diff --git a/.dockerignore b/.dockerignore
index d92acf83baddd..fe841322cc28f 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -7,6 +7,12 @@ packages/node-dev
 packages/**/node_modules
 packages/**/dist
 packages/**/.turbo
+packages/**/*.test.*
 .git
 .github
 *.tsbuildinfo
+packages/cli/dist/**/e2e.*
+docker/compose
+docker/**/Dockerfile
+.vscode
+cypress
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
new file mode 100644
index 0000000000000..a4f667ac4600a
--- /dev/null
+++ b/.git-blame-ignore-revs
@@ -0,0 +1,13 @@
+# Commits of large-scale changes to exclude from `git blame` results
+
+# Set up linting and formatting (#2120)
+
+56c4c6991fb21ba4b7bdcd22c929f63cc1d1defe
+
+# refactor(editor): Apply Prettier (no-changelog) #4920
+
+5ca2148c7ed06c90f999508928b7a51f9ac7a788
+
+# refactor: Run lintfix (no-changelog) (#7537)
+
+62c096710fab2f7e886518abdbded34b55e93f62
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000000..dfdb8b771ce07
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+*.sh text eol=lf
diff --git a/.github/ISSUE_TEMPLATE/01-bug.yml b/.github/ISSUE_TEMPLATE/01-bug.yml
new file mode 100644
index 0000000000000..63b0634e6facd
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/01-bug.yml
@@ -0,0 +1,82 @@
+name: Bug Report
+description: Create a bug report to help us improve
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+  - type: textarea
+    id: description
+    attributes:
+      label: Bug Description
+      description: A clear and concise description of what the bug is
+      placeholder: Tell us what you see!
+    validations:
+      required: true
+  - type: textarea
+    id: reproduction
+    attributes:
+      label: To Reproduce
+      description: Steps to reproduce the behavior
+      placeholder: |
+        1. Go to '...'
+        2. Click on '....'
+        3. Scroll down to '....'
+        4. See error
+    validations:
+      required: true
+  - type: textarea
+    id: expected
+    attributes:
+      label: Expected behavior
+      description: A clear and concise description of what you expected to happen
+    validations:
+      required: true
+  - type: markdown
+    attributes:
+      value: '## Environment'
+  - type: input
+    id: os
+    attributes:
+      label: Operating System
+      placeholder: ex. Ubuntu Linux 22.04
+    validations:
+      required: true
+  - type: input
+    id: n8n-version
+    attributes:
+      label: n8n Version
+      placeholder: ex. 1.25.0
+    validations:
+      required: true
+  - type: input
+    id: nodejs-version
+    attributes:
+      label: Node.js Version
+      placeholder: ex. 18.16.0
+    validations:
+      required: true
+  - type: dropdown
+    id: db
+    attributes:
+      label: Database
+      options:
+        - SQLite (default)
+        - PostgreSQL
+        - MySQL
+        - MariaDB
+      default: 0
+    validations:
+      required: true
+  - type: dropdown
+    id: execution-mode
+    attributes:
+      label: Execution mode
+      description: '[Info](https://docs.n8n.io/hosting/scaling/execution-modes-processes/)'
+      options:
+        - main (default)
+        - queue
+        - own (deprecated)
+      default: 0
+    validations:
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index fdc96ff873b92..0000000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,32 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Environment (please complete the following information):**
-
-- OS: [e.g. Ubuntu Linux 22.04]
-- n8n Version [e.g. 0.200.1]
-- Node.js Version [e.g. 16.17.0]
-- Database system [e.g. SQLite; n8n uses SQLite as default otherwise changed]
-- Operation mode [e.g. own; operation modes are `own`, `main` and `queue`. Default is `own`]
-
-**Additional context**
-Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index c2caf18ab3202..8b62ca7bbbffc 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -6,3 +6,6 @@ contact_links:
   - name: Question / Problem
     url: https://community.n8n.io
     about: Questions and problems with n8n
+  - name: n8n Security Vulnerability
+    url: https://n8n.io/legal/#vulnerability
+    about: Learn about our Vulnerability Disclosure Policy
diff --git a/.github/docker-compose.yml b/.github/docker-compose.yml
index 4482ab62222f8..84a1b9c9610b8 100644
--- a/.github/docker-compose.yml
+++ b/.github/docker-compose.yml
@@ -2,18 +2,24 @@ version: '3.9'
 
 services:
   mysql:
-    image: mysql:5.7-debian
+    image: mysql:5.7
     environment:
       - MYSQL_DATABASE=n8n
       - MYSQL_ROOT_PASSWORD=password
     ports:
       - 3306:3306
+    ulimits:
+      nproc: 65535
+      nofile:
+        soft: 26677
+        hard: 46677
 
   postgres:
-    image: postgres:11
+    image: postgres:16
+    restart: always
     environment:
       - POSTGRES_DB=n8n
-      - POSTGRES_USER=root
+      - POSTGRES_USER=postgres
       - POSTGRES_PASSWORD=password
     ports:
       - 5432:5432
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index bd399104db8d6..dfcc0615a7b4d 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1 +1,16 @@
-Github issue / Community forum post (link here to close automatically):
+## Summary
+> Describe what the PR does and how to test. Photos and videos are recommended.
+
+
+
+## Related tickets and issues
+> Include links to **Linear ticket** or Github issue or Community forum post. Important in order to close *automatically* and provide context to reviewers.
+
+
+
+## Review / Merge checklist
+- [ ] PR title and summary are descriptive. **Remember, the title automatically goes into the changelog. Use `(no-changelog)` otherwise.** ([conventions](https://github.com/n8n-io/n8n/blob/master/.github/pull_request_title_conventions.md))
+- [ ] [Docs updated](https://github.com/n8n-io/n8n-docs) or follow-up ticket created.
+- [ ] Tests included.
+   > A bug is not considered fixed, unless a test is added to prevent it from happening again.
+   > A feature is not complete without tests. 
\ No newline at end of file
diff --git a/.github/pull_request_title_conventions.md b/.github/pull_request_title_conventions.md
new file mode 100644
index 0000000000000..8808000e3b330
--- /dev/null
+++ b/.github/pull_request_title_conventions.md
@@ -0,0 +1,112 @@
+# PR Title Convention
+
+We have very precise rules over how Pull Requests (to the `master` branch) must be formatted. This format basically follows the [Angular Commit Message Convention](https://github.com/angular/angular/blob/master/CONTRIBUTING.md#commit). It leads to easier to read commit history and allows for automated generation of release notes:
+
+A PR title consists of these elements:
+
+```
+<type>(<scope>): <summary>
+  │       │          │
+  │       │          └─⫸ Summary: In imperative present tense.
+  |       |                        Capitalized
+  |       |                        No period at the end.
+  │       │
+  │       └─⫸ Scope: API|core|editor|* Node
+  │
+  └─⫸ Type: build|ci|docs|feat|fix|perf|refactor|test
+```
+
+- PR title
+    - type
+    - scope (*optional*)
+    - summary
+- PR description
+    - body (optional)
+    - blank line
+    - footer (optional)
+
+The structure looks like this:
+
+### **Type**
+
+Must be one of the following:
+
+- `feat` - A new feature
+- `fix` - A bug fix
+- `perf` - A code change that improves performance
+- `test` - Adding missing tests or correcting existing tests
+- `docs` - Documentation only changes
+- `refactor` - A code change that neither fixes a bug nor adds a feature
+- `build` - Changes that affect the build system or external dependencies (example scopes: broccoli, npm)
+- `ci` - Changes to our CI configuration files and scripts (e.g. Github actions)
+
+If the prefix is `feat`, `fix` or `perf`, it will appear in the changelog. However if there is any BREAKING CHANGE (see Footer section below), the commit will always appear in the changelog.
+
+### **Scope (optional)**
+
+The scope should specify the place of the commit change as long as the commit clearly addresses one of the following supported scopes. (Otherwise, omit the scope!)
+
+- `API` - changes to the *public* API
+- `core` - changes to the core / private API / backend of n8n
+- `editor` - changes to the Editor UI
+- `* Node` - changes to a specific node or trigger node (”`*`” to be replaced with the node name, not its display name), e.g.
+    - mattermost → Mattermost Node
+    - microsoftToDo  → Microsoft To Do Node
+    - n8n → n8n Node
+
+### **Summary**
+
+The summary contains succinct description of the change:
+
+- use the imperative, present tense: "change" not "changed" nor "changes"
+- capitalize the first letter
+- *no* dot (.) at the end
+- do *not* include Linear ticket IDs etc. (e.g. N8N-1234)
+- suffix with “(no-changelog)” for commits / PRs that should not get mentioned in the changelog.
+
+### **Body (optional)**
+
+Just as in the **summary**, use the imperative, present tense: "change" not "changed" nor "changes". The body should include the motivation for the change and contrast this with previous behavior.
+
+### **Footer (optional)**
+
+The footer can contain information about breaking changes and deprecations and is also the place to [reference GitHub issues](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword), Linear tickets, and other PRs that this commit closes or is related to. For example:
+
+```
+BREAKING CHANGE: <breaking change summary>
+<BLANK LINE>
+<breaking change description + migration instructions>
+<BLANK LINE>
+<BLANK LINE>
+Fixes #<issue number>
+```
+
+or
+
+```
+DEPRECATED: <what is deprecated>
+<BLANK LINE>
+<deprecation description + recommended update path>
+<BLANK LINE>
+<BLANK LINE>
+Closes #<pr number>
+```
+
+A Breaking Change section should start with the phrase "`BREAKING CHANGE:` " followed by a summary of the breaking change, a blank line, and a detailed description of the breaking change that also includes migration instructions.
+
+> 💡 A breaking change can additionally also be marked by adding a “`!`” to the header, right before the “`:`”, e.g. `feat(editor)!: Remove support for dark mode`
+> 
+> This makes locating breaking changes easier when just skimming through commit messages.
+
+> 💡 The breaking changes must also be added to the [packages/cli/BREAKING-CHANGES.md](https://github.com/n8n-io/n8n/blob/master/packages/cli/BREAKING-CHANGES.md) file located in the n8n repository.
+
+Similarly, a Deprecation section should start with "`DEPRECATED:` " followed by a short description of what is deprecated, a blank line, and a detailed description of the deprecation that also mentions the recommended update path.
+
+### **Revert commits**
+
+If the commit reverts a previous commit, it should begin with `revert:` , followed by the header of the reverted commit.
+
+The content of the commit message body should contain:
+
+- information about the SHA of the commit being reverted in the following format: `This reverts commit <SHA>`,
+- a clear description of the reason for reverting the commit message.
\ No newline at end of file
diff --git a/.github/scripts/bump-versions.mjs b/.github/scripts/bump-versions.mjs
index c1c110272cb9a..8e7acc21ebcfc 100644
--- a/.github/scripts/bump-versions.mjs
+++ b/.github/scripts/bump-versions.mjs
@@ -43,7 +43,7 @@ for (const packageName in packageMap) {
 
 	packageJson.version = packageMap[packageName].nextVersion =
 		isDirty ||
-		Object.keys(packageJson.dependencies).some(
+		Object.keys(packageJson.dependencies || {}).some(
 			(dependencyName) => packageMap[dependencyName]?.isDirty,
 		)
 			? semver.inc(version, releaseType)
diff --git a/.github/scripts/check-tests.mjs b/.github/scripts/check-tests.mjs
new file mode 100644
index 0000000000000..1e2e38e05b064
--- /dev/null
+++ b/.github/scripts/check-tests.mjs
@@ -0,0 +1,103 @@
+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 60f945f3f507b..cd67711fa4c29 100644
--- a/.github/scripts/package.json
+++ b/.github/scripts/package.json
@@ -1,6 +1,13 @@
 {
   "dependencies": {
-    "semver": "^7.3.8",
-    "conventional-changelog-cli": "^2.2.2"
+    "cacheable-lookup": "6.1.0",
+    "conventional-changelog": "^4.0.0",
+    "debug": "4.3.4",
+    "glob": "10.3.10",
+    "p-limit": "3.1.0",
+    "picocolors": "1.0.0",
+    "semver": "7.5.4",
+    "tempfile": "5.0.0",
+    "typescript": "*"
   }
 }
diff --git a/.github/scripts/update-changelog.mjs b/.github/scripts/update-changelog.mjs
new file mode 100644
index 0000000000000..c0cce214a9777
--- /dev/null
+++ b/.github/scripts/update-changelog.mjs
@@ -0,0 +1,35 @@
+import createTempFile from 'tempfile';
+import conventionalChangelog from 'conventional-changelog';
+import { resolve } from 'path';
+import { createReadStream, createWriteStream } from 'fs';
+import { dirname } from 'path';
+import { fileURLToPath } from 'url';
+import { pipeline } from 'stream/promises';
+import packageJson from '../../package.json' assert { type: 'json' };
+
+const baseDir = resolve(dirname(fileURLToPath(import.meta.url)), '../..');
+const fullChangelogFile = resolve(baseDir, 'CHANGELOG.md');
+const versionChangelogFile = resolve(baseDir, `CHANGELOG-${packageJson.version}.md`);
+
+const changelogStream = conventionalChangelog({
+	preset: 'angular',
+	releaseCount: 1,
+	tagPrefix: 'n8n@',
+	transform: (commit, callback) => {
+		callback(null, commit.header.includes('(no-changelog)') ? undefined : commit);
+	},
+}).on('error', (err) => {
+	console.error(err.stack);
+	process.exit(1);
+});
+
+// Write the new changelog to a new temporary file, so that the contents can be used in the PR description
+await pipeline(changelogStream, createWriteStream(versionChangelogFile));
+
+// Since we can't read and write from the same file at the same time,
+// we use a temporary file to output the updated changelog to.
+const tmpFile = createTempFile();
+const tmpStream = createWriteStream(tmpFile);
+await pipeline(createReadStream(versionChangelogFile), tmpStream, { end: false });
+await pipeline(createReadStream(fullChangelogFile), tmpStream);
+await pipeline(createReadStream(tmpFile), createWriteStream(fullChangelogFile));
diff --git a/.github/scripts/validate-docs-links.js b/.github/scripts/validate-docs-links.js
new file mode 100644
index 0000000000000..1c11e75f7f2c3
--- /dev/null
+++ b/.github/scripts/validate-docs-links.js
@@ -0,0 +1,90 @@
+#!/usr/bin/env node
+
+const packages = ['nodes-base', '@n8n/nodes-langchain'];
+const concurrency = 20;
+let exitCode = 0;
+
+const debug = require('debug')('n8n');
+const path = require('path');
+const https = require('https');
+const glob = require('glob');
+const pLimit = require('p-limit');
+const picocolors = require('picocolors');
+const Lookup = require('cacheable-lookup').default;
+
+const agent = new https.Agent({ keepAlive: true, keepAliveMsecs: 5000 });
+new Lookup().install(agent);
+const limiter = pLimit(concurrency);
+
+const validateUrl = async (packageName, kind, type) =>
+	new Promise((resolve, reject) => {
+		const name = type.displayName;
+		const documentationUrl =
+			kind === 'credentials'
+				? type.documentationUrl
+				: type.codex?.resources?.primaryDocumentation?.[0]?.url;
+		if (!documentationUrl) resolve([name, null]);
+
+		const url = new URL(
+			/^https?:\/\//.test(documentationUrl)
+				? documentationUrl
+				: `https://docs.n8n.io/integrations/builtin/${kind}/${documentationUrl.toLowerCase()}/`,
+		);
+		https
+			.request(
+				{
+					hostname: url.hostname,
+					port: 443,
+					path: url.pathname,
+					method: 'HEAD',
+					agent,
+				},
+				(res) => {
+					debug(picocolors.green('✓'), packageName, kind, name);
+					resolve([name, res.statusCode]);
+				},
+			)
+			.on('error', (e) => {
+				debug(picocolors.red('✘'), packageName, kind, name);
+				reject(e);
+			})
+			.end();
+	});
+
+const checkLinks = async (packageName, kind) => {
+	const baseDir = path.resolve(__dirname, '../../packages', packageName);
+	let types = require(path.join(baseDir, `dist/types/${kind}.json`));
+	if (kind === 'nodes')
+		types = types.filter(
+			({ codex, hidden }) => !!codex?.resources?.primaryDocumentation && !hidden,
+		);
+	debug(packageName, kind, types.length);
+
+	const statuses = await Promise.all(
+		types.map((type) =>
+			limiter(() => {
+				return validateUrl(packageName, kind, type);
+			}),
+		),
+	);
+
+	const missingDocs = [];
+	const invalidUrls = [];
+	for (const [name, statusCode] of statuses) {
+		if (statusCode === null) missingDocs.push(name);
+		if (statusCode !== 200) invalidUrls.push(name);
+	}
+
+	if (missingDocs.length)
+		console.log('Documentation URL missing in %s for %s', packageName, kind, missingDocs);
+	if (invalidUrls.length)
+		console.log('Documentation URL invalid in %s for %s', packageName, kind, invalidUrls);
+	if (missingDocs.length || invalidUrls.length) exitCode = 1;
+};
+
+(async () => {
+	for (const packageName of packages) {
+		await Promise.all([checkLinks(packageName, 'credentials'), checkLinks(packageName, 'nodes')]);
+		if (exitCode !== 0) process.exit(exitCode);
+	}
+})();
diff --git a/.github/workflows/units-tests-dispatch.yml b/.github/workflows/units-tests-dispatch.yml
new file mode 100644
index 0000000000000..5ad63f000e1fb
--- /dev/null
+++ b/.github/workflows/units-tests-dispatch.yml
@@ -0,0 +1,39 @@
+name: Runs unit tests for a given ref
+
+on:
+  workflow_dispatch:
+    inputs:
+      ref:
+        description: 'GitHub ref to test.'
+        required: false
+        default: 'master'
+        type: string
+      prNumber:
+        description: 'PR number to run tests for.'
+        required: false
+        type: number
+
+jobs:
+  prepare:
+    name: Prepare
+    runs-on: ubuntu-latest
+    outputs:
+      branch: ${{ steps.compute-branch.outputs.branch }}
+    steps:
+      - name: Compute branch
+        id: compute-branch
+        run: |
+          BRANCH_NAME=""
+          if [[ "${{ inputs.prNumber }}" != "" && "${{ inputs.prNumber }}" != "null" ]]; then
+            BRANCH_NAME="refs/pull/${{ inputs.prNumber }}/merge"
+          else
+            BRANCH_NAME="${{ inputs.ref }}"
+          fi
+          echo "branch=$BRANCH_NAME" >> $GITHUB_OUTPUT
+
+  unit-test:
+    name: Unit tests
+    needs: prepare
+    uses: ./.github/workflows/units-tests-reusable.yml
+    with:
+      ref: ${{ needs.prepare.outputs.branch }}
diff --git a/.github/workflows/units-tests-reusable.yml b/.github/workflows/units-tests-reusable.yml
new file mode 100644
index 0000000000000..386612678c1e5
--- /dev/null
+++ b/.github/workflows/units-tests-reusable.yml
@@ -0,0 +1,72 @@
+name: Reusable units test workflow
+
+on:
+  workflow_call:
+    inputs:
+      ref:
+        description: 'GitHub ref to test.'
+        required: false
+        type: string
+        default: 'master'
+      nodeVersion:
+        description: 'Version of node to use.'
+        required: false
+        type: string
+        default: '18.x'
+      cacheKey:
+        description: 'Cache key for modules and build artifacts.'
+        required: false
+        default: ''
+        type: string
+      collectCoverage:
+        required: false
+        default: 'false'
+        type: string
+
+jobs:
+  unit-test:
+    name: Unit tests
+    runs-on: ubuntu-latest
+    env:
+      COVERAGE_ENABLED: ${{ inputs.collectCoverage }}
+    steps:
+      - uses: actions/checkout@v4.1.1
+        with:
+          repository: n8n-io/n8n
+          ref: ${{ inputs.ref }}
+
+      - run: corepack enable
+      - name: Use Node.js ${{ inputs.nodeVersion }}
+        uses: actions/setup-node@v4.0.1
+        with:
+          node-version: ${{ inputs.nodeVersion }}
+          cache: pnpm
+
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+
+      - name: Build
+        if: ${{ inputs.cacheKey == '' }}
+        run: pnpm build
+
+      - name: Restore cached build artifacts
+        if: ${{ inputs.cacheKey != '' }}
+        uses: actions/cache/restore@v4.0.0
+        with:
+          path: ./packages/**/dist
+          key: ${{ inputs.cacheKey }}
+
+      - name: Test Backend
+        run: pnpm test:backend
+
+      - name: Test Nodes
+        run: pnpm test:nodes
+
+      - name: Test Frontend
+        run: pnpm test:frontend
+
+      - name: Upload coverage to Codecov
+        if: ${{ inputs.collectCoverage == 'true' }}
+        uses: codecov/codecov-action@v3
+        with:
+          files: packages/@n8n/chat/coverage/cobertura-coverage.xml,packages/@n8n/nodes-langchain/coverage/cobertura-coverage.xml,packages/@n8n/permissions/coverage/cobertura-coverage.xml,packages/@n8n/client-oauth2/coverage/cobertura-coverage.xml,packages/cli/coverage/cobertura-coverage.xml,packages/core/coverage/cobertura-coverage.xml,packages/design-system/coverage/cobertura-coverage.xml,packages/editor-ui/coverage/cobertura-coverage.xml,packages/nodes-base/coverage/cobertura-coverage.xml,packages/workflow/coverage/cobertura-coverage.xml
diff --git a/.gitignore b/.gitignore
index a62f7fdda9ca3..3ba0d8cfd14b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,10 +16,13 @@ _START_PACKAGE
 nodelinter.config.json
 **/package-lock.json
 packages/**/.turbo
+.turbo
 *.tsbuildinfo
 cypress/videos/*
 cypress/screenshots/*
+cypress/downloads/*
 *.swp
-
-# Logs
-packages/cli/bin/logs
+CHANGELOG-*.md
+*.mdx
+build-storybook.log
+*.log
diff --git a/.npmrc b/.npmrc
index ba82761a5257d..0d9bdb6234f43 100644
--- a/.npmrc
+++ b/.npmrc
@@ -1,3 +1,6 @@
+audit = false
+fund = false
+update-notifier = false
 auto-install-peers = true
 strict-peer-dependencies = false
 prefer-workspace-packages = true
diff --git a/.prettierignore b/.prettierignore
index c5faf0aa47ee0..4ac8f0dafbf68 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,4 +1,9 @@
 coverage
 dist
 package.json
-.pnpm-lock.yml
+pnpm-lock.yaml
+packages/editor-ui/index.html
+packages/nodes-base/nodes/**/test
+packages/cli/templates/form-trigger.handlebars
+cypress/fixtures
+CHANGELOG.md
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 877b69401a0fb..8fb03eb716f7c 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -5,7 +5,6 @@
 		"dbaeumer.vscode-eslint",
 		"EditorConfig.EditorConfig",
 		"esbenp.prettier-vscode",
-		"Vue.vscode-typescript-vue-plugin",
 		"Vue.volar"
 	]
 }
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 6e814517875a9..448d745236cbc 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -26,6 +26,7 @@
 			"name": "Launch n8n with debug",
 			"program": "${workspaceFolder}/packages/cli/bin/n8n",
 			"cwd": "${workspaceFolder}/packages/cli/bin",
+			// "args": ["start", "--tunnel"],
 			"request": "launch",
 			"skipFiles": ["<node_internals>/**"],
 			"type": "node",
diff --git a/.vscode/settings.default.json b/.vscode/settings.default.json
index 6532df1beec88..87db2ca2ee206 100644
--- a/.vscode/settings.default.json
+++ b/.vscode/settings.default.json
@@ -9,7 +9,7 @@
 	"typescript.format.enable": false,
 	"typescript.tsdk": "node_modules/typescript/lib",
 	"workspace-default-settings.runOnActivation": true,
-	"prettier.prettierPath": "node_modules/prettier",
+	"prettier.prettierPath": "node_modules/prettier/index.cjs",
 	"eslint.probe": ["javascript", "typescript", "vue"],
 	"eslint.workingDirectories": [
 		{
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1853cad3e7e2f..33a58cc333e68 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,2123 @@
+# [1.41.0](https://github.com/n8n-io/n8n/compare/n8n@1.40.0...n8n@1.41.0) (2024-05-08)
+
+
+### Bug Fixes
+
+* Cast boolean values in filter parameter ([#9260](https://github.com/n8n-io/n8n/issues/9260)) ([30c8efc](https://github.com/n8n-io/n8n/commit/30c8efc4cc9b25fabc8d9c56e8c29e7e77c04325))
+* **core:** Prevent occassional 429s on license init in multi-main setup ([#9284](https://github.com/n8n-io/n8n/issues/9284)) ([22b6f90](https://github.com/n8n-io/n8n/commit/22b6f909505d7c3d9c0583a90599e6e9c244e21e))
+* **core:** Report missing SAML attributes early with an actionable error message ([#9316](https://github.com/n8n-io/n8n/issues/9316)) ([225fdbb](https://github.com/n8n-io/n8n/commit/225fdbb379f6dd0005bd4ccb3791c96de35b1653))
+* **core:** Webhooks responding with binary data should not prematurely end the response stream ([#9063](https://github.com/n8n-io/n8n/issues/9063)) ([23b676d](https://github.com/n8n-io/n8n/commit/23b676d7cb9708d7a99fc031cfeec22b854be1d9))
+* **editor:** Fix multi-select parameters with load options getting cleared ([#9324](https://github.com/n8n-io/n8n/issues/9324)) ([0ee4b6c](https://github.com/n8n-io/n8n/commit/0ee4b6c86000ab164211c1ebed90306cd144af1b))
+* **editor:** Fix shortcut issue on save buttons ([#9309](https://github.com/n8n-io/n8n/issues/9309)) ([e74c14f](https://github.com/n8n-io/n8n/commit/e74c14ffbe088ac74dc6358068cd54af9a850cad))
+* **editor:** Resolve `$vars` and `$secrets` in expressions in credentials fields ([#9289](https://github.com/n8n-io/n8n/issues/9289)) ([d92f994](https://github.com/n8n-io/n8n/commit/d92f994913befd31aec409ef8e40b290ac4185ba))
+* **editor:** Show MFA section to instance owner, even when external auth is enabled ([#9301](https://github.com/n8n-io/n8n/issues/9301)) ([b65e0e2](https://github.com/n8n-io/n8n/commit/b65e0e28114f576f89e271ab8ffdb8550e1be60f))
+* **Gmail Node:** Remove duplicate options when creating drafts ([#9299](https://github.com/n8n-io/n8n/issues/9299)) ([bfb0eb7](https://github.com/n8n-io/n8n/commit/bfb0eb7a06f219424486a55256ecca46c14a85ba))
+* **Linear Node:** Fix issue with data not always being returned ([#9273](https://github.com/n8n-io/n8n/issues/9273)) ([435272b](https://github.com/n8n-io/n8n/commit/435272b568826edf899dbaba9d10077fbe134ea6))
+* **n8n Form Trigger Node:** Fix missing options when using respond to webhook ([#9282](https://github.com/n8n-io/n8n/issues/9282)) ([6ab3781](https://github.com/n8n-io/n8n/commit/6ab378157041abfc918ae1d9408821f8fd5cfb34))
+* **Pipedrive Node:** Improve type-safety in custom-property handling ([#9319](https://github.com/n8n-io/n8n/issues/9319)) ([c8895c5](https://github.com/n8n-io/n8n/commit/c8895c540e5c8edfb576960a5ba4ec9ac4426d5b))
+* **Read PDF Node:** Disable JS evaluation from PDFs ([#9336](https://github.com/n8n-io/n8n/issues/9336)) ([c4bf5b2](https://github.com/n8n-io/n8n/commit/c4bf5b2b9285402ae09960eb64a5d6f20356eeaf))
+
+
+### Features
+
+* **editor:** Implement AI Assistant chat UI ([#9300](https://github.com/n8n-io/n8n/issues/9300)) ([491c6ec](https://github.com/n8n-io/n8n/commit/491c6ec546c4ec8ab4eb88d020c13820071bf6dc))
+* **editor:** Temporarily disable AI error helper ([#9329](https://github.com/n8n-io/n8n/issues/9329)) ([35b983b](https://github.com/n8n-io/n8n/commit/35b983b6dfbb6ab02367801a15581e80a2d87340))
+* **LinkedIn Node:** Upgrade LinkedIn API version ([#9307](https://github.com/n8n-io/n8n/issues/9307)) ([3860077](https://github.com/n8n-io/n8n/commit/3860077f8100fb790acf1d930839e86719a454fd))
+* **Redis Node:** Add support for TLS ([#9266](https://github.com/n8n-io/n8n/issues/9266)) ([0a2de09](https://github.com/n8n-io/n8n/commit/0a2de093c01689b8f179b3f4413a4ce29ccf279a))
+* **Send Email Node:** Add an option to customize client host-name on SMTP connections ([#9322](https://github.com/n8n-io/n8n/issues/9322)) ([d0d52de](https://github.com/n8n-io/n8n/commit/d0d52def8fb4113a7a4866d30f2e9c7bfe11075e))
+* **Slack Node:** Update to use the new API method for file uploads ([#9323](https://github.com/n8n-io/n8n/issues/9323)) ([695e762](https://github.com/n8n-io/n8n/commit/695e762663fde79b9555be8cf075ee4144f380f1))
+
+
+
+# [1.40.0](https://github.com/n8n-io/n8n/compare/n8n@1.39.0...n8n@1.40.0) (2024-05-02)
+
+
+### Bug Fixes
+
+* **Airtable Node:** Do not allow to use deprecated api keys in v1 ([#9171](https://github.com/n8n-io/n8n/issues/9171)) ([017ae6e](https://github.com/n8n-io/n8n/commit/017ae6e1025fb4ae28b46b9c411e4b5c70e280e9))
+* **core:** Add `view engine` to webhook server to support forms ([#9224](https://github.com/n8n-io/n8n/issues/9224)) ([24c3150](https://github.com/n8n-io/n8n/commit/24c3150056401ddcf49f7266897b6c73ccc06253))
+* **core:** Fix browser session refreshes not working ([#9212](https://github.com/n8n-io/n8n/issues/9212)) ([1efeecc](https://github.com/n8n-io/n8n/commit/1efeeccc5bae306a798a66a8cf3e669ad3689262))
+* **core:** Prevent node param resolution from failing telemetry graph generation ([#9257](https://github.com/n8n-io/n8n/issues/9257)) ([f6c9493](https://github.com/n8n-io/n8n/commit/f6c9493355726ddf516fb54a37adf49a2ce0efd0))
+* **core:** Stop relying on filesystem for SSH keys ([#9217](https://github.com/n8n-io/n8n/issues/9217)) ([093dcef](https://github.com/n8n-io/n8n/commit/093dcefafc5a09f7622391d8b01b9aecfa9c8f2f))
+* **Discord Node:** When using OAuth2 authentication, check if user is a guild member when sending direct message ([#9183](https://github.com/n8n-io/n8n/issues/9183)) ([00dfad3](https://github.com/n8n-io/n8n/commit/00dfad3279bd2a45a8331e734b331f4ab3fce75c))
+* **editor:** Fix read-only mode in inline expression editor ([#9232](https://github.com/n8n-io/n8n/issues/9232)) ([99f384e](https://github.com/n8n-io/n8n/commit/99f384e2cf6b16d08a8bdc150a2833463b35f14b))
+* **editor:** Prevent excess runs in manual execution with run data ([#9259](https://github.com/n8n-io/n8n/issues/9259)) ([426a12a](https://github.com/n8n-io/n8n/commit/426a12ac0ec1d637063828db008a2fb9c32ddfff))
+* **editor:** Throw expression error on attempting to set variables at runtime ([#9229](https://github.com/n8n-io/n8n/issues/9229)) ([fec04d5](https://github.com/n8n-io/n8n/commit/fec04d5f796c677b6127addcb700d6442c2c3a26))
+* Elaborate scope of Sustainable Use License ([#9233](https://github.com/n8n-io/n8n/issues/9233)) ([442aaba](https://github.com/n8n-io/n8n/commit/442aaba116cf0cfe7c1e7b8d570e321cc6a14143))
+* **Google BigQuery Node:** Better error messages, transform timestamps ([#9255](https://github.com/n8n-io/n8n/issues/9255)) ([7ff24f1](https://github.com/n8n-io/n8n/commit/7ff24f134b706d0b5b7d7c13d3e69bd1a0f4c5b8))
+* **Google Drive Node:** Create from text operation ([#9185](https://github.com/n8n-io/n8n/issues/9185)) ([d9e7494](https://github.com/n8n-io/n8n/commit/d9e74949c4db7282c3ab42bd6825aa5acc042400))
+* **Jira Trigger Node:** Update credentials UI ([#9198](https://github.com/n8n-io/n8n/issues/9198)) ([ed98ca2](https://github.com/n8n-io/n8n/commit/ed98ca2fb77fc81362e6480ee6a12a64915418f9))
+* **LangChain Code Node:** Fix execution of custom n8n tools called via LC code node ([#9265](https://github.com/n8n-io/n8n/issues/9265)) ([741e829](https://github.com/n8n-io/n8n/commit/741e8299d64cd774cc35ea312433f50d865f1318))
+* **LangChain Code Node:** Fix resolution of scoped langchain modules ([#9258](https://github.com/n8n-io/n8n/issues/9258)) ([445c05d](https://github.com/n8n-io/n8n/commit/445c05dca46225e195ab122cf77d6d1088460e20))
+* **MySQL Node:** Query to statements splitting fix ([#9207](https://github.com/n8n-io/n8n/issues/9207)) ([dc84452](https://github.com/n8n-io/n8n/commit/dc844528f4554ae41037e2c25542237a74d86f3f))
+
+
+### Features
+
+* Add Ask AI to HTTP Request Node ([#8917](https://github.com/n8n-io/n8n/issues/8917)) ([cd9bc44](https://github.com/n8n-io/n8n/commit/cd9bc44bddf7fc78acec9ee7c96a40077a07615f))
+* **Gmail Node:** Add support for creating drafts using an alias ([#8728](https://github.com/n8n-io/n8n/issues/8728)) ([3986356](https://github.com/n8n-io/n8n/commit/3986356c8995998cb6ab392ae07f41efcb46d4bd))
+* **Gmail Node:** Add thread option for draft emails ([#8729](https://github.com/n8n-io/n8n/issues/8729)) ([2dd0b32](https://github.com/n8n-io/n8n/commit/2dd0b329ca243de87eb1b59bf831593f70c42784))
+* **Groq Chat Model Node:** Add support for Groq chat models  ([#9250](https://github.com/n8n-io/n8n/issues/9250)) ([96f02bd](https://github.com/n8n-io/n8n/commit/96f02bd6552cf9ea75fcb8ba29c3afac9553aa25))
+* **HTTP Request Node:** Option to provide SSL Certificates in Http Request Node ([#9125](https://github.com/n8n-io/n8n/issues/9125)) ([306b68d](https://github.com/n8n-io/n8n/commit/306b68da6bb37dbce67dcf5c4791c2986750579c))
+* **Jira Software Node:** Add Wiki Markup support for Jira Cloud comments ([#8857](https://github.com/n8n-io/n8n/issues/8857)) ([756012b](https://github.com/n8n-io/n8n/commit/756012b0524e09601fada80213dd4da3057d329a))
+* **Microsoft To Do Node:** Add an option to set a reminder when updating a task ([#6918](https://github.com/n8n-io/n8n/issues/6918)) ([22b2afd](https://github.com/n8n-io/n8n/commit/22b2afdd23bef2a301cd9d3743400e0d69463b1b))
+* **MISP Node:** Rest search operations ([#9196](https://github.com/n8n-io/n8n/issues/9196)) ([b694e77](https://github.com/n8n-io/n8n/commit/b694e7743e17507b901706c5023a9aac83b903dd))
+* **Ollama Chat Model Node:** Add aditional Ollama config parameters & fix vision ([#9215](https://github.com/n8n-io/n8n/issues/9215)) ([e17e767](https://github.com/n8n-io/n8n/commit/e17e767e700a74b187706552fc879c00fd551611))
+* **Pipedrive Node:** Add busy and description options to activities ([#9208](https://github.com/n8n-io/n8n/issues/9208)) ([9b3ac16](https://github.com/n8n-io/n8n/commit/9b3ac1648f1888d79079fd50998140fd27efae97))
+* **Postgres Node:** Add option IS NOT NULL and hide value input fields ([#9241](https://github.com/n8n-io/n8n/issues/9241)) ([e896889](https://github.com/n8n-io/n8n/commit/e89688939438b2d5414155f053530bd9eb34b300))
+* **S3 Node:** Add support for self signed SSL certificates ([#9269](https://github.com/n8n-io/n8n/issues/9269)) ([ddff804](https://github.com/n8n-io/n8n/commit/ddff80416df87166627fdefc755e3f79102c5664))
+* **Telegram Node:** Disable page preview by default ([#9267](https://github.com/n8n-io/n8n/issues/9267)) ([41ce178](https://github.com/n8n-io/n8n/commit/41ce178491135b5f972974ebecec0f5f223a71ce))
+* Upgrade typeorm for separate sqlite read & write connections ([#9230](https://github.com/n8n-io/n8n/issues/9230)) ([0b52320](https://github.com/n8n-io/n8n/commit/0b523206358886d5b81d7009ce95cb9d3ba9fa40))
+* **Wise Node:** Add XML as supported format in getStatement operation ([#9193](https://github.com/n8n-io/n8n/issues/9193)) ([a424b59](https://github.com/n8n-io/n8n/commit/a424b59e4949e96c0e56319cea91fcf084a5208e))
+* **Wise Trigger Node:** Add support for balance updates ([#9189](https://github.com/n8n-io/n8n/issues/9189)) ([42a9891](https://github.com/n8n-io/n8n/commit/42a9891081e7f1a19364c406b056eee036180c24))
+
+
+
+# [1.39.0](https://github.com/n8n-io/n8n/compare/n8n@1.38.0...n8n@1.39.0) (2024-04-24)
+
+
+### Bug Fixes
+
+* **core:** Exclude oAuth callback urls from browser-id checks ([#9158](https://github.com/n8n-io/n8n/issues/9158)) ([46e432b](https://github.com/n8n-io/n8n/commit/46e432b177b4f1ae437f598674f188fb11ee1f20))
+* **core:** Improve browserId checks, and add logging ([#9161](https://github.com/n8n-io/n8n/issues/9161)) ([ff9ae54](https://github.com/n8n-io/n8n/commit/ff9ae549fdc6962e9990987c54804d2570da6a12))
+* **core:** Upgrade mysql2 to address CVE-2024-21511 ([#9206](https://github.com/n8n-io/n8n/issues/9206)) ([3996d28](https://github.com/n8n-io/n8n/commit/3996d2852a2e2a056af008a8f1a1c6cec9ba6084))
+* **editor:** Fix expression preview when previous node is selected ([#9140](https://github.com/n8n-io/n8n/issues/9140)) ([85780ea](https://github.com/n8n-io/n8n/commit/85780eade57f30e6870c314fa465d523e3646005))
+* **editor:** Fix parameter reset on credential change in Discord node ([#9137](https://github.com/n8n-io/n8n/issues/9137)) ([135ef75](https://github.com/n8n-io/n8n/commit/135ef75add8a42ce5163cce934ac5b2757ca4fe3))
+* **editor:** Fix sessionId for manual chat trigger execution ([#9187](https://github.com/n8n-io/n8n/issues/9187)) ([f5ccb5f](https://github.com/n8n-io/n8n/commit/f5ccb5fe33392654a292de34b9ed8319901d303b))
+* **editor:** Make sticky node content parameter non require to support empty stickies ([#9192](https://github.com/n8n-io/n8n/issues/9192)) ([f6142ff](https://github.com/n8n-io/n8n/commit/f6142ff275abb443940e9d8a4694c7f54c77a183))
+* **editor:** Prevent duplicate values in preview for SQL editor ([#9129](https://github.com/n8n-io/n8n/issues/9129)) ([5acbfb4](https://github.com/n8n-io/n8n/commit/5acbfb423436b94e58af0e532e567bdc3783a622))
+* **Google Sheets Node:** Fix "Append or Update" on an empty sheet ([#9175](https://github.com/n8n-io/n8n/issues/9175)) ([29ee4fa](https://github.com/n8n-io/n8n/commit/29ee4fab61c2f364b249b91c7561b176e78f37ac))
+* **Notion Node:** Add itemIndex to API and operation errors ([#9150](https://github.com/n8n-io/n8n/issues/9150)) ([946f09f](https://github.com/n8n-io/n8n/commit/946f09f62842c963e94d97555d1b5bf7789a1b99))
+* **Postgres Node:** Convert js arrays to postgres type, if column type is ARRAY ([#9160](https://github.com/n8n-io/n8n/issues/9160)) ([08e3502](https://github.com/n8n-io/n8n/commit/08e35027f1d4f483670dce44e8026c77aa4e6c3f))
+* **Respond to Webhook Node:** Fix issue stopping form trigger response ([#9157](https://github.com/n8n-io/n8n/issues/9157)) ([6c63cd9](https://github.com/n8n-io/n8n/commit/6c63cd971162d3f018b210d221ffc2a56535550a))
+* **Schedule Trigger Node:** Default to 0 minute if falsy on hourly run ([#9146](https://github.com/n8n-io/n8n/issues/9146)) ([d756609](https://github.com/n8n-io/n8n/commit/d75660982636389516cd97305e3c19912b77ea9c))
+* **Splunk Node:** Retry attempts if no response from API call, better error with suggestion to use Retry On Fail  ([#9176](https://github.com/n8n-io/n8n/issues/9176)) ([05a569c](https://github.com/n8n-io/n8n/commit/05a569c1cd1f2ecf40987c5f677dad61fd6324e5))
+
+
+### Features
+
+* Add WhatsApp Business Trigger Node ([#8840](https://github.com/n8n-io/n8n/issues/8840)) ([23a2dd0](https://github.com/n8n-io/n8n/commit/23a2dd08b6e5391b61b73bdd4496cdb2f6fa9205))
+* **core:** Setup helmet.js for setting security headers ([#9027](https://github.com/n8n-io/n8n/issues/9027)) ([0ed4671](https://github.com/n8n-io/n8n/commit/0ed46711f426f7edf5fa7833673b6b07348a3bd7))
+* **core:** Upgrade mysql2 to address CVE-2024-21507, CVE-2024-21508, and CVE-2024-21509 ([#9154](https://github.com/n8n-io/n8n/issues/9154)) ([9bd8e10](https://github.com/n8n-io/n8n/commit/9bd8e10b356ab965bfee5d13bf339f057bcfdb14))
+* **n8n Form Trigger Node:** Option to remove attribution ([#9162](https://github.com/n8n-io/n8n/issues/9162)) ([699fd70](https://github.com/n8n-io/n8n/commit/699fd70c2427397455939391f95a5cd65521afb3))
+* **Webhook Node:** Setting to enable multiple outputs/methods ([#9086](https://github.com/n8n-io/n8n/issues/9086)) ([2bf0a39](https://github.com/n8n-io/n8n/commit/2bf0a3933e0d7da46be73b8671e72e69d7d472df))
+* **Zammad Node:** Add more options to the Organizations endpoint  ([#9180](https://github.com/n8n-io/n8n/issues/9180)) ([15c88d6](https://github.com/n8n-io/n8n/commit/15c88d6839fb0b59fe5112b846ba61a29e9e3e45))
+
+
+
+# [1.38.0](https://github.com/n8n-io/n8n/compare/n8n@1.37.0...n8n@1.38.0) (2024-04-17)
+
+
+### Bug Fixes
+
+* **core:** Don't create multiple owners when importing credentials or workflows ([#9112](https://github.com/n8n-io/n8n/issues/9112)) ([3eb5be5](https://github.com/n8n-io/n8n/commit/3eb5be5f5a1a62d7cf39381a67c8d747c397a969))
+* **core:** Don't revert irreversibble migrations ([#9105](https://github.com/n8n-io/n8n/issues/9105)) ([3bb821f](https://github.com/n8n-io/n8n/commit/3bb821f10e2d865040fd1d89bec9836c7f98b8ef))
+* **core:** Support MySQL in `MoveSshKeysToDatabase` migration ([#9120](https://github.com/n8n-io/n8n/issues/9120)) ([cf435c3](https://github.com/n8n-io/n8n/commit/cf435c33110d620295587e61b355ead6e4819958))
+* **editor:** Do not show overlapping trash icon in the node's settings ([#9119](https://github.com/n8n-io/n8n/issues/9119)) ([c00150b](https://github.com/n8n-io/n8n/commit/c00150bb8ff88f8905536e5b4612c4c8cdd755a7))
+* **editor:** Open links from embedded chat in new tab ([#9121](https://github.com/n8n-io/n8n/issues/9121)) ([284de5d](https://github.com/n8n-io/n8n/commit/284de5d6c7af901ee11ecda4c80b3998fd6b5657))
+* **editor:** Render dates correctly in parameter hint ([#9089](https://github.com/n8n-io/n8n/issues/9089)) ([064e8f4](https://github.com/n8n-io/n8n/commit/064e8f4a1dc5afaa7ab21b770e3fbb9165805add))
+* **Execute Workflow Node:** Assign fallback pairedItem only if not present in output item and different length of input output  ([#9145](https://github.com/n8n-io/n8n/issues/9145)) ([a95e401](https://github.com/n8n-io/n8n/commit/a95e4016967b2ef443ad0ea07338ab830d5c0100))
+* Fix issue with Crowdstrike credential not working correctly ([#9108](https://github.com/n8n-io/n8n/issues/9108)) ([4c16000](https://github.com/n8n-io/n8n/commit/4c16000efadbfc5961ef2befd4f6501f9f2f0b2c))
+* **HTTP Request Node:** Tolerate header name being empty ([#9138](https://github.com/n8n-io/n8n/issues/9138)) ([f6c9dbf](https://github.com/n8n-io/n8n/commit/f6c9dbf7b850e9b665bbc72090a41c45d125f996))
+* **Respond to Webhook Node:** Continue on fail and error branch support ([#9115](https://github.com/n8n-io/n8n/issues/9115)) ([86a20f6](https://github.com/n8n-io/n8n/commit/86a20f656389474cb9fb26acf406de4e7af7b34c))
+
+
+### Features
+
+* **editor:** Add object keys that need bracket access to autocomplete ([#9088](https://github.com/n8n-io/n8n/issues/9088)) ([98bcd50](https://github.com/n8n-io/n8n/commit/98bcd50bab47e384ddcb6261aa91ba843cfa3f5a))
+* **Github Node:** Add option to get pull requests ([#9094](https://github.com/n8n-io/n8n/issues/9094)) ([4d9000b](https://github.com/n8n-io/n8n/commit/4d9000bf27df5a2188a2d4a07d8e1e6a04f701d9))
+* **Google Gemini Chat Model Node:** Add support for new Google Gemini models ([#9130](https://github.com/n8n-io/n8n/issues/9130)) ([f1215cd](https://github.com/n8n-io/n8n/commit/f1215cdb6bdfb18b7a170286c2d8e8c0deb617ff))
+* **Summarize Node:** Option to continue when field to summarize can't be found in any items ([#9118](https://github.com/n8n-io/n8n/issues/9118)) ([d7abc30](https://github.com/n8n-io/n8n/commit/d7abc3010463ad21a9c162430485ebbb29d378b1))
+
+
+
+# [1.37.0](https://github.com/n8n-io/n8n/compare/n8n@1.36.0...n8n@1.37.0) (2024-04-10)
+
+
+### Bug Fixes
+
+* **API:** Accept `settings.executionOrder` in workflow creation ([#9072](https://github.com/n8n-io/n8n/issues/9072)) ([0c90c7c](https://github.com/n8n-io/n8n/commit/0c90c7c8c1cde23c56b34fde264ea4e6ec0300b2))
+* **AWS Bedrock Chat Model Node:** Improve filtering of Bedrock models & fix Claude 3 ([#9085](https://github.com/n8n-io/n8n/issues/9085)) ([cfaab0b](https://github.com/n8n-io/n8n/commit/cfaab0b829864f0d4900f7b36559c0bb1b2075a4))
+* Continue on fail / error output support for chains and agents ([#9078](https://github.com/n8n-io/n8n/issues/9078)) ([f62800c](https://github.com/n8n-io/n8n/commit/f62800cd727ecd2b4a41fe6bbef411f8bc6f0a2e))
+* **core:** Ensure `status` on Axios errors is available to the BE ([#9015](https://github.com/n8n-io/n8n/issues/9015)) ([744327c](https://github.com/n8n-io/n8n/commit/744327c20d909a0ccc2938dff8847d2b4756d9af))
+* **core:** Ensure only leader handles waiting executions ([#9014](https://github.com/n8n-io/n8n/issues/9014)) ([217b07d](https://github.com/n8n-io/n8n/commit/217b07d735feab535916cff4baa72e500e3b80ee))
+* **core:** Ensure TTL safeguard for test webhooks applies only to multi-main setup ([#9062](https://github.com/n8n-io/n8n/issues/9062)) ([ff81de3](https://github.com/n8n-io/n8n/commit/ff81de3313e8fd612104830b1b541b9dda392bb0))
+* **core:** Fix `isLeader` check in `WaitTracker` constructor ([#9100](https://github.com/n8n-io/n8n/issues/9100)) ([c2f4d7d](https://github.com/n8n-io/n8n/commit/c2f4d7d7966db9fd7f7b19772757c71d493bf647))
+* **core:** Remove binary data when deleting executions by filter ([#9056](https://github.com/n8n-io/n8n/issues/9056)) ([7bf0f90](https://github.com/n8n-io/n8n/commit/7bf0f900f193545c37849333e2964c89d96e25b2))
+* **editor:** Add fallback for expression resolution in multi-output case ([#9045](https://github.com/n8n-io/n8n/issues/9045)) ([bcd39a1](https://github.com/n8n-io/n8n/commit/bcd39a110b4ca4c35b66340cec240dfc0c83132c))
+* **editor:** Allow pinning of AI root nodes ([#9060](https://github.com/n8n-io/n8n/issues/9060)) ([32df171](https://github.com/n8n-io/n8n/commit/32df17104c13b713a36057ab9aaeef3fd03d9d24))
+* **editor:** Canvas showing error toast when clicking outside of "import workflow by url" modal ([#9001](https://github.com/n8n-io/n8n/issues/9001)) ([f6ce81e](https://github.com/n8n-io/n8n/commit/f6ce81e7da74f80f81909b24f9675f7abcdb4265))
+* **editor:** Connecting nodes to triggers when adding them together ([#9042](https://github.com/n8n-io/n8n/issues/9042)) ([f214362](https://github.com/n8n-io/n8n/commit/f2143620bab7c222e84e6cc0f5904805944e7163))
+* **editor:** Drop outgoing connections on order changed event for nodes with dynamic outputs ([#9055](https://github.com/n8n-io/n8n/issues/9055)) ([3dd70a1](https://github.com/n8n-io/n8n/commit/3dd70a17e27fd312f949fb2fcccc0bf50ce9302e))
+* **editor:** Expand range of allowed characters in expressions ([#9083](https://github.com/n8n-io/n8n/issues/9083)) ([3bcfef9](https://github.com/n8n-io/n8n/commit/3bcfef95f6c9e08b4429fd6b3fb9a67d7075b1aa))
+* **editor:** Fix displaying logic of execution retry button ([#9061](https://github.com/n8n-io/n8n/issues/9061)) ([92f6cbf](https://github.com/n8n-io/n8n/commit/92f6cbfba36d1238e5b981c018b2a5365aabfe9c))
+* **editor:** Fix execution with wait node ([#9051](https://github.com/n8n-io/n8n/issues/9051)) ([db4f8d4](https://github.com/n8n-io/n8n/commit/db4f8d49a3a87c4e893bb1496b0bc74bd804de64))
+* **editor:** Fix issue with case insensitive tags ([#9071](https://github.com/n8n-io/n8n/issues/9071)) ([caea27d](https://github.com/n8n-io/n8n/commit/caea27dbb599fb81aee59e87236463127bcfab8c))
+* **editor:** Fix issues in dark mode ([#9068](https://github.com/n8n-io/n8n/issues/9068)) ([7467aa3](https://github.com/n8n-io/n8n/commit/7467aa30e6c2a226cb9fee5f5d82fbd01db23e9e))
+* **editor:** Issue showing Auth2 callback section when all properties are overriden ([#8999](https://github.com/n8n-io/n8n/issues/8999)) ([dff8f7a](https://github.com/n8n-io/n8n/commit/dff8f7ac94e0d215f4e2a204774857d240e7f79b))
+* **editor:** Make share modal content scrollable ([#9025](https://github.com/n8n-io/n8n/issues/9025)) ([ec9fe98](https://github.com/n8n-io/n8n/commit/ec9fe98a357ad75349c6f64006ebbff7c95ff0fe))
+* **editor:** Make Webhook node pinnable ([#9047](https://github.com/n8n-io/n8n/issues/9047)) ([042aa62](https://github.com/n8n-io/n8n/commit/042aa62fc2ddae2b9d39f4a92068c10bfe5bec14))
+* **editor:** Prevent saving workflow while another save is in progress ([#9048](https://github.com/n8n-io/n8n/issues/9048)) ([3c9a1d2](https://github.com/n8n-io/n8n/commit/3c9a1d2da3aa7614ce1beec07654a8b2423f99bc))
+* **editor:** Rerun failed nodes in manual executions ([#9050](https://github.com/n8n-io/n8n/issues/9050)) ([bc6575a](https://github.com/n8n-io/n8n/commit/bc6575afbb106ea22ae1ff7b1b9057ccb665a964))
+* **editor:** UX improvements to mfa setup modal ([#9059](https://github.com/n8n-io/n8n/issues/9059)) ([4ac02dd](https://github.com/n8n-io/n8n/commit/4ac02dd5f46c78398186e94faabb2f8884c0f2ae))
+* Fix missing input panel in node details view ([#9043](https://github.com/n8n-io/n8n/issues/9043)) ([71c54cb](https://github.com/n8n-io/n8n/commit/71c54cba52f5de26bd9c086390313c211ad0e574))
+* **HTTP Request Node:** Duplicate key names support for form data  ([#9040](https://github.com/n8n-io/n8n/issues/9040)) ([3e231db](https://github.com/n8n-io/n8n/commit/3e231dbfe67b6dbe87f383daa8a52c5ae02edd92))
+* **MySQL Node:** Query Parameters parse string to number ([#9011](https://github.com/n8n-io/n8n/issues/9011)) ([610ead9](https://github.com/n8n-io/n8n/commit/610ead9a3851eeee246313669d0ed9049c736a1a))
+* **Summarization Chain Node:** 'Final Prompt to Combine' and 'Individual Summary Prompt' options ([#8391](https://github.com/n8n-io/n8n/issues/8391)) ([e47e4bf](https://github.com/n8n-io/n8n/commit/e47e4bf67152fae727374974fecf294aff56c257))
+* Workflows executed from other workflows not stopping ([#9010](https://github.com/n8n-io/n8n/issues/9010)) ([0ac9851](https://github.com/n8n-io/n8n/commit/0ac985133be546f068f7f25b340c3bfdecadc08e))
+
+
+### Features
+
+* Add credential update and delete events to log streaming ([#9026](https://github.com/n8n-io/n8n/issues/9026)) ([f4f0a36](https://github.com/n8n-io/n8n/commit/f4f0a36fe1f8a792e3581849a0d8a78ce1e6f21a))
+* Allow workflow execution even if it has errors ([#9037](https://github.com/n8n-io/n8n/issues/9037)) ([eaaefd7](https://github.com/n8n-io/n8n/commit/eaaefd76da6e9dbb86568aafdcb48b183b41fe40))
+* Append item index suffix to an error message, if provided, and node has many input items ([#9070](https://github.com/n8n-io/n8n/issues/9070)) ([5793e56](https://github.com/n8n-io/n8n/commit/5793e5644aaf40abe620d8a0a4f76856b6c5ff83))
+* **core:** Improve Langsmith traces for AI executions ([#9081](https://github.com/n8n-io/n8n/issues/9081)) ([936682e](https://github.com/n8n-io/n8n/commit/936682eeaae5f7cdbdb2afbf9c3bf9d85bcd964c))
+* **core:** Prevent session hijacking ([#9057](https://github.com/n8n-io/n8n/issues/9057)) ([2826104](https://github.com/n8n-io/n8n/commit/28261047c399be0cc9c8d30015cc42b9410cebce))
+* **Email Trigger (IMAP) Node:** Migrate from `imap-simple` to `@n8n/imap` ([#8899](https://github.com/n8n-io/n8n/issues/8899)) ([9f87cc2](https://github.com/n8n-io/n8n/commit/9f87cc25a020e03710bd64835c6547f9f12c1fe2))
+* **JWT Node:** New node ([#9005](https://github.com/n8n-io/n8n/issues/9005)) ([0a9f6b3](https://github.com/n8n-io/n8n/commit/0a9f6b3de8f5548700e736b7d5f1d31c229595f5))
+* **Postgres Node:** Options keepAlive and keepAliveInitialDelayMillis ([#9067](https://github.com/n8n-io/n8n/issues/9067)) ([58518b6](https://github.com/n8n-io/n8n/commit/58518b684b6c9495aa6efd0e815a8d01f102bbe4))
+
+
+
+# [1.36.0](https://github.com/n8n-io/n8n/compare/n8n@1.35.0...n8n@1.36.0) (2024-04-03)
+
+
+### Bug Fixes
+
+* **editor:**  Issue with JSON editor getting cut off ([#9000](https://github.com/n8n-io/n8n/issues/9000)) ([4668db2](https://github.com/n8n-io/n8n/commit/4668db20fb6a47b4e417ab8f31407d13af9c70f8))
+* **editor:** Fix canvas selection for touch devices that use mouse ([#9036](https://github.com/n8n-io/n8n/issues/9036)) ([286fa5c](https://github.com/n8n-io/n8n/commit/286fa5cd7eb5052d2c166145447f53b33174b62c))
+* **editor:** Fix execution debug button ([#9018](https://github.com/n8n-io/n8n/issues/9018)) ([aac77e1](https://github.com/n8n-io/n8n/commit/aac77e1668d2b3fd96c2e77b4626b7b0ae7bf233))
+* **editor:** Hover and active states not showing in execution list on dark mode ([#9002](https://github.com/n8n-io/n8n/issues/9002)) ([bead7eb](https://github.com/n8n-io/n8n/commit/bead7eb840b3c6c074364c6a44d001ea561fee1f))
+* **editor:** UI enhancements and fixes for expression inputs ([#8996](https://github.com/n8n-io/n8n/issues/8996)) ([8788e2a](https://github.com/n8n-io/n8n/commit/8788e2a35bed261e13da5c92ee31bbb414d019a4))
+* Prevent chat modal opening on 'Test workflow' click ([#9009](https://github.com/n8n-io/n8n/issues/9009)) ([3fd97e4](https://github.com/n8n-io/n8n/commit/3fd97e4c7299928a498e359b16f6f21eed9f0878))
+* Stop listening button not working in NDV ([#9023](https://github.com/n8n-io/n8n/issues/9023)) ([02219dd](https://github.com/n8n-io/n8n/commit/02219dde2fa3c16145c3985272567b334b69dd54))
+
+
+### Features
+
+* Add Salesforce Trigger Node ([#8920](https://github.com/n8n-io/n8n/issues/8920)) ([571b613](https://github.com/n8n-io/n8n/commit/571b6135dd41ef983a822f210c09e3623e8ee605))
+* Add Twilio Trigger Node ([#8859](https://github.com/n8n-io/n8n/issues/8859)) ([c204995](https://github.com/n8n-io/n8n/commit/c204995d9c5683d92cc7c7bd89c530ad3318b06d))
+* **core:** Introduce AWS secrets manager as external secrets store ([#8982](https://github.com/n8n-io/n8n/issues/8982)) ([2aab78b](https://github.com/n8n-io/n8n/commit/2aab78b058f46c7b1692503a2b3b6bfb8939c128))
+* **core:** Rate-limit login endpoint to mitigate brute force password guessing attacks ([#9028](https://github.com/n8n-io/n8n/issues/9028)) ([a6446fe](https://github.com/n8n-io/n8n/commit/a6446fe057749536344c4170395ce149340cd889))
+* **editor:** Update templates links ([#9024](https://github.com/n8n-io/n8n/issues/9024)) ([4619dec](https://github.com/n8n-io/n8n/commit/4619dec285da14bb097df225a5682ed8babd82dd))
+* **Webhook Node:** Overhaul ([#8889](https://github.com/n8n-io/n8n/issues/8889)) ([e84c27c](https://github.com/n8n-io/n8n/commit/e84c27c0cebd6fba135298ea18844045dcf55b4c))
+
+
+
+# [1.35.0](https://github.com/n8n-io/n8n/compare/n8n@1.33.0...n8n@1.35.0) (2024-03-27)
+
+
+### Bug Fixes
+
+* **Anthropic Chat Model Node:** Fix detection of chat models in docker build & add support Claude Haiku ([#8953](https://github.com/n8n-io/n8n/issues/8953)) ([76041b8](https://github.com/n8n-io/n8n/commit/76041b8587fc5943ee80338774125d1fabb8e927))
+* Chat Trigger exclude summarization node from valid ai nodes ([#8875](https://github.com/n8n-io/n8n/issues/8875)) ([4861556](https://github.com/n8n-io/n8n/commit/4861556a1c7da643fdc924f7f65dc89a7453744a))
+* **Cohere Model Node:** Fix issue with credential test ([#8916](https://github.com/n8n-io/n8n/issues/8916)) ([4f0b52c](https://github.com/n8n-io/n8n/commit/4f0b52c45d1f165159787197fd41138059b13db6))
+* **core:** Add missing `nodeCause` to paired item error ([#8976](https://github.com/n8n-io/n8n/issues/8976)) ([19d9e71](https://github.com/n8n-io/n8n/commit/19d9e71cb90d7085256496df8325564c13db3af4))
+* **core:** Assign credential ownership correctly in source control import ([#8955](https://github.com/n8n-io/n8n/issues/8955)) ([260bc07](https://github.com/n8n-io/n8n/commit/260bc07ca9484b6e82cc9dc82c68a6c1c58f4a49))
+* **core:** Ensure the generic OAuth2 API credential uses the OAuth2 credential test ([#8941](https://github.com/n8n-io/n8n/issues/8941)) ([079a114](https://github.com/n8n-io/n8n/commit/079a1147d41442bb7269d5e9da30e45019438ba2))
+* **core:** Improve handling of invalid objects in `cleanupParameterData` (no-chanhelog) ([#8910](https://github.com/n8n-io/n8n/issues/8910)) ([33ab781](https://github.com/n8n-io/n8n/commit/33ab781aef1b9107f9ecc7ec22c9b264b4eaae63))
+* **core:** Remove HTTP body for GET, HEAD, and OPTIONS requests ([#3621](https://github.com/n8n-io/n8n/issues/3621)) ([d85d0ec](https://github.com/n8n-io/n8n/commit/d85d0ecf45e8f256536bdd7cad6aab85971e8e43))
+* **core:** Stringify all Luxon DateTimes in cleanupParameterData ([#8959](https://github.com/n8n-io/n8n/issues/8959)) ([1fb0dd4](https://github.com/n8n-io/n8n/commit/1fb0dd4f1c074ad6462d42bea030e3bafecef2ad))
+* **core:** Update `follow-redirects` to address CVE-2024-28849 ([#8902](https://github.com/n8n-io/n8n/issues/8902)) ([a10120f](https://github.com/n8n-io/n8n/commit/a10120f74efa4c636f26eafc996e71bd372f8ee8))
+* **editor:** Add proper scroll to Environments push modal ([#8883](https://github.com/n8n-io/n8n/issues/8883)) ([bcbff76](https://github.com/n8n-io/n8n/commit/bcbff760553058f8fb43b379130db0cd064fd869))
+* **editor:** Fix accidental IDE code addition ([#8971](https://github.com/n8n-io/n8n/issues/8971)) ([117b57c](https://github.com/n8n-io/n8n/commit/117b57ccc5e3904d6ffc748d198d331f3008bcd3))
+* **editor:** Fix an issue with an empty chat response if not in `output` property ([#8913](https://github.com/n8n-io/n8n/issues/8913)) ([024be62](https://github.com/n8n-io/n8n/commit/024be62693e96020c284116110944e90c7bcf1a8))
+* **editor:** Fix design system component props ([#8923](https://github.com/n8n-io/n8n/issues/8923)) ([7176cd1](https://github.com/n8n-io/n8n/commit/7176cd1407e028ba8c543179b128c7e2ac9c0369))
+* **editor:** Fix opening of chat window when executing a child node ([#8789](https://github.com/n8n-io/n8n/issues/8789)) ([5f53d76](https://github.com/n8n-io/n8n/commit/5f53d76e39395a8effdfeba0677f333b509ec8c8))
+* **editor:** Fix source control docs link in add workflow button tooltip ([#8891](https://github.com/n8n-io/n8n/issues/8891)) ([a92d8bf](https://github.com/n8n-io/n8n/commit/a92d8bfc6e2fcc4bf79fc3f6564fdb864ccd3f41))
+* **editor:** Improve expression editor performance by removing watchers ([#8900](https://github.com/n8n-io/n8n/issues/8900)) ([a5261d6](https://github.com/n8n-io/n8n/commit/a5261d6ebb8fa4ac8796b04920a4fa4bc43bb397))
+* **editor:** Make inputs in the filter component regular inputs by default ([#8980](https://github.com/n8n-io/n8n/issues/8980)) ([295b650](https://github.com/n8n-io/n8n/commit/295b650fb8bd423eba506bc09a5746451db2c085))
+* **editor:** Nodes connectors improvements ([#8945](https://github.com/n8n-io/n8n/issues/8945)) ([264f918](https://github.com/n8n-io/n8n/commit/264f918d9720e2a11ec011993df1e7a4cb776882))
+* **editor:** Remove `isOwner` from IUser interface ([#8888](https://github.com/n8n-io/n8n/issues/8888)) ([6955e89](https://github.com/n8n-io/n8n/commit/6955e8991ca2ec13e6298c3c18ec2b28853ceda4))
+* **editor:** Use bracket notation for all invalid identifiers in expressions ([#8933](https://github.com/n8n-io/n8n/issues/8933)) ([0e4216d](https://github.com/n8n-io/n8n/commit/0e4216d7afb6a09547ae575fcfd13e9fac22b350))
+* **MySQL Node:** Set paired items correctly in single query batch mode ([#8940](https://github.com/n8n-io/n8n/issues/8940)) ([89df277](https://github.com/n8n-io/n8n/commit/89df277b80002f46d198d7b8bd3d81f5b815c116))
+* OpenAI Node function to preserve original tools after node execution ([#8872](https://github.com/n8n-io/n8n/issues/8872)) ([054a4fc](https://github.com/n8n-io/n8n/commit/054a4fce1a8163f2201efd846938b909c7d0e394))
+* Overhaul expression error messages related to paired item ([#8765](https://github.com/n8n-io/n8n/issues/8765)) ([45461c8](https://github.com/n8n-io/n8n/commit/45461c8cb57aa22697e58c6c52a25ab1d6d633d9))
+* **Pinecone Vector Store Node:** Fix vector store nodes execution issue ([#8968](https://github.com/n8n-io/n8n/issues/8968)) ([323b901](https://github.com/n8n-io/n8n/commit/323b9016c8c2409d5b72c6cc2fdb0cf6f2ba118b))
+* Validate custom tool names for forbidden chars ([#8878](https://github.com/n8n-io/n8n/issues/8878)) ([edce632](https://github.com/n8n-io/n8n/commit/edce632ee62fdb9485d1ed07ead7dd3c0d2afcf8))
+
+
+### Features
+
+* Add AI Error Debugging using OpenAI ([#8805](https://github.com/n8n-io/n8n/issues/8805)) ([948c383](https://github.com/n8n-io/n8n/commit/948c383999726278377f74987cd36ed6a5b39b7b))
+* Add Onedrive Trigger Node ([#8742](https://github.com/n8n-io/n8n/issues/8742)) ([ff8dd4e](https://github.com/n8n-io/n8n/commit/ff8dd4e604216203800d9b12fd5f1105356cf03e))
+* **core:** Add support for SQLite connection pooling ([#8722](https://github.com/n8n-io/n8n/issues/8722)) ([c4c319d](https://github.com/n8n-io/n8n/commit/c4c319d7cfb30772cca248a0039fd8e2b1c99eb7))
+* **editor:** Add missing extension methods for expressions ([#8845](https://github.com/n8n-io/n8n/issues/8845)) ([5e84c2a](https://github.com/n8n-io/n8n/commit/5e84c2ab89c7d0e4365b32b1c94a9c10cea56cb9))
+* **editor:** Add type information to autocomplete dropdown ([#8843](https://github.com/n8n-io/n8n/issues/8843)) ([d7bfd45](https://github.com/n8n-io/n8n/commit/d7bfd45333cc9780ae5f1424f33de2093bd1a2f9))
+* **editor:** Block the frontend when trying to access n8n from another host over http ([#8906](https://github.com/n8n-io/n8n/issues/8906)) ([669bd83](https://github.com/n8n-io/n8n/commit/669bd830e9b1b0f986d8a8b4525d0bdc3e3c0bd7))
+* **editor:** Refactor expression editors and mixins to composition API ([#8894](https://github.com/n8n-io/n8n/issues/8894)) ([0c179e4](https://github.com/n8n-io/n8n/commit/0c179e4e511e4e6075d390afc025c93630ef3241))
+* **editor:** Release `@n8n/chat@0.9.1` ([#8918](https://github.com/n8n-io/n8n/issues/8918)) ([e0c303c](https://github.com/n8n-io/n8n/commit/e0c303c6c10145a2ef72daaf4142315cf65c839a))
+* **editor:** Show tip when user can type dot after an expression ([#8931](https://github.com/n8n-io/n8n/issues/8931)) ([160dfd3](https://github.com/n8n-io/n8n/commit/160dfd383d79fc44be79e5a071dc5f6c6b67469b))
+* Fetch user cloud role and pass it on in website links ([#8942](https://github.com/n8n-io/n8n/issues/8942)) ([666867a](https://github.com/n8n-io/n8n/commit/666867a236bce519dbd1a8f9162d4ced1b80d567))
+* Telemetry include basic llm optional promps, trigger on save workflow event ([#8981](https://github.com/n8n-io/n8n/issues/8981)) ([335f363](https://github.com/n8n-io/n8n/commit/335f363ca16814d6ca1a8a92fc9da145b8eed990))
+
+
+
+## [1.34.2](https://github.com/n8n-io/n8n/compare/n8n@1.34.1...n8n@1.34.2) (2024-03-26)
+
+
+### Bug Fixes
+
+* **editor:** Nodes connectors improvements ([#8945](https://github.com/n8n-io/n8n/issues/8945)) ([6310e36](https://github.com/n8n-io/n8n/commit/6310e36c8eaf331b4116666677a82b9a75f862dc))
+* **Pinecone Vector Store Node:** Fix vector store nodes execution issue ([#8968](https://github.com/n8n-io/n8n/issues/8968)) ([9bd14c0](https://github.com/n8n-io/n8n/commit/9bd14c053c8b5410a49d3a5f3354e5ed0feed3b3))
+
+
+
+## [1.34.1](https://github.com/n8n-io/n8n/compare/n8n@1.34.0...n8n@1.34.1) (2024-03-25)
+
+
+### Bug Fixes
+
+* **Anthropic Chat Model Node:** Fix detection of chat models in docker build & add support Claude Haiku ([#8953](https://github.com/n8n-io/n8n/issues/8953)) ([becc804](https://github.com/n8n-io/n8n/commit/becc8045646bfd6ace40895288f5f5a323c7fc8e))
+* **core:** Ensure the generic OAuth2 API credential uses the OAuth2 credential test ([#8941](https://github.com/n8n-io/n8n/issues/8941)) ([578f01a](https://github.com/n8n-io/n8n/commit/578f01a02ccdef014938dfd3194bae182e02442a))
+* **core:** Stringify all Luxon DateTimes in cleanupParameterData ([#8959](https://github.com/n8n-io/n8n/issues/8959)) ([58d9983](https://github.com/n8n-io/n8n/commit/58d9983d0efd50d01d8406b949a4e7a3db63e465))
+* **editor:** Fix opening of chat window when executing a child node ([#8789](https://github.com/n8n-io/n8n/issues/8789)) ([e695927](https://github.com/n8n-io/n8n/commit/e69592784965f24a9c061f9a10bae58a72d2cc69))
+* **editor:** Use bracket notation for all invalid identifiers in expressions ([#8933](https://github.com/n8n-io/n8n/issues/8933)) ([1316f2d](https://github.com/n8n-io/n8n/commit/1316f2d682d847d314e0175781a4fe7561205324))
+* **MySQL Node:** Set paired items correctly in single query batch mode ([#8940](https://github.com/n8n-io/n8n/issues/8940)) ([5d129ba](https://github.com/n8n-io/n8n/commit/5d129baa2df3ff9cb2a608d4162e645e5dc64ae6))
+* Overhaul expression error messages related to paired item ([#8765](https://github.com/n8n-io/n8n/issues/8765)) ([09654f9](https://github.com/n8n-io/n8n/commit/09654f9dcca77710d91b3a6543ce50fb933eb870))
+
+
+
+# [1.34.0](https://github.com/n8n-io/n8n/compare/n8n@1.33.0...n8n@1.34.0) (2024-03-20)
+
+
+### Bug Fixes
+
+* Chat Trigger exclude summarization node from valid ai nodes ([#8875](https://github.com/n8n-io/n8n/issues/8875)) ([4861556](https://github.com/n8n-io/n8n/commit/4861556a1c7da643fdc924f7f65dc89a7453744a))
+* **Cohere Model Node:** Fix issue with credential test ([#8916](https://github.com/n8n-io/n8n/issues/8916)) ([4f0b52c](https://github.com/n8n-io/n8n/commit/4f0b52c45d1f165159787197fd41138059b13db6))
+* **core:** Improve handling of invalid objects in `cleanupParameterData` (no-chanhelog) ([#8910](https://github.com/n8n-io/n8n/issues/8910)) ([33ab781](https://github.com/n8n-io/n8n/commit/33ab781aef1b9107f9ecc7ec22c9b264b4eaae63))
+* **core:** Remove HTTP body for GET, HEAD, and OPTIONS requests ([#3621](https://github.com/n8n-io/n8n/issues/3621)) ([d85d0ec](https://github.com/n8n-io/n8n/commit/d85d0ecf45e8f256536bdd7cad6aab85971e8e43))
+* **core:** Update `follow-redirects` to address CVE-2024-28849 ([#8902](https://github.com/n8n-io/n8n/issues/8902)) ([a10120f](https://github.com/n8n-io/n8n/commit/a10120f74efa4c636f26eafc996e71bd372f8ee8))
+* **editor:** Add proper scroll to Environments push modal ([#8883](https://github.com/n8n-io/n8n/issues/8883)) ([bcbff76](https://github.com/n8n-io/n8n/commit/bcbff760553058f8fb43b379130db0cd064fd869))
+* **editor:** Fix an issue with an empty chat response if not in `output` property ([#8913](https://github.com/n8n-io/n8n/issues/8913)) ([024be62](https://github.com/n8n-io/n8n/commit/024be62693e96020c284116110944e90c7bcf1a8))
+* **editor:** Fix design system component props ([#8923](https://github.com/n8n-io/n8n/issues/8923)) ([7176cd1](https://github.com/n8n-io/n8n/commit/7176cd1407e028ba8c543179b128c7e2ac9c0369))
+* **editor:** Fix source control docs link in add workflow button tooltip ([#8891](https://github.com/n8n-io/n8n/issues/8891)) ([a92d8bf](https://github.com/n8n-io/n8n/commit/a92d8bfc6e2fcc4bf79fc3f6564fdb864ccd3f41))
+* **editor:** Improve expression editor performance by removing watchers ([#8900](https://github.com/n8n-io/n8n/issues/8900)) ([a5261d6](https://github.com/n8n-io/n8n/commit/a5261d6ebb8fa4ac8796b04920a4fa4bc43bb397))
+* **editor:** Remove `isOwner` from IUser interface ([#8888](https://github.com/n8n-io/n8n/issues/8888)) ([6955e89](https://github.com/n8n-io/n8n/commit/6955e8991ca2ec13e6298c3c18ec2b28853ceda4))
+* OpenAI Node function to preserve original tools after node execution ([#8872](https://github.com/n8n-io/n8n/issues/8872)) ([054a4fc](https://github.com/n8n-io/n8n/commit/054a4fce1a8163f2201efd846938b909c7d0e394))
+* Validate custom tool names for forbidden chars ([#8878](https://github.com/n8n-io/n8n/issues/8878)) ([edce632](https://github.com/n8n-io/n8n/commit/edce632ee62fdb9485d1ed07ead7dd3c0d2afcf8))
+
+
+### Features
+
+* Add AI Error Debugging using OpenAI ([#8805](https://github.com/n8n-io/n8n/issues/8805)) ([948c383](https://github.com/n8n-io/n8n/commit/948c383999726278377f74987cd36ed6a5b39b7b))
+* Add Onedrive Trigger Node ([#8742](https://github.com/n8n-io/n8n/issues/8742)) ([ff8dd4e](https://github.com/n8n-io/n8n/commit/ff8dd4e604216203800d9b12fd5f1105356cf03e))
+* **core:** Add support for SQLite connection pooling ([#8722](https://github.com/n8n-io/n8n/issues/8722)) ([c4c319d](https://github.com/n8n-io/n8n/commit/c4c319d7cfb30772cca248a0039fd8e2b1c99eb7))
+* **editor:** Add missing extension methods for expressions ([#8845](https://github.com/n8n-io/n8n/issues/8845)) ([5e84c2a](https://github.com/n8n-io/n8n/commit/5e84c2ab89c7d0e4365b32b1c94a9c10cea56cb9))
+* **editor:** Add type information to autocomplete dropdown ([#8843](https://github.com/n8n-io/n8n/issues/8843)) ([d7bfd45](https://github.com/n8n-io/n8n/commit/d7bfd45333cc9780ae5f1424f33de2093bd1a2f9))
+* **editor:** Block the frontend when trying to access n8n from another host over http ([#8906](https://github.com/n8n-io/n8n/issues/8906)) ([669bd83](https://github.com/n8n-io/n8n/commit/669bd830e9b1b0f986d8a8b4525d0bdc3e3c0bd7))
+* **editor:** Refactor expression editors and mixins to composition API ([#8894](https://github.com/n8n-io/n8n/issues/8894)) ([0c179e4](https://github.com/n8n-io/n8n/commit/0c179e4e511e4e6075d390afc025c93630ef3241))
+* **editor:** Release `@n8n/chat@0.9.1` ([#8918](https://github.com/n8n-io/n8n/issues/8918)) ([e0c303c](https://github.com/n8n-io/n8n/commit/e0c303c6c10145a2ef72daaf4142315cf65c839a))
+
+# [1.33.0](https://github.com/n8n-io/n8n/compare/n8n@1.32.0...n8n@1.33.0) (2024-03-13)
+
+
+### Bug Fixes
+
+* **core:** Always register webhooks on startup ([#8830](https://github.com/n8n-io/n8n/issues/8830)) ([c6f6254](https://github.com/n8n-io/n8n/commit/c6f6254c0e5197d4c0ba19aa52a1714e991a33b2))
+* **core:** Add fallback for pairedItem info in runPartialWorkflow ([#8842](https://github.com/n8n-io/n8n/issues/8842)) ([bd465d3](https://github.com/n8n-io/n8n/commit/bd465d394aa9eb74a127748ebda1fc84a158d236))
+* **core:** Display readable error when manual executions contains large payload ([#8834](https://github.com/n8n-io/n8n/issues/8834)) ([261b9c7](https://github.com/n8n-io/n8n/commit/261b9c73d6fbb06610839b80bb1f89125893b89b))
+* **core:** Ignore semver range when upgrading comunity packages ([#8863](https://github.com/n8n-io/n8n/issues/8863)) ([11173a0](https://github.com/n8n-io/n8n/commit/11173a011468160999e2c3f4a380741edf3ba37e))
+* **editor:** Allow sharee to use workflows with http request node without credential access ([#8841](https://github.com/n8n-io/n8n/issues/8841)) ([bde4c6c](https://github.com/n8n-io/n8n/commit/bde4c6c7a19b7275cabbbc3e4d0c5ec14be54769))
+* **editor:** Disable pinning for root nodes from canvas ([#8848](https://github.com/n8n-io/n8n/issues/8848)) ([e10fa37](https://github.com/n8n-io/n8n/commit/e10fa379d3212fd9fd964d8468add07b257af7e1))
+* **editor:** Fix workflow card open action ([#8839](https://github.com/n8n-io/n8n/issues/8839)) ([dd40570](https://github.com/n8n-io/n8n/commit/dd405700568acdc893358ef239e8f8637da66307))
+* **editor:** Make inputs in the filter component expressions by default ([#8784](https://github.com/n8n-io/n8n/issues/8784)) ([6e2aa40](https://github.com/n8n-io/n8n/commit/6e2aa405fcdff3f9b1f75d9e22719f6c0c500aa9))
+* **editor:** Improve filter component error handling ([#8832](https://github.com/n8n-io/n8n/issues/8832)) ([76fe960](https://github.com/n8n-io/n8n/commit/76fe960a7613b51a95720504537112fba13bb1d6))
+* **GitHub Document Loader Node:** Fix issue with ignore paths not working correctly ([#8798](https://github.com/n8n-io/n8n/issues/8798)) ([c8d589c](https://github.com/n8n-io/n8n/commit/c8d589cce74dc1267d8058fc8f0b61b516969b79))
+* **Notion Node:** Regex for block id ([#8860](https://github.com/n8n-io/n8n/issues/8860)) ([a1f6c57](https://github.com/n8n-io/n8n/commit/a1f6c570d63a8acd7b623fb039bfdbcd017dc022))
+* **OpenAI Node:** text > message hide tools connector for unsupported models ([#8866](https://github.com/n8n-io/n8n/issues/8866)) ([cef7c24](https://github.com/n8n-io/n8n/commit/cef7c24b7779000386e45dae4c3ee25dd2d6251b))
+
+
+### Features
+
+* **editor:** Add more AI node info to telemetry ([#8827](https://github.com/n8n-io/n8n/issues/8827)) ([ed6dc86](https://github.com/n8n-io/n8n/commit/ed6dc86d60e30ed6e5992e0bd1b27e8cd59d689b))
+* **editor:** Add sections to autocomplete dropdown ([#8720](https://github.com/n8n-io/n8n/issues/8720)) ([9b4618d](https://github.com/n8n-io/n8n/commit/9b4618dd5e58337b73e8804f11d7aca9a9bf1dc3))
+* **editor:** Help users discover expressions when using drag n drop ([#8869](https://github.com/n8n-io/n8n/issues/8869)) ([e78cc2d](https://github.com/n8n-io/n8n/commit/e78cc2d8d2d22bdea30af45edd8e319d479deb55))
+* **editor:** Improve errors in output panel ([#8644](https://github.com/n8n-io/n8n/issues/8644)) ([5301323](https://github.com/n8n-io/n8n/commit/5301323906663a64a3042bd2f8946e5f1e3f6293))
+* **Pinecone Vector Store Node:** Support serverless environments ([#8849](https://github.com/n8n-io/n8n/issues/8849)) ([a136a73](https://github.com/n8n-io/n8n/commit/a136a73e4e15b5d2d1c11ef90caec75d0318f829))
+* **Wordpress Node:** Support WordPress pages ([#8852](https://github.com/n8n-io/n8n/issues/8852)) ([a678e85](https://github.com/n8n-io/n8n/commit/a678e8570b72514b0b5da6fcac4da5534d05fee8))
+
+
+
+# [1.32.0](https://github.com/n8n-io/n8n/compare/n8n@1.31.0...n8n@1.32.0) (2024-03-06)
+
+
+### Bug Fixes
+
+* AI agents, throw error on duplicate names in dynamic tools ([#8766](https://github.com/n8n-io/n8n/issues/8766)) ([75e4df1](https://github.com/n8n-io/n8n/commit/75e4df138fc103a3370239e906b9e600dc14c835))
+* **Basic LLM Chain Node:** Fix retrieving of prompt parameter for v1.3 of the node ([#8817](https://github.com/n8n-io/n8n/issues/8817)) ([82f66c8](https://github.com/n8n-io/n8n/commit/82f66c87e0e6969535559aaa879fe1f66c6ff31f))
+* **editor:** Fix NDV output tabs resetting on any click ([#8808](https://github.com/n8n-io/n8n/issues/8808)) ([c7c1767](https://github.com/n8n-io/n8n/commit/c7c17673cbdffd328032c9ec09be17c1f9018a4e))
+* **editor:** Fix opening of node creator for sub-nodes connection hint link ([#8809](https://github.com/n8n-io/n8n/issues/8809)) ([df064af](https://github.com/n8n-io/n8n/commit/df064af6451cae0d5e389abae98fd9516b448272))
+* **editor:** Fix retrieving of messages from memory in chat modal ([#8807](https://github.com/n8n-io/n8n/issues/8807)) ([bfda8ea](https://github.com/n8n-io/n8n/commit/bfda8ead0c449b262d57f14c1e8a077d21bac441))
+* **editor:** Set correct type for right input in filter component ([#8771](https://github.com/n8n-io/n8n/issues/8771)) ([5d54663](https://github.com/n8n-io/n8n/commit/5d5466343e61125c0682d65a6829cbaf816d5a90))
+* **editor:** Update assignment hint when user hovers table row ([#8782](https://github.com/n8n-io/n8n/issues/8782)) ([8c993aa](https://github.com/n8n-io/n8n/commit/8c993aa59dd6712703d5cc0a84949b0fa7dd874a))
+* **editor:** Upgrade sanitize-html to address CVE-2024-21501 ([#8816](https://github.com/n8n-io/n8n/issues/8816)) ([a3e9e3d](https://github.com/n8n-io/n8n/commit/a3e9e3db62f9794fe4b3ae414a2d252edb6196aa))
+* **Google Drive Node:** Add supportsAllDrives: true to update and download ([#8786](https://github.com/n8n-io/n8n/issues/8786)) ([11a5331](https://github.com/n8n-io/n8n/commit/11a5331e038fc383e454230dd9996015d7ce9b16))
+* **HubSpot Node:** Include properties for contact and deal in getAll operation ([#8772](https://github.com/n8n-io/n8n/issues/8772)) ([08e2b06](https://github.com/n8n-io/n8n/commit/08e2b068fb241b3e44eebbc8d6053603d977ca32))
+* **n8n Form Trigger Node:** Do not open pop up when data is pinned in trigger ([#8781](https://github.com/n8n-io/n8n/issues/8781)) ([0481e6e](https://github.com/n8n-io/n8n/commit/0481e6e6e7259cef5f4ac1c88dd0b45ef402f166))
+* **OpenAI Node:** Message text operation parameters case fix ([#8804](https://github.com/n8n-io/n8n/issues/8804)) ([e38e96b](https://github.com/n8n-io/n8n/commit/e38e96bbec4a5f355ab0a8bb87bad3787032e9c5))
+* Simplify Structured Output Parser wrapping and fix auto-fixing output parser ([#8778](https://github.com/n8n-io/n8n/issues/8778)) ([7d82dc1](https://github.com/n8n-io/n8n/commit/7d82dc1ea8c86c2a3575c3629b29af3cfb709f44))
+* **TheHive 5 Node:** The Hive - Custom fields are no longer working ([#8780](https://github.com/n8n-io/n8n/issues/8780)) ([961d6b9](https://github.com/n8n-io/n8n/commit/961d6b9266344e221e21a771546b49c0c13ea80c))
+* **Wait Node:** Change default wait period to 5 seconds ([#8783](https://github.com/n8n-io/n8n/issues/8783)) ([a521e7a](https://github.com/n8n-io/n8n/commit/a521e7a54d746189f098ae31fc06a92975dab5a9))
+
+
+### Features
+
+* Chat Memory Manager group messages option, on insert delete return confirmation of success instead of messages ([#8757](https://github.com/n8n-io/n8n/issues/8757)) ([246bfb9](https://github.com/n8n-io/n8n/commit/246bfb9ad4349cc17c2df64b357ddb96f794dfc5))
+* **core:** Update hashing strategy for JWTs ([#8810](https://github.com/n8n-io/n8n/issues/8810)) ([cdec7c9](https://github.com/n8n-io/n8n/commit/cdec7c9334ef83a7e667a8bd5a649f165402f4e5))
+* **Notion Node:** Continue on fail support ([#8788](https://github.com/n8n-io/n8n/issues/8788)) ([4850f6a](https://github.com/n8n-io/n8n/commit/4850f6a9cca3ae5b3a08e8b68d5404293367465a))
+* Track node errors on PostHog ([#8774](https://github.com/n8n-io/n8n/issues/8774)) ([35f6826](https://github.com/n8n-io/n8n/commit/35f6826150ed91c679c855aa4ce5d1f5d5e072bd))
+
+
+### Performance Improvements
+
+* Upgrade Vue ([#8806](https://github.com/n8n-io/n8n/issues/8806)) ([1600433](https://github.com/n8n-io/n8n/commit/16004331b13d5d4cf3d379ab9c98fc898db14eeb))
+
+
+
+# [1.31.0](https://github.com/n8n-io/n8n/compare/n8n@1.30.0...n8n@1.31.0) (2024-02-28)
+
+
+### Bug Fixes
+
+* **core:** Ensure `maxRedirects` is used for any http request defining it ([#8706](https://github.com/n8n-io/n8n/issues/8706)) ([246c988](https://github.com/n8n-io/n8n/commit/246c988b9373a838086f37e603ec2827cf849588))
+* **core:** Fix pairedItem issue with partial manual executions ([#8575](https://github.com/n8n-io/n8n/issues/8575)) ([a29b41e](https://github.com/n8n-io/n8n/commit/a29b41ec55d8a0cf5610a53087e455b7e649b8bc))
+* **Default Data Loader Node:** Fix binary data loader in s3 mode ([#8626](https://github.com/n8n-io/n8n/issues/8626)) ([a5e6f59](https://github.com/n8n-io/n8n/commit/a5e6f5928ae39f19d6cb55a234818e776141e325))
+* **editor:** Do not break NDV for version-less nodes ([#8714](https://github.com/n8n-io/n8n/issues/8714)) ([8a88d15](https://github.com/n8n-io/n8n/commit/8a88d156847852b38e1fd13f3b9240887491a665))
+* **editor:** Hide previous execution data for sub-nodes in debug mode if it has execution error ([#8710](https://github.com/n8n-io/n8n/issues/8710)) ([a973b9c](https://github.com/n8n-io/n8n/commit/a973b9c077d28faa45b527cf6e0f0e6644cf354a))
+* **editor:** Update Filter component state when value is updated ([#8684](https://github.com/n8n-io/n8n/issues/8684)) ([3ba2cdc](https://github.com/n8n-io/n8n/commit/3ba2cdcadbf4df4e4521cb03bf63f13a32a926a5))
+* Fix execution error when using AI chain nodes with non-chat model ([#8724](https://github.com/n8n-io/n8n/issues/8724)) ([0882dc0](https://github.com/n8n-io/n8n/commit/0882dc0ce9ad4c9260390f99be56df2d6f7b5e86))
+* **Postgres Trigger Node:** `closeFunction` errors should not prevent a workflow from being deactivated ([#8738](https://github.com/n8n-io/n8n/issues/8738)) ([7012577](https://github.com/n8n-io/n8n/commit/7012577fce796c6d18ab8081f90014a8cded7391))
+* Send user id when setting up an account ([#8639](https://github.com/n8n-io/n8n/issues/8639)) ([27f3166](https://github.com/n8n-io/n8n/commit/27f3166272455627a2d2f851a286126310a4d5b5))
+* **Trello Node:** Remove GET request body ([#8715](https://github.com/n8n-io/n8n/issues/8715)) ([8c4a744](https://github.com/n8n-io/n8n/commit/8c4a744c56ce84984ed837583cdfd7a296de5090))
+* Wrong prompt input key for sql agent ([#8708](https://github.com/n8n-io/n8n/issues/8708)) ([7c1cf33](https://github.com/n8n-io/n8n/commit/7c1cf33616eb1990a9d6d7f4b93e91575f2cddc8))
+
+
+### Features
+
+* Add env variables to support exposing `/workflows/demo` route and `/nodes.json` route ([#8506](https://github.com/n8n-io/n8n/issues/8506)) ([4b01335](https://github.com/n8n-io/n8n/commit/4b01335aa45d93b0e4f2b7c69503430f1bcca28a))
+* Add Outlook Trigger Node ([#8656](https://github.com/n8n-io/n8n/issues/8656)) ([720ae1b](https://github.com/n8n-io/n8n/commit/720ae1b96b4c6fd644bad60191c35d8d598ad666))
+* Add support for Ollama embeddings API ([#8732](https://github.com/n8n-io/n8n/issues/8732)) ([15490ad](https://github.com/n8n-io/n8n/commit/15490ad1d47c4f0d5c3f9eb350b2a1bcad4bbec0))
+* **AI Agent Node:** Allow use of Azure Chat model for OpenAI Functions agent ([#8725](https://github.com/n8n-io/n8n/issues/8725)) ([d03d927](https://github.com/n8n-io/n8n/commit/d03d9276f923d541f9c9ef86b8dc232f2737e30b))
+* Allow instance owners and admins to edit all credentials ([#8716](https://github.com/n8n-io/n8n/issues/8716)) ([7371708](https://github.com/n8n-io/n8n/commit/737170893d17108098c14db6be80071e8ef51930))
+* **editor:** AI Floating Nodes ([#8703](https://github.com/n8n-io/n8n/issues/8703)) ([41b191e](https://github.com/n8n-io/n8n/commit/41b191e0552aa2d92d442d1dea05913e8b386d4d))
+* **editor:** Retrieve previous chat message on arrow-up ([#8696](https://github.com/n8n-io/n8n/issues/8696)) ([246f8cf](https://github.com/n8n-io/n8n/commit/246f8cfcc3acdeb323849c94542fc4ad028c4f77))
+* No expression error when node hasn’t executed ([#8448](https://github.com/n8n-io/n8n/issues/8448)) ([f9a99ec](https://github.com/n8n-io/n8n/commit/f9a99ec0295499d95534d64e016f70339a56956b))
+* Session is selector for memory nodes ([#8736](https://github.com/n8n-io/n8n/issues/8736)) ([2aaf211](https://github.com/n8n-io/n8n/commit/2aaf211dfc270920a4885a2b086b98ab8a3c2af6))
+* SQL agent improvements ([#8709](https://github.com/n8n-io/n8n/issues/8709)) ([0952430](https://github.com/n8n-io/n8n/commit/09524304e6a8d1fdcdfe6340b71a5a443b942d6d))
+
+
+
+# [1.30.0](https://github.com/n8n-io/n8n/compare/n8n@1.29.0...n8n@1.30.0) (2024-02-21)
+
+
+### Bug Fixes
+
+* **AwsS3 Node:** Use location constrain ([#8654](https://github.com/n8n-io/n8n/issues/8654)) ([c73aeee](https://github.com/n8n-io/n8n/commit/c73aeeec3d296b3a6e203eba4513f6bd4bb65732))
+* **core:** Apply correct hostname to redirected requests ([#8674](https://github.com/n8n-io/n8n/issues/8674)) ([0e36aeb](https://github.com/n8n-io/n8n/commit/0e36aeb421997948ef5d5170fa8d9b50d25b852d))
+* **core:** Define `SHELL` env variable on docker images ([#8670](https://github.com/n8n-io/n8n/issues/8670)) ([e1a4fde](https://github.com/n8n-io/n8n/commit/e1a4fde207e392c372e3876946d6a5740721e253))
+* **editor:** Correctly set condition operator when changed ([#8700](https://github.com/n8n-io/n8n/issues/8700)) ([23a1bc4](https://github.com/n8n-io/n8n/commit/23a1bc40a2eb8d340eea635a48c75f59369095bb))
+* **editor:** Escape node names with quotes in autocomplete and drag'n'drop ([#8663](https://github.com/n8n-io/n8n/issues/8663)) ([890c2bd](https://github.com/n8n-io/n8n/commit/890c2bd52bd2ccd94fbc2e626dceda30554f9e82))
+* **editor:** Filter component: do not clear expression when changing operator ([#8635](https://github.com/n8n-io/n8n/issues/8635)) ([66cbe54](https://github.com/n8n-io/n8n/commit/66cbe54e1d0ec48a36e6b6b15aaf7201970932e7))
+* **editor:** Fix node runData and pinned data check on manual run ([#8669](https://github.com/n8n-io/n8n/issues/8669)) ([40c7f77](https://github.com/n8n-io/n8n/commit/40c7f77a35ef4e9bd4dbd9f28886b1b9e6af416f))
+* **editor:** Fix SQL editors not always re-rendering when query changes ([#8621](https://github.com/n8n-io/n8n/issues/8621)) ([8e9d310](https://github.com/n8n-io/n8n/commit/8e9d3106a5792a182753e4030c135893f8bad27e))
+* **editor:** Fix unnecessary execution of nodes when there is pin data ([#8567](https://github.com/n8n-io/n8n/issues/8567)) ([46fe544](https://github.com/n8n-io/n8n/commit/46fe544b9a38ea81093d846917af970141b8c86a))
+* **editor:** Handle drag-n-dropping from other nodes in assignment component ([#8661](https://github.com/n8n-io/n8n/issues/8661)) ([c943a51](https://github.com/n8n-io/n8n/commit/c943a51a28953c2ecd0f3ae4849fd8a0de187bfc))
+* **editor:** Send protocol and n8n version in templates destination parameter, stop redirecting template preview page to website ([#8691](https://github.com/n8n-io/n8n/issues/8691)) ([a573146](https://github.com/n8n-io/n8n/commit/a57314613586841c14e86f009bf42793545c33f8))
+* **editor:** Use proper composable for localization ([#8660](https://github.com/n8n-io/n8n/issues/8660)) ([9c0fe41](https://github.com/n8n-io/n8n/commit/9c0fe413d9beb669b8b9807f98569f46a1682855))
+* **editor:** Wrap expressions in resource locator component ([#8673](https://github.com/n8n-io/n8n/issues/8673)) ([e2f2fc9](https://github.com/n8n-io/n8n/commit/e2f2fc910df5ee06fa0b57b85689b5674b6774ba))
+* **Extract From File Node:** Make binary data work with any backend  ([#8647](https://github.com/n8n-io/n8n/issues/8647)) ([d33d953](https://github.com/n8n-io/n8n/commit/d33d953497d25a50f17c71f7ecc7b9cc6332816e))
+* **FTP Node:** Continue of fail looping support with paired item ([#8659](https://github.com/n8n-io/n8n/issues/8659)) ([3279762](https://github.com/n8n-io/n8n/commit/327976222114956584fdb2de51c914ad57382988))
+* **FTP Node:** Fix "Maximum call stack size exceeded" error when dealing with too many files ([#8657](https://github.com/n8n-io/n8n/issues/8657)) ([5063674](https://github.com/n8n-io/n8n/commit/506367453c46485e5baff6510ce0c653ca4cc4e4))
+* **Google Calendar Node:** Errors with after/before options ([#8628](https://github.com/n8n-io/n8n/issues/8628)) ([bee17dd](https://github.com/n8n-io/n8n/commit/bee17dd6cc4eaabc252602a02d4ec109f42ef926))
+* **GraphQL Node:** Fix request format JSON error ([#8646](https://github.com/n8n-io/n8n/issues/8646)) ([bd4b50c](https://github.com/n8n-io/n8n/commit/bd4b50cf0882553b2ecb7f0b9bd93d154f775b4f))
+* **Postgres Node:** Close connection pool only if it's not already closed or closing ([#8690](https://github.com/n8n-io/n8n/issues/8690)) ([457cac4](https://github.com/n8n-io/n8n/commit/457cac4cf9f7093d48e9f4ccb0021423c18f0b8b))
+
+
+### Features
+
+* **AI Agent Node:** Whitelist Azure Chat model for Agent ([#8699](https://github.com/n8n-io/n8n/issues/8699)) ([40aecd1](https://github.com/n8n-io/n8n/commit/40aecd1715d4fec7e5024167e89d4b2171ec19e8))
+* **core:** Add support for $("NodeName").isExecuted ([#8683](https://github.com/n8n-io/n8n/issues/8683)) ([ad82f0c](https://github.com/n8n-io/n8n/commit/ad82f0c0c827e535a22b0a51e408f4cddea280e0))
+* **core:** Move execution permission checks earlier in the lifecycle ([#8677](https://github.com/n8n-io/n8n/issues/8677)) ([059d281](https://github.com/n8n-io/n8n/commit/059d281fd1efdd281d3c9bf3f3a6c614d343e7ca))
+* **editor:** Add chevron to filter component operator select ([#8633](https://github.com/n8n-io/n8n/issues/8633)) ([20446bd](https://github.com/n8n-io/n8n/commit/20446bdf11bd9f3528fd7b3bad61d522f1102f4d))
+* **Google Sheets Node:** Option how to combine filters when reading rows ([#8652](https://github.com/n8n-io/n8n/issues/8652)) ([a5e522e](https://github.com/n8n-io/n8n/commit/a5e522e5360bd72a5567c96aaf0076baf0d95b35))
+* **Google Workspace Admin Node:** Add support for error output branch ([#8499](https://github.com/n8n-io/n8n/issues/8499)) ([ef77571](https://github.com/n8n-io/n8n/commit/ef775711d01e77533775bd3c1e1f9bb1c508f2b2))
+* Introduce prompt type option for Agent, Basic LLM Chain, and QA Chain nodes ([#8697](https://github.com/n8n-io/n8n/issues/8697)) ([2068f18](https://github.com/n8n-io/n8n/commit/2068f186ffd64766051294e8652689618a0df3fb))
+
+
+
+# [1.29.0](https://github.com/n8n-io/n8n/compare/n8n@1.28.0...n8n@1.29.0) (2024-02-15)
+
+
+### Bug Fixes
+
+* **core:** Custom workflow tool tweaks  ([#8561](https://github.com/n8n-io/n8n/issues/8561)) ([ccc0ad5](https://github.com/n8n-io/n8n/commit/ccc0ad5009b2d547accfc34a9c0917114fd19c81))
+* **core:** Give better error message if `executions.process` is still used in the configs ([#8618](https://github.com/n8n-io/n8n/issues/8618)) ([cd8ca84](https://github.com/n8n-io/n8n/commit/cd8ca8412d02090af07d8657283b7637178c975c))
+* **core:** Improve the startup error when EXECUTIONS_PROCESS is set ([#8630](https://github.com/n8n-io/n8n/issues/8630)) ([a2a3ca1](https://github.com/n8n-io/n8n/commit/a2a3ca160f253b3b09f83bdc6dec11987971e464))
+* **core:** Upgrade `@n8n/typeorm` to address postgres timestamp issues ([#8627](https://github.com/n8n-io/n8n/issues/8627)) ([68498cb](https://github.com/n8n-io/n8n/commit/68498cb72a16d587c4b24f9fe5e8ac2450cd78b9))
+* **core:** Upgrade rudderstack sdk to address npm postInstall issues ([#8568](https://github.com/n8n-io/n8n/issues/8568)) ([5750e8e](https://github.com/n8n-io/n8n/commit/5750e8e88ed59b40d5115416c8afe227cb64c70e))
+* **editor:** Debounce expression changes ([#8629](https://github.com/n8n-io/n8n/issues/8629)) ([9c7e026](https://github.com/n8n-io/n8n/commit/9c7e0266ee1c2112649772ca553bff429dcabc2d))
+* **Execute Workflow Node:** Passing the workflow that is supposed to be executed as a paramter ([#8614](https://github.com/n8n-io/n8n/issues/8614)) ([b54488a](https://github.com/n8n-io/n8n/commit/b54488ada53a9941f5fd4d3cab8d39bd81b22f4a))
+* Fix resolving of expressions of deeply nested sub-nodes ([#8612](https://github.com/n8n-io/n8n/issues/8612)) ([f527430](https://github.com/n8n-io/n8n/commit/f5274302f843c34f0a8a0b3eb51e7f9262fe0ea4))
+* **FTP Node:** Fix issue with connections not closing properly ([#8619](https://github.com/n8n-io/n8n/issues/8619)) ([e597fbc](https://github.com/n8n-io/n8n/commit/e597fbc78ff60ce495eecd9ffdffda801ed90b66))
+* **FTP Node:** Fix issue with paireditems not always working ([#8613](https://github.com/n8n-io/n8n/issues/8613)) ([d38a822](https://github.com/n8n-io/n8n/commit/d38a822b9501a8730c9cf097a9372e96080e8722))
+* **Google Sheets Trigger Node:** First non-header row is ignored when using on row added event ([#8580](https://github.com/n8n-io/n8n/issues/8580)) ([2db8231](https://github.com/n8n-io/n8n/commit/2db8231af5baed941b5250af373898c3924d3baa))
+* **HTTP Request Node:** Errorneous binary object without content-disposition response header ([#8583](https://github.com/n8n-io/n8n/issues/8583)) ([e28b374](https://github.com/n8n-io/n8n/commit/e28b374170725efeff59ac39e4ba6385bf834e7f))
+* **HTTP Request Node:** Handle special characters in pagination expressions + improve hint text ([#8576](https://github.com/n8n-io/n8n/issues/8576)) ([3b2078c](https://github.com/n8n-io/n8n/commit/3b2078c3caf2a5acee48fed3055b47dbfe0af44a))
+* **Jira Software Node:** Fix issue with not all issue types being supported ([#8571](https://github.com/n8n-io/n8n/issues/8571)) ([a6211c9](https://github.com/n8n-io/n8n/commit/a6211c9a5df9513ef057be1bfb78b4e0e2a75c2f))
+* **Merge Node:** Fixing how paired items are handled in the merge node, when choosing a branch and selecting to return an empty object ([#8479](https://github.com/n8n-io/n8n/issues/8479)) ([a3bed97](https://github.com/n8n-io/n8n/commit/a3bed97883ece25ffb4ab3a8246418b123c92e52))
+* **Microsoft Outlook Node:** Download executes more than once per incoming item ([#8566](https://github.com/n8n-io/n8n/issues/8566)) ([053fb5f](https://github.com/n8n-io/n8n/commit/053fb5ff7a3a4ce30b35fa6c830787b935ebaf63))
+* **Notion Node:** Block with text results in a body validation error ([#8622](https://github.com/n8n-io/n8n/issues/8622)) ([6bc1c3d](https://github.com/n8n-io/n8n/commit/6bc1c3d7a83436ee3b3520adf4b52f59f2b4231c))
+* **RSS Feed Trigger Node:** Save last item's date instead of last execution date ([#8572](https://github.com/n8n-io/n8n/issues/8572)) ([a822588](https://github.com/n8n-io/n8n/commit/a822588012b66711f37d3ca363fcd04742eda1b8))
+* **Wait Node:** Account for workflow timezone in Wait node datetime ([#8578](https://github.com/n8n-io/n8n/issues/8578)) ([1116a28](https://github.com/n8n-io/n8n/commit/1116a28b4582cae93e9d44890cfe020cd813521c))
+
+
+### Features
+
+* Add support for AI log streaming ([#8526](https://github.com/n8n-io/n8n/issues/8526)) ([7501ad8](https://github.com/n8n-io/n8n/commit/7501ad8f3c56d9fcc5f4ec3d6fc468ab9cdb5024))
+* Add telemetry event when users click on templates link ([#8625](https://github.com/n8n-io/n8n/issues/8625)) ([bf4f896](https://github.com/n8n-io/n8n/commit/bf4f896373acb2530a8f322cd612a3de616d6d15))
+* **API:** Add tag support to public API ([#8588](https://github.com/n8n-io/n8n/issues/8588)) ([a743a40](https://github.com/n8n-io/n8n/commit/a743a4037674ccb68a311daa5511cb48de6c9bfa))
+* **Convert to File Node:** Operation to convert a string in a plain text file, option to format JSON when creating file ([#8620](https://github.com/n8n-io/n8n/issues/8620)) ([d18cba3](https://github.com/n8n-io/n8n/commit/d18cba37a4a690cb3b4cd4259d27aedaa97193e4))
+* **core:** Migrate to n8n's typeorm fork ([#8590](https://github.com/n8n-io/n8n/issues/8590)) ([8e392cf](https://github.com/n8n-io/n8n/commit/8e392cfc1dd103a00b3a0e7c186cbfad989a5080))
+* **editor:** Use website as the main templates repository ([#8591](https://github.com/n8n-io/n8n/issues/8591)) ([79b09fd](https://github.com/n8n-io/n8n/commit/79b09fdf84860eee4c80e0c7eb7e320f6e05eabb))
+* **HTML Extract Node:** Better text extraction, option to specify selectors to skip, option to clean up text data ([#8586](https://github.com/n8n-io/n8n/issues/8586)) ([32281d1](https://github.com/n8n-io/n8n/commit/32281d12d775281e4b8e419d76e46ca9e3b47267))
+* **OpenAI Node:** Overhaul ([#8335](https://github.com/n8n-io/n8n/issues/8335)) ([941278d](https://github.com/n8n-io/n8n/commit/941278db6880ae3734a7a37aa03d7e6106ee5009))
+* Upgrade typeorm, sqlite3, and pg/pg-promise ([#8579](https://github.com/n8n-io/n8n/issues/8579)) ([7826bd8](https://github.com/n8n-io/n8n/commit/7826bd842a8e1548c1eab8fff942d2efe8b3dc75))
+
+
+
+# [1.28.0](https://github.com/n8n-io/n8n/compare/n8n@1.27.0...n8n@1.28.0) (2024-02-07)
+
+
+### Bug Fixes
+
+* Allow Date/Luxon objects and additional formats in DateTime validation ([#8525](https://github.com/n8n-io/n8n/issues/8525)) ([c419c85](https://github.com/n8n-io/n8n/commit/c419c8592f16a002d9f460c555db5f8bc04d95b8))
+* **core:** Ensure AxiosError status always gets copied over to NodeApiError ([#8509](https://github.com/n8n-io/n8n/issues/8509)) ([76c5a62](https://github.com/n8n-io/n8n/commit/76c5a62f521fbd79a47d47f419fd90dcc6ca0275))
+* **core:** Fix DropRoleMapping migration ([#8521](https://github.com/n8n-io/n8n/issues/8521)) ([4fed68e](https://github.com/n8n-io/n8n/commit/4fed68ee34c239ed3cae8541d5d4e7f86cf28d13))
+* **core:** Fix new graceful shutdown env being always overridden by deprecated env ([#8503](https://github.com/n8n-io/n8n/issues/8503)) ([cc41fc7](https://github.com/n8n-io/n8n/commit/cc41fc7c801ecb1b0de4b7c5af5a03b3f30fdce8))
+* **core:** Fix PermissionChecker.check, and add additional unit tests ([#8528](https://github.com/n8n-io/n8n/issues/8528)) ([5832d3c](https://github.com/n8n-io/n8n/commit/5832d3ca4695ec812e028e40b41811ca2215c0e2))
+* **core:** Fix test runs of triggers that rely on static data ([#8524](https://github.com/n8n-io/n8n/issues/8524)) ([528c071](https://github.com/n8n-io/n8n/commit/528c07134a6705c8c7a5378f15f5e4a4b93234a9))
+* **core:** Fix workflow tagging failure due to unique constraint check ([#8505](https://github.com/n8n-io/n8n/issues/8505)) ([92f939f](https://github.com/n8n-io/n8n/commit/92f939f82799975a5f9b859e7f342f3440961320))
+* **core:** Upgrade nodemailer to address an exploit ([#8535](https://github.com/n8n-io/n8n/issues/8535)) ([ee5e422](https://github.com/n8n-io/n8n/commit/ee5e4220945fde5baaec9ad66ff08b8728912aa3))
+* **core:** Use hostname from URL instead of Host header for SNI ([#8562](https://github.com/n8n-io/n8n/issues/8562)) ([7531f34](https://github.com/n8n-io/n8n/commit/7531f343861d91df075b8f3220f5bce8858b117f))
+* **core:** Use trx manager instead of repository for tags overwrite ([#8557](https://github.com/n8n-io/n8n/issues/8557)) ([abddbb6](https://github.com/n8n-io/n8n/commit/abddbb622798bdc4a2b11347a09f10aaf03a4639))
+* **editor:** Prune values that are not in the schema in the ResourceMapper component ([#8478](https://github.com/n8n-io/n8n/issues/8478)) ([612771e](https://github.com/n8n-io/n8n/commit/612771e0328f7e565d5f075cc20ad86bd1f13bce))
+* **Embeddings OpenAI Node:** Fix dynamic models fetching ([#8533](https://github.com/n8n-io/n8n/issues/8533)) ([cccdfc7](https://github.com/n8n-io/n8n/commit/cccdfc73d6c13a37e395fdc2612f2ebf458a4f52))
+* **HTTP Request Node:** Require parameter with filled name and value to avoid infinite loop ([#8454](https://github.com/n8n-io/n8n/issues/8454)) ([3128dca](https://github.com/n8n-io/n8n/commit/3128dca1faeff85d77a28640b7dfe8fbcd85db4f))
+* **HTTP Request Node:** Support form data when using pagination ([#8497](https://github.com/n8n-io/n8n/issues/8497)) ([ca75744](https://github.com/n8n-io/n8n/commit/ca75744c7f93db827ece5bf3b17b82f07d4cffb1))
+* **Microsoft Excel 365 Node:** Upsert append new rows at the end of used range, option to append at the end of selected range ([#8461](https://github.com/n8n-io/n8n/issues/8461)) ([1e02d73](https://github.com/n8n-io/n8n/commit/1e02d73ad782fb21cdd9b7350e34beb731a677c5))
+* **MongoDB Node:** Fix "Maximum call stack size exceeded" error on too many rows ([#8530](https://github.com/n8n-io/n8n/issues/8530)) ([76cdf75](https://github.com/n8n-io/n8n/commit/76cdf75fb96fb55b4a6e7a1a9edc7c9674806391))
+* **Slack Node:** Attachments fix ([#8471](https://github.com/n8n-io/n8n/issues/8471)) ([254700a](https://github.com/n8n-io/n8n/commit/254700a059a48a66dea8b9d80e61c8250e09d5b5))
+* Update BaseChatModel import checks for MistralAI compatibility ([#8527](https://github.com/n8n-io/n8n/issues/8527)) ([c8b8379](https://github.com/n8n-io/n8n/commit/c8b83790150b9974d6d99f6a2b6b5b7be6fb8c53))
+
+
+### Features
+
+* Add assignment component with drag and drop to Set node ([#8283](https://github.com/n8n-io/n8n/issues/8283)) ([2799de4](https://github.com/n8n-io/n8n/commit/2799de491b753e6fb00f73b61393392b6fc8ad18))
+* Azure Open AI chat model & embeddings ([#8522](https://github.com/n8n-io/n8n/issues/8522)) ([934d0d3](https://github.com/n8n-io/n8n/commit/934d0d35b1814c0a39595d61a30fb9c2e05fd995))
+* **editor:** Add delete and disable button to nodes on hover ([#8482](https://github.com/n8n-io/n8n/issues/8482)) ([994754b](https://github.com/n8n-io/n8n/commit/994754bf39976c5bb33fd1c30a0eb82cc518850b))
+* **Email Trigger (IMAP) Node:** Upgrade mailparser ([#8539](https://github.com/n8n-io/n8n/issues/8539)) ([da1fe44](https://github.com/n8n-io/n8n/commit/da1fe44d5246848e2ba7bb8bc5f4577685fbcee0))
+* **RabbitMQ Trigger Node:** Add options to configure assert of exchanges and queues ([#8430](https://github.com/n8n-io/n8n/issues/8430)) ([4b3659f](https://github.com/n8n-io/n8n/commit/4b3659f04f84ef774d31cf2341c5dbb500a73afe))
+
+
+
+# [1.27.0](https://github.com/n8n-io/n8n/compare/n8n@1.26.0...n8n@1.27.0) (2024-01-31)
+
+
+### Bug Fixes
+
+* **AwsS3 Node:** Fix handling of bucket with dot in name ([#8475](https://github.com/n8n-io/n8n/issues/8475)) ([0febe62](https://github.com/n8n-io/n8n/commit/0febe62ad03f82b85922e0cb66d60eeb22b3a919))
+* **core:** Don't report executions that have been paused as failed to rudderstack and log streams ([#8501](https://github.com/n8n-io/n8n/issues/8501)) ([39e8754](https://github.com/n8n-io/n8n/commit/39e875478488f3c81147944bd6b52dc1f9def958))
+* **core:** Fix stopping and retrying failed executions ([#8480](https://github.com/n8n-io/n8n/issues/8480)) ([238b54c](https://github.com/n8n-io/n8n/commit/238b54c77bba6f7abcc7fc2b3ac48a85206ce37e))
+* **core:** Forward authorization header when on same domain ([#8507](https://github.com/n8n-io/n8n/issues/8507)) ([f1910a1](https://github.com/n8n-io/n8n/commit/f1910a10a6ac875b422d9efe9bfd3ca728ac8d96))
+* **core:** Handle possibly invalid `updatedAt` timestamps in source-control ([#8485](https://github.com/n8n-io/n8n/issues/8485)) ([033fd34](https://github.com/n8n-io/n8n/commit/033fd344b5a09a7b9c0b941279da1744e182cc57))
+* **core:** Handle zero execution statistics on metrics collection during license renewal ([#8463](https://github.com/n8n-io/n8n/issues/8463)) ([db48bdd](https://github.com/n8n-io/n8n/commit/db48bdd6d1110bfccc371ca490281c021227991f))
+* **core:** Improve handling of wrapped errors ([#8510](https://github.com/n8n-io/n8n/issues/8510)) ([670af16](https://github.com/n8n-io/n8n/commit/670af167e6f2c0e4e45bcc7e0998a371d651f89d))
+* **core:** Point users to the official documentation when they use `n8n --help` ([#8440](https://github.com/n8n-io/n8n/issues/8440)) ([9f11eba](https://github.com/n8n-io/n8n/commit/9f11eba0a4f726cc150b05c0f4b528bf25513e6f))
+* **core:** Prevent calling internal hook email event if emailing is disabled ([#8462](https://github.com/n8n-io/n8n/issues/8462)) ([9e93980](https://github.com/n8n-io/n8n/commit/9e939809575592622f6bdca112da1905ac9205ef))
+* **editor:** Disable expression editor modal opening on readonly field ([#8457](https://github.com/n8n-io/n8n/issues/8457)) ([eb27ed0](https://github.com/n8n-io/n8n/commit/eb27ed068ba21bbf4302686f0f0c0168e91c03f6))
+* **editor:** Fix workflows filter resetting ([#8411](https://github.com/n8n-io/n8n/issues/8411)) ([ad4b298](https://github.com/n8n-io/n8n/commit/ad4b298be34915718b0415322e328a1b46ef5842))
+* **editor:** Send template id as a number in telemetry events ([#8484](https://github.com/n8n-io/n8n/issues/8484)) ([327cc8d](https://github.com/n8n-io/n8n/commit/327cc8df7343b806bee87faaa86ed22d9d70127f))
+* **editor:** Show pin button on binary output but disable it with tooltip ([#8388](https://github.com/n8n-io/n8n/issues/8388)) ([caab97e](https://github.com/n8n-io/n8n/commit/caab97e667df5d305aa1d2e15c0d31eb5f1a84eb))
+* **Gotify Node:** Add option to set content type to support Markdown messages ([#8442](https://github.com/n8n-io/n8n/issues/8442)) ([c2ffd4e](https://github.com/n8n-io/n8n/commit/c2ffd4e6455b383e4ddc2eb310cefbcdf867d622))
+* **HTML Node:** Escape data path value in JSON Property ([#8441](https://github.com/n8n-io/n8n/issues/8441)) ([fc5c562](https://github.com/n8n-io/n8n/commit/fc5c5627850bf618be4ca0d9cdb20adb0f8610e9))
+* **Merge Node:** Passing on no items to "Input 2" results in wrong output items ([#8438](https://github.com/n8n-io/n8n/issues/8438)) ([dafacb9](https://github.com/n8n-io/n8n/commit/dafacb90c6b01e2f88c3de359ebb2d8d55e0aecc))
+* **Microsoft Excel 365 Node:** Better error and description on unsupported range in upsert, update, getRange operations ([#8452](https://github.com/n8n-io/n8n/issues/8452)) ([8a595d1](https://github.com/n8n-io/n8n/commit/8a595d1527bf8cd97ce8293c6a52929eb3335750))
+* Open executions with large number of execution items without crashing tab ([#8423](https://github.com/n8n-io/n8n/issues/8423)) ([56da2e4](https://github.com/n8n-io/n8n/commit/56da2e43528f157c421e97018366b8f2d854d11d))
+* Properly iterate over credentials with expressions ([#8502](https://github.com/n8n-io/n8n/issues/8502)) ([0e9a5a2](https://github.com/n8n-io/n8n/commit/0e9a5a2ab2cde251cf106b149bdd4c3142e52b40))
+* Use correct node version when pasting/importing nodes ([#8456](https://github.com/n8n-io/n8n/issues/8456)) ([70af67e](https://github.com/n8n-io/n8n/commit/70af67e744c709b85b600811b792def83518fa7c))
+
+
+### Features
+
+* Add model parameter to OpenAI embeddings ([#8481](https://github.com/n8n-io/n8n/issues/8481)) ([981ea39](https://github.com/n8n-io/n8n/commit/981ea3930e96c3b45267fa7ddac48710846e49ac))
+* Add new 'is empty' and 'is not empty' operators to Filter ([#8445](https://github.com/n8n-io/n8n/issues/8445)) ([c21c4b9](https://github.com/n8n-io/n8n/commit/c21c4b9178b3ae328ff7a068663eeb64fed3e465))
+* **core:** Upgrade Rudderstack SDK to address CVE-2023-45857 ([#8368](https://github.com/n8n-io/n8n/issues/8368)) ([2fba0e8](https://github.com/n8n-io/n8n/commit/2fba0e8d585aead43eaeb73fa49dc9b613900675))
+* **editor:** Implement loading and error states for dynamically loaded components in node parameter list ([#8477](https://github.com/n8n-io/n8n/issues/8477)) ([e643a12](https://github.com/n8n-io/n8n/commit/e643a126f40dbad0634e5abb1e3ba355bad0275d))
+* **editor:** Send template id as string in all telemetry events ([#8498](https://github.com/n8n-io/n8n/issues/8498)) ([2aed788](https://github.com/n8n-io/n8n/commit/2aed788dc354595b070e91fe76298f6702bbbe15))
+* **Google Calendar Node:** Next occurrence property in recurring events  ([#8444](https://github.com/n8n-io/n8n/issues/8444)) ([bf11c7c](https://github.com/n8n-io/n8n/commit/bf11c7c1bd5826ba64acc665da4e3319f9a47174))
+
+### ⚠️ BREAKING CHANGES
+* **core:** Remove `own` execution-process mode ([#8490](https://github.com/n8n-io/n8n/issues/8490)) ([121a55b](https://github.com/n8n-io/n8n/commit/121a55b691469e7eb042737573c0ace276366ecb))
+
+
+
+# [1.26.0](https://github.com/n8n-io/n8n/compare/n8n@1.25.0...n8n@1.26.0) (2024-01-24)
+
+
+### Bug Fixes
+
+* **AMQP Trigger Node:** Properly close connection after manual test step ([#8396](https://github.com/n8n-io/n8n/issues/8396)) ([2c14371](https://github.com/n8n-io/n8n/commit/2c143714817e62fcb2fec9b9cac208ef029f87fd))
+* **Asana Node:** Fix issue when connecting to the new Asana environment ([#8404](https://github.com/n8n-io/n8n/issues/8404)) ([44f6ef2](https://github.com/n8n-io/n8n/commit/44f6ef2ed729ad39518cc85e068be03cd8b409ff))
+* **AWS SQS Node:** Fix issue preventing data from being sent correctly ([#8382](https://github.com/n8n-io/n8n/issues/8382)) ([daba5bb](https://github.com/n8n-io/n8n/commit/daba5bb250c3bee338dde96e6e815835dd21e6f1))
+* Change the UI text for some filter operations ([#8360](https://github.com/n8n-io/n8n/issues/8360)) ([976fe2e](https://github.com/n8n-io/n8n/commit/976fe2e6c8caf3f72c833af4447c46ddfa1d8e0a))
+* **core:** Adjust starter node priority for manual executions with pinned activators ([#8386](https://github.com/n8n-io/n8n/issues/8386)) ([749ac2b](https://github.com/n8n-io/n8n/commit/749ac2b407d9477343c169ac26daba1a36cfcc6d))
+* **core:** Errors are returned on the success branch if error item has other keys in addition to 'error' ([#8380](https://github.com/n8n-io/n8n/issues/8380)) ([25f51f4](https://github.com/n8n-io/n8n/commit/25f51f4fd79d14ccff8d35d92c11e47fe18f3e0d))
+* **core:** Fix removal of triggers and pollers from memory on deactivation in multi-main setup ([#8416](https://github.com/n8n-io/n8n/issues/8416)) ([2257ec6](https://github.com/n8n-io/n8n/commit/2257ec63b3716598f85a5237bc147bb2c887fa33))
+* **core:** Fix update workflow cli command being unable to activate all workflows ([#8412](https://github.com/n8n-io/n8n/issues/8412)) ([ae06fde](https://github.com/n8n-io/n8n/commit/ae06fdeb62d0cb982253f32956fdd55bd66058bd))
+* **core:** Missing pairedItem fixes ([#8394](https://github.com/n8n-io/n8n/issues/8394)) ([284d965](https://github.com/n8n-io/n8n/commit/284d965b5acc0819ffc109729ce1d5d0b2352abb))
+* **Discord Node:** Remove requirement on message for webhooks ([#8377](https://github.com/n8n-io/n8n/issues/8377)) ([c64e893](https://github.com/n8n-io/n8n/commit/c64e893b60143df6e9a752191adef0419811fe43))
+* **editor:** Add pinned data for freshly added nodes ([#8323](https://github.com/n8n-io/n8n/issues/8323)) ([83228e2](https://github.com/n8n-io/n8n/commit/83228e26fb8f62676e15d59f65a43106487034da))
+* **editor:** Enable ctrl/cmd click in workflow editor header ([#8387](https://github.com/n8n-io/n8n/issues/8387)) ([e43cf2f](https://github.com/n8n-io/n8n/commit/e43cf2fd715e21fd4e454c9e6b6d874306472360))
+* **editor:** Fix copy to clipboard on insecure contexts ([#8425](https://github.com/n8n-io/n8n/issues/8425)) ([7386f79](https://github.com/n8n-io/n8n/commit/7386f79362673876509c27a2f6ddef08125a0b1e))
+* **editor:** Fix doclines for `plus` and `minus` ([#8405](https://github.com/n8n-io/n8n/issues/8405)) ([ebf2b0d](https://github.com/n8n-io/n8n/commit/ebf2b0d55ccf3977269d4ea442f2ad210d1b375b))
+* **editor:** Fix invisible community package update button ([#8406](https://github.com/n8n-io/n8n/issues/8406)) ([2ccb754](https://github.com/n8n-io/n8n/commit/2ccb754e52949e0d20925871f425eef92cd6aebc))
+* **editor:** Fix secondary icon for environments on sidebar menu item ([#8407](https://github.com/n8n-io/n8n/issues/8407)) ([3544966](https://github.com/n8n-io/n8n/commit/35449667bfab7324350fe92e1f6538e3ae3cadb1))
+* **editor:** Open native context menu when editing Sticky ([#8370](https://github.com/n8n-io/n8n/issues/8370)) ([ade7d30](https://github.com/n8n-io/n8n/commit/ade7d30053f897bd9269912565d86d33046e560e))
+* **editor:** Use web native <a> element in nav menus ([#8385](https://github.com/n8n-io/n8n/issues/8385)) ([e606e84](https://github.com/n8n-io/n8n/commit/e606e841ee1086d737849dc33f4ced867ab2cb21))
+* Fix issue preventing secrets with a - in the path from being imported ([#8378](https://github.com/n8n-io/n8n/issues/8378)) ([fc94377](https://github.com/n8n-io/n8n/commit/fc9437703687738091fdd072e03597358bd8f8d0))
+* Force posthog recording to be disabled outside cloud ([#8374](https://github.com/n8n-io/n8n/issues/8374)) ([f31cc07](https://github.com/n8n-io/n8n/commit/f31cc0743ff94c9b29cdd0d498c87340beb29585))
+* **Google Drive Node:** Fix issue preventing upload / update working in some configurations ([#8417](https://github.com/n8n-io/n8n/issues/8417)) ([4b3ea81](https://github.com/n8n-io/n8n/commit/4b3ea81028ae6dcbe3a4738dca7522b62685bb42))
+* **Microsoft Outlook Node:** Message -> Send with attachments ([#8238](https://github.com/n8n-io/n8n/issues/8238)) ([0128081](https://github.com/n8n-io/n8n/commit/01280815c950413188905f5d17a13157685d0a27))
+* **Microsoft SQL Node:** Prevent MSSQL max parameters error by chunking ([#8390](https://github.com/n8n-io/n8n/issues/8390)) ([1b0ba2c](https://github.com/n8n-io/n8n/commit/1b0ba2c02885a0dd9f548133efadcfc7485d666d))
+* **Notion Node:** Fix is_empty query on formula fields ([#8397](https://github.com/n8n-io/n8n/issues/8397)) ([08e7db4](https://github.com/n8n-io/n8n/commit/08e7db4648cd2f820e0d63d012f42057a124dd82))
+* **Switch Node:** Fix issue preventing some regex patterns from working ([#8422](https://github.com/n8n-io/n8n/issues/8422)) ([e9fea16](https://github.com/n8n-io/n8n/commit/e9fea16301cb9ee0ff7e3af45fc50d77e2cf6a23))
+
+
+### Features
+
+* **core:** Custom session timeout and refresh configuration ([#8342](https://github.com/n8n-io/n8n/issues/8342)) ([07e6705](https://github.com/n8n-io/n8n/commit/07e67052568dcb292dbf63bee8912110931726bc))
+* **core:** Email recipients on resource shared ([#8408](https://github.com/n8n-io/n8n/issues/8408)) ([a0a1830](https://github.com/n8n-io/n8n/commit/a0a1830696eaa905d37fbd56e8bc5035d12b2aa5))
+* **core:** Upgrade axios and follow-redirects to address CVE-2023-26159 ([#8366](https://github.com/n8n-io/n8n/issues/8366)) ([3912c5e](https://github.com/n8n-io/n8n/commit/3912c5e7abca98fe81d4c9c25894d30d8023ce56))
+* **core:** Upgrade bull and ioredis to address CVE-2023-52079 ([#8365](https://github.com/n8n-io/n8n/issues/8365)) ([639d347](https://github.com/n8n-io/n8n/commit/639d34769e75096d0725f1f60861dc972b344abe))
+* **editor:** Migrate `moveNodeWorkflow` mixin to `useCanvasPanning` composable ([#8322](https://github.com/n8n-io/n8n/issues/8322)) ([b6d7757](https://github.com/n8n-io/n8n/commit/b6d775768f927e69e7aa5f715c99f2fed4eaaa4c))
+* **Execute Workflow Node:** Add 'Wait For Sub-Workflow Completion' option ([#8389](https://github.com/n8n-io/n8n/issues/8389)) ([ff92fc7](https://github.com/n8n-io/n8n/commit/ff92fc7fef39076e0846f2426ffdd86c761e7896))
+* **LinkedIn Node:** Add support for Community Management API ([#7451](https://github.com/n8n-io/n8n/issues/7451)) ([7660d7e](https://github.com/n8n-io/n8n/commit/7660d7e735d248f3e731aca550c2973e85cdfebc))
+* **Microsoft Teams Node:** Overhaul ([#7477](https://github.com/n8n-io/n8n/issues/7477)) ([2c146cc](https://github.com/n8n-io/n8n/commit/2c146cca62ec605f6d722fe6c4b90c7df9cf77f7))
+* Nudge users to become template creators if eligible ([#8357](https://github.com/n8n-io/n8n/issues/8357)) ([9945701](https://github.com/n8n-io/n8n/commit/99457019f795636f56d80d3fc2c7e08055ace938))
+* **Telegram Trigger Node:** Verify Webhook requests ([#8383](https://github.com/n8n-io/n8n/issues/8383)) ([1117612](https://github.com/n8n-io/n8n/commit/11176124b5b6157c7c17fd882691d2f9d6b41487))
+
+
+
+# [1.25.0](https://github.com/n8n-io/n8n/compare/n8n@1.24.0...n8n@1.25.0) (2024-01-17)
+
+
+### Bug Fixes
+
+* Add fallback resolver for langchain modules ([#8308](https://github.com/n8n-io/n8n/issues/8308)) ([851060d](https://github.com/n8n-io/n8n/commit/851060dd3f38245da6e09c04ec0b12b24b63dca4))
+* **API:** Fix manual chat trigger execution ([#8300](https://github.com/n8n-io/n8n/issues/8300)) ([884396e](https://github.com/n8n-io/n8n/commit/884396ea0d9f4a8d7987daf2b674f080056dd1d1))
+* **AwsS3 Node:** Return confirmation of success after upload ([#8312](https://github.com/n8n-io/n8n/issues/8312)) ([c921665](https://github.com/n8n-io/n8n/commit/c921665f9abe19d9e8831062c1e7673d4d1ea694))
+* **core:** Account for immediate confirmation request during test webhook creation ([#8329](https://github.com/n8n-io/n8n/issues/8329)) ([5fbd797](https://github.com/n8n-io/n8n/commit/5fbd7971e04640be3f877b3aa22d4aee61c1d40a))
+* **core:** Ensure waiting executions account for workflow timezone ([#8340](https://github.com/n8n-io/n8n/issues/8340)) ([3734c89](https://github.com/n8n-io/n8n/commit/3734c89cf64514489831b5339d722c89b300cc54))
+* **core:** Parse any readable stream response instead of only IncomingMessage ([#8359](https://github.com/n8n-io/n8n/issues/8359)) ([eb1320f](https://github.com/n8n-io/n8n/commit/eb1320fd7a4a67cd16de10c4174c7bcf2c177b06))
+* **core:** Prevent invalid compressed responses from making executions stuck forever ([#8315](https://github.com/n8n-io/n8n/issues/8315)) ([0776814](https://github.com/n8n-io/n8n/commit/0776814ed8c520326a6447dcd7b6c53fda933054))
+* **core:** Prevent issues with missing or mismatching encryption key ([#8332](https://github.com/n8n-io/n8n/issues/8332)) ([d4c93b1](https://github.com/n8n-io/n8n/commit/d4c93b16071081002b4bd316be0921bc7867dd82))
+* **core:** Prevent NodeErrors from being wrapped multiple times ([#8301](https://github.com/n8n-io/n8n/issues/8301)) ([b267bf0](https://github.com/n8n-io/n8n/commit/b267bf07e365d8bb82a9847fb3c490437dc1010e))
+* **core:** Replace all `moment` imports with `moment-timezone` ([#8337](https://github.com/n8n-io/n8n/issues/8337)) ([52a2e25](https://github.com/n8n-io/n8n/commit/52a2e25a25e9a009a536d8a371d9404e75d756f4))
+* **core:** Report when waitTill is invalid and handle it  ([#8356](https://github.com/n8n-io/n8n/issues/8356)) ([d5455d7](https://github.com/n8n-io/n8n/commit/d5455d7accb193078b05a0f52386cf9303b6a00f))
+* **editor:** Add read only mode to filter component ([#8285](https://github.com/n8n-io/n8n/issues/8285)) ([dcc76f3](https://github.com/n8n-io/n8n/commit/dcc76f348075b6e05e3f38bb9694d25ac9a5646b))
+* **editor:** Capture indexed access expressions when building completions ([#8331](https://github.com/n8n-io/n8n/issues/8331)) ([159b328](https://github.com/n8n-io/n8n/commit/159b328587f3c57c73ae77c2a0c5d5c6ecc330aa))
+* **editor:** Fix issue with synchronization table on LDAP not loading data ([#8327](https://github.com/n8n-io/n8n/issues/8327)) ([6b92d49](https://github.com/n8n-io/n8n/commit/6b92d49ea58b8e5797e4e938444b161a63137638))
+* **editor:** Properly set colors for connections and labels on nodes with pinned data ([#8209](https://github.com/n8n-io/n8n/issues/8209)) ([3b8ccb9](https://github.com/n8n-io/n8n/commit/3b8ccb9fb903036a7d6e4b33f6b5a8933576e9e6))
+* Fix node graph telemetry with default values ([#8297](https://github.com/n8n-io/n8n/issues/8297)) ([93b969a](https://github.com/n8n-io/n8n/commit/93b969a327e0770d9a0e81a95a5185b0fc12ebc6))
+* **Google Drive Node:** Fix issue preventing service account from downloading files ([#7642](https://github.com/n8n-io/n8n/issues/7642)) ([cf7131d](https://github.com/n8n-io/n8n/commit/cf7131d766dfc7aec2c973525653ffec1ced03c1))
+* **HTTP Request Node:** Delete `response.request` only when it's a valid circular references ([#8293](https://github.com/n8n-io/n8n/issues/8293)) ([05c43fa](https://github.com/n8n-io/n8n/commit/05c43faa2d7582a8ce58b9bb3338c00253ad3281))
+* **Microsoft SQL Node:** Fix "Maximum call stack size exceeded" error on too many rows ([#8334](https://github.com/n8n-io/n8n/issues/8334)) ([bb2be8d](https://github.com/n8n-io/n8n/commit/bb2be8d70580896321641a49a3044165763eb9e1))
+* **Ollama Model Node:** Use a simpler credentials test ([#8318](https://github.com/n8n-io/n8n/issues/8318)) ([63b738a](https://github.com/n8n-io/n8n/commit/63b738a542429934b3838bfc814ea2a4c51675c7))
+* **OpenAI Node:** Load correct models for operation ([#8313](https://github.com/n8n-io/n8n/issues/8313)) ([a6a5372](https://github.com/n8n-io/n8n/commit/a6a5372b5f8e48e98788c4e3750ac4b63e91a96f))
+* Properly output saml validation errors ([#8284](https://github.com/n8n-io/n8n/issues/8284)) ([8c7f399](https://github.com/n8n-io/n8n/commit/8c7f39907fa82fa37af4436511d4a2daaff13015))
+* **Salesforce Node:** Upgrade to API version 59 ([#8346](https://github.com/n8n-io/n8n/issues/8346)) ([b51cbb3](https://github.com/n8n-io/n8n/commit/b51cbb325e03fd42be6dca99819d4cc7c4c1574b))
+* **Supabase Node:** Pagination for get all rows ([#8311](https://github.com/n8n-io/n8n/issues/8311)) ([e080476](https://github.com/n8n-io/n8n/commit/e0804768e84aefe9d66ab683080f67bb15a1cb58))
+* **Venafi TLS Protect Cloud Node:** Remove parameter `Application Server Type` ([#8325](https://github.com/n8n-io/n8n/issues/8325)) ([e3cedf7](https://github.com/n8n-io/n8n/commit/e3cedf7db038a70c9d48bb7c665b1be4beb872a9))
+* **Venafi TLS Protect Cloud Trigger Node:** Handle new webhook payload format  ([#8326](https://github.com/n8n-io/n8n/issues/8326)) ([057d7d0](https://github.com/n8n-io/n8n/commit/057d7d031828ea8b6e779ca535ccd50d91bfa0cc))
+
+
+### Features
+
+* **core:** Implement inter-main communication for test webhooks in multi-main setup ([#8267](https://github.com/n8n-io/n8n/issues/8267)) ([1a0e285](https://github.com/n8n-io/n8n/commit/1a0e28555385f682aa335115c4d72e671c0bdc85))
+* **editor:** Add new `/templates/search` endpoint ([#8227](https://github.com/n8n-io/n8n/issues/8227)) ([4277e92](https://github.com/n8n-io/n8n/commit/4277e92ec07671a679b0d9ab6e691ef9208585bd))
+* Implement Chat Memory Manager node ([#8127](https://github.com/n8n-io/n8n/issues/8127)) ([464be93](https://github.com/n8n-io/n8n/commit/464be9332354620b2f1890136abf95dfdb71fd2e))
+
+
+
+# [1.24.0](https://github.com/n8n-io/n8n/compare/n8n@1.23.0...n8n@1.24.0) (2024-01-10)
+
+
+### Bug Fixes
+
+* **core:** Do not add Authentication header when `authentication` type is `body` ([#8201](https://github.com/n8n-io/n8n/issues/8201)) ([ac1c642](https://github.com/n8n-io/n8n/commit/ac1c642fddfac3b0ed1144c7eccd7c88fbd5a1a5))
+* **core:** Fix test webhook deregistration ([#8247](https://github.com/n8n-io/n8n/issues/8247)) ([5032bf0](https://github.com/n8n-io/n8n/commit/5032bf0e346dccf7cade17a1518b3031118af5e1))
+* **editor:** Items count display in running workflow ([#8148](https://github.com/n8n-io/n8n/issues/8148)) ([8a3c87f](https://github.com/n8n-io/n8n/commit/8a3c87f69c20de7c713dff021e390ea4ea32b103)), closes [/github.com/n8n-io/n8n/pull/7763/files#diff-f5dae80a64b9951bb6691f1b9d439423cf84fa0cc9601b3f2c00904f3135e8deR48](https://github.com//github.com/n8n-io/n8n/pull/7763/files/issues/diff-f5dae80a64b9951bb6691f1b9d439423cf84fa0cc9601b3f2c00904f3135e8deR48)
+* **editor:** Only load suggested templates for owners ([#8228](https://github.com/n8n-io/n8n/issues/8228)) ([8f22a26](https://github.com/n8n-io/n8n/commit/8f22a265d607047eff22ba957d627bbec7da7900))
+* **editor:** Tweaking button sizes in execution preview ([#8206](https://github.com/n8n-io/n8n/issues/8206)) ([9d40ae8](https://github.com/n8n-io/n8n/commit/9d40ae8b74594d4368591a62f9b39dde28efc64d))
+* **editor:** Unify canvas button positioning ([#8258](https://github.com/n8n-io/n8n/issues/8258)) ([b6c42cc](https://github.com/n8n-io/n8n/commit/b6c42cc08408d9d7cc49cc84245b4ad515fa3e6a))
+* **editor:** Vertically center workflow preview loading state ([#8231](https://github.com/n8n-io/n8n/issues/8231)) ([2d6e406](https://github.com/n8n-io/n8n/commit/2d6e406e215188dbbbeb593ac09ccad3914aaf81))
+* Fix issue with API key being required for the Qdrant Node ([#8237](https://github.com/n8n-io/n8n/issues/8237)) ([4401db3](https://github.com/n8n-io/n8n/commit/4401db3a2fad3464a5498e9a86fc6bba4f9c9f95))
+* Fix template credential setup for nodes that dont have credentials ([#8208](https://github.com/n8n-io/n8n/issues/8208)) ([cd3f5b5](https://github.com/n8n-io/n8n/commit/cd3f5b5b1f48e42cb6fa5ebcc15527c28502ceb9))
+* Fix user reinvites on FE and BE ([#8261](https://github.com/n8n-io/n8n/issues/8261)) ([0dabe5c](https://github.com/n8n-io/n8n/commit/0dabe5c74e5ad0969d4691b3db4a1e796ed8a08c))
+* **FTP Node:** FTP connection failed due to missing password credential in node ([#8131](https://github.com/n8n-io/n8n/issues/8131)) ([e056aa9](https://github.com/n8n-io/n8n/commit/e056aa9c4dd6c6a7717202029b25f4f65ddecb0d))
+* **Github Trigger Node:** Enforce SSL validation by default ([#8265](https://github.com/n8n-io/n8n/issues/8265)) ([1387541](https://github.com/n8n-io/n8n/commit/1387541e336e7311ba9c43907fa95d3196fae2eb))
+* Make params panel double width for all SQL nodes ([#8236](https://github.com/n8n-io/n8n/issues/8236)) ([048b588](https://github.com/n8n-io/n8n/commit/048b588852f5fed1c976889ba54ef564ca7f4894))
+* **Monday.com Node:** Migrate to api 2023-10 ([#8254](https://github.com/n8n-io/n8n/issues/8254)) ([ccde38a](https://github.com/n8n-io/n8n/commit/ccde38a8a8d65a21bf4d38ef7b09a5ffa3c7ad2d))
+* **MySQL Node:** Only escape table names when needed ([#8246](https://github.com/n8n-io/n8n/issues/8246)) ([3b01eb6](https://github.com/n8n-io/n8n/commit/3b01eb60c98d51d0d7572342b8d6d40763293719))
+* **Nextcloud Node:** Throw an actual error if server responded with Fatal error ([#8234](https://github.com/n8n-io/n8n/issues/8234)) ([b201ff8](https://github.com/n8n-io/n8n/commit/b201ff8f23b2bac6b00d5c16d91b4b2931f45ade))
+* **NocoDB Node:** Download attachments ([#8235](https://github.com/n8n-io/n8n/issues/8235)) ([43e8e5e](https://github.com/n8n-io/n8n/commit/43e8e5e540b9fcbca663fcf17a78a7aba2abb475))
+* **Postgres Node:** Stop marking autogenerated columns as required ([#8230](https://github.com/n8n-io/n8n/issues/8230)) ([bed04ec](https://github.com/n8n-io/n8n/commit/bed04ec122234b4329a5e415bf3627c115b3f32e)), closes [#7084](https://github.com/n8n-io/n8n/issues/7084)
+* Resolve expressions in credentials following paired item ([#8250](https://github.com/n8n-io/n8n/issues/8250)) ([ccb2b07](https://github.com/n8n-io/n8n/commit/ccb2b076f8240b0712949b72ec57ae72a36ef62d))
+* **Set Node:** Field not excluded if dot notation disabled and field was set by using drag-and-drop from ui ([#8233](https://github.com/n8n-io/n8n/issues/8233)) ([cda49a4](https://github.com/n8n-io/n8n/commit/cda49a4747ef4369ce7a971872c6fb8a74f4156d))
+* Store workflow settings when saving an execution ([#8288](https://github.com/n8n-io/n8n/issues/8288)) ([8a7c629](https://github.com/n8n-io/n8n/commit/8a7c629ea183f75f9916003edf11cb8aeef445eb))
+* **Webhook Node:** Fix handling of form-data files ([#8256](https://github.com/n8n-io/n8n/issues/8256)) ([fc29030](https://github.com/n8n-io/n8n/commit/fc2903096e6e64e5b2a14593418d5651e07ca9ee))
+
+
+### Features
+
+* Add Chat Trigger node ([#7409](https://github.com/n8n-io/n8n/issues/7409)) ([af49e95](https://github.com/n8n-io/n8n/commit/af49e95cc7ccf70f233f9bd1e34fbb57f7f08ccf))
+* **core:** Cache test webhook registrations ([#8176](https://github.com/n8n-io/n8n/issues/8176)) ([22a5f52](https://github.com/n8n-io/n8n/commit/22a5f5258da0a973e1ad44c0d3d4f0fda1d23444)), closes [#8155](https://github.com/n8n-io/n8n/issues/8155)
+* **core:** Validate shutdown handlers on startup ([#8260](https://github.com/n8n-io/n8n/issues/8260)) ([3b996a7](https://github.com/n8n-io/n8n/commit/3b996a7da0137a75c3047656a4bc8cc336ebfc1e))
+* **editor:** Add fullscreen view to code editor ([#8084](https://github.com/n8n-io/n8n/issues/8084)) ([071e6d6](https://github.com/n8n-io/n8n/commit/071e6d6b6e32b7196f34043710c23331ad28fac0))
+* **editor:** Update copy: `Execute` --> `Test` ([#8137](https://github.com/n8n-io/n8n/issues/8137)) ([df5d07b](https://github.com/n8n-io/n8n/commit/df5d07bcb8beba760bc17118b36ccd531bc3c755))
+* **Google Sheets Node:** Add "By Name" option to selector for Sheets ([#8241](https://github.com/n8n-io/n8n/issues/8241)) ([dce28f9](https://github.com/n8n-io/n8n/commit/dce28f9cb98db33bf22bcfee181f8e9ca64dd2bc))
+* **HTTP Request Node:** Interval Between Requests option for pagination ([#8224](https://github.com/n8n-io/n8n/issues/8224)) ([270328c](https://github.com/n8n-io/n8n/commit/270328ccf6e5502adc092f6f85d146ffb98e1208))
+* Implement MistralCloud Chat & Embeddings nodes ([#8239](https://github.com/n8n-io/n8n/issues/8239)) ([d37b908](https://github.com/n8n-io/n8n/commit/d37b9084b2c657d8b5b8bae6dbb51b428db26e1e))
+* **MongoDB Node:** Add support for TLS ([#8266](https://github.com/n8n-io/n8n/issues/8266)) ([e796e7f](https://github.com/n8n-io/n8n/commit/e796e7f06d73a74a403000c53942d56cab91781b))
+* **Switch Node:** Overhaul ([#7855](https://github.com/n8n-io/n8n/issues/7855)) ([f4092a9](https://github.com/n8n-io/n8n/commit/f4092a9e49f66845612420ba59a013796ed80d45))
+
+
+### Performance Improvements
+
+* **core:** Improve caching service ([#8213](https://github.com/n8n-io/n8n/issues/8213)) ([f53c482](https://github.com/n8n-io/n8n/commit/f53c482939db938c47523ac11a9538e35e1926a9)), closes [#7747](https://github.com/n8n-io/n8n/issues/7747)
+* **core:** Optimize workflow activation errors ([#8242](https://github.com/n8n-io/n8n/issues/8242)) ([f293956](https://github.com/n8n-io/n8n/commit/f2939568cf399e67214e89bc7f859323aaeda8dd))
+
+
+
+# [1.23.0](https://github.com/n8n-io/n8n/compare/n8n@1.22.0...n8n@1.23.0) (2024-01-03)
+
+
+### Bug Fixes
+
+* **Asana Node:** Omit body from GET, HEAD, and DELETE requests ([#8057](https://github.com/n8n-io/n8n/issues/8057)) ([15ffd4f](https://github.com/n8n-io/n8n/commit/15ffd4fb9f967302e2444a873a804d2ccb64e748))
+* **core:** Better input validation for the changeRole endpoint ([#8189](https://github.com/n8n-io/n8n/issues/8189)) ([cfe9525](https://github.com/n8n-io/n8n/commit/cfe9525dd4e2dbf2496bd86ad854bb744b5dc8fe))
+* **core:** Fix issue that pinnedData is not used with Test-Webhooks ([#8123](https://github.com/n8n-io/n8n/issues/8123)) ([fa8bd8b](https://github.com/n8n-io/n8n/commit/fa8bd8b9eb202989229028cb6975cd2b50e5eef9))
+* **core:** Handle empty executions table in pruning in migrations ([#8121](https://github.com/n8n-io/n8n/issues/8121)) ([ffaa30d](https://github.com/n8n-io/n8n/commit/ffaa30ddc4ee312f44726c17a7ec91b5551092ad))
+* **core:** Remove circular dependency in WorkflowService and ActiveWorkflowRunner ([#8128](https://github.com/n8n-io/n8n/issues/8128)) ([21788d9](https://github.com/n8n-io/n8n/commit/21788d9153fb730965dabbce64c50c3b929ee728)), closes [#8122](https://github.com/n8n-io/n8n/issues/8122)
+* **core:** Use pinned data only for manual mode ([#8164](https://github.com/n8n-io/n8n/issues/8164)) ([ea7e76f](https://github.com/n8n-io/n8n/commit/ea7e76fa3b3dc1f37b0415e14ea5ff90b8017b9a))
+* **Discord Node:** Remove unnecessary requirement on parameters ([#8060](https://github.com/n8n-io/n8n/issues/8060)) ([ef3a577](https://github.com/n8n-io/n8n/commit/ef3a57719eb42777502cafdd38009e6cb5b484ce))
+* **editor:** Avoid sanitizing output to search node data ([#8126](https://github.com/n8n-io/n8n/issues/8126)) ([c83d9f4](https://github.com/n8n-io/n8n/commit/c83d9f45bab986eb930e9da69eec970d3a72263d))
+* **editor:** Enable explicit undo keyboard shortcut across all code editors ([#8178](https://github.com/n8n-io/n8n/issues/8178)) ([cf7f668](https://github.com/n8n-io/n8n/commit/cf7f6688bac5dd31dc3a45df4ecce579939141e2)), closes [#5297](https://github.com/n8n-io/n8n/issues/5297)
+* **editor:** Fix operation change failing in certain conditions ([#8114](https://github.com/n8n-io/n8n/issues/8114)) ([711fa2b](https://github.com/n8n-io/n8n/commit/711fa2b9251154b50d8e5e7cd9a857ccb2c0bec6)), closes [/github.com/n8n-io/n8n/blob/7806a65229878a473f5526bad0b94614e8bfa8aa/packages/workflow/src/NodeHelpers.ts#L786](https://github.com//github.com/n8n-io/n8n/blob/7806a65229878a473f5526bad0b94614e8bfa8aa/packages/workflow/src/NodeHelpers.ts/issues/L786)
+* **editor:** Fix templates view layout ([#8196](https://github.com/n8n-io/n8n/issues/8196)) ([d01e42a](https://github.com/n8n-io/n8n/commit/d01e42a2aabedfd4c0f79799bbfc9b1a235d4233))
+* **editor:** Fix UI urls when hosted behind a path prefix ([#8198](https://github.com/n8n-io/n8n/issues/8198)) ([5c078f1](https://github.com/n8n-io/n8n/commit/5c078f1b3d78c7038bfdbb083fd029ef61bf2dfc)), closes [#8061](https://github.com/n8n-io/n8n/issues/8061)
+* **editor:** Prevent browser zoom when scrolling inside sticky edit mode ([#8116](https://github.com/n8n-io/n8n/issues/8116)) ([e928210](https://github.com/n8n-io/n8n/commit/e928210ccdc00ad8a38e3f96ba5145c35e7b007b))
+* **editor:** Prevent canvas undo/redo when NDV is open ([#8118](https://github.com/n8n-io/n8n/issues/8118)) ([39e45d8](https://github.com/n8n-io/n8n/commit/39e45d8b929d474f1e7587329b003fe15b61636d))
+* **editor:** Prevent storing pairedItem data inside of pinData ([#8173](https://github.com/n8n-io/n8n/issues/8173)) ([405e267](https://github.com/n8n-io/n8n/commit/405e26757e2591b42a4bfeedd1fea997fbbb08c9))
+* **GitHub Node:** Fix issue that File->Get did not run once per item ([#8190](https://github.com/n8n-io/n8n/issues/8190)) ([11cda41](https://github.com/n8n-io/n8n/commit/11cda41214100a1a3e65309434ab8be3ccef1898))
+* **Invoice Ninja Node:** Fix issue with custom invoice numbers not working with v5 ([#8200](https://github.com/n8n-io/n8n/issues/8200)) ([3b6ae2d](https://github.com/n8n-io/n8n/commit/3b6ae2d0a510a57b27fc1a44cb3e710e2a783800))
+* **Microsoft Excel 365 Node:** Ensure arg is string during worksheet table search ([#8154](https://github.com/n8n-io/n8n/issues/8154)) ([8e873ca](https://github.com/n8n-io/n8n/commit/8e873ca2f3c73ddd7bbef2218d8da82032f66cec))
+* **Notion Node:** Ensure arg is string during page ID extraction ([#8153](https://github.com/n8n-io/n8n/issues/8153)) ([e94b8a6](https://github.com/n8n-io/n8n/commit/e94b8a6c30aaa2e59117d5a0cc03e1590d7ea8ca))
+* **Redis Trigger Node:** Activating a workflow with a Redis trigger fails ([#8129](https://github.com/n8n-io/n8n/issues/8129)) ([a169b74](https://github.com/n8n-io/n8n/commit/a169b7406279de43dbd3fd7d13166d987c60d01a))
+* **Schedule Trigger Node:** Use the correct `moment` import ([#8185](https://github.com/n8n-io/n8n/issues/8185)) ([17a4e2e](https://github.com/n8n-io/n8n/commit/17a4e2ea80c664e248c136b7e66eef710ccba7f2)), closes [#8184](https://github.com/n8n-io/n8n/issues/8184)
+* Show public API upgrade CTA when feature is not enabled ([#8109](https://github.com/n8n-io/n8n/issues/8109)) ([e9c7fd7](https://github.com/n8n-io/n8n/commit/e9c7fd73975ced504d5a16a0dbbc313f15ccd8ab))
+
+
+### Features
+
+* **core:** Add closeFunction support to Sub-Nodes ([#7708](https://github.com/n8n-io/n8n/issues/7708)) ([bec0fae](https://github.com/n8n-io/n8n/commit/bec0faed9e51fe6ea20ab3b07b4dfa849b28516b))
+* **core:** Add user.profile.beforeUpdate hook ([#8144](https://github.com/n8n-io/n8n/issues/8144)) ([e126ed7](https://github.com/n8n-io/n8n/commit/e126ed74f3d9ed3dae72252cb8c9e8a6f7620808))
+* **core:** Improvements/overhaul for nodes working with binary data ([#7651](https://github.com/n8n-io/n8n/issues/7651)) ([5e16dd4](https://github.com/n8n-io/n8n/commit/5e16dd4ab4457acf21d3d7a3566d07944ff7f857))
+* **core:** Remove discontinued crypto-js  ([#8104](https://github.com/n8n-io/n8n/issues/8104)) ([01e9a79](https://github.com/n8n-io/n8n/commit/01e9a79238bbd2c14ae77a12e54fc1c6f41e1246))
+* **core:** Unify application components shutdown ([#8097](https://github.com/n8n-io/n8n/issues/8097)) ([3a881be](https://github.com/n8n-io/n8n/commit/3a881be6c25b3e16d8c53227dc851cb420f5f1bf))
+* **editor:** Add node execution status indicator to output panel ([#8124](https://github.com/n8n-io/n8n/issues/8124)) ([ab74bad](https://github.com/n8n-io/n8n/commit/ab74bade05cb30e7fa65a491789a3df3ab7bf8b8))
+* **editor:** Add template Id to workflow metadata ([#8088](https://github.com/n8n-io/n8n/issues/8088)) ([517b050](https://github.com/n8n-io/n8n/commit/517b050d0ae1a64987ac00d5795c5e59ed176f3f))
+* **Home Assistant Node:** Use the new Home Assistant logo ([#8150](https://github.com/n8n-io/n8n/issues/8150)) ([518a99e](https://github.com/n8n-io/n8n/commit/518a99e5287dc648edafd34a4dd27c9205eb8629))
+* **Qdrant Vector Store Node:** Qdrant vector store support ([#8080](https://github.com/n8n-io/n8n/issues/8080)) ([66460f6](https://github.com/n8n-io/n8n/commit/66460f66b0b02ae6f342e52500b29fe8b724e1dc))
+* **Wordpress Node:** Add option to ignore error when using self signed certificates ([#8199](https://github.com/n8n-io/n8n/issues/8199)) ([65c8e12](https://github.com/n8n-io/n8n/commit/65c8e12b96ac8c1c53d3879d91982ca834f3cda1))
+
+
+
+# [1.22.0](https://github.com/n8n-io/n8n/compare/n8n@1.21.0...n8n@1.22.0) (2023-12-21)
+
+
+### Bug Fixes
+
+* **ActiveCampaign Node:** Fix pagination issue when loading tags ([#8017](https://github.com/n8n-io/n8n/issues/8017)) ([1943857](https://github.com/n8n-io/n8n/commit/19438572312cf9354c333aeb52ccbf1ab81fc51f))
+* **core:** Close db connection gracefully when exiting ([#8045](https://github.com/n8n-io/n8n/issues/8045)) ([e69707e](https://github.com/n8n-io/n8n/commit/e69707efd4bd947fdf6b9c66f373da63d34f41e9))
+* **core:** Consider timeout in shutdown an error ([#8050](https://github.com/n8n-io/n8n/issues/8050)) ([4cae976](https://github.com/n8n-io/n8n/commit/4cae976a3b428bd528fe71ef0b240c0fd6e23bbf))
+* **core:** Do not display error when stopping jobless execution in queue mode ([#8007](https://github.com/n8n-io/n8n/issues/8007)) ([8e6b951](https://github.com/n8n-io/n8n/commit/8e6b951a76e08b9ee9740fdd853f77553ad60cd6))
+* **core:** Fix shutdown if terminating before hooks are initialized ([#8047](https://github.com/n8n-io/n8n/issues/8047)) ([6ae2f5e](https://github.com/n8n-io/n8n/commit/6ae2f5efea65e23029475ccdc5a65ec7c8152423))
+* **core:** Handle multiple termination signals correctly ([#8046](https://github.com/n8n-io/n8n/issues/8046)) ([67bd8ad](https://github.com/n8n-io/n8n/commit/67bd8ad698bd0afe6ff7183d75da8bca4085598e))
+* **core:** Initialize queue once in queue mode ([#8025](https://github.com/n8n-io/n8n/issues/8025)) ([53c0b49](https://github.com/n8n-io/n8n/commit/53c0b49d15047461e3b65baed65c9d76dff99539))
+* **core:** Prevent axios from force setting a form-urlencoded content-type ([#8117](https://github.com/n8n-io/n8n/issues/8117)) ([bba9576](https://github.com/n8n-io/n8n/commit/bba95761e2f2b54af1fcab8a7b1d626ca10d537e)), closes [/github.com/axios/axios/blob/v1.x/lib/core/dispatchRequest.js#L45-L47](https://github.com//github.com/axios/axios/blob/v1.x/lib/core/dispatchRequest.js/issues/L45-L47)
+* **core:** Remove circular references before serializing executions in public API ([#8043](https://github.com/n8n-io/n8n/issues/8043)) ([989888d](https://github.com/n8n-io/n8n/commit/989888d9bcec6f4eb3c811ce10d480737d96b102)), closes [#8030](https://github.com/n8n-io/n8n/issues/8030)
+* **core:** Restore workflow ID during execution creation ([#8031](https://github.com/n8n-io/n8n/issues/8031)) ([c5e6ba8](https://github.com/n8n-io/n8n/commit/c5e6ba8cdd4a8f117ccc2e89e55497117156d8af)), closes [/github.com/n8n-io/n8n/pull/8002/files#diff-c8cbb62ca9ab2ae45e5f565cd8c63fff6475809a6241ea0b90acc575615224](https://github.com//github.com/n8n-io/n8n/pull/8002/files/issues/diff-c8cbb62ca9ab2ae45e5f565cd8c63fff6475809a6241ea0b90acc575615224)
+* **core:** Use relative imports for dynamic imports in SecurityAuditService ([#8086](https://github.com/n8n-io/n8n/issues/8086)) ([785bf99](https://github.com/n8n-io/n8n/commit/785bf9974e38ea84c016e210a3108f4af567510d)), closes [#8085](https://github.com/n8n-io/n8n/issues/8085)
+* **editor:** Add back credential `use` permission ([#8023](https://github.com/n8n-io/n8n/issues/8023)) ([329e5bf](https://github.com/n8n-io/n8n/commit/329e5bf9eed8556aba2bbd50bad9dbd6d3b373ad))
+* **editor:** Cleanup Executions page component ([#8053](https://github.com/n8n-io/n8n/issues/8053)) ([2689c37](https://github.com/n8n-io/n8n/commit/2689c37e87c5b3ae5029121f4d3dc878841e8844))
+* **editor:** Disable auto scroll and list size check when clicking on executions ([#7983](https://github.com/n8n-io/n8n/issues/7983)) ([fcb8b91](https://github.com/n8n-io/n8n/commit/fcb8b91f37e1fb0ef42f411c84390180e1ed7bbe))
+* **editor:** Ensure execution data overrides pinned data when copying in executions view ([#8009](https://github.com/n8n-io/n8n/issues/8009)) ([1d1cb0d](https://github.com/n8n-io/n8n/commit/1d1cb0d3c530856e0c26d8f146f60b2555625ab6))
+* **editor:** Fix copy/paste issue when switch node is in workflow ([#8103](https://github.com/n8n-io/n8n/issues/8103)) ([4b86926](https://github.com/n8n-io/n8n/commit/4b86926752fb1304a46385cb46bdf34fda0d53b6))
+* **editor:** Make keyboard shortcuts more strict; don't accept extra Ctrl/Alt/Shift keys ([#8024](https://github.com/n8n-io/n8n/issues/8024)) ([8df49e1](https://github.com/n8n-io/n8n/commit/8df49e134d886267f9f7475573d013371220dcac))
+* **editor:** Show credential share info only to appropriate users ([#8020](https://github.com/n8n-io/n8n/issues/8020)) ([b29b4d4](https://github.com/n8n-io/n8n/commit/b29b4d442bb0617aa516748ec48379eae0996cf0))
+* **editor:** Turn off executions list auto-refresh after leaving the page ([#8005](https://github.com/n8n-io/n8n/issues/8005)) ([e3c363d](https://github.com/n8n-io/n8n/commit/e3c363d72cf4ee49086d012f92a7b34be958482f))
+* **editor:** Update image sizes in template description not to be full width always ([#8037](https://github.com/n8n-io/n8n/issues/8037)) ([63a6e7e](https://github.com/n8n-io/n8n/commit/63a6e7e0340e1b00719f212ac620600a90d70ef1))
+* **HTTP Request Node:** Do not create circular references in HTTP request node output ([#8030](https://github.com/n8n-io/n8n/issues/8030)) ([5b7ea16](https://github.com/n8n-io/n8n/commit/5b7ea16d9a20880c72779b02620e99ebe9f3617a))
+* Stop binary data restoration from preventing execution from finishing ([#8082](https://github.com/n8n-io/n8n/issues/8082)) ([5ffff1b](https://github.com/n8n-io/n8n/commit/5ffff1bb22691c09c5ca8b3ada2a19d5ce155a0b))
+* Upgrade axios to address CVE-2023-45857 ([#7713](https://github.com/n8n-io/n8n/issues/7713)) ([64eb9bb](https://github.com/n8n-io/n8n/commit/64eb9bbc3624ee8f2fa90812711ad568926fdca8))
+
+
+### Features
+
+* Add config option to prefer GET request over LIST when using Hashicorp Vault ([#8049](https://github.com/n8n-io/n8n/issues/8049)) ([439a22d](https://github.com/n8n-io/n8n/commit/439a22d68f7bf32f281b1078b71607307640a09b))
+* Add option to `returnIntermediateSteps` for AI agents ([#8113](https://github.com/n8n-io/n8n/issues/8113)) ([7806a65](https://github.com/n8n-io/n8n/commit/7806a65229878a473f5526bad0b94614e8bfa8aa))
+* **core:** Add N8N_GRACEFUL_SHUTDOWN_TIMEOUT env var ([#8068](https://github.com/n8n-io/n8n/issues/8068)) ([614f488](https://github.com/n8n-io/n8n/commit/614f48838626e2af8e3f2e76ee4a144af2d40f72))
+* **editor:** Add lead enrichment suggestions to workflow list ([#8042](https://github.com/n8n-io/n8n/issues/8042)) ([36a923c](https://github.com/n8n-io/n8n/commit/36a923cf7bd4d42b8f8decbf01255c41d6dc1671)), closes [-update-workflows-list-page-to-show-fake-door-templates#comment-b6644c99](https://github.com/-update-workflows-list-page-to-show-fake-door-templates/issues/comment-b6644c99)
+* **editor:** Finalize workers view ([#8052](https://github.com/n8n-io/n8n/issues/8052)) ([edfa784](https://github.com/n8n-io/n8n/commit/edfa78414d6bce901becc05e9d860f2521139688))
+* **editor:** Gracefully ignore invalid payloads in postMessage handler ([#8096](https://github.com/n8n-io/n8n/issues/8096)) ([9d22c7a](https://github.com/n8n-io/n8n/commit/9d22c7a2782a1908f81bcf80260cd91cb296e239))
+* **editor:** Upgrade frontend tooling to address a few vulnerabilities ([#8100](https://github.com/n8n-io/n8n/issues/8100)) ([19b7f1f](https://github.com/n8n-io/n8n/commit/19b7f1ffb17dcd6ac77839f97c2544f60f4ad55e))
+* **Filter Node:** Overhaul UI by adding the new filter component ([#8016](https://github.com/n8n-io/n8n/issues/8016)) ([3d53052](https://github.com/n8n-io/n8n/commit/3d530522f828dfc985ae98e4bb551aa3a2bd44c6))
+* **Respond to Webhook Node:** Overhaul with improvements like returning all items ([#8093](https://github.com/n8n-io/n8n/issues/8093)) ([32d397e](https://github.com/n8n-io/n8n/commit/32d397eff315fdc77677c0b134a7a25bcd8ca5d0))
+
+
+### Performance Improvements
+
+* **editor:** Improve canvas rendering performance ([#8022](https://github.com/n8n-io/n8n/issues/8022)) ([b780436](https://github.com/n8n-io/n8n/commit/b780436a6b445dc5951217b5a1f2c61b34961757))
+
+
+
+# [1.21.0](https://github.com/n8n-io/n8n/compare/n8n@1.20.0...n8n@1.21.0) (2023-12-13)
+
+
+### Bug Fixes
+
+* **core:** Ensure inviter and invitee are set correctly in invite link ([#7943](https://github.com/n8n-io/n8n/issues/7943)) ([386bd61](https://github.com/n8n-io/n8n/commit/386bd619676e54e960ca0af3ff47fa3b9c16c813)), closes [4#a39f9e5ba64a48b58a71d81c837e8227](https://github.com/4/issues/a39f9e5ba64a48b58a71d81c837e8227) [4#f6a177d32bde4b57ae2da0b8e454](https://github.com/4/issues/f6a177d32bde4b57ae2da0b8e454) [4#fef2d36ab02247e1a0f65a74f6fb534](https://github.com/4/issues/fef2d36ab02247e1a0f65a74f6fb534)
+* **core:** Fix user comparison in same-user subworkflow caller policy ([#7913](https://github.com/n8n-io/n8n/issues/7913)) ([92bab72](https://github.com/n8n-io/n8n/commit/92bab72cffb1083b495d211d0a31920e83e66769))
+* **core:** Perform multi-main leader check against key ID ([#7964](https://github.com/n8n-io/n8n/issues/7964)) ([1a87f70](https://github.com/n8n-io/n8n/commit/1a87f70e8404218308072ee2f35c6ba2af34c23f)), closes [4#a39f9e5ba64a48b58a71d81c837e8227](https://github.com/4/issues/a39f9e5ba64a48b58a71d81c837e8227) [4#f6a177d32bde4b57ae2da0b8e454](https://github.com/4/issues/f6a177d32bde4b57ae2da0b8e454) [4#fef2d36ab02247e1a0f65a74f6fb534](https://github.com/4/issues/fef2d36ab02247e1a0f65a74f6fb534)
+* **core:** Prevent workflow history saving error from happening ([#7812](https://github.com/n8n-io/n8n/issues/7812)) ([e5581ce](https://github.com/n8n-io/n8n/commit/e5581ce8023e21d3dcf140099f3a53e5ffb4584f))
+* **editor:** Add missing string for worker in log streaming ([#7971](https://github.com/n8n-io/n8n/issues/7971)) ([148bc1d](https://github.com/n8n-io/n8n/commit/148bc1d303af3aafd73e73e11c3dd9cefd40a1dd)), closes [4#a39f9e5ba64a48b58a71d81c837e8227](https://github.com/4/issues/a39f9e5ba64a48b58a71d81c837e8227) [4#f6a177d32bde4b57ae2da0b8e454](https://github.com/4/issues/f6a177d32bde4b57ae2da0b8e454) [4#fef2d36ab02247e1a0f65a74f6fb534](https://github.com/4/issues/fef2d36ab02247e1a0f65a74f6fb534)
+* **editor:** Allow SSH protocol in git repository URL for environments ([#7944](https://github.com/n8n-io/n8n/issues/7944)) ([bc1c72f](https://github.com/n8n-io/n8n/commit/bc1c72f992a47a9c263aec175ca820088cf340ec)), closes [4#a39f9e5ba64a48b58a71d81c837e8227](https://github.com/4/issues/a39f9e5ba64a48b58a71d81c837e8227) [4#f6a177d32bde4b57ae2da0b8e454](https://github.com/4/issues/f6a177d32bde4b57ae2da0b8e454) [4#fef2d36ab02247e1a0f65a74f6fb534](https://github.com/4/issues/fef2d36ab02247e1a0f65a74f6fb534)
+* **editor:** Fix bug with node names with certain characters ([#8013](https://github.com/n8n-io/n8n/issues/8013)) ([26f0d57](https://github.com/n8n-io/n8n/commit/26f0d57f5fb71a06c92968a4997cceae62f32312))
+* **editor:** Fix Webhook URL expansion icon ([#8011](https://github.com/n8n-io/n8n/issues/8011)) ([b00b905](https://github.com/n8n-io/n8n/commit/b00b9057a42f23cd9c4bb6675a3e6134610bf81b))
+* **editor:** Prevent opening NDV search if `/` is typed in a contenteditable element ([#7968](https://github.com/n8n-io/n8n/issues/7968)) ([e8a493f](https://github.com/n8n-io/n8n/commit/e8a493f71863e6a5d2685b48a61a0d11daf5edc5))
+* **editor:** Return early in ws message handler if no 'command' keyword is found ([#7946](https://github.com/n8n-io/n8n/issues/7946)) ([5b2defc](https://github.com/n8n-io/n8n/commit/5b2defc867a0627a861bf0fb98abfd99f8efe934))
+* Ensure external hooks post workflow execute run in queue mode ([#7947](https://github.com/n8n-io/n8n/issues/7947)) ([3ba7deb](https://github.com/n8n-io/n8n/commit/3ba7deb337963d40ae70f40ffb2f4eb23cac89b7)), closes [4#a39f9e5ba64a48b58a71d81c837e8227](https://github.com/4/issues/a39f9e5ba64a48b58a71d81c837e8227) [4#f6a177d32bde4b57ae2da0b8e454](https://github.com/4/issues/f6a177d32bde4b57ae2da0b8e454) [4#fef2d36ab02247e1a0f65a74f6fb534](https://github.com/4/issues/fef2d36ab02247e1a0f65a74f6fb534)
+* **FileMaker Node:** Prevent erroring on zero fields loaded ([#7955](https://github.com/n8n-io/n8n/issues/7955)) ([10ad386](https://github.com/n8n-io/n8n/commit/10ad3866048ad06d0e8455ed2c52c618ae9e5032)), closes [4#a39f9e5ba64a48b58a71d81c837e8227](https://github.com/4/issues/a39f9e5ba64a48b58a71d81c837e8227) [4#f6a177d32bde4b57ae2da0b8e454](https://github.com/4/issues/f6a177d32bde4b57ae2da0b8e454) [4#fef2d36ab02247e1a0f65a74f6fb534](https://github.com/4/issues/fef2d36ab02247e1a0f65a74f6fb534)
+* Fix issue preventing secrets from loading if the path contains - or / ([#7988](https://github.com/n8n-io/n8n/issues/7988)) ([0ac9594](https://github.com/n8n-io/n8n/commit/0ac959463f25187c5be4116a2209411afd903d87))
+* **Google Sheets Node:** Prevent erroring on zero sheet search results ([#7957](https://github.com/n8n-io/n8n/issues/7957)) ([9b877a9](https://github.com/n8n-io/n8n/commit/9b877a942787c855c3a3a011c19c5d1d30b8da67)), closes [4#a39f9e5ba64a48b58a71d81c837e8227](https://github.com/4/issues/a39f9e5ba64a48b58a71d81c837e8227) [4#f6a177d32bde4b57ae2da0b8e454](https://github.com/4/issues/f6a177d32bde4b57ae2da0b8e454) [4#fef2d36ab02247e1a0f65a74f6fb534](https://github.com/4/issues/fef2d36ab02247e1a0f65a74f6fb534)
+* **Google Sheets Node:** Prevent erroring when fetching mapping columns ([#7972](https://github.com/n8n-io/n8n/issues/7972)) ([29a1066](https://github.com/n8n-io/n8n/commit/29a10668d17cdeb8b0e93c912f59c5976b6fc6c6)), closes [4#a39f9e5ba64a48b58a71d81c837e8227](https://github.com/4/issues/a39f9e5ba64a48b58a71d81c837e8227) [4#f6a177d32bde4b57ae2da0b8e454](https://github.com/4/issues/f6a177d32bde4b57ae2da0b8e454) [4#fef2d36ab02247e1a0f65a74f6fb534](https://github.com/4/issues/fef2d36ab02247e1a0f65a74f6fb534)
+* **Postgres Node:** Do not include id column in upsert fields selection if it's not unique ([#7975](https://github.com/n8n-io/n8n/issues/7975)) ([435392c](https://github.com/n8n-io/n8n/commit/435392cbfe150c5e85d092686b3b7e20273421cc))
+* **Postgres Trigger Node:** Increase manual trigger timeout from 30 to 60 seconds ([#8015](https://github.com/n8n-io/n8n/issues/8015)) ([09a5729](https://github.com/n8n-io/n8n/commit/09a5729305a8072f5e98a320c85ad1c83a6946ed))
+* Restrict updating/deleting of shared but not owned credentials ([#7950](https://github.com/n8n-io/n8n/issues/7950)) ([42e828d](https://github.com/n8n-io/n8n/commit/42e828d5c655e54b6a4ec83c398c684996b9cc3e)), closes [4#a39f9e5ba64a48b58a71d81c837e8227](https://github.com/4/issues/a39f9e5ba64a48b58a71d81c837e8227) [4#f6a177d32bde4b57ae2da0b8e454](https://github.com/4/issues/f6a177d32bde4b57ae2da0b8e454) [4#fef2d36ab02247e1a0f65a74f6fb534](https://github.com/4/issues/fef2d36ab02247e1a0f65a74f6fb534)
+* **Webhook Node:** Binary data handling ([#7804](https://github.com/n8n-io/n8n/issues/7804)) ([565b409](https://github.com/n8n-io/n8n/commit/565b409a82ca6173efd19f26a5f5b27a359a3b87))
+* **Webhook Node:** Do not create binary data when there is no data in the request ([#8000](https://github.com/n8n-io/n8n/issues/8000)) ([70f0755](https://github.com/n8n-io/n8n/commit/70f0755278e0a2bdb61c29623f27623b65473ab4)), closes [/github.com/n8n-io/n8n/pull/7804/files#r1422641833](https://github.com//github.com/n8n-io/n8n/pull/7804/files/issues/r1422641833)
+
+
+### Features
+
+* Add config option for external secret update interval ([#7995](https://github.com/n8n-io/n8n/issues/7995)) ([b6c1c04](https://github.com/n8n-io/n8n/commit/b6c1c04b541d0944c5baac1ab021539c8f020f10))
+* AI nodes usability fixes + Summarization Chain V2 ([#7949](https://github.com/n8n-io/n8n/issues/7949)) ([dcf1286](https://github.com/n8n-io/n8n/commit/dcf12867b3c49596cd214812caee3292d2e794de)), closes [4#a39f9e5ba64a48b58a71d81c837e8227](https://github.com/4/issues/a39f9e5ba64a48b58a71d81c837e8227) [4#f6a177d32bde4b57ae2da0b8e454](https://github.com/4/issues/f6a177d32bde4b57ae2da0b8e454) [4#fef2d36ab02247e1a0f65a74f6fb534](https://github.com/4/issues/fef2d36ab02247e1a0f65a74f6fb534)
+* Data transformation nodes and actions in Nodes Panel ([#7760](https://github.com/n8n-io/n8n/issues/7760)) ([675ec21](https://github.com/n8n-io/n8n/commit/675ec21d335af2b2c9598bc2bec18194506ef71a))
+* **editor:** Add AppCues tracking for onboarding event ([#7945](https://github.com/n8n-io/n8n/issues/7945)) ([04cabaf](https://github.com/n8n-io/n8n/commit/04cabafef7acbc30cba647732e2ca8ae8a02d29a)), closes [4#a39f9e5ba64a48b58a71d81c837e8227](https://github.com/4/issues/a39f9e5ba64a48b58a71d81c837e8227) [4#f6a177d32bde4b57ae2da0b8e454](https://github.com/4/issues/f6a177d32bde4b57ae2da0b8e454) [4#fef2d36ab02247e1a0f65a74f6fb534](https://github.com/4/issues/fef2d36ab02247e1a0f65a74f6fb534)
+* **editor:** Add option to disable NDV in workflow previews  ([#7990](https://github.com/n8n-io/n8n/issues/7990)) ([393afef](https://github.com/n8n-io/n8n/commit/393afef1747f168d5fa42be2424fd02125f1bbac)), closes [4#a39f9e5ba64a48b58a71d81c837e8227](https://github.com/4/issues/a39f9e5ba64a48b58a71d81c837e8227) [4#f6a177d32bde4b57ae2da0b8e454](https://github.com/4/issues/f6a177d32bde4b57ae2da0b8e454) [4#fef2d36ab02247e1a0f65a74f6fb534](https://github.com/4/issues/fef2d36ab02247e1a0f65a74f6fb534)
+* **editor:** Filter component + implement in If node ([#7490](https://github.com/n8n-io/n8n/issues/7490)) ([8a53434](https://github.com/n8n-io/n8n/commit/8a5343401dd355436120a9a424ae455e80b50da6))
+* **editor:** Show template credential setup based on feature flag ([#7989](https://github.com/n8n-io/n8n/issues/7989)) ([08ee307](https://github.com/n8n-io/n8n/commit/08ee3072093fb26b14b48e2b35d8c8d018317f13))
+* **Google Ads Node:** Update to support v15 ([#7962](https://github.com/n8n-io/n8n/issues/7962)) ([7f01269](https://github.com/n8n-io/n8n/commit/7f0126915aae514a0ab515a4baf5582da2aeb1e3))
+* Introduce advanced permissions ([#7844](https://github.com/n8n-io/n8n/issues/7844)) ([dbd62a4](https://github.com/n8n-io/n8n/commit/dbd62a4992ab8aca59e3cb50d3d970454e462238))
+* **Local File Trigger Node:** Add polling option typically good to watch network files/folders ([#7942](https://github.com/n8n-io/n8n/issues/7942)) ([2fbdfec](https://github.com/n8n-io/n8n/commit/2fbdfec0c0a3f5da64764e7821e84db30b664e49))
+* **n8n Form Trigger Node:** Improvements ([#7571](https://github.com/n8n-io/n8n/issues/7571)) ([953a58f](https://github.com/n8n-io/n8n/commit/953a58f18bfdd36fa8b526ca6213631aacab49cb))
+
+
+
+# [1.20.0](https://github.com/n8n-io/n8n/compare/n8n@1.19.0...n8n@1.20.0) (2023-12-06)
+
+
+### Bug Fixes
+
+* **AWS DynamoDB Node:** Improve error message parsing ([#7793](https://github.com/n8n-io/n8n/issues/7793)) ([5ba5ed8](https://github.com/n8n-io/n8n/commit/5ba5ed8e3c8ba2f909859bde129d92576fbda46f))
+* **core:** Allow grace period for binary data deletion after manual execution ([#7889](https://github.com/n8n-io/n8n/issues/7889)) ([61d8aeb](https://github.com/n8n-io/n8n/commit/61d8aebeaf6487269b252b353fdf16dcb67f41ff))
+* **core:** Consolidate ownership and sharing data on workflows and credentials ([#7920](https://github.com/n8n-io/n8n/issues/7920)) ([38b88b9](https://github.com/n8n-io/n8n/commit/38b88b946bab67dc1a964bb3c980a627d4a32595))
+* **core:** Fix hard deletes stopping if database query throws ([#7848](https://github.com/n8n-io/n8n/issues/7848)) ([46dd4d3](https://github.com/n8n-io/n8n/commit/46dd4d3105db3a15c81903ae81c9bbb21a45397b))
+* **core:** Make sure mfa secret and recovery codes are not returned on login ([#7936](https://github.com/n8n-io/n8n/issues/7936)) ([f5502cc](https://github.com/n8n-io/n8n/commit/f5502cc628f6b348f7fe3325b96ec9dc3360beaf)), closes [/github.com/n8n-io/n8n/pull/6994/files#diff-95a87cb029a3d26e6722df2e68132453fc254fc1f4540cbdaa95cfdbda1893deL91](https://github.com//github.com/n8n-io/n8n/pull/6994/files/issues/diff-95a87cb029a3d26e6722df2e68132453fc254fc1f4540cbdaa95cfdbda1893deL91) [4#a39f9e5ba64a48b58a71d81c837e8227](https://github.com/4/issues/a39f9e5ba64a48b58a71d81c837e8227) [4#f6a177d32bde4b57ae2da0b8e454](https://github.com/4/issues/f6a177d32bde4b57ae2da0b8e454) [4#fef2d36ab02247e1a0f65a74f6fb534](https://github.com/4/issues/fef2d36ab02247e1a0f65a74f6fb534)
+* **editor:** Fix deletion of last execution at execution preview ([#7883](https://github.com/n8n-io/n8n/issues/7883)) ([ce2d388](https://github.com/n8n-io/n8n/commit/ce2d388f059c0bb32d27f4b29e901d1a70083610))
+* **editor:** Replace isInstanceOwner checks with scopes where applicable ([#7858](https://github.com/n8n-io/n8n/issues/7858)) ([132d691](https://github.com/n8n-io/n8n/commit/132d691cbf983f60293c7423de0077fb7c97e0af))
+* **Google Sheets Node:** Fix issue with paired items not being set correctly ([#7862](https://github.com/n8n-io/n8n/issues/7862)) ([5207a2f](https://github.com/n8n-io/n8n/commit/5207a2fe5210e40d3b2aedd95182a18e497c72ab))
+* **Notion Node:** Fix broken Notion node parameters ([#7864](https://github.com/n8n-io/n8n/issues/7864)) ([51d1f5b](https://github.com/n8n-io/n8n/commit/51d1f5b82070542d45c3d57387343959a3f0abb2)), closes [#7791](https://github.com/n8n-io/n8n/issues/7791)
+
+
+### Features
+
+* **BambooHR Node:** Add support for Only Current on company reports ([#7878](https://github.com/n8n-io/n8n/issues/7878)) ([4175801](https://github.com/n8n-io/n8n/commit/4175801c90ad4f744d1a7c331d4fb20891ed2e9e))
+* **core:** Allow admin creation ([#7837](https://github.com/n8n-io/n8n/issues/7837)) ([476806e](https://github.com/n8n-io/n8n/commit/476806ebb0f31f656992fb67aba37116f10e1475))
+* **editor:** Add sections to create node panel ([#7831](https://github.com/n8n-io/n8n/issues/7831)) ([39fa8d2](https://github.com/n8n-io/n8n/commit/39fa8d21bbee5d870b2620ec65401a5ca134c4f1))
+* **editor:** Open template credential setup from collection ([#7882](https://github.com/n8n-io/n8n/issues/7882)) ([627ddb9](https://github.com/n8n-io/n8n/commit/627ddb91fb6c00796671a1f72f59a251cd89004d))
+* **editor:** Select credentials in template setup if theres only one ([#7879](https://github.com/n8n-io/n8n/issues/7879)) ([fe3417a](https://github.com/n8n-io/n8n/commit/fe3417a615534a01cb0c7b5e8f47bc18abd5cd4d))
+
+
+### Performance Improvements
+
+* **editor:** Improve node rendering performance when opening large workflows ([#7904](https://github.com/n8n-io/n8n/issues/7904)) ([a8049a0](https://github.com/n8n-io/n8n/commit/a8049a0def21506ebf4fb1d3b69ae28ec35fdc21)), closes [#7901](https://github.com/n8n-io/n8n/issues/7901) [4#a39f9e5ba64a48b58a71d81c837e8227](https://github.com/4/issues/a39f9e5ba64a48b58a71d81c837e8227) [4#f6a177d32bde4b57ae2da0b8e454](https://github.com/4/issues/f6a177d32bde4b57ae2da0b8e454) [4#fef2d36ab02247e1a0f65a74f6fb534](https://github.com/4/issues/fef2d36ab02247e1a0f65a74f6fb534)
+* **editor:** Improve performance when opening large workflows with node issues ([#7901](https://github.com/n8n-io/n8n/issues/7901)) ([4bd7ae2](https://github.com/n8n-io/n8n/commit/4bd7ae29f7c82b8817420e617a123024147c6c70))
+
+
+
+# [1.19.0](https://github.com/n8n-io/n8n/compare/n8n@1.18.0...n8n@1.19.0) (2023-11-29)
+
+
+### Bug Fixes
+
+* **core:** Ensure member and admin cannot be promoted to owner ([#7830](https://github.com/n8n-io/n8n/issues/7830)) ([9b87a59](https://github.com/n8n-io/n8n/commit/9b87a596ca4aec462faedcca1ba4655b168bc3bc)), closes [/linear.app/n8n/issue/PAY-985/add-user-role-modification-endpoint#comment-62355f6](https://github.com//linear.app/n8n/issue/PAY-985/add-user-role-modification-endpoint/issues/comment-62355f6)
+* **core:** Prevent error messages due to statistics about data loading ([#7824](https://github.com/n8n-io/n8n/issues/7824)) ([847f6ac](https://github.com/n8n-io/n8n/commit/847f6ac771316eea270d2e83adac5d8a6483475a))
+* **core:** Tighten checks for multi-main setup usage ([#7788](https://github.com/n8n-io/n8n/issues/7788)) ([fdb2c18](https://github.com/n8n-io/n8n/commit/fdb2c18ecc49d1e8759e809d2e2c2e4aa17009da))
+* **core:** Use AbortController to notify nodes to abort execution ([#6141](https://github.com/n8n-io/n8n/issues/6141)) ([d2c18c5](https://github.com/n8n-io/n8n/commit/d2c18c57274cac02e70cf1cc9e533a6ca98f0ec6))
+* **editor:** Add telemetry to workflow history ([#7811](https://github.com/n8n-io/n8n/issues/7811)) ([d497041](https://github.com/n8n-io/n8n/commit/d4970410e1ba328b05ddc23abcbf33c719de5624))
+* **editor:** Allow owners and admins to share workflows and credentials they don't own ([#7833](https://github.com/n8n-io/n8n/issues/7833)) ([3ab3ec9](https://github.com/n8n-io/n8n/commit/3ab3ec9da88f7b7ae07a98d7ef7c4f9892079048))
+* **editor:** Disable context menu actions in read-only mode ([#7789](https://github.com/n8n-io/n8n/issues/7789)) ([902beff](https://github.com/n8n-io/n8n/commit/902beffce51d547094ea249d1fbbb70a879165d6))
+* **editor:** Fix cloud plan data loading on instance ([#7841](https://github.com/n8n-io/n8n/issues/7841)) ([8b99384](https://github.com/n8n-io/n8n/commit/8b99384367161a47b3de13b7e83bcf6d07e3bf19))
+* **editor:** Fix credential icon for old node type version ([#7843](https://github.com/n8n-io/n8n/issues/7843)) ([4074107](https://github.com/n8n-io/n8n/commit/40741075117dd8018ca1c6d03c050c3959142ebd))
+* **editor:** Fix icon for unknown node type ([#7842](https://github.com/n8n-io/n8n/issues/7842)) ([28ac5a7](https://github.com/n8n-io/n8n/commit/28ac5a750eb28e9ab41611a76fa5fb9c30ce64dc))
+* **editor:** Fix mouse position in workflow previews ([#7853](https://github.com/n8n-io/n8n/issues/7853)) ([c063398](https://github.com/n8n-io/n8n/commit/c0633987bfd6de24db0efc4bcb73adba9e9b6a74))
+* **editor:** Show nice error when environment is not set up ([#7778](https://github.com/n8n-io/n8n/issues/7778)) ([5835e05](https://github.com/n8n-io/n8n/commit/5835e055d39921cdf2aa9799e427931bec8e5e2c))
+* **editor:** Suppress dev server websocket messages in workflow view ([#7808](https://github.com/n8n-io/n8n/issues/7808)) ([685ffd7](https://github.com/n8n-io/n8n/commit/685ffd74137199f5e10145a33f3e0f03dabc2e7f))
+* **Google Sheets Node:** Read operation execute for each item ([#7800](https://github.com/n8n-io/n8n/issues/7800)) ([d548872](https://github.com/n8n-io/n8n/commit/d5488725a83f6705b95c9de9d8736adf1b870134))
+* **HTTP Request Node:** Enable expressions for binary input data fields ([#7782](https://github.com/n8n-io/n8n/issues/7782)) ([6208af0](https://github.com/n8n-io/n8n/commit/6208af07eb393b0fb8483b8ae4949a63423cc409))
+* **Microsoft SQL Node:** Prevent double escaping table name ([#7801](https://github.com/n8n-io/n8n/issues/7801)) ([73ec753](https://github.com/n8n-io/n8n/commit/73ec7533ce4724940c2b23f677a9dfcf75de6a16))
+
+
+### Features
+
+* Add AI tool building capabilities  ([#7336](https://github.com/n8n-io/n8n/issues/7336)) ([87def60](https://github.com/n8n-io/n8n/commit/87def60979bd6525b59df4bd811571a2afe83bec))
+* Add initial scope checks via decorators ([#7737](https://github.com/n8n-io/n8n/issues/7737)) ([a37f1cb](https://github.com/n8n-io/n8n/commit/a37f1cb0bad87c486c387383f8179aa42f0b9e1a))
+* Add user role select to users list settings page ([#7796](https://github.com/n8n-io/n8n/issues/7796)) ([137e238](https://github.com/n8n-io/n8n/commit/137e23853fdbd3e62037a6cb7f742811af41a03d))
+* Ado 1296 spike credential setup in templates ([#7786](https://github.com/n8n-io/n8n/issues/7786)) ([aae45b0](https://github.com/n8n-io/n8n/commit/aae45b043b9e1427f9ffc44ef88d719782fccee5))
+* **core:** Add Support for custom CORS origins for webhooks ([#7455](https://github.com/n8n-io/n8n/issues/7455)) ([99a9ea4](https://github.com/n8n-io/n8n/commit/99a9ea497a3d21739f911da5c88c076f60471bed))
+* **core:** Allow user role modification ([#7797](https://github.com/n8n-io/n8n/issues/7797)) ([7a86d36](https://github.com/n8n-io/n8n/commit/7a86d3606852fcbc537533af24eef34279b229c6))
+* **core:** Set up endpoint for all existing roles with license flag ([#7834](https://github.com/n8n-io/n8n/issues/7834)) ([2356fb0](https://github.com/n8n-io/n8n/commit/2356fb0f0c247271ffa00d1cf25460e06212f1c4))
+* **editor:** Add node name and version to NDV node settings ([#7731](https://github.com/n8n-io/n8n/issues/7731)) ([da85198](https://github.com/n8n-io/n8n/commit/da851986f6f7cd4375b06c28a149dcb375fe8b83))
+* **editor:** Add routing middleware, permission checks, RBAC store, RBAC component ([#7702](https://github.com/n8n-io/n8n/issues/7702)) ([67a8891](https://github.com/n8n-io/n8n/commit/67a88914f2f2d11c413e7f627d659333d8419af8))
+* **editor:** Replace middleware for Role checks with Scope checks ([#7847](https://github.com/n8n-io/n8n/issues/7847)) ([72852a6](https://github.com/n8n-io/n8n/commit/72852a60eb15cbf45ebcdd390770c4cd9929a457))
+* **editor:** Show avatars for users currently working on the same workflow ([#7763](https://github.com/n8n-io/n8n/issues/7763)) ([77bc8ec](https://github.com/n8n-io/n8n/commit/77bc8ecd4b1552f7253bc1348087db518ce7ce07))
+* **Notion Node:** Option to simplify output in getChildBlocks operation ([#7791](https://github.com/n8n-io/n8n/issues/7791)) ([d667bca](https://github.com/n8n-io/n8n/commit/d667bca658a2b79fa5d0afba9ef25f26a10cdfc2))
+* **Slack Node:** Add support for getting the profile of a user ([#7829](https://github.com/n8n-io/n8n/issues/7829)) ([90bb6ba](https://github.com/n8n-io/n8n/commit/90bb6ba4174a71f0d42e8dc9f009b879ca9d4616))
+
+
+
+# [1.18.0](https://github.com/n8n-io/n8n/compare/n8n@1.17.0...n8n@1.18.0) (2023-11-22)
+
+
+### Bug Fixes
+
+* **core:** Account for non-ASCII chars in filename on binary data download ([#7742](https://github.com/n8n-io/n8n/issues/7742)) ([b4ebb1a](https://github.com/n8n-io/n8n/commit/b4ebb1a28dc87c297721299a635e836dcaa273b7))
+* **core:** Correct permissions for getstatus ([#7724](https://github.com/n8n-io/n8n/issues/7724)) ([f96c1d2](https://github.com/n8n-io/n8n/commit/f96c1d204400028c55a2120d0569180379c0649f))
+* **core:** Ensure failed executions are saved in queue mode ([#7744](https://github.com/n8n-io/n8n/issues/7744)) ([b7c5c74](https://github.com/n8n-io/n8n/commit/b7c5c7406f6f978bbd84737de34114e9492ae5f6))
+* **core:** Guard against node not found on cancelling test webhook ([#7750](https://github.com/n8n-io/n8n/issues/7750)) ([6be453b](https://github.com/n8n-io/n8n/commit/6be453b716eff14df420ef565ea1b5ffb3ce73f0))
+* **editor:** Handle permission edge cases (empty scopes) ([#7723](https://github.com/n8n-io/n8n/issues/7723)) ([e2ffd39](https://github.com/n8n-io/n8n/commit/e2ffd397fc0ab8d88128ba78d02c5df003af4a9d))
+* **editor:** Make sure LineController is registered with chart.js ([#7730](https://github.com/n8n-io/n8n/issues/7730)) ([ebee1a5](https://github.com/n8n-io/n8n/commit/ebee1a590873aa56c23fd610616196ee27fe657a))
+* **editor:** Move workerview entry into settings menu ([#7761](https://github.com/n8n-io/n8n/issues/7761)) ([366cd67](https://github.com/n8n-io/n8n/commit/366cd672a74649a19fc927e0327ae7c19ed5a1fc))
+* **editor:** Only show push to git menu item to owners ([#7766](https://github.com/n8n-io/n8n/issues/7766)) ([0d3d33d](https://github.com/n8n-io/n8n/commit/0d3d33dd1f2354248ac341a0c9f2553812f404e0))
+* **editor:** Show v1 banner dismiss button if owner ([#7722](https://github.com/n8n-io/n8n/issues/7722)) ([44d3b3e](https://github.com/n8n-io/n8n/commit/44d3b3ed7ee77715006591a4f49049388fcd4035))
+* **editor:** Use project diagram icon for worker view ([#7764](https://github.com/n8n-io/n8n/issues/7764)) ([ff0b651](https://github.com/n8n-io/n8n/commit/ff0b6511f74831c499ab032910dfa9cf38356e8c))
+* **editor:** Validate user info before submiting ([#7608](https://github.com/n8n-io/n8n/issues/7608)) ([2064f7f](https://github.com/n8n-io/n8n/commit/2064f7f251913a0cc22b4e27bb38df921f711109))
+* **GitHub Node:** Fix issue preventing file edits on branches ([#7734](https://github.com/n8n-io/n8n/issues/7734)) ([ce002a6](https://github.com/n8n-io/n8n/commit/ce002a6cc672d1e13cc3d3470add78781d1ef20e))
+* **Google Sheets Node:** Check for `null` before destructuring ([#7729](https://github.com/n8n-io/n8n/issues/7729)) ([5d4a52d](https://github.com/n8n-io/n8n/commit/5d4a52d3b7e35924e1a8c9a2c808418bdf224d2c))
+* **Item Lists Node:** Don't check same type in remove duplicates operation ([#7678](https://github.com/n8n-io/n8n/issues/7678)) ([4f30764](https://github.com/n8n-io/n8n/commit/4f307646f3a5691331c7c610c62f562921a005f8))
+* **JotForm Trigger Node:** Fix iteration on form loader ([#7751](https://github.com/n8n-io/n8n/issues/7751)) ([82f3202](https://github.com/n8n-io/n8n/commit/82f3202a2de2863f01abe3cf84d6f37eba4fb6fa))
+
+
+### Features
+
+* Add Creator hub link to Templates page ([#7721](https://github.com/n8n-io/n8n/issues/7721)) ([4dbae0e](https://github.com/n8n-io/n8n/commit/4dbae0e2e95d1b5f46cfc50a5a9fc6bb761defde))
+* **core:** Coordinate manual workflow activation and deactivation in multi-main scenario ([#7643](https://github.com/n8n-io/n8n/issues/7643)) ([4c40825](https://github.com/n8n-io/n8n/commit/4c4082503c916d654758da738321f9e78a098ce5)), closes [#7566](https://github.com/n8n-io/n8n/issues/7566)
+* **editor:** Add node context menu ([#7620](https://github.com/n8n-io/n8n/issues/7620)) ([8d12c1a](https://github.com/n8n-io/n8n/commit/8d12c1ad8d9283764647836bdd50224259d506e9))
+* **editor:** Node IO filter ([#7503](https://github.com/n8n-io/n8n/issues/7503)) ([1881765](https://github.com/n8n-io/n8n/commit/18817651ec5d9ed5e774379ae5cf8f57c5461e43))
+
+
+
+# [1.17.0](https://github.com/n8n-io/n8n/compare/n8n@1.16.0...n8n@1.17.0) (2023-11-15)
+
+
+### Bug Fixes
+
+* **Convert to/from binary data Node:** Better mime type defaults ([#7693](https://github.com/n8n-io/n8n/issues/7693)) ([9b3be0c](https://github.com/n8n-io/n8n/commit/9b3be0cfd8b0b58903d89ea3bf0b73be579a4f89))
+* **core:** Consider subworkflows successfully run when in waiting state ([#7699](https://github.com/n8n-io/n8n/issues/7699)) ([0e00dab](https://github.com/n8n-io/n8n/commit/0e00dab9f5d5a6622cdc22fa8bfbecc039f6b67a))
+* **core:** Fix named parameter resolution in migrations ([#7688](https://github.com/n8n-io/n8n/issues/7688)) ([4441ed5](https://github.com/n8n-io/n8n/commit/4441ed51169e8be930c548b17f54147ff6bd8e7d)), closes [#7628](https://github.com/n8n-io/n8n/issues/7628)
+* **core:** Initialize JWT Secret before it's used anywhere ([#7707](https://github.com/n8n-io/n8n/issues/7707)) ([3460eb5](https://github.com/n8n-io/n8n/commit/3460eb5eeba95e51ccdac05084daf883c9750022))
+* **core:** Reduce memory usage in credentials risk auditing ([#7663](https://github.com/n8n-io/n8n/issues/7663)) ([9fd6319](https://github.com/n8n-io/n8n/commit/9fd6319583d0446e41de4fb80d4bc5a6c5e1ca07))
+* **Date & Time Node:** Add fromFormat option to solve ambiguous date strings ([#7675](https://github.com/n8n-io/n8n/issues/7675)) ([d2d11e0](https://github.com/n8n-io/n8n/commit/d2d11e0208e8a20145910bbdd02e7b273fb0aa13))
+* **editor:** Fix resource mapper component being truncated ([#7664](https://github.com/n8n-io/n8n/issues/7664)) ([00dff50](https://github.com/n8n-io/n8n/commit/00dff50140d12e37bfeecdf1300ff313c179ec89))
+* **editor:** More securely clear executions tab auto refresh timer ([#7685](https://github.com/n8n-io/n8n/issues/7685)) ([37dd658](https://github.com/n8n-io/n8n/commit/37dd658dc5bc1128c91d86105bf7f49dfcf96985))
+* **editor:** Redirect to workflow editor after saving in debug mode ([#7645](https://github.com/n8n-io/n8n/issues/7645)) ([020042e](https://github.com/n8n-io/n8n/commit/020042ef1a329e805035061fbf6743bde892e3b1))
+* **Google Sheets Node:** Append exceeding grid limits ([#7684](https://github.com/n8n-io/n8n/issues/7684)) ([88efb99](https://github.com/n8n-io/n8n/commit/88efb9958711bac446b6a698dfba50afd2b46132))
+* **HTTP Request Node:** Support generic credentials when using pagination ([#7686](https://github.com/n8n-io/n8n/issues/7686)) ([48b240b](https://github.com/n8n-io/n8n/commit/48b240b0269858adb8fde8abb8a7211b2a3e78e0)), closes [#7653](https://github.com/n8n-io/n8n/issues/7653)
+* **HubSpot Node:** Fetching available parameters fails when using expressions ([#7672](https://github.com/n8n-io/n8n/issues/7672)) ([a9ab738](https://github.com/n8n-io/n8n/commit/a9ab73896e6a42b2fd5df296c9ee95ac82936b7e))
+* **HubSpot Node:** Update deal owner on Hubspot Deal ([#7673](https://github.com/n8n-io/n8n/issues/7673)) ([3c0734b](https://github.com/n8n-io/n8n/commit/3c0734bd2d92e9d2b9e99658c2e14710f57f36ef))
+* **Spreadsheet File Node:** Read file as utf-8 in v1 ([#7701](https://github.com/n8n-io/n8n/issues/7701)) ([786b4ad](https://github.com/n8n-io/n8n/commit/786b4adcce910fa52104550d90a688c4046628f9))
+
+
+### Features
+
+* **core:** Expression function $ifEmpty ([#7660](https://github.com/n8n-io/n8n/issues/7660)) ([1c7225e](https://github.com/n8n-io/n8n/commit/1c7225ebdb1d92ce45313bbab27b0839d963fc4c))
+* **Date & Time Node:** Option to include other fields in output item ([#7661](https://github.com/n8n-io/n8n/issues/7661)) ([aea3c50](https://github.com/n8n-io/n8n/commit/aea3c501313debaf1cf2b194023a534f829290ea))
+* **Discord Node:** Overhaul ([#5351](https://github.com/n8n-io/n8n/issues/5351)) ([6a53c2a](https://github.com/n8n-io/n8n/commit/6a53c2a375ca71ffad1491da5ae7e6ec461a1a56))
+* **Discourse Node:** Add new options to Get Users ([#7674](https://github.com/n8n-io/n8n/issues/7674)) ([2e8c841](https://github.com/n8n-io/n8n/commit/2e8c841277c2ba45ab2ab3e823135f2b15a7e570))
+* **editor:** Add color selector to sticky node ([#7453](https://github.com/n8n-io/n8n/issues/7453)) ([8359364](https://github.com/n8n-io/n8n/commit/8359364536809e667be86f4b4df0838c94a801d7))
+* **editor:** Add HTTP request nodes for credentials without a node ([#7157](https://github.com/n8n-io/n8n/issues/7157)) ([14035e1](https://github.com/n8n-io/n8n/commit/14035e1244fee5bc49b9afe57d63d9e887f25dd0))
+* **editor:** Add workflow filters to querystring ([#7456](https://github.com/n8n-io/n8n/issues/7456)) ([afd637b](https://github.com/n8n-io/n8n/commit/afd637b5eab2bba33fd9ec8b24104bef5e2a4cc0))
+* **editor:** Adds a EE view to show worker details and job status ([#7600](https://github.com/n8n-io/n8n/issues/7600)) ([cbc6909](https://github.com/n8n-io/n8n/commit/cbc690907fa36e2fde0218dd6f7737d00498c674))
+* **GitLab Node:** Add support for pagination on getIssues ([#7529](https://github.com/n8n-io/n8n/issues/7529)) ([0a0798e](https://github.com/n8n-io/n8n/commit/0a0798e48500b0c159aa37deae7ce5d144f4f4c7))
+* **OpenAI Node:** Add dall-e-3 support ([#7655](https://github.com/n8n-io/n8n/issues/7655)) ([a9c7188](https://github.com/n8n-io/n8n/commit/a9c7188c4d9d3a020cb26647c9030f6ffd47a35a))
+* **RabbitMQ Trigger Node:** Add exchange and routing key options ([#7547](https://github.com/n8n-io/n8n/issues/7547)) ([5aee2b7](https://github.com/n8n-io/n8n/commit/5aee2b768f7743c6508c518bab35206577035380))
+* **Telegram Node:** Add support for markdownv2 ([#7679](https://github.com/n8n-io/n8n/issues/7679)) ([819b3a7](https://github.com/n8n-io/n8n/commit/819b3a746a1cfbb785c97d0c681734211a599852))
+* **Venafi TLS Protect Cloud Node:** Add region parameter to Venafi protect cloud ([#7689](https://github.com/n8n-io/n8n/issues/7689)) ([a08fca5](https://github.com/n8n-io/n8n/commit/a08fca51d928b7bfb7c0081287a38274048892bb))
+
+
+### Performance Improvements
+
+* **core:** Lazyload security audit reporters ([#7696](https://github.com/n8n-io/n8n/issues/7696)) ([b2ca050](https://github.com/n8n-io/n8n/commit/b2ca0500311d85742ef8abf8f9f0d1436e6d9ba1))
+
+
+
+# [1.16.0](https://github.com/n8n-io/n8n/compare/n8n@1.15.1...n8n@1.16.0) (2023-11-08)
+
+
+### Bug Fixes
+
+* **core:** Comply with custom default for workflow saving settings ([#7634](https://github.com/n8n-io/n8n/issues/7634)) ([48c068f](https://github.com/n8n-io/n8n/commit/48c068f97b6c7df08fec9fd9d80a0e7eaacc95f5))
+* **core:** Decrease reset password token expire time ([#7598](https://github.com/n8n-io/n8n/issues/7598)) ([2aa7f63](https://github.com/n8n-io/n8n/commit/2aa7f6375a01625980278aee714bdc06002b0948))
+* **core:** Ensure `init` before checking leader or follower in multi-main scenario ([#7621](https://github.com/n8n-io/n8n/issues/7621)) ([a994ba5](https://github.com/n8n-io/n8n/commit/a994ba5e8d7092edeae05e7aa5fdfbb9fd854034))
+* **core:** Ensure pruning starts only after migrations have completed ([#7626](https://github.com/n8n-io/n8n/issues/7626)) ([f748de9](https://github.com/n8n-io/n8n/commit/f748de9567ed1ecebea0ee35e9c71f8ea0e2d450))
+* **core:** Fix accessor error when running partial execution ([#7618](https://github.com/n8n-io/n8n/issues/7618)) ([26361df](https://github.com/n8n-io/n8n/commit/26361dfcd31c9952c8ef109314ca88f5f03e40f4)), closes [#6229](https://github.com/n8n-io/n8n/issues/6229)
+* **core:** Make password-reset urls valid only for single-use ([#7622](https://github.com/n8n-io/n8n/issues/7622)) ([6031424](https://github.com/n8n-io/n8n/commit/60314248f4b021f451eb744184fe150ddc03bc6e))
+* **Crypto Node:** Fix issue with value not appearing for Sign action ([#7619](https://github.com/n8n-io/n8n/issues/7619)) ([5df583f](https://github.com/n8n-io/n8n/commit/5df583f783731e46500600e6a23ff3b7fdfb4e52))
+* **editor:** Allow overriding theme from query params ([#7591](https://github.com/n8n-io/n8n/issues/7591)) ([2854a0c](https://github.com/n8n-io/n8n/commit/2854a0cf467258c6dacc15c2b200cf6480b6ecef))
+* **editor:** Fix issue that frontend breaks with unkown nodes ([#7596](https://github.com/n8n-io/n8n/issues/7596)) ([db56a9e](https://github.com/n8n-io/n8n/commit/db56a9ee37e8b041ea8958fc8400b9e5b6b81316))
+* **editor:** Fix local storage flags defaulting to undefined string ([#7603](https://github.com/n8n-io/n8n/issues/7603)) ([151e60f](https://github.com/n8n-io/n8n/commit/151e60f829663e79982aae6ac1cd8489f3083224))
+* **editor:** Fix workflow history prune time limit (getting hours instead of days) ([#7644](https://github.com/n8n-io/n8n/issues/7644)) ([3d5a485](https://github.com/n8n-io/n8n/commit/3d5a485bcf7fef4c6b7d96df3a77c041178951a6))
+* **editor:** Hide not supported node options ([#7597](https://github.com/n8n-io/n8n/issues/7597)) ([b532a7b](https://github.com/n8n-io/n8n/commit/b532a7bdb7d33d5ffb20665dfde58cb664d39b4a))
+* **editor:** Remove unknown credentials on pasting workflow ([#7582](https://github.com/n8n-io/n8n/issues/7582)) ([d633753](https://github.com/n8n-io/n8n/commit/d63375368713b31e15735721c7a7603fe08a6645))
+* **editor:** Reset canvas zoom before workspace reset in node view ([#7625](https://github.com/n8n-io/n8n/issues/7625)) ([78b84af](https://github.com/n8n-io/n8n/commit/78b84af8d1cfed005c7d9c715d832e8c91fd9e3f))
+* **editor:** Zoom in/out on canvas the same amount on scroll/gesture ([#7602](https://github.com/n8n-io/n8n/issues/7602)) ([c92402a](https://github.com/n8n-io/n8n/commit/c92402a3cabfdc227f3c929bc7731d42f4516776))
+* **Facebook Lead Ads Trigger Node:** Fix issue with missing scope for business management  ([#7616](https://github.com/n8n-io/n8n/issues/7616)) ([32b85ba](https://github.com/n8n-io/n8n/commit/32b85ba2fec6e74d8648be7e718b52140c1bc4fc))
+
+
+### Features
+
+* **core:** Add the node version to telemetry in node_graph_string ([#7449](https://github.com/n8n-io/n8n/issues/7449)) ([59dc36a](https://github.com/n8n-io/n8n/commit/59dc36abd9141a863cb41c17a9115410b27bdb16))
+* **core:** Coordinate workflow activation in multiple main scenario in internal API ([#7566](https://github.com/n8n-io/n8n/issues/7566)) ([c857e42](https://github.com/n8n-io/n8n/commit/c857e42677ef0d415caf66f00d7af029546dfd79))
+* **core:** Initial support for two-way communication over websockets ([#7570](https://github.com/n8n-io/n8n/issues/7570)) ([ac87701](https://github.com/n8n-io/n8n/commit/ac877014eda83eb2ee61c87f29e2583f3fbfd125))
+* **core:** Log executed migrations with info level ([#7586](https://github.com/n8n-io/n8n/issues/7586)) ([7dac9ab](https://github.com/n8n-io/n8n/commit/7dac9ab82c2f91cfbb66a57f175c1865e8c8107a))
+* **core:** Rate limit forgot password endpoint ([#7604](https://github.com/n8n-io/n8n/issues/7604)) ([5790e25](https://github.com/n8n-io/n8n/commit/5790e251b8072679d7c061e2d2fa1f4229e03cf8))
+* **LinkedIn Node:** Add support for Article thumbnails ([#7489](https://github.com/n8n-io/n8n/issues/7489)) ([e6d3d1a](https://github.com/n8n-io/n8n/commit/e6d3d1a4c2dd6a860e935df4b0ce3f13e23030c7))
+* **NocoDB Node:** Add new data apis and workspace support ([#7329](https://github.com/n8n-io/n8n/issues/7329)) ([da2d2a8](https://github.com/n8n-io/n8n/commit/da2d2a83bbfb05db3a10aef99bfde3ccaf160d60))
+
+
+
+## [1.15.1](https://github.com/n8n-io/n8n/compare/n8n@1.14.0...n8n@1.15.1) (2023-11-02)
+
+
+### Bug Fixes
+
+* **core:** Ensure execution deletion in worker lifecycle hook ([#7481](https://github.com/n8n-io/n8n/issues/7481)) ([742c8a8](https://github.com/n8n-io/n8n/commit/742c8a8534098522fe103fad09fa95f70c460b3d))
+* **core:** Fix data encryption on credentials import ([#7560](https://github.com/n8n-io/n8n/issues/7560)) ([b350568](https://github.com/n8n-io/n8n/commit/b350568505d48ec880fe98d2b62ef090d5399c5f))
+* **core:** Fix issue that prevents owner logging in when using ldap ([#7408](https://github.com/n8n-io/n8n/issues/7408)) ([479f902](https://github.com/n8n-io/n8n/commit/479f90231d0a03c69b17189384812b5a1d81ef3d))
+* **core:** Handle missing resultData in runData  ([#7523](https://github.com/n8n-io/n8n/issues/7523)) ([1055bd3](https://github.com/n8n-io/n8n/commit/1055bd3762b90b013a300bd87e3fa902e902cb9e))
+* **core:** Permission check for subworkflow properly checking for workflow settings ([#7576](https://github.com/n8n-io/n8n/issues/7576)) ([437c95e](https://github.com/n8n-io/n8n/commit/437c95e84e144cc77f2866a74d6b670c415895cd))
+* **core:** Prevent executions from becoming forever running ([#7569](https://github.com/n8n-io/n8n/issues/7569)) ([9bdb85c](https://github.com/n8n-io/n8n/commit/9bdb85c4ced96fde75435e334dc757d6c7679926))
+* **core:** Upgrade crypto-js to address CVE-2023-46233  ([#7519](https://github.com/n8n-io/n8n/issues/7519)) ([65e5593](https://github.com/n8n-io/n8n/commit/65e559323371e8235b92e2134d9908d69043fac4))
+* **editor:** Do not truncate form inputs ([#7528](https://github.com/n8n-io/n8n/issues/7528)) ([ae616f1](https://github.com/n8n-io/n8n/commit/ae616f146bc2ce8d37f8cf5116c6c4c8682a91a6))
+* **editor:** Fix NDV close after using input select ([#7544](https://github.com/n8n-io/n8n/issues/7544)) ([3b5e181](https://github.com/n8n-io/n8n/commit/3b5e181e66f8d7e3860e3078dae7cbb20e92551a))
+* **editor:** Fix NDV unexpected re-render ([#7532](https://github.com/n8n-io/n8n/issues/7532)) ([2853fcf](https://github.com/n8n-io/n8n/commit/2853fcff735fd0b98c19c1192349ef2c659d2493))
+* **editor:** Fix route component caching, incorrect use of array reduce method and enable WF history feature  ([#7434](https://github.com/n8n-io/n8n/issues/7434)) ([12a89e6](https://github.com/n8n-io/n8n/commit/12a89e6d1441f81380d5e477274a5e2d3eb29f2d))
+* **editor:** Fixes the issue that Switch Node can not be created ([#7516](https://github.com/n8n-io/n8n/issues/7516)) ([df89685](https://github.com/n8n-io/n8n/commit/df89685e1548219f4c06614287abafbc96697817))
+* **editor:** Handle `localStorage` being blocked/unavailable ([#7348](https://github.com/n8n-io/n8n/issues/7348)) ([c05bc67](https://github.com/n8n-io/n8n/commit/c05bc6728d3227af4931ddcda5ed8bc6a3539dd0))
+* Fix dark mode small issues ([#7573](https://github.com/n8n-io/n8n/issues/7573)) ([1d81afc](https://github.com/n8n-io/n8n/commit/1d81afcbdf17166f3ebf468673e3ba348ae7fecb))
+* **Jira Software Node:** Handle missing issue types in issue types loader ([#7534](https://github.com/n8n-io/n8n/issues/7534)) ([9762705](https://github.com/n8n-io/n8n/commit/9762705833c809fd2781de179279a15c1be988eb))
+* **Switch Node:** Allow sortable Switch rules ([#7555](https://github.com/n8n-io/n8n/issues/7555)) ([7a56e58](https://github.com/n8n-io/n8n/commit/7a56e58a608132ef795d8c5cdaccb8caa49c0e8f))
+
+
+### Features
+
+* **core:** Add optional Error-Output ([#7460](https://github.com/n8n-io/n8n/issues/7460)) ([655efea](https://github.com/n8n-io/n8n/commit/655efeaf669e9722895b66fef47f000507459210))
+* **core:** Make queue mode settings configurable ([#7526](https://github.com/n8n-io/n8n/issues/7526)) ([3d95b24](https://github.com/n8n-io/n8n/commit/3d95b243e935e4eba97a418d05fa687169ab7d07))
+* **core:** Set up leader selection for multiple main instances ([#7527](https://github.com/n8n-io/n8n/issues/7527)) ([442c73e](https://github.com/n8n-io/n8n/commit/442c73e63bb54f50657a511d88912a80cab64c7f))
+* **editor:** Implement the `UserStack` design system component ([#7559](https://github.com/n8n-io/n8n/issues/7559)) ([ce14f62](https://github.com/n8n-io/n8n/commit/ce14f6266b30caadb477b08d4257b82c769a74c3))
+* **HTTP Request Node:** Add pagination support ([#5993](https://github.com/n8n-io/n8n/issues/5993)) ([cc2bd2e](https://github.com/n8n-io/n8n/commit/cc2bd2e19c8b75320b236de215d389220fbe24ae))
+* **HTTP Request Node:** Update icon and default color ([#7572](https://github.com/n8n-io/n8n/issues/7572)) ([ff279ab](https://github.com/n8n-io/n8n/commit/ff279ab4112435c341b84081d68b976ff03bf261))
+* **n8n Form Trigger Node:** Add text area and password input types ([#7474](https://github.com/n8n-io/n8n/issues/7474)) ([b72040a](https://github.com/n8n-io/n8n/commit/b72040aa5423aa6cb16dea2e7c6ea6439376b653))
+* **editor:** Dark mode is here! You can change it under personal settings.([#6980](https://github.com/n8n-io/n8n/pull/6980)) ([0746783](https://github.com/n8n-io/n8n/commit/0746783e027ebe6715588a68db399a34e0211a96))
+
+
+
+# [1.15.0](https://github.com/n8n-io/n8n/compare/n8n@1.14.0...n8n@1.15.0) (2023-11-02)
+
+
+### Bug Fixes
+
+* **core:** Ensure execution deletion in worker lifecycle hook ([#7481](https://github.com/n8n-io/n8n/issues/7481)) ([742c8a8](https://github.com/n8n-io/n8n/commit/742c8a8534098522fe103fad09fa95f70c460b3d))
+* **core:** Fix data encryption on credentials import ([#7560](https://github.com/n8n-io/n8n/issues/7560)) ([b350568](https://github.com/n8n-io/n8n/commit/b350568505d48ec880fe98d2b62ef090d5399c5f))
+* **core:** Fix issue that prevents owner logging in when using ldap ([#7408](https://github.com/n8n-io/n8n/issues/7408)) ([479f902](https://github.com/n8n-io/n8n/commit/479f90231d0a03c69b17189384812b5a1d81ef3d))
+* **core:** Handle missing resultData in runData  ([#7523](https://github.com/n8n-io/n8n/issues/7523)) ([1055bd3](https://github.com/n8n-io/n8n/commit/1055bd3762b90b013a300bd87e3fa902e902cb9e))
+* **core:** Permission check for subworkflow properly checking for workflow settings ([#7576](https://github.com/n8n-io/n8n/issues/7576)) ([437c95e](https://github.com/n8n-io/n8n/commit/437c95e84e144cc77f2866a74d6b670c415895cd))
+* **core:** Prevent executions from becoming forever running ([#7569](https://github.com/n8n-io/n8n/issues/7569)) ([9bdb85c](https://github.com/n8n-io/n8n/commit/9bdb85c4ced96fde75435e334dc757d6c7679926))
+* **core:** Upgrade crypto-js to address CVE-2023-46233  ([#7519](https://github.com/n8n-io/n8n/issues/7519)) ([65e5593](https://github.com/n8n-io/n8n/commit/65e559323371e8235b92e2134d9908d69043fac4))
+* **editor:** Do not truncate form inputs ([#7528](https://github.com/n8n-io/n8n/issues/7528)) ([ae616f1](https://github.com/n8n-io/n8n/commit/ae616f146bc2ce8d37f8cf5116c6c4c8682a91a6))
+* **editor:** Fix NDV close after using input select ([#7544](https://github.com/n8n-io/n8n/issues/7544)) ([3b5e181](https://github.com/n8n-io/n8n/commit/3b5e181e66f8d7e3860e3078dae7cbb20e92551a))
+* **editor:** Fix NDV unexpected re-render ([#7532](https://github.com/n8n-io/n8n/issues/7532)) ([2853fcf](https://github.com/n8n-io/n8n/commit/2853fcff735fd0b98c19c1192349ef2c659d2493))
+* **editor:** Fix route component caching, incorrect use of array reduce method and enable WF history feature  ([#7434](https://github.com/n8n-io/n8n/issues/7434)) ([12a89e6](https://github.com/n8n-io/n8n/commit/12a89e6d1441f81380d5e477274a5e2d3eb29f2d))
+* **editor:** Fixes the issue that Switch Node can not be created ([#7516](https://github.com/n8n-io/n8n/issues/7516)) ([df89685](https://github.com/n8n-io/n8n/commit/df89685e1548219f4c06614287abafbc96697817))
+* **editor:** Handle `localStorage` being blocked/unavailable ([#7348](https://github.com/n8n-io/n8n/issues/7348)) ([c05bc67](https://github.com/n8n-io/n8n/commit/c05bc6728d3227af4931ddcda5ed8bc6a3539dd0))
+* Fix dark mode small issues ([#7573](https://github.com/n8n-io/n8n/issues/7573)) ([1d81afc](https://github.com/n8n-io/n8n/commit/1d81afcbdf17166f3ebf468673e3ba348ae7fecb))
+* **Jira Software Node:** Handle missing issue types in issue types loader ([#7534](https://github.com/n8n-io/n8n/issues/7534)) ([9762705](https://github.com/n8n-io/n8n/commit/9762705833c809fd2781de179279a15c1be988eb))
+* **Switch Node:** Allow sortable Switch rules ([#7555](https://github.com/n8n-io/n8n/issues/7555)) ([7a56e58](https://github.com/n8n-io/n8n/commit/7a56e58a608132ef795d8c5cdaccb8caa49c0e8f))
+
+
+### Features
+
+* **core:** Add optional Error-Output ([#7460](https://github.com/n8n-io/n8n/issues/7460)) ([655efea](https://github.com/n8n-io/n8n/commit/655efeaf669e9722895b66fef47f000507459210))
+* **core:** Make queue mode settings configurable ([#7526](https://github.com/n8n-io/n8n/issues/7526)) ([3d95b24](https://github.com/n8n-io/n8n/commit/3d95b243e935e4eba97a418d05fa687169ab7d07))
+* **core:** Set up leader selection for multiple main instances ([#7527](https://github.com/n8n-io/n8n/issues/7527)) ([442c73e](https://github.com/n8n-io/n8n/commit/442c73e63bb54f50657a511d88912a80cab64c7f))
+* **editor:** Implement the `UserStack` design system component ([#7559](https://github.com/n8n-io/n8n/issues/7559)) ([ce14f62](https://github.com/n8n-io/n8n/commit/ce14f6266b30caadb477b08d4257b82c769a74c3))
+* **HTTP Request Node:** Add pagination support ([#5993](https://github.com/n8n-io/n8n/issues/5993)) ([cc2bd2e](https://github.com/n8n-io/n8n/commit/cc2bd2e19c8b75320b236de215d389220fbe24ae))
+* **HTTP Request Node:** Update icon and default color ([#7572](https://github.com/n8n-io/n8n/issues/7572)) ([ff279ab](https://github.com/n8n-io/n8n/commit/ff279ab4112435c341b84081d68b976ff03bf261))
+* **n8n Form Trigger Node:** Add text area and password input types ([#7474](https://github.com/n8n-io/n8n/issues/7474)) ([b72040a](https://github.com/n8n-io/n8n/commit/b72040aa5423aa6cb16dea2e7c6ea6439376b653))
+* * **editor:** Dark mode is here! You can change it under personal settings.([#6980](https://github.com/n8n-io/n8n/pull/6980)) ([0746783](https://github.com/n8n-io/n8n/commit/0746783e027ebe6715588a68db399a34e0211a96))
+
+
+
+# [1.14.0](https://github.com/n8n-io/n8n/compare/n8n@1.13.0...n8n@1.14.0) (2023-10-25)
+
+
+### Features
+
+* **Switch Node:** Add support for infinite Switch outputs ([#7499](https://github.com/n8n-io/n8n/issues/7499)) ([2febc61](https://github.com/n8n-io/n8n/commit/2febc61ec94928eb196e1b5f815fffa13f8bae07))
+
+
+
+# [1.13.0](https://github.com/n8n-io/n8n/compare/n8n@1.12.0...n8n@1.13.0) (2023-10-25)
+
+
+### Bug Fixes
+
+* **core:** Always derive `instanceId` from the encryption key (no-changlog) ([#7501](https://github.com/n8n-io/n8n/issues/7501)) ([a9fdd01](https://github.com/n8n-io/n8n/commit/a9fdd018f4f5ba1e11cc10dc3a3b7929a586f818))
+* **core:** Do not return `inviteAcceptUrl` in response if email was sent ([#7465](https://github.com/n8n-io/n8n/issues/7465)) ([55c6a1b](https://github.com/n8n-io/n8n/commit/55c6a1b0d394265fa4018a7023971589d8e61b4a))
+* **core:** Ensure nodes post-processors run in the correct order ([#7500](https://github.com/n8n-io/n8n/issues/7500)) ([6f45298](https://github.com/n8n-io/n8n/commit/6f45298d3d61b33e762f520129f4775e216707c8)), closes [#7497](https://github.com/n8n-io/n8n/issues/7497)
+* **core:** Fix `frontend.settings` external hook execution ([#7496](https://github.com/n8n-io/n8n/issues/7496)) ([774fe20](https://github.com/n8n-io/n8n/commit/774fe202bfde4f2c5cc95f28a33185e261b031a5))
+* **core:** Handle gzip and deflate compressed request payloads ([#7461](https://github.com/n8n-io/n8n/issues/7461)) ([83762e0](https://github.com/n8n-io/n8n/commit/83762e051d5e34d9e43caebd6275780da05c6a46))
+* **core:** Reduce logging overhead for levels that do not output ([#7479](https://github.com/n8n-io/n8n/issues/7479)) ([76c0481](https://github.com/n8n-io/n8n/commit/76c04815f7f53bf6b4c06bbe5afa52f51f28750d))
+* **Customer.io Node:** Fix api endpoint when using EU region ([#7485](https://github.com/n8n-io/n8n/issues/7485)) ([519680c](https://github.com/n8n-io/n8n/commit/519680c2cf37f3b7341e87e71b911ac2fee8bdfa)), closes [#7484](https://github.com/n8n-io/n8n/issues/7484)
+* **editor:** Allow importing the same workflow multiple times ([#7458](https://github.com/n8n-io/n8n/issues/7458)) ([3c0a166](https://github.com/n8n-io/n8n/commit/3c0a166f7f1cf225e5d1b4da91f7449f2deed5ca)), closes [#7457](https://github.com/n8n-io/n8n/issues/7457)
+* **editor:** Fix canvas selection breaking after interacting with node actions ([#7466](https://github.com/n8n-io/n8n/issues/7466)) ([bc47365](https://github.com/n8n-io/n8n/commit/bc473655fbc09b1172cd6949236ca2871c9d3b8e))
+* **editor:** Fix connections disappearing after reactivating canvas and renaming a node ([#7483](https://github.com/n8n-io/n8n/issues/7483)) ([450e0cc](https://github.com/n8n-io/n8n/commit/450e0cc66abbe57697f66835a837e53b5eb883a3))
+* **Google Sheets Node:** Append or update runs forever when without column headers ([#7463](https://github.com/n8n-io/n8n/issues/7463)) ([ab6a9bb](https://github.com/n8n-io/n8n/commit/ab6a9bbac29a2caf34f4dd8211cd18116f659804))
+* **Microsoft SQL Node:** Prevent SQL injection ([#7467](https://github.com/n8n-io/n8n/issues/7467)) ([a739245](https://github.com/n8n-io/n8n/commit/a7392453323fe06371988fd5bb28d659a7a00cd8))
+* **MQTT Trigger Node:** Fix node causing a start up hang when active ([#7498](https://github.com/n8n-io/n8n/issues/7498)) ([baecb93](https://github.com/n8n-io/n8n/commit/baecb93bef30ac00f09b46ea987bb4c9a2fca394))
+* **MySQL Node:** Resolve expressions in v1 ([#7464](https://github.com/n8n-io/n8n/issues/7464)) ([5c46bb0](https://github.com/n8n-io/n8n/commit/5c46bb09c137023608119093cabdf896555b22b9))
+* **Redis Node:** Fix adding sets data types ([#7444](https://github.com/n8n-io/n8n/issues/7444)) ([4e66023](https://github.com/n8n-io/n8n/commit/4e66023cd428513b76626795c27ba0713c6c4ea9)), closes [#6339](https://github.com/n8n-io/n8n/issues/6339)
+* **Spreadsheet File Node:** Fix include empty cells not working with v2 ([#7505](https://github.com/n8n-io/n8n/issues/7505)) ([05e6f2a](https://github.com/n8n-io/n8n/commit/05e6f2a6ac43fb4059e7e6cc40af6c5d75e01c8b)), closes [Ticket#763644](https://github.com/Ticket/issues/763644)
+
+
+### Features
+
+* **core:** Add support for oauth based service accounts with UM SMTP ([#7311](https://github.com/n8n-io/n8n/issues/7311)) ([647372b](https://github.com/n8n-io/n8n/commit/647372be275c46e9963c96163c9e913a17f13e5f))
+* **editor:** Add PH tracking to event ([#7511](https://github.com/n8n-io/n8n/issues/7511)) ([c47d27d](https://github.com/n8n-io/n8n/commit/c47d27dd6da9420add7dad243b2701876f39a95b))
+* **Facebook Lead Ads Trigger Node:** Add Facebook Lead Ads Trigger Node ([#7113](https://github.com/n8n-io/n8n/issues/7113)) ([ac814a9](https://github.com/n8n-io/n8n/commit/ac814a9c613f6f9943be8002110ca9e2433918b2))
+* **Ghost Node:** Add support for lexical format ([#7488](https://github.com/n8n-io/n8n/issues/7488)) ([7b1973c](https://github.com/n8n-io/n8n/commit/7b1973c058e0cb7dfa436953c6f046c2b3b145eb))
+* **RSS Feed Trigger Node:** Add RSS feed trigger node ([#7386](https://github.com/n8n-io/n8n/issues/7386)) ([689360e](https://github.com/n8n-io/n8n/commit/689360ee069043415838f1488486ce8deaef9e38))
+
+
+
+# [1.12.0](https://github.com/n8n-io/n8n/compare/n8n@1.11.0...n8n@1.12.0) (2023-10-18)
+
+
+### Bug Fixes
+
+* **core:** Add check that queue is defined and remove cyclic dependency ([#7404](https://github.com/n8n-io/n8n/issues/7404)) ([45f2ef3](https://github.com/n8n-io/n8n/commit/45f2ef373ee76abb0d4b9ad805beb02d8969ebd6))
+* **core:** Do not throw when deleting workflows with executions without binary-data ([#7411](https://github.com/n8n-io/n8n/issues/7411)) ([2b6a15e](https://github.com/n8n-io/n8n/commit/2b6a15e478fd1a6041be4eac19dcf1c5e5583886))
+* **core:** Fix expression with paired item with multi-input node ([#7424](https://github.com/n8n-io/n8n/issues/7424)) ([ec14141](https://github.com/n8n-io/n8n/commit/ec141416e29540a2bf6ce99be1b13d76517eca13))
+* **core:** Fix ignoring crashed executions without event msgs ([#7368](https://github.com/n8n-io/n8n/issues/7368)) ([2f4d91b](https://github.com/n8n-io/n8n/commit/2f4d91b2cd2b87ae4aceb06a4170cd86802c9bbf))
+* **core:** Pg-promise de-initialization fix ([#7417](https://github.com/n8n-io/n8n/issues/7417)) ([7703904](https://github.com/n8n-io/n8n/commit/77039044ebd74b907a44a08ae5421517fc74b46e))
+* **core:** Prevent false stalled jobs in queue mode from displaying as errored ([#7435](https://github.com/n8n-io/n8n/issues/7435)) ([e01b9e5](https://github.com/n8n-io/n8n/commit/e01b9e5ae1bf6ccdec422c2767fdf870b2e159b0))
+* **core:** Prevent undefined issues when restoring binary data ([#7419](https://github.com/n8n-io/n8n/issues/7419)) ([46977a2](https://github.com/n8n-io/n8n/commit/46977a2aff342bc7568f5a378b78689a5c3d8e95))
+* **editor:** Fix remote options fetching on every keystroke ([#7320](https://github.com/n8n-io/n8n/issues/7320)) ([367255a](https://github.com/n8n-io/n8n/commit/367255ab2c13b4a33a746d3d4b9f3164309a11c8))
+* **editor:** Open only one tab with plans page ([#7377](https://github.com/n8n-io/n8n/issues/7377)) ([c599006](https://github.com/n8n-io/n8n/commit/c599006b917e681fca918b789a80d79883bd69a9))
+* **Google Sheets Node:** Update by row_number, restored 'Handling Extra Data Option', updated Cell Format default ([#7357](https://github.com/n8n-io/n8n/issues/7357)) ([d8531a5](https://github.com/n8n-io/n8n/commit/d8531a53b9a256095157129b64adde7749aa84c9))
+* **Ldap Node:** Fix issue with connections not closing correctly ([#7432](https://github.com/n8n-io/n8n/issues/7432)) ([c3f0be8](https://github.com/n8n-io/n8n/commit/c3f0be809f3ea09573fec26648ef030c7d8ddc16))
+* **Set Node:** Null should not throw an error ([#7416](https://github.com/n8n-io/n8n/issues/7416)) ([e9b6ab0](https://github.com/n8n-io/n8n/commit/e9b6ab04cd4b292c291b77e66aa717605e72f852))
+* **TheHive 5 Node:** Observable encoding in alert > create fix ([#7450](https://github.com/n8n-io/n8n/issues/7450)) ([a2d2e3d](https://github.com/n8n-io/n8n/commit/a2d2e3dda798d166cfc2a49b0c4f0eb164a666dc))
+
+
+### Features
+
+* **core:** Make executions pruning interval configurable ([#7439](https://github.com/n8n-io/n8n/issues/7439)) ([40707fa](https://github.com/n8n-io/n8n/commit/40707fa6926776aa806221df8edee05ee7e9f3ed))
+* **Google Calendar Trigger Node:** Add support for cancelled events ([#7436](https://github.com/n8n-io/n8n/issues/7436)) ([9d241a0](https://github.com/n8n-io/n8n/commit/9d241a0d6dbfd990920708c718ff3de83c9b5883))
+* **HubSpot Trigger Node:** Add support for ticket related events ([#7156](https://github.com/n8n-io/n8n/issues/7156)) ([57c6093](https://github.com/n8n-io/n8n/commit/57c609384af7c583c213c639add7170e0bbb24fd))
+* **n8n Form Trigger Node:** New node ([#7130](https://github.com/n8n-io/n8n/issues/7130)) ([3ddc176](https://github.com/n8n-io/n8n/commit/3ddc176dfa2d3d99a328a29a3a8613e35ff456a0))
+* **Spreadsheet File Node:** Improve CSV parsing ([#7448](https://github.com/n8n-io/n8n/issues/7448)) ([79f23fb](https://github.com/n8n-io/n8n/commit/79f23fb93979aa1ef3a9bbf7049b93d1e6a0e95a))
+
+
+
+# [1.11.0](https://github.com/n8n-io/n8n/compare/n8n@1.10.0...n8n@1.11.0) (2023-10-11)
+
+
+### Bug Fixes
+
+* Add role check for upgrade path ([#7374](https://github.com/n8n-io/n8n/issues/7374)) ([a43f720](https://github.com/n8n-io/n8n/commit/a43f720658aedf8a52f713c28b29ed08bfad33c8))
+* **core:** Add an option to enable postgres ssl with default certs ([#6889](https://github.com/n8n-io/n8n/issues/6889)) ([789e1e7](https://github.com/n8n-io/n8n/commit/789e1e7ed41838bdadb5e8cb429aa76610fa5749))
+* **core:** Fix error on missing paired item data ([#7399](https://github.com/n8n-io/n8n/issues/7399)) ([47e8953](https://github.com/n8n-io/n8n/commit/47e8953ec9cccaddc603aff4c6e6fce88258e6d0))
+* **core:** Missing pairing info ([#7326](https://github.com/n8n-io/n8n/issues/7326)) ([e2c3c7a](https://github.com/n8n-io/n8n/commit/e2c3c7acebdae2014b32620277fce70d0db85dd0))
+* **core:** Prevent object deletion request on no prefix match ([#7366](https://github.com/n8n-io/n8n/issues/7366)) ([63e11e4](https://github.com/n8n-io/n8n/commit/63e11e4be93a50fe753d84771dbc72ead38fdc0e))
+* **editor:** Fix completions for `.json` on quoted node name in Code node ([#7382](https://github.com/n8n-io/n8n/issues/7382)) ([86e7ec7](https://github.com/n8n-io/n8n/commit/86e7ec796acd9d8fbe8e42a5beba687cd6133a2f)), closes [/linear.app/n8n/issue/PAY-635/autocomplete-only-supports-3-levels-of-children#comment-234f738](https://github.com//linear.app/n8n/issue/PAY-635/autocomplete-only-supports-3-levels-of-children/issues/comment-234f738)
+* **editor:** Implement canvas zoom UX improvements ([#7376](https://github.com/n8n-io/n8n/issues/7376)) ([7e06b31](https://github.com/n8n-io/n8n/commit/7e06b31a5f3de8f073e7ef42be24e04899091486))
+* **editor:** Make workflow history button available only for dev builds ([#7392](https://github.com/n8n-io/n8n/issues/7392)) ([7ed466d](https://github.com/n8n-io/n8n/commit/7ed466db7faa9af88e54276bc6cb9a6dc9e80493))
+* **editor:** Remove excess margin below run data editor ([#7372](https://github.com/n8n-io/n8n/issues/7372)) ([3fa2764](https://github.com/n8n-io/n8n/commit/3fa27647d8e8a39812d9802d4c0954b3135db847))
+* **editor:** Sanitize HTML binary-data before rendering in the UI ([#7400](https://github.com/n8n-io/n8n/issues/7400)) ([2b075bf](https://github.com/n8n-io/n8n/commit/2b075bfc2da02afc43c1ebfee565b849c87aee49))
+* **editor:** Use display option's @Version specifier  ([#7351](https://github.com/n8n-io/n8n/issues/7351)) ([afbf0c3](https://github.com/n8n-io/n8n/commit/afbf0c3d5e50976ca5d9f4c08051ea7bd3d2b354))
+* **Google BigQuery Node:** Location default to jobReference ([#7354](https://github.com/n8n-io/n8n/issues/7354)) ([97bb703](https://github.com/n8n-io/n8n/commit/97bb703d0a13cf979a2c462c87570707d5032867))
+* **Google Drive Trigger Node:** Add Shared Drives support ([#7369](https://github.com/n8n-io/n8n/issues/7369)) ([3e7a4d3](https://github.com/n8n-io/n8n/commit/3e7a4d3b2cc12fcb1b011fccd0773bb807986884))
+* **Google Sheets Node:** Fix "Maximum call stack size exceeded" error on too many rows ([#7384](https://github.com/n8n-io/n8n/issues/7384)) ([732b15a](https://github.com/n8n-io/n8n/commit/732b15a1faeab5b802dfddb282418601f34ade27))
+* **HTML Node:** Update property fields to not use expressions on drag ([#7379](https://github.com/n8n-io/n8n/issues/7379)) ([77643e5](https://github.com/n8n-io/n8n/commit/77643e5ccbc2f68cd240c7aa7e21c0efbcc08b63))
+* **Notion Node:** Handle empty values correctly for Notion selects + multi selects ([#7383](https://github.com/n8n-io/n8n/issues/7383)) ([fbcd1d4](https://github.com/n8n-io/n8n/commit/fbcd1d40edfa8737a8786a8f961723c42f84a851))
+* **Set Node:** Increase search priority ([#7358](https://github.com/n8n-io/n8n/issues/7358)) ([e5ad1e7](https://github.com/n8n-io/n8n/commit/e5ad1e7e4df33a06c9649fe0652edfc80f7cb818))
+* **Webhook Node:** Backward compatible form-data parsing for non-array files ([#7385](https://github.com/n8n-io/n8n/issues/7385)) ([6479eb1](https://github.com/n8n-io/n8n/commit/6479eb180ff9a43791b5211157f5c450e1463ffd))
+
+
+### Features
+
+* **core:** Add Job Summary to Worker response ([#7360](https://github.com/n8n-io/n8n/issues/7360)) ([b8608ce](https://github.com/n8n-io/n8n/commit/b8608cee6d5ab96ec38a8a7f5428d02ce01366ee))
+* **core:** Integrate object store as binary data manager ([#7253](https://github.com/n8n-io/n8n/issues/7253)) ([1a661e6](https://github.com/n8n-io/n8n/commit/1a661e6d00e907b9bc4bdc248db6dbc25972294b)), closes [#7225](https://github.com/n8n-io/n8n/issues/7225)
+* **core:** Switch binary filesystem mode to nested path structure ([#7307](https://github.com/n8n-io/n8n/issues/7307)) ([0847623](https://github.com/n8n-io/n8n/commit/0847623f85192232d129778ab4295be3cd685877)), closes [#7253](https://github.com/n8n-io/n8n/issues/7253)
+* **editor:** Make PDF and Audio binary-data viewable in the UI ([#7367](https://github.com/n8n-io/n8n/issues/7367)) ([8187be1](https://github.com/n8n-io/n8n/commit/8187be1b7dd723fec9591e2fc4f57a782f3ca398)), closes [#7361](https://github.com/n8n-io/n8n/issues/7361)
+* **editor:** Support autologin for upgrade path ([#7316](https://github.com/n8n-io/n8n/issues/7316)) ([1dfa052](https://github.com/n8n-io/n8n/commit/1dfa052301c4580838bc17830676c8fb383a00b4))
+* **Execute Workflow Node:** Run once for each item mode ([#7289](https://github.com/n8n-io/n8n/issues/7289)) ([c8c14ca](https://github.com/n8n-io/n8n/commit/c8c14ca0af1faaf680c97868210b7372ac8ac61e))
+* **Item Lists Node:** Split merge binary data ([#7297](https://github.com/n8n-io/n8n/issues/7297)) ([965db8f](https://github.com/n8n-io/n8n/commit/965db8f7f272056d10515a94a3b0b69b75913a9a))
+* **Loop Over Items (Split in Batches) Node:** Automatically add a loop + rename ([#7228](https://github.com/n8n-io/n8n/issues/7228)) ([7b773cc](https://github.com/n8n-io/n8n/commit/7b773cc5cc77853f73db186f7f7a7fbc6379db31))
+* **Notion Node:** Fetch child blocks recursively ([#7304](https://github.com/n8n-io/n8n/issues/7304)) ([193181a](https://github.com/n8n-io/n8n/commit/193181a9c62d21812e5452b06606c63f26f6b9d0))
+
+
+
+# [1.10.0](https://github.com/n8n-io/n8n/compare/n8n@1.9.0...n8n@1.10.0) (2023-10-05)
+
+
+### Bug Fixes
+
+* **Convert to/from binary data Node:** Rename 'Move Binary Data' to 'Convert to/from binary data' ([#7318](https://github.com/n8n-io/n8n/issues/7318)) ([5e6c1d4](https://github.com/n8n-io/n8n/commit/5e6c1d4f4bc049d366dbc9b66d5481f6ed43190e))
+* **core:** Account for itemless case on restoring binary data ID ([#7305](https://github.com/n8n-io/n8n/issues/7305)) ([1691223](https://github.com/n8n-io/n8n/commit/169122378968b4d4c73d921ee2d5d86b76e1cd01))
+* **core:** Fix pruning of non-finished executions ([#7333](https://github.com/n8n-io/n8n/issues/7333)) ([1b4848a](https://github.com/n8n-io/n8n/commit/1b4848afcb817621e0977186c7400945758bee96))
+* **editor:** Disable email confirmation banner for trialing users ([#7340](https://github.com/n8n-io/n8n/issues/7340)) ([6d3d178](https://github.com/n8n-io/n8n/commit/6d3d1789dbd800a6ef75aab3a69e5b5ef5dba933))
+* **editor:** Display value of selected matching column in RMC ([#7298](https://github.com/n8n-io/n8n/issues/7298)) ([3aac22b](https://github.com/n8n-io/n8n/commit/3aac22b4c1d472b8470346bfc4df99b7794c3692))
+* **editor:** Fix canvas endpoint snapping when dragging connection ([#7346](https://github.com/n8n-io/n8n/issues/7346)) ([b59b908](https://github.com/n8n-io/n8n/commit/b59b9086d769b859156f4f8f99411afe5e4b9108))
+* **editor:** Fix disappearing NDV header in code nodes ([#7290](https://github.com/n8n-io/n8n/issues/7290)) ([7ebf8f3](https://github.com/n8n-io/n8n/commit/7ebf8f327ad433acc949034cd070f2362dfacd4e))
+* **editor:** Fix RLC not loading when an expression can't resolve ([#7295](https://github.com/n8n-io/n8n/issues/7295)) ([ddc26c2](https://github.com/n8n-io/n8n/commit/ddc26c21bd8da6c95cbe447bf7e479ddc449e6a4))
+* **editor:** Separate cloud endpoint calls ([#7312](https://github.com/n8n-io/n8n/issues/7312)) ([04dfcd7](https://github.com/n8n-io/n8n/commit/04dfcd73bee2c1ea0d47fd7102383719827d53d0))
+* **Jira Software Node:** Get all users in dropdown/RLC ([#7322](https://github.com/n8n-io/n8n/issues/7322)) ([3704760](https://github.com/n8n-io/n8n/commit/370476072471da6b3b849d8f5acc5cf1380a5ba8)), closes [#2670](https://github.com/n8n-io/n8n/issues/2670)
+* **Notion Node:** Rename Notion API Key to Internal Integration Token ([#7176](https://github.com/n8n-io/n8n/issues/7176)) ([ec2aa38](https://github.com/n8n-io/n8n/commit/ec2aa3819c1e9624c4692d5f6942f096aae900e7))
+* **Postgres Node:** Node requires comma-separated string even when using a single parameter through an expression ([#7300](https://github.com/n8n-io/n8n/issues/7300)) ([763d451](https://github.com/n8n-io/n8n/commit/763d4514fafe489c169cd0513bf3b2c4cf7f7f12))
+* **Set Node:** Do not stringify null and undefined ([#7313](https://github.com/n8n-io/n8n/issues/7313)) ([f0a6687](https://github.com/n8n-io/n8n/commit/f0a66873b94b032792f30bc279118cdb13210505))
+* **Typeform Trigger Node:** Change output format for TypeForm trigger to object instead of array ([#7315](https://github.com/n8n-io/n8n/issues/7315)) ([b3fc00e](https://github.com/n8n-io/n8n/commit/b3fc00e045dc16f758b684b71591ec2d1f889d73))
+
+
+### Features
+
+* **core:** Add "Sent by n8n" attribution ([#7183](https://github.com/n8n-io/n8n/issues/7183)) ([8f9fe62](https://github.com/n8n-io/n8n/commit/8f9fe6269b5608346b0ac3612aa2e3af4a7baae1))
+* **core:** Add support for building LLM applications ([#7235](https://github.com/n8n-io/n8n/issues/7235)) ([00a4b8b](https://github.com/n8n-io/n8n/commit/00a4b8b0c62883f2a36559a939f9c32c5d1c048e)), closes [#7246](https://github.com/n8n-io/n8n/issues/7246) [#7137](https://github.com/n8n-io/n8n/issues/7137)
+* Workflow History pruning and prune time settings ([#7343](https://github.com/n8n-io/n8n/issues/7343)) ([0adc533](https://github.com/n8n-io/n8n/commit/0adc53371969ac3f759d06d9fbb095267fffe95e))
+
+
+
+# [1.9.0](https://github.com/n8n-io/n8n/compare/n8n@1.8.0...n8n@1.9.0) (2023-09-28)
+
+
+### Bug Fixes
+
+* **Airtable Node:** Attachments field type fix ([#7227](https://github.com/n8n-io/n8n/issues/7227)) ([2af967c](https://github.com/n8n-io/n8n/commit/2af967cf88a4d6e795ff1641f9946f9fcbf49a03))
+* **core:** Change WorkflowHistory nodes/connections columns to be json ([#7282](https://github.com/n8n-io/n8n/issues/7282)) ([a80abad](https://github.com/n8n-io/n8n/commit/a80abad3af8fed3a40b6f713cd94a16f44d84f60))
+* **core:** Fix binary data manager check on pruning ([#7251](https://github.com/n8n-io/n8n/issues/7251)) ([484035e](https://github.com/n8n-io/n8n/commit/484035eb519ab28de31488484caaa4bf9a77d095))
+* **core:** Fix missing execution ID in webhook-based workflow producing binary data ([#7244](https://github.com/n8n-io/n8n/issues/7244)) ([33991e9](https://github.com/n8n-io/n8n/commit/33991e92d0aabd13a44ba103de43a6ec2b90ca46))
+* **core:** Handle filename* with quotes in Content-Disposition header ([#7229](https://github.com/n8n-io/n8n/issues/7229)) ([67b985f](https://github.com/n8n-io/n8n/commit/67b985fe89cc45e40f66b38bd2e0c310a4b3504c))
+* **core:** Make DNS resolution order configurable ([#7272](https://github.com/n8n-io/n8n/issues/7272)) ([5b3121c](https://github.com/n8n-io/n8n/commit/5b3121c415ec96535eae4ed2adc28461311b6c6e))
+* **core:** Make senderId required for all command messages ([#7252](https://github.com/n8n-io/n8n/issues/7252)) ([4b01428](https://github.com/n8n-io/n8n/commit/4b014286cf66e5f9b660fc145274be7caccbf34c))
+* **core:** Prevent executions from displaying Running status incorrectly ([#7261](https://github.com/n8n-io/n8n/issues/7261)) ([861cac5](https://github.com/n8n-io/n8n/commit/861cac5257f5e0d3cc2a010f09481ab93b8241e6)), closes [/linear.app/n8n/issue/HELP-338/large-number-of-long-running-executions-for-nadjalemlist#comment-18d1fc96](https://github.com//linear.app/n8n/issue/HELP-338/large-number-of-long-running-executions-for-nadjalemlist/issues/comment-18d1fc96)
+* **core:** Use consistent timezone-aware timestamps in postgres ([#6948](https://github.com/n8n-io/n8n/issues/6948)) ([0132514](https://github.com/n8n-io/n8n/commit/0132514f8b7005a895880bab9f547484e2e90710)), closes [#2178](https://github.com/n8n-io/n8n/issues/2178) [#2810](https://github.com/n8n-io/n8n/issues/2810) [#3855](https://github.com/n8n-io/n8n/issues/3855) [#2813](https://github.com/n8n-io/n8n/issues/2813)
+* **editor:** Add debug feature docs link ([#7240](https://github.com/n8n-io/n8n/issues/7240)) ([4614e1e](https://github.com/n8n-io/n8n/commit/4614e1e1c90f1c7630ccc58e8400380afedba585))
+* **editor:** Fix SQL editor issue ([#7236](https://github.com/n8n-io/n8n/issues/7236)) ([647fc6c](https://github.com/n8n-io/n8n/commit/647fc6c555702bb3222871fb50f8916c6d2ae3f3))
+* Ensure new Set node is on top of search list ([#7215](https://github.com/n8n-io/n8n/issues/7215)) ([2491ccf](https://github.com/n8n-io/n8n/commit/2491ccf4d9f36ecc93e559918cf68c690ae149db))
+* **HTTP Request Node:** Add suggestion how to fix '429 - too many requests' errors ([#7293](https://github.com/n8n-io/n8n/issues/7293)) ([0bc33b1](https://github.com/n8n-io/n8n/commit/0bc33b1cc2c2d3ae8db0342545b3a4a2b4931af9))
+* Issue enforcing user limits on start plan ([#7188](https://github.com/n8n-io/n8n/issues/7188)) ([303bc8e](https://github.com/n8n-io/n8n/commit/303bc8e71e60c3ee8ccd6b823814945d892e3726))
+* **Item Lists Node:** Concatenate operation pairedItems fix ([#7286](https://github.com/n8n-io/n8n/issues/7286)) ([cde23a1](https://github.com/n8n-io/n8n/commit/cde23a1bb1934bebe8e19308745910d625e3ca73))
+* **Respond to Webhook Node:** JSON output from expression fix ([#7294](https://github.com/n8n-io/n8n/issues/7294)) ([8bc369d](https://github.com/n8n-io/n8n/commit/8bc369dd40836472502dc7b36c503a04db3f480c))
+
+
+### Features
+
+* Add onboarding flow ([#7212](https://github.com/n8n-io/n8n/issues/7212)) ([01e9340](https://github.com/n8n-io/n8n/commit/01e93406219f6c1712247d9855590ea06df3e965))
+* Add user cloud it to telemetry ([#7232](https://github.com/n8n-io/n8n/issues/7232)) ([60c152d](https://github.com/n8n-io/n8n/commit/60c152dc72c27862f50304b8a824e2ec5e201787))
+* **core:** Add secrets provider reload and refactor ([#7277](https://github.com/n8n-io/n8n/issues/7277)) ([53a7502](https://github.com/n8n-io/n8n/commit/53a7502d20eb95055e842e0450e9daea308443a1))
+* **core:** Add Tournament as the new default expression evaluator ([#6964](https://github.com/n8n-io/n8n/issues/6964)) ([bf74f09](https://github.com/n8n-io/n8n/commit/bf74f09d69014da3c3fb2a56288b010670a4b982))
+* **core:** Initial workflow history API ([#7234](https://github.com/n8n-io/n8n/issues/7234)) ([0083a9e](https://github.com/n8n-io/n8n/commit/0083a9e45d21928be259664532528706d0a57ecf))
+* **core:** Introduce object store service ([#7225](https://github.com/n8n-io/n8n/issues/7225)) ([fa84545](https://github.com/n8n-io/n8n/commit/fa845453bb3d2ef72ef555bc8b8fa3f8bb703e1f))
+* **editor:** Rework banners framework and add email confirmation banner ([#7205](https://github.com/n8n-io/n8n/issues/7205)) ([b0e98b5](https://github.com/n8n-io/n8n/commit/b0e98b59a6500b11f306403c563191749478c3fb)), closes [4#6afd052ec8d146a1b0fab8884a19add7](https://github.com/4/issues/6afd052ec8d146a1b0fab8884a19add7) [/github.com/n8n-io/n8n/blob/f9f122d46d26565a4cc5dcf63060e7ed9f359e53/packages/editor-ui/src/components/banners/BannerStack.vue#L14](https://github.com//github.com/n8n-io/n8n/blob/f9f122d46d26565a4cc5dcf63060e7ed9f359e53/packages/editor-ui/src/components/banners/BannerStack.vue/issues/L14) [/github.com/n8n-io/n8n/blob/b80d2e3bec59a9abe141a4c808ea2b7f5d9fecce/packages/editor-ui/src/stores/cloudPlan.store.ts#L59](https://github.com//github.com/n8n-io/n8n/blob/b80d2e3bec59a9abe141a4c808ea2b7f5d9fecce/packages/editor-ui/src/stores/cloudPlan.store.ts/issues/L59)
+* **MISP Node:** Update credential to support HTTP Request node ([#7268](https://github.com/n8n-io/n8n/issues/7268)) ([e4c302c](https://github.com/n8n-io/n8n/commit/e4c302c6833c2a9cc6a5fc46d21272266222dd63))
+
+
+### Performance Improvements
+
+* **core:** Skip unneeded calls on every pruning cycle ([#7260](https://github.com/n8n-io/n8n/issues/7260)) ([db01164](https://github.com/n8n-io/n8n/commit/db01164ce11c2c1574899a60541d13712bb39324))
+
+
+
+# [1.8.0](https://github.com/n8n-io/n8n/compare/n8n@1.7.0...n8n@1.8.0) (2023-09-20)
+
+
+### Bug Fixes
+
+* **core:** Make parsing of content-type and content-disposition headers more flexible ([#7217](https://github.com/n8n-io/n8n/issues/7217)) ([d41546b](https://github.com/n8n-io/n8n/commit/d41546b899e75c0decbf2fe2f0841b33c9b39bc9)), closes [#7149](https://github.com/n8n-io/n8n/issues/7149)
+* **core:** Resolve domains to IPv4 first ([#7206](https://github.com/n8n-io/n8n/issues/7206)) ([e9ce531](https://github.com/n8n-io/n8n/commit/e9ce5312106e550c15eb4adc049e4b0151a7c40c))
+* **editor:** Add ssh key type selection to source control settings when regenerating key ([#7172](https://github.com/n8n-io/n8n/issues/7172)) ([54bf66d](https://github.com/n8n-io/n8n/commit/54bf66d335060e866b4f120269b156c4690a8246))
+* **editor:** No need to add click emitting click events, VUE delegates the handler to the root element of the component ([#7182](https://github.com/n8n-io/n8n/issues/7182)) ([3c055e4](https://github.com/n8n-io/n8n/commit/3c055e4d8d77addea014d8da363518c4c14c9a98))
+* **editor:** Prevent duplicate creation of credential for OAuth2 ([#7163](https://github.com/n8n-io/n8n/issues/7163)) ([07a6417](https://github.com/n8n-io/n8n/commit/07a6417f0f52988e3dfac4583aab84426fc471cc))
+* **editor:** Testing flaky resource mapper feature in e2e tests ([#7165](https://github.com/n8n-io/n8n/issues/7165)) ([aaf87c3](https://github.com/n8n-io/n8n/commit/aaf87c3edd434ab464f3ec4a4001c07895370cb0))
+* **HTML Node:** Add pairedItem support for 'Convert to HTML Table' operation ([#7196](https://github.com/n8n-io/n8n/issues/7196)) ([6bc477b](https://github.com/n8n-io/n8n/commit/6bc477b50ebcb31eae6068b2218fea56349a64a9))
+* **HTTP Request Node:** Decrease default timeout to 5min ([#7177](https://github.com/n8n-io/n8n/issues/7177)) ([321780d](https://github.com/n8n-io/n8n/commit/321780d4a2a1f7e5e7ab0ea23e0b2fc28d539330))
+* **seven Node:** Rename sms77 to seven, fix credentials test ([#7180](https://github.com/n8n-io/n8n/issues/7180)) ([cf776b8](https://github.com/n8n-io/n8n/commit/cf776b8f1756c3e20ed39fe882ebaba05f12eb6a))
+* **X (Formerly Twitter) Node:** Rename Twitter to X (keep Twitter alias) ([#7179](https://github.com/n8n-io/n8n/issues/7179)) ([d317e09](https://github.com/n8n-io/n8n/commit/d317e09c597a37fbb099ed1f032d27225e655eb9))
+
+
+### Features
+
+* **core:** Add command to trigger license refresh on workers ([#7184](https://github.com/n8n-io/n8n/issues/7184)) ([9f797b9](https://github.com/n8n-io/n8n/commit/9f797b96d818a5ae74ad82917347c99f3c249688))
+* **core:** Add rsa option to ssh key generation ([#7154](https://github.com/n8n-io/n8n/issues/7154)) ([fdac2c8](https://github.com/n8n-io/n8n/commit/fdac2c85729e19be0fd18f6807a7f5f99dfca002))
+* **Linear Node:** Add support for OAuth2 ([#7201](https://github.com/n8n-io/n8n/issues/7201)) ([12a3168](https://github.com/n8n-io/n8n/commit/12a3168367e3208665ab78fe52b00cf508f7a50d))
+* **Microsoft Outlook Node:** Node overhaul ([#4449](https://github.com/n8n-io/n8n/issues/4449)) ([556a613](https://github.com/n8n-io/n8n/commit/556a6132bafc3eeb574fbd753a438a5e0f2c466d))
+* **Set Node:** Overhaul ([#6348](https://github.com/n8n-io/n8n/issues/6348)) ([3a47455](https://github.com/n8n-io/n8n/commit/3a474552b211fad8939a19492f34c5e7b3137002))
+
+
+
+# [1.7.0](https://github.com/n8n-io/n8n/compare/n8n@1.6.0...n8n@1.7.0) (2023-09-13)
+
+
+### Bug Fixes
+
+* Account for nanoid workflow ids for subworkflow execute policy ([#7094](https://github.com/n8n-io/n8n/issues/7094)) ([67092c0](https://github.com/n8n-io/n8n/commit/67092c0a1bf98ccc5ceadc3d582fac7bff2dc46c))
+* **Code Node:** Disable WASM to address CVE-2023-37903 ([#7122](https://github.com/n8n-io/n8n/issues/7122)) ([36a8e91](https://github.com/n8n-io/n8n/commit/36a8e911e6f58d0b87816fae0443c6ce8f5ea45a))
+* **Code Node:** Upgrade vm2 to address CVE-2023-37466 ([#7123](https://github.com/n8n-io/n8n/issues/7123)) ([0a35025](https://github.com/n8n-io/n8n/commit/0a35025e5e6669661bdfcc16378453ec9109a347))
+* **core:** Disable Node.js custom inspection to address CVE-2023-37903 ([#7125](https://github.com/n8n-io/n8n/issues/7125)) ([a223734](https://github.com/n8n-io/n8n/commit/a223734a4a781834bee1a1484dffc47c56e8d50e)), closes [#7122](https://github.com/n8n-io/n8n/issues/7122)
+* **editor:** Tweak hover area of workflow / cred cards ([#7108](https://github.com/n8n-io/n8n/issues/7108)) ([217de21](https://github.com/n8n-io/n8n/commit/217de21605beca57f087921231ae929279071686))
+* **editor:** Unbind workflow endpoint events in case of workspace reset  ([#7129](https://github.com/n8n-io/n8n/issues/7129)) ([c9b7948](https://github.com/n8n-io/n8n/commit/c9b79485cf7d361174aeba175ccb98de7d918693))
+* **editor:** Update git repo url validation regex ([#7151](https://github.com/n8n-io/n8n/issues/7151)) ([e51f173](https://github.com/n8n-io/n8n/commit/e51f173608dd79bfe53eb86eeaed976109f74410))
+* **Google Cloud Firestore Node:** Fix empty string interpreted as number ([#7136](https://github.com/n8n-io/n8n/issues/7136)) ([915cfa0](https://github.com/n8n-io/n8n/commit/915cfa0f6a0311ca34d2f8eeb471c601473314aa))
+* **HubSpot Node:** Fix issue with contact lists not working ([#5582](https://github.com/n8n-io/n8n/issues/5582)) ([6e5a4f6](https://github.com/n8n-io/n8n/commit/6e5a4f6a589550a816f421ffa966cfeea3cac64d))
+* **Postgres Node:** Fix automatic column mapping ([#7121](https://github.com/n8n-io/n8n/issues/7121)) ([92af131](https://github.com/n8n-io/n8n/commit/92af1314fe60560cdfb52b3307cc74559ba530a8))
+* **Zoho CRM Node:** Fix issue with Sales Order not updating ([#6959](https://github.com/n8n-io/n8n/issues/6959)) ([fd800b6](https://github.com/n8n-io/n8n/commit/fd800b674b52079eb2572a4d2465774759e9b31d))
+
+
+### Features
+
+* **core:** Add an option to enable WAL mode for SQLite ([#7118](https://github.com/n8n-io/n8n/issues/7118)) ([1d1a022](https://github.com/n8n-io/n8n/commit/1d1a022defefc790905cfb8fcb9dd364ffb063bb))
+* **core:** Add commands to workers to respond with current state ([#7029](https://github.com/n8n-io/n8n/issues/7029)) ([7b49cf2](https://github.com/n8n-io/n8n/commit/7b49cf2a2c750d685af6cff464401f38482dac5a))
+* **Salesforce Node:** Add fax field to lead option ([#7030](https://github.com/n8n-io/n8n/issues/7030)) ([01f875a](https://github.com/n8n-io/n8n/commit/01f875a94d193ba1e709bf6cfe31a3951f3af81a))
+
+
+
+# [1.6.0](https://github.com/n8n-io/n8n/compare/n8n@1.5.1...n8n@1.6.0) (2023-09-06)
+
+
+### Bug Fixes
+
+* **core:** Add support for in-transit encryption (TLS) on Redis connections ([#7047](https://github.com/n8n-io/n8n/issues/7047)) ([a910757](https://github.com/n8n-io/n8n/commit/a910757cc5ac7e47f9e0ca6a57c8b624e269aaa4))
+* **core:** Disallow orphan executions ([#7069](https://github.com/n8n-io/n8n/issues/7069)) ([8a28e98](https://github.com/n8n-io/n8n/commit/8a28e98ec811952163c58feaad608ec14ffc9243))
+* **core:** Split event bus controller into community and ee ([#7107](https://github.com/n8n-io/n8n/issues/7107)) ([011ee2e](https://github.com/n8n-io/n8n/commit/011ee2e04b62e0182e9d6787064dea70654cb4ab))
+* **editor:** Standardize save text ([#7093](https://github.com/n8n-io/n8n/issues/7093)) ([58b3492](https://github.com/n8n-io/n8n/commit/58b3492b0dcf140920ec97ce6d50e91a6d3a01a6))
+* Ensure all new executions are saved ([#7061](https://github.com/n8n-io/n8n/issues/7061)) ([b8e06d2](https://github.com/n8n-io/n8n/commit/b8e06d245f5b8bc969d2eb29793e9d98a33e69a8))
+* Load remote resources even if expressions in non requried parameters resolve ([#6987](https://github.com/n8n-io/n8n/issues/6987)) ([8a8d4e8](https://github.com/n8n-io/n8n/commit/8a8d4e8bb32588e79c3fcda2317c491ade9b3637))
+* **Postgres Node:** Connection pool of the database object has been destroyed ([#7074](https://github.com/n8n-io/n8n/issues/7074)) ([9dd5f0e](https://github.com/n8n-io/n8n/commit/9dd5f0e579ccfd5144ddb547977f15b45dd7c9ce))
+* **Postgres Node:** Tunnel doesn't always close ([#7087](https://github.com/n8n-io/n8n/issues/7087)) ([58e55ba](https://github.com/n8n-io/n8n/commit/58e55ba6691dc73a9f475a1989dccb51144e1825))
+
+
+### Features
+
+* **core:** Add list query middleware to credentials ([#7041](https://github.com/n8n-io/n8n/issues/7041)) ([fd78021](https://github.com/n8n-io/n8n/commit/fd78021b68a261291d76811a2a01d7336577bca7))
+* **core:** Add support for floating licenses ([#7090](https://github.com/n8n-io/n8n/issues/7090)) ([e26553f](https://github.com/n8n-io/n8n/commit/e26553f1981d2788f4f2e1e5f5ce23ff8a4a7c8d))
+* **core:** Migration for soft deletions for executions ([#7088](https://github.com/n8n-io/n8n/issues/7088)) ([413e0bc](https://github.com/n8n-io/n8n/commit/413e0bccb4d0144e5bdcf9221762e3f2b4428194))
+* **HTTP Request Node:** Determine binary file name from content-disposition headers ([#7032](https://github.com/n8n-io/n8n/issues/7032)) ([273d091](https://github.com/n8n-io/n8n/commit/273d0913fe5f45c0fe074e6a788e475d5a1d50bd))
+* **TheHive Node:** Overhaul ([#6457](https://github.com/n8n-io/n8n/issues/6457)) ([73e782e](https://github.com/n8n-io/n8n/commit/73e782e2cf9d4b96d8b3748e74ad93570663e536))
+
+
+
+## [1.5.1](https://github.com/n8n-io/n8n/compare/n8n@1.5.0...n8n@1.5.1) (2023-08-31)
+
+
+### Features
+
+* **Strapi Node:** Add token credentials ([#7048](https://github.com/n8n-io/n8n/issues/7048)) ([c01bca5](https://github.com/n8n-io/n8n/commit/c01bca562b71d8b524e29edd37e8397d0689b180))
+
+
+
+# [1.5.0](https://github.com/n8n-io/n8n/compare/n8n@1.4.0...n8n@1.5.0) (2023-08-31)
+
+
+### Bug Fixes
+
+* **Agile CRM Node:** Fix issue with company address not working ([#6997](https://github.com/n8n-io/n8n/issues/6997)) ([2f81652](https://github.com/n8n-io/n8n/commit/2f81652400b6a793fa610728519fd992c03c3d0d))
+* **Code Node:** Switch over to vm2 fork ([#7018](https://github.com/n8n-io/n8n/issues/7018)) ([dfe0fa6](https://github.com/n8n-io/n8n/commit/dfe0fa65f8111cd534387e26197cb3836d694e27))
+* **core:** Invalid NODES_INCLUDE should not crash the app ([#7038](https://github.com/n8n-io/n8n/issues/7038)) ([04e3178](https://github.com/n8n-io/n8n/commit/04e31789019aad6fe122ed81b06552a61d7f3a6d)), closes [#6683](https://github.com/n8n-io/n8n/issues/6683)
+* **core:** Setup websocket keep-live messages ([#6866](https://github.com/n8n-io/n8n/issues/6866)) ([8bdb07d](https://github.com/n8n-io/n8n/commit/8bdb07d33ded48eab0b8f892a06e18f37bee9372)), closes [#6757](https://github.com/n8n-io/n8n/issues/6757)
+* **core:** Throw `NodeSSLError` only for nodes that allow ignoring SSL issues ([#6928](https://github.com/n8n-io/n8n/issues/6928)) ([a01c3fb](https://github.com/n8n-io/n8n/commit/a01c3fbc19d66cf8b1dac3e34e0999dd36d81e7c))
+* **Date & Time Node:** Dont parse date if it's not set (null or undefined) ([#7050](https://github.com/n8n-io/n8n/issues/7050)) ([d72f79f](https://github.com/n8n-io/n8n/commit/d72f79ffb393a096f510f0c41bb66d987fe8cb0d))
+* **editor:** Fix sending of Ask AI tracking events ([#7002](https://github.com/n8n-io/n8n/issues/7002)) ([fb05afa](https://github.com/n8n-io/n8n/commit/fb05afa16560c3c837abf46824f8dc7fa3bb1c83))
+* **Microsoft Excel 365 Node:** Support for more extensions in workbook rlc ([#7020](https://github.com/n8n-io/n8n/issues/7020)) ([d6e1cf2](https://github.com/n8n-io/n8n/commit/d6e1cf232f86ddc69cceb69c8971c3373dab454c))
+* **MongoDB Node:** Stringify response ObjectIDs ([#6990](https://github.com/n8n-io/n8n/issues/6990)) ([9ca990b](https://github.com/n8n-io/n8n/commit/9ca990b9936ee80972952d0a1ad73c2926809ba2))
+* **MongoDB Node:** Upgrade mongodb package to address  CVE-2021-32050 ([#7054](https://github.com/n8n-io/n8n/issues/7054)) ([d3f6356](https://github.com/n8n-io/n8n/commit/d3f635657c7514296fd0a473ba13672db2717490))
+* **Postgres Node:** Empty return data fix for Postgres and MySQL ([#7016](https://github.com/n8n-io/n8n/issues/7016)) ([176ccd6](https://github.com/n8n-io/n8n/commit/176ccd62bc1d6f28958c0fc894ee647f1e3a5f6e))
+* **Webhook Node:** Fix URL params for webhooks ([#6986](https://github.com/n8n-io/n8n/issues/6986)) ([596b569](https://github.com/n8n-io/n8n/commit/596b5695cdcca33da02bec428d58de8b2a13297e))
+
+
+### Features
+
+* **core:** Add filtering, selection and pagination to users ([#6994](https://github.com/n8n-io/n8n/issues/6994)) ([b716241](https://github.com/n8n-io/n8n/commit/b716241b428ef09cf6bdf32cb3a8680e9ba8f25f))
+* **core:** Add MFA ([#4767](https://github.com/n8n-io/n8n/issues/4767)) ([2b7ba6f](https://github.com/n8n-io/n8n/commit/2b7ba6fdf100ef78b60358648d773e2f200847b8))
+* **editor:** Debug executions in the editor ([#6834](https://github.com/n8n-io/n8n/issues/6834)) ([c833078](https://github.com/n8n-io/n8n/commit/c833078c87adeadb1e701f17d3f380c669eb1460))
+* External Secrets storage for credentials ([#6477](https://github.com/n8n-io/n8n/issues/6477)) ([ed927d3](https://github.com/n8n-io/n8n/commit/ed927d34b25b4ddd7048b622c141e32a8a57b6b7))
+* **RSS Read Node:** Add support for self signed certificates ([#7039](https://github.com/n8n-io/n8n/issues/7039)) ([3b9f0fe](https://github.com/n8n-io/n8n/commit/3b9f0fed7af2d3a234049ab7d50d883ee4608007))
+
+
+
+# [1.4.0](https://github.com/n8n-io/n8n/compare/n8n@1.3.0...n8n@1.4.0) (2023-08-23)
+
+
+### Bug Fixes
+
+* **core:** Add recoveryInProgress flag file ([#6962](https://github.com/n8n-io/n8n/issues/6962)) ([7b96820](https://github.com/n8n-io/n8n/commit/7b96820218449958180d4c34bebdc4c4de9172e1))
+* **core:** Fix `continueOnFail` for expression error in Set ([#6939](https://github.com/n8n-io/n8n/issues/6939)) ([d4fac05](https://github.com/n8n-io/n8n/commit/d4fac0527b7a34aace9ea0ff89dde152026d6c17))
+* **core:** Fix `import:workflow` command ([#6996](https://github.com/n8n-io/n8n/issues/6996)) ([8c38d85](https://github.com/n8n-io/n8n/commit/8c38d85e765114df03afb5e221b3d4ae4e6c0fc7))
+* **core:** Replace throw with warning when deactivating a non-active workflow ([#6969](https://github.com/n8n-io/n8n/issues/6969)) ([b6a00fe](https://github.com/n8n-io/n8n/commit/b6a00febbdd62560fa68321fbcd6e44c92a82ddd))
+* **core:** Set up OAuth2 cred test ([#6960](https://github.com/n8n-io/n8n/issues/6960)) ([4fc69b7](https://github.com/n8n-io/n8n/commit/4fc69b776ccea91c2a38249dc4f4ef0b191ce374))
+* **editor:** Do not flag dynamic load options issue on expression ([#6932](https://github.com/n8n-io/n8n/issues/6932)) ([60a1ef0](https://github.com/n8n-io/n8n/commit/60a1ef09934608afbe171bf3cf18ca5e95987153))
+* **editor:** Ensure community node install button tracks user agreement ([#6976](https://github.com/n8n-io/n8n/issues/6976)) ([0ddfc73](https://github.com/n8n-io/n8n/commit/0ddfc73bee88c994876787a41540ef847f4fcd4f))
+* **editor:** Fix parsing for single quoted resolvables ([#6982](https://github.com/n8n-io/n8n/issues/6982)) ([f32e993](https://github.com/n8n-io/n8n/commit/f32e9932275bb51a724c6ae681ed9ca0683a8e8e))
+* **editor:** Fix Remove all fields not removing values in resource mapper ([#6940](https://github.com/n8n-io/n8n/issues/6940)) ([e6cff3f](https://github.com/n8n-io/n8n/commit/e6cff3fce4de1644b75b07318fe561f721aee51c))
+* **editor:** Prevent Code node linter from erroring on `null` parse ([#6934](https://github.com/n8n-io/n8n/issues/6934)) ([40d3a29](https://github.com/n8n-io/n8n/commit/40d3a295d3c5ddcf5c034c02b3584532c395a12c))
+* **Google Sheets Node:** Fix short sheet name interpreted as range ([#6989](https://github.com/n8n-io/n8n/issues/6989)) ([00268a0](https://github.com/n8n-io/n8n/commit/00268a019a1b09ba49971504bb38cd81a281236e))
+* **Google Sheets Trigger Node:** Support sheet names with non-latin characters ([#6970](https://github.com/n8n-io/n8n/issues/6970)) ([052dd7c](https://github.com/n8n-io/n8n/commit/052dd7cc9d10b2365b38001c6e091bd52bf45873))
+* **GraphQL Node:** Improve error handling ([#6955](https://github.com/n8n-io/n8n/issues/6955)) ([41db637](https://github.com/n8n-io/n8n/commit/41db6371f0d7a736bf7e1c13e2a3acd678bec246))
+* **Mautic Node:** Fix issue with owner not being set correctly ([#6991](https://github.com/n8n-io/n8n/issues/6991)) ([64b950f](https://github.com/n8n-io/n8n/commit/64b950f2944f8fe352e6832f4059047d14ba9485))
+* **Salesforce Node:** Fix Account update owner operation ([#6958](https://github.com/n8n-io/n8n/issues/6958)) ([9b27878](https://github.com/n8n-io/n8n/commit/9b27878d8fe8755d76d09db07be01bcab83b8772))
+* **Shopify Node:** Fix pagination when using options ([#6972](https://github.com/n8n-io/n8n/issues/6972)) ([475d9c9](https://github.com/n8n-io/n8n/commit/475d9c98e8281e62e3566671bb6ddb1d028b543f))
+* **Webhook Node:** Backward compatible form-data parsing for non-array fields ([#6967](https://github.com/n8n-io/n8n/issues/6967)) ([9455bcf](https://github.com/n8n-io/n8n/commit/9455bcfef5383ee351b620f12a0f5fba2447a839))
+
+
+### Features
+
+* **core:** Add a warning to error workflows that cannot be started due to permission or settings ([#6961](https://github.com/n8n-io/n8n/issues/6961)) ([67b88f7](https://github.com/n8n-io/n8n/commit/67b88f75f424011e3e49ebe3a37e36871a2253ae))
+* **core:** Add support for ready hooks, and credentials overwrite endpoint in workers ([#6954](https://github.com/n8n-io/n8n/issues/6954)) ([8f8a1de](https://github.com/n8n-io/n8n/commit/8f8a1de3dd478e2e7b33b4b8a64bb0e3b7cda1f3))
+* **editor:** Show banner for non-production licenses ([#6943](https://github.com/n8n-io/n8n/issues/6943)) ([413570c](https://github.com/n8n-io/n8n/commit/413570c49dc800cfed0581b8ae1798aa0b4bbd50))
+* Remove PostHog event calls ([#6915](https://github.com/n8n-io/n8n/issues/6915)) ([270946a](https://github.com/n8n-io/n8n/commit/270946a93bc61ae3953a3dd9b2835e458565e12c))
+* **Send Email Node:** Add support for sending text and html email simultaneously ([#6978](https://github.com/n8n-io/n8n/issues/6978)) ([3860d41](https://github.com/n8n-io/n8n/commit/3860d41d737d56a616e3a8c61a90d3ec956b89cd))
+
+
+
+# [1.3.0](https://github.com/n8n-io/n8n/compare/n8n@1.2.0...n8n@1.3.0) (2023-08-16)
+
+
+### Bug Fixes
+
+* **core:** Don't let bull override the default redis config ([#6897](https://github.com/n8n-io/n8n/issues/6897)) ([cfeb322](https://github.com/n8n-io/n8n/commit/cfeb322b3b19405e2788e3ca3325fd491d5ebd28))
+* **core:** Fix fetching of EE executions ([#6901](https://github.com/n8n-io/n8n/issues/6901)) ([f3fce48](https://github.com/n8n-io/n8n/commit/f3fce48155d4a1ed262efce16cbe537b19aa6963))
+* **core:** Update frontend urls when using the `--tunnel` option ([#6898](https://github.com/n8n-io/n8n/issues/6898)) ([718e613](https://github.com/n8n-io/n8n/commit/718e61354dc62e6aa1af69050eea52de6aa3c350))
+* **editor:** Disable telemetry in dev mode and in E2E tests ([#6869](https://github.com/n8n-io/n8n/issues/6869)) ([808a928](https://github.com/n8n-io/n8n/commit/808a92809e4d389d902249646d5dc146de1d4e98))
+* **editor:** Fix code node’s content property to be reactive ([#6931](https://github.com/n8n-io/n8n/issues/6931)) ([3b75bc6](https://github.com/n8n-io/n8n/commit/3b75bc6bc1c954c4d4a899edddda214f0a2245fb))
+* **editor:** Fix event emit on credential sharing ([#6922](https://github.com/n8n-io/n8n/issues/6922)) ([297c3c9](https://github.com/n8n-io/n8n/commit/297c3c91f23a47b1aa78323d2b6e5677fbab8402))
+* **editor:** Fix multiOptions parameters resetting on initial load ([#6903](https://github.com/n8n-io/n8n/issues/6903)) ([49867c2](https://github.com/n8n-io/n8n/commit/49867c2b176a5e76c4b9e7caafc29a44633332bf))
+* **editor:** Update execution view layout ([#6882](https://github.com/n8n-io/n8n/issues/6882)) ([0339732](https://github.com/n8n-io/n8n/commit/03397323784809eb64c30b2ee535e8516ab06fbf))
+* **Email Trigger (IMAP) Node:** Fix connection issue with unexpected spaces in host ([#6886](https://github.com/n8n-io/n8n/issues/6886)) ([f3248e4](https://github.com/n8n-io/n8n/commit/f3248e46e478e5ac061c3d69da988b0db8acf553))
+* Fix issue with key formatting if null or undefined ([#6924](https://github.com/n8n-io/n8n/issues/6924)) ([4e4a3cf](https://github.com/n8n-io/n8n/commit/4e4a3cf7ab8dee45cc15e8948f8628c5915cc841))
+* Fix issue with key formatting introduced in 1.2.0 ([#6896](https://github.com/n8n-io/n8n/issues/6896)) ([0e075c9](https://github.com/n8n-io/n8n/commit/0e075c9cb540d78209aaa3c8240259f074c31846))
+* Fix lag when node parameters are updated ([#6941](https://github.com/n8n-io/n8n/issues/6941)) ([3eb65e0](https://github.com/n8n-io/n8n/commit/3eb65e08c4f22334aeae172504991a688273528e))
+* **HTTP Request Node:** Improve error handling for TCP socket errors when `Continue On Fail` is enabled ([#6925](https://github.com/n8n-io/n8n/issues/6925)) ([96ff1f8](https://github.com/n8n-io/n8n/commit/96ff1f847d2672ecf6604dde6c3b5c594c3b1e2f))
+* Prevent workflow breaking when credential type is unknown ([#6923](https://github.com/n8n-io/n8n/issues/6923)) ([e83b93f](https://github.com/n8n-io/n8n/commit/e83b93f293ab8df37f896cc315afab50a477bbef))
+* **Respond to Webhook Node:** Return headers in response ([#6921](https://github.com/n8n-io/n8n/issues/6921)) ([a82107f](https://github.com/n8n-io/n8n/commit/a82107fb05120f7365086032c9b05ea316716327))
+
+
+### Features
+
+* **core:** Add support for not requiring SMTP auth with user management ([#3742](https://github.com/n8n-io/n8n/issues/3742)) ([eead6d4](https://github.com/n8n-io/n8n/commit/eead6d49f238f41714911d1488b75515472c34a0))
+* **core:** Descriptive message for common nodeJS errors ([#6841](https://github.com/n8n-io/n8n/issues/6841)) ([3adb0b6](https://github.com/n8n-io/n8n/commit/3adb0b66ea2c1e929850345bc31e5b0a708eabd0))
+* **editor:** Ask AI in Code node ([#6672](https://github.com/n8n-io/n8n/issues/6672)) ([fde6ad1](https://github.com/n8n-io/n8n/commit/fde6ad1e7fa6236c6c1ac1e3ff6d8e959012543a))
+* Enable parallel processing on multiple queue nodes ([#6295](https://github.com/n8n-io/n8n/issues/6295)) ([44afcff](https://github.com/n8n-io/n8n/commit/44afcff95916cd00df66391e54440d3f96788913))
+
+
+
+# [1.2.0](https://github.com/n8n-io/n8n/compare/n8n@1.1.0...n8n@1.2.0) (2023-08-09)
+
+
+### Bug Fixes
+
+* Auth.api user limit test expecting incorrect status ([#6836](https://github.com/n8n-io/n8n/issues/6836)) ([371bfa0](https://github.com/n8n-io/n8n/commit/371bfa0f488f0a240bd1a8854759d6f6639e6eea))
+* **Code Node:** Consistent redirection of stdout for JS and Python sandboxes ([#6818](https://github.com/n8n-io/n8n/issues/6818)) ([f718c22](https://github.com/n8n-io/n8n/commit/f718c2291f0385bfb60ea70e7b7a943a4c6b5149))
+* **core:** Add missing primary key on the `execution_data` table on postgres ([#6797](https://github.com/n8n-io/n8n/issues/6797)) ([dc295ac](https://github.com/n8n-io/n8n/commit/dc295ac5bfe8a62ce208656a8b25a89376af276a))
+* **core:** Add sharing data to workflows in EE executions ([#6872](https://github.com/n8n-io/n8n/issues/6872)) ([6796d9e](https://github.com/n8n-io/n8n/commit/6796d9e5d676a7e76206462ef18640c246f0dc5a))
+* **core:** Allow ignoring SSL issues on generic oauth2 credentials ([#6702](https://github.com/n8n-io/n8n/issues/6702)) ([feac369](https://github.com/n8n-io/n8n/commit/feac369f6c5590f30e63bed6d5569a57710a8d2e))
+* **core:** Change VariablesService to DI and use caching ([#6827](https://github.com/n8n-io/n8n/issues/6827)) ([659ca26](https://github.com/n8n-io/n8n/commit/659ca26fe7cf7d1b9403f6c20b63b598f7dfa7b5))
+* **core:** Fix loading of scoped-community packages ([#6807](https://github.com/n8n-io/n8n/issues/6807)) ([53e58b4](https://github.com/n8n-io/n8n/commit/53e58b408a8ef6a0f911593180d818ccee92cc1d))
+* **core:** Fix property existence checks on AugmentObject ([#6842](https://github.com/n8n-io/n8n/issues/6842)) ([732416f](https://github.com/n8n-io/n8n/commit/732416f52f49eeb542401439e5b96b4b1a083c05))
+* **core:** Fix source control name and email being switched ([#6839](https://github.com/n8n-io/n8n/issues/6839)) ([6ec7033](https://github.com/n8n-io/n8n/commit/6ec7033bb711648c8c2d93f4f2b15b3b6dfdcaea))
+* **core:** Fix WebSocket close codes ([a8bfb46](https://github.com/n8n-io/n8n/commit/a8bfb4618323731de8bc9bc265b3bbb9de69c50c))
+* **core:** Log crash causes to console when sentry is disabled ([#6890](https://github.com/n8n-io/n8n/issues/6890)) ([6553d92](https://github.com/n8n-io/n8n/commit/6553d92c7c128b117b6bdbd33182002f6cf24fa1))
+* **core:** OAuth1 authentication fix for Clever Cloud API ([#6847](https://github.com/n8n-io/n8n/issues/6847)) ([5ab30fd](https://github.com/n8n-io/n8n/commit/5ab30fdd95c766e57f8c2cf7c7a9951bbf3d7c2d))
+* **core:** Restrict read/write file paths access ([#6582](https://github.com/n8n-io/n8n/issues/6582)) ([f6bf9e9](https://github.com/n8n-io/n8n/commit/f6bf9e9887bb46bb884fd06f3e789f8585445501))
+* **core:** Serialize BigInts ([#6805](https://github.com/n8n-io/n8n/issues/6805)) ([7b27fa5](https://github.com/n8n-io/n8n/commit/7b27fa5898cd3c8c9882cbec0c36ff703510b57d))
+* **core:** Update packages to address CVE-2023-2142 and CVE-2020-28469 ([#6844](https://github.com/n8n-io/n8n/issues/6844)) ([a5667e6](https://github.com/n8n-io/n8n/commit/a5667e6c42fae96a48e39464cbcec808d36bb5ee))
+* Correct typos in Taiga and ServiceNow nodes ([#6814](https://github.com/n8n-io/n8n/issues/6814)) ([803b152](https://github.com/n8n-io/n8n/commit/803b1521facb7908c34fbb729d15aaaf5680e471))
+* Display source control buttons properly ([#6756](https://github.com/n8n-io/n8n/issues/6756)) ([d050b99](https://github.com/n8n-io/n8n/commit/d050b99fb218ae31dfd0ec7dea88884e14021495))
+* **editor:** Close tags dropdown when modal is opened ([#6766](https://github.com/n8n-io/n8n/issues/6766)) ([cf00ba7](https://github.com/n8n-io/n8n/commit/cf00ba708941bebceda8278a359b0badaa111f2c)), closes [#6571](https://github.com/n8n-io/n8n/issues/6571)
+* **editor:** Do not show mapping discoverability tooltip after dismiss ([#6862](https://github.com/n8n-io/n8n/issues/6862)) ([08982ed](https://github.com/n8n-io/n8n/commit/08982ede4c3dd2b38b1a0ce91adf8198f0af1776))
+* **editor:** Fix code node highlight error ([#6791](https://github.com/n8n-io/n8n/issues/6791)) ([50b0dc2](https://github.com/n8n-io/n8n/commit/50b0dc21fd0a698f87538e5458274ed50ab6774e))
+* **editor:** Fix collapsed sub menu elements ([#6778](https://github.com/n8n-io/n8n/issues/6778)) ([d33528d](https://github.com/n8n-io/n8n/commit/d33528dab399bc01461ab5e3af1fbb75e5d89d91))
+* **editor:** Fix credential errors in executions view for workflow sharee  ([#6875](https://github.com/n8n-io/n8n/issues/6875)) ([a0f9b2e](https://github.com/n8n-io/n8n/commit/a0f9b2eefe6050264b0c892c6e79e2140ab05825))
+* **editor:** Fix redo when adding node on connection ([#6833](https://github.com/n8n-io/n8n/issues/6833)) ([4ac4b85](https://github.com/n8n-io/n8n/commit/4ac4b850dd7187e4e4ef50bbe442ebf273e51eb9))
+* **editor:** Fix tooltip opening delay prop name ([#6776](https://github.com/n8n-io/n8n/issues/6776)) ([e19b0d7](https://github.com/n8n-io/n8n/commit/e19b0d7748765570903831d5e676e6c4deba2fef))
+* **editor:** Fix value syncing in SQL and HTML editor ([#6848](https://github.com/n8n-io/n8n/issues/6848)) ([90e825f](https://github.com/n8n-io/n8n/commit/90e825f74368588073b1403b0681a89704eced06))
+* **editor:** Improve displaying and hiding of connections actions ([#6823](https://github.com/n8n-io/n8n/issues/6823)) ([369a2e9](https://github.com/n8n-io/n8n/commit/369a2e97968c6d40d827d8e780a8d3f1fd2188f7))
+* **editor:** Prevent text edit dialog from re-opening in same tick ([#6781](https://github.com/n8n-io/n8n/issues/6781)) ([c9f3acc](https://github.com/n8n-io/n8n/commit/c9f3acc8485edd0adbde4a633318a01b018d6fc0))
+* **editor:** Remove additional margin on tooltip ([#6802](https://github.com/n8n-io/n8n/issues/6802)) ([651cf34](https://github.com/n8n-io/n8n/commit/651cf34da60fb3842132905adfee3cd5e1395c75))
+* **editor:** Resolve vue 3 related console-warnings ([#6779](https://github.com/n8n-io/n8n/issues/6779)) ([30484a0](https://github.com/n8n-io/n8n/commit/30484a0615c90525fa0604b8b0df16159f18a6d4))
+* **editor:** Vue3 - Fix modal positioning and multi-select tag sizing ([#6783](https://github.com/n8n-io/n8n/issues/6783)) ([4e491b7](https://github.com/n8n-io/n8n/commit/4e491b754fe74ebdffdc292f4358ee98ad99e01d))
+* **Email Trigger (IMAP) Node:**  UTF-8 attachments are not correctly named ([#6856](https://github.com/n8n-io/n8n/issues/6856)) ([72814d1](https://github.com/n8n-io/n8n/commit/72814d1f0fb5dfce19a89397a6a1cd5829563222))
+* Fix all modal sizes ([#6820](https://github.com/n8n-io/n8n/issues/6820)) ([7525cfe](https://github.com/n8n-io/n8n/commit/7525cfe2dcd03e5050ffb32e8fef64132788d62e))
+* Fix horizontal overflow for dialogs ([#6830](https://github.com/n8n-io/n8n/issues/6830)) ([41d8a18](https://github.com/n8n-io/n8n/commit/41d8a18d47dfeb0119034efe0e5779a9bfb0edce))
+* Fix issue with key based credentials not being read correctly ([#6824](https://github.com/n8n-io/n8n/issues/6824)) ([db21a8d](https://github.com/n8n-io/n8n/commit/db21a8db75833c86ab3d662c6c864f9f5e47c436))
+* Fix tags overflow handler in workflows header ([#6784](https://github.com/n8n-io/n8n/issues/6784)) ([7cd4588](https://github.com/n8n-io/n8n/commit/7cd45885bf13479948a4c5bb441d24b3c042a624))
+* **GoToWebinar Node:** Fix issue with timezone incorrectly being required ([#6865](https://github.com/n8n-io/n8n/issues/6865)) ([905eef8](https://github.com/n8n-io/n8n/commit/905eef85594bb10f27c7c97f24ac7f9fcedcc5cf))
+* Handle subtitle errors when pasting workflow ([#6826](https://github.com/n8n-io/n8n/issues/6826)) ([31a4cfc](https://github.com/n8n-io/n8n/commit/31a4cfc9698666bb69b2fd54d7af3644a31b69c2))
+* **Lemlist Node:** Fix pagination issues with campaigns and activities ([#6734](https://github.com/n8n-io/n8n/issues/6734)) ([c3e76ec](https://github.com/n8n-io/n8n/commit/c3e76ec697991f4a184e51cb7753a5c89064f7f9))
+* **Linear Node:** Fix issue creation priority ([#6813](https://github.com/n8n-io/n8n/issues/6813)) ([fce8cc4](https://github.com/n8n-io/n8n/commit/fce8cc427579c9098359b9d1ecc420650299b229))
+* **Postgres Trigger Node:** Imposible to cancell execution manually ([#6709](https://github.com/n8n-io/n8n/issues/6709)) ([491378d](https://github.com/n8n-io/n8n/commit/491378de772670b640be23e3b9bc7eadad6d3ebe))
+* Remove tag animation ([#6821](https://github.com/n8n-io/n8n/issues/6821)) ([52aafe0](https://github.com/n8n-io/n8n/commit/52aafe07372dd3dd46ddc8e4ad14de08f02fb4e8))
+* Respect set modal widths ([#6771](https://github.com/n8n-io/n8n/issues/6771)) ([3aaf1ac](https://github.com/n8n-io/n8n/commit/3aaf1ac0fd9cb7db6e074c1dca421de066c0793b)), closes [#6571](https://github.com/n8n-io/n8n/issues/6571)
+* Show NodeIcon tooltips by removing pointer-events: none ([#6777](https://github.com/n8n-io/n8n/issues/6777)) ([eb898f7](https://github.com/n8n-io/n8n/commit/eb898f744f7c3df92635409a136809473b4de0c1))
+* **TheHive Node:** Treat  `ApiKey` as a secret ([#6786](https://github.com/n8n-io/n8n/issues/6786)) ([11a3965](https://github.com/n8n-io/n8n/commit/11a3965ba89e75daaccf39596272eef70f1fc316))
+* **Todoist Node:** Fix issue with section id being ignored ([#6799](https://github.com/n8n-io/n8n/issues/6799)) ([749468e](https://github.com/n8n-io/n8n/commit/749468e4fa3d823785a01e79b02f4897bc40c943))
+
+
+### Features
+
+* Clean up onboarding experiment ([#6873](https://github.com/n8n-io/n8n/issues/6873)) ([3619345](https://github.com/n8n-io/n8n/commit/36193451692b878cea703e3a743d9ac8f3ba5086))
+* **core:** Add metrics option to cache ([#6846](https://github.com/n8n-io/n8n/issues/6846)) ([adcf5a9](https://github.com/n8n-io/n8n/commit/adcf5a96e83d8b43b155f5a834a74b3a1fd4274b))
+* **core:** Add unique id to instances ([#6863](https://github.com/n8n-io/n8n/issues/6863)) ([6499f42](https://github.com/n8n-io/n8n/commit/6499f424811188fa4785db9d86b1299e4fb39540))
+* **core:** Create a dsl for writing db agnostic migrations ([#6853](https://github.com/n8n-io/n8n/issues/6853)) ([75be1a9](https://github.com/n8n-io/n8n/commit/75be1a9c0d223a5d866551e836d7ab1b952d03ca))
+* **core:** Credentials for popular SecOps services, Part 1 ([#6775](https://github.com/n8n-io/n8n/issues/6775)) ([11567f9](https://github.com/n8n-io/n8n/commit/11567f946be411f081b2ba25c2ac60d5dcf56835))
+* **core:** Make Redis available for backend communication ([#6719](https://github.com/n8n-io/n8n/issues/6719)) ([3cad60e](https://github.com/n8n-io/n8n/commit/3cad60e9184de7ad73893062964366a09d4487df))
+* **editor:** Add "Download" button if JSON data is to large ([#6850](https://github.com/n8n-io/n8n/issues/6850)) ([efe08cc](https://github.com/n8n-io/n8n/commit/efe08cced3979e40bbf011301f51f9f2f69117de))
+* **editor:** Migrate Design System and Editor UI to Vue 3 ([#6476](https://github.com/n8n-io/n8n/issues/6476)) ([dd6a4c9](https://github.com/n8n-io/n8n/commit/dd6a4c956adb997b59ee0174eedd9b8f6265ec6b)), closes [#6571](https://github.com/n8n-io/n8n/issues/6571)
+* **Facebook Graph API Node:** Add support for v16 and v17 ([#6808](https://github.com/n8n-io/n8n/issues/6808)) ([46a41c1](https://github.com/n8n-io/n8n/commit/46a41c1c91c7ebadd72fb51b6f749a542a7393fc))
+* **Pipedrive Node:** Add option to update the file name and description ([#6883](https://github.com/n8n-io/n8n/issues/6883)) ([f8ad543](https://github.com/n8n-io/n8n/commit/f8ad543af5c5d680d23d5dab861a6b3fe47b4ccc))
+
+
+### Performance Improvements
+
+* **core:** Add filtering and pagination to `GET /workflows` ([#6845](https://github.com/n8n-io/n8n/issues/6845)) ([dceff67](https://github.com/n8n-io/n8n/commit/dceff675ecd1d9f72ca2614c42da2bfaa758f305)), closes [#6876](https://github.com/n8n-io/n8n/issues/6876)
+* **core:** Cache roles ([#6803](https://github.com/n8n-io/n8n/issues/6803)) ([e4f0418](https://github.com/n8n-io/n8n/commit/e4f041815a9a919add9ad616e17ed31d4b645c2c))
+* **core:** Cache webhooks ([#6825](https://github.com/n8n-io/n8n/issues/6825)) ([0511458](https://github.com/n8n-io/n8n/commit/0511458d41c65f81edc17b5ff58a0be911a7629d))
+* **editor:** Memoize locale translate calls during actions generation ([#6773](https://github.com/n8n-io/n8n/issues/6773)) ([2d47e8d](https://github.com/n8n-io/n8n/commit/2d47e8dc4ad2ec75d25cd5e67ab89f29766e0a7f))
+
+
+
+# [1.1.0](https://github.com/n8n-io/n8n/compare/n8n@1.0.1...n8n@1.1.0) (2023-07-26)
+
+
+### Bug Fixes
+
+* Add missing indices on sqlite ([#6673](https://github.com/n8n-io/n8n/issues/6673)) ([b1838f7](https://github.com/n8n-io/n8n/commit/b1838f7fab3e6d2983fa4d2ba1a480c79f8fe2c5))
+* **API:** Do not add starting node on workflow creation ([#6686](https://github.com/n8n-io/n8n/issues/6686)) ([92192fb](https://github.com/n8n-io/n8n/commit/92192fbd6108a71fca591e5284269239d4347621))
+* **API:** Fix issue with workflow setting not supporting newer nanoids ([#6699](https://github.com/n8n-io/n8n/issues/6699)) ([c7e1013](https://github.com/n8n-io/n8n/commit/c7e10130d694347982f50bc0ad1024101e27beea))
+* **AwsS3 Node:** Fix issue if bucket name contains a '.' ([#6542](https://github.com/n8n-io/n8n/issues/6542)) ([540d32d](https://github.com/n8n-io/n8n/commit/540d32dee4b8927199e047c77acf516d5b824bc3))
+* **Brevo Node:** Rename SendInBlue node to Brevo node ([#6521](https://github.com/n8n-io/n8n/issues/6521)) ([e63b398](https://github.com/n8n-io/n8n/commit/e63b3982d200ade34461b9159eb1e988f494c025))
+* **Code Node:** Install python modules always in a user-writable folder ([#6568](https://github.com/n8n-io/n8n/issues/6568)) ([bf35124](https://github.com/n8n-io/n8n/commit/bf351243dfa69095699596e8828904fda025d45c))
+* **core:** Add empty credential value marker to show empty pw field ([#6532](https://github.com/n8n-io/n8n/issues/6532)) ([9294e2d](https://github.com/n8n-io/n8n/commit/9294e2da3c7c99c2099f5865e610fa7217bf06be))
+* **core:** Deleting manual executions should defer deleting binary data ([#6680](https://github.com/n8n-io/n8n/issues/6680)) ([462a674](https://github.com/n8n-io/n8n/commit/462a674d1759dc5ae9849daa48cc8c4130dd030e))
+* **core:** Filter out workflows that failed to activate on startup ([#6676](https://github.com/n8n-io/n8n/issues/6676)) ([667c15d](https://github.com/n8n-io/n8n/commit/667c15d0dfbdab0c29114d5002eed75031c79b42))
+* **core:** Fix credentials test ([#6569](https://github.com/n8n-io/n8n/issues/6569)) ([1abd172](https://github.com/n8n-io/n8n/commit/1abd172f73e171e37c4cc3ccfaa395c6a46bdf48))
+* **core:** Fix migrations for MySQL/MariaDB ([#6591](https://github.com/n8n-io/n8n/issues/6591)) ([29882a6](https://github.com/n8n-io/n8n/commit/29882a6f39dddcd1c8c107c20a548ce8dc665cba))
+* **core:** Handle all uncaught exception, not just the ones from Axios ([#6666](https://github.com/n8n-io/n8n/issues/6666)) ([ff07595](https://github.com/n8n-io/n8n/commit/ff0759530df3780e8eb53a29ec4ab4e98e5755c6))
+* **core:** Improve the performance of last 2 sqlite migrations ([#6522](https://github.com/n8n-io/n8n/issues/6522)) ([31cba87](https://github.com/n8n-io/n8n/commit/31cba87d307183d613890c7e6d627636b5280b52))
+* **core:** Load SAML libraries dynamically ([#6690](https://github.com/n8n-io/n8n/issues/6690)) ([fce5609](https://github.com/n8n-io/n8n/commit/fce5609fa32b81ff8e44567233c77a7a1d6232df))
+* **core:** Redirect user to previous url after SSO signin ([#6710](https://github.com/n8n-io/n8n/issues/6710)) ([08331c6](https://github.com/n8n-io/n8n/commit/08331c63fbc0d69d2203f14165b15e1a596788b0))
+* **core:** Reduce memory consumption on `BinaryDataManager.init` ([#6633](https://github.com/n8n-io/n8n/issues/6633)) ([329d22f](https://github.com/n8n-io/n8n/commit/329d22f5d1f484d899df885a871f0f32839f0098))
+* **core:** Remove typeorm patches, but still enforce transactions on every migration ([#6594](https://github.com/n8n-io/n8n/issues/6594)) ([9def7a7](https://github.com/n8n-io/n8n/commit/9def7a729b52cd6b4698c47e190e9e2bd7894da5)), closes [#6519](https://github.com/n8n-io/n8n/issues/6519)
+* **core:** Rename to credential_stubs and variable_stubs.json ([#6528](https://github.com/n8n-io/n8n/issues/6528)) ([b06462f](https://github.com/n8n-io/n8n/commit/b06462f4415bd1143a00b4a66e6e626da8c52196))
+* **core:** Support redis cluster in queue mode ([#6708](https://github.com/n8n-io/n8n/issues/6708)) ([4029386](https://github.com/n8n-io/n8n/commit/40293863492d73865f805870937e46f3d0bdaa56))
+* **core:** Update docker compose setup for V1 images ([#6642](https://github.com/n8n-io/n8n/issues/6642)) ([05007d8](https://github.com/n8n-io/n8n/commit/05007d894e1bfa3550cfd865f85c2844b3db6eea))
+* **core:** Upgrade semver to address CVE-2022-25883 ([#6689](https://github.com/n8n-io/n8n/issues/6689)) ([9daf944](https://github.com/n8n-io/n8n/commit/9daf944ba53937ddd41bd640a6d473d235f0e16f))
+* **core:** Use `exec` in docker images to forward signals correctly ([#6732](https://github.com/n8n-io/n8n/issues/6732)) ([ed9f86b](https://github.com/n8n-io/n8n/commit/ed9f86bb95f7080335a336c866cd477669b02002))
+* **core:** Use JWT as reset password token ([#6714](https://github.com/n8n-io/n8n/issues/6714)) ([89f4402](https://github.com/n8n-io/n8n/commit/89f44021b919181ad58c555a31071c286b866975))
+* **core:** Use lower cased email for SAML email attribute ([#6663](https://github.com/n8n-io/n8n/issues/6663)) ([eedde24](https://github.com/n8n-io/n8n/commit/eedde24cc046ea517c6d6e455bcdd46a97e4c05b))
+* **core:** Use owners file to export wf owners ([#6547](https://github.com/n8n-io/n8n/issues/6547)) ([4b755fb](https://github.com/n8n-io/n8n/commit/4b755fb0b441a37eb804c9e70d4b071a341f7155))
+* **crowd.dev Node:** Fix documentation urls for crowd.dev credentials and nodes ([#6696](https://github.com/n8n-io/n8n/issues/6696)) ([acda7f2](https://github.com/n8n-io/n8n/commit/acda7f269f7b227d430e2308767e1676fda8e165))
+* **editor:** Add default author name and email to source control settings ([#6543](https://github.com/n8n-io/n8n/issues/6543)) ([e1a02c7](https://github.com/n8n-io/n8n/commit/e1a02c76257de30e08878279dea33d7854d46938))
+* **editor:** Add paywall state to non owner users for Variables ([#6679](https://github.com/n8n-io/n8n/issues/6679)) ([e7091d6](https://github.com/n8n-io/n8n/commit/e7091d6726eb98a194bc2614c0da332d348180dc))
+* **editor:** Change default branchColor and remove label ([#6541](https://github.com/n8n-io/n8n/issues/6541)) ([186271e](https://github.com/n8n-io/n8n/commit/186271e939bca19ec9c94d9455e9430d8b8cf9d7))
+* **editor:** Ensure default credential values are not detected as dirty state ([#6677](https://github.com/n8n-io/n8n/issues/6677)) ([c7b74c3](https://github.com/n8n-io/n8n/commit/c7b74c3c1fdd2f11b8650adf79052681c2f1e248))
+* **editor:** Extend menu item and use it as a recursive component ([#6618](https://github.com/n8n-io/n8n/issues/6618)) ([d617f63](https://github.com/n8n-io/n8n/commit/d617f63ae9155c03dbf5e597db8e102c1f7a025f))
+* **editor:** Hide Execute Node button for unknown nodes ([#6684](https://github.com/n8n-io/n8n/issues/6684)) ([6887b4e](https://github.com/n8n-io/n8n/commit/6887b4edeae6536f5b670c55637fde1c5dbd6e40))
+* **editor:** Increase contrast ratio in execution list workflow names ([#6661](https://github.com/n8n-io/n8n/issues/6661)) ([c0b1cb2](https://github.com/n8n-io/n8n/commit/c0b1cb273e56c04abff5d9893a5e37cda6eb3383))
+* **editor:** Make Source control branch select required ([#6619](https://github.com/n8n-io/n8n/issues/6619)) ([20737b5](https://github.com/n8n-io/n8n/commit/20737b532423c964bd70e0aa2aac2c9533b5c3d4))
+* **editor:** Prevent keyboard shortcuts to edit workflows in readonly mode ([#6613](https://github.com/n8n-io/n8n/issues/6613)) ([7383e7f](https://github.com/n8n-io/n8n/commit/7383e7fd48b5c86d43fab4fa47cb1e7a4a4b4043))
+* **editor:** Prevent RMC from loading schema if it's already cached ([#6695](https://github.com/n8n-io/n8n/issues/6695)) ([a79aa19](https://github.com/n8n-io/n8n/commit/a79aa198330808b7e45b217748fffdabb68098e2))
+* **editor:** Remove global link styling in v1 banner ([#6705](https://github.com/n8n-io/n8n/issues/6705)) ([76a765a](https://github.com/n8n-io/n8n/commit/76a765a1517f53cb0c4f16a57bdd6f55bc3be0bd))
+* **editor:** Show appropriate empty workflow list content when instance environment is readonly ([#6610](https://github.com/n8n-io/n8n/issues/6610)) ([7515f7d](https://github.com/n8n-io/n8n/commit/7515f7d52ae72fa1361687c43a9c29f585b3c6ce))
+* **editor:** Show retry information in execution list only when it exists ([#6587](https://github.com/n8n-io/n8n/issues/6587)) ([3ca66be](https://github.com/n8n-io/n8n/commit/3ca66be38082e7a3866d53d07328be58e913067f))
+* **editor:** Skip error line highlighting if out of range ([#6721](https://github.com/n8n-io/n8n/issues/6721)) ([a62d00a](https://github.com/n8n-io/n8n/commit/a62d00a4795d02a5905c5ddbae569f122a46a023))
+* **editor:** Update design system menu item component ([#6659](https://github.com/n8n-io/n8n/issues/6659)) ([84466e9](https://github.com/n8n-io/n8n/commit/84466e983336a3cfa8c20b30ead8d58abbf07cf0))
+* **FileMaker Node:** Improve returned error responses ([#6585](https://github.com/n8n-io/n8n/issues/6585)) ([91a052e](https://github.com/n8n-io/n8n/commit/91a052e4c53b6717d3a4e4d1034339012ce39c41))
+* **FTP Node:** List recursive ignore . and .. to prevent infinite loops ([#6707](https://github.com/n8n-io/n8n/issues/6707)) ([995d5cc](https://github.com/n8n-io/n8n/commit/995d5cc47095e584c2a064dd5aa3841b3054ffd4))
+* **GitLab Trigger Node:** Fix trigger activation 404 error  ([#6711](https://github.com/n8n-io/n8n/issues/6711)) ([8ceb832](https://github.com/n8n-io/n8n/commit/8ceb8322ebfc1384291e8a0d5d07ee5c22d52142))
+* **Gmail Trigger Node:** Early returns in case of no data ([#6727](https://github.com/n8n-io/n8n/issues/6727)) ([c2511a8](https://github.com/n8n-io/n8n/commit/c2511a829cfa40d4d9d570ad7724845c93544c3b))
+* **Google BigQuery Node:** Error description improvement ([#6715](https://github.com/n8n-io/n8n/issues/6715)) ([95837d2](https://github.com/n8n-io/n8n/commit/95837d260466e8a4bd19c44390ce4557fa5c51cb))
+* **Google Drive Node:** Fix regex in file RLC ([#6607](https://github.com/n8n-io/n8n/issues/6607)) ([5672146](https://github.com/n8n-io/n8n/commit/56721468dff51bb60ececc0472e2b9ca0740fcb1))
+* **Google Drive Node:** URL parsing ([#6527](https://github.com/n8n-io/n8n/issues/6527)) ([d9ed0b3](https://github.com/n8n-io/n8n/commit/d9ed0b31b538320a67ee4e5c0cae34656c9f4334))
+* **Google Sheets Node:** Incorrect read of 0 and false ([#6525](https://github.com/n8n-io/n8n/issues/6525)) ([806d134](https://github.com/n8n-io/n8n/commit/806d13460240abe94843e569b1820cd8d0d8edd1))
+* **HTTP Request Node:** Cleanup circular references in response ([#6590](https://github.com/n8n-io/n8n/issues/6590)) ([aecc05b](https://github.com/n8n-io/n8n/commit/aecc05b787d09ba778adc5b4bf96abacc5a64204))
+* **Merge Node:** Enrich input 2 fix ([#6526](https://github.com/n8n-io/n8n/issues/6526)) ([c82c7f1](https://github.com/n8n-io/n8n/commit/c82c7f19128df3a11d6d0f18e8d8dab57e6a3b8f))
+* **Microsoft Outlook Node:** Fix issue with category not correctly applying ([#6583](https://github.com/n8n-io/n8n/issues/6583)) ([fc8ed55](https://github.com/n8n-io/n8n/commit/fc8ed55c0de7db4cf17f4f1bf417f6cbf48444c2))
+* **Notion Node:** Version fix ([#6531](https://github.com/n8n-io/n8n/issues/6531)) ([38dc784](https://github.com/n8n-io/n8n/commit/38dc784d2eed25aae777c5c3c3fda1a35e20bd24))
+* **Postgres Node:** Arrays in query replacement fix ([#6718](https://github.com/n8n-io/n8n/issues/6718)) ([4cae091](https://github.com/n8n-io/n8n/commit/4cae091cfb54701dfa51b5204799df0a8b4929cd))
+* **Postgres Node:** For select queries, empty result should be be replaced with `{"success":true}` ([#6703](https://github.com/n8n-io/n8n/issues/6703)) ([250175d](https://github.com/n8n-io/n8n/commit/250175d066d6759f4a787371b47ed91ee62aab71))
+* **Postgres Node:** Upsert does not fetch columns when schema other then public ([#6643](https://github.com/n8n-io/n8n/issues/6643)) ([aaa9ee3](https://github.com/n8n-io/n8n/commit/aaa9ee3949529a745e3b624716da1549ed571604))
+* **Salesforce Node:** Fix typo for adding a contact to a campaign ([#6598](https://github.com/n8n-io/n8n/issues/6598)) ([7ffe3cb](https://github.com/n8n-io/n8n/commit/7ffe3cb36adeecaca6cc6ddf067a701ee55c18d1))
+* **Sendy Node:** Fix issue with brand id not being sent ([#6530](https://github.com/n8n-io/n8n/issues/6530)) ([2e8dfb8](https://github.com/n8n-io/n8n/commit/2e8dfb86d4636781b319d6190e8be12e7661ee16))
+* Stop n8n from complaining about credentials when saving a new workflow form a template ([#6671](https://github.com/n8n-io/n8n/issues/6671)) ([486d16b](https://github.com/n8n-io/n8n/commit/486d16bcdb6be12dd85f4af5f7de878d9d178fd6))
+* **Strapi Node:** Fix issue with pagination ([#4991](https://github.com/n8n-io/n8n/issues/4991)) ([54444fa](https://github.com/n8n-io/n8n/commit/54444fa388da12d75553e66e53a8cf6f8a99b6fc))
+* **Telegram Trigger Node:** Add guard to 'include' call on null or undefined ([#6730](https://github.com/n8n-io/n8n/issues/6730)) ([533b0ba](https://github.com/n8n-io/n8n/commit/533b0bac13d275753fee329bb4abe0c7aae5b48b))
+* **XML Node:** Fix issue with not returning valid data ([#6565](https://github.com/n8n-io/n8n/issues/6565)) ([cdd215f](https://github.com/n8n-io/n8n/commit/cdd215f642b47413c05f229e641074d0d4048f68))
+
+
+### Features
+
+* Add crowd.dev node and trigger node ([#6082](https://github.com/n8n-io/n8n/issues/6082)) ([238a78f](https://github.com/n8n-io/n8n/commit/238a78f0582dbf439a9799de0edcb2e9bef29978))
+* Add missing input panels to some trigger nodes ([#6518](https://github.com/n8n-io/n8n/issues/6518)) ([fdf8a42](https://github.com/n8n-io/n8n/commit/fdf8a428ed38bb3ceb2bc0e50b002b34843d8fc4))
+* Add various source control improvements ([#6533](https://github.com/n8n-io/n8n/issues/6533)) ([68fdc20](https://github.com/n8n-io/n8n/commit/68fdc2078928be478a286774f2889feba1c3f5fe))
+* **Airtable Node:** Overhaul ([#6200](https://github.com/n8n-io/n8n/issues/6200)) ([b69d20c](https://github.com/n8n-io/n8n/commit/b69d20c12ec1ad0395e23747ce5f1d437de0231b))
+* Allow `eslint-config` to be externally consumable ([#6694](https://github.com/n8n-io/n8n/issues/6694)) ([3566c13](https://github.com/n8n-io/n8n/commit/3566c13afc9795206b5a4af7b06159e35b046e12))
+* Allow hiding credential params on cloud ([#6687](https://github.com/n8n-io/n8n/issues/6687)) ([2af1c24](https://github.com/n8n-io/n8n/commit/2af1c24ead4c02e0588d4c2dfcf4a289f54388d4))
+* **API:** Implement users account quota guards  ([#6434](https://github.com/n8n-io/n8n/issues/6434)) ([e5620ab](https://github.com/n8n-io/n8n/commit/e5620ab1e49548e4c2ffd296e055f1caee94d2ba)), closes [#6636](https://github.com/n8n-io/n8n/issues/6636)
+* **core:** Add cache service ([#6729](https://github.com/n8n-io/n8n/issues/6729)) ([c0d2bac](https://github.com/n8n-io/n8n/commit/c0d2bac94d732d4166633adf9c3b8eaf5d8046be))
+* **core:** Only show V1 banner to users who migrated ([#6622](https://github.com/n8n-io/n8n/issues/6622)) ([071e56f](https://github.com/n8n-io/n8n/commit/071e56f7fde2fc4ffc7e3da92a069d8ed593bc60))
+* **editor:** Implement new banners framework ([#6603](https://github.com/n8n-io/n8n/issues/6603)) ([4240e76](https://github.com/n8n-io/n8n/commit/4240e76253e02da13942d4b84a83ec22fd30aca3))
+* **editor:** Load fixed template list as experiment ([#6632](https://github.com/n8n-io/n8n/issues/6632)) ([e996622](https://github.com/n8n-io/n8n/commit/e9966224ea555ce8f3a48872887a73ef879e47c3))
+* **editor:** Prevent saving of workflow when canvas is loading ([#6497](https://github.com/n8n-io/n8n/issues/6497)) ([f89ef83](https://github.com/n8n-io/n8n/commit/f89ef83c766fafb1d0497ed91a74b93e8d2af1ec))
+* **editor:** Removing `ph-no-capture` class from some elements ([#6674](https://github.com/n8n-io/n8n/issues/6674)) ([c3455a4](https://github.com/n8n-io/n8n/commit/c3455a4ad82d965c41267fea173feaad4800c43f))
+* Environments release using source control ([#6653](https://github.com/n8n-io/n8n/issues/6653)) ([fc7aa8b](https://github.com/n8n-io/n8n/commit/fc7aa8bd664553c463536b6abe58a488e5e11147))
+* **Google Cloud Storage Node:** Use streaming for file uploads ([#6462](https://github.com/n8n-io/n8n/issues/6462)) ([cd0e41a](https://github.com/n8n-io/n8n/commit/cd0e41a6b49a58bee95721363dd7e6c43de28725))
+* **Google Drive Node:** Overhaul ([#5941](https://github.com/n8n-io/n8n/issues/5941)) ([d70a1cb](https://github.com/n8n-io/n8n/commit/d70a1cb0c82ee0a4b92776684c6c9079020d028f))
+* **HTML Node:** 'Convert to table operation ([#6540](https://github.com/n8n-io/n8n/issues/6540)) ([8abb03d](https://github.com/n8n-io/n8n/commit/8abb03d7cf02ad7f03a0adffa646870df5f1a02c))
+* **HTTP Request Node:** New http request generic custom auth credential ([#5798](https://github.com/n8n-io/n8n/issues/5798)) ([b17b458](https://github.com/n8n-io/n8n/commit/b17b4582a059104665888a2369c3e2256db4c1ed))
+* **Matrix Node:** Allow setting filename if the binary data has none ([#6536](https://github.com/n8n-io/n8n/issues/6536)) ([8b76e98](https://github.com/n8n-io/n8n/commit/8b76e980852062b192a95593035697c43d6f808e))
+* **Microsoft To Do Node:** Add an option to set a reminder when creating a task ([#5757](https://github.com/n8n-io/n8n/issues/5757)) ([b19833d](https://github.com/n8n-io/n8n/commit/b19833d673bd554ba86c0b234e8d13633912563a))
+* **Notion Node:** Add option to update icon when updating a page ([#5670](https://github.com/n8n-io/n8n/issues/5670)) ([225e849](https://github.com/n8n-io/n8n/commit/225e849960ce65d7f85b482f05fb3d7ffb4f9427))
+* **OpenAI Node:** Update max token limit to support newer model limits ([#6644](https://github.com/n8n-io/n8n/issues/6644)) ([26046f6](https://github.com/n8n-io/n8n/commit/26046f6fe8df9e6fe799f6253d086142f6ce7e53))
+* **Read PDF Node:** Replace pdf-parse with pdfjs, and add support for streaming and encrypted PDFs ([#6640](https://github.com/n8n-io/n8n/issues/6640)) ([0a31b8e](https://github.com/n8n-io/n8n/commit/0a31b8e2b4aab8d74d80f76598900109fe19a0e8))
+* **Rundeck Node:** Add support for node filters  ([#5633](https://github.com/n8n-io/n8n/issues/5633)) ([1f70f49](https://github.com/n8n-io/n8n/commit/1f70f49ce5784baba7fd779b23209bae4f6b039a))
+* **Slack Node:** Add option to include link to workflow in Slack node ([#6611](https://github.com/n8n-io/n8n/issues/6611)) ([aa53c46](https://github.com/n8n-io/n8n/commit/aa53c46367480e31642e807ad1abf149fd13eb28))
+* **Strava Node:** Add hide_from_home field in Activity Update ([#5883](https://github.com/n8n-io/n8n/issues/5883)) ([7495e31](https://github.com/n8n-io/n8n/commit/7495e31a5b25e97683c7ea38225ba253d8fae8b7))
+* **Telegram Node:** Add support for sending messages to forum topics ([#5746](https://github.com/n8n-io/n8n/issues/5746)) ([e6a81f0](https://github.com/n8n-io/n8n/commit/e6a81f0008fddfcfd5f1102c8e6e58650020d930))
+* **Twitter Node:** Node overhaul ([#4788](https://github.com/n8n-io/n8n/issues/4788)) ([42721db](https://github.com/n8n-io/n8n/commit/42721dba80077fb796086a2bf0ecce256bf3a50f))
+
+
+### Reverts
+
+* Revert "test(editor): Add canvas actions E2E tests" (#6736) ([ed09e9c](https://github.com/n8n-io/n8n/commit/ed09e9c695109a715a4c8d47338bbb0b794eb009)), closes [#6736](https://github.com/n8n-io/n8n/issues/6736) [#6723](https://github.com/n8n-io/n8n/issues/6723)
+
+
+
+## [1.0.1](https://github.com/n8n-io/n8n/compare/n8n@1.0.0...n8n@1.0.1) (2023-07-05)
+
+
+### Bug Fixes
+
+* **core:** Fix credentials test ([#6569](https://github.com/n8n-io/n8n/issues/6569)) ([8f244df](https://github.com/n8n-io/n8n/commit/8f244df0f9efcb087a78dd8d9481489c484c77b7))
+* **core:** Fix migrations for MySQL/MariaDB ([#6591](https://github.com/n8n-io/n8n/issues/6591)) ([b9da67b](https://github.com/n8n-io/n8n/commit/b9da67b653bf19f39d0d1506d3140c71432efaed))
+* **core:** Make node execution order configurable, and backward-compatible ([#6507](https://github.com/n8n-io/n8n/issues/6507)) ([d97edbc](https://github.com/n8n-io/n8n/commit/d97edbcffa966a693548eed033ac41d4a404fc23))
+* **core:** Update pruning related config defaults for v1 ([#6577](https://github.com/n8n-io/n8n/issues/6577)) ([ffb4e47](https://github.com/n8n-io/n8n/commit/ffb4e470b56222ae11891d478e96ea9c31675afe))
+* **editor:** Restore expression completions ([#6566](https://github.com/n8n-io/n8n/issues/6566)) ([516e572](https://github.com/n8n-io/n8n/commit/516e5728f73da6393defe7633533cc142c531c7a))
+* **editor:** Show retry information in execution list only when it exists ([#6587](https://github.com/n8n-io/n8n/issues/6587)) ([2580286](https://github.com/n8n-io/n8n/commit/2580286a198e53c3bf3db6e56faed301b606db07))
+* **Sendy Node:** Fix issue with brand id not being sent ([#6530](https://github.com/n8n-io/n8n/issues/6530)) ([b9e5211](https://github.com/n8n-io/n8n/commit/b9e52117355d939e77a2e3c59a7f67ac21e31b22))
+* **Strapi Node:** Fix issue with pagination ([#4991](https://github.com/n8n-io/n8n/issues/4991)) ([4253b48](https://github.com/n8n-io/n8n/commit/4253b48b26d1625cd2fb7f38159f9528cea45f34))
+* **XML Node:** Fix issue with not returning valid data ([#6565](https://github.com/n8n-io/n8n/issues/6565)) ([c2b9d5a](https://github.com/n8n-io/n8n/commit/c2b9d5ac506375ecc316e8c79a3ce0bf143e9406))
+
+
+### Features
+
+* Add missing input panels to some trigger nodes ([#6518](https://github.com/n8n-io/n8n/issues/6518)) ([3b12864](https://github.com/n8n-io/n8n/commit/3b12864460a458f23b57a6f3f4b40d0d364ef6e6))
+
+
+
+# [1.0.0](https://github.com/n8n-io/n8n/compare/n8n@0.234.0...n8n@1.0.0) (2023-06-27)
+
+
+### ⚠️ BREAKING CHANGES
+* **core** Docker containers now run as the user `node` instead of `root` ([#6365](https://github.com/n8n-io/n8n/pull/6365)) ([f636616](https://github.com/n8n-io/n8n/commit/f6366160a476f42cb0612d10c5777a154d8665dd))
+* **core** Drop `debian` and `rhel7` images ([#6365](https://github.com/n8n-io/n8n/pull/6365)) ([f636616](https://github.com/n8n-io/n8n/commit/f6366160a476f42cb0612d10c5777a154d8665dd))
+* **core** Drop support for deprecated `WEBHOOK_TUNNEL_URL` env variable ([#6363](https://github.com/n8n-io/n8n/pull/6363))
+* **core** Execution mode defaults to `main` now, instead of `own` ([#6363](https://github.com/n8n-io/n8n/pull/6363))
+* **core** Default push backend is `websocket` now, instead of `sse` ([#6363](https://github.com/n8n-io/n8n/pull/6363))
+* **core** Stop loading custom/community nodes from n8n's `node_modules` folder ([#6396](https://github.com/n8n-io/n8n/pull/6396)) ([a45a2c8](https://github.com/n8n-io/n8n/commit/a45a2c8c41eb7ffb2d62d5a8877c34eb45799fa9))
+* **core** User management is mandatory now. basic-auth, external-jwt-auth, and no-auth options are removed ([#6362](https://github.com/n8n-io/n8n/pull/6362)) ([8c008f5](https://github.com/n8n-io/n8n/commit/8c008f5d2217030e93d79e2baca0f2965d4d643e))
+* **core** Allow syntax errors and expression errors to fail executions ([#6352](https://github.com/n8n-io/n8n/pull/6352)) ([1197811](https://github.com/n8n-io/n8n/commit/1197811a1e3bc4ad7464d53d7e4860d0e62335a3))
+* **core** Drop support for `request` library and `N8N_USE_DEPRECATED_REQUEST_LIB` env variable ([#6413](https://github.com/n8n-io/n8n/pull/6413)) ([632ea27](https://github.com/n8n-io/n8n/commit/632ea275b7fa352d4af23339208bed66bb948da8))
+* **core** Make date extensions outputs match inputs ([#6435](https://github.com/n8n-io/n8n/pull/6435)) ([85372aa](https://github.com/n8n-io/n8n/commit/85372aabdfc52493504d4723ee1829e2ea15151d))
+* **core** Drop support for `executeSingle` method on nodes ([#4853](https://github.com/n8n-io/n8n/pull/4853)) ([9194d8b](https://github.com/n8n-io/n8n/commit/9194d8bb0ecf81e52d47ddfc4b75dc4e0efd492d))
+* **core** Change data processing for multi-input-nodes ([#4238](https://github.com/n8n-io/n8n/pull/4238)) ([b8458a5](https://github.com/n8n-io/n8n/commit/b8458a53f66b79903f0fdb168f6febdefb36d13a))
+
+
+### Bug Fixes
+
+* **core:** All migrations should run in a transaction ([#6519](https://github.com/n8n-io/n8n/issues/6519)) ([e152cfe](https://github.com/n8n-io/n8n/commit/e152cfe27cf3396f4b278614f1d46d9dd723f36e))
+* **Edit Image Node:** Fix transparent operation ([#6513](https://github.com/n8n-io/n8n/issues/6513)) ([4a4bcbc](https://github.com/n8n-io/n8n/commit/4a4bcbca298bf90c54d3597103e6a231855abbd2))
+* **Google Drive Node:** URL parsing ([#6527](https://github.com/n8n-io/n8n/issues/6527)) ([18aa9f3](https://github.com/n8n-io/n8n/commit/18aa9f3c62149cd603c560c2944c3146cd31e9e7))
+* **Google Sheets Node:** Incorrect read of 0 and false ([#6525](https://github.com/n8n-io/n8n/issues/6525)) ([b6202b5](https://github.com/n8n-io/n8n/commit/b6202b5585f864d97dc114e1e49a6a7dae5c674a))
+* **Merge Node:** Enrich input 2 fix ([#6526](https://github.com/n8n-io/n8n/issues/6526)) ([70822ce](https://github.com/n8n-io/n8n/commit/70822ce988543476719089c132e1d10af0d03e78))
+* **Notion Node:** Version fix ([#6531](https://github.com/n8n-io/n8n/issues/6531)) ([d3d8522](https://github.com/n8n-io/n8n/commit/d3d8522e8f0c702f56997667a252892296540450))
+* Show error when referencing node that exist but has not been executed ([#6496](https://github.com/n8n-io/n8n/issues/6496)) ([3db2707](https://github.com/n8n-io/n8n/commit/3db2707b8e47ea539f4f6c40497a928b51b40274))
+
+
+### Features
+
+* **core:** Change node execution order (most top-left one first) ([#6246](https://github.com/n8n-io/n8n/issues/6246)) ([0287d5b](https://github.com/n8n-io/n8n/commit/0287d5becdce30a9c0de2a0d6ad4a0db50e198d7))
+* **core:** Remove conditional defaults in V1 release ([#6363](https://github.com/n8n-io/n8n/issues/6363)) ([f636616](https://github.com/n8n-io/n8n/commit/f6366160a476f42cb0612d10c5777a154d8665dd))
+* **editor:** Add v1 banner ([#6443](https://github.com/n8n-io/n8n/issues/6443)) ([0fe415a](https://github.com/n8n-io/n8n/commit/0fe415add2baa8e70e29087f7a90312bd1ab38af))
+* **editor:** SQL editor overhaul ([#6282](https://github.com/n8n-io/n8n/issues/6282)) ([beedfb6](https://github.com/n8n-io/n8n/commit/beedfb609ccde2ef202e08566580a2e1a6b6eafa))
+* **HTTP Request Node:** Notice about dev console ([#6516](https://github.com/n8n-io/n8n/issues/6516)) ([d431117](https://github.com/n8n-io/n8n/commit/d431117c9e5db9ff0ec6a1e7371bbf58698957c9))
+
+
+
+# [0.236.0](https://github.com/n8n-io/n8n/compare/n8n@0.235.0...n8n@0.236.0) (2023-07-05)
+
+
+### Bug Fixes
+
+* **Brevo Node:** Rename SendInBlue node to Brevo node ([#6521](https://github.com/n8n-io/n8n/issues/6521)) ([e63b398](https://github.com/n8n-io/n8n/commit/e63b3982d200ade34461b9159eb1e988f494c025))
+* **core:** Fix credentials test ([#6569](https://github.com/n8n-io/n8n/issues/6569)) ([1abd172](https://github.com/n8n-io/n8n/commit/1abd172f73e171e37c4cc3ccfaa395c6a46bdf48))
+* **core:** Fix migrations for MySQL/MariaDB ([#6591](https://github.com/n8n-io/n8n/issues/6591)) ([29882a6](https://github.com/n8n-io/n8n/commit/29882a6f39dddcd1c8c107c20a548ce8dc665cba))
+* **core:** Improve the performance of last 2 sqlite migrations ([#6522](https://github.com/n8n-io/n8n/issues/6522)) ([31cba87](https://github.com/n8n-io/n8n/commit/31cba87d307183d613890c7e6d627636b5280b52))
+* **core:** Remove typeorm patches, but still enforce transactions on every migration ([#6594](https://github.com/n8n-io/n8n/issues/6594)) ([9def7a7](https://github.com/n8n-io/n8n/commit/9def7a729b52cd6b4698c47e190e9e2bd7894da5)), closes [#6519](https://github.com/n8n-io/n8n/issues/6519)
+* **core:** Use owners file to export wf owners ([#6547](https://github.com/n8n-io/n8n/issues/6547)) ([4b755fb](https://github.com/n8n-io/n8n/commit/4b755fb0b441a37eb804c9e70d4b071a341f7155))
+* **editor:** Show retry information in execution list only when it exists ([#6587](https://github.com/n8n-io/n8n/issues/6587)) ([3ca66be](https://github.com/n8n-io/n8n/commit/3ca66be38082e7a3866d53d07328be58e913067f))
+* **Salesforce Node:** Fix typo for adding a contact to a campaign ([#6598](https://github.com/n8n-io/n8n/issues/6598)) ([7ffe3cb](https://github.com/n8n-io/n8n/commit/7ffe3cb36adeecaca6cc6ddf067a701ee55c18d1))
+* **Strapi Node:** Fix issue with pagination ([#4991](https://github.com/n8n-io/n8n/issues/4991)) ([54444fa](https://github.com/n8n-io/n8n/commit/54444fa388da12d75553e66e53a8cf6f8a99b6fc))
+* **XML Node:** Fix issue with not returning valid data ([#6565](https://github.com/n8n-io/n8n/issues/6565)) ([cdd215f](https://github.com/n8n-io/n8n/commit/cdd215f642b47413c05f229e641074d0d4048f68))
+
+
+### Features
+
+* Add crowd.dev node and trigger node ([#6082](https://github.com/n8n-io/n8n/issues/6082)) ([238a78f](https://github.com/n8n-io/n8n/commit/238a78f0582dbf439a9799de0edcb2e9bef29978))
+* Add various source control improvements ([#6533](https://github.com/n8n-io/n8n/issues/6533)) ([68fdc20](https://github.com/n8n-io/n8n/commit/68fdc2078928be478a286774f2889feba1c3f5fe))
+* **HTTP Request Node:** New http request generic custom auth credential ([#5798](https://github.com/n8n-io/n8n/issues/5798)) ([b17b458](https://github.com/n8n-io/n8n/commit/b17b4582a059104665888a2369c3e2256db4c1ed))
+* **Microsoft To Do Node:** Add an option to set a reminder when creating a task ([#5757](https://github.com/n8n-io/n8n/issues/5757)) ([b19833d](https://github.com/n8n-io/n8n/commit/b19833d673bd554ba86c0b234e8d13633912563a))
+* **Notion Node:** Add option to update icon when updating a page ([#5670](https://github.com/n8n-io/n8n/issues/5670)) ([225e849](https://github.com/n8n-io/n8n/commit/225e849960ce65d7f85b482f05fb3d7ffb4f9427))
+* **Strava Node:** Add hide_from_home field in Activity Update ([#5883](https://github.com/n8n-io/n8n/issues/5883)) ([7495e31](https://github.com/n8n-io/n8n/commit/7495e31a5b25e97683c7ea38225ba253d8fae8b7))
+* **Twitter Node:** Node overhaul ([#4788](https://github.com/n8n-io/n8n/issues/4788)) ([42721db](https://github.com/n8n-io/n8n/commit/42721dba80077fb796086a2bf0ecce256bf3a50f))
+
+
+
+# [0.235.0](https://github.com/n8n-io/n8n/compare/n8n@0.234.0...n8n@0.235.0) (2023-06-28)
+
+
+### Bug Fixes
+
+* **core:** Add empty credential value marker to show empty pw field ([#6532](https://github.com/n8n-io/n8n/issues/6532)) ([9294e2d](https://github.com/n8n-io/n8n/commit/9294e2da3c7c99c2099f5865e610fa7217bf06be))
+* **core:** All migrations should run in a transaction ([#6519](https://github.com/n8n-io/n8n/issues/6519)) ([e152cfe](https://github.com/n8n-io/n8n/commit/e152cfe27cf3396f4b278614f1d46d9dd723f36e))
+* **core:** Rename to credential_stubs and variable_stubs.json ([#6528](https://github.com/n8n-io/n8n/issues/6528)) ([b06462f](https://github.com/n8n-io/n8n/commit/b06462f4415bd1143a00b4a66e6e626da8c52196))
+* **Edit Image Node:** Fix transparent operation ([#6513](https://github.com/n8n-io/n8n/issues/6513)) ([4a4bcbc](https://github.com/n8n-io/n8n/commit/4a4bcbca298bf90c54d3597103e6a231855abbd2))
+* **editor:** Add default author name and email to source control settings ([#6543](https://github.com/n8n-io/n8n/issues/6543)) ([e1a02c7](https://github.com/n8n-io/n8n/commit/e1a02c76257de30e08878279dea33d7854d46938))
+* **editor:** Change default branchColor and remove label ([#6541](https://github.com/n8n-io/n8n/issues/6541)) ([186271e](https://github.com/n8n-io/n8n/commit/186271e939bca19ec9c94d9455e9430d8b8cf9d7))
+* **Google Drive Node:** URL parsing ([#6527](https://github.com/n8n-io/n8n/issues/6527)) ([d9ed0b3](https://github.com/n8n-io/n8n/commit/d9ed0b31b538320a67ee4e5c0cae34656c9f4334))
+* **Google Sheets Node:** Incorrect read of 0 and false ([#6525](https://github.com/n8n-io/n8n/issues/6525)) ([806d134](https://github.com/n8n-io/n8n/commit/806d13460240abe94843e569b1820cd8d0d8edd1))
+* **Merge Node:** Enrich input 2 fix ([#6526](https://github.com/n8n-io/n8n/issues/6526)) ([c82c7f1](https://github.com/n8n-io/n8n/commit/c82c7f19128df3a11d6d0f18e8d8dab57e6a3b8f))
+* **Notion Node:** Version fix ([#6531](https://github.com/n8n-io/n8n/issues/6531)) ([38dc784](https://github.com/n8n-io/n8n/commit/38dc784d2eed25aae777c5c3c3fda1a35e20bd24))
+* **Sendy Node:** Fix issue with brand id not being sent ([#6530](https://github.com/n8n-io/n8n/issues/6530)) ([2e8dfb8](https://github.com/n8n-io/n8n/commit/2e8dfb86d4636781b319d6190e8be12e7661ee16))
+
+
+### Features
+
+* Add missing input panels to some trigger nodes ([#6518](https://github.com/n8n-io/n8n/issues/6518)) ([fdf8a42](https://github.com/n8n-io/n8n/commit/fdf8a428ed38bb3ceb2bc0e50b002b34843d8fc4))
+* **editor:** Prevent saving of workflow when canvas is loading ([#6497](https://github.com/n8n-io/n8n/issues/6497)) ([f89ef83](https://github.com/n8n-io/n8n/commit/f89ef83c766fafb1d0497ed91a74b93e8d2af1ec))
+* **editor:** SQL editor overhaul ([#6282](https://github.com/n8n-io/n8n/issues/6282)) ([beedfb6](https://github.com/n8n-io/n8n/commit/beedfb609ccde2ef202e08566580a2e1a6b6eafa))
+* **Google Drive Node:** Overhaul ([#5941](https://github.com/n8n-io/n8n/issues/5941)) ([d70a1cb](https://github.com/n8n-io/n8n/commit/d70a1cb0c82ee0a4b92776684c6c9079020d028f))
+* **HTTP Request Node:** Notice about dev console ([#6516](https://github.com/n8n-io/n8n/issues/6516)) ([d431117](https://github.com/n8n-io/n8n/commit/d431117c9e5db9ff0ec6a1e7371bbf58698957c9))
+* **Matrix Node:** Allow setting filename if the binary data has none ([#6536](https://github.com/n8n-io/n8n/issues/6536)) ([8b76e98](https://github.com/n8n-io/n8n/commit/8b76e980852062b192a95593035697c43d6f808e))
+
+
+
+# [0.234.0](https://github.com/n8n-io/n8n/compare/n8n@0.233.0...n8n@0.234.0) (2023-06-22)
+
+
+### Bug Fixes
+
+* **core:** Fix OAuth2 callback for `grantType=clientCredentials` ([#6500](https://github.com/n8n-io/n8n/issues/6500)) ([25b9216](https://github.com/n8n-io/n8n/commit/25b92169aefc47dc028a11dc008abb4a36d037d3))
+* **core:** Fix pairedItem for alwaysOutputData & multi identical resolve ([#6405](https://github.com/n8n-io/n8n/issues/6405)) ([4b0e0b7](https://github.com/n8n-io/n8n/commit/4b0e0b797071cb20bd2b042eb0d8591fe801ae76))
+* **core:** Fix the url sent in the password-reset emails ([#6466](https://github.com/n8n-io/n8n/issues/6466)) ([9978e27](https://github.com/n8n-io/n8n/commit/9978e2760bc0b8f8c7e5c1ef6610670611d8efe9))
+* **core:** Improve the error returned to users on SSL issues ([#6494](https://github.com/n8n-io/n8n/issues/6494)) ([1b084bc](https://github.com/n8n-io/n8n/commit/1b084bc56b90a25b399c084b69efdb48ff01dfb5))
+* **core:** Use correct scopes-separator when generating authorization urls ([#6502](https://github.com/n8n-io/n8n/issues/6502)) ([5bf83f8](https://github.com/n8n-io/n8n/commit/5bf83f8bf6889e0154000ad774f292e98b87729d))
+* **editor:** Fix DNV header disappearing when scrolling the code editor content ([#6459](https://github.com/n8n-io/n8n/issues/6459)) ([ad9fd12](https://github.com/n8n-io/n8n/commit/ad9fd12615a7050c6fec0caf041e49c972693d1f))
+* **editor:** Fix resource mapper dropdown width and disabled styling ([#6493](https://github.com/n8n-io/n8n/issues/6493)) ([da330f0](https://github.com/n8n-io/n8n/commit/da330f0648b85c39e89ca2eeaba94f9b2c3a1b13))
+* **editor:** Remove `$if`, `$min` and `$max` from code node autocomplete ([#6460](https://github.com/n8n-io/n8n/issues/6460)) ([16f707d](https://github.com/n8n-io/n8n/commit/16f707d5c479c72f87c129ec870fd00c329a9ade))
+* **editor:** Show confirm on pull only when http response status is 409 ([#6451](https://github.com/n8n-io/n8n/issues/6451)) ([5819be5](https://github.com/n8n-io/n8n/commit/5819be5ced53adc643b2bb18dbd1be0096a05395))
+* **editor:** Show execution error as message ([#6431](https://github.com/n8n-io/n8n/issues/6431)) ([d3b78e2](https://github.com/n8n-io/n8n/commit/d3b78e291ece5355b0829c935a3142b6078287c9))
+* **editor:** Update data pinning tooltip to match current behaviour ([#6436](https://github.com/n8n-io/n8n/issues/6436)) ([ee10ac8](https://github.com/n8n-io/n8n/commit/ee10ac8da9ad6533995361f51cab97da35501855))
+* **editor:** Update git repo URL validation to prevent using https protocol ([#6475](https://github.com/n8n-io/n8n/issues/6475)) ([8b50625](https://github.com/n8n-io/n8n/commit/8b50625fb15fc86840485e167627a2ab1802d512))
+* **editor:** Update version control docs links ([#6440](https://github.com/n8n-io/n8n/issues/6440)) ([da105f4](https://github.com/n8n-io/n8n/commit/da105f468bd69b3d572f422d7270204e5823200e))
+* **Google Sheets Node:** Return empty response if no rows updated ([#6407](https://github.com/n8n-io/n8n/issues/6407)) ([32fb419](https://github.com/n8n-io/n8n/commit/32fb4190111c60c8bd05d47d5bace2f9043d1f06))
+* **HTML Node:** Prevent XSS in execution-data preview ([#6432](https://github.com/n8n-io/n8n/issues/6432)) ([16e0df5](https://github.com/n8n-io/n8n/commit/16e0df553c4e068768bf7dd7bbac1d7c2b88fec2))
+* **HTTP Request Node:** "Ignore SSL issues" should also ignore legacy renegotiation issues ([#6492](https://github.com/n8n-io/n8n/issues/6492)) ([7a95e08](https://github.com/n8n-io/n8n/commit/7a95e08bfd04cd53a9d531fdb715f289bfdd64b6))
+* **LinkedIn Node:** Remove unsupported description from image posts ([#6446](https://github.com/n8n-io/n8n/issues/6446)) ([529f0e4](https://github.com/n8n-io/n8n/commit/529f0e499670450f8cb0dda539176d1b07c39190))
+* Make MySQL migration for nano id change compatible with version 5.7 ([#6498](https://github.com/n8n-io/n8n/issues/6498)) ([044c710](https://github.com/n8n-io/n8n/commit/044c710a8ecca3d705ebfb53cef204482428fbec))
+* **Split In Batches Node:** Add "done" context to allow simple reset ([#6437](https://github.com/n8n-io/n8n/issues/6437)) ([ffd13f4](https://github.com/n8n-io/n8n/commit/ffd13f4541794832792ecf33e24d5dc4960ff005))
+* **Zendesk Node:** Fix issue with group assignment not working ([#6501](https://github.com/n8n-io/n8n/issues/6501)) ([772ed7f](https://github.com/n8n-io/n8n/commit/772ed7ff10f6071816ad8cb4543ae9bcaf3813d3))
+* **Zulip Node:** Remove trailing slash from the url ([#6427](https://github.com/n8n-io/n8n/issues/6427)) ([cc1b249](https://github.com/n8n-io/n8n/commit/cc1b249d58618c11bb22ae4458aaf22ef77e6493))
+
+
+### Features
+
+* Add support for large files with declarative nodes ([#6461](https://github.com/n8n-io/n8n/issues/6461)) ([e0f109f](https://github.com/n8n-io/n8n/commit/e0f109fa7ee3b1502d68f648504e12a61bff7c93))
+* **AwsS3 Node:** Small overhaul of the node with multipart uploading ([#6017](https://github.com/n8n-io/n8n/issues/6017)) ([109442f](https://github.com/n8n-io/n8n/commit/109442f38f9868d51d85ba4f88d185910f4f2688))
+* **core:** Add GET /users endpoints to public API ([#6360](https://github.com/n8n-io/n8n/issues/6360)) ([6ab3502](https://github.com/n8n-io/n8n/commit/6ab350209d0fa7ee37c9e4425d987517aeba3d98))
+* **core:** Add PKCE for OAuth2 ([#6324](https://github.com/n8n-io/n8n/issues/6324)) ([fc7261a](https://github.com/n8n-io/n8n/commit/fc7261aca6485141fca95b6eccffe1f1a9a8c0c4))
+* **DebugHelper Node:** Fix and include in main app ([#6406](https://github.com/n8n-io/n8n/issues/6406)) ([18f5884](https://github.com/n8n-io/n8n/commit/18f588444f7f126ec1c4867d2ac1f2d3cbc99b88))
+* **Gmail Node:** Add reply to email ([#6453](https://github.com/n8n-io/n8n/issues/6453)) ([fddc69e](https://github.com/n8n-io/n8n/commit/fddc69ee2c2324aff783172c959af9e40ad89696))
+* **Item Lists Node:** Improvements ([#6190](https://github.com/n8n-io/n8n/issues/6190)) ([1dbca44](https://github.com/n8n-io/n8n/commit/1dbca4402579ce1e323ab30c5caebef247a19c8d))
+* Migrate integer primary keys to nanoids ([#6345](https://github.com/n8n-io/n8n/issues/6345)) ([c3ba012](https://github.com/n8n-io/n8n/commit/c3ba0123ad0913140707dbf56fafa1d4dd0f3de3)), closes [#6323](https://github.com/n8n-io/n8n/issues/6323)
+* **Stripe Trigger Node:** Add action required trigger for payment intents ([#6490](https://github.com/n8n-io/n8n/issues/6490)) ([f2154fb](https://github.com/n8n-io/n8n/commit/f2154fba60cbbaa9b6c9e72523801573fe3b6baf))
+* **Webhook Node:** Stream binary response in `lastNode.firstEntryBinary` mode ([#6463](https://github.com/n8n-io/n8n/issues/6463)) ([6ccab3e](https://github.com/n8n-io/n8n/commit/6ccab3eaaa883e17d00607e180e14edf9ce33688))
+
+
+
+# [0.233.0](https://github.com/n8n-io/n8n/compare/n8n@0.232.0...n8n@0.233.0) (2023-06-14)
+
+
+### Bug Fixes
+
+* **core:** Allow all executions to be stopped ([#6386](https://github.com/n8n-io/n8n/issues/6386)) ([cc44af9](https://github.com/n8n-io/n8n/commit/cc44af9243457a5dfa904c205ad5428f793104b4))
+* **core:** Prevent arbitrary code execution via expressions ([#6420](https://github.com/n8n-io/n8n/issues/6420)) ([da7ae2b](https://github.com/n8n-io/n8n/commit/da7ae2beef0375aa914aee251aeff5f7ff334b34))
+* **editor:** Hide version control main menu component if no feature flag ([#6419](https://github.com/n8n-io/n8n/issues/6419)) ([75c0ab0](https://github.com/n8n-io/n8n/commit/75c0ab03f8379bb5426cef87045b67b458c97d70))
+* **LinkedIn Node:** Fix issue with posting as user or organization ([#6414](https://github.com/n8n-io/n8n/issues/6414)) ([d041602](https://github.com/n8n-io/n8n/commit/d041602754a694e67e81c1bbff87c13bf91bdd5d))
+* **Schedule Trigger Node:** Follow the correct Unix cron format for month and days of the week ([#6401](https://github.com/n8n-io/n8n/issues/6401)) ([2aef9de](https://github.com/n8n-io/n8n/commit/2aef9de14830c56199fd19bc09382424c55a2b9b))
+
+
+
+# [0.232.0](https://github.com/n8n-io/n8n/compare/n8n@0.231.0...n8n@0.232.0) (2023-06-07)
+
+
+### Bug Fixes
+
+* **core:** RMC boolean value fix ([#6397](https://github.com/n8n-io/n8n/issues/6397)) ([28bb797](https://github.com/n8n-io/n8n/commit/28bb797bb0ea59b66a7641fc116f47c25564c21a))
+* **Date & Time Node:** Reset responseData at end of loop ([#6385](https://github.com/n8n-io/n8n/issues/6385)) ([eaa8648](https://github.com/n8n-io/n8n/commit/eaa8648f2bf61074eae6dcd7355f8f107a31388e))
+* **editor:** Add button to refresh branches ([#6387](https://github.com/n8n-io/n8n/issues/6387)) ([ce57816](https://github.com/n8n-io/n8n/commit/ce578162f4e44a6cc1774ab217967110b254ab3f))
+* **editor:** Add secondary icon to menu items ([#6351](https://github.com/n8n-io/n8n/issues/6351)) ([3dd2601](https://github.com/n8n-io/n8n/commit/3dd260168eb627fd7fbed740bc97fa7f6289628f))
+* **editor:** Add Set up version control CTA ([#6356](https://github.com/n8n-io/n8n/issues/6356)) ([e72521d](https://github.com/n8n-io/n8n/commit/e72521d5ec7a5e57dc311defb70f1fe19054b0f0))
+* **editor:** Adding branch color ([#6380](https://github.com/n8n-io/n8n/issues/6380)) ([dba3f44](https://github.com/n8n-io/n8n/commit/dba3f44bc00de68113cc98db9afc6267f56ec04c))
+* **editor:** Fix an issue with connections breaking during renaming ([#6358](https://github.com/n8n-io/n8n/issues/6358)) ([0f2bc6b](https://github.com/n8n-io/n8n/commit/0f2bc6b73711597fdf008ee54665d9bed82a1a9e))
+* **editor:** Fix hard-coded parameter names for code editors ([#6372](https://github.com/n8n-io/n8n/issues/6372)) ([f61b776](https://github.com/n8n-io/n8n/commit/f61b776beac961fa58c6c69371c69ae1e74ef83e))
+* **editor:** Fix typing `$` in inline expression field reloading node parameters form ([#6374](https://github.com/n8n-io/n8n/issues/6374)) ([4c0d4eb](https://github.com/n8n-io/n8n/commit/4c0d4ebd9917e52512e85a5cad2c93b554e0e212))
+* **editor:** Pin all data regardless of pagination ([#6346](https://github.com/n8n-io/n8n/issues/6346)) ([f88029f](https://github.com/n8n-io/n8n/commit/f88029f308356c1c8271d7345ecbbd6e91c41b3d))
+* **editor:** Remove explicit parameter name scanning for code editors ([#6390](https://github.com/n8n-io/n8n/issues/6390)) ([97295f6](https://github.com/n8n-io/n8n/commit/97295f67f0f8509ac6ba0d4ce38ce12582dff074))
+* **editor:** Remove root level tag selector from css module to avoid making it a global style ([#6392](https://github.com/n8n-io/n8n/issues/6392)) ([cc37f21](https://github.com/n8n-io/n8n/commit/cc37f21aa27f3536f2043b5ff5da944388ac5504))
+* **editor:** Update version control setup CTA tooltip ([#6393](https://github.com/n8n-io/n8n/issues/6393)) ([385b3e8](https://github.com/n8n-io/n8n/commit/385b3e871a9307c36428f8239a5db318d71948c1))
+* Improve executions list polling performance ([#6355](https://github.com/n8n-io/n8n/issues/6355)) ([b5cabfe](https://github.com/n8n-io/n8n/commit/b5cabfef54e186f59580112a90566099bb79305e))
+* **Ldap Node:** Add DN field to update operation ([#6371](https://github.com/n8n-io/n8n/issues/6371)) ([9396e7e](https://github.com/n8n-io/n8n/commit/9396e7eb585ab9d6fda742b0d234c4262570af93))
+* Show actual execution data for production executions even if pin data exists ([#6302](https://github.com/n8n-io/n8n/issues/6302)) ([4eb8437](https://github.com/n8n-io/n8n/commit/4eb8437196a298a64f039aff51ba030dc21abb08))
+
+
+### Features
+
+* **Crypto Node:** Add support for hash and hmac on binary data ([#6359](https://github.com/n8n-io/n8n/issues/6359)) ([406a405](https://github.com/n8n-io/n8n/commit/406a405dd153833057286a27d04278ef71ceef3d))
+* **editor:** Make WF name a link on /executions ([#6354](https://github.com/n8n-io/n8n/issues/6354)) ([6ddf161](https://github.com/n8n-io/n8n/commit/6ddf16128b4ab47db716eeab89f7526558073f56))
+* New trigger PostgreSQL  ([#5495](https://github.com/n8n-io/n8n/issues/5495)) ([4488f93](https://github.com/n8n-io/n8n/commit/4488f93c39b0ec0b4a0eff98391b46db6a2eed78))
+* Version control mvp ([#6271](https://github.com/n8n-io/n8n/issues/6271)) ([1b32141](https://github.com/n8n-io/n8n/commit/1b321416c0ba5371e0016398ae660ce298b8cdd6))
+
+
+# [0.231.0](https://github.com/n8n-io/n8n/compare/n8n@0.230.0...n8n@0.231.0) (2023-05-31)
+
+
+### Bug Fixes
+
+* **Code Node:** Fix `item` and `items` alias regression ([#6331](https://github.com/n8n-io/n8n/issues/6331)) ([54e3838](https://github.com/n8n-io/n8n/commit/54e3838daed1f0931a04ba76cfd1ea7519c0e382))
+* **Code Node:** Update vm2 to address CVE-2023-32313 ([#6318](https://github.com/n8n-io/n8n/issues/6318)) ([bcbec52](https://github.com/n8n-io/n8n/commit/bcbec52552d52b0509659cab13112e1377a256b3))
+* **core:** Optimize getSharedWorkflowIds query ([#6314](https://github.com/n8n-io/n8n/issues/6314)) ([0631f69](https://github.com/n8n-io/n8n/commit/0631f69d98e5420faebba1a54d9ad47a2664d110))
+* **core:** Prevent prototype pollution on injectable services ([#6309](https://github.com/n8n-io/n8n/issues/6309)) ([d94c20a](https://github.com/n8n-io/n8n/commit/d94c20ada543767f700475b40ef7174c433c26c5))
+* **editor:** Fix locale plularisation if count is 0 ([#6312](https://github.com/n8n-io/n8n/issues/6312)) ([0d88bd7](https://github.com/n8n-io/n8n/commit/0d88bd7c1ae95cf077c2fa231d942204ff3b8f68))
+* **editor:** Fix Luxon date parsing of ExecutionsUsage component ([#6333](https://github.com/n8n-io/n8n/issues/6333)) ([8f0ff46](https://github.com/n8n-io/n8n/commit/8f0ff460b11999f4d78f8313910358aa87311713))
+* **editor:** Update SSO settings styles ([#6342](https://github.com/n8n-io/n8n/issues/6342)) ([5ae1124](https://github.com/n8n-io/n8n/commit/5ae1124106e7597d0943c371eae6aba6c105fd6b))
+* **Execute Command Node:** Block executions when `command` is empty ([#6308](https://github.com/n8n-io/n8n/issues/6308)) ([011d577](https://github.com/n8n-io/n8n/commit/011d5778b15232cff94a321dfee18c3d7489f93d))
+* Show `Ask AI` only on Code Node ([#6336](https://github.com/n8n-io/n8n/issues/6336)) ([da856d1](https://github.com/n8n-io/n8n/commit/da856d1c6593b43e1ce8d1becb1464c19c908e78))
+
+
+### Features
+
+* Add manual login option and password reset link for SSO ([#6328](https://github.com/n8n-io/n8n/issues/6328)) ([77e3f15](https://github.com/n8n-io/n8n/commit/77e3f1551dd7473a69f8833be5678d98964142e1))
+* **core:** Add metadata (customdata) to event log ([#6334](https://github.com/n8n-io/n8n/issues/6334)) ([792b1c1](https://github.com/n8n-io/n8n/commit/792b1c1ffb0eb279bc3451787891ca3835f59d9f))
+* **editor:** Implement Resource Mapper component ([#6207](https://github.com/n8n-io/n8n/issues/6207)) ([04cfa54](https://github.com/n8n-io/n8n/commit/04cfa548af3c7a25f1f0a36ddfb1de6a9e3f2169)), closes [#5752](https://github.com/n8n-io/n8n/issues/5752) [#5814](https://github.com/n8n-io/n8n/issues/5814)
+
+
+
+# [0.230.0](https://github.com/n8n-io/n8n/compare/n8n@0.229.0...n8n@0.230.0) (2023-05-24)
+
+
+### Bug Fixes
+
+* **core:** Optimize SharedWorkflow queries ([#6297](https://github.com/n8n-io/n8n/issues/6297)) ([ed7f3b8](https://github.com/n8n-io/n8n/commit/ed7f3b845fe9a7aa0f6e1ff57ae9197057cd8aa1))
+* **core:** Prevent app crashes because of unhandled promises in poll and trigger nodes ([#6278](https://github.com/n8n-io/n8n/issues/6278)) ([3750605](https://github.com/n8n-io/n8n/commit/37506050c3f49cececa9da3cf7d420b367f2e055))
+* **editor:** Fix canvas loading when page gets restored from bfcache ([#6304](https://github.com/n8n-io/n8n/issues/6304)) ([11477f0](https://github.com/n8n-io/n8n/commit/11477f0a20f82b02d763dbf53e29083dd1e95e87))
+* **editor:** Fix design system button with icon vertical alignment ([#6284](https://github.com/n8n-io/n8n/issues/6284)) ([fc580f7](https://github.com/n8n-io/n8n/commit/fc580f7ee80b48a62fc2bebaec9902cd15944ad7))
+* **editor:** Fix inverted checks on modal confirmation results ([#6285](https://github.com/n8n-io/n8n/issues/6285)) ([5d2f474](https://github.com/n8n-io/n8n/commit/5d2f4746ea5da977a6532db90c624ded1520ec3e))
+* **ERPNext Node:** Fix issue with credential test and add frappe cloud url ([#6283](https://github.com/n8n-io/n8n/issues/6283)) ([2a2b645](https://github.com/n8n-io/n8n/commit/2a2b6452dc326d8979bed0cf47fc54becd746619))
+* **Google Calendar Node:** All day option fix ([#6274](https://github.com/n8n-io/n8n/issues/6274)) ([5bef91e](https://github.com/n8n-io/n8n/commit/5bef91e3c84a15a30a893ce3b321b7a8ea926963))
+* Initialize license in queue mode correctly ([#6301](https://github.com/n8n-io/n8n/issues/6301)) ([42c79cd](https://github.com/n8n-io/n8n/commit/42c79cd6f1e495e60a9f038403d9a8a761318f52))
+* **OpenAI Node:** Descriptive errors ([#6270](https://github.com/n8n-io/n8n/issues/6270)) ([8fdfa3b](https://github.com/n8n-io/n8n/commit/8fdfa3b6b83c6a008d1be778dadcc2172e8a708d))
+* Prevent removing manual executions when setting says to save ([#6300](https://github.com/n8n-io/n8n/issues/6300)) ([55b755c](https://github.com/n8n-io/n8n/commit/55b755cb44a3bf9fc9d41af37b7818d3626baf0d))
+* **SSH Node:** Private key field as password and credential test ([#6298](https://github.com/n8n-io/n8n/issues/6298)) ([d5c7e6f](https://github.com/n8n-io/n8n/commit/d5c7e6f2cff63337948122a11c3707316c937b9f))
+* **SSH Node:** Replace ~ with /home/username ([#6269](https://github.com/n8n-io/n8n/issues/6269)) ([4219490](https://github.com/n8n-io/n8n/commit/421949067b47a25e859fbd45364ba657e7286599))
+* **Strapi Node:** Strapi credentials notice ([#6289](https://github.com/n8n-io/n8n/issues/6289)) ([bbe6d4c](https://github.com/n8n-io/n8n/commit/bbe6d4c4dbda0b2cba447cf1b0aa4a7f808096fb))
+* **Strava Trigger Node:** Fix issue with delete events failing to display data ([#6277](https://github.com/n8n-io/n8n/issues/6277)) ([8a8fed0](https://github.com/n8n-io/n8n/commit/8a8fed08407f20791ae01ab83e1ce3d99715dc5c))
+* **Wekan Node:** Handle response correctly ([#6296](https://github.com/n8n-io/n8n/issues/6296)) ([4d9c8b0](https://github.com/n8n-io/n8n/commit/4d9c8b07a93ea4f2e5ad913358bafb682f6f5506))
+
+
+### Features
+
+* Add SSO SAML metadataUrl support and various improvements ([#6139](https://github.com/n8n-io/n8n/issues/6139)) ([e3a53fd](https://github.com/n8n-io/n8n/commit/e3a53fd19d8c258a08baab9c090968104327a13b))
+* **core:** Remove all floating promises. Enforce `@typescript-eslint/no-floating-promises` ([#6281](https://github.com/n8n-io/n8n/issues/6281)) ([e046f65](https://github.com/n8n-io/n8n/commit/e046f656fefe951af71ab031a440729a5eb1c7cb))
+* **core:** Replace client-oauth2 with an in-repo package ([#6266](https://github.com/n8n-io/n8n/issues/6266)) ([a1b1f24](https://github.com/n8n-io/n8n/commit/a1b1f24ddfd4da36f8dd04e34e2675a3993755ca))
+* **Execution Data Node:** New node ([#6247](https://github.com/n8n-io/n8n/issues/6247)) ([3f7c4f0](https://github.com/n8n-io/n8n/commit/3f7c4f0ad485a0a4049f371723b01847077f7ccd))
+* **Gotify Node:** Add support for self signed certificates ([#6053](https://github.com/n8n-io/n8n/issues/6053)) ([401cffd](https://github.com/n8n-io/n8n/commit/401cffde57aa153bc2d1589bc8d11d7951f2ade1))
+* **Ldap Node:** Add LDAP node ([#4783](https://github.com/n8n-io/n8n/issues/4783)) ([ec393bc](https://github.com/n8n-io/n8n/commit/ec393bc041e9e7590e7b0a2821976f104f5c23bb))
+* **LoneScale Node:** Add LoneScale node and Trigger node ([#5146](https://github.com/n8n-io/n8n/issues/5146)) ([4b85433](https://github.com/n8n-io/n8n/commit/4b854333d49c661fe11f19a176a147dbf28e697f))
+* **RabbitMQ Node:** Add mode for acknowledging and deleting from queue later in workflow ([#6225](https://github.com/n8n-io/n8n/issues/6225)) ([f5950b2](https://github.com/n8n-io/n8n/commit/f5950b201c6ff412b9a304052f05eb2c3b8a7c51))
+* **Send Email Node:** Add content-id for email attachments ([#3632](https://github.com/n8n-io/n8n/issues/3632)) ([8fe8aad](https://github.com/n8n-io/n8n/commit/8fe8aad6a77bbec7a26c87f8bad9593852e8d464))
+* **SSH Node:** Credentials test ([#6279](https://github.com/n8n-io/n8n/issues/6279)) ([3569d53](https://github.com/n8n-io/n8n/commit/3569d53917b41b758a96293a2b33a06cbf2c0a70))
+
+
+
+# [0.229.0](https://github.com/n8n-io/n8n/compare/n8n@0.228.0...n8n@0.229.0) (2023-05-17)
+
+
+### Bug Fixes
+
+* **Code Node:** Restore help text ([#6231](https://github.com/n8n-io/n8n/issues/6231)) ([e72d564](https://github.com/n8n-io/n8n/commit/e72d564bf84460ce085f022f186e8101524f2e7b))
+* **core:** Make sure that special polling parameters are available on community nodes as well ([#6230](https://github.com/n8n-io/n8n/issues/6230)) ([9db49d0](https://github.com/n8n-io/n8n/commit/9db49d0c18f007b974594b918728e430ec510f54))
+* Remove workflow execution credential error message when instance owner ([#6116](https://github.com/n8n-io/n8n/issues/6116)) ([e81a964](https://github.com/n8n-io/n8n/commit/e81a96483af6e0d0a3cf62481f5e9a37d6a62b6e))
+
+
+### Features
+
+* **core:** Reduce the number of events sent to Sentry ([#6235](https://github.com/n8n-io/n8n/issues/6235)) ([a4c0cc9](https://github.com/n8n-io/n8n/commit/a4c0cc9b5c56639067918f1bad1baf4eb201e48b))
+* **core:** Return OAuth2 error body if available ([#5794](https://github.com/n8n-io/n8n/issues/5794)) ([79d0a0f](https://github.com/n8n-io/n8n/commit/79d0a0f2470905f98b71fb5c8ca007244004f99a))
+* **editor:** Add cloud ExecutionsUsage and API blocking using licenses ([#6159](https://github.com/n8n-io/n8n/issues/6159)) ([cd7c312](https://github.com/n8n-io/n8n/commit/cd7c312fbd172b5d3c8bbeaf775f7b5bb4611aa5)), closes [#6187](https://github.com/n8n-io/n8n/issues/6187)
+* **editor:** Add color picker design system component ([#6179](https://github.com/n8n-io/n8n/issues/6179)) ([823e885](https://github.com/n8n-io/n8n/commit/823e88500c35508d6322242bca5749d711fb2b31))
+* **editor:** Drop support for legacy browsers that do not have native ESM support ([#6239](https://github.com/n8n-io/n8n/issues/6239)) ([9182d15](https://github.com/n8n-io/n8n/commit/9182d1558a1f98e0ea1b9fbaddabf7c8b4836e94))
+* **editor:** Updating node reference pattern in expression editor ([#6228](https://github.com/n8n-io/n8n/issues/6228)) ([13bcec1](https://github.com/n8n-io/n8n/commit/13bcec1661e1da736ff9c93869bc49a3038bdf1b))
+* **editor:** Version Control settings update (WIP) ([#6233](https://github.com/n8n-io/n8n/issues/6233)) ([0666377](https://github.com/n8n-io/n8n/commit/0666377ef8074ad093391d41e08e194704a25dbd))
+* **Google Ads Node:** Update to support v13 ([#6212](https://github.com/n8n-io/n8n/issues/6212)) ([bd1bffc](https://github.com/n8n-io/n8n/commit/bd1bffcd536eedde8582a354c11349dbddd2b9a2))
+* **Respond to Webhook Node:** Move from Binary Buffer to Binary streaming ([#5613](https://github.com/n8n-io/n8n/issues/5613)) ([8ae2d80](https://github.com/n8n-io/n8n/commit/8ae2d801d8e2c881fcff5f7cf4fcb699c10b2be2))
+
+
+
+# [0.228.0](https://github.com/n8n-io/n8n/compare/n8n@0.227.0...n8n@0.228.0) (2023-05-11)
+
+
+### Bug Fixes
+
+* **AWS Rekognition Node:** Fix all different action type ([#6136](https://github.com/n8n-io/n8n/issues/6136)) ([22b82a4](https://github.com/n8n-io/n8n/commit/22b82a43a24bb8415eb8f4a941b05647ef8904c2))
+* **core:** Ensure DB repositories are initialized before the DB migrations are run  ([#6220](https://github.com/n8n-io/n8n/issues/6220)) ([500c0eb](https://github.com/n8n-io/n8n/commit/500c0ebce34dc2d21a531176dee965a70abec5f8))
+* **core:** Move nodeExecute InternalHook calls to hookFunctionsSave ([#6193](https://github.com/n8n-io/n8n/issues/6193)) ([f00b2ae](https://github.com/n8n-io/n8n/commit/f00b2ae3eaa225e483abc8defdc58d27b7d2c5e8))
+* Correctly save executions that failed when polling as error instead of new ([#6192](https://github.com/n8n-io/n8n/issues/6192)) ([06948b5](https://github.com/n8n-io/n8n/commit/06948b5ba5775b4f03d1ce46d57a461014317d51))
+* **editor:** Add loading skeletons to Executions list page ([#6184](https://github.com/n8n-io/n8n/issues/6184)) ([eae3a55](https://github.com/n8n-io/n8n/commit/eae3a55cc6b87bc8998d18d3d32d0d03013996b1))
+* **editor:** Display SSO entry in Settings on Cloud ([#6181](https://github.com/n8n-io/n8n/issues/6181)) ([b0a1899](https://github.com/n8n-io/n8n/commit/b0a1899e7141e5726d4fcbca6bba47e8e4b5cef7))
+* **editor:** Fix polling trigger check for `runData` ([#6130](https://github.com/n8n-io/n8n/issues/6130)) ([80831cd](https://github.com/n8n-io/n8n/commit/80831cd7c60f77557c37317600690a289d966448))
+* **editor:** Fix viewing and downloading of binary data ([#6218](https://github.com/n8n-io/n8n/issues/6218)) ([b9779c3](https://github.com/n8n-io/n8n/commit/b9779c32936c8b5e2385226ecab1025ff88d7044))
+* **editor:** Flag issues only on workflow activation ([#6127](https://github.com/n8n-io/n8n/issues/6127)) ([1b49c17](https://github.com/n8n-io/n8n/commit/1b49c17f38e97547430c407e21284b0c508469fa))
+* **editor:** Remove duplicate mapping of `item.json` key in data pinning ([#6135](https://github.com/n8n-io/n8n/issues/6135)) ([91fee0c](https://github.com/n8n-io/n8n/commit/91fee0ca667f233c0bde0dc6089bbed7d7db5b5f))
+* **editor:** Show the correct actions count in the nodes list ([#6183](https://github.com/n8n-io/n8n/issues/6183)) ([751e132](https://github.com/n8n-io/n8n/commit/751e132968470144cfca1c1b7ca22caf2c4c1de4))
+* **editor:** Update and add design system checkbox component to Editor ([#6178](https://github.com/n8n-io/n8n/issues/6178)) ([13c143e](https://github.com/n8n-io/n8n/commit/13c143eb6df41457fbd361674f2063b983a0e077))
+* **editor:** Update and fix storybook (was failing to run in local dev mode) ([#6180](https://github.com/n8n-io/n8n/issues/6180)) ([1e6a75f](https://github.com/n8n-io/n8n/commit/1e6a75f3416cdfcce1299dc9d242e23d0ea97ad3))
+* **FTP Node:** Use filename instead of remote filepath for downloaded binary data ([#6170](https://github.com/n8n-io/n8n/issues/6170)) ([be08933](https://github.com/n8n-io/n8n/commit/be089331b372e029ab5516b91e63a2d5d9033719))
+* **Google Sheets Node:** Upgrade xlsx to address CVE-2023-30533 ([#6172](https://github.com/n8n-io/n8n/issues/6172)) ([45dc985](https://github.com/n8n-io/n8n/commit/45dc985af742b049dc5673cf972da704d1f1f220))
+* **HTTP Request Node:** Correctly doesn't redirect on non GET method ([#6132](https://github.com/n8n-io/n8n/issues/6132)) ([3f5c606](https://github.com/n8n-io/n8n/commit/3f5c6062542f3b2b8a02cf0820e03da3f01d8bf2))
+* **MySQL Node:** Node should return date types as strings ([#6169](https://github.com/n8n-io/n8n/issues/6169)) ([5d77ec7](https://github.com/n8n-io/n8n/commit/5d77ec76e3c47fe9f9d7f31fe6c03827685ec576))
+* **Postgres Node:** Always return TIMESTAMP and TIMESTAMPZ as ISO string ([#6145](https://github.com/n8n-io/n8n/issues/6145)) ([0eb4d9f](https://github.com/n8n-io/n8n/commit/0eb4d9fc16aad1d1a350ba074c4b86712fbd90a1))
+* Prevent overflow when rendering expression hints ([#6214](https://github.com/n8n-io/n8n/issues/6214)) ([c717771](https://github.com/n8n-io/n8n/commit/c7177719e5f60813f4d15f7f97f1b4f253e29b07))
+* Prevent unnecessary error messages also for data loaded flag ([#6201](https://github.com/n8n-io/n8n/issues/6201)) ([d5e62ff](https://github.com/n8n-io/n8n/commit/d5e62ff096ddefd52dae742166fe92ceef17ded6))
+
+
+### Features
+
+* **Airtable Node:** Access token support ([#6160](https://github.com/n8n-io/n8n/issues/6160)) ([f9fd820](https://github.com/n8n-io/n8n/commit/f9fd82040ac09914a03e5b9f8f84fce5f6a99835))
+* **Code Node:** Add Python support ([#4295](https://github.com/n8n-io/n8n/issues/4295)) ([35c8510](https://github.com/n8n-io/n8n/commit/35c8510ab6d607fe59056a4aa1d8d148e194d12c))
+* **core:** Improve health check ([#6205](https://github.com/n8n-io/n8n/issues/6205)) ([9e7b9fb](https://github.com/n8n-io/n8n/commit/9e7b9fb443046c73135efb70d0d1894207125f66))
+* Create NPM node ([#6177](https://github.com/n8n-io/n8n/issues/6177)) ([f3bc6f1](https://github.com/n8n-io/n8n/commit/f3bc6f19b68f6bd4bd99614f60bd6833bd15813f))
+* **Date & Time Node:** Overhaul of the node ([#5904](https://github.com/n8n-io/n8n/issues/5904)) ([7d1d1f7](https://github.com/n8n-io/n8n/commit/7d1d1f7872163cecb468c317670da2d8b89a7651))
+* **HubSpot Node:** Overhaul the HubSpot Node ([#4337](https://github.com/n8n-io/n8n/issues/4337)) ([2913e67](https://github.com/n8n-io/n8n/commit/2913e676e639757cdf1a513ad35a7df0e494fa6f))
+* **JotForm Trigger Node:** Add support for hipaa-api.jotform.com ([#6171](https://github.com/n8n-io/n8n/issues/6171)) ([3074f42](https://github.com/n8n-io/n8n/commit/3074f42b3b98cf0dbdc13ad7b927d6b7fc726fab))
+* **Kafka Trigger Node:** Add non-parallel execution ([#6175](https://github.com/n8n-io/n8n/issues/6175)) ([814ea51](https://github.com/n8n-io/n8n/commit/814ea5185ce82e0a7687b41161602b45f92bee93))
+
+
+
+# [0.227.0](https://github.com/n8n-io/n8n/compare/n8n@0.226.0...n8n@0.227.0) (2023-05-03)
+
+
+### Bug Fixes
+
+* **AWS S3 Node:** Fix File upload, and add node tests ([#6153](https://github.com/n8n-io/n8n/issues/6153)) ([deb4c04](https://github.com/n8n-io/n8n/commit/deb4c04f346f8e5985b5f6c3f3a3e929fde13e5b))
+* **Compression Node:** Fix issue with decompression failing with uppercase extensions ([#6098](https://github.com/n8n-io/n8n/issues/6098)) ([aa59329](https://github.com/n8n-io/n8n/commit/aa593298365eabd6eb1dda9fe3f06e7eae7c5ea9))
+* **core:** Account for nodes with renamable content ([#6109](https://github.com/n8n-io/n8n/issues/6109)) ([c99f158](https://github.com/n8n-io/n8n/commit/c99f158120b3c1ffca1718be337afc73d6ec9e65))
+* **core:** Assign Unknown Error only if message or description not present in error ([8aedc03](https://github.com/n8n-io/n8n/commit/8aedc03ddad3f83ffd2569be5b61710f27d2f672))
+* **core:** Avoid using `Object.keys` on Buffer and other non-plain objects ([#6131](https://github.com/n8n-io/n8n/issues/6131)) ([a3aba83](https://github.com/n8n-io/n8n/commit/a3aba835a15a8a32acc1e1ff0b972007df2b2b34))
+* **core:** Better error message in Webhook node when using the POST method ([a0dd17e](https://github.com/n8n-io/n8n/commit/a0dd17e1151e668b95dc57367a0b100d00913ea3))
+* **core:** Better errors for common status codes fix ([700cc39](https://github.com/n8n-io/n8n/commit/700cc39cbc7da3c70513ff586dc97319456308ae))
+* **core:** Fix `hasOwnProperty` on augmented objects ([#6124](https://github.com/n8n-io/n8n/issues/6124)) ([206b6b9](https://github.com/n8n-io/n8n/commit/206b6b90b860ceaab58b9bdd5ff20ffc741c13fa))
+* **core:** Fix bug running addUserActivatedColumn migration on MariaDB ([#6157](https://github.com/n8n-io/n8n/issues/6157)) ([570790e](https://github.com/n8n-io/n8n/commit/570790ed0c9521e09b6414bc1da2c596f17ff072))
+* **core:** Fix canceled execution status ([#6142](https://github.com/n8n-io/n8n/issues/6142)) ([839a56a](https://github.com/n8n-io/n8n/commit/839a56a682674baf44d5beececdbe677d18c0d89))
+* **core:** Improve saml endpoints and audit events ([#6107](https://github.com/n8n-io/n8n/issues/6107)) ([c0b1cdd](https://github.com/n8n-io/n8n/commit/c0b1cddc91fe199377c301f02f230827f231ba73))
+* **core:** Remove SAML config metadataUrl if XML metadata is set directly ([#6143](https://github.com/n8n-io/n8n/issues/6143)) ([25fe14b](https://github.com/n8n-io/n8n/commit/25fe14be56482477c00a360914730b25c9028443))
+* **core:** Skip auth for controllers/routes that don't use the `Authorized` decorator, or use `Authorized('none')` ([#6106](https://github.com/n8n-io/n8n/issues/6106)) ([59aee22](https://github.com/n8n-io/n8n/commit/59aee2270bdc0c8360aa534237b7f6015d382346))
+* Correctly allow sharees to test credential when opening the modal ([#6111](https://github.com/n8n-io/n8n/issues/6111)) ([2e73f4a](https://github.com/n8n-io/n8n/commit/2e73f4abd04ba7ab929b0fce57bf12651a0a2e49))
+* **Date & Time Node:** Numbers conversions fix ([14f7114](https://github.com/n8n-io/n8n/commit/14f71146e21026721fc9d5883bb9d73d38afcf8c))
+* **editor:** Change execution list tab loader design ([#6120](https://github.com/n8n-io/n8n/issues/6120)) ([188ef04](https://github.com/n8n-io/n8n/commit/188ef042cd58b9194dadef4cc68deb3510688c26))
+* **editor:** Disable changing of email and pw when SAML login enabled ([#6104](https://github.com/n8n-io/n8n/issues/6104)) ([3e9ecd9](https://github.com/n8n-io/n8n/commit/3e9ecd939742df8d8ced9179aaa26b081139befa))
+* **editor:** Fix `Show details` summary ([#6113](https://github.com/n8n-io/n8n/issues/6113)) ([90a62cc](https://github.com/n8n-io/n8n/commit/90a62ccfb5b4a959d72336d284ad4ac3b17af582))
+* **editor:** Fix copy selection behavior ([#6112](https://github.com/n8n-io/n8n/issues/6112)) ([1607aeb](https://github.com/n8n-io/n8n/commit/1607aeb9f94700793d58604ea4f89c5555d43981))
+* **editor:** Fix cropped off completions docstrings ([#6129](https://github.com/n8n-io/n8n/issues/6129)) ([85e8145](https://github.com/n8n-io/n8n/commit/85e8145439f89e76fe5fe3a659430c03738d6e2b))
+* **editor:** Fix focus jumping when using chrome autofill ([#6140](https://github.com/n8n-io/n8n/issues/6140)) ([c63181b](https://github.com/n8n-io/n8n/commit/c63181b3171040c3dd3051c2a1358aea0af6bae0))
+* **editor:** Fix missing `Stop Listening` button ([#6125](https://github.com/n8n-io/n8n/issues/6125)) ([20a72bb](https://github.com/n8n-io/n8n/commit/20a72bb28b981e9c8d12dd6398d843b39d80daac))
+* **editor:** Fix quote handling on dollar-sign variable completions ([#6128](https://github.com/n8n-io/n8n/issues/6128)) ([51f5990](https://github.com/n8n-io/n8n/commit/51f59905591fa492017fc3ced46601eeca5fb057))
+* **editor:** Fix sidebar button styling ([#6138](https://github.com/n8n-io/n8n/issues/6138)) ([a72a511](https://github.com/n8n-io/n8n/commit/a72a5112f34a0d8ab248f687c74b758c8db6729c))
+* **editor:** Fix unique names for node duplication ([#6134](https://github.com/n8n-io/n8n/issues/6134)) ([71ae6c6](https://github.com/n8n-io/n8n/commit/71ae6c66ef32ba86edf0bb9cdb9f24a6d40ee80c))
+* **editor:** Fix unscrollable node settings ([#6133](https://github.com/n8n-io/n8n/issues/6133)) ([c8ff368](https://github.com/n8n-io/n8n/commit/c8ff368fc7be58e7c42746f7e7a4c5f6a4149d3e))
+* **editor:** Loading state for executions tab ([#6100](https://github.com/n8n-io/n8n/issues/6100)) ([4cbb05b](https://github.com/n8n-io/n8n/commit/4cbb05b0017ffd77eca51fc5b9c5c4868515a60d))
+* **editor:** Remove pagination from binary data output ([#6093](https://github.com/n8n-io/n8n/issues/6093)) ([c6e665a](https://github.com/n8n-io/n8n/commit/c6e665a975958c433d7991c057a3e4be644daff1))
+* **editor:** Restrict `[empty]` in parameter input hint to zero-length string ([#6003](https://github.com/n8n-io/n8n/issues/6003)) ([8862e1e](https://github.com/n8n-io/n8n/commit/8862e1e7df0be62ab3746b70e613ffd2ab26bc4a))
+* **editor:** Show error in RLC if credentials are not set ([#6108](https://github.com/n8n-io/n8n/issues/6108)) ([2c240a0](https://github.com/n8n-io/n8n/commit/2c240a0e4ecd9157dca612d98a8a7c68a65a9909))
+* **HTTP Request Node:** Add description for 'Specify Body' option ([#6114](https://github.com/n8n-io/n8n/issues/6114)) ([af097ae](https://github.com/n8n-io/n8n/commit/af097ae22c7e87918ada2527c6a2fe62cb8f318a))
+* **HTTP Request Node:** Always lowercase headers ([983e6e1](https://github.com/n8n-io/n8n/commit/983e6e124eb9557eec55c5f2e2b834a926243955))
+* **Mattermost Node:** Fix base url trailing slash error ([#6097](https://github.com/n8n-io/n8n/issues/6097)) ([25a386d](https://github.com/n8n-io/n8n/commit/25a386dd70df516090e622d921a79456fc7d16e3))
+* **Merge Node:** Do not error if expected key is missing ([d219af7](https://github.com/n8n-io/n8n/commit/d219af75cf37c603c34b1ca5851cafd4a490889c))
+* Prevent displaying an endless timer in the execution list for finished executions ([#6137](https://github.com/n8n-io/n8n/issues/6137)) ([701105e](https://github.com/n8n-io/n8n/commit/701105edcf5284f276fe146d8267e1a5560ab186))
+* Prevent invocations of 'GET /rest/license' from returning an error when ephemeral licenses are used ([#6154](https://github.com/n8n-io/n8n/issues/6154)) ([a3d26ef](https://github.com/n8n-io/n8n/commit/a3d26eff79013642865fa59078732526850b96a6))
+* **Slack Node:** Restore ability to send text in addition of blocks or attachments ([8669f95](https://github.com/n8n-io/n8n/commit/8669f95736797da4f3efd33468cdeac5d28667b0))
+
+
+### Features
+
+* **core:** Add notice to alert users a new version is available ([cb497fb](https://github.com/n8n-io/n8n/commit/cb497fbbecdba670d5121fa2c6eaf7c66d8a8a38))
+* **editor:** Add support for `loadOptionsDependsOn` to RLC ([#6101](https://github.com/n8n-io/n8n/issues/6101)) ([b17d5f9](https://github.com/n8n-io/n8n/commit/b17d5f9aa086bf408e8450244460ada57de0d7c3))
+* **editor:** Add version controls settings (WIP) ([#6036](https://github.com/n8n-io/n8n/issues/6036)) ([0c9ce3a](https://github.com/n8n-io/n8n/commit/0c9ce3a2ec9487b4eb9130651927e91dcd0f85af))
+* **Item Lists Node:** Split out items work on objects as well as arrays ([c65ac03](https://github.com/n8n-io/n8n/commit/c65ac0336821868c289adc55abab40017b1856da))
+* **Microsoft Excel 365 Node:** Overhaul ([5364a2d](https://github.com/n8n-io/n8n/commit/5364a2dff32e05147b8e9dd392038eb36791e5dc))
+
+
+
+## [0.226.2](https://github.com/n8n-io/n8n/compare/n8n@0.226.1...n8n@0.226.2) (2023-05-03)
+
+
+### Bug Fixes
+
+* **core:** Fix bug running addUserActivatedColumn migration on MariaDB ([#6157](https://github.com/n8n-io/n8n/issues/6157)) ([aa8e96d](https://github.com/n8n-io/n8n/commit/aa8e96dd6b19f105a957da71a5c4d7ab5caecc01))
+
+
+
+## [0.226.1](https://github.com/n8n-io/n8n/compare/n8n@0.226.0...n8n@0.226.1) (2023-05-02)
+
+
+### Bug Fixes
+
+* **Compression Node:** Fix issue with decompression failing with uppercase extensions ([#6098](https://github.com/n8n-io/n8n/issues/6098)) ([7136500](https://github.com/n8n-io/n8n/commit/71365002daa71c5fa5e68a5bb373ee200a05b7b9))
+* **core:** Account for nodes with renamable content ([#6109](https://github.com/n8n-io/n8n/issues/6109)) ([b561d46](https://github.com/n8n-io/n8n/commit/b561d463265831f3cd370ec99982847f2bddca41))
+* **core:** Fix `hasOwnProperty` on augmented objects ([#6124](https://github.com/n8n-io/n8n/issues/6124)) ([2f015c0](https://github.com/n8n-io/n8n/commit/2f015c0f153785384b009e71bf4994e18b5d06b8))
+* **core:** Fix canceled execution status ([#6142](https://github.com/n8n-io/n8n/issues/6142)) ([1796101](https://github.com/n8n-io/n8n/commit/1796101fed03d04906f2341a0488b60b7b5bf71c))
+* **core:** Skip auth for controllers/routes that don't use the `Authorized` decorator, or use `Authorized('none')` ([#6106](https://github.com/n8n-io/n8n/issues/6106)) ([9d44991](https://github.com/n8n-io/n8n/commit/9d44991b2a8c9384e2bf32204ac47a4ecb0131be))
+* Correctly allow sharees to test credential when opening the modal ([#6111](https://github.com/n8n-io/n8n/issues/6111)) ([240bb47](https://github.com/n8n-io/n8n/commit/240bb47e8e2cd99c56b8837079073bbf2bf5f687))
+* **Date & Time Node:** Numbers conversions fix ([e11e7cd](https://github.com/n8n-io/n8n/commit/e11e7cd603a145c83c36f6a6deb821a56ccabd6f))
+* **editor:** Change execution list tab loader design ([#6120](https://github.com/n8n-io/n8n/issues/6120)) ([ffc033f](https://github.com/n8n-io/n8n/commit/ffc033ff8ff391be09da8dbd62f8eb06a94f6cb0))
+* **editor:** Fix `Show details` summary ([#6113](https://github.com/n8n-io/n8n/issues/6113)) ([e12bafb](https://github.com/n8n-io/n8n/commit/e12bafb9473393dd9e139d0e0a4a21241b417645))
+* **editor:** Fix copy selection behavior ([#6112](https://github.com/n8n-io/n8n/issues/6112)) ([0efd94a](https://github.com/n8n-io/n8n/commit/0efd94a875fe9e3cac5da3421effcf6c8f6eaae8))
+* **editor:** Fix cropped off completions docstrings ([#6129](https://github.com/n8n-io/n8n/issues/6129)) ([06594cc](https://github.com/n8n-io/n8n/commit/06594cc36f1a0d4069e556d6dbb4e268a78301c6))
+* **editor:** Fix missing `Stop Listening` button ([#6125](https://github.com/n8n-io/n8n/issues/6125)) ([dcbd2d2](https://github.com/n8n-io/n8n/commit/dcbd2d2bc1c59ca8bbe6a802a2a8f482b3d20d74))
+* **editor:** Fix quote handling on dollar-sign variable completions ([#6128](https://github.com/n8n-io/n8n/issues/6128)) ([c23ad35](https://github.com/n8n-io/n8n/commit/c23ad3502d0a8c4bcbd60cce2fc13a91981fb119))
+* **editor:** Fix sidebar button styling ([#6138](https://github.com/n8n-io/n8n/issues/6138)) ([d3f4bc1](https://github.com/n8n-io/n8n/commit/d3f4bc1859104f11d2cf38ef3f3405d62c88bc6d))
+* **editor:** Fix unique names for node duplication ([#6134](https://github.com/n8n-io/n8n/issues/6134)) ([48a4068](https://github.com/n8n-io/n8n/commit/48a4068d7ec1ddf5d5a4d10620dce1c89cb8fa34))
+* **editor:** Fix unscrollable node settings ([#6133](https://github.com/n8n-io/n8n/issues/6133)) ([f762f16](https://github.com/n8n-io/n8n/commit/f762f16afb7b9ea54e29950c06133a292dc87b3f))
+* **editor:** Loading state for executions tab ([#6100](https://github.com/n8n-io/n8n/issues/6100)) ([2e12c50](https://github.com/n8n-io/n8n/commit/2e12c50477014c57fa665ba36f48ff658cf7ee94))
+* **editor:** Remove pagination from binary data output ([#6093](https://github.com/n8n-io/n8n/issues/6093)) ([7b7d9de](https://github.com/n8n-io/n8n/commit/7b7d9de7586905b2740541e7f0289bc78f8f2ad7))
+* **editor:** Show error in RLC if credentials are not set ([#6108](https://github.com/n8n-io/n8n/issues/6108)) ([5bf3400](https://github.com/n8n-io/n8n/commit/5bf3400ca7ffa04bb51214bc539435b847614cbb))
+* **HTTP Request Node:** Add description for 'Specify Body' option ([#6114](https://github.com/n8n-io/n8n/issues/6114)) ([69b6ba8](https://github.com/n8n-io/n8n/commit/69b6ba85202c5a28052a56c041b880bfa9fcf0a0))
+* **HTTP Request Node:** Always lowercase headers ([31c56a1](https://github.com/n8n-io/n8n/commit/31c56a12f273d5569ed3ac4d72cf74c90cc24b31))
+* **Mattermost Node:** Fix base url trailing slash error ([#6097](https://github.com/n8n-io/n8n/issues/6097)) ([788fda1](https://github.com/n8n-io/n8n/commit/788fda1b7dbf29d7a7e614a959ac3630b2a6559f))
+* **Merge Node:** Do not error if expected key is missing ([8b59564](https://github.com/n8n-io/n8n/commit/8b59564776ebaf2c54b9e2dae5b77109895da883))
+* Prevent displaying an endless timer in the execution list for finished executions ([#6137](https://github.com/n8n-io/n8n/issues/6137)) ([2672896](https://github.com/n8n-io/n8n/commit/2672896c8e2de7d1f92899a392a3f2b3f60aaef3))
+* **Slack Node:** Restore ability to send text in addition of blocks or attachments ([625d672](https://github.com/n8n-io/n8n/commit/625d6729b4158fbc811941ce45819f32372e6265))
+
+
+
+# [0.226.0](https://github.com/n8n-io/n8n/compare/n8n@0.225.0...n8n@0.226.0) (2023-04-26)
+
+
+### Bug Fixes
+
+* **Code Node:** Update vm2 to address CVE-2023-30547 ([#6039](https://github.com/n8n-io/n8n/issues/6039)) ([8268f23](https://github.com/n8n-io/n8n/commit/8268f235abf5277480c215ea953fc3db1c275c95))
+* **core:** Improve domain and url matching for extractDomain and extractUrl ([#6010](https://github.com/n8n-io/n8n/issues/6010)) ([33fb732](https://github.com/n8n-io/n8n/commit/33fb73217dca68244c93296f1a4be96cc83e4480))
+* **core:** Serialize dates and regexps when reading from augmented objects ([#6086](https://github.com/n8n-io/n8n/issues/6086)) ([a4eb46a](https://github.com/n8n-io/n8n/commit/a4eb46acc178533e3c63fedcf0d884a5b66bae28))
+* **core:** Skip license activation when instance was already activated ([#6064](https://github.com/n8n-io/n8n/issues/6064)) ([eaf7090](https://github.com/n8n-io/n8n/commit/eaf70909197ed511efe9add956eb5e4f78b27e20))
+* **editor:** Clean up demo and template callouts from workflows page ([#6023](https://github.com/n8n-io/n8n/issues/6023)) ([4ee5083](https://github.com/n8n-io/n8n/commit/4ee508385ab5ac379925b315006a2d9389183751))
+* **editor:** Fix memory leak in Node Detail View by correctly unsubscribing from event buses ([#6021](https://github.com/n8n-io/n8n/issues/6021)) ([0970ec0](https://github.com/n8n-io/n8n/commit/0970ec066d8f80082f49f0b0f8987b95392102bf))
+* **editor:** Fix typo in SSO upgrade link ([#6031](https://github.com/n8n-io/n8n/issues/6031)) ([9b59f1d](https://github.com/n8n-io/n8n/commit/9b59f1df9c358d3677b4cbc3e80a73af03b7981d))
+* **editor:** Resolve expressions for grandparent nodes ([#5859](https://github.com/n8n-io/n8n/issues/5859)) ([a19d444](https://github.com/n8n-io/n8n/commit/a19d4447ac38e40d1fd1da83beb6c20fb7b2d0ed))
+* **editor:** SettingsSidebar should disconnect from push when navigating away ([#6025](https://github.com/n8n-io/n8n/issues/6025)) ([41660d9](https://github.com/n8n-io/n8n/commit/41660d9e281432b87d875c98992bfaf54d25b37f))
+* **editor:** Update LDAP and Log streaming paywalls ([#6069](https://github.com/n8n-io/n8n/issues/6069)) ([8a3b3e5](https://github.com/n8n-io/n8n/commit/8a3b3e53e1ac0a2a1864b42b24ab46f25253a9d3))
+* **editor:** Update SSO upgrade link ([#6016](https://github.com/n8n-io/n8n/issues/6016)) ([953198e](https://github.com/n8n-io/n8n/commit/953198e092a44029805ff85e4607355444ea8b2c))
+* **Notion Node:** Update credential test to not require user permissions ([#6022](https://github.com/n8n-io/n8n/issues/6022)) ([a68330f](https://github.com/n8n-io/n8n/commit/a68330ff66744551270f40399a6fd7fe330e6f27))
+
+
+### Features
+
+* **core:** Add license:info command ([#6047](https://github.com/n8n-io/n8n/issues/6047)) ([ab12d3e](https://github.com/n8n-io/n8n/commit/ab12d3e3278745b290de82c16f358841b20850b4))
+* **core:** Add SSH key generation ([#6006](https://github.com/n8n-io/n8n/issues/6006)) ([71ed1f4](https://github.com/n8n-io/n8n/commit/71ed1f410c5a80f35ecaf913a5522b7788998695))
+* **core:** Add support for digestAuth to httpRequest and declarative style ([#5676](https://github.com/n8n-io/n8n/issues/5676)) ([62f993c](https://github.com/n8n-io/n8n/commit/62f993c84f6ecf2f4d0431d505ba18a0253bd244))
+* **core:** Manage version control settings ([#6079](https://github.com/n8n-io/n8n/issues/6079)) ([f3b4701](https://github.com/n8n-io/n8n/commit/f3b470186360dc3c3a3df599f0a9740183e86696))
+* **core:** Upgrade google-timezones-json to use the correct timezone for Sao Paulo ([#6042](https://github.com/n8n-io/n8n/issues/6042)) ([b8cb5d7](https://github.com/n8n-io/n8n/commit/b8cb5d7f0b11fb138d5c4714bcc9e1d9b6366d76)), closes [#2647](https://github.com/n8n-io/n8n/issues/2647)
+* **editor:** Add disable template experiment ([#5963](https://github.com/n8n-io/n8n/issues/5963)) ([a74284b](https://github.com/n8n-io/n8n/commit/a74284bac387338e870dc81ac33748af55521274))
+* **editor:** Add SQL editor support ([#5517](https://github.com/n8n-io/n8n/issues/5517)) ([70aaf24](https://github.com/n8n-io/n8n/commit/70aaf2478461d9ceea98bc91dc935493fd6dbe24))
+* **editor:** Enhance Node Creator actions view ([#5954](https://github.com/n8n-io/n8n/issues/5954)) ([390841b](https://github.com/n8n-io/n8n/commit/390841bbf0fdd4d536101593711a6658ea2784e4))
+* **editor:** Version control (WIP) ([#6013](https://github.com/n8n-io/n8n/issues/6013)) ([0e0a064](https://github.com/n8n-io/n8n/commit/0e0a064fa7ae54a8a6b695bd4bb19da71334fea0))
+* **editor:** Version control paywall (WIP) ([#6030](https://github.com/n8n-io/n8n/issues/6030)) ([ef79b03](https://github.com/n8n-io/n8n/commit/ef79b03f38460a20658c62fd35dbcaf6d266582f))
+* **Google BigQuery Node:** Node improvements ([#4877](https://github.com/n8n-io/n8n/issues/4877)) ([9817a15](https://github.com/n8n-io/n8n/commit/9817a15da4c80425fb77273ed7c9acbe020f0f48))
+
+
+
+## [0.225.2](https://github.com/n8n-io/n8n/compare/n8n@0.225.1...n8n@0.225.2) (2023-04-25)
+
+
+### Bug Fixes
+
+* **core:** Upgrade google-timezones-json to use the correct timezone for Sao Paulo ([#6042](https://github.com/n8n-io/n8n/issues/6042)) ([f93fd5a](https://github.com/n8n-io/n8n/commit/f93fd5aba2583e1c62efe8dcb423559413cf9c6a)), closes [#2647](https://github.com/n8n-io/n8n/issues/2647)
+* **Code Node:** Update vm2 to address CVE-2023-30547 ([#6039](https://github.com/n8n-io/n8n/issues/6039)) ([f1ca4e2](https://github.com/n8n-io/n8n/commit/f1ca4e232865a0ee6ac178b11515de115b0bfd09))
+
+
+
+# [0.224.4](https://github.com/n8n-io/n8n/compare/n8n@0.224.2...n8n@0.224.4) (2023-04-24)
+
+
+### Bug Fixes
+
+* **core:** Upgrade google-timezones-json to use the correct timezone for Sao Paulo ([#6042](https://github.com/n8n-io/n8n/issues/6042)) ([c23a592](https://github.com/n8n-io/n8n/commit/c23a5923f8df787758f756c529518c9e8b93b96e)), closes [#2647](https://github.com/n8n-io/n8n/issues/2647)
+* **Code Node:** Update vm2 to address CVE-2023-30547 ([#6039](https://github.com/n8n-io/n8n/issues/6039)) ([6cd15bd](https://github.com/n8n-io/n8n/commit/6cd15bd889b6eec3b050cfe3c3b190707a09e898))
+
+
+
 ## [0.225.1](https://github.com/n8n-io/n8n/compare/n8n@0.225.0...n8n@0.225.1) (2023-04-20)
 
 
diff --git a/CHECKLIST.yml b/CHECKLIST.yml
deleted file mode 100644
index a1c3fa8407508..0000000000000
--- a/CHECKLIST.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-paths:
-  'packages/**':
-    - If fixing bug, added test to cover scenario.
-    - If addressing forum or Github issue, added link to description.
-  'packages/**/*.ts':
-    - Added unit tests to cover new or updated functionality.
-  '**/*.vue':
-    - Used composition API for all new components.
-    - Added component or unit tests to cover functionality.
-
-  # cli
-  'packages/cli/src/databases/migrations/**':
-    - Requested review from at least two engineers on migration.
-    - Avoided irreversible data migrations.
-    - Avoided deleting or updating data keys.
-    - Wrote 'down' migration if possible.
-  'n8n/packages/cli/src/api/**':
-    - Added integration tests for new endpoints.
-
-  # editor ui
-  'packages/editor-ui/**/*.vue':
-    - Added E2E if adding new features.
-    - Used design system tokens (colors, spacings...) where possible.
-  'packages/editor-ui/src/mixins/restApi.ts':
-    - Avoided adding new methods. Only deleted from here.
-  'packages/editor-ui/src/mixins/**':
-    - Avoided adding new mixins (use composables instead). Only removed code from here.
-  'packages/editor-ui/src/views/NodeView.vue':
-    - Avoided adding code here. Only refactored to make it smaller.
-  'packages/editor-ui/src/hooks/**':
-    - Avoided adding new hooks. Only refactored to move hooks to relevant store instead.
-
-  # nodes-base
-  'packages/nodes-base/nodes/**':
-    - Added workflow tests for nodes if possible.
-  'packages/nodes-base/package.json':
-    - Avoided adding dependencies for nodes if not absolutely necessary.
-
-  # design-system
-  'packages/design-system/**/*.vue':
-    - Used design system tokens (colors, spacings...) where possible.
-    - Updated Storybook with new component or updated functionality.
-
-  # e2e
-  'cypress/e2e/**':
-    - Avoided chaining commands more than two or three times (to avoid flakiness because only last one will be retried).
-    - Spoofed endpoints that are not critical for the test (to avoid flakiness).
-    - Picked most efficient path to start the test (for example skipped account setup and starting at /workflow/new for a canvas test).
-    - Avoided adding waits on time (use request intercepts instead).
-    - Ensured each spec does not depend on any another spec to pass.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 6960d5ce28f6f..7480e601315cd 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -5,24 +5,27 @@ Great that you are here and you want to contribute to n8n
 ## Contents
 
 - [Contributing to n8n](#contributing-to-n8n)
-  - [Contents](#contents)
-  - [Code of conduct](#code-of-conduct)
-  - [Directory structure](#directory-structure)
-  - [Development setup](#development-setup)
-    - [Requirements](#requirements)
-      - [Node.js](#nodejs)
-      - [pnpm](#pnpm)
-        - [pnpm workspaces](#pnpm-workspaces)
-      - [corepack](#corepack)
-      - [Build tools](#build-tools)
-    - [Actual n8n setup](#actual-n8n-setup)
-    - [Start](#start)
-  - [Development cycle](#development-cycle)
-    - [Test suite](#test-suite)
-  - [Releasing](#releasing)
-  - [Create custom nodes](#create-custom-nodes)
-  - [Extend documentation](#extend-documentation)
-  - [Contributor License Agreement](#contributor-license-agreement)
+	- [Contents](#contents)
+	- [Code of conduct](#code-of-conduct)
+	- [Directory structure](#directory-structure)
+	- [Development setup](#development-setup)
+		- [Requirements](#requirements)
+			- [Node.js](#nodejs)
+			- [pnpm](#pnpm)
+				- [pnpm workspaces](#pnpm-workspaces)
+			- [corepack](#corepack)
+			- [Build tools](#build-tools)
+		- [Actual n8n setup](#actual-n8n-setup)
+		- [Start](#start)
+	- [Development cycle](#development-cycle)
+		- [Test suite](#test-suite)
+			- [Unit tests](#unit-tests)
+			- [E2E tests](#e2e-tests)
+	- [Releasing](#releasing)
+	- [Create custom nodes](#create-custom-nodes)
+	- [Extend documentation](#extend-documentation)
+	- [Contribute workflow templates](#contribute-workflow-templates)
+	- [Contributor License Agreement](#contributor-license-agreement)
 
 ## Code of conduct
 
@@ -54,8 +57,8 @@ The most important directories:
 
 ## Development setup
 
-If you want to change or extend n8n you have to make sure that all needed
-dependencies are installed and the packages get linked correctly. Here a short guide on how that can be done:
+If you want to change or extend n8n you have to make sure that all the needed
+dependencies are installed and the packages get linked correctly. Here's a short guide on how that can be done:
 
 ### Requirements
 
@@ -65,11 +68,11 @@ dependencies are installed and the packages get linked correctly. Here a short g
 
 #### pnpm
 
-[pnpm](https://pnpm.io/) version 7.18 or newer is required for development purposes. We recommend installing it with [corepack](#corepack).
+[pnpm](https://pnpm.io/) version 8.9 or newer is required for development purposes. We recommend installing it with [corepack](#corepack).
 
 ##### pnpm workspaces
 
-n8n is split up in different modules which are all in a single mono repository.
+n8n is split up into different modules which are all in a single mono repository.
 To facilitate the module management, [pnpm workspaces](https://pnpm.io/workspaces) are used.
 This automatically sets up file-links between modules which depend on each other.
 
@@ -113,24 +116,24 @@ No additional packages required.
 
 > **IMPORTANT**: All the steps below have to get executed at least once to get the development setup up and running!
 
-Now that everything n8n requires to run is installed the actual n8n code can be
+Now that everything n8n requires to run is installed, the actual n8n code can be
 checked out and set up:
 
-1. [Fork](https://guides.github.com/activities/forking/#fork) the n8n repository
+1. [Fork](https://guides.github.com/activities/forking/#fork) the n8n repository.
 
-2. Clone your forked repository
+2. Clone your forked repository:
 
    ```
    git clone https://github.com/<your_github_username>/n8n.git
    ```
 
-3. Go into repository folder
+3. Go into repository folder:
 
    ```
    cd n8n
    ```
 
-4. Add the original n8n repository as `upstream` to your forked repository
+4. Add the original n8n repository as `upstream` to your forked repository:
 
    ```
    git remote add upstream https://github.com/n8n-io/n8n.git
@@ -172,13 +175,13 @@ automatically build your code, restart the backend and refresh the frontend
    pnpm dev
    ```
 1. Hack, hack, hack
-1. Check if everything still runs in production mode
+1. Check if everything still runs in production mode:
    ```
    pnpm build
    pnpm start
    ```
 1. Create tests
-1. Run all [tests](#test-suite)
+1. Run all [tests](#test-suite):
    ```
    pnpm test
    ```
@@ -186,7 +189,9 @@ automatically build your code, restart the backend and refresh the frontend
 
 ### Test suite
 
-The tests can be started via:
+#### Unit tests
+
+Unit tests can be started via:
 
 ```
 pnpm test
@@ -196,9 +201,21 @@ If that gets executed in one of the package folders it will only run the tests
 of this package. If it gets executed in the n8n-root folder it will run all
 tests of all packages.
 
+#### E2E tests
+
+⚠️ You have to run `pnpm cypress:install` to install cypress before running the tests for the first time and to update cypress.
+
+E2E tests can be started via one of the following commands:
+
+- `pnpm test:e2e:ui`: Start n8n and run e2e tests interactively using built UI code. Does not react to code changes (i.e. runs `pnpm start` and `cypress open`)
+- `pnpm test:e2e:dev`: Start n8n in development mode and run e2e tests interactively. Reacts to code changes (i.e. runs `pnpm dev` and `cypress open`)
+- `pnpm test:e2e:all`: Start n8n and run e2e tests headless (i.e. runs `pnpm start` and `cypress run --headless`)
+
+⚠️ Remember to stop your dev server before. Otherwise port binding will fail.
+
 ## Releasing
 
-To start a release, trigger [this workflow](https://github.com/n8n-io/n8n/actions/workflows/release-create-pr.yml) with the SemVer release type, and select a branch to cut this release from. This workflow will then
+To start a release, trigger [this workflow](https://github.com/n8n-io/n8n/actions/workflows/release-create-pr.yml) with the SemVer release type, and select a branch to cut this release from. This workflow will then:
 
 1. Bump versions of packages that have changed or have dependencies that have changed
 2. Update the Changelog
@@ -206,7 +223,7 @@ To start a release, trigger [this workflow](https://github.com/n8n-io/n8n/action
 4. Create a new pull-request to track any further changes that need to be included in this release
 
 Once ready to release, simply merge the pull-request.
-This triggers [another workflow](https://github.com/n8n-io/n8n/actions/workflows/release-publish.yml), that will
+This triggers [another workflow](https://github.com/n8n-io/n8n/actions/workflows/release-publish.yml), that will:
 
 1. Build and publish the packages that have a new version in this release
 2. Create a new tag, and GitHub release from squashed release commit
@@ -220,10 +237,18 @@ Learn about [building nodes](https://docs.n8n.io/integrations/creating-nodes/) t
 
 The repository for the n8n documentation on [docs.n8n.io](https://docs.n8n.io) can be found [here](https://github.com/n8n-io/n8n-docs).
 
+## Contribute workflow templates
+
+You can submit your workflows to n8n's template library.
+
+n8n is working on a creator program, and developing a marketplace of templates. This is an ongoing project, and details are likely to change.
+
+Refer to [n8n Creator hub](https://www.notion.so/n8n/n8n-Creator-hub-7bd2cbe0fce0449198ecb23ff4a2f76f) for information on how to submit templates and become a creator.
+
 ## Contributor License Agreement
 
 That we do not have any potential problems later it is sadly necessary to sign a [Contributor License Agreement](CONTRIBUTOR_LICENSE_AGREEMENT.md). That can be done literally with the push of a button.
 
 We used the most simple one that exists. It is from [Indie Open Source](https://indieopensource.com/forms/cla) which uses plain English and is literally only a few lines long.
 
-A bot will automatically comment on the pull request once it got opened asking for the agreement to be signed. Before it did not get signed it is sadly not possible to merge it in.
+Once a pull request is opened, an automated bot will promptly leave a comment requesting the agreement to be signed. The pull request can only be merged once the signature is obtained.
diff --git a/LICENSE.md b/LICENSE.md
index c1d74239754fd..aab68b6d9301b 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -3,8 +3,9 @@
 Portions of this software are licensed as follows:
 
 - Content of branches other than the main branch (i.e. "master") are not licensed.
-- All source code files that contain ".ee." in their filename are licensed under the
-  "n8n Enterprise License" defined in "LICENSE_EE.md".
+- Source code files that contain ".ee." in their filename are NOT licensed under the Sustainable Use License.
+  To use source code files that contain ".ee." in their filename you must hold a valid n8n Enterprise License
+  specifically allowing you access to such source code files and as defined in "LICENSE_EE.md".
 - All third party components incorporated into the n8n Software are licensed under the original license
   provided by the owner of the applicable component.
 - Content outside of the above mentioned files or restrictions is available under the "Sustainable Use
diff --git a/README.md b/README.md
index 25a8199b69cf2..f37cffd70f775 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ ESA_POSTMAN_ID_COLLISION_RETRY_COUNT=
 
 # n8n - Workflow automation tool
 
-n8n is an extendable workflow automation tool. With a [fair-code](http://faircode.io) distribution model, n8n
+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.
@@ -24,7 +24,7 @@ anything to everything.
 
 ## Demo
 
-[:tv: A short video (< 4 min)](https://www.youtube.com/watch?v=RpjQTGKm-ok) that goes over key concepts of
+[:tv: A short video (< 5 min)](https://www.youtube.com/watch?v=1MwSoB0gnM4) that goes over key concepts of
 creating workflows in n8n.
 
 ## Available integrations
@@ -49,6 +49,7 @@ changes [here](https://github.com/n8n-io/n8n/blob/master/packages/cli/BREAKING-C
   [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:
 
@@ -66,6 +67,15 @@ While n8n cloud and n8n are the same in terms of features, n8n cloud provides ce
 - Managed OAuth for authentication
 - Easily upgrading to the newer n8n versions
 
+## Build with LangChain and AI in n8n (beta)
+
+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.
+
+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)
+
 ## Support
 
 If you have problems or questions go to our forum, we will then try to help you asap:
@@ -97,7 +107,7 @@ development environment ready in minutes.
 
 ## License
 
-n8n is [fair-code](http://faircode.io) distributed under the
+n8n is [fair-code](https://faircode.io) distributed under the
 [**Sustainable Use License**](https://github.com/n8n-io/n8n/blob/master/packages/cli/LICENSE.md) and the
 [**n8n Enterprise License**](https://github.com/n8n-io/n8n/blob/master/packages/cli/LICENSE_EE.md).
 
diff --git a/cypress.config.js b/cypress.config.js
index d1451fcd06fc2..f01672c6f9b8b 100644
--- a/cypress.config.js
+++ b/cypress.config.js
@@ -1,17 +1,16 @@
-const fetch = require('node-fetch');
 const { defineConfig } = require('cypress');
 
 const BASE_URL = 'http://localhost:5678';
 
 module.exports = defineConfig({
-	projectId: "5hbsdn",
+	projectId: '5hbsdn',
 	retries: {
 		openMode: 0,
 		runMode: 2,
 	},
 	defaultCommandTimeout: 10000,
 	requestTimeout: 12000,
-	numTestsKeptInMemory: 0,
+	numTestsKeptInMemory: 2,
 	experimentalMemoryManagement: true,
 	e2e: {
 		baseUrl: BASE_URL,
@@ -19,26 +18,10 @@ module.exports = defineConfig({
 		screenshotOnRunFailure: true,
 		experimentalInteractiveRunEvents: true,
 		experimentalSessionAndOrigin: true,
-
-		setupNodeEvents(on, config) {
-			on('task', {
-				reset: () => fetch(BASE_URL + '/e2e/db/reset', { method: 'POST' }),
-				'setup-owner': (payload) => {
-					try {
-						return fetch(BASE_URL + '/e2e/db/setup-owner', {
-							method: 'POST',
-							body: JSON.stringify(payload),
-							headers: { 'Content-Type': 'application/json' },
-						})
-					} catch (error) {
-						console.error("setup-owner failed with: ", error)
-						return null
-					}
-				},
-				'enable-feature': (feature) =>
-					fetch(BASE_URL + `/e2e/enable-feature/${feature}`, { method: 'POST' }),
-			});
-		},
+	},
+	env: {
+		MAX_PINNED_DATA_SIZE: process.env.VUE_APP_MAX_PINNED_DATA_SIZE
+			? parseInt(process.env.VUE_APP_MAX_PINNED_DATA_SIZE, 10)
+			: 16 * 1024,
 	},
 });
-
diff --git a/cypress/composables/becomeTemplateCreatorCta.ts b/cypress/composables/becomeTemplateCreatorCta.ts
new file mode 100644
index 0000000000000..55fc985c745bc
--- /dev/null
+++ b/cypress/composables/becomeTemplateCreatorCta.ts
@@ -0,0 +1,18 @@
+//#region Getters
+
+export const getBecomeTemplateCreatorCta = () => cy.getByTestId('become-template-creator-cta');
+
+export const getCloseBecomeTemplateCreatorCtaButton = () =>
+	cy.getByTestId('close-become-template-creator-cta');
+
+//#endregion
+
+//#region Actions
+
+export const interceptCtaRequestWithResponse = (becomeCreator: boolean) => {
+	return cy.intercept('GET', `/rest/cta/become-creator`, {
+		body: becomeCreator,
+	});
+};
+
+//#endregion
diff --git a/cypress/composables/featureFlags.ts b/cypress/composables/featureFlags.ts
new file mode 100644
index 0000000000000..ea8e95064e4d1
--- /dev/null
+++ b/cypress/composables/featureFlags.ts
@@ -0,0 +1,12 @@
+export const overrideFeatureFlag = (name: string, value: boolean | string) => {
+	cy.window().then((win) => {
+		// If feature flags hasn't been initialized yet, we store the override
+		// in local storage and it gets loaded when the feature flags are
+		// initialized.
+		win.localStorage.setItem('N8N_EXPERIMENT_OVERRIDES', JSON.stringify({ [name]: value }));
+
+		if (win.featureFlags) {
+			win.featureFlags.override(name, value);
+		}
+	});
+};
diff --git a/cypress/composables/modals/chat-modal.ts b/cypress/composables/modals/chat-modal.ts
new file mode 100644
index 0000000000000..31e139c93e6bc
--- /dev/null
+++ b/cypress/composables/modals/chat-modal.ts
@@ -0,0 +1,51 @@
+/**
+ * Getters
+ */
+
+export function getManualChatModal() {
+	return cy.getByTestId('lmChat-modal');
+}
+
+export function getManualChatInput() {
+	return cy.getByTestId('workflow-chat-input');
+}
+
+export function getManualChatSendButton() {
+	return getManualChatModal().getByTestId('workflow-chat-send-button');
+}
+
+export function getManualChatMessages() {
+	return getManualChatModal().get('.messages .message');
+}
+
+export function getManualChatModalCloseButton() {
+	return getManualChatModal().get('.el-dialog__close');
+}
+
+export function getManualChatModalLogs() {
+	return getManualChatModal().getByTestId('lm-chat-logs');
+}
+export function getManualChatDialog() {
+	return getManualChatModal().getByTestId('workflow-lm-chat-dialog');
+}
+
+export function getManualChatModalLogsTree() {
+	return getManualChatModalLogs().getByTestId('lm-chat-logs-tree');
+}
+
+export function getManualChatModalLogsEntries() {
+	return getManualChatModalLogs().getByTestId('lm-chat-logs-entry');
+}
+
+/**
+ * Actions
+ */
+
+export function sendManualChatMessage(message: string) {
+	getManualChatInput().type(message);
+	getManualChatSendButton().click();
+}
+
+export function closeManualChatModal() {
+	getManualChatModalCloseButton().click();
+}
diff --git a/cypress/composables/modals/credential-modal.ts b/cypress/composables/modals/credential-modal.ts
new file mode 100644
index 0000000000000..bfcbf89251059
--- /dev/null
+++ b/cypress/composables/modals/credential-modal.ts
@@ -0,0 +1,54 @@
+/**
+ * Getters
+ */
+
+export function getCredentialConnectionParameterInputs() {
+	return cy.getByTestId('credential-connection-parameter');
+}
+
+export function getCredentialConnectionParameterInputByName(name: string) {
+	return cy.getByTestId(`parameter-input-${name}`);
+}
+
+export function getEditCredentialModal() {
+	return cy.getByTestId('editCredential-modal', { timeout: 5000 });
+}
+
+export function getCredentialSaveButton() {
+	return cy.getByTestId('credential-save-button', { timeout: 5000 });
+}
+
+export function getCredentialDeleteButton() {
+	return cy.getByTestId('credential-delete-button');
+}
+
+export function getCredentialModalCloseButton() {
+	return getEditCredentialModal().find('.el-dialog__close').first();
+}
+
+/**
+ * Actions
+ */
+
+export function setCredentialConnectionParameterInputByName(name: string, value: string) {
+	getCredentialConnectionParameterInputByName(name).type(value);
+}
+
+export function saveCredential() {
+	getCredentialSaveButton().click({ force: true });
+}
+
+export function closeCredentialModal() {
+	getCredentialModalCloseButton().click();
+}
+
+export function setCredentialValues(values: Record<string, any>, save = true) {
+	Object.entries(values).forEach(([key, value]) => {
+		setCredentialConnectionParameterInputByName(key, value);
+	});
+
+	if (save) {
+		saveCredential();
+		closeCredentialModal();
+	}
+}
diff --git a/cypress/composables/modals/workflow-credential-setup-modal.ts b/cypress/composables/modals/workflow-credential-setup-modal.ts
new file mode 100644
index 0000000000000..88bbd133486e5
--- /dev/null
+++ b/cypress/composables/modals/workflow-credential-setup-modal.ts
@@ -0,0 +1,13 @@
+/**
+ * Getters
+ */
+
+export const getWorkflowCredentialsModal = () => cy.getByTestId('setup-workflow-credentials-modal');
+
+export const getContinueButton = () => cy.getByTestId('continue-button');
+
+/**
+ * Actions
+ */
+
+export const closeModalFromContinueButton = () => getContinueButton().click();
diff --git a/cypress/composables/ndv.ts b/cypress/composables/ndv.ts
new file mode 100644
index 0000000000000..e2fc03d7afe61
--- /dev/null
+++ b/cypress/composables/ndv.ts
@@ -0,0 +1,84 @@
+/**
+ * Getters
+ */
+
+import { getVisibleSelect } from "../utils";
+
+export function getCredentialSelect(eq = 0) {
+	return cy.getByTestId('node-credentials-select').eq(eq);
+}
+
+export function getCreateNewCredentialOption() {
+	return cy.getByTestId('node-credentials-select-item-new');
+}
+
+export function getBackToCanvasButton() {
+	return cy.getByTestId('back-to-canvas');
+}
+
+export function getExecuteNodeButton() {
+	return cy.getByTestId('node-execute-button');
+}
+
+export function getParameterInputByName(name: string) {
+	return cy.getByTestId(`parameter-input-${name}`);
+}
+
+export function getInputPanel() {
+	return cy.getByTestId('input-panel');
+}
+
+export function getMainPanel() {
+	return cy.getByTestId('node-parameters');
+}
+
+export function getOutputPanel() {
+	return cy.getByTestId('output-panel');
+}
+
+export function getOutputPanelDataContainer() {
+	return getOutputPanel().getByTestId('ndv-data-container');
+}
+
+export function getOutputPanelTable() {
+	return getOutputPanelDataContainer().get('table');
+}
+
+/**
+ * Actions
+ */
+
+export function openCredentialSelect(eq = 0) {
+	getCredentialSelect(eq).click();
+}
+
+export function setCredentialByName(name: string) {
+	openCredentialSelect();
+	getCredentialSelect().contains(name).click();
+}
+
+export function clickCreateNewCredential() {
+	openCredentialSelect();
+	getCreateNewCredentialOption().click();
+}
+
+export function clickGetBackToCanvas() {
+	getBackToCanvasButton().click();
+}
+
+export function clickExecuteNode() {
+	getExecuteNodeButton().click();
+}
+
+export function setParameterInputByName(name: string, value: string) {
+	getParameterInputByName(name).clear().type(value);
+}
+
+export function toggleParameterCheckboxInputByName(name: string) {
+	getParameterInputByName(name).find('input[type="checkbox"]').realClick()
+}
+
+export function setParameterSelectByContent(name: string, content: string) {
+	getParameterInputByName(name).realClick();
+	getVisibleSelect().find('.option-headline').contains(content).click();
+}
diff --git a/cypress/composables/setup-template-form-step.ts b/cypress/composables/setup-template-form-step.ts
new file mode 100644
index 0000000000000..6f0166278367f
--- /dev/null
+++ b/cypress/composables/setup-template-form-step.ts
@@ -0,0 +1,14 @@
+/**
+ * Getters
+ */
+
+export const getFormStep = () => cy.getByTestId('setup-credentials-form-step');
+
+export const getStepHeading = ($el: JQuery<HTMLElement>) =>
+	cy.wrap($el).findChildByTestId('credential-step-heading');
+
+export const getStepDescription = ($el: JQuery<HTMLElement>) =>
+	cy.wrap($el).findChildByTestId('credential-step-description');
+
+export const getCreateAppCredentialsButton = (appName: string) =>
+	cy.get(`button:contains("Create new ${appName} credential")`);
diff --git a/cypress/composables/setup-workflow-credentials-button.ts b/cypress/composables/setup-workflow-credentials-button.ts
new file mode 100644
index 0000000000000..6b1b9b69d4582
--- /dev/null
+++ b/cypress/composables/setup-workflow-credentials-button.ts
@@ -0,0 +1,5 @@
+/**
+ * Getters
+ */
+
+export const getSetupWorkflowCredentialsButton = () => cy.get(`button:contains("Set up template")`);
diff --git a/cypress/composables/versions.ts b/cypress/composables/versions.ts
new file mode 100644
index 0000000000000..f96ea8152fd31
--- /dev/null
+++ b/cypress/composables/versions.ts
@@ -0,0 +1,32 @@
+/**
+ * Getters
+ */
+
+export function getVersionUpdatesPanelOpenButton() {
+	return cy.getByTestId('version-updates-panel-button');
+}
+
+export function getVersionUpdatesPanel() {
+	return cy.getByTestId('version-updates-panel');
+}
+
+export function getVersionUpdatesPanelCloseButton() {
+	return getVersionUpdatesPanel().get('.el-drawer__close-btn').first();
+}
+
+export function getVersionCard() {
+	return cy.getByTestId('version-card');
+}
+
+/**
+ * Actions
+ */
+
+export function openVersionUpdatesPanel() {
+	getVersionUpdatesPanelOpenButton().click();
+	getVersionUpdatesPanel().should('be.visible');
+}
+
+export function closeVersionUpdatesPanel() {
+	getVersionUpdatesPanelCloseButton().click();
+}
diff --git a/cypress/composables/workflow.ts b/cypress/composables/workflow.ts
new file mode 100644
index 0000000000000..1aa469b19458f
--- /dev/null
+++ b/cypress/composables/workflow.ts
@@ -0,0 +1,159 @@
+import { ROUTES } from '../constants';
+import { getManualChatModal } from './modals/chat-modal';
+
+/**
+ * Types
+ */
+
+export type EndpointType =
+	| 'ai_chain'
+	| 'ai_document'
+	| 'ai_embedding'
+	| 'ai_languageModel'
+	| 'ai_memory'
+	| 'ai_outputParser'
+	| 'ai_tool'
+	| 'ai_retriever'
+	| 'ai_textSplitter'
+	| 'ai_vectorRetriever'
+	| 'ai_vectorStore';
+
+/**
+ * Getters
+ */
+
+export function getAddInputEndpointByType(nodeName: string, endpointType: EndpointType) {
+	return cy.get(
+		`.add-input-endpoint[data-jtk-scope-${endpointType}][data-endpoint-name="${nodeName}"]`,
+	);
+}
+
+export function getNodeCreatorItems() {
+	return cy.getByTestId('item-iterator-item');
+}
+
+export function getExecuteWorkflowButton() {
+	return cy.getByTestId('execute-workflow-button');
+}
+
+export function getManualChatButton() {
+	return cy.getByTestId('workflow-chat-button');
+}
+
+export function getNodes() {
+	return cy.getByTestId('canvas-node');
+}
+
+export function getNodeByName(name: string) {
+	return cy.getByTestId('canvas-node').filter(`[data-name="${name}"]`).eq(0);
+}
+
+export function disableNode(name: string) {
+	const target = getNodeByName(name);
+	target.rightclick(name ? 'center' : 'topLeft', { force: true });
+	cy.getByTestId(`context-menu-item-toggle_activation`).click();
+}
+
+export function getConnectionBySourceAndTarget(source: string, target: string) {
+	return cy
+		.get('.jtk-connector')
+		.filter(`[data-source-node="${source}"][data-target-node="${target}"]`)
+		.eq(0);
+}
+
+export function getNodeCreatorSearchBar() {
+	return cy.getByTestId('node-creator-search-bar');
+}
+
+export function getNodeCreatorPlusButton() {
+	return cy.getByTestId('node-creator-plus-button');
+}
+
+/**
+ * Actions
+ */
+
+export function addNodeToCanvas(
+	nodeDisplayName: string,
+	plusButtonClick = true,
+	preventNdvClose?: boolean,
+	action?: string,
+) {
+	if (plusButtonClick) {
+		getNodeCreatorPlusButton().click();
+	}
+
+	getNodeCreatorSearchBar().type(nodeDisplayName);
+	getNodeCreatorSearchBar().type('{enter}');
+	cy.wait(500);
+	cy.get('body').then((body) => {
+		if (body.find('[data-test-id=node-creator]').length > 0) {
+			if (action) {
+				cy.contains(action).click();
+			} else {
+				// Select the first action
+				cy.get('[data-keyboard-nav-type="action"]').eq(0).click();
+			}
+		}
+	});
+
+	if (!preventNdvClose) cy.get('body').type('{esc}');
+}
+
+export function navigateToNewWorkflowPage(preventNodeViewUnload = true) {
+	cy.visit(ROUTES.NEW_WORKFLOW_PAGE);
+	cy.waitForLoad();
+	cy.window().then((win) => {
+		win.preventNodeViewBeforeUnload = preventNodeViewUnload;
+	});
+}
+
+export function addSupplementalNodeToParent(
+	nodeName: string,
+	endpointType: EndpointType,
+	parentNodeName: string,
+	exactMatch = false,
+) {
+	getAddInputEndpointByType(parentNodeName, endpointType).click({ force: true });
+	if (exactMatch) {
+		getNodeCreatorItems()
+			.contains(new RegExp('^' + nodeName + '$', 'g'))
+			.click();
+	} else {
+		getNodeCreatorItems().contains(nodeName).click();
+	}
+	getConnectionBySourceAndTarget(parentNodeName, nodeName).should('exist');
+}
+
+export function addLanguageModelNodeToParent(
+	nodeName: string,
+	parentNodeName: string,
+	exactMatch = false,
+) {
+	addSupplementalNodeToParent(nodeName, 'ai_languageModel', parentNodeName, exactMatch);
+}
+
+export function addMemoryNodeToParent(nodeName: string, parentNodeName: string) {
+	addSupplementalNodeToParent(nodeName, 'ai_memory', parentNodeName);
+}
+
+export function addToolNodeToParent(nodeName: string, parentNodeName: string) {
+	addSupplementalNodeToParent(nodeName, 'ai_tool', parentNodeName);
+}
+
+export function addOutputParserNodeToParent(nodeName: string, parentNodeName: string) {
+	addSupplementalNodeToParent(nodeName, 'ai_outputParser', parentNodeName);
+}
+
+export function clickExecuteWorkflowButton() {
+	getExecuteWorkflowButton().click();
+}
+
+export function clickManualChatButton() {
+	getManualChatButton().click();
+	getManualChatModal().should('be.visible');
+}
+
+export function openNode(nodeName: string) {
+	getNodeByName(nodeName).dblclick();
+}
diff --git a/cypress/constants.ts b/cypress/constants.ts
index 5118696bc81d3..9711a7fc0294e 100644
--- a/cypress/constants.ts
+++ b/cypress/constants.ts
@@ -1,14 +1,47 @@
+import { randFirstName, randLastName } from '@ngneat/falso';
+
+export const BACKEND_BASE_URL = 'http://localhost:5678';
 export const N8N_AUTH_COOKIE = 'n8n-auth';
 
-export const DEFAULT_USER_EMAIL = 'nathan@n8n.io';
-export const DEFAULT_USER_PASSWORD = 'CypressTest123';
+const DEFAULT_USER_PASSWORD = 'CypressTest123';
+
+export const INSTANCE_OWNER = {
+	email: 'nathan@n8n.io',
+	password: DEFAULT_USER_PASSWORD,
+	firstName: randFirstName(),
+	lastName: randLastName(),
+};
+
+export const INSTANCE_ADMIN = {
+	email: 'admin@n8n.io',
+	password: DEFAULT_USER_PASSWORD,
+	firstName: randFirstName(),
+	lastName: randLastName(),
+};
+
+export const INSTANCE_MEMBERS = [
+	{
+		email: 'rebecca@n8n.io',
+		password: DEFAULT_USER_PASSWORD,
+		firstName: randFirstName(),
+		lastName: randLastName(),
+	},
+	{
+		email: 'mustafa@n8n.io',
+		password: DEFAULT_USER_PASSWORD,
+		firstName: randFirstName(),
+		lastName: randLastName(),
+	},
+];
 
 export const MANUAL_TRIGGER_NODE_NAME = 'Manual Trigger';
-export const MANUAL_TRIGGER_NODE_DISPLAY_NAME = 'When clicking "Execute Workflow"';
+export const MANUAL_TRIGGER_NODE_DISPLAY_NAME = 'When clicking "Test workflow"';
+export const MANUAL_CHAT_TRIGGER_NODE_NAME = 'Chat Trigger';
 export const SCHEDULE_TRIGGER_NODE_NAME = 'Schedule Trigger';
 export const CODE_NODE_NAME = 'Code';
 export const SET_NODE_NAME = 'Set';
-export const IF_NODE_NAME = 'IF';
+export const EDIT_FIELDS_SET_NODE_NAME = 'Edit Fields';
+export const IF_NODE_NAME = 'If';
 export const MERGE_NODE_NAME = 'Merge';
 export const SWITCH_NODE_NAME = 'Switch';
 export const GMAIL_NODE_NAME = 'Gmail';
@@ -16,6 +49,14 @@ export const TRELLO_NODE_NAME = 'Trello';
 export const NOTION_NODE_NAME = 'Notion';
 export const PIPEDRIVE_NODE_NAME = 'Pipedrive';
 export const HTTP_REQUEST_NODE_NAME = 'HTTP Request';
+export const AGENT_NODE_NAME = 'AI Agent';
+export const BASIC_LLM_CHAIN_NODE_NAME = 'Basic LLM Chain';
+export const AI_MEMORY_WINDOW_BUFFER_MEMORY_NODE_NAME = 'Window Buffer Memory';
+export const AI_TOOL_CALCULATOR_NODE_NAME = 'Calculator';
+export const AI_TOOL_CODE_NODE_NAME = 'Custom Code Tool';
+export const AI_TOOL_WIKIPEDIA_NODE_NAME = 'Wikipedia';
+export const AI_LANGUAGE_MODEL_OPENAI_CHAT_MODEL_NODE_NAME = 'OpenAI Chat Model';
+export const AI_OUTPUT_PARSER_AUTO_FIXING_NODE_NAME = 'Auto-fixing Output Parser';
 
 export const META_KEY = Cypress.platform === 'darwin' ? '{meta}' : '{ctrl}';
 
@@ -23,3 +64,7 @@ export const NEW_GOOGLE_ACCOUNT_NAME = 'Gmail account';
 export const NEW_TRELLO_ACCOUNT_NAME = 'Trello account';
 export const NEW_NOTION_ACCOUNT_NAME = 'Notion account';
 export const NEW_QUERY_AUTH_ACCOUNT_NAME = 'Query Auth account';
+
+export const ROUTES = {
+	NEW_WORKFLOW_PAGE: '/workflow/new',
+};
diff --git a/cypress/e2e/0-smoke.cy.ts b/cypress/e2e/0-smoke.cy.ts
deleted file mode 100644
index 09d9842922743..0000000000000
--- a/cypress/e2e/0-smoke.cy.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { DEFAULT_USER_EMAIL, DEFAULT_USER_PASSWORD } from '../constants';
-import { randFirstName, randLastName } from '@ngneat/falso';
-
-const email = DEFAULT_USER_EMAIL;
-const password = DEFAULT_USER_PASSWORD;
-const firstName = randFirstName();
-const lastName = randLastName();
-
-describe('Authentication', () => {
-	beforeEach(() => {
-		cy.resetAll();
-	});
-
-	it('should setup owner', () => {
-		cy.setup({ email, firstName, lastName, password });
-	});
-
-	it('should sign user in', () => {
-		cy.setupOwner({ email, password, firstName, lastName });
-		cy.on('uncaught:exception', (err, runnable) => {
-			expect(err.message).to.include('Not logged in');
-
-			return false;
-		});
-
-		cy.signin({ email, password });
-	});
-});
diff --git a/cypress/e2e/1-workflows.cy.ts b/cypress/e2e/1-workflows.cy.ts
index d10f3ac850ea5..25f4f3cb0a697 100644
--- a/cypress/e2e/1-workflows.cy.ts
+++ b/cypress/e2e/1-workflows.cy.ts
@@ -8,11 +8,6 @@ const WorkflowPage = new WorkflowPageClass();
 const multipleWorkflowsCount = 5;
 
 describe('Workflows', () => {
-	before(() => {
-		cy.resetAll();
-		cy.skipSetup();
-	});
-
 	beforeEach(() => {
 		cy.visit(WorkflowsPage.url);
 	});
diff --git a/cypress/e2e/10-settings-log-streaming.cy.ts b/cypress/e2e/10-settings-log-streaming.cy.ts
index 0126667a699b5..9acec76f420bc 100644
--- a/cypress/e2e/10-settings-log-streaming.cy.ts
+++ b/cypress/e2e/10-settings-log-streaming.cy.ts
@@ -1,23 +1,10 @@
-import { randFirstName, randLastName } from '@ngneat/falso';
-import { DEFAULT_USER_EMAIL, DEFAULT_USER_PASSWORD } from '../constants';
 import { SettingsLogStreamingPage } from '../pages';
+import { getVisibleModalOverlay } from '../utils/modal';
+import { getVisibleDropdown } from '../utils';
 
-const email = DEFAULT_USER_EMAIL;
-const password = DEFAULT_USER_PASSWORD;
-const firstName = randFirstName();
-const lastName = randLastName();
 const settingsLogStreamingPage = new SettingsLogStreamingPage();
 
 describe('Log Streaming Settings', () => {
-	before(() => {
-		cy.resetAll();
-		cy.setup({ email, firstName, lastName, password });
-	});
-
-	beforeEach(() => {
-		cy.signin({ email, password });
-	});
-
 	it('should show the unlicensed view when the feature is disabled', () => {
 		cy.visit('/settings/log-streaming');
 		settingsLogStreamingPage.getters.getActionBoxUnlicensed().should('be.visible');
@@ -26,7 +13,7 @@ describe('Log Streaming Settings', () => {
 	});
 
 	it('should show the licensed view when the feature is enabled', () => {
-		cy.enableFeature('feat:logStreaming');
+		cy.enableFeature('logStreaming');
 		cy.visit('/settings/log-streaming');
 		settingsLogStreamingPage.getters.getActionBoxLicensed().should('be.visible');
 		settingsLogStreamingPage.getters.getAddFirstDestinationButton().should('be.visible');
@@ -34,6 +21,7 @@ describe('Log Streaming Settings', () => {
 	});
 
 	it('should show the add destination modal', () => {
+		cy.enableFeature('logStreaming');
 		cy.visit('/settings/log-streaming');
 		settingsLogStreamingPage.actions.clickAddFirstDestination();
 		cy.wait(100);
@@ -42,7 +30,7 @@ describe('Log Streaming Settings', () => {
 		settingsLogStreamingPage.getters.getSelectDestinationButton().should('be.visible');
 		settingsLogStreamingPage.getters.getSelectDestinationButton().should('have.attr', 'disabled');
 		settingsLogStreamingPage.getters
-			.getDestinationModalDialog()
+			.getDestinationModal()
 			.invoke('css', 'width')
 			.then((widthStr) => parseInt((widthStr as unknown as string).replace('px', '')))
 			.should('be.lessThan', 500);
@@ -51,65 +39,67 @@ describe('Log Streaming Settings', () => {
 		settingsLogStreamingPage.getters
 			.getSelectDestinationButton()
 			.should('not.have.attr', 'disabled');
-		settingsLogStreamingPage.getters.getDestinationModal().click(1, 1);
+		getVisibleModalOverlay().click(1, 1);
 		settingsLogStreamingPage.getters.getDestinationModal().should('not.exist');
 	});
 
 	it('should create a destination and delete it', () => {
+		cy.enableFeature('logStreaming');
 		cy.visit('/settings/log-streaming');
+		cy.wait(1000); // Race condition with getDestinationDataFromBackend()
 		settingsLogStreamingPage.actions.clickAddFirstDestination();
 		cy.wait(100);
 		settingsLogStreamingPage.getters.getDestinationModal().should('be.visible');
 		settingsLogStreamingPage.getters.getSelectDestinationType().click();
 		settingsLogStreamingPage.getters.getSelectDestinationTypeItems().eq(0).click();
 		settingsLogStreamingPage.getters.getSelectDestinationButton().click();
-		settingsLogStreamingPage.getters.getDestinationNameInput().click()
+		settingsLogStreamingPage.getters.getDestinationNameInput().click();
 
-		settingsLogStreamingPage.getters.getDestinationNameInput().find('input').clear().type('Destination 0');
+		settingsLogStreamingPage.getters
+			.getDestinationNameInput()
+			.find('input')
+			.clear()
+			.type('Destination 0');
 		settingsLogStreamingPage.getters.getDestinationSaveButton().click();
 		cy.wait(100);
-		settingsLogStreamingPage.getters.getDestinationModal().click(1, 1);
+		getVisibleModalOverlay().click(1, 1);
 		cy.reload();
 		settingsLogStreamingPage.getters.getDestinationCards().eq(0).click();
 		settingsLogStreamingPage.getters.getDestinationDeleteButton().should('be.visible').click();
 		cy.get('.el-message-box').should('be.visible').find('.btn--cancel').click();
 		settingsLogStreamingPage.getters.getDestinationDeleteButton().click();
 		cy.get('.el-message-box').should('be.visible').find('.btn--confirm').click();
-		cy.reload();
 	});
 
 	it('should create a destination and delete it via card actions', () => {
+		cy.enableFeature('logStreaming');
 		cy.visit('/settings/log-streaming');
+		cy.wait(1000); // Race condition with getDestinationDataFromBackend()
 		settingsLogStreamingPage.actions.clickAddFirstDestination();
 		cy.wait(100);
 		settingsLogStreamingPage.getters.getDestinationModal().should('be.visible');
 		settingsLogStreamingPage.getters.getSelectDestinationType().click();
 		settingsLogStreamingPage.getters.getSelectDestinationTypeItems().eq(0).click();
 		settingsLogStreamingPage.getters.getSelectDestinationButton().click();
-		settingsLogStreamingPage.getters.getDestinationNameInput().click()
-		settingsLogStreamingPage.getters.getDestinationNameInput().find('input').clear().type('Destination 1');
+		settingsLogStreamingPage.getters.getDestinationNameInput().click();
+		settingsLogStreamingPage.getters
+			.getDestinationNameInput()
+			.find('input')
+			.clear()
+			.type('Destination 1');
 		settingsLogStreamingPage.getters.getDestinationSaveButton().should('not.have.attr', 'disabled');
 		settingsLogStreamingPage.getters.getDestinationSaveButton().click();
 		cy.wait(100);
-		settingsLogStreamingPage.getters.getDestinationModal().click(1, 1);
+		getVisibleModalOverlay().click(1, 1);
 		cy.reload();
 
-		settingsLogStreamingPage.getters
-			.getDestinationCards()
-			.eq(0)
-			.find('.el-dropdown-selfdefine')
-			.click();
-		cy.get('.el-dropdown-menu').find('.el-dropdown-menu__item').eq(0).click();
+		settingsLogStreamingPage.getters.getDestinationCards().eq(0).find('.el-dropdown').click();
+		getVisibleDropdown().find('.el-dropdown-menu__item').eq(0).click();
 		settingsLogStreamingPage.getters.getDestinationSaveButton().should('not.exist');
-		settingsLogStreamingPage.getters.getDestinationModal().click(1, 1);
+		getVisibleModalOverlay().click(1, 1);
 
-		settingsLogStreamingPage.getters
-			.getDestinationCards()
-			.eq(0)
-			.find('.el-dropdown-selfdefine')
-			.click();
-		cy.get('.el-dropdown-menu').find('.el-dropdown-menu__item').eq(1).click();
+		settingsLogStreamingPage.getters.getDestinationCards().eq(0).find('.el-dropdown').click();
+		getVisibleDropdown().find('.el-dropdown-menu__item').eq(1).click();
 		cy.get('.el-message-box').should('be.visible').find('.btn--confirm').click();
-		cy.reload();
 	});
 });
diff --git a/cypress/e2e/10-undo-redo.cy.ts b/cypress/e2e/10-undo-redo.cy.ts
index 8f9b90d68c322..3190987541673 100644
--- a/cypress/e2e/10-undo-redo.cy.ts
+++ b/cypress/e2e/10-undo-redo.cy.ts
@@ -1,20 +1,17 @@
-import { CODE_NODE_NAME, SET_NODE_NAME } from './../constants';
+import { CODE_NODE_NAME, SET_NODE_NAME, EDIT_FIELDS_SET_NODE_NAME } from './../constants';
 import { SCHEDULE_TRIGGER_NODE_NAME } from '../constants';
 import { WorkflowPage as WorkflowPageClass } from '../pages/workflow';
+import { MessageBox as MessageBoxClass } from '../pages/modals/message-box';
 import { NDV } from '../pages/ndv';
 
 // Suite-specific constants
 const CODE_NODE_NEW_NAME = 'Something else';
 
 const WorkflowPage = new WorkflowPageClass();
+const messageBox = new MessageBoxClass();
 const ndv = new NDV();
 
 describe('Undo/Redo', () => {
-	before(() => {
-		cy.resetAll();
-		cy.skipSetup();
-	});
-
 	beforeEach(() => {
 		WorkflowPage.actions.visit();
 	});
@@ -46,21 +43,34 @@ describe('Undo/Redo', () => {
 			SET_NODE_NAME,
 		);
 		WorkflowPage.actions.zoomToFit();
+		WorkflowPage.getters
+			.canvasNodeByName('Code')
+			.should('have.css', 'left', '860px')
+			.should('have.css', 'top', '220px');
+
 		WorkflowPage.actions.hitUndo();
 		WorkflowPage.getters.canvasNodes().should('have.have.length', 2);
 		WorkflowPage.getters.nodeConnections().should('have.length', 1);
+		WorkflowPage.actions.hitUndo();
+		WorkflowPage.getters.canvasNodes().should('have.have.length', 1);
+		WorkflowPage.getters.nodeConnections().should('have.length', 0);
+		WorkflowPage.actions.hitRedo();
+		WorkflowPage.getters.canvasNodes().should('have.have.length', 2);
+		WorkflowPage.getters.nodeConnections().should('have.length', 1);
 		WorkflowPage.actions.hitRedo();
 		WorkflowPage.getters.canvasNodes().should('have.have.length', 3);
 		WorkflowPage.getters.nodeConnections().should('have.length', 2);
+		// Last node should be added back to original position
+		WorkflowPage.getters
+			.canvasNodeByName('Code')
+			.should('have.css', 'left', '860px')
+			.should('have.css', 'top', '220px');
 	});
 
-	it('should undo/redo deleting node using delete button', () => {
+	it('should undo/redo deleting node using context menu', () => {
 		WorkflowPage.actions.addNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME);
 		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
-		WorkflowPage.getters
-			.canvasNodeByName(CODE_NODE_NAME)
-			.find('[data-test-id=delete-node-button]')
-			.click({ force: true });
+		WorkflowPage.actions.deleteNodeFromContextMenu(CODE_NODE_NAME);
 		WorkflowPage.getters.canvasNodes().should('have.have.length', 1);
 		WorkflowPage.getters.nodeConnections().should('have.length', 0);
 		WorkflowPage.actions.hitUndo();
@@ -122,28 +132,32 @@ describe('Undo/Redo', () => {
 	it('should undo/redo moving nodes', () => {
 		WorkflowPage.actions.addNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME);
 		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
-		cy.drag('[data-test-id="canvas-node"].jtk-drag-selected', [50, 150]);
+		cy.drag('[data-test-id="canvas-node"].jtk-drag-selected', [50, 150], { clickToFinish: true });
 		WorkflowPage.getters
-			.canvasNodes()
-			.last()
-			.should('have.attr', 'style', 'left: 740px; top: 360px;');
+			.canvasNodeByName('Code')
+			.should('have.css', 'left', '740px')
+			.should('have.css', 'top', '320px');
+
 		WorkflowPage.actions.hitUndo();
 		WorkflowPage.getters
-			.canvasNodes()
-			.last()
-			.should('have.attr', 'style', 'left: 640px; top: 260px;');
+			.canvasNodeByName('Code')
+			.should('have.css', 'left', '640px')
+			.should('have.css', 'top', '220px');
 		WorkflowPage.actions.hitRedo();
 		WorkflowPage.getters
-			.canvasNodes()
-			.last()
-			.should('have.attr', 'style', 'left: 740px; top: 360px;');
+			.canvasNodeByName('Code')
+			.should('have.css', 'left', '740px')
+			.should('have.css', 'top', '320px');
 	});
 
-	it('should undo/redo deleting a connection by pressing delete button', () => {
+	it('should undo/redo deleting a connection using context menu', () => {
 		WorkflowPage.actions.addNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME);
 		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
 		WorkflowPage.getters.nodeConnections().realHover();
-		cy.get('.connection-actions .delete').filter(':visible').should('be.visible').click();
+		cy.get('.connection-actions .delete')
+			.filter(':visible')
+			.should('be.visible')
+			.click({ force: true });
 		WorkflowPage.getters.nodeConnections().should('have.length', 0);
 		WorkflowPage.actions.hitUndo();
 		WorkflowPage.getters.nodeConnections().should('have.length', 1);
@@ -162,14 +176,10 @@ describe('Undo/Redo', () => {
 		WorkflowPage.getters.nodeConnections().should('have.length', 0);
 	});
 
-	it('should undo/redo disabling a node using disable button', () => {
+	it('should undo/redo disabling a node using context menu', () => {
 		WorkflowPage.actions.addNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME);
 		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
-		WorkflowPage.getters
-			.canvasNodes()
-			.last()
-			.find('[data-test-id="disable-node-button"]')
-			.click({ force: true });
+		WorkflowPage.actions.disableNode(CODE_NODE_NAME);
 		WorkflowPage.getters.disabledNodes().should('have.length', 1);
 		WorkflowPage.actions.hitUndo();
 		WorkflowPage.getters.disabledNodes().should('have.length', 0);
@@ -237,11 +247,7 @@ describe('Undo/Redo', () => {
 	it('should undo/redo duplicating a node', () => {
 		WorkflowPage.actions.addNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME);
 		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
-		WorkflowPage.getters
-			.canvasNodes()
-			.last()
-			.find('[data-test-id="duplicate-node-button"]')
-			.click({ force: true });
+		WorkflowPage.actions.duplicateNode(CODE_NODE_NAME);
 		WorkflowPage.actions.hitUndo();
 		WorkflowPage.getters.canvasNodes().should('have.length', 2);
 		WorkflowPage.actions.hitRedo();
@@ -252,57 +258,134 @@ describe('Undo/Redo', () => {
 		cy.fixture('Test_workflow-actions_paste-data.json').then((data) => {
 			cy.get('body').paste(JSON.stringify(data));
 			WorkflowPage.actions.zoomToFit();
-			WorkflowPage.getters.canvasNodes().should('have.have.length', 2);
+			WorkflowPage.getters.canvasNodes().should('have.have.length', 5);
 			WorkflowPage.actions.hitUndo();
 			WorkflowPage.getters.canvasNodes().should('have.have.length', 0);
 			WorkflowPage.actions.hitRedo();
-			WorkflowPage.getters.canvasNodes().should('have.have.length', 2);
+			WorkflowPage.getters.canvasNodes().should('have.have.length', 5);
 		});
 	});
 
 	it('should undo/redo multiple steps', () => {
 		WorkflowPage.actions.addNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME);
 		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
-		WorkflowPage.actions.addNodeToCanvas(SET_NODE_NAME);
+		// WorkflowPage.actions.addNodeToCanvas(SET_NODE_NAME);
+		WorkflowPage.actions.addNodeToCanvas(EDIT_FIELDS_SET_NODE_NAME);
 		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
 		WorkflowPage.actions.zoomToFit();
 
 		// Disable last node
 		WorkflowPage.getters.canvasNodes().last().click();
 		WorkflowPage.actions.hitDisableNodeShortcut();
+
 		// Move first one
-		WorkflowPage.getters.canvasNodes().first().click();
-		cy.drag('[data-test-id="canvas-node"].jtk-drag-selected', [50, 150]);
-		// Delete the set node
-		WorkflowPage.getters.canvasNodeByName(SET_NODE_NAME).click().click();
-		cy.get('body').type('{backspace}');
+		WorkflowPage.actions
+			.getNodePosition(WorkflowPage.getters.canvasNodes().first())
+			.then((initialPosition) => {
+				WorkflowPage.getters.canvasNodes().first().click();
+				cy.drag('[data-test-id="canvas-node"].jtk-drag-selected', [50, 150], {
+					clickToFinish: true,
+				});
+				WorkflowPage.getters
+					.canvasNodes()
+					.first()
+					.should('have.css', 'left', `${initialPosition.left + 120}px`)
+					.should('have.css', 'top', `${initialPosition.top + 140}px`);
 
-		// First undo: Should return deleted node
-		WorkflowPage.actions.hitUndo();
+				// Delete the set node
+				WorkflowPage.getters.canvasNodeByName(EDIT_FIELDS_SET_NODE_NAME).click().click();
+				cy.get('body').type('{backspace}');
+
+				// First undo: Should return deleted node
+				WorkflowPage.actions.hitUndo();
+				WorkflowPage.getters.canvasNodes().should('have.length', 4);
+				WorkflowPage.getters.nodeConnections().should('have.length', 3);
+				// Second undo: Should move first node to it's original position
+				WorkflowPage.actions.hitUndo();
+				WorkflowPage.getters
+					.canvasNodes()
+					.first()
+					.should('have.css', 'left', `${initialPosition.left}px`)
+					.should('have.css', 'top', `${initialPosition.top}px`);
+				// Third undo: Should enable last node
+				WorkflowPage.actions.hitUndo();
+				WorkflowPage.getters.disabledNodes().should('have.length', 0);
+
+				// First redo: Should disable last node
+				WorkflowPage.actions.hitRedo();
+				WorkflowPage.getters.disabledNodes().should('have.length', 1);
+				// Second redo: Should move the first node
+				WorkflowPage.actions.hitRedo();
+				WorkflowPage.getters
+					.canvasNodes()
+					.first()
+					.should('have.css', 'left', `${initialPosition.left + 120}px`)
+					.should('have.css', 'top', `${initialPosition.top + 140}px`);
+				// Third redo: Should delete the Set node
+				WorkflowPage.actions.hitRedo();
+				WorkflowPage.getters.canvasNodes().should('have.length', 3);
+				WorkflowPage.getters.nodeConnections().should('have.length', 2);
+			});
+	});
+
+	it('should be able to copy and paste pinned data nodes in workflows with dynamic Switch node', () => {
+		cy.fixture('Test_workflow_form_switch.json').then((data) => {
+			cy.get('body').paste(JSON.stringify(data));
+		});
+		WorkflowPage.actions.zoomToFit();
+
+		WorkflowPage.getters.canvasNodes().should('have.length', 2);
+		WorkflowPage.getters.nodeConnections().should('have.length', 1);
+		cy.get(WorkflowPage.getters.getEndpointSelector('input', 'Switch')).should('have.length', 1);
+		cy.get(WorkflowPage.getters.getEndpointSelector('input', 'Switch'))
+			.should('have.css', 'left', `637px`)
+			.should('have.css', 'top', `501px`);
+
+		cy.fixture('Test_workflow_form_switch.json').then((data) => {
+			cy.get('body').paste(JSON.stringify(data));
+		});
 		WorkflowPage.getters.canvasNodes().should('have.length', 4);
-		WorkflowPage.getters.nodeConnections().should('have.length', 3);
-		// Second undo: Should move first node to it's original position
+		WorkflowPage.getters.nodeConnections().should('have.length', 2);
+
 		WorkflowPage.actions.hitUndo();
-		WorkflowPage.getters
-			.canvasNodes()
-			.first()
-			.should('have.attr', 'style', 'left: 420px; top: 260px;');
-		// Third undo: Should enable last node
+
+		WorkflowPage.getters.canvasNodes().should('have.length', 2);
+		WorkflowPage.getters.nodeConnections().should('have.length', 1);
+		cy.get(WorkflowPage.getters.getEndpointSelector('input', 'Switch')).should('have.length', 1);
+		cy.get(WorkflowPage.getters.getEndpointSelector('input', 'Switch'))
+			.should('have.css', 'left', `637px`)
+			.should('have.css', 'top', `501px`);
+	});
+
+	it('should not undo/redo when NDV or a modal is open', () => {
+		WorkflowPage.actions.addInitialNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME, { keepNdvOpen: true });
+		// Try while NDV is open
 		WorkflowPage.actions.hitUndo();
-		WorkflowPage.getters.disabledNodes().should('have.length', 0);
+		WorkflowPage.getters.canvasNodes().should('have.have.length', 1);
+		ndv.getters.backToCanvas().click();
+		// Try while modal is open
+		cy.getByTestId('menu-item').contains('About n8n').click({ force: true });
+		cy.getByTestId('about-modal').should('be.visible');
+		WorkflowPage.actions.hitUndo();
+		WorkflowPage.getters.canvasNodes().should('have.have.length', 1);
+		cy.getByTestId('close-about-modal-button').click();
+		// Should work now
+		WorkflowPage.actions.hitUndo();
+		WorkflowPage.getters.canvasNodes().should('have.have.length', 0);
+	});
 
-		// First redo: Should disable last node
-		WorkflowPage.actions.hitRedo();
-		WorkflowPage.getters.disabledNodes().should('have.length', 1);
-		// Second redo: Should move the first node
-		WorkflowPage.actions.hitRedo();
-		WorkflowPage.getters
-			.canvasNodes()
-			.first()
-			.should('have.attr', 'style', 'left: 540px; top: 400px;');
-		// Third redo: Should delete the Set node
-		WorkflowPage.actions.hitRedo();
-		WorkflowPage.getters.canvasNodes().should('have.length', 3);
-		WorkflowPage.getters.nodeConnections().should('have.length', 2);
+	it('should not undo/redo when NDV or a prompt is open', () => {
+		WorkflowPage.actions.addInitialNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME, { keepNdvOpen: false });
+		WorkflowPage.getters.workflowMenu().click();
+		WorkflowPage.getters.workflowMenuItemImportFromURLItem().should('be.visible');
+		WorkflowPage.getters.workflowMenuItemImportFromURLItem().click();
+		// Try while prompt is open
+		messageBox.getters.header().click();
+		WorkflowPage.actions.hitUndo();
+		WorkflowPage.getters.canvasNodes().should('have.have.length', 1);
+		// Close prompt and try again
+		messageBox.actions.cancel();
+		WorkflowPage.actions.hitUndo();
+		WorkflowPage.getters.canvasNodes().should('have.have.length', 0);
 	});
 });
diff --git a/cypress/e2e/11-inline-expression-editor.cy.ts b/cypress/e2e/11-inline-expression-editor.cy.ts
index de5594a4f429a..1d95b2db8e889 100644
--- a/cypress/e2e/11-inline-expression-editor.cy.ts
+++ b/cypress/e2e/11-inline-expression-editor.cy.ts
@@ -1,74 +1,136 @@
+import { NDV } from '../pages/ndv';
 import { WorkflowPage as WorkflowPageClass } from '../pages/workflow';
 
+const ndv = new NDV();
 const WorkflowPage = new WorkflowPageClass();
 
 describe('Inline expression editor', () => {
-	before(() => {
-		cy.resetAll();
-		cy.skipSetup();
-	});
-
 	beforeEach(() => {
 		WorkflowPage.actions.visit();
-		WorkflowPage.actions.addInitialNodeToCanvas('Manual');
-		WorkflowPage.actions.addNodeToCanvas('Hacker News');
-		WorkflowPage.actions.openNode('Hacker News');
-		WorkflowPage.actions.openInlineExpressionEditor();
+		WorkflowPage.actions.addInitialNodeToCanvas('Schedule');
+		cy.on('uncaught:exception', (err) => err.name !== 'ExpressionError');
 	});
 
-	it('should resolve primitive resolvables', () => {
-		WorkflowPage.getters.inlineExpressionEditorInput().clear();
-		WorkflowPage.getters.inlineExpressionEditorInput().type('{{');
-		WorkflowPage.getters.inlineExpressionEditorInput().type('1 + 2');
-		WorkflowPage.getters.inlineExpressionEditorOutput().contains(/^3$/);
-		WorkflowPage.getters.inlineExpressionEditorInput().clear();
-
-		WorkflowPage.getters.inlineExpressionEditorInput().type('{{');
-		WorkflowPage.getters.inlineExpressionEditorInput().type('"ab"');
-		WorkflowPage.getters.inlineExpressionEditorInput().type('{rightArrow}+');
-		WorkflowPage.getters.inlineExpressionEditorInput().type('"cd"');
-		WorkflowPage.getters.inlineExpressionEditorOutput().contains(/^abcd$/);
-		WorkflowPage.getters.inlineExpressionEditorInput().clear();
-
-		WorkflowPage.getters.inlineExpressionEditorInput().type('{{');
-		WorkflowPage.getters.inlineExpressionEditorInput().type('true && false');
-		WorkflowPage.getters.inlineExpressionEditorOutput().contains(/^false$/);
-	});
+	describe('Static data', () => {
+		beforeEach(() => {
+			WorkflowPage.actions.addNodeToCanvas('Hacker News');
+			WorkflowPage.actions.openNode('Hacker News');
+			WorkflowPage.actions.openInlineExpressionEditor();
+		});
 
-	it('should resolve object resolvables', () => {
-		WorkflowPage.getters.inlineExpressionEditorInput().clear();
-		WorkflowPage.getters.inlineExpressionEditorInput().type('{{');
-		WorkflowPage.getters
-			.inlineExpressionEditorInput()
-			.type('{ a: 1 }', { parseSpecialCharSequences: false });
-		WorkflowPage.getters.inlineExpressionEditorOutput().contains(/^\[Object: \{"a": 1\}\]$/);
-		WorkflowPage.getters.inlineExpressionEditorInput().clear();
-
-		WorkflowPage.getters.inlineExpressionEditorInput().type('{{');
-		WorkflowPage.getters
-			.inlineExpressionEditorInput()
-			.type('{ a: 1 }.a', { parseSpecialCharSequences: false });
-		WorkflowPage.getters.inlineExpressionEditorOutput().contains(/^1$/);
-	});
+		it('should resolve primitive resolvables', () => {
+			WorkflowPage.getters.inlineExpressionEditorInput().clear();
+			WorkflowPage.getters.inlineExpressionEditorInput().type('{{');
+			WorkflowPage.getters.inlineExpressionEditorInput().type('1 + 2');
+			WorkflowPage.getters.inlineExpressionEditorOutput().contains(/^3$/);
+			WorkflowPage.getters.inlineExpressionEditorInput().clear();
+
+			WorkflowPage.getters.inlineExpressionEditorInput().type('{{');
+			WorkflowPage.getters.inlineExpressionEditorInput().type('"ab"');
+			WorkflowPage.getters.inlineExpressionEditorInput().type('{rightArrow}+');
+			WorkflowPage.getters.inlineExpressionEditorInput().type('"cd"');
+			WorkflowPage.getters.inlineExpressionEditorOutput().contains(/^abcd$/);
+			WorkflowPage.getters.inlineExpressionEditorInput().clear();
+
+			WorkflowPage.getters.inlineExpressionEditorInput().type('{{');
+			WorkflowPage.getters.inlineExpressionEditorInput().type('true && false');
+			WorkflowPage.getters.inlineExpressionEditorOutput().contains(/^false$/);
+		});
 
-	it('should resolve array resolvables', () => {
-		WorkflowPage.getters.inlineExpressionEditorInput().clear();
-		WorkflowPage.getters.inlineExpressionEditorInput().type('{{');
-		WorkflowPage.getters.inlineExpressionEditorInput().type('[1, 2, 3]');
-		WorkflowPage.getters.inlineExpressionEditorOutput().contains(/^\[Array: \[1,2,3\]\]$/);
+		it('should resolve object resolvables', () => {
+			WorkflowPage.getters.inlineExpressionEditorInput().clear();
+			WorkflowPage.getters.inlineExpressionEditorInput().type('{{');
+			WorkflowPage.getters
+				.inlineExpressionEditorInput()
+				.type('{ a: 1 }', { parseSpecialCharSequences: false });
+			WorkflowPage.getters.inlineExpressionEditorOutput().contains(/^\[Object: \{"a": 1\}\]$/);
+			WorkflowPage.getters.inlineExpressionEditorInput().clear();
 
-		WorkflowPage.getters.inlineExpressionEditorInput().clear();
+			WorkflowPage.getters.inlineExpressionEditorInput().type('{{');
+			WorkflowPage.getters
+				.inlineExpressionEditorInput()
+				.type('{ a: 1 }.a', { parseSpecialCharSequences: false });
+			WorkflowPage.getters.inlineExpressionEditorOutput().contains(/^1$/);
+		});
 
-		WorkflowPage.getters.inlineExpressionEditorInput().type('{{');
-		WorkflowPage.getters.inlineExpressionEditorInput().type('[1, 2, 3]');
-		WorkflowPage.getters.inlineExpressionEditorInput().type('[0]');
-		WorkflowPage.getters.inlineExpressionEditorOutput().contains(/^1$/);
+		it('should resolve array resolvables', () => {
+			WorkflowPage.getters.inlineExpressionEditorInput().clear();
+			WorkflowPage.getters.inlineExpressionEditorInput().type('{{');
+			WorkflowPage.getters.inlineExpressionEditorInput().type('[1, 2, 3]');
+			WorkflowPage.getters.inlineExpressionEditorOutput().contains(/^\[Array: \[1,2,3\]\]$/);
+
+			WorkflowPage.getters.inlineExpressionEditorInput().clear();
+
+			WorkflowPage.getters.inlineExpressionEditorInput().type('{{');
+			WorkflowPage.getters.inlineExpressionEditorInput().type('[1, 2, 3]');
+			WorkflowPage.getters.inlineExpressionEditorInput().type('[0]');
+			WorkflowPage.getters.inlineExpressionEditorOutput().contains(/^1$/);
+		});
 	});
 
-	it('should resolve $parameter[]', () => {
-		WorkflowPage.getters.inlineExpressionEditorInput().clear();
-		WorkflowPage.getters.inlineExpressionEditorInput().type('{{');
-		WorkflowPage.getters.inlineExpressionEditorInput().type('$parameter["operation"]');
-		WorkflowPage.getters.inlineExpressionEditorOutput().contains(/^getAll$/);
+	describe('Dynamic data', () => {
+		beforeEach(() => {
+			WorkflowPage.actions.openNode('Schedule Trigger');
+			ndv.actions.setPinnedData([{ myStr: 'Monday' }]);
+			ndv.actions.close();
+			WorkflowPage.actions.addNodeToCanvas('No Operation');
+			WorkflowPage.actions.addNodeToCanvas('Hacker News');
+			WorkflowPage.actions.openNode('Hacker News');
+			WorkflowPage.actions.openInlineExpressionEditor();
+		});
+
+		it('should resolve $parameter[]', () => {
+			WorkflowPage.getters.inlineExpressionEditorInput().clear();
+			WorkflowPage.getters.inlineExpressionEditorInput().type('{{');
+			// Resolving $parameter is slow, especially on CI runner
+			WorkflowPage.getters.inlineExpressionEditorInput().type('$parameter["operation"]');
+			WorkflowPage.getters.inlineExpressionEditorOutput().should('have.text', 'getAll');
+		});
+
+		it('should resolve input: $json,$input,$(nodeName)', () => {
+			// Previous nodes have not run, input is empty
+			WorkflowPage.getters.inlineExpressionEditorInput().clear();
+			WorkflowPage.getters.inlineExpressionEditorInput().type('{{');
+			WorkflowPage.getters.inlineExpressionEditorInput().type('$json.myStr');
+			WorkflowPage.getters
+				.inlineExpressionEditorOutput()
+				.should('have.text', '[Execute previous nodes for preview]');
+			WorkflowPage.getters.inlineExpressionEditorInput().clear();
+			WorkflowPage.getters.inlineExpressionEditorInput().type('{{');
+			WorkflowPage.getters.inlineExpressionEditorInput().type('$input.item.json.myStr');
+			WorkflowPage.getters
+				.inlineExpressionEditorOutput()
+				.should('have.text', '[Execute previous nodes for preview]');
+			WorkflowPage.getters.inlineExpressionEditorInput().clear();
+			WorkflowPage.getters.inlineExpressionEditorInput().type('{{');
+			WorkflowPage.getters
+				.inlineExpressionEditorInput()
+				.type("$('Schedule Trigger').item.json.myStr");
+			WorkflowPage.getters
+				.inlineExpressionEditorOutput()
+				.should('have.text', '[Execute previous nodes for preview]');
+
+			// Run workflow
+			ndv.actions.close();
+			WorkflowPage.actions.executeNode('No Operation');
+			WorkflowPage.actions.openNode('Hacker News');
+			WorkflowPage.actions.openInlineExpressionEditor();
+
+			// Previous nodes have run, input can be resolved
+			WorkflowPage.getters.inlineExpressionEditorInput().clear();
+			WorkflowPage.getters.inlineExpressionEditorInput().type('{{');
+			WorkflowPage.getters.inlineExpressionEditorInput().type('$json.myStr');
+			WorkflowPage.getters.inlineExpressionEditorOutput().should('have.text', 'Monday');
+			WorkflowPage.getters.inlineExpressionEditorInput().clear();
+			WorkflowPage.getters.inlineExpressionEditorInput().type('{{');
+			WorkflowPage.getters.inlineExpressionEditorInput().type('$input.item.json.myStr');
+			WorkflowPage.getters.inlineExpressionEditorOutput().should('have.text', 'Monday');
+			WorkflowPage.getters.inlineExpressionEditorInput().clear();
+			WorkflowPage.getters.inlineExpressionEditorInput().type('{{');
+			WorkflowPage.getters
+				.inlineExpressionEditorInput()
+				.type("$('Schedule Trigger').item.json.myStr");
+			WorkflowPage.getters.inlineExpressionEditorOutput().should('have.text', 'Monday');
+		});
 	});
 });
diff --git a/cypress/e2e/12-canvas-actions.cy.ts b/cypress/e2e/12-canvas-actions.cy.ts
index 518857106fdcb..3c517b6c9840f 100644
--- a/cypress/e2e/12-canvas-actions.cy.ts
+++ b/cypress/e2e/12-canvas-actions.cy.ts
@@ -3,7 +3,7 @@ import {
 	MANUAL_TRIGGER_NODE_DISPLAY_NAME,
 	CODE_NODE_NAME,
 	SCHEDULE_TRIGGER_NODE_NAME,
-	SET_NODE_NAME,
+	EDIT_FIELDS_SET_NODE_NAME,
 	IF_NODE_NAME,
 	HTTP_REQUEST_NODE_NAME,
 } from './../constants';
@@ -11,11 +11,6 @@ import { WorkflowPage as WorkflowPageClass } from '../pages/workflow';
 
 const WorkflowPage = new WorkflowPageClass();
 describe('Canvas Actions', () => {
-	before(() => {
-		cy.resetAll();
-		cy.skipSetup();
-	});
-
 	beforeEach(() => {
 		WorkflowPage.actions.visit();
 	});
@@ -30,24 +25,29 @@ describe('Canvas Actions', () => {
 	});
 
 	it('should connect and disconnect a simple node', () => {
-		WorkflowPage.actions.addNodeToCanvas(SET_NODE_NAME);
+		WorkflowPage.actions.addNodeToCanvas(EDIT_FIELDS_SET_NODE_NAME);
 		WorkflowPage.getters.nodeViewBackground().click(600, 200, { force: true });
 		cy.get('.jtk-connector').should('have.length', 1);
-		WorkflowPage.actions.addNodeToCanvas(SET_NODE_NAME);
+
+		WorkflowPage.getters.nodeViewBackground().click(600, 400, { force: true });
+		WorkflowPage.actions.addNodeToCanvas(EDIT_FIELDS_SET_NODE_NAME);
 
 		// Change connection from Set to Set1
 		cy.draganddrop(
-			WorkflowPage.getters.getEndpointSelector('input', SET_NODE_NAME),
-			WorkflowPage.getters.getEndpointSelector('input', `${SET_NODE_NAME}1`),
+			WorkflowPage.getters.getEndpointSelector('input', EDIT_FIELDS_SET_NODE_NAME),
+			WorkflowPage.getters.getEndpointSelector('input', `${EDIT_FIELDS_SET_NODE_NAME}1`),
 		);
 
 		WorkflowPage.getters
-			.canvasNodeInputEndpointByName(`${SET_NODE_NAME}1`)
+			.canvasNodeInputEndpointByName(`${EDIT_FIELDS_SET_NODE_NAME}1`)
 			.should('have.class', 'jtk-endpoint-connected');
 
 		cy.get('.jtk-connector').should('have.length', 1);
 		// Disconnect Set1
-		cy.drag(WorkflowPage.getters.getEndpointSelector('input', `${SET_NODE_NAME}1`), [-200, 100]);
+		cy.drag(
+			WorkflowPage.getters.getEndpointSelector('input', `${EDIT_FIELDS_SET_NODE_NAME}1`),
+			[-200, 100],
+		);
 		cy.get('.jtk-connector').should('have.length', 0);
 	});
 
@@ -71,7 +71,6 @@ describe('Canvas Actions', () => {
 		WorkflowPage.getters.nodeViewBackground().click({ force: true });
 	});
 
-
 	it('should add a connected node using plus endpoint', () => {
 		WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
 		cy.get('.plus-endpoint').should('be.visible').click();
@@ -83,6 +82,34 @@ describe('Canvas Actions', () => {
 		WorkflowPage.getters.nodeConnections().should('have.length', 1);
 	});
 
+	it('should add a connected node dragging from node creator', () => {
+		WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
+		cy.get('.plus-endpoint').should('be.visible').click();
+		WorkflowPage.getters.nodeCreatorSearchBar().should('be.visible');
+		WorkflowPage.getters.nodeCreatorSearchBar().type(CODE_NODE_NAME);
+		cy.drag(WorkflowPage.getters.nodeCreatorNodeItems().first(), [100, 100], {
+			realMouse: true,
+			abs: true,
+		});
+		cy.get('body').type('{esc}');
+		WorkflowPage.getters.canvasNodes().should('have.length', 2);
+		WorkflowPage.getters.nodeConnections().should('have.length', 1);
+	});
+
+	it('should open a category when trying to drag and drop it on the canvas', () => {
+		WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
+		cy.get('.plus-endpoint').should('be.visible').click();
+		WorkflowPage.getters.nodeCreatorSearchBar().should('be.visible');
+		WorkflowPage.getters.nodeCreatorSearchBar().type(CODE_NODE_NAME);
+		cy.drag(WorkflowPage.getters.nodeCreatorActionItems().first(), [100, 100], {
+			realMouse: true,
+			abs: true,
+		});
+		WorkflowPage.getters.nodeCreatorCategoryItems().its('length').should('be.gt', 0);
+		WorkflowPage.getters.canvasNodes().should('have.length', 1);
+		WorkflowPage.getters.nodeConnections().should('have.length', 0);
+	});
+
 	it('should add disconnected node if nothing is selected', () => {
 		WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
 		// Deselect nodes
@@ -95,16 +122,21 @@ describe('Canvas Actions', () => {
 	it('should add node between two connected nodes', () => {
 		WorkflowPage.actions.addNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME);
 		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
-		WorkflowPage.actions.addNodeToCanvas(SET_NODE_NAME);
+		WorkflowPage.actions.addNodeToCanvas(EDIT_FIELDS_SET_NODE_NAME);
 		WorkflowPage.actions.zoomToFit();
-		WorkflowPage.actions.addNodeBetweenNodes(CODE_NODE_NAME, SET_NODE_NAME, HTTP_REQUEST_NODE_NAME);
+		WorkflowPage.actions.addNodeBetweenNodes(
+			CODE_NODE_NAME,
+			EDIT_FIELDS_SET_NODE_NAME,
+			HTTP_REQUEST_NODE_NAME,
+		);
 		WorkflowPage.getters.canvasNodes().should('have.length', 4);
 		WorkflowPage.getters.nodeConnections().should('have.length', 3);
 		// And last node should be pushed to the right
 		WorkflowPage.getters
 			.canvasNodes()
 			.last()
-			.should('have.attr', 'style', 'left: 860px; top: 260px;');
+			.should('have.css', 'left', '860px')
+			.should('have.css', 'top', '220px');
 	});
 
 	it('should delete connections by pressing the delete button', () => {
@@ -124,30 +156,64 @@ describe('Canvas Actions', () => {
 		WorkflowPage.getters.nodeConnections().should('have.length', 0);
 	});
 
-	it('should execute node', () => {
-		WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
-		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
-		WorkflowPage.getters
-			.canvasNodes()
-			.last()
-			.find('[data-test-id="execute-node-button"]')
-			.click({ force: true });
-		WorkflowPage.getters.successToast().should('contain', 'Node executed successfully');
+	describe('Node hover actions', () => {
+		it('should execute node', () => {
+			WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
+			WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
+			WorkflowPage.getters
+				.canvasNodes()
+				.last()
+				.findChildByTestId('execute-node-button')
+				.click({ force: true });
+			WorkflowPage.actions.executeNode(CODE_NODE_NAME);
+			WorkflowPage.getters.successToast().should('have.length', 2);
+			WorkflowPage.getters.successToast().should('contain.text', 'Node executed successfully');
+		});
+
+		it('should disable and enable node', () => {
+			WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
+			WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
+			const disableButton = WorkflowPage.getters
+				.canvasNodes()
+				.last()
+				.findChildByTestId('disable-node-button');
+			disableButton.click({ force: true });
+			WorkflowPage.getters.disabledNodes().should('have.length', 1);
+			disableButton.click({ force: true });
+			WorkflowPage.getters.disabledNodes().should('have.length', 0);
+		});
+
+		it('should delete node', () => {
+			WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
+			WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
+			WorkflowPage.getters
+				.canvasNodes()
+				.last()
+				.find('[data-test-id="delete-node-button"]')
+				.click({ force: true });
+			WorkflowPage.getters.canvasNodes().should('have.length', 1);
+		});
 	});
 
 	it('should copy selected nodes', () => {
 		WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
 		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
 		WorkflowPage.actions.selectAll();
+
 		WorkflowPage.actions.hitCopy();
 		WorkflowPage.getters.successToast().should('contain', 'Copied!');
+
+		WorkflowPage.actions.copyNode(CODE_NODE_NAME);
+		WorkflowPage.getters.successToast().should('contain', 'Copied!');
 	});
 
-	it('should select all nodes', () => {
+	it('should select/deselect all nodes', () => {
 		WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
 		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
 		WorkflowPage.actions.selectAll();
 		WorkflowPage.getters.selectedNodes().should('have.length', 2);
+		WorkflowPage.actions.deselectAll();
+		WorkflowPage.getters.selectedNodes().should('have.length', 0);
 	});
 
 	it('should select nodes using arrow keys', () => {
@@ -169,4 +235,29 @@ describe('Canvas Actions', () => {
 		cy.get('body').type('{shift}', { release: false }).type('{leftArrow}');
 		WorkflowPage.getters.selectedNodes().should('have.length', 2);
 	});
+
+	it('should not break lasso selection when dragging node action buttons', () => {
+		WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
+		WorkflowPage.getters
+			.canvasNodes()
+			.last()
+			.findChildByTestId('execute-node-button')
+			.as('executeNodeButton');
+		cy.drag('@executeNodeButton', [200, 200]);
+		WorkflowPage.actions.testLassoSelection([100, 100], [200, 200]);
+	});
+
+	it('should not break lasso selection with multiple clicks on node action buttons', () => {
+		WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
+		WorkflowPage.actions.testLassoSelection([100, 100], [200, 200]);
+		WorkflowPage.getters.canvasNodes().last().as('lastNode');
+		cy.get('@lastNode').findChildByTestId('execute-node-button').as('executeNodeButton');
+		for (let i = 0; i < 20; i++) {
+			cy.get('@lastNode').realHover();
+			cy.get('@executeNodeButton').should('be.visible');
+			cy.get('@executeNodeButton').realTouch();
+			cy.getByTestId('execute-workflow-button').realHover();
+			WorkflowPage.actions.testLassoSelection([100, 100], [200, 200]);
+		}
+	});
 });
diff --git a/cypress/e2e/12-canvas.cy.ts b/cypress/e2e/12-canvas.cy.ts
index 5f2fe8db07c37..c1e06c107d636 100644
--- a/cypress/e2e/12-canvas.cy.ts
+++ b/cypress/e2e/12-canvas.cy.ts
@@ -3,50 +3,61 @@ import {
 	MANUAL_TRIGGER_NODE_DISPLAY_NAME,
 	CODE_NODE_NAME,
 	SCHEDULE_TRIGGER_NODE_NAME,
-	SET_NODE_NAME,
+	EDIT_FIELDS_SET_NODE_NAME,
 	SWITCH_NODE_NAME,
-	IF_NODE_NAME,
 	MERGE_NODE_NAME,
-	HTTP_REQUEST_NODE_NAME,
 } from './../constants';
 import { WorkflowPage as WorkflowPageClass } from '../pages/workflow';
+import { NDV, WorkflowExecutionsTab } from '../pages';
 
 const WorkflowPage = new WorkflowPageClass();
-
+const ExecutionsTab = new WorkflowExecutionsTab();
+const NDVDialog = new NDV();
 const DEFAULT_ZOOM_FACTOR = 1;
 const ZOOM_IN_X1_FACTOR = 1.25; // Zoom in factor after one click
 const ZOOM_IN_X2_FACTOR = 1.5625; // Zoom in factor after two clicks
 const ZOOM_OUT_X1_FACTOR = 0.8;
 const ZOOM_OUT_X2_FACTOR = 0.64;
+
+const PINCH_ZOOM_IN_FACTOR = 1.05702;
+const PINCH_ZOOM_OUT_FACTOR = 0.946058;
 const RENAME_NODE_NAME = 'Something else';
+const RENAME_NODE_NAME2 = 'Something different';
 
 describe('Canvas Node Manipulation and Navigation', () => {
-	before(() => {
-		cy.resetAll();
-		cy.skipSetup();
-	});
-
 	beforeEach(() => {
 		WorkflowPage.actions.visit();
 	});
 
-
 	it('should add switch node and test connections', () => {
-		WorkflowPage.actions.addNodeToCanvas(SWITCH_NODE_NAME, true);
+		const desiredOutputs = 4;
+		WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME, true);
+		WorkflowPage.actions.addNodeToCanvas(SWITCH_NODE_NAME, true, true);
+
+		for (let i = 0; i < desiredOutputs; i++) {
+			cy.contains('Add Routing Rule').click();
+		}
 
-		// Switch has 4 output endpoints
-		for (let i = 0; i < 4; i++) {
+		NDVDialog.actions.close();
+		for (let i = 0; i < desiredOutputs; i++) {
 			WorkflowPage.getters.canvasNodePlusEndpointByName(SWITCH_NODE_NAME, i).click({ force: true });
 			WorkflowPage.getters.nodeCreatorSearchBar().should('be.visible');
-			WorkflowPage.actions.addNodeToCanvas(SET_NODE_NAME, false);
+			WorkflowPage.actions.addNodeToCanvas(EDIT_FIELDS_SET_NODE_NAME, false);
 			WorkflowPage.actions.zoomToFit();
 		}
+		WorkflowPage.getters.nodeViewBackground().click({ force: true });
+		WorkflowPage.getters.canvasNodePlusEndpointByName(`${EDIT_FIELDS_SET_NODE_NAME}3`).click();
+		WorkflowPage.actions.addNodeToCanvas(SWITCH_NODE_NAME, false);
 		WorkflowPage.actions.saveWorkflowOnButtonClick();
 		cy.reload();
 		cy.waitForLoad();
+		// Make sure outputless switch was connected correctly
+		cy.get(
+			`[data-target-node="${SWITCH_NODE_NAME}1"][data-source-node="${EDIT_FIELDS_SET_NODE_NAME}3"]`,
+		).should('be.visible');
 		// Make sure all connections are there after reload
-		for (let i = 0; i < 4; i++) {
-			const setName = `${SET_NODE_NAME}${i > 0 ? i : ''}`;
+		for (let i = 0; i < desiredOutputs; i++) {
+			const setName = `${EDIT_FIELDS_SET_NODE_NAME}${i > 0 ? i : ''}`;
 			WorkflowPage.getters
 				.canvasNodeInputEndpointByName(setName)
 				.should('have.class', 'jtk-endpoint-connected');
@@ -57,7 +68,7 @@ describe('Canvas Node Manipulation and Navigation', () => {
 		WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
 		WorkflowPage.getters.canvasNodeByName(MANUAL_TRIGGER_NODE_DISPLAY_NAME).click();
 		for (let i = 0; i < 2; i++) {
-			WorkflowPage.actions.addNodeToCanvas(SET_NODE_NAME, true);
+			WorkflowPage.actions.addNodeToCanvas(EDIT_FIELDS_SET_NODE_NAME, true);
 			WorkflowPage.getters.nodeViewBackground().click(600 + i * 100, 200, { force: true });
 		}
 		WorkflowPage.actions.zoomToFit();
@@ -68,18 +79,18 @@ describe('Canvas Node Manipulation and Navigation', () => {
 		// Connect manual to Set1
 		cy.draganddrop(
 			WorkflowPage.getters.getEndpointSelector('output', MANUAL_TRIGGER_NODE_DISPLAY_NAME),
-			WorkflowPage.getters.getEndpointSelector('input', `${SET_NODE_NAME}1`),
+			WorkflowPage.getters.getEndpointSelector('input', `${EDIT_FIELDS_SET_NODE_NAME}1`),
 		);
 
 		cy.get('.rect-input-endpoint.jtk-endpoint-connected').should('have.length', 2);
 
 		// Connect Set1 and Set2 to merge
 		cy.draganddrop(
-			WorkflowPage.getters.getEndpointSelector('plus', SET_NODE_NAME),
+			WorkflowPage.getters.getEndpointSelector('plus', EDIT_FIELDS_SET_NODE_NAME),
 			WorkflowPage.getters.getEndpointSelector('input', MERGE_NODE_NAME, 0),
 		);
 		cy.draganddrop(
-			WorkflowPage.getters.getEndpointSelector('plus', `${SET_NODE_NAME}1`),
+			WorkflowPage.getters.getEndpointSelector('plus', `${EDIT_FIELDS_SET_NODE_NAME}1`),
 			WorkflowPage.getters.getEndpointSelector('input', MERGE_NODE_NAME, 1),
 		);
 
@@ -102,7 +113,7 @@ describe('Canvas Node Manipulation and Navigation', () => {
 		WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
 		WorkflowPage.getters.canvasNodeByName(MANUAL_TRIGGER_NODE_DISPLAY_NAME).click();
 		for (let i = 0; i < 3; i++) {
-			WorkflowPage.actions.addNodeToCanvas(SET_NODE_NAME, true);
+			WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME, true);
 		}
 		WorkflowPage.actions.zoomToFit();
 		WorkflowPage.actions.executeWorkflow();
@@ -111,7 +122,7 @@ describe('Canvas Node Manipulation and Navigation', () => {
 		cy.get('.data-count').should('have.length', 4);
 		cy.get('.plus-draggable-endpoint').should('have.class', 'ep-success');
 
-		WorkflowPage.actions.addNodeToCanvas(SET_NODE_NAME);
+		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
 		WorkflowPage.actions.zoomToFit();
 
 		cy.get('.plus-draggable-endpoint').filter(':visible').should('not.have.class', 'ep-success');
@@ -119,13 +130,10 @@ describe('Canvas Node Manipulation and Navigation', () => {
 		cy.get('.jtk-connector').should('have.length', 4);
 	});
 
-	it('should delete node using node action button', () => {
+	it('should delete node using context menu', () => {
 		WorkflowPage.actions.addNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME);
 		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
-		WorkflowPage.getters
-			.canvasNodeByName(CODE_NODE_NAME)
-			.find('[data-test-id=delete-node-button]')
-			.click({ force: true });
+		WorkflowPage.actions.deleteNodeFromContextMenu(CODE_NODE_NAME);
 		WorkflowPage.getters.canvasNodes().should('have.length', 1);
 		WorkflowPage.getters.nodeConnections().should('have.length', 0);
 	});
@@ -142,7 +150,7 @@ describe('Canvas Node Manipulation and Navigation', () => {
 	it('should delete node between two connected nodes', () => {
 		WorkflowPage.actions.addNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME);
 		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
-		WorkflowPage.actions.addNodeToCanvas(SET_NODE_NAME);
+		WorkflowPage.actions.addNodeToCanvas(EDIT_FIELDS_SET_NODE_NAME);
 		WorkflowPage.getters.canvasNodes().should('have.length', 3);
 		WorkflowPage.getters.nodeConnections().should('have.length', 2);
 		WorkflowPage.getters.canvasNodeByName(CODE_NODE_NAME).click();
@@ -152,13 +160,38 @@ describe('Canvas Node Manipulation and Navigation', () => {
 		WorkflowPage.getters.nodeConnections().should('have.length', 1);
 	});
 
-	it('should delete multiple nodes', () => {
+	it('should delete multiple nodes (context menu or shortcut)', () => {
+		WorkflowPage.actions.addNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME);
+		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
+		cy.wait(500);
+		WorkflowPage.actions.selectAll();
+		cy.get('body').type('{backspace}');
+		WorkflowPage.getters.canvasNodes().should('have.length', 0);
+
+		WorkflowPage.actions.addNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME);
+		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
+		cy.wait(500);
+		WorkflowPage.actions.selectAllFromContextMenu();
+		WorkflowPage.actions.openContextMenu();
+		WorkflowPage.actions.contextMenuAction('delete');
+		WorkflowPage.getters.canvasNodes().should('have.length', 0);
+	});
+
+	it('should delete multiple nodes (context menu or shortcut)', () => {
 		WorkflowPage.actions.addNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME);
 		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
 		cy.wait(500);
 		WorkflowPage.actions.selectAll();
 		cy.get('body').type('{backspace}');
 		WorkflowPage.getters.canvasNodes().should('have.length', 0);
+
+		WorkflowPage.actions.addNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME);
+		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
+		cy.wait(500);
+		WorkflowPage.actions.selectAllFromContextMenu();
+		WorkflowPage.actions.openContextMenu();
+		WorkflowPage.actions.contextMenuAction('delete');
+		WorkflowPage.getters.canvasNodes().should('have.length', 0);
 	});
 
 	it('should move node', () => {
@@ -166,11 +199,13 @@ describe('Canvas Node Manipulation and Navigation', () => {
 		WorkflowPage.getters.canvasNodeByName(MANUAL_TRIGGER_NODE_DISPLAY_NAME).click();
 		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
 		WorkflowPage.actions.zoomToFit();
-		cy.drag('[data-test-id="canvas-node"].jtk-drag-selected', [50, 150]);
+
+		cy.drag('[data-test-id="canvas-node"].jtk-drag-selected', [50, 150], { clickToFinish: true });
 		WorkflowPage.getters
 			.canvasNodes()
 			.last()
-			.should('have.attr', 'style', 'left: 740px; top: 360px;');
+			.should('have.css', 'left', '740px')
+			.should('have.css', 'top', '320px');
 	});
 
 	it('should zoom in', () => {
@@ -211,6 +246,30 @@ describe('Canvas Node Manipulation and Navigation', () => {
 			);
 	});
 
+	it('should zoom using scroll or pinch gesture', () => {
+		WorkflowPage.actions.pinchToZoom(1, 'zoomIn');
+		WorkflowPage.getters
+			.nodeView()
+			.should(
+				'have.css',
+				'transform',
+				`matrix(${PINCH_ZOOM_IN_FACTOR}, 0, 0, ${PINCH_ZOOM_IN_FACTOR}, 0, 0)`,
+			);
+
+		WorkflowPage.actions.pinchToZoom(1, 'zoomOut');
+		// Zoom in 1x + Zoom out 1x should reset to default (=1)
+		WorkflowPage.getters.nodeView().should('have.css', 'transform', `matrix(1, 0, 0, 1, 0, 0)`);
+
+		WorkflowPage.actions.pinchToZoom(1, 'zoomOut');
+		WorkflowPage.getters
+			.nodeView()
+			.should(
+				'have.css',
+				'transform',
+				`matrix(${PINCH_ZOOM_OUT_FACTOR}, 0, 0, ${PINCH_ZOOM_OUT_FACTOR}, 0, 0)`,
+			);
+	});
+
 	it('should reset zoom', () => {
 		// Reset zoom should not appear until zoom level changed
 		WorkflowPage.getters.resetZoomButton().should('not.exist');
@@ -236,39 +295,59 @@ describe('Canvas Node Manipulation and Navigation', () => {
 		WorkflowPage.getters.canvasNodes().last().should('be.visible');
 	});
 
-	it('should disable node by pressing the disable button', () => {
-		WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
-		WorkflowPage.getters.canvasNodeByName(MANUAL_TRIGGER_NODE_DISPLAY_NAME).click();
-		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
-		WorkflowPage.getters
-			.canvasNodes()
-			.last()
-			.find('[data-test-id="disable-node-button"]')
-			.click({ force: true });
-		WorkflowPage.getters.disabledNodes().should('have.length', 1);
-	});
-
-	it('should disable node using keyboard shortcut', () => {
+	it('should disable node (context menu or shortcut)', () => {
 		WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
 		WorkflowPage.getters.canvasNodeByName(MANUAL_TRIGGER_NODE_DISPLAY_NAME).click();
 		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
 		WorkflowPage.getters.canvasNodes().last().click();
 		WorkflowPage.actions.hitDisableNodeShortcut();
 		WorkflowPage.getters.disabledNodes().should('have.length', 1);
+
+		WorkflowPage.actions.disableNode(CODE_NODE_NAME);
+		WorkflowPage.getters.disabledNodes().should('have.length', 0);
 	});
 
-	it('should disable multiple nodes', () => {
+	it('should disable multiple nodes (context menu or shortcut)', () => {
 		WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
 		WorkflowPage.getters.canvasNodeByName(MANUAL_TRIGGER_NODE_DISPLAY_NAME).click();
 		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
 		cy.get('body').type('{esc}');
 		cy.get('body').type('{esc}');
+
+		// Keyboard shortcut
 		WorkflowPage.actions.selectAll();
 		WorkflowPage.actions.hitDisableNodeShortcut();
 		WorkflowPage.getters.disabledNodes().should('have.length', 2);
+		WorkflowPage.actions.hitDisableNodeShortcut();
+		WorkflowPage.getters.disabledNodes().should('have.length', 0);
+		WorkflowPage.actions.deselectAll();
+		WorkflowPage.getters.canvasNodeByName(MANUAL_TRIGGER_NODE_DISPLAY_NAME).click();
+		WorkflowPage.actions.hitDisableNodeShortcut();
+		WorkflowPage.getters.disabledNodes().should('have.length', 1);
+		WorkflowPage.actions.selectAll();
+		WorkflowPage.actions.hitDisableNodeShortcut();
+		WorkflowPage.getters.disabledNodes().should('have.length', 2);
+
+		// Context menu
+		WorkflowPage.actions.selectAll();
+		WorkflowPage.actions.openContextMenu();
+		WorkflowPage.actions.contextMenuAction('toggle_activation');
+		WorkflowPage.getters.disabledNodes().should('have.length', 0);
+		WorkflowPage.actions.openContextMenu();
+		WorkflowPage.actions.contextMenuAction('toggle_activation');
+		WorkflowPage.getters.disabledNodes().should('have.length', 2);
+		WorkflowPage.actions.deselectAll();
+		WorkflowPage.getters.canvasNodeByName(MANUAL_TRIGGER_NODE_DISPLAY_NAME).click();
+		WorkflowPage.actions.openContextMenu();
+		WorkflowPage.actions.contextMenuAction('toggle_activation');
+		WorkflowPage.getters.disabledNodes().should('have.length', 1);
+		WorkflowPage.actions.selectAll();
+		WorkflowPage.actions.openContextMenu();
+		WorkflowPage.actions.contextMenuAction('toggle_activation');
+		WorkflowPage.getters.disabledNodes().should('have.length', 2);
 	});
 
-	it('should rename node using keyboard shortcut', () => {
+	it('should rename node (context menu or shortcut)', () => {
 		WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
 		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
 		WorkflowPage.getters.canvasNodes().last().click();
@@ -277,18 +356,97 @@ describe('Canvas Node Manipulation and Navigation', () => {
 		cy.get('body').type(RENAME_NODE_NAME);
 		cy.get('body').type('{enter}');
 		WorkflowPage.getters.canvasNodeByName(RENAME_NODE_NAME).should('exist');
+
+		WorkflowPage.actions.renameNode(RENAME_NODE_NAME);
+		cy.get('.rename-prompt').should('be.visible');
+		cy.get('body').type(RENAME_NODE_NAME2);
+		cy.get('body').type('{enter}');
+		WorkflowPage.getters.canvasNodeByName(RENAME_NODE_NAME2).should('exist');
 	});
 
-	it('should duplicate node', () => {
+	it('should duplicate nodes (context menu or shortcut)', () => {
 		WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
 		WorkflowPage.getters.canvasNodeByName(MANUAL_TRIGGER_NODE_DISPLAY_NAME).click();
 		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
-		WorkflowPage.getters
-			.canvasNodes()
-			.last()
-			.find('[data-test-id="duplicate-node-button"]')
-			.click({ force: true });
+		WorkflowPage.actions.duplicateNode(CODE_NODE_NAME);
 		WorkflowPage.getters.canvasNodes().should('have.length', 3);
 		WorkflowPage.getters.nodeConnections().should('have.length', 1);
+
+		WorkflowPage.actions.selectAll();
+		WorkflowPage.actions.hitDuplicateNodeShortcut();
+		WorkflowPage.getters.canvasNodes().should('have.length', 5);
+	});
+
+	// ADO-1240: Connections would get deleted after activating and deactivating NodeView
+	it('should preserve connections after rename & node-view switch', () => {
+		WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
+		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
+		WorkflowPage.actions.executeWorkflow();
+
+		ExecutionsTab.actions.switchToExecutionsTab();
+		ExecutionsTab.getters.successfulExecutionListItems().should('have.length', 1);
+
+		ExecutionsTab.actions.switchToEditorTab();
+
+		ExecutionsTab.actions.switchToExecutionsTab();
+		ExecutionsTab.getters.successfulExecutionListItems().should('have.length', 1);
+
+		ExecutionsTab.actions.switchToEditorTab();
+		WorkflowPage.getters.canvasNodes().should('have.length', 2);
+
+		WorkflowPage.getters.canvasNodes().last().click();
+		cy.get('body').trigger('keydown', { key: 'F2' });
+		cy.get('.rename-prompt').should('be.visible');
+		cy.get('body').type(RENAME_NODE_NAME);
+		cy.get('body').type('{enter}');
+		WorkflowPage.getters.canvasNodeByName(RENAME_NODE_NAME).should('exist');
+		// Make sure all connections are there after save & reload
+		WorkflowPage.actions.saveWorkflowOnButtonClick();
+		cy.reload();
+		cy.waitForLoad();
+		WorkflowPage.getters.canvasNodes().should('have.length', 2);
+		cy.get('.rect-input-endpoint.jtk-endpoint-connected').should('have.length', 1);
+	});
+
+	it('should remove unknown credentials on pasting workflow', () => {
+		cy.fixture('workflow-with-unknown-credentials.json').then((data) => {
+			cy.get('body').paste(JSON.stringify(data));
+
+			WorkflowPage.getters.canvasNodes().should('have.have.length', 2);
+
+			WorkflowPage.actions.openNodeFromContextMenu('n8n');
+			cy.get('[class*=hasIssues]').should('have.length', 1);
+			NDVDialog.actions.close();
+		});
+	});
+
+	it('should render connections correctly if unkown nodes are present', () => {
+		const unknownNodeName = 'Unknown node';
+		cy.createFixtureWorkflow('workflow-with-unknown-nodes.json', 'Unknown nodes');
+
+		WorkflowPage.getters.canvasNodeByName(`${unknownNodeName} 1`).should('exist');
+		WorkflowPage.getters.canvasNodeByName(`${unknownNodeName} 2`).should('exist');
+		WorkflowPage.actions.zoomToFit();
+
+		cy.draganddrop(
+			WorkflowPage.getters.getEndpointSelector('plus', `${unknownNodeName} 1`),
+			WorkflowPage.getters.getEndpointSelector('input', EDIT_FIELDS_SET_NODE_NAME),
+		);
+
+		cy.draganddrop(
+			WorkflowPage.getters.getEndpointSelector('plus', `${unknownNodeName} 2`),
+			WorkflowPage.getters.getEndpointSelector('input', `${EDIT_FIELDS_SET_NODE_NAME}1`),
+		);
+
+		WorkflowPage.actions.executeWorkflow();
+		cy.contains('Unrecognized node type').should('be.visible');
+
+		WorkflowPage.actions.deselectAll();
+		WorkflowPage.actions.deleteNodeFromContextMenu(`${unknownNodeName} 1`);
+		WorkflowPage.actions.deleteNodeFromContextMenu(`${unknownNodeName} 2`);
+
+		WorkflowPage.actions.executeWorkflow();
+
+		cy.contains('Unrecognized node type').should('not.exist');
 	});
 });
diff --git a/cypress/e2e/13-pinning.cy.ts b/cypress/e2e/13-pinning.cy.ts
index 6f1c328fd9c6b..a9ccc7881857e 100644
--- a/cypress/e2e/13-pinning.cy.ts
+++ b/cypress/e2e/13-pinning.cy.ts
@@ -1,8 +1,9 @@
 import {
 	HTTP_REQUEST_NODE_NAME,
-	MANUAL_TRIGGER_NODE_DISPLAY_NAME,
+	MANUAL_TRIGGER_NODE_NAME,
 	PIPEDRIVE_NODE_NAME,
-	SET_NODE_NAME,
+	EDIT_FIELDS_SET_NODE_NAME,
+	BACKEND_BASE_URL,
 } from '../constants';
 import { WorkflowPage, NDV } from '../pages';
 
@@ -10,11 +11,6 @@ const workflowPage = new WorkflowPage();
 const ndv = new NDV();
 
 describe('Data pinning', () => {
-	before(() => {
-		cy.resetAll();
-		cy.skipSetup();
-	});
-
 	beforeEach(() => {
 		workflowPage.actions.visit();
 	});
@@ -67,15 +63,89 @@ describe('Data pinning', () => {
 
 		workflowPage.actions.saveWorkflowOnButtonClick();
 
-		cy.reload();
 		workflowPage.actions.openNode('Schedule Trigger');
 
 		ndv.getters.outputTableHeaders().first().should('include.text', 'test');
 		ndv.getters.outputTbodyCell(1, 0).should('include.text', 1);
 	});
 
+	it('should display pin data edit button for Webhook node', () => {
+		workflowPage.actions.addInitialNodeToCanvas('Webhook', { keepNdvOpen: true });
+
+		ndv.getters
+			.runDataPaneHeader()
+			.find('button')
+			.filter(':visible')
+			.should('have.attr', 'title', 'Edit Output');
+	});
+
+	it('Should be duplicating pin data when duplicating node', () => {
+		workflowPage.actions.addInitialNodeToCanvas('Schedule Trigger');
+		workflowPage.actions.addNodeToCanvas(EDIT_FIELDS_SET_NODE_NAME, true, true);
+		ndv.getters.container().should('be.visible');
+		ndv.getters.pinDataButton().should('not.exist');
+		ndv.getters.editPinnedDataButton().should('be.visible');
+
+		ndv.actions.setPinnedData([{ test: 1 }]);
+		ndv.actions.close();
+
+		workflowPage.actions.duplicateNode(EDIT_FIELDS_SET_NODE_NAME);
+
+		workflowPage.actions.saveWorkflowOnButtonClick();
+
+		workflowPage.actions.openNode('Edit Fields1');
+
+		ndv.getters.outputTableHeaders().first().should('include.text', 'test');
+		ndv.getters.outputTbodyCell(1, 0).should('include.text', 1);
+	});
+
+	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.getters
+			.contextMenuAction('toggle_pin')
+			.parent()
+			.should('have.class', 'is-disabled');
+
+		// Unpin using context menu
+		workflowPage.actions.openNode(EDIT_FIELDS_SET_NODE_NAME);
+		ndv.actions.setPinnedData([{ test: 1 }]);
+		ndv.actions.close();
+		workflowPage.actions.pinNode(EDIT_FIELDS_SET_NODE_NAME);
+		workflowPage.actions.openNode(EDIT_FIELDS_SET_NODE_NAME);
+		ndv.getters.nodeOutputHint().should('exist');
+		ndv.actions.close();
+
+		// Unpin using shortcut
+		workflowPage.actions.openNode(EDIT_FIELDS_SET_NODE_NAME);
+		ndv.actions.setPinnedData([{ test: 1 }]);
+		ndv.actions.close();
+		workflowPage.getters.canvasNodeByName(EDIT_FIELDS_SET_NODE_NAME).click();
+		workflowPage.actions.hitPinNodeShortcut();
+		workflowPage.actions.openNode(EDIT_FIELDS_SET_NODE_NAME);
+		ndv.getters.nodeOutputHint().should('exist');
+	});
+
+	it('Should show an error when maximum pin data size is exceeded', () => {
+		workflowPage.actions.addInitialNodeToCanvas('Schedule Trigger');
+		workflowPage.actions.addNodeToCanvas(EDIT_FIELDS_SET_NODE_NAME, true, true);
+		ndv.getters.container().should('be.visible');
+		ndv.getters.pinDataButton().should('not.exist');
+		ndv.getters.editPinnedDataButton().should('be.visible');
+
+		ndv.actions.pastePinnedData([
+			{
+				test: '1'.repeat(Cypress.env('MAX_PINNED_DATA_SIZE')),
+			},
+		]);
+		workflowPage.getters
+			.errorToast()
+			.should('contain', 'Workflow has reached the maximum allowed pinned data size');
+	});
+
 	it('Should be able to reference paired items in a node located before pinned data', () => {
-		workflowPage.actions.addInitialNodeToCanvas(MANUAL_TRIGGER_NODE_DISPLAY_NAME);
+		workflowPage.actions.addInitialNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
 		workflowPage.actions.addNodeToCanvas(HTTP_REQUEST_NODE_NAME, true, true);
 		ndv.actions.setPinnedData([{ http: 123 }]);
 		ndv.actions.close();
@@ -84,24 +154,58 @@ describe('Data pinning', () => {
 		ndv.actions.setPinnedData(Array(3).fill({ pipedrive: 123 }));
 		ndv.actions.close();
 
-		workflowPage.actions.addNodeToCanvas(SET_NODE_NAME, true, true);
+		workflowPage.actions.addNodeToCanvas(EDIT_FIELDS_SET_NODE_NAME, true, true);
 		setExpressionOnStringValueInSet(`{{ $('${HTTP_REQUEST_NODE_NAME}').item`);
 
 		const output = '[Object: {"json": {"http": 123}, "pairedItem": {"item": 0}}]';
 
 		cy.get('div').contains(output).should('be.visible');
 	});
+
+	it('should use pin data in manual executions that are started by a webhook', () => {
+		cy.createFixtureWorkflow('Test_workflow_webhook_with_pin_data.json', 'Test');
+
+		workflowPage.actions.executeWorkflow();
+
+		cy.request('GET', `${BACKEND_BASE_URL}/webhook-test/b0d79ddb-df2d-49b1-8555-9fa2b482608f`).then(
+			(response) => {
+				expect(response.status).to.eq(200);
+			},
+		);
+
+		workflowPage.actions.openNode('End');
+
+		ndv.getters.outputTableRow(1).should('exist');
+		ndv.getters.outputTableRow(1).should('have.text', 'pin-overwritten');
+	});
+
+	it('should not use pin data in production executions that are started by a webhook', () => {
+		cy.createFixtureWorkflow('Test_workflow_webhook_with_pin_data.json', 'Test');
+
+		workflowPage.actions.activateWorkflow();
+		cy.request('GET', `${BACKEND_BASE_URL}/webhook/b0d79ddb-df2d-49b1-8555-9fa2b482608f`).then(
+			(response) => {
+				expect(response.status).to.eq(200);
+				// Assert that we get the data hard coded in the edit fields node,
+				// instead of the data pinned in said node.
+				expect(response.body).to.deep.equal({
+					nodeData: 'pin',
+				});
+			},
+		);
+	});
 });
 
 function setExpressionOnStringValueInSet(expression: string) {
-	cy.get('button').contains('Execute node').click();
-	cy.get('input[placeholder="Add Value"]').click();
-	cy.get('span').contains('String').click();
+	cy.get('button').contains('Test step').click();
 
-	ndv.getters.nthParam(3).contains('Expression').invoke('show').click();
+	ndv.getters.assignmentCollectionAdd('assignments').click();
+	ndv.getters.assignmentValue('assignments').contains('Expression').invoke('show').click();
 
 	ndv.getters
 		.inlineExpressionEditorInput()
 		.clear()
-		.type(expression, { parseSpecialCharSequences: false });
+		.type(expression, { parseSpecialCharSequences: false })
+		// hide autocomplete
+		.type('{esc}');
 }
diff --git a/cypress/e2e/1338-ADO-ndv-missing-input-panel.cy.ts b/cypress/e2e/1338-ADO-ndv-missing-input-panel.cy.ts
new file mode 100644
index 0000000000000..046d4d809d1bd
--- /dev/null
+++ b/cypress/e2e/1338-ADO-ndv-missing-input-panel.cy.ts
@@ -0,0 +1,25 @@
+import { v4 as uuid } from 'uuid';
+import { NDV, WorkflowPage as WorkflowPageClass } from '../pages';
+
+const workflowPage = new WorkflowPageClass();
+const ndv = new NDV();
+
+describe('ADO-1338-ndv-missing-input-panel', () => {
+	beforeEach(() => {
+		workflowPage.actions.visit();
+	});
+
+	it('should show the input and output panels when node is missing input and output data', () => {
+		cy.createFixtureWorkflow('Test_ado_1338.json', uuid());
+
+		// Execute the workflow
+		workflowPage.getters.zoomToFitButton().click();
+		workflowPage.getters.executeWorkflowButton().click();
+		// Check success toast (works because Cypress waits enough for the element to show after the http request node has finished)
+		workflowPage.getters.successToast().should('be.visible');
+
+		workflowPage.actions.openNode('Discourse1');
+		ndv.getters.inputPanel().should('be.visible');
+		ndv.getters.outputPanel().should('be.visible');
+	});
+});
diff --git a/cypress/e2e/14-data-transformation-expressions.cy.ts b/cypress/e2e/14-data-transformation-expressions.cy.ts
index cb08d51e5b1e8..21c958d691fec 100644
--- a/cypress/e2e/14-data-transformation-expressions.cy.ts
+++ b/cypress/e2e/14-data-transformation-expressions.cy.ts
@@ -1,35 +1,25 @@
 import { WorkflowPage, NDV } from '../pages';
+import { getVisibleSelect } from '../utils';
 
 const wf = new WorkflowPage();
 const ndv = new NDV();
 
 describe('Data transformation expressions', () => {
-	before(() => {
-		cy.resetAll();
-		cy.skipSetup();
-	});
-
 	beforeEach(() => {
 		wf.actions.visit();
-
-		cy.window().then(
-			(win) => {
-				// @ts-ignore
-				win.preventNodeViewBeforeUnload = true;
-			},
-		);
 	});
 
 	it('$json + native string methods', () => {
 		wf.actions.addInitialNodeToCanvas('Schedule Trigger', { keepNdvOpen: true });
 		ndv.actions.setPinnedData([{ myStr: 'Monday' }]);
 		ndv.actions.close();
-		addSet();
+		addEditFields();
 
 		const input = '{{$json.myStr.toLowerCase() + " is " + "today".toUpperCase()';
 		const output = 'monday is TODAY';
 
 		ndv.getters.inlineExpressionEditorInput().clear().type(input);
+		ndv.getters.inlineExpressionEditorOutput().should('have.text', output);
 		ndv.actions.execute();
 		ndv.getters.outputDataContainer().should('be.visible');
 		ndv.getters.outputDataContainer().contains(output);
@@ -39,12 +29,13 @@ describe('Data transformation expressions', () => {
 		wf.actions.addInitialNodeToCanvas('Schedule Trigger', { keepNdvOpen: true });
 		ndv.actions.setPinnedData([{ myStr: 'hello@n8n.io is an email' }]);
 		ndv.actions.close();
-		addSet();
+		addEditFields();
 
 		const input = '{{$json.myStr.extractEmail() + " " + $json.myStr.isEmpty()';
 		const output = 'hello@n8n.io false';
 
 		ndv.getters.inlineExpressionEditorInput().clear().type(input);
+		ndv.getters.inlineExpressionEditorOutput().should('have.text', output);
 		ndv.actions.execute();
 		ndv.getters.outputDataContainer().should('be.visible');
 		ndv.getters.outputDataContainer().contains(output);
@@ -54,12 +45,13 @@ describe('Data transformation expressions', () => {
 		wf.actions.addInitialNodeToCanvas('Schedule Trigger', { keepNdvOpen: true });
 		ndv.actions.setPinnedData([{ myNum: 9.123 }]);
 		ndv.actions.close();
-		addSet();
+		addEditFields();
 
 		const input = '{{$json.myNum.toPrecision(3)';
 		const output = '9.12';
 
 		ndv.getters.inlineExpressionEditorInput().clear().type(input);
+		ndv.getters.inlineExpressionEditorOutput().should('have.text', output);
 		ndv.actions.execute();
 		ndv.getters.outputDataContainer().should('be.visible');
 		ndv.getters.outputDataContainer().contains(output);
@@ -69,12 +61,13 @@ describe('Data transformation expressions', () => {
 		wf.actions.addInitialNodeToCanvas('Schedule Trigger', { keepNdvOpen: true });
 		ndv.actions.setPinnedData([{ myStr: 'hello@n8n.io is an email' }]);
 		ndv.actions.close();
-		addSet();
+		addEditFields();
 
 		const input = '{{$json.myStr.extractEmail() + " " + $json.myStr.isEmpty()';
 		const output = 'hello@n8n.io false';
 
 		ndv.getters.inlineExpressionEditorInput().clear().type(input);
+		ndv.getters.inlineExpressionEditorOutput().should('have.text', output);
 		ndv.actions.execute();
 		ndv.getters.outputDataContainer().should('be.visible');
 		ndv.getters.outputDataContainer().contains(output);
@@ -84,13 +77,14 @@ describe('Data transformation expressions', () => {
 		wf.actions.addInitialNodeToCanvas('Schedule Trigger', { keepNdvOpen: true });
 		ndv.actions.setPinnedData([{ myArr: [1, 2, 3] }]);
 		ndv.actions.close();
-		addSet();
+		addEditFields();
 		const input = '{{$json.myArr.includes(1) + " " + $json.myArr[2]';
 		const output = 'true 3';
 
 		ndv.getters.inlineExpressionEditorInput().clear().type(input);
+		ndv.getters.inlineExpressionEditorOutput().should('have.text', output);
 		ndv.actions.execute();
-		ndv.getters.outputDataContainer().find('[class*=value_]').should('exist')
+		ndv.getters.outputDataContainer().find('[class*=value_]').should('exist');
 		ndv.getters.outputDataContainer().find('[class*=value_]').should('contain', output);
 	});
 
@@ -98,14 +92,15 @@ describe('Data transformation expressions', () => {
 		wf.actions.addInitialNodeToCanvas('Schedule Trigger', { keepNdvOpen: true });
 		ndv.actions.setPinnedData([{ myArr: [1, 2, 3] }]);
 		ndv.actions.close();
-		addSet();
+		addEditFields();
 
 		const input = '{{$json.myArr.first() + " " + $json.myArr.last()';
 		const output = '1 3';
 
 		ndv.getters.inlineExpressionEditorInput().clear().type(input);
+		ndv.getters.inlineExpressionEditorOutput().should('have.text', output);
 		ndv.actions.execute();
-		ndv.getters.outputDataContainer().find('[class*=value_]').should('exist')
+		ndv.getters.outputDataContainer().find('[class*=value_]').should('exist');
 		ndv.getters.outputDataContainer().find('[class*=value_]').should('contain', output);
 	});
 });
@@ -114,10 +109,8 @@ describe('Data transformation expressions', () => {
 //             utils
 // ----------------------------------
 
-const addSet = () => {
-	wf.actions.addNodeToCanvas('Set', true, true);
-	ndv.getters.parameterInput('keepOnlySet').find('div[role=switch]').click(); // shorten output
-	cy.get('input[placeholder="Add Value"]').click();
-	cy.get('span').contains('String').click();
-	ndv.getters.nthParam(3).contains('Expression').invoke('show').click(); // Values to Set > String > Value
+const addEditFields = () => {
+	wf.actions.addNodeToCanvas('Edit Fields', true, true);
+	ndv.getters.assignmentCollectionAdd('assignments').click();
+	ndv.getters.assignmentValue('assignments').contains('Expression').invoke('show').click();
 };
diff --git a/cypress/e2e/14-mapping.cy.ts b/cypress/e2e/14-mapping.cy.ts
index 8c4d6f9cdbe05..bcfeb71ec70a4 100644
--- a/cypress/e2e/14-mapping.cy.ts
+++ b/cypress/e2e/14-mapping.cy.ts
@@ -4,25 +4,14 @@ import {
 	SCHEDULE_TRIGGER_NODE_NAME,
 } from './../constants';
 import { WorkflowPage, NDV } from '../pages';
+import { getVisibleSelect } from '../utils';
 
 const workflowPage = new WorkflowPage();
 const ndv = new NDV();
 
 describe('Data mapping', () => {
-	before(() => {
-		cy.resetAll();
-		cy.skipSetup();
-	});
-
 	beforeEach(() => {
 		workflowPage.actions.visit();
-
-		cy.window().then(
-			(win) => {
-				// @ts-ignore
-				win.preventNodeViewBeforeUnload = true;
-			},
-		);
 	});
 
 	it('maps expressions from table header', () => {
@@ -35,11 +24,7 @@ describe('Data mapping', () => {
 		ndv.getters.inputDataContainer().get('table', { timeout: 10000 }).should('exist');
 
 		ndv.getters.nodeParameters().find('input[placeholder*="Add Value"]').click();
-		ndv.getters
-			.nodeParameters()
-			.find('.el-select-dropdown__list li:nth-child(3)')
-			.should('have.text', 'String')
-			.click();
+		getVisibleSelect().find('li:nth-child(3)').should('have.text', 'String').click();
 		ndv.getters
 			.parameterInput('name')
 			.should('have.length', 1)
@@ -95,14 +80,14 @@ describe('Data mapping', () => {
 			.parameterExpressionPreview('value')
 			.should('include.text', '0')
 			.invoke('css', 'color')
-			.should('equal', 'rgb(125, 125, 135)');
+			.should('equal', 'rgb(113, 116, 122)');
 
 		ndv.getters.inputTbodyCell(2, 0).realHover();
 		ndv.getters
 			.parameterExpressionPreview('value')
 			.should('include.text', '1')
 			.invoke('css', 'color')
-			.should('equal', 'rgb(125, 125, 135)');
+			.should('equal', 'rgb(113, 116, 122)');
 
 		ndv.actions.execute();
 
@@ -111,14 +96,14 @@ describe('Data mapping', () => {
 			.parameterExpressionPreview('value')
 			.should('include.text', '0')
 			.invoke('css', 'color')
-			.should('equal', 'rgb(125, 125, 135)'); // todo update color
+			.should('equal', 'rgb(113, 116, 122)'); // todo update color
 
 		ndv.getters.outputTbodyCell(2, 0).realHover();
 		ndv.getters
 			.parameterExpressionPreview('value')
 			.should('include.text', '1')
 			.invoke('css', 'color')
-			.should('equal', 'rgb(125, 125, 135)');
+			.should('equal', 'rgb(113, 116, 122)');
 	});
 
 	it('maps expressions from json view', () => {
@@ -135,7 +120,7 @@ describe('Data mapping', () => {
 			.find('.json-data')
 			.should(
 				'have.text',
-				'[{"input":[{"count":0,"with space":"!!","with.dot":"!!","with"quotes":"!!"}]},{"input":[{"count":1}]}]',
+				'[{"input": [{"count": 0,"with space": "!!","with.dot": "!!","with"quotes": "!!"}]},{"input": [{"count": 1}]}]',
 			)
 			.find('span')
 			.contains('"count"')
@@ -156,7 +141,7 @@ describe('Data mapping', () => {
 		ndv.getters
 			.inlineExpressionEditorInput()
 			.should('have.text', '{{ $json.input[0].count }} {{ $json.input }}');
-		ndv.getters.parameterExpressionPreview('value').should('include.text', '0 [object Object]');
+		ndv.actions.validateExpressionPreview('value', '0 [object Object]');
 	});
 
 	it('maps expressions from schema view', () => {
@@ -172,7 +157,7 @@ describe('Data mapping', () => {
 
 		ndv.actions.mapToParameter('value');
 		ndv.getters.inlineExpressionEditorInput().should('have.text', '{{ $json.input[0].count }}');
-		ndv.getters.parameterExpressionPreview('value').should('include.text', '0');
+		ndv.actions.validateExpressionPreview('value', '0');
 
 		ndv.getters.inputDataContainer().find('span').contains('input').realMouseDown();
 
@@ -180,11 +165,12 @@ describe('Data mapping', () => {
 		ndv.getters
 			.inlineExpressionEditorInput()
 			.should('have.text', '{{ $json.input[0].count }} {{ $json.input }}');
-		ndv.getters.parameterExpressionPreview('value').should('include.text', '0 [object Object]');
+		ndv.actions.validateExpressionPreview('value', '0 [object Object]');
 	});
 
 	it('maps expressions from previous nodes', () => {
 		cy.createFixtureWorkflow('Test_workflow_3.json', `My test workflow`);
+		workflowPage.actions.zoomToFit();
 		workflowPage.actions.openNode('Set1');
 
 		ndv.actions.selectInputNode(SCHEDULE_TRIGGER_NODE_NAME);
@@ -194,8 +180,7 @@ describe('Data mapping', () => {
 		ndv.actions.mapToParameter('value');
 		ndv.getters
 			.inlineExpressionEditorInput()
-			.should('have.text', `{{ $node['${SCHEDULE_TRIGGER_NODE_NAME}'].json.input[0].count }}`);
-		ndv.getters.parameterExpressionPreview('value').should('not.exist');
+			.should('have.text', `{{ $('${SCHEDULE_TRIGGER_NODE_NAME}').item.json.input[0].count }}`);
 
 		ndv.actions.switchInputMode('Table');
 		ndv.actions.mapDataFromHeader(1, 'value');
@@ -203,26 +188,25 @@ describe('Data mapping', () => {
 			.inlineExpressionEditorInput()
 			.should(
 				'have.text',
-				`{{ $node['${SCHEDULE_TRIGGER_NODE_NAME}'].json.input[0].count }} {{ $node['${SCHEDULE_TRIGGER_NODE_NAME}'].json.input }}`,
+				`{{ $('${SCHEDULE_TRIGGER_NODE_NAME}').item.json.input[0].count }} {{ $('${SCHEDULE_TRIGGER_NODE_NAME}').item.json.input }}`,
 			);
-		ndv.getters.parameterExpressionPreview('value').should('include.text', '[empty]');
 
 		ndv.actions.selectInputNode('Set');
 
 		ndv.actions.executePrevious();
 		ndv.getters.executingLoader().should('not.exist');
 		ndv.getters.inputDataContainer().should('exist');
-		ndv.getters.parameterExpressionPreview('value').should('include.text', '0 [object Object]');
+		ndv.actions.validateExpressionPreview('value', '0 [object Object]');
 
 		ndv.getters.inputTbodyCell(2, 0).realHover();
-		ndv.getters.parameterExpressionPreview('value').should('include.text', '1 [object Object]');
+		ndv.actions.validateExpressionPreview('value', '1 [object Object]');
 	});
 
 	it('maps keys to path', () => {
 		workflowPage.actions.addInitialNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
 		workflowPage.getters.canvasNodeByName(MANUAL_TRIGGER_NODE_DISPLAY_NAME).click();
 		workflowPage.actions.openNode(MANUAL_TRIGGER_NODE_DISPLAY_NAME);
-		ndv.actions.setPinnedData([
+		ndv.actions.pastePinnedData([
 			{
 				input: [
 					{
@@ -245,10 +229,8 @@ describe('Data mapping', () => {
 
 		ndv.actions.close();
 
-		workflowPage.actions.addNodeToCanvas('Item Lists');
-		workflowPage.actions.openNode('Item Lists');
-
-		ndv.getters.parameterInput('operation').click().find('li').contains('Sort').click();
+		workflowPage.actions.addNodeToCanvas('Sort');
+		workflowPage.actions.openNode('Sort');
 
 		ndv.getters.nodeParameters().find('button').contains('Add Field To Sort By').click();
 
@@ -271,18 +253,19 @@ describe('Data mapping', () => {
 		workflowPage.actions.openNode('Set');
 
 		ndv.actions.typeIntoParameterInput('value', 'delete me');
-		ndv.actions.dismissMappingTooltip();
 
 		ndv.actions.typeIntoParameterInput('name', 'test');
+		ndv.getters.parameterInput('name').find('input').blur();
 
 		ndv.actions.typeIntoParameterInput('value', 'fun');
 		ndv.actions.clearParameterInput('value'); // keep focus on param
+		cy.wait(300);
 
 		ndv.getters.inputDataContainer().should('exist').find('span').contains('count').realMouseDown();
 
 		ndv.actions.mapToParameter('value');
 		ndv.getters.inlineExpressionEditorInput().should('have.text', '{{ $json.input[0].count }}');
-		ndv.getters.parameterExpressionPreview('value').should('include.text', '0');
+		ndv.actions.validateExpressionPreview('value', '0');
 
 		ndv.getters.inputDataContainer().find('span').contains('input').realMouseDown();
 
@@ -290,7 +273,34 @@ describe('Data mapping', () => {
 		ndv.getters
 			.inlineExpressionEditorInput()
 			.should('have.text', '{{ $json.input[0].count }} {{ $json.input }}');
-		ndv.getters.parameterExpressionPreview('value').should('include.text', '0 [object Object]');
+		ndv.actions.validateExpressionPreview('value', '0 [object Object]');
+	});
+
+	it('renders expression preview when a previous node is selected', () => {
+		cy.fixture('Test_workflow_3.json').then((data) => {
+			cy.get('body').paste(JSON.stringify(data));
+		});
+
+		workflowPage.actions.openNode('Set');
+		ndv.actions.typeIntoParameterInput('value', 'test_value');
+		ndv.actions.typeIntoParameterInput('name', '{selectall}test_name');
+		ndv.actions.close();
+
+		workflowPage.actions.openNode('Set1');
+		ndv.actions.executePrevious();
+		ndv.getters.executingLoader().should('not.exist');
+		ndv.getters.inputDataContainer().should('exist');
+		ndv.getters
+			.inputDataContainer()
+			.should('exist')
+			.find('span')
+			.contains('test_name')
+			.realMouseDown();
+		ndv.actions.mapToParameter('value');
+
+		ndv.actions.validateExpressionPreview('value', 'test_value');
+		ndv.actions.selectInputNode(SCHEDULE_TRIGGER_NODE_NAME);
+		ndv.actions.validateExpressionPreview('value', 'test_value');
 	});
 
 	it('shows you can drop to inputs, including booleans', () => {
@@ -302,21 +312,33 @@ describe('Data mapping', () => {
 		ndv.actions.clearParameterInput('value');
 		cy.get('body').type('{esc}');
 
-		ndv.getters.parameterInput('keepOnlySet').find('input[type="checkbox"]').should('exist');
-		ndv.getters.parameterInput('keepOnlySet').find('input[type="text"]').should('not.exist');
-		ndv.getters.inputDataContainer().should('exist').find('span').contains('count').realMouseDown().realMouseMove(100, 100);
+		ndv.getters.parameterInput('includeOtherFields').find('input[type="checkbox"]').should('exist');
+		ndv.getters.parameterInput('includeOtherFields').find('input[type="text"]').should('not.exist');
+		ndv.getters
+			.inputDataContainer()
+			.should('exist')
+			.find('span')
+			.contains('count')
+			.realMouseDown()
+			.realMouseMove(100, 100);
 		cy.wait(50);
 
-		ndv.getters.parameterInput('keepOnlySet').find('input[type="checkbox"]').should('not.exist');
-		ndv.getters.parameterInput('keepOnlySet').find('input[type="text"]')
+		ndv.getters
+			.parameterInput('includeOtherFields')
+			.find('input[type="checkbox"]')
+			.should('not.exist');
+		ndv.getters
+			.parameterInput('includeOtherFields')
+			.find('input[type="text"]')
 			.should('exist')
 			.invoke('css', 'border')
-			.then((border) => expect(border).to.include('1.5px dashed rgb(90, 76, 194)'));
+			.then((border) => expect(border).to.include('dashed rgb(90, 76, 194)'));
 
-		ndv.getters.parameterInput('value').find('input[type="text"]')
-		.should('exist')
-		.invoke('css', 'border')
-		.then((border) => expect(border).to.include('1.5px dashed rgb(90, 76, 194)'));
+		ndv.getters
+			.parameterInput('value')
+			.find('input[type="text"]')
+			.should('exist')
+			.invoke('css', 'border')
+			.then((border) => expect(border).to.include('dashed rgb(90, 76, 194)'));
 	});
-
 });
diff --git a/cypress/e2e/15-scheduler-node.cy.ts b/cypress/e2e/15-scheduler-node.cy.ts
index ae3de65c26749..0021455619811 100644
--- a/cypress/e2e/15-scheduler-node.cy.ts
+++ b/cypress/e2e/15-scheduler-node.cy.ts
@@ -1,4 +1,6 @@
 import { WorkflowPage, WorkflowsPage, NDV } from '../pages';
+import { BACKEND_BASE_URL } from '../constants';
+import { getVisibleSelect } from '../utils';
 
 const workflowsPage = new WorkflowsPage();
 const workflowPage = new WorkflowPage();
@@ -6,8 +8,7 @@ const ndv = new NDV();
 
 describe('Schedule Trigger node', async () => {
 	beforeEach(() => {
-		cy.resetAll();
-		cy.skipSetup();
+		workflowPage.actions.visit();
 	});
 
 	it('should execute and return the execution timestamp', () => {
@@ -24,11 +25,7 @@ describe('Schedule Trigger node', async () => {
 		workflowPage.actions.openNode('Schedule Trigger');
 
 		cy.getByTestId('parameter-input-field').click();
-		cy.getByTestId('parameter-input-field')
-			.find('.el-select-dropdown')
-			.find('.option-headline')
-			.contains('Seconds')
-			.click();
+		getVisibleSelect().find('.option-headline').contains('Seconds').click();
 		cy.getByTestId('parameter-input-secondsInterval').clear().type('1');
 
 		ndv.getters.backToCanvas().click();
@@ -36,44 +33,34 @@ describe('Schedule Trigger node', async () => {
 		workflowPage.actions.activateWorkflow();
 		workflowPage.getters.activatorSwitch().should('have.class', 'is-checked');
 
-		cy.request('GET', '/rest/workflows')
-			.then((response) => {
+		cy.url().then((url) => {
+			const workflowId = url.split('/').pop();
+
+			cy.wait(1200);
+			cy.request('GET', `${BACKEND_BASE_URL}/rest/executions`).then((response) => {
 				expect(response.status).to.eq(200);
-				expect(response.body.data).to.have.length(1);
-				const workflowId = response.body.data[0].id.toString();
-				expect(workflowId).to.not.be.empty;
-				return workflowId;
-			})
-			.then((workflowId) => {
+				expect(workflowId).to.not.be.undefined;
+				expect(response.body.data.results.length).to.be.greaterThan(0);
+				const matchingExecutions = response.body.data.results.filter(
+					(execution: any) => execution.workflowId === workflowId,
+				);
+				expect(matchingExecutions).to.have.length(1);
+
 				cy.wait(1200);
-				cy.request('GET', '/rest/executions')
-					.then((response) => {
-						expect(response.status).to.eq(200);
-						expect(response.body.data.results.length).to.be.greaterThan(0);
-						const matchingExecutions = response.body.data.results.filter(
-							(execution: any) => execution.workflowId === workflowId,
-						);
-						expect(matchingExecutions).to.have.length(1);
-						return workflowId;
-					})
-					.then((workflowId) => {
-						cy.wait(1200);
-						cy.request('GET', '/rest/executions')
-							.then((response) => {
-								expect(response.status).to.eq(200);
-								expect(response.body.data.results.length).to.be.greaterThan(0);
-								const matchingExecutions = response.body.data.results.filter(
-									(execution: any) => execution.workflowId === workflowId,
-								);
-								expect(matchingExecutions).to.have.length(2);
-							})
-							.then(() => {
-								workflowPage.actions.activateWorkflow();
-								workflowPage.getters.activatorSwitch().should('not.have.class', 'is-checked');
-								cy.visit(workflowsPage.url);
-								workflowsPage.actions.deleteWorkFlow('Schedule Trigger Workflow');
-							});
-					});
+				cy.request('GET', `${BACKEND_BASE_URL}/rest/executions`).then((response) => {
+					expect(response.status).to.eq(200);
+					expect(response.body.data.results.length).to.be.greaterThan(0);
+					const matchingExecutions = response.body.data.results.filter(
+						(execution: any) => execution.workflowId === workflowId,
+					);
+					expect(matchingExecutions).to.have.length(2);
+
+					workflowPage.actions.activateWorkflow();
+					workflowPage.getters.activatorSwitch().should('not.have.class', 'is-checked');
+					cy.visit(workflowsPage.url);
+					workflowsPage.actions.deleteWorkFlow('Schedule Trigger Workflow');
+				});
 			});
+		});
 	});
 });
diff --git a/cypress/e2e/16-form-trigger-node.cy.ts b/cypress/e2e/16-form-trigger-node.cy.ts
new file mode 100644
index 0000000000000..0162479f7c559
--- /dev/null
+++ b/cypress/e2e/16-form-trigger-node.cy.ts
@@ -0,0 +1,101 @@
+import { WorkflowPage, NDV } from '../pages';
+import { getVisibleSelect } from '../utils';
+
+const workflowPage = new WorkflowPage();
+const ndv = new NDV();
+
+describe('n8n Form Trigger', () => {
+	beforeEach(() => {
+		workflowPage.actions.visit();
+	});
+
+	it("add node by clicking on 'On form submission'", () => {
+		workflowPage.getters.canvasPlusButton().click();
+		workflowPage.getters.nodeCreatorNodeItems().contains('On form submission').click();
+		ndv.getters.parameterInput('formTitle').type('Test Form');
+		ndv.getters.parameterInput('formDescription').type('Test Form Description');
+		ndv.getters.parameterInput('fieldLabel').type('Test Field 1');
+		ndv.getters.backToCanvas().click();
+		workflowPage.getters.nodeIssuesByName('n8n Form Trigger').should('not.exist');
+	});
+
+	it('should fill up form fields', () => {
+		workflowPage.actions.addInitialNodeToCanvas('n8n Form Trigger');
+		workflowPage.getters.canvasNodes().first().dblclick();
+		ndv.getters.parameterInput('formTitle').type('Test Form');
+		ndv.getters.parameterInput('formDescription').type('Test Form Description');
+		//fill up first field of type number
+		ndv.getters.parameterInput('fieldLabel').type('Test Field 1');
+		ndv.getters.parameterInput('fieldType').click();
+		getVisibleSelect().contains('Number').click();
+		cy.get(
+			'[data-test-id="parameter-input-requiredField"] > .parameter-input > .el-switch > .el-switch__core',
+		).click();
+		//fill up second field of type text
+		cy.get('.fixed-collection-parameter > :nth-child(2) > .button > span').click();
+		cy.get('.border-top-dashed > .parameter-input-list-wrapper > :nth-child(1) > .parameter-item')
+			.find('input[placeholder*="e.g. What is your name?"]')
+			.type('Test Field 2');
+		//fill up second field of type date
+		cy.get('.fixed-collection-parameter > :nth-child(2) > .button > span').click();
+		cy.get(
+			':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();
+		cy.get(
+			':nth-child(3) > .border-top-dashed > .parameter-input-list-wrapper > :nth-child(2) > .parameter-item',
+		).click();
+		getVisibleSelect().contains('Date').click();
+		// fill up second field of type dropdown
+		cy.get('.fixed-collection-parameter > :nth-child(2) > .button').click();
+		cy.get(
+			':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();
+		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();
+
+		//add optional submitted message
+		cy.get('.param-options').click();
+		getVisibleSelect().find('span').contains('Form Response').click();
+		cy.contains('span', 'Text to Show')
+			.should('exist')
+			.parent()
+			.parent()
+			.next()
+			.children()
+			.children()
+			.children()
+			.children()
+			.children()
+			.children()
+			.children()
+			.first()
+			.clear()
+			.type('Your test form was successfully submitted');
+
+		ndv.getters.backToCanvas().click();
+		workflowPage.getters.nodeIssuesByName('n8n Form Trigger').should('not.exist');
+	});
+});
diff --git a/cypress/e2e/16-webhook-node.cy.ts b/cypress/e2e/16-webhook-node.cy.ts
index d2bceaf22faa1..560fc41056b30 100644
--- a/cypress/e2e/16-webhook-node.cy.ts
+++ b/cypress/e2e/16-webhook-node.cy.ts
@@ -1,6 +1,8 @@
 import { WorkflowPage, NDV, CredentialsModal } from '../pages';
 import { v4 as uuid } from 'uuid';
 import { cowBase64 } from '../support/binaryTestFiles';
+import { BACKEND_BASE_URL, EDIT_FIELDS_SET_NODE_NAME } from '../constants';
+import { getVisibleSelect } from '../utils';
 
 const workflowPage = new WorkflowPage();
 const ndv = new NDV();
@@ -33,11 +35,7 @@ const simpleWebhookCall = (options: SimpleWebhookCallOptions) => {
 	workflowPage.actions.openNode('Webhook');
 
 	cy.getByTestId('parameter-input-httpMethod').click();
-	cy.getByTestId('parameter-input-httpMethod')
-		.find('.el-select-dropdown')
-		.find('.option-headline')
-		.contains(method)
-		.click();
+	getVisibleSelect().find('.option-headline').contains(method).click();
 	cy.getByTestId('parameter-input-path')
 		.find('.parameter-input')
 		.find('input')
@@ -46,44 +44,31 @@ const simpleWebhookCall = (options: SimpleWebhookCallOptions) => {
 
 	if (authentication) {
 		cy.getByTestId('parameter-input-authentication').click();
-		cy.getByTestId('parameter-input-authentication')
-			.find('.el-select-dropdown')
-			.find('.option-headline')
-			.contains(authentication)
-			.click();
+		getVisibleSelect().find('.option-headline').contains(authentication).click();
 	}
 
 	if (responseCode) {
-		cy.getByTestId('parameter-input-responseCode')
-			.find('.parameter-input')
-			.find('input')
-			.clear()
-			.type(responseCode.toString());
+		cy.get('.param-options').click();
+		getVisibleSelect().contains('Response Code').click();
+		cy.get('.parameter-item-wrapper > .parameter-input-list-wrapper').children().click();
+		getVisibleSelect().contains('201').click();
 	}
 
 	if (respondWith) {
 		cy.getByTestId('parameter-input-responseMode').click();
-		cy.getByTestId('parameter-input-responseMode')
-			.find('.el-select-dropdown')
-			.find('.option-headline')
-			.contains(respondWith)
-			.click();
+		getVisibleSelect().find('.option-headline').contains(respondWith).click();
 	}
 
 	if (responseData) {
 		cy.getByTestId('parameter-input-responseData').click();
-		cy.getByTestId('parameter-input-responseData')
-			.find('.el-select-dropdown')
-			.find('.option-headline')
-			.contains(responseData)
-			.click();
+		getVisibleSelect().find('.option-headline').contains(responseData).click();
 	}
 
 	if (executeNow) {
 		ndv.actions.execute();
 		cy.wait(waitForWebhook);
 
-		cy.request(method, '/webhook-test/' + webhookPath).then((response) => {
+		cy.request(method, `${BACKEND_BASE_URL}/webhook-test/${webhookPath}`).then((response) => {
 			expect(response.status).to.eq(200);
 			ndv.getters.outputPanel().contains('headers');
 		});
@@ -91,20 +76,8 @@ const simpleWebhookCall = (options: SimpleWebhookCallOptions) => {
 };
 
 describe('Webhook Trigger node', async () => {
-	before(() => {
-		cy.resetAll();
-		cy.skipSetup();
-	});
-
 	beforeEach(() => {
 		workflowPage.actions.visit();
-
-		cy.window().then(
-			(win) => {
-				// @ts-ignore
-				win.preventNodeViewBeforeUnload = true;
-			},
-		);
 	});
 
 	it('should listen for a GET request', () => {
@@ -139,23 +112,16 @@ describe('Webhook Trigger node', async () => {
 
 		ndv.getters.backToCanvas().click();
 
-		workflowPage.actions.addNodeToCanvas('Set');
-		workflowPage.actions.openNode('Set');
-		cy.get('.add-option').click();
-		cy.get('.add-option').find('.el-select-dropdown__item').contains('Number').click();
-		cy.get('.fixed-collection-parameter')
-			.getByTestId('parameter-input-name')
-			.clear()
-			.type('MyValue');
-		cy.get('.fixed-collection-parameter').getByTestId('parameter-input-value').clear().type('1234');
-		ndv.getters.backToCanvas().click();
+		addEditFields();
+
+		ndv.getters.backToCanvas().click({ force: true });
 
 		workflowPage.actions.addNodeToCanvas('Respond to Webhook');
 
 		workflowPage.actions.executeWorkflow();
 		cy.wait(waitForWebhook);
 
-		cy.request('GET', '/webhook-test/' + webhookPath).then((response) => {
+		cy.request('GET', `${BACKEND_BASE_URL}/webhook-test/${webhookPath}`).then((response) => {
 			expect(response.status).to.eq(200);
 			expect(response.body.MyValue).to.eq(1234);
 		});
@@ -173,7 +139,7 @@ describe('Webhook Trigger node', async () => {
 		ndv.actions.execute();
 		cy.wait(waitForWebhook);
 
-		cy.request('GET', '/webhook-test/' + webhookPath).then((response) => {
+		cy.request('GET', `${BACKEND_BASE_URL}/webhook-test/${webhookPath}`).then((response) => {
 			expect(response.status).to.eq(201);
 		});
 	});
@@ -188,21 +154,14 @@ describe('Webhook Trigger node', async () => {
 		});
 		ndv.getters.backToCanvas().click();
 
-		workflowPage.actions.addNodeToCanvas('Set');
-		workflowPage.actions.openNode('Set');
-		cy.get('.add-option').click();
-		cy.get('.add-option').find('.el-select-dropdown__item').contains('Number').click();
-		cy.get('.fixed-collection-parameter')
-			.getByTestId('parameter-input-name')
-			.clear()
-			.type('MyValue');
-		cy.get('.fixed-collection-parameter').getByTestId('parameter-input-value').clear().type('1234');
-		ndv.getters.backToCanvas().click();
+		addEditFields();
+
+		ndv.getters.backToCanvas().click({ force: true });
 
 		workflowPage.actions.executeWorkflow();
 		cy.wait(waitForWebhook);
 
-		cy.request('GET', '/webhook-test/' + webhookPath).then((response) => {
+		cy.request('GET', `${BACKEND_BASE_URL}/webhook-test/${webhookPath}`).then((response) => {
 			expect(response.status).to.eq(200);
 			expect(response.body.MyValue).to.eq(1234);
 		});
@@ -219,35 +178,29 @@ describe('Webhook Trigger node', async () => {
 		});
 		ndv.getters.backToCanvas().click();
 
-		workflowPage.actions.addNodeToCanvas('Set');
-		workflowPage.actions.openNode('Set');
-		cy.get('.add-option').click();
-		cy.get('.add-option').find('.el-select-dropdown__item').contains('String').click();
-		cy.get('.fixed-collection-parameter').getByTestId('parameter-input-name').clear().type('data');
-		cy.get('.fixed-collection-parameter')
-			.getByTestId('parameter-input-value')
-			.clear()
-			.find('input')
-			.invoke('val', cowBase64)
-			.trigger('blur');
+		workflowPage.actions.addNodeToCanvas(EDIT_FIELDS_SET_NODE_NAME);
+		workflowPage.actions.openNode(EDIT_FIELDS_SET_NODE_NAME);
+		ndv.getters.assignmentCollectionAdd('assignments').click();
+		ndv.getters.assignmentName('assignments').type('data').find('input').blur();
+		ndv.getters.assignmentType('assignments').click();
+		ndv.getters.assignmentValue('assignments').paste(cowBase64);
+
 		ndv.getters.backToCanvas().click();
 
-		workflowPage.actions.addNodeToCanvas('Move Binary Data');
+		workflowPage.actions.addNodeToCanvas('Convert to File');
 		workflowPage.actions.zoomToFit();
 
-		workflowPage.actions.openNode('Move Binary Data');
+		workflowPage.actions.openNode('Convert to File');
+		cy.getByTestId('parameter-input-operation').click();
+		getVisibleSelect().find('.option-headline').contains('Convert to JSON').click();
 		cy.getByTestId('parameter-input-mode').click();
-		cy.getByTestId('parameter-input-mode')
-			.find('.el-select-dropdown')
-			.find('.option-headline')
-			.contains('JSON to Binary')
-			.click();
+		getVisibleSelect().find('.option-headline').contains('Each Item to Separate File').click();
 		ndv.getters.backToCanvas().click();
 
 		workflowPage.actions.executeWorkflow();
 		cy.wait(waitForWebhook);
 
-		cy.request('GET', '/webhook-test/' + webhookPath).then((response) => {
+		cy.request('GET', `${BACKEND_BASE_URL}/webhook-test/${webhookPath}`).then((response) => {
 			expect(response.status).to.eq(200);
 			expect(Object.keys(response.body).includes('data')).to.be.true;
 		});
@@ -264,7 +217,7 @@ describe('Webhook Trigger node', async () => {
 		});
 		ndv.actions.execute();
 		cy.wait(waitForWebhook);
-		cy.request('GET', '/webhook-test/' + webhookPath).then((response) => {
+		cy.request('GET', `${BACKEND_BASE_URL}/webhook-test/${webhookPath}`).then((response) => {
 			expect(response.status).to.eq(200);
 			expect(response.body.MyValue).to.be.undefined;
 		});
@@ -280,7 +233,7 @@ describe('Webhook Trigger node', async () => {
 		});
 		// add credentials
 		workflowPage.getters.nodeCredentialsSelect().click();
-		workflowPage.getters.nodeCredentialsSelect().find('li').last().click();
+		getVisibleSelect().find('li').last().click();
 		credentialsModal.getters.credentialsEditModal().should('be.visible');
 		credentialsModal.actions.fillCredentialsForm();
 
@@ -288,7 +241,7 @@ describe('Webhook Trigger node', async () => {
 		cy.wait(waitForWebhook);
 		cy.request({
 			method: 'GET',
-			url: '/webhook-test/' + webhookPath,
+			url: `${BACKEND_BASE_URL}/webhook-test/${webhookPath}`,
 			auth: {
 				user: 'username',
 				pass: 'password',
@@ -301,7 +254,7 @@ describe('Webhook Trigger node', async () => {
 			.then(() => {
 				cy.request({
 					method: 'GET',
-					url: '/webhook-test/' + webhookPath,
+					url: `${BACKEND_BASE_URL}/webhook-test/${webhookPath}`,
 					auth: {
 						user: 'test',
 						pass: 'test',
@@ -323,7 +276,7 @@ describe('Webhook Trigger node', async () => {
 		});
 		// add credentials
 		workflowPage.getters.nodeCredentialsSelect().click();
-		workflowPage.getters.nodeCredentialsSelect().find('li').last().click();
+		getVisibleSelect().find('li').last().click();
 		credentialsModal.getters.credentialsEditModal().should('be.visible');
 		credentialsModal.actions.fillCredentialsForm();
 
@@ -331,7 +284,7 @@ describe('Webhook Trigger node', async () => {
 		cy.wait(waitForWebhook);
 		cy.request({
 			method: 'GET',
-			url: '/webhook-test/' + webhookPath,
+			url: `${BACKEND_BASE_URL}/webhook-test/${webhookPath}`,
 			headers: {
 				test: 'wrong',
 			},
@@ -343,7 +296,7 @@ describe('Webhook Trigger node', async () => {
 			.then(() => {
 				cy.request({
 					method: 'GET',
-					url: '/webhook-test/' + webhookPath,
+					url: `${BACKEND_BASE_URL}/webhook-test/${webhookPath}`,
 					headers: {
 						test: 'test',
 					},
@@ -354,3 +307,13 @@ describe('Webhook Trigger node', async () => {
 			});
 	});
 });
+
+const addEditFields = () => {
+	workflowPage.actions.addNodeToCanvas(EDIT_FIELDS_SET_NODE_NAME);
+	workflowPage.actions.openNode(EDIT_FIELDS_SET_NODE_NAME);
+	ndv.getters.assignmentCollectionAdd('assignments').click();
+	ndv.getters.assignmentName('assignments').type('MyValue').find('input').blur();
+	ndv.getters.assignmentType('assignments').click();
+	getVisibleSelect().find('li').contains('Number').click();
+	ndv.getters.assignmentValue('assignments').type('1234');
+};
diff --git a/cypress/e2e/17-sharing.cy.ts b/cypress/e2e/17-sharing.cy.ts
index 1a8b0a3d007ba..71f41250eca77 100644
--- a/cypress/e2e/17-sharing.cy.ts
+++ b/cypress/e2e/17-sharing.cy.ts
@@ -1,4 +1,4 @@
-import { DEFAULT_USER_EMAIL, DEFAULT_USER_PASSWORD } from '../constants';
+import { INSTANCE_MEMBERS, INSTANCE_OWNER, INSTANCE_ADMIN } from '../constants';
 import {
 	CredentialsModal,
 	CredentialsPage,
@@ -7,6 +7,7 @@ import {
 	WorkflowSharingModal,
 	WorkflowsPage,
 } from '../pages';
+import { getVisibleSelect } from '../utils';
 
 /**
  * User U1 - Instance owner
@@ -28,54 +29,18 @@ const workflowPage = new WorkflowPage();
 const workflowSharingModal = new WorkflowSharingModal();
 const ndv = new NDV();
 
-const instanceOwner = {
-	email: `${DEFAULT_USER_EMAIL}one`,
-	password: DEFAULT_USER_PASSWORD,
-	firstName: 'User',
-	lastName: 'U1',
-};
-
-const users = [
-	{
-		email: `${DEFAULT_USER_EMAIL}two`,
-		password: DEFAULT_USER_PASSWORD,
-		firstName: 'User',
-		lastName: 'U2',
-	},
-	{
-		email: `${DEFAULT_USER_EMAIL}three`,
-		password: DEFAULT_USER_PASSWORD,
-		firstName: 'User',
-		lastName: 'U3',
-	},
-];
-
-describe('Sharing', () => {
-	before(() => {
-		cy.resetAll();
-		cy.setupOwner(instanceOwner);
-	});
-
-	beforeEach(() => {
-		cy.on('uncaught:exception', (err, runnable) => {
-			expect(err.message).to.include('Not logged in');
-			return false;
-		});
-	});
-
-	it('should invite User U2 and User U3 to instance', () => {
-		cy.inviteUsers({ instanceOwner, users });
-	});
+describe('Sharing', { disableAutoLogin: true }, () => {
+	before(() => cy.enableFeature('sharing', true));
 
 	let workflowW2Url = '';
 	it('should create C1, W1, W2, share W1 with U3, as U2', () => {
-		cy.signin(users[0]);
+		cy.signin(INSTANCE_MEMBERS[0]);
 
 		cy.visit(credentialsPage.url);
 		credentialsPage.getters.emptyListCreateCredentialButton().click();
 		credentialsModal.getters.newCredentialTypeOption('Notion API').click();
 		credentialsModal.getters.newCredentialTypeButton().click();
-		credentialsModal.getters.connectionParameter('API Key').type('1234567890');
+		credentialsModal.getters.connectionParameter('Internal Integration Secret').type('1234567890');
 		credentialsModal.actions.setName('Credential C1');
 		credentialsModal.actions.save();
 		credentialsModal.actions.close();
@@ -84,46 +49,63 @@ describe('Sharing', () => {
 		workflowPage.actions.setWorkflowName('Workflow W1');
 		workflowPage.actions.addInitialNodeToCanvas('Manual Trigger');
 		workflowPage.actions.addNodeToCanvas('Notion', true, true);
-		ndv.getters.credentialInput().should('contain', 'Credential C1');
+		ndv.getters.credentialInput().find('input').should('have.value', 'Credential C1');
 		ndv.actions.close();
 
 		workflowPage.actions.openShareModal();
-		workflowSharingModal.actions.addUser(users[1].email);
+		workflowSharingModal.actions.addUser(INSTANCE_MEMBERS[1].email);
 		workflowSharingModal.actions.save();
 		workflowPage.actions.saveWorkflowOnButtonClick();
 
 		cy.visit(workflowsPage.url);
 		workflowsPage.getters.createWorkflowButton().click();
 		cy.createFixtureWorkflow('Test_workflow_1.json', 'Workflow W2');
+		workflowPage.actions.saveWorkflowOnButtonClick();
 		cy.url().then((url) => {
 			workflowW2Url = url;
 		});
 	});
 
 	it('should create C2, share C2 with U1 and U2, as U3', () => {
-		cy.signin(users[1]);
+		cy.signin(INSTANCE_MEMBERS[1]);
 
 		cy.visit(credentialsPage.url);
 		credentialsPage.getters.emptyListCreateCredentialButton().click();
-		credentialsModal.getters.newCredentialTypeOption('Airtable API').click();
+		credentialsModal.getters.newCredentialTypeOption('Airtable Personal Access Token API').click();
 		credentialsModal.getters.newCredentialTypeButton().click();
-		credentialsModal.getters.connectionParameter('API Key').type('1234567890');
+		credentialsModal.getters.connectionParameter('Access Token').type('1234567890');
 		credentialsModal.actions.setName('Credential C2');
 		credentialsModal.actions.changeTab('Sharing');
-		credentialsModal.actions.addUser(instanceOwner.email);
-		credentialsModal.actions.addUser(users[0].email);
+		credentialsModal.actions.addUser(INSTANCE_OWNER.email);
+		credentialsModal.actions.addUser(INSTANCE_MEMBERS[0].email);
 		credentialsModal.actions.save();
 		credentialsModal.actions.close();
 	});
 
 	it('should open W1, add node using C2 as U3', () => {
-		cy.signin(users[1]);
+		cy.signin(INSTANCE_MEMBERS[1]);
 
 		cy.visit(workflowsPage.url);
 		workflowsPage.getters.workflowCards().should('have.length', 1);
 		workflowsPage.getters.workflowCard('Workflow W1').click();
 		workflowPage.actions.addNodeToCanvas('Airtable', true, true);
-		ndv.getters.credentialInput().should('contain', 'Credential C2');
+		ndv.getters.credentialInput().find('input').should('have.value', 'Credential C2');
+		ndv.actions.close();
+		workflowPage.actions.saveWorkflowOnButtonClick();
+
+		workflowPage.actions.openNode('Notion');
+		ndv.getters.credentialInput().should('have.value', 'Credential C1').should('be.disabled');
+		ndv.actions.close();
+	});
+
+	it('should open W1, add node using C2 as U2', () => {
+		cy.signin(INSTANCE_MEMBERS[0]);
+
+		cy.visit(workflowsPage.url);
+		workflowsPage.getters.workflowCards().should('have.length', 2);
+		workflowsPage.getters.workflowCard('Workflow W1').click();
+		workflowPage.actions.addNodeToCanvas('Airtable', true, true);
+		ndv.getters.credentialInput().find('input').should('have.value', 'Credential C2');
 		ndv.actions.close();
 		workflowPage.actions.saveWorkflowOnButtonClick();
 
@@ -132,12 +114,12 @@ describe('Sharing', () => {
 			.credentialInput()
 			.find('input')
 			.should('have.value', 'Credential C1')
-			.should('be.disabled');
+			.should('be.enabled');
 		ndv.actions.close();
 	});
 
 	it('should not have access to W2, as U3', () => {
-		cy.signin(users[1]);
+		cy.signin(INSTANCE_MEMBERS[1]);
 
 		cy.visit(workflowW2Url);
 		cy.waitForLoad();
@@ -146,22 +128,63 @@ describe('Sharing', () => {
 	});
 
 	it('should have access to W1, W2, as U1', () => {
-		cy.signin(instanceOwner);
+		cy.signin(INSTANCE_OWNER);
 
 		cy.visit(workflowsPage.url);
 		workflowsPage.getters.workflowCards().should('have.length', 2);
 		workflowsPage.getters.workflowCard('Workflow W1').click();
 		workflowPage.actions.openNode('Notion');
-		ndv.getters
-			.credentialInput()
-			.find('input')
-			.should('have.value', 'Credential C1')
-			.should('be.disabled');
+		ndv.getters.credentialInput().should('have.value', 'Credential C1').should('be.disabled');
 		ndv.actions.close();
 
 		cy.waitForLoad();
 		cy.visit(workflowsPage.url);
-		workflowsPage.getters.workflowCard('Workflow W2').click();
+		workflowsPage.getters.workflowCard('Workflow W2').click('top');
 		workflowPage.actions.executeWorkflow();
 	});
+
+	it('should automatically test C2 when opened by U2 sharee', () => {
+		cy.signin(INSTANCE_MEMBERS[0]);
+
+		cy.visit(credentialsPage.url);
+		credentialsPage.getters.credentialCard('Credential C2').click();
+		credentialsModal.getters.testSuccessTag().should('be.visible');
+	});
+
+	it('should work for admin role on credentials created by others (also can share it with themselves)', () => {
+		cy.signin(INSTANCE_MEMBERS[0]);
+
+		cy.visit(credentialsPage.url);
+		credentialsPage.getters.createCredentialButton().click();
+		credentialsModal.getters.newCredentialTypeOption('Notion API').click();
+		credentialsModal.getters.newCredentialTypeButton().click({ force: true });
+		credentialsModal.getters.connectionParameter('Internal Integration Secret').type('1234567890');
+		credentialsModal.actions.setName('Credential C3');
+		credentialsModal.actions.save();
+		credentialsModal.actions.close();
+
+		cy.signout();
+		cy.signin(INSTANCE_ADMIN);
+		cy.visit(credentialsPage.url);
+		credentialsPage.getters.credentialCard('Credential C3').click();
+		credentialsModal.getters.testSuccessTag().should('be.visible');
+		cy.get('input').should('not.have.length');
+		credentialsModal.actions.changeTab('Sharing');
+		cy.contains(
+			'You can view this credential because you have permission to read and share',
+		).should('be.visible');
+
+		credentialsModal.getters.usersSelect().click();
+		cy.getByTestId('user-email')
+			.filter(':visible')
+			.should('have.length', 3)
+			.contains(INSTANCE_ADMIN.email)
+			.should('have.length', 1);
+		getVisibleSelect().contains(INSTANCE_OWNER.email.toLowerCase()).click();
+
+		credentialsModal.actions.addUser(INSTANCE_MEMBERS[1].email);
+		credentialsModal.actions.addUser(INSTANCE_ADMIN.email);
+		credentialsModal.actions.saveSharing();
+		credentialsModal.actions.close();
+	});
 });
diff --git a/cypress/e2e/17-workflow-tags.cy.ts b/cypress/e2e/17-workflow-tags.cy.ts
index 8e14897508aea..dea45d1a9afc8 100644
--- a/cypress/e2e/17-workflow-tags.cy.ts
+++ b/cypress/e2e/17-workflow-tags.cy.ts
@@ -2,51 +2,49 @@ import { WorkflowPage } from '../pages';
 
 const wf = new WorkflowPage();
 
-const TEST_TAGS = ['Tag 1', 'Tag 2', 'Tag 3'];
+const TEST_TAGS = ['Tag 1', 'Tag 2', 'Tag 3', 'Tag 4', 'Tag 5'];
 
 describe('Workflow tags', () => {
 	beforeEach(() => {
-		cy.resetAll();
-		cy.skipSetup();
+		wf.actions.visit();
 	});
 
 	it('should create and attach tags inline', () => {
 		wf.getters.createTagButton().click();
-		wf.actions.addTags(TEST_TAGS);
-		wf.getters.tagPills().should('have.length', TEST_TAGS.length);
+		wf.actions.addTags(TEST_TAGS.slice(0, 2));
+		wf.getters.tagPills().should('have.length', 2);
 		wf.getters.nthTagPill(1).click();
-		wf.actions.addTags('Tag 4');
-		wf.getters.tagPills().should('have.length', TEST_TAGS.length + 1);
+		wf.actions.addTags(TEST_TAGS[1].toUpperCase());
+		wf.getters.tagPills().should('have.length', 3);
 		wf.getters.isWorkflowSaved();
 	});
 
 	it('should create tags via modal', () => {
 		wf.actions.openTagManagerModal();
 
-		const [first, second] = TEST_TAGS;
-
-		cy.contains('Create a tag').click();
-		cy.getByTestId('tags-table').find('input').type(first).type('{enter}');
-		cy.contains('Add new').click();
-		cy.wait(300);
-		cy.getByTestId('tags-table').find('input').type(second).type('{enter}');
+		const tags = TEST_TAGS.slice(3);
+		for (const tag of tags) {
+			cy.contains('Add new').click();
+			cy.getByTestId('tags-table').find('input').type(tag).type('{enter}');
+			cy.wait(300);
+		}
 		cy.contains('Done').click();
 
 		wf.getters.createTagButton().click();
-		wf.getters.tagsInDropdown().should('have.length', 2); // two stored
+		wf.getters.tagsDropdown().click();
+		wf.getters.tagsInDropdown().should('have.length', 5);
 		wf.getters.tagPills().should('have.length', 0); // none attached
 	});
 
-	it('should delete a tag via modal', () => {
+	it('should delete all tags via modal', () => {
 		wf.actions.openTagManagerModal();
 
-		const [first] = TEST_TAGS;
+		TEST_TAGS.forEach(() => {
+			cy.getByTestId('delete-tag-button').first().click({ force: true });
+			cy.contains('Delete tag').click();
+			cy.wait(300);
+		});
 
-		cy.contains('Create a tag').click();
-		cy.getByTestId('tags-table').find('input').type(first).type('{enter}');
-		cy.getByTestId('delete-tag-button').click({ force: true });
-		cy.wait(300);
-		cy.contains('Delete tag').click();
 		cy.contains('Done').click();
 		wf.getters.createTagButton().click();
 		wf.getters.tagsInDropdown().should('have.length', 0); // none stored
@@ -60,7 +58,8 @@ describe('Workflow tags', () => {
 
 		cy.contains('Create a tag').click();
 		cy.getByTestId('tags-table').find('input').type(first).type('{enter}');
-		cy.getByTestId('edit-tag-button').click({ force: true });
+		cy.getByTestId('tags-table').should('contain.text', first);
+		cy.getByTestId('edit-tag-button').eq(-1).click({ force: true });
 		cy.wait(300);
 		cy.getByTestId('tags-table')
 			.find('.el-input--large')
@@ -79,7 +78,7 @@ describe('Workflow tags', () => {
 		wf.actions.addTags(TEST_TAGS);
 		wf.getters.nthTagPill(1).click();
 		wf.getters.tagsDropdown().find('.el-tag__close').first().click();
-		cy.get('body').type('{enter}');
+		cy.get('body').click(0, 0);
 		wf.getters.tagPills().should('have.length', TEST_TAGS.length - 1);
 	});
 
@@ -87,8 +86,8 @@ describe('Workflow tags', () => {
 		wf.getters.createTagButton().click();
 		wf.actions.addTags(TEST_TAGS);
 		wf.getters.nthTagPill(1).click();
-		wf.getters.tagsDropdown().find('li.selected').first().click();
-		cy.get('body').type('{enter}');
+		wf.getters.tagsInDropdown().filter('.selected').first().click();
+		cy.get('body').click(0, 0);
 		wf.getters.tagPills().should('have.length', TEST_TAGS.length - 1);
 	});
 });
diff --git a/cypress/e2e/18-user-management.cy.ts b/cypress/e2e/18-user-management.cy.ts
index f06ba3d6559d9..0dc12647399b1 100644
--- a/cypress/e2e/18-user-management.cy.ts
+++ b/cypress/e2e/18-user-management.cy.ts
@@ -1,7 +1,7 @@
-import { MainSidebar } from './../pages/sidebar/main-sidebar';
-import { DEFAULT_USER_EMAIL, DEFAULT_USER_PASSWORD } from '../constants';
-import { SettingsSidebar, SettingsUsersPage, WorkflowPage, WorkflowsPage } from '../pages';
+import { INSTANCE_MEMBERS, INSTANCE_OWNER, INSTANCE_ADMIN } from '../constants';
+import { MainSidebar, SettingsSidebar, SettingsUsersPage, WorkflowPage } from '../pages';
 import { PersonalSettingsPage } from '../pages/settings-personal';
+import { getVisibleSelect } from '../utils';
 
 /**
  * User A - Instance owner
@@ -15,28 +15,6 @@ import { PersonalSettingsPage } from '../pages/settings-personal';
  * C2 - Credential owned by User C, shared with User A and User B
  */
 
-const instanceOwner = {
-	email: `${DEFAULT_USER_EMAIL}A`,
-	password: DEFAULT_USER_PASSWORD,
-	firstName: 'User',
-	lastName: 'A',
-};
-
-const users = [
-	{
-		email: `${DEFAULT_USER_EMAIL}B`,
-		password: DEFAULT_USER_PASSWORD,
-		firstName: 'User',
-		lastName: 'B',
-	},
-	{
-		email: `${DEFAULT_USER_EMAIL}C`,
-		password: DEFAULT_USER_PASSWORD,
-		firstName: 'User',
-		lastName: 'C',
-	},
-];
-
 const updatedPersonalData = {
 	newFirstName: 'Something',
 	newLastName: 'Else',
@@ -48,67 +26,148 @@ const updatedPersonalData = {
 const usersSettingsPage = new SettingsUsersPage();
 const workflowPage = new WorkflowPage();
 const personalSettingsPage = new PersonalSettingsPage();
+const settingsSidebar = new SettingsSidebar();
+const mainSidebar = new MainSidebar();
 
-describe('User Management', () => {
+describe('User Management', { disableAutoLogin: true }, () => {
 	before(() => {
-		cy.resetAll();
-		cy.setupOwner(instanceOwner);
-	});
-
-	beforeEach(() => {
-		cy.on('uncaught:exception', (err, runnable) => {
-			expect(err.message).to.include('Not logged in');
-			return false;
-		});
-	});
-
-	it(`should invite User B and User C to instance`, () => {
-		cy.inviteUsers({ instanceOwner, users });
+		cy.enableFeature('sharing');
 	});
 
 	it('should prevent non-owners to access UM settings', () => {
-		usersSettingsPage.actions.loginAndVisit(users[0].email, users[0].password, false);
+		usersSettingsPage.actions.loginAndVisit(
+			INSTANCE_MEMBERS[0].email,
+			INSTANCE_MEMBERS[0].password,
+			false,
+		);
 	});
 
 	it('should allow instance owner to access UM settings', () => {
-		usersSettingsPage.actions.loginAndVisit(instanceOwner.email, instanceOwner.password, true);
+		usersSettingsPage.actions.loginAndVisit(INSTANCE_OWNER.email, INSTANCE_OWNER.password, true);
 	});
 
 	it('should properly render UM settings page for instance owners', () => {
-		usersSettingsPage.actions.loginAndVisit(instanceOwner.email, instanceOwner.password, true);
+		usersSettingsPage.actions.loginAndVisit(INSTANCE_OWNER.email, INSTANCE_OWNER.password, true);
 		// All items in user list should be there
-		usersSettingsPage.getters.userListItems().should('have.length', 3);
+		usersSettingsPage.getters.userListItems().should('have.length', 4);
 		// List item for current user should have the `Owner` badge
 		usersSettingsPage.getters
-			.userItem(instanceOwner.email)
+			.userItem(INSTANCE_OWNER.email)
 			.find('.n8n-badge:contains("Owner")')
 			.should('exist');
 		// Other users list items should contain action pop-up list
-		usersSettingsPage.getters.userActionsToggle(users[0].email).should('exist');
-		usersSettingsPage.getters.userActionsToggle(users[1].email).should('exist');
+		usersSettingsPage.getters.userActionsToggle(INSTANCE_MEMBERS[0].email).should('exist');
+		usersSettingsPage.getters.userActionsToggle(INSTANCE_MEMBERS[1].email).should('exist');
+		usersSettingsPage.getters.userActionsToggle(INSTANCE_ADMIN.email).should('exist');
+	});
+
+	it('should be able to change user role to Admin and back', () => {
+		cy.enableFeature('advancedPermissions');
+
+		usersSettingsPage.actions.loginAndVisit(INSTANCE_OWNER.email, INSTANCE_OWNER.password, true);
+
+		// Change role from Member to Admin
+		usersSettingsPage.getters
+			.userRoleSelect(INSTANCE_MEMBERS[0].email)
+			.find('input')
+			.should('contain.value', 'Member');
+		usersSettingsPage.getters.userRoleSelect(INSTANCE_MEMBERS[0].email).click();
+		getVisibleSelect().find('li').contains('Admin').click();
+		usersSettingsPage.getters
+			.userRoleSelect(INSTANCE_MEMBERS[0].email)
+			.find('input')
+			.should('contain.value', 'Admin');
+
+		usersSettingsPage.actions.loginAndVisit(
+			INSTANCE_MEMBERS[0].email,
+			INSTANCE_MEMBERS[0].password,
+			true,
+		);
+
+		// Change role from Admin to Member, then back to Admin
+		usersSettingsPage.getters
+			.userRoleSelect(INSTANCE_ADMIN.email)
+			.find('input')
+			.should('contain.value', 'Admin');
+
+		usersSettingsPage.getters.userRoleSelect(INSTANCE_ADMIN.email).click();
+		getVisibleSelect().find('li').contains('Member').click();
+		usersSettingsPage.getters
+			.userRoleSelect(INSTANCE_ADMIN.email)
+			.find('input')
+			.should('contain.value', 'Member');
+
+		usersSettingsPage.actions.loginAndVisit(INSTANCE_ADMIN.email, INSTANCE_ADMIN.password, false);
+		usersSettingsPage.actions.loginAndVisit(
+			INSTANCE_MEMBERS[0].email,
+			INSTANCE_MEMBERS[0].password,
+			true,
+		);
+
+		usersSettingsPage.getters.userRoleSelect(INSTANCE_ADMIN.email).click();
+		getVisibleSelect().find('li').contains('Admin').click();
+		usersSettingsPage.getters
+			.userRoleSelect(INSTANCE_ADMIN.email)
+			.find('input')
+			.should('contain.value', 'Admin');
+
+		usersSettingsPage.actions.loginAndVisit(INSTANCE_ADMIN.email, INSTANCE_ADMIN.password, true);
+		usersSettingsPage.getters.userRoleSelect(INSTANCE_MEMBERS[0].email).click();
+		getVisibleSelect().find('li').contains('Member').click();
+		usersSettingsPage.getters
+			.userRoleSelect(INSTANCE_MEMBERS[0].email)
+			.find('input')
+			.should('contain.value', 'Member');
+
+		cy.disableFeature('advancedPermissions');
+	});
+
+	it('should be able to change theme', () => {
+		personalSettingsPage.actions.loginAndVisit(INSTANCE_OWNER.email, INSTANCE_OWNER.password);
+
+		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', () => {
-		usersSettingsPage.actions.loginAndVisit(instanceOwner.email, instanceOwner.password, true);
-		usersSettingsPage.actions.opedDeleteDialog(users[0].email);
-		usersSettingsPage.getters.deleteDataRadioButton().realClick();
+		usersSettingsPage.actions.loginAndVisit(INSTANCE_OWNER.email, INSTANCE_OWNER.password, true);
+		usersSettingsPage.actions.opedDeleteDialog(INSTANCE_MEMBERS[0].email);
+		usersSettingsPage.getters.deleteDataRadioButton().click();
 		usersSettingsPage.getters.deleteDataInput().type('delete all data');
-		usersSettingsPage.getters.deleteUserButton().realClick();
+		usersSettingsPage.getters.deleteUserButton().click();
 		workflowPage.getters.successToast().should('contain', 'User deleted');
 	});
 
 	it('should delete user and transfer their data', () => {
-		usersSettingsPage.actions.loginAndVisit(instanceOwner.email, instanceOwner.password, true);
-		usersSettingsPage.actions.opedDeleteDialog(users[1].email);
-		usersSettingsPage.getters.transferDataRadioButton().realClick();
-		usersSettingsPage.getters.userSelectDropDown().realClick();
-		usersSettingsPage.getters.userSelectOptions().first().realClick();
-		usersSettingsPage.getters.deleteUserButton().realClick();
+		usersSettingsPage.actions.loginAndVisit(INSTANCE_OWNER.email, INSTANCE_OWNER.password, true);
+		usersSettingsPage.actions.opedDeleteDialog(INSTANCE_MEMBERS[1].email);
+		usersSettingsPage.getters.transferDataRadioButton().click();
+		usersSettingsPage.getters.userSelectDropDown().click();
+		usersSettingsPage.getters.userSelectOptions().first().click();
+		usersSettingsPage.getters.deleteUserButton().click();
 		workflowPage.getters.successToast().should('contain', 'User deleted');
 	});
 
 	it(`should allow user to change their personal data`, () => {
-		personalSettingsPage.actions.loginAndVisit(instanceOwner.email, instanceOwner.password);
+		personalSettingsPage.actions.loginAndVisit(INSTANCE_OWNER.email, INSTANCE_OWNER.password);
 		personalSettingsPage.actions.updateFirstAndLastName(
 			updatedPersonalData.newFirstName,
 			updatedPersonalData.newLastName,
@@ -120,14 +179,16 @@ describe('User Management', () => {
 	});
 
 	it(`shouldn't allow user to set weak password`, () => {
-		personalSettingsPage.actions.loginAndVisit(instanceOwner.email, instanceOwner.password);
+		personalSettingsPage.actions.loginAndVisit(INSTANCE_OWNER.email, INSTANCE_OWNER.password);
+		personalSettingsPage.getters.changePasswordLink().click();
 		for (let weakPass of updatedPersonalData.invalidPasswords) {
-			personalSettingsPage.actions.tryToSetWeakPassword(instanceOwner.password, weakPass);
+			personalSettingsPage.actions.tryToSetWeakPassword(INSTANCE_OWNER.password, weakPass);
 		}
 	});
 
 	it(`shouldn't allow user to change password if old password is wrong`, () => {
-		personalSettingsPage.actions.loginAndVisit(instanceOwner.email, instanceOwner.password);
+		personalSettingsPage.actions.loginAndVisit(INSTANCE_OWNER.email, INSTANCE_OWNER.password);
+		personalSettingsPage.getters.changePasswordLink().click();
 		personalSettingsPage.actions.updatePassword('iCannotRemember', updatedPersonalData.newPassword);
 		workflowPage.getters
 			.errorToast()
@@ -136,21 +197,22 @@ describe('User Management', () => {
 	});
 
 	it(`should change current user password`, () => {
-		personalSettingsPage.actions.loginAndVisit(instanceOwner.email, instanceOwner.password);
+		personalSettingsPage.actions.loginAndVisit(INSTANCE_OWNER.email, INSTANCE_OWNER.password);
+		personalSettingsPage.getters.changePasswordLink().click();
 		personalSettingsPage.actions.updatePassword(
-			instanceOwner.password,
+			INSTANCE_OWNER.password,
 			updatedPersonalData.newPassword,
 		);
 		workflowPage.getters.successToast().should('contain', 'Password updated');
 		personalSettingsPage.actions.loginWithNewData(
-			instanceOwner.email,
+			INSTANCE_OWNER.email,
 			updatedPersonalData.newPassword,
 		);
 	});
 
 	it(`shouldn't allow users to set invalid email`, () => {
 		personalSettingsPage.actions.loginAndVisit(
-			instanceOwner.email,
+			INSTANCE_OWNER.email,
 			updatedPersonalData.newPassword,
 		);
 		// try without @ part
@@ -161,7 +223,7 @@ describe('User Management', () => {
 
 	it(`should change user email`, () => {
 		personalSettingsPage.actions.loginAndVisit(
-			instanceOwner.email,
+			INSTANCE_OWNER.email,
 			updatedPersonalData.newPassword,
 		);
 		personalSettingsPage.actions.updateEmail(updatedPersonalData.newEmail);
diff --git a/cypress/e2e/19-execution.cy.ts b/cypress/e2e/19-execution.cy.ts
index 6ad2ce6592fa1..1855bdb43be66 100644
--- a/cypress/e2e/19-execution.cy.ts
+++ b/cypress/e2e/19-execution.cy.ts
@@ -1,14 +1,14 @@
 import { v4 as uuid } from 'uuid';
-import { NDV, WorkflowPage as WorkflowPageClass, WorkflowsPage } from '../pages';
+import { NDV, WorkflowExecutionsTab, WorkflowPage as WorkflowPageClass } from '../pages';
+import { SCHEDULE_TRIGGER_NODE_NAME, EDIT_FIELDS_SET_NODE_NAME } from '../constants';
 
-const workflowsPage = new WorkflowsPage();
 const workflowPage = new WorkflowPageClass();
+const executionsTab = new WorkflowExecutionsTab();
 const ndv = new NDV();
 
 describe('Execution', () => {
 	beforeEach(() => {
-		cy.resetAll();
-		cy.skipSetup();
+		workflowPage.actions.visit();
 	});
 
 	it('should test manual workflow', () => {
@@ -106,7 +106,7 @@ describe('Execution', () => {
 			.canvasNodeByName('Set')
 			.within(() => cy.get('.fa-check').should('not.exist'));
 
-		cy.wait(1000);
+		workflowPage.getters.stopExecutionButton().should('exist');
 		workflowPage.getters.stopExecutionButton().click();
 
 		// Check canvas nodes after workflow stopped
@@ -114,10 +114,6 @@ describe('Execution', () => {
 			.canvasNodeByName('Manual')
 			.within(() => cy.get('.fa-check'))
 			.should('exist');
-		workflowPage.getters
-			.canvasNodeByName('Wait')
-			.within(() => cy.get('.fa-check'))
-			.should('exist');
 		workflowPage.getters
 			.canvasNodeByName('Wait')
 			.within(() => cy.get('.fa-sync-alt').should('not.visible'));
@@ -193,10 +189,6 @@ describe('Execution', () => {
 			.canvasNodeByName('Webhook')
 			.within(() => cy.get('.fa-check'))
 			.should('exist');
-		workflowPage.getters
-			.canvasNodeByName('Wait')
-			.within(() => cy.get('.fa-check'))
-			.should('exist');
 		workflowPage.getters
 			.canvasNodeByName('Set')
 			.within(() => cy.get('.fa-check'))
@@ -264,16 +256,11 @@ describe('Execution', () => {
 			.canvasNodeByName('Set')
 			.within(() => cy.get('.fa-check').should('not.exist'));
 
-
 		// Check canvas nodes after workflow stopped
 		workflowPage.getters
 			.canvasNodeByName('Webhook')
 			.within(() => cy.get('.fa-check'))
 			.should('exist');
-		workflowPage.getters
-			.canvasNodeByName('Wait')
-			.within(() => cy.get('.fa-check'))
-			.should('exist');
 		workflowPage.getters
 			.canvasNodeByName('Wait')
 			.within(() => cy.get('.fa-sync-alt').should('not.visible'));
@@ -289,4 +276,347 @@ describe('Execution', () => {
 		// Check success toast (works because Cypress waits enough for the element to show after the http request node has finished)
 		workflowPage.getters.successToast().should('be.visible');
 	});
+
+	describe('execution preview', () => {
+		it('when deleting the last execution, it should show empty state', () => {
+			workflowPage.actions.addInitialNodeToCanvas('Manual Trigger');
+			workflowPage.actions.executeWorkflow();
+			executionsTab.actions.switchToExecutionsTab();
+
+			executionsTab.actions.deleteExecutionInPreview();
+
+			executionsTab.getters.successfulExecutionListItems().should('have.length', 0);
+			workflowPage.getters.successToast().contains('Execution deleted');
+		});
+	});
+
+	describe('connections should be colored differently for pinned data', () => {
+		beforeEach(() => {
+			cy.createFixtureWorkflow('Schedule_pinned.json', `Schedule pinned ${uuid()}`);
+			workflowPage.actions.deselectAll();
+			workflowPage.getters.zoomToFitButton().click();
+
+			workflowPage.getters
+				.getConnectionBetweenNodes('Schedule Trigger', 'Edit Fields')
+				.should('have.class', 'success')
+				.should('have.class', 'pinned')
+				.should('not.have.class', 'has-run');
+
+			workflowPage.getters
+				.getConnectionBetweenNodes('Schedule Trigger', 'Edit Fields1')
+				.should('have.class', 'success')
+				.should('have.class', 'pinned')
+				.should('not.have.class', 'has-run');
+
+			workflowPage.getters
+				.getConnectionBetweenNodes('Edit Fields5', 'Edit Fields6')
+				.should('not.have.class', 'success')
+				.should('not.have.class', 'pinned');
+
+			workflowPage.getters
+				.getConnectionBetweenNodes('Edit Fields7', 'Edit Fields9')
+				.should('have.class', 'success')
+				.should('have.class', 'pinned')
+				.should('not.have.class', 'has-run');
+
+			workflowPage.getters
+				.getConnectionBetweenNodes('Edit Fields1', 'Edit Fields2')
+				.should('not.have.class', 'success')
+				.should('not.have.class', 'pinned');
+
+			workflowPage.getters
+				.getConnectionBetweenNodes('Edit Fields2', 'Edit Fields3')
+				.should('have.class', 'success')
+				.should('have.class', 'pinned')
+				.should('not.have.class', 'has-run');
+		});
+
+		it('when executing the workflow', () => {
+			workflowPage.actions.executeWorkflow();
+
+			workflowPage.getters
+				.getConnectionBetweenNodes('Schedule Trigger', 'Edit Fields')
+				.should('have.class', 'success')
+				.should('have.class', 'pinned')
+				.should('have.class', 'has-run');
+
+			workflowPage.getters
+				.getConnectionBetweenNodes('Schedule Trigger', 'Edit Fields1')
+				.should('have.class', 'success')
+				.should('have.class', 'pinned')
+				.should('have.class', 'has-run');
+
+			workflowPage.getters
+				.getConnectionBetweenNodes('Edit Fields5', 'Edit Fields6')
+				.should('have.class', 'success')
+				.should('not.have.class', 'pinned')
+				.should('not.have.class', 'has-run');
+
+			workflowPage.getters
+				.getConnectionBetweenNodes('Edit Fields7', 'Edit Fields9')
+				.should('have.class', 'success')
+				.should('have.class', 'pinned')
+				.should('have.class', 'has-run');
+
+			workflowPage.getters
+				.getConnectionBetweenNodes('Edit Fields1', 'Edit Fields2')
+				.should('have.class', 'success')
+				.should('not.have.class', 'pinned')
+				.should('not.have.class', 'has-run');
+
+			workflowPage.getters
+				.getConnectionBetweenNodes('Edit Fields2', 'Edit Fields3')
+				.should('have.class', 'success')
+				.should('have.class', 'pinned')
+				.should('have.class', 'has-run');
+		});
+
+		it('when executing a node', () => {
+			workflowPage.actions.executeNode('Edit Fields3');
+
+			workflowPage.getters
+				.getConnectionBetweenNodes('Schedule Trigger', 'Edit Fields')
+				.should('have.class', 'success')
+				.should('have.class', 'pinned')
+				.should('have.class', 'has-run');
+
+			workflowPage.getters
+				.getConnectionBetweenNodes('Schedule Trigger', 'Edit Fields1')
+				.should('have.class', 'success')
+				.should('have.class', 'pinned')
+				.should('have.class', 'has-run');
+
+			workflowPage.getters
+				.getConnectionBetweenNodes('Edit Fields5', 'Edit Fields6')
+				.should('not.have.class', 'success')
+				.should('not.have.class', 'pinned')
+				.should('not.have.class', 'has-run');
+
+			workflowPage.getters
+				.getConnectionBetweenNodes('Edit Fields7', 'Edit Fields9')
+				.should('have.class', 'success')
+				.should('have.class', 'pinned')
+				.should('not.have.class', 'has-run');
+
+			workflowPage.getters
+				.getConnectionBetweenNodes('Edit Fields1', 'Edit Fields2')
+				.should('have.class', 'success')
+				.should('not.have.class', 'pinned')
+				.should('not.have.class', 'has-run');
+
+			workflowPage.getters
+				.getConnectionBetweenNodes('Edit Fields2', 'Edit Fields3')
+				.should('have.class', 'success')
+				.should('have.class', 'pinned')
+				.should('have.class', 'has-run');
+		});
+
+		it('when connecting pinned node by output drag and drop', () => {
+			cy.drag(
+				workflowPage.getters.getEndpointSelector('output', SCHEDULE_TRIGGER_NODE_NAME),
+				[-200, -300],
+			);
+			workflowPage.getters.nodeCreatorSearchBar().should('be.visible');
+			workflowPage.actions.addNodeToCanvas(EDIT_FIELDS_SET_NODE_NAME, false);
+			cy.drag('[data-test-id="canvas-node"].jtk-drag-selected', [150, 200], {
+				clickToFinish: true,
+			});
+
+			workflowPage.getters
+				.getConnectionBetweenNodes('Schedule Trigger', 'Edit Fields8')
+				.should('have.class', 'success')
+				.should('have.class', 'pinned')
+				.should('not.have.class', 'has-run');
+
+			workflowPage.actions.executeWorkflow();
+
+			workflowPage.getters
+				.getConnectionBetweenNodes('Schedule Trigger', 'Edit Fields8')
+				.should('have.class', 'success')
+				.should('have.class', 'pinned')
+				.should('have.class', 'has-run');
+
+			cy.drag(workflowPage.getters.getEndpointSelector('output', 'Edit Fields2'), [-200, -300]);
+			workflowPage.getters.nodeCreatorSearchBar().should('be.visible');
+			workflowPage.actions.addNodeToCanvas(EDIT_FIELDS_SET_NODE_NAME, false);
+			cy.drag('[data-test-id="canvas-node"].jtk-drag-selected', [150, 200], {
+				clickToFinish: true,
+			});
+
+			workflowPage.getters
+				.getConnectionBetweenNodes('Edit Fields2', 'Edit Fields11')
+				.should('have.class', 'success')
+				.should('have.class', 'pinned')
+				.should('have.class', 'has-run');
+		});
+
+		it('when connecting pinned node after adding an unconnected node', () => {
+			workflowPage.actions.addNodeToCanvas(EDIT_FIELDS_SET_NODE_NAME);
+
+			cy.draganddrop(
+				workflowPage.getters.getEndpointSelector('output', SCHEDULE_TRIGGER_NODE_NAME),
+				workflowPage.getters.getEndpointSelector('input', 'Edit Fields8'),
+			);
+			workflowPage.getters.zoomToFitButton().click();
+
+			workflowPage.getters
+				.getConnectionBetweenNodes('Schedule Trigger', 'Edit Fields8')
+				.should('have.class', 'success')
+				.should('have.class', 'pinned')
+				.should('not.have.class', 'has-run');
+
+			workflowPage.actions.executeWorkflow();
+
+			workflowPage.getters
+				.getConnectionBetweenNodes('Schedule Trigger', 'Edit Fields8')
+				.should('have.class', 'success')
+				.should('have.class', 'pinned')
+				.should('have.class', 'has-run');
+
+			workflowPage.actions.deselectAll();
+			workflowPage.actions.addNodeToCanvas(EDIT_FIELDS_SET_NODE_NAME);
+			workflowPage.getters.zoomToFitButton().click();
+
+			cy.draganddrop(
+				workflowPage.getters.getEndpointSelector('output', 'Edit Fields7'),
+				workflowPage.getters.getEndpointSelector('input', 'Edit Fields11'),
+			);
+
+			workflowPage.getters
+				.getConnectionBetweenNodes('Edit Fields7', 'Edit Fields11')
+				.should('have.class', 'success')
+				.should('have.class', 'pinned')
+				.should('have.class', 'has-run');
+		});
+	});
+
+	it('should send proper payload for node rerun', () => {
+		cy.createFixtureWorkflow(
+			'Multiple_trigger_node_rerun.json',
+			`Multiple trigger node rerun ${uuid()}`,
+		);
+
+		workflowPage.getters.zoomToFitButton().click();
+		workflowPage.getters.executeWorkflowButton().click();
+
+		workflowPage.getters.clearExecutionDataButton().should('be.visible');
+
+		cy.intercept('POST', '/rest/workflows/run').as('workflowRun');
+
+		workflowPage.getters
+			.canvasNodeByName('do something with them')
+			.findChildByTestId('execute-node-button')
+			.click({ force: true });
+
+		cy.wait('@workflowRun').then((interception) => {
+			expect(interception.request.body).to.have.property('runData').that.is.an('object');
+			const expectedKeys = ['When clicking "Test workflow"', 'fetch 5 random users'];
+
+			expect(Object.keys(interception.request.body.runData)).to.have.lengthOf(expectedKeys.length);
+			expect(interception.request.body.runData).to.include.all.keys(expectedKeys);
+		});
+	});
+
+	it('should send proper payload for manual node run', () => {
+		cy.createFixtureWorkflow(
+			'Check_manual_node_run_for_pinned_and_rundata.json',
+			`Check manual node run for pinned and rundata ${uuid()}`,
+		);
+
+		workflowPage.getters.zoomToFitButton().click();
+
+		cy.intercept('POST', '/rest/workflows/run').as('workflowRun');
+
+		workflowPage.getters
+			.canvasNodeByName('If')
+			.findChildByTestId('execute-node-button')
+			.click({ force: true });
+
+		cy.wait('@workflowRun').then((interception) => {
+			expect(interception.request.body).not.to.have.property('runData').that.is.an('object');
+			expect(interception.request.body).to.have.property('pinData').that.is.an('object');
+			const expectedPinnedDataKeys = ['Webhook'];
+
+			expect(Object.keys(interception.request.body.pinData)).to.have.lengthOf(
+				expectedPinnedDataKeys.length,
+			);
+			expect(interception.request.body.pinData).to.include.all.keys(expectedPinnedDataKeys);
+		});
+
+		workflowPage.getters.clearExecutionDataButton().should('be.visible');
+
+		cy.intercept('POST', '/rest/workflows/run').as('workflowRun');
+
+		workflowPage.getters
+			.canvasNodeByName('NoOp2')
+			.findChildByTestId('execute-node-button')
+			.click({ force: true });
+
+		cy.wait('@workflowRun').then((interception) => {
+			expect(interception.request.body).to.have.property('runData').that.is.an('object');
+			expect(interception.request.body).to.have.property('pinData').that.is.an('object');
+			const expectedPinnedDataKeys = ['Webhook'];
+			const expectedRunDataKeys = ['If', 'Webhook'];
+
+			expect(Object.keys(interception.request.body.pinData)).to.have.lengthOf(
+				expectedPinnedDataKeys.length,
+			);
+			expect(interception.request.body.pinData).to.include.all.keys(expectedPinnedDataKeys);
+
+			expect(Object.keys(interception.request.body.runData)).to.have.lengthOf(
+				expectedRunDataKeys.length,
+			);
+			expect(interception.request.body.runData).to.include.all.keys(expectedRunDataKeys);
+		});
+	});
+
+	it('should successfully execute partial executions with nodes attached to the second output', () => {
+		cy.createFixtureWorkflow(
+			'Test_Workflow_pairedItem_incomplete_manual_bug.json',
+			'My test workflow',
+		);
+
+		cy.intercept('POST', '/rest/workflows/run').as('workflowRun');
+
+		workflowPage.getters.zoomToFitButton().click();
+		workflowPage.getters.executeWorkflowButton().click();
+		workflowPage.getters
+			.canvasNodeByName('Test Expression')
+			.findChildByTestId('execute-node-button')
+			.click({ force: true });
+
+		// Check  toast (works because Cypress waits enough for the element to show after the http request node has finished)
+		// Wait for the execution to return.
+		cy.wait('@workflowRun');
+		// Wait again for the websocket message to arrive and the UI to update.
+		cy.wait(100);
+		workflowPage.getters.errorToast({ timeout: 1 }).should('not.exist');
+	});
+
+	it('should execute workflow partially up to the node that has issues', () => {
+		cy.createFixtureWorkflow(
+			'Test_workflow_partial_execution_with_missing_credentials.json',
+			'My test workflow',
+		);
+
+		cy.intercept('POST', '/rest/workflows/run').as('workflowRun');
+
+		workflowPage.getters.zoomToFitButton().click();
+		workflowPage.getters.executeWorkflowButton().click();
+
+		// Wait for the execution to return.
+		cy.wait('@workflowRun');
+
+		// Check that the previous nodes executed successfully
+		workflowPage.getters
+			.canvasNodeByName('DebugHelper')
+			.within(() => cy.get('.fa-check'))
+			.should('exist');
+		workflowPage.getters
+			.canvasNodeByName('Filter')
+			.within(() => cy.get('.fa-check'))
+			.should('exist');
+
+		workflowPage.getters.errorToast().should('contain', `Problem in node ‘Telegram‘`);
+	});
 });
diff --git a/cypress/e2e/2-credentials.cy.ts b/cypress/e2e/2-credentials.cy.ts
index 17d51ebb0ded4..008758aef2f75 100644
--- a/cypress/e2e/2-credentials.cy.ts
+++ b/cypress/e2e/2-credentials.cy.ts
@@ -1,29 +1,18 @@
 import {
-	NEW_NOTION_ACCOUNT_NAME,
-	NOTION_NODE_NAME,
-	PIPEDRIVE_NODE_NAME,
-	HTTP_REQUEST_NODE_NAME,
-	NEW_QUERY_AUTH_ACCOUNT_NAME,
-} from './../constants';
-import {
-	DEFAULT_USER_EMAIL,
-	DEFAULT_USER_PASSWORD,
 	GMAIL_NODE_NAME,
+	HTTP_REQUEST_NODE_NAME,
 	NEW_GOOGLE_ACCOUNT_NAME,
+	NEW_NOTION_ACCOUNT_NAME,
+	NEW_QUERY_AUTH_ACCOUNT_NAME,
 	NEW_TRELLO_ACCOUNT_NAME,
+	NOTION_NODE_NAME,
+	PIPEDRIVE_NODE_NAME,
 	SCHEDULE_TRIGGER_NODE_NAME,
 	TRELLO_NODE_NAME,
 } from '../constants';
-import { randFirstName, randLastName } from '@ngneat/falso';
-import { CredentialsPage, CredentialsModal, WorkflowPage, NDV } from '../pages';
-import CustomNodeWithN8nCredentialFixture from '../fixtures/Custom_node_n8n_credential.json';
-import CustomNodeWithCustomCredentialFixture from '../fixtures/Custom_node_custom_credential.json';
-import CustomCredential from '../fixtures/Custom_credential.json';
-
-const email = DEFAULT_USER_EMAIL;
-const password = DEFAULT_USER_PASSWORD;
-const firstName = randFirstName();
-const lastName = randLastName();
+import { CredentialsModal, CredentialsPage, NDV, WorkflowPage } from '../pages';
+import { getVisibleSelect } from '../utils';
+
 const credentialsPage = new CredentialsPage();
 const credentialsModal = new CredentialsModal();
 const workflowPage = new WorkflowPage();
@@ -32,11 +21,6 @@ const nodeDetailsView = new NDV();
 const NEW_CREDENTIAL_NAME = 'Something else';
 
 describe('Credentials', () => {
-	before(() => {
-		cy.resetAll();
-		cy.skipSetup();
-	});
-
 	beforeEach(() => {
 		cy.visit(credentialsPage.url);
 	});
@@ -49,7 +33,7 @@ describe('Credentials', () => {
 		credentialsModal.getters.newCredentialTypeOption('Notion API').click();
 
 		credentialsModal.getters.newCredentialTypeButton().click();
-		credentialsModal.getters.connectionParameter('API Key').type('1234567890');
+		credentialsModal.getters.connectionParameter('Internal Integration Secret').type('1234567890');
 
 		credentialsModal.actions.setName('My awesome Notion account');
 		credentialsModal.actions.save();
@@ -58,7 +42,7 @@ describe('Credentials', () => {
 		credentialsPage.getters.credentialCards().should('have.length', 1);
 	});
 
-	it('should create a new credential using Add Credential button', () => {
+	it.skip('should create a new credential using Add Credential button', () => {
 		credentialsPage.getters.createCredentialButton().click();
 
 		credentialsModal.getters.newCredentialModal().should('be.visible');
@@ -76,7 +60,7 @@ describe('Credentials', () => {
 		credentialsPage.getters.credentialCards().should('have.length', 2);
 	});
 
-	it('should search credentials', () => {
+	it.skip('should search credentials', () => {
 		// Search by name
 		credentialsPage.actions.search('Notion');
 		credentialsPage.getters.credentialCards().should('have.length', 1);
@@ -105,13 +89,16 @@ describe('Credentials', () => {
 		workflowPage.getters.canvasNodes().last().click();
 		cy.get('body').type('{enter}');
 		workflowPage.getters.nodeCredentialsSelect().click();
-		workflowPage.getters.nodeCredentialsSelect().find('li').last().click();
+		getVisibleSelect().find('li').last().click();
 		credentialsModal.getters.credentialsEditModal().should('be.visible');
 		credentialsModal.getters.credentialAuthTypeRadioButtons().should('have.length', 2);
 		credentialsModal.getters.credentialAuthTypeRadioButtons().first().click();
 		credentialsModal.actions.fillCredentialsForm();
 		cy.get('.el-message-box').find('button').contains('Close').click();
-		workflowPage.getters.nodeCredentialsSelect().should('contain', NEW_GOOGLE_ACCOUNT_NAME);
+		workflowPage.getters
+			.nodeCredentialsSelect()
+			.find('input')
+			.should('have.value', NEW_GOOGLE_ACCOUNT_NAME);
 	});
 
 	it('should show multiple credential types in the same dropdown', () => {
@@ -122,7 +109,7 @@ describe('Credentials', () => {
 		cy.get('body').type('{enter}');
 		workflowPage.getters.nodeCredentialsSelect().click();
 		// Add oAuth credentials
-		workflowPage.getters.nodeCredentialsSelect().find('li').last().click();
+		getVisibleSelect().find('li').last().click();
 		credentialsModal.getters.credentialsEditModal().should('be.visible');
 		credentialsModal.getters.credentialAuthTypeRadioButtons().should('have.length', 2);
 		credentialsModal.getters.credentialAuthTypeRadioButtons().first().click();
@@ -130,13 +117,14 @@ describe('Credentials', () => {
 		cy.get('.el-message-box').find('button').contains('Close').click();
 		workflowPage.getters.nodeCredentialsSelect().click();
 		// Add Service account credentials
-		workflowPage.getters.nodeCredentialsSelect().find('li').last().click();
+		getVisibleSelect().find('li').last().click();
 		credentialsModal.getters.credentialsEditModal().should('be.visible');
 		credentialsModal.getters.credentialAuthTypeRadioButtons().should('have.length', 2);
 		credentialsModal.getters.credentialAuthTypeRadioButtons().last().click();
 		credentialsModal.actions.fillCredentialsForm();
 		// Both (+ the 'Create new' option) should be in the dropdown
-		workflowPage.getters.nodeCredentialsSelect().find('li').should('have.length.greaterThan', 3);
+		workflowPage.getters.nodeCredentialsSelect().click();
+		getVisibleSelect().find('li').should('have.length.greaterThan', 2);
 	});
 
 	it('should correctly render required and optional credentials', () => {
@@ -147,18 +135,18 @@ describe('Credentials', () => {
 		// Select incoming authentication
 		nodeDetailsView.getters.parameterInput('incomingAuthentication').should('exist');
 		nodeDetailsView.getters.parameterInput('incomingAuthentication').click();
-		nodeDetailsView.getters.parameterInput('incomingAuthentication').find('li').first().click();
+		getVisibleSelect().find('li').first().click();
 		// There should be two credential fields
 		workflowPage.getters.nodeCredentialsSelect().should('have.length', 2);
 
 		workflowPage.getters.nodeCredentialsSelect().first().click();
-		workflowPage.getters.nodeCredentialsSelect().first().find('li').last().click();
+		getVisibleSelect().find('li').last().click();
 		// This one should show auth type selector
 		credentialsModal.getters.credentialAuthTypeRadioButtons().should('have.length', 2);
 		cy.get('body').type('{esc}');
 
 		workflowPage.getters.nodeCredentialsSelect().last().click();
-		workflowPage.getters.nodeCredentialsSelect().last().find('li').last().click();
+		getVisibleSelect().find('li').last().click();
 		// This one should not show auth type selector
 		credentialsModal.getters.credentialsAuthTypeSelector().should('not.exist');
 	});
@@ -170,10 +158,13 @@ describe('Credentials', () => {
 		workflowPage.getters.canvasNodes().last().click();
 		cy.get('body').type('{enter}');
 		workflowPage.getters.nodeCredentialsSelect().click();
-		workflowPage.getters.nodeCredentialsSelect().find('li').last().click();
+		getVisibleSelect().find('li').last().click();
 		credentialsModal.getters.credentialsAuthTypeSelector().should('not.exist');
 		credentialsModal.actions.fillCredentialsForm();
-		workflowPage.getters.nodeCredentialsSelect().should('contain', NEW_TRELLO_ACCOUNT_NAME);
+		workflowPage.getters
+			.nodeCredentialsSelect()
+			.find('input')
+			.should('have.value', NEW_TRELLO_ACCOUNT_NAME);
 	});
 
 	it('should delete credentials from NDV', () => {
@@ -183,16 +174,22 @@ describe('Credentials', () => {
 		workflowPage.getters.canvasNodes().last().click();
 		cy.get('body').type('{enter}');
 		workflowPage.getters.nodeCredentialsSelect().click();
-		workflowPage.getters.nodeCredentialsSelect().find('li').last().click();
+		getVisibleSelect().find('li').last().click();
 		credentialsModal.actions.fillCredentialsForm();
-		workflowPage.getters.nodeCredentialsSelect().should('contain', NEW_NOTION_ACCOUNT_NAME);
+		workflowPage.getters
+			.nodeCredentialsSelect()
+			.find('input')
+			.should('have.value', NEW_NOTION_ACCOUNT_NAME);
 
 		workflowPage.getters.nodeCredentialsEditButton().click();
 		credentialsModal.getters.credentialsEditModal().should('be.visible');
 		credentialsModal.getters.deleteButton().click();
 		cy.get('.el-message-box').find('button').contains('Yes').click();
 		workflowPage.getters.successToast().contains('Credential deleted');
-		workflowPage.getters.nodeCredentialsSelect().should('not.contain', NEW_TRELLO_ACCOUNT_NAME);
+		workflowPage.getters
+			.nodeCredentialsSelect()
+			.find('input')
+			.should('not.have.value', NEW_TRELLO_ACCOUNT_NAME);
 	});
 
 	it('should rename credentials from NDV', () => {
@@ -202,17 +199,18 @@ describe('Credentials', () => {
 		workflowPage.getters.canvasNodes().last().click();
 		cy.get('body').type('{enter}');
 		workflowPage.getters.nodeCredentialsSelect().click();
-		workflowPage.getters.nodeCredentialsSelect().find('li').last().click();
+		getVisibleSelect().find('li').last().click();
 		credentialsModal.actions.fillCredentialsForm();
-		workflowPage.getters.nodeCredentialsSelect().should('contain', NEW_TRELLO_ACCOUNT_NAME);
-
 		workflowPage.getters.nodeCredentialsEditButton().click();
 		credentialsModal.getters.credentialsEditModal().should('be.visible');
 		credentialsModal.getters.name().click();
 		credentialsModal.actions.renameCredential(NEW_CREDENTIAL_NAME);
 		credentialsModal.getters.saveButton().click();
 		credentialsModal.getters.closeButton().click();
-		workflowPage.getters.nodeCredentialsSelect().should('contain', NEW_CREDENTIAL_NAME);
+		workflowPage.getters
+			.nodeCredentialsSelect()
+			.find('input')
+			.should('have.value', NEW_CREDENTIAL_NAME);
 	});
 
 	it('should setup generic authentication for HTTP node', () => {
@@ -222,20 +220,45 @@ describe('Credentials', () => {
 		workflowPage.getters.canvasNodes().last().click();
 		cy.get('body').type('{enter}');
 		nodeDetailsView.getters.parameterInput('authentication').click();
-		nodeDetailsView.getters.parameterInput('authentication').find('li').should('have.length', 3);
-		nodeDetailsView.getters.parameterInput('authentication').find('li').last().click();
+		getVisibleSelect().find('li').should('have.length', 3);
+		getVisibleSelect().find('li').last().click();
 		nodeDetailsView.getters.parameterInput('genericAuthType').should('exist');
 		nodeDetailsView.getters.parameterInput('genericAuthType').click();
-		nodeDetailsView.getters
-			.parameterInput('genericAuthType')
-			.find('li')
-			.should('have.length.greaterThan', 0);
-		nodeDetailsView.getters.parameterInput('genericAuthType').find('li').last().click();
+		getVisibleSelect().find('li').should('have.length.greaterThan', 0);
+		getVisibleSelect().find('li').last().click();
 
 		workflowPage.getters.nodeCredentialsSelect().should('exist');
 		workflowPage.getters.nodeCredentialsSelect().click();
-		workflowPage.getters.nodeCredentialsSelect().find('li').last().click();
+		getVisibleSelect().find('li').last().click();
 		credentialsModal.actions.fillCredentialsForm();
-		workflowPage.getters.nodeCredentialsSelect().should('contain', NEW_QUERY_AUTH_ACCOUNT_NAME);
+		workflowPage.getters
+			.nodeCredentialsSelect()
+			.find('input')
+			.should('have.value', NEW_QUERY_AUTH_ACCOUNT_NAME);
+	});
+
+	it('should not show OAuth redirect URL section when OAuth2 credentials are overridden', () => {
+		cy.intercept('/types/credentials.json', { middleware: true }, (req) => {
+			req.headers['cache-control'] = 'no-cache, no-store';
+
+			req.on('response', (res) => {
+				const credentials = res.body || [];
+
+				const index = credentials.findIndex((c) => c.name === 'slackOAuth2Api');
+
+				credentials[index] = {
+					...credentials[index],
+					__overwrittenProperties: ['clientId', 'clientSecret'],
+				};
+			});
+		});
+
+		workflowPage.actions.visit(true);
+		workflowPage.actions.addNodeToCanvas('Slack');
+		workflowPage.actions.openNode('Slack');
+		workflowPage.getters.nodeCredentialsSelect().click();
+		getVisibleSelect().find('li').last().click();
+		credentialsModal.getters.credentialAuthTypeRadioButtons().first().click();
+		nodeDetailsView.getters.copyInput().should('not.exist');
 	});
 });
diff --git a/cypress/e2e/20-workflow-executions.cy.ts b/cypress/e2e/20-workflow-executions.cy.ts
index 1e40b7dcc4f8e..37036a7971d6e 100644
--- a/cypress/e2e/20-workflow-executions.cy.ts
+++ b/cypress/e2e/20-workflow-executions.cy.ts
@@ -1,29 +1,27 @@
 import { WorkflowPage } from '../pages';
 import { WorkflowExecutionsTab } from '../pages/workflow-executions-tab';
+import type { RouteHandler } from 'cypress/types/net-stubbing';
 
 const workflowPage = new WorkflowPage();
 const executionsTab = new WorkflowExecutionsTab();
+const executionsRefreshInterval = 4000;
 
 // Test suite for executions tab
 describe('Current Workflow Executions', () => {
-	before(() => {
-		cy.resetAll();
-		cy.skipSetup();
-	});
-
 	beforeEach(() => {
 		workflowPage.actions.visit();
 		cy.createFixtureWorkflow('Test_workflow_4_executions_view.json', `My test workflow`);
-		createMockExecutions();
 	});
 
 	it('should render executions tab correctly', () => {
+		createMockExecutions();
 		cy.intercept('GET', '/rest/executions?filter=*').as('getExecutions');
-		cy.intercept('GET', '/rest/executions-current?filter=*').as('getCurrentExecutions');
 
 		executionsTab.actions.switchToExecutionsTab();
 
-		cy.wait(['@getExecutions', '@getCurrentExecutions']);
+		cy.wait(['@getExecutions']);
+
+		executionsTab.getters.executionsList().scrollTo(0, 500).wait(0);
 
 		executionsTab.getters.executionListItems().should('have.length', 11);
 		executionsTab.getters.successfulExecutionListItems().should('have.length', 9);
@@ -34,10 +32,48 @@ describe('Current Workflow Executions', () => {
 			.invoke('attr', 'class')
 			.should('match', /_active_/);
 	});
+
+	it('should not redirect back to execution tab when request is not done before leaving the page', () => {
+		cy.intercept('GET', '/rest/executions?filter=*');
+		cy.intercept('GET', '/rest/executions/active?filter=*');
+
+		executionsTab.actions.switchToExecutionsTab();
+		executionsTab.actions.switchToEditorTab();
+		cy.wait(executionsRefreshInterval);
+		cy.url().should('not.include', '/executions');
+		executionsTab.actions.switchToExecutionsTab();
+		executionsTab.actions.switchToEditorTab();
+		executionsTab.actions.switchToExecutionsTab();
+		executionsTab.actions.switchToEditorTab();
+		executionsTab.actions.switchToExecutionsTab();
+		executionsTab.actions.switchToEditorTab();
+		cy.wait(executionsRefreshInterval);
+		cy.url().should('not.include', '/executions');
+		executionsTab.actions.switchToExecutionsTab();
+		cy.wait(1000);
+		executionsTab.actions.switchToEditorTab();
+		cy.wait(executionsRefreshInterval);
+		cy.url().should('not.include', '/executions');
+	});
+
+	it('should not redirect back to execution tab when slow request is not done before leaving the page', () => {
+		const throttleResponse: RouteHandler = (req) => {
+			return new Promise((resolve) => {
+				setTimeout(() => resolve(req.continue()), 2000);
+			});
+		};
+
+		cy.intercept('GET', '/rest/executions?filter=*', throttleResponse);
+		cy.intercept('GET', '/rest/executions/active?filter=*', throttleResponse);
+
+		executionsTab.actions.switchToExecutionsTab();
+		executionsTab.actions.switchToEditorTab();
+		cy.wait(executionsRefreshInterval);
+		cy.url().should('not.include', '/executions');
+	});
 });
 
 const createMockExecutions = () => {
-	workflowPage.actions.turnOnManualExecutionSaving();
 	executionsTab.actions.createManualExecutions(5);
 	// Make some failed executions by enabling Code node with syntax error
 	executionsTab.actions.toggleNodeEnabled('Error');
diff --git a/cypress/e2e/21-community-nodes.cy.ts b/cypress/e2e/21-community-nodes.cy.ts
index f46a829ac033f..39f572ba5c348 100644
--- a/cypress/e2e/21-community-nodes.cy.ts
+++ b/cypress/e2e/21-community-nodes.cy.ts
@@ -4,6 +4,7 @@ import { CredentialsModal, WorkflowPage } from '../pages';
 import CustomNodeWithN8nCredentialFixture from '../fixtures/Custom_node_n8n_credential.json';
 import CustomNodeWithCustomCredentialFixture from '../fixtures/Custom_node_custom_credential.json';
 import CustomCredential from '../fixtures/Custom_credential.json';
+import { getVisibleSelect } from '../utils';
 
 const credentialsModal = new CredentialsModal();
 const nodeCreatorFeature = new NodeCreator();
@@ -13,10 +14,6 @@ const workflowPage = new WorkflowPage();
 // so the /nodes and /credentials endpoints are intercepted and non-cached.
 // We want to keep the other tests as fast as possible so we don't want to break the cache in those.
 describe('Community Nodes', () => {
-	before(() => {
-		cy.resetAll();
-		cy.skipSetup();
-	})
 	beforeEach(() => {
 		cy.intercept('/types/nodes.json', { middleware: true }, (req) => {
 			req.headers['cache-control'] = 'no-cache, no-store';
@@ -24,9 +21,13 @@ describe('Community Nodes', () => {
 			req.on('response', (res) => {
 				const nodes = res.body || [];
 
-				nodes.push(CustomNodeFixture, CustomNodeWithN8nCredentialFixture, CustomNodeWithCustomCredentialFixture);
+				nodes.push(
+					CustomNodeFixture,
+					CustomNodeWithN8nCredentialFixture,
+					CustomNodeWithCustomCredentialFixture,
+				);
 			});
-		})
+		});
 
 		cy.intercept('/types/credentials.json', { middleware: true }, (req) => {
 			req.headers['cache-control'] = 'no-cache, no-store';
@@ -35,8 +36,9 @@ describe('Community Nodes', () => {
 				const credentials = res.body || [];
 
 				credentials.push(CustomCredential);
-			})
-		})
+			});
+		});
+
 		workflowPage.actions.visit();
 	});
 
@@ -48,7 +50,7 @@ describe('Community Nodes', () => {
 
 		nodeCreatorFeature.getters
 			.getCreatorItem(customNode)
-			.findChildByTestId('node-creator-item-tooltip')
+			.find('.el-tooltip__trigger')
 			.should('exist');
 		nodeCreatorFeature.actions.selectNode(customNode);
 
@@ -68,16 +70,9 @@ describe('Community Nodes', () => {
 		secondParameter().find('label').contains('Resource').should('exist');
 		secondParameter().find('input.el-input__inner').should('have.value', 'option2');
 		secondParameter().find('.el-select').click();
-		secondParameter().find('.el-select-dropdown__list').should('exist');
 		// Check if all options are rendered and select the fourth one
-		secondParameter().find('.el-select-dropdown__list').children().should('have.length', 4);
-		secondParameter()
-			.find('.el-select-dropdown__list')
-			.children()
-			.eq(3)
-			.contains('option4')
-			.should('exist')
-			.click();
+		getVisibleSelect().find('li').should('have.length', 4);
+		getVisibleSelect().find('li').eq(3).contains('option4').should('exist').click();
 		secondParameter().find('input.el-input__inner').should('have.value', 'option4');
 	});
 
diff --git a/cypress/e2e/22-user-activation-modal.cy.ts b/cypress/e2e/22-user-activation-modal.cy.ts
deleted file mode 100644
index 6b8f23be2fcf5..0000000000000
--- a/cypress/e2e/22-user-activation-modal.cy.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-import { WorkflowPage, NDV, UserActivationSurveyModal } from '../pages';
-import SettingsWithActivationModalEnabled from '../fixtures/Settings_user_activation_modal_enabled.json';
-import { v4 as uuid } from 'uuid';
-
-const workflowPage = new WorkflowPage();
-const ndv = new NDV();
-const userActivationSurveyModal = new UserActivationSurveyModal();
-
-const BASE_WEBHOOK_URL = 'http://localhost:5678/webhook';
-
-describe('User activation survey', () => {
-	it('Should show activation survey', () => {
-		cy.resetAll();
-
-		cy.skipSetup();
-
-		cy.intercept('GET', '/rest/settings', (req) => {
-			req.reply(SettingsWithActivationModalEnabled);
-		});
-
-		const path = uuid();
-		const method = 'GET';
-
-		workflowPage.actions.addInitialNodeToCanvas('Webhook');
-		workflowPage.actions.openNode('Webhook');
-
-		//input http method
-		cy.getByTestId('parameter-input-httpMethod').click();
-		cy.getByTestId('parameter-input-httpMethod')
-			.find('.el-select-dropdown')
-			.find('.option-headline')
-			.contains(method)
-			.click();
-
-		//input path method
-		cy.getByTestId('parameter-input-path')
-			.find('.parameter-input')
-			.find('input')
-			.clear()
-			.type(path);
-
-		ndv.actions.close();
-
-		workflowPage.actions.saveWorkflowOnButtonClick();
-
-		workflowPage.actions.activateWorkflow();
-
-		cy.intercept('GET', '/rest/workflows').as('getWorkflows');
-		cy.intercept('GET', '/rest/credentials').as('getCredentials');
-		cy.intercept('GET', '/rest/active').as('getActive');
-
-		cy.request(method, `${BASE_WEBHOOK_URL}/${path}`).then((response) => {
-			expect(response.status).to.eq(200);
-			cy.visit('/');
-			cy.reload();
-
-			cy.wait(['@getWorkflows', '@getCredentials', '@getActive']);
-			userActivationSurveyModal.getters.modalContainer().should('be.visible');
-			userActivationSurveyModal.getters.feedbackInput().should('be.visible');
-			userActivationSurveyModal.getters.feedbackInput().type('testing');
-			userActivationSurveyModal.getters.feedbackInput().should('have.value', 'testing');
-			userActivationSurveyModal.getters.sendFeedbackButton().click();
-		});
-	});
-});
diff --git a/cypress/e2e/23-variables.cy.ts b/cypress/e2e/23-variables.cy.ts
index 8dc16bb8e967d..ce6a49fb99402 100644
--- a/cypress/e2e/23-variables.cy.ts
+++ b/cypress/e2e/23-variables.cy.ts
@@ -1,22 +1,10 @@
 import { VariablesPage } from '../pages/variables';
-import { DEFAULT_USER_EMAIL, DEFAULT_USER_PASSWORD } from '../constants';
-import { randFirstName, randLastName } from '@ngneat/falso';
 
 const variablesPage = new VariablesPage();
 
-const email = DEFAULT_USER_EMAIL;
-const password = DEFAULT_USER_PASSWORD;
-const firstName = randFirstName();
-const lastName = randLastName();
-
 describe('Variables', () => {
-	before(() => {
-		cy.resetAll();
-		cy.setup({ email, firstName, lastName, password });
-	});
-
 	it('should show the unlicensed action box when the feature is disabled', () => {
-		cy.signin({ email, password });
+		cy.disableFeature('variables', false);
 		cy.visit(variablesPage.url);
 
 		variablesPage.getters.unavailableResourcesList().should('be.visible');
@@ -25,12 +13,14 @@ describe('Variables', () => {
 
 	describe('licensed', () => {
 		before(() => {
-			cy.enableFeature('feat:variables');
+			cy.enableFeature('variables');
 		});
 
 		beforeEach(() => {
-			cy.signin({ email, password });
+			cy.intercept('GET', '/rest/variables').as('loadVariables');
+
 			cy.visit(variablesPage.url);
+			cy.wait(['@loadVariables', '@loadSettings']);
 		});
 
 		it('should show the licensed action box when the feature is enabled', () => {
diff --git a/cypress/e2e/24-ndv-paired-item.cy.ts b/cypress/e2e/24-ndv-paired-item.cy.ts
index 05f5dd8581a71..1b2b4f1efeaad 100644
--- a/cypress/e2e/24-ndv-paired-item.cy.ts
+++ b/cypress/e2e/24-ndv-paired-item.cy.ts
@@ -5,11 +5,6 @@ const workflowPage = new WorkflowPage();
 const ndv = new NDV();
 
 describe('NDV', () => {
-	before(() => {
-		cy.resetAll();
-		cy.skipSetup();
-
-	});
 	beforeEach(() => {
 		workflowPage.actions.visit();
 		workflowPage.actions.renameWorkflow(uuid());
@@ -24,7 +19,7 @@ describe('NDV', () => {
 
 		workflowPage.actions.executeWorkflow();
 
-		workflowPage.actions.openNode('Item Lists');
+		workflowPage.actions.openNode('Sort');
 
 		ndv.getters.inputPanel().contains('6 items').should('exist');
 		ndv.getters.outputPanel().contains('6 items').should('exist');
@@ -33,59 +28,34 @@ describe('NDV', () => {
 		ndv.actions.switchOutputMode('Table');
 
 		// input to output
-		ndv.getters.inputTableRow(1)
-			.should('exist')
-			.invoke('attr', 'data-test-id')
-			.should('equal', 'hovering-item');
+		ndv.getters.inputTableRow(1).should('exist');
 
-		ndv.getters.inputTableRow(1)
-			.realHover();
-		ndv.getters.outputTableRow(4)
-			.invoke('attr', 'data-test-id')
-			.should('equal', 'hovering-item');
+		ndv.getters.inputTableRow(1).invoke('attr', 'data-test-id').should('equal', 'hovering-item');
 
-		ndv.getters.inputTableRow(2)
-			.realHover();
-		ndv.getters.outputTableRow(2)
-			.invoke('attr', 'data-test-id')
-			.should('equal', 'hovering-item');
-		
-		ndv.getters.inputTableRow(3)
-			.realHover();
-		ndv.getters.outputTableRow(6)
-			.invoke('attr', 'data-test-id')
-			.should('equal', 'hovering-item');
+		ndv.getters.inputTableRow(1).realHover();
+		ndv.getters.outputTableRow(4).invoke('attr', 'data-test-id').should('equal', 'hovering-item');
+
+		ndv.getters.inputTableRow(2).realHover();
+		ndv.getters.outputTableRow(2).invoke('attr', 'data-test-id').should('equal', 'hovering-item');
+
+		ndv.getters.inputTableRow(3).realHover();
+		ndv.getters.outputTableRow(6).invoke('attr', 'data-test-id').should('equal', 'hovering-item');
 
 		// output to input
-		ndv.getters.outputTableRow(1)
-			.realHover();
-		ndv.getters.inputTableRow(4)
-			.invoke('attr', 'data-test-id')
-			.should('equal', 'hovering-item');
+		ndv.getters.outputTableRow(1).realHover();
+		ndv.getters.inputTableRow(4).invoke('attr', 'data-test-id').should('equal', 'hovering-item');
 
-			ndv.getters.outputTableRow(4)
-			.realHover();
-		ndv.getters.inputTableRow(1)
-			.invoke('attr', 'data-test-id')
-			.should('equal', 'hovering-item');
+		ndv.getters.outputTableRow(4).realHover();
+		ndv.getters.inputTableRow(1).invoke('attr', 'data-test-id').should('equal', 'hovering-item');
 
-		ndv.getters.outputTableRow(2)
-			.realHover();
-		ndv.getters.inputTableRow(2)
-			.invoke('attr', 'data-test-id')
-			.should('equal', 'hovering-item');
-		
-		ndv.getters.outputTableRow(6)
-			.realHover();
-		ndv.getters.inputTableRow(3)
-			.invoke('attr', 'data-test-id')
-			.should('equal', 'hovering-item');
+		ndv.getters.outputTableRow(2).realHover();
+		ndv.getters.inputTableRow(2).invoke('attr', 'data-test-id').should('equal', 'hovering-item');
 
-		ndv.getters.outputTableRow(1)
-			.realHover();
-		ndv.getters.inputTableRow(4)
-			.invoke('attr', 'data-test-id')
-			.should('equal', 'hovering-item');
+		ndv.getters.outputTableRow(6).realHover();
+		ndv.getters.inputTableRow(3).invoke('attr', 'data-test-id').should('equal', 'hovering-item');
+
+		ndv.getters.outputTableRow(1).realHover();
+		ndv.getters.inputTableRow(4).invoke('attr', 'data-test-id').should('equal', 'hovering-item');
 	});
 
 	it('maps paired input and output items based on selected input node', () => {
@@ -97,9 +67,11 @@ describe('NDV', () => {
 		workflowPage.actions.openNode('Set2');
 
 		ndv.getters.inputPanel().contains('6 items').should('exist');
-		ndv.getters.outputRunSelector()
+		ndv.getters
+			.outputRunSelector()
+			.find('input')
 			.should('exist')
-			.should('include.text', '2 of 2 (6 items)');
+			.should('have.value', '2 of 2 (6 items)');
 
 		ndv.actions.switchInputMode('Table');
 		ndv.actions.switchOutputMode('Table');
@@ -111,23 +83,22 @@ describe('NDV', () => {
 		ndv.actions.selectInputNode('Set1');
 		ndv.getters.backToCanvas().realHover(); // reset to default hover
 
-		ndv.getters.inputTableRow(1)
-			.should('have.text', '1000')
-			.invoke('attr', 'data-test-id')
-			.should('equal', 'hovering-item');
+		ndv.getters.inputTableRow(1).should('have.text', '1000');
+
+		ndv.getters.inputTableRow(1).invoke('attr', 'data-test-id').should('equal', 'hovering-item');
+
 		ndv.getters.inputTableRow(1).realHover();
 		cy.wait(50);
 		ndv.getters.outputHoveringItem().should('have.text', '1000');
 		ndv.getters.parameterExpressionPreview('value').should('include.text', '1000');
 
-		ndv.actions.selectInputNode('Item Lists');
+		ndv.actions.selectInputNode('Sort');
 		ndv.actions.changeOutputRunSelector('1 of 2 (6 items)');
 		ndv.getters.backToCanvas().realHover(); // reset to default hover
 
-		ndv.getters.inputTableRow(1)
-			.should('have.text', '1111')
-			.invoke('attr', 'data-test-id')
-			.should('equal', 'hovering-item');
+		ndv.getters.inputTableRow(1).should('have.text', '1111');
+
+		ndv.getters.inputTableRow(1).invoke('attr', 'data-test-id').should('equal', 'hovering-item');
 		ndv.getters.inputTableRow(1).realHover();
 		cy.wait(50);
 		ndv.getters.outputHoveringItem().should('have.text', '1111');
@@ -142,11 +113,13 @@ describe('NDV', () => {
 		workflowPage.actions.executeWorkflow();
 		workflowPage.actions.openNode('Set3');
 
-		ndv.getters.inputRunSelector()
+		ndv.getters
+			.inputRunSelector()
 			.should('exist')
 			.find('input')
 			.should('include.value', '2 of 2 (6 items)');
-		ndv.getters.outputRunSelector()
+		ndv.getters
+			.outputRunSelector()
 			.should('exist')
 			.find('input')
 			.should('include.value', '2 of 2 (6 items)');
@@ -155,45 +128,39 @@ describe('NDV', () => {
 		ndv.actions.switchOutputMode('Table');
 
 		ndv.actions.changeOutputRunSelector('1 of 2 (6 items)');
-		ndv.getters.inputRunSelector().find('input')
-			.should('include.value', '1 of 2 (6 items)');
-		ndv.getters.outputRunSelector().find('input')
-			.should('include.value', '1 of 2 (6 items)');
+		ndv.getters.inputRunSelector().find('input').should('include.value', '1 of 2 (6 items)');
+		ndv.getters.outputRunSelector().find('input').should('include.value', '1 of 2 (6 items)');
 
-		ndv.getters.inputTableRow(1)
-			.should('have.text', '1111')
-			.invoke('attr', 'data-test-id')
-			.should('equal', 'hovering-item');
-		ndv.getters.outputTableRow(1)
-			.should('have.text', '1111')
-			.realHover();
+		ndv.getters.inputTableRow(1).should('have.text', '1111');
+		ndv.getters.inputTableRow(1).invoke('attr', 'data-test-id').should('equal', 'hovering-item');
+		ndv.getters.outputTableRow(1).should('have.text', '1111');
+		ndv.getters.outputTableRow(1).realHover();
 
-		ndv.getters.outputTableRow(3)
-			.should('have.text', '4444')
-			.realHover();
-		ndv.getters.inputTableRow(3)
-			.should('have.text', '4444')
-			.invoke('attr', 'data-test-id')
-			.should('equal', 'hovering-item');
+		ndv.getters.outputTableRow(3).should('have.text', '4444');
+		ndv.getters.outputTableRow(3).realHover();
+
+		ndv.getters.inputTableRow(3).should('have.text', '4444');
+		ndv.getters.inputTableRow(3).invoke('attr', 'data-test-id').should('equal', 'hovering-item');
 
 		ndv.actions.changeOutputRunSelector('2 of 2 (6 items)');
 		cy.wait(50);
 
-		ndv.getters.inputTableRow(1)
-			.should('have.text', '1000')
-			.realHover();
-		ndv.getters.outputTableRow(1)
+		ndv.getters.inputTableRow(1).should('have.text', '1000');
+		ndv.getters.inputTableRow(1).realHover();
+
+		ndv.getters.outputTableRow(1).should('have.text', '1000');
+		ndv.getters
+			.outputTableRow(1)
 			.should('have.text', '1000')
 			.invoke('attr', 'data-test-id')
 			.should('equal', 'hovering-item');
 
-		ndv.getters.outputTableRow(3)
-			.should('have.text', '2000')
-			.realHover();
-		ndv.getters.inputTableRow(3)
-			.should('have.text', '2000')
-			.invoke('attr', 'data-test-id')
-			.should('equal', 'hovering-item');
+		ndv.getters.outputTableRow(3).should('have.text', '2000');
+		ndv.getters.outputTableRow(3).realHover();
+
+		ndv.getters.inputTableRow(3).should('have.text', '2000');
+
+		ndv.getters.inputTableRow(3).invoke('attr', 'data-test-id').should('equal', 'hovering-item');
 	});
 
 	it('resolves expression with default item when input node is not parent, while still pairing items', () => {
@@ -205,46 +172,51 @@ describe('NDV', () => {
 		workflowPage.actions.openNode('Set2');
 
 		ndv.getters.inputPanel().contains('6 items').should('exist');
-		ndv.getters.outputRunSelector()
+		ndv.getters
+			.outputRunSelector()
+			.find('input')
 			.should('exist')
-			.should('include.text', '2 of 2 (6 items)');
+			.should('have.value', '2 of 2 (6 items)');
 
 		ndv.actions.switchInputMode('Table');
 		ndv.actions.switchOutputMode('Table');
 
 		ndv.getters.backToCanvas().realHover(); // reset to default hover
-		ndv.getters.inputTableRow(1)
-			.should('have.text', '1111')
-			.invoke('attr', 'data-test-id')
-			.should('equal', 'hovering-item');
+		ndv.getters.inputTableRow(1).should('have.text', '1111');
+
+		ndv.getters.inputTableRow(1).invoke('attr', 'data-test-id').should('equal', 'hovering-item');
 		ndv.getters.inputTableRow(1).realHover();
+		cy.wait(100);
 		ndv.getters.outputHoveringItem().should('not.exist');
 		ndv.getters.parameterExpressionPreview('value').should('include.text', '1111');
 
 		ndv.actions.selectInputNode('Code1');
 		ndv.getters.inputTableRow(1).realHover();
-		ndv.getters.inputTableRow(1)
-			.should('have.text', '1000')
-			.invoke('attr', 'data-test-id')
-			.should('equal', 'hovering-item');
-		ndv.getters.outputTableRow(1)
-			.should('have.text', '1000');
+		ndv.getters.inputTableRow(1).should('have.text', '1000');
+
+		ndv.getters.inputTableRow(1).invoke('attr', 'data-test-id').should('equal', 'hovering-item');
+		ndv.getters.outputTableRow(1).should('have.text', '1000');
 		ndv.getters.parameterExpressionPreview('value').should('include.text', '1000');
 
 		ndv.actions.selectInputNode('Code');
 
 		ndv.getters.inputTableRow(1).realHover();
-		ndv.getters.inputTableRow(1)
-		.should('have.text', '6666')
-		.invoke('attr', 'data-test-id')
-		.should('equal', 'hovering-item');
+		cy.wait(100);
+		ndv.getters.inputTableRow(1).should('have.text', '6666');
+
+		ndv.getters.inputTableRow(1).invoke('attr', 'data-test-id').should('equal', 'hovering-item');
+
 		ndv.getters.outputHoveringItem().should('not.exist');
 		ndv.getters.parameterExpressionPreview('value').should('include.text', '1000');
 
 		ndv.actions.selectInputNode('When clicking');
 
 		ndv.getters.inputTableRow(1).realHover();
-		ndv.getters.inputTableRow(1).should('have.text', "This is an item, but it's empty.").realHover();
+		ndv.getters
+			.inputTableRow(1)
+			.should('have.text', "This is an item, but it's empty.")
+			.realHover();
+
 		ndv.getters.outputHoveringItem().should('have.length', 6);
 		ndv.getters.parameterExpressionPreview('value').should('include.text', '1000');
 	});
@@ -261,45 +233,104 @@ describe('NDV', () => {
 		ndv.actions.switchOutputMode('Table');
 
 		ndv.actions.switchOutputBranch('False Branch (2 items)');
-		ndv.getters.outputTableRow(1)
-			.should('have.text', '8888')
-			.realHover();
-		ndv.getters.inputTableRow(5)
-			.should('have.text', '8888')
-			.invoke('attr', 'data-test-id')
-			.should('equal', 'hovering-item');
+		ndv.getters.outputTableRow(1).should('have.text', '8888');
+		ndv.getters.outputTableRow(1).realHover();
 
-		ndv.getters.outputTableRow(2)
-			.should('have.text', '9999')
-			.realHover();
-		ndv.getters.inputTableRow(6)
-			.should('have.text', '9999')
-			.invoke('attr', 'data-test-id')
-			.should('equal', 'hovering-item');
+		ndv.getters.inputTableRow(5).should('have.text', '8888');
+
+		ndv.getters.inputTableRow(5).invoke('attr', 'data-test-id').should('equal', 'hovering-item');
+
+		ndv.getters.outputTableRow(2).should('have.text', '9999');
+		ndv.getters.outputTableRow(2).realHover();
+
+		ndv.getters.inputTableRow(6).should('have.text', '9999');
+
+		ndv.getters.inputTableRow(6).invoke('attr', 'data-test-id').should('equal', 'hovering-item');
 
 		ndv.actions.close();
+
 		workflowPage.actions.openNode('Set5');
-		ndv.getters.outputTableRow(1)
-			.should('have.text', '8888')
-			.realHover();
+
+		ndv.actions.switchInputBranch('True Branch');
+		ndv.actions.changeOutputRunSelector('1 of 2 (2 items)');
+		ndv.getters.outputTableRow(1).should('have.text', '8888');
+		ndv.getters.outputTableRow(1).realHover();
+		cy.wait(100);
 		ndv.getters.inputHoveringItem().should('not.exist');
 
-		ndv.getters.inputTableRow(1)
-			.should('have.text', '1111')
-			.realHover();
+		ndv.getters.inputTableRow(1).should('have.text', '1111');
+		ndv.getters.inputTableRow(1).realHover();
+		cy.wait(100);
 		ndv.getters.outputHoveringItem().should('not.exist');
 
-		ndv.actions.switchIntputBranch('False Branch');
-		ndv.getters.inputTableRow(1)
-			.should('have.text', '8888')
-			.realHover();
-		ndv.getters.outputHoveringItem().should('have.text', '8888');
+		ndv.actions.switchInputBranch('False Branch');
+		ndv.getters.inputTableRow(1).should('have.text', '8888');
+		ndv.getters.inputTableRow(1).realHover();
 
-		ndv.actions.changeOutputRunSelector('1 of 2 (4 items)')
-		ndv.getters.outputTableRow(1)
-			.should('have.text', '1111')
-			.realHover();
+		ndv.actions.changeOutputRunSelector('2 of 2 (4 items)');
+		ndv.getters.outputTableRow(1).should('have.text', '1111');
+		ndv.getters.outputTableRow(1).realHover();
+
+		ndv.actions.changeOutputRunSelector('1 of 2 (2 items)');
+		ndv.getters.inputTableRow(1).should('have.text', '8888');
+		ndv.getters.inputTableRow(1).realHover();
+		ndv.getters.outputHoveringItem().should('have.text', '8888');
 		// todo there's a bug here need to fix ADO-534
 		// ndv.getters.outputHoveringItem().should('not.exist');
 	});
+
+	it('can resolve expression with paired item in multi-input node', () => {
+		cy.fixture('expression_with_paired_item_in_multi_input_node.json').then((data) => {
+			cy.get('body').paste(JSON.stringify(data));
+		});
+
+		workflowPage.actions.zoomToFit();
+
+		/* prettier-ignore */
+		const PINNED_DATA = [
+			{
+				"id": "abc",
+				"historyId": "def",
+				"messages": [
+					{
+						"id": "abc"
+					}
+				]
+			},
+			{
+				"id": "abc",
+				"historyId": "def",
+				"messages": [
+					{
+						"id": "abc"
+					},
+					{
+						"id": "abc"
+					},
+					{
+						"id": "abc"
+					}
+				]
+			},
+			{
+				"id": "abc",
+				"historyId": "def",
+				"messages": [
+					{
+						"id": "abc"
+					}
+				]
+			}
+		];
+		/* prettier-ignore */
+		workflowPage.actions.openNode('Get thread details1');
+		ndv.actions.pastePinnedData(PINNED_DATA);
+		ndv.actions.close();
+
+		workflowPage.actions.executeWorkflow();
+		workflowPage.actions.openNode('Switch1');
+		ndv.actions.execute();
+
+		ndv.getters.parameterExpressionPreview('output').should('include.text', '1');
+	});
 });
diff --git a/cypress/e2e/25-stickies.cy.ts b/cypress/e2e/25-stickies.cy.ts
index 0746fddc0326a..4cbad810f915e 100644
--- a/cypress/e2e/25-stickies.cy.ts
+++ b/cypress/e2e/25-stickies.cy.ts
@@ -1,8 +1,17 @@
+import { META_KEY } from '../constants';
 import { WorkflowPage as WorkflowPageClass } from '../pages/workflow';
+import { getPopper } from '../utils';
+import { Interception } from 'cypress/types/net-stubbing';
 
 const workflowPage = new WorkflowPageClass();
 
-function checkStickiesStyle( top: number, left: number, height: number, width: number, zIndex?: number) {
+function checkStickiesStyle(
+	top: number,
+	left: number,
+	height: number,
+	width: number,
+	zIndex?: number,
+) {
 	workflowPage.getters.stickies().should(($el) => {
 		expect($el).to.have.css('top', `${top}px`);
 		expect($el).to.have.css('left', `${left}px`);
@@ -16,26 +25,33 @@ function checkStickiesStyle( top: number, left: number, height: number, width: n
 
 describe('Canvas Actions', () => {
 	beforeEach(() => {
-		cy.resetAll();
-		cy.skipSetup();
 		workflowPage.actions.visit();
-
-		cy.window().then(
-			(win) => {
-				// @ts-ignore
-				win.preventNodeViewBeforeUnload = true;
-			},
-		);
 	});
 
-
 	it('adds sticky to canvas with default text and position', () => {
 		workflowPage.getters.addStickyButton().should('not.be.visible');
 
-		addDefaultSticky()
-		workflowPage.getters.stickies().eq(0)
+		addDefaultSticky();
+		workflowPage.actions.deselectAll();
+		workflowPage.actions.addStickyFromContextMenu();
+		workflowPage.actions.hitAddStickyShortcut();
+
+		workflowPage.getters.stickies().should('have.length', 3);
+
+		// Should not add a sticky for ctrl+shift+s
+		cy.get('body')
+			.type(META_KEY, { delay: 500, release: false })
+			.type('{shift}', { release: false })
+			.type('s');
+
+		workflowPage.getters.stickies().should('have.length', 3);
+		workflowPage.getters
+			.stickies()
+			.eq(0)
 			.should('have.text', 'I’m a note\nDouble click to edit me. Guide\n')
-			.find('a').contains('Guide').should('have.attr', 'href');
+			.find('a')
+			.contains('Guide')
+			.should('have.attr', 'href');
 	});
 
 	it('drags sticky around to top left corner', () => {
@@ -59,18 +75,45 @@ describe('Canvas Actions', () => {
 
 	it('deletes sticky', () => {
 		workflowPage.actions.addSticky();
-		workflowPage.getters.stickies().should('have.length', 1)
+		workflowPage.getters.stickies().should('have.length', 1);
 
 		workflowPage.actions.deleteSticky();
 
-		workflowPage.getters.stickies().should('have.length', 0)
+		workflowPage.getters.stickies().should('have.length', 0);
+	});
+
+	it('change sticky color', () => {
+		workflowPage.actions.addSticky();
+
+		workflowPage.getters.stickies().should('have.length', 1);
+
+		workflowPage.actions.toggleColorPalette();
+
+		getPopper().should('be.visible');
+
+		workflowPage.actions.pickColor(2);
+
+		workflowPage.actions.toggleColorPalette();
+
+		getPopper().should('not.be.visible');
+
+		workflowPage.actions.saveWorkflowOnButtonClick();
+
+		cy.wait('@createWorkflow').then((interception: Interception) => {
+			const { request } = interception;
+			const color = request.body?.nodes[0]?.parameters?.color;
+			expect(color).to.equal(2);
+		});
+
+		workflowPage.getters.stickies().should('have.length', 1);
 	});
 
 	it('edits sticky and updates content as markdown', () => {
 		workflowPage.actions.addSticky();
 
-		workflowPage.getters.stickies()
-			.should('have.text', 'I’m a note\nDouble click to edit me. Guide\n')
+		workflowPage.getters
+			.stickies()
+			.should('have.text', 'I’m a note\nDouble click to edit me. Guide\n');
 
 		workflowPage.getters.stickies().dblclick();
 		workflowPage.actions.editSticky('# hello world \n ## text text');
@@ -83,8 +126,11 @@ describe('Canvas Actions', () => {
 
 		moveSticky({ top: 200, left: 200 });
 
-		dragRightEdge({ left: 200, top: 200, height: 160, width: 240 }, 100);
-		dragRightEdge({ left: 200, top: 200, height: 160, width: 240 }, -50);
+		cy.drag('[data-test-id="sticky"] [data-dir="right"]', [100, 100]);
+		checkStickiesStyle(100, 20, 160, 346);
+
+		cy.drag('[data-test-id="sticky"] [data-dir="right"]', [-50, -50]);
+		checkStickiesStyle(100, 20, 160, 302);
 	});
 
 	it('expands/shrinks sticky from the left edge', () => {
@@ -92,66 +138,66 @@ describe('Canvas Actions', () => {
 
 		moveSticky({ left: 600, top: 200 });
 		cy.drag('[data-test-id="sticky"] [data-dir="left"]', [100, 100]);
-		checkStickiesStyle(140, 510, 160, 150);
+		checkStickiesStyle(100, 510, 160, 150);
 
 		cy.drag('[data-test-id="sticky"] [data-dir="left"]', [-50, -50]);
-		checkStickiesStyle(140, 466, 160, 194);
+		checkStickiesStyle(100, 466, 160, 194);
 	});
 
 	it('expands/shrinks sticky from the top edge', () => {
 		workflowPage.actions.addSticky();
 		cy.drag('[data-test-id="sticky"]', [100, 100]); // move away from canvas button
-		checkStickiesStyle(360, 620, 160, 240);
+		checkStickiesStyle(300, 620, 160, 240);
 
 		cy.drag('[data-test-id="sticky"] [data-dir="top"]', [100, 100]);
-		checkStickiesStyle(440, 620, 80, 240);
+		checkStickiesStyle(380, 620, 80, 240);
 
 		cy.drag('[data-test-id="sticky"] [data-dir="top"]', [-50, -50]);
-		checkStickiesStyle(384, 620, 136, 240);
+		checkStickiesStyle(324, 620, 136, 240);
 	});
 
 	it('expands/shrinks sticky from the bottom edge', () => {
 		workflowPage.actions.addSticky();
 		cy.drag('[data-test-id="sticky"]', [100, 100]); // move away from canvas button
-		checkStickiesStyle(360, 620, 160, 240);
+		checkStickiesStyle(300, 620, 160, 240);
 
 		cy.drag('[data-test-id="sticky"] [data-dir="bottom"]', [100, 100]);
-		checkStickiesStyle(360, 620, 254, 240);
+		checkStickiesStyle(300, 620, 254, 240);
 
 		cy.drag('[data-test-id="sticky"] [data-dir="bottom"]', [-50, -50]);
-		checkStickiesStyle(360, 620, 198, 240);
+		checkStickiesStyle(300, 620, 198, 240);
 	});
 
 	it('expands/shrinks sticky from the bottom right edge', () => {
 		workflowPage.actions.addSticky();
 		cy.drag('[data-test-id="sticky"]', [-100, -100]); // move away from canvas button
-		checkStickiesStyle(160, 420, 160, 240);
+		checkStickiesStyle(100, 420, 160, 240);
 
 		cy.drag('[data-test-id="sticky"] [data-dir="bottomRight"]', [100, 100]);
-		checkStickiesStyle(160, 420, 254, 346);
+		checkStickiesStyle(100, 420, 254, 346);
 
 		cy.drag('[data-test-id="sticky"] [data-dir="bottomRight"]', [-50, -50]);
-		checkStickiesStyle(160, 420, 198, 302);
+		checkStickiesStyle(100, 420, 198, 302);
 	});
 
 	it('expands/shrinks sticky from the top right edge', () => {
 		addDefaultSticky();
 
 		cy.drag('[data-test-id="sticky"] [data-dir="topRight"]', [100, 100]);
-		checkStickiesStyle(420, 400, 80, 346);
+		checkStickiesStyle(360, 400, 80, 346);
 
 		cy.drag('[data-test-id="sticky"] [data-dir="topRight"]', [-50, -50]);
-		checkStickiesStyle(364, 400, 136, 302);
+		checkStickiesStyle(304, 400, 136, 302);
 	});
 
 	it('expands/shrinks sticky from the top left edge, and reach min height/width', () => {
 		addDefaultSticky();
 
 		cy.drag('[data-test-id="sticky"] [data-dir="topLeft"]', [100, 100]);
-		checkStickiesStyle(420, 490, 80, 150);
+		checkStickiesStyle(360, 490, 80, 150);
 
 		cy.drag('[data-test-id="sticky"] [data-dir="topLeft"]', [-150, -150]);
-		checkStickiesStyle(264, 346, 236, 294);
+		checkStickiesStyle(204, 346, 236, 294);
 	});
 
 	it('sets sticky behind node', () => {
@@ -159,34 +205,57 @@ describe('Canvas Actions', () => {
 		addDefaultSticky();
 
 		cy.drag('[data-test-id="sticky"] [data-dir="topLeft"]', [-150, -150]);
-		checkStickiesStyle(184, 256, 316, 384, -121);
+		checkStickiesStyle(124, 256, 316, 384, -121);
 
-		workflowPage.getters.canvasNodes().eq(0)
+		workflowPage.getters
+			.canvasNodes()
+			.eq(0)
 			.should(($el) => {
 				expect($el).to.have.css('z-index', 'auto');
 			});
 
 		workflowPage.actions.addSticky();
-		workflowPage.getters.stickies().eq(0)
+		workflowPage.getters
+			.stickies()
+			.eq(0)
 			.should(($el) => {
 				expect($el).to.have.css('z-index', '-121');
 			});
-		workflowPage.getters.stickies().eq(1)
+		workflowPage.getters
+			.stickies()
+			.eq(1)
 			.should(($el) => {
 				expect($el).to.have.css('z-index', '-38');
 			});
 
 		cy.drag('[data-test-id="sticky"] [data-dir="topLeft"]', [-200, -200], { index: 1 });
-		workflowPage.getters.stickies().eq(0)
+		workflowPage.getters
+			.stickies()
+			.eq(0)
 			.should(($el) => {
 				expect($el).to.have.css('z-index', '-121');
 			});
 
-		workflowPage.getters.stickies().eq(1)
+		workflowPage.getters
+			.stickies()
+			.eq(1)
 			.should(($el) => {
 				expect($el).to.have.css('z-index', '-158');
 			});
+	});
+
+	it('Empty sticky should not error when activating workflow', () => {
+		workflowPage.actions.addSticky();
+
+		workflowPage.getters.stickies().should('have.length', 1);
 
+		workflowPage.getters.stickies().dblclick();
+
+		workflowPage.actions.clearSticky();
+
+		workflowPage.actions.addNodeToCanvas('Schedule Trigger');
+
+		workflowPage.actions.activateWorkflow();
 	});
 });
 
@@ -195,38 +264,25 @@ type Position = {
 	left: number;
 };
 
-type BoundingBox = {
-	height: number;
-	width: number;
-	top: number;
-	left: number;
-}
-
-function dragRightEdge(curr: BoundingBox, move: number) {
-	workflowPage.getters.stickies().first().then(($el) => {
-		const { left, top, height, width } = curr;
-		cy.drag(`[data-test-id="sticky"] [data-dir="right"]`, [left + width + move, 0], { abs: true });
-		stickyShouldBePositionedCorrectly({ top, left });
-		stickyShouldHaveCorrectSize([height, width * 1.5 + move]);
-	});
-}
-
 function shouldHaveOneSticky() {
 	workflowPage.getters.stickies().should('have.length', 1);
 }
 
 function shouldBeInDefaultLocation() {
-	workflowPage.getters.stickies().eq(0).should(($el) => {
-		expect($el).to.have.css('height', '160px');
-		expect($el).to.have.css('width', '240px');
-	})
+	workflowPage.getters
+		.stickies()
+		.eq(0)
+		.should(($el) => {
+			expect($el).to.have.css('height', '160px');
+			expect($el).to.have.css('width', '240px');
+		});
 }
 
 function shouldHaveDefaultSize() {
 	workflowPage.getters.stickies().should(($el) => {
 		expect($el).to.have.css('height', '160px');
 		expect($el).to.have.css('width', '240px');
-	})
+	});
 }
 
 function addDefaultSticky() {
@@ -237,23 +293,21 @@ function addDefaultSticky() {
 }
 
 function stickyShouldBePositionedCorrectly(position: Position) {
-	const yOffset = -60;
+	const yOffset = -100;
 	const xOffset = -180;
-	workflowPage.getters.stickies()
-		.should(($el) => {
-			expect($el).to.have.css('top', `${yOffset + position.top}px`);
-			expect($el).to.have.css('left', `${xOffset + position.left}px`);
-		});
+	workflowPage.getters.stickies().should(($el) => {
+		expect($el).to.have.css('top', `${yOffset + position.top}px`);
+		expect($el).to.have.css('left', `${xOffset + position.left}px`);
+	});
 }
 
 function stickyShouldHaveCorrectSize(size: [number, number]) {
 	const yOffset = 0;
 	const xOffset = 0;
-	workflowPage.getters.stickies()
-		.should(($el) => {
-			expect($el).to.have.css('height', `${yOffset + size[0]}px`);
-			expect($el).to.have.css('width', `${xOffset + size[1]}px`);
-		});
+	workflowPage.getters.stickies().should(($el) => {
+		expect($el).to.have.css('height', `${yOffset + size[0]}px`);
+		expect($el).to.have.css('width', `${xOffset + size[1]}px`);
+	});
 }
 
 function moveSticky(target: Position) {
diff --git a/cypress/e2e/26-resource-locator.cy.ts b/cypress/e2e/26-resource-locator.cy.ts
new file mode 100644
index 0000000000000..9cea4e25a3c38
--- /dev/null
+++ b/cypress/e2e/26-resource-locator.cy.ts
@@ -0,0 +1,88 @@
+import { WorkflowPage, NDV, CredentialsModal } from '../pages';
+import { getVisiblePopper, getVisibleSelect } from '../utils';
+
+const workflowPage = new WorkflowPage();
+const ndv = new NDV();
+const credentialsModal = new CredentialsModal();
+
+const NO_CREDENTIALS_MESSAGE = 'Please add your credential';
+const INVALID_CREDENTIALS_MESSAGE = 'Please check your credential';
+const MODE_SELECTOR_LIST = 'From list';
+
+describe('Resource Locator', () => {
+	beforeEach(() => {
+		workflowPage.actions.visit();
+	});
+
+	it('should render both RLC components in google sheets', () => {
+		workflowPage.actions.addInitialNodeToCanvas('Manual');
+		workflowPage.actions.addNodeToCanvas('Google Sheets', true, true, 'Update row in sheet');
+		ndv.getters.resourceLocator('documentId').should('be.visible');
+		ndv.getters.resourceLocator('sheetName').should('be.visible');
+		ndv.getters
+			.resourceLocatorModeSelector('documentId')
+			.find('input')
+			.should('have.value', MODE_SELECTOR_LIST);
+		ndv.getters
+			.resourceLocatorModeSelector('sheetName')
+			.find('input')
+			.should('have.value', MODE_SELECTOR_LIST);
+	});
+
+	it('should show appropriate error when credentials are not set', () => {
+		workflowPage.actions.addInitialNodeToCanvas('Manual');
+		workflowPage.actions.addNodeToCanvas('Google Sheets', true, true, 'Update row in sheet');
+		ndv.getters.resourceLocator('documentId').should('be.visible');
+		ndv.getters.resourceLocatorInput('documentId').click();
+		ndv.getters.resourceLocatorErrorMessage().should('contain', NO_CREDENTIALS_MESSAGE);
+	});
+
+	it('should show appropriate error when credentials are not valid', () => {
+		workflowPage.actions.addInitialNodeToCanvas('Manual');
+		workflowPage.actions.addNodeToCanvas('Google Sheets', true, true, 'Update row in sheet');
+		workflowPage.getters.nodeCredentialsSelect().click();
+		// Add oAuth credentials
+		getVisibleSelect().find('li').last().click();
+		credentialsModal.getters.credentialsEditModal().should('be.visible');
+		credentialsModal.getters.credentialAuthTypeRadioButtons().should('have.length', 2);
+		credentialsModal.getters.credentialAuthTypeRadioButtons().first().click();
+		credentialsModal.actions.fillCredentialsForm();
+		cy.get('.el-message-box').find('button').contains('Close').click();
+		ndv.getters.resourceLocatorInput('documentId').click();
+		ndv.getters.resourceLocatorErrorMessage().should('contain', INVALID_CREDENTIALS_MESSAGE);
+	});
+
+	it('should reset resource locator when dependent field is changed', () => {
+		workflowPage.actions.addInitialNodeToCanvas('Manual');
+		workflowPage.actions.addNodeToCanvas('Google Sheets', true, true, 'Update row in sheet');
+		ndv.actions.setRLCValue('documentId', '123');
+		ndv.actions.setRLCValue('sheetName', '123');
+		ndv.actions.setRLCValue('documentId', '321');
+		ndv.getters.resourceLocatorInput('sheetName').should('have.value', '');
+	});
+
+	// unlike RMC and remote options, RLC does not support loadOptionDependsOn
+	it('should retrieve list options when other params throw errors', () => {
+		workflowPage.actions.addInitialNodeToCanvas('E2e Test', { action: 'Resource Locator' });
+
+		ndv.getters.resourceLocatorInput('rlc').click();
+
+		cy.getByTestId('rlc-item').should('exist');
+		getVisiblePopper()
+			.should('have.length', 1)
+			.findChildByTestId('rlc-item')
+			.should('have.length', 5);
+
+		ndv.actions.setInvalidExpression({ fieldName: 'fieldId' });
+
+		ndv.getters.nodeParameters().click(); // remove focus from input, hide expression preview
+
+		ndv.getters.resourceLocatorInput('rlc').click();
+
+		cy.getByTestId('rlc-item').should('exist');
+		getVisiblePopper()
+			.should('have.length', 1)
+			.findChildByTestId('rlc-item')
+			.should('have.length', 5);
+	});
+});
diff --git a/cypress/e2e/27-cloud.cy.ts b/cypress/e2e/27-cloud.cy.ts
new file mode 100644
index 0000000000000..965bc5bccfedf
--- /dev/null
+++ b/cypress/e2e/27-cloud.cy.ts
@@ -0,0 +1,119 @@
+import {
+	BannerStack,
+	MainSidebar,
+	WorkflowPage,
+	visitPublicApiPage,
+	getPublicApiUpgradeCTA,
+} from '../pages';
+import planData from '../fixtures/Plan_data_opt_in_trial.json';
+import { INSTANCE_OWNER } from '../constants';
+
+const mainSidebar = new MainSidebar();
+const bannerStack = new BannerStack();
+const workflowPage = new WorkflowPage();
+
+describe('Cloud', { disableAutoLogin: true }, () => {
+	before(() => {
+		const now = new Date();
+		const fiveDaysFromNow = new Date(now.getTime() + 5 * 24 * 60 * 60 * 1000);
+		planData.expirationDate = fiveDaysFromNow.toJSON();
+	});
+
+	describe('BannerStack', () => {
+		it('should render trial banner for opt-in cloud user', () => {
+			cy.intercept('GET', '/rest/admin/cloud-plan', {
+				body: planData,
+			}).as('getPlanData');
+
+			cy.intercept('GET', '/rest/settings', (req) => {
+				req.on('response', (res) => {
+					res.send({
+						data: { ...res.body.data, deployment: { type: 'cloud' }, n8nMetadata: { userId: 1 } },
+					});
+				});
+			}).as('loadSettings');
+
+			cy.signin({ email: INSTANCE_OWNER.email, password: INSTANCE_OWNER.password });
+
+			cy.visit(workflowPage.url);
+
+			cy.wait('@getPlanData');
+
+			bannerStack.getters.banner().should('be.visible');
+
+			mainSidebar.actions.signout();
+
+			bannerStack.getters.banner().should('not.be.visible');
+
+			cy.signin({ email: INSTANCE_OWNER.email, password: INSTANCE_OWNER.password });
+
+			cy.visit(workflowPage.url);
+
+			bannerStack.getters.banner().should('be.visible');
+
+			mainSidebar.actions.signout();
+		});
+
+		it('should not render opt-in-trial banner for non cloud deployment', () => {
+			cy.intercept('GET', '/rest/settings', (req) => {
+				req.on('response', (res) => {
+					res.send({
+						data: { ...res.body.data, deployment: { type: 'default' } },
+					});
+				});
+			}).as('loadSettings');
+
+			cy.signin({ email: INSTANCE_OWNER.email, password: INSTANCE_OWNER.password });
+
+			cy.visit(workflowPage.url);
+
+			bannerStack.getters.banner().should('not.be.visible');
+
+			mainSidebar.actions.signout();
+		});
+	});
+
+	describe('Admin Home', () => {
+		it('Should show admin button', () => {
+			cy.intercept('GET', '/rest/settings', (req) => {
+				req.on('response', (res) => {
+					res.send({
+						data: { ...res.body.data, deployment: { type: 'cloud' }, n8nMetadata: { userId: 1 } },
+					});
+				});
+			}).as('loadSettings');
+
+			cy.signin({ email: INSTANCE_OWNER.email, password: INSTANCE_OWNER.password });
+
+			cy.visit(workflowPage.url);
+
+			mainSidebar.getters.adminPanel().should('be.visible');
+		});
+	});
+
+	describe('Public API', () => {
+		it('Should show upgrade CTA for Public API if user is trialing', () => {
+			cy.intercept('GET', '/rest/admin/cloud-plan', {
+				body: planData,
+			}).as('getPlanData');
+
+			cy.intercept('GET', '/rest/settings', (req) => {
+				req.on('response', (res) => {
+					res.send({
+						data: {
+							...res.body.data,
+							deployment: { type: 'cloud' },
+							n8nMetadata: { userId: 1 },
+						},
+					});
+				});
+			}).as('loadSettings');
+
+			cy.signin({ email: INSTANCE_OWNER.email, password: INSTANCE_OWNER.password });
+
+			visitPublicApiPage();
+
+			getPublicApiUpgradeCTA().should('be.visible');
+		});
+	});
+});
diff --git a/cypress/e2e/27-two-factor-authentication.cy.ts b/cypress/e2e/27-two-factor-authentication.cy.ts
new file mode 100644
index 0000000000000..91f6ca57a24cc
--- /dev/null
+++ b/cypress/e2e/27-two-factor-authentication.cy.ts
@@ -0,0 +1,81 @@
+import { MainSidebar } from './../pages/sidebar/main-sidebar';
+import { INSTANCE_OWNER, INSTANCE_ADMIN, BACKEND_BASE_URL } from '../constants';
+import { SigninPage } from '../pages';
+import { PersonalSettingsPage } from '../pages/settings-personal';
+import { MfaLoginPage } from '../pages/mfa-login';
+import generateOTPToken from 'cypress-otp';
+
+const MFA_SECRET = 'KVKFKRCPNZQUYMLXOVYDSQKJKZDTSRLD';
+
+const RECOVERY_CODE = 'd04ea17f-e8b2-4afa-a9aa-57a2c735b30e';
+
+const user = {
+	email: INSTANCE_OWNER.email,
+	password: INSTANCE_OWNER.password,
+	firstName: 'User',
+	lastName: 'A',
+	mfaEnabled: false,
+	mfaSecret: MFA_SECRET,
+	mfaRecoveryCodes: [RECOVERY_CODE],
+};
+
+const admin = {
+	email: INSTANCE_ADMIN.email,
+	password: INSTANCE_ADMIN.password,
+	firstName: 'Admin',
+	lastName: 'B',
+	mfaEnabled: false,
+	mfaSecret: MFA_SECRET,
+	mfaRecoveryCodes: [RECOVERY_CODE],
+};
+
+const mfaLoginPage = new MfaLoginPage();
+const signinPage = new SigninPage();
+const personalSettingsPage = new PersonalSettingsPage();
+const mainSidebar = new MainSidebar();
+
+describe('Two-factor authentication', () => {
+	beforeEach(() => {
+		Cypress.session.clearAllSavedSessions();
+		cy.request('POST', `${BACKEND_BASE_URL}/rest/e2e/reset`, {
+			owner: user,
+			members: [],
+			admin,
+		});
+		cy.on('uncaught:exception', (err, runnable) => {
+			expect(err.message).to.include('Not logged in');
+			return false;
+		});
+		cy.intercept('GET', '/rest/mfa/qr').as('getMfaQrCode');
+	});
+
+	it('Should be able to login with MFA token', () => {
+		const { email, password } = user;
+		signinPage.actions.loginWithEmailAndPassword(email, password);
+		personalSettingsPage.actions.enableMfa();
+		mainSidebar.actions.signout();
+		const token = generateOTPToken(user.mfaSecret);
+		mfaLoginPage.actions.loginWithMfaToken(email, password, token);
+		mainSidebar.actions.signout();
+	});
+
+	it('Should be able to login with recovery code', () => {
+		const { email, password } = user;
+		signinPage.actions.loginWithEmailAndPassword(email, password);
+		personalSettingsPage.actions.enableMfa();
+		mainSidebar.actions.signout();
+		mfaLoginPage.actions.loginWithRecoveryCode(email, password, user.mfaRecoveryCodes[0]);
+		mainSidebar.actions.signout();
+	});
+
+	it('Should be able to disable MFA in account', () => {
+		const { email, password } = user;
+		signinPage.actions.loginWithEmailAndPassword(email, password);
+		personalSettingsPage.actions.enableMfa();
+		mainSidebar.actions.signout();
+		const token = generateOTPToken(user.mfaSecret);
+		mfaLoginPage.actions.loginWithMfaToken(email, password, token);
+		personalSettingsPage.actions.disableMfa();
+		mainSidebar.actions.signout();
+	});
+});
diff --git a/cypress/e2e/28-debug.cy.ts b/cypress/e2e/28-debug.cy.ts
new file mode 100644
index 0000000000000..955d33ce28c28
--- /dev/null
+++ b/cypress/e2e/28-debug.cy.ts
@@ -0,0 +1,139 @@
+import {
+	HTTP_REQUEST_NODE_NAME,
+	IF_NODE_NAME,
+	INSTANCE_OWNER,
+	MANUAL_TRIGGER_NODE_NAME,
+	EDIT_FIELDS_SET_NODE_NAME,
+} from '../constants';
+import { WorkflowPage, NDV, WorkflowExecutionsTab } from '../pages';
+
+const workflowPage = new WorkflowPage();
+const ndv = new NDV();
+const executionsTab = new WorkflowExecutionsTab();
+
+describe('Debug', () => {
+	beforeEach(() => {
+		cy.enableFeature('debugInEditor');
+	});
+
+	it('should be able to debug executions', () => {
+		cy.intercept('GET', '/rest/executions?filter=*').as('getExecutions');
+		cy.intercept('GET', '/rest/executions/*').as('getExecution');
+		cy.intercept('POST', '/rest/workflows/run').as('postWorkflowRun');
+
+		cy.signin({ email: INSTANCE_OWNER.email, password: INSTANCE_OWNER.password });
+
+		workflowPage.actions.visit();
+
+		workflowPage.actions.addInitialNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
+		workflowPage.actions.addNodeToCanvas(HTTP_REQUEST_NODE_NAME);
+		workflowPage.actions.openNode(HTTP_REQUEST_NODE_NAME);
+		ndv.actions.typeIntoParameterInput('url', 'https://foo.bar');
+		ndv.actions.close();
+
+		workflowPage.actions.addNodeToCanvas(EDIT_FIELDS_SET_NODE_NAME, true);
+
+		workflowPage.actions.saveWorkflowUsingKeyboardShortcut();
+		workflowPage.actions.executeWorkflow();
+
+		cy.wait(['@postWorkflowRun']);
+
+		executionsTab.actions.switchToExecutionsTab();
+
+		cy.wait(['@getExecutions']);
+
+		executionsTab.getters.executionDebugButton().should('have.text', 'Debug in editor').click();
+		cy.url().should('include', '/debug');
+		cy.get('.el-notification').contains('Execution data imported').should('be.visible');
+		cy.get('.matching-pinned-nodes-confirmation').should('not.exist');
+
+		workflowPage.actions.openNode(HTTP_REQUEST_NODE_NAME);
+		ndv.actions.clearParameterInput('url');
+		ndv.actions.typeIntoParameterInput('url', 'https://postman-echo.com/get?foo1=bar1&foo2=bar2');
+		ndv.actions.close();
+
+		workflowPage.actions.saveWorkflowUsingKeyboardShortcut();
+		cy.url().should('not.include', '/debug');
+
+		workflowPage.actions.executeWorkflow();
+
+		cy.wait(['@postWorkflowRun']);
+
+		workflowPage.actions.openNode(HTTP_REQUEST_NODE_NAME);
+		ndv.actions.pinData();
+		ndv.actions.close();
+
+		executionsTab.actions.switchToExecutionsTab();
+
+		cy.wait(['@getExecutions']);
+
+		executionsTab.getters.executionListItems().should('have.length', 2).first().click();
+		cy.wait(['@getExecution']);
+
+		executionsTab.getters.executionDebugButton().should('have.text', 'Copy to editor').click();
+
+		let confirmDialog = cy.get('.matching-pinned-nodes-confirmation').filter(':visible');
+		confirmDialog.find('li').should('have.length', 2);
+		confirmDialog.get('.btn--cancel').click();
+
+		cy.wait(['@getExecutions']);
+
+		executionsTab.getters.executionListItems().should('have.length', 2).first().click();
+		cy.wait(['@getExecution']);
+
+		executionsTab.getters.executionDebugButton().should('have.text', 'Copy to editor').click();
+
+		confirmDialog = cy.get('.matching-pinned-nodes-confirmation').filter(':visible');
+		confirmDialog.find('li').should('have.length', 2);
+		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.reload(true);
+		cy.wait(['@getExecution']);
+
+		confirmDialog = cy.get('.matching-pinned-nodes-confirmation').filter(':visible');
+		confirmDialog.find('li').should('have.length', 1);
+		confirmDialog.get('.btn--confirm').click();
+
+		workflowPage.getters.canvasNodePlusEndpointByName(EDIT_FIELDS_SET_NODE_NAME).click();
+		workflowPage.actions.addNodeToCanvas(IF_NODE_NAME, false);
+		workflowPage.actions.saveWorkflowUsingKeyboardShortcut();
+		cy.url().should('not.include', '/debug');
+
+		executionsTab.actions.switchToExecutionsTab();
+		cy.wait(['@getExecutions']);
+		executionsTab.getters.executionDebugButton().should('have.text', 'Copy to editor').click();
+
+		confirmDialog = cy.get('.matching-pinned-nodes-confirmation').filter(':visible');
+		confirmDialog.find('li').should('have.length', 1);
+		confirmDialog.get('.btn--confirm').click();
+		cy.url().should('include', '/debug');
+
+		workflowPage.getters.canvasNodes().last().find('.node-info-icon').should('be.empty');
+
+		workflowPage.getters.canvasNodes().first().dblclick();
+		ndv.getters.pinDataButton().click();
+		ndv.actions.close();
+
+		workflowPage.actions.saveWorkflowUsingKeyboardShortcut();
+		cy.url().should('not.include', '/debug');
+
+		workflowPage.actions.executeWorkflow();
+		workflowPage.actions.zoomToFit();
+		workflowPage.actions.deleteNode(IF_NODE_NAME);
+
+		executionsTab.actions.switchToExecutionsTab();
+		cy.wait(['@getExecutions']);
+		executionsTab.getters.executionListItems().should('have.length', 3).first().click();
+		cy.wait(['@getExecution']);
+		executionsTab.getters.executionDebugButton().should('have.text', 'Copy to editor').click();
+		cy.get('.el-notification').contains("Some execution data wasn't imported").should('be.visible');
+		cy.url().should('include', '/debug');
+	});
+});
diff --git a/cypress/e2e/28-resource-mapper.cy.ts b/cypress/e2e/28-resource-mapper.cy.ts
new file mode 100644
index 0000000000000..3f5909de62abd
--- /dev/null
+++ b/cypress/e2e/28-resource-mapper.cy.ts
@@ -0,0 +1,95 @@
+import { WorkflowPage, NDV } from '../pages';
+
+const workflowPage = new WorkflowPage();
+const ndv = new NDV();
+
+describe('Resource Mapper', () => {
+	beforeEach(() => {
+		workflowPage.actions.visit();
+	});
+
+	it('should not retrieve list options when required params throw errors', () => {
+		workflowPage.actions.addInitialNodeToCanvas('E2e Test', {
+			action: 'Resource Mapping Component',
+		});
+
+		ndv.getters
+			.resourceMapperFieldsContainer()
+			.should('be.visible')
+			.findChildByTestId('parameter-input')
+			.should('have.length', 3);
+
+		ndv.actions.setInvalidExpression({ fieldName: 'fieldId' });
+
+		ndv.actions.refreshResourceMapperColumns();
+		ndv.getters.resourceMapperFieldsContainer().should('not.exist');
+	});
+
+	it('should retrieve list options when optional params throw errors', () => {
+		workflowPage.actions.addInitialNodeToCanvas('E2e Test', {
+			action: 'Resource Mapping Component',
+		});
+
+		ndv.getters
+			.resourceMapperFieldsContainer()
+			.should('be.visible')
+			.findChildByTestId('parameter-input')
+			.should('have.length', 3);
+
+		ndv.actions.setInvalidExpression({ fieldName: 'otherField' });
+
+		ndv.actions.refreshResourceMapperColumns();
+		ndv.getters
+			.resourceMapperFieldsContainer()
+			.should('be.visible')
+			.findChildByTestId('parameter-input')
+			.should('have.length', 3);
+	});
+
+	it('should correctly delete single field', () => {
+		workflowPage.actions.addInitialNodeToCanvas('E2e Test', {
+			action: 'Resource Mapping Component',
+		});
+		ndv.getters.parameterInput('id').type('001');
+		ndv.getters.parameterInput('name').type('John');
+		ndv.getters.parameterInput('age').type('30');
+		ndv.getters.nodeExecuteButton().click();
+		ndv.getters.outputTableHeaderByText('id').should('exist');
+		ndv.getters.outputTableHeaderByText('name').should('exist');
+		ndv.getters.outputTableHeaderByText('age').should('exist');
+		// Remove the 'name' field
+		ndv.getters.resourceMapperRemoveFieldButton('name').should('exist').click({ force: true });
+		ndv.getters.nodeExecuteButton().click();
+		ndv.getters.parameterInput('id').should('exist');
+		ndv.getters.outputTableHeaderByText('id').should('exist');
+		// After removing the field, text field and the output table column for the 'name' should not be there anymore
+		ndv.getters.parameterInput('age').should('exist');
+		ndv.getters.outputTableHeaderByText('age').should('exist');
+		ndv.getters.parameterInput('name').should('not.exist');
+		ndv.getters.outputTableHeaderByText('name').should('not.exist');
+	});
+
+	it('should correctly delete all fields', () => {
+		workflowPage.actions.addInitialNodeToCanvas('E2e Test', {
+			action: 'Resource Mapping Component',
+		});
+		ndv.getters.parameterInput('id').type('001');
+		ndv.getters.parameterInput('name').type('John');
+		ndv.getters.parameterInput('age').type('30');
+		ndv.getters.nodeExecuteButton().click();
+		ndv.getters.outputTableHeaderByText('id').should('exist');
+		ndv.getters.outputTableHeaderByText('name').should('exist');
+		ndv.getters.outputTableHeaderByText('age').should('exist');
+		ndv.getters.resourceMapperColumnsOptionsButton().click();
+		// Click on the 'Remove All Fields' option
+		ndv.getters.resourceMapperRemoveAllFieldsOption().should('be.visible').click();
+		ndv.getters.nodeExecuteButton().click();
+		ndv.getters.parameterInput('id').should('exist');
+		ndv.getters.outputTableHeaderByText('id').should('exist');
+		// After removing the all fields, only required one should be in UI and output table
+		ndv.getters.parameterInput('name').should('not.exist');
+		ndv.getters.outputTableHeaderByText('name').should('not.exist');
+		ndv.getters.parameterInput('age').should('not.exist');
+		ndv.getters.outputTableHeaderByText('age').should('not.exist');
+	});
+});
diff --git a/cypress/e2e/29-sql-editor.cy.ts b/cypress/e2e/29-sql-editor.cy.ts
new file mode 100644
index 0000000000000..86299d5f67cdc
--- /dev/null
+++ b/cypress/e2e/29-sql-editor.cy.ts
@@ -0,0 +1,71 @@
+import { WorkflowPage, NDV } from '../pages';
+
+const workflowPage = new WorkflowPage();
+const ndv = new NDV();
+
+describe('SQL editors', () => {
+	beforeEach(() => {
+		workflowPage.actions.visit();
+	});
+
+	it('should preserve changes when opening-closing Postgres node', () => {
+		workflowPage.actions.addInitialNodeToCanvas('Postgres', {
+			action: 'Execute a SQL query',
+			keepNdvOpen: true,
+		});
+		ndv.getters
+			.sqlEditorContainer()
+			.click()
+			.find('.cm-content')
+			.type('SELECT * FROM `testTable`')
+			.type('{esc}');
+		ndv.actions.close();
+		workflowPage.actions.openNode('Postgres');
+		ndv.getters.sqlEditorContainer().find('.cm-content').type('{end} LIMIT 10').type('{esc}');
+		ndv.actions.close();
+		workflowPage.actions.openNode('Postgres');
+		ndv.getters.sqlEditorContainer().should('contain', 'SELECT * FROM `testTable` LIMIT 10');
+	});
+
+	it('should update expression output dropdown as the query is edited', () => {
+		workflowPage.actions.addInitialNodeToCanvas('MySQL', {
+			action: 'Execute a SQL query',
+		});
+		ndv.actions.close();
+
+		workflowPage.actions.openNode('When clicking "Test workflow"');
+		ndv.actions.setPinnedData([{ table: 'test_table' }]);
+		ndv.actions.close();
+
+		workflowPage.actions.openNode('MySQL');
+		ndv.getters
+			.sqlEditorContainer()
+			.find('.cm-content')
+			.type('SELECT * FROM {{ $json.table }}', { parseSpecialCharSequences: false });
+		workflowPage.getters
+			.inlineExpressionEditorOutput()
+			.should('have.text', 'SELECT * FROM test_table');
+	});
+
+	it('should not push NDV header out with a lot of code in Postgres editor', () => {
+		workflowPage.actions.addInitialNodeToCanvas('Postgres', {
+			action: 'Execute a SQL query',
+			keepNdvOpen: true,
+		});
+		cy.fixture('Dummy_javascript.txt').then((code) => {
+			ndv.getters.sqlEditorContainer().find('.cm-content').paste(code);
+		});
+		ndv.getters.nodeExecuteButton().should('be.visible');
+	});
+
+	it('should not push NDV header out with a lot of code in MySQL editor', () => {
+		workflowPage.actions.addInitialNodeToCanvas('MySQL', {
+			action: 'Execute a SQL query',
+			keepNdvOpen: true,
+		});
+		cy.fixture('Dummy_javascript.txt').then((code) => {
+			ndv.getters.sqlEditorContainer().find('.cm-content').paste(code);
+		});
+		ndv.getters.nodeExecuteButton().should('be.visible');
+	});
+});
diff --git a/cypress/e2e/29-templates.cy.ts b/cypress/e2e/29-templates.cy.ts
new file mode 100644
index 0000000000000..34762b12fcfb2
--- /dev/null
+++ b/cypress/e2e/29-templates.cy.ts
@@ -0,0 +1,46 @@
+import { TemplatesPage } from '../pages/templates';
+import { WorkflowsPage } from '../pages/workflows';
+import { MainSidebar } from '../pages/sidebar/main-sidebar';
+
+const templatesPage = new TemplatesPage();
+const workflowsPage = new WorkflowsPage();
+const mainSidebar = new MainSidebar();
+
+describe('Workflow templates', () => {
+	beforeEach(() => {
+		cy.intercept('GET', '**/rest/settings', (req) => {
+			// Disable cache
+			delete req.headers['if-none-match']
+			req.reply((res) => {
+				if (res.body.data) {
+					// Disable custom templates host if it has been overridden by another intercept
+					res.body.data.templates = { enabled: true, host: 'https://api.n8n.io/api/' };
+				}
+			});
+		}).as('settingsRequest');
+	});
+
+	it('Opens website when clicking templates sidebar link', () => {
+		cy.visit(workflowsPage.url);
+		mainSidebar.getters.menuItem('Templates').should('be.visible');
+		// Templates should be a link to the website
+		mainSidebar.getters.templates().parent('a').should('have.attr', 'href').and('include', 'https://n8n.io/workflows');
+		// Link should contain instance address and n8n version
+		mainSidebar.getters.templates().parent('a').then(($a) => {
+			const href = $a.attr('href');
+			const params = new URLSearchParams(href);
+			// Link should have all mandatory parameters expected on the website
+			expect(decodeURIComponent(`${params.get('utm_instance')}`)).to.include(window.location.origin);
+			expect(params.get('utm_n8n_version')).to.match(/[0-9]+\.[0-9]+\.[0-9]+/);
+			expect(params.get('utm_awc')).to.match(/[0-9]+/);
+		});
+		mainSidebar.getters.templates().parent('a').should('have.attr', 'target', '_blank');
+	});
+
+	it('Redirects to website when visiting templates page directly', () => {
+		cy.visit(templatesPage.url);
+		cy.origin('https://n8n.io', () => {
+			cy.url().should('include', 'https://n8n.io/workflows');
+		})
+	});
+});
diff --git a/cypress/e2e/3-default-owner.cy.ts b/cypress/e2e/3-default-owner.cy.ts
deleted file mode 100644
index 1871dd9c6c950..0000000000000
--- a/cypress/e2e/3-default-owner.cy.ts
+++ /dev/null
@@ -1,110 +0,0 @@
-import { randFirstName, randLastName } from '@ngneat/falso';
-import { DEFAULT_USER_EMAIL, DEFAULT_USER_PASSWORD } from '../constants';
-import {
-	SettingsUsersPage,
-	SignupPage,
-	WorkflowsPage,
-	WorkflowPage,
-	CredentialsPage,
-	CredentialsModal,
-	MessageBox,
-} from '../pages';
-import { SettingsUsagePage } from '../pages/settings-usage';
-
-import { MainSidebar, SettingsSidebar } from '../pages/sidebar';
-
-const mainSidebar = new MainSidebar();
-const settingsSidebar = new SettingsSidebar();
-
-const workflowsPage = new WorkflowsPage();
-const signupPage = new SignupPage();
-const workflowPage = new WorkflowPage();
-
-const credentialsPage = new CredentialsPage();
-const credentialsModal = new CredentialsModal();
-
-const settingsUsersPage = new SettingsUsersPage();
-const settingsUsagePage = new SettingsUsagePage();
-
-const messageBox = new MessageBox();
-
-const email = DEFAULT_USER_EMAIL;
-const password = DEFAULT_USER_PASSWORD;
-const firstName = randFirstName();
-const lastName = randLastName();
-
-describe('Default owner', () => {
-	it('should be able to create workflows', () => {
-		cy.resetAll();
-		cy.skipSetup();
-		cy.createFixtureWorkflow('Test_workflow_1.json', `Test workflow`);
-
-		// reload page, ensure owner still has access
-		cy.reload();
-		cy.waitForLoad();
-		workflowPage.getters.workflowNameInput().should('contain.value', 'Test workflow');
-	});
-
-	it('should be able to add new credentials', () => {
-		cy.visit(credentialsPage.url);
-
-		credentialsPage.getters.emptyListCreateCredentialButton().click();
-
-		credentialsModal.getters.newCredentialModal().should('be.visible');
-		credentialsModal.getters.newCredentialTypeSelect().should('be.visible');
-		credentialsModal.getters.newCredentialTypeOption('Notion API').click();
-
-		credentialsModal.getters.newCredentialTypeButton().click();
-
-		credentialsModal.getters.connectionParameter('API Key').type('1234567890');
-
-		credentialsModal.actions.setName('My awesome Notion account');
-		credentialsModal.actions.save();
-
-		credentialsModal.actions.close();
-
-		credentialsModal.getters.newCredentialModal().should('not.exist');
-		credentialsModal.getters.editCredentialModal().should('not.exist');
-
-		credentialsPage.getters.credentialCards().should('have.length', 1);
-	});
-
-	it('should be able to setup UM from settings', () => {
-		cy.visit('/');
-		mainSidebar.getters.settings().should('be.visible');
-		mainSidebar.actions.goToSettings();
-		cy.url().should('include', settingsUsagePage.url);
-
-		settingsSidebar.actions.goToUsers();
-		cy.url().should('include', settingsUsersPage.url);
-
-		settingsUsersPage.actions.goToOwnerSetup();
-
-		cy.url().should('include', signupPage.url);
-	});
-
-	it('should be able to setup instance and migrate workflows and credentials', () => {
-		cy.setup({ email, firstName, lastName, password });
-
-		messageBox.getters.content().should('contain.text', '1 existing workflow and 1 credential');
-
-		messageBox.actions.confirm();
-		cy.url().should('include', settingsUsersPage.url);
-		settingsSidebar.actions.back();
-
-		cy.url().should('include', workflowsPage.url);
-
-		workflowsPage.getters.workflowCards().should('have.length', 1);
-	});
-
-	it('can click back to main menu and have migrated credential after setup', () => {
-		cy.signin({ email, password });
-		cy.visit(workflowsPage.url);
-
-		mainSidebar.actions.goToCredentials();
-
-		cy.url().should('include', credentialsPage.url);
-
-		credentialsPage.getters.credentialCards().should('have.length', 1);
-	});
-});
diff --git a/cypress/e2e/30-editor-after-route-changes.cy.ts b/cypress/e2e/30-editor-after-route-changes.cy.ts
new file mode 100644
index 0000000000000..727078e7352c9
--- /dev/null
+++ b/cypress/e2e/30-editor-after-route-changes.cy.ts
@@ -0,0 +1,216 @@
+import {
+	CODE_NODE_NAME,
+	EDIT_FIELDS_SET_NODE_NAME,
+	IF_NODE_NAME,
+	INSTANCE_OWNER,
+	SCHEDULE_TRIGGER_NODE_NAME,
+} from '../constants';
+import {
+	WorkflowExecutionsTab,
+	WorkflowPage as WorkflowPageClass,
+	WorkflowHistoryPage,
+} from '../pages';
+
+const workflowPage = new WorkflowPageClass();
+const executionsTab = new WorkflowExecutionsTab();
+const workflowHistoryPage = new WorkflowHistoryPage();
+
+const createNewWorkflowAndActivate = () => {
+	workflowPage.actions.visit();
+	workflowPage.actions.addNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME);
+	workflowPage.actions.saveWorkflowOnButtonClick();
+	workflowPage.actions.activateWorkflow();
+	cy.get('.el-notification .el-notification--error').should('not.exist');
+};
+
+const editWorkflowAndDeactivate = () => {
+	workflowPage.getters.canvasNodePlusEndpointByName(SCHEDULE_TRIGGER_NODE_NAME).click();
+	workflowPage.getters.nodeCreatorSearchBar().should('be.visible');
+	workflowPage.actions.addNodeToCanvas(EDIT_FIELDS_SET_NODE_NAME, false);
+	cy.get('.jtk-connector').should('have.length', 1);
+	workflowPage.actions.saveWorkflowOnButtonClick();
+	workflowPage.getters.activatorSwitch().click();
+	workflowPage.actions.zoomToFit();
+	cy.get('.el-notification .el-notification--error').should('not.exist');
+};
+
+const editWorkflowMoreAndActivate = () => {
+	cy.drag(workflowPage.getters.getEndpointSelector('plus', EDIT_FIELDS_SET_NODE_NAME), [200, 200], {
+		realMouse: true,
+	});
+	workflowPage.getters.nodeCreatorSearchBar().should('be.visible');
+
+	workflowPage.actions.addNodeToCanvas(CODE_NODE_NAME, false);
+	workflowPage.getters.nodeViewBackground().click(600, 200, { force: true });
+	cy.get('.jtk-connector').should('have.length', 2);
+	workflowPage.actions.zoomToFit();
+	workflowPage.actions.saveWorkflowOnButtonClick();
+
+	workflowPage.actions.addNodeToCanvas(IF_NODE_NAME);
+	workflowPage.getters.nodeViewBackground().click(600, 200, { force: true });
+	cy.get('.jtk-connector').should('have.length', 2);
+
+	const position = {
+		top: 0,
+		left: 0,
+	};
+	workflowPage.getters
+		.canvasNodeByName(IF_NODE_NAME)
+		.click()
+		.then(($element) => {
+			position.top = $element.position().top;
+			position.left = $element.position().left;
+		});
+
+	cy.drag('[data-test-id="canvas-node"].jtk-drag-selected', [50, 200], { clickToFinish: true });
+	workflowPage.getters
+		.canvasNodes()
+		.last()
+		.then(($element) => {
+			const finalPosition = {
+				top: $element.position().top,
+				left: $element.position().left,
+			};
+
+			expect(finalPosition.top).to.be.greaterThan(position.top);
+			expect(finalPosition.left).to.be.greaterThan(position.left);
+		});
+
+	cy.draganddrop(
+		workflowPage.getters.getEndpointSelector('output', CODE_NODE_NAME),
+		workflowPage.getters.getEndpointSelector('input', IF_NODE_NAME),
+	);
+	cy.get('.jtk-connector').should('have.length', 3);
+
+	workflowPage.actions.saveWorkflowOnButtonClick();
+	workflowPage.getters.activatorSwitch().click();
+	cy.get('.el-notification .el-notification--error').should('not.exist');
+};
+
+const switchBetweenEditorAndHistory = () => {
+	workflowPage.getters.workflowHistoryButton().click();
+	cy.wait(['@getHistory']);
+	cy.wait(['@getVersion']);
+
+	cy.intercept('GET', '/rest/workflows/*').as('workflowGet');
+	workflowHistoryPage.getters.workflowHistoryCloseButton().click();
+	cy.wait(['@workflowGet']);
+	cy.wait(1000);
+
+	workflowPage.getters.canvasNodes().first().should('be.visible');
+	workflowPage.getters.canvasNodes().last().should('be.visible');
+};
+
+const switchBetweenEditorAndWorkflowlist = () => {
+	cy.getByTestId('menu-item').first().click();
+	cy.wait(['@getUsers', '@getWorkflows', '@getActiveWorkflows', '@getCredentials']);
+
+	cy.getByTestId('resources-list-item').first().click();
+
+	workflowPage.getters.canvasNodes().first().should('be.visible');
+	workflowPage.getters.canvasNodes().last().should('be.visible');
+};
+
+const zoomInAndCheckNodes = () => {
+	cy.getByTestId('zoom-in-button').click();
+	cy.getByTestId('zoom-in-button').click();
+	cy.getByTestId('zoom-in-button').click();
+	cy.getByTestId('zoom-in-button').click();
+
+	workflowPage.getters.canvasNodes().first().should('not.be.visible');
+	workflowPage.getters.canvasNodes().last().should('not.be.visible');
+};
+
+describe('Editor actions should work', () => {
+	beforeEach(() => {
+		cy.enableFeature('debugInEditor');
+		cy.enableFeature('workflowHistory');
+		cy.signin({ email: INSTANCE_OWNER.email, password: INSTANCE_OWNER.password });
+		createNewWorkflowAndActivate();
+	});
+
+	it('after saving a new workflow', () => {
+		editWorkflowAndDeactivate();
+		editWorkflowMoreAndActivate();
+	});
+
+	it('after switching between Editor and Executions', () => {
+		cy.intercept('GET', '/rest/executions?filter=*').as('getExecutions');
+
+		executionsTab.actions.switchToExecutionsTab();
+		cy.wait(['@getExecutions']);
+		cy.wait(500);
+		executionsTab.actions.switchToEditorTab();
+		editWorkflowAndDeactivate();
+		editWorkflowMoreAndActivate();
+	});
+
+	it('after switching between Editor and Debug', () => {
+		cy.intercept('GET', '/rest/executions?filter=*').as('getExecutions');
+		cy.intercept('GET', '/rest/executions/*').as('getExecution');
+		cy.intercept('POST', '/rest/workflows/run').as('postWorkflowRun');
+
+		editWorkflowAndDeactivate();
+		workflowPage.actions.executeWorkflow();
+		cy.wait(['@postWorkflowRun']);
+
+		executionsTab.actions.switchToExecutionsTab();
+		cy.wait(['@getExecutions']);
+
+		executionsTab.getters.executionListItems().should('have.length', 1).first().click();
+		cy.wait(['@getExecution']);
+
+		executionsTab.getters.executionDebugButton().should('have.text', 'Copy to editor').click();
+		editWorkflowMoreAndActivate();
+	});
+
+	it('after switching between Editor and Workflow history', () => {
+		cy.intercept('GET', '/rest/workflow-history/workflow/*/version/*').as('getVersion');
+		cy.intercept('GET', '/rest/workflow-history/workflow/*').as('getHistory');
+
+		editWorkflowAndDeactivate();
+		workflowPage.getters.workflowHistoryButton().click();
+		cy.wait(['@getHistory']);
+		cy.wait(['@getVersion']);
+
+		cy.intercept('GET', '/rest/workflows/*').as('workflowGet');
+		workflowHistoryPage.getters.workflowHistoryCloseButton().click();
+		cy.wait(['@workflowGet']);
+		cy.wait(1000);
+
+		editWorkflowMoreAndActivate();
+	});
+});
+
+describe('Editor zoom should work after route changes', () => {
+	beforeEach(() => {
+		cy.enableFeature('debugInEditor');
+		cy.enableFeature('workflowHistory');
+		cy.signin({ email: INSTANCE_OWNER.email, password: INSTANCE_OWNER.password });
+		workflowPage.actions.visit();
+		cy.createFixtureWorkflow('Lots_of_nodes.json', `Lots of nodes`);
+		workflowPage.actions.saveWorkflowOnButtonClick();
+	});
+
+	it('after switching between Editor and Workflow history and Workflow list', () => {
+		cy.intercept('GET', '/rest/workflow-history/workflow/*/version/*').as('getVersion');
+		cy.intercept('GET', '/rest/workflow-history/workflow/*').as('getHistory');
+		cy.intercept('GET', '/rest/users').as('getUsers');
+		cy.intercept('GET', '/rest/workflows').as('getWorkflows');
+		cy.intercept('GET', '/rest/active-workflows').as('getActiveWorkflows');
+		cy.intercept('GET', '/rest/credentials').as('getCredentials');
+
+		switchBetweenEditorAndHistory();
+		zoomInAndCheckNodes();
+		switchBetweenEditorAndHistory();
+		switchBetweenEditorAndHistory();
+		zoomInAndCheckNodes();
+		switchBetweenEditorAndWorkflowlist();
+		zoomInAndCheckNodes();
+		switchBetweenEditorAndWorkflowlist();
+		switchBetweenEditorAndWorkflowlist();
+		zoomInAndCheckNodes();
+		switchBetweenEditorAndHistory();
+		switchBetweenEditorAndWorkflowlist();
+	});
+});
diff --git a/cypress/e2e/30-if-node.cy.ts b/cypress/e2e/30-if-node.cy.ts
new file mode 100644
index 0000000000000..95ed1e9a0d34d
--- /dev/null
+++ b/cypress/e2e/30-if-node.cy.ts
@@ -0,0 +1,58 @@
+import { IF_NODE_NAME } from '../constants';
+import { WorkflowPage, NDV } from '../pages';
+
+const workflowPage = new WorkflowPage();
+const ndv = new NDV();
+
+const FILTER_PARAM_NAME = 'conditions';
+
+describe('If Node (filter component)', () => {
+	beforeEach(() => {
+		workflowPage.actions.visit();
+	});
+
+	it('should be able to create and delete multiple conditions', () => {
+		workflowPage.actions.addInitialNodeToCanvas(IF_NODE_NAME, { keepNdvOpen: true });
+
+		// Default state
+		ndv.getters.filterComponent(FILTER_PARAM_NAME).should('exist');
+		ndv.getters.filterConditions(FILTER_PARAM_NAME).should('have.length', 1);
+		ndv.getters
+			.filterConditionOperator(FILTER_PARAM_NAME)
+			.find('input')
+			.should('have.value', 'is equal to');
+
+		// Add
+		ndv.actions.addFilterCondition(FILTER_PARAM_NAME);
+		ndv.getters.filterConditionLeft(FILTER_PARAM_NAME, 0).find('input').type('first left');
+		ndv.getters.filterConditionLeft(FILTER_PARAM_NAME, 1).find('input').type('second left');
+		ndv.actions.addFilterCondition(FILTER_PARAM_NAME);
+		ndv.getters.filterConditions(FILTER_PARAM_NAME).should('have.length', 3);
+
+		// Delete
+		ndv.actions.removeFilterCondition(FILTER_PARAM_NAME, 0);
+		ndv.getters.filterConditions(FILTER_PARAM_NAME).should('have.length', 2);
+		ndv.getters
+			.filterConditionLeft(FILTER_PARAM_NAME, 0)
+			.find('input')
+			.should('have.value', 'second left');
+		ndv.actions.removeFilterCondition(FILTER_PARAM_NAME, 1);
+		ndv.getters.filterConditions(FILTER_PARAM_NAME).should('have.length', 1);
+	});
+
+	it('should correctly evaluate conditions', () => {
+		cy.fixture('Test_workflow_filter.json').then((data) => {
+			cy.get('body').paste(JSON.stringify(data));
+		});
+
+		workflowPage.actions.zoomToFit();
+		workflowPage.actions.executeWorkflow();
+
+		workflowPage.actions.openNode('Then');
+		ndv.getters.outputPanel().contains('3 items').should('exist');
+		ndv.actions.close();
+
+		workflowPage.actions.openNode('Else');
+		ndv.getters.outputPanel().contains('1 item').should('exist');
+	});
+});
diff --git a/cypress/e2e/30-langchain.cy.ts b/cypress/e2e/30-langchain.cy.ts
new file mode 100644
index 0000000000000..9536b3cf60b5a
--- /dev/null
+++ b/cypress/e2e/30-langchain.cy.ts
@@ -0,0 +1,334 @@
+import {
+	AGENT_NODE_NAME,
+	MANUAL_CHAT_TRIGGER_NODE_NAME,
+	AI_LANGUAGE_MODEL_OPENAI_CHAT_MODEL_NODE_NAME,
+	MANUAL_TRIGGER_NODE_NAME,
+	AI_MEMORY_WINDOW_BUFFER_MEMORY_NODE_NAME,
+	AI_TOOL_CALCULATOR_NODE_NAME,
+	AI_OUTPUT_PARSER_AUTO_FIXING_NODE_NAME,
+	AI_TOOL_CODE_NODE_NAME,
+	AI_TOOL_WIKIPEDIA_NODE_NAME,
+	BASIC_LLM_CHAIN_NODE_NAME,
+	EDIT_FIELDS_SET_NODE_NAME,
+} from './../constants';
+import { createMockNodeExecutionData, runMockWorkflowExcution } from '../utils';
+import {
+	addLanguageModelNodeToParent,
+	addMemoryNodeToParent,
+	addNodeToCanvas,
+	addOutputParserNodeToParent,
+	addToolNodeToParent,
+	clickExecuteWorkflowButton,
+	clickManualChatButton,
+	disableNode,
+	getExecuteWorkflowButton,
+	navigateToNewWorkflowPage,
+	openNode,
+} from '../composables/workflow';
+import {
+	clickCreateNewCredential,
+	clickExecuteNode,
+	clickGetBackToCanvas,
+	toggleParameterCheckboxInputByName,
+} from '../composables/ndv';
+import { setCredentialValues } from '../composables/modals/credential-modal';
+import {
+	closeManualChatModal,
+	getManualChatDialog,
+	getManualChatMessages,
+	getManualChatModal,
+	getManualChatModalLogs,
+	getManualChatModalLogsEntries,
+	getManualChatModalLogsTree,
+	sendManualChatMessage,
+} from '../composables/modals/chat-modal';
+
+describe('Langchain Integration', () => {
+	beforeEach(() => {
+		navigateToNewWorkflowPage();
+	});
+
+	it('should not open chat modal', () => {
+		addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME, true);
+		addNodeToCanvas(EDIT_FIELDS_SET_NODE_NAME, true);
+
+		clickGetBackToCanvas();
+
+		addNodeToCanvas(AGENT_NODE_NAME, true, true);
+		clickGetBackToCanvas();
+
+		addLanguageModelNodeToParent(
+			AI_LANGUAGE_MODEL_OPENAI_CHAT_MODEL_NODE_NAME,
+			AGENT_NODE_NAME,
+			true,
+		);
+		clickGetBackToCanvas();
+
+		clickExecuteWorkflowButton();
+		getManualChatModal().should('not.exist');
+	});
+
+	it('should disable test workflow button', () => {
+		addNodeToCanvas('Schedule Trigger', true);
+		addNodeToCanvas(EDIT_FIELDS_SET_NODE_NAME, true);
+
+		clickGetBackToCanvas();
+
+		addNodeToCanvas(AGENT_NODE_NAME, true, true);
+		clickGetBackToCanvas();
+
+		addLanguageModelNodeToParent(
+			AI_LANGUAGE_MODEL_OPENAI_CHAT_MODEL_NODE_NAME,
+			AGENT_NODE_NAME,
+			true,
+		);
+		clickGetBackToCanvas();
+
+		disableNode('Schedule Trigger');
+
+		getExecuteWorkflowButton().should('be.disabled');
+	});
+
+	it('should add nodes to all Agent node input types', () => {
+		addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME, true);
+		addNodeToCanvas(AGENT_NODE_NAME, true, true);
+		toggleParameterCheckboxInputByName('hasOutputParser');
+		clickGetBackToCanvas();
+
+		addLanguageModelNodeToParent(
+			AI_LANGUAGE_MODEL_OPENAI_CHAT_MODEL_NODE_NAME,
+			AGENT_NODE_NAME,
+			true,
+		);
+		clickGetBackToCanvas();
+
+		addMemoryNodeToParent(AI_MEMORY_WINDOW_BUFFER_MEMORY_NODE_NAME, AGENT_NODE_NAME);
+		clickGetBackToCanvas();
+
+		addToolNodeToParent(AI_TOOL_CALCULATOR_NODE_NAME, AGENT_NODE_NAME);
+		clickGetBackToCanvas();
+
+		addOutputParserNodeToParent(AI_OUTPUT_PARSER_AUTO_FIXING_NODE_NAME, AGENT_NODE_NAME);
+		clickGetBackToCanvas();
+	});
+
+	it('should add multiple tool nodes to Agent node tool input type', () => {
+		addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME, true);
+		addNodeToCanvas(AGENT_NODE_NAME, true);
+
+		[
+			AI_TOOL_CALCULATOR_NODE_NAME,
+			AI_TOOL_CODE_NODE_NAME,
+			AI_TOOL_CODE_NODE_NAME,
+			AI_TOOL_CODE_NODE_NAME,
+			AI_TOOL_WIKIPEDIA_NODE_NAME,
+		].forEach((tool) => {
+			addToolNodeToParent(tool, AGENT_NODE_NAME);
+			clickGetBackToCanvas();
+		});
+	});
+
+	it('should be able to open and execute Basic LLM Chain node', () => {
+		addNodeToCanvas(MANUAL_CHAT_TRIGGER_NODE_NAME, true);
+		addNodeToCanvas(BASIC_LLM_CHAIN_NODE_NAME, true);
+
+		addLanguageModelNodeToParent(
+			AI_LANGUAGE_MODEL_OPENAI_CHAT_MODEL_NODE_NAME,
+			BASIC_LLM_CHAIN_NODE_NAME,
+			true,
+		);
+
+		clickCreateNewCredential();
+		setCredentialValues({
+			apiKey: 'sk_test_123',
+		});
+		clickGetBackToCanvas();
+
+		openNode(BASIC_LLM_CHAIN_NODE_NAME);
+		const inputMessage = 'Hello!';
+		const outputMessage = 'Hi there! How can I assist you today?';
+
+		clickExecuteNode();
+		runMockWorkflowExcution({
+			trigger: () => sendManualChatMessage(inputMessage),
+			runData: [
+				createMockNodeExecutionData(BASIC_LLM_CHAIN_NODE_NAME, {
+					jsonData: {
+						main: { output: outputMessage },
+					},
+					metadata: {
+						subRun: [{ node: AI_LANGUAGE_MODEL_OPENAI_CHAT_MODEL_NODE_NAME, runIndex: 0 }],
+					},
+				}),
+			],
+			lastNodeExecuted: BASIC_LLM_CHAIN_NODE_NAME,
+		});
+
+		getManualChatDialog().should('contain', outputMessage);
+	});
+
+	it('should be able to open and execute Agent node', () => {
+		addNodeToCanvas(MANUAL_CHAT_TRIGGER_NODE_NAME, true);
+		addNodeToCanvas(AGENT_NODE_NAME, true);
+
+		addLanguageModelNodeToParent(
+			AI_LANGUAGE_MODEL_OPENAI_CHAT_MODEL_NODE_NAME,
+			AGENT_NODE_NAME,
+			true,
+		);
+
+		clickCreateNewCredential();
+		setCredentialValues({
+			apiKey: 'sk_test_123',
+		});
+		clickGetBackToCanvas();
+
+		openNode(AGENT_NODE_NAME);
+
+		const inputMessage = 'Hello!';
+		const outputMessage = 'Hi there! How can I assist you today?';
+
+		clickExecuteNode();
+		runMockWorkflowExcution({
+			trigger: () => sendManualChatMessage(inputMessage),
+			runData: [
+				createMockNodeExecutionData(AGENT_NODE_NAME, {
+					jsonData: {
+						main: { output: outputMessage },
+					},
+					metadata: {
+						subRun: [{ node: AI_LANGUAGE_MODEL_OPENAI_CHAT_MODEL_NODE_NAME, runIndex: 0 }],
+					},
+				}),
+			],
+			lastNodeExecuted: AGENT_NODE_NAME,
+		});
+
+		getManualChatDialog().should('contain', outputMessage);
+	});
+
+	it('should add and use Manual Chat Trigger node together with Agent node', () => {
+		addNodeToCanvas(MANUAL_CHAT_TRIGGER_NODE_NAME, true);
+		addNodeToCanvas(AGENT_NODE_NAME, true);
+
+		addLanguageModelNodeToParent(
+			AI_LANGUAGE_MODEL_OPENAI_CHAT_MODEL_NODE_NAME,
+			AGENT_NODE_NAME,
+			true,
+		);
+
+		clickCreateNewCredential();
+		setCredentialValues({
+			apiKey: 'sk_test_123',
+		});
+		clickGetBackToCanvas();
+
+		clickManualChatButton();
+
+		getManualChatModalLogs().should('not.exist');
+
+		const inputMessage = 'Hello!';
+		const outputMessage = 'Hi there! How can I assist you today?';
+
+		runMockWorkflowExcution({
+			trigger: () => {
+				sendManualChatMessage(inputMessage);
+			},
+			runData: [
+				createMockNodeExecutionData(MANUAL_CHAT_TRIGGER_NODE_NAME, {
+					jsonData: {
+						main: { input: inputMessage },
+					},
+				}),
+				createMockNodeExecutionData(AI_LANGUAGE_MODEL_OPENAI_CHAT_MODEL_NODE_NAME, {
+					jsonData: {
+						ai_languageModel: {
+							response: {
+								generations: [
+									{
+										text: `{
+    "action": "Final Answer",
+    "action_input": "${outputMessage}"
+}`,
+										message: {
+											lc: 1,
+											type: 'constructor',
+											id: ['langchain', 'schema', 'AIMessage'],
+											kwargs: {
+												content: `{
+    "action": "Final Answer",
+    "action_input": "${outputMessage}"
+}`,
+												additional_kwargs: {},
+											},
+										},
+										generationInfo: { finish_reason: 'stop' },
+									},
+								],
+								llmOutput: {
+									tokenUsage: {
+										completionTokens: 26,
+										promptTokens: 519,
+										totalTokens: 545,
+									},
+								},
+							},
+						},
+					},
+					inputOverride: {
+						ai_languageModel: [
+							[
+								{
+									json: {
+										messages: [
+											{
+												lc: 1,
+												type: 'constructor',
+												id: ['langchain', 'schema', 'SystemMessage'],
+												kwargs: {
+													content:
+														'Assistant is a large language model trained by OpenAI.\n\nAssistant is designed to be able to assist with a wide range of tasks, from answering simple questions to providing in-depth explanations and discussions on a wide range of topics. As a language model, Assistant is able to generate human-like text based on the input it receives, allowing it to engage in natural-sounding conversations and provide responses that are coherent and relevant to the topic at hand.\n\nAssistant is constantly learning and improving, and its capabilities are constantly evolving. It is able to process and understand large amounts of text, and can use this knowledge to provide accurate and informative responses to a wide range of questions. Additionally, Assistant is able to generate its own text based on the input it receives, allowing it to engage in discussions and provide explanations and descriptions on a wide range of topics.\n\nOverall, Assistant is a powerful system that can help with a wide range of tasks and provide valuable insights and information on a wide range of topics. Whether you need help with a specific question or just want to have a conversation about a particular topic, Assistant is here to assist. However, above all else, all responses must adhere to the format of RESPONSE FORMAT INSTRUCTIONS.',
+													additional_kwargs: {},
+												},
+											},
+											{
+												lc: 1,
+												type: 'constructor',
+												id: ['langchain', 'schema', 'HumanMessage'],
+												kwargs: {
+													content:
+														'TOOLS\n------\nAssistant can ask the user to use tools to look up information that may be helpful in answering the users original question. The tools the human can use are:\n\n\n\nRESPONSE FORMAT INSTRUCTIONS\n----------------------------\n\nOutput a JSON markdown code snippet containing a valid JSON object in one of two formats:\n\n**Option 1:**\nUse this if you want the human to use a tool.\nMarkdown code snippet formatted in the following schema:\n\n```json\n{\n    "action": string, // The action to take. Must be one of []\n    "action_input": string // The input to the action. May be a stringified object.\n}\n```\n\n**Option #2:**\nUse this if you want to respond directly and conversationally to the human. Markdown code snippet formatted in the following schema:\n\n```json\n{\n    "action": "Final Answer",\n    "action_input": string // You should put what you want to return to use here and make sure to use valid json newline characters.\n}\n```\n\nFor both options, remember to always include the surrounding markdown code snippet delimiters (begin with "```json" and end with "```")!\n\n\nUSER\'S INPUT\n--------------------\nHere is the user\'s input (remember to respond with a markdown code snippet of a json blob with a single action, and NOTHING else):\n\nHello!',
+													additional_kwargs: {},
+												},
+											},
+										],
+										options: { stop: ['Observation:'], promptIndex: 0 },
+									},
+								},
+							],
+						],
+					},
+				}),
+				createMockNodeExecutionData(AGENT_NODE_NAME, {
+					jsonData: {
+						main: { output: 'Hi there! How can I assist you today?' },
+					},
+					metadata: {
+						subRun: [{ node: AI_LANGUAGE_MODEL_OPENAI_CHAT_MODEL_NODE_NAME, runIndex: 0 }],
+					},
+				}),
+			],
+			lastNodeExecuted: AGENT_NODE_NAME,
+		});
+
+		const messages = getManualChatMessages();
+		messages.should('have.length', 2);
+		messages.should('contain', inputMessage);
+		messages.should('contain', outputMessage);
+
+		getManualChatModalLogsTree().should('be.visible');
+		getManualChatModalLogsEntries().should('have.length', 1);
+
+		closeManualChatModal();
+	});
+});
diff --git a/cypress/e2e/30-workflow-filters.cy.ts b/cypress/e2e/30-workflow-filters.cy.ts
new file mode 100644
index 0000000000000..634f95ba06a6f
--- /dev/null
+++ b/cypress/e2e/30-workflow-filters.cy.ts
@@ -0,0 +1,118 @@
+import { WorkflowsPage as WorkflowsPageClass } from '../pages/workflows';
+import { WorkflowPage as WorkflowPageClass } from '../pages/workflow';
+
+import { MainSidebar } from '../pages';
+import { INSTANCE_OWNER } from '../constants';
+
+const WorkflowsPage = new WorkflowsPageClass();
+const WorkflowPages = new WorkflowPageClass();
+const mainSidebar = new MainSidebar();
+
+describe.skip('Workflow filters', () => {
+	before(() => {
+		cy.enableFeature('sharing', true);
+	});
+
+	beforeEach(() => {
+		cy.visit(WorkflowsPage.url);
+	});
+
+	it('Should filter by tags', () => {
+		cy.visit(WorkflowsPage.url);
+		WorkflowsPage.getters.newWorkflowButtonCard().click();
+		cy.createFixtureWorkflow('Test_workflow_1.json', `Workflow 1`);
+		cy.visit(WorkflowsPage.url);
+		WorkflowsPage.getters.createWorkflowButton().click();
+		cy.createFixtureWorkflow('Test_workflow_2.json', `Workflow 2`);
+		cy.visit(WorkflowsPage.url);
+
+		WorkflowsPage.getters.workflowFilterButton().click();
+		WorkflowsPage.getters.workflowTagsDropdown().click();
+		WorkflowsPage.getters.workflowTagItem('other-tag-1').click();
+		cy.get('body').click(0, 0);
+
+		WorkflowsPage.getters.workflowCards().should('have.length', 1);
+		WorkflowsPage.getters.workflowCard('Workflow 2').should('contain.text', 'Workflow 2');
+		mainSidebar.actions.goToSettings();
+		cy.go('back');
+
+		WorkflowsPage.getters.workflowCards().should('have.length', 1);
+		WorkflowsPage.getters.workflowCard('Workflow 2').should('contain.text', 'Workflow 2');
+		WorkflowsPage.getters.workflowResetFilters().click();
+
+		WorkflowsPage.getters.workflowCards().each(($el) => {
+			const workflowName = $el.find('[data-test-id="workflow-card-name"]').text();
+
+			WorkflowsPage.getters.workflowCardActions(workflowName).click();
+			WorkflowsPage.getters.workflowDeleteButton().click();
+
+			cy.get('button').contains('delete').click();
+		});
+	});
+
+	it('Should filter by status', () => {
+		cy.visit(WorkflowsPage.url);
+		WorkflowsPage.getters.newWorkflowButtonCard().click();
+		cy.createFixtureWorkflow('Test_workflow_1.json', `Workflow 1`);
+		cy.visit(WorkflowsPage.url);
+		WorkflowsPage.getters.createWorkflowButton().click();
+		cy.createFixtureWorkflow('Test_workflow_3.json', `Workflow 3`);
+		WorkflowPages.getters.activatorSwitch().click();
+		cy.visit(WorkflowsPage.url);
+
+		WorkflowsPage.getters.workflowFilterButton().click();
+		WorkflowsPage.getters.workflowStatusDropdown().click();
+		WorkflowsPage.getters.workflowStatusItem('Active').click();
+		cy.get('body').click(0, 0);
+
+		WorkflowsPage.getters.workflowCards().should('have.length', 1);
+		WorkflowsPage.getters.workflowCard('Workflow 3').should('contain.text', 'Workflow 3');
+		mainSidebar.actions.goToSettings();
+		cy.go('back');
+
+		WorkflowsPage.getters.workflowCards().should('have.length', 1);
+		WorkflowsPage.getters.workflowCard('Workflow 3').should('contain.text', 'Workflow 3');
+		WorkflowsPage.getters.workflowResetFilters().click();
+
+		WorkflowsPage.getters.workflowCards().each(($el) => {
+			const workflowName = $el.find('[data-test-id="workflow-card-name"]').text();
+
+			WorkflowsPage.getters.workflowCardActions(workflowName).click();
+			WorkflowsPage.getters.workflowDeleteButton().click();
+
+			cy.get('button').contains('delete').click();
+		});
+	});
+
+	it('Should filter by owned by', () => {
+		cy.visit(WorkflowsPage.url);
+
+		WorkflowsPage.getters.newWorkflowButtonCard().click();
+		cy.createFixtureWorkflow('Test_workflow_1.json', `Workflow 1`);
+		cy.visit(WorkflowsPage.url);
+		WorkflowsPage.getters.createWorkflowButton().click();
+		cy.createFixtureWorkflow('Test_workflow_3.json', `Workflow 3`);
+		WorkflowPages.getters.activatorSwitch().click();
+		cy.visit(WorkflowsPage.url);
+
+		WorkflowsPage.getters.workflowFilterButton().click();
+		WorkflowsPage.getters.workflowOwnershipDropdown().realClick();
+		WorkflowsPage.getters.workflowOwner(INSTANCE_OWNER.email).click();
+		cy.get('body').click(0, 0);
+
+		WorkflowsPage.getters.workflowCards().should('have.length', 2);
+		mainSidebar.actions.goToSettings();
+		cy.go('back');
+
+		WorkflowsPage.getters.workflowResetFilters().click();
+
+		WorkflowsPage.getters.workflowCards().each(($el) => {
+			const workflowName = $el.find('[data-test-id="workflow-card-name"]').text();
+
+			WorkflowsPage.getters.workflowCardActions(workflowName).click();
+			WorkflowsPage.getters.workflowDeleteButton().click();
+
+			cy.get('button').contains('delete').click();
+		});
+	});
+});
diff --git a/cypress/e2e/31-demo.cy.ts b/cypress/e2e/31-demo.cy.ts
new file mode 100644
index 0000000000000..d9397ace4eece
--- /dev/null
+++ b/cypress/e2e/31-demo.cy.ts
@@ -0,0 +1,23 @@
+import workflow from '../fixtures/Manual_wait_set.json';
+import { importWorkflow, vistDemoPage } from '../pages/demo';
+import { WorkflowPage } from '../pages/workflow';
+
+const workflowPage = new WorkflowPage();
+
+describe('Demo', () => {
+	it('can import template', () => {
+		vistDemoPage();
+		importWorkflow(workflow);
+		workflowPage.getters.canvasNodes().should('have.length', 3);
+	});
+
+	it('can override theme to dark', () => {
+		vistDemoPage('dark');
+		cy.get('body').should('have.attr', 'data-theme', 'dark');
+	});
+
+	it('can override theme to light', () => {
+		vistDemoPage('light');
+		cy.get('body').should('have.attr', 'data-theme', 'light');
+	});
+});
diff --git a/cypress/e2e/32-node-io-filter.cy.ts b/cypress/e2e/32-node-io-filter.cy.ts
new file mode 100644
index 0000000000000..3f1ffdf005243
--- /dev/null
+++ b/cypress/e2e/32-node-io-filter.cy.ts
@@ -0,0 +1,116 @@
+import { WorkflowPage as WorkflowPageClass, NDV } from '../pages';
+
+const workflowPage = new WorkflowPageClass();
+const ndv = new NDV();
+
+describe('Node IO Filter', () => {
+	beforeEach(() => {
+		workflowPage.actions.visit();
+		cy.createFixtureWorkflow('Node_IO_filter.json', `Node IO filter`);
+		workflowPage.actions.saveWorkflowOnButtonClick();
+		workflowPage.actions.executeWorkflow();
+	});
+
+	it('should filter pinned data', () => {
+		workflowPage.getters.canvasNodes().first().dblclick();
+		ndv.actions.close();
+		workflowPage.getters.canvasNodes().first().dblclick();
+		cy.wait(500);
+		ndv.getters.outputDataContainer().should('be.visible');
+		cy.document().trigger('keyup', { key: '/' });
+
+		const searchInput = ndv.getters.searchInput();
+
+		searchInput.filter(':focus').should('exist');
+		ndv.getters.pagination().find('li').should('have.length', 3);
+		ndv.getters.outputDataContainer().find('mark').should('not.exist');
+
+		searchInput.type('ar');
+		ndv.getters.pagination().find('li').should('have.length', 2);
+		ndv.getters.outputDataContainer().find('mark').its('length').should('be.gt', 0);
+
+		searchInput.type('i');
+		ndv.getters.pagination().should('not.exist');
+		ndv.getters.outputDataContainer().find('mark').its('length').should('be.gt', 0);
+	});
+
+	it('should filter input/output data separately', () => {
+		workflowPage.getters.canvasNodes().eq(1).dblclick();
+		cy.wait(500);
+		ndv.getters.outputDataContainer().should('be.visible');
+		ndv.getters.inputDataContainer().should('be.visible');
+		ndv.actions.switchInputMode('Table');
+		cy.document().trigger('keyup', { key: '/' });
+
+		ndv.getters.outputPanel().findChildByTestId('ndv-search').filter(':focus').should('not.exist');
+
+		let focusedInput = ndv.getters
+			.inputPanel()
+			.findChildByTestId('ndv-search')
+			.filter(':focus')
+			.should('exist');
+
+		const getInputPagination = () =>
+			ndv.getters.inputPanel().findChildByTestId('ndv-data-pagination');
+		const getInputCounter = () => ndv.getters.inputPanel().findChildByTestId('ndv-items-count');
+		const getOuputPagination = () =>
+			ndv.getters.outputPanel().findChildByTestId('ndv-data-pagination');
+		const getOutputCounter = () => ndv.getters.outputPanel().findChildByTestId('ndv-items-count');
+
+		getInputPagination().find('li').should('have.length', 3);
+		getInputCounter().contains('21 items').should('exist');
+		getOuputPagination().find('li').should('have.length', 3);
+		getOutputCounter().contains('21 items').should('exist');
+		focusedInput.type('ar');
+
+		getInputPagination().find('li').should('have.length', 2);
+		getInputCounter().should('contain', '14 of 21 items');
+		getOuputPagination().find('li').should('have.length', 3);
+		getOutputCounter().should('contain', '21 items');
+		focusedInput.type('i');
+
+		getInputPagination().should('not.exist');
+		getInputCounter().should('contain', '8 of 21 items');
+		getOuputPagination().find('li').should('have.length', 3);
+		getOutputCounter().should('contain', '21 items');
+
+		focusedInput.clear();
+		getInputPagination().find('li').should('have.length', 3);
+		getInputCounter().contains('21 items').should('exist');
+		getOuputPagination().find('li').should('have.length', 3);
+		getOutputCounter().contains('21 items').should('exist');
+
+		ndv.getters.outputDataContainer().trigger('mouseover');
+		cy.document().trigger('keyup', { key: '/' });
+		ndv.getters.inputPanel().findChildByTestId('ndv-search').filter(':focus').should('not.exist');
+
+		focusedInput = ndv.getters
+			.outputPanel()
+			.findChildByTestId('ndv-search')
+			.filter(':focus')
+			.should('exist');
+
+		getInputPagination().find('li').should('have.length', 3);
+		getInputCounter().contains('21 items').should('exist');
+		getOuputPagination().find('li').should('have.length', 3);
+		getOutputCounter().contains('21 items').should('exist');
+		focusedInput.type('ar');
+
+		getInputPagination().find('li').should('have.length', 3);
+		getInputCounter().contains('21 items').should('exist');
+		getOuputPagination().find('li').should('have.length', 2);
+		getOutputCounter().should('contain', '14 of 21 items');
+		focusedInput.type('i');
+
+		getInputPagination().find('li').should('have.length', 3);
+		getInputCounter().contains('21 items').should('exist');
+		getOuputPagination().should('not.exist');
+		getOutputCounter().should('contain', '8 of 21 items');
+
+		focusedInput.clear();
+		getInputPagination().find('li').should('have.length', 3);
+		getInputCounter().contains('21 items').should('exist');
+		getOuputPagination().find('li').should('have.length', 3);
+		getOutputCounter().contains('21 items').should('exist');
+	});
+});
diff --git a/cypress/e2e/32-worker-view.cy.ts b/cypress/e2e/32-worker-view.cy.ts
new file mode 100644
index 0000000000000..ba3edbe4c9a17
--- /dev/null
+++ b/cypress/e2e/32-worker-view.cy.ts
@@ -0,0 +1,43 @@
+import { INSTANCE_MEMBERS, INSTANCE_OWNER } from '../constants';
+import { WorkerViewPage } from '../pages';
+
+const workerViewPage = new WorkerViewPage();
+
+describe('Worker View (unlicensed)', () => {
+	beforeEach(() => {
+		cy.disableFeature('workerView');
+		cy.disableQueueMode();
+	});
+
+	it('should not show up in the menu sidebar', () => {
+		cy.signin(INSTANCE_MEMBERS[0]);
+		cy.visit(workerViewPage.url);
+		workerViewPage.getters.menuItem().should('not.exist');
+	});
+
+	it('should show action box', () => {
+		cy.signin(INSTANCE_MEMBERS[0]);
+		cy.visit(workerViewPage.url);
+		workerViewPage.getters.workerViewUnlicensed().should('exist');
+	});
+});
+
+describe('Worker View (licensed)', () => {
+	beforeEach(() => {
+		cy.enableFeature('workerView');
+		cy.enableQueueMode();
+	});
+
+	it('should show up in the menu sidebar', () => {
+		cy.signin(INSTANCE_OWNER);
+		cy.enableQueueMode();
+		cy.visit(workerViewPage.url);
+		workerViewPage.getters.menuItem().should('exist');
+	});
+
+	it('should show worker list view', () => {
+		cy.signin(INSTANCE_MEMBERS[0]);
+		cy.visit(workerViewPage.url);
+		workerViewPage.getters.workerViewLicensed().should('exist');
+	});
+});
diff --git a/cypress/e2e/33-settings-personal.cy.ts b/cypress/e2e/33-settings-personal.cy.ts
new file mode 100644
index 0000000000000..9257bee22d25f
--- /dev/null
+++ b/cypress/e2e/33-settings-personal.cy.ts
@@ -0,0 +1,52 @@
+import { WorkflowPage } from "../pages";
+
+const workflowPage = new WorkflowPage();
+
+const INVALID_NAMES = [
+	'https://n8n.io',
+	'http://n8n.io',
+	'www.n8n.io',
+	'n8n.io',
+	'n8n.бг',
+	'n8n.io/home',
+	'n8n.io/home?send=true',
+	'<a href="#">Jack</a>',
+	'<script>alert("Hello")</script>',
+];
+
+const VALID_NAMES = [
+	['a', 'a'],
+	['alice', 'alice'],
+	['Robert', 'Downey Jr.'],
+	['Mia', 'Mia-Downey'],
+	['Mark', "O'neil"],
+	['Thomas', 'Müler'],
+	['ßáçøñ', 'ßáçøñ'],
+	['أحمد', 'فلسطين'],
+	['Милорад', 'Филиповић'],
+];
+
+describe('Personal Settings', () => {
+	it ('should allow to change first and last name', () => {
+		cy.visit('/settings/personal');
+		VALID_NAMES.forEach((name) => {
+			cy.getByTestId('personal-data-form').find('input[name="firstName"]').clear().type(name[0]);
+			cy.getByTestId('personal-data-form').find('input[name="lastName"]').clear().type(name[1]);
+			cy.getByTestId('save-settings-button').click();
+			workflowPage.getters.successToast().should('contain', 'Personal details updated');
+			workflowPage.getters.successToast().find('.el-notification__closeBtn').click();
+		});
+	});
+	it('not allow malicious values for personal data', () => {
+		cy.visit('/settings/personal');
+		INVALID_NAMES.forEach((name) => {
+			cy.getByTestId('personal-data-form').find('input[name="firstName"]').clear().type(name);
+			cy.getByTestId('personal-data-form').find('input[name="lastName"]').clear().type(name);
+			cy.getByTestId('save-settings-button').click();
+			workflowPage.getters
+				.errorToast()
+				.should('contain', 'Malicious firstName | Malicious lastName');
+			workflowPage.getters.errorToast().find('.el-notification__closeBtn').click();
+		});
+	});
+});
diff --git a/cypress/e2e/34-template-credentials-setup.cy.ts b/cypress/e2e/34-template-credentials-setup.cy.ts
new file mode 100644
index 0000000000000..7de435c4fafaa
--- /dev/null
+++ b/cypress/e2e/34-template-credentials-setup.cy.ts
@@ -0,0 +1,208 @@
+import {
+	clickUseWorkflowButtonByTitle,
+	visitTemplateCollectionPage,
+	testData,
+} from '../pages/template-collection';
+import * as templateCredentialsSetupPage from '../pages/template-credential-setup';
+import { WorkflowPage } from '../pages/workflow';
+import * as formStep from '../composables/setup-template-form-step';
+import { getSetupWorkflowCredentialsButton } from '../composables/setup-workflow-credentials-button';
+import * as setupCredsModal from '../composables/modals/workflow-credential-setup-modal';
+
+const workflowPage = new WorkflowPage();
+
+const testTemplate = templateCredentialsSetupPage.testData.simpleTemplate;
+
+// NodeView uses beforeunload listener that will show a browser
+// native popup, which will block cypress from continuing / exiting.
+// This prevent the registration of the listener.
+Cypress.on('window:before:load', (win) => {
+	const origAddEventListener = win.addEventListener;
+	win.addEventListener = (eventName: string, listener: any, opts: any) => {
+		if (eventName === 'beforeunload') {
+			return;
+		}
+
+		return origAddEventListener.call(win, eventName, listener, opts);
+	};
+});
+
+describe('Template credentials setup', () => {
+	beforeEach(() => {
+		cy.intercept('GET', `https://api.n8n.io/api/templates/workflows/${testTemplate.id}`, {
+			fixture: testTemplate.fixture,
+		});
+		cy.intercept('GET', '**/rest/settings', (req) => {
+			// Disable cache
+			delete req.headers['if-none-match']
+			req.reply((res) => {
+				if (res.body.data) {
+					// Disable custom templates host if it has been overridden by another intercept
+					res.body.data.templates = { enabled: true, host: 'https://api.n8n.io/api/' };
+				}
+			});
+		}).as('settingsRequest');
+	});
+
+	it('can be opened from template collection page', () => {
+		visitTemplateCollectionPage(testData.ecommerceStarterPack);
+		templateCredentialsSetupPage.enableTemplateCredentialSetupFeatureFlag();
+		clickUseWorkflowButtonByTitle('Promote new Shopify products on Twitter and Telegram');
+
+		templateCredentialsSetupPage.getters
+			.title(`Set up 'Promote new Shopify products on Twitter and Telegram' template`)
+			.should('be.visible');
+	});
+
+	it('has all the elements on page', () => {
+		templateCredentialsSetupPage.visitTemplateCredentialSetupPage(testTemplate.id);
+
+		templateCredentialsSetupPage.getters
+			.title(`Set up 'Promote new Shopify products on Twitter and Telegram' template`)
+			.should('be.visible');
+
+		templateCredentialsSetupPage.getters
+			.infoCallout()
+			.should(
+				'contain.text',
+				'You need 1x Shopify, 1x X (Formerly Twitter) and 1x Telegram account to setup this template',
+			);
+
+		const expectedAppNames = ['1. Shopify', '2. X (Formerly Twitter)', '3. Telegram'];
+		const expectedAppDescriptions = [
+			'The credential you select will be used in the product created node of the workflow template.',
+			'The credential you select will be used in the Twitter node of the workflow template.',
+			'The credential you select will be used in the Telegram node of the workflow template.',
+		];
+
+		formStep.getFormStep().each(($el, index) => {
+			formStep.getStepHeading($el).should('have.text', expectedAppNames[index]);
+			formStep.getStepDescription($el).should('have.text', expectedAppDescriptions[index]);
+		});
+	});
+
+	it('can skip template creation', () => {
+		templateCredentialsSetupPage.visitTemplateCredentialSetupPage(testTemplate.id);
+
+		templateCredentialsSetupPage.getters.skipLink().click();
+		workflowPage.getters.canvasNodes().should('have.length', 3);
+	});
+
+	it('can create credentials and workflow from the template', () => {
+		templateCredentialsSetupPage.visitTemplateCredentialSetupPage(testTemplate.id);
+
+		// Continue button should be disabled if no credentials are created
+		templateCredentialsSetupPage.getters.continueButton().should('be.disabled');
+
+		templateCredentialsSetupPage.fillInDummyCredentialsForApp('Shopify');
+
+		// Continue button should be enabled if at least one has been created
+		templateCredentialsSetupPage.getters.continueButton().should('be.enabled');
+
+		templateCredentialsSetupPage.fillInDummyCredentialsForAppWithConfirm('X (Formerly Twitter)');
+		templateCredentialsSetupPage.fillInDummyCredentialsForApp('Telegram');
+
+		templateCredentialsSetupPage.finishCredentialSetup();
+
+		workflowPage.getters.canvasNodes().should('have.length', 3);
+
+		// Focus the canvas so the copy to clipboard works
+		workflowPage.getters.canvasNodes().eq(0).realClick();
+		workflowPage.actions.selectAll();
+		workflowPage.actions.hitCopy();
+
+		cy.grantBrowserPermissions('clipboardReadWrite', 'clipboardSanitizedWrite');
+		// Check workflow JSON by copying it to clipboard
+		cy.readClipboard().then((workflowJSON) => {
+			const workflow = JSON.parse(workflowJSON);
+
+			expect(workflow.meta).to.haveOwnProperty('templateId', testTemplate.id.toString());
+			workflow.nodes.forEach((node: any) => {
+				expect(Object.keys(node.credentials ?? {})).to.have.lengthOf(1);
+			});
+		});
+	});
+
+	it('should work with a template that has no credentials (ADO-1603)', () => {
+		const templateWithoutCreds = templateCredentialsSetupPage.testData.templateWithoutCredentials;
+		cy.intercept('GET', `https://api.n8n.io/api/templates/workflows/${templateWithoutCreds.id}`, {
+			fixture: templateWithoutCreds.fixture,
+		});
+		templateCredentialsSetupPage.visitTemplateCredentialSetupPage(templateWithoutCreds.id);
+
+		const expectedAppNames = ['1. Email (IMAP)', '2. Nextcloud'];
+		const expectedAppDescriptions = [
+			'The credential you select will be used in the IMAP Email node of the workflow template.',
+			'The credential you select will be used in the Nextcloud node of the workflow template.',
+		];
+
+		formStep.getFormStep().each(($el, index) => {
+			formStep.getStepHeading($el).should('have.text', expectedAppNames[index]);
+			formStep.getStepDescription($el).should('have.text', expectedAppDescriptions[index]);
+		});
+
+		templateCredentialsSetupPage.getters.continueButton().should('be.disabled');
+
+		templateCredentialsSetupPage.fillInDummyCredentialsForApp('Email (IMAP)');
+		templateCredentialsSetupPage.fillInDummyCredentialsForApp('Nextcloud');
+
+		templateCredentialsSetupPage.finishCredentialSetup();
+
+		workflowPage.getters.canvasNodes().should('have.length', 3);
+	});
+
+	describe('Credential setup from workflow editor', () => {
+		beforeEach(() => {
+			cy.resetDatabase();
+			cy.signinAsOwner();
+		});
+
+		it('should allow credential setup from workflow editor if user skips it during template setup', () => {
+			templateCredentialsSetupPage.visitTemplateCredentialSetupPage(testTemplate.id);
+			templateCredentialsSetupPage.getters.skipLink().click();
+
+			getSetupWorkflowCredentialsButton().should('be.visible');
+		});
+
+		it('should allow credential setup from workflow editor if user fills in credentials partially during template setup', () => {
+			templateCredentialsSetupPage.visitTemplateCredentialSetupPage(testTemplate.id);
+			templateCredentialsSetupPage.fillInDummyCredentialsForApp('Shopify');
+
+			templateCredentialsSetupPage.finishCredentialSetup();
+
+			getSetupWorkflowCredentialsButton().should('be.visible');
+		});
+
+		it('should fill credentials from workflow editor', () => {
+			templateCredentialsSetupPage.visitTemplateCredentialSetupPage(testTemplate.id);
+			templateCredentialsSetupPage.getters.skipLink().click();
+
+			getSetupWorkflowCredentialsButton().click();
+			setupCredsModal.getWorkflowCredentialsModal().should('be.visible');
+
+			templateCredentialsSetupPage.fillInDummyCredentialsForApp('Shopify');
+			templateCredentialsSetupPage.fillInDummyCredentialsForAppWithConfirm('X (Formerly Twitter)');
+			templateCredentialsSetupPage.fillInDummyCredentialsForApp('Telegram');
+
+			setupCredsModal.closeModalFromContinueButton();
+			setupCredsModal.getWorkflowCredentialsModal().should('not.exist');
+
+			// Focus the canvas so the copy to clipboard works
+			workflowPage.getters.canvasNodes().eq(0).realClick();
+			workflowPage.actions.selectAll();
+			workflowPage.actions.hitCopy();
+
+			cy.grantBrowserPermissions('clipboardReadWrite', 'clipboardSanitizedWrite');
+			// Check workflow JSON by copying it to clipboard
+			cy.readClipboard().then((workflowJSON) => {
+				const workflow = JSON.parse(workflowJSON);
+
+				workflow.nodes.forEach((node: any) => {
+					expect(Object.keys(node.credentials ?? {})).to.have.lengthOf(1);
+				});
+			});
+
+			getSetupWorkflowCredentialsButton().should('not.exist');
+		});
+	});
+});
diff --git a/cypress/e2e/35-admin-user-smoke-test.cy.ts b/cypress/e2e/35-admin-user-smoke-test.cy.ts
new file mode 100644
index 0000000000000..05e70aa339ab4
--- /dev/null
+++ b/cypress/e2e/35-admin-user-smoke-test.cy.ts
@@ -0,0 +1,23 @@
+import { INSTANCE_ADMIN, INSTANCE_OWNER } from '../constants';
+import { SettingsPage } from '../pages/settings';
+
+const settingsPage = new SettingsPage();
+
+describe('Admin user', { disableAutoLogin: true }, () => {
+	it('should see same Settings sub menu items as instance owner', () => {
+		cy.signin(INSTANCE_OWNER);
+		cy.visit(settingsPage.url);
+
+		let ownerMenuItems = 0;
+
+		settingsPage.getters.menuItems().then(($el) => {
+			ownerMenuItems = $el.length;
+		});
+
+		cy.signout();
+		cy.signin(INSTANCE_ADMIN);
+		cy.visit(settingsPage.url);
+
+		settingsPage.getters.menuItems().should('have.length', ownerMenuItems);
+	});
+});
diff --git a/cypress/e2e/36-suggested-templates.cy.ts b/cypress/e2e/36-suggested-templates.cy.ts
new file mode 100644
index 0000000000000..b788796e45b01
--- /dev/null
+++ b/cypress/e2e/36-suggested-templates.cy.ts
@@ -0,0 +1,143 @@
+import { WorkflowsPage as WorkflowsPageClass } from '../pages/workflows';
+import { WorkflowPage as WorkflowPageClass } from '../pages/workflow';
+
+type SuggestedTemplatesStub = {
+	sections: SuggestedTemplatesSectionStub[];
+}
+
+type SuggestedTemplatesSectionStub = {
+	name: string;
+	title: string;
+	description: string;
+	workflows: Array<Object>;
+};
+
+const WorkflowsListPage = new WorkflowsPageClass();
+const WorkflowPage = new WorkflowPageClass();
+
+let fixtureSections: SuggestedTemplatesStub = { sections: [] };;
+
+describe('Suggested templates - Should render', () => {
+
+	before(() => {
+		cy.fixture('Suggested_Templates.json').then((data) => {
+			fixtureSections = data;
+		});
+	});
+
+	beforeEach(() => {
+		localStorage.removeItem('SHOW_N8N_SUGGESTED_TEMPLATES');
+		cy.intercept('GET', '/rest/settings', (req) => {
+			req.on('response', (res) => {
+				res.send({
+					data: { ...res.body.data, deployment: { type: 'cloud' } },
+				});
+			});
+		}).as('loadSettings');
+		cy.intercept('GET', '/rest/cloud/proxy/templates', {
+			fixture: 'Suggested_Templates.json',
+		});
+		cy.visit(WorkflowsListPage.url);
+		cy.wait('@loadSettings');
+	});
+
+	it('should render suggested templates page in empty workflow list', () => {
+		WorkflowsListPage.getters.suggestedTemplatesPageContainer().should('exist');
+		WorkflowsListPage.getters.suggestedTemplatesCards().should('have.length', fixtureSections.sections[0].workflows.length);
+		WorkflowsListPage.getters.suggestedTemplatesSectionDescription().should('contain', fixtureSections.sections[0].description);
+	});
+
+	it('should render suggested templates when there are workflows in the list', () => {
+		WorkflowsListPage.getters.suggestedTemplatesNewWorkflowButton().click();
+		cy.createFixtureWorkflow('Test_workflow_1.json', 'Test workflow');
+		cy.visit(WorkflowsListPage.url);
+		WorkflowsListPage.getters.suggestedTemplatesSectionContainer().should('exist');
+		cy.contains(`Explore ${fixtureSections.sections[0].name.toLocaleLowerCase()} workflow templates`).should('exist');
+		WorkflowsListPage.getters.suggestedTemplatesCards().should('have.length', fixtureSections.sections[0].workflows.length);
+	});
+
+	it('should enable users to signup for suggested templates templates', () => {
+		// Test the whole flow
+		WorkflowsListPage.getters.suggestedTemplatesCards().first().click();
+		WorkflowsListPage.getters.suggestedTemplatesPreviewModal().should('exist');
+		WorkflowsListPage.getters.suggestedTemplatesUseTemplateButton().click();
+		cy.url().should('include', '/workflow/new');
+		WorkflowPage.getters.infoToast().should('contain', 'Template coming soon!');
+		WorkflowPage.getters.infoToast().contains('Notify me when it\'s available').click();
+		WorkflowPage.getters.successToast().should('contain', 'We will contact you via email once this template is released.');
+		cy.visit(WorkflowsListPage.url);
+		// Once users have signed up for a template, suggestions should not be shown again
+		WorkflowsListPage.getters.suggestedTemplatesSectionContainer().should('not.exist');
+	});
+
+});
+
+describe('Suggested templates - Should not render', () => {
+	beforeEach(() => {
+		localStorage.removeItem('SHOW_N8N_SUGGESTED_TEMPLATES');
+		cy.visit(WorkflowsListPage.url);
+	});
+
+	it('should not render suggested templates templates if not in cloud deployment', () => {
+		cy.intercept('GET', '/rest/settings', (req) => {
+			req.on('response', (res) => {
+				res.send({
+					data: { ...res.body.data, deployment: { type: 'notCloud' } },
+				});
+			});
+		});
+		WorkflowsListPage.getters.suggestedTemplatesPageContainer().should('not.exist');
+		WorkflowsListPage.getters.suggestedTemplatesSectionContainer().should('not.exist');
+	});
+
+	it('should not render suggested templates templates if endpoint throws error', () => {
+		cy.intercept('GET', '/rest/settings', (req) => {
+			req.on('response', (res) => {
+				res.send({
+					data: { ...res.body.data, deployment: { type: 'cloud' } },
+				});
+			});
+		});
+		cy.intercept('GET', '/rest/cloud/proxy/templates', { statusCode: 500 }).as('loadTemplates');
+		WorkflowsListPage.getters.suggestedTemplatesPageContainer().should('not.exist');
+		WorkflowsListPage.getters.suggestedTemplatesSectionContainer().should('not.exist');
+	});
+
+	it('should not render suggested templates templates if endpoint returns empty list', () => {
+		cy.intercept('GET', '/rest/settings', (req) => {
+			req.on('response', (res) => {
+				res.send({
+					data: { ...res.body.data, deployment: { type: 'cloud' } },
+				});
+			});
+		});
+		cy.intercept('GET', '/rest/cloud/proxy/templates', (req) => {
+			req.on('response', (res) => {
+				res.send({
+					data: { collections: [] },
+				});
+			});
+		});
+		WorkflowsListPage.getters.suggestedTemplatesPageContainer().should('not.exist');
+		WorkflowsListPage.getters.suggestedTemplatesSectionContainer().should('not.exist');
+	});
+
+	it('should not render suggested templates templates if endpoint returns invalid response', () => {
+		cy.intercept('GET', '/rest/settings', (req) => {
+			req.on('response', (res) => {
+				res.send({
+					data: { ...res.body.data, deployment: { type: 'cloud' } },
+				});
+			});
+		});
+		cy.intercept('GET', '/rest/cloud/proxy/templates', (req) => {
+			req.on('response', (res) => {
+				res.send({
+					data: { somethingElse: [] },
+				});
+			});
+		});
+		WorkflowsListPage.getters.suggestedTemplatesPageContainer().should('not.exist');
+		WorkflowsListPage.getters.suggestedTemplatesSectionContainer().should('not.exist');
+	});
+});
diff --git a/cypress/e2e/36-versions.cy.ts b/cypress/e2e/36-versions.cy.ts
new file mode 100644
index 0000000000000..2d93223ebb81f
--- /dev/null
+++ b/cypress/e2e/36-versions.cy.ts
@@ -0,0 +1,66 @@
+import { INSTANCE_OWNER } from '../constants';
+import { WorkflowsPage } from '../pages/workflows';
+import {
+	closeVersionUpdatesPanel,
+	getVersionCard,
+	getVersionUpdatesPanelOpenButton,
+	openVersionUpdatesPanel,
+} from '../composables/versions';
+
+const workflowsPage = new WorkflowsPage();
+
+describe('Versions', () => {
+	it('should open updates panel', () => {
+		cy.intercept('GET', '/rest/settings', (req) => {
+			req.continue((res) => {
+				if (res.body.hasOwnProperty('data')) {
+					res.body.data = {
+						...res.body.data,
+						releaseChannel: 'stable',
+						versionCli: '1.0.0',
+						versionNotifications: {
+							enabled: true,
+							endpoint: 'https://api.n8n.io/api/versions/',
+							infoUrl: 'https://docs.n8n.io/getting-started/installation/updating.html',
+						},
+					};
+				}
+			});
+		}).as('settings');
+
+		cy.intercept('GET', 'https://api.n8n.io/api/versions/1.0.0', [
+			{
+				name: '1.3.1',
+				createdAt: '2023-08-18T11:53:12.857Z',
+				hasSecurityIssue: null,
+				hasSecurityFix: null,
+				securityIssueFixVersion: null,
+				hasBreakingChange: null,
+				documentationUrl: 'https://docs.n8n.io/release-notes/#n8n131',
+				nodes: [],
+				description: 'Includes <strong>bug fixes</strong>',
+			},
+			{
+				name: '1.0.5',
+				createdAt: '2023-07-24T10:54:56.097Z',
+				hasSecurityIssue: false,
+				hasSecurityFix: null,
+				securityIssueFixVersion: null,
+				hasBreakingChange: true,
+				documentationUrl: 'https://docs.n8n.io/release-notes/#n8n104',
+				nodes: [],
+				description: 'Includes <strong>core functionality</strong> and <strong>bug fixes</strong>',
+			},
+		]);
+
+		cy.signin(INSTANCE_OWNER);
+
+		cy.visit(workflowsPage.url);
+		cy.wait('@settings');
+
+		getVersionUpdatesPanelOpenButton().should('contain', '2 updates');
+		openVersionUpdatesPanel();
+		getVersionCard().should('have.length', 2);
+		closeVersionUpdatesPanel();
+	});
+});
diff --git a/cypress/e2e/37-become-creator-cta.cy.ts b/cypress/e2e/37-become-creator-cta.cy.ts
new file mode 100644
index 0000000000000..931208e5f35d5
--- /dev/null
+++ b/cypress/e2e/37-become-creator-cta.cy.ts
@@ -0,0 +1,32 @@
+import {
+	getBecomeTemplateCreatorCta,
+	getCloseBecomeTemplateCreatorCtaButton,
+	interceptCtaRequestWithResponse,
+} from '../composables/becomeTemplateCreatorCta';
+import { WorkflowsPage as WorkflowsPageClass } from '../pages/workflows';
+
+const WorkflowsPage = new WorkflowsPageClass();
+
+describe('Become creator CTA', () => {
+	it('should not show the CTA if user is not eligible', () => {
+		interceptCtaRequestWithResponse(false).as('cta');
+		cy.visit(WorkflowsPage.url);
+
+		cy.wait('@cta');
+
+		getBecomeTemplateCreatorCta().should('not.exist');
+	});
+
+	it('should show the CTA if the user is eligible', () => {
+		interceptCtaRequestWithResponse(true).as('cta');
+		cy.visit(WorkflowsPage.url);
+
+		cy.wait('@cta');
+
+		getBecomeTemplateCreatorCta().should('be.visible');
+
+		getCloseBecomeTemplateCreatorCtaButton().click();
+
+		getBecomeTemplateCreatorCta().should('not.exist');
+	});
+});
diff --git a/cypress/e2e/38-custom-template-repository.cy.ts b/cypress/e2e/38-custom-template-repository.cy.ts
new file mode 100644
index 0000000000000..067bf19b15cc5
--- /dev/null
+++ b/cypress/e2e/38-custom-template-repository.cy.ts
@@ -0,0 +1,147 @@
+import { TemplatesPage } from '../pages/templates';
+import { WorkflowPage } from '../pages/workflow';
+import { TemplateWorkflowPage } from '../pages/template-workflow';
+import OnboardingWorkflow from '../fixtures/Onboarding_workflow.json';
+import WorkflowTemplate from '../fixtures/Workflow_template_write_http_query.json';
+
+const templatesPage = new TemplatesPage();
+const workflowPage = new WorkflowPage();
+const templateWorkflowPage = new TemplateWorkflowPage();
+
+
+describe.skip('In-app templates repository', () => {
+	beforeEach(() => {
+		cy.intercept('GET', '**/api/templates/search?page=1&rows=20&category=&search=', { fixture: 'templates_search/all_templates_search_response.json' }).as('searchRequest');
+		cy.intercept('GET', '**/api/templates/search?page=1&rows=20&category=Sales*', { fixture: 'templates_search/sales_templates_search_response.json' }).as('categorySearchRequest');
+		cy.intercept('GET', '**/api/templates/workflows/*', { fixture: 'templates_search/test_template_preview.json' }).as('singleTemplateRequest');
+		cy.intercept('GET', '**/api/workflows/templates/*', { fixture: 'templates_search/test_template_import.json' }).as('singleTemplateRequest');
+		cy.intercept('GET', '**/rest/settings', (req) => {
+			// Disable cache
+			delete req.headers['if-none-match']
+			req.reply((res) => {
+				if (res.body.data) {
+					// Enable in-app templates by setting a custom host
+					res.body.data.templates = { enabled: true, host: 'https://api-staging.n8n.io/api/' };
+				}
+			});
+		}).as('settingsRequest');
+	});
+
+	it('can open onboarding flow', () => {
+		templatesPage.actions.openOnboardingFlow(1, OnboardingWorkflow.name, OnboardingWorkflow, 'https://api-staging.n8n.io');
+		cy.url().then(($url) => {
+			expect($url).to.match(/.*\/workflow\/.*?onboardingId=1$/);
+		})
+
+		workflowPage.actions.shouldHaveWorkflowName(`Demo: ${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', () => {
+		templatesPage.actions.importTemplate(1, OnboardingWorkflow.name, OnboardingWorkflow, 'https://api-staging.n8n.io');
+
+		cy.url().then(($url) => {
+			expect($url).to.include('/workflow/new?templateId=1');
+		});
+
+		workflowPage.getters.canvasNodes().should('have.length', 4);
+		workflowPage.getters.stickies().should('have.length', 1);
+		workflowPage.actions.shouldHaveWorkflowName(OnboardingWorkflow.name);
+	});
+
+	it('should save template id with the workflow', () => {
+		cy.visit(templatesPage.url);
+		cy.get('.el-skeleton.n8n-loading').should('not.exist');
+		templatesPage.getters.firstTemplateCard().should('exist');
+		templatesPage.getters.templatesLoadingContainer().should('not.exist');
+		templatesPage.getters.firstTemplateCard().click();
+		cy.url().should('include', '/templates/');
+
+		cy.url().then(($url) => {
+			const templateId = $url.split('/').pop();
+
+			templatesPage.getters.useTemplateButton().click();
+			cy.url().should('include', '/workflow/new');
+			workflowPage.actions.saveWorkflowOnButtonClick();
+
+			workflowPage.actions.selectAll();
+			workflowPage.actions.hitCopy();
+
+			cy.grantBrowserPermissions('clipboardReadWrite', 'clipboardSanitizedWrite');
+			// Check workflow JSON by copying it to clipboard
+			cy.readClipboard().then((workflowJSON) => {
+				expect(workflowJSON).to.contain(`"templateId": "${templateId}"`);
+			});
+		});
+	});
+
+	it('can open template with images and hides workflow screenshots', () => {
+		templateWorkflowPage.actions.openTemplate(WorkflowTemplate, 'https://api-staging.n8n.io');
+
+		templateWorkflowPage.getters.description().find('img').should('have.length', 1);
+	});
+
+
+	it('renders search elements correctly', () => {
+		cy.visit(templatesPage.url);
+		templatesPage.getters.searchInput().should('exist');
+		templatesPage.getters.allCategoriesFilter().should('exist');
+		templatesPage.getters.categoryFilters().should('have.length.greaterThan', 1);
+		templatesPage.getters.templateCards().should('have.length.greaterThan', 0);
+	});
+
+	it('can filter templates by category', () => {
+		cy.visit(templatesPage.url);
+		templatesPage.getters.templatesLoadingContainer().should('not.exist');
+		templatesPage.getters.categoryFilter('sales').should('exist');
+		let initialTemplateCount = 0;
+		let initialCollectionCount = 0;
+
+		templatesPage.getters.templateCountLabel().then(($el) => {
+			initialTemplateCount = parseInt($el.text().replace(/\D/g, ''), 10);
+			templatesPage.getters.collectionCountLabel().then(($el) => {
+				initialCollectionCount = parseInt($el.text().replace(/\D/g, ''), 10);
+
+				templatesPage.getters.categoryFilter('sales').click();
+				templatesPage.getters.templatesLoadingContainer().should('not.exist');
+
+				// Should have less templates and collections after selecting a category
+				templatesPage.getters.templateCountLabel().should(($el) => {
+					expect(parseInt($el.text().replace(/\D/g, ''), 10)).to.be.lessThan(initialTemplateCount);
+				});
+				templatesPage.getters.collectionCountLabel().should(($el) => {
+					expect(parseInt($el.text().replace(/\D/g, ''), 10)).to.be.lessThan(initialCollectionCount);
+				});
+			});
+		});
+	});
+
+	it('should preserve search query in URL', () => {
+		cy.visit(templatesPage.url);
+		templatesPage.getters.templatesLoadingContainer().should('not.exist');
+		templatesPage.getters.categoryFilter('sales').should('exist');
+		templatesPage.getters.categoryFilter('sales').click();
+		templatesPage.getters.searchInput().type('auto');
+
+		cy.url().should('include', '?categories=');
+		cy.url().should('include', '&search=');
+
+		cy.reload();
+
+		// Should preserve search query in URL
+		cy.url().should('include', '?categories=');
+		cy.url().should('include', '&search=');
+
+		// Sales category should still be selected
+		templatesPage.getters.categoryFilter('sales').find('label').should('have.class', 'is-checked');
+		// Search input should still have the search query
+		templatesPage.getters.searchInput().should('have.value', 'auto');
+		// Sales checkbox should be pushed to the top
+		templatesPage.getters.categoryFilters().eq(1).then(($el) => {
+			expect($el.text()).to.equal('Sales');
+		});
+	});
+});
diff --git a/cypress/e2e/39-import-workflow.cy.ts b/cypress/e2e/39-import-workflow.cy.ts
new file mode 100644
index 0000000000000..831228fba35d9
--- /dev/null
+++ b/cypress/e2e/39-import-workflow.cy.ts
@@ -0,0 +1,74 @@
+import { WorkflowPage } from '../pages';
+import { MessageBox as MessageBoxClass } from '../pages/modals/message-box';
+
+const workflowPage = new WorkflowPage();
+const messageBox = new MessageBoxClass();
+
+before(() => {
+	cy.fixture('Onboarding_workflow.json').then((data) => {
+		cy.intercept('GET', '/rest/workflows/from-url*', {
+			body: { data },
+		}).as('downloadWorkflowFromURL');
+	});
+});
+
+describe('Import workflow', () => {
+	describe('From URL', () => {
+		it('should import workflow', () => {
+			workflowPage.actions.visit(true);
+			workflowPage.getters.workflowMenu().click();
+			workflowPage.getters.workflowMenuItemImportFromURLItem().click();
+
+			messageBox.getters.modal().should('be.visible');
+
+			messageBox.getters.content().type('https://fakepage.com/workflow.json');
+
+			messageBox.getters.confirm().click();
+
+			workflowPage.actions.zoomToFit();
+
+			workflowPage.getters.canvasNodes().should('have.length', 4);
+
+			workflowPage.getters.errorToast().should('not.exist');
+
+			workflowPage.getters.successToast().should('not.exist');
+		});
+
+		it('clicking outside modal should not show error toast', () => {
+			workflowPage.actions.visit(true);
+
+			workflowPage.getters.workflowMenu().click();
+			workflowPage.getters.workflowMenuItemImportFromURLItem().click();
+
+			cy.get('body').click(0, 0);
+
+			workflowPage.getters.errorToast().should('not.exist');
+		});
+
+		it('canceling modal should not show error toast', () => {
+			workflowPage.actions.visit(true);
+
+			workflowPage.getters.workflowMenu().click();
+			workflowPage.getters.workflowMenuItemImportFromURLItem().click();
+			messageBox.getters.cancel().click();
+
+			workflowPage.getters.errorToast().should('not.exist');
+		});
+	});
+
+	describe('From File', () => {
+		it('should import workflow', () => {
+			workflowPage.actions.visit(true);
+
+			workflowPage.getters.workflowMenu().click();
+			workflowPage.getters.workflowMenuItemImportFromFile().click();
+			workflowPage.getters
+				.workflowImportInput()
+				.selectFile('cypress/fixtures/Test_workflow-actions_paste-data.json', { force: true });
+			cy.waitForLoad(false);
+			workflowPage.actions.zoomToFit();
+			workflowPage.getters.canvasNodes().should('have.length', 5);
+			workflowPage.getters.nodeConnections().should('have.length', 5);
+		});
+	});
+});
diff --git a/cypress/e2e/4-node-creator.cy.ts b/cypress/e2e/4-node-creator.cy.ts
index 0057afd93c839..6955c95463550 100644
--- a/cypress/e2e/4-node-creator.cy.ts
+++ b/cypress/e2e/4-node-creator.cy.ts
@@ -1,18 +1,14 @@
 import { NodeCreator } from '../pages/features/node-creator';
 import { WorkflowPage as WorkflowPageClass } from '../pages/workflow';
 import { NDV } from '../pages/ndv';
+import { getVisibleSelect } from '../utils';
+import { IF_NODE_NAME } from '../constants';
 
 const nodeCreatorFeature = new NodeCreator();
 const WorkflowPage = new WorkflowPageClass();
 const NDVModal = new NDV();
 
-
 describe('Node Creator', () => {
-	before(() => {
-		cy.resetAll();
-		cy.skipSetup();
-	});
-
 	beforeEach(() => {
 		WorkflowPage.actions.visit();
 	});
@@ -20,7 +16,10 @@ describe('Node Creator', () => {
 	it('should open node creator on trigger tab if no trigger is on canvas', () => {
 		nodeCreatorFeature.getters.canvasAddButton().click();
 
-		nodeCreatorFeature.getters.nodeCreator().contains('Select a trigger').should('be.visible');
+		nodeCreatorFeature.getters
+			.nodeCreator()
+			.contains('What triggers this workflow?')
+			.should('be.visible');
 	});
 
 	it('should navigate subcategory', () => {
@@ -36,7 +35,7 @@ describe('Node Creator', () => {
 		nodeCreatorFeature.actions.openNodeCreator();
 
 		nodeCreatorFeature.getters.searchBar().find('input').type('manual');
-		nodeCreatorFeature.getters.creatorItem().should('have.length', 1);
+		nodeCreatorFeature.getters.creatorItem().should('have.length', 2);
 		nodeCreatorFeature.getters.searchBar().find('input').clear().type('manual123');
 		nodeCreatorFeature.getters.creatorItem().should('have.length', 0);
 		nodeCreatorFeature.getters
@@ -58,8 +57,8 @@ describe('Node Creator', () => {
 		nodeCreatorFeature.getters.getCreatorItem('On app event').click();
 
 		nodeCreatorFeature.getters.searchBar().find('input').clear().type('edit image');
-		nodeCreatorFeature.getters.getCreatorItem('Results in other categories (1)').should('exist');
-		nodeCreatorFeature.getters.creatorItem().should('have.length', 2);
+		nodeCreatorFeature.getters.getCategoryItem('Results in other categories').should('exist');
+		nodeCreatorFeature.getters.creatorItem().should('have.length', 1);
 		nodeCreatorFeature.getters.getCreatorItem('Edit Image').should('exist');
 		nodeCreatorFeature.getters.searchBar().find('input').clear().type('edit image123123');
 		nodeCreatorFeature.getters.creatorItem().should('have.length', 0);
@@ -78,7 +77,10 @@ describe('Node Creator', () => {
 		nodeCreatorFeature.getters.nodeCreator().contains('What happens next?').should('be.visible');
 
 		nodeCreatorFeature.getters.getCreatorItem('Add another trigger').click();
-		nodeCreatorFeature.getters.nodeCreator().contains('Select a trigger').should('be.visible');
+		nodeCreatorFeature.getters
+			.nodeCreator()
+			.contains('What triggers this workflow?')
+			.should('be.visible');
 		nodeCreatorFeature.getters.activeSubcategory().find('button').should('exist');
 		nodeCreatorFeature.getters.activeSubcategory().find('button').click();
 		nodeCreatorFeature.getters.nodeCreator().contains('What happens next?').should('be.visible');
@@ -91,7 +93,7 @@ describe('Node Creator', () => {
 		nodeCreatorFeature.getters.getCreatorItem(editImageNode).click();
 		nodeCreatorFeature.getters.activeSubcategory().should('have.text', editImageNode);
 		nodeCreatorFeature.getters.getCreatorItem('Crop Image').click();
-		NDVModal.getters.parameterInput('operation').should('contain.text', 'Crop');
+		NDVModal.getters.parameterInput('operation').find('input').should('have.value', 'Crop');
 	});
 
 	it('should search through actions and confirm added action', () => {
@@ -100,15 +102,15 @@ describe('Node Creator', () => {
 		nodeCreatorFeature.getters.searchBar().find('input').type('{rightarrow}');
 		nodeCreatorFeature.getters.activeSubcategory().should('have.text', 'FTP');
 		nodeCreatorFeature.getters.searchBar().find('input').clear().type('file');
-		// Navigate to rename action which should be the 4th item
-		nodeCreatorFeature.getters.searchBar().find('input').type('{downarrow} {downarrow} {downarrow} {rightarrow}');
-		NDVModal.getters.parameterInput('operation').should('contain.text', 'Rename');
-	})
+		// The 1st trigger is selected, up 1x to the collapsable header, up 2x to the last action (rename)
+		nodeCreatorFeature.getters.searchBar().find('input').type('{uparrow}{uparrow}{rightarrow}');
+		NDVModal.getters.parameterInput('operation').find('input').should('have.value', 'Rename');
+	});
 
 	it('should not show actions for single action nodes', () => {
 		const singleActionNodes = [
 			'DHL',
-			'iCalendar',
+			'Edit Fields',
 			'LingvaNex',
 			'Mailcheck',
 			'MSG91',
@@ -116,19 +118,157 @@ describe('Node Creator', () => {
 			'Spontit',
 			'Vonage',
 			'Send Email',
-			'Toggl Trigger'
-		]
-		const doubleActionNode = 'OpenWeatherMap'
+			'Toggl Trigger',
+		];
+		const doubleActionNode = 'OpenWeatherMap';
 
 		nodeCreatorFeature.actions.openNodeCreator();
 		singleActionNodes.forEach((node) => {
 			nodeCreatorFeature.getters.searchBar().find('input').clear().type(node);
-			nodeCreatorFeature.getters.getCreatorItem(node).find('button[class*="panelIcon"]').should('not.exist');
-		})
+			nodeCreatorFeature.getters
+				.getCreatorItem(node)
+				.find('button[class*="panelIcon"]')
+				.should('not.exist');
+		});
 		nodeCreatorFeature.getters.searchBar().find('input').clear().type(doubleActionNode);
 		nodeCreatorFeature.getters.getCreatorItem(doubleActionNode).click();
-		nodeCreatorFeature.getters.creatorItem().should('have.length', 2);
-	})
+		nodeCreatorFeature.getters.creatorItem().should('have.length', 4);
+	});
+
+	it('should have "Actions" section collapsed when opening actions view from Trigger root view', () => {
+		nodeCreatorFeature.actions.openNodeCreator();
+		nodeCreatorFeature.getters.searchBar().find('input').clear().type('ActiveCampaign');
+		nodeCreatorFeature.getters.getCreatorItem('ActiveCampaign').click();
+		nodeCreatorFeature.getters.getCategoryItem('Actions').should('exist');
+		nodeCreatorFeature.getters.getCategoryItem('Triggers').should('exist');
+
+		nodeCreatorFeature.getters
+			.getCategoryItem('Triggers')
+			.parent()
+			.should('have.attr', 'data-category-collapsed', 'false');
+		nodeCreatorFeature.getters
+			.getCategoryItem('Actions')
+			.parent()
+			.should('have.attr', 'data-category-collapsed', 'true');
+		nodeCreatorFeature.getters.getCategoryItem('Actions').click();
+		nodeCreatorFeature.getters
+			.getCategoryItem('Actions')
+			.parent()
+			.should('have.attr', 'data-category-collapsed', 'false');
+	});
+
+	it('should have "Triggers" section collapsed when opening actions view from Regular root view', () => {
+		nodeCreatorFeature.actions.openNodeCreator();
+		nodeCreatorFeature.getters.getCreatorItem('Manually').click();
+
+		nodeCreatorFeature.actions.openNodeCreator();
+		nodeCreatorFeature.getters.searchBar().find('input').clear().type('n8n');
+		nodeCreatorFeature.getters.getCreatorItem('n8n').click();
+
+		nodeCreatorFeature.getters
+			.getCategoryItem('Actions')
+			.parent()
+			.should('have.attr', 'data-category-collapsed', 'false');
+		nodeCreatorFeature.getters.getCategoryItem('Actions').click();
+		nodeCreatorFeature.getters
+			.getCategoryItem('Actions')
+			.parent()
+			.should('have.attr', 'data-category-collapsed', 'true');
+		nodeCreatorFeature.getters
+			.getCategoryItem('Triggers')
+			.parent()
+			.should('have.attr', 'data-category-collapsed', 'true');
+		nodeCreatorFeature.getters.getCategoryItem('Triggers').click();
+		nodeCreatorFeature.getters
+			.getCategoryItem('Triggers')
+			.parent()
+			.should('have.attr', 'data-category-collapsed', 'false');
+	});
+
+	it('should show callout and two suggested nodes if node has no trigger actions', () => {
+		nodeCreatorFeature.actions.openNodeCreator();
+		nodeCreatorFeature.getters
+			.searchBar()
+			.find('input')
+			.clear()
+			.type('Customer Datastore (n8n training)');
+		nodeCreatorFeature.getters.getCreatorItem('Customer Datastore (n8n training)').click();
+
+		cy.getByTestId('actions-panel-no-triggers-callout').should('be.visible');
+		nodeCreatorFeature.getters.getCreatorItem('On a Schedule').should('be.visible');
+		nodeCreatorFeature.getters.getCreatorItem('On a Webhook call').should('be.visible');
+	});
+
+	it('should show intro callout if user has not made a production execution', () => {
+		nodeCreatorFeature.actions.openNodeCreator();
+		nodeCreatorFeature.getters
+			.searchBar()
+			.find('input')
+			.clear()
+			.type('Customer Datastore (n8n training)');
+		nodeCreatorFeature.getters.getCreatorItem('Customer Datastore (n8n training)').click();
+
+		cy.getByTestId('actions-panel-activation-callout').should('be.visible');
+		nodeCreatorFeature.getters.activeSubcategory().find('button').click();
+		nodeCreatorFeature.getters.searchBar().find('input').clear();
+
+		nodeCreatorFeature.getters.getCreatorItem('On a schedule').click();
+
+		// Setup 1s interval execution
+		cy.getByTestId('parameter-input-field').click();
+		getVisibleSelect().find('.option-headline').contains('Seconds').click();
+		cy.getByTestId('parameter-input-secondsInterval').clear().type('1');
+
+		NDVModal.actions.close();
+
+		nodeCreatorFeature.actions.openNodeCreator();
+		nodeCreatorFeature.getters
+			.searchBar()
+			.find('input')
+			.clear()
+			.type('Customer Datastore (n8n training)');
+		nodeCreatorFeature.getters.getCreatorItem('Customer Datastore (n8n training)').click();
+		nodeCreatorFeature.getters.getCreatorItem('Get All People').click();
+		NDVModal.actions.close();
+
+		WorkflowPage.actions.saveWorkflowOnButtonClick();
+		WorkflowPage.actions.activateWorkflow();
+		WorkflowPage.getters.activatorSwitch().should('have.class', 'is-checked');
+
+		// Wait for schedule 1s execution to mark user as having made a production execution
+		cy.wait(1500);
+		cy.reload();
+
+		// Action callout should not be visible after user has made a production execution
+		nodeCreatorFeature.actions.openNodeCreator();
+		nodeCreatorFeature.getters
+			.searchBar()
+			.find('input')
+			.clear()
+			.type('Customer Datastore (n8n training)');
+		nodeCreatorFeature.getters.getCreatorItem('Customer Datastore (n8n training)').click();
+
+		cy.getByTestId('actions-panel-activation-callout').should('not.exist');
+	});
+
+	it('should show Trigger and Actions sections during search', () => {
+		nodeCreatorFeature.actions.openNodeCreator();
+
+		nodeCreatorFeature.getters
+			.searchBar()
+			.find('input')
+			.clear()
+			.type('Customer Datastore (n8n training)');
+		nodeCreatorFeature.getters.getCreatorItem('Customer Datastore (n8n training)').click();
+
+		nodeCreatorFeature.getters.searchBar().find('input').clear().type('Non existent action name');
+
+		nodeCreatorFeature.getters.getCategoryItem('Triggers').should('be.visible');
+		nodeCreatorFeature.getters.getCategoryItem('Actions').should('be.visible');
+		cy.getByTestId('actions-panel-no-triggers-callout').should('be.visible');
+		nodeCreatorFeature.getters.getCreatorItem('On a Schedule').should('be.visible');
+		nodeCreatorFeature.getters.getCreatorItem('On a Webhook call').should('be.visible');
+	});
 
 	describe('should correctly append manual trigger for regular actions', () => {
 		// For these sources, manual node should be added
@@ -136,7 +276,8 @@ describe('Node Creator', () => {
 			{
 				name: 'canvas add button',
 				handler: () => nodeCreatorFeature.getters.canvasAddButton().click(),
-			}, {
+			},
+			{
 				name: 'plus button',
 				handler: () => nodeCreatorFeature.getters.plusButton().click(),
 			},
@@ -146,34 +287,221 @@ describe('Node Creator', () => {
 			// 	name: 'tab key',
 			// 	handler: () => cy.realPress('Tab'),
 			// },
-		]
+		];
 		sourcesWithAppend.forEach((source) => {
 			it(`should append manual trigger when source is ${source.name}`, () => {
-				source.handler()
+				source.handler();
 				nodeCreatorFeature.getters.searchBar().find('input').clear().type('n8n');
 				nodeCreatorFeature.getters.getCreatorItem('n8n').click();
+				nodeCreatorFeature.getters.getCategoryItem('Actions').click();
 				nodeCreatorFeature.getters.getCreatorItem('Create a credential').click();
 				NDVModal.actions.close();
 				WorkflowPage.getters.canvasNodes().should('have.length', 2);
 			});
 		});
 
+		// @TODO FIX ADDING 2 NODES IN ONE GO
 		it('should not append manual trigger when source is canvas related', () => {
 			nodeCreatorFeature.getters.canvasAddButton().click();
 			nodeCreatorFeature.getters.searchBar().find('input').clear().type('n8n');
 			nodeCreatorFeature.getters.getCreatorItem('n8n').click();
+			nodeCreatorFeature.getters.getCategoryItem('Actions').click();
 			nodeCreatorFeature.getters.getCreatorItem('Create a credential').click();
 			NDVModal.actions.close();
-			WorkflowPage.actions.deleteNode('When clicking "Execute Workflow"')
-			WorkflowPage.getters.canvasNodePlusEndpointByName('n8n').click()
+			WorkflowPage.actions.deleteNode('When clicking "Test workflow"');
+			WorkflowPage.getters.canvasNodePlusEndpointByName('n8n').click();
 			nodeCreatorFeature.getters.searchBar().find('input').clear().type('n8n');
 			nodeCreatorFeature.getters.getCreatorItem('n8n').click();
+			nodeCreatorFeature.getters.getCategoryItem('Actions').click();
 			nodeCreatorFeature.getters.getCreatorItem('Create a credential').click();
 			NDVModal.actions.close();
 			WorkflowPage.getters.canvasNodes().should('have.length', 2);
 			WorkflowPage.actions.zoomToFit();
-			WorkflowPage.actions.addNodeBetweenNodes('n8n', 'n8n1', 'Item Lists')
+			WorkflowPage.actions.addNodeBetweenNodes('n8n', 'n8n1', 'Summarize');
 			WorkflowPage.getters.canvasNodes().should('have.length', 3);
-		})
+		});
+	});
+
+	it('should correctly append a No Op node when Loop Over Items node is added (from add button)', () => {
+		nodeCreatorFeature.actions.openNodeCreator();
+
+		nodeCreatorFeature.getters.searchBar().find('input').type('Loop Over Items');
+		nodeCreatorFeature.getters.getCreatorItem('Loop Over Items').click();
+		NDVModal.actions.close();
+
+		WorkflowPage.getters.canvasNodes().should('have.length', 3);
+		WorkflowPage.getters.nodeConnections().should('have.length', 3);
+
+		WorkflowPage.getters.getConnectionBetweenNodes('Loop Over Items', 'Replace Me').should('exist');
+		WorkflowPage.getters.getConnectionBetweenNodes('Replace Me', 'Loop Over Items').should('exist');
+	});
+
+	it('should correctly append a No Op node when Loop Over Items node is added (from connection)', () => {
+		WorkflowPage.actions.addNodeToCanvas('Manual');
+		cy.get('.plus-endpoint').should('be.visible').click();
+
+		nodeCreatorFeature.getters.searchBar().find('input').type('Loop Over Items');
+		nodeCreatorFeature.getters.getCreatorItem('Loop Over Items').click();
+		NDVModal.actions.close();
+
+		WorkflowPage.getters.canvasNodes().should('have.length', 3);
+		WorkflowPage.getters.nodeConnections().should('have.length', 3);
+
+		WorkflowPage.getters.getConnectionBetweenNodes('Loop Over Items', 'Replace Me').should('exist');
+		WorkflowPage.getters.getConnectionBetweenNodes('Replace Me', 'Loop Over Items').should('exist');
+	});
+
+	it('should have most relevenat nodes on top when searching', () => {
+		nodeCreatorFeature.getters.canvasAddButton().click();
+
+		nodeCreatorFeature.getters.searchBar().find('input').clear().type('email');
+		nodeCreatorFeature.getters.nodeItemName().first().should('have.text', 'Email Trigger (IMAP)');
+
+		nodeCreatorFeature.getters.searchBar().find('input').clear().type('Set');
+		nodeCreatorFeature.getters.nodeItemName().first().should('have.text', 'Edit Fields (Set)');
+
+		nodeCreatorFeature.getters.searchBar().find('input').clear().type('i');
+		nodeCreatorFeature.getters.nodeItemName().first().should('have.text', IF_NODE_NAME);
+		nodeCreatorFeature.getters.nodeItemName().eq(1).should('have.text', 'Switch');
+
+		nodeCreatorFeature.getters.searchBar().find('input').clear().type('sw');
+		nodeCreatorFeature.getters.searchBar().find('input').clear().type('Edit F');
+		nodeCreatorFeature.getters.nodeItemName().first().should('have.text', 'Edit Fields (Set)');
+
+		nodeCreatorFeature.getters.searchBar().find('input').clear().type('i');
+		nodeCreatorFeature.getters.nodeItemName().first().should('have.text', IF_NODE_NAME);
+		nodeCreatorFeature.getters.nodeItemName().eq(1).should('have.text', 'Switch');
+
+		nodeCreatorFeature.getters.searchBar().find('input').clear().type('IF');
+		nodeCreatorFeature.getters.nodeItemName().first().should('have.text', IF_NODE_NAME);
+		nodeCreatorFeature.getters.nodeItemName().eq(1).should('have.text', 'Switch');
+
+		nodeCreatorFeature.getters.searchBar().find('input').clear().type('sw');
+		nodeCreatorFeature.getters.nodeItemName().first().should('have.text', 'Switch');
+
+		nodeCreatorFeature.getters.searchBar().find('input').clear().type('swit');
+		nodeCreatorFeature.getters.nodeItemName().first().should('have.text', 'Switch');
+
+		nodeCreatorFeature.getters.searchBar().find('input').clear().type('red');
+		nodeCreatorFeature.getters.nodeItemName().first().should('have.text', 'Redis');
+		nodeCreatorFeature.getters.nodeItemName().eq(1).should('have.text', 'Reddit');
+
+		nodeCreatorFeature.getters.searchBar().find('input').clear().type('redd');
+		nodeCreatorFeature.getters.nodeItemName().first().should('have.text', 'Reddit');
+
+		nodeCreatorFeature.getters.searchBar().find('input').clear().type('wh');
+		nodeCreatorFeature.getters.nodeItemName().first().should('have.text', 'Webhook');
+
+		nodeCreatorFeature.getters.searchBar().find('input').clear().type('web');
+		nodeCreatorFeature.getters.nodeItemName().first().should('have.text', 'Webflow');
+		nodeCreatorFeature.getters.nodeItemName().eq(1).should('have.text', 'Webhook');
+
+		nodeCreatorFeature.getters.searchBar().find('input').clear().type('webh');
+		nodeCreatorFeature.getters.nodeItemName().first().should('have.text', 'Webhook');
+
+		nodeCreatorFeature.getters.searchBar().find('input').clear().type('func');
+		nodeCreatorFeature.getters.nodeItemName().first().should('have.text', 'Code');
+
+		nodeCreatorFeature.getters.searchBar().find('input').clear().type('cod');
+		nodeCreatorFeature.getters.nodeItemName().first().should('have.text', 'Coda');
+		nodeCreatorFeature.getters.nodeItemName().eq(1).should('have.text', 'Code');
+
+		nodeCreatorFeature.getters.searchBar().find('input').clear().type('code');
+		nodeCreatorFeature.getters.nodeItemName().first().should('have.text', 'Code');
+
+		nodeCreatorFeature.getters.searchBar().find('input').clear().type('js');
+		nodeCreatorFeature.getters.nodeItemName().first().should('have.text', 'Code');
+		nodeCreatorFeature.getters.nodeItemName().eq(1).should('have.text', 'Edit Fields (Set)');
+
+		nodeCreatorFeature.getters.searchBar().find('input').clear().type('fi');
+		nodeCreatorFeature.getters.nodeItemName().first().should('have.text', 'Filter');
+
+		nodeCreatorFeature.getters.searchBar().find('input').clear().type('filt');
+		nodeCreatorFeature.getters.nodeItemName().first().should('have.text', 'Filter');
+
+		nodeCreatorFeature.getters.searchBar().find('input').clear().type('manu');
+		nodeCreatorFeature.getters.nodeItemName().first().should('have.text', 'Manual Trigger');
+
+		nodeCreatorFeature.getters.searchBar().find('input').clear().type('sse');
+		nodeCreatorFeature.getters.nodeItemName().first().should('have.text', 'SSE Trigger');
+
+		nodeCreatorFeature.getters.searchBar().find('input').clear().type('cmpar');
+		nodeCreatorFeature.getters.nodeItemName().first().should('have.text', 'Compare Datasets');
+
+		nodeCreatorFeature.getters.searchBar().find('input').clear().type('fb');
+		nodeCreatorFeature.getters.nodeItemName().first().should('have.text', 'Facebook Trigger');
+
+		nodeCreatorFeature.getters.searchBar().find('input').clear().type('crn');
+		nodeCreatorFeature.getters.nodeItemName().first().should('have.text', 'Schedule Trigger');
+
+		nodeCreatorFeature.getters.searchBar().find('input').clear().type('cron');
+		nodeCreatorFeature.getters.nodeItemName().first().should('have.text', 'Schedule Trigger');
+
+		nodeCreatorFeature.getters.searchBar().find('input').clear().type('sch');
+		nodeCreatorFeature.getters.nodeItemName().first().should('have.text', 'Schedule Trigger');
+
+		nodeCreatorFeature.getters.searchBar().find('input').clear().type('time');
+		nodeCreatorFeature.getters.nodeItemName().eq(1).should('have.text', 'Schedule Trigger');
+		nodeCreatorFeature.getters.nodeItemName().eq(2).should('have.text', 'Wait');
+
+		nodeCreatorFeature.getters.searchBar().find('input').clear().type('mail');
+		nodeCreatorFeature.getters.nodeItemName().first().should('have.text', 'Mailgun');
+
+		nodeCreatorFeature.getters.searchBar().find('input').clear().type('mailc');
+		nodeCreatorFeature.getters.nodeItemName().first().should('have.text', 'Mailcheck');
+		nodeCreatorFeature.getters.nodeItemName().eq(1).should('have.text', 'Mailchimp');
+
+		nodeCreatorFeature.getters.searchBar().find('input').clear().type('api');
+		nodeCreatorFeature.getters.nodeItemName().first().should('have.text', 'HTTP Request');
+
+		nodeCreatorFeature.getters.searchBar().find('input').clear().type('s3');
+		nodeCreatorFeature.getters.nodeItemName().first().should('have.text', 'S3');
+
+		nodeCreatorFeature.getters.searchBar().find('input').clear().type('no op');
+		nodeCreatorFeature.getters
+			.nodeItemName()
+			.first()
+			.should('have.text', 'No Operation, do nothing');
+
+		nodeCreatorFeature.getters.searchBar().find('input').clear().type('do no');
+		nodeCreatorFeature.getters
+			.nodeItemName()
+			.first()
+			.should('have.text', 'No Operation, do nothing');
+
+		nodeCreatorFeature.getters.searchBar().find('input').clear().type('htt');
+		nodeCreatorFeature.getters.nodeItemName().first().should('have.text', 'HTTP Request');
+		nodeCreatorFeature.getters.nodeItemName().eq(1).should('have.text', 'Webhook');
+
+		nodeCreatorFeature.getters.searchBar().find('input').clear().type('http');
+		nodeCreatorFeature.getters.nodeItemName().first().should('have.text', 'HTTP Request');
+		nodeCreatorFeature.getters.nodeItemName().eq(1).should('have.text', 'Webhook');
+
+		nodeCreatorFeature.getters.searchBar().find('input').clear().type('wa');
+		nodeCreatorFeature.getters.nodeItemName().first().should('have.text', 'Wait');
+
+		nodeCreatorFeature.getters.searchBar().find('input').clear().type('wait');
+		nodeCreatorFeature.getters.nodeItemName().first().should('have.text', 'Wait');
+
+		nodeCreatorFeature.getters.searchBar().find('input').clear().type('spreadsheet');
+		nodeCreatorFeature.getters.nodeItemName().first().should('have.text', 'Convert to File');
+		nodeCreatorFeature.getters.nodeItemName().eq(1).should('have.text', 'Extract from File');
+		nodeCreatorFeature.getters.nodeItemName().eq(2).should('have.text', 'Google Sheets');
+
+		nodeCreatorFeature.getters.searchBar().find('input').clear().type('sheets');
+		nodeCreatorFeature.getters.nodeItemName().first().should('have.text', 'Google Sheets');
+
+		nodeCreatorFeature.getters.searchBar().find('input').clear().type('ggle she');
+		nodeCreatorFeature.getters.nodeItemName().first().should('have.text', 'Google Sheets');
+
+		nodeCreatorFeature.getters.searchBar().find('input').clear().type('hub');
+		nodeCreatorFeature.getters.nodeItemName().first().should('have.text', 'HubSpot');
+
+		nodeCreatorFeature.getters.searchBar().find('input').clear().type('git');
+		nodeCreatorFeature.getters.nodeItemName().first().should('have.text', 'Git');
+		nodeCreatorFeature.getters.nodeItemName().eq(1).should('have.text', 'GitHub');
+
+		nodeCreatorFeature.getters.searchBar().find('input').clear().type('gith');
+		nodeCreatorFeature.getters.nodeItemName().first().should('have.text', 'GitHub');
 	});
 });
diff --git a/cypress/e2e/40-manual-partial-execution.cy.ts b/cypress/e2e/40-manual-partial-execution.cy.ts
new file mode 100644
index 0000000000000..5fe31b56ad137
--- /dev/null
+++ b/cypress/e2e/40-manual-partial-execution.cy.ts
@@ -0,0 +1,28 @@
+import { NDV, WorkflowPage } from '../pages';
+
+const canvas = new WorkflowPage();
+const ndv = new NDV();
+
+describe('Manual partial execution', () => {
+	it('should execute parent nodes with no run data only once', () => {
+		canvas.actions.visit();
+
+		cy.fixture('manual-partial-execution.json').then((data) => {
+			cy.get('body').paste(JSON.stringify(data));
+		});
+
+		canvas.actions.zoomToFit();
+
+		canvas.actions.openNode('Edit Fields');
+
+		cy.get('button').contains('Test step').click(); // create run data
+		cy.get('button').contains('Test step').click(); // use run data
+
+		ndv.actions.close();
+
+		canvas.actions.openNode('Webhook1');
+
+		ndv.getters.nodeRunSuccessIndicator().should('exist');
+		ndv.getters.outputRunSelector().should('not.exist'); // single run
+	});
+});
diff --git a/cypress/e2e/5-ndv.cy.ts b/cypress/e2e/5-ndv.cy.ts
index 749fb4434e506..6103dbbc039f6 100644
--- a/cypress/e2e/5-ndv.cy.ts
+++ b/cypress/e2e/5-ndv.cy.ts
@@ -1,15 +1,15 @@
-import { WorkflowPage, NDV } from '../pages';
 import { v4 as uuid } from 'uuid';
+import { getVisibleSelect } from '../utils';
+import { MANUAL_TRIGGER_NODE_DISPLAY_NAME } from '../constants';
+import { NDV, WorkflowPage } from '../pages';
+import { NodeCreator } from '../pages/features/node-creator';
+import { clickCreateNewCredential } from '../composables/ndv';
+import { setCredentialValues } from '../composables/modals/credential-modal';
 
 const workflowPage = new WorkflowPage();
 const ndv = new NDV();
 
 describe('NDV', () => {
-	before(() => {
-		cy.resetAll();
-		cy.skipSetup();
-
-	});
 	beforeEach(() => {
 		workflowPage.actions.visit();
 		workflowPage.actions.renameWorkflow(uuid());
@@ -45,14 +45,37 @@ describe('NDV', () => {
 		ndv.getters.outputDisplayMode().should('have.length.at.least', 1).and('be.visible');
 	});
 
-	it('should change input', () => {
+	it('should change input and go back to canvas', () => {
 		cy.createFixtureWorkflow('NDV-test-select-input.json', `NDV test select input ${uuid()}`);
 		workflowPage.actions.zoomToFit();
 		workflowPage.getters.canvasNodes().last().dblclick();
 		ndv.getters.inputSelect().click();
 		ndv.getters.inputOption().last().click();
-		ndv.getters.inputDataContainer().find('[class*=schema_]').should('exist')
+		ndv.getters.inputDataContainer().find('[class*=schema_]').should('exist');
 		ndv.getters.inputDataContainer().should('contain', 'start');
+		ndv.getters.backToCanvas().click();
+		ndv.getters.container().should('not.be.visible');
+		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('1 item').should('exist');
+		cy.contains('span', 'zero').should('exist');
 	});
 
 	it('should show correct validation state for resource locator params', () => {
@@ -69,15 +92,15 @@ describe('NDV', () => {
 
 	it('should show validation errors only after blur or re-opening of NDV', () => {
 		workflowPage.actions.addNodeToCanvas('Manual');
-		workflowPage.actions.addNodeToCanvas('Airtable', true, true, 'Read data from a table');
+		workflowPage.actions.addNodeToCanvas('Airtable', true, true, 'Search records');
 		ndv.getters.container().should('be.visible');
 		cy.get('.has-issues').should('have.length', 0);
 		ndv.getters.parameterInput('table').find('input').eq(1).focus().blur();
-		ndv.getters.parameterInput('application').find('input').eq(1).focus().blur();
+		ndv.getters.parameterInput('base').find('input').eq(1).focus().blur();
 		cy.get('.has-issues').should('have.length', 2);
 		ndv.getters.backToCanvas().click();
 		workflowPage.actions.openNode('Airtable');
-		cy.get('.has-issues').should('have.length', 3);
+		cy.get('.has-issues').should('have.length', 2);
 		cy.get('[class*=hasIssues]').should('have.length', 1);
 	});
 
@@ -97,10 +120,20 @@ describe('NDV', () => {
 		ndv.getters.container().should('be.visible');
 		workflowPage.actions.saveWorkflowUsingKeyboardShortcut();
 		workflowPage.getters.isWorkflowSaved();
-	})
+	});
 
 	describe('test output schema view', () => {
-		const schemaKeys = ['id', 'name', 'email', 'notes', 'country', 'created', 'objectValue', 'prop1', 'prop2'];
+		const schemaKeys = [
+			'id',
+			'name',
+			'email',
+			'notes',
+			'country',
+			'created',
+			'objectValue',
+			'prop1',
+			'prop2',
+		];
 		function setupSchemaWorkflow() {
 			cy.createFixtureWorkflow('Test_workflow_schema_test.json', `NDV test schema view ${uuid()}`);
 			workflowPage.actions.zoomToFit();
@@ -109,60 +142,87 @@ describe('NDV', () => {
 		}
 
 		it('should switch to output schema view and validate it', () => {
-			setupSchemaWorkflow()
+			setupSchemaWorkflow();
 			ndv.getters.outputDisplayMode().children().should('have.length', 3);
 			ndv.getters.outputDisplayMode().find('[class*=active]').should('contain', 'Table');
-			ndv.getters.outputDisplayMode().contains('Schema').click();
+			ndv.actions.switchOutputMode('Schema');
 			ndv.getters.outputDisplayMode().find('[class*=active]').should('contain', 'Schema');
 
 			schemaKeys.forEach((key) => {
-				ndv.getters.outputPanel().find('[data-test-id=run-data-schema-item]').contains(key).should('exist');
+				ndv.getters
+					.outputPanel()
+					.find('[data-test-id=run-data-schema-item]')
+					.contains(key)
+					.should('exist');
 			});
 		});
 		it('should preserve schema view after execution', () => {
-			setupSchemaWorkflow()
-			ndv.getters.outputDisplayMode().contains('Schema').click();
+			setupSchemaWorkflow();
+			ndv.actions.switchOutputMode('Schema');
 			ndv.actions.execute();
 			ndv.getters.outputDisplayMode().find('[class*=active]').should('contain', 'Schema');
-		})
+		});
 		it('should collapse and expand nested schema object', () => {
-			setupSchemaWorkflow()
-			const expandedObjectProps = ['prop1', 'prop2'];;
-			const getObjectValueItem = () => ndv.getters.outputPanel().find('[data-test-id=run-data-schema-item]').filter(':contains("objectValue")');
-			ndv.getters.outputDisplayMode().contains('Schema').click();
+			setupSchemaWorkflow();
+			const expandedObjectProps = ['prop1', 'prop2'];
+			const getObjectValueItem = () =>
+				ndv.getters
+					.outputPanel()
+					.find('[data-test-id=run-data-schema-item]')
+					.filter(':contains("objectValue")');
+			ndv.actions.switchOutputMode('Schema');
 
 			expandedObjectProps.forEach((key) => {
-				ndv.getters.outputPanel().find('[data-test-id=run-data-schema-item]').contains(key).should('be.visible');
+				ndv.getters
+					.outputPanel()
+					.find('[data-test-id=run-data-schema-item]')
+					.contains(key)
+					.should('be.visible');
 			});
 			getObjectValueItem().find('label').click();
 			expandedObjectProps.forEach((key) => {
-				ndv.getters.outputPanel().find('[data-test-id=run-data-schema-item]').contains(key).should('not.be.visible');
+				ndv.getters
+					.outputPanel()
+					.find('[data-test-id=run-data-schema-item]')
+					.contains(key)
+					.should('not.be.visible');
 			});
-		})
+		});
 		it('should not display pagination for schema', () => {
-			setupSchemaWorkflow()
+			setupSchemaWorkflow();
 			ndv.getters.backToCanvas().click();
 			workflowPage.getters.canvasNodeByName('Set').click();
-			workflowPage.actions.addNodeToCanvas('Customer Datastore (n8n training)', true, true, 'Get All People');
+			workflowPage.actions.addNodeToCanvas(
+				'Customer Datastore (n8n training)',
+				true,
+				true,
+				'Get All People',
+			);
 			ndv.actions.execute();
 			ndv.getters.outputPanel().contains('25 items').should('exist');
 			ndv.getters.outputPanel().find('[class*=_pagination]').should('exist');
-			ndv.getters.outputDisplayMode().contains('Schema').click();
+			ndv.actions.switchOutputMode('Schema');
 			ndv.getters.outputPanel().find('[class*=_pagination]').should('not.exist');
-			ndv.getters.outputDisplayMode().contains('JSON').click();
+			ndv.actions.switchOutputMode('JSON');
 			ndv.getters.outputPanel().find('[class*=_pagination]').should('exist');
-		})
+		});
 		it('should display large schema', () => {
-			cy.createFixtureWorkflow('Test_workflow_schema_test_pinned_data.json', `NDV test schema view ${uuid()}`);
+			cy.createFixtureWorkflow(
+				'Test_workflow_schema_test_pinned_data.json',
+				`NDV test schema view ${uuid()}`,
+			);
 			workflowPage.actions.zoomToFit();
 			workflowPage.actions.openNode('Set');
 
 			ndv.getters.outputPanel().contains('20 items').should('exist');
 			ndv.getters.outputPanel().find('[class*=_pagination]').should('exist');
-			ndv.getters.outputDisplayMode().contains('Schema').click();
+			ndv.actions.switchOutputMode('Schema');
 			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);
-		})
+			ndv.getters
+				.outputPanel()
+				.find('[data-test-id=run-data-schema-item] [data-test-id=run-data-schema-item]')
+				.should('have.length', 20);
+		});
 	});
 
 	it('can link and unlink run selectors between input and output', () => {
@@ -171,11 +231,13 @@ describe('NDV', () => {
 		workflowPage.actions.executeWorkflow();
 		workflowPage.actions.openNode('Set3');
 
-		ndv.getters.inputRunSelector()
+		ndv.getters
+			.inputRunSelector()
 			.should('exist')
 			.find('input')
 			.should('include.value', '2 of 2 (6 items)');
-		ndv.getters.outputRunSelector()
+		ndv.getters
+			.outputRunSelector()
 			.should('exist')
 			.find('input')
 			.should('include.value', '2 of 2 (6 items)');
@@ -184,23 +246,20 @@ describe('NDV', () => {
 		ndv.actions.switchOutputMode('Table');
 
 		ndv.actions.changeOutputRunSelector('1 of 2 (6 items)');
-		ndv.getters.inputRunSelector()
-			.find('input')
-			.should('include.value', '1 of 2 (6 items)');
+		ndv.getters.inputRunSelector().find('input').should('include.value', '1 of 2 (6 items)');
 		ndv.getters.inputTbodyCell(1, 0).should('have.text', '1111');
 		ndv.getters.outputTbodyCell(1, 0).should('have.text', '1111');
 
 		ndv.getters.inputTbodyCell(1, 0).click(); // remove tooltip
 		ndv.actions.changeInputRunSelector('2 of 2 (6 items)');
-		ndv.getters.outputRunSelector()
-			.find('input')
-			.should('include.value', '2 of 2 (6 items)');
+		ndv.getters.outputRunSelector().find('input').should('include.value', '2 of 2 (6 items)');
 
 		// unlink
 		ndv.actions.toggleOutputRunLinking();
 		ndv.getters.inputTbodyCell(1, 0).click(); // remove tooltip
 		ndv.actions.changeOutputRunSelector('1 of 2 (6 items)');
-		ndv.getters.inputRunSelector()
+		ndv.getters
+			.inputRunSelector()
 			.should('exist')
 			.find('input')
 			.should('include.value', '2 of 2 (6 items)');
@@ -208,23 +267,449 @@ describe('NDV', () => {
 		// link again
 		ndv.actions.toggleOutputRunLinking();
 		ndv.getters.inputTbodyCell(1, 0).click(); // remove tooltip
-		ndv.getters.inputRunSelector()
-			.find('input')
-			.should('include.value', '1 of 2 (6 items)');
-		
+		ndv.getters.inputRunSelector().find('input').should('include.value', '1 of 2 (6 items)');
+
 		// unlink again
 		ndv.actions.toggleInputRunLinking();
 		ndv.getters.inputTbodyCell(1, 0).click(); // remove tooltip
 		ndv.actions.changeInputRunSelector('2 of 2 (6 items)');
-		ndv.getters.outputRunSelector()
-			.find('input')
-			.should('include.value', '1 of 2 (6 items)');
+		ndv.getters.outputRunSelector().find('input').should('include.value', '1 of 2 (6 items)');
 
 		// link again
 		ndv.actions.toggleInputRunLinking();
 		ndv.getters.inputTbodyCell(1, 0).click(); // remove tooltip
-		ndv.getters.outputRunSelector()
-			.find('input')
-			.should('include.value', '2 of 2 (6 items)');
+		ndv.getters.outputRunSelector().find('input').should('include.value', '2 of 2 (6 items)');
+	});
+
+	it('should display parameter hints correctly', () => {
+		workflowPage.actions.visit();
+
+		cy.createFixtureWorkflow('Test_workflow_3.json', `My test workflow`);
+		workflowPage.actions.openNode('Set1');
+
+		ndv.actions.typeIntoParameterInput('value', '='); // switch to expressions
+
+		[
+			{
+				input: 'hello',
+			},
+			{
+				input: '',
+				output: '[empty]',
+			},
+			{
+				input: ' test',
+			},
+			{
+				input: ' ',
+			},
+			{
+				input: '<div></div>',
+			},
+		].forEach(({ input, output }) => {
+			if (input) {
+				ndv.actions.typeIntoParameterInput('value', input);
+			}
+			ndv.getters.parameterInput('name').click(); // remove focus from input, hide expression preview
+
+			ndv.actions.validateExpressionPreview('value', output || input);
+			ndv.getters.parameterInput('value').clear();
+		});
+	});
+
+	it('should not retrieve remote options when required params throw errors', () => {
+		workflowPage.actions.addInitialNodeToCanvas('E2e Test', { action: 'Remote Options' });
+
+		ndv.getters.parameterInput('remoteOptions').click();
+		getVisibleSelect().find('.el-select-dropdown__item').should('have.length', 3);
+
+		ndv.actions.setInvalidExpression({ fieldName: 'fieldId', delay: 200 });
+
+		ndv.getters.nodeParameters().click(); // remove focus from input, hide expression preview
+
+		ndv.getters.parameterInput('remoteOptions').click();
+
+		ndv.getters.parameterInputIssues('remoteOptions').realHover({ scrollBehavior: false });
+		// Remote options dropdown should not be visible
+		ndv.getters.parameterInput('remoteOptions').find('.el-select').should('not.exist');
+	});
+
+	it('should retrieve remote options when non-required params throw errors', () => {
+		workflowPage.actions.addInitialNodeToCanvas('E2e Test', { action: 'Remote Options' });
+
+		ndv.getters.parameterInput('remoteOptions').click();
+		getVisibleSelect().find('.el-select-dropdown__item').should('have.length', 3);
+		ndv.getters.parameterInput('remoteOptions').click();
+
+		ndv.actions.setInvalidExpression({ fieldName: 'otherField', delay: 50 });
+
+		ndv.getters.nodeParameters().click(); // remove focus from input, hide expression preview
+
+		ndv.getters.parameterInput('remoteOptions').click();
+		getVisibleSelect().find('.el-select-dropdown__item').should('have.length', 3);
+	});
+
+	it('should flag issues as soon as params are set', () => {
+		workflowPage.actions.addInitialNodeToCanvas('Webhook');
+		workflowPage.getters.canvasNodes().first().dblclick();
+
+		workflowPage.getters.nodeIssuesByName('Webhook').should('not.exist');
+		ndv.getters.nodeExecuteButton().should('not.be.disabled');
+		ndv.getters.triggerPanelExecuteButton().should('exist');
+
+		ndv.getters.parameterInput('path').clear();
+
+		ndv.getters.nodeExecuteButton().should('be.disabled');
+		ndv.getters.triggerPanelExecuteButton().should('not.exist');
+		ndv.actions.close();
+		workflowPage.getters.nodeIssuesByName('Webhook').should('exist');
+
+		workflowPage.getters.canvasNodes().first().dblclick();
+		ndv.getters.parameterInput('path').type('t');
+
+		ndv.getters.nodeExecuteButton().should('not.be.disabled');
+		ndv.getters.triggerPanelExecuteButton().should('exist');
+
+		ndv.actions.close();
+		workflowPage.getters.nodeIssuesByName('Webhook').should('not.exist');
+	});
+
+	it('should not push NDV header out with a lot of code in Code node editor', () => {
+		workflowPage.actions.addInitialNodeToCanvas('Code', { keepNdvOpen: true });
+		ndv.getters.parameterInput('jsCode').get('.cm-content').type('{selectall}').type('{backspace}');
+		cy.fixture('Dummy_javascript.txt').then((code) => {
+			ndv.getters.parameterInput('jsCode').get('.cm-content').paste(code);
+		});
+		ndv.getters.nodeExecuteButton().should('be.visible');
+	});
+
+	it('should allow editing code in fullscreen in the Code node', () => {
+		workflowPage.actions.addInitialNodeToCanvas('Code', { keepNdvOpen: true });
+		ndv.actions.openCodeEditorFullscreen();
+
+		ndv.getters.codeEditorFullscreen().type('{selectall}').type('{backspace}').type('foo()');
+		ndv.getters.codeEditorFullscreen().should('contain.text', 'foo()');
+		cy.wait(200);
+		ndv.getters.codeEditorDialog().find('.el-dialog__close').click();
+		ndv.getters.parameterInput('jsCode').get('.cm-content').should('contain.text', 'foo()');
+	});
+
+	it('should not retrieve remote options when a parameter value changes', () => {
+		cy.intercept('/rest/dynamic-node-parameters/options?**', cy.spy().as('fetchParameterOptions'));
+		workflowPage.actions.addInitialNodeToCanvas('E2e Test', { action: 'Remote Options' });
+		// Type something into the field
+		ndv.actions.typeIntoParameterInput('otherField', 'test');
+		// Should call the endpoint only once (on mount), not for every keystroke
+		cy.get('@fetchParameterOptions').should('have.been.calledOnce');
+	});
+
+	describe('floating nodes', () => {
+		function getFloatingNodeByPosition(
+			position: 'inputMain' | 'outputMain' | 'outputSub' | 'inputSub',
+		) {
+			return cy.get(`[data-node-placement=${position}]`);
+		}
+
+		it('should traverse floating nodes with mouse', () => {
+			cy.createFixtureWorkflow('Floating_Nodes.json', `Floating Nodes`);
+			workflowPage.getters.canvasNodes().first().dblclick();
+			getFloatingNodeByPosition('inputMain').should('not.exist');
+			getFloatingNodeByPosition('outputMain').should('exist');
+			// Traverse 4 connected node forwards
+			Array.from(Array(4).keys()).forEach((i) => {
+				getFloatingNodeByPosition('outputMain').click({ force: true });
+				ndv.getters.nodeNameContainer().should('contain', `Node ${i + 1}`);
+				getFloatingNodeByPosition('inputMain').should('exist');
+				getFloatingNodeByPosition('outputMain').should('exist');
+				ndv.actions.close();
+				workflowPage.getters.selectedNodes().should('have.length', 1);
+				workflowPage.getters
+					.selectedNodes()
+					.first()
+					.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 });
+				ndv.getters.nodeNameContainer().should('contain', `Node ${4 - i}`);
+				getFloatingNodeByPosition('outputMain').should('exist');
+				getFloatingNodeByPosition('inputMain').should('exist');
+			});
+			getFloatingNodeByPosition('inputMain').click({ force: true });
+			workflowPage.getters
+				.selectedNodes()
+				.first()
+				.should('contain', MANUAL_TRIGGER_NODE_DISPLAY_NAME);
+			getFloatingNodeByPosition('inputMain').should('not.exist');
+			getFloatingNodeByPosition('inputSub').should('not.exist');
+			getFloatingNodeByPosition('outputSub').should('not.exist');
+			ndv.actions.close();
+			workflowPage.getters.selectedNodes().should('have.length', 1);
+			workflowPage.getters
+				.selectedNodes()
+				.first()
+				.should('contain', MANUAL_TRIGGER_NODE_DISPLAY_NAME);
+		});
+
+		it('should traverse floating nodes with keyboard', () => {
+			cy.createFixtureWorkflow('Floating_Nodes.json', `Floating Nodes`);
+			workflowPage.getters.canvasNodes().first().dblclick();
+			getFloatingNodeByPosition('inputMain').should('not.exist');
+			getFloatingNodeByPosition('outputMain').should('exist');
+			// Traverse 4 connected node forwards
+			Array.from(Array(4).keys()).forEach((i) => {
+				cy.realPress(['ShiftLeft', 'Meta', 'AltLeft', 'ArrowRight']);
+				ndv.getters.nodeNameContainer().should('contain', `Node ${i + 1}`);
+				getFloatingNodeByPosition('inputMain').should('exist');
+				getFloatingNodeByPosition('outputMain').should('exist');
+				ndv.actions.close();
+				workflowPage.getters.selectedNodes().should('have.length', 1);
+				workflowPage.getters
+					.selectedNodes()
+					.first()
+					.should('contain', `Node ${i + 1}`);
+				workflowPage.getters.selectedNodes().first().dblclick();
+			});
+
+			cy.realPress(['ShiftLeft', 'Meta', 'AltLeft', 'ArrowRight']);
+			ndv.getters.nodeNameContainer().should('contain', 'Chain');
+
+			// Traverse 4 connected node backwards
+			Array.from(Array(4).keys()).forEach((i) => {
+				cy.realPress(['ShiftLeft', 'Meta', 'AltLeft', 'ArrowLeft']);
+				ndv.getters.nodeNameContainer().should('contain', `Node ${4 - i}`);
+				getFloatingNodeByPosition('outputMain').should('exist');
+				getFloatingNodeByPosition('inputMain').should('exist');
+			});
+			cy.realPress(['ShiftLeft', 'Meta', 'AltLeft', 'ArrowLeft']);
+			workflowPage.getters
+				.selectedNodes()
+				.first()
+				.should('contain', MANUAL_TRIGGER_NODE_DISPLAY_NAME);
+			getFloatingNodeByPosition('inputMain').should('not.exist');
+			getFloatingNodeByPosition('inputSub').should('not.exist');
+			getFloatingNodeByPosition('outputSub').should('not.exist');
+			ndv.actions.close();
+			workflowPage.getters.selectedNodes().should('have.length', 1);
+			workflowPage.getters
+				.selectedNodes()
+				.first()
+				.should('contain', MANUAL_TRIGGER_NODE_DISPLAY_NAME);
+		});
+
+		it('should connect floating sub-nodes', () => {
+			const nodeCreator = new NodeCreator();
+			const connectionGroups = [
+				{
+					title: 'Language Models',
+					id: 'ai_languageModel',
+				},
+				{
+					title: 'Tools',
+					id: 'ai_tool',
+				},
+			];
+
+			workflowPage.actions.addInitialNodeToCanvas('AI Agent', { keepNdvOpen: true });
+
+			connectionGroups.forEach((group) => {
+				cy.getByTestId(`add-subnode-${group.id}`).should('exist');
+				cy.getByTestId(`add-subnode-${group.id}`).click();
+
+				cy.getByTestId('nodes-list-header').contains(group.title).should('exist');
+				nodeCreator.getters.getNthCreatorItem(1).click();
+				getFloatingNodeByPosition('outputSub').should('exist');
+				getFloatingNodeByPosition('outputSub').click({ force: true });
+
+				if (group.id === 'ai_languageModel') {
+					cy.getByTestId(`add-subnode-${group.id}`).should('not.exist');
+				} else {
+					cy.getByTestId(`add-subnode-${group.id}`).should('exist');
+					// Expand the subgroup
+					cy.getByTestId('subnode-connection-group-ai_tool').click();
+					cy.getByTestId(`add-subnode-${group.id}`).click();
+					nodeCreator.getters.getNthCreatorItem(1).click();
+					getFloatingNodeByPosition('outputSub').click({ force: true });
+					cy.getByTestId('subnode-connection-group-ai_tool')
+						.findChildByTestId('floating-subnode')
+						.should('have.length', 2);
+				}
+			});
+
+			// Since language model has no credentials set, it should show an error
+			// Sinse code tool require alphanumeric tool name it would also show an error(2 errors, 1 for each tool node)
+			cy.get('[class*=hasIssues]').should('have.length', 3);
+		});
+	});
+
+	it('should show node name and version in settings', () => {
+		cy.createFixtureWorkflow('Test_workflow_ndv_version.json', `NDV test version ${uuid()}`);
+
+		workflowPage.actions.openNode('Edit Fields (old)');
+		ndv.actions.openSettings();
+		ndv.getters.nodeVersion().should('have.text', 'Set node version 2 (Latest version: 3.3)');
+		ndv.actions.close();
+
+		workflowPage.actions.openNode('Edit Fields (latest)');
+		ndv.actions.openSettings();
+		ndv.getters.nodeVersion().should('have.text', 'Edit Fields (Set) node version 3.3 (Latest)');
+		ndv.actions.close();
+
+		workflowPage.actions.openNode('Edit Fields (no typeVersion)');
+		ndv.actions.openSettings();
+		ndv.getters.nodeVersion().should('have.text', 'Edit Fields (Set) node version 3.3 (Latest)');
+		ndv.actions.close();
+
+		workflowPage.actions.openNode('Function');
+		ndv.actions.openSettings();
+		ndv.getters.nodeVersion().should('have.text', 'Function node version 1 (Deprecated)');
+		ndv.actions.close();
+	});
+
+	it('Should render xml and html tags as strings and can search', () => {
+		cy.createFixtureWorkflow('Test_workflow_xml_output.json', `test`);
+
+		workflowPage.actions.executeWorkflow();
+
+		workflowPage.actions.openNode('Edit Fields');
+
+		ndv.getters.outputDisplayMode().find('[class*=active]').should('contain', 'Table');
+
+		ndv.getters
+			.outputTableRow(1)
+			.should('include.text', '<?xml version="1.0" encoding="UTF-8"?> <library>');
+
+		cy.document().trigger('keyup', { key: '/' });
+		ndv.getters.searchInput().filter(':focus').type('<lib');
+
+		ndv.getters.outputTableRow(1).find('mark').should('have.text', '<lib');
+
+		ndv.getters.outputDisplayMode().find('label').eq(1).should('include.text', 'JSON');
+		ndv.getters.outputDisplayMode().find('label').eq(1).click();
+
+		ndv.getters.outputDataContainer().find('.json-data').should('exist');
+		ndv.getters
+			.outputDataContainer()
+			.should(
+				'have.text',
+				'[{"body": "<?xml version="1.0" encoding="UTF-8"?> <library>     <book>         <title>Introduction to XML</title>         <author>John Doe</author>         <publication_year>2020</publication_year>         <isbn>1234567890</isbn>     </book>     <book>         <title>Data Science Basics</title>         <author>Jane Smith</author>         <publication_year>2019</publication_year>         <isbn>0987654321</isbn>     </book>     <book>         <title>Programming in Python</title>         <author>Bob Johnson</author>         <publication_year>2021</publication_year>         <isbn>5432109876</isbn>     </book> </library>"}]',
+			);
+		ndv.getters.outputDataContainer().find('mark').should('have.text', '<lib');
+
+		ndv.getters.outputDisplayMode().find('label').eq(2).should('include.text', 'Schema');
+		ndv.getters.outputDisplayMode().find('label').eq(2).click({ force: true });
+		ndv.getters
+			.outputDataContainer()
+			.findChildByTestId('run-data-schema-item')
+			.find('> span')
+			.should('include.text', '<?xml version="1.0" encoding="UTF-8"?>');
+	});
+
+	it('should properly show node execution indicator', () => {
+		workflowPage.actions.addInitialNodeToCanvas('Code');
+		workflowPage.actions.openNode('Code');
+		// Should not show run info before execution
+		ndv.getters.nodeRunSuccessIndicator().should('not.exist');
+		ndv.getters.nodeRunErrorIndicator().should('not.exist');
+		ndv.getters.nodeExecuteButton().click();
+		ndv.getters.nodeRunSuccessIndicator().should('exist');
+	});
+
+	it('should properly show node execution indicator for multiple nodes', () => {
+		workflowPage.actions.addInitialNodeToCanvas('Code');
+		workflowPage.actions.openNode('Code');
+		ndv.actions.typeIntoParameterInput('jsCode', 'testets');
+		ndv.getters.backToCanvas().click();
+		workflowPage.actions.executeWorkflow();
+		// Manual tigger node should show success indicator
+		workflowPage.actions.openNode('When clicking "Test workflow"');
+		ndv.getters.nodeRunSuccessIndicator().should('exist');
+		// Code node should show error
+		ndv.getters.backToCanvas().click();
+		workflowPage.actions.openNode('Code');
+		ndv.getters.nodeRunErrorIndicator().should('exist');
+	});
+
+	it('Should clear mismatched collection parameters', () => {
+		workflowPage.actions.addInitialNodeToCanvas('LDAP', {
+			keepNdvOpen: true,
+			action: 'Create a new entry',
+		});
+		// Add some attributes in Create operation
+		cy.getByTestId('parameter-item').contains('Add Attributes').click();
+		ndv.actions.changeNodeOperation('Update');
+		// Attributes should be empty after operation change
+		cy.getByTestId('parameter-item').contains('Currently no items exist').should('exist');
+	});
+
+	it('Should keep RLC values after operation change', () => {
+		const TEST_DOC_ID = '1111';
+		workflowPage.actions.addInitialNodeToCanvas('Google Sheets', {
+			keepNdvOpen: true,
+			action: 'Append row in sheet',
+		});
+		ndv.actions.setRLCValue('documentId', TEST_DOC_ID);
+		ndv.actions.changeNodeOperation('Update Row');
+		ndv.getters.resourceLocatorInput('documentId').find('input').should('have.value', TEST_DOC_ID);
+	});
+
+	it('Should not clear resource/operation after credential change', () => {
+		workflowPage.actions.addInitialNodeToCanvas('Discord', {
+			keepNdvOpen: true,
+			action: 'Delete a message',
+		});
+
+		clickCreateNewCredential();
+		setCredentialValues({
+			botToken: 'sk_test_123',
+		});
+
+		ndv.getters.parameterInput('resource').find('input').should('have.value', 'Message');
+		ndv.getters.parameterInput('operation').find('input').should('have.value', 'Delete');
+	});
+
+	it('Should open appropriate node creator after clicking on connection hint link', () => {
+		const nodeCreator = new NodeCreator();
+		const hintMapper = {
+			Memory: 'AI Nodes',
+			'Output Parser': 'AI Nodes',
+			'Token Splitter': 'Document Loaders',
+			Tool: 'AI Nodes',
+			Embeddings: 'Vector Stores',
+			'Vector Store': 'Retrievers',
+		};
+		cy.createFixtureWorkflow(
+			'open_node_creator_for_connection.json',
+			`open_node_creator_for_connection ${uuid()}`,
+		);
+
+		Object.entries(hintMapper).forEach(([node, group]) => {
+			workflowPage.actions.openNode(node);
+			cy.get('[data-action=openSelectiveNodeCreator]').contains('Insert one').click();
+			nodeCreator.getters.activeSubcategory().should('contain', group);
+			cy.realPress('Escape');
+		});
+	});
+
+	it('Stop listening for trigger event from NDV', () => {
+		cy.intercept('POST', '/rest/workflows/run').as('workflowRun');
+		workflowPage.actions.addInitialNodeToCanvas('Local File Trigger', {
+			keepNdvOpen: true,
+			action: 'On Changes To A Specific File',
+			isTrigger: true,
+		});
+		ndv.getters.triggerPanelExecuteButton().should('exist');
+		ndv.getters.triggerPanelExecuteButton().realClick();
+		ndv.getters.triggerPanelExecuteButton().should('contain', 'Stop Listening');
+		ndv.getters.triggerPanelExecuteButton().realClick();
+		cy.wait('@workflowRun').then(() => {
+			ndv.getters.triggerPanelExecuteButton().should('contain', 'Test step');
+			workflowPage.getters.successToast().should('exist');
+		});
 	});
 });
diff --git a/cypress/e2e/6-code-node.cy.ts b/cypress/e2e/6-code-node.cy.ts
index 7fa465d2ee86d..0964cff41e225 100644
--- a/cypress/e2e/6-code-node.cy.ts
+++ b/cypress/e2e/6-code-node.cy.ts
@@ -5,31 +5,153 @@ const WorkflowPage = new WorkflowPageClass();
 const ndv = new NDV();
 
 describe('Code node', () => {
-	before(() => {
-		cy.resetAll();
-		cy.skipSetup();
-	});
+	describe('Code editor', () => {
+		beforeEach(() => {
+			WorkflowPage.actions.visit();
+			WorkflowPage.actions.addInitialNodeToCanvas('Manual');
+			WorkflowPage.actions.addNodeToCanvas('Code', true, true);
+		});
+
+		it('should show correct placeholders switching modes', () => {
+			cy.contains('// Loop over input items and add a new field').should('be.visible');
+
+			ndv.getters.parameterInput('mode').click();
+			ndv.actions.selectOptionInParameterDropdown('mode', 'Run Once for Each Item');
+
+			cy.contains("// Add a new field called 'myNewField'").should('be.visible');
 
-	it('should execute the placeholder in all-items mode successfully', () => {
-		WorkflowPage.actions.addInitialNodeToCanvas('Manual');
-		WorkflowPage.actions.addNodeToCanvas('Code');
-		WorkflowPage.actions.openNode('Code');
+			ndv.getters.parameterInput('mode').click();
+			ndv.actions.selectOptionInParameterDropdown('mode', 'Run Once for All Items');
+			cy.contains('// Loop over input items and add a new field').should('be.visible');
+		});
 
-		ndv.actions.execute();
+		it('should execute the placeholder successfully in both modes', () => {
+			ndv.actions.execute();
 
-		WorkflowPage.getters.successToast().contains('Node executed successfully');
+			WorkflowPage.getters.successToast().contains('Node executed successfully');
+			ndv.getters.parameterInput('mode').click();
+			ndv.actions.selectOptionInParameterDropdown('mode', 'Run Once for Each Item');
+
+			ndv.actions.execute();
+
+			WorkflowPage.getters.successToast().contains('Node executed successfully');
+		});
 	});
 
-	it('should execute the placeholder in each-item mode successfully', () => {
-		WorkflowPage.actions.visit();
-		WorkflowPage.actions.addInitialNodeToCanvas('Manual');
-		WorkflowPage.actions.addNodeToCanvas('Code');
-		WorkflowPage.actions.openNode('Code');
-		ndv.getters.parameterInput('mode').click();
-		ndv.actions.selectOptionInParameterDropdown('mode', 'Run Once for Each Item');
+	describe('Ask AI', () => {
+		it('tab should display based on experiment', () => {
+			WorkflowPage.actions.visit();
+			cy.window().then((win) => {
+				win.featureFlags.override('011_ask_AI', 'control');
+				WorkflowPage.actions.addInitialNodeToCanvas('Manual');
+				WorkflowPage.actions.addNodeToCanvas('Code');
+				WorkflowPage.actions.openNode('Code');
+
+				cy.getByTestId('code-node-tab-ai').should('not.exist');
+
+				ndv.actions.close();
+				win.featureFlags.override('011_ask_AI', undefined);
+				WorkflowPage.actions.openNode('Code');
+				cy.getByTestId('code-node-tab-ai').should('not.exist');
+			});
+		});
+
+		describe('Enabled', () => {
+			beforeEach(() => {
+				WorkflowPage.actions.visit();
+				cy.window().then((win) => {
+					win.featureFlags.override('011_ask_AI', 'gpt3');
+					WorkflowPage.actions.addInitialNodeToCanvas('Manual');
+					WorkflowPage.actions.addNodeToCanvas('Code', true, true);
+				});
+			});
+
+			it('tab should exist if experiment selected and be selectable', () => {
+				cy.getByTestId('code-node-tab-ai').should('exist');
+				cy.get('#tab-ask-ai').click();
+				cy.contains('Hey AI, generate JavaScript').should('exist');
+			});
+
+			it('generate code button should have correct state & tooltips', () => {
+				cy.getByTestId('code-node-tab-ai').should('exist');
+				cy.get('#tab-ask-ai').click();
+
+				cy.getByTestId('ask-ai-cta').should('be.disabled');
+				cy.getByTestId('ask-ai-cta').realHover();
+				cy.getByTestId('ask-ai-cta-tooltip-no-input-data').should('exist');
+				ndv.actions.executePrevious();
+				cy.getByTestId('ask-ai-cta').realHover();
+				cy.getByTestId('ask-ai-cta-tooltip-no-prompt').should('exist');
+				cy.getByTestId('ask-ai-prompt-input')
+					// Type random 14 character string
+					.type([...Array(14)].map(() => ((Math.random() * 36) | 0).toString(36)).join(''));
+
+				cy.getByTestId('ask-ai-cta').realHover();
+				cy.getByTestId('ask-ai-cta-tooltip-prompt-too-short').should('exist');
+
+				cy.getByTestId('ask-ai-prompt-input')
+					.clear()
+					// Type random 15 character string
+					.type([...Array(15)].map(() => ((Math.random() * 36) | 0).toString(36)).join(''));
+				cy.getByTestId('ask-ai-cta').should('be.enabled');
+
+				cy.getByTestId('ask-ai-prompt-counter').should('contain.text', '15 / 600');
+			});
+
+			it('should send correct schema and replace code', () => {
+				const prompt = [...Array(20)].map(() => ((Math.random() * 36) | 0).toString(36)).join('');
+				cy.get('#tab-ask-ai').click();
+				ndv.actions.executePrevious();
+
+				cy.getByTestId('ask-ai-prompt-input').type(prompt);
+
+				cy.intercept('POST', '/rest/ask-ai', {
+					statusCode: 200,
+					body: {
+						data: {
+							code: 'console.log("Hello World")',
+						},
+					},
+				}).as('ask-ai');
+
+				cy.getByTestId('ask-ai-cta').click();
+				const askAiReq = cy.wait('@ask-ai');
+
+				askAiReq
+					.its('request.body')
+					.should('have.keys', ['question', 'model', 'context', 'n8nVersion']);
+
+				askAiReq.its('context').should('have.keys', ['schema', 'ndvPushRef', 'pushRef']);
+
+				cy.contains('Code generation completed').should('be.visible');
+				cy.getByTestId('code-node-tab-code').should('contain.text', 'console.log("Hello World")');
+				cy.get('#tab-code').should('have.class', 'is-active');
+			});
+
+			it('should show error based on status code', () => {
+				const prompt = [...Array(20)].map(() => ((Math.random() * 36) | 0).toString(36)).join('');
+				cy.get('#tab-ask-ai').click();
+				ndv.actions.executePrevious();
+
+				cy.getByTestId('ask-ai-prompt-input').type(prompt);
+
+				const handledCodes = [
+					{ code: 400, message: 'Code generation failed due to an unknown reason' },
+					{ code: 413, message: 'Your workflow data is too large for AI to process' },
+					{ code: 429, message: "We've hit our rate limit with our AI partner" },
+					{ code: 500, message: 'Code generation failed due to an unknown reason' },
+				];
 
-		ndv.actions.execute();
+				handledCodes.forEach(({ code, message }) => {
+					cy.intercept('POST', '/rest/ask-ai', {
+						statusCode: code,
+						status: code,
+					}).as('ask-ai');
 
-		WorkflowPage.getters.successToast().contains('Node executed successfully');
+					cy.getByTestId('ask-ai-cta').click();
+					cy.contains(message).should('be.visible');
+				});
+			});
+		});
 	});
 });
diff --git a/cypress/e2e/7-workflow-actions.cy.ts b/cypress/e2e/7-workflow-actions.cy.ts
index baa38e9f7a205..794e2ee605821 100644
--- a/cypress/e2e/7-workflow-actions.cy.ts
+++ b/cypress/e2e/7-workflow-actions.cy.ts
@@ -3,22 +3,24 @@ import {
 	MANUAL_TRIGGER_NODE_NAME,
 	META_KEY,
 	SCHEDULE_TRIGGER_NODE_NAME,
+	EDIT_FIELDS_SET_NODE_NAME,
+	INSTANCE_MEMBERS,
+	INSTANCE_OWNER,
 } from '../constants';
 import { WorkflowPage as WorkflowPageClass } from '../pages/workflow';
+import { WorkflowsPage as WorkflowsPageClass } from '../pages/workflows';
+import { getVisibleSelect } from '../utils';
+import { WorkflowExecutionsTab } from '../pages';
 
 const NEW_WORKFLOW_NAME = 'Something else';
-const IMPORT_WORKFLOW_URL = 'https://gist.githubusercontent.com/OlegIvaniv/010bd3f45c8a94f8eb7012e663a8b671/raw/3afea1aec15573cc168d9af7e79395bd76082906/test-workflow.json';
 const DUPLICATE_WORKFLOW_NAME = 'Duplicated workflow';
 const DUPLICATE_WORKFLOW_TAG = 'Duplicate';
 
 const WorkflowPage = new WorkflowPageClass();
+const WorkflowPages = new WorkflowsPageClass();
+const executionsTab = new WorkflowExecutionsTab();
 
 describe('Workflow Actions', () => {
-	before(() => {
-		cy.resetAll();
-		cy.skipSetup();
-	});
-
 	beforeEach(() => {
 		WorkflowPage.actions.visit();
 	});
@@ -67,6 +69,63 @@ describe('Workflow Actions', () => {
 			.should('eq', NEW_WORKFLOW_NAME);
 	});
 
+	it('should not save workflow if canvas is loading', () => {
+		let interceptCalledCount = 0;
+
+		// There's no way in Cypress to check if intercept was not called
+		// so we'll count the number of times it was called
+		cy.intercept('PATCH', '/rest/workflows/*', () => {
+			interceptCalledCount++;
+		}).as('saveWorkflow');
+
+		WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
+		WorkflowPage.actions.saveWorkflowOnButtonClick();
+		cy.intercept(
+			{
+				url: '/rest/workflows/*',
+				method: 'GET',
+				middleware: true,
+			},
+			(req) => {
+				// Delay the response to give time for the save to be triggered
+				req.on('response', async (res) => {
+					await new Promise((resolve) => setTimeout(resolve, 2000));
+					res.send();
+				});
+			},
+		);
+		cy.reload();
+		cy.get('.el-loading-mask').should('exist');
+		cy.get('body').type(META_KEY, { release: false }).type('s');
+		cy.get('body').type(META_KEY, { release: false }).type('s');
+		cy.get('body').type(META_KEY, { release: false }).type('s');
+		cy.wrap(null).then(() => expect(interceptCalledCount).to.eq(0));
+		cy.waitForLoad();
+		WorkflowPage.actions.addNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME);
+		cy.get('body').type(META_KEY, { release: false }).type('s');
+		cy.wait('@saveWorkflow');
+		cy.wrap(null).then(() => expect(interceptCalledCount).to.eq(1));
+	});
+
+	it('should not save workflow twice when save is in progress', () => {
+		// This happens when users click save button from workflow name input
+		// In this case blur on the input saves the workflow and then click on the button saves it again
+		WorkflowPage.actions.visit();
+		WorkflowPage.getters
+			.workflowNameInput()
+			.invoke('val')
+			.then((oldName) => {
+				WorkflowPage.getters.workflowNameInputContainer().click();
+				WorkflowPage.getters.workflowNameInput().type('{selectall}');
+				WorkflowPage.getters.workflowNameInput().type('Test');
+				WorkflowPage.getters.saveButton().click();
+				WorkflowPage.getters.workflowNameInput().should('have.value', 'Test');
+				cy.visit(WorkflowPages.url);
+				// There should be no workflow with the old name (duplicate save)
+				WorkflowPages.getters.workflowCards().contains(String(oldName)).should('not.exist');
+			});
+	});
+
 	it('should copy nodes', () => {
 		WorkflowPage.actions.addNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME);
 		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
@@ -79,98 +138,56 @@ describe('Workflow Actions', () => {
 		WorkflowPage.getters.successToast().should('exist');
 	});
 
-	it('should paste nodes', () => {
+	it('should paste nodes (both current and old node versions)', () => {
 		cy.fixture('Test_workflow-actions_paste-data.json').then((data) => {
 			cy.get('body').paste(JSON.stringify(data));
-			WorkflowPage.getters.canvasNodes().should('have.have.length', 2);
+			WorkflowPage.actions.zoomToFit();
+			WorkflowPage.getters.canvasNodes().should('have.length', 5);
+			WorkflowPage.getters.nodeConnections().should('have.length', 5);
 		});
 	});
 
-	it('should import workflow from url', () => {
-		WorkflowPage.getters.workflowMenu().should('be.visible');
-		WorkflowPage.getters.workflowMenu().click();
-		WorkflowPage.getters.workflowMenuItemImportFromURLItem().should('be.visible');
-		WorkflowPage.getters.workflowMenuItemImportFromURLItem().click();
-		cy.get('.el-message-box').should('be.visible');
-		cy.get('.el-message-box').find('input').type(IMPORT_WORKFLOW_URL);
-		cy.get('body').type('{enter}');
-		cy.waitForLoad(false)
-		WorkflowPage.actions.zoomToFit();
-		WorkflowPage.getters.canvasNodes().should('have.length', 2);
-		WorkflowPage.getters.nodeConnections().should('have.length', 1);
-	});
-
-	it('should import workflow from file', () => {
-		WorkflowPage.getters
-			.workflowImportInput()
-			.selectFile('cypress/fixtures/Test_workflow-actions_paste-data.json', { force: true });
-		cy.waitForLoad(false)
-		WorkflowPage.actions.zoomToFit();
-		WorkflowPage.getters.canvasNodes().should('have.length', 2);
-		WorkflowPage.getters.nodeConnections().should('have.length', 1);
-	});
-
 	it('should update workflow settings', () => {
-		cy.resetAll();
-		cy.skipSetup();
-		WorkflowPage.actions.visit();
-		// Open settings dialog
-		WorkflowPage.actions.saveWorkflowOnButtonClick();
-		WorkflowPage.getters.workflowMenu().should('be.visible');
-		WorkflowPage.getters.workflowMenu().click();
-		WorkflowPage.getters.workflowMenuItemSettings().should('be.visible');
-		WorkflowPage.getters.workflowMenuItemSettings().click();
-		// Change all settings
-		WorkflowPage.getters.workflowSettingsErrorWorkflowSelect().find('li').should('have.length', 2);
-		WorkflowPage.getters
-			.workflowSettingsErrorWorkflowSelect()
-			.find('li')
-			.last()
-			.click({ force: true });
-		WorkflowPage.getters.workflowSettingsTimezoneSelect().find('li').should('exist');
-		WorkflowPage.getters.workflowSettingsTimezoneSelect().find('li').eq(1).click({ force: true });
-		WorkflowPage.getters
-			.workflowSettingsSaveFiledExecutionsSelect()
-			.find('li')
-			.should('have.length', 3);
-		WorkflowPage.getters
-			.workflowSettingsSaveFiledExecutionsSelect()
-			.find('li')
-			.last()
-			.click({ force: true });
-		WorkflowPage.getters
-			.workflowSettingsSaveSuccessExecutionsSelect()
-			.find('li')
-			.should('have.length', 3);
-		WorkflowPage.getters
-			.workflowSettingsSaveSuccessExecutionsSelect()
-			.find('li')
-			.last()
-			.click({ force: true });
-		WorkflowPage.getters
-			.workflowSettingsSaveManualExecutionsSelect()
-			.find('li')
-			.should('have.length', 3);
-		WorkflowPage.getters
-			.workflowSettingsSaveManualExecutionsSelect()
-			.find('li')
-			.last()
-			.click({ force: true });
-		WorkflowPage.getters
-			.workflowSettingsSaveExecutionProgressSelect()
-			.find('li')
-			.should('have.length', 3);
-		WorkflowPage.getters
-			.workflowSettingsSaveExecutionProgressSelect()
-			.find('li')
-			.last()
-			.click({ force: true });
-		WorkflowPage.getters.workflowSettingsTimeoutWorkflowSwitch().click();
-		WorkflowPage.getters.workflowSettingsTimeoutForm().find('input').first().type('1');
-		// Save settings
-		WorkflowPage.getters.workflowSettingsSaveButton().click();
-		WorkflowPage.getters.workflowSettingsModal().should('not.exist');
-		WorkflowPage.getters.successToast().should('exist');
+		cy.visit(WorkflowPages.url);
+		WorkflowPages.getters.workflowCards().then((cards) => {
+			const totalWorkflows = cards.length;
+
+			WorkflowPage.actions.visit();
+			// Open settings dialog
+			WorkflowPage.actions.saveWorkflowOnButtonClick();
+			WorkflowPage.getters.workflowMenu().should('be.visible');
+			WorkflowPage.getters.workflowMenu().click();
+			WorkflowPage.getters.workflowMenuItemSettings().should('be.visible');
+			WorkflowPage.getters.workflowMenuItemSettings().click();
+			// Change all settings
+			// totalWorkflows + 1 (current workflow) + 1 (no workflow option)
+			WorkflowPage.getters.workflowSettingsErrorWorkflowSelect().click();
+			getVisibleSelect()
+				.find('li')
+				.should('have.length', totalWorkflows + 2);
+			getVisibleSelect().find('li').last().click({ force: true });
+			WorkflowPage.getters.workflowSettingsTimezoneSelect().click();
+			getVisibleSelect().find('li').should('exist');
+			getVisibleSelect().find('li').eq(1).click({ force: true });
+			WorkflowPage.getters.workflowSettingsSaveFiledExecutionsSelect().click();
+			getVisibleSelect().find('li').should('have.length', 3);
+			getVisibleSelect().find('li').last().click({ force: true });
+			WorkflowPage.getters.workflowSettingsSaveSuccessExecutionsSelect().click();
+			getVisibleSelect().find('li').should('have.length', 3);
+			getVisibleSelect().find('li').last().click({ force: true });
+			WorkflowPage.getters.workflowSettingsSaveManualExecutionsSelect().click();
+			getVisibleSelect().find('li').should('have.length', 3);
+			getVisibleSelect().find('li').last().click({ force: true });
+			WorkflowPage.getters.workflowSettingsSaveExecutionProgressSelect().click();
+			getVisibleSelect().find('li').should('have.length', 3);
+			getVisibleSelect().find('li').last().click({ force: true });
+			WorkflowPage.getters.workflowSettingsTimeoutWorkflowSwitch().click();
+			WorkflowPage.getters.workflowSettingsTimeoutForm().find('input').first().type('1');
+			// Save settings
+			WorkflowPage.getters.workflowSettingsSaveButton().click();
+			WorkflowPage.getters.workflowSettingsModal().should('not.exist');
+			WorkflowPage.getters.successToast().should('exist');
+		});
 	});
 
 	it('should not be able to delete unsaved workflow', () => {
@@ -208,7 +225,7 @@ describe('Workflow Actions', () => {
 				.find('.el-select__tags input')
 				.type(DUPLICATE_WORKFLOW_TAG);
 			WorkflowPage.getters.duplicateWorkflowModal().find('.el-select__tags input').type('{enter}');
-			WorkflowPage.getters.duplicateWorkflowModal().find('.el-select__tags input').type('{enter}');
+			WorkflowPage.getters.duplicateWorkflowModal().find('.el-select__tags input').type('{esc}');
 			WorkflowPage.getters
 				.duplicateWorkflowModal()
 				.find('button')
@@ -229,9 +246,46 @@ describe('Workflow Actions', () => {
 		it('should duplicate unsaved workflow', () => {
 			duplicateWorkflow();
 		});
+
 		it('should duplicate saved workflow', () => {
 			WorkflowPage.actions.saveWorkflowOnButtonClick();
 			duplicateWorkflow();
 		});
 	});
+
+	it('should keep endpoint click working when switching between execution and editor tab', () => {
+		cy.intercept('GET', '/rest/executions?filter=*').as('getExecutions');
+
+		WorkflowPage.actions.addInitialNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
+		WorkflowPage.actions.addNodeToCanvas(EDIT_FIELDS_SET_NODE_NAME);
+		WorkflowPage.actions.saveWorkflowOnButtonClick();
+
+		WorkflowPage.getters.canvasNodePlusEndpointByName(EDIT_FIELDS_SET_NODE_NAME).click();
+		WorkflowPage.getters.nodeCreatorSearchBar().should('be.visible');
+		cy.get('body').type('{esc}');
+
+		executionsTab.actions.switchToExecutionsTab();
+		cy.wait(['@getExecutions']);
+		cy.wait(500);
+		executionsTab.actions.switchToEditorTab();
+
+		WorkflowPage.getters.canvasNodePlusEndpointByName(EDIT_FIELDS_SET_NODE_NAME).click();
+		WorkflowPage.getters.nodeCreatorSearchBar().should('be.visible');
+	});
+});
+
+describe('Menu entry Push To Git', () => {
+	it('should not show up in the menu for members', () => {
+		cy.signin(INSTANCE_MEMBERS[0]);
+		cy.visit(WorkflowPages.url);
+		WorkflowPage.actions.visit();
+		WorkflowPage.getters.workflowMenuItemGitPush().should('not.exist');
+	});
+
+	it('should show up for owners', () => {
+		cy.signin(INSTANCE_OWNER);
+		cy.visit(WorkflowPages.url);
+		WorkflowPage.actions.visit();
+		WorkflowPage.getters.workflowMenuItemGitPush().should('exist');
+	});
 });
diff --git a/cypress/e2e/8-http-request-node.cy.ts b/cypress/e2e/8-http-request-node.cy.ts
index 9c3cce11e85c3..1567815ddf448 100644
--- a/cypress/e2e/8-http-request-node.cy.ts
+++ b/cypress/e2e/8-http-request-node.cy.ts
@@ -1,12 +1,13 @@
 import { WorkflowPage, NDV } from '../pages';
+import { NodeCreator } from '../pages/features/node-creator';
 
 const workflowPage = new WorkflowPage();
+const nodeCreatorFeature = new NodeCreator();
 const ndv = new NDV();
 
 describe('HTTP Request node', () => {
-	before(() => {
-		cy.resetAll();
-		cy.skipSetup();
+	beforeEach(() => {
+		workflowPage.actions.visit();
 	});
 
 	it('should make a request with a URL and receive a response', () => {
@@ -19,4 +20,40 @@ describe('HTTP Request node', () => {
 
 		ndv.getters.outputPanel().contains('fact');
 	});
+
+	describe('Credential-only HTTP Request Node variants', () => {
+		it('should render a modified HTTP Request Node', () => {
+			workflowPage.actions.addInitialNodeToCanvas('Manual');
+
+			workflowPage.getters.nodeCreatorPlusButton().click();
+			workflowPage.getters.nodeCreatorSearchBar().type('VirusTotal');
+
+			expect(nodeCreatorFeature.getters.nodeItemName().first().should('have.text', 'VirusTotal'));
+			expect(
+				nodeCreatorFeature.getters
+					.nodeItemDescription()
+					.first()
+					.should('have.text', 'HTTP request'),
+			);
+
+			nodeCreatorFeature.actions.selectNode('VirusTotal');
+			expect(ndv.getters.nodeNameContainer().should('contain.text', 'VirusTotal HTTP Request'));
+			expect(
+				ndv.getters
+					.parameterInput('url')
+					.find('input')
+					.should('contain.value', 'https://www.virustotal.com/api/v3/'),
+			);
+
+			// These parameters exist for normal HTTP Request Node, but are hidden for credential-only variants
+			expect(ndv.getters.parameterInput('authentication').should('not.exist'));
+			expect(ndv.getters.parameterInput('nodeCredentialType').should('not.exist'));
+
+			expect(
+				workflowPage.getters
+					.nodeCredentialsLabel()
+					.should('contain.text', 'Credential for VirusTotal'),
+			);
+		});
+	});
 });
diff --git a/cypress/e2e/9-expression-editor-modal.cy.ts b/cypress/e2e/9-expression-editor-modal.cy.ts
index 957c0505f5505..66758cabd3e0f 100644
--- a/cypress/e2e/9-expression-editor-modal.cy.ts
+++ b/cypress/e2e/9-expression-editor-modal.cy.ts
@@ -1,65 +1,117 @@
+import { NDV } from '../pages/ndv';
 import { WorkflowPage as WorkflowPageClass } from '../pages/workflow';
 
 const WorkflowPage = new WorkflowPageClass();
+const ndv = new NDV();
 
 describe('Expression editor modal', () => {
-	before(() => {
-		cy.resetAll();
-		cy.skipSetup();
-	});
-
 	beforeEach(() => {
 		WorkflowPage.actions.visit();
-		WorkflowPage.actions.addInitialNodeToCanvas('Manual');
-		WorkflowPage.actions.addNodeToCanvas('Hacker News');
-		WorkflowPage.actions.openNode('Hacker News');
-		WorkflowPage.actions.openExpressionEditorModal();
+		WorkflowPage.actions.addInitialNodeToCanvas('Schedule');
+		cy.on('uncaught:exception', (err) => err.name !== 'ExpressionError');
 	});
 
-	it('should resolve primitive resolvables', () => {
-		WorkflowPage.getters.expressionModalInput().clear();
-		WorkflowPage.getters.expressionModalInput().type('{{ 1 + 2');
-		WorkflowPage.getters.expressionModalOutput().contains(/^3$/);
-		WorkflowPage.getters.expressionModalInput().clear();
+	describe('Static data', () => {
+		beforeEach(() => {
+			WorkflowPage.actions.addNodeToCanvas('Hacker News');
+			WorkflowPage.actions.openNode('Hacker News');
+			WorkflowPage.actions.openExpressionEditorModal();
+		});
 
-		WorkflowPage.getters.expressionModalInput().type('{{ "ab" + "cd"');
-		WorkflowPage.getters.expressionModalOutput().contains(/^abcd$/);
+		it('should resolve primitive resolvables', () => {
+			WorkflowPage.getters.expressionModalInput().clear();
+			WorkflowPage.getters.expressionModalInput().type('{{ 1 + 2');
+			WorkflowPage.getters.expressionModalOutput().contains(/^3$/);
+			WorkflowPage.getters.expressionModalInput().clear();
 
-		WorkflowPage.getters.expressionModalInput().clear();
+			WorkflowPage.getters.expressionModalInput().type('{{ "ab" + "cd"');
+			WorkflowPage.getters.expressionModalOutput().contains(/^abcd$/);
 
-		WorkflowPage.getters.expressionModalInput().type('{{ true && false');
-		WorkflowPage.getters.expressionModalOutput().contains(/^false$/);
-	});
+			WorkflowPage.getters.expressionModalInput().clear();
 
-	it('should resolve object resolvables', () => {
-		WorkflowPage.getters.expressionModalInput().clear();
-		WorkflowPage.getters
-			.expressionModalInput()
-			.type('{{ { a : 1 }', { parseSpecialCharSequences: false });
-		WorkflowPage.getters.expressionModalOutput().contains(/^\[Object: \{"a": 1\}\]$/);
+			WorkflowPage.getters.expressionModalInput().type('{{ true && false');
+			WorkflowPage.getters.expressionModalOutput().contains(/^false$/);
+		});
 
-		WorkflowPage.getters.expressionModalInput().clear();
+		it('should resolve object resolvables', () => {
+			WorkflowPage.getters.expressionModalInput().clear();
+			WorkflowPage.getters
+				.expressionModalInput()
+				.type('{{ { a : 1 }', { parseSpecialCharSequences: false });
+			WorkflowPage.getters.expressionModalOutput().contains(/^\[Object: \{"a": 1\}\]$/);
 
-		WorkflowPage.getters
-			.expressionModalInput()
-			.type('{{ { a : 1 }.a', { parseSpecialCharSequences: false });
-		WorkflowPage.getters.expressionModalOutput().contains(/^1$/);
-	});
+			WorkflowPage.getters.expressionModalInput().clear();
+
+			WorkflowPage.getters
+				.expressionModalInput()
+				.type('{{ { a : 1 }.a', { parseSpecialCharSequences: false });
+			WorkflowPage.getters.expressionModalOutput().contains(/^1$/);
+		});
 
-	it('should resolve array resolvables', () => {
-		WorkflowPage.getters.expressionModalInput().clear();
-		WorkflowPage.getters.expressionModalInput().type('{{ [1, 2, 3]');
-		WorkflowPage.getters.expressionModalOutput().contains(/^\[Array: \[1,2,3\]\]$/);
+		it('should resolve array resolvables', () => {
+			WorkflowPage.getters.expressionModalInput().clear();
+			WorkflowPage.getters.expressionModalInput().type('{{ [1, 2, 3]');
+			WorkflowPage.getters.expressionModalOutput().contains(/^\[Array: \[1,2,3\]\]$/);
 
-		WorkflowPage.getters.expressionModalInput().clear();
+			WorkflowPage.getters.expressionModalInput().clear();
 
-		WorkflowPage.getters.expressionModalInput().type('{{ [1, 2, 3][0]');
-		WorkflowPage.getters.expressionModalOutput().contains(/^1$/);
+			WorkflowPage.getters.expressionModalInput().type('{{ [1, 2, 3][0]');
+			WorkflowPage.getters.expressionModalOutput().contains(/^1$/);
+		});
 	});
 
-	it('should resolve $parameter[]', () => {
-		WorkflowPage.getters.expressionModalInput().clear();
-		WorkflowPage.getters.expressionModalInput().type('{{ $parameter["operation"]');
-		WorkflowPage.getters.expressionModalOutput().contains(/^getAll$/);
+	describe('Dynamic data', () => {
+		beforeEach(() => {
+			WorkflowPage.actions.openNode('Schedule Trigger');
+			ndv.actions.setPinnedData([{ myStr: 'Monday' }]);
+			ndv.actions.close();
+			WorkflowPage.actions.addNodeToCanvas('No Operation');
+			WorkflowPage.actions.addNodeToCanvas('Hacker News');
+			WorkflowPage.actions.openNode('Hacker News');
+			WorkflowPage.actions.openExpressionEditorModal();
+		});
+
+		it('should resolve $parameter[]', () => {
+			WorkflowPage.getters.expressionModalInput().clear();
+			WorkflowPage.getters.expressionModalInput().type('{{ $parameter["operation"]');
+			WorkflowPage.getters.expressionModalOutput().should('have.text', 'getAll');
+		});
+
+		it('should resolve input: $json,$input,$(nodeName)', () => {
+			// Previous nodes have not run, input is empty
+			WorkflowPage.getters.expressionModalInput().clear();
+			WorkflowPage.getters.expressionModalInput().type('{{ $json.myStr');
+			WorkflowPage.getters
+				.expressionModalOutput()
+				.should('have.text', '[Execute previous nodes for preview]');
+			WorkflowPage.getters.expressionModalInput().clear();
+			WorkflowPage.getters.expressionModalInput().type('{{ $input.item.json.myStr');
+			WorkflowPage.getters
+				.expressionModalOutput()
+				.should('have.text', '[Execute previous nodes for preview]');
+			WorkflowPage.getters.expressionModalInput().clear();
+			WorkflowPage.getters.expressionModalInput().type("{{ $('Schedule Trigger').item.json.myStr");
+			WorkflowPage.getters
+				.expressionModalOutput()
+				.should('have.text', '[Execute previous nodes for preview]');
+
+			// Run workflow
+			cy.get('body').type('{esc}');
+			ndv.actions.close();
+			WorkflowPage.actions.executeNode('No Operation');
+			WorkflowPage.actions.openNode('Hacker News');
+			WorkflowPage.actions.openExpressionEditorModal();
+
+			// Previous nodes have run, input can be resolved
+			WorkflowPage.getters.expressionModalInput().clear();
+			WorkflowPage.getters.expressionModalInput().type('{{ $json.myStr');
+			WorkflowPage.getters.expressionModalOutput().should('have.text', 'Monday');
+			WorkflowPage.getters.expressionModalInput().clear();
+			WorkflowPage.getters.expressionModalInput().type('{{ $input.item.json.myStr');
+			WorkflowPage.getters.expressionModalOutput().should('have.text', 'Monday');
+			WorkflowPage.getters.expressionModalInput().clear();
+			WorkflowPage.getters.expressionModalInput().type("{{ $('Schedule Trigger').item.json.myStr");
+			WorkflowPage.getters.expressionModalOutput().should('have.text', 'Monday');
+		});
 	});
 });
diff --git a/cypress/fixtures/Check_manual_node_run_for_pinned_and_rundata.json b/cypress/fixtures/Check_manual_node_run_for_pinned_and_rundata.json
new file mode 100644
index 0000000000000..0236f38811bd8
--- /dev/null
+++ b/cypress/fixtures/Check_manual_node_run_for_pinned_and_rundata.json
@@ -0,0 +1,318 @@
+{
+  "name": "Webhook PairedItem error test",
+  "nodes": [
+    {
+      "parameters": {
+        "path": "86f05bcc-44a4-44f7-b774-7002fc2eddfc",
+        "options": {}
+      },
+      "id": "143572ab-f85b-4a6f-8ca7-4a5cea00a9fe",
+      "name": "Webhook",
+      "type": "n8n-nodes-base.webhook",
+      "typeVersion": 1.1,
+      "position": [
+        860,
+        140
+      ],
+      "webhookId": "86f05bcc-44a4-44f7-b774-7002fc2eddfc"
+    },
+    {
+      "parameters": {
+        "conditions": {
+          "options": {
+            "caseSensitive": true,
+            "leftValue": "",
+            "typeValidation": "strict"
+          },
+          "conditions": [
+            {
+              "id": "e9605092-a127-46ad-9fb3-e671f955f856",
+              "leftValue": "={{ $json.headers.host }}",
+              "rightValue": "asdf",
+              "operator": {
+                "type": "string",
+                "operation": "equals",
+                "name": "filter.operator.equals"
+              }
+            }
+          ],
+          "combinator": "and"
+        },
+        "options": {}
+      },
+      "id": "50542b55-4237-4c18-9e3a-5d146372c270",
+      "name": "If",
+      "type": "n8n-nodes-base.if",
+      "typeVersion": 2,
+      "position": [
+        1080,
+        140
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "c6365289-0383-4d73-bd5f-a52b6a6e1eeb",
+      "name": "No Operation, do nothing",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        1420,
+        20
+      ]
+    },
+    {
+      "parameters": {
+        "assignments": {
+          "assignments": [
+            {
+              "id": "1d65053c-31de-43e8-a870-e7e79d34ca67",
+              "name": "asdf",
+              "value": "={{ $('Webhook').item.json.headers['accept-encoding'] }}",
+              "type": "string"
+            }
+          ]
+        },
+        "options": {}
+      },
+      "id": "8fd60b5e-19eb-47f4-a3e2-3822c722a68a",
+      "name": "Edit Fields1",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.3,
+      "position": [
+        1860,
+        220
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "96ac4860-81eb-4d47-9a6e-7c717d910fcd",
+      "name": "NoOp1",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        1420,
+        220
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "5b550207-3f4f-4519-b272-ff02d9d28ffc",
+      "name": "NoOp3",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        2040,
+        220
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "9f450e47-902e-413e-99ce-ea93f6bc375e",
+      "name": "NoOp2",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        1640,
+        220
+      ]
+    },
+    {
+      "parameters": {
+        "assignments": {
+          "assignments": [
+            {
+              "id": "1d65053c-31de-43e8-a870-e7e79d34ca67",
+              "name": "asdf",
+              "value": "={{ $('Webhook').item.json.headers['accept-encoding'] }}",
+              "type": "string"
+            }
+          ]
+        },
+        "options": {}
+      },
+      "id": "7acd1642-a6ef-4c33-a562-95b19fedbded",
+      "name": "Edit Fields",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.3,
+      "position": [
+        2220,
+        220
+      ]
+    },
+    {
+      "parameters": {
+        "assignments": {
+          "assignments": [
+            {
+              "id": "1d65053c-31de-43e8-a870-e7e79d34ca67",
+              "name": "asdf",
+              "value": "={{ $('Webhook').item.json.headers['accept-encoding'] }}",
+              "type": "string"
+            }
+          ]
+        },
+        "options": {}
+      },
+      "id": "adc93a3b-2825-4ddf-9a17-fe61b5861d43",
+      "name": "Edit Fields2",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.3,
+      "position": [
+        1460,
+        440
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "1cd5d8dc-cd08-4596-9435-d48a6e20996d",
+      "name": "NoOp",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        1700,
+        480
+      ]
+    },
+    {
+      "parameters": {
+        "content": "For Error:\n1. Execute \"If\"\n2. Execute \"NoOp2\"\n"
+      },
+      "id": "658c3a31-b640-4338-8b22-6d0a17ab5b80",
+      "name": "Sticky Note",
+      "type": "n8n-nodes-base.stickyNote",
+      "typeVersion": 1,
+      "position": [
+        940,
+        480
+      ]
+    }
+  ],
+  "pinData": {
+    "Webhook": [
+      {
+        "json": {
+          "headers": {
+            "host": "localhost:5678",
+            "user-agent": "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:122.0) Gecko/20100101 Firefox/122.0",
+            "accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,*/*;q=0.8",
+            "accept-language": "en-US,en;q=0.5",
+            "accept-encoding": "gzip, deflate, br",
+            "connection": "keep-alive",
+            "cookie": "n8n-auth=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6ImQ1YWQzODQ1LWFmMTAtNDc2OC04ZDU4LTBmNDE3YTVlNDkxNSIsImVtYWlsIjoiamFuQG44bi5pbyIsInBhc3N3b3JkIjoiMzhjMTFiMDEwMjRlMDhiZTE0ZGExZjhmOWVjNGFmOTQxZmQwOGUyMzJmNWEzYmMyNjBmOTI1ZjIxNTBhNTZlYSIsImlhdCI6MTcwNzA3ODgxMSwiZXhwIjoxNzA3NjgzNjExfQ.bhbh8gCbLYAY87kPqZSGZeMBq7_4d9IgKnsrJ0UV4Iw",
+            "upgrade-insecure-requests": "1",
+            "sec-fetch-dest": "document",
+            "sec-fetch-mode": "navigate",
+            "sec-fetch-site": "none",
+            "sec-fetch-user": "?1",
+            "if-none-match": "W/\"22-6OS7cK0FzqnV2NeDHdOSGS1bVUs\""
+          },
+          "params": {},
+          "query": {},
+          "body": {}
+        }
+      }
+    ]
+  },
+  "connections": {
+    "Webhook": {
+      "main": [
+        [
+          {
+            "node": "If",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "If": {
+      "main": [
+        [
+          {
+            "node": "No Operation, do nothing",
+            "type": "main",
+            "index": 0
+          }
+        ],
+        [
+          {
+            "node": "NoOp1",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Edit Fields2",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "NoOp1": {
+      "main": [
+        [
+          {
+            "node": "NoOp2",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Edit Fields1": {
+      "main": [
+        [
+          {
+            "node": "NoOp3",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "NoOp2": {
+      "main": [
+        [
+          {
+            "node": "Edit Fields1",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "NoOp3": {
+      "main": [
+        [
+          {
+            "node": "Edit Fields",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Edit Fields2": {
+      "main": [
+        [
+          {
+            "node": "NoOp",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "631547ec-c580-4b5f-9220-7fd3d801029b",
+  "meta": {
+    "templateCredsSetupCompleted": true,
+    "instanceId": "021d3c82ba2d3bc090cbf4fc81c9312668bcc34297e022bb3438c5c88a43a5ff"
+  },
+  "id": "fjCAcetjbaYM1vy6",
+  "tags": []
+}
\ No newline at end of file
diff --git a/cypress/fixtures/Dummy_javascript.txt b/cypress/fixtures/Dummy_javascript.txt
new file mode 100644
index 0000000000000..9ccfe6c5d1417
--- /dev/null
+++ b/cypress/fixtures/Dummy_javascript.txt
@@ -0,0 +1,42 @@
+var File = function(url, object){
+	File.list = Array.isArray(File.list)? File.list : [];
+	File.progress = File.progress || 0;
+	this.progress = 0;
+	this.object = object;
+	this.url = url;
+};
+
+File.indexOf = function(term){
+	for(var index in File.list){
+		var file = File.list[index];
+		if (file.equals(term) || file.url === term || file.object === term) {
+			return index;
+		}
+	}
+	return -1;
+};
+
+File.find = function(term){
+	var index = File.indexOf(term);
+	return ~index && File.list[index];
+};
+
+File.prototype.equals = function(file){
+	var isFileType = file instanceof File;
+	return isFileType && this.url === file.url && this.object === file.object;
+};
+
+File.prototype.save = function(update){
+	update = typeof update === 'undefined'? true : update;
+	if(Array.isArray(File.list)){
+		var index = File.indexOf(this);
+		if(~index && update) {
+			File.list[index] = this;
+			console.warn('File `%s` has been loaded before and updated now for: %O.', this.url, this);
+		}else File.list.push(this);
+		console.log(File.list)
+	}else{
+		File.list = [this];
+	}
+	return this;
+};
diff --git a/cypress/fixtures/Dummy_sql.txt b/cypress/fixtures/Dummy_sql.txt
new file mode 100644
index 0000000000000..c8976be22916f
--- /dev/null
+++ b/cypress/fixtures/Dummy_sql.txt
@@ -0,0 +1,49 @@
+CREATE TABLE emp (
+empno INT PRIMARY KEY,
+ename VARCHAR(10),
+job VARCHAR(9),
+mgr INT NULL,
+hiredate DATETIME,
+sal NUMERIC(7,2),
+comm NUMERIC(7,2) NULL,
+dept INT)
+begin
+insert into emp values
+    (1,'JOHNSON','ADMIN',6,'12-17-1990',18000,NULL,4)
+insert into emp values
+    (2,'HARDING','MANAGER',9,'02-02-1998',52000,300,3)
+insert into emp values
+    (3,'TAFT','SALES I',2,'01-02-1996',25000,500,3)
+insert into emp values
+    (4,'HOOVER','SALES I',2,'04-02-1990',27000,NULL,3)
+insert into emp values
+    (5,'LINCOLN','TECH',6,'06-23-1994',22500,1400,4)
+insert into emp values
+    (6,'GARFIELD','MANAGER',9,'05-01-1993',54000,NULL,4)
+insert into emp values
+    (7,'POLK','TECH',6,'09-22-1997',25000,NULL,4)
+insert into emp values
+    (8,'GRANT','ENGINEER',10,'03-30-1997',32000,NULL,2)
+insert into emp values
+    (9,'JACKSON','CEO',NULL,'01-01-1990',75000,NULL,4)
+insert into emp values
+    (10,'FILLMORE','MANAGER',9,'08-09-1994',56000,NULL,2)
+insert into emp values
+    (11,'ADAMS','ENGINEER',10,'03-15-1996',34000,NULL,2)
+insert into emp values
+    (12,'WASHINGTON','ADMIN',6,'04-16-1998',18000,NULL,4)
+insert into emp values
+    (13,'MONROE','ENGINEER',10,'12-03-2000',30000,NULL,2)
+insert into emp values
+    (14,'ROOSEVELT','CPA',9,'10-12-1995',35000,NULL,1)
+end
+CREATE TABLE dept (
+deptno INT NOT NULL,
+dname VARCHAR(14),
+loc VARCHAR(13))
+begin
+insert into dept values (1,'ACCOUNTING','ST LOUIS')
+insert into dept values (2,'RESEARCH','NEW YORK')
+insert into dept values (3,'SALES','ATLANTA')
+insert into dept values (4, 'OPERATIONS','SEATTLE')
+end
diff --git a/cypress/fixtures/Ecommerce_starter_pack_template_collection.json b/cypress/fixtures/Ecommerce_starter_pack_template_collection.json
new file mode 100644
index 0000000000000..1f908c587bae5
--- /dev/null
+++ b/cypress/fixtures/Ecommerce_starter_pack_template_collection.json
@@ -0,0 +1 @@
+{"collection":{"id":1,"name":"eCommerce Starter Pack","description":"eCommerce operations are complex — but there are many things that you can automate to make your life easier. This collection provides a few ideas to get started.\n\nReduce manual work and the risk of human error by automating processes such as social media promotion of products, updating customer databases, and get notifications for important events.","totalViews":0,"createdAt":"2022-02-17T12:40:50.498Z","nodes":[{"id":20,"name":"n8n-nodes-base.if","defaults":{"name":"IF","color":"#408000"},"displayName":"IF","icon":"fa:map-signs","iconData":{"icon":"map-signs","type":"icon"},"typeVersion":1,"categories":[{"id":9,"name":"Core Nodes"}]},{"id":49,"name":"n8n-nodes-base.telegram","defaults":{"name":"Telegram"},"displayName":"Telegram","icon":"file:telegram.svg","iconData":{"type":"file","fileBuffer":"data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgNjYgNjYiIGZpbGw9IiNmZmYiIGZpbGwtcnVsZT0iZXZlbm9kZCIgc3Ryb2tlPSIjMDAwIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiPjx1c2UgeGxpbms6aHJlZj0iI2EiIHg9Ii41IiB5PSIuNSIvPjxzeW1ib2wgaWQ9ImEiIG92ZXJmbG93PSJ2aXNpYmxlIj48ZyBzdHJva2U9Im5vbmUiIGZpbGwtcnVsZT0ibm9uemVybyI+PHBhdGggZD0iTTAgMzJjMCAxNy42NzMgMTQuMzI3IDMyIDMyIDMyczMyLTE0LjMyNyAzMi0zMlM0OS42NzMgMCAzMiAwIDAgMTQuMzI3IDAgMzIiIGZpbGw9IiMzN2FlZTIiLz48cGF0aCBkPSJNMjEuNjYxIDM0LjMzOGwzLjc5NyAxMC41MDhzLjQ3NS45ODMuOTgzLjk4MyA4LjA2OC03Ljg2NCA4LjA2OC03Ljg2NGw4LjQwNy0xNi4yMzctMjEuMTE5IDkuODk4eiIgZmlsbD0iI2M4ZGFlYSIvPjxwYXRoIGQ9Ik0yNi42OTUgMzcuMDM0bC0uNzI5IDcuNzQ2cy0uMzA1IDIuMzczIDIuMDY4IDBsNC42NDQtNC4yMDMiIGZpbGw9IiNhOWM2ZDgiLz48cGF0aCBkPSJNMjEuNzMgMzQuNzEybC03LjgwOS0yLjU0NXMtLjkzMi0uMzc4LS42MzMtMS4yMzdjLjA2Mi0uMTc3LjE4Ni0uMzI4LjU1OS0uNTg4IDEuNzMxLTEuMjA2IDMyLjAyOC0xMi4wOTYgMzIuMDI4LTEyLjA5NnMuODU2LS4yODggMS4zNjEtLjA5N2MuMjMxLjA4OC4zNzguMTg3LjUwMy41NDguMDQ1LjEzMi4wNzEuNDExLjA2OC42ODktLjAwMy4yMDEtLjAyNy4zODYtLjA0NS42NzgtLjE4NCAyLjk3OC01LjcwNiAyNS4xOTgtNS43MDYgMjUuMTk4cy0uMzMgMS4zLTEuNTE0IDEuMzQ1Yy0uNDMyLjAxNi0uOTU2LS4wNzEtMS41ODItLjYxLTIuMzIzLTEuOTk4LTEwLjM1Mi03LjM5NC0xMi4xMjYtOC41OGEuMzQuMzQgMCAwMS0uMTQ2LS4yMzljLS4wMjUtLjEyNS4xMDgtLjI4LjEwOC0uMjhzMTMuOTgtMTIuNDI3IDE0LjM1Mi0xMy43MzFjLjAyOS0uMTAxLS4wNzktLjE1MS0uMjI2LS4xMDctLjkyOS4zNDItMTcuMDI1IDEwLjUwNi0xOC44MDEgMTEuNjI5LS4xMDQuMDY2LS4zOTUuMDIzLS4zOTUuMDIzIi8+PC9nPjwvc3ltYm9sPjwvc3ZnPg=="},"typeVersion":1,"categories":[{"id":6,"name":"Communication"}]},{"id":107,"name":"n8n-nodes-base.shopifyTrigger","defaults":{"name":"Shopify Trigger"},"displayName":"Shopify Trigger","icon":"file:shopify.svg","iconData":{"type":"file","fileBuffer":"data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgNTggNjYiIGZpbGw9IiNmZmYiIGZpbGwtcnVsZT0iZXZlbm9kZCIgc3Ryb2tlPSIjMDAwIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiPjx1c2UgeGxpbms6aHJlZj0iI2EiIHg9Ii41IiB5PSIuNSIvPjxzeW1ib2wgaWQ9ImEiIG92ZXJmbG93PSJ2aXNpYmxlIj48ZyBzdHJva2U9Im5vbmUiIGZpbGwtcnVsZT0ibm9uemVybyI+PHBhdGggZD0iTTQ5LjI1NSAxMi40ODRhLjYzMy42MzMgMCAwMC0uNTY0LS41MjdjLS4yMjUtLjAzNy01LjE3LS4zNzYtNS4xNy0uMzc2bC0zLjc3LTMuNzdjLS4zNC0uMzc2LTEuMDkyLS4yNjYtMS4zNzYtLjE4OC0uMDM3IDAtLjc1Mi4yMjUtMS45MjIuNjA1LTEuMTM3LTMuMy0zLjE1LTYuMzA2LTYuNjk2LTYuMzA2aC0uMzAzQzI4LjQzOC42MDUgMjcuMTk0IDAgMjYuMTQ0IDBjLTguMjU2LjAzNy0xMi4yIDEwLjMzMy0xMy40MzQgMTUuNTk0bC01Ljc3IDEuNzdjLTEuNzcuNTY0LTEuODM1LjYwNS0yLjA3MyAyLjI5M0wwIDU3LjE3NSAzNi40NjggNjRsMTkuNzYzLTQuMjZjMC0uMDM3LTYuOTQtNDYuODk3LTYuOTc2LTQ3LjI1NXpNMzQuNDMxIDguODZjLS45MTcuMzAzLTEuOTYzLjYwNS0zLjEuOTQ1di0uNjhhMTUuMDMgMTUuMDMgMCAwMC0uNzUyLTQuOTk5YzEuODQ4LjI4NCAzLjEgMi4zNTcgMy44NDMgNC43MzN6bS02LjA2OC00LjI5OGMuNjAzIDEuNzc4Ljg4MyAzLjY1LjgyNiA1LjUyN3YuMzRsLTYuMzc1IDEuOTYzYzEuMjQ4LTQuNjYgMy41NS02Ljk2MiA1LjU1LTcuODN6bS0yLjQ1LTIuMjkzYTEuOTQgMS45NCAwIDAxMS4wNTUuMzM5Yy0yLjY2IDEuMjM4LTUuNDcyIDQuMzY2LTYuNjc4IDEwLjYyN2wtNS4wNDUgMS41NDZDMTYuNjY4IDEwLjAzIDE5Ljk4OCAyLjI2IDI1LjkxIDIuMjZ6IiBmaWxsPSIjOTViZjQ3Ii8+PHBhdGggZD0iTTQ4LjY5MSAxMS45NTdjLS4yMjUtLjAzNy01LjE3LS4zNzYtNS4xNy0uMzc2bC0zLjc3LTMuNzdhLjc1My43NTMgMCAwMC0uNTI3LS4yMjVMMzYuNDcyIDY0bDE5Ljc2My00LjI2LTYuOTgtNDcuMjE4YS42OC42OCAwIDAwLS41NjQtLjU2NHoiIGZpbGw9IiM1ZThlM2UiLz48cGF0aCBkPSJNMjkuNzU4IDIyLjlsLTIuNDU0IDcuMjQyYTExLjM2IDExLjM2IDAgMDAtNC43NTItMS4xMzNjLTMuODQ4IDAtNC4wMzYgMi40MTItNC4wMzYgMy4wMTggMCAzLjI5OCA4LjYzNiA0LjU2NCA4LjYzNiAxMi4zMzMgMCA2LjEtMy44ODUgMTAuMDMtOS4xIDEwLjAzLTYuMjYgMC05LjQ2Ny0zLjg4NS05LjQ2Ny0zLjg4NWwxLjY2NS01LjU1czMuMjggMi44MyA2LjA3MyAyLjgzYTIuNDcgMi40NyAwIDAwMi41NjQtMi40OWMwLTQuMzQtNy4xLTQuNTI3LTcuMS0xMS42MTggMC01Ljk2MiA0LjI5OC0xMS43NyAxMi45MzQtMTEuNzcgMy4zOTQuMDUgNS4wMTggMSA1LjAxOCAxeiIvPjwvZz48L3N5bWJvbD48L3N2Zz4="},"typeVersion":1,"categories":[{"id":2,"name":"Sales"}]},{"id":126,"name":"n8n-nodes-base.mautic","defaults":{"name":"Mautic"},"displayName":"Mautic","icon":"file:mautic.svg","iconData":{"type":"file","fileBuffer":"data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxNi4wLjAsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+DQo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkxheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4Ig0KCSB3aWR0aD0iMzQ5Ljc3OXB4IiBoZWlnaHQ9IjM0OS43NzlweCIgdmlld0JveD0iMCAwIDM0OS43NzkgMzQ5Ljc3OSIgZW5hYmxlLWJhY2tncm91bmQ9Im5ldyAwIDAgMzQ5Ljc3OSAzNDkuNzc5Ig0KCSB4bWw6c3BhY2U9InByZXNlcnZlIj4NCjxwYXRoIGZpbGw9IiNGRkZGRkYiIGQ9Ik0xNzQuODksMzQ5Ljc3OUM3OC42MTIsMzQ5Ljc3OSwwLDI3MS40NjIsMCwxNzQuODlTNzguNjEyLDAsMTc0Ljg5LDBjMjMuMjYsMCw0NS45MzEsNC40MTcsNjcuMTI5LDEzLjU0Mw0KCWM1Ljg4OSwyLjY1LDguODMzLDkuNDIyLDYuNDc4LDE1LjYwNWMtMi42NDksNS44ODgtOS40MjEsOC44MzMtMTUuNjA0LDYuNDc3Yy0xOC41NDktNy42NTUtMzcuOTgtMTEuNDgyLTU4LjAwMi0xMS40ODINCgljLTgzLjMyMywwLTE1MS4wNDEsNjcuNzE4LTE1MS4wNDEsMTUxLjA0MVM5MS41NjcsMzI2LjIyNSwxNzQuODksMzI2LjIyNWM4My4zMjMsMCwxNTEuMDQxLTY3LjcxOCwxNTEuMDQxLTE1MS4wNDENCgljMC0xNy45Ni0yLjk0NC0zNS4zMzItOS4xMjctNTEuODE5Yy0yLjM1NS02LjE4MywwLjg4My0xMi45NTUsNy4wNjYtMTUuMzFjNi4xODMtMi4zNTUsMTIuOTU0LDAuODgzLDE1LjMxLDcuMDY2DQoJYzcuMDY2LDE5LjEzOCwxMC42LDM5LjQ1MywxMC42LDYwLjA2M0MzNDkuNzc5LDI3MS4xNjcsMjcxLjQ2MiwzNDkuNzc5LDE3NC44OSwzNDkuNzc5Ii8+DQo8Zz4NCgk8cG9seWdvbiBmaWxsPSIjRkRCOTMzIiBwb2ludHM9IjI1MS40NCwxNTYuOTMgMjI0LjM1NCwxODUuMTk0IDIzOS4zNjksMjQ4LjQ5NiAyNzMuNTIyLDI0OC40OTYgCSIvPg0KPC9nPg0KPHBvbHlnb24gZmlsbD0iI0ZEQjkzMyIgcG9pbnRzPSIyNDAuMjUzLDczLjMxMiAyNDkuNjc0LDgyLjczNCAxNzQuODksMTYxLjkzNSAxMTAuOTk5LDk2LjI3NyA3NC4xOTYsMjQ4LjQ5NiAxMDguMzUsMjQ4LjQ5NiANCgkxMjguNjY1LDE2My45OTYgMTc0Ljg5LDIxNC4zNDMgMjczLjgxNywxMDYuNTgzIDI4My4yMzksMTE2LjI5OSAyOTIuNjYsNjMuMDA3ICIvPg0KPC9zdmc+DQo="},"typeVersion":1,"categories":[{"id":1,"name":"Marketing & Content"},{"id":6,"name":"Communication"}]},{"id":235,"name":"n8n-nodes-base.wooCommerceTrigger","defaults":{"name":"WooCommerce Trigger"},"displayName":"WooCommerce Trigger","icon":"file:wooCommerce.svg","iconData":{"type":"file","fileBuffer":"data:image/svg+xml;base64,PHN2ZyBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWlkWU1pZCIgdmVyc2lvbj0iMS4xIiB2aWV3Qm94PSIwIC01MCAyNTYgMjUzIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOmNjPSJodHRwOi8vY3JlYXRpdmVjb21tb25zLm9yZy9ucyMiIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KPHRpdGxlPldvb0NvbW1lcmNlIExvZ288L3RpdGxlPgo8bWV0YWRhdGE+CjxyZGY6UkRGPgo8Y2M6V29yayByZGY6YWJvdXQ9IiI+CjxkYzpmb3JtYXQ+aW1hZ2Uvc3ZnK3htbDwvZGM6Zm9ybWF0Pgo8ZGM6dHlwZSByZGY6cmVzb3VyY2U9Imh0dHA6Ly9wdXJsLm9yZy9kYy9kY21pdHlwZS9TdGlsbEltYWdlIi8+CjxkYzp0aXRsZS8+CjwvY2M6V29yaz4KPC9yZGY6UkRGPgo8L21ldGFkYXRhPgo8cGF0aCBkPSJtMjMuNzU5IDBoMjA4LjM4YzEzLjE4NyAwIDIzLjg2MyAxMC42NzUgMjMuODYzIDIzLjg2M3Y3OS41NDJjMCAxMy4xODctMTAuNjc1IDIzLjg2My0yMy44NjMgMjMuODYzaC03NC43MjdsMTAuMjU3IDI1LjExOC00NS4xMDktMjUuMTE4aC05OC42OTVjLTEzLjE4NyAwLTIzLjg2My0xMC42NzUtMjMuODYzLTIzLjg2M3YtNzkuNTQyYy0wLjEwNDY2LTEzLjA4MyAxMC41NzEtMjMuODYzIDIzLjc1OC0yMy44NjN6IiBmaWxsPSIjN2Y1NGIzIi8+CjxwYXRoIGQ9Im0xNC41NzggMjEuNzVjMS40NTY5LTEuOTc3MiAzLjY0MjMtMy4wMTc5IDYuNTU2MS0zLjIyNiA1LjMwNzMtMC40MTYyNiA4LjMyNTIgMi4wODEzIDkuMDUzNyA3LjQ5MjcgMy4yMjYgMjEuNzUgNi43NjQyIDQwLjE2OSAxMC41MTEgNTUuMjU5bDIyLjc5LTQzLjM5NWMyLjA4MTMtMy45NTQ1IDQuNjgyOS02LjAzNTggNy44MDQ5LTYuMjQzOSA0LjU3ODktMC4zMTIyIDcuMzg4NiAyLjYwMTYgOC41MzMzIDguNzQxNSAyLjYwMTYgMTMuODQxIDUuOTMxNyAyNS42IDkuODg2MiAzNS41OSAyLjcwNTctMjYuNDMzIDcuMjg0Ni00NS40NzYgMTMuNzM3LTU3LjIzNiAxLjU2MS0yLjkxMzggMy44NTA0LTQuMzcwNyA2Ljg2ODMtNC41Nzg5IDIuMzkzNS0wLjIwODEzIDQuNTc4OSAwLjUyMDMzIDYuNTU2MSAyLjA4MTMgMS45NzcyIDEuNTYxIDMuMDE3OSAzLjUzODIgMy4yMjYgNS45MzE3IDAuMTA0MDYgMS44NzMyLTAuMjA4MTMgMy40MzQxLTEuMDQwNyA0Ljk5NTEtNC4wNTg1IDcuNDkyNy03LjM4ODYgMjAuMDg1LTEwLjA5NCAzNy41NjctMi42MDE2IDE2Ljk2My0zLjUzODIgMzAuMTc5LTIuOTEzOCAzOS42NDkgMC4yMDgxMyAyLjYwMTYtMC4yMDgxMyA0Ljg5MTEtMS4yNDg4IDYuODY4My0xLjI0ODggMi4yODk0LTMuMTIyIDMuNTM4Mi01LjUxNTQgMy43NDYzLTIuNzA1NyAwLjIwODEzLTUuNTE1NC0xLjA0MDYtOC4yMjExLTMuODUwNC05LjY3OC05Ljg4NjItMTcuMzc5LTI0LjY2My0yMi45OTgtNDQuMzMyLTYuNzY0MiAxMy4zMi0xMS43NTkgMjMuMzExLTE0Ljk4NSAyOS45NzEtNi4xMzk4IDExLjc1OS0xMS4zNDMgMTcuNzk1LTE1LjcxNCAxOC4xMDctMi44MDk4IDAuMjA4MTMtNS4yMDMzLTIuMTg1NC03LjI4NDYtNy4xODA1LTUuMzA3My0xMy42MzMtMTEuMDMxLTM5Ljk2MS0xNy4xNzEtNzguOTg1LTAuNDE2MjYtMi43MDU3IDAuMjA4MTMtNS4wOTkyIDEuNjY1LTYuOTcyNHptMjIzLjY0IDE2LjMzOGMtMy43NDYzLTYuNTU2MS05LjI2MTgtMTAuNTExLTE2LjY1LTEyLjA3Mi0xLjk3NzItMC40MTYyNi0zLjg1MDQtMC42MjQzOS01LjYxOTUtMC42MjQzOS05Ljk5MDIgMC0xOC4xMDcgNS4yMDMzLTI0LjQ1NSAxNS42MS01LjQxMTQgOC44NDU1LTguMTE3MSAxOC42MjgtOC4xMTcxIDI5LjM0NiAwIDguMDEzIDEuNjY1IDE0Ljg4MSA0Ljk5NTEgMjAuNjA1IDMuNzQ2MyA2LjU1NjEgOS4yNjE4IDEwLjUxMSAxNi42NSAxMi4wNzIgMS45NzcyIDAuNDE2MjYgMy44NTA0IDAuNjI0MzkgNS42MTk1IDAuNjI0MzkgMTAuMDk0IDAgMTguMjExLTUuMjAzMyAyNC40NTUtMTUuNjEgNS40MTE0LTguOTQ5NiA4LjExNzEtMTguNzMyIDguMTE3MS0yOS40NSAwLjEwNDA2LTguMTE3MS0xLjY2NS0xNC44ODEtNC45OTUxLTIwLjUwMXptLTEzLjExMiAyOC44MjZjLTEuNDU2OSA2Ljg2ODMtNC4wNTg1IDExLjk2Ny03LjkwODkgMTUuNDAyLTMuMDE3OSAyLjcwNTctNS44Mjc2IDMuODUwNC04LjQyOTMgMy4zMzAxLTIuNDk3Ni0wLjUyMDMzLTQuNTc4OS0yLjcwNTctNi4xMzk4LTYuNzY0Mi0xLjI0ODgtMy4yMjYtMS44NzMyLTYuNDUyLTEuODczMi05LjQ2OTkgMC0yLjYwMTYgMC4yMDgxMy01LjIwMzMgMC43Mjg0Ni03LjU5NjcgMC45MzY1OS00LjI2NjcgMi43MDU3LTguNDI5MyA1LjUxNTQtMTIuMzg0IDMuNDM0MS01LjA5OTIgNy4wNzY0LTcuMTgwNSAxMC44MjMtNi40NTIgMi40OTc2IDAuNTIwMzMgNC41Nzg5IDIuNzA1NyA2LjEzOTggNi43NjQyIDEuMjQ4OCAzLjIyNiAxLjg3MzIgNi40NTIgMS44NzMyIDkuNDY5OSAwIDIuNzA1Ny0wLjIwODEzIDUuMzA3My0wLjcyODQ2IDcuNzAwOHptLTUyLjAzMy0yOC44MjZjLTMuNzQ2My02LjU1NjEtOS4zNjU5LTEwLjUxMS0xNi42NS0xMi4wNzItMS45NzcyLTAuNDE2MjYtMy44NTA0LTAuNjI0MzktNS42MTk1LTAuNjI0MzktOS45OTAyIDAtMTguMTA3IDUuMjAzMy0yNC40NTUgMTUuNjEtNS40MTE0IDguODQ1NS04LjExNzEgMTguNjI4LTguMTE3MSAyOS4zNDYgMCA4LjAxMyAxLjY2NSAxNC44ODEgNC45OTUxIDIwLjYwNSAzLjc0NjMgNi41NTYxIDkuMjYxOCAxMC41MTEgMTYuNjUgMTIuMDcyIDEuOTc3MiAwLjQxNjI2IDMuODUwNCAwLjYyNDM5IDUuNjE5NSAwLjYyNDM5IDEwLjA5NCAwIDE4LjIxMS01LjIwMzMgMjQuNDU1LTE1LjYxIDUuNDExNC04Ljk0OTYgOC4xMTcxLTE4LjczMiA4LjExNzEtMjkuNDUgMC04LjExNzEtMS42NjUtMTQuODgxLTQuOTk1MS0yMC41MDF6bS0xMy4yMTYgMjguODI2Yy0xLjQ1NjkgNi44NjgzLTQuMDU4NSAxMS45NjctNy45MDg5IDE1LjQwMi0zLjAxNzkgMi43MDU3LTUuODI3NiAzLjg1MDQtOC40MjkzIDMuMzMwMS0yLjQ5NzYtMC41MjAzMy00LjU3ODktMi43MDU3LTYuMTM5OC02Ljc2NDItMS4yNDg4LTMuMjI2LTEuODczMi02LjQ1Mi0xLjg3MzItOS40Njk5IDAtMi42MDE2IDAuMjA4MTMtNS4yMDMzIDAuNzI4NDYtNy41OTY3IDAuOTM2NTgtNC4yNjY3IDIuNzA1Ny04LjQyOTMgNS41MTU0LTEyLjM4NCAzLjQzNDEtNS4wOTkyIDcuMDc2NC03LjE4MDUgMTAuODIzLTYuNDUyIDIuNDk3NiAwLjUyMDMzIDQuNTc4OSAyLjcwNTcgNi4xMzk4IDYuNzY0MiAxLjI0ODggMy4yMjYgMS44NzMyIDYuNDUyIDEuODczMiA5LjQ2OTkgMC4xMDQwNiAyLjcwNTctMC4yMDgxMyA1LjMwNzMtMC43Mjg0NiA3LjcwMDh6IiBmaWxsPSIjZmZmIi8+Cjwvc3ZnPgo="},"typeVersion":1,"categories":[{"id":2,"name":"Sales"}]},{"id":325,"name":"n8n-nodes-base.twitter","defaults":{"name":"X"},"displayName":"X (Formerly Twitter)","icon":"file:x.svg","iconData":{"type":"file","fileBuffer":"data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgMjQgMjQiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PHBhdGggZD0iTTE4LjI0NCAyLjI1aDMuMzA4bC03LjIyNyA4LjI2IDguNTAyIDExLjI0SDE2LjE3bC01LjIxNC02LjgxN0w0Ljk5IDIxLjc1SDEuNjhsNy43My04LjgzNUwxLjI1NCAyLjI1SDguMDhsNC43MTMgNi4yMzF6bS0xLjE2MSAxNy41MmgxLjgzM0w3LjA4NCA0LjEyNkg1LjExN3oiPjwvcGF0aD48L3N2Zz4K"},"typeVersion":2,"categories":[{"id":1,"name":"Marketing & Content"}]}],"categories":[{"id":2,"name":"Sales"}],"workflows":[{"id":1205,"name":"Promote new Shopify products on Twitter and Telegram","views":485,"recentViews":9850,"totalViews":485,"createdAt":"2021-08-24T10:40:50.007Z","description":"This workflow automatically promotes your new Shopify products on Twitter and Telegram. This workflow is also featured in the blog post [*6 e-commerce workflows to power up your Shopify store*](https://n8n.io/blog/no-code-ecommerce-workflow-automations/#promote-your-new-products-on-social-media).\n\n## Prerequisites\n\n- A Shopify account and [credentials](https://docs.n8n.io/integrations/credentials/shopify/)\n- A Twitter account and [credentials](https://docs.n8n.io/integrations/credentials/twitter/)\n- A Telegram account and [credentials](https://docs.n8n.io/integrations/credentials/telegram/) for the channel you want to send messages to.\n\n## Nodes\n\n- [Shopify Trigger node](https://docs.n8n.io/integrations/trigger-nodes/n8n-nodes-base.shopifytrigger/) triggers the workflow when you create a new product in Shopify.\n- [Twitter node](https://docs.n8n.io/integrations/nodes/n8n-nodes-base.twitter/) posts a tweet with the text \"Hey there, my design is now on a new product! Visit my {shop name} to get this cool {product title} (and check out more {product type})\".\n- [Telegram node](https://docs.n8n.io/integrations/nodes/n8n-nodes-base.telegram/) posts a message with the same text as above in a Telegram channel.","workflow":{"nodes":[{"name":"Twitter","type":"n8n-nodes-base.twitter","position":[720,-220],"parameters":{"text":"=Hey there, my design is now on a new product ✨\nVisit my {{$json[\"vendor\"]}} shop to get this cool{{$json[\"title\"]}} (and check out more {{$json[\"product_type\"]}}) 🛍️","additionalFields":{}},"credentials":{"twitterOAuth1Api":"twitter"},"typeVersion":1},{"name":"Telegram","type":"n8n-nodes-base.telegram","position":[720,-20],"parameters":{"text":"=Hey there, my design is now on a new product!\nVisit my {{$json[\"vendor\"]}} shop to get this cool{{$json[\"title\"]}} (and check out more {{$json[\"product_type\"]}})","chatId":"123456","additionalFields":{}},"credentials":{"telegramApi":"telegram_habot"},"typeVersion":1},{"name":"product created","type":"n8n-nodes-base.shopifyTrigger","position":[540,-110],"webhookId":"2a7e0e50-8f09-4a2b-bf54-a849a6ac4fe0","parameters":{"topic":"products/create"},"credentials":{"shopifyApi":"shopify_nodeqa"},"typeVersion":1}],"connections":{"product created":{"main":[[{"node":"Twitter","type":"main","index":0},{"node":"Telegram","type":"main","index":0}]]}}},"workflowInfo":{"nodeCount":3,"nodeTypes":{"n8n-nodes-base.twitter":{"count":1},"n8n-nodes-base.telegram":{"count":1},"n8n-nodes-base.shopifyTrigger":{"count":1}}},"user":{"username":"lorenanda"},"nodes":[{"id":49,"icon":"file:telegram.svg","name":"n8n-nodes-base.telegram","defaults":{"name":"Telegram"},"iconData":{"type":"file","fileBuffer":"data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgNjYgNjYiIGZpbGw9IiNmZmYiIGZpbGwtcnVsZT0iZXZlbm9kZCIgc3Ryb2tlPSIjMDAwIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiPjx1c2UgeGxpbms6aHJlZj0iI2EiIHg9Ii41IiB5PSIuNSIvPjxzeW1ib2wgaWQ9ImEiIG92ZXJmbG93PSJ2aXNpYmxlIj48ZyBzdHJva2U9Im5vbmUiIGZpbGwtcnVsZT0ibm9uemVybyI+PHBhdGggZD0iTTAgMzJjMCAxNy42NzMgMTQuMzI3IDMyIDMyIDMyczMyLTE0LjMyNyAzMi0zMlM0OS42NzMgMCAzMiAwIDAgMTQuMzI3IDAgMzIiIGZpbGw9IiMzN2FlZTIiLz48cGF0aCBkPSJNMjEuNjYxIDM0LjMzOGwzLjc5NyAxMC41MDhzLjQ3NS45ODMuOTgzLjk4MyA4LjA2OC03Ljg2NCA4LjA2OC03Ljg2NGw4LjQwNy0xNi4yMzctMjEuMTE5IDkuODk4eiIgZmlsbD0iI2M4ZGFlYSIvPjxwYXRoIGQ9Ik0yNi42OTUgMzcuMDM0bC0uNzI5IDcuNzQ2cy0uMzA1IDIuMzczIDIuMDY4IDBsNC42NDQtNC4yMDMiIGZpbGw9IiNhOWM2ZDgiLz48cGF0aCBkPSJNMjEuNzMgMzQuNzEybC03LjgwOS0yLjU0NXMtLjkzMi0uMzc4LS42MzMtMS4yMzdjLjA2Mi0uMTc3LjE4Ni0uMzI4LjU1OS0uNTg4IDEuNzMxLTEuMjA2IDMyLjAyOC0xMi4wOTYgMzIuMDI4LTEyLjA5NnMuODU2LS4yODggMS4zNjEtLjA5N2MuMjMxLjA4OC4zNzguMTg3LjUwMy41NDguMDQ1LjEzMi4wNzEuNDExLjA2OC42ODktLjAwMy4yMDEtLjAyNy4zODYtLjA0NS42NzgtLjE4NCAyLjk3OC01LjcwNiAyNS4xOTgtNS43MDYgMjUuMTk4cy0uMzMgMS4zLTEuNTE0IDEuMzQ1Yy0uNDMyLjAxNi0uOTU2LS4wNzEtMS41ODItLjYxLTIuMzIzLTEuOTk4LTEwLjM1Mi03LjM5NC0xMi4xMjYtOC41OGEuMzQuMzQgMCAwMS0uMTQ2LS4yMzljLS4wMjUtLjEyNS4xMDgtLjI4LjEwOC0uMjhzMTMuOTgtMTIuNDI3IDE0LjM1Mi0xMy43MzFjLjAyOS0uMTAxLS4wNzktLjE1MS0uMjI2LS4xMDctLjkyOS4zNDItMTcuMDI1IDEwLjUwNi0xOC44MDEgMTEuNjI5LS4xMDQuMDY2LS4zOTUuMDIzLS4zOTUuMDIzIi8+PC9nPjwvc3ltYm9sPjwvc3ZnPg=="},"categories":[{"id":6,"name":"Communication"}],"displayName":"Telegram","typeVersion":1},{"id":107,"icon":"file:shopify.svg","name":"n8n-nodes-base.shopifyTrigger","defaults":{"name":"Shopify Trigger"},"iconData":{"type":"file","fileBuffer":"data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgNTggNjYiIGZpbGw9IiNmZmYiIGZpbGwtcnVsZT0iZXZlbm9kZCIgc3Ryb2tlPSIjMDAwIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiPjx1c2UgeGxpbms6aHJlZj0iI2EiIHg9Ii41IiB5PSIuNSIvPjxzeW1ib2wgaWQ9ImEiIG92ZXJmbG93PSJ2aXNpYmxlIj48ZyBzdHJva2U9Im5vbmUiIGZpbGwtcnVsZT0ibm9uemVybyI+PHBhdGggZD0iTTQ5LjI1NSAxMi40ODRhLjYzMy42MzMgMCAwMC0uNTY0LS41MjdjLS4yMjUtLjAzNy01LjE3LS4zNzYtNS4xNy0uMzc2bC0zLjc3LTMuNzdjLS4zNC0uMzc2LTEuMDkyLS4yNjYtMS4zNzYtLjE4OC0uMDM3IDAtLjc1Mi4yMjUtMS45MjIuNjA1LTEuMTM3LTMuMy0zLjE1LTYuMzA2LTYuNjk2LTYuMzA2aC0uMzAzQzI4LjQzOC42MDUgMjcuMTk0IDAgMjYuMTQ0IDBjLTguMjU2LjAzNy0xMi4yIDEwLjMzMy0xMy40MzQgMTUuNTk0bC01Ljc3IDEuNzdjLTEuNzcuNTY0LTEuODM1LjYwNS0yLjA3MyAyLjI5M0wwIDU3LjE3NSAzNi40NjggNjRsMTkuNzYzLTQuMjZjMC0uMDM3LTYuOTQtNDYuODk3LTYuOTc2LTQ3LjI1NXpNMzQuNDMxIDguODZjLS45MTcuMzAzLTEuOTYzLjYwNS0zLjEuOTQ1di0uNjhhMTUuMDMgMTUuMDMgMCAwMC0uNzUyLTQuOTk5YzEuODQ4LjI4NCAzLjEgMi4zNTcgMy44NDMgNC43MzN6bS02LjA2OC00LjI5OGMuNjAzIDEuNzc4Ljg4MyAzLjY1LjgyNiA1LjUyN3YuMzRsLTYuMzc1IDEuOTYzYzEuMjQ4LTQuNjYgMy41NS02Ljk2MiA1LjU1LTcuODN6bS0yLjQ1LTIuMjkzYTEuOTQgMS45NCAwIDAxMS4wNTUuMzM5Yy0yLjY2IDEuMjM4LTUuNDcyIDQuMzY2LTYuNjc4IDEwLjYyN2wtNS4wNDUgMS41NDZDMTYuNjY4IDEwLjAzIDE5Ljk4OCAyLjI2IDI1LjkxIDIuMjZ6IiBmaWxsPSIjOTViZjQ3Ii8+PHBhdGggZD0iTTQ4LjY5MSAxMS45NTdjLS4yMjUtLjAzNy01LjE3LS4zNzYtNS4xNy0uMzc2bC0zLjc3LTMuNzdhLjc1My43NTMgMCAwMC0uNTI3LS4yMjVMMzYuNDcyIDY0bDE5Ljc2My00LjI2LTYuOTgtNDcuMjE4YS42OC42OCAwIDAwLS41NjQtLjU2NHoiIGZpbGw9IiM1ZThlM2UiLz48cGF0aCBkPSJNMjkuNzU4IDIyLjlsLTIuNDU0IDcuMjQyYTExLjM2IDExLjM2IDAgMDAtNC43NTItMS4xMzNjLTMuODQ4IDAtNC4wMzYgMi40MTItNC4wMzYgMy4wMTggMCAzLjI5OCA4LjYzNiA0LjU2NCA4LjYzNiAxMi4zMzMgMCA2LjEtMy44ODUgMTAuMDMtOS4xIDEwLjAzLTYuMjYgMC05LjQ2Ny0zLjg4NS05LjQ2Ny0zLjg4NWwxLjY2NS01LjU1czMuMjggMi44MyA2LjA3MyAyLjgzYTIuNDcgMi40NyAwIDAwMi41NjQtMi40OWMwLTQuMzQtNy4xLTQuNTI3LTcuMS0xMS42MTggMC01Ljk2MiA0LjI5OC0xMS43NyAxMi45MzQtMTEuNzcgMy4zOTQuMDUgNS4wMTggMSA1LjAxOCAxeiIvPjwvZz48L3N5bWJvbD48L3N2Zz4="},"categories":[{"id":2,"name":"Sales"}],"displayName":"Shopify Trigger","typeVersion":1},{"id":325,"icon":"file:x.svg","name":"n8n-nodes-base.twitter","defaults":{"name":"X"},"iconData":{"type":"file","fileBuffer":"data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgMjQgMjQiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PHBhdGggZD0iTTE4LjI0NCAyLjI1aDMuMzA4bC03LjIyNyA4LjI2IDguNTAyIDExLjI0SDE2LjE3bC01LjIxNC02LjgxN0w0Ljk5IDIxLjc1SDEuNjhsNy43My04LjgzNUwxLjI1NCAyLjI1SDguMDhsNC43MTMgNi4yMzF6bS0xLjE2MSAxNy41MmgxLjgzM0w3LjA4NCA0LjEyNkg1LjExN3oiPjwvcGF0aD48L3N2Zz4K"},"categories":[{"id":1,"name":"Marketing & Content"}],"displayName":"X (Formerly Twitter)","typeVersion":2}],"categories":[{"id":2,"name":"Sales"},{"id":19,"name":"Marketing & Growth"}],"image":[{"id":527,"url":"https://n8niostorageaccount.blob.core.windows.net/n8nio-strapi-blobs-prod/assets/89a078b208fe4c6181902608b1cd1332.png"}]},{"id":1456,"name":"Add new customers from WooCommerce to Mautic","views":333,"recentViews":9833,"totalViews":333,"createdAt":"2022-02-17T15:00:40.748Z","description":"This workflow uses a WooCommerce trigger that will run when a new customer has been added, It will then add the customer to Mautic.\n\nTo use this workflow you will need to set the credentials to use for the WooCommerce and Mautic nodes.","workflow":{"id":83,"name":"New WooCommerce Customer to Mautic","nodes":[{"name":"Check for Existing","type":"n8n-nodes-base.mautic","position":[280,480],"parameters":{"options":{"search":"={{$json[\"email\"]}}"},"operation":"getAll","authentication":"oAuth2"},"credentials":{"mauticOAuth2Api":{"id":"54","name":"Mautic account"}},"typeVersion":1,"alwaysOutputData":true},{"name":"If New","type":"n8n-nodes-base.if","position":[460,480],"parameters":{"conditions":{"string":[{"value1":"={{$json[\"id\"]}}","operation":"isEmpty"}]}},"typeVersion":1},{"name":"Create Contact","type":"n8n-nodes-base.mautic","position":[680,320],"parameters":{"email":"={{$node[\"Customer Created\"].json[\"email\"]}}","company":"={{$node[\"Customer Created\"].json[\"billing\"][\"company\"]}}","options":{},"lastName":"={{$node[\"Customer Created\"].json[\"last_name\"]}}","firstName":"={{$node[\"Customer Created\"].json[\"first_name\"]}}","authentication":"oAuth2","additionalFields":{}},"credentials":{"mauticOAuth2Api":{"id":"54","name":"Mautic account"}},"typeVersion":1},{"name":"Update Contact","type":"n8n-nodes-base.mautic","position":[680,580],"parameters":{"options":{},"contactId":"={{$json[\"id\"]}}","operation":"update","updateFields":{"lastName":"={{$node[\"Customer Created or Updated\"].json[\"last_name\"]}}","firstName":"={{$node[\"Customer Created or Updated\"].json[\"first_name\"]}}"},"authentication":"oAuth2"},"credentials":{"mauticOAuth2Api":{"id":"54","name":"Mautic account"}},"typeVersion":1},{"name":"Customer Created or Updated","type":"n8n-nodes-base.wooCommerceTrigger","position":[100,480],"webhookId":"5d89e322-a5e0-4cce-9eab-185e8375175b","parameters":{"event":"customer.updated"},"credentials":{"wooCommerceApi":{"id":"48","name":"WooCommerce account"}},"typeVersion":1}],"active":false,"settings":{"saveManualExecutions":true,"saveExecutionProgress":true,"saveDataSuccessExecution":"all"},"connections":{"If New":{"main":[[{"node":"Create Contact","type":"main","index":0}],[{"node":"Update Contact","type":"main","index":0}]]},"Check for Existing":{"main":[[{"node":"If New","type":"main","index":0}]]},"Customer Created or Updated":{"main":[[{"node":"Check for Existing","type":"main","index":0}]]}}},"workflowInfo":{"nodeCount":6,"nodeTypes":{"n8n-nodes-base.if":{"count":1},"n8n-nodes-base.mautic":{"count":3},"n8n-nodes-base.wooCommerceTrigger":{"count":1}}},"user":{"username":"jon-n8n"},"nodes":[{"id":20,"icon":"fa:map-signs","name":"n8n-nodes-base.if","defaults":{"name":"IF","color":"#408000"},"iconData":{"icon":"map-signs","type":"icon"},"categories":[{"id":9,"name":"Core Nodes"}],"displayName":"IF","typeVersion":1},{"id":42,"icon":"fa:play","name":"n8n-nodes-base.start","defaults":{"name":"Start","color":"#00e000"},"iconData":{"icon":"play","type":"icon"},"categories":[{"id":9,"name":"Core Nodes"}],"displayName":"Start","typeVersion":1},{"id":126,"icon":"file:mautic.svg","name":"n8n-nodes-base.mautic","defaults":{"name":"Mautic"},"iconData":{"type":"file","fileBuffer":"data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxNi4wLjAsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+DQo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkxheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4Ig0KCSB3aWR0aD0iMzQ5Ljc3OXB4IiBoZWlnaHQ9IjM0OS43NzlweCIgdmlld0JveD0iMCAwIDM0OS43NzkgMzQ5Ljc3OSIgZW5hYmxlLWJhY2tncm91bmQ9Im5ldyAwIDAgMzQ5Ljc3OSAzNDkuNzc5Ig0KCSB4bWw6c3BhY2U9InByZXNlcnZlIj4NCjxwYXRoIGZpbGw9IiNGRkZGRkYiIGQ9Ik0xNzQuODksMzQ5Ljc3OUM3OC42MTIsMzQ5Ljc3OSwwLDI3MS40NjIsMCwxNzQuODlTNzguNjEyLDAsMTc0Ljg5LDBjMjMuMjYsMCw0NS45MzEsNC40MTcsNjcuMTI5LDEzLjU0Mw0KCWM1Ljg4OSwyLjY1LDguODMzLDkuNDIyLDYuNDc4LDE1LjYwNWMtMi42NDksNS44ODgtOS40MjEsOC44MzMtMTUuNjA0LDYuNDc3Yy0xOC41NDktNy42NTUtMzcuOTgtMTEuNDgyLTU4LjAwMi0xMS40ODINCgljLTgzLjMyMywwLTE1MS4wNDEsNjcuNzE4LTE1MS4wNDEsMTUxLjA0MVM5MS41NjcsMzI2LjIyNSwxNzQuODksMzI2LjIyNWM4My4zMjMsMCwxNTEuMDQxLTY3LjcxOCwxNTEuMDQxLTE1MS4wNDENCgljMC0xNy45Ni0yLjk0NC0zNS4zMzItOS4xMjctNTEuODE5Yy0yLjM1NS02LjE4MywwLjg4My0xMi45NTUsNy4wNjYtMTUuMzFjNi4xODMtMi4zNTUsMTIuOTU0LDAuODgzLDE1LjMxLDcuMDY2DQoJYzcuMDY2LDE5LjEzOCwxMC42LDM5LjQ1MywxMC42LDYwLjA2M0MzNDkuNzc5LDI3MS4xNjcsMjcxLjQ2MiwzNDkuNzc5LDE3NC44OSwzNDkuNzc5Ii8+DQo8Zz4NCgk8cG9seWdvbiBmaWxsPSIjRkRCOTMzIiBwb2ludHM9IjI1MS40NCwxNTYuOTMgMjI0LjM1NCwxODUuMTk0IDIzOS4zNjksMjQ4LjQ5NiAyNzMuNTIyLDI0OC40OTYgCSIvPg0KPC9nPg0KPHBvbHlnb24gZmlsbD0iI0ZEQjkzMyIgcG9pbnRzPSIyNDAuMjUzLDczLjMxMiAyNDkuNjc0LDgyLjczNCAxNzQuODksMTYxLjkzNSAxMTAuOTk5LDk2LjI3NyA3NC4xOTYsMjQ4LjQ5NiAxMDguMzUsMjQ4LjQ5NiANCgkxMjguNjY1LDE2My45OTYgMTc0Ljg5LDIxNC4zNDMgMjczLjgxNywxMDYuNTgzIDI4My4yMzksMTE2LjI5OSAyOTIuNjYsNjMuMDA3ICIvPg0KPC9zdmc+DQo="},"categories":[{"id":1,"name":"Marketing & Content"},{"id":6,"name":"Communication"}],"displayName":"Mautic","typeVersion":1},{"id":235,"icon":"file:wooCommerce.svg","name":"n8n-nodes-base.wooCommerceTrigger","defaults":{"name":"WooCommerce Trigger"},"iconData":{"type":"file","fileBuffer":"data:image/svg+xml;base64,PHN2ZyBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWlkWU1pZCIgdmVyc2lvbj0iMS4xIiB2aWV3Qm94PSIwIC01MCAyNTYgMjUzIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOmNjPSJodHRwOi8vY3JlYXRpdmVjb21tb25zLm9yZy9ucyMiIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KPHRpdGxlPldvb0NvbW1lcmNlIExvZ288L3RpdGxlPgo8bWV0YWRhdGE+CjxyZGY6UkRGPgo8Y2M6V29yayByZGY6YWJvdXQ9IiI+CjxkYzpmb3JtYXQ+aW1hZ2Uvc3ZnK3htbDwvZGM6Zm9ybWF0Pgo8ZGM6dHlwZSByZGY6cmVzb3VyY2U9Imh0dHA6Ly9wdXJsLm9yZy9kYy9kY21pdHlwZS9TdGlsbEltYWdlIi8+CjxkYzp0aXRsZS8+CjwvY2M6V29yaz4KPC9yZGY6UkRGPgo8L21ldGFkYXRhPgo8cGF0aCBkPSJtMjMuNzU5IDBoMjA4LjM4YzEzLjE4NyAwIDIzLjg2MyAxMC42NzUgMjMuODYzIDIzLjg2M3Y3OS41NDJjMCAxMy4xODctMTAuNjc1IDIzLjg2My0yMy44NjMgMjMuODYzaC03NC43MjdsMTAuMjU3IDI1LjExOC00NS4xMDktMjUuMTE4aC05OC42OTVjLTEzLjE4NyAwLTIzLjg2My0xMC42NzUtMjMuODYzLTIzLjg2M3YtNzkuNTQyYy0wLjEwNDY2LTEzLjA4MyAxMC41NzEtMjMuODYzIDIzLjc1OC0yMy44NjN6IiBmaWxsPSIjN2Y1NGIzIi8+CjxwYXRoIGQ9Im0xNC41NzggMjEuNzVjMS40NTY5LTEuOTc3MiAzLjY0MjMtMy4wMTc5IDYuNTU2MS0zLjIyNiA1LjMwNzMtMC40MTYyNiA4LjMyNTIgMi4wODEzIDkuMDUzNyA3LjQ5MjcgMy4yMjYgMjEuNzUgNi43NjQyIDQwLjE2OSAxMC41MTEgNTUuMjU5bDIyLjc5LTQzLjM5NWMyLjA4MTMtMy45NTQ1IDQuNjgyOS02LjAzNTggNy44MDQ5LTYuMjQzOSA0LjU3ODktMC4zMTIyIDcuMzg4NiAyLjYwMTYgOC41MzMzIDguNzQxNSAyLjYwMTYgMTMuODQxIDUuOTMxNyAyNS42IDkuODg2MiAzNS41OSAyLjcwNTctMjYuNDMzIDcuMjg0Ni00NS40NzYgMTMuNzM3LTU3LjIzNiAxLjU2MS0yLjkxMzggMy44NTA0LTQuMzcwNyA2Ljg2ODMtNC41Nzg5IDIuMzkzNS0wLjIwODEzIDQuNTc4OSAwLjUyMDMzIDYuNTU2MSAyLjA4MTMgMS45NzcyIDEuNTYxIDMuMDE3OSAzLjUzODIgMy4yMjYgNS45MzE3IDAuMTA0MDYgMS44NzMyLTAuMjA4MTMgMy40MzQxLTEuMDQwNyA0Ljk5NTEtNC4wNTg1IDcuNDkyNy03LjM4ODYgMjAuMDg1LTEwLjA5NCAzNy41NjctMi42MDE2IDE2Ljk2My0zLjUzODIgMzAuMTc5LTIuOTEzOCAzOS42NDkgMC4yMDgxMyAyLjYwMTYtMC4yMDgxMyA0Ljg5MTEtMS4yNDg4IDYuODY4My0xLjI0ODggMi4yODk0LTMuMTIyIDMuNTM4Mi01LjUxNTQgMy43NDYzLTIuNzA1NyAwLjIwODEzLTUuNTE1NC0xLjA0MDYtOC4yMjExLTMuODUwNC05LjY3OC05Ljg4NjItMTcuMzc5LTI0LjY2My0yMi45OTgtNDQuMzMyLTYuNzY0MiAxMy4zMi0xMS43NTkgMjMuMzExLTE0Ljk4NSAyOS45NzEtNi4xMzk4IDExLjc1OS0xMS4zNDMgMTcuNzk1LTE1LjcxNCAxOC4xMDctMi44MDk4IDAuMjA4MTMtNS4yMDMzLTIuMTg1NC03LjI4NDYtNy4xODA1LTUuMzA3My0xMy42MzMtMTEuMDMxLTM5Ljk2MS0xNy4xNzEtNzguOTg1LTAuNDE2MjYtMi43MDU3IDAuMjA4MTMtNS4wOTkyIDEuNjY1LTYuOTcyNHptMjIzLjY0IDE2LjMzOGMtMy43NDYzLTYuNTU2MS05LjI2MTgtMTAuNTExLTE2LjY1LTEyLjA3Mi0xLjk3NzItMC40MTYyNi0zLjg1MDQtMC42MjQzOS01LjYxOTUtMC42MjQzOS05Ljk5MDIgMC0xOC4xMDcgNS4yMDMzLTI0LjQ1NSAxNS42MS01LjQxMTQgOC44NDU1LTguMTE3MSAxOC42MjgtOC4xMTcxIDI5LjM0NiAwIDguMDEzIDEuNjY1IDE0Ljg4MSA0Ljk5NTEgMjAuNjA1IDMuNzQ2MyA2LjU1NjEgOS4yNjE4IDEwLjUxMSAxNi42NSAxMi4wNzIgMS45NzcyIDAuNDE2MjYgMy44NTA0IDAuNjI0MzkgNS42MTk1IDAuNjI0MzkgMTAuMDk0IDAgMTguMjExLTUuMjAzMyAyNC40NTUtMTUuNjEgNS40MTE0LTguOTQ5NiA4LjExNzEtMTguNzMyIDguMTE3MS0yOS40NSAwLjEwNDA2LTguMTE3MS0xLjY2NS0xNC44ODEtNC45OTUxLTIwLjUwMXptLTEzLjExMiAyOC44MjZjLTEuNDU2OSA2Ljg2ODMtNC4wNTg1IDExLjk2Ny03LjkwODkgMTUuNDAyLTMuMDE3OSAyLjcwNTctNS44Mjc2IDMuODUwNC04LjQyOTMgMy4zMzAxLTIuNDk3Ni0wLjUyMDMzLTQuNTc4OS0yLjcwNTctNi4xMzk4LTYuNzY0Mi0xLjI0ODgtMy4yMjYtMS44NzMyLTYuNDUyLTEuODczMi05LjQ2OTkgMC0yLjYwMTYgMC4yMDgxMy01LjIwMzMgMC43Mjg0Ni03LjU5NjcgMC45MzY1OS00LjI2NjcgMi43MDU3LTguNDI5MyA1LjUxNTQtMTIuMzg0IDMuNDM0MS01LjA5OTIgNy4wNzY0LTcuMTgwNSAxMC44MjMtNi40NTIgMi40OTc2IDAuNTIwMzMgNC41Nzg5IDIuNzA1NyA2LjEzOTggNi43NjQyIDEuMjQ4OCAzLjIyNiAxLjg3MzIgNi40NTIgMS44NzMyIDkuNDY5OSAwIDIuNzA1Ny0wLjIwODEzIDUuMzA3My0wLjcyODQ2IDcuNzAwOHptLTUyLjAzMy0yOC44MjZjLTMuNzQ2My02LjU1NjEtOS4zNjU5LTEwLjUxMS0xNi42NS0xMi4wNzItMS45NzcyLTAuNDE2MjYtMy44NTA0LTAuNjI0MzktNS42MTk1LTAuNjI0MzktOS45OTAyIDAtMTguMTA3IDUuMjAzMy0yNC40NTUgMTUuNjEtNS40MTE0IDguODQ1NS04LjExNzEgMTguNjI4LTguMTE3MSAyOS4zNDYgMCA4LjAxMyAxLjY2NSAxNC44ODEgNC45OTUxIDIwLjYwNSAzLjc0NjMgNi41NTYxIDkuMjYxOCAxMC41MTEgMTYuNjUgMTIuMDcyIDEuOTc3MiAwLjQxNjI2IDMuODUwNCAwLjYyNDM5IDUuNjE5NSAwLjYyNDM5IDEwLjA5NCAwIDE4LjIxMS01LjIwMzMgMjQuNDU1LTE1LjYxIDUuNDExNC04Ljk0OTYgOC4xMTcxLTE4LjczMiA4LjExNzEtMjkuNDUgMC04LjExNzEtMS42NjUtMTQuODgxLTQuOTk1MS0yMC41MDF6bS0xMy4yMTYgMjguODI2Yy0xLjQ1NjkgNi44NjgzLTQuMDU4NSAxMS45NjctNy45MDg5IDE1LjQwMi0zLjAxNzkgMi43MDU3LTUuODI3NiAzLjg1MDQtOC40MjkzIDMuMzMwMS0yLjQ5NzYtMC41MjAzMy00LjU3ODktMi43MDU3LTYuMTM5OC02Ljc2NDItMS4yNDg4LTMuMjI2LTEuODczMi02LjQ1Mi0xLjg3MzItOS40Njk5IDAtMi42MDE2IDAuMjA4MTMtNS4yMDMzIDAuNzI4NDYtNy41OTY3IDAuOTM2NTgtNC4yNjY3IDIuNzA1Ny04LjQyOTMgNS41MTU0LTEyLjM4NCAzLjQzNDEtNS4wOTkyIDcuMDc2NC03LjE4MDUgMTAuODIzLTYuNDUyIDIuNDk3NiAwLjUyMDMzIDQuNTc4OSAyLjcwNTcgNi4xMzk4IDYuNzY0MiAxLjI0ODggMy4yMjYgMS44NzMyIDYuNDUyIDEuODczMiA5LjQ2OTkgMC4xMDQwNiAyLjcwNTctMC4yMDgxMyA1LjMwNzMtMC43Mjg0NiA3LjcwMDh6IiBmaWxsPSIjZmZmIi8+Cjwvc3ZnPgo="},"categories":[{"id":2,"name":"Sales"}],"displayName":"WooCommerce Trigger","typeVersion":1}],"categories":[{"id":2,"name":"Sales"}],"image":[]},{"id":1459,"name":"Notify on Telegram and Twitter when new order is added in WooCommerce","views":620,"recentViews":9823,"totalViews":620,"createdAt":"2022-02-17T15:02:14.961Z","description":"This workflow uses a WooCommerce trigger that will run a new product has been added, It will then post the product to Telegram and Twitter.\n\nTo use this workflow you will need to set the credentials to use for the WooCommerce, Twitter and Telegram nodes.","workflow":{"id":85,"name":"New WooCommerce Product to Twitter and Telegram","nodes":[{"name":"Twitter","type":"n8n-nodes-base.twitter","position":[720,300],"parameters":{"text":"=✨ New Product Announcement ✨\nWe have just added {{$json[\"name\"]}}, Head to {{$json[\"permalink\"]}} to find out more.","additionalFields":{}},"credentials":{"twitterOAuth1Api":{"id":"37","name":"joffcom"}},"typeVersion":1},{"name":"Telegram","type":"n8n-nodes-base.telegram","position":[720,500],"parameters":{"text":"=✨ New Product Announcement ✨\nWe have just added {{$json[\"name\"]}}, Head to {{$json[\"permalink\"]}} to find out more.","chatId":"123456","additionalFields":{}},"credentials":{"telegramApi":{"id":"56","name":"Telegram account"}},"typeVersion":1},{"name":"WooCommerce Trigger","type":"n8n-nodes-base.wooCommerceTrigger","position":[540,400],"webhookId":"ab7b134b-9b2d-4e0d-b496-1aee30db0808","parameters":{"event":"product.created"},"credentials":{"wooCommerceApi":{"id":"48","name":"WooCommerce account"}},"typeVersion":1}],"active":false,"settings":{},"connections":{"WooCommerce Trigger":{"main":[[{"node":"Twitter","type":"main","index":0},{"node":"Telegram","type":"main","index":0}]]}}},"workflowInfo":{"nodeCount":4,"nodeTypes":{"n8n-nodes-base.twitter":{"count":1},"n8n-nodes-base.telegram":{"count":1},"n8n-nodes-base.wooCommerceTrigger":{"count":1}}},"user":{"username":"jon-n8n"},"nodes":[{"id":42,"icon":"fa:play","name":"n8n-nodes-base.start","defaults":{"name":"Start","color":"#00e000"},"iconData":{"icon":"play","type":"icon"},"categories":[{"id":9,"name":"Core Nodes"}],"displayName":"Start","typeVersion":1},{"id":49,"icon":"file:telegram.svg","name":"n8n-nodes-base.telegram","defaults":{"name":"Telegram"},"iconData":{"type":"file","fileBuffer":"data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgNjYgNjYiIGZpbGw9IiNmZmYiIGZpbGwtcnVsZT0iZXZlbm9kZCIgc3Ryb2tlPSIjMDAwIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiPjx1c2UgeGxpbms6aHJlZj0iI2EiIHg9Ii41IiB5PSIuNSIvPjxzeW1ib2wgaWQ9ImEiIG92ZXJmbG93PSJ2aXNpYmxlIj48ZyBzdHJva2U9Im5vbmUiIGZpbGwtcnVsZT0ibm9uemVybyI+PHBhdGggZD0iTTAgMzJjMCAxNy42NzMgMTQuMzI3IDMyIDMyIDMyczMyLTE0LjMyNyAzMi0zMlM0OS42NzMgMCAzMiAwIDAgMTQuMzI3IDAgMzIiIGZpbGw9IiMzN2FlZTIiLz48cGF0aCBkPSJNMjEuNjYxIDM0LjMzOGwzLjc5NyAxMC41MDhzLjQ3NS45ODMuOTgzLjk4MyA4LjA2OC03Ljg2NCA4LjA2OC03Ljg2NGw4LjQwNy0xNi4yMzctMjEuMTE5IDkuODk4eiIgZmlsbD0iI2M4ZGFlYSIvPjxwYXRoIGQ9Ik0yNi42OTUgMzcuMDM0bC0uNzI5IDcuNzQ2cy0uMzA1IDIuMzczIDIuMDY4IDBsNC42NDQtNC4yMDMiIGZpbGw9IiNhOWM2ZDgiLz48cGF0aCBkPSJNMjEuNzMgMzQuNzEybC03LjgwOS0yLjU0NXMtLjkzMi0uMzc4LS42MzMtMS4yMzdjLjA2Mi0uMTc3LjE4Ni0uMzI4LjU1OS0uNTg4IDEuNzMxLTEuMjA2IDMyLjAyOC0xMi4wOTYgMzIuMDI4LTEyLjA5NnMuODU2LS4yODggMS4zNjEtLjA5N2MuMjMxLjA4OC4zNzguMTg3LjUwMy41NDguMDQ1LjEzMi4wNzEuNDExLjA2OC42ODktLjAwMy4yMDEtLjAyNy4zODYtLjA0NS42NzgtLjE4NCAyLjk3OC01LjcwNiAyNS4xOTgtNS43MDYgMjUuMTk4cy0uMzMgMS4zLTEuNTE0IDEuMzQ1Yy0uNDMyLjAxNi0uOTU2LS4wNzEtMS41ODItLjYxLTIuMzIzLTEuOTk4LTEwLjM1Mi03LjM5NC0xMi4xMjYtOC41OGEuMzQuMzQgMCAwMS0uMTQ2LS4yMzljLS4wMjUtLjEyNS4xMDgtLjI4LjEwOC0uMjhzMTMuOTgtMTIuNDI3IDE0LjM1Mi0xMy43MzFjLjAyOS0uMTAxLS4wNzktLjE1MS0uMjI2LS4xMDctLjkyOS4zNDItMTcuMDI1IDEwLjUwNi0xOC44MDEgMTEuNjI5LS4xMDQuMDY2LS4zOTUuMDIzLS4zOTUuMDIzIi8+PC9nPjwvc3ltYm9sPjwvc3ZnPg=="},"categories":[{"id":6,"name":"Communication"}],"displayName":"Telegram","typeVersion":1},{"id":235,"icon":"file:wooCommerce.svg","name":"n8n-nodes-base.wooCommerceTrigger","defaults":{"name":"WooCommerce Trigger"},"iconData":{"type":"file","fileBuffer":"data:image/svg+xml;base64,PHN2ZyBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWlkWU1pZCIgdmVyc2lvbj0iMS4xIiB2aWV3Qm94PSIwIC01MCAyNTYgMjUzIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOmNjPSJodHRwOi8vY3JlYXRpdmVjb21tb25zLm9yZy9ucyMiIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KPHRpdGxlPldvb0NvbW1lcmNlIExvZ288L3RpdGxlPgo8bWV0YWRhdGE+CjxyZGY6UkRGPgo8Y2M6V29yayByZGY6YWJvdXQ9IiI+CjxkYzpmb3JtYXQ+aW1hZ2Uvc3ZnK3htbDwvZGM6Zm9ybWF0Pgo8ZGM6dHlwZSByZGY6cmVzb3VyY2U9Imh0dHA6Ly9wdXJsLm9yZy9kYy9kY21pdHlwZS9TdGlsbEltYWdlIi8+CjxkYzp0aXRsZS8+CjwvY2M6V29yaz4KPC9yZGY6UkRGPgo8L21ldGFkYXRhPgo8cGF0aCBkPSJtMjMuNzU5IDBoMjA4LjM4YzEzLjE4NyAwIDIzLjg2MyAxMC42NzUgMjMuODYzIDIzLjg2M3Y3OS41NDJjMCAxMy4xODctMTAuNjc1IDIzLjg2My0yMy44NjMgMjMuODYzaC03NC43MjdsMTAuMjU3IDI1LjExOC00NS4xMDktMjUuMTE4aC05OC42OTVjLTEzLjE4NyAwLTIzLjg2My0xMC42NzUtMjMuODYzLTIzLjg2M3YtNzkuNTQyYy0wLjEwNDY2LTEzLjA4MyAxMC41NzEtMjMuODYzIDIzLjc1OC0yMy44NjN6IiBmaWxsPSIjN2Y1NGIzIi8+CjxwYXRoIGQ9Im0xNC41NzggMjEuNzVjMS40NTY5LTEuOTc3MiAzLjY0MjMtMy4wMTc5IDYuNTU2MS0zLjIyNiA1LjMwNzMtMC40MTYyNiA4LjMyNTIgMi4wODEzIDkuMDUzNyA3LjQ5MjcgMy4yMjYgMjEuNzUgNi43NjQyIDQwLjE2OSAxMC41MTEgNTUuMjU5bDIyLjc5LTQzLjM5NWMyLjA4MTMtMy45NTQ1IDQuNjgyOS02LjAzNTggNy44MDQ5LTYuMjQzOSA0LjU3ODktMC4zMTIyIDcuMzg4NiAyLjYwMTYgOC41MzMzIDguNzQxNSAyLjYwMTYgMTMuODQxIDUuOTMxNyAyNS42IDkuODg2MiAzNS41OSAyLjcwNTctMjYuNDMzIDcuMjg0Ni00NS40NzYgMTMuNzM3LTU3LjIzNiAxLjU2MS0yLjkxMzggMy44NTA0LTQuMzcwNyA2Ljg2ODMtNC41Nzg5IDIuMzkzNS0wLjIwODEzIDQuNTc4OSAwLjUyMDMzIDYuNTU2MSAyLjA4MTMgMS45NzcyIDEuNTYxIDMuMDE3OSAzLjUzODIgMy4yMjYgNS45MzE3IDAuMTA0MDYgMS44NzMyLTAuMjA4MTMgMy40MzQxLTEuMDQwNyA0Ljk5NTEtNC4wNTg1IDcuNDkyNy03LjM4ODYgMjAuMDg1LTEwLjA5NCAzNy41NjctMi42MDE2IDE2Ljk2My0zLjUzODIgMzAuMTc5LTIuOTEzOCAzOS42NDkgMC4yMDgxMyAyLjYwMTYtMC4yMDgxMyA0Ljg5MTEtMS4yNDg4IDYuODY4My0xLjI0ODggMi4yODk0LTMuMTIyIDMuNTM4Mi01LjUxNTQgMy43NDYzLTIuNzA1NyAwLjIwODEzLTUuNTE1NC0xLjA0MDYtOC4yMjExLTMuODUwNC05LjY3OC05Ljg4NjItMTcuMzc5LTI0LjY2My0yMi45OTgtNDQuMzMyLTYuNzY0MiAxMy4zMi0xMS43NTkgMjMuMzExLTE0Ljk4NSAyOS45NzEtNi4xMzk4IDExLjc1OS0xMS4zNDMgMTcuNzk1LTE1LjcxNCAxOC4xMDctMi44MDk4IDAuMjA4MTMtNS4yMDMzLTIuMTg1NC03LjI4NDYtNy4xODA1LTUuMzA3My0xMy42MzMtMTEuMDMxLTM5Ljk2MS0xNy4xNzEtNzguOTg1LTAuNDE2MjYtMi43MDU3IDAuMjA4MTMtNS4wOTkyIDEuNjY1LTYuOTcyNHptMjIzLjY0IDE2LjMzOGMtMy43NDYzLTYuNTU2MS05LjI2MTgtMTAuNTExLTE2LjY1LTEyLjA3Mi0xLjk3NzItMC40MTYyNi0zLjg1MDQtMC42MjQzOS01LjYxOTUtMC42MjQzOS05Ljk5MDIgMC0xOC4xMDcgNS4yMDMzLTI0LjQ1NSAxNS42MS01LjQxMTQgOC44NDU1LTguMTE3MSAxOC42MjgtOC4xMTcxIDI5LjM0NiAwIDguMDEzIDEuNjY1IDE0Ljg4MSA0Ljk5NTEgMjAuNjA1IDMuNzQ2MyA2LjU1NjEgOS4yNjE4IDEwLjUxMSAxNi42NSAxMi4wNzIgMS45NzcyIDAuNDE2MjYgMy44NTA0IDAuNjI0MzkgNS42MTk1IDAuNjI0MzkgMTAuMDk0IDAgMTguMjExLTUuMjAzMyAyNC40NTUtMTUuNjEgNS40MTE0LTguOTQ5NiA4LjExNzEtMTguNzMyIDguMTE3MS0yOS40NSAwLjEwNDA2LTguMTE3MS0xLjY2NS0xNC44ODEtNC45OTUxLTIwLjUwMXptLTEzLjExMiAyOC44MjZjLTEuNDU2OSA2Ljg2ODMtNC4wNTg1IDExLjk2Ny03LjkwODkgMTUuNDAyLTMuMDE3OSAyLjcwNTctNS44Mjc2IDMuODUwNC04LjQyOTMgMy4zMzAxLTIuNDk3Ni0wLjUyMDMzLTQuNTc4OS0yLjcwNTctNi4xMzk4LTYuNzY0Mi0xLjI0ODgtMy4yMjYtMS44NzMyLTYuNDUyLTEuODczMi05LjQ2OTkgMC0yLjYwMTYgMC4yMDgxMy01LjIwMzMgMC43Mjg0Ni03LjU5NjcgMC45MzY1OS00LjI2NjcgMi43MDU3LTguNDI5MyA1LjUxNTQtMTIuMzg0IDMuNDM0MS01LjA5OTIgNy4wNzY0LTcuMTgwNSAxMC44MjMtNi40NTIgMi40OTc2IDAuNTIwMzMgNC41Nzg5IDIuNzA1NyA2LjEzOTggNi43NjQyIDEuMjQ4OCAzLjIyNiAxLjg3MzIgNi40NTIgMS44NzMyIDkuNDY5OSAwIDIuNzA1Ny0wLjIwODEzIDUuMzA3My0wLjcyODQ2IDcuNzAwOHptLTUyLjAzMy0yOC44MjZjLTMuNzQ2My02LjU1NjEtOS4zNjU5LTEwLjUxMS0xNi42NS0xMi4wNzItMS45NzcyLTAuNDE2MjYtMy44NTA0LTAuNjI0MzktNS42MTk1LTAuNjI0MzktOS45OTAyIDAtMTguMTA3IDUuMjAzMy0yNC40NTUgMTUuNjEtNS40MTE0IDguODQ1NS04LjExNzEgMTguNjI4LTguMTE3MSAyOS4zNDYgMCA4LjAxMyAxLjY2NSAxNC44ODEgNC45OTUxIDIwLjYwNSAzLjc0NjMgNi41NTYxIDkuMjYxOCAxMC41MTEgMTYuNjUgMTIuMDcyIDEuOTc3MiAwLjQxNjI2IDMuODUwNCAwLjYyNDM5IDUuNjE5NSAwLjYyNDM5IDEwLjA5NCAwIDE4LjIxMS01LjIwMzMgMjQuNDU1LTE1LjYxIDUuNDExNC04Ljk0OTYgOC4xMTcxLTE4LjczMiA4LjExNzEtMjkuNDUgMC04LjExNzEtMS42NjUtMTQuODgxLTQuOTk1MS0yMC41MDF6bS0xMy4yMTYgMjguODI2Yy0xLjQ1NjkgNi44NjgzLTQuMDU4NSAxMS45NjctNy45MDg5IDE1LjQwMi0zLjAxNzkgMi43MDU3LTUuODI3NiAzLjg1MDQtOC40MjkzIDMuMzMwMS0yLjQ5NzYtMC41MjAzMy00LjU3ODktMi43MDU3LTYuMTM5OC02Ljc2NDItMS4yNDg4LTMuMjI2LTEuODczMi02LjQ1Mi0xLjg3MzItOS40Njk5IDAtMi42MDE2IDAuMjA4MTMtNS4yMDMzIDAuNzI4NDYtNy41OTY3IDAuOTM2NTgtNC4yNjY3IDIuNzA1Ny04LjQyOTMgNS41MTU0LTEyLjM4NCAzLjQzNDEtNS4wOTkyIDcuMDc2NC03LjE4MDUgMTAuODIzLTYuNDUyIDIuNDk3NiAwLjUyMDMzIDQuNTc4OSAyLjcwNTcgNi4xMzk4IDYuNzY0MiAxLjI0ODggMy4yMjYgMS44NzMyIDYuNDUyIDEuODczMiA5LjQ2OTkgMC4xMDQwNiAyLjcwNTctMC4yMDgxMyA1LjMwNzMtMC43Mjg0NiA3LjcwMDh6IiBmaWxsPSIjZmZmIi8+Cjwvc3ZnPgo="},"categories":[{"id":2,"name":"Sales"}],"displayName":"WooCommerce Trigger","typeVersion":1},{"id":325,"icon":"file:x.svg","name":"n8n-nodes-base.twitter","defaults":{"name":"X"},"iconData":{"type":"file","fileBuffer":"data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgMjQgMjQiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PHBhdGggZD0iTTE4LjI0NCAyLjI1aDMuMzA4bC03LjIyNyA4LjI2IDguNTAyIDExLjI0SDE2LjE3bC01LjIxNC02LjgxN0w0Ljk5IDIxLjc1SDEuNjhsNy43My04LjgzNUwxLjI1NCAyLjI1SDguMDhsNC43MTMgNi4yMzF6bS0xLjE2MSAxNy41MmgxLjgzM0w3LjA4NCA0LjEyNkg1LjExN3oiPjwvcGF0aD48L3N2Zz4K"},"categories":[{"id":1,"name":"Marketing & Content"}],"displayName":"X (Formerly Twitter)","typeVersion":2}],"categories":[{"id":2,"name":"Sales"},{"id":19,"name":"Marketing & Growth"}],"image":[]},{"id":1457,"name":"Notify on Slack when new order is registered in WooCommerce","views":178,"recentViews":9787,"totalViews":178,"createdAt":"2022-02-17T15:01:13.489Z","description":"This workflow uses a WooCommerce trigger that will run when an order has been placed.\n\nIf the value of this is over 100 it will post it to a Slack channel.\n\nTo use this workflow you will need to set the credentials to use for the WooCommerce and Slack nodes, You will also need to pick a channel to post the message to.","workflow":{"id":81,"name":"New WooCommerce order to Slack","nodes":[{"name":"Order Created","type":"n8n-nodes-base.wooCommerceTrigger","position":[340,500],"webhookId":"287b4bf4-67ec-4c97-85d9-c0d3e6f59e6b","parameters":{"event":"order.created"},"credentials":{"wooCommerceApi":{"id":"48","name":"WooCommerce account"}},"typeVersion":1},{"name":"Send to Slack","type":"n8n-nodes-base.slack","position":[780,480],"parameters":{"text":":sparkles: There is a new order :sparkles:","channel":"woo-commerce","blocksUi":{"blocksValues":[]},"attachments":[{"color":"#66FF00","fields":{"item":[{"short":true,"title":"Order ID","value":"={{$json[\"id\"]}}"},{"short":true,"title":"Status","value":"={{$json[\"status\"]}}"},{"short":true,"title":"Total","value":"={{$json[\"currency_symbol\"]}}{{$json[\"total\"]}}"},{"short":false,"title":"Link","value":"={{$node[\"Order Created\"].json[\"_links\"][\"self\"][0][\"href\"]}}"}]},"footer":"=*Ordered:* {{$json[\"date_created\"]}} | *Transaction ID:* {{$json[\"transaction_id\"]}}"}],"otherOptions":{}},"credentials":{"slackApi":{"id":"53","name":"Slack Access Token"}},"typeVersion":1},{"name":"Price over 100","type":"n8n-nodes-base.if","position":[540,500],"parameters":{"conditions":{"number":[{"value1":"={{$json[\"total\"]}}","value2":100,"operation":"largerEqual"}]}},"typeVersion":1}],"active":false,"settings":{"saveManualExecutions":true,"saveExecutionProgress":true,"saveDataSuccessExecution":"all"},"connections":{"Order Created":{"main":[[{"node":"Price over 100","type":"main","index":0}]]},"Price over 100":{"main":[[{"node":"Send to Slack","type":"main","index":0}],[]]}}},"workflowInfo":{"nodeCount":4,"nodeTypes":{"n8n-nodes-base.if":{"count":1},"n8n-nodes-base.slack":{"count":1},"n8n-nodes-base.wooCommerceTrigger":{"count":1}}},"user":{"username":"jon-n8n"},"nodes":[{"id":20,"icon":"fa:map-signs","name":"n8n-nodes-base.if","defaults":{"name":"IF","color":"#408000"},"iconData":{"icon":"map-signs","type":"icon"},"categories":[{"id":9,"name":"Core Nodes"}],"displayName":"IF","typeVersion":1},{"id":40,"icon":"file:slack.svg","name":"n8n-nodes-base.slack","defaults":{"name":"Slack"},"iconData":{"type":"file","fileBuffer":"data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgMTUwLjg1MiAxNTAuODUyIiBmaWxsPSIjZmZmIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiIHN0cm9rZT0iIzAwMCIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiBzdHJva2UtbGluZWpvaW49InJvdW5kIj48dXNlIHhsaW5rOmhyZWY9IiNhIiB4PSIuOTI2IiB5PSIuOTI2Ii8+PHN5bWJvbCBpZD0iYSIgb3ZlcmZsb3c9InZpc2libGUiPjxnIHN0cm9rZS13aWR0aD0iMS44NTIiPjxwYXRoIGQ9Ik00MC43NDEgOTMuNTVjMC04LjczNSA2LjYwNy0xNS43NzIgMTQuODE1LTE1Ljc3MnMxNC44MTUgNy4wMzcgMTQuODE1IDE1Ljc3MnYzOC44MjRjMCA4LjczNy02LjYwNyAxNS43NzQtMTQuODE1IDE1Ljc3NHMtMTQuODE1LTcuMDM3LTE0LjgxNS0xNS43NzJ6IiBmaWxsPSIjZTAxZTVhIiBzdHJva2U9IiNlMDFlNWEiLz48cGF0aCBkPSJNOTMuNTUgMTA3LjQwOGMtOC43MzUgMC0xNS43NzItNi42MDctMTUuNzcyLTE0LjgxNXM3LjAzNy0xNC44MTUgMTUuNzcyLTE0LjgxNWgzOC44MjZjOC43MzUgMCAxNS43NzIgNi42MDcgMTUuNzcyIDE0LjgxNXMtNy4wMzcgMTQuODE1LTE1Ljc3MiAxNC44MTV6IiBmaWxsPSIjZWNiMjJkIiBzdHJva2U9IiNlY2IyMmQiLz48cGF0aCBkPSJNNzcuNzc4IDE1Ljc3MkM3Ny43NzggNy4wMzcgODQuMzg1IDAgOTIuNTkzIDBzMTQuODE1IDcuMDM3IDE0LjgxNSAxNS43NzJ2MzguODI2YzAgOC43MzUtNi42MDcgMTUuNzcyLTE0LjgxNSAxNS43NzJzLTE0LjgxNS03LjAzNy0xNC44MTUtMTUuNzcyeiIgZmlsbD0iIzJmYjY3YyIgc3Ryb2tlPSIjMmZiNjdjIi8+PHBhdGggZD0iTTE1Ljc3MiA3MC4zNzFDNy4wMzcgNzAuMzcxIDAgNjMuNzYzIDAgNTUuNTU2czcuMDM3LTE0LjgxNSAxNS43NzItMTQuODE1aDM4LjgyNmM4LjczNSAwIDE1Ljc3MiA2LjYwNyAxNS43NzIgMTQuODE1cy03LjAzNyAxNC44MTUtMTUuNzcyIDE0LjgxNXoiIGZpbGw9IiMzNmM1ZjEiIHN0cm9rZT0iIzM2YzVmMSIvPjxnIHN0cm9rZS1saW5lam9pbj0ibWl0ZXIiPjxwYXRoIGQ9Ik03Ny43NzggMTMzLjMzM2MwIDguMjA4IDYuNjA3IDE0LjgxNSAxNC44MTUgMTQuODE1czE0LjgxNS02LjYwNyAxNC44MTUtMTQuODE1LTYuNjA3LTE0LjgxNS0xNC44MTUtMTQuODE1SDc3Ljc3OHoiIGZpbGw9IiNlY2IyMmQiIHN0cm9rZT0iI2VjYjIyZCIvPjxwYXRoIGQ9Ik0xMzMuMzM0IDcwLjM3MWgtMTQuODE1VjU1LjU1NmMwLTguMjA3IDYuNjA3LTE0LjgxNSAxNC44MTUtMTQuODE1czE0LjgxNSA2LjYwNyAxNC44MTUgMTQuODE1LTYuNjA3IDE0LjgxNS0xNC44MTUgMTQuODE1eiIgZmlsbD0iIzJmYjY3YyIgc3Ryb2tlPSIjMmZiNjdjIi8+PHBhdGggZD0iTTE0LjgxNSA3Ny43NzhIMjkuNjN2MTQuODE1YzAgOC4yMDctNi42MDcgMTQuODE1LTE0LjgxNSAxNC44MTVTMCAxMDAuOCAwIDkyLjU5M3M2LjYwNy0xNC44MTUgMTQuODE1LTE0LjgxNXoiIGZpbGw9IiNlMDFlNWEiIHN0cm9rZT0iI2UwMWU1YSIvPjxwYXRoIGQ9Ik03MC4zNzEgMTQuODE1VjI5LjYzSDU1LjU1NmMtOC4yMDcgMC0xNC44MTUtNi42MDctMTQuODE1LTE0LjgxNVM0Ny4zNDggMCA1NS41NTYgMHMxNC44MTUgNi42MDcgMTQuODE1IDE0LjgxNXoiIGZpbGw9IiMzNmM1ZjEiIHN0cm9rZT0iIzM2YzVmMSIvPjwvZz48L2c+PC9zeW1ib2w+PC9zdmc+"},"categories":[{"id":6,"name":"Communication"}],"displayName":"Slack","typeVersion":2},{"id":42,"icon":"fa:play","name":"n8n-nodes-base.start","defaults":{"name":"Start","color":"#00e000"},"iconData":{"icon":"play","type":"icon"},"categories":[{"id":9,"name":"Core Nodes"}],"displayName":"Start","typeVersion":1},{"id":235,"icon":"file:wooCommerce.svg","name":"n8n-nodes-base.wooCommerceTrigger","defaults":{"name":"WooCommerce Trigger"},"iconData":{"type":"file","fileBuffer":"data:image/svg+xml;base64,PHN2ZyBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWlkWU1pZCIgdmVyc2lvbj0iMS4xIiB2aWV3Qm94PSIwIC01MCAyNTYgMjUzIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOmNjPSJodHRwOi8vY3JlYXRpdmVjb21tb25zLm9yZy9ucyMiIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KPHRpdGxlPldvb0NvbW1lcmNlIExvZ288L3RpdGxlPgo8bWV0YWRhdGE+CjxyZGY6UkRGPgo8Y2M6V29yayByZGY6YWJvdXQ9IiI+CjxkYzpmb3JtYXQ+aW1hZ2Uvc3ZnK3htbDwvZGM6Zm9ybWF0Pgo8ZGM6dHlwZSByZGY6cmVzb3VyY2U9Imh0dHA6Ly9wdXJsLm9yZy9kYy9kY21pdHlwZS9TdGlsbEltYWdlIi8+CjxkYzp0aXRsZS8+CjwvY2M6V29yaz4KPC9yZGY6UkRGPgo8L21ldGFkYXRhPgo8cGF0aCBkPSJtMjMuNzU5IDBoMjA4LjM4YzEzLjE4NyAwIDIzLjg2MyAxMC42NzUgMjMuODYzIDIzLjg2M3Y3OS41NDJjMCAxMy4xODctMTAuNjc1IDIzLjg2My0yMy44NjMgMjMuODYzaC03NC43MjdsMTAuMjU3IDI1LjExOC00NS4xMDktMjUuMTE4aC05OC42OTVjLTEzLjE4NyAwLTIzLjg2My0xMC42NzUtMjMuODYzLTIzLjg2M3YtNzkuNTQyYy0wLjEwNDY2LTEzLjA4MyAxMC41NzEtMjMuODYzIDIzLjc1OC0yMy44NjN6IiBmaWxsPSIjN2Y1NGIzIi8+CjxwYXRoIGQ9Im0xNC41NzggMjEuNzVjMS40NTY5LTEuOTc3MiAzLjY0MjMtMy4wMTc5IDYuNTU2MS0zLjIyNiA1LjMwNzMtMC40MTYyNiA4LjMyNTIgMi4wODEzIDkuMDUzNyA3LjQ5MjcgMy4yMjYgMjEuNzUgNi43NjQyIDQwLjE2OSAxMC41MTEgNTUuMjU5bDIyLjc5LTQzLjM5NWMyLjA4MTMtMy45NTQ1IDQuNjgyOS02LjAzNTggNy44MDQ5LTYuMjQzOSA0LjU3ODktMC4zMTIyIDcuMzg4NiAyLjYwMTYgOC41MzMzIDguNzQxNSAyLjYwMTYgMTMuODQxIDUuOTMxNyAyNS42IDkuODg2MiAzNS41OSAyLjcwNTctMjYuNDMzIDcuMjg0Ni00NS40NzYgMTMuNzM3LTU3LjIzNiAxLjU2MS0yLjkxMzggMy44NTA0LTQuMzcwNyA2Ljg2ODMtNC41Nzg5IDIuMzkzNS0wLjIwODEzIDQuNTc4OSAwLjUyMDMzIDYuNTU2MSAyLjA4MTMgMS45NzcyIDEuNTYxIDMuMDE3OSAzLjUzODIgMy4yMjYgNS45MzE3IDAuMTA0MDYgMS44NzMyLTAuMjA4MTMgMy40MzQxLTEuMDQwNyA0Ljk5NTEtNC4wNTg1IDcuNDkyNy03LjM4ODYgMjAuMDg1LTEwLjA5NCAzNy41NjctMi42MDE2IDE2Ljk2My0zLjUzODIgMzAuMTc5LTIuOTEzOCAzOS42NDkgMC4yMDgxMyAyLjYwMTYtMC4yMDgxMyA0Ljg5MTEtMS4yNDg4IDYuODY4My0xLjI0ODggMi4yODk0LTMuMTIyIDMuNTM4Mi01LjUxNTQgMy43NDYzLTIuNzA1NyAwLjIwODEzLTUuNTE1NC0xLjA0MDYtOC4yMjExLTMuODUwNC05LjY3OC05Ljg4NjItMTcuMzc5LTI0LjY2My0yMi45OTgtNDQuMzMyLTYuNzY0MiAxMy4zMi0xMS43NTkgMjMuMzExLTE0Ljk4NSAyOS45NzEtNi4xMzk4IDExLjc1OS0xMS4zNDMgMTcuNzk1LTE1LjcxNCAxOC4xMDctMi44MDk4IDAuMjA4MTMtNS4yMDMzLTIuMTg1NC03LjI4NDYtNy4xODA1LTUuMzA3My0xMy42MzMtMTEuMDMxLTM5Ljk2MS0xNy4xNzEtNzguOTg1LTAuNDE2MjYtMi43MDU3IDAuMjA4MTMtNS4wOTkyIDEuNjY1LTYuOTcyNHptMjIzLjY0IDE2LjMzOGMtMy43NDYzLTYuNTU2MS05LjI2MTgtMTAuNTExLTE2LjY1LTEyLjA3Mi0xLjk3NzItMC40MTYyNi0zLjg1MDQtMC42MjQzOS01LjYxOTUtMC42MjQzOS05Ljk5MDIgMC0xOC4xMDcgNS4yMDMzLTI0LjQ1NSAxNS42MS01LjQxMTQgOC44NDU1LTguMTE3MSAxOC42MjgtOC4xMTcxIDI5LjM0NiAwIDguMDEzIDEuNjY1IDE0Ljg4MSA0Ljk5NTEgMjAuNjA1IDMuNzQ2MyA2LjU1NjEgOS4yNjE4IDEwLjUxMSAxNi42NSAxMi4wNzIgMS45NzcyIDAuNDE2MjYgMy44NTA0IDAuNjI0MzkgNS42MTk1IDAuNjI0MzkgMTAuMDk0IDAgMTguMjExLTUuMjAzMyAyNC40NTUtMTUuNjEgNS40MTE0LTguOTQ5NiA4LjExNzEtMTguNzMyIDguMTE3MS0yOS40NSAwLjEwNDA2LTguMTE3MS0xLjY2NS0xNC44ODEtNC45OTUxLTIwLjUwMXptLTEzLjExMiAyOC44MjZjLTEuNDU2OSA2Ljg2ODMtNC4wNTg1IDExLjk2Ny03LjkwODkgMTUuNDAyLTMuMDE3OSAyLjcwNTctNS44Mjc2IDMuODUwNC04LjQyOTMgMy4zMzAxLTIuNDk3Ni0wLjUyMDMzLTQuNTc4OS0yLjcwNTctNi4xMzk4LTYuNzY0Mi0xLjI0ODgtMy4yMjYtMS44NzMyLTYuNDUyLTEuODczMi05LjQ2OTkgMC0yLjYwMTYgMC4yMDgxMy01LjIwMzMgMC43Mjg0Ni03LjU5NjcgMC45MzY1OS00LjI2NjcgMi43MDU3LTguNDI5MyA1LjUxNTQtMTIuMzg0IDMuNDM0MS01LjA5OTIgNy4wNzY0LTcuMTgwNSAxMC44MjMtNi40NTIgMi40OTc2IDAuNTIwMzMgNC41Nzg5IDIuNzA1NyA2LjEzOTggNi43NjQyIDEuMjQ4OCAzLjIyNiAxLjg3MzIgNi40NTIgMS44NzMyIDkuNDY5OSAwIDIuNzA1Ny0wLjIwODEzIDUuMzA3My0wLjcyODQ2IDcuNzAwOHptLTUyLjAzMy0yOC44MjZjLTMuNzQ2My02LjU1NjEtOS4zNjU5LTEwLjUxMS0xNi42NS0xMi4wNzItMS45NzcyLTAuNDE2MjYtMy44NTA0LTAuNjI0MzktNS42MTk1LTAuNjI0MzktOS45OTAyIDAtMTguMTA3IDUuMjAzMy0yNC40NTUgMTUuNjEtNS40MTE0IDguODQ1NS04LjExNzEgMTguNjI4LTguMTE3MSAyOS4zNDYgMCA4LjAxMyAxLjY2NSAxNC44ODEgNC45OTUxIDIwLjYwNSAzLjc0NjMgNi41NTYxIDkuMjYxOCAxMC41MTEgMTYuNjUgMTIuMDcyIDEuOTc3MiAwLjQxNjI2IDMuODUwNCAwLjYyNDM5IDUuNjE5NSAwLjYyNDM5IDEwLjA5NCAwIDE4LjIxMS01LjIwMzMgMjQuNDU1LTE1LjYxIDUuNDExNC04Ljk0OTYgOC4xMTcxLTE4LjczMiA4LjExNzEtMjkuNDUgMC04LjExNzEtMS42NjUtMTQuODgxLTQuOTk1MS0yMC41MDF6bS0xMy4yMTYgMjguODI2Yy0xLjQ1NjkgNi44NjgzLTQuMDU4NSAxMS45NjctNy45MDg5IDE1LjQwMi0zLjAxNzkgMi43MDU3LTUuODI3NiAzLjg1MDQtOC40MjkzIDMuMzMwMS0yLjQ5NzYtMC41MjAzMy00LjU3ODktMi43MDU3LTYuMTM5OC02Ljc2NDItMS4yNDg4LTMuMjI2LTEuODczMi02LjQ1Mi0xLjg3MzItOS40Njk5IDAtMi42MDE2IDAuMjA4MTMtNS4yMDMzIDAuNzI4NDYtNy41OTY3IDAuOTM2NTgtNC4yNjY3IDIuNzA1Ny04LjQyOTMgNS41MTU0LTEyLjM4NCAzLjQzNDEtNS4wOTkyIDcuMDc2NC03LjE4MDUgMTAuODIzLTYuNDUyIDIuNDk3NiAwLjUyMDMzIDQuNTc4OSAyLjcwNTcgNi4xMzk4IDYuNzY0MiAxLjI0ODggMy4yMjYgMS44NzMyIDYuNDUyIDEuODczMiA5LjQ2OTkgMC4xMDQwNiAyLjcwNTctMC4yMDgxMyA1LjMwNzMtMC43Mjg0NiA3LjcwMDh6IiBmaWxsPSIjZmZmIi8+Cjwvc3ZnPgo="},"categories":[{"id":2,"name":"Sales"}],"displayName":"WooCommerce Trigger","typeVersion":1}],"categories":[{"id":2,"name":"Sales"}],"image":[]},{"id":1765,"name":"Get Slack notifications when new product published on WooCommerce","views":79,"recentViews":9577,"totalViews":79,"createdAt":"2022-08-12T12:36:53.409Z","description":"This workflow let's a bot in Slack notify a specific channel when a new product in WooCommerce is published and live on the site. \n\n## Prerequisites\n\n[WooCommerce](https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.woocommercetrigger/) account\n[Slack](https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.slack/) and a [Slack bot](https://slack.com/help/articles/115005265703-Create-a-bot-for-your-workspace)\n\n## How it works\n\n1. Listen for WooCommerce product creation\n2. If permalink starts with https://[your-url-here].com/product/\n3. Slack bot notifies channel that a new product has been added. \n\nPlease note, you must update the URL in the IF node to match your url. If your WooCommerce doesn't use the slug /product/, that will need to be updated too. \n","workflow":{"id":1016,"name":"Woocommerce to slack: notify new product created","tags":[{"id":"5","name":"FVF","createdAt":"2022-07-30T07:43:44.795Z","updatedAt":"2022-07-30T07:43:44.795Z"}],"nodes":[{"name":"If URL has /product/","type":"n8n-nodes-base.if","position":[640,300],"parameters":{"conditions":{"string":[{"value1":"={{$json[\"permalink\"]}}","value2":"https://[add-your-url-here]/product/","operation":"startsWith"}]}},"typeVersion":1},{"name":"Send message to slack","type":"n8n-nodes-base.slack","position":[920,260],"parameters":{"text":":new: A new product has been added! :new:","channel":"newproducts","blocksUi":{"blocksValues":[]},"attachments":[{"color":"#66FF00","fields":{"item":[{"short":false,"title":"Name","value":"={{$json[\"name\"]}}"},{"short":true,"title":"Price","value":"={{$json[\"regular_price\"]}}"},{"short":true,"title":"Sale Price","value":"={{$json[\"sale_price\"]}}"},{"short":false,"title":"Link","value":"={{$json[\"permalink\"]}}"}]},"footer":"=Added: {{$json[\"date_created\"]}}"}],"otherOptions":{}},"credentials":{"slackApi":{"id":"21","name":"FVF bot"}},"typeVersion":1},{"name":"On product creation","type":"n8n-nodes-base.wooCommerceTrigger","position":[460,300],"webhookId":"267c4855-6227-4d33-867e-74600097473e","parameters":{"event":"product.created"},"credentials":{"wooCommerceApi":{"id":"20","name":"WooCommerce account FVF"}},"typeVersion":1}],"active":true,"settings":{},"connections":{"On product creation":{"main":[[{"node":"If URL has /product/","type":"main","index":0}]]},"If URL has /product/":{"main":[[{"node":"Send message to slack","type":"main","index":0}]]}}},"workflowInfo":{"nodeCount":4,"nodeTypes":{"n8n-nodes-base.if":{"count":1},"n8n-nodes-base.slack":{"count":1},"n8n-nodes-base.wooCommerceTrigger":{"count":1}}},"user":{"username":"n8n-team"},"nodes":[{"id":20,"icon":"fa:map-signs","name":"n8n-nodes-base.if","defaults":{"name":"IF","color":"#408000"},"iconData":{"icon":"map-signs","type":"icon"},"categories":[{"id":9,"name":"Core Nodes"}],"displayName":"IF","typeVersion":1},{"id":40,"icon":"file:slack.svg","name":"n8n-nodes-base.slack","defaults":{"name":"Slack"},"iconData":{"type":"file","fileBuffer":"data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgMTUwLjg1MiAxNTAuODUyIiBmaWxsPSIjZmZmIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiIHN0cm9rZT0iIzAwMCIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiBzdHJva2UtbGluZWpvaW49InJvdW5kIj48dXNlIHhsaW5rOmhyZWY9IiNhIiB4PSIuOTI2IiB5PSIuOTI2Ii8+PHN5bWJvbCBpZD0iYSIgb3ZlcmZsb3c9InZpc2libGUiPjxnIHN0cm9rZS13aWR0aD0iMS44NTIiPjxwYXRoIGQ9Ik00MC43NDEgOTMuNTVjMC04LjczNSA2LjYwNy0xNS43NzIgMTQuODE1LTE1Ljc3MnMxNC44MTUgNy4wMzcgMTQuODE1IDE1Ljc3MnYzOC44MjRjMCA4LjczNy02LjYwNyAxNS43NzQtMTQuODE1IDE1Ljc3NHMtMTQuODE1LTcuMDM3LTE0LjgxNS0xNS43NzJ6IiBmaWxsPSIjZTAxZTVhIiBzdHJva2U9IiNlMDFlNWEiLz48cGF0aCBkPSJNOTMuNTUgMTA3LjQwOGMtOC43MzUgMC0xNS43NzItNi42MDctMTUuNzcyLTE0LjgxNXM3LjAzNy0xNC44MTUgMTUuNzcyLTE0LjgxNWgzOC44MjZjOC43MzUgMCAxNS43NzIgNi42MDcgMTUuNzcyIDE0LjgxNXMtNy4wMzcgMTQuODE1LTE1Ljc3MiAxNC44MTV6IiBmaWxsPSIjZWNiMjJkIiBzdHJva2U9IiNlY2IyMmQiLz48cGF0aCBkPSJNNzcuNzc4IDE1Ljc3MkM3Ny43NzggNy4wMzcgODQuMzg1IDAgOTIuNTkzIDBzMTQuODE1IDcuMDM3IDE0LjgxNSAxNS43NzJ2MzguODI2YzAgOC43MzUtNi42MDcgMTUuNzcyLTE0LjgxNSAxNS43NzJzLTE0LjgxNS03LjAzNy0xNC44MTUtMTUuNzcyeiIgZmlsbD0iIzJmYjY3YyIgc3Ryb2tlPSIjMmZiNjdjIi8+PHBhdGggZD0iTTE1Ljc3MiA3MC4zNzFDNy4wMzcgNzAuMzcxIDAgNjMuNzYzIDAgNTUuNTU2czcuMDM3LTE0LjgxNSAxNS43NzItMTQuODE1aDM4LjgyNmM4LjczNSAwIDE1Ljc3MiA2LjYwNyAxNS43NzIgMTQuODE1cy03LjAzNyAxNC44MTUtMTUuNzcyIDE0LjgxNXoiIGZpbGw9IiMzNmM1ZjEiIHN0cm9rZT0iIzM2YzVmMSIvPjxnIHN0cm9rZS1saW5lam9pbj0ibWl0ZXIiPjxwYXRoIGQ9Ik03Ny43NzggMTMzLjMzM2MwIDguMjA4IDYuNjA3IDE0LjgxNSAxNC44MTUgMTQuODE1czE0LjgxNS02LjYwNyAxNC44MTUtMTQuODE1LTYuNjA3LTE0LjgxNS0xNC44MTUtMTQuODE1SDc3Ljc3OHoiIGZpbGw9IiNlY2IyMmQiIHN0cm9rZT0iI2VjYjIyZCIvPjxwYXRoIGQ9Ik0xMzMuMzM0IDcwLjM3MWgtMTQuODE1VjU1LjU1NmMwLTguMjA3IDYuNjA3LTE0LjgxNSAxNC44MTUtMTQuODE1czE0LjgxNSA2LjYwNyAxNC44MTUgMTQuODE1LTYuNjA3IDE0LjgxNS0xNC44MTUgMTQuODE1eiIgZmlsbD0iIzJmYjY3YyIgc3Ryb2tlPSIjMmZiNjdjIi8+PHBhdGggZD0iTTE0LjgxNSA3Ny43NzhIMjkuNjN2MTQuODE1YzAgOC4yMDctNi42MDcgMTQuODE1LTE0LjgxNSAxNC44MTVTMCAxMDAuOCAwIDkyLjU5M3M2LjYwNy0xNC44MTUgMTQuODE1LTE0LjgxNXoiIGZpbGw9IiNlMDFlNWEiIHN0cm9rZT0iI2UwMWU1YSIvPjxwYXRoIGQ9Ik03MC4zNzEgMTQuODE1VjI5LjYzSDU1LjU1NmMtOC4yMDcgMC0xNC44MTUtNi42MDctMTQuODE1LTE0LjgxNVM0Ny4zNDggMCA1NS41NTYgMHMxNC44MTUgNi42MDcgMTQuODE1IDE0LjgxNXoiIGZpbGw9IiMzNmM1ZjEiIHN0cm9rZT0iIzM2YzVmMSIvPjwvZz48L2c+PC9zeW1ib2w+PC9zdmc+"},"categories":[{"id":6,"name":"Communication"}],"displayName":"Slack","typeVersion":2},{"id":42,"icon":"fa:play","name":"n8n-nodes-base.start","defaults":{"name":"Start","color":"#00e000"},"iconData":{"icon":"play","type":"icon"},"categories":[{"id":9,"name":"Core Nodes"}],"displayName":"Start","typeVersion":1},{"id":235,"icon":"file:wooCommerce.svg","name":"n8n-nodes-base.wooCommerceTrigger","defaults":{"name":"WooCommerce Trigger"},"iconData":{"type":"file","fileBuffer":"data:image/svg+xml;base64,PHN2ZyBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWlkWU1pZCIgdmVyc2lvbj0iMS4xIiB2aWV3Qm94PSIwIC01MCAyNTYgMjUzIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOmNjPSJodHRwOi8vY3JlYXRpdmVjb21tb25zLm9yZy9ucyMiIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KPHRpdGxlPldvb0NvbW1lcmNlIExvZ288L3RpdGxlPgo8bWV0YWRhdGE+CjxyZGY6UkRGPgo8Y2M6V29yayByZGY6YWJvdXQ9IiI+CjxkYzpmb3JtYXQ+aW1hZ2Uvc3ZnK3htbDwvZGM6Zm9ybWF0Pgo8ZGM6dHlwZSByZGY6cmVzb3VyY2U9Imh0dHA6Ly9wdXJsLm9yZy9kYy9kY21pdHlwZS9TdGlsbEltYWdlIi8+CjxkYzp0aXRsZS8+CjwvY2M6V29yaz4KPC9yZGY6UkRGPgo8L21ldGFkYXRhPgo8cGF0aCBkPSJtMjMuNzU5IDBoMjA4LjM4YzEzLjE4NyAwIDIzLjg2MyAxMC42NzUgMjMuODYzIDIzLjg2M3Y3OS41NDJjMCAxMy4xODctMTAuNjc1IDIzLjg2My0yMy44NjMgMjMuODYzaC03NC43MjdsMTAuMjU3IDI1LjExOC00NS4xMDktMjUuMTE4aC05OC42OTVjLTEzLjE4NyAwLTIzLjg2My0xMC42NzUtMjMuODYzLTIzLjg2M3YtNzkuNTQyYy0wLjEwNDY2LTEzLjA4MyAxMC41NzEtMjMuODYzIDIzLjc1OC0yMy44NjN6IiBmaWxsPSIjN2Y1NGIzIi8+CjxwYXRoIGQ9Im0xNC41NzggMjEuNzVjMS40NTY5LTEuOTc3MiAzLjY0MjMtMy4wMTc5IDYuNTU2MS0zLjIyNiA1LjMwNzMtMC40MTYyNiA4LjMyNTIgMi4wODEzIDkuMDUzNyA3LjQ5MjcgMy4yMjYgMjEuNzUgNi43NjQyIDQwLjE2OSAxMC41MTEgNTUuMjU5bDIyLjc5LTQzLjM5NWMyLjA4MTMtMy45NTQ1IDQuNjgyOS02LjAzNTggNy44MDQ5LTYuMjQzOSA0LjU3ODktMC4zMTIyIDcuMzg4NiAyLjYwMTYgOC41MzMzIDguNzQxNSAyLjYwMTYgMTMuODQxIDUuOTMxNyAyNS42IDkuODg2MiAzNS41OSAyLjcwNTctMjYuNDMzIDcuMjg0Ni00NS40NzYgMTMuNzM3LTU3LjIzNiAxLjU2MS0yLjkxMzggMy44NTA0LTQuMzcwNyA2Ljg2ODMtNC41Nzg5IDIuMzkzNS0wLjIwODEzIDQuNTc4OSAwLjUyMDMzIDYuNTU2MSAyLjA4MTMgMS45NzcyIDEuNTYxIDMuMDE3OSAzLjUzODIgMy4yMjYgNS45MzE3IDAuMTA0MDYgMS44NzMyLTAuMjA4MTMgMy40MzQxLTEuMDQwNyA0Ljk5NTEtNC4wNTg1IDcuNDkyNy03LjM4ODYgMjAuMDg1LTEwLjA5NCAzNy41NjctMi42MDE2IDE2Ljk2My0zLjUzODIgMzAuMTc5LTIuOTEzOCAzOS42NDkgMC4yMDgxMyAyLjYwMTYtMC4yMDgxMyA0Ljg5MTEtMS4yNDg4IDYuODY4My0xLjI0ODggMi4yODk0LTMuMTIyIDMuNTM4Mi01LjUxNTQgMy43NDYzLTIuNzA1NyAwLjIwODEzLTUuNTE1NC0xLjA0MDYtOC4yMjExLTMuODUwNC05LjY3OC05Ljg4NjItMTcuMzc5LTI0LjY2My0yMi45OTgtNDQuMzMyLTYuNzY0MiAxMy4zMi0xMS43NTkgMjMuMzExLTE0Ljk4NSAyOS45NzEtNi4xMzk4IDExLjc1OS0xMS4zNDMgMTcuNzk1LTE1LjcxNCAxOC4xMDctMi44MDk4IDAuMjA4MTMtNS4yMDMzLTIuMTg1NC03LjI4NDYtNy4xODA1LTUuMzA3My0xMy42MzMtMTEuMDMxLTM5Ljk2MS0xNy4xNzEtNzguOTg1LTAuNDE2MjYtMi43MDU3IDAuMjA4MTMtNS4wOTkyIDEuNjY1LTYuOTcyNHptMjIzLjY0IDE2LjMzOGMtMy43NDYzLTYuNTU2MS05LjI2MTgtMTAuNTExLTE2LjY1LTEyLjA3Mi0xLjk3NzItMC40MTYyNi0zLjg1MDQtMC42MjQzOS01LjYxOTUtMC42MjQzOS05Ljk5MDIgMC0xOC4xMDcgNS4yMDMzLTI0LjQ1NSAxNS42MS01LjQxMTQgOC44NDU1LTguMTE3MSAxOC42MjgtOC4xMTcxIDI5LjM0NiAwIDguMDEzIDEuNjY1IDE0Ljg4MSA0Ljk5NTEgMjAuNjA1IDMuNzQ2MyA2LjU1NjEgOS4yNjE4IDEwLjUxMSAxNi42NSAxMi4wNzIgMS45NzcyIDAuNDE2MjYgMy44NTA0IDAuNjI0MzkgNS42MTk1IDAuNjI0MzkgMTAuMDk0IDAgMTguMjExLTUuMjAzMyAyNC40NTUtMTUuNjEgNS40MTE0LTguOTQ5NiA4LjExNzEtMTguNzMyIDguMTE3MS0yOS40NSAwLjEwNDA2LTguMTE3MS0xLjY2NS0xNC44ODEtNC45OTUxLTIwLjUwMXptLTEzLjExMiAyOC44MjZjLTEuNDU2OSA2Ljg2ODMtNC4wNTg1IDExLjk2Ny03LjkwODkgMTUuNDAyLTMuMDE3OSAyLjcwNTctNS44Mjc2IDMuODUwNC04LjQyOTMgMy4zMzAxLTIuNDk3Ni0wLjUyMDMzLTQuNTc4OS0yLjcwNTctNi4xMzk4LTYuNzY0Mi0xLjI0ODgtMy4yMjYtMS44NzMyLTYuNDUyLTEuODczMi05LjQ2OTkgMC0yLjYwMTYgMC4yMDgxMy01LjIwMzMgMC43Mjg0Ni03LjU5NjcgMC45MzY1OS00LjI2NjcgMi43MDU3LTguNDI5MyA1LjUxNTQtMTIuMzg0IDMuNDM0MS01LjA5OTIgNy4wNzY0LTcuMTgwNSAxMC44MjMtNi40NTIgMi40OTc2IDAuNTIwMzMgNC41Nzg5IDIuNzA1NyA2LjEzOTggNi43NjQyIDEuMjQ4OCAzLjIyNiAxLjg3MzIgNi40NTIgMS44NzMyIDkuNDY5OSAwIDIuNzA1Ny0wLjIwODEzIDUuMzA3My0wLjcyODQ2IDcuNzAwOHptLTUyLjAzMy0yOC44MjZjLTMuNzQ2My02LjU1NjEtOS4zNjU5LTEwLjUxMS0xNi42NS0xMi4wNzItMS45NzcyLTAuNDE2MjYtMy44NTA0LTAuNjI0MzktNS42MTk1LTAuNjI0MzktOS45OTAyIDAtMTguMTA3IDUuMjAzMy0yNC40NTUgMTUuNjEtNS40MTE0IDguODQ1NS04LjExNzEgMTguNjI4LTguMTE3MSAyOS4zNDYgMCA4LjAxMyAxLjY2NSAxNC44ODEgNC45OTUxIDIwLjYwNSAzLjc0NjMgNi41NTYxIDkuMjYxOCAxMC41MTEgMTYuNjUgMTIuMDcyIDEuOTc3MiAwLjQxNjI2IDMuODUwNCAwLjYyNDM5IDUuNjE5NSAwLjYyNDM5IDEwLjA5NCAwIDE4LjIxMS01LjIwMzMgMjQuNDU1LTE1LjYxIDUuNDExNC04Ljk0OTYgOC4xMTcxLTE4LjczMiA4LjExNzEtMjkuNDUgMC04LjExNzEtMS42NjUtMTQuODgxLTQuOTk1MS0yMC41MDF6bS0xMy4yMTYgMjguODI2Yy0xLjQ1NjkgNi44NjgzLTQuMDU4NSAxMS45NjctNy45MDg5IDE1LjQwMi0zLjAxNzkgMi43MDU3LTUuODI3NiAzLjg1MDQtOC40MjkzIDMuMzMwMS0yLjQ5NzYtMC41MjAzMy00LjU3ODktMi43MDU3LTYuMTM5OC02Ljc2NDItMS4yNDg4LTMuMjI2LTEuODczMi02LjQ1Mi0xLjg3MzItOS40Njk5IDAtMi42MDE2IDAuMjA4MTMtNS4yMDMzIDAuNzI4NDYtNy41OTY3IDAuOTM2NTgtNC4yNjY3IDIuNzA1Ny04LjQyOTMgNS41MTU0LTEyLjM4NCAzLjQzNDEtNS4wOTkyIDcuMDc2NC03LjE4MDUgMTAuODIzLTYuNDUyIDIuNDk3NiAwLjUyMDMzIDQuNTc4OSAyLjcwNTcgNi4xMzk4IDYuNzY0MiAxLjI0ODggMy4yMjYgMS44NzMyIDYuNDUyIDEuODczMiA5LjQ2OTkgMC4xMDQwNiAyLjcwNTctMC4yMDgxMyA1LjMwNzMtMC43Mjg0NiA3LjcwMDh6IiBmaWxsPSIjZmZmIi8+Cjwvc3ZnPgo="},"categories":[{"id":2,"name":"Sales"}],"displayName":"WooCommerce Trigger","typeVersion":1}],"categories":[{"id":2,"name":"Sales"}],"image":[]},{"id":1460,"name":"Notify on Slack when refund is registered in WooCommerce","views":85,"recentViews":9541,"totalViews":85,"createdAt":"2022-02-17T15:02:58.662Z","description":"This workflow uses a WooCommerce trigger that will run when an order has been updated and the status is refunded.\n\nIf the value of this is over 100 it will post it to a Slack channel.\n\nTo use this workflow you will need to set the credentials to use for the WooCommerce and Slack nodes, You will also need to pick a channel to post the message to.","workflow":{"id":82,"name":"New WooCommerce refund to Slack","nodes":[{"name":"Order Updated","type":"n8n-nodes-base.wooCommerceTrigger","position":[320,500],"webhookId":"f7736be3-e978-4a17-b936-7ce9f8ccdb72","parameters":{"event":"order.updated"},"credentials":{"wooCommerceApi":{"id":"48","name":"WooCommerce account"}},"typeVersion":1},{"name":"If Refund and Over 100","type":"n8n-nodes-base.if","position":[540,500],"parameters":{"conditions":{"number":[{"value1":"={{$json[\"total\"]}}","value2":100,"operation":"largerEqual"}],"string":[{"value1":"={{$json[\"status\"]}}","value2":"refunded"}]}},"typeVersion":1},{"name":"Send to Slack","type":"n8n-nodes-base.slack","position":[780,480],"parameters":{"text":":x: A refund has been issued :x:","channel":"woo-commerce","blocksUi":{"blocksValues":[]},"attachments":[{"color":"#FF0000","fields":{"item":[{"short":true,"title":"Order ID","value":"={{$json[\"id\"]}}"},{"short":true,"title":"Status","value":"={{$json[\"status\"]}}"},{"short":true,"title":"Total","value":"={{$json[\"currency_symbol\"]}}{{$json[\"total\"]}}"}]},"footer":"=*Order updated:* {{$json[\"date_modified\"]}}"}],"otherOptions":{}},"credentials":{"slackApi":{"id":"53","name":"Slack Access Token"}},"typeVersion":1}],"active":false,"settings":{"saveManualExecutions":true,"saveExecutionProgress":true,"saveDataSuccessExecution":"all"},"connections":{"Order Updated":{"main":[[{"node":"If Refund and Over 100","type":"main","index":0}]]},"If Refund and Over 100":{"main":[[{"node":"Send to Slack","type":"main","index":0}],[]]}}},"workflowInfo":{"nodeCount":4,"nodeTypes":{"n8n-nodes-base.if":{"count":1},"n8n-nodes-base.slack":{"count":1},"n8n-nodes-base.wooCommerceTrigger":{"count":1}}},"user":{"username":"jon-n8n"},"nodes":[{"id":20,"icon":"fa:map-signs","name":"n8n-nodes-base.if","defaults":{"name":"IF","color":"#408000"},"iconData":{"icon":"map-signs","type":"icon"},"categories":[{"id":9,"name":"Core Nodes"}],"displayName":"IF","typeVersion":1},{"id":40,"icon":"file:slack.svg","name":"n8n-nodes-base.slack","defaults":{"name":"Slack"},"iconData":{"type":"file","fileBuffer":"data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgMTUwLjg1MiAxNTAuODUyIiBmaWxsPSIjZmZmIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiIHN0cm9rZT0iIzAwMCIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiBzdHJva2UtbGluZWpvaW49InJvdW5kIj48dXNlIHhsaW5rOmhyZWY9IiNhIiB4PSIuOTI2IiB5PSIuOTI2Ii8+PHN5bWJvbCBpZD0iYSIgb3ZlcmZsb3c9InZpc2libGUiPjxnIHN0cm9rZS13aWR0aD0iMS44NTIiPjxwYXRoIGQ9Ik00MC43NDEgOTMuNTVjMC04LjczNSA2LjYwNy0xNS43NzIgMTQuODE1LTE1Ljc3MnMxNC44MTUgNy4wMzcgMTQuODE1IDE1Ljc3MnYzOC44MjRjMCA4LjczNy02LjYwNyAxNS43NzQtMTQuODE1IDE1Ljc3NHMtMTQuODE1LTcuMDM3LTE0LjgxNS0xNS43NzJ6IiBmaWxsPSIjZTAxZTVhIiBzdHJva2U9IiNlMDFlNWEiLz48cGF0aCBkPSJNOTMuNTUgMTA3LjQwOGMtOC43MzUgMC0xNS43NzItNi42MDctMTUuNzcyLTE0LjgxNXM3LjAzNy0xNC44MTUgMTUuNzcyLTE0LjgxNWgzOC44MjZjOC43MzUgMCAxNS43NzIgNi42MDcgMTUuNzcyIDE0LjgxNXMtNy4wMzcgMTQuODE1LTE1Ljc3MiAxNC44MTV6IiBmaWxsPSIjZWNiMjJkIiBzdHJva2U9IiNlY2IyMmQiLz48cGF0aCBkPSJNNzcuNzc4IDE1Ljc3MkM3Ny43NzggNy4wMzcgODQuMzg1IDAgOTIuNTkzIDBzMTQuODE1IDcuMDM3IDE0LjgxNSAxNS43NzJ2MzguODI2YzAgOC43MzUtNi42MDcgMTUuNzcyLTE0LjgxNSAxNS43NzJzLTE0LjgxNS03LjAzNy0xNC44MTUtMTUuNzcyeiIgZmlsbD0iIzJmYjY3YyIgc3Ryb2tlPSIjMmZiNjdjIi8+PHBhdGggZD0iTTE1Ljc3MiA3MC4zNzFDNy4wMzcgNzAuMzcxIDAgNjMuNzYzIDAgNTUuNTU2czcuMDM3LTE0LjgxNSAxNS43NzItMTQuODE1aDM4LjgyNmM4LjczNSAwIDE1Ljc3MiA2LjYwNyAxNS43NzIgMTQuODE1cy03LjAzNyAxNC44MTUtMTUuNzcyIDE0LjgxNXoiIGZpbGw9IiMzNmM1ZjEiIHN0cm9rZT0iIzM2YzVmMSIvPjxnIHN0cm9rZS1saW5lam9pbj0ibWl0ZXIiPjxwYXRoIGQ9Ik03Ny43NzggMTMzLjMzM2MwIDguMjA4IDYuNjA3IDE0LjgxNSAxNC44MTUgMTQuODE1czE0LjgxNS02LjYwNyAxNC44MTUtMTQuODE1LTYuNjA3LTE0LjgxNS0xNC44MTUtMTQuODE1SDc3Ljc3OHoiIGZpbGw9IiNlY2IyMmQiIHN0cm9rZT0iI2VjYjIyZCIvPjxwYXRoIGQ9Ik0xMzMuMzM0IDcwLjM3MWgtMTQuODE1VjU1LjU1NmMwLTguMjA3IDYuNjA3LTE0LjgxNSAxNC44MTUtMTQuODE1czE0LjgxNSA2LjYwNyAxNC44MTUgMTQuODE1LTYuNjA3IDE0LjgxNS0xNC44MTUgMTQuODE1eiIgZmlsbD0iIzJmYjY3YyIgc3Ryb2tlPSIjMmZiNjdjIi8+PHBhdGggZD0iTTE0LjgxNSA3Ny43NzhIMjkuNjN2MTQuODE1YzAgOC4yMDctNi42MDcgMTQuODE1LTE0LjgxNSAxNC44MTVTMCAxMDAuOCAwIDkyLjU5M3M2LjYwNy0xNC44MTUgMTQuODE1LTE0LjgxNXoiIGZpbGw9IiNlMDFlNWEiIHN0cm9rZT0iI2UwMWU1YSIvPjxwYXRoIGQ9Ik03MC4zNzEgMTQuODE1VjI5LjYzSDU1LjU1NmMtOC4yMDcgMC0xNC44MTUtNi42MDctMTQuODE1LTE0LjgxNVM0Ny4zNDggMCA1NS41NTYgMHMxNC44MTUgNi42MDcgMTQuODE1IDE0LjgxNXoiIGZpbGw9IiMzNmM1ZjEiIHN0cm9rZT0iIzM2YzVmMSIvPjwvZz48L2c+PC9zeW1ib2w+PC9zdmc+"},"categories":[{"id":6,"name":"Communication"}],"displayName":"Slack","typeVersion":2},{"id":42,"icon":"fa:play","name":"n8n-nodes-base.start","defaults":{"name":"Start","color":"#00e000"},"iconData":{"icon":"play","type":"icon"},"categories":[{"id":9,"name":"Core Nodes"}],"displayName":"Start","typeVersion":1},{"id":235,"icon":"file:wooCommerce.svg","name":"n8n-nodes-base.wooCommerceTrigger","defaults":{"name":"WooCommerce Trigger"},"iconData":{"type":"file","fileBuffer":"data:image/svg+xml;base64,PHN2ZyBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWlkWU1pZCIgdmVyc2lvbj0iMS4xIiB2aWV3Qm94PSIwIC01MCAyNTYgMjUzIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOmNjPSJodHRwOi8vY3JlYXRpdmVjb21tb25zLm9yZy9ucyMiIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KPHRpdGxlPldvb0NvbW1lcmNlIExvZ288L3RpdGxlPgo8bWV0YWRhdGE+CjxyZGY6UkRGPgo8Y2M6V29yayByZGY6YWJvdXQ9IiI+CjxkYzpmb3JtYXQ+aW1hZ2Uvc3ZnK3htbDwvZGM6Zm9ybWF0Pgo8ZGM6dHlwZSByZGY6cmVzb3VyY2U9Imh0dHA6Ly9wdXJsLm9yZy9kYy9kY21pdHlwZS9TdGlsbEltYWdlIi8+CjxkYzp0aXRsZS8+CjwvY2M6V29yaz4KPC9yZGY6UkRGPgo8L21ldGFkYXRhPgo8cGF0aCBkPSJtMjMuNzU5IDBoMjA4LjM4YzEzLjE4NyAwIDIzLjg2MyAxMC42NzUgMjMuODYzIDIzLjg2M3Y3OS41NDJjMCAxMy4xODctMTAuNjc1IDIzLjg2My0yMy44NjMgMjMuODYzaC03NC43MjdsMTAuMjU3IDI1LjExOC00NS4xMDktMjUuMTE4aC05OC42OTVjLTEzLjE4NyAwLTIzLjg2My0xMC42NzUtMjMuODYzLTIzLjg2M3YtNzkuNTQyYy0wLjEwNDY2LTEzLjA4MyAxMC41NzEtMjMuODYzIDIzLjc1OC0yMy44NjN6IiBmaWxsPSIjN2Y1NGIzIi8+CjxwYXRoIGQ9Im0xNC41NzggMjEuNzVjMS40NTY5LTEuOTc3MiAzLjY0MjMtMy4wMTc5IDYuNTU2MS0zLjIyNiA1LjMwNzMtMC40MTYyNiA4LjMyNTIgMi4wODEzIDkuMDUzNyA3LjQ5MjcgMy4yMjYgMjEuNzUgNi43NjQyIDQwLjE2OSAxMC41MTEgNTUuMjU5bDIyLjc5LTQzLjM5NWMyLjA4MTMtMy45NTQ1IDQuNjgyOS02LjAzNTggNy44MDQ5LTYuMjQzOSA0LjU3ODktMC4zMTIyIDcuMzg4NiAyLjYwMTYgOC41MzMzIDguNzQxNSAyLjYwMTYgMTMuODQxIDUuOTMxNyAyNS42IDkuODg2MiAzNS41OSAyLjcwNTctMjYuNDMzIDcuMjg0Ni00NS40NzYgMTMuNzM3LTU3LjIzNiAxLjU2MS0yLjkxMzggMy44NTA0LTQuMzcwNyA2Ljg2ODMtNC41Nzg5IDIuMzkzNS0wLjIwODEzIDQuNTc4OSAwLjUyMDMzIDYuNTU2MSAyLjA4MTMgMS45NzcyIDEuNTYxIDMuMDE3OSAzLjUzODIgMy4yMjYgNS45MzE3IDAuMTA0MDYgMS44NzMyLTAuMjA4MTMgMy40MzQxLTEuMDQwNyA0Ljk5NTEtNC4wNTg1IDcuNDkyNy03LjM4ODYgMjAuMDg1LTEwLjA5NCAzNy41NjctMi42MDE2IDE2Ljk2My0zLjUzODIgMzAuMTc5LTIuOTEzOCAzOS42NDkgMC4yMDgxMyAyLjYwMTYtMC4yMDgxMyA0Ljg5MTEtMS4yNDg4IDYuODY4My0xLjI0ODggMi4yODk0LTMuMTIyIDMuNTM4Mi01LjUxNTQgMy43NDYzLTIuNzA1NyAwLjIwODEzLTUuNTE1NC0xLjA0MDYtOC4yMjExLTMuODUwNC05LjY3OC05Ljg4NjItMTcuMzc5LTI0LjY2My0yMi45OTgtNDQuMzMyLTYuNzY0MiAxMy4zMi0xMS43NTkgMjMuMzExLTE0Ljk4NSAyOS45NzEtNi4xMzk4IDExLjc1OS0xMS4zNDMgMTcuNzk1LTE1LjcxNCAxOC4xMDctMi44MDk4IDAuMjA4MTMtNS4yMDMzLTIuMTg1NC03LjI4NDYtNy4xODA1LTUuMzA3My0xMy42MzMtMTEuMDMxLTM5Ljk2MS0xNy4xNzEtNzguOTg1LTAuNDE2MjYtMi43MDU3IDAuMjA4MTMtNS4wOTkyIDEuNjY1LTYuOTcyNHptMjIzLjY0IDE2LjMzOGMtMy43NDYzLTYuNTU2MS05LjI2MTgtMTAuNTExLTE2LjY1LTEyLjA3Mi0xLjk3NzItMC40MTYyNi0zLjg1MDQtMC42MjQzOS01LjYxOTUtMC42MjQzOS05Ljk5MDIgMC0xOC4xMDcgNS4yMDMzLTI0LjQ1NSAxNS42MS01LjQxMTQgOC44NDU1LTguMTE3MSAxOC42MjgtOC4xMTcxIDI5LjM0NiAwIDguMDEzIDEuNjY1IDE0Ljg4MSA0Ljk5NTEgMjAuNjA1IDMuNzQ2MyA2LjU1NjEgOS4yNjE4IDEwLjUxMSAxNi42NSAxMi4wNzIgMS45NzcyIDAuNDE2MjYgMy44NTA0IDAuNjI0MzkgNS42MTk1IDAuNjI0MzkgMTAuMDk0IDAgMTguMjExLTUuMjAzMyAyNC40NTUtMTUuNjEgNS40MTE0LTguOTQ5NiA4LjExNzEtMTguNzMyIDguMTE3MS0yOS40NSAwLjEwNDA2LTguMTE3MS0xLjY2NS0xNC44ODEtNC45OTUxLTIwLjUwMXptLTEzLjExMiAyOC44MjZjLTEuNDU2OSA2Ljg2ODMtNC4wNTg1IDExLjk2Ny03LjkwODkgMTUuNDAyLTMuMDE3OSAyLjcwNTctNS44Mjc2IDMuODUwNC04LjQyOTMgMy4zMzAxLTIuNDk3Ni0wLjUyMDMzLTQuNTc4OS0yLjcwNTctNi4xMzk4LTYuNzY0Mi0xLjI0ODgtMy4yMjYtMS44NzMyLTYuNDUyLTEuODczMi05LjQ2OTkgMC0yLjYwMTYgMC4yMDgxMy01LjIwMzMgMC43Mjg0Ni03LjU5NjcgMC45MzY1OS00LjI2NjcgMi43MDU3LTguNDI5MyA1LjUxNTQtMTIuMzg0IDMuNDM0MS01LjA5OTIgNy4wNzY0LTcuMTgwNSAxMC44MjMtNi40NTIgMi40OTc2IDAuNTIwMzMgNC41Nzg5IDIuNzA1NyA2LjEzOTggNi43NjQyIDEuMjQ4OCAzLjIyNiAxLjg3MzIgNi40NTIgMS44NzMyIDkuNDY5OSAwIDIuNzA1Ny0wLjIwODEzIDUuMzA3My0wLjcyODQ2IDcuNzAwOHptLTUyLjAzMy0yOC44MjZjLTMuNzQ2My02LjU1NjEtOS4zNjU5LTEwLjUxMS0xNi42NS0xMi4wNzItMS45NzcyLTAuNDE2MjYtMy44NTA0LTAuNjI0MzktNS42MTk1LTAuNjI0MzktOS45OTAyIDAtMTguMTA3IDUuMjAzMy0yNC40NTUgMTUuNjEtNS40MTE0IDguODQ1NS04LjExNzEgMTguNjI4LTguMTE3MSAyOS4zNDYgMCA4LjAxMyAxLjY2NSAxNC44ODEgNC45OTUxIDIwLjYwNSAzLjc0NjMgNi41NTYxIDkuMjYxOCAxMC41MTEgMTYuNjUgMTIuMDcyIDEuOTc3MiAwLjQxNjI2IDMuODUwNCAwLjYyNDM5IDUuNjE5NSAwLjYyNDM5IDEwLjA5NCAwIDE4LjIxMS01LjIwMzMgMjQuNDU1LTE1LjYxIDUuNDExNC04Ljk0OTYgOC4xMTcxLTE4LjczMiA4LjExNzEtMjkuNDUgMC04LjExNzEtMS42NjUtMTQuODgxLTQuOTk1MS0yMC41MDF6bS0xMy4yMTYgMjguODI2Yy0xLjQ1NjkgNi44NjgzLTQuMDU4NSAxMS45NjctNy45MDg5IDE1LjQwMi0zLjAxNzkgMi43MDU3LTUuODI3NiAzLjg1MDQtOC40MjkzIDMuMzMwMS0yLjQ5NzYtMC41MjAzMy00LjU3ODktMi43MDU3LTYuMTM5OC02Ljc2NDItMS4yNDg4LTMuMjI2LTEuODczMi02LjQ1Mi0xLjg3MzItOS40Njk5IDAtMi42MDE2IDAuMjA4MTMtNS4yMDMzIDAuNzI4NDYtNy41OTY3IDAuOTM2NTgtNC4yNjY3IDIuNzA1Ny04LjQyOTMgNS41MTU0LTEyLjM4NCAzLjQzNDEtNS4wOTkyIDcuMDc2NC03LjE4MDUgMTAuODIzLTYuNDUyIDIuNDk3NiAwLjUyMDMzIDQuNTc4OSAyLjcwNTcgNi4xMzk4IDYuNzY0MiAxLjI0ODggMy4yMjYgMS44NzMyIDYuNDUyIDEuODczMiA5LjQ2OTkgMC4xMDQwNiAyLjcwNTctMC4yMDgxMyA1LjMwNzMtMC43Mjg0NiA3LjcwMDh6IiBmaWxsPSIjZmZmIi8+Cjwvc3ZnPgo="},"categories":[{"id":2,"name":"Sales"}],"displayName":"WooCommerce Trigger","typeVersion":1}],"categories":[{"id":2,"name":"Sales"},{"id":8,"name":"Finance & Accounting"}],"image":[]}],"image":[]}}
diff --git a/cypress/fixtures/Floating_Nodes.json b/cypress/fixtures/Floating_Nodes.json
new file mode 100644
index 0000000000000..2ffc1b3fde777
--- /dev/null
+++ b/cypress/fixtures/Floating_Nodes.json
@@ -0,0 +1,176 @@
+{
+  "name": "Floating Nodes",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "d0eda550-2526-42a1-aa19-dee411c8acf9",
+      "name": "When clicking \"Test workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        700,
+        560
+      ]
+    },
+    {
+      "parameters": {
+        "options": {}
+      },
+      "id": "30412165-1229-4b21-9890-05bfbd9952ab",
+      "name": "Node 1",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.2,
+      "position": [
+        920,
+        560
+      ]
+    },
+    {
+      "parameters": {
+        "options": {}
+      },
+      "id": "201cc8fc-3124-47a3-bc08-b3917c1ddcd9",
+      "name": "Node 2",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.2,
+      "position": [
+        1100,
+        560
+      ]
+    },
+    {
+      "parameters": {
+        "options": {}
+      },
+      "id": "a29802bb-a284-495d-9917-6c6e42fef01e",
+      "name": "Node 3",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.2,
+      "position": [
+        1280,
+        560
+      ]
+    },
+    {
+      "parameters": {
+        "options": {}
+      },
+      "id": "a95a72b3-8b39-44e2-a05b-d8d677741c80",
+      "name": "Node 4",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.2,
+      "position": [
+        1440,
+        560
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "4674f10d-6144-4a17-bbbb-350c3974438e",
+      "name": "Chain",
+      "type": "@n8n/n8n-nodes-langchain.chainLlm",
+      "typeVersion": 1,
+      "position": [
+        1580,
+        560
+      ]
+    },
+    {
+      "parameters": {
+        "options": {}
+      },
+      "id": "58e12ea5-bd3e-4abf-abec-fcfb5c0a7955",
+      "name": "Model",
+      "type": "@n8n/n8n-nodes-langchain.lmChatOpenAi",
+      "typeVersion": 1,
+      "position": [
+        1600,
+        740
+      ]
+    }
+  ],
+  "pinData": {},
+  "connections": {
+    "When clicking \"Test workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Node 1",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Node 1": {
+      "main": [
+        [
+          {
+            "node": "Node 2",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Node 3": {
+      "main": [
+        [
+          {
+            "node": "Node 4",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Node 2": {
+      "main": [
+        [
+          {
+            "node": "Node 3",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Chain": {
+      "main": [
+        []
+      ]
+    },
+    "Model": {
+      "ai_languageModel": [
+        [
+          {
+            "node": "Chain",
+            "type": "ai_languageModel",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Node 4": {
+      "main": [
+        [
+          {
+            "node": "Chain",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "2730d156-a98a-4ac8-b481-5c16361fdba2",
+  "id": "6bzXMGxHuxeEaqsA",
+  "meta": {
+    "instanceId": "1838be0fa0389fbaf5e2e4aaedab4ddc79abc4175b433401abb22a281001b853"
+  },
+  "tags": []
+}
diff --git a/cypress/fixtures/Lots_of_nodes.json b/cypress/fixtures/Lots_of_nodes.json
new file mode 100644
index 0000000000000..7b3ad507c8f18
--- /dev/null
+++ b/cypress/fixtures/Lots_of_nodes.json
@@ -0,0 +1,1051 @@
+{
+  "name": "Lots of nodes",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "369fe424-dd3b-4399-9de3-50bd4ce1f75b",
+      "name": "When clicking \"Test workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        860,
+        740
+      ]
+    },
+    {
+      "parameters": {
+        "jsCode": "// Loop over input items and add a new field called 'myNewField' to the JSON of each one\nfor (const item of $input.all()) {\n  item.json.myNewField = 1;\n}\n\nreturn $input.all();"
+      },
+      "id": "dce967a7-8c5e-43cc-ba2b-e0fb0c9cf14c",
+      "name": "Code",
+      "type": "n8n-nodes-base.code",
+      "typeVersion": 2,
+      "position": [
+        1080,
+        740
+      ]
+    },
+    {
+      "parameters": {
+        "options": {}
+      },
+      "id": "df7a719e-b25a-43e3-b941-7091a7d9a1a8",
+      "name": "Edit Fields",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.2,
+      "position": [
+        1300,
+        740
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "32968b79-6a8b-43ed-b884-eb906b597661",
+      "name": "IF",
+      "type": "n8n-nodes-base.if",
+      "typeVersion": 1,
+      "position": [
+        1520,
+        740
+      ]
+    },
+    {
+      "parameters": {
+        "jsCode": "// Loop over input items and add a new field called 'myNewField' to the JSON of each one\nfor (const item of $input.all()) {\n  item.json.myNewField = 1;\n}\n\nreturn $input.all();"
+      },
+      "id": "e9a72745-6dbb-4be1-b286-aaa679b95e36",
+      "name": "Code1",
+      "type": "n8n-nodes-base.code",
+      "typeVersion": 2,
+      "position": [
+        1820,
+        80
+      ]
+    },
+    {
+      "parameters": {
+        "options": {}
+      },
+      "id": "f831d21b-c3a9-4bd8-9fc3-6daef12bd43f",
+      "name": "Edit Fields1",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.2,
+      "position": [
+        2040,
+        80
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "6e6b2a4f-9e61-4245-8502-ca01e851fcbe",
+      "name": "IF1",
+      "type": "n8n-nodes-base.if",
+      "typeVersion": 1,
+      "position": [
+        2260,
+        80
+      ]
+    },
+    {
+      "parameters": {
+        "jsCode": "// Loop over input items and add a new field called 'myNewField' to the JSON of each one\nfor (const item of $input.all()) {\n  item.json.myNewField = 1;\n}\n\nreturn $input.all();"
+      },
+      "id": "535b9786-ead9-44f9-bff2-ef2e019a4cf9",
+      "name": "Code3",
+      "type": "n8n-nodes-base.code",
+      "typeVersion": 2,
+      "position": [
+        2560,
+        -260
+      ]
+    },
+    {
+      "parameters": {
+        "options": {}
+      },
+      "id": "6a181d75-f2f2-4ad1-be3c-81ebe077ccc8",
+      "name": "Edit Fields3",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.2,
+      "position": [
+        2780,
+        -260
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "4b45828e-4e2b-4046-b9ae-24b373a81863",
+      "name": "IF7",
+      "type": "n8n-nodes-base.if",
+      "typeVersion": 1,
+      "position": [
+        3000,
+        -260
+      ]
+    },
+    {
+      "parameters": {
+        "jsCode": "// Loop over input items and add a new field called 'myNewField' to the JSON of each one\nfor (const item of $input.all()) {\n  item.json.myNewField = 1;\n}\n\nreturn $input.all();"
+      },
+      "id": "059534cb-820c-4fb7-933c-eeed2ae74f1c",
+      "name": "Code7",
+      "type": "n8n-nodes-base.code",
+      "typeVersion": 2,
+      "position": [
+        3260,
+        -400
+      ]
+    },
+    {
+      "parameters": {
+        "options": {}
+      },
+      "id": "4f5c0d94-b69d-4ad3-aa8f-f1dd5824ec4a",
+      "name": "Edit Fields7",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.2,
+      "position": [
+        3480,
+        -400
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "cd74f840-7b0f-425d-8ecd-e247a7d8abf5",
+      "name": "IF8",
+      "type": "n8n-nodes-base.if",
+      "typeVersion": 1,
+      "position": [
+        3700,
+        -400
+      ]
+    },
+    {
+      "parameters": {
+        "jsCode": "// Loop over input items and add a new field called 'myNewField' to the JSON of each one\nfor (const item of $input.all()) {\n  item.json.myNewField = 1;\n}\n\nreturn $input.all();"
+      },
+      "id": "3c97fd14-9c23-45e2-a1ac-934d743e9a01",
+      "name": "Code8",
+      "type": "n8n-nodes-base.code",
+      "typeVersion": 2,
+      "position": [
+        3260,
+        -80
+      ]
+    },
+    {
+      "parameters": {
+        "options": {}
+      },
+      "id": "9e7bd7e9-5142-4751-b132-735d27007d82",
+      "name": "Edit Fields8",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.2,
+      "position": [
+        3480,
+        -80
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "8d3968b6-16d4-4e03-9026-eeaf70b17805",
+      "name": "IF9",
+      "type": "n8n-nodes-base.if",
+      "typeVersion": 1,
+      "position": [
+        3700,
+        -80
+      ]
+    },
+    {
+      "parameters": {
+        "jsCode": "// Loop over input items and add a new field called 'myNewField' to the JSON of each one\nfor (const item of $input.all()) {\n  item.json.myNewField = 1;\n}\n\nreturn $input.all();"
+      },
+      "id": "141edef3-ea0f-4e90-9b6a-09f5d5551195",
+      "name": "Code4",
+      "type": "n8n-nodes-base.code",
+      "typeVersion": 2,
+      "position": [
+        2560,
+        440
+      ]
+    },
+    {
+      "parameters": {
+        "options": {}
+      },
+      "id": "b5b93cd7-9448-4290-91b7-c3c8429925fd",
+      "name": "Edit Fields4",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.2,
+      "position": [
+        2780,
+        440
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "79d2c11c-0378-4ff5-b166-ae1bf773f53a",
+      "name": "IF14",
+      "type": "n8n-nodes-base.if",
+      "typeVersion": 1,
+      "position": [
+        3000,
+        440
+      ]
+    },
+    {
+      "parameters": {
+        "jsCode": "// Loop over input items and add a new field called 'myNewField' to the JSON of each one\nfor (const item of $input.all()) {\n  item.json.myNewField = 1;\n}\n\nreturn $input.all();"
+      },
+      "id": "8483e962-24e7-4495-9c8e-481481ebe897",
+      "name": "Code13",
+      "type": "n8n-nodes-base.code",
+      "typeVersion": 2,
+      "position": [
+        3260,
+        300
+      ]
+    },
+    {
+      "parameters": {
+        "options": {}
+      },
+      "id": "74dfb8f9-6d14-493e-97d5-729e1f44856b",
+      "name": "Edit Fields13",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.2,
+      "position": [
+        3480,
+        300
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "0c2e8e54-958d-4932-91b5-b23979460c97",
+      "name": "IF15",
+      "type": "n8n-nodes-base.if",
+      "typeVersion": 1,
+      "position": [
+        3700,
+        300
+      ]
+    },
+    {
+      "parameters": {
+        "jsCode": "// Loop over input items and add a new field called 'myNewField' to the JSON of each one\nfor (const item of $input.all()) {\n  item.json.myNewField = 1;\n}\n\nreturn $input.all();"
+      },
+      "id": "bfed29c6-c453-4850-8acf-7aa11b1d0d8e",
+      "name": "Code14",
+      "type": "n8n-nodes-base.code",
+      "typeVersion": 2,
+      "position": [
+        3260,
+        620
+      ]
+    },
+    {
+      "parameters": {
+        "options": {}
+      },
+      "id": "d8415057-c597-40a9-95f6-bafbe3fafac0",
+      "name": "Edit Fields14",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.2,
+      "position": [
+        3480,
+        620
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "51ed9040-bb6c-4f77-9740-74b54ac56a00",
+      "name": "IF16",
+      "type": "n8n-nodes-base.if",
+      "typeVersion": 1,
+      "position": [
+        3700,
+        620
+      ]
+    },
+    {
+      "parameters": {
+        "jsCode": "// Loop over input items and add a new field called 'myNewField' to the JSON of each one\nfor (const item of $input.all()) {\n  item.json.myNewField = 1;\n}\n\nreturn $input.all();"
+      },
+      "id": "5864e701-eb16-4412-ae8b-be1f2a1f16a5",
+      "name": "Code2",
+      "type": "n8n-nodes-base.code",
+      "typeVersion": 2,
+      "position": [
+        1820,
+        1480
+      ]
+    },
+    {
+      "parameters": {
+        "options": {}
+      },
+      "id": "4b7de291-f1c7-4ae8-a545-81aaa2ebd1fb",
+      "name": "Edit Fields2",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.2,
+      "position": [
+        2040,
+        1480
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "328aa16f-82ed-465e-b548-9436f21eb519",
+      "name": "IF2",
+      "type": "n8n-nodes-base.if",
+      "typeVersion": 1,
+      "position": [
+        2260,
+        1480
+      ]
+    },
+    {
+      "parameters": {
+        "jsCode": "// Loop over input items and add a new field called 'myNewField' to the JSON of each one\nfor (const item of $input.all()) {\n  item.json.myNewField = 1;\n}\n\nreturn $input.all();"
+      },
+      "id": "90aaf0b0-57b6-4a08-b000-abb2956ba640",
+      "name": "Code5",
+      "type": "n8n-nodes-base.code",
+      "typeVersion": 2,
+      "position": [
+        2560,
+        1140
+      ]
+    },
+    {
+      "parameters": {
+        "options": {}
+      },
+      "id": "7d327c87-da3b-4f4b-9f9a-51c9c622990d",
+      "name": "Edit Fields5",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.2,
+      "position": [
+        2780,
+        1140
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "fa2a3b1b-53de-454e-a16d-e2bf62cb05ec",
+      "name": "IF21",
+      "type": "n8n-nodes-base.if",
+      "typeVersion": 1,
+      "position": [
+        3000,
+        1140
+      ]
+    },
+    {
+      "parameters": {
+        "jsCode": "// Loop over input items and add a new field called 'myNewField' to the JSON of each one\nfor (const item of $input.all()) {\n  item.json.myNewField = 1;\n}\n\nreturn $input.all();"
+      },
+      "id": "8efaa5a3-982e-41b4-af6e-28e35c64093d",
+      "name": "Code19",
+      "type": "n8n-nodes-base.code",
+      "typeVersion": 2,
+      "position": [
+        3260,
+        1000
+      ]
+    },
+    {
+      "parameters": {
+        "options": {}
+      },
+      "id": "987e27fd-778a-4562-85a9-369b1ec232de",
+      "name": "Edit Fields19",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.2,
+      "position": [
+        3480,
+        1000
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "b3f4e9b3-9995-4019-9b0f-dadd64e036b4",
+      "name": "IF22",
+      "type": "n8n-nodes-base.if",
+      "typeVersion": 1,
+      "position": [
+        3700,
+        1000
+      ]
+    },
+    {
+      "parameters": {
+        "jsCode": "// Loop over input items and add a new field called 'myNewField' to the JSON of each one\nfor (const item of $input.all()) {\n  item.json.myNewField = 1;\n}\n\nreturn $input.all();"
+      },
+      "id": "681c1b30-063d-4c1e-b550-942a9dd3eb9a",
+      "name": "Code20",
+      "type": "n8n-nodes-base.code",
+      "typeVersion": 2,
+      "position": [
+        3260,
+        1320
+      ]
+    },
+    {
+      "parameters": {
+        "options": {}
+      },
+      "id": "024770b6-7bf4-44f6-9675-d4f7dc73d6ac",
+      "name": "Edit Fields20",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.2,
+      "position": [
+        3480,
+        1320
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "24699015-3ccf-4ffa-b52f-8ba4c4853963",
+      "name": "IF23",
+      "type": "n8n-nodes-base.if",
+      "typeVersion": 1,
+      "position": [
+        3700,
+        1320
+      ]
+    },
+    {
+      "parameters": {
+        "jsCode": "// Loop over input items and add a new field called 'myNewField' to the JSON of each one\nfor (const item of $input.all()) {\n  item.json.myNewField = 1;\n}\n\nreturn $input.all();"
+      },
+      "id": "f4b2d116-2fda-4a3a-9509-0e8c64e7796e",
+      "name": "Code6",
+      "type": "n8n-nodes-base.code",
+      "typeVersion": 2,
+      "position": [
+        2560,
+        1840
+      ]
+    },
+    {
+      "parameters": {
+        "options": {}
+      },
+      "id": "535e5b12-6743-4c01-9fc5-e27b10421423",
+      "name": "Edit Fields6",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.2,
+      "position": [
+        2780,
+        1840
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "3dcbecdf-686b-445f-9c77-2902d0dc1f56",
+      "name": "IF28",
+      "type": "n8n-nodes-base.if",
+      "typeVersion": 1,
+      "position": [
+        3000,
+        1840
+      ]
+    },
+    {
+      "parameters": {
+        "jsCode": "// Loop over input items and add a new field called 'myNewField' to the JSON of each one\nfor (const item of $input.all()) {\n  item.json.myNewField = 1;\n}\n\nreturn $input.all();"
+      },
+      "id": "7223c6ef-664b-426a-8d08-eca1b34e6b23",
+      "name": "Code25",
+      "type": "n8n-nodes-base.code",
+      "typeVersion": 2,
+      "position": [
+        3260,
+        1700
+      ]
+    },
+    {
+      "parameters": {
+        "options": {}
+      },
+      "id": "496414a6-384a-4f94-97ec-d2e5ad646f82",
+      "name": "Edit Fields25",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.2,
+      "position": [
+        3480,
+        1700
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "82f9562d-e4a8-49f3-924d-983effb4b6c6",
+      "name": "IF29",
+      "type": "n8n-nodes-base.if",
+      "typeVersion": 1,
+      "position": [
+        3700,
+        1700
+      ]
+    },
+    {
+      "parameters": {
+        "jsCode": "// Loop over input items and add a new field called 'myNewField' to the JSON of each one\nfor (const item of $input.all()) {\n  item.json.myNewField = 1;\n}\n\nreturn $input.all();"
+      },
+      "id": "c91d4bc5-3c60-4c22-aa31-44e84e0816ec",
+      "name": "Code26",
+      "type": "n8n-nodes-base.code",
+      "typeVersion": 2,
+      "position": [
+        3260,
+        2020
+      ]
+    },
+    {
+      "parameters": {
+        "options": {}
+      },
+      "id": "49b61f23-bf3f-474d-8bba-a3b7de6f6441",
+      "name": "Edit Fields26",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.2,
+      "position": [
+        3480,
+        2020
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "1cad6ae3-1064-4f30-a9ec-502891868332",
+      "name": "IF30",
+      "type": "n8n-nodes-base.if",
+      "typeVersion": 1,
+      "position": [
+        3700,
+        2020
+      ]
+    }
+  ],
+  "pinData": {},
+  "connections": {
+    "When clicking \"Test workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Code",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Code": {
+      "main": [
+        [
+          {
+            "node": "Edit Fields",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Edit Fields": {
+      "main": [
+        [
+          {
+            "node": "IF",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "IF": {
+      "main": [
+        [
+          {
+            "node": "Code1",
+            "type": "main",
+            "index": 0
+          }
+        ],
+        [
+          {
+            "node": "Code2",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Code1": {
+      "main": [
+        [
+          {
+            "node": "Edit Fields1",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Edit Fields1": {
+      "main": [
+        [
+          {
+            "node": "IF1",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Code3": {
+      "main": [
+        [
+          {
+            "node": "Edit Fields3",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Edit Fields3": {
+      "main": [
+        [
+          {
+            "node": "IF7",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "IF1": {
+      "main": [
+        [
+          {
+            "node": "Code3",
+            "type": "main",
+            "index": 0
+          }
+        ],
+        [
+          {
+            "node": "Code4",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "IF7": {
+      "main": [
+        [
+          {
+            "node": "Code7",
+            "type": "main",
+            "index": 0
+          }
+        ],
+        [
+          {
+            "node": "Code8",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Code7": {
+      "main": [
+        [
+          {
+            "node": "Edit Fields7",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Edit Fields7": {
+      "main": [
+        [
+          {
+            "node": "IF8",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Code8": {
+      "main": [
+        [
+          {
+            "node": "Edit Fields8",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Edit Fields8": {
+      "main": [
+        [
+          {
+            "node": "IF9",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Code4": {
+      "main": [
+        [
+          {
+            "node": "Edit Fields4",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Edit Fields4": {
+      "main": [
+        [
+          {
+            "node": "IF14",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "IF14": {
+      "main": [
+        [
+          {
+            "node": "Code13",
+            "type": "main",
+            "index": 0
+          }
+        ],
+        [
+          {
+            "node": "Code14",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Code13": {
+      "main": [
+        [
+          {
+            "node": "Edit Fields13",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Edit Fields13": {
+      "main": [
+        [
+          {
+            "node": "IF15",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Code14": {
+      "main": [
+        [
+          {
+            "node": "Edit Fields14",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Edit Fields14": {
+      "main": [
+        [
+          {
+            "node": "IF16",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Code2": {
+      "main": [
+        [
+          {
+            "node": "Edit Fields2",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Edit Fields2": {
+      "main": [
+        [
+          {
+            "node": "IF2",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "IF2": {
+      "main": [
+        [
+          {
+            "node": "Code5",
+            "type": "main",
+            "index": 0
+          }
+        ],
+        [
+          {
+            "node": "Code6",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Code5": {
+      "main": [
+        [
+          {
+            "node": "Edit Fields5",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Edit Fields5": {
+      "main": [
+        [
+          {
+            "node": "IF21",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "IF21": {
+      "main": [
+        [
+          {
+            "node": "Code19",
+            "type": "main",
+            "index": 0
+          }
+        ],
+        [
+          {
+            "node": "Code20",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Code19": {
+      "main": [
+        [
+          {
+            "node": "Edit Fields19",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Edit Fields19": {
+      "main": [
+        [
+          {
+            "node": "IF22",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Code20": {
+      "main": [
+        [
+          {
+            "node": "Edit Fields20",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Edit Fields20": {
+      "main": [
+        [
+          {
+            "node": "IF23",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Code6": {
+      "main": [
+        [
+          {
+            "node": "Edit Fields6",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Edit Fields6": {
+      "main": [
+        [
+          {
+            "node": "IF28",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "IF28": {
+      "main": [
+        [
+          {
+            "node": "Code25",
+            "type": "main",
+            "index": 0
+          }
+        ],
+        [
+          {
+            "node": "Code26",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Code25": {
+      "main": [
+        [
+          {
+            "node": "Edit Fields25",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Edit Fields25": {
+      "main": [
+        [
+          {
+            "node": "IF29",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Code26": {
+      "main": [
+        [
+          {
+            "node": "Edit Fields26",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Edit Fields26": {
+      "main": [
+        [
+          {
+            "node": "IF30",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "d38289e0-49d3-4e1d-8e4b-46e4eb85a2c9",
+  "id": "iKlx4AGIjCNJSu9M",
+  "meta": {
+    "instanceId": "8a47b83b4479b11330fdf21ccc96d4a8117035a968612e452b4c87bfd09c16c7"
+  },
+  "tags": []
+}
diff --git a/cypress/fixtures/Multiple_trigger_node_rerun.json b/cypress/fixtures/Multiple_trigger_node_rerun.json
new file mode 100644
index 0000000000000..39d231a894c5c
--- /dev/null
+++ b/cypress/fixtures/Multiple_trigger_node_rerun.json
@@ -0,0 +1,133 @@
+{
+  "name": "Multiple trigger node rerun",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "5ae8991f-08a2-4b27-b61c-85e3b8a83693",
+      "name": "When clicking \"Test workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        460,
+        460
+      ]
+    },
+    {
+      "parameters": {
+        "url": "https://random-data-api.com/api/v2/users?size=5",
+        "options": {}
+      },
+      "id": "22511d75-ab54-49e1-b8af-08b8b3372373",
+      "name": "fetch 5 random users",
+      "type": "n8n-nodes-base.httpRequest",
+      "typeVersion": 4.1,
+      "position": [
+        680,
+        460
+      ]
+    },
+    {
+      "parameters": {
+        "jsCode": "// Loop over input items and add a new field called 'myNewField' to the JSON of each one\nfor (const item of $input.all()) {\n  item.json.first_name_reversed = item.json = {\n    firstName: item.json.first_name,\n    firstnNameReversed: item.json.first_name_BUG.split(\"\").reverse().join(\"\")\n  };\n}\n\nreturn $input.all();"
+      },
+      "id": "4b66b15a-1685-46c1-a5e3-ebf8cdb11d21",
+      "name": "do something with them",
+      "type": "n8n-nodes-base.code",
+      "typeVersion": 2,
+      "position": [
+        900,
+        460
+      ]
+    },
+    {
+      "parameters": {
+        "rule": {
+          "interval": [
+            {
+              "field": "cronExpression",
+              "expression": "* * * * *"
+            }
+          ]
+        }
+      },
+      "id": "d763fc3b-6c4a-4d39-8857-ff84f7b6dc83",
+      "name": "Schedule Trigger",
+      "type": "n8n-nodes-base.scheduleTrigger",
+      "typeVersion": 1.1,
+      "position": [
+        460,
+        660
+      ]
+    }
+  ],
+  "pinData": {
+    "Schedule Trigger": [
+      {
+        "json": {
+          "timestamp": "2024-01-29T13:45:00.006+01:00",
+          "Readable date": "January 29th 2024, 1:45:00 pm",
+          "Readable time": "1:45:00 pm",
+          "Day of week": "Monday",
+          "Year": "2024",
+          "Month": "January",
+          "Day of month": "29",
+          "Hour": "13",
+          "Minute": "45",
+          "Second": "00",
+          "Timezone": "CET +01:00"
+        }
+      }
+    ],
+    "When clicking \"Test workflow\"": [
+      {
+        "json": {}
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Test workflow\"": {
+      "main": [
+        [
+          {
+            "node": "fetch 5 random users",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "fetch 5 random users": {
+      "main": [
+        [
+          {
+            "node": "do something with them",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Schedule Trigger": {
+      "main": [
+        [
+          {
+            "node": "fetch 5 random users",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "b9a6c3b0-15cd-4359-a92e-12a691a36b7b",
+  "meta": {
+    "templateCredsSetupCompleted": true,
+    "instanceId": "8a47b83b4479b11330fdf21ccc96d4a8117035a968612e452b4c87bfd09c16c7"
+  },
+  "id": "PymcwIrbqgNh3O0K",
+  "tags": []
+}
\ No newline at end of file
diff --git a/cypress/fixtures/NDV-test-switch_reorder.json b/cypress/fixtures/NDV-test-switch_reorder.json
new file mode 100644
index 0000000000000..cf970434f3efb
--- /dev/null
+++ b/cypress/fixtures/NDV-test-switch_reorder.json
@@ -0,0 +1,235 @@
+{
+  "name": "switch reorder",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "b3f0815d-b733-413f-ab3f-74e48277bd3a",
+      "name": "When clicking \"Test workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        -20,
+        620
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "fbc5b12a-6165-4cab-80a1-9fd6e4fbe39f",
+      "name": "One",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        620,
+        720
+      ]
+    },
+    {
+      "parameters": {
+        "duplicateItem": true,
+        "duplicateCount": 1,
+        "assignments": {
+          "assignments": [
+            {
+              "id": "ec6c1d1d-a17a-4537-8135-d474df7fded1",
+              "name": "entry",
+              "value": "first",
+              "type": "string"
+            }
+          ]
+        },
+        "options": {}
+      },
+      "id": "8c5a72a5-17ef-40e0-8477-764f24770174",
+      "name": "Edit Fields",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.3,
+      "position": [
+        160,
+        740
+      ]
+    },
+    {
+      "parameters": {
+        "assignments": {
+          "assignments": [
+            {
+              "id": "d8ec7c46-d02f-4bf5-931e-5ec2fb8bea22",
+              "name": "entry",
+              "value": "zero",
+              "type": "string"
+            }
+          ]
+        },
+        "options": {}
+      },
+      "id": "bc3fb81d-2ddf-4b28-a93d-762a48e8fd6b",
+      "name": "Edit Fields1",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.3,
+      "position": [
+        160,
+        500
+      ]
+    },
+    {
+      "parameters": {
+        "rules": {
+          "values": [
+            {
+              "conditions": {
+                "options": {
+                  "caseSensitive": true,
+                  "leftValue": "",
+                  "typeValidation": "strict"
+                },
+                "conditions": [
+                  {
+                    "leftValue": "={{ $json.entry }}",
+                    "rightValue": "first",
+                    "operator": {
+                      "type": "string",
+                      "operation": "equals"
+                    }
+                  }
+                ],
+                "combinator": "and"
+              },
+              "renameOutput": true,
+              "outputKey": "1"
+            },
+            {
+              "conditions": {
+                "options": {
+                  "caseSensitive": true,
+                  "leftValue": "",
+                  "typeValidation": "strict"
+                },
+                "conditions": [
+                  {
+                    "id": "ffa570ef-fc16-49ec-87be-56159f14a44b",
+                    "leftValue": "={{ $json.entry }}",
+                    "rightValue": "=second",
+                    "operator": {
+                      "type": "string",
+                      "operation": "equals"
+                    }
+                  }
+                ],
+                "combinator": "and"
+              },
+              "renameOutput": true,
+              "outputKey": "2"
+            }
+          ]
+        },
+        "options": {}
+      },
+      "id": "296ba553-c6c5-4c84-89fb-9056b24bab30",
+      "name": "Switch",
+      "type": "n8n-nodes-base.switch",
+      "typeVersion": 3,
+      "position": [
+        360,
+        740
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "da787dd6-8e85-4dd5-8326-198705b4ae4b",
+      "name": "Merge",
+      "type": "n8n-nodes-base.merge",
+      "typeVersion": 2.1,
+      "position": [
+        880,
+        520
+      ]
+    }
+  ],
+  "pinData": {
+    "Edit Fields": [
+      {
+        "json": {
+          "entry": "first"
+        }
+      },
+      {
+        "json": {
+          "entry": "second"
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Test workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Edit Fields",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Edit Fields1",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Edit Fields": {
+      "main": [
+        [
+          {
+            "node": "Switch",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "One": {
+      "main": [
+        [
+          {
+            "node": "Merge",
+            "type": "main",
+            "index": 1
+          }
+        ]
+      ]
+    },
+    "Edit Fields1": {
+      "main": [
+        [
+          {
+            "node": "Merge",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Switch": {
+      "main": [
+        [
+          {
+            "node": "One",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "ce5db792-5e38-4d54-895b-88d85f2545d0",
+  "meta": {
+    "templateCredsSetupCompleted": true,
+    "instanceId": "be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd"
+  },
+  "id": "uMpL0bN7t1NYZDJS",
+  "tags": []
+}
diff --git a/cypress/fixtures/Node_IO_filter.json b/cypress/fixtures/Node_IO_filter.json
new file mode 100644
index 0000000000000..61be5d58d8016
--- /dev/null
+++ b/cypress/fixtures/Node_IO_filter.json
@@ -0,0 +1,653 @@
+{
+  "name": "Node IO filter",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "46770685-44d1-4aad-9107-1d790cf26b50",
+      "name": "When clicking \"Test workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        840,
+        180
+      ]
+    },
+    {
+      "parameters": {
+        "options": {}
+      },
+      "id": "480e3832-2ce4-4118-9f7b-a8aed6017174",
+      "name": "Edit Fields",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.2,
+      "position": [
+        1080,
+        180
+      ]
+    },
+    {
+      "parameters": {
+        "conditions": {
+          "string": [
+            {
+              "value1": "={{ $json.profile.name }}",
+              "operation": "contains",
+              "value2": "an"
+            }
+          ]
+        }
+      },
+      "id": "4773d460-6ed9-49e1-a688-7e480f0fbacf",
+      "name": "IF",
+      "type": "n8n-nodes-base.if",
+      "typeVersion": 1,
+      "position": [
+        1300,
+        180
+      ]
+    },
+    {
+      "parameters": {
+        "options": {}
+      },
+      "id": "d17dffe6-e29c-4c1a-8b4c-9e374dcd70ea",
+      "name": "True",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.2,
+      "position": [
+        1560,
+        60
+      ]
+    },
+    {
+      "parameters": {
+        "options": {}
+      },
+      "id": "893d6e79-feb4-4752-a6f8-e2e5f5163787",
+      "name": "False",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.2,
+      "position": [
+        1560,
+        240
+      ]
+    }
+  ],
+  "pinData": {
+    "When clicking \"Test workflow\"": [
+      {
+        "json": {
+          "id": "654cfa05fa51480dcb543b1a",
+          "email": "reese_hahn@kidgrease.coach",
+          "username": "reese94",
+          "profile": {
+            "name": "Reese Hahn",
+            "company": "Kidgrease",
+            "dob": "1994-06-18",
+            "address": "3 Richmond Street, Norfolk, Delaware",
+            "location": {
+              "lat": 22.507436,
+              "long": -50.812775
+            },
+            "about": "Cupidatat voluptate reprehenderit commodo mollit tempor sint id. Id exercitation id eiusmod dolore non non anim voluptate anim eu consectetur."
+          },
+          "apiKey": "a18592bf-1147-4b61-a70f-2ab90b60bb6e",
+          "roles": [
+            "guest"
+          ],
+          "createdAt": "2010-10-04T09:57:59.240Z",
+          "updatedAt": "2010-10-05T09:57:59.240Z"
+        }
+      },
+      {
+        "json": {
+          "id": "654cfa055bea471bc4853158",
+          "email": "jeanne_boyd@hatology.gratis",
+          "username": "jeanne91",
+          "profile": {
+            "name": "Jeanne Boyd",
+            "company": "Hatology",
+            "dob": "1991-02-21",
+            "address": "81 Kingsway Place, Blairstown, Vermont",
+            "location": {
+              "lat": -57.665234,
+              "long": -41.301893
+            },
+            "about": "Proident pariatur non consequat cupidatat Lorem nisi est consequat dolor id eiusmod id. Amet culpa ex Lorem nostrud labore laboris culpa mollit dolor culpa ut."
+          },
+          "apiKey": "8a6056a6-0197-4920-858d-cb26f8c8a1e2",
+          "roles": [
+            "owner",
+            "admin"
+          ],
+          "createdAt": "2011-11-06T09:05:41.945Z",
+          "updatedAt": "2011-11-07T09:05:41.945Z"
+        }
+      },
+      {
+        "json": {
+          "id": "654cfa05b012921c060dc5a5",
+          "email": "roslyn_underwood@portico.melbourne",
+          "username": "roslyn88",
+          "profile": {
+            "name": "Roslyn Underwood",
+            "company": "Portico",
+            "dob": "1988-04-30",
+            "address": "24 Schenck Street, Drytown, New Jersey",
+            "location": {
+              "lat": 11.797141,
+              "long": 10.751804
+            },
+            "about": "Duis excepteur minim consequat exercitation. Laboris occaecat cupidatat aliqua consequat occaecat."
+          },
+          "apiKey": "72d629f3-d613-4fd0-bbfe-3f67c8ad7af2",
+          "roles": [
+            "member",
+            "owner"
+          ],
+          "createdAt": "2012-11-17T22:09:10.911Z",
+          "updatedAt": "2012-11-18T22:09:10.911Z"
+        }
+      },
+      {
+        "json": {
+          "id": "654cfa05df7b35968507efe6",
+          "email": "combs_hardy@acrodance.domains",
+          "username": "combs91",
+          "profile": {
+            "name": "Combs Hardy",
+            "company": "Acrodance",
+            "dob": "1991-04-30",
+            "address": "58 Pineapple Street, Falconaire, New Mexico",
+            "location": {
+              "lat": -62.922443,
+              "long": -159.493799
+            },
+            "about": "Magna qui minim velit magna est eiusmod aliquip elit aliquip excepteur. Laborum labore do ut et ut in incididunt do elit nostrud."
+          },
+          "apiKey": "d9807b9e-aee9-486d-9826-4e6c166bfbe4",
+          "roles": [
+            "owner",
+            "member"
+          ],
+          "createdAt": "2014-04-13T13:02:09.319Z",
+          "updatedAt": "2014-04-14T13:02:09.319Z"
+        }
+      },
+      {
+        "json": {
+          "id": "654cfa05f2d4a0508a7c59c4",
+          "email": "terrell_peters@vantage.international",
+          "username": "terrell94",
+          "profile": {
+            "name": "Terrell Peters",
+            "company": "Vantage",
+            "dob": "1994-01-31",
+            "address": "10 Lafayette Walk, Vincent, Virginia",
+            "location": {
+              "lat": -62.267913,
+              "long": 29.682121
+            },
+            "about": "Eiusmod fugiat nulla ea tempor incididunt nulla nulla consectetur officia incididunt proident sint. Sunt duis non excepteur non."
+          },
+          "apiKey": "20b96df1-d882-4dea-a505-84d7ff296a6e",
+          "roles": [
+            "admin",
+            "guest"
+          ],
+          "createdAt": "2010-12-09T08:24:56.517Z",
+          "updatedAt": "2010-12-10T08:24:56.517Z"
+        }
+      },
+      {
+        "json": {
+          "id": "654cfa0599fbabf3a05c7b14",
+          "email": "shari_winters@powernet.supply",
+          "username": "shari93",
+          "profile": {
+            "name": "Shari Winters",
+            "company": "Powernet",
+            "dob": "1993-03-10",
+            "address": "89 Aviation Road, Leyner, Indiana",
+            "location": {
+              "lat": 40.404704,
+              "long": -141.216235
+            },
+            "about": "Occaecat sit laboris elit laboris do anim culpa dolore exercitation enim. Non veniam sint exercitation irure."
+          },
+          "apiKey": "2b869ce9-3431-4edb-944d-9d9336b1eb4a",
+          "roles": [
+            "guest",
+            "admin"
+          ],
+          "createdAt": "2014-10-15T15:56:55.873Z",
+          "updatedAt": "2014-10-16T15:56:55.873Z"
+        }
+      },
+      {
+        "json": {
+          "id": "654cfa050df18b4798ec95be",
+          "email": "rena_beasley@bitrex.ma",
+          "username": "rena90",
+          "profile": {
+            "name": "Rena Beasley",
+            "company": "Bitrex",
+            "dob": "1990-01-09",
+            "address": "78 Forbell Street, Homeland, Maine",
+            "location": {
+              "lat": 46.047548,
+              "long": 4.128049
+            },
+            "about": "Lorem aliqua veniam duis ut cillum ad sunt mollit incididunt elit. Ipsum incididunt et magna incididunt quis duis amet duis occaecat laborum nulla et commodo nisi."
+          },
+          "apiKey": "17e350f8-1020-4344-bbd7-ceb62cd44edb",
+          "roles": [
+            "member",
+            "owner"
+          ],
+          "createdAt": "2010-04-22T13:35:24.838Z",
+          "updatedAt": "2010-04-23T13:35:24.838Z"
+        }
+      },
+      {
+        "json": {
+          "id": "654cfa0595243d2b7b1ea22a",
+          "email": "sally_gentry@eventex.maif",
+          "username": "sally93",
+          "profile": {
+            "name": "Sally Gentry",
+            "company": "Eventex",
+            "dob": "1993-04-03",
+            "address": "54 Plaza Street, Greenbackville, North Carolina",
+            "location": {
+              "lat": -20.529121,
+              "long": 73.533118
+            },
+            "about": "Laborum sit exercitation sint laborum. Fugiat sit ipsum ullamco sint do dolore in sunt incididunt adipisicing magna ullamco aute."
+          },
+          "apiKey": "746b6ab3-c63f-44df-bb99-9de48f8e43c4",
+          "roles": [
+            "owner",
+            "guest"
+          ],
+          "createdAt": "2011-09-18T13:18:49.655Z",
+          "updatedAt": "2011-09-19T13:18:49.655Z"
+        }
+      },
+      {
+        "json": {
+          "id": "654cfa05cdea66c87bb01439",
+          "email": "battle_duran@jasper.property",
+          "username": "battle88",
+          "profile": {
+            "name": "Battle Duran",
+            "company": "Jasper",
+            "dob": "1988-11-04",
+            "address": "34 Amherst Street, Corriganville, Nevada",
+            "location": {
+              "lat": 74.391489,
+              "long": -98.421464
+            },
+            "about": "Nostrud occaecat laborum aliquip sint est minim id aliquip adipisicing dolor. Aute velit amet officia anim sint anim aliquip."
+          },
+          "apiKey": "b22a3ddd-d540-4df0-9ce5-e837bc6a6a10",
+          "roles": [
+            "member"
+          ],
+          "createdAt": "2012-08-31T19:14:37.463Z",
+          "updatedAt": "2012-09-01T19:14:37.463Z"
+        }
+      },
+      {
+        "json": {
+          "id": "654cfa05e9c13e25d41d4135",
+          "email": "petty_moore@neurocell.shriram",
+          "username": "petty91",
+          "profile": {
+            "name": "Petty Moore",
+            "company": "Neurocell",
+            "dob": "1991-03-10",
+            "address": "78 Interborough Parkway, Grill, Texas",
+            "location": {
+              "lat": -79.817761,
+              "long": -36.728201
+            },
+            "about": "Dolor occaecat anim est Lorem culpa fugiat id aliqua sint. Sit nisi do exercitation do voluptate exercitation in."
+          },
+          "apiKey": "4b341cfb-a83c-4f2a-9f4d-11cd747b8783",
+          "roles": [
+            "admin"
+          ],
+          "createdAt": "2012-01-02T21:28:22.431Z",
+          "updatedAt": "2012-01-03T21:28:22.431Z"
+        }
+      },
+      {
+        "json": {
+          "id": "654cfa052890c7b4d510d3d4",
+          "email": "matilda_kelley@senmei.in",
+          "username": "matilda93",
+          "profile": {
+            "name": "Matilda Kelley",
+            "company": "Senmei",
+            "dob": "1993-02-04",
+            "address": "29 Stuart Street, Henrietta, New York",
+            "location": {
+              "lat": 40.788206,
+              "long": -135.821558
+            },
+            "about": "Dolor veniam ex ullamco deserunt reprehenderit nostrud sunt culpa cupidatat qui labore deserunt. In ad anim laboris amet labore duis consequat nostrud eiusmod."
+          },
+          "apiKey": "dcf40383-a00a-43ef-8bd0-4af7e70413bd",
+          "roles": [
+            "owner",
+            "guest"
+          ],
+          "createdAt": "2014-03-28T22:07:39.636Z",
+          "updatedAt": "2014-03-29T22:07:39.636Z"
+        }
+      },
+      {
+        "json": {
+          "id": "654cfa05af129db469473bf1",
+          "email": "savannah_hardin@exoblue.kn",
+          "username": "savannah89",
+          "profile": {
+            "name": "Savannah Hardin",
+            "company": "Exoblue",
+            "dob": "1989-07-01",
+            "address": "44 Navy Walk, Fresno, Kentucky",
+            "location": {
+              "lat": 75.679679,
+              "long": -58.534947
+            },
+            "about": "Id eiusmod eu elit consequat quis anim veniam officia anim ipsum. Sunt ex sit ipsum id est eu."
+          },
+          "apiKey": "98d6abb7-e4aa-4b3b-8958-ff3c4d672f1d",
+          "roles": [
+            "guest",
+            "member"
+          ],
+          "createdAt": "2011-04-15T00:55:02.325Z",
+          "updatedAt": "2011-04-16T00:55:02.325Z"
+        }
+      },
+      {
+        "json": {
+          "id": "654cfa055dfa731b01573a67",
+          "email": "abbott_gallegos@katakana.dad",
+          "username": "abbott91",
+          "profile": {
+            "name": "Abbott Gallegos",
+            "company": "Katakana",
+            "dob": "1991-03-04",
+            "address": "85 Indiana Place, Forestburg, Michigan",
+            "location": {
+              "lat": -5.417414,
+              "long": -4.557904
+            },
+            "about": "Adipisicing amet ullamco aliquip velit nostrud qui non pariatur Lorem. Culpa ut deserunt esse quis magna."
+          },
+          "apiKey": "3cf92c24-6193-4cc9-85fc-78e4ad9d6e13",
+          "roles": [
+            "guest",
+            "owner"
+          ],
+          "createdAt": "2011-06-01T16:38:39.316Z",
+          "updatedAt": "2011-06-02T16:38:39.316Z"
+        }
+      },
+      {
+        "json": {
+          "id": "654cfa05386de2e6d75c1694",
+          "email": "short_brennan@hyplex.tc",
+          "username": "short92",
+          "profile": {
+            "name": "Short Brennan",
+            "company": "Hyplex",
+            "dob": "1992-04-19",
+            "address": "21 Irving Place, Hinsdale, Northern Mariana Islands",
+            "location": {
+              "lat": 57.340225,
+              "long": -7.021582
+            },
+            "about": "Mollit dolor dolore deserunt anim minim adipisicing eiusmod velit tempor id veniam cupidatat. Magna veniam consequat incididunt ut quis culpa excepteur tempor eiusmod consectetur excepteur."
+          },
+          "apiKey": "07bf533d-4a31-4e78-9d6e-d46160479069",
+          "roles": [
+            "admin",
+            "member"
+          ],
+          "createdAt": "2014-03-10T19:25:02.217Z",
+          "updatedAt": "2014-03-11T19:25:02.217Z"
+        }
+      },
+      {
+        "json": {
+          "id": "654cfa05fd2a878d43bb45cd",
+          "email": "bowers_cooke@iplax.ci",
+          "username": "bowers92",
+          "profile": {
+            "name": "Bowers Cooke",
+            "company": "Iplax",
+            "dob": "1992-07-05",
+            "address": "83 Greenpoint Avenue, Marion, Georgia",
+            "location": {
+              "lat": 64.261022,
+              "long": -58.493714
+            },
+            "about": "Deserunt ipsum fugiat tempor sunt eu ea laboris ad magna ex laborum laboris. Ullamco nostrud qui exercitation aute consectetur irure."
+          },
+          "apiKey": "a3ecc58b-f292-4de1-b6e5-014345a76a7a",
+          "roles": [
+            "member",
+            "owner"
+          ],
+          "createdAt": "2010-06-20T16:34:56.467Z",
+          "updatedAt": "2010-06-21T16:34:56.467Z"
+        }
+      },
+      {
+        "json": {
+          "id": "654cfa05a6de547367990f9c",
+          "email": "tara_rutledge@escenta.lc",
+          "username": "tara90",
+          "profile": {
+            "name": "Tara Rutledge",
+            "company": "Escenta",
+            "dob": "1990-08-11",
+            "address": "25 Butler Place, Frierson, Missouri",
+            "location": {
+              "lat": -32.176783,
+              "long": 67.345415
+            },
+            "about": "Aute sunt laborum anim ex non pariatur nisi minim tempor adipisicing. Excepteur irure non amet eiusmod et excepteur."
+          },
+          "apiKey": "22da9647-a7b7-4815-91bb-d5101fc90e55",
+          "roles": [
+            "member"
+          ],
+          "createdAt": "2013-09-06T21:41:53.287Z",
+          "updatedAt": "2013-09-07T21:41:53.287Z"
+        }
+      },
+      {
+        "json": {
+          "id": "654cfa053778601ad57f22cd",
+          "email": "elva_chapman@bytrex.gg",
+          "username": "elva90",
+          "profile": {
+            "name": "Elva Chapman",
+            "company": "Bytrex",
+            "dob": "1990-05-31",
+            "address": "4 Royce Place, Advance, New Hampshire",
+            "location": {
+              "lat": -28.393464,
+              "long": -28.622091
+            },
+            "about": "Est sit deserunt Lorem amet voluptate elit reprehenderit occaecat est eiusmod eu reprehenderit laborum. Pariatur magna occaecat et excepteur est excepteur consectetur ad nulla."
+          },
+          "apiKey": "4d242fa4-ac69-42f1-8f12-ec19d9c6d632",
+          "roles": [
+            "owner",
+            "admin"
+          ],
+          "createdAt": "2011-04-05T04:04:31.524Z",
+          "updatedAt": "2011-04-06T04:04:31.524Z"
+        }
+      },
+      {
+        "json": {
+          "id": "654cfa054c6abbc57efcb100",
+          "email": "pitts_meyer@unisure.tui",
+          "username": "pitts93",
+          "profile": {
+            "name": "Pitts Meyer",
+            "company": "Unisure",
+            "dob": "1993-06-12",
+            "address": "47 Columbus Place, Cade, Alaska",
+            "location": {
+              "lat": 56.723675,
+              "long": 158.093389
+            },
+            "about": "Non ea pariatur excepteur nostrud elit quis qui. Dolore aute velit ipsum officia ea pariatur incididunt non elit tempor duis consequat."
+          },
+          "apiKey": "82a88344-d289-447c-81b5-1ae10cd1994b",
+          "roles": [
+            "guest",
+            "admin"
+          ],
+          "createdAt": "2014-05-15T06:38:59.269Z",
+          "updatedAt": "2014-05-16T06:38:59.269Z"
+        }
+      },
+      {
+        "json": {
+          "id": "654cfa0527e7ce14e421d9cd",
+          "email": "delia_figueroa@overplex.um",
+          "username": "delia89",
+          "profile": {
+            "name": "Delia Figueroa",
+            "company": "Overplex",
+            "dob": "1989-04-22",
+            "address": "12 Nova Court, Taft, Ohio",
+            "location": {
+              "lat": -32.990583,
+              "long": -4.598863
+            },
+            "about": "Cupidatat fugiat veniam eu proident excepteur deserunt ad esse fugiat deserunt. Non velit cillum velit veniam ex minim eiusmod tempor excepteur voluptate adipisicing nostrud."
+          },
+          "apiKey": "b3a7747b-24a0-4039-8a21-56e83441a660",
+          "roles": [
+            "admin",
+            "guest"
+          ],
+          "createdAt": "2014-09-20T03:40:10.190Z",
+          "updatedAt": "2014-09-21T03:40:10.190Z"
+        }
+      },
+      {
+        "json": {
+          "id": "654cfa05cf60000cbca6dca4",
+          "email": "kristina_fulton@portaline.engineer",
+          "username": "kristina88",
+          "profile": {
+            "name": "Kristina Fulton",
+            "company": "Portaline",
+            "dob": "1988-07-25",
+            "address": "50 Laurel Avenue, Greenwich, Palau",
+            "location": {
+              "lat": 44.118984,
+              "long": 41.518949
+            },
+            "about": "Id incididunt officia exercitation ipsum id cillum consectetur. Veniam enim voluptate ut proident ex."
+          },
+          "apiKey": "c106dbf0-bfc0-461d-b1d7-1840fe8e1cbc",
+          "roles": [
+            "admin",
+            "member"
+          ],
+          "createdAt": "2010-04-10T08:06:27.028Z",
+          "updatedAt": "2010-04-11T08:06:27.028Z"
+        }
+      },
+      {
+        "json": {
+          "id": "654cfa0501fe5691d620f570",
+          "email": "gould_noel@gonkle.gmx",
+          "username": "gould91",
+          "profile": {
+            "name": "Gould Noel",
+            "company": "Gonkle",
+            "dob": "1991-10-08",
+            "address": "33 Crooke Avenue, Idamay, Oklahoma",
+            "location": {
+              "lat": -11.398731,
+              "long": 34.706948
+            },
+            "about": "Veniam esse tempor aute quis mollit consequat Lorem. Nostrud ea dolore laboris Lorem elit est do nisi Lorem minim reprehenderit culpa."
+          },
+          "apiKey": "1089783d-32ae-4102-8ac5-1e7f6cebe3c1",
+          "roles": [
+            "guest",
+            "admin"
+          ],
+          "createdAt": "2011-12-30T20:24:19.620Z",
+          "updatedAt": "2011-12-31T20:24:19.620Z"
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Test workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Edit Fields",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Edit Fields": {
+      "main": [
+        [
+          {
+            "node": "IF",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "IF": {
+      "main": [
+        [
+          {
+            "node": "True",
+            "type": "main",
+            "index": 0
+          }
+        ],
+        [
+          {
+            "node": "False",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "9812dda2-cc1b-4458-97d8-21ccb18c90d1",
+  "id": "WNq486x7DpV1MPRH",
+  "meta": {
+    "instanceId": "8a47b83b4479b11330fdf21ccc96d4a8117035a968612e452b4c87bfd09c16c7"
+  },
+  "tags": []
+}
diff --git a/cypress/fixtures/Onboarding_workflow.json b/cypress/fixtures/Onboarding_workflow.json
new file mode 100644
index 0000000000000..8e292b59a3a7a
--- /dev/null
+++ b/cypress/fixtures/Onboarding_workflow.json
@@ -0,0 +1,1020 @@
+{
+  "name": "DEMO: Create a new record in Google Sheets when something happens in Hubspot",
+  "nodes": [
+    {
+      "parameters": {
+        "eventsUi": {
+          "eventValues": [
+            {}
+          ]
+        },
+        "additionalFields": {}
+      },
+      "id": "78395fdf-2e8b-4064-a102-c1c0335e0d94",
+      "name": "HubSpot Trigger",
+      "type": "n8n-nodes-base.hubspotTrigger",
+      "typeVersion": 1,
+      "position": [
+        580,
+        320
+      ],
+      "webhookId": "25833e56-c646-4af0-8bbe-2eea8bda4c00",
+      "notesInFlow": true,
+      "notes": "On Contact Created"
+    },
+    {
+      "parameters": {
+        "conditions": {
+          "string": [
+            {
+              "value1": "={{ $json['identity-profiles'][0].identities[0].value }}",
+              "operation": "contains",
+              "value2": "@gmail"
+            }
+          ]
+        }
+      },
+      "id": "3888d918-c140-47a1-8024-d50fddb3f8f0",
+      "name": "IF",
+      "type": "n8n-nodes-base.if",
+      "typeVersion": 1,
+      "position": [
+        820,
+        320
+      ],
+      "notesInFlow": true,
+      "notes": "Is Gmail Email?"
+    },
+    {
+      "parameters": {},
+      "id": "416a8876-f496-499c-a089-aad243daabc6",
+      "name": "Is Gmail, Don't Add to Sheet",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        1140,
+        240
+      ]
+    },
+    {
+      "parameters": {
+        "content": "## Demo: Creating Google Sheets records when something happens in HubSpot\nThis workflow runs each time a new Contact is added in HubSpot. It filters out Contacts with Gmail email addresses then pushes the remaining new Contacts to [this Google Sheet](https://docs.google.com/spreadsheets/d/1GeWRcu5cvNVA-0hpHZHtatjnFtyunbgWUgRur5uT08A/edit?usp=sharing).",
+        "height": 160.1450000000002,
+        "width": 480.31999999999596
+      },
+      "id": "cf69cda9-ba96-468f-990c-6c3ad5242053",
+      "name": "Sticky Note1",
+      "type": "n8n-nodes-base.stickyNote",
+      "typeVersion": 1,
+      "position": [
+        520,
+        100
+      ]
+    },
+    {
+      "parameters": {
+        "operation": "append",
+        "documentId": {
+          "__rl": true,
+          "value": "1GeWRcu5cvNVA-0hpHZHtatjnFtyunbgWUgRur5uT08A",
+          "mode": "list",
+          "cachedResultName": "New HubSpot Contacts",
+          "cachedResultUrl": "https://docs.google.com/spreadsheets/d/1GeWRcu5cvNVA-0hpHZHtatjnFtyunbgWUgRur5uT08A/edit?usp=drivesdk"
+        },
+        "sheetName": {
+          "__rl": true,
+          "value": "gid=0",
+          "mode": "list",
+          "cachedResultName": "New Contacts",
+          "cachedResultUrl": "https://docs.google.com/spreadsheets/d/1GeWRcu5cvNVA-0hpHZHtatjnFtyunbgWUgRur5uT08A/edit#gid=0"
+        },
+        "columns": {
+          "mappingMode": "defineBelow",
+          "value": {
+            "Name": "={{ $json.properties.num_unique_conversion_events.versions[0]['source-type'] }}",
+            "Email": "={{ $json.properties.num_unique_conversion_events.versions[0]['source-label'] }}"
+          },
+          "matchingColumns": [],
+          "schema": [
+            {
+              "id": "Name",
+              "displayName": "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
+            },
+            {
+              "id": "Sync timestamp",
+              "displayName": "Sync timestamp",
+              "required": false,
+              "defaultMatch": false,
+              "display": true,
+              "type": "string",
+              "canBeUsedToMatch": true
+            }
+          ]
+        },
+        "options": {}
+      },
+      "id": "1e4084bd-b7fb-41f1-a340-1414ef134468",
+      "name": "Google Sheets",
+      "type": "n8n-nodes-base.googleSheets",
+      "typeVersion": 4,
+      "position": [
+        1140,
+        440
+      ],
+      "notesInFlow": true,
+      "credentials": {
+        "googleSheetsOAuth2Api": {
+          "id": "FrRoXgPJOrFwkeN4",
+          "name": "Replace me with your own Sheets credential"
+        }
+      },
+      "notes": "Append new contact to sheet"
+    }
+  ],
+  "pinData": {
+    "HubSpot Trigger": [
+      {
+        "json": {
+          "vid": 51,
+          "canonical-vid": 51,
+          "merged-vids": [],
+          "portal-id": 8924380,
+          "is-contact": true,
+          "properties": {
+            "hs_latest_source_data_2": {
+              "value": "sample-contact",
+              "versions": [
+                {
+                  "value": "sample-contact",
+                  "source-type": "MIGRATION",
+                  "source-id": "BackfillContactUpdatesKafka",
+                  "source-label": null,
+                  "updated-by-user-id": null,
+                  "timestamp": 1639158301358,
+                  "selected": false
+                }
+              ]
+            },
+            "hs_latest_source_data_1": {
+              "value": "API",
+              "versions": [
+                {
+                  "value": "API",
+                  "source-type": "MIGRATION",
+                  "source-id": "BackfillContactUpdatesKafka",
+                  "source-label": null,
+                  "updated-by-user-id": null,
+                  "timestamp": 1639158301358,
+                  "selected": false
+                }
+              ]
+            },
+            "hs_is_unworked": {
+              "value": "true",
+              "versions": [
+                {
+                  "value": "true",
+                  "source-type": "CALCULATED",
+                  "source-id": null,
+                  "source-label": null,
+                  "updated-by-user-id": null,
+                  "timestamp": 1606827045782,
+                  "selected": false
+                }
+              ]
+            },
+            "firstname": {
+              "value": "Brian",
+              "versions": [
+                {
+                  "value": "Brian",
+                  "source-type": "CONTACTS_WEB",
+                  "source-id": "sample-contact",
+                  "source-label": null,
+                  "updated-by-user-id": null,
+                  "timestamp": 1606827045444,
+                  "selected": false
+                }
+              ]
+            },
+            "associatedcompanyid": {
+              "value": "4931550080",
+              "versions": [
+                {
+                  "value": "4931550080",
+                  "source-type": "CALCULATED",
+                  "source-id": "RollupProperties",
+                  "source-label": null,
+                  "updated-by-user-id": null,
+                  "timestamp": 1606827057264,
+                  "selected": false
+                }
+              ]
+            },
+            "city": {
+              "value": "Cambridge",
+              "versions": [
+                {
+                  "value": "Cambridge",
+                  "source-type": "CONTACTS_WEB",
+                  "source-id": "sample-contact",
+                  "source-label": null,
+                  "updated-by-user-id": null,
+                  "timestamp": 1606827045444,
+                  "selected": false
+                }
+              ]
+            },
+            "num_unique_conversion_events": {
+              "value": "0",
+              "versions": [
+                {
+                  "value": "0",
+                  "source-type": "MIGRATION",
+                  "source-id": "BackfillReadtimeCalculatedPropertiesJob",
+                  "source-label": null,
+                  "updated-by-user-id": null,
+                  "timestamp": 1629469311146,
+                  "selected": false
+                }
+              ]
+            },
+            "hs_latest_source": {
+              "value": "OFFLINE",
+              "versions": [
+                {
+                  "value": "OFFLINE",
+                  "source-type": "MIGRATION",
+                  "source-id": "BackfillContactUpdatesKafka",
+                  "source-label": null,
+                  "updated-by-user-id": null,
+                  "timestamp": 1639158301358,
+                  "selected": false
+                }
+              ]
+            },
+            "hs_pipeline": {
+              "value": "contacts-lifecycle-pipeline",
+              "versions": [
+                {
+                  "value": "contacts-lifecycle-pipeline",
+                  "source-type": "MIGRATION",
+                  "source-id": "BackfillHsPipelineForContacts",
+                  "source-label": null,
+                  "updated-by-user-id": null,
+                  "timestamp": 1628846625829,
+                  "selected": false
+                }
+              ]
+            },
+            "hs_analytics_revenue": {
+              "value": "0.0",
+              "versions": [
+                {
+                  "value": "0.0",
+                  "source-type": "ANALYTICS",
+                  "source-id": "ContactAnalyticsDetailsUpdateWorker",
+                  "source-label": null,
+                  "updated-by-user-id": null,
+                  "timestamp": 1606827047569,
+                  "selected": false
+                }
+              ]
+            },
+            "hs_social_num_broadcast_clicks": {
+              "value": "0",
+              "versions": [
+                {
+                  "value": "0",
+                  "source-type": "ANALYTICS",
+                  "source-id": "ContactAnalyticsDetailsUpdateWorker",
+                  "source-label": null,
+                  "updated-by-user-id": null,
+                  "timestamp": 1606827047569,
+                  "selected": false
+                }
+              ]
+            },
+            "createdate": {
+              "value": "1606827045698",
+              "versions": [
+                {
+                  "value": "1606827045698",
+                  "source-type": "API",
+                  "source-id": "sample-contact",
+                  "source-label": null,
+                  "updated-by-user-id": null,
+                  "timestamp": 1606827045698,
+                  "selected": false
+                }
+              ]
+            },
+            "hs_analytics_num_visits": {
+              "value": "0",
+              "versions": [
+                {
+                  "value": "0",
+                  "source-type": "ANALYTICS",
+                  "source-id": "ContactAnalyticsDetailsUpdateWorker",
+                  "source-label": null,
+                  "updated-by-user-id": null,
+                  "timestamp": 1606827047569,
+                  "selected": false
+                }
+              ]
+            },
+            "hs_social_linkedin_clicks": {
+              "value": "0",
+              "versions": [
+                {
+                  "value": "0",
+                  "source-type": "ANALYTICS",
+                  "source-id": "ContactAnalyticsDetailsUpdateWorker",
+                  "source-label": null,
+                  "updated-by-user-id": null,
+                  "timestamp": 1606827047569,
+                  "selected": false
+                }
+              ]
+            },
+            "hs_marketable_until_renewal": {
+              "value": "true",
+              "versions": [
+                {
+                  "value": "true",
+                  "source-type": "API",
+                  "source-id": "sample-contact",
+                  "source-label": null,
+                  "updated-by-user-id": null,
+                  "timestamp": 1606827045876,
+                  "selected": false
+                }
+              ]
+            },
+            "hs_marketable_status": {
+              "value": "true",
+              "versions": [
+                {
+                  "value": "true",
+                  "source-type": "API",
+                  "source-id": "sample-contact",
+                  "source-label": null,
+                  "updated-by-user-id": null,
+                  "timestamp": 1606827045876,
+                  "selected": false
+                }
+              ]
+            },
+            "hs_analytics_source": {
+              "value": "OFFLINE",
+              "versions": [
+                {
+                  "value": "OFFLINE",
+                  "source-type": "ANALYTICS",
+                  "source-id": "ContactAnalyticsDetailsUpdateWorker",
+                  "source-label": null,
+                  "updated-by-user-id": null,
+                  "timestamp": 1606827047569,
+                  "selected": false
+                }
+              ]
+            },
+            "hs_email_domain": {
+              "value": "hubspot.com",
+              "versions": [
+                {
+                  "value": "hubspot.com",
+                  "source-type": "MIGRATION",
+                  "source-id": "BackfillReadtimeCalculatedPropertiesJob",
+                  "source-label": null,
+                  "updated-by-user-id": null,
+                  "timestamp": 1629469311146,
+                  "selected": false
+                }
+              ]
+            },
+            "hs_analytics_num_page_views": {
+              "value": "0",
+              "versions": [
+                {
+                  "value": "0",
+                  "source-type": "ANALYTICS",
+                  "source-id": "ContactAnalyticsDetailsUpdateWorker",
+                  "source-label": null,
+                  "updated-by-user-id": null,
+                  "timestamp": 1606827047569,
+                  "selected": false
+                }
+              ]
+            },
+            "hs_marketable_reason_id": {
+              "value": "Sample Contact",
+              "versions": [
+                {
+                  "value": "Sample Contact",
+                  "source-type": "API",
+                  "source-id": "sample-contact",
+                  "source-label": null,
+                  "updated-by-user-id": null,
+                  "timestamp": 1606827045876,
+                  "selected": false
+                }
+              ]
+            },
+            "company": {
+              "value": "HubSpot",
+              "versions": [
+                {
+                  "value": "HubSpot",
+                  "source-type": "CONTACTS_WEB",
+                  "source-id": "sample-contact",
+                  "source-label": null,
+                  "updated-by-user-id": null,
+                  "timestamp": 1606827045444,
+                  "selected": false
+                }
+              ]
+            },
+            "state": {
+              "value": "MA",
+              "versions": [
+                {
+                  "value": "MA",
+                  "source-type": "CONTACTS_WEB",
+                  "source-id": "sample-contact",
+                  "source-label": null,
+                  "updated-by-user-id": null,
+                  "timestamp": 1606827045444,
+                  "selected": false
+                }
+              ]
+            },
+            "email": {
+              "value": "bh@hubspot.com",
+              "versions": [
+                {
+                  "value": "bh@hubspot.com",
+                  "source-type": "API",
+                  "source-id": "sample-contact",
+                  "source-label": null,
+                  "updated-by-user-id": null,
+                  "timestamp": 1606827045444,
+                  "selected": false
+                }
+              ]
+            },
+            "hs_latest_source_timestamp": {
+              "value": "1606827045720",
+              "versions": [
+                {
+                  "value": "1606827045720",
+                  "source-type": "MIGRATION",
+                  "source-id": "BackfillContactUpdatesKafka",
+                  "source-label": null,
+                  "updated-by-user-id": null,
+                  "timestamp": 1651750884919,
+                  "selected": false
+                }
+              ]
+            },
+            "website": {
+              "value": "http://www.HubSpot.com",
+              "versions": [
+                {
+                  "value": "http://www.HubSpot.com",
+                  "source-type": "CONTACTS_WEB",
+                  "source-id": "sample-contact",
+                  "source-label": null,
+                  "updated-by-user-id": null,
+                  "timestamp": 1606827045444,
+                  "selected": false
+                }
+              ]
+            },
+            "hs_marketable_reason_type": {
+              "value": "SAMPLE_CONTACT",
+              "versions": [
+                {
+                  "value": "SAMPLE_CONTACT",
+                  "source-type": "API",
+                  "source-id": "sample-contact",
+                  "source-label": null,
+                  "updated-by-user-id": null,
+                  "timestamp": 1606827045876,
+                  "selected": false
+                }
+              ]
+            },
+            "jobtitle": {
+              "value": "CEO",
+              "versions": [
+                {
+                  "value": "CEO",
+                  "source-type": "CONTACTS_WEB",
+                  "source-id": "sample-contact",
+                  "source-label": null,
+                  "updated-by-user-id": null,
+                  "timestamp": 1606827045444,
+                  "selected": false
+                }
+              ]
+            },
+            "lastmodifieddate": {
+              "value": "1651750891986",
+              "versions": [
+                {
+                  "value": "1651750891986",
+                  "source-type": "CALCULATED",
+                  "source-id": null,
+                  "source-label": null,
+                  "updated-by-user-id": null,
+                  "timestamp": 1651750891986,
+                  "selected": false
+                },
+                {
+                  "value": "1639158305597",
+                  "source-type": "CALCULATED",
+                  "source-id": null,
+                  "source-label": null,
+                  "updated-by-user-id": null,
+                  "timestamp": 1639158305597,
+                  "selected": false
+                },
+                {
+                  "value": "1628846625829",
+                  "source-type": "CALCULATED",
+                  "source-id": "BackfillHsPipelineForContacts",
+                  "source-label": null,
+                  "updated-by-user-id": null,
+                  "timestamp": 1628846625829,
+                  "selected": false
+                }
+              ]
+            },
+            "hs_analytics_first_timestamp": {
+              "value": "1606827045444",
+              "versions": [
+                {
+                  "value": "1606827045444",
+                  "source-type": "ANALYTICS",
+                  "source-id": "ContactAnalyticsDetailsUpdateWorker",
+                  "source-label": null,
+                  "updated-by-user-id": null,
+                  "timestamp": 1606827047569,
+                  "selected": false
+                }
+              ]
+            },
+            "hs_social_google_plus_clicks": {
+              "value": "0",
+              "versions": [
+                {
+                  "value": "0",
+                  "source-type": "ANALYTICS",
+                  "source-id": "ContactAnalyticsDetailsUpdateWorker",
+                  "source-label": null,
+                  "updated-by-user-id": null,
+                  "timestamp": 1606827047569,
+                  "selected": false
+                }
+              ]
+            },
+            "hs_analytics_average_page_views": {
+              "value": "0",
+              "versions": [
+                {
+                  "value": "0",
+                  "source-type": "ANALYTICS",
+                  "source-id": "ContactAnalyticsDetailsUpdateWorker",
+                  "source-label": null,
+                  "updated-by-user-id": null,
+                  "timestamp": 1606827047569,
+                  "selected": false
+                }
+              ]
+            },
+            "lastname": {
+              "value": "Halligan (Sample Contact)",
+              "versions": [
+                {
+                  "value": "Halligan (Sample Contact)",
+                  "source-type": "CONTACTS_WEB",
+                  "source-id": "sample-contact",
+                  "source-label": null,
+                  "updated-by-user-id": null,
+                  "timestamp": 1606827045444,
+                  "selected": false
+                }
+              ]
+            },
+            "hs_all_contact_vids": {
+              "value": "51",
+              "versions": [
+                {
+                  "value": "51",
+                  "source-type": "MIGRATION",
+                  "source-id": "BackfillReadtimeCalculatedPropertiesJob",
+                  "source-label": null,
+                  "updated-by-user-id": null,
+                  "timestamp": 1629469311146,
+                  "selected": false
+                }
+              ]
+            },
+            "twitterhandle": {
+              "value": "bhalligan",
+              "versions": [
+                {
+                  "value": "bhalligan",
+                  "source-type": "CONTACTS_WEB",
+                  "source-id": "sample-contact",
+                  "source-label": null,
+                  "updated-by-user-id": null,
+                  "timestamp": 1606827045444,
+                  "selected": false
+                }
+              ]
+            },
+            "hs_social_facebook_clicks": {
+              "value": "0",
+              "versions": [
+                {
+                  "value": "0",
+                  "source-type": "ANALYTICS",
+                  "source-id": "ContactAnalyticsDetailsUpdateWorker",
+                  "source-label": null,
+                  "updated-by-user-id": null,
+                  "timestamp": 1606827047569,
+                  "selected": false
+                }
+              ]
+            },
+            "hs_is_contact": {
+              "value": "true",
+              "versions": [
+                {
+                  "value": "true",
+                  "source-type": "CALCULATED",
+                  "source-id": null,
+                  "source-label": null,
+                  "updated-by-user-id": null,
+                  "timestamp": 1606827045698,
+                  "selected": false
+                }
+              ]
+            },
+            "num_conversion_events": {
+              "value": "0",
+              "versions": [
+                {
+                  "value": "0",
+                  "source-type": "MIGRATION",
+                  "source-id": "BackfillReadtimeCalculatedPropertiesJob",
+                  "source-label": null,
+                  "updated-by-user-id": null,
+                  "timestamp": 1629469311146,
+                  "selected": false
+                }
+              ]
+            },
+            "twitterprofilephoto": {
+              "value": "https://pbs.twimg.com/profile_images/3491742741/212e42c07d3348251da10872e85aa6b0.jpeg",
+              "versions": [
+                {
+                  "value": "https://pbs.twimg.com/profile_images/3491742741/212e42c07d3348251da10872e85aa6b0.jpeg",
+                  "source-type": "CONTACTS_WEB",
+                  "source-id": "sample-contact",
+                  "source-label": null,
+                  "updated-by-user-id": null,
+                  "timestamp": 1606827045444,
+                  "selected": false
+                }
+              ]
+            },
+            "hs_object_id": {
+              "value": "51",
+              "versions": [
+                {
+                  "value": "51",
+                  "source-type": "MIGRATION",
+                  "source-id": "BackfillReadtimeCalculatedPropertiesJob",
+                  "source-label": null,
+                  "updated-by-user-id": null,
+                  "timestamp": 1629469311146,
+                  "selected": false
+                }
+              ]
+            },
+            "hs_analytics_num_event_completions": {
+              "value": "0",
+              "versions": [
+                {
+                  "value": "0",
+                  "source-type": "ANALYTICS",
+                  "source-id": "ContactAnalyticsDetailsUpdateWorker",
+                  "source-label": null,
+                  "updated-by-user-id": null,
+                  "timestamp": 1606827047569,
+                  "selected": false
+                }
+              ]
+            },
+            "hs_social_twitter_clicks": {
+              "value": "0",
+              "versions": [
+                {
+                  "value": "0",
+                  "source-type": "ANALYTICS",
+                  "source-id": "ContactAnalyticsDetailsUpdateWorker",
+                  "source-label": null,
+                  "updated-by-user-id": null,
+                  "timestamp": 1606827047569,
+                  "selected": false
+                }
+              ]
+            },
+            "hs_analytics_source_data_2": {
+              "value": "sample-contact",
+              "versions": [
+                {
+                  "value": "sample-contact",
+                  "source-type": "ANALYTICS",
+                  "source-id": "ContactAnalyticsDetailsUpdateWorker",
+                  "source-label": null,
+                  "updated-by-user-id": null,
+                  "timestamp": 1606827054762,
+                  "selected": false
+                }
+              ]
+            },
+            "hs_lifecyclestage_lead_date": {
+              "value": "1606827045444",
+              "versions": [
+                {
+                  "value": "1606827045444",
+                  "source-type": "CONTACTS_WEB",
+                  "source-id": "sample-contact",
+                  "source-label": null,
+                  "updated-by-user-id": null,
+                  "timestamp": 1606827045444,
+                  "selected": false
+                }
+              ]
+            },
+            "hs_analytics_source_data_1": {
+              "value": "API",
+              "versions": [
+                {
+                  "value": "API",
+                  "source-type": "ANALYTICS",
+                  "source-id": "ContactAnalyticsDetailsUpdateWorker",
+                  "source-label": null,
+                  "updated-by-user-id": null,
+                  "timestamp": 1606827054762,
+                  "selected": false
+                }
+              ]
+            },
+            "lifecyclestage": {
+              "value": "lead",
+              "versions": [
+                {
+                  "value": "lead",
+                  "source-type": "CONTACTS_WEB",
+                  "source-id": "sample-contact",
+                  "source-label": null,
+                  "updated-by-user-id": null,
+                  "timestamp": 1606827045444,
+                  "selected": false
+                }
+              ]
+            }
+          },
+          "form-submissions": [],
+          "list-memberships": [],
+          "identity-profiles": [
+            {
+              "vid": 51,
+              "saved-at-timestamp": 1606827045720,
+              "deleted-changed-timestamp": 0,
+              "identities": [
+                {
+                  "type": "EMAIL",
+                  "value": "bh@hubspot.com",
+                  "timestamp": 1606827045444,
+                  "is-primary": true
+                },
+                {
+                  "type": "LEAD_GUID",
+                  "value": "d3749acc-06e1-4511-84fd-7b0d847f6eff",
+                  "timestamp": 1606827045717
+                }
+              ]
+            }
+          ],
+          "merge-audits": [],
+          "associated-company": {
+            "company-id": 4931550080,
+            "portal-id": 8924380,
+            "properties": {
+              "country": {
+                "value": "United States"
+              },
+              "city": {
+                "value": "Cambridge"
+              },
+              "num_associated_contacts": {
+                "value": "2"
+              },
+              "timezone": {
+                "value": "America/New_York"
+              },
+              "facebook_company_page": {
+                "value": "https://www.facebook.com/hubspot"
+              },
+              "createdate": {
+                "value": "1606827053844"
+              },
+              "description": {
+                "value": "HubSpot is an American developer and marketer of software products for inbound marketing, sales, and customer service."
+              },
+              "hs_analytics_latest_source_data_2": {
+                "value": "sample-contact"
+              },
+              "hs_analytics_latest_source_data_1": {
+                "value": "API"
+              },
+              "hs_num_blockers": {
+                "value": "0"
+              },
+              "industry": {
+                "value": "COMPUTER_SOFTWARE"
+              },
+              "total_money_raised": {
+                "value": "100.5M"
+              },
+              "web_technologies": {
+                "value": "unbounce;instagram;app_nexus;piwik;google_analytics;mixpanel;google_tag_manager;facebook_advertiser;salesforce;cloud_flare;dstillery;twitter_button;hubspot;vidyard;facebook_connect;crazy_egg;amazon__cloudfront;wistia;optimizely"
+              },
+              "numberofemployees": {
+                "value": "5000"
+              },
+              "hs_analytics_num_visits": {
+                "value": "0"
+              },
+              "linkedin_company_page": {
+                "value": "https://www.linkedin.com/company/hubspot"
+              },
+              "hs_analytics_latest_source_timestamp": {
+                "value": "1606827045720"
+              },
+              "hs_analytics_source": {
+                "value": "OFFLINE"
+              },
+              "annualrevenue": {
+                "value": "250000000"
+              },
+              "founded_year": {
+                "value": "2006"
+              },
+              "hs_annual_revenue_currency_code": {
+                "value": "USD"
+              },
+              "hs_analytics_num_page_views": {
+                "value": "0"
+              },
+              "state": {
+                "value": "MA"
+              },
+              "linkedinbio": {
+                "value": "HubSpot is an American developer and marketer of software products for inbound marketing, sales, and customer service."
+              },
+              "hs_num_open_deals": {
+                "value": "0"
+              },
+              "zip": {
+                "value": "02141"
+              },
+              "website": {
+                "value": "hubspot.com"
+              },
+              "address": {
+                "value": "25 First Street"
+              },
+              "hs_analytics_first_timestamp": {
+                "value": "1606827045444"
+              },
+              "first_contact_createdate": {
+                "value": "1606827045444"
+              },
+              "twitterhandle": {
+                "value": "HubSpot"
+              },
+              "hs_target_account_probability": {
+                "value": "0.49565839767456055"
+              },
+              "hs_lastmodifieddate": {
+                "value": "1653392172246"
+              },
+              "hs_num_decision_makers": {
+                "value": "0"
+              },
+              "phone": {
+                "value": "+1 888-482-7768"
+              },
+              "domain": {
+                "value": "hubspot.com"
+              },
+              "hs_num_child_companies": {
+                "value": "0"
+              },
+              "hs_num_contacts_with_buying_roles": {
+                "value": "0"
+              },
+              "hs_object_id": {
+                "value": "4931550080"
+              },
+              "is_public": {
+                "value": "true"
+              },
+              "name": {
+                "value": "HubSpot, Inc."
+              },
+              "hs_analytics_source_data_2": {
+                "value": "sample-contact"
+              },
+              "hs_analytics_latest_source": {
+                "value": "OFFLINE"
+              },
+              "hs_analytics_source_data_1": {
+                "value": "API"
+              }
+            }
+          }
+        }
+      }
+    ]
+  },
+  "connections": {
+    "HubSpot Trigger": {
+      "main": [
+        [
+          {
+            "node": "IF",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "IF": {
+      "main": [
+        [
+          {
+            "node": "Is Gmail, Don't Add to Sheet",
+            "type": "main",
+            "index": 0
+          }
+        ],
+        [
+          {
+            "node": "Google Sheets",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "4748dbbc-75dd-400e-98d1-41bbd82c7208",
+  "id": "cGYp8fpTdh3LAgP5",
+  "meta": {
+    "instanceId": "dbd43d88d26a9e30d8aadc002c9e77f1400c683dd34efe3778d43d27250dde50"
+  },
+  "tags": [
+    {
+      "createdAt": "2023-09-21T09:36:34.726Z",
+      "updatedAt": "2023-09-21T09:36:52.231Z",
+      "id": "vh6ctEIEfFztmSF2",
+      "name": "release-template-version"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/cypress/fixtures/Plan_data_opt_in_trial.json b/cypress/fixtures/Plan_data_opt_in_trial.json
new file mode 100644
index 0000000000000..7a805708c651d
--- /dev/null
+++ b/cypress/fixtures/Plan_data_opt_in_trial.json
@@ -0,0 +1,28 @@
+{
+	"id": 200,
+	"planId": 1,
+	"pruneExecutionsInterval": 168,
+	"monthlyExecutionsLimit": 1000,
+	"activeWorkflowsLimit": 20,
+	"credentialsLimit": 100,
+	"supportTier": "community",
+	"displayName": "Trial",
+	"enabledFeatures": ["userManagement", "advancedExecutionFilters", "sharing"],
+	"licenseFeatures": {
+		"feat:sharing": true,
+		"feat:advancedExecutionFilters": true,
+		"quota:users": -1,
+		"quota:maxVariables": -1,
+		"feat:variables": true
+	},
+	"metadata": {
+		"version": "v1",
+		"group": "trial",
+		"slug": "trial-2",
+		"trial": {
+			"length": 14,
+			"gracePeriod": 3
+		}
+	},
+	"expirationDate": "2023-08-30T15:47:27.611Z"
+}
diff --git a/cypress/fixtures/Schedule_pinned.json b/cypress/fixtures/Schedule_pinned.json
new file mode 100644
index 0000000000000..e27623b6fae61
--- /dev/null
+++ b/cypress/fixtures/Schedule_pinned.json
@@ -0,0 +1,313 @@
+{
+  "name": "Schedule + pinned",
+  "nodes": [
+    {
+      "parameters": {
+        "rule": {
+          "interval": [
+            {}
+          ]
+        }
+      },
+      "id": "66358c29-b263-43dd-be25-3b068b0a88eb",
+      "name": "Schedule Trigger",
+      "type": "n8n-nodes-base.scheduleTrigger",
+      "typeVersion": 1.1,
+      "position": [
+        660,
+        340
+      ]
+    },
+    {
+      "parameters": {
+        "options": {}
+      },
+      "id": "6d903354-4e59-4032-81fe-426a5d6ec33c",
+      "name": "Edit Fields",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.2,
+      "position": [
+        860,
+        240
+      ]
+    },
+    {
+      "parameters": {
+        "options": {}
+      },
+      "id": "d8a1e9cf-81d3-400f-97d4-ad6167e7b236",
+      "name": "Edit Fields1",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.2,
+      "position": [
+        860,
+        440
+      ]
+    },
+    {
+      "parameters": {
+        "options": {}
+      },
+      "id": "bdc41148-067e-4649-8f21-5707b128d877",
+      "name": "Edit Fields2",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.2,
+      "position": [
+        1080,
+        440
+      ]
+    },
+    {
+      "parameters": {
+        "options": {}
+      },
+      "id": "d5a4337f-a6b3-4b51-9b02-e668593d9ae8",
+      "name": "Edit Fields3",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.2,
+      "position": [
+        1300,
+        440
+      ]
+    },
+    {
+      "parameters": {
+        "options": {}
+      },
+      "id": "fbc23f60-e7f6-4423-9329-33b0e4809a9a",
+      "name": "Edit Fields4",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.2,
+      "position": [
+        1500,
+        440
+      ]
+    },
+    {
+      "parameters": {
+        "options": {}
+      },
+      "id": "eaee47b0-94ec-4137-bfeb-a6c1a2c63f81",
+      "name": "Edit Fields5",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.2,
+      "position": [
+        1080,
+        240
+      ]
+    },
+    {
+      "parameters": {
+        "options": {}
+      },
+      "id": "eabb6308-21e9-4e59-8f74-9220a03c3186",
+      "name": "Edit Fields6",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.2,
+      "position": [
+        1300,
+        240
+      ]
+    },
+    {
+      "parameters": {
+        "options": {}
+      },
+      "id": "8812a45b-5545-4080-aad8-8e9f7b17ecd7",
+      "name": "Edit Fields7",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.2,
+      "position": [
+        1500,
+        240
+      ]
+    },
+    {
+      "parameters": {
+        "options": {}
+      },
+      "id": "d5ea3c5b-0b3e-4514-93e1-9c88563bab5c",
+      "name": "Edit Fields9",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.2,
+      "position": [
+        1700,
+        240
+      ]
+    },
+    {
+      "parameters": {
+        "options": {}
+      },
+      "id": "7af34474-5cd0-40b1-abea-850858e3b495",
+      "name": "Edit Fields10",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.2,
+      "position": [
+        1700,
+        440
+      ]
+    }
+  ],
+  "pinData": {
+    "Schedule Trigger": [
+      {
+        "json": {
+          "name": "First item",
+          "code": 1
+        }
+      },
+      {
+        "json": {
+          "name": "Second item",
+          "code": 2
+        }
+      }
+    ],
+    "Edit Fields7": [
+      {
+        "json": {
+          "name": "First item",
+          "code": 1
+        }
+      },
+      {
+        "json": {
+          "name": "Second item",
+          "code": 2
+        }
+      }
+    ],
+    "Edit Fields2": [
+      {
+        "json": {
+          "name": "First item",
+          "code": 1
+        }
+      },
+      {
+        "json": {
+          "name": "Second item",
+          "code": 2
+        }
+      }
+    ]
+  },
+  "connections": {
+    "Schedule Trigger": {
+      "main": [
+        [
+          {
+            "node": "Edit Fields",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Edit Fields1",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Edit Fields1": {
+      "main": [
+        [
+          {
+            "node": "Edit Fields2",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Edit Fields2": {
+      "main": [
+        [
+          {
+            "node": "Edit Fields3",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Edit Fields3": {
+      "main": [
+        [
+          {
+            "node": "Edit Fields4",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Edit Fields5": {
+      "main": [
+        [
+          {
+            "node": "Edit Fields6",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Edit Fields6": {
+      "main": [
+        [
+          {
+            "node": "Edit Fields7",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Edit Fields": {
+      "main": [
+        [
+          {
+            "node": "Edit Fields5",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Edit Fields7": {
+      "main": [
+        [
+          {
+            "node": "Edit Fields9",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Edit Fields4": {
+      "main": [
+        [
+          {
+            "node": "Edit Fields10",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "9b6c68c0-f94f-45bc-a604-bf97d17a47ac",
+  "meta": {
+    "templateCredsSetupCompleted": true,
+    "instanceId": "8a47b83b4479b11330fdf21ccc96d4a8117035a968612e452b4c87bfd09c16c7"
+  },
+  "id": "nWzcnYUb3AVaZpHG",
+  "tags": []
+}
diff --git a/cypress/fixtures/Settings_user_activation_modal_enabled.json b/cypress/fixtures/Settings_user_activation_modal_enabled.json
deleted file mode 100644
index 8ce6a5fca67e2..0000000000000
--- a/cypress/fixtures/Settings_user_activation_modal_enabled.json
+++ /dev/null
@@ -1,90 +0,0 @@
-{
-	"data": {
-			"endpointWebhook": "webhook",
-			"endpointWebhookTest": "webhook-test",
-			"saveDataErrorExecution": "all",
-			"saveDataSuccessExecution": "all",
-			"saveManualExecutions": false,
-			"executionTimeout": -1,
-			"maxExecutionTimeout": 3600,
-			"workflowCallerPolicyDefaultOption": "workflowsFromSameOwner",
-			"timezone": "America/New_York",
-			"urlBaseWebhook": "http://localhost:5678/",
-			"urlBaseEditor": "http://localhost:5678",
-			"versionCli": "0.221.2",
-			"oauthCallbackUrls": {
-				"oauth1": "http://localhost:5678/rest/oauth1-credential/callback",
-				"oauth2": "http://localhost:5678/rest/oauth2-credential/callback"
-			},
-			"versionNotifications": {
-				"enabled": true,
-				"endpoint": "https://api.n8n.io/api/versions/",
-				"infoUrl": "https://docs.n8n.io/release-notes/"
-			},
-			"instanceId": "c229842c6d1e217486d04caf7223758e08385156ca87a58286c850760c7161f4",
-			"telemetry": {
-				"enabled": true
-			},
-			"posthog": {
-				"enabled": false,
-				"apiHost": "https://ph.n8n.io",
-				"apiKey": "phc_4URIAm1uYfJO7j8kWSe0J8lc8IqnstRLS7Jx8NcakHo",
-				"autocapture": false,
-				"disableSessionRecording": true,
-				"debug": false
-			},
-			"personalizationSurveyEnabled": false,
-			"userActivationSurveyEnabled": true,
-			"defaultLocale": "en",
-			"userManagement": {
-				"enabled": true,
-				"showSetupOnFirstLoad": false,
-				"smtpSetup": false
-			},
-			"sso": {
-				"saml": {
-					"loginEnabled": false,
-					"loginLabel": ""
-				},
-				"ldap": {
-					"loginEnabled": false,
-					"loginLabel": ""
-				}
-			},
-			"publicApi": {
-				"enabled": false,
-				"latestVersion": 1,
-				"path": "api",
-				"swaggerUi": {
-					"enabled": true
-				}
-			},
-			"workflowTagsDisabled": false,
-			"logLevel": "info",
-			"hiringBannerEnabled": true,
-			"templates": {
-				"enabled": true,
-				"host": "https://api.n8n.io/api/"
-			},
-			"onboardingCallPromptEnabled": true,
-			"executionMode": "regular",
-			"pushBackend": "sse",
-			"communityNodesEnabled": true,
-			"deployment": {
-				"type": "default"
-			},
-			"isNpmAvailable": false,
-			"allowedModules": {},
-			"enterprise": {
-				"sharing": true,
-				"ldap": true,
-				"saml": false,
-				"logStreaming": false,
-				"advancedExecutionFilters": false
-			},
-			"hideUsagePage": false,
-			"license": {
-				"environment": "production"
-			}
-		}
-}
diff --git a/cypress/fixtures/Suggested_Templates.json b/cypress/fixtures/Suggested_Templates.json
new file mode 100644
index 0000000000000..3f69c4b1a90bb
--- /dev/null
+++ b/cypress/fixtures/Suggested_Templates.json
@@ -0,0 +1,655 @@
+{
+	"sections": [
+			{
+					"name": "Lead enrichment",
+					"description": "Explore curated lead enrichment workflows or start fresh with a blank canvas",
+					"workflows": [
+							{
+									"title": "Score new leads with AI from Facebook Lead Ads with AI and get notifications for high scores on Slack",
+									"description": "This workflow will help you save tons of time and will notify you fully automatically about the most important incoming leads from Facebook Lead Ads. The workflow will automatically fire for every submission. It will then take the name, company, and email information, enrich the submitter via AI, and score it based on metrics that you can easily set.",
+									"preview": {
+											"nodes": [
+													{
+															"parameters": {
+																	"operation": "create",
+																	"base": {
+																			"__rl": true,
+																			"mode": "list",
+																			"value": ""
+																	},
+																	"table": {
+																			"__rl": true,
+																			"mode": "list",
+																			"value": ""
+																	},
+																	"columns": {
+																			"mappingMode": "defineBelow",
+																			"value": {},
+																			"matchingColumns": [],
+																			"schema": []
+																	},
+																	"options": {}
+															},
+															"id": "b09d4f4d-19fa-43de-8148-2d430a04956f",
+															"name": "Airtable",
+															"type": "n8n-nodes-base.airtable",
+															"typeVersion": 2,
+															"position": [
+																	1800,
+																	740
+															]
+													},
+													{
+															"parameters": {},
+															"id": "551313bb-1e01-4133-9956-e6f09968f2ce",
+															"name": "When clicking \"Test workflow\"",
+															"type": "n8n-nodes-base.manualTrigger",
+															"typeVersion": 1,
+															"position": [
+																	920,
+																	740
+															]
+													},
+													{
+															"parameters": {
+																	"options": {}
+															},
+															"id": "b4c089ee-2adb-435e-8d48-47012c981a11",
+															"name": "Get image",
+															"type": "n8n-nodes-base.httpRequest",
+															"typeVersion": 4.1,
+															"position": [
+																	1140,
+																	740
+															]
+													},
+													{
+															"parameters": {
+																	"operation": "extractHtmlContent",
+																	"options": {}
+															},
+															"id": "04ca2f61-b930-4fbc-b467-3470c0d93d64",
+															"name": "Extract Information",
+															"type": "n8n-nodes-base.html",
+															"typeVersion": 1,
+															"position": [
+																	1360,
+																	740
+															]
+													},
+													{
+															"parameters": {
+																	"options": {}
+															},
+															"id": "d1a77493-c579-4ac4-b6a7-708eea2bf8ce",
+															"name": "Set Information",
+															"type": "n8n-nodes-base.set",
+															"typeVersion": 3.2,
+															"position": [
+																	1580,
+																	740
+															]
+													}
+											],
+											"connections": {
+													"When clicking \"Test workflow\"": {
+															"main": [
+																	[
+																			{
+																					"node": "Get image",
+																					"type": "main",
+																					"index": 0
+																			}
+																	]
+															]
+													},
+													"Get image": {
+															"main": [
+																	[
+																			{
+																					"node": "Extract Information",
+																					"type": "main",
+																					"index": 0
+																			}
+																	]
+															]
+													},
+													"Extract Information": {
+															"main": [
+																	[
+																			{
+																					"node": "Set Information",
+																					"type": "main",
+																					"index": 0
+																			}
+																	]
+															]
+													},
+													"Set Information": {
+															"main": [
+																	[
+																			{
+																					"node": "Airtable",
+																					"type": "main",
+																					"index": 0
+																			}
+																	]
+															]
+													}
+											}
+									},
+									"nodes": [
+											{
+													"id": 24,
+													"icon": "fa:code-branch",
+													"defaults": {
+															"color": "#00bbcc"
+													},
+													"iconData": {
+															"icon": "code-branch",
+															"type": "icon"
+													},
+													"displayName": "Merge"
+											}
+									]
+							},
+							{
+									"title": "Verify the email address every time a contact is created in HubSpot",
+									"description": "This workflow will help you save tons of time and will notify you fully automatically about the most important incoming leads from Facebook Lead Ads. The workflow will automatically fire for every submission. It will then take the name, company, and email information, enrich the submitter via AI, and score it based on metrics that you can easily set.",
+									"preview": {
+											"nodes": [
+													{
+															"parameters": {
+																	"operation": "create",
+																	"base": {
+																			"__rl": true,
+																			"mode": "list",
+																			"value": ""
+																	},
+																	"table": {
+																			"__rl": true,
+																			"mode": "list",
+																			"value": ""
+																	},
+																	"columns": {
+																			"mappingMode": "defineBelow",
+																			"value": {},
+																			"matchingColumns": [],
+																			"schema": []
+																	},
+																	"options": {}
+															},
+															"id": "b09d4f4d-19fa-43de-8148-2d430a04956f",
+															"name": "Airtable",
+															"type": "n8n-nodes-base.airtable",
+															"typeVersion": 2,
+															"position": [
+																	1800,
+																	740
+															]
+													},
+													{
+															"parameters": {},
+															"id": "551313bb-1e01-4133-9956-e6f09968f2ce",
+															"name": "When clicking \"Test workflow\"",
+															"type": "n8n-nodes-base.manualTrigger",
+															"typeVersion": 1,
+															"position": [
+																	920,
+																	740
+															]
+													},
+													{
+															"parameters": {
+																	"options": {}
+															},
+															"id": "b4c089ee-2adb-435e-8d48-47012c981a11",
+															"name": "Get image",
+															"type": "n8n-nodes-base.httpRequest",
+															"typeVersion": 4.1,
+															"position": [
+																	1140,
+																	740
+															]
+													},
+													{
+															"parameters": {
+																	"operation": "extractHtmlContent",
+																	"options": {}
+															},
+															"id": "04ca2f61-b930-4fbc-b467-3470c0d93d64",
+															"name": "Extract Information",
+															"type": "n8n-nodes-base.html",
+															"typeVersion": 1,
+															"position": [
+																	1360,
+																	740
+															]
+													},
+													{
+															"parameters": {
+																	"options": {}
+															},
+															"id": "d1a77493-c579-4ac4-b6a7-708eea2bf8ce",
+															"name": "Set Information",
+															"type": "n8n-nodes-base.set",
+															"typeVersion": 3.2,
+															"position": [
+																	1580,
+																	740
+															]
+													}
+											],
+											"connections": {
+													"When clicking \"Test workflow\"": {
+															"main": [
+																	[
+																			{
+																					"node": "Get image",
+																					"type": "main",
+																					"index": 0
+																			}
+																	]
+															]
+													},
+													"Get image": {
+															"main": [
+																	[
+																			{
+																					"node": "Extract Information",
+																					"type": "main",
+																					"index": 0
+																			}
+																	]
+															]
+													},
+													"Extract Information": {
+															"main": [
+																	[
+																			{
+																					"node": "Set Information",
+																					"type": "main",
+																					"index": 0
+																			}
+																	]
+															]
+													},
+													"Set Information": {
+															"main": [
+																	[
+																			{
+																					"node": "Airtable",
+																					"type": "main",
+																					"index": 0
+																			}
+																	]
+															]
+													}
+											}
+									},
+									"nodes": [
+											{
+													"id": 14,
+													"icon": "fa:code",
+													"name": "n8n-nodes-base.function",
+													"defaults": {
+															"name": "Function",
+															"color": "#FF9922"
+													},
+													"iconData": {
+															"icon": "code",
+															"type": "icon"
+													},
+													"categories": [
+															{
+																	"id": 5,
+																	"name": "Development"
+															},
+															{
+																	"id": 9,
+																	"name": "Core Nodes"
+															}
+													],
+													"displayName": "Function",
+													"typeVersion": 1
+											},
+											{
+													"id": 24,
+													"icon": "fa:code-branch",
+													"name": "n8n-nodes-base.merge",
+													"defaults": {
+															"name": "Merge",
+															"color": "#00bbcc"
+													},
+													"iconData": {
+															"icon": "code-branch",
+															"type": "icon"
+													},
+													"categories": [
+															{
+																	"id": 9,
+																	"name": "Core Nodes"
+															}
+													],
+													"displayName": "Merge",
+													"typeVersion": 2
+											}
+									]
+							},
+							{
+									"title": "Enrich leads from HubSpot with company information via OpenAi",
+									"description": "This workflow will help you save tons of time and will notify you fully automatically about the most important incoming leads from Facebook Lead Ads. The workflow will automatically fire for every submission. It will then take the name, company, and email information, enrich the submitter via AI, and score it based on metrics that you can easily set.",
+									"preview": {
+											"nodes": [
+													{
+															"parameters": {
+																	"operation": "create",
+																	"base": {
+																			"__rl": true,
+																			"mode": "list",
+																			"value": ""
+																	},
+																	"table": {
+																			"__rl": true,
+																			"mode": "list",
+																			"value": ""
+																	},
+																	"columns": {
+																			"mappingMode": "defineBelow",
+																			"value": {},
+																			"matchingColumns": [],
+																			"schema": []
+																	},
+																	"options": {}
+															},
+															"id": "b09d4f4d-19fa-43de-8148-2d430a04956f",
+															"name": "Airtable",
+															"type": "n8n-nodes-base.airtable",
+															"typeVersion": 2,
+															"position": [
+																	1800,
+																	740
+															]
+													},
+													{
+															"parameters": {},
+															"id": "551313bb-1e01-4133-9956-e6f09968f2ce",
+															"name": "When clicking \"Test workflow\"",
+															"type": "n8n-nodes-base.manualTrigger",
+															"typeVersion": 1,
+															"position": [
+																	920,
+																	740
+															]
+													},
+													{
+															"parameters": {
+																	"options": {}
+															},
+															"id": "b4c089ee-2adb-435e-8d48-47012c981a11",
+															"name": "Get image",
+															"type": "n8n-nodes-base.httpRequest",
+															"typeVersion": 4.1,
+															"position": [
+																	1140,
+																	740
+															]
+													},
+													{
+															"parameters": {
+																	"operation": "extractHtmlContent",
+																	"options": {}
+															},
+															"id": "04ca2f61-b930-4fbc-b467-3470c0d93d64",
+															"name": "Extract Information",
+															"type": "n8n-nodes-base.html",
+															"typeVersion": 1,
+															"position": [
+																	1360,
+																	740
+															]
+													},
+													{
+															"parameters": {
+																	"options": {}
+															},
+															"id": "d1a77493-c579-4ac4-b6a7-708eea2bf8ce",
+															"name": "Set Information",
+															"type": "n8n-nodes-base.set",
+															"typeVersion": 3.2,
+															"position": [
+																	1580,
+																	740
+															]
+													}
+											],
+											"connections": {
+													"When clicking \"Test workflow\"": {
+															"main": [
+																	[
+																			{
+																					"node": "Get image",
+																					"type": "main",
+																					"index": 0
+																			}
+																	]
+															]
+													},
+													"Get image": {
+															"main": [
+																	[
+																			{
+																					"node": "Extract Information",
+																					"type": "main",
+																					"index": 0
+																			}
+																	]
+															]
+													},
+													"Extract Information": {
+															"main": [
+																	[
+																			{
+																					"node": "Set Information",
+																					"type": "main",
+																					"index": 0
+																			}
+																	]
+															]
+													},
+													"Set Information": {
+															"main": [
+																	[
+																			{
+																					"node": "Airtable",
+																					"type": "main",
+																					"index": 0
+																			}
+																	]
+															]
+													}
+											}
+									},
+									"nodes": [
+											{
+													"id": 14,
+													"icon": "fa:code",
+													"defaults": {
+															"name": "Function",
+															"color": "#FF9922"
+													},
+													"iconData": {
+															"icon": "code",
+															"type": "icon"
+													},
+													"displayName": "Function"
+											}
+									]
+							},
+							{
+									"title": "Score new lead submissions from Facebook Lead Ads with AI and notify me on Slack when it is a high score lead",
+									"description": "This workflow will help you save tons of time and will notify you fully automatically about the most important incoming leads from Facebook Lead Ads. The workflow will automatically fire for every submission. It will then take the name, company, and email information, enrich the submitter via AI, and score it based on metrics that you can easily set.",
+									"preview": {
+											"nodes": [
+													{
+															"parameters": {
+																	"operation": "create",
+																	"base": {
+																			"__rl": true,
+																			"mode": "list",
+																			"value": ""
+																	},
+																	"table": {
+																			"__rl": true,
+																			"mode": "list",
+																			"value": ""
+																	},
+																	"columns": {
+																			"mappingMode": "defineBelow",
+																			"value": {},
+																			"matchingColumns": [],
+																			"schema": []
+																	},
+																	"options": {}
+															},
+															"id": "b09d4f4d-19fa-43de-8148-2d430a04956f",
+															"name": "Airtable",
+															"type": "n8n-nodes-base.airtable",
+															"typeVersion": 2,
+															"position": [
+																	1800,
+																	740
+															]
+													},
+													{
+															"parameters": {},
+															"id": "551313bb-1e01-4133-9956-e6f09968f2ce",
+															"name": "When clicking \"Test workflow\"",
+															"type": "n8n-nodes-base.manualTrigger",
+															"typeVersion": 1,
+															"position": [
+																	920,
+																	740
+															]
+													},
+													{
+															"parameters": {
+																	"options": {}
+															},
+															"id": "b4c089ee-2adb-435e-8d48-47012c981a11",
+															"name": "Get image",
+															"type": "n8n-nodes-base.httpRequest",
+															"typeVersion": 4.1,
+															"position": [
+																	1140,
+																	740
+															]
+													},
+													{
+															"parameters": {
+																	"operation": "extractHtmlContent",
+																	"options": {}
+															},
+															"id": "04ca2f61-b930-4fbc-b467-3470c0d93d64",
+															"name": "Extract Information",
+															"type": "n8n-nodes-base.html",
+															"typeVersion": 1,
+															"position": [
+																	1360,
+																	740
+															]
+													},
+													{
+															"parameters": {
+																	"options": {}
+															},
+															"id": "d1a77493-c579-4ac4-b6a7-708eea2bf8ce",
+															"name": "Set Information",
+															"type": "n8n-nodes-base.set",
+															"typeVersion": 3.2,
+															"position": [
+																	1580,
+																	740
+															]
+													}
+											],
+											"connections": {
+													"When clicking \"Test workflow\"": {
+															"main": [
+																	[
+																			{
+																					"node": "Get image",
+																					"type": "main",
+																					"index": 0
+																			}
+																	]
+															]
+													},
+													"Get image": {
+															"main": [
+																	[
+																			{
+																					"node": "Extract Information",
+																					"type": "main",
+																					"index": 0
+																			}
+																	]
+															]
+													},
+													"Extract Information": {
+															"main": [
+																	[
+																			{
+																					"node": "Set Information",
+																					"type": "main",
+																					"index": 0
+																			}
+																	]
+															]
+													},
+													"Set Information": {
+															"main": [
+																	[
+																			{
+																					"node": "Airtable",
+																					"type": "main",
+																					"index": 0
+																			}
+																	]
+															]
+													}
+											}
+									},
+									"nodes": [
+											{
+													"id": 14,
+													"icon": "fa:code",
+													"defaults": {
+															"name": "Function",
+															"color": "#FF9922"
+													},
+													"iconData": {
+															"icon": "code",
+															"type": "icon"
+													},
+													"displayName": "Function"
+											},
+											{
+													"id": 24,
+													"icon": "fa:code-branch",
+													"defaults": {
+															"name": "Merge",
+															"color": "#00bbcc"
+													},
+													"iconData": {
+															"icon": "code-branch",
+															"type": "icon"
+													},
+													"displayName": "Merge"
+											}
+									]
+							}
+					]
+			}
+	]
+}
diff --git a/cypress/fixtures/Test_Template_1.json b/cypress/fixtures/Test_Template_1.json
new file mode 100644
index 0000000000000..f15970677e1d5
--- /dev/null
+++ b/cypress/fixtures/Test_Template_1.json
@@ -0,0 +1,177 @@
+{
+	"workflow": {
+			"id": 1205,
+			"name": "Promote new Shopify products on Twitter and Telegram",
+			"views": 478,
+			"recentViews": 9880,
+			"totalViews": 478,
+			"createdAt": "2021-08-24T10:40:50.007Z",
+			"description": "This workflow automatically promotes your new Shopify products on Twitter and Telegram. This workflow is also featured in the blog post [*6 e-commerce workflows to power up your Shopify store*](https://n8n.io/blog/no-code-ecommerce-workflow-automations/#promote-your-new-products-on-social-media).\n\n## Prerequisites\n\n- A Shopify account and [credentials](https://docs.n8n.io/integrations/credentials/shopify/)\n- A Twitter account and [credentials](https://docs.n8n.io/integrations/credentials/twitter/)\n- A Telegram account and [credentials](https://docs.n8n.io/integrations/credentials/telegram/) for the channel you want to send messages to.\n\n## Nodes\n\n- [Shopify Trigger node](https://docs.n8n.io/integrations/trigger-nodes/n8n-nodes-base.shopifytrigger/) triggers the workflow when you create a new product in Shopify.\n- [Twitter node](https://docs.n8n.io/integrations/nodes/n8n-nodes-base.twitter/) posts a tweet with the text \"Hey there, my design is now on a new product! Visit my {shop name} to get this cool {product title} (and check out more {product type})\".\n- [Telegram node](https://docs.n8n.io/integrations/nodes/n8n-nodes-base.telegram/) posts a message with the same text as above in a Telegram channel.",
+			"workflow": {
+					"nodes": [
+							{
+									"name": "Twitter",
+									"type": "n8n-nodes-base.twitter",
+									"position": [
+											720,
+											-220
+									],
+									"parameters": {
+											"text": "=Hey there, my design is now on a new product ✨\nVisit my {{$json[\"vendor\"]}} shop to get this cool{{$json[\"title\"]}} (and check out more {{$json[\"product_type\"]}}) 🛍️",
+											"additionalFields": {}
+									},
+									"credentials": {
+											"twitterOAuth1Api": "twitter"
+									},
+									"typeVersion": 1
+							},
+							{
+									"name": "Telegram",
+									"type": "n8n-nodes-base.telegram",
+									"position": [
+											720,
+											-20
+									],
+									"parameters": {
+											"text": "=Hey there, my design is now on a new product!\nVisit my {{$json[\"vendor\"]}} shop to get this cool{{$json[\"title\"]}} (and check out more {{$json[\"product_type\"]}})",
+											"chatId": "123456",
+											"additionalFields": {}
+									},
+									"credentials": {
+											"telegramApi": "telegram_habot"
+									},
+									"typeVersion": 1
+							},
+							{
+									"name": "product created",
+									"type": "n8n-nodes-base.shopifyTrigger",
+									"position": [
+											540,
+											-110
+									],
+									"webhookId": "2a7e0e50-8f09-4a2b-bf54-a849a6ac4fe0",
+									"parameters": {
+											"topic": "products/create"
+									},
+									"credentials": {
+											"shopifyApi": "shopify_nodeqa"
+									},
+									"typeVersion": 1
+							}
+					],
+					"connections": {
+							"product created": {
+									"main": [
+											[
+													{
+															"node": "Twitter",
+															"type": "main",
+															"index": 0
+													},
+													{
+															"node": "Telegram",
+															"type": "main",
+															"index": 0
+													}
+											]
+									]
+							}
+					}
+			},
+			"workflowInfo": {
+					"nodeCount": 3,
+					"nodeTypes": {
+							"n8n-nodes-base.twitter": {
+									"count": 1
+							},
+							"n8n-nodes-base.telegram": {
+									"count": 1
+							},
+							"n8n-nodes-base.shopifyTrigger": {
+									"count": 1
+							}
+					}
+			},
+			"user": {
+					"username": "lorenanda"
+			},
+			"nodes": [
+					{
+							"id": 49,
+							"icon": "file:telegram.svg",
+							"name": "n8n-nodes-base.telegram",
+							"defaults": {
+									"name": "Telegram"
+							},
+							"iconData": {
+									"type": "file",
+									"fileBuffer": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgNjYgNjYiIGZpbGw9IiNmZmYiIGZpbGwtcnVsZT0iZXZlbm9kZCIgc3Ryb2tlPSIjMDAwIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiPjx1c2UgeGxpbms6aHJlZj0iI2EiIHg9Ii41IiB5PSIuNSIvPjxzeW1ib2wgaWQ9ImEiIG92ZXJmbG93PSJ2aXNpYmxlIj48ZyBzdHJva2U9Im5vbmUiIGZpbGwtcnVsZT0ibm9uemVybyI+PHBhdGggZD0iTTAgMzJjMCAxNy42NzMgMTQuMzI3IDMyIDMyIDMyczMyLTE0LjMyNyAzMi0zMlM0OS42NzMgMCAzMiAwIDAgMTQuMzI3IDAgMzIiIGZpbGw9IiMzN2FlZTIiLz48cGF0aCBkPSJNMjEuNjYxIDM0LjMzOGwzLjc5NyAxMC41MDhzLjQ3NS45ODMuOTgzLjk4MyA4LjA2OC03Ljg2NCA4LjA2OC03Ljg2NGw4LjQwNy0xNi4yMzctMjEuMTE5IDkuODk4eiIgZmlsbD0iI2M4ZGFlYSIvPjxwYXRoIGQ9Ik0yNi42OTUgMzcuMDM0bC0uNzI5IDcuNzQ2cy0uMzA1IDIuMzczIDIuMDY4IDBsNC42NDQtNC4yMDMiIGZpbGw9IiNhOWM2ZDgiLz48cGF0aCBkPSJNMjEuNzMgMzQuNzEybC03LjgwOS0yLjU0NXMtLjkzMi0uMzc4LS42MzMtMS4yMzdjLjA2Mi0uMTc3LjE4Ni0uMzI4LjU1OS0uNTg4IDEuNzMxLTEuMjA2IDMyLjAyOC0xMi4wOTYgMzIuMDI4LTEyLjA5NnMuODU2LS4yODggMS4zNjEtLjA5N2MuMjMxLjA4OC4zNzguMTg3LjUwMy41NDguMDQ1LjEzMi4wNzEuNDExLjA2OC42ODktLjAwMy4yMDEtLjAyNy4zODYtLjA0NS42NzgtLjE4NCAyLjk3OC01LjcwNiAyNS4xOTgtNS43MDYgMjUuMTk4cy0uMzMgMS4zLTEuNTE0IDEuMzQ1Yy0uNDMyLjAxNi0uOTU2LS4wNzEtMS41ODItLjYxLTIuMzIzLTEuOTk4LTEwLjM1Mi03LjM5NC0xMi4xMjYtOC41OGEuMzQuMzQgMCAwMS0uMTQ2LS4yMzljLS4wMjUtLjEyNS4xMDgtLjI4LjEwOC0uMjhzMTMuOTgtMTIuNDI3IDE0LjM1Mi0xMy43MzFjLjAyOS0uMTAxLS4wNzktLjE1MS0uMjI2LS4xMDctLjkyOS4zNDItMTcuMDI1IDEwLjUwNi0xOC44MDEgMTEuNjI5LS4xMDQuMDY2LS4zOTUuMDIzLS4zOTUuMDIzIi8+PC9nPjwvc3ltYm9sPjwvc3ZnPg=="
+							},
+							"categories": [
+									{
+											"id": 6,
+											"name": "Communication"
+									}
+							],
+							"displayName": "Telegram",
+							"typeVersion": 1
+					},
+					{
+							"id": 107,
+							"icon": "file:shopify.svg",
+							"name": "n8n-nodes-base.shopifyTrigger",
+							"defaults": {
+									"name": "Shopify Trigger"
+							},
+							"iconData": {
+									"type": "file",
+									"fileBuffer": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgNTggNjYiIGZpbGw9IiNmZmYiIGZpbGwtcnVsZT0iZXZlbm9kZCIgc3Ryb2tlPSIjMDAwIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiPjx1c2UgeGxpbms6aHJlZj0iI2EiIHg9Ii41IiB5PSIuNSIvPjxzeW1ib2wgaWQ9ImEiIG92ZXJmbG93PSJ2aXNpYmxlIj48ZyBzdHJva2U9Im5vbmUiIGZpbGwtcnVsZT0ibm9uemVybyI+PHBhdGggZD0iTTQ5LjI1NSAxMi40ODRhLjYzMy42MzMgMCAwMC0uNTY0LS41MjdjLS4yMjUtLjAzNy01LjE3LS4zNzYtNS4xNy0uMzc2bC0zLjc3LTMuNzdjLS4zNC0uMzc2LTEuMDkyLS4yNjYtMS4zNzYtLjE4OC0uMDM3IDAtLjc1Mi4yMjUtMS45MjIuNjA1LTEuMTM3LTMuMy0zLjE1LTYuMzA2LTYuNjk2LTYuMzA2aC0uMzAzQzI4LjQzOC42MDUgMjcuMTk0IDAgMjYuMTQ0IDBjLTguMjU2LjAzNy0xMi4yIDEwLjMzMy0xMy40MzQgMTUuNTk0bC01Ljc3IDEuNzdjLTEuNzcuNTY0LTEuODM1LjYwNS0yLjA3MyAyLjI5M0wwIDU3LjE3NSAzNi40NjggNjRsMTkuNzYzLTQuMjZjMC0uMDM3LTYuOTQtNDYuODk3LTYuOTc2LTQ3LjI1NXpNMzQuNDMxIDguODZjLS45MTcuMzAzLTEuOTYzLjYwNS0zLjEuOTQ1di0uNjhhMTUuMDMgMTUuMDMgMCAwMC0uNzUyLTQuOTk5YzEuODQ4LjI4NCAzLjEgMi4zNTcgMy44NDMgNC43MzN6bS02LjA2OC00LjI5OGMuNjAzIDEuNzc4Ljg4MyAzLjY1LjgyNiA1LjUyN3YuMzRsLTYuMzc1IDEuOTYzYzEuMjQ4LTQuNjYgMy41NS02Ljk2MiA1LjU1LTcuODN6bS0yLjQ1LTIuMjkzYTEuOTQgMS45NCAwIDAxMS4wNTUuMzM5Yy0yLjY2IDEuMjM4LTUuNDcyIDQuMzY2LTYuNjc4IDEwLjYyN2wtNS4wNDUgMS41NDZDMTYuNjY4IDEwLjAzIDE5Ljk4OCAyLjI2IDI1LjkxIDIuMjZ6IiBmaWxsPSIjOTViZjQ3Ii8+PHBhdGggZD0iTTQ4LjY5MSAxMS45NTdjLS4yMjUtLjAzNy01LjE3LS4zNzYtNS4xNy0uMzc2bC0zLjc3LTMuNzdhLjc1My43NTMgMCAwMC0uNTI3LS4yMjVMMzYuNDcyIDY0bDE5Ljc2My00LjI2LTYuOTgtNDcuMjE4YS42OC42OCAwIDAwLS41NjQtLjU2NHoiIGZpbGw9IiM1ZThlM2UiLz48cGF0aCBkPSJNMjkuNzU4IDIyLjlsLTIuNDU0IDcuMjQyYTExLjM2IDExLjM2IDAgMDAtNC43NTItMS4xMzNjLTMuODQ4IDAtNC4wMzYgMi40MTItNC4wMzYgMy4wMTggMCAzLjI5OCA4LjYzNiA0LjU2NCA4LjYzNiAxMi4zMzMgMCA2LjEtMy44ODUgMTAuMDMtOS4xIDEwLjAzLTYuMjYgMC05LjQ2Ny0zLjg4NS05LjQ2Ny0zLjg4NWwxLjY2NS01LjU1czMuMjggMi44MyA2LjA3MyAyLjgzYTIuNDcgMi40NyAwIDAwMi41NjQtMi40OWMwLTQuMzQtNy4xLTQuNTI3LTcuMS0xMS42MTggMC01Ljk2MiA0LjI5OC0xMS43NyAxMi45MzQtMTEuNzcgMy4zOTQuMDUgNS4wMTggMSA1LjAxOCAxeiIvPjwvZz48L3N5bWJvbD48L3N2Zz4="
+							},
+							"categories": [
+									{
+											"id": 2,
+											"name": "Sales"
+									}
+							],
+							"displayName": "Shopify Trigger",
+							"typeVersion": 1
+					},
+					{
+							"id": 325,
+							"icon": "file:x.svg",
+							"name": "n8n-nodes-base.twitter",
+							"defaults": {
+									"name": "X"
+							},
+							"iconData": {
+									"type": "file",
+									"fileBuffer": "data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgMjQgMjQiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PHBhdGggZD0iTTE4LjI0NCAyLjI1aDMuMzA4bC03LjIyNyA4LjI2IDguNTAyIDExLjI0SDE2LjE3bC01LjIxNC02LjgxN0w0Ljk5IDIxLjc1SDEuNjhsNy43My04LjgzNUwxLjI1NCAyLjI1SDguMDhsNC43MTMgNi4yMzF6bS0xLjE2MSAxNy41MmgxLjgzM0w3LjA4NCA0LjEyNkg1LjExN3oiPjwvcGF0aD48L3N2Zz4K"
+							},
+							"categories": [
+									{
+											"id": 1,
+											"name": "Marketing & Content"
+									}
+							],
+							"displayName": "X (Formerly Twitter)",
+							"typeVersion": 2
+					}
+			],
+			"categories": [
+					{
+							"id": 2,
+							"name": "Sales"
+					},
+					{
+							"id": 19,
+							"name": "Marketing & Growth"
+					}
+			],
+			"image": [
+					{
+							"id": 527,
+							"url": "https://n8niostorageaccount.blob.core.windows.net/n8nio-strapi-blobs-prod/assets/89a078b208fe4c6181902608b1cd1332.png"
+					}
+			]
+	}
+}
diff --git a/cypress/fixtures/Test_Template_2.json b/cypress/fixtures/Test_Template_2.json
new file mode 100644
index 0000000000000..29001a78e36e5
--- /dev/null
+++ b/cypress/fixtures/Test_Template_2.json
@@ -0,0 +1,182 @@
+{
+	"workflow": {
+			"id": 1344,
+			"name": "Save email attachments to Nextcloud",
+			"views": 650,
+			"recentViews": 9887,
+			"totalViews": 650,
+			"createdAt": "2021-11-29T13:59:16.771Z",
+			"description": "This workflow will take all emails you put into a certain folder, upload any attachements to Nextcloud, and mark the emails as read (configurable).\n\nAttachements will be saved with automatically generated filenames:\n`2021-01-01_From-Sender-Name_Filename-of-attachement.pdf`\n\nInstructions:\n1. **Allow lodash to be used in n8n** (or rewrite the code...)\n  `NODE_FUNCTION_ALLOW_EXTERNAL=lodash` (environment variable)\n2. Import workflow\n3. Set credentials for Email & Nextcloud nodes\n4. Configure to use correct folder / custom filters\n5. Activate\n\nCustom filter examples:\n- Only unread emails:\n  `Custom Email Config` = `[\"UNSEEN\"]`\n- Filter emails by 'to' address:\n  `Custom Email Config` = `[[\"TO\", \"example+invoices@posteo.de\"]]`",
+			"workflow": {
+					"nodes": [
+							{
+									"name": "IMAP Email",
+									"type": "n8n-nodes-base.emailReadImap",
+									"position": [
+											240,
+											420
+									],
+									"parameters": {
+											"format": "resolved",
+											"mailbox": "Invoices",
+											"options": {
+													"customEmailConfig": "[\"ALL\"]"
+											}
+									},
+									"typeVersion": 1
+							},
+							{
+									"name": "Nextcloud",
+									"type": "n8n-nodes-base.nextCloud",
+									"position": [
+											940,
+											420
+									],
+									"parameters": {
+											"path": "=Documents/Invoices/{{$json[\"date\"]}}_{{$json[\"from\"]}}_{{$binary.file.fileName}}",
+											"binaryDataUpload": true,
+											"binaryPropertyName": "file"
+									},
+									"typeVersion": 1
+							},
+							{
+									"name": "Map each attachment",
+									"type": "n8n-nodes-base.function",
+									"position": [
+											620,
+											420
+									],
+									"parameters": {
+											"functionCode": "const _ = require('lodash')\n\nconst sanitize = str => _.chain(str)\n  .replace(/[^A-Za-z0-9&.-]/g, '-') // sanitise via whitelist of characters\n  .replace(/-(?=-)/g, '') // remove repeated dashes - https://regexr.com/6ag8h\n  .trim('-') // trim any leading/trailing dashes\n  .truncate({\n    length: 60,\n    omission: '-' // when the string ends with '-', you'll know it was truncated\n  })\n  .value()\n\nconst result = _.flatMap(items.map(item => {\n  //console.log({item})\n\n  // Maps each attachment to a separate item\n  return _.values(item.binary).map(file => {\n    console.log(\"Saving attachement:\", file.fileName, 'from:', ...item.json.from.value)\n    \n    // sanitize filename but exclude extension\n    const filename_parts = file.fileName.split('.')\n    const ext = _.slice(filename_parts, filename_parts.length-1)\n    const filename_main = _.join(_.dropRight(filename_parts), '.')\n    file.fileName = sanitize(filename_main) + '.' + ext\n    \n    return {\n      json: {\n        from: sanitize(item.json.from.value[0].name),\n        date: sanitize(new Date(item.json.date).toISOString().split(\"T\")[0]) // get date part \"2020-01-01\"\n      }, \n      binary: { file }\n    }\n  })\n}))\n\n//console.log(result)\nreturn result"
+									},
+									"typeVersion": 1
+							}
+					],
+					"connections": {
+							"IMAP Email": {
+									"main": [
+											[
+													{
+															"node": "Map each attachment",
+															"type": "main",
+															"index": 0
+													}
+											]
+									]
+							},
+							"Map each attachment": {
+									"main": [
+											[
+													{
+															"node": "Nextcloud",
+															"type": "main",
+															"index": 0
+													}
+											]
+									]
+							}
+					}
+			},
+			"lastUpdatedBy": 11,
+			"workflowInfo": {
+					"nodeCount": 3,
+					"nodeTypes": {
+							"n8n-nodes-base.function": {
+									"count": 1
+							},
+							"n8n-nodes-base.nextCloud": {
+									"count": 1
+							},
+							"n8n-nodes-base.emailReadImap": {
+									"count": 1
+							}
+					}
+			},
+			"user": {
+					"username": "tennox"
+			},
+			"nodes": [
+					{
+							"id": 10,
+							"icon": "fa:inbox",
+							"name": "n8n-nodes-base.emailReadImap",
+							"defaults": {
+									"name": "Email Trigger (IMAP)",
+									"color": "#44AA22"
+							},
+							"iconData": {
+									"icon": "inbox",
+									"type": "icon"
+							},
+							"categories": [
+									{
+											"id": 6,
+											"name": "Communication"
+									},
+									{
+											"id": 9,
+											"name": "Core Nodes"
+									}
+							],
+							"displayName": "Email Trigger (IMAP)",
+							"typeVersion": 2
+					},
+					{
+							"id": 14,
+							"icon": "fa:code",
+							"name": "n8n-nodes-base.function",
+							"defaults": {
+									"name": "Function",
+									"color": "#FF9922"
+							},
+							"iconData": {
+									"icon": "code",
+									"type": "icon"
+							},
+							"categories": [
+									{
+											"id": 5,
+											"name": "Development"
+									},
+									{
+											"id": 9,
+											"name": "Core Nodes"
+									}
+							],
+							"displayName": "Function",
+							"typeVersion": 1
+					},
+					{
+							"id": 25,
+							"icon": "file:nextcloud.svg",
+							"name": "n8n-nodes-base.nextCloud",
+							"defaults": {
+									"name": "Nextcloud"
+							},
+							"iconData": {
+									"type": "file",
+									"fileBuffer": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgNzYgNTEiIGZpbGw9IiNmZmYiIGZpbGwtcnVsZT0iZXZlbm9kZCIgc3Ryb2tlPSIjMDAwIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiPjx1c2UgeGxpbms6aHJlZj0iI0EiIHg9Ii41IiB5PSIuNSIvPjxzeW1ib2wgaWQ9IkEiIG92ZXJmbG93PSJ2aXNpYmxlIj48cGF0aCBkPSJNMzcuNTMzIDBjLTcuNzcgMC0xNC4zNTUgNS4yNjgtMTYuMzk2IDEyLjM3OS0xLjc3OC0zLjgxOS01LjU5Ny02LjQ1My0xMC4wNzUtNi40NTNDNS4wMDQgNS45MjYgMCAxMC45MzEgMCAxNy4wNTRhMTEuMTYgMTEuMTYgMCAwIDAgMTEuMTI4IDExLjEyOGM0LjQxMiAwIDguMjk3LTIuNjM0IDEwLjA3NS02LjQ1M2ExNi45OSAxNi45OSAwIDAgMCAxNi4zMyAxMi4zNzljNy43MDQgMCAxNC4yODktNS4yMDIgMTYuMzk2LTEyLjI0OCAxLjc3OCAzLjY4NyA1LjU5NyA2LjI1NiA5Ljk0MyA2LjI1NkExMS4xNiAxMS4xNiAwIDAgMCA3NSAxNi45ODljMC02LjEyNC01LjAwNC0xMS4wNjItMTEuMTI4LTExLjA2Mi00LjM0NiAwLTguMTY1IDIuNTY4LTkuOTQzIDYuMjU2QzUxLjgyMiA1LjIwMiA0NS4zMDMgMCAzNy41MzMgMHptMCA2LjUxOWExMC40OCAxMC40OCAwIDAgMSAxMC41MzUgMTAuNTM2QTEwLjQ4IDEwLjQ4IDAgMCAxIDM3LjUzMyAyNy41OWExMC40OCAxMC40OCAwIDAgMS0xMC41MzYtMTAuNTM1QTEwLjQ4IDEwLjQ4IDAgMCAxIDM3LjUzMyA2LjUxOXptLTI2LjQwNSA1LjkyNmE0LjU4IDQuNTggMCAwIDEgNC42MDkgNC42MDkgNC41OCA0LjU4IDAgMCAxLTQuNjA5IDQuNjA5IDQuNTggNC41OCAwIDAgMS00LjYwOS00LjYwOSA0LjU4IDQuNTggMCAwIDEgNC42MDktNC42MDl6bTUyLjc0NCAwYTQuNTggNC41OCAwIDAgMSA0LjYwOSA0LjYwOSA0LjYwOSA0LjYwOSAwIDEgMS05LjIxOCAwYy4wNjYtMi41NjggMi4wNDEtNC42MDkgNC42MDktNC42MDl6TTE5LjE3NiA0MS45NTdjMS44MjcgMCAyLjg1IDEuMzAxIDIuODUgMy4yNTIgMCAuMTg2LS4xNTUuMzQxLS4zNDEuMzQxSDE2Ljc2Yy4wMzEgMS43MzQgMS4yMzkgMi43MjYgMi42MzMgMi43MjZhMi44OSAyLjg5IDAgMCAwIDEuNzk2LS42MTljLjE4Ni0uMTI0LjM0MS0uMDkzLjQzNC4wOTNsLjA5My4xNTVjLjA5My4xNTUuMDYyLjMxLS4wOTMuNDM0YTMuODQgMy44NCAwIDAgMS0yLjI2MS43NDNjLTIuMDEzIDAtMy41NjItMS40NTYtMy41NjItMy41NjIuMDMxLTIuMjMgMS41MTgtMy41NjIgMy4zNzYtMy41NjJ6bTEuODg5IDIuOTExYy0uMDYyLTEuNDI1LS45MjktMi4xMzctMS45Mi0yLjEzNy0xLjE0NiAwLTIuMTM3Ljc0My0yLjM1NCAyLjEzN2g0LjI3NHptMTAuMjUzLTEuOTJ2LS43NzQtMS42MTFjMC0uMjE3LjEyNC0uMzQxLjM0MS0uMzQxaC4yNDhjLjIxNyAwIC4zMS4xMjQuMzEuMzQxdjEuNjExaDEuMzk0Yy4yMTcgMCAuMzQxLjEyNC4zNDEuMzQxdi4wOTNjMCAuMjE3LS4xMjQuMzEtLjM0MS4zMWgtMS4zOTR2My40MDdjMCAxLjU4Ljk2IDEuNzY2IDEuNDg3IDEuNzk2LjI3OS4wMzEuMzcyLjA5My4zNzIuMzQxdi4xODZjMCAuMjE3LS4wOTMuMzEtLjM3Mi4zMS0xLjQ4NyAwLTIuMzg1LS44OTgtMi4zODUtMi41MDl2LTMuNXptNy4wOTMtLjk5MWMxLjE3NyAwIDEuOTIuNDk2IDIuMjYxLjc3NC4xNTUuMTI0LjE4Ni4yNzkuMDMxLjQ2NWwtLjA5My4xNTVjLS4xMjQuMTg2LS4yNzkuMTg2LS40NjUuMDYyLS4zMS0uMjE3LS44OTgtLjYxOS0xLjcwMy0uNjE5LTEuNDg3IDAtMi42NjQgMS4xMTUtMi42NjQgMi43NTcgMCAxLjYxMSAxLjE3NyAyLjcyNiAyLjY2NCAyLjcyNi45NiAwIDEuNjExLS40MzQgMS45Mi0uNzEyLjE4Ni0uMTI0LjMxLS4wOTMuNDM0LjA5M2wuMDkzLjEyNGMuMDkzLjE4Ni4wNjIuMzEtLjA5My40NjVhMy44MSAzLjgxIDAgMCAxLTIuNDE2Ljg2N2MtMi4wMTMgMC0zLjU2Mi0xLjQ1Ni0zLjU2Mi0zLjU2Mi4wMzEtMi4xMDYgMS41OC0zLjU5MyAzLjU5My0zLjU5M3ptNC4xMTktMi4xOTljMC0uMjE3LS4xMjQtLjM0MS4wOTMtLjM0MWguMjQ4Yy4yMTcgMCAuNTU4LjEyNC41NTguMzQxdjcuNDAzYzAgLjg2Ny40MDMuOTYuNzEyLjk5MS4xNTUgMCAuMjc5LjA5My4yNzkuMzF2LjIxN2MwIC4yMTctLjA5My4zNDEtLjM0MS4zNDEtLjU1NyAwLTEuNTQ5LS4xODYtMS41NDktMS42NzN2LTcuNTg5em02LjM1IDIuMTk5YzEuOTgyIDAgMy41OTMgMS41MTggMy41OTMgMy41MzEgMCAyLjA0NC0xLjYxMSAzLjU5My0zLjU5MyAzLjU5M3MtMy41OTMtMS41NDktMy41OTMtMy41OTNjMC0yLjAxMyAxLjYxMS0zLjUzMSAzLjU5My0zLjUzMXptMCA2LjMxOWMxLjQ1NiAwIDIuNjMzLTEuMTc3IDIuNjMzLTIuNzg4IDAtMS41NDktMS4xNzctMi42OTUtMi42MzMtMi42OTVhMi42NyAyLjY3IDAgMCAwLTIuNjY0IDIuNjk1Yy4wMzEgMS41OCAxLjIwOCAyLjc4OCAyLjY2NCAyLjc4OHptMTUuNDU2LTYuMzE5YTIuNDUgMi40NSAwIDAgMSAyLjIzIDEuMzYzaC4wMzFzLS4wMzEtLjIxNy0uMDMxLS41MjZ2LTMuMDY2YzAtLjIxNy0uMDkzLS4zNDEuMTI0LS4zNDFoLjI0OGMuMjE3IDAgLjU1OC4xMjQuNTU4LjM0MXY4LjgyN2MwIC4yMTctLjA5My4zNDEtLjMxLjM0MWgtLjIxN2MtLjIxNyAwLS4zNDEtLjA5My0uMzQxLS4zMXYtLjUyN2MwLS4yNDguMDYyLS40MzQuMDYyLS40MzRoLS4wMzFzLS41ODkgMS40MjUtMi4zNTQgMS40MjVjLTEuODI3IDAtMi45NzMtMS40NTYtMi45NzMtMy41NjItLjA2Mi0yLjEwNiAxLjIwOC0zLjUzMSAzLjAwNC0zLjUzMWgwem0uMDMxIDYuMzE5YzEuMTQ2IDAgMi4xOTktLjgwNSAyLjE5OS0yLjc1NyAwLTEuMzk0LS43MTItMi43MjYtMi4xNjgtMi43MjYtMS4yMDggMC0yLjE5OS45OTEtMi4xOTkgMi43MjYuMDMxIDEuNjczLjg5OCAyLjc1NyAyLjE2OCAyLjc1N3ptLTU2LjU1OC42NWguMjQ4Yy4yMTcgMCAuMzQxLS4xMjQuMzQxLS4zNDF2LTYuNjI4YzAtMS4wNTMgMS4xNDYtMS43OTYgMi40NDctMS43OTZzMi40NDcuNzQzIDIuNDQ3IDEuNzk2djYuNjU5YzAgLjIxNy4xMjQuMzQxLjM0MS4zNDFoLjI0OGMuMjE3IDAgLjMxLS4xMjQuMzEtLjM0MXYtNi43MjFjMC0xLjc2Ni0xLjc2NS0yLjYzMy0zLjM3Ni0yLjYzM2gwIDAgMCAwYy0xLjU0OSAwLTMuMzE0Ljg2Ny0zLjMxNCAyLjYzM3Y2LjY5YzAgLjIxNy4wOTMuMzQxLjMxLjM0MXptNTEuNjk1LTYuODE0aC0uMjQ4Yy0uMjE3IDAtLjM0MS4xMjQtLjM0MS4zNDF2My43NDhjMCAxLjA1My0uNjgxIDIuMDEzLTIuMDEzIDIuMDEzLTEuMzAxIDAtMi4wMTMtLjk2LTIuMDEzLTIuMDEzdi0zLjc0OGMwLS4yMTctLjEyNC0uMzQxLS4zNDEtLjM0MUg1NC4zYy0uMjE3IDAtLjMxLjEyNC0uMzEuMzQxdjMuOTk2YzAgMS43NjUgMS4zMDEgMi42MzMgMi45MTIgMi42MzNoMCAwIDAgMGMxLjYxMSAwIDIuOTExLS44NjcgMi45MTEtMi42MzN2LTMuOTk2Yy4wMzEtLjIxNy0uMDkzLS4zNDEtLjMxLS4zNDFoMHptLTMwLjY2NC0uMDMxYy0uMDYyIDAtLjE1NS4wNjItLjIxNy4xNTVsLTEuMjM5IDEuNDg3LS45MjkgMS4xMTUtMS40MjUtMS43MDQtLjc3NC0uOTI5Yy0uMDYyLS4wOTMtLjE1NS0uMTI0LS4yMTctLjEyNHMtLjE1NS4wMzEtLjI0OC4wOTNsLS4xODYuMTU1Yy0uMTU1LjEyNC0uMTU1LjI3OS0uMDMxLjQ2NWwxLjIzOSAxLjQ4NyAxLjA1MyAxLjIzOS0xLjUxOCAxLjgyN2gwbC0uNzc0LjkyOWMtLjEyNC4xNTUtLjEyNC4zNDEuMDMxLjQ5NmwuMTg2LjE1NWMuMTU1LjEyNC4zMS4wOTMuNDY1LS4wNjJsMS4yMzktMS40ODcuOTI5LTEuMTE1IDEuNDI1IDEuNzA0aDBsLjc3NC45MjljLjEyNC4xNTUuMzEuMTg2LjQ2NS4wMzFsLjE4Ni0uMTU1Yy4xNTUtLjEyNC4xNTUtLjI3OS4wMzEtLjQ2NWwtMS4yMzktMS40ODctMS4wNTMtMS4yMzkgMS41MTgtMS44MjdoMGwuNzc0LS45MjljLjEyNC0uMTU1LjEyNC0uMzQxLS4wMzEtLjQ5NWwtLjE4Ni0uMTg2Yy0uMDkzLS4wNjItLjE1NS0uMDkzLS4yNDgtLjA2MmgweiIgZmlsbD0iIzAwODJjOSIgZmlsbC1ydWxlPSJub256ZXJvIiBzdHJva2U9Im5vbmUiLz48L3N5bWJvbD48L3N2Zz4="
+							},
+							"categories": [
+									{
+											"id": 3,
+											"name": "Data & Storage"
+									}
+							],
+							"displayName": "Nextcloud",
+							"typeVersion": 1
+					}
+			],
+			"categories": [
+					{
+							"id": 2,
+							"name": "Sales"
+					},
+					{
+							"id": 8,
+							"name": "Finance & Accounting"
+					}
+			],
+			"image": []
+	}
+}
diff --git a/cypress/fixtures/Test_Workflow_pairedItem_incomplete_manual_bug.json b/cypress/fixtures/Test_Workflow_pairedItem_incomplete_manual_bug.json
new file mode 100644
index 0000000000000..f740bc1df63d1
--- /dev/null
+++ b/cypress/fixtures/Test_Workflow_pairedItem_incomplete_manual_bug.json
@@ -0,0 +1,160 @@
+{
+	"name": "Test Workflow pairedItem incomplete manual bug",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "f26332f3-c61a-4843-94bd-64a73ad161ff",
+      "name": "When clicking \"Test workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        860,
+        340
+      ]
+    },
+    {
+      "parameters": {
+        "assignments": {
+          "assignments": [
+            {
+              "id": "bd522794-d056-48b8-9204-26f7d68288d9",
+              "name": "test",
+              "value": "a",
+              "type": "string"
+            }
+          ]
+        },
+        "options": {}
+      },
+      "id": "fae0c907-e2bf-4ecf-82be-f9caa209f925",
+      "name": "Init Data",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.3,
+      "position": [
+        1080,
+        340
+      ]
+    },
+    {
+      "parameters": {
+        "conditions": {
+          "options": {
+            "caseSensitive": true,
+            "leftValue": "",
+            "typeValidation": "strict"
+          },
+          "conditions": [
+            {
+              "id": "8db21b4b-1675-4e63-b092-7fcc45a86547",
+              "leftValue": "={{ $json.test }}",
+              "rightValue": "b",
+              "operator": {
+                "type": "string",
+                "operation": "equals",
+                "name": "filter.operator.equals"
+              }
+            }
+          ],
+          "combinator": "and"
+        },
+        "options": {}
+      },
+      "id": "f7990edd-2c0f-42e6-b3ce-74c7df02b6a4",
+      "name": "If",
+      "type": "n8n-nodes-base.if",
+      "typeVersion": 2,
+      "position": [
+        1300,
+        340
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "850d48f5-0689-4cab-b30c-30e179577c82",
+      "name": "NoOp1",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        1540,
+        200
+      ]
+    },
+    {
+      "parameters": {
+        "assignments": {
+          "assignments": [
+            {
+              "id": "bd522794-d056-48b8-9204-26f7d68288d9",
+              "name": "test2",
+              "value": "={{ $('Init Data').item.json.test }}",
+              "type": "string"
+            }
+          ]
+        },
+        "options": {}
+      },
+      "id": "91d93c3a-a557-465e-812b-266d6277b279",
+      "name": "Test Expression",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.3,
+      "position": [
+        1540,
+        440
+      ]
+    }
+  ],
+  "pinData": {},
+  "connections": {
+    "When clicking \"Test workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Init Data",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Init Data": {
+      "main": [
+        [
+          {
+            "node": "If",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "If": {
+      "main": [
+        [
+          {
+            "node": "NoOp1",
+            "type": "main",
+            "index": 0
+          }
+        ],
+        [
+          {
+            "node": "Test Expression",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "765a6d9b-d667-4a59-9bd7-b0bc2627b008",
+  "meta": {
+    "templateCredsSetupCompleted": true,
+    "instanceId": "021d3c82ba2d3bc090cbf4fc81c9312668bcc34297e022bb3438c5c88a43a5ff"
+  },
+  "id": "qnGQYw8TD58xs214",
+  "tags": []
+}
diff --git a/cypress/fixtures/Test_ado_1338.json b/cypress/fixtures/Test_ado_1338.json
new file mode 100644
index 0000000000000..0609ae6e55f75
--- /dev/null
+++ b/cypress/fixtures/Test_ado_1338.json
@@ -0,0 +1,632 @@
+{
+  "meta": {
+    "instanceId": "2be09fdcb9594c0827fd4cee80f7e590c93297d9217685f34c2250fe3144ef0c"
+  },
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "6dace68e-0727-472d-a212-00863acb64d6",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        -340,
+        660
+      ]
+    },
+    {
+      "parameters": {
+        "resource": "user",
+        "operation": "getAll",
+        "flag": "new",
+        "returnAll": true,
+        "options": {}
+      },
+      "id": "2465a943-0d2c-480d-a98a-a67e92151367",
+      "name": "Discourse",
+      "type": "n8n-nodes-base.discourse",
+      "typeVersion": 1,
+      "position": [
+        -120,
+        660
+      ]
+    },
+    {
+      "parameters": {
+        "conditions": {
+          "dateTime": [
+            {
+              "value1": "={{ $json.user.created_at }}",
+              "operation": "before",
+              "value2": "={{ $today.minus(6,\"day\") }}"
+            }
+          ],
+          "number": [
+            {
+              "value1": "={{ $json.user.accepted_answers }}",
+              "operation": "larger",
+              "value2": 1
+            },
+            {
+              "value1": "={{ $json.user.post_count }}",
+              "operation": "larger",
+              "value2": 4
+            }
+          ]
+        }
+      },
+      "id": "ce1b80bb-08db-42cf-b7d9-56df74044f5c",
+      "name": "Filter",
+      "type": "n8n-nodes-base.filter",
+      "typeVersion": 1,
+      "position": [
+        600,
+        640
+      ]
+    },
+    {
+      "parameters": {
+        "resource": "user",
+        "operation": "get",
+        "username": "={{ $json.username }}"
+      },
+      "id": "ad3c141b-7aee-449b-8254-f21815a3d124",
+      "name": "Discourse1",
+      "type": "n8n-nodes-base.discourse",
+      "typeVersion": 1,
+      "position": [
+        340,
+        840
+      ]
+    },
+    {
+      "parameters": {
+        "batchSize": 5,
+        "options": {}
+      },
+      "id": "97fa87d0-ba76-4156-aa40-6bccd4775cdc",
+      "name": "Loop Over Items",
+      "type": "n8n-nodes-base.splitInBatches",
+      "typeVersion": 3,
+      "position": [
+        100,
+        660
+      ],
+      "disabled": true
+    },
+    {
+      "parameters": {
+        "amount": 4,
+        "unit": "seconds"
+      },
+      "id": "4f7f4b5d-2e02-4479-a4ee-9818f5b3e6de",
+      "name": "Wait",
+      "type": "n8n-nodes-base.wait",
+      "typeVersion": 1,
+      "position": [
+        580,
+        840
+      ],
+      "webhookId": "6bbd5e21-6022-475d-ace1-2aeb73e899d2"
+    },
+    {
+      "parameters": {},
+      "id": "a6cfc3b9-0d7a-4d4e-99c4-eba5085947d0",
+      "name": "No Operation, do nothing",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        340,
+        640
+      ]
+    },
+    {
+      "parameters": {
+        "content": "### filtering\n- Forum account older than 6 days\n- 2+ replies marked as answer\n- 5+ posts"
+      },
+      "id": "580c80dc-cf95-413c-9465-29c9dc66ef6e",
+      "name": "Sticky Note",
+      "type": "n8n-nodes-base.stickyNote",
+      "typeVersion": 1,
+      "position": [
+        640,
+        420
+      ]
+    }
+  ],
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Discourse",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Discourse": {
+      "main": [
+        [
+          {
+            "node": "Loop Over Items",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Discourse1": {
+      "main": [
+        [
+          {
+            "node": "Wait",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Loop Over Items": {
+      "main": [
+        [
+          {
+            "node": "No Operation, do nothing",
+            "type": "main",
+            "index": 0
+          }
+        ],
+        [
+          {
+            "node": "Discourse1",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Wait": {
+      "main": [
+        [
+          {
+            "node": "Loop Over Items",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "No Operation, do nothing": {
+      "main": [
+        [
+          {
+            "node": "Filter",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "pinData": {
+    "Discourse": [
+      {
+				"id": 1,
+				"user": "name"
+			}
+    ],
+    "Wait": [
+      {
+        "user_badges": [],
+        "user": {
+          "id": 1,
+          "username": "User",
+          "name": "User",
+          "avatar_template": "/user_avatar/community.n8n.io/user/{size}/2.png",
+          "last_posted_at": "2023-11-02T16:16:05.615Z",
+          "last_seen_at": "2023-11-02T16:15:42.734Z",
+          "created_at": "2023-11-01T15:16:53.268Z",
+          "ignored": false,
+          "muted": false,
+          "can_ignore_user": true,
+          "can_mute_user": true,
+          "can_send_private_messages": true,
+          "can_send_private_message_to_user": true,
+          "trust_level": 0,
+          "moderator": false,
+          "admin": false,
+          "title": null,
+          "badge_count": 0,
+          "user_fields": {
+            "1": null
+          },
+          "custom_fields": {},
+          "time_read": 121,
+          "recent_time_read": 121,
+          "primary_group_id": null,
+          "primary_group_name": null,
+          "flair_group_id": null,
+          "flair_name": null,
+          "flair_url": null,
+          "flair_bg_color": null,
+          "flair_color": null,
+          "featured_topic": null,
+          "pending_posts_count": 0,
+          "staged": false,
+          "can_edit": true,
+          "can_edit_username": true,
+          "can_edit_email": true,
+          "can_edit_name": true,
+          "uploaded_avatar_id": 31486,
+          "has_title_badges": false,
+          "pending_count": 0,
+          "profile_view_count": 7,
+          "second_factor_enabled": false,
+          "can_upload_profile_header": true,
+          "can_upload_user_card_background": true,
+          "post_count": 1,
+          "can_be_deleted": true,
+          "can_delete_all_posts": true,
+          "locale": "en",
+          "muted_category_ids": [],
+          "regular_category_ids": [],
+          "watched_tags": [],
+          "watching_first_post_tags": [],
+          "tracked_tags": [],
+          "muted_tags": [],
+          "tracked_category_ids": [],
+          "watched_category_ids": [],
+          "watched_first_post_category_ids": [],
+          "system_avatar_upload_id": null,
+          "system_avatar_template": "/letter_avatar_proxy/v4/letter/c/3be4f8/{size}.png",
+          "custom_avatar_upload_id": 31486,
+          "custom_avatar_template": "/user_avatar/community.n8n.io/user/{size}/2.png",
+          "muted_usernames": [],
+          "ignored_usernames": [],
+          "allowed_pm_usernames": [],
+          "mailing_list_posts_per_day": 100,
+          "can_change_bio": true,
+          "can_change_location": true,
+          "can_change_website": true,
+          "can_change_tracking_preferences": true,
+          "user_api_keys": null,
+          "user_auth_tokens": [],
+          "user_notification_schedule": {
+            "enabled": false,
+            "day_0_start_time": 480,
+            "day_0_end_time": 1020,
+            "day_1_start_time": 480,
+            "day_1_end_time": 1020,
+            "day_2_start_time": 480,
+            "day_2_end_time": 1020,
+            "day_3_start_time": 480,
+            "day_3_end_time": 1020,
+            "day_4_start_time": 480,
+            "day_4_end_time": 1020,
+            "day_5_start_time": 480,
+            "day_5_end_time": 1020,
+            "day_6_start_time": 480,
+            "day_6_end_time": 1020
+          },
+          "use_logo_small_as_avatar": false,
+          "reminders_frequency": [
+            {
+              "name": "discourse_assign.reminders_frequency.never",
+              "value": 0
+            },
+            {
+              "name": "discourse_assign.reminders_frequency.daily",
+              "value": 1440
+            },
+            {
+              "name": "discourse_assign.reminders_frequency.weekly",
+              "value": 10080
+            },
+            {
+              "name": "discourse_assign.reminders_frequency.monthly",
+              "value": 43200
+            },
+            {
+              "name": "discourse_assign.reminders_frequency.quarterly",
+              "value": 129600
+            }
+          ],
+          "assign_icon": "user-plus",
+          "assign_path": "/u/User/activity/assigned",
+          "accepted_answers": 0,
+          "featured_user_badge_ids": [],
+          "invited_by": null,
+          "groups": [
+            {
+              "id": 10,
+              "automatic": true,
+              "name": "trust_level_0",
+              "display_name": "trust_level_0",
+              "user_count": 9295,
+              "mentionable_level": 0,
+              "messageable_level": 0,
+              "visibility_level": 1,
+              "primary_group": false,
+              "title": null,
+              "grant_trust_level": null,
+              "incoming_email": null,
+              "has_messages": false,
+              "flair_url": null,
+              "flair_bg_color": null,
+              "flair_color": null,
+              "bio_raw": null,
+              "bio_cooked": null,
+              "bio_excerpt": null,
+              "public_admission": false,
+              "public_exit": false,
+              "allow_membership_requests": false,
+              "full_name": null,
+              "default_notification_level": 3,
+              "membership_request_template": null,
+              "members_visibility_level": 0,
+              "can_see_members": true,
+              "can_admin_group": true,
+              "publish_read_state": false
+            }
+          ],
+          "group_users": [
+            {
+              "group_id": 10,
+              "user_id": 1,
+              "notification_level": 3
+            }
+          ],
+          "user_option": {
+            "user_id": 1,
+            "mailing_list_mode": false,
+            "mailing_list_mode_frequency": 1,
+            "email_digests": false,
+            "email_level": 1,
+            "email_messages_level": 0,
+            "external_links_in_new_tab": true,
+            "color_scheme_id": null,
+            "dark_scheme_id": null,
+            "dynamic_favicon": true,
+            "enable_quoting": true,
+            "enable_defer": false,
+            "digest_after_minutes": 0,
+            "automatically_unpin_topics": true,
+            "auto_track_topics_after_msecs": 300000,
+            "notification_level_when_replying": 2,
+            "new_topic_duration_minutes": 2880,
+            "email_previous_replies": 2,
+            "email_in_reply_to": false,
+            "like_notification_frequency": 1,
+            "include_tl0_in_digests": false,
+            "theme_ids": [
+              7
+            ],
+            "theme_key_seq": 0,
+            "allow_private_messages": true,
+            "enable_allowed_pm_users": false,
+            "homepage_id": null,
+            "hide_profile_and_presence": false,
+            "text_size": "normal",
+            "text_size_seq": 0,
+            "title_count_mode": "notifications",
+            "bookmark_auto_delete_preference": 3,
+            "timezone": "Europe/Berlin",
+            "skip_new_user_tips": false,
+            "default_calendar": "none_selected",
+            "oldest_search_log_date": null,
+            "seen_popups": [
+              1,
+              3
+            ]
+          }
+        }
+      }],
+    "No Operation, do nothing": [
+      {
+        "user_badges": [],
+        "user": {
+          "id": 1,
+          "username": "User",
+          "name": "User",
+          "avatar_template": "/user_avatar/community.n8n.io/user/{size}/2.png",
+          "last_posted_at": "2023-11-02T16:16:05.615Z",
+          "last_seen_at": "2023-11-02T16:15:42.734Z",
+          "created_at": "2023-11-01T15:16:53.268Z",
+          "ignored": false,
+          "muted": false,
+          "can_ignore_user": true,
+          "can_mute_user": true,
+          "can_send_private_messages": true,
+          "can_send_private_message_to_user": true,
+          "trust_level": 0,
+          "moderator": false,
+          "admin": false,
+          "title": null,
+          "badge_count": 0,
+          "user_fields": {
+            "1": null
+          },
+          "custom_fields": {},
+          "time_read": 121,
+          "recent_time_read": 121,
+          "primary_group_id": null,
+          "primary_group_name": null,
+          "flair_group_id": null,
+          "flair_name": null,
+          "flair_url": null,
+          "flair_bg_color": null,
+          "flair_color": null,
+          "featured_topic": null,
+          "pending_posts_count": 0,
+          "staged": false,
+          "can_edit": true,
+          "can_edit_username": true,
+          "can_edit_email": true,
+          "can_edit_name": true,
+          "uploaded_avatar_id": 31486,
+          "has_title_badges": false,
+          "pending_count": 0,
+          "profile_view_count": 7,
+          "second_factor_enabled": false,
+          "can_upload_profile_header": true,
+          "can_upload_user_card_background": true,
+          "post_count": 1,
+          "can_be_deleted": true,
+          "can_delete_all_posts": true,
+          "locale": "en",
+          "muted_category_ids": [],
+          "regular_category_ids": [],
+          "watched_tags": [],
+          "watching_first_post_tags": [],
+          "tracked_tags": [],
+          "muted_tags": [],
+          "tracked_category_ids": [],
+          "watched_category_ids": [],
+          "watched_first_post_category_ids": [],
+          "system_avatar_upload_id": null,
+          "system_avatar_template": "/letter_avatar_proxy/v4/letter/c/3be4f8/{size}.png",
+          "custom_avatar_upload_id": 31486,
+          "custom_avatar_template": "/user_avatar/community.n8n.io/user/{size}/2.png",
+          "muted_usernames": [],
+          "ignored_usernames": [],
+          "allowed_pm_usernames": [],
+          "mailing_list_posts_per_day": 100,
+          "can_change_bio": true,
+          "can_change_location": true,
+          "can_change_website": true,
+          "can_change_tracking_preferences": true,
+          "user_api_keys": null,
+          "user_auth_tokens": [],
+          "user_notification_schedule": {
+            "enabled": false,
+            "day_0_start_time": 480,
+            "day_0_end_time": 1020,
+            "day_1_start_time": 480,
+            "day_1_end_time": 1020,
+            "day_2_start_time": 480,
+            "day_2_end_time": 1020,
+            "day_3_start_time": 480,
+            "day_3_end_time": 1020,
+            "day_4_start_time": 480,
+            "day_4_end_time": 1020,
+            "day_5_start_time": 480,
+            "day_5_end_time": 1020,
+            "day_6_start_time": 480,
+            "day_6_end_time": 1020
+          },
+          "use_logo_small_as_avatar": false,
+          "reminders_frequency": [
+            {
+              "name": "discourse_assign.reminders_frequency.never",
+              "value": 0
+            },
+            {
+              "name": "discourse_assign.reminders_frequency.daily",
+              "value": 1440
+            },
+            {
+              "name": "discourse_assign.reminders_frequency.weekly",
+              "value": 10080
+            },
+            {
+              "name": "discourse_assign.reminders_frequency.monthly",
+              "value": 43200
+            },
+            {
+              "name": "discourse_assign.reminders_frequency.quarterly",
+              "value": 129600
+            }
+          ],
+          "assign_icon": "user-plus",
+          "assign_path": "/u/User/activity/assigned",
+          "accepted_answers": 0,
+          "featured_user_badge_ids": [],
+          "invited_by": null,
+          "groups": [
+            {
+              "id": 10,
+              "automatic": true,
+              "name": "trust_level_0",
+              "display_name": "trust_level_0",
+              "user_count": 9295,
+              "mentionable_level": 0,
+              "messageable_level": 0,
+              "visibility_level": 1,
+              "primary_group": false,
+              "title": null,
+              "grant_trust_level": null,
+              "incoming_email": null,
+              "has_messages": false,
+              "flair_url": null,
+              "flair_bg_color": null,
+              "flair_color": null,
+              "bio_raw": null,
+              "bio_cooked": null,
+              "bio_excerpt": null,
+              "public_admission": false,
+              "public_exit": false,
+              "allow_membership_requests": false,
+              "full_name": null,
+              "default_notification_level": 3,
+              "membership_request_template": null,
+              "members_visibility_level": 0,
+              "can_see_members": true,
+              "can_admin_group": true,
+              "publish_read_state": false
+            }
+          ],
+          "group_users": [
+            {
+              "group_id": 10,
+              "user_id": 1,
+              "notification_level": 3
+            }
+          ],
+          "user_option": {
+            "user_id": 1,
+            "mailing_list_mode": false,
+            "mailing_list_mode_frequency": 1,
+            "email_digests": false,
+            "email_level": 1,
+            "email_messages_level": 0,
+            "external_links_in_new_tab": true,
+            "color_scheme_id": null,
+            "dark_scheme_id": null,
+            "dynamic_favicon": true,
+            "enable_quoting": true,
+            "enable_defer": false,
+            "digest_after_minutes": 0,
+            "automatically_unpin_topics": true,
+            "auto_track_topics_after_msecs": 300000,
+            "notification_level_when_replying": 2,
+            "new_topic_duration_minutes": 2880,
+            "email_previous_replies": 2,
+            "email_in_reply_to": false,
+            "like_notification_frequency": 1,
+            "include_tl0_in_digests": false,
+            "theme_ids": [
+              7
+            ],
+            "theme_key_seq": 0,
+            "allow_private_messages": true,
+            "enable_allowed_pm_users": false,
+            "homepage_id": null,
+            "hide_profile_and_presence": false,
+            "text_size": "normal",
+            "text_size_seq": 0,
+            "title_count_mode": "notifications",
+            "bookmark_auto_delete_preference": 3,
+            "timezone": "Europe/Berlin",
+            "skip_new_user_tips": false,
+            "default_calendar": "none_selected",
+            "oldest_search_log_date": null,
+            "seen_popups": [
+              1,
+              3
+            ]
+          }
+        }
+      }]
+  }
+}
diff --git a/cypress/fixtures/Test_workflow-actions_paste-data.json b/cypress/fixtures/Test_workflow-actions_paste-data.json
index f3916fca15af1..c7342ce39641f 100644
--- a/cypress/fixtures/Test_workflow-actions_paste-data.json
+++ b/cypress/fixtures/Test_workflow-actions_paste-data.json
@@ -1,42 +1,128 @@
 {
 	"meta": {
-		"instanceId": "1a30c82b98a30444ad25bce513655a5e02be772d361403542c23172be6062f04"
+	  "templateCredsSetupCompleted": true,
+	  "instanceId": "669258f419ee5d9faf0a484944244a47fcc28c541f3c6c874e50a171a0be1e6b"
 	},
 	"nodes": [
-		{
-			"parameters": {
-				"rule": {
-					"interval": [{}]
-				}
-			},
-			"id": "a898563b-d2a4-4b15-a979-366872e801b0",
-			"name": "Schedule Trigger",
-			"type": "n8n-nodes-base.scheduleTrigger",
-			"typeVersion": 1,
-			"position": [420, 260]
+	  {
+		"parameters": {
+		  "rule": {
+			"interval": [
+			  {}
+			]
+		  }
 		},
-		{
-			"parameters": {
-				"options": {}
-			},
-			"id": "b9a13e3d-bfa5-4873-959f-fd3d67e380d9",
-			"name": "Set",
-			"type": "n8n-nodes-base.set",
-			"typeVersion": 1,
-			"position": [640, 260]
-		}
+		"id": "54b1cdeb-b453-4568-8107-c17fcf2aa25a",
+		"name": "Schedule Trigger",
+		"type": "n8n-nodes-base.scheduleTrigger",
+		"typeVersion": 1,
+		"position": [
+		  240,
+		  560
+		]
+	  },
+	  {
+		"parameters": {
+		  "options": {}
+		},
+		"id": "5f6dffef-61f7-459d-930c-ef701d08d49a",
+		"name": "Set",
+		"type": "n8n-nodes-base.set",
+		"typeVersion": 1,
+		"position": [
+		  460,
+		  460
+		]
+	  },
+	  {
+		"parameters": {
+		  "rules": {
+			"rules": [
+			  {
+				"outputKey": "a"
+			  }
+			]
+		  }
+		},
+		"id": "c07d3a12-1ee2-4131-bec2-ab366457d042",
+		"name": "Old version Switch Node",
+		"type": "n8n-nodes-base.switch",
+		"typeVersion": 2,
+		"position": [
+		  460,
+		  680
+		]
+	  },
+	  {
+		"parameters": {
+		  "options": {}
+		},
+		"id": "182a833d-3b93-4e86-a0db-3ceb19d6562b",
+		"name": "Loop Over Items",
+		"type": "n8n-nodes-base.splitInBatches",
+		"typeVersion": 3,
+		"position": [
+		  720,
+		  560
+		]
+	  },
+	  {
+		"parameters": {},
+		"id": "b0d0aeb7-0c8f-4810-8b78-6c0db3c9a486",
+		"name": "Replace Me",
+		"type": "n8n-nodes-base.noOp",
+		"typeVersion": 1,
+		"position": [
+		  900,
+		  560
+		]
+	  }
 	],
 	"connections": {
-		"Schedule Trigger": {
-			"main": [
-				[
-					{
-						"node": "Set",
-						"type": "main",
-						"index": 0
-					}
-				]
-			]
-		}
-	}
-}
+	  "Schedule Trigger": {
+		"main": [
+		  [
+			{
+			  "node": "Set",
+			  "type": "main",
+			  "index": 0
+			},
+			{
+			  "node": "Old version Switch Node",
+			  "type": "main",
+			  "index": 0
+			},
+			{
+			  "node": "Loop Over Items",
+			  "type": "main",
+			  "index": 0
+			}
+		  ]
+		]
+	  },
+	  "Loop Over Items": {
+		"main": [
+		  null,
+		  [
+			{
+			  "node": "Replace Me",
+			  "type": "main",
+			  "index": 0
+			}
+		  ]
+		]
+	  },
+	  "Replace Me": {
+		"main": [
+		  [
+			{
+			  "node": "Loop Over Items",
+			  "type": "main",
+			  "index": 0
+			}
+		  ]
+		]
+	  }
+	},
+	"pinData": {}
+  }
diff --git a/cypress/fixtures/Test_workflow_3.json b/cypress/fixtures/Test_workflow_3.json
index 846b50cf193c8..43313c1f602b1 100644
--- a/cypress/fixtures/Test_workflow_3.json
+++ b/cypress/fixtures/Test_workflow_3.json
@@ -20,20 +20,21 @@
 		},
 		{
 			"parameters": {
-				"values": {
-					"string": [
-						{
-							"name": "other",
-							"value": ""
-						}
+				"assignments": {
+					"assignments": [
+					  {
+						"id": "2b0f25a2-9483-4579-9f6d-91b7ac2fcb71",
+						"name": "other",
+						"value": "",
+						"type": "string"
+					  }
 					]
-				},
-				"options": {}
+				  }
 			},
 			"id": "2dfc690a-95cf-48c2-85a6-2b3bb8cd1d1d",
 			"name": "Set",
 			"type": "n8n-nodes-base.set",
-			"typeVersion": 1,
+			"typeVersion": 3.3,
 			"position": [
 				920,
 				300
@@ -43,21 +44,22 @@
 			"id": "9bee04af-1bfc-4be2-a704-e975cb887ced",
 			"name": "Set1",
 			"type": "n8n-nodes-base.set",
-			"typeVersion": 1,
+			"typeVersion": 3.3,
 			"position": [
 				1120,
 				300
 			],
 			"parameters": {
-				"values": {
-					"string": [
-						{
-							"name": "other",
-							"value": ""
-						}
+				"assignments": {
+					"assignments": [
+					  {
+						"id": "2b0f25a2-9483-4579-9f6d-91b7ac2fcb71",
+						"name": "other",
+						"value": "",
+						"type": "string"
+					  }
 					]
-				},
-				"options": {}
+				  }
 			}
 		}
 	],
@@ -118,4 +120,4 @@
 		"instanceId": "fe45a93dd232270eb40d3ba1f7907ad3935bbd72ad5e4ee09ff61e96674f9aef"
 	},
 	"tags": []
-}
\ No newline at end of file
+}
diff --git a/cypress/fixtures/Test_workflow_5.json b/cypress/fixtures/Test_workflow_5.json
index 6b87fc33b70a1..5771e197d9e56 100644
--- a/cypress/fixtures/Test_workflow_5.json
+++ b/cypress/fixtures/Test_workflow_5.json
@@ -40,7 +40,7 @@
     {
       "parameters": {},
       "id": "ef63cdc5-50bc-4525-9873-7e7f7589a60e",
-      "name": "When clicking \"Execute Workflow\"",
+      "name": "When clicking \"Test workflow\"",
       "type": "n8n-nodes-base.manualTrigger",
       "typeVersion": 1,
       "position": [
@@ -50,7 +50,6 @@
     },
     {
       "parameters": {
-        "operation": "sort",
         "sortFieldsUi": {
           "sortField": [
             {
@@ -61,9 +60,9 @@
         "options": {}
       },
       "id": "555a150c-d735-4331-b628-c1f1cfed2da1",
-      "name": "Item Lists",
-      "type": "n8n-nodes-base.itemLists",
-      "typeVersion": 2,
+      "name": "Sort",
+      "type": "n8n-nodes-base.sort",
+      "typeVersion": 1,
       "position": [
         -280,
         580
@@ -182,7 +181,7 @@
       "main": [
         [
           {
-            "node": "Item Lists",
+            "node": "Sort",
             "type": "main",
             "index": 0
           }
@@ -200,7 +199,7 @@
         ]
       ]
     },
-    "When clicking \"Execute Workflow\"": {
+    "When clicking \"Test workflow\"": {
       "main": [
         [
           {
@@ -216,7 +215,7 @@
         ]
       ]
     },
-    "Item Lists": {
+    "Sort": {
       "main": [
         [
           {
@@ -289,4 +288,4 @@
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/cypress/fixtures/Test_workflow_filter.json b/cypress/fixtures/Test_workflow_filter.json
new file mode 100644
index 0000000000000..e5aad933882f7
--- /dev/null
+++ b/cypress/fixtures/Test_workflow_filter.json
@@ -0,0 +1,153 @@
+{
+	"name": "Filter test",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "f332a7d1-31b4-4e78-b31e-9e8db945bf3f",
+			"name": "When clicking \"Test workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [
+				-60,
+				480
+			]
+		},
+		{
+			"parameters": {
+				"jsCode": "return [\n  {\n    \"label\": \"Apple\",\n    tags: [],\n    meta: {foo: 'bar'}\n  },\n  {\n    \"label\": \"Banana\",\n    tags: ['exotic'],\n    meta: {}\n  },\n  {\n    \"label\": \"Pear\",\n    tags: ['other'],\n    meta: {}\n  },\n  {\n    \"label\": \"Orange\",\n    meta: {}\n  }\n]"
+			},
+			"id": "60697c7f-3948-4790-97ba-8aba03d02ac2",
+			"name": "Code",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 2,
+			"position": [
+				160,
+				480
+			]
+		},
+		{
+			"parameters": {
+				"conditions": {
+					"options": {
+						"caseSensitive": true,
+						"leftValue": ""
+					},
+					"conditions": [
+						{
+							"leftValue": "={{ $json.tags }}",
+							"rightValue": "exotic",
+							"operator": {
+								"type": "array",
+								"operation": "contains",
+								"rightType": "any"
+							}
+						},
+						{
+							"leftValue": "={{ $json.meta }}",
+							"rightValue": "",
+							"operator": {
+								"type": "object",
+								"operation": "notEmpty",
+								"singleValue": true
+							}
+						},
+						{
+							"leftValue": "={{ $json.label }}",
+							"rightValue": "Pea",
+							"operator": {
+								"type": "string",
+								"operation": "startsWith",
+								"rightType": "string"
+							}
+						}
+					],
+					"combinator": "or"
+				},
+				"options": {}
+			},
+			"id": "7531191b-5ac3-45dc-8afb-27ae83d8f33a",
+			"name": "If",
+			"type": "n8n-nodes-base.if",
+			"typeVersion": 2,
+			"position": [
+				380,
+				480
+			]
+		},
+		{
+			"parameters": {},
+			"id": "d8c614ea-0bbf-4b12-ad7d-c9ebe09ce583",
+			"name": "Then",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [
+				600,
+				400
+			]
+		},
+		{
+			"parameters": {},
+			"id": "69364770-60d2-4ef4-9f29-9570718a9a10",
+			"name": "Else",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [
+				600,
+				580
+			]
+		}
+	],
+	"pinData": {},
+	"connections": {
+		"When clicking \"Test workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Code",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code": {
+			"main": [
+				[
+					{
+						"node": "If",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"If": {
+			"main": [
+				[
+					{
+						"node": "Then",
+						"type": "main",
+						"index": 0
+					}
+				],
+				[
+					{
+						"node": "Else",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "a6249f48-d88f-4b80-9ed9-79555e522d48",
+	"id": "BWUTRs5RHxVgQ4uT",
+	"meta": {
+		"instanceId": "78577815012af39cf16dad7a787b0898c42fb7514b8a7f99b2136862c2af502c"
+	},
+	"tags": []
+}
diff --git a/cypress/fixtures/Test_workflow_form_switch.json b/cypress/fixtures/Test_workflow_form_switch.json
new file mode 100644
index 0000000000000..78349c3ae5554
--- /dev/null
+++ b/cypress/fixtures/Test_workflow_form_switch.json
@@ -0,0 +1,78 @@
+{
+  "name": "My workflow 8",
+  "nodes": [
+    {
+      "parameters": {
+        "path": "d1cba915-ca18-4425-bcfb-133205fc815a",
+        "formTitle": "test",
+        "formFields": {
+          "values": [
+            {
+              "fieldLabel": "test"
+            }
+          ]
+        },
+        "options": {}
+      },
+      "id": "9e685367-fb94-4376-a9a4-7f311d9f7e2d",
+      "name": "n8n Form Trigger",
+      "type": "n8n-nodes-base.formTrigger",
+      "typeVersion": 2,
+      "position": [
+        620,
+        580
+      ],
+      "webhookId": "d1cba915-ca18-4425-bcfb-133205fc815a"
+    },
+    {
+      "parameters": {},
+      "id": "0f4dfe66-51c0-4378-9eab-680f8140a572",
+      "name": "Switch",
+      "type": "n8n-nodes-base.switch",
+      "typeVersion": 2,
+      "position": [
+        800,
+        580
+      ]
+    }
+  ],
+  "pinData": {
+    "n8n Form Trigger": [
+      {
+        "json": {
+          "name": "First item",
+          "code": 1
+        }
+      },
+      {
+        "json": {
+          "name": "Second item",
+          "code": 2
+        }
+      }
+    ]
+  },
+  "connections": {
+    "n8n Form Trigger": {
+      "main": [
+        [
+          {
+            "node": "Switch",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "d6c14bc8-a69f-47bb-b5ba-fe6e9db0a3a4",
+  "id": "UQSimcMQJGbTeTLG",
+  "meta": {
+    "instanceId": "a786b722078489c1fa382391a9f3476c2784761624deb2dfb4634827256d51a0"
+  },
+  "tags": []
+}
\ No newline at end of file
diff --git a/cypress/fixtures/Test_workflow_ndv_version.json b/cypress/fixtures/Test_workflow_ndv_version.json
new file mode 100644
index 0000000000000..7f3ba16f43277
--- /dev/null
+++ b/cypress/fixtures/Test_workflow_ndv_version.json
@@ -0,0 +1,41 @@
+{
+	"name": "Node versions",
+	"nodes": [
+		{
+			"id": "2acca986-10a6-451e-b20a-86e95b50e627",
+			"name": "When clicking \"Test workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [460, 460]
+		},
+		{
+			"id": "1ea0a87c-3395-4bd9-84fb-cf8b0f769cc4",
+			"name": "Function",
+			"type": "n8n-nodes-base.function",
+			"typeVersion": 1,
+			"position": [960, 460]
+		},
+		{
+			"id": "30bb9fab-bc89-4309-b42b-0fc586519c76",
+			"name": "Edit Fields (old)",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 2,
+			"position": [800, 460]
+		},
+		{
+			"id": "a266b96c-3539-4034-b24c-c86c6d0ca31e",
+			"name": "Edit Fields (no typeVersion)",
+			"type": "n8n-nodes-base.set",
+			"position": [1120, 460]
+		},
+		{
+			"id": "273f60c9-08e7-457e-b01d-31e16c565171",
+			"name": "Edit Fields (latest)",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.3,
+			"position": [640, 460]
+		}
+	],
+	"connections": {},
+	"pinData": {}
+}
diff --git a/cypress/fixtures/Test_workflow_partial_execution_with_missing_credentials.json b/cypress/fixtures/Test_workflow_partial_execution_with_missing_credentials.json
new file mode 100644
index 0000000000000..2a9e75e11b4ab
--- /dev/null
+++ b/cypress/fixtures/Test_workflow_partial_execution_with_missing_credentials.json
@@ -0,0 +1,115 @@
+{
+  "meta": {
+    "templateCredsSetupCompleted": true,
+    "instanceId": "2be09fdcb9594c0827fd4cee80f7e590c93297d9217685f34c2250fe3144ef0c"
+  },
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "09e4325e-ede1-40cf-a1ba-58612bbc7f1b",
+      "name": "When clicking \"Test workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        820,
+        400
+      ]
+    },
+    {
+      "parameters": {
+        "category": "randomData"
+      },
+      "id": "4920bf3a-9978-4196-9dcb-8c2892e5641b",
+      "name": "DebugHelper",
+      "type": "n8n-nodes-base.debugHelper",
+      "typeVersion": 1,
+      "position": [
+        1040,
+        400
+      ]
+    },
+    {
+      "parameters": {
+        "conditions": {
+          "options": {
+            "caseSensitive": true,
+            "leftValue": "",
+            "typeValidation": "strict"
+          },
+          "conditions": [
+            {
+              "id": "7508343e-3e99-4d12-96e4-00a35a3d4306",
+              "leftValue": "={{ $json.email }}",
+              "rightValue": ".",
+              "operator": {
+                "type": "string",
+                "operation": "contains"
+              }
+            }
+          ],
+          "combinator": "and"
+        },
+        "options": {}
+      },
+      "id": "4f6a6a4e-19b6-43f5-ba5c-e40b09d7f873",
+      "name": "Filter",
+      "type": "n8n-nodes-base.filter",
+      "typeVersion": 2,
+      "position": [
+        1260,
+        400
+      ]
+    },
+    {
+      "parameters": {
+        "chatId": "123123",
+        "text": "1123123",
+        "additionalFields": {}
+      },
+      "id": "1765f352-fc12-4fab-9c24-d666a150266f",
+      "name": "Telegram",
+      "type": "n8n-nodes-base.telegram",
+      "typeVersion": 1.1,
+      "position": [
+        1480,
+        400
+      ]
+    }
+  ],
+  "connections": {
+    "When clicking \"Test workflow\"": {
+      "main": [
+        [
+          {
+            "node": "DebugHelper",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "DebugHelper": {
+      "main": [
+        [
+          {
+            "node": "Filter",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Filter": {
+      "main": [
+        [
+          {
+            "node": "Telegram",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "pinData": {}
+}
diff --git a/cypress/fixtures/Test_workflow_schema_test.json b/cypress/fixtures/Test_workflow_schema_test.json
index 0db43a5ea458f..8c83c4f20e633 100644
--- a/cypress/fixtures/Test_workflow_schema_test.json
+++ b/cypress/fixtures/Test_workflow_schema_test.json
@@ -47,7 +47,7 @@
     {
       "parameters": {},
       "id": "58512a93-dabf-4584-817f-27c608c1bdd5",
-      "name": "When clicking \"Execute Workflow\"",
+      "name": "When clicking \"Test workflow\"",
       "type": "n8n-nodes-base.manualTrigger",
       "typeVersion": 1,
       "position": [
@@ -69,7 +69,7 @@
         ]
       ]
     },
-    "When clicking \"Execute Workflow\"": {
+    "When clicking \"Test workflow\"": {
       "main": [
         [
           {
diff --git a/cypress/fixtures/Test_workflow_schema_test_pinned_data.json b/cypress/fixtures/Test_workflow_schema_test_pinned_data.json
index 5233a17848a26..8bd5ef783db56 100644
--- a/cypress/fixtures/Test_workflow_schema_test_pinned_data.json
+++ b/cypress/fixtures/Test_workflow_schema_test_pinned_data.json
@@ -47,7 +47,7 @@
     {
       "parameters": {},
       "id": "3dc7cf26-ff25-4437-b9fd-0e8b127ebec9",
-      "name": "When clicking \"Execute Workflow\"",
+      "name": "When clicking \"Test workflow\"",
       "type": "n8n-nodes-base.manualTrigger",
       "typeVersion": 1,
       "position": [
@@ -552,7 +552,7 @@
         ]
       ]
     },
-    "When clicking \"Execute Workflow\"": {
+    "When clicking \"Test workflow\"": {
       "main": [
         [
           {
diff --git a/cypress/fixtures/Test_workflow_webhook_with_pin_data.json b/cypress/fixtures/Test_workflow_webhook_with_pin_data.json
new file mode 100644
index 0000000000000..fb632bcf36383
--- /dev/null
+++ b/cypress/fixtures/Test_workflow_webhook_with_pin_data.json
@@ -0,0 +1,151 @@
+{
+    "name": "PinData Test",
+    "nodes": [
+      {
+        "parameters": {},
+        "id": "0a60e507-7f34-41c0-a0f9-697d852033b6",
+        "name": "When clicking \"Test workflow\"",
+        "type": "n8n-nodes-base.manualTrigger",
+        "typeVersion": 1,
+        "position": [
+          780,
+          320
+        ]
+      },
+      {
+        "parameters": {
+          "path": "b0d79ddb-df2d-49b1-8555-9fa2b482608f",
+          "responseMode": "lastNode",
+          "options": {}
+        },
+        "id": "66425ce3-450d-4aa6-a53b-a701ab89c2de",
+        "name": "Webhook",
+        "type": "n8n-nodes-base.webhook",
+        "typeVersion": 1.1,
+        "position": [
+          780,
+          540
+        ],
+        "webhookId": "b0d79ddb-df2d-49b1-8555-9fa2b482608f"
+      },
+      {
+        "parameters": {
+          "fields": {
+            "values": [
+              {
+                "name": "nodeData",
+                "stringValue": "init"
+              }
+            ]
+          },
+          "include": "none",
+          "options": {}
+        },
+        "id": "3211b3c5-49e9-4694-8f86-7a5783bc653a",
+        "name": "Init Data",
+        "type": "n8n-nodes-base.set",
+        "typeVersion": 3.2,
+        "position": [
+          1000,
+          320
+        ]
+      },
+      {
+        "parameters": {
+          "fields": {
+            "values": [
+              {
+                "name": "nodeData",
+                "stringValue": "pin"
+              }
+            ]
+          },
+          "options": {}
+        },
+        "id": "97b31120-4720-4632-9d35-356f345119f7",
+        "name": "Pin Data",
+        "type": "n8n-nodes-base.set",
+        "typeVersion": 3.2,
+        "position": [
+          1240,
+          320
+        ]
+      },
+      {
+        "parameters": {},
+        "id": "1ee7be4f-7006-43bf-bb0c-29db3058a399",
+        "name": "End",
+        "type": "n8n-nodes-base.noOp",
+        "typeVersion": 1,
+        "position": [
+          1460,
+          320
+        ]
+      }
+    ],
+    "pinData": {
+      "Pin Data": [
+        {
+          "json": {
+            "nodeData": "pin-overwritten"
+          }
+        }
+      ]
+    },
+    "connections": {
+      "When clicking \"Test workflow\"": {
+        "main": [
+          [
+            {
+              "node": "Init Data",
+              "type": "main",
+              "index": 0
+            }
+          ]
+        ]
+      },
+      "Webhook": {
+        "main": [
+          [
+            {
+              "node": "Init Data",
+              "type": "main",
+              "index": 0
+            }
+          ]
+        ]
+      },
+      "Init Data": {
+        "main": [
+          [
+            {
+              "node": "Pin Data",
+              "type": "main",
+              "index": 0
+            }
+          ]
+        ]
+      },
+      "Pin Data": {
+        "main": [
+          [
+            {
+              "node": "End",
+              "type": "main",
+              "index": 0
+            }
+          ]
+        ]
+      }
+    },
+    "active": false,
+    "settings": {
+      "executionOrder": "v1"
+    },
+    "versionId": "ded8577a-3ed2-4611-842c-a7922ec58b98",
+    "id": "weofVLZo0ssmPDrV",
+    "meta": {
+      "instanceId": "021d3c82ba2d3bc090cbf4fc81c9312668bcc34297e022bb3438c5c88a43a5ff"
+    },
+    "tags": []
+  }
diff --git a/cypress/fixtures/Test_workflow_xml_output.json b/cypress/fixtures/Test_workflow_xml_output.json
new file mode 100644
index 0000000000000..17449bc56d9ab
--- /dev/null
+++ b/cypress/fixtures/Test_workflow_xml_output.json
@@ -0,0 +1,53 @@
+{
+    "meta": {
+      "instanceId": "2d1cf27f75b18bb9e146336f791c37884f4fc7ddb97c2def27c0444d106778bf"
+    },
+    "nodes": [
+      {
+        "parameters": {},
+        "id": "8108d313-8b03-4aa4-963d-cd1c0fe8f85c",
+        "name": "When clicking \"Test workflow\"",
+        "type": "n8n-nodes-base.manualTrigger",
+        "typeVersion": 1,
+        "position": [
+          420,
+          220
+        ]
+      },
+      {
+        "parameters": {
+          "fields": {
+            "values": [
+              {
+                "name": "body",
+                "stringValue": "<?xml version=\"1.0\" encoding=\"UTF-8\"?> <library>     <book>         <title>Introduction to XML</title>         <author>John Doe</author>         <publication_year>2020</publication_year>         <isbn>1234567890</isbn>     </book>     <book>         <title>Data Science Basics</title>         <author>Jane Smith</author>         <publication_year>2019</publication_year>         <isbn>0987654321</isbn>     </book>     <book>         <title>Programming in Python</title>         <author>Bob Johnson</author>         <publication_year>2021</publication_year>         <isbn>5432109876</isbn>     </book> </library>"
+              }
+            ]
+          },
+          "options": {}
+        },
+        "id": "45888152-7c5f-4d88-9039-660c594da084",
+        "name": "Edit Fields",
+        "type": "n8n-nodes-base.set",
+        "typeVersion": 3.2,
+        "position": [
+          640,
+          220
+        ]
+      }
+    ],
+    "connections": {
+      "When clicking \"Test workflow\"": {
+        "main": [
+          [
+            {
+              "node": "Edit Fields",
+              "type": "main",
+              "index": 0
+            }
+          ]
+        ]
+      }
+    },
+    "pinData": {}
+  }
diff --git a/cypress/fixtures/Workflow_template_write_http_query.json b/cypress/fixtures/Workflow_template_write_http_query.json
new file mode 100644
index 0000000000000..3187bccd617ea
--- /dev/null
+++ b/cypress/fixtures/Workflow_template_write_http_query.json
@@ -0,0 +1,188 @@
+{
+    "workflow": {
+        "id": 1,
+        "name": "Write HTTP query string on image",
+        "views": 116,
+        "recentViews": 9766,
+        "totalViews": 116,
+        "createdAt": "2019-08-31T00:13:41.893Z",
+        "description": "1. Receives data from an incoming HTTP Request\n1. Reads file from internet\n ![workflow-screenshot](fileId:14) \n1. Writes data on image\n1. Returns the data\n\nThe URL to call will look like this:\nhttp://localhost:5678/webhook-test/webhook/test?name=Jim\n\nOnce called it will return an image like this:\n\n![reponseimage.jpeg](fileId:4)",
+        "workflow": {
+            "nodes": [
+                {
+                    "name": "Webhook",
+                    "type": "n8n-nodes-base.webhook",
+                    "position": [
+                        700,
+                        350
+                    ],
+                    "parameters": {
+                        "path": "test",
+                        "responseData": "firstEntryBinary",
+                        "responseMode": "lastNode"
+                    },
+                    "typeVersion": 1
+                },
+                {
+                    "name": "Edit Image",
+                    "type": "n8n-nodes-base.editImage",
+                    "position": [
+                        1100,
+                        350
+                    ],
+                    "parameters": {
+                        "text": "=They found the killer it was {{$node[\"Webhook\"].data[\"query\"][\"name\"]}}!",
+                        "fontSize": "=25",
+                        "operation": "text",
+                        "positionX": 150,
+                        "positionY": 180,
+                        "lineLength": 18
+                    },
+                    "typeVersion": 1
+                },
+                {
+                    "name": "Read File URL",
+                    "type": "n8n-nodes-base.httpRequest",
+                    "position": [
+                        900,
+                        350
+                    ],
+                    "parameters": {
+                        "url": "https://www.needpix.com/file_download.php?url=//storage.needpix.com/thumbs/newspaper-412809_1280.jpg",
+                        "responseFormat": "file"
+                    },
+                    "typeVersion": 1
+                }
+            ],
+            "connections": {
+                "Webhook": {
+                    "main": [
+                        [
+                            {
+                                "node": "Read File URL",
+                                "type": "main",
+                                "index": 0
+                            }
+                        ]
+                    ]
+                },
+                "Read File URL": {
+                    "main": [
+                        [
+                            {
+                                "node": "Edit Image",
+                                "type": "main",
+                                "index": 0
+                            }
+                        ]
+                    ]
+                }
+            }
+        },
+        "lastUpdatedBy": 11,
+        "workflowInfo": {
+            "nodeCount": 3,
+            "nodeTypes": {
+                "n8n-nodes-base.webhook": {
+                    "count": 1
+                },
+                "n8n-nodes-base.editImage": {
+                    "count": 1
+                },
+                "n8n-nodes-base.httpRequest": {
+                    "count": 1
+                }
+            }
+        },
+        "user": {
+            "username": "jan"
+        },
+        "nodes": [
+            {
+                "id": 9,
+                "icon": "fa:image",
+                "name": "n8n-nodes-base.editImage",
+                "defaults": {
+                    "name": "Edit Image",
+                    "color": "#553399"
+                },
+                "iconData": {
+                    "icon": "image",
+                    "type": "icon"
+                },
+                "categories": [
+                    {
+                        "id": 9,
+                        "name": "Core Nodes"
+                    },
+                    {
+                        "id": 27,
+                        "name": "Marketing"
+                    }
+                ],
+                "displayName": "Edit Image",
+                "typeVersion": 1
+            },
+            {
+                "id": 19,
+                "icon": "file:httprequest.svg",
+                "name": "n8n-nodes-base.httpRequest",
+                "defaults": {
+                    "name": "HTTP Request",
+                    "color": "#0004F5"
+                },
+                "iconData": {
+                    "type": "file",
+                    "fileBuffer": "data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgNDAgNDAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CiAgICA8cGF0aCBmaWxsLXJ1bGU9ImV2ZW5vZGQiIGNsaXAtcnVsZT0iZXZlbm9kZCIgZD0iTTQwIDIwQzQwIDguOTUzMTQgMzEuMDQ2OSAwIDIwIDBDOC45NTMxNCAwIDAgOC45NTMxNCAwIDIwQzAgMzEuMDQ2OSA4Ljk1MzE0IDQwIDIwIDQwQzMxLjA0NjkgNDAgNDAgMzEuMDQ2OSA0MCAyMFpNMjAgMzYuOTQ1OEMxOC44ODUyIDM2Ljk0NTggMTcuMTM3OCAzNS45NjcgMTUuNDk5OCAzMi42OTg1QzE0Ljc5NjQgMzEuMjkxOCAxNC4xOTYxIDI5LjU0MzEgMTMuNzUyNiAyNy42ODQ3SDI2LjE4OThDMjUuODA0NSAyOS41NDAzIDI1LjIwNDQgMzEuMjkwMSAyNC41MDAyIDMyLjY5ODVDMjIuODYyMiAzNS45NjcgMjEuMTE0OCAzNi45NDU4IDIwIDM2Ljk0NThaTTEyLjkwNjQgMjBDMTIuOTA2NCAyMS42MDk3IDEzLjAwODcgMjMuMTY0IDEzLjIwMDMgMjQuNjMwNUgyNi43OTk3QzI2Ljk5MTMgMjMuMTY0IDI3LjA5MzYgMjEuNjA5NyAyNy4wOTM2IDIwQzI3LjA5MzYgMTguMzkwMyAyNi45OTEzIDE2LjgzNiAyNi43OTk3IDE1LjM2OTVIMTMuMjAwM0MxMy4wMDg3IDE2LjgzNiAxMi45MDY0IDE4LjM5MDMgMTIuOTA2NCAyMFpNMjAgMy4wNTQxOUMyMS4xMTQ5IDMuMDU0MTkgMjIuODYyMiA0LjAzMDc4IDI0LjUwMDEgNy4zMDAzOUMyNS4yMDY2IDguNzE0MDggMjUuODA3MiAxMC40MDY3IDI2LjE5MiAxMi4zMTUzSDEzLjc1MDFDMTQuMTkzMyAxMC40MDQ3IDE0Ljc5NDIgOC43MTI1NCAxNS40OTk4IDcuMzAwNjRDMTcuMTM3NyA0LjAzMDgzIDE4Ljg4NTEgMy4wNTQxOSAyMCAzLjA1NDE5Wk0zMC4xNDc4IDIwQzMwLjE0NzggMTguNDA5OSAzMC4wNTQzIDE2Ljg2MTcgMjkuODIyNyAxNS4zNjk1SDM2LjMwNDJDMzYuNzI1MiAxNi44NDIgMzYuOTQ1OCAxOC4zOTY0IDM2Ljk0NTggMjBDMzYuOTQ1OCAyMS42MDM2IDM2LjcyNTIgMjMuMTU4IDM2LjMwNDIgMjQuNjMwNUgyOS44MjI3QzMwLjA1NDMgMjMuMTM4MyAzMC4xNDc4IDIxLjU5MDEgMzAuMTQ3OCAyMFpNMjYuMjc2NyA0LjI1NTExQzI3LjYzNjUgNi4zNjAxOSAyOC43MTEgOS4xMzIgMjkuMzc3NCAxMi4zMTUzSDM1LjEwNDZDMzMuMjUxMSA4LjY2OCAzMC4xMDcgNS43ODM0NiAyNi4yNzY3IDQuMjU1MTFaTTEwLjYyMjYgMTIuMzE1M0g0Ljg5MjkzQzYuNzUxNDcgOC42Njc4NCA5Ljg5MzUxIDUuNzgzNDEgMTMuNzIzMiA0LjI1NTEzQzEyLjM2MzUgNi4zNjAyMSAxMS4yODkgOS4xMzIwMSAxMC42MjI2IDEyLjMxNTNaTTMuMDU0MTkgMjBDMy4wNTQxOSAyMS42MDMgMy4yNzc0MyAyMy4xNTc1IDMuNjk0ODQgMjQuNjMwNUgxMC4xMjE3QzkuOTQ2MTkgMjMuMTQyIDkuODUyMjIgMjEuNTk0MyA5Ljg1MjIyIDIwQzkuODUyMjIgMTguNDA1NyA5Ljk0NjE5IDE2Ljg1OCAxMC4xMjE3IDE1LjM2OTVIMy42OTQ4NEMzLjI3NzQzIDE2Ljg0MjUgMy4wNTQxOSAxOC4zOTcgMy4wNTQxOSAyMFpNMjYuMjc2NiAzNS43NDI3QzI3LjYzNjUgMzMuNjM5MyAyOC43MTEgMzAuODY4IDI5LjM3NzQgMjcuNjg0N0gzNS4xMDQ2QzMzLjI1MSAzMS4zMzIyIDMwLjEwNjggMzQuMjE3OSAyNi4yNzY2IDM1Ljc0MjdaTTEzLjcyMzQgMzUuNzQyN0M5Ljg5MzY5IDM0LjIxNzkgNi43NTE1NSAzMS4zMzI0IDQuODkyOTMgMjcuNjg0N0gxMC42MjI2QzExLjI4OSAzMC44NjggMTIuMzYzNSAzMy42MzkzIDEzLjcyMzQgMzUuNzQyN1oiIGZpbGw9IiMwMDA0RjUiLz4KPC9zdmc+Cg=="
+                },
+                "categories": [
+                    {
+                        "id": 5,
+                        "name": "Development"
+                    },
+                    {
+                        "id": 9,
+                        "name": "Core Nodes"
+                    }
+                ],
+                "displayName": "HTTP Request",
+                "typeVersion": 3
+            },
+            {
+                "id": 47,
+                "icon": "file:webhook.svg",
+                "name": "n8n-nodes-base.webhook",
+                "defaults": {
+                    "name": "Webhook"
+                },
+                "iconData": {
+                    "type": "file",
+                    "fileBuffer": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciICB2aWV3Qm94PSIwIDAgNDggNDgiIHdpZHRoPSI0OHB4IiBoZWlnaHQ9IjQ4cHgiPjxwYXRoIGZpbGw9IiMzNzQ3NGYiIGQ9Ik0zNSwzN2MtMi4yLDAtNC0xLjgtNC00czEuOC00LDQtNHM0LDEuOCw0LDRTMzcuMiwzNywzNSwzN3oiLz48cGF0aCBmaWxsPSIjMzc0NzRmIiBkPSJNMzUsNDNjLTMsMC01LjktMS40LTcuOC0zLjdsMy4xLTIuNWMxLjEsMS40LDIuOSwyLjMsNC43LDIuM2MzLjMsMCw2LTIuNyw2LTZzLTIuNy02LTYtNiBjLTEsMC0yLDAuMy0yLjksMC43bC0xLjcsMUwyMy4zLDE2bDMuNS0xLjlsNS4zLDkuNGMxLTAuMywyLTAuNSwzLTAuNWM1LjUsMCwxMCw0LjUsMTAsMTBTNDAuNSw0MywzNSw0M3oiLz48cGF0aCBmaWxsPSIjMzc0NzRmIiBkPSJNMTQsNDNDOC41LDQzLDQsMzguNSw0LDMzYzAtNC42LDMuMS04LjUsNy41LTkuN2wxLDMuOUM5LjksMjcuOSw4LDMwLjMsOCwzM2MwLDMuMywyLjcsNiw2LDYgczYtMi43LDYtNnYtMmgxNXY0SDIzLjhDMjIuOSwzOS42LDE4LjgsNDMsMTQsNDN6Ii8+PHBhdGggZmlsbD0iI2U5MWU2MyIgZD0iTTE0LDM3Yy0yLjIsMC00LTEuOC00LTRzMS44LTQsNC00czQsMS44LDQsNFMxNi4yLDM3LDE0LDM3eiIvPjxwYXRoIGZpbGw9IiMzNzQ3NGYiIGQ9Ik0yNSwxOWMtMi4yLDAtNC0xLjgtNC00czEuOC00LDQtNHM0LDEuOCw0LDRTMjcuMiwxOSwyNSwxOXoiLz48cGF0aCBmaWxsPSIjZTkxZTYzIiBkPSJNMTUuNywzNEwxMi4zLDMybDUuOS05LjdjLTItMS45LTMuMi00LjUtMy4yLTcuM2MwLTUuNSw0LjUtMTAsMTAtMTBjNS41LDAsMTAsNC41LDEwLDEwIGMwLDAuOS0wLjEsMS43LTAuMywyLjVsLTMuOS0xYzAuMS0wLjUsMC4yLTEsMC4yLTEuNWMwLTMuMy0yLjctNi02LTZzLTYsMi43LTYsNmMwLDIuMSwxLjEsNCwyLjksNS4xbDEuNywxTDE1LjcsMzR6Ii8+PC9zdmc+Cg=="
+                },
+                "categories": [
+                    {
+                        "id": 5,
+                        "name": "Development"
+                    },
+                    {
+                        "id": 9,
+                        "name": "Core Nodes"
+                    }
+                ],
+                "displayName": "Webhook",
+                "typeVersion": 1
+            }
+        ],
+        "categories": [],
+        "image": [
+            {
+                "id": 4,
+                "url": "data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gA7Q1JFQVRPUjogZ2QtanBlZyB2MS4wICh1c2luZyBJSkcgSlBFRyB2NjIpLCBxdWFsaXR5ID0gODAK/9sAQwAIBgYHBgUIBwcHCQkICgwUDQwLCwwZEhMPFB0aHx4dGhwcICQuJyAiLCMcHCg3KSwwMTQ0NB8nOT04MjwuMzQy/9sAQwEJCQkMCwwYDQ0YMiEcITIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy/8AAEQgBYQH0AwEiAAIRAQMRAf/EABwAAAICAwEBAAAAAAAAAAAAAAECAAMEBQYHCP/EAFQQAAECBQMBBAcCCgcFBgMJAAECEQADBAUhBhIxQVFhcZEHExQiMoGhFZIWMzRCUnKCscHRI0NEU6Lh8CRUYnOTFyVjg7PxZZTiCCc2N0V2hbLE/8QAFQEBAQAAAAAAAAAAAAAAAAAAAAH/xAAVEQEBAAAAAAAAAAAAAAAAAAAAAf/aAAwDAQACEQMRAD8A9iJySMjtEWDCRxFYDkdH6u7w6WSD70QDp8XnEJYnl4bcCGy8KQCH/fFCkkjOIdIG1wIrBzkB4sCW8eyADElgzeMOzYwYAOf84OG7oBdxbKRnsgfm9vfBISQ748YGN2eIAv0xEA95ixB4xDBOXhCGUSktARTA93cYiS5YE5ibScvxyGeCQHAfBgJ8RLnrxxBAY44gAMMCGAw7YgDgjJEA9cNAB+RiFQc90BWT7xI58IZIS5HbCltx6fSG4x1gIezgQFdGdhxmGbGSx4GYh7eT3F4AABJY9ctAWM/yMEDJfA7YhG33gzM8ABkEnJHUww93PQ/KCwBBfw6wpcJ5DQB3AA5z2cwC4GHhQSSAMtwYct1L/WADKUeWEPtEIFEYwfnEJUQ/TsgCAHYF/rAJbk8dOyBzmCE9e5xAQnLj5wUkqDhoBTtAYnlmfiFC2dv3vAMQAOkDjnPhE5PUH/XSGTnnMBAjLnHgP8oXfhiA/VoYqIyD8orDMztnoYCwKccdOIbAIfEVgsWOYYKBUBnygAXKg/yhsE9v1gE+8GILc90M2XP7oAcEkwFuA4Bbsgn4S0VjgBjjgwELkk+8CIYHcMZPXmGVtKQ/B7ogYjD4gF6gszdIILkv8sOIC8KiBLpcEOYAkAZHnDJLjlyYQZYFTPgZbygpAHJy/bARYZWA8QAlPdBUCoN/nCgKRxgd0BOoPME4BYuOoJiAl8s3MAgFXL58oCEZB4B74gICmdwO2IE5yfrBYDiAJLH+AgEEsyX72ifncf5QwUS+H8IBAnGT84m73WAx2kvEPvHvHQQCX6ccwDIOM8Qp+Ijh+rGHS4Ac5PWK1pG7tJ7oBmSQDgY4iRAA2SX+USAJAD9oiBmzz2gQFl2AHPbEYJIdgO2AGQXy0MCx6tDHIZQBis9CPnAE5DgB4KVOMc9j8Qimw0MB2HL8QEIILnH1hj8JeIe4nwgEs3+ngIA3Z4xBhWflAIZnZzDAAgNAEcfvhXPD8d0NgAO/yhckl+YBgAzQpG7rmGByzRWrKto6dCICYG4h8ZciGSp8HELtIwMvBAIOWGe3iAYhmx3xDx2HoIId+IhZu2ArSDkMQ3SCAAcE/IRJgdj9YISGBBPfmAgP+ReBhXIfoYhIc/viBSGA3AwBIwQPnCBYKih2Wz/KHBG5uPnGHU2yjqaqTVTqWVMqJJeXNKQVJ7gpnZ2LcOBAYc/VVgpqtVJU321yp6T70qZWISpJ7CCrnuh52obNKpTUKutH6raVI2z0qK26Jz7x7hHn1w9ClHetS1NyrrpU+zzsiUhKUrBfjcxDAYyHzk4zxOu/Q3UadoVXKyT51dSyg86VMSDMQMBwzbhnoHHyeA9YkekO3T65FGQKefO2pl+uCtpJDhywAwR15IjRX3Wt7E3/ALvqk0wVMTKSlNEqaUKIS6VfEX94EDakllM+2PnBM2bLBSmYtIfgEjMem+jXV2krMJEq7W6fLuXrt4uXrdyXD7QQSNoALdR1PcHpdPP1hcqKYvTerLZdJktH9L7XKTLUlTfD6tKAUHs3GPKbn6XNf09XMpZ9ciknyjtWhNLLcHH6ST/oxt9A659VqWfcKqwzav1m4VFzkoUpSEADaVJcpSwDKIIwe7Pq9L6ONL/hNUajRSInz6lJV6qYEzJIUpj6xKSCxPLueSzQHL+ibUesNULqZl3qd1vlJG2d6hCVKU/wuBw3d8xHrBLO2IxptBIqKiROmCalUgukInLQl+9KVBKv2gf3xxGq9eSKC13SmqayfYq1G00sxUn1kyck5ISkggKLEddoUkku4AdH9v09FXGlu19ssqaSUokCYJcw5w4Ut37mjY1FbJp6NVVvK5aUlQ9WkrUoNwkJcqPhHydea6zLtFLT0q51XczMXOqq0p2+sUThyoFRIHYQHPBIc6Wru1fWpCKiqmLljhG7akHtCQwfvaA+tl6rtVD6pFyraenM3dtQpYUpJSHUFBDpSwY8xyF99NumqGaJFvmVFVMBBVMl0wVLI7PeUkv3h/4R83ImzJe7YtSdwZW0kOOw90VwH0tZPThpuulBN0K7dMYfEhUwKLn9EFvnG8V6U9HIoJdbLvNPMSpTFDlMxIdnKD73PdxnjMfJsdDo+x0WotQybdXVy6OXNcJVLlGYpRZ2DYGASScCA+prfrTTN0Qk0t9oFKUndtVUJSoAFspJcf5xtaSvoq1a00lZIqCjCxKmBe055Y4jx9XoOtsi50lEgVtTTzgtc+tVNSj1CQlkpSkJ95SlF3OAE9evomkNDWbRUicm1onKmTwn1s6evcpW12GAAOTwIDpwkc9PGCG7YUqPIBhXUrIf+cBFqHHLmFx2PnrloYgqLgQpTgk/WAbCcu7938Ym7HHnCsTgAfIwySEjgkwEcnASc9eIBWwI93zhgpRGMd8VlKmYtAFIBPMMU7skjH0iAEEDPjA3FwHJMAQpSQRzEA90kAAdwxAYsXB56wwOCCD2ZgBggfygE57/ABhhw4eEKsHjEA24niIFF8kQRgc/KIQ5BZmgIM8eMT4VDD98EFldOzmBlJy58T/OAJ5cD5xWcl2+kEg85/jEHvED5v2wBSp1MWgEbS4IfuiH3WZLxACosevdEDjjLvEhSCC2PP8AyiRRFpy7wwAKQ3LQSnjo0AkuMY7oCAsAGaAQAH4/jDEB4RQ5I58YCAOcePMMxHEKCEgHnOA7Q/AJLNAKVZz5RCrkB3glik98KkH5NAQAlWcDxiw4Z4AH074nAeACsjHHa0LySzYhueOsAksG+sAvgwEMXB3j90L+bu2+LQxPucgdxgJhu3DxMdC0K+1n5MAFwAMd8A4yBBJyHZoALByM+EQscAwEIJSw69sQAAAQHIOAX6dIIPDwAID5g4fAz2dsQg4OcQQPeJIDdsAAkDnBifnO48CYrAKs5OcmGPulirHMAwBKunfFVVT+1Uc+nK1JTOlqllQDkAghx5xaBl+h6N1huVZ+sB8b6p0rctI3eZQ3GWzH+jnJ+GanBBSfAjwLjpFVv0tfbn7OuktNWuTPWiWif6lQlOo7UusjaAThyY+qtZaQoNX2SfQ1aUyp6gPU1OzcqUoFwQHD9Rzwo9sam2Sr3YpNust4lUyrSinRTIrKQjalaQSlUwKbbhKQGChuVzxAX6L0BatKWyQmXTpXcSge0T1KdSlEDckYbaCMBu+OuQj1YSAEpASwAGB4RorZqiy1VcbfKv1BVVYX6tMpKwlalJDHDsoulRdIbyjfgFy+R3wEKgBuJATy5MfNt21fp2p1RcJ2oBUai2TVyaNXq0yZUiWVEuGO5bOANw4B5fHsvpORWn0cXsUKZpnGSH9Vzt3J3/LbufuePkeA9qm2jQIuUq52TUVql1pkhcqRWSyqS5UpJKksBu2kMnGUgsXePML7UzbteKyoRTSCJI2zJlHJUhBSkhImFLnaD7o6DIw8aWPQ9O2udq/UlFVWi7y7ZcZ8oy6wrUN6poSQtSEpyoKSNxdgFFQfiA87iR9La/8ARtap2hJy6GglfalBI9amolSUy1zykDeVhIG4kAnx8Y5md6FKZHo89rlVJmXsShVKmKVtRtCSoygnwxuPUdmIDyPT9JSV+oKCirVLRTVE9MpakKYjcWBdjwSOkfRelfR3S6ZeRS0BVVGaRPuc2cXVJCyUhAHCikJBYJAc+8pmjRejf0f0VBZV3e5WSol32jmzJSE1MxSUlaXZaGwxcJBYsUkg9Y9gkVEufIlzZSnlrSFJUOoIgCgNw47oYkpPAaASlJctn6wpUVFs+EAyl4BHPhmIlDOXIBgBO5+o/fDFDJDdICBBIyT4QCjaHBPhiIEqbd/HpBCsnBYdYANjJ8HhSkghxg4hjj3mDeEQBy5+TQECgx4OOyC+DggxAnxbthCEgFxmAg97nMAAu3ZBAJD9IdKCMkDwaAgAIDcRAkdREDDEQ8/ugCcQjHoP8oYqxkOe6IFB8A+EAB0fHzh2cdjwpIUcAgxD4c9YCYyTx3QC75fwgLVln4xABchwGgIxIxx5Q4SU84eInh3Ge+ATvLBn8YCDsORxE2gKcFujM8Elg2d3ZABc54doAFn+KJBODhm8IkBY/jiEWTyC7woJ+fGOsOPr3QAThOOndEABTmAlPxdneIZugxAFmTj98BRYN1iLVtTxmEHvE5cwBDZJ+HtaDwBwQYDgKcmCdoL47u+AIw/MFwQxYCJ8oOCGH0gEKgDteAVe6DhvCIS5JbH0gABXj2wBJBSHdoV3AA8uYYFiQoMOkQJYuAzcYgGQlg55PdxEJScEFoiFbku4J7oUdU9OcmAnu4I6dYg5wPk0QOFHOIKmGScDo0AA4If+UEj/AEIUue94d0gAEwCh2wfliAklKyBh4Ylxhx/ruhGJy/nAFJ54yYhc9RjIgB0k90O20cOD3wAcgEAsBBK/dGH+UApJSQ+IhSyWAz1MASr3eGMYV1mVabRXLt6EqrUyFqp0kAgzAk7Rz2t2RmkgpZ8xEe6lziA+ITNnyqszd6kT0r3bhhQUDzjgvHs/o89MVaFW3TtzoJ9eta0yJdVLmFU07lFtwV8TOA7hgOscr6aKK3UHpBnS7dTokBchE2elAYGaolRLdHBTxHXehj0fT0TqTWNZN9WkCYmmp9hBUCkp3knoxUwbOC/aHuhD4VkHnEc9cdGafqLTW0cmzWySqplqTvFInCiDtUWAOFF+Y6IqBSOHhSQzbSceEB8R11JNt9fUUc/E2nmqlLA/SSSD9RH0J6D9J22l03L1LuTOuNX6yWFH+pQlRSUgdp2uT2EDjnx3Uula2k9IdZYJEqZMnTasppwrJWlRdBJ/VIJPjH0bZdGqslZY5dJMTJtttpppXIQtR9ZVLASZhfkbStnyN3EB2AYjEYtZQoqqGZShapKVI2pVLO0o7COmOzg8FxGSC2OfCAVe8wgOEFm1ImrsxmXIy5dskGWqnSgqlVM0JUlMwqyr4VA7VDBB55jb3W63W0SpS7da5VzkhSEKkS5glTkJUSNwSRtbKcHazHJ6av0p6uuWj9Nya62U8qZMnThIVMmuRKdKiDtBDn3euPF4+bhqLUVLPqKtdwrEzK6VsmTZhJM1LvgnoDwRx0gPr2mnmpkomiTNlbg4TMTtUnuIfBjJBfk57CY5X0e6pnav0fJuc+SJVSFKkTiBhSkgOpPcXHzcdI6oJcku47HgGHvZHA5HbBBY8H5QAlg4P+v4RCp8Z74BhxwfpC7SASPKGLtyQIUkhJzgwCgMHEQJdi5btgfm8+cMjIZ3EAxYs/7oBQDkv8oISRmFKst0/fAEJxkOImEnPX/XMMB7rdOIRRYhOW7oCM7HMFwAMcxBw2X8YhGOc9vZAIA5wzdrQ7NBSGc8wTxw8BAnLxCoEs4OeIQglTEuBmBk8h+jcwAPXoejn+UOVMHyB3wAzdIhwdzcdICBwQeYhO1X8CYIVjDeMKVFSsQDJS6go+XSCoe6wHEIVHoeOog7gep8BgwAz2CJAKs4ZokAwLpwQCOsOFbg3WE27hjs5ctESACzF++AgwrqxL9kWeEVlI3YDQ4JKccwFS1urLkdjRYlJ2jtgFPB/wBGCCSM5H1gAQGIPB+WYASSoh8t1hj29IAPviAO1uIBUBwHPhEKnwf/AHgEEkY4HMAAncXOPlFnYBzCgjtBbsiFeG48IAlQdjx2xWS/BfwzHJyPSFYJYr03S6UVDPpKudTmQuY0wJQopCink7gN2B1AjWSvS5bq6omS7JYr7dpaeZ1JSOn6kHzAgPQSlLgYfr2wQN3By/jHJaa9I1m1PXzLYkVNDc5RO6jrZfq5hbnbkgkdjv3NF2tNb2vRVsFTWkzqqa4kUiVe9NP12pHUn6nEB04ynh27IAPQAiOc0ZrG361swrKP+jqJbJqKZRdUlZ6dHByyuvcQRHR5Zm+WYCEAno8EBi7/AOuyFBPLuemIsOEkk/OAG4OQwcQoG5JJd+WJ/nChO5QPCfOHUPdCRgwCgKJA4HhA+Fyzv2dYgcKAbjq7tDlIKSxBJgEyosCexzBwSARnxjjNc+ke1aIEunnom1dwmo3JpZSglk8blKIO0EggYJ7oxdO+kZd0vsq0XKyzbfNmnZLnImGbK9bs3mUpW1ICwkuQH7Ig74pLhuPOAQUgZLO/zhk4w4JOY57UOs7Tpyrl01cqpVMVKM9YkU6pvqZQVtMxe0e6l8PFHnNt0hTa09K+o7vd0zzQW+pTJloWSkLWkBIHekbQWBzuHbHs0tCJElMuVLSiWkBKEoG0JADAAAYEUU8ukJNbTolbqhCVGclIeYlnSSoByGOPGMglwyg/aWgEL7mEMEdSWPZiCSCnu7XiDLglXzMBSaOnTVe1ezyRPKQkzhLTv29m5naLmIOODEVy+5m72EQMSQwI8BAThgHgEF2+fdEBcBWA0Qq90OS0BTU0lPWISiqppU4JWFJTNQFAKHBAPXnMa++6ctmpLabfdaNE+QS6XcKSQQXSoFxwHY5GI26RhxwY4bU3pDpNKa1kW+6qnS7fNoPWoMqTvKppmEZbIZKTgfpF+kB1NltNNYLFSWujlIly6eWyUIcAqyVEbiTlRJyT4w9tRVoRMnVywmbOUFeoSdyZIZtqSwJxkngl2AEcaPSLc7kR+DeirtXoPE+rKaWWR/wqU4P0ir/tPqLTXyaTWGm6qxJnFpdSJqZ8onvUkBvk/wAoD0NaiTh2iAJ6cRwetPSdb9LTaShoZKbnc6pKVS5SJwShKVfCpSsj3nwOzLgM+rn+lSv09WyqbV+lp9vE8FUmbSzkT0qZsADB5HCicjEB6kcjiE3Enn6xj2uoqam1U9RWU3s1RNRvVI3OZb5CSe0Bge94yQjLgjuxAFIc5HziE7XAEQFgxDGIkBnOQfCAXa5cYD/WCQCHdx5wSHSwA84UK2jvMA4O7AhSNpP7uYISBntxADPyw4GIAgOcxCCWdm7Ijg98Q8FjAA4IIfnIeGBJdxiF2uMnA7Im7AAgCpOXHTthWc8dxcCHJIB7oUpcjMAApgxD+MNjo7d8AJSTk/5xEYBGOfKAV274im+cMwCnLnueFOT7sBBngw2zhjiFBcP17osSfdy8ANkSGcRICAAQFYG7gQ3eITJGTiABJdxhvlDAukdjZMLtbAJAgoJALpMBMqPEAp6sPEQQSR08oIyMgwAKnDNAIDDjEctqPXdDp28U1pNBcbhXVEozUyaCSJqgkEhyNwPQ+UYJ9JCjj8DdVuf/AId/9UB2+08gu8AFQxgiOP016Q6PVF6n2qmtF2kTaYE1CqiQlKZJDslXvEgkhgGfyMdiHUl08/wgIHT70QJ3c4ghRYP+6DucFvDMB5zq/wBFVJf70m+WysRb7q4UsrkJmypqhgKKVYBbxB7HzDosHpNp6cS5OqrQyUslPsKUj6Jx8hHoJJwRHhdy9J+qpEy5XmTcLVJt9FcDRotM5KfXTkpOVcbuCHIIDvjEBr9SKvtVdZ8jUEmnotWWqQa+guNKnamrlS3UpJbkgJUpJYNtUkgPHQU2i5Ou5cy71twn/bk63UlZIqkqITJmLM0hITwEjalPbh+SXx/TXPmz6rSsyglkXCrk1EoSgPfKZqUJCSP2lDxeNui3as09cK6VZZ1uWLdYaWWmVPQpRmFKZjEMQN25Mxnx7ye8wHKej2511X6XKczKb2evMqokXlMoMiYpCVNMIGAoqCQWxuD/AJ0e5Xe80FjtU243KpRTUsr4lqJyTwAA5JPYI8w9DmoNM1In00pE2TqOrKptVNqVBSqpTlSihQADO52sD+sxMXelXTSau6afra6vqamnqbxIozRFe2SiUoF2AzuO0up3YthhAejC+2v1NFUe304lVxAplqWAJxIKgEuc4B/94yKKup7lJVOpJ6Z8pK1SitBdO5KilQB6sQRiPBNP+j67akm3Ohl3Ckm2u0VtTbZEuvExRkAlzMQlJA3cHJZ49C1NXTPRvoq02DTsr11wqVijo1LAPvKLqmEcPuVxw6uwNAdFqDWun9L1FNT3auRKn1KglKQNykpP5ygPhT3n+BjoAyUpUCFJUAzdfCPlu62Ar0BbdbVE2dWVdbPnSK4VCtzqKlpQpJ5BG3zbo8emVesLzp/0a6Vt9FIM7UF0phKkesDhCEge8QcEhJTzjknhoDttUa5sGkVUqLtUqRMqVMlMtO5SU9VKSMhIP+QOY3lFW09dSSqqkny59NOTulzUK3JUD1Bj53qtPVC9B270kTKhdxrhMUbhIrgJsubLMxUsMCMBiEt0dwzR3fo7s6LTrrUlrpqurXbrf6qZR065pKEeuQFEtwSAyQfE8mA5b0k0cufqLXtYtAUunoKFEsnO3dMkuR2YSfMx6TdqfSGlK5OpbosU1QpQUl5qlBUxSQkqTKBbdtwVBPEefekI/wC3ekYO49ktv/8AdEUelnS1LZ7dYbxUT6iurpik09UifOJM/wB1yUj8xiCAEhg4x2h7zJmomy0TZS0zZcxAUhSVOFAhwQewjMeY+kCZpSp1XS0VfqGsttxq5AoqlFIQUqkqVuCZpIIS5OD2HIbMdL6PaC40Xo6tVHcSuVWpkKDKDqlJKlFIIPVKSnB4Zo8l1dpK20N41kgibULk22TWSps9ZVMExUxIUrd1fL+MB77Ty6ejoZVNJ2plSJaZaUlXwpSlgPkAI0entdWHU92rrZa6wzZ1GNylFLJmpdipB/OALAnHI5GYW16co6zQVLZpi6hMiqpU+vWiaoTJilJBUpSuSSSSe3jjEeLaQs5k1GiKq21U2hrbjOraapnymKlS0q6AgjdtUoO2PdPSA9qvevNP2G90Vorq4IrKlQTtSykyX+FUwv7oJYfN+Mx0Uqaha1ALSopVtWEqBKSwLHsLEH5x8/6s0rbrXeta0/qFTkotkmup5k9ZmTELM1KVK3qJJclT5y8empr6TQXoslXJEozfU0kucQpRKp06Zt95SucqOT0HgIDoNS6otGlLaK27VHqpSlhKUpDqUo9ABksMnujJtt3tt3tqLnb62TPpFJJ9clQYNyFfokdQWIjwm16Zu3pMpb5drxXTk32hnJTSyVhJlJO0q9WUFwAcD975hNB0QmX/AEuZM6ZJo7365ddQpxKVMpipSSB+iSEqbgFxxiA+hy7F8HvxCk4DvFm3LxWRg8eLwBQo4GCO2OZ1loi3aypqdNRNm0tXSqK6erkllyyWcZ5GAW7sER0xU6Q2H5ggd/0gPPk6E1alAQn0kXApAYFVGlRbvJW5jnr1Kvmn7hS2XWNXL1Bpi7zhT+0rkiXNp5p+EuPhI55OAWbrNe6guk/W9bZk6n/ByhttAKpM1KiDUzCAQnBBV8TMH+E4JjXaq1NU3f0E2m4XRYNyn1iRKVtAK1S1KG8D9VOW6nvgBpHS1muFtobVX0MqoEjUFXRzlkFK5iUU61JdSWUwZOHbEc5dLVY6T0kUOn7Aa1YRWSqWbVzp2/1ClKymUwG0pzkuXBZmc+i6StFVYdP6Xm3AK9tq7lPrqgKGQpdNOIB79qUv2F45TT9GhOmtFXVSd1TcdTevnTCMk7lJDn9l/mYD32XKRTyESpbhCEBKQVFRYBg5OT8402pNT2rSlu9uu1UmVLJZEtOVzD2JT1Pb0HVoTWGpEaW0rW3hcozVSEgIlqOFLUoJSCegch+548GnWa56osGpNTXqfMnXu0VEs+omEGUJQypG3gAAksP0T2vAfRdvr6W7W+RX0E5M6mqEiZLUn84H9x7uhjBtmpbRd7vW2ygr5U+som9fLS52v2HgscFuDgx5/wCiy21d79FkyhXWVdBSzK2cmSuQoCZ6kgOlKiMe8VORnBGHjjNE2qdbrpoyrs9SaWtuxraaqmkbwUy1HIScbtrN0dKSQcuHuVZqyx2+/wBJZKq4ypdxqsS5JJJc8BR4ST0B56RffdSWjTVIiqu9dKppS1hCSpyVKPYA5LcnsEeE6v0XS0epdXFE+oVNpKCTcqefNmFcwK3JCtyjkud3hjsja6t0qmqlaKv11r6q5zrpPp6esRPWySJqQr3EpA2ge9xyWJy7h7kFomoSuWtKkKAUlSWIUDwQeyMeuraO2UUysrqmXT08sOubMUAAI820bqpWmfRXdJ9xUqpNhrJtCgOxmMUhCX7HUB3Ad0cgmz6p9J98rqS93FFHOopEmrkUKkEyAJg3AFKS4O0hzlQciA9vk3y2VEq3TZNbJmIuL+yFJJ9d7pUW8ACS/HBzGyOGLDHRo819HHo8otN3Gprqi4UlZc0Ay0yKWYVS6UKPvABRKnLM5bqOseksQeP5QBKnBYc9pgONrvxByR3QpQSQS3bxAMMpiZw/PeY57VWrqHSNNSLq5NVUTaueJMiRSoC5i1M+Ekh+g8SI049JKnb8DdVn/wDjv/qgO4ZjmIFe8cRw1D6UKOv1DT2IWC/SK+cQfVz6ZKClJ/PUCpwkZLtHbp2uSW4gGO7I6nveFADctDBik4DeEIByzmAIB5PZDjKYgST2v4QfzWAPfiATPdEhgzcxIA8gtAILNkiCB1/dCkgmAm1hlvKIFpSMhhwxYQU8nEOUuO+AQKcu3yibt2ePCACXYD90QJLs2PCA4uv9FunLpd6i6VJr11k9RK5oq1g56BugwABhgBFP/ZLpjc265/8Az0zH1jvG7IB94qYDvgNJpzS1q0pST6W1yVpROmGbMVMWVqUohsqOY3afhLvmIQScdO+BkHa2OyAILJAZmgEFQwC3Z2wGDYAV4wQC+1I29sAQl2LAfvjxbV07QNi1nOuUibTVN5mTAqbS+xqq0Jmv8QSlaEpUTyCo56A5j1DUqpy7ZLoqeeumXWz5dMqckspCVF1FJ6K2hQB6Eg9I0d39FelLlaDQSLXJopoT/RVchLTEq6KKndXeFEv45gNJout01qXVs66VddPq9SyUFEuRW04p/Z0h3EqU6hhy5KlKyTh47emQkazuLhwq3Urj/wAyojw/Ulm1xa5tGqps8+suttmJNHe6FBWqZLScJmhIJV3FTHkFwXj0Wi1VW3BNdcKWyXNNznWuRJl0qqOYhIqEqnEgrUkJCQVJO4q4Pa4gPNZMiklaO0jWUa9t7RfFyqQI+JcszC4PaArb949pj1H0qFpOlmPGoaXHyXGk9HHonn2Grk3jUM1E6vkg+zUyVbkU5LkqJ4KslmwCXclm6H0haMr9W26aae5LlTqUJm0MhHupE5OSpSuSSHSk4CXJy8Bj+i8tP1iBz+ENV+8QfSAqUjV2hVTvxZuSkueApSUhP+IiOP8AR1pnV1xvd1rrlMqrPb6pe2ukpG1dXNHxFL5S6nJUlviISez0TXekBqnSnsNEU09bSqTOoVg7QhaQyQ/QEOO7B6QHDej+xzNWaRobTXSgiy2uumqnpKhuqpoWVJQw+FCdzl8ksB2xvtbJQn0k6QI2hPs9clPYGlBmjjfR5pvXiNRV6k+usNDNU1aZksETFtkykqcbiXIUPdD9QwjvNfaPrbrYrfUWOav7Wsy/W0pnLKlTgwCklSi5Kto55IY8vAchIAX/APZgWARiSp/lUvHSaGWFekHVCnzNo7dM+XqBmOa0Z6PtR3TQtda7xWzrZa6wmZTW/wBWN6Vu6SoqG5KdwB28lnx1yPRvo/Up1NNvuoVT6UUqE0qZIWUe0mUAlKlAH3kp2gg/nFj2uGr9IZa6ekVPbR245/5kv+cX+kLTC7UNJXKxVlWm5zqtEiSampVOSJigClQ3lW1iMtjPGIu1v6PNXVuoq+bba2TW0l9UmXVKmoTL9mQhSVIByTtSEJDpyWYhyH6jWOl73U6JtCKCoFfebJPk1UuYtCUmeqWC4Adn4LPnb2mA2no71PWar0uKqvkiVX089dJUADaFLSEkkDo4UHHa7RwfpD9zUusU/padknn/AMdMdP6MLLqG301wud6UKRNzqplWLalAHqlrIJUSXUCwACXwOc8aH0rad1DMvX2pY6NVdJuVELbVSUI3KT7+4KboH254G3ODAeoWEKFhtrEN7NKOP1RHieiGMz0dd1dch/hTHq9gsl7otDy7VX3f/vL2USkT0SkkU7JCUhIxv2sCSTkx5dpzQGsKbVdvtdROl0lvsM9VVJrpaH9cJhBUEv8AESEsQfhDu7hwzvSQsHU+qEhv/wAMSyW7fak/zje+kMD/ALFZbgH+gouf1pca30qaW1DU3k3WxUwrJVfRC21UkD3kgr3JVyGD7c9NucGN6r0f11T6Mp+nK+7zam4TZEsJmrUTLlKl7ShCU9EjaAVcnk9AAfQQA1PrhA90puaVMP8AiSf5Rwno+Y3L0dcAhF0+ZdUZ/o80xrabervWV1au0yJxTS1bICps9SEhO9BLpBYk78h1Fgemj0tUKsV/0rTVST6y1Xistk8dhnBIQfAlSvuwH0RhX/vCghSjzw0AuwUzgeUEch3bvMApBDpJ6Yggv1JEQqSVJzEJKCSeOuHgOF9Its0cVUt41FVSKKrkgpkzFS0zTNTztMpSVbwCX4cPyHjiZGpNFzLvRXa+qvlZLp2RRTKqgTKopIHBQhHgOQeBjAjpaf0cWrW1LJ1FqOoramurpaZ6US521EmWobkS0huEpIcvkuesae/6G1dZUfZ2lLrUVtmr2p5tLXFM32YK6jcCAkDqkAjvwYDuLncaC9VGmZ1tq5NTJn1U4y1ylBQIFNOB8ioA9hOY8soa1FN6KtHVRUQi06gAqif6sesWov2YUnzj1TROgLVoq3hNOkz69aNs+rWPeUcEpSPzUuBgdgclhHn2qtBalRfa2y2MJ/B/UE8VE9SkAppVpUFKJP5rkAhucJ6QHW+l9SB6N60khSBNkKUxd0+tT2Rzttpai+an1tpukIlUdbUyZtTVhSXTJUhylCeqlDD8AOeWB7OR6PbdI0ZVacXPnT/apCZc2qnqKpilJACFBywCWG1IwG8SfJLFpH0g23XMuVRyl0dTTIEmdclAmRNkpZKSXwrCQAkZwlwCCYD3+2UNNardT0NFJEqnp0iXLljgAfv7+0x4do1RN19H6RwmtugHk/8AGPZpduq6eyT6WTc5q6+YhRFZUp3tMUPiCQQAkFmSGAbxfxjTmhtZ/hTRWibUS7fIsE1dRKuCZRV6wTSPhfCt20hizBweggNtr5bau1fLLAq0wkt4TU/zjO1hV08rQvo8qlzkJp5dfQLXMJ91KUyiSSe5jGw9IekbjU3eVqeySJdbOTTGkrbctWKqQp3AP6TKPfhJGQx4rRugNQarsUqhvM+ooNMSqk1FNSTQDPJDhkkgFKfeLkhichOXgOm0ZYpOsfRtqCTP9ZJp71dKipkrbKcpKS3VlJyO4wth9F+oZN0q6y9arnJM+nTTKNuUUzJqEgJTuUpOCAkcAk597l+6uUqq07peRQ6ZtiZs9O2mpJJLS5Tv761fopAJJ5JxyY8gvVo9KNBe5UpdfdauvqpgVTz6KrIpEpD7gpBSAlscsG7YDX6Tt6dOX7TtdRT1iqm3+otc4uf6WUChLlPduJ8SOyPo/kckx5hoz0UGz3hF+vtwFbckTFTkSJQIlS5ii6lB8qPXgDxw3p7mAhO35wpUSogM0FSsN1PZCgOIDlNQ+j6x6nuouNy9rXUJSEo2VKkpQB+ikHDnJ74wP+ybTP6dy/8An5n847naeP3iHSMnAJMBzWndC2TS9ZUVltlTvaZ6Ahc2fPVMVtHQFXHTyHZHSIIKyHB7ngKIYgA8/KGSQEDOWgIEBzgPCpdOc/zgkkkAdTmGB2gZ5gF3K3O44iMo546AGCACS+YJOMNiAXIw5iRNz5LfWJAE5wAwhgByOYUqADgAE9IZJ3ZcwACSFOYGVKOSOxsQwLkh4QklefKABBAxg9xhgoKxty7QCly7tEfackt0gCtTkAOMxDgEDjuhVBju3DPMDelQ6CAcEByTCkgszQNzsH8zAJA7B3kwFgUAkkc8tDOyQCeYRBScfOCSCQ/bAYd0tyLlQzKWYuZLCtqkzJZZUtSSFJUk8OlQBD9nUYjmp171XZCZdfYDeJScCsti0pUsdqpKmIV27SR2R2K1AlukIA3UB+MwHFSde19XM9VTaG1KZnT2imTJQ/epSmEb+zyb3NqJldeFyadKk7ZVvp/fTKDuVKWQCpXTACQH55jcjbtOQ3lECkP8QfugGGBh2isgBT4hxtS+RAKk8bswEHHPPbDDjuhQoJ6gHxhSpj8Sc98BZhQ7oAABJDn5cQnrAkh1JPcYnrEk8p84AtuVhhECSMElumYXcCoMoN2kw25OPeTAKRtIDiCxSeFN3GGG3kqBgkoP5w84BS23t7DiFST0JfsgkgYKg3jABTuAJT3RBaCxyEj98IVMXAcdeREUrcMqDxAoAfEAfGKIAkpcZjCvVJUV9jrqSknmRUzqeZKlTwW2KUkgKcZDEviMwEEkkpBEFxuJBDdTugPEfRfbL1oO6XhV7t122zJaUS5FJSTJ6ZywSdwUgFIIGMkfF3RnaZ9H13vOu5+rNQ05t9J7YaunoFLClKWD7pUBgMwJ6kjgCPYCoMeGOeYUKSUkukPyGgHOVBIwOyIAwzABD/EHHfEKgABuHnAQkOClxmGDNiKgsAFRUD4fzhwpP6Q+RgONrKfVOl1LNhoqa82pSypNFMmeqnU7lylCi6VIclgcjgYAbXI15q+fO9TJ9HVwTOON06pSlAP6xSA3zj0QKTxuB7oO5AGFDzgObs1Df59ai56iq5SJqUkSbfRKIkynDEqUczFNjPujLDrHRFipy3+cKSkl9wz3wd20glQ7IApDH4WfiAXKscwQtDA7kt8jBK0JGFD5QFYOSGZuesEJc4bxHWICFJLq8IXcEqyUnq7xBZsYElsQwwMhj4RWFJ3MVDPfBKtre8G7HigqUdwbd8hCM5Dv84JSkpyR9IgUA4cZGMiICCxIGYcuR4RXuBIZQB4h3S3xAmKFVyc8QXzh/GISnqofIwQpADbh3viAAU+GyYhG0AAOYAWkKLEHHbAC0sSSnd5RAyi4ACc/ugjCeSQOyKwrsUAPGDuYFmz3hooYglmA54PWDtURlh3vACjkuIYKCn6QEDJfkgxCwSSYA78mAvADnzEAHiQGSMMPuxIgLE45frBJKcBmEMCDhy4hWblLnuEUIuZShXvtu6xSVUDudsFdtTOUVlbFWYqXZELH4z6wEK7UeQmF32d8hMVnTyFD8b9YrOmEKP476wFy5tkHITFKqiwp52RTN0olX9f9YxZmi0L/ALR9YDMNZp4c7PpC+3ac7ERrF6EQr+0/WF/AFB/tP1gNui4acH6Aiz7V06PzkRozoFHSp+sKfR+j/efrAb37W052oifaunD1RGi/ABDflP1iDQCB/afrAb4XHTquCiIazTqhkojTJ0GhKcVP1gHQof8AKPrAbZU3TZ6ohSrTh6ojVHQhJxUY8Yb8BQ35T/igNiU6dUG3Iiv2TTqz8SIwToUnip/xQBoZYOKn/FAZ3sGnQfjRANBp4/np84wjoeaTip/xQp0NOIxU/wCKAylW7Tn94jzhPs3Tn96nzjCVoCepWar/ABQw0BM61ef1oDMFt08cCanzhvsvT398nzjDGgZiRmq/xRDoGY/5X/igMv7J0+7+vT5xYLZp4D8cjzjBGgZv+9/4oh0DOb8rP3oDONt06R+OR5xBatO8icjzjXfgBN6VZ+9AOgZo/tn+KA2gtenXzOR5w32bpz+9l+YjVfgDPP8Aaz5wDoGpHFUT84Dam2aadzNR5iCLdpgf1kvzjTHQFSeaoj5wP+z+odva8/rQG9FBphvxkvzEL9m6YPC0ecaX8AKgMPa/8UEaBnp/tf8AigNz9laY/vEecH7M0wzesR5xphoKpH9r/wAUA6EqRzVf4oDcG06aI/GI84Q2bTP94jzEas6GqhxUnzhfwFqnzUkftQG2TaNOA4mI84c2nT5/PR5xqkaGqUHNSfvRb+BdQ35T/igM82bT394nziCzafTn1ifONadF1Lv7T/iiHRdX/vJ84DbC1WFvxifOAbRYVf1qfONWNGVQT+U/4oYaNqjxUv8AtQGyFmsA/rU+cWC1WIBhNT5xqRourUSPac/rRDomt6VJ84Dbm02IBzOR5xWq2WHpPT5xql6JryMVJ84xzoi4JP48n5wG8+ybGeJyfOIbTZCMzk+calGjq8BjOPnBOj6/++PnAbL7FsQL+uT5w32VYwPxyfONQrR1wJ/HHzhfwMuB/rj5wG5FtsYOJqfOLE22yuGmJ840idGV6S5mnzjKlaTrk8zD5wG4RbrSBhafOLE2+1AvvTGuRpqqTys+cXo09UDmYfOA2Caa2I4WIsCaBHCxGtNgmj+s+sWy7ItIzM+sBskLpioCWXV0EXs75+sYEi3mQtK9z7cxnJPLMQIBCkvwIkDce3yeJAOl3wMQXAUxPPbESehDHxgNuIU+HgMCfJqlz1KQo7ScRSqnrmwTGZOqZstRSAWBxGKu5VKRhBgMVcm4jgqisS7mOqosm3etTwhRig3uvBxLV5QCzZV1PBVGIqnvROFLi+bqG4JdpSj8oxzqW55/oVeUBWukvhOFLi1FHe9uVrjFXqi7JViSryhRqu7f3KvKAzxR3p/jXCLo72Tha4xPwru/9yryiDVd2fMlXlAZPsN8P56vOIbdfTwtXnFY1TdVB/Uq8oP4U3Qf1SvKAvTbr4lOVq84Jor2AffVFaNT3VXMpXlFw1FcmzLV5QG6syKlFvKKvcZ25RfsGGjYIDl8fOMK1Vc6so/XTk7VFRSQewcRmpLKfoe54CzgYhCWbJfsEQqd8GAQXYZ+UAxJSAWfxhsFOWhHIGIIJDZgGZi5DQqlADHMEqCRlhABKiSQw8YAA4CT24MPtfMTa7d0HcAW/hBEI74U5GMnugFTqbsLcQXG538xBQcBiXI8IhBBx9Id3DwhSSHJ/wDaACcqIyPo8OMYOYrBZTDjiGKtuXz2dsBCS7AMB2CCTt6AmAHW5wXhgNoyYCtitRI+bCGDhMBxvJJAPAeH7BmAQDs5gsQ/bBB28/JzBPGMQAJSlyTAKwSQGiFsdf4RNoIcljAFscCFZumYPBIc47oigCHfMAGYuYh5fjxg7X5474jY5zAKDhzgdsAFlBnPzd4cAOO2G3AYA+kBpNSrrZVvSqgB9d6xIO0Z2sp/4RyordSv8MzyjtLuupTShVKHmbwMdjGNAuqvo4SrygNauu1KE4Svyij7Q1R+jM8o2aqvUJBYKjHNTqV+FwGMi4amfKV+UW+3akP5q/KLPadS/wDiQDVamAx6yAUV2o3ylflFwrdQN8K/KMc1mp2/rIIrNUN/WQGSitv5VlKvKMuXV3sjIV5RqxWan7ZkZMqr1IeTMgNkipvJOQqL0TLqr4t0YCKnUDZ3xkyqq9t72+AzP+8CMlUWSxWj4iYoRUXVXO6MqXNrz8W75wGRKTP3ArdusZO5KS2XiiSupKhvdusXt1PbAAcRIjeMSAJISMYMAFlcEdpeISSoscd0FKT2luyApXUIQpQUOO6KFXCnTyPpGRMkyVE7iH6uYpNJSKdynzgMZd2pEggoz4RUb9Qp+JA8ovmUNAf0T+1CG2WtQ94p+9AYp1Db+NnjgQPwgt392PuiLTabQ5dSPvQv2ZZ+qk/eEAg1BbOskH9kQwv1sVj1KfuiCLbZXyuWP24Y2+zJyFoP7YgHRdrar+qT90RcisoFENLT9yKk01oQMLlv+vFiTbEMBMlfegL/AFtGU4Qn7sATKUltifutEE23NiZL+9C+voAcTJZP60BeTTMGQj7sAKp2LoT3YhfaaMpDTJfeAqCJ9I+VpIPfEF0oIUndLYDuDRYWyP3QkhSFS3lqBS7OIfaX7vGKMG70tfWWuokWy4/Z9YsD1dV6lM31eQT7isFw4+ceaXaXr616psNl/DsTTdjUD132TIHqvVICuOru3Ibvj1f87o3bHCas/wDzT0Cx61//AKKYDInydT6b0hqKuuOphdKmVRTJtJM9glyPUKQhRdg4U5289nfGfYdUUU3T9jN0u9Ei5VlDInKRNnIlrmLWhJJCcck9BF+uAPwA1Af/AIbUcf8ALVHBp0ZYk+hBdZNtsidWqs3tntcxAVNC/Vb0svkAYAHDBoD1ibNTKlqXMUlCEh1KUWAHaTGHQ3m2XSYtFBc6SrXLLLEiemYU+LHEeVamrLjXaV9HlrTRzLpLuUiXOqaT2kSfajLkoUEKWcAEqJ727WhKyzX/AO1bRX2v0d02nqmlq5ZVU09ypwJkvhUtSU7dzj5wHsEmuo6qpqKenq6ebPpiEz5cuYFKlE5AUBlL98BFdRzK+bRIq5CqqUkLmSEzQZiEnglPIBjh69cvTPpbpq+YoSqG/USpM5RwkT5I3BRP6mB84t9GlOu40t11ZUJKZ17rFTZe4B006HRLT5A/SA6TVF8kaf05cLnNmyJa5EiYqSJywkTJgSSlAc5JIZhkxp/R5c6u7aXlXG4X2muk+c01YkoQgUjpB9Urb1D5fOYztd08mo0HfhPky5ol2+omI9YkK2qEtTKD8EdscHdpMuR6H9I2+mQmkk3mdQUtbMkpCCpC0AqJI6naHMB6hRXu1XCoVIornRVM5HxS5NQlak+IBi2fW0smsp6SZVSpVTUbvUSVzAFzdodW1JyphktxHm/pF0xZdLaVkX6xW6nt9xtdTJXTzKdASqY6wkpUR8bgnl+PGNpqgv6WNBn/AIbhyP8AwRAdnMrqSRWU9JMqpEqpqd3qZK5gC5pSHUyTlTDJbiKqi9WqnVUpnXOjlmkKfaQuekep3B073PuuOH5jkNTKT/2taCTjcE15I/8AJ/yMa20aft969LutZtyppdVLpvY9kienfL3Kk/EUnBIAIBPG4wHpNDW0twpxU0VVJqadXE2TMC0n5jEUrvdqRcRb1XKkTWqwKYz0iYf2XePNrIRpm7+k+VaJYkSKGRJqqaRLHuImGQtZYcDIGO4Rk6W0Fpy4ejikqaqlkzq6upRVTrivM9M1Q3bhM5G0np2ZfMBvvRperhqDQVuudzn+vrJxm+sm+rSl2mKSMJAHAHSH1nrWRpNdplmdR+tra+VJnS584JVLkK3bprPwCOTiNd6Gx/8AdbaMHJn/APrLin0q0dLOGlJk2mkzJi9QUkpSloBJQd7oJ/RPZxAZ941FUStc6PpaGulG1XNFXMnql7FImpRKCkKC8sAcuCHjpqC82u6qmJt9xo6taB74p56ZhT4sS0ef66stHc9f6EtU2WE0ShWAypfuJKEy0q2MPzSAxHYSIa4Wa3WH0u6OXaqGRQCslVkuemmlhCZiUSnS4GOT9B2QHf111t1qSF3GvpaNKsJVUzkywfByIup6iTVSET6aaidKWHRMlqCkqHcRzHjcr7SvWttT169ESdSmnrlUUpVTWyZaKeWjASmXMB5+Ld3+MdH6ObXebXfr2ipsgs1qniXOkUIrZdQJMzhW3aXAVzw2BAejg/6ERSSSxIaAT72FRAfeyTw0AUsE848YBVuOSWglzh2gEOnBy/PMASNgbLnrACcPhngswAHA+UTDNAYF5uP2ZQio2bnWEN4gn+Ec8dZBn9nPlHS3D2b2Ye1gGVvGD2sf841JVYkvuQjygNUvXWzmmwO6Kxr8PmlPlG1K9PZ3IlxWZmmuiJb+EBrzr9/7MfKB+HoH9mPlGeZ2mx+ZL8oIn6Y42y38IDXjXYUr8m57osGuG4p/pGd63TPITKeH9o010TKgMFOuNys030i8ayB/s58ovFRp18eq8otROsSiG9U3hAVo1YlY/EERkI1GlQb1JEWIm2ToJcWiZamG31flALLvSSG9WfnF4uSVAe4oCGCrefh2eUPupMNtgGl1AmKAAIfvi8B8g5ipC5KiACl+jRcWSGDwCkKfn6mJEx/oxICEEk8iCg4IL/vhUEFZeLBtJJA6wGJPpFTFqIWzmMVdsmKdpkZ80zgTtGBxGKuZWPhP0gNeuyzlkgTvrGOvT9SssJ/1jZLmVwyEZjGmTLp0QqA1q9LVaxip+sUHR1eT+Un70Z8yfeQ+1Ch8oxJlRfwcJVAYi9FV6i4qv8UIdE3DpVH70XrqdQnhK4qM/UP6K4Cv8Crh/vR+9BGia9/yo/egLqNRvhC/KCio1EeULgLkaOrgGNSfvQw0fWA5qT5xirn6iJ+GZETP1CFZRMgNijStUgP7S48YvGm6lOPXnzjARPvuHQuMlE68Ee8lcB0VqoV0dJ6pS9ytxV0OMRnjf8Lj+LRgWZU9VCTUAiZvOD2YjOQ+4k8dcQEIASQQXbntjRXXTYuup7BezV+q+xzUH1Pq93rfWoCficbWZ+C/dG+UoEYOOsHBTAa2+W03mw3C1et9SaymmSPWbd2zckpdnDs/DxhnTb6C/Bf2v/8ATRQe0iWP7vZv2v8ANn+cb0c5iEupgTjrAcrXaFprhpC1WSfWTUT7ZKkilrpA2TJcyWgJCxyztkP88PGHS6Erpt1oa7Umpam8poZnraWQadEiWiYOFqCfiI6GO2JZJYwhcg7R9IDzX0vKt96t1BpunqZcy+z6+UmRJlrBmSnBClqAyE7Sfp2R6NbaGRbLdS2+mSEyKaUmVLB/RSGH7oVNroE3A3AUdN7aU7DU+qT6zb2bmdoy/EPAYN7tv2xYLjaxM9T7ZSzaf1m3ds3pKXZw7Pw8aefo2hrdDUula+aubKkU0qSmoljYsKlgATE8sXD9eyOlfsSTAD7yXIHhAcNK9HldV1lErUWqau8UVFMTNkUq6dEpJWn4TMIzMbv/AJvtNWaROopttrKW5zbZc7bMUulqpaAvbuACgUnBBYR0wD4BideYDh6XQVUjVdp1JcNQVFwuFCJyZilyEoTMStBQlKUpLSwl1Hgkk5Mbm0ac+y9U6gvftfrTdzTn1Pq9vqvVIKfic7nd+A3fG/ORmFKWyOesBz9v0wih1LqK7TagT0XoSAqnVKYSxLQUEEudzv2D5xoKf0aVVFKXbKXVdwlacmKO62iWkq2EuUCd8SUly4HafGO/Bcv1iKckQGl0bpv8EdK0lkFX7X7OVn13q9m7ctSvhct8TcxVrHS51XbKWRKuC6CqpKuXWU9QmWJm2Yh2dJIce8Y6EuGgEkdMQHMVGl6iqv2mbvV3P1tRZpc5M16cI9pVMlhBVgshmdmPZGTc9M/aerbFffavVi0ioHqfVv671qNvxP7rc8F+6N8EgglQaApbkAE7e6A467aHqV36ovWn7/PslZVACqCJKJ0qcRgKKFYCm6/5vsNMaUk6cTVzlVk+vuNdMEyqrJ5AVNIDAMMBIyw6PHRY2hzClLlsAeEASzAHmIFZwxPYIO0Acc/WA20cY7ICAszfSGKQYg55gbveYsH7YCEF2iFJHDwwLB8RCXYjPhAYdwoU19MJKlbRvCn7wD/ONOvSlOrmcofKOhmoWpI2Fi/bGMETCrKny0BolaKkLGJ6hFB0NTg5nqjqCmYjBW0TatST77wHKr0NI6z1RWdBUxU/tCvGOpXKnqSSlbNGHMpa1RYTDnjMBojoSnGPaVecEaCpv95PnGxm2+5l2mHzir7Oun94fOAxBoWnH9pPnF8vRlOjipJ+cMbddScTD5wPs26/3qvOAuRpWnSczyYyEadkJ4mqjB+zbr/eHzhkW27A5WrzgNomySUEf0hi1FtlgsFktGuRRXFLblq84yZdJWJZ1nzgM2VRolr3BTkdsZG3IJAaMaRKnoWkrU4HMZmCGyD2wC7FdOPnEiZiQEyr/wB4AJAbGT1hgwUQRC43s/c0BVNrPVKKSkloxF3UJd0PGXMVKCik7X6xUpVGBna79YDCXfAlx6stFR1IkODKUR3xmlduHxbfKFJthOEo8WgNdM1MlAxJVGLM1gEcU58o3RRa1ZUmX8hFS02QfEhHlAaFeuSk/k30hfw9V/u30jcKFgCveRK8ohGnv0JXlAaf8PVf7t9In4dup/Zc+EbcHT36EvyhkjTyuJcvygNUNdEpzTfSArXGPyV/lG6EuxtiXL8oB+wE8ol+UBqEa3KmBpj5RejV+8/kxjPK7AGZEsfKGEyysNqZflAbC013t9IZ2wp94pZuxozVFgz+OOIxaT2ddMTTJ/o3OE9sX8nIfugNVqirqLdpK81tLMKKinoZ86Utgdq0y1EFjg5A5iiw3xA0Labzeq6TK9dRSZs+onKTLTuUkOTwA5MHWYH4Bai6f92VPd/VKjyew1FZVV2iRq+i9Xp5dKiTa5W95aqhKUhEycOpVnaD2jvgPWNQVU/ZZZtBeqS3y51wkhZnFJFXKLvKQ4PvKwzZxGALzcT6W1WL2g/Zv2H7X6kIT+N9dt3bmfjDO0YHpLUFTdGgBm1LR9G/S6QUOPT2v/8AbX/+kQGfoO9XC8y9R/aFR640d8qaSR7iU7JSNu1OAHZzk5743ZvtnXXm3i60JrHb2f2hG9+za7x5XIudVaPRv6Rq2iWpFQm/1aEqTyncqUkkd4CiYxJumq+ZpQW+T6KqaUr1HuXEXen9cFtiZvZznLO3SA9oqK+iofUiqqpFP6+aJMr1swJ9ZMPCUvyo9AMwKavo69M1VFVyKgSlmXM9TMC9ixykscHIxHler6a41uitCUl3WuXcJt3o5M+YiaCoKKVJ3BaSQ/VweY9Qtlpt1npBS2yip6Snd9kiWEhRZnLcnAycwGvuM6qRqqxypV5paamWJ/r6Gbt9bVsj3djh/dOSxGOY1tk15Q3fW15sSa23mVS+pFEuXUJJqSpBVMAD+9tIYtx1jB1O49LOgz3XD/0RGLpW3UEr0s62Mujpk+zihMkplJHqyqSdxTjD9W5gPQqurpqClmVVZUSaeRLDrmzlhCEjjJOBFNXdbdQUaa2tr6WmpVttnzpyUIL8MolsxVfLbLvdhr7XMbbV065JJ6FQIB+RzHjEwz9c6R0npVRUKmTIqlVSXyhdOhUqU/ioiA9vqrhQ0KZJrKuRTidMEqUZs1KPWLPCUuck9giq43e2WtKTcLjSUaV/CaiemW/huIjyyzXL8NLxoCnUdyaChXcasdsxH9Ck+PrEk/ONlU0+na3Wd6qJGnbhqi5haZM8zpclVNSqSG9WlUwpAPbyYD0akq6aukCopKiXUSlfDMlLC0nwIxGIm/WdVwFAm70BrCdvs/tKPWP2bXd4840RRVCbv6QrPJp0WN0SPU08qaFopFzJS/eBGP0Tjhm6RqzYrbZdKotmqdDzZMqQlO++2n1c5RYv60q+NI7XB8ID27lWQcQGzhnPZ1jHt8+TU0FNOp55nSJkpK5c4lzMSQCFfMZjKIBPMAvI3EcYbsiBSAC37oBIAUOhzACOoJ73MAWT+lnsgt2nHjARzkwSCePnAMPHHbEwWaFG4DaPOCMYBgGMVlIKnPEO44cOOkKVEuAOIIYEdPnAy7nIhQjtdhx2eUDaXyXB6dDBWBfbhMt1AmbITuWVhJAzggn+Ecz+FdwGPZuP+GOtuM+mpacLnICkbgM9uY1BvdqQC8pL/qwGmm6tuIBamP3YxxrC6An/AGcj9mN2dQ2dLvKSf2YA1DZv7gH9mA1CNW3NXMlXlD/hTchxJUPlG0OobOOKdPlBGobSohpCfuwGvRqa4qH4pQ+UFWoLir8xXlGyN+teCJIHyiK1HbEDMlJ/ZgNWm+XJSspV5RkJu1wKc7vKMpOqLWT+JHlFyNQ29XEseUBiyrlXE5CvKMuVX1ZZwryi9F7oVcI+ghxeKMkshiYBfbakj4T5Q8upnqOUnyixFzplYD57RFya6S2R5CAkuZNVMS7t4RljuEUSqqXMUEpGekXAjrx06wDN3DyiQrjqcxIAAjq/fAIfJ8jmAPe45/11hwMAOweAoVTImElRU5yYpXbpKjyTFk6VOKiZa2B4zGKumrFPtmeOeICGzSFHK1RBY5DfGYxzRV5GJhfxihdFclO07/FAZ5s9OPz1NFS7BSr/AKwtGsm2y8qGJx84xF2i/PicrzgNsvS1Io/jj5xUdK0jP64+caddm1CrInK84Q2XULfjlfegN2NLUf8AfKixGmaRJxNVHPfYuov7xR+cWC06hSMzFD5wHRfg/TAN6xUVr0zSLz61XhGhXadRNiYrzhBaNRvmYrzgN8dLUv8Aeqhk6apkAf0in7DGml2vUCWeYrzjJRbr2BlavOA6qgpEUVN6lCipO4q7YyTlwMRr7PKqJFBsqS83cS57MRmqJDNxAYV8txu9guNs9aZXtlLNpzMKd2zekpdnDs7s8aOt0RS3LQFPpepqCsU9NLlSqoIZSJktICZgD4yOH4JDx1j+6CYUE7WIDGA5a46SqrvbtOSK27CZU2mukVsyoFO3tJlvgp3e6S+S58IzfwcCdfK1R7Xk2z2D2b1fH9Jv37n+TN843bnoX6DvgBJJz8y0BzFo0dTUNsv9urJ4rKW818+rmIMvZsE0AbOS7N8WPARph6Nroug+x5mtLiuwtsNH6hAmGX+gZ3LNhm4j0EpyGMOMBhiA5q9aQkXWmsFNTTxRSLNX09XLliXvCkygQJfIbB5zxwY6QAFJD+LiIVbePqYBIUA4wO0QGguenPtLV1gvoqxK+yRUD1JQ/rfWo2/E/utzwX7oxZOkqqk15WajoryuVIrkyxWUJp0qE0oRsSy3dLc4HbHUHnOX6NBCmByB3cQCsRycfQRyOntBSLDrO8ail1frDcd2yQZbCTuUFLYuXdQB4EdeDkkxCnacPAcfpDQVPpO83m4yqw1H2hMeVL9WUezy9ylbAXLh1d3EVzNEXOjvFwrLBqiotUi4zjUVNN7JLngzT8SklXwk/P8Ac3ZjngP3wSACCTjvgOItfo8Tar1c6pN6qqqhutP6qvpapIWueraU7zMdx8SsAdexmwx6OLuq2/YitbVxsWz1Xsnssv1nquNnreWbHHHSPQyzYAeIEv1gKKKip7dQyKKlTskU8tMqWh/hSkMB5CMkEth4BQ5zx2PC5TgHHfAF8sAMHkwxGO7shQcqPThuIcKCh1gEKS2OO7Bg7gnoG74IUDiIzqLE/KAL4xChTjJzE3MoDAHhClyXDEdkASSMsQ8KHCh2/OJwXIB6kmGUQWYHwgCM9AC8NxCh+TDDjH84IxK+nkVVOJU87U7wr5gH+cak2K2q5WG8Y2lfSrq6cISvaQoKfz/nGtNjnEN69j4wVSrTtpPK0g+MFOnrOPz0n5iAvTlSvio574qRpqpSr8pf5wGQNO2ljkH9oRBYbQkO6X/WgCxTQkg1GfGK16aqF5FS3zgMkWS1EZUn70KbHaFclP3hGGdM1QGKk+cD8Gqsc1J+ZgMr7BswU4Un7wi5NmtCeFp+9Gu/BqpJ/KT5wRpmpcf7SfOA2yLbbU8FJH60WC228ZBHnGtl2CoTzP8AMxkJtE4BhOc+MBmijoUDBT5xYKemCQxSfnGuNnn9Jv1iyXbZqf6zc3fAbGXLkJUFIGRxmLd2c58IwpNMuUsKK3I6RnJUCgOeYCbj3+cSA3/F9P8AOJAQgAFx9IIS4OMRAdxA6eEQp2qxAYs6fNRMUEowDy0VCqn9UPGSupRLUQoORiKF3KQnkHEBPaJp/ML+EH18xvxbxQq80yRl4qVqGkSljugLl1tQnhB8oQ19SeZX0jGOqqFCSCCTFC9Z0CfzDAbAV1QTmVyeyMlFRMOSgjpGgOuLcFZQYI1xbf0VRB0PtMxgNhxFMytmo4lHEaX8OLcC+1UQ64tx/MViKNhNu1Sh2knyjDXfa1KmFOfKKjra2nlBPyhRrO1q5l/SAy5d7rFDMj6Q5u9UXeQ57xGOnVltUzIPlF6dTW9WdnPdAba3VK6ml3zE7VbiNp7MRkHCg5PbGNQ1UqtpfXyEkJ3FLAtmMgkK7C30gHYKwWaOV9JN5uGn/R/dLnbJ/qKyR6r1U3Yle3dNQk4UCOCRxG8vd6odO2efdblNVKpJG31kxKCojcoJGBnkiOS9MS0q9FN4IOFeobv/AKaXAbvUE+slCzmlvFLbvWXCSmd7Rt/2pBd5KHB95XRs4jaT7tbqafMp59xpZM6XJ9euXMnJSpMt23kEuEvh+HjjPSOM6M3DP4SUbk/tRh3Oz0N69OkuTXyET5EqwCaJM0OhZE8gbk8KAd2PUA9IDuft60rtxuIu1CaEK2mpFQj1b9m52eMikrKe5UoqaKsk1UhRYTJEwLSfmMR5jprSFinelPV1NNt1OuiofZl09ItAMiWubK3KUEH3XxjGHjaaDpKa0a/11baKWmRQyZtHMlSEYQhS5aiph0z+4QG20Ld6+9L1ILhUGaKK91NJI9xKdkpG3anADs5yXPfHVlKgA3HdHIaDolUC9UqmJP8ATX6qnJJ7FbY7LeWcAN4vAFsB/rA2+8+eIO4cnAgFfuuMfWAYDHYYVmxmBuUVBsQcM/L4zBCqLEYiJdWWcdxgpSClyHf5tClLuQMDvgpgliXAL90H4Rg8xBhIxEL5A4gFJ3BvqIISAS3MT80Djv5gu6WPLQCBOSzjwMMEghxg9YQNuwMeMPggkDIgAEqPIz3wTtSckgmIllAuA5gkAsYBSnGG8uYA3JU2OItOQYRQZPXnsgAfdGOemICAc474YM7sQ4hAW3KBH0zAODljDHALc8wqXZjnPURCp8AcfSAw7iqoRTA04JXvAbuYxrBPunGw+Ubipninl7yncHAaMQ3VAOZZgMUVFzb4T5RZLnV6j7yH+UP9roBJ9UX7sQRek8+qMBfLVU4JTGQBNZyMxgC8pOfVmCL0jj1RgM9pj4wYSZ64cPGKbunDIVAN3SD8CoAq9pctAHtbYBzAN4QtQBlqx3xYi6oPCFQCtVjLGFJrOm6MgXFCg2xQiIrUuzKbsgMQ+29ioUe2vkK5jYCrBLgHyhxPBSSxcwGNTGcZqRMBbq+I2Dg/6eKkrCilO0574sKdoPAHfARz2jyiQNyO+JAI/cH7xBLu5ghLdILl+nh/owFS5MpRJWMntik0dIoZZvGDPplTVqIXtBL8xR9nzC4C8QAmUFASxID98UrtVqPK0+cCZaJqz+NjGXYZ6+J+fGAsXZLQol1pbt3Rjq0/YzytI/ahF6aqlDE4v4xiTdKVquKhn74DIVp7T75mJ+9C/g9p/wDvE/ejXr0XXqV+UED9aD+BlcAHqT5wGzGntPkfjE/eiHTunx/WJ+9GsOjK8cVJ84Rei7goflKvvQG5TpuwHPrE/eEEacsW740/eEaZOjbikflKsf8AFDDR9xCg9SfvQG8RYbIkYUl/1hFybNZ2wpP3o0idI16SHqT5xkS9L1iA5qD5wHT0VPT0tP6umYy9xOM5i0vnj5xi2qjXRUXqJqtytxU/i0ZZG1oDBvdnpL7Zaq11qSqmqZZQsAsR2EHtBYjwjj5fo2rasUlJetW1tzs9ItK5dCqnRL37fhExYyseMd8FFyCHiBW0ZyOzsgNFqXTI1HMs6jVCmNtuUmv/ABW/1vq39zkM7858IidMga8VqYVZL232D2Yy/wDxN+/c/wAmb5x0DAhwxPRorBIUQQXgNFbNNm16tv189q9Z9rCnHqPVt6r1SNvxP7z88Bu+JadOfZmqdQXv2v1v2saciT6pvVeqQU/E53O78Bu+OiGQ7v4GKiGf3Q8BrLJba2gXcDWXSZXiprJk+SFo2+zy1NtlDJcJbnHPEbQpYgYY9IUghlDKfGHCgt2bHgYAFKm5BHSABniHCmU3ZA69Du4gIjjAxDuG5gYH+UJu7SR3CAYdo/nBfHPzhHSzu/z/AJxAp0kFh3GAYqbkv3QApxzE2uzcQFJywJxAMWADnn5wre7kc9ggByCATjsg8Y+kAva+eyHHD9mGhHAYE+cMnAJPnAEjazBxzEBdwMGC4YKaFOVODziAIUXAd8tBIKg38YgwBzDB4BFDYyunBEAKDAEv39IZadyWhQkMzuT3wDEsnkQDhJfgxFL2g93Uwu7IJcH90BTV1Einlb6ggI3bc5zGvXd7SOVp8oy7nb03KkFOtTJ3hQ8j/ONEvRtMokevMBsDebM2JiPKGTdrOoMFy/KNWNEUrt7QYdOiqZP9eYDZ/adpf40NENxtKle6uX5RrfwPpuk8vDo0fTg4nKgNmKy3qZlo/wBfKHFTbycql+DRhS9MSE/1qoY6fkD+sV8oDLFRbicFEWoXRkYKHjXosUgK+NQ8YykWiTLGFqMBlA0+53Q0QqpwcFMVChlPhRbxgG3yzwo+cBcFSnwUkdxh0lB/R84oTRy0nBUYsEpPwt9YCzcndgh+g7YJL9IrRJAUCHcRbsxkfIiAAIbpEgfM+USIGUAAehgBTZ7usR3DkjJiMcMYox5syeFEJGOkYq5lcOAYyl1Hq1lJS7YilVwKeEGAwZk65gnak/KMaZUXkfClXlGeu7qQp/VkxWb8x/FGA1M2pv44Sryir2rUP6CvKNvM1Ns/qYxV6v2f2f6QGumVWouiV+UVGp1F+ivyjOXrdixpvpARrZJP5MYDB9q1H+ivyiyVVahPKFeUZZ1oASRTGFGuA7GmPlAOmovu3KFeUET74TlKvKInWqQPyY57oC9bpx/sxgMqXPvBAdKvKLTOuvYqMNGtArimIfui9Gq9/FOYDeWwz10r1I/pdxGeWjKJfB58Iw7fXGupPX7Sn3iGHdGSzkcPAEjI/jDpGHI57MwAkMxiFbKYAgcQBAG4fxERY93saICOuMQNw2lziAiHZ3x0zAKjuLYhgQDg9OvEAZVjIgFSglzlu3h4sfDZ84hBAx8oAOHeACg5/wA4Ld5IgP1Jg9OkAMAZPPfCnKgMN1gqI5HlBGAD08cQClJSrhh2QDxg/KHUEjlmaEADO48B0gHQSQIgI3OWbiAl2YFj9IhDAu5V3YaAhU6iQ7QpLnpnsghG4FyGghICnBgAh0nIfwEMckADJ5hmxClRGWD9hgFKQFcAwULyxBhXJOS5hin3eYBwQeCIBUE5LfOEITgdR2DJgE9c/wCvrAPu6AHMAhQDAnvYwu7cO0cZ4h0n809YCsgue2AMOfdPzzFq+Rw8KA4JAIgMK7oqZlClFMo+sCwSR2MY51dHejwtXnG+u9bNoaETZKN6isJ7cMf5Rzi9UV6eKdXlAEUF8/TV5wfYL2fz1ecY51hckn8mP3YQayuT/kx+7AZgt98BytXnGVKorwOVq841Y1lcic0x+7BOsbj/ALsrygNuKO7fpqbxiGhuxGJivONQNY3H/dj92B+GVxf8nP3YDZm23oqxMV5xbLoLsGeYfONWjWNwJD0x8oypeqa1fNMfKA2QormRiYT84KaO5JUHWfOMZGoapQc058otTfKlXMj6QGYimrQMrPnBVTVgD7z5xUm6z1Jb1TfKLk3GctLGXg44gLqaTUpWlUxRYcxmEOHJIxFEietakgoYGLl8t0gGSPd/9okTMSAUE5Y/KCGBbDmEc7eXPa0EEBLDn6wAX6oKLgExWVSHygN3wxlJUSpy5zCKpkK5JEBUpVKMqCT3NFe6gzhHlFi7ahQ+IxUbRK3fEqAC/sw8oR5RQv7H6ol+UXmySVjK1ARjr03IX/WqzAVE2AqYoR4wwRYiHCJflFK9KUzuZxEOnTFMA3rjAPssY5TLMESrEVPslNFZ0tTq/rjBGlqcD8cqAtMqxthMrmJ6qyNlMmEOlZB/rVQh0rI2uZqhAZCUWQcJkxYEWl8CU0YadLU4LieqL0ackpGJqoDaUyZQk/7OUiW/5vDxeEsejRRSUyaOn9UlRI3FWYsWGIbnsgDuIIYfLtiFJVlgO4wo7CxHOYcKJHfyztATgZLRHBIfiGHvAAs56QrMra3EBGctmC23OA/ZCkp3HPHZBB93gwDE4x9IVw3EQnPdEIc4OYBQApyzHtIh3ZhmCCOrfuibgcDkQC5cgvmIkguWyIJLFnz2QBjhoAKyoDPbzAOC4JGOpgndjs7ogB6s/jAFJDBzkxAHJIgEgpYAN++ICzEMYB3wXYDpmEBglTgP9BESAUu0BPERFk/L98EEEt07CIQl8dIAFOM4B74YrALfKFfDY8oYpKWyQe2AcB2fPjECUu45hQskMQCO3qIYAbcZB+cAgPRnL+MApYgDax4fpDAYy2OPGDvJZgA/WAG0NznxhSRtGGIht/uk4eK24OPOAx6+qk0dKJtQjdL3BOQ+WP8AIxp1agtQOZafuiNvXyaedShFU3q94I8WMag2uyqJdaR84gpVqWzp5kJP7Iiv8K7K/wCTp+6IsVZrEo5mJ84X7A0+eJqT84oU6rsgP4hP3RE/Cuxv+JDfqiCdPWA4MxH3oU6asCjian70AfwqsX9wPuiFOrbID+IR92GGmLE341L+ML+C1iJzNSP2oAo1XZFHEhP3RGSjU1oIxJT5CKE6XsQOJyfvRejTtnThK0n9oQGQjUNsUPdQn7oi5F5oFDCUv+rFKLFak8KDeMXItFuSMKH3oC5Nyo1DA8xFya2mUMfuihFuoxwR5xemjpkkAFz4wFsuegsByeHi5KQMdefGKUSpQUNvTrF25Si4GB25gIRn/KJEbtI8okASxCQkgk9YVaCEu2esEbTynxeFKWwnHhAY02XPWolCikdOkYy6asOQs+cZE2qXJUUhDsekY67pMQ7SoCoUle/xnzhhSV5J98xTMvNQniR9Ixl6hqkhhTP8oDY+y1w/rC/jFMyiuKnaYfONWvU1age5TN4CMWZrC5IdqY/dgNlMtt2UrEw+cKm13YHMw+caOZri6gsKY/dhTri7EN7MfuwHTy6C4pYGZ9Yy5VJWAB1v84438NrsOKY/dgfhxdn/ACY/dgO6VIqdrb/rGNMo60qYTPrHHjW91IzSk/sww1rdVEPSn7sB1fsVwIcTPrDy6OvHKz5xzEvWFzdjTf4Yy0aruCuaYh+6A6+mStEgImKdZJ6xYRuVjDRg2mtm19vE6ckJXvIY9zRmpLKPQHygGwSQ2eyAMJcs0NtHUCFOQcgntgApiz5HRm/dASkBJVkMcZ4hgBh8YzmAUgdSBzAD4lDjPHSG3ABhgdCIUhldSOoAaGCSUh8PAQORjnpDB+oeCGBy7RDguekAvXoOmDACQQSYKju4DNh3iDcBxgeMBAG6klohBIfyggvnkdMQDjiAQkk9cQ4X248IhS/AIJhC6eP4GAZQzgg+J4iEOl92R2GCFgDoB3GIod3vdIBNwLgklu2HLNgnwhAQer/KGIZLj590AOeXbs4iEe72w4DJ4+kAFL45PzgEBG4AjrDkZLu0MR5wE8EEu0AqywDZfjMFJCOHLjmATuJSPpmIACS7gCAJILj/ADgApPxEP9YjB8lh0DxEpBJ4IgIoFgRwe+FBwxcwCAC+BmHDEhwfCIMC80My40Ip5ayghYU/gD/OOaXpCqVxUnzjp7uufKogqlBKysAgDox/yjnJlbe0uyFeUUYi9E1ijiq/xQg0NX9Kr/FGQa+/vhCvKKzX6gf4F+UAg0VXBQ/2vJ496GGiq4Ofaiw74JuGoG+BflFJuWokqwhflAZI0bWq4qjjvgHRlcce1HzjHFz1GD+LX5QDc9Rkv6tb+EBko0XXBX5UfvRko0rVIwar/FGqF01Lu/FrbwjJlXLUKvilr8oDbS9O1KQ/tJI8YuRY5w5qD5xrk117KcoV5RdKrbz1lq8oDZotE1I/HGLk21aQ5m48YwEVd0PxIV5RlIqK9QDoPlAZUimVLUFFZU0ZgISBjJ7YwpCp6lp9alknkkRmBALu3gwgAS5dlfWJDFOf8okQE+7w3nAwxOHJ4ic46eMAgOSSc93EUY82fKSohYDjqIpXW0wyUDwaMhcmSpR3c95itVJTHlvOAxV3OjTygHuaKV3e3J5lDyjJXQ0Bdyl/GKTbrYrkjzgMRd+tafilJ+7GNM1JZku8hJ/ZjPXZ7OrlQHzjGXYbGp3WnzgMP8JrG+adP3YYansLfk6R+yIu/BywE5WnzgjTFiIcLT5wCjUtiKcU6fuwDqKxn+zp+7Fo0zZAMLT5xDpyxhTb0+cAgv1kIxJT90Q34QWQgASUg/qiHGn7J0Wn70MNPWTBK0j9qAKL3Z1ANKS/6oi5F2tZ4lJ+6ICbHZkjC0/eiwWy0oDhafvQGyop8qfTb5A2o3EdmYtAKS2PKKqJEiXT7KYgoCicdsXkYPDwECvLtEHIVjiAGYuDBAcd0AFKz9OYhHD4c9sMCkBhg9jQGdRJyeIAhglktCFWWcEdDAIJHPyJgAEHJ5gHSplF2A8gIsOQzj5RWA2R0glPUEjwgFQTl37YIO0kEeLwEsFMQcwyurYeAAPvcCC7Hgt1gDOMt2w5IIaAV26whccs3cIYpyWHz/8AeAPeAyfpmAjtt7YYAsx48IDAJyHVB2gAEJAeACgCOMgeH1gDAYKGeR2Q4wruhVDbkZHjAWADDDjq0IR7xzzACgBiIcEEc9cQDAMP5wrncSxEOFOMYhCou2A3cYAEMygXgk7SDjPZEDlLEYPb1iHIYDHhAQAN298QFhgnwgpwNowfCG7iTAIUks7MOvEOeGHIiAAHGGiLUwYMSekBROnJlJcgnLYHEUCpQRkEn6RbV1FPR06ZlSoJRu2urtz/ACjBF7tPHrkP4QGWqtQkfCW7hFX2lKcjYojwilV6tQGZyD8orN7szuJyHbsgLl3SUk4lnyeB9rymYyz5RT9s2ZYzNl7u4QU3Sz8majygLUXWVx6snxEWG5SlM0sgjrFIu1mBwtEMbtaiMTED5QBVdJQV8CvKILtKb8WqFNytSjhct+yHFZblD3Vyz8oApukpWAhQi9FchXCCPlFSKq3k8ywYsFRTH4VIaAyEzkKTgFu+IpaWwDCJqJAGVph/XylDCkmAT1iSoJGH7RFjsWyDCp2EghSSSYsKMHHygA/dEgAKb4Qe/wD0YkQMoOxxAAdWW4eDsYEu/wAsRGwRw0UY02m9ZMKgptxdoVdCraPfgTVTkzFCXx0aKFzKwOwPlARdqKxiY0UmyqbM2FVOuAHuhUYy591BwlXlAWr0+tYxOP1jFVpmapWKhvnCTZ95HwhXlGFNqL9lkr8oDMXpSeolqnjvh0aYqEJD1P1jSLqtR9Er8oQ1epP0ZnlAdB+DU4HNT9YVel55yKn6xofatSHhEzyhDV6m/QmeUBvvwVqR/aT5wDpSpUARVY/WjR+2amb4JnlEFZqb9CZ5QG/TpepAzVHzhjpicxepPnGkRV6kKcomeUEztRkvsmQHaWmiVbqL1ClhZ3lW5+1v5RnByrDEdY87MzUf6K4cTdRtwvygPRHCRkpEKlR2565zHnhXqM9FwUjUZOd8B37gq7X5EEqcctHn5laiJwVwplaj/SXAehJIJyX8TEJZ2bxaPNlydTbsKmQwRqcD4pkB6QFEhnHnEB29f4R5ylGpjyVwfVanJ+JcB6JuD9sArdQdo89EnU/6S4hk6nbClwHofu7gHEOFBIbp4x5t6nVH6S4Ip9UH85cB6RvBd/3wpHUKSO0R517Nqj9JcKaTU55UuA9FCgC5UMctDhaTl8R5qaTVHRS4U0mqW+KZAemFQPCsxCf+IfOPNfY9UtzMgik1T1VMgPRgQHyfOIVskB0jwjzr2PU7ZUuJ7Fqd/iXAejbg+FJHjAExBJJUCexOY889h1KeSuF9h1MDhS4D0crSXZQEKlQ3u4Hzjz6XR6kfKlxd7HqE/nLgO8JDllJHe8ETEPyPmRHAGi1CT8S4BoNQ/pr84D0HekltwhTtBABS3bHBCh1DtbcuGFBqD9NXnAdZe7Ui8UKaYzNrLC3fsBH8Y58aFkjPtR84wvs/UIPxrbxifZ2oT+evzgM5eiKYhjVERSdC0wOavnvjFXa9QkYWrzig2nUL5WtvGA2iNDUyTiqf5w50XTA/lX1jXItd9Aytb+MMbZfT+cvzgM8aMpQfyr6xaNIUwA/2r6xqFWm/E4UvzhDab8Pzl+cBu06Tpkl/afrGSjTNOnAqfrHOItt9CsqX5xlyrfeks6lecBvU6dkpLiefOLkWSUkYmktGol0d1AyVRlS6W5gfErzgNiLYhsLUzPFyLchJwskeMa32W5P8SvOLpdPXAgFRgNmJCZagxdvKLRuZ9zRhyJdQlaTMJKesZgUymxARz2/QRIaJAAKcBwR3mFA945cdYLEpHATzAScFx5GABKgcIfscwpVO6Sgf2hDgk5b6wQoqgKDMqQS0hPgVAQvrKrn2ZJH6wjJDlIZmHMT5Y7hAYpmVWWpknu3iAJlazCkR98RlskpAPI+kTI5GYDDMyuB/I0E/riJvrWxRyx+2IztuGJiByGJeAwkzKzL0aR+2IYTal29lTn/iGIy+CwEKzEkFvlAYpmVL5pknu3iAZ1SxamS/64jLIYF3hCHZmLQGMJ1SSwpknwWIip1Z0pUFv+MRlgFRGeOwxFEBQcGAwTOuBOKOU364hTPubYo5X3xGxdnOSIBJPQeMBrjOuvqyRSSm/wCYIpM29jijkt/zBG3AVgFx9IZm8PCA0gm3w80cgD/mCAZt86Ukkf8AmCNyE5P+nhjg4JgNAV6gOBSSP+oIG7UJ/ssj/qCOgwcvgQGc9vfAaEq1Cw/2WT98QN+oelNJ/wCoI353AtzAUkHJGYDQbtQgj/ZpH/UEOJt/2saaQ3P4wRuw/f58xGJWGcPEGlE2/timk/8AUET1moWzTSWP/iCN6AAouCOr9IBO5m47Yo0e+/OxpZJ/8wQwnXwn8mkk/wDMEboggMIHR2+sBpTOvz/kkgtz/SCCJ19IzRSf+qI3Llw/nEUXyTx2wGoFRfUj8ik/9URDUX//AHKQ3/NEbnYdrfzgbtqeS/kYDS+v1AA3sUn/AKoMRNRfSMUUk/8AmiN0WcERNzlgz9nMBpTP1CRijkf9QRX7RqNz/scj/qJjoAdwB7IHJxiA0InahHNJID5P9IIf11/OBSyT/wCYI3JHzIzADQGlEzUJ4pZBI7ZoiCZqHdmlkf8AUEbwnL5chojkctAaYzL6A5ppL9yxCmZfiWFLKx13ho3o6wFlgMAk93MBo/W6gwTTSW4+MRYF3xKfyaV8lgxtgMsc/KHBdLEN0aA03rb2eaaV81iAVXx8U0kH9cRuQCB/OIS4wCPGA0hXfAfxEl/1xE3X4jFPJ++I3CgXBwzdn0hgpgH65zAaPfqEHNPJbumCHKr+zmnk/fEbol+eB0MQqO2A0oXfFKzTyX/XEMF3pJzIkj9sRuEHl+x4UJUVEYaA1oXdVcyZRPcsRYJl1BYyZfhuEbIbRmIxJPQQGEF15AJlI+/FqVVJOZaQ3Yp4vJAwesD4R0Y8QAQqYSApIzyXhmCSMFj9IOAwJgKzghz8oCE54+sSIAe+JAMeR4RX1+f84kSAI/OhjyPD+ESJAQfGfCF/R/WESJEQyuR+tBV+LP8ArpEiRVBPA8YYcGJEgKv60eBgq+MeESJARXCvl+6AOU+B/jEiQCq/Gp8RDy+vyiRICHj/AF2wTzL8YkSAYcH5wByfARIkAD1itf5sSJAP2eMBPCYkSCD+cnwiL+EeBiRIKQ/Ef1RAV08TEiQosPxK8IJ5P+usSJAIPiEH85Xy/dEiQFf5qf1R/CGmfGjxMSJEFyPhEJM58v3xIkVCDhfz/dDr+AfL94iRIKI+H5mFRx8xEiQCTviHjEP4v5RIkBejnzgL+H5mJEghR+J+RgI+BP6sSJEUB+MHjEX18DEiQBH8Yi+ngIkSKGPxK8IrmfF5RIkRDJ6eMFXHyMSJFUn9X+1FievgP3CJEgAfxqvl/GHHPyiRIIB+KCrr4GJEgEHxjxgjg+A/fEiQIESJEgr/2Q=="
+            },
+            {
+                "id": 14,
+                "url": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAisAAACzCAYAAABIBFwvAAAABHNCSVQICAgIfAhkiAAAABl0RVh0U29mdHdhcmUAZ25vbWUtc2NyZWVuc2hvdO8Dvz4AACAASURBVHic7d15fFTV2cDx32SdbGQAQ0KUZKAlCSAkyBKgQELLqoBAEUUFoRWoL4tYUavAS6hYF1xAtCL4FsQFBVQEFxZbEtwIiyQgS6DCJEAIBMhkn6zz/pEEJ5PJBsm9N8nz/Xz4tN7M3HNucs+9zz3nOefqCgtKrSgoJxe8vZQssXHIcWiLHIe2yHFoixyHtshx1J+TMsUIIYQQQtwYCVaEEEIIoWkSrAghhBBC0yRYEUIIIYSmSbAihBBCCE2TYEUIIYQQmibBihBCCCE0TYIVIYQQQmiaBCtCCCGE0DQJVoQQQgihaRKsCCGEEELTJFgRQgghhKZJsCKEEEIITZNgRQghhBCaJsGKEEIIITRNghUhhBBCaJoEK0IIIYTQNAlWhBBCCKFpEqwIIYQQQtMkWBFCCCGEpkmwIoQQQghNk2BFCCGEEJomwYoQQgghNE2CFSGEEEJomgQrQgghhNA0CVaEEEIIoWkSrAghhBBC0yRYEUIIIYSm6a5dK7WqXYkbZUo4TudenXHTu/LR39eQZ84mNzOL4oLC6595atMLALw46W+a3vZhzNucO34WgMlLZhLUrdP1bS7ubsxfv5TSUvh8xUd4t/bF/7fBGMO71un3JFqmuK9yib7TE08vHQ/+/iLpacWkp5WQn/trk//F2gmA3+jOaHrb5OhU9sdZAPhgTyD9ovXXt3l46UjMNFJaCo9Ovox/oAvh/dyJGuVVp9+TaJkSfjDRa2AH9B7O/P0vX2C+mkvm1TwKLMXXP7Pp4EwAJvVeo+ltMTO3c/yniwAsWT2abr0Dr29z17uwPm46paWw4pn/0NrPi9/eHkB4/+A6/Z60QldYoGywkpML3jdxDdE5wTf/2krSvqP0GNKbAROG4O7lQWF+ATonJ1zdXRuushpkTrtK9rVMLv5ynj6jB1GYX8jpgyfpGB6Km4d7vfd3s38PrZDjKKNzgpi5V/hqcy73TPdh9sLWtDI4kZNtxdkZPDx1DVdZDUr+pZi088UcPVjAn//airwcK99syyVqpCdePvXvSJbzSlsaon3866Xv2PfvMwwZE8qEP9+Bl48b+blFODnrcNe7NFxlNSjtfBbXLuXyy4l0Rj/QHUteMQfikono3wEPL7d670/J86pJBCuF+QUc/HIvAb8JJDTydgrzC27oxtwcFRcWcfy7RPZ9HssdI35H+NB+9fq+XMS05UaOIze7lP97NZPbe7kzYoIXOdlWvH2ad1BSV5Z8K9s35rD6xQwemuvL5Jmt6vX9lnxeadGNHEd+biFffniETl1uIfL3HcnPLcLDq3k/1NZVoaWY73b+wufrDzPy3u4MnVC/3noJVmxc/G8y/3l3O8MfHkfgb28DnVyEHbJaycvKxaOVF+dPpnBLUCAurrU/JbTki5gW1fc4EvdbeHb+VZa+6Ud4X3dpHtWwWuFaeglt/Jz46YcCwnq44eZe+y+rpZ5XWlXf4/jvsUusf/UHHn5qIL/t1k7aRzWsVsjKyKdVaz0nEy4T3Lktrm7OtX5PyfNKswm2menXcHGBoK5Gpr0wh8DOHSRQqYlOh6evNzqdDkt2DpuWvU3GxXS1ayUayXlTES4u0HugB1sP3EZEpAQqNdHpoG07Z3Q6HVfTS5gyNJWzp4vUrpZoJJdTs3BxgS49A3hhwwQ63y6BSk10OvBt44FOpyM7M59nZ2/nYkqm2tWqRJPByvHvfuLr1ZuwlpaWbZCzrF469+3G5P+dwYEv49Bp8i8sbsbnH+Tw5J/SKS4paxfSPOpn+DgvNnxzK//3Sqa0j2boux2nWf33WErKBw2kfdRP32gj//vP0XzxQYKm2ofmhoH+e/Bnkn8+zcgZ4+UsayApx85yS1Agru5VE6haavewVtV2HN98nst33+SzbLWfNI8GEh+XT5dwNzw8q16ZW8p51VTUdhwH485ydP8FZjwzSNpHAzl+6CJBnW9xmHzcIoeBcq5l4uIKXQZ0Z+TMCRKoNKCMi+lsXPJP0lMuql0VcYMuXSjGxRVG3ePNc29LoNKQzp4qZtLAVJKOFtb+YaFJ19JzcXGF/sM6MXOhBCoNKTXFzJKHt5Ly36uq1kMTwUppaSk7135C6ukUtavSLIUP7Uvk2MEc/c9+rNYmu6xOi1VSYuWZWVc4vE9upo3hvhk+zHjCwMfvZEn7aIJKS0pZ89xeTh+9rHZVmqWh47swZmo4/9l6QtX2oYlhoL0ffY0lO4e7Zk9SsiotTqGlEGdXV0pLft3WUrqHmwpHx/HyM9e4dqWE5evbqVOpFiI3x4reA2kfGuboODb+M55ss4XZMdGq1KmlsOQV4eruolr7UH0FHJ0TuOtd+cOUe9SuSrPnpnfj5I9HKC3V0bnP7WpXR9SBzgk8vZ342/K2alel2fPy1vHV5lyspVaGj28Gd/YWQOcEeg9Xpjxav/WlRP3pPV358ZszlJZC3+iOipev6jBQcWERzs4wcNIwyVFRSMfwEP69fiuW3Hy1qyJqYckvxdkZHo1pLc1DIYOGe7D00StkmUtq/7BQVWFBMc7OMGlWL2kfCgnvdxvrX/6O3OwCxctWNVj59uMd19+HI5Th7qln5IwJHPl3vNpVEbV4ZWEG8XHKXxRaMh9fJ5at9uOjtdlqV0XU4qN/7uf4IZk0oCRPbzdmPDOYf392QvGyVQtWcs3ZnDv+C0Fdle9Oauk69+nKgD9Gq10NUYP0tGL2xeUTGaVXuyotzrC7vfifZwxqV0PUwHw1j+M/pdK1V6DaVWlx+kQZmfDnCMXLVS1YuWw6z+g598rwjxp0OnQ6HZfOnlO7JqIaxw4X8soGf2keKtDpQKfTcfSQ9Gpp1dmkK8xZOkTahwoq2seZk8qukK5asNK5Txf8O0pUrBqrle0rPyQrXd2588KxoWM96daz/m9BFQ3DaoX591/i/FlZkl+L+kQF0THsFrWr0WJZrbBy4Tekp2YpVqbz4sVLYhQrDSgsgtSTSeh0Ojx8PJUsWtjS6XBxdeFq6lVu7Xyb2rW5aYVF4NYM7u2FRRAfm4dOp6N129pfJCYah04Hbnonzp4qIiKy6b/hvTm1j5OHzwE6fAwyRKoWnQ5c3ZxJTcki5HY/RcpUpWfl0Nffo/eSE01tXQb0wODno3Y1hJ31r2fRyqCJ9RpbtLsmeRPYQQJGrflq4894+TSDyKuJGzDsN/gFKNfhoPgVsTDfwqWzF/D09Va6aGFH7+1J1wHd1K6GsJGTVcqxnyy0bSc3SbUZ2jhx5z2y3oqW5OcWcjYpHd82HmpXpcXz9nVnwDCjYuUpHqzorMVMWPCg0sWKaiQf/S+XTRfUroYoV1pi5Z+ftFe7GqLc999YOH5YEm21wlpawoKXhqtdDVHuaPwFTElXFClL8WDFp403Hbp2UrpYUQ0nZ2f+e+i42tUQ5dq1d5bpyhri4qrj39vz1K6GKNfGz4OuvSSY1wpnFycOfpusSFmKByv7t8VSaJEXsmmFT1tfstLNaldDlFvzkpncHHmZnlYE3ObMheRitashym3bkIAlT2ZoaUVbf2+uXFRmAUXFg5XkI6ewlshS1lrh08aXLgPD1a6GKPfdrnxKiiVY0Yr2t7kwerLkrWjFkfhzlJRI+9CKNu28+N2I3yhSluLBSl5WNk4uqr8/UZRzcXPhNz1D1K6GKHf1cgmubrLSlVa463VEj5IlFrQi61o+Lq4yU04r3Nyd6fm7DoqUpfhf/c5H/oiru6vSxYoabHlhvdpVEOVe+D8/PDwlWNGSh0enqV0FUe6R/x2Mu14edrXkhfk7FClH8WBF3gWkPWcOJ6ldBVGu72BJrtWa2K/kDeVa0fUOSa7VmsPfK/PaFsWDlY0xa5QuUogm4/4hqWpXQQjNipm1Xe0qCJUoHqykHD+jdJGiFpOXzFS7CqJcfKxF7SoIOx/skXeYacXxQxfVroKws2T1aEXKkUwlQVA3WfdGiOr0i5ahOSGq0623MsG84sGKPMVrjwzNaYc8xWuPDM1ph1JP8aLulBqaUz7BVp7iNUeG5rRDnuK1R4bmtEOpp3hRd0oNzUmCrRAaIk/xQlRPEmxbLsUnrMtTvPbI0Jx2NNWn+CxzKScSy16jcTyh7MV/XSPcAfDxdaJrhJtqdbtZMjSnHZJgqz1KDc3J6jqCoG6dKCqUJaxF/Zw3FbP781w+WZ/NiYSa3/flY3CiX7SeyGgP/viQD60MTSe3v1+0XtqHENXo1jtQkfYhCbZChuY0pCk8xZ83FfOX8WlEdUxh2fyrtQYqANnmUnZvzWPZ/KsM7pjCsseuct7UNF4QKENz2iEJttojCbZCMTI0px1aTrDNMpey7LGrRHVMYffWvBveT7a5lHUrMonqmMLrSzMasIaNo6kOzTVHkmCrPUoNzSk+DLQxZg2TY6R3RQhH7h+Syoca7F2p6E2pSy9KfayMyWBfbD4vrWvHbUYZlRY1i5m1nZi3x6hdDQ7EmjCduqpK2caQtvSJNqpStppaXIKtJfZfvPHPU5TYbvTswfg19xNSYw5gBvsWvkjc6cpb3aOmM2d2aM2/SNPXrH0yjmuVNram90tP8QdjfWrfOGRoTju0+BR/PKGQ+4ekkm0udfjzwGAX+kXrGTbOi1YGZ24zutDK4MTx8sAmPjaf4wkFxMdayM6suo/4WAt/GZ/Gh3sCNZnL0hSG5loKtRNsc7MLWTpru2qBSgVjSFuWvD0GLx/1E9clwbaR6Lt2oi2nuGy7Me8cZ00QElLDF3PPcMZUdXPB8VNcIpRba/hqzqlzdoEK4NuJjsa61LjxSYKtOhYt/luVbROfhKee+vW/dTodL7zwgoK1quy8qbjaQCUw2IVHY1ozcZqPw+9WDGlV/G+WuZRP1mfzrxWZpCZXzlc5UR4QaTFgkQRbdThqHx3/AE/ZNBCl28f6V35QPVABMJ26yvpXfmB2TLTaVVEswVbxYEX1p/h2nQjyg8vpthszuHw6A0JaV/u14mNJXC5y8IP0M5y7DLe2q+6bRaQer5qg52wMQenntdzcXOLi4jh27Bgmk4n09LJfgqernq49utOrV2969eqDl5eXwjVruXQ6XY0/t1rVu0lmmUv5y/g0h4HKvCWteTSm+vbiSCuDE9Pn+/LHaT6sjMlg/crMSj8/kVB4vYdFDdW1D0ra0Lvvb6R9qEBr7eNArEnR8mqidF2qax+uTl6E9+za6O1D8WBF/QTb9nTsrOdgeuXu9kvHUyi+q3W1v5DUxHMUOPxJOmeOZ9OvneOnS7jIudNVu/b9I4JQKpUyNzeXr776ii+//JK8vKqJkXlFFg4eOsDBQwfw9HyXkSPvZOSIO+Wi3MKtjMmokqPi4+vEohVtq+1NqYtWBicWr2hLlwg3nppe6amB+FgL+2ItiiYa19Y+cL7GwUPXpH0I8nIc52wFd25Dn+iO5GUXsD/WxJW0HNXq0tBqax9FpbmK3D9aYIKtK4ERQTj/UDlvpeTUGVIJJ8jhdy5z5lR1sxaKuZyQQnF0N8e/THMKqen2G/0I7Fa/p9IblZuby9KlSzGZTHX6fF5eHp9+uoVDhw6y8Jn/lQtyC3XeVFyl5wNwGKhUfHbX1lwu2ExHvtXowsRpPkx71Jfdn1f+Wd8oj+v7sQ9Ynpx+mb1nHbfEhibtQ9ysBS8Pp69Nwuu0BQNY//IPfPXRz+pVqoFoqX0oPjisdoItgL5rCG3tN2amkHqhmi+Yz3CuhqUWCo6dorofF586wyX7jb5BiuSr5ObmMnv27DqfaLaSk03Mf2wOubm5DV8xoXnLHrtSZdu8JZXzU2ynMq9bkVkpGAG4YCpmZUwGo3ue58lp6ayMybj+74EhqWxZn83EaT70jdJX+d6urY1/3kn7EDdr4oxelQKVCtMWDKDrHe2Vr1AD0lr70FYmm1LK81YqSyfldL7DjxefOsUl23wVVz3Oth/IPMOZagKd1MSUyjOPAOeQxs9XqYiIHXZr11FeXh7P/ePvckFuYc6biquso1KRTFshy1zK/UNSWbeiau+LPfsgxn778vVVE752N3KwIu1DNIToMdXPyqjpZ1qnxfbRQlew9aNjV/sx8WJSj6Xg6LKaeqBywOHcOYQgT9tPpHPuWLaDb2aQeqrq2KV/eKdGz1f58ssvbygitpecbGLHjq9uvkLNVP+77mXg2PuZMudJNn76BSkXmv5qp44CBftk2oZYc+XW8nVVbjO6EBZeeQrm7s9v/CJZF9I+RENoF1h97pZf+/rndQV3boOnt/rTkbXYPlroCrbleSt2WwtOn6HqpLRUTp+uHHB4GcOrDONcSjxDlTTa3BRSqty7/OgQcuPJiXVRkRDVUHbs/EqeHqvx45cfU1JSwumzybz17kb+9Ogz3PXATF7+5//x09HjalfvhnzybuXAOzDYpdLwz8qYjAZZD6biRYdAlTyYbHPp9XVaGpq0D9FQTEnVT2Ou7xTnqNEhLN84kZi3x6gasGi1fSgerGjlPTT6ziH4229MP0eq2W7b5TOkVgo4XPDv2olAY+UnzZJTDvJWTKeqTnf2DaKT8cbqXFexsbE31X1nLy8vj0OHDjTY/pqbH7/8GB1QVFxMbn4+V81mPvliF08tW87gux/giaUvsSv2e/Lytbfgm70sc2mVHhPbmTlZ5lLWOUi8hbKZQi+u8+NwhpHDGUYWvVYlM6wS2zcxd7EJXGzLagzSPkRD2bz2kMPtudmFfLXxaJ33EzU65PqaKcbQtqoGLFptHy0ywRaAdp0ItE8cKUol5VTl6MJy+pRdgqwfgUYP/Du3r5K3ctZUeXdXT6diH08qka9y7NixBt/nwYNyMa7Jj19+fP3/69CBDnJy8igqLubb+IM8v+ptht/7J80PFznqzRg27teM/k/WZ1e7ku2HsYFMnFb2RuWKNVWG3u3p8LP2SbWOFoLLMttnezUMaR+ioRyINbH+lR/Jzf613VxOzWb5gp2kX6zb9GXbQKWCmgGLVttHy0ywBcCPjp297bZZSD1uu5xzUZV8FXwDCWwHLp2D7GYUZZByzHZ6cz6px6rMWcY/vFOjzxdviLFGe1euVp0dIiqzDVhs6XQ6LJaCKsNFTUUrw69h+b5Yx0no85a0rtRTUqGrgx4TR9sdfbeh30NUQdqHaEhfbTzK9CHriZm1nSfv/4Q5YzfW+bUAjgKVCmoFLFptHy1vBdvrXAmMCMQ5rvJ6K1mnU8gkCF8ALnLabkE355AQ2kFZz4zdSrhXE85guatXefJsCmdO26fr+tGhW+PmqwBcudLwF87kZBP977q3wffb0lQMFxUVO54ho7YTCVWXPrQNJL6pJvH1j/VcJK6LXXDiqEfH/jMNRdpH0/CHOzqqXYV6qe97i2oKVCpUBCwxs7YrtghcY7WPm+WSo3BemDYSbMvou4Xgj12uiekMqYUD8XUDLpypsqDbrzN5ylbCTbBZCbfkdBIphb3KXohoOsNl++u6bxCdanqJkBBNVHVvTD7uIPgp+7xrrZ+z7dERoqnoHRWMMeQWtlSTzwJ1C1QqqBGwNIabjTVcvBVegFH9FWxtGDrRIZDKCbRFF0kxQZcQyDl9ym52kO1MHleC7FfCtXkhoqOXFyqRrwJwyy23NHh0HBQUzAfvv9Sg+2xIObmg9LnsSG1P11bAzcUFN1fXGj+nFkeJrscTCm9o+fvzpuJqe2Ls9/fpu1Wn/jfWkvvSPpoGRy8y1DrbIKRdoDf/XBpX42fqyhjaljsnd68xAGoojdU+bvb8a7kJtgAE0qlK3kr5Sw0pIjUh1S5fpfJMnrI3OFf+bmr5dy87eHmhEvkqAEajscH36XdLlVX0hJ3qAhWr1Yre3R1nZ2c6dwzmkYcm86+V/1C4djeuLomu++ymMle8BNER+zVVtqzPrjIVurrE3IYg7UM0BvsgJHpMKP+zJKrGz2iRVttHC06wLeNovZWrp1MpJp1zJvt8la6Ve0YcrIR79XgqxWSQYrKfpqpMvgpAt27dGnyfvXv3afB9Nie2gYoVK1jB28sTVxcXBkX25ul5s9j18b94742XmDxhNEG3qvNm4do4SnS1XSTOx9fxJWPZY1euL+S2L9bC/UNSq02QtX2R7rqVmVXeDQT1z4GpD2kfoqFVF4TYBixNIVAB7baPFpxgW8alWwj+HK+Ut1JgSuGq2cKlKvkqQXa/sPZ07KrnYJxN3sqFFK7mFldKvAXAt5Ni+SrR0dFs3ry5webKe3p60quXXIyr0/+ueysN77i7uzHkd5H8flB/7ujeVe3q1UsrgxNh4W6cTPw10Ii3Ob8jo/UOh3ZOJBTyl3GOe1IcfXZwxxSyzKUOp0H3jdIzfFzjjVlI+xANqbYgJHpMKH7tfejWW5sPKPa02j5a6Aq2NgxBdLA/h9LTuWxK4VqlJVcc9Yw4WAk3/SKXTSlctVsMTql8FQAvLy/uvPPOBttfY7zuu7nof9e9VYZ3vvxgDQv+589NLlCpYL+a7AVTMVvWl+WUTJ9vaJAyLpiKHQYqgcEuvL01oEHKqI60D9FQekcF16m3pKkEKqDd9tFiV7D9VSCdutnlrRSlk3LAbkG3anpGqqyEW5ROyg8XqywGF1ilV6Zx3XXXXQQHB9/0foKCghk5suFO3Obmxy8/5rttH2p+eKc+hjno1Xh9adkaQv2i9XXOJ5nwkHe1w0aOhIW78WXCbQ4XiGto0j5EQzCG3KJ2FRqFFttHC0+wLRMYbp+3ksHZhIxKW9y7VdMzUmUl3AzOJly2e9NyewIVylep4OXlRUxMDJ6eN56o6OnpyaKFS+SpsYW5zehSJSC5YCpmZUxZm1i+vh0THrJPTK9s2qO+LF/fjkUral5yH8p6U15c56dYoALSPoSoiRbbR4tPsAVwCQnBv9JM0mJy022XSnahXUR1PSOBdLabUVT5u6i2voqXlxdvvvnmDUXIQUHBrHjtDbkQt1CLV1R9Ynx9aQZb1mfTyuDE8vXt+GBPIBMe8iYwuKxlhIW7MeEhb7Yfvo3F5UHKxGk+fLAnkHlLWjP0bk/6RumZ8JA385a0ZtFrbdl++Da+NQVVGXpSgrQPIaqntfbR4hNsgbL1Vvzs1lupxI9Onau/mAZGBOEcd5zqJnhW2yujgIoI+csvv+Srr76qNWnK09OTkSPuZORIGYdvyW4zujDtUV/W2720cNljZSsPTZzmQ79ofZ3WQqnr59Qg7UPcjC1rDymy9olatNQ+FA9WNJdgC0A7OnXzJj61mhdP+QXRoYaeEUczimx+WkOvjDK8vLyYNGkSd911FwcOHGD//v2kp6eTnJwMgIfVja69etC7dx969eojF2EBwKMxrdkXm19pZlC2uZSnpqeTmlzMvCWta/h29eLjLPj4OjmcJq2G2tpHnrk9g35/q7QPgae3m2ZWkVXqnUG1tQ9rgTe9+4c1evtQ/B6qqRVsbQSGB+G823HviLt9Eq09RyvhXldzr4ySvLy8iI6OJjo6utL2Fyf9jb/+9Ql1KtWC6WwXHLmJzzSWVgYn3t4awOiI82RnVp65szKmbEjo0ZjW/PGhup3fn7ybzcqYDC6Yyt6L9OI6P1WGf6pTXfv4je4Mn33RtN5T0xxosX30iTYS98UpRcusTp9oo6LlVdc+JvVew1//OqPRy9cVFpRaG70UG68++DRPbXpBySLrxryPD2dv5VyR/Q9c6PA/C7k/2qPGr6esXcbG3Q56ZvwimfzmeIIarKINL+XYGdp3btoX46a4nLgjYe5n+cWqrd7H4wmF3B+dWiVgqeBjcGL4OC+GjfOilcGJW4NdaGVw4kRiIVnmUuJj89m1Nfd6kGIr7mxQte8V0op9sRZ6DXD89uimorm0jwcGrGXTQfUednOzC4mZuY3k0/YvU1FWcOc2xKwZi5eP+r2Txw6mEtKjfaOXI8GKAKCoUNHToME1l4uxFoMVKHvPz6xxaZWGhBrC9sO3aWY4qCbSPrRB7WClwv5YE6akq7V/sBEYQ9vSV+Feldoo0T4UD1Yunj6r0byVlmtjzBomPtP43XiNqblcjA/9UKDZZNQscykrYzKqJN3eqGmP+l6fNaRl9w9J5d2djf/k2JiaS/s4deRik1pgrSWImbWdhatGN3o5soKt0OTaNy2VVgMVKMthWbyiLXFng27qRYN9o/TEnQ1qEoEKUOUli0I9Eqhoz/FDFxUpR1awFUJD7h9S7fx5zbjNWLYkftzZIBa91rbKW5QdCQt3Y96S1sSdDWJjbKDm81SENsXM2q52FYRKFL9iyFO89mhy7ZsWqik9xd9mdGH6fF+mz/cFyhJRAc6bisg2l9IloiwpVcu9RXXxwR55mtcKpZ7iRd0tWd34Q0CgQrAitCeoW6cmn0Ao1PdrUNK0gxN7/aL10j6EqEa33oGKtA/Fh4HkKV57ZGhOO+QpXnuawtBcS6HUU7yoO6WG5iTBVsjQnIY09SGT5qgpDc01d5Jgqz2SYCtECyRP8UJUTxJsWy7FgxV5itceGZrTDnmK1x4ZmtMOSbDVHqWG5hQPVoT2yNCcENWToTkhqqfU0Jwk2AoZmtMQeYrXHhma0w5JsNUeSbAVipGhOe2Qp3jtkaE57ZAEW+2RBFshWiB5iheiepJg23IpHqxcPHNB6SJFLe5fOkvtKohyPx8qULsKws7GvfI0rxVnTlxRuwrCztI1YxQpR/FgxdPXh6KCIqWLFTW4LcyodhVEuVv8XcjPk9VStaTPQHe1qyDK+bbxpMBSrHY1hI2wngGKlKN4sDJm3v24ursqXayoRqGlkG/WSdeqVrz2YTs8PHVqV0OUy82x8vdHr6pdDVFu3rI/4K6Xt8RohSWviHUv/6BIWYoHK37B7ZUuUtQgPyuHnIxstashynWpwxuMhXKupZeQfrFE7WqIcsEhbdWugrCRlWHBfCVfkbIUD1Z+3BpH6qkUpYsV1cg15+Bl8FG7GqLc6hfNHN4neStaceVSCbf4O6tdDVFu6/pETh29rHY1RDnzC/ep/gAAG6lJREFUtXx823goUpbi/WmevgbOHjlNYEiQ0kULBwJDgvBu21rtaohy7dq78O2uPHr2kzwJLejZz53ADhKsaIVvWy+O7DtHSPd2aldFACHd29HW31uRshTvWelwewiHvv5e6WJFNaxWKx4+ypxsonYDhnqwYVWm2tUQ5axWK238JFjRitv7duDrj4+pXQ1Rzmq10sqgTM+K4sGKu6cHs1Y9pXSxwoG8zBw+X7FJ7WoIGz6+zsT+Ir2OWnD1cgnzH0hXuxrChqe3O6u2Tla7GgLIvJbPimf2KFaeKu8GcnFzo7hQpi+r7czhJPw6yo1Razw8dVjyZfqy2mK/zuP2XjIcpzXuehcKZfqy6g7/cI6OXfwVK0+VYCU3M5e3576kRtHCxg+f7cEY0VXtagg7Vy+XMOS3koSutn/+w0z0nZ5qV0PYybyWz9xxH6ldjRbvs38dJmKAUbHynBcvXhKjWGlAYRF4ebuRddWMq7srvu0kuVMtt0f3BhdP3JrBbNnCIprNcfganEhNKUbv6cRtRllTQi0Tp/vg7uncbM6r5nIcPq1cuZKWg7vehXaBMpNRLdFjwnBxc1fsvFKlZwWg75hokn/+Ra3iWzRraSm/HE7CyVkW59OqmU/6sm9PntrVaJFKSiDu6zzc3GRxPq0aOzWCY4fkPVpqKC2xcviHc7i4KJt4rlqw4mXwYcDEoWoV36Idjf2JtF+koWuZX4ALc/9Xeh3V8Om72RyVdzRpmqGtJ398uJfa1WiRYr84xZnjyr+jSbVgBaCk2Mpnr7xPQa4yK+AJyM/OY+9HO+k58ndqV0XUorjIyux7LpFlLlW7Ki1GxtVSXl10lYfmtlK7KqIWxUVWXnlyN7nZhWpXpcXINlv46K0DjLz3dsXLVjVY0el0dB14B+8+8wbWUpn9oAQnZyfuefphXN1kCEjrnJx03P2ANxMiL1Aq8YoiXFxg3Y726D1UvTSKOnBy0jFoVAjPPPQppXL/UISzixPPvH4nbu7K59KpkmBrm5DTur0fRZZCCvMttAn0U7IqLYvVSsqxMxj8/dD7eF3f3JwS75rjcXTs7EpuTik5WVY6hUqA2VisVtgXm4/xt660bvvrWHxzPa+aKvvjaB/kiyWvmPzcQgKDDepVrJmzWuHYoVQCbvPFx/fXReCUPK80MdWg79honDVRk+br8O54TEd/oX1IJ7WrIupp1pMGaR+N7MPVWfz4n3x6/06vdlVEPY2dGiHto5Ht/uQ4Px9IJbSHei8i1kxfZ0kxxH6wg5/jflK7Ks3O6YPHObw7nhEzJ6pdFXGDSorhpb9d49MNOWpXpdn5ZlseG9/O4h9rb1G7KuIGlRTDB6viifvilNpVaXYOxiWz+5MTzFwYpWo9dIUFyg725eSCt5fjnxXkWdi+8n1a3eLLXbMnKVmtZq0gr4DiYitu+qqrcdb092hKWsJxZGeWMu++S7Tv4MLy9fIit4aSk1VKcbEVL++qz24t4bxqSmo6jrycQlY8s5tbAryZHROtaL2as7zcIkqKrOg9qw5DK3leaaZnBcDdU8+EJ6fz297KZxo3N4WWQtbOf5lLZ9NwcnFzGKiIpsXH14m12wMYNq4Z3HVUlptjZWjYOU4kFuCu1zkMVETT4untxlOvjqJPlFHtqjR5lrwi5v/xY0ynruHq6uIwUFGa5lqok7MznXp2objYyucrPuRo7CGZKVRPab+c541Zz9Fv/FDa3KrcuxtE43Nx0THkTk+Ki63Mu+8SW9Zny0yhejp6sIABt5qYs8jAb7s0g6xTcZ2zixM9fxdMcbGVFc98ww+7fpGZQvX0y/F0Zo18nwl/6sWtRu2s9aSpYSB75svXOPTVt5w79l/+9PJ8nF0li6paVivp5y5xSwd/Ci1FZF/Lwdev9hOtJXQPNyX1OY5zZ4pYtzKTH/6Tz9dHOuDmLiuuVsdqhVM/FxJyuyt5uVbSU4u51Vj702JLPK+0rD7HcflCFl9uPMqxg+d5+aN7cHVTdsXVpsRqhXO/XKPDb1pjySsh40oefu1rf5WBkueVpoOVCgV5Fjx89GSkXubif8/xmzvC8GzlBTq5OAOc+D6RvR/v4jc9uzDw3hE4u9Q9qGuJFzEtu5HjyM4sxbeNE2eSikiML2DIXZ608XOW5lFu+0c5vLb4Gr+/y5O/LmuDaz2W0W/J55UW3chx5OUU4u3rxsVkM6d/vswdA4No1dpD2ke573f+wsdv7eeOgUbufaQPLq51D+oUDVauXWs6fWQlRUWYEk9w9qef0Xu4MGbevRTk5pOfnYfe2xM3vRtOCr+vQCmlxSU4uTiTdcVM5uUM/vvTCboNugNDe3+Sj6fQyt9f8lJauAJLKXFf57Fnex6e3jpefa8dWeZSMq6WYmjjhKe3E67qDz03iqIicHWF1HPFnD9bzH++yGX8FB86hrpy4FsLwZ3d8PLR3Ki3UFBRYTGJPyTz03cmPLycmff3IeRmF5KdacG7lTt6T1dcXJrnOVJcXIqLixNX0nK4nJrNT9+mMOjOzrQPbs3xny7j38GA3lPbQ6JNomelOjodJB89zc9xh8gxZxHa93Z63TmA7zd/w/db/g3A7yb+gYGThvHdpt1NdpuruxuD7xvBHaMGcHjXPsyXMggMCea3vbre9O+wJT9xaVFDt4/v/53PJ+uzSb9Ywog/evHQ3Fa8vtTM60szAJi3pDWPxrRmZUxGk93m6aXj8X+0YeqcVny4OouUX4q5Y4A7fxhz879IOa+0paHbx9H9F4j7IomMK3lE/r4jo+7rxuY1P7Fl7SEAJs7oxaRZvdj09qEmu83dw4XJ/9OXkfd2Y9eWE1y+kEVId396DTbe9O9QhoGaADkObZHj0BY5Dm2R49AWOY76a559XkIIIYRoNiRYEUIIIYSmSbAihBBCCE2TYEUIIYQQmibBihBCCCE0TYIVIYQQQmiaBCtCCCGE0LSmE6wkvUDvVh15PM5uu2UrD7Rzwm/iR5jtfpS2Zgg+QdPZaalbEeZN4/EJeQT7IuztfLg17f+8lTrutkGU1e0x4hUsU6ghltkhTri5l/9r5UGHkJ6MnrOaePsTvBHFzWmPz8SPqj/Hk16gt7tNPa//68nCRCBlNUOD+vNSYvnnTSsY2KonLyXdTK1MvD7Ig+4LExz+1LxpfFl7r66OrVrTuc8o/rwqljT7Y7npugntsfD5gx4OzlGnms9tANNqhrYqP5cr/tv2fK4rObcaTNN5M2BoNFEBS4nbfxKiwq5vtsR/zl6LO5a9nxNnuY+79dd/QvzeBOj7EJF6h3sUQqPc6bvga96cZACLmbSknaxa9hijkyx8u3s+YbXvQBnuocx4Zx1Tg2226Q0EhwKpRsL7RmD0Vaty5dxDmfH+RmYGg8WSRvLed3l24ShGp+3hu+f6IZeG5s99+Kt8s6hfpW16/7D6/e319uezhZ0P92fblMO8GdVAFRU1ajrBChEM7qtnzd59pD0RRkD51sRt+7BE3ceIxB1si7dwd1TFKbiPXfsthM+NxqBWlYW4QYbQMMLDy87y8MhoooLNdB/zNu8lzue5cJUrd52e4PB+RIZW/UmO/0he2TJS+SpVoSc4NILw8jpGRo6kBz3ps+pd4p/rh9xnWgBfI5GR/Wr/XE0C7M5nSyyb9prRT7m53Yq6azrDQOiJHN4P4uNIvN5/l0DcXhPhYx5lbF8Le7fZdA8n7SM+zUiUzfsPLElbeXxMTzq088AnqAtD53zEySp9gXrMO1/ggT4d8WvlgV9If/68al+VISZ3zCRueISh3Vvj08qDDt2HMHvDSbuuRTPxa6YztHt7fMr3NXHhDkz2RVoS2PD4KHoHtcanVWs69BnF45vs92XvJGvGtKfDsBU2vw/RXOlDIwkljTSb8Yvaz+c04pZPZ/SgLmWfadeRgQ+uqDKcZI5fwZ8H/Xq+P7B8B5duts8hpQ7DPpYENswZQvcgD3xataf3mKf53HRzxdaFMTQMzGlcUnBYTWiYxcTnj4+id/l52H3MY2xKtruo2g5jJq1mdMh43ktOZu3w8mGlYasrDy1Wax8Lu3fkr5/Gsubh/nRuV37uT3yBuDQziWseuX6/6NBnFAt3Vt6rJXE9j08cQu+QivvOKB7fZKpc1Z1PM7H8/lVp+MsmjaBu90JtaULBCgRERhFu2ceu6+OIsWxLCmN4VATDh0eQtutzKn6UFh9HkqEfgyue+tK28ucxk9nlO4v3d5/gwOanCI5/hDEPb60ciKStZ8GyJEa8/BkHjhxmy6IIkp4dxcQ1pkp1Kfj+aWZvC2buOz9y9MCPvDNVz7Y543n2+pimhcTloxi9zET44o18d+AwX7x8L2wbz7CHt9qc2CbW3DOEx/camffeHg4c2MM7MwKImzOEiRsql2lTST5/eDwLzdN4f/N8wqUvu/lLTiIZI6EVXYp1Op8tJCfD4Llv8cW3Jziw+VEC9j/Ng4tifw2ETauZOOZpEkOXsOXACb7dvITIxKd5fFPdLr03zsSGe0bxeLyRJ947zNEDG5npu5UHxzxGXCNfNNOSTRAQgL90ubYY1Z9SFuIWjOLBzTDpjR85cGQP70yBNXNepNr0lNC/sGX/W4x192fKtmtkZeaRvv0v13v7a5fMxr8+TeLwdRy4nE/6kbeITFrKxME9+fPecJ7bfZbsrItsmWRhzZRH2GR7gzKnkRZ8L4vf+5GjR37kjeFm1jw8neu3p6QVPDhlK75PfM25rHyykj5lSog7oXP+Q8qR14iEut8LNaYJDQMBodFEBiwlfr8JIo2k7d1JYnA0r4RCgPvdhC94l51JzxMeaiF+1z70fd+6nq9y8r2lbGMaX7zzF8pGiqbx5svxdB/zIhtM45hnLC+jIICxL69jamTZfxqNb/HOpX30WbWS+Jnlf2yggJE8987fGFF+wTM+8TxTN/Qnbq8Jwo1g3sqzy08S9cYJXplUfhqHhvG+fzJ9hi1lw9xxPBkOlrgXWR4XxuIjbzG1vA5hoesILuhPn2UvEjfpLaIqBSNm4heO5+H4fryz+3mi5ILbzFkwJ+3g2QWrMUe9xqTyIaC6nc9Gpr6x7tddhc5n8Yx3GbhpHyaiCQPiV60k3n8+370zjbJdGwl7R09Sj9+zoTGPKu5Fno0L4IkD65gaChDGzDeeJy5kOqs2LSFqamOc2GZMO1czZ/lJwp9YJ0NALUTB5gm02my7xZ3hay/yxVQDpH3E8k1pjHjjR54cW3Exf433zQl0nlv9rVtvKLso6/UG9PV+WHTH/Q9P8cqk8rwZ4zjmTo1gw7N6Zr78FyIDAPREzp1F1PLH2BkPk0aUlxv1Nz6wOXGNzz3F2PemE3fEwkyjHtOuj0kMfoh3bPb9xNQI+mxLwKKPBupxL9SYJtWzAhEMH2wgKW4fZszs3baPgKi7yy6yxmiiQk+ya5cJSGDvfgvhw/uV56uksXfXSQyD761049eHRxFOAvFHbOJu3wgG2+UEhPWNJiA5gUSbh03326OIrHQ9DSA4ADLTyk/wxDjiLREMH1w53tZH3s3ggJPsii/bWdL+faSF3s1wo12Zw+8mNG0f8ZW60S0krZnMxPcMPLdlHXfXPZQXTUoBu2YElnffetKuxyMk9n2L3ZunYQTqdT7b8fcPAEsmBeX7STxiIiBqBJVOeX0/hvdwr0M1E1nUw6naruaamPbvIy14JCNs810MEUSGWkjc73i2zw2pVMc2hEz5GP9le/hirmbSlEUjcx/+Kt/u/4kD1//9yBsVgUlSPImWsvuKrYDIfoTWoQncqJDeEZUGWg2+egiIINz2mq434Ks3YymooatRbyDAYKHiIxbAfgS3Ipgq+8iNXzvU1rR6VtATOTgCy6I4Es0Gdu6Hvm9UZPRHMHZwAK/viiVtuJn4tDCiIo3l3zNjNsOl+FH4bKq8x4ICGG62cP0vrDdgsI+UDXp8MWPOhOt9fb6GGkf1LZlmzBgcdDUbCPaF+EwzEIA52QwGQ9UkYF8DBswkV+oC3MrCZRYs5gCS0swQKt0qzZM7fZd9zTtjA8Acy6J7nsYc2o+w6ydcHc9ncwKblr/Ihl0JJF0yl12sLGYK/CMq7cc32P480qM3GKi1T9hmps2vXw0gFCiu5auX0swUnFrBwFYrqhyAPvTmLpiV2qV7KHM3f8YMIxQkvsjEhxMICA+TpPuWxNdIZHiEwx+VXacdDAn6+jfqOeLuqDvGvfYumrS4FTy76mP2HjFhLmvQmC9BeccLYYOjCV34Lsu33cebY41g2sHyDScJnzSyfBZhPe6FGtPEghUwDB5BuPld4rfp2W+JZvHgX3+x4WNHEnDPTnbFW0gy9LOZNWHAYIDgqRvZviCiyp9CH2BzWlrMVPl7mc1kYsBQj2mYel8DBk6WJfFV6gExk5wJBt+yMg3BBog3U+Vj5cFO5ftIGE9s30j4hiGMnvEYw/evuz4MJZoXg38YYaEBQBjLnviYQcseY9PYzygbUazL+ZzGhilDeNw8jXfe/5ERoWXBtWnNELqvuv5JDAbITLMPDixYLHUJGCrPtLGVU9vx6Q2497iPLzbPIrjKD6vrMiw7bnOm4yjKfCkNfO2npOrxN4YRFgqEPs9zm3oye8FqpmhpCrhQTdl12kSm/QW4wKK5/A1L/GMMG7OVHi9vZPv7/TDqAWKZHTSKSxUfCl/C+y8nMOzBLnTQ69Ebwhg8YyNbnqg42+txL9SYJjYMBBj7ERlsYtd7+0gLH4Ft750+cgR99QlseC8BBkfZdG0HENnXSFriSTAaMdr9C7D9i2UmsNduek3irn2kBdt10dUmfASD9Qns2mWXqJi4k71pYUSWDUwS2rcfAUmfs8tU+WOmXTtJCrCbFmqIIDI8gKjn1jHP9yMenvNRHTPQRVMWNuN5pvruYOGiHeUX0Dqcz5Z97IyzEDV3CXeHVvQCWkg+YrLZs5HwHgGk7Y3lZKUSE9ibmNmoxxQ6vB8ByQkk66vW31ila7OCgb7DIzDvepedVe4kJ9m2KQFDZBTVz+wOYNJzTxEav5RFG6TlCCA0knAS2Lm/8glljo8nudYvW6hTTN9ATHtjMQXfx7yZFYEKYDpJUqWqn2TbeyYGv3+W9MsZnDv1Ix88MdImDqvHvVBjmlzPCkQwPFLPqvcS6LtsXeXeCH00d/dN48HtFgavqry+Svjc5xm7eTL3TITFc0cSarBgSTOReMRC+Nxpvy4c52tm24JHCF/2FIOD4dLelcxeayJq2aPXk2vrxDCOJxe/yNBFk1loeJ4pPQIgeQfPzlmBZexG5pZfUfVRT7E4qj+PT3kEw7JHGRwMyXtXsvDZk0QtW2eXXFtxnP1Y/M4S4oY9xsMb+vFFRWauaJ70/Vj83H1se/Axnp0RzSuR+jqcz0bCQ2HVe6uJC59GqHsaidtf5NldFrAZi4+c+SiR7y3l4TlGXpnbD39M7F3+GBuS3cFBj0mDHVLUUzwR2Z/Hx0zGvHgWUcEGLOY0ko8kwPC/MamassOmPM/UNaN4cBgsfuIhIoP1WMwn2fbGUtYkj+TN90bW3Ikd+hdemfE2Q5c9zedj13H39YuEheTEfXbTuvXc8tsIvL0a4oiFajJNxMfvq7RJ7x9GuNEAAeOYO2kpExdM53X3JYwNNZB55CMWLtuBpaa+N30YfUMtrF27mvjQcfijJ8BYc2rAzQoIDUOfvIMNm+7Ff7ABS1Isa5etJFnPr/c6i4nEJAuknSQ+MQ094O4bgNEYcL1udb4XakzT61kpX2/FHSNRw+1PJgODx/bDnTCGR9l1gwSM44NdnzFF/zkL7+lPn75DGD33RbYlg6/NH8cw/DW2Lwpg24JR9OnRk9HLEghf9jXvzzTWu6bhc7/mm2VhJD47nkE9ujBoxrsUjN3I7nfG2QRZRqZu3sObg9N4fUZ/uvfoz4OrTES+/DVbaihTH/433lkcRvyC6bwuSzk3e4axS1gclcaaBSvKekFqPZ8jmPfOaww3v83EPh3pPHgyq0z38s570wi1vRiFzuf9zUsITnya0X260H3YY2zzX8KWxY29uquRmZv38OZgCxsWjGdg3zsYes8jvB53CfeaEhsN0by5ew/PRaaxYdF4hg4ewsQZL5LoP4stez+j9rhdT+Ti5xlr+YhFz9pM4S5IYu2UAQwabPtvOqtPN8SxCjUV7Pqr3d91AAMX7Cj/2xsY8cbX/N8YC2tn9Kd7j55MXJXE2LXrmFTjiEgEM99YQnjS0wzt0ZFBc7c2ei+3YexrvD83gL0L+tM9pCdjFu0keNnXPDfYtqUaiYq0sHnu7xnU9w769L2DHqGB+IWMZ03FiEEd74VaoyssKLUqWWBOLs3iSUWOQ1vkOLRFjkNb5Di0pXGOI4GXBo1i2+B1vL945PWhIktaAhtmjGKh+2uc3nJfgyYOK/n3aII9K0IIIYSoJGkHmxLDmDr310AFQB8QQWQPQ81ToJsACVaEEEKIps4/jHBDAhuWb+VkWtmMPnPaSeI2PMLstWbGThnZpKfsN8EEWyGEEEJUYhjHK9vNLFy0lDE9JpOcCe7+AYSGRzPpvR+ZN6JpryIqwYoQQgjRDBjCp/Hm9mlqV6NRyDCQEEIIITRNghUhhBBCaJoEK0IIIYTQNAlWhBBCCKFpEqwIIYQQQtNkNpAQQghxg05/+hwf/ly+4FpxMcUuLmU3Vhc/+k+fx/D2N7jj7FOcMHegSwePBqpp0ybBihBCCHGDOk9YyJIJANnsX/Mqpwc9wwNdXG96vxkJ37CXiRKslJNgRQghhGgsRZf5afsW9vw3g2I8uOX20dwVFYI3l/lhzTpO95nJQz1bA9kc+fCffNthCpMM37Pp23NccVnHysMetB80nUk9fdQ+ElVJsCKEEEI0iiLOfb2OPZah/OmxXrQmlb3r1vHV0Xn8qV87BtzzO06s28x+40y6nN/K7pzfMXVQIH7cw52nT/GV33RmD2qn9kFogiTYCiGEEI3iHAdOutJ9SC9auwKugfTs6UfKiTPkA7QeyIRBLny7+V98uDuf/vcMxE/lGmuV9KwIIYQQjaEom2xLBic2vsjRim3Fxbj4WSgu/8/WEQPpuGcdJ4zT6dNapXo2ARKsCCGEEI3B1QcfvR+DpsxjsE2XSU4ueANQxMU9Ozgb0Bdj2g52n+vInR0qknPl9mxLhoGEEEKIRtGBnmH5HNh9iPSi8k35GVzNKfuPonM72fSzH2PvGc+EMR04/dkXnC3/nN7blZyL6WXDRUKCFSGEEKJxuNJx1HSGeR9iw2tLee4fS3nurY0cTLVA0Rm+/uwYHcaMo7MHeHQczVjjWT7dfop8oH2fP9AxbSuvvvQq7x7IUPtAVKcrLCi1KllgTi54eylZYuOQ49AWOQ5tkePQFjkObZHjqD/pWRFCCCGEpkmwIoQQQghNk2BFCCGEEJomwYoQQgghNE2CFSGEEEJomgQrQgghhNA0CVaEEEIIoWkSrAghhBBC0/4f1ZR3ya0xc5cAAAAASUVORK5CYII="
+            }
+        ]
+    }
+}
diff --git a/cypress/fixtures/expression_with_paired_item_in_multi_input_node.json b/cypress/fixtures/expression_with_paired_item_in_multi_input_node.json
new file mode 100644
index 0000000000000..ffb7005f4fbd8
--- /dev/null
+++ b/cypress/fixtures/expression_with_paired_item_in_multi_input_node.json
@@ -0,0 +1,156 @@
+{
+	"meta": {
+		"instanceId": "abc"
+	},
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "bcb6abdf-d34b-4ea7-a8ed-58155b708c43",
+			"name": "When clicking \"Test workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [
+				20,
+				260
+			]
+		},
+		{
+			"parameters": {
+				"jsCode": "// Loop over input items and add a new field\n// called 'myNewField' to the JSON of each one\nfor (const item of $input.all()) {\nitem.json.message_count = Math.min(item.json.messages.length, 3);\n}\n\nreturn $input.all();"
+			},
+			"id": "59c3889c-3671-4f49-b258-6131df8587d8",
+			"name": "Set thread properties1",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [
+				500,
+				520
+			]
+		},
+		{
+			"parameters": {
+				"resource": "thread",
+				"operation": "get",
+				"threadId": "={{ $json.id }}",
+				"options": {}
+			},
+			"id": "e102b72e-1e47-4004-a6b9-38cef75f44a1",
+			"name": "Get thread details1",
+			"type": "n8n-nodes-base.gmail",
+			"typeVersion": 2,
+			"position": [
+				300,
+				520
+			]
+		},
+		{
+			"parameters": {
+				"mode": "expression",
+				"output": "={{ $('Set thread properties1').item.json.message_count }}"
+			},
+			"id": "f3e42f07-df82-42ba-8e99-97cda707a9d9",
+			"name": "Switch1",
+			"type": "n8n-nodes-base.switch",
+			"typeVersion": 1,
+			"position": [
+				1220,
+				540
+			]
+		},
+		{
+			"parameters": {
+				"conditions": {
+					"boolean": [
+						{
+							"value1": true,
+							"value2": true
+						}
+					]
+				}
+			},
+			"id": "c7fe521e-8c02-44bf-8a14-482b39749508",
+			"name": "IF",
+			"type": "n8n-nodes-base.if",
+			"typeVersion": 1,
+			"position": [
+				720,
+				520
+			]
+		},
+		{
+			"parameters": {},
+			"id": "3b9f6a05-7f19-46c5-95d1-5dec732f00ae",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [
+				960,
+				400
+			]
+		}
+	],
+	"connections": {
+		"When clicking \"Test workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Get thread details1",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Set thread properties1": {
+			"main": [
+				[
+					{
+						"node": "IF",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Get thread details1": {
+			"main": [
+				[
+					{
+						"node": "Set thread properties1",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"IF": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				],
+				[
+					{
+						"node": "Switch1",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"No Operation, do nothing": {
+			"main": [
+				[
+					{
+						"node": "Switch1",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	}
+}
diff --git a/cypress/fixtures/manual-partial-execution.json b/cypress/fixtures/manual-partial-execution.json
new file mode 100644
index 0000000000000..9e43cd525bef0
--- /dev/null
+++ b/cypress/fixtures/manual-partial-execution.json
@@ -0,0 +1,107 @@
+{
+  "meta": {
+    "templateCredsSetupCompleted": true
+  },
+  "nodes": [
+    {
+      "parameters": {
+        "options": {}
+      },
+      "id": "f4467143-fdb9-46fa-8020-6417cc5eea7d",
+      "name": "Edit Fields",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.3,
+      "position": [
+        1140,
+        260
+      ]
+    },
+    {
+      "parameters": {
+        "path": "30ff316d-405f-4288-a0ac-e713546c9d4e",
+        "options": {}
+      },
+      "id": "4760aafb-5d56-4633-99d3-7a97c576a216",
+      "name": "Webhook1",
+      "type": "n8n-nodes-base.webhook",
+      "typeVersion": 2,
+      "position": [
+        680,
+        340
+      ],
+      "webhookId": "30ff316d-405f-4288-a0ac-e713546c9d4e"
+    },
+    {
+      "parameters": {
+        "articleId": "123",
+        "additionalFields": {}
+      },
+      "id": "8c811eca-8978-44d9-b8f7-ef2c7725784c",
+      "name": "Hacker News",
+      "type": "n8n-nodes-base.hackerNews",
+      "typeVersion": 1,
+      "position": [
+        920,
+        260
+      ]
+    },
+    {
+      "parameters": {
+        "path": "4a3398e4-1388-4e10-9d21-add90b804955",
+        "options": {}
+      },
+      "id": "1c2c2d06-45c9-4712-9fa0-c655bef8d0e5",
+      "name": "Webhook",
+      "type": "n8n-nodes-base.webhook",
+      "typeVersion": 2,
+      "position": [
+        680,
+        180
+      ],
+      "webhookId": "4a3398e4-1388-4e10-9d21-add90b804955"
+    }
+  ],
+  "connections": {
+    "Webhook1": {
+      "main": [
+        [
+          {
+            "node": "Hacker News",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Hacker News": {
+      "main": [
+        [
+          {
+            "node": "Edit Fields",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Webhook": {
+      "main": [
+        [
+          {
+            "node": "Hacker News",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "pinData": {
+    "Webhook": [
+      {
+        "name": "First item",
+        "code": 1
+      }
+    ]
+  }
+}
diff --git a/cypress/fixtures/open_node_creator_for_connection.json b/cypress/fixtures/open_node_creator_for_connection.json
new file mode 100644
index 0000000000000..78827d4083fd1
--- /dev/null
+++ b/cypress/fixtures/open_node_creator_for_connection.json
@@ -0,0 +1,110 @@
+{
+  "name": "open_node_creator_for_connection",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "25ff0c17-7064-4e14-aec6-45c71d63201b",
+      "name": "When clicking \"Test workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        740,
+        520
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "49f376ca-845b-4737-aac0-073d0e4fa95c",
+      "name": "Token Splitter",
+      "type": "@n8n/n8n-nodes-langchain.textSplitterTokenSplitter",
+      "typeVersion": 1,
+      "position": [
+        1180,
+        540
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "d1db5111-4b01-4620-8ccb-a16ea576c363",
+      "name": "Memory",
+      "type": "@n8n/n8n-nodes-langchain.memoryXata",
+      "typeVersion": 1.2,
+      "position": [
+        940,
+        540
+      ],
+      "credentials": {
+        "xataApi": {
+          "id": "q1ckaYlHTWCYDtF0",
+          "name": "Xata Api account"
+        }
+      }
+    },
+    {
+      "parameters": {},
+      "id": "b08b6d3a-bef8-42ac-9cef-ec9d4e5402b1",
+      "name": "Output Parser",
+      "type": "@n8n/n8n-nodes-langchain.outputParserStructured",
+      "typeVersion": 1.1,
+      "position": [
+        1060,
+        540
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "ee557938-9cf1-4b78-afef-c783c52fd307",
+      "name": "Tool",
+      "type": "@n8n/n8n-nodes-langchain.toolWikipedia",
+      "typeVersion": 1,
+      "position": [
+        1300,
+        540
+      ]
+    },
+    {
+      "parameters": {
+        "options": {}
+      },
+      "id": "814f2e9c-cc7b-4f3c-89b4-d6eb82bc24df",
+      "name": "Embeddings",
+      "type": "@n8n/n8n-nodes-langchain.embeddingsHuggingFaceInference",
+      "typeVersion": 1,
+      "position": [
+        1420,
+        540
+      ]
+    },
+    {
+      "parameters": {
+        "tableName": {
+          "__rl": true,
+          "mode": "list",
+          "value": ""
+        },
+        "options": {}
+      },
+      "id": "e8569b0b-a580-4249-9c5e-f1feed5c644e",
+      "name": "Vector Store",
+      "type": "@n8n/n8n-nodes-langchain.vectorStoreSupabase",
+      "typeVersion": 1,
+      "position": [
+        1540,
+        540
+      ]
+    }
+  ],
+  "pinData": {},
+  "connections": {},
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "8e90604c-f7e9-489d-8e43-1cc699b7db04",
+  "meta": {
+    "templateCredsSetupCompleted": true,
+    "instanceId": "27cc9b56542ad45b38725555722c50a1c3fee1670bbb67980558314ee08517c4"
+  },
+  "id": "L3tgfoW660UOSuX6",
+  "tags": []
+}
\ No newline at end of file
diff --git a/cypress/fixtures/templates_search/all_templates_search_response.json b/cypress/fixtures/templates_search/all_templates_search_response.json
new file mode 100644
index 0000000000000..5a0a1eb5ad5b1
--- /dev/null
+++ b/cypress/fixtures/templates_search/all_templates_search_response.json
@@ -0,0 +1,1071 @@
+{
+	"totalWorkflows": 506,
+	"workflows": [
+			{
+					"id": 60,
+					"name": "test1 test1",
+					"totalViews": 120000000,
+					"recentViews": 0,
+					"user": {
+							"username": "admin"
+					},
+					"createdAt": "2019-08-30T16:39:31.362Z",
+					"nodes": [
+							{
+									"id": 11,
+									"icon": "file:amqp.png",
+									"name": "n8n-nodes-base.amqpTrigger",
+									"defaults": {
+											"name": "AMQP Trigger"
+									},
+									"iconData": {
+											"type": "file",
+											"fileBuffer": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAB7UlEQVRoge2W4W3CMBCFj26QjkBHSEdIR4AR6Ah0BBgBRqAjhBFgBBghHaEVlV29PN0lDr+o9D7JEjhn+975bJ8JIYQQQgghhBBCCCGEEA9CY2bf0NaBW2uyu7UN2XSOzTyY60J2BzNbObbsH7eTmS2mhHJHE1wmCD7A93ngEAquHaHc2omCcysSXQW74g32BHfwfTEiuCoQm9vuDsEndPYpELxKjjBj0foCEXX6XdM3by3c7aOZPZvZzMzeaBzbIh9pzIuZXaG/RqNIMAq7Ur8XCHQ2kx3LC56DMQ39X4LI23zbAd88ruRHD09wTVF5p+/eBZI5g7O8w5FgXOvsZAI7PxRwS4HGIPbm8wRjBL/Sgp/QNyQYHWySmOxgJBgFeGnPfZHgDVyufET+YMEVCdo7gziCTBbGmRKlGQpCMXOnj+1L6B0JFsxndO3cjjZyjo6OnZeqGb5gqhTQS3qKeK1SwbesfB3IrF/awqu+g8Dgs5SLE37SciHiPUv8rLVp7k2wdl63tDDqgTs8lqpINWGXbSTKe9rlJgXME7C9I6V7oGAWsEzv2gzeN2TstkbCZyIJWBYKWUwtF4foKGU9TpRGdZDSdVDpDNXSVVBLt5TeucS9K6X/E3USX3rshBBCCCGEEEIIIYQQ4tExsx8PuuPnwhCIbgAAAABJRU5ErkJggg=="
+									},
+									"categories": [
+											{
+													"id": 5,
+													"name": "Development"
+											},
+											{
+													"id": 6,
+													"name": "Communication"
+											}
+									],
+									"displayName": "AMQP Trigger",
+									"typeVersion": 1
+							},
+							{
+									"id": 18,
+									"icon": "file:autopilot.svg",
+									"name": "n8n-nodes-base.autopilot",
+									"defaults": {
+											"name": "Autopilot"
+									},
+									"iconData": {
+											"type": "file",
+											"fileBuffer": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjM4IDI2IDM1IDM1Ij48Y2lyY2xlIGN4PSI1MCIgY3k9IjUwIiByPSI0MCIgc3Ryb2tlPSIjMThkNGIyIiBzdHJva2Utd2lkdGg9IjMiIGZpbGw9IiMxOGQ0YjIiLz48cGF0aCBmaWxsPSIjZmZmIiBkPSJNNDUuNCA0Mi42aDE5LjlsMy40LTQuOEg0MmwzLjQgNC44em0zLjEgOC4zaDEzLjFsMy40LTQuOEg0NS40bDMuMSA0Ljh6bTU0LS43Ii8+PC9zdmc+"
+									},
+									"categories": [
+											{
+													"id": 1,
+													"name": "Marketing"
+											}
+									],
+									"displayName": "Autopilot",
+									"typeVersion": 1
+							},
+							{
+									"id": 20,
+									"icon": "file:lambda.svg",
+									"name": "n8n-nodes-base.awsLambda",
+									"defaults": {
+											"name": "AWS Lambda"
+									},
+									"iconData": {
+											"type": "file",
+											"fileBuffer": "data:image/svg+xml;base64,PHN2ZyBoZWlnaHQ9IjI1MDAiIHZpZXdCb3g9Ii0zLjAyMyAtMC4yMiA0MjAuOTIzIDQzMy41NCIgd2lkdGg9IjI0NDMiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PHBhdGggZD0iTTIwOC40NSAyMjcuODljLTEuNTkgMi4yNi0yLjkzIDQuMTItNC4yMiA2cS0zMC44NiA0NS40Mi02MS43IDkwLjgzLTI4LjY5IDQyLjI0LTU3LjQ0IDg0LjQzYTMuODggMy44OCAwIDAxLTIuNzMgMS41OXEtNDAuNTktLjM1LTgxLjE2LS44OGMtLjMgMC0uNjEtLjA5LTEuMi0uMThhMTQuNDQgMTQuNDQgMCAwMS43Ni0xLjY1cTI4LjMxLTQzLjg5IDU2LjYyLTg3Ljc2IDI1LjExLTM4Ljg4IDUwLjI1LTc3Ljc0IDI3Ljg2LTQzLjE4IDU1LjY5LTg2LjQyYzIuNzQtNC4yNSA1LjU5LTguNDIgOC4xOS0xMi43NWE1LjI2IDUuMjYgMCAwMC41Ni0zLjgzYy01LTE1Ljk0LTEwLjEtMzEuODQtMTUuMTktNDcuNzQtMi4xOC02LjgxLTQuNDYtMTMuNTgtNi41LTIwLjQzLS42Ni0yLjItMS43NS0yLjg3LTQtMi44Ni0xNyAuMDctMzMuOS4wNS01MC44NS4wNS0zLjIyIDAtMy4yMyAwLTMuMjMtMy4xOCAwLTIwLjg0IDAtNDEuNjgtLjA2LTYyLjUyIDAtMi4zMi43Ni0yLjg0IDIuOTQtMi44NHE1MS4xOS4wOSAxMDIuNCAwYTMuMjkgMy4yOSAwIDAxMy42IDIuNDNxMjcgNjcuOTEgNTQgMTM1Ljc3IDMxLjUgNzkuMTQgNjMgMTU4LjNjNi41MiAxNi4zOCAxMy4wOSAzMi43NSAxOS41NCA0OS4xNy43NyAyIDEuNTcgMi4zOCAzLjU5IDEuNzYgMTcuODktNS41MyAzNS44Mi0xMC45MSA1My43LTE2LjQ1IDIuMjUtLjcgMy4wNy0uMjMgMy43NyAyIDYuMSAxOS4xNyAxMi4zMiAzOC4zIDE4LjUgNTcuNDUuMjEuNjYuMzcgMS4zMy42MiAyLjI1LTEuMjguNDctMi40OCAxLTMuNzEgMS4zNHEtNjEgMTkuMzMtMTIxLjkzIDM4LjY4Yy0xLjk0LjYxLTIuNTItLjA1LTMuMTctMS42OHEtMTguNjEtNDcuMTYtMzcuMzEtOTQuMjgtMTguMjktNDYuMTQtMzYuNi05Mi4yOGMtMS44My00LjYyLTMuNjMtOS4yNi01LjQ2LTEzLjg4LS4yOS0uNzktLjY5LTEuNDgtMS4yNy0yLjd6IiBmaWxsPSIjZmE3ZTE0Ii8+PC9zdmc+"
+									},
+									"categories": [
+											{
+													"id": 5,
+													"name": "Development"
+											}
+									],
+									"displayName": "AWS Lambda",
+									"typeVersion": 1
+							},
+							{
+									"id": 40,
+									"icon": "file:clearbit.svg",
+									"name": "n8n-nodes-base.clearbit",
+									"defaults": {
+											"name": "Clearbit"
+									},
+									"iconData": {
+											"type": "file",
+											"fileBuffer": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI3MiIgaGVpZ2h0PSI3MiI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJhIiB4MT0iNTAlIiB4Mj0iMTAwJSIgeTE9IjAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI0RFRjJGRSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI0RCRjFGRSIvPjwvbGluZWFyR3JhZGllbnQ+PGxpbmVhckdyYWRpZW50IGlkPSJiIiB4MT0iMCUiIHgyPSI1MCUiIHkxPSIwJSIgeTI9IjEwMCUiPjxzdG9wIG9mZnNldD0iMCUiIHN0b3AtY29sb3I9IiM1N0JDRkQiLz48c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiM1MUI1RkQiLz48L2xpbmVhckdyYWRpZW50PjxsaW5lYXJHcmFkaWVudCBpZD0iYyIgeDE9IjM3LjUlIiB4Mj0iNjIuNSUiIHkxPSIwJSIgeTI9IjEwMCUiPjxzdG9wIG9mZnNldD0iMCUiIHN0b3AtY29sb3I9IiMxQ0E3RkQiLz48c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiMxNDhDRkMiLz48L2xpbmVhckdyYWRpZW50PjwvZGVmcz48ZyBmaWxsPSJub25lIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiPjxwYXRoIGZpbGw9InVybCgjYSkiIGQ9Ik03MiAzNnYxNi43N2wtLjAwNC44NjhjLS4wNiA2LjAzNS0uNzUgOC4zNTMtMiAxMC42ODhhMTMuNjMgMTMuNjMgMCAwMS01LjY3IDUuNjdsLS4zMjYuMTcxQzYxLjY1OCA3MS4zNjQgNTkuMTYgNzIgNTIuNzcgNzJIMzZWMzZoMzZ6Ii8+PHBhdGggZmlsbD0idXJsKCNiKSIgZD0iTTY0LjMyNiAyLjAwM2ExMy42MyAxMy42MyAwIDAxNS42NyA1LjY3bC4xNzEuMzI3QzcxLjM2NCAxMC4zNDIgNzIgMTIuODQgNzIgMTkuMjNWMzZIMzZWMGgxNi43N2M2LjY4NyAwIDkuMTEyLjY5NiAxMS41NTYgMi4wMDN6Ii8+PHBhdGggZmlsbD0idXJsKCNjKSIgZD0iTTM2IDB2NzJIMTkuMjNsLS44NjgtLjAwNGMtNi4wMzUtLjA2LTguMzUzLS43NS0xMC42ODgtMmExMy42MyAxMy42MyAwIDAxLTUuNjctNS42N0wxLjgzMiA2NEMuNjM2IDYxLjY1OCAwIDU5LjE2IDAgNTIuNzdWMTkuMjNjMC02LjY4Ny42OTYtOS4xMTIgMi4wMDMtMTEuNTU2YTEzLjYzIDEzLjYzIDAgMDE1LjY3LTUuNjdMOCAxLjgzMkMxMC4zNDIuNjM2IDEyLjg0IDAgMTkuMjMgMEgzNnoiLz48L2c+PC9zdmc+"
+									},
+									"categories": [
+											{
+													"id": 2,
+													"name": "Sales"
+											}
+									],
+									"displayName": "Clearbit",
+									"typeVersion": 1
+							},
+							{
+									"id": 51,
+									"icon": "file:convertKit.svg",
+									"name": "n8n-nodes-base.convertKitTrigger",
+									"defaults": {
+											"name": "ConvertKit Trigger"
+									},
+									"iconData": {
+											"type": "file",
+											"fileBuffer": "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTcyIiBoZWlnaHQ9IjE2MCIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cGF0aCBkPSJNODIuNzIgMTI2LjMxNmMyOS43NyAwIDUyLjc4LTIyLjYyMiA1Mi43OC01MC41MjYgMC0yNi4xNDMtMjEuNjE3LTQyLjEwNi0zNS45MzUtNDIuMTA2LTE5Ljk0NSAwLTM1LjkzIDE0LjA4NC0zOC4xOTggMzQuOTg4LS40MTggMy44NTYtMy40NzYgNy4wOS03LjM1NSA3LjA2MS02LjQyMy0uMDQ2LTE1Ljc0Ni0uMS0yMS42NTgtLjA4LTIuNTU1LjAwOC00LjY2OS0yLjA2NS00LjU0My00LjYxOC44OS0xOC4xMjMgNi45MTQtMzUuMDcgMTguNDAyLTQ4LjA4N0M1OC45NzYgOC40ODggNzcuNTYxIDAgOTkuNTY1IDBjMzYuOTY5IDAgNzEuODY5IDMzLjc4NiA3MS44NjkgNzUuNzkgMCA0Ni41MDgtMzguMzEyIDg0LjIxLTg3LjkyNyA4NC4yMS0zNS4zODQgMC03MS4wMjEtMjMuMjU4LTgzLjQ2NC01NS43NzVhLjcwMi43MDIgMCAwMS0uMDMtLjM3N2MuMTY1LS45NjIuNDk0LTEuODQxLjgxOC0yLjcwNy40NzEtMS4yNTguOTMxLTIuNDg4Ljg2NC0zLjkwNmwtLjIxNS00LjUyOWE1LjUyMyA1LjUyMyAwIDAxMy4xOC01LjI2M2wxLjc5OC0uODQyYTYuOTgyIDYuOTgyIDAgMDAzLjkxMi01LjA3NSA2Ljk5MyA2Ljk5MyAwIDAxNi44ODctNS43MzZjNS4yODIgMCA5Ljg3NSAzLjUxNSAxMS41OSA4LjUxMiA4LjMwNyAyNC4yMTIgMjEuNTExIDQyLjAxNCA1My44NzMgNDIuMDE0eiIgZmlsbD0iI0ZCNjk3MCIvPjwvc3ZnPg=="
+									},
+									"categories": [
+											{
+													"id": 1,
+													"name": "Marketing"
+											},
+											{
+													"id": 2,
+													"name": "Sales"
+											}
+									],
+									"displayName": "ConvertKit Trigger",
+									"typeVersion": 1
+							}
+					]
+			},
+			{
+					"id": 25,
+					"name": "test1 test1",
+					"totalViews": 120000000,
+					"recentViews": 0,
+					"user": {
+							"username": "admin"
+					},
+					"createdAt": "2019-08-18T18:17:58.358Z",
+					"nodes": [
+							{
+									"id": 15,
+									"icon": "file:affinity.png",
+									"name": "n8n-nodes-base.affinity",
+									"defaults": {
+											"name": "Affinity"
+									},
+									"iconData": {
+											"type": "file",
+											"fileBuffer": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAMAAAANIilAAAAC/VBMVEUAAAAtTfMvVekpSN8rR+g2POglUecfWuY0PukdXeUoTucrS+c2POkfW+VGJusyQeghWOcjVecmUecNceQgWeY4OegiV+YeXOYxQ+gXZeUuR+gmUuc9MuoZYeZHJuszP+g4OulFKOsTauQpS+c7Ou02O+kvRegiVuZBLuoMdOQoTeoQbuQ9NekVaOVHJesQbeQhWOctR+gTauUyQuk9L+wqS+cjVeY0PugyQeg7NekXZeVDK+pHJesgWeYqTOglUugcYeg0PukNceRDK+tGJ+pFKOsyQeg4OekrSec2O+kyQOgkVOYOceQjVechWOY6NuglUecQbuQtSOchV+cxQek9MelAMOkcX+ZDKetEK+otR+dCL+oPZ+IcX+YSbOQ5OOgyQegKdeQUaeU3O+gcX+U2O+kdXeYgWuYmUeYZY+ZFJ+onT+gjVOcSbORFKesKdeMcXeYPbuMYZOQNbOYlUuYyQegcXuU4OehEKeopTechV+dHJusnUOdHJus0PukOceRGJuoPbeQyQegjVeY3O+kpTudGJ+svR+c6N+kcXuUVZ+VGJuoLdOMzQOgLdOQvRegKdeQPceQdXeQqTOZBLegQb+UiVuYeXOQlU+dBLelBLukPcOQTauQdXOUsSuYLd+MvR+hEK+otR+dDLOpHJusPceUiVeczQOkiVuU1Pek2POkgWOYeW+UfWucgY/c2RPcjXfQ3OugkVOc7PfU6NulMKfw4Q/kzQOlLKPgqTektSOclW/ZJKPM1Qe4iWu0YZegsUfUPePIkWvI2QfIeYe85O+1HJ+0tSeowRepAL+kiV+cySvgjXvYRdvQxSfMsTvAxRe09Ne0VbewMc+RILvsvTvk1Rvk7P/lDM/knWPcqVPYWb/Q6PfInVfAnU+xHJuseXuojV+obYOYZavQ3QfQMffMTcvNELvNAMvALe+8Odu8aZu0Mduo9M+oQcOkoUOgLdeU/OflIK/chYfY8OPIgXu8wQ+g8P/wsVPoeZfU6Ou8vSu5BL+0hWugSbea5VKRRAAAAqXRSTlMAAgQFBvkQ/fv+/f37+fv7+/v++/ng2b79/fz7/f35vfz7+0UV/fz8+/sj+Qv+/f38ek0uF/jtqIx1cGZfUU8eF/39/PTj4tvOy8Ozp5OIhnl4b2JQT0tGRDc1HA358O7p5NjU0sW6q6V5eG9rZlRDPDIuE/f26+ba2tHLx7+9urWuoaCamJeXlZGLin5kYllXKe/u6unf3dXTz8/Ix8XBurmdnJqVfnNZVQrS8AAABtNJREFUSMfllndQE0EUxveSCwES0rBEAggoRQRBwYqKvffee++99957712pwUgkVAGlSUdQsYJSLAj2ruPbC2HvxPFvZ9xMkne7+7tv79379g79K42ieHw+j6L+OMDjUX9DeYaITOMeUpV5gtIe/bZv7+cBM/gUQeHrOai5V/NBQ5kj0thTPDZ2SFSr1QU+HZs4I2Sg+QjNON0uQqfVRbRb3pwiNJulNyYkZyiVUqlxSOQdcU+9Bv4dfCT7bbytrURS77FOu2gQqpQSPnJenBNm4eDgIAXaWOD7qbMRdFIw0etZsZNTW1ugrSUS6wjdlN9pCnnvjW4YZhGWlpx2+3ZBa+PWgjtVayMKPk3vJjklOX3Pzn6r1UZIHksk2q2I4rK8xdENQ0XpCafq79xZv0vkdWMfwZWqnsgFNX1jaZmUdHffWa8ZXhvaax/Xq2etbY74nAvu/hnY6BMe+uPBY9UCH8GDhWOrds58ZWn56llPF6afnvI4XlIv3noo0YbIWaEwNY2eBCEfqgRWW/OqwEcc9+Dr++Bgy8zM/pAUPACntY4H6XMgR7LVI1elergMR3oFhGqqjX3sbS7bBAdnZg5CNKVXodGMCEh6O0+DNP4/9FCleDQEWNLVBa7b9/Lly8HBAxDN0lmlk0h0cNVk1Y4aECYXgrWb3Db2wXTcSBfErrYBOom1dgMEho6BUY7y3B4QEAWApSFA28ctdOHcF8928da65RAY4BZBjvLwaSyYAlgtDQHaPm7kUMRnwS7tI6wjlkJEYHdHBiYeqZ+m/BgCteYjfgDVwmfD8RimKuBZH4RVUrpDQNhkh4/KELX6OtBXME3yYxtvq1vFynYrsx+yqGps3RyLMIeM+Y3XdMbVQmj488q2tdVuZa/l+AehLOgSog1stCjMIjGxFhxBtRAa6x0ubtv27QDEI6ltFmgmjGrUCiLM9ooWiUQJCbUQTXNpyGPPu05ti9vTiCLKwxbkCYUfqhkhmgfsPVORKBSzkA9CwxgfPAYWy56C+Gxj9A00868SBDRCvXJVpqahoZiFRjG0L+MxBKxlklPxIh4jTLQnYjplSa+1Ex8qFKoyPcuhO25at+k9eCzp+2BQ48CoOtCyqJTwWLlG8agMs2RzWwG0OO7OmzfB2J/9DYsmM4AW+gtljnKNRqMoZ4m2Wuxrb2ODPUZYDj3hhom/n9/Nm/LYvhUs8ZgYTII91p+McbZAExN/TJMyJx5bd5UxqM37jiRXHOlWw5+Y+Af4+cnCL3BhOGqsZgxq87Ujjw2Tmpz8EqRBWxbUArS4q1qjZgxKPMZpwD61emICLUAYtQT2bA7bJ0MZEmLc2t7XhniMy9awsnpyIy9PGCBLqYZpsqY+yR+VypDIyEixL+Mx6rd1Tb9fo0aNa8PHLdhzQxiAa41sNMDCoyRR2WFUB8i54MpYqGyO7uwsV2CvDURGwyYEmulpvmHNOdhjGf0oI5qptU+N2TBFoWP37VyBZeSqExqveSr2Z8K3fszUFWqBr80VliMhalBk5+qa1QDRMJvQjI+mYo8lfGuJaAqPjS8Qix+M5+ynq4vs7O5vARYam0aYBY+ltzSMec73sbeP82DRw/aXuv0cMRd6uPTarpMeKRSExbXW86pYfKcp4pN0lbrVLeqGKTYtiwqPjZUrFGWPKlg4/ZBIePxCysglv3Crm9obQ4R+JwwQyuRyjVxDWAwbjYoUFIxnbb27YszNU6dDwKbhfoPFwKC4WAlMd4g0vt4ZIqIMMCizfdQj0AxbzD2/Ea4JtnKG9HoXlvLs123MY1Zzn1Wbv5hhgwJsxIGHZCil6sbsbI8uMb9VtxWrhwZ4OGPvfLwjs5+eyVLp7Yuki4e6FdYxjzlPcgo7+UvGY0I/9yhcLRWst0WiUpkI95nAM5/XudXmxQ6gKEBharOnVthjN7DH9LVGQYHRiNcpzcIhrSanuNFJoG+V9DZ0bMH+vGY1btxB7LHYA0PK+507pVuEWaTVYqUHwt2vX4N2zNHpu+fOndNsDOPPly2g0qu/w9WSP2mgt5F3rfWm6aKwhjlnAOD4eVch0OYvUt1GjPhZlGXnCmwDRDH7eRU/95vhsfMazXt4L9RU1DCnE8XxM9be8bykTh1z8zalpW520LJcG5T7aEKgUObu6KjJ16hU8ML1uZMLYUnSRheWAF0XmlvW/TFz9HcD6B557344QqXKVaqye+nrEWFZK6e3jX5eGBMTk5qaNaYZ0rPMzDkTq6SkBMWG5+aqus6qzJZr0DO3dVu5sltvmMF5QUHefbt3rd61e19n8tZfWZyEnC2OJJfiolx1Pg8av9LZKdzHvJX+7+0X6aNkPIGC7jsAAAAASUVORK5CYII="
+									},
+									"categories": [
+											{
+													"id": 2,
+													"name": "Sales"
+											}
+									],
+									"displayName": "Affinity",
+									"typeVersion": 1
+							},
+							{
+									"id": 21,
+									"icon": "file:comprehend.svg",
+									"name": "n8n-nodes-base.awsComprehend",
+									"defaults": {
+											"name": "AWS Comprehend"
+									},
+									"iconData": {
+											"type": "file",
+											"fileBuffer": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA3NSA3NSI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJhIiB4MT0iNjE3LjQ2IiB5MT0iLTY3NC41MyIgeDI9IjcyMy41MyIgeTI9Ii01NjguNDYiIGdyYWRpZW50VHJhbnNmb3JtPSJyb3RhdGUoLTkwIDY4My41IDI0LjUpIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+PHN0b3Agb2Zmc2V0PSIwIiBzdG9wLWNvbG9yPSIjMDU1ZjRlIi8+PHN0b3Agb2Zmc2V0PSIxIiBzdG9wLWNvbG9yPSIjNTZjMGE3Ii8+PC9saW5lYXJHcmFkaWVudD48L2RlZnM+PHBhdGggZGF0YS1uYW1lPSJUdXJxdW9pc2UgR3JhZGllbnQiIGQ9Ik0wIDBoNzV2NzVIMHoiIGZpbGw9InVybCgjYSkiLz48cGF0aCBkPSJNNDQuNSAzNC4ydi05LjdhMSAxIDAgMDAtLjI5LS43MWwtMTEtMTFhMSAxIDAgMDAtLjcxLS4yOWgtMTlhMSAxIDAgMDAtMSAxdjQzYTEgMSAwIDAwMSAxaDMwYTEgMSAwIDAwMS0xdi00LjQ0YTExLjggMTEuOCAwIDAxLTItMi4zdjUuNzRoLTI4di00MWgxN3YxMGExIDEgMCAwMDEgMWgxMHYxMWExMS41NiAxMS41NiAwIDAxMi0yLjN6bS0xMS0xMC43di03LjU5bDcuNTkgNy41OXptLTEwIDhoLTZ2LTJoNnptMTYgMGgtMTR2LTJoMTR6bTAgNmgtMjJ2LTJoMjJ6bTE1LjQ0IDI1aC00Ljg4YTEgMSAwIDAxLS45My0uNjJsLTEuMjEtM2ExIDEgMCAwMS4wOS0uOTQgMSAxIDAgMDEuODMtLjQ0aDcuMzJhMSAxIDAgMDEuODMuNDQgMSAxIDAgMDEuMDkuOTRsLTEuMjEgM2ExIDEgMCAwMS0uOTMuNjJ6bS00LjIxLTJoMy41NGwuNC0xaC00LjM0em0xMS42NC0xOWExMCAxMCAwIDAwLTE5Ljg3IDEuNjIgMTAgMTAgMCAwMDQuMjggOC4yIDMuODggMy44OCAwIDAxLjcyLjU5djMuNTlhMSAxIDAgMDAxIDFoOGExIDEgMCAwMDEtMXYtMy42YTQuMzMgNC4zMyAwIDAxLjcxLS41NyA5LjkyIDkuOTIgMCAwMDQuMjktOC4yIDEwLjE5IDEwLjE5IDAgMDAtLjEzLTEuNjV6bS01LjMyIDguMmMtLjU4LjQtMS41NSAxLjA3LTEuNTUgMi4xdjIuN2gtMnYtN2gydi0yaC02djJoMnY3aC0ydi0yLjY4YzAtMS0xLTEuNzMtMS41OC0yLjE0QTggOCAwIDExNTggMzcuMzJhNy44OSA3Ljg5IDAgMDEyLjM5IDQuNDcgOCA4IDAgMDEtMy4zNCA3Ljkxek0yOC41IDI1LjVoLTExdi0yaDExem0xIDE4aC0xMnYtMmgxMnptMTAgMGgtOHYtMmg4em0tOSA2aC0xM3YtMmgxM3oiIGRhdGEtbmFtZT0iSWNvbiBUZXN0IiBmaWxsPSIjZmZmIi8+PC9zdmc+"
+									},
+									"categories": [
+											{
+													"id": 5,
+													"name": "Development"
+											}
+									],
+									"displayName": "AWS Comprehend",
+									"typeVersion": 1
+							},
+							{
+									"id": 38,
+									"icon": "file:chargebee.png",
+									"name": "n8n-nodes-base.chargebeeTrigger",
+									"defaults": {
+											"name": "Chargebee Trigger"
+									},
+									"iconData": {
+											"type": "file",
+											"fileBuffer": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAMAAAANIilAAAAAk1BMVEUAAAD9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azXS0qjqAAAAMHRSTlMAAta1CPr3HAyb8mNPLBLq5MmGZ1wi28+soEQX7pZ9dkk/MijDurCMims54b6lb1YyU8hoAAACDklEQVRIx+2V2bKiMBBAmyTs+w6CIi64O/n/rxtKJwIjJPA4Nfc8acOpTnfSAX7493G2QZN6Zeml+GwVS0xiNSXtYeBIm6lKEaJf3C5kjrvz6SioFruVTKcIJEG1D8oBa1wXUy6+w2lVxhFFuU+0j4KOjwdOjUHQnHJ/DVZ4iaXXatTo2OuhPuEWXm9fLOhxPQjldeeuyV/NqGT+su1ucZuRkt5PMRElDmCEbdK2MNcmKnaZi2EUrd7GMEHEXGMPi8mYfFruqjd2NLrE+/P9oF9nyCuW+P4JhcorcBbL4dc2WSxyEcoBe9Vi5yJlEc8RyTp7ldVo0w8rkZyzN3ddExjR4sw7TmZhzSRhEddZ3m2TRar5+3z8hDZ/xlMSnzCPnbDu9NcPhLItzKAZG0hJnHVYYhnDYtSS2RksJ+fcQi0qAbDtKXknU84oWPQJtizvxanpmcCQJ3VtiA1lUlbdzk7rfs/bzwFSVR/bsaDhjHukvvfJsbBXm8S+UboXTwfDQFjXG6S0/dde18oGrN20TI4DOzHaA3drzAJWPqVy2Fa+5qTWDn05AKJJbS+eafsHtUlRUgAHB/dkJT+ddJzI7U+3kopjVgiGUwroF7J/IWAac+7RFeo0D6X3daQCiRBNZs2XVrmDr4e2zQ1aVhrMwwl9+Z1Zzw42ptQPHZiPFJv5IXENWXGvdRhL8MN/y2+uRpQ1fWz5HAAAAABJRU5ErkJggg=="
+									},
+									"categories": [
+											{
+													"id": 8,
+													"name": "Finance & Accounting"
+											}
+									],
+									"displayName": "Chargebee Trigger",
+									"typeVersion": 1
+							},
+							{
+									"id": 42,
+									"icon": "file:clickup.svg",
+									"name": "n8n-nodes-base.clickUpTrigger",
+									"defaults": {
+											"name": "ClickUp Trigger"
+									},
+									"iconData": {
+											"type": "file",
+											"fileBuffer": "data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSItMTAgMCAxNTUgMTU1IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPjxkZWZzPjxsaW5lYXJHcmFkaWVudCB4MT0iMCUiIHkxPSI2OC4wMSUiIHkyPSI2OC4wMSUiIGlkPSJhIj48c3RvcCBzdG9wLWNvbG9yPSIjODkzMEZEIiBvZmZzZXQ9IjAlIi8+PHN0b3Agc3RvcC1jb2xvcj0iIzQ5Q0NGOSIgb2Zmc2V0PSIxMDAlIi8+PC9saW5lYXJHcmFkaWVudD48bGluZWFyR3JhZGllbnQgeDE9IjAlIiB5MT0iNjguMDElIiB5Mj0iNjguMDElIiBpZD0iYiI+PHN0b3Agc3RvcC1jb2xvcj0iI0ZGMDJGMCIgb2Zmc2V0PSIwJSIvPjxzdG9wIHN0b3AtY29sb3I9IiNGRkM4MDAiIG9mZnNldD0iMTAwJSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxnIGZpbGw9Im5vbmUiPjxwYXRoIGQ9Ik0uNCAxMTkuMTJsMjMuODEtMTguMjRDMzYuODYgMTE3LjM5IDUwLjMgMTI1IDY1LjI2IDEyNWMxNC44OCAwIDI3Ljk0LTcuNTIgNDAuMDItMjMuOWwyNC4xNSAxNy44QzExMiAxNDIuNTIgOTAuMzQgMTU1IDY1LjI2IDE1NWMtMjUgMC00Ni44Ny0xMi40LTY0Ljg2LTM1Ljg4eiIgZmlsbD0idXJsKCNhKSIvPjxwYXRoIGZpbGw9InVybCgjYikiIGQ9Ik02NS4xOCAzOS44NEwyMi44IDc2LjM2IDMuMjEgNTMuNjQgNjUuMjcuMTZsNjEuNTcgNTMuNTItMTkuNjggMjIuNjR6Ii8+PC9nPjwvc3ZnPg=="
+									},
+									"categories": [
+											{
+													"id": 4,
+													"name": "Productivity"
+											},
+											{
+													"id": 6,
+													"name": "Communication"
+											}
+									],
+									"displayName": "ClickUp Trigger",
+									"typeVersion": 1
+							}
+					]
+			},
+			{
+					"id": 16,
+					"name": "Create dynamic Twitter Profile Banner",
+					"totalViews": 120000,
+					"recentViews": 0,
+					"user": {
+							"username": "admin"
+					},
+					"createdAt": "2022-01-10T14:15:25.921Z",
+					"nodes": []
+			},
+			{
+					"id": 1073,
+					"name": "Scrape and Store Data from Multiple Pages Websites",
+					"totalViews": 2476,
+					"recentViews": 0,
+					"user": {
+							"username": "admin"
+					},
+					"createdAt": "2021-05-07T14:48:56.297Z",
+					"nodes": [
+							{
+									"id": 13,
+									"icon": "file:asana.svg",
+									"name": "n8n-nodes-base.asanaTrigger",
+									"defaults": {
+											"name": "Asana Trigger"
+									},
+									"iconData": {
+											"type": "file",
+											"fileBuffer": "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNjAiIGhlaWdodD0iNjAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PHJhZGlhbEdyYWRpZW50IGN4PSI1MCUiIGN5PSI1NSUiIGZ4PSI1MCUiIGZ5PSI1NSUiIHI9IjcyLjUwNyUiIGdyYWRpZW50VHJhbnNmb3JtPSJtYXRyaXgoLjkyNDA0IDAgMCAxIC4wMzggMCkiIGlkPSJhIj48c3RvcCBzdG9wLWNvbG9yPSIjRkZCOTAwIiBvZmZzZXQ9IjAlIi8+PHN0b3Agc3RvcC1jb2xvcj0iI0Y5NUQ4RiIgb2Zmc2V0PSI2MCUiLz48c3RvcCBzdG9wLWNvbG9yPSIjRjk1MzUzIiBvZmZzZXQ9Ijk5LjkxJSIvPjwvcmFkaWFsR3JhZGllbnQ+PC9kZWZzPjxwYXRoIGQ9Ik00NS41OTQgMjguNWMtNi45OTQuMDAzLTEyLjY2NCA1LjY3My0xMi42NjcgMTIuNjY3LjAwMyA2Ljk5NSA1LjY3MyAxMi42NjQgMTIuNjY3IDEyLjY2OCA2Ljk5NS0uMDA0IDEyLjY2NC01LjY3MyAxMi42NjctMTIuNjY4LS4wMDMtNi45OTQtNS42NzItMTIuNjY0LTEyLjY2Ny0xMi42Njd6bS0zMi45MjcuMDAxQzUuNjczIDI4LjUwNS4wMDMgMzQuMTc0IDAgNDEuMTdjLjAwMyA2Ljk5NCA1LjY3MyAxMi42NjQgMTIuNjY3IDEyLjY2NyA2Ljk5NS0uMDAzIDEyLjY2NC01LjY3MyAxMi42NjgtMTIuNjY3LS4wMDQtNi45OTUtNS42NzMtMTIuNjY0LTEyLjY2OC0xMi42Njh6TTQxLjc5IDEyLjY2N2MtLjAwMiA2Ljk5NS01LjY3MSAxMi42NjUtMTIuNjY2IDEyLjY3LTYuOTk1LS4wMDQtMTIuNjY0LTUuNjc0LTEyLjY2Ny0xMi42N0MxNi40NiA1LjY3MyAyMi4xMy4wMDMgMjkuMTIzIDBjNi45OTQuMDA0IDEyLjY2MyA1LjY3MyAxMi42NjYgMTIuNjY3eiIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoLjczMiAyLjczMikiIGZpbGw9InVybCgjYSkiIGZpbGwtcnVsZT0iZXZlbm9kZCIvPjwvc3ZnPg=="
+									},
+									"categories": [
+											{
+													"id": 4,
+													"name": "Productivity"
+											}
+									],
+									"displayName": "Asana Trigger",
+									"typeVersion": 1
+							},
+							{
+									"id": 14,
+									"icon": "file:apiTemplateIo.svg",
+									"name": "n8n-nodes-base.apiTemplateIo",
+									"defaults": {
+											"name": "APITemplate.io"
+									},
+									"iconData": {
+											"type": "file",
+											"fileBuffer": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI4MCIgaGVpZ2h0PSI4MCIgdmlld0JveD0iMCAwIDIzLjE2NyAyMS4xNjciPjxwYXRoIGZpbGw9IiM5MWJjZTUiIGQ9Ik0xOC42MTEuNTA0TDMuNDczIDExLjI0bDQuNTk3IDIuMjEzIDEuMDY2IDMuODgzIDMuMTcxLTIuMjI2IDIuODAyLjk1MXoiLz48cGF0aCBmaWxsPSIjMWYyMTJiIiBkPSJNOS4xNzIgMTcuNTk3YS4yNjQuMjY0IDAgMDEtLjI5LS4xOTJsLTEuMDM1LTMuNzY3LTQuNDg4LTIuMTZhLjI2NS4yNjUgMCAwMS0uMDM5LS40NTRMMTguNDU4LjI4OGEuMjY0LjI2NCAwIDAxLjQxLjI3NGwtMy41IDE1LjU1NmEuMjY1LjI2NSAwIDAxLS4zNDQuMTkzbC0yLjY3NC0uOTA4LTMuMDYxIDIuMTVhLjI3My4yNzMgMCAwMS0uMTE3LjA0NHptLTUuMTgtNi40MDFsNC4xOTMgMi4wMTdjLjA2OS4wMzQuMTIuMDk1LjE0LjE2OWwuOTY3IDMuNTIgMi44NjMtMi4wMWEuMjY1LjI2NSAwIDAxLjIzNy0uMDMzbDIuNTI0Ljg1NkwxOC4yIDEuMTE5eiIvPjxwYXRoIGZpbGw9IiMzYTg0YzEiIGQ9Ik05LjMzOSAxNy4wNzlsLjk0Ni0yLjkxM0wxOC42NDIuNzI4IDguMjI2IDEzLjIzNXoiLz48cGF0aCBmaWxsPSIjMWYyMTJiIiBkPSJNOS4zNTYgMTcuMjFhLjEzMi4xMzIgMCAwMS0uMTQzLS4xNzJsLjk0Ni0yLjkxM2EuMTYuMTYgMCAwMS4wMTQtLjAzbDcuMzkzLTExLjg4OC05LjQxOSAxMS4xNTZhLjEzMy4xMzMgMCAwMS0uMjAyLS4xNzFMMTguNTQuNjQyYS4xMzIuMTMyIDAgMDEuMjE0LjE1NmwtOC4zNDggMTMuNDI0LS45NDEgMi44OThhLjEzMi4xMzIgMCAwMS0uMTA5LjA5em0tMy4yMTUgMS4wNDVjLTEuMTY4LjAyOS0yLjMwMy0uMzczLTMuMDY3LTEuMjg3LS40ODUtLjU4LS42ODMtMS41NzQuMjc1LTEuNzA1Ljg1OS0uMTE5IDEuMjI5LjQ4NSAxLjQ4IDEuMTk2LjgwNCAyLjAyNi4xNiAyLjkzOC0xLjY4IDQuMjcyLS4xNDQuMDkuMDE1LjI5Ni4xNTkuMjA2IDEuMjE4LTEgMS44MjktMS40NjYgMi4xLTIuNDQ4LjEzNC0xLjM2LS40MDItMy4wOTEtMS4zODQtMy40MzYtMS4xMi0uMzgyLTIuMDYzLjUxNi0xLjQ5OSAxLjU4NS42OTkgMS4zMjQgMi4yMyAxLjkxNCAzLjY1MiAxLjg3OC4xNy0uMDA0LjEzMy0uMjY2LS4wMzYtLjI2MXoiLz48cGF0aCBmaWxsPSIjMWYyMTJiIiBkPSJNNy4yMzUgMTguMTRhMTQuOTUgMTQuOTUgMCAwMS0uNzU5LjA5Yy0uMTcuMDE3LS4xMzMuMjc5LjAzNi4yNjIuMjUzLS4wMjUuNTA3LS4wNTIuNzU4LS4wOS4xNjktLjAyNi4xMzMtLjI4OC0uMDM1LS4yNjJ6bTEuMTk0LS41MDRhOC40NiA4LjQ2IDAgMDEtLjg2NS4zNDRjLS4xNjIuMDU0LS4wNTcuMjk3LjEwNC4yNDNhOC4zNyA4LjM3IDAgMDAuODY1LS4zNDRjLjE1NC0uMDcxLjA1LS4zMTUtLjEwNC0uMjQzeiIvPjxwYXRoIGQ9Ik0xMi41OTkgMTUuMjJhLjEzMS4xMzEgMCAwMS0uMDctLjAxbC0yLjE2OC0uOTI0YS4xMzMuMTMzIDAgMDEuMTAzLS4yNDNsMi4xNjkuOTIzYS4xMzMuMTMzIDAgMDEtLjAzNC4yNTN6Ii8+PC9zdmc+"
+									},
+									"categories": [
+											{
+													"id": 1,
+													"name": "Marketing"
+											}
+									],
+									"displayName": "APITemplate.io",
+									"typeVersion": 1
+							},
+							{
+									"id": 15,
+									"icon": "file:affinity.png",
+									"name": "n8n-nodes-base.affinity",
+									"defaults": {
+											"name": "Affinity"
+									},
+									"iconData": {
+											"type": "file",
+											"fileBuffer": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAMAAAANIilAAAAC/VBMVEUAAAAtTfMvVekpSN8rR+g2POglUecfWuY0PukdXeUoTucrS+c2POkfW+VGJusyQeghWOcjVecmUecNceQgWeY4OegiV+YeXOYxQ+gXZeUuR+gmUuc9MuoZYeZHJuszP+g4OulFKOsTauQpS+c7Ou02O+kvRegiVuZBLuoMdOQoTeoQbuQ9NekVaOVHJesQbeQhWOctR+gTauUyQuk9L+wqS+cjVeY0PugyQeg7NekXZeVDK+pHJesgWeYqTOglUugcYeg0PukNceRDK+tGJ+pFKOsyQeg4OekrSec2O+kyQOgkVOYOceQjVechWOY6NuglUecQbuQtSOchV+cxQek9MelAMOkcX+ZDKetEK+otR+dCL+oPZ+IcX+YSbOQ5OOgyQegKdeQUaeU3O+gcX+U2O+kdXeYgWuYmUeYZY+ZFJ+onT+gjVOcSbORFKesKdeMcXeYPbuMYZOQNbOYlUuYyQegcXuU4OehEKeopTechV+dHJusnUOdHJus0PukOceRGJuoPbeQyQegjVeY3O+kpTudGJ+svR+c6N+kcXuUVZ+VGJuoLdOMzQOgLdOQvRegKdeQPceQdXeQqTOZBLegQb+UiVuYeXOQlU+dBLelBLukPcOQTauQdXOUsSuYLd+MvR+hEK+otR+dDLOpHJusPceUiVeczQOkiVuU1Pek2POkgWOYeW+UfWucgY/c2RPcjXfQ3OugkVOc7PfU6NulMKfw4Q/kzQOlLKPgqTektSOclW/ZJKPM1Qe4iWu0YZegsUfUPePIkWvI2QfIeYe85O+1HJ+0tSeowRepAL+kiV+cySvgjXvYRdvQxSfMsTvAxRe09Ne0VbewMc+RILvsvTvk1Rvk7P/lDM/knWPcqVPYWb/Q6PfInVfAnU+xHJuseXuojV+obYOYZavQ3QfQMffMTcvNELvNAMvALe+8Odu8aZu0Mduo9M+oQcOkoUOgLdeU/OflIK/chYfY8OPIgXu8wQ+g8P/wsVPoeZfU6Ou8vSu5BL+0hWugSbea5VKRRAAAAqXRSTlMAAgQFBvkQ/fv+/f37+fv7+/v++/ng2b79/fz7/f35vfz7+0UV/fz8+/sj+Qv+/f38ek0uF/jtqIx1cGZfUU8eF/39/PTj4tvOy8Ozp5OIhnl4b2JQT0tGRDc1HA358O7p5NjU0sW6q6V5eG9rZlRDPDIuE/f26+ba2tHLx7+9urWuoaCamJeXlZGLin5kYllXKe/u6unf3dXTz8/Ix8XBurmdnJqVfnNZVQrS8AAABtNJREFUSMfllndQE0EUxveSCwES0rBEAggoRQRBwYqKvffee++99957712pwUgkVAGlSUdQsYJSLAj2ruPbC2HvxPFvZ9xMkne7+7tv79379g79K42ieHw+j6L+OMDjUX9DeYaITOMeUpV5gtIe/bZv7+cBM/gUQeHrOai5V/NBQ5kj0thTPDZ2SFSr1QU+HZs4I2Sg+QjNON0uQqfVRbRb3pwiNJulNyYkZyiVUqlxSOQdcU+9Bv4dfCT7bbytrURS77FOu2gQqpQSPnJenBNm4eDgIAXaWOD7qbMRdFIw0etZsZNTW1ugrSUS6wjdlN9pCnnvjW4YZhGWlpx2+3ZBa+PWgjtVayMKPk3vJjklOX3Pzn6r1UZIHksk2q2I4rK8xdENQ0XpCafq79xZv0vkdWMfwZWqnsgFNX1jaZmUdHffWa8ZXhvaax/Xq2etbY74nAvu/hnY6BMe+uPBY9UCH8GDhWOrds58ZWn56llPF6afnvI4XlIv3noo0YbIWaEwNY2eBCEfqgRWW/OqwEcc9+Dr++Bgy8zM/pAUPACntY4H6XMgR7LVI1elergMR3oFhGqqjX3sbS7bBAdnZg5CNKVXodGMCEh6O0+DNP4/9FCleDQEWNLVBa7b9/Lly8HBAxDN0lmlk0h0cNVk1Y4aECYXgrWb3Db2wXTcSBfErrYBOom1dgMEho6BUY7y3B4QEAWApSFA28ctdOHcF8928da65RAY4BZBjvLwaSyYAlgtDQHaPm7kUMRnwS7tI6wjlkJEYHdHBiYeqZ+m/BgCteYjfgDVwmfD8RimKuBZH4RVUrpDQNhkh4/KELX6OtBXME3yYxtvq1vFynYrsx+yqGps3RyLMIeM+Y3XdMbVQmj488q2tdVuZa/l+AehLOgSog1stCjMIjGxFhxBtRAa6x0ubtv27QDEI6ltFmgmjGrUCiLM9ooWiUQJCbUQTXNpyGPPu05ti9vTiCLKwxbkCYUfqhkhmgfsPVORKBSzkA9CwxgfPAYWy56C+Gxj9A00868SBDRCvXJVpqahoZiFRjG0L+MxBKxlklPxIh4jTLQnYjplSa+1Ex8qFKoyPcuhO25at+k9eCzp+2BQ48CoOtCyqJTwWLlG8agMs2RzWwG0OO7OmzfB2J/9DYsmM4AW+gtljnKNRqMoZ4m2Wuxrb2ODPUZYDj3hhom/n9/Nm/LYvhUs8ZgYTII91p+McbZAExN/TJMyJx5bd5UxqM37jiRXHOlWw5+Y+Af4+cnCL3BhOGqsZgxq87Ujjw2Tmpz8EqRBWxbUArS4q1qjZgxKPMZpwD61emICLUAYtQT2bA7bJ0MZEmLc2t7XhniMy9awsnpyIy9PGCBLqYZpsqY+yR+VypDIyEixL+Mx6rd1Tb9fo0aNa8PHLdhzQxiAa41sNMDCoyRR2WFUB8i54MpYqGyO7uwsV2CvDURGwyYEmulpvmHNOdhjGf0oI5qptU+N2TBFoWP37VyBZeSqExqveSr2Z8K3fszUFWqBr80VliMhalBk5+qa1QDRMJvQjI+mYo8lfGuJaAqPjS8Qix+M5+ynq4vs7O5vARYam0aYBY+ltzSMec73sbeP82DRw/aXuv0cMRd6uPTarpMeKRSExbXW86pYfKcp4pN0lbrVLeqGKTYtiwqPjZUrFGWPKlg4/ZBIePxCysglv3Crm9obQ4R+JwwQyuRyjVxDWAwbjYoUFIxnbb27YszNU6dDwKbhfoPFwKC4WAlMd4g0vt4ZIqIMMCizfdQj0AxbzD2/Ea4JtnKG9HoXlvLs123MY1Zzn1Wbv5hhgwJsxIGHZCil6sbsbI8uMb9VtxWrhwZ4OGPvfLwjs5+eyVLp7Yuki4e6FdYxjzlPcgo7+UvGY0I/9yhcLRWst0WiUpkI95nAM5/XudXmxQ6gKEBharOnVthjN7DH9LVGQYHRiNcpzcIhrSanuNFJoG+V9DZ0bMH+vGY1btxB7LHYA0PK+507pVuEWaTVYqUHwt2vX4N2zNHpu+fOndNsDOPPly2g0qu/w9WSP2mgt5F3rfWm6aKwhjlnAOD4eVch0OYvUt1GjPhZlGXnCmwDRDH7eRU/95vhsfMazXt4L9RU1DCnE8XxM9be8bykTh1z8zalpW520LJcG5T7aEKgUObu6KjJ16hU8ML1uZMLYUnSRheWAF0XmlvW/TFz9HcD6B557344QqXKVaqye+nrEWFZK6e3jX5eGBMTk5qaNaYZ0rPMzDkTq6SkBMWG5+aqus6qzJZr0DO3dVu5sltvmMF5QUHefbt3rd61e19n8tZfWZyEnC2OJJfiolx1Pg8av9LZKdzHvJX+7+0X6aNkPIGC7jsAAAAASUVORK5CYII="
+									},
+									"categories": [
+											{
+													"id": 2,
+													"name": "Sales"
+											}
+									],
+									"displayName": "Affinity",
+									"typeVersion": 1
+							},
+							{
+									"id": 19,
+									"icon": "file:autopilot.svg",
+									"name": "n8n-nodes-base.autopilotTrigger",
+									"defaults": {
+											"name": "Autopilot Trigger"
+									},
+									"iconData": {
+											"type": "file",
+											"fileBuffer": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjM4IDI2IDM1IDM1Ij48Y2lyY2xlIGN4PSI1MCIgY3k9IjUwIiByPSI0MCIgc3Ryb2tlPSIjMThkNGIyIiBzdHJva2Utd2lkdGg9IjMiIGZpbGw9IiMxOGQ0YjIiLz48cGF0aCBmaWxsPSIjZmZmIiBkPSJNNDUuNCA0Mi42aDE5LjlsMy40LTQuOEg0MmwzLjQgNC44em0zLjEgOC4zaDEzLjFsMy40LTQuOEg0NS40bDMuMSA0Ljh6bTU0LS43Ii8+PC9zdmc+"
+									},
+									"categories": [
+											{
+													"id": 1,
+													"name": "Marketing"
+											}
+									],
+									"displayName": "Autopilot Trigger",
+									"typeVersion": 1
+							},
+							{
+									"id": 20,
+									"icon": "file:lambda.svg",
+									"name": "n8n-nodes-base.awsLambda",
+									"defaults": {
+											"name": "AWS Lambda"
+									},
+									"iconData": {
+											"type": "file",
+											"fileBuffer": "data:image/svg+xml;base64,PHN2ZyBoZWlnaHQ9IjI1MDAiIHZpZXdCb3g9Ii0zLjAyMyAtMC4yMiA0MjAuOTIzIDQzMy41NCIgd2lkdGg9IjI0NDMiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PHBhdGggZD0iTTIwOC40NSAyMjcuODljLTEuNTkgMi4yNi0yLjkzIDQuMTItNC4yMiA2cS0zMC44NiA0NS40Mi02MS43IDkwLjgzLTI4LjY5IDQyLjI0LTU3LjQ0IDg0LjQzYTMuODggMy44OCAwIDAxLTIuNzMgMS41OXEtNDAuNTktLjM1LTgxLjE2LS44OGMtLjMgMC0uNjEtLjA5LTEuMi0uMThhMTQuNDQgMTQuNDQgMCAwMS43Ni0xLjY1cTI4LjMxLTQzLjg5IDU2LjYyLTg3Ljc2IDI1LjExLTM4Ljg4IDUwLjI1LTc3Ljc0IDI3Ljg2LTQzLjE4IDU1LjY5LTg2LjQyYzIuNzQtNC4yNSA1LjU5LTguNDIgOC4xOS0xMi43NWE1LjI2IDUuMjYgMCAwMC41Ni0zLjgzYy01LTE1Ljk0LTEwLjEtMzEuODQtMTUuMTktNDcuNzQtMi4xOC02LjgxLTQuNDYtMTMuNTgtNi41LTIwLjQzLS42Ni0yLjItMS43NS0yLjg3LTQtMi44Ni0xNyAuMDctMzMuOS4wNS01MC44NS4wNS0zLjIyIDAtMy4yMyAwLTMuMjMtMy4xOCAwLTIwLjg0IDAtNDEuNjgtLjA2LTYyLjUyIDAtMi4zMi43Ni0yLjg0IDIuOTQtMi44NHE1MS4xOS4wOSAxMDIuNCAwYTMuMjkgMy4yOSAwIDAxMy42IDIuNDNxMjcgNjcuOTEgNTQgMTM1Ljc3IDMxLjUgNzkuMTQgNjMgMTU4LjNjNi41MiAxNi4zOCAxMy4wOSAzMi43NSAxOS41NCA0OS4xNy43NyAyIDEuNTcgMi4zOCAzLjU5IDEuNzYgMTcuODktNS41MyAzNS44Mi0xMC45MSA1My43LTE2LjQ1IDIuMjUtLjcgMy4wNy0uMjMgMy43NyAyIDYuMSAxOS4xNyAxMi4zMiAzOC4zIDE4LjUgNTcuNDUuMjEuNjYuMzcgMS4zMy42MiAyLjI1LTEuMjguNDctMi40OCAxLTMuNzEgMS4zNHEtNjEgMTkuMzMtMTIxLjkzIDM4LjY4Yy0xLjk0LjYxLTIuNTItLjA1LTMuMTctMS42OHEtMTguNjEtNDcuMTYtMzcuMzEtOTQuMjgtMTguMjktNDYuMTQtMzYuNi05Mi4yOGMtMS44My00LjYyLTMuNjMtOS4yNi01LjQ2LTEzLjg4LS4yOS0uNzktLjY5LTEuNDgtMS4yNy0yLjd6IiBmaWxsPSIjZmE3ZTE0Ii8+PC9zdmc+"
+									},
+									"categories": [
+											{
+													"id": 5,
+													"name": "Development"
+											}
+									],
+									"displayName": "AWS Lambda",
+									"typeVersion": 1
+							},
+							{
+									"id": 31,
+									"icon": "file:bitwarden.svg",
+									"name": "n8n-nodes-base.bitwarden",
+									"defaults": {
+											"name": "Bitwarden"
+									},
+									"iconData": {
+											"type": "file",
+											"fileBuffer": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgNTUgNjYiIGZpbGw9IiNmZmYiIGZpbGwtcnVsZT0iZXZlbm9kZCIgc3Ryb2tlPSIjMDAwIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiPjx1c2UgeGxpbms6aHJlZj0iI2EiIHg9Ii41IiB5PSIuNSIvPjxzeW1ib2wgaWQ9ImEiIG92ZXJmbG93PSJ2aXNpYmxlIj48cGF0aCBkPSJNNTMuMzMzIDIuNjY3djMyYzAgMi4zODgtLjQ2NSA0Ljc1Ni0xLjM5NiA3LjEwM3MtMi4wODQgNC40My0zLjQ1OCA2LjI1LTMuMDE1IDMuNTktNC45MTcgNS4zMTItMy42NiAzLjE1My01LjI3MiA0LjI5MmwtNS4wNCAzLjIzLTMuNzMgMi4wNjItMS43Ny44MzRjLS4zMzMuMTY2LS42OTUuMjUtMS4wODMuMjVhMi40IDIuNCAwIDAxLTEuMDgzLS4yNWwtMS43Ny0uODM0LTMuNzMtMi4wNjItNS4wNDItMy4yM2MtMS42MS0xLjE0LTMuMzY4LTIuNTctNS4yNy00LjI5MnMtMy41NC0zLjQ5Mi00LjkxNi01LjMxMi0yLjUyOC0zLjkwMy0zLjQ2LTYuMjVTMCAzNy4wNTUgMCAzNC42Njd2LTMyQTIuNTYgMi41NiAwIDAxLjc5MS43OTIgMi41NiAyLjU2IDAgMDEyLjY2NiAwaDQ4Yy43MiAwIDEuMzQ2LjI2NCAxLjg3NC43OTJhMi41NiAyLjU2IDAgMDEuNzkyIDEuODc1bS04IDMyVjhIMjYuNjY2djQ3LjM3NWMzLjMwNS0xLjc1IDYuMjY0LTMuNjUzIDguODc1LTUuNzA4IDYuNTI3LTUuMTEgOS43OS0xMC4xMSA5Ljc5LTE1IiBzdHJva2U9Im5vbmUiIGZpbGw9IiMzYzhkYmMiIGZpbGwtcnVsZT0ibm9uemVybyIvPjwvc3ltYm9sPjwvc3ZnPg=="
+									},
+									"categories": [
+											{
+													"id": 3,
+													"name": "Data & Storage"
+											}
+									],
+									"displayName": "Bitwarden",
+									"typeVersion": 1
+							},
+							{
+									"id": 38,
+									"icon": "file:chargebee.png",
+									"name": "n8n-nodes-base.chargebeeTrigger",
+									"defaults": {
+											"name": "Chargebee Trigger"
+									},
+									"iconData": {
+											"type": "file",
+											"fileBuffer": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAMAAAANIilAAAAAk1BMVEUAAAD9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azXS0qjqAAAAMHRSTlMAAta1CPr3HAyb8mNPLBLq5MmGZ1wi28+soEQX7pZ9dkk/MijDurCMims54b6lb1YyU8hoAAACDklEQVRIx+2V2bKiMBBAmyTs+w6CIi64O/n/rxtKJwIjJPA4Nfc8acOpTnfSAX7493G2QZN6Zeml+GwVS0xiNSXtYeBIm6lKEaJf3C5kjrvz6SioFruVTKcIJEG1D8oBa1wXUy6+w2lVxhFFuU+0j4KOjwdOjUHQnHJ/DVZ4iaXXatTo2OuhPuEWXm9fLOhxPQjldeeuyV/NqGT+su1ucZuRkt5PMRElDmCEbdK2MNcmKnaZi2EUrd7GMEHEXGMPi8mYfFruqjd2NLrE+/P9oF9nyCuW+P4JhcorcBbL4dc2WSxyEcoBe9Vi5yJlEc8RyTp7ldVo0w8rkZyzN3ddExjR4sw7TmZhzSRhEddZ3m2TRar5+3z8hDZ/xlMSnzCPnbDu9NcPhLItzKAZG0hJnHVYYhnDYtSS2RksJ+fcQi0qAbDtKXknU84oWPQJtizvxanpmcCQJ3VtiA1lUlbdzk7rfs/bzwFSVR/bsaDhjHukvvfJsbBXm8S+UboXTwfDQFjXG6S0/dde18oGrN20TI4DOzHaA3drzAJWPqVy2Fa+5qTWDn05AKJJbS+eafsHtUlRUgAHB/dkJT+ddJzI7U+3kopjVgiGUwroF7J/IWAac+7RFeo0D6X3daQCiRBNZs2XVrmDr4e2zQ1aVhrMwwl9+Z1Zzw42ptQPHZiPFJv5IXENWXGvdRhL8MN/y2+uRpQ1fWz5HAAAAABJRU5ErkJggg=="
+									},
+									"categories": [
+											{
+													"id": 8,
+													"name": "Finance & Accounting"
+											}
+									],
+									"displayName": "Chargebee Trigger",
+									"typeVersion": 1
+							},
+							{
+									"id": 39,
+									"icon": "file:circleCi.png",
+									"name": "n8n-nodes-base.circleCi",
+									"defaults": {
+											"name": "CircleCI"
+									},
+									"iconData": {
+											"type": "file",
+											"fileBuffer": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAABGCAMAAABG8BK2AAAAmVBMVEUAAAAVFBUEAwQVExUAAAAAAAAVFBUWExYVFBUUFBQcHBwVFBUUFBQVExUVERURDxEVExUUExQVFBUUFBQVFBUVFBUUEhQUFBQVExUUFBQVFBUVExUUExQVExUWFhYZGRkVFRUVFBUVFBUVFBUVFBUVFBUUFBQWFBYWFhYTExMUFBQTExMUFBQVFBUVExUVFBUWFRYVFBUVFBX33+L1AAAAMnRSTlMA/QX5AwL7adxiCHqYux8QqUHn4cuOKZ9t79fEr4UiFAy19eyUgHJGLhpLNTPPWlI54+oyz24AAAM7SURBVFjDlJWJduIwDEUly3ZD2MtaylrWlnbaef//cYNLIIntAPNyTuDYyZWebCsUlVHurubdWn3QGDUG9Vq3pX+HDD0s7d44jKeJBZhxvknSGQ8dSD8Omde/4MRyEcOpX289CFJEPx3rwgszcjGLddzOkUg9ADmsABQQZdTpPh3eAylKNy4kI65sbpDe4hii/bOLeFsC7nXJmGpDM2cH9+QCbauMKVJNZsYjYuapIRWlLCZBUW6V6GtJKkbpQfC4BEk74GhaJh7lPmeSkiZP/YByn/MaJNNhwf9KeFSypeipisJnVXFqBY6mIcAxhFicZSVGYsg8L4+h11hhLON0rZNJsob7Z2PlaZK5WqpFLDkjyeZ72Fak2sPvTeKGIpw/V1vLZ3A4j9W+tAofTUBCWz11SaYeJMOWJ103p0zWVN3D+wSWgyrvSFUkw4yGY1BRSpMeBcYYf9NssSH+FMYUPTC0CziCbNH7YC8XN2PiH4wnn2OzvfyJgF8nVdmTZhA/9QNpohmLR1kVT5zRSpc6ZNPjCLuovifG23uOycqckzS1xH/h9QRvMYtYJ/m93hy8UNTFsfvZpuLQliWIS2niFbiX5gboZ/oCYN05Fly1X/x0Pojo/amsFuWLNABwPt+zQpUbkHJxto7uy1x/R8zC587LDdIXTLe86ILOeaOXlJ/Ycd7iOW8thtLytrfoU6h4DRjPaZanpiZs+XimN77DNUi0JSgasJQwL4sbmJGHaVwxOw8jrWpTXurWbe5ongye/6vF2nEQhmFoTRxPsCGBuEAlxJT7H45QF6UiH6d9wUvVJamT+v3+vQzeVHFPsY64/8Kn+oXjvx+FqzUM4iiWOQz5aN6PjOYooFDYSpXD1qsHtgwQZdaHCaI2pDN7E9L3EwyVCSZ2JQW6m6p0FzK684PItyUFuFcKNIRJeMwL27FX5vws+awJk6ZMusx+h0zCRVtTQtKPhJSahLQEbdgAhS1ocXmdvud2SOwrPOPWY7QRwm0ZbhJByyrJssIGmmshx2rnyepH7TweLsQDQKIOsaMOLf8NXsgJEW2HQlwevNgxEOn2WrK8aQzEvXnSaQ2lHBBKZRHZuSMiewPdyr8Dzj/WNwAAAABJRU5ErkJggg=="
+									},
+									"categories": [
+											{
+													"id": 5,
+													"name": "Development"
+											}
+									],
+									"displayName": "CircleCI",
+									"typeVersion": 1
+							},
+							{
+									"id": 42,
+									"icon": "file:clickup.svg",
+									"name": "n8n-nodes-base.clickUpTrigger",
+									"defaults": {
+											"name": "ClickUp Trigger"
+									},
+									"iconData": {
+											"type": "file",
+											"fileBuffer": "data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSItMTAgMCAxNTUgMTU1IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPjxkZWZzPjxsaW5lYXJHcmFkaWVudCB4MT0iMCUiIHkxPSI2OC4wMSUiIHkyPSI2OC4wMSUiIGlkPSJhIj48c3RvcCBzdG9wLWNvbG9yPSIjODkzMEZEIiBvZmZzZXQ9IjAlIi8+PHN0b3Agc3RvcC1jb2xvcj0iIzQ5Q0NGOSIgb2Zmc2V0PSIxMDAlIi8+PC9saW5lYXJHcmFkaWVudD48bGluZWFyR3JhZGllbnQgeDE9IjAlIiB5MT0iNjguMDElIiB5Mj0iNjguMDElIiBpZD0iYiI+PHN0b3Agc3RvcC1jb2xvcj0iI0ZGMDJGMCIgb2Zmc2V0PSIwJSIvPjxzdG9wIHN0b3AtY29sb3I9IiNGRkM4MDAiIG9mZnNldD0iMTAwJSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxnIGZpbGw9Im5vbmUiPjxwYXRoIGQ9Ik0uNCAxMTkuMTJsMjMuODEtMTguMjRDMzYuODYgMTE3LjM5IDUwLjMgMTI1IDY1LjI2IDEyNWMxNC44OCAwIDI3Ljk0LTcuNTIgNDAuMDItMjMuOWwyNC4xNSAxNy44QzExMiAxNDIuNTIgOTAuMzQgMTU1IDY1LjI2IDE1NWMtMjUgMC00Ni44Ny0xMi40LTY0Ljg2LTM1Ljg4eiIgZmlsbD0idXJsKCNhKSIvPjxwYXRoIGZpbGw9InVybCgjYikiIGQ9Ik02NS4xOCAzOS44NEwyMi44IDc2LjM2IDMuMjEgNTMuNjQgNjUuMjcuMTZsNjEuNTcgNTMuNTItMTkuNjggMjIuNjR6Ii8+PC9nPjwvc3ZnPg=="
+									},
+									"categories": [
+											{
+													"id": 4,
+													"name": "Productivity"
+											},
+											{
+													"id": 6,
+													"name": "Communication"
+											}
+									],
+									"displayName": "ClickUp Trigger",
+									"typeVersion": 1
+							},
+							{
+									"id": 46,
+									"icon": "fa:file-archive",
+									"name": "n8n-nodes-base.compression",
+									"defaults": {
+											"name": "Compression",
+											"color": "#408000"
+									},
+									"iconData": {
+											"icon": "file-archive",
+											"type": "icon"
+									},
+									"categories": [
+											{
+													"id": 3,
+													"name": "Data & Storage"
+											},
+											{
+													"id": 9,
+													"name": "Core Nodes"
+											}
+									],
+									"displayName": "Compression",
+									"typeVersion": 1
+							},
+							{
+									"id": 59,
+									"icon": "fa:clock",
+									"name": "n8n-nodes-base.dateTime",
+									"defaults": {
+											"name": "Date & Time",
+											"color": "#408000"
+									},
+									"iconData": {
+											"icon": "clock",
+											"type": "icon"
+									},
+									"categories": [
+											{
+													"id": 9,
+													"name": "Core Nodes"
+											}
+									],
+									"displayName": "Date & Time",
+									"typeVersion": 2
+							},
+							{
+									"id": 114,
+									"icon": "file:helpScout.svg",
+									"name": "n8n-nodes-base.helpScoutTrigger",
+									"defaults": {
+											"name": "HelpScout Trigger"
+									},
+									"iconData": {
+											"type": "file",
+											"fileBuffer": "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjU2IiBoZWlnaHQ9IjMxMCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWlkWU1pZCI+PHBhdGggZD0iTTE4LjQzMiAxODAuOTY5bDkwLjQ4NC05MC40ODVhNjMuNzE3IDYzLjcxNyAwIDAwMTguOTktNDUuNDI4QTY0LjI0NSA2NC4yNDUgMCAwMDEwOS40NzYgMEwxOC45OSA5MC40ODRBNjMuNzE3IDYzLjcxNyAwIDAwMCAxMzUuOTEzYzAgMTcuNjg3IDcuMDc1IDMzLjUxMiAxOC40MzIgNDUuMDU2em0yMTkuMTM2LTUyLjg3NmwtOTAuNDg0IDkwLjQ4NGE2My43MTcgNjMuNzE3IDAgMDAtMTguOTkgNDUuNDI5IDY0LjI0NSA2NC4yNDUgMCAwMDE4LjQzMSA0NS4wNTZsOTAuNDg0LTkwLjQ4NUE2My43MTcgNjMuNzE3IDAgMDAyNTYgMTczLjE1YzAtMTcuNjg3LTcuMDc1LTMzLjUxMy0xOC40MzItNDUuMDU2em0tLjU1OS0zNy40MjJBNjMuNzE3IDYzLjcxNyAwIDAwMjU2IDQ1LjI0MiA2NC4yNDUgNjQuMjQ1IDAgMDAyMzcuNTY4LjE4NkwxOC45OTEgMjE4LjU3N0M3LjI2IDIzMC4zMDcgMCAyNDYuMzIgMCAyNjQuMTkyYTY0LjI0NSA2NC4yNDUgMCAwMDE4LjQzMiA0NS4wNTZMMjM3LjAwOSA5MC42NzF6IiBmaWxsPSIjMTI5MkVFIi8+PC9zdmc+"
+									},
+									"categories": [
+											{
+													"id": 6,
+													"name": "Communication"
+											}
+									],
+									"displayName": "HelpScout Trigger",
+									"typeVersion": 1
+							}
+					]
+			},
+			{
+					"id": 226,
+					"name": "Receive Google Sheet data via REST API",
+					"totalViews": 2438,
+					"recentViews": 0,
+					"user": {
+							"username": "admin"
+					},
+					"createdAt": "2020-01-01T19:27:20.732Z",
+					"nodes": [
+							{
+									"id": 18,
+									"icon": "file:autopilot.svg",
+									"name": "n8n-nodes-base.autopilot",
+									"defaults": {
+											"name": "Autopilot"
+									},
+									"iconData": {
+											"type": "file",
+											"fileBuffer": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjM4IDI2IDM1IDM1Ij48Y2lyY2xlIGN4PSI1MCIgY3k9IjUwIiByPSI0MCIgc3Ryb2tlPSIjMThkNGIyIiBzdHJva2Utd2lkdGg9IjMiIGZpbGw9IiMxOGQ0YjIiLz48cGF0aCBmaWxsPSIjZmZmIiBkPSJNNDUuNCA0Mi42aDE5LjlsMy40LTQuOEg0MmwzLjQgNC44em0zLjEgOC4zaDEzLjFsMy40LTQuOEg0NS40bDMuMSA0Ljh6bTU0LS43Ii8+PC9zdmc+"
+									},
+									"categories": [
+											{
+													"id": 1,
+													"name": "Marketing"
+											}
+									],
+									"displayName": "Autopilot",
+									"typeVersion": 1
+							},
+							{
+									"id": 47,
+									"icon": "file:coda.svg",
+									"name": "n8n-nodes-base.coda",
+									"defaults": {
+											"name": "Coda"
+									},
+									"iconData": {
+											"type": "file",
+											"fileBuffer": "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KPCEtLSBHZW5lcmF0b3I6IEFkb2JlIElsbHVzdHJhdG9yIDI0LjIuMSwgU1ZHIEV4cG9ydCBQbHVnLUluIC4gU1ZHIFZlcnNpb246IDYuMDAgQnVpbGQgMCkgIC0tPgo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkxheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4IgoJIHZpZXdCb3g9IjAgMCA2MCA2MCIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAgNjAgNjA7IiB4bWw6c3BhY2U9InByZXNlcnZlIj4KPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KCS5zdDB7ZmlsbDojRUU1QTI5O30KPC9zdHlsZT4KPHBhdGggY2xhc3M9InN0MCIgZD0iTTQ1LjIsMTYuMmMzLjMsMCw2LjUsMS4zLDguOCwzLjNjMS41LDEuMywzLjgsMC4yLDMuOC0xLjhWNC43YzAtMi41LTIuMS00LjctNC43LTQuN0g2LjMKCUMzLjcsMCwxLjYsMi4xLDEuNiw0Ljd2NTAuN2MwLDIuNSwyLjEsNC42LDQuNyw0LjZoNDYuOGMyLjUsMCw0LjctMi4xLDQuNy00LjdWNDIuM2MwLTItMi4zLTMuMS0zLjgtMS44Yy0yLjQsMi4xLTUuNCwzLjMtOC44LDMuMwoJYy03LjYsMC0xMy43LTYuMi0xMy43LTEzLjhDMzEuNiwyMi40LDM3LjcsMTYuMiw0NS4yLDE2LjJ6Ii8+Cjwvc3ZnPgo="
+									},
+									"categories": [
+											{
+													"id": 4,
+													"name": "Productivity"
+											}
+									],
+									"displayName": "Coda",
+									"typeVersion": 1
+							}
+					]
+			},
+			{
+					"id": 156,
+					"name": "Get Execute Command Data and Transfer to JSON",
+					"totalViews": 1855,
+					"recentViews": 0,
+					"user": {
+							"username": "admin"
+					},
+					"createdAt": "2019-11-02T12:18:37.963Z",
+					"nodes": [
+							{
+									"id": 13,
+									"icon": "file:asana.svg",
+									"name": "n8n-nodes-base.asanaTrigger",
+									"defaults": {
+											"name": "Asana Trigger"
+									},
+									"iconData": {
+											"type": "file",
+											"fileBuffer": "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNjAiIGhlaWdodD0iNjAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PHJhZGlhbEdyYWRpZW50IGN4PSI1MCUiIGN5PSI1NSUiIGZ4PSI1MCUiIGZ5PSI1NSUiIHI9IjcyLjUwNyUiIGdyYWRpZW50VHJhbnNmb3JtPSJtYXRyaXgoLjkyNDA0IDAgMCAxIC4wMzggMCkiIGlkPSJhIj48c3RvcCBzdG9wLWNvbG9yPSIjRkZCOTAwIiBvZmZzZXQ9IjAlIi8+PHN0b3Agc3RvcC1jb2xvcj0iI0Y5NUQ4RiIgb2Zmc2V0PSI2MCUiLz48c3RvcCBzdG9wLWNvbG9yPSIjRjk1MzUzIiBvZmZzZXQ9Ijk5LjkxJSIvPjwvcmFkaWFsR3JhZGllbnQ+PC9kZWZzPjxwYXRoIGQ9Ik00NS41OTQgMjguNWMtNi45OTQuMDAzLTEyLjY2NCA1LjY3My0xMi42NjcgMTIuNjY3LjAwMyA2Ljk5NSA1LjY3MyAxMi42NjQgMTIuNjY3IDEyLjY2OCA2Ljk5NS0uMDA0IDEyLjY2NC01LjY3MyAxMi42NjctMTIuNjY4LS4wMDMtNi45OTQtNS42NzItMTIuNjY0LTEyLjY2Ny0xMi42Njd6bS0zMi45MjcuMDAxQzUuNjczIDI4LjUwNS4wMDMgMzQuMTc0IDAgNDEuMTdjLjAwMyA2Ljk5NCA1LjY3MyAxMi42NjQgMTIuNjY3IDEyLjY2NyA2Ljk5NS0uMDAzIDEyLjY2NC01LjY3MyAxMi42NjgtMTIuNjY3LS4wMDQtNi45OTUtNS42NzMtMTIuNjY0LTEyLjY2OC0xMi42Njh6TTQxLjc5IDEyLjY2N2MtLjAwMiA2Ljk5NS01LjY3MSAxMi42NjUtMTIuNjY2IDEyLjY3LTYuOTk1LS4wMDQtMTIuNjY0LTUuNjc0LTEyLjY2Ny0xMi42N0MxNi40NiA1LjY3MyAyMi4xMy4wMDMgMjkuMTIzIDBjNi45OTQuMDA0IDEyLjY2MyA1LjY3MyAxMi42NjYgMTIuNjY3eiIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoLjczMiAyLjczMikiIGZpbGw9InVybCgjYSkiIGZpbGwtcnVsZT0iZXZlbm9kZCIvPjwvc3ZnPg=="
+									},
+									"categories": [
+											{
+													"id": 4,
+													"name": "Productivity"
+											}
+									],
+									"displayName": "Asana Trigger",
+									"typeVersion": 1
+							},
+							{
+									"id": 15,
+									"icon": "file:affinity.png",
+									"name": "n8n-nodes-base.affinity",
+									"defaults": {
+											"name": "Affinity"
+									},
+									"iconData": {
+											"type": "file",
+											"fileBuffer": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAMAAAANIilAAAAC/VBMVEUAAAAtTfMvVekpSN8rR+g2POglUecfWuY0PukdXeUoTucrS+c2POkfW+VGJusyQeghWOcjVecmUecNceQgWeY4OegiV+YeXOYxQ+gXZeUuR+gmUuc9MuoZYeZHJuszP+g4OulFKOsTauQpS+c7Ou02O+kvRegiVuZBLuoMdOQoTeoQbuQ9NekVaOVHJesQbeQhWOctR+gTauUyQuk9L+wqS+cjVeY0PugyQeg7NekXZeVDK+pHJesgWeYqTOglUugcYeg0PukNceRDK+tGJ+pFKOsyQeg4OekrSec2O+kyQOgkVOYOceQjVechWOY6NuglUecQbuQtSOchV+cxQek9MelAMOkcX+ZDKetEK+otR+dCL+oPZ+IcX+YSbOQ5OOgyQegKdeQUaeU3O+gcX+U2O+kdXeYgWuYmUeYZY+ZFJ+onT+gjVOcSbORFKesKdeMcXeYPbuMYZOQNbOYlUuYyQegcXuU4OehEKeopTechV+dHJusnUOdHJus0PukOceRGJuoPbeQyQegjVeY3O+kpTudGJ+svR+c6N+kcXuUVZ+VGJuoLdOMzQOgLdOQvRegKdeQPceQdXeQqTOZBLegQb+UiVuYeXOQlU+dBLelBLukPcOQTauQdXOUsSuYLd+MvR+hEK+otR+dDLOpHJusPceUiVeczQOkiVuU1Pek2POkgWOYeW+UfWucgY/c2RPcjXfQ3OugkVOc7PfU6NulMKfw4Q/kzQOlLKPgqTektSOclW/ZJKPM1Qe4iWu0YZegsUfUPePIkWvI2QfIeYe85O+1HJ+0tSeowRepAL+kiV+cySvgjXvYRdvQxSfMsTvAxRe09Ne0VbewMc+RILvsvTvk1Rvk7P/lDM/knWPcqVPYWb/Q6PfInVfAnU+xHJuseXuojV+obYOYZavQ3QfQMffMTcvNELvNAMvALe+8Odu8aZu0Mduo9M+oQcOkoUOgLdeU/OflIK/chYfY8OPIgXu8wQ+g8P/wsVPoeZfU6Ou8vSu5BL+0hWugSbea5VKRRAAAAqXRSTlMAAgQFBvkQ/fv+/f37+fv7+/v++/ng2b79/fz7/f35vfz7+0UV/fz8+/sj+Qv+/f38ek0uF/jtqIx1cGZfUU8eF/39/PTj4tvOy8Ozp5OIhnl4b2JQT0tGRDc1HA358O7p5NjU0sW6q6V5eG9rZlRDPDIuE/f26+ba2tHLx7+9urWuoaCamJeXlZGLin5kYllXKe/u6unf3dXTz8/Ix8XBurmdnJqVfnNZVQrS8AAABtNJREFUSMfllndQE0EUxveSCwES0rBEAggoRQRBwYqKvffee++99957712pwUgkVAGlSUdQsYJSLAj2ruPbC2HvxPFvZ9xMkne7+7tv79379g79K42ieHw+j6L+OMDjUX9DeYaITOMeUpV5gtIe/bZv7+cBM/gUQeHrOai5V/NBQ5kj0thTPDZ2SFSr1QU+HZs4I2Sg+QjNON0uQqfVRbRb3pwiNJulNyYkZyiVUqlxSOQdcU+9Bv4dfCT7bbytrURS77FOu2gQqpQSPnJenBNm4eDgIAXaWOD7qbMRdFIw0etZsZNTW1ugrSUS6wjdlN9pCnnvjW4YZhGWlpx2+3ZBa+PWgjtVayMKPk3vJjklOX3Pzn6r1UZIHksk2q2I4rK8xdENQ0XpCafq79xZv0vkdWMfwZWqnsgFNX1jaZmUdHffWa8ZXhvaax/Xq2etbY74nAvu/hnY6BMe+uPBY9UCH8GDhWOrds58ZWn56llPF6afnvI4XlIv3noo0YbIWaEwNY2eBCEfqgRWW/OqwEcc9+Dr++Bgy8zM/pAUPACntY4H6XMgR7LVI1elergMR3oFhGqqjX3sbS7bBAdnZg5CNKVXodGMCEh6O0+DNP4/9FCleDQEWNLVBa7b9/Lly8HBAxDN0lmlk0h0cNVk1Y4aECYXgrWb3Db2wXTcSBfErrYBOom1dgMEho6BUY7y3B4QEAWApSFA28ctdOHcF8928da65RAY4BZBjvLwaSyYAlgtDQHaPm7kUMRnwS7tI6wjlkJEYHdHBiYeqZ+m/BgCteYjfgDVwmfD8RimKuBZH4RVUrpDQNhkh4/KELX6OtBXME3yYxtvq1vFynYrsx+yqGps3RyLMIeM+Y3XdMbVQmj488q2tdVuZa/l+AehLOgSog1stCjMIjGxFhxBtRAa6x0ubtv27QDEI6ltFmgmjGrUCiLM9ooWiUQJCbUQTXNpyGPPu05ti9vTiCLKwxbkCYUfqhkhmgfsPVORKBSzkA9CwxgfPAYWy56C+Gxj9A00868SBDRCvXJVpqahoZiFRjG0L+MxBKxlklPxIh4jTLQnYjplSa+1Ex8qFKoyPcuhO25at+k9eCzp+2BQ48CoOtCyqJTwWLlG8agMs2RzWwG0OO7OmzfB2J/9DYsmM4AW+gtljnKNRqMoZ4m2Wuxrb2ODPUZYDj3hhom/n9/Nm/LYvhUs8ZgYTII91p+McbZAExN/TJMyJx5bd5UxqM37jiRXHOlWw5+Y+Af4+cnCL3BhOGqsZgxq87Ujjw2Tmpz8EqRBWxbUArS4q1qjZgxKPMZpwD61emICLUAYtQT2bA7bJ0MZEmLc2t7XhniMy9awsnpyIy9PGCBLqYZpsqY+yR+VypDIyEixL+Mx6rd1Tb9fo0aNa8PHLdhzQxiAa41sNMDCoyRR2WFUB8i54MpYqGyO7uwsV2CvDURGwyYEmulpvmHNOdhjGf0oI5qptU+N2TBFoWP37VyBZeSqExqveSr2Z8K3fszUFWqBr80VliMhalBk5+qa1QDRMJvQjI+mYo8lfGuJaAqPjS8Qix+M5+ynq4vs7O5vARYam0aYBY+ltzSMec73sbeP82DRw/aXuv0cMRd6uPTarpMeKRSExbXW86pYfKcp4pN0lbrVLeqGKTYtiwqPjZUrFGWPKlg4/ZBIePxCysglv3Crm9obQ4R+JwwQyuRyjVxDWAwbjYoUFIxnbb27YszNU6dDwKbhfoPFwKC4WAlMd4g0vt4ZIqIMMCizfdQj0AxbzD2/Ea4JtnKG9HoXlvLs123MY1Zzn1Wbv5hhgwJsxIGHZCil6sbsbI8uMb9VtxWrhwZ4OGPvfLwjs5+eyVLp7Yuki4e6FdYxjzlPcgo7+UvGY0I/9yhcLRWst0WiUpkI95nAM5/XudXmxQ6gKEBharOnVthjN7DH9LVGQYHRiNcpzcIhrSanuNFJoG+V9DZ0bMH+vGY1btxB7LHYA0PK+507pVuEWaTVYqUHwt2vX4N2zNHpu+fOndNsDOPPly2g0qu/w9WSP2mgt5F3rfWm6aKwhjlnAOD4eVch0OYvUt1GjPhZlGXnCmwDRDH7eRU/95vhsfMazXt4L9RU1DCnE8XxM9be8bykTh1z8zalpW520LJcG5T7aEKgUObu6KjJ16hU8ML1uZMLYUnSRheWAF0XmlvW/TFz9HcD6B557344QqXKVaqye+nrEWFZK6e3jX5eGBMTk5qaNaYZ0rPMzDkTq6SkBMWG5+aqus6qzJZr0DO3dVu5sltvmMF5QUHefbt3rd61e19n8tZfWZyEnC2OJJfiolx1Pg8av9LZKdzHvJX+7+0X6aNkPIGC7jsAAAAASUVORK5CYII="
+									},
+									"categories": [
+											{
+													"id": 2,
+													"name": "Sales"
+											}
+									],
+									"displayName": "Affinity",
+									"typeVersion": 1
+							},
+							{
+									"id": 20,
+									"icon": "file:lambda.svg",
+									"name": "n8n-nodes-base.awsLambda",
+									"defaults": {
+											"name": "AWS Lambda"
+									},
+									"iconData": {
+											"type": "file",
+											"fileBuffer": "data:image/svg+xml;base64,PHN2ZyBoZWlnaHQ9IjI1MDAiIHZpZXdCb3g9Ii0zLjAyMyAtMC4yMiA0MjAuOTIzIDQzMy41NCIgd2lkdGg9IjI0NDMiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PHBhdGggZD0iTTIwOC40NSAyMjcuODljLTEuNTkgMi4yNi0yLjkzIDQuMTItNC4yMiA2cS0zMC44NiA0NS40Mi02MS43IDkwLjgzLTI4LjY5IDQyLjI0LTU3LjQ0IDg0LjQzYTMuODggMy44OCAwIDAxLTIuNzMgMS41OXEtNDAuNTktLjM1LTgxLjE2LS44OGMtLjMgMC0uNjEtLjA5LTEuMi0uMThhMTQuNDQgMTQuNDQgMCAwMS43Ni0xLjY1cTI4LjMxLTQzLjg5IDU2LjYyLTg3Ljc2IDI1LjExLTM4Ljg4IDUwLjI1LTc3Ljc0IDI3Ljg2LTQzLjE4IDU1LjY5LTg2LjQyYzIuNzQtNC4yNSA1LjU5LTguNDIgOC4xOS0xMi43NWE1LjI2IDUuMjYgMCAwMC41Ni0zLjgzYy01LTE1Ljk0LTEwLjEtMzEuODQtMTUuMTktNDcuNzQtMi4xOC02LjgxLTQuNDYtMTMuNTgtNi41LTIwLjQzLS42Ni0yLjItMS43NS0yLjg3LTQtMi44Ni0xNyAuMDctMzMuOS4wNS01MC44NS4wNS0zLjIyIDAtMy4yMyAwLTMuMjMtMy4xOCAwLTIwLjg0IDAtNDEuNjgtLjA2LTYyLjUyIDAtMi4zMi43Ni0yLjg0IDIuOTQtMi44NHE1MS4xOS4wOSAxMDIuNCAwYTMuMjkgMy4yOSAwIDAxMy42IDIuNDNxMjcgNjcuOTEgNTQgMTM1Ljc3IDMxLjUgNzkuMTQgNjMgMTU4LjNjNi41MiAxNi4zOCAxMy4wOSAzMi43NSAxOS41NCA0OS4xNy43NyAyIDEuNTcgMi4zOCAzLjU5IDEuNzYgMTcuODktNS41MyAzNS44Mi0xMC45MSA1My43LTE2LjQ1IDIuMjUtLjcgMy4wNy0uMjMgMy43NyAyIDYuMSAxOS4xNyAxMi4zMiAzOC4zIDE4LjUgNTcuNDUuMjEuNjYuMzcgMS4zMy42MiAyLjI1LTEuMjguNDctMi40OCAxLTMuNzEgMS4zNHEtNjEgMTkuMzMtMTIxLjkzIDM4LjY4Yy0xLjk0LjYxLTIuNTItLjA1LTMuMTctMS42OHEtMTguNjEtNDcuMTYtMzcuMzEtOTQuMjgtMTguMjktNDYuMTQtMzYuNi05Mi4yOGMtMS44My00LjYyLTMuNjMtOS4yNi01LjQ2LTEzLjg4LS4yOS0uNzktLjY5LTEuNDgtMS4yNy0yLjd6IiBmaWxsPSIjZmE3ZTE0Ii8+PC9zdmc+"
+									},
+									"categories": [
+											{
+													"id": 5,
+													"name": "Development"
+											}
+									],
+									"displayName": "AWS Lambda",
+									"typeVersion": 1
+							}
+					]
+			},
+			{
+					"id": 1,
+					"name": "Excel to Postgres",
+					"totalViews": 1757,
+					"recentViews": 0,
+					"user": {
+							"username": "admin"
+					},
+					"createdAt": "2019-08-31T00:05:02.587Z",
+					"nodes": [
+							{
+									"id": 30,
+									"icon": "file:bitly.svg",
+									"name": "n8n-nodes-base.bitly",
+									"defaults": {
+											"name": "Bitly"
+									},
+									"iconData": {
+											"type": "file",
+											"fileBuffer": "data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgMTI4IDEyOCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48ZyBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGZpbGwtcnVsZT0iZXZlbm9kZCI+PHBhdGggZmlsbD0ibm9uZSIgZD0iTTAgMGgxMjh2MTI4SDB6Ii8+PHBhdGggZD0iTTYzLjcwOCAwQzI4LjQ0MyAwIDAgMjguMzA2IDAgNjUuMzIyYzAgMTkuMTkzIDEwLjI2NiAzNy43MzYgMjQuNzAzIDQ4Ljg3NyAyLjc4IDIuMTQ1IDYuMDkxIDEuOTQ5IDcuOTg5LjEwOSAxLjU5OS0xLjU1IDEuNDY3LTUuMjgyLTEuNTA3LTcuODk3LTExLjU0MS0xMC4xNDktMTkuNTItMjUuNTE0LTE5LjUyLTQwLjg2MSAwLTI3LjU2NCAyNC40NzQtNTAuNzU2IDUyLjA0NC01MC43NTYgMzMuNTU4IDAgNTEuNTAzIDI3LjI1MiA1MS41MDMgNTAuMzUxIDAgMTQuMTE0LTYuOTAyIDMxLjE1NS0xOS4zNjEgNDIuMDI1LjAxOS0uMDQ5IDIuNTg4LTUuMTAxIDIuNTg4LTE0Ljk0IDAtMTYuNzQ4LTEwLjYxMi0yNS44MjEtMjIuOTI2LTI1LjgyMS04LjkxNCAwLTE0LjI1MSAzLjE4Ny0xNy44ODMgNi4xNTggMC02LjgyMi4yMjgtMTkuNTYzLjIyOC0xOS41NjMgMC04LjQwOS0yLjk0Ni0xNS4xNC0xMy4yMTMtMTUuMjg3LTUuOTQzLS4wODQtMTAuMzUzIDIuNjQxLTEzLjEwMyA4LjgwMy0uOTkxIDIuMzExLS42MjYgNC44MjIgMS4zMzMgNS45NiAxLjYyMS45NDEgNC4yODcuMjQzIDUuNjA2LTEuNTE3Ljg4MS0xLjEgMS4zNzUtMS4zMzUgMi4xNDEtMS4yNTIgMS4yNjEuMTM2IDEuMzA5IDIuMTY4IDEuMzU5IDMuNDY4LjAzOC45OTggMS4wMDggMTUuNDk0LjQ3NyA1Mi43NDYgMCAxMC4yNzUgOC4wNTkgMjIuMDc3IDI3LjM1NSAyMi4wNzcgOC4zMDcgMCAxNC42ODYtMi4zMjIgMjMuOTUzLTcuNTg3QzEwNy44NzEgMTEyLjM5OCAxMjggOTQuNjIgMTI4IDY0LjU1IDEyOCAyNi45NzcgOTcuNTcyIDAgNjMuNzA4IDB6bTYuMDUyIDExMy42MDJjLTcuMTgzLjEyNi0xMi40MjItMi4xODMtMTIuNzQzLTguNDYxLS4xMi0yLjM1Ni0uMDgyLTQuODY1LjAzMy02LjM3OC42OTUtOS4xNzQgNy4xMS0xNS43NzQgMTMuNDQzLTE3LjA0MSA3Ljg3Ni0xLjU3NiAxMy4xMjMgMi4wMjYgMTMuMTIzIDEyLjMzNy0uMDAxIDYuOTY4LTEuOTM1IDE5LjMzNC0xMy44NTYgMTkuNTQzeiIgZmlsbD0iI0RENUEyQiIvPjwvZz48L3N2Zz4="
+									},
+									"categories": [
+											{
+													"id": 7,
+													"name": "Utility"
+											}
+									],
+									"displayName": "Bitly",
+									"typeVersion": 1
+							},
+							{
+									"id": 31,
+									"icon": "file:bitwarden.svg",
+									"name": "n8n-nodes-base.bitwarden",
+									"defaults": {
+											"name": "Bitwarden"
+									},
+									"iconData": {
+											"type": "file",
+											"fileBuffer": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgNTUgNjYiIGZpbGw9IiNmZmYiIGZpbGwtcnVsZT0iZXZlbm9kZCIgc3Ryb2tlPSIjMDAwIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiPjx1c2UgeGxpbms6aHJlZj0iI2EiIHg9Ii41IiB5PSIuNSIvPjxzeW1ib2wgaWQ9ImEiIG92ZXJmbG93PSJ2aXNpYmxlIj48cGF0aCBkPSJNNTMuMzMzIDIuNjY3djMyYzAgMi4zODgtLjQ2NSA0Ljc1Ni0xLjM5NiA3LjEwM3MtMi4wODQgNC40My0zLjQ1OCA2LjI1LTMuMDE1IDMuNTktNC45MTcgNS4zMTItMy42NiAzLjE1My01LjI3MiA0LjI5MmwtNS4wNCAzLjIzLTMuNzMgMi4wNjItMS43Ny44MzRjLS4zMzMuMTY2LS42OTUuMjUtMS4wODMuMjVhMi40IDIuNCAwIDAxLTEuMDgzLS4yNWwtMS43Ny0uODM0LTMuNzMtMi4wNjItNS4wNDItMy4yM2MtMS42MS0xLjE0LTMuMzY4LTIuNTctNS4yNy00LjI5MnMtMy41NC0zLjQ5Mi00LjkxNi01LjMxMi0yLjUyOC0zLjkwMy0zLjQ2LTYuMjVTMCAzNy4wNTUgMCAzNC42Njd2LTMyQTIuNTYgMi41NiAwIDAxLjc5MS43OTIgMi41NiAyLjU2IDAgMDEyLjY2NiAwaDQ4Yy43MiAwIDEuMzQ2LjI2NCAxLjg3NC43OTJhMi41NiAyLjU2IDAgMDEuNzkyIDEuODc1bS04IDMyVjhIMjYuNjY2djQ3LjM3NWMzLjMwNS0xLjc1IDYuMjY0LTMuNjUzIDguODc1LTUuNzA4IDYuNTI3LTUuMTEgOS43OS0xMC4xMSA5Ljc5LTE1IiBzdHJva2U9Im5vbmUiIGZpbGw9IiMzYzhkYmMiIGZpbGwtcnVsZT0ibm9uemVybyIvPjwvc3ltYm9sPjwvc3ZnPg=="
+									},
+									"categories": [
+											{
+													"id": 3,
+													"name": "Data & Storage"
+											}
+									],
+									"displayName": "Bitwarden",
+									"typeVersion": 1
+							},
+							{
+									"id": 41,
+									"icon": "file:clickup.svg",
+									"name": "n8n-nodes-base.clickUp",
+									"defaults": {
+											"name": "ClickUp"
+									},
+									"iconData": {
+											"type": "file",
+											"fileBuffer": "data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSItMTAgMCAxNTUgMTU1IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPjxkZWZzPjxsaW5lYXJHcmFkaWVudCB4MT0iMCUiIHkxPSI2OC4wMSUiIHkyPSI2OC4wMSUiIGlkPSJhIj48c3RvcCBzdG9wLWNvbG9yPSIjODkzMEZEIiBvZmZzZXQ9IjAlIi8+PHN0b3Agc3RvcC1jb2xvcj0iIzQ5Q0NGOSIgb2Zmc2V0PSIxMDAlIi8+PC9saW5lYXJHcmFkaWVudD48bGluZWFyR3JhZGllbnQgeDE9IjAlIiB5MT0iNjguMDElIiB5Mj0iNjguMDElIiBpZD0iYiI+PHN0b3Agc3RvcC1jb2xvcj0iI0ZGMDJGMCIgb2Zmc2V0PSIwJSIvPjxzdG9wIHN0b3AtY29sb3I9IiNGRkM4MDAiIG9mZnNldD0iMTAwJSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxnIGZpbGw9Im5vbmUiPjxwYXRoIGQ9Ik0uNCAxMTkuMTJsMjMuODEtMTguMjRDMzYuODYgMTE3LjM5IDUwLjMgMTI1IDY1LjI2IDEyNWMxNC44OCAwIDI3Ljk0LTcuNTIgNDAuMDItMjMuOWwyNC4xNSAxNy44QzExMiAxNDIuNTIgOTAuMzQgMTU1IDY1LjI2IDE1NWMtMjUgMC00Ni44Ny0xMi40LTY0Ljg2LTM1Ljg4eiIgZmlsbD0idXJsKCNhKSIvPjxwYXRoIGZpbGw9InVybCgjYikiIGQ9Ik02NS4xOCAzOS44NEwyMi44IDc2LjM2IDMuMjEgNTMuNjQgNjUuMjcuMTZsNjEuNTcgNTMuNTItMTkuNjggMjIuNjR6Ii8+PC9nPjwvc3ZnPg=="
+									},
+									"categories": [
+											{
+													"id": 4,
+													"name": "Productivity"
+											},
+											{
+													"id": 6,
+													"name": "Communication"
+											}
+									],
+									"displayName": "ClickUp",
+									"typeVersion": 1
+							},
+							{
+									"id": 42,
+									"icon": "file:clickup.svg",
+									"name": "n8n-nodes-base.clickUpTrigger",
+									"defaults": {
+											"name": "ClickUp Trigger"
+									},
+									"iconData": {
+											"type": "file",
+											"fileBuffer": "data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSItMTAgMCAxNTUgMTU1IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPjxkZWZzPjxsaW5lYXJHcmFkaWVudCB4MT0iMCUiIHkxPSI2OC4wMSUiIHkyPSI2OC4wMSUiIGlkPSJhIj48c3RvcCBzdG9wLWNvbG9yPSIjODkzMEZEIiBvZmZzZXQ9IjAlIi8+PHN0b3Agc3RvcC1jb2xvcj0iIzQ5Q0NGOSIgb2Zmc2V0PSIxMDAlIi8+PC9saW5lYXJHcmFkaWVudD48bGluZWFyR3JhZGllbnQgeDE9IjAlIiB5MT0iNjguMDElIiB5Mj0iNjguMDElIiBpZD0iYiI+PHN0b3Agc3RvcC1jb2xvcj0iI0ZGMDJGMCIgb2Zmc2V0PSIwJSIvPjxzdG9wIHN0b3AtY29sb3I9IiNGRkM4MDAiIG9mZnNldD0iMTAwJSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxnIGZpbGw9Im5vbmUiPjxwYXRoIGQ9Ik0uNCAxMTkuMTJsMjMuODEtMTguMjRDMzYuODYgMTE3LjM5IDUwLjMgMTI1IDY1LjI2IDEyNWMxNC44OCAwIDI3Ljk0LTcuNTIgNDAuMDItMjMuOWwyNC4xNSAxNy44QzExMiAxNDIuNTIgOTAuMzQgMTU1IDY1LjI2IDE1NWMtMjUgMC00Ni44Ny0xMi40LTY0Ljg2LTM1Ljg4eiIgZmlsbD0idXJsKCNhKSIvPjxwYXRoIGZpbGw9InVybCgjYikiIGQ9Ik02NS4xOCAzOS44NEwyMi44IDc2LjM2IDMuMjEgNTMuNjQgNjUuMjcuMTZsNjEuNTcgNTMuNTItMTkuNjggMjIuNjR6Ii8+PC9nPjwvc3ZnPg=="
+									},
+									"categories": [
+											{
+													"id": 4,
+													"name": "Productivity"
+											},
+											{
+													"id": 6,
+													"name": "Communication"
+											}
+									],
+									"displayName": "ClickUp Trigger",
+									"typeVersion": 1
+							}
+					]
+			},
+			{
+					"id": 980,
+					"name": "Loading Data Into Spreadsheet or Database",
+					"totalViews": 1553,
+					"recentViews": 0,
+					"user": {
+							"username": "admin"
+					},
+					"createdAt": "2021-03-11T11:20:25.787Z",
+					"nodes": [
+							{
+									"id": 14,
+									"icon": "file:apiTemplateIo.svg",
+									"name": "n8n-nodes-base.apiTemplateIo",
+									"defaults": {
+											"name": "APITemplate.io"
+									},
+									"iconData": {
+											"type": "file",
+											"fileBuffer": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI4MCIgaGVpZ2h0PSI4MCIgdmlld0JveD0iMCAwIDIzLjE2NyAyMS4xNjciPjxwYXRoIGZpbGw9IiM5MWJjZTUiIGQ9Ik0xOC42MTEuNTA0TDMuNDczIDExLjI0bDQuNTk3IDIuMjEzIDEuMDY2IDMuODgzIDMuMTcxLTIuMjI2IDIuODAyLjk1MXoiLz48cGF0aCBmaWxsPSIjMWYyMTJiIiBkPSJNOS4xNzIgMTcuNTk3YS4yNjQuMjY0IDAgMDEtLjI5LS4xOTJsLTEuMDM1LTMuNzY3LTQuNDg4LTIuMTZhLjI2NS4yNjUgMCAwMS0uMDM5LS40NTRMMTguNDU4LjI4OGEuMjY0LjI2NCAwIDAxLjQxLjI3NGwtMy41IDE1LjU1NmEuMjY1LjI2NSAwIDAxLS4zNDQuMTkzbC0yLjY3NC0uOTA4LTMuMDYxIDIuMTVhLjI3My4yNzMgMCAwMS0uMTE3LjA0NHptLTUuMTgtNi40MDFsNC4xOTMgMi4wMTdjLjA2OS4wMzQuMTIuMDk1LjE0LjE2OWwuOTY3IDMuNTIgMi44NjMtMi4wMWEuMjY1LjI2NSAwIDAxLjIzNy0uMDMzbDIuNTI0Ljg1NkwxOC4yIDEuMTE5eiIvPjxwYXRoIGZpbGw9IiMzYTg0YzEiIGQ9Ik05LjMzOSAxNy4wNzlsLjk0Ni0yLjkxM0wxOC42NDIuNzI4IDguMjI2IDEzLjIzNXoiLz48cGF0aCBmaWxsPSIjMWYyMTJiIiBkPSJNOS4zNTYgMTcuMjFhLjEzMi4xMzIgMCAwMS0uMTQzLS4xNzJsLjk0Ni0yLjkxM2EuMTYuMTYgMCAwMS4wMTQtLjAzbDcuMzkzLTExLjg4OC05LjQxOSAxMS4xNTZhLjEzMy4xMzMgMCAwMS0uMjAyLS4xNzFMMTguNTQuNjQyYS4xMzIuMTMyIDAgMDEuMjE0LjE1NmwtOC4zNDggMTMuNDI0LS45NDEgMi44OThhLjEzMi4xMzIgMCAwMS0uMTA5LjA5em0tMy4yMTUgMS4wNDVjLTEuMTY4LjAyOS0yLjMwMy0uMzczLTMuMDY3LTEuMjg3LS40ODUtLjU4LS42ODMtMS41NzQuMjc1LTEuNzA1Ljg1OS0uMTE5IDEuMjI5LjQ4NSAxLjQ4IDEuMTk2LjgwNCAyLjAyNi4xNiAyLjkzOC0xLjY4IDQuMjcyLS4xNDQuMDkuMDE1LjI5Ni4xNTkuMjA2IDEuMjE4LTEgMS44MjktMS40NjYgMi4xLTIuNDQ4LjEzNC0xLjM2LS40MDItMy4wOTEtMS4zODQtMy40MzYtMS4xMi0uMzgyLTIuMDYzLjUxNi0xLjQ5OSAxLjU4NS42OTkgMS4zMjQgMi4yMyAxLjkxNCAzLjY1MiAxLjg3OC4xNy0uMDA0LjEzMy0uMjY2LS4wMzYtLjI2MXoiLz48cGF0aCBmaWxsPSIjMWYyMTJiIiBkPSJNNy4yMzUgMTguMTRhMTQuOTUgMTQuOTUgMCAwMS0uNzU5LjA5Yy0uMTcuMDE3LS4xMzMuMjc5LjAzNi4yNjIuMjUzLS4wMjUuNTA3LS4wNTIuNzU4LS4wOS4xNjktLjAyNi4xMzMtLjI4OC0uMDM1LS4yNjJ6bTEuMTk0LS41MDRhOC40NiA4LjQ2IDAgMDEtLjg2NS4zNDRjLS4xNjIuMDU0LS4wNTcuMjk3LjEwNC4yNDNhOC4zNyA4LjM3IDAgMDAuODY1LS4zNDRjLjE1NC0uMDcxLjA1LS4zMTUtLjEwNC0uMjQzeiIvPjxwYXRoIGQ9Ik0xMi41OTkgMTUuMjJhLjEzMS4xMzEgMCAwMS0uMDctLjAxbC0yLjE2OC0uOTI0YS4xMzMuMTMzIDAgMDEuMTAzLS4yNDNsMi4xNjkuOTIzYS4xMzMuMTMzIDAgMDEtLjAzNC4yNTN6Ii8+PC9zdmc+"
+									},
+									"categories": [
+											{
+													"id": 1,
+													"name": "Marketing"
+											}
+									],
+									"displayName": "APITemplate.io",
+									"typeVersion": 1
+							},
+							{
+									"id": 26,
+									"icon": "file:sns.svg",
+									"name": "n8n-nodes-base.awsSnsTrigger",
+									"defaults": {
+											"name": "AWS SNS Trigger"
+									},
+									"iconData": {
+											"type": "file",
+											"fileBuffer": "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjQ5MCIgaGVpZ2h0PSIyNTAwIiB2aWV3Qm94PSIwIDAgMjU2IDI1NyIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWlkWU1pZCI+PHBhdGggZD0iTTk4Ljg3NSAyMzIuMDMzbC0yNi40MzMtNy40MDgtMjUuMDAxLTI4LjUwOCAzMS4yNzItLjg2MyAyMC4xNjIgMzYuNzc5bS02MS4xMjUtMTguOGwtMTQuODc1LTQuMTY2LTE0LjA1OC0xNi4wMzQgMTcuMDgyLTIuODA5IDExLjg1MSAyMy4wMDkiIGZpbGw9IiM5OTVCODAiLz48cGF0aCBkPSJNMCAxOTEuMDE3bDE1LjIwNCAzLjA5MSAyLjIwNy0zLjg4MlY1OC41MDNsLTIuMjA3LTIuNTYxTDAgNjQuNnYxMjYuNDE3IiBmaWxsPSIjN0IzRjY1Ii8+PHBhdGggZD0iTTczLjkzMyA2OS43MDhMMTUuMjA4IDU1Ljk0MnYxMzguMTY2bDguNzk4LS44MTggMTMuNzQ0IDE5Ljk0MyAxMC42LTIyLjIwNSAyNS41ODMtMi4zNzhWNjkuNzA4IiBmaWxsPSIjQzE3QjlEIi8+PHBhdGggZD0iTTMzLjk1OCAxOTguMTMzbDI2LjA2MyA1LjI1IDEuNzE2LTQuMDQ1VjM3LjQ0bC0xLjcxNi0zLjY2NS0yNi4wNjMgMTMuMjA4djE1MS4xNSIgZmlsbD0iIzdCM0Y2NSIvPjxwYXRoIGQ9Ik0yMDguNzM0IDgxLjUxNkw2MC4wMjEgMzMuNzc1djE2OS42MTJsMTcuMjIxLTIuMjE2IDIxLjYzMyAzMC44NjIgMTcuMTI2LTM1Ljg1IDkyLjczMy0xMS45MzNWODEuNTE2IiBmaWxsPSIjQzE3QjlEIi8+PHBhdGggZD0iTTE4MS44MzMgMjU2LjQ5MmwtMzcuNTY2LTEwLjUyNS0zNS41MDktNDAuNSA0Ni4wMzMtLjQ2OCAyNy4wNDIgNTEuNDkzIiBmaWxsPSIjOTk1QjgwIi8+PHBhdGggZD0iTTg5LjU5MSAyMDguOTVsMzguMzMgNy40MTcgMi45NzctMi41NjZWNC4xMTdMMTI3LjkyMSAwbC0zOC4zMyAxOS4xNThWMjA4Ljk1IiBmaWxsPSIjN0IzRjY1Ii8+PHBhdGggZD0iTTI1NiA2NC4wMzNMMTI3LjkyNSAwdjIxNi4zNjdsMjIuNTk3LTQuNTI4IDMxLjMxMSA0NC42NTMgMjYuOTAxLTU2LjMwOS0uMDE3LS4wMDJMMjU2IDE5MC43MDhWNjQuMDMzIiBmaWxsPSIjQzE3QjlEIi8+PC9zdmc+"
+									},
+									"categories": [
+											{
+													"id": 5,
+													"name": "Development"
+											},
+											{
+													"id": 6,
+													"name": "Communication"
+											}
+									],
+									"displayName": "AWS SNS Trigger",
+									"typeVersion": 1
+							},
+							{
+									"id": 38,
+									"icon": "file:chargebee.png",
+									"name": "n8n-nodes-base.chargebeeTrigger",
+									"defaults": {
+											"name": "Chargebee Trigger"
+									},
+									"iconData": {
+											"type": "file",
+											"fileBuffer": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAMAAAANIilAAAAAk1BMVEUAAAD9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azXS0qjqAAAAMHRSTlMAAta1CPr3HAyb8mNPLBLq5MmGZ1wi28+soEQX7pZ9dkk/MijDurCMims54b6lb1YyU8hoAAACDklEQVRIx+2V2bKiMBBAmyTs+w6CIi64O/n/rxtKJwIjJPA4Nfc8acOpTnfSAX7493G2QZN6Zeml+GwVS0xiNSXtYeBIm6lKEaJf3C5kjrvz6SioFruVTKcIJEG1D8oBa1wXUy6+w2lVxhFFuU+0j4KOjwdOjUHQnHJ/DVZ4iaXXatTo2OuhPuEWXm9fLOhxPQjldeeuyV/NqGT+su1ucZuRkt5PMRElDmCEbdK2MNcmKnaZi2EUrd7GMEHEXGMPi8mYfFruqjd2NLrE+/P9oF9nyCuW+P4JhcorcBbL4dc2WSxyEcoBe9Vi5yJlEc8RyTp7ldVo0w8rkZyzN3ddExjR4sw7TmZhzSRhEddZ3m2TRar5+3z8hDZ/xlMSnzCPnbDu9NcPhLItzKAZG0hJnHVYYhnDYtSS2RksJ+fcQi0qAbDtKXknU84oWPQJtizvxanpmcCQJ3VtiA1lUlbdzk7rfs/bzwFSVR/bsaDhjHukvvfJsbBXm8S+UboXTwfDQFjXG6S0/dde18oGrN20TI4DOzHaA3drzAJWPqVy2Fa+5qTWDn05AKJJbS+eafsHtUlRUgAHB/dkJT+ddJzI7U+3kopjVgiGUwroF7J/IWAac+7RFeo0D6X3daQCiRBNZs2XVrmDr4e2zQ1aVhrMwwl9+Z1Zzw42ptQPHZiPFJv5IXENWXGvdRhL8MN/y2+uRpQ1fWz5HAAAAABJRU5ErkJggg=="
+									},
+									"categories": [
+											{
+													"id": 8,
+													"name": "Finance & Accounting"
+											}
+									],
+									"displayName": "Chargebee Trigger",
+									"typeVersion": 1
+							},
+							{
+									"id": 42,
+									"icon": "file:clickup.svg",
+									"name": "n8n-nodes-base.clickUpTrigger",
+									"defaults": {
+											"name": "ClickUp Trigger"
+									},
+									"iconData": {
+											"type": "file",
+											"fileBuffer": "data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSItMTAgMCAxNTUgMTU1IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPjxkZWZzPjxsaW5lYXJHcmFkaWVudCB4MT0iMCUiIHkxPSI2OC4wMSUiIHkyPSI2OC4wMSUiIGlkPSJhIj48c3RvcCBzdG9wLWNvbG9yPSIjODkzMEZEIiBvZmZzZXQ9IjAlIi8+PHN0b3Agc3RvcC1jb2xvcj0iIzQ5Q0NGOSIgb2Zmc2V0PSIxMDAlIi8+PC9saW5lYXJHcmFkaWVudD48bGluZWFyR3JhZGllbnQgeDE9IjAlIiB5MT0iNjguMDElIiB5Mj0iNjguMDElIiBpZD0iYiI+PHN0b3Agc3RvcC1jb2xvcj0iI0ZGMDJGMCIgb2Zmc2V0PSIwJSIvPjxzdG9wIHN0b3AtY29sb3I9IiNGRkM4MDAiIG9mZnNldD0iMTAwJSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxnIGZpbGw9Im5vbmUiPjxwYXRoIGQ9Ik0uNCAxMTkuMTJsMjMuODEtMTguMjRDMzYuODYgMTE3LjM5IDUwLjMgMTI1IDY1LjI2IDEyNWMxNC44OCAwIDI3Ljk0LTcuNTIgNDAuMDItMjMuOWwyNC4xNSAxNy44QzExMiAxNDIuNTIgOTAuMzQgMTU1IDY1LjI2IDE1NWMtMjUgMC00Ni44Ny0xMi40LTY0Ljg2LTM1Ljg4eiIgZmlsbD0idXJsKCNhKSIvPjxwYXRoIGZpbGw9InVybCgjYikiIGQ9Ik02NS4xOCAzOS44NEwyMi44IDc2LjM2IDMuMjEgNTMuNjQgNjUuMjcuMTZsNjEuNTcgNTMuNTItMTkuNjggMjIuNjR6Ii8+PC9nPjwvc3ZnPg=="
+									},
+									"categories": [
+											{
+													"id": 4,
+													"name": "Productivity"
+											},
+											{
+													"id": 6,
+													"name": "Communication"
+											}
+									],
+									"displayName": "ClickUp Trigger",
+									"typeVersion": 1
+							}
+					]
+			},
+			{
+					"id": 225,
+					"name": "Trending \"Show HN\" to email",
+					"totalViews": 1459,
+					"recentViews": 0,
+					"user": {
+							"username": "admin"
+					},
+					"createdAt": "2020-01-01T18:56:31.672Z",
+					"nodes": [
+							{
+									"id": 7,
+									"icon": "file:airtable.svg",
+									"name": "n8n-nodes-base.airtable",
+									"defaults": {
+											"name": "Airtable"
+									},
+									"iconData": {
+											"type": "file",
+											"fileBuffer": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyMDAgMTcwIj48cGF0aCBkPSJNODkgNC44TDE2LjIgMzQuOWMtNC4xIDEuNy00IDcuNC4xIDkuMWw3My4yIDI5YzYuNCAyLjYgMTMuNiAyLjYgMjAgMGw3My4yLTI5YzQuMS0xLjYgNC4xLTcuNC4xLTkuMWwtNzMtMzAuMUMxMDMuMiAyIDk1LjcgMiA4OSA0LjgiIGZpbGw9IiNmY2I0MDAiLz48cGF0aCBkPSJNMTA1LjkgODguOXY3Mi41YzAgMy40IDMuNSA1LjggNi43IDQuNWw4MS42LTMxLjdjMS45LS43IDMuMS0yLjUgMy4xLTQuNVY1Ny4yYzAtMy40LTMuNS01LjgtNi43LTQuNUwxMDkgODQuM2MtMS45LjgtMy4xIDIuNi0zLjEgNC42IiBmaWxsPSIjMThiZmZmIi8+PHBhdGggZD0iTTg2LjkgOTIuNmwtMjQuMiAxMS43LTIuNSAxLjJMOS4xIDEzMGMtMy4yIDEuNi03LjQtLjgtNy40LTQuNFY1Ny41YzAtMS4zLjctMi40IDEuNi0zLjMuNC0uNC44LS43IDEuMi0uOSAxLjItLjcgMy0uOSA0LjQtLjNsNzcuNSAzMC43YzQgMS41IDQuMyA3LjEuNSA4LjkiIGZpbGw9IiNmODJiNjAiLz48cGF0aCBkPSJNODYuOSA5Mi42bC0yNC4yIDExLjctNTkuNC01MGMuNC0uNC44LS43IDEuMi0uOSAxLjItLjcgMy0uOSA0LjQtLjNsNzcuNSAzMC43YzQgMS40IDQuMyA3IC41IDguOCIgZmlsbD0iI2JhMWU0NSIvPjwvc3ZnPg=="
+									},
+									"categories": [
+											{
+													"id": 3,
+													"name": "Data & Storage"
+											}
+									],
+									"displayName": "Airtable",
+									"typeVersion": 2
+							},
+							{
+									"id": 11,
+									"icon": "file:amqp.png",
+									"name": "n8n-nodes-base.amqpTrigger",
+									"defaults": {
+											"name": "AMQP Trigger"
+									},
+									"iconData": {
+											"type": "file",
+											"fileBuffer": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAB7UlEQVRoge2W4W3CMBCFj26QjkBHSEdIR4AR6Ah0BBgBRqAjhBFgBBghHaEVlV29PN0lDr+o9D7JEjhn+975bJ8JIYQQQgghhBBCCCGEEA9CY2bf0NaBW2uyu7UN2XSOzTyY60J2BzNbObbsH7eTmS2mhHJHE1wmCD7A93ngEAquHaHc2omCcysSXQW74g32BHfwfTEiuCoQm9vuDsEndPYpELxKjjBj0foCEXX6XdM3by3c7aOZPZvZzMzeaBzbIh9pzIuZXaG/RqNIMAq7Ur8XCHQ2kx3LC56DMQ39X4LI23zbAd88ruRHD09wTVF5p+/eBZI5g7O8w5FgXOvsZAI7PxRwS4HGIPbm8wRjBL/Sgp/QNyQYHWySmOxgJBgFeGnPfZHgDVyufET+YMEVCdo7gziCTBbGmRKlGQpCMXOnj+1L6B0JFsxndO3cjjZyjo6OnZeqGb5gqhTQS3qKeK1SwbesfB3IrF/awqu+g8Dgs5SLE37SciHiPUv8rLVp7k2wdl63tDDqgTs8lqpINWGXbSTKe9rlJgXME7C9I6V7oGAWsEzv2gzeN2TstkbCZyIJWBYKWUwtF4foKGU9TpRGdZDSdVDpDNXSVVBLt5TeucS9K6X/E3USX3rshBBCCCGEEEIIIYQQ4tExsx8PuuPnwhCIbgAAAABJRU5ErkJggg=="
+									},
+									"categories": [
+											{
+													"id": 5,
+													"name": "Development"
+											},
+											{
+													"id": 6,
+													"name": "Communication"
+											}
+									],
+									"displayName": "AMQP Trigger",
+									"typeVersion": 1
+							},
+							{
+									"id": 14,
+									"icon": "file:apiTemplateIo.svg",
+									"name": "n8n-nodes-base.apiTemplateIo",
+									"defaults": {
+											"name": "APITemplate.io"
+									},
+									"iconData": {
+											"type": "file",
+											"fileBuffer": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI4MCIgaGVpZ2h0PSI4MCIgdmlld0JveD0iMCAwIDIzLjE2NyAyMS4xNjciPjxwYXRoIGZpbGw9IiM5MWJjZTUiIGQ9Ik0xOC42MTEuNTA0TDMuNDczIDExLjI0bDQuNTk3IDIuMjEzIDEuMDY2IDMuODgzIDMuMTcxLTIuMjI2IDIuODAyLjk1MXoiLz48cGF0aCBmaWxsPSIjMWYyMTJiIiBkPSJNOS4xNzIgMTcuNTk3YS4yNjQuMjY0IDAgMDEtLjI5LS4xOTJsLTEuMDM1LTMuNzY3LTQuNDg4LTIuMTZhLjI2NS4yNjUgMCAwMS0uMDM5LS40NTRMMTguNDU4LjI4OGEuMjY0LjI2NCAwIDAxLjQxLjI3NGwtMy41IDE1LjU1NmEuMjY1LjI2NSAwIDAxLS4zNDQuMTkzbC0yLjY3NC0uOTA4LTMuMDYxIDIuMTVhLjI3My4yNzMgMCAwMS0uMTE3LjA0NHptLTUuMTgtNi40MDFsNC4xOTMgMi4wMTdjLjA2OS4wMzQuMTIuMDk1LjE0LjE2OWwuOTY3IDMuNTIgMi44NjMtMi4wMWEuMjY1LjI2NSAwIDAxLjIzNy0uMDMzbDIuNTI0Ljg1NkwxOC4yIDEuMTE5eiIvPjxwYXRoIGZpbGw9IiMzYTg0YzEiIGQ9Ik05LjMzOSAxNy4wNzlsLjk0Ni0yLjkxM0wxOC42NDIuNzI4IDguMjI2IDEzLjIzNXoiLz48cGF0aCBmaWxsPSIjMWYyMTJiIiBkPSJNOS4zNTYgMTcuMjFhLjEzMi4xMzIgMCAwMS0uMTQzLS4xNzJsLjk0Ni0yLjkxM2EuMTYuMTYgMCAwMS4wMTQtLjAzbDcuMzkzLTExLjg4OC05LjQxOSAxMS4xNTZhLjEzMy4xMzMgMCAwMS0uMjAyLS4xNzFMMTguNTQuNjQyYS4xMzIuMTMyIDAgMDEuMjE0LjE1NmwtOC4zNDggMTMuNDI0LS45NDEgMi44OThhLjEzMi4xMzIgMCAwMS0uMTA5LjA5em0tMy4yMTUgMS4wNDVjLTEuMTY4LjAyOS0yLjMwMy0uMzczLTMuMDY3LTEuMjg3LS40ODUtLjU4LS42ODMtMS41NzQuMjc1LTEuNzA1Ljg1OS0uMTE5IDEuMjI5LjQ4NSAxLjQ4IDEuMTk2LjgwNCAyLjAyNi4xNiAyLjkzOC0xLjY4IDQuMjcyLS4xNDQuMDkuMDE1LjI5Ni4xNTkuMjA2IDEuMjE4LTEgMS44MjktMS40NjYgMi4xLTIuNDQ4LjEzNC0xLjM2LS40MDItMy4wOTEtMS4zODQtMy40MzYtMS4xMi0uMzgyLTIuMDYzLjUxNi0xLjQ5OSAxLjU4NS42OTkgMS4zMjQgMi4yMyAxLjkxNCAzLjY1MiAxLjg3OC4xNy0uMDA0LjEzMy0uMjY2LS4wMzYtLjI2MXoiLz48cGF0aCBmaWxsPSIjMWYyMTJiIiBkPSJNNy4yMzUgMTguMTRhMTQuOTUgMTQuOTUgMCAwMS0uNzU5LjA5Yy0uMTcuMDE3LS4xMzMuMjc5LjAzNi4yNjIuMjUzLS4wMjUuNTA3LS4wNTIuNzU4LS4wOS4xNjktLjAyNi4xMzMtLjI4OC0uMDM1LS4yNjJ6bTEuMTk0LS41MDRhOC40NiA4LjQ2IDAgMDEtLjg2NS4zNDRjLS4xNjIuMDU0LS4wNTcuMjk3LjEwNC4yNDNhOC4zNyA4LjM3IDAgMDAuODY1LS4zNDRjLjE1NC0uMDcxLjA1LS4zMTUtLjEwNC0uMjQzeiIvPjxwYXRoIGQ9Ik0xMi41OTkgMTUuMjJhLjEzMS4xMzEgMCAwMS0uMDctLjAxbC0yLjE2OC0uOTI0YS4xMzMuMTMzIDAgMDEuMTAzLS4yNDNsMi4xNjkuOTIzYS4xMzMuMTMzIDAgMDEtLjAzNC4yNTN6Ii8+PC9zdmc+"
+									},
+									"categories": [
+											{
+													"id": 1,
+													"name": "Marketing"
+											}
+									],
+									"displayName": "APITemplate.io",
+									"typeVersion": 1
+							},
+							{
+									"id": 19,
+									"icon": "file:autopilot.svg",
+									"name": "n8n-nodes-base.autopilotTrigger",
+									"defaults": {
+											"name": "Autopilot Trigger"
+									},
+									"iconData": {
+											"type": "file",
+											"fileBuffer": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjM4IDI2IDM1IDM1Ij48Y2lyY2xlIGN4PSI1MCIgY3k9IjUwIiByPSI0MCIgc3Ryb2tlPSIjMThkNGIyIiBzdHJva2Utd2lkdGg9IjMiIGZpbGw9IiMxOGQ0YjIiLz48cGF0aCBmaWxsPSIjZmZmIiBkPSJNNDUuNCA0Mi42aDE5LjlsMy40LTQuOEg0MmwzLjQgNC44em0zLjEgOC4zaDEzLjFsMy40LTQuOEg0NS40bDMuMSA0Ljh6bTU0LS43Ii8+PC9zdmc+"
+									},
+									"categories": [
+											{
+													"id": 1,
+													"name": "Marketing"
+											}
+									],
+									"displayName": "Autopilot Trigger",
+									"typeVersion": 1
+							},
+							{
+									"id": 20,
+									"icon": "file:lambda.svg",
+									"name": "n8n-nodes-base.awsLambda",
+									"defaults": {
+											"name": "AWS Lambda"
+									},
+									"iconData": {
+											"type": "file",
+											"fileBuffer": "data:image/svg+xml;base64,PHN2ZyBoZWlnaHQ9IjI1MDAiIHZpZXdCb3g9Ii0zLjAyMyAtMC4yMiA0MjAuOTIzIDQzMy41NCIgd2lkdGg9IjI0NDMiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PHBhdGggZD0iTTIwOC40NSAyMjcuODljLTEuNTkgMi4yNi0yLjkzIDQuMTItNC4yMiA2cS0zMC44NiA0NS40Mi02MS43IDkwLjgzLTI4LjY5IDQyLjI0LTU3LjQ0IDg0LjQzYTMuODggMy44OCAwIDAxLTIuNzMgMS41OXEtNDAuNTktLjM1LTgxLjE2LS44OGMtLjMgMC0uNjEtLjA5LTEuMi0uMThhMTQuNDQgMTQuNDQgMCAwMS43Ni0xLjY1cTI4LjMxLTQzLjg5IDU2LjYyLTg3Ljc2IDI1LjExLTM4Ljg4IDUwLjI1LTc3Ljc0IDI3Ljg2LTQzLjE4IDU1LjY5LTg2LjQyYzIuNzQtNC4yNSA1LjU5LTguNDIgOC4xOS0xMi43NWE1LjI2IDUuMjYgMCAwMC41Ni0zLjgzYy01LTE1Ljk0LTEwLjEtMzEuODQtMTUuMTktNDcuNzQtMi4xOC02LjgxLTQuNDYtMTMuNTgtNi41LTIwLjQzLS42Ni0yLjItMS43NS0yLjg3LTQtMi44Ni0xNyAuMDctMzMuOS4wNS01MC44NS4wNS0zLjIyIDAtMy4yMyAwLTMuMjMtMy4xOCAwLTIwLjg0IDAtNDEuNjgtLjA2LTYyLjUyIDAtMi4zMi43Ni0yLjg0IDIuOTQtMi44NHE1MS4xOS4wOSAxMDIuNCAwYTMuMjkgMy4yOSAwIDAxMy42IDIuNDNxMjcgNjcuOTEgNTQgMTM1Ljc3IDMxLjUgNzkuMTQgNjMgMTU4LjNjNi41MiAxNi4zOCAxMy4wOSAzMi43NSAxOS41NCA0OS4xNy43NyAyIDEuNTcgMi4zOCAzLjU5IDEuNzYgMTcuODktNS41MyAzNS44Mi0xMC45MSA1My43LTE2LjQ1IDIuMjUtLjcgMy4wNy0uMjMgMy43NyAyIDYuMSAxOS4xNyAxMi4zMiAzOC4zIDE4LjUgNTcuNDUuMjEuNjYuMzcgMS4zMy42MiAyLjI1LTEuMjguNDctMi40OCAxLTMuNzEgMS4zNHEtNjEgMTkuMzMtMTIxLjkzIDM4LjY4Yy0xLjk0LjYxLTIuNTItLjA1LTMuMTctMS42OHEtMTguNjEtNDcuMTYtMzcuMzEtOTQuMjgtMTguMjktNDYuMTQtMzYuNi05Mi4yOGMtMS44My00LjYyLTMuNjMtOS4yNi01LjQ2LTEzLjg4LS4yOS0uNzktLjY5LTEuNDgtMS4yNy0yLjd6IiBmaWxsPSIjZmE3ZTE0Ii8+PC9zdmc+"
+									},
+									"categories": [
+											{
+													"id": 5,
+													"name": "Development"
+											}
+									],
+									"displayName": "AWS Lambda",
+									"typeVersion": 1
+							},
+							{
+									"id": 114,
+									"icon": "file:helpScout.svg",
+									"name": "n8n-nodes-base.helpScoutTrigger",
+									"defaults": {
+											"name": "HelpScout Trigger"
+									},
+									"iconData": {
+											"type": "file",
+											"fileBuffer": "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjU2IiBoZWlnaHQ9IjMxMCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWlkWU1pZCI+PHBhdGggZD0iTTE4LjQzMiAxODAuOTY5bDkwLjQ4NC05MC40ODVhNjMuNzE3IDYzLjcxNyAwIDAwMTguOTktNDUuNDI4QTY0LjI0NSA2NC4yNDUgMCAwMDEwOS40NzYgMEwxOC45OSA5MC40ODRBNjMuNzE3IDYzLjcxNyAwIDAwMCAxMzUuOTEzYzAgMTcuNjg3IDcuMDc1IDMzLjUxMiAxOC40MzIgNDUuMDU2em0yMTkuMTM2LTUyLjg3NmwtOTAuNDg0IDkwLjQ4NGE2My43MTcgNjMuNzE3IDAgMDAtMTguOTkgNDUuNDI5IDY0LjI0NSA2NC4yNDUgMCAwMDE4LjQzMSA0NS4wNTZsOTAuNDg0LTkwLjQ4NUE2My43MTcgNjMuNzE3IDAgMDAyNTYgMTczLjE1YzAtMTcuNjg3LTcuMDc1LTMzLjUxMy0xOC40MzItNDUuMDU2em0tLjU1OS0zNy40MjJBNjMuNzE3IDYzLjcxNyAwIDAwMjU2IDQ1LjI0MiA2NC4yNDUgNjQuMjQ1IDAgMDAyMzcuNTY4LjE4NkwxOC45OTEgMjE4LjU3N0M3LjI2IDIzMC4zMDcgMCAyNDYuMzIgMCAyNjQuMTkyYTY0LjI0NSA2NC4yNDUgMCAwMDE4LjQzMiA0NS4wNTZMMjM3LjAwOSA5MC42NzF6IiBmaWxsPSIjMTI5MkVFIi8+PC9zdmc+"
+									},
+									"categories": [
+											{
+													"id": 6,
+													"name": "Communication"
+											}
+									],
+									"displayName": "HelpScout Trigger",
+									"typeVersion": 1
+							}
+					]
+			},
+			{
+					"id": 524,
+					"name": "Get today's date and day using the Function node",
+					"totalViews": 1354,
+					"recentViews": 0,
+					"user": {
+							"username": "admin"
+					},
+					"createdAt": "2020-07-16T09:26:32.454Z",
+					"nodes": [
+							{
+									"id": 14,
+									"icon": "file:apiTemplateIo.svg",
+									"name": "n8n-nodes-base.apiTemplateIo",
+									"defaults": {
+											"name": "APITemplate.io"
+									},
+									"iconData": {
+											"type": "file",
+											"fileBuffer": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI4MCIgaGVpZ2h0PSI4MCIgdmlld0JveD0iMCAwIDIzLjE2NyAyMS4xNjciPjxwYXRoIGZpbGw9IiM5MWJjZTUiIGQ9Ik0xOC42MTEuNTA0TDMuNDczIDExLjI0bDQuNTk3IDIuMjEzIDEuMDY2IDMuODgzIDMuMTcxLTIuMjI2IDIuODAyLjk1MXoiLz48cGF0aCBmaWxsPSIjMWYyMTJiIiBkPSJNOS4xNzIgMTcuNTk3YS4yNjQuMjY0IDAgMDEtLjI5LS4xOTJsLTEuMDM1LTMuNzY3LTQuNDg4LTIuMTZhLjI2NS4yNjUgMCAwMS0uMDM5LS40NTRMMTguNDU4LjI4OGEuMjY0LjI2NCAwIDAxLjQxLjI3NGwtMy41IDE1LjU1NmEuMjY1LjI2NSAwIDAxLS4zNDQuMTkzbC0yLjY3NC0uOTA4LTMuMDYxIDIuMTVhLjI3My4yNzMgMCAwMS0uMTE3LjA0NHptLTUuMTgtNi40MDFsNC4xOTMgMi4wMTdjLjA2OS4wMzQuMTIuMDk1LjE0LjE2OWwuOTY3IDMuNTIgMi44NjMtMi4wMWEuMjY1LjI2NSAwIDAxLjIzNy0uMDMzbDIuNTI0Ljg1NkwxOC4yIDEuMTE5eiIvPjxwYXRoIGZpbGw9IiMzYTg0YzEiIGQ9Ik05LjMzOSAxNy4wNzlsLjk0Ni0yLjkxM0wxOC42NDIuNzI4IDguMjI2IDEzLjIzNXoiLz48cGF0aCBmaWxsPSIjMWYyMTJiIiBkPSJNOS4zNTYgMTcuMjFhLjEzMi4xMzIgMCAwMS0uMTQzLS4xNzJsLjk0Ni0yLjkxM2EuMTYuMTYgMCAwMS4wMTQtLjAzbDcuMzkzLTExLjg4OC05LjQxOSAxMS4xNTZhLjEzMy4xMzMgMCAwMS0uMjAyLS4xNzFMMTguNTQuNjQyYS4xMzIuMTMyIDAgMDEuMjE0LjE1NmwtOC4zNDggMTMuNDI0LS45NDEgMi44OThhLjEzMi4xMzIgMCAwMS0uMTA5LjA5em0tMy4yMTUgMS4wNDVjLTEuMTY4LjAyOS0yLjMwMy0uMzczLTMuMDY3LTEuMjg3LS40ODUtLjU4LS42ODMtMS41NzQuMjc1LTEuNzA1Ljg1OS0uMTE5IDEuMjI5LjQ4NSAxLjQ4IDEuMTk2LjgwNCAyLjAyNi4xNiAyLjkzOC0xLjY4IDQuMjcyLS4xNDQuMDkuMDE1LjI5Ni4xNTkuMjA2IDEuMjE4LTEgMS44MjktMS40NjYgMi4xLTIuNDQ4LjEzNC0xLjM2LS40MDItMy4wOTEtMS4zODQtMy40MzYtMS4xMi0uMzgyLTIuMDYzLjUxNi0xLjQ5OSAxLjU4NS42OTkgMS4zMjQgMi4yMyAxLjkxNCAzLjY1MiAxLjg3OC4xNy0uMDA0LjEzMy0uMjY2LS4wMzYtLjI2MXoiLz48cGF0aCBmaWxsPSIjMWYyMTJiIiBkPSJNNy4yMzUgMTguMTRhMTQuOTUgMTQuOTUgMCAwMS0uNzU5LjA5Yy0uMTcuMDE3LS4xMzMuMjc5LjAzNi4yNjIuMjUzLS4wMjUuNTA3LS4wNTIuNzU4LS4wOS4xNjktLjAyNi4xMzMtLjI4OC0uMDM1LS4yNjJ6bTEuMTk0LS41MDRhOC40NiA4LjQ2IDAgMDEtLjg2NS4zNDRjLS4xNjIuMDU0LS4wNTcuMjk3LjEwNC4yNDNhOC4zNyA4LjM3IDAgMDAuODY1LS4zNDRjLjE1NC0uMDcxLjA1LS4zMTUtLjEwNC0uMjQzeiIvPjxwYXRoIGQ9Ik0xMi41OTkgMTUuMjJhLjEzMS4xMzEgMCAwMS0uMDctLjAxbC0yLjE2OC0uOTI0YS4xMzMuMTMzIDAgMDEuMTAzLS4yNDNsMi4xNjkuOTIzYS4xMzMuMTMzIDAgMDEtLjAzNC4yNTN6Ii8+PC9zdmc+"
+									},
+									"categories": [
+											{
+													"id": 1,
+													"name": "Marketing"
+											}
+									],
+									"displayName": "APITemplate.io",
+									"typeVersion": 1
+							},
+							{
+									"id": 42,
+									"icon": "file:clickup.svg",
+									"name": "n8n-nodes-base.clickUpTrigger",
+									"defaults": {
+											"name": "ClickUp Trigger"
+									},
+									"iconData": {
+											"type": "file",
+											"fileBuffer": "data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSItMTAgMCAxNTUgMTU1IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPjxkZWZzPjxsaW5lYXJHcmFkaWVudCB4MT0iMCUiIHkxPSI2OC4wMSUiIHkyPSI2OC4wMSUiIGlkPSJhIj48c3RvcCBzdG9wLWNvbG9yPSIjODkzMEZEIiBvZmZzZXQ9IjAlIi8+PHN0b3Agc3RvcC1jb2xvcj0iIzQ5Q0NGOSIgb2Zmc2V0PSIxMDAlIi8+PC9saW5lYXJHcmFkaWVudD48bGluZWFyR3JhZGllbnQgeDE9IjAlIiB5MT0iNjguMDElIiB5Mj0iNjguMDElIiBpZD0iYiI+PHN0b3Agc3RvcC1jb2xvcj0iI0ZGMDJGMCIgb2Zmc2V0PSIwJSIvPjxzdG9wIHN0b3AtY29sb3I9IiNGRkM4MDAiIG9mZnNldD0iMTAwJSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxnIGZpbGw9Im5vbmUiPjxwYXRoIGQ9Ik0uNCAxMTkuMTJsMjMuODEtMTguMjRDMzYuODYgMTE3LjM5IDUwLjMgMTI1IDY1LjI2IDEyNWMxNC44OCAwIDI3Ljk0LTcuNTIgNDAuMDItMjMuOWwyNC4xNSAxNy44QzExMiAxNDIuNTIgOTAuMzQgMTU1IDY1LjI2IDE1NWMtMjUgMC00Ni44Ny0xMi40LTY0Ljg2LTM1Ljg4eiIgZmlsbD0idXJsKCNhKSIvPjxwYXRoIGZpbGw9InVybCgjYikiIGQ9Ik02NS4xOCAzOS44NEwyMi44IDc2LjM2IDMuMjEgNTMuNjQgNjUuMjcuMTZsNjEuNTcgNTMuNTItMTkuNjggMjIuNjR6Ii8+PC9nPjwvc3ZnPg=="
+									},
+									"categories": [
+											{
+													"id": 4,
+													"name": "Productivity"
+											},
+											{
+													"id": 6,
+													"name": "Communication"
+											}
+									],
+									"displayName": "ClickUp Trigger",
+									"typeVersion": 1
+							}
+					]
+			}
+	],
+	"filters": [
+			{
+					"counts": [
+							{
+									"count": 66,
+									"highlighted": "Building Blocks",
+									"value": "Building Blocks"
+							},
+							{
+									"count": 24,
+									"highlighted": "Sales",
+									"value": "Sales"
+							},
+							{
+									"count": 24,
+									"highlighted": "Marketing & Growth",
+									"value": "Marketing & Growth"
+							},
+							{
+									"count": 16,
+									"highlighted": "DevOps & IT",
+									"value": "DevOps & IT"
+							},
+							{
+									"count": 12,
+									"highlighted": "HR & People Ops",
+									"value": "HR & People Ops"
+							},
+							{
+									"count": 9,
+									"highlighted": "Development",
+									"value": "Development"
+							},
+							{
+									"count": 9,
+									"highlighted": "Managed Service Providers",
+									"value": "Managed Service Providers"
+							},
+							{
+									"count": 7,
+									"highlighted": "Finance & Accounting",
+									"value": "Finance & Accounting"
+							},
+							{
+									"count": 6,
+									"highlighted": "Product & Project Management",
+									"value": "Product & Project Management"
+							},
+							{
+									"count": 3,
+									"highlighted": "Customer Service",
+									"value": "Customer Service"
+							}
+					],
+					"field_name": "categories",
+					"sampled": false,
+					"stats": {
+							"total_values": 11
+					}
+			}
+	]
+}
diff --git a/cypress/fixtures/templates_search/sales_templates_search_response.json b/cypress/fixtures/templates_search/sales_templates_search_response.json
new file mode 100644
index 0000000000000..4efbb3585b504
--- /dev/null
+++ b/cypress/fixtures/templates_search/sales_templates_search_response.json
@@ -0,0 +1,1316 @@
+{
+    "totalWorkflows": 24,
+    "workflows": [
+        {
+            "id": 837,
+            "name": "Automating Products Price Changes Tracking",
+            "totalViews": 1343,
+            "recentViews": 0,
+            "user": {
+                "username": "admin"
+            },
+            "createdAt": "2020-12-19T10:26:27.570Z",
+            "nodes": [
+                {
+                    "id": 7,
+                    "icon": "file:airtable.svg",
+                    "name": "n8n-nodes-base.airtable",
+                    "defaults": {
+                        "name": "Airtable"
+                    },
+                    "iconData": {
+                        "type": "file",
+                        "fileBuffer": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyMDAgMTcwIj48cGF0aCBkPSJNODkgNC44TDE2LjIgMzQuOWMtNC4xIDEuNy00IDcuNC4xIDkuMWw3My4yIDI5YzYuNCAyLjYgMTMuNiAyLjYgMjAgMGw3My4yLTI5YzQuMS0xLjYgNC4xLTcuNC4xLTkuMWwtNzMtMzAuMUMxMDMuMiAyIDk1LjcgMiA4OSA0LjgiIGZpbGw9IiNmY2I0MDAiLz48cGF0aCBkPSJNMTA1LjkgODguOXY3Mi41YzAgMy40IDMuNSA1LjggNi43IDQuNWw4MS42LTMxLjdjMS45LS43IDMuMS0yLjUgMy4xLTQuNVY1Ny4yYzAtMy40LTMuNS01LjgtNi43LTQuNUwxMDkgODQuM2MtMS45LjgtMy4xIDIuNi0zLjEgNC42IiBmaWxsPSIjMThiZmZmIi8+PHBhdGggZD0iTTg2LjkgOTIuNmwtMjQuMiAxMS43LTIuNSAxLjJMOS4xIDEzMGMtMy4yIDEuNi03LjQtLjgtNy40LTQuNFY1Ny41YzAtMS4zLjctMi40IDEuNi0zLjMuNC0uNC44LS43IDEuMi0uOSAxLjItLjcgMy0uOSA0LjQtLjNsNzcuNSAzMC43YzQgMS41IDQuMyA3LjEuNSA4LjkiIGZpbGw9IiNmODJiNjAiLz48cGF0aCBkPSJNODYuOSA5Mi42bC0yNC4yIDExLjctNTkuNC01MGMuNC0uNC44LS43IDEuMi0uOSAxLjItLjcgMy0uOSA0LjQtLjNsNzcuNSAzMC43YzQgMS40IDQuMyA3IC41IDguOCIgZmlsbD0iI2JhMWU0NSIvPjwvc3ZnPg=="
+                    },
+                    "categories": [
+                        {
+                            "id": 3,
+                            "name": "Data & Storage"
+                        }
+                    ],
+                    "displayName": "Airtable",
+                    "typeVersion": 2
+                },
+                {
+                    "id": 11,
+                    "icon": "file:amqp.png",
+                    "name": "n8n-nodes-base.amqpTrigger",
+                    "defaults": {
+                        "name": "AMQP Trigger"
+                    },
+                    "iconData": {
+                        "type": "file",
+                        "fileBuffer": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAB7UlEQVRoge2W4W3CMBCFj26QjkBHSEdIR4AR6Ah0BBgBRqAjhBFgBBghHaEVlV29PN0lDr+o9D7JEjhn+975bJ8JIYQQQgghhBBCCCGEEA9CY2bf0NaBW2uyu7UN2XSOzTyY60J2BzNbObbsH7eTmS2mhHJHE1wmCD7A93ngEAquHaHc2omCcysSXQW74g32BHfwfTEiuCoQm9vuDsEndPYpELxKjjBj0foCEXX6XdM3by3c7aOZPZvZzMzeaBzbIh9pzIuZXaG/RqNIMAq7Ur8XCHQ2kx3LC56DMQ39X4LI23zbAd88ruRHD09wTVF5p+/eBZI5g7O8w5FgXOvsZAI7PxRwS4HGIPbm8wRjBL/Sgp/QNyQYHWySmOxgJBgFeGnPfZHgDVyufET+YMEVCdo7gziCTBbGmRKlGQpCMXOnj+1L6B0JFsxndO3cjjZyjo6OnZeqGb5gqhTQS3qKeK1SwbesfB3IrF/awqu+g8Dgs5SLE37SciHiPUv8rLVp7k2wdl63tDDqgTs8lqpINWGXbSTKe9rlJgXME7C9I6V7oGAWsEzv2gzeN2TstkbCZyIJWBYKWUwtF4foKGU9TpRGdZDSdVDpDNXSVVBLt5TeucS9K6X/E3USX3rshBBCCCGEEEIIIYQQ4tExsx8PuuPnwhCIbgAAAABJRU5ErkJggg=="
+                    },
+                    "categories": [
+                        {
+                            "id": 5,
+                            "name": "Development"
+                        },
+                        {
+                            "id": 6,
+                            "name": "Communication"
+                        }
+                    ],
+                    "displayName": "AMQP Trigger",
+                    "typeVersion": 1
+                },
+                {
+                    "id": 13,
+                    "icon": "file:asana.svg",
+                    "name": "n8n-nodes-base.asanaTrigger",
+                    "defaults": {
+                        "name": "Asana Trigger"
+                    },
+                    "iconData": {
+                        "type": "file",
+                        "fileBuffer": "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNjAiIGhlaWdodD0iNjAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PHJhZGlhbEdyYWRpZW50IGN4PSI1MCUiIGN5PSI1NSUiIGZ4PSI1MCUiIGZ5PSI1NSUiIHI9IjcyLjUwNyUiIGdyYWRpZW50VHJhbnNmb3JtPSJtYXRyaXgoLjkyNDA0IDAgMCAxIC4wMzggMCkiIGlkPSJhIj48c3RvcCBzdG9wLWNvbG9yPSIjRkZCOTAwIiBvZmZzZXQ9IjAlIi8+PHN0b3Agc3RvcC1jb2xvcj0iI0Y5NUQ4RiIgb2Zmc2V0PSI2MCUiLz48c3RvcCBzdG9wLWNvbG9yPSIjRjk1MzUzIiBvZmZzZXQ9Ijk5LjkxJSIvPjwvcmFkaWFsR3JhZGllbnQ+PC9kZWZzPjxwYXRoIGQ9Ik00NS41OTQgMjguNWMtNi45OTQuMDAzLTEyLjY2NCA1LjY3My0xMi42NjcgMTIuNjY3LjAwMyA2Ljk5NSA1LjY3MyAxMi42NjQgMTIuNjY3IDEyLjY2OCA2Ljk5NS0uMDA0IDEyLjY2NC01LjY3MyAxMi42NjctMTIuNjY4LS4wMDMtNi45OTQtNS42NzItMTIuNjY0LTEyLjY2Ny0xMi42Njd6bS0zMi45MjcuMDAxQzUuNjczIDI4LjUwNS4wMDMgMzQuMTc0IDAgNDEuMTdjLjAwMyA2Ljk5NCA1LjY3MyAxMi42NjQgMTIuNjY3IDEyLjY2NyA2Ljk5NS0uMDAzIDEyLjY2NC01LjY3MyAxMi42NjgtMTIuNjY3LS4wMDQtNi45OTUtNS42NzMtMTIuNjY0LTEyLjY2OC0xMi42Njh6TTQxLjc5IDEyLjY2N2MtLjAwMiA2Ljk5NS01LjY3MSAxMi42NjUtMTIuNjY2IDEyLjY3LTYuOTk1LS4wMDQtMTIuNjY0LTUuNjc0LTEyLjY2Ny0xMi42N0MxNi40NiA1LjY3MyAyMi4xMy4wMDMgMjkuMTIzIDBjNi45OTQuMDA0IDEyLjY2MyA1LjY3MyAxMi42NjYgMTIuNjY3eiIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoLjczMiAyLjczMikiIGZpbGw9InVybCgjYSkiIGZpbGwtcnVsZT0iZXZlbm9kZCIvPjwvc3ZnPg=="
+                    },
+                    "categories": [
+                        {
+                            "id": 4,
+                            "name": "Productivity"
+                        }
+                    ],
+                    "displayName": "Asana Trigger",
+                    "typeVersion": 1
+                },
+                {
+                    "id": 15,
+                    "icon": "file:affinity.png",
+                    "name": "n8n-nodes-base.affinity",
+                    "defaults": {
+                        "name": "Affinity"
+                    },
+                    "iconData": {
+                        "type": "file",
+                        "fileBuffer": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAMAAAANIilAAAAC/VBMVEUAAAAtTfMvVekpSN8rR+g2POglUecfWuY0PukdXeUoTucrS+c2POkfW+VGJusyQeghWOcjVecmUecNceQgWeY4OegiV+YeXOYxQ+gXZeUuR+gmUuc9MuoZYeZHJuszP+g4OulFKOsTauQpS+c7Ou02O+kvRegiVuZBLuoMdOQoTeoQbuQ9NekVaOVHJesQbeQhWOctR+gTauUyQuk9L+wqS+cjVeY0PugyQeg7NekXZeVDK+pHJesgWeYqTOglUugcYeg0PukNceRDK+tGJ+pFKOsyQeg4OekrSec2O+kyQOgkVOYOceQjVechWOY6NuglUecQbuQtSOchV+cxQek9MelAMOkcX+ZDKetEK+otR+dCL+oPZ+IcX+YSbOQ5OOgyQegKdeQUaeU3O+gcX+U2O+kdXeYgWuYmUeYZY+ZFJ+onT+gjVOcSbORFKesKdeMcXeYPbuMYZOQNbOYlUuYyQegcXuU4OehEKeopTechV+dHJusnUOdHJus0PukOceRGJuoPbeQyQegjVeY3O+kpTudGJ+svR+c6N+kcXuUVZ+VGJuoLdOMzQOgLdOQvRegKdeQPceQdXeQqTOZBLegQb+UiVuYeXOQlU+dBLelBLukPcOQTauQdXOUsSuYLd+MvR+hEK+otR+dDLOpHJusPceUiVeczQOkiVuU1Pek2POkgWOYeW+UfWucgY/c2RPcjXfQ3OugkVOc7PfU6NulMKfw4Q/kzQOlLKPgqTektSOclW/ZJKPM1Qe4iWu0YZegsUfUPePIkWvI2QfIeYe85O+1HJ+0tSeowRepAL+kiV+cySvgjXvYRdvQxSfMsTvAxRe09Ne0VbewMc+RILvsvTvk1Rvk7P/lDM/knWPcqVPYWb/Q6PfInVfAnU+xHJuseXuojV+obYOYZavQ3QfQMffMTcvNELvNAMvALe+8Odu8aZu0Mduo9M+oQcOkoUOgLdeU/OflIK/chYfY8OPIgXu8wQ+g8P/wsVPoeZfU6Ou8vSu5BL+0hWugSbea5VKRRAAAAqXRSTlMAAgQFBvkQ/fv+/f37+fv7+/v++/ng2b79/fz7/f35vfz7+0UV/fz8+/sj+Qv+/f38ek0uF/jtqIx1cGZfUU8eF/39/PTj4tvOy8Ozp5OIhnl4b2JQT0tGRDc1HA358O7p5NjU0sW6q6V5eG9rZlRDPDIuE/f26+ba2tHLx7+9urWuoaCamJeXlZGLin5kYllXKe/u6unf3dXTz8/Ix8XBurmdnJqVfnNZVQrS8AAABtNJREFUSMfllndQE0EUxveSCwES0rBEAggoRQRBwYqKvffee++99957712pwUgkVAGlSUdQsYJSLAj2ruPbC2HvxPFvZ9xMkne7+7tv79379g79K42ieHw+j6L+OMDjUX9DeYaITOMeUpV5gtIe/bZv7+cBM/gUQeHrOai5V/NBQ5kj0thTPDZ2SFSr1QU+HZs4I2Sg+QjNON0uQqfVRbRb3pwiNJulNyYkZyiVUqlxSOQdcU+9Bv4dfCT7bbytrURS77FOu2gQqpQSPnJenBNm4eDgIAXaWOD7qbMRdFIw0etZsZNTW1ugrSUS6wjdlN9pCnnvjW4YZhGWlpx2+3ZBa+PWgjtVayMKPk3vJjklOX3Pzn6r1UZIHksk2q2I4rK8xdENQ0XpCafq79xZv0vkdWMfwZWqnsgFNX1jaZmUdHffWa8ZXhvaax/Xq2etbY74nAvu/hnY6BMe+uPBY9UCH8GDhWOrds58ZWn56llPF6afnvI4XlIv3noo0YbIWaEwNY2eBCEfqgRWW/OqwEcc9+Dr++Bgy8zM/pAUPACntY4H6XMgR7LVI1elergMR3oFhGqqjX3sbS7bBAdnZg5CNKVXodGMCEh6O0+DNP4/9FCleDQEWNLVBa7b9/Lly8HBAxDN0lmlk0h0cNVk1Y4aECYXgrWb3Db2wXTcSBfErrYBOom1dgMEho6BUY7y3B4QEAWApSFA28ctdOHcF8928da65RAY4BZBjvLwaSyYAlgtDQHaPm7kUMRnwS7tI6wjlkJEYHdHBiYeqZ+m/BgCteYjfgDVwmfD8RimKuBZH4RVUrpDQNhkh4/KELX6OtBXME3yYxtvq1vFynYrsx+yqGps3RyLMIeM+Y3XdMbVQmj488q2tdVuZa/l+AehLOgSog1stCjMIjGxFhxBtRAa6x0ubtv27QDEI6ltFmgmjGrUCiLM9ooWiUQJCbUQTXNpyGPPu05ti9vTiCLKwxbkCYUfqhkhmgfsPVORKBSzkA9CwxgfPAYWy56C+Gxj9A00868SBDRCvXJVpqahoZiFRjG0L+MxBKxlklPxIh4jTLQnYjplSa+1Ex8qFKoyPcuhO25at+k9eCzp+2BQ48CoOtCyqJTwWLlG8agMs2RzWwG0OO7OmzfB2J/9DYsmM4AW+gtljnKNRqMoZ4m2Wuxrb2ODPUZYDj3hhom/n9/Nm/LYvhUs8ZgYTII91p+McbZAExN/TJMyJx5bd5UxqM37jiRXHOlWw5+Y+Af4+cnCL3BhOGqsZgxq87Ujjw2Tmpz8EqRBWxbUArS4q1qjZgxKPMZpwD61emICLUAYtQT2bA7bJ0MZEmLc2t7XhniMy9awsnpyIy9PGCBLqYZpsqY+yR+VypDIyEixL+Mx6rd1Tb9fo0aNa8PHLdhzQxiAa41sNMDCoyRR2WFUB8i54MpYqGyO7uwsV2CvDURGwyYEmulpvmHNOdhjGf0oI5qptU+N2TBFoWP37VyBZeSqExqveSr2Z8K3fszUFWqBr80VliMhalBk5+qa1QDRMJvQjI+mYo8lfGuJaAqPjS8Qix+M5+ynq4vs7O5vARYam0aYBY+ltzSMec73sbeP82DRw/aXuv0cMRd6uPTarpMeKRSExbXW86pYfKcp4pN0lbrVLeqGKTYtiwqPjZUrFGWPKlg4/ZBIePxCysglv3Crm9obQ4R+JwwQyuRyjVxDWAwbjYoUFIxnbb27YszNU6dDwKbhfoPFwKC4WAlMd4g0vt4ZIqIMMCizfdQj0AxbzD2/Ea4JtnKG9HoXlvLs123MY1Zzn1Wbv5hhgwJsxIGHZCil6sbsbI8uMb9VtxWrhwZ4OGPvfLwjs5+eyVLp7Yuki4e6FdYxjzlPcgo7+UvGY0I/9yhcLRWst0WiUpkI95nAM5/XudXmxQ6gKEBharOnVthjN7DH9LVGQYHRiNcpzcIhrSanuNFJoG+V9DZ0bMH+vGY1btxB7LHYA0PK+507pVuEWaTVYqUHwt2vX4N2zNHpu+fOndNsDOPPly2g0qu/w9WSP2mgt5F3rfWm6aKwhjlnAOD4eVch0OYvUt1GjPhZlGXnCmwDRDH7eRU/95vhsfMazXt4L9RU1DCnE8XxM9be8bykTh1z8zalpW520LJcG5T7aEKgUObu6KjJ16hU8ML1uZMLYUnSRheWAF0XmlvW/TFz9HcD6B557344QqXKVaqye+nrEWFZK6e3jX5eGBMTk5qaNaYZ0rPMzDkTq6SkBMWG5+aqus6qzJZr0DO3dVu5sltvmMF5QUHefbt3rd61e19n8tZfWZyEnC2OJJfiolx1Pg8av9LZKdzHvJX+7+0X6aNkPIGC7jsAAAAASUVORK5CYII="
+                    },
+                    "categories": [
+                        {
+                            "id": 2,
+                            "name": "Sales"
+                        }
+                    ],
+                    "displayName": "Affinity",
+                    "typeVersion": 1
+                },
+                {
+                    "id": 19,
+                    "icon": "file:autopilot.svg",
+                    "name": "n8n-nodes-base.autopilotTrigger",
+                    "defaults": {
+                        "name": "Autopilot Trigger"
+                    },
+                    "iconData": {
+                        "type": "file",
+                        "fileBuffer": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjM4IDI2IDM1IDM1Ij48Y2lyY2xlIGN4PSI1MCIgY3k9IjUwIiByPSI0MCIgc3Ryb2tlPSIjMThkNGIyIiBzdHJva2Utd2lkdGg9IjMiIGZpbGw9IiMxOGQ0YjIiLz48cGF0aCBmaWxsPSIjZmZmIiBkPSJNNDUuNCA0Mi42aDE5LjlsMy40LTQuOEg0MmwzLjQgNC44em0zLjEgOC4zaDEzLjFsMy40LTQuOEg0NS40bDMuMSA0Ljh6bTU0LS43Ii8+PC9zdmc+"
+                    },
+                    "categories": [
+                        {
+                            "id": 1,
+                            "name": "Marketing"
+                        }
+                    ],
+                    "displayName": "Autopilot Trigger",
+                    "typeVersion": 1
+                },
+                {
+                    "id": 20,
+                    "icon": "file:lambda.svg",
+                    "name": "n8n-nodes-base.awsLambda",
+                    "defaults": {
+                        "name": "AWS Lambda"
+                    },
+                    "iconData": {
+                        "type": "file",
+                        "fileBuffer": "data:image/svg+xml;base64,PHN2ZyBoZWlnaHQ9IjI1MDAiIHZpZXdCb3g9Ii0zLjAyMyAtMC4yMiA0MjAuOTIzIDQzMy41NCIgd2lkdGg9IjI0NDMiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PHBhdGggZD0iTTIwOC40NSAyMjcuODljLTEuNTkgMi4yNi0yLjkzIDQuMTItNC4yMiA2cS0zMC44NiA0NS40Mi02MS43IDkwLjgzLTI4LjY5IDQyLjI0LTU3LjQ0IDg0LjQzYTMuODggMy44OCAwIDAxLTIuNzMgMS41OXEtNDAuNTktLjM1LTgxLjE2LS44OGMtLjMgMC0uNjEtLjA5LTEuMi0uMThhMTQuNDQgMTQuNDQgMCAwMS43Ni0xLjY1cTI4LjMxLTQzLjg5IDU2LjYyLTg3Ljc2IDI1LjExLTM4Ljg4IDUwLjI1LTc3Ljc0IDI3Ljg2LTQzLjE4IDU1LjY5LTg2LjQyYzIuNzQtNC4yNSA1LjU5LTguNDIgOC4xOS0xMi43NWE1LjI2IDUuMjYgMCAwMC41Ni0zLjgzYy01LTE1Ljk0LTEwLjEtMzEuODQtMTUuMTktNDcuNzQtMi4xOC02LjgxLTQuNDYtMTMuNTgtNi41LTIwLjQzLS42Ni0yLjItMS43NS0yLjg3LTQtMi44Ni0xNyAuMDctMzMuOS4wNS01MC44NS4wNS0zLjIyIDAtMy4yMyAwLTMuMjMtMy4xOCAwLTIwLjg0IDAtNDEuNjgtLjA2LTYyLjUyIDAtMi4zMi43Ni0yLjg0IDIuOTQtMi44NHE1MS4xOS4wOSAxMDIuNCAwYTMuMjkgMy4yOSAwIDAxMy42IDIuNDNxMjcgNjcuOTEgNTQgMTM1Ljc3IDMxLjUgNzkuMTQgNjMgMTU4LjNjNi41MiAxNi4zOCAxMy4wOSAzMi43NSAxOS41NCA0OS4xNy43NyAyIDEuNTcgMi4zOCAzLjU5IDEuNzYgMTcuODktNS41MyAzNS44Mi0xMC45MSA1My43LTE2LjQ1IDIuMjUtLjcgMy4wNy0uMjMgMy43NyAyIDYuMSAxOS4xNyAxMi4zMiAzOC4zIDE4LjUgNTcuNDUuMjEuNjYuMzcgMS4zMy42MiAyLjI1LTEuMjguNDctMi40OCAxLTMuNzEgMS4zNHEtNjEgMTkuMzMtMTIxLjkzIDM4LjY4Yy0xLjk0LjYxLTIuNTItLjA1LTMuMTctMS42OHEtMTguNjEtNDcuMTYtMzcuMzEtOTQuMjgtMTguMjktNDYuMTQtMzYuNi05Mi4yOGMtMS44My00LjYyLTMuNjMtOS4yNi01LjQ2LTEzLjg4LS4yOS0uNzktLjY5LTEuNDgtMS4yNy0yLjd6IiBmaWxsPSIjZmE3ZTE0Ii8+PC9zdmc+"
+                    },
+                    "categories": [
+                        {
+                            "id": 5,
+                            "name": "Development"
+                        }
+                    ],
+                    "displayName": "AWS Lambda",
+                    "typeVersion": 1
+                },
+                {
+                    "id": 31,
+                    "icon": "file:bitwarden.svg",
+                    "name": "n8n-nodes-base.bitwarden",
+                    "defaults": {
+                        "name": "Bitwarden"
+                    },
+                    "iconData": {
+                        "type": "file",
+                        "fileBuffer": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgNTUgNjYiIGZpbGw9IiNmZmYiIGZpbGwtcnVsZT0iZXZlbm9kZCIgc3Ryb2tlPSIjMDAwIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiPjx1c2UgeGxpbms6aHJlZj0iI2EiIHg9Ii41IiB5PSIuNSIvPjxzeW1ib2wgaWQ9ImEiIG92ZXJmbG93PSJ2aXNpYmxlIj48cGF0aCBkPSJNNTMuMzMzIDIuNjY3djMyYzAgMi4zODgtLjQ2NSA0Ljc1Ni0xLjM5NiA3LjEwM3MtMi4wODQgNC40My0zLjQ1OCA2LjI1LTMuMDE1IDMuNTktNC45MTcgNS4zMTItMy42NiAzLjE1My01LjI3MiA0LjI5MmwtNS4wNCAzLjIzLTMuNzMgMi4wNjItMS43Ny44MzRjLS4zMzMuMTY2LS42OTUuMjUtMS4wODMuMjVhMi40IDIuNCAwIDAxLTEuMDgzLS4yNWwtMS43Ny0uODM0LTMuNzMtMi4wNjItNS4wNDItMy4yM2MtMS42MS0xLjE0LTMuMzY4LTIuNTctNS4yNy00LjI5MnMtMy41NC0zLjQ5Mi00LjkxNi01LjMxMi0yLjUyOC0zLjkwMy0zLjQ2LTYuMjVTMCAzNy4wNTUgMCAzNC42Njd2LTMyQTIuNTYgMi41NiAwIDAxLjc5MS43OTIgMi41NiAyLjU2IDAgMDEyLjY2NiAwaDQ4Yy43MiAwIDEuMzQ2LjI2NCAxLjg3NC43OTJhMi41NiAyLjU2IDAgMDEuNzkyIDEuODc1bS04IDMyVjhIMjYuNjY2djQ3LjM3NWMzLjMwNS0xLjc1IDYuMjY0LTMuNjUzIDguODc1LTUuNzA4IDYuNTI3LTUuMTEgOS43OS0xMC4xMSA5Ljc5LTE1IiBzdHJva2U9Im5vbmUiIGZpbGw9IiMzYzhkYmMiIGZpbGwtcnVsZT0ibm9uemVybyIvPjwvc3ltYm9sPjwvc3ZnPg=="
+                    },
+                    "categories": [
+                        {
+                            "id": 3,
+                            "name": "Data & Storage"
+                        }
+                    ],
+                    "displayName": "Bitwarden",
+                    "typeVersion": 1
+                },
+                {
+                    "id": 42,
+                    "icon": "file:clickup.svg",
+                    "name": "n8n-nodes-base.clickUpTrigger",
+                    "defaults": {
+                        "name": "ClickUp Trigger"
+                    },
+                    "iconData": {
+                        "type": "file",
+                        "fileBuffer": "data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSItMTAgMCAxNTUgMTU1IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPjxkZWZzPjxsaW5lYXJHcmFkaWVudCB4MT0iMCUiIHkxPSI2OC4wMSUiIHkyPSI2OC4wMSUiIGlkPSJhIj48c3RvcCBzdG9wLWNvbG9yPSIjODkzMEZEIiBvZmZzZXQ9IjAlIi8+PHN0b3Agc3RvcC1jb2xvcj0iIzQ5Q0NGOSIgb2Zmc2V0PSIxMDAlIi8+PC9saW5lYXJHcmFkaWVudD48bGluZWFyR3JhZGllbnQgeDE9IjAlIiB5MT0iNjguMDElIiB5Mj0iNjguMDElIiBpZD0iYiI+PHN0b3Agc3RvcC1jb2xvcj0iI0ZGMDJGMCIgb2Zmc2V0PSIwJSIvPjxzdG9wIHN0b3AtY29sb3I9IiNGRkM4MDAiIG9mZnNldD0iMTAwJSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxnIGZpbGw9Im5vbmUiPjxwYXRoIGQ9Ik0uNCAxMTkuMTJsMjMuODEtMTguMjRDMzYuODYgMTE3LjM5IDUwLjMgMTI1IDY1LjI2IDEyNWMxNC44OCAwIDI3Ljk0LTcuNTIgNDAuMDItMjMuOWwyNC4xNSAxNy44QzExMiAxNDIuNTIgOTAuMzQgMTU1IDY1LjI2IDE1NWMtMjUgMC00Ni44Ny0xMi40LTY0Ljg2LTM1Ljg4eiIgZmlsbD0idXJsKCNhKSIvPjxwYXRoIGZpbGw9InVybCgjYikiIGQ9Ik02NS4xOCAzOS44NEwyMi44IDc2LjM2IDMuMjEgNTMuNjQgNjUuMjcuMTZsNjEuNTcgNTMuNTItMTkuNjggMjIuNjR6Ii8+PC9nPjwvc3ZnPg=="
+                    },
+                    "categories": [
+                        {
+                            "id": 4,
+                            "name": "Productivity"
+                        },
+                        {
+                            "id": 6,
+                            "name": "Communication"
+                        }
+                    ],
+                    "displayName": "ClickUp Trigger",
+                    "typeVersion": 1
+                },
+                {
+                    "id": 46,
+                    "icon": "fa:file-archive",
+                    "name": "n8n-nodes-base.compression",
+                    "defaults": {
+                        "name": "Compression",
+                        "color": "#408000"
+                    },
+                    "iconData": {
+                        "icon": "file-archive",
+                        "type": "icon"
+                    },
+                    "categories": [
+                        {
+                            "id": 3,
+                            "name": "Data & Storage"
+                        },
+                        {
+                            "id": 9,
+                            "name": "Core Nodes"
+                        }
+                    ],
+                    "displayName": "Compression",
+                    "typeVersion": 1
+                },
+                {
+                    "id": 62,
+                    "icon": "file:discord.svg",
+                    "name": "n8n-nodes-base.discord",
+                    "defaults": {
+                        "name": "Discord"
+                    },
+                    "iconData": {
+                        "type": "file",
+                        "fileBuffer": "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyB3aWR0aD0iMjU2cHgiIGhlaWdodD0iMTk5cHgiIHZpZXdCb3g9IjAgMCAyNTYgMTk5IiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHByZXNlcnZlQXNwZWN0UmF0aW89InhNaWRZTWlkIj4KICAgIDxnPgogICAgICAgIDxwYXRoIGQ9Ik0yMTYuODU2MzM5LDE2LjU5NjYwMzEgQzIwMC4yODUwMDIsOC44NDMyODY2NSAxODIuNTY2MTQ0LDMuMjA4NDk4OCAxNjQuMDQxNTY0LDAgQzE2MS43NjY1MjMsNC4xMTMxODEwNiAxNTkuMTA4NjI0LDkuNjQ1NDk5MDggMTU3LjI3NjA5OSwxNC4wNDY0Mzc5IEMxMzcuNTgzOTk1LDExLjA4NDk4OTYgMTE4LjA3Mjk2NywxMS4wODQ5ODk2IDk4Ljc0MzAxNjMsMTQuMDQ2NDM3OSBDOTYuOTEwODQxNyw5LjY0NTQ5OTA4IDk0LjE5MjU4MzgsNC4xMTMxODEwNiA5MS44OTcxODk1LDAgQzczLjM1MjYwNjgsMy4yMDg0OTg4IDU1LjYxMzM5NDksOC44NjM5OTExNyAzOS4wNDIwNTgzLDE2LjYzNzY2MTIgQzUuNjE3NTIyOTMsNjcuMTQ2NTE0IC0zLjQ0MzMxOTEsMTE2LjQwMDgxMyAxLjA4NzExMDY5LDE2NC45NTU3MjEgQzIzLjI1NjAxOTYsMTgxLjUxMDkxNSA0NC43NDAzNjM0LDE5MS41Njc2OTcgNjUuODYyMTMyNSwxOTguMTQ4NTc2IEM3MS4wNzcyMTUxLDE5MC45NzExMjYgNzUuNzI4MzYyOCwxODMuMzQxMzM1IDc5LjczNTIxMzksMTc1LjMwMDI2MSBDNzIuMTA0MDE5LDE3Mi40MDA1NzUgNjQuNzk0OTcyNCwxNjguODIyMjAyIDU3Ljg4ODc4NjYsMTY0LjY2Nzk2MyBDNTkuNzIwOTYxMiwxNjMuMzEwNTg5IDYxLjUxMzEzMDQsMTYxLjg5MTQ1MiA2My4yNDQ1ODk4LDE2MC40MzEyNTcgQzEwNS4zNjc0MSwxODAuMTMzMTg3IDE1MS4xMzQ5MjgsMTgwLjEzMzE4NyAxOTIuNzU0NTIzLDE2MC40MzEyNTcgQzE5NC41MDYzMzYsMTYxLjg5MTQ1MiAxOTYuMjk4MTU0LDE2My4zMTA1ODkgMTk4LjExMDMyNiwxNjQuNjY3OTYzIEMxOTEuMTgzNzg3LDE2OC44NDI1NTYgMTgzLjg1NDczNywxNzIuNDIwOTI5IDE3Ni4yMjM1NDIsMTc1LjMyMDk2NSBDMTgwLjIzMDM5MywxODMuMzQxMzM1IDE4NC44NjE1MzgsMTkwLjk5MTgzMSAxOTAuMDk2NjI0LDE5OC4xNjg5MyBDMjExLjIzODc0NiwxOTEuNTg4MDUxIDIzMi43NDMwMjMsMTgxLjUzMTYxOSAyNTQuOTExOTQ5LDE2NC45NTU3MjEgQzI2MC4yMjc3NDcsMTA4LjY2ODIwMSAyNDUuODMxMDg3LDU5Ljg2NjI0MzIgMjE2Ljg1NjMzOSwxNi41OTY2MDMxIFogTTg1LjQ3Mzg3NTIsMTM1LjA5NDg5IEM3Mi44MjkwMjgxLDEzNS4wOTQ4OSA2Mi40NTkyMjE3LDEyMy4yOTAxNTUgNjIuNDU5MjIxNywxMDguOTE0OTAxIEM2Mi40NTkyMjE3LDk0LjUzOTY0NzIgNzIuNjA3NTk1LDgyLjcxNDU1ODcgODUuNDczODc1Miw4Mi43MTQ1NTg3IEM5OC4zNDA1MDY0LDgyLjcxNDU1ODcgMTA4LjcwOTk2Miw5NC41MTg5NDI3IDEwOC40ODg1MjksMTA4LjkxNDkwMSBDMTA4LjUwODUzMSwxMjMuMjkwMTU1IDk4LjM0MDUwNjQsMTM1LjA5NDg5IDg1LjQ3Mzg3NTIsMTM1LjA5NDg5IFogTTE3MC41MjUyMzcsMTM1LjA5NDg5IEMxNTcuODgwMzksMTM1LjA5NDg5IDE0Ny41MTA1ODQsMTIzLjI5MDE1NSAxNDcuNTEwNTg0LDEwOC45MTQ5MDEgQzE0Ny41MTA1ODQsOTQuNTM5NjQ3MiAxNTcuNjU4NjA2LDgyLjcxNDU1ODcgMTcwLjUyNTIzNyw4Mi43MTQ1NTg3IEMxODMuMzkxNTE4LDgyLjcxNDU1ODcgMTkzLjc2MTMyNCw5NC41MTg5NDI3IDE5My41Mzk4OTEsMTA4LjkxNDkwMSBDMTkzLjUzOTg5MSwxMjMuMjkwMTU1IDE4My4zOTE1MTgsMTM1LjA5NDg5IDE3MC41MjUyMzcsMTM1LjA5NDg5IFoiIGZpbGw9IiM1ODY1RjIiIGZpbGwtcnVsZT0ibm9uemVybyI+PC9wYXRoPgogICAgPC9nPgo8L3N2Zz4="
+                    },
+                    "categories": [
+                        {
+                            "id": 6,
+                            "name": "Communication"
+                        }
+                    ],
+                    "displayName": "Discord",
+                    "typeVersion": 2
+                },
+                {
+                    "id": 114,
+                    "icon": "file:helpScout.svg",
+                    "name": "n8n-nodes-base.helpScoutTrigger",
+                    "defaults": {
+                        "name": "HelpScout Trigger"
+                    },
+                    "iconData": {
+                        "type": "file",
+                        "fileBuffer": "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjU2IiBoZWlnaHQ9IjMxMCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWlkWU1pZCI+PHBhdGggZD0iTTE4LjQzMiAxODAuOTY5bDkwLjQ4NC05MC40ODVhNjMuNzE3IDYzLjcxNyAwIDAwMTguOTktNDUuNDI4QTY0LjI0NSA2NC4yNDUgMCAwMDEwOS40NzYgMEwxOC45OSA5MC40ODRBNjMuNzE3IDYzLjcxNyAwIDAwMCAxMzUuOTEzYzAgMTcuNjg3IDcuMDc1IDMzLjUxMiAxOC40MzIgNDUuMDU2em0yMTkuMTM2LTUyLjg3NmwtOTAuNDg0IDkwLjQ4NGE2My43MTcgNjMuNzE3IDAgMDAtMTguOTkgNDUuNDI5IDY0LjI0NSA2NC4yNDUgMCAwMDE4LjQzMSA0NS4wNTZsOTAuNDg0LTkwLjQ4NUE2My43MTcgNjMuNzE3IDAgMDAyNTYgMTczLjE1YzAtMTcuNjg3LTcuMDc1LTMzLjUxMy0xOC40MzItNDUuMDU2em0tLjU1OS0zNy40MjJBNjMuNzE3IDYzLjcxNyAwIDAwMjU2IDQ1LjI0MiA2NC4yNDUgNjQuMjQ1IDAgMDAyMzcuNTY4LjE4NkwxOC45OTEgMjE4LjU3N0M3LjI2IDIzMC4zMDcgMCAyNDYuMzIgMCAyNjQuMTkyYTY0LjI0NSA2NC4yNDUgMCAwMDE4LjQzMiA0NS4wNTZMMjM3LjAwOSA5MC42NzF6IiBmaWxsPSIjMTI5MkVFIi8+PC9zdmc+"
+                    },
+                    "categories": [
+                        {
+                            "id": 6,
+                            "name": "Communication"
+                        }
+                    ],
+                    "displayName": "HelpScout Trigger",
+                    "typeVersion": 1
+                }
+            ]
+        },
+        {
+            "id": 1323,
+            "name": "Create Email Campaign From LinkedIn Post Interactions",
+            "totalViews": 942,
+            "recentViews": 0,
+            "user": {
+                "username": "admin"
+            },
+            "createdAt": "2021-11-15T14:48:51.258Z",
+            "nodes": [
+                {
+                    "id": 7,
+                    "icon": "file:airtable.svg",
+                    "name": "n8n-nodes-base.airtable",
+                    "defaults": {
+                        "name": "Airtable"
+                    },
+                    "iconData": {
+                        "type": "file",
+                        "fileBuffer": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyMDAgMTcwIj48cGF0aCBkPSJNODkgNC44TDE2LjIgMzQuOWMtNC4xIDEuNy00IDcuNC4xIDkuMWw3My4yIDI5YzYuNCAyLjYgMTMuNiAyLjYgMjAgMGw3My4yLTI5YzQuMS0xLjYgNC4xLTcuNC4xLTkuMWwtNzMtMzAuMUMxMDMuMiAyIDk1LjcgMiA4OSA0LjgiIGZpbGw9IiNmY2I0MDAiLz48cGF0aCBkPSJNMTA1LjkgODguOXY3Mi41YzAgMy40IDMuNSA1LjggNi43IDQuNWw4MS42LTMxLjdjMS45LS43IDMuMS0yLjUgMy4xLTQuNVY1Ny4yYzAtMy40LTMuNS01LjgtNi43LTQuNUwxMDkgODQuM2MtMS45LjgtMy4xIDIuNi0zLjEgNC42IiBmaWxsPSIjMThiZmZmIi8+PHBhdGggZD0iTTg2LjkgOTIuNmwtMjQuMiAxMS43LTIuNSAxLjJMOS4xIDEzMGMtMy4yIDEuNi03LjQtLjgtNy40LTQuNFY1Ny41YzAtMS4zLjctMi40IDEuNi0zLjMuNC0uNC44LS43IDEuMi0uOSAxLjItLjcgMy0uOSA0LjQtLjNsNzcuNSAzMC43YzQgMS41IDQuMyA3LjEuNSA4LjkiIGZpbGw9IiNmODJiNjAiLz48cGF0aCBkPSJNODYuOSA5Mi42bC0yNC4yIDExLjctNTkuNC01MGMuNC0uNC44LS43IDEuMi0uOSAxLjItLjcgMy0uOSA0LjQtLjNsNzcuNSAzMC43YzQgMS40IDQuMyA3IC41IDguOCIgZmlsbD0iI2JhMWU0NSIvPjwvc3ZnPg=="
+                    },
+                    "categories": [
+                        {
+                            "id": 3,
+                            "name": "Data & Storage"
+                        }
+                    ],
+                    "displayName": "Airtable",
+                    "typeVersion": 2
+                },
+                {
+                    "id": 14,
+                    "icon": "file:apiTemplateIo.svg",
+                    "name": "n8n-nodes-base.apiTemplateIo",
+                    "defaults": {
+                        "name": "APITemplate.io"
+                    },
+                    "iconData": {
+                        "type": "file",
+                        "fileBuffer": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI4MCIgaGVpZ2h0PSI4MCIgdmlld0JveD0iMCAwIDIzLjE2NyAyMS4xNjciPjxwYXRoIGZpbGw9IiM5MWJjZTUiIGQ9Ik0xOC42MTEuNTA0TDMuNDczIDExLjI0bDQuNTk3IDIuMjEzIDEuMDY2IDMuODgzIDMuMTcxLTIuMjI2IDIuODAyLjk1MXoiLz48cGF0aCBmaWxsPSIjMWYyMTJiIiBkPSJNOS4xNzIgMTcuNTk3YS4yNjQuMjY0IDAgMDEtLjI5LS4xOTJsLTEuMDM1LTMuNzY3LTQuNDg4LTIuMTZhLjI2NS4yNjUgMCAwMS0uMDM5LS40NTRMMTguNDU4LjI4OGEuMjY0LjI2NCAwIDAxLjQxLjI3NGwtMy41IDE1LjU1NmEuMjY1LjI2NSAwIDAxLS4zNDQuMTkzbC0yLjY3NC0uOTA4LTMuMDYxIDIuMTVhLjI3My4yNzMgMCAwMS0uMTE3LjA0NHptLTUuMTgtNi40MDFsNC4xOTMgMi4wMTdjLjA2OS4wMzQuMTIuMDk1LjE0LjE2OWwuOTY3IDMuNTIgMi44NjMtMi4wMWEuMjY1LjI2NSAwIDAxLjIzNy0uMDMzbDIuNTI0Ljg1NkwxOC4yIDEuMTE5eiIvPjxwYXRoIGZpbGw9IiMzYTg0YzEiIGQ9Ik05LjMzOSAxNy4wNzlsLjk0Ni0yLjkxM0wxOC42NDIuNzI4IDguMjI2IDEzLjIzNXoiLz48cGF0aCBmaWxsPSIjMWYyMTJiIiBkPSJNOS4zNTYgMTcuMjFhLjEzMi4xMzIgMCAwMS0uMTQzLS4xNzJsLjk0Ni0yLjkxM2EuMTYuMTYgMCAwMS4wMTQtLjAzbDcuMzkzLTExLjg4OC05LjQxOSAxMS4xNTZhLjEzMy4xMzMgMCAwMS0uMjAyLS4xNzFMMTguNTQuNjQyYS4xMzIuMTMyIDAgMDEuMjE0LjE1NmwtOC4zNDggMTMuNDI0LS45NDEgMi44OThhLjEzMi4xMzIgMCAwMS0uMTA5LjA5em0tMy4yMTUgMS4wNDVjLTEuMTY4LjAyOS0yLjMwMy0uMzczLTMuMDY3LTEuMjg3LS40ODUtLjU4LS42ODMtMS41NzQuMjc1LTEuNzA1Ljg1OS0uMTE5IDEuMjI5LjQ4NSAxLjQ4IDEuMTk2LjgwNCAyLjAyNi4xNiAyLjkzOC0xLjY4IDQuMjcyLS4xNDQuMDkuMDE1LjI5Ni4xNTkuMjA2IDEuMjE4LTEgMS44MjktMS40NjYgMi4xLTIuNDQ4LjEzNC0xLjM2LS40MDItMy4wOTEtMS4zODQtMy40MzYtMS4xMi0uMzgyLTIuMDYzLjUxNi0xLjQ5OSAxLjU4NS42OTkgMS4zMjQgMi4yMyAxLjkxNCAzLjY1MiAxLjg3OC4xNy0uMDA0LjEzMy0uMjY2LS4wMzYtLjI2MXoiLz48cGF0aCBmaWxsPSIjMWYyMTJiIiBkPSJNNy4yMzUgMTguMTRhMTQuOTUgMTQuOTUgMCAwMS0uNzU5LjA5Yy0uMTcuMDE3LS4xMzMuMjc5LjAzNi4yNjIuMjUzLS4wMjUuNTA3LS4wNTIuNzU4LS4wOS4xNjktLjAyNi4xMzMtLjI4OC0uMDM1LS4yNjJ6bTEuMTk0LS41MDRhOC40NiA4LjQ2IDAgMDEtLjg2NS4zNDRjLS4xNjIuMDU0LS4wNTcuMjk3LjEwNC4yNDNhOC4zNyA4LjM3IDAgMDAuODY1LS4zNDRjLjE1NC0uMDcxLjA1LS4zMTUtLjEwNC0uMjQzeiIvPjxwYXRoIGQ9Ik0xMi41OTkgMTUuMjJhLjEzMS4xMzEgMCAwMS0uMDctLjAxbC0yLjE2OC0uOTI0YS4xMzMuMTMzIDAgMDEuMTAzLS4yNDNsMi4xNjkuOTIzYS4xMzMuMTMzIDAgMDEtLjAzNC4yNTN6Ii8+PC9zdmc+"
+                    },
+                    "categories": [
+                        {
+                            "id": 1,
+                            "name": "Marketing"
+                        }
+                    ],
+                    "displayName": "APITemplate.io",
+                    "typeVersion": 1
+                },
+                {
+                    "id": 20,
+                    "icon": "file:lambda.svg",
+                    "name": "n8n-nodes-base.awsLambda",
+                    "defaults": {
+                        "name": "AWS Lambda"
+                    },
+                    "iconData": {
+                        "type": "file",
+                        "fileBuffer": "data:image/svg+xml;base64,PHN2ZyBoZWlnaHQ9IjI1MDAiIHZpZXdCb3g9Ii0zLjAyMyAtMC4yMiA0MjAuOTIzIDQzMy41NCIgd2lkdGg9IjI0NDMiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PHBhdGggZD0iTTIwOC40NSAyMjcuODljLTEuNTkgMi4yNi0yLjkzIDQuMTItNC4yMiA2cS0zMC44NiA0NS40Mi02MS43IDkwLjgzLTI4LjY5IDQyLjI0LTU3LjQ0IDg0LjQzYTMuODggMy44OCAwIDAxLTIuNzMgMS41OXEtNDAuNTktLjM1LTgxLjE2LS44OGMtLjMgMC0uNjEtLjA5LTEuMi0uMThhMTQuNDQgMTQuNDQgMCAwMS43Ni0xLjY1cTI4LjMxLTQzLjg5IDU2LjYyLTg3Ljc2IDI1LjExLTM4Ljg4IDUwLjI1LTc3Ljc0IDI3Ljg2LTQzLjE4IDU1LjY5LTg2LjQyYzIuNzQtNC4yNSA1LjU5LTguNDIgOC4xOS0xMi43NWE1LjI2IDUuMjYgMCAwMC41Ni0zLjgzYy01LTE1Ljk0LTEwLjEtMzEuODQtMTUuMTktNDcuNzQtMi4xOC02LjgxLTQuNDYtMTMuNTgtNi41LTIwLjQzLS42Ni0yLjItMS43NS0yLjg3LTQtMi44Ni0xNyAuMDctMzMuOS4wNS01MC44NS4wNS0zLjIyIDAtMy4yMyAwLTMuMjMtMy4xOCAwLTIwLjg0IDAtNDEuNjgtLjA2LTYyLjUyIDAtMi4zMi43Ni0yLjg0IDIuOTQtMi44NHE1MS4xOS4wOSAxMDIuNCAwYTMuMjkgMy4yOSAwIDAxMy42IDIuNDNxMjcgNjcuOTEgNTQgMTM1Ljc3IDMxLjUgNzkuMTQgNjMgMTU4LjNjNi41MiAxNi4zOCAxMy4wOSAzMi43NSAxOS41NCA0OS4xNy43NyAyIDEuNTcgMi4zOCAzLjU5IDEuNzYgMTcuODktNS41MyAzNS44Mi0xMC45MSA1My43LTE2LjQ1IDIuMjUtLjcgMy4wNy0uMjMgMy43NyAyIDYuMSAxOS4xNyAxMi4zMiAzOC4zIDE4LjUgNTcuNDUuMjEuNjYuMzcgMS4zMy42MiAyLjI1LTEuMjguNDctMi40OCAxLTMuNzEgMS4zNHEtNjEgMTkuMzMtMTIxLjkzIDM4LjY4Yy0xLjk0LjYxLTIuNTItLjA1LTMuMTctMS42OHEtMTguNjEtNDcuMTYtMzcuMzEtOTQuMjgtMTguMjktNDYuMTQtMzYuNi05Mi4yOGMtMS44My00LjYyLTMuNjMtOS4yNi01LjQ2LTEzLjg4LS4yOS0uNzktLjY5LTEuNDgtMS4yNy0yLjd6IiBmaWxsPSIjZmE3ZTE0Ii8+PC9zdmc+"
+                    },
+                    "categories": [
+                        {
+                            "id": 5,
+                            "name": "Development"
+                        }
+                    ],
+                    "displayName": "AWS Lambda",
+                    "typeVersion": 1
+                },
+                {
+                    "id": 38,
+                    "icon": "file:chargebee.png",
+                    "name": "n8n-nodes-base.chargebeeTrigger",
+                    "defaults": {
+                        "name": "Chargebee Trigger"
+                    },
+                    "iconData": {
+                        "type": "file",
+                        "fileBuffer": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAMAAAANIilAAAAAk1BMVEUAAAD9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azXS0qjqAAAAMHRSTlMAAta1CPr3HAyb8mNPLBLq5MmGZ1wi28+soEQX7pZ9dkk/MijDurCMims54b6lb1YyU8hoAAACDklEQVRIx+2V2bKiMBBAmyTs+w6CIi64O/n/rxtKJwIjJPA4Nfc8acOpTnfSAX7493G2QZN6Zeml+GwVS0xiNSXtYeBIm6lKEaJf3C5kjrvz6SioFruVTKcIJEG1D8oBa1wXUy6+w2lVxhFFuU+0j4KOjwdOjUHQnHJ/DVZ4iaXXatTo2OuhPuEWXm9fLOhxPQjldeeuyV/NqGT+su1ucZuRkt5PMRElDmCEbdK2MNcmKnaZi2EUrd7GMEHEXGMPi8mYfFruqjd2NLrE+/P9oF9nyCuW+P4JhcorcBbL4dc2WSxyEcoBe9Vi5yJlEc8RyTp7ldVo0w8rkZyzN3ddExjR4sw7TmZhzSRhEddZ3m2TRar5+3z8hDZ/xlMSnzCPnbDu9NcPhLItzKAZG0hJnHVYYhnDYtSS2RksJ+fcQi0qAbDtKXknU84oWPQJtizvxanpmcCQJ3VtiA1lUlbdzk7rfs/bzwFSVR/bsaDhjHukvvfJsbBXm8S+UboXTwfDQFjXG6S0/dde18oGrN20TI4DOzHaA3drzAJWPqVy2Fa+5qTWDn05AKJJbS+eafsHtUlRUgAHB/dkJT+ddJzI7U+3kopjVgiGUwroF7J/IWAac+7RFeo0D6X3daQCiRBNZs2XVrmDr4e2zQ1aVhrMwwl9+Z1Zzw42ptQPHZiPFJv5IXENWXGvdRhL8MN/y2+uRpQ1fWz5HAAAAABJRU5ErkJggg=="
+                    },
+                    "categories": [
+                        {
+                            "id": 8,
+                            "name": "Finance & Accounting"
+                        }
+                    ],
+                    "displayName": "Chargebee Trigger",
+                    "typeVersion": 1
+                },
+                {
+                    "id": 76,
+                    "icon": "fa:sign-in-alt",
+                    "name": "n8n-nodes-base.executeWorkflow",
+                    "defaults": {
+                        "name": "Execute Workflow",
+                        "color": "#ff6d5a"
+                    },
+                    "iconData": {
+                        "icon": "sign-in-alt",
+                        "type": "icon"
+                    },
+                    "categories": [
+                        {
+                            "id": 9,
+                            "name": "Core Nodes"
+                        }
+                    ],
+                    "displayName": "Execute Workflow",
+                    "typeVersion": 1
+                }
+            ]
+        },
+        {
+            "id": 467,
+            "name": "Funnel Users and Sales Data From Webhook to a Marketing Platform (We’d might like to generalize the workflow as it’s very specific to Teachable and Muatic integration)",
+            "totalViews": 658,
+            "recentViews": 0,
+            "user": {
+                "username": "admin"
+            },
+            "createdAt": "2020-07-09T20:34:27.156Z",
+            "nodes": [
+                {
+                    "id": 14,
+                    "icon": "file:apiTemplateIo.svg",
+                    "name": "n8n-nodes-base.apiTemplateIo",
+                    "defaults": {
+                        "name": "APITemplate.io"
+                    },
+                    "iconData": {
+                        "type": "file",
+                        "fileBuffer": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI4MCIgaGVpZ2h0PSI4MCIgdmlld0JveD0iMCAwIDIzLjE2NyAyMS4xNjciPjxwYXRoIGZpbGw9IiM5MWJjZTUiIGQ9Ik0xOC42MTEuNTA0TDMuNDczIDExLjI0bDQuNTk3IDIuMjEzIDEuMDY2IDMuODgzIDMuMTcxLTIuMjI2IDIuODAyLjk1MXoiLz48cGF0aCBmaWxsPSIjMWYyMTJiIiBkPSJNOS4xNzIgMTcuNTk3YS4yNjQuMjY0IDAgMDEtLjI5LS4xOTJsLTEuMDM1LTMuNzY3LTQuNDg4LTIuMTZhLjI2NS4yNjUgMCAwMS0uMDM5LS40NTRMMTguNDU4LjI4OGEuMjY0LjI2NCAwIDAxLjQxLjI3NGwtMy41IDE1LjU1NmEuMjY1LjI2NSAwIDAxLS4zNDQuMTkzbC0yLjY3NC0uOTA4LTMuMDYxIDIuMTVhLjI3My4yNzMgMCAwMS0uMTE3LjA0NHptLTUuMTgtNi40MDFsNC4xOTMgMi4wMTdjLjA2OS4wMzQuMTIuMDk1LjE0LjE2OWwuOTY3IDMuNTIgMi44NjMtMi4wMWEuMjY1LjI2NSAwIDAxLjIzNy0uMDMzbDIuNTI0Ljg1NkwxOC4yIDEuMTE5eiIvPjxwYXRoIGZpbGw9IiMzYTg0YzEiIGQ9Ik05LjMzOSAxNy4wNzlsLjk0Ni0yLjkxM0wxOC42NDIuNzI4IDguMjI2IDEzLjIzNXoiLz48cGF0aCBmaWxsPSIjMWYyMTJiIiBkPSJNOS4zNTYgMTcuMjFhLjEzMi4xMzIgMCAwMS0uMTQzLS4xNzJsLjk0Ni0yLjkxM2EuMTYuMTYgMCAwMS4wMTQtLjAzbDcuMzkzLTExLjg4OC05LjQxOSAxMS4xNTZhLjEzMy4xMzMgMCAwMS0uMjAyLS4xNzFMMTguNTQuNjQyYS4xMzIuMTMyIDAgMDEuMjE0LjE1NmwtOC4zNDggMTMuNDI0LS45NDEgMi44OThhLjEzMi4xMzIgMCAwMS0uMTA5LjA5em0tMy4yMTUgMS4wNDVjLTEuMTY4LjAyOS0yLjMwMy0uMzczLTMuMDY3LTEuMjg3LS40ODUtLjU4LS42ODMtMS41NzQuMjc1LTEuNzA1Ljg1OS0uMTE5IDEuMjI5LjQ4NSAxLjQ4IDEuMTk2LjgwNCAyLjAyNi4xNiAyLjkzOC0xLjY4IDQuMjcyLS4xNDQuMDkuMDE1LjI5Ni4xNTkuMjA2IDEuMjE4LTEgMS44MjktMS40NjYgMi4xLTIuNDQ4LjEzNC0xLjM2LS40MDItMy4wOTEtMS4zODQtMy40MzYtMS4xMi0uMzgyLTIuMDYzLjUxNi0xLjQ5OSAxLjU4NS42OTkgMS4zMjQgMi4yMyAxLjkxNCAzLjY1MiAxLjg3OC4xNy0uMDA0LjEzMy0uMjY2LS4wMzYtLjI2MXoiLz48cGF0aCBmaWxsPSIjMWYyMTJiIiBkPSJNNy4yMzUgMTguMTRhMTQuOTUgMTQuOTUgMCAwMS0uNzU5LjA5Yy0uMTcuMDE3LS4xMzMuMjc5LjAzNi4yNjIuMjUzLS4wMjUuNTA3LS4wNTIuNzU4LS4wOS4xNjktLjAyNi4xMzMtLjI4OC0uMDM1LS4yNjJ6bTEuMTk0LS41MDRhOC40NiA4LjQ2IDAgMDEtLjg2NS4zNDRjLS4xNjIuMDU0LS4wNTcuMjk3LjEwNC4yNDNhOC4zNyA4LjM3IDAgMDAuODY1LS4zNDRjLjE1NC0uMDcxLjA1LS4zMTUtLjEwNC0uMjQzeiIvPjxwYXRoIGQ9Ik0xMi41OTkgMTUuMjJhLjEzMS4xMzEgMCAwMS0uMDctLjAxbC0yLjE2OC0uOTI0YS4xMzMuMTMzIDAgMDEuMTAzLS4yNDNsMi4xNjkuOTIzYS4xMzMuMTMzIDAgMDEtLjAzNC4yNTN6Ii8+PC9zdmc+"
+                    },
+                    "categories": [
+                        {
+                            "id": 1,
+                            "name": "Marketing"
+                        }
+                    ],
+                    "displayName": "APITemplate.io",
+                    "typeVersion": 1
+                },
+                {
+                    "id": 20,
+                    "icon": "file:lambda.svg",
+                    "name": "n8n-nodes-base.awsLambda",
+                    "defaults": {
+                        "name": "AWS Lambda"
+                    },
+                    "iconData": {
+                        "type": "file",
+                        "fileBuffer": "data:image/svg+xml;base64,PHN2ZyBoZWlnaHQ9IjI1MDAiIHZpZXdCb3g9Ii0zLjAyMyAtMC4yMiA0MjAuOTIzIDQzMy41NCIgd2lkdGg9IjI0NDMiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PHBhdGggZD0iTTIwOC40NSAyMjcuODljLTEuNTkgMi4yNi0yLjkzIDQuMTItNC4yMiA2cS0zMC44NiA0NS40Mi02MS43IDkwLjgzLTI4LjY5IDQyLjI0LTU3LjQ0IDg0LjQzYTMuODggMy44OCAwIDAxLTIuNzMgMS41OXEtNDAuNTktLjM1LTgxLjE2LS44OGMtLjMgMC0uNjEtLjA5LTEuMi0uMThhMTQuNDQgMTQuNDQgMCAwMS43Ni0xLjY1cTI4LjMxLTQzLjg5IDU2LjYyLTg3Ljc2IDI1LjExLTM4Ljg4IDUwLjI1LTc3Ljc0IDI3Ljg2LTQzLjE4IDU1LjY5LTg2LjQyYzIuNzQtNC4yNSA1LjU5LTguNDIgOC4xOS0xMi43NWE1LjI2IDUuMjYgMCAwMC41Ni0zLjgzYy01LTE1Ljk0LTEwLjEtMzEuODQtMTUuMTktNDcuNzQtMi4xOC02LjgxLTQuNDYtMTMuNTgtNi41LTIwLjQzLS42Ni0yLjItMS43NS0yLjg3LTQtMi44Ni0xNyAuMDctMzMuOS4wNS01MC44NS4wNS0zLjIyIDAtMy4yMyAwLTMuMjMtMy4xOCAwLTIwLjg0IDAtNDEuNjgtLjA2LTYyLjUyIDAtMi4zMi43Ni0yLjg0IDIuOTQtMi44NHE1MS4xOS4wOSAxMDIuNCAwYTMuMjkgMy4yOSAwIDAxMy42IDIuNDNxMjcgNjcuOTEgNTQgMTM1Ljc3IDMxLjUgNzkuMTQgNjMgMTU4LjNjNi41MiAxNi4zOCAxMy4wOSAzMi43NSAxOS41NCA0OS4xNy43NyAyIDEuNTcgMi4zOCAzLjU5IDEuNzYgMTcuODktNS41MyAzNS44Mi0xMC45MSA1My43LTE2LjQ1IDIuMjUtLjcgMy4wNy0uMjMgMy43NyAyIDYuMSAxOS4xNyAxMi4zMiAzOC4zIDE4LjUgNTcuNDUuMjEuNjYuMzcgMS4zMy42MiAyLjI1LTEuMjguNDctMi40OCAxLTMuNzEgMS4zNHEtNjEgMTkuMzMtMTIxLjkzIDM4LjY4Yy0xLjk0LjYxLTIuNTItLjA1LTMuMTctMS42OHEtMTguNjEtNDcuMTYtMzcuMzEtOTQuMjgtMTguMjktNDYuMTQtMzYuNi05Mi4yOGMtMS44My00LjYyLTMuNjMtOS4yNi01LjQ2LTEzLjg4LS4yOS0uNzktLjY5LTEuNDgtMS4yNy0yLjd6IiBmaWxsPSIjZmE3ZTE0Ii8+PC9zdmc+"
+                    },
+                    "categories": [
+                        {
+                            "id": 5,
+                            "name": "Development"
+                        }
+                    ],
+                    "displayName": "AWS Lambda",
+                    "typeVersion": 1
+                },
+                {
+                    "id": 24,
+                    "icon": "file:ses.svg",
+                    "name": "n8n-nodes-base.awsSes",
+                    "defaults": {
+                        "name": "AWS SES"
+                    },
+                    "iconData": {
+                        "type": "file",
+                        "fileBuffer": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgNzQuMzc1IDg1IiBmaWxsPSIjZmZmIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiIHN0cm9rZT0iIzAwMCIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiBzdHJva2UtbGluZWpvaW49InJvdW5kIj48dXNlIHhsaW5rOmhyZWY9IiNhIiB4PSIyLjE4OCIgeT0iMi41Ii8+PHN5bWJvbCBpZD0iYSIgb3ZlcmZsb3c9InZpc2libGUiPjxnIHN0cm9rZT0ibm9uZSI+PHBhdGggZD0iTTE2LjU1OCAxMi43NUwwIDM4LjU5MWwxNi41NTggMjUuODQxIDEzLjIyNy0zLjMyNC42NTQtNDQuODY5LTEzLjg4MS0zLjQ4OXoiIGZpbGw9IiM4NzY5MjkiLz48cGF0aCBkPSJNMzUuMDQ5IDU5Ljc4NmwtMTguNDkxIDQuNjQ1VjEyLjc1bDE4LjQ5MSA0LjY0NXY0Mi4zOTF6IiBmaWxsPSIjZDlhNzQxIi8+PGcgZmlsbD0iIzg3NjkyOSI+PHBhdGggZD0iTTMyLjg0OSAyMS42MTRMMzUuMDUgODAgNzAgNjIuODY3bC0uMDEtNDMuNjE1LTguOTE0IDEuNDQ4LTI4LjIyOC45MTN6Ii8+PHBhdGggZD0iTTQ2LjE4NCAzMy4xNDlsMTAuOTA2LS42MzIgMTAuNzc4LTE5LjE2NEw0MC42MTIgMCAzMC40MzkgNC4zNjRsMTUuNzQ1IDI4Ljc4NXoiLz48L2c+PHBhdGggZD0iTTQwLjYxMiAwbDI3LjI1NiAxMy4zNTNMNTcuMDkgMzIuNTE3IDQwLjYxMiAweiIgZmlsbD0iI2Q5YTc0MSIvPjxwYXRoIGQ9Ik0zNS4wNDkgNS41MzlMNTcuMDkgNDQuNzQybDMuNzg4IDIyLjU5NUwzNS4wNDkgODBsLTEwLjQ2LTUuMTMxVjkuNjRsMTAuNDYtNC4xMDF6IiBmaWxsPSIjODc2OTI5Ii8+PHBhdGggZD0iTTY5Ljk5MSAxOS4yNTFMNzAgNjIuODY3IDM1LjA1IDgwVjUuNTM5bDIyLjA0MSAzOS4yMDNMNjkuOTkgMTkuMjUxeiIgZmlsbD0iI2Q5YTc0MSIvPjwvZz48L3N5bWJvbD48L3N2Zz4="
+                    },
+                    "categories": [
+                        {
+                            "id": 5,
+                            "name": "Development"
+                        },
+                        {
+                            "id": 6,
+                            "name": "Communication"
+                        }
+                    ],
+                    "displayName": "AWS SES",
+                    "typeVersion": 1
+                },
+                {
+                    "id": 38,
+                    "icon": "file:chargebee.png",
+                    "name": "n8n-nodes-base.chargebeeTrigger",
+                    "defaults": {
+                        "name": "Chargebee Trigger"
+                    },
+                    "iconData": {
+                        "type": "file",
+                        "fileBuffer": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAMAAAANIilAAAAAk1BMVEUAAAD9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azXS0qjqAAAAMHRSTlMAAta1CPr3HAyb8mNPLBLq5MmGZ1wi28+soEQX7pZ9dkk/MijDurCMims54b6lb1YyU8hoAAACDklEQVRIx+2V2bKiMBBAmyTs+w6CIi64O/n/rxtKJwIjJPA4Nfc8acOpTnfSAX7493G2QZN6Zeml+GwVS0xiNSXtYeBIm6lKEaJf3C5kjrvz6SioFruVTKcIJEG1D8oBa1wXUy6+w2lVxhFFuU+0j4KOjwdOjUHQnHJ/DVZ4iaXXatTo2OuhPuEWXm9fLOhxPQjldeeuyV/NqGT+su1ucZuRkt5PMRElDmCEbdK2MNcmKnaZi2EUrd7GMEHEXGMPi8mYfFruqjd2NLrE+/P9oF9nyCuW+P4JhcorcBbL4dc2WSxyEcoBe9Vi5yJlEc8RyTp7ldVo0w8rkZyzN3ddExjR4sw7TmZhzSRhEddZ3m2TRar5+3z8hDZ/xlMSnzCPnbDu9NcPhLItzKAZG0hJnHVYYhnDYtSS2RksJ+fcQi0qAbDtKXknU84oWPQJtizvxanpmcCQJ3VtiA1lUlbdzk7rfs/bzwFSVR/bsaDhjHukvvfJsbBXm8S+UboXTwfDQFjXG6S0/dde18oGrN20TI4DOzHaA3drzAJWPqVy2Fa+5qTWDn05AKJJbS+eafsHtUlRUgAHB/dkJT+ddJzI7U+3kopjVgiGUwroF7J/IWAac+7RFeo0D6X3daQCiRBNZs2XVrmDr4e2zQ1aVhrMwwl9+Z1Zzw42ptQPHZiPFJv5IXENWXGvdRhL8MN/y2+uRpQ1fWz5HAAAAABJRU5ErkJggg=="
+                    },
+                    "categories": [
+                        {
+                            "id": 8,
+                            "name": "Finance & Accounting"
+                        }
+                    ],
+                    "displayName": "Chargebee Trigger",
+                    "typeVersion": 1
+                },
+                {
+                    "id": 42,
+                    "icon": "file:clickup.svg",
+                    "name": "n8n-nodes-base.clickUpTrigger",
+                    "defaults": {
+                        "name": "ClickUp Trigger"
+                    },
+                    "iconData": {
+                        "type": "file",
+                        "fileBuffer": "data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSItMTAgMCAxNTUgMTU1IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPjxkZWZzPjxsaW5lYXJHcmFkaWVudCB4MT0iMCUiIHkxPSI2OC4wMSUiIHkyPSI2OC4wMSUiIGlkPSJhIj48c3RvcCBzdG9wLWNvbG9yPSIjODkzMEZEIiBvZmZzZXQ9IjAlIi8+PHN0b3Agc3RvcC1jb2xvcj0iIzQ5Q0NGOSIgb2Zmc2V0PSIxMDAlIi8+PC9saW5lYXJHcmFkaWVudD48bGluZWFyR3JhZGllbnQgeDE9IjAlIiB5MT0iNjguMDElIiB5Mj0iNjguMDElIiBpZD0iYiI+PHN0b3Agc3RvcC1jb2xvcj0iI0ZGMDJGMCIgb2Zmc2V0PSIwJSIvPjxzdG9wIHN0b3AtY29sb3I9IiNGRkM4MDAiIG9mZnNldD0iMTAwJSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxnIGZpbGw9Im5vbmUiPjxwYXRoIGQ9Ik0uNCAxMTkuMTJsMjMuODEtMTguMjRDMzYuODYgMTE3LjM5IDUwLjMgMTI1IDY1LjI2IDEyNWMxNC44OCAwIDI3Ljk0LTcuNTIgNDAuMDItMjMuOWwyNC4xNSAxNy44QzExMiAxNDIuNTIgOTAuMzQgMTU1IDY1LjI2IDE1NWMtMjUgMC00Ni44Ny0xMi40LTY0Ljg2LTM1Ljg4eiIgZmlsbD0idXJsKCNhKSIvPjxwYXRoIGZpbGw9InVybCgjYikiIGQ9Ik02NS4xOCAzOS44NEwyMi44IDc2LjM2IDMuMjEgNTMuNjQgNjUuMjcuMTZsNjEuNTcgNTMuNTItMTkuNjggMjIuNjR6Ii8+PC9nPjwvc3ZnPg=="
+                    },
+                    "categories": [
+                        {
+                            "id": 4,
+                            "name": "Productivity"
+                        },
+                        {
+                            "id": 6,
+                            "name": "Communication"
+                        }
+                    ],
+                    "displayName": "ClickUp Trigger",
+                    "typeVersion": 1
+                },
+                {
+                    "id": 47,
+                    "icon": "file:coda.svg",
+                    "name": "n8n-nodes-base.coda",
+                    "defaults": {
+                        "name": "Coda"
+                    },
+                    "iconData": {
+                        "type": "file",
+                        "fileBuffer": "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KPCEtLSBHZW5lcmF0b3I6IEFkb2JlIElsbHVzdHJhdG9yIDI0LjIuMSwgU1ZHIEV4cG9ydCBQbHVnLUluIC4gU1ZHIFZlcnNpb246IDYuMDAgQnVpbGQgMCkgIC0tPgo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkxheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4IgoJIHZpZXdCb3g9IjAgMCA2MCA2MCIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAgNjAgNjA7IiB4bWw6c3BhY2U9InByZXNlcnZlIj4KPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KCS5zdDB7ZmlsbDojRUU1QTI5O30KPC9zdHlsZT4KPHBhdGggY2xhc3M9InN0MCIgZD0iTTQ1LjIsMTYuMmMzLjMsMCw2LjUsMS4zLDguOCwzLjNjMS41LDEuMywzLjgsMC4yLDMuOC0xLjhWNC43YzAtMi41LTIuMS00LjctNC43LTQuN0g2LjMKCUMzLjcsMCwxLjYsMi4xLDEuNiw0Ljd2NTAuN2MwLDIuNSwyLjEsNC42LDQuNyw0LjZoNDYuOGMyLjUsMCw0LjctMi4xLDQuNy00LjdWNDIuM2MwLTItMi4zLTMuMS0zLjgtMS44Yy0yLjQsMi4xLTUuNCwzLjMtOC44LDMuMwoJYy03LjYsMC0xMy43LTYuMi0xMy43LTEzLjhDMzEuNiwyMi40LDM3LjcsMTYuMiw0NS4yLDE2LjJ6Ii8+Cjwvc3ZnPgo="
+                    },
+                    "categories": [
+                        {
+                            "id": 4,
+                            "name": "Productivity"
+                        }
+                    ],
+                    "displayName": "Coda",
+                    "typeVersion": 1
+                },
+                {
+                    "id": 112,
+                    "icon": "file:harvest.png",
+                    "name": "n8n-nodes-base.harvest",
+                    "defaults": {
+                        "name": "Harvest"
+                    },
+                    "iconData": {
+                        "type": "file",
+                        "fileBuffer": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAJgAAACYBAMAAADq7D0SAAAAJ1BMVEX////3aCL3kyz3jiv3bSP3cST3mC73diX3gCj3eyb3iir3hSn3li1uKk+wAAAGwUlEQVRo3pyWO3KsMBBFWYuVEomMBb2IhVDFBpxPhjZAQUYwEYt6txvQ1YdC4OsZPEXB4XSr5XH1c6beznz/PUi3HVlXjyBs9bAyiTAkgBnzw7yH8V5rbYUjKyWsHMJyM8K+b2Cs0RgDM2Z7A+s8jGZNg+NrNxZJsaYRmLUFWNlLmiUw+7flJCw0s4Il7Eh3Y9dxxkIzAxhiA1xd3AddSpLpAkXNrG3iJSjVytEPaKDkZhR7ATOXZoQVV/LaDAExG93n4wqORmFGqiStbJZPLKIwTb6cb8Y/Mct31AuYpdmRFIfckYBiDgTLxKISRrkyTKbBECbxpCKs41zkPWMe8LacxPsJMwZtzGEhrkNSmPanuTc7lwC0b7ej9HcKM5dmFjEZrAOt+weKHr9IZqZjkZvZ3AwQZSHCZdPIspmZqukOtVdf8Pm3LuuUG71ZSzOy6nWrtxVlbigMdprtbBh+uCUDs0/1OWng02td9R7FdX4shFfjfE2zkNZW46fxNJr5rgmv+27y6lhmHZmZgzVWI7LzTLgI1ZktiD/JgSUJgRnim4bZfQzD5TDzDfuMNEP+ZGYjM7BOHMRweArTbu1mgJwwqZRbFPoRDFNyvCKYXhjUmJlpO5My1zszvO7N8MjY7AjcYjNzZaaJtui1WU0z336aXcBkNgRHmAy79OunrnlSiuSMZTAtlH8meV8t2cBKYUS1bWbGLWpiMwSodY1hTZAURpx2NbpvFdQaPQHPpJpHVO781LYeZxOYWCUwBXElNXNoxpgIprhoiQ0eeLKa9sqMaiYyYwizfLAXc65aRp9P0LZ7GKci8HILYPN8wrgTCjAOBVnzIjCmYQgz+n8hZi+HybPHyGyGGZPDlCZHk5uNjHNihoxBUpj+qTH7MYF9RgYohc2Lc84vQpvAGpQIkgCbGNaS5hCFIVLnfJp9Ehho6JjwEhgX0tFscWgb1VIz0JSUmsGLNMlhdtoRl0rkTwiG4iB4mHPhuLUZzNgYht1CKxQWwuIlzcyMwTvuGZufmiHCZ6HlMomaF4gRRjfmHhYPGM0m/1FqfwuDlPO4KTAjKofpiBbMJpoda5rDWmDwujSTbgW0qh+8mR5TmOwJTXxSozeR1QM2DEGlM0Y5gemOxXtsw5POccAkw9AD1pOtvMRst5J3m5q5JYrAkEBNWzCnZnntx9UkIQob+mkKJgRZSjC5iiOB9NMOG1RNaGxdAeZOJ/K8maiRpF2tbqP+7D0AvkzhgR2alWBh76Us4AiTLEzZjNECY7M972HTHg+j2vQahjv6xIx5AWOJhP3yM3Tl/RR2FMj8Vr3QyHtuJpf2F2ZUU73nZsMQiv3+55yMbhwGgSjoJlEqQYgOgq4AcLf3dtfoaXFiIJM4H8gMAyjH2Uopb89cxtMi53mcp0g5ZH+0iQxNgJOKoLLWmtkofE9k9BCRicq7pOzvWWZhpIFTygznw3vPsqGpmMNk2LC/hh0Z5onAZD2NbMkKvs2XwezTOG822KDC48qa/uzKToVn1ikCbmVdVgxTUUYjsldlpYd9lMki62UFZQ18lvHk2oKMmyNHBU6HtaZlFuVEGVjZmFcmssLTcmVJnO4Omlz1s0wP2HkqSEcS7m2cRziIFzw1AZHBmQVf3GmEg7fTSvJcZXVMm5UN1GxlokIk03bL8lVmMpCT8ktZMmovUyqQn3VZrp1kUNaPrq6X5X6Ld5kcopEXZF2TUx1k5DrNqQwubtDJRmCbySqDnmRShs+zLMHVu0g84seyNJF9KQshDeibnEc4KAuOxBAgCxEk4udlMq5AXiCYLIHBNivzRHlMZrx+l5mgy7QyCpuyqLyELlNisM3vyKIL6zItE/9WWdSyoGGUeVZlwXGXxWupBVmwogeZbRnPVIbXJmW6mur+2x+j1IhhGArqCgJdSKDcwKUn2fv3SXIQGDeu3Z/92FmHGLGejBcyuLLsQZa8Yn5T82H4WpRNz72KGn7PD7X2LFsMixZl7aBswtW+yMBxWdEM0GXtujmRXYm5h/CYdc11XAYJll/TvQFsm7TEApQN7KhsYJSttc2Ktax10D1Vtc5KNkqHvpjulZ1DaibxOycUeClJd6n+y6WqXqZ9corEAiIkrOKo4r1fdSPwMEmimXrQhaNq2UIKpYaHMZP9LssU1+Q12cSnu7bUKIgkIWZh4MaYYG9/gplTIoADYg0ThsA38MkaNIQpdZwl5C4GOY1H1nFhAdVVZf6hdPU6XmUBvn3cj0JWSG2VnxCZ/6dk/QtxX4/9HdflhXyVcyyT7p2VVbxK3+pY9syQ9AzxBh/ZR/YOsh+0QKcWXhB1rwAAAABJRU5ErkJggg=="
+                    },
+                    "categories": [
+                        {
+                            "id": 4,
+                            "name": "Productivity"
+                        }
+                    ],
+                    "displayName": "Harvest",
+                    "typeVersion": 1
+                },
+                {
+                    "id": 126,
+                    "icon": "file:invoiceNinja.svg",
+                    "name": "n8n-nodes-base.invoiceNinjaTrigger",
+                    "defaults": {
+                        "name": "Invoice Ninja Trigger"
+                    },
+                    "iconData": {
+                        "type": "file",
+                        "fileBuffer": "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjQiIGhlaWdodD0iMjQiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PHBhdGggZD0iTTE2LjI0NyAxMC4zMjZhMS4xNjQgMS4xNjQgMCAxMS0yLjMyOCAwIDEuMTY0IDEuMTY0IDAgMDEyLjMyOCAwem0tNi4yODggMGExLjE2NCAxLjE2NCAwIDExLTIuMzI5IDAgMS4xNjQgMS4xNjQgMCAwMTIuMzI5IDB6bS0uMTQgMTMuNTJjLTQuNzEyLS45OC04LjIyNy00LjI1Ny05LjQ4Mi04Ljg0Mi0uNDIxLTEuNTM3LS40MjEtNC40OSAwLTYuMDI3QzEuNTA2IDQuNzA5IDQuNzMgMS40ODUgOC45OTcuMzE2YzEuNTM4LS40MjEgNC40OS0uNDIxIDYuMDI4IDAgNC4yNjcgMS4xNjkgNy40OTIgNC4zOTMgOC42NiA4LjY2LjI0Ljg3NC4yOTQgMS40My4yOTQgMy4wMTQgMCAxLjU4NC0uMDU0IDIuMTQtLjI5MyAzLjAxNC0xLjE3IDQuMjcxLTQuNDM5IDcuNTM2LTguNjYxIDguNjUtMS4zOTEuMzY3LTMuOTE2LjQ2LTUuMjA2LjE5MnptNi42NC05LjMxNWMtMy4wNDctMS4zNDgtNC4wNTQtMS43MzctNC41LTEuNzM3LS40NDYgMC0xLjQzMy4zOC00LjM4IDEuNjg0LTIuMDkxLjkyNi0zLjgyOCAxLjc2LTMuODYgMS43OWgxNi42NjN6bS05Ljg3My0uMzYxYzEuNjIxLS43MjkgMy4wNi0xLjM4NyAzLjE5Ni0xLjQ2NC4yNTgtLjE0NS4zMzctLjA5LTUuMjg1LTMuNjgyLS41Ni0uMzU4LTEuMDIzLS42OTgtMS4wMjUtLjY1djcuMTlhNzkwLjEgNzkwLjEgMCAwMDMuMTE0LTEuMzk0em0xNC4wNzgtMi4xOTRWOC40MTdjMC0uMTEtMS42NzYuOTkzLTMuNDk2IDIuMTItMyAxLjg1NC0zLjI4MSAyLjA2LTMuMDA0IDIuMTg1IDEuMzQ1LjYxMSA2LjQyIDIuODYyIDYuNSAyLjg3MnptLTguMTY5LjExYy41NDUuMTI1LjY0My4xMDQgMS4yMjYtLjI2My4zNDktLjIyLjY1NS0uNDE5LjY4MS0uNDQyLjAyNi0uMDI0LS4wNS0uMTgxLS4xNjctLjM1LS4xMTgtLjE2OC0uMjE1LS41LS4yMTUtLjczOVY5Ljg2bC0uNTY5LjIxYy0uNzI2LjI2Ny0yLjI4LjI3LTMgLjAwNWwtLjU1Ni0uMjA1LjAxMy40NTJjLjAwNy4yNi0uMDg4LjU2My0uMjI1LjcxNS0uMjMyLjI1Ni0uMjIuMjc2LjQ1LjcyNi42NC40MzIuNzI1LjQ1NSAxLjIzLjMyN2EyLjM0OSAyLjM0OSAwIDAxMS4xMzItLjAwMnptLTQuMjMtMi42NWMtLjEwNS0uMTEzLTIuOTctLjk1NC0zLjAzMy0uODkxLS4wMy4wMy41MDQuNDE0IDEuMTg2Ljg1NGwxLjI0LjguMzQtLjM0NGMuMTg2LS4xODguMzA3LS4zNzcuMjY4LS40MnptOS43Ni0uMzczYy40NzMtLjMwNi44LS41NTUuNzI4LS41NTUtLjE1NSAwLTIuODc3LjgwNC0zLjAyNy44OTQtLjA1Ny4wMzQuMDMzLjIyOS4yLjQzM2wuMzA0LjM3LjQ3LS4yOTNjLjI1Ny0uMTYyLjg1NC0uNTQ0IDEuMzI2LS44NXptLTEuNjM2LS41NTVjMi4xMS0uNTkgMy44NjctMS4xMDIgMy45MDQtMS4xMzlIMy41OWMuMTg3LjE4NyA3Ljc3OSAyLjE5NSA4LjMyMyAyLjIwMi40MS4wMDUgMi4wMTQtLjM3NiA0LjQ3Ni0xLjA2M3oiLz48L3N2Zz4="
+                    },
+                    "categories": [
+                        {
+                            "id": 8,
+                            "name": "Finance & Accounting"
+                        }
+                    ],
+                    "displayName": "Invoice Ninja Trigger",
+                    "typeVersion": 1
+                }
+            ]
+        },
+        {
+            "id": 1206,
+            "name": "Process Shopify New Orders with CRM and Marketing Platforms",
+            "totalViews": 471,
+            "recentViews": 0,
+            "user": {
+                "username": "admin"
+            },
+            "createdAt": "2021-08-24T11:23:23.518Z",
+            "nodes": [
+                {
+                    "id": 20,
+                    "icon": "file:lambda.svg",
+                    "name": "n8n-nodes-base.awsLambda",
+                    "defaults": {
+                        "name": "AWS Lambda"
+                    },
+                    "iconData": {
+                        "type": "file",
+                        "fileBuffer": "data:image/svg+xml;base64,PHN2ZyBoZWlnaHQ9IjI1MDAiIHZpZXdCb3g9Ii0zLjAyMyAtMC4yMiA0MjAuOTIzIDQzMy41NCIgd2lkdGg9IjI0NDMiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PHBhdGggZD0iTTIwOC40NSAyMjcuODljLTEuNTkgMi4yNi0yLjkzIDQuMTItNC4yMiA2cS0zMC44NiA0NS40Mi02MS43IDkwLjgzLTI4LjY5IDQyLjI0LTU3LjQ0IDg0LjQzYTMuODggMy44OCAwIDAxLTIuNzMgMS41OXEtNDAuNTktLjM1LTgxLjE2LS44OGMtLjMgMC0uNjEtLjA5LTEuMi0uMThhMTQuNDQgMTQuNDQgMCAwMS43Ni0xLjY1cTI4LjMxLTQzLjg5IDU2LjYyLTg3Ljc2IDI1LjExLTM4Ljg4IDUwLjI1LTc3Ljc0IDI3Ljg2LTQzLjE4IDU1LjY5LTg2LjQyYzIuNzQtNC4yNSA1LjU5LTguNDIgOC4xOS0xMi43NWE1LjI2IDUuMjYgMCAwMC41Ni0zLjgzYy01LTE1Ljk0LTEwLjEtMzEuODQtMTUuMTktNDcuNzQtMi4xOC02LjgxLTQuNDYtMTMuNTgtNi41LTIwLjQzLS42Ni0yLjItMS43NS0yLjg3LTQtMi44Ni0xNyAuMDctMzMuOS4wNS01MC44NS4wNS0zLjIyIDAtMy4yMyAwLTMuMjMtMy4xOCAwLTIwLjg0IDAtNDEuNjgtLjA2LTYyLjUyIDAtMi4zMi43Ni0yLjg0IDIuOTQtMi44NHE1MS4xOS4wOSAxMDIuNCAwYTMuMjkgMy4yOSAwIDAxMy42IDIuNDNxMjcgNjcuOTEgNTQgMTM1Ljc3IDMxLjUgNzkuMTQgNjMgMTU4LjNjNi41MiAxNi4zOCAxMy4wOSAzMi43NSAxOS41NCA0OS4xNy43NyAyIDEuNTcgMi4zOCAzLjU5IDEuNzYgMTcuODktNS41MyAzNS44Mi0xMC45MSA1My43LTE2LjQ1IDIuMjUtLjcgMy4wNy0uMjMgMy43NyAyIDYuMSAxOS4xNyAxMi4zMiAzOC4zIDE4LjUgNTcuNDUuMjEuNjYuMzcgMS4zMy42MiAyLjI1LTEuMjguNDctMi40OCAxLTMuNzEgMS4zNHEtNjEgMTkuMzMtMTIxLjkzIDM4LjY4Yy0xLjk0LjYxLTIuNTItLjA1LTMuMTctMS42OHEtMTguNjEtNDcuMTYtMzcuMzEtOTQuMjgtMTguMjktNDYuMTQtMzYuNi05Mi4yOGMtMS44My00LjYyLTMuNjMtOS4yNi01LjQ2LTEzLjg4LS4yOS0uNzktLjY5LTEuNDgtMS4yNy0yLjd6IiBmaWxsPSIjZmE3ZTE0Ii8+PC9zdmc+"
+                    },
+                    "categories": [
+                        {
+                            "id": 5,
+                            "name": "Development"
+                        }
+                    ],
+                    "displayName": "AWS Lambda",
+                    "typeVersion": 1
+                },
+                {
+                    "id": 38,
+                    "icon": "file:chargebee.png",
+                    "name": "n8n-nodes-base.chargebeeTrigger",
+                    "defaults": {
+                        "name": "Chargebee Trigger"
+                    },
+                    "iconData": {
+                        "type": "file",
+                        "fileBuffer": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAMAAAANIilAAAAAk1BMVEUAAAD9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azXS0qjqAAAAMHRSTlMAAta1CPr3HAyb8mNPLBLq5MmGZ1wi28+soEQX7pZ9dkk/MijDurCMims54b6lb1YyU8hoAAACDklEQVRIx+2V2bKiMBBAmyTs+w6CIi64O/n/rxtKJwIjJPA4Nfc8acOpTnfSAX7493G2QZN6Zeml+GwVS0xiNSXtYeBIm6lKEaJf3C5kjrvz6SioFruVTKcIJEG1D8oBa1wXUy6+w2lVxhFFuU+0j4KOjwdOjUHQnHJ/DVZ4iaXXatTo2OuhPuEWXm9fLOhxPQjldeeuyV/NqGT+su1ucZuRkt5PMRElDmCEbdK2MNcmKnaZi2EUrd7GMEHEXGMPi8mYfFruqjd2NLrE+/P9oF9nyCuW+P4JhcorcBbL4dc2WSxyEcoBe9Vi5yJlEc8RyTp7ldVo0w8rkZyzN3ddExjR4sw7TmZhzSRhEddZ3m2TRar5+3z8hDZ/xlMSnzCPnbDu9NcPhLItzKAZG0hJnHVYYhnDYtSS2RksJ+fcQi0qAbDtKXknU84oWPQJtizvxanpmcCQJ3VtiA1lUlbdzk7rfs/bzwFSVR/bsaDhjHukvvfJsbBXm8S+UboXTwfDQFjXG6S0/dde18oGrN20TI4DOzHaA3drzAJWPqVy2Fa+5qTWDn05AKJJbS+eafsHtUlRUgAHB/dkJT+ddJzI7U+3kopjVgiGUwroF7J/IWAac+7RFeo0D6X3daQCiRBNZs2XVrmDr4e2zQ1aVhrMwwl9+Z1Zzw42ptQPHZiPFJv5IXENWXGvdRhL8MN/y2+uRpQ1fWz5HAAAAABJRU5ErkJggg=="
+                    },
+                    "categories": [
+                        {
+                            "id": 8,
+                            "name": "Finance & Accounting"
+                        }
+                    ],
+                    "displayName": "Chargebee Trigger",
+                    "typeVersion": 1
+                },
+                {
+                    "id": 43,
+                    "icon": "file:clockify.svg",
+                    "name": "n8n-nodes-base.clockifyTrigger",
+                    "defaults": {
+                        "name": "Clockify Trigger"
+                    },
+                    "iconData": {
+                        "type": "file",
+                        "fileBuffer": "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjU2IiBoZWlnaHQ9IjI1NiIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cGF0aCBmaWxsPSJub25lIiBkPSJNMTQgMGgyMjd2MjU2SDE0eiIvPjxwYXRoIGZpbGwtcnVsZT0iZXZlbm9kZCIgY2xpcC1ydWxlPSJldmVub2RkIiBkPSJNMTY1LjEyNCA4Ny45OWw1OC43NzctNTguODE0IDE2LjgyNSAxNi44MjMtNTguNzc4IDU4LjgxNS0xNi44MjQtMTYuODIzem0tMjMuODE3IDYwLjEwNWMtMTEuNTAzIDAtMjAuODIyLTkuMzYtMjAuODIyLTIwLjkxOCAwLTExLjU0NiA5LjMxOS0yMC45MTggMjAuODIyLTIwLjkxOCAxMS41MDMgMCAyMC44MjIgOS4zNzIgMjAuODIyIDIwLjkxOCAwIDExLjU1OC05LjMxOSAyMC45MTgtMjAuODIyIDIwLjkxOHpNMjQxIDIwOC44NDVsLTE2LjgyNCAxNi44MzUtNTguNzc4LTU4LjgxNiAxNi44MjUtMTYuODM1TDI0MSAyMDguODQ1eiIgZmlsbD0iIzIyMiIvPjxwYXRoIGZpbGwtcnVsZT0iZXZlbm9kZCIgY2xpcC1ydWxlPSJldmVub2RkIiBkPSJNMTQxLjkxMyAyMTcuNjM3YzExLjg0OCAwIDIzLjEzNi0yLjM2NCAzMy40ODItNi41NjdsMjguNzA4IDI4Ljc0QzE4NS42OTIgMjUwLjA4OSAxNjQuNSAyNTYgMTQxLjkxMyAyNTYgNzEuMjc0IDI1NiAxNCAxOTguNjg5IDE0IDEyOC4wMDYgMTQgNTcuMzExIDcxLjI3NSAwIDE0MS45MTMgMGMyMi4zNjEgMCA0My4zNjIgNS43NjcgNjEuNjQxIDE1Ljg1NmwtMjguMjMxIDI4LjI2MWMtMTAuMzMzLTQuMTc5LTIxLjU4NS02LjU0My0zMy40MS02LjU0My00OS40NyAwLTg5LjU3NSA0MC4zMDktODkuNTc1IDkwLjAzOCAwIDQ5LjcxNiA0MC4xMDQgOTAuMDI1IDg5LjU3NSA5MC4wMjV6IiBmaWxsPSIjMDNBOUY0Ii8+PC9zdmc+"
+                    },
+                    "categories": [
+                        {
+                            "id": 4,
+                            "name": "Productivity"
+                        },
+                        {
+                            "id": 7,
+                            "name": "Utility"
+                        }
+                    ],
+                    "displayName": "Clockify Trigger",
+                    "typeVersion": 1
+                },
+                {
+                    "id": 71,
+                    "icon": "file:emelia.svg",
+                    "name": "n8n-nodes-base.emelia",
+                    "defaults": {
+                        "name": "Emelia"
+                    },
+                    "iconData": {
+                        "type": "file",
+                        "fileBuffer": "data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSItMiAyIDQ1IDQ1IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPjxwYXRoIGQ9Ik0yOS43MTQgNi41MzlIOS4wNzhhMi4xMDkgMi4xMDkgMCAwMC0yLjAwNyAyLjc2Mmw1LjQ4NCAxNi44NjMgNC4yMTktMS44MTdhMi42OSAyLjY5IDAgMDEtLjAyNC0uMzQgMi42NDEgMi42NDEgMCAxMTEuMDIzIDIuMDgxIDI0MTYuNzEgMjQxNi43MSAwIDAxLTQuNDE1IDIuNTQ1bDUuMTU2IDE1Ljg1MmEuODY1Ljg2NSAwIDAwMS42NDUgMGwxMS40OC0zNS4yOTNhMi4wMjYgMi4wMjYgMCAwMC0xLjkyNS0yLjY1M3oiIG9wYWNpdHk9Ii45IiBmaWxsPSIjZjRiNDU0Ii8+PHBhdGggZD0iTTM3LjE1NCAyMS4yNjFMMS4wNzEgMTIuNTc3YS44NjUuODY1IDAgMDAtLjg2MSAxLjRsMTAuOTA5IDEyLjggNS42NTYtMi40MzZhMi42OTQgMi42OTQgMCAwMS0uMDI0LS4zNCAyLjY0MSAyLjY0MSAwIDExMS4wMjMgMi4wODEgMjE3OC4xNSAyMTc4LjE1IDAgMDEtNC44NiAyLjhsMTEuMjkxIDEzLjI1NWEyLjExIDIuMTEgMCAwMDMuNC0uMjY0bDEwLjgtMTcuNTg2YTIuMDI2IDIuMDI2IDAgMDAtMS4yNTEtMy4wMjZ6IiBmaWxsPSIjZWY2ZDRhIiBvcGFjaXR5PSIuOSIvPjxwYXRoIGQ9Ik0zNy42MzYgMTIuNTc3TDEuNTUzIDIxLjI2MUEyLjAyNSAyLjAyNSAwIDAwLjMwMSAyNC4yOWwzLjQ3MiA1LjY1NiAxMy01LjZhMi42ODkgMi42ODkgMCAwMS0uMDI0LS4zNCAyLjY0MSAyLjY0MSAwIDExMS4wMjMgMi4wODFjLTMuMSAxLjc5MS05LjA3MyA1LjIzNC0xMi4xMDggNi45NGw1LjQzMiA4Ljg0OGEyLjExIDIuMTEgMCAwMDMuNC4yNjRsMjMuOTk1LTI4LjE2MWEuODY1Ljg2NSAwIDAwLS44NTUtMS40MDF6IiBmaWxsPSIjMjAzNTRjIiBvcGFjaXR5PSIuOSIvPjwvc3ZnPg=="
+                    },
+                    "categories": [
+                        {
+                            "id": 1,
+                            "name": "Marketing"
+                        },
+                        {
+                            "id": 6,
+                            "name": "Communication"
+                        }
+                    ],
+                    "displayName": "Emelia",
+                    "typeVersion": 1
+                },
+                {
+                    "id": 107,
+                    "icon": "file:gotify.png",
+                    "name": "n8n-nodes-base.gotify",
+                    "defaults": {
+                        "name": "Gotify"
+                    },
+                    "iconData": {
+                        "type": "file",
+                        "fileBuffer": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAAxCAMAAACxvDqeAAAC9FBMVEUAAABwyOxfb3ArKizu7u4AAAA2Nja65N/09PQ9PT1xyu5ISEdzzfJRVFZFRkdOUlRstNFISEhyzPCNjnxSVFN0zvRDhaZsvd4AAAAHAAA6a380NzQWCQdUUlEAAADayqFgrs4EAAAAAAA+Pj5fq8pLiaJPQzcAAAC/wMFVla5Vl7Fao8FUmbZPkaxzcm45RUYxXGxYaHEEAAClopNenba8urXBsY1ktNRisM/Gx8i9vb5RkaxWm7hTlrO5ubqcj3Gdnp9HfZNFf5YTCABPAABJSUkAAACpvclnqse6rIq5tJmUoqBRiZ3S0tJGRkZXosBbpcOypYRQiKCBfnemmHmzs7Ogk3ZAY3NLiqNGgZdSlrKYjG6Zmp2HhoZIg5xua18VAAASJS6IzONveYJcp8VNl7XMzMyCgH2ulmmoqKdam7dSZmdVj6aFeF65ubmOnabc2NZIdYddqMeTk5PFxcV8fGSoqKhiYmKbm5uDeF42UlwxODplXkdxyu7///9wyezw8PHv7+9vxedvx+r8/Pz+/v729vVxy+9zye1uw+Vtvt9svNx20/hzzvN1yu7y8vJ4zvJtweN41v1zzPBrttR31fttutr39/f09PXT09N62v/7+vprzPJwye5awefh4ODb2trY2Nj49PJpy/FlyvF2zO/q6urq6Obm5eVsudhsuNbDwsJ00PZ1z/RvzfNxy/BgyO9bxOvt6+rOzs/My8v///718u/j4+JXud5mudtktte1w8u8vLx2zfFQwOhtwOHR1dhis9TEyc2ivMvIyMiJs8j24rTHuJNpvd9fut3e3dxYs9ZmstF9ttB3scvjzqH4+Pj89/Xx7OliwudQu+F2vdu8ytOKudB0s8+rwMyUucyAsMeRtMZWpcWYtcSur7Ln06aenp7Ov5eCgX9pxutswuVGtt5ZrtGMsL1normHpLHKwZ5tcHNua2tczfd4yOh0w+OWydWuzsnS2sF4qLvVzattkKHQwZ2ypYZ0foabk3+0om8tQEi7AAAAfXRSTlMA/gIE/gEIBP4M+x35KBUh/hn5CC77Bv4pI2dCPTMY/v0vEhHmiiAe/fTT0MmfVlBNNg7+/f378u3hyr64p5yXlX1yYBYSDf7+/fz6+vX05tnSy7u2rKOXlZWSgW9mX0pKOf7+9vbv7Ozq6ebl5eTj2Me/urWtn5eHfXpyb7qhFt8AAAb+SURBVEjHjZZlmBJRFIbvwIBDi4ru2t3d3d3d3d2tzNCgSwmLxLILq6urrt3d3d3d3e0fzx0B0QfjPLvD7sA73znfOdx70Z+Dkx317Zkzrmne+Lj4vHx8JzsX/WfABwvc2HKjROHq1apVK9y+dpHyBRHKxPsHxcmUiYM4CAlyltwyT2l2mSFcLpf5QeHu8fDMv7NsggjlbGcxK4xKYSiyZHGaXfkbwFt/ZYs1LM9FeWtZXGIhowxHMpOcLBQud9WqiPicv1Ra2jVvYqP2PgWhjARhsi5aZCKMWrGvZFOo/A94JtT38OD82i1GMWEMo4zV7l+9Zs3CFVYlI/bVAuXYlfMyoSLaB0R+ofinrmnH6mMnr+7bd+BY2g6GUZwbN76+AHFi0mByqS0EoBHWsvlmcIF+w4akwOMUO2NaeWEBXZP/JxrlLbFHa2TCOVv27N1A/4gzN1PshH1nMx1dH+qLEdCKBg4FE7HKvnkvTetYXEcvuJZmNfkvr6W9jf7U8NKOiFnJ1tXX9bSe1dXrdfTuzSsI+/ndOl1bQQwabhWsbo4SfrgbFHGw0htPpJnsO6/o6UkoNlxg64oIbFp5fC0Wxr/BxbR+w741VmvapSS6Lox5rJIHHLZEYOvCEwsAxKLbX9yiaPpiilO58An5Rzh3FLwo7dIZgPHP83t3ghjeofn4/I67d5TdvKi046LStvovbwylndr2XhJNb0tx3XjR6suwglElc/ic2IYtf7QkZDbrW9LVtC2Vvg66d6hXWJkHIF/A5+E/eXAt5RBGxtq+cxutY2k9oHRg6+pKp/LdzXewc/jbweNCCgKpVID/hSeWcQiN0OJkVtqSfxOIsqGnFxxIO9fi9qnbp1rkQllD5XIFfKDlIpFcwIWhzblCzBBaIjnk98lgeDzTr6fYF76veqhqpVzhcjmIxxeAqkBUVJItm0TGz31cu2uORhtKfNHCY/t2p2/cuPbotsxrdmhNzs3XvDVAMOwVSBeS8hFXLsmWJ082SYGRmhxzNETk22xZsznxxInMR1JW2p0W/8KdzTNG1J88dtoPGFT5haRyKbzIsgEcX9KUY94cImKaaZFz1cqVluWWhWs27zl5c9u6YLo+KVAlDmDIGSrlS+UiGcblMlmxkqa5Gi0TBdtX+FenHMl8oNneYPpGg4FSGdanLh4DRuGcC3GhYpFMIpHjGwULm6PXIKd/9fljl69fWXf07AK3waZWkyS1KcOt7oQgIOcmUj7QMpkkTx6JCJXTKpQAMwTBJCtX3mcuXL24OwCgxwacWoVj+2JK1/uHZQDLBVCwBNzOUyG+oybHrnnz5oDhhFNz4U3rW0fXr3WHQQjSsD9oIOkuoZGUQsVSxJFKgG3cben8pQk55s4DmLH6nzy7+/nZtypulUodYVPXG9QkXZNl8YDIRUVlHG5FSYWis5onLJ2fMBfDhJJxnnva8tChKhnrAyoPpSYxSy3eroYXXQ1+iG4igorjO/ZAnEaV52f+CQPtf/h0iccTWL8/dbGBIkkSF+whVeTpNnlDME9aVNZ45uvEcgXyr8gxH2CctpZh3V556ayN9HiWePevW2Iw2NzrbqXaKBKSLxBiEUcuEZUb/ap1iUVCp5HQasCsUKNNq46nGsAsyrM2sH17kPTup7zFlxhI25JcKEKLshXNPaHyssyJCTBcxlWrjEasC7DlyF6DGvwiKXXGptSM9SobtSTDazMs7ociNE8ERidmzpyYmLg0YRc0SqPVYnlmx5p9G1WYpjI2uSmKAtspLK4qi37S3Kz9K88HdtnS+fMTWMcgd1x02rV0Sq0i3eu8blLNNoxca0hftwngqD0u57LMGF4WZvGA47z3pEJfDUf3e9hO4/HU0afbdCr2C9zTvAtoUI7AP5ai89sWQHeLk5AwCHt0NDm0S5/433a4Og6xdu6yxGW4U7swzLDwotUH1tpsGQGKVNvcuqRNNaaWhRZHo1lhaSjjyqJcRcyZm5AQGs9Qs5bnDyat8ybZTtM2b83pudnJglNPlCysaA3MYoZRrjIyWg0EVPxzCU1ffyY9ULxunzgWxFy01bnglFVsCLGK7a0RR9T+7j95Z++VA49G5cYaXF40ikVz3+3QP352q4HJrBroRwfjvL/1SMrLx6c+lUVZY5yfKnY4mO/Qh3dvj8NhJEY4FQpfieH5DtaLtb9xUdN6VfPlazmlnU8sJJjfUIbIYnGVLsbperArFopBo7y5ysWhuNJOh0WcRUhEnkAQQvFyx5Ye8KF6B3uBcswTJ77CJWepwy6fY7lCnIUNsWK5w7G1dm5sTOfboV0mhnhW6HV2BMYXqV14K2F2OHw+n8PM7ClVZAA8FnLrNwNn/ZfgshlULFC+YZEydeqU6d6wfBxgKHso21+S/g6qU2joMkwsiQAAAABJRU5ErkJggg=="
+                    },
+                    "categories": [
+                        {
+                            "id": 6,
+                            "name": "Communication"
+                        }
+                    ],
+                    "displayName": "Gotify",
+                    "typeVersion": 1
+                },
+                {
+                    "id": 225,
+                    "icon": "file:strapi.svg",
+                    "name": "n8n-nodes-base.strapi",
+                    "defaults": {
+                        "name": "Strapi"
+                    },
+                    "iconData": {
+                        "type": "file",
+                        "fileBuffer": "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTAyNSIgaGVpZ2h0PSIxMDMyIiBmaWxsPSJub25lIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPjxwYXRoIGQ9Ik0zNDEuMzI4IDB2MzQ0LjA2MWgzNDEuMzMzdjM0NC4wNmgzNDEuMzI5VjBIMzQxLjMyOHoiIGZpbGw9InVybCgjYSkiLz48cGF0aCBkPSJNNjgzIDM0My43MjVIMzQzdjM0NC43MzJoMzQwVjM0My43MjV6IiBmaWxsPSJ1cmwoI2IpIi8+PHBhdGggZD0iTTM0MS4zMzMgMzQ0LjA2MUgwTDM0MS4zMzMgMHYzNDQuMDYxeiIgZmlsbD0idXJsKCNjKSIvPjxwYXRoIGQ9Ik02ODIuMzY3IDEwMzEuMThWNjg3LjQ1N2gzNDIuMDAzTDY4Mi4zNjcgMTAzMS4xOHoiIGZpbGw9InVybCgjZCkiLz48Y2lyY2xlIHI9IjEuNzk2IiB0cmFuc2Zvcm09Im1hdHJpeCgxIDAgMCAtMSAzNjUuMTYyIDMxNC42NjMpIiBmaWxsPSIjOTU2RkZGIi8+PGNpcmNsZSByPSIxLjc5NiIgdHJhbnNmb3JtPSJtYXRyaXgoMSAwIDAgLTEgMzc0LjUwMiAzMTQuNjYzKSIgZmlsbD0iIzk1NkZGRiIvPjxjaXJjbGUgcj0iMS43OTYiIHRyYW5zZm9ybT0ibWF0cml4KDEgMCAwIC0xIDM4My44NDMgMzE0LjY2MykiIGZpbGw9IiM5NTZGRkYiLz48Y2lyY2xlIHI9IjEuNzk2IiB0cmFuc2Zvcm09Im1hdHJpeCgxIDAgMCAtMSAzOTMuMTg0IDMxNC42NjMpIiBmaWxsPSIjOTU2RkZGIi8+PGNpcmNsZSByPSIxLjc5NiIgdHJhbnNmb3JtPSJtYXRyaXgoMSAwIDAgLTEgNDAyLjUyNSAzMTQuNjYzKSIgZmlsbD0iIzk1NkZGRiIvPjxjaXJjbGUgcj0iMS43OTYiIHRyYW5zZm9ybT0ibWF0cml4KDEgMCAwIC0xIDQxMS44NjYgMzE0LjY2MykiIGZpbGw9IiM5NTZGRkYiLz48Y2lyY2xlIHI9IjEuNzk2IiB0cmFuc2Zvcm09Im1hdHJpeCgxIDAgMCAtMSA0MjEuMjA2IDMxNC42NjMpIiBmaWxsPSIjOTU2RkZGIi8+PGNpcmNsZSByPSIxLjc5NiIgdHJhbnNmb3JtPSJtYXRyaXgoMSAwIDAgLTEgNDMwLjU0NiAzMTQuNjYzKSIgZmlsbD0iIzk1NkZGRiIvPjxjaXJjbGUgcj0iMS43OTYiIHRyYW5zZm9ybT0ibWF0cml4KDEgMCAwIC0xIDQzOS44ODcgMzE0LjY2MykiIGZpbGw9IiM5NTZGRkYiLz48Y2lyY2xlIHI9IjEuNzk2IiB0cmFuc2Zvcm09Im1hdHJpeCgxIDAgMCAtMSA0NDkuMjI4IDMxNC42NjMpIiBmaWxsPSIjOTU2RkZGIi8+PGNpcmNsZSByPSIxLjc5NiIgdHJhbnNmb3JtPSJtYXRyaXgoMSAwIDAgLTEgNDU4LjU2OSAzMTQuNjYzKSIgZmlsbD0iIzk1NkZGRiIvPjxjaXJjbGUgcj0iMS43OTYiIHRyYW5zZm9ybT0ibWF0cml4KDEgMCAwIC0xIDM2NS4xNjIgMzA2LjA0MSkiIGZpbGw9IiM5NTZGRkYiLz48Y2lyY2xlIHI9IjEuNzk2IiB0cmFuc2Zvcm09Im1hdHJpeCgxIDAgMCAtMSAzNzQuNTAyIDMwNi4wNDEpIiBmaWxsPSIjOTU2RkZGIi8+PGNpcmNsZSByPSIxLjc5NiIgdHJhbnNmb3JtPSJtYXRyaXgoMSAwIDAgLTEgMzgzLjg0MyAzMDYuMDQxKSIgZmlsbD0iIzk1NkZGRiIvPjxjaXJjbGUgcj0iMS43OTYiIHRyYW5zZm9ybT0ibWF0cml4KDEgMCAwIC0xIDM5My4xODQgMzA2LjA0MSkiIGZpbGw9IiM5NTZGRkYiLz48Y2lyY2xlIHI9IjEuNzk2IiB0cmFuc2Zvcm09Im1hdHJpeCgxIDAgMCAtMSA0MDIuNTI1IDMwNi4wNDEpIiBmaWxsPSIjOTU2RkZGIi8+PGNpcmNsZSByPSIxLjc5NiIgdHJhbnNmb3JtPSJtYXRyaXgoMSAwIDAgLTEgNDExLjg2NiAzMDYuMDQxKSIgZmlsbD0iIzk1NkZGRiIvPjxjaXJjbGUgcj0iMS43OTYiIHRyYW5zZm9ybT0ibWF0cml4KDEgMCAwIC0xIDQyMS4yMDYgMzA2LjA0MSkiIGZpbGw9IiM5NTZGRkYiLz48Y2lyY2xlIHI9IjEuNzk2IiB0cmFuc2Zvcm09Im1hdHJpeCgxIDAgMCAtMSA0MzAuNTQ2IDMwNi4wNDEpIiBmaWxsPSIjOTU2RkZGIi8+PGNpcmNsZSByPSIxLjc5NiIgdHJhbnNmb3JtPSJtYXRyaXgoMSAwIDAgLTEgMzY1LjE2MiAyOTcuNDE5KSIgZmlsbD0iIzk1NkZGRiIvPjxjaXJjbGUgcj0iMS43OTYiIHRyYW5zZm9ybT0ibWF0cml4KDEgMCAwIC0xIDM3NC41MDIgMjk3LjQxOSkiIGZpbGw9IiM5NTZGRkYiLz48Y2lyY2xlIHI9IjEuNzk2IiB0cmFuc2Zvcm09Im1hdHJpeCgxIDAgMCAtMSAzODMuODQzIDI5Ny40MTkpIiBmaWxsPSIjOTU2RkZGIi8+PGNpcmNsZSByPSIxLjc5NiIgdHJhbnNmb3JtPSJtYXRyaXgoMSAwIDAgLTEgMzkzLjE4NCAyOTcuNDE5KSIgZmlsbD0iIzk1NkZGRiIvPjxjaXJjbGUgcj0iMS43OTYiIHRyYW5zZm9ybT0ibWF0cml4KDEgMCAwIC0xIDQwMi41MjUgMjk3LjQxOSkiIGZpbGw9IiM5NTZGRkYiLz48Y2lyY2xlIHI9IjEuNzk2IiB0cmFuc2Zvcm09Im1hdHJpeCgxIDAgMCAtMSAzNjUuMTYyIDI4OC43OTYpIiBmaWxsPSIjOTU2RkZGIi8+PGNpcmNsZSByPSIxLjc5NiIgdHJhbnNmb3JtPSJtYXRyaXgoMSAwIDAgLTEgMzc0LjUwMiAyODguNzk3KSIgZmlsbD0iIzk1NkZGRiIvPjxjaXJjbGUgcj0iMS43OTYiIHRyYW5zZm9ybT0ibWF0cml4KDEgMCAwIC0xIDM4My44NDMgMjg4Ljc5NykiIGZpbGw9IiM5NTZGRkYiLz48Y2lyY2xlIGN4PSI3MTYuMTYyIiBjeT0iNjM4Ljc5NiIgcj0iMS43OTYiIGZpbGw9IiM5NTZGRkYiLz48Y2lyY2xlIGN4PSI3MjUuNTAyIiBjeT0iNjM4Ljc5NiIgcj0iMS43OTYiIGZpbGw9IiM5NTZGRkYiLz48Y2lyY2xlIGN4PSI3MzQuODQzIiBjeT0iNjM4Ljc5NiIgcj0iMS43OTYiIGZpbGw9IiM5NTZGRkYiLz48Y2lyY2xlIGN4PSI3NDQuMTg0IiBjeT0iNjM4Ljc5NiIgcj0iMS43OTYiIGZpbGw9IiM5NTZGRkYiLz48Y2lyY2xlIGN4PSI3NTMuNTI1IiBjeT0iNjM4Ljc5NiIgcj0iMS43OTYiIGZpbGw9IiM5NTZGRkYiLz48Y2lyY2xlIGN4PSI3NjIuODY2IiBjeT0iNjM4Ljc5NiIgcj0iMS43OTYiIGZpbGw9IiM5NTZGRkYiLz48Y2lyY2xlIGN4PSI3NzIuMjA2IiBjeT0iNjM4Ljc5NiIgcj0iMS43OTYiIGZpbGw9IiM5NTZGRkYiLz48Y2lyY2xlIGN4PSI3MTYuMTYyIiBjeT0iNjQ3LjQxOSIgcj0iMS43OTYiIGZpbGw9IiM5NTZGRkYiLz48Y2lyY2xlIGN4PSI3MjUuNTAyIiBjeT0iNjQ3LjQxOSIgcj0iMS43OTYiIGZpbGw9IiM5NTZGRkYiLz48Y2lyY2xlIGN4PSI3MzQuODQzIiBjeT0iNjQ3LjQxOSIgcj0iMS43OTYiIGZpbGw9IiM5NTZGRkYiLz48Y2lyY2xlIGN4PSI3NDQuMTg0IiBjeT0iNjQ3LjQxOSIgcj0iMS43OTYiIGZpbGw9IiM5NTZGRkYiLz48Y2lyY2xlIGN4PSI3NTMuNTI1IiBjeT0iNjQ3LjQxOSIgcj0iMS43OTYiIGZpbGw9IiM5NTZGRkYiLz48Y2lyY2xlIGN4PSI3NjIuODY2IiBjeT0iNjQ3LjQxOSIgcj0iMS43OTYiIGZpbGw9IiM5NTZGRkYiLz48Y2lyY2xlIGN4PSI3MTYuMTYyIiBjeT0iNjU2LjA0MSIgcj0iMS43OTYiIGZpbGw9IiM5NTZGRkYiLz48Y2lyY2xlIGN4PSI3MjUuNTAyIiBjeT0iNjU2LjA0IiByPSIxLjc5NiIgZmlsbD0iIzk1NkZGRiIvPjxjaXJjbGUgY3g9IjczNC44NDMiIGN5PSI2NTYuMDQiIHI9IjEuNzk2IiBmaWxsPSIjOTU2RkZGIi8+PGNpcmNsZSBjeD0iNzQ0LjE4NCIgY3k9IjY1Ni4wNCIgcj0iMS43OTYiIGZpbGw9IiM5NTZGRkYiLz48Y2lyY2xlIGN4PSI3NTMuNTI1IiBjeT0iNjU2LjA0IiByPSIxLjc5NiIgZmlsbD0iIzk1NkZGRiIvPjxjaXJjbGUgY3g9IjcxNi4xNjIiIGN5PSI2NjQuNjY0IiByPSIxLjc5NiIgZmlsbD0iIzk1NkZGRiIvPjxjaXJjbGUgY3g9IjcyNS41MDIiIGN5PSI2NjQuNjYzIiByPSIxLjc5NiIgZmlsbD0iIzk1NkZGRiIvPjxjaXJjbGUgY3g9IjczNC44NDMiIGN5PSI2NjQuNjYzIiByPSIxLjc5NiIgZmlsbD0iIzk1NkZGRiIvPjxkZWZzPjxsaW5lYXJHcmFkaWVudCBpZD0iYSIgeDE9IjEwNzIuMzYiIHkxPSItNTEuNDA3IiB4Mj0iNTUzLjAzMSIgeTI9IjQ0Ni45NDUiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIj48c3RvcCBvZmZzZXQ9Ii4wMjEiIHN0b3AtY29sb3I9IiM5NTZGRkYiLz48c3RvcCBvZmZzZXQ9IjEiIHN0b3AtY29sb3I9IiMxQzFCN0UiLz48L2xpbmVhckdyYWRpZW50PjxsaW5lYXJHcmFkaWVudCBpZD0iYiIgeDE9IjYzNC4zNjUiIHkxPSIzOTYuNSIgeDI9IjI3Ny4xNzciIHkyPSI3MTIuOTAxIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+PHN0b3Agc3RvcC1jb2xvcj0iIzk1NkZGRiIvPjxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0iIzFBMjY3MCIvPjwvbGluZWFyR3JhZGllbnQ+PGxpbmVhckdyYWRpZW50IGlkPSJjIiB4MT0iMTcwLjY2NyIgeTE9IjAiIHgyPSIxNzAuNjY3IiB5Mj0iMzQ0LjA2MSIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPjxzdG9wIG9mZnNldD0iLjAyMSIgc3RvcC1jb2xvcj0iIzk1NkZGRiIvPjxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0iIzFDMUI3RSIvPjwvbGluZWFyR3JhZGllbnQ+PGxpbmVhckdyYWRpZW50IGlkPSJkIiB4MT0iMTA4NS4xOCIgeTE9IjU1Ni4yMiIgeDI9IjY5NS42NTQiIHkyPSI5NjcuMDQyIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+PHN0b3Agc3RvcC1jb2xvcj0iIzk1NkZGRiIvPjxzdG9wIG9mZnNldD0iLjgzOSIgc3RvcC1jb2xvcj0iIzFDMUI3RSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjwvc3ZnPg=="
+                    },
+                    "categories": [
+                        {
+                            "id": 1,
+                            "name": "Marketing"
+                        },
+                        {
+                            "id": 3,
+                            "name": "Data & Storage"
+                        }
+                    ],
+                    "displayName": "Strapi",
+                    "typeVersion": 1
+                }
+            ]
+        },
+        {
+            "id": 1207,
+            "name": "Run Weekly Inventories on Shopify Sales ",
+            "totalViews": 424,
+            "recentViews": 0,
+            "user": {
+                "username": "admin"
+            },
+            "createdAt": "2021-08-24T15:08:34.063Z",
+            "nodes": [
+                {
+                    "id": 7,
+                    "icon": "file:airtable.svg",
+                    "name": "n8n-nodes-base.airtable",
+                    "defaults": {
+                        "name": "Airtable"
+                    },
+                    "iconData": {
+                        "type": "file",
+                        "fileBuffer": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyMDAgMTcwIj48cGF0aCBkPSJNODkgNC44TDE2LjIgMzQuOWMtNC4xIDEuNy00IDcuNC4xIDkuMWw3My4yIDI5YzYuNCAyLjYgMTMuNiAyLjYgMjAgMGw3My4yLTI5YzQuMS0xLjYgNC4xLTcuNC4xLTkuMWwtNzMtMzAuMUMxMDMuMiAyIDk1LjcgMiA4OSA0LjgiIGZpbGw9IiNmY2I0MDAiLz48cGF0aCBkPSJNMTA1LjkgODguOXY3Mi41YzAgMy40IDMuNSA1LjggNi43IDQuNWw4MS42LTMxLjdjMS45LS43IDMuMS0yLjUgMy4xLTQuNVY1Ny4yYzAtMy40LTMuNS01LjgtNi43LTQuNUwxMDkgODQuM2MtMS45LjgtMy4xIDIuNi0zLjEgNC42IiBmaWxsPSIjMThiZmZmIi8+PHBhdGggZD0iTTg2LjkgOTIuNmwtMjQuMiAxMS43LTIuNSAxLjJMOS4xIDEzMGMtMy4yIDEuNi03LjQtLjgtNy40LTQuNFY1Ny41YzAtMS4zLjctMi40IDEuNi0zLjMuNC0uNC44LS43IDEuMi0uOSAxLjItLjcgMy0uOSA0LjQtLjNsNzcuNSAzMC43YzQgMS41IDQuMyA3LjEuNSA4LjkiIGZpbGw9IiNmODJiNjAiLz48cGF0aCBkPSJNODYuOSA5Mi42bC0yNC4yIDExLjctNTkuNC01MGMuNC0uNC44LS43IDEuMi0uOSAxLjItLjcgMy0uOSA0LjQtLjNsNzcuNSAzMC43YzQgMS40IDQuMyA3IC41IDguOCIgZmlsbD0iI2JhMWU0NSIvPjwvc3ZnPg=="
+                    },
+                    "categories": [
+                        {
+                            "id": 3,
+                            "name": "Data & Storage"
+                        }
+                    ],
+                    "displayName": "Airtable",
+                    "typeVersion": 2
+                },
+                {
+                    "id": 14,
+                    "icon": "file:apiTemplateIo.svg",
+                    "name": "n8n-nodes-base.apiTemplateIo",
+                    "defaults": {
+                        "name": "APITemplate.io"
+                    },
+                    "iconData": {
+                        "type": "file",
+                        "fileBuffer": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI4MCIgaGVpZ2h0PSI4MCIgdmlld0JveD0iMCAwIDIzLjE2NyAyMS4xNjciPjxwYXRoIGZpbGw9IiM5MWJjZTUiIGQ9Ik0xOC42MTEuNTA0TDMuNDczIDExLjI0bDQuNTk3IDIuMjEzIDEuMDY2IDMuODgzIDMuMTcxLTIuMjI2IDIuODAyLjk1MXoiLz48cGF0aCBmaWxsPSIjMWYyMTJiIiBkPSJNOS4xNzIgMTcuNTk3YS4yNjQuMjY0IDAgMDEtLjI5LS4xOTJsLTEuMDM1LTMuNzY3LTQuNDg4LTIuMTZhLjI2NS4yNjUgMCAwMS0uMDM5LS40NTRMMTguNDU4LjI4OGEuMjY0LjI2NCAwIDAxLjQxLjI3NGwtMy41IDE1LjU1NmEuMjY1LjI2NSAwIDAxLS4zNDQuMTkzbC0yLjY3NC0uOTA4LTMuMDYxIDIuMTVhLjI3My4yNzMgMCAwMS0uMTE3LjA0NHptLTUuMTgtNi40MDFsNC4xOTMgMi4wMTdjLjA2OS4wMzQuMTIuMDk1LjE0LjE2OWwuOTY3IDMuNTIgMi44NjMtMi4wMWEuMjY1LjI2NSAwIDAxLjIzNy0uMDMzbDIuNTI0Ljg1NkwxOC4yIDEuMTE5eiIvPjxwYXRoIGZpbGw9IiMzYTg0YzEiIGQ9Ik05LjMzOSAxNy4wNzlsLjk0Ni0yLjkxM0wxOC42NDIuNzI4IDguMjI2IDEzLjIzNXoiLz48cGF0aCBmaWxsPSIjMWYyMTJiIiBkPSJNOS4zNTYgMTcuMjFhLjEzMi4xMzIgMCAwMS0uMTQzLS4xNzJsLjk0Ni0yLjkxM2EuMTYuMTYgMCAwMS4wMTQtLjAzbDcuMzkzLTExLjg4OC05LjQxOSAxMS4xNTZhLjEzMy4xMzMgMCAwMS0uMjAyLS4xNzFMMTguNTQuNjQyYS4xMzIuMTMyIDAgMDEuMjE0LjE1NmwtOC4zNDggMTMuNDI0LS45NDEgMi44OThhLjEzMi4xMzIgMCAwMS0uMTA5LjA5em0tMy4yMTUgMS4wNDVjLTEuMTY4LjAyOS0yLjMwMy0uMzczLTMuMDY3LTEuMjg3LS40ODUtLjU4LS42ODMtMS41NzQuMjc1LTEuNzA1Ljg1OS0uMTE5IDEuMjI5LjQ4NSAxLjQ4IDEuMTk2LjgwNCAyLjAyNi4xNiAyLjkzOC0xLjY4IDQuMjcyLS4xNDQuMDkuMDE1LjI5Ni4xNTkuMjA2IDEuMjE4LTEgMS44MjktMS40NjYgMi4xLTIuNDQ4LjEzNC0xLjM2LS40MDItMy4wOTEtMS4zODQtMy40MzYtMS4xMi0uMzgyLTIuMDYzLjUxNi0xLjQ5OSAxLjU4NS42OTkgMS4zMjQgMi4yMyAxLjkxNCAzLjY1MiAxLjg3OC4xNy0uMDA0LjEzMy0uMjY2LS4wMzYtLjI2MXoiLz48cGF0aCBmaWxsPSIjMWYyMTJiIiBkPSJNNy4yMzUgMTguMTRhMTQuOTUgMTQuOTUgMCAwMS0uNzU5LjA5Yy0uMTcuMDE3LS4xMzMuMjc5LjAzNi4yNjIuMjUzLS4wMjUuNTA3LS4wNTIuNzU4LS4wOS4xNjktLjAyNi4xMzMtLjI4OC0uMDM1LS4yNjJ6bTEuMTk0LS41MDRhOC40NiA4LjQ2IDAgMDEtLjg2NS4zNDRjLS4xNjIuMDU0LS4wNTcuMjk3LjEwNC4yNDNhOC4zNyA4LjM3IDAgMDAuODY1LS4zNDRjLjE1NC0uMDcxLjA1LS4zMTUtLjEwNC0uMjQzeiIvPjxwYXRoIGQ9Ik0xMi41OTkgMTUuMjJhLjEzMS4xMzEgMCAwMS0uMDctLjAxbC0yLjE2OC0uOTI0YS4xMzMuMTMzIDAgMDEuMTAzLS4yNDNsMi4xNjkuOTIzYS4xMzMuMTMzIDAgMDEtLjAzNC4yNTN6Ii8+PC9zdmc+"
+                    },
+                    "categories": [
+                        {
+                            "id": 1,
+                            "name": "Marketing"
+                        }
+                    ],
+                    "displayName": "APITemplate.io",
+                    "typeVersion": 1
+                },
+                {
+                    "id": 18,
+                    "icon": "file:autopilot.svg",
+                    "name": "n8n-nodes-base.autopilot",
+                    "defaults": {
+                        "name": "Autopilot"
+                    },
+                    "iconData": {
+                        "type": "file",
+                        "fileBuffer": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjM4IDI2IDM1IDM1Ij48Y2lyY2xlIGN4PSI1MCIgY3k9IjUwIiByPSI0MCIgc3Ryb2tlPSIjMThkNGIyIiBzdHJva2Utd2lkdGg9IjMiIGZpbGw9IiMxOGQ0YjIiLz48cGF0aCBmaWxsPSIjZmZmIiBkPSJNNDUuNCA0Mi42aDE5LjlsMy40LTQuOEg0MmwzLjQgNC44em0zLjEgOC4zaDEzLjFsMy40LTQuOEg0NS40bDMuMSA0Ljh6bTU0LS43Ii8+PC9zdmc+"
+                    },
+                    "categories": [
+                        {
+                            "id": 1,
+                            "name": "Marketing"
+                        }
+                    ],
+                    "displayName": "Autopilot",
+                    "typeVersion": 1
+                },
+                {
+                    "id": 20,
+                    "icon": "file:lambda.svg",
+                    "name": "n8n-nodes-base.awsLambda",
+                    "defaults": {
+                        "name": "AWS Lambda"
+                    },
+                    "iconData": {
+                        "type": "file",
+                        "fileBuffer": "data:image/svg+xml;base64,PHN2ZyBoZWlnaHQ9IjI1MDAiIHZpZXdCb3g9Ii0zLjAyMyAtMC4yMiA0MjAuOTIzIDQzMy41NCIgd2lkdGg9IjI0NDMiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PHBhdGggZD0iTTIwOC40NSAyMjcuODljLTEuNTkgMi4yNi0yLjkzIDQuMTItNC4yMiA2cS0zMC44NiA0NS40Mi02MS43IDkwLjgzLTI4LjY5IDQyLjI0LTU3LjQ0IDg0LjQzYTMuODggMy44OCAwIDAxLTIuNzMgMS41OXEtNDAuNTktLjM1LTgxLjE2LS44OGMtLjMgMC0uNjEtLjA5LTEuMi0uMThhMTQuNDQgMTQuNDQgMCAwMS43Ni0xLjY1cTI4LjMxLTQzLjg5IDU2LjYyLTg3Ljc2IDI1LjExLTM4Ljg4IDUwLjI1LTc3Ljc0IDI3Ljg2LTQzLjE4IDU1LjY5LTg2LjQyYzIuNzQtNC4yNSA1LjU5LTguNDIgOC4xOS0xMi43NWE1LjI2IDUuMjYgMCAwMC41Ni0zLjgzYy01LTE1Ljk0LTEwLjEtMzEuODQtMTUuMTktNDcuNzQtMi4xOC02LjgxLTQuNDYtMTMuNTgtNi41LTIwLjQzLS42Ni0yLjItMS43NS0yLjg3LTQtMi44Ni0xNyAuMDctMzMuOS4wNS01MC44NS4wNS0zLjIyIDAtMy4yMyAwLTMuMjMtMy4xOCAwLTIwLjg0IDAtNDEuNjgtLjA2LTYyLjUyIDAtMi4zMi43Ni0yLjg0IDIuOTQtMi44NHE1MS4xOS4wOSAxMDIuNCAwYTMuMjkgMy4yOSAwIDAxMy42IDIuNDNxMjcgNjcuOTEgNTQgMTM1Ljc3IDMxLjUgNzkuMTQgNjMgMTU4LjNjNi41MiAxNi4zOCAxMy4wOSAzMi43NSAxOS41NCA0OS4xNy43NyAyIDEuNTcgMi4zOCAzLjU5IDEuNzYgMTcuODktNS41MyAzNS44Mi0xMC45MSA1My43LTE2LjQ1IDIuMjUtLjcgMy4wNy0uMjMgMy43NyAyIDYuMSAxOS4xNyAxMi4zMiAzOC4zIDE4LjUgNTcuNDUuMjEuNjYuMzcgMS4zMy42MiAyLjI1LTEuMjguNDctMi40OCAxLTMuNzEgMS4zNHEtNjEgMTkuMzMtMTIxLjkzIDM4LjY4Yy0xLjk0LjYxLTIuNTItLjA1LTMuMTctMS42OHEtMTguNjEtNDcuMTYtMzcuMzEtOTQuMjgtMTguMjktNDYuMTQtMzYuNi05Mi4yOGMtMS44My00LjYyLTMuNjMtOS4yNi01LjQ2LTEzLjg4LS4yOS0uNzktLjY5LTEuNDgtMS4yNy0yLjd6IiBmaWxsPSIjZmE3ZTE0Ii8+PC9zdmc+"
+                    },
+                    "categories": [
+                        {
+                            "id": 5,
+                            "name": "Development"
+                        }
+                    ],
+                    "displayName": "AWS Lambda",
+                    "typeVersion": 1
+                },
+                {
+                    "id": 26,
+                    "icon": "file:sns.svg",
+                    "name": "n8n-nodes-base.awsSnsTrigger",
+                    "defaults": {
+                        "name": "AWS SNS Trigger"
+                    },
+                    "iconData": {
+                        "type": "file",
+                        "fileBuffer": "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjQ5MCIgaGVpZ2h0PSIyNTAwIiB2aWV3Qm94PSIwIDAgMjU2IDI1NyIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWlkWU1pZCI+PHBhdGggZD0iTTk4Ljg3NSAyMzIuMDMzbC0yNi40MzMtNy40MDgtMjUuMDAxLTI4LjUwOCAzMS4yNzItLjg2MyAyMC4xNjIgMzYuNzc5bS02MS4xMjUtMTguOGwtMTQuODc1LTQuMTY2LTE0LjA1OC0xNi4wMzQgMTcuMDgyLTIuODA5IDExLjg1MSAyMy4wMDkiIGZpbGw9IiM5OTVCODAiLz48cGF0aCBkPSJNMCAxOTEuMDE3bDE1LjIwNCAzLjA5MSAyLjIwNy0zLjg4MlY1OC41MDNsLTIuMjA3LTIuNTYxTDAgNjQuNnYxMjYuNDE3IiBmaWxsPSIjN0IzRjY1Ii8+PHBhdGggZD0iTTczLjkzMyA2OS43MDhMMTUuMjA4IDU1Ljk0MnYxMzguMTY2bDguNzk4LS44MTggMTMuNzQ0IDE5Ljk0MyAxMC42LTIyLjIwNSAyNS41ODMtMi4zNzhWNjkuNzA4IiBmaWxsPSIjQzE3QjlEIi8+PHBhdGggZD0iTTMzLjk1OCAxOTguMTMzbDI2LjA2MyA1LjI1IDEuNzE2LTQuMDQ1VjM3LjQ0bC0xLjcxNi0zLjY2NS0yNi4wNjMgMTMuMjA4djE1MS4xNSIgZmlsbD0iIzdCM0Y2NSIvPjxwYXRoIGQ9Ik0yMDguNzM0IDgxLjUxNkw2MC4wMjEgMzMuNzc1djE2OS42MTJsMTcuMjIxLTIuMjE2IDIxLjYzMyAzMC44NjIgMTcuMTI2LTM1Ljg1IDkyLjczMy0xMS45MzNWODEuNTE2IiBmaWxsPSIjQzE3QjlEIi8+PHBhdGggZD0iTTE4MS44MzMgMjU2LjQ5MmwtMzcuNTY2LTEwLjUyNS0zNS41MDktNDAuNSA0Ni4wMzMtLjQ2OCAyNy4wNDIgNTEuNDkzIiBmaWxsPSIjOTk1QjgwIi8+PHBhdGggZD0iTTg5LjU5MSAyMDguOTVsMzguMzMgNy40MTcgMi45NzctMi41NjZWNC4xMTdMMTI3LjkyMSAwbC0zOC4zMyAxOS4xNThWMjA4Ljk1IiBmaWxsPSIjN0IzRjY1Ii8+PHBhdGggZD0iTTI1NiA2NC4wMzNMMTI3LjkyNSAwdjIxNi4zNjdsMjIuNTk3LTQuNTI4IDMxLjMxMSA0NC42NTMgMjYuOTAxLTU2LjMwOS0uMDE3LS4wMDJMMjU2IDE5MC43MDhWNjQuMDMzIiBmaWxsPSIjQzE3QjlEIi8+PC9zdmc+"
+                    },
+                    "categories": [
+                        {
+                            "id": 5,
+                            "name": "Development"
+                        },
+                        {
+                            "id": 6,
+                            "name": "Communication"
+                        }
+                    ],
+                    "displayName": "AWS SNS Trigger",
+                    "typeVersion": 1
+                },
+                {
+                    "id": 38,
+                    "icon": "file:chargebee.png",
+                    "name": "n8n-nodes-base.chargebeeTrigger",
+                    "defaults": {
+                        "name": "Chargebee Trigger"
+                    },
+                    "iconData": {
+                        "type": "file",
+                        "fileBuffer": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAMAAAANIilAAAAAk1BMVEUAAAD9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azXS0qjqAAAAMHRSTlMAAta1CPr3HAyb8mNPLBLq5MmGZ1wi28+soEQX7pZ9dkk/MijDurCMims54b6lb1YyU8hoAAACDklEQVRIx+2V2bKiMBBAmyTs+w6CIi64O/n/rxtKJwIjJPA4Nfc8acOpTnfSAX7493G2QZN6Zeml+GwVS0xiNSXtYeBIm6lKEaJf3C5kjrvz6SioFruVTKcIJEG1D8oBa1wXUy6+w2lVxhFFuU+0j4KOjwdOjUHQnHJ/DVZ4iaXXatTo2OuhPuEWXm9fLOhxPQjldeeuyV/NqGT+su1ucZuRkt5PMRElDmCEbdK2MNcmKnaZi2EUrd7GMEHEXGMPi8mYfFruqjd2NLrE+/P9oF9nyCuW+P4JhcorcBbL4dc2WSxyEcoBe9Vi5yJlEc8RyTp7ldVo0w8rkZyzN3ddExjR4sw7TmZhzSRhEddZ3m2TRar5+3z8hDZ/xlMSnzCPnbDu9NcPhLItzKAZG0hJnHVYYhnDYtSS2RksJ+fcQi0qAbDtKXknU84oWPQJtizvxanpmcCQJ3VtiA1lUlbdzk7rfs/bzwFSVR/bsaDhjHukvvfJsbBXm8S+UboXTwfDQFjXG6S0/dde18oGrN20TI4DOzHaA3drzAJWPqVy2Fa+5qTWDn05AKJJbS+eafsHtUlRUgAHB/dkJT+ddJzI7U+3kopjVgiGUwroF7J/IWAac+7RFeo0D6X3daQCiRBNZs2XVrmDr4e2zQ1aVhrMwwl9+Z1Zzw42ptQPHZiPFJv5IXENWXGvdRhL8MN/y2+uRpQ1fWz5HAAAAABJRU5ErkJggg=="
+                    },
+                    "categories": [
+                        {
+                            "id": 8,
+                            "name": "Finance & Accounting"
+                        }
+                    ],
+                    "displayName": "Chargebee Trigger",
+                    "typeVersion": 1
+                },
+                {
+                    "id": 40,
+                    "icon": "file:clearbit.svg",
+                    "name": "n8n-nodes-base.clearbit",
+                    "defaults": {
+                        "name": "Clearbit"
+                    },
+                    "iconData": {
+                        "type": "file",
+                        "fileBuffer": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI3MiIgaGVpZ2h0PSI3MiI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJhIiB4MT0iNTAlIiB4Mj0iMTAwJSIgeTE9IjAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI0RFRjJGRSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI0RCRjFGRSIvPjwvbGluZWFyR3JhZGllbnQ+PGxpbmVhckdyYWRpZW50IGlkPSJiIiB4MT0iMCUiIHgyPSI1MCUiIHkxPSIwJSIgeTI9IjEwMCUiPjxzdG9wIG9mZnNldD0iMCUiIHN0b3AtY29sb3I9IiM1N0JDRkQiLz48c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiM1MUI1RkQiLz48L2xpbmVhckdyYWRpZW50PjxsaW5lYXJHcmFkaWVudCBpZD0iYyIgeDE9IjM3LjUlIiB4Mj0iNjIuNSUiIHkxPSIwJSIgeTI9IjEwMCUiPjxzdG9wIG9mZnNldD0iMCUiIHN0b3AtY29sb3I9IiMxQ0E3RkQiLz48c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiMxNDhDRkMiLz48L2xpbmVhckdyYWRpZW50PjwvZGVmcz48ZyBmaWxsPSJub25lIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiPjxwYXRoIGZpbGw9InVybCgjYSkiIGQ9Ik03MiAzNnYxNi43N2wtLjAwNC44NjhjLS4wNiA2LjAzNS0uNzUgOC4zNTMtMiAxMC42ODhhMTMuNjMgMTMuNjMgMCAwMS01LjY3IDUuNjdsLS4zMjYuMTcxQzYxLjY1OCA3MS4zNjQgNTkuMTYgNzIgNTIuNzcgNzJIMzZWMzZoMzZ6Ii8+PHBhdGggZmlsbD0idXJsKCNiKSIgZD0iTTY0LjMyNiAyLjAwM2ExMy42MyAxMy42MyAwIDAxNS42NyA1LjY3bC4xNzEuMzI3QzcxLjM2NCAxMC4zNDIgNzIgMTIuODQgNzIgMTkuMjNWMzZIMzZWMGgxNi43N2M2LjY4NyAwIDkuMTEyLjY5NiAxMS41NTYgMi4wMDN6Ii8+PHBhdGggZmlsbD0idXJsKCNjKSIgZD0iTTM2IDB2NzJIMTkuMjNsLS44NjgtLjAwNGMtNi4wMzUtLjA2LTguMzUzLS43NS0xMC42ODgtMmExMy42MyAxMy42MyAwIDAxLTUuNjctNS42N0wxLjgzMiA2NEMuNjM2IDYxLjY1OCAwIDU5LjE2IDAgNTIuNzdWMTkuMjNjMC02LjY4Ny42OTYtOS4xMTIgMi4wMDMtMTEuNTU2YTEzLjYzIDEzLjYzIDAgMDE1LjY3LTUuNjdMOCAxLjgzMkMxMC4zNDIuNjM2IDEyLjg0IDAgMTkuMjMgMEgzNnoiLz48L2c+PC9zdmc+"
+                    },
+                    "categories": [
+                        {
+                            "id": 2,
+                            "name": "Sales"
+                        }
+                    ],
+                    "displayName": "Clearbit",
+                    "typeVersion": 1
+                },
+                {
+                    "id": 221,
+                    "icon": "file:stackby.png",
+                    "name": "n8n-nodes-base.stackby",
+                    "defaults": {
+                        "name": "Stackby"
+                    },
+                    "iconData": {
+                        "type": "file",
+                        "fileBuffer": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAMAAAANIilAAAAC91BMVEUAAAApJRwHBggfGxImIBjLeRIAjNFQqjnmQjZQqTgNKCUmIAQadHJOpTfvuhD6wxHlQjYAi9AyayNrHhlgMw8ANlEAd7K+NSsAbKL1vxDmQzfzvRAAh8ndQDT7wxFNojYAjNEAg8QAi9Dmsw9QqDjfrQ/kQjb4wRAAis5GlTHIOS9Ppzj3wBAAd7E/hiwAb6Y7fim3jgzdPzQAhshMozapgwvaPjMAhMWfewrQOzEAVH2JJx8AfLmKawiCJR7TPDFImjLMOi/hrg4Ae7hHlzEgRRZEki9RFhLIOC7ZqA1aRQVDkC8/iy3NoAu8NCngQTUAhcbaPzNLoDXVPTJKnTTVPTL5whEAgL7RPDH5wRFHlzIAfbvNOzAAerbiQTbEOC7Wpg7iQTUAic2+Ni3Row7hQTVCji8Acqv0vhDgQDVOpTe6NSzImw0/hiyyMyoAiMpNpTYAbKEAh8mvMikAZ5tNpDbdPzTxvBC/lAyoMCcAYpNMoTWiLiaxiQvaPzM6fCk2cyY2cyaXKyNLnzTrtw9KnjTptg8AgsIAgsKZdgrUPTIwZiJJnDPnsw7dqw5GlTEsXh8AT3YAf7/ksQ6FZwgASnB2Ihvhrw4ARWdHlzF6XgclThlxVwfIOS7bqg0dPhTTpAzrtxBLnjXptQ8AgsFKnDQAe7dPqDjdrA/bqg5PpzdFkjAAis1PpzdEkDD2vxBPpjf2vxD2vxAAicxPpze9Ny1OpjfMng29kwwAiMsAiMvfQDXzvRDeQDX0vhDEmA3eQDTyvBA9gisAhsgAaJvwuxDyvBA6fCkAZZemMCfvug/uuQ8AhcYAcakAhMbtuQ+7kQwAYI9LoDWwMymdLSXtuA8AXYsAT3YAW4gAg8MAWYWTKiLWPTIAV4KPKSKcegp2IhtJnDPmsw8ASW1JmjMsXh/ksQ7QPDErWx4AfrzPOzApWB0nVBsAfLoAQGAAQWEAeLQAd7JRqznoQzf9xBEAjdIAjtP7wxHmQjcAjNEAic1PqDjjQTarWRDCAAAA8nRSTlMAAwULDgX8+/jzEgkG/fn17+lfKRwbEg8J/vz8+/v7+fb08O/o5OHh3t7c2tfSu7eZlJKPj3Z0cWBcT09EQ0JBNCkmJSEdGBcWFhURCwoJ/vn39vXx8fDq6urm5OTa2dHR0MzJyMfHwL+7urq0rq6tqaWjn56enp6el4GBgYGAgH5zamlpXV1cUlJRUVBQSUdGQjk4ODc3Ly4rKycjHh0WDvXx8e/s5eHe2tPT0s7OzsfHxsTEwsG8vLu2trawrquqp6GalZWSjouLioSDgX19eXh3d3d3bWhnZWFhX1taWlVMSkRAPz86OjY1NS4tKycbGNIMkEAAAAMoSURBVEjHzdNVVBVRGIbh/wSIgIGA3Yog3SkpSIuEhS0WBiIigoKAiqBSiiISit3d3d3d3a0nKLnw1N7DrMXA7OMN3/27Zs0z/0CDXi9HpVPNJ1ob3ynZtrzeVSw2KVCq/R2jKhaLK810gXw/joilK6uK5ZNTbRfLV9bvESlVuhZqq8x+kbWtb3bFzz2vTtb+OaeK2vV3eGRt76OVYsWGvOASUo1GaaXJErKUk25AUf0kpLLDVO1jdQkv0qozarvM4qk4OJFQTVXFVE+5reaoGbqwbpfSqEri2gorIrRZUmVQVOMLwD2yQigUVkd5s6PSwlTTdMF1lFC2oATplXjc1mFNxVd53kOoWOhrgLy97Sx4rKgGPpZQNUdtcII3ZBmLRE1tGG/tyz5MNcwRfOLUUNv/Pk9l/mCRZN3smd43hqJaDu7HKlA79CWn9GozkWx6zkwfyYBGpVjFCBdYdaajSL7yw0w/Z4aWjOqyOscBUwVN0oYVE0So3bKQw/SR7TpLqB5q9LXFVB2me8NbY9yOWQaM07RSlVJZUlSJiEq6dqeK6/zQNyRUJ9piqmfc0mvNUNvUwq+e84RPY2lUMzuitpuNBtQTLxqO2moZVTl63c2IinE0Kh3IplF5JnvV1baiqEIT+SoL9FHbZnIxuO1uYs5nbktOY6pBc7mBtwbUpMo0Egg6pTDe9leKytAJfGlUmvO6CyQLa1E/1YF88Dhejlq9Vxx/68YC2cJza3/fSEwVpQMfd2Gqkc7gGd1IoJhp7bftqrjn4Ct0qkJwOyhA67mY4YM5NJdTaQQ+oKji/eCNEUr/jvvGeCC2anKqC/gi1yXxpFSKNZniVceJWFZH5ANk4VbPnus/uzFqQy6pQx3zuacNAIEXyzFVnxmYakOqBrCY70kZ1aFCWDmRRsVqHnskP2+8DuRspag+A9vl6a9J4nPSalAVAftl23MDKKpO5quBZDWpwlJ5RCmNqgWXrH2/A1Pt/ECWctI24da0iKwNuPsfVNaYam0KIRVk4ueGk1IBBKAnb8sF8vlHy6m+gzLz3C+5yLNeoNzcjEKS+aDsciRUDXj/AJL4Mhr51poGAAAAAElFTkSuQmCC"
+                    },
+                    "categories": [
+                        {
+                            "id": 3,
+                            "name": "Data & Storage"
+                        }
+                    ],
+                    "displayName": "Stackby",
+                    "typeVersion": 1
+                },
+                {
+                    "id": 312,
+                    "icon": "file:perspective.svg",
+                    "name": "n8n-nodes-base.googlePerspective",
+                    "defaults": {
+                        "name": "Google Perspective"
+                    },
+                    "iconData": {
+                        "type": "file",
+                        "fileBuffer": "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgdmlld0JveD0iNiAxMCAxMjUgMTI1IgogICB2ZXJzaW9uPSIxLjEiCiAgIGlkPSJzdmc0IgogICB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgogIDxkZWZzCiAgICAgaWQ9ImRlZnM4Ij4KICAgIDxjbGlwUGF0aAogICAgICAgY2xpcFBhdGhVbml0cz0idXNlclNwYWNlT25Vc2UiCiAgICAgICBpZD0iY2xpcFBhdGg5MzciPgogICAgICA8cmVjdAogICAgICAgICBzdHlsZT0iZmlsbDojMDAwMGZmO2ZpbGwtcnVsZTpldmVub2RkIgogICAgICAgICBpZD0icmVjdDkzOSIKICAgICAgICAgd2lkdGg9IjEyMy40OTQ3IgogICAgICAgICBoZWlnaHQ9IjExOS4wMjc3MyIKICAgICAgICAgeD0iMTIuMjUiCiAgICAgICAgIHk9IjEyLjQ4MjI3MSIgLz4KICAgIDwvY2xpcFBhdGg+CiAgPC9kZWZzPgogIDxnCiAgICAgaWQ9Imc1MzIiCiAgICAgY2xpcC1wYXRoPSJ1cmwoI2NsaXBQYXRoOTM3KSI+CiAgICA8cGF0aAogICAgICAgZD0iTTEzMS41MyA3MmE1OS43OSA1OS43OSAwIDAgMS01My44MSA1OS40OXYtMTE5QTU5Ljc5IDU5Ljc5IDAgMCAxIDEzMS41MyA3MnpNMTIuMjUgNzh2NTMuNTFoNTMuNTJBNTkuODEgNTkuODEgMCAwIDAgMTIuMjUgNzh6bTAtMTJoNTMuNTJWMTIuNTFBNTkuODEgNTkuODEgMCAwIDAgMTIuMjUgNjZ6bTE3Ni44My0zNy4wNkgyMjNjMjEuNzcgMCAzNS44IDExLjMyIDM1LjggMjkuNjVzLTE0IDI5LjY0LTM1LjggMjkuNjRoLTE1LjIydjI2LjgyaC0xOC43em0zMy4zNCA0NGMxMS44MSAwIDE3LjM0LTQuNTUgMTcuMzQtMTQuMzlzLTUuNTMtMTQuNC0xNy4zNC0xNC40aC0xNC42NFY3M3ptMzcuMTQgMTEuNzJ2LS42MWMwLTE5LjkzIDEyLjkxLTMzIDMyLTMzIDE4IDAgMzEgMTIuNjcgMzEgMzMuNDZ2NC4xOGgtNDQuOWMxIDkuNzIgNiAxNC4yNyAxNC4xNCAxNC4yNyA1LjkxIDAgMTAuMDktMi41OCAxMS45NC03aDE4LjJjLTIuNyAxMi40Mi0xNC42NCAyMS0zMC4yNiAyMS0xOS44Mi4wNC0zMi4xMi0xMS45Ni0zMi4xMi0zMi4zem0xOC41Ny03Ljg3aDI2LjJjLTEuNzItOC4xMi02LjI3LTEyLjE4LTEyLjkxLTEyLjE4cy0xMS42OSAzLjk0LTEzLjI5IDEyLjE4em01NC43My0yMy43NGgxNy41OXY5LjQ3QzM1NC4yNiA1NS44OCAzNjEgNTIuMzEgMzcwIDUyLjMxaDMuNTZ2MTdoLTE1LjVjLTQuNjcgMC03LjEzIDIuNDYtNy4xMyA3djM4Ljc1aC0xOC4wN3pNMzc4LjEyIDk2SDM5NWMuNjIgNC45MiA0LjU1IDcuNSAxMy4yOSA3LjUgNy4zOCAwIDEwLjk0LTIuMzMgMTAuOTQtNS42NSAwLTIuNzEtMS43Mi0zLjk0LTYuMTUtNC44bC0xNC43OS0yLjg1Yy0xMy42NS0yLjQ2LTE5LjA2LTguMTItMTkuMDYtMTguMDggMC0xMi4zIDEwLTIxIDI3LjkyLTIxIDE2LjczIDAgMjguMTcgOC4zNyAyOSAyMC41NGgtMTYuODJjLS43NC00LjQyLTQuOC03LTEyLjMtNy03IDAtMTAuNDYgMi4yMi0xMC40NiA1LjU0IDAgMi41OCAxLjcyIDMuODEgNiA0LjY3bDE0Ljg4IDIuODNjMTMuNTMgMi40NiAxOC45NCA4LjEyIDE4Ljk0IDE4LjIxIDAgMTIuOTEtMTAuNDUgMjEuMTUtMjguMjkgMjEuMTUtMTguNzktLjA2LTI5LjM3LTguNzgtMjkuOTgtMjEuMDZ6bTY4LjEzLTQyLjk1aDE3LjU5djkuODRjMy43LTcuMzggMTAuNzEtMTEuNTYgMTkuNTYtMTEuNTYgMTQuODkgMCAyNi4zMyAxMS42OCAyNi4zMyAzMnYuNjJjMCAyMC4xNy0xMi4wNiAzMi44NC0yNi45NCAzMi44NC04LjEyIDAtMTQuNzYtMy4zMi0xOC40NS05LjQ3djMwLjYzaC0xOC4wOXpNNDkxIDg0LjQydi0xLjZjMC0xMS4zMi00LjkyLTE3LjM1LTEzLjE2LTE3LjM1LTguNjEgMC0xMy41MyA1LjkxLTEzLjUzIDE3LjIzdjIuN2MwIDEyLjE4IDUgMTcuMjIgMTMuMTYgMTcuMjIgNy45IDAgMTMuNTMtNi42MiAxMy41My0xOC4yem0yNi4xLjI0di0uNjFjMC0xOS45MyAxMi45Mi0zMyAzMi0zMyAxOCAwIDMxIDEyLjY3IDMxIDMzLjQ2djQuMThoLTQ0LjljMSA5LjcyIDYgMTQuMjcgMTQuMTUgMTQuMjcgNS45IDAgMTAuMDgtMi41OCAxMS45My03aDE4LjJjLTIuNyAxMi40Mi0xNC42MyAyMS0zMC4yNSAyMS0xOS44My4wNC0zMi4xMy0xMS45Ni0zMi4xMy0zMi4zem0xOC41Ny03Ljg3aDI2LjIxYy0xLjczLTguMTItNi4yOC0xMi4xOC0xMi45Mi0xMi4xOHMtMTEuNjkgMy45NC0xMy4yOSAxMi4xOHptNTEuNTMgNy43NXYtLjc0YzAtMTkuMzEgMTMuMTYtMzIuNzIgMzEuMzctMzIuNzIgMTYuMjQgMCAyNy44IDkuMzUgMjkuNCAyNC42aC0xNy43MWMtLjc0LTYuNjQtNS40Mi0xMC40NS0xMS40NC0xMC40NS03Ljg4IDAtMTMgNi41Mi0xMyAxOC4ydjEuNDhjMCAxMS44MSA1LjE2IDE4IDEyLjc5IDE4IDYuNTIgMCAxMC45NS00LjA2IDExLjgxLTExLjJoMTcuNzFjLTEuNiAxNS43NS0xMyAyNS4zNC0yOS43NyAyNS4zNEM2MDAgMTE3IDU4Ny4yIDEwNC4zNCA1ODcuMiA4NC41NHptNzYuMDEgOS4zNVY2Ny4zMmgtMTAuN1Y1My4wNWgxMC43di0xOGgxOHYxOGgxOC4yMXYxNC4yN2gtMTguMjV2MzAuNzVjMCAxLjcyLjc0IDIuNDYgMi40NiAyLjQ2aDE1Ljc1djE0LjUySDY4NS42Yy0xNC41MiAwLTIyLjM5LTcuNTEtMjIuMzktMjEuMTZ6bTQ2LTU4LjMxYTEwLjA5IDEwLjA5IDAgMCAxIDIwLjE3IDAgMTAuMDkgMTAuMDkgMCAxIDEtMjAuMTcgMHptMSAxNy40N2gxOC4wOHY2MmgtMTguMXptMjUuMTkgMEg3NTRsMTQuMzkgNDUuMjcgMTQuMjctNDUuMjdoMTcuNzFsLTIwLjkxIDYyaC0yMy4xNXptNjguODggMzEuNjF2LS42MWMwLTE5LjkzIDEyLjkyLTMzIDMyLTMzIDE4IDAgMzEgMTIuNjcgMzEgMzMuNDZ2NC4xOGgtNDQuOWMxIDkuNzIgNiAxNC4yNyAxNC4xNSAxNC4yNyA1LjkgMCAxMC4wOS0yLjU4IDExLjkzLTdoMTguMjFjLTIuNzEgMTIuNDItMTQuNjQgMjEtMzAuMjYgMjEtMTkuODMuMDQtMzIuMTMtMTEuOTYtMzIuMTMtMzIuM3ptMTguNTctNy44N2gyNi4yMWMtMS43My04LjEyLTYuMjgtMTIuMTgtMTIuOTItMTIuMThzLTExLjY5IDMuOTQtMTMuMjkgMTIuMTh6IgogICAgICAgZmlsbD0iIzQ1MTczNSIKICAgICAgIGlkPSJwYXRoMiIgLz4KICA8L2c+Cjwvc3ZnPgo="
+                    },
+                    "categories": [
+                        {
+                            "id": 7,
+                            "name": "Utility"
+                        },
+                        {
+                            "id": 10,
+                            "name": "Analytics"
+                        }
+                    ],
+                    "displayName": "Google Perspective",
+                    "typeVersion": 1
+                }
+            ]
+        },
+        {
+            "id": 628,
+            "name": "Receive updates from HubSpot when a new contact is created",
+            "totalViews": 376,
+            "recentViews": 0,
+            "user": {
+                "username": "admin"
+            },
+            "createdAt": "2020-08-31T00:27:22.044Z",
+            "nodes": [
+                {
+                    "id": 303,
+                    "icon": "file:notion.svg",
+                    "name": "n8n-nodes-base.notionTrigger",
+                    "defaults": {
+                        "name": "Notion Trigger"
+                    },
+                    "iconData": {
+                        "type": "file",
+                        "fileBuffer": "data:image/svg+xml;base64,PHN2ZyBoZWlnaHQ9IjI1MDAiIHdpZHRoPSIyNTAwIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjEyIDAuMTkgNDg3LjYxOSA1MTAuOTQxIj48cGF0aCBkPSJNOTYuMDg1IDkxLjExOGMxNS44MSAxMi44NDUgMjEuNzQxIDExLjg2NSA1MS40MyA5Ljg4NGwyNzkuODg4LTE2LjgwNmM1LjkzNiAwIDEtNS45MjItLjk4LTYuOTA2TDM3OS45NCA0My42ODZjLTguOTA3LTYuOTE1LTIwLjc3My0xNC44MzQtNDMuNTE2LTEyLjg1M0w2NS40MDggNTAuNmMtOS44ODQuOTgtMTEuODU4IDUuOTIyLTcuOTIyIDkuODgzem0xNi44MDQgNjUuMjI4djI5NC40OTFjMCAxNS44MjcgNy45MDkgMjEuNzQ4IDI1LjcxIDIwLjc2OWwzMDcuNTk3LTE3Ljc5OWMxNy44MS0uOTc5IDE5Ljc5NC0xMS44NjUgMTkuNzk0LTI0LjcyMlYxMzYuNTdjMC0xMi44MzYtNC45MzgtMTkuNzU4LTE1Ljg0LTE4Ljc3bC0zMjEuNDQyIDE4Ljc3Yy0xMS44NjMuOTk3LTE1LjgyIDYuOTMxLTE1LjgyIDE5Ljc3NnptMzAzLjY1OSAxNS43OTdjMS45NzIgOC45MDMgMCAxNy43OTgtOC45MiAxOC43OTlsLTE0LjgyIDIuOTUzdjIxNy40MTJjLTEyLjg2OCA2LjkxNi0yNC43MzQgMTAuODctMzQuNjIyIDEwLjg3LTE1LjgzMSAwLTE5Ljc5Ni00Ljk0NS0zMS42NTQtMTkuNzZsLTk2Ljk0NC0xNTIuMTl2MTQ3LjI0OGwzMC42NzcgNi45MjJzMCAxNy43OC0yNC43NSAxNy43OGwtNjguMjMgMy45NThjLTEuOTgyLTMuOTU4IDAtMTMuODMyIDYuOTIxLTE1LjgxbDE3LjgwNS00LjkzNVYyMTAuN2wtMjQuNzIxLTEuOTgxYy0xLjk4My04LjkwMyAyLjk1NS0yMS43NCAxNi44MTItMjIuNzM2bDczLjE5NS00LjkzNEwzNTguMTg2IDMzNS4yMlYxOTguODM2bC0yNS43MjMtMi45NTJjLTEuOTc0LTEwLjg4NCA1LjkyNy0xOC43ODcgMTUuODE5LTE5Ljc2N3pNNDIuNjUzIDIzLjkxOWwyODEuOS0yMC43NmMzNC42MTgtMi45NjkgNDMuNTI1LS45OCA2NS4yODMgMTQuODI1bDg5Ljk4NiA2My4yNDdjMTQuODQ4IDEwLjg3NiAxOS43OTcgMTMuODM3IDE5Ljc5NyAyNS42OTN2MzQ2Ljg4M2MwIDIxLjc0LTcuOTIgMzQuNTk3LTM1LjYwOCAzNi41NjRMMTM2LjY0IDUxMC4xNGMtMjAuNzg1Ljk5MS0zMC42NzctMS45NzEtNDEuNTYyLTE1LjgxNWwtNjYuMjY3LTg1Ljk3OEMxNi45MzggMzkyLjUyIDEyIDM4MC42OCAxMiAzNjYuODI4VjU4LjQ5NWMwLTE3Ljc3OCA3LjkyMi0zMi42MDggMzAuNjUzLTM0LjU3NnoiIGZpbGwtcnVsZT0iZXZlbm9kZCIvPjwvc3ZnPg=="
+                    },
+                    "categories": [
+                        {
+                            "id": 4,
+                            "name": "Productivity"
+                        }
+                    ],
+                    "displayName": "Notion Trigger",
+                    "typeVersion": 1
+                }
+            ]
+        },
+        {
+            "id": 1344,
+            "name": "Save Email Attachments to Cloud Storage (Nextcloud)",
+            "totalViews": 362,
+            "recentViews": 0,
+            "user": {
+                "username": "admin"
+            },
+            "createdAt": "2021-11-29T13:59:16.771Z",
+            "nodes": [
+                {
+                    "id": 10,
+                    "icon": "file:amqp.png",
+                    "name": "n8n-nodes-base.amqp",
+                    "defaults": {
+                        "name": "AMQP Sender"
+                    },
+                    "iconData": {
+                        "type": "file",
+                        "fileBuffer": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAB7UlEQVRoge2W4W3CMBCFj26QjkBHSEdIR4AR6Ah0BBgBRqAjhBFgBBghHaEVlV29PN0lDr+o9D7JEjhn+975bJ8JIYQQQgghhBBCCCGEEA9CY2bf0NaBW2uyu7UN2XSOzTyY60J2BzNbObbsH7eTmS2mhHJHE1wmCD7A93ngEAquHaHc2omCcysSXQW74g32BHfwfTEiuCoQm9vuDsEndPYpELxKjjBj0foCEXX6XdM3by3c7aOZPZvZzMzeaBzbIh9pzIuZXaG/RqNIMAq7Ur8XCHQ2kx3LC56DMQ39X4LI23zbAd88ruRHD09wTVF5p+/eBZI5g7O8w5FgXOvsZAI7PxRwS4HGIPbm8wRjBL/Sgp/QNyQYHWySmOxgJBgFeGnPfZHgDVyufET+YMEVCdo7gziCTBbGmRKlGQpCMXOnj+1L6B0JFsxndO3cjjZyjo6OnZeqGb5gqhTQS3qKeK1SwbesfB3IrF/awqu+g8Dgs5SLE37SciHiPUv8rLVp7k2wdl63tDDqgTs8lqpINWGXbSTKe9rlJgXME7C9I6V7oGAWsEzv2gzeN2TstkbCZyIJWBYKWUwtF4foKGU9TpRGdZDSdVDpDNXSVVBLt5TeucS9K6X/E3USX3rshBBCCCGEEEIIIYQQ4tExsx8PuuPnwhCIbgAAAABJRU5ErkJggg=="
+                    },
+                    "categories": [
+                        {
+                            "id": 5,
+                            "name": "Development"
+                        },
+                        {
+                            "id": 6,
+                            "name": "Communication"
+                        }
+                    ],
+                    "displayName": "AMQP Sender",
+                    "typeVersion": 1
+                },
+                {
+                    "id": 14,
+                    "icon": "file:apiTemplateIo.svg",
+                    "name": "n8n-nodes-base.apiTemplateIo",
+                    "defaults": {
+                        "name": "APITemplate.io"
+                    },
+                    "iconData": {
+                        "type": "file",
+                        "fileBuffer": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI4MCIgaGVpZ2h0PSI4MCIgdmlld0JveD0iMCAwIDIzLjE2NyAyMS4xNjciPjxwYXRoIGZpbGw9IiM5MWJjZTUiIGQ9Ik0xOC42MTEuNTA0TDMuNDczIDExLjI0bDQuNTk3IDIuMjEzIDEuMDY2IDMuODgzIDMuMTcxLTIuMjI2IDIuODAyLjk1MXoiLz48cGF0aCBmaWxsPSIjMWYyMTJiIiBkPSJNOS4xNzIgMTcuNTk3YS4yNjQuMjY0IDAgMDEtLjI5LS4xOTJsLTEuMDM1LTMuNzY3LTQuNDg4LTIuMTZhLjI2NS4yNjUgMCAwMS0uMDM5LS40NTRMMTguNDU4LjI4OGEuMjY0LjI2NCAwIDAxLjQxLjI3NGwtMy41IDE1LjU1NmEuMjY1LjI2NSAwIDAxLS4zNDQuMTkzbC0yLjY3NC0uOTA4LTMuMDYxIDIuMTVhLjI3My4yNzMgMCAwMS0uMTE3LjA0NHptLTUuMTgtNi40MDFsNC4xOTMgMi4wMTdjLjA2OS4wMzQuMTIuMDk1LjE0LjE2OWwuOTY3IDMuNTIgMi44NjMtMi4wMWEuMjY1LjI2NSAwIDAxLjIzNy0uMDMzbDIuNTI0Ljg1NkwxOC4yIDEuMTE5eiIvPjxwYXRoIGZpbGw9IiMzYTg0YzEiIGQ9Ik05LjMzOSAxNy4wNzlsLjk0Ni0yLjkxM0wxOC42NDIuNzI4IDguMjI2IDEzLjIzNXoiLz48cGF0aCBmaWxsPSIjMWYyMTJiIiBkPSJNOS4zNTYgMTcuMjFhLjEzMi4xMzIgMCAwMS0uMTQzLS4xNzJsLjk0Ni0yLjkxM2EuMTYuMTYgMCAwMS4wMTQtLjAzbDcuMzkzLTExLjg4OC05LjQxOSAxMS4xNTZhLjEzMy4xMzMgMCAwMS0uMjAyLS4xNzFMMTguNTQuNjQyYS4xMzIuMTMyIDAgMDEuMjE0LjE1NmwtOC4zNDggMTMuNDI0LS45NDEgMi44OThhLjEzMi4xMzIgMCAwMS0uMTA5LjA5em0tMy4yMTUgMS4wNDVjLTEuMTY4LjAyOS0yLjMwMy0uMzczLTMuMDY3LTEuMjg3LS40ODUtLjU4LS42ODMtMS41NzQuMjc1LTEuNzA1Ljg1OS0uMTE5IDEuMjI5LjQ4NSAxLjQ4IDEuMTk2LjgwNCAyLjAyNi4xNiAyLjkzOC0xLjY4IDQuMjcyLS4xNDQuMDkuMDE1LjI5Ni4xNTkuMjA2IDEuMjE4LTEgMS44MjktMS40NjYgMi4xLTIuNDQ4LjEzNC0xLjM2LS40MDItMy4wOTEtMS4zODQtMy40MzYtMS4xMi0uMzgyLTIuMDYzLjUxNi0xLjQ5OSAxLjU4NS42OTkgMS4zMjQgMi4yMyAxLjkxNCAzLjY1MiAxLjg3OC4xNy0uMDA0LjEzMy0uMjY2LS4wMzYtLjI2MXoiLz48cGF0aCBmaWxsPSIjMWYyMTJiIiBkPSJNNy4yMzUgMTguMTRhMTQuOTUgMTQuOTUgMCAwMS0uNzU5LjA5Yy0uMTcuMDE3LS4xMzMuMjc5LjAzNi4yNjIuMjUzLS4wMjUuNTA3LS4wNTIuNzU4LS4wOS4xNjktLjAyNi4xMzMtLjI4OC0uMDM1LS4yNjJ6bTEuMTk0LS41MDRhOC40NiA4LjQ2IDAgMDEtLjg2NS4zNDRjLS4xNjIuMDU0LS4wNTcuMjk3LjEwNC4yNDNhOC4zNyA4LjM3IDAgMDAuODY1LS4zNDRjLjE1NC0uMDcxLjA1LS4zMTUtLjEwNC0uMjQzeiIvPjxwYXRoIGQ9Ik0xMi41OTkgMTUuMjJhLjEzMS4xMzEgMCAwMS0uMDctLjAxbC0yLjE2OC0uOTI0YS4xMzMuMTMzIDAgMDEuMTAzLS4yNDNsMi4xNjkuOTIzYS4xMzMuMTMzIDAgMDEtLjAzNC4yNTN6Ii8+PC9zdmc+"
+                    },
+                    "categories": [
+                        {
+                            "id": 1,
+                            "name": "Marketing"
+                        }
+                    ],
+                    "displayName": "APITemplate.io",
+                    "typeVersion": 1
+                },
+                {
+                    "id": 25,
+                    "icon": "file:sns.svg",
+                    "name": "n8n-nodes-base.awsSns",
+                    "defaults": {
+                        "name": "AWS SNS"
+                    },
+                    "iconData": {
+                        "type": "file",
+                        "fileBuffer": "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjQ5MCIgaGVpZ2h0PSIyNTAwIiB2aWV3Qm94PSIwIDAgMjU2IDI1NyIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWlkWU1pZCI+PHBhdGggZD0iTTk4Ljg3NSAyMzIuMDMzbC0yNi40MzMtNy40MDgtMjUuMDAxLTI4LjUwOCAzMS4yNzItLjg2MyAyMC4xNjIgMzYuNzc5bS02MS4xMjUtMTguOGwtMTQuODc1LTQuMTY2LTE0LjA1OC0xNi4wMzQgMTcuMDgyLTIuODA5IDExLjg1MSAyMy4wMDkiIGZpbGw9IiM5OTVCODAiLz48cGF0aCBkPSJNMCAxOTEuMDE3bDE1LjIwNCAzLjA5MSAyLjIwNy0zLjg4MlY1OC41MDNsLTIuMjA3LTIuNTYxTDAgNjQuNnYxMjYuNDE3IiBmaWxsPSIjN0IzRjY1Ii8+PHBhdGggZD0iTTczLjkzMyA2OS43MDhMMTUuMjA4IDU1Ljk0MnYxMzguMTY2bDguNzk4LS44MTggMTMuNzQ0IDE5Ljk0MyAxMC42LTIyLjIwNSAyNS41ODMtMi4zNzhWNjkuNzA4IiBmaWxsPSIjQzE3QjlEIi8+PHBhdGggZD0iTTMzLjk1OCAxOTguMTMzbDI2LjA2MyA1LjI1IDEuNzE2LTQuMDQ1VjM3LjQ0bC0xLjcxNi0zLjY2NS0yNi4wNjMgMTMuMjA4djE1MS4xNSIgZmlsbD0iIzdCM0Y2NSIvPjxwYXRoIGQ9Ik0yMDguNzM0IDgxLjUxNkw2MC4wMjEgMzMuNzc1djE2OS42MTJsMTcuMjIxLTIuMjE2IDIxLjYzMyAzMC44NjIgMTcuMTI2LTM1Ljg1IDkyLjczMy0xMS45MzNWODEuNTE2IiBmaWxsPSIjQzE3QjlEIi8+PHBhdGggZD0iTTE4MS44MzMgMjU2LjQ5MmwtMzcuNTY2LTEwLjUyNS0zNS41MDktNDAuNSA0Ni4wMzMtLjQ2OCAyNy4wNDIgNTEuNDkzIiBmaWxsPSIjOTk1QjgwIi8+PHBhdGggZD0iTTg5LjU5MSAyMDguOTVsMzguMzMgNy40MTcgMi45NzctMi41NjZWNC4xMTdMMTI3LjkyMSAwbC0zOC4zMyAxOS4xNThWMjA4Ljk1IiBmaWxsPSIjN0IzRjY1Ii8+PHBhdGggZD0iTTI1NiA2NC4wMzNMMTI3LjkyNSAwdjIxNi4zNjdsMjIuNTk3LTQuNTI4IDMxLjMxMSA0NC42NTMgMjYuOTAxLTU2LjMwOS0uMDE3LS4wMDJMMjU2IDE5MC43MDhWNjQuMDMzIiBmaWxsPSIjQzE3QjlEIi8+PC9zdmc+"
+                    },
+                    "categories": [
+                        {
+                            "id": 5,
+                            "name": "Development"
+                        },
+                        {
+                            "id": 6,
+                            "name": "Communication"
+                        }
+                    ],
+                    "displayName": "AWS SNS",
+                    "typeVersion": 1
+                }
+            ]
+        },
+        {
+            "id": 1225,
+            "name": "Export New Deals from CRM to Internal Messaging, Email and Database",
+            "totalViews": 309,
+            "recentViews": 0,
+            "user": {
+                "username": "admin"
+            },
+            "createdAt": "2021-09-10T14:28:58.405Z",
+            "nodes": [
+                {
+                    "id": 20,
+                    "icon": "file:lambda.svg",
+                    "name": "n8n-nodes-base.awsLambda",
+                    "defaults": {
+                        "name": "AWS Lambda"
+                    },
+                    "iconData": {
+                        "type": "file",
+                        "fileBuffer": "data:image/svg+xml;base64,PHN2ZyBoZWlnaHQ9IjI1MDAiIHZpZXdCb3g9Ii0zLjAyMyAtMC4yMiA0MjAuOTIzIDQzMy41NCIgd2lkdGg9IjI0NDMiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PHBhdGggZD0iTTIwOC40NSAyMjcuODljLTEuNTkgMi4yNi0yLjkzIDQuMTItNC4yMiA2cS0zMC44NiA0NS40Mi02MS43IDkwLjgzLTI4LjY5IDQyLjI0LTU3LjQ0IDg0LjQzYTMuODggMy44OCAwIDAxLTIuNzMgMS41OXEtNDAuNTktLjM1LTgxLjE2LS44OGMtLjMgMC0uNjEtLjA5LTEuMi0uMThhMTQuNDQgMTQuNDQgMCAwMS43Ni0xLjY1cTI4LjMxLTQzLjg5IDU2LjYyLTg3Ljc2IDI1LjExLTM4Ljg4IDUwLjI1LTc3Ljc0IDI3Ljg2LTQzLjE4IDU1LjY5LTg2LjQyYzIuNzQtNC4yNSA1LjU5LTguNDIgOC4xOS0xMi43NWE1LjI2IDUuMjYgMCAwMC41Ni0zLjgzYy01LTE1Ljk0LTEwLjEtMzEuODQtMTUuMTktNDcuNzQtMi4xOC02LjgxLTQuNDYtMTMuNTgtNi41LTIwLjQzLS42Ni0yLjItMS43NS0yLjg3LTQtMi44Ni0xNyAuMDctMzMuOS4wNS01MC44NS4wNS0zLjIyIDAtMy4yMyAwLTMuMjMtMy4xOCAwLTIwLjg0IDAtNDEuNjgtLjA2LTYyLjUyIDAtMi4zMi43Ni0yLjg0IDIuOTQtMi44NHE1MS4xOS4wOSAxMDIuNCAwYTMuMjkgMy4yOSAwIDAxMy42IDIuNDNxMjcgNjcuOTEgNTQgMTM1Ljc3IDMxLjUgNzkuMTQgNjMgMTU4LjNjNi41MiAxNi4zOCAxMy4wOSAzMi43NSAxOS41NCA0OS4xNy43NyAyIDEuNTcgMi4zOCAzLjU5IDEuNzYgMTcuODktNS41MyAzNS44Mi0xMC45MSA1My43LTE2LjQ1IDIuMjUtLjcgMy4wNy0uMjMgMy43NyAyIDYuMSAxOS4xNyAxMi4zMiAzOC4zIDE4LjUgNTcuNDUuMjEuNjYuMzcgMS4zMy42MiAyLjI1LTEuMjguNDctMi40OCAxLTMuNzEgMS4zNHEtNjEgMTkuMzMtMTIxLjkzIDM4LjY4Yy0xLjk0LjYxLTIuNTItLjA1LTMuMTctMS42OHEtMTguNjEtNDcuMTYtMzcuMzEtOTQuMjgtMTguMjktNDYuMTQtMzYuNi05Mi4yOGMtMS44My00LjYyLTMuNjMtOS4yNi01LjQ2LTEzLjg4LS4yOS0uNzktLjY5LTEuNDgtMS4yNy0yLjd6IiBmaWxsPSIjZmE3ZTE0Ii8+PC9zdmc+"
+                    },
+                    "categories": [
+                        {
+                            "id": 5,
+                            "name": "Development"
+                        }
+                    ],
+                    "displayName": "AWS Lambda",
+                    "typeVersion": 1
+                },
+                {
+                    "id": 38,
+                    "icon": "file:chargebee.png",
+                    "name": "n8n-nodes-base.chargebeeTrigger",
+                    "defaults": {
+                        "name": "Chargebee Trigger"
+                    },
+                    "iconData": {
+                        "type": "file",
+                        "fileBuffer": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAMAAAANIilAAAAAk1BMVEUAAAD9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azX9azXS0qjqAAAAMHRSTlMAAta1CPr3HAyb8mNPLBLq5MmGZ1wi28+soEQX7pZ9dkk/MijDurCMims54b6lb1YyU8hoAAACDklEQVRIx+2V2bKiMBBAmyTs+w6CIi64O/n/rxtKJwIjJPA4Nfc8acOpTnfSAX7493G2QZN6Zeml+GwVS0xiNSXtYeBIm6lKEaJf3C5kjrvz6SioFruVTKcIJEG1D8oBa1wXUy6+w2lVxhFFuU+0j4KOjwdOjUHQnHJ/DVZ4iaXXatTo2OuhPuEWXm9fLOhxPQjldeeuyV/NqGT+su1ucZuRkt5PMRElDmCEbdK2MNcmKnaZi2EUrd7GMEHEXGMPi8mYfFruqjd2NLrE+/P9oF9nyCuW+P4JhcorcBbL4dc2WSxyEcoBe9Vi5yJlEc8RyTp7ldVo0w8rkZyzN3ddExjR4sw7TmZhzSRhEddZ3m2TRar5+3z8hDZ/xlMSnzCPnbDu9NcPhLItzKAZG0hJnHVYYhnDYtSS2RksJ+fcQi0qAbDtKXknU84oWPQJtizvxanpmcCQJ3VtiA1lUlbdzk7rfs/bzwFSVR/bsaDhjHukvvfJsbBXm8S+UboXTwfDQFjXG6S0/dde18oGrN20TI4DOzHaA3drzAJWPqVy2Fa+5qTWDn05AKJJbS+eafsHtUlRUgAHB/dkJT+ddJzI7U+3kopjVgiGUwroF7J/IWAac+7RFeo0D6X3daQCiRBNZs2XVrmDr4e2zQ1aVhrMwwl9+Z1Zzw42ptQPHZiPFJv5IXENWXGvdRhL8MN/y2+uRpQ1fWz5HAAAAABJRU5ErkJggg=="
+                    },
+                    "categories": [
+                        {
+                            "id": 8,
+                            "name": "Finance & Accounting"
+                        }
+                    ],
+                    "displayName": "Chargebee Trigger",
+                    "typeVersion": 1
+                },
+                {
+                    "id": 40,
+                    "icon": "file:clearbit.svg",
+                    "name": "n8n-nodes-base.clearbit",
+                    "defaults": {
+                        "name": "Clearbit"
+                    },
+                    "iconData": {
+                        "type": "file",
+                        "fileBuffer": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI3MiIgaGVpZ2h0PSI3MiI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJhIiB4MT0iNTAlIiB4Mj0iMTAwJSIgeTE9IjAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI0RFRjJGRSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI0RCRjFGRSIvPjwvbGluZWFyR3JhZGllbnQ+PGxpbmVhckdyYWRpZW50IGlkPSJiIiB4MT0iMCUiIHgyPSI1MCUiIHkxPSIwJSIgeTI9IjEwMCUiPjxzdG9wIG9mZnNldD0iMCUiIHN0b3AtY29sb3I9IiM1N0JDRkQiLz48c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiM1MUI1RkQiLz48L2xpbmVhckdyYWRpZW50PjxsaW5lYXJHcmFkaWVudCBpZD0iYyIgeDE9IjM3LjUlIiB4Mj0iNjIuNSUiIHkxPSIwJSIgeTI9IjEwMCUiPjxzdG9wIG9mZnNldD0iMCUiIHN0b3AtY29sb3I9IiMxQ0E3RkQiLz48c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiMxNDhDRkMiLz48L2xpbmVhckdyYWRpZW50PjwvZGVmcz48ZyBmaWxsPSJub25lIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiPjxwYXRoIGZpbGw9InVybCgjYSkiIGQ9Ik03MiAzNnYxNi43N2wtLjAwNC44NjhjLS4wNiA2LjAzNS0uNzUgOC4zNTMtMiAxMC42ODhhMTMuNjMgMTMuNjMgMCAwMS01LjY3IDUuNjdsLS4zMjYuMTcxQzYxLjY1OCA3MS4zNjQgNTkuMTYgNzIgNTIuNzcgNzJIMzZWMzZoMzZ6Ii8+PHBhdGggZmlsbD0idXJsKCNiKSIgZD0iTTY0LjMyNiAyLjAwM2ExMy42MyAxMy42MyAwIDAxNS42NyA1LjY3bC4xNzEuMzI3QzcxLjM2NCAxMC4zNDIgNzIgMTIuODQgNzIgMTkuMjNWMzZIMzZWMGgxNi43N2M2LjY4NyAwIDkuMTEyLjY5NiAxMS41NTYgMi4wMDN6Ii8+PHBhdGggZmlsbD0idXJsKCNjKSIgZD0iTTM2IDB2NzJIMTkuMjNsLS44NjgtLjAwNGMtNi4wMzUtLjA2LTguMzUzLS43NS0xMC42ODgtMmExMy42MyAxMy42MyAwIDAxLTUuNjctNS42N0wxLjgzMiA2NEMuNjM2IDYxLjY1OCAwIDU5LjE2IDAgNTIuNzdWMTkuMjNjMC02LjY4Ny42OTYtOS4xMTIgMi4wMDMtMTEuNTU2YTEzLjYzIDEzLjYzIDAgMDE1LjY3LTUuNjdMOCAxLjgzMkMxMC4zNDIuNjM2IDEyLjg0IDAgMTkuMjMgMEgzNnoiLz48L2c+PC9zdmc+"
+                    },
+                    "categories": [
+                        {
+                            "id": 2,
+                            "name": "Sales"
+                        }
+                    ],
+                    "displayName": "Clearbit",
+                    "typeVersion": 1
+                },
+                {
+                    "id": 76,
+                    "icon": "fa:sign-in-alt",
+                    "name": "n8n-nodes-base.executeWorkflow",
+                    "defaults": {
+                        "name": "Execute Workflow",
+                        "color": "#ff6d5a"
+                    },
+                    "iconData": {
+                        "icon": "sign-in-alt",
+                        "type": "icon"
+                    },
+                    "categories": [
+                        {
+                            "id": 9,
+                            "name": "Core Nodes"
+                        }
+                    ],
+                    "displayName": "Execute Workflow",
+                    "typeVersion": 1
+                },
+                {
+                    "id": 112,
+                    "icon": "file:harvest.png",
+                    "name": "n8n-nodes-base.harvest",
+                    "defaults": {
+                        "name": "Harvest"
+                    },
+                    "iconData": {
+                        "type": "file",
+                        "fileBuffer": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAJgAAACYBAMAAADq7D0SAAAAJ1BMVEX////3aCL3kyz3jiv3bSP3cST3mC73diX3gCj3eyb3iir3hSn3li1uKk+wAAAGwUlEQVRo3pyWO3KsMBBFWYuVEomMBb2IhVDFBpxPhjZAQUYwEYt6txvQ1YdC4OsZPEXB4XSr5XH1c6beznz/PUi3HVlXjyBs9bAyiTAkgBnzw7yH8V5rbYUjKyWsHMJyM8K+b2Cs0RgDM2Z7A+s8jGZNg+NrNxZJsaYRmLUFWNlLmiUw+7flJCw0s4Il7Eh3Y9dxxkIzAxhiA1xd3AddSpLpAkXNrG3iJSjVytEPaKDkZhR7ATOXZoQVV/LaDAExG93n4wqORmFGqiStbJZPLKIwTb6cb8Y/Mct31AuYpdmRFIfckYBiDgTLxKISRrkyTKbBECbxpCKs41zkPWMe8LacxPsJMwZtzGEhrkNSmPanuTc7lwC0b7ej9HcKM5dmFjEZrAOt+weKHr9IZqZjkZvZ3AwQZSHCZdPIspmZqukOtVdf8Pm3LuuUG71ZSzOy6nWrtxVlbigMdprtbBh+uCUDs0/1OWng02td9R7FdX4shFfjfE2zkNZW46fxNJr5rgmv+27y6lhmHZmZgzVWI7LzTLgI1ZktiD/JgSUJgRnim4bZfQzD5TDzDfuMNEP+ZGYjM7BOHMRweArTbu1mgJwwqZRbFPoRDFNyvCKYXhjUmJlpO5My1zszvO7N8MjY7AjcYjNzZaaJtui1WU0z336aXcBkNgRHmAy79OunrnlSiuSMZTAtlH8meV8t2cBKYUS1bWbGLWpiMwSodY1hTZAURpx2NbpvFdQaPQHPpJpHVO781LYeZxOYWCUwBXElNXNoxpgIprhoiQ0eeLKa9sqMaiYyYwizfLAXc65aRp9P0LZ7GKci8HILYPN8wrgTCjAOBVnzIjCmYQgz+n8hZi+HybPHyGyGGZPDlCZHk5uNjHNihoxBUpj+qTH7MYF9RgYohc2Lc84vQpvAGpQIkgCbGNaS5hCFIVLnfJp9Ehho6JjwEhgX0tFscWgb1VIz0JSUmsGLNMlhdtoRl0rkTwiG4iB4mHPhuLUZzNgYht1CKxQWwuIlzcyMwTvuGZufmiHCZ6HlMomaF4gRRjfmHhYPGM0m/1FqfwuDlPO4KTAjKofpiBbMJpoda5rDWmDwujSTbgW0qh+8mR5TmOwJTXxSozeR1QM2DEGlM0Y5gemOxXtsw5POccAkw9AD1pOtvMRst5J3m5q5JYrAkEBNWzCnZnntx9UkIQob+mkKJgRZSjC5iiOB9NMOG1RNaGxdAeZOJ/K8maiRpF2tbqP+7D0AvkzhgR2alWBh76Us4AiTLEzZjNECY7M972HTHg+j2vQahjv6xIx5AWOJhP3yM3Tl/RR2FMj8Vr3QyHtuJpf2F2ZUU73nZsMQiv3+55yMbhwGgSjoJlEqQYgOgq4AcLf3dtfoaXFiIJM4H8gMAyjH2Uopb89cxtMi53mcp0g5ZH+0iQxNgJOKoLLWmtkofE9k9BCRicq7pOzvWWZhpIFTygznw3vPsqGpmMNk2LC/hh0Z5onAZD2NbMkKvs2XwezTOG822KDC48qa/uzKToVn1ikCbmVdVgxTUUYjsldlpYd9lMki62UFZQ18lvHk2oKMmyNHBU6HtaZlFuVEGVjZmFcmssLTcmVJnO4Omlz1s0wP2HkqSEcS7m2cRziIFzw1AZHBmQVf3GmEg7fTSvJcZXVMm5UN1GxlokIk03bL8lVmMpCT8ktZMmovUyqQn3VZrp1kUNaPrq6X5X6Ld5kcopEXZF2TUx1k5DrNqQwubtDJRmCbySqDnmRShs+zLMHVu0g84seyNJF9KQshDeibnEc4KAuOxBAgCxEk4udlMq5AXiCYLIHBNivzRHlMZrx+l5mgy7QyCpuyqLyELlNisM3vyKIL6zItE/9WWdSyoGGUeVZlwXGXxWupBVmwogeZbRnPVIbXJmW6mur+2x+j1IhhGArqCgJdSKDcwKUn2fv3SXIQGDeu3Z/92FmHGLGejBcyuLLsQZa8Yn5T82H4WpRNz72KGn7PD7X2LFsMixZl7aBswtW+yMBxWdEM0GXtujmRXYm5h/CYdc11XAYJll/TvQFsm7TEApQN7KhsYJSttc2Ktax10D1Vtc5KNkqHvpjulZ1DaibxOycUeClJd6n+y6WqXqZ9corEAiIkrOKo4r1fdSPwMEmimXrQhaNq2UIKpYaHMZP9LssU1+Q12cSnu7bUKIgkIWZh4MaYYG9/gplTIoADYg0ThsA38MkaNIQpdZwl5C4GOY1H1nFhAdVVZf6hdPU6XmUBvn3cj0JWSG2VnxCZ/6dk/QtxX4/9HdflhXyVcyyT7p2VVbxK3+pY9syQ9AzxBh/ZR/YOsh+0QKcWXhB1rwAAAABJRU5ErkJggg=="
+                    },
+                    "categories": [
+                        {
+                            "id": 4,
+                            "name": "Productivity"
+                        }
+                    ],
+                    "displayName": "Harvest",
+                    "typeVersion": 1
+                },
+                {
+                    "id": 303,
+                    "icon": "file:notion.svg",
+                    "name": "n8n-nodes-base.notionTrigger",
+                    "defaults": {
+                        "name": "Notion Trigger"
+                    },
+                    "iconData": {
+                        "type": "file",
+                        "fileBuffer": "data:image/svg+xml;base64,PHN2ZyBoZWlnaHQ9IjI1MDAiIHdpZHRoPSIyNTAwIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjEyIDAuMTkgNDg3LjYxOSA1MTAuOTQxIj48cGF0aCBkPSJNOTYuMDg1IDkxLjExOGMxNS44MSAxMi44NDUgMjEuNzQxIDExLjg2NSA1MS40MyA5Ljg4NGwyNzkuODg4LTE2LjgwNmM1LjkzNiAwIDEtNS45MjItLjk4LTYuOTA2TDM3OS45NCA0My42ODZjLTguOTA3LTYuOTE1LTIwLjc3My0xNC44MzQtNDMuNTE2LTEyLjg1M0w2NS40MDggNTAuNmMtOS44ODQuOTgtMTEuODU4IDUuOTIyLTcuOTIyIDkuODgzem0xNi44MDQgNjUuMjI4djI5NC40OTFjMCAxNS44MjcgNy45MDkgMjEuNzQ4IDI1LjcxIDIwLjc2OWwzMDcuNTk3LTE3Ljc5OWMxNy44MS0uOTc5IDE5Ljc5NC0xMS44NjUgMTkuNzk0LTI0LjcyMlYxMzYuNTdjMC0xMi44MzYtNC45MzgtMTkuNzU4LTE1Ljg0LTE4Ljc3bC0zMjEuNDQyIDE4Ljc3Yy0xMS44NjMuOTk3LTE1LjgyIDYuOTMxLTE1LjgyIDE5Ljc3NnptMzAzLjY1OSAxNS43OTdjMS45NzIgOC45MDMgMCAxNy43OTgtOC45MiAxOC43OTlsLTE0LjgyIDIuOTUzdjIxNy40MTJjLTEyLjg2OCA2LjkxNi0yNC43MzQgMTAuODctMzQuNjIyIDEwLjg3LTE1LjgzMSAwLTE5Ljc5Ni00Ljk0NS0zMS42NTQtMTkuNzZsLTk2Ljk0NC0xNTIuMTl2MTQ3LjI0OGwzMC42NzcgNi45MjJzMCAxNy43OC0yNC43NSAxNy43OGwtNjguMjMgMy45NThjLTEuOTgyLTMuOTU4IDAtMTMuODMyIDYuOTIxLTE1LjgxbDE3LjgwNS00LjkzNVYyMTAuN2wtMjQuNzIxLTEuOTgxYy0xLjk4My04LjkwMyAyLjk1NS0yMS43NCAxNi44MTItMjIuNzM2bDczLjE5NS00LjkzNEwzNTguMTg2IDMzNS4yMlYxOTguODM2bC0yNS43MjMtMi45NTJjLTEuOTc0LTEwLjg4NCA1LjkyNy0xOC43ODcgMTUuODE5LTE5Ljc2N3pNNDIuNjUzIDIzLjkxOWwyODEuOS0yMC43NmMzNC42MTgtMi45NjkgNDMuNTI1LS45OCA2NS4yODMgMTQuODI1bDg5Ljk4NiA2My4yNDdjMTQuODQ4IDEwLjg3NiAxOS43OTcgMTMuODM3IDE5Ljc5NyAyNS42OTN2MzQ2Ljg4M2MwIDIxLjc0LTcuOTIgMzQuNTk3LTM1LjYwOCAzNi41NjRMMTM2LjY0IDUxMC4xNGMtMjAuNzg1Ljk5MS0zMC42NzctMS45NzEtNDEuNTYyLTE1LjgxNWwtNjYuMjY3LTg1Ljk3OEMxNi45MzggMzkyLjUyIDEyIDM4MC42OCAxMiAzNjYuODI4VjU4LjQ5NWMwLTE3Ljc3OCA3LjkyMi0zMi42MDggMzAuNjUzLTM0LjU3NnoiIGZpbGwtcnVsZT0iZXZlbm9kZCIvPjwvc3ZnPg=="
+                    },
+                    "categories": [
+                        {
+                            "id": 4,
+                            "name": "Productivity"
+                        }
+                    ],
+                    "displayName": "Notion Trigger",
+                    "typeVersion": 1
+                }
+            ]
+        },
+        {
+            "id": 1221,
+            "name": "Send Reminders After Meetings",
+            "totalViews": 281,
+            "recentViews": 0,
+            "user": {
+                "username": "admin"
+            },
+            "createdAt": "2021-09-08T08:45:12.497Z",
+            "nodes": [
+                {
+                    "id": 28,
+                    "icon": "file:beeminder.png",
+                    "name": "n8n-nodes-base.beeminder",
+                    "defaults": {
+                        "name": "Beeminder"
+                    },
+                    "iconData": {
+                        "type": "file",
+                        "fileBuffer": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAMAAAANIilAAAABelBMVEUAAAA6Ojw6Ojw6Ojw6Ojw6Ojw6Ojw7Ozw7Oz46Ojw6Ojw6Ojw6Ojw6Ojw6Ojw6Ojw6Ojw6Ojw6Ojw6Ojw6Ojw6Ojw7Oz07Oz06Ojw6Ojw6Oj07Oz06Ojw6Ojw6Ojw6Ojw6Ojw7Ozw5OTw7Oz06Ojw6Oj06Ojw6Ojw6Ojw6Ojz/ywf/zgYyND03ODw1NjwvMj3/0wRCQUD2xxL/1Af/zwT/0QRPSz8vMj//0Qo9PUAyNUE0NTz/zwotMEAxM0BYUT5wZDp3ajn/0ggxND7vwxP/1QRGREA3OEBUTz5kWz2iiS6skCvtwBb4yQ7uvgw5OUI0NkFKRj9rYDx8bTiXgTG/oCPWsB3btBzhuBn0xBD6yw/9ywz/2QFSTT1cVDs6OjpsYDmCcTaZgzCTfTC6myfFoiTfthrovhlbUz1gWDxoXjqKdzSPejPCoSmylSm2mCjDoCHPqyD9zQz/0wv/1wR0ZjmpjizKpiPTrR/iuhjquw1UUEaPfD6tkjF8XVfuAAAAKXRSTlMA59K3oPqzMQkF9smWj0AsJ+7g2HpcGhGag2JSTPPMxq2piXRuNta/ZZKUy0EAAAOpSURBVEjH7ZVnW9pQGIbD0jqq1tm915NxEggBwpSNWFoHG7TuvbW7/e89SUA+kLbRr/X+ALmS685zzsl73sPc8D/zYhRwOUa0y2GHCxh9ad29DR3bSB8zbIPOc6vuEIBkkFDbPkBdEk0CeGVRHgSy66UYDx0+VloXgNsWZQdCO+fNskp4kSdErTQDsRB6LMrPILi3lPTa3G58eimSl5WKW4DTonwfEBfOuNoWGwjXNmve+gwPTFiUbw0AkdkE52VZllO4xOcI8OTWv72+KWPciM4qbIvAtAg80B72/S1x4qndZu+533sH/F6YbaN8yQKDI+MO++s390YYc3ofw6Af8G80L2VOpnPu74fOo3vm7h1AoB9HAIVMV6WW6w0cZYx7okgA3DUbsx3g1YXFPbcoABDdR2Gv5krb8ajmhKJL8XguKQD3u+W3Wi2Vw4nwt/1sSMvxx7dl1pvYmBdB8ec2PIFEIZ8FRrsX/gkEtZLWhil/yUX08PljObUaDGmxwdWUxNHpX+yLwMMu+RHERZnVkVL7ukKC8ZgeK/pKCc5YgC1VMClzwD8rXa7voU+3kgTarlp8J7EtGss8HCZy8ERh20jvVlUYCL7jgJdtE57m8dhEntvsyGy6PhOCztyvZsdlA4si7GbJJalTF1+XSTsZBx6lk7zCY8Bszvm2rNTXPvCa50/qvzunMtd6ayFHTLY2reeVQCu2PBMxCiUf9xMA/Idi3QhXvn4A7pm0D2QPLziOk87yqh4bmamkw5/don69W057OU45/8QDQ13yQ4C4j1KFVGnPr8WG3PmwxHmb1RW92nl1veIpbC0mgYE+xiyaROdz80E9Vvxx6Em9o9S2f7bmry7l1CS04G4m7aB6iECf5NpCxm2QyRRXIoKmE6L9mff/qbsuGJDYqfxp3tcic3JeVAUY2B8wf2B43Ol02sAveyS24LmkwV1szAEOp/P5w3+0sh4qN+gH60Cr9SQKDFk6qAS1qhVkx2XldT9cIxbkB639Vfv+Xuc7fU1jh8dYnwV5ktbaboPzVn3kIyV0EGalzaDVw8oJRI/TrHI6TVk4KHDc2Qxv9ZjsdYFkqhJtmxq0haTX/ECP9SOWj2132srsnABXr0V5aozavrJkuOFiUABeMFYZtlHbvSlrHa++GhG0Tm+d3lGAZOlBqaQWIgAGmaswOaB13qL8Te+948zVmOoBhGh8ibr9E8yVGQTAE8A2xFyDcWiMDTPXYmIM/U8nmRtuuD6/AQzW+dqtokXXAAAAAElFTkSuQmCC"
+                    },
+                    "categories": [
+                        {
+                            "id": 4,
+                            "name": "Productivity"
+                        }
+                    ],
+                    "displayName": "Beeminder",
+                    "typeVersion": 1
+                },
+                {
+                    "id": 40,
+                    "icon": "file:clearbit.svg",
+                    "name": "n8n-nodes-base.clearbit",
+                    "defaults": {
+                        "name": "Clearbit"
+                    },
+                    "iconData": {
+                        "type": "file",
+                        "fileBuffer": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI3MiIgaGVpZ2h0PSI3MiI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJhIiB4MT0iNTAlIiB4Mj0iMTAwJSIgeTE9IjAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI0RFRjJGRSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI0RCRjFGRSIvPjwvbGluZWFyR3JhZGllbnQ+PGxpbmVhckdyYWRpZW50IGlkPSJiIiB4MT0iMCUiIHgyPSI1MCUiIHkxPSIwJSIgeTI9IjEwMCUiPjxzdG9wIG9mZnNldD0iMCUiIHN0b3AtY29sb3I9IiM1N0JDRkQiLz48c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiM1MUI1RkQiLz48L2xpbmVhckdyYWRpZW50PjxsaW5lYXJHcmFkaWVudCBpZD0iYyIgeDE9IjM3LjUlIiB4Mj0iNjIuNSUiIHkxPSIwJSIgeTI9IjEwMCUiPjxzdG9wIG9mZnNldD0iMCUiIHN0b3AtY29sb3I9IiMxQ0E3RkQiLz48c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiMxNDhDRkMiLz48L2xpbmVhckdyYWRpZW50PjwvZGVmcz48ZyBmaWxsPSJub25lIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiPjxwYXRoIGZpbGw9InVybCgjYSkiIGQ9Ik03MiAzNnYxNi43N2wtLjAwNC44NjhjLS4wNiA2LjAzNS0uNzUgOC4zNTMtMiAxMC42ODhhMTMuNjMgMTMuNjMgMCAwMS01LjY3IDUuNjdsLS4zMjYuMTcxQzYxLjY1OCA3MS4zNjQgNTkuMTYgNzIgNTIuNzcgNzJIMzZWMzZoMzZ6Ii8+PHBhdGggZmlsbD0idXJsKCNiKSIgZD0iTTY0LjMyNiAyLjAwM2ExMy42MyAxMy42MyAwIDAxNS42NyA1LjY3bC4xNzEuMzI3QzcxLjM2NCAxMC4zNDIgNzIgMTIuODQgNzIgMTkuMjNWMzZIMzZWMGgxNi43N2M2LjY4NyAwIDkuMTEyLjY5NiAxMS41NTYgMi4wMDN6Ii8+PHBhdGggZmlsbD0idXJsKCNjKSIgZD0iTTM2IDB2NzJIMTkuMjNsLS44NjgtLjAwNGMtNi4wMzUtLjA2LTguMzUzLS43NS0xMC42ODgtMmExMy42MyAxMy42MyAwIDAxLTUuNjctNS42N0wxLjgzMiA2NEMuNjM2IDYxLjY1OCAwIDU5LjE2IDAgNTIuNzdWMTkuMjNjMC02LjY4Ny42OTYtOS4xMTIgMi4wMDMtMTEuNTU2YTEzLjYzIDEzLjYzIDAgMDE1LjY3LTUuNjdMOCAxLjgzMkMxMC4zNDIuNjM2IDEyLjg0IDAgMTkuMjMgMEgzNnoiLz48L2c+PC9zdmc+"
+                    },
+                    "categories": [
+                        {
+                            "id": 2,
+                            "name": "Sales"
+                        }
+                    ],
+                    "displayName": "Clearbit",
+                    "typeVersion": 1
+                },
+                {
+                    "id": 221,
+                    "icon": "file:stackby.png",
+                    "name": "n8n-nodes-base.stackby",
+                    "defaults": {
+                        "name": "Stackby"
+                    },
+                    "iconData": {
+                        "type": "file",
+                        "fileBuffer": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAMAAAANIilAAAAC91BMVEUAAAApJRwHBggfGxImIBjLeRIAjNFQqjnmQjZQqTgNKCUmIAQadHJOpTfvuhD6wxHlQjYAi9AyayNrHhlgMw8ANlEAd7K+NSsAbKL1vxDmQzfzvRAAh8ndQDT7wxFNojYAjNEAg8QAi9Dmsw9QqDjfrQ/kQjb4wRAAis5GlTHIOS9Ppzj3wBAAd7E/hiwAb6Y7fim3jgzdPzQAhshMozapgwvaPjMAhMWfewrQOzEAVH2JJx8AfLmKawiCJR7TPDFImjLMOi/hrg4Ae7hHlzEgRRZEki9RFhLIOC7ZqA1aRQVDkC8/iy3NoAu8NCngQTUAhcbaPzNLoDXVPTJKnTTVPTL5whEAgL7RPDH5wRFHlzIAfbvNOzAAerbiQTbEOC7Wpg7iQTUAic2+Ni3Row7hQTVCji8Acqv0vhDgQDVOpTe6NSzImw0/hiyyMyoAiMpNpTYAbKEAh8mvMikAZ5tNpDbdPzTxvBC/lAyoMCcAYpNMoTWiLiaxiQvaPzM6fCk2cyY2cyaXKyNLnzTrtw9KnjTptg8AgsIAgsKZdgrUPTIwZiJJnDPnsw7dqw5GlTEsXh8AT3YAf7/ksQ6FZwgASnB2Ihvhrw4ARWdHlzF6XgclThlxVwfIOS7bqg0dPhTTpAzrtxBLnjXptQ8AgsFKnDQAe7dPqDjdrA/bqg5PpzdFkjAAis1PpzdEkDD2vxBPpjf2vxD2vxAAicxPpze9Ny1OpjfMng29kwwAiMsAiMvfQDXzvRDeQDX0vhDEmA3eQDTyvBA9gisAhsgAaJvwuxDyvBA6fCkAZZemMCfvug/uuQ8AhcYAcakAhMbtuQ+7kQwAYI9LoDWwMymdLSXtuA8AXYsAT3YAW4gAg8MAWYWTKiLWPTIAV4KPKSKcegp2IhtJnDPmsw8ASW1JmjMsXh/ksQ7QPDErWx4AfrzPOzApWB0nVBsAfLoAQGAAQWEAeLQAd7JRqznoQzf9xBEAjdIAjtP7wxHmQjcAjNEAic1PqDjjQTarWRDCAAAA8nRSTlMAAwULDgX8+/jzEgkG/fn17+lfKRwbEg8J/vz8+/v7+fb08O/o5OHh3t7c2tfSu7eZlJKPj3Z0cWBcT09EQ0JBNCkmJSEdGBcWFhURCwoJ/vn39vXx8fDq6urm5OTa2dHR0MzJyMfHwL+7urq0rq6tqaWjn56enp6el4GBgYGAgH5zamlpXV1cUlJRUVBQSUdGQjk4ODc3Ly4rKycjHh0WDvXx8e/s5eHe2tPT0s7OzsfHxsTEwsG8vLu2trawrquqp6GalZWSjouLioSDgX19eXh3d3d3bWhnZWFhX1taWlVMSkRAPz86OjY1NS4tKycbGNIMkEAAAAMoSURBVEjHzdNVVBVRGIbh/wSIgIGA3Yog3SkpSIuEhS0WBiIigoKAiqBSiiISit3d3d3d3a0nKLnw1N7DrMXA7OMN3/27Zs0z/0CDXi9HpVPNJ1ob3ynZtrzeVSw2KVCq/R2jKhaLK810gXw/joilK6uK5ZNTbRfLV9bvESlVuhZqq8x+kbWtb3bFzz2vTtb+OaeK2vV3eGRt76OVYsWGvOASUo1GaaXJErKUk25AUf0kpLLDVO1jdQkv0qozarvM4qk4OJFQTVXFVE+5reaoGbqwbpfSqEri2gorIrRZUmVQVOMLwD2yQigUVkd5s6PSwlTTdMF1lFC2oATplXjc1mFNxVd53kOoWOhrgLy97Sx4rKgGPpZQNUdtcII3ZBmLRE1tGG/tyz5MNcwRfOLUUNv/Pk9l/mCRZN3smd43hqJaDu7HKlA79CWn9GozkWx6zkwfyYBGpVjFCBdYdaajSL7yw0w/Z4aWjOqyOscBUwVN0oYVE0So3bKQw/SR7TpLqB5q9LXFVB2me8NbY9yOWQaM07RSlVJZUlSJiEq6dqeK6/zQNyRUJ9piqmfc0mvNUNvUwq+e84RPY2lUMzuitpuNBtQTLxqO2moZVTl63c2IinE0Kh3IplF5JnvV1baiqEIT+SoL9FHbZnIxuO1uYs5nbktOY6pBc7mBtwbUpMo0Egg6pTDe9leKytAJfGlUmvO6CyQLa1E/1YF88Dhejlq9Vxx/68YC2cJza3/fSEwVpQMfd2Gqkc7gGd1IoJhp7bftqrjn4Ct0qkJwOyhA67mY4YM5NJdTaQQ+oKji/eCNEUr/jvvGeCC2anKqC/gi1yXxpFSKNZniVceJWFZH5ANk4VbPnus/uzFqQy6pQx3zuacNAIEXyzFVnxmYakOqBrCY70kZ1aFCWDmRRsVqHnskP2+8DuRspag+A9vl6a9J4nPSalAVAftl23MDKKpO5quBZDWpwlJ5RCmNqgWXrH2/A1Pt/ECWctI24da0iKwNuPsfVNaYam0KIRVk4ueGk1IBBKAnb8sF8vlHy6m+gzLz3C+5yLNeoNzcjEKS+aDsciRUDXj/AJL4Mhr51poGAAAAAElFTkSuQmCC"
+                    },
+                    "categories": [
+                        {
+                            "id": 3,
+                            "name": "Data & Storage"
+                        }
+                    ],
+                    "displayName": "Stackby",
+                    "typeVersion": 1
+                }
+            ]
+        },
+        {
+            "id": 1205,
+            "name": "Promote New Shopify Products on Social Media (Twitter and Telegram)",
+            "totalViews": 219,
+            "recentViews": 0,
+            "user": {
+                "username": "admin"
+            },
+            "createdAt": "2021-08-24T10:40:50.007Z",
+            "nodes": [
+                {
+                    "id": 49,
+                    "icon": "file:contentful.png",
+                    "name": "n8n-nodes-base.contentful",
+                    "defaults": {
+                        "name": "Contentful"
+                    },
+                    "iconData": {
+                        "type": "file",
+                        "fileBuffer": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAMAAAANIilAAAACzVBMVEUAAAD//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////v3wV1FOteFQteH/11/8/f79/v///f3xWlX///4tsN//12BYuOPwXljORzn/2GXwYFry+Pz/1lrwVk/++/lTtuHvPzXvLyD//fdhueNbuOP/12L/1En/1EXvSkPq8/rO5fT/+e5LtOE9suD/9doAd7wIgbYAgbb/2nD/113MSjz+9PTU5/T98O+72++22e+GxedHs+AzseAArN73v74Ae7IAbq7/5KT0m5m6so//22H/2lnwTUb/1DzvRDvOTjrMPzfKRTbvOS7wNCnvKhjIAQD2+v3i7/jc6/fF4PL87Oz86umWy+mSyuh2wOX/9eH74eA/suA4sd8mr98crt763Nz/8tf61tb/8NL50tGiu8/6zs04ncz4yskbjcAAiMD/6r8AfLcohLYdgrYIgrYvhbU0hbT2s7L0pKLzlJHzjYvyf3v/23npzHjxcW3/3l7/2VXuVlDwUUvZT0TUSj7JLTjuJQ3+9fX//Oun0eqbzeqZzOl/wub/+eVtveSsyN8Prd4ArN2Ludnd2ss4ksL2uLcRgrb2t7Xy0LQAcbHorar+4qbczaPiqaDgpJ3nl5T0yY7Juou1rYbyhYLxeHX/33P/32/4yWTyZmHwZmH4yVvtsVPpp1PeWFD/2k/PVk3xUkvMVEnppEjILUTIIDvnoTj/1SvmmRDWLA7KHADUAAA0tfvvAAAAQ3RSTlMA/vz6AgQIBQOJf3UV+fjCbF1aVxEH9+7r5dzXyoRnUEpFKSUc8ejhtq6fm3FvMCwiCryxr6WWjnphQD42DdLNxZg46i9pNgAABRtJREFUSMelloV700AYxpNUJ8wZG3PB3V2vtq50LbSTlm0wxsYYDHfXbbi7u7u7u7u729/Ad+nCJaE0PPDuedbker973+/ukivlVgqlUk7u1EqlgvpLyZUq/BES3zwmODimRUIrfKeC0SQFNvAvMbBGZGU/xMovvG3jYF9olMYBLR9YtRISqULDGPZLT1KpqXpNqyAsmieEFRGgplQKj7bR4RzImZLbisEezMtTdf1dfZFIXGMD3z/QcjUVFIqIp1s8LBYs3LAU5YUQQ1B3OINQTUold8NWxyzyKEx7Uarf4eoYlRSmxclVkPk31pjkklFE+1BKIRsIrIjkXxsFdCyfVlPxDDSK0W59pw8Y0H/6NDtcJ/HpMF9B3ZFIxmeTgBxwSr/AjJWfOSs3CRmNvFmrSmAFVQtYga39uN6cn6fTg3S6QYPNc3KJOc4YRIL7VuKHpjug3KzBeXq+5i+cbf9Fw16oqKLkZcZeqBxhOyB0du2aVTqw5IRxc+ZUQsNe4axDKghna8XwjT2HrckDKMNisWS4+Ix8HdDEWgHW2DiAXzGNLg7feKXnpmGrLFkZ+eaFgwdZLC7aPBAZiTVXdSTPWIN6PCjYXAjwJd35+XNmnxyYucjMuusHZdmB5qzxhIN5HbgmBac/GVWwpbCw54a1lv7dcMwp02Yt0lnyAM+086wrJVIK+KsJqYnxui+71xdu2bxh+AU74tRXvyAzK2vICWBJ7kDIraYa8Evu3Ct1zP31BQXXVyCuK3x0OzPk3JCBdgFcAxetqoIYYrxsXCfDmN2jRt3qgDsgDp+S279vEmFxoZF4uuvKEK/kEV07GQxj9r05DQN5ECBhITDXzfmLnL5rX7YhJbvLCGAlYFkdgIOQjBh3T01JMRiyuyyRhlEcwAF8eG4XSG3ondJdCoa0wQD78OEeuOSU1F6d4VrKudn/wrX+NXYQwIH/OmGxAMfxl6rzrtRsyN31pgjWJCcna4QwUxvgeFq8SXqP3rv3mIBOdo0ggCv4AlwvXLQ9e49+8erzPUwQNn350KUa3EK2Z2v2qKgvejBGv5x4+PD328BoyhKjGY+KJzt3HCXekLURHBwKylv4SI57OnHihKKi0rt9WBL3X2obbzWZjmwDawJHs49kexybvAwef/g0oWPHjkXfng2dgcn0xSMdB0xarfbA8z6cNcChCa53d4TwNfT1I4YnHXxXnLZz5MjtexwOE2a1abZ+YM2V7A+ZKS43CXSt9C0Lm0xpOQ7H+LGAYpnGP0Qaza/UAewLUC54ovG2vFP6vmjSof0YAGEQbK1jc+aBMQdXDoGCWevqfGsY/MaPQ6+BJUoz2SZbCQupvbAxa53AwC2fXqktNtk4T63Waht7ZAcULNghCu6ga4LPG0LTqN+2HGeOyWqzWm02a5qjZM9qxGNpwfmu5F6CxHzm1Z05zhKn01ky2bp9ZTpuI0dsG8hLztg4JKMFtAacZi4funXr5dWL+wj3NQPPBF5jQkchP4TEOCcWJaHZZRKompgGhJPo11Q78BX9DPNHoUhatAxVw91FtMIf+dFSLMNgVi1k2YaGSMZ4ZmVwRBFWmDwKoXIezBnYDLVIZjEdFw5F0X+sFkW0hIVxL/iiXhOE3IZnAC3nLSfz7I6m4hsxuCvD0GRxZHi40MaJXLke8ISoiq6YZUJYEU0T8ZcSkquhU4so/zASuXJ975Z4XDxTkjhrEFI7JtrH29snOrZOK4qHSksNXQXDua/1J0BR0xDIlyn3AAAAAElFTkSuQmCC"
+                    },
+                    "categories": [
+                        {
+                            "id": 1,
+                            "name": "Marketing"
+                        },
+                        {
+                            "id": 5,
+                            "name": "Development"
+                        }
+                    ],
+                    "displayName": "Contentful",
+                    "typeVersion": 1
+                },
+                {
+                    "id": 107,
+                    "icon": "file:gotify.png",
+                    "name": "n8n-nodes-base.gotify",
+                    "defaults": {
+                        "name": "Gotify"
+                    },
+                    "iconData": {
+                        "type": "file",
+                        "fileBuffer": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAAxCAMAAACxvDqeAAAC9FBMVEUAAABwyOxfb3ArKizu7u4AAAA2Nja65N/09PQ9PT1xyu5ISEdzzfJRVFZFRkdOUlRstNFISEhyzPCNjnxSVFN0zvRDhaZsvd4AAAAHAAA6a380NzQWCQdUUlEAAADayqFgrs4EAAAAAAA+Pj5fq8pLiaJPQzcAAAC/wMFVla5Vl7Fao8FUmbZPkaxzcm45RUYxXGxYaHEEAAClopNenba8urXBsY1ktNRisM/Gx8i9vb5RkaxWm7hTlrO5ubqcj3Gdnp9HfZNFf5YTCABPAABJSUkAAACpvclnqse6rIq5tJmUoqBRiZ3S0tJGRkZXosBbpcOypYRQiKCBfnemmHmzs7Ogk3ZAY3NLiqNGgZdSlrKYjG6Zmp2HhoZIg5xua18VAAASJS6IzONveYJcp8VNl7XMzMyCgH2ulmmoqKdam7dSZmdVj6aFeF65ubmOnabc2NZIdYddqMeTk5PFxcV8fGSoqKhiYmKbm5uDeF42UlwxODplXkdxyu7///9wyezw8PHv7+9vxedvx+r8/Pz+/v729vVxy+9zye1uw+Vtvt9svNx20/hzzvN1yu7y8vJ4zvJtweN41v1zzPBrttR31fttutr39/f09PXT09N62v/7+vprzPJwye5awefh4ODb2trY2Nj49PJpy/FlyvF2zO/q6urq6Obm5eVsudhsuNbDwsJ00PZ1z/RvzfNxy/BgyO9bxOvt6+rOzs/My8v///718u/j4+JXud5mudtktte1w8u8vLx2zfFQwOhtwOHR1dhis9TEyc2ivMvIyMiJs8j24rTHuJNpvd9fut3e3dxYs9ZmstF9ttB3scvjzqH4+Pj89/Xx7OliwudQu+F2vdu8ytOKudB0s8+rwMyUucyAsMeRtMZWpcWYtcSur7Ln06aenp7Ov5eCgX9pxutswuVGtt5ZrtGMsL1normHpLHKwZ5tcHNua2tczfd4yOh0w+OWydWuzsnS2sF4qLvVzattkKHQwZ2ypYZ0foabk3+0om8tQEi7AAAAfXRSTlMA/gIE/gEIBP4M+x35KBUh/hn5CC77Bv4pI2dCPTMY/v0vEhHmiiAe/fTT0MmfVlBNNg7+/f378u3hyr64p5yXlX1yYBYSDf7+/fz6+vX05tnSy7u2rKOXlZWSgW9mX0pKOf7+9vbv7Ozq6ebl5eTj2Me/urWtn5eHfXpyb7qhFt8AAAb+SURBVEjHjZZlmBJRFIbvwIBDi4ru2t3d3d3d3d2tzNCgSwmLxLILq6urrt3d3d3d3e0fzx0B0QfjPLvD7sA73znfOdx70Z+Dkx317Zkzrmne+Lj4vHx8JzsX/WfABwvc2HKjROHq1apVK9y+dpHyBRHKxPsHxcmUiYM4CAlyltwyT2l2mSFcLpf5QeHu8fDMv7NsggjlbGcxK4xKYSiyZHGaXfkbwFt/ZYs1LM9FeWtZXGIhowxHMpOcLBQud9WqiPicv1Ra2jVvYqP2PgWhjARhsi5aZCKMWrGvZFOo/A94JtT38OD82i1GMWEMo4zV7l+9Zs3CFVYlI/bVAuXYlfMyoSLaB0R+ofinrmnH6mMnr+7bd+BY2g6GUZwbN76+AHFi0mByqS0EoBHWsvlmcIF+w4akwOMUO2NaeWEBXZP/JxrlLbFHa2TCOVv27N1A/4gzN1PshH1nMx1dH+qLEdCKBg4FE7HKvnkvTetYXEcvuJZmNfkvr6W9jf7U8NKOiFnJ1tXX9bSe1dXrdfTuzSsI+/ndOl1bQQwabhWsbo4SfrgbFHGw0htPpJnsO6/o6UkoNlxg64oIbFp5fC0Wxr/BxbR+w741VmvapSS6Lox5rJIHHLZEYOvCEwsAxKLbX9yiaPpiilO58An5Rzh3FLwo7dIZgPHP83t3ghjeofn4/I67d5TdvKi046LStvovbwylndr2XhJNb0tx3XjR6suwglElc/ic2IYtf7QkZDbrW9LVtC2Vvg66d6hXWJkHIF/A5+E/eXAt5RBGxtq+cxutY2k9oHRg6+pKp/LdzXewc/jbweNCCgKpVID/hSeWcQiN0OJkVtqSfxOIsqGnFxxIO9fi9qnbp1rkQllD5XIFfKDlIpFcwIWhzblCzBBaIjnk98lgeDzTr6fYF76veqhqpVzhcjmIxxeAqkBUVJItm0TGz31cu2uORhtKfNHCY/t2p2/cuPbotsxrdmhNzs3XvDVAMOwVSBeS8hFXLsmWJ082SYGRmhxzNETk22xZsznxxInMR1JW2p0W/8KdzTNG1J88dtoPGFT5haRyKbzIsgEcX9KUY94cImKaaZFz1cqVluWWhWs27zl5c9u6YLo+KVAlDmDIGSrlS+UiGcblMlmxkqa5Gi0TBdtX+FenHMl8oNneYPpGg4FSGdanLh4DRuGcC3GhYpFMIpHjGwULm6PXIKd/9fljl69fWXf07AK3waZWkyS1KcOt7oQgIOcmUj7QMpkkTx6JCJXTKpQAMwTBJCtX3mcuXL24OwCgxwacWoVj+2JK1/uHZQDLBVCwBNzOUyG+oybHrnnz5oDhhFNz4U3rW0fXr3WHQQjSsD9oIOkuoZGUQsVSxJFKgG3cben8pQk55s4DmLH6nzy7+/nZtypulUodYVPXG9QkXZNl8YDIRUVlHG5FSYWis5onLJ2fMBfDhJJxnnva8tChKhnrAyoPpSYxSy3eroYXXQ1+iG4igorjO/ZAnEaV52f+CQPtf/h0iccTWL8/dbGBIkkSF+whVeTpNnlDME9aVNZ45uvEcgXyr8gxH2CctpZh3V556ayN9HiWePevW2Iw2NzrbqXaKBKSLxBiEUcuEZUb/ap1iUVCp5HQasCsUKNNq46nGsAsyrM2sH17kPTup7zFlxhI25JcKEKLshXNPaHyssyJCTBcxlWrjEasC7DlyF6DGvwiKXXGptSM9SobtSTDazMs7ociNE8ERidmzpyYmLg0YRc0SqPVYnlmx5p9G1WYpjI2uSmKAtspLK4qi37S3Kz9K88HdtnS+fMTWMcgd1x02rV0Sq0i3eu8blLNNoxca0hftwngqD0u57LMGF4WZvGA47z3pEJfDUf3e9hO4/HU0afbdCr2C9zTvAtoUI7AP5ai89sWQHeLk5AwCHt0NDm0S5/433a4Og6xdu6yxGW4U7swzLDwotUH1tpsGQGKVNvcuqRNNaaWhRZHo1lhaSjjyqJcRcyZm5AQGs9Qs5bnDyat8ybZTtM2b83pudnJglNPlCysaA3MYoZRrjIyWg0EVPxzCU1ffyY9ULxunzgWxFy01bnglFVsCLGK7a0RR9T+7j95Z++VA49G5cYaXF40ikVz3+3QP352q4HJrBroRwfjvL/1SMrLx6c+lUVZY5yfKnY4mO/Qh3dvj8NhJEY4FQpfieH5DtaLtb9xUdN6VfPlazmlnU8sJJjfUIbIYnGVLsbperArFopBo7y5ysWhuNJOh0WcRUhEnkAQQvFyx5Ye8KF6B3uBcswTJ77CJWepwy6fY7lCnIUNsWK5w7G1dm5sTOfboV0mhnhW6HV2BMYXqV14K2F2OHw+n8PM7ClVZAA8FnLrNwNn/ZfgshlULFC+YZEydeqU6d6wfBxgKHso21+S/g6qU2joMkwsiQAAAABJRU5ErkJggg=="
+                    },
+                    "categories": [
+                        {
+                            "id": 6,
+                            "name": "Communication"
+                        }
+                    ],
+                    "displayName": "Gotify",
+                    "typeVersion": 1
+                },
+                {
+                    "id": 325,
+                    "icon": "file:dropcontact.svg",
+                    "name": "n8n-nodes-base.dropcontact",
+                    "defaults": {
+                        "name": "Dropcontact"
+                    },
+                    "iconData": {
+                        "type": "file",
+                        "fileBuffer": "data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgNTAgNTAiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxwYXRoIGZpbGwtcnVsZT0iZXZlbm9kZCIgY2xpcC1ydWxlPSJldmVub2RkIiBkPSJNMjkuNTY5MiAxNi4yMTlDMjguMTQ2OSAxNS41MzcxIDI2LjU1MzUgMTUuMTU1MiAyNC44NzA5IDE1LjE1NTJDMTguODYxNSAxNS4xNTUyIDEzLjk4OTkgMjAuMDI2OCAxMy45ODk5IDI2LjAzNjJDMTMuOTg5OSAzMi4wNDU2IDE4Ljg2MTUgMzYuOTE3MiAyNC44NzA5IDM2LjkxNzJDMjguOTYyMSAzNi45MTcyIDMyLjUyNiAzNC42NTkyIDM0LjM4NDMgMzEuMzIxNUwzMS43NjE0IDI5Ljg2NDNDMzAuNDE1NCAzMi4yODE4IDI3LjgzNDEgMzMuOTE3MiAyNC44NzA5IDMzLjkxNzJDMjAuNTE4MyAzMy45MTcyIDE2Ljk4OTkgMzAuMzg4OCAxNi45ODk5IDI2LjAzNjJDMTYuOTg5OSAyMS42ODM2IDIwLjUxODMgMTguMTU1MiAyNC44NzA5IDE4LjE1NTJDMjYuMDg5NiAxOC4xNTUyIDI3LjI0MzcgMTguNDMxOCAyOC4yNzM4IDE4LjkyNTdMMjkuNTY5MiAxNi4yMTlaTTM0Ljc3NzkgMS45ODQ0NFYyNy43NDYxSDMxLjY2OVYwLjg5OTM2M0MyOS41NDU5IDAuMzEzMTcxIDI3LjMwOTUgMCAyNSAwQzExLjE5MjkgMCAwIDExLjE5MjkgMCAyNUMwIDM4LjgwNzEgMTEuMTkyOSA1MCAyNSA1MEMzOC44MDcxIDUwIDUwIDM4LjgwNzEgNTAgMjVDNTAgMTQuNjYyNiA0My43MjU5IDUuNzkwNyAzNC43Nzc5IDEuOTg0NDRaIiBmaWxsPSIjMEFCQTlGIi8+Cjwvc3ZnPgo="
+                    },
+                    "categories": [
+                        {
+                            "id": 2,
+                            "name": "Sales"
+                        }
+                    ],
+                    "displayName": "Dropcontact",
+                    "typeVersion": 1
+                }
+            ]
+        }
+    ],
+    "filters": [
+        {
+            "counts": [
+                {
+                    "count": 24,
+                    "highlighted": "Sales",
+                    "value": "Sales"
+                },
+                {
+                    "count": 12,
+                    "highlighted": "Marketing & Growth",
+                    "value": "Marketing & Growth"
+                },
+                {
+                    "count": 6,
+                    "highlighted": "Building Blocks",
+                    "value": "Building Blocks"
+                },
+                {
+                    "count": 3,
+                    "highlighted": "Finance & Accounting",
+                    "value": "Finance & Accounting"
+                },
+                {
+                    "count": 2,
+                    "highlighted": "HR & People Ops",
+                    "value": "HR & People Ops"
+                }
+            ],
+            "field_name": "categories",
+            "sampled": false,
+            "stats": {
+                "total_values": 5
+            }
+        }
+    ]
+}
diff --git a/cypress/fixtures/templates_search/test_template_import.json b/cypress/fixtures/templates_search/test_template_import.json
new file mode 100644
index 0000000000000..c77be3db9c28d
--- /dev/null
+++ b/cypress/fixtures/templates_search/test_template_import.json
@@ -0,0 +1,19 @@
+{
+	"id": 60,
+	"name": "test1 test1",
+	"workflow": {
+			"nodes": [
+					{
+							"name": "Start",
+							"type": "n8n-nodes-base.start",
+							"position": [
+									250,
+									300
+							],
+							"parameters": {},
+							"typeVersion": 1
+					}
+			],
+			"connections": {}
+	}
+}
diff --git a/cypress/fixtures/templates_search/test_template_preview.json b/cypress/fixtures/templates_search/test_template_preview.json
new file mode 100644
index 0000000000000..4d3ca1e548f9a
--- /dev/null
+++ b/cypress/fixtures/templates_search/test_template_preview.json
@@ -0,0 +1,150 @@
+{
+	"workflow": {
+			"id": 60,
+			"name": "test1 test1",
+			"views": 120000000,
+			"recentViews": 0,
+			"totalViews": 120000000,
+			"createdAt": "2019-08-30T16:39:31.362Z",
+			"description": "here is a description. here is a description. here is a description. \n\n![Screenshot from 20190806 091433.png](fileId:88)",
+			"workflow": {
+					"nodes": [
+							{
+									"name": "Start",
+									"type": "n8n-nodes-base.start",
+									"position": [
+											250,
+											300
+									],
+									"parameters": {},
+									"typeVersion": 1
+							}
+					],
+					"connections": {}
+			},
+			"lastUpdatedBy": null,
+			"workflowInfo": {
+					"nodeCount": 1,
+					"nodeTypes": {
+							"n8n-nodes-base.start": {
+									"count": 1
+							}
+					}
+			},
+			"user": {
+					"username": "admin"
+			},
+			"nodes": [
+					{
+							"id": 11,
+							"icon": "file:amqp.png",
+							"name": "n8n-nodes-base.amqpTrigger",
+							"defaults": {
+									"name": "AMQP Trigger"
+							},
+							"iconData": {
+									"type": "file",
+									"fileBuffer": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAB7UlEQVRoge2W4W3CMBCFj26QjkBHSEdIR4AR6Ah0BBgBRqAjhBFgBBghHaEVlV29PN0lDr+o9D7JEjhn+975bJ8JIYQQQgghhBBCCCGEEA9CY2bf0NaBW2uyu7UN2XSOzTyY60J2BzNbObbsH7eTmS2mhHJHE1wmCD7A93ngEAquHaHc2omCcysSXQW74g32BHfwfTEiuCoQm9vuDsEndPYpELxKjjBj0foCEXX6XdM3by3c7aOZPZvZzMzeaBzbIh9pzIuZXaG/RqNIMAq7Ur8XCHQ2kx3LC56DMQ39X4LI23zbAd88ruRHD09wTVF5p+/eBZI5g7O8w5FgXOvsZAI7PxRwS4HGIPbm8wRjBL/Sgp/QNyQYHWySmOxgJBgFeGnPfZHgDVyufET+YMEVCdo7gziCTBbGmRKlGQpCMXOnj+1L6B0JFsxndO3cjjZyjo6OnZeqGb5gqhTQS3qKeK1SwbesfB3IrF/awqu+g8Dgs5SLE37SciHiPUv8rLVp7k2wdl63tDDqgTs8lqpINWGXbSTKe9rlJgXME7C9I6V7oGAWsEzv2gzeN2TstkbCZyIJWBYKWUwtF4foKGU9TpRGdZDSdVDpDNXSVVBLt5TeucS9K6X/E3USX3rshBBCCCGEEEIIIYQQ4tExsx8PuuPnwhCIbgAAAABJRU5ErkJggg=="
+							},
+							"categories": [
+									{
+											"id": 5,
+											"name": "Development"
+									},
+									{
+											"id": 6,
+											"name": "Communication"
+									}
+							],
+							"displayName": "AMQP Trigger",
+							"typeVersion": 1
+					},
+					{
+							"id": 18,
+							"icon": "file:autopilot.svg",
+							"name": "n8n-nodes-base.autopilot",
+							"defaults": {
+									"name": "Autopilot"
+							},
+							"iconData": {
+									"type": "file",
+									"fileBuffer": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjM4IDI2IDM1IDM1Ij48Y2lyY2xlIGN4PSI1MCIgY3k9IjUwIiByPSI0MCIgc3Ryb2tlPSIjMThkNGIyIiBzdHJva2Utd2lkdGg9IjMiIGZpbGw9IiMxOGQ0YjIiLz48cGF0aCBmaWxsPSIjZmZmIiBkPSJNNDUuNCA0Mi42aDE5LjlsMy40LTQuOEg0MmwzLjQgNC44em0zLjEgOC4zaDEzLjFsMy40LTQuOEg0NS40bDMuMSA0Ljh6bTU0LS43Ii8+PC9zdmc+"
+							},
+							"categories": [
+									{
+											"id": 1,
+											"name": "Marketing"
+									}
+							],
+							"displayName": "Autopilot",
+							"typeVersion": 1
+					},
+					{
+							"id": 20,
+							"icon": "file:lambda.svg",
+							"name": "n8n-nodes-base.awsLambda",
+							"defaults": {
+									"name": "AWS Lambda"
+							},
+							"iconData": {
+									"type": "file",
+									"fileBuffer": "data:image/svg+xml;base64,PHN2ZyBoZWlnaHQ9IjI1MDAiIHZpZXdCb3g9Ii0zLjAyMyAtMC4yMiA0MjAuOTIzIDQzMy41NCIgd2lkdGg9IjI0NDMiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PHBhdGggZD0iTTIwOC40NSAyMjcuODljLTEuNTkgMi4yNi0yLjkzIDQuMTItNC4yMiA2cS0zMC44NiA0NS40Mi02MS43IDkwLjgzLTI4LjY5IDQyLjI0LTU3LjQ0IDg0LjQzYTMuODggMy44OCAwIDAxLTIuNzMgMS41OXEtNDAuNTktLjM1LTgxLjE2LS44OGMtLjMgMC0uNjEtLjA5LTEuMi0uMThhMTQuNDQgMTQuNDQgMCAwMS43Ni0xLjY1cTI4LjMxLTQzLjg5IDU2LjYyLTg3Ljc2IDI1LjExLTM4Ljg4IDUwLjI1LTc3Ljc0IDI3Ljg2LTQzLjE4IDU1LjY5LTg2LjQyYzIuNzQtNC4yNSA1LjU5LTguNDIgOC4xOS0xMi43NWE1LjI2IDUuMjYgMCAwMC41Ni0zLjgzYy01LTE1Ljk0LTEwLjEtMzEuODQtMTUuMTktNDcuNzQtMi4xOC02LjgxLTQuNDYtMTMuNTgtNi41LTIwLjQzLS42Ni0yLjItMS43NS0yLjg3LTQtMi44Ni0xNyAuMDctMzMuOS4wNS01MC44NS4wNS0zLjIyIDAtMy4yMyAwLTMuMjMtMy4xOCAwLTIwLjg0IDAtNDEuNjgtLjA2LTYyLjUyIDAtMi4zMi43Ni0yLjg0IDIuOTQtMi44NHE1MS4xOS4wOSAxMDIuNCAwYTMuMjkgMy4yOSAwIDAxMy42IDIuNDNxMjcgNjcuOTEgNTQgMTM1Ljc3IDMxLjUgNzkuMTQgNjMgMTU4LjNjNi41MiAxNi4zOCAxMy4wOSAzMi43NSAxOS41NCA0OS4xNy43NyAyIDEuNTcgMi4zOCAzLjU5IDEuNzYgMTcuODktNS41MyAzNS44Mi0xMC45MSA1My43LTE2LjQ1IDIuMjUtLjcgMy4wNy0uMjMgMy43NyAyIDYuMSAxOS4xNyAxMi4zMiAzOC4zIDE4LjUgNTcuNDUuMjEuNjYuMzcgMS4zMy42MiAyLjI1LTEuMjguNDctMi40OCAxLTMuNzEgMS4zNHEtNjEgMTkuMzMtMTIxLjkzIDM4LjY4Yy0xLjk0LjYxLTIuNTItLjA1LTMuMTctMS42OHEtMTguNjEtNDcuMTYtMzcuMzEtOTQuMjgtMTguMjktNDYuMTQtMzYuNi05Mi4yOGMtMS44My00LjYyLTMuNjMtOS4yNi01LjQ2LTEzLjg4LS4yOS0uNzktLjY5LTEuNDgtMS4yNy0yLjd6IiBmaWxsPSIjZmE3ZTE0Ii8+PC9zdmc+"
+							},
+							"categories": [
+									{
+											"id": 5,
+											"name": "Development"
+									}
+							],
+							"displayName": "AWS Lambda",
+							"typeVersion": 1
+					},
+					{
+							"id": 40,
+							"icon": "file:clearbit.svg",
+							"name": "n8n-nodes-base.clearbit",
+							"defaults": {
+									"name": "Clearbit"
+							},
+							"iconData": {
+									"type": "file",
+									"fileBuffer": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI3MiIgaGVpZ2h0PSI3MiI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJhIiB4MT0iNTAlIiB4Mj0iMTAwJSIgeTE9IjAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI0RFRjJGRSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI0RCRjFGRSIvPjwvbGluZWFyR3JhZGllbnQ+PGxpbmVhckdyYWRpZW50IGlkPSJiIiB4MT0iMCUiIHgyPSI1MCUiIHkxPSIwJSIgeTI9IjEwMCUiPjxzdG9wIG9mZnNldD0iMCUiIHN0b3AtY29sb3I9IiM1N0JDRkQiLz48c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiM1MUI1RkQiLz48L2xpbmVhckdyYWRpZW50PjxsaW5lYXJHcmFkaWVudCBpZD0iYyIgeDE9IjM3LjUlIiB4Mj0iNjIuNSUiIHkxPSIwJSIgeTI9IjEwMCUiPjxzdG9wIG9mZnNldD0iMCUiIHN0b3AtY29sb3I9IiMxQ0E3RkQiLz48c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiMxNDhDRkMiLz48L2xpbmVhckdyYWRpZW50PjwvZGVmcz48ZyBmaWxsPSJub25lIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiPjxwYXRoIGZpbGw9InVybCgjYSkiIGQ9Ik03MiAzNnYxNi43N2wtLjAwNC44NjhjLS4wNiA2LjAzNS0uNzUgOC4zNTMtMiAxMC42ODhhMTMuNjMgMTMuNjMgMCAwMS01LjY3IDUuNjdsLS4zMjYuMTcxQzYxLjY1OCA3MS4zNjQgNTkuMTYgNzIgNTIuNzcgNzJIMzZWMzZoMzZ6Ii8+PHBhdGggZmlsbD0idXJsKCNiKSIgZD0iTTY0LjMyNiAyLjAwM2ExMy42MyAxMy42MyAwIDAxNS42NyA1LjY3bC4xNzEuMzI3QzcxLjM2NCAxMC4zNDIgNzIgMTIuODQgNzIgMTkuMjNWMzZIMzZWMGgxNi43N2M2LjY4NyAwIDkuMTEyLjY5NiAxMS41NTYgMi4wMDN6Ii8+PHBhdGggZmlsbD0idXJsKCNjKSIgZD0iTTM2IDB2NzJIMTkuMjNsLS44NjgtLjAwNGMtNi4wMzUtLjA2LTguMzUzLS43NS0xMC42ODgtMmExMy42MyAxMy42MyAwIDAxLTUuNjctNS42N0wxLjgzMiA2NEMuNjM2IDYxLjY1OCAwIDU5LjE2IDAgNTIuNzdWMTkuMjNjMC02LjY4Ny42OTYtOS4xMTIgMi4wMDMtMTEuNTU2YTEzLjYzIDEzLjYzIDAgMDE1LjY3LTUuNjdMOCAxLjgzMkMxMC4zNDIuNjM2IDEyLjg0IDAgMTkuMjMgMEgzNnoiLz48L2c+PC9zdmc+"
+							},
+							"categories": [
+									{
+											"id": 2,
+											"name": "Sales"
+									}
+							],
+							"displayName": "Clearbit",
+							"typeVersion": 1
+					},
+					{
+							"id": 51,
+							"icon": "file:convertKit.svg",
+							"name": "n8n-nodes-base.convertKitTrigger",
+							"defaults": {
+									"name": "ConvertKit Trigger"
+							},
+							"iconData": {
+									"type": "file",
+									"fileBuffer": "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTcyIiBoZWlnaHQ9IjE2MCIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cGF0aCBkPSJNODIuNzIgMTI2LjMxNmMyOS43NyAwIDUyLjc4LTIyLjYyMiA1Mi43OC01MC41MjYgMC0yNi4xNDMtMjEuNjE3LTQyLjEwNi0zNS45MzUtNDIuMTA2LTE5Ljk0NSAwLTM1LjkzIDE0LjA4NC0zOC4xOTggMzQuOTg4LS40MTggMy44NTYtMy40NzYgNy4wOS03LjM1NSA3LjA2MS02LjQyMy0uMDQ2LTE1Ljc0Ni0uMS0yMS42NTgtLjA4LTIuNTU1LjAwOC00LjY2OS0yLjA2NS00LjU0My00LjYxOC44OS0xOC4xMjMgNi45MTQtMzUuMDcgMTguNDAyLTQ4LjA4N0M1OC45NzYgOC40ODggNzcuNTYxIDAgOTkuNTY1IDBjMzYuOTY5IDAgNzEuODY5IDMzLjc4NiA3MS44NjkgNzUuNzkgMCA0Ni41MDgtMzguMzEyIDg0LjIxLTg3LjkyNyA4NC4yMS0zNS4zODQgMC03MS4wMjEtMjMuMjU4LTgzLjQ2NC01NS43NzVhLjcwMi43MDIgMCAwMS0uMDMtLjM3N2MuMTY1LS45NjIuNDk0LTEuODQxLjgxOC0yLjcwNy40NzEtMS4yNTguOTMxLTIuNDg4Ljg2NC0zLjkwNmwtLjIxNS00LjUyOWE1LjUyMyA1LjUyMyAwIDAxMy4xOC01LjI2M2wxLjc5OC0uODQyYTYuOTgyIDYuOTgyIDAgMDAzLjkxMi01LjA3NSA2Ljk5MyA2Ljk5MyAwIDAxNi44ODctNS43MzZjNS4yODIgMCA5Ljg3NSAzLjUxNSAxMS41OSA4LjUxMiA4LjMwNyAyNC4yMTIgMjEuNTExIDQyLjAxNCA1My44NzMgNDIuMDE0eiIgZmlsbD0iI0ZCNjk3MCIvPjwvc3ZnPg=="
+							},
+							"categories": [
+									{
+											"id": 1,
+											"name": "Marketing"
+									},
+									{
+											"id": 2,
+											"name": "Sales"
+									}
+							],
+							"displayName": "ConvertKit Trigger",
+							"typeVersion": 1
+					}
+			],
+			"categories": [],
+			"image": []
+	}
+}
diff --git a/cypress/fixtures/workflow-with-unknown-credentials.json b/cypress/fixtures/workflow-with-unknown-credentials.json
new file mode 100644
index 0000000000000..142422227c1ee
--- /dev/null
+++ b/cypress/fixtures/workflow-with-unknown-credentials.json
@@ -0,0 +1,52 @@
+{
+  "meta": {
+    "instanceId": "123"
+  },
+  "nodes": [
+    {
+      "parameters": {
+        "resource": "credential",
+        "name": "123",
+        "credentialTypeName": "123"
+      },
+      "id": "a01f79f6-e8c3-44c5-be5e-4bc482e23172",
+      "name": "n8n",
+      "type": "n8n-nodes-base.n8n",
+      "typeVersion": 1,
+      "position": [
+        540,
+        240
+      ],
+      "credentials": {
+        "n8nApi": {
+          "id": "10",
+          "name": "n8n account"
+        }
+      }
+    },
+    {
+      "parameters": {},
+      "id": "acdd1bdc-c642-4ea6-ad67-f4201b640cfa",
+      "name": "When clicking \"Test workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        300,
+        240
+      ]
+    }
+  ],
+  "connections": {
+    "When clicking \"Test workflow\"": {
+      "main": [
+        [
+          {
+            "node": "n8n",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  }
+}
diff --git a/cypress/fixtures/workflow-with-unknown-nodes.json b/cypress/fixtures/workflow-with-unknown-nodes.json
new file mode 100644
index 0000000000000..5ea0189e50af4
--- /dev/null
+++ b/cypress/fixtures/workflow-with-unknown-nodes.json
@@ -0,0 +1,90 @@
+{
+  "meta": {
+    "instanceId": "15bbf37b6a515ccc2f534cabcd8bd171ca33583ff7744b1e9420e5ce68e615bb"
+  },
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "40720511-19b6-4421-bdb0-3fb6efef4bc5",
+      "name": "When clicking \"Test workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        280,
+        320
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "acdd1bdc-c642-4ea6-ad67-f4201b640cfa",
+      "name": "Unknown node 1",
+      "type": "n8n-nodes-base.thisNodeDoesntExist",
+      "typeVersion": 1,
+      "position": [
+        400,
+        500
+      ]
+    },
+		{
+      "parameters": {},
+      "id": "acdd1bdc-c642-4ea6-ad67-f4201b640ffa",
+      "name": "Unknown node 2",
+      "type": "n8n-nodes-base.thisNodeDoesntExistEither",
+      "typeVersion": 1,
+      "position": [
+        600,
+        500
+      ]
+    },
+    {
+      "parameters": {
+        "options": {}
+      },
+      "id": "fbe5163b-7474-4741-980a-e4956789be0a",
+      "name": "Edit Fields",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.2,
+      "position": [
+        500,
+        320
+      ]
+    },
+    {
+      "parameters": {
+        "options": {}
+      },
+      "id": "163313b9-64ff-4ffc-b00f-09b267d8132c",
+      "name": "Edit Fields1",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.2,
+      "position": [
+        720,
+        320
+      ]
+    }
+  ],
+  "connections": {
+    "When clicking \"Test workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Edit Fields",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Edit Fields": {
+      "main": [
+        [
+          {
+            "node": "Edit Fields1",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  }
+}
diff --git a/cypress/pages/bannerStack.ts b/cypress/pages/bannerStack.ts
new file mode 100644
index 0000000000000..dce3222126018
--- /dev/null
+++ b/cypress/pages/bannerStack.ts
@@ -0,0 +1,8 @@
+import { BasePage } from './base';
+
+export class BannerStack extends BasePage {
+	getters = {
+		banner: () => cy.getByTestId('banner-stack'),
+	};
+	actions = {};
+}
diff --git a/cypress/pages/credentials.ts b/cypress/pages/credentials.ts
index 7d3bf7ac9855e..24ec88565dd9e 100644
--- a/cypress/pages/credentials.ts
+++ b/cypress/pages/credentials.ts
@@ -5,7 +5,7 @@ export class CredentialsPage extends BasePage {
 	getters = {
 		emptyListCreateCredentialButton: () => cy.getByTestId('empty-resources-list').find('button'),
 		createCredentialButton: () => cy.getByTestId('resources-list-add'),
-		searchInput: () => cy.getByTestId('resources-list-search').find('input'),
+		searchInput: () => cy.getByTestId('resources-list-search'),
 		emptyList: () => cy.getByTestId('resources-list-empty'),
 		credentialCards: () => cy.getByTestId('resources-list-item'),
 		credentialCard: (credentialName: string) =>
@@ -17,8 +17,9 @@ export class CredentialsPage extends BasePage {
 			this.getters.credentialCard(credentialName).findChildByTestId('credential-card-actions'),
 		credentialDeleteButton: () =>
 			cy.getByTestId('action-toggle-dropdown').filter(':visible').contains('Delete'),
-		sort: () => cy.getByTestId('resources-list-sort'),
-		sortOption: (label: string) => this.getters.sort().contains(label).first(),
+		sort: () => cy.getByTestId('resources-list-sort').first(),
+		sortOption: (label: string) =>
+			cy.getByTestId('resources-list-sort-item').contains(label).first(),
 		filtersTrigger: () => cy.getByTestId('resources-list-filters-trigger'),
 		filtersDropdown: () => cy.getByTestId('resources-list-filters-dropdown'),
 	};
diff --git a/cypress/pages/demo.ts b/cypress/pages/demo.ts
new file mode 100644
index 0000000000000..0590fb8def03e
--- /dev/null
+++ b/cypress/pages/demo.ts
@@ -0,0 +1,21 @@
+/**
+ * Actions
+ */
+
+export function vistDemoPage(theme?: 'dark' | 'light') {
+	const query = theme ? `?theme=${theme}` : '';
+	cy.visit('/workflows/demo' + query);
+	cy.waitForLoad();
+	cy.window().then((win) => {
+		// @ts-ignore
+		win.preventNodeViewBeforeUnload = true;
+	});
+}
+
+export function importWorkflow(workflow: object) {
+	const OPEN_WORKFLOW = {command: 'openWorkflow', workflow};
+	cy.window().then($window => {
+		const message = JSON.stringify(OPEN_WORKFLOW);
+		$window.postMessage(message, '*')
+	});
+}
diff --git a/cypress/pages/features/node-creator.ts b/cypress/pages/features/node-creator.ts
index 8ebe6db702d6e..3e6a819443c8f 100644
--- a/cypress/pages/features/node-creator.ts
+++ b/cypress/pages/features/node-creator.ts
@@ -7,6 +7,7 @@ export class NodeCreator extends BasePage {
 		plusButton: () => cy.getByTestId('node-creator-plus-button'),
 		canvasAddButton: () => cy.getByTestId('canvas-add-button'),
 		searchBar: () => cy.getByTestId('search-bar'),
+		getCategoryItem: (label: string) => cy.get(`[data-keyboard-nav-id="${label}"]`),
 		getCreatorItem: (label: string) =>
 			this.getters.creatorItem().contains(label).parents('[data-test-id="item-iterator-item"]'),
 		getNthCreatorItem: (n: number) => this.getters.creatorItem().eq(n),
@@ -15,10 +16,12 @@ export class NodeCreator extends BasePage {
 		selectedTab: () => this.getters.nodeCreatorTabs().find('.is-active'),
 		categorizedItems: () => cy.getByTestId('categorized-items'),
 		creatorItem: () => cy.getByTestId('item-iterator-item'),
+		categoryItem: () => cy.getByTestId('node-creator-category-item'),
 		communityNodeTooltip: () => cy.getByTestId('node-item-community-tooltip'),
-		noResults: () => cy.getByTestId('categorized-no-results'),
+		noResults: () => cy.getByTestId('node-creator-no-results'),
 		nodeItemName: () => cy.getByTestId('node-creator-item-name'),
-		activeSubcategory: () => cy.getByTestId('categorized-items-subcategory'),
+		nodeItemDescription: () => cy.getByTestId('node-creator-item-description'),
+		activeSubcategory: () => cy.getByTestId('nodes-list-header'),
 		expandedCategories: () =>
 			this.getters.creatorItem().find('>div').filter('.active').invoke('text'),
 	};
diff --git a/cypress/pages/index.ts b/cypress/pages/index.ts
index 35ef30d5ec005..39c9be3b5648b 100644
--- a/cypress/pages/index.ts
+++ b/cypress/pages/index.ts
@@ -1,7 +1,5 @@
 export * from './base';
 export * from './credentials';
-export * from './signin';
-export * from './signup';
 export * from './workflows';
 export * from './workflow';
 export * from './modals';
@@ -9,3 +7,9 @@ export * from './settings-users';
 export * from './settings-log-streaming';
 export * from './sidebar';
 export * from './ndv';
+export * from './bannerStack';
+export * from './workflow-executions-tab';
+export * from './signin';
+export * from './workflow-history';
+export * from './workerView';
+export * from './settings-public-api';
diff --git a/cypress/pages/mfa-login.ts b/cypress/pages/mfa-login.ts
new file mode 100644
index 0000000000000..50ca5adab7f98
--- /dev/null
+++ b/cypress/pages/mfa-login.ts
@@ -0,0 +1,77 @@
+import { N8N_AUTH_COOKIE } from '../constants';
+import { BasePage } from './base';
+import { SigninPage } from './signin';
+import { WorkflowsPage } from './workflows';
+
+export class MfaLoginPage extends BasePage {
+	url = '/mfa';
+	getters = {
+		form: () => cy.getByTestId('mfa-login-form'),
+		token: () => cy.getByTestId('token'),
+		recoveryCode: () => cy.getByTestId('recoveryCode'),
+		enterRecoveryCodeButton: () => cy.getByTestId('mfa-enter-recovery-code-button'),
+	};
+
+	actions = {
+		loginWithMfaToken: (email: string, password: string, mfaToken: string) => {
+			const signinPage = new SigninPage();
+			const workflowsPage = new WorkflowsPage();
+
+			cy.session(
+				[mfaToken],
+				() => {
+					cy.visit(signinPage.url);
+
+					signinPage.getters.form().within(() => {
+						signinPage.getters.email().type(email);
+						signinPage.getters.password().type(password);
+						signinPage.getters.submit().click();
+					});
+
+					this.getters.form().within(() => {
+						this.getters.token().type(mfaToken);
+					});
+
+					// we should be redirected to /workflows
+					cy.url().should('include', workflowsPage.url);
+				},
+				{
+					validate() {
+						cy.getCookie(N8N_AUTH_COOKIE).should('exist');
+					},
+				},
+			);
+		},
+		loginWithRecoveryCode: (email: string, password: string, recoveryCode: string) => {
+			const signinPage = new SigninPage();
+			const workflowsPage = new WorkflowsPage();
+
+			cy.session(
+				[recoveryCode],
+				() => {
+					cy.visit(signinPage.url);
+
+					signinPage.getters.form().within(() => {
+						signinPage.getters.email().type(email);
+						signinPage.getters.password().type(password);
+						signinPage.getters.submit().click();
+					});
+
+					this.getters.enterRecoveryCodeButton().click();
+
+					this.getters.form().within(() => {
+						this.getters.recoveryCode().type(recoveryCode);
+					});
+
+					// we should be redirected to /workflows
+					cy.url().should('include', workflowsPage.url);
+				},
+				{
+					validate() {
+						cy.getCookie(N8N_AUTH_COOKIE).should('exist');
+					},
+				},
+			);
+		},
+	};
+}
diff --git a/cypress/pages/modals/credentials-modal.ts b/cypress/pages/modals/credentials-modal.ts
index 2f5fd298aa99d..08a258a05768e 100644
--- a/cypress/pages/modals/credentials-modal.ts
+++ b/cypress/pages/modals/credentials-modal.ts
@@ -1,4 +1,5 @@
 import { BasePage } from '../base';
+import { getVisibleSelect } from '../../utils';
 
 export class CredentialsModal extends BasePage {
 	getters = {
@@ -10,9 +11,7 @@ export class CredentialsModal extends BasePage {
 		newCredentialTypeButton: () => cy.getByTestId('new-credential-type-button'),
 		connectionParameters: () => cy.getByTestId('credential-connection-parameter'),
 		connectionParameter: (fieldName: string) =>
-			this.getters
-				.connectionParameters()
-				.find(`:contains('${fieldName}') .n8n-input input`),
+			this.getters.connectionParameters().find(`:contains('${fieldName}') .n8n-input input`),
 		name: () => cy.getByTestId('credential-name'),
 		nameInput: () => cy.getByTestId('credential-name').find('input'),
 		// Saving of the credentials takes a while on the CI so we need to increase the timeout
@@ -22,20 +21,17 @@ export class CredentialsModal extends BasePage {
 		credentialsEditModal: () => cy.getByTestId('credential-edit-dialog'),
 		credentialsAuthTypeSelector: () => cy.getByTestId('node-auth-type-selector'),
 		credentialAuthTypeRadioButtons: () =>
-			this.getters.credentialsAuthTypeSelector().find('label[role=radio]'),
+			this.getters.credentialsAuthTypeSelector().find('label.el-radio'),
 		credentialInputs: () => cy.getByTestId('credential-connection-parameter'),
 		menu: () => this.getters.editCredentialModal().get('.menu-container'),
 		menuItem: (name: string) => this.getters.menu().get('.n8n-menu-item').contains(name),
 		usersSelect: () => cy.getByTestId('credential-sharing-modal-users-select'),
+		testSuccessTag: () => cy.getByTestId('credentials-config-container-test-success'),
 	};
 	actions = {
 		addUser: (email: string) => {
 			this.getters.usersSelect().click();
-			this.getters
-				.usersSelect()
-				.get('.el-select-dropdown__item')
-				.contains(email.toLowerCase())
-				.click();
+			getVisibleSelect().contains(email.toLowerCase()).click();
 		},
 		setName: (name: string) => {
 			this.getters.name().click();
@@ -43,12 +39,18 @@ export class CredentialsModal extends BasePage {
 		},
 		save: (test = false) => {
 			cy.intercept('POST', '/rest/credentials').as('saveCredential');
-			this.getters.saveButton().click();
+			this.getters.saveButton().click({ force: true });
 
 			cy.wait('@saveCredential');
 			if (test) cy.wait('@testCredential');
 			this.getters.saveButton().should('contain.text', 'Saved');
 		},
+		saveSharing: (test = false) => {
+			cy.intercept('PUT', '/rest/credentials/*/share').as('shareCredential');
+			this.getters.saveButton().click({ force: true });
+			cy.wait('@shareCredential');
+			this.getters.saveButton().should('contain.text', 'Saved');
+		},
 		close: () => {
 			this.getters.closeButton().click();
 		},
diff --git a/cypress/pages/modals/index.ts b/cypress/pages/modals/index.ts
index 358ba0cf7800d..3d1981d027ad2 100644
--- a/cypress/pages/modals/index.ts
+++ b/cypress/pages/modals/index.ts
@@ -1,5 +1,3 @@
 export * from './credentials-modal';
 export * from './message-box';
 export * from './workflow-sharing-modal';
-export * from './user-activation-survey-modal';
-
diff --git a/cypress/pages/modals/message-box.ts b/cypress/pages/modals/message-box.ts
index cfa38368b8d67..b54e375ef6c2a 100644
--- a/cypress/pages/modals/message-box.ts
+++ b/cypress/pages/modals/message-box.ts
@@ -5,15 +5,15 @@ export class MessageBox extends BasePage {
 		modal: () => cy.get('.el-message-box', { withinSubject: null }),
 		header: () => this.getters.modal().find('.el-message-box__title'),
 		content: () => this.getters.modal().find('.el-message-box__content'),
-		confirm: () => this.getters.modal().find('.btn--confirm'),
-		cancel: () => this.getters.modal().find('.btn--cancel'),
+		confirm: () => this.getters.modal().find('.btn--confirm').first(),
+		cancel: () => this.getters.modal().find('.btn--cancel').first(),
 	};
 	actions = {
 		confirm: () => {
-			this.getters.confirm().click();
+			this.getters.confirm().click({ force: true });
 		},
 		cancel: () => {
-			this.getters.cancel().click();
+			this.getters.cancel().click({ force: true });
 		},
 	};
 }
diff --git a/cypress/pages/modals/mfa-setup-modal.ts b/cypress/pages/modals/mfa-setup-modal.ts
new file mode 100644
index 0000000000000..d127731be278d
--- /dev/null
+++ b/cypress/pages/modals/mfa-setup-modal.ts
@@ -0,0 +1,11 @@
+import { BasePage } from './../base';
+
+export class MfaSetupModal extends BasePage {
+	getters = {
+		modalContainer: () => cy.getByTestId('changePassword-modal').last(),
+		tokenInput: () => cy.getByTestId('mfa-token-input'),
+		copySecretToClipboardButton: () => cy.getByTestId('mfa-secret-button'),
+		downloadRecoveryCodesButton: () => cy.getByTestId('mfa-recovery-codes-button'),
+		saveButton: () => cy.getByTestId('mfa-save-button'),
+	};
+}
diff --git a/cypress/pages/modals/user-activation-survey-modal.ts b/cypress/pages/modals/user-activation-survey-modal.ts
deleted file mode 100644
index d47f987887aeb..0000000000000
--- a/cypress/pages/modals/user-activation-survey-modal.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { BasePage } from './../base';
-
-export class UserActivationSurveyModal extends BasePage {
-	getters = {
-		modalContainer: () => cy.getByTestId('userActivationSurvey-modal').last(),
-		feedbackInput: () => cy.getByTestId('activation-feedback-input').find('textarea'),
-		sendFeedbackButton: () => cy.getByTestId('send-activation-feedback-button'),
-	};
-}
diff --git a/cypress/pages/ndv.ts b/cypress/pages/ndv.ts
index 15f177240f793..f9cb5b130445b 100644
--- a/cypress/pages/ndv.ts
+++ b/cypress/pages/ndv.ts
@@ -1,4 +1,5 @@
 import { BasePage } from './base';
+import { getVisiblePopper, getVisibleSelect } from '../utils';
 
 export class NDV extends BasePage {
 	getters = {
@@ -7,22 +8,28 @@ export class NDV extends BasePage {
 		copyInput: () => cy.getByTestId('copy-input'),
 		credentialInput: (eq = 0) => cy.getByTestId('node-credentials-select').eq(eq),
 		nodeExecuteButton: () => cy.getByTestId('node-execute-button'),
+		triggerPanelExecuteButton: () => cy.getByTestId('trigger-execute-button'),
 		inputSelect: () => cy.getByTestId('ndv-input-select'),
 		inputOption: () => cy.getByTestId('ndv-input-option'),
 		inputPanel: () => cy.getByTestId('ndv-input-panel'),
 		outputPanel: () => cy.getByTestId('output-panel'),
 		executingLoader: () => cy.getByTestId('ndv-executing'),
 		inputDataContainer: () => this.getters.inputPanel().findChildByTestId('ndv-data-container'),
-		inputDisplayMode: () => this.getters.inputPanel().findChildByTestId('ndv-run-data-display-mode').first(),
+		inputDisplayMode: () =>
+			this.getters.inputPanel().findChildByTestId('ndv-run-data-display-mode').first(),
 		outputDataContainer: () => this.getters.outputPanel().findChildByTestId('ndv-data-container'),
-		outputDisplayMode: () => this.getters.outputPanel().findChildByTestId('ndv-run-data-display-mode').first(),
+		outputDisplayMode: () =>
+			this.getters.outputPanel().findChildByTestId('ndv-run-data-display-mode').first(),
 		pinDataButton: () => cy.getByTestId('ndv-pin-data'),
 		editPinnedDataButton: () => cy.getByTestId('ndv-edit-pinned-data'),
-		pinnedDataEditor: () => this.getters.outputPanel().find('.monaco-editor[role=code]'),
+		pinnedDataEditor: () => this.getters.outputPanel().find('.cm-editor .cm-scroller .cm-content'),
 		runDataPaneHeader: () => cy.getByTestId('run-data-pane-header'),
-		savePinnedDataButton: () => this.getters.runDataPaneHeader().find('button').filter(':visible').contains('Save'),
+		nodeOutputHint: () => cy.getByTestId('ndv-output-run-node-hint'),
+		savePinnedDataButton: () =>
+			this.getters.runDataPaneHeader().find('button').filter(':visible').contains('Save'),
 		outputTableRows: () => this.getters.outputDataContainer().find('table tr'),
 		outputTableHeaders: () => this.getters.outputDataContainer().find('table thead th'),
+		outputTableHeaderByText: (text: string) => this.getters.outputTableHeaders().contains(text),
 		outputTableRow: (row: number) => this.getters.outputTableRows().eq(row),
 		outputTbodyCell: (row: number, col: number) =>
 			this.getters.outputTableRow(row).find('td').eq(col),
@@ -32,14 +39,18 @@ export class NDV extends BasePage {
 		inputTbodyCell: (row: number, col: number) =>
 			this.getters.inputTableRow(row).find('td').eq(col),
 		inlineExpressionEditorInput: () => cy.getByTestId('inline-expression-editor-input'),
+		inlineExpressionEditorOutput: () => cy.getByTestId('inline-expression-editor-output'),
 		nodeParameters: () => cy.getByTestId('node-parameters'),
 		parameterInput: (parameterName: string) => cy.getByTestId(`parameter-input-${parameterName}`),
+		parameterInputIssues: (parameterName: string) =>
+			cy
+				.getByTestId(`parameter-input-${parameterName}`)
+				.should('have.length', 1)
+				.findChildByTestId('parameter-issues'),
 		parameterExpressionPreview: (parameterName: string) =>
 			this.getters
 				.nodeParameters()
-				.find(
-					`[data-test-id="parameter-input-${parameterName}"] + [data-test-id="parameter-expression-preview"]`,
-				),
+				.find(`[data-test-id="parameter-expression-preview-${parameterName}"]`),
 		nodeNameContainer: () => cy.getByTestId('node-title-container'),
 		nodeRenameInput: () => cy.getByTestId('node-rename-input'),
 		executePrevious: () => cy.getByTestId('execute-previous-node'),
@@ -51,11 +62,67 @@ export class NDV extends BasePage {
 		inputHoveringItem: () => this.getters.inputPanel().findChildByTestId('hovering-item'),
 		outputBranches: () => this.getters.outputPanel().findChildByTestId('branches'),
 		inputBranches: () => this.getters.inputPanel().findChildByTestId('branches'),
+		resourceLocator: (paramName: string) => cy.getByTestId(`resource-locator-${paramName}`),
+		resourceLocatorInput: (paramName: string) =>
+			this.getters.resourceLocator(paramName).find('[data-test-id="rlc-input-container"]'),
+		resourceLocatorDropdown: (paramName: string) =>
+			this.getters.resourceLocator(paramName).find('[data-test-id="resource-locator-dropdown"]'),
+		resourceLocatorErrorMessage: () => cy.getByTestId('rlc-error-container'),
+		resourceLocatorModeSelector: (paramName: string) =>
+			this.getters.resourceLocator(paramName).find('[data-test-id="rlc-mode-selector"]'),
+		resourceMapperFieldsContainer: () => cy.getByTestId('mapping-fields-container'),
+		resourceMapperSelectColumn: () => cy.getByTestId('matching-column-select'),
+		resourceMapperRemoveFieldButton: (fieldName: string) =>
+			cy.getByTestId(`remove-field-button-${fieldName}`),
+		resourceMapperColumnsOptionsButton: () =>
+			cy.getByTestId('columns-parameter-input-options-container'),
+		resourceMapperRemoveAllFieldsOption: () => cy.getByTestId('action-removeAllFields'),
+		sqlEditorContainer: () => cy.getByTestId('sql-editor-container'),
+		filterComponent: (paramName: string) => cy.getByTestId(`filter-${paramName}`),
+		filterCombinator: (paramName: string, index = 0) =>
+			this.getters.filterComponent(paramName).getByTestId('filter-combinator-select').eq(index),
+		filterConditions: (paramName: string) =>
+			this.getters.filterComponent(paramName).getByTestId('filter-condition'),
+		filterCondition: (paramName: string, index = 0) =>
+			this.getters.filterComponent(paramName).getByTestId('filter-condition').eq(index),
+		filterConditionLeft: (paramName: string, index = 0) =>
+			this.getters.filterComponent(paramName).getByTestId('filter-condition-left').eq(index),
+		filterConditionRight: (paramName: string, index = 0) =>
+			this.getters.filterComponent(paramName).getByTestId('filter-condition-right').eq(index),
+		filterConditionOperator: (paramName: string, index = 0) =>
+			this.getters.filterComponent(paramName).getByTestId('filter-operator-select').eq(index),
+		filterConditionRemove: (paramName: string, index = 0) =>
+			this.getters.filterComponent(paramName).getByTestId('filter-remove-condition').eq(index),
+		filterConditionAdd: (paramName: string) =>
+			this.getters.filterComponent(paramName).getByTestId('filter-add-condition'),
+		assignmentCollection: (paramName: string) =>
+			cy.getByTestId(`assignment-collection-${paramName}`),
+		assignmentCollectionAdd: (paramName: string) =>
+			this.getters.assignmentCollection(paramName).getByTestId('assignment-collection-drop-area'),
+		assignment: (paramName: string, index = 0) =>
+			this.getters.assignmentCollection(paramName).getByTestId('assignment').eq(index),
+		assignmentRemove: (paramName: string, index = 0) =>
+			this.getters.assignment(paramName, index).getByTestId('assignment-remove'),
+		assignmentName: (paramName: string, index = 0) =>
+			this.getters.assignment(paramName, index).getByTestId('assignment-name'),
+		assignmentValue: (paramName: string, index = 0) =>
+			this.getters.assignment(paramName, index).getByTestId('assignment-value'),
+		assignmentType: (paramName: string, index = 0) =>
+			this.getters.assignment(paramName, index).getByTestId('assignment-type-select'),
+		searchInput: () => cy.getByTestId('ndv-search'),
+		pagination: () => cy.getByTestId('ndv-data-pagination'),
+		nodeVersion: () => cy.getByTestId('node-version'),
+		nodeSettingsTab: () => cy.getByTestId('tab-settings'),
+		codeEditorFullscreenButton: () => cy.getByTestId('code-editor-fullscreen-button'),
+		codeEditorDialog: () => cy.getByTestId('code-editor-fullscreen'),
+		codeEditorFullscreen: () => this.getters.codeEditorDialog().find('.cm-content'),
+		nodeRunSuccessIndicator: () => cy.getByTestId('node-run-info-success'),
+		nodeRunErrorIndicator: () => cy.getByTestId('node-run-info-danger'),
 	};
 
 	actions = {
 		pinData: () => {
-			this.getters.pinDataButton().click();
+			this.getters.pinDataButton().click({ force: true });
 		},
 		editPinnedData: () => {
 			this.getters.editPinnedDataButton().click();
@@ -77,22 +144,40 @@ export class NDV extends BasePage {
 			this.getters.editPinnedDataButton().click();
 
 			this.getters.pinnedDataEditor().click();
-			this.getters.pinnedDataEditor().type(`{selectall}{backspace}`);
-			this.getters.pinnedDataEditor().type(JSON.stringify(data).replace(new RegExp('{', 'g'), '{{}'));
+			this.getters
+				.pinnedDataEditor()
+				.type(
+					`{selectall}{backspace}${JSON.stringify(data).replace(new RegExp('{', 'g'), '{{}')}`,
+					{
+						delay: 0,
+					},
+				);
+
+			this.actions.savePinnedData();
+		},
+		pastePinnedData: (data: object) => {
+			this.getters.editPinnedDataButton().click();
+
+			this.getters.pinnedDataEditor().click();
+			this.getters
+				.pinnedDataEditor()
+				.type('{selectall}{backspace}', { delay: 0 })
+				.paste(JSON.stringify(data));
 
 			this.actions.savePinnedData();
 		},
 		clearParameterInput: (parameterName: string) => {
 			this.getters.parameterInput(parameterName).type(`{selectall}{backspace}`);
 		},
-		typeIntoParameterInput: (parameterName: string, content: string) => {
-			this.getters.parameterInput(parameterName).type(content);
+		typeIntoParameterInput: (
+			parameterName: string,
+			content: string,
+			opts?: { parseSpecialCharSequences: boolean; delay?: number },
+		) => {
+			this.getters.parameterInput(parameterName).type(content, opts);
 		},
 		selectOptionInParameterDropdown: (parameterName: string, content: string) => {
-			this.getters.parameterInput(parameterName).find('.option-headline').contains(content).click();
-		},
-		dismissMappingTooltip: () => {
-			cy.getByTestId('dismiss-mapping-tooltip').click();
+			getVisibleSelect().find('.option-headline').contains(content).click();
 		},
 		rename: (newName: string) => {
 			this.getters.nodeNameContainer().click();
@@ -100,7 +185,7 @@ export class NDV extends BasePage {
 			cy.get('body').type('{enter}');
 		},
 		executePrevious: () => {
-			this.getters.executePrevious().click();
+			this.getters.executePrevious().click({ force: true });
 		},
 		mapDataFromHeader: (col: number, parameterName: string) => {
 			const draggable = `[data-test-id="ndv-input-panel"] [data-test-id="ndv-data-container"] table th:nth-child(${col})`;
@@ -127,15 +212,11 @@ export class NDV extends BasePage {
 		},
 		changeInputRunSelector: (runName: string) => {
 			this.getters.inputRunSelector().click();
-			cy.get('.el-select-dropdown:visible .el-select-dropdown__item')
-				.contains(runName)
-				.click();
+			getVisibleSelect().find('.el-select-dropdown__item').contains(runName).click();
 		},
 		changeOutputRunSelector: (runName: string) => {
 			this.getters.outputRunSelector().click();
-			cy.get('.el-select-dropdown:visible .el-select-dropdown__item')
-				.contains(runName)
-				.click();
+			getVisibleSelect().find('.el-select-dropdown__item').contains(runName).click();
 		},
 		toggleOutputRunLinking: () => {
 			this.getters.outputRunSelector().find('button').click();
@@ -146,8 +227,77 @@ export class NDV extends BasePage {
 		switchOutputBranch: (name: string) => {
 			this.getters.outputBranches().get('span').contains(name).click();
 		},
-		switchIntputBranch: (name: string) => {
+		switchInputBranch: (name: string) => {
 			this.getters.inputBranches().get('span').contains(name).click();
 		},
+		setRLCValue: (paramName: string, value: string) => {
+			this.getters.resourceLocatorModeSelector(paramName).click();
+			getVisibleSelect().find('li').last().click();
+			this.getters.resourceLocatorInput(paramName).type(value);
+		},
+		validateExpressionPreview: (paramName: string, value: string) => {
+			this.getters
+				.parameterExpressionPreview(paramName)
+				.find('span')
+				.should('include.html', asEncodedHTML(value));
+		},
+		refreshResourceMapperColumns: () => {
+			this.getters.resourceMapperSelectColumn().realHover();
+			this.getters
+				.resourceMapperSelectColumn()
+				.findChildByTestId('action-toggle')
+				.should('have.length', 1)
+				.click();
+
+			getVisiblePopper().find('li').last().click();
+		},
+		addFilterCondition: (paramName: string) => {
+			this.getters.filterConditionAdd(paramName).click({ force: true });
+		},
+		removeFilterCondition: (paramName: string, index: number) => {
+			this.getters.filterConditionRemove(paramName, index).click();
+		},
+		removeAssignment: (paramName: string, index: number) => {
+			this.getters.assignmentRemove(paramName, index).click();
+		},
+		setInvalidExpression: ({
+			fieldName,
+			invalidExpression,
+			delay,
+		}: {
+			fieldName: string;
+			invalidExpression?: string;
+			delay?: number;
+		}) => {
+			this.actions.typeIntoParameterInput(fieldName, '=');
+			this.actions.typeIntoParameterInput(fieldName, invalidExpression ?? "{{ $('unknown')", {
+				parseSpecialCharSequences: false,
+				delay,
+			});
+			this.actions.validateExpressionPreview(fieldName, `node doesn't exist`);
+		},
+		openSettings: () => {
+			this.getters.nodeSettingsTab().click();
+		},
+
+		openCodeEditorFullscreen: () => {
+			this.getters.codeEditorFullscreenButton().click({ force: true });
+		},
+		changeNodeOperation: (operation: string) => {
+			this.getters.parameterInput('operation').click();
+			cy.get('.el-select-dropdown__item')
+				.contains(new RegExp(`^${operation}$`))
+				.click({ force: true });
+			this.getters.parameterInput('operation').find('input').should('have.value', operation);
+		},
 	};
 }
+
+function asEncodedHTML(str: string): string {
+	return String(str)
+		.replace(/&/g, '&amp;')
+		.replace(/</g, '&lt;')
+		.replace(/>/g, '&gt;')
+		.replace(/"/g, '&quot;')
+		.replace(/ /g, '&nbsp;');
+}
diff --git a/cypress/pages/settings-log-streaming.ts b/cypress/pages/settings-log-streaming.ts
index b95fcb38bfa63..2d056a4444c04 100644
--- a/cypress/pages/settings-log-streaming.ts
+++ b/cypress/pages/settings-log-streaming.ts
@@ -1,4 +1,5 @@
 import { BasePage } from './base';
+import { getVisibleSelect } from '../utils';
 
 export class SettingsLogStreamingPage extends BasePage {
 	url = '/settings/log-streaming';
@@ -6,11 +7,9 @@ export class SettingsLogStreamingPage extends BasePage {
 		getActionBoxUnlicensed: () => cy.getByTestId('action-box-unlicensed'),
 		getActionBoxLicensed: () => cy.getByTestId('action-box-licensed'),
 		getDestinationModal: () => cy.getByTestId('destination-modal'),
-		getDestinationModalDialog: () => this.getters.getDestinationModal().find('.el-dialog'),
 		getSelectDestinationType: () => cy.getByTestId('select-destination-type'),
 		getDestinationNameInput: () => cy.getByTestId('subtitle-showing-type'),
-		getSelectDestinationTypeItems: () =>
-			this.getters.getSelectDestinationType().find('.el-select-dropdown__item'),
+		getSelectDestinationTypeItems: () => getVisibleSelect().find('.el-select-dropdown__item'),
 		getSelectDestinationButton: () => cy.getByTestId('select-destination-button'),
 		getContactUsButton: () => this.getters.getActionBoxUnlicensed().find('button'),
 		getAddFirstDestinationButton: () => this.getters.getActionBoxLicensed().find('button'),
diff --git a/cypress/pages/settings-personal.ts b/cypress/pages/settings-personal.ts
index a454837011a19..716625beb5ab6 100644
--- a/cypress/pages/settings-personal.ts
+++ b/cypress/pages/settings-personal.ts
@@ -1,20 +1,34 @@
 import { ChangePasswordModal } from './modals/change-password-modal';
+import { MfaSetupModal } from './modals/mfa-setup-modal';
 import { BasePage } from './base';
+import generateOTPToken from 'cypress-otp';
 
 const changePasswordModal = new ChangePasswordModal();
+const mfaSetupModal = new MfaSetupModal();
 
 export class PersonalSettingsPage extends BasePage {
 	url = '/settings/personal';
+	secret = '';
+
 	getters = {
 		currentUserName: () => cy.getByTestId('current-user-name'),
 		firstNameInput: () => cy.getByTestId('firstName').find('input').first(),
 		lastNameInput: () => cy.getByTestId('lastName').find('input').first(),
 		emailInputContainer: () => cy.getByTestId('email'),
 		emailInput: () => cy.getByTestId('email').find('input').first(),
-		changePasswordLink: () => cy.getByTestId('change-password-link').find('a').first(),
+		changePasswordLink: () => cy.getByTestId('change-password-link').first(),
 		saveSettingsButton: () => cy.getByTestId('save-settings-button'),
+		enableMfaButton: () => cy.getByTestId('enable-mfa-button'),
+		disableMfaButton: () => cy.getByTestId('disable-mfa-button'),
+		themeSelector: () => cy.getByTestId('theme-select'),
+		selectOptionsVisible: () => cy.get('.el-select-dropdown:visible .el-select-dropdown__item'),
 	};
 	actions = {
+		changeTheme: (theme: 'System default' | 'Dark' | 'Light') => {
+			this.getters.themeSelector().click();
+			this.getters.selectOptionsVisible().should('have.length', 3);
+			this.getters.selectOptionsVisible().contains(theme).click();
+		},
 		loginAndVisit: (email: string, password: string) => {
 			cy.signin({ email, password });
 			cy.visit(this.url);
@@ -25,7 +39,6 @@ export class PersonalSettingsPage extends BasePage {
 			this.getters.saveSettingsButton().realClick();
 		},
 		updatePassword: (oldPassword: string, newPassword: string) => {
-			this.getters.changePasswordLink().realClick();
 			changePasswordModal.getters.modalContainer().should('be.visible');
 			changePasswordModal.getters.currentPasswordInput().type('{selectall}').type(oldPassword);
 			changePasswordModal.getters.newPasswordInput().type('{selectall}').type(newPassword);
@@ -34,7 +47,10 @@ export class PersonalSettingsPage extends BasePage {
 		},
 		tryToSetWeakPassword: (oldPassword: string, newPassword: string) => {
 			this.actions.updatePassword(oldPassword, newPassword);
-			changePasswordModal.getters.newPasswordInputContainer().find('div[class^="_errorInput"]').should('exist');
+			changePasswordModal.getters
+				.newPasswordInputContainer()
+				.find('div[class^="_errorInput"]')
+				.should('exist');
 		},
 		updateEmail: (newEmail: string) => {
 			this.getters.emailInput().type('{selectall}').type(newEmail).type('{enter}');
@@ -48,5 +64,24 @@ export class PersonalSettingsPage extends BasePage {
 			this.actions.loginAndVisit(email, password);
 			cy.url().should('match', new RegExp(this.url));
 		},
+		enableMfa: () => {
+			cy.visit(this.url);
+			this.getters.enableMfaButton().click();
+			cy.wait('@getMfaQrCode');
+			mfaSetupModal.getters.copySecretToClipboardButton().should('be.visible');
+			mfaSetupModal.getters.copySecretToClipboardButton().realClick();
+			cy.readClipboard().then((secret) => {
+				const token = generateOTPToken(secret);
+
+				mfaSetupModal.getters.tokenInput().type(token);
+				mfaSetupModal.getters.downloadRecoveryCodesButton().should('be.visible');
+				mfaSetupModal.getters.downloadRecoveryCodesButton().click();
+				mfaSetupModal.getters.saveButton().click();
+			});
+		},
+		disableMfa: () => {
+			cy.visit(this.url);
+			this.getters.disableMfaButton().click();
+		},
 	};
 }
diff --git a/cypress/pages/settings-public-api.ts b/cypress/pages/settings-public-api.ts
new file mode 100644
index 0000000000000..1a7d668136775
--- /dev/null
+++ b/cypress/pages/settings-public-api.ts
@@ -0,0 +1,5 @@
+export const getPublicApiUpgradeCTA = () => cy.getByTestId('public-api-upgrade-cta');
+
+export const visitPublicApiPage = () => {
+	cy.visit('/settings/api');
+};
diff --git a/cypress/pages/settings-users.ts b/cypress/pages/settings-users.ts
index 41ae18711468f..e3c80e5bcc9c6 100644
--- a/cypress/pages/settings-users.ts
+++ b/cypress/pages/settings-users.ts
@@ -4,8 +4,8 @@ import { WorkflowPage } from './workflow';
 import { WorkflowsPage } from './workflows';
 import { BasePage } from './base';
 
-const workflowPage =  new WorkflowPage();
-const workflowsPage =  new WorkflowsPage();
+const workflowPage = new WorkflowPage();
+const workflowsPage = new WorkflowsPage();
 const mainSidebar = new MainSidebar();
 const settingsSidebar = new SettingsSidebar();
 
@@ -18,11 +18,17 @@ export class SettingsUsersPage extends BasePage {
 		inviteUsersModalEmailsInput: () => cy.getByTestId('emails').find('input').first(),
 		userListItems: () => cy.get('[data-test-id^="user-list-item"]'),
 		userItem: (email: string) => cy.getByTestId(`user-list-item-${email.toLowerCase()}`),
-		userActionsToggle: (email: string) => this.getters.userItem(email).find('[data-test-id="action-toggle"]'),
-		deleteUserAction: () => cy.getByTestId('action-toggle-dropdown').find('li:contains("Delete"):visible'),
+		userActionsToggle: (email: string) =>
+			this.getters.userItem(email).find('[data-test-id="action-toggle"]'),
+		userRoleSelect: (email: string) =>
+			this.getters.userItem(email).find('[data-test-id="user-role-select"]'),
+		deleteUserAction: () =>
+			cy.getByTestId('action-toggle-dropdown').find('li:contains("Delete"):visible'),
 		confirmDeleteModal: () => cy.getByTestId('deleteUser-modal').last(),
-		transferDataRadioButton: () => this.getters.confirmDeleteModal().find('[role="radio"]').first(),
-		deleteDataRadioButton: () => this.getters.confirmDeleteModal().find('[role="radio"]').last(),
+		transferDataRadioButton: () =>
+			this.getters.confirmDeleteModal().find('.el-radio .el-radio__input').first(),
+		deleteDataRadioButton: () =>
+			this.getters.confirmDeleteModal().find('.el-radio .el-radio__input').last(),
 		userSelectDropDown: () => this.getters.confirmDeleteModal().find('.n8n-select'),
 		userSelectOptions: () => cy.get('.el-select-dropdown:visible .el-select-dropdown__item'),
 		deleteUserButton: () => this.getters.confirmDeleteModal().find('button:contains("Delete")'),
diff --git a/cypress/pages/settings.ts b/cypress/pages/settings.ts
new file mode 100644
index 0000000000000..264b525dee717
--- /dev/null
+++ b/cypress/pages/settings.ts
@@ -0,0 +1,9 @@
+import { BasePage } from './base';
+
+export class SettingsPage extends BasePage {
+	url = '/settings';
+	getters = {
+		menuItems: () => cy.getByTestId('menu-item'),
+	};
+	actions = {};
+}
diff --git a/cypress/pages/sidebar/main-sidebar.ts b/cypress/pages/sidebar/main-sidebar.ts
index b86ed326f19bc..5379b1f889285 100644
--- a/cypress/pages/sidebar/main-sidebar.ts
+++ b/cypress/pages/sidebar/main-sidebar.ts
@@ -1,4 +1,7 @@
 import { BasePage } from '../base';
+import { WorkflowsPage } from '../workflows';
+
+const workflowsPage = new WorkflowsPage();
 
 export class MainSidebar extends BasePage {
 	getters = {
@@ -9,7 +12,9 @@ export class MainSidebar extends BasePage {
 		workflows: () => this.getters.menuItem('Workflows'),
 		credentials: () => this.getters.menuItem('Credentials'),
 		executions: () => this.getters.menuItem('Executions'),
-		userMenu: () => cy.getByTestId('main-sidebar-user-menu'),
+		adminPanel: () => this.getters.menuItem('Admin Panel'),
+		userMenu: () => cy.get('div[class="action-dropdown-container"]'),
+		logo: () => cy.getByTestId('n8n-logo'),
 	};
 	actions = {
 		goToSettings: () => {
@@ -24,11 +29,17 @@ export class MainSidebar extends BasePage {
 			this.getters.credentials().click();
 		},
 		openUserMenu: () => {
-			this.getters.userMenu().find('[role="button"]').last().click();
+			this.getters.userMenu().click();
+		},
+		openUserMenu: () => {
+			this.getters.userMenu().click();
 		},
 		signout: () => {
+			const workflowsPage = new WorkflowsPage();
+			cy.visit(workflowsPage.url);
 			this.actions.openUserMenu();
-			cy.getByTestId('workflow-menu-item-logout').click();
+			cy.getByTestId('user-menu-item-logout').click();
+			cy.wrap(Cypress.session.clearAllSavedSessions());
 		},
 	};
 }
diff --git a/cypress/pages/signin.ts b/cypress/pages/signin.ts
index b54a30173f6a5..1b2b35c22fbb4 100644
--- a/cypress/pages/signin.ts
+++ b/cypress/pages/signin.ts
@@ -1,4 +1,6 @@
+import { N8N_AUTH_COOKIE } from '../constants';
 import { BasePage } from './base';
+import { WorkflowsPage } from './workflows';
 
 export class SigninPage extends BasePage {
 	url = '/signin';
@@ -8,4 +10,32 @@ export class SigninPage extends BasePage {
 		password: () => cy.getByTestId('password'),
 		submit: () => cy.get('button'),
 	};
+
+	actions = {
+		loginWithEmailAndPassword: (email: string, password: string) => {
+			const signinPage = new SigninPage();
+			const workflowsPage = new WorkflowsPage();
+
+			cy.session(
+				[email, password],
+				() => {
+					cy.visit(signinPage.url);
+
+					this.getters.form().within(() => {
+						this.getters.email().type(email);
+						this.getters.password().type(password);
+						this.getters.submit().click();
+					});
+
+					// we should be redirected to /workflows
+					cy.url().should('include', workflowsPage.url);
+				},
+				{
+					validate() {
+						cy.getCookie(N8N_AUTH_COOKIE).should('exist');
+					},
+				},
+			);
+		},
+	};
 }
diff --git a/cypress/pages/signup.ts b/cypress/pages/signup.ts
deleted file mode 100644
index f647720ce4ef9..0000000000000
--- a/cypress/pages/signup.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { BasePage } from './base';
-
-// todo rename to setup
-export class SignupPage extends BasePage {
-	url = '/setup';
-	getters = {
-		form: () => cy.getByTestId('auth-form'),
-		email: () => cy.getByTestId('email'),
-		firstName: () => cy.getByTestId('firstName'),
-		lastName: () => cy.getByTestId('lastName'),
-		password: () => cy.getByTestId('password'),
-		submit: () => cy.get('button'),
-		skip: () => cy.get('a'),
-	};
-}
diff --git a/cypress/pages/template-collection.ts b/cypress/pages/template-collection.ts
new file mode 100644
index 0000000000000..9f3457eae97d2
--- /dev/null
+++ b/cypress/pages/template-collection.ts
@@ -0,0 +1,33 @@
+export function visitTemplateCollectionPage(withFixture: Fixture) {
+	cy.intercept(
+		'GET',
+		`https://api.n8n.io/api/templates/collections/${testData.ecommerceStarterPack.id}`,
+		{
+			fixture: withFixture.fixture,
+		},
+	).as('getTemplateCollection');
+
+	cy.visit(`/collections/${withFixture.id}`);
+
+	cy.wait('@getTemplateCollection');
+}
+
+export function clickUseWorkflowButtonByTitle(workflowTitle: string) {
+	cy.getByTestId('template-card')
+		.contains('[data-test-id=template-card]', workflowTitle)
+		.realHover({ position: 'center' })
+		.findChildByTestId('use-workflow-button')
+		.click({ force: true });
+}
+
+export type Fixture = {
+	id: number;
+	fixture: string;
+};
+
+export const testData = {
+	ecommerceStarterPack: {
+		id: 1,
+		fixture: 'Ecommerce_starter_pack_template_collection.json',
+	},
+};
diff --git a/cypress/pages/template-credential-setup.ts b/cypress/pages/template-credential-setup.ts
new file mode 100644
index 0000000000000..d673261fdf77b
--- /dev/null
+++ b/cypress/pages/template-credential-setup.ts
@@ -0,0 +1,70 @@
+import { CredentialsModal, MessageBox } from './modals';
+import * as formStep from '../composables/setup-template-form-step';
+import { overrideFeatureFlag } from '../composables/featureFlags';
+
+export type TemplateTestData = {
+	id: number;
+	fixture: string;
+};
+
+export const testData = {
+	simpleTemplate: {
+		id: 1205,
+		fixture: 'Test_Template_1.json',
+	},
+	templateWithoutCredentials: {
+		id: 1344,
+		fixture: 'Test_Template_2.json',
+	},
+};
+
+const credentialsModal = new CredentialsModal();
+const messageBox = new MessageBox();
+
+export const getters = {
+	continueButton: () => cy.getByTestId('continue-button'),
+	skipLink: () => cy.get('a:contains("Skip")'),
+	title: (title: string) => cy.get(`h1:contains(${title})`),
+	infoCallout: () => cy.getByTestId('info-callout'),
+};
+
+export const enableTemplateCredentialSetupFeatureFlag = () => {
+	overrideFeatureFlag('017_template_credential_setup_v2', true);
+};
+
+export const visitTemplateCredentialSetupPage = (templateId: number) => {
+	cy.visit(`templates/${templateId}/setup`);
+	enableTemplateCredentialSetupFeatureFlag();
+
+	formStep.getFormStep().eq(0).should('be.visible');
+};
+
+/**
+ * Fills in dummy credentials for the given app name.
+ */
+export const fillInDummyCredentialsForApp = (appName: string) => {
+	formStep.getCreateAppCredentialsButton(appName).click();
+	credentialsModal.getters.editCredentialModal().find('input:first()').type('test');
+	credentialsModal.actions.save(false);
+	credentialsModal.actions.close();
+};
+
+/**
+ * Fills in dummy credentials for the given app name. Assumes
+ * that a confirmation message box will be shown, which will be
+ * handled.
+ */
+export const fillInDummyCredentialsForAppWithConfirm = (appName: string) => {
+	fillInDummyCredentialsForApp(appName);
+	messageBox.actions.cancel();
+};
+
+/**
+ * Finishes the credential setup by clicking the continue button.
+ */
+export const finishCredentialSetup = () => {
+	cy.intercept('POST', '/rest/workflows').as('createWorkflow');
+	getters.continueButton().should('be.enabled');
+	getters.continueButton().click();
+	cy.wait('@createWorkflow');
+};
diff --git a/cypress/pages/template-workflow.ts b/cypress/pages/template-workflow.ts
new file mode 100644
index 0000000000000..d1e8630a12428
--- /dev/null
+++ b/cypress/pages/template-workflow.ts
@@ -0,0 +1,38 @@
+import { BasePage } from './base';
+
+export class TemplateWorkflowPage extends BasePage {
+	url = '/templates';
+
+	getters = {
+		useTemplateButton: () => cy.get('[data-test-id="use-template-button"]'),
+		description: () => cy.get('[data-test-id="template-description"]'),
+	};
+
+	actions = {
+		visit: (templateId: number) => {
+			cy.visit(`${this.url}/${templateId}`);
+		},
+
+		clickUseThisWorkflowButton: () => {
+			this.getters.useTemplateButton().click();
+		},
+
+		openTemplate: (template: {
+			workflow: {
+				id: number;
+				name: string;
+				description: string;
+				user: { username: string };
+				image: { id: number; url: string }[];
+			};
+		}, templateHost: string) => {
+			cy.intercept('GET', `${templateHost}/api/templates/workflows/${template.workflow.id}`, {
+				statusCode: 200,
+				body: template,
+			}).as('getTemplate');
+
+			this.actions.visit(template.workflow.id);
+			cy.wait('@getTemplate');
+		},
+	};
+}
diff --git a/cypress/pages/templates.ts b/cypress/pages/templates.ts
new file mode 100644
index 0000000000000..4c0225be48bbd
--- /dev/null
+++ b/cypress/pages/templates.ts
@@ -0,0 +1,63 @@
+import { BasePage } from './base';
+
+export class TemplatesPage extends BasePage {
+	url = '/templates';
+
+	getters = {
+		useTemplateButton: () => cy.getByTestId('use-template-button'),
+		templateCards: () => cy.getByTestId('template-card'),
+		firstTemplateCard: () => this.getters.templateCards().first(),
+		allCategoriesFilter: () => cy.getByTestId('template-filter-all-categories'),
+		searchInput: () => cy.getByTestId('template-search-input'),
+		categoryFilters: () => cy.get('[data-test-id^=template-filter]'),
+		categoryFilter: (category: string) => cy.getByTestId(`template-filter-${category}`),
+		collectionCountLabel: () => cy.getByTestId('collection-count-label'),
+		templateCountLabel: () => cy.getByTestId('template-count-label'),
+		templatesLoadingContainer: () => cy.getByTestId('templates-loading-container'),
+		expandCategoriesButton: () => cy.getByTestId('expand-categories-button'),
+	};
+
+	actions = {
+		openSingleTemplateView: (templateId: number) => {
+			cy.visit(`${this.url}/${templateId}`);
+			cy.waitForLoad();
+		},
+
+		openOnboardingFlow: (id: number, name: string, workflow: object, templatesHost: string) => {
+			const apiResponse = {
+				id,
+				name,
+				workflow,
+			};
+			cy.intercept('POST', '/rest/workflows').as('createWorkflow');
+			cy.intercept('GET', `${templatesHost}/api/workflows/templates/${id}`, {
+				statusCode: 200,
+				body: apiResponse,
+			}).as('getTemplate');
+			cy.intercept('GET', 'rest/workflows/**').as('getWorkflow');
+
+			cy.visit(`/workflows/onboarding/${id}`);
+
+			cy.wait('@getTemplate');
+			cy.wait(['@createWorkflow', '@getWorkflow']);
+		},
+
+		importTemplate: (id: number, name: string, workflow: object, templatesHost: string) => {
+			const apiResponse = {
+				id,
+				name,
+				workflow,
+			};
+			cy.intercept('GET', `${templatesHost}/api/workflows/templates/${id}`, {
+				statusCode: 200,
+				body: apiResponse,
+			}).as('getTemplate');
+			cy.intercept('GET', 'rest/workflows/**').as('getWorkflow');
+
+			cy.visit(`/workflows/templates/${id}`);
+
+			cy.wait('@getTemplate');
+			cy.wait('@getWorkflow');
+		},
+	};
+}
diff --git a/cypress/pages/variables.ts b/cypress/pages/variables.ts
index 721d874351cfe..6091e5cf1b54a 100644
--- a/cypress/pages/variables.ts
+++ b/cypress/pages/variables.ts
@@ -10,7 +10,7 @@ export class VariablesPage extends BasePage {
 		goToUpgrade: () => cy.getByTestId('go-to-upgrade'),
 		actionBox: () => cy.getByTestId('action-box'),
 		emptyResourcesListNewVariableButton: () => this.getters.emptyResourcesList().find('button'),
-		searchBar: () => cy.getByTestId('resources-list-search').find('input'),
+		searchBar: () => cy.getByTestId('resources-list-search'),
 		createVariableButton: () => cy.getByTestId('resources-list-add'),
 		variablesRows: () => cy.getByTestId('variables-row'),
 		variablesEditableRows: () =>
diff --git a/cypress/pages/workerView.ts b/cypress/pages/workerView.ts
new file mode 100644
index 0000000000000..e14bfd36a253b
--- /dev/null
+++ b/cypress/pages/workerView.ts
@@ -0,0 +1,15 @@
+import { BasePage } from './base';
+
+export class WorkerViewPage extends BasePage {
+	url = '/settings/workers';
+	getters = {
+		workerCards: () => cy.getByTestId('worker-card'),
+		workerCard: (workerId: string) => this.getters.workerCards().contains(workerId),
+		workerViewLicensed: () => cy.getByTestId('worker-view-licensed'),
+		workerViewUnlicensed: () => cy.getByTestId('worker-view-unlicensed'),
+		menuItems: () => cy.get('.el-menu-item'),
+		menuItem: () => this.getters.menuItems().get('#settings-workersview'),
+	};
+
+	actions = {};
+}
diff --git a/cypress/pages/workflow-executions-tab.ts b/cypress/pages/workflow-executions-tab.ts
index 4e641ae69a2e7..eb855f026f50a 100644
--- a/cypress/pages/workflow-executions-tab.ts
+++ b/cypress/pages/workflow-executions-tab.ts
@@ -1,5 +1,5 @@
-import { BasePage } from "./base";
-import { WorkflowPage } from "./workflow";
+import { BasePage } from './base';
+import { WorkflowPage } from './workflow';
 
 const workflowPage = new WorkflowPage();
 
@@ -14,10 +14,16 @@ export class WorkflowExecutionsTab extends BasePage {
 		failedExecutionListItems: () => cy.get('[data-test-execution-status="error"]'),
 		executionCard: (executionId: string) => cy.getByTestId(`execution-details-${executionId}`),
 		executionPreviewDetails: () => cy.get('[data-test-id^="execution-preview-details-"]'),
-		executionPreviewDetailsById: (executionId: string) => cy.getByTestId(`execution-preview-details-${executionId}`),
-		executionPreviewTime: () => this.getters.executionPreviewDetails().find('[data-test-id="execution-time"]'),
-		executionPreviewStatus: () => this.getters.executionPreviewDetails().find('[data-test-id="execution-preview-label"]'),
-		executionPreviewId: () => this.getters.executionPreviewDetails().find('[data-test-id="execution-preview-id"]'),
+		executionPreviewDeleteButton: () => cy.get('[data-test-id="execution-preview-delete-button"]'),
+		executionPreviewDetailsById: (executionId: string) =>
+			cy.getByTestId(`execution-preview-details-${executionId}`),
+		executionPreviewTime: () =>
+			this.getters.executionPreviewDetails().find('[data-test-id="execution-time"]'),
+		executionPreviewStatus: () =>
+			this.getters.executionPreviewDetails().find('[data-test-id="execution-preview-label"]'),
+		executionPreviewId: () =>
+			this.getters.executionPreviewDetails().find('[data-test-id="execution-preview-id"]'),
+		executionDebugButton: () => cy.getByTestId('execution-debug-button'),
 	};
 	actions = {
 		toggleNodeEnabled: (nodeName: string) => {
@@ -25,7 +31,7 @@ export class WorkflowExecutionsTab extends BasePage {
 			cy.get('body').type('d', { force: true });
 		},
 		createManualExecutions: (count: number) => {
-			for (let i=0; i<count; i++) {
+			for (let i = 0; i < count; i++) {
 				cy.intercept('POST', '/rest/workflows/run').as('workflowExecution');
 				workflowPage.actions.executeWorkflow();
 				cy.wait('@workflowExecution');
@@ -33,9 +39,15 @@ export class WorkflowExecutionsTab extends BasePage {
 		},
 		switchToExecutionsTab: () => {
 			this.getters.executionsTabButton().click();
+			cy.url().should('include', '/executions');
 		},
 		switchToEditorTab: () => {
 			workflowPage.getters.editorTabButton().click();
-		}
+			cy.url().should('match', /\/workflow\/[^\/]+$/);
+		},
+		deleteExecutionInPreview: () => {
+			this.getters.executionPreviewDeleteButton().click();
+			cy.get('button.btn--confirm').click();
+		},
 	};
-};
+}
diff --git a/cypress/pages/workflow-history.ts b/cypress/pages/workflow-history.ts
new file mode 100644
index 0000000000000..18cd6ed999235
--- /dev/null
+++ b/cypress/pages/workflow-history.ts
@@ -0,0 +1,7 @@
+import { BasePage } from "./base";
+
+export class WorkflowHistoryPage extends BasePage {
+    getters = {
+        workflowHistoryCloseButton: () => cy.getByTestId('workflow-history-close-button'),
+    }
+}
diff --git a/cypress/pages/workflow.ts b/cypress/pages/workflow.ts
index d42b2850c4e93..a3443c81b5941 100644
--- a/cypress/pages/workflow.ts
+++ b/cypress/pages/workflow.ts
@@ -1,6 +1,11 @@
 import { META_KEY } from '../constants';
 import { BasePage } from './base';
+import { getVisibleSelect } from '../utils';
+import { NodeCreator } from './features/node-creator';
 
+type CyGetOptions = Parameters<(typeof cy)['get']>[1];
+
+const nodeCreator = new NodeCreator();
 export class WorkflowPage extends BasePage {
 	url = '/workflow/new';
 	getters = {
@@ -12,11 +17,11 @@ export class WorkflowPage extends BasePage {
 		workflowTagsContainer: () => cy.getByTestId('workflow-tags-container'),
 		workflowTagsInput: () =>
 			this.getters.workflowTagsContainer().then(($el) => cy.wrap($el.find('input').first())),
-		tagPills: () => cy.get('[data-test-id="workflow-tags-container"] span.tags > span'),
+		tagPills: () => cy.get('[data-test-id="workflow-tags-container"] span.el-tag'),
 		nthTagPill: (n: number) =>
-			cy.get(`[data-test-id="workflow-tags-container"] span.tags > span:nth-child(${n})`),
+			cy.get(`[data-test-id="workflow-tags-container"] span.el-tag:nth-child(${n})`),
 		tagsDropdown: () => cy.getByTestId('workflow-tags-dropdown'),
-		tagsInDropdown: () => cy.getByTestId('workflow-tags-dropdown').find('li').filter('.tag'),
+		tagsInDropdown: () => getVisibleSelect().find('li').filter('.tag'),
 		createTagButton: () => cy.getByTestId('new-tag-link'),
 		saveButton: () => cy.getByTestId('workflow-save-button'),
 		nodeCreatorSearchBar: () => cy.getByTestId('node-creator-search-bar'),
@@ -25,6 +30,12 @@ export class WorkflowPage extends BasePage {
 		canvasNodes: () => cy.getByTestId('canvas-node'),
 		canvasNodeByName: (nodeName: string) =>
 			this.getters.canvasNodes().filter(`:contains(${nodeName})`),
+		nodeIssuesByName: (nodeName: string) =>
+			this.getters
+				.canvasNodes()
+				.filter(`:contains(${nodeName})`)
+				.should('have.length.greaterThan', 0)
+				.findChildByTestId('node-issues'),
 		getEndpointSelector: (type: 'input' | 'output' | 'plus', nodeName: string, index = 0) => {
 			return `[data-endpoint-name='${nodeName}'][data-endpoint-type='${type}'][data-input-index='${index}']`;
 		},
@@ -37,8 +48,11 @@ export class WorkflowPage extends BasePage {
 		canvasNodePlusEndpointByName: (nodeName: string, index = 0) => {
 			return cy.get(this.getters.getEndpointSelector('plus', nodeName, index));
 		},
-		successToast: () => cy.get('.el-notification .el-icon-success').parent(),
-		errorToast: () => cy.get('.el-notification .el-icon-error'),
+		successToast: () => cy.get('.el-notification:has(.el-notification--success)'),
+		warningToast: () => cy.get('.el-notification:has(.el-notification--warning)'),
+		errorToast: (options?: CyGetOptions) =>
+			cy.get('.el-notification:has(.el-notification--error)', options),
+		infoToast: () => cy.get('.el-notification:has(.el-notification--info)'),
 		activatorSwitch: () => cy.getByTestId('workflow-activate-switch'),
 		workflowMenu: () => cy.getByTestId('workflow-menu'),
 		firstStepButton: () => cy.getByTestId('canvas-add-button'),
@@ -61,6 +75,7 @@ export class WorkflowPage extends BasePage {
 		workflowMenuItemImportFromFile: () => cy.getByTestId('workflow-menu-item-import-from-file'),
 		workflowMenuItemSettings: () => cy.getByTestId('workflow-menu-item-settings'),
 		workflowMenuItemDelete: () => cy.getByTestId('workflow-menu-item-delete'),
+		workflowMenuItemGitPush: () => cy.getByTestId('workflow-menu-item-push'),
 		// Workflow settings dialog elements
 		workflowSettingsModal: () => cy.getByTestId('workflow-settings-dialog'),
 		workflowSettingsErrorWorkflowSelect: () => cy.getByTestId('workflow-settings-error-workflow'),
@@ -84,7 +99,8 @@ export class WorkflowPage extends BasePage {
 		duplicateWorkflowModal: () => cy.getByTestId('duplicate-modal'),
 		nodeViewBackground: () => cy.getByTestId('node-view-background'),
 		nodeView: () => cy.getByTestId('node-view'),
-		inlineExpressionEditorInput: () => cy.getByTestId('inline-expression-editor-input').find('[role=textbox]'),
+		inlineExpressionEditorInput: () =>
+			cy.getByTestId('inline-expression-editor-input').find('[role=textbox]'),
 		inlineExpressionEditorOutput: () => cy.getByTestId('inline-expression-editor-output'),
 		zoomInButton: () => cy.getByTestId('zoom-in-button'),
 		zoomOutButton: () => cy.getByTestId('zoom-out-button'),
@@ -92,10 +108,15 @@ export class WorkflowPage extends BasePage {
 		executeWorkflowButton: () => cy.getByTestId('execute-workflow-button'),
 		clearExecutionDataButton: () => cy.getByTestId('clear-execution-data-button'),
 		stopExecutionButton: () => cy.getByTestId('stop-execution-button'),
-		stopExecutionWaitingForWebhookButton: () => cy.getByTestId('stop-execution-waiting-for-webhook-button'),
+		stopExecutionWaitingForWebhookButton: () =>
+			cy.getByTestId('stop-execution-waiting-for-webhook-button'),
 		nodeCredentialsSelect: () => cy.getByTestId('node-credentials-select'),
+		nodeCredentialsCreateOption: () => cy.getByTestId('node-credentials-select-item-new'),
 		nodeCredentialsEditButton: () => cy.getByTestId('credential-edit-button'),
 		nodeCreatorItems: () => cy.getByTestId('item-iterator-item'),
+		nodeCreatorNodeItems: () => cy.getByTestId('node-creator-node-item'),
+		nodeCreatorActionItems: () => cy.getByTestId('node-creator-action-item'),
+		nodeCreatorCategoryItems: () => cy.getByTestId('node-creator-category-item'),
 		ndvParameters: () => cy.getByTestId('parameter-item'),
 		nodeCredentialsLabel: () => cy.getByTestId('credentials-label'),
 		getConnectionBetweenNodes: (sourceNodeName: string, targetNodeName: string) =>
@@ -109,18 +130,41 @@ export class WorkflowPage extends BasePage {
 		addStickyButton: () => cy.getByTestId('add-sticky-button'),
 		stickies: () => cy.getByTestId('sticky'),
 		editorTabButton: () => cy.getByTestId('radio-button-workflow'),
+		workflowHistoryButton: () => cy.getByTestId('workflow-history-button'),
+		colors: () => cy.getByTestId('color'),
+		contextMenuAction: (action: string) => cy.getByTestId(`context-menu-item-${action}`),
 	};
 	actions = {
-		visit: () => {
+		visit: (preventNodeViewUnload = true) => {
 			cy.visit(this.url);
 			cy.waitForLoad();
+			cy.window().then((win) => {
+				// @ts-ignore
+				win.preventNodeViewBeforeUnload = preventNodeViewUnload;
+			});
 		},
-		addInitialNodeToCanvas: (nodeDisplayName: string, { keepNdvOpen } = { keepNdvOpen: false }) => {
+		addInitialNodeToCanvas: (
+			nodeDisplayName: string,
+			opts?: { keepNdvOpen?: boolean; action?: string, isTrigger?: boolean},
+		) => {
 			this.getters.canvasPlusButton().click();
 			this.getters.nodeCreatorSearchBar().type(nodeDisplayName);
 			this.getters.nodeCreatorSearchBar().type('{enter}');
-			if (keepNdvOpen) return;
-			cy.get('body').type('{esc}');
+			if (opts?.action) {
+				const itemId = opts.isTrigger ? 'Triggers' : 'Actions';
+				// Expand actions category if it's collapsed
+				nodeCreator.getters
+					.getCategoryItem(itemId)
+					.parent()
+					.then(($el) => {
+						if ($el.attr('data-category-collapsed') === 'true') {
+							nodeCreator.getters.getCategoryItem(itemId).click();
+						}
+					});
+				nodeCreator.getters.getCreatorItem(opts.action).click();
+			} else if (!opts?.keepNdvOpen) {
+				cy.get('body').type('{esc}');
+			}
 		},
 		addNodeToCanvas: (
 			nodeDisplayName: string,
@@ -134,29 +178,94 @@ export class WorkflowPage extends BasePage {
 
 			this.getters.nodeCreatorSearchBar().type(nodeDisplayName);
 			this.getters.nodeCreatorSearchBar().type('{enter}');
-			cy.wait(500)
 			cy.get('body').then((body) => {
-				if(body.find('[data-test-id=node-creator]').length > 0) {
-					if(action) {
-						cy.contains(action).click()
+				if (body.find('[data-test-id=node-creator]').length > 0) {
+					if (action) {
+						cy.contains(action).click();
 					} else {
-						cy.getByTestId('item-iterator-item').eq(1).click()
+						// Select the first action
+						if (body.find('[data-keyboard-nav-type="action"]').length > 0) {
+							cy.get('[data-keyboard-nav-type="action"]').eq(0).click();
+						}
 					}
 				}
-			})
+			});
 
 			if (!preventNdvClose) cy.get('body').type('{esc}');
 		},
+		openContextMenu: (
+			nodeTypeName?: string,
+			method: 'right-click' | 'overflow-button' = 'right-click',
+		) => {
+			const target = nodeTypeName
+				? this.getters.canvasNodeByName(nodeTypeName)
+				: this.getters.nodeViewBackground();
+
+			if (method === 'right-click') {
+				target.rightclick(nodeTypeName ? 'center' : 'topLeft', { force: true });
+			} else {
+				target.realHover();
+				target.find('[data-test-id="overflow-node-button"]').click({ force: true });
+			}
+		},
 		openNode: (nodeTypeName: string) => {
 			this.getters.canvasNodeByName(nodeTypeName).first().dblclick();
 		},
+		duplicateNode: (nodeTypeName: string) => {
+			this.actions.openContextMenu(nodeTypeName);
+			this.actions.contextMenuAction('duplicate');
+		},
+		deleteNodeFromContextMenu: (nodeTypeName: string) => {
+			this.actions.openContextMenu(nodeTypeName);
+			this.actions.contextMenuAction('delete');
+		},
+		executeNode: (nodeTypeName: string) => {
+			this.actions.openContextMenu(nodeTypeName);
+			this.actions.contextMenuAction('execute');
+		},
+		addStickyFromContextMenu: () => {
+			this.actions.openContextMenu();
+			this.actions.contextMenuAction('add_sticky');
+		},
+		renameNode: (nodeTypeName: string) => {
+			this.actions.openContextMenu(nodeTypeName);
+			this.actions.contextMenuAction('rename');
+		},
+		copyNode: (nodeTypeName: string) => {
+			this.actions.openContextMenu(nodeTypeName);
+			this.actions.contextMenuAction('copy');
+		},
+		contextMenuAction: (action: string) => {
+			this.getters.contextMenuAction(action).click();
+		},
+		disableNode: (nodeTypeName: string) => {
+			this.actions.openContextMenu(nodeTypeName);
+			this.actions.contextMenuAction('toggle_activation');
+		},
+		pinNode: (nodeTypeName: string) => {
+			this.actions.openContextMenu(nodeTypeName);
+			this.actions.contextMenuAction('toggle_pin');
+		},
+		openNodeFromContextMenu: (nodeTypeName: string) => {
+			this.actions.openContextMenu(nodeTypeName, 'overflow-button');
+			this.actions.contextMenuAction('open');
+		},
+		selectAllFromContextMenu: () => {
+			this.actions.openContextMenu();
+			this.actions.contextMenuAction('select_all');
+		},
+		deselectAll: () => {
+			this.actions.openContextMenu();
+			this.actions.contextMenuAction('deselect_all');
+		},
 		openExpressionEditorModal: () => {
 			cy.contains('Expression').invoke('show').click();
 			cy.getByTestId('expander').invoke('show').click();
 		},
 		openTagManagerModal: () => {
 			this.getters.createTagButton().click();
-			this.getters.tagsDropdown().find('li.manage-tags').first().click();
+			this.getters.tagsDropdown().click();
+			getVisibleSelect().find('li.manage-tags').first().click();
 		},
 		openInlineExpressionEditor: () => {
 			cy.contains('Expression').invoke('show').click();
@@ -173,10 +282,11 @@ export class WorkflowPage extends BasePage {
 			this.getters.saveButton().should('contain', 'Save');
 			this.getters.saveButton().click();
 			this.getters.saveButton().should('contain', 'Saved');
+			cy.url().should('not.have.string', '/new');
 		},
 		saveWorkflowUsingKeyboardShortcut: () => {
 			cy.intercept('POST', '/rest/workflows').as('createWorkflow');
-			cy.get('body').type('{meta}', { release: false }).type('s');
+			cy.get('body').type(META_KEY, { release: false }).type('s');
 		},
 		deleteNode: (name: string) => {
 			this.getters.canvasNodeByName(name).first().click();
@@ -208,7 +318,7 @@ export class WorkflowPage extends BasePage {
 				this.getters.workflowTagsInput().type(tag);
 				this.getters.workflowTagsInput().type('{enter}');
 			});
-			cy.get('body').type('{enter}');
+			cy.realPress('Tab');
 			// For a brief moment the Element UI tag component shows the tags as(+X) string
 			// so we need to wait for it to disappear
 			this.getters.workflowTagsContainer().should('not.contain', `+${tags.length}`);
@@ -216,6 +326,18 @@ export class WorkflowPage extends BasePage {
 		zoomToFit: () => {
 			cy.getByTestId('zoom-to-fit').click();
 		},
+		pinchToZoom: (steps: number, mode: 'zoomIn' | 'zoomOut' = 'zoomIn') => {
+			// Pinch-to-zoom simulates a 'wheel' event with ctrlKey: true (same as zooming by scrolling)
+			this.getters.nodeViewBackground().trigger('wheel', {
+				force: true,
+				bubbles: true,
+				ctrlKey: true,
+				pageX: cy.window().innerWidth / 2,
+				pageY: cy.window().innerHeight / 2,
+				deltaMode: 1,
+				deltaY: mode === 'zoomOut' ? steps : -steps,
+			});
+		},
 		hitUndo: () => {
 			cy.get('body').type(META_KEY, { delay: 500, release: false }).type('z');
 		},
@@ -229,25 +351,40 @@ export class WorkflowPage extends BasePage {
 			cy.get('body').type(META_KEY, { delay: 500, release: false }).type('a');
 		},
 		hitDisableNodeShortcut: () => {
-			cy.get('body').type(META_KEY, { delay: 500, release: false }).type('d');
+			cy.get('body').type('d');
 		},
 		hitCopy: () => {
 			cy.get('body').type(META_KEY, { delay: 500, release: false }).type('c');
 		},
-		hitPaste: () => {
-			cy.get('body').type(META_KEY, { delay: 500, release: false }).type('P');
+		hitPinNodeShortcut: () => {
+			cy.get('body').type('p');
+		},
+		hitExecuteWorkflowShortcut: () => {
+			cy.get('body').type(META_KEY, { delay: 500, release: false }).type('{enter}');
+		},
+		hitDuplicateNodeShortcut: () => {
+			cy.get('body').type(META_KEY, { delay: 500, release: false }).type('d');
+		},
+		hitAddStickyShortcut: () => {
+			cy.get('body').type('{shift}', { delay: 500, release: false }).type('S');
 		},
 		executeWorkflow: () => {
 			this.getters.executeWorkflowButton().click();
 		},
-		addNodeBetweenNodes: (sourceNodeName: string, targetNodeName: string, newNodeName: string) => {
+		addNodeBetweenNodes: (
+			sourceNodeName: string,
+			targetNodeName: string,
+			newNodeName: string,
+			action?: string,
+		) => {
 			this.getters.getConnectionBetweenNodes(sourceNodeName, targetNodeName).first().realHover();
 			this.getters
 				.getConnectionActionsBetweenNodes(sourceNodeName, targetNodeName)
 				.find('.add')
 				.first()
 				.click({ force: true });
-			this.actions.addNodeToCanvas(newNodeName, false);
+
+			this.actions.addNodeToCanvas(newNodeName, false, false, action);
 		},
 		deleteNodeBetweenNodes: (
 			sourceNodeName: string,
@@ -266,36 +403,40 @@ export class WorkflowPage extends BasePage {
 			this.getters.addStickyButton().click();
 		},
 		deleteSticky: () => {
-			this.getters.stickies().eq(0)
-				.realHover()
-				.find('[data-test-id="delete-sticky"]')
-				.click();
+			this.getters.stickies().eq(0).realHover().find('[data-test-id="delete-sticky"]').click();
 		},
-		editSticky: (content: string) => {
-			this.getters.stickies()
-				.dblclick()
-				.find('textarea')
-				.clear()
-				.type(content)
-				.type('{esc}');
-		},
-		turnOnManualExecutionSaving: () => {
-			this.getters.workflowMenu().click();
-			this.getters.workflowMenuItemSettings().click();
-			cy.get('.el-loading-mask').should('not.be.visible');
+		toggleColorPalette: () => {
 			this.getters
-				.workflowSettingsSaveManualExecutionsSelect()
-				.find('li:contains("Yes")')
+				.stickies()
+				.eq(0)
+				.realHover()
+				.find('[data-test-id="change-sticky-color"]')
 				.click({ force: true });
-
-			this.getters.workflowSettingsSaveManualExecutionsSelect().should('contain', 'Yes');
-			this.getters.workflowSettingsSaveButton().click();
-			this.getters.successToast().should('exist');
-
-			this.getters.workflowMenu().click();
-			this.getters.workflowMenuItemSettings().click();
-			this.getters.workflowSettingsSaveManualExecutionsSelect().should('contain', 'Yes');
-			this.getters.workflowSettingsSaveButton().click();
+		},
+		pickColor: (index: number) => {
+			this.getters.colors().eq(1).click();
+		},
+		editSticky: (content: string) => {
+			this.getters.stickies().dblclick().find('textarea').clear().type(content).type('{esc}');
+		},
+		clearSticky: () => {
+			this.getters.stickies().dblclick().find('textarea').clear().type('{esc}');
+		},
+		shouldHaveWorkflowName: (name: string) => {
+			this.getters.workflowNameInputContainer().invoke('attr', 'title').should('include', name);
+		},
+		testLassoSelection: (from: [number, number], to: [number, number]) => {
+			cy.getByTestId('node-view-wrapper').trigger('mousedown', from[0], from[1], { force: true });
+			cy.getByTestId('node-view-wrapper').trigger('mousemove', to[0], to[1], { force: true });
+			cy.get('#select-box').should('be.visible');
+			cy.getByTestId('node-view-wrapper').trigger('mouseup', to[0], to[1], { force: true });
+			cy.get('#select-box').should('not.be.visible');
+		},
+		getNodePosition: (node: Cypress.Chainable<JQuery<HTMLElement>>) => {
+			return node.then(($el) => ({
+				left: +$el[0].style.left.replace('px', ''),
+				top: +$el[0].style.top.replace('px', ''),
+			}));
 		},
 	};
 }
diff --git a/cypress/pages/workflows.ts b/cypress/pages/workflows.ts
index 4a30b92ecbdc2..56a3c44923170 100644
--- a/cypress/pages/workflows.ts
+++ b/cypress/pages/workflows.ts
@@ -5,7 +5,7 @@ export class WorkflowsPage extends BasePage {
 	getters = {
 		newWorkflowButtonCard: () => cy.getByTestId('new-workflow-card'),
 		newWorkflowTemplateCard: () => cy.getByTestId('new-workflow-template-card'),
-		searchBar: () => cy.getByTestId('resources-list-search').find('input'),
+		searchBar: () => cy.getByTestId('resources-list-search'),
 		createWorkflowButton: () => cy.getByTestId('resources-list-add'),
 		workflowCards: () => cy.getByTestId('resources-list-item'),
 		workflowCard: (workflowName: string) =>
@@ -23,9 +23,24 @@ export class WorkflowsPage extends BasePage {
 			this.getters.workflowCard(workflowName).findChildByTestId('workflow-card-actions'),
 		workflowDeleteButton: () =>
 			cy.getByTestId('action-toggle-dropdown').filter(':visible').contains('Delete'),
+		workflowFilterButton: () => cy.getByTestId('resources-list-filters-trigger').filter(':visible'),
+		workflowTagsDropdown: () => cy.getByTestId('tags-dropdown'),
+		workflowTagItem: (tag: string) => cy.getByTestId('tag').contains(tag),
+		workflowStatusDropdown: () => cy.getByTestId('status-dropdown'),
+		workflowStatusItem: (status: string) => cy.getByTestId('status').contains(status),
+		workflowOwnershipDropdown: () => cy.getByTestId('user-select-trigger'),
+		workflowOwner: (email: string) => cy.getByTestId('user-email').contains(email),
+		workflowResetFilters: () => cy.getByTestId('workflows-filter-reset'),
 		// Not yet implemented
 		// myWorkflows: () => cy.getByTestId('my-workflows'),
 		// allWorkflows: () => cy.getByTestId('all-workflows'),
+		suggestedTemplatesPageContainer: () => cy.getByTestId('suggested-templates-page-container'),
+		suggestedTemplatesCards: () => cy.get('.agile__slides--regular [data-test-id=templates-info-card]'),
+		suggestedTemplatesNewWorkflowButton: () => cy.getByTestId('suggested-templates-new-workflow-button'),
+		suggestedTemplatesSectionContainer: () => cy.getByTestId('suggested-templates-section-container'),
+		suggestedTemplatesPreviewModal: () => cy.getByTestId('suggested-templates-preview-modal'),
+		suggestedTemplatesUseTemplateButton: () => cy.getByTestId('use-template-button'),
+		suggestedTemplatesSectionDescription: () => cy.getByTestId('suggested-template-section-description'),
 	};
 
 	actions = {
@@ -36,8 +51,10 @@ export class WorkflowsPage extends BasePage {
 			cy.visit(this.url);
 			this.getters.workflowCardActions(name).click();
 			this.getters.workflowDeleteButton().click();
+			cy.intercept('DELETE', '/rest/workflows/*').as('deleteWorkflow');
 
 			cy.get('button').contains('delete').click();
+			cy.wait('@deleteWorkflow');
 		},
 	};
 }
diff --git a/cypress/support/binaryTestFiles.ts b/cypress/support/binaryTestFiles.ts
index bb42cd2101ca8..4dc9919549627 100644
--- a/cypress/support/binaryTestFiles.ts
+++ b/cypress/support/binaryTestFiles.ts
@@ -1 +1,2 @@
-export const cowBase64 = "iVBORw0KGgoAAAANSUhEUgAAAHAAAABwCAMAAADxPgR5AAAACGFjVEwAAAAYAAAAANndHFMAAABmUExURf//////7PXszYl3WeXUqT03GmxYPEdEMbOafEc5J1lHMHZkR/Olptl7fP+9vc9dX5SJe4BqT//X1+vZrCsnEk9AK//99q2bfvrv1P/OzllHL8K6pX5sT+vdw/r04puJbPvpzOPOqsQreYIAAAABdFJOUwBA5thmAAAAGmZjVEwAAAAAAAAAcAAAAHAAAAAAAAAAAAAKAGQBAGZ29oAAAAGhSURBVGje7dhdT8JAEIVhCwti+UZDMPz//+mcpCfZTDqsGjsl5rw3pc3OPDcQ0Bf1PzpZ/tmba/Mgv0tgHsgDN+s0dLcA9K5rUGcB5Tx3CcwF363bELF11dbqHgS4WJjHLoHzgAxgDaGz1TXivMBckAFhvVVDxFrdLUCIuwTmgHyTMICEPoa4lPfRh3/twm6BOWBfVSwO/BTsXQJzQKIIWPfLiHIXMYE5INpYNbhvFKGLKuwUmA8S+xy6uPg8QgF5VGAueLSw8DCExfWV4QzOekzgc4CHb0awxiJUYC64s1oYzhDEHObH4GIJnBYkdrUcGkasIGIu7kK9JTAHJIqOjQgRi8D6D12B04FL6+oiHhdjBM/W1hKYAxbLg6VRBBZL4Dzga9XKaoE442eI4SowDyT6FyAxgfOAK1Zh+6Aa9TMCc0GP8jCxSxDROoHPBRI7BBFduDwKTGAeSJQg/7mwYyP3Hi0jCcwFiRLE1QMRWIKICUwCPeqKMH6B+x9ZeI59AjPB+M3jXy+HuHTshzGeC5wP5BIs5zBet84z3AucHPwCGDJBQOajSuoAAAAaZmNUTAAAAAEAAABsAAAAZAAAAAAAAAAMAAoAZAEABzCnYQAAAYFmZEFUAAAAAmje7djbbsIwEIRhAoGGcAq0qqh4//fsjuSRrJUdt2o2vZn/JgTs/W5COGzQZG1cR9cw04ZxViVhy2B48WlNqZeF4aPrs1JnAeR+zhIWi71bzxShQ9bJ6mYC2lvYj1nC1sEYsBxBd6trxP3CYjEGgI1WjhBq9bKmFGcJi8F4QTBgRD5SHMjz2hv74MJsYTHYmNVbXPxbbHQJi8EIIkDdHwJ4zNpagyVsWYwNVo5dGtXAbaHREhaHEfpKPVx83oFNDAmLwW4Whl1TGJofGdZgbQs6pITFYtcfRqwG3a2TJSweO1stCGuIlT50ha2DObAaIawlJGx9bGdhI9FbI67FYGH/iLmGZnUM+4Wtg71l7a2+EdaU9gyWsFiM4BIYb+j8kiosFtuzDLpUykHWFxIWh/kbMqFHJYJz5X+WCYvHCF0rEdy6hK2LESTGH4ZnVjgnWMIICYvFCBLjEdXO5yBhAVgLdHlolyp9+REWjbUvFP/Yr9+nCAlbHPsG9holMHgtc1IAAAAaZmNUTAAAAAMAAABwAAAAYAAAAAAAAAAQAAoAZAEAMy/MPAAAAYNmZEFUAAAABGje7dbbbsIwEIRh0nJKyiHQqqLi/d+zO5JHWq3suEUy5mL+G0jw7sdFkFih2VqFxtB+oRXjroUEPgRWsZs1p+4WgCn0XWiwgHKeuwQ+F/y0biliW9eHNSwEeG1hHruwc0oJfB7IAHoIXayhEucJchZ7AAtsA7LRNVkeIlbrbs0p7oqowDagf0j4AaGvFJfyuvTj34aI+t0C24CTa23xwH/BKYTdFwuowHYgGlPAhgcjOrpwT2B7kO0tDx4rldA3F/YBJCrwOSCxn9Q1xPsl1GMxGALbg2cLC08pLPavDGdwNmICXwM8/TGCxAS+DniwahjOEMQckMElsA8Y0GLE/CIP4lpgH5A30bkSzxET2B98t3IH1pUIRUxgP3Dn2lh+4JgJZ/x5tIQJbAcSjaDHrpkIMoH9wQ3LYKdCcWYfIiawKVj8AgT55/jAMtc4h5ncgySwD8hBgnxFpWs/i4gJ7ACGQS7PRqyQwH5gzD88/j0xga8PEs29F9gN/AXtWh/wZnKszAAAABpmY1RMAAAABQAAAHAAAABYAAAAAAAAABQACgBkAAAwn8ZCAAABZmZkQVQAAAAGaN7t09tuwjAQhGFCAsThlJaKUvX937M70o60WuE4UjHJxf43ELDnu4FNruTqC21mFmAdcJQ8NrjumRoNaJKwlUwB1gWJPaRRI+ZrMhHjfW7tpaNEOMC64E16aAT3Gi9OgXepk3AfW9jEHbuB3QDrgCi5LIQ+pKbQzcQf39E0SEkK8PUgAYYvLESs1K80atzxaID1wMHUScS/NI7yOffntzsE7W4vBfh6ECWtk3B5DphDk6kzBVgPZHgg+J+2GrYCXBY8FwpwvSCxH+3Txc+JeizA5cGrhMGLhmH7ynAGZy0W4HrAy8wIcizA9YAnqYThDM5aLMBlQaKI6FQe81CA7wWJ8YtWuhbqNT9qNwJ8P7g1uQvZ0e2TvqWddDDhOcD6IAbsoVbLgpofzoFwAqwDMh7yB9tMZ2lqeGfCc4B1QX/IH8T4KdOc4QBrguU8ilf/nmcCXDdI9Nn7ABcD/wCp0/cxvYy6+wAAABpmY1RMAAAABwAAAGgAAABgAAAACAAAAAwACgBkAAAqNm2eAAABY2ZkQVQAAAAIaN7t1l1Pg0AQhWERhJZqix/BGv///3ROsifZbBiHwJJoct4LK+3MPDe96IPXyWkM8u4JqgcRaZz6IIKCjoPORaegixMwQXUhImPR7NSkiE3WEiZoPzSliJQ1TkS4f7fw+prVW5gRtA+6pwj1WRfrN2i2Ogv77xYhIo+WoP0QAJYDCAtNEADGLxURREzQdij/UZEDRKK+rSnFW8AE1YPGLAJcWAPN1lgkqC6EN7sUgY8Uj2XPLnZmBYK7gvZB+IMHLMSQX35c0FFQnKC/Ab0EeYig4yEiX6m3Ir5PbC0iqB50s3DomsLB/JVhBrNAeGQJaS1B9aHryjC7BhFUB0L4B8vPVoRgBrMRIqgehA84RMyLCA8sIU/WUCSoDsTBW5CHoE+rhPiNE1QHItYFYcaDcBMYw7OgfRCxIatNuVBqKOLhPEF1IAwsLbVO3BFUHQoxxoUtO4K2Qepf9wPZWfDxej6GtgAAABpmY1RMAAAACQAAAHAAAABgAAAAAAAAAAwACgBkAABnZZsIAAABZGZkQVQAAAAKaN7t0tFKw0AQheHGpGkTtU1Vkooo+P4v6RyYA8uQ7AZhN1HmvylJd8930R68/995pn5FDm4PEqtmaldE2MHtwM50TvS4EGEH84KDZLHeNC5UaUSxFYI3DRsOZgAVu0uDRsxWRQLG+9wKsVZ6kHDOwTzgq3TXCLZBuBwDR6mRcB9b2LSYg/lA1JlCiD9+lQgQ45+PmIN5QX7BeimEiKX6kAaNW9h2sAzYmwjx4hpwlOyOg2VA1GmNRuhN4yifYyi3iDmYH2R4AIaLSTCSRVCjOVgKTOfg3wCfEy1hDm4PEnvXXkx8TzTEHNwHeJUweNEwHH4ynMFZYBxzcD/gZWU4G8NqaZJO2lFyMB9IFCNPUgrDGZyNYYQcLAdO0qdEdCli39IShj0AjJiDZcAv6Zpo0uZAvD/M5GBZENVSE8nB/YFH6WRKoXN38M7BfYC8XEdycEcgUdNv7zhYDPwBnsUNoDMUs3kAAAAaZmNUTAAAAAsAAABwAAAAZAAAAAAAAAAMAAoAZAAAAI8tggAAAX5mZEFUAAAADGje7dPJbsJAEIRhHLM5JICSSBCykfd/yVRJU9KoZbutoBlz6P9iPEt/F7MYa9vT44TGZgZYBxTW9MSB65FyOMCaoI8pDd4NZPEOBXhfoDAPtGiA9UBhnWnrJKAP5LNDAZYDjygHuXkxNU5COSvAuuAPOqNjSpjNw3Rfs/pA/g6wDPiKzimB66wdapyWiPc5y4Id4n6AZUDWmXKIfSIPJKQE6oMJsCwoQF1QDgnz+kCEhjC2RQGWAS8mQetUMzEiStgDCrAsyLqUNgS9pTTQvPemWcICLA8qvnCxQbeAVyQowJnAGyMQ4H2Az05TsBZtslYowPKgsPfUi0nrFiVgIxJgffCAOHCf4uD8qXiGZ4npT51jV0RACQuwDrifGM8OYSe0MAVYDlQ8xCFPyMN4hmctxloU4HzgFxI6lLBfJMSCnBfgfOA3OjidUn0g1wOcH2QtWjpZjPcCnA9coY3JQ/vucC3A+wG51o4UYHXQR03/vRNgNfAPiAUqMD2IFBoAAAAaZmNUTAAAAA0AAABwAAAAYAAAAAAAAAAIAAoAZAEAim0vyQAAAWlmZEFUAAAADmje7dbLbsJADIXhJkBKoAVaWkHT+/u/ZH0kH8kakXEQzSQL/5soxPa35W5IiyvL3QqwLEisMrXSqxPhAKcAfWwzIKC1RDjA0qCPNZnsDHdxK8B5gBbb9oRvAZYEfazWCGYwFw2wPEiMILEA5w0Sa5PWPT1pjSnA8uBBsiCALqlyAg4Aty6BSwm3A/x/8Fs6SweNWJqHcZ+3AiwLHqWzRrAxbaUcyIPYxy0L8luA44GoTbIQ+pA88KgRJBbg+CAB1kkWIub1LgGyWAqupADHAbskQo1WDWyjVUkL6V4KcBwQtdpSI/SicdG8ZwuwLMjWEjAM3ArWUooFWBB087EUBEQswHLgo1MOQ8SsEWAZkNib9pzE34laLMB5gHsJB3caDtsnwwxm+UcX+xYkFuA04G5gmL2E/UgBlgXZScKRB8nDMINZYjZiAU4DfkpE+yL2KwEIcD7gSgL4Je2dTlqAk4N/NLUPYOlyoTgAAAAaZmNUTAAAAA8AAABwAAAAbAAAAAAAAAAEAAoAZAABi7I+ZwAAAXpmZEFUAAAAEGje7dddS8NAEIVhE/qRtlpTq1ijoP7/P+kc2APDwmZDanZbOO9NSJmd52ZL6cNY7zMb2ylwVrOhZmY8L7AOmIN21lsmzLUWYYElwOnYfkJAAfpLJHAJcD62GcnP8CxRgfVBjx0SEcWztQSWAYlNAz2WRwXeFkhM4P2CWHYaSeB9g0xgfbCzCPi6TFhOVGB5sLc8CGCIajIRTYFrS+Ay4Ld1sfoQsbgcxvPY5TG2tYAKXAY8W5cQwY3rYDWZVhbOYxcvocAyINpFeQh9WTnwHBJYHiTABstDxHJ9Wn0Ie/ijS0zgsuAQRWgTaia2d+GdKCDeUIH/DxJFqxCh1xAPu/dk3OVBOgKXAVlnAcPQNeCP1VoCK4JX1oY8JrAO+JQphQmsDxL7CL1E8fMYbaOICSwPPltYeAxhsX8yzGCWf0ZxXuDtgMeJYXYME1gOZGsLSx6tHIYZzALbRmGPwDogI5qK2K+V2iGwJujhdPxyC6wO/gEmzFlgUTP51wAAABpmY1RMAAAAEQAAAHAAAABwAAAAAAAAAAAACgBkAADlbKtZAAABfGZkQVQAAAASaN7t2l1rwkAQhWFXk5qkH1ZspdD//z87BzLMELLZRZpZL857I8rmPAQUcuEh1+mBDhUR3Bs0LD2QwgTbgmWsHia4AxiAaUcJewSfDxyl70IKKkowAqzHpoqAAvMowfagx1428mcIxoH1XxjDXjMpqmAnEYwHjysZaFgNSjASNCgHKkbwOcE8ZSDGrhvlQNRLBGPBcdFQSNEceJaAEowB1x54k3RfKc15lGBbMPfAa+P5gBJsA366AK497G5Bd8lveIzg/iAO3KSfOYAAfFcpFcIorscWNj14kvTuCO4Djq5JMkgrgzeXbnoQFsF9QP2hawAVMazcrwQI6Ra2FSO4Lzi5OkkhvTBVNi0iGAEaioAlSaGvOR209/mw4/cIxoD4cJD+Azy6FCMYD5YrY9gi2BZ8L1SLEWwDXqSPQh7tFmGLYCzoUWBvkh+2VwtncHZY5DGCkaChCpZSMPfHVoLxYD1q2NnlNwi2BVEvXQr1iwg2A/8A0+MHMIo5vtgAAAAaZmNUTAAAABMAAABwAAAAcAAAAAAAAAAAAAoAZAAACPp4sAAAAWVmZEFUAAAAFGje7dTbasMwEITh2HFSH9qmJS0U+v7v2R3wwCJQpNBqlcL8N8YgzXdlH251rOxwRwIDQAcNlXlcYH+wAFXjAv8v6GGBDcAgzKMCHw9crM9CODfuYVNgBFiPrRUBFdgTLGPnG/kzAPkDENgHHF0APbZlIurBJ+tkCWwHEkuhDOiwMkqQqMC2ILEcSEzgY4LE/hrEXYECBdaBI2oATpbHBMaBS9JcUQ6kIzAGJHZOGioi6kFsC2wPvrkAEtlcNSA3BMaBxK7W195ibUnvVgmbLNzHFjbXPYEx4JLkIFYEry5uCowB0x81DgGoxdi35T98hG2BMeDqmixCvDhUtiZhG4bAtiBRBAwXCX3scdC9Z+MW9wTGgEdrtn4Dji7s8IMXGAMSJXhvRNhsCewD4uDFerZeC+EMzqaQxwTGgkQJshfLPxlBAoyYwEiwjLIUI3ByYUNgX5AXL4U8IrAr+APL+PChFMmrngAAABpmY1RMAAAAFQAAAHAAAABwAAAAAAAAAAAACgBkAgDXBmhIAAABUmZkQVQAAAAWaN7t2tFqwzAMheF5TdM43UhLNxjs/d9zEshImLrWLiJ34/w3IZDou7IxIS/of3dwBjAa9EPJmcUBjgc7kBsHGA/6MT8M8M+CikoAdwADsBoG+Bzg6y9KppMEMAB0AJn67NQCjxTAfUDFFGphq6OCcgAjQT82P8g+AzAaVKwNKnZuVNACcnbzBjgetJgXLYcogPuCbUpBxfzgRAEECHAsWDCAY8BsWjoBfCZQsdmUOhUY4BjwUnVvkSdHFwlgFKjYjfqSGDtXXakeNlH8Ps/imasEMAbMVQpJDvBmKjMBxoB2k7YL1pYcfVN24XOZAhgDrqZEXSUFfa1VmWID4H6gopoFP6Qk2Xtb6/A8UQAjQD0ML1SiZskDTqZF4lnlgzrAKFDR5KzG7v0gCTAaVHSj3qR3Sq/aRi2mUxXAceBR2jodqmqQZwAMAX8AyIHYEYSizPYAAAAaZmNUTAAAABcAAABwAAAAcAAAAAAAAAAAAAoAZAEAEb3oYgAAAU5mZEFUAAAAGGje7drRaoNAEIXhpjG1mpakpIFC3/89uwO7nMOA3WxgVhPOf6PC7nxeCIL4op67fUMCtwQC2jXEuMB1QUD3x/CBEhgABmAeHilDBT4SCFRgKBiKMSrwkUGg5giMAIEJfH7wtSG/T2AvsA5MqWslXi+wP+ghj8035FGBfcAW7O2feI3AvuASxCBjx4UKyuCQErglkLE6KnBbYMFaQMMErgdO1HulZRCYwH4gHhK0q1RggeuDjLWADAvsDQL12JG6FyyYwFjwTBkIpg0sMwT2AoFdUj85W8jQV66GDSnbb7Ns5pwT2AecXIzdCl6oMtNAMwTGgv5la9dgUO3j+2/qnONZh5TAeHCm+Aa4JWzI2fnsEhgPAkUe/M4VgK8HqnyEnagxJbAPiHADp9RH7jOFI7I1hvgf58acwLVAdKq0tM//ACkwFPwDOBHMwXcQBKYAAAAaZmNUTAAAABkAAABsAAAAaAAAAAAAAAAIAAoAZAEAt0Hv/AAAASJmZEFUAAAAGmje7drBCoMwEEVRra1trKDFFoT+/392Agk8gmmMHa3Cu7uBYc4uqxRTXaAio9QNYroYLl2hKqPYDTsT08LiULkghBHzIDFdzC+VCiFMbB0sgqihxI6DIUhMD/MQMWLEjo2dJOsQ2z+GEdsGO/0Qsf1gRnolCtGzREwXSyEINTMKQWK6mATgPKj+Eu4QWxeLIYghdI9US8T2hiGUBon9F/NQDmYhYupYFDTQLVEMQ4iYPhZCNVQm8iixbbFRQigHQxQxDxHTxYzUQ+GD+5BysF5CkJgOhtAwEUJzsdE1SBZsXMTWwUyQR3KwAbKYkYjpYgjW0NKH+C31LrxFTBdDEOukVnq6WhvOUCdVLhNETBNL180s9ZGSmCr2ATZwwPFLCoQfAAAAGmZjVEwAAAAbAAAAbAAAAGQAAAAAAAAACAAKAGQBAB8ilfEAAADpZmRBVAAAABxo3u3NwQrCMBCEYRuxGnuxFN//Ve1gC8NSm0Z3ycH5b2HDfCfuYjpVVd4Q5ovhcDWdv8huYFdYLNb9GMPC4rHOOYDC4jAcPCEGhfljDEWBwoT9K8aQMGFboDBhwoQJe5eWhPlikYiwGCwtHR3Ic89CwuIwRGAxQPcDARTWHmOo34lBYe0xhoYP4SYsFrNgGWOoDApri62QsPaYBfE5U7eKGBUWh2HwQQ3UONdVBJC3sC3MF8NjMjFUg6W5aSMYwvyxTI2moxDKJmH+2Ar2O6WK7NYKCXPCGKToXd3WljA37AUnJqSBEfMALQAAABpmY1RMAAAAHQAAAHAAAABcAAAAAAAAAAwACgBkAQD2AoWjAAAA6WZkQVQAAAAeaN7t1tEKwjAQRFFtsRJFQcT//1Wz0DBLaeJG2aSVuW8hZM5b6aGmWyHrBsEeILB7IbknuC1w/CJBCfYDTyp5fDSk38g5wQRbgsDOqjRQKv8GMMH9ghomuGcQKEFfEB/q3yP4jyBQggQJ9gSBEtwzCJQgQYLr4BDzhIY5gtsBQ+z1IQ0R9AWlhFrhiyFBCTYGDYVYGpwKaZRgExCoCQR2zSR3BFuDQG0gMBsKjKAfKGPP2DiXA4HZQEn20jZBfzCoHotqfnrDIoLeINCp0FDRckvOYhD0A4EinOtb2yLoAr4BN6eOce7b6XgAAAAaZmNUTAAAAB8AAABwAAAAVAAAAAAAAAAMAAoAZAAAzQarjAAAANVmZEFUAAAAIGje7dRbC4MwDIZhdczRnWCI//+vroGFhKAhBVMmfO9VD6TPXYdIL6ehMYA9QcHeTnQPMAFMwJ47MQrwf8DLQQHsC15NYzBvjmGAmaBgN1UU5Dl/VmCA5wQtDBAgwG2QFv7H3f55eyjAHHA8KIAAAQIECBAgwDOBJdComn4BzANp04Lda7MT3ZcaQwA7gMEs9tiJ0bWmZwHmgBQt6GAxOaDCfHRR0TzAHJBisKg+JjpjLAIWFcBsUNDZaWrIvsUYwDxQUEn27W29BTAF/AIO+4pR0fYgEwAAABpmY1RMAAAAIQAAAHAAAABkAAAAAAAAAAQACgBkAADcqv+yAAABA2ZkQVQAAAAiaN7t2N0KwyAMhuHZ0Y2O/cBg93+rNQchImpmi1Hhe09aW+Jz1EJ7OdKnkDYL0AZcg/jaVSmcAdgLFOweRGva0BXKzQAcB3RKuRlCAc4NMgrQDkw94C9fdF6RoABbgTr29NExPgc4NChYJoYB9gZ1TFBBzqAA7cG3LwRoDXAyUAngGGD8Q4DBry8H0T3GAHYFCx8vgsYxtkYBHA9kNBXPxHMABwKVAPYG9Zc3wPlAd6Cal/fiA9gMFLRBjAG0AZeg84gEsAcoHdm4hAFsBgpaGcB5wc33UwJoDwqqY48/YpQxgBagoFQOY/BWKERpT4CmoMCJtop4H4DNwR0796YRRhi74QAAABpmY1RMAAAAIwAAAGwAAABsAAAAAAAAAAAACgBkAAD5ce+iAAAA7mZkQVQAAAAkaN7t2cEKgzAQRVHbErrRFvr/H1sDwguhjgnO1Czu3QhO9Oyi4tTa22hqDMzE3KHZqITBrsHS1qOjVAT2X6xEbh3VcD6CxWOpqAVIRXswWAQm6Fl0BB6vFwrmj+UT3lgNgoGB6UEZEZgbZkKLUTe2BRaBCZqN8hxsDKyGPEGweEyobg42NvY6CGws7LNmQXkONgwmcDdBYNdhqaj1JRXsOqz9w12lKrCxMa1vu+a+BTY6JgTMFTM24n6sBsBisV9DE6wyDEFrYC6YwBOBgYGZWDAoCMwbE+iB1j9WwcIwoacTAuaOfQER+52x4k1fNgAAABpmY1RMAAAAJQAAAGwAAABwAAAAAAAAAAAACgBkAQAMN5oyAAAA6GZkQVQAAAAmaN7t2EEKgzAQQFGNSDdqofc/bBtQJoR2hpiMpPL/0ui8TVDiYPU0GgoC88WmvcUoglMSmBdmQ+PJUhjMC7OhGhjMB5uTRqM5CexqTKBHkjZEuVcFwcDAwP4Lq/9Ygt0NExDMF1uNwPrEFqW4DtYHlkMWCNYXJqgMr90kYL7YZgTWF/b6pEFxHawbTECluD5ngV2LfXtoVZKDvBSvgV2DnfmRAnZvLOyB+WMmmPULAWuKKS/isoLRcRgEa4MdYMgqGQzWAaYEBgZWjDmBghwQWGtMwFhrBMwNE7QqQcBcsDe74ZwhV/x3xgAAABpmY1RMAAAAJwAAAGgAAABwAAAABAAAAAAACgBkAAChCwb6AAAA7mZkQVQAAAAoaN7t2MsKwyAQQNFoKd2kKfT/P7axICPSUXB8pHDvJogjZydJNq1Xoa0hoG9dkb1QBIFmQ4LcGgKaA8VDrqEUBRoDaYAFBbJDdcQOAlkhQYCuDd2zXKV8HmgsFAYfWaXD+ryOAQEBWSDBgJqhbpcq0FjIZT0LuR8BzYIE2QuFfaBVkCAppq2BFkJKQNeCwvNIytdAa6H32VEo7AMtgwRTEwSoCeJN9f+gpR9iPgnIAHX+oeGTgOZD8ZA2H/aA5kI+C2gFpF+qvpIyryNnQO1QxLw5HQGyQoKFegERAeoGCWhOAKAu0Af14aCh2gE5VAAAABpmY1RMAAAAKQAAAGgAAABwAAAAAAAAAAAACgBkAAD8oUQkAAABNGZkQVQAAAAqaN7t2dGKgzAQhWFrTDdCa2Hv+v4vumfBYcLUcatTtUvPfxOMDN+NBCTNbz06jxV0Q3c0jF2Rrtod3VAaO0/UowYRei10Wlmq6pEghKKQYoJ0CyuoNSXUIEIxyCZQWZBFLEYoCFlkZRaQfULbQvEUIxSHEiL03pCHdBMROh6yyBqsIIsR2hcqiND/hbx3hGJQNj0DZROh7aCMvkwZzUHejCCE3hc6IUKEPhGyh6og15laNHWoEtoOKqgbE+R7JsHqCO0FKTKgS1X9LBih46ALklWyz4QOhpwIBaCdP4YBLYFaROhVkGKDm0V8TPYJxaGMHjAnD8mmFhHaBvIH/Lwfs/pynlAE0stEb4DQ8ZBg3kD3Rz6kCKEIpHkD6YmyKSFBCMUgmzOwMAUIhaEffvXDgc1gj3oAAAAaZmNUTAAAACsAAABsAAAAcAAAAAAAAAAAAAoAZAAA+F+aLwAAAV5mZEFUAAAALGje7dfBbsIwEEVREpI2lYiLYNP+/492nmRrRpYHZ2EnoXp3g8DjOQsiIS7obnpKy8auWfdCFxOxBliEfqRnbJV+Y4+s9DlmhkIAv7KItcdQOviWsCzEsFRfNcxgdnD6MGEvsVaYQukAC8LGPGyM2QeEWEtMwUXCgptUgzBTwsYsYv0wBGySIuhWgnAP93NskYj1xRR8nUUsRGx/DAsiWEmREjSYcE6sL4aWjQ1OxPpj3sXJKZ0T+z9Yvu8qETsWwzyx82G1H80aROydMQWJtcU+s2bJw3BWmk8QsffBsJTYsdjqROwc2GxK0ONF+fwoEdsXm0wJCtLNZN/jHHNjjNi+mIKKYWF6RaX3xE6GORHrhfV/QIJE7CyYgsFNIVsNItYEc8E5azWVIO8esT0w/8/eWGjLn0RivTAFvUuTUw3DXmL9MOR+0ZWIHYUpaPMn6/eINcX+ACCf/BEcVDlJAAAAGmZjVEwAAAAtAAAAbAAAAHAAAAAAAAAAAAAKAGQAABWV6FUAAAF/ZmRBVAAAAC5o3u3Xy26DMBCF4YSQlNCGVmkX9P1ftHMkj8ay8UWqDVmcf4MInvk2WcBJ+5JODcrtItYOw8NVwlUP3jeaEukOTXcR64t9S6sLi+eNzokArl7YRawvdg+6ef24dLHep9BwF7H2mL98lkbp3asOs7Dj5oX9xNpjs2uSgJ3/2exFrDVmoA89CtWAg6QQsfYYUgzLfl3PIP29BA4u7CTWF/uUsGxxYaldLZzB2TRkXSRifbGlMsVCiNj+2IdUgnCmBsNvxPpio6RguhjCnAFxAIn1wQzM5yMIc1sfhsT6Y3poLGaIzhHbFwsHpkIhQuxoLC7156iBfJBYb8wgYq+JYcFb0FUaM+F5eF4hYsdgj0wpDIuJ7YfpAoSFz0x4PkhXL9wT2wWLQIX0Y13z7w20iB2LYaFetfCe2IthxWIMs8SOwsp/kEXyMZ3NQcSaYFlwSRZDxPbGYrD0knrZaOulVSFivTADw6FTRYqFc8R6YzaI8gPlOWLNsT/srwtAAftErwAAABh0RVh0U29mdHdhcmUAZ2lmMmFwbmcuc2YubmV0lv8TyAAAAABJRU5ErkJggg=="
+export const cowBase64 =
+	'iVBORw0KGgoAAAANSUhEUgAAAHAAAABwCAMAAADxPgR5AAAACGFjVEwAAAAYAAAAANndHFMAAABmUExURf//////7PXszYl3WeXUqT03GmxYPEdEMbOafEc5J1lHMHZkR/Olptl7fP+9vc9dX5SJe4BqT//X1+vZrCsnEk9AK//99q2bfvrv1P/OzllHL8K6pX5sT+vdw/r04puJbPvpzOPOqsQreYIAAAABdFJOUwBA5thmAAAAGmZjVEwAAAAAAAAAcAAAAHAAAAAAAAAAAAAKAGQBAGZ29oAAAAGhSURBVGje7dhdT8JAEIVhCwti+UZDMPz//+mcpCfZTDqsGjsl5rw3pc3OPDcQ0Bf1PzpZ/tmba/Mgv0tgHsgDN+s0dLcA9K5rUGcB5Tx3CcwF363bELF11dbqHgS4WJjHLoHzgAxgDaGz1TXivMBckAFhvVVDxFrdLUCIuwTmgHyTMICEPoa4lPfRh3/twm6BOWBfVSwO/BTsXQJzQKIIWPfLiHIXMYE5INpYNbhvFKGLKuwUmA8S+xy6uPg8QgF5VGAueLSw8DCExfWV4QzOekzgc4CHb0awxiJUYC64s1oYzhDEHObH4GIJnBYkdrUcGkasIGIu7kK9JTAHJIqOjQgRi8D6D12B04FL6+oiHhdjBM/W1hKYAxbLg6VRBBZL4Dzga9XKaoE442eI4SowDyT6FyAxgfOAK1Zh+6Aa9TMCc0GP8jCxSxDROoHPBRI7BBFduDwKTGAeSJQg/7mwYyP3Hi0jCcwFiRLE1QMRWIKICUwCPeqKMH6B+x9ZeI59AjPB+M3jXy+HuHTshzGeC5wP5BIs5zBet84z3AucHPwCGDJBQOajSuoAAAAaZmNUTAAAAAEAAABsAAAAZAAAAAAAAAAMAAoAZAEABzCnYQAAAYFmZEFUAAAAAmje7djbbsIwEIRhAoGGcAq0qqh4//fsjuSRrJUdt2o2vZn/JgTs/W5COGzQZG1cR9cw04ZxViVhy2B48WlNqZeF4aPrs1JnAeR+zhIWi71bzxShQ9bJ6mYC2lvYj1nC1sEYsBxBd6trxP3CYjEGgI1WjhBq9bKmFGcJi8F4QTBgRD5SHMjz2hv74MJsYTHYmNVbXPxbbHQJi8EIIkDdHwJ4zNpagyVsWYwNVo5dGtXAbaHREhaHEfpKPVx83oFNDAmLwW4Whl1TGJofGdZgbQs6pITFYtcfRqwG3a2TJSweO1stCGuIlT50ha2DObAaIawlJGx9bGdhI9FbI67FYGH/iLmGZnUM+4Wtg71l7a2+EdaU9gyWsFiM4BIYb+j8kiosFtuzDLpUykHWFxIWh/kbMqFHJYJz5X+WCYvHCF0rEdy6hK2LESTGH4ZnVjgnWMIICYvFCBLjEdXO5yBhAVgLdHlolyp9+REWjbUvFP/Yr9+nCAlbHPsG9holMHgtc1IAAAAaZmNUTAAAAAMAAABwAAAAYAAAAAAAAAAQAAoAZAEAMy/MPAAAAYNmZEFUAAAABGje7dbbbsIwEIRh0nJKyiHQqqLi/d+zO5JHWq3suEUy5mL+G0jw7sdFkFih2VqFxtB+oRXjroUEPgRWsZs1p+4WgCn0XWiwgHKeuwQ+F/y0biliW9eHNSwEeG1hHruwc0oJfB7IAHoIXayhEucJchZ7AAtsA7LRNVkeIlbrbs0p7oqowDagf0j4AaGvFJfyuvTj34aI+t0C24CTa23xwH/BKYTdFwuowHYgGlPAhgcjOrpwT2B7kO0tDx4rldA3F/YBJCrwOSCxn9Q1xPsl1GMxGALbg2cLC08pLPavDGdwNmICXwM8/TGCxAS+DniwahjOEMQckMElsA8Y0GLE/CIP4lpgH5A30bkSzxET2B98t3IH1pUIRUxgP3Dn2lh+4JgJZ/x5tIQJbAcSjaDHrpkIMoH9wQ3LYKdCcWYfIiawKVj8AgT55/jAMtc4h5ncgySwD8hBgnxFpWs/i4gJ7ACGQS7PRqyQwH5gzD88/j0xga8PEs29F9gN/AXtWh/wZnKszAAAABpmY1RMAAAABQAAAHAAAABYAAAAAAAAABQACgBkAAAwn8ZCAAABZmZkQVQAAAAGaN7t09tuwjAQhGFCAsThlJaKUvX937M70o60WuE4UjHJxf43ELDnu4FNruTqC21mFmAdcJQ8NrjumRoNaJKwlUwB1gWJPaRRI+ZrMhHjfW7tpaNEOMC64E16aAT3Gi9OgXepk3AfW9jEHbuB3QDrgCi5LIQ+pKbQzcQf39E0SEkK8PUgAYYvLESs1K80atzxaID1wMHUScS/NI7yOffntzsE7W4vBfh6ECWtk3B5DphDk6kzBVgPZHgg+J+2GrYCXBY8FwpwvSCxH+3Txc+JeizA5cGrhMGLhmH7ynAGZy0W4HrAy8wIcizA9YAnqYThDM5aLMBlQaKI6FQe81CA7wWJ8YtWuhbqNT9qNwJ8P7g1uQvZ0e2TvqWddDDhOcD6IAbsoVbLgpofzoFwAqwDMh7yB9tMZ2lqeGfCc4B1QX/IH8T4KdOc4QBrguU8ilf/nmcCXDdI9Nn7ABcD/wCp0/cxvYy6+wAAABpmY1RMAAAABwAAAGgAAABgAAAACAAAAAwACgBkAAAqNm2eAAABY2ZkQVQAAAAIaN7t1l1Pg0AQhWERhJZqix/BGv///3ROsifZbBiHwJJoct4LK+3MPDe96IPXyWkM8u4JqgcRaZz6IIKCjoPORaegixMwQXUhImPR7NSkiE3WEiZoPzSliJQ1TkS4f7fw+prVW5gRtA+6pwj1WRfrN2i2Ogv77xYhIo+WoP0QAJYDCAtNEADGLxURREzQdij/UZEDRKK+rSnFW8AE1YPGLAJcWAPN1lgkqC6EN7sUgY8Uj2XPLnZmBYK7gvZB+IMHLMSQX35c0FFQnKC/Ab0EeYig4yEiX6m3Ir5PbC0iqB50s3DomsLB/JVhBrNAeGQJaS1B9aHryjC7BhFUB0L4B8vPVoRgBrMRIqgehA84RMyLCA8sIU/WUCSoDsTBW5CHoE+rhPiNE1QHItYFYcaDcBMYw7OgfRCxIatNuVBqKOLhPEF1IAwsLbVO3BFUHQoxxoUtO4K2Qepf9wPZWfDxej6GtgAAABpmY1RMAAAACQAAAHAAAABgAAAAAAAAAAwACgBkAABnZZsIAAABZGZkQVQAAAAKaN7t0tFKw0AQheHGpGkTtU1Vkooo+P4v6RyYA8uQ7AZhN1HmvylJd8930R68/995pn5FDm4PEqtmaldE2MHtwM50TvS4EGEH84KDZLHeNC5UaUSxFYI3DRsOZgAVu0uDRsxWRQLG+9wKsVZ6kHDOwTzgq3TXCLZBuBwDR6mRcB9b2LSYg/lA1JlCiD9+lQgQ45+PmIN5QX7BeimEiKX6kAaNW9h2sAzYmwjx4hpwlOyOg2VA1GmNRuhN4yifYyi3iDmYH2R4AIaLSTCSRVCjOVgKTOfg3wCfEy1hDm4PEnvXXkx8TzTEHNwHeJUweNEwHH4ynMFZYBxzcD/gZWU4G8NqaZJO2lFyMB9IFCNPUgrDGZyNYYQcLAdO0qdEdCli39IShj0AjJiDZcAv6Zpo0uZAvD/M5GBZENVSE8nB/YFH6WRKoXN38M7BfYC8XEdycEcgUdNv7zhYDPwBnsUNoDMUs3kAAAAaZmNUTAAAAAsAAABwAAAAZAAAAAAAAAAMAAoAZAAAAI8tggAAAX5mZEFUAAAADGje7dPJbsJAEIRhHLM5JICSSBCykfd/yVRJU9KoZbutoBlz6P9iPEt/F7MYa9vT44TGZgZYBxTW9MSB65FyOMCaoI8pDd4NZPEOBXhfoDAPtGiA9UBhnWnrJKAP5LNDAZYDjygHuXkxNU5COSvAuuAPOqNjSpjNw3Rfs/pA/g6wDPiKzimB66wdapyWiPc5y4Id4n6AZUDWmXKIfSIPJKQE6oMJsCwoQF1QDgnz+kCEhjC2RQGWAS8mQetUMzEiStgDCrAsyLqUNgS9pTTQvPemWcICLA8qvnCxQbeAVyQowJnAGyMQ4H2Az05TsBZtslYowPKgsPfUi0nrFiVgIxJgffCAOHCf4uD8qXiGZ4npT51jV0RACQuwDrifGM8OYSe0MAVYDlQ8xCFPyMN4hmctxloU4HzgFxI6lLBfJMSCnBfgfOA3OjidUn0g1wOcH2QtWjpZjPcCnA9coY3JQ/vucC3A+wG51o4UYHXQR03/vRNgNfAPiAUqMD2IFBoAAAAaZmNUTAAAAA0AAABwAAAAYAAAAAAAAAAIAAoAZAEAim0vyQAAAWlmZEFUAAAADmje7dbLbsJADIXhJkBKoAVaWkHT+/u/ZH0kH8kakXEQzSQL/5soxPa35W5IiyvL3QqwLEisMrXSqxPhAKcAfWwzIKC1RDjA0qCPNZnsDHdxK8B5gBbb9oRvAZYEfazWCGYwFw2wPEiMILEA5w0Sa5PWPT1pjSnA8uBBsiCALqlyAg4Aty6BSwm3A/x/8Fs6SweNWJqHcZ+3AiwLHqWzRrAxbaUcyIPYxy0L8luA44GoTbIQ+pA88KgRJBbg+CAB1kkWIub1LgGyWAqupADHAbskQo1WDWyjVUkL6V4KcBwQtdpSI/SicdG8ZwuwLMjWEjAM3ArWUooFWBB087EUBEQswHLgo1MOQ8SsEWAZkNib9pzE34laLMB5gHsJB3caDtsnwwxm+UcX+xYkFuA04G5gmL2E/UgBlgXZScKRB8nDMINZYjZiAU4DfkpE+yL2KwEIcD7gSgL4Je2dTlqAk4N/NLUPYOlyoTgAAAAaZmNUTAAAAA8AAABwAAAAbAAAAAAAAAAEAAoAZAABi7I+ZwAAAXpmZEFUAAAAEGje7dddS8NAEIVhE/qRtlpTq1ijoP7/P+kc2APDwmZDanZbOO9NSJmd52ZL6cNY7zMb2ylwVrOhZmY8L7AOmIN21lsmzLUWYYElwOnYfkJAAfpLJHAJcD62GcnP8CxRgfVBjx0SEcWztQSWAYlNAz2WRwXeFkhM4P2CWHYaSeB9g0xgfbCzCPi6TFhOVGB5sLc8CGCIajIRTYFrS+Ay4Ld1sfoQsbgcxvPY5TG2tYAKXAY8W5cQwY3rYDWZVhbOYxcvocAyINpFeQh9WTnwHBJYHiTABstDxHJ9Wn0Ie/ijS0zgsuAQRWgTaia2d+GdKCDeUIH/DxJFqxCh1xAPu/dk3OVBOgKXAVlnAcPQNeCP1VoCK4JX1oY8JrAO+JQphQmsDxL7CL1E8fMYbaOICSwPPltYeAxhsX8yzGCWf0ZxXuDtgMeJYXYME1gOZGsLSx6tHIYZzALbRmGPwDogI5qK2K+V2iGwJujhdPxyC6wO/gEmzFlgUTP51wAAABpmY1RMAAAAEQAAAHAAAABwAAAAAAAAAAAACgBkAADlbKtZAAABfGZkQVQAAAASaN7t2l1rwkAQhWFXk5qkH1ZspdD//z87BzLMELLZRZpZL857I8rmPAQUcuEh1+mBDhUR3Bs0LD2QwgTbgmWsHia4AxiAaUcJewSfDxyl70IKKkowAqzHpoqAAvMowfagx1428mcIxoH1XxjDXjMpqmAnEYwHjysZaFgNSjASNCgHKkbwOcE8ZSDGrhvlQNRLBGPBcdFQSNEceJaAEowB1x54k3RfKc15lGBbMPfAa+P5gBJsA366AK497G5Bd8lveIzg/iAO3KSfOYAAfFcpFcIorscWNj14kvTuCO4Djq5JMkgrgzeXbnoQFsF9QP2hawAVMazcrwQI6Ra2FSO4Lzi5OkkhvTBVNi0iGAEaioAlSaGvOR209/mw4/cIxoD4cJD+Azy6FCMYD5YrY9gi2BZ8L1SLEWwDXqSPQh7tFmGLYCzoUWBvkh+2VwtncHZY5DGCkaChCpZSMPfHVoLxYD1q2NnlNwi2BVEvXQr1iwg2A/8A0+MHMIo5vtgAAAAaZmNUTAAAABMAAABwAAAAcAAAAAAAAAAAAAoAZAAACPp4sAAAAWVmZEFUAAAAFGje7dTbasMwEITh2HFSH9qmJS0U+v7v2R3wwCJQpNBqlcL8N8YgzXdlH251rOxwRwIDQAcNlXlcYH+wAFXjAv8v6GGBDcAgzKMCHw9crM9CODfuYVNgBFiPrRUBFdgTLGPnG/kzAPkDENgHHF0APbZlIurBJ+tkCWwHEkuhDOiwMkqQqMC2ILEcSEzgY4LE/hrEXYECBdaBI2oATpbHBMaBS9JcUQ6kIzAGJHZOGioi6kFsC2wPvrkAEtlcNSA3BMaBxK7W195ibUnvVgmbLNzHFjbXPYEx4JLkIFYEry5uCowB0x81DgGoxdi35T98hG2BMeDqmixCvDhUtiZhG4bAtiBRBAwXCX3scdC9Z+MW9wTGgEdrtn4Dji7s8IMXGAMSJXhvRNhsCewD4uDFerZeC+EMzqaQxwTGgkQJshfLPxlBAoyYwEiwjLIUI3ByYUNgX5AXL4U8IrAr+APL+PChFMmrngAAABpmY1RMAAAAFQAAAHAAAABwAAAAAAAAAAAACgBkAgDXBmhIAAABUmZkQVQAAAAWaN7t2tFqwzAMheF5TdM43UhLNxjs/d9zEshImLrWLiJ34/w3IZDou7IxIS/of3dwBjAa9EPJmcUBjgc7kBsHGA/6MT8M8M+CikoAdwADsBoG+Bzg6y9KppMEMAB0AJn67NQCjxTAfUDFFGphq6OCcgAjQT82P8g+AzAaVKwNKnZuVNACcnbzBjgetJgXLYcogPuCbUpBxfzgRAEECHAsWDCAY8BsWjoBfCZQsdmUOhUY4BjwUnVvkSdHFwlgFKjYjfqSGDtXXakeNlH8Ps/imasEMAbMVQpJDvBmKjMBxoB2k7YL1pYcfVN24XOZAhgDrqZEXSUFfa1VmWID4H6gopoFP6Qk2Xtb6/A8UQAjQD0ML1SiZskDTqZF4lnlgzrAKFDR5KzG7v0gCTAaVHSj3qR3Sq/aRi2mUxXAceBR2jodqmqQZwAMAX8AyIHYEYSizPYAAAAaZmNUTAAAABcAAABwAAAAcAAAAAAAAAAAAAoAZAEAEb3oYgAAAU5mZEFUAAAAGGje7drRaoNAEIXhpjG1mpakpIFC3/89uwO7nMOA3WxgVhPOf6PC7nxeCIL4op67fUMCtwQC2jXEuMB1QUD3x/CBEhgABmAeHilDBT4SCFRgKBiKMSrwkUGg5giMAIEJfH7wtSG/T2AvsA5MqWslXi+wP+ghj8035FGBfcAW7O2feI3AvuASxCBjx4UKyuCQErglkLE6KnBbYMFaQMMErgdO1HulZRCYwH4gHhK0q1RggeuDjLWADAvsDQL12JG6FyyYwFjwTBkIpg0sMwT2AoFdUj85W8jQV66GDSnbb7Ns5pwT2AecXIzdCl6oMtNAMwTGgv5la9dgUO3j+2/qnONZh5TAeHCm+Aa4JWzI2fnsEhgPAkUe/M4VgK8HqnyEnagxJbAPiHADp9RH7jOFI7I1hvgf58acwLVAdKq0tM//ACkwFPwDOBHMwXcQBKYAAAAaZmNUTAAAABkAAABsAAAAaAAAAAAAAAAIAAoAZAEAt0Hv/AAAASJmZEFUAAAAGmje7drBCoMwEEVRra1trKDFFoT+/392Agk8gmmMHa3Cu7uBYc4uqxRTXaAio9QNYroYLl2hKqPYDTsT08LiULkghBHzIDFdzC+VCiFMbB0sgqihxI6DIUhMD/MQMWLEjo2dJOsQ2z+GEdsGO/0Qsf1gRnolCtGzREwXSyEINTMKQWK6mATgPKj+Eu4QWxeLIYghdI9US8T2hiGUBon9F/NQDmYhYupYFDTQLVEMQ4iYPhZCNVQm8iixbbFRQigHQxQxDxHTxYzUQ+GD+5BysF5CkJgOhtAwEUJzsdE1SBZsXMTWwUyQR3KwAbKYkYjpYgjW0NKH+C31LrxFTBdDEOukVnq6WhvOUCdVLhNETBNL180s9ZGSmCr2ATZwwPFLCoQfAAAAGmZjVEwAAAAbAAAAbAAAAGQAAAAAAAAACAAKAGQBAB8ilfEAAADpZmRBVAAAABxo3u3NwQrCMBCEYRuxGnuxFN//Ve1gC8NSm0Z3ycH5b2HDfCfuYjpVVd4Q5ovhcDWdv8huYFdYLNb9GMPC4rHOOYDC4jAcPCEGhfljDEWBwoT9K8aQMGFboDBhwoQJe5eWhPlikYiwGCwtHR3Ic89CwuIwRGAxQPcDARTWHmOo34lBYe0xhoYP4SYsFrNgGWOoDApri62QsPaYBfE5U7eKGBUWh2HwQQ3UONdVBJC3sC3MF8NjMjFUg6W5aSMYwvyxTI2moxDKJmH+2Ar2O6WK7NYKCXPCGKToXd3WljA37AUnJqSBEfMALQAAABpmY1RMAAAAHQAAAHAAAABcAAAAAAAAAAwACgBkAQD2AoWjAAAA6WZkQVQAAAAeaN7t1tEKwjAQRFFtsRJFQcT//1Wz0DBLaeJG2aSVuW8hZM5b6aGmWyHrBsEeILB7IbknuC1w/CJBCfYDTyp5fDSk38g5wQRbgsDOqjRQKv8GMMH9ghomuGcQKEFfEB/q3yP4jyBQggQJ9gSBEtwzCJQgQYLr4BDzhIY5gtsBQ+z1IQ0R9AWlhFrhiyFBCTYGDYVYGpwKaZRgExCoCQR2zSR3BFuDQG0gMBsKjKAfKGPP2DiXA4HZQEn20jZBfzCoHotqfnrDIoLeINCp0FDRckvOYhD0A4EinOtb2yLoAr4BN6eOce7b6XgAAAAaZmNUTAAAAB8AAABwAAAAVAAAAAAAAAAMAAoAZAAAzQarjAAAANVmZEFUAAAAIGje7dRbC4MwDIZhdczRnWCI//+vroGFhKAhBVMmfO9VD6TPXYdIL6ehMYA9QcHeTnQPMAFMwJ47MQrwf8DLQQHsC15NYzBvjmGAmaBgN1UU5Dl/VmCA5wQtDBAgwG2QFv7H3f55eyjAHHA8KIAAAQIECBAgwDOBJdComn4BzANp04Lda7MT3ZcaQwA7gMEs9tiJ0bWmZwHmgBQt6GAxOaDCfHRR0TzAHJBisKg+JjpjLAIWFcBsUNDZaWrIvsUYwDxQUEn27W29BTAF/AIO+4pR0fYgEwAAABpmY1RMAAAAIQAAAHAAAABkAAAAAAAAAAQACgBkAADcqv+yAAABA2ZkQVQAAAAiaN7t2N0KwyAMhuHZ0Y2O/cBg93+rNQchImpmi1Hhe09aW+Jz1EJ7OdKnkDYL0AZcg/jaVSmcAdgLFOweRGva0BXKzQAcB3RKuRlCAc4NMgrQDkw94C9fdF6RoABbgTr29NExPgc4NChYJoYB9gZ1TFBBzqAA7cG3LwRoDXAyUAngGGD8Q4DBry8H0T3GAHYFCx8vgsYxtkYBHA9kNBXPxHMABwKVAPYG9Zc3wPlAd6Cal/fiA9gMFLRBjAG0AZeg84gEsAcoHdm4hAFsBgpaGcB5wc33UwJoDwqqY48/YpQxgBagoFQOY/BWKERpT4CmoMCJtop4H4DNwR0796YRRhi74QAAABpmY1RMAAAAIwAAAGwAAABsAAAAAAAAAAAACgBkAAD5ce+iAAAA7mZkQVQAAAAkaN7t2cEKgzAQRVHbErrRFvr/H1sDwguhjgnO1Czu3QhO9Oyi4tTa22hqDMzE3KHZqITBrsHS1qOjVAT2X6xEbh3VcD6CxWOpqAVIRXswWAQm6Fl0BB6vFwrmj+UT3lgNgoGB6UEZEZgbZkKLUTe2BRaBCZqN8hxsDKyGPEGweEyobg42NvY6CGws7LNmQXkONgwmcDdBYNdhqaj1JRXsOqz9w12lKrCxMa1vu+a+BTY6JgTMFTM24n6sBsBisV9DE6wyDEFrYC6YwBOBgYGZWDAoCMwbE+iB1j9WwcIwoacTAuaOfQER+52x4k1fNgAAABpmY1RMAAAAJQAAAGwAAABwAAAAAAAAAAAACgBkAQAMN5oyAAAA6GZkQVQAAAAmaN7t2EEKgzAQQFGNSDdqofc/bBtQJoR2hpiMpPL/0ui8TVDiYPU0GgoC88WmvcUoglMSmBdmQ+PJUhjMC7OhGhjMB5uTRqM5CexqTKBHkjZEuVcFwcDAwP4Lq/9Ygt0NExDMF1uNwPrEFqW4DtYHlkMWCNYXJqgMr90kYL7YZgTWF/b6pEFxHawbTECluD5ngV2LfXtoVZKDvBSvgV2DnfmRAnZvLOyB+WMmmPULAWuKKS/isoLRcRgEa4MdYMgqGQzWAaYEBgZWjDmBghwQWGtMwFhrBMwNE7QqQcBcsDe74ZwhV/x3xgAAABpmY1RMAAAAJwAAAGgAAABwAAAABAAAAAAACgBkAAChCwb6AAAA7mZkQVQAAAAoaN7t2MsKwyAQQNFoKd2kKfT/P7axICPSUXB8pHDvJogjZydJNq1Xoa0hoG9dkb1QBIFmQ4LcGgKaA8VDrqEUBRoDaYAFBbJDdcQOAlkhQYCuDd2zXKV8HmgsFAYfWaXD+ryOAQEBWSDBgJqhbpcq0FjIZT0LuR8BzYIE2QuFfaBVkCAppq2BFkJKQNeCwvNIytdAa6H32VEo7AMtgwRTEwSoCeJN9f+gpR9iPgnIAHX+oeGTgOZD8ZA2H/aA5kI+C2gFpF+qvpIyryNnQO1QxLw5HQGyQoKFegERAeoGCWhOAKAu0Af14aCh2gE5VAAAABpmY1RMAAAAKQAAAGgAAABwAAAAAAAAAAAACgBkAAD8oUQkAAABNGZkQVQAAAAqaN7t2dGKgzAQhWFrTDdCa2Hv+v4vumfBYcLUcatTtUvPfxOMDN+NBCTNbz06jxV0Q3c0jF2Rrtod3VAaO0/UowYRei10Wlmq6pEghKKQYoJ0CyuoNSXUIEIxyCZQWZBFLEYoCFlkZRaQfULbQvEUIxSHEiL03pCHdBMROh6yyBqsIIsR2hcqiND/hbx3hGJQNj0DZROh7aCMvkwZzUHejCCE3hc6IUKEPhGyh6og15laNHWoEtoOKqgbE+R7JsHqCO0FKTKgS1X9LBih46ALklWyz4QOhpwIBaCdP4YBLYFaROhVkGKDm0V8TPYJxaGMHjAnD8mmFhHaBvIH/Lwfs/pynlAE0stEb4DQ8ZBg3kD3Rz6kCKEIpHkD6YmyKSFBCMUgmzOwMAUIhaEffvXDgc1gj3oAAAAaZmNUTAAAACsAAABsAAAAcAAAAAAAAAAAAAoAZAAA+F+aLwAAAV5mZEFUAAAALGje7dfBbsIwEEVREpI2lYiLYNP+/492nmRrRpYHZ2EnoXp3g8DjOQsiIS7obnpKy8auWfdCFxOxBliEfqRnbJV+Y4+s9DlmhkIAv7KItcdQOviWsCzEsFRfNcxgdnD6MGEvsVaYQukAC8LGPGyM2QeEWEtMwUXCgptUgzBTwsYsYv0wBGySIuhWgnAP93NskYj1xRR8nUUsRGx/DAsiWEmREjSYcE6sL4aWjQ1OxPpj3sXJKZ0T+z9Yvu8qETsWwzyx82G1H80aROydMQWJtcU+s2bJw3BWmk8QsffBsJTYsdjqROwc2GxK0ONF+fwoEdsXm0wJCtLNZN/jHHNjjNi+mIKKYWF6RaX3xE6GORHrhfV/QIJE7CyYgsFNIVsNItYEc8E5azWVIO8esT0w/8/eWGjLn0RivTAFvUuTUw3DXmL9MOR+0ZWIHYUpaPMn6/eINcX+ACCf/BEcVDlJAAAAGmZjVEwAAAAtAAAAbAAAAHAAAAAAAAAAAAAKAGQAABWV6FUAAAF/ZmRBVAAAAC5o3u3Xy26DMBCF4YSQlNCGVmkX9P1ftHMkj8ay8UWqDVmcf4MInvk2WcBJ+5JODcrtItYOw8NVwlUP3jeaEukOTXcR64t9S6sLi+eNzokArl7YRawvdg+6ef24dLHep9BwF7H2mL98lkbp3asOs7Dj5oX9xNpjs2uSgJ3/2exFrDVmoA89CtWAg6QQsfYYUgzLfl3PIP29BA4u7CTWF/uUsGxxYaldLZzB2TRkXSRifbGlMsVCiNj+2IdUgnCmBsNvxPpio6RguhjCnAFxAIn1wQzM5yMIc1sfhsT6Y3poLGaIzhHbFwsHpkIhQuxoLC7156iBfJBYb8wgYq+JYcFb0FUaM+F5eF4hYsdgj0wpDIuJ7YfpAoSFz0x4PkhXL9wT2wWLQIX0Y13z7w20iB2LYaFetfCe2IthxWIMs8SOwsp/kEXyMZ3NQcSaYFlwSRZDxPbGYrD0knrZaOulVSFivTADw6FTRYqFc8R6YzaI8gPlOWLNsT/srwtAAftErwAAABh0RVh0U29mdHdhcmUAZ2lmMmFwbmcuc2YubmV0lv8TyAAAAABJRU5ErkJggg==';
diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts
index 132745510cbfa..a92dc2ce06443 100644
--- a/cypress/support/commands.ts
+++ b/cypress/support/commands.ts
@@ -1,32 +1,12 @@
-// ***********************************************
-// This example commands.js shows you how to
-// create various custom commands and overwrite
-// existing commands.
-//
-// For more comprehensive examples of custom
-// commands please read more here:
-// https://on.cypress.io/custom-commands
-// ***********************************************
-//
-//
-// -- This is a parent command --
-// Cypress.Commands.add('login', (email, password) => { ... })
-//
-//
-// -- This is a child command --
-// Cypress.Commands.add('drag', { prevSubject: 'element'}, (subject, options) => { ... })
-//
-//
-// -- This is a dual command --
-// Cypress.Commands.add('dismiss', { prevSubject: 'optional'}, (subject, options) => { ... })
-//
-//
-// -- This will overwrite an existing command --
-// Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... })
 import 'cypress-real-events';
-import { WorkflowsPage, SigninPage, SignupPage, SettingsUsersPage, WorkflowPage } from '../pages';
-import { N8N_AUTH_COOKIE } from '../constants';
-import { MessageBox } from '../pages/modals/message-box';
+import { WorkflowPage } from '../pages';
+import {
+	BACKEND_BASE_URL,
+	INSTANCE_ADMIN,
+	INSTANCE_MEMBERS,
+	INSTANCE_OWNER,
+	N8N_AUTH_COOKIE,
+} from '../constants';
 
 Cypress.Commands.add('getByTestId', (selector, ...args) => {
 	return cy.get(`[data-test-id="${selector}"]`, ...args);
@@ -42,8 +22,8 @@ Cypress.Commands.add('createFixtureWorkflow', (fixtureKey, workflowName) => {
 
 	cy.waitForLoad(false);
 	workflowPage.actions.setWorkflowName(workflowName);
-
 	workflowPage.getters.saveButton().should('contain', 'Saved');
+	workflowPage.actions.zoomToFit();
 });
 
 Cypress.Commands.add(
@@ -58,149 +38,57 @@ Cypress.Commands.add('waitForLoad', (waitForIntercepts = true) => {
 	// These aliases are set-up before each test in cypress/support/e2e.ts
 	// we can't set them up here because at this point it would be too late
 	// and the requests would already have been made
-	if(waitForIntercepts) {
-		cy.wait(['@loadSettings', '@loadLogin'])
+	if (waitForIntercepts) {
+		cy.wait(['@loadSettings', '@loadNodeTypes']);
 	}
 	cy.getByTestId('node-view-loader', { timeout: 20000 }).should('not.exist');
 	cy.get('.el-loading-mask', { timeout: 20000 }).should('not.exist');
 });
 
 Cypress.Commands.add('signin', ({ email, password }) => {
-	const signinPage = new SigninPage();
-	const workflowsPage = new WorkflowsPage();
-
-	cy.session(
-		[email, password],
-		() => {
-			cy.visit(signinPage.url);
-
-			signinPage.getters.form().within(() => {
-				signinPage.getters.email().type(email);
-				signinPage.getters.password().type(password);
-				signinPage.getters.submit().click();
-			});
-
-			// we should be redirected to /workflows
-			cy.url().should('include', workflowsPage.url);
-		},
-		{
-			validate() {
-				cy.getCookie(N8N_AUTH_COOKIE).should('exist');
-			},
-		},
+	Cypress.session.clearAllSavedSessions();
+	cy.session([email, password], () =>
+		cy.request({
+			method: 'POST',
+			url: `${BACKEND_BASE_URL}/rest/login`,
+			body: { email, password },
+			failOnStatusCode: false,
+		}),
 	);
 });
 
-Cypress.Commands.add('signout', () => {
-	cy.visit('/signout');
-	cy.waitForLoad();
-	cy.url().should('include', '/signin');
-	cy.getCookie(N8N_AUTH_COOKIE).should('not.exist');
-});
-
-Cypress.Commands.add('signup', ({ firstName, lastName, password, url }) => {
-	const signupPage = new SignupPage();
-
-	cy.visit(url);
-
-	signupPage.getters.form().within(() => {
-		cy.url().then((url) => {
-			signupPage.getters.firstName().type(firstName);
-			signupPage.getters.lastName().type(lastName);
-			signupPage.getters.password().type(password);
-			signupPage.getters.submit().click();
-		});
-	});
+Cypress.Commands.add('signinAsOwner', () => {
+	cy.signin({ email: INSTANCE_OWNER.email, password: INSTANCE_OWNER.password });
 });
 
-Cypress.Commands.add('setup', ({ email, firstName, lastName, password }) => {
-	const signupPage = new SignupPage();
-
-	cy.visit(signupPage.url);
-
-	signupPage.getters.form().within(() => {
-		cy.url().then((url) => {
-			if (url.includes(signupPage.url)) {
-				signupPage.getters.email().type(email);
-				signupPage.getters.firstName().type(firstName);
-				signupPage.getters.lastName().type(lastName);
-				signupPage.getters.password().type(password);
-				signupPage.getters.submit().click();
-			} else {
-				cy.log('User already signed up');
-			}
-		});
+Cypress.Commands.add('signout', () => {
+	cy.request({
+		method: 'POST',
+		url: `${BACKEND_BASE_URL}/rest/logout`,
+		headers: { 'browser-id': localStorage.getItem('n8n-browserId') }
 	});
+	cy.getCookie(N8N_AUTH_COOKIE).should('not.exist');
 });
 
 Cypress.Commands.add('interceptREST', (method, url) => {
-	cy.intercept(method, `http://localhost:5678/rest${url}`);
+	cy.intercept(method, `${BACKEND_BASE_URL}/rest${url}`);
 });
 
-Cypress.Commands.add('inviteUsers', ({ instanceOwner, users }) => {
-	const settingsUsersPage = new SettingsUsersPage();
-
-	cy.signin(instanceOwner);
-
-	users.forEach((user) => {
-		cy.signin(instanceOwner);
-		cy.visit(settingsUsersPage.url);
-
-		cy.interceptREST('POST', '/users').as('inviteUser');
-
-		settingsUsersPage.getters.inviteButton().click();
-		settingsUsersPage.getters.inviteUsersModal().within((modal) => {
-			settingsUsersPage.getters.inviteUsersModalEmailsInput().type(user.email).type('{enter}');
-		});
-
-		cy.wait('@inviteUser').then((interception) => {
-			const inviteLink = interception.response!.body.data[0].user.inviteAcceptUrl;
-			cy.log(JSON.stringify(interception.response!.body.data[0].user));
-			cy.log(inviteLink);
-			cy.signout();
-			cy.signup({ ...user, url: inviteLink });
-		});
+const setFeature = (feature: string, enabled: boolean) =>
+	cy.request('PATCH', `${BACKEND_BASE_URL}/rest/e2e/feature`, {
+		feature: `feat:${feature}`,
+		enabled,
 	});
-});
-
-Cypress.Commands.add('skipSetup', () => {
-	const signupPage = new SignupPage();
-	const workflowPage = new WorkflowPage();
-	const Confirmation = new MessageBox();
-
-	cy.visit(signupPage.url);
 
-	signupPage.getters.form().within(() => {
-		cy.url().then((url) => {
-			if (url.endsWith(signupPage.url)) {
-				signupPage.getters.skip().click();
-
-				Confirmation.getters.header().should('contain.text', 'Skip owner account setup?');
-				Confirmation.actions.confirm();
-
-				// we should be redirected to empty canvas
-				cy.intercept('GET', '/rest/workflows/new').as('loading');
-				cy.url().should('include', workflowPage.url);
-				cy.wait('@loading');
-			} else {
-				cy.log('User already signed up');
-			}
-		});
+const setQueueMode = (enabled: boolean) =>
+	cy.request('PATCH', `${BACKEND_BASE_URL}/rest/e2e/queue-mode`, {
+		enabled,
 	});
-});
 
-Cypress.Commands.add('resetAll', () => {
-	cy.task('reset');
-	Cypress.session.clearAllSavedSessions();
-});
-
-Cypress.Commands.add('setupOwner', (payload) => {
-	cy.task('setup-owner', payload);
-});
-
-Cypress.Commands.add('enableFeature', (feature) => {
-	cy.task('enable-feature', feature);
-});
+Cypress.Commands.add('enableFeature', (feature: string) => setFeature(feature, true));
+Cypress.Commands.add('disableFeature', (feature: string) => setFeature(feature, false));
+Cypress.Commands.add('enableQueueMode', () => setQueueMode(true));
+Cypress.Commands.add('disableQueueMode', () => setQueueMode(false));
 
 Cypress.Commands.add('grantBrowserPermissions', (...permissions: string[]) => {
 	if (Cypress.isBrowser('chrome')) {
@@ -235,19 +123,36 @@ Cypress.Commands.add('paste', { prevSubject: true }, (selector, pastePayload) =>
 Cypress.Commands.add('drag', (selector, pos, options) => {
 	const index = options?.index || 0;
 	const [xDiff, yDiff] = pos;
-	const element = cy.get(selector).eq(index);
+	const element = typeof selector === 'string' ? cy.get(selector).eq(index) : selector;
 	element.should('exist');
 
-	const originalLocation = Cypress.$(selector)[index].getBoundingClientRect();
-
-	element.trigger('mousedown');
-	element.trigger('mousemove', {
-		which: 1,
-		pageX: options?.abs? xDiff: originalLocation.right + xDiff,
-		pageY: options?.abs? yDiff: originalLocation.top + yDiff,
-		force: true,
+	element.then(([$el]) => {
+		const originalLocation = $el.getBoundingClientRect();
+		const newPosition = {
+			x: options?.abs ? xDiff : originalLocation.right + xDiff,
+			y: options?.abs ? yDiff : originalLocation.top + yDiff,
+		};
+		if (options?.realMouse) {
+			element.realMouseDown();
+			element.realMouseMove(newPosition.x, newPosition.y);
+			element.realMouseUp();
+		} else {
+			element.trigger('mousedown', { force: true });
+			element.trigger('mousemove', {
+				which: 1,
+				pageX: newPosition.x,
+				pageY: newPosition.y,
+				force: true,
+			});
+			if (options?.clickToFinish) {
+				// Click to finish the drag
+				// For some reason, mouseup isn't working when moving nodes
+				cy.get('body').click(newPosition.x, newPosition.y);
+			} else {
+				element.trigger('mouseup', { force: true });
+			}
+		}
 	});
-	element.trigger('mouseup', { force: true });
 });
 
 Cypress.Commands.add('draganddrop', (draggableSelector, droppableSelector) => {
@@ -269,6 +174,7 @@ Cypress.Commands.add('draganddrop', (draggableSelector, droppableSelector) => {
 				cy.get(draggableSelector).trigger('mousedown');
 			}
 			// We don't chain these commands to make sure cy.get is re-trying correctly
+			cy.get(droppableSelector).realMouseMove(0, 0);
 			cy.get(droppableSelector).realMouseMove(pageX, pageY);
 			cy.get(droppableSelector).realHover();
 			cy.get(droppableSelector).realMouseUp();
@@ -277,3 +183,25 @@ Cypress.Commands.add('draganddrop', (draggableSelector, droppableSelector) => {
 			}
 		});
 });
+
+Cypress.Commands.add('push', (type, data) => {
+	cy.request('POST', `${BACKEND_BASE_URL}/rest/e2e/push`, {
+		type,
+		data,
+	});
+});
+
+Cypress.Commands.add('shouldNotHaveConsoleErrors', () => {
+	cy.window().then((win) => {
+		const spy = cy.spy(win.console, 'error');
+		cy.wrap(spy).should('not.have.been.called');
+	});
+});
+
+Cypress.Commands.add('resetDatabase', () => {
+	cy.request('POST', `${BACKEND_BASE_URL}/rest/e2e/reset`, {
+		owner: INSTANCE_OWNER,
+		members: INSTANCE_MEMBERS,
+		admin: INSTANCE_ADMIN,
+	});
+});
diff --git a/cypress/support/e2e.ts b/cypress/support/e2e.ts
index ee534b4dc59fd..69bb74ec88b0c 100644
--- a/cypress/support/e2e.ts
+++ b/cypress/support/e2e.ts
@@ -1,30 +1,31 @@
-// ***********************************************************
-// This example support/e2e.js is processed and
-// loaded automatically before your test files.
-//
-// This is a great place to put global configuration and
-// behavior that modifies Cypress.
-//
-// You can change the location of this file or turn off
-// automatically serving support files with the
-// 'supportFile' configuration option.
-//
-// You can read more here:
-// https://on.cypress.io/configuration
-// ***********************************************************
-
+import { INSTANCE_OWNER } from '../constants';
 import './commands';
 
-// Load custom nodes and credentials fixtures
+before(() => {
+	cy.resetDatabase();
+
+	Cypress.on('uncaught:exception', (err) => {
+		return !err.message.includes('ResizeObserver');
+	});
+});
+
 beforeEach(() => {
+	if (!cy.config('disableAutoLogin')) {
+		cy.signin({ email: INSTANCE_OWNER.email, password: INSTANCE_OWNER.password });
+	}
+
+	cy.window().then((win): void => {
+		win.localStorage.setItem('N8N_THEME', 'light');
+	});
+
 	cy.intercept('GET', '/rest/settings').as('loadSettings');
-	cy.intercept('GET', '/rest/login').as('loadLogin');
+	cy.intercept('GET', '/types/nodes.json').as('loadNodeTypes');
 
 	// Always intercept the request to test credentials and return a success
 	cy.intercept('POST', '/rest/credentials/test', {
 		statusCode: 200,
 		body: {
 			data: { status: 'success', message: 'Tested successfully' },
-		}
+		},
 	});
-})
+});
diff --git a/cypress/support/index.ts b/cypress/support/index.ts
index 7665602dafcb4..f31e50c57899c 100644
--- a/cypress/support/index.ts
+++ b/cypress/support/index.ts
@@ -8,25 +8,14 @@ interface SigninPayload {
 	password: string;
 }
 
-interface SetupPayload {
-	email: string;
-	password: string;
-	firstName: string;
-	lastName: string;
-}
-
-interface SignupPayload extends SetupPayload {
-	url: string;
-}
-
-interface InviteUsersPayload {
-	instanceOwner: SigninPayload;
-	users: SetupPayload[];
-}
-
 declare global {
 	namespace Cypress {
+		interface SuiteConfigOverrides {
+			disableAutoLogin: boolean;
+		}
+
 		interface Chainable {
+			config(key: keyof SuiteConfigOverrides): boolean;
 			getByTestId(
 				selector: string,
 				...args: (Partial<Loggable & Timeoutable & Withinable & Shadow> | undefined)[]
@@ -34,21 +23,33 @@ declare global {
 			findChildByTestId(childTestId: string): Chainable<JQuery<HTMLElement>>;
 			createFixtureWorkflow(fixtureKey: string, workflowName: string): void;
 			signin(payload: SigninPayload): void;
+			signinAsOwner(): void;
 			signout(): void;
-			signup(payload: SignupPayload): void;
-			setup(payload: SetupPayload): void;
-			setupOwner(payload: SetupPayload): void;
-			inviteUsers(payload: InviteUsersPayload): void;
 			interceptREST(method: string, url: string): Chainable<Interception>;
-			skipSetup(): void;
-			resetAll(): void;
 			enableFeature(feature: string): void;
+			disableFeature(feature: string): void;
+			enableQueueMode(): void;
+			disableQueueMode(): void;
 			waitForLoad(waitForIntercepts?: boolean): void;
 			grantBrowserPermissions(...permissions: string[]): void;
 			readClipboard(): Chainable<string>;
 			paste(pastePayload: string): void;
-			drag(selector: string, target: [number, number], options?: {abs?: true, index?: number}): void;
+			drag(
+				selector: string | Cypress.Chainable<JQuery<HTMLElement>>,
+				target: [number, number],
+				options?: { abs?: boolean; index?: number; realMouse?: boolean; clickToFinish?: boolean },
+			): void;
 			draganddrop(draggableSelector: string, droppableSelector: string): void;
+			push(type: string, data: unknown): void;
+			shouldNotHaveConsoleErrors(): void;
+			window(): Chainable<
+				AUTWindow & {
+					featureFlags: {
+						override: (feature: string, value: any) => void;
+					};
+				}
+			>;
+			resetDatabase(): void;
 		}
 	}
 }
diff --git a/cypress/tsconfig.json b/cypress/tsconfig.json
index 61b0e504a304f..26a5da716b47e 100644
--- a/cypress/tsconfig.json
+++ b/cypress/tsconfig.json
@@ -1,7 +1,11 @@
 {
 	"extends": "../tsconfig.json",
 	"compilerOptions": {
+		"sourceMap": false,
 		"declaration": false,
-		"sourceMap": false
-	}
+		"lib": ["esnext", "dom"],
+		"types": ["cypress", "node"]
+	},
+	"include": ["**/*.ts"],
+	"exclude": ["**/dist/**/*", "**/node_modules/**/*"]
 }
diff --git a/cypress/utils/executions.ts b/cypress/utils/executions.ts
new file mode 100644
index 0000000000000..81748af50566e
--- /dev/null
+++ b/cypress/utils/executions.ts
@@ -0,0 +1,135 @@
+import { ITaskData } from '../../packages/workflow/src';
+import { IPinData } from '../../packages/workflow';
+import { clickExecuteWorkflowButton } from '../composables/workflow';
+
+export function createMockNodeExecutionData(
+	name: string,
+	{
+		data,
+		inputOverride,
+		executionStatus = 'success',
+		jsonData,
+		...rest
+	}: Partial<ITaskData> & { jsonData?: Record<string, object> },
+): Record<string, ITaskData> {
+	return {
+		[name]: {
+			startTime: new Date().getTime(),
+			executionTime: 0,
+			executionStatus,
+			data: jsonData
+				? Object.keys(jsonData).reduce((acc, key) => {
+						acc[key] = [
+							[
+								{
+									json: jsonData[key],
+									pairedItem: { item: 0 },
+								},
+							],
+						];
+
+						return acc;
+				  }, {})
+				: data,
+			source: [null],
+			...rest,
+		},
+	};
+}
+
+export function createMockWorkflowExecutionData({
+	executionId,
+	runData,
+	pinData = {},
+	lastNodeExecuted,
+}: {
+	executionId: string;
+	runData: Record<string, ITaskData | ITaskData[]>;
+	pinData?: IPinData;
+	lastNodeExecuted: string;
+}) {
+	return {
+		executionId,
+		data: {
+			data: {
+				startData: {},
+				resultData: {
+					runData,
+					pinData,
+					lastNodeExecuted,
+				},
+				executionData: {
+					contextData: {},
+					nodeExecutionStack: [],
+					metadata: {},
+					waitingExecution: {},
+					waitingExecutionSource: {},
+				},
+			},
+			mode: 'manual',
+			startedAt: new Date().toISOString(),
+			stoppedAt: new Date().toISOString(),
+			status: 'success',
+			finished: true,
+		},
+	};
+}
+
+export function runMockWorkflowExcution({
+	trigger,
+	lastNodeExecuted,
+	runData,
+	workflowExecutionData,
+}: {
+	trigger?: () => void;
+	lastNodeExecuted: string;
+	runData: Array<ReturnType<typeof createMockNodeExecutionData>>;
+	workflowExecutionData?: ReturnType<typeof createMockWorkflowExecutionData>;
+}) {
+	const executionId = Math.random().toString(36).substring(4);
+
+	cy.intercept('POST', '/rest/workflows/run', {
+		statusCode: 201,
+		body: {
+			data: {
+				executionId,
+			},
+		},
+	}).as('runWorkflow');
+
+	if (trigger) {
+		trigger();
+	} else {
+		clickExecuteWorkflowButton();
+	}
+
+	cy.wait('@runWorkflow');
+
+	const resolvedRunData = {};
+	runData.forEach((nodeExecution) => {
+		const nodeName = Object.keys(nodeExecution)[0];
+		const nodeRunData = nodeExecution[nodeName];
+
+		cy.push('nodeExecuteBefore', {
+			executionId,
+			nodeName,
+		});
+		cy.push('nodeExecuteAfter', {
+			executionId,
+			nodeName,
+			data: nodeRunData,
+		});
+
+		resolvedRunData[nodeName] = nodeExecution[nodeName];
+	});
+
+	cy.push(
+		'executionFinished',
+		createMockWorkflowExecutionData({
+			executionId,
+			lastNodeExecuted,
+			runData: resolvedRunData,
+			...workflowExecutionData,
+		}),
+	);
+}
diff --git a/cypress/utils/index.ts b/cypress/utils/index.ts
new file mode 100644
index 0000000000000..3cfa5a7449186
--- /dev/null
+++ b/cypress/utils/index.ts
@@ -0,0 +1,3 @@
+export * from './executions';
+export * from './modal';
+export * from './popper';
diff --git a/cypress/utils/modal.ts b/cypress/utils/modal.ts
new file mode 100644
index 0000000000000..4b260ca9e858a
--- /dev/null
+++ b/cypress/utils/modal.ts
@@ -0,0 +1,3 @@
+export function getVisibleModalOverlay() {
+	return cy.get('.el-overlay .el-overlay-dialog').filter(':visible');
+}
diff --git a/cypress/utils/popper.ts b/cypress/utils/popper.ts
new file mode 100644
index 0000000000000..5743c70f3e6fa
--- /dev/null
+++ b/cypress/utils/popper.ts
@@ -0,0 +1,15 @@
+export function getPopper() {
+	return cy.get('.el-popper');
+}
+
+export function getVisiblePopper() {
+	return getPopper().filter(':visible');
+}
+
+export function getVisibleSelect() {
+	return getVisiblePopper().filter('.el-select__popper');
+}
+
+export function getVisibleDropdown() {
+	return getVisiblePopper().filter('.el-dropdown__popper');
+}
diff --git a/docker/compose/subfolderWithSSL/.env b/docker/compose/subfolderWithSSL/.env
deleted file mode 100644
index 7008bd631a05e..0000000000000
--- a/docker/compose/subfolderWithSSL/.env
+++ /dev/null
@@ -1,25 +0,0 @@
-# Folder where data should be saved
-DATA_FOLDER=/root/n8n/
-
-# The top level domain to serve from
-DOMAIN_NAME=example.com
-
-# The subfolder to serve from
-SUBFOLDER=app1
-N8N_PATH=/app1/
-
-# DOMAIN_NAME and SUBDOMAIN combined decide where n8n will be reachable from
-# above example would result in: https://example.com/n8n/
-
-# The user name to use for autentication - IMPORTANT ALWAYS CHANGE!
-N8N_BASIC_AUTH_USER=user
-
-# The password to use for autentication - IMPORTANT ALWAYS CHANGE!
-N8N_BASIC_AUTH_PASSWORD=password
-
-# Optional timezone to set which gets used by Cron-Node by default
-# If not set New York time will be used
-GENERIC_TIMEZONE=Europe/Berlin
-
-# The email address to use for the SSL certificate creation
-SSL_EMAIL=user@example.com
diff --git a/docker/compose/subfolderWithSSL/README.md b/docker/compose/subfolderWithSSL/README.md
deleted file mode 100644
index 3970938719caa..0000000000000
--- a/docker/compose/subfolderWithSSL/README.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# n8n on Subfolder with SSL
-
-Starts n8n and deploys it on a subfolder
-
-## Start
-
-To start n8n in a subfolder simply start docker-compose by executing the following
-command in the current folder.
-
-**IMPORTANT:** But before you do that change the default users and passwords in the `.env` file!
-
-```
-docker-compose up -d
-```
-
-To stop it execute:
-
-```
-docker-compose stop
-```
diff --git a/docker/compose/subfolderWithSSL/docker-compose.yml b/docker/compose/subfolderWithSSL/docker-compose.yml
deleted file mode 100644
index 37a4b25f182f2..0000000000000
--- a/docker/compose/subfolderWithSSL/docker-compose.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-version: '3'
-
-services:
-  traefik:
-    image: 'traefik'
-    command:
-      - '--api=true'
-      - '--api.insecure=true'
-      - '--api.dashboard=true'
-      - '--providers.docker=true'
-      - '--providers.docker.exposedbydefault=false'
-      - '--entrypoints.websecure.address=:443'
-      - '--certificatesresolvers.mytlschallenge.acme.tlschallenge=true'
-      - '--certificatesresolvers.mytlschallenge.acme.email=${SSL_EMAIL}'
-      - '--certificatesresolvers.mytlschallenge.acme.storage=/letsencrypt/acme.json'
-    ports:
-      - '443:443'
-      - '80:80'
-    volumes:
-      - ${DATA_FOLDER}/letsencrypt:/letsencrypt
-      - /var/run/docker.sock:/var/run/docker.sock:ro
-  n8n:
-    image: docker.n8n.io/n8nio/n8n
-    ports:
-      - '127.0.0.1:5678:5678'
-    labels:
-      - traefik.enable=true
-      - traefik.http.routers.n8n.rule=Host(`${DOMAIN_NAME}`)
-      - traefik.http.routers.n8n.tls=true
-      - traefik.http.routers.n8n.entrypoints=websecure
-      - 'traefik.http.routers.n8n.rule=PathPrefix(`/${SUBFOLDER}{regex:$$|/.*}`)'
-      - 'traefik.http.middlewares.n8n-stripprefix.stripprefix.prefixes=/${SUBFOLDER}'
-      - 'traefik.http.routers.n8n.middlewares=n8n-stripprefix'
-      - traefik.http.routers.n8n.tls.certresolver=mytlschallenge
-      - traefik.http.middlewares.n8n.headers.SSLRedirect=true
-      - traefik.http.middlewares.n8n.headers.STSSeconds=315360000
-      - traefik.http.middlewares.n8n.headers.browserXSSFilter=true
-      - traefik.http.middlewares.n8n.headers.contentTypeNosniff=true
-      - traefik.http.middlewares.n8n.headers.forceSTSHeader=true
-      - traefik.http.middlewares.n8n.headers.SSLHost=${DOMAIN_NAME}
-      - traefik.http.middlewares.n8n.headers.STSIncludeSubdomains=true
-      - traefik.http.middlewares.n8n.headers.STSPreload=true
-    environment:
-      - N8N_BASIC_AUTH_ACTIVE=true
-      - N8N_BASIC_AUTH_USER
-      - N8N_BASIC_AUTH_PASSWORD
-      - N8N_HOST=${DOMAIN_NAME}
-      - N8N_PORT=5678
-      - N8N_PROTOCOL=https
-      - NODE_ENV=production
-      - N8N_PATH
-      - WEBHOOK_URL=https://${DOMAIN_NAME}${N8N_PATH}
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - ${DATA_FOLDER}/.n8n:/home/node/.n8n
diff --git a/docker/compose/withMariaDB/.env b/docker/compose/withMariaDB/.env
deleted file mode 100644
index 48f9efcd642a0..0000000000000
--- a/docker/compose/withMariaDB/.env
+++ /dev/null
@@ -1,8 +0,0 @@
-MARIADB_ROOT_PASSWORD=changePassword
-
-MARIADB_DATABASE=n8n
-MARIADB_USER=changeUser
-MARIADB_PASSWORD=changePassword
-
-N8N_BASIC_AUTH_USER=changeUser
-N8N_BASIC_AUTH_PASSWORD=changePassword
diff --git a/docker/compose/withMariaDB/README.md b/docker/compose/withMariaDB/README.md
deleted file mode 100644
index 6af2fa8c8ac16..0000000000000
--- a/docker/compose/withMariaDB/README.md
+++ /dev/null
@@ -1,24 +0,0 @@
-# n8n with MariaDB
-
-Starts n8n with MariaDB as database.
-
-## Start
-
-To start n8n with MariaDB simply start docker-compose by executing the following
-command in the current folder.
-
-**IMPORTANT:** But before you do that change the default users and passwords in the [`.env`](.env) file!
-
-```
-docker-compose up -d
-```
-
-To stop it execute:
-
-```
-docker-compose stop
-```
-
-## Configuration
-
-The default name of the database, user and password for MariaDB can be changed in the [`.env`](.env) file in the current directory.
diff --git a/docker/compose/withMariaDB/docker-compose.yml b/docker/compose/withMariaDB/docker-compose.yml
deleted file mode 100644
index e7a1db74e0ff9..0000000000000
--- a/docker/compose/withMariaDB/docker-compose.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-version: '3.8'
-
-volumes:
-  db_storage:
-  n8n_storage:
-
-services:
-  db:
-    image: mariadb:10.7
-    restart: always
-    environment:
-      - MARIADB_ROOT_PASSWORD
-      - MARIADB_DATABASE
-      - MARIADB_USER
-      - MARIADB_PASSWORD
-      - MARIADB_MYSQL_LOCALHOST_USER=true
-    volumes:
-      - db_storage:/var/lib/mysql
-    healthcheck:
-      test: "/usr/bin/mysql --user=${MARIADB_USER} --password=${MARIADB_PASSWORD} --execute 'SELECT 1;'"
-      interval: 10s
-      timeout: 5s
-      retries: 10
-
-  n8n:
-    image: docker.n8n.io/n8nio/n8n
-    restart: always
-    environment:
-      - DB_TYPE=mariadb
-      - DB_MYSQLDB_HOST=db
-      - DB_MYSQLDB_DATABASE=${MARIADB_DATABASE}
-      - DB_MYSQLDB_USER=${MARIADB_USER}
-      - DB_MYSQLDB_PASSWORD=${MARIADB_PASSWORD}
-    ports:
-      - 5678:5678
-    links:
-      - db
-    volumes:
-      - n8n_storage:/home/node/.n8n
-    command: n8n start --tunnel
-    depends_on:
-      db:
-        condition: service_healthy
diff --git a/docker/compose/withPostgres/.env b/docker/compose/withPostgres/.env
deleted file mode 100644
index c074f42c9edae..0000000000000
--- a/docker/compose/withPostgres/.env
+++ /dev/null
@@ -1,9 +0,0 @@
-POSTGRES_USER=changeUser
-POSTGRES_PASSWORD=changePassword
-POSTGRES_DB=n8n
-
-POSTGRES_NON_ROOT_USER=changeUser
-POSTGRES_NON_ROOT_PASSWORD=changePassword
-
-N8N_BASIC_AUTH_USER=changeUser
-N8N_BASIC_AUTH_PASSWORD=changePassword
diff --git a/docker/compose/withPostgres/README.md b/docker/compose/withPostgres/README.md
deleted file mode 100644
index f47d5e51c86a5..0000000000000
--- a/docker/compose/withPostgres/README.md
+++ /dev/null
@@ -1,24 +0,0 @@
-# n8n with PostgreSQL
-
-Starts n8n with PostgreSQL as database.
-
-## Start
-
-To start n8n with PostgreSQL simply start docker-compose by executing the following
-command in the current folder.
-
-**IMPORTANT:** But before you do that change the default users and passwords in the [`.env`](.env) file!
-
-```
-docker-compose up -d
-```
-
-To stop it execute:
-
-```
-docker-compose stop
-```
-
-## Configuration
-
-The default name of the database, user and password for PostgreSQL can be changed in the [`.env`](.env) file in the current directory.
diff --git a/docker/compose/withPostgres/docker-compose.yml b/docker/compose/withPostgres/docker-compose.yml
deleted file mode 100644
index 9b3ab5b83e23f..0000000000000
--- a/docker/compose/withPostgres/docker-compose.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-version: '3.8'
-
-volumes:
-  db_storage:
-  n8n_storage:
-
-services:
-  postgres:
-    image: postgres:11
-    restart: always
-    environment:
-      - POSTGRES_USER
-      - POSTGRES_PASSWORD
-      - POSTGRES_DB
-      - POSTGRES_NON_ROOT_USER
-      - POSTGRES_NON_ROOT_PASSWORD
-    volumes:
-      - db_storage:/var/lib/postgresql/data
-      - ./init-data.sh:/docker-entrypoint-initdb.d/init-data.sh
-    healthcheck:
-      test: ['CMD-SHELL', 'pg_isready -h localhost -U ${POSTGRES_USER} -d ${POSTGRES_DB}']
-      interval: 5s
-      timeout: 5s
-      retries: 10
-
-  n8n:
-    image: docker.n8n.io/n8nio/n8n
-    restart: always
-    environment:
-      - DB_TYPE=postgresdb
-      - DB_POSTGRESDB_HOST=postgres
-      - DB_POSTGRESDB_PORT=5432
-      - DB_POSTGRESDB_DATABASE=${POSTGRES_DB}
-      - DB_POSTGRESDB_USER=${POSTGRES_NON_ROOT_USER}
-      - DB_POSTGRESDB_PASSWORD=${POSTGRES_NON_ROOT_PASSWORD}
-      - N8N_BASIC_AUTH_ACTIVE=true
-      - N8N_BASIC_AUTH_USER
-      - N8N_BASIC_AUTH_PASSWORD
-    ports:
-      - 5678:5678
-    links:
-      - postgres
-    volumes:
-      - n8n_storage:/home/node/.n8n
-    command: /bin/sh -c "n8n start --tunnel"
-    depends_on:
-      postgres:
-        condition: service_healthy
diff --git a/docker/compose/withPostgres/init-data.sh b/docker/compose/withPostgres/init-data.sh
deleted file mode 100755
index 69a8d79e1ea03..0000000000000
--- a/docker/compose/withPostgres/init-data.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-set -e;
-
-
-if [ -n "${POSTGRES_NON_ROOT_USER:-}" ] && [ -n "${POSTGRES_NON_ROOT_PASSWORD:-}" ]; then
-	psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
-		CREATE USER ${POSTGRES_NON_ROOT_USER} WITH PASSWORD '${POSTGRES_NON_ROOT_PASSWORD}';
-		GRANT ALL PRIVILEGES ON DATABASE ${POSTGRES_DB} TO ${POSTGRES_NON_ROOT_USER};
-	EOSQL
-else
-	echo "SETUP INFO: No Environment variables given!"
-fi
diff --git a/docker/compose/withPostgresAndWorker/.env b/docker/compose/withPostgresAndWorker/.env
deleted file mode 100644
index c074f42c9edae..0000000000000
--- a/docker/compose/withPostgresAndWorker/.env
+++ /dev/null
@@ -1,9 +0,0 @@
-POSTGRES_USER=changeUser
-POSTGRES_PASSWORD=changePassword
-POSTGRES_DB=n8n
-
-POSTGRES_NON_ROOT_USER=changeUser
-POSTGRES_NON_ROOT_PASSWORD=changePassword
-
-N8N_BASIC_AUTH_USER=changeUser
-N8N_BASIC_AUTH_PASSWORD=changePassword
diff --git a/docker/compose/withPostgresAndWorker/README.md b/docker/compose/withPostgresAndWorker/README.md
deleted file mode 100644
index 6c291dea8d624..0000000000000
--- a/docker/compose/withPostgresAndWorker/README.md
+++ /dev/null
@@ -1,24 +0,0 @@
-# n8n with PostgreSQL and Worker
-
-Starts n8n with PostgreSQL as database, and the Worker as a separate container.
-
-## Start
-
-To start n8n simply start docker-compose by executing the following
-command in the current folder.
-
-**IMPORTANT:** But before you do that change the default users and passwords in the [`.env`](.env) file!
-
-```
-docker-compose up -d
-```
-
-To stop it execute:
-
-```
-docker-compose stop
-```
-
-## Configuration
-
-The default name of the database, user and password for PostgreSQL can be changed in the [`.env`](.env) file in the current directory.
diff --git a/docker/compose/withPostgresAndWorker/docker-compose.yml b/docker/compose/withPostgresAndWorker/docker-compose.yml
deleted file mode 100644
index 9f947d735d49b..0000000000000
--- a/docker/compose/withPostgresAndWorker/docker-compose.yml
+++ /dev/null
@@ -1,76 +0,0 @@
-version: '3.8'
-
-volumes:
-  db_storage:
-  n8n_storage:
-  redis_storage:
-
-x-shared: &shared
-  restart: always
-  environment:
-    - DB_TYPE=postgresdb
-    - DB_POSTGRESDB_HOST=postgres
-    - DB_POSTGRESDB_PORT=5432
-    - DB_POSTGRESDB_DATABASE=${POSTGRES_DB}
-    - DB_POSTGRESDB_USER=${POSTGRES_NON_ROOT_USER}
-    - DB_POSTGRESDB_PASSWORD=${POSTGRES_NON_ROOT_PASSWORD}
-    - EXECUTIONS_MODE=queue
-    - QUEUE_BULL_REDIS_HOST=redis
-    - QUEUE_HEALTH_CHECK_ACTIVE=true
-    - N8N_BASIC_AUTH_ACTIVE=true
-    - N8N_BASIC_AUTH_USER
-    - N8N_BASIC_AUTH_PASSWORD
-  links:
-    - postgres
-    - redis
-  volumes:
-    - n8n_storage:/home/node/.n8n
-  depends_on:
-    redis:
-      condition: service_healthy
-    postgres:
-      condition: service_healthy
-
-services:
-  postgres:
-    image: postgres:11
-    restart: always
-    environment:
-      - POSTGRES_USER
-      - POSTGRES_PASSWORD
-      - POSTGRES_DB
-      - POSTGRES_NON_ROOT_USER
-      - POSTGRES_NON_ROOT_PASSWORD
-    volumes:
-      - db_storage:/var/lib/postgresql/data
-      - ./init-data.sh:/docker-entrypoint-initdb.d/init-data.sh
-    healthcheck:
-      test: ['CMD-SHELL', 'pg_isready -h localhost -U ${POSTGRES_USER} -d ${POSTGRES_DB}']
-      interval: 5s
-      timeout: 5s
-      retries: 10
-
-  redis:
-    image: redis:6-alpine
-    restart: always
-    volumes:
-      - redis_storage:/data
-    healthcheck:
-      test: ['CMD', 'redis-cli', 'ping']
-      interval: 5s
-      timeout: 5s
-      retries: 10
-
-  n8n:
-    <<: *shared
-    image: docker.n8n.io/n8nio/n8n
-    command: /bin/sh -c "n8n start --tunnel"
-    ports:
-      - 5678:5678
-
-  n8n-worker:
-    <<: *shared
-    image: docker.n8n.io/n8nio/n8n
-    command: /bin/sh -c "sleep 5; n8n worker"
-    depends_on:
-      - n8n
diff --git a/docker/compose/withPostgresAndWorker/init-data.sh b/docker/compose/withPostgresAndWorker/init-data.sh
deleted file mode 100755
index 69a8d79e1ea03..0000000000000
--- a/docker/compose/withPostgresAndWorker/init-data.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-set -e;
-
-
-if [ -n "${POSTGRES_NON_ROOT_USER:-}" ] && [ -n "${POSTGRES_NON_ROOT_PASSWORD:-}" ]; then
-	psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
-		CREATE USER ${POSTGRES_NON_ROOT_USER} WITH PASSWORD '${POSTGRES_NON_ROOT_PASSWORD}';
-		GRANT ALL PRIVILEGES ON DATABASE ${POSTGRES_DB} TO ${POSTGRES_NON_ROOT_USER};
-	EOSQL
-else
-	echo "SETUP INFO: No Environment variables given!"
-fi
diff --git a/docker/images/n8n-base/.npmrc b/docker/images/n8n-base/.npmrc
deleted file mode 100644
index 7a650526cf7dc..0000000000000
--- a/docker/images/n8n-base/.npmrc
+++ /dev/null
@@ -1,4 +0,0 @@
-audit = false
-fund = false
-loglevel = warn
-update-notifier = false
diff --git a/docker/images/n8n-base/Dockerfile b/docker/images/n8n-base/Dockerfile
index 62258d8d3857b..1a3236fae5d60 100644
--- a/docker/images/n8n-base/Dockerfile
+++ b/docker/images/n8n-base/Dockerfile
@@ -1,20 +1,38 @@
-ARG NODE_VERSION=16
-FROM node:${NODE_VERSION}-alpine
+ARG NODE_VERSION=18
 
-WORKDIR /home/node
-COPY .npmrc /usr/local/etc/npmrc
+# 1. Use a builder step to download various dependencies
+FROM node:${NODE_VERSION}-alpine as builder
 
-RUN \
-	apk add --update git graphicsmagick tini tzdata ca-certificates && \
-	npm install -g npm@8.19.2 full-icu && \
-	rm -rf /var/cache/apk/* /root/.npm /tmp/* && \
-	# Install fonts
+# Install fonts
+RUN	\
 	apk --no-cache add --virtual fonts msttcorefonts-installer fontconfig && \
 	update-ms-fonts && \
 	fc-cache -f && \
 	apk del fonts && \
-	find  /usr/share/fonts/truetype/msttcorefonts/ -type l -exec unlink {} \; && \
-	rm -rf /var/cache/apk/* /tmp/*
+	find  /usr/share/fonts/truetype/msttcorefonts/ -type l -exec unlink {} \;
+
+# Install git and other OS dependencies
+RUN apk add --update git openssh graphicsmagick tini tzdata ca-certificates libc6-compat jq
+
+# Update npm and install full-uci
+COPY .npmrc /usr/local/etc/npmrc
+RUN npm install -g npm@9.9.2 full-icu@1.5.0
 
+# Activate corepack, and install pnpm
+WORKDIR /tmp
+COPY package.json ./
+RUN corepack enable && corepack prepare --activate
+
+# Cleanup
+RUN	rm -rf /lib/apk/db /var/cache/apk/ /tmp/* /root/.npm /root/.cache/node /opt/yarn*
+
+# 2. Start with a new clean image and copy over the added files into a single layer
+FROM node:${NODE_VERSION}-alpine
+COPY --from=builder / /
+
+# Delete this folder to make the base image backward compatible to be able to build older version images
+RUN rm -rf /tmp/v8-compile-cache*
+
+WORKDIR /home/node
 ENV NODE_ICU_DATA /usr/local/lib/node_modules/full-icu
 EXPOSE 5678/tcp
diff --git a/docker/images/n8n-custom/Dockerfile b/docker/images/n8n-custom/Dockerfile
index f737a3847d1e4..ff7a4c0e0551e 100644
--- a/docker/images/n8n-custom/Dockerfile
+++ b/docker/images/n8n-custom/Dockerfile
@@ -1,4 +1,4 @@
-ARG NODE_VERSION=16
+ARG NODE_VERSION=18
 ARG ACCESS_TOKEN
 
 # 1. Create an image to build n8n
@@ -6,27 +6,32 @@ FROM n8nio/base:${NODE_VERSION} as builder
 ARG ACCESS_TOKEN
 ENV TOKEN_FOR_PACKAGES=${ACCESS_TOKEN}
 
-COPY --chown=node:node turbo.json package.json .npmrc pnpm-lock.yaml pnpm-workspace.yaml jest.config.js tsconfig.json ./
+RUN mkdir /compiled && chown node:node /compiled
+
+COPY --chown=node:node turbo.json package.json .npmrc pnpm-lock.yaml pnpm-workspace.yaml jest.config.js tsconfig.backend.json tsconfig.json tsconfig.build.json ./
 COPY --chown=node:node scripts ./scripts
 COPY --chown=node:node packages ./packages
 COPY --chown=node:node patches ./patches
 
 RUN apk add --update libc6-compat jq
 RUN corepack enable && corepack prepare --activate
-USER node
 
 RUN printf "@deep-consulting-solutions:registry=https://npm.pkg.github.com/\nalways-auth=true\n//npm.pkg.github.com/:_authToken=%s" $TOKEN_FOR_PACKAGES >> .npmrc
-RUN pnpm install --frozen-lockfile
-RUN pnpm build
-RUN rm -rf node_modules
+RUN /usr/local/bin/pnpm install --frozen-lockfile
+RUN /usr/local/bin/pnpm build
+
+# Delete all dev dependencies
 RUN jq 'del(.pnpm.patchedDependencies)' package.json > package.json.tmp; mv package.json.tmp package.json
-RUN jq '{name: .name, version: .version}' packages/editor-ui/package.json > editor-ui.tmp; mv editor-ui.tmp packages/editor-ui/package.json
-RUN jq '{name: .name, version: .version}' packages/design-system/package.json > design-system.tmp; mv design-system.tmp packages/design-system/package.json
-RUN NODE_ENV=production pnpm install --prod --no-optional
+RUN node scripts/trim-fe-packageJson.js
+
+# Delete any source code, source-mapping, or typings
 RUN find . -type f -name "*.ts" -o -name "*.js.map" -o -name "*.vue" -o -name "tsconfig.json" -o -name "*.tsbuildinfo" | xargs rm -rf
-RUN rm -rf packages/@n8n_io/eslint-config packages/editor-ui/src packages/editor-ui/node_modules packages/design-system
-RUN rm -rf patches .npmrc *.yaml node_modules/.cache packages/**/node_modules/.cache packages/**/.turbo .config .cache .local .node /tmp/*
 
+# Deploy the `n8n` package into /compiled
+ENV NODE_ENV=production
+RUN pnpm --filter=n8n --prod --no-optional deploy /compiled
+
+USER node
 # 2 . install packages
 FROM node:${NODE_VERSION}-slim as privatenodepackages
 ARG ACCESS_TOKEN
@@ -34,15 +39,22 @@ ENV TOKEN_FOR_PACKAGES=${ACCESS_TOKEN}
 RUN cd /home/node && mkdir .n8n && cd .n8n && mkdir nodes && cd nodes
 WORKDIR /home/node/.n8n/nodes
 RUN printf "@deep-consulting-solutions:registry=https://npm.pkg.github.com/\nalways-auth=true\n//npm.pkg.github.com/:_authToken=%s" $TOKEN_FOR_PACKAGES > .npmrc
-RUN npm install "@deep-consulting-solutions/n8n-nodes-dcs-crm" "@deep-consulting-solutions/n8n-nodes-dcs-noco-db" "@deep-consulting-solutions/n8n-nodes-dcs-s3" "@deep-consulting-solutions/n8n-nodes-esa-sendgrid"
+RUN npm install "@deep-consulting-solutions/n8n-nodes-dcs-crm" "@deep-consulting-solutions/n8n-nodes-dcs-noco-db" "@deep-consulting-solutions/n8n-nodes-dcs-s3" "@deep-consulting-solutions/n8n-nodes-esa-sendgrid" "@deep-consulting-solutions/n8n-nodes-dcs-wait"
 
 # 3. Start with a new clean image with just the code that is needed to run n8n
 FROM n8nio/base:${NODE_VERSION}
-COPY --from=builder /home/node /usr/local/lib/node_modules/n8n
-RUN ln -s /usr/local/lib/node_modules/n8n/packages/cli/bin/n8n /usr/local/bin/n8n
+ENV NODE_ENV=production
+
+ARG N8N_RELEASE_TYPE=dev
+ENV N8N_RELEASE_TYPE=${N8N_RELEASE_TYPE}
+
+WORKDIR /home/node
+COPY --from=builder /compiled /usr/local/lib/node_modules/n8n
 COPY docker/images/n8n-custom/docker-entrypoint.sh /
 
 RUN \
+	pnpm rebuild --dir /usr/local/lib/node_modules/n8n sqlite3 && \
+	ln -s /usr/local/lib/node_modules/n8n/bin/n8n /usr/local/bin/n8n && \
 	mkdir .n8n && \
 	chown node:node .n8n
 
diff --git a/docker/images/n8n-debian/Dockerfile b/docker/images/n8n-debian/Dockerfile
deleted file mode 100644
index 8bc7cc982c3e8..0000000000000
--- a/docker/images/n8n-debian/Dockerfile
+++ /dev/null
@@ -1,24 +0,0 @@
-FROM node:16
-
-ARG N8N_VERSION
-
-RUN if [ -z "$N8N_VERSION" ] ; then echo "The N8N_VERSION argument is missing!" ; exit 1; fi
-
-ENV N8N_VERSION=${N8N_VERSION}
-RUN \
-	apt-get update && \
-	apt-get -y install graphicsmagick gosu git
-
-# Set a custom user to not have n8n run as root
-USER root
-
-RUN npm_config_user=root npm install -g npm@8.19.2 full-icu n8n@${N8N_VERSION}
-
-ENV NODE_ICU_DATA /usr/local/lib/node_modules/full-icu
-
-WORKDIR /data
-
-COPY docker-entrypoint.sh /docker-entrypoint.sh
-ENTRYPOINT ["/docker-entrypoint.sh"]
-
-EXPOSE 5678/tcp
diff --git a/docker/images/n8n-debian/README.md b/docker/images/n8n-debian/README.md
deleted file mode 100644
index 236305e8ea104..0000000000000
--- a/docker/images/n8n-debian/README.md
+++ /dev/null
@@ -1,20 +0,0 @@
-## n8n - Debian Docker Image
-
-Dockerfile to build n8n with Debian.
-
-For information about how to run n8n with Docker check the generic
-[Docker-Readme](https://github.com/n8n-io/n8n/tree/master/docker/images/n8n/README.md)
-
-```
-docker build --build-arg N8N_VERSION=<VERSION> -t n8nio/n8n:<VERSION> .
-
-# For example:
-docker build --build-arg N8N_VERSION=0.43.0 -t n8nio/n8n:0.43.0-debian .
-```
-
-```
-docker run -it --rm \
-  --name n8n \
-  -p 5678:5678 \
-  n8nio/n8n:0.43.0-debian
-```
diff --git a/docker/images/n8n-debian/docker-entrypoint.sh b/docker/images/n8n-debian/docker-entrypoint.sh
deleted file mode 100755
index 80a252f31e643..0000000000000
--- a/docker/images/n8n-debian/docker-entrypoint.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-if [ -d /root/.n8n ] ; then
-  chmod o+rx /root
-  chown -R node /root/.n8n
-  ln -s /root/.n8n /home/node/
-fi
-
-if [ "$#" -gt 0 ]; then
-  # Got started with arguments
-  exec gosu node "$@"
-else
-  # Got started without arguments
-  exec gosu node n8n
-fi
diff --git a/docker/images/n8n-rhel7/Dockerfile b/docker/images/n8n-rhel7/Dockerfile
deleted file mode 100644
index 09fd0ad019c51..0000000000000
--- a/docker/images/n8n-rhel7/Dockerfile
+++ /dev/null
@@ -1,24 +0,0 @@
-FROM richxsl/rhel7
-
-ARG N8N_VERSION
-
-RUN if [ -z "$N8N_VERSION" ] ; then echo "The N8N_VERSION argument is missing!" ; exit 1; fi
-
-ENV N8N_VERSION=${N8N_VERSION}
-RUN \
-	yum install -y gcc-c++ make
-
-RUN \
-	curl -sL https://rpm.nodesource.com/setup_12.x | sudo -E bash -
-
-RUN \
-	sudo yum install nodejs
-
-# Set a custom user to not have n8n run as root
-USER root
-
-RUN npm_config_user=root npm install -g npm@8.19.2 n8n@${N8N_VERSION}
-
-WORKDIR /data
-
-CMD "n8n"
diff --git a/docker/images/n8n-rhel7/README.md b/docker/images/n8n-rhel7/README.md
deleted file mode 100644
index 559aec3fa2b30..0000000000000
--- a/docker/images/n8n-rhel7/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-## Build Docker-Image
-
-```
-docker build --build-arg N8N_VERSION=<VERSION> -t n8nio/n8n:<VERSION> .
-
-# For example:
-docker build --build-arg N8N_VERSION=0.36.1 -t n8nio/n8n:0.36.1-rhel7 .
-```
-
-```
-docker run -it --rm \
-  --name n8n \
-  -p 5678:5678 \
-  n8nio/n8n:0.25.0-ubuntu
-```
diff --git a/docker/images/n8n/Dockerfile b/docker/images/n8n/Dockerfile
index c85ef12a66b97..af7803820c0bb 100644
--- a/docker/images/n8n/Dockerfile
+++ b/docker/images/n8n/Dockerfile
@@ -1,4 +1,4 @@
-ARG NODE_VERSION=16
+ARG NODE_VERSION=18
 FROM n8nio/base:${NODE_VERSION}
 
 ARG N8N_VERSION
@@ -6,21 +6,21 @@ RUN if [ -z "$N8N_VERSION" ] ; then echo "The N8N_VERSION argument is missing!"
 
 ENV N8N_VERSION=${N8N_VERSION}
 ENV NODE_ENV=production
+ENV N8N_RELEASE_TYPE=stable
 RUN set -eux; \
-	apkArch="$(apk --print-arch)"; \
-	case "$apkArch" in \
-	'armv7') apk --no-cache add --virtual build-dependencies python3 build-base;; \
-	esac && \
-	npm install -g --omit=dev n8n@${N8N_VERSION} && \
-	case "$apkArch" in \
-	'armv7') apk del build-dependencies;; \
-	esac && \
-	find /usr/local/lib/node_modules/n8n -type f -name "*.ts" -o -name "*.js.map" -o -name "*.vue" | xargs rm && \
+	npm install -g --omit=dev n8n@${N8N_VERSION} --ignore-scripts && \
+	npm rebuild --prefix=/usr/local/lib/node_modules/n8n sqlite3 && \
+	rm -rf /usr/local/lib/node_modules/n8n/node_modules/@n8n/chat && \
+	rm -rf /usr/local/lib/node_modules/n8n/node_modules/n8n-design-system && \
+	rm -rf /usr/local/lib/node_modules/n8n/node_modules/n8n-editor-ui/node_modules && \
+	find /usr/local/lib/node_modules/n8n -type f -name "*.ts" -o -name "*.js.map" -o -name "*.vue" | xargs rm -f && \
 	rm -rf /root/.npm
 
-# Set a custom user to not have n8n run as root
-USER root
-WORKDIR /data
-RUN apk --no-cache add su-exec
-COPY docker-entrypoint.sh /docker-entrypoint.sh
+COPY docker-entrypoint.sh /
+
+RUN \
+	mkdir .n8n && \
+	chown node:node .n8n
+ENV SHELL /bin/sh
+USER node
 ENTRYPOINT ["tini", "--", "/docker-entrypoint.sh"]
diff --git a/docker/images/n8n/README.md b/docker/images/n8n/README.md
index 376c4494abb68..d65459615086e 100644
--- a/docker/images/n8n/README.md
+++ b/docker/images/n8n/README.md
@@ -2,27 +2,32 @@
 
 # n8n - Workflow automation tool
 
-n8n is an extendable workflow automation tool. With a [fair-code](http://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 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.
 
 <a href="https://raw.githubusercontent.com/n8n-io/n8n/master/assets/n8n-screenshot.png"><img src="https://raw.githubusercontent.com/n8n-io/n8n/master/assets/n8n-screenshot.png" alt="n8n.io - Screenshot"></a>
 
 ## Contents
 
-- [Demo](#demo)
-- [Available integrations](#available-integrations)
-- [Documentation](#documentation)
-- [Start n8n in Docker](#start-n8n-in-docker)
-- [Start with tunnel](#start-with-tunnel)
-- [Securing n8n](#securing-n8n)
-- [Persist data](#persist-data)
-- [Passing Sensitive Data via File](#passing-sensitive-data-via-file)
-- [Updating a Running docker-compose Instance](#updating-a-running-docker-compose-instance)
-- [Example Setup with Lets Encrypt](#example-setup-with-lets-encrypt)
-- [What does n8n mean and how do you pronounce it](#what-does-n8n-mean-and-how-do-you-pronounce-it)
-- [Support](#support)
-- [Jobs](#jobs)
-- [Upgrading](#upgrading)
-- [License](#license)
+- [n8n - Workflow automation tool](#n8n---workflow-automation-tool)
+	- [Contents](#contents)
+	- [Demo](#demo)
+	- [Available integrations](#available-integrations)
+	- [Documentation](#documentation)
+	- [Start n8n in Docker](#start-n8n-in-docker)
+	- [Start with tunnel](#start-with-tunnel)
+	- [Persist data](#persist-data)
+		- [Start with other Database](#start-with-other-database)
+			- [Use with PostgresDB](#use-with-postgresdb)
+	- [Passing Sensitive Data via File](#passing-sensitive-data-via-file)
+	- [Example Setup with Lets Encrypt](#example-setup-with-lets-encrypt)
+	- [Updating a running docker-compose instance](#updating-a-running-docker-compose-instance)
+	- [Setting Timezone](#setting-timezone)
+	- [Build Docker-Image](#build-docker-image)
+	- [What does n8n mean and how do you pronounce it?](#what-does-n8n-mean-and-how-do-you-pronounce-it)
+	- [Support](#support)
+	- [Jobs](#jobs)
+	- [Upgrading](#upgrading)
+	- [License](#license)
 
 ## Demo
 
@@ -57,7 +62,7 @@ You can then access n8n by opening:
 
 To be able to use webhooks which all triggers of external services like Github
 rely on n8n has to be reachable from the web. To make that easy n8n has a
-special tunnel service (uses this code: [https://github.com/localtunnel/localtunnel](https://github.com/localtunnel/localtunnel)) which redirects requests from our servers to your local
+special tunnel service (uses this code: [https://github.com/n8n-io/localtunnel](https://github.com/n8n-io/localtunnel)) which redirects requests from our servers to your local
 n8n instance.
 
 To use it simply start n8n with `--tunnel`
@@ -71,25 +76,12 @@ docker run -it --rm \
  n8n start --tunnel
 ```
 
-## Securing n8n
-
-By default n8n can be accessed by everybody. This is OK if you have it only running
-locally but if you deploy it on a server which is accessible from the web you have
-to make sure that n8n is protected!
-Right now we have very basic protection via basic-auth in place. It can be activated
-by setting the following environment variables:
-
-```text
-N8N_BASIC_AUTH_ACTIVE=true
-N8N_BASIC_AUTH_USER=<USER>
-N8N_BASIC_AUTH_PASSWORD=<PASSWORD>
-```
-
 ## Persist data
 
 The workflow data gets by default saved in an SQLite database in the user
 folder (`/home/node/.n8n`). That folder also additionally contains the
 settings like webhook URL and encryption key.
+Note that the folder needs to be writable by user with UID/GID 1000.
 
 ```bash
 docker run -it --rm \
@@ -102,10 +94,9 @@ docker run -it --rm \
 ### Start with other Database
 
 By default n8n uses SQLite to save credentials, past executions and workflows.
-n8n however also supports PostgresDB, MySQL and MariaDB. To use them simply a few
-environment variables have to be set.
+n8n however also supports PostgresDB.
 
-It is important to still persist the data in the `/root/.n8n` folder. The reason
+It is important to still persist the data in the `/home/node/.n8n` folder. The reason
 is that it contains n8n user data. That is the name of the webhook
 (in case) the n8n tunnel gets used and even more important the encryption key
 for the credentials. If none gets found n8n creates automatically one on
@@ -135,43 +126,17 @@ docker run -it --rm \
  -e DB_POSTGRESDB_SCHEMA=<POSTGRES_SCHEMA> \
  -e DB_POSTGRESDB_PASSWORD=<POSTGRES_PASSWORD> \
  -v ~/.n8n:/home/node/.n8n \
- docker.n8n.io/n8nio/n8n \
- n8n start
+ docker.n8n.io/n8nio/n8n
 ```
 
-A full working setup with docker-compose can be found [here](https://github.com/n8n-io/n8n/blob/master/docker/compose/withPostgres/README.md)
-
-#### Use with MySQL
-
-Replace the following placeholders with the actual data:
-
-- MYSQLDB_DATABASE
-- MYSQLDB_HOST
-- MYSQLDB_PASSWORD
-- MYSQLDB_PORT
-- MYSQLDB_USER
-
-```bash
-docker run -it --rm \
- --name n8n \
- -p 5678:5678 \
- -e DB_TYPE=mysqldb \
- -e DB_MYSQLDB_DATABASE=<MYSQLDB_DATABASE> \
- -e DB_MYSQLDB_HOST=<MYSQLDB_HOST> \
- -e DB_MYSQLDB_PORT=<MYSQLDB_PORT> \
- -e DB_MYSQLDB_USER=<MYSQLDB_USER> \
- -e DB_MYSQLDB_PASSWORD=<MYSQLDB_PASSWORD> \
- -v ~/.n8n:/home/node/.n8n \
- docker.n8n.io/n8nio/n8n \
- n8n start
-```
+A full working setup with docker-compose can be found [here](https://github.com/n8n-io/n8n-hosting/blob/main/docker-compose/withPostgres/README.md)
 
 ## Passing Sensitive Data via File
 
 To avoid passing sensitive information via environment variables "\_FILE" may be
 appended to some environment variables. It will then load the data from a file
 with the given name. That makes it possible to load data easily from
-Docker- and Kubernetes-Secrets.
+Docker and Kubernetes secrets.
 
 The following environment variables support file input:
 
@@ -181,8 +146,6 @@ The following environment variables support file input:
 - DB_POSTGRESDB_PORT_FILE
 - DB_POSTGRESDB_USER_FILE
 - DB_POSTGRESDB_SCHEMA_FILE
-- N8N_BASIC_AUTH_PASSWORD_FILE
-- N8N_BASIC_AUTH_USER_FILE
 
 ## Example Setup with Lets Encrypt
 
@@ -193,26 +156,25 @@ A basic step by step example setup of n8n with docker-compose and Lets Encrypt i
 
 1. Pull the latest version from the registry
 
-    `docker pull docker.n8n.io/n8nio/n8n`
+   `docker pull docker.n8n.io/n8nio/n8n`
 
 2. Stop the current setup
 
-    `sudo docker-compose stop`
+   `sudo docker-compose stop`
 
 3. Delete it (will only delete the docker-containers, data is stored separately)
 
-    `sudo docker-compose rm`
+   `sudo docker-compose rm`
 
 4. Then start it again
 
-    `sudo docker-compose up -d`
+   `sudo docker-compose up -d`
 
 ## Setting Timezone
 
 To define the timezone n8n should use, the environment variable `GENERIC_TIMEZONE` can
-be set. This gets used by for example the Cron-Node.
-Apart from that can also the timezone of the system be set separately. Which controls what
-some scripts and commands return like `$ date`. The system timezone can be set via
+be set. One instance where this variable is implemented is in the Schedule node. Furthermore, the system's timezone can be set separately,
+which controls the output of certain scripts and commands such as `$ date`. The system timezone can be set via
 the environment variable `TZ`.
 
 Example to use the same timezone for both:
@@ -229,10 +191,10 @@ docker run -it --rm \
 ## Build Docker-Image
 
 ```bash
-docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 --build-arg N8N_VERSION=<VERSION> -t n8n:<VERSION> .
+docker buildx build --platform linux/amd64,linux/arm64 --build-arg N8N_VERSION=<VERSION> -t n8n:<VERSION> .
 
 # For example:
-docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 --build-arg N8N_VERSION=0.114.0 -t n8n:0.114.0 .
+docker buildx build --platform linux/amd64,linux/arm64 --build-arg N8N_VERSION=1.30.1 -t n8n:1.30.1 .
 ```
 
 ## What does n8n mean and how do you pronounce it?
@@ -268,6 +230,6 @@ Before you upgrade to the latest version make sure to check here if there are an
 
 ## License
 
-n8n is [fair-code](http://faircode.io) distributed under the [**Sustainable Use License**](https://github.com/n8n-io/n8n/blob/master/packages/cli/LICENSE.md).
+n8n is [fair-code](https://faircode.io) distributed under the [**Sustainable Use License**](https://github.com/n8n-io/n8n/blob/master/packages/cli/LICENSE.md).
 
 Additional information about the license can be found in the [docs](https://docs.n8n.io/reference/license/).
diff --git a/docker/images/n8n/docker-entrypoint.sh b/docker/images/n8n/docker-entrypoint.sh
index fa81b3713ca54..63a7c1dca6380 100755
--- a/docker/images/n8n/docker-entrypoint.sh
+++ b/docker/images/n8n/docker-entrypoint.sh
@@ -1,17 +1,8 @@
 #!/bin/sh
-
-if [ -d /root/.n8n ] ; then
-  chmod o+rx /root
-  chown -R node /root/.n8n
-  ln -s /root/.n8n /home/node/
-fi
-
-chown -R node /home/node
-
 if [ "$#" -gt 0 ]; then
   # Got started with arguments
-  exec su-exec node "$@"
+  exec n8n "$@"
 else
   # Got started without arguments
-  exec su-exec node n8n
+  exec n8n
 fi
diff --git a/docker/images/n8n/hooks/build b/docker/images/n8n/hooks/build
deleted file mode 100644
index a09c622456a7e..0000000000000
--- a/docker/images/n8n/hooks/build
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-docker build --build-arg N8N_VERSION=$DOCKER_TAG -f $DOCKERFILE_PATH -t $IMAGE_NAME .
diff --git a/jest.config.js b/jest.config.js
index e34e01fa22e7c..f3f7824c14253 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -1,15 +1,17 @@
 const { compilerOptions } = require('./tsconfig.json');
 
+/** @type {import('ts-jest').TsJestGlobalOptions} */
 const tsJestOptions = {
 	isolatedModules: true,
 	tsconfig: {
 		...compilerOptions,
 		declaration: false,
 		sourceMap: true,
-		skipLibCheck: true,
 	},
 };
 
+const { baseUrl, paths } = require('get-tsconfig').getTsconfig().config?.compilerOptions;
+
 /** @type {import('jest').Config} */
 const config = {
 	verbose: true,
@@ -19,11 +21,17 @@ const config = {
 	transform: {
 		'^.+\\.ts$': ['ts-jest', tsJestOptions],
 	},
-	moduleNameMapper: {
-		'^@/(.*)$': '<rootDir>/src/$1',
-	},
-	collectCoverage: true,
-	coverageReporters: [process.env.COVERAGE_REPORT === 'true' ? 'text' : 'text-summary'],
+	// This resolve the path mappings from the tsconfig relative to each jest.config.js
+	moduleNameMapper: Object.entries(paths || {}).reduce((acc, [path, [mapping]]) => {
+		path = `^${path.replace(/\/\*$/, '/(.*)$')}`;
+		mapping = mapping.replace(/^\.\/(?:(.*)\/)?\*$/, '$1');
+		mapping = mapping ? `/${mapping}` : '';
+		acc[path] = '<rootDir>' + (baseUrl ? `/${baseUrl.replace(/^\.\//, '')}` : '') + mapping + '/$1';
+		return acc;
+	}, {}),
+	setupFilesAfterEnv: ['jest-expect-message'],
+	collectCoverage: process.env.COVERAGE_ENABLED === 'true',
+	coverageReporters: ['text-summary'],
 	collectCoverageFrom: ['src/**/*.ts'],
 };
 
diff --git a/package.json b/package.json
index 2ede2cf2b6144..914bf5aa35805 100644
--- a/package.json
+++ b/package.json
@@ -1,18 +1,21 @@
 {
-  "name": "n8n",
-  "version": "0.225.0",
+  "name": "n8n-monorepo",
+  "version": "1.41.0",
   "private": true,
   "homepage": "https://n8n.io",
   "engines": {
-    "node": ">=16.9",
-    "pnpm": ">=8.1"
+    "node": ">=18.10",
+    "pnpm": ">=8.14"
   },
-  "packageManager": "pnpm@8.1.0",
+  "packageManager": "pnpm@8.14.3",
   "scripts": {
     "preinstall": "node scripts/block-npm-install.js",
     "build": "turbo run build",
+    "build:backend": "pnpm --filter=!@n8n/chat --filter=!n8n-design-system --filter=!n8n-editor-ui build",
+    "build:frontend": "pnpm --filter=@n8n/chat --filter=n8n-design-system --filter=n8n-editor-ui build",
     "typecheck": "turbo run typecheck",
-    "dev": "turbo run dev --parallel",
+    "dev": "turbo run dev --parallel --filter=!n8n-design-system --filter=!@n8n/chat",
+    "dev:ai": "turbo run dev --parallel --filter=@n8n/nodes-langchain --filter=n8n --filter=n8n-core",
     "clean": "turbo run clean --parallel",
     "format": "turbo run format && node scripts/format.mjs",
     "lint": "turbo run lint",
@@ -23,73 +26,95 @@
     "start:tunnel": "./packages/cli/bin/n8n start --tunnel",
     "start:windows": "cd packages/cli/bin && n8n",
     "test": "turbo run test",
-    "watch": "turbo run watch",
+    "test:backend": "pnpm --filter=!@n8n/chat --filter=!n8n-design-system --filter=!n8n-editor-ui --filter=!n8n-nodes-base --filter=!@n8n/n8n-nodes-langchain test",
+    "test:nodes": "pnpm --filter=n8n-nodes-base --filter=@n8n/n8n-nodes-langchain test",
+    "test:frontend": "pnpm --filter=@n8n/chat --filter=n8n-design-system --filter=n8n-editor-ui test",
+    "watch": "turbo run watch --parallel",
     "webhook": "./packages/cli/bin/n8n webhook",
     "worker": "./packages/cli/bin/n8n worker",
     "cypress:install": "cypress install",
     "cypress:open": "CYPRESS_BASE_URL=http://localhost:8080 cypress open",
-    "test:e2e:ui": "cross-env E2E_TESTS=true start-server-and-test start http://localhost:5678/favicon.ico 'cypress open'",
-    "test:e2e:dev": "cross-env E2E_TESTS=true CYPRESS_BASE_URL=http://localhost:8080 start-server-and-test dev http://localhost:8080/favicon.ico 'cypress open'",
-    "test:e2e:smoke": "cross-env E2E_TESTS=true start-server-and-test start http://localhost:5678/favicon.ico 'cypress run --headless --spec \"cypress/e2e/0-smoke.cy.ts\"'",
-    "test:e2e:all": "cross-env E2E_TESTS=true start-server-and-test start http://localhost:5678/favicon.ico 'cypress run --headless'"
+    "test:e2e:ui": "scripts/run-e2e.js ui",
+    "test:e2e:dev": "scripts/run-e2e.js dev",
+    "test:e2e:all": "scripts/run-e2e.js all"
   },
   "dependencies": {
+    "@deep-consulting-solutions/incident-handling": "^0.0.37",
+    "@types/lodash.set": "^4.3.9",
+    "@types/lodash.sortby": "^4.7.9",
+    "@types/openapi-to-postmanv2": "^3.2.4",
+    "@types/postman-collection": "^3.5.10",
+    "@types/qrcode": "^1.5.0",
+    "@types/request": "^2.48.12",
+    "@types/request-promise-native": "^1.0.21",
+    "@types/speakeasy": "^2.0.7",
     "@types/strftime": "^0.9.8",
+    "lodash.set": "^4.3.2",
+    "lodash.sortby": "^4.7.0",
     "n8n": "workspace:*",
+    "openapi-to-postmanv2": "^4.20.1",
+    "postman-collection": "^4.4.0",
+    "qrcode": "^1.5.3",
+    "request": "^2.88.2",
+    "request-promise-native": "^1.0.9",
+    "speakeasy": "^2.0.0",
     "strftime": "^0.10.2"
   },
   "devDependencies": {
     "@n8n_io/eslint-config": "workspace:*",
-    "@ngneat/falso": "^6.1.0",
-    "@types/jest": "^29.5.0",
-    "@types/supertest": "^2.0.12",
+    "@ngneat/falso": "^6.4.0",
+    "@types/jest": "^29.5.3",
+    "@types/supertest": "^6.0.2",
+    "@vitest/coverage-v8": "^1.2.1",
     "cross-env": "^7.0.3",
-    "cypress": "^12.8.1",
-    "cypress-real-events": "^1.7.6",
-    "jest": "^29.5.0",
-    "jest-environment-jsdom": "^29.5.0",
-    "jest-mock": "^29.5.0",
+    "cypress": "^13.6.2",
+    "cypress-otp": "^1.0.3",
+    "cypress-real-events": "^1.11.0",
+    "jest": "^29.6.2",
+    "jest-environment-jsdom": "^29.6.2",
+    "jest-expect-message": "^1.1.3",
+    "jest-mock": "^29.6.2",
     "jest-mock-extended": "^3.0.4",
-    "nock": "^13.2.9",
-    "node-fetch": "^2.6.7",
+    "nock": "^13.3.2",
+    "nodemon": "^3.0.1",
     "p-limit": "^3.1.0",
-    "prettier": "^2.8.3",
-    "rimraf": "^3.0.2",
+    "rimraf": "^5.0.1",
     "run-script-os": "^1.0.7",
-    "start-server-and-test": "^1.14.0",
-    "supertest": "^6.3.3",
-    "ts-jest": "^29.1.0",
-    "tsc-watch": "^6.0.0",
-    "turbo": "1.8.8",
-    "typescript": "*"
+    "start-server-and-test": "^2.0.3",
+    "supertest": "^6.3.4",
+    "ts-jest": "^29.1.1",
+    "tsc-alias": "^1.8.7",
+    "tsc-watch": "^6.0.4",
+    "turbo": "1.13.3",
+    "typescript": "*",
+    "vite": "^5.1.6",
+    "vite-plugin-checker": "^0.6.4",
+    "vitest": "^1.3.1",
+    "vue-tsc": "^2.0.6"
   },
   "pnpm": {
     "onlyBuiltDependencies": [
-      "sqlite3",
-      "vue-demi"
+      "sqlite3"
     ],
     "overrides": {
-      "@types/node": "^16.18.12",
-      "browserslist": "^4.21.4",
+      "@types/node": "^18.16.16",
+      "axios": "1.6.7",
       "chokidar": "3.5.2",
-      "decode-uri-component": "0.2.2",
-      "ejs": "^3.1.8",
-      "fork-ts-checker-webpack-plugin": "^6.0.4",
-      "http-cache-semantics": "4.1.1",
-      "jsonwebtoken": "9.0.0",
-      "prettier": "^2.8.3",
-      "tslib": "^2.5.0",
-      "ts-node": "^10.9.1",
-      "typescript": "^5.0.3",
-      "xml2js": "^0.5.0",
-      "cpy@8>globby": "^11.1.0",
-      "qqjs>globby": "^11.1.0"
+      "formidable": "3.5.1",
+      "prettier": "^3.2.5",
+      "semver": "^7.5.4",
+      "tslib": "^2.6.2",
+      "tsconfig-paths": "^4.2.0",
+      "typescript": "^5.4.2"
     },
     "patchedDependencies": {
-      "element-ui@2.15.12": "patches/element-ui@2.15.12.patch",
       "typedi@0.10.0": "patches/typedi@0.10.0.patch",
       "@sentry/cli@2.17.0": "patches/@sentry__cli@2.17.0.patch",
-      "@typescript-eslint/eslint-plugin@5.59.0": "patches/@typescript-eslint__eslint-plugin@5.59.0.patch"
+      "pkce-challenge@3.0.0": "patches/pkce-challenge@3.0.0.patch",
+      "pyodide@0.23.4": "patches/pyodide@0.23.4.patch",
+      "@types/express-serve-static-core@4.17.43": "patches/@types__express-serve-static-core@4.17.43.patch",
+      "@types/ws@8.5.4": "patches/@types__ws@8.5.4.patch",
+      "vite-plugin-checker@0.6.4": "patches/vite-plugin-checker@0.6.4.patch"
     }
   }
 }
diff --git a/packages/@n8n/chat/.eslintignore b/packages/@n8n/chat/.eslintignore
new file mode 100644
index 0000000000000..40a7b4122be25
--- /dev/null
+++ b/packages/@n8n/chat/.eslintignore
@@ -0,0 +1,2 @@
+.eslintrc.cjs
+vitest.config.ts
diff --git a/packages/@n8n/chat/.eslintrc.cjs b/packages/@n8n/chat/.eslintrc.cjs
new file mode 100644
index 0000000000000..a1ad467ea3b92
--- /dev/null
+++ b/packages/@n8n/chat/.eslintrc.cjs
@@ -0,0 +1,10 @@
+const sharedOptions = require('@n8n_io/eslint-config/shared');
+
+/**
+ * @type {import('@types/eslint').ESLint.ConfigData}
+ */
+module.exports = {
+	extends: ['@n8n_io/eslint-config/frontend'],
+
+	...sharedOptions(__dirname, 'frontend'),
+};
diff --git a/packages/@n8n/chat/.gitignore b/packages/@n8n/chat/.gitignore
new file mode 100644
index 0000000000000..38adffa64e830
--- /dev/null
+++ b/packages/@n8n/chat/.gitignore
@@ -0,0 +1,28 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+.DS_Store
+dist
+dist-ssr
+coverage
+*.local
+
+/cypress/videos/
+/cypress/screenshots/
+
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
diff --git a/packages/@n8n/chat/.np-config.json b/packages/@n8n/chat/.np-config.json
new file mode 100644
index 0000000000000..5b1cb0a96ae65
--- /dev/null
+++ b/packages/@n8n/chat/.np-config.json
@@ -0,0 +1,5 @@
+{
+	"yarn": false,
+	"tests": false,
+	"contents": "./dist"
+}
diff --git a/packages/@n8n/chat/.storybook/main.ts b/packages/@n8n/chat/.storybook/main.ts
new file mode 100644
index 0000000000000..0636327e99ad6
--- /dev/null
+++ b/packages/@n8n/chat/.storybook/main.ts
@@ -0,0 +1,4 @@
+import { sharedConfig } from '@n8n/storybook/main';
+
+const config = { ...sharedConfig };
+export default config;
diff --git a/packages/@n8n/chat/.storybook/preview.scss b/packages/@n8n/chat/.storybook/preview.scss
new file mode 100644
index 0000000000000..abaf406f8d257
--- /dev/null
+++ b/packages/@n8n/chat/.storybook/preview.scss
@@ -0,0 +1,4 @@
+html, body, #storybook-root, #n8n-chat {
+	width: 100%;
+	height: 100%;
+}
diff --git a/packages/@n8n/chat/.storybook/preview.ts b/packages/@n8n/chat/.storybook/preview.ts
new file mode 100644
index 0000000000000..fbdb007564016
--- /dev/null
+++ b/packages/@n8n/chat/.storybook/preview.ts
@@ -0,0 +1,15 @@
+import type { Preview } from '@storybook/vue3';
+import './preview.scss';
+
+const preview: Preview = {
+	parameters: {
+		controls: {
+			matchers: {
+				color: /(background|color)$/i,
+				date: /Date$/,
+			},
+		},
+	},
+};
+
+export default preview;
diff --git a/packages/@n8n/chat/.vscode/extensions.json b/packages/@n8n/chat/.vscode/extensions.json
new file mode 100644
index 0000000000000..c0a6e5a48110e
--- /dev/null
+++ b/packages/@n8n/chat/.vscode/extensions.json
@@ -0,0 +1,3 @@
+{
+  "recommendations": ["Vue.volar", "Vue.vscode-typescript-vue-plugin"]
+}
diff --git a/packages/@n8n/chat/LICENSE.md b/packages/@n8n/chat/LICENSE.md
new file mode 100644
index 0000000000000..aab68b6d9301b
--- /dev/null
+++ b/packages/@n8n/chat/LICENSE.md
@@ -0,0 +1,86 @@
+# License
+
+Portions of this software are licensed as follows:
+
+- Content of branches other than the main branch (i.e. "master") are not licensed.
+- Source code files that contain ".ee." in their filename are NOT licensed under the Sustainable Use License.
+  To use source code files that contain ".ee." in their filename you must hold a valid n8n Enterprise License
+  specifically allowing you access to such source code files and as defined in "LICENSE_EE.md".
+- All third party components incorporated into the n8n Software are licensed under the original license
+  provided by the owner of the applicable component.
+- Content outside of the above mentioned files or restrictions is available under the "Sustainable Use
+  License" as defined below.
+
+## Sustainable Use License
+
+Version 1.0
+
+### Acceptance
+
+By using the software, you agree to all of the terms and conditions below.
+
+### Copyright License
+
+The licensor grants you a non-exclusive, royalty-free, worldwide, non-sublicensable, non-transferable license
+to use, copy, distribute, make available, and prepare derivative works of the software, in each case subject
+to the limitations below.
+
+### Limitations
+
+You may use or modify the software only for your own internal business purposes or for non-commercial or
+personal use. You may distribute the software or provide it to others only if you do so free of charge for
+non-commercial purposes. You may not alter, remove, or obscure any licensing, copyright, or other notices of
+the licensor in the software. Any use of the licensor’s trademarks is subject to applicable law.
+
+### Patents
+
+The licensor grants you a license, under any patent claims the licensor can license, or becomes able to
+license, to make, have made, use, sell, offer for sale, import and have imported the software, in each case
+subject to the limitations and conditions in this license. This license does not cover any patent claims that
+you cause to be infringed by modifications or additions to the software. If you or your company make any
+written claim that the software infringes or contributes to infringement of any patent, your patent license
+for the software granted under these terms ends immediately. If your company makes such a claim, your patent
+license ends immediately for work on behalf of your company.
+
+### Notices
+
+You must ensure that anyone who gets a copy of any part of the software from you also gets a copy of these
+terms. If you modify the software, you must include in any modified copies of the software a prominent notice
+stating that you have modified the software.
+
+### No Other Rights
+
+These terms do not imply any licenses other than those expressly granted in these terms.
+
+### Termination
+
+If you use the software in violation of these terms, such use is not licensed, and your license will
+automatically terminate. If the licensor provides you with a notice of your violation, and you cease all
+violation of this license no later than 30 days after you receive that notice, your license will be reinstated
+retroactively. However, if you violate these terms after such reinstatement, any additional violation of these
+terms will cause your license to terminate automatically and permanently.
+
+### No Liability
+
+As far as the law allows, the software comes as is, without any warranty or condition, and the licensor will
+not be liable to you for any damages arising out of these terms or the use or nature of the software, under
+any kind of legal claim.
+
+### Definitions
+
+The “licensor” is the entity offering these terms.
+
+The “software” is the software the licensor makes available under these terms, including any portion of it.
+
+“You” refers to the individual or entity agreeing to these terms.
+
+“Your company” is any legal entity, sole proprietorship, or other kind of organization that you work for, plus
+all organizations that have control over, are under the control of, or are under common control with that
+organization. Control means ownership of substantially all the assets of an entity, or the power to direct its
+management and policies by vote, contract, or otherwise. Control can be direct or indirect.
+
+“Your license” is the license granted to you for the software under these terms.
+
+“Use” means anything you do with the software requiring your license.
+
+“Trademark” means trademarks, service marks, and similar rights.
diff --git a/packages/@n8n/chat/README.md b/packages/@n8n/chat/README.md
new file mode 100644
index 0000000000000..8055e9677761a
--- /dev/null
+++ b/packages/@n8n/chat/README.md
@@ -0,0 +1,269 @@
+# n8n Chat
+This is an embeddable Chat widget for n8n. It allows the execution of AI-Powered Workflows through a Chat window.
+
+**Windowed Example**
+![n8n Chat Windowed](https://raw.githubusercontent.com/n8n-io/n8n/master/packages/%40n8n/chat/resources/images/windowed.png)
+
+**Fullscreen Example**
+![n8n Chat Fullscreen](https://raw.githubusercontent.com/n8n-io/n8n/master/packages/%40n8n/chat/resources/images/fullscreen.png)
+
+## Prerequisites
+Create a n8n workflow which you want to execute via chat. The workflow has to be triggered using a **Chat Trigger** node.
+
+Open the **Chat Trigger** node and add your domain to the **Allowed Origins (CORS)** field. This makes sure that only requests from your domain are accepted.
+
+[See example workflow](https://github.com/n8n-io/n8n/blob/master/packages/%40n8n/chat/resources/workflow.json)
+
+> Make sure the workflow is **Active.**
+
+### How it works
+Each Chat request is sent to the n8n Webhook endpoint, which then sends back a response.
+
+Each request is accompanied by an `action` query parameter, where `action` can be one of:
+- `loadPreviousSession` - When the user opens the Chatbot again and the previous chat session should be loaded
+- `sendMessage` - When the user sends a message
+
+## Installation
+
+Open the **Webhook** node and replace `YOUR_PRODUCTION_WEBHOOK_URL` with your production URL. This is the URL that the Chat widget will use to send requests to.
+
+### a. CDN Embed
+Add the following code to your HTML page.
+
+```html
+<link href="https://cdn.jsdelivr.net/npm/@n8n/chat/style.css" rel="stylesheet" />
+<script type="module">
+	import { createChat } from 'https://cdn.jsdelivr.net/npm/@n8n/chat/chat.bundle.es.js';
+
+	createChat({
+		webhookUrl: 'YOUR_PRODUCTION_WEBHOOK_URL'
+	});
+</script>
+```
+
+### b. Import Embed
+Install and save n8n Chat as a production dependency.
+
+```sh
+npm install @n8n/chat
+```
+
+Import the CSS and use the `createChat` function to initialize your Chat window.
+
+```ts
+import '@n8n/chat/style.css';
+import { createChat } from '@n8n/chat';
+
+createChat({
+	webhookUrl: 'YOUR_PRODUCTION_WEBHOOK_URL'
+});
+```
+
+##### Vue.js
+
+```html
+<script lang="ts" setup>
+// App.vue
+import { onMounted } from 'vue';
+import '@n8n/chat/style.css';
+import { createChat } from '@n8n/chat';
+
+onMounted(() => {
+	createChat({
+		webhookUrl: 'YOUR_PRODUCTION_WEBHOOK_URL'
+	});
+});
+</script>
+<template>
+	<div></div>
+</template>
+```
+
+##### React
+
+```tsx
+// App.tsx
+import { useEffect } from 'react';
+import '@n8n/chat/style.css';
+import { createChat } from '@n8n/chat';
+
+export const App = () => {
+	useEffect(() => {
+		createChat({
+			webhookUrl: 'YOUR_PRODUCTION_WEBHOOK_URL'
+		});
+	}, []);
+
+	return (<div></div>);
+};
+```
+
+## Options
+The default options are:
+
+```ts
+createChat({
+	webhookUrl: '',
+	webhookConfig: {
+		method: 'POST',
+		headers: {}
+	},
+	target: '#n8n-chat',
+	mode: 'window',
+	chatInputKey: 'chatInput',
+	chatSessionKey: 'sessionId',
+	metadata: {},
+	showWelcomeScreen: false,
+	defaultLanguage: 'en',
+	initialMessages: [
+		'Hi there! 👋',
+		'My name is Nathan. How can I assist you today?'
+	],
+	i18n: {
+		en: {
+			title: 'Hi there! 👋',
+			subtitle: "Start a chat. We're here to help you 24/7.",
+			footer: '',
+			getStarted: 'New Conversation',
+			inputPlaceholder: 'Type your question..',
+		},
+	},
+});
+```
+
+### `webhookUrl`
+- **Type**: `string`
+- **Required**: `true`
+- **Examples**:
+	- `https://yourname.app.n8n.cloud/webhook/513107b3-6f3a-4a1e-af21-659f0ed14183`
+	- `http://localhost:5678/webhook/513107b3-6f3a-4a1e-af21-659f0ed14183`
+- **Description**: The URL of the n8n Webhook endpoint. Should be the production URL.
+
+### `webhookConfig`
+- **Type**: `{ method: string, headers: Record<string, string> }`
+- **Default**: `{ method: 'POST', headers: {} }`
+- **Description**: The configuration for the Webhook request.
+
+### `target`
+- **Type**: `string`
+- **Default**: `'#n8n-chat'`
+- **Description**: The CSS selector of the element where the Chat window should be embedded.
+
+### `mode`
+- **Type**: `'window' | 'fullscreen'`
+- **Default**: `'window'`
+- **Description**: The render mode of the Chat window.
+  - In `window` mode, the Chat window will be embedded in the target element as a chat toggle button and a fixed size chat window.
+  - In `fullscreen` mode, the Chat will take up the entire width and height of its target container.
+
+### `showWelcomeScreen`
+- **Type**: `boolean`
+- **Default**: `false`
+- **Description**: Whether to show the welcome screen when the Chat window is opened.
+
+### `chatSessionKey`
+- **Type**: `string`
+- **Default**: `'sessionId'`
+- **Description**: The key to use for sending the chat history session ID for the AI Memory node.
+
+### `chatInputKey`
+- **Type**: `string`
+- **Default**: `'chatInput'`
+- **Description**: The key to use for sending the chat input for the AI Agent node.
+
+### `defaultLanguage`
+- **Type**: `string`
+- **Default**: `'en'`
+- **Description**: The default language of the Chat window. Currently only `en` is supported.
+
+### `i18n`
+- **Type**: `{ [key: string]: Record<string, string> }`
+- **Description**: The i18n configuration for the Chat window. Currently only `en` is supported.
+
+### `initialMessages`
+- **Type**: `string[]`
+- **Description**: The initial messages to be displayed in the Chat window.
+
+## Customization
+The Chat window is entirely customizable using CSS variables.
+
+```css
+:root {
+	--chat--color-primary: #e74266;
+	--chat--color-primary-shade-50: #db4061;
+	--chat--color-primary-shade-100: #cf3c5c;
+	--chat--color-secondary: #20b69e;
+	--chat--color-secondary-shade-50: #1ca08a;
+	--chat--color-white: #ffffff;
+	--chat--color-light: #f2f4f8;
+	--chat--color-light-shade-50: #e6e9f1;
+	--chat--color-light-shade-100: #c2c5cc;
+	--chat--color-medium: #d2d4d9;
+	--chat--color-dark: #101330;
+	--chat--color-disabled: #777980;
+	--chat--color-typing: #404040;
+
+	--chat--spacing: 1rem;
+	--chat--border-radius: 0.25rem;
+	--chat--transition-duration: 0.15s;
+
+	--chat--window--width: 400px;
+	--chat--window--height: 600px;
+
+	--chat--header-height: auto;
+	--chat--header--padding: var(--chat--spacing);
+	--chat--header--background: var(--chat--color-dark);
+	--chat--header--color: var(--chat--color-light);
+	--chat--header--border-top: none;
+	--chat--header--border-bottom: none;
+	--chat--header--border-bottom: none;
+	--chat--header--border-bottom: none;
+	--chat--heading--font-size: 2em;
+	--chat--header--color: var(--chat--color-light);
+	--chat--subtitle--font-size: inherit;
+	--chat--subtitle--line-height: 1.8;
+
+	--chat--textarea--height: 50px;
+
+	--chat--message--font-size: 1rem;
+	--chat--message--padding: var(--chat--spacing);
+	--chat--message--border-radius: var(--chat--border-radius);
+	--chat--message-line-height: 1.8;
+	--chat--message--bot--background: var(--chat--color-white);
+	--chat--message--bot--color: var(--chat--color-dark);
+	--chat--message--bot--border: none;
+	--chat--message--user--background: var(--chat--color-secondary);
+	--chat--message--user--color: var(--chat--color-white);
+	--chat--message--user--border: none;
+	--chat--message--pre--background: rgba(0, 0, 0, 0.05);
+
+	--chat--toggle--background: var(--chat--color-primary);
+	--chat--toggle--hover--background: var(--chat--color-primary-shade-50);
+	--chat--toggle--active--background: var(--chat--color-primary-shade-100);
+	--chat--toggle--color: var(--chat--color-white);
+	--chat--toggle--size: 64px;
+}
+```
+
+## Caveats
+
+### Fullscreen mode
+In fullscreen mode, the Chat window will take up the entire width and height of its target container. Make sure that the container has a set width and height.
+
+```css
+html,
+body,
+#n8n-chat {
+	width: 100%;
+	height: 100%;
+}
+```
+
+## License
+n8n Chat is [fair-code](https://faircode.io) distributed under the
+[**Sustainable Use License**](https://github.com/n8n-io/n8n/blob/master/packages/cli/LICENSE.md).
+
+Proprietary licenses are available for enterprise customers. [Get in touch](mailto:license@n8n.io)
+
+Additional information about the license model can be found in the
+[docs](https://docs.n8n.io/reference/license/).
diff --git a/packages/@n8n/chat/build.config.js b/packages/@n8n/chat/build.config.js
new file mode 100644
index 0000000000000..9d5910dbe778b
--- /dev/null
+++ b/packages/@n8n/chat/build.config.js
@@ -0,0 +1,21 @@
+import { defineBuildConfig } from 'unbuild';
+
+export default defineBuildConfig({
+	entries: [
+		{
+			builder: 'mkdist',
+			format: 'esm',
+			input: './src',
+			outDir: './tmp/lib',
+		},
+		{
+			builder: 'mkdist',
+			format: 'cjs',
+			input: './src',
+			outDir: './tmp/cjs',
+		},
+	],
+	clean: true,
+	declaration: true,
+	failOnWarn: false,
+});
diff --git a/packages/@n8n/chat/env.d.ts b/packages/@n8n/chat/env.d.ts
new file mode 100644
index 0000000000000..11f02fe2a0061
--- /dev/null
+++ b/packages/@n8n/chat/env.d.ts
@@ -0,0 +1 @@
+/// <reference types="vite/client" />
diff --git a/packages/@n8n/chat/index.html b/packages/@n8n/chat/index.html
new file mode 100644
index 0000000000000..a888544898a50
--- /dev/null
+++ b/packages/@n8n/chat/index.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8">
+    <link rel="icon" href="/favicon.ico">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Vite App</title>
+  </head>
+  <body>
+    <div id="app"></div>
+    <script type="module" src="/src/main.ts"></script>
+  </body>
+</html>
diff --git a/packages/@n8n/chat/package.json b/packages/@n8n/chat/package.json
new file mode 100644
index 0000000000000..092987cf0e7d7
--- /dev/null
+++ b/packages/@n8n/chat/package.json
@@ -0,0 +1,63 @@
+{
+  "name": "@n8n/chat",
+  "version": "0.14.0",
+  "scripts": {
+    "dev": "pnpm run storybook",
+    "build": "pnpm type-check && pnpm build:vite && pnpm run build:individual && npm run build:prepare",
+    "build:full": "pnpm type-check && pnpm build:vite && pnpm build:vite:full && pnpm run build:individual && npm run build:prepare",
+    "build:vite": "vite build",
+    "build:vite:full": "INCLUDE_VUE=true vite build",
+    "build:individual": "unbuild",
+    "build:prepare": "node scripts/postbuild.js",
+    "build:pack": "node scripts/pack.js",
+    "preview": "vite preview",
+    "test:dev": "vitest",
+    "test": "vitest run --coverage",
+    "type-check": "vue-tsc --noEmit -p tsconfig.json --composite false",
+    "lint": "eslint . --ext .js,.ts,.vue --quiet",
+    "lintfix": "eslint . --ext .js,.ts,.vue --fix",
+    "format": "prettier --write src/",
+    "storybook": "storybook dev -p 6006 --no-open",
+    "build:storybook": "storybook build",
+    "release": "pnpm run build:full && cd dist && pnpm publish"
+  },
+  "main": "./chat.umd.js",
+  "module": "./chat.es.js",
+  "types": "./types/index.d.ts",
+  "exports": {
+    ".": {
+      "import": "./index.mjs",
+      "require": "./index.js"
+    },
+    "./style.css": {
+      "import": "./style.css",
+      "require": "./style.css"
+    },
+    "./*": {
+      "import": "./*",
+      "require": "./*"
+    }
+  },
+  "dependencies": {
+    "highlight.js": "^11.8.0",
+    "markdown-it-link-attributes": "^4.0.1",
+    "uuid": "^8.3.2",
+    "vue": "^3.4.21",
+    "vue-markdown-render": "^2.1.1"
+  },
+  "devDependencies": {
+    "@iconify-json/mdi": "^1.1.54",
+    "@n8n/storybook": "workspace:*",
+    "@types/markdown-it": "^12.2.3",
+    "shelljs": "^0.8.5",
+    "unbuild": "^2.0.0",
+    "unplugin-icons": "^0.17.0",
+    "vite-plugin-dts": "^3.7.3"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/n8n-io/n8n.git"
+  },
+  "license": "SEE LICENSE IN LICENSE.md",
+  "homepage": "https://n8n.io"
+}
diff --git a/packages/@n8n/chat/public/favicon.ico b/packages/@n8n/chat/public/favicon.ico
new file mode 100644
index 0000000000000..df36fcfb72584
Binary files /dev/null and b/packages/@n8n/chat/public/favicon.ico differ
diff --git a/packages/@n8n/chat/resources/images/fullscreen.png b/packages/@n8n/chat/resources/images/fullscreen.png
new file mode 100644
index 0000000000000..4c3f5aed4eb7e
Binary files /dev/null and b/packages/@n8n/chat/resources/images/fullscreen.png differ
diff --git a/packages/@n8n/chat/resources/images/windowed.png b/packages/@n8n/chat/resources/images/windowed.png
new file mode 100644
index 0000000000000..1a598c823e57c
Binary files /dev/null and b/packages/@n8n/chat/resources/images/windowed.png differ
diff --git a/packages/@n8n/chat/resources/workflow-manual.json b/packages/@n8n/chat/resources/workflow-manual.json
new file mode 100644
index 0000000000000..a21028b9fb6b6
--- /dev/null
+++ b/packages/@n8n/chat/resources/workflow-manual.json
@@ -0,0 +1,238 @@
+{
+  "name": "Hosted n8n AI Chat Manual",
+  "nodes": [
+    {
+      "parameters": {
+        "options": {}
+      },
+      "id": "e6043748-44fc-4019-9301-5690fe26c614",
+      "name": "OpenAI Chat Model",
+      "type": "@n8n/n8n-nodes-langchain.lmChatOpenAi",
+      "typeVersion": 1,
+      "position": [
+        860,
+        540
+      ],
+      "credentials": {
+        "openAiApi": {
+          "id": "cIIkOhl7tUX1KsL6",
+          "name": "OpenAi account"
+        }
+      }
+    },
+    {
+      "parameters": {
+        "sessionKey": "={{ $json.sessionId }}"
+      },
+      "id": "0a68a59a-8ab6-4fa5-a1ea-b7f99a93109b",
+      "name": "Window Buffer Memory",
+      "type": "@n8n/n8n-nodes-langchain.memoryBufferWindow",
+      "typeVersion": 1,
+      "position": [
+        640,
+        540
+      ]
+    },
+    {
+      "parameters": {
+        "text": "={{ $json.chatInput }}",
+        "options": {}
+      },
+      "id": "3d4e0fbf-d761-4569-b02e-f5c1eeb830c8",
+      "name": "AI Agent",
+      "type": "@n8n/n8n-nodes-langchain.agent",
+      "typeVersion": 1.1,
+      "position": [
+        840,
+        300
+      ]
+    },
+    {
+      "parameters": {
+        "dataType": "string",
+        "value1": "={{ $json.action }}",
+        "rules": {
+          "rules": [
+            {
+              "value2": "loadPreviousSession",
+              "outputKey": "loadPreviousSession"
+            },
+            {
+              "value2": "sendMessage",
+              "outputKey": "sendMessage"
+            }
+          ]
+        }
+      },
+      "id": "84213c7b-abc7-4f40-9567-cd3484a4ae6b",
+      "name": "Switch",
+      "type": "n8n-nodes-base.switch",
+      "typeVersion": 2,
+      "position": [
+        300,
+        280
+      ]
+    },
+    {
+      "parameters": {
+        "simplifyOutput": false
+      },
+      "id": "3be7f076-98ed-472a-80b6-bf8d9538ac87",
+      "name": "Chat Messages Retriever",
+      "type": "@n8n/n8n-nodes-langchain.memoryChatRetriever",
+      "typeVersion": 1,
+      "position": [
+        620,
+        140
+      ]
+    },
+    {
+      "parameters": {
+        "options": {}
+      },
+      "id": "3417c644-8a91-4524-974a-45b4a46d0e2e",
+      "name": "Respond to Webhook",
+      "type": "n8n-nodes-base.respondToWebhook",
+      "typeVersion": 1,
+      "position": [
+        1240,
+        140
+      ]
+    },
+    {
+      "parameters": {
+        "public": true,
+        "authentication": "n8nUserAuth",
+        "options": {
+          "loadPreviousSession": "manually",
+          "responseMode": "responseNode"
+        }
+      },
+      "id": "1b30c239-a819-45b4-b0ae-bdd5b92a5424",
+      "name": "Chat Trigger",
+      "type": "@n8n/n8n-nodes-langchain.chatTrigger",
+      "typeVersion": 1,
+      "position": [
+        80,
+        280
+      ],
+      "webhookId": "ed3dea26-7d68-42b3-9032-98fe967d441d"
+    },
+    {
+      "parameters": {
+        "aggregate": "aggregateAllItemData",
+        "options": {}
+      },
+      "id": "79672cf0-686b-41eb-90ae-fd31b6da837d",
+      "name": "Aggregate",
+      "type": "n8n-nodes-base.aggregate",
+      "typeVersion": 1,
+      "position": [
+        1000,
+        140
+      ]
+    }
+  ],
+  "pinData": {},
+  "connections": {
+    "OpenAI Chat Model": {
+      "ai_languageModel": [
+        [
+          {
+            "node": "AI Agent",
+            "type": "ai_languageModel",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Window Buffer Memory": {
+      "ai_memory": [
+        [
+          {
+            "node": "AI Agent",
+            "type": "ai_memory",
+            "index": 0
+          },
+          {
+            "node": "Chat Messages Retriever",
+            "type": "ai_memory",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Switch": {
+      "main": [
+        [
+          {
+            "node": "Chat Messages Retriever",
+            "type": "main",
+            "index": 0
+          }
+        ],
+        [
+          {
+            "node": "AI Agent",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Chat Messages Retriever": {
+      "main": [
+        [
+          {
+            "node": "Aggregate",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "AI Agent": {
+      "main": [
+        [
+          {
+            "node": "Respond to Webhook",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Chat Trigger": {
+      "main": [
+        [
+          {
+            "node": "Switch",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Aggregate": {
+      "main": [
+        [
+          {
+            "node": "Respond to Webhook",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": true,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "425c0efe-3aa0-4e0e-8c06-abe12234b1fd",
+  "id": "1569HF92Y02EUtsU",
+  "meta": {
+    "instanceId": "374b43d8b8d6299cc777811a4ad220fc688ee2d54a308cfb0de4450a5233ca9e"
+  },
+  "tags": []
+}
\ No newline at end of file
diff --git a/packages/@n8n/chat/resources/workflow.json b/packages/@n8n/chat/resources/workflow.json
new file mode 100644
index 0000000000000..1bf4be681bc11
--- /dev/null
+++ b/packages/@n8n/chat/resources/workflow.json
@@ -0,0 +1,119 @@
+{
+	"name": "Hosted n8n AI Chat",
+	"nodes": [
+		{
+			"parameters": {
+				"options": {}
+			},
+			"id": "4c109d13-62a2-4e23-9979-e50201db743d",
+			"name": "OpenAI Chat Model",
+			"type": "@n8n/n8n-nodes-langchain.lmChatOpenAi",
+			"typeVersion": 1,
+			"position": [
+				640,
+				540
+			],
+			"credentials": {
+				"openAiApi": {
+					"id": "cIIkOhl7tUX1KsL6",
+					"name": "OpenAi account"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"sessionKey": "={{ $json.sessionId }}"
+			},
+			"id": "b416df7b-4802-462f-8f74-f0a71dc4c0be",
+			"name": "Window Buffer Memory",
+			"type": "@n8n/n8n-nodes-langchain.memoryBufferWindow",
+			"typeVersion": 1,
+			"position": [
+				340,
+				540
+			]
+		},
+		{
+			"parameters": {
+				"text": "={{ $json.chatInput }}",
+				"options": {}
+			},
+			"id": "4de25807-a2ef-4453-900e-e00e0021ecdc",
+			"name": "AI Agent",
+			"type": "@n8n/n8n-nodes-langchain.agent",
+			"typeVersion": 1.1,
+			"position": [
+				620,
+				300
+			]
+		},
+		{
+			"parameters": {
+				"public": true,
+				"options": {
+					"loadPreviousSession": "memory"
+				}
+			},
+			"id": "5a9612ae-51c1-4be2-bd8b-8556872d1149",
+			"name": "Chat Trigger",
+			"type": "@n8n/n8n-nodes-langchain.chatTrigger",
+			"typeVersion": 1,
+			"position": [
+				340,
+				300
+			],
+			"webhookId": "f406671e-c954-4691-b39a-66c90aa2f103"
+		}
+	],
+	"pinData": {},
+	"connections": {
+		"OpenAI Chat Model": {
+			"ai_languageModel": [
+				[
+					{
+						"node": "AI Agent",
+						"type": "ai_languageModel",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Window Buffer Memory": {
+			"ai_memory": [
+				[
+					{
+						"node": "AI Agent",
+						"type": "ai_memory",
+						"index": 0
+					},
+					{
+						"node": "Chat Trigger",
+						"type": "ai_memory",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Chat Trigger": {
+			"main": [
+				[
+					{
+						"node": "AI Agent",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": true,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "6076136f-fdb4-48d9-b483-d1c24c95ef9e",
+	"id": "zaBHnDtj22BzEQ6K",
+	"meta": {
+		"instanceId": "374b43d8b8d6299cc777811a4ad220fc688ee2d54a308cfb0de4450a5233ca9e"
+	},
+	"tags": []
+}
diff --git a/packages/@n8n/chat/scripts/pack.js b/packages/@n8n/chat/scripts/pack.js
new file mode 100644
index 0000000000000..0dffb892e4e33
--- /dev/null
+++ b/packages/@n8n/chat/scripts/pack.js
@@ -0,0 +1,11 @@
+const path = require('path');
+const shelljs = require('shelljs');
+
+const rootDirPath = path.resolve(__dirname, '..');
+const distDirPath = path.resolve(rootDirPath, 'dist');
+
+shelljs.cd(rootDirPath);
+shelljs.exec('npm run build');
+
+shelljs.cd(distDirPath);
+shelljs.exec('npm pack');
diff --git a/packages/@n8n/chat/scripts/postbuild.js b/packages/@n8n/chat/scripts/postbuild.js
new file mode 100644
index 0000000000000..2ce6a4e8c28be
--- /dev/null
+++ b/packages/@n8n/chat/scripts/postbuild.js
@@ -0,0 +1,36 @@
+const path = require('path');
+const shelljs = require('shelljs');
+const glob = require('fast-glob');
+
+const rootDirPath = path.resolve(__dirname, '..');
+const n8nRootDirPath = path.resolve(rootDirPath, '..', '..', '..');
+const distDirPath = path.resolve(rootDirPath, 'dist');
+const srcDirPath = path.resolve(rootDirPath, 'src');
+const libDirPath = path.resolve(rootDirPath, 'tmp', 'lib');
+const cjsDirPath = path.resolve(rootDirPath, 'tmp', 'cjs');
+
+const packageJsonFilePath = path.resolve(rootDirPath, 'package.json');
+const readmeFilePath = path.resolve(rootDirPath, 'README.md');
+const licenseFilePath = path.resolve(n8nRootDirPath, 'LICENSE.md');
+
+shelljs.cp(packageJsonFilePath, distDirPath);
+shelljs.cp(readmeFilePath, distDirPath);
+shelljs.cp(licenseFilePath, distDirPath);
+
+shelljs.mv(path.resolve(distDirPath, 'src'), path.resolve(distDirPath, 'types'));
+
+function moveFiles(files, from, to) {
+	files.forEach((file) => {
+		const toFile = file.replace(from, to);
+		shelljs.mkdir('-p', path.dirname(toFile));
+		shelljs.mv(file, toFile);
+	});
+}
+
+const cjsFiles = glob.sync(path.resolve(cjsDirPath, '**', '*'));
+moveFiles(cjsFiles, 'tmp/cjs', 'dist');
+shelljs.rm('-rf', cjsDirPath);
+
+const libFiles = glob.sync(path.resolve(libDirPath, '**/*'));
+moveFiles(libFiles, 'tmp/lib', 'dist');
+shelljs.rm('-rf', libDirPath);
diff --git a/packages/@n8n/chat/src/App.vue b/packages/@n8n/chat/src/App.vue
new file mode 100644
index 0000000000000..ec90bef42583e
--- /dev/null
+++ b/packages/@n8n/chat/src/App.vue
@@ -0,0 +1,23 @@
+<script lang="ts" setup>
+import { computed, onMounted } from 'vue';
+import hljs from 'highlight.js/lib/core';
+import hljsXML from 'highlight.js/lib/languages/xml';
+import hljsJavascript from 'highlight.js/lib/languages/javascript';
+import { Chat, ChatWindow } from '@n8n/chat/components';
+import { useOptions } from '@n8n/chat/composables';
+
+defineProps({});
+
+const { options } = useOptions();
+
+const isFullscreen = computed<boolean>(() => options.mode === 'fullscreen');
+
+onMounted(() => {
+	hljs.registerLanguage('xml', hljsXML);
+	hljs.registerLanguage('javascript', hljsJavascript);
+});
+</script>
+<template>
+	<Chat v-if="isFullscreen" class="n8n-chat" />
+	<ChatWindow v-else class="n8n-chat" />
+</template>
diff --git a/packages/@n8n/chat/src/__stories__/App.stories.ts b/packages/@n8n/chat/src/__stories__/App.stories.ts
new file mode 100644
index 0000000000000..ca93cdb240d1c
--- /dev/null
+++ b/packages/@n8n/chat/src/__stories__/App.stories.ts
@@ -0,0 +1,43 @@
+/* eslint-disable @typescript-eslint/naming-convention */
+import type { StoryObj } from '@storybook/vue3';
+import { onMounted } from 'vue';
+import type { ChatOptions } from '@n8n/chat/types';
+import { createChat } from '@n8n/chat/index';
+
+const webhookUrl = 'http://localhost:5678/webhook/f406671e-c954-4691-b39a-66c90aa2f103/chat';
+
+const meta = {
+	title: 'Chat',
+	render: (args: Partial<ChatOptions>) => ({
+		setup() {
+			onMounted(() => {
+				createChat(args);
+			});
+
+			return {};
+		},
+		template: '<div id="n8n-chat" />',
+	}),
+	parameters: {
+		layout: 'fullscreen',
+	},
+	tags: ['autodocs'],
+};
+
+// eslint-disable-next-line import/no-default-export
+export default meta;
+type Story = StoryObj<typeof meta>;
+
+export const Fullscreen: Story = {
+	args: {
+		webhookUrl,
+		mode: 'fullscreen',
+	} satisfies Partial<ChatOptions>,
+};
+
+export const Windowed: Story = {
+	args: {
+		webhookUrl,
+		mode: 'window',
+	} satisfies Partial<ChatOptions>,
+};
diff --git a/packages/@n8n/chat/src/__tests__/index.spec.ts b/packages/@n8n/chat/src/__tests__/index.spec.ts
new file mode 100644
index 0000000000000..5307880d67fa5
--- /dev/null
+++ b/packages/@n8n/chat/src/__tests__/index.spec.ts
@@ -0,0 +1,218 @@
+import { fireEvent, waitFor } from '@testing-library/vue';
+import {
+	createFetchResponse,
+	createGetLatestMessagesResponse,
+	createSendMessageResponse,
+	getChatInputSendButton,
+	getChatInputTextarea,
+	getChatMessage,
+	getChatMessageByText,
+	getChatMessages,
+	getChatMessageTyping,
+	getChatWindowToggle,
+	getChatWindowWrapper,
+	getChatWrapper,
+	getGetStartedButton,
+	getMountingTarget,
+} from '@n8n/chat/__tests__/utils';
+import { createChat } from '@n8n/chat/index';
+
+describe('createChat()', () => {
+	let app: ReturnType<typeof createChat>;
+
+	afterEach(() => {
+		vi.clearAllMocks();
+
+		app.unmount();
+	});
+
+	describe('mode', () => {
+		it('should create fullscreen chat app with default options', () => {
+			const fetchSpy = vi.spyOn(window, 'fetch');
+			fetchSpy.mockImplementationOnce(createFetchResponse(createGetLatestMessagesResponse()));
+
+			app = createChat({
+				mode: 'fullscreen',
+			});
+
+			expect(getMountingTarget()).toBeVisible();
+			expect(getChatWrapper()).toBeVisible();
+			expect(getChatWindowWrapper()).not.toBeInTheDocument();
+		});
+
+		it('should create window chat app with default options', () => {
+			const fetchSpy = vi.spyOn(window, 'fetch');
+			fetchSpy.mockImplementationOnce(createFetchResponse(createGetLatestMessagesResponse()));
+
+			app = createChat({
+				mode: 'window',
+			});
+
+			expect(getMountingTarget()).toBeDefined();
+			expect(getChatWindowWrapper()).toBeVisible();
+			expect(getChatWrapper()).not.toBeVisible();
+		});
+
+		it('should open window chat app using toggle button', async () => {
+			const fetchSpy = vi.spyOn(window, 'fetch');
+			fetchSpy.mockImplementationOnce(createFetchResponse(createGetLatestMessagesResponse()));
+
+			app = createChat();
+
+			expect(getMountingTarget()).toBeVisible();
+			expect(getChatWindowWrapper()).toBeVisible();
+
+			const trigger = getChatWindowToggle();
+			await fireEvent.click(trigger as HTMLElement);
+
+			expect(getChatWrapper()).toBeVisible();
+		});
+	});
+
+	describe('loadPreviousMessages', () => {
+		it('should load previous messages on mount', async () => {
+			const fetchSpy = vi.spyOn(global, 'fetch');
+			fetchSpy.mockImplementation(createFetchResponse(createGetLatestMessagesResponse()));
+
+			app = createChat({
+				mode: 'fullscreen',
+				showWelcomeScreen: true,
+			});
+
+			const getStartedButton = getGetStartedButton();
+			await fireEvent.click(getStartedButton as HTMLElement);
+
+			expect(fetchSpy.mock.calls[0][1]).toEqual(
+				expect.objectContaining({
+					method: 'POST',
+					headers: {
+						'Content-Type': 'application/json',
+					},
+					body: expect.stringContaining('"action":"loadPreviousSession"') as unknown,
+					mode: 'cors',
+					cache: 'no-cache',
+				}),
+			);
+		});
+	});
+
+	describe('initialMessages', () => {
+		it.each(['fullscreen', 'window'] as Array<'fullscreen' | 'window'>)(
+			'should show initial default messages in %s mode',
+			async (mode) => {
+				const fetchSpy = vi.spyOn(window, 'fetch');
+				fetchSpy.mockImplementationOnce(createFetchResponse(createGetLatestMessagesResponse()));
+
+				const initialMessages = ['Hello tester!', 'How are you?'];
+				app = createChat({
+					mode,
+					initialMessages,
+				});
+
+				if (mode === 'window') {
+					const trigger = getChatWindowToggle();
+					await fireEvent.click(trigger as HTMLElement);
+				}
+
+				expect(getChatMessages().length).toBe(initialMessages.length);
+				expect(getChatMessageByText(initialMessages[0])).toBeInTheDocument();
+				expect(getChatMessageByText(initialMessages[1])).toBeInTheDocument();
+			},
+		);
+	});
+
+	describe('sendMessage', () => {
+		it.each(['window', 'fullscreen'] as Array<'fullscreen' | 'window'>)(
+			'should send a message and render a text message in %s mode',
+			async (mode) => {
+				const input = 'Hello User World!';
+				const output = 'Hello Bot World!';
+
+				const fetchSpy = vi.spyOn(window, 'fetch');
+				fetchSpy
+					.mockImplementationOnce(createFetchResponse(createGetLatestMessagesResponse))
+					.mockImplementationOnce(createFetchResponse(createSendMessageResponse(output)));
+
+				app = createChat({
+					mode,
+				});
+
+				if (mode === 'window') {
+					const trigger = getChatWindowToggle();
+					await fireEvent.click(trigger as HTMLElement);
+				}
+
+				expect(getChatMessageTyping()).not.toBeInTheDocument();
+				expect(getChatMessages().length).toBe(2);
+
+				await waitFor(() => expect(getChatInputTextarea()).toBeInTheDocument());
+
+				const textarea = getChatInputTextarea();
+				const sendButton = getChatInputSendButton();
+				await fireEvent.update(textarea as HTMLElement, input);
+				expect(sendButton).not.toBeDisabled();
+				await fireEvent.click(sendButton as HTMLElement);
+
+				expect(fetchSpy.mock.calls[1][1]).toEqual(
+					expect.objectContaining({
+						method: 'POST',
+						headers: {
+							'Content-Type': 'application/json',
+						},
+						body: expect.stringMatching(/"action":"sendMessage"/) as unknown,
+						mode: 'cors',
+						cache: 'no-cache',
+					}),
+				);
+				expect(fetchSpy.mock.calls[1][1]?.body).toContain(`"${input}"`);
+
+				expect(getChatMessages().length).toBe(3);
+				expect(getChatMessageByText(input)).toBeInTheDocument();
+				expect(getChatMessageTyping()).toBeVisible();
+
+				await waitFor(() => expect(getChatMessageTyping()).not.toBeInTheDocument());
+				expect(getChatMessageByText(output)).toBeInTheDocument();
+			},
+		);
+
+		it.each(['fullscreen', 'window'] as Array<'fullscreen' | 'window'>)(
+			'should send a message and render a code markdown message in %s mode',
+			async (mode) => {
+				const input = 'Teach me javascript!';
+				const output = '# Code\n```js\nconsole.log("Hello World!");\n```';
+
+				const fetchSpy = vi.spyOn(window, 'fetch');
+				fetchSpy
+					.mockImplementationOnce(createFetchResponse(createGetLatestMessagesResponse))
+					.mockImplementationOnce(createFetchResponse(createSendMessageResponse(output)));
+
+				app = createChat({
+					mode,
+				});
+
+				if (mode === 'window') {
+					const trigger = getChatWindowToggle();
+					await fireEvent.click(trigger as HTMLElement);
+				}
+
+				await waitFor(() => expect(getChatInputTextarea()).toBeInTheDocument());
+
+				const textarea = getChatInputTextarea();
+				const sendButton = getChatInputSendButton();
+				await fireEvent.update(textarea as HTMLElement, input);
+				await fireEvent.click(sendButton as HTMLElement);
+
+				expect(getChatMessageByText(input)).toBeInTheDocument();
+				expect(getChatMessages().length).toBe(3);
+
+				await waitFor(() => expect(getChatMessageTyping()).not.toBeInTheDocument());
+
+				const lastMessage = getChatMessage(-1);
+				expect(lastMessage).toBeInTheDocument();
+
+				expect(lastMessage.querySelector('h1')).toHaveTextContent('Code');
+				expect(lastMessage.querySelector('code')).toHaveTextContent('console.log("Hello World!");');
+			},
+		);
+	});
+});
diff --git a/packages/@n8n/chat/src/__tests__/setup.ts b/packages/@n8n/chat/src/__tests__/setup.ts
new file mode 100644
index 0000000000000..7b0828bfa80fb
--- /dev/null
+++ b/packages/@n8n/chat/src/__tests__/setup.ts
@@ -0,0 +1 @@
+import '@testing-library/jest-dom';
diff --git a/packages/@n8n/chat/src/__tests__/utils/create.ts b/packages/@n8n/chat/src/__tests__/utils/create.ts
new file mode 100644
index 0000000000000..db34921acd489
--- /dev/null
+++ b/packages/@n8n/chat/src/__tests__/utils/create.ts
@@ -0,0 +1,16 @@
+import { createChat } from '@n8n/chat/index';
+
+export function createTestChat(options: Parameters<typeof createChat>[0] = {}): {
+	unmount: () => void;
+	container: Element;
+} {
+	const app = createChat(options);
+
+	const container = app._container as Element;
+	const unmount = () => app.unmount();
+
+	return {
+		unmount,
+		container,
+	};
+}
diff --git a/packages/@n8n/chat/src/__tests__/utils/fetch.ts b/packages/@n8n/chat/src/__tests__/utils/fetch.ts
new file mode 100644
index 0000000000000..6cf31c7d0d0c1
--- /dev/null
+++ b/packages/@n8n/chat/src/__tests__/utils/fetch.ts
@@ -0,0 +1,18 @@
+import type { LoadPreviousSessionResponse, SendMessageResponse } from '@n8n/chat/types';
+
+export function createFetchResponse<T>(data: T) {
+	return async () =>
+		({
+			json: async () => await new Promise<T>((resolve) => resolve(data)),
+		}) as Response;
+}
+
+export const createGetLatestMessagesResponse = (
+	data: LoadPreviousSessionResponse['data'] = [],
+): LoadPreviousSessionResponse => ({ data });
+
+export const createSendMessageResponse = (
+	output: SendMessageResponse['output'],
+): SendMessageResponse => ({
+	output,
+});
diff --git a/packages/@n8n/chat/src/__tests__/utils/index.ts b/packages/@n8n/chat/src/__tests__/utils/index.ts
new file mode 100644
index 0000000000000..6dc234f1d0b94
--- /dev/null
+++ b/packages/@n8n/chat/src/__tests__/utils/index.ts
@@ -0,0 +1,3 @@
+export * from './create';
+export * from './fetch';
+export * from './selectors';
diff --git a/packages/@n8n/chat/src/__tests__/utils/selectors.ts b/packages/@n8n/chat/src/__tests__/utils/selectors.ts
new file mode 100644
index 0000000000000..a510652b0d863
--- /dev/null
+++ b/packages/@n8n/chat/src/__tests__/utils/selectors.ts
@@ -0,0 +1,53 @@
+import { screen } from '@testing-library/vue';
+import { defaultMountingTarget } from '@n8n/chat/constants';
+
+export function getMountingTarget(target = defaultMountingTarget) {
+	return document.querySelector(target);
+}
+
+export function getChatWindowWrapper() {
+	return document.querySelector('.chat-window-wrapper');
+}
+
+export function getChatWindowToggle() {
+	return document.querySelector('.chat-window-toggle');
+}
+
+export function getChatWrapper() {
+	return document.querySelector('.chat-wrapper');
+}
+
+export function getChatMessages() {
+	return document.querySelectorAll('.chat-message:not(.chat-message-typing)');
+}
+
+export function getChatMessage(index: number) {
+	const messages = getChatMessages();
+	return index < 0 ? messages[messages.length + index] : messages[index];
+}
+
+export function getChatMessageByText(text: string) {
+	return screen.queryByText(text, {
+		selector: '.chat-message:not(.chat-message-typing) .chat-message-markdown p',
+	});
+}
+
+export function getChatMessageTyping() {
+	return document.querySelector('.chat-message-typing');
+}
+
+export function getGetStartedButton() {
+	return document.querySelector('.chat-get-started .chat-button');
+}
+
+export function getChatInput() {
+	return document.querySelector('.chat-input');
+}
+
+export function getChatInputTextarea() {
+	return document.querySelector('.chat-input textarea');
+}
+
+export function getChatInputSendButton() {
+	return document.querySelector('.chat-input .chat-input-send-button');
+}
diff --git a/packages/@n8n/chat/src/api/generic.ts b/packages/@n8n/chat/src/api/generic.ts
new file mode 100644
index 0000000000000..04b6d61b65034
--- /dev/null
+++ b/packages/@n8n/chat/src/api/generic.ts
@@ -0,0 +1,63 @@
+async function getAccessToken() {
+	return '';
+}
+
+export async function authenticatedFetch<T>(...args: Parameters<typeof fetch>): Promise<T> {
+	const accessToken = await getAccessToken();
+
+	const response = await fetch(args[0], {
+		...args[1],
+		mode: 'cors',
+		cache: 'no-cache',
+		headers: {
+			'Content-Type': 'application/json',
+			...(accessToken ? { authorization: `Bearer ${accessToken}` } : {}),
+			...args[1]?.headers,
+		},
+	});
+
+	return (await response.json()) as T;
+}
+
+export async function get<T>(url: string, query: object = {}, options: RequestInit = {}) {
+	let resolvedUrl = url;
+	if (Object.keys(query).length > 0) {
+		resolvedUrl = `${resolvedUrl}?${new URLSearchParams(
+			query as Record<string, string>,
+		).toString()}`;
+	}
+
+	return await authenticatedFetch<T>(resolvedUrl, { ...options, method: 'GET' });
+}
+
+export async function post<T>(url: string, body: object = {}, options: RequestInit = {}) {
+	return await authenticatedFetch<T>(url, {
+		...options,
+		method: 'POST',
+		body: JSON.stringify(body),
+	});
+}
+
+export async function put<T>(url: string, body: object = {}, options: RequestInit = {}) {
+	return await authenticatedFetch<T>(url, {
+		...options,
+		method: 'PUT',
+		body: JSON.stringify(body),
+	});
+}
+
+export async function patch<T>(url: string, body: object = {}, options: RequestInit = {}) {
+	return await authenticatedFetch<T>(url, {
+		...options,
+		method: 'PATCH',
+		body: JSON.stringify(body),
+	});
+}
+
+export async function del<T>(url: string, body: object = {}, options: RequestInit = {}) {
+	return await authenticatedFetch<T>(url, {
+		...options,
+		method: 'DELETE',
+		body: JSON.stringify(body),
+	});
+}
diff --git a/packages/@n8n/chat/src/api/index.ts b/packages/@n8n/chat/src/api/index.ts
new file mode 100644
index 0000000000000..a78afb92f2fcd
--- /dev/null
+++ b/packages/@n8n/chat/src/api/index.ts
@@ -0,0 +1,2 @@
+export * from './generic';
+export * from './message';
diff --git a/packages/@n8n/chat/src/api/message.ts b/packages/@n8n/chat/src/api/message.ts
new file mode 100644
index 0000000000000..72f8e2fb2741c
--- /dev/null
+++ b/packages/@n8n/chat/src/api/message.ts
@@ -0,0 +1,37 @@
+import { get, post } from '@n8n/chat/api/generic';
+import type {
+	ChatOptions,
+	LoadPreviousSessionResponse,
+	SendMessageResponse,
+} from '@n8n/chat/types';
+
+export async function loadPreviousSession(sessionId: string, options: ChatOptions) {
+	const method = options.webhookConfig?.method === 'POST' ? post : get;
+	return await method<LoadPreviousSessionResponse>(
+		`${options.webhookUrl}`,
+		{
+			action: 'loadPreviousSession',
+			[options.chatSessionKey as string]: sessionId,
+			...(options.metadata ? { metadata: options.metadata } : {}),
+		},
+		{
+			headers: options.webhookConfig?.headers,
+		},
+	);
+}
+
+export async function sendMessage(message: string, sessionId: string, options: ChatOptions) {
+	const method = options.webhookConfig?.method === 'POST' ? post : get;
+	return await method<SendMessageResponse>(
+		`${options.webhookUrl}`,
+		{
+			action: 'sendMessage',
+			[options.chatSessionKey as string]: sessionId,
+			[options.chatInputKey as string]: message,
+			...(options.metadata ? { metadata: options.metadata } : {}),
+		},
+		{
+			headers: options.webhookConfig?.headers,
+		},
+	);
+}
diff --git a/packages/@n8n/chat/src/components/Button.vue b/packages/@n8n/chat/src/components/Button.vue
new file mode 100644
index 0000000000000..ca35153fc6b96
--- /dev/null
+++ b/packages/@n8n/chat/src/components/Button.vue
@@ -0,0 +1,41 @@
+<template>
+	<button class="chat-button">
+		<slot />
+	</button>
+</template>
+<style lang="scss">
+.chat-button {
+	display: inline-flex;
+	text-align: center;
+	vertical-align: middle;
+	user-select: none;
+	color: var(--chat--button--color, var(--chat--color-light));
+	background-color: var(--chat--button--background, var(--chat--color-primary));
+	border: 1px solid transparent;
+	padding: var(--chat--button--padding, calc(var(--chat--spacing) * 1 / 2) var(--chat--spacing));
+	font-size: 1rem;
+	line-height: 1.5;
+	border-radius: var(--chat--button--border-radius, var(--chat--border-radius));
+	transition:
+		color var(--chat--transition-duration) ease-in-out,
+		background-color var(--chat--transition-duration) ease-in-out,
+		border-color var(--chat--transition-duration) ease-in-out,
+		box-shadow var(--chat--transition-duration) ease-in-out;
+	cursor: pointer;
+
+	&:hover {
+		color: var(--chat--button--hover--color, var(--chat--color-light));
+		background-color: var(--chat--button--hover--background, var(--chat--color-primary-shade-50));
+		text-decoration: none;
+	}
+
+	&:focus {
+		outline: 0;
+		box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25);
+	}
+
+	&:disabled {
+		opacity: 0.65;
+	}
+}
+</style>
diff --git a/packages/@n8n/chat/src/components/Chat.vue b/packages/@n8n/chat/src/components/Chat.vue
new file mode 100644
index 0000000000000..c6b0a08618fab
--- /dev/null
+++ b/packages/@n8n/chat/src/components/Chat.vue
@@ -0,0 +1,97 @@
+<script setup lang="ts">
+// eslint-disable-next-line import/no-unresolved
+import Close from 'virtual:icons/mdi/close';
+import { computed, nextTick, onMounted } from 'vue';
+import Layout from '@n8n/chat/components/Layout.vue';
+import GetStarted from '@n8n/chat/components/GetStarted.vue';
+import GetStartedFooter from '@n8n/chat/components/GetStartedFooter.vue';
+import MessagesList from '@n8n/chat/components/MessagesList.vue';
+import Input from '@n8n/chat/components/Input.vue';
+import { useI18n, useChat, useOptions } from '@n8n/chat/composables';
+import { chatEventBus } from '@n8n/chat/event-buses';
+
+const { t } = useI18n();
+const chatStore = useChat();
+
+const { messages, currentSessionId } = chatStore;
+const { options } = useOptions();
+
+const showCloseButton = computed(() => options.mode === 'window' && options.showWindowCloseButton);
+
+async function getStarted() {
+	if (!chatStore.startNewSession) {
+		return;
+	}
+	void chatStore.startNewSession();
+	void nextTick(() => {
+		chatEventBus.emit('scrollToBottom');
+	});
+}
+
+async function initialize() {
+	if (!chatStore.loadPreviousSession) {
+		return;
+	}
+	await chatStore.loadPreviousSession();
+	void nextTick(() => {
+		chatEventBus.emit('scrollToBottom');
+	});
+}
+
+function closeChat() {
+	chatEventBus.emit('close');
+}
+
+onMounted(async () => {
+	await initialize();
+	if (!options.showWelcomeScreen && !currentSessionId.value) {
+		await getStarted();
+	}
+});
+</script>
+
+<template>
+	<Layout class="chat-wrapper">
+		<template #header>
+			<div class="chat-heading">
+				<h1>
+					{{ t('title') }}
+				</h1>
+				<button
+					v-if="showCloseButton"
+					class="chat-close-button"
+					:title="t('closeButtonTooltip')"
+					@click="closeChat"
+				>
+					<Close height="18" width="18" />
+				</button>
+			</div>
+			<p v-if="t('subtitle')">{{ t('subtitle') }}</p>
+		</template>
+		<GetStarted v-if="!currentSessionId && options.showWelcomeScreen" @click:button="getStarted" />
+		<MessagesList v-else :messages="messages" />
+		<template #footer>
+			<Input v-if="currentSessionId" />
+			<GetStartedFooter v-else />
+		</template>
+	</Layout>
+</template>
+
+<style lang="scss">
+.chat-heading {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+}
+
+.chat-close-button {
+	display: flex;
+	border: none;
+	background: none;
+	cursor: pointer;
+
+	&:hover {
+		color: var(--chat--close--button--color-hover, var(--chat--color-primary));
+	}
+}
+</style>
diff --git a/packages/@n8n/chat/src/components/ChatWindow.vue b/packages/@n8n/chat/src/components/ChatWindow.vue
new file mode 100644
index 0000000000000..1d1f7ae3c22f2
--- /dev/null
+++ b/packages/@n8n/chat/src/components/ChatWindow.vue
@@ -0,0 +1,125 @@
+<script lang="ts" setup>
+// eslint-disable-next-line import/no-unresolved
+import IconChat from 'virtual:icons/mdi/chat';
+// eslint-disable-next-line import/no-unresolved
+import IconChevronDown from 'virtual:icons/mdi/chevron-down';
+import { nextTick, ref } from 'vue';
+import Chat from '@n8n/chat/components/Chat.vue';
+import { chatEventBus } from '@n8n/chat/event-buses';
+
+const isOpen = ref(false);
+
+function toggle() {
+	isOpen.value = !isOpen.value;
+
+	if (isOpen.value) {
+		void nextTick(() => {
+			chatEventBus.emit('scrollToBottom');
+		});
+	}
+}
+</script>
+
+<template>
+	<div class="chat-window-wrapper">
+		<Transition name="chat-window-transition">
+			<div v-show="isOpen" class="chat-window">
+				<Chat />
+			</div>
+		</Transition>
+		<div class="chat-window-toggle" @click="toggle">
+			<Transition name="chat-window-toggle-transition" mode="out-in">
+				<IconChat v-if="!isOpen" height="32" width="32" />
+				<IconChevronDown v-else height="32" width="32" />
+			</Transition>
+		</div>
+	</div>
+</template>
+
+<style lang="scss">
+.chat-window-wrapper {
+	position: fixed;
+	display: flex;
+	flex-direction: column;
+	bottom: var(--chat--window--bottom, var(--chat--spacing));
+	right: var(--chat--window--right, var(--chat--spacing));
+	z-index: var(--chat--window--z-index, 9999);
+
+	max-width: calc(100% - var(--chat--window--right, var(--chat--spacing)) * 2);
+	max-height: calc(100% - var(--chat--window--bottom, var(--chat--spacing)) * 2);
+
+	.chat-window {
+		display: flex;
+		width: var(--chat--window--width);
+		height: var(--chat--window--height);
+		max-width: 100%;
+		max-height: 100%;
+		border: var(--chat--window--border, 1px solid var(--chat--color-light-shade-100));
+		border-radius: var(--chat--window--border-radius, var(--chat--border-radius));
+		margin-bottom: var(--chat--window--margin-bottom, var(--chat--spacing));
+		overflow: hidden;
+		transform-origin: bottom right;
+
+		.chat-layout {
+			width: auto;
+			height: auto;
+			flex: 1;
+		}
+	}
+
+	.chat-window-toggle {
+		flex: 0 0 auto;
+		background: var(--chat--toggle--background);
+		color: var(--chat--toggle--color);
+		cursor: pointer;
+		width: var(--chat--toggle--width, var(--chat--toggle--size));
+		height: var(--chat--toggle--height, var(--chat--toggle--size));
+		border-radius: var(--chat--toggle--border-radius, 50%);
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
+		margin-left: auto;
+		transition:
+			transform var(--chat--transition-duration) ease,
+			background var(--chat--transition-duration) ease;
+
+		&:hover,
+		&:focus {
+			transform: scale(1.05);
+			background: var(--chat--toggle--hover--background);
+		}
+
+		&:active {
+			transform: scale(0.95);
+			background: var(--chat--toggle--active--background);
+		}
+	}
+}
+
+.chat-window-transition {
+	&-enter-active,
+	&-leave-active {
+		transition:
+			transform var(--chat--transition-duration) ease,
+			opacity var(--chat--transition-duration) ease;
+	}
+
+	&-enter-from,
+	&-leave-to {
+		transform: scale(0);
+		opacity: 0;
+	}
+}
+
+.chat-window-toggle-transition {
+	&-enter-active,
+	&-leave-active {
+		transition: opacity var(--chat--transition-duration) ease;
+	}
+
+	&-enter-from,
+	&-leave-to {
+		opacity: 0;
+	}
+}
+</style>
diff --git a/packages/@n8n/chat/src/components/GetStarted.vue b/packages/@n8n/chat/src/components/GetStarted.vue
new file mode 100644
index 0000000000000..7c1a6aea2b092
--- /dev/null
+++ b/packages/@n8n/chat/src/components/GetStarted.vue
@@ -0,0 +1,24 @@
+<script setup lang="ts">
+import Button from '@n8n/chat/components/Button.vue';
+import { useI18n } from '@n8n/chat/composables';
+
+const { t } = useI18n();
+</script>
+<template>
+	<div class="chat-get-started">
+		<Button @click="$emit('click:button')">
+			{{ t('getStarted') }}
+		</Button>
+	</div>
+</template>
+
+<style lang="scss">
+.chat-get-started {
+	padding-top: var(--chat--spacing);
+	padding-bottom: var(--chat--spacing);
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	height: 100%;
+}
+</style>
diff --git a/packages/@n8n/chat/src/components/GetStartedFooter.vue b/packages/@n8n/chat/src/components/GetStartedFooter.vue
new file mode 100644
index 0000000000000..dca1d16bc6b9f
--- /dev/null
+++ b/packages/@n8n/chat/src/components/GetStartedFooter.vue
@@ -0,0 +1,20 @@
+<script setup lang="ts">
+import { useI18n } from '@n8n/chat/composables';
+import PoweredBy from '@n8n/chat/components/PoweredBy.vue';
+
+const { t, te } = useI18n();
+</script>
+<template>
+	<div class="chat-get-started-footer">
+		<div v-if="te('footer')">
+			{{ t('footer') }}
+		</div>
+		<PoweredBy />
+	</div>
+</template>
+
+<style lang="scss">
+.chat-get-started-footer {
+	padding: var(--chat--spacing);
+}
+</style>
diff --git a/packages/@n8n/chat/src/components/Input.vue b/packages/@n8n/chat/src/components/Input.vue
new file mode 100644
index 0000000000000..0f8746369019a
--- /dev/null
+++ b/packages/@n8n/chat/src/components/Input.vue
@@ -0,0 +1,109 @@
+<script setup lang="ts">
+// eslint-disable-next-line import/no-unresolved
+import IconSend from 'virtual:icons/mdi/send';
+import { computed, onMounted, ref } from 'vue';
+import { useI18n, useChat, useOptions } from '@n8n/chat/composables';
+import { chatEventBus } from '@n8n/chat/event-buses';
+
+const { options } = useOptions();
+const chatStore = useChat();
+const { waitingForResponse } = chatStore;
+const { t } = useI18n();
+
+const chatTextArea = ref<HTMLTextAreaElement | null>(null);
+const input = ref('');
+
+const isSubmitDisabled = computed(() => {
+	return input.value === '' || waitingForResponse.value || options.disabled?.value === true;
+});
+
+const isInputDisabled = computed(() => options.disabled?.value === true);
+
+onMounted(() => {
+	chatEventBus.on('focusInput', () => {
+		if (chatTextArea.value) {
+			chatTextArea.value.focus();
+		}
+	});
+});
+
+async function onSubmit(event: MouseEvent | KeyboardEvent) {
+	event.preventDefault();
+
+	if (isSubmitDisabled.value) {
+		return;
+	}
+
+	const messageText = input.value;
+	input.value = '';
+	await chatStore.sendMessage(messageText);
+}
+
+async function onSubmitKeydown(event: KeyboardEvent) {
+	if (event.shiftKey) {
+		return;
+	}
+
+	await onSubmit(event);
+}
+</script>
+
+<template>
+	<div class="chat-input">
+		<textarea
+			ref="chatTextArea"
+			v-model="input"
+			rows="1"
+			:disabled="isInputDisabled"
+			:placeholder="t('inputPlaceholder')"
+			@keydown.enter="onSubmitKeydown"
+		/>
+		<button :disabled="isSubmitDisabled" class="chat-input-send-button" @click="onSubmit">
+			<IconSend height="32" width="32" />
+		</button>
+	</div>
+</template>
+
+<style lang="scss">
+.chat-input {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	width: 100%;
+	background: white;
+
+	textarea {
+		font-family: inherit;
+		font-size: var(--chat--input--font-size, inherit);
+		width: 100%;
+		border: 0;
+		padding: var(--chat--spacing);
+		max-height: var(--chat--textarea--height);
+		resize: none;
+	}
+
+	.chat-input-send-button {
+		height: var(--chat--textarea--height);
+		width: var(--chat--textarea--height);
+		background: white;
+		cursor: pointer;
+		color: var(--chat--input--send--button--color, var(--chat--color-secondary));
+		border: 0;
+		font-size: 24px;
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
+		transition: color var(--chat--transition-duration) ease;
+
+		&:hover,
+		&:focus {
+			color: var(--chat--color-secondary-shade-50);
+		}
+
+		&[disabled] {
+			cursor: default;
+			color: var(--chat--color-disabled);
+		}
+	}
+}
+</style>
diff --git a/packages/@n8n/chat/src/components/Layout.vue b/packages/@n8n/chat/src/components/Layout.vue
new file mode 100644
index 0000000000000..6ed1744f31ca5
--- /dev/null
+++ b/packages/@n8n/chat/src/components/Layout.vue
@@ -0,0 +1,99 @@
+<script setup lang="ts">
+import { onBeforeUnmount, onMounted, ref } from 'vue';
+import { chatEventBus } from '@n8n/chat/event-buses';
+
+const chatBodyRef = ref<HTMLElement | null>(null);
+
+function scrollToBottom() {
+	const element = chatBodyRef.value as HTMLElement;
+	if (element) {
+		element.scrollTop = element.scrollHeight;
+	}
+}
+
+onMounted(() => {
+	chatEventBus.on('scrollToBottom', scrollToBottom);
+	window.addEventListener('resize', scrollToBottom);
+});
+
+onBeforeUnmount(() => {
+	chatEventBus.off('scrollToBottom', scrollToBottom);
+	window.removeEventListener('resize', scrollToBottom);
+});
+</script>
+<template>
+	<main class="chat-layout">
+		<div v-if="$slots.header" class="chat-header">
+			<slot name="header" />
+		</div>
+		<div v-if="$slots.default" ref="chatBodyRef" class="chat-body">
+			<slot />
+		</div>
+		<div v-if="$slots.footer" class="chat-footer">
+			<slot name="footer" />
+		</div>
+	</main>
+</template>
+
+<style lang="scss">
+.chat-layout {
+	width: 100%;
+	height: 100%;
+	display: flex;
+	overflow-y: auto;
+	flex-direction: column;
+	font-family: var(
+		--chat--font-family,
+		(
+			-apple-system,
+			BlinkMacSystemFont,
+			'Segoe UI',
+			Roboto,
+			Oxygen-Sans,
+			Ubuntu,
+			Cantarell,
+			'Helvetica Neue',
+			sans-serif
+		)
+	);
+
+	.chat-header {
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		gap: 1em;
+		height: var(--chat--header-height, auto);
+		padding: var(--chat--header--padding, var(--chat--spacing));
+		background: var(--chat--header--background, var(--chat--color-dark));
+		color: var(--chat--header--color, var(--chat--color-light));
+		border-top: var(--chat--header--border-top, none);
+		border-bottom: var(--chat--header--border-bottom, none);
+		border-left: var(--chat--header--border-left, none);
+		border-right: var(--chat--header--border-right, none);
+		h1 {
+			font-size: var(--chat--heading--font-size);
+			color: var(--chat--header--color, var(--chat--color-light));
+		}
+		p {
+			font-size: var(--chat--subtitle--font-size, inherit);
+			line-height: var(--chat--subtitle--line-height, 1.8);
+		}
+	}
+
+	.chat-body {
+		background: var(--chat--body--background, var(--chat--color-light));
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+		overflow-y: auto;
+		position: relative;
+		min-height: 100px;
+	}
+
+	.chat-footer {
+		border-top: 1px solid var(--chat--color-light-shade-100);
+		background: var(--chat--footer--background, var(--chat--color-light));
+		color: var(--chat--footer--color, var(--chat--color-dark));
+	}
+}
+</style>
diff --git a/packages/@n8n/chat/src/components/Message.vue b/packages/@n8n/chat/src/components/Message.vue
new file mode 100644
index 0000000000000..27391c7d2aa9e
--- /dev/null
+++ b/packages/@n8n/chat/src/components/Message.vue
@@ -0,0 +1,141 @@
+<script lang="ts" setup>
+/* eslint-disable @typescript-eslint/naming-convention */
+import type { PropType } from 'vue';
+import { computed, toRefs } from 'vue';
+import VueMarkdown from 'vue-markdown-render';
+import hljs from 'highlight.js/lib/core';
+import markdownLink from 'markdown-it-link-attributes';
+import type MarkdownIt from 'markdown-it';
+import type { ChatMessage, ChatMessageText } from '@n8n/chat/types';
+import { useOptions } from '@n8n/chat/composables';
+
+const props = defineProps({
+	message: {
+		type: Object as PropType<ChatMessage>,
+		required: true,
+	},
+});
+
+const { message } = toRefs(props);
+const { options } = useOptions();
+
+const messageText = computed(() => {
+	return (message.value as ChatMessageText).text || '&lt;Empty response&gt;';
+});
+
+const classes = computed(() => {
+	return {
+		'chat-message-from-user': message.value.sender === 'user',
+		'chat-message-from-bot': message.value.sender === 'bot',
+		'chat-message-transparent': message.value.transparent === true,
+	};
+});
+
+const linksNewTabPlugin = (vueMarkdownItInstance: MarkdownIt) => {
+	vueMarkdownItInstance.use(markdownLink, {
+		attrs: {
+			target: '_blank',
+			rel: 'noopener',
+		},
+	});
+};
+
+const markdownOptions = {
+	highlight(str: string, lang: string) {
+		if (lang && hljs.getLanguage(lang)) {
+			try {
+				return hljs.highlight(str, { language: lang }).value;
+			} catch {}
+		}
+
+		return ''; // use external default escaping
+	},
+};
+
+const messageComponents = options.messageComponents ?? {};
+</script>
+<template>
+	<div class="chat-message" :class="classes">
+		<slot>
+			<template v-if="message.type === 'component' && messageComponents[message.key]">
+				<component :is="messageComponents[message.key]" v-bind="message.arguments" />
+			</template>
+			<VueMarkdown
+				v-else
+				class="chat-message-markdown"
+				:source="messageText"
+				:options="markdownOptions"
+				:plugins="[linksNewTabPlugin]"
+			/>
+		</slot>
+	</div>
+</template>
+
+<style lang="scss">
+.chat-message {
+	display: block;
+	max-width: 80%;
+	font-size: var(--chat--message--font-size, 1rem);
+	padding: var(--chat--message--padding, var(--chat--spacing));
+	border-radius: var(--chat--message--border-radius, var(--chat--border-radius));
+
+	p {
+		line-height: var(--chat--message-line-height, 1.8);
+		word-wrap: break-word;
+	}
+
+	// Default message gap is half of the spacing
+	+ .chat-message {
+		margin-top: var(--chat--message--margin-bottom, calc(var(--chat--spacing) * 0.5));
+	}
+
+	// Spacing between messages from different senders is double the individual message gap
+	&.chat-message-from-user + &.chat-message-from-bot,
+	&.chat-message-from-bot + &.chat-message-from-user {
+		margin-top: var(--chat--spacing);
+	}
+
+	&.chat-message-from-bot {
+		&:not(.chat-message-transparent) {
+			background-color: var(--chat--message--bot--background);
+			border: var(--chat--message--bot--border, none);
+		}
+		color: var(--chat--message--bot--color);
+		border-bottom-left-radius: 0;
+	}
+
+	&.chat-message-from-user {
+		&:not(.chat-message-transparent) {
+			background-color: var(--chat--message--user--background);
+			border: var(--chat--message--user--border, none);
+		}
+		color: var(--chat--message--user--color);
+		margin-left: auto;
+		border-bottom-right-radius: 0;
+	}
+
+	> .chat-message-markdown {
+		display: block;
+		box-sizing: border-box;
+
+		> *:first-child {
+			margin-top: 0;
+		}
+
+		> *:last-child {
+			margin-bottom: 0;
+		}
+
+		pre {
+			font-family: inherit;
+			font-size: inherit;
+			margin: 0;
+			white-space: pre-wrap;
+			box-sizing: border-box;
+			padding: var(--chat--spacing);
+			background: var(--chat--message--pre--background);
+			border-radius: var(--chat--border-radius);
+		}
+	}
+}
+</style>
diff --git a/packages/@n8n/chat/src/components/MessageTyping.vue b/packages/@n8n/chat/src/components/MessageTyping.vue
new file mode 100644
index 0000000000000..cf5981a97c6ef
--- /dev/null
+++ b/packages/@n8n/chat/src/components/MessageTyping.vue
@@ -0,0 +1,109 @@
+<script lang="ts" setup>
+import type { PropType } from 'vue';
+import { computed } from 'vue';
+import { Message } from './index';
+import type { ChatMessage } from '@n8n/chat/types';
+
+const props = defineProps({
+	animation: {
+		type: String as PropType<'bouncing' | 'scaling'>,
+		default: 'bouncing',
+	},
+});
+
+const message: ChatMessage = {
+	id: 'typing',
+	text: '',
+	sender: 'bot',
+	createdAt: '',
+};
+
+const classes = computed(() => {
+	return {
+		// eslint-disable-next-line @typescript-eslint/naming-convention
+		'chat-message-typing': true,
+		[`chat-message-typing-animation-${props.animation}`]: true,
+	};
+});
+</script>
+<template>
+	<Message :class="classes" :message="message">
+		<div class="chat-message-typing-body">
+			<span class="chat-message-typing-circle"></span>
+			<span class="chat-message-typing-circle"></span>
+			<span class="chat-message-typing-circle"></span>
+		</div>
+	</Message>
+</template>
+<style lang="scss">
+.chat-message-typing {
+	max-width: 80px;
+
+	&.chat-message-typing-animation-scaling .chat-message-typing-circle {
+		animation: chat-message-typing-animation-scaling 800ms ease-in-out infinite;
+		animation-delay: 3600ms;
+	}
+
+	&.chat-message-typing-animation-bouncing .chat-message-typing-circle {
+		animation: chat-message-typing-animation-bouncing 800ms ease-in-out infinite;
+		animation-delay: 3600ms;
+	}
+
+	.chat-message-typing-body {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.chat-message-typing-circle {
+		display: block;
+		height: 10px;
+		width: 10px;
+		border-radius: 50%;
+		background-color: var(--chat--color-typing);
+		margin: 3px;
+
+		&:nth-child(1) {
+			animation-delay: 0ms;
+		}
+
+		&:nth-child(2) {
+			animation-delay: 333ms;
+		}
+
+		&:nth-child(3) {
+			animation-delay: 666ms;
+		}
+	}
+}
+
+@keyframes chat-message-typing-animation-scaling {
+	0% {
+		transform: scale(1);
+	}
+	33% {
+		transform: scale(1);
+	}
+	50% {
+		transform: scale(1.4);
+	}
+	100% {
+		transform: scale(1);
+	}
+}
+
+@keyframes chat-message-typing-animation-bouncing {
+	0% {
+		transform: translateY(0);
+	}
+	33% {
+		transform: translateY(0);
+	}
+	50% {
+		transform: translateY(-10px);
+	}
+	100% {
+		transform: translateY(0);
+	}
+}
+</style>
diff --git a/packages/@n8n/chat/src/components/MessagesList.vue b/packages/@n8n/chat/src/components/MessagesList.vue
new file mode 100644
index 0000000000000..7781c450468c1
--- /dev/null
+++ b/packages/@n8n/chat/src/components/MessagesList.vue
@@ -0,0 +1,37 @@
+<script lang="ts" setup>
+import type { PropType } from 'vue';
+import Message from '@n8n/chat/components/Message.vue';
+import type { ChatMessage } from '@n8n/chat/types';
+import MessageTyping from '@n8n/chat/components/MessageTyping.vue';
+import { useChat } from '@n8n/chat/composables';
+
+defineProps({
+	messages: {
+		type: Array as PropType<ChatMessage[]>,
+		required: true,
+	},
+});
+
+const chatStore = useChat();
+
+const { initialMessages, waitingForResponse } = chatStore;
+</script>
+<template>
+	<div class="chat-messages-list">
+		<Message
+			v-for="initialMessage in initialMessages"
+			:key="initialMessage.id"
+			:message="initialMessage"
+		/>
+		<Message v-for="message in messages" :key="message.id" :message="message" />
+		<MessageTyping v-if="waitingForResponse" />
+	</div>
+</template>
+
+<style lang="scss">
+.chat-messages-list {
+	margin-top: auto;
+	display: block;
+	padding: var(--chat--messages-list--padding, var(--chat--spacing));
+}
+</style>
diff --git a/packages/@n8n/chat/src/components/PoweredBy.vue b/packages/@n8n/chat/src/components/PoweredBy.vue
new file mode 100644
index 0000000000000..bd899e6b1648d
--- /dev/null
+++ b/packages/@n8n/chat/src/components/PoweredBy.vue
@@ -0,0 +1,17 @@
+<template>
+	<div class="chat-powered-by">
+		Powered by
+		<a href="https://n8n.io?utm_source=n8n-external&utm_medium=widget-powered-by">n8n</a>
+	</div>
+</template>
+
+<style lang="scss">
+.chat-powered-by {
+	text-align: center;
+
+	a {
+		color: var(--chat--color-primary);
+		text-decoration: none;
+	}
+}
+</style>
diff --git a/packages/@n8n/chat/src/components/index.ts b/packages/@n8n/chat/src/components/index.ts
new file mode 100644
index 0000000000000..223c136993995
--- /dev/null
+++ b/packages/@n8n/chat/src/components/index.ts
@@ -0,0 +1,10 @@
+export { default as Button } from './Button.vue';
+export { default as Chat } from './Chat.vue';
+export { default as ChatWindow } from './ChatWindow.vue';
+export { default as GetStarted } from './GetStarted.vue';
+export { default as GetStartedFooter } from './GetStartedFooter.vue';
+export { default as Input } from './Input.vue';
+export { default as Layout } from './Layout.vue';
+export { default as Message } from './Message.vue';
+export { default as MessagesList } from './MessagesList.vue';
+export { default as PoweredBy } from './PoweredBy.vue';
diff --git a/packages/@n8n/chat/src/composables/index.ts b/packages/@n8n/chat/src/composables/index.ts
new file mode 100644
index 0000000000000..1eee732bc8deb
--- /dev/null
+++ b/packages/@n8n/chat/src/composables/index.ts
@@ -0,0 +1,3 @@
+export * from './useChat';
+export * from './useI18n';
+export * from './useOptions';
diff --git a/packages/@n8n/chat/src/composables/useChat.ts b/packages/@n8n/chat/src/composables/useChat.ts
new file mode 100644
index 0000000000000..a7ec6147327ba
--- /dev/null
+++ b/packages/@n8n/chat/src/composables/useChat.ts
@@ -0,0 +1,7 @@
+import { inject } from 'vue';
+import { ChatSymbol } from '@n8n/chat/constants';
+import type { Chat } from '@n8n/chat/types';
+
+export function useChat() {
+	return inject(ChatSymbol) as Chat;
+}
diff --git a/packages/@n8n/chat/src/composables/useI18n.ts b/packages/@n8n/chat/src/composables/useI18n.ts
new file mode 100644
index 0000000000000..68cfc33813582
--- /dev/null
+++ b/packages/@n8n/chat/src/composables/useI18n.ts
@@ -0,0 +1,21 @@
+import { isRef } from 'vue';
+import { useOptions } from '@n8n/chat/composables/useOptions';
+
+export function useI18n() {
+	const { options } = useOptions();
+	const language = options?.defaultLanguage ?? 'en';
+
+	function t(key: string): string {
+		const val = options?.i18n?.[language]?.[key];
+		if (isRef(val)) {
+			return val.value as string;
+		}
+		return val ?? key;
+	}
+
+	function te(key: string): boolean {
+		return !!options?.i18n?.[language]?.[key];
+	}
+
+	return { t, te };
+}
diff --git a/packages/@n8n/chat/src/composables/useOptions.ts b/packages/@n8n/chat/src/composables/useOptions.ts
new file mode 100644
index 0000000000000..5223ad09df142
--- /dev/null
+++ b/packages/@n8n/chat/src/composables/useOptions.ts
@@ -0,0 +1,11 @@
+import { inject } from 'vue';
+import { ChatOptionsSymbol } from '@n8n/chat/constants';
+import type { ChatOptions } from '@n8n/chat/types';
+
+export function useOptions() {
+	const options = inject(ChatOptionsSymbol) as ChatOptions;
+
+	return {
+		options,
+	};
+}
diff --git a/packages/@n8n/chat/src/constants/defaults.ts b/packages/@n8n/chat/src/constants/defaults.ts
new file mode 100644
index 0000000000000..e178d0607925b
--- /dev/null
+++ b/packages/@n8n/chat/src/constants/defaults.ts
@@ -0,0 +1,30 @@
+import type { ChatOptions } from '@n8n/chat/types';
+
+export const defaultOptions: ChatOptions = {
+	webhookUrl: 'http://localhost:5678',
+	webhookConfig: {
+		method: 'POST',
+		headers: {},
+	},
+	target: '#n8n-chat',
+	mode: 'window',
+	loadPreviousSession: true,
+	chatInputKey: 'chatInput',
+	chatSessionKey: 'sessionId',
+	defaultLanguage: 'en',
+	showWelcomeScreen: false,
+	initialMessages: ['Hi there! 👋', 'My name is Nathan. How can I assist you today?'],
+	i18n: {
+		en: {
+			title: 'Hi there! 👋',
+			subtitle: "Start a chat. We're here to help you 24/7.",
+			footer: '',
+			getStarted: 'New Conversation',
+			inputPlaceholder: 'Type your question..',
+			closeButtonTooltip: 'Close chat',
+		},
+	},
+	theme: {},
+};
+
+export const defaultMountingTarget = '#n8n-chat';
diff --git a/packages/@n8n/chat/src/constants/index.ts b/packages/@n8n/chat/src/constants/index.ts
new file mode 100644
index 0000000000000..4138202e088f4
--- /dev/null
+++ b/packages/@n8n/chat/src/constants/index.ts
@@ -0,0 +1,3 @@
+export * from './defaults';
+export * from './localStorage';
+export * from './symbols';
diff --git a/packages/@n8n/chat/src/constants/localStorage.ts b/packages/@n8n/chat/src/constants/localStorage.ts
new file mode 100644
index 0000000000000..43b2d3d8ec327
--- /dev/null
+++ b/packages/@n8n/chat/src/constants/localStorage.ts
@@ -0,0 +1,2 @@
+export const localStorageNamespace = 'n8n-chat';
+export const localStorageSessionIdKey = `${localStorageNamespace}/sessionId`;
diff --git a/packages/@n8n/chat/src/constants/symbols.ts b/packages/@n8n/chat/src/constants/symbols.ts
new file mode 100644
index 0000000000000..618d48e9608cf
--- /dev/null
+++ b/packages/@n8n/chat/src/constants/symbols.ts
@@ -0,0 +1,8 @@
+import type { InjectionKey } from 'vue';
+import type { Chat, ChatOptions } from '@n8n/chat/types';
+
+// eslint-disable-next-line @typescript-eslint/naming-convention
+export const ChatSymbol = 'Chat' as unknown as InjectionKey<Chat>;
+
+// eslint-disable-next-line @typescript-eslint/naming-convention
+export const ChatOptionsSymbol = 'ChatOptions' as unknown as InjectionKey<ChatOptions>;
diff --git a/packages/@n8n/chat/src/css/_tokens.scss b/packages/@n8n/chat/src/css/_tokens.scss
new file mode 100644
index 0000000000000..872dfb99b249a
--- /dev/null
+++ b/packages/@n8n/chat/src/css/_tokens.scss
@@ -0,0 +1,38 @@
+:root {
+	--chat--color-primary: #e74266;
+	--chat--color-primary-shade-50: #db4061;
+	--chat--color-primary-shade-100: #cf3c5c;
+	--chat--color-secondary: #20b69e;
+	--chat--color-secondary-shade-50: #1ca08a;
+	--chat--color-white: #ffffff;
+	--chat--color-light: #f2f4f8;
+	--chat--color-light-shade-50: #e6e9f1;
+	--chat--color-light-shade-100: #c2c5cc;
+	--chat--color-medium: #d2d4d9;
+	--chat--color-dark: #101330;
+	--chat--color-disabled: #777980;
+	--chat--color-typing: #404040;
+
+	--chat--spacing: 1rem;
+	--chat--border-radius: 0.25rem;
+	--chat--transition-duration: 0.15s;
+
+	--chat--window--width: 400px;
+	--chat--window--height: 600px;
+
+	--chat--textarea--height: 50px;
+
+	--chat--message--bot--background: var(--chat--color-white);
+	--chat--message--bot--color: var(--chat--color-dark);
+	--chat--message--user--background: var(--chat--color-secondary);
+	--chat--message--user--color: var(--chat--color-white);
+	--chat--message--pre--background: rgba(0, 0, 0, 0.05);
+
+	--chat--toggle--background: var(--chat--color-primary);
+	--chat--toggle--hover--background: var(--chat--color-primary-shade-50);
+	--chat--toggle--active--background: var(--chat--color-primary-shade-100);
+	--chat--toggle--color: var(--chat--color-white);
+	--chat--toggle--size: 64px;
+
+	--chat--heading--font-size: 2em;
+}
diff --git a/packages/@n8n/chat/src/css/index.scss b/packages/@n8n/chat/src/css/index.scss
new file mode 100644
index 0000000000000..1cfb0253a4dc9
--- /dev/null
+++ b/packages/@n8n/chat/src/css/index.scss
@@ -0,0 +1 @@
+@import 'tokens';
diff --git a/packages/@n8n/chat/src/event-buses/chatEventBus.ts b/packages/@n8n/chat/src/event-buses/chatEventBus.ts
new file mode 100644
index 0000000000000..92ef5e33a1aee
--- /dev/null
+++ b/packages/@n8n/chat/src/event-buses/chatEventBus.ts
@@ -0,0 +1,3 @@
+import { createEventBus } from '@n8n/chat/utils';
+
+export const chatEventBus = createEventBus();
diff --git a/packages/@n8n/chat/src/event-buses/index.ts b/packages/@n8n/chat/src/event-buses/index.ts
new file mode 100644
index 0000000000000..34b5669549ab9
--- /dev/null
+++ b/packages/@n8n/chat/src/event-buses/index.ts
@@ -0,0 +1 @@
+export * from './chatEventBus';
diff --git a/packages/@n8n/chat/src/index.ts b/packages/@n8n/chat/src/index.ts
new file mode 100644
index 0000000000000..eb45e0b9630f3
--- /dev/null
+++ b/packages/@n8n/chat/src/index.ts
@@ -0,0 +1,42 @@
+import './main.scss';
+
+import { createApp } from 'vue';
+import App from './App.vue';
+import type { ChatOptions } from '@n8n/chat/types';
+import { defaultMountingTarget, defaultOptions } from '@n8n/chat/constants';
+import { createDefaultMountingTarget } from '@n8n/chat/utils';
+import { ChatPlugin } from '@n8n/chat/plugins';
+
+export function createChat(options?: Partial<ChatOptions>) {
+	const resolvedOptions: ChatOptions = {
+		...defaultOptions,
+		...options,
+		webhookConfig: {
+			...defaultOptions.webhookConfig,
+			...options?.webhookConfig,
+		},
+		i18n: {
+			...defaultOptions.i18n,
+			...options?.i18n,
+			en: {
+				...defaultOptions.i18n?.en,
+				...options?.i18n?.en,
+			},
+		},
+		theme: {
+			...defaultOptions.theme,
+			...options?.theme,
+		},
+	};
+
+	const mountingTarget = resolvedOptions.target ?? defaultMountingTarget;
+	if (typeof mountingTarget === 'string') {
+		createDefaultMountingTarget(mountingTarget);
+	}
+
+	// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+	const app = createApp(App);
+	app.use(ChatPlugin, resolvedOptions);
+	app.mount(mountingTarget);
+	return app;
+}
diff --git a/packages/@n8n/chat/src/main.scss b/packages/@n8n/chat/src/main.scss
new file mode 100644
index 0000000000000..f91c9fff55bbc
--- /dev/null
+++ b/packages/@n8n/chat/src/main.scss
@@ -0,0 +1,5 @@
+.n8n-chat {
+	@import 'highlight.js/styles/github';
+}
+
+@import 'css';
diff --git a/packages/@n8n/chat/src/plugins/chat.ts b/packages/@n8n/chat/src/plugins/chat.ts
new file mode 100644
index 0000000000000..a460a5274e9ea
--- /dev/null
+++ b/packages/@n8n/chat/src/plugins/chat.ts
@@ -0,0 +1,115 @@
+import type { Plugin } from 'vue';
+import { computed, nextTick, ref } from 'vue';
+import { v4 as uuidv4 } from 'uuid';
+import type { ChatMessage, ChatOptions } from '@n8n/chat/types';
+import { chatEventBus } from '@n8n/chat/event-buses';
+import * as api from '@n8n/chat/api';
+import { ChatOptionsSymbol, ChatSymbol, localStorageSessionIdKey } from '@n8n/chat/constants';
+
+// eslint-disable-next-line @typescript-eslint/naming-convention
+export const ChatPlugin: Plugin<ChatOptions> = {
+	install(app, options) {
+		app.provide(ChatOptionsSymbol, options);
+
+		const messages = ref<ChatMessage[]>([]);
+		const currentSessionId = ref<string | null>(null);
+		const waitingForResponse = ref(false);
+
+		const initialMessages = computed<ChatMessage[]>(() =>
+			(options.initialMessages ?? []).map((text) => ({
+				id: uuidv4(),
+				text,
+				sender: 'bot',
+				createdAt: new Date().toISOString(),
+			})),
+		);
+
+		async function sendMessage(text: string) {
+			const sentMessage: ChatMessage = {
+				id: uuidv4(),
+				text,
+				sender: 'user',
+				createdAt: new Date().toISOString(),
+			};
+
+			messages.value.push(sentMessage);
+			waitingForResponse.value = true;
+
+			void nextTick(() => {
+				chatEventBus.emit('scrollToBottom');
+			});
+
+			const sendMessageResponse = await api.sendMessage(
+				text,
+				currentSessionId.value as string,
+				options,
+			);
+
+			let textMessage = sendMessageResponse.output ?? sendMessageResponse.text ?? '';
+
+			if (textMessage === '' && Object.keys(sendMessageResponse).length > 0) {
+				try {
+					textMessage = JSON.stringify(sendMessageResponse, null, 2);
+				} catch (e) {
+					// Failed to stringify the object so fallback to empty string
+				}
+			}
+
+			const receivedMessage: ChatMessage = {
+				id: uuidv4(),
+				text: textMessage,
+				sender: 'bot',
+				createdAt: new Date().toISOString(),
+			};
+			messages.value.push(receivedMessage);
+
+			waitingForResponse.value = false;
+
+			void nextTick(() => {
+				chatEventBus.emit('scrollToBottom');
+			});
+		}
+
+		async function loadPreviousSession() {
+			if (!options.loadPreviousSession) {
+				return;
+			}
+
+			const sessionId = localStorage.getItem(localStorageSessionIdKey) ?? uuidv4();
+			const previousMessagesResponse = await api.loadPreviousSession(sessionId, options);
+			const timestamp = new Date().toISOString();
+
+			messages.value = (previousMessagesResponse?.data || []).map((message, index) => ({
+				id: `${index}`,
+				text: message.kwargs.content,
+				sender: message.id.includes('HumanMessage') ? 'user' : 'bot',
+				createdAt: timestamp,
+			}));
+
+			if (messages.value.length) {
+				currentSessionId.value = sessionId;
+			}
+
+			return sessionId;
+		}
+
+		async function startNewSession() {
+			currentSessionId.value = uuidv4();
+
+			localStorage.setItem(localStorageSessionIdKey, currentSessionId.value);
+		}
+
+		const chatStore = {
+			initialMessages,
+			messages,
+			currentSessionId,
+			waitingForResponse,
+			loadPreviousSession,
+			startNewSession,
+			sendMessage,
+		};
+
+		app.provide(ChatSymbol, chatStore);
+		app.config.globalProperties.$chat = chatStore;
+	},
+};
diff --git a/packages/@n8n/chat/src/plugins/index.ts b/packages/@n8n/chat/src/plugins/index.ts
new file mode 100644
index 0000000000000..043e5b3938310
--- /dev/null
+++ b/packages/@n8n/chat/src/plugins/index.ts
@@ -0,0 +1 @@
+export * from './chat';
diff --git a/packages/@n8n/chat/src/shims.d.ts b/packages/@n8n/chat/src/shims.d.ts
new file mode 100644
index 0000000000000..1fc02b20793b0
--- /dev/null
+++ b/packages/@n8n/chat/src/shims.d.ts
@@ -0,0 +1,6 @@
+declare module '*.vue' {
+	import { defineComponent } from 'vue';
+
+	const component: ReturnType<typeof defineComponent>;
+	export default component;
+}
diff --git a/packages/@n8n/chat/src/types/chat.ts b/packages/@n8n/chat/src/types/chat.ts
new file mode 100644
index 0000000000000..30efc944579bd
--- /dev/null
+++ b/packages/@n8n/chat/src/types/chat.ts
@@ -0,0 +1,12 @@
+import type { Ref } from 'vue';
+import type { ChatMessage } from '@n8n/chat/types/messages';
+
+export interface Chat {
+	initialMessages: Ref<ChatMessage[]>;
+	messages: Ref<ChatMessage[]>;
+	currentSessionId: Ref<string | null>;
+	waitingForResponse: Ref<boolean>;
+	loadPreviousSession?: () => Promise<string | undefined>;
+	startNewSession?: () => Promise<void>;
+	sendMessage: (text: string) => Promise<void>;
+}
diff --git a/packages/@n8n/chat/src/types/index.ts b/packages/@n8n/chat/src/types/index.ts
new file mode 100644
index 0000000000000..7fce96db0403a
--- /dev/null
+++ b/packages/@n8n/chat/src/types/index.ts
@@ -0,0 +1,4 @@
+export * from './chat';
+export * from './messages';
+export * from './options';
+export * from './webhook';
diff --git a/packages/@n8n/chat/src/types/messages.ts b/packages/@n8n/chat/src/types/messages.ts
new file mode 100644
index 0000000000000..982c12b3bd6a9
--- /dev/null
+++ b/packages/@n8n/chat/src/types/messages.ts
@@ -0,0 +1,19 @@
+export type ChatMessage<T = Record<string, unknown>> = ChatMessageComponent<T> | ChatMessageText;
+
+export interface ChatMessageComponent<T = Record<string, unknown>> extends ChatMessageBase {
+	type: 'component';
+	key: string;
+	arguments: T;
+}
+
+export interface ChatMessageText extends ChatMessageBase {
+	type?: 'text';
+	text: string;
+}
+
+interface ChatMessageBase {
+	id: string;
+	createdAt: string;
+	transparent?: boolean;
+	sender: 'user' | 'bot';
+}
diff --git a/packages/@n8n/chat/src/types/options.ts b/packages/@n8n/chat/src/types/options.ts
new file mode 100644
index 0000000000000..6cc7b302bbd37
--- /dev/null
+++ b/packages/@n8n/chat/src/types/options.ts
@@ -0,0 +1,33 @@
+import type { Component, Ref } from 'vue';
+export interface ChatOptions {
+	webhookUrl: string;
+	webhookConfig?: {
+		method?: 'GET' | 'POST';
+		headers?: Record<string, string>;
+	};
+	target?: string | Element;
+	mode?: 'window' | 'fullscreen';
+	showWindowCloseButton?: boolean;
+	showWelcomeScreen?: boolean;
+	loadPreviousSession?: boolean;
+	chatInputKey?: string;
+	chatSessionKey?: string;
+	defaultLanguage?: 'en';
+	initialMessages?: string[];
+	metadata?: Record<string, unknown>;
+	i18n: Record<
+		string,
+		{
+			title: string;
+			subtitle: string;
+			footer: string;
+			getStarted: string;
+			inputPlaceholder: string;
+			closeButtonTooltip: string;
+			[message: string]: string;
+		}
+	>;
+	theme?: {};
+	messageComponents?: Record<string, Component>;
+	disabled?: Ref<boolean>;
+}
diff --git a/packages/@n8n/chat/src/types/webhook.ts b/packages/@n8n/chat/src/types/webhook.ts
new file mode 100644
index 0000000000000..5926a8248bb91
--- /dev/null
+++ b/packages/@n8n/chat/src/types/webhook.ts
@@ -0,0 +1,18 @@
+export interface LoadPreviousSessionResponseItem {
+	id: string[];
+	kwargs: {
+		content: string;
+		additional_kwargs: Record<string, unknown>;
+	};
+	lc: number;
+	type: string;
+}
+
+export interface LoadPreviousSessionResponse {
+	data: LoadPreviousSessionResponseItem[];
+}
+
+export interface SendMessageResponse {
+	output?: string;
+	text?: string;
+}
diff --git a/packages/@n8n/chat/src/utils/event-bus.ts b/packages/@n8n/chat/src/utils/event-bus.ts
new file mode 100644
index 0000000000000..f6ffc597f5fd6
--- /dev/null
+++ b/packages/@n8n/chat/src/utils/event-bus.ts
@@ -0,0 +1,51 @@
+// eslint-disable-next-line @typescript-eslint/ban-types
+export type CallbackFn = Function;
+export type UnregisterFn = () => void;
+
+export interface EventBus {
+	on: (eventName: string, fn: CallbackFn) => UnregisterFn;
+	off: (eventName: string, fn: CallbackFn) => void;
+	emit: <T = Event>(eventName: string, event?: T) => void;
+}
+
+export function createEventBus(): EventBus {
+	const handlers = new Map<string, CallbackFn[]>();
+
+	function off(eventName: string, fn: CallbackFn) {
+		const eventFns = handlers.get(eventName);
+
+		if (eventFns) {
+			eventFns.splice(eventFns.indexOf(fn) >>> 0, 1);
+		}
+	}
+
+	function on(eventName: string, fn: CallbackFn): UnregisterFn {
+		let eventFns = handlers.get(eventName);
+
+		if (!eventFns) {
+			eventFns = [fn];
+		} else {
+			eventFns.push(fn);
+		}
+
+		handlers.set(eventName, eventFns);
+
+		return () => off(eventName, fn);
+	}
+
+	function emit<T = Event>(eventName: string, event?: T) {
+		const eventFns = handlers.get(eventName);
+
+		if (eventFns) {
+			eventFns.slice().forEach(async (handler) => {
+				await handler(event);
+			});
+		}
+	}
+
+	return {
+		on,
+		off,
+		emit,
+	};
+}
diff --git a/packages/@n8n/chat/src/utils/index.ts b/packages/@n8n/chat/src/utils/index.ts
new file mode 100644
index 0000000000000..b0d37298b5a79
--- /dev/null
+++ b/packages/@n8n/chat/src/utils/index.ts
@@ -0,0 +1,2 @@
+export * from './event-bus';
+export * from './mount';
diff --git a/packages/@n8n/chat/src/utils/mount.ts b/packages/@n8n/chat/src/utils/mount.ts
new file mode 100644
index 0000000000000..214bd98c4fa65
--- /dev/null
+++ b/packages/@n8n/chat/src/utils/mount.ts
@@ -0,0 +1,16 @@
+export function createDefaultMountingTarget(mountingTarget: string) {
+	const mountingTargetNode = document.querySelector(mountingTarget);
+	if (!mountingTargetNode) {
+		const generatedMountingTargetNode = document.createElement('div');
+
+		if (mountingTarget.startsWith('#')) {
+			generatedMountingTargetNode.id = mountingTarget.replace('#', '');
+		}
+
+		if (mountingTarget.startsWith('.')) {
+			generatedMountingTargetNode.classList.add(mountingTarget.replace('.', ''));
+		}
+
+		document.body.appendChild(generatedMountingTargetNode);
+	}
+}
diff --git a/packages/@n8n/chat/tsconfig.json b/packages/@n8n/chat/tsconfig.json
new file mode 100644
index 0000000000000..358588b8522af
--- /dev/null
+++ b/packages/@n8n/chat/tsconfig.json
@@ -0,0 +1,27 @@
+{
+	"extends": "../../../tsconfig.json",
+	"compilerOptions": {
+		"rootDir": ".",
+		"outDir": "dist",
+		"target": "esnext",
+		"module": "esnext",
+		"allowJs": true,
+		"importHelpers": true,
+		"incremental": false,
+		"allowSyntheticDefaultImports": true,
+		"resolveJsonModule": true,
+		"baseUrl": ".",
+		"types": ["vitest/globals", "unplugin-icons/types/vue"],
+		"paths": {
+			"@/*": ["src/*"],
+			"@n8n/chat/*": ["src/*"]
+		},
+		"lib": ["esnext", "dom", "dom.iterable", "scripthost"],
+		// TODO: remove all options below this line
+		"noUnusedLocals": false,
+		"useUnknownInCatchVariables": false
+	},
+	"include": ["src/**/*.ts", "src/**/*.vue", "**/*.d.ts"]
+}
+
+
diff --git a/packages/@n8n/chat/vite.config.ts b/packages/@n8n/chat/vite.config.ts
new file mode 100644
index 0000000000000..ecb096c5e28bb
--- /dev/null
+++ b/packages/@n8n/chat/vite.config.ts
@@ -0,0 +1,60 @@
+import { fileURLToPath, URL } from 'node:url';
+
+import { defineConfig } from 'vite';
+import checker from 'vite-plugin-checker';
+import { resolve } from 'path';
+import vue from '@vitejs/plugin-vue';
+import icons from 'unplugin-icons/vite';
+import dts from 'vite-plugin-dts';
+
+const includeVue = process.env.INCLUDE_VUE === 'true';
+const srcPath = fileURLToPath(new URL('./src', import.meta.url));
+
+const plugins = [
+	vue(),
+	icons({
+		compiler: 'vue3',
+	}),
+	dts(),
+];
+if (process.env.ENABLE_TYPE_CHECKING === 'true') {
+	plugins.push(checker({ vueTsc: true }));
+}
+
+// https://vitejs.dev/config/
+export default defineConfig({
+	plugins,
+	resolve: {
+		alias: {
+			'@': srcPath,
+			'@n8n/chat': srcPath,
+			lodash: 'lodash-es',
+		},
+	},
+	define: {
+		'process.env.NODE_ENV': process.env.NODE_ENV ? `"${process.env.NODE_ENV}"` : '"development"',
+	},
+	build: {
+		emptyOutDir: !includeVue,
+		lib: {
+			entry: resolve(__dirname, 'src', 'index.ts'),
+			name: 'N8nChat',
+			fileName: (format) => (includeVue ? `chat.bundle.${format}.js` : `chat.${format}.js`),
+		},
+		rollupOptions: {
+			// make sure to externalize deps that shouldn't be bundled
+			// into your library
+			external: includeVue ? [] : ['vue'],
+			output: {
+				exports: 'named',
+				// Provide global variables to use in the UMD build
+				// for externalized deps
+				globals: includeVue
+					? {}
+					: {
+							vue: 'Vue',
+					  },
+			},
+		},
+	},
+});
diff --git a/packages/@n8n/chat/vitest.config.ts b/packages/@n8n/chat/vitest.config.ts
new file mode 100644
index 0000000000000..cda2fb78678f8
--- /dev/null
+++ b/packages/@n8n/chat/vitest.config.ts
@@ -0,0 +1,20 @@
+import { fileURLToPath } from 'node:url';
+import { mergeConfig, defineConfig } from 'vite';
+import { configDefaults } from 'vitest/config';
+import viteConfig from './vite.config';
+
+export default mergeConfig(
+	viteConfig,
+	defineConfig({
+		test: {
+			globals: true,
+			environment: 'jsdom',
+			exclude: [...configDefaults.exclude, 'e2e/*'],
+			root: fileURLToPath(new URL('./', import.meta.url)),
+			setupFiles: ['./src/__tests__/setup.ts'],
+			transformMode: {
+				web: [/\.[jt]sx$/],
+			},
+		},
+	}),
+);
diff --git a/packages/@n8n/client-oauth2/.eslintrc.js b/packages/@n8n/client-oauth2/.eslintrc.js
new file mode 100644
index 0000000000000..c3fe283453eb5
--- /dev/null
+++ b/packages/@n8n/client-oauth2/.eslintrc.js
@@ -0,0 +1,15 @@
+const sharedOptions = require('@n8n_io/eslint-config/shared');
+
+/**
+ * @type {import('@types/eslint').ESLint.ConfigData}
+ */
+module.exports = {
+	extends: ['@n8n_io/eslint-config/base'],
+
+	...sharedOptions(__dirname),
+
+	rules: {
+		'@typescript-eslint/consistent-type-imports': 'error',
+		'n8n-local-rules/no-plain-errors': 'off',
+	},
+};
diff --git a/packages/@n8n/client-oauth2/jest.config.js b/packages/@n8n/client-oauth2/jest.config.js
new file mode 100644
index 0000000000000..d6c48554a79a4
--- /dev/null
+++ b/packages/@n8n/client-oauth2/jest.config.js
@@ -0,0 +1,2 @@
+/** @type {import('jest').Config} */
+module.exports = require('../../../jest.config');
diff --git a/packages/@n8n/client-oauth2/package.json b/packages/@n8n/client-oauth2/package.json
new file mode 100644
index 0000000000000..8d4edbf487f72
--- /dev/null
+++ b/packages/@n8n/client-oauth2/package.json
@@ -0,0 +1,25 @@
+{
+  "name": "@n8n/client-oauth2",
+  "version": "0.14.0",
+  "scripts": {
+    "clean": "rimraf dist .turbo",
+    "dev": "pnpm watch",
+    "typecheck": "tsc",
+    "build": "tsc -p tsconfig.build.json",
+    "format": "prettier --write . --ignore-path ../../../.prettierignore",
+    "lint": "eslint . --quiet",
+    "lintfix": "eslint . --fix",
+    "watch": "tsc -p tsconfig.build.json --watch",
+    "test": "jest",
+    "test:dev": "jest --watch"
+  },
+  "main": "dist/index.js",
+  "module": "src/index.ts",
+  "types": "dist/index.d.ts",
+  "files": [
+    "dist/**/*"
+  ],
+  "dependencies": {
+    "axios": "1.6.7"
+  }
+}
diff --git a/packages/@n8n/client-oauth2/src/ClientOAuth2.ts b/packages/@n8n/client-oauth2/src/ClientOAuth2.ts
new file mode 100644
index 0000000000000..b41c68686cff5
--- /dev/null
+++ b/packages/@n8n/client-oauth2/src/ClientOAuth2.ts
@@ -0,0 +1,127 @@
+/* eslint-disable @typescript-eslint/no-unsafe-return */
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import * as qs from 'querystring';
+import { Agent } from 'https';
+import axios from 'axios';
+import type { AxiosRequestConfig } from 'axios';
+import { getAuthError } from './utils';
+import type { ClientOAuth2TokenData } from './ClientOAuth2Token';
+import { ClientOAuth2Token } from './ClientOAuth2Token';
+import { CodeFlow } from './CodeFlow';
+import { CredentialsFlow } from './CredentialsFlow';
+import type { Headers } from './types';
+
+export interface ClientOAuth2RequestObject {
+	url: string;
+	method: 'DELETE' | 'GET' | 'HEAD' | 'PATCH' | 'POST' | 'PUT';
+	body?: Record<string, any>;
+	query?: qs.ParsedUrlQuery;
+	headers?: Headers;
+	ignoreSSLIssues?: boolean;
+}
+
+export interface ClientOAuth2Options {
+	clientId: string;
+	clientSecret?: string;
+	accessTokenUri: string;
+	authentication?: 'header' | 'body';
+	authorizationUri?: string;
+	redirectUri?: string;
+	scopes?: string[];
+	scopesSeparator?: ',' | ' ';
+	authorizationGrants?: string[];
+	state?: string;
+	body?: Record<string, any>;
+	query?: qs.ParsedUrlQuery;
+	ignoreSSLIssues?: boolean;
+}
+
+class ResponseError extends Error {
+	constructor(
+		readonly status: number,
+		readonly body: object,
+		readonly code = 'ESTATUS',
+	) {
+		super(`HTTP status ${status}`);
+	}
+}
+
+const sslIgnoringAgent = new Agent({ rejectUnauthorized: false });
+
+/**
+ * Construct an object that can handle the multiple OAuth 2.0 flows.
+ */
+export class ClientOAuth2 {
+	code: CodeFlow;
+
+	credentials: CredentialsFlow;
+
+	constructor(readonly options: ClientOAuth2Options) {
+		this.code = new CodeFlow(this);
+		this.credentials = new CredentialsFlow(this);
+	}
+
+	/**
+	 * Create a new token from existing data.
+	 */
+	createToken(data: ClientOAuth2TokenData, type?: string): ClientOAuth2Token {
+		return new ClientOAuth2Token(this, {
+			...data,
+			...(typeof type === 'string' ? { token_type: type } : type),
+		});
+	}
+
+	/**
+	 * Attempt to parse response body as JSON, fall back to parsing as a query string.
+	 */
+	private parseResponseBody<T extends object>(body: string): T {
+		try {
+			return JSON.parse(body);
+		} catch (e) {
+			return qs.parse(body) as T;
+		}
+	}
+
+	/**
+	 * Using the built-in request method, we'll automatically attempt to parse
+	 * the response.
+	 */
+	async request<T extends object>(options: ClientOAuth2RequestObject): Promise<T> {
+		let url = options.url;
+		const query = qs.stringify(options.query);
+
+		if (query) {
+			url += (url.indexOf('?') === -1 ? '?' : '&') + query;
+		}
+
+		const requestConfig: AxiosRequestConfig = {
+			url,
+			method: options.method,
+			data: qs.stringify(options.body),
+			headers: options.headers,
+			transformResponse: (res) => res,
+			// Axios rejects the promise by default for all status codes 4xx.
+			// We override this to reject promises only on 5xxs
+			validateStatus: (status) => status < 500,
+		};
+
+		if (options.ignoreSSLIssues) {
+			requestConfig.httpsAgent = sslIgnoringAgent;
+		}
+
+		const response = await axios.request(requestConfig);
+
+		const body = this.parseResponseBody<T>(response.data);
+
+		// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+		// @ts-ignore
+		const authErr = getAuthError(body);
+		if (authErr) throw authErr;
+
+		if (response.status < 200 || response.status >= 399)
+			throw new ResponseError(response.status, response.data);
+
+		return body;
+	}
+}
diff --git a/packages/@n8n/client-oauth2/src/ClientOAuth2Token.ts b/packages/@n8n/client-oauth2/src/ClientOAuth2Token.ts
new file mode 100644
index 0000000000000..9b696dff22b62
--- /dev/null
+++ b/packages/@n8n/client-oauth2/src/ClientOAuth2Token.ts
@@ -0,0 +1,103 @@
+/* eslint-disable @typescript-eslint/naming-convention */
+import type { ClientOAuth2, ClientOAuth2Options, ClientOAuth2RequestObject } from './ClientOAuth2';
+import { auth, expects, getRequestOptions } from './utils';
+import { DEFAULT_HEADERS } from './constants';
+
+export interface ClientOAuth2TokenData extends Record<string, string | undefined> {
+	token_type?: string | undefined;
+	access_token: string;
+	refresh_token: string;
+	expires_in?: string;
+	scope?: string | undefined;
+}
+/**
+ * General purpose client token generator.
+ */
+export class ClientOAuth2Token {
+	readonly tokenType?: string;
+
+	readonly accessToken: string;
+
+	readonly refreshToken: string;
+
+	private expires: Date;
+
+	constructor(
+		readonly client: ClientOAuth2,
+		readonly data: ClientOAuth2TokenData,
+	) {
+		this.tokenType = data.token_type?.toLowerCase() ?? 'bearer';
+		this.accessToken = data.access_token;
+		this.refreshToken = data.refresh_token;
+
+		this.expires = new Date();
+		this.expires.setSeconds(this.expires.getSeconds() + Number(data.expires_in));
+	}
+
+	/**
+	 * Sign a standardized request object with user authentication information.
+	 */
+	sign(requestObject: ClientOAuth2RequestObject): ClientOAuth2RequestObject {
+		if (!this.accessToken) {
+			throw new Error('Unable to sign without access token');
+		}
+
+		requestObject.headers = requestObject.headers ?? {};
+
+		if (this.tokenType === 'bearer') {
+			requestObject.headers.Authorization = 'Bearer ' + this.accessToken;
+		} else {
+			const parts = requestObject.url.split('#');
+			const token = 'access_token=' + this.accessToken;
+			const url = parts[0].replace(/[?&]access_token=[^&#]/, '');
+			const fragment = parts[1] ? '#' + parts[1] : '';
+
+			// Prepend the correct query string parameter to the url.
+			requestObject.url = url + (url.indexOf('?') > -1 ? '&' : '?') + token + fragment;
+
+			// Attempt to avoid storing the url in proxies, since the access token
+			// is exposed in the query parameters.
+			requestObject.headers.Pragma = 'no-store';
+			requestObject.headers['Cache-Control'] = 'no-store';
+		}
+
+		return requestObject;
+	}
+
+	/**
+	 * Refresh a user access token with the supplied token.
+	 */
+	async refresh(opts?: ClientOAuth2Options): Promise<ClientOAuth2Token> {
+		const options = { ...this.client.options, ...opts };
+
+		expects(options, 'clientSecret');
+
+		if (!this.refreshToken) throw new Error('No refresh token');
+
+		const requestOptions = getRequestOptions(
+			{
+				url: options.accessTokenUri,
+				method: 'POST',
+				headers: {
+					...DEFAULT_HEADERS,
+					Authorization: auth(options.clientId, options.clientSecret),
+				},
+				body: {
+					refresh_token: this.refreshToken,
+					grant_type: 'refresh_token',
+				},
+			},
+			options,
+		);
+
+		const responseData = await this.client.request<ClientOAuth2TokenData>(requestOptions);
+		return this.client.createToken({ ...this.data, ...responseData });
+	}
+
+	/**
+	 * Check whether the token has expired.
+	 */
+	expired(): boolean {
+		return Date.now() > this.expires.getTime();
+	}
+}
diff --git a/packages/@n8n/client-oauth2/src/CodeFlow.ts b/packages/@n8n/client-oauth2/src/CodeFlow.ts
new file mode 100644
index 0000000000000..3fda119a003b2
--- /dev/null
+++ b/packages/@n8n/client-oauth2/src/CodeFlow.ts
@@ -0,0 +1,122 @@
+import * as qs from 'querystring';
+import type { ClientOAuth2, ClientOAuth2Options } from './ClientOAuth2';
+import type { ClientOAuth2Token, ClientOAuth2TokenData } from './ClientOAuth2Token';
+import { DEFAULT_HEADERS, DEFAULT_URL_BASE } from './constants';
+import { auth, expects, getAuthError, getRequestOptions } from './utils';
+
+interface CodeFlowBody {
+	code: string | string[];
+	grant_type: 'authorization_code';
+	redirect_uri?: string;
+	client_id?: string;
+}
+
+/**
+ * Support authorization code OAuth 2.0 grant.
+ *
+ * Reference: http://tools.ietf.org/html/rfc6749#section-4.1
+ */
+export class CodeFlow {
+	constructor(private client: ClientOAuth2) {}
+
+	/**
+	 * Generate the uri for doing the first redirect.
+	 */
+	getUri(opts?: Partial<ClientOAuth2Options>): string {
+		const options: ClientOAuth2Options = { ...this.client.options, ...opts };
+
+		// Check the required parameters are set.
+		expects(options, 'clientId', 'authorizationUri');
+
+		const url = new URL(options.authorizationUri);
+
+		const queryParams = {
+			...options.query,
+			client_id: options.clientId,
+			redirect_uri: options.redirectUri,
+			response_type: 'code',
+			state: options.state,
+			...(options.scopes ? { scope: options.scopes.join(options.scopesSeparator ?? ' ') } : {}),
+		};
+
+		for (const [key, value] of Object.entries(queryParams)) {
+			if (value !== null && value !== undefined) {
+				url.searchParams.append(key, value);
+			}
+		}
+
+		return url.toString();
+	}
+
+	/**
+	 * Get the code token from the redirected uri and make another request for
+	 * the user access token.
+	 */
+	async getToken(
+		urlString: string,
+		opts?: Partial<ClientOAuth2Options>,
+	): Promise<ClientOAuth2Token> {
+		const options: ClientOAuth2Options = { ...this.client.options, ...opts };
+		expects(options, 'clientId', 'accessTokenUri');
+
+		const url = new URL(urlString, DEFAULT_URL_BASE);
+		if (
+			typeof options.redirectUri === 'string' &&
+			typeof url.pathname === 'string' &&
+			url.pathname !== new URL(options.redirectUri, DEFAULT_URL_BASE).pathname
+		) {
+			throw new TypeError('Redirected path should match configured path, but got: ' + url.pathname);
+		}
+
+		if (!url.search?.substring(1)) {
+			throw new TypeError(`Unable to process uri: ${urlString}`);
+		}
+
+		const data =
+			typeof url.search === 'string' ? qs.parse(url.search.substring(1)) : url.search || {};
+
+		// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+		// @ts-ignore
+		const error = getAuthError(data);
+		if (error) throw error;
+
+		if (options.state && data.state !== options.state) {
+			// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+			throw new TypeError(`Invalid state: ${data.state}`);
+		}
+
+		// Check whether the response code is set.
+		if (!data.code) {
+			throw new TypeError('Missing code, unable to request token');
+		}
+
+		const headers = { ...DEFAULT_HEADERS };
+		const body: CodeFlowBody = {
+			code: data.code,
+			grant_type: 'authorization_code',
+			redirect_uri: options.redirectUri,
+		};
+
+		// `client_id`: REQUIRED, if the client is not authenticating with the
+		// authorization server as described in Section 3.2.1.
+		// Reference: https://tools.ietf.org/html/rfc6749#section-3.2.1
+		if (options.clientSecret) {
+			headers.Authorization = auth(options.clientId, options.clientSecret);
+		} else {
+			body.client_id = options.clientId;
+		}
+
+		const requestOptions = getRequestOptions(
+			{
+				url: options.accessTokenUri,
+				method: 'POST',
+				headers,
+				body,
+			},
+			options,
+		);
+
+		const responseData = await this.client.request<ClientOAuth2TokenData>(requestOptions);
+		return this.client.createToken(responseData);
+	}
+}
diff --git a/packages/@n8n/client-oauth2/src/CredentialsFlow.ts b/packages/@n8n/client-oauth2/src/CredentialsFlow.ts
new file mode 100644
index 0000000000000..f1ccc256e73ea
--- /dev/null
+++ b/packages/@n8n/client-oauth2/src/CredentialsFlow.ts
@@ -0,0 +1,61 @@
+import type { ClientOAuth2 } from './ClientOAuth2';
+import type { ClientOAuth2Token, ClientOAuth2TokenData } from './ClientOAuth2Token';
+import { DEFAULT_HEADERS } from './constants';
+import type { Headers } from './types';
+import { auth, expects, getRequestOptions } from './utils';
+
+interface CredentialsFlowBody {
+	client_id?: string;
+	client_secret?: string;
+	grant_type: 'client_credentials';
+	scope?: string;
+}
+
+/**
+ * Support client credentials OAuth 2.0 grant.
+ *
+ * Reference: http://tools.ietf.org/html/rfc6749#section-4.4
+ */
+export class CredentialsFlow {
+	constructor(private client: ClientOAuth2) {}
+
+	/**
+	 * Request an access token using the client credentials.
+	 */
+	async getToken(): Promise<ClientOAuth2Token> {
+		const options = { ...this.client.options };
+		expects(options, 'clientId', 'clientSecret', 'accessTokenUri');
+
+		const headers: Headers = { ...DEFAULT_HEADERS };
+		const body: CredentialsFlowBody = {
+			grant_type: 'client_credentials',
+		};
+
+		if (options.scopes !== undefined) {
+			body.scope = options.scopes.join(options.scopesSeparator ?? ' ');
+		}
+
+		const clientId = options.clientId;
+		const clientSecret = options.clientSecret;
+
+		if (options.authentication === 'body') {
+			body.client_id = clientId;
+			body.client_secret = clientSecret;
+		} else {
+			headers.Authorization = auth(clientId, clientSecret);
+		}
+
+		const requestOptions = getRequestOptions(
+			{
+				url: options.accessTokenUri,
+				method: 'POST',
+				headers,
+				body,
+			},
+			options,
+		);
+
+		const responseData = await this.client.request<ClientOAuth2TokenData>(requestOptions);
+		return this.client.createToken(responseData);
+	}
+}
diff --git a/packages/@n8n/client-oauth2/src/constants.ts b/packages/@n8n/client-oauth2/src/constants.ts
new file mode 100644
index 0000000000000..e4895aa470a15
--- /dev/null
+++ b/packages/@n8n/client-oauth2/src/constants.ts
@@ -0,0 +1,63 @@
+/* eslint-disable @typescript-eslint/naming-convention */
+import type { Headers } from './types';
+
+export const DEFAULT_URL_BASE = 'https://example.org/';
+
+/**
+ * Default headers for executing OAuth 2.0 flows.
+ */
+export const DEFAULT_HEADERS: Headers = {
+	Accept: 'application/json, application/x-www-form-urlencoded',
+	'Content-Type': 'application/x-www-form-urlencoded',
+};
+
+/**
+ * Format error response types to regular strings for displaying to clients.
+ *
+ * Reference: http://tools.ietf.org/html/rfc6749#section-4.1.2.1
+ */
+export const ERROR_RESPONSES: Record<string, string> = {
+	invalid_request: [
+		'The request is missing a required parameter, includes an',
+		'invalid parameter value, includes a parameter more than',
+		'once, or is otherwise malformed.',
+	].join(' '),
+	invalid_client: [
+		'Client authentication failed (e.g., unknown client, no',
+		'client authentication included, or unsupported',
+		'authentication method).',
+	].join(' '),
+	invalid_grant: [
+		'The provided authorization grant (e.g., authorization',
+		'code, resource owner credentials) or refresh token is',
+		'invalid, expired, revoked, does not match the redirection',
+		'URI used in the authorization request, or was issued to',
+		'another client.',
+	].join(' '),
+	unauthorized_client: [
+		'The client is not authorized to request an authorization',
+		'code using this method.',
+	].join(' '),
+	unsupported_grant_type: [
+		'The authorization grant type is not supported by the',
+		'authorization server.',
+	].join(' '),
+	access_denied: ['The resource owner or authorization server denied the request.'].join(' '),
+	unsupported_response_type: [
+		'The authorization server does not support obtaining',
+		'an authorization code using this method.',
+	].join(' '),
+	invalid_scope: ['The requested scope is invalid, unknown, or malformed.'].join(' '),
+	server_error: [
+		'The authorization server encountered an unexpected',
+		'condition that prevented it from fulfilling the request.',
+		'(This error code is needed because a 500 Internal Server',
+		'Error HTTP status code cannot be returned to the client',
+		'via an HTTP redirect.)',
+	].join(' '),
+	temporarily_unavailable: [
+		'The authorization server is currently unable to handle',
+		'the request due to a temporary overloading or maintenance',
+		'of the server.',
+	].join(' '),
+};
diff --git a/packages/@n8n/client-oauth2/src/index.ts b/packages/@n8n/client-oauth2/src/index.ts
new file mode 100644
index 0000000000000..aa19a0f66d5fc
--- /dev/null
+++ b/packages/@n8n/client-oauth2/src/index.ts
@@ -0,0 +1,3 @@
+export { ClientOAuth2, ClientOAuth2Options, ClientOAuth2RequestObject } from './ClientOAuth2';
+export { ClientOAuth2Token, ClientOAuth2TokenData } from './ClientOAuth2Token';
+export type * from './types';
diff --git a/packages/@n8n/client-oauth2/src/types.ts b/packages/@n8n/client-oauth2/src/types.ts
new file mode 100644
index 0000000000000..69c225d827661
--- /dev/null
+++ b/packages/@n8n/client-oauth2/src/types.ts
@@ -0,0 +1,19 @@
+export type Headers = Record<string, string | string[]>;
+
+export type OAuth2GrantType = 'pkce' | 'authorizationCode' | 'clientCredentials';
+
+export interface OAuth2CredentialData {
+	clientId: string;
+	clientSecret?: string;
+	accessTokenUrl: string;
+	authentication?: 'header' | 'body';
+	authUrl?: string;
+	scope?: string;
+	authQueryParameters?: string;
+	grantType: OAuth2GrantType;
+	ignoreSSLIssues?: boolean;
+	oauthTokenData?: {
+		access_token: string;
+		refresh_token?: string;
+	};
+}
diff --git a/packages/@n8n/client-oauth2/src/utils.ts b/packages/@n8n/client-oauth2/src/utils.ts
new file mode 100644
index 0000000000000..550c1dcf994a3
--- /dev/null
+++ b/packages/@n8n/client-oauth2/src/utils.ts
@@ -0,0 +1,82 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import type { ClientOAuth2Options, ClientOAuth2RequestObject } from './ClientOAuth2';
+import { ERROR_RESPONSES } from './constants';
+
+/**
+ * Check if properties exist on an object and throw when they aren't.
+ */
+export function expects<Keys extends keyof ClientOAuth2Options>(
+	obj: ClientOAuth2Options,
+	...keys: Keys[]
+): asserts obj is ClientOAuth2Options & {
+	[K in Keys]: NonNullable<ClientOAuth2Options[K]>;
+} {
+	for (const key of keys) {
+		if (obj[key] === null || obj[key] === undefined) {
+			throw new TypeError('Expected "' + key + '" to exist');
+		}
+	}
+}
+
+export class AuthError extends Error {
+	constructor(
+		message: string,
+		readonly body: any,
+		readonly code = 'EAUTH',
+	) {
+		super(message);
+	}
+}
+
+/**
+ * Pull an authentication error from the response data.
+ */
+export function getAuthError(body: {
+	error: string;
+	error_description?: string;
+}): Error | undefined {
+	const message: string | undefined =
+		ERROR_RESPONSES[body.error] ?? body.error_description ?? body.error;
+
+	if (message) {
+		return new AuthError(message, body);
+	}
+
+	return undefined;
+}
+
+/**
+ * Ensure a value is a string.
+ */
+function toString(str: string | null | undefined) {
+	return str === null ? '' : String(str);
+}
+
+/**
+ * Create basic auth header.
+ */
+export function auth(username: string, password: string): string {
+	return 'Basic ' + Buffer.from(toString(username) + ':' + toString(password)).toString('base64');
+}
+
+/**
+ * Merge request options from an options object.
+ */
+export function getRequestOptions(
+	{ url, method, body, query, headers }: ClientOAuth2RequestObject,
+	options: ClientOAuth2Options,
+): ClientOAuth2RequestObject {
+	const rOptions = {
+		url,
+		method,
+		body: { ...body, ...options.body },
+		query: { ...query, ...options.query },
+		headers: headers ?? {},
+		ignoreSSLIssues: options.ignoreSSLIssues,
+	};
+	// if request authorization was overridden delete it from header
+	if (rOptions.headers.Authorization === '') {
+		delete rOptions.headers.Authorization;
+	}
+	return rOptions;
+}
diff --git a/packages/@n8n/client-oauth2/test/CodeFlow.test.ts b/packages/@n8n/client-oauth2/test/CodeFlow.test.ts
new file mode 100644
index 0000000000000..f479769c77f32
--- /dev/null
+++ b/packages/@n8n/client-oauth2/test/CodeFlow.test.ts
@@ -0,0 +1,189 @@
+import nock from 'nock';
+import { ClientOAuth2, ClientOAuth2Token } from '../src';
+import * as config from './config';
+import { AuthError } from '@/utils';
+
+describe('CodeFlow', () => {
+	beforeAll(async () => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+	});
+
+	const uri = `/auth/callback?code=${config.code}&state=${config.state}`;
+
+	const githubAuth = new ClientOAuth2({
+		clientId: config.clientId,
+		clientSecret: config.clientSecret,
+		accessTokenUri: config.accessTokenUri,
+		authorizationUri: config.authorizationUri,
+		authorizationGrants: ['code'],
+		redirectUri: config.redirectUri,
+		scopes: ['notifications'],
+	});
+
+	describe('#getUri', () => {
+		it('should return a valid uri', () => {
+			expect(githubAuth.code.getUri()).toEqual(
+				`${config.authorizationUri}?client_id=abc&` +
+					`redirect_uri=${encodeURIComponent(config.redirectUri)}&` +
+					'response_type=code&scope=notifications',
+			);
+		});
+
+		describe('when scopes are undefined', () => {
+			it('should not include scope in the uri', () => {
+				const authWithoutScopes = new ClientOAuth2({
+					clientId: config.clientId,
+					clientSecret: config.clientSecret,
+					accessTokenUri: config.accessTokenUri,
+					authorizationUri: config.authorizationUri,
+					authorizationGrants: ['code'],
+					redirectUri: config.redirectUri,
+				});
+				expect(authWithoutScopes.code.getUri()).toEqual(
+					`${config.authorizationUri}?client_id=abc&` +
+						`redirect_uri=${encodeURIComponent(config.redirectUri)}&` +
+						'response_type=code',
+				);
+			});
+		});
+
+		it('should include empty scopes array as an empty string', () => {
+			const authWithEmptyScopes = new ClientOAuth2({
+				clientId: config.clientId,
+				clientSecret: config.clientSecret,
+				accessTokenUri: config.accessTokenUri,
+				authorizationUri: config.authorizationUri,
+				authorizationGrants: ['code'],
+				redirectUri: config.redirectUri,
+				scopes: [],
+			});
+			expect(authWithEmptyScopes.code.getUri()).toEqual(
+				`${config.authorizationUri}?client_id=abc&` +
+					`redirect_uri=${encodeURIComponent(config.redirectUri)}&` +
+					'response_type=code&scope=',
+			);
+		});
+
+		it('should include empty scopes string as an empty string', () => {
+			const authWithEmptyScopes = new ClientOAuth2({
+				clientId: config.clientId,
+				clientSecret: config.clientSecret,
+				accessTokenUri: config.accessTokenUri,
+				authorizationUri: config.authorizationUri,
+				authorizationGrants: ['code'],
+				redirectUri: config.redirectUri,
+				scopes: [],
+			});
+			expect(authWithEmptyScopes.code.getUri()).toEqual(
+				`${config.authorizationUri}?client_id=abc&` +
+					`redirect_uri=${encodeURIComponent(config.redirectUri)}&` +
+					'response_type=code&scope=',
+			);
+		});
+
+		describe('when authorizationUri contains query parameters', () => {
+			it('should preserve query string parameters', () => {
+				const authWithParams = new ClientOAuth2({
+					clientId: config.clientId,
+					clientSecret: config.clientSecret,
+					accessTokenUri: config.accessTokenUri,
+					authorizationUri: `${config.authorizationUri}?bar=qux`,
+					authorizationGrants: ['code'],
+					redirectUri: config.redirectUri,
+					scopes: ['notifications'],
+				});
+				expect(authWithParams.code.getUri()).toEqual(
+					`${config.authorizationUri}?bar=qux&client_id=abc&` +
+						`redirect_uri=${encodeURIComponent(config.redirectUri)}&` +
+						'response_type=code&scope=notifications',
+				);
+			});
+		});
+	});
+
+	describe('#getToken', () => {
+		const mockTokenCall = () =>
+			nock(config.baseUrl)
+				.post(
+					'/login/oauth/access_token',
+					({ code, grant_type, redirect_uri }) =>
+						code === config.code &&
+						grant_type === 'authorization_code' &&
+						redirect_uri === config.redirectUri,
+				)
+				.once()
+				.reply(200, {
+					access_token: config.accessToken,
+					refresh_token: config.refreshToken,
+				});
+
+		it('should request the token', async () => {
+			mockTokenCall();
+			const user = await githubAuth.code.getToken(uri);
+
+			expect(user).toBeInstanceOf(ClientOAuth2Token);
+			expect(user.accessToken).toEqual(config.accessToken);
+			expect(user.tokenType).toEqual('bearer');
+		});
+
+		it('should reject with auth errors', async () => {
+			let errored = false;
+
+			try {
+				await githubAuth.code.getToken(`${config.redirectUri}?error=invalid_request`);
+			} catch (err) {
+				errored = true;
+				expect(err).toBeInstanceOf(AuthError);
+				if (err instanceof AuthError) {
+					expect(err.code).toEqual('EAUTH');
+					expect(err.body.error).toEqual('invalid_request');
+				}
+			}
+			expect(errored).toEqual(true);
+		});
+
+		describe('#sign', () => {
+			it('should be able to sign a standard request object', async () => {
+				mockTokenCall();
+				const token = await githubAuth.code.getToken(uri);
+				const requestOptions = token.sign({
+					method: 'GET',
+					url: 'http://api.github.com/user',
+				});
+				expect(requestOptions.headers?.Authorization).toEqual(`Bearer ${config.accessToken}`);
+			});
+		});
+
+		describe('#refresh', () => {
+			const mockRefreshCall = () =>
+				nock(config.baseUrl)
+					.post(
+						'/login/oauth/access_token',
+						({ refresh_token, grant_type }) =>
+							refresh_token === config.refreshToken && grant_type === 'refresh_token',
+					)
+					.once()
+					.reply(200, {
+						access_token: config.refreshedAccessToken,
+						refresh_token: config.refreshedRefreshToken,
+					});
+
+			it('should make a request to get a new access token', async () => {
+				mockTokenCall();
+				const token = await githubAuth.code.getToken(uri, { state: config.state });
+				expect(token.refreshToken).toEqual(config.refreshToken);
+
+				mockRefreshCall();
+				const token1 = await token.refresh();
+				expect(token1).toBeInstanceOf(ClientOAuth2Token);
+				expect(token1.accessToken).toEqual(config.refreshedAccessToken);
+				expect(token1.refreshToken).toEqual(config.refreshedRefreshToken);
+				expect(token1.tokenType).toEqual('bearer');
+			});
+		});
+	});
+});
diff --git a/packages/@n8n/client-oauth2/test/CredentialsFlow.test.ts b/packages/@n8n/client-oauth2/test/CredentialsFlow.test.ts
new file mode 100644
index 0000000000000..9e0749800de99
--- /dev/null
+++ b/packages/@n8n/client-oauth2/test/CredentialsFlow.test.ts
@@ -0,0 +1,161 @@
+import nock from 'nock';
+import type { Headers } from '../src/types';
+import type { ClientOAuth2Options } from '../src';
+import { ClientOAuth2, ClientOAuth2Token } from '../src';
+import * as config from './config';
+
+describe('CredentialsFlow', () => {
+	beforeAll(async () => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+	});
+
+	beforeEach(() => jest.clearAllMocks());
+
+	describe('#getToken', () => {
+		const createAuthClient = ({
+			scopes,
+			authentication,
+		}: Pick<ClientOAuth2Options, 'scopes' | 'authentication'> = {}) =>
+			new ClientOAuth2({
+				clientId: config.clientId,
+				clientSecret: config.clientSecret,
+				accessTokenUri: config.accessTokenUri,
+				authentication,
+				authorizationGrants: ['credentials'],
+				scopes,
+			});
+
+		const mockTokenCall = async ({ requestedScope }: { requestedScope?: string } = {}) => {
+			const nockScope = nock(config.baseUrl)
+				.post(
+					'/login/oauth/access_token',
+					({ scope, grant_type }) =>
+						scope === requestedScope && grant_type === 'client_credentials',
+				)
+				.once()
+				.reply(200, {
+					access_token: config.accessToken,
+					refresh_token: config.refreshToken,
+					scope: requestedScope,
+				});
+			return await new Promise<{ headers: Headers; body: unknown }>((resolve) => {
+				nockScope.once('request', (req) => {
+					resolve({
+						headers: req.headers,
+						body: req.requestBodyBuffers.toString('utf-8'),
+					});
+				});
+			});
+		};
+
+		it('should request the token', async () => {
+			const authClient = createAuthClient({ scopes: ['notifications'] });
+			const requestPromise = mockTokenCall({ requestedScope: 'notifications' });
+
+			const user = await authClient.credentials.getToken();
+
+			expect(user).toBeInstanceOf(ClientOAuth2Token);
+			expect(user.accessToken).toEqual(config.accessToken);
+			expect(user.tokenType).toEqual('bearer');
+			expect(user.data.scope).toEqual('notifications');
+
+			const { headers, body } = await requestPromise;
+			expect(headers.authorization).toBe('Basic YWJjOjEyMw==');
+			expect(body).toEqual('grant_type=client_credentials&scope=notifications');
+		});
+
+		it('when scopes are undefined, it should not send scopes to an auth server', async () => {
+			const authClient = createAuthClient();
+			const requestPromise = mockTokenCall();
+
+			const user = await authClient.credentials.getToken();
+			expect(user).toBeInstanceOf(ClientOAuth2Token);
+			expect(user.accessToken).toEqual(config.accessToken);
+			expect(user.tokenType).toEqual('bearer');
+			expect(user.data.scope).toEqual(undefined);
+
+			const { body } = await requestPromise;
+			expect(body).toEqual('grant_type=client_credentials');
+		});
+
+		it('when scopes is an empty array, it should send empty scope string to an auth server', async () => {
+			const authClient = createAuthClient({ scopes: [] });
+			const requestPromise = mockTokenCall({ requestedScope: '' });
+
+			const user = await authClient.credentials.getToken();
+			expect(user).toBeInstanceOf(ClientOAuth2Token);
+			expect(user.accessToken).toEqual(config.accessToken);
+			expect(user.tokenType).toEqual('bearer');
+			expect(user.data.scope).toEqual('');
+
+			const { body } = await requestPromise;
+			expect(body).toEqual('grant_type=client_credentials&scope=');
+		});
+
+		it('should handle authentication = "header"', async () => {
+			const authClient = createAuthClient({ scopes: [] });
+			const requestPromise = mockTokenCall({ requestedScope: '' });
+			await authClient.credentials.getToken();
+			const { headers, body } = await requestPromise;
+			expect(headers?.authorization).toBe('Basic YWJjOjEyMw==');
+			expect(body).toEqual('grant_type=client_credentials&scope=');
+		});
+
+		it('should handle authentication = "body"', async () => {
+			const authClient = createAuthClient({ scopes: [], authentication: 'body' });
+			const requestPromise = mockTokenCall({ requestedScope: '' });
+			await authClient.credentials.getToken();
+			const { headers, body } = await requestPromise;
+			expect(headers?.authorization).toBe(undefined);
+			expect(body).toEqual('grant_type=client_credentials&scope=&client_id=abc&client_secret=123');
+		});
+
+		describe('#sign', () => {
+			it('should be able to sign a standard request object', async () => {
+				const authClient = createAuthClient({ scopes: ['notifications'] });
+				void mockTokenCall({ requestedScope: 'notifications' });
+
+				const token = await authClient.credentials.getToken();
+				const requestOptions = token.sign({
+					method: 'GET',
+					url: `${config.baseUrl}/test`,
+				});
+
+				expect(requestOptions.headers?.Authorization).toEqual(`Bearer ${config.accessToken}`);
+			});
+		});
+
+		describe('#refresh', () => {
+			const mockRefreshCall = () =>
+				nock(config.baseUrl)
+					.post(
+						'/login/oauth/access_token',
+						({ refresh_token, grant_type }) =>
+							refresh_token === config.refreshToken && grant_type === 'refresh_token',
+					)
+					.once()
+					.reply(200, {
+						access_token: config.refreshedAccessToken,
+						refresh_token: config.refreshedRefreshToken,
+					});
+
+			it('should make a request to get a new access token', async () => {
+				const authClient = createAuthClient({ scopes: ['notifications'] });
+				void mockTokenCall({ requestedScope: 'notifications' });
+
+				const token = await authClient.credentials.getToken();
+				expect(token.accessToken).toEqual(config.accessToken);
+
+				mockRefreshCall();
+				const token1 = await token.refresh();
+				expect(token1).toBeInstanceOf(ClientOAuth2Token);
+				expect(token1.accessToken).toEqual(config.refreshedAccessToken);
+				expect(token1.tokenType).toEqual('bearer');
+			});
+		});
+	});
+});
diff --git a/packages/@n8n/client-oauth2/test/config.ts b/packages/@n8n/client-oauth2/test/config.ts
new file mode 100644
index 0000000000000..a6dd28a3ef95d
--- /dev/null
+++ b/packages/@n8n/client-oauth2/test/config.ts
@@ -0,0 +1,15 @@
+export const baseUrl = 'https://mock.auth.service';
+export const accessTokenUri = baseUrl + '/login/oauth/access_token';
+export const authorizationUri = baseUrl + '/login/oauth/authorize';
+export const redirectUri = 'http://example.com/auth/callback';
+
+export const accessToken = '4430eb1615fb6127cbf828a8e403';
+export const refreshToken = 'def456token';
+export const refreshedAccessToken = 'f456okeendt';
+export const refreshedRefreshToken = 'f4f6577c0f3af456okeendt';
+
+export const clientId = 'abc';
+export const clientSecret = '123';
+
+export const code = 'fbe55d970377e0686746';
+export const state = '7076840850058943';
diff --git a/packages/@n8n/client-oauth2/tsconfig.build.json b/packages/@n8n/client-oauth2/tsconfig.build.json
new file mode 100644
index 0000000000000..30910a3bf1ebb
--- /dev/null
+++ b/packages/@n8n/client-oauth2/tsconfig.build.json
@@ -0,0 +1,10 @@
+{
+	"extends": ["./tsconfig.json", "../../../tsconfig.build.json"],
+	"compilerOptions": {
+		"rootDir": "src",
+		"outDir": "dist",
+		"tsBuildInfoFile": "dist/build.tsbuildinfo"
+	},
+	"include": ["src/**/*.ts"],
+	"exclude": ["test/**"]
+}
diff --git a/packages/@n8n/client-oauth2/tsconfig.json b/packages/@n8n/client-oauth2/tsconfig.json
new file mode 100644
index 0000000000000..a693815582818
--- /dev/null
+++ b/packages/@n8n/client-oauth2/tsconfig.json
@@ -0,0 +1,15 @@
+{
+	"extends": "../../../tsconfig.json",
+	"compilerOptions": {
+		"rootDir": ".",
+		"types": ["node", "jest"],
+		"composite": true,
+		"noEmit": true,
+		"baseUrl": "src",
+		"paths": {
+			"@/*": ["./*"]
+		},
+		"tsBuildInfoFile": "dist/typecheck.tsbuildinfo"
+	},
+	"include": ["src/**/*.ts", "test/**/*.ts"]
+}
diff --git a/packages/@n8n/imap/.eslintrc.js b/packages/@n8n/imap/.eslintrc.js
new file mode 100644
index 0000000000000..c3fe283453eb5
--- /dev/null
+++ b/packages/@n8n/imap/.eslintrc.js
@@ -0,0 +1,15 @@
+const sharedOptions = require('@n8n_io/eslint-config/shared');
+
+/**
+ * @type {import('@types/eslint').ESLint.ConfigData}
+ */
+module.exports = {
+	extends: ['@n8n_io/eslint-config/base'],
+
+	...sharedOptions(__dirname),
+
+	rules: {
+		'@typescript-eslint/consistent-type-imports': 'error',
+		'n8n-local-rules/no-plain-errors': 'off',
+	},
+};
diff --git a/packages/@n8n/imap/jest.config.js b/packages/@n8n/imap/jest.config.js
new file mode 100644
index 0000000000000..d6c48554a79a4
--- /dev/null
+++ b/packages/@n8n/imap/jest.config.js
@@ -0,0 +1,2 @@
+/** @type {import('jest').Config} */
+module.exports = require('../../../jest.config');
diff --git a/packages/@n8n/imap/package.json b/packages/@n8n/imap/package.json
new file mode 100644
index 0000000000000..3773c5f3a1f90
--- /dev/null
+++ b/packages/@n8n/imap/package.json
@@ -0,0 +1,34 @@
+{
+  "name": "@n8n/imap",
+  "version": "0.2.0",
+  "scripts": {
+    "clean": "rimraf dist .turbo",
+    "dev": "pnpm watch",
+    "typecheck": "tsc",
+    "build": "tsc -p tsconfig.build.json",
+    "format": "prettier --write . --ignore-path ../../../.prettierignore",
+    "lint": "eslint . --quiet",
+    "lintfix": "eslint . --fix",
+    "watch": "tsc -p tsconfig.build.json --watch",
+    "test": "echo \"Error: no test created yet\""
+  },
+  "main": "dist/index.js",
+  "module": "src/index.ts",
+  "types": "dist/index.d.ts",
+  "files": [
+    "dist/**/*"
+  ],
+  "dependencies": {
+    "iconv-lite": "0.6.3",
+    "imap": "0.8.19",
+    "quoted-printable": "1.0.1",
+    "utf8": "3.0.0",
+    "uuencode": "0.0.4"
+  },
+  "devDependencies": {
+    "@types/imap": "^0.8.40",
+    "@types/quoted-printable": "^1.0.2",
+    "@types/utf8": "^3.0.3",
+    "@types/uuencode": "^0.0.3"
+  }
+}
diff --git a/packages/@n8n/imap/src/ImapSimple.ts b/packages/@n8n/imap/src/ImapSimple.ts
new file mode 100644
index 0000000000000..c495e8d1f42c4
--- /dev/null
+++ b/packages/@n8n/imap/src/ImapSimple.ts
@@ -0,0 +1,235 @@
+/* eslint-disable @typescript-eslint/no-use-before-define */
+import { EventEmitter } from 'events';
+import type Imap from 'imap';
+import { type ImapMessage } from 'imap';
+import * as qp from 'quoted-printable';
+import * as iconvlite from 'iconv-lite';
+import * as utf8 from 'utf8';
+import * as uuencode from 'uuencode';
+
+import { getMessage } from './helpers/getMessage';
+import type { Message, MessagePart } from './types';
+
+const IMAP_EVENTS = ['alert', 'mail', 'expunge', 'uidvalidity', 'update', 'close', 'end'] as const;
+
+export class ImapSimple extends EventEmitter {
+	/** flag to determine whether we should suppress ECONNRESET from bubbling up to listener */
+	private ending = false;
+
+	constructor(private readonly imap: Imap) {
+		super();
+
+		// pass most node-imap `Connection` events through 1:1
+		IMAP_EVENTS.forEach((event) => {
+			this.imap.on(event, this.emit.bind(this, event));
+		});
+
+		// special handling for `error` event
+		this.imap.on('error', (e: Error & { code?: string }) => {
+			// if .end() has been called and an 'ECONNRESET' error is received, don't bubble
+			if (e && this.ending && e.code?.toUpperCase() === 'ECONNRESET') {
+				return;
+			}
+			this.emit('error', e);
+		});
+	}
+
+	/** disconnect from the imap server */
+	end(): void {
+		// set state flag to suppress 'ECONNRESET' errors that are triggered when .end() is called.
+		// it is a known issue that has no known fix. This just temporarily ignores that error.
+		// https://github.com/mscdex/node-imap/issues/391
+		// https://github.com/mscdex/node-imap/issues/395
+		this.ending = true;
+
+		// using 'close' event to unbind ECONNRESET error handler, because the node-imap
+		// maintainer claims it is the more reliable event between 'end' and 'close'.
+		// https://github.com/mscdex/node-imap/issues/394
+		this.imap.once('close', () => {
+			this.ending = false;
+		});
+
+		this.imap.end();
+	}
+
+	/**
+	 * Search the currently open mailbox, and retrieve the results
+	 *
+	 * Results are in the form:
+	 *
+	 * [{
+	 *   attributes: object,
+	 *   parts: [ { which: string, size: number, body: string }, ... ]
+	 * }, ...]
+	 *
+	 * See node-imap's ImapMessage signature for information about `attributes`, `which`, `size`, and `body`.
+	 * For any message part that is a `HEADER`, the body is automatically parsed into an object.
+	 */
+	async search(
+		/** Criteria to use to search. Passed to node-imap's .search() 1:1 */
+		// eslint-disable-next-line @typescript-eslint/no-explicit-any
+		searchCriteria: any[],
+		/** Criteria to use to fetch the search results. Passed to node-imap's .fetch() 1:1 */
+		fetchOptions: Imap.FetchOptions,
+	) {
+		return await new Promise<Message[]>((resolve, reject) => {
+			this.imap.search(searchCriteria, (e, uids) => {
+				if (e) {
+					reject(e);
+					return;
+				}
+
+				if (uids.length === 0) {
+					resolve([]);
+					return;
+				}
+
+				const fetch = this.imap.fetch(uids, fetchOptions);
+				let messagesRetrieved = 0;
+				const messages: Message[] = [];
+
+				const fetchOnMessage = async (message: Imap.ImapMessage, seqNo: number) => {
+					const msg: Message = await getMessage(message);
+					msg.seqNo = seqNo;
+					messages[seqNo] = msg;
+
+					messagesRetrieved++;
+					if (messagesRetrieved === uids.length) {
+						resolve(messages.filter((m) => !!m));
+					}
+				};
+
+				const fetchOnError = (error: Error) => {
+					fetch.removeListener('message', fetchOnMessage);
+					fetch.removeListener('end', fetchOnEnd);
+					reject(error);
+				};
+
+				const fetchOnEnd = () => {
+					fetch.removeListener('message', fetchOnMessage);
+					fetch.removeListener('error', fetchOnError);
+				};
+
+				fetch.on('message', fetchOnMessage);
+				fetch.once('error', fetchOnError);
+				fetch.once('end', fetchOnEnd);
+			});
+		});
+	}
+
+	/** Download a "part" (either a portion of the message body, or an attachment) */
+	async getPartData(
+		/** The message returned from `search()` */
+		message: Message,
+		/** The message part to be downloaded, from the `message.attributes.struct` Array */
+		part: MessagePart,
+	) {
+		return await new Promise<string>((resolve, reject) => {
+			const fetch = this.imap.fetch(message.attributes.uid, {
+				bodies: [part.partID],
+				struct: true,
+			});
+
+			const fetchOnMessage = async (msg: ImapMessage) => {
+				const result = await getMessage(msg);
+				if (result.parts.length !== 1) {
+					reject(new Error('Got ' + result.parts.length + ' parts, should get 1'));
+					return;
+				}
+
+				const data = result.parts[0].body as string;
+
+				const encoding = part.encoding.toUpperCase();
+
+				if (encoding === 'BASE64') {
+					resolve(Buffer.from(data, 'base64').toString());
+					return;
+				}
+
+				if (encoding === 'QUOTED-PRINTABLE') {
+					if (part.params?.charset?.toUpperCase() === 'UTF-8') {
+						resolve(Buffer.from(utf8.decode(qp.decode(data))).toString());
+					} else {
+						resolve(Buffer.from(qp.decode(data)).toString());
+					}
+					return;
+				}
+
+				if (encoding === '7BIT') {
+					resolve(Buffer.from(data).toString('ascii'));
+					return;
+				}
+
+				if (encoding === '8BIT' || encoding === 'BINARY') {
+					const charset = part.params?.charset ?? 'utf-8';
+					resolve(iconvlite.decode(Buffer.from(data), charset));
+					return;
+				}
+
+				if (encoding === 'UUENCODE') {
+					const parts = data.toString().split('\n'); // remove newline characters
+					const merged = parts.splice(1, parts.length - 4).join(''); // remove excess lines and join lines with empty string
+					resolve(uuencode.decode(merged));
+					return;
+				}
+
+				// if it gets here, the encoding is not currently supported
+				reject(new Error('Unknown encoding ' + part.encoding));
+			};
+
+			const fetchOnError = (error: Error) => {
+				fetch.removeListener('message', fetchOnMessage);
+				fetch.removeListener('end', fetchOnEnd);
+				reject(error);
+			};
+
+			const fetchOnEnd = () => {
+				fetch.removeListener('message', fetchOnMessage);
+				fetch.removeListener('error', fetchOnError);
+			};
+
+			fetch.once('message', fetchOnMessage);
+			fetch.once('error', fetchOnError);
+			fetch.once('end', fetchOnEnd);
+		});
+	}
+
+	/** Adds the provided flag(s) to the specified message(s). */
+	async addFlags(
+		/** The messages uid */
+		uid: number[],
+		/** The flags to add to the message(s). */
+		flags: string | string[],
+	) {
+		return await new Promise<void>((resolve, reject) => {
+			this.imap.addFlags(uid, flags, (e) => (e ? reject(e) : resolve()));
+		});
+	}
+
+	/** Returns a list of mailboxes (folders). */
+	async getBoxes() {
+		return await new Promise<Imap.MailBoxes>((resolve, reject) => {
+			this.imap.getBoxes((e, boxes) => (e ? reject(e) : resolve(boxes)));
+		});
+	}
+
+	/** Open a mailbox */
+	async openBox(
+		/** The name of the box to open */
+		boxName: string,
+	): Promise<Imap.Box> {
+		return await new Promise((resolve, reject) => {
+			this.imap.openBox(boxName, (e, result) => (e ? reject(e) : resolve(result)));
+		});
+	}
+
+	/** Close a mailbox */
+	async closeBox(
+		/** If autoExpunge is true, any messages marked as Deleted in the currently open mailbox will be removed @default true */
+		autoExpunge = true,
+	) {
+		return await new Promise<void>((resolve, reject) => {
+			this.imap.closeBox(autoExpunge, (e) => (e ? reject(e) : resolve()));
+		});
+	}
+}
diff --git a/packages/@n8n/imap/src/errors.ts b/packages/@n8n/imap/src/errors.ts
new file mode 100644
index 0000000000000..ec36a0b1a0149
--- /dev/null
+++ b/packages/@n8n/imap/src/errors.ts
@@ -0,0 +1,27 @@
+export abstract class ImapError extends Error {}
+
+/** Error thrown when a connection attempt has timed out */
+export class ConnectionTimeoutError extends ImapError {
+	constructor(
+		/** timeout in milliseconds that the connection waited before timing out */
+		readonly timeout?: number,
+	) {
+		let message = 'connection timed out';
+		if (timeout) {
+			message += `. timeout = ${timeout} ms`;
+		}
+		super(message);
+	}
+}
+
+export class ConnectionClosedError extends ImapError {
+	constructor() {
+		super('Connection closed unexpectedly');
+	}
+}
+
+export class ConnectionEndedError extends ImapError {
+	constructor() {
+		super('Connection ended unexpectedly');
+	}
+}
diff --git a/packages/@n8n/imap/src/helpers/getMessage.ts b/packages/@n8n/imap/src/helpers/getMessage.ts
new file mode 100644
index 0000000000000..09b51186671db
--- /dev/null
+++ b/packages/@n8n/imap/src/helpers/getMessage.ts
@@ -0,0 +1,53 @@
+import {
+	parseHeader,
+	type ImapMessage,
+	type ImapMessageBodyInfo,
+	type ImapMessageAttributes,
+} from 'imap';
+import type { Message, MessageBodyPart } from '../types';
+
+/**
+ * Given an 'ImapMessage' from the node-imap library, retrieves the `Message`
+ */
+export async function getMessage(
+	/** an ImapMessage from the node-imap library */
+	message: ImapMessage,
+): Promise<Message> {
+	return await new Promise((resolve) => {
+		let attributes: ImapMessageAttributes;
+		const parts: MessageBodyPart[] = [];
+
+		const messageOnBody = (stream: NodeJS.ReadableStream, info: ImapMessageBodyInfo) => {
+			let body: string = '';
+
+			const streamOnData = (chunk: Buffer) => {
+				body += chunk.toString('utf8');
+			};
+
+			stream.on('data', streamOnData);
+			stream.once('end', () => {
+				stream.removeListener('data', streamOnData);
+
+				parts.push({
+					which: info.which,
+					size: info.size,
+					body: /^HEADER/g.test(info.which) ? parseHeader(body) : body,
+				});
+			});
+		};
+
+		const messageOnAttributes = (attrs: ImapMessageAttributes) => {
+			attributes = attrs;
+		};
+
+		const messageOnEnd = () => {
+			message.removeListener('body', messageOnBody);
+			message.removeListener('attributes', messageOnAttributes);
+			resolve({ attributes, parts });
+		};
+
+		message.on('body', messageOnBody);
+		message.once('attributes', messageOnAttributes);
+		message.once('end', messageOnEnd);
+	});
+}
diff --git a/packages/@n8n/imap/src/index.ts b/packages/@n8n/imap/src/index.ts
new file mode 100644
index 0000000000000..f82cfca037b14
--- /dev/null
+++ b/packages/@n8n/imap/src/index.ts
@@ -0,0 +1,99 @@
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/no-use-before-define */
+import Imap from 'imap';
+import { ImapSimple } from './ImapSimple';
+import { ConnectionClosedError, ConnectionEndedError, ConnectionTimeoutError } from './errors';
+import type { ImapSimpleOptions, MessagePart } from './types';
+
+/**
+ * Connect to an Imap server, returning an ImapSimple instance, which is a wrapper over node-imap to simplify it's api for common use cases.
+ */
+export async function connect(options: ImapSimpleOptions): Promise<ImapSimple> {
+	const authTimeout = options.imap.authTimeout ?? 2000;
+	options.imap.authTimeout = authTimeout;
+
+	const imap = new Imap(options.imap);
+
+	return await new Promise<ImapSimple>((resolve, reject) => {
+		const cleanUp = () => {
+			imap.removeListener('ready', imapOnReady);
+			imap.removeListener('error', imapOnError);
+			imap.removeListener('close', imapOnClose);
+			imap.removeListener('end', imapOnEnd);
+		};
+
+		const imapOnReady = () => {
+			cleanUp();
+			resolve(new ImapSimple(imap));
+		};
+
+		const imapOnError = (e: Error & { source?: string }) => {
+			if (e.source === 'timeout-auth') {
+				e = new ConnectionTimeoutError(authTimeout);
+			}
+
+			cleanUp();
+			reject(e);
+		};
+
+		const imapOnEnd = () => {
+			cleanUp();
+			reject(new ConnectionEndedError());
+		};
+
+		const imapOnClose = () => {
+			cleanUp();
+			reject(new ConnectionClosedError());
+		};
+
+		imap.once('ready', imapOnReady);
+		imap.once('error', imapOnError);
+		imap.once('close', imapOnClose);
+		imap.once('end', imapOnEnd);
+
+		if (options.onMail) {
+			imap.on('mail', options.onMail);
+		}
+
+		if (options.onExpunge) {
+			imap.on('expunge', options.onExpunge);
+		}
+
+		if (options.onUpdate) {
+			imap.on('update', options.onUpdate);
+		}
+
+		imap.connect();
+	});
+}
+
+/**
+ * Given the `message.attributes.struct`, retrieve a flattened array of `parts` objects that describe the structure of
+ * the different parts of the message's body. Useful for getting a simple list to iterate for the purposes of,
+ * for example, finding all attachments.
+ *
+ * Code taken from http://stackoverflow.com/questions/25247207/how-to-read-and-save-attachments-using-node-imap
+ *
+ * @returns {Array} a flattened array of `parts` objects that describe the structure of the different parts of the
+ *  message's body
+ */
+export function getParts(
+	/** The `message.attributes.struct` value from the message you wish to retrieve parts for. */
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	struct: any,
+	/** The list of parts to push to. */
+	parts: MessagePart[] = [],
+): MessagePart[] {
+	for (let i = 0; i < struct.length; i++) {
+		if (Array.isArray(struct[i])) {
+			getParts(struct[i], parts);
+		} else if (struct[i].partID) {
+			parts.push(struct[i] as MessagePart);
+		}
+	}
+	return parts;
+}
+
+export * from './ImapSimple';
+export * from './errors';
+export * from './types';
diff --git a/packages/@n8n/imap/src/types.ts b/packages/@n8n/imap/src/types.ts
new file mode 100644
index 0000000000000..6fa533dd9d963
--- /dev/null
+++ b/packages/@n8n/imap/src/types.ts
@@ -0,0 +1,41 @@
+import type { Config, ImapMessageBodyInfo, ImapMessageAttributes } from 'imap';
+
+export interface ImapSimpleOptions {
+	/** Options to pass to node-imap constructor. */
+	imap: Config;
+
+	/** Server event emitted when new mail arrives in the currently open mailbox. */
+	onMail?: ((numNewMail: number) => void) | undefined;
+
+	/** Server event emitted when a message was expunged externally. seqNo is the sequence number (instead of the unique UID) of the message that was expunged. If you are caching sequence numbers, all sequence numbers higher than this value MUST be decremented by 1 in order to stay synchronized with the server and to keep correct continuity. */
+	onExpunge?: ((seqNo: number) => void) | undefined;
+
+	/** Server event emitted when message metadata (e.g. flags) changes externally. */
+	onUpdate?:
+		| ((seqNo: number, info: { num: number | undefined; text: unknown }) => void)
+		| undefined;
+}
+
+export interface MessagePart {
+	partID: string;
+	encoding: 'BASE64' | 'QUOTED-PRINTABLE' | '7BIT' | '8BIT' | 'BINARY' | 'UUENCODE';
+	type: 'TEXT';
+	subtype: string;
+	params?: {
+		charset?: string;
+	};
+	disposition?: {
+		type: string;
+	};
+}
+
+export interface MessageBodyPart extends ImapMessageBodyInfo {
+	/** string type where which=='TEXT', complex Object where which=='HEADER' */
+	body: string | object;
+}
+
+export interface Message {
+	attributes: ImapMessageAttributes;
+	parts: MessageBodyPart[];
+	seqNo?: number;
+}
diff --git a/packages/@n8n/imap/tsconfig.build.json b/packages/@n8n/imap/tsconfig.build.json
new file mode 100644
index 0000000000000..30910a3bf1ebb
--- /dev/null
+++ b/packages/@n8n/imap/tsconfig.build.json
@@ -0,0 +1,10 @@
+{
+	"extends": ["./tsconfig.json", "../../../tsconfig.build.json"],
+	"compilerOptions": {
+		"rootDir": "src",
+		"outDir": "dist",
+		"tsBuildInfoFile": "dist/build.tsbuildinfo"
+	},
+	"include": ["src/**/*.ts"],
+	"exclude": ["test/**"]
+}
diff --git a/packages/@n8n/imap/tsconfig.json b/packages/@n8n/imap/tsconfig.json
new file mode 100644
index 0000000000000..ca1ca3154c587
--- /dev/null
+++ b/packages/@n8n/imap/tsconfig.json
@@ -0,0 +1,12 @@
+{
+	"extends": "../../../tsconfig.json",
+	"compilerOptions": {
+		"rootDir": ".",
+		"types": ["node", "jest"],
+		"composite": true,
+		"noEmit": true,
+		"baseUrl": "src",
+		"tsBuildInfoFile": "dist/typecheck.tsbuildinfo"
+	},
+	"include": ["src/**/*.ts", "test/**/*.ts"]
+}
diff --git a/packages/@n8n/nodes-langchain/.editorconfig b/packages/@n8n/nodes-langchain/.editorconfig
new file mode 100644
index 0000000000000..cff7816e85b4d
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/.editorconfig
@@ -0,0 +1,20 @@
+root = true
+
+[*]
+charset = utf-8
+indent_style = tab
+indent_size = 2
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[package.json]
+indent_style = space
+indent_size = 2
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.yml]
+indent_style = space
+indent_size = 2
diff --git a/packages/@n8n/nodes-langchain/.eslintrc.js b/packages/@n8n/nodes-langchain/.eslintrc.js
new file mode 100644
index 0000000000000..93091bad23836
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/.eslintrc.js
@@ -0,0 +1,153 @@
+const sharedOptions = require('@n8n_io/eslint-config/shared');
+
+/**
+ * @type {import('@types/eslint').ESLint.ConfigData}
+ */
+module.exports = {
+	extends: ['@n8n_io/eslint-config/node'],
+
+	...sharedOptions(__dirname),
+
+	ignorePatterns: ['index.js', '**/package.json'],
+
+	rules: {
+		// TODO: remove all the following rules
+		eqeqeq: 'warn',
+		'id-denylist': 'warn',
+		'import/extensions': 'warn',
+		'import/order': 'warn',
+		'prefer-spread': 'warn',
+
+		'@typescript-eslint/naming-convention': ['error', { selector: 'memberLike', format: null }],
+		'@typescript-eslint/no-explicit-any': 'warn', //812 warnings, better to fix in separate PR
+		'@typescript-eslint/no-non-null-assertion': 'warn', //665 errors, better to fix in separate PR
+		'@typescript-eslint/no-unsafe-assignment': 'warn', //7084 problems, better to fix in separate PR
+		'@typescript-eslint/no-unsafe-call': 'warn', //541 errors, better to fix in separate PR
+		'@typescript-eslint/no-unsafe-member-access': 'warn', //4591 errors, better to fix in separate PR
+		'@typescript-eslint/no-unsafe-return': 'warn', //438 errors, better to fix in separate PR
+		'@typescript-eslint/no-unused-expressions': ['error', { allowTernary: true }],
+		'@typescript-eslint/restrict-template-expressions': 'warn', //1152 errors, better to fix in separate PR
+		'@typescript-eslint/unbound-method': 'warn',
+		'@typescript-eslint/ban-ts-comment': ['warn', { 'ts-ignore': true }],
+		'@typescript-eslint/prefer-nullish-coalescing': 'warn',
+		'@typescript-eslint/no-base-to-string': 'warn',
+		'@typescript-eslint/no-redundant-type-constituents': 'warn',
+		'@typescript-eslint/no-unsafe-argument': 'warn',
+		'@typescript-eslint/prefer-optional-chain': 'warn',
+		'@typescript-eslint/restrict-plus-operands': 'warn',
+	},
+
+	overrides: [
+		{
+			files: ['./credentials/*.ts'],
+			plugins: ['eslint-plugin-n8n-nodes-base'],
+			rules: {
+				'n8n-nodes-base/cred-class-field-authenticate-type-assertion': 'error',
+				'n8n-nodes-base/cred-class-field-display-name-missing-oauth2': 'error',
+				'n8n-nodes-base/cred-class-field-display-name-miscased': 'error',
+				'n8n-nodes-base/cred-class-field-documentation-url-missing': 'error',
+				'n8n-nodes-base/cred-class-field-name-missing-oauth2': 'error',
+				'n8n-nodes-base/cred-class-field-name-unsuffixed': 'error',
+				'n8n-nodes-base/cred-class-field-name-uppercase-first-char': 'error',
+				'n8n-nodes-base/cred-class-field-properties-assertion': 'error',
+				'n8n-nodes-base/cred-class-field-type-options-password-missing': 'error',
+				'n8n-nodes-base/cred-class-name-missing-oauth2-suffix': 'error',
+				'n8n-nodes-base/cred-class-name-unsuffixed': 'error',
+				'n8n-nodes-base/cred-filename-against-convention': 'error',
+			},
+		},
+		{
+			files: ['./nodes/**/*.ts'],
+			plugins: ['eslint-plugin-n8n-nodes-base'],
+			rules: {
+				'n8n-nodes-base/node-class-description-credentials-name-unsuffixed': 'error',
+				'n8n-nodes-base/node-class-description-display-name-unsuffixed-trigger-node': 'error',
+				'n8n-nodes-base/node-class-description-empty-string': 'error',
+				'n8n-nodes-base/node-class-description-icon-not-svg': 'error',
+				'n8n-nodes-base/node-class-description-inputs-wrong-regular-node': 'off',
+				'n8n-nodes-base/node-class-description-outputs-wrong': 'off',
+				'n8n-nodes-base/node-class-description-inputs-wrong-trigger-node': 'error',
+				'n8n-nodes-base/node-class-description-missing-subtitle': 'error',
+				'n8n-nodes-base/node-class-description-non-core-color-present': 'error',
+				'n8n-nodes-base/node-class-description-name-miscased': 'error',
+				'n8n-nodes-base/node-class-description-name-unsuffixed-trigger-node': 'error',
+				'n8n-nodes-base/node-dirname-against-convention': 'error',
+				'n8n-nodes-base/node-execute-block-double-assertion-for-items': 'error',
+				'n8n-nodes-base/node-execute-block-wrong-error-thrown': 'error',
+				'n8n-nodes-base/node-filename-against-convention': 'error',
+				'n8n-nodes-base/node-param-array-type-assertion': 'error',
+				'n8n-nodes-base/node-param-collection-type-unsorted-items': 'error',
+				'n8n-nodes-base/node-param-color-type-unused': 'error',
+				'n8n-nodes-base/node-param-default-missing': 'error',
+				'n8n-nodes-base/node-param-default-wrong-for-boolean': 'error',
+				'n8n-nodes-base/node-param-default-wrong-for-collection': 'error',
+				'n8n-nodes-base/node-param-default-wrong-for-fixed-collection': 'error',
+				'n8n-nodes-base/node-param-default-wrong-for-fixed-collection': 'error',
+				'n8n-nodes-base/node-param-default-wrong-for-multi-options': 'error',
+				'n8n-nodes-base/node-param-default-wrong-for-number': 'error',
+				'n8n-nodes-base/node-param-default-wrong-for-simplify': 'error',
+				'n8n-nodes-base/node-param-default-wrong-for-string': 'error',
+				'n8n-nodes-base/node-param-description-boolean-without-whether': 'error',
+				'n8n-nodes-base/node-param-description-comma-separated-hyphen': 'error',
+				'n8n-nodes-base/node-param-description-empty-string': 'error',
+				'n8n-nodes-base/node-param-description-excess-final-period': 'error',
+				'n8n-nodes-base/node-param-description-excess-inner-whitespace': 'error',
+				'n8n-nodes-base/node-param-description-identical-to-display-name': 'error',
+				'n8n-nodes-base/node-param-description-line-break-html-tag': 'error',
+				'n8n-nodes-base/node-param-description-lowercase-first-char': 'error',
+				'n8n-nodes-base/node-param-description-miscased-id': 'error',
+				'n8n-nodes-base/node-param-description-miscased-json': 'error',
+				'n8n-nodes-base/node-param-description-miscased-url': 'error',
+				'n8n-nodes-base/node-param-description-missing-final-period': 'error',
+				'n8n-nodes-base/node-param-description-missing-for-ignore-ssl-issues': 'error',
+				'n8n-nodes-base/node-param-description-missing-for-return-all': 'error',
+				'n8n-nodes-base/node-param-description-missing-for-simplify': 'error',
+				'n8n-nodes-base/node-param-description-missing-from-dynamic-multi-options': 'error',
+				'n8n-nodes-base/node-param-description-missing-from-dynamic-options': 'error',
+				'n8n-nodes-base/node-param-description-missing-from-limit': 'error',
+				'n8n-nodes-base/node-param-description-unencoded-angle-brackets': 'error',
+				'n8n-nodes-base/node-param-description-unneeded-backticks': 'error',
+				'n8n-nodes-base/node-param-description-untrimmed': 'error',
+				'n8n-nodes-base/node-param-description-url-missing-protocol': 'error',
+				'n8n-nodes-base/node-param-description-weak': 'error',
+				'n8n-nodes-base/node-param-description-wrong-for-dynamic-multi-options': 'error',
+				'n8n-nodes-base/node-param-description-wrong-for-dynamic-options': 'error',
+				'n8n-nodes-base/node-param-description-wrong-for-ignore-ssl-issues': 'error',
+				'n8n-nodes-base/node-param-description-wrong-for-limit': 'error',
+				'n8n-nodes-base/node-param-description-wrong-for-return-all': 'error',
+				'n8n-nodes-base/node-param-description-wrong-for-simplify': 'error',
+				'n8n-nodes-base/node-param-description-wrong-for-upsert': 'error',
+				'n8n-nodes-base/node-param-display-name-excess-inner-whitespace': 'error',
+				'n8n-nodes-base/node-param-display-name-miscased-id': 'error',
+				'n8n-nodes-base/node-param-display-name-miscased': 'error',
+				'n8n-nodes-base/node-param-display-name-not-first-position': 'error',
+				'n8n-nodes-base/node-param-display-name-untrimmed': 'error',
+				'n8n-nodes-base/node-param-display-name-wrong-for-dynamic-multi-options': 'error',
+				'n8n-nodes-base/node-param-display-name-wrong-for-dynamic-options': 'error',
+				'n8n-nodes-base/node-param-display-name-wrong-for-simplify': 'error',
+				'n8n-nodes-base/node-param-display-name-wrong-for-update-fields': 'error',
+				'n8n-nodes-base/node-param-min-value-wrong-for-limit': 'error',
+				'n8n-nodes-base/node-param-multi-options-type-unsorted-items': 'error',
+				'n8n-nodes-base/node-param-name-untrimmed': 'error',
+				'n8n-nodes-base/node-param-operation-option-action-wrong-for-get-many': 'error',
+				'n8n-nodes-base/node-param-operation-option-description-wrong-for-get-many': 'error',
+				'n8n-nodes-base/node-param-operation-option-without-action': 'error',
+				'n8n-nodes-base/node-param-operation-without-no-data-expression': 'error',
+				'n8n-nodes-base/node-param-option-description-identical-to-name': 'error',
+				'n8n-nodes-base/node-param-option-name-containing-star': 'error',
+				'n8n-nodes-base/node-param-option-name-duplicate': 'error',
+				'n8n-nodes-base/node-param-option-name-wrong-for-get-many': 'error',
+				'n8n-nodes-base/node-param-option-name-wrong-for-upsert': 'error',
+				'n8n-nodes-base/node-param-option-value-duplicate': 'error',
+				'n8n-nodes-base/node-param-options-type-unsorted-items': 'error',
+				'n8n-nodes-base/node-param-placeholder-miscased-id': 'error',
+				'n8n-nodes-base/node-param-placeholder-missing-email': 'error',
+				'n8n-nodes-base/node-param-required-false': 'error',
+				'n8n-nodes-base/node-param-resource-with-plural-option': 'error',
+				'n8n-nodes-base/node-param-resource-without-no-data-expression': 'error',
+				'n8n-nodes-base/node-param-type-options-missing-from-limit': 'error',
+				'n8n-nodes-base/node-param-type-options-password-missing': 'error',
+			},
+		},
+	],
+};
diff --git a/packages/@n8n/nodes-langchain/.gitignore b/packages/@n8n/nodes-langchain/.gitignore
new file mode 100644
index 0000000000000..7e729633290f4
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/.gitignore
@@ -0,0 +1,8 @@
+node_modules
+.DS_Store
+.tmp
+tmp
+dist
+npm-debug.log*
+yarn.lock
+.vscode/launch.json
diff --git a/packages/@n8n/nodes-langchain/.npmignore b/packages/@n8n/nodes-langchain/.npmignore
new file mode 100644
index 0000000000000..a7ac611a60a9a
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/.npmignore
@@ -0,0 +1,2 @@
+.DS_Store
+*.tsbuildinfo
diff --git a/packages/@n8n/nodes-langchain/.prettierrc.js b/packages/@n8n/nodes-langchain/.prettierrc.js
new file mode 100644
index 0000000000000..ebf28d8091492
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/.prettierrc.js
@@ -0,0 +1,51 @@
+module.exports = {
+	/**
+	 * https://prettier.io/docs/en/options.html#semicolons
+	 */
+	semi: true,
+
+	/**
+	 * https://prettier.io/docs/en/options.html#trailing-commas
+	 */
+	trailingComma: 'all',
+
+	/**
+	 * https://prettier.io/docs/en/options.html#bracket-spacing
+	 */
+	bracketSpacing: true,
+
+	/**
+	 * https://prettier.io/docs/en/options.html#tabs
+	 */
+	useTabs: true,
+
+	/**
+	 * https://prettier.io/docs/en/options.html#tab-width
+	 */
+	tabWidth: 2,
+
+	/**
+	 * https://prettier.io/docs/en/options.html#arrow-function-parentheses
+	 */
+	arrowParens: 'always',
+
+	/**
+	 * https://prettier.io/docs/en/options.html#quotes
+	 */
+	singleQuote: true,
+
+	/**
+	 * https://prettier.io/docs/en/options.html#quote-props
+	 */
+	quoteProps: 'as-needed',
+
+	/**
+	 * https://prettier.io/docs/en/options.html#end-of-line
+	 */
+	endOfLine: 'lf',
+
+	/**
+	 * https://prettier.io/docs/en/options.html#print-width
+	 */
+	printWidth: 100,
+};
diff --git a/packages/@n8n/nodes-langchain/.vscode/extensions.json b/packages/@n8n/nodes-langchain/.vscode/extensions.json
new file mode 100644
index 0000000000000..306a6af39a1b7
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/.vscode/extensions.json
@@ -0,0 +1,7 @@
+{
+	"recommendations": [
+		"dbaeumer.vscode-eslint",
+		"EditorConfig.EditorConfig",
+		"esbenp.prettier-vscode",
+	]
+}
diff --git a/packages/@n8n/nodes-langchain/LICENSE.md b/packages/@n8n/nodes-langchain/LICENSE.md
new file mode 100644
index 0000000000000..aab68b6d9301b
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/LICENSE.md
@@ -0,0 +1,86 @@
+# License
+
+Portions of this software are licensed as follows:
+
+- Content of branches other than the main branch (i.e. "master") are not licensed.
+- Source code files that contain ".ee." in their filename are NOT licensed under the Sustainable Use License.
+  To use source code files that contain ".ee." in their filename you must hold a valid n8n Enterprise License
+  specifically allowing you access to such source code files and as defined in "LICENSE_EE.md".
+- All third party components incorporated into the n8n Software are licensed under the original license
+  provided by the owner of the applicable component.
+- Content outside of the above mentioned files or restrictions is available under the "Sustainable Use
+  License" as defined below.
+
+## Sustainable Use License
+
+Version 1.0
+
+### Acceptance
+
+By using the software, you agree to all of the terms and conditions below.
+
+### Copyright License
+
+The licensor grants you a non-exclusive, royalty-free, worldwide, non-sublicensable, non-transferable license
+to use, copy, distribute, make available, and prepare derivative works of the software, in each case subject
+to the limitations below.
+
+### Limitations
+
+You may use or modify the software only for your own internal business purposes or for non-commercial or
+personal use. You may distribute the software or provide it to others only if you do so free of charge for
+non-commercial purposes. You may not alter, remove, or obscure any licensing, copyright, or other notices of
+the licensor in the software. Any use of the licensor’s trademarks is subject to applicable law.
+
+### Patents
+
+The licensor grants you a license, under any patent claims the licensor can license, or becomes able to
+license, to make, have made, use, sell, offer for sale, import and have imported the software, in each case
+subject to the limitations and conditions in this license. This license does not cover any patent claims that
+you cause to be infringed by modifications or additions to the software. If you or your company make any
+written claim that the software infringes or contributes to infringement of any patent, your patent license
+for the software granted under these terms ends immediately. If your company makes such a claim, your patent
+license ends immediately for work on behalf of your company.
+
+### Notices
+
+You must ensure that anyone who gets a copy of any part of the software from you also gets a copy of these
+terms. If you modify the software, you must include in any modified copies of the software a prominent notice
+stating that you have modified the software.
+
+### No Other Rights
+
+These terms do not imply any licenses other than those expressly granted in these terms.
+
+### Termination
+
+If you use the software in violation of these terms, such use is not licensed, and your license will
+automatically terminate. If the licensor provides you with a notice of your violation, and you cease all
+violation of this license no later than 30 days after you receive that notice, your license will be reinstated
+retroactively. However, if you violate these terms after such reinstatement, any additional violation of these
+terms will cause your license to terminate automatically and permanently.
+
+### No Liability
+
+As far as the law allows, the software comes as is, without any warranty or condition, and the licensor will
+not be liable to you for any damages arising out of these terms or the use or nature of the software, under
+any kind of legal claim.
+
+### Definitions
+
+The “licensor” is the entity offering these terms.
+
+The “software” is the software the licensor makes available under these terms, including any portion of it.
+
+“You” refers to the individual or entity agreeing to these terms.
+
+“Your company” is any legal entity, sole proprietorship, or other kind of organization that you work for, plus
+all organizations that have control over, are under the control of, or are under common control with that
+organization. Control means ownership of substantially all the assets of an entity, or the power to direct its
+management and policies by vote, contract, or otherwise. Control can be direct or indirect.
+
+“Your license” is the license granted to you for the software under these terms.
+
+“Use” means anything you do with the software requiring your license.
+
+“Trademark” means trademarks, service marks, and similar rights.
diff --git a/packages/@n8n/nodes-langchain/README.md b/packages/@n8n/nodes-langchain/README.md
new file mode 100644
index 0000000000000..e5761628cf67b
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/README.md
@@ -0,0 +1,13 @@
+![Banner image](https://user-images.githubusercontent.com/10284570/173569848-c624317f-42b1-45a6-ab09-f0ea3c247648.png)
+
+# n8n-nodes-langchain
+
+This repo contains nodes to use n8n in combination with [LangChain](https://langchain.com/).
+
+These nodes are still in Beta state and are only compatible with the Docker image `docker.n8n.io/n8nio/n8n:ai-beta`.
+
+## License
+
+n8n is [fair-code](https://faircode.io) distributed under the [**Sustainable Use License**](https://github.com/n8n-io/n8n/blob/master/packages/cli/LICENSE.md).
+
+Additional information about the license can be found in the [docs](https://docs.n8n.io/reference/license/).
diff --git a/packages/@n8n/nodes-langchain/credentials/AnthropicApi.credentials.ts b/packages/@n8n/nodes-langchain/credentials/AnthropicApi.credentials.ts
new file mode 100644
index 0000000000000..2ee2aa94dc3ce
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/credentials/AnthropicApi.credentials.ts
@@ -0,0 +1,50 @@
+import type {
+	IAuthenticateGeneric,
+	ICredentialTestRequest,
+	ICredentialType,
+	INodeProperties,
+} from 'n8n-workflow';
+
+export class AnthropicApi implements ICredentialType {
+	name = 'anthropicApi';
+
+	displayName = 'Anthropic';
+
+	documentationUrl = 'anthropic';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'API Key',
+			name: 'apiKey',
+			type: 'string',
+			typeOptions: { password: true },
+			required: true,
+			default: '',
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				'x-api-key': '={{$credentials.apiKey}}',
+			},
+		},
+	};
+
+	test: ICredentialTestRequest = {
+		request: {
+			baseURL: 'https://api.anthropic.com',
+			url: '/v1/complete',
+			method: 'POST',
+			headers: {
+				'anthropic-version': '2023-06-01',
+			},
+			body: {
+				model: 'claude-2',
+				prompt: '\n\nHuman: Hello, world!\n\nAssistant:',
+				max_tokens_to_sample: 256,
+			},
+		},
+	};
+}
diff --git a/packages/@n8n/nodes-langchain/credentials/AzureOpenAiApi.credentials.ts b/packages/@n8n/nodes-langchain/credentials/AzureOpenAiApi.credentials.ts
new file mode 100644
index 0000000000000..28608524c8e1c
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/credentials/AzureOpenAiApi.credentials.ts
@@ -0,0 +1,43 @@
+import type { IAuthenticateGeneric, ICredentialType, INodeProperties } from 'n8n-workflow';
+
+export class AzureOpenAiApi implements ICredentialType {
+	name = 'azureOpenAiApi';
+
+	displayName = 'Azure Open AI';
+
+	documentationUrl = 'azureopenai';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'API Key',
+			name: 'apiKey',
+			type: 'string',
+			typeOptions: { password: true },
+			required: true,
+			default: '',
+		},
+		{
+			displayName: 'Resource Name',
+			name: 'resourceName',
+			type: 'string',
+			required: true,
+			default: '',
+		},
+		{
+			displayName: 'API Version',
+			name: 'apiVersion',
+			type: 'string',
+			required: true,
+			default: '2023-07-01-preview',
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				'api-key': '={{$credentials.apiKey}}',
+			},
+		},
+	};
+}
diff --git a/packages/@n8n/nodes-langchain/credentials/CohereApi.credentials.ts b/packages/@n8n/nodes-langchain/credentials/CohereApi.credentials.ts
new file mode 100644
index 0000000000000..f243593e7b63e
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/credentials/CohereApi.credentials.ts
@@ -0,0 +1,41 @@
+import type {
+	IAuthenticateGeneric,
+	ICredentialTestRequest,
+	ICredentialType,
+	INodeProperties,
+} from 'n8n-workflow';
+
+export class CohereApi implements ICredentialType {
+	name = 'cohereApi';
+
+	displayName = 'CohereApi';
+
+	documentationUrl = 'cohere';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'API Key',
+			name: 'apiKey',
+			type: 'string',
+			typeOptions: { password: true },
+			required: true,
+			default: '',
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				Authorization: '=Bearer {{$credentials.apiKey}}',
+			},
+		},
+	};
+
+	test: ICredentialTestRequest = {
+		request: {
+			baseURL: 'https://api.cohere.ai',
+			url: '/v1/models?page_size=1',
+		},
+	};
+}
diff --git a/packages/@n8n/nodes-langchain/credentials/GooglePalmApi.credentials.ts b/packages/@n8n/nodes-langchain/credentials/GooglePalmApi.credentials.ts
new file mode 100644
index 0000000000000..3c474e31986f4
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/credentials/GooglePalmApi.credentials.ts
@@ -0,0 +1,47 @@
+import type {
+	IAuthenticateGeneric,
+	ICredentialTestRequest,
+	ICredentialType,
+	INodeProperties,
+} from 'n8n-workflow';
+
+export class GooglePalmApi implements ICredentialType {
+	name = 'googlePalmApi';
+
+	displayName = 'Google Gemini(PaLM) Api';
+
+	documentationUrl = 'google';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'Host',
+			name: 'host',
+			required: true,
+			type: 'string',
+			default: 'https://generativelanguage.googleapis.com',
+		},
+		{
+			displayName: 'API Key',
+			name: 'apiKey',
+			type: 'string',
+			typeOptions: { password: true },
+			required: true,
+			default: '',
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			qs: {
+				key: '={{$credentials.apiKey}}',
+			},
+		},
+	};
+
+	test: ICredentialTestRequest = {
+		request: {
+			baseURL: '={{$credentials.host}}/v1beta/models',
+		},
+	};
+}
diff --git a/packages/@n8n/nodes-langchain/credentials/GroqApi.credentials.ts b/packages/@n8n/nodes-langchain/credentials/GroqApi.credentials.ts
new file mode 100644
index 0000000000000..1c2d2ae343957
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/credentials/GroqApi.credentials.ts
@@ -0,0 +1,41 @@
+import type {
+	IAuthenticateGeneric,
+	ICredentialTestRequest,
+	ICredentialType,
+	INodeProperties,
+} from 'n8n-workflow';
+
+export class GroqApi implements ICredentialType {
+	name = 'groqApi';
+
+	displayName = 'Groq';
+
+	documentationUrl = 'groq';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'API Key',
+			name: 'apiKey',
+			type: 'string',
+			typeOptions: { password: true },
+			required: true,
+			default: '',
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				Authorization: '=Bearer {{$credentials.apiKey}}',
+			},
+		},
+	};
+
+	test: ICredentialTestRequest = {
+		request: {
+			baseURL: 'https://api.groq.com/openai/v1',
+			url: '/models',
+		},
+	};
+}
diff --git a/packages/@n8n/nodes-langchain/credentials/HuggingFaceApi.credentials.ts b/packages/@n8n/nodes-langchain/credentials/HuggingFaceApi.credentials.ts
new file mode 100644
index 0000000000000..9545b1619c73e
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/credentials/HuggingFaceApi.credentials.ts
@@ -0,0 +1,41 @@
+import type {
+	IAuthenticateGeneric,
+	ICredentialTestRequest,
+	ICredentialType,
+	INodeProperties,
+} from 'n8n-workflow';
+
+export class HuggingFaceApi implements ICredentialType {
+	name = 'huggingFaceApi';
+
+	displayName = 'HuggingFaceApi';
+
+	documentationUrl = 'huggingface';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'API Key',
+			name: 'apiKey',
+			type: 'string',
+			typeOptions: { password: true },
+			required: true,
+			default: '',
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				Authorization: '=Bearer {{$credentials.apiKey}}',
+			},
+		},
+	};
+
+	test: ICredentialTestRequest = {
+		request: {
+			baseURL: 'https://api-inference.huggingface.co',
+			url: '/models/gpt2',
+		},
+	};
+}
diff --git a/packages/@n8n/nodes-langchain/credentials/MistralCloudApi.credentials.ts b/packages/@n8n/nodes-langchain/credentials/MistralCloudApi.credentials.ts
new file mode 100644
index 0000000000000..c5b47b3760b0a
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/credentials/MistralCloudApi.credentials.ts
@@ -0,0 +1,42 @@
+import type {
+	IAuthenticateGeneric,
+	ICredentialTestRequest,
+	ICredentialType,
+	INodeProperties,
+} from 'n8n-workflow';
+
+export class MistralCloudApi implements ICredentialType {
+	name = 'mistralCloudApi';
+
+	displayName = 'Mistral Cloud API';
+
+	documentationUrl = 'mistral';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'API Key',
+			name: 'apiKey',
+			type: 'string',
+			typeOptions: { password: true },
+			required: true,
+			default: '',
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				Authorization: '=Bearer {{$credentials.apiKey}}',
+			},
+		},
+	};
+
+	test: ICredentialTestRequest = {
+		request: {
+			baseURL: 'https://api.mistral.ai/v1',
+			url: '/models',
+			method: 'GET',
+		},
+	};
+}
diff --git a/packages/@n8n/nodes-langchain/credentials/MotorheadApi.credentials.ts b/packages/@n8n/nodes-langchain/credentials/MotorheadApi.credentials.ts
new file mode 100644
index 0000000000000..2a3b3e4640a79
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/credentials/MotorheadApi.credentials.ts
@@ -0,0 +1,54 @@
+import type {
+	IAuthenticateGeneric,
+	ICredentialTestRequest,
+	ICredentialType,
+	INodeProperties,
+} from 'n8n-workflow';
+
+export class MotorheadApi implements ICredentialType {
+	name = 'motorheadApi';
+
+	displayName = 'MotorheadApi';
+
+	documentationUrl = 'motorhead';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'Host',
+			name: 'host',
+			required: true,
+			type: 'string',
+			default: 'https://api.getmetal.io/v1',
+		},
+		{
+			displayName: 'API Key',
+			name: 'apiKey',
+			type: 'string',
+			typeOptions: { password: true },
+			required: true,
+			default: '',
+		},
+		{
+			displayName: 'Client ID',
+			name: 'clientId',
+			type: 'string',
+			default: '',
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				'x-metal-client-id': '={{$credentials.clientId}}',
+				'x-metal-api-key': '={{$credentials.apiKey}}',
+			},
+		},
+	};
+
+	test: ICredentialTestRequest = {
+		request: {
+			baseURL: '={{$credentials.host}}/keys/current',
+		},
+	};
+}
diff --git a/packages/@n8n/nodes-langchain/credentials/OllamaApi.credentials.ts b/packages/@n8n/nodes-langchain/credentials/OllamaApi.credentials.ts
new file mode 100644
index 0000000000000..acfbbcd3f92a0
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/credentials/OllamaApi.credentials.ts
@@ -0,0 +1,27 @@
+import type { ICredentialTestRequest, ICredentialType, INodeProperties } from 'n8n-workflow';
+
+export class OllamaApi implements ICredentialType {
+	name = 'ollamaApi';
+
+	displayName = 'Ollama';
+
+	documentationUrl = 'ollama';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'Base URL',
+			name: 'baseUrl',
+			required: true,
+			type: 'string',
+			default: 'http://localhost:11434',
+		},
+	];
+
+	test: ICredentialTestRequest = {
+		request: {
+			baseURL: '={{ $credentials.baseUrl }}',
+			url: '/',
+			method: 'GET',
+		},
+	};
+}
diff --git a/packages/@n8n/nodes-langchain/credentials/PineconeApi.credentials.ts b/packages/@n8n/nodes-langchain/credentials/PineconeApi.credentials.ts
new file mode 100644
index 0000000000000..0605a0af09f0e
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/credentials/PineconeApi.credentials.ts
@@ -0,0 +1,43 @@
+import type {
+	IAuthenticateGeneric,
+	ICredentialTestRequest,
+	ICredentialType,
+	INodeProperties,
+} from 'n8n-workflow';
+
+export class PineconeApi implements ICredentialType {
+	name = 'pineconeApi';
+
+	displayName = 'PineconeApi';
+
+	documentationUrl = 'pinecone';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'API Key',
+			name: 'apiKey',
+			type: 'string',
+			typeOptions: { password: true },
+			required: true,
+			default: '',
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				'Api-Key': '={{$credentials.apiKey}}',
+			},
+		},
+	};
+
+	test: ICredentialTestRequest = {
+		request: {
+			baseURL: 'https://api.pinecone.io/indexes',
+			headers: {
+				accept: 'application/json; charset=utf-8',
+			},
+		},
+	};
+}
diff --git a/packages/@n8n/nodes-langchain/credentials/QdrantApi.credentials.ts b/packages/@n8n/nodes-langchain/credentials/QdrantApi.credentials.ts
new file mode 100644
index 0000000000000..25c1bec32ad07
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/credentials/QdrantApi.credentials.ts
@@ -0,0 +1,50 @@
+import type {
+	IAuthenticateGeneric,
+	ICredentialTestRequest,
+	ICredentialType,
+	INodeProperties,
+} from 'n8n-workflow';
+
+export class QdrantApi implements ICredentialType {
+	name = 'qdrantApi';
+
+	displayName = 'QdrantApi';
+
+	documentationUrl = 'https://docs.n8n.io/integrations/builtin/credentials/qdrant/';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'API Key',
+			name: 'apiKey',
+			type: 'string',
+			typeOptions: { password: true },
+			required: false,
+			default: '',
+		},
+		{
+			displayName: 'Qdrant URL',
+			name: 'qdrantUrl',
+			type: 'string',
+			required: true,
+			default: '',
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				'api-key': '={{$credentials.apiKey}}',
+			},
+		},
+	};
+
+	test: ICredentialTestRequest = {
+		request: {
+			baseURL: '={{$credentials.qdrantUrl}}',
+			headers: {
+				accept: 'application/json; charset=utf-8',
+			},
+		},
+	};
+}
diff --git a/packages/@n8n/nodes-langchain/credentials/SerpApi.credentials.ts b/packages/@n8n/nodes-langchain/credentials/SerpApi.credentials.ts
new file mode 100644
index 0000000000000..a1ab3a55c47ce
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/credentials/SerpApi.credentials.ts
@@ -0,0 +1,41 @@
+import type {
+	IAuthenticateGeneric,
+	ICredentialTestRequest,
+	ICredentialType,
+	INodeProperties,
+} from 'n8n-workflow';
+
+export class SerpApi implements ICredentialType {
+	name = 'serpApi';
+
+	displayName = 'SerpAPI';
+
+	documentationUrl = 'serp';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'API Key',
+			name: 'apiKey',
+			type: 'string',
+			typeOptions: { password: true },
+			required: true,
+			default: '',
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			qs: {
+				api_key: '={{$credentials.apiKey}}',
+			},
+		},
+	};
+
+	test: ICredentialTestRequest = {
+		request: {
+			baseURL: 'https://serpapi.com',
+			url: '/account.json ',
+		},
+	};
+}
diff --git a/packages/@n8n/nodes-langchain/credentials/WolframAlphaApi.credentials.ts b/packages/@n8n/nodes-langchain/credentials/WolframAlphaApi.credentials.ts
new file mode 100644
index 0000000000000..642161c46299f
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/credentials/WolframAlphaApi.credentials.ts
@@ -0,0 +1,45 @@
+import type {
+	IAuthenticateGeneric,
+	ICredentialTestRequest,
+	ICredentialType,
+	INodeProperties,
+} from 'n8n-workflow';
+
+export class WolframAlphaApi implements ICredentialType {
+	name = 'wolframAlphaApi';
+
+	displayName = 'WolframAlphaApi';
+
+	documentationUrl = 'wolframalpha';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'App ID',
+			name: 'appId',
+			type: 'string',
+			typeOptions: { password: true },
+			required: true,
+			default: '',
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			qs: {
+				api_key: '={{$credentials.appId}}',
+			},
+		},
+	};
+
+	test: ICredentialTestRequest = {
+		request: {
+			baseURL: 'https://api.wolframalpha.com/v1',
+			url: '=/simple',
+			qs: {
+				i: 'How much is 1 1',
+				appid: '={{$credentials.appId}}',
+			},
+		},
+	};
+}
diff --git a/packages/@n8n/nodes-langchain/credentials/XataApi.credentials.ts b/packages/@n8n/nodes-langchain/credentials/XataApi.credentials.ts
new file mode 100644
index 0000000000000..0d66cdf89b8f3
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/credentials/XataApi.credentials.ts
@@ -0,0 +1,55 @@
+import type {
+	IAuthenticateGeneric,
+	ICredentialTestRequest,
+	ICredentialType,
+	INodeProperties,
+} from 'n8n-workflow';
+
+export class XataApi implements ICredentialType {
+	name = 'xataApi';
+
+	displayName = 'Xata Api';
+
+	documentationUrl = 'xata';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'Database Endpoint',
+			name: 'databaseEndpoint',
+			required: true,
+			type: 'string',
+			default: '',
+			placeholder: 'https://{workspace}.{region}.xata.sh/db/{database}',
+		},
+		{
+			displayName: 'Branch',
+			name: 'branch',
+			required: true,
+			type: 'string',
+			default: 'main',
+		},
+		{
+			displayName: 'API Key',
+			name: 'apiKey',
+			type: 'string',
+			typeOptions: { password: true },
+			required: true,
+			default: '',
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				Authorization: '=Bearer {{$credentials.apiKey}}',
+			},
+		},
+	};
+
+	test: ICredentialTestRequest = {
+		request: {
+			baseURL: '={{$credentials.databaseEndpoint}}:{{$credentials.branch}}',
+		},
+	};
+}
diff --git a/packages/@n8n/nodes-langchain/credentials/ZepApi.credentials.ts b/packages/@n8n/nodes-langchain/credentials/ZepApi.credentials.ts
new file mode 100644
index 0000000000000..3d5758ae22354
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/credentials/ZepApi.credentials.ts
@@ -0,0 +1,48 @@
+import type {
+	IAuthenticateGeneric,
+	ICredentialTestRequest,
+	ICredentialType,
+	INodeProperties,
+} from 'n8n-workflow';
+
+export class ZepApi implements ICredentialType {
+	name = 'zepApi';
+
+	displayName = 'Zep Api';
+
+	documentationUrl = 'zep';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'API URL',
+			name: 'apiUrl',
+			required: true,
+			type: 'string',
+			default: 'http://localhost:8000',
+		},
+		{
+			displayName: 'API Key',
+			name: 'apiKey',
+			type: 'string',
+			typeOptions: { password: true },
+			required: false,
+			default: '',
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				Authorization: '={{$credentials.apiKey ? "Bearer " + $credentials.apiKey : undefined }}',
+			},
+		},
+	};
+
+	test: ICredentialTestRequest = {
+		request: {
+			baseURL: '={{$credentials.apiUrl}}',
+			url: '/api/v1/collection',
+		},
+	};
+}
diff --git a/packages/@n8n/nodes-langchain/index.js b/packages/@n8n/nodes-langchain/index.js
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/packages/@n8n/nodes-langchain/jest.config.js b/packages/@n8n/nodes-langchain/jest.config.js
new file mode 100644
index 0000000000000..d6c48554a79a4
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/jest.config.js
@@ -0,0 +1,2 @@
+/** @type {import('jest').Config} */
+module.exports = require('../../../jest.config');
diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/Agent.node.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/Agent.node.ts
new file mode 100644
index 0000000000000..9518728e358b0
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/Agent.node.ts
@@ -0,0 +1,336 @@
+import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
+import type {
+	ConnectionTypes,
+	INodeInputConfiguration,
+	INodeInputFilter,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+import { getTemplateNoticeField } from '../../../utils/sharedFields';
+import { promptTypeOptions, textInput } from '../../../utils/descriptions';
+import { conversationalAgentProperties } from './agents/ConversationalAgent/description';
+import { conversationalAgentExecute } from './agents/ConversationalAgent/execute';
+import { openAiFunctionsAgentProperties } from './agents/OpenAiFunctionsAgent/description';
+import { openAiFunctionsAgentExecute } from './agents/OpenAiFunctionsAgent/execute';
+import { planAndExecuteAgentProperties } from './agents/PlanAndExecuteAgent/description';
+import { planAndExecuteAgentExecute } from './agents/PlanAndExecuteAgent/execute';
+import { reActAgentAgentProperties } from './agents/ReActAgent/description';
+import { reActAgentAgentExecute } from './agents/ReActAgent/execute';
+import { sqlAgentAgentProperties } from './agents/SqlAgent/description';
+import { sqlAgentAgentExecute } from './agents/SqlAgent/execute';
+
+// Function used in the inputs expression to figure out which inputs to
+// display based on the agent type
+function getInputs(
+	agent: 'conversationalAgent' | 'openAiFunctionsAgent' | 'reActAgent' | 'sqlAgent',
+	hasOutputParser?: boolean,
+): Array<ConnectionTypes | INodeInputConfiguration> {
+	interface SpecialInput {
+		type: ConnectionTypes;
+		filter?: INodeInputFilter;
+		required?: boolean;
+	}
+
+	const getInputData = (
+		inputs: SpecialInput[],
+	): Array<ConnectionTypes | INodeInputConfiguration> => {
+		const displayNames: { [key: string]: string } = {
+			[NodeConnectionType.AiLanguageModel]: 'Model',
+			[NodeConnectionType.AiMemory]: 'Memory',
+			[NodeConnectionType.AiTool]: 'Tool',
+			[NodeConnectionType.AiOutputParser]: 'Output Parser',
+		};
+
+		return inputs.map(({ type, filter, required }) => {
+			const input: INodeInputConfiguration = {
+				type,
+				displayName: type in displayNames ? displayNames[type] : undefined,
+				required: type === NodeConnectionType.AiLanguageModel,
+				maxConnections: [NodeConnectionType.AiLanguageModel, NodeConnectionType.AiMemory].includes(
+					type as NodeConnectionType,
+				)
+					? 1
+					: undefined,
+			};
+
+			if (filter) {
+				input.filter = filter;
+			}
+
+			return input;
+		});
+	};
+
+	let specialInputs: SpecialInput[] = [];
+
+	if (agent === 'conversationalAgent') {
+		specialInputs = [
+			{
+				type: NodeConnectionType.AiLanguageModel,
+				filter: {
+					nodes: [
+						'@n8n/n8n-nodes-langchain.lmChatAnthropic',
+						'@n8n/n8n-nodes-langchain.lmChatGroq',
+						'@n8n/n8n-nodes-langchain.lmChatOllama',
+						'@n8n/n8n-nodes-langchain.lmChatOpenAi',
+						'@n8n/n8n-nodes-langchain.lmChatGooglePalm',
+						'@n8n/n8n-nodes-langchain.lmChatGoogleGemini',
+						'@n8n/n8n-nodes-langchain.lmChatMistralCloud',
+						'@n8n/n8n-nodes-langchain.lmChatAzureOpenAi',
+					],
+				},
+			},
+			{
+				type: NodeConnectionType.AiMemory,
+			},
+			{
+				type: NodeConnectionType.AiTool,
+			},
+			{
+				type: NodeConnectionType.AiOutputParser,
+			},
+		];
+	} else if (agent === 'openAiFunctionsAgent') {
+		specialInputs = [
+			{
+				type: NodeConnectionType.AiLanguageModel,
+				filter: {
+					nodes: [
+						'@n8n/n8n-nodes-langchain.lmChatOpenAi',
+						'@n8n/n8n-nodes-langchain.lmChatAzureOpenAi',
+					],
+				},
+			},
+			{
+				type: NodeConnectionType.AiMemory,
+			},
+			{
+				type: NodeConnectionType.AiTool,
+				required: true,
+			},
+			{
+				type: NodeConnectionType.AiOutputParser,
+			},
+		];
+	} else if (agent === 'reActAgent') {
+		specialInputs = [
+			{
+				type: NodeConnectionType.AiLanguageModel,
+			},
+			{
+				type: NodeConnectionType.AiTool,
+			},
+			{
+				type: NodeConnectionType.AiOutputParser,
+			},
+		];
+	} else if (agent === 'sqlAgent') {
+		specialInputs = [
+			{
+				type: NodeConnectionType.AiLanguageModel,
+			},
+			{
+				type: NodeConnectionType.AiMemory,
+			},
+		];
+	} else if (agent === 'planAndExecuteAgent') {
+		specialInputs = [
+			{
+				type: NodeConnectionType.AiLanguageModel,
+			},
+			{
+				type: NodeConnectionType.AiTool,
+			},
+			{
+				type: NodeConnectionType.AiOutputParser,
+			},
+		];
+	}
+
+	if (hasOutputParser === false) {
+		specialInputs = specialInputs.filter(
+			(input) => input.type !== NodeConnectionType.AiOutputParser,
+		);
+	}
+	return [NodeConnectionType.Main, ...getInputData(specialInputs)];
+}
+
+export class Agent implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'AI Agent',
+		name: 'agent',
+		icon: 'fa:robot',
+		group: ['transform'],
+		version: [1, 1.1, 1.2, 1.3, 1.4, 1.5],
+		description: 'Generates an action plan and executes it. Can use external tools.',
+		subtitle:
+			"={{ {	conversationalAgent: 'Conversational Agent', openAiFunctionsAgent: 'OpenAI Functions Agent', reActAgent: 'ReAct Agent', sqlAgent: 'SQL Agent', planAndExecuteAgent: 'Plan and Execute Agent' }[$parameter.agent] }}",
+		defaults: {
+			name: 'AI Agent',
+			color: '#404040',
+		},
+		codex: {
+			alias: ['LangChain'],
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Agents'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/root-nodes/n8n-nodes-langchain.agent/',
+					},
+				],
+			},
+		},
+		inputs: `={{
+			((agent, hasOutputParser) => {
+				${getInputs.toString()};
+				return getInputs(agent, hasOutputParser)
+			})($parameter.agent, $parameter.hasOutputParser === undefined || $parameter.hasOutputParser === true)
+		}}`,
+		outputs: [NodeConnectionType.Main],
+		credentials: [
+			{
+				// eslint-disable-next-line n8n-nodes-base/node-class-description-credentials-name-unsuffixed
+				name: 'mySql',
+				required: true,
+				testedBy: 'mysqlConnectionTest',
+				displayOptions: {
+					show: {
+						agent: ['sqlAgent'],
+						'/dataSource': ['mysql'],
+					},
+				},
+			},
+			{
+				name: 'postgres',
+				required: true,
+				displayOptions: {
+					show: {
+						agent: ['sqlAgent'],
+						'/dataSource': ['postgres'],
+					},
+				},
+			},
+		],
+		properties: [
+			{
+				...getTemplateNoticeField(1954),
+				displayOptions: {
+					show: {
+						agent: ['conversationalAgent'],
+					},
+				},
+			},
+			{
+				displayName: 'Agent',
+				name: 'agent',
+				type: 'options',
+				noDataExpression: true,
+				options: [
+					{
+						name: 'Conversational Agent',
+						value: 'conversationalAgent',
+						description:
+							'Selects tools to accomplish its task and uses memory to recall previous conversations',
+					},
+					{
+						name: 'OpenAI Functions Agent',
+						value: 'openAiFunctionsAgent',
+						description:
+							"Utilizes OpenAI's Function Calling feature to select the appropriate tool and arguments for execution",
+					},
+					{
+						name: 'Plan and Execute Agent',
+						value: 'planAndExecuteAgent',
+						description:
+							'Plan and execute agents accomplish an objective by first planning what to do, then executing the sub tasks',
+					},
+					{
+						name: 'ReAct Agent',
+						value: 'reActAgent',
+						description: 'Strategically select tools to accomplish a given task',
+					},
+					{
+						name: 'SQL Agent',
+						value: 'sqlAgent',
+						description: 'Answers questions about data in an SQL database',
+					},
+				],
+				default: 'conversationalAgent',
+			},
+			{
+				...promptTypeOptions,
+				displayOptions: {
+					hide: {
+						'@version': [{ _cnd: { lte: 1.2 } }],
+						agent: ['sqlAgent'],
+					},
+				},
+			},
+			{
+				...textInput,
+				displayOptions: {
+					show: {
+						promptType: ['define'],
+					},
+					hide: {
+						agent: ['sqlAgent'],
+					},
+				},
+			},
+			{
+				displayName: 'Require Specific Output Format',
+				name: 'hasOutputParser',
+				type: 'boolean',
+				default: false,
+				noDataExpression: true,
+				displayOptions: {
+					hide: {
+						'@version': [{ _cnd: { lte: 1.2 } }],
+						agent: ['sqlAgent'],
+					},
+				},
+			},
+			{
+				displayName: `Connect an <a data-action='openSelectiveNodeCreator' data-action-parameter-connectiontype='${NodeConnectionType.AiOutputParser}'>output parser</a> on the canvas to specify the output format you require`,
+				name: 'notice',
+				type: 'notice',
+				default: '',
+				displayOptions: {
+					show: {
+						hasOutputParser: [true],
+					},
+				},
+			},
+
+			...conversationalAgentProperties,
+			...openAiFunctionsAgentProperties,
+			...reActAgentAgentProperties,
+			...sqlAgentAgentProperties,
+			...planAndExecuteAgentProperties,
+		],
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const agentType = this.getNodeParameter('agent', 0, '') as string;
+		const nodeVersion = this.getNode().typeVersion;
+
+		if (agentType === 'conversationalAgent') {
+			return await conversationalAgentExecute.call(this, nodeVersion);
+		} else if (agentType === 'openAiFunctionsAgent') {
+			return await openAiFunctionsAgentExecute.call(this, nodeVersion);
+		} else if (agentType === 'reActAgent') {
+			return await reActAgentAgentExecute.call(this, nodeVersion);
+		} else if (agentType === 'sqlAgent') {
+			return await sqlAgentAgentExecute.call(this, nodeVersion);
+		} else if (agentType === 'planAndExecuteAgent') {
+			return await planAndExecuteAgentExecute.call(this, nodeVersion);
+		}
+
+		throw new NodeOperationError(this.getNode(), `The agent type "${agentType}" is not supported`);
+	}
+}
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
new file mode 100644
index 0000000000000..c3507b328c9a7
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ConversationalAgent/description.ts
@@ -0,0 +1,92 @@
+import type { INodeProperties } from 'n8n-workflow';
+import { SYSTEM_MESSAGE, HUMAN_MESSAGE } from './prompt';
+
+export const conversationalAgentProperties: INodeProperties[] = [
+	{
+		displayName: 'Text',
+		name: 'text',
+		type: 'string',
+		required: true,
+		displayOptions: {
+			show: {
+				agent: ['conversationalAgent'],
+				'@version': [1],
+			},
+		},
+		default: '={{ $json.input }}',
+	},
+	{
+		displayName: 'Text',
+		name: 'text',
+		type: 'string',
+		required: true,
+		displayOptions: {
+			show: {
+				agent: ['conversationalAgent'],
+				'@version': [1.1],
+			},
+		},
+		default: '={{ $json.chat_input }}',
+	},
+	{
+		displayName: 'Text',
+		name: 'text',
+		type: 'string',
+		required: true,
+		displayOptions: {
+			show: {
+				agent: ['conversationalAgent'],
+				'@version': [1.2],
+			},
+		},
+		default: '={{ $json.chatInput }}',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		displayOptions: {
+			show: {
+				agent: ['conversationalAgent'],
+			},
+		},
+		default: {},
+		placeholder: 'Add Option',
+		options: [
+			{
+				displayName: 'Human Message',
+				name: 'humanMessage',
+				type: 'string',
+				default: HUMAN_MESSAGE,
+				description: 'The message that will provide the agent with a list of tools to use',
+				typeOptions: {
+					rows: 6,
+				},
+			},
+			{
+				displayName: 'System Message',
+				name: 'systemMessage',
+				type: 'string',
+				default: SYSTEM_MESSAGE,
+				description: 'The message that will be sent to the agent before the conversation starts',
+				typeOptions: {
+					rows: 6,
+				},
+			},
+			{
+				displayName: 'Max Iterations',
+				name: 'maxIterations',
+				type: 'number',
+				default: 10,
+				description: 'The maximum number of iterations the agent will run before stopping',
+			},
+			{
+				displayName: 'Return Intermediate Steps',
+				name: 'returnIntermediateSteps',
+				type: 'boolean',
+				default: false,
+				description: 'Whether or not the output should include intermediate steps the agent took',
+			},
+		],
+	},
+];
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
new file mode 100644
index 0000000000000..fd14107627de4
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ConversationalAgent/execute.ts
@@ -0,0 +1,124 @@
+import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
+import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
+
+import { initializeAgentExecutorWithOptions } from 'langchain/agents';
+import type { BaseChatMemory } from '@langchain/community/memory/chat_memory';
+import type { BaseOutputParser } from '@langchain/core/output_parsers';
+import { PromptTemplate } from '@langchain/core/prompts';
+import { CombiningOutputParser } from 'langchain/output_parsers';
+import {
+	isChatInstance,
+	getPromptInputByType,
+	getOptionalOutputParsers,
+	getConnectedTools,
+} from '../../../../../utils/helpers';
+import { getTracingConfig } from '../../../../../utils/tracing';
+
+export async function conversationalAgentExecute(
+	this: IExecuteFunctions,
+	nodeVersion: number,
+): Promise<INodeExecutionData[][]> {
+	this.logger.verbose('Executing Conversational Agent');
+	const model = await this.getInputConnectionData(NodeConnectionType.AiLanguageModel, 0);
+
+	if (!isChatInstance(model)) {
+		throw new NodeOperationError(this.getNode(), 'Conversational Agent requires Chat Model');
+	}
+
+	const memory = (await this.getInputConnectionData(NodeConnectionType.AiMemory, 0)) as
+		| BaseChatMemory
+		| undefined;
+
+	const tools = await getConnectedTools(this, nodeVersion >= 1.5);
+	const outputParsers = await getOptionalOutputParsers(this);
+
+	// TODO: Make it possible in the future to use values for other items than just 0
+	const options = this.getNodeParameter('options', 0, {}) as {
+		systemMessage?: string;
+		humanMessage?: string;
+		maxIterations?: number;
+		returnIntermediateSteps?: boolean;
+	};
+
+	const agentExecutor = await initializeAgentExecutorWithOptions(tools, model, {
+		// Passing "chat-conversational-react-description" as the agent type
+		// automatically creates and uses BufferMemory with the executor.
+		// If you would like to override this, you can pass in a custom
+		// memory option, but the memoryKey set on it must be "chat_history".
+		agentType: 'chat-conversational-react-description',
+		memory,
+		returnIntermediateSteps: options?.returnIntermediateSteps === true,
+		maxIterations: options.maxIterations ?? 10,
+		agentArgs: {
+			systemMessage: options.systemMessage,
+			humanMessage: options.humanMessage,
+		},
+	});
+
+	const returnData: INodeExecutionData[] = [];
+
+	let outputParser: BaseOutputParser | undefined;
+	let prompt: PromptTemplate | undefined;
+	if (outputParsers.length) {
+		if (outputParsers.length === 1) {
+			outputParser = outputParsers[0];
+		} else {
+			outputParser = new CombiningOutputParser(...outputParsers);
+		}
+
+		if (outputParser) {
+			const formatInstructions = outputParser.getFormatInstructions();
+
+			prompt = new PromptTemplate({
+				template: '{input}\n{formatInstructions}',
+				inputVariables: ['input'],
+				partialVariables: { formatInstructions },
+			});
+		}
+	}
+
+	const items = this.getInputData();
+	for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
+		try {
+			let input;
+
+			if (this.getNode().typeVersion <= 1.2) {
+				input = this.getNodeParameter('text', itemIndex) as string;
+			} else {
+				input = getPromptInputByType({
+					ctx: this,
+					i: itemIndex,
+					inputKey: 'text',
+					promptTypeKey: 'promptType',
+				});
+			}
+
+			if (input === undefined) {
+				throw new NodeOperationError(this.getNode(), 'The ‘text parameter is empty.');
+			}
+
+			if (prompt) {
+				input = (await prompt.invoke({ input })).value;
+			}
+
+			let response = await agentExecutor
+				.withConfig(getTracingConfig(this))
+				.invoke({ input, outputParsers });
+
+			if (outputParser) {
+				response = { output: await outputParser.parse(response.output as string) };
+			}
+
+			returnData.push({ json: response });
+		} catch (error) {
+			if (this.continueOnFail()) {
+				returnData.push({ json: { error: error.message }, pairedItem: { item: itemIndex } });
+				continue;
+			}
+
+			throw error;
+		}
+	}
+
+	return await this.prepareOutputData(returnData);
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ConversationalAgent/prompt.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ConversationalAgent/prompt.ts
new file mode 100644
index 0000000000000..d8706304faf02
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ConversationalAgent/prompt.ts
@@ -0,0 +1,21 @@
+export const SYSTEM_MESSAGE = `Assistant is a large language model trained by OpenAI.
+
+Assistant is designed to be able to assist with a wide range of tasks, from answering simple questions to providing in-depth explanations and discussions on a wide range of topics. As a language model, Assistant is able to generate human-like text based on the input it receives, allowing it to engage in natural-sounding conversations and provide responses that are coherent and relevant to the topic at hand.
+
+Assistant is constantly learning and improving, and its capabilities are constantly evolving. It is able to process and understand large amounts of text, and can use this knowledge to provide accurate and informative responses to a wide range of questions. Additionally, Assistant is able to generate its own text based on the input it receives, allowing it to engage in discussions and provide explanations and descriptions on a wide range of topics.
+
+Overall, Assistant is a powerful system that can help with a wide range of tasks and provide valuable insights and information on a wide range of topics. Whether you need help with a specific question or just want to have a conversation about a particular topic, Assistant is here to assist.`;
+
+export const HUMAN_MESSAGE = `TOOLS
+------
+Assistant can ask the user to use tools to look up information that may be helpful in answering the users original question. The tools the human can use are:
+
+{tools}
+
+{format_instructions}
+
+USER'S INPUT
+--------------------
+Here is the user's input (remember to respond with a markdown code snippet of a json blob with a single action, and NOTHING else):
+
+{{input}}`;
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
new file mode 100644
index 0000000000000..40f9ad1945b74
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/OpenAiFunctionsAgent/description.ts
@@ -0,0 +1,82 @@
+import type { INodeProperties } from 'n8n-workflow';
+import { SYSTEM_MESSAGE } from './prompt';
+
+export const openAiFunctionsAgentProperties: INodeProperties[] = [
+	{
+		displayName: 'Text',
+		name: 'text',
+		type: 'string',
+		required: true,
+		displayOptions: {
+			show: {
+				agent: ['openAiFunctionsAgent'],
+				'@version': [1],
+			},
+		},
+		default: '={{ $json.input }}',
+	},
+	{
+		displayName: 'Text',
+		name: 'text',
+		type: 'string',
+		required: true,
+		displayOptions: {
+			show: {
+				agent: ['openAiFunctionsAgent'],
+				'@version': [1.1],
+			},
+		},
+		default: '={{ $json.chat_input }}',
+	},
+	{
+		displayName: 'Text',
+		name: 'text',
+		type: 'string',
+		required: true,
+		displayOptions: {
+			show: {
+				agent: ['openAiFunctionsAgent'],
+				'@version': [1.2],
+			},
+		},
+		default: '={{ $json.chatInput }}',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		displayOptions: {
+			show: {
+				agent: ['openAiFunctionsAgent'],
+			},
+		},
+		default: {},
+		placeholder: 'Add Option',
+		options: [
+			{
+				displayName: 'System Message',
+				name: 'systemMessage',
+				type: 'string',
+				default: SYSTEM_MESSAGE,
+				description: 'The message that will be sent to the agent before the conversation starts',
+				typeOptions: {
+					rows: 6,
+				},
+			},
+			{
+				displayName: 'Max Iterations',
+				name: 'maxIterations',
+				type: 'number',
+				default: 10,
+				description: 'The maximum number of iterations the agent will run before stopping',
+			},
+			{
+				displayName: 'Return Intermediate Steps',
+				name: 'returnIntermediateSteps',
+				type: 'boolean',
+				default: false,
+				description: 'Whether or not the output should include intermediate steps the agent took',
+			},
+		],
+	},
+];
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
new file mode 100644
index 0000000000000..d6173c2847f00
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/OpenAiFunctionsAgent/execute.ts
@@ -0,0 +1,129 @@
+import {
+	type IExecuteFunctions,
+	type INodeExecutionData,
+	NodeConnectionType,
+	NodeOperationError,
+} from 'n8n-workflow';
+
+import type { AgentExecutorInput } from 'langchain/agents';
+import { AgentExecutor, OpenAIAgent } from 'langchain/agents';
+import type { BaseOutputParser } from '@langchain/core/output_parsers';
+import { PromptTemplate } from '@langchain/core/prompts';
+import { CombiningOutputParser } from 'langchain/output_parsers';
+import { BufferMemory, type BaseChatMemory } from 'langchain/memory';
+import { ChatOpenAI } from '@langchain/openai';
+import {
+	getConnectedTools,
+	getOptionalOutputParsers,
+	getPromptInputByType,
+} from '../../../../../utils/helpers';
+import { getTracingConfig } from '../../../../../utils/tracing';
+
+export async function openAiFunctionsAgentExecute(
+	this: IExecuteFunctions,
+	nodeVersion: number,
+): Promise<INodeExecutionData[][]> {
+	this.logger.verbose('Executing OpenAi Functions Agent');
+	const model = (await this.getInputConnectionData(
+		NodeConnectionType.AiLanguageModel,
+		0,
+	)) as ChatOpenAI;
+
+	if (!(model instanceof ChatOpenAI)) {
+		throw new NodeOperationError(
+			this.getNode(),
+			'OpenAI Functions Agent requires OpenAI Chat Model',
+		);
+	}
+	const memory = (await this.getInputConnectionData(NodeConnectionType.AiMemory, 0)) as
+		| BaseChatMemory
+		| undefined;
+	const tools = await getConnectedTools(this, nodeVersion >= 1.5);
+	const outputParsers = await getOptionalOutputParsers(this);
+	const options = this.getNodeParameter('options', 0, {}) as {
+		systemMessage?: string;
+		maxIterations?: number;
+		returnIntermediateSteps?: boolean;
+	};
+
+	const agentConfig: AgentExecutorInput = {
+		tags: ['openai-functions'],
+		agent: OpenAIAgent.fromLLMAndTools(model, tools, {
+			prefix: options.systemMessage,
+		}),
+		tools,
+		maxIterations: options.maxIterations ?? 10,
+		returnIntermediateSteps: options?.returnIntermediateSteps === true,
+		memory:
+			memory ??
+			new BufferMemory({
+				returnMessages: true,
+				memoryKey: 'chat_history',
+				inputKey: 'input',
+				outputKey: 'output',
+			}),
+	};
+
+	const agentExecutor = AgentExecutor.fromAgentAndTools(agentConfig);
+
+	const returnData: INodeExecutionData[] = [];
+
+	let outputParser: BaseOutputParser | undefined;
+	let prompt: PromptTemplate | undefined;
+	if (outputParsers.length) {
+		outputParser =
+			outputParsers.length === 1 ? outputParsers[0] : new CombiningOutputParser(...outputParsers);
+
+		const formatInstructions = outputParser.getFormatInstructions();
+
+		prompt = new PromptTemplate({
+			template: '{input}\n{formatInstructions}',
+			inputVariables: ['input'],
+			partialVariables: { formatInstructions },
+		});
+	}
+
+	const items = this.getInputData();
+	for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
+		try {
+			let input;
+			if (this.getNode().typeVersion <= 1.2) {
+				input = this.getNodeParameter('text', itemIndex) as string;
+			} else {
+				input = getPromptInputByType({
+					ctx: this,
+					i: itemIndex,
+					inputKey: 'text',
+					promptTypeKey: 'promptType',
+				});
+			}
+
+			if (input === undefined) {
+				throw new NodeOperationError(this.getNode(), 'The ‘text‘ parameter is empty.');
+			}
+
+			if (prompt) {
+				input = (await prompt.invoke({ input })).value;
+			}
+
+			let response = await agentExecutor
+				.withConfig(getTracingConfig(this))
+				.invoke({ input, outputParsers });
+
+			if (outputParser) {
+				response = { output: await outputParser.parse(response.output as string) };
+			}
+
+			returnData.push({ json: response });
+		} catch (error) {
+			if (this.continueOnFail()) {
+				returnData.push({ json: { error: error.message }, pairedItem: { item: itemIndex } });
+				continue;
+			}
+
+			throw error;
+		}
+	}
+
+	return await this.prepareOutputData(returnData);
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/OpenAiFunctionsAgent/prompt.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/OpenAiFunctionsAgent/prompt.ts
new file mode 100644
index 0000000000000..47e6c783f3aa8
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/OpenAiFunctionsAgent/prompt.ts
@@ -0,0 +1 @@
+export const SYSTEM_MESSAGE = 'You are a helpful AI assistant.';
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
new file mode 100644
index 0000000000000..608f9e9def135
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/PlanAndExecuteAgent/description.ts
@@ -0,0 +1,68 @@
+import type { INodeProperties } from 'n8n-workflow';
+import { DEFAULT_STEP_EXECUTOR_HUMAN_CHAT_MESSAGE_TEMPLATE } from './prompt';
+
+export const planAndExecuteAgentProperties: INodeProperties[] = [
+	{
+		displayName: 'Text',
+		name: 'text',
+		type: 'string',
+		required: true,
+		displayOptions: {
+			show: {
+				agent: ['planAndExecuteAgent'],
+				'@version': [1],
+			},
+		},
+		default: '={{ $json.input }}',
+	},
+	{
+		displayName: 'Text',
+		name: 'text',
+		type: 'string',
+		required: true,
+		displayOptions: {
+			show: {
+				agent: ['planAndExecuteAgent'],
+				'@version': [1.1],
+			},
+		},
+		default: '={{ $json.chat_input }}',
+	},
+	{
+		displayName: 'Text',
+		name: 'text',
+		type: 'string',
+		required: true,
+		displayOptions: {
+			show: {
+				agent: ['planAndExecuteAgent'],
+				'@version': [1.2],
+			},
+		},
+		default: '={{ $json.chatInput }}',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		displayOptions: {
+			show: {
+				agent: ['planAndExecuteAgent'],
+			},
+		},
+		default: {},
+		placeholder: 'Add Option',
+		options: [
+			{
+				displayName: 'Human Message Template',
+				name: 'humanMessageTemplate',
+				type: 'string',
+				default: DEFAULT_STEP_EXECUTOR_HUMAN_CHAT_MESSAGE_TEMPLATE,
+				description: 'The message that will be sent to the agent during each step execution',
+				typeOptions: {
+					rows: 6,
+				},
+			},
+		],
+	},
+];
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
new file mode 100644
index 0000000000000..3957f867cd2ce
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/PlanAndExecuteAgent/execute.ts
@@ -0,0 +1,104 @@
+import {
+	type IExecuteFunctions,
+	type INodeExecutionData,
+	NodeConnectionType,
+	NodeOperationError,
+} from 'n8n-workflow';
+
+import type { BaseOutputParser } from '@langchain/core/output_parsers';
+import { PromptTemplate } from '@langchain/core/prompts';
+import { CombiningOutputParser } from 'langchain/output_parsers';
+import type { BaseChatModel } from '@langchain/core/language_models/chat_models';
+import { PlanAndExecuteAgentExecutor } from 'langchain/experimental/plan_and_execute';
+import {
+	getConnectedTools,
+	getOptionalOutputParsers,
+	getPromptInputByType,
+} from '../../../../../utils/helpers';
+import { getTracingConfig } from '../../../../../utils/tracing';
+
+export async function planAndExecuteAgentExecute(
+	this: IExecuteFunctions,
+	nodeVersion: number,
+): Promise<INodeExecutionData[][]> {
+	this.logger.verbose('Executing PlanAndExecute Agent');
+	const model = (await this.getInputConnectionData(
+		NodeConnectionType.AiLanguageModel,
+		0,
+	)) as BaseChatModel;
+
+	const tools = await getConnectedTools(this, nodeVersion >= 1.5);
+
+	const outputParsers = await getOptionalOutputParsers(this);
+
+	const options = this.getNodeParameter('options', 0, {}) as {
+		humanMessageTemplate?: string;
+	};
+
+	const agentExecutor = await PlanAndExecuteAgentExecutor.fromLLMAndTools({
+		llm: model,
+		tools,
+		humanMessageTemplate: options.humanMessageTemplate,
+	});
+
+	const returnData: INodeExecutionData[] = [];
+
+	let outputParser: BaseOutputParser | undefined;
+	let prompt: PromptTemplate | undefined;
+	if (outputParsers.length) {
+		outputParser =
+			outputParsers.length === 1 ? outputParsers[0] : new CombiningOutputParser(...outputParsers);
+
+		const formatInstructions = outputParser.getFormatInstructions();
+
+		prompt = new PromptTemplate({
+			template: '{input}\n{formatInstructions}',
+			inputVariables: ['input'],
+			partialVariables: { formatInstructions },
+		});
+	}
+
+	const items = this.getInputData();
+	for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
+		try {
+			let input;
+			if (this.getNode().typeVersion <= 1.2) {
+				input = this.getNodeParameter('text', itemIndex) as string;
+			} else {
+				input = getPromptInputByType({
+					ctx: this,
+					i: itemIndex,
+					inputKey: 'text',
+					promptTypeKey: 'promptType',
+				});
+			}
+
+			if (input === undefined) {
+				throw new NodeOperationError(this.getNode(), 'The ‘text‘ parameter is empty.');
+			}
+
+			if (prompt) {
+				input = (await prompt.invoke({ input })).value;
+			}
+
+			let response = await agentExecutor
+				.withConfig(getTracingConfig(this))
+				.invoke({ input, outputParsers });
+
+			if (outputParser) {
+				response = { output: await outputParser.parse(response.output as string) };
+			}
+
+			returnData.push({ json: response });
+		} catch (error) {
+			if (this.continueOnFail()) {
+				returnData.push({ json: { error: error.message }, pairedItem: { item: itemIndex } });
+				continue;
+			}
+
+			throw error;
+		}
+	}
+
+	return await this.prepareOutputData(returnData);
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/PlanAndExecuteAgent/prompt.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/PlanAndExecuteAgent/prompt.ts
new file mode 100644
index 0000000000000..cd1f964fd174f
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/PlanAndExecuteAgent/prompt.ts
@@ -0,0 +1,7 @@
+export const DEFAULT_STEP_EXECUTOR_HUMAN_CHAT_MESSAGE_TEMPLATE = `Previous steps: {previous_steps}
+
+Current objective: {current_step}
+
+{agent_scratchpad}
+
+You may extract and combine relevant data from your previous steps when responding to me.`;
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
new file mode 100644
index 0000000000000..f95026f7a42e3
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ReActAgent/description.ts
@@ -0,0 +1,107 @@
+import type { INodeProperties } from 'n8n-workflow';
+import { HUMAN_MESSAGE_TEMPLATE, PREFIX, SUFFIX, SUFFIX_CHAT } from './prompt';
+
+export const reActAgentAgentProperties: INodeProperties[] = [
+	{
+		displayName: 'Text',
+		name: 'text',
+		type: 'string',
+		required: true,
+		displayOptions: {
+			show: {
+				agent: ['reActAgent'],
+				'@version': [1],
+			},
+		},
+		default: '={{ $json.input }}',
+	},
+	{
+		displayName: 'Text',
+		name: 'text',
+		type: 'string',
+		required: true,
+		displayOptions: {
+			show: {
+				agent: ['reActAgent'],
+				'@version': [1.1],
+			},
+		},
+		default: '={{ $json.chat_input }}',
+	},
+	{
+		displayName: 'Text',
+		name: 'text',
+		type: 'string',
+		required: true,
+		displayOptions: {
+			show: {
+				agent: ['reActAgent'],
+				'@version': [1.2],
+			},
+		},
+		default: '={{ $json.chatInput }}',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		displayOptions: {
+			show: {
+				agent: ['reActAgent'],
+			},
+		},
+		default: {},
+		placeholder: 'Add Option',
+		options: [
+			{
+				displayName: 'Human Message Template',
+				name: 'humanMessageTemplate',
+				type: 'string',
+				default: HUMAN_MESSAGE_TEMPLATE,
+				description: 'String to use directly as the human message template',
+				typeOptions: {
+					rows: 6,
+				},
+			},
+			{
+				displayName: 'Prefix Message',
+				name: 'prefix',
+				type: 'string',
+				default: PREFIX,
+				description: 'String to put before the list of tools',
+				typeOptions: {
+					rows: 6,
+				},
+			},
+			{
+				displayName: 'Suffix Message for Chat Model',
+				name: 'suffixChat',
+				type: 'string',
+				default: SUFFIX_CHAT,
+				description:
+					'String to put after the list of tools that will be used if chat model is used',
+				typeOptions: {
+					rows: 6,
+				},
+			},
+			{
+				displayName: 'Suffix Message for Regular Model',
+				name: 'suffix',
+				type: 'string',
+				default: SUFFIX,
+				description:
+					'String to put after the list of tools that will be used if regular model is used',
+				typeOptions: {
+					rows: 6,
+				},
+			},
+			{
+				displayName: 'Return Intermediate Steps',
+				name: 'returnIntermediateSteps',
+				type: 'boolean',
+				default: false,
+				description: 'Whether or not the output should include intermediate steps the agent took',
+			},
+		],
+	},
+];
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
new file mode 100644
index 0000000000000..a2a6392a5ff13
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ReActAgent/execute.ts
@@ -0,0 +1,125 @@
+import {
+	type IExecuteFunctions,
+	type INodeExecutionData,
+	NodeConnectionType,
+	NodeOperationError,
+} from 'n8n-workflow';
+
+import { AgentExecutor, ChatAgent, ZeroShotAgent } from 'langchain/agents';
+import type { BaseLanguageModel } from 'langchain/base_language';
+import type { BaseOutputParser } from '@langchain/core/output_parsers';
+import { PromptTemplate } from '@langchain/core/prompts';
+import { CombiningOutputParser } from 'langchain/output_parsers';
+import type { BaseChatModel } from '@langchain/core/language_models/chat_models';
+import {
+	getConnectedTools,
+	getOptionalOutputParsers,
+	getPromptInputByType,
+	isChatInstance,
+} from '../../../../../utils/helpers';
+import { getTracingConfig } from '../../../../../utils/tracing';
+
+export async function reActAgentAgentExecute(
+	this: IExecuteFunctions,
+	nodeVersion: number,
+): Promise<INodeExecutionData[][]> {
+	this.logger.verbose('Executing ReAct Agent');
+
+	const model = (await this.getInputConnectionData(NodeConnectionType.AiLanguageModel, 0)) as
+		| BaseLanguageModel
+		| BaseChatModel;
+
+	const tools = await getConnectedTools(this, nodeVersion >= 1.5);
+
+	const outputParsers = await getOptionalOutputParsers(this);
+
+	const options = this.getNodeParameter('options', 0, {}) as {
+		prefix?: string;
+		suffix?: string;
+		suffixChat?: string;
+		humanMessageTemplate?: string;
+		returnIntermediateSteps?: boolean;
+	};
+	let agent: ChatAgent | ZeroShotAgent;
+
+	if (isChatInstance(model)) {
+		agent = ChatAgent.fromLLMAndTools(model, tools, {
+			prefix: options.prefix,
+			suffix: options.suffixChat,
+			humanMessageTemplate: options.humanMessageTemplate,
+		});
+	} else {
+		agent = ZeroShotAgent.fromLLMAndTools(model, tools, {
+			prefix: options.prefix,
+			suffix: options.suffix,
+		});
+	}
+
+	const agentExecutor = AgentExecutor.fromAgentAndTools({
+		agent,
+		tools,
+		returnIntermediateSteps: options?.returnIntermediateSteps === true,
+	});
+
+	const returnData: INodeExecutionData[] = [];
+
+	let outputParser: BaseOutputParser | undefined;
+	let prompt: PromptTemplate | undefined;
+	if (outputParsers.length) {
+		outputParser =
+			outputParsers.length === 1 ? outputParsers[0] : new CombiningOutputParser(...outputParsers);
+
+		const formatInstructions = outputParser.getFormatInstructions();
+
+		prompt = new PromptTemplate({
+			template: '{input}\n{formatInstructions}',
+			inputVariables: ['input'],
+			partialVariables: { formatInstructions },
+		});
+	}
+
+	const items = this.getInputData();
+	for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
+		try {
+			let input;
+
+			if (this.getNode().typeVersion <= 1.2) {
+				input = this.getNodeParameter('text', itemIndex) as string;
+			} else {
+				input = getPromptInputByType({
+					ctx: this,
+					i: itemIndex,
+					inputKey: 'text',
+					promptTypeKey: 'promptType',
+				});
+			}
+
+			if (input === undefined) {
+				throw new NodeOperationError(this.getNode(), 'The ‘text‘ parameter is empty.');
+			}
+
+			if (prompt) {
+				input = (await prompt.invoke({ input })).value;
+			}
+
+			let response = await agentExecutor
+				.withConfig(getTracingConfig(this))
+				.invoke({ input, outputParsers });
+
+			if (outputParser) {
+				response = { output: await outputParser.parse(response.output as string) };
+			}
+
+			returnData.push({ json: response });
+		} catch (error) {
+			if (this.continueOnFail()) {
+				returnData.push({ json: { error: error.message }, pairedItem: { item: itemIndex } });
+				continue;
+			}
+
+			throw error;
+		}
+	}
+
+	return await this.prepareOutputData(returnData);
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ReActAgent/prompt.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ReActAgent/prompt.ts
new file mode 100644
index 0000000000000..274a95629eda6
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ReActAgent/prompt.ts
@@ -0,0 +1,12 @@
+export const PREFIX =
+	'Answer the following questions as best you can. You have access to the following tools:';
+
+export const SUFFIX_CHAT =
+	'Begin! Reminder to always use the exact characters `Final Answer` when responding.';
+
+export const SUFFIX = `Begin!
+
+	Question: {input}
+	Thought:{agent_scratchpad}`;
+
+export const HUMAN_MESSAGE_TEMPLATE = '{input}\n\n{agent_scratchpad}';
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
new file mode 100644
index 0000000000000..c7f888a334903
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/description.ts
@@ -0,0 +1,191 @@
+import type { INodeProperties } from 'n8n-workflow';
+import { promptTypeOptions, textInput } from '../../../../../utils/descriptions';
+import { SQL_PREFIX, SQL_SUFFIX } from './other/prompts';
+
+const dataSourceOptions: INodeProperties = {
+	displayName: 'Data Source',
+	name: 'dataSource',
+	type: 'options',
+	displayOptions: {
+		show: {
+			agent: ['sqlAgent'],
+		},
+	},
+	default: 'sqlite',
+	description: 'SQL database to connect to',
+	options: [
+		{
+			name: 'MySQL',
+			value: 'mysql',
+			description: 'Connect to a MySQL database',
+		},
+		{
+			name: 'Postgres',
+			value: 'postgres',
+			description: 'Connect to a Postgres database',
+		},
+		{
+			name: 'SQLite',
+			value: 'sqlite',
+			description: 'Use SQLite by connecting a database file as binary input',
+		},
+	],
+};
+
+export const sqlAgentAgentProperties: INodeProperties[] = [
+	{
+		...dataSourceOptions,
+		displayOptions: {
+			show: {
+				agent: ['sqlAgent'],
+				'@version': [{ _cnd: { lt: 1.4 } }],
+			},
+		},
+	},
+	{
+		...dataSourceOptions,
+		default: 'postgres',
+		displayOptions: {
+			show: {
+				agent: ['sqlAgent'],
+				'@version': [{ _cnd: { gte: 1.4 } }],
+			},
+		},
+	},
+	{
+		displayName: 'Credentials',
+		name: 'credentials',
+		type: 'credentials',
+		default: '',
+	},
+	{
+		// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+		displayName:
+			"Pass the SQLite database into this node as binary data, e.g. by inserting a 'Read/Write Files from Disk' node beforehand",
+		name: 'sqLiteFileNotice',
+		type: 'notice',
+		default: '',
+		displayOptions: {
+			show: {
+				agent: ['sqlAgent'],
+				dataSource: ['sqlite'],
+			},
+		},
+	},
+	{
+		displayName: 'Input Binary Field',
+		name: 'binaryPropertyName',
+		type: 'string',
+		default: 'data',
+		required: true,
+		placeholder: 'e.g data',
+		hint: 'The name of the input binary field containing the file to be extracted',
+		displayOptions: {
+			show: {
+				agent: ['sqlAgent'],
+				dataSource: ['sqlite'],
+			},
+		},
+	},
+	{
+		displayName: 'Prompt',
+		name: 'input',
+		type: 'string',
+		displayOptions: {
+			show: {
+				agent: ['sqlAgent'],
+				'@version': [{ _cnd: { lte: 1.2 } }],
+			},
+		},
+		default: '',
+		required: true,
+		typeOptions: {
+			rows: 5,
+		},
+	},
+	{
+		...promptTypeOptions,
+		displayOptions: {
+			hide: {
+				'@version': [{ _cnd: { lte: 1.2 } }],
+			},
+			show: {
+				agent: ['sqlAgent'],
+			},
+		},
+	},
+	{
+		...textInput,
+		displayOptions: {
+			show: {
+				promptType: ['define'],
+				agent: ['sqlAgent'],
+			},
+		},
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		displayOptions: {
+			show: {
+				agent: ['sqlAgent'],
+			},
+		},
+		default: {},
+		placeholder: 'Add Option',
+		options: [
+			{
+				displayName: 'Ignored Tables',
+				name: 'ignoredTables',
+				type: 'string',
+				default: '',
+				description:
+					'Comma-separated list of tables to ignore from the database. If empty, no tables are ignored.',
+			},
+			{
+				displayName: 'Include Sample Rows',
+				name: 'includedSampleRows',
+				type: 'number',
+				description:
+					'Number of sample rows to include in the prompt to the agent. It helps the agent to understand the schema of the database but it also increases the amount of tokens used.',
+				default: 3,
+			},
+			{
+				displayName: 'Included Tables',
+				name: 'includedTables',
+				type: 'string',
+				default: '',
+				description:
+					'Comma-separated list of tables to include in the database. If empty, all tables are included.',
+			},
+			{
+				displayName: 'Prefix Prompt',
+				name: 'prefixPrompt',
+				type: 'string',
+				default: SQL_PREFIX,
+				description: 'Prefix prompt to use for the agent',
+				typeOptions: {
+					rows: 10,
+				},
+			},
+			{
+				displayName: 'Suffix Prompt',
+				name: 'suffixPrompt',
+				type: 'string',
+				default: SQL_SUFFIX,
+				description: 'Suffix prompt to use for the agent',
+				typeOptions: {
+					rows: 4,
+				},
+			},
+			{
+				displayName: 'Limit',
+				name: 'topK',
+				type: 'number',
+				default: 10,
+				description: 'The maximum number of results to return',
+			},
+		],
+	},
+];
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
new file mode 100644
index 0000000000000..459a88db72dfb
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/execute.ts
@@ -0,0 +1,157 @@
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
+import {
+	type IExecuteFunctions,
+	type INodeExecutionData,
+	NodeConnectionType,
+	NodeOperationError,
+	type IDataObject,
+} from 'n8n-workflow';
+
+import { SqlDatabase } from 'langchain/sql_db';
+import type { SqlCreatePromptArgs } from 'langchain/agents/toolkits/sql';
+import { SqlToolkit, createSqlAgent } from 'langchain/agents/toolkits/sql';
+import type { BaseLanguageModel } from '@langchain/core/language_models/base';
+import type { BaseChatMemory } from '@langchain/community/memory/chat_memory';
+import type { DataSource } from '@n8n/typeorm';
+
+import { getPromptInputByType, serializeChatHistory } from '../../../../../utils/helpers';
+import { getTracingConfig } from '../../../../../utils/tracing';
+import { getSqliteDataSource } from './other/handlers/sqlite';
+import { getPostgresDataSource } from './other/handlers/postgres';
+import { SQL_PREFIX, SQL_SUFFIX } from './other/prompts';
+import { getMysqlDataSource } from './other/handlers/mysql';
+
+const parseTablesString = (tablesString: string) =>
+	tablesString
+		.split(',')
+		.map((table) => table.trim())
+		.filter((table) => table.length > 0);
+
+export async function sqlAgentAgentExecute(
+	this: IExecuteFunctions,
+	nodeVersion: number,
+): Promise<INodeExecutionData[][]> {
+	this.logger.verbose('Executing SQL Agent');
+
+	const model = (await this.getInputConnectionData(
+		NodeConnectionType.AiLanguageModel,
+		0,
+	)) as BaseLanguageModel;
+	const items = this.getInputData();
+
+	const returnData: INodeExecutionData[] = [];
+
+	for (let i = 0; i < items.length; i++) {
+		try {
+			const item = items[i];
+			let input;
+			if (this.getNode().typeVersion <= 1.2) {
+				input = this.getNodeParameter('input', i) as string;
+			} else {
+				input = getPromptInputByType({
+					ctx: this,
+					i,
+					inputKey: 'text',
+					promptTypeKey: 'promptType',
+				});
+			}
+
+			if (input === undefined) {
+				throw new NodeOperationError(this.getNode(), 'The ‘prompt’ parameter is empty.');
+			}
+
+			const options = this.getNodeParameter('options', i, {});
+			const selectedDataSource = this.getNodeParameter('dataSource', i, 'sqlite') as
+				| 'mysql'
+				| 'postgres'
+				| 'sqlite';
+
+			const includedSampleRows = options.includedSampleRows as number;
+			const includedTablesArray = parseTablesString((options.includedTables as string) ?? '');
+			const ignoredTablesArray = parseTablesString((options.ignoredTables as string) ?? '');
+
+			let dataSource: DataSource | null = null;
+			if (selectedDataSource === 'sqlite') {
+				if (!item.binary) {
+					throw new NodeOperationError(
+						this.getNode(),
+						'No binary data found, please connect a binary to the input if you want to use SQLite as data source',
+					);
+				}
+
+				const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i, 'data');
+				dataSource = await getSqliteDataSource.call(this, item.binary, binaryPropertyName);
+			}
+
+			if (selectedDataSource === 'postgres') {
+				dataSource = await getPostgresDataSource.call(this);
+			}
+
+			if (selectedDataSource === 'mysql') {
+				dataSource = await getMysqlDataSource.call(this);
+			}
+
+			if (!dataSource) {
+				throw new NodeOperationError(
+					this.getNode(),
+					'No data source found, please configure data source',
+				);
+			}
+
+			const agentOptions: SqlCreatePromptArgs = {
+				topK: (options.topK as number) ?? 10,
+				prefix: (options.prefixPrompt as string) ?? SQL_PREFIX,
+				suffix: (options.suffixPrompt as string) ?? SQL_SUFFIX,
+				inputVariables: ['chatHistory', 'input', 'agent_scratchpad'],
+			};
+
+			const dbInstance = await SqlDatabase.fromDataSourceParams({
+				appDataSource: dataSource as any,
+				includesTables: includedTablesArray.length > 0 ? includedTablesArray : undefined,
+				ignoreTables: ignoredTablesArray.length > 0 ? ignoredTablesArray : undefined,
+				sampleRowsInTableInfo: includedSampleRows ?? 3,
+			});
+
+			const toolkit = new SqlToolkit(dbInstance, model);
+			const agentExecutor = createSqlAgent(model, toolkit, agentOptions);
+
+			const memory = (await this.getInputConnectionData(NodeConnectionType.AiMemory, 0)) as
+				| BaseChatMemory
+				| undefined;
+
+			agentExecutor.memory = memory;
+
+			let chatHistory = '';
+			if (memory) {
+				const messages = await memory.chatHistory.getMessages();
+				chatHistory = serializeChatHistory(messages);
+			}
+
+			let response: IDataObject;
+			try {
+				response = await agentExecutor.withConfig(getTracingConfig(this)).invoke({
+					input,
+					signal: this.getExecutionCancelSignal(),
+					chatHistory,
+				});
+			} catch (error) {
+				if ((error.message as IDataObject)?.output) {
+					response = error.message as IDataObject;
+				} else {
+					throw new NodeOperationError(this.getNode(), error.message as string, { itemIndex: i });
+				}
+			}
+
+			returnData.push({ json: response });
+		} catch (error) {
+			if (this.continueOnFail()) {
+				returnData.push({ json: { error: error.message }, pairedItem: { item: i } });
+				continue;
+			}
+
+			throw error;
+		}
+	}
+
+	return await this.prepareOutputData(returnData);
+}
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
new file mode 100644
index 0000000000000..ea1b360f046fe
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/other/handlers/mysql.ts
@@ -0,0 +1,20 @@
+import { type IExecuteFunctions } from 'n8n-workflow';
+import { DataSource } from '@n8n/typeorm';
+
+export async function getMysqlDataSource(this: IExecuteFunctions): Promise<DataSource> {
+	const credentials = await this.getCredentials('mySql');
+
+	const dataSource = new DataSource({
+		type: 'mysql',
+		host: credentials.host as string,
+		port: credentials.port as number,
+		username: credentials.user as string,
+		password: credentials.password as string,
+		database: credentials.database as string,
+		ssl: {
+			rejectUnauthorized: credentials.ssl as boolean,
+		},
+	});
+
+	return dataSource;
+}
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
new file mode 100644
index 0000000000000..6971d9119f27a
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/other/handlers/postgres.ts
@@ -0,0 +1,29 @@
+import { type IExecuteFunctions } from 'n8n-workflow';
+import { DataSource } from '@n8n/typeorm';
+
+export async function getPostgresDataSource(this: IExecuteFunctions): Promise<DataSource> {
+	const credentials = await this.getCredentials('postgres');
+
+	const dataSource = new DataSource({
+		type: 'postgres',
+		host: credentials.host as string,
+		port: credentials.port as number,
+		username: credentials.user as string,
+		password: credentials.password as string,
+		database: credentials.database as string,
+	});
+
+	if (credentials.allowUnauthorizedCerts === true) {
+		dataSource.setOptions({
+			ssl: {
+				rejectUnauthorized: true,
+			},
+		});
+	} else {
+		dataSource.setOptions({
+			ssl: !['disable', undefined].includes(credentials.ssl as string | undefined),
+		});
+	}
+
+	return dataSource;
+}
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
new file mode 100644
index 0000000000000..9240feb280b19
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/other/handlers/sqlite.ts
@@ -0,0 +1,49 @@
+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';
+
+export async function getSqliteDataSource(
+	this: IExecuteFunctions,
+	binary: INodeExecutionData['binary'],
+	binaryPropertyName = 'data',
+): Promise<DataSource> {
+	const binaryData = binary?.[binaryPropertyName];
+
+	if (!binaryData) {
+		throw new NodeOperationError(this.getNode(), 'No binary data received.');
+	}
+
+	let fileBase64;
+	if (binaryData.id) {
+		const chunkSize = 256 * 1024;
+		const stream = await this.helpers.getBinaryStream(binaryData.id, chunkSize);
+		const buffer = await this.helpers.binaryToBuffer(stream);
+		fileBase64 = buffer.toString('base64');
+	} else {
+		fileBase64 = binaryData.data;
+	}
+
+	const bufferString = Buffer.from(fileBase64, BINARY_ENCODING);
+
+	// Track and cleanup temp files at exit
+	temp.track();
+
+	const tempDbPath = temp.path({ suffix: '.sqlite' });
+	fs.writeFileSync(tempDbPath, bufferString);
+
+	// Initialize a new SQLite database from the temp file
+	const tempDb = new sqlite3.Database(tempDbPath, (error: Error | null) => {
+		if (error) {
+			throw new NodeOperationError(this.getNode(), 'Could not connect to database');
+		}
+	});
+	tempDb.close();
+
+	return new DataSource({
+		type: 'sqlite',
+		database: tempDbPath,
+	});
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/other/prompts.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/other/prompts.ts
new file mode 100644
index 0000000000000..443fcddb9c649
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/other/prompts.ts
@@ -0,0 +1,20 @@
+export const SQL_PREFIX = `You are an agent designed to interact with an SQL database.
+Given an input question, create a syntactically correct {dialect} query to run, then look at the results of the query and return the answer.
+Unless the user specifies a specific number of examples they wish to obtain, always limit your query to at most {top_k} results using the LIMIT clause.
+You can order the results by a relevant column to return the most interesting examples in the database.
+Never query for all the columns from a specific table, only ask for a the few relevant columns given the question.
+You have access to tools for interacting with the database.
+Only use the below tools. Only use the information returned by the below tools to construct your final answer.
+You MUST double check your query before executing it. If you get an error while executing a query, rewrite the query and try again.
+
+DO NOT make any DML statements (INSERT, UPDATE, DELETE, DROP etc.) to the database.
+
+If the question does not seem related to the database, just return "I don't know" as the answer.`;
+
+export const SQL_SUFFIX = `Begin!
+Chat History:
+{chatHistory}
+
+Question: {input}
+Thought: I should look at the tables in the database to see what I can query.
+{agent_scratchpad}`;
diff --git a/packages/@n8n/nodes-langchain/nodes/agents/OpenAiAssistant/OpenAiAssistant.node.ts b/packages/@n8n/nodes-langchain/nodes/agents/OpenAiAssistant/OpenAiAssistant.node.ts
new file mode 100644
index 0000000000000..77fa3911e02f5
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/agents/OpenAiAssistant/OpenAiAssistant.node.ts
@@ -0,0 +1,397 @@
+import { AgentExecutor } from 'langchain/agents';
+import { OpenAI as OpenAIClient } from 'openai';
+import { OpenAIAssistantRunnable } from 'langchain/experimental/openai_assistant';
+import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+import type { OpenAIToolType } from 'langchain/dist/experimental/openai_assistant/schema';
+import { getConnectedTools } from '../../../utils/helpers';
+import { getTracingConfig } from '../../../utils/tracing';
+import { formatToOpenAIAssistantTool } from './utils';
+
+export class OpenAiAssistant implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'OpenAI Assistant',
+		name: 'openAiAssistant',
+		hidden: true,
+		icon: 'fa:robot',
+		group: ['transform'],
+		version: [1, 1.1],
+		description: 'Utilizes Assistant API from Open AI.',
+		subtitle: 'Open AI Assistant',
+		defaults: {
+			name: 'OpenAI Assistant',
+			color: '#404040',
+		},
+		codex: {
+			alias: ['LangChain'],
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Agents'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/root-nodes/n8n-nodes-langchain.openaiassistant/',
+					},
+				],
+			},
+		},
+		inputs: [
+			{ type: NodeConnectionType.Main },
+			{ type: NodeConnectionType.AiTool, displayName: 'Tools' },
+		],
+		outputs: [NodeConnectionType.Main],
+		credentials: [
+			{
+				name: 'openAiApi',
+				required: true,
+			},
+		],
+		requestDefaults: {
+			ignoreHttpStatusErrors: true,
+			baseURL:
+				'={{ $parameter.options?.baseURL?.split("/").slice(0,-1).join("/") || "https://api.openai.com" }}',
+		},
+		properties: [
+			{
+				displayName: 'Operation',
+				name: 'mode',
+				type: 'options',
+				noDataExpression: true,
+				default: 'existing',
+				options: [
+					{
+						name: 'Use New Assistant',
+						value: 'new',
+					},
+					{
+						name: 'Use Existing Assistant',
+						value: 'existing',
+					},
+				],
+			},
+			{
+				displayName: 'Name',
+				name: 'name',
+				type: 'string',
+				default: '',
+				required: true,
+				displayOptions: {
+					show: {
+						'/mode': ['new'],
+					},
+				},
+			},
+			{
+				displayName: 'Instructions',
+				name: 'instructions',
+				type: 'string',
+				description: 'How the Assistant and model should behave or respond',
+				default: '',
+				typeOptions: {
+					rows: 5,
+				},
+				displayOptions: {
+					show: {
+						'/mode': ['new'],
+					},
+				},
+			},
+			{
+				displayName: 'Model',
+				name: 'model',
+				type: 'options',
+				description:
+					'The model which will be used to power the assistant. <a href="https://beta.openai.com/docs/models/overview">Learn more</a>. The Retrieval tool requires gpt-3.5-turbo-1106 and gpt-4-1106-preview models.',
+				required: true,
+				displayOptions: {
+					show: {
+						'/mode': ['new'],
+					},
+				},
+				typeOptions: {
+					loadOptions: {
+						routing: {
+							request: {
+								method: 'GET',
+								url: '={{ $parameter.options?.baseURL?.split("/").slice(-1).pop() || "v1"  }}/models',
+							},
+							output: {
+								postReceive: [
+									{
+										type: 'rootProperty',
+										properties: {
+											property: 'data',
+										},
+									},
+									{
+										type: 'filter',
+										properties: {
+											pass: "={{ $responseItem.id.startsWith('gpt-') && !$responseItem.id.includes('instruct') }}",
+										},
+									},
+									{
+										type: 'setKeyValue',
+										properties: {
+											name: '={{$responseItem.id}}',
+											value: '={{$responseItem.id}}',
+										},
+									},
+									{
+										type: 'sort',
+										properties: {
+											key: 'name',
+										},
+									},
+								],
+							},
+						},
+					},
+				},
+				routing: {
+					send: {
+						type: 'body',
+						property: 'model',
+					},
+				},
+				default: 'gpt-3.5-turbo-1106',
+			},
+			{
+				displayName: 'Assistant',
+				name: 'assistantId',
+				type: 'options',
+				noDataExpression: true,
+				displayOptions: {
+					show: {
+						'/mode': ['existing'],
+					},
+				},
+				description:
+					'The assistant to use. <a href="https://beta.openai.com/docs/assistants/overview">Learn more</a>.',
+				typeOptions: {
+					loadOptions: {
+						routing: {
+							request: {
+								method: 'GET',
+								headers: {
+									'OpenAI-Beta': 'assistants=v1',
+								},
+								url: '={{ $parameter.options?.baseURL?.split("/").slice(-1).pop() || "v1"  }}/assistants',
+							},
+							output: {
+								postReceive: [
+									{
+										type: 'rootProperty',
+										properties: {
+											property: 'data',
+										},
+									},
+									{
+										type: 'setKeyValue',
+										properties: {
+											name: '={{$responseItem.name}}',
+											value: '={{$responseItem.id}}',
+											// eslint-disable-next-line n8n-local-rules/no-interpolation-in-regular-string
+											description: '={{$responseItem.model}}',
+										},
+									},
+									{
+										type: 'sort',
+										properties: {
+											key: 'name',
+										},
+									},
+								],
+							},
+						},
+					},
+				},
+				routing: {
+					send: {
+						type: 'body',
+						property: 'assistant',
+					},
+				},
+				required: true,
+				default: '',
+			},
+			{
+				displayName: 'Text',
+				name: 'text',
+				type: 'string',
+				required: true,
+				default: '={{ $json.chat_input }}',
+				displayOptions: {
+					show: {
+						'@version': [1],
+					},
+				},
+			},
+			{
+				displayName: 'Text',
+				name: 'text',
+				type: 'string',
+				required: true,
+				default: '={{ $json.chatInput }}',
+				displayOptions: {
+					show: {
+						'@version': [1.1],
+					},
+				},
+			},
+			{
+				displayName: 'OpenAI Tools',
+				name: 'nativeTools',
+				type: 'multiOptions',
+				default: [],
+				options: [
+					{
+						name: 'Code Interpreter',
+						value: 'code_interpreter',
+					},
+					{
+						name: 'Knowledge Retrieval',
+						value: 'retrieval',
+					},
+				],
+			},
+			{
+				displayName: 'Connect your own custom tools to this node on the canvas',
+				name: 'noticeTools',
+				type: 'notice',
+				default: '',
+			},
+			{
+				displayName:
+					'Upload files for retrieval using the <a href="https://platform.openai.com/playground" target="_blank">OpenAI website<a/>',
+				name: 'noticeTools',
+				type: 'notice',
+				typeOptions: {
+					noticeTheme: 'info',
+				},
+				displayOptions: { show: { '/nativeTools': ['retrieval'] } },
+				default: '',
+			},
+			{
+				displayName: 'Options',
+				name: 'options',
+				placeholder: 'Add Option',
+				description: 'Additional options to add',
+				type: 'collection',
+				default: {},
+				options: [
+					{
+						displayName: 'Base URL',
+						name: 'baseURL',
+						default: 'https://api.openai.com/v1',
+						description: 'Override the default base URL for the API',
+						type: 'string',
+					},
+					{
+						displayName: 'Max Retries',
+						name: 'maxRetries',
+						default: 2,
+						description: 'Maximum number of retries to attempt',
+						type: 'number',
+					},
+					{
+						displayName: 'Timeout',
+						name: 'timeout',
+						default: 10000,
+						description: 'Maximum amount of time a request is allowed to take in milliseconds',
+						type: 'number',
+					},
+				],
+			},
+		],
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const nodeVersion = this.getNode().typeVersion;
+		const tools = await getConnectedTools(this, nodeVersion > 1);
+		const credentials = await this.getCredentials('openAiApi');
+
+		const items = this.getInputData();
+		const returnData: INodeExecutionData[] = [];
+
+		for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
+			try {
+				const input = this.getNodeParameter('text', itemIndex) as string;
+				const assistantId = this.getNodeParameter('assistantId', itemIndex, '') as string;
+				const nativeTools = this.getNodeParameter('nativeTools', itemIndex, []) as Array<
+					'code_interpreter' | 'retrieval'
+				>;
+
+				const options = this.getNodeParameter('options', itemIndex, {}) as {
+					baseURL?: string;
+					maxRetries: number;
+					timeout: number;
+				};
+
+				if (input === undefined) {
+					throw new NodeOperationError(this.getNode(), 'The ‘text‘ parameter is empty.');
+				}
+
+				const client = new OpenAIClient({
+					apiKey: credentials.apiKey as string,
+					maxRetries: options.maxRetries ?? 2,
+					timeout: options.timeout ?? 10000,
+					baseURL: options.baseURL,
+				});
+				let agent;
+				const nativeToolsParsed: OpenAIToolType = nativeTools.map((tool) => ({ type: tool }));
+				const transformedConnectedTools = tools?.map(formatToOpenAIAssistantTool) ?? [];
+				const newTools = [...transformedConnectedTools, ...nativeToolsParsed];
+
+				// Existing agent, update tools with currently assigned
+				if (assistantId) {
+					agent = new OpenAIAssistantRunnable({ assistantId, client, asAgent: true });
+
+					await client.beta.assistants.update(assistantId, {
+						tools: newTools,
+					});
+				} else {
+					const name = this.getNodeParameter('name', itemIndex, '') as string;
+					const instructions = this.getNodeParameter('instructions', itemIndex, '') as string;
+					const model = this.getNodeParameter('model', itemIndex, 'gpt-3.5-turbo-1106') as string;
+
+					agent = await OpenAIAssistantRunnable.createAssistant({
+						model,
+						client,
+						instructions,
+						name,
+						tools: newTools,
+						asAgent: true,
+					});
+				}
+
+				const agentExecutor = AgentExecutor.fromAgentAndTools({
+					agent,
+					tools,
+				});
+
+				const response = await agentExecutor.withConfig(getTracingConfig(this)).invoke({
+					content: input,
+					signal: this.getExecutionCancelSignal(),
+					timeout: options.timeout ?? 10000,
+				});
+
+				returnData.push({ json: response });
+			} catch (error) {
+				if (this.continueOnFail()) {
+					returnData.push({ json: { error: error.message }, pairedItem: { item: itemIndex } });
+					continue;
+				}
+
+				throw error;
+			}
+		}
+
+		return await this.prepareOutputData(returnData);
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/agents/OpenAiAssistant/utils.ts b/packages/@n8n/nodes-langchain/nodes/agents/OpenAiAssistant/utils.ts
new file mode 100644
index 0000000000000..294fc47847f0f
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/agents/OpenAiAssistant/utils.ts
@@ -0,0 +1,45 @@
+import { zodToJsonSchema } from 'zod-to-json-schema';
+import type { OpenAIClient } from '@langchain/openai';
+import type { StructuredTool } from '@langchain/core/tools';
+
+// Copied from langchain(`langchain/src/tools/convert_to_openai.ts`)
+// since these functions are not exported
+
+/**
+ * Formats a `StructuredTool` instance into a format that is compatible
+ * with OpenAI's ChatCompletionFunctions. It uses the `zodToJsonSchema`
+ * function to convert the schema of the `StructuredTool` into a JSON
+ * schema, which is then used as the parameters for the OpenAI function.
+ */
+export function formatToOpenAIFunction(
+	tool: StructuredTool,
+): OpenAIClient.Chat.ChatCompletionCreateParams.Function {
+	return {
+		name: tool.name,
+		description: tool.description,
+		parameters: zodToJsonSchema(tool.schema),
+	};
+}
+
+export function formatToOpenAITool(tool: StructuredTool): OpenAIClient.Chat.ChatCompletionTool {
+	const schema = zodToJsonSchema(tool.schema);
+	return {
+		type: 'function',
+		function: {
+			name: tool.name,
+			description: tool.description,
+			parameters: schema,
+		},
+	};
+}
+
+export function formatToOpenAIAssistantTool(tool: StructuredTool): OpenAIClient.Beta.AssistantTool {
+	return {
+		type: 'function',
+		function: {
+			name: tool.name,
+			description: tool.description,
+			parameters: zodToJsonSchema(tool.schema),
+		},
+	};
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/chains/ChainLLM/ChainLlm.node.ts b/packages/@n8n/nodes-langchain/nodes/chains/ChainLLM/ChainLlm.node.ts
new file mode 100644
index 0000000000000..b177755591215
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/chains/ChainLLM/ChainLlm.node.ts
@@ -0,0 +1,594 @@
+import { ApplicationError, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
+import type {
+	IBinaryData,
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+
+import type { BaseLanguageModel } from '@langchain/core/language_models/base';
+import {
+	AIMessagePromptTemplate,
+	PromptTemplate,
+	SystemMessagePromptTemplate,
+	HumanMessagePromptTemplate,
+	ChatPromptTemplate,
+} from '@langchain/core/prompts';
+import type { BaseOutputParser } from '@langchain/core/output_parsers';
+import { CombiningOutputParser } from 'langchain/output_parsers';
+import { LLMChain } from 'langchain/chains';
+import type { BaseChatModel } from '@langchain/core/language_models/chat_models';
+import { HumanMessage } from '@langchain/core/messages';
+import { ChatGoogleGenerativeAI } from '@langchain/google-genai';
+import { ChatOllama } from '@langchain/community/chat_models/ollama';
+import { getTemplateNoticeField } from '../../../utils/sharedFields';
+import {
+	getOptionalOutputParsers,
+	getPromptInputByType,
+	isChatInstance,
+} from '../../../utils/helpers';
+import { getTracingConfig } from '../../../utils/tracing';
+
+interface MessagesTemplate {
+	type: string;
+	message: string;
+	messageType: 'text' | 'imageBinary' | 'imageUrl';
+	binaryImageDataKey?: string;
+	imageUrl?: string;
+	imageDetail?: 'auto' | 'low' | 'high';
+}
+
+async function getImageMessage(
+	context: IExecuteFunctions,
+	itemIndex: number,
+	message: MessagesTemplate,
+) {
+	if (message.messageType !== 'imageBinary' && message.messageType !== 'imageUrl') {
+		// eslint-disable-next-line n8n-nodes-base/node-execute-block-wrong-error-thrown
+		throw new NodeOperationError(
+			context.getNode(),
+			'Invalid message type. Only imageBinary and imageUrl are supported',
+		);
+	}
+	const detail = message.imageDetail === 'auto' ? undefined : message.imageDetail;
+	if (message.messageType === 'imageUrl' && message.imageUrl) {
+		return new HumanMessage({
+			content: [
+				{
+					type: 'image_url',
+					image_url: {
+						url: message.imageUrl,
+						detail,
+					},
+				},
+			],
+		});
+	}
+
+	const binaryDataKey = message.binaryImageDataKey ?? 'data';
+	const inputData = context.getInputData()[itemIndex];
+	const binaryData = inputData.binary?.[binaryDataKey] as IBinaryData;
+
+	if (!binaryData) {
+		throw new NodeOperationError(context.getNode(), 'No binary data set.');
+	}
+
+	const bufferData = await context.helpers.getBinaryDataBuffer(itemIndex, binaryDataKey);
+	const model = (await context.getInputConnectionData(
+		NodeConnectionType.AiLanguageModel,
+		0,
+	)) as BaseLanguageModel;
+	const dataURI = `data:image/jpeg;base64,${bufferData.toString('base64')}`;
+
+	const directUriModels = [ChatGoogleGenerativeAI, ChatOllama];
+	const imageUrl = directUriModels.some((i) => model instanceof i)
+		? dataURI
+		: { url: dataURI, detail };
+
+	return new HumanMessage({
+		content: [
+			{
+				type: 'image_url',
+				image_url: imageUrl,
+			},
+		],
+	});
+}
+
+async function getChainPromptTemplate(
+	context: IExecuteFunctions,
+	itemIndex: number,
+	llm: BaseLanguageModel | BaseChatModel,
+	messages?: MessagesTemplate[],
+	formatInstructions?: string,
+	query?: string,
+) {
+	const queryTemplate = new PromptTemplate({
+		template: `{query}${formatInstructions ? '\n{formatInstructions}' : ''}`,
+		inputVariables: ['query'],
+		partialVariables: formatInstructions ? { formatInstructions } : undefined,
+	});
+
+	if (isChatInstance(llm)) {
+		const parsedMessages = await Promise.all(
+			(messages ?? []).map(async (message) => {
+				const messageClass = [
+					SystemMessagePromptTemplate,
+					AIMessagePromptTemplate,
+					HumanMessagePromptTemplate,
+				].find((m) => m.lc_name() === message.type);
+
+				if (!messageClass) {
+					// eslint-disable-next-line n8n-nodes-base/node-execute-block-wrong-error-thrown
+					throw new ApplicationError('Invalid message type', {
+						extra: { messageType: message.type },
+					});
+				}
+
+				if (messageClass === HumanMessagePromptTemplate && message.messageType !== 'text') {
+					const test = await getImageMessage(context, itemIndex, message);
+					return test;
+				}
+
+				const res = messageClass.fromTemplate(
+					// Since we're using the message as template, we need to escape any curly braces
+					// so LangChain doesn't try to parse them as variables
+					(message.message || '').replace(/[{}]/g, (match) => match + match),
+				);
+				return res;
+			}),
+		);
+
+		const lastMessage = parsedMessages[parsedMessages.length - 1];
+		// If the last message is a human message and it has an array of content, we need to add the query to the last message
+		if (lastMessage instanceof HumanMessage && Array.isArray(lastMessage.content)) {
+			const humanMessage = new HumanMessagePromptTemplate(queryTemplate);
+			const test = await humanMessage.format({ query });
+			lastMessage.content.push({ text: test.content.toString(), type: 'text' });
+		} else {
+			parsedMessages.push(new HumanMessagePromptTemplate(queryTemplate));
+		}
+		return ChatPromptTemplate.fromMessages(parsedMessages);
+	}
+
+	return queryTemplate;
+}
+
+async function createSimpleLLMChain(
+	context: IExecuteFunctions,
+	llm: BaseLanguageModel,
+	query: string,
+	prompt: ChatPromptTemplate | PromptTemplate,
+): Promise<string[]> {
+	const chain = new LLMChain({
+		llm,
+		prompt,
+	}).withConfig(getTracingConfig(context));
+
+	const response = (await chain.invoke({
+		query,
+		signal: context.getExecutionCancelSignal(),
+	})) as string[];
+
+	return Array.isArray(response) ? response : [response];
+}
+
+async function getChain(
+	context: IExecuteFunctions,
+	itemIndex: number,
+	query: string,
+	llm: BaseLanguageModel,
+	outputParsers: BaseOutputParser[],
+	messages?: MessagesTemplate[],
+): Promise<unknown[]> {
+	const chatTemplate: ChatPromptTemplate | PromptTemplate = await getChainPromptTemplate(
+		context,
+		itemIndex,
+		llm,
+		messages,
+		undefined,
+		query,
+	);
+
+	// If there are no output parsers, create a simple LLM chain and execute the query
+	if (!outputParsers.length) {
+		return await createSimpleLLMChain(context, llm, query, chatTemplate);
+	}
+
+	// If there's only one output parser, use it; otherwise, create a combined output parser
+	const combinedOutputParser =
+		outputParsers.length === 1 ? outputParsers[0] : new CombiningOutputParser(...outputParsers);
+
+	const formatInstructions = combinedOutputParser.getFormatInstructions();
+
+	// Create a prompt template incorporating the format instructions and query
+	const prompt = await getChainPromptTemplate(
+		context,
+		itemIndex,
+		llm,
+		messages,
+		formatInstructions,
+		query,
+	);
+
+	const chain = prompt.pipe(llm).pipe(combinedOutputParser);
+	const response = (await chain.withConfig(getTracingConfig(context)).invoke({ query })) as
+		| string
+		| string[];
+
+	return Array.isArray(response) ? response : [response];
+}
+
+function getInputs(parameters: IDataObject) {
+	const hasOutputParser = parameters?.hasOutputParser;
+	const inputs = [
+		{ displayName: '', type: NodeConnectionType.Main },
+		{
+			displayName: 'Model',
+			maxConnections: 1,
+			type: NodeConnectionType.AiLanguageModel,
+			required: true,
+		},
+	];
+
+	// If `hasOutputParser` is undefined it must be version 1.3 or earlier so we
+	// always add the output parser input
+	if (hasOutputParser === undefined || hasOutputParser === true) {
+		inputs.push({ displayName: 'Output Parser', type: NodeConnectionType.AiOutputParser });
+	}
+	return inputs;
+}
+
+export class ChainLlm implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Basic LLM Chain',
+		name: 'chainLlm',
+		icon: 'fa:link',
+		group: ['transform'],
+		version: [1, 1.1, 1.2, 1.3, 1.4],
+		description: 'A simple chain to prompt a large language model',
+		defaults: {
+			name: 'Basic LLM Chain',
+			color: '#909298',
+		},
+		codex: {
+			alias: ['LangChain'],
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Chains'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/root-nodes/n8n-nodes-langchain.chainllm/',
+					},
+				],
+			},
+		},
+		inputs: `={{ ((parameter) => { ${getInputs.toString()}; return getInputs(parameter) })($parameter) }}`,
+		outputs: [NodeConnectionType.Main],
+		credentials: [],
+		properties: [
+			getTemplateNoticeField(1978),
+			{
+				displayName: 'Prompt',
+				name: 'prompt',
+				type: 'string',
+				required: true,
+				default: '={{ $json.input }}',
+				displayOptions: {
+					show: {
+						'@version': [1],
+					},
+				},
+			},
+			{
+				displayName: 'Prompt',
+				name: 'prompt',
+				type: 'string',
+				required: true,
+				default: '={{ $json.chat_input }}',
+				displayOptions: {
+					show: {
+						'@version': [1.1, 1.2],
+					},
+				},
+			},
+			{
+				displayName: 'Prompt',
+				name: 'prompt',
+				type: 'string',
+				required: true,
+				default: '={{ $json.chatInput }}',
+				displayOptions: {
+					show: {
+						'@version': [1.3],
+					},
+				},
+			},
+			{
+				displayName: 'Prompt',
+				name: 'promptType',
+				type: 'options',
+				options: [
+					{
+						// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+						name: 'Take from previous node automatically',
+						value: 'auto',
+						description: 'Looks for an input field called chatInput',
+					},
+					{
+						// 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',
+					},
+				],
+				displayOptions: {
+					hide: {
+						'@version': [1, 1.1, 1.2, 1.3],
+					},
+				},
+				default: 'auto',
+			},
+			{
+				displayName: 'Text',
+				name: 'text',
+				type: 'string',
+				required: true,
+				default: '',
+				placeholder: 'e.g. Hello, how can you help me?',
+				typeOptions: {
+					rows: 2,
+				},
+				displayOptions: {
+					show: {
+						promptType: ['define'],
+					},
+				},
+			},
+			{
+				displayName: 'Require Specific Output Format',
+				name: 'hasOutputParser',
+				type: 'boolean',
+				default: false,
+				noDataExpression: true,
+				displayOptions: {
+					hide: {
+						'@version': [1, 1.1, 1.3],
+					},
+				},
+			},
+			{
+				displayName: 'Chat Messages (if Using a Chat Model)',
+				name: 'messages',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: true,
+				},
+				default: {},
+				placeholder: 'Add prompt',
+				options: [
+					{
+						name: 'messageValues',
+						displayName: 'Prompt',
+						values: [
+							{
+								displayName: 'Type Name or ID',
+								name: 'type',
+								type: 'options',
+								options: [
+									{
+										name: 'AI',
+										value: AIMessagePromptTemplate.lc_name(),
+									},
+									{
+										name: 'System',
+										value: SystemMessagePromptTemplate.lc_name(),
+									},
+									{
+										name: 'User',
+										value: HumanMessagePromptTemplate.lc_name(),
+									},
+								],
+								default: SystemMessagePromptTemplate.lc_name(),
+							},
+							{
+								displayName: 'Message Type',
+								name: 'messageType',
+								type: 'options',
+								displayOptions: {
+									show: {
+										type: [HumanMessagePromptTemplate.lc_name()],
+									},
+								},
+								options: [
+									{
+										name: 'Text',
+										value: 'text',
+										description: 'Simple text message',
+									},
+									{
+										name: 'Image (Binary)',
+										value: 'imageBinary',
+										description: 'Process the binary input from the previous node',
+									},
+									{
+										name: 'Image (URL)',
+										value: 'imageUrl',
+										description: 'Process the image from the specified URL',
+									},
+								],
+								default: 'text',
+							},
+							{
+								displayName: 'Image Data Field Name',
+								name: 'binaryImageDataKey',
+								type: 'string',
+								default: 'data',
+								required: true,
+								description:
+									'The name of the field in the chain’s input that contains the binary image file to be processed',
+								displayOptions: {
+									show: {
+										messageType: ['imageBinary'],
+									},
+								},
+							},
+							{
+								displayName: 'Image URL',
+								name: 'imageUrl',
+								type: 'string',
+								default: '',
+								required: true,
+								description: 'URL to the image to be processed',
+								displayOptions: {
+									show: {
+										messageType: ['imageUrl'],
+									},
+								},
+							},
+							{
+								displayName: 'Image Details',
+								description:
+									'Control how the model processes the image and generates its textual understanding',
+								name: 'imageDetail',
+								type: 'options',
+								displayOptions: {
+									show: {
+										type: [HumanMessagePromptTemplate.lc_name()],
+										messageType: ['imageBinary', 'imageUrl'],
+									},
+								},
+								options: [
+									{
+										name: 'Auto',
+										value: 'auto',
+										description:
+											'Model will use the auto setting which will look at the image input size and decide if it should use the low or high setting',
+									},
+									{
+										name: 'Low',
+										value: 'low',
+										description:
+											'The model will receive a low-res 512px x 512px version of the image, and represent the image with a budget of 65 tokens. This allows the API to return faster responses and consume fewer input tokens for use cases that do not require high detail.',
+									},
+									{
+										name: 'High',
+										value: 'high',
+										description:
+											'Allows the model to see the low res image and then creates detailed crops of input images as 512px squares based on the input image size. Each of the detailed crops uses twice the token budget (65 tokens) for a total of 129 tokens.',
+									},
+								],
+								default: 'auto',
+							},
+
+							{
+								displayName: 'Message',
+								name: 'message',
+								type: 'string',
+								required: true,
+								displayOptions: {
+									hide: {
+										messageType: ['imageBinary', 'imageUrl'],
+									},
+								},
+								default: '',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: `Connect an <a data-action='openSelectiveNodeCreator' data-action-parameter-connectiontype='${NodeConnectionType.AiOutputParser}'>output parser</a> on the canvas to specify the output format you require`,
+				name: 'notice',
+				type: 'notice',
+				default: '',
+				displayOptions: {
+					show: {
+						hasOutputParser: [true],
+					},
+				},
+			},
+		],
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		this.logger.verbose('Executing LLM Chain');
+		const items = this.getInputData();
+
+		const returnData: INodeExecutionData[] = [];
+		const llm = (await this.getInputConnectionData(
+			NodeConnectionType.AiLanguageModel,
+			0,
+		)) as BaseLanguageModel;
+
+		const outputParsers = await getOptionalOutputParsers(this);
+
+		for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
+			try {
+				let prompt: string;
+				if (this.getNode().typeVersion <= 1.3) {
+					prompt = this.getNodeParameter('prompt', itemIndex) as string;
+				} else {
+					prompt = getPromptInputByType({
+						ctx: this,
+						i: itemIndex,
+						inputKey: 'text',
+						promptTypeKey: 'promptType',
+					});
+				}
+				const messages = this.getNodeParameter(
+					'messages.messageValues',
+					itemIndex,
+					[],
+				) as MessagesTemplate[];
+
+				if (prompt === undefined) {
+					throw new NodeOperationError(this.getNode(), "The 'prompt' parameter is empty.");
+				}
+
+				const responses = await getChain(this, itemIndex, prompt, llm, outputParsers, messages);
+
+				responses.forEach((response) => {
+					let data: IDataObject;
+					if (typeof response === 'string') {
+						data = {
+							response: {
+								text: response.trim(),
+							},
+						};
+					} else if (Array.isArray(response)) {
+						data = {
+							data: response,
+						};
+					} else if (response instanceof Object) {
+						data = response as IDataObject;
+					} else {
+						data = {
+							response: {
+								text: response,
+							},
+						};
+					}
+
+					returnData.push({
+						json: data,
+					});
+				});
+			} catch (error) {
+				if (this.continueOnFail()) {
+					returnData.push({ json: { error: error.message }, pairedItem: { item: itemIndex } });
+					continue;
+				}
+
+				throw error;
+			}
+		}
+
+		return [returnData];
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/chains/ChainRetrievalQA/ChainRetrievalQa.node.ts b/packages/@n8n/nodes-langchain/nodes/chains/ChainRetrievalQA/ChainRetrievalQa.node.ts
new file mode 100644
index 0000000000000..cc5cba5b7ca9c
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/chains/ChainRetrievalQA/ChainRetrievalQa.node.ts
@@ -0,0 +1,194 @@
+import {
+	NodeConnectionType,
+	type IExecuteFunctions,
+	type INodeExecutionData,
+	type INodeType,
+	type INodeTypeDescription,
+	NodeOperationError,
+} from 'n8n-workflow';
+
+import { RetrievalQAChain } from 'langchain/chains';
+import type { BaseLanguageModel } from '@langchain/core/language_models/base';
+import type { BaseRetriever } from '@langchain/core/retrievers';
+import { getTemplateNoticeField } from '../../../utils/sharedFields';
+import { getPromptInputByType } from '../../../utils/helpers';
+import { getTracingConfig } from '../../../utils/tracing';
+
+export class ChainRetrievalQa implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Question and Answer Chain',
+		name: 'chainRetrievalQa',
+		icon: 'fa:link',
+		group: ['transform'],
+		version: [1, 1.1, 1.2, 1.3],
+		description: 'Answer questions about retrieved documents',
+		defaults: {
+			name: 'Question and Answer Chain',
+			color: '#909298',
+		},
+		codex: {
+			alias: ['LangChain'],
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Chains'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/root-nodes/n8n-nodes-langchain.chainretrievalqa/',
+					},
+				],
+			},
+		},
+		// eslint-disable-next-line n8n-nodes-base/node-class-description-inputs-wrong-regular-node
+		inputs: [
+			NodeConnectionType.Main,
+			{
+				displayName: 'Model',
+				maxConnections: 1,
+				type: NodeConnectionType.AiLanguageModel,
+				required: true,
+			},
+			{
+				displayName: 'Retriever',
+				maxConnections: 1,
+				type: NodeConnectionType.AiRetriever,
+				required: true,
+			},
+		],
+		outputs: [NodeConnectionType.Main],
+		credentials: [],
+		properties: [
+			getTemplateNoticeField(1960),
+			{
+				displayName: 'Query',
+				name: 'query',
+				type: 'string',
+				required: true,
+				default: '={{ $json.input }}',
+				displayOptions: {
+					show: {
+						'@version': [1],
+					},
+				},
+			},
+			{
+				displayName: 'Query',
+				name: 'query',
+				type: 'string',
+				required: true,
+				default: '={{ $json.chat_input }}',
+				displayOptions: {
+					show: {
+						'@version': [1.1],
+					},
+				},
+			},
+			{
+				displayName: 'Query',
+				name: 'query',
+				type: 'string',
+				required: true,
+				default: '={{ $json.chatInput }}',
+				displayOptions: {
+					show: {
+						'@version': [1.2],
+					},
+				},
+			},
+			{
+				displayName: 'Prompt',
+				name: 'promptType',
+				type: 'options',
+				options: [
+					{
+						// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+						name: 'Take from previous node automatically',
+						value: 'auto',
+						description: 'Looks for an input field called chatInput',
+					},
+					{
+						// 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',
+					},
+				],
+				displayOptions: {
+					hide: {
+						'@version': [{ _cnd: { lte: 1.2 } }],
+					},
+				},
+				default: 'auto',
+			},
+			{
+				displayName: 'Text',
+				name: 'text',
+				type: 'string',
+				required: true,
+				default: '',
+				typeOptions: {
+					rows: 2,
+				},
+				displayOptions: {
+					show: {
+						promptType: ['define'],
+					},
+				},
+			},
+		],
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		this.logger.verbose('Executing Retrieval QA Chain');
+
+		const model = (await this.getInputConnectionData(
+			NodeConnectionType.AiLanguageModel,
+			0,
+		)) as BaseLanguageModel;
+
+		const retriever = (await this.getInputConnectionData(
+			NodeConnectionType.AiRetriever,
+			0,
+		)) as BaseRetriever;
+
+		const items = this.getInputData();
+		const chain = RetrievalQAChain.fromLLM(model, retriever);
+
+		const returnData: INodeExecutionData[] = [];
+
+		// Run for each item
+		for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
+			try {
+				let query;
+
+				if (this.getNode().typeVersion <= 1.2) {
+					query = this.getNodeParameter('query', itemIndex) as string;
+				} else {
+					query = getPromptInputByType({
+						ctx: this,
+						i: itemIndex,
+						inputKey: 'text',
+						promptTypeKey: 'promptType',
+					});
+				}
+
+				if (query === undefined) {
+					throw new NodeOperationError(this.getNode(), 'The ‘query‘ parameter is empty.');
+				}
+
+				const response = await chain.withConfig(getTracingConfig(this)).invoke({ query });
+				returnData.push({ json: { response } });
+			} catch (error) {
+				if (this.continueOnFail()) {
+					returnData.push({ json: { error: error.message }, pairedItem: { item: itemIndex } });
+					continue;
+				}
+
+				throw error;
+			}
+		}
+		return await this.prepareOutputData(returnData);
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/chains/ChainSummarization/ChainSummarization.node.ts b/packages/@n8n/nodes-langchain/nodes/chains/ChainSummarization/ChainSummarization.node.ts
new file mode 100644
index 0000000000000..8cc64c6e4f734
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/chains/ChainSummarization/ChainSummarization.node.ts
@@ -0,0 +1,39 @@
+import type { INodeTypeBaseDescription, IVersionedNodeType } from 'n8n-workflow';
+import { VersionedNodeType } from 'n8n-workflow';
+
+import { ChainSummarizationV1 } from './V1/ChainSummarizationV1.node';
+import { ChainSummarizationV2 } from './V2/ChainSummarizationV2.node';
+
+export class ChainSummarization extends VersionedNodeType {
+	constructor() {
+		const baseDescription: INodeTypeBaseDescription = {
+			displayName: 'Summarization Chain',
+			name: 'chainSummarization',
+			icon: 'fa:link',
+			group: ['transform'],
+			description: 'Transforms text into a concise summary',
+			codex: {
+				alias: ['LangChain'],
+				categories: ['AI'],
+				subcategories: {
+					AI: ['Chains'],
+				},
+				resources: {
+					primaryDocumentation: [
+						{
+							url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/root-nodes/n8n-nodes-langchain.chainsummarization/',
+						},
+					],
+				},
+			},
+			defaultVersion: 2,
+		};
+
+		const nodeVersions: IVersionedNodeType['nodeVersions'] = {
+			1: new ChainSummarizationV1(baseDescription),
+			2: new ChainSummarizationV2(baseDescription),
+		};
+
+		super(nodeVersions, baseDescription);
+	}
+}
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
new file mode 100644
index 0000000000000..a5d19432774e8
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/chains/ChainSummarization/V1/ChainSummarizationV1.node.ts
@@ -0,0 +1,263 @@
+import {
+	NodeConnectionType,
+	type INodeTypeBaseDescription,
+	type IExecuteFunctions,
+	type INodeExecutionData,
+	type INodeType,
+	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 { REFINE_PROMPT_TEMPLATE, DEFAULT_PROMPT_TEMPLATE } from '../prompt';
+
+export class ChainSummarizationV1 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			version: 1,
+			defaults: {
+				name: 'Summarization Chain',
+				color: '#909298',
+			},
+			// eslint-disable-next-line n8n-nodes-base/node-class-description-inputs-wrong-regular-node
+			inputs: [
+				NodeConnectionType.Main,
+				{
+					displayName: 'Model',
+					maxConnections: 1,
+					type: NodeConnectionType.AiLanguageModel,
+					required: true,
+				},
+				{
+					displayName: 'Document',
+					maxConnections: 1,
+					type: NodeConnectionType.AiDocument,
+					required: true,
+				},
+			],
+			outputs: [NodeConnectionType.Main],
+			credentials: [],
+			properties: [
+				getTemplateNoticeField(1951),
+				{
+					displayName: 'Type',
+					name: 'type',
+					type: 'options',
+					description: 'The type of summarization to run',
+					default: 'map_reduce',
+					options: [
+						{
+							name: 'Map Reduce (Recommended)',
+							value: 'map_reduce',
+							description:
+								'Summarize each document (or chunk) individually, then summarize those summaries',
+						},
+						{
+							name: 'Refine',
+							value: 'refine',
+							description:
+								'Summarize the first document (or chunk). Then update that summary based on the next document (or chunk), and repeat.',
+						},
+						{
+							name: 'Stuff',
+							value: 'stuff',
+							description: 'Pass all documents (or chunks) at once. Ideal for small datasets.',
+						},
+					],
+				},
+				{
+					displayName: 'Options',
+					name: 'options',
+					type: 'collection',
+					default: {},
+					placeholder: 'Add Option',
+					options: [
+						{
+							displayName: 'Final Prompt to Combine',
+							name: 'combineMapPrompt',
+							type: 'string',
+							hint: 'The prompt to combine individual summaries',
+							displayOptions: {
+								show: {
+									'/type': ['map_reduce'],
+								},
+							},
+							default: DEFAULT_PROMPT_TEMPLATE,
+							typeOptions: {
+								rows: 6,
+							},
+						},
+						{
+							displayName: 'Individual Summary Prompt',
+							name: 'prompt',
+							type: 'string',
+							default: DEFAULT_PROMPT_TEMPLATE,
+							hint: 'The prompt to summarize an individual document (or chunk)',
+							displayOptions: {
+								show: {
+									'/type': ['map_reduce'],
+								},
+							},
+							typeOptions: {
+								rows: 6,
+							},
+						},
+						{
+							displayName: 'Prompt',
+							name: 'prompt',
+							type: 'string',
+							default: DEFAULT_PROMPT_TEMPLATE,
+							displayOptions: {
+								show: {
+									'/type': ['stuff'],
+								},
+							},
+							typeOptions: {
+								rows: 6,
+							},
+						},
+						{
+							displayName: 'Subsequent (Refine) Prompt',
+							name: 'refinePrompt',
+							type: 'string',
+							displayOptions: {
+								show: {
+									'/type': ['refine'],
+								},
+							},
+							default: REFINE_PROMPT_TEMPLATE,
+							hint: 'The prompt to refine the summary based on the next document (or chunk)',
+							typeOptions: {
+								rows: 6,
+							},
+						},
+						{
+							displayName: 'Initial Prompt',
+							name: 'refineQuestionPrompt',
+							type: 'string',
+							displayOptions: {
+								show: {
+									'/type': ['refine'],
+								},
+							},
+							default: DEFAULT_PROMPT_TEMPLATE,
+							hint: 'The prompt for the first document (or chunk)',
+							typeOptions: {
+								rows: 6,
+							},
+						},
+					],
+				},
+			],
+		};
+	}
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		this.logger.verbose('Executing Vector Store QA Chain');
+		const type = this.getNodeParameter('type', 0) as 'map_reduce' | 'stuff' | 'refine';
+
+		const model = (await this.getInputConnectionData(
+			NodeConnectionType.AiLanguageModel,
+			0,
+		)) as BaseLanguageModel;
+
+		const documentInput = (await this.getInputConnectionData(NodeConnectionType.AiDocument, 0)) as
+			| N8nJsonLoader
+			| Array<Document<Record<string, unknown>>>;
+
+		const options = this.getNodeParameter('options', 0, {}) as {
+			prompt?: string;
+			refineQuestionPrompt?: string;
+			refinePrompt?: string;
+			combineMapPrompt?: string;
+		};
+
+		const chainArgs: SummarizationChainParams = {
+			type,
+		};
+
+		// Map reduce prompt override
+		if (type === 'map_reduce') {
+			const mapReduceArgs = chainArgs as SummarizationChainParams & {
+				type: 'map_reduce';
+			};
+			if (options.combineMapPrompt) {
+				mapReduceArgs.combineMapPrompt = new PromptTemplate({
+					template: options.combineMapPrompt,
+					inputVariables: ['text'],
+				});
+			}
+			if (options.prompt) {
+				mapReduceArgs.combinePrompt = new PromptTemplate({
+					template: options.prompt,
+					inputVariables: ['text'],
+				});
+			}
+		}
+
+		// Stuff prompt override
+		if (type === 'stuff') {
+			const stuffArgs = chainArgs as SummarizationChainParams & {
+				type: 'stuff';
+			};
+			if (options.prompt) {
+				stuffArgs.prompt = new PromptTemplate({
+					template: options.prompt,
+					inputVariables: ['text'],
+				});
+			}
+		}
+
+		// Refine prompt override
+		if (type === 'refine') {
+			const refineArgs = chainArgs as SummarizationChainParams & {
+				type: 'refine';
+			};
+
+			if (options.refinePrompt) {
+				refineArgs.refinePrompt = new PromptTemplate({
+					template: options.refinePrompt,
+					inputVariables: ['existing_answer', 'text'],
+				});
+			}
+
+			if (options.refineQuestionPrompt) {
+				refineArgs.questionPrompt = new PromptTemplate({
+					template: options.refineQuestionPrompt,
+					inputVariables: ['text'],
+				});
+			}
+		}
+
+		const chain = loadSummarizationChain(model, chainArgs);
+
+		const items = this.getInputData();
+		const returnData: INodeExecutionData[] = [];
+
+		for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
+			let processedDocuments: Document[];
+			if (documentInput instanceof N8nJsonLoader || documentInput instanceof N8nBinaryLoader) {
+				processedDocuments = await documentInput.processItem(items[itemIndex], itemIndex);
+			} else {
+				processedDocuments = documentInput;
+			}
+
+			const response = await chain.call({
+				input_documents: processedDocuments,
+			});
+
+			returnData.push({ json: { response } });
+		}
+
+		return await this.prepareOutputData(returnData);
+	}
+}
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
new file mode 100644
index 0000000000000..9d05b0a7c5115
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/chains/ChainSummarization/V2/ChainSummarizationV2.node.ts
@@ -0,0 +1,430 @@
+import { NodeConnectionType } from 'n8n-workflow';
+import type {
+	INodeTypeBaseDescription,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+	IDataObject,
+} from 'n8n-workflow';
+
+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/text_splitter';
+import { RecursiveCharacterTextSplitter } from 'langchain/text_splitter';
+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';
+
+function getInputs(parameters: IDataObject) {
+	const chunkingMode = parameters?.chunkingMode;
+	const operationMode = parameters?.operationMode;
+	const inputs = [
+		{ displayName: '', type: NodeConnectionType.Main },
+		{
+			displayName: 'Model',
+			maxConnections: 1,
+			type: NodeConnectionType.AiLanguageModel,
+			required: true,
+		},
+	];
+
+	if (operationMode === 'documentLoader') {
+		inputs.push({
+			displayName: 'Document',
+			type: NodeConnectionType.AiDocument,
+			required: true,
+			maxConnections: 1,
+		});
+		return inputs;
+	}
+
+	if (chunkingMode === 'advanced') {
+		inputs.push({
+			displayName: 'Text Splitter',
+			type: NodeConnectionType.AiTextSplitter,
+			required: false,
+			maxConnections: 1,
+		});
+		return inputs;
+	}
+	return inputs;
+}
+
+export class ChainSummarizationV2 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			version: [2],
+			defaults: {
+				name: 'Summarization Chain',
+				color: '#909298',
+			},
+			// eslint-disable-next-line n8n-nodes-base/node-class-description-inputs-wrong-regular-node
+			inputs: `={{ ((parameter) => { ${getInputs.toString()}; return getInputs(parameter) })($parameter) }}`,
+			outputs: [NodeConnectionType.Main],
+			credentials: [],
+			properties: [
+				getTemplateNoticeField(1951),
+				{
+					displayName: 'Data to Summarize',
+					name: 'operationMode',
+					noDataExpression: true,
+					type: 'options',
+					description: 'How to pass data into the summarization chain',
+					default: 'nodeInputJson',
+					options: [
+						{
+							name: 'Use Node Input (JSON)',
+							value: 'nodeInputJson',
+							description: 'Summarize the JSON data coming into this node from the previous one',
+						},
+						{
+							name: 'Use Node Input (Binary)',
+							value: 'nodeInputBinary',
+							description: 'Summarize the binary data coming into this node from the previous one',
+						},
+						{
+							name: 'Use Document Loader',
+							value: 'documentLoader',
+							description: 'Use a loader sub-node with more configuration options',
+						},
+					],
+				},
+				{
+					displayName: 'Chunking Strategy',
+					name: 'chunkingMode',
+					noDataExpression: true,
+					type: 'options',
+					description: 'Chunk splitting strategy',
+					default: 'simple',
+					options: [
+						{
+							name: 'Simple (Define Below)',
+							value: 'simple',
+						},
+						{
+							name: 'Advanced',
+							value: 'advanced',
+							description: 'Use a splitter sub-node with more configuration options',
+						},
+					],
+					displayOptions: {
+						show: {
+							'/operationMode': ['nodeInputJson', 'nodeInputBinary'],
+						},
+					},
+				},
+				{
+					displayName: 'Characters Per Chunk',
+					name: 'chunkSize',
+					description:
+						'Controls the max size (in terms of number of characters) of the final document chunk',
+					type: 'number',
+					default: 1000,
+					displayOptions: {
+						show: {
+							'/chunkingMode': ['simple'],
+						},
+					},
+				},
+				{
+					displayName: 'Chunk Overlap (Characters)',
+					name: 'chunkOverlap',
+					type: 'number',
+					description: 'Specifies how much characters overlap there should be between chunks',
+					default: 200,
+					displayOptions: {
+						show: {
+							'/chunkingMode': ['simple'],
+						},
+					},
+				},
+				{
+					displayName: 'Options',
+					name: 'options',
+					type: 'collection',
+					default: {},
+					placeholder: 'Add Option',
+					options: [
+						{
+							displayName: 'Input Data Field Name',
+							name: 'binaryDataKey',
+							type: 'string',
+							default: 'data',
+							description:
+								'The name of the field in the agent or chain’s input that contains the binary file to be processed',
+							displayOptions: {
+								show: {
+									'/operationMode': ['nodeInputBinary'],
+								},
+							},
+						},
+						{
+							displayName: 'Summarization Method and Prompts',
+							name: 'summarizationMethodAndPrompts',
+							type: 'fixedCollection',
+							default: {
+								values: {
+									summarizationMethod: 'map_reduce',
+									prompt: DEFAULT_PROMPT_TEMPLATE,
+									combineMapPrompt: DEFAULT_PROMPT_TEMPLATE,
+								},
+							},
+							placeholder: 'Add Option',
+							typeOptions: {},
+							options: [
+								{
+									name: 'values',
+									displayName: 'Values',
+									values: [
+										{
+											displayName: 'Summarization Method',
+											name: 'summarizationMethod',
+											type: 'options',
+											description: 'The type of summarization to run',
+											default: 'map_reduce',
+											options: [
+												{
+													name: 'Map Reduce (Recommended)',
+													value: 'map_reduce',
+													description:
+														'Summarize each document (or chunk) individually, then summarize those summaries',
+												},
+												{
+													name: 'Refine',
+													value: 'refine',
+													description:
+														'Summarize the first document (or chunk). Then update that summary based on the next document (or chunk), and repeat.',
+												},
+												{
+													name: 'Stuff',
+													value: 'stuff',
+													description:
+														'Pass all documents (or chunks) at once. Ideal for small datasets.',
+												},
+											],
+										},
+										{
+											displayName: 'Individual Summary Prompt',
+											name: 'combineMapPrompt',
+											type: 'string',
+											hint: 'The prompt to summarize an individual document (or chunk)',
+											displayOptions: {
+												hide: {
+													'/options.summarizationMethodAndPrompts.values.summarizationMethod': [
+														'stuff',
+														'refine',
+													],
+												},
+											},
+											default: DEFAULT_PROMPT_TEMPLATE,
+											typeOptions: {
+												rows: 9,
+											},
+										},
+										{
+											displayName: 'Final Prompt to Combine',
+											name: 'prompt',
+											type: 'string',
+											default: DEFAULT_PROMPT_TEMPLATE,
+											hint: 'The prompt to combine individual summaries',
+											displayOptions: {
+												hide: {
+													'/options.summarizationMethodAndPrompts.values.summarizationMethod': [
+														'stuff',
+														'refine',
+													],
+												},
+											},
+											typeOptions: {
+												rows: 9,
+											},
+										},
+										{
+											displayName: 'Prompt',
+											name: 'prompt',
+											type: 'string',
+											default: DEFAULT_PROMPT_TEMPLATE,
+											displayOptions: {
+												hide: {
+													'/options.summarizationMethodAndPrompts.values.summarizationMethod': [
+														'refine',
+														'map_reduce',
+													],
+												},
+											},
+											typeOptions: {
+												rows: 9,
+											},
+										},
+										{
+											displayName: 'Subsequent (Refine) Prompt',
+											name: 'refinePrompt',
+											type: 'string',
+											displayOptions: {
+												hide: {
+													'/options.summarizationMethodAndPrompts.values.summarizationMethod': [
+														'stuff',
+														'map_reduce',
+													],
+												},
+											},
+											default: REFINE_PROMPT_TEMPLATE,
+											hint: 'The prompt to refine the summary based on the next document (or chunk)',
+											typeOptions: {
+												rows: 9,
+											},
+										},
+										{
+											displayName: 'Initial Prompt',
+											name: 'refineQuestionPrompt',
+											type: 'string',
+											displayOptions: {
+												hide: {
+													'/options.summarizationMethodAndPrompts.values.summarizationMethod': [
+														'stuff',
+														'map_reduce',
+													],
+												},
+											},
+											default: DEFAULT_PROMPT_TEMPLATE,
+											hint: 'The prompt for the first document (or chunk)',
+											typeOptions: {
+												rows: 9,
+											},
+										},
+									],
+								},
+							],
+						},
+					],
+				},
+			],
+		};
+	}
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		this.logger.verbose('Executing Summarization Chain V2');
+		const operationMode = this.getNodeParameter('operationMode', 0, 'nodeInputJson') as
+			| 'nodeInputJson'
+			| 'nodeInputBinary'
+			| 'documentLoader';
+		const chunkingMode = this.getNodeParameter('chunkingMode', 0, 'simple') as
+			| 'simple'
+			| 'advanced';
+
+		const model = (await this.getInputConnectionData(
+			NodeConnectionType.AiLanguageModel,
+			0,
+		)) as BaseLanguageModel;
+
+		const items = this.getInputData();
+		const returnData: INodeExecutionData[] = [];
+
+		for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
+			try {
+				const summarizationMethodAndPrompts = this.getNodeParameter(
+					'options.summarizationMethodAndPrompts.values',
+					itemIndex,
+					{},
+				) as {
+					prompt?: string;
+					refineQuestionPrompt?: string;
+					refinePrompt?: string;
+					summarizationMethod: 'map_reduce' | 'stuff' | 'refine';
+					combineMapPrompt?: string;
+				};
+
+				const chainArgs = getChainPromptsArgs(
+					summarizationMethodAndPrompts.summarizationMethod ?? 'map_reduce',
+					summarizationMethodAndPrompts,
+				);
+
+				const chain = loadSummarizationChain(model, chainArgs);
+				const item = items[itemIndex];
+
+				let processedDocuments: Document[];
+
+				// Use dedicated document loader input to load documents
+				if (operationMode === 'documentLoader') {
+					const documentInput = (await this.getInputConnectionData(
+						NodeConnectionType.AiDocument,
+						0,
+					)) as N8nJsonLoader | Array<Document<Record<string, unknown>>>;
+
+					const isN8nLoader =
+						documentInput instanceof N8nJsonLoader || documentInput instanceof N8nBinaryLoader;
+
+					processedDocuments = isN8nLoader
+						? await documentInput.processItem(item, itemIndex)
+						: documentInput;
+
+					const response = await chain.withConfig(getTracingConfig(this)).invoke({
+						input_documents: processedDocuments,
+					});
+
+					returnData.push({ json: { response } });
+				}
+
+				// Take the input and use binary or json loader
+				if (['nodeInputJson', 'nodeInputBinary'].includes(operationMode)) {
+					let textSplitter: TextSplitter | undefined;
+
+					switch (chunkingMode) {
+						// In simple mode we use recursive character splitter with default settings
+						case 'simple':
+							const chunkSize = this.getNodeParameter('chunkSize', itemIndex, 1000) as number;
+							const chunkOverlap = this.getNodeParameter('chunkOverlap', itemIndex, 200) as number;
+
+							textSplitter = new RecursiveCharacterTextSplitter({ chunkOverlap, chunkSize });
+							break;
+
+						// In advanced mode user can connect text splitter node so we just retrieve it
+						case 'advanced':
+							textSplitter = (await this.getInputConnectionData(
+								NodeConnectionType.AiTextSplitter,
+								0,
+							)) as TextSplitter | undefined;
+							break;
+						default:
+							break;
+					}
+
+					let processor: N8nJsonLoader | N8nBinaryLoader;
+					if (operationMode === 'nodeInputBinary') {
+						const binaryDataKey = this.getNodeParameter(
+							'options.binaryDataKey',
+							itemIndex,
+							'data',
+						) as string;
+						processor = new N8nBinaryLoader(this, 'options.', binaryDataKey, textSplitter);
+					} else {
+						processor = new N8nJsonLoader(this, 'options.', textSplitter);
+					}
+
+					const processedItem = await processor.processItem(item, itemIndex);
+					const response = await chain.call({
+						input_documents: processedItem,
+					});
+					returnData.push({ json: { response } });
+				}
+			} catch (error) {
+				if (this.continueOnFail()) {
+					returnData.push({ json: { error: error.message }, pairedItem: { item: itemIndex } });
+					continue;
+				}
+
+				throw error;
+			}
+		}
+
+		return await this.prepareOutputData(returnData);
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/chains/ChainSummarization/helpers.ts b/packages/@n8n/nodes-langchain/nodes/chains/ChainSummarization/helpers.ts
new file mode 100644
index 0000000000000..2a00d836e8f87
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/chains/ChainSummarization/helpers.ts
@@ -0,0 +1,71 @@
+import type { SummarizationChainParams } from 'langchain/chains';
+import { PromptTemplate } from '@langchain/core/prompts';
+interface ChainTypeOptions {
+	combineMapPrompt?: string;
+	prompt?: string;
+	refinePrompt?: string;
+	refineQuestionPrompt?: string;
+}
+
+export function getChainPromptsArgs(
+	type: 'stuff' | 'map_reduce' | 'refine',
+	options: ChainTypeOptions,
+) {
+	const chainArgs: SummarizationChainParams = {
+		type,
+	};
+	// Map reduce prompt override
+	if (type === 'map_reduce') {
+		const mapReduceArgs = chainArgs as SummarizationChainParams & {
+			type: 'map_reduce';
+		};
+		if (options.combineMapPrompt) {
+			mapReduceArgs.combineMapPrompt = new PromptTemplate({
+				template: options.combineMapPrompt,
+				inputVariables: ['text'],
+			});
+		}
+		if (options.prompt) {
+			mapReduceArgs.combinePrompt = new PromptTemplate({
+				template: options.prompt,
+				inputVariables: ['text'],
+			});
+		}
+	}
+
+	// Stuff prompt override
+	if (type === 'stuff') {
+		const stuffArgs = chainArgs as SummarizationChainParams & {
+			type: 'stuff';
+		};
+		if (options.prompt) {
+			stuffArgs.prompt = new PromptTemplate({
+				template: options.prompt,
+				inputVariables: ['text'],
+			});
+		}
+	}
+
+	// Refine prompt override
+	if (type === 'refine') {
+		const refineArgs = chainArgs as SummarizationChainParams & {
+			type: 'refine';
+		};
+
+		if (options.refinePrompt) {
+			refineArgs.refinePrompt = new PromptTemplate({
+				template: options.refinePrompt,
+				inputVariables: ['existing_answer', 'text'],
+			});
+		}
+
+		if (options.refineQuestionPrompt) {
+			refineArgs.questionPrompt = new PromptTemplate({
+				template: options.refineQuestionPrompt,
+				inputVariables: ['text'],
+			});
+		}
+	}
+
+	return chainArgs;
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/chains/ChainSummarization/prompt.ts b/packages/@n8n/nodes-langchain/nodes/chains/ChainSummarization/prompt.ts
new file mode 100644
index 0000000000000..4908d59715f91
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/chains/ChainSummarization/prompt.ts
@@ -0,0 +1,20 @@
+export const REFINE_PROMPT_TEMPLATE = `Your job is to produce a final summary
+We have provided an existing summary up to a certain point: "{existing_answer}"
+We have the opportunity to refine the existing summary
+(only if needed) with some more context below.
+------------
+"{text}"
+------------
+
+Given the new context, refine the original summary
+If the context isn't useful, return the original summary.
+
+REFINED SUMMARY:`;
+
+export const DEFAULT_PROMPT_TEMPLATE = `Write a concise summary of the following:
+
+
+"{text}"
+
+
+CONCISE SUMMARY:`;
diff --git a/packages/@n8n/nodes-langchain/nodes/code/Code.node.ts b/packages/@n8n/nodes-langchain/nodes/code/Code.node.ts
new file mode 100644
index 0000000000000..be15860b27970
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/code/Code.node.ts
@@ -0,0 +1,368 @@
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import {
+	NodeOperationError,
+	type IExecuteFunctions,
+	type INodeExecutionData,
+	type INodeType,
+	type INodeTypeDescription,
+	type INodeOutputConfiguration,
+	type SupplyData,
+	NodeConnectionType,
+} from 'n8n-workflow';
+
+// 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';
+
+const { NODE_FUNCTION_ALLOW_BUILTIN: builtIn, NODE_FUNCTION_ALLOW_EXTERNAL: external } =
+	process.env;
+
+// TODO: Replace
+const connectorTypes = {
+	[NodeConnectionType.AiChain]: 'Chain',
+	[NodeConnectionType.AiDocument]: 'Document',
+	[NodeConnectionType.AiEmbedding]: 'Embedding',
+	[NodeConnectionType.AiLanguageModel]: 'Language Model',
+	[NodeConnectionType.AiMemory]: 'Memory',
+	[NodeConnectionType.AiOutputParser]: 'Output Parser',
+	[NodeConnectionType.AiTextSplitter]: 'Text Splitter',
+	[NodeConnectionType.AiTool]: 'Tool',
+	[NodeConnectionType.AiVectorStore]: 'Vector Store',
+	[NodeConnectionType.Main]: 'Main',
+};
+
+const defaultCodeExecute = `const { PromptTemplate } = require('@langchain/core/prompts');
+
+const query = 'Tell me a joke';
+const prompt = PromptTemplate.fromTemplate(query);
+const llm = await this.getInputConnectionData('ai_languageModel', 0);
+let chain = prompt.pipe(llm);
+const output = await chain.invoke();
+return [ {json: { output } } ];`;
+
+const defaultCodeSupplyData = `const { WikipediaQueryRun } = require('langchain/tools');
+return new WikipediaQueryRun();`;
+
+const langchainModules = ['langchain', '@langchain/*'];
+export const vmResolver = makeResolverFromLegacyOptions({
+	external: {
+		modules: external ? [...langchainModules, ...external.split(',')] : [...langchainModules],
+		transitive: false,
+	},
+	resolve(moduleName, parentDirname) {
+		if (moduleName.match(/^langchain\//) ?? moduleName.match(/^@langchain\//)) {
+			return require.resolve(`@n8n/n8n-nodes-langchain/node_modules/${moduleName}.cjs`, {
+				paths: [parentDirname],
+			});
+		}
+		return;
+	},
+	builtin: builtIn?.split(',') ?? [],
+});
+
+function getSandbox(
+	this: IExecuteFunctions,
+	code: string,
+	options?: { addItems?: boolean; itemIndex?: number },
+) {
+	const itemIndex = options?.itemIndex ?? 0;
+	const node = this.getNode();
+	const workflowMode = this.getMode();
+
+	const context = getSandboxContext.call(this, itemIndex);
+	// eslint-disable-next-line @typescript-eslint/unbound-method
+	context.addInputData = this.addInputData;
+	// eslint-disable-next-line @typescript-eslint/unbound-method
+	context.addOutputData = this.addOutputData;
+	// eslint-disable-next-line @typescript-eslint/unbound-method
+	context.getInputConnectionData = this.getInputConnectionData;
+	// eslint-disable-next-line @typescript-eslint/unbound-method
+	context.getInputData = this.getInputData;
+	// eslint-disable-next-line @typescript-eslint/unbound-method
+	context.getNode = this.getNode;
+	// eslint-disable-next-line @typescript-eslint/unbound-method
+	context.getExecutionCancelSignal = this.getExecutionCancelSignal;
+	// eslint-disable-next-line @typescript-eslint/unbound-method
+	context.getNodeOutputs = this.getNodeOutputs;
+	// eslint-disable-next-line @typescript-eslint/unbound-method
+	context.executeWorkflow = this.executeWorkflow;
+	// eslint-disable-next-line @typescript-eslint/unbound-method
+	context.logger = this.logger;
+
+	if (options?.addItems) {
+		context.items = context.$input.all();
+	}
+	// eslint-disable-next-line @typescript-eslint/unbound-method
+
+	const sandbox = new JavaScriptSandbox(context, code, itemIndex, this.helpers, {
+		resolver: vmResolver,
+	});
+
+	sandbox.on(
+		'output',
+		workflowMode === 'manual'
+			? this.sendMessageToUI.bind(this)
+			: (...args: unknown[]) =>
+					console.log(`[Workflow "${this.getWorkflow().id}"][Node "${node.name}"]`, ...args),
+	);
+	return sandbox;
+}
+
+export class Code implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'LangChain Code',
+		name: 'code',
+		icon: 'fa:code',
+		group: ['transform'],
+		version: 1,
+		description: 'LangChain Code Node',
+		defaults: {
+			name: 'LangChain Code',
+		},
+		codex: {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Miscellaneous'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/root-nodes/n8n-nodes-langchain.code/',
+					},
+				],
+			},
+		},
+		inputs: `={{ ((values) => { const connectorTypes = ${JSON.stringify(
+			connectorTypes,
+		)}; return values.map(value => { return { type: value.type, required: value.required, maxConnections: value.maxConnections === -1 ? undefined : value.maxConnections, displayName: connectorTypes[value.type] !== 'Main' ? connectorTypes[value.type] : undefined } } ) })($parameter.inputs.input) }}`,
+		outputs: `={{ ((values) => { const connectorTypes = ${JSON.stringify(
+			connectorTypes,
+		)}; return values.map(value => { return { type: value.type, displayName: connectorTypes[value.type] !== 'Main' ? connectorTypes[value.type] : undefined } } ) })($parameter.outputs.output) }}`,
+		properties: [
+			{
+				displayName: 'Code',
+				name: 'code',
+				placeholder: 'Add Code',
+				type: 'fixedCollection',
+				noDataExpression: true,
+				default: {},
+				options: [
+					{
+						name: 'execute',
+						displayName: 'Execute',
+						values: [
+							{
+								displayName: 'JavaScript - Execute',
+								name: 'code',
+								type: 'string',
+								typeOptions: {
+									editor: 'jsEditor',
+								},
+								default: defaultCodeExecute,
+								hint: 'This code will only run and return data if a "Main" input & output got created.',
+								noDataExpression: true,
+							},
+						],
+					},
+					{
+						name: 'supplyData',
+						displayName: 'Supply Data',
+						values: [
+							{
+								displayName: 'JavaScript - Supply Data',
+								name: 'code',
+								type: 'string',
+								typeOptions: {
+									editor: 'jsEditor',
+								},
+								default: defaultCodeSupplyData,
+								hint: 'This code will only run and return data if an output got created which is not "Main".',
+								noDataExpression: true,
+							},
+						],
+					},
+				],
+			},
+
+			// TODO: Add links to docs which provide additional information regarding functionality
+			{
+				displayName:
+					'You can import LangChain and use all available functionality. Debug by using <code>console.log()</code> statements and viewing their output in the browser console.',
+				name: 'notice',
+				type: 'notice',
+				default: '',
+			},
+			{
+				displayName: 'Inputs',
+				name: 'inputs',
+				placeholder: 'Add Input',
+				type: 'fixedCollection',
+				noDataExpression: true,
+				typeOptions: {
+					multipleValues: true,
+					sortable: true,
+				},
+				description: 'The input to add',
+				default: {},
+				options: [
+					{
+						name: 'input',
+						displayName: 'Input',
+						values: [
+							{
+								displayName: 'Type',
+								name: 'type',
+								type: 'options',
+								options: Object.keys(connectorTypes).map((key) => ({
+									name: connectorTypes[key as keyof typeof connectorTypes],
+									value: key,
+								})),
+								noDataExpression: true,
+								default: '',
+								required: true,
+								description: 'The type of the input',
+							},
+							{
+								displayName: 'Max Connections',
+								name: 'maxConnections',
+								type: 'number',
+								noDataExpression: true,
+								default: -1,
+								required: true,
+								description:
+									'How many nodes of this type are allowed to be connected. Set it to -1 for unlimited.',
+							},
+							{
+								displayName: 'Required',
+								name: 'required',
+								type: 'boolean',
+								noDataExpression: true,
+								default: false,
+								required: true,
+								description: 'Whether the input needs a connection',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Outputs',
+				name: 'outputs',
+				placeholder: 'Add Output',
+				type: 'fixedCollection',
+				noDataExpression: true,
+				typeOptions: {
+					multipleValues: true,
+					sortable: true,
+				},
+				description: 'The output to add',
+				default: {},
+				options: [
+					{
+						name: 'output',
+						displayName: 'Output',
+						values: [
+							{
+								displayName: 'Type',
+								name: 'type',
+								type: 'options',
+								options: Object.keys(connectorTypes).map((key) => ({
+									name: connectorTypes[key as keyof typeof connectorTypes],
+									value: key,
+								})),
+								noDataExpression: true,
+								default: '',
+								required: true,
+								description: 'The type of the input',
+							},
+						],
+					},
+				],
+			},
+		],
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const itemIndex = 0;
+
+		const code = this.getNodeParameter('code', itemIndex) as { execute?: { code: string } };
+
+		if (!code.execute?.code) {
+			throw new NodeOperationError(
+				this.getNode(),
+				`No code for "Execute" set on node "${this.getNode().name}`,
+				{
+					itemIndex,
+				},
+			);
+		}
+
+		const sandbox = getSandbox.call(this, code.execute.code, { addItems: true, itemIndex });
+
+		const outputs = this.getNodeOutputs();
+		const mainOutputs: INodeOutputConfiguration[] = outputs.filter(
+			(output) => output.type === NodeConnectionType.Main,
+		);
+
+		const options = { multiOutput: mainOutputs.length !== 1 };
+
+		let items: INodeExecutionData[] | INodeExecutionData[][];
+		try {
+			items = await sandbox.runCodeAllItems(options);
+		} catch (error) {
+			if (!this.continueOnFail()) throw error;
+			items = [{ json: { error: (error as Error).message } }];
+			if (options.multiOutput) {
+				items = [items];
+			}
+		}
+
+		if (mainOutputs.length === 0) {
+			throw new NodeOperationError(
+				this.getNode(),
+				'The node does not have a "Main" output set. Please add one.',
+				{
+					itemIndex,
+				},
+			);
+		} else if (!options.multiOutput) {
+			for (const item of items as INodeExecutionData[]) {
+				standardizeOutput(item.json);
+			}
+			return [items as INodeExecutionData[]];
+		} else {
+			items.forEach((data) => {
+				for (const item of data as INodeExecutionData[]) {
+					standardizeOutput(item.json);
+				}
+			});
+			return items as INodeExecutionData[][];
+		}
+	}
+
+	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
+		const code = this.getNodeParameter('code', itemIndex) as { supplyData?: { code: string } };
+
+		if (!code.supplyData?.code) {
+			throw new NodeOperationError(
+				this.getNode(),
+				`No code for "Supply Data" set on node "${this.getNode().name}`,
+				{
+					itemIndex,
+				},
+			);
+		}
+
+		const sandbox = getSandbox.call(this, code.supplyData.code, { itemIndex });
+		const response = (await sandbox.runCode()) as Tool;
+
+		return {
+			response: logWrapper(response, this),
+		};
+	}
+}
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
new file mode 100644
index 0000000000000..7dfce64a50d91
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/document_loaders/DocumentBinaryInputLoader/DocumentBinaryInputLoader.node.ts
@@ -0,0 +1,194 @@
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import {
+	NodeConnectionType,
+	type IExecuteFunctions,
+	type INodeType,
+	type INodeTypeDescription,
+	type SupplyData,
+} from 'n8n-workflow';
+
+import type { TextSplitter } from 'langchain/text_splitter';
+
+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
+// import 'd3-dsv'; // for csv
+import 'mammoth'; // for docx
+import 'epub2'; // for epub
+import 'pdf-parse'; // for pdf
+
+export class DocumentBinaryInputLoader implements INodeType {
+	description: INodeTypeDescription = {
+		// This node is deprecated and will be removed in the future.
+		// The functionality was merged with the `DocumentJSONInputLoader` to `DocumentDefaultDataLoader`
+		hidden: true,
+		displayName: 'Binary Input Loader',
+		name: 'documentBinaryInputLoader',
+		icon: 'file:binary.svg',
+		group: ['transform'],
+		version: 1,
+		description: 'Use binary data from a previous step in the workflow',
+		defaults: {
+			name: 'Binary Input Loader',
+		},
+		codex: {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Document Loaders'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/sub-nodes/n8n-nodes-langchain.documentdefaultdataloader/',
+					},
+				],
+			},
+		},
+		// eslint-disable-next-line n8n-nodes-base/node-class-description-inputs-wrong-regular-node
+		inputs: [
+			{
+				displayName: 'Text Splitter',
+				maxConnections: 1,
+				type: NodeConnectionType.AiTextSplitter,
+				required: true,
+			},
+		],
+		// eslint-disable-next-line n8n-nodes-base/node-class-description-outputs-wrong
+		outputs: [NodeConnectionType.AiDocument],
+		outputNames: ['Document'],
+		properties: [
+			getConnectionHintNoticeField([NodeConnectionType.AiVectorStore]),
+			{
+				displayName: 'Loader Type',
+				name: 'loader',
+				type: 'options',
+				default: 'jsonLoader',
+				required: true,
+				options: [
+					{
+						name: 'CSV Loader',
+						value: 'csvLoader',
+						description: 'Load CSV files',
+					},
+					{
+						name: 'Docx Loader',
+						value: 'docxLoader',
+						description: 'Load Docx documents',
+					},
+					{
+						name: 'EPub Loader',
+						value: 'epubLoader',
+						description: 'Load EPub files',
+					},
+					{
+						name: 'JSON Loader',
+						value: 'jsonLoader',
+						description: 'Load JSON files',
+					},
+					{
+						name: 'PDF Loader',
+						value: 'pdfLoader',
+						description: 'Load PDF documents',
+					},
+					{
+						name: 'Text Loader',
+						value: 'textLoader',
+						description: 'Load plain text files',
+					},
+				],
+			},
+			{
+				displayName: 'Binary Data Key',
+				name: 'binaryDataKey',
+				type: 'string',
+				default: 'data',
+				required: true,
+				description: 'Name of the binary property from which to read the file buffer',
+			},
+			// PDF Only Fields
+			{
+				displayName: 'Split Pages',
+				name: 'splitPages',
+				type: 'boolean',
+				default: true,
+				displayOptions: {
+					show: {
+						loader: ['pdfLoader'],
+					},
+				},
+			},
+			// CSV Only Fields
+			{
+				displayName: 'Column',
+				name: 'column',
+				type: 'string',
+				default: '',
+				description: 'Column to extract from CSV',
+				displayOptions: {
+					show: {
+						loader: ['csvLoader'],
+					},
+				},
+			},
+			{
+				displayName: 'Separator',
+				name: 'separator',
+				type: 'string',
+				description: 'Separator to use for CSV',
+				default: ',',
+				displayOptions: {
+					show: {
+						loader: ['csvLoader'],
+					},
+				},
+			},
+			// JSON Only Fields
+			{
+				displayName: 'Pointers',
+				name: 'pointers',
+				type: 'string',
+				default: '',
+				description: 'Pointers to extract from JSON, e.g. "/text" or "/text, /meta/title"',
+				displayOptions: {
+					show: {
+						loader: ['jsonLoader'],
+					},
+				},
+			},
+			{
+				displayName: 'Options',
+				name: 'options',
+				type: 'collection',
+				placeholder: 'Add Option',
+				default: {},
+				options: [
+					{
+						...metadataFilterField,
+						displayName: 'Metadata',
+						description:
+							'Metadata to add to each document. Could be used for filtering during retrieval',
+						placeholder: 'Add property',
+					},
+				],
+			},
+		],
+	};
+
+	async supplyData(this: IExecuteFunctions): Promise<SupplyData> {
+		this.logger.verbose('Supply Data for Binary Input Loader');
+		const textSplitter = (await this.getInputConnectionData(
+			NodeConnectionType.AiTextSplitter,
+			0,
+		)) as TextSplitter | undefined;
+
+		const binaryDataKey = this.getNodeParameter('binaryDataKey', 0) as string;
+		const processor = new N8nBinaryLoader(this, undefined, binaryDataKey, textSplitter);
+
+		return {
+			response: logWrapper(processor, this),
+		};
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/document_loaders/DocumentBinaryInputLoader/binary.svg b/packages/@n8n/nodes-langchain/nodes/document_loaders/DocumentBinaryInputLoader/binary.svg
new file mode 100644
index 0000000000000..de9db5cae9086
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/document_loaders/DocumentBinaryInputLoader/binary.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="768" height="1024"><path fill="#7D7D87" d="M0 960V64h576l192 192v704zm704-640L512 128H64v768h640zM320 512H128V256h192zm-64-192h-64v128h64zm0 448h64v64H128v-64h64V640h-64v-64h128zm256-320h64v64H384v-64h64V320h-64v-64h128zm64 384H384V576h192zm-64-192h-64v128h64z"/></svg>
\ No newline at end of file
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
new file mode 100644
index 0000000000000..cb9d66ac9d550
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/document_loaders/DocumentDefaultDataLoader/DocumentDefaultDataLoader.node.ts
@@ -0,0 +1,276 @@
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import {
+	NodeConnectionType,
+	type IExecuteFunctions,
+	type INodeType,
+	type INodeTypeDescription,
+	type SupplyData,
+} from 'n8n-workflow';
+
+import type { TextSplitter } from 'langchain/text_splitter';
+import { logWrapper } from '../../../utils/logWrapper';
+import { N8nBinaryLoader } from '../../../utils/N8nBinaryLoader';
+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
+// import 'd3-dsv'; // for csv
+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 = {
+		displayName: 'Default Data Loader',
+		name: 'documentDefaultDataLoader',
+		icon: 'file:binary.svg',
+		group: ['transform'],
+		version: 1,
+		description: 'Load data from previous step in the workflow',
+		defaults: {
+			name: 'Default Data Loader',
+		},
+		codex: {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Document Loaders'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/sub-nodes/n8n-nodes-langchain.documentdefaultdataloader/',
+					},
+				],
+			},
+		},
+		// eslint-disable-next-line n8n-nodes-base/node-class-description-inputs-wrong-regular-node
+		inputs: [
+			{
+				displayName: 'Text Splitter',
+				maxConnections: 1,
+				type: NodeConnectionType.AiTextSplitter,
+				required: true,
+			},
+		],
+		// eslint-disable-next-line n8n-nodes-base/node-class-description-outputs-wrong
+		outputs: [NodeConnectionType.AiDocument],
+		outputNames: ['Document'],
+		properties: [
+			{
+				displayName:
+					'This will load data from a previous step in the workflow. <a href="/templates/1962" target="_blank">Example</a>',
+				name: 'notice',
+				type: 'notice',
+				default: '',
+			},
+			{
+				displayName: 'Type of Data',
+				name: 'dataType',
+				type: 'options',
+				default: 'json',
+				required: true,
+				noDataExpression: true,
+				options: [
+					{
+						name: 'JSON',
+						value: 'json',
+						description: 'Process JSON data from previous step in the workflow',
+					},
+					{
+						name: 'Binary',
+						value: 'binary',
+						description: 'Process binary data from previous step in the workflow',
+					},
+				],
+			},
+			{
+				displayName: 'Mode',
+				name: 'jsonMode',
+				type: 'options',
+				default: 'allInputData',
+				required: true,
+				displayOptions: {
+					show: {
+						dataType: ['json'],
+					},
+				},
+				options: [
+					{
+						name: 'Load All Input Data',
+						value: 'allInputData',
+						description: 'Use all JSON data that flows into the parent agent or chain',
+					},
+					{
+						name: 'Load Specific Data',
+						value: 'expressionData',
+						description:
+							'Load a subset of data, and/or data from any previous step in the workflow',
+					},
+				],
+			},
+			{
+				displayName: 'Data Format',
+				name: 'loader',
+				type: 'options',
+				default: 'auto',
+				required: true,
+				displayOptions: {
+					show: {
+						dataType: ['binary'],
+					},
+				},
+				options: [
+					{
+						name: 'Automatically Detect by Mime Type',
+						value: 'auto',
+						description: 'Uses the mime type to detect the format',
+					},
+					{
+						name: 'CSV',
+						value: 'csvLoader',
+						description: 'Load CSV files',
+					},
+					{
+						name: 'Docx',
+						value: 'docxLoader',
+						description: 'Load Docx documents',
+					},
+					{
+						name: 'EPub',
+						value: 'epubLoader',
+						description: 'Load EPub files',
+					},
+					{
+						name: 'JSON',
+						value: 'jsonLoader',
+						description: 'Load JSON files',
+					},
+					{
+						name: 'PDF',
+						value: 'pdfLoader',
+						description: 'Load PDF documents',
+					},
+					{
+						name: 'Text',
+						value: 'textLoader',
+						description: 'Load plain text files',
+					},
+				],
+			},
+			{
+				displayName: 'Data',
+				name: 'jsonData',
+				type: 'string',
+				typeOptions: {
+					rows: 6,
+				},
+				default: '',
+				required: true,
+				description: 'Drag and drop fields from the input pane, or use an expression',
+				displayOptions: {
+					show: {
+						dataType: ['json'],
+						jsonMode: ['expressionData'],
+					},
+				},
+			},
+			{
+				displayName: 'Input Data Field Name',
+				name: 'binaryDataKey',
+				type: 'string',
+				default: 'data',
+				required: true,
+				description:
+					'The name of the field in the agent or chain’s input that contains the binary file to be processed',
+				displayOptions: {
+					show: {
+						dataType: ['binary'],
+					},
+				},
+			},
+			{
+				displayName: 'Options',
+				name: 'options',
+				type: 'collection',
+				placeholder: 'Add Option',
+				default: {},
+				options: [
+					{
+						displayName: 'JSON Pointers',
+						name: 'pointers',
+						type: 'string',
+						default: '',
+						description: 'Pointers to extract from JSON, e.g. "/text" or "/text, /meta/title"',
+						displayOptions: {
+							show: {
+								'/loader': ['jsonLoader', 'auto'],
+							},
+						},
+					},
+					{
+						displayName: 'CSV Separator',
+						name: 'separator',
+						type: 'string',
+						description: 'Separator to use for CSV',
+						default: ',',
+						displayOptions: {
+							show: {
+								'/loader': ['csvLoader', 'auto'],
+							},
+						},
+					},
+					{
+						displayName: 'CSV Column',
+						name: 'column',
+						type: 'string',
+						default: '',
+						description: 'Column to extract from CSV',
+						displayOptions: {
+							show: {
+								'/loader': ['csvLoader', 'auto'],
+							},
+						},
+					},
+					{
+						displayName: 'Split Pages in PDF',
+						description: 'Whether to split PDF pages into separate documents',
+						name: 'splitPages',
+						type: 'boolean',
+						default: true,
+						displayOptions: {
+							show: {
+								'/loader': ['pdfLoader', 'auto'],
+							},
+						},
+					},
+					{
+						...metadataFilterField,
+						displayName: 'Metadata',
+						description:
+							'Metadata to add to each document. Could be used for filtering during retrieval',
+						placeholder: 'Add property',
+					},
+				],
+			},
+		],
+	};
+
+	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
+		const dataType = this.getNodeParameter('dataType', itemIndex, 'json') as 'json' | 'binary';
+		const textSplitter = (await this.getInputConnectionData(
+			NodeConnectionType.AiTextSplitter,
+			0,
+		)) as TextSplitter | undefined;
+		const binaryDataKey = this.getNodeParameter('binaryDataKey', itemIndex, '') as string;
+
+		const processor =
+			dataType === 'binary'
+				? new N8nBinaryLoader(this, 'options.', binaryDataKey, textSplitter)
+				: new N8nJsonLoader(this, 'options.', textSplitter);
+
+		return {
+			response: logWrapper(processor, this),
+		};
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/document_loaders/DocumentDefaultDataLoader/binary.svg b/packages/@n8n/nodes-langchain/nodes/document_loaders/DocumentDefaultDataLoader/binary.svg
new file mode 100644
index 0000000000000..de9db5cae9086
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/document_loaders/DocumentDefaultDataLoader/binary.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="768" height="1024"><path fill="#7D7D87" d="M0 960V64h576l192 192v704zm704-640L512 128H64v768h640zM320 512H128V256h192zm-64-192h-64v128h64zm0 448h64v64H128v-64h64V640h-64v-64h128zm256-320h64v64H384v-64h64V320h-64v-64h128zm64 384H384V576h192zm-64-192h-64v128h64z"/></svg>
\ No newline at end of file
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
new file mode 100644
index 0000000000000..0c91e7370ef1d
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/document_loaders/DocumentGithubLoader/DocumentGithubLoader.node.ts
@@ -0,0 +1,125 @@
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import {
+	NodeConnectionType,
+	type IExecuteFunctions,
+	type INodeType,
+	type INodeTypeDescription,
+	type SupplyData,
+} from 'n8n-workflow';
+import { GithubRepoLoader } from 'langchain/document_loaders/web/github';
+import type { CharacterTextSplitter } from 'langchain/text_splitter';
+import { logWrapper } from '../../../utils/logWrapper';
+import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+
+export class DocumentGithubLoader implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'GitHub Document Loader',
+		name: 'documentGithubLoader',
+		icon: 'file:github.svg',
+		group: ['transform'],
+		version: 1,
+		description: 'Use GitHub data as input to this chain',
+		defaults: {
+			name: 'GitHub Document Loader',
+		},
+		codex: {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Document Loaders'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/sub-nodes/n8n-nodes-langchain.documentgithubloader/',
+					},
+				],
+			},
+		},
+		credentials: [
+			{
+				name: 'githubApi',
+				required: true,
+			},
+		],
+		// eslint-disable-next-line n8n-nodes-base/node-class-description-inputs-wrong-regular-node
+		inputs: [
+			{
+				displayName: 'Text Splitter',
+				maxConnections: 1,
+				type: NodeConnectionType.AiTextSplitter,
+			},
+		],
+		inputNames: ['Text Splitter'],
+		// eslint-disable-next-line n8n-nodes-base/node-class-description-outputs-wrong
+		outputs: [NodeConnectionType.AiDocument],
+		outputNames: ['Document'],
+		properties: [
+			getConnectionHintNoticeField([NodeConnectionType.AiVectorStore]),
+			{
+				displayName: 'Repository Link',
+				name: 'repository',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Branch',
+				name: 'branch',
+				type: 'string',
+				default: 'main',
+			},
+			{
+				displayName: 'Options',
+				name: 'additionalOptions',
+				type: 'collection',
+				placeholder: 'Add Option',
+				default: {},
+
+				options: [
+					{
+						displayName: 'Recursive',
+						name: 'recursive',
+						type: 'boolean',
+						default: false,
+					},
+					{
+						displayName: 'Ignore Paths',
+						name: 'ignorePaths',
+						type: 'string',
+						description: 'Comma-separated list of paths to ignore, e.g. "docs, src/tests',
+						default: '',
+					},
+				],
+			},
+		],
+	};
+
+	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
+		console.log('Supplying data for Github Document Loader');
+
+		const repository = this.getNodeParameter('repository', itemIndex) as string;
+		const branch = this.getNodeParameter('branch', itemIndex) as string;
+		const credentials = await this.getCredentials('githubApi');
+		const { ignorePaths, recursive } = this.getNodeParameter('additionalOptions', 0) as {
+			recursive: boolean;
+			ignorePaths: string;
+		};
+
+		const textSplitter = (await this.getInputConnectionData(
+			NodeConnectionType.AiTextSplitter,
+			0,
+		)) as CharacterTextSplitter | undefined;
+
+		const docs = new GithubRepoLoader(repository, {
+			branch,
+			ignorePaths: (ignorePaths ?? '').split(',').map((p) => p.trim()),
+			recursive,
+			accessToken: (credentials.accessToken as string) || '',
+		});
+
+		const loadedDocs = textSplitter ? await docs.loadAndSplit(textSplitter) : await docs.load();
+
+		return {
+			response: logWrapper(loadedDocs, this),
+		};
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/document_loaders/DocumentGithubLoader/github.svg b/packages/@n8n/nodes-langchain/nodes/document_loaders/DocumentGithubLoader/github.svg
new file mode 100644
index 0000000000000..629e53dc25c6e
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/document_loaders/DocumentGithubLoader/github.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round" viewBox="0 0 148.744 150.744"><use xlink:href="#a" x=".872" y=".872"/><symbol id="a" overflow="visible"><path fill="#7D7D87" stroke="none" d="M73.256 0C32.801 0 0 34.029 0 76.001c0 33.586 20.988 62.069 50.1 72.115 3.663.698 4.999-1.652 4.999-3.656l-.105-14.149c-20.372 4.593-24.677-8.961-24.677-8.961-3.335-8.777-8.133-11.114-8.133-11.114-6.658-4.713.523-4.622.523-4.622 7.355.529 11.227 7.831 11.227 7.831 6.537 11.616 17.151 8.257 21.319 6.309.666-4.901 2.564-8.257 4.65-10.151-16.261-1.919-33.366-8.442-33.366-37.565 0-8.302 2.857-15.075 7.535-20.396-.747-1.929-3.269-9.663.724-20.123 0 0 6.143-2.041 20.145 7.793 5.84-1.692 12.105-2.529 18.314-2.555 6.223.028 12.492.872 18.34 2.564 13.978-9.844 20.128-7.793 20.128-7.793 4.006 10.47 1.483 18.192.733 20.114 4.695 5.32 7.53 12.093 7.53 20.396 0 29.198-17.133 35.627-33.453 37.509 2.639 2.355 4.971 6.977 4.971 14.065l-.098 20.855c0 2.023 1.333 4.388 5.044 3.663 29.091-10.078 50.062-38.561 50.062-72.129C146.512 34.029 113.71 0 73.256 0"/></symbol></svg>
\ No newline at end of file
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
new file mode 100644
index 0000000000000..2bc1d8025e699
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/document_loaders/DocumentJSONInputLoader/DocumentJsonInputLoader.node.ts
@@ -0,0 +1,95 @@
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import {
+	NodeConnectionType,
+	type IExecuteFunctions,
+	type INodeType,
+	type INodeTypeDescription,
+	type SupplyData,
+} from 'n8n-workflow';
+
+import type { TextSplitter } from 'langchain/text_splitter';
+import { logWrapper } from '../../../utils/logWrapper';
+import { N8nJsonLoader } from '../../../utils/N8nJsonLoader';
+import { getConnectionHintNoticeField, metadataFilterField } from '../../../utils/sharedFields';
+
+export class DocumentJsonInputLoader implements INodeType {
+	description: INodeTypeDescription = {
+		// This node is deprecated and will be removed in the future.
+		// The functionality was merged with the `DocumentBinaryInputLoader` to `DocumentDefaultDataLoader`
+		hidden: true,
+		displayName: 'JSON Input Loader',
+		name: 'documentJsonInputLoader',
+		icon: 'file:json.svg',
+		group: ['transform'],
+		version: 1,
+		description: 'Use JSON data from a previous step in the workflow',
+		defaults: {
+			name: 'JSON Input Loader',
+		},
+		codex: {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Document Loaders'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/sub-nodes/n8n-nodes-langchain.documentdefaultdataloader/',
+					},
+				],
+			},
+		},
+		// eslint-disable-next-line n8n-nodes-base/node-class-description-inputs-wrong-regular-node
+		inputs: [
+			{
+				displayName: 'Text Splitter',
+				maxConnections: 1,
+				type: NodeConnectionType.AiTextSplitter,
+			},
+		],
+		inputNames: ['Text Splitter'],
+		// eslint-disable-next-line n8n-nodes-base/node-class-description-outputs-wrong
+		outputs: [NodeConnectionType.AiDocument],
+		outputNames: ['Document'],
+		properties: [
+			getConnectionHintNoticeField([NodeConnectionType.AiVectorStore]),
+			{
+				displayName: 'Pointers',
+				name: 'pointers',
+				type: 'string',
+				default: '',
+				description: 'Pointers to extract from JSON, e.g. "/text" or "/text, /meta/title"',
+			},
+			{
+				displayName: 'Options',
+				name: 'options',
+				type: 'collection',
+				placeholder: 'Add Option',
+				default: {},
+				options: [
+					{
+						...metadataFilterField,
+						displayName: 'Metadata',
+						description:
+							'Metadata to add to each document. Could be used for filtering during retrieval',
+						placeholder: 'Add property',
+					},
+				],
+			},
+		],
+	};
+
+	async supplyData(this: IExecuteFunctions): Promise<SupplyData> {
+		this.logger.verbose('Supply Data for JSON Input Loader');
+		const textSplitter = (await this.getInputConnectionData(
+			NodeConnectionType.AiTextSplitter,
+			0,
+		)) as TextSplitter | undefined;
+
+		const processor = new N8nJsonLoader(this, undefined, textSplitter);
+
+		return {
+			response: logWrapper(processor, this),
+		};
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/document_loaders/DocumentJSONInputLoader/json.svg b/packages/@n8n/nodes-langchain/nodes/document_loaders/DocumentJSONInputLoader/json.svg
new file mode 100644
index 0000000000000..db96b6eb84069
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/document_loaders/DocumentJSONInputLoader/json.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="800" height="800" fill="#7D7D87" viewBox="0 0 58 58"><path d="m50.949 12.187-1.361-1.361-9.504-9.505-.002-.001-.77-.771A1.87 1.87 0 0 0 37.985 0H8.963C7.776 0 6.5.916 6.5 2.926V56c0 .837.841 1.652 1.836 1.909.051.014.1.033.152.043q.235.047.475.048h40.074q.24 0 .475-.048c.052-.01.101-.029.152-.043.995-.257 1.836-1.072 1.836-1.909V13.978c0-.767-.093-1.334-.551-1.791M39.5 3.565 47.935 12H39.5zM8.963 56c-.071 0-.135-.025-.198-.049a.46.46 0 0 1-.265-.414V41h41v14.537a.46.46 0 0 1-.265.414c-.063.024-.127.049-.198.049zM8.5 39V2.926c0-.217.033-.926.463-.926h28.595a1.5 1.5 0 0 0-.058.391V13.78a2.98 2.98 0 0 0-2-.78 1 1 0 1 0 0 2c.552 0 1 .449 1 1v4c0 1.2.542 2.266 1.382 3a3.98 3.98 0 0 0-1.382 3v4c0 .551-.448 1-1 1a1 1 0 1 0 0 2c1.654 0 3-1.346 3-3v-4c0-1.103.897-2 2-2a1 1 0 1 0 0-2c-1.103 0-2-.897-2-2v-4a2.98 2.98 0 0 0-.78-2h11.389c.135 0 .265-.025.391-.058l.001.036V39z"/><path d="M16.354 51.43q-.028.67-.458.95c-.43.28-.672.28-1.155.28q-.287 0-.615-.068c-.328-.068-.429-.098-.629-.157s-.385-.123-.554-.191-.299-.135-.39-.198l-.697 1.107q.274.205.67.369c.396.164.54.207.827.294s.565.15.834.191.504.062.704.062q.602 0 1.169-.116t1.005-.41c.438-.294.524-.456.697-.779s.26-.723.26-1.196V43.72h-1.668zm8.729-2.366q-.471-.342-1.019-.581c-.548-.239-.702-.323-1.012-.492s-.569-.364-.779-.588-.314-.518-.314-.882q0-.22.109-.458c.109-.238.173-.303.301-.431s.273-.234.438-.321.337-.139.52-.157q.492-.04.807-.014c.315.026.378.05.506.096s.226.091.294.137.13.082.185.109q.013-.014.082-.137c.069-.123.101-.185.164-.308l.205-.396a9 9 0 0 0 .191-.39q-.396-.26-1.039-.376c-.643-.116-.853-.116-1.271-.116q-.615 0-1.169.191c-.554.191-.692.313-.971.554s-.499.535-.663.882-.248.744-.248 1.19q0 .738.314 1.23c.314.492.474.613.793.854s.661.451 1.025.629.704.355 1.019.533.576.376.786.595.314.483.314.793q0 .767-.444 1.155c-.444.388-.723.39-1.278.39q-.274 0-.588-.055c-.314-.055-.419-.084-.629-.144s-.412-.123-.608-.191-.357-.139-.485-.212l-.287 1.176q.233.205.554.349c.321.144.439.171.677.226q.356.083.704.116c.348.033.458.034.677.034q.766 0 1.367-.232c.601-.232.738-.362 1.012-.622s.485-.561.636-.902.226-.695.226-1.06q0-.807-.314-1.319c-.314-.512-.474-.627-.788-.855m9.789-3.992q-.567-.643-1.326-.978c-.759-.335-1.06-.335-1.661-.335s-1.155.111-1.661.335-.948.549-1.326.978-.675.964-.889 1.606-.321 1.388-.321 2.235.107 1.595.321 2.242.511 1.185.889 1.613.82.752 1.326.971 1.06.328 1.661.328 1.155-.109 1.661-.328.948-.542 1.326-.971.675-.966.889-1.613.321-1.395.321-2.242-.107-1.593-.321-2.235-.511-1.177-.889-1.606m-.677 5.626q-.205.731-.567 1.183c-.362.452-.515.518-.82.649s-.627.198-.964.198q-.492 0-.937-.212c-.445-.212-.561-.364-.793-.67s-.415-.699-.547-1.183-.203-1.066-.212-1.75q.014-1.053.219-1.777.206-.724.567-1.183c.361-.459.515-.521.82-.649s.627-.191.964-.191q.493 0 .937.205c.444.205.561.36.793.67s.415.704.547 1.183.203 1.06.212 1.743q-.013 1.053-.219 1.784m9.817.171-3.951-6.945h-1.668V54h1.668v-6.945L44.012 54h1.668V43.924h-1.668zM20.5 20v-4c0-.551.448-1 1-1a1 1 0 1 0 0-2c-1.654 0-3 1.346-3 3v4c0 1.103-.897 2-2 2a1 1 0 1 0 0 2c1.103 0 2 .897 2 2v4c0 1.654 1.346 3 3 3a1 1 0 1 0 0-2c-.552 0-1-.449-1-1v-4c0-1.2-.542-2.266-1.382-3a3.98 3.98 0 0 0 1.382-3"/><circle cx="28.5" cy="19.5" r="1.5"/><path d="M28.5 25a1 1 0 0 0-1 1v3a1 1 0 1 0 2 0v-3a1 1 0 0 0-1-1"/></svg>
\ No newline at end of file
diff --git a/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsAwsBedrock/EmbeddingsAwsBedrock.node.ts b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsAwsBedrock/EmbeddingsAwsBedrock.node.ts
new file mode 100644
index 0000000000000..832ff52f782da
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsAwsBedrock/EmbeddingsAwsBedrock.node.ts
@@ -0,0 +1,126 @@
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import {
+	NodeConnectionType,
+	type IExecuteFunctions,
+	type INodeType,
+	type INodeTypeDescription,
+	type SupplyData,
+} from 'n8n-workflow';
+import { BedrockEmbeddings } from '@langchain/community/embeddings/bedrock';
+
+import { logWrapper } from '../../../utils/logWrapper';
+import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+
+export class EmbeddingsAwsBedrock implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Embeddings AWS Bedrock',
+		name: 'embeddingsAwsBedrock',
+		icon: 'file:bedrock.svg',
+		credentials: [
+			{
+				name: 'aws',
+				required: true,
+			},
+		],
+		group: ['transform'],
+		version: 1,
+		description: 'Use Embeddings AWS Bedrock',
+		defaults: {
+			name: 'Embeddings AWS Bedrock',
+		},
+
+		codex: {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Embeddings'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/sub-nodes/n8n-nodes-langchain.embeddingsawsbedrock/',
+					},
+				],
+			},
+		},
+		// 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.AiEmbedding],
+		outputNames: ['Embeddings'],
+		requestDefaults: {
+			ignoreHttpStatusErrors: true,
+			baseURL: '=https://bedrock.{{$credentials?.region ?? "eu-central-1"}}.amazonaws.com',
+		},
+		properties: [
+			getConnectionHintNoticeField([NodeConnectionType.AiVectorStore]),
+			{
+				displayName: 'Model',
+				name: 'model',
+				type: 'options',
+				description:
+					'The model which will generate the completion. <a href="https://docs.aws.amazon.com/bedrock/latest/userguide/foundation-models.html">Learn more</a>.',
+				typeOptions: {
+					loadOptions: {
+						routing: {
+							request: {
+								method: 'GET',
+								url: '/foundation-models?byInferenceType=ON_DEMAND&byOutputModality=EMBEDDING',
+							},
+							output: {
+								postReceive: [
+									{
+										type: 'rootProperty',
+										properties: {
+											property: 'modelSummaries',
+										},
+									},
+									{
+										type: 'setKeyValue',
+										properties: {
+											name: '={{$responseItem.modelName}}',
+											description: '={{$responseItem.modelArn}}',
+											value: '={{$responseItem.modelId}}',
+										},
+									},
+									{
+										type: 'sort',
+										properties: {
+											key: 'name',
+										},
+									},
+								],
+							},
+						},
+					},
+				},
+				routing: {
+					send: {
+						type: 'body',
+						property: 'model',
+					},
+				},
+				default: '',
+			},
+		],
+	};
+
+	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
+		const credentials = await this.getCredentials('aws');
+		const modelName = this.getNodeParameter('model', itemIndex) as string;
+
+		const embeddings = new BedrockEmbeddings({
+			region: credentials.region as string,
+			model: modelName,
+			maxRetries: 3,
+			credentials: {
+				secretAccessKey: credentials.secretAccessKey as string,
+				accessKeyId: credentials.accessKeyId as string,
+				sessionToken: credentials.sessionToken as string,
+			},
+		});
+
+		return {
+			response: logWrapper(embeddings, this),
+		};
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsAwsBedrock/bedrock.svg b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsAwsBedrock/bedrock.svg
new file mode 100644
index 0000000000000..33c91d86616a8
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsAwsBedrock/bedrock.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24"><defs><linearGradient id="a" x1="0%" x2="100%" y1="100%" y2="0%"><stop offset="0%" stop-color="#055F4E"/><stop offset="100%" stop-color="#56C0A7"/></linearGradient></defs><g fill="none" fill-rule="evenodd"><path fill="url(#a)" d="M0 0h24v24H0z"/><path fill="#FFF" d="m12 18.14-2.426.809-.946-.631 1.03-.344-.316-.948-1.768.589L7 17.233V14.5a.5.5 0 0 0-.276-.447L5 13.19v-2.382l1.5-.75 1.5.75v1.69c0 .19.107.364.276.449l2 1 .448-.895L9 12.19v-1.382l1.724-.861A.5.5 0 0 0 11 9.5V8h-1v1.19l-1.5.75L7 9.19V6.769L8 6.1V8h1V5.435l.574-.383L12 5.86zM17.5 17a.5.5 0 1 1-.002 1 .5.5 0 0 1 .002-1m-1-11a.5.5 0 1 1-.002 1 .5.5 0 0 1 .002-1m2 6a.5.5 0 1 1-.002 1 .5.5 0 0 1 .002-1m-1.408 1c.207.58.757 1 1.408 1a1.501 1.501 0 0 0 0-3c-.651 0-1.201.42-1.408 1H13v-2h3.5a.5.5 0 0 0 .5-.5V7.908c.581-.207 1-.757 1-1.408 0-.827-.673-1.5-1.5-1.5S15 5.673 15 6.5c0 .65.419 1.2 1 1.408V9h-3V5.5a.5.5 0 0 0-.342-.474l-3-1a.5.5 0 0 0-.435.058l-3 2A.5.5 0 0 0 6 6.5v2.69l-1.724.863A.5.5 0 0 0 4 10.5v3c0 .19.107.363.276.448l1.724.86V17.5a.5.5 0 0 0 .223.416l3 2a.5.5 0 0 0 .435.058l3-1A.5.5 0 0 0 13 18.5V16h2.293l.853.854.013-.013c-.098.2-.159.422-.159.659 0 .827.673 1.5 1.5 1.5s1.5-.673 1.5-1.5-.673-1.5-1.5-1.5c-.238 0-.46.06-.659.16l.013-.013-1-1A.5.5 0 0 0 15.5 15H13v-2z"/></g></svg>
\ No newline at end of file
diff --git a/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsAzureOpenAi/EmbeddingsAzureOpenAi.node.ts b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsAzureOpenAi/EmbeddingsAzureOpenAi.node.ts
new file mode 100644
index 0000000000000..49942b786ac74
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsAzureOpenAi/EmbeddingsAzureOpenAi.node.ts
@@ -0,0 +1,126 @@
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import {
+	NodeConnectionType,
+	type IExecuteFunctions,
+	type INodeType,
+	type INodeTypeDescription,
+	type SupplyData,
+} from 'n8n-workflow';
+
+import { OpenAIEmbeddings } from '@langchain/openai';
+import { logWrapper } from '../../../utils/logWrapper';
+import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+
+export class EmbeddingsAzureOpenAi implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Embeddings Azure OpenAI',
+		name: 'embeddingsAzureOpenAi',
+		icon: 'file:azure.svg',
+		credentials: [
+			{
+				name: 'azureOpenAiApi',
+				required: true,
+			},
+		],
+		group: ['transform'],
+		version: 1,
+		description: 'Use Embeddings Azure OpenAI',
+		defaults: {
+			name: 'Embeddings Azure OpenAI',
+		},
+
+		codex: {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Embeddings'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/sub-nodes/n8n-nodes-langchain.embeddingsazureopenai/',
+					},
+				],
+			},
+		},
+		// 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.AiEmbedding],
+		outputNames: ['Embeddings'],
+		properties: [
+			getConnectionHintNoticeField([NodeConnectionType.AiVectorStore]),
+			{
+				displayName: 'Model (Deployment) Name',
+				name: 'model',
+				type: 'string',
+				description: 'The name of the model(deployment) to use',
+				default: '',
+			},
+			{
+				displayName: 'Options',
+				name: 'options',
+				placeholder: 'Add Option',
+				description: 'Additional options to add',
+				type: 'collection',
+				default: {},
+				options: [
+					{
+						displayName: 'Batch Size',
+						name: 'batchSize',
+						default: 512,
+						typeOptions: { maxValue: 2048 },
+						description: 'Maximum number of documents to send in each request',
+						type: 'number',
+					},
+					{
+						displayName: 'Strip New Lines',
+						name: 'stripNewLines',
+						default: true,
+						description: 'Whether to strip new lines from the input text',
+						type: 'boolean',
+					},
+					{
+						displayName: 'Timeout',
+						name: 'timeout',
+						default: -1,
+						description:
+							'Maximum amount of time a request is allowed to take in seconds. Set to -1 for no timeout.',
+						type: 'number',
+					},
+				],
+			},
+		],
+	};
+
+	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
+		this.logger.verbose('Supply data for embeddings');
+		const credentials = (await this.getCredentials('azureOpenAiApi')) as {
+			apiKey: string;
+			resourceName: string;
+			apiVersion: string;
+		};
+		const modelName = this.getNodeParameter('model', itemIndex) as string;
+
+		const options = this.getNodeParameter('options', itemIndex, {}) as {
+			batchSize?: number;
+			stripNewLines?: boolean;
+			timeout?: number;
+		};
+
+		if (options.timeout === -1) {
+			options.timeout = undefined;
+		}
+
+		const embeddings = new OpenAIEmbeddings({
+			azureOpenAIApiDeploymentName: modelName,
+			azureOpenAIApiInstanceName: credentials.resourceName,
+			azureOpenAIApiKey: credentials.apiKey,
+			azureOpenAIApiVersion: credentials.apiVersion,
+			...options,
+		});
+
+		return {
+			response: logWrapper(embeddings, this),
+		};
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsAzureOpenAi/azure.svg b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsAzureOpenAi/azure.svg
new file mode 100644
index 0000000000000..bbbc6c33b3bcd
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsAzureOpenAi/azure.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="242" preserveAspectRatio="xMidYMid"><defs><linearGradient id="a" x1="58.972%" x2="37.191%" y1="7.411%" y2="103.762%"><stop offset="0%" stop-color="#114A8B"/><stop offset="100%" stop-color="#0669BC"/></linearGradient><linearGradient id="b" x1="59.719%" x2="52.691%" y1="52.313%" y2="54.864%"><stop offset="0%" stop-opacity=".3"/><stop offset="7.1%" stop-opacity=".2"/><stop offset="32.1%" stop-opacity=".1"/><stop offset="62.3%" stop-opacity=".05"/><stop offset="100%" stop-opacity="0"/></linearGradient><linearGradient id="c" x1="37.279%" x2="62.473%" y1="4.6%" y2="99.979%"><stop offset="0%" stop-color="#3CCBF4"/><stop offset="100%" stop-color="#2892DF"/></linearGradient></defs><path fill="url(#a)" d="M85.343.003h75.753L82.457 233a12.08 12.08 0 0 1-11.442 8.216H12.06A12.06 12.06 0 0 1 .633 225.303L73.898 8.219A12.08 12.08 0 0 1 85.343 0z"/><path fill="#0078D4" d="M195.423 156.282H75.297a5.56 5.56 0 0 0-3.796 9.627l77.19 72.047a12.14 12.14 0 0 0 8.28 3.26h68.02z"/><path fill="url(#b)" d="M85.343.003a11.98 11.98 0 0 0-11.471 8.376L.723 225.105a12.045 12.045 0 0 0 11.37 16.112h60.475a12.93 12.93 0 0 0 9.921-8.437l14.588-42.991 52.105 48.6a12.33 12.33 0 0 0 7.757 2.828h67.766l-29.721-84.935-86.643.02L161.37.003z"/><path fill="url(#c)" d="M182.098 8.207A12.06 12.06 0 0 0 170.67.003H86.245c5.175 0 9.773 3.301 11.428 8.204L170.94 225.3a12.062 12.062 0 0 1-11.428 15.92h84.429a12.062 12.062 0 0 0 11.425-15.92z"/></svg>
\ No newline at end of file
diff --git a/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsCohere/EmbeddingsCohere.node.ts b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsCohere/EmbeddingsCohere.node.ts
new file mode 100644
index 0000000000000..94800eb9323a5
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsCohere/EmbeddingsCohere.node.ts
@@ -0,0 +1,99 @@
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import {
+	NodeConnectionType,
+	type IExecuteFunctions,
+	type INodeType,
+	type INodeTypeDescription,
+	type SupplyData,
+} from 'n8n-workflow';
+import { CohereEmbeddings } from '@langchain/cohere';
+import { logWrapper } from '../../../utils/logWrapper';
+import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+
+export class EmbeddingsCohere implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Embeddings Cohere',
+		name: 'embeddingsCohere',
+		icon: 'file:cohere.svg',
+		group: ['transform'],
+		version: 1,
+		description: 'Use Cohere Embeddings',
+		defaults: {
+			name: 'Embeddings Cohere',
+		},
+		requestDefaults: {
+			ignoreHttpStatusErrors: true,
+			baseURL: '={{ $credentials.host }}',
+		},
+		credentials: [
+			{
+				name: 'cohereApi',
+				required: true,
+			},
+		],
+		codex: {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Embeddings'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/sub-nodes/n8n-nodes-langchain.embeddingscohere/',
+					},
+				],
+			},
+		},
+		// 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.AiEmbedding],
+		outputNames: ['Embeddings'],
+		properties: [
+			getConnectionHintNoticeField([NodeConnectionType.AiVectorStore]),
+			{
+				displayName:
+					'Each model is using different dimensional density for embeddings. Please make sure to use the same dimensionality for your vector store. The default model is using 768-dimensional embeddings.',
+				name: 'notice',
+				type: 'notice',
+				default: '',
+			},
+			{
+				displayName: 'Model',
+				name: 'modelName',
+				type: 'options',
+				description:
+					'The model which will generate the embeddings. <a href="https://docs.cohere.com/docs/models">Learn more</a>.',
+				default: 'embed-english-v2.0',
+				options: [
+					{
+						name: 'Embed-English-v2.0(4096 Dimensions)',
+						value: 'embed-english-v2.0',
+					},
+					{
+						name: 'Embed-English-Light-v2.0(1024 Dimensions)',
+						value: 'embed-english-light-v2.0',
+					},
+					{
+						name: 'Embed-Multilingual-v2.0(768 Dimensions)',
+						value: 'embed-multilingual-v2.0',
+					},
+				],
+			},
+		],
+	};
+
+	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
+		this.logger.verbose('Supply data for embeddings Cohere');
+		const modelName = this.getNodeParameter('modelName', itemIndex, 'embed-english-v2.0') as string;
+		const credentials = await this.getCredentials('cohereApi');
+		const embeddings = new CohereEmbeddings({
+			apiKey: credentials.apiKey as string,
+			model: modelName,
+		});
+
+		return {
+			response: logWrapper(embeddings, this),
+		};
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsCohere/cohere.svg b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsCohere/cohere.svg
new file mode 100644
index 0000000000000..5311832f19c19
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsCohere/cohere.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="1000" height="166.84" style="fill:none"><path d="M281.724 166.807c24.783 0 46.473-12.392 55.048-37.41 1.664-5.01-.724-8.34-5.482-8.34h-9.298c-4.287 0-7.145 1.9-9.062 5.951-7.381 14.545-17.637 19.774-30.5 19.774-22.883 0-36.939-15.974-36.939-42.656 0-26.683 14.544-42.656 36.452-42.656 13.35 0 24.313 5.717 31.223 19.302 2.152 4.052 4.758 5.952 9.062 5.952h9.298c4.758 0 7.146-3.094 5.481-7.633-10.004-27.171-32.417-37.646-55.283-37.646-34.551 0-60.293 25.506-60.293 62.68 0 37.176 24.548 62.682 60.293 62.682m623.629-73.644c3.093-20.26 16.914-32.887 35.745-32.887s32.887 12.863 34.551 32.887zm36.703 73.644c21.925 0 43.85-10.24 54.578-33.359 2.62-5.48.235-9.297-4.525-9.297h-8.813c-4.283 0-6.907 1.9-9.059 5.716-7.146 12.627-19.537 17.873-32.164 17.873-21.69 0-35.745-14.78-37.41-38.84h87.466c4.76 0 7.871-2.622 7.871-7.632-.962-37.41-25.259-59.806-58.868-59.806s-60.293 24.312-60.293 62.68c0 38.369 25.976 62.681 61.25 62.681zm-138.694-59.571h7.868c4.76 0 7.381-2.622 8.105-7.633 4.54-32.198 23.388-36.468 43.43-35.51 4.286.202 7.8-3.094 7.8-7.398v-7.381c0-4.758-2.387-7.633-7.145-7.869-17.738-.672-33.56 5.414-42.706 22.648-.505.941-1.917.69-2.035-.37l-1.48-12.997c-.47-4.758-3.093-7.146-7.868-7.146H773.35c-4.204 0-7.634 3.414-7.634 7.634v4.052c0 4.203 3.414 7.633 7.634 7.633h14.779c4.203 0 7.633 3.413 7.633 7.634v29.07c0 4.203 3.414 7.633 7.634 7.633zm-32.164 57.2h74.584c4.759 0 7.633-2.858 7.633-7.634v-4.052c0-4.758-2.858-7.633-7.633-7.633h-19.066c-4.758 0-7.633-2.858-7.633-7.633v-13.115c0-4.758-2.858-7.633-7.634-7.633h-8.103c-4.76 0-7.634 2.858-7.634 7.633v13.115c0 4.758-2.859 7.633-7.633 7.633h-16.915c-4.758 0-7.633 2.858-7.633 7.633v4.052c0 4.759 2.859 7.634 7.633 7.634zM656.093 93.18c3.094-20.26 16.914-32.887 35.746-32.887 18.83 0 32.887 12.862 34.551 32.887zm36.703 73.643c21.925 0 43.85-10.239 54.577-33.358 2.623-5.481.235-9.298-4.523-9.298h-8.81c-4.288 0-6.91 1.9-9.062 5.717-7.146 12.627-19.538 17.872-32.165 17.872-21.69 0-35.745-14.779-37.41-38.838h87.464c4.758 0 7.87-2.623 7.87-7.633-.96-37.41-25.255-59.806-58.865-59.806s-60.293 24.312-60.293 62.68c0 38.369 25.977 62.681 61.252 62.681zm-275.707 0c35.746 0 61.252-26.448 61.252-62.68s-25.506-62.681-61.252-62.681c-35.745 0-61.25 26.935-61.25 62.68 0 8.34 1.428 17.638 5.715 27.878 2.152 5.01 6.205 5.716 10.492 2.622l6.91-5.01c3.582-2.624 4.523-5.717 3.33-10.24-1.9-5.952-2.388-11.197-2.388-15.72 0-25.019 15.014-42.185 37.175-42.185s37.175 16.914 37.175 42.656-14.78 42.656-36.704 42.656c-7.634 0-14.78-1.43-23.355-7.87-3.581-2.857-6.91-3.328-10.727-.47l-5.245 3.816c-4.288 3.095-4.758 7.382-.724 10.727 12.393 10.005 26.684 13.821 39.563 13.821zm91.5-2.387h7.868c4.204 0 7.634-3.414 7.634-7.634V99.855c0-24.06 12.861-38.368 32.887-38.368 18.108 0 28.6 11.92 28.6 33.845v61.487c0 4.203 3.413 7.633 7.633 7.633h8.103c4.204 0 7.634-3.413 7.634-7.633V91.516c0-32.164-16.444-50.037-44.32-50.037-18.983 0-30.197 7.768-38.57 18.579-.64.824-1.934.37-1.934-.656V7.633c-.05-4.22-3.463-7.633-7.667-7.633h-7.869c-4.203 0-7.633 3.413-7.633 7.633v149.17c0 4.203 3.413 7.633 7.633 7.633" style="fill:#39594d;stroke-width:9.81412029"/><g clip-path="url(#a)" transform="translate(0 -4.907)scale(9.81412)"><path d="M5.508 10.622c.457 0 1.367-.025 2.626-.543 1.466-.604 4.383-1.7 6.487-2.825 1.471-.787 2.117-1.828 2.117-3.23A3.523 3.523 0 0 0 13.214.5H5.061A5.06 5.06 0 0 0 0 5.561c0 2.795 2.122 5.06 5.508 5.06" style="clip-rule:evenodd;fill:#39594d;fill-rule:evenodd"/><path d="M6.887 14.107a3.39 3.39 0 0 1 2.09-3.13l2.568-1.066C14.142 8.833 17 10.74 17 13.554a3.944 3.944 0 0 1-3.945 3.943h-2.78a3.39 3.39 0 0 1-3.388-3.39" style="clip-rule:evenodd;fill:#d18ee2;fill-rule:evenodd"/><path d="M2.917 11.29A2.917 2.917 0 0 0 0 14.206v.377a2.917 2.917 0 0 0 5.835 0v-.378a2.917 2.917 0 0 0-2.918-2.917" style="fill:#ff7759"/></g><defs><clipPath id="a"><path d="M0 0h17v17H0z" style="fill:#fff" transform="translate(0 .5)"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsGoogleGemini/EmbeddingsGoogleGemini.node.ts b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsGoogleGemini/EmbeddingsGoogleGemini.node.ts
new file mode 100644
index 0000000000000..7249b639f650c
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsGoogleGemini/EmbeddingsGoogleGemini.node.ts
@@ -0,0 +1,136 @@
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import {
+	NodeConnectionType,
+	type IExecuteFunctions,
+	type INodeType,
+	type INodeTypeDescription,
+	type SupplyData,
+} from 'n8n-workflow';
+import { GoogleGenerativeAIEmbeddings } from '@langchain/google-genai';
+
+import { logWrapper } from '../../../utils/logWrapper';
+import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+
+export class EmbeddingsGoogleGemini implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Embeddings Google Gemini',
+		name: 'embeddingsGoogleGemini',
+		icon: 'file:google.svg',
+		group: ['transform'],
+		version: 1,
+		description: 'Use Google Gemini Embeddings',
+		defaults: {
+			name: 'Embeddings Google Gemini',
+		},
+		requestDefaults: {
+			ignoreHttpStatusErrors: true,
+			baseURL: '={{ $credentials.host }}',
+		},
+		credentials: [
+			{
+				name: 'googlePalmApi',
+				required: true,
+			},
+		],
+		codex: {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Embeddings'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/sub-nodes/n8n-nodes-langchain.embeddingsgooglegemini/',
+					},
+				],
+			},
+		},
+		// 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.AiEmbedding],
+		outputNames: ['Embeddings'],
+		properties: [
+			getConnectionHintNoticeField([NodeConnectionType.AiVectorStore]),
+			{
+				displayName:
+					'Each model is using different dimensional density for embeddings. Please make sure to use the same dimensionality for your vector store. The default model is using 768-dimensional embeddings.',
+				name: 'notice',
+				type: 'notice',
+				default: '',
+			},
+			{
+				displayName: 'Model',
+				name: 'modelName',
+				type: 'options',
+				description:
+					'The model which will generate the embeddings. <a href="https://developers.generativeai.google/api/rest/generativelanguage/models/list">Learn more</a>.',
+				typeOptions: {
+					loadOptions: {
+						routing: {
+							request: {
+								method: 'GET',
+								url: '/v1beta/models',
+							},
+							output: {
+								postReceive: [
+									{
+										type: 'rootProperty',
+										properties: {
+											property: 'models',
+										},
+									},
+									{
+										type: 'filter',
+										properties: {
+											pass: "={{ $responseItem.name.includes('embedding') }}",
+										},
+									},
+									{
+										type: 'setKeyValue',
+										properties: {
+											name: '={{$responseItem.name}}',
+											value: '={{$responseItem.name}}',
+											description: '={{$responseItem.description}}',
+										},
+									},
+									{
+										type: 'sort',
+										properties: {
+											key: 'name',
+										},
+									},
+								],
+							},
+						},
+					},
+				},
+				routing: {
+					send: {
+						type: 'body',
+						property: 'model',
+					},
+				},
+				default: 'textembedding-gecko-multilingual@latest',
+			},
+		],
+	};
+
+	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
+		this.logger.verbose('Supply data for embeddings Google Gemini');
+		const modelName = this.getNodeParameter(
+			'modelName',
+			itemIndex,
+			'textembedding-gecko-multilingual@latest',
+		) as string;
+		const credentials = await this.getCredentials('googlePalmApi');
+		const embeddings = new GoogleGenerativeAIEmbeddings({
+			apiKey: credentials.apiKey as string,
+			modelName,
+		});
+
+		return {
+			response: logWrapper(embeddings, this),
+		};
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsGoogleGemini/google.svg b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsGoogleGemini/google.svg
new file mode 100644
index 0000000000000..38f3c22592e39
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsGoogleGemini/google.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 48 48"><defs><path id="a" d="M44.5 20H24v8.5h11.8C34.7 33.9 30.1 37 24 37c-7.2 0-13-5.8-13-13s5.8-13 13-13c3.1 0 5.9 1.1 8.1 2.9l6.4-6.4C34.6 4.1 29.6 2 24 2 11.8 2 2 11.8 2 24s9.8 22 22 22c11 0 21-8 21-22 0-1.3-.2-2.7-.5-4"/></defs><clipPath id="b"><use xlink:href="#a" overflow="visible"/></clipPath><path fill="#FBBC05" d="M0 37V11l17 13z" clip-path="url(#b)"/><path fill="#EA4335" d="m0 11 17 13 7-6.1L48 14V0H0z" clip-path="url(#b)"/><path fill="#34A853" d="m0 37 30-23 7.9 1L48 0v48H0z" clip-path="url(#b)"/><path fill="#4285F4" d="M48 48 17 24l-4-3 35-10z" clip-path="url(#b)"/></svg>
\ No newline at end of file
diff --git a/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsGooglePalm/EmbeddingsGooglePalm.node.ts b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsGooglePalm/EmbeddingsGooglePalm.node.ts
new file mode 100644
index 0000000000000..32cbd8822d065
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsGooglePalm/EmbeddingsGooglePalm.node.ts
@@ -0,0 +1,135 @@
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import {
+	NodeConnectionType,
+	type IExecuteFunctions,
+	type INodeType,
+	type INodeTypeDescription,
+	type SupplyData,
+} from 'n8n-workflow';
+import { GooglePaLMEmbeddings } from '@langchain/community/embeddings/googlepalm';
+import { logWrapper } from '../../../utils/logWrapper';
+import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+
+export class EmbeddingsGooglePalm implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Embeddings Google PaLM',
+		name: 'embeddingsGooglePalm',
+		icon: 'file:google.svg',
+		group: ['transform'],
+		version: 1,
+		description: 'Use Google PaLM Embeddings',
+		defaults: {
+			name: 'Embeddings Google PaLM',
+		},
+		requestDefaults: {
+			ignoreHttpStatusErrors: true,
+			baseURL: '={{ $credentials.host }}',
+		},
+		credentials: [
+			{
+				name: 'googlePalmApi',
+				required: true,
+			},
+		],
+		codex: {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Embeddings'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/sub-nodes/n8n-nodes-langchain.embeddingsgooglepalm/',
+					},
+				],
+			},
+		},
+		// 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.AiEmbedding],
+		outputNames: ['Embeddings'],
+		properties: [
+			getConnectionHintNoticeField([NodeConnectionType.AiVectorStore]),
+			{
+				displayName:
+					'Each model is using different dimensional density for embeddings. Please make sure to use the same dimensionality for your vector store. The default model is using 768-dimensional embeddings.',
+				name: 'notice',
+				type: 'notice',
+				default: '',
+			},
+			{
+				displayName: 'Model',
+				name: 'modelName',
+				type: 'options',
+				description:
+					'The model which will generate the embeddings. <a href="https://developers.generativeai.google/api/rest/generativelanguage/models/list">Learn more</a>.',
+				typeOptions: {
+					loadOptions: {
+						routing: {
+							request: {
+								method: 'GET',
+								url: '/v1beta3/models',
+							},
+							output: {
+								postReceive: [
+									{
+										type: 'rootProperty',
+										properties: {
+											property: 'models',
+										},
+									},
+									{
+										type: 'filter',
+										properties: {
+											pass: "={{ $responseItem.name.startsWith('models/embedding') }}",
+										},
+									},
+									{
+										type: 'setKeyValue',
+										properties: {
+											name: '={{$responseItem.name}}',
+											value: '={{$responseItem.name}}',
+											description: '={{$responseItem.description}}',
+										},
+									},
+									{
+										type: 'sort',
+										properties: {
+											key: 'name',
+										},
+									},
+								],
+							},
+						},
+					},
+				},
+				routing: {
+					send: {
+						type: 'body',
+						property: 'model',
+					},
+				},
+				default: 'models/embedding-gecko-001',
+			},
+		],
+	};
+
+	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
+		this.logger.verbose('Supply data for embeddings Google PaLM');
+		const modelName = this.getNodeParameter(
+			'modelName',
+			itemIndex,
+			'models/embedding-gecko-001',
+		) as string;
+		const credentials = await this.getCredentials('googlePalmApi');
+		const embeddings = new GooglePaLMEmbeddings({
+			apiKey: credentials.apiKey as string,
+			modelName,
+		});
+
+		return {
+			response: logWrapper(embeddings, this),
+		};
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsGooglePalm/google.svg b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsGooglePalm/google.svg
new file mode 100644
index 0000000000000..38f3c22592e39
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsGooglePalm/google.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 48 48"><defs><path id="a" d="M44.5 20H24v8.5h11.8C34.7 33.9 30.1 37 24 37c-7.2 0-13-5.8-13-13s5.8-13 13-13c3.1 0 5.9 1.1 8.1 2.9l6.4-6.4C34.6 4.1 29.6 2 24 2 11.8 2 2 11.8 2 24s9.8 22 22 22c11 0 21-8 21-22 0-1.3-.2-2.7-.5-4"/></defs><clipPath id="b"><use xlink:href="#a" overflow="visible"/></clipPath><path fill="#FBBC05" d="M0 37V11l17 13z" clip-path="url(#b)"/><path fill="#EA4335" d="m0 11 17 13 7-6.1L48 14V0H0z" clip-path="url(#b)"/><path fill="#34A853" d="m0 37 30-23 7.9 1L48 0v48H0z" clip-path="url(#b)"/><path fill="#4285F4" d="M48 48 17 24l-4-3 35-10z" clip-path="url(#b)"/></svg>
\ No newline at end of file
diff --git a/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsHuggingFaceInference/EmbeddingsHuggingFaceInference.node.ts b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsHuggingFaceInference/EmbeddingsHuggingFaceInference.node.ts
new file mode 100644
index 0000000000000..4adc8d6014d6f
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsHuggingFaceInference/EmbeddingsHuggingFaceInference.node.ts
@@ -0,0 +1,104 @@
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import {
+	NodeConnectionType,
+	type IExecuteFunctions,
+	type INodeType,
+	type INodeTypeDescription,
+	type SupplyData,
+} from 'n8n-workflow';
+import { HuggingFaceInferenceEmbeddings } from '@langchain/community/embeddings/hf';
+import { logWrapper } from '../../../utils/logWrapper';
+import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+
+export class EmbeddingsHuggingFaceInference implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Embeddings Hugging Face Inference',
+		name: 'embeddingsHuggingFaceInference',
+		icon: 'file:huggingface.svg',
+		group: ['transform'],
+		version: 1,
+		description: 'Use HuggingFace Inference Embeddings',
+		defaults: {
+			name: 'Embeddings HuggingFace Inference',
+		},
+		credentials: [
+			{
+				name: 'huggingFaceApi',
+				required: true,
+			},
+		],
+		codex: {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Embeddings'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/sub-nodes/n8n-nodes-langchain.embeddingshuggingfaceinference/',
+					},
+				],
+			},
+		},
+		// 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.AiEmbedding],
+		outputNames: ['Embeddings'],
+		properties: [
+			getConnectionHintNoticeField([NodeConnectionType.AiVectorStore]),
+			{
+				displayName:
+					'Each model is using different dimensional density for embeddings. Please make sure to use the same dimensionality for your vector store. The default model is using 768-dimensional embeddings.',
+				name: 'notice',
+				type: 'notice',
+				default: '',
+			},
+			{
+				displayName: 'Model Name',
+				name: 'modelName',
+				type: 'string',
+				default: 'sentence-transformers/distilbert-base-nli-mean-tokens',
+				description: 'The model name to use from HuggingFace library',
+			},
+			{
+				displayName: 'Options',
+				name: 'options',
+				placeholder: 'Add Option',
+				description: 'Additional options to add',
+				type: 'collection',
+				default: {},
+				options: [
+					{
+						displayName: 'Custom Inference Endpoint',
+						name: 'endpointUrl',
+						default: '',
+						description: 'Custom endpoint URL',
+						type: 'string',
+					},
+				],
+			},
+		],
+	};
+
+	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
+		this.logger.verbose('Supply data for embeddings HF Inference');
+		const model = this.getNodeParameter(
+			'modelName',
+			itemIndex,
+			'sentence-transformers/distilbert-base-nli-mean-tokens',
+		) as string;
+		const credentials = await this.getCredentials('huggingFaceApi');
+		const options = this.getNodeParameter('options', itemIndex, {}) as object;
+
+		const embeddings = new HuggingFaceInferenceEmbeddings({
+			apiKey: credentials.apiKey as string,
+			model,
+			...options,
+		});
+
+		return {
+			response: logWrapper(embeddings, this),
+		};
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsHuggingFaceInference/huggingface.svg b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsHuggingFaceInference/huggingface.svg
new file mode 100644
index 0000000000000..8f9b152632b92
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsHuggingFaceInference/huggingface.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" fill="none"><path fill="#fff" d="M230.721 172.7a19 19 0 0 0-2.575-5.692q.376-1.377.568-2.791c.829-5.976-1.243-11.447-5.147-15.68-2.115-2.312-4.382-3.839-6.783-4.776a90.6 90.6 0 0 0 2.377-20.568c0-3.163-.179-6.261-.479-9.313a106 106 0 0 0-.567-4.56 91 91 0 0 0-3.051-13.21 91 91 0 0 0-3.054-8.374 92 92 0 0 0-6.041-11.754 81 81 0 0 0-4.907-7.262 69 69 0 0 0-2.704-3.446 90.5 90.5 0 0 0-9.033-9.486 70 70 0 0 0-3.315-2.862 82 82 0 0 0-3.424-2.704 96 96 0 0 0-7.262-4.907c-13.781-8.37-29.942-13.17-47.215-13.17-50.292 0-91.052 40.762-91.052 91.051-.002 7.012.81 14 2.42 20.824-2.16.938-4.23 2.4-6.15 4.515-3.903 4.231-5.976 9.682-5.147 15.658q.189 1.425.567 2.813a19 19 0 0 0-2.573 5.694c-1.2 4.561-.805 8.674.72 12.278-1.658 4.71-1.244 9.726.915 14.087 1.57 3.185 3.817 5.649 6.587 7.851 3.293 2.618 7.415 4.842 12.387 6.976 5.932 2.53 13.173 4.907 16.466 5.779 8.506 2.202 16.662 3.598 24.928 3.666 11.777.109 21.919-2.66 29.18-9.747a88 88 0 0 0 10.752.654 94 94 0 0 0 11.358-.715c7.244 7.132 17.425 9.926 29.245 9.814 8.265-.066 16.421-1.462 24.905-3.667 3.315-.872 10.553-3.249 16.488-5.779 4.972-2.137 9.094-4.361 12.409-6.975 2.749-2.203 4.994-4.666 6.565-7.851 2.181-4.362 2.573-9.378.938-14.088 1.51-3.604 1.903-7.726.704-12.283m-8.44 11.973c1.671 3.171 1.778 6.754.304 10.091-2.236 5.057-7.79 9.041-18.577 13.318-6.708 2.66-12.85 4.361-12.904 4.376-8.872 2.301-16.896 3.47-23.842 3.47-11.502 0-20.061-3.174-25.489-9.442a85.5 85.5 0 0 1-27.747.158c-5.435 6.164-13.945 9.284-25.35 9.284-6.947 0-14.97-1.169-23.843-3.47-.054-.015-6.194-1.716-12.904-4.376-10.786-4.277-16.342-8.258-18.577-13.318-1.474-3.337-1.367-6.92.304-10.091q.231-.443.497-.86a12.8 12.8 0 0 1-1.728-10.341c.664-2.523 2.035-4.621 3.897-6.128a12.75 12.75 0 0 1-1.73-4.822c-.536-3.714.697-7.422 3.47-10.446 2.16-2.353 5.213-3.648 8.593-3.648h.09a84.5 84.5 0 0 1-3.832-25.235c0-46.671 37.836-84.51 84.514-84.51s84.513 37.835 84.513 84.51a84.4 84.4 0 0 1-3.859 25.299q.612-.06 1.201-.061c3.38 0 6.434 1.295 8.592 3.648 2.773 3.021 4.007 6.732 3.47 10.446a12.8 12.8 0 0 1-1.729 4.822c1.862 1.507 3.234 3.605 3.897 6.128a12.8 12.8 0 0 1-1.728 10.341q.267.413.497.857"/><path fill="#FF9D00" d="M221.784 183.816a12.8 12.8 0 0 0 1.728-10.341c-.664-2.523-2.036-4.621-3.897-6.128a12.7 12.7 0 0 0 1.729-4.822c.537-3.714-.696-7.422-3.47-10.446-2.158-2.353-5.212-3.648-8.592-3.648q-.59 0-1.201.061a84.4 84.4 0 0 0 3.852-25.297c0-46.672-37.836-84.51-84.509-84.51S42.91 76.52 42.91 123.195a84.5 84.5 0 0 0 3.832 25.235h-.09c-3.38 0-6.433 1.294-8.592 3.647-2.773 3.021-4.007 6.733-3.47 10.446a12.8 12.8 0 0 0 1.73 4.823c-1.862 1.506-3.234 3.604-3.898 6.127a12.8 12.8 0 0 0 1.73 10.343q-.266.417-.497.86c-1.67 3.171-1.778 6.754-.303 10.091 2.236 5.057 7.79 9.041 18.577 13.318 6.707 2.66 12.85 4.361 12.904 4.376 8.872 2.301 16.896 3.47 23.842 3.47 11.406 0 19.916-3.12 25.351-9.284a85.5 85.5 0 0 0 27.747-.158c5.428 6.268 13.987 9.442 25.489 9.442 6.946 0 14.97-1.169 23.841-3.47.055-.015 6.195-1.716 12.905-4.376 10.787-4.277 16.342-8.261 18.577-13.318 1.474-3.337 1.367-6.92-.304-10.091q-.23-.447-.497-.86m-111.647 13.181a35 35 0 0 1-1.502 2.394c-1.405 2.057-3.253 3.629-5.398 4.797-4.1 2.236-9.29 3.017-14.562 3.017-8.329 0-16.867-1.949-21.652-3.19-.236-.061-29.334-8.28-25.65-15.276.62-1.177 1.64-1.647 2.925-1.647 5.187 0 14.632 7.724 18.69 7.724.908 0 1.548-.386 1.809-1.328 1.73-6.204-26.293-8.812-23.933-17.796.416-1.59 1.546-2.236 3.134-2.236 6.858-.001 22.25 12.06 25.469 12.06.247 0 .424-.073.52-.225l.041-.069c1.511-2.495.644-4.309-9.707-10.649l-.994-.605c-11.391-6.894-19.386-11.043-14.84-15.993.524-.571 1.266-.824 2.167-.824 1.068 0 2.36.357 3.785.957 6.016 2.537 14.354 9.456 17.837 12.473a146 146 0 0 1 1.633 1.441s4.41 4.586 7.076 4.586c.614 0 1.135-.242 1.488-.84 1.891-3.188-17.563-17.93-18.66-24.013-.744-4.121.522-6.209 2.862-6.209 1.113 0 2.47.474 3.97 1.425 4.65 2.951 13.628 18.379 16.915 24.381 1.102 2.011 2.983 2.861 4.678 2.861 3.363 0 5.992-3.343.308-7.591-8.543-6.392-5.545-16.84-1.468-17.483q.262-.042.525-.042c3.708 0 5.343 6.389 5.343 6.389s4.794 12.038 13.029 20.267c7.472 7.469 8.516 13.598 4.162 21.244m26.629 1.41-.427.051-.728.083q-.575.06-1.152.113l-.375.034-.343.029-.486.039-.537.039-.536.035-.119.008q-.21.013-.422.024l-.179.01q-.248.013-.5.024l-.581.025-.527.018-.352.01h-.179c-.11 0-.219.006-.329.007h-.174q-.165-.001-.329.005l-.448.006h-.625q-.737 0-1.469-.015l-.396-.009q-.17-.001-.337-.009l-.42-.012-.521-.02-.47-.021-.121-.005-.447-.023q-.187-.01-.372-.022l-.289-.017a80 80 0 0 1-1.089-.076l-.38-.031q-.24-.019-.479-.041-.28-.024-.561-.052a60 60 0 0 1-.939-.095h-.015c4.57-10.195 2.259-19.717-6.976-28.944-6.057-6.049-10.086-14.981-10.922-16.942-1.692-5.805-6.17-12.258-13.607-12.258q-.945 0-1.878.148c-3.258.513-6.106 2.388-8.138 5.21-2.196-2.731-4.33-4.902-6.26-6.128-2.91-1.845-5.814-2.781-8.643-2.781-3.531 0-6.687 1.45-8.887 4.08l-.056.067-.123-.52-.005-.023a74 74 0 0 1-1.054-5.412q.002-.018-.006-.036l-.063-.412q-.093-.61-.173-1.22l-.073-.555-.068-.555c-.022-.185-.04-.353-.06-.529l-.006-.044q-.12-1.08-.21-2.162l-.022-.277-.035-.472q-.016-.194-.027-.389c0-.031-.005-.061-.006-.09a53 53 0 0 1-.065-1.088q-.016-.283-.028-.567l-.02-.496-.005-.15-.016-.457-.01-.389c0-.155-.008-.31-.01-.465-.003-.155-.007-.325-.008-.489-.002-.164 0-.326-.005-.489-.004-.164 0-.327 0-.49 0-41.853 33.93-75.784 75.788-75.784 41.856 0 75.786 33.93 75.786 75.784v.979q-.002.245-.008.489c0 .135-.006.268-.01.405q-.002.182-.009.357c0 .153-.009.306-.014.459v.012l-.021.531-.021.466-.005.11-.027.496a81 81 0 0 1-.241 3.184v.013q-.025.261-.053.522l-.045.411-.089.804-.051.407-.063.479q-.034.262-.072.522-.04.292-.084.583l-.069.459-.082.52q-.042.26-.09.517c-.033.173-.059.345-.089.517q-.09.516-.189 1.031-.151.77-.31 1.537l-.11.507q-.055.254-.113.508c-2.133-2.073-4.958-3.202-8.073-3.202-2.827 0-5.734.935-8.643 2.78-1.93 1.226-4.063 3.398-6.26 6.128-2.035-2.822-4.883-4.697-8.139-5.21a12 12 0 0 0-1.878-.148c-7.439 0-11.914 6.453-13.607 12.258-.84 1.961-4.87 10.893-10.932 16.951-9.229 9.198-11.557 18.677-7.059 28.83m78.241-20.409-.03.089a5 5 0 0 1-.263.587q-.112.21-.244.408-.25.374-.549.711c-.046.052-.09.104-.142.155a8 8 0 0 1-.22.227c-1.346 1.334-3.398 2.504-5.718 3.577l-.799.358-.268.119c-.179.079-.358.157-.546.234q-.27.118-.551.232l-.558.23c-1.305.537-2.642 1.049-3.946 1.554l-.558.217-.551.216q-.55.214-1.085.429l-.531.214-.522.213-.256.108-.505.213c-3.837 1.647-6.598 3.322-6.018 5.4q.024.088.054.17.078.23.212.436.078.122.179.228c.682.709 1.923.597 3.488.034q.33-.121.656-.253l.136-.056c.358-.152.737-.322 1.124-.506.097-.046.195-.09.293-.141 1.914-.936 4.083-2.196 6.235-3.343a56 56 0 0 1 2.618-1.325c2.038-.959 3.954-1.639 5.494-1.639.723 0 1.361.148 1.893.488l.089.059c.334.235.614.537.823.887q.061.101.12.211c.761 1.445.124 2.941-1.367 4.408-1.431 1.409-3.657 2.79-6.187 4.068q-.281.143-.567.283c-7.53 3.698-17.391 6.483-17.528 6.518-2.628.681-6.386 1.575-10.62 2.244l-.626.098-.103.015q-.711.108-1.425.201-.725.097-1.462.179l-.09.01a69 69 0 0 1-5.358.406h-.026q-.971.035-1.943.035h-.747a46 46 0 0 1-2.959-.134q-.035.002-.071-.006-.53-.04-1.057-.099a40 40 0 0 1-1.092-.132 25 25 0 0 1-.715-.107 58 58 0 0 1-.725-.121l-.329-.062-.025-.005a26 26 0 0 1-1.036-.219c-.2-.045-.399-.089-.596-.143l-.119-.03q-.146-.037-.29-.076l-.053-.014-.308-.09-.336-.098-.039-.011-.291-.089q-.165-.052-.329-.106l-.268-.089-.197-.069q-.285-.1-.566-.208l-.178-.07-.147-.058a23 23 0 0 1-.845-.358l-.185-.09-.031-.014q-.099-.048-.197-.089a17 17 0 0 1-.384-.191l-.039-.019-.184-.097a16 16 0 0 1-.961-.546l-.172-.106a9 9 0 0 1-.256-.164l-.224-.148-.241-.166-.144-.103q-.228-.162-.447-.335l-.233-.179a15 15 0 0 1-.276-.228q-.115-.095-.227-.195l-.006-.005q-.121-.106-.239-.215a12 12 0 0 1-.232-.216l-.009-.009a9 9 0 0 1-.235-.232q-.117-.117-.231-.236t-.226-.243c-.074-.082-.142-.157-.212-.238l-.023-.027a9 9 0 0 1-.201-.238 12 12 0 0 1-.416-.525q-.203-.27-.396-.551l-.123-.184q-.246-.36-.479-.728a19 19 0 0 1-.339-.536q-.106-.17-.207-.339l-.028-.046q-.098-.164-.191-.327a3 3 0 0 1-.102-.179c-.033-.062-.071-.125-.106-.188l-.057-.099-.035-.064q-.1-.18-.197-.363-.044-.082-.09-.16l-.089-.173-.09-.171q-.338-.675-.638-1.368l-.071-.169q-.067-.17-.135-.336-.034-.08-.063-.161a17 17 0 0 1-.776-2.639q-.017-.083-.031-.163a12 12 0 0 1-.127-.806q-.012-.08-.02-.159l-.017-.162a11 11 0 0 1-.049-.638q-.002-.082-.007-.16a8 8 0 0 1-.008-.318c-.056-4.273 2.106-8.381 6.729-13.002 8.235-8.227 13.029-20.266 13.029-20.266s.129-.505.397-1.232q.055-.151.12-.314.234-.611.527-1.197l.039-.075q.25-.498.544-.971c.046-.073.09-.145.141-.218q.22-.326.465-.634c.089-.111.186-.221.283-.328q.057-.064.118-.124c.477-.493 1.022-.895 1.639-1.109l.078-.026q.078-.025.157-.048.091-.024.185-.043l.029-.006q.195-.039.395-.052h.011c.069 0 .139-.007.21-.007.089 0 .172 0 .259.009q.135.012.269.032c.742.118 1.448.56 2.056 1.242q.347.391.621.836.18.288.34.609c.043.089.084.171.124.259a8 8 0 0 1 .28.691q.293.827.439 1.692.126.758.15 1.526.012.41 0 .829a12 12 0 0 1-.787 3.792q-.065.167-.134.335a9 9 0 0 1-.302.665q-.12.248-.258.496-.09.165-.186.33-.242.41-.522.817l-.113.162a13.6 13.6 0 0 1-1.472 1.728 15.4 15.4 0 0 1-1.699 1.47q-.905.67-1.689 1.477c-1.503 1.577-1.853 2.969-1.515 4.024q.081.25.211.479.152.261.357.48l.053.055.054.054q.08.078.172.153l.06.048q.218.168.46.3c.047.025.089.05.142.074q.261.128.537.217.076.025.154.048l.065.017.09.024.077.019.084.018.083.017.079.013q.087.016.178.027l.057.009.104.01.064.007.105.007h.062l.11.006h.346l.099-.006.114-.007.139-.013.13-.015c.03 0 .06-.008.09-.014.4-.058.792-.164 1.167-.316l.159-.067a5 5 0 0 0 .772-.421q.344-.225.647-.503.072-.066.141-.133.034-.032.067-.067.067-.066.133-.138.482-.53.825-1.157a229 229 0 0 1 6.151-10.514l.294-.471.297-.471q.223-.358.447-.708l.15-.234q.747-1.17 1.519-2.324l.305-.456c.612-.907 1.222-1.789 1.827-2.627l.301-.415a56 56 0 0 1 2.054-2.661l.282-.338c.047-.056.09-.112.141-.166q.14-.165.277-.321c.046-.053.089-.105.138-.157l.268-.302.134-.147q.202-.217.397-.417c.09-.09.173-.179.259-.263a10.5 10.5 0 0 1 1.669-1.386l.14-.09q.201-.136.415-.25c2.364-1.342 4.321-1.441 5.448-.314.682.682 1.06 1.813 1.039 3.387q.001.103-.005.211v.077q-.002.108-.012.217c0 .09-.01.179-.019.269-.009.089-.014.157-.023.237q-.001.033-.008.069-.01.104-.025.211.002.032-.008.065a5 5 0 0 1-.041.283c-.011.09-.026.174-.042.262l-.026.149a4 4 0 0 1-.1.42 6 6 0 0 1-.283.758 11 11 0 0 1-.514.987q-.156.267-.322.526-.172.269-.358.543-.474.678-.985 1.328l-.156.197a51 51 0 0 1-1.722 2.035l-.187.21q-.378.422-.77.848l-.197.214c-.131.143-.268.286-.4.43q-.198.215-.406.433l-.411.433-.417.436-.42.436q-.423.438-.85.876c-4.055 4.159-8.327 8.304-9.773 10.888a5 5 0 0 0-.262.519c-.206.47-.292.872-.233 1.197a.9.9 0 0 0 .111.303q.122.212.295.387.08.078.168.144c.298.212.657.321 1.023.311h.114l.117-.009.117-.013.097-.014q.02-.002.04-.008l.089-.017.023-.005.099-.021.035-.009.104-.028c.035-.01.083-.023.125-.037q.264-.08.517-.188.133-.054.262-.117.068-.03.132-.063l.134-.066q.48-.25.936-.541l.133-.09q.068-.041.133-.089l.133-.089.071-.049.192-.135c.179-.123.346-.25.515-.379l.015-.012.269-.208c.367-.29.715-.582 1.031-.857l.21-.184.019-.018.11-.097c.258-.232.488-.448.679-.626l.079-.077q.103-.099.189-.178l.112-.111.04-.039.011-.011.117-.117.074-.077.009-.007.035-.032.044-.04.014-.013.037-.034.204-.179.114-.102q.091-.08.179-.162l.136-.121q.037-.03.074-.064l.143-.125.21-.185.112-.097c.435-.378.964-.835 1.572-1.35l.249-.211.411-.345.421-.351c.55-.457 1.142-.942 1.768-1.445l.411-.33q.526-.42 1.073-.849.22-.173.448-.344.558-.434 1.123-.859c.858-.648 1.743-1.297 2.639-1.929l.384-.268q.403-.279.805-.552l.243-.164q.72-.488 1.455-.951l.243-.153.241-.15q.363-.225.721-.44l.239-.143.478-.278.469-.269.095-.052.371-.204q.232-.126.463-.244l.229-.118.223-.112.231-.113a22 22 0 0 1 1.954-.845l.41-.144q.185-.062.358-.115l.04-.012q.093-.03.185-.054l.018-.005q.192-.055.38-.099h.009a8 8 0 0 1 1.077-.183q.25-.026.502-.025h.084q.167 0 .327.018c.049 0 .098.01.146.016h.02q.072.008.144.024.071.013.141.028h.015c.047.01.089.022.138.036.254.071.496.181.718.325q.164.107.305.24l.027.026.051.05.049.053c.402.421.734.904.984 1.43l.038.09q.128.3.2.618c.142.646.087 1.32-.158 1.935a4.7 4.7 0 0 1-.339.715 8 8 0 0 1-1.099 1.452l-.089.095q-.199.21-.416.42-.097.094-.198.188l-.205.189-.107.095q-.388.345-.792.669-.244.198-.493.388-.879.672-1.791 1.297a60 60 0 0 1-1.11.743 100 100 0 0 1-2.786 1.763c-1.968 1.21-4.149 2.504-6.474 3.911l-.602.365q-.988.603-1.867 1.152l-.295.185-.558.358q-.555.356-1.108.715l-.297.196q-.217.142-.433.286l-.141.09-.432.291-.229.157-.268.186-.249.173q-.626.442-1.162.843l-.134.102q-.315.239-.623.486-.464.373-.844.716l-.124.113q-.107.098-.208.194-.067.068-.137.133l-.064.064q-.215.216-.418.442l-.066.076q-.22.254-.387.492l-.05.071q-.132.192-.242.396-.028.051-.053.102l-.049.102-.033.074-.021.05-.017.045-.023.061a2.6 2.6 0 0 0-.13.523l-.008.062-.006.058v.315q-.002.038.007.08l.005.048c0 .026.006.051.01.079.004.026.011.073.019.11v.005q.01.052.023.104c.009.035.018.075.029.111q.03.106.068.211.023.063.048.124.002.012.01.025l.036.081.05.111q.081.172.177.336l.066.114.068.114a.4.4 0 0 0 .041.054l.022.023.025.023.026.02a.5.5 0 0 0 .122.063q.035.012.071.02c.577.13 1.763-.347 3.339-1.179.089-.048.187-.098.282-.15l.48-.262.234-.13c.167-.089.337-.19.511-.289l.317-.179c2.083-1.199 4.571-2.739 7.143-4.243q.362-.212.725-.421l.486-.311q.846-.485 1.7-.957a80 80 0 0 1 2.168-1.15l.476-.241q.474-.234.938-.456a41 41 0 0 1 1.815-.809l.335-.136.04-.016c1.775-.703 3.384-1.137 4.686-1.137q.423-.004.84.069h.009c.089.016.17.034.253.054h.015q.32.081.616.23c.275.142.522.331.731.559q.144.16.256.343.21.324.329.692c.032.095.06.188.089.287a3.93 3.93 0 0 1-.06 2.305"/><path fill="#FFD21E" fill-rule="evenodd" d="M203.21 123.685v-.491c0-41.854-33.918-75.783-75.775-75.783-41.856 0-75.787 33.931-75.787 75.783v.164a7 7 0 0 0 0 .327q.008.244.005.489l.005.36.003.129q0 .09.004.179.005.143.005.286l.011.389.016.457.005.15.02.473v.023l.027.553.001.014q.014.282.032.566.014.261.033.522l.002.031.03.448.003.04.033.432.003.028q.008.127.02.249.09 1.082.21 2.161l.004.045.061.529.068.555.05.377.023.177q.08.612.173 1.221l.004.027.059.384q.429 2.745 1.06 5.45l.005.022.032.135.091.385.056-.067c2.2-2.63 5.356-4.08 8.887-4.08 2.83 0 5.733.936 8.643 2.781 1.93 1.226 4.064 3.397 6.26 6.128 2.032-2.822 4.88-4.698 8.138-5.21.621-.098 1.25-.147 1.878-.148 7.436 0 11.915 6.453 13.607 12.258.836 1.961 4.865 10.893 10.941 16.935 9.236 9.227 11.547 18.748 6.976 28.943h.016q.466.053.939.096.28.028.561.052l.066.006.413.035.38.03q.543.042 1.089.077l.289.017.229.014.142.008.447.023.122.005.469.021.522.02.419.012.07.002q.133.006.267.007l.096.003q.885.021 1.769.02h.626l.447-.005q.164-.006.33-.005h.174l.151-.004q.088-.004.178-.004h.179l.351-.009.528-.018.581-.026q.252-.01.5-.023l.179-.011.266-.014.156-.009.118-.008.537-.035.536-.039.487-.039.342-.029.376-.034a62 62 0 0 0 1.88-.197l.427-.051c-4.499-10.152-2.17-19.632 7.027-28.822 6.063-6.058 10.092-14.99 10.932-16.952 1.693-5.804 6.169-12.257 13.607-12.257.629 0 1.258.05 1.879.148 3.255.512 6.103 2.388 8.138 5.21 2.197-2.73 4.33-4.903 6.261-6.129 2.909-1.844 5.815-2.78 8.642-2.78 3.116 0 5.94 1.13 8.073 3.203q.058-.253.114-.508l.109-.506q.059-.278.115-.555.1-.49.195-.984.099-.513.189-1.03l.031-.186.058-.331q.05-.258.09-.518l.011-.066.071-.453.07-.459v-.004q.076-.508.144-1.017l.011-.084.063-.478.051-.408.09-.804.035-.323.009-.088q.029-.261.053-.522v-.014l.039-.416q.107-1.182.179-2.375.013-.195.024-.392v-.006l.026-.491.006-.11q.024-.498.041-.996v-.012l.005-.13q.008-.164.009-.329l.002-.044q.007-.156.008-.314l.003-.09q.005-.157.006-.314l.002-.089q.005-.2.006-.4zm-94.572 75.706c6.002-8.801 5.576-15.407-2.658-23.637-8.236-8.231-13.029-20.267-13.029-20.267s-1.789-6.991-5.869-6.349-7.073 11.089 1.47 17.484c8.542 6.395-1.7 10.731-4.988 4.73-3.288-6.002-12.265-21.429-16.919-24.38s-7.927-1.297-6.83 4.785c.545 3.019 5.613 8.172 10.348 12.986 4.804 4.884 9.265 9.42 8.311 11.025-1.893 3.187-8.56-3.745-8.56-3.745s-20.876-18.998-25.42-14.047c-4.19 4.563 2.271 8.442 12.227 14.421q1.27.762 2.611 1.572c11.391 6.896 12.277 8.715 10.66 11.324-.597.964-4.41-1.325-9.1-4.14-7.995-4.801-18.537-11.13-20.026-5.465-1.288 4.903 6.468 7.907 13.502 10.632 5.86 2.27 11.22 4.346 10.431 7.164-.817 2.922-5.246.485-10.087-2.179-5.435-2.991-11.39-6.267-13.339-2.57-3.683 6.99 25.41 15.219 25.65 15.28 9.4 2.438 33.272 7.604 41.615-4.624m38.665 0c-6.002-8.801-5.576-15.407 2.659-23.637s13.028-20.267 13.028-20.267 1.789-6.991 5.869-6.349 7.073 11.089-1.469 17.484 1.699 10.731 4.987 4.73c3.289-6.002 12.26-21.429 16.914-24.38s7.929-1.297 6.831 4.785c-.544 3.019-5.613 8.172-10.348 12.987-4.804 4.884-9.265 9.419-8.312 11.024 1.893 3.187 8.565-3.749 8.565-3.749s20.875-18.997 25.421-14.046c4.189 4.562-2.272 8.442-12.229 14.421q-1.306.784-2.61 1.572c-11.391 6.896-12.277 8.715-10.661 11.323.598.965 4.411-1.325 9.1-4.14 7.996-4.8 18.538-11.13 20.027-5.464 1.289 4.903-6.468 7.907-13.502 10.632-5.86 2.27-11.22 4.346-10.432 7.164.816 2.921 5.244.484 10.084-2.18 5.435-2.991 11.391-6.269 13.339-2.569 3.684 6.994-25.414 15.215-25.649 15.275-9.4 2.446-33.272 7.612-41.612-4.616" clip-rule="evenodd"/><path fill="#32343D" fill-rule="evenodd" d="M152.047 102.567c1.182.418 2.061 1.69 2.897 2.901 1.13 1.636 2.182 3.159 3.796 2.301a10.91 10.91 0 0 0 4.247-15.214 10.91 10.91 0 0 0-7.742-5.198 10.904 10.904 0 0 0-11.689 6.589 10.9 10.9 0 0 0 .436 9.314c.748 1.407 2.408.743 4.16.042 1.373-.549 2.804-1.121 3.895-.735m-51.375 0c-1.182.418-2.061 1.691-2.897 2.901-1.13 1.637-2.183 3.159-3.796 2.301a10.903 10.903 0 0 1 8.263-20.068 10.91 10.91 0 0 1 7.707 9.348 10.9 10.9 0 0 1-1.221 6.211c-.749 1.407-2.409.743-4.161.043-1.374-.55-2.803-1.122-3.895-.736m43.427 46.751c8.143-6.415 11.134-16.889 11.134-23.341 0-5.1-3.431-3.495-8.924-.775l-.31.153c-5.042 2.497-11.754 5.822-19.122 5.822s-14.081-3.325-19.122-5.823c-5.671-2.809-9.228-4.571-9.228.624 0 6.656 3.182 17.585 11.916 23.934a18.97 18.97 0 0 1 11.575-9.786c.872-.26 1.77 1.241 2.689 2.778.887 1.482 1.794 2.998 2.716 2.998.983 0 1.948-1.494 2.891-2.952.985-1.525 1.946-3.01 2.875-2.713a18.97 18.97 0 0 1 10.91 9.081" clip-rule="evenodd"/><path fill="#FF323D" d="M144.097 149.317c-4.241 3.342-9.878 5.583-17.219 5.583-6.897 0-12.291-1.978-16.435-4.989a18.97 18.97 0 0 1 11.575-9.786c1.712-.511 3.527 5.776 5.405 5.776 2.01 0 3.947-6.246 5.766-5.665a18.97 18.97 0 0 1 10.908 9.081"/><path fill="#FFAD03" fill-rule="evenodd" d="M81.2 111.64a7.08 7.08 0 0 1-6.65.655 7.06 7.06 0 0 1-3.837-3.837 7.08 7.08 0 0 1 .657-6.65 7.087 7.087 0 1 1 9.83 9.832m101.413 0a7.08 7.08 0 0 1-6.651.655 7.06 7.06 0 0 1-3.837-3.837 7.1 7.1 0 0 1-.504-3.407 7.1 7.1 0 0 1 3.411-5.385 7.08 7.08 0 0 1 8.656 1.07 7.08 7.08 0 0 1 1.536 7.724 7.1 7.1 0 0 1-2.611 3.18" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsMistralCloud/EmbeddingsMistralCloud.node.ts b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsMistralCloud/EmbeddingsMistralCloud.node.ts
new file mode 100644
index 0000000000000..d8223a2ffed4d
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsMistralCloud/EmbeddingsMistralCloud.node.ts
@@ -0,0 +1,156 @@
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import {
+	NodeConnectionType,
+	type IExecuteFunctions,
+	type INodeType,
+	type INodeTypeDescription,
+	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';
+
+export class EmbeddingsMistralCloud implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Embeddings Mistral Cloud',
+		name: 'embeddingsMistralCloud',
+		icon: 'file:mistral.svg',
+		credentials: [
+			{
+				name: 'mistralCloudApi',
+				required: true,
+			},
+		],
+		group: ['transform'],
+		version: 1,
+		description: 'Use Embeddings Mistral Cloud',
+		defaults: {
+			name: 'Embeddings Mistral Cloud',
+		},
+
+		codex: {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Embeddings'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/sub-nodes/n8n-nodes-langchain.embeddingsmistralcloud/',
+					},
+				],
+			},
+		},
+		// 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.AiEmbedding],
+		outputNames: ['Embeddings'],
+		requestDefaults: {
+			ignoreHttpStatusErrors: true,
+			baseURL: 'https://api.mistral.ai/v1',
+		},
+		properties: [
+			getConnectionHintNoticeField([NodeConnectionType.AiVectorStore]),
+			{
+				displayName: 'Model',
+				name: 'model',
+				type: 'options',
+				description:
+					'The model which will compute the embeddings. <a href="https://docs.mistral.ai/platform/endpoints/">Learn more</a>.',
+				typeOptions: {
+					loadOptions: {
+						routing: {
+							request: {
+								method: 'GET',
+								url: '/models',
+							},
+							output: {
+								postReceive: [
+									{
+										type: 'rootProperty',
+										properties: {
+											property: 'data',
+										},
+									},
+									{
+										type: 'filter',
+										properties: {
+											pass: "={{ $responseItem.id.includes('embed') }}",
+										},
+									},
+									{
+										type: 'setKeyValue',
+										properties: {
+											name: '={{ $responseItem.id }}',
+											value: '={{ $responseItem.id }}',
+										},
+									},
+									{
+										type: 'sort',
+										properties: {
+											key: 'name',
+										},
+									},
+								],
+							},
+						},
+					},
+				},
+				routing: {
+					send: {
+						type: 'body',
+						property: 'model',
+					},
+				},
+				default: 'mistral-embed',
+			},
+			{
+				displayName: 'Options',
+				name: 'options',
+				placeholder: 'Add Option',
+				description: 'Additional options to add',
+				type: 'collection',
+				default: {},
+				options: [
+					{
+						displayName: 'Batch Size',
+						name: 'batchSize',
+						default: 512,
+						typeOptions: { maxValue: 2048 },
+						description: 'Maximum number of documents to send in each request',
+						type: 'number',
+					},
+					{
+						displayName: 'Strip New Lines',
+						name: 'stripNewLines',
+						default: true,
+						description: 'Whether to strip new lines from the input text',
+						type: 'boolean',
+					},
+				],
+			},
+		],
+	};
+
+	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
+		const credentials = await this.getCredentials('mistralCloudApi');
+		const modelName = this.getNodeParameter('model', itemIndex) as string;
+		const options = this.getNodeParameter(
+			'options',
+			itemIndex,
+			{},
+		) as Partial<MistralAIEmbeddingsParams>;
+
+		const embeddings = new MistralAIEmbeddings({
+			apiKey: credentials.apiKey as string,
+			modelName,
+			...options,
+		});
+
+		return {
+			response: logWrapper(embeddings, this),
+		};
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsMistralCloud/mistral.svg b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsMistralCloud/mistral.svg
new file mode 100644
index 0000000000000..928faf4518a51
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsMistralCloud/mistral.svg
@@ -0,0 +1,262 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="216"
+   height="216"
+   version="1.1"
+   id="svg41"
+   sodipodi:docname="mistral.svg"
+   inkscape:version="1.3.2 (091e20ef0f, 2023-11-25, custom)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview41"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="1.936488"
+     inkscape:cx="197.78072"
+     inkscape:cy="79.00901"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg41" />
+  <style
+     id="style1"><![CDATA[.I{fill:#ff7000}.J{fill:#ff4900}.K{fill:#ffa300}.L{fill:#1c1c1b icc-color(adobe-rgb-1998, 0.13299561, 0.13299561, 0.1289978)}]]></style>
+  <defs
+     id="defs10">
+    <clipPath
+       id="A">
+      <path
+         d="M 0,184.252 H 481.89 V 0 H 0 Z"
+         transform="translate(-206.251,-140.139)"
+         id="path1" />
+    </clipPath>
+    <clipPath
+       id="B">
+      <path
+         d="M 0,184.252 H 481.89 V 0 H 0 Z"
+         transform="translate(-247.436,-104.865)"
+         id="path2" />
+    </clipPath>
+    <clipPath
+       id="C">
+      <path
+         d="M 0,184.252 H 481.89 V 0 H 0 Z"
+         transform="translate(-285.938,-102.089)"
+         id="path3" />
+    </clipPath>
+    <clipPath
+       id="D">
+      <path
+         d="M 0,184.252 H 481.89 V 0 H 0 Z"
+         transform="translate(-337.769,-131.877)"
+         id="path4" />
+    </clipPath>
+    <clipPath
+       id="E">
+      <path
+         d="M 0,184.252 H 481.89 V 0 H 0 Z"
+         transform="translate(-377.247,-132.319)"
+         id="path5" />
+    </clipPath>
+    <clipPath
+       id="F">
+      <path
+         d="M 0,184.252 H 481.89 V 0 H 0 Z"
+         transform="translate(-418.107,-114.634)"
+         id="path6" />
+    </clipPath>
+    <clipPath
+       id="G">
+      <path
+         d="M 0,184.252 H 481.89 V 0 H 0 Z"
+         transform="translate(-450.023,-140.139)"
+         id="path7" />
+    </clipPath>
+    <clipPath
+       id="H">
+      <path
+         d="M 0,184.252 H 481.89 V 0 H 0 Z"
+         transform="translate(-217.694,-44.794)"
+         id="path8" />
+    </clipPath>
+    <clipPath
+       id="I">
+      <path
+         d="M 0,184.252 H 481.89 V 0 H 0 Z"
+         transform="translate(-247.436,-35.025)"
+         id="path9" />
+    </clipPath>
+    <clipPath
+       id="J">
+      <path
+         d="M 0,184.252 H 481.89 V 0 H 0 Z"
+         id="path10" />
+    </clipPath>
+    <path
+       id="K"
+       d="m 173.987,134.362 h -37.795 l 9.633,-37.776 h 37.796 z" />
+  </defs>
+  <g
+     transform="matrix(1,0,0.254535,1,-51.362792,-7.4725007)"
+     id="g32">
+    <g
+       class="L"
+       id="g22">
+      <path
+         d="M 98.397,134.362 H 60.602 l 9.633,-37.776 h 37.796 z"
+         id="path11" />
+      <path
+         d="M 126.558,172.138 H 88.763 l 9.633,-37.776 h 37.796 z"
+         id="path12" />
+      <path
+         d="M 136.192,134.362 H 98.397 l 9.633,-37.776 h 37.796 z"
+         id="path13" />
+      <use
+         xlink:href="#K"
+         id="use13" />
+      <path
+         d="M 108.031,96.585 H 70.236 l 9.633,-37.776 h 37.796 z"
+         id="path14" />
+      <use
+         xlink:href="#K"
+         x="9.6339998"
+         y="-37.777"
+         id="use14" />
+      <path
+         d="M 60.602,134.362 H 22.807 L 32.44,96.586 h 37.796 z"
+         id="path15" />
+      <path
+         d="M 70.236,96.585 H 32.441 L 42.074,58.809 H 79.87 Z"
+         id="path16" />
+      <path
+         d="M 79.87,58.809 H 42.075 l 9.633,-37.776 h 37.796 z"
+         id="path17" />
+      <use
+         xlink:href="#K"
+         x="57.063"
+         y="-75.553001"
+         id="use17" />
+      <path
+         d="M 50.968,172.138 H 13.173 l 9.633,-37.776 h 37.796 z"
+         id="path18" />
+      <path
+         d="M 41.334,209.915 H 3.539 l 9.633,-37.776 h 37.796 z"
+         id="path19" />
+      <use
+         xlink:href="#K"
+         x="37.794998"
+         id="use19" />
+      <use
+         xlink:href="#K"
+         x="47.429001"
+         y="-37.777"
+         id="use20" />
+      <use
+         xlink:href="#K"
+         x="28.160999"
+         y="37.776001"
+         id="use21" />
+      <use
+         xlink:href="#K"
+         x="18.527"
+         y="75.553001"
+         id="use22" />
+    </g>
+    <path
+       d="M 114.115,134.359 H 76.321 l 9.633,-37.776 h 37.796 z"
+       class="I"
+       id="path22" />
+    <use
+       xlink:href="#K"
+       x="-31.709999"
+       y="37.772999"
+       class="J"
+       id="use23" />
+    <g
+       class="I"
+       id="g25">
+      <use
+         xlink:href="#K"
+         x="-22.076"
+         y="-0.003"
+         id="use24" />
+      <use
+         xlink:href="#K"
+         x="15.719"
+         y="-0.003"
+         id="use25" />
+    </g>
+    <g
+       class="K"
+       id="g26">
+      <path
+         d="M 123.749,96.582 H 85.955 l 9.633,-37.776 h 37.796 z"
+         id="path25" />
+      <use
+         xlink:href="#K"
+         x="25.353001"
+         y="-37.779999"
+         id="use26" />
+    </g>
+    <path
+       d="M 76.32,134.359 H 38.526 l 9.633,-37.776 h 37.796 z"
+       class="I"
+       id="path26" />
+    <path
+       d="M 85.954,96.582 H 48.16 l 9.633,-37.776 h 37.796 z"
+       class="K"
+       id="path27" />
+    <g
+       fill="#ffce00"
+       id="g28">
+      <path
+         d="M 95.588,58.806 H 57.794 L 67.427,21.03 h 37.796 z"
+         id="path28" />
+      <use
+         xlink:href="#K"
+         x="72.781998"
+         y="-75.556"
+         id="use28" />
+    </g>
+    <path
+       d="M 66.686,172.135 H 28.892 l 9.633,-37.776 h 37.796 z"
+       class="J"
+       id="path29" />
+    <path
+       d="M 57.052,209.912 H 19.258 l 9.633,-37.776 h 37.796 z"
+       fill="#ff0107"
+       id="path30" />
+    <use
+       xlink:href="#K"
+       x="53.514"
+       y="-0.003"
+       class="I"
+       id="use30" />
+    <path
+       d="M 237.135,96.582 H 199.34 l 9.633,-37.776 h 37.796 z"
+       class="K"
+       id="path31" />
+    <use
+       xlink:href="#K"
+       x="43.880001"
+       y="37.772999"
+       class="J"
+       id="use31" />
+    <use
+       xlink:href="#K"
+       x="34.245998"
+       y="75.550003"
+       fill="#ff0107"
+       id="use32" />
+  </g>
+</svg>
diff --git a/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsOllama/EmbeddingsOllama.node.ts b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsOllama/EmbeddingsOllama.node.ts
new file mode 100644
index 0000000000000..b0cf8277714ef
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsOllama/EmbeddingsOllama.node.ts
@@ -0,0 +1,61 @@
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import {
+	NodeConnectionType,
+	type IExecuteFunctions,
+	type INodeType,
+	type INodeTypeDescription,
+	type SupplyData,
+} from 'n8n-workflow';
+import { OllamaEmbeddings } from '@langchain/community/embeddings/ollama';
+import { logWrapper } from '../../../utils/logWrapper';
+import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+import { ollamaDescription, ollamaModel } from '../../llms/LMOllama/description';
+
+export class EmbeddingsOllama implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Embeddings Ollama',
+		name: 'embeddingsOllama',
+		icon: 'file:ollama.svg',
+		group: ['transform'],
+		version: 1,
+		description: 'Use Ollama Embeddings',
+		defaults: {
+			name: 'Embeddings Ollama',
+		},
+		...ollamaDescription,
+		codex: {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Embeddings'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/sub-nodes/n8n-nodes-langchain.embeddingsollama/',
+					},
+				],
+			},
+		},
+		// 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.AiEmbedding],
+		outputNames: ['Embeddings'],
+		properties: [getConnectionHintNoticeField([NodeConnectionType.AiVectorStore]), ollamaModel],
+	};
+
+	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
+		this.logger.verbose('Supply data for embeddings Ollama');
+		const modelName = this.getNodeParameter('model', itemIndex) as string;
+		const credentials = await this.getCredentials('ollamaApi');
+
+		const embeddings = new OllamaEmbeddings({
+			baseUrl: credentials.baseUrl as string,
+			model: modelName,
+		});
+
+		return {
+			response: logWrapper(embeddings, this),
+		};
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsOllama/ollama.svg b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsOllama/ollama.svg
new file mode 100644
index 0000000000000..ced4564f6c520
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsOllama/ollama.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="241.333" height="341.333" version="1.0" viewBox="0 0 181 256"><g fill="#7D7D87"><path d="M37.7 19.5c-5.2 1.8-8.3 4.9-11.7 11.6-4.5 8.9-6.2 19.2-5.8 35.5l.3 14.2-5.8 6.1c-14.8 15.5-18.5 38.7-9.2 57.4l3.4 6.9-2 4.4c-3.4 8.2-5 16.4-5 26.3 0 10.8 1.8 19 5.8 26.2l2.6 4.8-2.1 4.9c-1.2 2.7-2.6 7.1-3.2 9.8-1.4 6.2-1.5 22.1-.1 25.7 1 2.6 1.4 2.7 7.6 2.7 7.3 0 7 .4 5.3-8.6-1.5-8.2.2-18.8 4.2-26.6 3.7-7 3.8-10.4.5-14.8-4.7-6.4-6.8-13.6-6.9-24-.1-10.3 1.4-16 6.6-26.1 3.1-6.1 2.9-8.7-1-12.2-1.1-1-3.1-4.2-4.3-7-1.9-4.2-2.4-6.9-2.3-14.2 0-11.4 2.5-18.3 9.5-26 7-7.6 14.2-11 23.9-11.2 4.1 0 7.8-.2 8.2-.2.4-.1 1.7-2.2 2.9-4.7 3-5.9 9.6-11.9 16.7-15.2 4.9-2.3 7-2.7 14.7-2.7 7.9 0 9.7.4 14.9 2.9 6.8 3.3 13.3 9.4 15.9 14.8 1 2 2.3 4.1 3 4.5.6.4 4.6.8 8.7.8 6.7.1 8.3.5 14 3.6 12.3 6.8 19.3 18.7 19.3 33.4.1 6.7-.4 9-2.7 14.2-1.6 3.5-3.5 6.8-4.3 7.5-3.4 2.8-3.5 5.8-.5 11.7 5.2 10.1 6.7 15.8 6.6 26.1-.1 10.4-2.2 17.6-6.9 24-3.3 4.4-3.2 7.8.5 14.8 4 7.8 5.7 18.4 4.2 26.6-1.7 9-2 8.6 5.3 8.6 6.2 0 6.6-.1 7.6-2.7 1.4-3.6 1.3-19.5-.1-25.7-.6-2.7-2-7.1-3.2-9.8l-2.1-4.9 2.6-4.8c7.6-13.9 7.9-35.9.6-52.8l-2-4.7 2.5-4.6c9.9-18.3 6.4-43.9-8.1-59.1l-5.8-6.1.3-14.2c.4-16.4-1.3-26.6-5.8-35.7-6.4-12.6-17.2-15.9-26.3-7.9-5.4 4.7-9.2 13.8-12.3 29.8-.3 1.4-1 2.2-1.7 1.8-18.2-8-29.7-8.5-44.3-2.1L65 54.9l-.4-2.2C61 34.2 56.1 24.2 49 20.5c-4.3-2.1-7.4-2.4-11.3-1m7.7 16.8c4.2 7.1 8.1 30.1 5.7 33.6-.5.8-3.1 1.6-5.8 1.8-2.6.2-6.2.8-8 1.3l-3.1.8-.7-4.9c-.8-5.9.2-17.2 2.2-24.8C37.1 38.4 40.5 32 42 32c.5 0 2 1.9 3.4 4.3m96.5-1c4 6.5 6.9 23.9 5.6 33.6l-.7 4.9-3.1-.8c-1.8-.5-5.4-1.1-8-1.3-2.7-.2-5.3-1-5.8-1.8-1.2-1.7-.3-14.1 1.7-22.9 1.5-6.4 5.7-15 7.4-15 .4 0 1.8 1.5 2.9 3.3"/><path d="M77.8 119.9c-7.3 2.4-11.6 5.1-16.5 10.4-5.5 6-7.6 12-7.1 20.1.5 7.6 3.5 12.9 10.6 18.3 6.2 4.7 12.7 6.3 25.7 6.3 17.2 0 25.8-3.6 32.9-13.8 4.2-5.9 4.8-15.5 1.6-23-2.9-6.8-11.1-14.3-18.8-17.3-8-3.1-20.7-3.6-28.4-1m25.7 10c16.1 7.1 19.4 23.2 6.6 31.8-4.9 3.3-9.4 4.3-19.6 4.3s-14.7-1-19.6-4.3c-17.8-12-3.2-35.6 21.1-34.3 3.9.2 8.6 1.2 11.5 2.5"/><path d="M83.8 140.1c-2.5 1.4-2.2 4.4.7 6.7 2 1.6 2.4 2.6 1.9 4.9-.7 3.6 1.5 5.8 5.1 4.9 2.1-.5 2.5-1.2 2.5-4.6 0-2.9.5-4.2 2-5 2.7-1.5 2.7-6.6 0-7.5-1-.3-2.8-.1-4 .5-1.4.7-2.6.8-3.9 0-2.3-1.2-2.2-1.2-4.3.1m-44.1-18.9c-.9.7-2.3 3-3.2 5-2.1 5.3-.1 10.3 4.7 11.6 4.3 1.1 6 .6 9.2-2.7 4-4.1 4.3-8.1 1.1-11.9-2.1-2.5-3.4-3.2-6.4-3.2-2 0-4.5.6-5.4 1.2m89.8 2c-3.2 3.8-2.9 7.8 1.1 11.9 3.2 3.3 4.9 3.8 9.2 2.7 4.9-1.3 6.8-6.2 4.6-11.8-1.9-4.7-3.8-6-8.7-6-2.7 0-4.1.7-6.2 3.2"/></g></svg>
\ No newline at end of file
diff --git a/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsOpenAI/EmbeddingsOpenAi.node.ts b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsOpenAI/EmbeddingsOpenAi.node.ts
new file mode 100644
index 0000000000000..fa4387629948a
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsOpenAI/EmbeddingsOpenAi.node.ts
@@ -0,0 +1,206 @@
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import {
+	NodeConnectionType,
+	type IExecuteFunctions,
+	type INodeType,
+	type INodeTypeDescription,
+	type SupplyData,
+	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';
+
+const modelParameter: INodeProperties = {
+	displayName: 'Model',
+	name: 'model',
+	type: 'options',
+	description:
+		'The model which will generate the embeddings. <a href="https://platform.openai.com/docs/models/overview">Learn more</a>.',
+	typeOptions: {
+		loadOptions: {
+			routing: {
+				request: {
+					method: 'GET',
+					url: '={{ $parameter.options?.baseURL?.split("/").slice(-1).pop() || "v1"  }}/models',
+				},
+				output: {
+					postReceive: [
+						{
+							type: 'rootProperty',
+							properties: {
+								property: 'data',
+							},
+						},
+						{
+							type: 'filter',
+							properties: {
+								pass: "={{ $responseItem.id.includes('embed') }}",
+							},
+						},
+						{
+							type: 'setKeyValue',
+							properties: {
+								name: '={{$responseItem.id}}',
+								value: '={{$responseItem.id}}',
+							},
+						},
+						{
+							type: 'sort',
+							properties: {
+								key: 'name',
+							},
+						},
+					],
+				},
+			},
+		},
+	},
+	routing: {
+		send: {
+			type: 'body',
+			property: 'model',
+		},
+	},
+	default: 'text-embedding-3-small',
+};
+
+export class EmbeddingsOpenAi implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Embeddings OpenAI',
+		name: 'embeddingsOpenAi',
+		icon: 'file:openAi.svg',
+		credentials: [
+			{
+				name: 'openAiApi',
+				required: true,
+			},
+		],
+		group: ['transform'],
+		version: 1,
+		description: 'Use Embeddings OpenAI',
+		defaults: {
+			name: 'Embeddings OpenAI',
+		},
+
+		codex: {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Embeddings'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/sub-nodes/n8n-nodes-langchain.embeddingsopenai/',
+					},
+				],
+			},
+		},
+		// 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.AiEmbedding],
+		outputNames: ['Embeddings'],
+		requestDefaults: {
+			ignoreHttpStatusErrors: true,
+			baseURL:
+				'={{ $parameter.options?.baseURL?.split("/").slice(0,-1).join("/") || "https://api.openai.com" }}',
+		},
+		properties: [
+			getConnectionHintNoticeField([NodeConnectionType.AiVectorStore]),
+			{
+				...modelParameter,
+				default: 'text-embedding-ada-002',
+				displayOptions: {
+					show: {
+						'@version': [1],
+					},
+				},
+			},
+			{
+				...modelParameter,
+				displayOptions: {
+					hide: {
+						'@version': [1],
+					},
+				},
+			},
+			{
+				displayName: 'Options',
+				name: 'options',
+				placeholder: 'Add Option',
+				description: 'Additional options to add',
+				type: 'collection',
+				default: {},
+				options: [
+					{
+						displayName: 'Base URL',
+						name: 'baseURL',
+						default: 'https://api.openai.com/v1',
+						description: 'Override the default base URL for the API',
+						type: 'string',
+					},
+					{
+						displayName: 'Batch Size',
+						name: 'batchSize',
+						default: 512,
+						typeOptions: { maxValue: 2048 },
+						description: 'Maximum number of documents to send in each request',
+						type: 'number',
+					},
+					{
+						displayName: 'Strip New Lines',
+						name: 'stripNewLines',
+						default: true,
+						description: 'Whether to strip new lines from the input text',
+						type: 'boolean',
+					},
+					{
+						displayName: 'Timeout',
+						name: 'timeout',
+						default: -1,
+						description:
+							'Maximum amount of time a request is allowed to take in seconds. Set to -1 for no timeout.',
+						type: 'number',
+					},
+				],
+			},
+		],
+	};
+
+	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
+		this.logger.verbose('Supply data for embeddings');
+		const credentials = await this.getCredentials('openAiApi');
+
+		const options = this.getNodeParameter('options', itemIndex, {}) as {
+			baseURL?: string;
+			batchSize?: number;
+			stripNewLines?: boolean;
+			timeout?: number;
+		};
+
+		if (options.timeout === -1) {
+			options.timeout = undefined;
+		}
+
+		const configuration: ClientOptions = {};
+		if (options.baseURL) {
+			configuration.baseURL = options.baseURL;
+		}
+
+		const embeddings = new OpenAIEmbeddings(
+			{
+				modelName: this.getNodeParameter('model', itemIndex, 'text-embedding-3-small') as string,
+				openAIApiKey: credentials.apiKey as string,
+				...options,
+			},
+			configuration,
+		);
+
+		return {
+			response: logWrapper(embeddings, this),
+		};
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsOpenAI/openAi.svg b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsOpenAI/openAi.svg
new file mode 100644
index 0000000000000..73d7895782176
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsOpenAI/openAi.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="260" preserveAspectRatio="xMidYMid"><path fill="#7D7D87" d="M239.184 106.203a64.72 64.72 0 0 0-5.576-53.103C219.452 28.459 191 15.784 163.213 21.74A65.586 65.586 0 0 0 52.096 45.22a64.72 64.72 0 0 0-43.23 31.36c-14.31 24.602-11.061 55.634 8.033 76.74a64.67 64.67 0 0 0 5.525 53.102c14.174 24.65 42.644 37.324 70.446 31.36a64.72 64.72 0 0 0 48.754 21.744c28.481.025 53.714-18.361 62.414-45.481a64.77 64.77 0 0 0 43.229-31.36c14.137-24.558 10.875-55.423-8.083-76.483m-97.56 136.338a48.4 48.4 0 0 1-31.105-11.255l1.535-.87 51.67-29.825a8.6 8.6 0 0 0 4.247-7.367v-72.85l21.845 12.636c.218.111.37.32.409.563v60.367c-.056 26.818-21.783 48.545-48.601 48.601M37.158 197.93a48.35 48.35 0 0 1-5.781-32.589l1.534.921 51.722 29.826a8.34 8.34 0 0 0 8.441 0l63.181-36.425v25.221a.87.87 0 0 1-.358.665l-52.335 30.184c-23.257 13.398-52.97 5.431-66.404-17.803M23.549 85.38a48.5 48.5 0 0 1 25.58-21.333v61.39a8.29 8.29 0 0 0 4.195 7.316l62.874 36.272-21.845 12.636a.82.82 0 0 1-.767 0L41.353 151.53c-23.211-13.454-31.171-43.144-17.804-66.405zm179.466 41.695-63.08-36.63L161.73 77.86a.82.82 0 0 1 .768 0l52.233 30.184a48.6 48.6 0 0 1-7.316 87.635v-61.391a8.54 8.54 0 0 0-4.4-7.213m21.742-32.69-1.535-.922-51.619-30.081a8.39 8.39 0 0 0-8.492 0L99.98 99.808V74.587a.72.72 0 0 1 .307-.665l52.233-30.133a48.652 48.652 0 0 1 72.236 50.391zM88.061 139.097l-21.845-12.585a.87.87 0 0 1-.41-.614V65.685a48.652 48.652 0 0 1 79.757-37.346l-1.535.87-51.67 29.825a8.6 8.6 0 0 0-4.246 7.367zm11.868-25.58L128.067 97.3l28.188 16.218v32.434l-28.086 16.218-28.188-16.218z"/></svg>
\ No newline at end of file
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LMChatAnthropic/LmChatAnthropic.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LMChatAnthropic/LmChatAnthropic.node.ts
new file mode 100644
index 0000000000000..1140c8aa8f5d2
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LMChatAnthropic/LmChatAnthropic.node.ts
@@ -0,0 +1,182 @@
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import {
+	NodeConnectionType,
+	type INodeProperties,
+	type IExecuteFunctions,
+	type INodeType,
+	type INodeTypeDescription,
+	type SupplyData,
+} from 'n8n-workflow';
+
+import { ChatAnthropic } from '@langchain/anthropic';
+import { logWrapper } from '../../../utils/logWrapper';
+import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+
+const modelField: INodeProperties = {
+	displayName: 'Model',
+	name: 'model',
+	type: 'options',
+	// eslint-disable-next-line n8n-nodes-base/node-param-options-type-unsorted-items
+	options: [
+		{
+			name: 'Claude 3 Opus(20240229)',
+			value: 'claude-3-opus-20240229',
+		},
+		{
+			name: 'Claude 3 Sonnet(20240229)',
+			value: 'claude-3-sonnet-20240229',
+		},
+		{
+			name: 'Claude 3 Haiku(20240307)',
+			value: 'claude-3-haiku-20240307',
+		},
+		{
+			name: 'LEGACY: Claude 2',
+			value: 'claude-2',
+		},
+		{
+			name: 'LEGACY: Claude 2.1',
+			value: 'claude-2.1',
+		},
+		{
+			name: 'LEGACY: Claude Instant 1.2',
+			value: 'claude-instant-1.2',
+		},
+		{
+			name: 'LEGACY: Claude Instant 1',
+			value: 'claude-instant-1',
+		},
+	],
+	description:
+		'The model which will generate the completion. <a href="https://docs.anthropic.com/claude/docs/models-overview">Learn more</a>.',
+	default: 'claude-2',
+};
+
+export class LmChatAnthropic implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Anthropic Chat Model',
+		// eslint-disable-next-line n8n-nodes-base/node-class-description-name-miscased
+		name: 'lmChatAnthropic',
+		icon: 'file:anthropic.svg',
+		group: ['transform'],
+		version: [1, 1.1],
+		description: 'Language Model Anthropic',
+		defaults: {
+			name: 'Anthropic Chat Model',
+		},
+		codex: {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Language Models'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/sub-nodes/n8n-nodes-langchain.lmchatanthropic/',
+					},
+				],
+			},
+			alias: ['claude', 'sonnet', 'opus'],
+		},
+		// 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.AiLanguageModel],
+		outputNames: ['Model'],
+		credentials: [
+			{
+				name: 'anthropicApi',
+				required: true,
+			},
+		],
+		properties: [
+			getConnectionHintNoticeField([NodeConnectionType.AiChain, NodeConnectionType.AiChain]),
+			{
+				...modelField,
+				displayOptions: {
+					show: {
+						'@version': [1],
+					},
+				},
+			},
+			{
+				...modelField,
+				default: 'claude-3-sonnet-20240229',
+				displayOptions: {
+					hide: {
+						'@version': [1],
+					},
+				},
+			},
+			{
+				displayName: 'Options',
+				name: 'options',
+				placeholder: 'Add Option',
+				description: 'Additional options to add',
+				type: 'collection',
+				default: {},
+				options: [
+					{
+						displayName: 'Maximum Number of Tokens',
+						name: 'maxTokensToSample',
+						default: 4096,
+						description: 'The maximum number of tokens to generate in the completion',
+						type: 'number',
+					},
+					{
+						displayName: 'Sampling Temperature',
+						name: 'temperature',
+						default: 0.7,
+						typeOptions: { maxValue: 1, minValue: 0, numberPrecision: 1 },
+						description:
+							'Controls randomness: Lowering results in less random completions. As the temperature approaches zero, the model will become deterministic and repetitive.',
+						type: 'number',
+					},
+					{
+						displayName: 'Top K',
+						name: 'topK',
+						default: -1,
+						typeOptions: { maxValue: 1, minValue: -1, numberPrecision: 1 },
+						description:
+							'Used to remove "long tail" low probability responses. Defaults to -1, which disables it.',
+						type: 'number',
+					},
+					{
+						displayName: 'Top P',
+						name: 'topP',
+						default: 1,
+						typeOptions: { maxValue: 1, minValue: 0, numberPrecision: 1 },
+						description:
+							'Controls diversity via nucleus sampling: 0.5 means half of all likelihood-weighted options are considered. We generally recommend altering this or temperature but not both.',
+						type: 'number',
+					},
+				],
+			},
+		],
+	};
+
+	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
+		const credentials = await this.getCredentials('anthropicApi');
+
+		const modelName = this.getNodeParameter('model', itemIndex) as string;
+		const options = this.getNodeParameter('options', itemIndex, {}) as {
+			maxTokensToSample?: number;
+			temperature: number;
+			topK: number;
+			topP: number;
+		};
+
+		const model = new ChatAnthropic({
+			anthropicApiKey: credentials.apiKey as string,
+			modelName,
+			maxTokens: options.maxTokensToSample,
+			temperature: options.temperature,
+			topK: options.topK,
+			topP: options.topP,
+		});
+
+		return {
+			response: logWrapper(model, this),
+		};
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LMChatAnthropic/anthropic.png b/packages/@n8n/nodes-langchain/nodes/llms/LMChatAnthropic/anthropic.png
new file mode 100644
index 0000000000000..253e44fd52afe
Binary files /dev/null and b/packages/@n8n/nodes-langchain/nodes/llms/LMChatAnthropic/anthropic.png differ
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LMChatAnthropic/anthropic.svg b/packages/@n8n/nodes-langchain/nodes/llms/LMChatAnthropic/anthropic.svg
new file mode 100644
index 0000000000000..7eee07a207039
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LMChatAnthropic/anthropic.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="46" height="32" fill="none"><path fill="#7D7D87" d="M32.73 0h-6.945L38.45 32h6.945zM12.665 0 0 32h7.082l2.59-6.72h13.25l2.59 6.72h7.082L19.929 0zm-.702 19.337 4.334-11.246 4.334 11.246z"/></svg>
\ No newline at end of file
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LMChatOllama/LmChatOllama.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LMChatOllama/LmChatOllama.node.ts
new file mode 100644
index 0000000000000..c5cd5eabfb801
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LMChatOllama/LmChatOllama.node.ts
@@ -0,0 +1,71 @@
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import {
+	NodeConnectionType,
+	type IExecuteFunctions,
+	type INodeType,
+	type INodeTypeDescription,
+	type SupplyData,
+} from 'n8n-workflow';
+
+import type { ChatOllamaInput } from '@langchain/community/chat_models/ollama';
+import { ChatOllama } from '@langchain/community/chat_models/ollama';
+import { logWrapper } from '../../../utils/logWrapper';
+import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+import { ollamaModel, ollamaOptions, ollamaDescription } from '../LMOllama/description';
+
+export class LmChatOllama implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Ollama Chat Model',
+		// eslint-disable-next-line n8n-nodes-base/node-class-description-name-miscased
+		name: 'lmChatOllama',
+		icon: 'file:ollama.svg',
+		group: ['transform'],
+		version: 1,
+		description: 'Language Model Ollama',
+		defaults: {
+			name: 'Ollama Chat Model',
+		},
+		codex: {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Language Models'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/sub-nodes/n8n-nodes-langchain.lmchatollama/',
+					},
+				],
+			},
+		},
+		// 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.AiLanguageModel],
+		outputNames: ['Model'],
+		...ollamaDescription,
+		properties: [
+			getConnectionHintNoticeField([NodeConnectionType.AiChain, NodeConnectionType.AiAgent]),
+			ollamaModel,
+			ollamaOptions,
+		],
+	};
+
+	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
+		const credentials = await this.getCredentials('ollamaApi');
+
+		const modelName = this.getNodeParameter('model', itemIndex) as string;
+		const options = this.getNodeParameter('options', itemIndex, {}) as ChatOllamaInput;
+
+		const model = new ChatOllama({
+			...options,
+			baseUrl: credentials.baseUrl as string,
+			model: modelName,
+			format: options.format === 'default' ? undefined : options.format,
+		});
+
+		return {
+			response: logWrapper(model, this),
+		};
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LMChatOllama/ollama.svg b/packages/@n8n/nodes-langchain/nodes/llms/LMChatOllama/ollama.svg
new file mode 100644
index 0000000000000..ced4564f6c520
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LMChatOllama/ollama.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="241.333" height="341.333" version="1.0" viewBox="0 0 181 256"><g fill="#7D7D87"><path d="M37.7 19.5c-5.2 1.8-8.3 4.9-11.7 11.6-4.5 8.9-6.2 19.2-5.8 35.5l.3 14.2-5.8 6.1c-14.8 15.5-18.5 38.7-9.2 57.4l3.4 6.9-2 4.4c-3.4 8.2-5 16.4-5 26.3 0 10.8 1.8 19 5.8 26.2l2.6 4.8-2.1 4.9c-1.2 2.7-2.6 7.1-3.2 9.8-1.4 6.2-1.5 22.1-.1 25.7 1 2.6 1.4 2.7 7.6 2.7 7.3 0 7 .4 5.3-8.6-1.5-8.2.2-18.8 4.2-26.6 3.7-7 3.8-10.4.5-14.8-4.7-6.4-6.8-13.6-6.9-24-.1-10.3 1.4-16 6.6-26.1 3.1-6.1 2.9-8.7-1-12.2-1.1-1-3.1-4.2-4.3-7-1.9-4.2-2.4-6.9-2.3-14.2 0-11.4 2.5-18.3 9.5-26 7-7.6 14.2-11 23.9-11.2 4.1 0 7.8-.2 8.2-.2.4-.1 1.7-2.2 2.9-4.7 3-5.9 9.6-11.9 16.7-15.2 4.9-2.3 7-2.7 14.7-2.7 7.9 0 9.7.4 14.9 2.9 6.8 3.3 13.3 9.4 15.9 14.8 1 2 2.3 4.1 3 4.5.6.4 4.6.8 8.7.8 6.7.1 8.3.5 14 3.6 12.3 6.8 19.3 18.7 19.3 33.4.1 6.7-.4 9-2.7 14.2-1.6 3.5-3.5 6.8-4.3 7.5-3.4 2.8-3.5 5.8-.5 11.7 5.2 10.1 6.7 15.8 6.6 26.1-.1 10.4-2.2 17.6-6.9 24-3.3 4.4-3.2 7.8.5 14.8 4 7.8 5.7 18.4 4.2 26.6-1.7 9-2 8.6 5.3 8.6 6.2 0 6.6-.1 7.6-2.7 1.4-3.6 1.3-19.5-.1-25.7-.6-2.7-2-7.1-3.2-9.8l-2.1-4.9 2.6-4.8c7.6-13.9 7.9-35.9.6-52.8l-2-4.7 2.5-4.6c9.9-18.3 6.4-43.9-8.1-59.1l-5.8-6.1.3-14.2c.4-16.4-1.3-26.6-5.8-35.7-6.4-12.6-17.2-15.9-26.3-7.9-5.4 4.7-9.2 13.8-12.3 29.8-.3 1.4-1 2.2-1.7 1.8-18.2-8-29.7-8.5-44.3-2.1L65 54.9l-.4-2.2C61 34.2 56.1 24.2 49 20.5c-4.3-2.1-7.4-2.4-11.3-1m7.7 16.8c4.2 7.1 8.1 30.1 5.7 33.6-.5.8-3.1 1.6-5.8 1.8-2.6.2-6.2.8-8 1.3l-3.1.8-.7-4.9c-.8-5.9.2-17.2 2.2-24.8C37.1 38.4 40.5 32 42 32c.5 0 2 1.9 3.4 4.3m96.5-1c4 6.5 6.9 23.9 5.6 33.6l-.7 4.9-3.1-.8c-1.8-.5-5.4-1.1-8-1.3-2.7-.2-5.3-1-5.8-1.8-1.2-1.7-.3-14.1 1.7-22.9 1.5-6.4 5.7-15 7.4-15 .4 0 1.8 1.5 2.9 3.3"/><path d="M77.8 119.9c-7.3 2.4-11.6 5.1-16.5 10.4-5.5 6-7.6 12-7.1 20.1.5 7.6 3.5 12.9 10.6 18.3 6.2 4.7 12.7 6.3 25.7 6.3 17.2 0 25.8-3.6 32.9-13.8 4.2-5.9 4.8-15.5 1.6-23-2.9-6.8-11.1-14.3-18.8-17.3-8-3.1-20.7-3.6-28.4-1m25.7 10c16.1 7.1 19.4 23.2 6.6 31.8-4.9 3.3-9.4 4.3-19.6 4.3s-14.7-1-19.6-4.3c-17.8-12-3.2-35.6 21.1-34.3 3.9.2 8.6 1.2 11.5 2.5"/><path d="M83.8 140.1c-2.5 1.4-2.2 4.4.7 6.7 2 1.6 2.4 2.6 1.9 4.9-.7 3.6 1.5 5.8 5.1 4.9 2.1-.5 2.5-1.2 2.5-4.6 0-2.9.5-4.2 2-5 2.7-1.5 2.7-6.6 0-7.5-1-.3-2.8-.1-4 .5-1.4.7-2.6.8-3.9 0-2.3-1.2-2.2-1.2-4.3.1m-44.1-18.9c-.9.7-2.3 3-3.2 5-2.1 5.3-.1 10.3 4.7 11.6 4.3 1.1 6 .6 9.2-2.7 4-4.1 4.3-8.1 1.1-11.9-2.1-2.5-3.4-3.2-6.4-3.2-2 0-4.5.6-5.4 1.2m89.8 2c-3.2 3.8-2.9 7.8 1.1 11.9 3.2 3.3 4.9 3.8 9.2 2.7 4.9-1.3 6.8-6.2 4.6-11.8-1.9-4.7-3.8-6-8.7-6-2.7 0-4.1.7-6.2 3.2"/></g></svg>
\ No newline at end of file
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LMChatOpenAi/LmChatOpenAi.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LMChatOpenAi/LmChatOpenAi.node.ts
new file mode 100644
index 0000000000000..9d676b91c41ff
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LMChatOpenAi/LmChatOpenAi.node.ts
@@ -0,0 +1,261 @@
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import {
+	NodeConnectionType,
+	type IExecuteFunctions,
+	type INodeType,
+	type INodeTypeDescription,
+	type SupplyData,
+} from 'n8n-workflow';
+
+import { ChatOpenAI, type ClientOptions } from '@langchain/openai';
+import { logWrapper } from '../../../utils/logWrapper';
+import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+
+export class LmChatOpenAi implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'OpenAI Chat Model',
+		// eslint-disable-next-line n8n-nodes-base/node-class-description-name-miscased
+		name: 'lmChatOpenAi',
+		icon: 'file:openAi.svg',
+		group: ['transform'],
+		version: 1,
+		description: 'For advanced usage with an AI chain',
+		defaults: {
+			name: 'OpenAI Chat Model',
+		},
+		codex: {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Language Models'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/sub-nodes/n8n-nodes-langchain.lmchatopenai/',
+					},
+				],
+			},
+		},
+		// 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.AiLanguageModel],
+		outputNames: ['Model'],
+		credentials: [
+			{
+				name: 'openAiApi',
+				required: true,
+			},
+		],
+		requestDefaults: {
+			ignoreHttpStatusErrors: true,
+			baseURL:
+				'={{ $parameter.options?.baseURL?.split("/").slice(0,-1).join("/") || "https://api.openai.com" }}',
+		},
+		properties: [
+			getConnectionHintNoticeField([NodeConnectionType.AiChain, NodeConnectionType.AiAgent]),
+			{
+				displayName:
+					'If using JSON response format, you must include word "json" in the prompt in your chain or agent. Also, make sure to select latest models released post November 2023.',
+				name: 'notice',
+				type: 'notice',
+				default: '',
+				displayOptions: {
+					show: {
+						'/options.responseFormat': ['json_object'],
+					},
+				},
+			},
+			{
+				displayName: 'Model',
+				name: 'model',
+				type: 'options',
+				description:
+					'The model which will generate the completion. <a href="https://beta.openai.com/docs/models/overview">Learn more</a>.',
+				typeOptions: {
+					loadOptions: {
+						routing: {
+							request: {
+								method: 'GET',
+								url: '={{ $parameter.options?.baseURL?.split("/").slice(-1).pop() || "v1"  }}/models',
+							},
+							output: {
+								postReceive: [
+									{
+										type: 'rootProperty',
+										properties: {
+											property: 'data',
+										},
+									},
+									{
+										type: 'filter',
+										properties: {
+											pass: "={{ $responseItem.id.startsWith('gpt-') && !$responseItem.id.includes('instruct') }}",
+										},
+									},
+									{
+										type: 'setKeyValue',
+										properties: {
+											name: '={{$responseItem.id}}',
+											value: '={{$responseItem.id}}',
+										},
+									},
+									{
+										type: 'sort',
+										properties: {
+											key: 'name',
+										},
+									},
+								],
+							},
+						},
+					},
+				},
+				routing: {
+					send: {
+						type: 'body',
+						property: 'model',
+					},
+				},
+				default: 'gpt-3.5-turbo',
+			},
+			{
+				displayName: 'Options',
+				name: 'options',
+				placeholder: 'Add Option',
+				description: 'Additional options to add',
+				type: 'collection',
+				default: {},
+				options: [
+					{
+						displayName: 'Base URL',
+						name: 'baseURL',
+						default: 'https://api.openai.com/v1',
+						description: 'Override the default base URL for the API',
+						type: 'string',
+					},
+					{
+						displayName: 'Frequency Penalty',
+						name: 'frequencyPenalty',
+						default: 0,
+						typeOptions: { maxValue: 2, minValue: -2, numberPrecision: 1 },
+						description:
+							"Positive values penalize new tokens based on their existing frequency in the text so far, decreasing the model's likelihood to repeat the same line verbatim",
+						type: 'number',
+					},
+					{
+						displayName: 'Maximum Number of Tokens',
+						name: 'maxTokens',
+						default: -1,
+						description:
+							'The maximum number of tokens to generate in the completion. Most models have a context length of 2048 tokens (except for the newest models, which support 32,768).',
+						type: 'number',
+						typeOptions: {
+							maxValue: 32768,
+						},
+					},
+					{
+						displayName: 'Response Format',
+						name: 'responseFormat',
+						default: 'text',
+						type: 'options',
+						options: [
+							{
+								name: 'Text',
+								value: 'text',
+								description: 'Regular text response',
+							},
+							{
+								name: 'JSON',
+								value: 'json_object',
+								description:
+									'Enables JSON mode, which should guarantee the message the model generates is valid JSON',
+							},
+						],
+					},
+					{
+						displayName: 'Presence Penalty',
+						name: 'presencePenalty',
+						default: 0,
+						typeOptions: { maxValue: 2, minValue: -2, numberPrecision: 1 },
+						description:
+							"Positive values penalize new tokens based on whether they appear in the text so far, increasing the model's likelihood to talk about new topics",
+						type: 'number',
+					},
+					{
+						displayName: 'Sampling Temperature',
+						name: 'temperature',
+						default: 0.7,
+						typeOptions: { maxValue: 1, minValue: 0, numberPrecision: 1 },
+						description:
+							'Controls randomness: Lowering results in less random completions. As the temperature approaches zero, the model will become deterministic and repetitive.',
+						type: 'number',
+					},
+					{
+						displayName: 'Timeout',
+						name: 'timeout',
+						default: 60000,
+						description: 'Maximum amount of time a request is allowed to take in milliseconds',
+						type: 'number',
+					},
+					{
+						displayName: 'Max Retries',
+						name: 'maxRetries',
+						default: 2,
+						description: 'Maximum number of retries to attempt',
+						type: 'number',
+					},
+					{
+						displayName: 'Top P',
+						name: 'topP',
+						default: 1,
+						typeOptions: { maxValue: 1, minValue: 0, numberPrecision: 1 },
+						description:
+							'Controls diversity via nucleus sampling: 0.5 means half of all likelihood-weighted options are considered. We generally recommend altering this or temperature but not both.',
+						type: 'number',
+					},
+				],
+			},
+		],
+	};
+
+	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
+		const credentials = await this.getCredentials('openAiApi');
+
+		const modelName = this.getNodeParameter('model', itemIndex) as string;
+		const options = this.getNodeParameter('options', itemIndex, {}) as {
+			baseURL?: string;
+			frequencyPenalty?: number;
+			maxTokens?: number;
+			maxRetries: number;
+			timeout: number;
+			presencePenalty?: number;
+			temperature?: number;
+			topP?: number;
+			responseFormat?: 'text' | 'json_object';
+		};
+
+		const configuration: ClientOptions = {};
+		if (options.baseURL) {
+			configuration.baseURL = options.baseURL;
+		}
+
+		const model = new ChatOpenAI({
+			openAIApiKey: credentials.apiKey as string,
+			modelName,
+			...options,
+			timeout: options.timeout ?? 60000,
+			maxRetries: options.maxRetries ?? 2,
+			configuration,
+			modelKwargs: options.responseFormat
+				? {
+						response_format: { type: options.responseFormat },
+					}
+				: undefined,
+		});
+
+		return {
+			response: logWrapper(model, this),
+		};
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LMChatOpenAi/openAi.svg b/packages/@n8n/nodes-langchain/nodes/llms/LMChatOpenAi/openAi.svg
new file mode 100644
index 0000000000000..73d7895782176
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LMChatOpenAi/openAi.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="260" preserveAspectRatio="xMidYMid"><path fill="#7D7D87" d="M239.184 106.203a64.72 64.72 0 0 0-5.576-53.103C219.452 28.459 191 15.784 163.213 21.74A65.586 65.586 0 0 0 52.096 45.22a64.72 64.72 0 0 0-43.23 31.36c-14.31 24.602-11.061 55.634 8.033 76.74a64.67 64.67 0 0 0 5.525 53.102c14.174 24.65 42.644 37.324 70.446 31.36a64.72 64.72 0 0 0 48.754 21.744c28.481.025 53.714-18.361 62.414-45.481a64.77 64.77 0 0 0 43.229-31.36c14.137-24.558 10.875-55.423-8.083-76.483m-97.56 136.338a48.4 48.4 0 0 1-31.105-11.255l1.535-.87 51.67-29.825a8.6 8.6 0 0 0 4.247-7.367v-72.85l21.845 12.636c.218.111.37.32.409.563v60.367c-.056 26.818-21.783 48.545-48.601 48.601M37.158 197.93a48.35 48.35 0 0 1-5.781-32.589l1.534.921 51.722 29.826a8.34 8.34 0 0 0 8.441 0l63.181-36.425v25.221a.87.87 0 0 1-.358.665l-52.335 30.184c-23.257 13.398-52.97 5.431-66.404-17.803M23.549 85.38a48.5 48.5 0 0 1 25.58-21.333v61.39a8.29 8.29 0 0 0 4.195 7.316l62.874 36.272-21.845 12.636a.82.82 0 0 1-.767 0L41.353 151.53c-23.211-13.454-31.171-43.144-17.804-66.405zm179.466 41.695-63.08-36.63L161.73 77.86a.82.82 0 0 1 .768 0l52.233 30.184a48.6 48.6 0 0 1-7.316 87.635v-61.391a8.54 8.54 0 0 0-4.4-7.213m21.742-32.69-1.535-.922-51.619-30.081a8.39 8.39 0 0 0-8.492 0L99.98 99.808V74.587a.72.72 0 0 1 .307-.665l52.233-30.133a48.652 48.652 0 0 1 72.236 50.391zM88.061 139.097l-21.845-12.585a.87.87 0 0 1-.41-.614V65.685a48.652 48.652 0 0 1 79.757-37.346l-1.535.87-51.67 29.825a8.6 8.6 0 0 0-4.246 7.367zm11.868-25.58L128.067 97.3l28.188 16.218v32.434l-28.086 16.218-28.188-16.218z"/></svg>
\ No newline at end of file
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LMCohere/LmCohere.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LMCohere/LmCohere.node.ts
new file mode 100644
index 0000000000000..8c127bb5efaa5
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LMCohere/LmCohere.node.ts
@@ -0,0 +1,106 @@
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import {
+	NodeConnectionType,
+	type IExecuteFunctions,
+	type INodeType,
+	type INodeTypeDescription,
+	type SupplyData,
+} from 'n8n-workflow';
+
+import { Cohere } from '@langchain/cohere';
+import { logWrapper } from '../../../utils/logWrapper';
+import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+
+export class LmCohere implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Cohere Model',
+		// eslint-disable-next-line n8n-nodes-base/node-class-description-name-miscased
+		name: 'lmCohere',
+		icon: 'file:cohere.svg',
+		group: ['transform'],
+		version: 1,
+		description: 'Language Model Cohere',
+		defaults: {
+			name: 'Cohere Model',
+		},
+		codex: {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Language Models'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/sub-nodes/n8n-nodes-langchain.lmcohere/',
+					},
+				],
+			},
+		},
+		// 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.AiLanguageModel],
+		outputNames: ['Model'],
+		credentials: [
+			{
+				name: 'cohereApi',
+				required: true,
+			},
+		],
+		properties: [
+			getConnectionHintNoticeField([NodeConnectionType.AiChain, NodeConnectionType.AiAgent]),
+			{
+				displayName: 'Options',
+				name: 'options',
+				placeholder: 'Add Option',
+				description: 'Additional options to add',
+				type: 'collection',
+				default: {},
+				options: [
+					{
+						displayName: 'Maximum Number of Tokens',
+						name: 'maxTokens',
+						default: 250,
+						description:
+							'The maximum number of tokens to generate in the completion. Most models have a context length of 2048 tokens (except for the newest models, which support 32,768).',
+						type: 'number',
+						typeOptions: {
+							maxValue: 32768,
+						},
+					},
+					{
+						displayName: 'Model',
+						name: 'model',
+						type: 'string',
+						description: 'The name of the model to use',
+						default: '',
+					},
+					{
+						displayName: 'Sampling Temperature',
+						name: 'temperature',
+						default: 0,
+						typeOptions: { maxValue: 1, minValue: 0, numberPrecision: 1 },
+						description:
+							'Controls randomness: Lowering results in less random completions. As the temperature approaches zero, the model will become deterministic and repetitive.',
+						type: 'number',
+					},
+				],
+			},
+		],
+	};
+
+	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
+		const credentials = await this.getCredentials('cohereApi');
+
+		const options = this.getNodeParameter('options', itemIndex, {}) as object;
+
+		const model = new Cohere({
+			apiKey: credentials.apiKey as string,
+			...options,
+		});
+
+		return {
+			response: logWrapper(model, this),
+		};
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LMCohere/cohere.svg b/packages/@n8n/nodes-langchain/nodes/llms/LMCohere/cohere.svg
new file mode 100644
index 0000000000000..5311832f19c19
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LMCohere/cohere.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="1000" height="166.84" style="fill:none"><path d="M281.724 166.807c24.783 0 46.473-12.392 55.048-37.41 1.664-5.01-.724-8.34-5.482-8.34h-9.298c-4.287 0-7.145 1.9-9.062 5.951-7.381 14.545-17.637 19.774-30.5 19.774-22.883 0-36.939-15.974-36.939-42.656 0-26.683 14.544-42.656 36.452-42.656 13.35 0 24.313 5.717 31.223 19.302 2.152 4.052 4.758 5.952 9.062 5.952h9.298c4.758 0 7.146-3.094 5.481-7.633-10.004-27.171-32.417-37.646-55.283-37.646-34.551 0-60.293 25.506-60.293 62.68 0 37.176 24.548 62.682 60.293 62.682m623.629-73.644c3.093-20.26 16.914-32.887 35.745-32.887s32.887 12.863 34.551 32.887zm36.703 73.644c21.925 0 43.85-10.24 54.578-33.359 2.62-5.48.235-9.297-4.525-9.297h-8.813c-4.283 0-6.907 1.9-9.059 5.716-7.146 12.627-19.537 17.873-32.164 17.873-21.69 0-35.745-14.78-37.41-38.84h87.466c4.76 0 7.871-2.622 7.871-7.632-.962-37.41-25.259-59.806-58.868-59.806s-60.293 24.312-60.293 62.68c0 38.369 25.976 62.681 61.25 62.681zm-138.694-59.571h7.868c4.76 0 7.381-2.622 8.105-7.633 4.54-32.198 23.388-36.468 43.43-35.51 4.286.202 7.8-3.094 7.8-7.398v-7.381c0-4.758-2.387-7.633-7.145-7.869-17.738-.672-33.56 5.414-42.706 22.648-.505.941-1.917.69-2.035-.37l-1.48-12.997c-.47-4.758-3.093-7.146-7.868-7.146H773.35c-4.204 0-7.634 3.414-7.634 7.634v4.052c0 4.203 3.414 7.633 7.634 7.633h14.779c4.203 0 7.633 3.413 7.633 7.634v29.07c0 4.203 3.414 7.633 7.634 7.633zm-32.164 57.2h74.584c4.759 0 7.633-2.858 7.633-7.634v-4.052c0-4.758-2.858-7.633-7.633-7.633h-19.066c-4.758 0-7.633-2.858-7.633-7.633v-13.115c0-4.758-2.858-7.633-7.634-7.633h-8.103c-4.76 0-7.634 2.858-7.634 7.633v13.115c0 4.758-2.859 7.633-7.633 7.633h-16.915c-4.758 0-7.633 2.858-7.633 7.633v4.052c0 4.759 2.859 7.634 7.633 7.634zM656.093 93.18c3.094-20.26 16.914-32.887 35.746-32.887 18.83 0 32.887 12.862 34.551 32.887zm36.703 73.643c21.925 0 43.85-10.239 54.577-33.358 2.623-5.481.235-9.298-4.523-9.298h-8.81c-4.288 0-6.91 1.9-9.062 5.717-7.146 12.627-19.538 17.872-32.165 17.872-21.69 0-35.745-14.779-37.41-38.838h87.464c4.758 0 7.87-2.623 7.87-7.633-.96-37.41-25.255-59.806-58.865-59.806s-60.293 24.312-60.293 62.68c0 38.369 25.977 62.681 61.252 62.681zm-275.707 0c35.746 0 61.252-26.448 61.252-62.68s-25.506-62.681-61.252-62.681c-35.745 0-61.25 26.935-61.25 62.68 0 8.34 1.428 17.638 5.715 27.878 2.152 5.01 6.205 5.716 10.492 2.622l6.91-5.01c3.582-2.624 4.523-5.717 3.33-10.24-1.9-5.952-2.388-11.197-2.388-15.72 0-25.019 15.014-42.185 37.175-42.185s37.175 16.914 37.175 42.656-14.78 42.656-36.704 42.656c-7.634 0-14.78-1.43-23.355-7.87-3.581-2.857-6.91-3.328-10.727-.47l-5.245 3.816c-4.288 3.095-4.758 7.382-.724 10.727 12.393 10.005 26.684 13.821 39.563 13.821zm91.5-2.387h7.868c4.204 0 7.634-3.414 7.634-7.634V99.855c0-24.06 12.861-38.368 32.887-38.368 18.108 0 28.6 11.92 28.6 33.845v61.487c0 4.203 3.413 7.633 7.633 7.633h8.103c4.204 0 7.634-3.413 7.634-7.633V91.516c0-32.164-16.444-50.037-44.32-50.037-18.983 0-30.197 7.768-38.57 18.579-.64.824-1.934.37-1.934-.656V7.633c-.05-4.22-3.463-7.633-7.667-7.633h-7.869c-4.203 0-7.633 3.413-7.633 7.633v149.17c0 4.203 3.413 7.633 7.633 7.633" style="fill:#39594d;stroke-width:9.81412029"/><g clip-path="url(#a)" transform="translate(0 -4.907)scale(9.81412)"><path d="M5.508 10.622c.457 0 1.367-.025 2.626-.543 1.466-.604 4.383-1.7 6.487-2.825 1.471-.787 2.117-1.828 2.117-3.23A3.523 3.523 0 0 0 13.214.5H5.061A5.06 5.06 0 0 0 0 5.561c0 2.795 2.122 5.06 5.508 5.06" style="clip-rule:evenodd;fill:#39594d;fill-rule:evenodd"/><path d="M6.887 14.107a3.39 3.39 0 0 1 2.09-3.13l2.568-1.066C14.142 8.833 17 10.74 17 13.554a3.944 3.944 0 0 1-3.945 3.943h-2.78a3.39 3.39 0 0 1-3.388-3.39" style="clip-rule:evenodd;fill:#d18ee2;fill-rule:evenodd"/><path d="M2.917 11.29A2.917 2.917 0 0 0 0 14.206v.377a2.917 2.917 0 0 0 5.835 0v-.378a2.917 2.917 0 0 0-2.918-2.917" style="fill:#ff7759"/></g><defs><clipPath id="a"><path d="M0 0h17v17H0z" style="fill:#fff" transform="translate(0 .5)"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LMOllama/LmOllama.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LMOllama/LmOllama.node.ts
new file mode 100644
index 0000000000000..8904d5b3b6eca
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LMOllama/LmOllama.node.ts
@@ -0,0 +1,69 @@
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import {
+	NodeConnectionType,
+	type IExecuteFunctions,
+	type INodeType,
+	type INodeTypeDescription,
+	type SupplyData,
+} from 'n8n-workflow';
+
+import { Ollama } from '@langchain/community/llms/ollama';
+import { logWrapper } from '../../../utils/logWrapper';
+import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+import { ollamaDescription, ollamaModel, ollamaOptions } from './description';
+
+export class LmOllama implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Ollama Model',
+		// eslint-disable-next-line n8n-nodes-base/node-class-description-name-miscased
+		name: 'lmOllama',
+		icon: 'file:ollama.svg',
+		group: ['transform'],
+		version: 1,
+		description: 'Language Model Ollama',
+		defaults: {
+			name: 'Ollama Model',
+		},
+		codex: {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Language Models'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/sub-nodes/n8n-nodes-langchain.lmollama/',
+					},
+				],
+			},
+		},
+		// 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.AiLanguageModel],
+		outputNames: ['Model'],
+		...ollamaDescription,
+		properties: [
+			getConnectionHintNoticeField([NodeConnectionType.AiChain, NodeConnectionType.AiAgent]),
+			ollamaModel,
+			ollamaOptions,
+		],
+	};
+
+	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
+		const credentials = await this.getCredentials('ollamaApi');
+
+		const modelName = this.getNodeParameter('model', itemIndex) as string;
+		const options = this.getNodeParameter('options', itemIndex, {}) as object;
+
+		const model = new Ollama({
+			baseUrl: credentials.baseUrl as string,
+			model: modelName,
+			...options,
+		});
+
+		return {
+			response: logWrapper(model, this),
+		};
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LMOllama/description.ts b/packages/@n8n/nodes-langchain/nodes/llms/LMOllama/description.ts
new file mode 100644
index 0000000000000..382de60fddedb
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LMOllama/description.ts
@@ -0,0 +1,233 @@
+import type { INodeProperties, INodeTypeDescription } from 'n8n-workflow';
+
+export const ollamaDescription: Partial<INodeTypeDescription> = {
+	credentials: [
+		{
+			name: 'ollamaApi',
+			required: true,
+		},
+	],
+	requestDefaults: {
+		ignoreHttpStatusErrors: true,
+		baseURL: '={{ $credentials.baseUrl.replace(new RegExp("/$"), "") }}',
+	},
+};
+
+export const ollamaModel: INodeProperties = {
+	displayName: 'Model',
+	name: 'model',
+	type: 'options',
+	default: 'llama2',
+	description:
+		'The model which will generate the completion. To download models, visit <a href="https://ollama.ai/library">Ollama Models Library</a>.',
+	typeOptions: {
+		loadOptions: {
+			routing: {
+				request: {
+					method: 'GET',
+					url: '/api/tags',
+				},
+				output: {
+					postReceive: [
+						{
+							type: 'rootProperty',
+							properties: {
+								property: 'models',
+							},
+						},
+						{
+							type: 'setKeyValue',
+							properties: {
+								name: '={{$responseItem.name}}',
+								value: '={{$responseItem.name}}',
+							},
+						},
+						{
+							type: 'sort',
+							properties: {
+								key: 'name',
+							},
+						},
+					],
+				},
+			},
+		},
+	},
+	routing: {
+		send: {
+			type: 'body',
+			property: 'model',
+		},
+	},
+	required: true,
+};
+
+export const ollamaOptions: INodeProperties = {
+	displayName: 'Options',
+	name: 'options',
+	placeholder: 'Add Option',
+	description: 'Additional options to add',
+	type: 'collection',
+	default: {},
+	options: [
+		{
+			displayName: 'Sampling Temperature',
+			name: 'temperature',
+			default: 0.7,
+			typeOptions: { maxValue: 1, minValue: 0, numberPrecision: 1 },
+			description:
+				'Controls the randomness of the generated text. Lower values make the output more focused and deterministic, while higher values make it more diverse and random.',
+			type: 'number',
+		},
+		{
+			displayName: 'Top K',
+			name: 'topK',
+			default: -1,
+			typeOptions: { maxValue: 100, minValue: -1, numberPrecision: 1 },
+			description:
+				'Limits the number of highest probability vocabulary tokens to consider at each step. A higher value increases diversity but may reduce coherence. Set to -1 to disable.',
+			type: 'number',
+		},
+		{
+			displayName: 'Top P',
+			name: 'topP',
+			default: 1,
+			typeOptions: { maxValue: 1, minValue: 0, numberPrecision: 1 },
+			description:
+				'Chooses from the smallest possible set of tokens whose cumulative probability exceeds the probability top_p. Helps generate more human-like text by reducing repetitions.',
+			type: 'number',
+		},
+		{
+			displayName: 'Frequency Penalty',
+			name: 'frequencyPenalty',
+			type: 'number',
+			default: 0.0,
+			typeOptions: { minValue: 0 },
+			description:
+				'Adjusts the penalty for tokens that have already appeared in the generated text. Higher values discourage repetition.',
+		},
+		{
+			displayName: 'Keep Alive',
+			name: 'keepAlive',
+			type: 'string',
+			default: '5m',
+			description:
+				'Specifies the duration to keep the loaded model in memory after use. Useful for frequently used models. Format: 1h30m (1 hour 30 minutes).',
+		},
+		{
+			displayName: 'Low VRAM Mode',
+			name: 'lowVram',
+			type: 'boolean',
+			default: false,
+			description:
+				'Whether to Activate low VRAM mode, which reduces memory usage at the cost of slower generation speed. Useful for GPUs with limited memory.',
+		},
+		{
+			displayName: 'Main GPU ID',
+			name: 'mainGpu',
+			type: 'number',
+			default: 0,
+			description:
+				'Specifies the ID of the GPU to use for the main computation. Only change this if you have multiple GPUs.',
+		},
+		{
+			displayName: 'Context Batch Size',
+			name: 'numBatch',
+			type: 'number',
+			default: 512,
+			description:
+				'Sets the batch size for prompt processing. Larger batch sizes may improve generation speed but increase memory usage.',
+		},
+		{
+			displayName: 'Context Length',
+			name: 'numCtx',
+			type: 'number',
+			default: 2048,
+			description:
+				'The maximum number of tokens to use as context for generating the next token. Smaller values reduce memory usage, while larger values provide more context to the model.',
+		},
+		{
+			displayName: 'Number of GPUs',
+			name: 'numGpu',
+			type: 'number',
+			default: -1,
+			description:
+				'Specifies the number of GPUs to use for parallel processing. Set to -1 for auto-detection.',
+		},
+		{
+			displayName: 'Max Tokens to Generate',
+			name: 'numPredict',
+			type: 'number',
+			default: -1,
+			description:
+				'The maximum number of tokens to generate. Set to -1 for no limit. Be cautious when setting this to a large value, as it can lead to very long outputs.',
+		},
+		{
+			displayName: 'Number of CPU Threads',
+			name: 'numThread',
+			type: 'number',
+			default: 0,
+			description:
+				'Specifies the number of CPU threads to use for processing. Set to 0 for auto-detection.',
+		},
+		{
+			displayName: 'Penalize Newlines',
+			name: 'penalizeNewline',
+			type: 'boolean',
+			default: true,
+			description:
+				'Whether the model will be less likely to generate newline characters, encouraging longer continuous sequences of text',
+		},
+		{
+			displayName: 'Presence Penalty',
+			name: 'presencePenalty',
+			type: 'number',
+			default: 0.0,
+			description:
+				'Adjusts the penalty for tokens based on their presence in the generated text so far. Positive values penalize tokens that have already appeared, encouraging diversity.',
+		},
+		{
+			displayName: 'Repetition Penalty',
+			name: 'repeatPenalty',
+			type: 'number',
+			default: 1.0,
+			description:
+				'Adjusts the penalty factor for repeated tokens. Higher values more strongly discourage repetition. Set to 1.0 to disable repetition penalty.',
+		},
+		{
+			displayName: 'Use Memory Locking',
+			name: 'useMLock',
+			type: 'boolean',
+			default: false,
+			description:
+				'Whether to lock the model in memory to prevent swapping. This can improve performance but requires sufficient available memory.',
+		},
+		{
+			displayName: 'Use Memory Mapping',
+			name: 'useMMap',
+			type: 'boolean',
+			default: true,
+			description:
+				'Whether to use memory mapping for loading the model. This can reduce memory usage but may impact performance. Recommended to keep enabled.',
+		},
+		{
+			displayName: 'Load Vocabulary Only',
+			name: 'vocabOnly',
+			type: 'boolean',
+			default: false,
+			description:
+				'Whether to only load the model vocabulary without the weights. Useful for quickly testing tokenization.',
+		},
+		{
+			displayName: 'Output Format',
+			name: 'format',
+			type: 'options',
+			options: [
+				{ name: 'Default', value: 'default' },
+				{ name: 'JSON', value: 'json' },
+			],
+			default: 'default',
+			description: 'Specifies the format of the API response',
+		},
+	],
+};
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LMOllama/ollama.svg b/packages/@n8n/nodes-langchain/nodes/llms/LMOllama/ollama.svg
new file mode 100644
index 0000000000000..ced4564f6c520
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LMOllama/ollama.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="241.333" height="341.333" version="1.0" viewBox="0 0 181 256"><g fill="#7D7D87"><path d="M37.7 19.5c-5.2 1.8-8.3 4.9-11.7 11.6-4.5 8.9-6.2 19.2-5.8 35.5l.3 14.2-5.8 6.1c-14.8 15.5-18.5 38.7-9.2 57.4l3.4 6.9-2 4.4c-3.4 8.2-5 16.4-5 26.3 0 10.8 1.8 19 5.8 26.2l2.6 4.8-2.1 4.9c-1.2 2.7-2.6 7.1-3.2 9.8-1.4 6.2-1.5 22.1-.1 25.7 1 2.6 1.4 2.7 7.6 2.7 7.3 0 7 .4 5.3-8.6-1.5-8.2.2-18.8 4.2-26.6 3.7-7 3.8-10.4.5-14.8-4.7-6.4-6.8-13.6-6.9-24-.1-10.3 1.4-16 6.6-26.1 3.1-6.1 2.9-8.7-1-12.2-1.1-1-3.1-4.2-4.3-7-1.9-4.2-2.4-6.9-2.3-14.2 0-11.4 2.5-18.3 9.5-26 7-7.6 14.2-11 23.9-11.2 4.1 0 7.8-.2 8.2-.2.4-.1 1.7-2.2 2.9-4.7 3-5.9 9.6-11.9 16.7-15.2 4.9-2.3 7-2.7 14.7-2.7 7.9 0 9.7.4 14.9 2.9 6.8 3.3 13.3 9.4 15.9 14.8 1 2 2.3 4.1 3 4.5.6.4 4.6.8 8.7.8 6.7.1 8.3.5 14 3.6 12.3 6.8 19.3 18.7 19.3 33.4.1 6.7-.4 9-2.7 14.2-1.6 3.5-3.5 6.8-4.3 7.5-3.4 2.8-3.5 5.8-.5 11.7 5.2 10.1 6.7 15.8 6.6 26.1-.1 10.4-2.2 17.6-6.9 24-3.3 4.4-3.2 7.8.5 14.8 4 7.8 5.7 18.4 4.2 26.6-1.7 9-2 8.6 5.3 8.6 6.2 0 6.6-.1 7.6-2.7 1.4-3.6 1.3-19.5-.1-25.7-.6-2.7-2-7.1-3.2-9.8l-2.1-4.9 2.6-4.8c7.6-13.9 7.9-35.9.6-52.8l-2-4.7 2.5-4.6c9.9-18.3 6.4-43.9-8.1-59.1l-5.8-6.1.3-14.2c.4-16.4-1.3-26.6-5.8-35.7-6.4-12.6-17.2-15.9-26.3-7.9-5.4 4.7-9.2 13.8-12.3 29.8-.3 1.4-1 2.2-1.7 1.8-18.2-8-29.7-8.5-44.3-2.1L65 54.9l-.4-2.2C61 34.2 56.1 24.2 49 20.5c-4.3-2.1-7.4-2.4-11.3-1m7.7 16.8c4.2 7.1 8.1 30.1 5.7 33.6-.5.8-3.1 1.6-5.8 1.8-2.6.2-6.2.8-8 1.3l-3.1.8-.7-4.9c-.8-5.9.2-17.2 2.2-24.8C37.1 38.4 40.5 32 42 32c.5 0 2 1.9 3.4 4.3m96.5-1c4 6.5 6.9 23.9 5.6 33.6l-.7 4.9-3.1-.8c-1.8-.5-5.4-1.1-8-1.3-2.7-.2-5.3-1-5.8-1.8-1.2-1.7-.3-14.1 1.7-22.9 1.5-6.4 5.7-15 7.4-15 .4 0 1.8 1.5 2.9 3.3"/><path d="M77.8 119.9c-7.3 2.4-11.6 5.1-16.5 10.4-5.5 6-7.6 12-7.1 20.1.5 7.6 3.5 12.9 10.6 18.3 6.2 4.7 12.7 6.3 25.7 6.3 17.2 0 25.8-3.6 32.9-13.8 4.2-5.9 4.8-15.5 1.6-23-2.9-6.8-11.1-14.3-18.8-17.3-8-3.1-20.7-3.6-28.4-1m25.7 10c16.1 7.1 19.4 23.2 6.6 31.8-4.9 3.3-9.4 4.3-19.6 4.3s-14.7-1-19.6-4.3c-17.8-12-3.2-35.6 21.1-34.3 3.9.2 8.6 1.2 11.5 2.5"/><path d="M83.8 140.1c-2.5 1.4-2.2 4.4.7 6.7 2 1.6 2.4 2.6 1.9 4.9-.7 3.6 1.5 5.8 5.1 4.9 2.1-.5 2.5-1.2 2.5-4.6 0-2.9.5-4.2 2-5 2.7-1.5 2.7-6.6 0-7.5-1-.3-2.8-.1-4 .5-1.4.7-2.6.8-3.9 0-2.3-1.2-2.2-1.2-4.3.1m-44.1-18.9c-.9.7-2.3 3-3.2 5-2.1 5.3-.1 10.3 4.7 11.6 4.3 1.1 6 .6 9.2-2.7 4-4.1 4.3-8.1 1.1-11.9-2.1-2.5-3.4-3.2-6.4-3.2-2 0-4.5.6-5.4 1.2m89.8 2c-3.2 3.8-2.9 7.8 1.1 11.9 3.2 3.3 4.9 3.8 9.2 2.7 4.9-1.3 6.8-6.2 4.6-11.8-1.9-4.7-3.8-6-8.7-6-2.7 0-4.1.7-6.2 3.2"/></g></svg>
\ No newline at end of file
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LMOpenAi/LmOpenAi.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LMOpenAi/LmOpenAi.node.ts
new file mode 100644
index 0000000000000..55398a60b12e3
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LMOpenAi/LmOpenAi.node.ts
@@ -0,0 +1,249 @@
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import { NodeConnectionType } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	INodeType,
+	INodeTypeDescription,
+	SupplyData,
+	ILoadOptionsFunctions,
+} from 'n8n-workflow';
+
+import { OpenAI, type ClientOptions } from '@langchain/openai';
+import { logWrapper } from '../../../utils/logWrapper';
+import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+
+type LmOpenAiOptions = {
+	baseURL?: string;
+	frequencyPenalty?: number;
+	maxTokens?: number;
+	presencePenalty?: number;
+	temperature?: number;
+	timeout?: number;
+	maxRetries?: number;
+	topP?: number;
+};
+
+export class LmOpenAi implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'OpenAI Model',
+		// eslint-disable-next-line n8n-nodes-base/node-class-description-name-miscased
+		name: 'lmOpenAi',
+		icon: 'file:openAi.svg',
+		group: ['transform'],
+		version: 1,
+		description: 'For advanced usage with an AI chain',
+		defaults: {
+			name: 'OpenAI Model',
+		},
+		codex: {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Language Models'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/sub-nodes/n8n-nodes-langchain.lmopenai/',
+					},
+				],
+			},
+		},
+		// 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.AiLanguageModel],
+		outputNames: ['Model'],
+		credentials: [
+			{
+				name: 'openAiApi',
+				required: true,
+			},
+		],
+		requestDefaults: {
+			ignoreHttpStatusErrors: true,
+			baseURL:
+				'={{ $parameter.options?.baseURL?.split("/").slice(0,-1).join("/") || "https://api.openai.com" }}',
+		},
+		properties: [
+			getConnectionHintNoticeField([NodeConnectionType.AiChain, NodeConnectionType.AiAgent]),
+			{
+				displayName: 'Model',
+				name: 'model',
+				type: 'resourceLocator',
+				default: { mode: 'list', value: 'gpt-3.5-turbo-instruct' },
+				required: true,
+				description:
+					'The model which will generate the completion. <a href="https://beta.openai.com/docs/models/overview">Learn more</a>.',
+				modes: [
+					{
+						displayName: 'From List',
+						name: 'list',
+						type: 'list',
+						typeOptions: {
+							searchListMethod: 'openAiModelSearch',
+						},
+					},
+					{
+						displayName: 'ID',
+						name: 'id',
+						type: 'string',
+					},
+				],
+				routing: {
+					send: {
+						type: 'body',
+						property: 'model',
+						value: '={{$parameter.model.value}}',
+					},
+				},
+			},
+			{
+				displayName: 'Options',
+				name: 'options',
+				placeholder: 'Add Option',
+				description: 'Additional options to add',
+				type: 'collection',
+				default: {},
+				options: [
+					{
+						displayName: 'Base URL',
+						name: 'baseURL',
+						default: 'https://api.openai.com/v1',
+						description: 'Override the default base URL for the API',
+						type: 'string',
+					},
+					{
+						displayName: 'Frequency Penalty',
+						name: 'frequencyPenalty',
+						default: 0,
+						typeOptions: { maxValue: 2, minValue: -2, numberPrecision: 1 },
+						description:
+							"Positive values penalize new tokens based on their existing frequency in the text so far, decreasing the model's likelihood to repeat the same line verbatim",
+						type: 'number',
+					},
+					{
+						displayName: 'Maximum Number of Tokens',
+						name: 'maxTokens',
+						default: -1,
+						description:
+							'The maximum number of tokens to generate in the completion. Most models have a context length of 2048 tokens (except for the newest models, which support 32,768).',
+						type: 'number',
+						typeOptions: {
+							maxValue: 32768,
+						},
+					},
+					{
+						displayName: 'Presence Penalty',
+						name: 'presencePenalty',
+						default: 0,
+						typeOptions: { maxValue: 2, minValue: -2, numberPrecision: 1 },
+						description:
+							"Positive values penalize new tokens based on whether they appear in the text so far, increasing the model's likelihood to talk about new topics",
+						type: 'number',
+					},
+					{
+						displayName: 'Sampling Temperature',
+						name: 'temperature',
+						default: 0.7,
+						typeOptions: { maxValue: 1, minValue: 0, numberPrecision: 1 },
+						description:
+							'Controls randomness: Lowering results in less random completions. As the temperature approaches zero, the model will become deterministic and repetitive.',
+						type: 'number',
+					},
+					{
+						displayName: 'Timeout',
+						name: 'timeout',
+						default: 60000,
+						description: 'Maximum amount of time a request is allowed to take in milliseconds',
+						type: 'number',
+					},
+					{
+						displayName: 'Max Retries',
+						name: 'maxRetries',
+						default: 2,
+						description: 'Maximum number of retries to attempt',
+						type: 'number',
+					},
+					{
+						displayName: 'Top P',
+						name: 'topP',
+						default: 1,
+						typeOptions: { maxValue: 1, minValue: 0, numberPrecision: 1 },
+						description:
+							'Controls diversity via nucleus sampling: 0.5 means half of all likelihood-weighted options are considered. We generally recommend altering this or temperature but not both.',
+						type: 'number',
+					},
+				],
+			},
+		],
+	};
+
+	methods = {
+		listSearch: {
+			async openAiModelSearch(this: ILoadOptionsFunctions) {
+				const results = [];
+
+				const options = this.getNodeParameter('options', {}) as LmOpenAiOptions;
+
+				let uri = 'https://api.openai.com/v1/models';
+
+				if (options.baseURL) {
+					uri = `${options.baseURL}/models`;
+				}
+
+				const { data } = (await this.helpers.requestWithAuthentication.call(this, 'openAiApi', {
+					method: 'GET',
+					uri,
+					json: true,
+				})) as { data: Array<{ owned_by: string; id: string }> };
+
+				for (const model of data) {
+					if (!model.owned_by?.startsWith('system')) continue;
+					results.push({
+						name: model.id,
+						value: model.id,
+					});
+				}
+
+				return { results };
+			},
+		},
+	};
+
+	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
+		const credentials = await this.getCredentials('openAiApi');
+
+		const modelName = this.getNodeParameter('model', itemIndex, '', {
+			extractValue: true,
+		}) as string;
+
+		const options = this.getNodeParameter('options', itemIndex, {}) as {
+			baseURL?: string;
+			frequencyPenalty?: number;
+			maxTokens?: number;
+			presencePenalty?: number;
+			temperature?: number;
+			timeout?: number;
+			maxRetries?: number;
+			topP?: number;
+		};
+
+		const configuration: ClientOptions = {};
+		if (options.baseURL) {
+			configuration.baseURL = options.baseURL;
+		}
+
+		const model = new OpenAI({
+			openAIApiKey: credentials.apiKey as string,
+			modelName,
+			...options,
+			configuration,
+			timeout: options.timeout ?? 60000,
+			maxRetries: options.maxRetries ?? 2,
+		});
+
+		return {
+			response: logWrapper(model, this),
+		};
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LMOpenAi/openAi.svg b/packages/@n8n/nodes-langchain/nodes/llms/LMOpenAi/openAi.svg
new file mode 100644
index 0000000000000..73d7895782176
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LMOpenAi/openAi.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="260" preserveAspectRatio="xMidYMid"><path fill="#7D7D87" d="M239.184 106.203a64.72 64.72 0 0 0-5.576-53.103C219.452 28.459 191 15.784 163.213 21.74A65.586 65.586 0 0 0 52.096 45.22a64.72 64.72 0 0 0-43.23 31.36c-14.31 24.602-11.061 55.634 8.033 76.74a64.67 64.67 0 0 0 5.525 53.102c14.174 24.65 42.644 37.324 70.446 31.36a64.72 64.72 0 0 0 48.754 21.744c28.481.025 53.714-18.361 62.414-45.481a64.77 64.77 0 0 0 43.229-31.36c14.137-24.558 10.875-55.423-8.083-76.483m-97.56 136.338a48.4 48.4 0 0 1-31.105-11.255l1.535-.87 51.67-29.825a8.6 8.6 0 0 0 4.247-7.367v-72.85l21.845 12.636c.218.111.37.32.409.563v60.367c-.056 26.818-21.783 48.545-48.601 48.601M37.158 197.93a48.35 48.35 0 0 1-5.781-32.589l1.534.921 51.722 29.826a8.34 8.34 0 0 0 8.441 0l63.181-36.425v25.221a.87.87 0 0 1-.358.665l-52.335 30.184c-23.257 13.398-52.97 5.431-66.404-17.803M23.549 85.38a48.5 48.5 0 0 1 25.58-21.333v61.39a8.29 8.29 0 0 0 4.195 7.316l62.874 36.272-21.845 12.636a.82.82 0 0 1-.767 0L41.353 151.53c-23.211-13.454-31.171-43.144-17.804-66.405zm179.466 41.695-63.08-36.63L161.73 77.86a.82.82 0 0 1 .768 0l52.233 30.184a48.6 48.6 0 0 1-7.316 87.635v-61.391a8.54 8.54 0 0 0-4.4-7.213m21.742-32.69-1.535-.922-51.619-30.081a8.39 8.39 0 0 0-8.492 0L99.98 99.808V74.587a.72.72 0 0 1 .307-.665l52.233-30.133a48.652 48.652 0 0 1 72.236 50.391zM88.061 139.097l-21.845-12.585a.87.87 0 0 1-.41-.614V65.685a48.652 48.652 0 0 1 79.757-37.346l-1.535.87-51.67 29.825a8.6 8.6 0 0 0-4.246 7.367zm11.868-25.58L128.067 97.3l28.188 16.218v32.434l-28.086 16.218-28.188-16.218z"/></svg>
\ No newline at end of file
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LMOpenHuggingFaceInference/LmOpenHuggingFaceInference.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LMOpenHuggingFaceInference/LmOpenHuggingFaceInference.node.ts
new file mode 100644
index 0000000000000..43092ab917b79
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LMOpenHuggingFaceInference/LmOpenHuggingFaceInference.node.ts
@@ -0,0 +1,150 @@
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import {
+	NodeConnectionType,
+	type IExecuteFunctions,
+	type INodeType,
+	type INodeTypeDescription,
+	type SupplyData,
+} from 'n8n-workflow';
+
+import { HuggingFaceInference } from '@langchain/community/llms/hf';
+import { logWrapper } from '../../../utils/logWrapper';
+import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+
+export class LmOpenHuggingFaceInference implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Hugging Face Inference Model',
+		// eslint-disable-next-line n8n-nodes-base/node-class-description-name-miscased
+		name: 'lmOpenHuggingFaceInference',
+		icon: 'file:huggingface.svg',
+		group: ['transform'],
+		version: 1,
+		description: 'Language Model HuggingFaceInference',
+		defaults: {
+			name: 'Hugging Face Inference Model',
+		},
+		codex: {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Language Models'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/sub-nodes/n8n-nodes-langchain.lmopenhuggingfaceinference/',
+					},
+				],
+			},
+		},
+		// 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.AiLanguageModel],
+		outputNames: ['Model'],
+		credentials: [
+			{
+				name: 'huggingFaceApi',
+				required: true,
+			},
+		],
+		properties: [
+			getConnectionHintNoticeField([NodeConnectionType.AiChain, NodeConnectionType.AiAgent]),
+			{
+				displayName: 'Model',
+				name: 'model',
+				type: 'string',
+				default: 'gpt2',
+			},
+			{
+				displayName: 'Options',
+				name: 'options',
+				placeholder: 'Add Option',
+				description: 'Additional options to add',
+				type: 'collection',
+				default: {},
+				options: [
+					{
+						displayName: 'Custom Inference Endpoint',
+						name: 'endpointUrl',
+						default: '',
+						description: 'Custom endpoint URL',
+						type: 'string',
+					},
+					{
+						displayName: 'Frequency Penalty',
+						name: 'frequencyPenalty',
+						default: 0,
+						typeOptions: { maxValue: 2, minValue: -2, numberPrecision: 1 },
+						description:
+							"Positive values penalize new tokens based on their existing frequency in the text so far, decreasing the model's likelihood to repeat the same line verbatim",
+						type: 'number',
+					},
+					{
+						displayName: 'Maximum Number of Tokens',
+						name: 'maxTokens',
+						default: 128,
+						description:
+							'The maximum number of tokens to generate in the completion. Most models have a context length of 2048 tokens (except for the newest models, which support 32,768).',
+						type: 'number',
+						typeOptions: {
+							maxValue: 32768,
+						},
+					},
+					{
+						displayName: 'Presence Penalty',
+						name: 'presencePenalty',
+						default: 0,
+						typeOptions: { maxValue: 2, minValue: -2, numberPrecision: 1 },
+						description:
+							"Positive values penalize new tokens based on whether they appear in the text so far, increasing the model's likelihood to talk about new topics",
+						type: 'number',
+					},
+					{
+						displayName: 'Sampling Temperature',
+						name: 'temperature',
+						default: 1,
+						typeOptions: { maxValue: 1, minValue: 0, numberPrecision: 1 },
+						description:
+							'Controls randomness: Lowering results in less random completions. As the temperature approaches zero, the model will become deterministic and repetitive.',
+						type: 'number',
+					},
+					{
+						displayName: 'Top K',
+						name: 'topK',
+						default: 1,
+						typeOptions: { maxValue: 1, minValue: 0, numberPrecision: 1 },
+						description:
+							'Controls the top tokens to consider within the sample operation to create new text',
+						type: 'number',
+					},
+					{
+						displayName: 'Top P',
+						name: 'topP',
+						default: 1,
+						typeOptions: { maxValue: 1, minValue: 0, numberPrecision: 1 },
+						description:
+							'Controls diversity via nucleus sampling: 0.5 means half of all likelihood-weighted options are considered. We generally recommend altering this or temperature but not both.',
+						type: 'number',
+					},
+				],
+			},
+		],
+	};
+
+	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
+		const credentials = await this.getCredentials('huggingFaceApi');
+
+		const modelName = this.getNodeParameter('model', itemIndex) as string;
+		const options = this.getNodeParameter('options', itemIndex, {}) as object;
+
+		const model = new HuggingFaceInference({
+			model: modelName,
+			apiKey: credentials.apiKey as string,
+			...options,
+		});
+
+		return {
+			response: logWrapper(model, this),
+		};
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LMOpenHuggingFaceInference/huggingface.svg b/packages/@n8n/nodes-langchain/nodes/llms/LMOpenHuggingFaceInference/huggingface.svg
new file mode 100644
index 0000000000000..8f9b152632b92
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LMOpenHuggingFaceInference/huggingface.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" fill="none"><path fill="#fff" d="M230.721 172.7a19 19 0 0 0-2.575-5.692q.376-1.377.568-2.791c.829-5.976-1.243-11.447-5.147-15.68-2.115-2.312-4.382-3.839-6.783-4.776a90.6 90.6 0 0 0 2.377-20.568c0-3.163-.179-6.261-.479-9.313a106 106 0 0 0-.567-4.56 91 91 0 0 0-3.051-13.21 91 91 0 0 0-3.054-8.374 92 92 0 0 0-6.041-11.754 81 81 0 0 0-4.907-7.262 69 69 0 0 0-2.704-3.446 90.5 90.5 0 0 0-9.033-9.486 70 70 0 0 0-3.315-2.862 82 82 0 0 0-3.424-2.704 96 96 0 0 0-7.262-4.907c-13.781-8.37-29.942-13.17-47.215-13.17-50.292 0-91.052 40.762-91.052 91.051-.002 7.012.81 14 2.42 20.824-2.16.938-4.23 2.4-6.15 4.515-3.903 4.231-5.976 9.682-5.147 15.658q.189 1.425.567 2.813a19 19 0 0 0-2.573 5.694c-1.2 4.561-.805 8.674.72 12.278-1.658 4.71-1.244 9.726.915 14.087 1.57 3.185 3.817 5.649 6.587 7.851 3.293 2.618 7.415 4.842 12.387 6.976 5.932 2.53 13.173 4.907 16.466 5.779 8.506 2.202 16.662 3.598 24.928 3.666 11.777.109 21.919-2.66 29.18-9.747a88 88 0 0 0 10.752.654 94 94 0 0 0 11.358-.715c7.244 7.132 17.425 9.926 29.245 9.814 8.265-.066 16.421-1.462 24.905-3.667 3.315-.872 10.553-3.249 16.488-5.779 4.972-2.137 9.094-4.361 12.409-6.975 2.749-2.203 4.994-4.666 6.565-7.851 2.181-4.362 2.573-9.378.938-14.088 1.51-3.604 1.903-7.726.704-12.283m-8.44 11.973c1.671 3.171 1.778 6.754.304 10.091-2.236 5.057-7.79 9.041-18.577 13.318-6.708 2.66-12.85 4.361-12.904 4.376-8.872 2.301-16.896 3.47-23.842 3.47-11.502 0-20.061-3.174-25.489-9.442a85.5 85.5 0 0 1-27.747.158c-5.435 6.164-13.945 9.284-25.35 9.284-6.947 0-14.97-1.169-23.843-3.47-.054-.015-6.194-1.716-12.904-4.376-10.786-4.277-16.342-8.258-18.577-13.318-1.474-3.337-1.367-6.92.304-10.091q.231-.443.497-.86a12.8 12.8 0 0 1-1.728-10.341c.664-2.523 2.035-4.621 3.897-6.128a12.75 12.75 0 0 1-1.73-4.822c-.536-3.714.697-7.422 3.47-10.446 2.16-2.353 5.213-3.648 8.593-3.648h.09a84.5 84.5 0 0 1-3.832-25.235c0-46.671 37.836-84.51 84.514-84.51s84.513 37.835 84.513 84.51a84.4 84.4 0 0 1-3.859 25.299q.612-.06 1.201-.061c3.38 0 6.434 1.295 8.592 3.648 2.773 3.021 4.007 6.732 3.47 10.446a12.8 12.8 0 0 1-1.729 4.822c1.862 1.507 3.234 3.605 3.897 6.128a12.8 12.8 0 0 1-1.728 10.341q.267.413.497.857"/><path fill="#FF9D00" d="M221.784 183.816a12.8 12.8 0 0 0 1.728-10.341c-.664-2.523-2.036-4.621-3.897-6.128a12.7 12.7 0 0 0 1.729-4.822c.537-3.714-.696-7.422-3.47-10.446-2.158-2.353-5.212-3.648-8.592-3.648q-.59 0-1.201.061a84.4 84.4 0 0 0 3.852-25.297c0-46.672-37.836-84.51-84.509-84.51S42.91 76.52 42.91 123.195a84.5 84.5 0 0 0 3.832 25.235h-.09c-3.38 0-6.433 1.294-8.592 3.647-2.773 3.021-4.007 6.733-3.47 10.446a12.8 12.8 0 0 0 1.73 4.823c-1.862 1.506-3.234 3.604-3.898 6.127a12.8 12.8 0 0 0 1.73 10.343q-.266.417-.497.86c-1.67 3.171-1.778 6.754-.303 10.091 2.236 5.057 7.79 9.041 18.577 13.318 6.707 2.66 12.85 4.361 12.904 4.376 8.872 2.301 16.896 3.47 23.842 3.47 11.406 0 19.916-3.12 25.351-9.284a85.5 85.5 0 0 0 27.747-.158c5.428 6.268 13.987 9.442 25.489 9.442 6.946 0 14.97-1.169 23.841-3.47.055-.015 6.195-1.716 12.905-4.376 10.787-4.277 16.342-8.261 18.577-13.318 1.474-3.337 1.367-6.92-.304-10.091q-.23-.447-.497-.86m-111.647 13.181a35 35 0 0 1-1.502 2.394c-1.405 2.057-3.253 3.629-5.398 4.797-4.1 2.236-9.29 3.017-14.562 3.017-8.329 0-16.867-1.949-21.652-3.19-.236-.061-29.334-8.28-25.65-15.276.62-1.177 1.64-1.647 2.925-1.647 5.187 0 14.632 7.724 18.69 7.724.908 0 1.548-.386 1.809-1.328 1.73-6.204-26.293-8.812-23.933-17.796.416-1.59 1.546-2.236 3.134-2.236 6.858-.001 22.25 12.06 25.469 12.06.247 0 .424-.073.52-.225l.041-.069c1.511-2.495.644-4.309-9.707-10.649l-.994-.605c-11.391-6.894-19.386-11.043-14.84-15.993.524-.571 1.266-.824 2.167-.824 1.068 0 2.36.357 3.785.957 6.016 2.537 14.354 9.456 17.837 12.473a146 146 0 0 1 1.633 1.441s4.41 4.586 7.076 4.586c.614 0 1.135-.242 1.488-.84 1.891-3.188-17.563-17.93-18.66-24.013-.744-4.121.522-6.209 2.862-6.209 1.113 0 2.47.474 3.97 1.425 4.65 2.951 13.628 18.379 16.915 24.381 1.102 2.011 2.983 2.861 4.678 2.861 3.363 0 5.992-3.343.308-7.591-8.543-6.392-5.545-16.84-1.468-17.483q.262-.042.525-.042c3.708 0 5.343 6.389 5.343 6.389s4.794 12.038 13.029 20.267c7.472 7.469 8.516 13.598 4.162 21.244m26.629 1.41-.427.051-.728.083q-.575.06-1.152.113l-.375.034-.343.029-.486.039-.537.039-.536.035-.119.008q-.21.013-.422.024l-.179.01q-.248.013-.5.024l-.581.025-.527.018-.352.01h-.179c-.11 0-.219.006-.329.007h-.174q-.165-.001-.329.005l-.448.006h-.625q-.737 0-1.469-.015l-.396-.009q-.17-.001-.337-.009l-.42-.012-.521-.02-.47-.021-.121-.005-.447-.023q-.187-.01-.372-.022l-.289-.017a80 80 0 0 1-1.089-.076l-.38-.031q-.24-.019-.479-.041-.28-.024-.561-.052a60 60 0 0 1-.939-.095h-.015c4.57-10.195 2.259-19.717-6.976-28.944-6.057-6.049-10.086-14.981-10.922-16.942-1.692-5.805-6.17-12.258-13.607-12.258q-.945 0-1.878.148c-3.258.513-6.106 2.388-8.138 5.21-2.196-2.731-4.33-4.902-6.26-6.128-2.91-1.845-5.814-2.781-8.643-2.781-3.531 0-6.687 1.45-8.887 4.08l-.056.067-.123-.52-.005-.023a74 74 0 0 1-1.054-5.412q.002-.018-.006-.036l-.063-.412q-.093-.61-.173-1.22l-.073-.555-.068-.555c-.022-.185-.04-.353-.06-.529l-.006-.044q-.12-1.08-.21-2.162l-.022-.277-.035-.472q-.016-.194-.027-.389c0-.031-.005-.061-.006-.09a53 53 0 0 1-.065-1.088q-.016-.283-.028-.567l-.02-.496-.005-.15-.016-.457-.01-.389c0-.155-.008-.31-.01-.465-.003-.155-.007-.325-.008-.489-.002-.164 0-.326-.005-.489-.004-.164 0-.327 0-.49 0-41.853 33.93-75.784 75.788-75.784 41.856 0 75.786 33.93 75.786 75.784v.979q-.002.245-.008.489c0 .135-.006.268-.01.405q-.002.182-.009.357c0 .153-.009.306-.014.459v.012l-.021.531-.021.466-.005.11-.027.496a81 81 0 0 1-.241 3.184v.013q-.025.261-.053.522l-.045.411-.089.804-.051.407-.063.479q-.034.262-.072.522-.04.292-.084.583l-.069.459-.082.52q-.042.26-.09.517c-.033.173-.059.345-.089.517q-.09.516-.189 1.031-.151.77-.31 1.537l-.11.507q-.055.254-.113.508c-2.133-2.073-4.958-3.202-8.073-3.202-2.827 0-5.734.935-8.643 2.78-1.93 1.226-4.063 3.398-6.26 6.128-2.035-2.822-4.883-4.697-8.139-5.21a12 12 0 0 0-1.878-.148c-7.439 0-11.914 6.453-13.607 12.258-.84 1.961-4.87 10.893-10.932 16.951-9.229 9.198-11.557 18.677-7.059 28.83m78.241-20.409-.03.089a5 5 0 0 1-.263.587q-.112.21-.244.408-.25.374-.549.711c-.046.052-.09.104-.142.155a8 8 0 0 1-.22.227c-1.346 1.334-3.398 2.504-5.718 3.577l-.799.358-.268.119c-.179.079-.358.157-.546.234q-.27.118-.551.232l-.558.23c-1.305.537-2.642 1.049-3.946 1.554l-.558.217-.551.216q-.55.214-1.085.429l-.531.214-.522.213-.256.108-.505.213c-3.837 1.647-6.598 3.322-6.018 5.4q.024.088.054.17.078.23.212.436.078.122.179.228c.682.709 1.923.597 3.488.034q.33-.121.656-.253l.136-.056c.358-.152.737-.322 1.124-.506.097-.046.195-.09.293-.141 1.914-.936 4.083-2.196 6.235-3.343a56 56 0 0 1 2.618-1.325c2.038-.959 3.954-1.639 5.494-1.639.723 0 1.361.148 1.893.488l.089.059c.334.235.614.537.823.887q.061.101.12.211c.761 1.445.124 2.941-1.367 4.408-1.431 1.409-3.657 2.79-6.187 4.068q-.281.143-.567.283c-7.53 3.698-17.391 6.483-17.528 6.518-2.628.681-6.386 1.575-10.62 2.244l-.626.098-.103.015q-.711.108-1.425.201-.725.097-1.462.179l-.09.01a69 69 0 0 1-5.358.406h-.026q-.971.035-1.943.035h-.747a46 46 0 0 1-2.959-.134q-.035.002-.071-.006-.53-.04-1.057-.099a40 40 0 0 1-1.092-.132 25 25 0 0 1-.715-.107 58 58 0 0 1-.725-.121l-.329-.062-.025-.005a26 26 0 0 1-1.036-.219c-.2-.045-.399-.089-.596-.143l-.119-.03q-.146-.037-.29-.076l-.053-.014-.308-.09-.336-.098-.039-.011-.291-.089q-.165-.052-.329-.106l-.268-.089-.197-.069q-.285-.1-.566-.208l-.178-.07-.147-.058a23 23 0 0 1-.845-.358l-.185-.09-.031-.014q-.099-.048-.197-.089a17 17 0 0 1-.384-.191l-.039-.019-.184-.097a16 16 0 0 1-.961-.546l-.172-.106a9 9 0 0 1-.256-.164l-.224-.148-.241-.166-.144-.103q-.228-.162-.447-.335l-.233-.179a15 15 0 0 1-.276-.228q-.115-.095-.227-.195l-.006-.005q-.121-.106-.239-.215a12 12 0 0 1-.232-.216l-.009-.009a9 9 0 0 1-.235-.232q-.117-.117-.231-.236t-.226-.243c-.074-.082-.142-.157-.212-.238l-.023-.027a9 9 0 0 1-.201-.238 12 12 0 0 1-.416-.525q-.203-.27-.396-.551l-.123-.184q-.246-.36-.479-.728a19 19 0 0 1-.339-.536q-.106-.17-.207-.339l-.028-.046q-.098-.164-.191-.327a3 3 0 0 1-.102-.179c-.033-.062-.071-.125-.106-.188l-.057-.099-.035-.064q-.1-.18-.197-.363-.044-.082-.09-.16l-.089-.173-.09-.171q-.338-.675-.638-1.368l-.071-.169q-.067-.17-.135-.336-.034-.08-.063-.161a17 17 0 0 1-.776-2.639q-.017-.083-.031-.163a12 12 0 0 1-.127-.806q-.012-.08-.02-.159l-.017-.162a11 11 0 0 1-.049-.638q-.002-.082-.007-.16a8 8 0 0 1-.008-.318c-.056-4.273 2.106-8.381 6.729-13.002 8.235-8.227 13.029-20.266 13.029-20.266s.129-.505.397-1.232q.055-.151.12-.314.234-.611.527-1.197l.039-.075q.25-.498.544-.971c.046-.073.09-.145.141-.218q.22-.326.465-.634c.089-.111.186-.221.283-.328q.057-.064.118-.124c.477-.493 1.022-.895 1.639-1.109l.078-.026q.078-.025.157-.048.091-.024.185-.043l.029-.006q.195-.039.395-.052h.011c.069 0 .139-.007.21-.007.089 0 .172 0 .259.009q.135.012.269.032c.742.118 1.448.56 2.056 1.242q.347.391.621.836.18.288.34.609c.043.089.084.171.124.259a8 8 0 0 1 .28.691q.293.827.439 1.692.126.758.15 1.526.012.41 0 .829a12 12 0 0 1-.787 3.792q-.065.167-.134.335a9 9 0 0 1-.302.665q-.12.248-.258.496-.09.165-.186.33-.242.41-.522.817l-.113.162a13.6 13.6 0 0 1-1.472 1.728 15.4 15.4 0 0 1-1.699 1.47q-.905.67-1.689 1.477c-1.503 1.577-1.853 2.969-1.515 4.024q.081.25.211.479.152.261.357.48l.053.055.054.054q.08.078.172.153l.06.048q.218.168.46.3c.047.025.089.05.142.074q.261.128.537.217.076.025.154.048l.065.017.09.024.077.019.084.018.083.017.079.013q.087.016.178.027l.057.009.104.01.064.007.105.007h.062l.11.006h.346l.099-.006.114-.007.139-.013.13-.015c.03 0 .06-.008.09-.014.4-.058.792-.164 1.167-.316l.159-.067a5 5 0 0 0 .772-.421q.344-.225.647-.503.072-.066.141-.133.034-.032.067-.067.067-.066.133-.138.482-.53.825-1.157a229 229 0 0 1 6.151-10.514l.294-.471.297-.471q.223-.358.447-.708l.15-.234q.747-1.17 1.519-2.324l.305-.456c.612-.907 1.222-1.789 1.827-2.627l.301-.415a56 56 0 0 1 2.054-2.661l.282-.338c.047-.056.09-.112.141-.166q.14-.165.277-.321c.046-.053.089-.105.138-.157l.268-.302.134-.147q.202-.217.397-.417c.09-.09.173-.179.259-.263a10.5 10.5 0 0 1 1.669-1.386l.14-.09q.201-.136.415-.25c2.364-1.342 4.321-1.441 5.448-.314.682.682 1.06 1.813 1.039 3.387q.001.103-.005.211v.077q-.002.108-.012.217c0 .09-.01.179-.019.269-.009.089-.014.157-.023.237q-.001.033-.008.069-.01.104-.025.211.002.032-.008.065a5 5 0 0 1-.041.283c-.011.09-.026.174-.042.262l-.026.149a4 4 0 0 1-.1.42 6 6 0 0 1-.283.758 11 11 0 0 1-.514.987q-.156.267-.322.526-.172.269-.358.543-.474.678-.985 1.328l-.156.197a51 51 0 0 1-1.722 2.035l-.187.21q-.378.422-.77.848l-.197.214c-.131.143-.268.286-.4.43q-.198.215-.406.433l-.411.433-.417.436-.42.436q-.423.438-.85.876c-4.055 4.159-8.327 8.304-9.773 10.888a5 5 0 0 0-.262.519c-.206.47-.292.872-.233 1.197a.9.9 0 0 0 .111.303q.122.212.295.387.08.078.168.144c.298.212.657.321 1.023.311h.114l.117-.009.117-.013.097-.014q.02-.002.04-.008l.089-.017.023-.005.099-.021.035-.009.104-.028c.035-.01.083-.023.125-.037q.264-.08.517-.188.133-.054.262-.117.068-.03.132-.063l.134-.066q.48-.25.936-.541l.133-.09q.068-.041.133-.089l.133-.089.071-.049.192-.135c.179-.123.346-.25.515-.379l.015-.012.269-.208c.367-.29.715-.582 1.031-.857l.21-.184.019-.018.11-.097c.258-.232.488-.448.679-.626l.079-.077q.103-.099.189-.178l.112-.111.04-.039.011-.011.117-.117.074-.077.009-.007.035-.032.044-.04.014-.013.037-.034.204-.179.114-.102q.091-.08.179-.162l.136-.121q.037-.03.074-.064l.143-.125.21-.185.112-.097c.435-.378.964-.835 1.572-1.35l.249-.211.411-.345.421-.351c.55-.457 1.142-.942 1.768-1.445l.411-.33q.526-.42 1.073-.849.22-.173.448-.344.558-.434 1.123-.859c.858-.648 1.743-1.297 2.639-1.929l.384-.268q.403-.279.805-.552l.243-.164q.72-.488 1.455-.951l.243-.153.241-.15q.363-.225.721-.44l.239-.143.478-.278.469-.269.095-.052.371-.204q.232-.126.463-.244l.229-.118.223-.112.231-.113a22 22 0 0 1 1.954-.845l.41-.144q.185-.062.358-.115l.04-.012q.093-.03.185-.054l.018-.005q.192-.055.38-.099h.009a8 8 0 0 1 1.077-.183q.25-.026.502-.025h.084q.167 0 .327.018c.049 0 .098.01.146.016h.02q.072.008.144.024.071.013.141.028h.015c.047.01.089.022.138.036.254.071.496.181.718.325q.164.107.305.24l.027.026.051.05.049.053c.402.421.734.904.984 1.43l.038.09q.128.3.2.618c.142.646.087 1.32-.158 1.935a4.7 4.7 0 0 1-.339.715 8 8 0 0 1-1.099 1.452l-.089.095q-.199.21-.416.42-.097.094-.198.188l-.205.189-.107.095q-.388.345-.792.669-.244.198-.493.388-.879.672-1.791 1.297a60 60 0 0 1-1.11.743 100 100 0 0 1-2.786 1.763c-1.968 1.21-4.149 2.504-6.474 3.911l-.602.365q-.988.603-1.867 1.152l-.295.185-.558.358q-.555.356-1.108.715l-.297.196q-.217.142-.433.286l-.141.09-.432.291-.229.157-.268.186-.249.173q-.626.442-1.162.843l-.134.102q-.315.239-.623.486-.464.373-.844.716l-.124.113q-.107.098-.208.194-.067.068-.137.133l-.064.064q-.215.216-.418.442l-.066.076q-.22.254-.387.492l-.05.071q-.132.192-.242.396-.028.051-.053.102l-.049.102-.033.074-.021.05-.017.045-.023.061a2.6 2.6 0 0 0-.13.523l-.008.062-.006.058v.315q-.002.038.007.08l.005.048c0 .026.006.051.01.079.004.026.011.073.019.11v.005q.01.052.023.104c.009.035.018.075.029.111q.03.106.068.211.023.063.048.124.002.012.01.025l.036.081.05.111q.081.172.177.336l.066.114.068.114a.4.4 0 0 0 .041.054l.022.023.025.023.026.02a.5.5 0 0 0 .122.063q.035.012.071.02c.577.13 1.763-.347 3.339-1.179.089-.048.187-.098.282-.15l.48-.262.234-.13c.167-.089.337-.19.511-.289l.317-.179c2.083-1.199 4.571-2.739 7.143-4.243q.362-.212.725-.421l.486-.311q.846-.485 1.7-.957a80 80 0 0 1 2.168-1.15l.476-.241q.474-.234.938-.456a41 41 0 0 1 1.815-.809l.335-.136.04-.016c1.775-.703 3.384-1.137 4.686-1.137q.423-.004.84.069h.009c.089.016.17.034.253.054h.015q.32.081.616.23c.275.142.522.331.731.559q.144.16.256.343.21.324.329.692c.032.095.06.188.089.287a3.93 3.93 0 0 1-.06 2.305"/><path fill="#FFD21E" fill-rule="evenodd" d="M203.21 123.685v-.491c0-41.854-33.918-75.783-75.775-75.783-41.856 0-75.787 33.931-75.787 75.783v.164a7 7 0 0 0 0 .327q.008.244.005.489l.005.36.003.129q0 .09.004.179.005.143.005.286l.011.389.016.457.005.15.02.473v.023l.027.553.001.014q.014.282.032.566.014.261.033.522l.002.031.03.448.003.04.033.432.003.028q.008.127.02.249.09 1.082.21 2.161l.004.045.061.529.068.555.05.377.023.177q.08.612.173 1.221l.004.027.059.384q.429 2.745 1.06 5.45l.005.022.032.135.091.385.056-.067c2.2-2.63 5.356-4.08 8.887-4.08 2.83 0 5.733.936 8.643 2.781 1.93 1.226 4.064 3.397 6.26 6.128 2.032-2.822 4.88-4.698 8.138-5.21.621-.098 1.25-.147 1.878-.148 7.436 0 11.915 6.453 13.607 12.258.836 1.961 4.865 10.893 10.941 16.935 9.236 9.227 11.547 18.748 6.976 28.943h.016q.466.053.939.096.28.028.561.052l.066.006.413.035.38.03q.543.042 1.089.077l.289.017.229.014.142.008.447.023.122.005.469.021.522.02.419.012.07.002q.133.006.267.007l.096.003q.885.021 1.769.02h.626l.447-.005q.164-.006.33-.005h.174l.151-.004q.088-.004.178-.004h.179l.351-.009.528-.018.581-.026q.252-.01.5-.023l.179-.011.266-.014.156-.009.118-.008.537-.035.536-.039.487-.039.342-.029.376-.034a62 62 0 0 0 1.88-.197l.427-.051c-4.499-10.152-2.17-19.632 7.027-28.822 6.063-6.058 10.092-14.99 10.932-16.952 1.693-5.804 6.169-12.257 13.607-12.257.629 0 1.258.05 1.879.148 3.255.512 6.103 2.388 8.138 5.21 2.197-2.73 4.33-4.903 6.261-6.129 2.909-1.844 5.815-2.78 8.642-2.78 3.116 0 5.94 1.13 8.073 3.203q.058-.253.114-.508l.109-.506q.059-.278.115-.555.1-.49.195-.984.099-.513.189-1.03l.031-.186.058-.331q.05-.258.09-.518l.011-.066.071-.453.07-.459v-.004q.076-.508.144-1.017l.011-.084.063-.478.051-.408.09-.804.035-.323.009-.088q.029-.261.053-.522v-.014l.039-.416q.107-1.182.179-2.375.013-.195.024-.392v-.006l.026-.491.006-.11q.024-.498.041-.996v-.012l.005-.13q.008-.164.009-.329l.002-.044q.007-.156.008-.314l.003-.09q.005-.157.006-.314l.002-.089q.005-.2.006-.4zm-94.572 75.706c6.002-8.801 5.576-15.407-2.658-23.637-8.236-8.231-13.029-20.267-13.029-20.267s-1.789-6.991-5.869-6.349-7.073 11.089 1.47 17.484c8.542 6.395-1.7 10.731-4.988 4.73-3.288-6.002-12.265-21.429-16.919-24.38s-7.927-1.297-6.83 4.785c.545 3.019 5.613 8.172 10.348 12.986 4.804 4.884 9.265 9.42 8.311 11.025-1.893 3.187-8.56-3.745-8.56-3.745s-20.876-18.998-25.42-14.047c-4.19 4.563 2.271 8.442 12.227 14.421q1.27.762 2.611 1.572c11.391 6.896 12.277 8.715 10.66 11.324-.597.964-4.41-1.325-9.1-4.14-7.995-4.801-18.537-11.13-20.026-5.465-1.288 4.903 6.468 7.907 13.502 10.632 5.86 2.27 11.22 4.346 10.431 7.164-.817 2.922-5.246.485-10.087-2.179-5.435-2.991-11.39-6.267-13.339-2.57-3.683 6.99 25.41 15.219 25.65 15.28 9.4 2.438 33.272 7.604 41.615-4.624m38.665 0c-6.002-8.801-5.576-15.407 2.659-23.637s13.028-20.267 13.028-20.267 1.789-6.991 5.869-6.349 7.073 11.089-1.469 17.484 1.699 10.731 4.987 4.73c3.289-6.002 12.26-21.429 16.914-24.38s7.929-1.297 6.831 4.785c-.544 3.019-5.613 8.172-10.348 12.987-4.804 4.884-9.265 9.419-8.312 11.024 1.893 3.187 8.565-3.749 8.565-3.749s20.875-18.997 25.421-14.046c4.189 4.562-2.272 8.442-12.229 14.421q-1.306.784-2.61 1.572c-11.391 6.896-12.277 8.715-10.661 11.323.598.965 4.411-1.325 9.1-4.14 7.996-4.8 18.538-11.13 20.027-5.464 1.289 4.903-6.468 7.907-13.502 10.632-5.86 2.27-11.22 4.346-10.432 7.164.816 2.921 5.244.484 10.084-2.18 5.435-2.991 11.391-6.269 13.339-2.569 3.684 6.994-25.414 15.215-25.649 15.275-9.4 2.446-33.272 7.612-41.612-4.616" clip-rule="evenodd"/><path fill="#32343D" fill-rule="evenodd" d="M152.047 102.567c1.182.418 2.061 1.69 2.897 2.901 1.13 1.636 2.182 3.159 3.796 2.301a10.91 10.91 0 0 0 4.247-15.214 10.91 10.91 0 0 0-7.742-5.198 10.904 10.904 0 0 0-11.689 6.589 10.9 10.9 0 0 0 .436 9.314c.748 1.407 2.408.743 4.16.042 1.373-.549 2.804-1.121 3.895-.735m-51.375 0c-1.182.418-2.061 1.691-2.897 2.901-1.13 1.637-2.183 3.159-3.796 2.301a10.903 10.903 0 0 1 8.263-20.068 10.91 10.91 0 0 1 7.707 9.348 10.9 10.9 0 0 1-1.221 6.211c-.749 1.407-2.409.743-4.161.043-1.374-.55-2.803-1.122-3.895-.736m43.427 46.751c8.143-6.415 11.134-16.889 11.134-23.341 0-5.1-3.431-3.495-8.924-.775l-.31.153c-5.042 2.497-11.754 5.822-19.122 5.822s-14.081-3.325-19.122-5.823c-5.671-2.809-9.228-4.571-9.228.624 0 6.656 3.182 17.585 11.916 23.934a18.97 18.97 0 0 1 11.575-9.786c.872-.26 1.77 1.241 2.689 2.778.887 1.482 1.794 2.998 2.716 2.998.983 0 1.948-1.494 2.891-2.952.985-1.525 1.946-3.01 2.875-2.713a18.97 18.97 0 0 1 10.91 9.081" clip-rule="evenodd"/><path fill="#FF323D" d="M144.097 149.317c-4.241 3.342-9.878 5.583-17.219 5.583-6.897 0-12.291-1.978-16.435-4.989a18.97 18.97 0 0 1 11.575-9.786c1.712-.511 3.527 5.776 5.405 5.776 2.01 0 3.947-6.246 5.766-5.665a18.97 18.97 0 0 1 10.908 9.081"/><path fill="#FFAD03" fill-rule="evenodd" d="M81.2 111.64a7.08 7.08 0 0 1-6.65.655 7.06 7.06 0 0 1-3.837-3.837 7.08 7.08 0 0 1 .657-6.65 7.087 7.087 0 1 1 9.83 9.832m101.413 0a7.08 7.08 0 0 1-6.651.655 7.06 7.06 0 0 1-3.837-3.837 7.1 7.1 0 0 1-.504-3.407 7.1 7.1 0 0 1 3.411-5.385 7.08 7.08 0 0 1 8.656 1.07 7.08 7.08 0 0 1 1.536 7.724 7.1 7.1 0 0 1-2.611 3.18" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LmChatAwsBedrock/LmChatAwsBedrock.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LmChatAwsBedrock/LmChatAwsBedrock.node.ts
new file mode 100644
index 0000000000000..48cfc603fd505
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LmChatAwsBedrock/LmChatAwsBedrock.node.ts
@@ -0,0 +1,161 @@
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import {
+	NodeConnectionType,
+	type IExecuteFunctions,
+	type INodeType,
+	type INodeTypeDescription,
+	type SupplyData,
+} from 'n8n-workflow';
+import { BedrockChat } from '@langchain/community/chat_models/bedrock';
+import { logWrapper } from '../../../utils/logWrapper';
+import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+// Dependencies needed underneath the hood. We add them
+// here only to track where what dependency is used
+import '@aws-sdk/credential-provider-node';
+import '@aws-sdk/client-bedrock-runtime';
+
+export class LmChatAwsBedrock implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'AWS Bedrock Chat Model',
+		// eslint-disable-next-line n8n-nodes-base/node-class-description-name-miscased
+		name: 'lmChatAwsBedrock',
+		icon: 'file:bedrock.svg',
+		group: ['transform'],
+		version: 1,
+		description: 'Language Model AWS Bedrock',
+		defaults: {
+			name: 'AWS Bedrock Chat Model',
+		},
+		codex: {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Language Models'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/sub-nodes/n8n-nodes-langchain.lmchatawsbedrock/',
+					},
+				],
+			},
+		},
+		// 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.AiLanguageModel],
+		outputNames: ['Model'],
+		credentials: [
+			{
+				// eslint-disable-next-line n8n-nodes-base/node-class-description-credentials-name-unsuffixed
+				name: 'aws',
+				required: true,
+			},
+		],
+		requestDefaults: {
+			ignoreHttpStatusErrors: true,
+			baseURL: '=https://bedrock.{{$credentials?.region ?? "eu-central-1"}}.amazonaws.com',
+		},
+		properties: [
+			getConnectionHintNoticeField([NodeConnectionType.AiChain, NodeConnectionType.AiChain]),
+			{
+				displayName: 'Model',
+				name: 'model',
+				type: 'options',
+				description:
+					'The model which will generate the completion. <a href="https://docs.aws.amazon.com/bedrock/latest/userguide/foundation-models.html">Learn more</a>.',
+				typeOptions: {
+					loadOptions: {
+						routing: {
+							request: {
+								method: 'GET',
+								url: '/foundation-models?&byOutputModality=TEXT&byInferenceType=ON_DEMAND',
+							},
+							output: {
+								postReceive: [
+									{
+										type: 'rootProperty',
+										properties: {
+											property: 'modelSummaries',
+										},
+									},
+									{
+										type: 'setKeyValue',
+										properties: {
+											name: '={{$responseItem.modelName}}',
+											description: '={{$responseItem.modelArn}}',
+											value: '={{$responseItem.modelId}}',
+										},
+									},
+									{
+										type: 'sort',
+										properties: {
+											key: 'name',
+										},
+									},
+								],
+							},
+						},
+					},
+				},
+				routing: {
+					send: {
+						type: 'body',
+						property: 'model',
+					},
+				},
+				default: '',
+			},
+			{
+				displayName: 'Options',
+				name: 'options',
+				placeholder: 'Add Option',
+				description: 'Additional options to add',
+				type: 'collection',
+				default: {},
+				options: [
+					{
+						displayName: 'Maximum Number of Tokens',
+						name: 'maxTokensToSample',
+						default: 2000,
+						description: 'The maximum number of tokens to generate in the completion',
+						type: 'number',
+					},
+					{
+						displayName: 'Sampling Temperature',
+						name: 'temperature',
+						default: 0.7,
+						typeOptions: { maxValue: 1, minValue: 0, numberPrecision: 1 },
+						description:
+							'Controls randomness: Lowering results in less random completions. As the temperature approaches zero, the model will become deterministic and repetitive.',
+						type: 'number',
+					},
+				],
+			},
+		],
+	};
+
+	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
+		const credentials = await this.getCredentials('aws');
+		const modelName = this.getNodeParameter('model', itemIndex) as string;
+		const options = this.getNodeParameter('options', itemIndex, {}) as {
+			temperature: number;
+			maxTokensToSample: number;
+		};
+
+		const model = new BedrockChat({
+			region: credentials.region as string,
+			model: modelName,
+			temperature: options.temperature,
+			maxTokens: options.maxTokensToSample,
+			credentials: {
+				secretAccessKey: credentials.secretAccessKey as string,
+				accessKeyId: credentials.accessKeyId as string,
+				sessionToken: credentials.sessionToken as string,
+			},
+		});
+
+		return {
+			response: logWrapper(model, this),
+		};
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LmChatAwsBedrock/bedrock.svg b/packages/@n8n/nodes-langchain/nodes/llms/LmChatAwsBedrock/bedrock.svg
new file mode 100644
index 0000000000000..33c91d86616a8
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LmChatAwsBedrock/bedrock.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24"><defs><linearGradient id="a" x1="0%" x2="100%" y1="100%" y2="0%"><stop offset="0%" stop-color="#055F4E"/><stop offset="100%" stop-color="#56C0A7"/></linearGradient></defs><g fill="none" fill-rule="evenodd"><path fill="url(#a)" d="M0 0h24v24H0z"/><path fill="#FFF" d="m12 18.14-2.426.809-.946-.631 1.03-.344-.316-.948-1.768.589L7 17.233V14.5a.5.5 0 0 0-.276-.447L5 13.19v-2.382l1.5-.75 1.5.75v1.69c0 .19.107.364.276.449l2 1 .448-.895L9 12.19v-1.382l1.724-.861A.5.5 0 0 0 11 9.5V8h-1v1.19l-1.5.75L7 9.19V6.769L8 6.1V8h1V5.435l.574-.383L12 5.86zM17.5 17a.5.5 0 1 1-.002 1 .5.5 0 0 1 .002-1m-1-11a.5.5 0 1 1-.002 1 .5.5 0 0 1 .002-1m2 6a.5.5 0 1 1-.002 1 .5.5 0 0 1 .002-1m-1.408 1c.207.58.757 1 1.408 1a1.501 1.501 0 0 0 0-3c-.651 0-1.201.42-1.408 1H13v-2h3.5a.5.5 0 0 0 .5-.5V7.908c.581-.207 1-.757 1-1.408 0-.827-.673-1.5-1.5-1.5S15 5.673 15 6.5c0 .65.419 1.2 1 1.408V9h-3V5.5a.5.5 0 0 0-.342-.474l-3-1a.5.5 0 0 0-.435.058l-3 2A.5.5 0 0 0 6 6.5v2.69l-1.724.863A.5.5 0 0 0 4 10.5v3c0 .19.107.363.276.448l1.724.86V17.5a.5.5 0 0 0 .223.416l3 2a.5.5 0 0 0 .435.058l3-1A.5.5 0 0 0 13 18.5V16h2.293l.853.854.013-.013c-.098.2-.159.422-.159.659 0 .827.673 1.5 1.5 1.5s1.5-.673 1.5-1.5-.673-1.5-1.5-1.5c-.238 0-.46.06-.659.16l.013-.013-1-1A.5.5 0 0 0 15.5 15H13v-2z"/></g></svg>
\ No newline at end of file
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LmChatAzureOpenAi/LmChatAzureOpenAi.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LmChatAzureOpenAi/LmChatAzureOpenAi.node.ts
new file mode 100644
index 0000000000000..dad7643c6d655
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LmChatAzureOpenAi/LmChatAzureOpenAi.node.ts
@@ -0,0 +1,169 @@
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import {
+	NodeConnectionType,
+	type IExecuteFunctions,
+	type INodeType,
+	type INodeTypeDescription,
+	type SupplyData,
+} from 'n8n-workflow';
+
+import type { ClientOptions } from '@langchain/openai';
+import { ChatOpenAI } from '@langchain/openai';
+import { logWrapper } from '../../../utils/logWrapper';
+import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+
+export class LmChatAzureOpenAi implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Azure OpenAI Chat Model',
+		// eslint-disable-next-line n8n-nodes-base/node-class-description-name-miscased
+		name: 'lmChatAzureOpenAi',
+		icon: 'file:azure.svg',
+		group: ['transform'],
+		version: 1,
+		description: 'For advanced usage with an AI chain',
+		defaults: {
+			name: 'Azure OpenAI Chat Model',
+		},
+		codex: {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Language Models'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/sub-nodes/n8n-nodes-langchain.lmchatazureopenai/',
+					},
+				],
+			},
+		},
+		// 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.AiLanguageModel],
+		outputNames: ['Model'],
+		credentials: [
+			{
+				name: 'azureOpenAiApi',
+				required: true,
+			},
+		],
+		properties: [
+			getConnectionHintNoticeField([NodeConnectionType.AiChain, NodeConnectionType.AiAgent]),
+			{
+				displayName: 'Model (Deployment) Name',
+				name: 'model',
+				type: 'string',
+				description: 'The name of the model(deployment) to use',
+				default: '',
+			},
+			{
+				displayName: 'Options',
+				name: 'options',
+				placeholder: 'Add Option',
+				description: 'Additional options to add',
+				type: 'collection',
+				default: {},
+				options: [
+					{
+						displayName: 'Frequency Penalty',
+						name: 'frequencyPenalty',
+						default: 0,
+						typeOptions: { maxValue: 2, minValue: -2, numberPrecision: 1 },
+						description:
+							"Positive values penalize new tokens based on their existing frequency in the text so far, decreasing the model's likelihood to repeat the same line verbatim",
+						type: 'number',
+					},
+					{
+						displayName: 'Maximum Number of Tokens',
+						name: 'maxTokens',
+						default: -1,
+						description:
+							'The maximum number of tokens to generate in the completion. Most models have a context length of 2048 tokens (except for the newest models, which support 32,768).',
+						type: 'number',
+						typeOptions: {
+							maxValue: 32768,
+						},
+					},
+					{
+						displayName: 'Presence Penalty',
+						name: 'presencePenalty',
+						default: 0,
+						typeOptions: { maxValue: 2, minValue: -2, numberPrecision: 1 },
+						description:
+							"Positive values penalize new tokens based on whether they appear in the text so far, increasing the model's likelihood to talk about new topics",
+						type: 'number',
+					},
+					{
+						displayName: 'Sampling Temperature',
+						name: 'temperature',
+						default: 0.7,
+						typeOptions: { maxValue: 1, minValue: 0, numberPrecision: 1 },
+						description:
+							'Controls randomness: Lowering results in less random completions. As the temperature approaches zero, the model will become deterministic and repetitive.',
+						type: 'number',
+					},
+					{
+						displayName: 'Timeout',
+						name: 'timeout',
+						default: 60000,
+						description: 'Maximum amount of time a request is allowed to take in milliseconds',
+						type: 'number',
+					},
+					{
+						displayName: 'Max Retries',
+						name: 'maxRetries',
+						default: 2,
+						description: 'Maximum number of retries to attempt',
+						type: 'number',
+					},
+					{
+						displayName: 'Top P',
+						name: 'topP',
+						default: 1,
+						typeOptions: { maxValue: 1, minValue: 0, numberPrecision: 1 },
+						description:
+							'Controls diversity via nucleus sampling: 0.5 means half of all likelihood-weighted options are considered. We generally recommend altering this or temperature but not both.',
+						type: 'number',
+					},
+				],
+			},
+		],
+	};
+
+	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
+		const credentials = (await this.getCredentials('azureOpenAiApi')) as {
+			apiKey: string;
+			resourceName: string;
+			apiVersion: string;
+		};
+
+		const modelName = this.getNodeParameter('model', itemIndex) as string;
+		const options = this.getNodeParameter('options', itemIndex, {}) as {
+			frequencyPenalty?: number;
+			maxTokens?: number;
+			maxRetries: number;
+			timeout: number;
+			presencePenalty?: number;
+			temperature?: number;
+			topP?: number;
+		};
+
+		const configuration: ClientOptions = {};
+
+		const model = new ChatOpenAI({
+			azureOpenAIApiDeploymentName: modelName,
+			azureOpenAIApiInstanceName: credentials.resourceName,
+			azureOpenAIApiKey: credentials.apiKey,
+			azureOpenAIApiVersion: credentials.apiVersion,
+			...options,
+			timeout: options.timeout ?? 60000,
+			maxRetries: options.maxRetries ?? 2,
+			configuration,
+		});
+
+		return {
+			response: logWrapper(model, this),
+		};
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LmChatAzureOpenAi/azure.svg b/packages/@n8n/nodes-langchain/nodes/llms/LmChatAzureOpenAi/azure.svg
new file mode 100644
index 0000000000000..bbbc6c33b3bcd
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LmChatAzureOpenAi/azure.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="242" preserveAspectRatio="xMidYMid"><defs><linearGradient id="a" x1="58.972%" x2="37.191%" y1="7.411%" y2="103.762%"><stop offset="0%" stop-color="#114A8B"/><stop offset="100%" stop-color="#0669BC"/></linearGradient><linearGradient id="b" x1="59.719%" x2="52.691%" y1="52.313%" y2="54.864%"><stop offset="0%" stop-opacity=".3"/><stop offset="7.1%" stop-opacity=".2"/><stop offset="32.1%" stop-opacity=".1"/><stop offset="62.3%" stop-opacity=".05"/><stop offset="100%" stop-opacity="0"/></linearGradient><linearGradient id="c" x1="37.279%" x2="62.473%" y1="4.6%" y2="99.979%"><stop offset="0%" stop-color="#3CCBF4"/><stop offset="100%" stop-color="#2892DF"/></linearGradient></defs><path fill="url(#a)" d="M85.343.003h75.753L82.457 233a12.08 12.08 0 0 1-11.442 8.216H12.06A12.06 12.06 0 0 1 .633 225.303L73.898 8.219A12.08 12.08 0 0 1 85.343 0z"/><path fill="#0078D4" d="M195.423 156.282H75.297a5.56 5.56 0 0 0-3.796 9.627l77.19 72.047a12.14 12.14 0 0 0 8.28 3.26h68.02z"/><path fill="url(#b)" d="M85.343.003a11.98 11.98 0 0 0-11.471 8.376L.723 225.105a12.045 12.045 0 0 0 11.37 16.112h60.475a12.93 12.93 0 0 0 9.921-8.437l14.588-42.991 52.105 48.6a12.33 12.33 0 0 0 7.757 2.828h67.766l-29.721-84.935-86.643.02L161.37.003z"/><path fill="url(#c)" d="M182.098 8.207A12.06 12.06 0 0 0 170.67.003H86.245c5.175 0 9.773 3.301 11.428 8.204L170.94 225.3a12.062 12.062 0 0 1-11.428 15.92h84.429a12.062 12.062 0 0 0 11.425-15.92z"/></svg>
\ No newline at end of file
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LmChatGoogleGemini/LmChatGoogleGemini.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LmChatGoogleGemini/LmChatGoogleGemini.node.ts
new file mode 100644
index 0000000000000..425ef2294cd3b
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LmChatGoogleGemini/LmChatGoogleGemini.node.ts
@@ -0,0 +1,233 @@
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import {
+	NodeConnectionType,
+	type IExecuteFunctions,
+	type INodeType,
+	type INodeTypeDescription,
+	type SupplyData,
+} from 'n8n-workflow';
+import { ChatGoogleGenerativeAI } from '@langchain/google-genai';
+import type { HarmBlockThreshold, HarmCategory, SafetySetting } from '@google/generative-ai';
+import { logWrapper } from '../../../utils/logWrapper';
+import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+import { harmCategories, harmThresholds } from './options';
+
+export class LmChatGoogleGemini implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Google Gemini Chat Model',
+		// eslint-disable-next-line n8n-nodes-base/node-class-description-name-miscased
+		name: 'lmChatGoogleGemini',
+		icon: 'file:google.svg',
+		group: ['transform'],
+		version: 1,
+		description: 'Chat Model Google Gemini',
+		defaults: {
+			name: 'Google Gemini Chat Model',
+		},
+		codex: {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Language Models'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/sub-nodes/n8n-nodes-langchain.lmchatgooglegemini/',
+					},
+				],
+			},
+		},
+		// 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.AiLanguageModel],
+		outputNames: ['Model'],
+		credentials: [
+			{
+				name: 'googlePalmApi',
+				required: true,
+			},
+		],
+		requestDefaults: {
+			ignoreHttpStatusErrors: true,
+			baseURL: '={{ $credentials.host }}',
+		},
+		properties: [
+			getConnectionHintNoticeField([NodeConnectionType.AiChain, NodeConnectionType.AiAgent]),
+			{
+				displayName: 'Model',
+				name: 'modelName',
+				type: 'options',
+				description:
+					'The model which will generate the completion. <a href="https://developers.generativeai.google/api/rest/generativelanguage/models/list">Learn more</a>.',
+				typeOptions: {
+					loadOptions: {
+						routing: {
+							request: {
+								method: 'GET',
+								url: '/v1beta/models',
+							},
+							output: {
+								postReceive: [
+									{
+										type: 'rootProperty',
+										properties: {
+											property: 'models',
+										},
+									},
+									{
+										type: 'filter',
+										properties: {
+											pass: "={{ !$responseItem.name.includes('embedding') }}",
+										},
+									},
+									{
+										type: 'setKeyValue',
+										properties: {
+											name: '={{$responseItem.name}}',
+											value: '={{$responseItem.name}}',
+											description: '={{$responseItem.description}}',
+										},
+									},
+									{
+										type: 'sort',
+										properties: {
+											key: 'name',
+										},
+									},
+								],
+							},
+						},
+					},
+				},
+				routing: {
+					send: {
+						type: 'body',
+						property: 'model',
+					},
+				},
+				default: 'models/gemini-1.0-pro',
+			},
+			{
+				displayName: 'Options',
+				name: 'options',
+				placeholder: 'Add Option',
+				description: 'Additional options to add',
+				type: 'collection',
+				default: {},
+				options: [
+					{
+						displayName: 'Maximum Number of Tokens',
+						name: 'maxOutputTokens',
+						default: 2048,
+						description: 'The maximum number of tokens to generate in the completion',
+						type: 'number',
+					},
+					{
+						displayName: 'Sampling Temperature',
+						name: 'temperature',
+						default: 0.4,
+						typeOptions: { maxValue: 1, minValue: 0, numberPrecision: 1 },
+						description:
+							'Controls randomness: Lowering results in less random completions. As the temperature approaches zero, the model will become deterministic and repetitive.',
+						type: 'number',
+					},
+					{
+						displayName: 'Top K',
+						name: 'topK',
+						default: 32,
+						typeOptions: { maxValue: 40, minValue: -1, numberPrecision: 1 },
+						description:
+							'Used to remove "long tail" low probability responses. Defaults to -1, which disables it.',
+						type: 'number',
+					},
+					{
+						displayName: 'Top P',
+						name: 'topP',
+						default: 1,
+						typeOptions: { maxValue: 1, minValue: 0, numberPrecision: 1 },
+						description:
+							'Controls diversity via nucleus sampling: 0.5 means half of all likelihood-weighted options are considered. We generally recommend altering this or temperature but not both.',
+						type: 'number',
+					},
+
+					// Safety Settings
+					{
+						displayName: 'Safety Settings',
+						name: 'safetySettings',
+						type: 'fixedCollection',
+						typeOptions: { multipleValues: true },
+						default: {
+							values: {
+								category: harmCategories[0].name as HarmCategory,
+								threshold: harmThresholds[0].name as HarmBlockThreshold,
+							},
+						},
+						placeholder: 'Add Option',
+						options: [
+							{
+								name: 'values',
+								displayName: 'Values',
+								values: [
+									{
+										displayName: 'Safety Category',
+										name: 'category',
+										type: 'options',
+										description: 'The category of harmful content to block',
+										default: 'HARM_CATEGORY_UNSPECIFIED',
+										options: harmCategories,
+									},
+									{
+										displayName: 'Safety Threshold',
+										name: 'threshold',
+										type: 'options',
+										description: 'The threshold of harmful content to block',
+										default: 'HARM_BLOCK_THRESHOLD_UNSPECIFIED',
+										options: harmThresholds,
+									},
+								],
+							},
+						],
+					},
+				],
+			},
+		],
+	};
+
+	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
+		const credentials = await this.getCredentials('googlePalmApi');
+
+		const modelName = this.getNodeParameter('modelName', itemIndex) as string;
+		const options = this.getNodeParameter('options', itemIndex, {
+			maxOutputTokens: 1024,
+			temperature: 0.7,
+			topK: 40,
+			topP: 0.9,
+		}) as {
+			maxOutputTokens: number;
+			temperature: number;
+			topK: number;
+			topP: number;
+		};
+
+		const safetySettings = this.getNodeParameter(
+			'options.safetySettings.values',
+			itemIndex,
+			null,
+		) as SafetySetting[];
+
+		const model = new ChatGoogleGenerativeAI({
+			apiKey: credentials.apiKey as string,
+			modelName,
+			topK: options.topK,
+			topP: options.topP,
+			temperature: options.temperature,
+			maxOutputTokens: options.maxOutputTokens,
+			safetySettings,
+		});
+
+		return {
+			response: logWrapper(model, this),
+		};
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LmChatGoogleGemini/google.svg b/packages/@n8n/nodes-langchain/nodes/llms/LmChatGoogleGemini/google.svg
new file mode 100644
index 0000000000000..38f3c22592e39
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LmChatGoogleGemini/google.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 48 48"><defs><path id="a" d="M44.5 20H24v8.5h11.8C34.7 33.9 30.1 37 24 37c-7.2 0-13-5.8-13-13s5.8-13 13-13c3.1 0 5.9 1.1 8.1 2.9l6.4-6.4C34.6 4.1 29.6 2 24 2 11.8 2 2 11.8 2 24s9.8 22 22 22c11 0 21-8 21-22 0-1.3-.2-2.7-.5-4"/></defs><clipPath id="b"><use xlink:href="#a" overflow="visible"/></clipPath><path fill="#FBBC05" d="M0 37V11l17 13z" clip-path="url(#b)"/><path fill="#EA4335" d="m0 11 17 13 7-6.1L48 14V0H0z" clip-path="url(#b)"/><path fill="#34A853" d="m0 37 30-23 7.9 1L48 0v48H0z" clip-path="url(#b)"/><path fill="#4285F4" d="M48 48 17 24l-4-3 35-10z" clip-path="url(#b)"/></svg>
\ No newline at end of file
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LmChatGoogleGemini/options.ts b/packages/@n8n/nodes-langchain/nodes/llms/LmChatGoogleGemini/options.ts
new file mode 100644
index 0000000000000..08506cb080387
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LmChatGoogleGemini/options.ts
@@ -0,0 +1,52 @@
+import type { INodePropertyOptions } from 'n8n-workflow';
+
+export const harmCategories: INodePropertyOptions[] = [
+	{
+		value: 'HARM_CATEGORY_HARASSMENT',
+		name: 'HARM_CATEGORY_HARASSMENT',
+		description: 'Harassment content',
+	},
+	{
+		value: 'HARM_CATEGORY_HATE_SPEECH',
+		name: 'HARM_CATEGORY_HATE_SPEECH',
+		description: 'Hate speech and content',
+	},
+	{
+		value: 'HARM_CATEGORY_SEXUALLY_EXPLICIT',
+		name: 'HARM_CATEGORY_SEXUALLY_EXPLICIT',
+		description: 'Sexually explicit content',
+	},
+	{
+		value: 'HARM_CATEGORY_DANGEROUS_CONTENT',
+		name: 'HARM_CATEGORY_DANGEROUS_CONTENT',
+		description: 'Dangerous content',
+	},
+];
+
+export const harmThresholds: INodePropertyOptions[] = [
+	{
+		value: 'HARM_BLOCK_THRESHOLD_UNSPECIFIED',
+		name: 'HARM_BLOCK_THRESHOLD_UNSPECIFIED',
+		description: 'Threshold is unspecified',
+	},
+	{
+		value: 'BLOCK_LOW_AND_ABOVE',
+		name: 'BLOCK_LOW_AND_ABOVE',
+		description: 'Content with NEGLIGIBLE will be allowed',
+	},
+	{
+		value: 'BLOCK_MEDIUM_AND_ABOVE',
+		name: 'BLOCK_MEDIUM_AND_ABOVE',
+		description: 'Content with NEGLIGIBLE and LOW will be allowed',
+	},
+	{
+		value: 'BLOCK_ONLY_HIGH',
+		name: 'BLOCK_ONLY_HIGH',
+		description: 'Content with NEGLIGIBLE, LOW, and MEDIUM will be allowed',
+	},
+	{
+		value: 'BLOCK_NONE',
+		name: 'BLOCK_NONE',
+		description: 'All content will be allowed',
+	},
+];
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LmChatGooglePalm/LmChatGooglePalm.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LmChatGooglePalm/LmChatGooglePalm.node.ts
new file mode 100644
index 0000000000000..b7d3eb8eda8bb
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LmChatGooglePalm/LmChatGooglePalm.node.ts
@@ -0,0 +1,165 @@
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import {
+	NodeConnectionType,
+	type IExecuteFunctions,
+	type INodeType,
+	type INodeTypeDescription,
+	type SupplyData,
+} from 'n8n-workflow';
+import { ChatGooglePaLM } from '@langchain/community/chat_models/googlepalm';
+import { logWrapper } from '../../../utils/logWrapper';
+import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+
+export class LmChatGooglePalm implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Google PaLM Chat Model',
+		// eslint-disable-next-line n8n-nodes-base/node-class-description-name-miscased
+		name: 'lmChatGooglePalm',
+		icon: 'file:google.svg',
+		group: ['transform'],
+		version: 1,
+		description: 'Chat Model Google PaLM',
+		defaults: {
+			name: 'Google PaLM Chat Model',
+		},
+		codex: {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Language Models'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/sub-nodes/n8n-nodes-langchain.lmchatgooglepalm/',
+					},
+				],
+			},
+		},
+		// 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.AiLanguageModel],
+		outputNames: ['Model'],
+		credentials: [
+			{
+				name: 'googlePalmApi',
+				required: true,
+			},
+		],
+		requestDefaults: {
+			ignoreHttpStatusErrors: true,
+			baseURL: '={{ $credentials.host }}',
+		},
+		properties: [
+			getConnectionHintNoticeField([NodeConnectionType.AiChain, NodeConnectionType.AiAgent]),
+			{
+				displayName: 'Model',
+				name: 'modelName',
+				type: 'options',
+				description:
+					'The model which will generate the completion. <a href="https://developers.generativeai.google/api/rest/generativelanguage/models/list">Learn more</a>.',
+				typeOptions: {
+					loadOptions: {
+						routing: {
+							request: {
+								method: 'GET',
+								url: '/v1beta3/models',
+							},
+							output: {
+								postReceive: [
+									{
+										type: 'rootProperty',
+										properties: {
+											property: 'models',
+										},
+									},
+									{
+										type: 'filter',
+										properties: {
+											pass: "={{ $responseItem.name.startsWith('models/chat') }}",
+										},
+									},
+									{
+										type: 'setKeyValue',
+										properties: {
+											name: '={{$responseItem.name}}',
+											value: '={{$responseItem.name}}',
+											description: '={{$responseItem.description}}',
+										},
+									},
+									{
+										type: 'sort',
+										properties: {
+											key: 'name',
+										},
+									},
+								],
+							},
+						},
+					},
+				},
+				routing: {
+					send: {
+						type: 'body',
+						property: 'model',
+					},
+				},
+				default: 'models/chat-bison-001',
+			},
+			{
+				displayName: 'Options',
+				name: 'options',
+				placeholder: 'Add Option',
+				description: 'Additional options to add',
+				type: 'collection',
+				default: {},
+				options: [
+					{
+						displayName: 'Sampling Temperature',
+						name: 'temperature',
+						default: 0.7,
+						typeOptions: { maxValue: 1, minValue: 0, numberPrecision: 1 },
+						description:
+							'Controls randomness: Lowering results in less random completions. As the temperature approaches zero, the model will become deterministic and repetitive.',
+						type: 'number',
+					},
+					{
+						displayName: 'Top K',
+						name: 'topK',
+						default: 40,
+						typeOptions: { maxValue: 1, minValue: -1, numberPrecision: 1 },
+						description:
+							'Used to remove "long tail" low probability responses. Defaults to -1, which disables it.',
+						type: 'number',
+					},
+					{
+						displayName: 'Top P',
+						name: 'topP',
+						default: 0.9,
+						typeOptions: { maxValue: 1, minValue: 0, numberPrecision: 1 },
+						description:
+							'Controls diversity via nucleus sampling: 0.5 means half of all likelihood-weighted options are considered. We generally recommend altering this or temperature but not both.',
+						type: 'number',
+					},
+				],
+			},
+		],
+	};
+
+	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
+		const credentials = await this.getCredentials('googlePalmApi');
+
+		const modelName = this.getNodeParameter('modelName', itemIndex) as string;
+		const options = this.getNodeParameter('options', itemIndex, {}) as object;
+
+		const model = new ChatGooglePaLM({
+			apiKey: credentials.apiKey as string,
+			modelName,
+			...options,
+		});
+
+		return {
+			response: logWrapper(model, this),
+		};
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LmChatGooglePalm/google.svg b/packages/@n8n/nodes-langchain/nodes/llms/LmChatGooglePalm/google.svg
new file mode 100644
index 0000000000000..38f3c22592e39
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LmChatGooglePalm/google.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 48 48"><defs><path id="a" d="M44.5 20H24v8.5h11.8C34.7 33.9 30.1 37 24 37c-7.2 0-13-5.8-13-13s5.8-13 13-13c3.1 0 5.9 1.1 8.1 2.9l6.4-6.4C34.6 4.1 29.6 2 24 2 11.8 2 2 11.8 2 24s9.8 22 22 22c11 0 21-8 21-22 0-1.3-.2-2.7-.5-4"/></defs><clipPath id="b"><use xlink:href="#a" overflow="visible"/></clipPath><path fill="#FBBC05" d="M0 37V11l17 13z" clip-path="url(#b)"/><path fill="#EA4335" d="m0 11 17 13 7-6.1L48 14V0H0z" clip-path="url(#b)"/><path fill="#34A853" d="m0 37 30-23 7.9 1L48 0v48H0z" clip-path="url(#b)"/><path fill="#4285F4" d="M48 48 17 24l-4-3 35-10z" clip-path="url(#b)"/></svg>
\ No newline at end of file
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LmChatGroq/LmChatGroq.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LmChatGroq/LmChatGroq.node.ts
new file mode 100644
index 0000000000000..f9965709973b7
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LmChatGroq/LmChatGroq.node.ts
@@ -0,0 +1,151 @@
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import {
+	NodeConnectionType,
+	type IExecuteFunctions,
+	type INodeType,
+	type INodeTypeDescription,
+	type SupplyData,
+} from 'n8n-workflow';
+
+import { ChatGroq } from '@langchain/groq';
+import { logWrapper } from '../../../utils/logWrapper';
+import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+
+export class LmChatGroq implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Groq Chat Model',
+		// eslint-disable-next-line n8n-nodes-base/node-class-description-name-miscased
+		name: 'lmChatGroq',
+		icon: 'file:groq.svg',
+		group: ['transform'],
+		version: 1,
+		description: 'Language Model Groq',
+		defaults: {
+			name: 'Groq Chat Model',
+		},
+		codex: {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Language Models'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/sub-nodes/n8n-nodes-langchain.lmchatgroq/',
+					},
+				],
+			},
+		},
+		// 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.AiLanguageModel],
+		outputNames: ['Model'],
+		credentials: [
+			{
+				name: 'groqApi',
+				required: true,
+			},
+		],
+		requestDefaults: {
+			baseURL: 'https://api.groq.com/openai/v1',
+		},
+		properties: [
+			getConnectionHintNoticeField([NodeConnectionType.AiChain, NodeConnectionType.AiChain]),
+			{
+				displayName: 'Model',
+				name: 'model',
+				type: 'options',
+				typeOptions: {
+					loadOptions: {
+						routing: {
+							request: {
+								method: 'GET',
+								url: '/models',
+							},
+							output: {
+								postReceive: [
+									{
+										type: 'rootProperty',
+										properties: {
+											property: 'data',
+										},
+									},
+									{
+										type: 'filter',
+										properties: {
+											pass: '={{ $responseItem.active === true && $responseItem.object === "model" }}',
+										},
+									},
+									{
+										type: 'setKeyValue',
+										properties: {
+											name: '={{$responseItem.id}}',
+											value: '={{$responseItem.id}}',
+										},
+									},
+								],
+							},
+						},
+					},
+				},
+				routing: {
+					send: {
+						type: 'body',
+						property: 'model',
+					},
+				},
+				description:
+					'The model which will generate the completion. <a href="https://console.groq.com/docs/models">Learn more</a>.',
+				default: 'llama3-8b-8192',
+			},
+			{
+				displayName: 'Options',
+				name: 'options',
+				placeholder: 'Add Option',
+				description: 'Additional options to add',
+				type: 'collection',
+				default: {},
+				options: [
+					{
+						displayName: 'Maximum Number of Tokens',
+						name: 'maxTokensToSample',
+						default: 4096,
+						description: 'The maximum number of tokens to generate in the completion',
+						type: 'number',
+					},
+					{
+						displayName: 'Sampling Temperature',
+						name: 'temperature',
+						default: 0.7,
+						typeOptions: { maxValue: 1, minValue: 0, numberPrecision: 1 },
+						description:
+							'Controls randomness: Lowering results in less random completions. As the temperature approaches zero, the model will become deterministic and repetitive.',
+						type: 'number',
+					},
+				],
+			},
+		],
+	};
+
+	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
+		const credentials = await this.getCredentials('groqApi');
+
+		const modelName = this.getNodeParameter('model', itemIndex) as string;
+		const options = this.getNodeParameter('options', itemIndex, {}) as {
+			maxTokensToSample?: number;
+			temperature: number;
+		};
+
+		const model = new ChatGroq({
+			apiKey: credentials.apiKey as string,
+			modelName,
+			maxTokens: options.maxTokensToSample,
+			temperature: options.temperature,
+		});
+
+		return {
+			response: logWrapper(model, this),
+		};
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LmChatGroq/groq.svg b/packages/@n8n/nodes-langchain/nodes/llms/LmChatGroq/groq.svg
new file mode 100644
index 0000000000000..7ab13c768e109
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LmChatGroq/groq.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   id="Layer_2"
+   viewBox="0 0 499.99999 499.99999"
+   version="1.1"
+   width="500"
+   height="500"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs4" /><g
+     id="PAGES"><circle
+       style="fill:#f54f35;fill-opacity:1;stroke-width:1.13622"
+       id="path4"
+       cx="250"
+       cy="250"
+       r="250" /><path
+       d="M 250.53664,97.122994 C 192.71931,96.588638 145.48222,142.97075 144.94786,200.78808 c -0.53434,57.81733 45.84777,105.05442 103.6651,105.58877 h 36.33621 v -39.22174 h -34.41253 c -36.12248,0.4275 -65.7258,-28.53462 -66.15329,-64.65708 -0.42749,-36.12248 28.53463,-65.72581 64.65708,-66.1533 h 1.49621 c 36.12248,0 65.4052,29.28272 65.51207,65.4052 v 0 96.39783 0 c 0,35.80187 -29.17585,64.97773 -64.87083,65.40521 -17.09941,-0.10688 -33.45071,-7.05351 -45.52717,-19.12995 l -27.7865,27.78651 c 19.23681,19.3437 45.31339,30.35143 72.56556,30.67205 h 1.38933 c 57.06924,-0.85497 102.917,-47.13022 103.2376,-104.19945 V 199.29189 C 353.66739,142.43639 307.28527,97.122994 250.53664,97.122994 Z"
+       style="fill:#ffffff;stroke-width:0px"
+       id="path1-3" /></g></svg>
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LmChatMistralCloud/LmChatMistralCloud.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LmChatMistralCloud/LmChatMistralCloud.node.ts
new file mode 100644
index 0000000000000..a23ab4c0c171a
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LmChatMistralCloud/LmChatMistralCloud.node.ts
@@ -0,0 +1,197 @@
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import {
+	NodeConnectionType,
+	type IExecuteFunctions,
+	type INodeType,
+	type INodeTypeDescription,
+	type SupplyData,
+} from 'n8n-workflow';
+
+import type { ChatMistralAIInput } from '@langchain/mistralai';
+import { ChatMistralAI } from '@langchain/mistralai';
+import { logWrapper } from '../../../utils/logWrapper';
+import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+
+export class LmChatMistralCloud implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Mistral Cloud Chat Model',
+		// eslint-disable-next-line n8n-nodes-base/node-class-description-name-miscased
+		name: 'lmChatMistralCloud',
+		icon: 'file:mistral.svg',
+		group: ['transform'],
+		version: 1,
+		description: 'For advanced usage with an AI chain',
+		defaults: {
+			name: 'Mistral Cloud Chat Model',
+		},
+		codex: {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Language Models'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/sub-nodes/n8n-nodes-langchain.lmchatmistralcloud/',
+					},
+				],
+			},
+		},
+		// 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.AiLanguageModel],
+		outputNames: ['Model'],
+		credentials: [
+			{
+				name: 'mistralCloudApi',
+				required: true,
+			},
+		],
+		requestDefaults: {
+			ignoreHttpStatusErrors: true,
+			baseURL: 'https://api.mistral.ai/v1',
+		},
+		properties: [
+			getConnectionHintNoticeField([NodeConnectionType.AiChain, NodeConnectionType.AiAgent]),
+			{
+				displayName: 'Model',
+				name: 'model',
+				type: 'options',
+				description:
+					'The model which will generate the completion. <a href="https://docs.mistral.ai/platform/endpoints/">Learn more</a>.',
+				typeOptions: {
+					loadOptions: {
+						routing: {
+							request: {
+								method: 'GET',
+								url: '/models',
+							},
+							output: {
+								postReceive: [
+									{
+										type: 'rootProperty',
+										properties: {
+											property: 'data',
+										},
+									},
+									{
+										type: 'filter',
+										properties: {
+											pass: "={{ !$responseItem.id.includes('embed') }}",
+										},
+									},
+									{
+										type: 'setKeyValue',
+										properties: {
+											name: '={{ $responseItem.id }}',
+											value: '={{ $responseItem.id }}',
+										},
+									},
+									{
+										type: 'sort',
+										properties: {
+											key: 'name',
+										},
+									},
+								],
+							},
+						},
+					},
+				},
+				routing: {
+					send: {
+						type: 'body',
+						property: 'model',
+					},
+				},
+				default: 'mistral-small',
+			},
+			{
+				displayName: 'Options',
+				name: 'options',
+				placeholder: 'Add Option',
+				description: 'Additional options to add',
+				type: 'collection',
+				default: {},
+				options: [
+					{
+						displayName: 'Maximum Number of Tokens',
+						name: 'maxTokens',
+						default: -1,
+						description:
+							'The maximum number of tokens to generate in the completion. Most models have a context length of 2048 tokens (except for the newest models, which support 32,768).',
+						type: 'number',
+						typeOptions: {
+							maxValue: 32768,
+						},
+					},
+					{
+						displayName: 'Sampling Temperature',
+						name: 'temperature',
+						default: 0.7,
+						typeOptions: { maxValue: 1, minValue: 0, numberPrecision: 1 },
+						description:
+							'Controls randomness: Lowering results in less random completions. As the temperature approaches zero, the model will become deterministic and repetitive.',
+						type: 'number',
+					},
+					{
+						displayName: 'Max Retries',
+						name: 'maxRetries',
+						default: 2,
+						description: 'Maximum number of retries to attempt',
+						type: 'number',
+					},
+					{
+						displayName: 'Top P',
+						name: 'topP',
+						default: 1,
+						typeOptions: { maxValue: 1, minValue: 0, numberPrecision: 1 },
+						description:
+							'Controls diversity via nucleus sampling: 0.5 means half of all likelihood-weighted options are considered. We generally recommend altering this or temperature but not both.',
+						type: 'number',
+					},
+					{
+						displayName: 'Enable Safe Mode',
+						name: 'safeMode',
+						default: false,
+						type: 'boolean',
+						description: 'Whether to inject a safety prompt before all conversations',
+					},
+					{
+						displayName: 'Random Seed',
+						name: 'randomSeed',
+						default: undefined,
+						type: 'number',
+						description:
+							'The seed to use for random sampling. If set, different calls will generate deterministic results.',
+					},
+				],
+			},
+		],
+	};
+
+	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
+		const credentials = await this.getCredentials('mistralCloudApi');
+
+		const modelName = this.getNodeParameter('model', itemIndex) as string;
+		const options = this.getNodeParameter('options', itemIndex, {
+			maxRetries: 2,
+			topP: 1,
+			temperature: 0.7,
+			maxTokens: -1,
+			safeMode: false,
+			randomSeed: undefined,
+		}) as Partial<ChatMistralAIInput>;
+
+		const model = new ChatMistralAI({
+			apiKey: credentials.apiKey as string,
+			modelName,
+			...options,
+		});
+
+		return {
+			response: logWrapper(model, this),
+		};
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LmChatMistralCloud/mistral.svg b/packages/@n8n/nodes-langchain/nodes/llms/LmChatMistralCloud/mistral.svg
new file mode 100644
index 0000000000000..928faf4518a51
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LmChatMistralCloud/mistral.svg
@@ -0,0 +1,262 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="216"
+   height="216"
+   version="1.1"
+   id="svg41"
+   sodipodi:docname="mistral.svg"
+   inkscape:version="1.3.2 (091e20ef0f, 2023-11-25, custom)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview41"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="1.936488"
+     inkscape:cx="197.78072"
+     inkscape:cy="79.00901"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg41" />
+  <style
+     id="style1"><![CDATA[.I{fill:#ff7000}.J{fill:#ff4900}.K{fill:#ffa300}.L{fill:#1c1c1b icc-color(adobe-rgb-1998, 0.13299561, 0.13299561, 0.1289978)}]]></style>
+  <defs
+     id="defs10">
+    <clipPath
+       id="A">
+      <path
+         d="M 0,184.252 H 481.89 V 0 H 0 Z"
+         transform="translate(-206.251,-140.139)"
+         id="path1" />
+    </clipPath>
+    <clipPath
+       id="B">
+      <path
+         d="M 0,184.252 H 481.89 V 0 H 0 Z"
+         transform="translate(-247.436,-104.865)"
+         id="path2" />
+    </clipPath>
+    <clipPath
+       id="C">
+      <path
+         d="M 0,184.252 H 481.89 V 0 H 0 Z"
+         transform="translate(-285.938,-102.089)"
+         id="path3" />
+    </clipPath>
+    <clipPath
+       id="D">
+      <path
+         d="M 0,184.252 H 481.89 V 0 H 0 Z"
+         transform="translate(-337.769,-131.877)"
+         id="path4" />
+    </clipPath>
+    <clipPath
+       id="E">
+      <path
+         d="M 0,184.252 H 481.89 V 0 H 0 Z"
+         transform="translate(-377.247,-132.319)"
+         id="path5" />
+    </clipPath>
+    <clipPath
+       id="F">
+      <path
+         d="M 0,184.252 H 481.89 V 0 H 0 Z"
+         transform="translate(-418.107,-114.634)"
+         id="path6" />
+    </clipPath>
+    <clipPath
+       id="G">
+      <path
+         d="M 0,184.252 H 481.89 V 0 H 0 Z"
+         transform="translate(-450.023,-140.139)"
+         id="path7" />
+    </clipPath>
+    <clipPath
+       id="H">
+      <path
+         d="M 0,184.252 H 481.89 V 0 H 0 Z"
+         transform="translate(-217.694,-44.794)"
+         id="path8" />
+    </clipPath>
+    <clipPath
+       id="I">
+      <path
+         d="M 0,184.252 H 481.89 V 0 H 0 Z"
+         transform="translate(-247.436,-35.025)"
+         id="path9" />
+    </clipPath>
+    <clipPath
+       id="J">
+      <path
+         d="M 0,184.252 H 481.89 V 0 H 0 Z"
+         id="path10" />
+    </clipPath>
+    <path
+       id="K"
+       d="m 173.987,134.362 h -37.795 l 9.633,-37.776 h 37.796 z" />
+  </defs>
+  <g
+     transform="matrix(1,0,0.254535,1,-51.362792,-7.4725007)"
+     id="g32">
+    <g
+       class="L"
+       id="g22">
+      <path
+         d="M 98.397,134.362 H 60.602 l 9.633,-37.776 h 37.796 z"
+         id="path11" />
+      <path
+         d="M 126.558,172.138 H 88.763 l 9.633,-37.776 h 37.796 z"
+         id="path12" />
+      <path
+         d="M 136.192,134.362 H 98.397 l 9.633,-37.776 h 37.796 z"
+         id="path13" />
+      <use
+         xlink:href="#K"
+         id="use13" />
+      <path
+         d="M 108.031,96.585 H 70.236 l 9.633,-37.776 h 37.796 z"
+         id="path14" />
+      <use
+         xlink:href="#K"
+         x="9.6339998"
+         y="-37.777"
+         id="use14" />
+      <path
+         d="M 60.602,134.362 H 22.807 L 32.44,96.586 h 37.796 z"
+         id="path15" />
+      <path
+         d="M 70.236,96.585 H 32.441 L 42.074,58.809 H 79.87 Z"
+         id="path16" />
+      <path
+         d="M 79.87,58.809 H 42.075 l 9.633,-37.776 h 37.796 z"
+         id="path17" />
+      <use
+         xlink:href="#K"
+         x="57.063"
+         y="-75.553001"
+         id="use17" />
+      <path
+         d="M 50.968,172.138 H 13.173 l 9.633,-37.776 h 37.796 z"
+         id="path18" />
+      <path
+         d="M 41.334,209.915 H 3.539 l 9.633,-37.776 h 37.796 z"
+         id="path19" />
+      <use
+         xlink:href="#K"
+         x="37.794998"
+         id="use19" />
+      <use
+         xlink:href="#K"
+         x="47.429001"
+         y="-37.777"
+         id="use20" />
+      <use
+         xlink:href="#K"
+         x="28.160999"
+         y="37.776001"
+         id="use21" />
+      <use
+         xlink:href="#K"
+         x="18.527"
+         y="75.553001"
+         id="use22" />
+    </g>
+    <path
+       d="M 114.115,134.359 H 76.321 l 9.633,-37.776 h 37.796 z"
+       class="I"
+       id="path22" />
+    <use
+       xlink:href="#K"
+       x="-31.709999"
+       y="37.772999"
+       class="J"
+       id="use23" />
+    <g
+       class="I"
+       id="g25">
+      <use
+         xlink:href="#K"
+         x="-22.076"
+         y="-0.003"
+         id="use24" />
+      <use
+         xlink:href="#K"
+         x="15.719"
+         y="-0.003"
+         id="use25" />
+    </g>
+    <g
+       class="K"
+       id="g26">
+      <path
+         d="M 123.749,96.582 H 85.955 l 9.633,-37.776 h 37.796 z"
+         id="path25" />
+      <use
+         xlink:href="#K"
+         x="25.353001"
+         y="-37.779999"
+         id="use26" />
+    </g>
+    <path
+       d="M 76.32,134.359 H 38.526 l 9.633,-37.776 h 37.796 z"
+       class="I"
+       id="path26" />
+    <path
+       d="M 85.954,96.582 H 48.16 l 9.633,-37.776 h 37.796 z"
+       class="K"
+       id="path27" />
+    <g
+       fill="#ffce00"
+       id="g28">
+      <path
+         d="M 95.588,58.806 H 57.794 L 67.427,21.03 h 37.796 z"
+         id="path28" />
+      <use
+         xlink:href="#K"
+         x="72.781998"
+         y="-75.556"
+         id="use28" />
+    </g>
+    <path
+       d="M 66.686,172.135 H 28.892 l 9.633,-37.776 h 37.796 z"
+       class="J"
+       id="path29" />
+    <path
+       d="M 57.052,209.912 H 19.258 l 9.633,-37.776 h 37.796 z"
+       fill="#ff0107"
+       id="path30" />
+    <use
+       xlink:href="#K"
+       x="53.514"
+       y="-0.003"
+       class="I"
+       id="use30" />
+    <path
+       d="M 237.135,96.582 H 199.34 l 9.633,-37.776 h 37.796 z"
+       class="K"
+       id="path31" />
+    <use
+       xlink:href="#K"
+       x="43.880001"
+       y="37.772999"
+       class="J"
+       id="use31" />
+    <use
+       xlink:href="#K"
+       x="34.245998"
+       y="75.550003"
+       fill="#ff0107"
+       id="use32" />
+  </g>
+</svg>
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LmGooglePalm/LmGooglePalm.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LmGooglePalm/LmGooglePalm.node.ts
new file mode 100644
index 0000000000000..a47001ba3b532
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LmGooglePalm/LmGooglePalm.node.ts
@@ -0,0 +1,172 @@
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import {
+	NodeConnectionType,
+	type IExecuteFunctions,
+	type INodeType,
+	type INodeTypeDescription,
+	type SupplyData,
+} from 'n8n-workflow';
+import { GooglePaLM } from '@langchain/community/llms/googlepalm';
+import { logWrapper } from '../../../utils/logWrapper';
+import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+
+export class LmGooglePalm implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Google PaLM Language Model',
+		// eslint-disable-next-line n8n-nodes-base/node-class-description-name-miscased
+		name: 'lmGooglePalm',
+		icon: 'file:google.svg',
+		group: ['transform'],
+		version: 1,
+		description: 'Language Model Google PaLM',
+		defaults: {
+			name: 'Google PaLM Language Model',
+		},
+		codex: {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Language Models'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/sub-nodes/n8n-nodes-langchain.lmgooglepalm/',
+					},
+				],
+			},
+		},
+		// 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.AiLanguageModel],
+		outputNames: ['Model'],
+		credentials: [
+			{
+				name: 'googlePalmApi',
+				required: true,
+			},
+		],
+		requestDefaults: {
+			ignoreHttpStatusErrors: true,
+			baseURL: '={{ $credentials.host }}',
+		},
+		properties: [
+			getConnectionHintNoticeField([NodeConnectionType.AiChain, NodeConnectionType.AiAgent]),
+			{
+				displayName: 'Model',
+				name: 'modelName',
+				type: 'options',
+				description:
+					'The model which will generate the completion. <a href="https://developers.generativeai.google/api/rest/generativelanguage/models/list">Learn more</a>.',
+				typeOptions: {
+					loadOptions: {
+						routing: {
+							request: {
+								method: 'GET',
+								url: '/v1beta3/models',
+							},
+							output: {
+								postReceive: [
+									{
+										type: 'rootProperty',
+										properties: {
+											property: 'models',
+										},
+									},
+									{
+										type: 'filter',
+										properties: {
+											pass: "={{ $responseItem.name.startsWith('models/text') }}",
+										},
+									},
+									{
+										type: 'setKeyValue',
+										properties: {
+											name: '={{$responseItem.name}}',
+											value: '={{$responseItem.name}}',
+											description: '={{$responseItem.description}}',
+										},
+									},
+									{
+										type: 'sort',
+										properties: {
+											key: 'name',
+										},
+									},
+								],
+							},
+						},
+					},
+				},
+				routing: {
+					send: {
+						type: 'body',
+						property: 'model',
+					},
+				},
+				default: 'models/text-bison-001',
+			},
+			{
+				displayName: 'Options',
+				name: 'options',
+				placeholder: 'Add Option',
+				description: 'Additional options to add',
+				type: 'collection',
+				default: {},
+				options: [
+					{
+						displayName: 'Maximum Number of Tokens',
+						name: 'maxOutputTokens',
+						default: 1024,
+						description: 'The maximum number of tokens to generate in the completion',
+						type: 'number',
+					},
+					{
+						displayName: 'Sampling Temperature',
+						name: 'temperature',
+						default: 0.7,
+						typeOptions: { maxValue: 1, minValue: 0, numberPrecision: 1 },
+						description:
+							'Controls randomness: Lowering results in less random completions. As the temperature approaches zero, the model will become deterministic and repetitive.',
+						type: 'number',
+					},
+					{
+						displayName: 'Top K',
+						name: 'topK',
+						default: 40,
+						typeOptions: { maxValue: 1, minValue: -1, numberPrecision: 1 },
+						description:
+							'Used to remove "long tail" low probability responses. Defaults to -1, which disables it.',
+						type: 'number',
+					},
+					{
+						displayName: 'Top P',
+						name: 'topP',
+						default: 0.9,
+						typeOptions: { maxValue: 1, minValue: 0, numberPrecision: 1 },
+						description:
+							'Controls diversity via nucleus sampling: 0.5 means half of all likelihood-weighted options are considered. We generally recommend altering this or temperature but not both.',
+						type: 'number',
+					},
+				],
+			},
+		],
+	};
+
+	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
+		const credentials = await this.getCredentials('googlePalmApi');
+
+		const modelName = this.getNodeParameter('modelName', itemIndex) as string;
+		const options = this.getNodeParameter('options', itemIndex, {}) as object;
+
+		const model = new GooglePaLM({
+			apiKey: credentials.apiKey as string,
+			modelName,
+			...options,
+		});
+
+		return {
+			response: logWrapper(model, this),
+		};
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LmGooglePalm/google.svg b/packages/@n8n/nodes-langchain/nodes/llms/LmGooglePalm/google.svg
new file mode 100644
index 0000000000000..38f3c22592e39
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LmGooglePalm/google.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 48 48"><defs><path id="a" d="M44.5 20H24v8.5h11.8C34.7 33.9 30.1 37 24 37c-7.2 0-13-5.8-13-13s5.8-13 13-13c3.1 0 5.9 1.1 8.1 2.9l6.4-6.4C34.6 4.1 29.6 2 24 2 11.8 2 2 11.8 2 24s9.8 22 22 22c11 0 21-8 21-22 0-1.3-.2-2.7-.5-4"/></defs><clipPath id="b"><use xlink:href="#a" overflow="visible"/></clipPath><path fill="#FBBC05" d="M0 37V11l17 13z" clip-path="url(#b)"/><path fill="#EA4335" d="m0 11 17 13 7-6.1L48 14V0H0z" clip-path="url(#b)"/><path fill="#34A853" d="m0 37 30-23 7.9 1L48 0v48H0z" clip-path="url(#b)"/><path fill="#4285F4" d="M48 48 17 24l-4-3 35-10z" clip-path="url(#b)"/></svg>
\ No newline at end of file
diff --git a/packages/@n8n/nodes-langchain/nodes/memory/MemoryBufferWindow/MemoryBufferWindow.node.ts b/packages/@n8n/nodes-langchain/nodes/memory/MemoryBufferWindow/MemoryBufferWindow.node.ts
new file mode 100644
index 0000000000000..2b7e205de63fb
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/memory/MemoryBufferWindow/MemoryBufferWindow.node.ts
@@ -0,0 +1,170 @@
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import {
+	NodeConnectionType,
+	type IExecuteFunctions,
+	type INodeType,
+	type INodeTypeDescription,
+	type SupplyData,
+} from 'n8n-workflow';
+import type { BufferWindowMemoryInput } from 'langchain/memory';
+import { BufferWindowMemory } from 'langchain/memory';
+import { logWrapper } from '../../../utils/logWrapper';
+import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+import { sessionIdOption, sessionKeyProperty } from '../descriptions';
+import { getSessionId } from '../../../utils/helpers';
+
+class MemoryChatBufferSingleton {
+	private static instance: MemoryChatBufferSingleton;
+
+	private memoryBuffer: Map<
+		string,
+		{ buffer: BufferWindowMemory; created: Date; last_accessed: Date }
+	>;
+
+	private constructor() {
+		this.memoryBuffer = new Map();
+	}
+
+	public static getInstance(): MemoryChatBufferSingleton {
+		if (!MemoryChatBufferSingleton.instance) {
+			MemoryChatBufferSingleton.instance = new MemoryChatBufferSingleton();
+		}
+		return MemoryChatBufferSingleton.instance;
+	}
+
+	public async getMemory(
+		sessionKey: string,
+		memoryParams: BufferWindowMemoryInput,
+	): Promise<BufferWindowMemory> {
+		await this.cleanupStaleBuffers();
+
+		let memoryInstance = this.memoryBuffer.get(sessionKey);
+		if (memoryInstance) {
+			memoryInstance.last_accessed = new Date();
+		} else {
+			const newMemory = new BufferWindowMemory(memoryParams);
+
+			memoryInstance = {
+				buffer: newMemory,
+				created: new Date(),
+				last_accessed: new Date(),
+			};
+			this.memoryBuffer.set(sessionKey, memoryInstance);
+		}
+		return memoryInstance.buffer;
+	}
+
+	private async cleanupStaleBuffers(): Promise<void> {
+		const oneHourAgo = new Date(Date.now() - 60 * 60 * 1000);
+
+		for (const [key, memoryInstance] of this.memoryBuffer.entries()) {
+			if (memoryInstance.last_accessed < oneHourAgo) {
+				await this.memoryBuffer.get(key)?.buffer.clear();
+				this.memoryBuffer.delete(key);
+			}
+		}
+	}
+}
+
+export class MemoryBufferWindow implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Window Buffer Memory (easiest)',
+		name: 'memoryBufferWindow',
+		icon: 'fa:database',
+		group: ['transform'],
+		version: [1, 1.1, 1.2],
+		description: 'Stores in n8n memory, so no credentials required',
+		defaults: {
+			name: 'Window Buffer Memory',
+		},
+		codex: {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Memory'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/sub-nodes/n8n-nodes-langchain.memorybufferwindow/',
+					},
+				],
+			},
+		},
+		// 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.AiMemory],
+		outputNames: ['Memory'],
+		properties: [
+			getConnectionHintNoticeField([NodeConnectionType.AiAgent]),
+			{
+				displayName: 'Session Key',
+				name: 'sessionKey',
+				type: 'string',
+				default: 'chat_history',
+				description: 'The key to use to store the memory in the workflow data',
+				displayOptions: {
+					show: {
+						'@version': [1],
+					},
+				},
+			},
+			{
+				displayName: 'Session ID',
+				name: 'sessionKey',
+				type: 'string',
+				default: '={{ $json.sessionId }}',
+				description: 'The key to use to store the memory',
+				displayOptions: {
+					show: {
+						'@version': [1.1],
+					},
+				},
+			},
+			{
+				...sessionIdOption,
+				displayOptions: {
+					show: {
+						'@version': [{ _cnd: { gte: 1.2 } }],
+					},
+				},
+			},
+			sessionKeyProperty,
+			{
+				displayName: 'Context Window Length',
+				name: 'contextWindowLength',
+				type: 'number',
+				default: 5,
+				description: 'The number of previous messages to consider for context',
+			},
+		],
+	};
+
+	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
+		const contextWindowLength = this.getNodeParameter('contextWindowLength', itemIndex) as number;
+		const workflowId = this.getWorkflow().id;
+		const memoryInstance = MemoryChatBufferSingleton.getInstance();
+
+		const nodeVersion = this.getNode().typeVersion;
+
+		let sessionId;
+
+		if (nodeVersion >= 1.2) {
+			sessionId = getSessionId(this, itemIndex);
+		} else {
+			sessionId = this.getNodeParameter('sessionKey', itemIndex) as string;
+		}
+
+		const memory = await memoryInstance.getMemory(`${workflowId}__${sessionId}`, {
+			k: contextWindowLength,
+			inputKey: 'input',
+			memoryKey: 'chat_history',
+			outputKey: 'output',
+			returnMessages: true,
+		});
+
+		return {
+			response: logWrapper(memory, this),
+		};
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/memory/MemoryChatRetriever/MemoryChatRetriever.node.ts b/packages/@n8n/nodes-langchain/nodes/memory/MemoryChatRetriever/MemoryChatRetriever.node.ts
new file mode 100644
index 0000000000000..9d8b220f493fb
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/memory/MemoryChatRetriever/MemoryChatRetriever.node.ts
@@ -0,0 +1,112 @@
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import {
+	NodeConnectionType,
+	type IDataObject,
+	type IExecuteFunctions,
+	type INodeExecutionData,
+	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 = [];
+	for (let i = 0; i < messages.length; i += 2) {
+		chunkedMessages.push([messages[i], messages[i + 1]]);
+	}
+
+	const transformedMessages = chunkedMessages.map((exchange) => {
+		const simplified = {
+			[exchange[0]._getType()]: exchange[0].content,
+		};
+
+		if (exchange[1]) {
+			simplified[exchange[1]._getType()] = exchange[1].content;
+		}
+
+		return {
+			json: simplified,
+		};
+	});
+	return transformedMessages;
+}
+
+// This node is deprecated. Use MemoryManager instead.
+export class MemoryChatRetriever implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Chat Messages Retriever',
+		name: 'memoryChatRetriever',
+		icon: 'fa:database',
+		group: ['transform'],
+		hidden: true,
+		version: 1,
+		description: 'Retrieve chat messages from memory and use them in the workflow',
+		defaults: {
+			name: 'Chat Messages Retriever',
+		},
+		codex: {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Miscellaneous'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/sub-nodes/n8n-nodes-langchain.memorymanager/',
+					},
+				],
+			},
+		},
+		// eslint-disable-next-line n8n-nodes-base/node-class-description-inputs-wrong-regular-node
+		inputs: [
+			NodeConnectionType.Main,
+			{
+				displayName: 'Memory',
+				maxConnections: 1,
+				type: NodeConnectionType.AiMemory,
+				required: true,
+			},
+		],
+		// eslint-disable-next-line n8n-nodes-base/node-class-description-outputs-wrong
+		outputs: [NodeConnectionType.Main],
+		properties: [
+			{
+				displayName: "This node is deprecated. Use 'Chat Memory Manager' node instead.",
+				type: 'notice',
+				default: '',
+				name: 'deprecatedNotice',
+			},
+			{
+				displayName: 'Simplify Output',
+				name: 'simplifyOutput',
+				type: 'boolean',
+				description: 'Whether to simplify the output to only include the sender and the text',
+				default: true,
+			},
+		],
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		this.logger.verbose('Executing Chat Memory Retriever');
+
+		const memory = (await this.getInputConnectionData(NodeConnectionType.AiMemory, 0)) as
+			| BaseChatMemory
+			| undefined;
+		const simplifyOutput = this.getNodeParameter('simplifyOutput', 0) as boolean;
+
+		const messages = await memory?.chatHistory.getMessages();
+
+		if (simplifyOutput && messages) {
+			return await this.prepareOutputData(simplifyMessages(messages));
+		}
+
+		const serializedMessages =
+			messages?.map((message) => {
+				const serializedMessage = message.toJSON();
+				return { json: serializedMessage as unknown as IDataObject };
+			}) ?? [];
+
+		return await this.prepareOutputData(serializedMessages);
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/memory/MemoryManager/MemoryManager.node.ts b/packages/@n8n/nodes-langchain/nodes/memory/MemoryManager/MemoryManager.node.ts
new file mode 100644
index 0000000000000..ef20fb041f816
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/memory/MemoryManager/MemoryManager.node.ts
@@ -0,0 +1,410 @@
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import { NodeConnectionType } from 'n8n-workflow';
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	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 {
+	type: MessageRole;
+	message: string;
+	hideFromUI: boolean;
+}
+
+function simplifyMessages(messages: BaseMessage[]) {
+	const chunkedMessages = [];
+	for (let i = 0; i < messages.length; i += 2) {
+		chunkedMessages.push([messages[i], messages[i + 1]]);
+	}
+
+	const transformedMessages = chunkedMessages.map((exchange) => {
+		const simplified = {
+			[exchange[0]._getType()]: exchange[0].content,
+		};
+
+		if (exchange[1]) {
+			simplified[exchange[1]._getType()] = exchange[1].content;
+		}
+
+		return simplified;
+	});
+	return transformedMessages;
+}
+
+const prepareOutputSetup = (ctx: IExecuteFunctions, version: number, memory: BaseChatMemory) => {
+	if (version === 1) {
+		//legacy behavior of insert and delete for version 1
+		return async (i: number) => {
+			const messages = await memory.chatHistory.getMessages();
+
+			const serializedMessages = messages?.map((message) => message.toJSON()) ?? [];
+
+			const executionData = ctx.helpers.constructExecutionMetaData(
+				ctx.helpers.returnJsonArray(serializedMessages as unknown as IDataObject[]),
+				{ itemData: { item: i } },
+			);
+
+			return executionData;
+		};
+	}
+	return async (i: number) => {
+		return [
+			{
+				json: { success: true },
+				pairedItem: { item: i },
+			},
+		];
+	};
+};
+
+export class MemoryManager implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Chat Memory Manager',
+		name: 'memoryManager',
+		icon: 'fa:database',
+		group: ['transform'],
+		version: [1, 1.1],
+		description: 'Manage chat messages memory and use it in the workflow',
+		defaults: {
+			name: 'Chat Memory Manager',
+		},
+		codex: {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Miscellaneous'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/sub-nodes/n8n-nodes-langchain.memorymanager/',
+					},
+				],
+			},
+		},
+		// eslint-disable-next-line n8n-nodes-base/node-class-description-inputs-wrong-regular-node
+		inputs: [
+			{
+				displayName: '',
+				type: NodeConnectionType.Main,
+			},
+			{
+				displayName: 'Memory',
+				type: NodeConnectionType.AiMemory,
+				required: true,
+				maxConnections: 1,
+			},
+		],
+		// eslint-disable-next-line n8n-nodes-base/node-class-description-outputs-wrong
+		outputs: [
+			{
+				displayName: '',
+				type: NodeConnectionType.Main,
+			},
+		],
+		properties: [
+			{
+				displayName: 'Operation Mode',
+				name: 'mode',
+				type: 'options',
+				noDataExpression: true,
+				default: 'load',
+				options: [
+					{
+						name: 'Get Many Messages',
+						description: 'Retrieve chat messages from connected memory',
+						value: 'load',
+					},
+					{
+						name: 'Insert Messages',
+						description: 'Insert chat messages into connected memory',
+						value: 'insert',
+					},
+					{
+						name: 'Delete Messages',
+						description: 'Delete chat messages from connected memory',
+						value: 'delete',
+					},
+				],
+			},
+			{
+				displayName: 'Insert Mode',
+				name: 'insertMode',
+				type: 'options',
+				description: 'Choose how new messages are inserted into the memory',
+				noDataExpression: true,
+				default: 'insert',
+				options: [
+					{
+						name: 'Insert Messages',
+						value: 'insert',
+						description: 'Add messages alongside existing ones',
+					},
+					{
+						name: 'Override All Messages',
+						value: 'override',
+						description: 'Replace the current memory with new messages',
+					},
+				],
+				displayOptions: {
+					show: {
+						mode: ['insert'],
+					},
+				},
+			},
+			{
+				displayName: 'Delete Mode',
+				name: 'deleteMode',
+				type: 'options',
+				description: 'How messages are deleted from memory',
+				noDataExpression: true,
+				default: 'lastN',
+				options: [
+					{
+						name: 'Last N',
+						value: 'lastN',
+						description: 'Delete the last N messages',
+					},
+					{
+						name: 'All Messages',
+						value: 'all',
+						description: 'Clear all messages from memory',
+					},
+				],
+				displayOptions: {
+					show: {
+						mode: ['delete'],
+					},
+				},
+			},
+			{
+				displayName: 'Chat Messages',
+				name: 'messages',
+				description: 'Chat messages to insert into memory',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: true,
+				},
+				default: {},
+				placeholder: 'Add message',
+				options: [
+					{
+						name: 'messageValues',
+						displayName: 'Message',
+						values: [
+							{
+								displayName: 'Type Name or ID',
+								name: 'type',
+								type: 'options',
+								options: [
+									{
+										name: 'AI',
+										value: 'ai',
+									},
+									{
+										name: 'System',
+										value: 'system',
+									},
+									{
+										name: 'User',
+										value: 'user',
+									},
+								],
+								default: 'system',
+							},
+							{
+								displayName: 'Message',
+								name: 'message',
+								type: 'string',
+								required: true,
+								default: '',
+							},
+							{
+								displayName: 'Hide Message in Chat',
+								name: 'hideFromUI',
+								type: 'boolean',
+								required: true,
+								default: false,
+								description: 'Whether to hide the message from the chat UI',
+							},
+						],
+					},
+				],
+				displayOptions: {
+					show: {
+						mode: ['insert'],
+					},
+				},
+			},
+			{
+				displayName: 'Messages Count',
+				name: 'lastMessagesCount',
+				type: 'number',
+				description: 'The amount of last messages to delete',
+				default: 2,
+				displayOptions: {
+					show: {
+						mode: ['delete'],
+						deleteMode: ['lastN'],
+					},
+				},
+			},
+			{
+				displayName: 'Simplify Output',
+				name: 'simplifyOutput',
+				type: 'boolean',
+				description: 'Whether to simplify the output to only include the sender and the text',
+				default: true,
+				displayOptions: {
+					show: {
+						mode: ['load'],
+					},
+				},
+			},
+			{
+				displayName: 'Options',
+				name: 'options',
+				placeholder: 'Add Option',
+				type: 'collection',
+				default: {},
+				options: [
+					{
+						displayName: 'Group Messages',
+						name: 'groupMessages',
+						type: 'boolean',
+						default: true,
+						description:
+							'Whether to group messages into a single item or return each message as a separate item',
+					},
+				],
+				displayOptions: {
+					show: {
+						mode: ['load'],
+					},
+				},
+			},
+		],
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const nodeVersion = this.getNode().typeVersion;
+		const items = this.getInputData();
+		const mode = this.getNodeParameter('mode', 0, 'load') as 'load' | 'insert' | 'delete';
+		const memory = (await this.getInputConnectionData(
+			NodeConnectionType.AiMemory,
+			0,
+		)) as BaseChatMemory;
+
+		const prepareOutput = prepareOutputSetup(this, nodeVersion, memory);
+
+		const returnData: INodeExecutionData[] = [];
+
+		for (let i = 0; i < items.length; i++) {
+			const messages = await memory.chatHistory.getMessages();
+
+			if (mode === 'delete') {
+				const deleteMode = this.getNodeParameter('deleteMode', i) as 'lastN' | 'all';
+
+				if (deleteMode === 'lastN') {
+					const lastMessagesCount = this.getNodeParameter('lastMessagesCount', i) as number;
+					if (messages.length >= lastMessagesCount) {
+						const newMessages = messages.slice(0, messages.length - lastMessagesCount);
+
+						await memory.chatHistory.clear();
+						for (const message of newMessages) {
+							await memory.chatHistory.addMessage(message);
+						}
+					}
+				} else {
+					await memory.chatHistory.clear();
+				}
+
+				returnData.push(...(await prepareOutput(i)));
+			}
+
+			if (mode === 'insert') {
+				const insertMode = this.getNodeParameter('insertMode', i) as 'insert' | 'override';
+				const messagesToInsert = this.getNodeParameter(
+					'messages.messageValues',
+					i,
+					[],
+				) as MessageRecord[];
+
+				const templateMapper = {
+					ai: AIMessage,
+					system: SystemMessage,
+					user: HumanMessage,
+				};
+
+				if (insertMode === 'override') {
+					await memory.chatHistory.clear();
+				}
+
+				for (const message of messagesToInsert) {
+					const MessageClass = new templateMapper[message.type](message.message);
+
+					if (message.hideFromUI) {
+						MessageClass.additional_kwargs.hideFromUI = true;
+					}
+
+					await memory.chatHistory.addMessage(MessageClass);
+				}
+
+				returnData.push(...(await prepareOutput(i)));
+			}
+
+			if (mode === 'load') {
+				const simplifyOutput = this.getNodeParameter('simplifyOutput', i, false) as boolean;
+				const options = this.getNodeParameter('options', i);
+
+				//Load mode, legacy behavior for version 1, buggy - outputs only for single input item
+				if (simplifyOutput && messages.length && nodeVersion === 1) {
+					const groupMessages = options.groupMessages as boolean;
+					const output = simplifyMessages(messages);
+
+					return [
+						this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(
+								groupMessages ? [{ messages: output, messagesCount: output.length }] : output,
+							),
+							{ itemData: { item: i } },
+						),
+					];
+				}
+
+				let groupMessages = true;
+				//disable grouping if explicitly set to false
+				if (options.groupMessages === false) {
+					groupMessages = false;
+				}
+				//disable grouping if not set and node version is 1 (legacy behavior)
+				if (options.groupMessages === undefined && nodeVersion === 1) {
+					groupMessages = false;
+				}
+
+				let output: IDataObject[] =
+					(simplifyOutput
+						? simplifyMessages(messages)
+						: (messages?.map((message) => message.toJSON()) as unknown as IDataObject[])) ?? [];
+
+				if (groupMessages) {
+					output = [{ messages: output, messagesCount: output.length }];
+				}
+
+				const executionData = this.helpers.constructExecutionMetaData(
+					this.helpers.returnJsonArray(output),
+					{ itemData: { item: i } },
+				);
+
+				returnData.push(...executionData);
+			}
+		}
+
+		return [returnData];
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/memory/MemoryMotorhead/MemoryMotorhead.node.ts b/packages/@n8n/nodes-langchain/nodes/memory/MemoryMotorhead/MemoryMotorhead.node.ts
new file mode 100644
index 0000000000000..9b2f46fb30dd4
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/memory/MemoryMotorhead/MemoryMotorhead.node.ts
@@ -0,0 +1,118 @@
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import {
+	NodeConnectionType,
+	type IExecuteFunctions,
+	type INodeType,
+	type INodeTypeDescription,
+	type SupplyData,
+} from 'n8n-workflow';
+
+import { MotorheadMemory } from '@langchain/community/memory/motorhead_memory';
+import { logWrapper } from '../../../utils/logWrapper';
+import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+import { sessionIdOption, sessionKeyProperty } from '../descriptions';
+import { getSessionId } from '../../../utils/helpers';
+
+export class MemoryMotorhead implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Motorhead',
+		name: 'memoryMotorhead',
+		icon: 'fa:file-export',
+		group: ['transform'],
+		version: [1, 1.1, 1.2],
+		description: 'Use Motorhead Memory',
+		defaults: {
+			name: 'Motorhead',
+		},
+		codex: {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Memory'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/sub-nodes/n8n-nodes-langchain.memorymotorhead/',
+					},
+				],
+			},
+		},
+		// 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.AiMemory],
+		outputNames: ['Memory'],
+		credentials: [
+			{
+				name: 'motorheadApi',
+				required: true,
+			},
+		],
+		properties: [
+			getConnectionHintNoticeField([NodeConnectionType.AiAgent]),
+			{
+				displayName: 'Session ID',
+				name: 'sessionId',
+				type: 'string',
+				required: true,
+				default: '',
+				displayOptions: {
+					show: {
+						'@version': [1],
+					},
+				},
+			},
+			{
+				displayName: 'Session ID',
+				name: 'sessionId',
+				type: 'string',
+				default: '={{ $json.sessionId }}',
+				description: 'The key to use to store the memory',
+				displayOptions: {
+					show: {
+						'@version': [1.1],
+					},
+				},
+			},
+			{
+				...sessionIdOption,
+				displayOptions: {
+					show: {
+						'@version': [{ _cnd: { gte: 1.2 } }],
+					},
+				},
+			},
+			sessionKeyProperty,
+		],
+	};
+
+	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
+		const credentials = await this.getCredentials('motorheadApi');
+		const nodeVersion = this.getNode().typeVersion;
+
+		let sessionId;
+
+		if (nodeVersion >= 1.2) {
+			sessionId = getSessionId(this, itemIndex);
+		} else {
+			sessionId = this.getNodeParameter('sessionId', itemIndex) as string;
+		}
+
+		const memory = new MotorheadMemory({
+			sessionId,
+			url: `${credentials.host as string}/motorhead`,
+			clientId: credentials.clientId as string,
+			apiKey: credentials.apiKey as string,
+			memoryKey: 'chat_history',
+			returnMessages: true,
+			inputKey: 'input',
+			outputKey: 'output',
+		});
+
+		await memory.init();
+
+		return {
+			response: logWrapper(memory, this),
+		};
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/memory/MemoryRedisChat/MemoryRedisChat.node.ts b/packages/@n8n/nodes-langchain/nodes/memory/MemoryRedisChat/MemoryRedisChat.node.ts
new file mode 100644
index 0000000000000..d139bd31e365a
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/memory/MemoryRedisChat/MemoryRedisChat.node.ts
@@ -0,0 +1,163 @@
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import {
+	NodeOperationError,
+	type IExecuteFunctions,
+	type INodeType,
+	type INodeTypeDescription,
+	type SupplyData,
+	NodeConnectionType,
+} from 'n8n-workflow';
+import { BufferMemory } from 'langchain/memory';
+import type { RedisChatMessageHistoryInput } from '@langchain/redis';
+import { RedisChatMessageHistory } from '@langchain/redis';
+import type { RedisClientOptions } from 'redis';
+import { createClient } from 'redis';
+import { logWrapper } from '../../../utils/logWrapper';
+import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+import { sessionIdOption, sessionKeyProperty } from '../descriptions';
+import { getSessionId } from '../../../utils/helpers';
+
+export class MemoryRedisChat implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Redis Chat Memory',
+		name: 'memoryRedisChat',
+		icon: 'file:redis.svg',
+		group: ['transform'],
+		version: [1, 1.1, 1.2],
+		description: 'Stores the chat history in Redis.',
+		defaults: {
+			name: 'Redis Chat Memory',
+		},
+		credentials: [
+			{
+				name: 'redis',
+				required: true,
+			},
+		],
+		codex: {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Memory'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/sub-nodes/n8n-nodes-langchain.memoryredischat/',
+					},
+				],
+			},
+		},
+		// 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.AiMemory],
+		outputNames: ['Memory'],
+		properties: [
+			getConnectionHintNoticeField([NodeConnectionType.AiAgent]),
+			{
+				displayName: 'Session Key',
+				name: 'sessionKey',
+				type: 'string',
+				default: 'chat_history',
+				description: 'The key to use to store the memory in the workflow data',
+				displayOptions: {
+					show: {
+						'@version': [1],
+					},
+				},
+			},
+			{
+				displayName: 'Session ID',
+				name: 'sessionKey',
+				type: 'string',
+				default: '={{ $json.sessionId }}',
+				description: 'The key to use to store the memory',
+				displayOptions: {
+					show: {
+						'@version': [1.1],
+					},
+				},
+			},
+			{
+				...sessionIdOption,
+				displayOptions: {
+					show: {
+						'@version': [{ _cnd: { gte: 1.2 } }],
+					},
+				},
+			},
+			sessionKeyProperty,
+			{
+				displayName: 'Session Time To Live',
+				name: 'sessionTTL',
+				type: 'number',
+				default: 0,
+				description:
+					'For how long the session should be stored in seconds. If set to 0 it will not expire.',
+			},
+		],
+	};
+
+	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
+		const credentials = await this.getCredentials('redis');
+		const nodeVersion = this.getNode().typeVersion;
+
+		const sessionTTL = this.getNodeParameter('sessionTTL', itemIndex, 0) as number;
+
+		let sessionId;
+
+		if (nodeVersion >= 1.2) {
+			sessionId = getSessionId(this, itemIndex);
+		} else {
+			sessionId = this.getNodeParameter('sessionKey', itemIndex) as string;
+		}
+
+		const redisOptions: RedisClientOptions = {
+			socket: {
+				host: credentials.host as string,
+				port: credentials.port as number,
+			},
+			database: credentials.database as number,
+		};
+
+		if (credentials.password) {
+			redisOptions.password = credentials.password as string;
+		}
+
+		const client = createClient({
+			...redisOptions,
+		});
+
+		client.on('error', async (error: Error) => {
+			await client.quit();
+			throw new NodeOperationError(this.getNode(), 'Redis Error: ' + error.message);
+		});
+
+		const redisChatConfig: RedisChatMessageHistoryInput = {
+			client,
+			sessionId,
+		};
+
+		if (sessionTTL > 0) {
+			redisChatConfig.sessionTTL = sessionTTL;
+		}
+		const redisChatHistory = new RedisChatMessageHistory(redisChatConfig);
+
+		const memory = new BufferMemory({
+			memoryKey: 'chat_history',
+			chatHistory: redisChatHistory,
+			returnMessages: true,
+			inputKey: 'input',
+			outputKey: 'output',
+		});
+
+		async function closeFunction() {
+			void client.disconnect();
+		}
+
+		return {
+			closeFunction,
+			response: logWrapper(memory, this),
+		};
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/memory/MemoryRedisChat/redis.svg b/packages/@n8n/nodes-langchain/nodes/memory/MemoryRedisChat/redis.svg
new file mode 100644
index 0000000000000..beb6ad40dab1b
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/memory/MemoryRedisChat/redis.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="60" height="60"><g fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round"><path fill="#A41E11" d="M57.656 43.99c-3.201 1.683-19.787 8.561-23.318 10.417s-5.494 1.838-8.283.494c-2.79-1.343-20.449-8.535-23.629-10.067C.834 44.066.002 43.422.002 42.811v-6.117s22.98-5.045 26.69-6.388 4.995-1.39 8.154-.225c3.16 1.165 22.035 4.603 25.154 5.756v6.032c0 .605-.72 1.283-2.35 2.124z"/><path fill="#D82C20" d="M57.656 37.872c-3.201 1.685-19.787 8.56-23.318 10.417s-5.494 1.838-8.283.494c-2.79-1.343-20.449-8.534-23.63-10.068s-3.243-2.588-.122-3.82l24.388-9.52c3.71-1.34 4.994-1.39 8.153-.225s19.643 7.78 22.747 8.951c3.103 1.17 3.24 2.086.037 3.786z"/><path fill="#A41E11" d="M57.656 34.015c-3.201 1.683-19.787 8.561-23.318 10.417s-5.494 1.838-8.283.495c-2.79-1.344-20.449-8.536-23.629-10.067C.834 34.092.002 33.447.002 32.836V26.72s22.98-5.045 26.69-6.387c3.711-1.343 4.995-1.39 8.154-.225 3.16 1.165 22.035 4.602 25.154 5.756v6.032c0 .605-.72 1.283-2.35 2.123z"/><path fill="#D82C20" d="M57.656 27.898c-3.201 1.685-19.787 8.561-23.318 10.417s-5.494 1.838-8.283.495c-2.79-1.344-20.449-8.534-23.63-10.067-3.18-1.534-3.243-2.588-.122-3.82l24.388-9.52c3.71-1.343 4.994-1.39 8.153-.225 3.16 1.166 19.644 7.785 22.765 8.935s3.24 2.085.038 3.785z"/><path fill="#A41E11" d="M57.656 23.671c-3.201 1.683-19.787 8.561-23.318 10.419s-5.494 1.838-8.283.495c-2.79-1.344-20.449-8.535-23.629-10.069-1.592-.765-2.424-1.411-2.424-2.02v-6.11s22.98-5.045 26.69-6.388 4.995-1.39 8.154-.225c3.16 1.165 22.035 4.591 25.154 5.745v6.032c0 .605-.72 1.283-2.35 2.123z"/><path fill="#D82C20" d="M57.656 17.553c-3.201 1.685-19.787 8.561-23.318 10.417s-5.494 1.838-8.283.495c-2.79-1.344-20.449-8.534-23.63-10.068s-3.243-2.587-.122-3.82l24.388-9.52c3.71-1.343 4.994-1.39 8.153-.226 3.16 1.165 19.643 7.785 22.765 8.936s3.24 2.085.038 3.785z"/><path fill="#FFF" d="m31.497 15.032-1.88-3.153-6.002-.545 4.48-1.63L26.75 7.2l4.192 1.653 3.955-1.305-1.07 2.586 4.032 1.524-5.198.546zm-10.014 6.275 13.903-2.153-4.2 6.211zm-11.17-5.167c0-1.61 3.314-2.906 7.431-2.906 4.118 0 7.432 1.296 7.432 2.906s-3.314 2.905-7.432 2.905c-4.117 0-7.431-1.295-7.431-2.905"/><path fill="#7A0C00" d="m52.233 15.714-8.224 3.276-.007-6.556z"/><path fill="#AD2115" d="m44.01 18.991-.89.353-8.217-3.276 9.094-3.63z"/></g></svg>
\ No newline at end of file
diff --git a/packages/@n8n/nodes-langchain/nodes/memory/MemoryXata/MemoryXata.node.ts b/packages/@n8n/nodes-langchain/nodes/memory/MemoryXata/MemoryXata.node.ts
new file mode 100644
index 0000000000000..e5c9dc4c35611
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/memory/MemoryXata/MemoryXata.node.ts
@@ -0,0 +1,135 @@
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
+import type { IExecuteFunctions, INodeType, INodeTypeDescription, SupplyData } from 'n8n-workflow';
+import { XataChatMessageHistory } from '@langchain/community/stores/message/xata';
+import { BufferMemory } from 'langchain/memory';
+import { BaseClient } from '@xata.io/client';
+import { logWrapper } from '../../../utils/logWrapper';
+import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+import { sessionIdOption, sessionKeyProperty } from '../descriptions';
+import { getSessionId } from '../../../utils/helpers';
+
+export class MemoryXata implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Xata',
+		name: 'memoryXata',
+		icon: 'file:xata.svg',
+		group: ['transform'],
+		version: [1, 1.1, 1.2],
+		description: 'Use Xata Memory',
+		defaults: {
+			name: 'Xata',
+			// eslint-disable-next-line n8n-nodes-base/node-class-description-non-core-color-present
+			color: '#1321A7',
+		},
+		codex: {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Memory'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/sub-nodes/n8n-nodes-langchain.memoryxata/',
+					},
+				],
+			},
+		},
+		// 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.AiMemory],
+		outputNames: ['Memory'],
+		credentials: [
+			{
+				name: 'xataApi',
+				required: true,
+			},
+		],
+		properties: [
+			getConnectionHintNoticeField([NodeConnectionType.AiAgent]),
+			{
+				displayName: 'Session ID',
+				name: 'sessionId',
+				type: 'string',
+				required: true,
+				default: '',
+				displayOptions: {
+					show: {
+						'@version': [1],
+					},
+				},
+			},
+			{
+				displayName: 'Session ID',
+				name: 'sessionId',
+				type: 'string',
+				default: '={{ $json.sessionId }}',
+				description: 'The key to use to store the memory',
+				displayOptions: {
+					show: {
+						'@version': [1.1],
+					},
+				},
+			},
+			{
+				...sessionIdOption,
+				displayOptions: {
+					show: {
+						'@version': [{ _cnd: { gte: 1.2 } }],
+					},
+				},
+			},
+			sessionKeyProperty,
+		],
+	};
+
+	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
+		const credentials = await this.getCredentials('xataApi');
+		const nodeVersion = this.getNode().typeVersion;
+
+		let sessionId;
+
+		if (nodeVersion >= 1.2) {
+			sessionId = getSessionId(this, itemIndex);
+		} else {
+			sessionId = this.getNodeParameter('sessionId', itemIndex) as string;
+		}
+
+		const xataClient = new BaseClient({
+			apiKey: credentials.apiKey as string,
+			branch: (credentials.branch as string) || 'main',
+			databaseURL: credentials.databaseEndpoint as string,
+		});
+
+		const table = (credentials.databaseEndpoint as string).match(
+			/https:\/\/[^.]+\.[^.]+\.xata\.sh\/db\/([^\/:]+)/,
+		);
+
+		if (table === null) {
+			throw new NodeOperationError(
+				this.getNode(),
+				'It was not possible to extract the table from the Database Endpoint.',
+			);
+		}
+
+		const chatHistory = new XataChatMessageHistory({
+			table: table[1],
+			sessionId,
+			client: xataClient,
+			apiKey: credentials.apiKey as string,
+		});
+
+		const memory = new BufferMemory({
+			chatHistory,
+			memoryKey: 'chat_history',
+			returnMessages: true,
+			inputKey: 'input',
+			outputKey: 'output',
+		});
+
+		return {
+			response: logWrapper(memory, this),
+		};
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/memory/MemoryXata/xata.svg b/packages/@n8n/nodes-langchain/nodes/memory/MemoryXata/xata.svg
new file mode 100644
index 0000000000000..546596b3e46ac
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/memory/MemoryXata/xata.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="1600" height="1600" fill="none"><path fill="#7D7D87" d="M1250.12 576.498c-.11 89.997-36 176.267-99.79 239.83l-.01-.007-226.282 225.489c-7.841 7.82-20.58 7.84-27.927-.44-55.015-61.995-85.587-142.175-85.49-225.478.106-89.997 36-176.267 99.787-239.83l.007.007 206.745-206.014c18.63-18.569 49.12-18.702 64.92 2.324a339.1 339.1 0 0 1 68.04 204.119M440.552 817.702c-63.787-63.563-99.682-149.833-99.787-239.83-.087-74.03 24.048-145.594 68.035-204.119 15.803-21.026 46.294-20.893 64.928-2.324l206.741 206.016.006-.007c63.787 63.564 99.681 149.833 99.787 239.831.097 83.302-30.475 163.483-85.49 225.471-7.347 8.28-20.086 8.26-27.927.45L440.558 817.696zm701.268 403.488c-16.63 20.39-47.04 20.21-65.63 1.59l-127.698-127.84c-7.836-7.85-7.821-20.56.033-28.39l212.095-211.345c7.84-7.813 20.62-7.859 27.54.784 36.81 45.996 51.29 109.566 40.34 179.551-10.01 64.06-40.65 129.19-86.68 185.65m-627.124 2.97c-18.594 18.61-49.002 18.79-65.626-1.6-46.036-56.46-76.672-121.58-86.687-185.64-10.943-69.992 3.531-133.562 40.342-179.558 6.916-8.642 19.703-8.597 27.544-.784l212.092 211.352c7.854 7.82 7.868 20.54.033 28.38z"/></svg>
\ No newline at end of file
diff --git a/packages/@n8n/nodes-langchain/nodes/memory/MemoryZep/MemoryZep.node.ts b/packages/@n8n/nodes-langchain/nodes/memory/MemoryZep/MemoryZep.node.ts
new file mode 100644
index 0000000000000..c600e4432d700
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/memory/MemoryZep/MemoryZep.node.ts
@@ -0,0 +1,119 @@
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import {
+	NodeConnectionType,
+	type IExecuteFunctions,
+	type INodeType,
+	type INodeTypeDescription,
+	type SupplyData,
+} from 'n8n-workflow';
+import { ZepMemory } from '@langchain/community/memory/zep';
+import { logWrapper } from '../../../utils/logWrapper';
+import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+import { sessionIdOption, sessionKeyProperty } from '../descriptions';
+import { getSessionId } from '../../../utils/helpers';
+
+export class MemoryZep implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Zep',
+		name: 'memoryZep',
+		// eslint-disable-next-line n8n-nodes-base/node-class-description-icon-not-svg
+		icon: 'file:zep.png',
+		group: ['transform'],
+		version: [1, 1.1, 1.2],
+		description: 'Use Zep Memory',
+		defaults: {
+			name: 'Zep',
+		},
+		codex: {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Memory'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/sub-nodes/n8n-nodes-langchain.memoryzep/',
+					},
+				],
+			},
+		},
+		// 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.AiMemory],
+		outputNames: ['Memory'],
+		credentials: [
+			{
+				name: 'zepApi',
+				required: true,
+			},
+		],
+		properties: [
+			getConnectionHintNoticeField([NodeConnectionType.AiAgent]),
+			{
+				displayName: 'Session ID',
+				name: 'sessionId',
+				type: 'string',
+				required: true,
+				default: '',
+				displayOptions: {
+					show: {
+						'@version': [1],
+					},
+				},
+			},
+			{
+				displayName: 'Session ID',
+				name: 'sessionId',
+				type: 'string',
+				default: '={{ $json.sessionId }}',
+				description: 'The key to use to store the memory',
+				displayOptions: {
+					show: {
+						'@version': [1.1],
+					},
+				},
+			},
+			{
+				...sessionIdOption,
+				displayOptions: {
+					show: {
+						'@version': [{ _cnd: { gte: 1.2 } }],
+					},
+				},
+			},
+			sessionKeyProperty,
+		],
+	};
+
+	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
+		const credentials = (await this.getCredentials('zepApi')) as {
+			apiKey?: string;
+			apiUrl: string;
+		};
+
+		const nodeVersion = this.getNode().typeVersion;
+
+		let sessionId;
+
+		if (nodeVersion >= 1.2) {
+			sessionId = getSessionId(this, itemIndex);
+		} else {
+			sessionId = this.getNodeParameter('sessionId', itemIndex) as string;
+		}
+
+		const memory = new ZepMemory({
+			sessionId,
+			baseURL: credentials.apiUrl,
+			apiKey: credentials.apiKey,
+			memoryKey: 'chat_history',
+			returnMessages: true,
+			inputKey: 'input',
+			outputKey: 'output',
+		});
+
+		return {
+			response: logWrapper(memory, this),
+		};
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/memory/MemoryZep/zep.png b/packages/@n8n/nodes-langchain/nodes/memory/MemoryZep/zep.png
new file mode 100644
index 0000000000000..12d5d975ffdd5
Binary files /dev/null and b/packages/@n8n/nodes-langchain/nodes/memory/MemoryZep/zep.png differ
diff --git a/packages/@n8n/nodes-langchain/nodes/memory/descriptions.ts b/packages/@n8n/nodes-langchain/nodes/memory/descriptions.ts
new file mode 100644
index 0000000000000..5f722c4647828
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/memory/descriptions.ts
@@ -0,0 +1,35 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+export const sessionIdOption: INodeProperties = {
+	displayName: 'Session ID',
+	name: 'sessionIdType',
+	type: 'options',
+	options: [
+		{
+			// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+			name: 'Take from previous node automatically',
+			value: 'fromInput',
+			description: 'Looks for an input field called sessionId',
+		},
+		{
+			// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+			name: 'Define below',
+			value: 'customKey',
+			description: 'Use an expression to reference data in previous nodes or enter static text',
+		},
+	],
+	default: 'fromInput',
+};
+
+export const sessionKeyProperty: INodeProperties = {
+	displayName: 'Key',
+	name: 'sessionKey',
+	type: 'string',
+	default: '',
+	description: 'The key to use to store session ID in the memory',
+	displayOptions: {
+		show: {
+			sessionIdType: ['customKey'],
+		},
+	},
+};
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
new file mode 100644
index 0000000000000..97c86506b7f1d
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserAutofixing/OutputParserAutofixing.node.ts
@@ -0,0 +1,86 @@
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import {
+	NodeConnectionType,
+	type IExecuteFunctions,
+	type INodeType,
+	type INodeTypeDescription,
+	type SupplyData,
+} from 'n8n-workflow';
+import { OutputFixingParser } from 'langchain/output_parsers';
+import type { BaseOutputParser } from '@langchain/core/output_parsers';
+import type { BaseLanguageModel } from '@langchain/core/language_models/base';
+import { logWrapper } from '../../../utils/logWrapper';
+import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+
+export class OutputParserAutofixing implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Auto-fixing Output Parser',
+		name: 'outputParserAutofixing',
+		icon: 'fa:tools',
+		group: ['transform'],
+		version: 1,
+		description: 'Automatically fix the output if it is not in the correct format',
+		defaults: {
+			name: 'Auto-fixing Output Parser',
+		},
+
+		codex: {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Output Parsers'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/sub-nodes/n8n-nodes-langchain.outputparserautofixing/',
+					},
+				],
+			},
+		},
+		// eslint-disable-next-line n8n-nodes-base/node-class-description-inputs-wrong-regular-node
+		inputs: [
+			{
+				displayName: 'Model',
+				maxConnections: 1,
+				type: NodeConnectionType.AiLanguageModel,
+				required: true,
+			},
+			{
+				displayName: 'Output Parser',
+				maxConnections: 1,
+				required: true,
+				type: NodeConnectionType.AiOutputParser,
+			},
+		],
+		// eslint-disable-next-line n8n-nodes-base/node-class-description-outputs-wrong
+		outputs: [NodeConnectionType.AiOutputParser],
+		outputNames: ['Output Parser'],
+		properties: [
+			{
+				displayName:
+					'This node wraps another output parser. If the first one fails it calls an LLM to fix the format',
+				name: 'info',
+				type: 'notice',
+				default: '',
+			},
+			getConnectionHintNoticeField([NodeConnectionType.AiChain, NodeConnectionType.AiAgent]),
+		],
+	};
+
+	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
+		const model = (await this.getInputConnectionData(
+			NodeConnectionType.AiLanguageModel,
+			itemIndex,
+		)) as BaseLanguageModel;
+		const outputParser = (await this.getInputConnectionData(
+			NodeConnectionType.AiOutputParser,
+			itemIndex,
+		)) as BaseOutputParser;
+
+		const parser = OutputFixingParser.fromLLM(model, outputParser);
+
+		return {
+			response: logWrapper(parser, this),
+		};
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserItemList/ItemListOutputParser.ts b/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserItemList/ItemListOutputParser.ts
new file mode 100644
index 0000000000000..7e596a2b6859f
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserItemList/ItemListOutputParser.ts
@@ -0,0 +1,51 @@
+import { BaseOutputParser, OutputParserException } from '@langchain/core/output_parsers';
+
+export class ItemListOutputParser extends BaseOutputParser<string[]> {
+	lc_namespace = ['n8n-nodes-langchain', 'output_parsers', 'list_items'];
+
+	private numberOfItems: number | undefined;
+
+	private separator: string;
+
+	constructor(options: { numberOfItems?: number; separator?: string }) {
+		super();
+		if (options.numberOfItems && options.numberOfItems > 0) {
+			this.numberOfItems = options.numberOfItems;
+		}
+		this.separator = options.separator ?? '\\n';
+		if (this.separator === '\\n') {
+			this.separator = '\n';
+		}
+	}
+
+	async parse(text: string): Promise<string[]> {
+		const response = text
+			.split(this.separator)
+			.map((item) => item.trim())
+			.filter((item) => item);
+
+		if (this.numberOfItems && response.length < this.numberOfItems) {
+			// Only error if to few items got returned, if there are to many we can autofix it
+			throw new OutputParserException(
+				`Wrong number of items returned. Expected ${this.numberOfItems} items but got ${response.length} items instead.`,
+			);
+		}
+
+		return response.slice(0, this.numberOfItems);
+	}
+
+	getFormatInstructions(): string {
+		const instructions = `Your response should be a list of ${
+			this.numberOfItems ? this.numberOfItems + ' ' : ''
+		}items separated by`;
+
+		const numberOfExamples = this.numberOfItems ?? 3;
+
+		const examples: string[] = [];
+		for (let i = 1; i <= numberOfExamples; i++) {
+			examples.push(`item${i}`);
+		}
+
+		return `${instructions} "${this.separator}" (for example: "${examples.join(this.separator)}")`;
+	}
+}
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
new file mode 100644
index 0000000000000..24327b2970e2f
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserItemList/OutputParserItemList.node.ts
@@ -0,0 +1,95 @@
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import {
+	NodeConnectionType,
+	type IExecuteFunctions,
+	type INodeType,
+	type INodeTypeDescription,
+	type SupplyData,
+} from 'n8n-workflow';
+import { logWrapper } from '../../../utils/logWrapper';
+import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+import { ItemListOutputParser } from './ItemListOutputParser';
+
+export class OutputParserItemList implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Item List Output Parser',
+		name: 'outputParserItemList',
+		icon: 'fa:bars',
+		group: ['transform'],
+		version: 1,
+		description: 'Return the results as separate items',
+		defaults: {
+			name: 'Item List Output Parser',
+		},
+
+		codex: {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Output Parsers'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/sub-nodes/n8n-nodes-langchain.outputparseritemlist/',
+					},
+				],
+			},
+		},
+		// 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.AiOutputParser],
+		outputNames: ['Output Parser'],
+		properties: [
+			getConnectionHintNoticeField([NodeConnectionType.AiChain, NodeConnectionType.AiAgent]),
+			{
+				displayName: 'Options',
+				name: 'options',
+				type: 'collection',
+				placeholder: 'Add Option',
+				default: {},
+				options: [
+					{
+						displayName: 'Number Of Items',
+						name: 'numberOfItems',
+						type: 'number',
+						default: -1,
+						description:
+							'Defines how many items should be returned maximally. If set to -1, there is no limit.',
+					},
+					// For that to be easily possible the metadata would have to be returned and be able to be read.
+					// Would also be possible with a wrapper but that would be even more hacky and the output types
+					// would not be correct anymore.
+					// {
+					// 	displayName: 'Parse Output',
+					// 	name: 'parseOutput',
+					// 	type: 'boolean',
+					// 	default: true,
+					// 	description: 'Whether the output should be automatically be parsed or left RAW',
+					// },
+					{
+						displayName: 'Separator',
+						name: 'separator',
+						type: 'string',
+						default: '\\n',
+						description:
+							'Defines the separator that should be used to split the results into separate items. Defaults to a new line but can be changed depending on the data that should be returned.',
+					},
+				],
+			},
+		],
+	};
+
+	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
+		const options = this.getNodeParameter('options', itemIndex, {}) as {
+			numberOfItems?: number;
+			separator?: string;
+		};
+
+		const parser = new ItemListOutputParser(options);
+
+		return {
+			response: logWrapper(parser, this),
+		};
+	}
+}
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
new file mode 100644
index 0000000000000..e41cd75fcb1cc
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserStructured/OutputParserStructured.node.ts
@@ -0,0 +1,223 @@
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import {
+	jsonParse,
+	type IExecuteFunctions,
+	type INodeType,
+	type INodeTypeDescription,
+	type SupplyData,
+	NodeOperationError,
+	NodeConnectionType,
+} from 'n8n-workflow';
+import { z } from 'zod';
+import type { JSONSchema7 } from 'json-schema';
+import { StructuredOutputParser } from 'langchain/output_parsers';
+import { OutputParserException } from '@langchain/core/output_parsers';
+import get from 'lodash/get';
+import { getSandboxContext } from 'n8n-nodes-base/dist/nodes/Code/Sandbox';
+import { JavaScriptSandbox } from 'n8n-nodes-base/dist/nodes/Code/JavaScriptSandbox';
+import { makeResolverFromLegacyOptions } from '@n8n/vm2';
+import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+import { logWrapper } from '../../../utils/logWrapper';
+
+const STRUCTURED_OUTPUT_KEY = '__structured__output';
+const STRUCTURED_OUTPUT_OBJECT_KEY = '__structured__output__object';
+const STRUCTURED_OUTPUT_ARRAY_KEY = '__structured__output__array';
+
+export class N8nStructuredOutputParser<T extends z.ZodTypeAny> extends StructuredOutputParser<T> {
+	async parse(text: string): Promise<z.infer<T>> {
+		try {
+			const parsed = (await super.parse(text)) as object;
+
+			return (
+				get(parsed, [STRUCTURED_OUTPUT_KEY, STRUCTURED_OUTPUT_OBJECT_KEY]) ??
+				get(parsed, [STRUCTURED_OUTPUT_KEY, STRUCTURED_OUTPUT_ARRAY_KEY]) ??
+				get(parsed, STRUCTURED_OUTPUT_KEY) ??
+				parsed
+			);
+		} catch (e) {
+			// eslint-disable-next-line n8n-nodes-base/node-execute-block-wrong-error-thrown
+			throw new OutputParserException(`Failed to parse. Text: "${text}". Error: ${e}`, text);
+		}
+	}
+
+	static async fromZedJsonSchema(
+		sandboxedSchema: JavaScriptSandbox,
+		nodeVersion: number,
+	): Promise<StructuredOutputParser<z.ZodType<object, z.ZodTypeDef, object>>> {
+		const zodSchema = (await sandboxedSchema.runCode()) as z.ZodSchema<object>;
+
+		let returnSchema: z.ZodSchema<object>;
+		if (nodeVersion === 1) {
+			returnSchema = z.object({
+				[STRUCTURED_OUTPUT_KEY]: z
+					.object({
+						[STRUCTURED_OUTPUT_OBJECT_KEY]: zodSchema.optional(),
+						[STRUCTURED_OUTPUT_ARRAY_KEY]: z.array(zodSchema).optional(),
+					})
+					.describe(
+						`Wrapper around the output data. It can only contain ${STRUCTURED_OUTPUT_OBJECT_KEY} or ${STRUCTURED_OUTPUT_ARRAY_KEY} but never both.`,
+					)
+					.refine(
+						(data) => {
+							// Validate that one and only one of the properties exists
+							return (
+								Boolean(data[STRUCTURED_OUTPUT_OBJECT_KEY]) !==
+								Boolean(data[STRUCTURED_OUTPUT_ARRAY_KEY])
+							);
+						},
+						{
+							message:
+								'One and only one of __structured__output__object and __structured__output__array should be present.',
+							path: [STRUCTURED_OUTPUT_KEY],
+						},
+					),
+			});
+		} else {
+			returnSchema = z.object({
+				output: zodSchema.optional(),
+			});
+		}
+
+		return N8nStructuredOutputParser.fromZodSchema(returnSchema);
+	}
+}
+export class OutputParserStructured implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Structured Output Parser',
+		name: 'outputParserStructured',
+		icon: 'fa:code',
+		group: ['transform'],
+		version: [1, 1.1],
+		defaultVersion: 1.1,
+		description: 'Return data in a defined JSON format',
+		defaults: {
+			name: 'Structured Output Parser',
+		},
+
+		codex: {
+			alias: ['json', 'zod'],
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Output Parsers'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/sub-nodes/n8n-nodes-langchain.outputparserstructured/',
+					},
+				],
+			},
+		},
+		// 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.AiOutputParser],
+		outputNames: ['Output Parser'],
+		properties: [
+			getConnectionHintNoticeField([NodeConnectionType.AiChain, NodeConnectionType.AiAgent]),
+			{
+				displayName: 'JSON Schema',
+				name: 'jsonSchema',
+				type: 'json',
+				description: 'JSON Schema to structure and validate the output against',
+				default: `{
+  "type": "object",
+  "properties": {
+    "state": {
+      "type": "string"
+    },
+    "cities": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    }
+  }
+}`,
+				typeOptions: {
+					rows: 10,
+				},
+				required: true,
+			},
+			{
+				displayName:
+					'The schema has to be defined in the <a target="_blank" href="https://json-schema.org/">JSON Schema</a> format. Look at <a target="_blank" href="https://json-schema.org/learn/miscellaneous-examples.html">this</a> page for examples.',
+				name: 'notice',
+				type: 'notice',
+				default: '',
+			},
+		],
+	};
+
+	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
+		const schema = this.getNodeParameter('jsonSchema', itemIndex) as string;
+
+		let itemSchema: JSONSchema7;
+		try {
+			itemSchema = jsonParse<JSONSchema7>(schema);
+
+			// If the type is not defined, we assume it's an object
+			if (itemSchema.type === undefined) {
+				itemSchema = {
+					type: 'object',
+					properties: itemSchema.properties ?? (itemSchema as { [key: string]: JSONSchema7 }),
+				};
+			}
+		} catch (error) {
+			throw new NodeOperationError(this.getNode(), 'Error during parsing of JSON Schema.');
+		}
+
+		const vmResolver = makeResolverFromLegacyOptions({
+			external: {
+				modules: ['json-schema-to-zod', 'zod'],
+				transitive: false,
+			},
+			resolve(moduleName, parentDirname) {
+				if (moduleName === 'json-schema-to-zod') {
+					return require.resolve(
+						'@n8n/n8n-nodes-langchain/node_modules/json-schema-to-zod/dist/cjs/jsonSchemaToZod.js',
+						{
+							paths: [parentDirname],
+						},
+					);
+				}
+				if (moduleName === 'zod') {
+					return require.resolve('@n8n/n8n-nodes-langchain/node_modules/zod.cjs', {
+						paths: [parentDirname],
+					});
+				}
+				return;
+			},
+			builtin: [],
+		});
+		const context = getSandboxContext.call(this, itemIndex);
+		// Make sure to remove the description from root schema
+		const { description, ...restOfSchema } = itemSchema;
+		const sandboxedSchema = new JavaScriptSandbox(
+			context,
+			`
+				const { z } = require('zod');
+				const { parseSchema } = require('json-schema-to-zod');
+				const zodSchema = parseSchema(${JSON.stringify(restOfSchema)});
+				const itemSchema = new Function('z', 'return (' + zodSchema + ')')(z)
+				return itemSchema
+			`,
+			itemIndex,
+			this.helpers,
+			{ resolver: vmResolver },
+		);
+
+		const nodeVersion = this.getNode().typeVersion;
+		try {
+			const parser = await N8nStructuredOutputParser.fromZedJsonSchema(
+				sandboxedSchema,
+				nodeVersion,
+			);
+			return {
+				response: logWrapper(parser, this),
+			};
+		} catch (error) {
+			throw new NodeOperationError(this.getNode(), 'Error during parsing of JSON Schema.');
+		}
+	}
+}
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
new file mode 100644
index 0000000000000..6daac7ab9d139
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserStructured/test/OutputParserStructured.node.test.ts
@@ -0,0 +1,149 @@
+import type { IExecuteFunctions, IWorkflowDataProxyData } from 'n8n-workflow';
+import { mock } from 'jest-mock-extended';
+import { normalizeItems } from 'n8n-core';
+import type { z } from 'zod';
+import type { StructuredOutputParser } from 'langchain/output_parsers';
+import { OutputParserStructured } from '../OutputParserStructured.node';
+
+describe('OutputParserStructured', () => {
+	let outputParser: OutputParserStructured;
+	const thisArg = mock<IExecuteFunctions>({
+		helpers: { normalizeItems },
+	});
+	const workflowDataProxy = mock<IWorkflowDataProxyData>({ $input: mock() });
+	thisArg.getWorkflowDataProxy.mockReturnValue(workflowDataProxy);
+	thisArg.getNode.mockReturnValue({ typeVersion: 1.1 });
+	thisArg.addInputData.mockReturnValue({ index: 0 });
+	thisArg.addOutputData.mockReturnValue();
+
+	beforeEach(() => {
+		outputParser = new OutputParserStructured();
+	});
+
+	describe('supplyData', () => {
+		it('should parse a valid JSON schema', async () => {
+			const schema = `{
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "age": {
+            "type": "number"
+          }
+        },
+				"required": ["name", "age"]
+      }`;
+			thisArg.getNodeParameter.calledWith('jsonSchema', 0).mockReturnValueOnce(schema);
+			const { response } = (await outputParser.supplyData.call(thisArg, 0)) as {
+				response: StructuredOutputParser<z.ZodType<object, z.ZodTypeDef, object>>;
+			};
+			const outputObject = { output: { name: 'Mac', age: 27 } };
+			const parsersOutput = await response.parse(`Here's the output!
+				\`\`\`json
+				${JSON.stringify(outputObject)}
+				\`\`\`
+			`);
+
+			expect(parsersOutput).toEqual(outputObject);
+		});
+		it('should handle missing required properties', async () => {
+			const schema = `{
+				"type": "object",
+				"properties": {
+					"name": {
+						"type": "string"
+					},
+					"age": {
+						"type": "number"
+					}
+				},
+				"required": ["name", "age"]
+			}`;
+			thisArg.getNodeParameter.calledWith('jsonSchema', 0).mockReturnValueOnce(schema);
+			const { response } = (await outputParser.supplyData.call(thisArg, 0)) as {
+				response: StructuredOutputParser<z.ZodType<object, z.ZodTypeDef, object>>;
+			};
+			const outputObject = { output: { name: 'Mac' } };
+
+			await expect(
+				response.parse(`Here's the output!
+					\`\`\`json
+					${JSON.stringify(outputObject)}
+					\`\`\`
+				`),
+			).rejects.toThrow('Required');
+		});
+
+		it('should throw on wrong type', async () => {
+			const schema = `{
+				"type": "object",
+				"properties": {
+					"name": {
+						"type": "string"
+					},
+					"age": {
+						"type": "number"
+					}
+				},
+				"required": ["name", "age"]
+			}`;
+			thisArg.getNodeParameter.calledWith('jsonSchema', 0).mockReturnValueOnce(schema);
+			const { response } = (await outputParser.supplyData.call(thisArg, 0)) as {
+				response: StructuredOutputParser<z.ZodType<object, z.ZodTypeDef, object>>;
+			};
+			const outputObject = { output: { name: 'Mac', age: '27' } };
+
+			await expect(
+				response.parse(`Here's the output!
+					\`\`\`json
+					${JSON.stringify(outputObject)}
+					\`\`\`
+				`),
+			).rejects.toThrow('Expected number, received string');
+		});
+
+		it('should parse array output', async () => {
+			const schema = `{
+				"type": "object",
+				"properties": {
+					"myArr": {
+						"type": "array",
+						"items": {
+							"type": "object",
+							"properties": {
+								"name": {
+									"type": "string"
+								},
+								"age": {
+									"type": "number"
+								}
+							},
+							"required": ["name", "age"]
+						}
+					}
+				},
+				"required": ["myArr"]
+			}`;
+			thisArg.getNodeParameter.calledWith('jsonSchema', 0).mockReturnValueOnce(schema);
+			const { response } = (await outputParser.supplyData.call(thisArg, 0)) as {
+				response: StructuredOutputParser<z.ZodType<object, z.ZodTypeDef, object>>;
+			};
+			const outputObject = {
+				output: {
+					myArr: [
+						{ name: 'Mac', age: 27 },
+						{ name: 'Alice', age: 25 },
+					],
+				},
+			};
+			const parsersOutput = await response.parse(`Here's the output!
+				\`\`\`json
+				${JSON.stringify(outputObject)}
+				\`\`\`
+			`);
+
+			expect(parsersOutput).toEqual(outputObject);
+		});
+	});
+});
diff --git a/packages/@n8n/nodes-langchain/nodes/retrievers/RetrieverContextualCompression/RetrieverContextualCompression.node.ts b/packages/@n8n/nodes-langchain/nodes/retrievers/RetrieverContextualCompression/RetrieverContextualCompression.node.ts
new file mode 100644
index 0000000000000..2526ecb861e74
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/retrievers/RetrieverContextualCompression/RetrieverContextualCompression.node.ts
@@ -0,0 +1,90 @@
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import {
+	NodeConnectionType,
+	type IExecuteFunctions,
+	type INodeType,
+	type INodeTypeDescription,
+	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';
+
+export class RetrieverContextualCompression implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Contextual Compression Retriever',
+		name: 'retrieverContextualCompression',
+		icon: 'fa:box-open',
+		group: ['transform'],
+		version: 1,
+		description: 'Enhances document similarity search by contextual compression.',
+		defaults: {
+			name: 'Contextual Compression Retriever',
+		},
+		codex: {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Retrievers'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/sub-nodes/n8n-nodes-langchain.retrievercontextualcompression/',
+					},
+				],
+			},
+		},
+		// eslint-disable-next-line n8n-nodes-base/node-class-description-inputs-wrong-regular-node
+		inputs: [
+			{
+				displayName: 'Model',
+				maxConnections: 1,
+				type: NodeConnectionType.AiLanguageModel,
+				required: true,
+			},
+			{
+				displayName: 'Retriever',
+				maxConnections: 1,
+				type: NodeConnectionType.AiRetriever,
+				required: true,
+			},
+		],
+		outputs: [
+			{
+				displayName: 'Retriever',
+				maxConnections: 1,
+				type: NodeConnectionType.AiRetriever,
+			},
+		],
+		properties: [],
+	};
+
+	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
+		this.logger.verbose('Supplying data for Contextual Compression Retriever');
+
+		const model = (await this.getInputConnectionData(
+			NodeConnectionType.AiLanguageModel,
+			itemIndex,
+		)) as BaseLanguageModel;
+
+		const baseRetriever = (await this.getInputConnectionData(
+			NodeConnectionType.AiRetriever,
+			itemIndex,
+		)) as BaseRetriever;
+
+		const baseCompressor = LLMChainExtractor.fromLLM(model);
+
+		const retriever = new ContextualCompressionRetriever({
+			baseCompressor,
+			baseRetriever,
+		});
+
+		return {
+			response: logWrapper(retriever, this),
+		};
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/retrievers/RetrieverMultiQuery/RetrieverMultiQuery.node.ts b/packages/@n8n/nodes-langchain/nodes/retrievers/RetrieverMultiQuery/RetrieverMultiQuery.node.ts
new file mode 100644
index 0000000000000..d594c3a28588a
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/retrievers/RetrieverMultiQuery/RetrieverMultiQuery.node.ts
@@ -0,0 +1,112 @@
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import {
+	NodeConnectionType,
+	type IExecuteFunctions,
+	type INodeType,
+	type INodeTypeDescription,
+	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';
+
+export class RetrieverMultiQuery implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'MultiQuery Retriever',
+		name: 'retrieverMultiQuery',
+		icon: 'fa:box-open',
+		group: ['transform'],
+		version: 1,
+		description:
+			'Automates prompt tuning, generates diverse queries and expands document pool for enhanced retrieval.',
+		defaults: {
+			name: 'MultiQuery Retriever',
+		},
+		codex: {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Retrievers'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/sub-nodes/n8n-nodes-langchain.retrievermultiquery/',
+					},
+				],
+			},
+		},
+		// eslint-disable-next-line n8n-nodes-base/node-class-description-inputs-wrong-regular-node
+		inputs: [
+			{
+				displayName: 'Model',
+				maxConnections: 1,
+				type: NodeConnectionType.AiLanguageModel,
+				required: true,
+			},
+			{
+				displayName: 'Retriever',
+				maxConnections: 1,
+				type: NodeConnectionType.AiRetriever,
+				required: true,
+			},
+		],
+		outputs: [
+			{
+				displayName: 'Retriever',
+				maxConnections: 1,
+				type: NodeConnectionType.AiRetriever,
+			},
+		],
+		properties: [
+			{
+				displayName: 'Options',
+				name: 'options',
+				placeholder: 'Add Option',
+				description: 'Additional options to add',
+				type: 'collection',
+				default: {},
+				options: [
+					{
+						displayName: 'Query Count',
+						name: 'queryCount',
+						default: 3,
+						typeOptions: { minValue: 1 },
+						description: 'Number of different versions of the given question to generate',
+						type: 'number',
+					},
+				],
+			},
+		],
+	};
+
+	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
+		this.logger.verbose('Supplying data for MultiQuery Retriever');
+
+		const options = this.getNodeParameter('options', itemIndex, {}) as { queryCount?: number };
+
+		const model = (await this.getInputConnectionData(
+			NodeConnectionType.AiLanguageModel,
+			itemIndex,
+		)) as BaseLanguageModel;
+
+		const baseRetriever = (await this.getInputConnectionData(
+			NodeConnectionType.AiRetriever,
+			itemIndex,
+		)) as BaseRetriever;
+
+		// TODO: Add support for parserKey
+
+		const retriever = MultiQueryRetriever.fromLLM({
+			llm: model,
+			retriever: baseRetriever,
+			...options,
+		});
+
+		return {
+			response: logWrapper(retriever, this),
+		};
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/retrievers/RetrieverVectorStore/RetrieverVectorStore.node.ts b/packages/@n8n/nodes-langchain/nodes/retrievers/RetrieverVectorStore/RetrieverVectorStore.node.ts
new file mode 100644
index 0000000000000..9dd5dff58aa71
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/retrievers/RetrieverVectorStore/RetrieverVectorStore.node.ts
@@ -0,0 +1,74 @@
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import {
+	NodeConnectionType,
+	type IExecuteFunctions,
+	type INodeType,
+	type INodeTypeDescription,
+	type SupplyData,
+} from 'n8n-workflow';
+import type { VectorStore } from '@langchain/core/vectorstores';
+import { logWrapper } from '../../../utils/logWrapper';
+
+export class RetrieverVectorStore implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Vector Store Retriever',
+		name: 'retrieverVectorStore',
+		icon: 'fa:box-open',
+		group: ['transform'],
+		version: 1,
+		description: 'Use a Vector Store as Retriever',
+		defaults: {
+			name: 'Vector Store Retriever',
+		},
+		codex: {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Retrievers'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/sub-nodes/n8n-nodes-langchain.retrievervectorstore/',
+					},
+				],
+			},
+		},
+		// eslint-disable-next-line n8n-nodes-base/node-class-description-inputs-wrong-regular-node
+		inputs: [
+			{
+				displayName: 'Vector Store',
+				maxConnections: 1,
+				type: NodeConnectionType.AiVectorStore,
+				required: true,
+			},
+		],
+		// eslint-disable-next-line n8n-nodes-base/node-class-description-outputs-wrong
+		outputs: [NodeConnectionType.AiRetriever],
+		outputNames: ['Retriever'],
+		properties: [
+			{
+				displayName: 'Limit',
+				name: 'topK',
+				type: 'number',
+				default: 4,
+				description: 'The maximum number of results to return',
+			},
+		],
+	};
+
+	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
+		this.logger.verbose('Supplying data for Vector Store Retriever');
+
+		const topK = this.getNodeParameter('topK', itemIndex, 4) as number;
+		const vectorStore = (await this.getInputConnectionData(
+			NodeConnectionType.AiVectorStore,
+			itemIndex,
+		)) as VectorStore;
+
+		const retriever = vectorStore.asRetriever(topK);
+
+		return {
+			response: logWrapper(retriever, this),
+		};
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/retrievers/RetrieverWorkflow/RetrieverWorkflow.node.ts b/packages/@n8n/nodes-langchain/nodes/retrievers/RetrieverWorkflow/RetrieverWorkflow.node.ts
new file mode 100644
index 0000000000000..5b2d852178932
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/retrievers/RetrieverWorkflow/RetrieverWorkflow.node.ts
@@ -0,0 +1,399 @@
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
+import type {
+	IDataObject,
+	IExecuteWorkflowInfo,
+	INodeExecutionData,
+	IWorkflowBase,
+	IExecuteFunctions,
+	INodeType,
+	INodeTypeDescription,
+	SupplyData,
+} 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';
+
+function objectToString(obj: Record<string, string> | IDataObject, level = 0) {
+	let result = '';
+	for (const key in obj) {
+		const value = obj[key];
+		if (typeof value === 'object' && value !== null) {
+			result += `${'  '.repeat(level)}- "${key}":\n${objectToString(
+				value as IDataObject,
+				level + 1,
+			)}`;
+		} else {
+			result += `${'  '.repeat(level)}- "${key}": "${value}"\n`;
+		}
+	}
+	return result;
+}
+
+export class RetrieverWorkflow implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Workflow Retriever',
+		name: 'retrieverWorkflow',
+		icon: 'fa:box-open',
+		group: ['transform'],
+		version: 1,
+		description: 'Use an n8n Workflow as Retriever',
+		defaults: {
+			name: 'Workflow Retriever',
+		},
+		codex: {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Retrievers'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/sub-nodes/n8n-nodes-langchain.retrieverworkflow/',
+					},
+				],
+			},
+		},
+		inputs: [],
+		outputs: [
+			{
+				displayName: 'Retriever',
+				maxConnections: 1,
+				type: NodeConnectionType.AiRetriever,
+			},
+		],
+		properties: [
+			{
+				displayName:
+					'The workflow will receive "query" as input and the output of the last node will be returned and converted to Documents',
+				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: 'Parameter',
+						value: 'parameter',
+						description: 'Load the workflow from a parameter',
+					},
+				],
+				default: 'database',
+				description: 'Where to get the workflow to execute from',
+			},
+
+			// ----------------------------------
+			//         source:database
+			// ----------------------------------
+			{
+				displayName: 'Workflow ID',
+				name: 'workflowId',
+				type: 'string',
+				displayOptions: {
+					show: {
+						source: ['database'],
+					},
+				},
+				default: '',
+				required: true,
+				description: 'The workflow to execute',
+			},
+
+			// ----------------------------------
+			//         source:parameter
+			// ----------------------------------
+			{
+				displayName: 'Workflow JSON',
+				name: 'workflowJson',
+				type: 'json',
+				typeOptions: {
+					rows: 10,
+				},
+				displayOptions: {
+					show: {
+						source: ['parameter'],
+					},
+				},
+				default: '\n\n\n',
+				required: true,
+				description: 'The workflow JSON code to execute',
+			},
+
+			// ----------------------------------
+			//         For all
+			// ----------------------------------
+			{
+				displayName: 'Workflow Values',
+				name: 'fields',
+				placeholder: 'Add Value',
+				type: 'fixedCollection',
+				description: 'Set the values which should be made available in the workflow',
+				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,
+							},
+						],
+					},
+				],
+			},
+		],
+	};
+
+	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
+		class WorkflowRetriever extends BaseRetriever {
+			lc_namespace = ['n8n-nodes-langchain', 'retrievers', 'workflow'];
+
+			executeFunctions: IExecuteFunctions;
+
+			constructor(executeFunctions: IExecuteFunctions, fields: BaseRetrieverInput) {
+				super(fields);
+				this.executeFunctions = executeFunctions;
+			}
+
+			async _getRelevantDocuments(
+				query: string,
+				config?: CallbackManagerForRetrieverRun,
+			): Promise<Document[]> {
+				const source = this.executeFunctions.getNodeParameter('source', itemIndex) as string;
+
+				const baseMetadata: IDataObject = {
+					source: 'workflow',
+					workflowSource: source,
+				};
+
+				const workflowInfo: IExecuteWorkflowInfo = {};
+				if (source === 'database') {
+					// Read workflow from database
+					workflowInfo.id = this.executeFunctions.getNodeParameter(
+						'workflowId',
+						itemIndex,
+					) as string;
+					baseMetadata.workflowId = workflowInfo.id;
+				} else if (source === 'parameter') {
+					// Read workflow from parameter
+					const workflowJson = this.executeFunctions.getNodeParameter(
+						'workflowJson',
+						itemIndex,
+					) as string;
+					try {
+						workflowInfo.code = JSON.parse(workflowJson) as IWorkflowBase;
+					} catch (error) {
+						throw new NodeOperationError(
+							this.executeFunctions.getNode(),
+							`The provided workflow is not valid JSON: "${(error as Error).message}"`,
+							{
+								itemIndex,
+							},
+						);
+					}
+				}
+
+				const rawData: IDataObject = { query };
+
+				const workflowFieldsJson = this.executeFunctions.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.executeFunctions,
+					{ json: { query } },
+					itemIndex,
+					options,
+					rawData,
+					this.executeFunctions.getNode(),
+				);
+
+				const items = [newItem] as INodeExecutionData[];
+
+				let receivedItems: INodeExecutionData[][];
+				try {
+					receivedItems = (await this.executeFunctions.executeWorkflow(
+						workflowInfo,
+						items,
+						config?.getChild(),
+					)) as INodeExecutionData[][];
+				} 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.executeFunctions.getNode(), error as Error);
+				}
+
+				const returnData: Document[] = [];
+				for (const [index, itemData] of receivedItems[0].entries()) {
+					const pageContent = objectToString(itemData.json);
+					returnData.push(
+						new Document({
+							pageContent: `### ${index + 1}. Context data:\n${pageContent}`,
+							metadata: {
+								...baseMetadata,
+								itemIndex: index,
+							},
+						}),
+					);
+				}
+
+				return returnData;
+			}
+		}
+
+		const retriever = new WorkflowRetriever(this, {});
+
+		return {
+			response: logWrapper(retriever, this),
+		};
+	}
+}
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
new file mode 100644
index 0000000000000..8ff294b076717
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/text_splitters/TextSplitterCharacterTextSplitter/TextSplitterCharacterTextSplitter.node.ts
@@ -0,0 +1,86 @@
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import {
+	NodeConnectionType,
+	type IExecuteFunctions,
+	type INodeType,
+	type INodeTypeDescription,
+	type SupplyData,
+} from 'n8n-workflow';
+import type { CharacterTextSplitterParams } from 'langchain/text_splitter';
+import { CharacterTextSplitter } from 'langchain/text_splitter';
+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',
+		group: ['transform'],
+		version: 1,
+		description: 'Split text into chunks by characters',
+		defaults: {
+			name: 'Character Text Splitter',
+		},
+		codex: {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Text Splitters'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/sub-nodes/n8n-nodes-langchain.textsplittercharactertextsplitter/',
+					},
+				],
+			},
+		},
+		// 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.AiTextSplitter],
+		outputNames: ['Text Splitter'],
+		properties: [
+			getConnectionHintNoticeField([NodeConnectionType.AiDocument]),
+			{
+				displayName: 'Separator',
+				name: 'separator',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Chunk Size',
+				name: 'chunkSize',
+				type: 'number',
+				default: 1000,
+			},
+			{
+				displayName: 'Chunk Overlap',
+				name: 'chunkOverlap',
+				type: 'number',
+				default: 0,
+			},
+		],
+	};
+
+	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
+		this.logger.verbose('Supply Data for Text Splitter');
+
+		const separator = this.getNodeParameter('separator', itemIndex) as string;
+		const chunkSize = this.getNodeParameter('chunkSize', itemIndex) as number;
+		const chunkOverlap = this.getNodeParameter('chunkOverlap', itemIndex) as number;
+
+		const params: CharacterTextSplitterParams = {
+			separator,
+			chunkSize,
+			chunkOverlap,
+			keepSeparator: false,
+		};
+
+		const splitter = new CharacterTextSplitter(params);
+
+		return {
+			response: logWrapper(splitter, this),
+		};
+	}
+}
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
new file mode 100644
index 0000000000000..1807ad9f52996
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/text_splitters/TextSplitterRecursiveCharacterTextSplitter/TextSplitterRecursiveCharacterTextSplitter.node.ts
@@ -0,0 +1,126 @@
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import {
+	NodeConnectionType,
+	type IExecuteFunctions,
+	type INodeType,
+	type INodeTypeDescription,
+	type SupplyData,
+} from 'n8n-workflow';
+import type {
+	RecursiveCharacterTextSplitterParams,
+	SupportedTextSplitterLanguage,
+} from 'langchain/text_splitter';
+import { RecursiveCharacterTextSplitter } from 'langchain/text_splitter';
+import { logWrapper } from '../../../utils/logWrapper';
+import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+
+const supportedLanguages: SupportedTextSplitterLanguage[] = [
+	'cpp',
+	'go',
+	'java',
+	'js',
+	'php',
+	'proto',
+	'python',
+	'rst',
+	'ruby',
+	'rust',
+	'scala',
+	'swift',
+	'markdown',
+	'latex',
+	'html',
+];
+export class TextSplitterRecursiveCharacterTextSplitter implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Recursive Character Text Splitter',
+		name: 'textSplitterRecursiveCharacterTextSplitter',
+		icon: 'fa:grip-lines-vertical',
+		group: ['transform'],
+		version: 1,
+		description: 'Split text into chunks by characters recursively, recommended for most use cases',
+		defaults: {
+			name: 'Recursive Character Text Splitter',
+		},
+		codex: {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Text Splitters'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/sub-nodes/n8n-nodes-langchain.textsplitterrecursivecharactertextsplitter/',
+					},
+				],
+			},
+		},
+		// 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.AiTextSplitter],
+		outputNames: ['Text Splitter'],
+		properties: [
+			getConnectionHintNoticeField([NodeConnectionType.AiDocument]),
+			{
+				displayName: 'Chunk Size',
+				name: 'chunkSize',
+				type: 'number',
+				default: 1000,
+			},
+			{
+				displayName: 'Chunk Overlap',
+				name: 'chunkOverlap',
+				type: 'number',
+				default: 0,
+			},
+			{
+				displayName: 'Options',
+				name: 'options',
+				placeholder: 'Add Option',
+				description: 'Additional options to add',
+				type: 'collection',
+				default: {},
+				options: [
+					{
+						displayName: 'Split Code',
+						name: 'splitCode',
+						default: 'markdown',
+						type: 'options',
+						options: supportedLanguages.map((lang) => ({ name: lang, value: lang })),
+					},
+				],
+			},
+		],
+	};
+
+	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
+		this.logger.verbose('Supply Data for Text Splitter');
+
+		const chunkSize = this.getNodeParameter('chunkSize', itemIndex) as number;
+		const chunkOverlap = this.getNodeParameter('chunkOverlap', itemIndex) as number;
+		const splitCode = this.getNodeParameter(
+			'options.splitCode',
+			itemIndex,
+			null,
+		) as SupportedTextSplitterLanguage | null;
+		const params: RecursiveCharacterTextSplitterParams = {
+			// TODO: These are the default values, should we allow the user to change them?
+			separators: ['\n\n', '\n', ' ', ''],
+			chunkSize,
+			chunkOverlap,
+			keepSeparator: false,
+		};
+		let splitter: RecursiveCharacterTextSplitter;
+
+		if (splitCode && supportedLanguages.includes(splitCode)) {
+			splitter = RecursiveCharacterTextSplitter.fromLanguage(splitCode, params);
+		} else {
+			splitter = new RecursiveCharacterTextSplitter(params);
+		}
+
+		return {
+			response: logWrapper(splitter, this),
+		};
+	}
+}
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
new file mode 100644
index 0000000000000..fd1d8d1b0c34f
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/text_splitters/TextSplitterTokenSplitter/TextSplitterTokenSplitter.node.ts
@@ -0,0 +1,81 @@
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import {
+	NodeConnectionType,
+	type IExecuteFunctions,
+	type INodeType,
+	type INodeTypeDescription,
+	type SupplyData,
+} from 'n8n-workflow';
+import { TokenTextSplitter } from 'langchain/text_splitter';
+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',
+		group: ['transform'],
+		version: 1,
+		description: 'Split text into chunks by tokens',
+		defaults: {
+			name: 'Token Splitter',
+		},
+		codex: {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Text Splitters'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/sub-nodes/n8n-nodes-langchain.textsplittertokensplitter/',
+					},
+				],
+			},
+		},
+		// 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.AiTextSplitter],
+		outputNames: ['Text Splitter'],
+		properties: [
+			getConnectionHintNoticeField([NodeConnectionType.AiDocument]),
+			{
+				displayName: 'Chunk Size',
+				name: 'chunkSize',
+				type: 'number',
+				default: 1000,
+			},
+			{
+				displayName: 'Chunk Overlap',
+				name: 'chunkOverlap',
+				type: 'number',
+				default: 0,
+			},
+		],
+	};
+
+	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
+		this.logger.verbose('Supply Data for Text Splitter');
+
+		const chunkSize = this.getNodeParameter('chunkSize', itemIndex) as number;
+		const chunkOverlap = this.getNodeParameter('chunkOverlap', itemIndex) as number;
+
+		const splitter = new TokenTextSplitter({
+			chunkSize,
+			chunkOverlap,
+			allowedSpecial: 'all',
+			disallowedSpecial: 'all',
+			encodingName: 'cl100k_base',
+			keepSeparator: false,
+			// allowedSpecial: 'all',
+			// disallowedSpecial: 'all',
+			// encodingName: 'cl100k_base',
+		});
+
+		return {
+			response: logWrapper(splitter, this),
+		};
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolCalculator/ToolCalculator.node.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolCalculator/ToolCalculator.node.ts
new file mode 100644
index 0000000000000..5af816ba4f126
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolCalculator/ToolCalculator.node.ts
@@ -0,0 +1,50 @@
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import {
+	NodeConnectionType,
+	type IExecuteFunctions,
+	type INodeType,
+	type INodeTypeDescription,
+	type SupplyData,
+} from 'n8n-workflow';
+import { Calculator } from '@langchain/community/tools/calculator';
+import { logWrapper } from '../../../utils/logWrapper';
+import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+
+export class ToolCalculator implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Calculator',
+		name: 'toolCalculator',
+		icon: 'fa:calculator',
+		group: ['transform'],
+		version: 1,
+		description: 'Make it easier for AI agents to perform arithmetic',
+		defaults: {
+			name: 'Calculator',
+		},
+		codex: {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Tools'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/sub-nodes/n8n-nodes-langchain.toolcalculator/',
+					},
+				],
+			},
+		},
+		// 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])],
+	};
+
+	async supplyData(this: IExecuteFunctions): Promise<SupplyData> {
+		return {
+			response: logWrapper(new Calculator(), this),
+		};
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolCode/ToolCode.node.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolCode/ToolCode.node.ts
new file mode 100644
index 0000000000000..7691839672f2d
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolCode/ToolCode.node.ts
@@ -0,0 +1,236 @@
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import type {
+	IExecuteFunctions,
+	INodeType,
+	INodeTypeDescription,
+	SupplyData,
+	ExecutionError,
+} from 'n8n-workflow';
+import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
+import type { Sandbox } from 'n8n-nodes-base/dist/nodes/Code/Sandbox';
+import { getSandboxContext } from 'n8n-nodes-base/dist/nodes/Code/Sandbox';
+import { JavaScriptSandbox } from 'n8n-nodes-base/dist/nodes/Code/JavaScriptSandbox';
+import { PythonSandbox } from 'n8n-nodes-base/dist/nodes/Code/PythonSandbox';
+
+import { DynamicTool } from '@langchain/core/tools';
+import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+
+export class ToolCode implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Custom Code Tool',
+		name: 'toolCode',
+		icon: 'fa:code',
+		group: ['transform'],
+		version: [1, 1.1],
+		description: 'Write a tool in JS or Python',
+		defaults: {
+			name: 'Custom Code Tool',
+		},
+		codex: {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Tools'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/sub-nodes/n8n-nodes-langchain.toolcode/',
+					},
+				],
+			},
+		},
+		// 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 conversational agent with custom tool written in JavaScript <a href="/templates/1963" target="_blank">here</a>.',
+				name: 'noticeTemplateExample',
+				type: 'notice',
+				default: '',
+			},
+			{
+				displayName: 'Name',
+				name: 'name',
+				type: 'string',
+				default: '',
+				placeholder: 'My_Tool',
+				displayOptions: {
+					show: {
+						'@version': [1],
+					},
+				},
+			},
+			{
+				displayName: 'Name',
+				name: 'name',
+				type: 'string',
+				default: '',
+				placeholder: 'e.g. My_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: 'Language',
+				name: 'language',
+				type: 'options',
+				noDataExpression: true,
+				options: [
+					{
+						name: 'JavaScript',
+						value: 'javaScript',
+					},
+					{
+						name: 'Python (Beta)',
+						value: 'python',
+					},
+				],
+				default: 'javaScript',
+			},
+			{
+				displayName: 'JavaScript',
+				name: 'jsCode',
+				type: 'string',
+				displayOptions: {
+					show: {
+						language: ['javaScript'],
+					},
+				},
+				typeOptions: {
+					editor: 'jsEditor',
+				},
+				default:
+					'// Example: convert the incoming query to uppercase and return it\nreturn query.toUpperCase()',
+				// TODO: Add proper text here later
+				hint: 'You can access the input the tool receives via the input property "query". The returned value should be a single string.',
+				// eslint-disable-next-line n8n-nodes-base/node-param-description-missing-final-period
+				description: 'E.g. Converts any text to uppercase',
+				noDataExpression: true,
+			},
+			{
+				displayName: 'Python',
+				name: 'pythonCode',
+				type: 'string',
+				displayOptions: {
+					show: {
+						language: ['python'],
+					},
+				},
+				typeOptions: {
+					editor: 'codeNodeEditor', // TODO: create a separate `pythonEditor` component
+					editorLanguage: 'python',
+				},
+				default:
+					'# Example: convert the incoming query to uppercase and return it\nreturn query.upper()',
+				// TODO: Add proper text here later
+				hint: 'You can access the input the tool receives via the input property "query". The returned value should be a single string.',
+				// eslint-disable-next-line n8n-nodes-base/node-param-description-missing-final-period
+				description: 'E.g. Converts any text to uppercase',
+				noDataExpression: true,
+			},
+		],
+	};
+
+	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
+		const node = this.getNode();
+		const workflowMode = this.getMode();
+
+		const name = this.getNodeParameter('name', itemIndex) as string;
+		const description = this.getNodeParameter('description', itemIndex) as string;
+
+		const language = this.getNodeParameter('language', itemIndex) as string;
+		let code = '';
+		if (language === 'javaScript') {
+			code = this.getNodeParameter('jsCode', itemIndex) as string;
+		} else {
+			code = this.getNodeParameter('pythonCode', itemIndex) as string;
+		}
+
+		const getSandbox = (query: string, index = 0) => {
+			const context = getSandboxContext.call(this, index);
+			context.query = query;
+
+			let sandbox: Sandbox;
+			if (language === 'javaScript') {
+				sandbox = new JavaScriptSandbox(context, code, index, this.helpers);
+			} else {
+				sandbox = new PythonSandbox(context, code, index, this.helpers);
+			}
+
+			sandbox.on(
+				'output',
+				workflowMode === 'manual'
+					? this.sendMessageToUI.bind(this)
+					: (...args: unknown[]) =>
+							console.log(`[Workflow "${this.getWorkflow().id}"][Node "${node.name}"]`, ...args),
+			);
+			return sandbox;
+		};
+
+		const runFunction = async (query: string): Promise<string> => {
+			const sandbox = getSandbox(query, itemIndex);
+			return await (sandbox.runCode() as Promise<string>);
+		};
+
+		return {
+			response: new DynamicTool({
+				name,
+				description,
+
+				func: async (query: string): Promise<string> => {
+					const { index } = this.addInputData(NodeConnectionType.AiTool, [[{ json: { query } }]]);
+
+					let response: string = '';
+					let executionError: ExecutionError | undefined;
+					try {
+						response = await runFunction(query);
+					} catch (error: unknown) {
+						executionError = error as ExecutionError;
+						response = `There was an error: "${executionError.message}"`;
+					}
+
+					if (typeof response === 'number') {
+						response = (response as number).toString();
+					}
+
+					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}"`;
+					}
+
+					if (executionError) {
+						void this.addOutputData(NodeConnectionType.AiTool, index, executionError);
+					} else {
+						void this.addOutputData(NodeConnectionType.AiTool, index, [[{ json: { response } }]]);
+					}
+					return response;
+				},
+			}),
+		};
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolSerpApi/ToolSerpApi.node.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolSerpApi/ToolSerpApi.node.ts
new file mode 100644
index 0000000000000..9a474175473de
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolSerpApi/ToolSerpApi.node.ts
@@ -0,0 +1,124 @@
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import {
+	NodeConnectionType,
+	type IExecuteFunctions,
+	type INodeType,
+	type INodeTypeDescription,
+	type SupplyData,
+} from 'n8n-workflow';
+import { SerpAPI } from '@langchain/community/tools/serpapi';
+import { logWrapper } from '../../../utils/logWrapper';
+import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+
+export class ToolSerpApi implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'SerpApi (Google Search)',
+		name: 'toolSerpApi',
+		icon: 'file:serpApi.svg',
+		group: ['transform'],
+		version: 1,
+		description: 'Search in Google using SerpAPI',
+		defaults: {
+			name: 'SerpAPI',
+		},
+		codex: {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Tools'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/sub-nodes/n8n-nodes-langchain.toolserpapi/',
+					},
+				],
+			},
+		},
+		// 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'],
+		credentials: [
+			{
+				name: 'serpApi',
+				required: true,
+			},
+		],
+		properties: [
+			getConnectionHintNoticeField([NodeConnectionType.AiAgent]),
+			{
+				displayName: 'Options',
+				name: 'options',
+				type: 'collection',
+				placeholder: 'Add Option',
+				default: {},
+				options: [
+					{
+						displayName: 'Country',
+						name: 'gl',
+						type: 'string',
+						default: 'us',
+						description:
+							'Defines the country to use for search. Head to <a href="https://serpapi.com/google-countries">Google countries page</a> for a full list of supported countries.',
+					},
+					{
+						displayName: 'Device',
+						name: 'device',
+						type: 'options',
+						options: [
+							{
+								name: 'Desktop',
+								value: 'desktop',
+							},
+							{
+								name: 'Mobile',
+								value: 'mobile',
+							},
+							{
+								name: 'Tablet',
+								value: 'tablet',
+							},
+						],
+						default: 'desktop',
+						description: 'Device to use to get the results',
+					},
+					{
+						displayName: 'Explicit Array',
+						name: 'no_cache',
+						type: 'boolean',
+						default: false,
+						description:
+							'Whether to force SerpApi to fetch the Google results even if a cached version is already present. Cache expires after 1h. Cached searches are free, and are not counted towards your searches per month.',
+					},
+					{
+						displayName: 'Google Domain',
+						name: 'google_domain',
+						type: 'string',
+						default: 'google.com',
+						description:
+							'Defines the domain to use for search. Head to <a href="https://serpapi.com/google-domains">Google domains page</a> for a full list of supported domains.',
+					},
+					{
+						displayName: 'Language',
+						name: 'hl',
+						type: 'string',
+						default: 'en',
+						description:
+							'Defines the language to use. It\'s a two-letter language code. (e.g., `en` for English, `es` for Spanish, or `fr` for French). Head to <a href="https://serpapi.com/google-languages">Google languages page</a> for a full list of supported languages.',
+					},
+				],
+			},
+		],
+	};
+
+	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
+		const credentials = await this.getCredentials('serpApi');
+
+		const options = this.getNodeParameter('options', itemIndex) as object;
+
+		return {
+			response: logWrapper(new SerpAPI(credentials.apiKey as string, options), this),
+		};
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolSerpApi/serpApi.svg b/packages/@n8n/nodes-langchain/nodes/tools/ToolSerpApi/serpApi.svg
new file mode 100644
index 0000000000000..821aa27c8f94f
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolSerpApi/serpApi.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" viewBox="0 0 4680 1340"><path fill="#7D7D87" d="M4463 121v110h207V11h-207zM300.5 47.6c-2.7.2-12.2.8-21 1.4-68.2 4.6-123.8 18.1-161 39.2C60.6 121 31.8 174.2 24 263c-2.7 31.5-2.2 98.3 1.1 135C35 509.4 72.8 555.1 185 591.5c24 7.7 55.1 15.8 98.2 25.5 20 4.5 47.1 10.9 60.3 14.2 71.8 18 95 32.5 102.5 63.9 5.2 21.9 5.2 74.3.1 97.9-9 40.9-36.1 55.8-105.8 57.8-91.6 2.8-177-9.3-279.6-39.5-10.4-3-19.2-5.1-19.7-4.7-.9 1.1-36.3 165.4-35.7 166 1.3 1.3 34.4 14.3 49.7 19.5 59.9 20.5 123.2 33.3 197.5 40 19.2 1.7 92.1 2.3 117 1 133.6-7.2 210-36.4 253.1-96.8 34.3-48 46.8-117.2 42.5-235.3-2.3-62.8-7.5-92.1-21.6-121.5-27.5-57.2-89-90.1-235.5-126.1-92.8-22.8-104.9-26.1-123.3-33.4-25.7-10.3-37.5-22-42.7-42.5-3.7-14.5-5.2-55.9-2.9-79 4-39.9 20.1-56.3 61.9-63 33.7-5.4 114.6-3.6 184.5 4.1 27 3 74.5 9.7 110.9 15.7 16.3 2.7 26 3.9 26.2 3.2.6-1.9 21.5-179.8 21.1-180.1-.7-.8-40.5-8.5-63.6-12.3C531.7 58 489.4 53 433.5 48.9c-14.1-1-122.1-2.1-133-1.3m2699 14.6c-1 2.9-291.5 956.8-291.5 957.3 0 .3 50.5.4 112.2.3l112.3-.3 25.2-91c13.8-50.1 25.4-92 25.8-93.3l.5-2.2 160.8.2 160.7.3 25.5 92c14.1 50.6 25.8 92.6 26 93.3.4 1 23.4 1.2 112.6 1l112-.3-146.6-479-146.7-479-144.2-.3c-114.8-.2-144.3 0-144.6 1m199.3 390c29.8 109.6 54.2 199.6 54.2 200 0 .5-49.5.8-110.1.8-91.3 0-110-.2-109.6-1.3.3-.8 25.2-90.8 55.3-200 30.1-109.3 55.1-198.7 55.4-198.7s25 89.7 54.8 199.2M1062 304.6c-17.4.9-38.6 2.7-48.5 4-129.8 17.5-205.8 85.9-226.5 204.1-5.2 29.7-5.3 30.9-5.7 142.8-.5 110.1-.1 126.7 3.8 154.4 7.1 50.8 25 95.7 51.4 128.6 37.3 46.6 94.8 76.9 168.9 88.9 34.1 5.6 57.4 7 102.1 6.3 53.4-.9 98.5-5.9 153.5-17.2 39.2-8 97-24.6 97-27.7 0-1.2-28.9-150.6-29.6-152.9-.4-1.5-.9-1.5-5.2-.3-40.8 12.4-110.5 23.9-166.9 27.5-24.8 1.6-77.4.7-91.1-1.5-41-6.7-60.5-20.4-70.3-49.7-4.1-12.4-5.9-25.2-6.6-49.2l-.6-20.7H1366v-73.8c0-76.6-.9-109.4-3.6-133.5-12.2-110.7-60.5-178.8-149.6-210.8-22.5-8-53.6-14.6-82.8-17.3-15.5-1.5-55.7-2.7-68-2m39 163.4c21.7 2.7 35.6 8.6 47.1 20 16.3 16.3 21.2 33.3 21.3 74.5l.1 24h-181l-.3-15c-.8-41.2 6.3-64.7 24.6-81.7 11.3-10.4 25.3-17.1 42.3-20.2 14.6-2.7 32-3.3 45.9-1.6m1296.5-162.9c-39.3 2.7-85 14.6-130.7 34-17.8 7.6-44.4 21-58.1 29.2l-10.8 6.5-1.2-3.1c-.7-1.8-5.6-14.3-10.8-27.9l-9.4-24.8H2014v506.5c0 464.7.1 506.5 1.6 506.5.9 0 47-6.3 102.4-14 55.5-7.7 101.3-14 101.9-14 .8 0 1.1-42.4 1.1-144.8v-144.9l8.3 1.8c35.6 7.9 82 14 128.5 17 24.2 1.5 72.6.7 88.7-1.5 67.9-9.5 115.3-36.5 146.9-83.6 7.6-11.3 19.5-35.7 24.4-50 7.6-22.2 12.5-46.1 15.9-76.5 1.3-11.6 1.6-34.9 2-136 .5-123.9 0-151.4-3.2-177.5-10-82.2-41.6-139.7-94.7-172.6-28.8-17.9-62.8-27.7-105.3-30.4-16.5-1.1-19-1.1-35 .1M2364 485c19.9 1.9 32.4 6.8 43.1 16.8s16.6 22 19.4 39.5c2.2 13.7 2.2 242.2 0 255-4.8 27.3-17.9 44.5-40.4 52.7-12 4.4-21.5 5.4-46.1 4.7-22.5-.6-44.9-2.9-71-7.1-15.7-2.6-37.1-6.8-44.2-8.6l-3.8-1.1V539.2l4.3-3.7c6.6-5.7 26.2-18.6 37.8-24.8 30.2-16.2 57.7-24.4 88.4-26.6 1.1 0 6.7.4 12.5.9m1714.5-180.4c-59 3.5-134.4 28.3-193.7 63.7l-10.7 6.4-4.9-12.6c-2.7-6.9-7.5-19.5-10.7-27.9l-5.9-15.2H3690v506.5c0 468 .1 506.5 1.6 506.5.9 0 47.1-6.3 102.6-14s101.3-14 101.8-14c.6 0 1-53.3 1-144.8v-144.8l18.3 3.7c30.2 6.1 56.5 9.7 97.7 13.6 23.5 2.2 88.9 2.5 105 .5 31-3.9 59.5-12 82.9-23.9 19.2-9.6 30.9-18.1 46.1-33.3 29.2-29.2 47-65.1 57-115 7.4-37 8-51.3 8-191 0-138.9-.6-152.8-8-190-20.3-102-80.6-160.8-177-172.4-13-1.5-38.1-2.6-48.5-2M4041 485c12.6 1.2 19.8 3.2 29.7 8 15.3 7.5 25.2 20.8 30.6 41l2.2 8.5v253l-2.2 8.4c-6.2 23.1-20.2 39-40.1 45.5-13.1 4.3-19.7 4.9-44.2 4.3-22.2-.6-36.1-1.9-63.5-5.8-13.7-2-45.3-8-52.7-10l-3.8-1V539l5.8-4.5c32.7-26.1 78.8-46 114.5-49.4 11.6-1.2 13.1-1.2 23.7-.1M1879 307.6c-45.1 11.8-115.7 42.6-162.5 70.9-7.8 4.8-12.2 6.9-12.6 6.2-.3-.7-3.7-15.7-7.4-33.5l-6.8-32.2H1517v701h207V592.2l10.8-7c35.7-23.1 97.7-53.7 158.4-78.2 8.4-3.4 15.6-6.5 16-6.8.4-.4-3.1-43.7-7.8-96.2-4.6-52.5-8.4-96.3-8.4-97.3 0-2.3-2.4-2.2-14 .9m2584 361.9V1020h207V319h-207z"/></svg>
\ No newline at end of file
diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolWikipedia/ToolWikipedia.node.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolWikipedia/ToolWikipedia.node.ts
new file mode 100644
index 0000000000000..a85d18adaa4a6
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolWikipedia/ToolWikipedia.node.ts
@@ -0,0 +1,55 @@
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import {
+	NodeConnectionType,
+	type IExecuteFunctions,
+	type INodeType,
+	type INodeTypeDescription,
+	type SupplyData,
+} from 'n8n-workflow';
+import { WikipediaQueryRun } from '@langchain/community/tools/wikipedia_query_run';
+import { logWrapper } from '../../../utils/logWrapper';
+import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+
+export class ToolWikipedia implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Wikipedia',
+		name: 'toolWikipedia',
+		icon: 'file:wikipedia.svg',
+		group: ['transform'],
+		version: 1,
+		description: 'Search in Wikipedia',
+		defaults: {
+			name: 'Wikipedia',
+		},
+		codex: {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Tools'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/sub-nodes/n8n-nodes-langchain.toolwikipedia/',
+					},
+				],
+			},
+		},
+		// 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])],
+	};
+
+	async supplyData(this: IExecuteFunctions): Promise<SupplyData> {
+		const WikiTool = new WikipediaQueryRun();
+
+		WikiTool.description =
+			'A tool for interacting with and fetching data from the Wikipedia API. The input should always be a string query.';
+
+		return {
+			response: logWrapper(WikiTool, this),
+		};
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolWikipedia/wikipedia.svg b/packages/@n8n/nodes-langchain/nodes/tools/ToolWikipedia/wikipedia.svg
new file mode 100644
index 0000000000000..2ba1fda8d329f
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolWikipedia/wikipedia.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="200" height="200"><path fill="#fff" d="M63.607 74.503c-.996-.052-2.687-.084-2.9-1.889-.107-.907 3.614-4.249 2.68-5.58-.233-.332-.909-.69-2.504-1.143-1.904-.42-5.314-.146-11.204 1.977-.265.096.079-.032-.132.044-.229.081-.111.033-.264.088.182-.061-.266.112-1.055.396-.064.031-.11.058-1.054.352-1.293-4.653 2.193-13.24 5.141-13.533 1.2-.119 2.541 1.554 4.262.615 3.1-1.691 3.417-4.277 2.988-7.469-.327-2.43-2.838-.132-4.525.527-1.833.716-1.871 1.146-2.373.659-1.528-1.483-.681-4.84 5.316-11.468 2.105-2.326 3.053-5.638 3.164-6.766.127-1.299-4.059 2.34-4.482 1.45-.294-.62 3.356-4.171 5.229-5.141.869-.45.874.51 1.494.439.808-.092 5.868-4.71 5.536-5.448-.218-.483-3.872 1.626-4.042 1.099-.092-.285 3.779-2.241 3.779-2.241s-.021-.099 0-.176c-1.523.546-21.552 6.944-37.303 30.537C6.151 89.584 16.574 140.516 54.6 165.541s89.339 14.686 114.546-23.067c12.603-18.876 16.318-41.086 12.127-61.688-4.193-20.602-17.543-39.097-22.496-41.477.989.968 1.641 1.579 1.361 1.933-.162.206-1.373.438-2.504-.791-1.132-1.228-6.436-5.342-7.074-6.283-.64-.94-.518-1.26-.176-1.318s.908.137 1.143.264c.233.126-5.178-4.201-5.537-4.438-.357-.236-1.348-.638-1.537-.571-.332.117.862.941.658 1.143-.186.184-.742.08-1.186-.308-.223-.194-6.137-4.498-9.754-5.888-2.141.322-3.507.527-3.734.966-.326.629 4.822 2.7 5.096 3.208.288.532-.811 1.31-1.845 1.45-3.236.438-4.49-1.133-4.878-2.021-1.359-3.121-7.203-1.975-12.346 1.362-2.221 1.441-10.902 1.425-10.984.308-.158-2.147.639-3.563-4.614-2.68-3.693.62-4.682 1.931-4.35 2.197.615.495 3.137 1.382 3.339 2.197.137.554-3.165 3.657-12.259 3.032-.904 4.828-.866 5.897.044 7.381s2.371 2.057 3.208 1.846c1.93-.488 3.839-2.784 5.272-2.812 2.507-.052 4.208 2.361 4.086 5.624.013-.005.032.005.044 0-.003.114-.035.201-.044.308-.004.044.005.088 0 .132-.401 3.607-4.548 2.264-7.338 1.582-3.55-.869-3.575 11.03-.22 13.313-6.562-.697-14.868 2.424-19.245 4.35-3.61 1.588 3.413 4.926 2.197 6.063-1.427 1.335-4.397 2.606-6.678 3.164-1.283.311-4.358.531-5.315.481"/><radialGradient id="a" cx="191.784" cy="258.793" r="58.789" gradientTransform="matrix(0 2.1396 2.1792 0 -509.25 -338.216)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset=".235" stop-color="#fff"/><stop offset=".332" stop-color="#EAEAEA"/><stop offset=".677" stop-color="#C9C9C9"/><stop offset=".702" stop-color="#C9C9C9"/><stop offset=".887" stop-color="#919191"/><stop offset="1" stop-color="#636363"/></radialGradient><path fill="url(#a)" d="M63.608 74.503c-.996-.052-2.687-.084-2.9-1.889-.107-.907 3.614-4.249 2.68-5.58-.232-.332-.909-.69-2.504-1.143-1.904-.42-5.314-.146-11.204 1.977-.265.096.079-.032-.132.044-.229.081-.111.033-.264.088.182-.061-.265.112-1.055.396-.064.031-.109.058-1.054.352-1.293-4.653 2.193-13.24 5.141-13.533 1.2-.119 2.541 1.554 4.262.615 3.1-1.691 3.417-4.277 2.988-7.469-.327-2.43-2.838-.132-4.525.527-1.833.716-1.871 1.146-2.373.659-1.528-1.483-.681-4.84 5.316-11.468 2.105-2.326 3.053-5.638 3.164-6.766.127-1.299-4.059 2.341-4.482 1.45-.294-.621 3.356-4.171 5.229-5.141.869-.45.874.51 1.494.439.809-.092 5.869-4.71 5.536-5.448-.218-.483-3.872 1.626-4.042 1.099-.092-.285 3.779-2.241 3.779-2.241s-.021-.099 0-.176c-1.523.546-21.552 6.944-37.303 30.536-25.208 37.754-14.785 88.685 23.242 113.71s89.34 14.687 114.546-23.066c12.604-18.877 16.318-41.086 12.127-61.688S163.732 41.69 158.778 39.31c.99.968 1.642 1.579 1.361 1.933-.162.206-1.373.438-2.504-.791-1.131-1.228-6.435-5.342-7.074-6.283-.639-.94-.518-1.26-.176-1.318s.908.137 1.143.264-5.178-4.201-5.536-4.438-1.348-.638-1.538-.571c-.332.117.863.941.66 1.143-.187.184-.743.081-1.188-.308-.221-.194-6.137-4.498-9.754-5.888-2.141.322-3.506.527-3.734.966-.326.629 4.822 2.7 5.097 3.208.288.532-.812 1.31-1.845 1.45-3.236.438-4.49-1.133-4.877-2.021-1.361-3.122-7.204-1.976-12.348 1.362-2.22 1.441-10.902 1.425-10.984.308-.157-2.147.641-3.563-4.614-2.68-3.693.62-4.681 1.931-4.35 2.197.616.495 3.139 1.382 3.34 2.197.137.554-3.164 3.657-12.259 3.032-.904 4.828-.866 5.897.044 7.381s2.371 2.057 3.208 1.846c1.931-.488 3.839-2.783 5.272-2.812 2.507-.052 4.208 2.361 4.087 5.624.012-.005.031.005.043 0-.002.115-.035.201-.043.308-.004.044.004.088 0 .132-.4 3.607-4.549 2.264-7.338 1.582-3.55-.869-3.575 11.03-.22 13.313-6.562-.697-14.867 2.424-19.245 4.35-3.61 1.588 3.413 4.925 2.197 6.063-1.427 1.335-4.397 2.606-6.679 3.164-1.285.311-4.359.53-5.316.48"/><path fill="#5a5a5a" stroke="#5a5a5a" stroke-width=".141" d="M62.074 53.631c5.917.295 9.529-1.275 13.181-2.779-6.526-4.731 10.77-7.035 5.891-1.149 4.492.384 8.05-2.313 12.289-3.447 1.699-.455 5.111-.433 6.829-1.141-.091 4.183-4.501 2.734-7.404 2.024-3.55-.869-3.586 11.026-.231 13.309-6.562-.697-14.824 2.44-19.201 4.365-3.611 1.588 3.377 4.899 2.161 6.037-1.427 1.335-4.401 2.628-6.683 3.187-1.285.314-4.349.571-5.303.464s-.895-.784.829-2.853c1.242-1.491 1.875-2.633-.103-4.125-1.57-1.185-2.4-1.385-3.43-1.612-1.904-.42-5.327-.15-11.217 1.972 1.023-6.344 2.587-8.218 3.739-9.587 1.083-1.288 2.669-.521 4.794-.24 2.229.295 3.519-2.337 3.859-4.425z"/><path stroke="#000" stroke-width=".141" d="M68.744 21.292s-3.967 2.121-3.875 2.406c.17.527 3.813-1.546 4.031-1.063.333.738-4.723 5.345-5.531 5.438-.62.071-.6-.918-1.469-.469-1.872.97-5.514 4.536-5.219 5.156.423.891 4.596-2.736 4.469-1.438-.11 1.128-1.051 4.455-3.156 6.781-5.998 6.627-6.841 9.955-5.313 11.438.502.487 2.344-.625 2.344-.625 1.964-5.714 6.981-7.681 7.969-12.969.226-1.21.02-1.227-1.188-3.281 0 0 1.249-1.125 2.031-1.594.815-.489.777.511 1.594.25 1.734-.553 3.134-2.167 4.344-3.719s.365-1.848.406-2.375c.043-.54.403.071 0-.875s-1.437-3.061-1.437-3.061zm61.688 2.875c.027.809-.082 1.658.063 2.438.117.637 1.934 1.56 3.219 2.063 1.041-.08 2.131-.905 1.844-1.438-.276-.508-2.726-1.136-5.126-3.063zm-33.907 3.687c-.087.522.048 2.832.344 4.219 1.196-.563 3.137-1.478 3-2.031-.202-.815-2.875-1.551-3.344-2.188zm47.907.375c-.298.394-.4.569-.5.719.498.388 1.002.497 1.188.313.202-.202-.513-.726-.688-1.032zm5.968 4.594c-.342.059-.482.403.156 1.344.882-.995.145-.141.969-1.063-.234-.126-.783-.34-1.125-.281zm8.375 6.469c-1.17 1.157-.174.194-1.156 1.156 1.131 1.228 2.338.987 2.5.781.279-.354-.353-.969-1.344-1.937zm-62.625.187c-1.433.029-3.382 2.356-5.313 2.844-1.674.423-2.505-1.282-3.625-2.375.419 2.476 1.034 4.875 3.281 5.406 2.117.5 4.474-2.694 6.563-2.688 1.222.003 2.539 2.195 3.156 2.875.303-3.486-1.442-6.116-4.062-6.062zm-37.031 7.906c-.186 3.294.569 6.747-2.531 8.438-1.721.938-3.082-.744-4.281-.625-2.947.292-6.418 8.878-5.125 13.531 1.96-.61.101-.021 2.344-.813.755-4.095 1.773-8.013 4.281-10.125 1.299-1.096 4.68.959 6.219-.313 1.943-1.605 3.816-6.872-.907-10.093zM63.4 67.042c.958 1.326-2.426 4.321-2.688 5.563s1.042 1.785 2.344 1.781c-1.044-.685 1.705-2.743 2.375-4.625.284-.799-.212-1.507-2.031-2.719z"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width=".141" d="M32.412 113.827c-1.185.124-1.599 1.118-.879 2.899-2.435-.447-4.144-.953-6.195-2.021-.48 1.264 2.94 1.971 4.569 2.725.09.605.144 1.238.22 1.846-.195-.256-.443-.459-.703-.659-.714-.552-1.29-.924-1.933-.923-.386.001-.617-.044-.835.22-.707.854-.31 2.048.747 3.032s2.498 1.458 3.12.791c.015-.017.03-.027.044-.045.211.977.466 1.951.966 2.856.132.132.777.646.747.527-.78-3.861-1.039-4.785-1.274-7.382.288.072.703.216 1.582.352.398 2.361.119.838 1.23 6.415.533.548.883.929 1.406 1.493-.68-3.897-1.222-4.959-1.45-7.732.39.226.708.215 1.054.396-.003-.021.226-.542-.132-1.055-3.581-.706-3.483-5.145 2.988-.527.032.022 1.054-.438.22-1.011-2.323-1.592-4.307-2.321-5.492-2.197m-4.833 4.965c.362.026.963.272 1.362.615.646.555 1.289 1.3.791 1.714-.494.41-1.292-.223-1.889-.836s-.932-1.105-.527-1.449c.06-.053.142-.053.263-.044"/><path stroke="#000" stroke-width=".141" d="M31.279 138.551c2.245.87 3.332 3.609 3.798 4.205l2.302 1.248-1.851-3.752c.772-.086 6.449 2.748 8.879 5.448 1.968 2.188 2.914 4.53 1.476 6.102-.167.183-1.01.22-1.165-.319.596-.69.853-1.719.408-2.906-.445-1.186-1.411-2.67-2.122-3.26-1.477-1.227-3.42-2.387-5.599-3.216.885 2.069 2.06 4.501 3.54 6.911-1.352-1.131-1.916-2.512-2.774-3.524l-2.357-1.316c.228.331.855 1.528 1.227 2.265-.854-1.093-1.338-1.918-2.345-3.574-.447-.735-.79-1.477-1.366-2.206-.505-.64-1.174-1.19-1.331-1.247-.102-.039-.746.012-.72-.859z"/><path d="M172.113 85.299c-.967.927-1.264 2.099-.941 2.596.804 1.244 2.05-.029 2.58-.719.371-.481.592-1.152.541-1.706-.045-.494-.558-1.727-2.18-.171m4.866 2.596c-.088-.452-1.49-5.836-1.514-5.91a4 4 0 0 1-.055-.173c-.061-.218-.43-.188-.675-.234a3 3 0 0 0-.718-.048q-.348.021-.379-.092-.045-.163.271-.366.34-.215 1.068-.396.729-.181.787.122c.122.593.281.922.572 2.066l1.088 4.28c.111.439.352 1.723.44 2.377s-.042 1.053-.211 1.161c-.132.085-.477-1.778-.674-2.787m-.565-.766-2.438 2.766.28 1.094c.065.235.063.45.135.789q.109.508.156 1.225.05.717-.178.845-.108.01-.264-.35a4 4 0 0 1-.237-.723 5 5 0 0 0-.141-.533l-.398-1.786-1.257 1.033a5 5 0 0 0-.331.381q-.231.288-.38.382-.244.156-.995.232c-.751.076-.772.001-.813-.15q-.015-.05.029-.122.041-.07.088-.086a13 13 0 0 0 1.72-.944c.487-.309 1.177-.923 1.933-1.595.752-.67 1.371-1.322 1.892-1.811l1.032-1.146zm-4.014-2.833c.471-.279.98-.635 1.46-.524.479.11.898.697.952 1.254a3.25 3.25 0 0 1-.371 1.912c-.332.62-.799 1.247-1.33 1.68-1.371 1.115-2.192.694-2.592-.106-.396-.792.12-2.458.939-3.342q.028-.033.229-.228c.201-.195.21-.21.227-.24q.057-.111.036-.186c-.021-.075-.053-.094-.117-.133q-.097-.057-.111-.107l.011-.051a.3.3 0 0 1 .081-.066q.117-.074.341-.12c.224-.046.233-.013.252.055q.034.126-.044.383zm-68.439-52.791 1.01-.483.758 1.986 2.913-1.468c1.34 4.981.802 9.445-2.849 14.859-.476-.436-.757-.975-.988-1.327 4.097-6.718 3.788-7.722 3.077-12.109l-4.487 2.434-.013 3.498-1.188.863.049-4.853 2.404-1.341m9.778-.697 3.335 5.569-.86.628-2.921-4.698c-.256.55-1.045 1.997-1.826 2.821a1.1 1.1 0 0 0-.273-.257 1.5 1.5 0 0 0-.213-.236l-.408-.224c.787-1.313 1.144-1.729 1.729-3.041.514-1.15.944-1.882 1.032-3.555l1.019-.045c-.089 1.414-.426 2.161-.614 3.038"/><path fill="none" d="M68.489 20.802c-30.185 12.312-51.411 41.46-51.411 75.89 0 45.48 37.123 82.382 82.867 82.382s82.866-36.902 82.866-82.382c0-21.583-8.381-41.194-22.057-55.889-.944.973-2.523.854-4.744-1.538-1.664-1.792-8.016-7.024-5.141-6.283 2.34.604-5.632-5.603-6.226-4.856-.637.8-.178.256-.636.806-4.143-2.673-8.955-6.833-11.77-5.616-2.064.893-1.936.31-1.701 1.249.236.939 1.389 3.212 3.1 4.092-.036.003-.125.294-2.561-.078-2.87-.438-1.668-3.673-5.035-3.626-1.932.027-4.068-.089-5.577.911-4.81 3.187-8.321 2.968-13.231 3.148-3.752.138-.028-2.932-3.334-3.412-1.465-.214-4.625.04-6.143.931-1.193.702-1.676.047-.931 5.648-3.553 1.583-8.125.495-9.007 1.286-.751.674-1.661 7.343.823 10.7 3.15 4.257 6.264-2.86 9.239-1.122.895.522 2.204 2.139 1.845 2.417-1.58 1.221-2.623-.077-6.59.878-1.654.398-7.293 3.618-11.983 3.38.175-.259.494-.176.847-1.335.56-1.844-3.014-3.809-8.194.031-.395.292.766 1.616 1.319 2.45-2.042.533-5.433 3.064-13.149 2.726.464-3.383-2.749-6.471-3.56-6.399-1.137.101-2.325 1.274-3.6 1.895 1.542-2.774 1.806-3.543 2.713-4.587 2.836-3.266 4.478-4.803 5.559-8.992.108-.417.604-.193-1.271-2.734 3.548-3.262 2.242-.979 3.749-1.461 1.502-.481 4.676-4.711 4.046-5.947-.825-1.619.134-1.868-1.121-4.563"/><path fill="#5a5a5a" stroke="#5a5a5a" stroke-width=".141" d="M178.598 107.902c1.643-2.445-.746-2.914-.467-4.624.494-3.038 3.916-8.803 4.438-9.109-1.035-.245-2-11.437-1.542-12.192-.687.412-.175 7.76 1.028 12.192-2.416 3.692-4.18 8.092-4.252 9.062-.149 2.02 1.713 2.822.795 4.671z"/><path d="M55.229 31.184c.885-.853 1.984-1.952 1.941-1.988-.162-.14-1.229.233-1.59.37-1.958 1.721-3.576 3.544-5.273 5.383l-.773.12c2.392-2.53 4.829-5.06 7.95-7.578l.649-.114-2.068 1.756c.244-.063.629-.189.806-.226.159-.032.945-.258 1.191-.146.313.143-1.321 1.537-1.993 2.281zm3.74 50.565a.9.9 0 0 0-.359.131q-.299.202-.364.482a.58.58 0 0 0 .093.472.71.71 0 0 0 .528.304c.065.007.179-.001.321-.018.146-.02.237-.041.264-.038.188.022.255.172.195.431-.068.301-.266.549-.572.728s-.653.319-1.017.439l-.065.306c1.415-.264 2.248-.875 2.466-1.83.069-.304 0-.595-.179-.892s-.456-.48-.856-.527a1.6 1.6 0 0 0-.455.012m8.536-.472c-2.23.313-4.12 1.124-5.375 2.238-1.255 1.115-2.066 2.763-1.883 4.066.166 1.176.583 2.34 1.685 2.972s1.86.886 3.091.887l.047.721-1.447.257c-.629.088-1.099.064-1.408-.045-.309-.108-.703-.478-.861-.84l-.788.047.222 2.153 6.373-.895-.079-1.903c-2.085-.249-2.477-.819-3.127-1.34-.523-.419-1.091-1.432-1.214-2.311-.17-1.213.39-2.792 1.319-3.664.876-.822 1.749-1.219 3.391-1.582 1.04-.23 2.946-.326 4.025.244.475.25 1.708 1.213 1.901 2.591.296 2.107-.671 4.239-3.649 5.69l.09 1.794 6.978-1.007-.267-2.28-.649.015c-.146.29-.567.881-.746 1.15-.168.252-.411.44-1.132.542l-2.073.287-.024-.752c1.415-.502 2.567-1.248 3.313-2.137.745-.889 1.031-2.446.876-3.547-.19-1.357-1.035-2.365-2.53-3.042-1.498-.677-3.897-.612-6.059-.309m93.944-28.358c-.496.066-1.586.375-1.754.822-.118.316-.291.765.789 1.258.371.169 1.1-.34 1.711-.366 1.221-.052 2.189 2.046 1.615 3.61-.4 1.085-1.649 1.941-2.94 2.477-.895.372-1.572.294-2.188.143q-1.005-.246-1.477-1.384a6.2 6.2 0 0 1-.426-1.75c.002-.541.434-.634.66.592.255.613.722 1.231 1.273 1.361q.829.195 2.012-.296c.604-.25 1.283-.871 1.824-1.592.903-1.203.557-2.109-.044-2.299-.286-.09-1.134.487-1.762.425-1.143-.114-1.999-1.556-2.001-2.071-.002-.652.468-1.021.906-1.326.699-.484 1.922-1.061 1.802.396m2.795 6.933-.137 1.33-1.49-.141.242-1.248zm-2.012 1.318-.119 1.331-1.483-.126.104-1.325zm-96.08 54.973-.277.145c.939.642 1.555 1.14 1.811 1.516.256.375.547.396.92.043s.455-.633.219-.81-1.129-.478-2.673-.894m7.088-.134c.175.862.79 4.597 2.255 10.798l-1.609.047-.792-.302.891.854a13.4 13.4 0 0 1 2.207-.42l12.679-1.448-2.348-.881-1.47.916-2.177-9.57 1.071-.461-1.887-.646-1.298.787-5.57.639zm1.642.622 6.235-.697.545 2.972-6.073.703zm-5.067 1.408-.601.562-5.98.584.796.327c.549-.153 1.16-.251 1.843-.318l3.161-.327c-.698 1.203-1.566 2.261-2.606 3.163s-2.141 1.684-3.328 2.367l.285.125c1.674-.832 3.053-1.617 4.106-2.387.295 3.041.448 4.899.45 5.566l1.349-.604c-.123-.622-.32-2.233-.576-4.878 1.299.473 2.144.871 2.555 1.231s.736.417.961.146c.224-.273.283-.527.199-.753s-.817-.474-2.221-.736c.641-.497 1.307-1.015 2.007-1.551l.728-.202-1.628-.516c-.302.764-.807 1.51-1.491 2.211l-1.153-.174-.045-.561a59 59 0 0 0 1.752-2.271l.998-.398zm5.812 1.86 6.1-.706.635 3.04-6.183.69zm.616 3.312 6.232-.723.712 3.434-6.232.724zm58.86-27.985q.48-.149.888-.063t.49.347q.2.647-1.082 1.553-1.28.906-4.378 1.864-3.113.963-4.674.936c-1.561-.027-1.628-.243-1.761-.674q-.079-.254.201-.556.281-.301.791-.459.511-.158.933-.085.42.073 1.282.5 1.209.615 3.129.021 1.905-.59 2.57-1.783.454-.841.753-1.133.3-.296.858-.468m1.386 4.092c-.171-.547-.909-.302-2.011-.067l-.084-.269 6.609-2.317.082.269c-1.174.571-2.123 1.088-1.938 1.647l1.751 7.807c.082.219.89.061 2.086-.222l.083.269-6.488 2.455-.082-.269c1.322-.657 2.117-1.132 1.877-1.882l-1.324-6.236-8.182 10.198c.425.067 1.489-.018 2.287-.194l.082.27-7.271 2.209-.082-.27c1.531-.727 2.307-1.111 2.235-1.504l-1.731-7.873c-.054-.456-1.4-.392-2.521-.112l-.083-.269 7.73-2.429.083.269c-.82.394-2.871 1.131-2.659 1.831l1.458 6.608zm41.243 17.152c-.322.206-1.773 3.194-2.62 4.923l-1.312 1.454.086-3.426c-.559 1.03-1.526 1.255-1.662 1.103-.2-.225.041-1.359.59-2.082.421-.554 1.342-1.549 1.951-1.62.958-.112.147 2.568.246 3.804.795-1.842 1.741-3.536 2.863-5.248l.22-2.709c-.042-.51-.333-.746-.884-.481-.553.266-1.168.88-1.834 1.615-.911 1.005-2.25 2.491-2.743 3.888l-1.415 1.318c.217-2.534 4.01-6.493 6.432-8.529.545-.459 1.1-.283 1.264.363.166.65-.114 1.461-.086 2.986.828-.791.996-.787.871.221-.131 1.063-.949 2.568-1.625 3.592-.529.8-.501-.103-.342-1.172m-4.312 1.925c-.373.457-.561.673-.521 1.093.027.31.295.104.619-.188.331-.296.548-.658.533-1.078-.02-.519-.377-.137-.631.173m5.258-3.317c-.193.4-.273.944-.127 1.034.129.078.279-.296.434-.659.102-.237.318-.85.178-.986-.132-.126-.366.366-.485.611m-48.362-54.124q.025.084-.03.178a.26.26 0 0 1-.148.122q-.748.282-1.146.714-.397.431-.668 1.388l-2.384 9.559q-.018.127-.255.201a.4.4 0 0 1-.322-.024l-4.227-3.29-2.108 5.227a.4.4 0 0 1-.253.2q-.228.07-.334-.021l-7.621-6.474q-.714-.602-1.34-.736t-1.607.089a.25.25 0 0 1-.172-.013q-.091-.037-.113-.115-.061-.196.104-.247a27 27 0 0 1 1.456-.398q.713-.172 1.331-.361.627-.192 1.471-.495a35 35 0 0 1 1.572-.527q.166-.05.227.146.059.196-.044.228-.68.246-1.015.571t-.233.654q.051.168.294.37l6.268 5.248 1.469-3.851-3.238-2.527q-.872-.676-1.34-.805-.466-.129-1.277.057a.2.2 0 0 1-.156-.017.2.2 0 0 1-.109-.116q-.06-.197.084-.24.691-.212 1.279-.345.57-.128 1.197-.32a23 23 0 0 0 1.296-.442q.7-.26 1.388-.471.166-.05.226.146c.06.196.025.207-.043.228q-1.36.485-1.218.955.064.21.519.554l2.124 1.604.906-2.338q.187-.494.104-.767-.197-.645-1.59-.265-.124.037-.184-.159a.2.2 0 0 1 .021-.152q.042-.082.104-.101a22 22 0 0 1 1.229-.329q.704-.169 1.146-.305.32-.097.927-.321.768-.288 1.293-.449.123-.037.176.131.067.224-.158.293-.786.301-1.201.696-.413.395-.88 1.487l-1.217 3.092 3.813 2.895 1.636-7.369q.1-.406.013-.693-.21-.687-1.603-.307-.125.037-.185-.159c-.06-.196.002-.215.126-.253q.504-.154 1.207-.323.654-.154 1.084-.286.453-.138 1.039-.363.604-.23 1.099-.382.138-.047.191.123m14.871 79.16c-.021-3.786-.076-3.94-.208-6.634-4.428 1.7-11.522 4.574-12.641 4.791-1.17.228-2.635.102-2.391-.762.199-.708 1.609-2.193 2.875-2.657-.405.536-.694 1.016 0 1.063.892.061 4.592-1.49 6.398-2.082 1.789-.587 5.521-2.623 6.624-2.18 1.12.451.882 4.145.882 6.814.001.38.115.701-.063.971-.325.5-.958.557-1.476.676M83.363 153.66c.276.33 1.403.373 1.981.571s3.501.315 4.41.253c1.026-.07 2.216-.533 2.75-.904.459-.317.728-.688.699-1.102-.064-.938-2.606-1.73-4.619-2.158-1.843-.391-5.326-.01-7.9.089-3.184.122-5.569.262-8.387.286-.338.002-.784-.311-.782-.625.003-.475.675-.66.758-1.268.02-.144.039-.277-.045-.31-.05-.019-.517-.038-.749-.005-.179.027-.329.123-.895.146-.232.01-.668 0-.965-.128-.261-.112-1.051-.552.049-.737.39-.065 2.347-.352 3.133.311.803.676-.072 1.525-.072 1.525s2.511.003 3.801-.035c3.388-.103 11.173-.786 11.173-.786.527-.036 1.762-.397 2.083-.595.301-.184.521-.401.431-.582-.379-.76-.868-.73-1.895-.915 1.527-.323 3.148.054 3.233.956.1 1.063-1.098 1.646-2.437 2.178 1.419.221 3.218.806 4.082 1.311.865.506 1.439.916 1.482 1.541.044.635-.284 1.193-1.093 1.711-.922.582-2.147 1.006-4.222 1.096-1.713.073-4.599-.369-5.631-.815-.951.584-2.782 1.21-4.463 1.325-1.515.105-3.691-.14-4.405-.508-.909-.467-1.469-.793-1.509-1.376-.032-.46.099-.927.801-1.106a9 9 0 0 1 2.599-.225c1.57.104 3.349.793 2.332 1.661-.234.2-.641.144-1.171-.009 1.156-1.217-3.406-1.022-3.368-.462q.035.505.925.804c.604.21 2.759.347 3.629.287.929-.064 2.404-.471 2.964-.744s1.038-.295 1.293-.656m-12.06-5.578c.003-.104-.424-.121-.662-.117-.235.002-.641.053-.638.137s.386.188.62.185c.231-.004.677-.104.68-.205m72.451-107.988c-2.576-5.508-3.352-6.882.062-7.438-1.009-.527-1.292-.976-1.95-.798-1.506.406-3.648-1.188-4.617-1.593.963-.372 2.352-.729 2.998-.779.131-.011 1.447.511 1.611.486-.244-.546-2.668-2.069-3.053-1.98-2.09.484-5.148 1.357-6.493 1.711.439.938 4.979 1.489 7.333 2.714.02.792 1.092 6.117 4.109 7.677M30.719 81.217l-.655 1.561c.03.188.22 1.654-.372 2.778l2.04-.035c.033-.761.837-1.978-.776-2.733l.527-1.438 1.905-.044c-.813 1.311-1.208 3.487-1.196 4.201l.668-.015c-.734 2.094-1.008 3.223-1.198 6.109-1.803-1.697-5.234-1.79-5.656-1.562.078-1.116 1.066-3.005 1.232-3.294l-.386-.056.521-1.209 1.801.086c.275-.512.666-1.071.464-2.715-.808-.064-1.475-.137-1.734.017-.455.27-.824.772-.959 2.2-.13-1.377-.115-2.403.278-3.009.198-.315.53-.507.796-.76zm.768 6.261c-.531-.821-3.277-.788-3.59-.771-.445.381-.819 1.515-.958 2.004 1.738-.222 3.731 1.319 4.422 2.004-.028-.944.163-2.175.126-3.237m1.99-6.897c-.341.02-1.07-.662-1.8-1.364-.917-.884-2.663-1.534-3.31-.772-.165.194-.296.377-.285.78.005.168.142.37.382.466.185.073.448.122.804.141-.081.631-.131 1.063-.462 1.065-1.354.011-1.701-1.254-1.603-1.866.114-.706.277-.971.546-1.311.542-.686 1.161-.71 1.737-.744 1.49-.087 2.941 2.455 3.991 3.605m1.038-23.727 2.883-5.56 1.7-.429.723.568-1.982 3.961c-.197.393-.084.814.427.785.549-.031 1.382-.257 1.597-.714l1.535-3.268-.606-1.095 1.715-.82.357.399.567-.031-1.046.622-.37-.492-.702.327.588 1.049-1.503 3.212c-.433.924-2.276 1.376-2.882 1.093-.343-.161-.239-.776-.074-1.118l1.813-3.777-.334-.31-1.275.293-1.86 3.511c.315-.208 1.167-.469.621.52-.311.564-1.379 1.366-1.379 1.366zm.663-.546.427-.834c.53-.434.729-.36.512.028-.157.28-.581.73-.939.806"/><radialGradient id="b" cx="312.711" cy="279.838" r="71.078" gradientTransform="matrix(0 1.4984 1.3097 0 -325.355 -394.3)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#c8c8c8"/><stop offset="1" stop-color="#5a5a5a"/></radialGradient><path fill="url(#b)" d="M77.494 103.215c-2.028 1.587 2.352 2.819 3.201 4.322s-2.012 3.105-1.953 3.111c.084.008 3.224-1.896 2.423-3.332-.802-1.437-4.994-2.726-3.671-4.101m-8.953-81.949c.054-.034-.225.088-.47.181-.043.082-2.352 1.088-3.618 2.243-.049.267.91.869 3.364-.362-.39.584-2.729 3.042-4.269 3.979-.668.407-.498-.543-1.483-.109-1.501.662-5.509 3.605-5.788 5.896-.13 1.076 4.583-2.348 4.341-1.375-.303 1.218-2.265 6.316-5.824 8.826-3.203.584-3.383.554-5.571.977-2.851 0 5.469-4.724 1.592-4.919-4.885-.248-5.668 2.354-6.765 4.485 1.243-2.1 2.22-4.689 6.837-4.413 3.188.191-4.84 4.992-1.736 4.992 2.187-.422 2.512-.428 5.715-1.013 3.559-2.51 5.593-7.698 5.896-9.08.215-.979-4.582 2.482-4.413 1.411.315-2.002 4.293-5.039 5.788-5.715.84-.38.706.624 1.375.217 1.539-.938 4.187-3.629 4.63-4.413-2.455 1.231-3.558.882-3.509.615 1.207-1.099 3.655-2.261 3.908-2.423M44.052 41.089c-.93 1.571-2 2.893-4.847 2.496 2.204-2.627 5.171-5.665 7.053-8.066-1.229.907-1.248.739-.687.108-.841.881-1.075 1.26.29.253-2.334 2.546-4.596 5.186-6.801 7.813 3.155.402 4.154-.976 4.992-2.604m23.874-19.606c-.254.074-.914.309-2.134.724-3.053 1.557-5.918 3.347-9.043 4.811-2.239 2.002-3.58 2.777-5.317 4.377.327-.725-.049-.632-.76-.181.606-.337.923-.322.615.362 1.737-1.6 3.295-2.483 5.534-4.485 3.125-1.464 5.99-3.253 9.043-4.811 1.181-.453 1.667-.649 2.062-.797m67.463 2.207c2.404 1.303 5.304 3.555 8.139 5.1-1.575-1.052-4.251-3.199-8.139-5.1m-9.912 1.193c-.72-.009-1.619.098-2.748.29 7.445-1.014 2.031 5.433 11.611 3.545-7.402.561-3.821-3.77-8.863-3.835m-23.151.616c-2.165.145-4.655.908-5.499 1.664 1.236-.892 5.512-1.783 7.235-1.157 1.526.554-1.095 1.55 1.303 2.966.963.569 4.533.586 7.668.036-3.114.393-6.455-.039-7.162-.289-1.191-.423.341-2.564-1.121-3.039-.641-.209-1.508-.243-2.424-.181m15.519 1.735c-.339 1.23 4.522 7.381 8.066 7.488 1.062.032 1.511-1.123 2.243-1.845.73-.722 1.208-1.187 1.627-1.266.33-.062-.853-.532-1.627.036-.775.568-1.486 2.012-2.135 2.17-2.312.565-6.901-5.639-8.174-6.583m-21.306.29c-.027.08-.043.142 0 .217a.33.33 0 0 1 0-.217m47.929.651c-.026.066.38.325.614.615a1.5 1.5 0 0 0-.434-.542c.669-.141 5.195 3.424 5.787 3.943.973.85-1.005.038-.904.759.169 1.201 3.906 4.468 7.055 7.488-1.639.561-3.689 2.572-3.689 3.798-.002 2.127 3.106 2.963 4.123 4.305.963 1.271-.629 1.993-4.305 3.038 2.041.879 6.205-.382 5.426-2.785-.858-2.647-3.676-2.053-4.232-4.449-.209-.906 2.84-3.209 3.365-3.4 3.467 2.575 8.484 8.187 8.102 9.441-.129.423-1.67-1.107-2.496-.651-1.443.796 3.868 8.895 5.535 9.622.604.264 1.005-3.973.506-3.979-.998-.012-.082 3.27-.688 2.966-.641-.322-4.768-5.611-4.666-7.524.037-.678 2.621.829 2.568-.109-.084-1.533-4.953-7.069-8.935-10.454-5.745-5.455-7.446-6.85-7.126-7.307.347-.441 1.736.407 1.447.036-.676-.864-5.262-4.405-6.547-4.738-.355-.092-.494-.107-.506-.073m.614.615c.105.225.115.411.072.542q.02-.016.037-.036c.112-.157.025-.341-.109-.506m.072.543a.38.38 0 0 1-.324.108c.033.016.074.021.107.036.12.054.177-.018.217-.144m-1.482-.471c.465.303.861.539 1.121.579-.377-.173-.741-.375-1.121-.579m-13.781 3.256c2.166 1.255 4.93 3.773 5.533 5.571.49 1.455-1.178.923-3.255.94 1.995.787 4.593.999 4.341-.796-.319-2.271-4.067-5.724-6.619-5.715m-33.787.47c-2.837.93-5.365.375-8.464.579-.007.099-.023.281-.036.398 2.75-.181 5.39.215 8.5-.977m-8.536 1.23c-.262 1.799-.612 3.609-.543 4.883.013-1.362.375-3.521.543-4.883M49.84 36.856c-1.354.08-3.264.792-3.654 1.592-1.667 3.415-4.08 6.605-7.343 5.57-2.05 1.734-6.248 7.07-6.186 9.478.014.545 2.438-2.649 2.641-2.098.334.907-.757 3.131-1.7 4.666-.808 1.315-1.819 3.047-2.966 3.762-.22.137-.502-1.894-.832-1.447-2.301 3.12-4.967 7.872-4.883 10.924.048 1.735 3.179 2.937 5.317 0 .749-1.028-.086-4.456.832-5.39.55-.559 1.587-1.288 2.858-1.519 1.235-.225 3.994.257 3.798 1.519-.361 2.328-3.612 4.042-2.387 5.245 2.018 1.982 8.366 1.521 11.431-.253-1.458-4.743 1.85-12.94 5.281-13.999 1.186-.366 2.264 1.17 3.762.76 2.756-.756 3.394-3.46 3.437-5.137.04-1.589.433-3.546-.94-3.219-1.76.419-4.75 3.738-6.113 2.459-2.215-2.077 1.09-5.888 2.604-8.681-1.512.011-6.168 1.422-7.054.651-.004 1.388 4.772-.168 6.438-.181-1.514 2.793-4.47 6.328-2.387 8.537 1.065 1.129 4.281-1.643 6.041-2.062 1.374-.327.98 1.233.94 2.822-.042 1.676-.355 3.729-3.111 4.485-1.498.411-2.432-1.306-3.618-.94-3.431 1.059-7.425 9.544-5.968 14.288-3.064 1.775-8.183 1.672-10.201.362-1.439-.935 1.882-3.026 2.243-5.354.196-1.262-2.744-1.853-3.979-1.628-1.27.231-2.814 1.141-3.364 1.7-.918.934-.01 4.451-.868 5.39-2.139 2.34-4.655 1.808-4.703.072-.083-3.053 2.519-7.379 4.521-10.201.322-.453.612 1.403.832 1.266 1.146-.715 2.291-2.647 3.183-3.907 1.027-1.451 2.365-4.586 1.917-5.606-.236-.538-2.847 2.663-2.713 2.134.61-2.407 3.991-6.802 6.041-8.537 3.263 1.034 5.675-2.191 7.343-5.606.446-.914 2.875-1.68 4.196-1.556.213.02.335.056.434.108.089-.233-.048-.384-.579-.434-.164-.014-.348-.046-.541-.035m1.121.471c-.286.749-2.991 2.324-3.364 3.943a.45.45 0 0 0 .145.47c0-.051-.014-.085 0-.145.443-1.921 4.153-3.776 3.219-4.268m79.834.47c-.938-.031-1.498.952-1.483 1.954.024 1.589 3.729 9.086 6.692 10.092-4.939 3.132-6.051 2.256-13.313 3.4 4.711-.299 10.92.659 15.121-3.689-3.732-1.789-6.012-5.936-7.162-9.767-.431-1.431.34-1.281 1.193-1.592-.387-.272-.736-.387-1.048-.398m-43.77 1.158c.016.379.062.664.181.796.042.046.068.064.108.108-.082-.142-.169-.283-.217-.47a4 4 0 0 1-.072-.434m8.537.072c-.162-.004-.326 0-.47.036-2.375.6-4.09 2.99-5.751 2.894-.71-.7-1.081-1.056-1.411-1.375 1.374 1.559 1.747 1.972 3.111 1.519 2.052-.682 3.43-2.814 5.788-2.713.138.006.268.029.398.072-.532-.24-1.111-.418-1.665-.433m-57.949 4.485-.036.072.76.29c-1.339 1.493-6.04 5.94-6.077 9.477-.003.317.09.498.217.615.246.227.793-.275 2.062-1.592.025-.026.308-.342.326-.036.058 1.002-2.955 5.445-3.653 6.258-.379.44-.449.425-.579.072-.308-.834-.411-1.236-.579-1.193-.333.084-2.649 3.16-4.341 6.909-.535 1.185-1.052 2.583-1.375 3.871-.255-.204-.857-.713-1.121-.796l-.073.253c.417.179.788.383 1.302 1.121.573-3.425 3.389-8.872 5.535-11.105.297-.309.621 1.755.94 1.411 1.704-1.833 4.16-5.951 4.087-6.909-.067-.881-1.768 1.552-2.315 1.628-.09.012-.311-.085-.326-.253-.251-2.781 3.276-6.785 6.149-9.73zm108.916 1.628c-4.121-.088-9.361 3.242-8.754 3.871.852.879 5.472-4.281 11.358-3.184-.744-.456-1.653-.666-2.604-.687m.579.977c5.247.816-.491 7.374 6.981 6.33-6.168-.501-.343-6.634-6.981-6.33m-30.674.759c-6.236.206-12.337 3.048-10.418 5.498.938 1.197 5.089 2.422 4.16 3.689-2.068 2.825-7.201 3.125-16.35 4.088 13.663-.297 14.62-1.092 17.653-3.871 2.068-1.898-3.398-2.918-4.232-4.847-.904-2.093 7.317-4.779 13.203-4.269a18 18 0 0 0-2.785-.289 23 23 0 0 0-1.231.001m1.519.76c-.285-.003-.57.019-.868.037-1.427.084-2.951.4-4.052.94 2.82-.399 5.203-1.021 6.439.145.633.597-.834 2.583-.651 3.726.355 2.219 1.403 1.836 11.395 1.266-9.059-.292-11.337 1.105-9.151-4.377.453-1.138-1.121-1.71-3.112-1.737m20.257 2.713a.22.22 0 0 0-.181.072c-.768.917 5.346 4.902 5.209 9.115-.055 1.654.021 1.795-2.605 1.556 2.179.691 3.982.96 4.016-1.411.056-3.984-5.255-9.304-6.439-9.332m31.289 6.005c1.947 3.006 3.429 4.58 5.064 9.188-2.471 1.797-4.827 4.893-4.63 7.56.15 2.029 2.752 3.106 2.676 4.377-.098 1.675-2.818 4.156-4.629 4.63 2.647 1.741 5.885-3.094 5.859-5.317-.013-1.104-2.105-1.549-2.641-3.689-.603-2.408 3.231-6.241 3.581-6.547 1.46 1.271 3.589 14.961 4.991 8.898-1.504 4.053-2.781-5.797-4.521-9.115.803-.478.434-.326 1.158-.977-.11-.251.01-.482-.361-.868-.885.674-.635.398-1.122.868-1.131-3.8-3.014-7.045-5.425-9.008m-59.974 2.423c-7.551 1.948-9.676 1.857-14.687 2.134 5.144.752 8.984-.315 14.687-2.134m-18.629 1.7c-.484.004-1.152.034-2.062.073 2.2.022 2.948.751 2.966.723 2.439 2.163 4.006 5.933 3.871 9.116-.12 2.808-1.073 4.556-5.535 3.328-4.291-1.181-9.327.402-8.428 5.426.606 3.386.743 7.865 6.765 7.416-3.716.046-5.92-4.444-5.643-8.284.375-5.255 5.18-4.869 9.115-3.942 2.137.502 4.115.755 5.245-4.015.429-1.806-.977-5.753-4.557-9.767-.381-.001-.286-.087-1.737-.074m47.603.398c-.392-.01-.74.014-1.085.036-2.068.136-3.261.953-3.364 2.568-.23 3.659 2.892 10.07 7.38 8.935-4.474-2.009-5.973-5.527-5.788-9.333.079-1.626 1.747-2.031 4.124-2.098a14 14 0 0 0-1.267-.108m-49.81.109c-5.286.119-13.002 3.445-15.482 4.702-1.176.597 3.975 3.859 2.966 5.281-2.797 3.945-11.212 4.626-14.976 3.617-3.972-1.065 3.491-6.34 1.338-7.668-2.733-1.688-8.548-.332-14.831 2.351.684 5.737.947 6.656-.326 10.563-.451 1.383-2.113 4.909-5.932 1.953-2.036-1.575-3.839.117-4.269 3.22-.591 4.268.253 8.449 4.087 5.1 1.522-1.33 3.909-.67 4.341.579 1.818 5.261 3.292 8.867.832 13.493 12.313-3.321 17.079-1.232 18.846-.543 2.376.927.17 3.237-1.772 5.896 2.865-2.979 4.292-5.059 2.17-6.403-3.796-2.406-12.763-1.166-18.412.362 1.935-4.125-.049-9.876-1.338-12.914-.75-1.767-3.477-2.388-4.883-.94-4.109 4.229-3.578-2.322-3.184-5.064.248-1.723 1.373-3.691 3.328-2.315 2.084 1.466 4.097 2.917 6.547-1.809 1.751-3.378 1.57-7.315.796-11.141 6.221-2.442 10.667-3.64 13.528-1.772 1.283.838-4.616 4.79-2.604 6.692 2.162 2.044 13.463 1.377 16.748-2.568 2.125-2.552-4.363-5.094-2.46-6.041 3.688-1.834 11.109-4.653 17.038-4.449a9.5 9.5 0 0 0-2.096-.182m50.461.904a6.6 6.6 0 0 0-1.303.145c2.01.683 2.83.823 5.209.398-1.47-.251-2.634-.56-3.906-.543M34.466 62.901c-1.061.008-2.157.257-2.785.832-1.16 1.06-.28 4.173-1.23 5.86-1.341 2.381-4.083 2.792-6.077.651-.68 4.03-2.409 12.244-3.689 11.901.032.021.038.095.072.109 1.27.519 3.155-7.222 3.834-11.214 1.971 2.099 5.185.67 6.511-1.664.94-1.653-.346-4.716 1.013-5.462 1.561-.857 5.619-.751 4.521.579-1.084 1.313-3.057 3.416-2.207 5.317.986 2.205 8.37 2.395 12.19.181.304 4.426.628 9.765-2.17 11.575-1.391.899-2.968-1.812-4.702-1.881-3.775-.154-5.975 10.998-1.375 12.914 1.603.667 2.486-1.776 5.172-2.207 1.443-.231 3.283 10.275 1.7 12.66-2.511 3.784-12.105 1.178-13.818-.795-.884-1.019 2.785-3.605 1.7-5.245-1.843-2.785-7.081-3.773-8.682-2.207-1.985 1.943 1.527 6.029-.036 7.306-1.021.835-3.382-.537-4.268-2.423.183-3.738.994-16.184-.832-12.914-.013-1.39-.044-2.365.036-3.256-.12 1.165-.157 2.394-.145 3.762 1.8-3.248.759 9.055.651 12.841 1.186 2.291 3.706 3.456 4.739 2.604 1.581-1.304-1.792-5.505.217-7.487 1.619-1.598 5.269-.436 7.596 1.845 1.43 1.4-2.143 4.011-1.627 5.281.785 1.936 11.947 5.658 15.337.832 1.674-2.384-.357-13.765-2.532-13.239-2.675.647-3.527 2.919-5.1 2.134-4.266-2.129-1.667-11.744 1.338-11.684 1.755.035 3.44 2.69 4.847 1.772 2.83-1.847 2.694-8.254 2.387-12.769-4.212 2.529-11.656 1.606-12.19.362-.836-1.95 1.255-4.086 2.351-5.426.696-.846-.979-1.458-2.747-1.445m112.027 4.485c-2.624.281-5.432 3.489-4.991 4.196.791 1.271 3.486-3.989 6.041-4.124a3 3 0 0 0-.543-.072c-.173-.009-.332-.018-.507 0m-123.385.941a.34.34 0 0 0-.362.253c-.154.499 1.615-.333 1.085 2.207-.443 2.126-1.181 6.629-2.641 9.441-.178.342-.493-2.198-.832-2.062-1.094.44-2.143 9.442-1.411 10.382.012.016.42-.853.542-.434.697 2.382-.258 3.64-.217 10.165-.161-.584-1.461-3.254-1.556-2.207-.028.311.955 2.299 1.7 3.111-.091-3.564 1.147-9.501.253-11.756-.115-.29-.524.522-.651.651-.154-2.831.023-7.33 1.194-9.333.229-.391.488 2.694.723 2.351 1.582-2.311 2.492-7.537 3.075-10.381.31-1.503-.415-2.36-.902-2.388m124.073.036a.5.5 0 0 0-.325.181c-.086.102 8.188 8.193 5.209 13.022-2.807 4.548-15.184 5.202-16.242 6.113 4.682-.875 14.924-.39 17.941-6.583 2.123-4.358-4.623-12.987-6.583-12.733m-59.83 6.113c-.563-.004-1.08.095-1.519.434 1.779-.115 6.14 1.812 9.296.326-3.756.379-6.089-.747-7.777-.76m77.264.036c-4.078.104-10.223 4.441-9.26 5.534 3.605-1.653 3.729-3.668 10.852-5.317-.473-.181-1.008-.231-1.592-.217m1.158 1.049c1.48 2.771-2.498 10.052 2.821 7.054-3.991.743.11-6.351-2.821-7.054m-33.097 4.052c-6.467-.113-15.613 3.424-15.699 7.017-.053 2.225 7.367 3.263 4.377 5.499-7.617 5.694-17.992 3.558-18.268 4.919 4.625.025 13.785.608 20.257-5.209 2.445-2.198-5.298-4.165-4.884-5.86.771-3.144 11.262-6.49 16.785-6.077a12.7 12.7 0 0 0-2.568-.289m-112.643.325a18 18 0 0 0-.687 3.437c.085-.841.291-1.625.615-2.677.088.335.207.748.398 1.085-.202-.521-.222-1.445-.326-1.845m113.692 1.049c-1.174-.009-2.861.225-4.738.289 4.758-.036 5.818-.554 3.255 4.16-2.026 3.727 4.064 3.341 5.606 3.255-1.635-.067-5.208-.823-3.689-3.4 2.103-3.566 1.522-4.289-.434-4.304m-38.489.543c-3.519.114-5.834 3.325-8.066 3.907 2.252 1.352 5.379-4.168 10.707-3.437a6.5 6.5 0 0 0-2.641-.47m58.6 1.121c-3.521 1.488.93 15.217 5.028 12.479-4.669-1.89-4.55-7.315-5.028-12.479m-57.913.109a1.5 1.5 0 0 0-.253.036c2.146 2.932 6.439 8.378 4.159 13.564-5.984-.118-20.575 3.336-23.512 5.606-4.224 3.267 3.958 5.387 2.532 6.873-2.671 2.784-10.507 3.359-15.337 1.592 2.773 2.358 13.87 1.871 16.278-1.592 1.341-1.93-6.159-3.695-3.581-6.077 2.866-2.648 17.007-5.942 24.778-5.643.11-.357.624-.736.977-1.628 1.557-3.929-3.155-12.261-5.788-12.732-.087-.015-.167-.007-.253.001m68.295 5.823c-2.272.107-4.846 5.357-5.751 5.57 2.671 1.409 4.131-5.23 6.691-5.245-.305-.222-.615-.34-.94-.325m.362.977c-.555 1.639 3.09 2.679 1.229 9.441-1.854.152-4.403-.523-6.655 2.17-.705.843-3.16 10.716.76 14.505-5.287 5.382-14.99 6.195-16.17 6.981-.734 1.493 11.699-.97 16.277-5.86 1.314-1.402 11.986-10.688 13.059-9.982.605.397-1.854 6.82-1.303 7.849.547 1.019 5.689-4.254 6.729-6.547-1.824 2.65-5.365 6.373-5.57 5.498-.533-2.274 2.444-8.302.036-7.56s-9.993 6.559-11.756 8.464c-1.784-.479-2.469-9.201-.76-12.877 1.222-2.629 6.149-.653 6.872-2.857 1.245-3.793-.33-8.642-2.748-9.225M27.015 95.022c-1-.028-1.88.343-2.279 1.411-.539 1.442 1.979 4.869.724 6.258-1.374 1.519-3.176 1.425-5.462-1.339.626 1.389 3.417 3.621 5.933 1.483 1.701-1.445-1.455-4.483-.76-6.402.737-2.034 3.672-1.045 5.317.29 2.122 1.721-1.124 3.354-.688 5.317 1.064 4.789 11.846 5.054 14.216 4.413-1.456 5.018-.48 15.255 7.669 12.118-6.797 2.309-8.64-6.77-6.765-12.732-4.467 1.278-13.997.139-14.577-3.581-.479-3.075 3.545-3.881-.181-6.149-.995-.607-2.147-1.059-3.147-1.087m85.801 2.315c-.518.063-1.801.271-2.785.325-1.313.072-6.971.236-7.018.398-.101.349 5.211-.108 6.512-.145 1.299-.036 3.23-.411 3.508-.579.047-.026-.044-.02-.217.001m-16.061.615c-.527.02-1.025.083-1.519.145 1.908.068 3.099-.066 3.871.181-.129 2.295-4.034 14.407 6.836 14.36-8.161-1.913-5.862-9.182-5.535-14.541-.498-.08-2.071-.205-3.653-.145m-77.192 2.749c-.667 2.583-.136 9.449 1.158 10.996.655.783.766-1.551 2.025.181 1.326 1.822 2.352 6.754 1.375 9.224 1.748-1.979.404-6.359-.651-8.934-1.466-3.577-2.906.297-3.255-2.026-.364-2.411-1.168-5.424-.652-9.441m41.924 2.496c-.611-.015-1.276.012-2.026.036 3.362.296 4.244.403 4.232 1.591-.017 1.773-4.47 4.781-2.243 6.475 2.006 1.525 2.578.95 7.705 1.592-5.208-.967-6.97-1.156-6.8-3.002.172-1.877 3.208-3.826 2.604-5.281-.437-1.055-1.64-1.368-3.472-1.411m-5.425.036c-3.522.057-7.073.465-9.767 1.7-1.503 5.024-2.381 11.628 2.387 13.202 2.509.829 4.811-2.636 7.234-2.134 4.068.842 6.063 7.003 3.617 10.924 3.377-2.441 1.655-11.491-4.196-11.575-3.014-.044-5.369 3.001-6.728 2.278-3.463-1.838-3.004-8.178-1.881-12.443 3.465-1.283 5.287-1.725 12.805-1.916a70 70 0 0 0-3.471-.036m126.061 2.857c-2.658 1.332-2.789 6.508-1.482 9.369-.83-2.8-.841-7.412 1.482-9.369m-66.955.797c-3.886-.031-6.17 4.006-10.092 4.557 3.531 1.841 6.861-4.463 11.864-4.268a6.1 6.1 0 0 0-1.772-.289m-13.564.253c-.338.132-.17 1.415.65 2.423s2.309 1.722 2.75 1.557c.199-.076-1.025-.885-1.881-1.882-.857-.998-1.363-2.16-1.519-2.098m14.324.796c-.166.042-.281.182-.326.397-.123.591 2.452 2.011 2.388 4.739-.038 1.592 1.13 5.492-3.4 4.955-4.806-.57-11.013-.732-11.394 7.09-.132 2.717-.883 4.705 1.266 7.777-5.671.813-21.961 3.408-23.006 5.896-1.188 2.828 4.922 3.662 4.232 4.666-.864 1.256-8.027 2.076-14.36 1.157 1.188 2.255 13.093 2.138 16.061-.94 1.163-1.206-5.281-2.604-4.377-4.594 1.151-2.532 20.809-5.471 23.947-5.391-3.224-4.266-2.211-6.826-1.99-8.572.617-4.853 1.855-7.008 7.524-6.438 4.59.461 7.292.927 7.343-5.462.021-2.604-2.584-5.219-3.726-5.281-.067-.003-.128-.014-.182.001m-92.422 7.523c.608 3.669.538 5.478-.904 2.677-.54-1.048-1.595-2.538-1.591-.94 1.025-1.043 2.398 4.129 2.821 2.713.607-2.035.079-4.45-.326-4.45m119.189.036c-5.338.009-15.549 3.948-17.291 7.487-.981 1.995 6.197 3.426 4.269 4.848-8.375 6.177-20.785 4.509-20.727 5.752 3.063.421 16.913-.418 22.644-6.15 1.594-1.594-5.27-3.268-3.942-5.063 2.397-3.242 12.354-6.626 17.797-6.222-.547-.47-1.518-.654-2.75-.652m19.207.253c-1.953 1.801 2.195 6.906-.47 10.201-2.351 2.906-6.671.279-9.188 4.485-1.762 2.946-2.819 8.71 2.135 7.994-2.657-1.747-2.289-4.808-.615-7.56 2.476-4.071 6.366-.926 8.791-4.559 1.779-2.666 1.797-7.579-.653-10.561m-18.302.797c-.155.02-.284.14-.361.397-1.08 3.582-2.787 4.147-2.75 5.933.023 1.101.68 1.329 3.039.939-.925-.206-1.271-.963-1.23-1.482.119-1.53 1.572-2.988 2.279-4.666.158-.377-.512-1.184-.977-1.121m-87.647.18c2.805 4.074 3.157 7.518 1.266 9.441-.983 1-6.141-3.681-8.464-1.664-3.471 3.013-1.725 10.677 1.158 13.457-4.097.387-10.629-.928-13.312-4.016-1.129-1.299 1.374-2.483.289-4.123-1.419-2.148-9.216-5.566-9.694-3.763-.079.3.027.72.181 1.157-.065-.25-.052-.43.072-.542 1.658-1.507 6.931 2.118 9.116 3.472 1.161.721-1.319 3.177-.362 4.088 3.172 3.021 9.089 5.275 15.048 4.016-2.987-3.467-4.728-9.576-2.098-12.66 1.61-1.889 6.463 2.313 8.935 1.229 2.901-1.272 1.237-9.485-2.135-10.092m-2.858 1.194c-.305.159-.617.308-.904.435.294-.122.592-.272.904-.435m-31.325.036c-.593 4.955 3.075 12.867 7.379 14.65 3.028 1.254-.03-2.182-1.302-4.377 1.041 1.966 2.885 4.242 2.134 4.087-4.202-.866-7.975-8.04-8.211-14.36m89.202 1.375c-.452.014-.767.068-.759.145.029.336 4.871.788 4.846.361-.018-.34-2.729-.549-4.087-.506m-60.771 6.439c-1.825.136-1.717 9.529 1.52 11.937 1.361 1.013 15.939-1.656 21.92 1.809-3.947-4.332-18.064-1.998-21.342-2.496-3.279-.498-3.63-11.41-1.917-11.213-.063-.017-.122-.042-.181-.037m-21.197 1.157c-2.627-.055 2.533 5.047 2.098 6.619 1.501-2.164-3.343-5.388-2.098-6.619m5.824 2.894c1.101 1.186-2.233 3.104 1.664 5.787-2.98-3.349 1.647-4.582-1.664-5.787m127.328 2.206c-2.898-.06-5.493 3.935-7.633 6.149 2.643-1.944 5.068-4.949 8.211-6.077a3 3 0 0 0-.578-.072m-.651.977c-.052-.001-.101.03-.145.072-1.037.984 1.308 5.255-1.05 8.935-3.049 3.537-10.773 6.838-15.408 8.718 3.283-.135 11.931-4.466 14.396-6.945-1.371 3.949-3.355 7.11-.651 6.765-2.24-.689.987-5.46 1.881-7.922 3.578-2.366 5.593-5.082 9.007-8.139-2.115 1.555-5.667 5.437-7.777 6.475 1.937-3.355.514-7.948-.253-7.959m9.694.724c-5.203 9.59-1.674 5.184 2.242.217-3.619 3.304-7 9.614-2.242-.217m-62.904.687c-.434.144-.914.908-.723 1.157 1.556 2.024 3.619 5.347 3.545 6.258-.508 6.144-4.496 3.909-8.646 3.473-2.823-.298-6.749 1.177-6.981 3.617-.347 3.644 2.846 6.521 4.993 5.896-2.506-1.635-3.604-3.588-3.184-5.932.602-3.354 6.915-2.885 9.477-2.424 3.932.707 5.904-2.438 6.078-4.92.109-1.588-1.962-4.289-4.16-7.018-.112-.136-.255-.156-.399-.107m-55.164 4.449c-.453.525 4.703 5.031 4.087 9.26 2.271-2.822-3.663-9.752-4.087-9.26m16.423.035c1.454 1.217 1.063 1.816.145 2.641-2.271 2.042-2.367 2.922 1.375 4.052-2.358-1.962-1.042-2.407-.072-3.292 1.681-1.535 1.541-3.227-1.448-3.401m-17.869.254c-.355-.279 4.483 6.063 3.219 8.754-.778 1.656-7.213-3.842-8.79-1.736-.745.994 1.849 5.377 4.269 7.379-2.61-2.796-4.818-6.166-3.581-7.018 1.911-1.314 6.954 4.153 8.971 2.135 2.303-2.308-2.556-8.309-4.088-9.514m112.823 5.39c-1.07-.079-4.023 3.729-5.354 5.426 1.518-1.642 4.42-4.784 4.774-4.702.314.072-.198 1.578-.615 2.17-2.298 3.268-5.862 4.56-7.886 7.234-1.46 1.799-3.167 3.449-3.291 5.68.275-1.593 2.311-3.951 3.617-5.391 2.738-3.198 5.125-4.396 7.523-6.98.988-1.064 1.797-3.065 1.41-3.364a.3.3 0 0 0-.178-.073m-18.123.94c-5.582.074-17.35 5.543-16.784 7.451.293.988 3.692 1.467 2.858 2.315-3.629 3.685-15.54 4.438-16.676 5.426 6.586-.513 15.313-2.522 18.882-6.04.725-.715-3.854-1.549-3.328-2.389.782-1.249 10.118-6.025 16.061-6.728-.312-.044-.641-.039-1.013-.035m-.109.796c-.651-.278-7.254 7.765-1.809 4.919-2.264-.292 3.222-4.314 1.809-4.919m-98.86 1.447c1.246 4.068 3.924 7.461 7.452 5.933 2.053-.89 9.122 3.319 10.454 8.067-.209-4.041-6.652-9.566-10.526-8.719-3.944.863-3.744-.131-7.38-5.281m-8.356 3.003c-.689.031 2.534 2.394 4.16 4.413.262.326-1.577-1.027-2.062-1.086.45.451 3.232 2.133 2.93 1.557-.67-1.279-4.85-4.27-4.196-4.197 1.28.145 11.373 5.127 8.862 6.006 3.441-.928-6.569-5.611-9.152-6.548-.272-.1-.443-.15-.542-.145m71.08.434c-2.931.234-5.75 2.197-8.573 3.146 2.575.781 5.961-3.178 11.539-2.677a6.5 6.5 0 0 0-2.966-.469m1.157 1.374c-.211.03-.383.146-.542.325 1.509 1.466 3.056 2.482 3.327 4.956.203 1.119-.311 1.818-.832 2.713.606.315.895.06 1.52.072.799-1.042 1.174-2.312.941-3.327-.427-1.853-2.936-4.955-4.414-4.739m-53.066 2.423c7.591 8.336 7.986 10.945-9.26 3.221 12.22 8.281 22.101 6.961 9.26-3.221m-10.562.869c-.061-.017-.112.005-.181.035-.414.186-.493 1.408.542 1.882.264-.665.061-1.806-.361-1.917m63.52 4.883c-6.556.305-17.475 2.742-20.692 3.871-2.16.758 4.685 2.944 3.473 3.183-4.748.934-6.833.838-12.118.29 2.742.898 10.764 1.303 13.926-.218 1.553-.746-5.078-2.295-3.726-2.785 5.813-2.108 12.807-2.704 21.631-4.305a21 21 0 0 0-2.494-.036m39.356.832c-2.875.455-14.803 9.708-6.909 3.146-9.749 7.421 5.522-3.041 7.38-3.11-.104-.056-.28-.066-.471-.036m-36.86.217c-2.167.096-2.372 2.396-2.351 4.016.023 1.769 1.953 3.032 4.594 2.424-1.826-.752-2.701-1.018-2.822-2.857-.111-1.691.154-2.293 1.014-3.582-.164-.015-.291-.007-.435-.001m-45.868 1.193c-1.44.016-2.345.074-2.315.182.159.575 12.522-.124 18.737 2.352-3-2.053-12.102-2.577-16.422-2.534m-4.159.942a.4.4 0 0 0-.181.036c-1.072.507 2.015 4.288 4.883 5.534-3.329-2.307-3.895-5.533-4.702-5.57m1.555.325c1.729 3.825 3.574 5.966 8.03 5.716 2.966-.167 6.72.313 8.935 2.568-2.011-2.473-5.006-3.234-9.803-3.184-3.308.034-5.922-2.904-7.162-5.1m60.951 0c-2.748-.008-8.09 3.376-9.73 3.509 2.244.896 5.776-2.793 10.707-3.291-.268-.16-.584-.217-.977-.218m16.35.253c-3.024.552-10.709 3.16-13.13 5.57-.347.346 1.88.241 1.556.507-2.848 2.333-12.363 3.325-14.434 4.739-.922.63 2.141.686 1.339 1.121-2.173 1.178-8.235.714-10.128 2.352 1.507-.824 10.193-1.687 11.141-2.46.644-.525-2.396-.97-1.447-1.267 3.614-1.129 11.721-2.121 14.795-4.811.607-.531-2.896-.024-1.193-.94 3.539-1.906 8.57-3.902 11.068-4.485.662-.154-1.973 1.542-2.641 2.387.826-.497 3.864-2.857 3.074-2.713m-62.253.47c1.932 1.374-3.706 2.578.796 3.653-1.691-1.963 3.926-2.974-.796-3.653m45.867.434c-.388-.024-.845.082-1.339.326 2.356.871.633 3.714-1.771 3.798-2.418.085-4.362-.107-6.547.977-2.016 1-3.295 2.48-2.605 4.595-4.057.545-11.893 1.662-14.65 2.278-.413.093.21.278.868.435-.262-.176.063-.424.361-.507 2.619-.732 10.723-1.436 15.338-2.026-.398-.969-.9-2.082.397-3.473 1.374-1.471 3.589-1.691 6.692-1.844 1.761-.088 3.524-.971 4.484-2.533.539-.872-.063-1.951-1.228-2.026m-48.291 5.209c1.049.808 2.783 2.459 1.845 2.496-2.179.089-8.884-2.021-7.922-.723 3.695 4.986 15.374 3.802 21.595 5.1-5.244-1.445-16.95-.549-20.257-4.594-1.645-2.013 7.254 1.846 8.03.543.459-.771-2.151-2.223-3.291-2.822"/><path fill="#fff" stroke="#fff" stroke-width=".141" d="M133.182 22.894c-1.272.456-1.797.437-2.387 1.121.363.473 1.457.919 2.025 1.23 4.404 2.413 3.571 2.16 1.699 3.871 3.49-1.713.879-2.495-1.591-3.871-1.138-.633-1.087-.624-1.917-1.23.573-.453 1.194-.757 2.171-1.121zm-14.758 4.015c-.115 0-.061.064-.362.108 1.458 1.308 6.062 7.603 8.356 6.222-2.635.169-5.522-4.1-7.994-6.33zm26.695 1.591c.557.733.435.938.181 1.158 1.325.176.186-.834-.181-1.158zm-14.867 3.365c2.109.59 3.654 1.675 5.027 3.328 1.027 1.236 1.813 2.688 1.086 3.834 2.074-1.134.496-2.632-.977-4.269-1.529-1.697-3.244-2.547-5.136-2.893zm-.796.289c-.694.651-1.629 1.692-1.374 1.917.658.582 1.398-.7 1.374-1.917zm1.7 6.475c-.543-.005-.015 2.411.94 4.232 1.369 2.612 3.399 5.143 5.063 6.149-.053-.261.07-.504.254-.688-3.764-3.39-3.363-4.187-4.848-6.33-1.477-2.133-.594-2.975-1.302-3.328-.044-.022-.071-.035-.107-.035zm29.228 1.954c.382 1.09-.633 1.029-1.374 1.085 4.242 4.114 7 7.374 7.307 9.152-.271-2.569-4.348-6.484-6.656-8.898 1.2-.129.96-1.138.723-1.339zm-3.038.759c-2.998 1.981-3.861 2.753-2.352 4.124-1.043-1.251.371-2.638 2.352-4.124zm-8.14 4.666c2.96 1.174.864 5.689 3.22 5.245-1.641-.931.666-4.253-3.22-5.245zm-4.268.217c-5.57 1.749-8.217 5.341-11.177 6.294 1.392-.368 3.13-1.358 4.558-2.496a11.4 11.4 0 0 1 4.63 4.811c1.187 2.336 3.145 5.555.615 7.162 3.304-1.606 2.316-4.049.435-7.198-1.15-1.923-3.01-3.748-4.667-5.245 1.84-1.231 3.334-2.095 5.606-3.328zm11.033.072c3.197 2.185 3.244 3.895.325 5.824 4.29-2.469 2.329-4.013-.325-5.824zm-35.486 1.158c3.085 2.158-2.167 5.484 1.7 5.715-2.175-1.302 3.133-4.735-1.7-5.715zm-28.757.181c-2.266 6.903-.67 10.396 1.664 13.167 1.98 2.351 5.955 8.135 2.641 12.733-2.404 3.335-7.414-1.199-10.924 1.121-3.291 2.175-2.635 6.862-.072 9.984 4.304 5.242 9.251-4.542 12.335-1.7 5.533 5.098 6.137 11.1 4.016 14.397-.871 1.351-1.53 6.268-1.05 9.223s2.121 3.937 4.957 5.752c3.37 2.156 7.047-2.958 10.598-4.377 3.051-1.22 7.872 9.003 1.303 11.395 7.211.921 5.092-13.289-1.266-12.046-4.58.896-7.355 6.218-11.431 4.305-4.907-2.304-4.136-9.359-3.075-13.564 10.535-1.089 18.941.087 23.982-6.475 1.657-2.157-7.024-4.591-5.1-6.113 2-1.582 7.684-3.771 7.74-3.798-3.768.67-5.399.794-8.682 3.653-2.309 2.013 6.158 4.218 4.521 6.149-4.691 5.542-13.589 6.136-21.305 5.643 1.309-5.273.909-9.112-3.872-13.89-3.856-3.856-9.199 4.668-12.009 2.207-3.522-3.085-3.545-7.804-2.026-9.912 2.499-3.465 8.677 1.979 12.587-1.7 3.249-3.056-.834-8.985-2.604-12.841 2.186-.276 4.861-.561 7.488-.94-3.24.317-6.458.266-8.393.326-2.282-4.409-3.309-7.436-2.023-12.699zm21.884.507c-2.505.79-2.426.458-5.136 1.917-3.639 1.958 4.908 3.407 3.545 5.788-.969 1.689-2.905 2.714-5.209 3.364 2.587-.543 4.77-1.247 5.823-2.134 3.643-3.068-7.308-5.522-3.509-7.126 1.499-.634 2.288-1.04 4.486-1.809zm-6.799 11.068c-1.43.3-2.98.566-4.559.795 1.571-.157 3.127-.391 4.559-.795zm56.97-8.428c-.469-.003 1.068 3.294 1.918 4.376.633.807 2.408 3.139 2.531 2.822.074-.188-1.608-2.112-2.423-3.183-.914-1.204-1.782-4.013-2.026-4.015zm5.644 5.752c.091 2.168-.06 2.038-.435 2.64 1.016.492.868-1.551.435-2.64zm1.628.759c.938 1.259 1.781 2.674 2.459 3.943-.627-1.397-1.38-2.602-2.459-3.943zm2.459 3.979c.479 1.068.922 2.238 1.411 3.653.249-.105-.374-1.711-1.411-3.653zm-36.824.796c-1.397.333-1.006 6.767 3.87 9.152-5.837-4.854-2.131-8.662-3.545-9.116a.66.66 0 0 0-.325-.036zm38.995 4.305c-.018.02-.055.016-.072.036.531 1.679 1.071 3.317 1.483 4.774.421 1.493 1.281 5.247 2.278 4.594-1.021.301-1.772-3.082-2.206-4.775-.354-1.374-.854-2.736-1.483-4.629zm-.905.506c-.788.669-1.735 1.876-1.881 2.062-1.454 1.858-1.974 3.371-1.229 4.811-.496-1.074.432-3.164 1.266-4.304.849-1.162 1.242-1.683 1.844-2.569zm-25.863.94c-.195-.036-.315.034-.325.253-.04.797 6.217 6.036 5.751 12.009.745-.638.325-.438.796-.832.369-5.152-4.854-11.181-6.222-11.43zm-2.821.905c-.795.027-3.648 3.054-3.184 3.255.457.198 3.88-2.773 3.328-3.219-.033-.027-.092-.038-.144-.036zm25.681 5.245c.17.278.342.558.615.832 1.904 1.907 1.703 2.064 1.339 3.4-.286 1.05-1.037 2.163-2.099 3.256 3.277-3.147 3.215-5.024.326-7.307a1.2 1.2 0 0 1-.181-.181zm-4.955 1.194a.44.44 0 0 0-.217.036c-.385.141.985.375.76 3.038-.111 1.292-.541 3.099-.109 3.762.298-.127.037-.206.362-.145-.55-1.445.075-2.545.181-3.69.176-1.927-.459-2.918-.977-3.001zm-3.291.47c-.799.113-4.133 1.89-9.333 5.715-.227 8.477 2.056 13.037 3.798 12.48.506-.162-2.521-1.644-2.93-11.901 6.926-5.503 8.711-5.852 8.645-6.258-.008-.051-.066-.053-.18-.036zm16.314.651c-.151.056-.424.526-.253.796.439.696.201-.637.253-.796zm-45.65 3.834c-1.449.098-3.109.574-4.377.904 2.496-.299 5.867-.7 5.932.615.091 1.848-2.537 4.684-1.375 5.715 3.014 2.674 13.547.803 18.015-3.002-.015-.223.354-.997.145-1.049-2.358 2.46-12.862 6.835-17.11 4.305-1.58-.941 2.561-4.18 1.918-6.041-.431-1.243-1.7-1.545-3.148-1.447zm47.061 2.749c-.027.051-.023.157-.037.29.014-.126.01-.217.037-.29zm.072 3.581c.064.87.122 1.661.145 2.026.02.319.055.69.107 1.121-.049-.42-.059-.812-.072-1.121-.02-.479-.11-1.23-.18-2.026zm-15.338 2.713c-.023 0-.027.012-.036.036-.159.476 1.804 3.125 1.917 5.751.23 5.319-1.944 5.207-1.52 5.607.43.403 2.557-1.625 2.424-5.571-.103-3.089-2.433-5.826-2.785-5.823zm-2.025.868c-1.421 1.286-2.646 3.01-3.834 4.521 2.098-.934 3.017-2.722 3.834-4.521zm17.941 1.628c.131.674.279 1.281.434 1.7a16 16 0 0 1-.434-1.7zm-.506 4.413c-.961 2.304-2.09 3.914-2.967 6.438-.609 1.754.927 2.728.94 3.617.007.41-.103.889-.325 1.41.139-.285.283-.557.434-.868.318-.657-.526-1.552-.904-2.821-.424-1.426 2.029-5.212 2.822-7.776zm-17.435 4.268c-.797.023-1.569.138-1.556.29.03.336 3.207.427 3.183 0-.012-.227-.83-.313-1.627-.29zm-2.098.398c-1.857-.105-2.252 4.626-2.243 6.764.011 2.512.411 6.347 1.556 6.873.119-.242.67-.579.795-.832-1.639-1.364-1.257-3.886-1.446-5.86-.226-2.345 1.69-6.925 1.338-6.945zm12.696 5.498c-.602.141-.085 1.536-.651 3.327-.468 1.48-1.346 3.498-.578 3.871-.063-1.285.742-2.847 1.121-4.377.377-1.531.695-2.958.108-2.821zm7.235.507c-1.219.975-1.919 4.845-1.194 7.27-.502-2.657.067-6.147 1.194-7.27zm-10.056.867c-3.218 2.176-6.928 4.916-9.803 7.633 3.864 5.921 2.039 11.766-2.713 14.071 6.832-2.306 6.807-11.587 3.798-14.505 2.142-2.146 7.91-6.198 8.718-7.199zm6.293 1.664zm-132.681 6.258c1.721 2.963 3.452 3.566 5.354 3.111 2.168-.52 4.339-2.639 5.788-1.953 2.629 1.242 4.394 6.559 2.424 9.514-2.042 3.061-6.09-1.74-9.188-.832-3.094.906-.872 11.086 1.809 12.985-6.577 1.474-12.549-1.36-15.626-4.015 1.221 3.735 10.861 6.795 15.808 4.521 2.955 2.79 6.288 8.225 4.051 9.947-2.149 1.655-7.527-3.034-8.862-1.772-.784.74 2.86 6.826 5.498 7.597 1.803.525 3.561-1.244 6.077.904-1.98-2.47-3.133-1.398-5.535-1.375-3.275.032-6.47-6.299-5.751-6.981 1.221-1.16 6.617 4.569 9.296 1.845 2.2-2.236-1.958-7.329-3.87-10.346 7.29-.254 17.543-1.541 16.965 2.604.827-.784.861-1.413-.398-2.567 4.802.22 2.888 3.192.977 4.449-1.298.853 1.091 2.524 2.134 2.893 4 1.415 12.4 1.156 16.676-1.844 1.203-.845-5.987-4.095-4.992-4.703 5.611-3.427 16.154-3.93 22.682-5.244-5.893.543-17.249 1.604-23.26 4.847-1.366.737 5.72 3.585 4.449 4.774-1.831 1.715-6.845 2.6-10.997 2.46-4.151-.14-7.613-1.548-5.86-2.785 9.126-6.457-8.503-5.841-18.737-5.317-3.519-1.953-4.861-11.688-2.532-12.407 2.87-.886 7.421 3.872 9.948.435 2.221-3.021.394-9.012-3.654-10.093-1.802-.481-3.779 1.536-5.534 2.062-2.366.708-3.786-1.083-5.14-2.714zm115.5.615c-3.684 4.504-9.988 6.537-13.275 7.198 7.375-.979 11.1-4.528 13.529-6.583.08-.847-.101-.474-.254-.615zm-16.242.29c1.823.861-2.681 5.764-1.953 5.86.676.09 5.081-5.007 1.953-5.86zm-4.377.795c-4.214.86-8.532 2.083-11.503 4.558-3.132 2.609 5.804 3.572 3.292 5.86-6.04 5.503-14.979 5.803-23.042 6.728 2.684 3.412 4.9 5.646 3.653 9.405-1.977 5.962-10.161.503-14.18 3.87-2.377 1.992-.46 5.912 2.569 6.729-1.796-1.412-4.53-4.395-2.424-6.222 3.738-3.243 12.921 1.53 15.265-3.835 1.051-2.402-2.26-7.564-3.473-9.44 8.111-.585 17.082-2.45 22.971-7.632 1.537-1.354-6.543-3.356-4.232-5.137 3.633-2.8 9.452-4.449 11.104-4.884zm-31.723 2.244c-.467-.049-.947.408-1.41 1.157.419-.47.875-.866 1.41-1.157zm-1.483 1.265c-2.853 3.328-2.874 10.278.904 12.949-3.542-3.557-2.524-10.187-.904-12.949zm48.725 8.61c-2.701.973-4.306 6.921-1.809 8.5.409-1.473-1.373-4.4 1.809-8.5zm7.017 3.218c-.061.004-.126.043-.182.109-.736.878 1.573 3.87-.543 8.029 2.892-1.624 1.626-8.194.725-8.138zm9.188.832c-.192-.105-1.889 3.646-2.895 5.281 1.218-1.606 3.031-5.204 2.895-5.281zm-11.395.145c-1.895 1.314-3.75 3.469-5.715 4.848 3.018-1.44 4.26-3.449 5.715-4.848zm9.297 1.122c-2.971 2.502-5.945 5.903-9.225 8.03-.799 2.123-3.618 6.57-2.062 7.451-.585-1.133 1.096-5.175 2.351-7.307 2.809-2.417 6.944-5.998 8.936-8.174zm-10.888 9.585c-3.98 3.248-7.185 4.667-13.492 7.055 4.602-1.545 8.398-2.685 13.312-6.62.08-.224.045-.15.18-.435zm6.041.072c-.183-.029.984 1.712-4.051 6.041 3.688-2.459 5.289-5.837 4.051-6.041zm-17.761 1.485a2 2 0 0 0-.397.107c1.58-.152-1.996 3.332-2.641 4.812 1.571-1.328 4.775-5.259 3.038-4.919zm16.351 0c-.697.279-4.293 4.12-4.27 4.195.038.113 4.613-3.977 4.342-4.195-.02-.016-.027-.02-.072 0zm-18.196.614c-3.457.964-11.111 3.063-13.492 5.823-.613.711 3.996 1.521 3.111 2.389-4.754 4.648-15.684 6.178-20.148 6.293-1.369 2.516-2.679 6.193.939 6.837-2.533-1.372-1.049-4.282-.434-6.222 3.096-.615 16.154-1.881 20.619-7.126 1.042-1.226-4.129-1.079-3.582-1.953 1.353-2.16 8.538-4.503 12.987-6.041zm-33.025 5.643c5.279 4.664 3.844 6.912 3.074 8.319 1.118-.554 1.13-.549 2.063-1.085.611-3.053-2.592-6.23-5.137-7.234zm-2.098.145c-2.999.218-5.005 2.569-9.116 3.074 4.704.149 6.47-2.355 9.694-3.074-.21-.006-.379-.016-.578 0zm47.567.939c-.51.011-3.685 3.584-5.317 6.476 2.266-3.489 5.467-6.13 5.39-6.403-.01-.032-.039-.073-.073-.073zm-45.614 8.538c-6.67.604-15.055 1.87-19.86 3.437-1.032.337 5.01 2.202 4.015 2.641-3.145 1.384-8.769 1.764-13.094.94 3.789.792 11.24 1.168 13.927-.723.869-.613-5.421-2.525-4.341-2.822 4.322-1.189 13.115-2.53 19.353-3.473zm31.47 2.423c-.095-.105-3.718 2.782-3.617 3.002.098.215 3.845-2.749 3.617-3.002zm-16.748 1.013c-.23.003-.479.005-.759.036 2.053.665 2.316 2.209-.941 4.341-1.32.864-6.094.305-8.465 1.881-1.682 1.12-1.49 3.599-.723 3.292.529-.211-.207-1.825 1.157-2.93 2.8-2.268 6.361-.761 9.224-2.424 1.961-1.138 3.967-4.232.507-4.196zm-44.818.036c1.836.742-1.838 2.285-.651 3.039.037-.575 4.202-1.825.651-3.039zm42.612 0c-.338-.059-2.068.66-3.799 1.52-1.033.514-2.437 1.203-3.256 1.266-.905.069-1.3.076-1.338.182.573.375 3.711-.624 5.715-1.592 1.918-.926 2.712-1.175 2.75-1.303.012-.042-.024-.064-.072-.073zm16.06.182c-3.446.91-7.303 2.787-10.092 4.231-.726.376 1.936.022 1.591.579-1.38 2.233-15.04 4.637-14.976 5.1.034.244 1.607.4 1.736.797.199.607-1.869.924-3.002 1.157 1.574.1 4.355-1.105 3.509-1.302-.877-.204-1.298-.598-1.411-.797-.244-.426 12.109-2.379 15.048-5.027.378-.34-1.888-.443-1.628-.688.954-.892 8.669-3.781 9.225-4.05zm-59.287 2.892c.008.022-.022.054 0 .073.249.075.533.116.796.181-.28-.08-.603-.17-.796-.254zm-2.207 2.787c1.153.698 2.844 2.378 1.917 2.677-2.218.713-6.177-1.23-7.922-1.266-.901-.018 1.412 1.646 2.496 2.098-.614-.308-2.603-1.838-2.098-1.809 1.83.105 6.079 1.941 8.284 1.229 1.36-.438-.895-2.063-2.677-2.929zm28.034 5.353c-4.414.507-8.378 1.019-6.982 1.339-.168-.342 3.246-.869 6.982-1.339zm-24.669.181c4.012.468 8.46.982 8.537.904-.083-.125-4.585-.508-8.537-.904zm10.634 1.193c-.357.041-.633.35-.579.362.205.048 1.127-.185.94-.29a.56.56 0 0 0-.361-.072zm10.238.072c.857.447-.549.678-2.786.797 2.189-.088 4.264-.265 2.786-.797z"/></svg>
\ No newline at end of file
diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolWolframAlpha/ToolWolframAlpha.node.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolWolframAlpha/ToolWolframAlpha.node.ts
new file mode 100644
index 0000000000000..1a77d067c5a08
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolWolframAlpha/ToolWolframAlpha.node.ts
@@ -0,0 +1,58 @@
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import {
+	NodeConnectionType,
+	type IExecuteFunctions,
+	type INodeType,
+	type INodeTypeDescription,
+	type SupplyData,
+} from 'n8n-workflow';
+import { WolframAlphaTool } from '@langchain/community/tools/wolframalpha';
+import { logWrapper } from '../../../utils/logWrapper';
+import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+
+export class ToolWolframAlpha implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Wolfram|Alpha',
+		name: 'toolWolframAlpha',
+		icon: 'file:wolfram-alpha.svg',
+		group: ['transform'],
+		version: 1,
+		description: "Connects to WolframAlpha's computational intelligence engine.",
+		defaults: {
+			name: 'Wolfram Alpha',
+		},
+		credentials: [
+			{
+				name: 'wolframAlphaApi',
+				required: true,
+			},
+		],
+		codex: {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Tools'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/sub-nodes/n8n-nodes-langchain.toolwolframalpha/',
+					},
+				],
+			},
+		},
+		// 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])],
+	};
+
+	async supplyData(this: IExecuteFunctions): Promise<SupplyData> {
+		const credentials = await this.getCredentials('wolframAlphaApi');
+
+		return {
+			response: logWrapper(new WolframAlphaTool({ appid: credentials.appId as string }), this),
+		};
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolWolframAlpha/wolfram-alpha.svg b/packages/@n8n/nodes-langchain/nodes/tools/ToolWolframAlpha/wolfram-alpha.svg
new file mode 100644
index 0000000000000..50c0714e4e394
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolWolframAlpha/wolfram-alpha.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 50 39"><path d="m36.971 24.875-7.869 1.673.801 7.825-7.372-3.162L18.469 38l-4.063-6.791-7.373 3.161.802-7.823-7.868-1.677L5.326 19l-5.357-5.872 7.867-1.673-.799-7.825 7.372 3.162 4.06-6.791 4.063 6.791 7.373-3.16-.801 7.824 7.867 1.676-5.357 5.871z" style="fill:#f16850"/><path d="m18.469 11.861-4.06-5.071-7.372-3.163 4.388 5.787z" style="fill:#fd694f"/><path d="m7.836 11.452-7.868 1.674 5.357 5.872 6.306-2.285z" style="fill:#ff3413"/><path d="M11.425 9.414 7.037 3.627l.799 7.825 3.795 5.261z" style="fill:#dc1d23"/><path d="M22.532 6.79 18.469 0l-4.06 6.79 4.06 5.071z" style="fill:#ff9281"/><path d="m31.613 19.001 5.358-5.871-7.867-1.675-3.797 5.258z" style="fill:#ff8b79"/><path d="m25.307 16.713 3.797-5.258.801-7.826-4.392 5.785z" style="fill:#fd694f"/><path d="m25.513 9.414 4.392-5.785-7.373 3.161-4.063 5.071z" style="fill:#ef5240"/><path d="m29.866 22.499 7.104 2.373-5.357-5.871-6.306-2.288z" style="fill:#ff482c"/><path d="m11.631 16.713-6.306 2.285-5.358 5.87 7.105-2.369z" style="fill:#ec2101"/><path d="M18.469 30.586v7.412l4.061-6.789.165-6.645z" style="fill:#d21c22"/><path d="m29.866 22.499-7.171 2.065 6.407 1.982 7.868-1.674z" style="fill:#c90901"/><path d="m22.53 31.209 7.372 3.162-.8-7.825-6.407-1.982z" style="fill:#ec2101"/><path d="m7.072 22.499-7.105 2.369 7.868 1.676 6.408-1.98z" style="fill:#b6171e"/><path d="m14.243 24.564.163 6.644 4.063 6.79v-7.412z" style="fill:#b4151b"/><path d="m7.835 26.544-.802 7.824 7.373-3.16-.163-6.644z" style="fill:#d21c22"/><path d="m25.307 16.713.206-7.299-7.044 2.447v7.102z" style="fill:#e63320"/><path d="m18.469 11.861-7.044-2.447.206 7.299 6.838 2.25z" style="fill:#ff4527"/><path d="m14.243 24.564 4.226 6.022 4.226-6.022-4.226-5.601z" style="fill:#ff9281"/><path d="m18.469 18.963 4.226 5.601 7.171-2.065-4.559-5.786z" style="fill:#fd684d"/><path d="m11.631 16.713-4.559 5.786 7.171 2.065 4.226-5.601z" style="fill:#fd745c"/></svg>
\ No newline at end of file
diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/ToolWorkflow.node.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/ToolWorkflow.node.ts
new file mode 100644
index 0000000000000..5130cf7d2924d
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/ToolWorkflow.node.ts
@@ -0,0 +1,465 @@
+import type {
+	IExecuteFunctions,
+	IExecuteWorkflowInfo,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+	IWorkflowBase,
+	SupplyData,
+	ExecutionError,
+	IDataObject,
+} from 'n8n-workflow';
+import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
+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 { DynamicTool } from '@langchain/core/tools';
+import get from 'lodash/get';
+import isObject from 'lodash/isObject';
+import type { CallbackManagerForToolRun } from '@langchain/core/callbacks/manager';
+import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+
+export class ToolWorkflow implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Custom n8n Workflow Tool',
+		name: 'toolWorkflow',
+		icon: 'fa:network-wired',
+		group: ['transform'],
+		version: [1, 1.1],
+		description: 'Uses another n8n workflow as a tool. Allows packaging any n8n node(s) as a tool.',
+		defaults: {
+			name: 'Custom n8n Workflow Tool',
+		},
+		codex: {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['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'],
+					},
+				},
+				default: '',
+				required: true,
+				description: 'The workflow to execute',
+				hint: 'Can be found in the URL of the workflow',
+			},
+
+			// ----------------------------------
+			//         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.',
+			},
+			{
+				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,
+							},
+						],
+					},
+				],
+			},
+		],
+	};
+
+	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
+		const name = this.getNodeParameter('name', itemIndex) as string;
+		const description = this.getNodeParameter('description', itemIndex) as string;
+
+		const runFunction = async (
+			query: string,
+			runManager?: CallbackManagerForToolRun,
+		): Promise<string> => {
+			const source = this.getNodeParameter('source', itemIndex) as string;
+			const responsePropertyName = this.getNodeParameter(
+				'responsePropertyName',
+				itemIndex,
+			) as string;
+
+			if (!responsePropertyName) {
+				throw new NodeOperationError(this.getNode(), "Field to return can't be empty", {
+					itemIndex,
+					description:
+						'Enter the name of a field in the last node of the workflow that contains the response to return',
+				});
+			}
+
+			const workflowInfo: IExecuteWorkflowInfo = {};
+			if (source === 'database') {
+				// Read workflow from database
+				workflowInfo.id = this.getNodeParameter('workflowId', itemIndex) as string;
+			} else if (source === 'parameter') {
+				// Read workflow from parameter
+				const workflowJson = this.getNodeParameter('workflowJson', itemIndex) as string;
+				try {
+					workflowInfo.code = JSON.parse(workflowJson) as IWorkflowBase;
+				} 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: INodeExecutionData;
+			try {
+				receivedData = (await this.executeWorkflow(
+					workflowInfo,
+					items,
+					runManager?.getChild(),
+				)) as INodeExecutionData;
+			} 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, [
+				0,
+				0,
+				'json',
+				responsePropertyName,
+			]) as string | undefined;
+			if (response === undefined) {
+				throw new NodeOperationError(
+					this.getNode(),
+					`There was an error: "The workflow did not return an item with the property '${responsePropertyName}'"`,
+				);
+			}
+
+			return response;
+		};
+
+		return {
+			response: new DynamicTool({
+				name,
+				description,
+
+				func: async (query: string, 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}"`;
+					}
+
+					if (executionError) {
+						void this.addOutputData(NodeConnectionType.AiTool, index, executionError);
+					} else {
+						void this.addOutputData(NodeConnectionType.AiTool, index, [[{ json: { response } }]]);
+					}
+					return response;
+				},
+			}),
+		};
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/ChatTrigger.node.ts b/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/ChatTrigger.node.ts
new file mode 100644
index 0000000000000..386479e569966
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/ChatTrigger.node.ts
@@ -0,0 +1,428 @@
+import {
+	type IDataObject,
+	type IWebhookFunctions,
+	type IWebhookResponseData,
+	type INodeType,
+	type INodeTypeDescription,
+	NodeConnectionType,
+} from 'n8n-workflow';
+import { pick } from 'lodash';
+import type { BaseChatMemory } from '@langchain/community/memory/chat_memory';
+import { createPage } from './templates';
+import { validateAuth } from './GenericFunctions';
+import type { LoadPreviousSessionChatOption } from './types';
+
+const CHAT_TRIGGER_PATH_IDENTIFIER = 'chat';
+
+export class ChatTrigger implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Chat Trigger',
+		name: 'chatTrigger',
+		icon: 'fa:comments',
+		group: ['trigger'],
+		version: 1,
+		description: 'Runs the workflow when an n8n generated webchat is submitted',
+		defaults: {
+			name: 'Chat Trigger',
+		},
+		codex: {
+			categories: ['Core Nodes'],
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-langchain.chattrigger/',
+					},
+				],
+			},
+			subcategories: {
+				'Core Nodes': ['Other Trigger Nodes'],
+			},
+		},
+		supportsCORS: true,
+		maxNodes: 1,
+		inputs: `={{ (() => {
+			if (!['hostedChat', 'webhook'].includes($parameter.mode)) {
+				return [];
+			}
+			if ($parameter.options?.loadPreviousSession !== 'memory') {
+				return [];
+			}
+
+			return [
+				{
+					displayName: 'Memory',
+					maxConnections: 1,
+					type: '${NodeConnectionType.AiMemory}',
+					required: true,
+				}
+			];
+		 })() }}`,
+		outputs: ['main'],
+		credentials: [
+			{
+				// eslint-disable-next-line n8n-nodes-base/node-class-description-credentials-name-unsuffixed
+				name: 'httpBasicAuth',
+				required: true,
+				displayOptions: {
+					show: {
+						authentication: ['basicAuth'],
+					},
+				},
+			},
+		],
+		webhooks: [
+			{
+				name: 'setup',
+				httpMethod: 'GET',
+				responseMode: 'onReceived',
+				path: CHAT_TRIGGER_PATH_IDENTIFIER,
+				ndvHideUrl: true,
+			},
+			{
+				name: 'default',
+				httpMethod: 'POST',
+				responseMode: '={{$parameter.options?.["responseMode"] || "lastNode" }}',
+				path: CHAT_TRIGGER_PATH_IDENTIFIER,
+				ndvHideMethod: true,
+				ndvHideUrl: '={{ !$parameter.public }}',
+			},
+		],
+		eventTriggerDescription: 'Waiting for you to submit the chat',
+		activationMessage: 'You can now make calls to your production chat URL.',
+		triggerPanel: false,
+		properties: [
+			/**
+			 * @note If we change this property, also update it in ChatEmbedModal.vue
+			 */
+			{
+				displayName: 'Make Chat Publicly Available',
+				name: 'public',
+				type: 'boolean',
+				default: false,
+				description:
+					'Whether the chat should be publicly available or only accessible through the manual chat interface',
+			},
+			{
+				displayName: 'Mode',
+				name: 'mode',
+				type: 'options',
+				options: [
+					{
+						name: 'Hosted Chat',
+						value: 'hostedChat',
+						description: 'Chat on a page served by n8n',
+					},
+					{
+						name: 'Embedded Chat',
+						value: 'webhook',
+						description: 'Chat through a widget embedded in another page, or by calling a webhook',
+					},
+				],
+				default: 'hostedChat',
+				displayOptions: {
+					show: {
+						public: [true],
+					},
+				},
+			},
+			{
+				displayName:
+					'Chat will be live at the URL above once you activate this workflow. Live executions will show up in the ‘executions’ tab',
+				name: 'hostedChatNotice',
+				type: 'notice',
+				displayOptions: {
+					show: {
+						mode: ['hostedChat'],
+						public: [true],
+					},
+				},
+				default: '',
+			},
+			{
+				displayName:
+					'Follow the instructions <a href="https://www.npmjs.com/package/@n8n/chat" target="_blank">here</a> to embed chat in a webpage (or just call the webhook URL at the top of this section). Chat will be live once you activate this workflow',
+				name: 'embeddedChatNotice',
+				type: 'notice',
+				displayOptions: {
+					show: {
+						mode: ['webhook'],
+						public: [true],
+					},
+				},
+				default: '',
+			},
+			{
+				displayName: 'Authentication',
+				name: 'authentication',
+				type: 'options',
+				displayOptions: {
+					show: {
+						public: [true],
+					},
+				},
+				options: [
+					{
+						name: 'Basic Auth',
+						value: 'basicAuth',
+						description: 'Simple username and password (the same one for all users)',
+					},
+					{
+						// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+						name: 'n8n User Auth',
+						value: 'n8nUserAuth',
+						description: 'Require user to be logged in with their n8n account',
+					},
+					{
+						name: 'None',
+						value: 'none',
+					},
+				],
+				default: 'none',
+				description: 'The way to authenticate',
+			},
+			{
+				displayName: 'Initial Message(s)',
+				name: 'initialMessages',
+				type: 'string',
+				displayOptions: {
+					show: {
+						mode: ['hostedChat'],
+						public: [true],
+					},
+				},
+				typeOptions: {
+					rows: 3,
+				},
+				default: 'Hi there! 👋\nMy name is Nathan. How can I assist you today?',
+				description: 'Default messages shown at the start of the chat, one per line',
+			},
+			{
+				displayName: 'Options',
+				name: 'options',
+				type: 'collection',
+				displayOptions: {
+					show: {
+						mode: ['hostedChat', 'webhook'],
+						public: [true],
+					},
+				},
+				placeholder: 'Add Field',
+				default: {},
+				options: [
+					{
+						displayName: 'Input Placeholder',
+						name: 'inputPlaceholder',
+						type: 'string',
+						displayOptions: {
+							show: {
+								'/mode': ['hostedChat'],
+							},
+						},
+						default: 'Type your question..',
+						placeholder: 'e.g. Type your message here',
+						description: 'Shown as placeholder text in the chat input field',
+					},
+					{
+						displayName: 'Load Previous Session',
+						name: 'loadPreviousSession',
+						type: 'options',
+						options: [
+							{
+								name: 'Off',
+								value: 'notSupported',
+								description: 'Loading messages of previous session is turned off',
+							},
+							{
+								name: 'From Memory',
+								value: 'memory',
+								description: 'Load session messages from memory',
+							},
+							{
+								name: 'Manually',
+								value: 'manually',
+								description: 'Manually return messages of session',
+							},
+						],
+						default: 'notSupported',
+						description: 'If loading messages of a previous session should be enabled',
+					},
+					{
+						displayName: 'Response Mode',
+						name: 'responseMode',
+						type: 'options',
+						options: [
+							{
+								name: 'When Last Node Finishes',
+								value: 'lastNode',
+								description: 'Returns data of the last-executed node',
+							},
+							{
+								name: "Using 'Respond to Webhook' Node",
+								value: 'responseNode',
+								description: 'Response defined in that node',
+							},
+						],
+						default: 'lastNode',
+						description: 'When and how to respond to the webhook',
+					},
+					{
+						displayName: 'Require Button Click to Start Chat',
+						name: 'showWelcomeScreen',
+						type: 'boolean',
+						displayOptions: {
+							show: {
+								'/mode': ['hostedChat'],
+							},
+						},
+						default: false,
+						description: 'Whether to show the welcome screen at the start of the chat',
+					},
+					{
+						displayName: 'Start Conversation Button Text',
+						name: 'getStarted',
+						type: 'string',
+						displayOptions: {
+							show: {
+								showWelcomeScreen: [true],
+								'/mode': ['hostedChat'],
+							},
+						},
+						default: 'New Conversation',
+						placeholder: 'e.g. New Conversation',
+						description: 'Shown as part of the welcome screen, in the middle of the chat window',
+					},
+					{
+						displayName: 'Subtitle',
+						name: 'subtitle',
+						type: 'string',
+						displayOptions: {
+							show: {
+								'/mode': ['hostedChat'],
+							},
+						},
+						default: "Start a chat. We're here to help you 24/7.",
+						placeholder: "e.g. We're here for you",
+						description: 'Shown at the top of the chat, under the title',
+					},
+					{
+						displayName: 'Title',
+						name: 'title',
+						type: 'string',
+						displayOptions: {
+							show: {
+								'/mode': ['hostedChat'],
+							},
+						},
+						default: 'Hi there! 👋',
+						placeholder: 'e.g. Welcome',
+						description: 'Shown at the top of the chat',
+					},
+				],
+			},
+		],
+	};
+
+	async webhook(this: IWebhookFunctions): Promise<IWebhookResponseData> {
+		const res = this.getResponseObject();
+
+		const isPublic = this.getNodeParameter('public', false) as boolean;
+		const nodeMode = this.getNodeParameter('mode', 'hostedChat') as string;
+		if (!isPublic) {
+			res.status(404).end();
+			return {
+				noWebhookResponse: true,
+			};
+		}
+
+		const webhookName = this.getWebhookName();
+		const mode = this.getMode() === 'manual' ? 'test' : 'production';
+		const bodyData = this.getBodyData() ?? {};
+
+		const options = this.getNodeParameter('options', {}) as {
+			getStarted?: string;
+			inputPlaceholder?: string;
+			loadPreviousSession?: LoadPreviousSessionChatOption;
+			showWelcomeScreen?: boolean;
+			subtitle?: string;
+			title?: string;
+		};
+
+		if (nodeMode === 'hostedChat') {
+			try {
+				await validateAuth(this);
+			} catch (error) {
+				if (error) {
+					res.writeHead((error as IDataObject).responseCode as number, {
+						'www-authenticate': 'Basic realm="Webhook"',
+					});
+					res.end((error as IDataObject).message as string);
+					return { noWebhookResponse: true };
+				}
+				throw error;
+			}
+
+			// Show the chat on GET request
+			if (webhookName === 'setup') {
+				const webhookUrlRaw = this.getNodeWebhookUrl('default') as string;
+				const webhookUrl =
+					mode === 'test' ? webhookUrlRaw.replace('/webhook', '/webhook-test') : webhookUrlRaw;
+				const authentication = this.getNodeParameter('authentication') as
+					| 'none'
+					| 'basicAuth'
+					| 'n8nUserAuth';
+				const initialMessagesRaw = this.getNodeParameter('initialMessages', '') as string;
+				const initialMessages = initialMessagesRaw
+					.split('\n')
+					.filter((line) => line)
+					.map((line) => line.trim());
+				const instanceId = this.getInstanceId();
+
+				const i18nConfig = pick(options, ['getStarted', 'inputPlaceholder', 'subtitle', 'title']);
+
+				const page = createPage({
+					i18n: {
+						en: i18nConfig,
+					},
+					showWelcomeScreen: options.showWelcomeScreen,
+					loadPreviousSession: options.loadPreviousSession,
+					initialMessages,
+					webhookUrl,
+					mode,
+					instanceId,
+					authentication,
+				});
+
+				res.status(200).send(page).end();
+				return {
+					noWebhookResponse: true,
+				};
+			}
+		}
+
+		if (bodyData.action === 'loadPreviousSession') {
+			if (options?.loadPreviousSession === 'memory') {
+				const memory = (await this.getInputConnectionData(NodeConnectionType.AiMemory, 0)) as
+					| BaseChatMemory
+					| undefined;
+				const messages = ((await memory?.chatHistory.getMessages()) ?? [])
+					.filter((message) => !message?.additional_kwargs?.hideFromUI)
+					.map((message) => message?.toJSON());
+				return {
+					webhookResponse: { data: messages },
+				};
+			} else if (options?.loadPreviousSession === 'notSupported') {
+				// If messages of a previous session should not be loaded, simply return an empty array
+				return {
+					webhookResponse: { data: [] },
+				};
+			}
+		}
+
+		const returnData: IDataObject = { ...bodyData };
+		const webhookResponse: IDataObject = { status: 200 };
+		return {
+			webhookResponse,
+			workflowData: [this.helpers.returnJsonArray(returnData)],
+		};
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/GenericFunctions.ts b/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/GenericFunctions.ts
new file mode 100644
index 0000000000000..bd89c6595da3d
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/GenericFunctions.ts
@@ -0,0 +1,54 @@
+import type { ICredentialDataDecryptedObject, IWebhookFunctions } from 'n8n-workflow';
+import basicAuth from 'basic-auth';
+import { ChatTriggerAuthorizationError } from './error';
+import type { AuthenticationChatOption } from './types';
+
+export async function validateAuth(context: IWebhookFunctions) {
+	const authentication = context.getNodeParameter('authentication') as AuthenticationChatOption;
+	const req = context.getRequestObject();
+	const headers = context.getHeaderData();
+
+	if (authentication === 'none') {
+		return;
+	} else if (authentication === 'basicAuth') {
+		// Basic authorization is needed to call webhook
+		let expectedAuth: ICredentialDataDecryptedObject | undefined;
+		try {
+			expectedAuth = await context.getCredentials('httpBasicAuth');
+		} catch {}
+
+		if (expectedAuth === undefined || !expectedAuth.user || !expectedAuth.password) {
+			// Data is not defined on node so can not authenticate
+			throw new ChatTriggerAuthorizationError(500, 'No authentication data defined on node!');
+		}
+
+		const providedAuth = basicAuth(req);
+		// Authorization data is missing
+		if (!providedAuth) throw new ChatTriggerAuthorizationError(401);
+
+		if (providedAuth.name !== expectedAuth.user || providedAuth.pass !== expectedAuth.password) {
+			// Provided authentication data is wrong
+			throw new ChatTriggerAuthorizationError(403);
+		}
+	} else if (authentication === 'n8nUserAuth') {
+		const webhookName = context.getWebhookName();
+
+		function getCookie(name: string) {
+			const value = `; ${headers.cookie}`;
+			const parts = value.split(`; ${name}=`);
+
+			if (parts.length === 2) {
+				return parts.pop()?.split(';').shift();
+			}
+			return '';
+		}
+
+		const authCookie = getCookie('n8n-auth');
+		if (!authCookie && webhookName !== 'setup') {
+			// Data is not defined on node so can not authenticate
+			throw new ChatTriggerAuthorizationError(500, 'User not authenticated!');
+		}
+	}
+
+	return;
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/error.ts b/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/error.ts
new file mode 100644
index 0000000000000..6f19cfeae7d62
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/error.ts
@@ -0,0 +1,16 @@
+export class ChatTriggerAuthorizationError extends Error {
+	constructor(
+		readonly responseCode: number,
+		message?: string,
+	) {
+		if (message === undefined) {
+			message = 'Authorization problem!';
+			if (responseCode === 401) {
+				message = 'Authorization is required!';
+			} else if (responseCode === 403) {
+				message = 'Authorization data is wrong!';
+			}
+		}
+		super(message);
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/templates.ts b/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/templates.ts
new file mode 100644
index 0000000000000..9c7f7f0301a6a
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/templates.ts
@@ -0,0 +1,107 @@
+import type { AuthenticationChatOption, LoadPreviousSessionChatOption } from './types';
+
+export function createPage({
+	instanceId,
+	webhookUrl,
+	showWelcomeScreen,
+	loadPreviousSession,
+	i18n: { en },
+	initialMessages,
+	authentication,
+}: {
+	instanceId: string;
+	webhookUrl?: string;
+	showWelcomeScreen?: boolean;
+	loadPreviousSession?: LoadPreviousSessionChatOption;
+	i18n: {
+		en: Record<string, string>;
+	};
+	initialMessages: string[];
+	mode: 'test' | 'production';
+	authentication: AuthenticationChatOption;
+}) {
+	const validAuthenticationOptions: AuthenticationChatOption[] = [
+		'none',
+		'basicAuth',
+		'n8nUserAuth',
+	];
+	const validLoadPreviousSessionOptions: LoadPreviousSessionChatOption[] = [
+		'manually',
+		'memory',
+		'notSupported',
+	];
+
+	const sanitizedAuthentication = validAuthenticationOptions.includes(authentication)
+		? authentication
+		: 'none';
+	const sanitizedShowWelcomeScreen = !!showWelcomeScreen;
+	const sanitizedLoadPreviousSession = validLoadPreviousSessionOptions.includes(
+		loadPreviousSession as LoadPreviousSessionChatOption,
+	)
+		? loadPreviousSession
+		: 'notSupported';
+
+	return `<!doctype html>
+	<html lang="en">
+		<head>
+			<meta charset="utf-8">
+			<meta name="viewport" content="width=device-width, initial-scale=1">
+			<title>Chat</title>
+			<link href="https://cdn.jsdelivr.net/npm/normalize.css@8.0.1/normalize.min.css" rel="stylesheet" />
+			<link href="https://cdn.jsdelivr.net/npm/@n8n/chat/style.css" rel="stylesheet" />
+		</head>
+		<body>
+			<script type="module">
+				import { createChat } from 'https://cdn.jsdelivr.net/npm/@n8n/chat@latest/chat.bundle.es.js';
+
+				(async function () {
+					const authentication = '${sanitizedAuthentication}';
+					let metadata;
+					if (authentication === 'n8nUserAuth') {
+						try {
+							const response = await fetch('/rest/login', {
+									method: 'GET',
+									headers: { 'browser-id': localStorage.getItem('n8n-browserId') }
+							});
+
+							if (response.status !== 200) {
+								throw new Error('Not logged in');
+							}
+
+							const responseData = await response.json();
+							metadata = {
+								user: {
+									id: responseData.data.id,
+									firstName: responseData.data.firstName,
+									lastName: responseData.data.lastName,
+									email: responseData.data.email,
+								},
+							};
+						} catch (error) {
+							window.location.href = '/signin?redirect=' + window.location.href;
+							return;
+						}
+					}
+
+					createChat({
+						mode: 'fullscreen',
+						webhookUrl: '${webhookUrl}',
+						showWelcomeScreen: ${sanitizedShowWelcomeScreen},
+						loadPreviousSession: ${sanitizedLoadPreviousSession !== 'notSupported'},
+						metadata: metadata,
+						webhookConfig: {
+							headers: {
+								'Content-Type': 'application/json',
+								'X-Instance-Id': '${instanceId}',
+							}
+						},
+						i18n: {
+							${en ? `en: ${JSON.stringify(en)},` : ''}
+						},
+						${initialMessages.length ? `initialMessages: ${JSON.stringify(initialMessages)},` : ''}
+					});
+				})();
+			</script>
+		</body>
+	</html>`;
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/types.ts b/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/types.ts
new file mode 100644
index 0000000000000..dedf7e48cbe8e
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/types.ts
@@ -0,0 +1,2 @@
+export type AuthenticationChatOption = 'none' | 'basicAuth' | 'n8nUserAuth';
+export type LoadPreviousSessionChatOption = 'manually' | 'memory' | 'notSupported';
diff --git a/packages/@n8n/nodes-langchain/nodes/trigger/ManualChatTrigger/ManualChatTrigger.node.ts b/packages/@n8n/nodes-langchain/nodes/trigger/ManualChatTrigger/ManualChatTrigger.node.ts
new file mode 100644
index 0000000000000..58dac30fd5cdf
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/trigger/ManualChatTrigger/ManualChatTrigger.node.ts
@@ -0,0 +1,69 @@
+import {
+	type ITriggerFunctions,
+	type INodeType,
+	type INodeTypeDescription,
+	type ITriggerResponse,
+	NodeConnectionType,
+} from 'n8n-workflow';
+
+export class ManualChatTrigger implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Manual Chat Trigger',
+		name: 'manualChatTrigger',
+		icon: 'fa:comments',
+		group: ['trigger'],
+		version: [1, 1.1],
+		description: 'Runs the flow on new manual chat message',
+		eventTriggerDescription: '',
+		maxNodes: 1,
+		hidden: true,
+		defaults: {
+			name: 'On new manual Chat Message',
+			color: '#909298',
+		},
+		codex: {
+			categories: ['Core Nodes'],
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-langchain.chattrigger/',
+					},
+				],
+			},
+			subcategories: {
+				'Core Nodes': ['Other Trigger Nodes'],
+			},
+		},
+		inputs: [],
+		outputs: [NodeConnectionType.Main],
+		properties: [
+			{
+				displayName:
+					'This node is where a manual chat workflow execution starts. To make one, go back to the canvas and click ‘Chat’',
+				name: 'notice',
+				type: 'notice',
+				default: '',
+			},
+			{
+				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+				displayName: 'Chat and execute workflow',
+				name: 'openChat',
+				type: 'button',
+				typeOptions: {
+					action: 'openChat',
+				},
+				default: '',
+			},
+		],
+	};
+
+	async trigger(this: ITriggerFunctions): Promise<ITriggerResponse> {
+		const manualTriggerFunction = async () => {
+			this.emit([this.helpers.returnJsonArray([{}])]);
+		};
+
+		return {
+			manualTriggerFunction,
+		};
+	}
+}
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
new file mode 100644
index 0000000000000..fecf8d163aff4
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreInMemory/VectorStoreInMemory.node.ts
@@ -0,0 +1,59 @@
+import type { INodeProperties } from 'n8n-workflow';
+import { createVectorStoreNode } from '../shared/createVectorStoreNode';
+import { MemoryVectorStoreManager } from '../shared/MemoryVectorStoreManager';
+
+const insertFields: INodeProperties[] = [
+	{
+		displayName:
+			'The embbded data are stored in the server memory, so they will be lost when the server is restarted. Additionally, if the amount of data is too large, it may cause the server to crash due to insufficient memory.',
+		name: 'notice',
+		type: 'notice',
+		default: '',
+	},
+	{
+		displayName: 'Clear Store',
+		name: 'clearStore',
+		type: 'boolean',
+		default: false,
+		description: 'Whether to clear the store before inserting new data',
+	},
+];
+
+export const VectorStoreInMemory = createVectorStoreNode({
+	meta: {
+		displayName: 'In-Memory Vector Store',
+		name: 'vectorStoreInMemory',
+		description: 'Work with your data in In-Memory Vector Store',
+		icon: 'fa:database',
+		docsUrl:
+			'https://docs.n8n.io/integrations/builtin/cluster-nodes/root-nodes/n8n-nodes-langchain.vectorstoreinmemory/',
+	},
+	sharedFields: [
+		{
+			displayName: 'Memory Key',
+			name: 'memoryKey',
+			type: 'string',
+			default: 'vector_store_key',
+			description:
+				'The key to use to store the vector memory in the workflow data. The key will be prefixed with the workflow ID to avoid collisions.',
+		},
+	],
+	insertFields,
+	loadFields: [],
+	retrieveFields: [],
+	async getVectorStoreClient(context, _filter, embeddings, itemIndex) {
+		const workflowId = context.getWorkflow().id;
+		const memoryKey = context.getNodeParameter('memoryKey', itemIndex) as string;
+		const vectorStoreSingleton = MemoryVectorStoreManager.getInstance(embeddings);
+
+		return await vectorStoreSingleton.getVectorStore(`${workflowId}__${memoryKey}`);
+	},
+	async populateVectorStore(context, embeddings, documents, itemIndex) {
+		const memoryKey = context.getNodeParameter('memoryKey', itemIndex) as string;
+		const clearStore = context.getNodeParameter('clearStore', itemIndex) as boolean;
+		const workflowId = context.getWorkflow().id;
+		const vectorStoreInstance = MemoryVectorStoreManager.getInstance(embeddings);
+
+		void vectorStoreInstance.addDocuments(`${workflowId}__${memoryKey}`, documents, clearStore);
+	},
+});
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
new file mode 100644
index 0000000000000..c9c1b560b9c17
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreInMemoryInsert/VectorStoreInMemoryInsert.node.ts
@@ -0,0 +1,113 @@
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import {
+	NodeConnectionType,
+	type INodeExecutionData,
+	type IExecuteFunctions,
+	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 { MemoryVectorStoreManager } from '../shared/MemoryVectorStoreManager';
+
+// This node is deprecated. Use VectorStoreInMemory instead.
+export class VectorStoreInMemoryInsert implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'In Memory Vector Store Insert',
+		name: 'vectorStoreInMemoryInsert',
+		icon: 'fa:database',
+		group: ['transform'],
+		version: 1,
+		hidden: true,
+		description: 'Insert data into an in-memory vector store',
+		defaults: {
+			name: 'In Memory Vector Store Insert',
+		},
+		codex: {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Vector Stores'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/root-nodes/n8n-nodes-langchain.vectorstoreinmemory/',
+					},
+				],
+			},
+		},
+		// eslint-disable-next-line n8n-nodes-base/node-class-description-inputs-wrong-regular-node
+		inputs: [
+			NodeConnectionType.Main,
+			{
+				displayName: 'Document',
+				maxConnections: 1,
+				type: NodeConnectionType.AiDocument,
+				required: true,
+			},
+			{
+				displayName: 'Embedding',
+				maxConnections: 1,
+				type: NodeConnectionType.AiEmbedding,
+				required: true,
+			},
+		],
+		outputs: [NodeConnectionType.Main],
+		properties: [
+			{
+				displayName:
+					'The embbded data are stored in the server memory, so they will be lost when the server is restarted. Additionally, if the amount of data is too large, it may cause the server to crash due to insufficient memory.',
+				name: 'notice',
+				type: 'notice',
+				default: '',
+			},
+			{
+				displayName: 'Clear Store',
+				name: 'clearStore',
+				type: 'boolean',
+				default: false,
+				description: 'Whether to clear the store before inserting new data',
+			},
+			{
+				displayName: 'Memory Key',
+				name: 'memoryKey',
+				type: 'string',
+				default: 'vector_store_key',
+				description:
+					'The key to use to store the vector memory in the workflow data. The key will be prefixed with the workflow ID to avoid collisions.',
+			},
+		],
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = this.getInputData(0);
+		const embeddings = (await this.getInputConnectionData(
+			NodeConnectionType.AiEmbedding,
+			0,
+		)) as Embeddings;
+
+		const memoryKey = this.getNodeParameter('memoryKey', 0) as string;
+		const clearStore = this.getNodeParameter('clearStore', 0) as boolean;
+		const documentInput = (await this.getInputConnectionData(NodeConnectionType.AiDocument, 0)) as
+			| N8nJsonLoader
+			| Array<Document<Record<string, unknown>>>;
+
+		const { processedDocuments, serializedDocuments } = await processDocuments(
+			documentInput,
+			items,
+		);
+
+		const workflowId = this.getWorkflow().id;
+
+		const vectorStoreInstance = MemoryVectorStoreManager.getInstance(embeddings);
+		await vectorStoreInstance.addDocuments(
+			`${workflowId}__${memoryKey}`,
+			processedDocuments,
+			clearStore,
+		);
+
+		return await this.prepareOutputData(serializedDocuments);
+	}
+}
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
new file mode 100644
index 0000000000000..c85a245073edd
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreInMemoryLoad/VectorStoreInMemoryLoad.node.ts
@@ -0,0 +1,80 @@
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import {
+	NodeConnectionType,
+	type SupplyData,
+	type IExecuteFunctions,
+	type INodeType,
+	type INodeTypeDescription,
+} from 'n8n-workflow';
+import type { Embeddings } from '@langchain/core/embeddings';
+import { MemoryVectorStoreManager } from '../shared/MemoryVectorStoreManager';
+import { logWrapper } from '../../../utils/logWrapper';
+
+// This node is deprecated. Use VectorStoreInMemory instead.
+export class VectorStoreInMemoryLoad implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'In Memory Vector Store Load',
+		name: 'vectorStoreInMemoryLoad',
+		icon: 'fa:database',
+		group: ['transform'],
+		version: 1,
+		hidden: true,
+		description: 'Load embedded data from an in-memory vector store',
+		defaults: {
+			name: 'In Memory Vector Store Load',
+		},
+		codex: {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Vector Stores'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/root-nodes/n8n-nodes-langchain.vectorstoreinmemory/',
+					},
+				],
+			},
+		},
+		// eslint-disable-next-line n8n-nodes-base/node-class-description-inputs-wrong-regular-node
+		inputs: [
+			{
+				displayName: 'Embedding',
+				maxConnections: 1,
+				type: NodeConnectionType.AiEmbedding,
+				required: true,
+			},
+		],
+		outputs: [NodeConnectionType.AiVectorStore],
+		outputNames: ['Vector Store'],
+		properties: [
+			{
+				displayName: 'Memory Key',
+				name: 'memoryKey',
+				type: 'string',
+				default: 'vector_store_key',
+				description:
+					'The key to use to store the vector memory in the workflow data. The key will be prefixed with the workflow ID to avoid collisions.',
+			},
+		],
+	};
+
+	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
+		const embeddings = (await this.getInputConnectionData(
+			NodeConnectionType.AiEmbedding,
+			itemIndex,
+		)) as Embeddings;
+
+		const workflowId = this.getWorkflow().id;
+		const memoryKey = this.getNodeParameter('memoryKey', 0) as string;
+
+		const vectorStoreSingleton = MemoryVectorStoreManager.getInstance(embeddings);
+		const vectorStoreInstance = await vectorStoreSingleton.getVectorStore(
+			`${workflowId}__${memoryKey}`,
+		);
+
+		return {
+			response: logWrapper(vectorStoreInstance, this),
+		};
+	}
+}
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
new file mode 100644
index 0000000000000..08ad2b18dc21f
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePinecone/VectorStorePinecone.node.ts
@@ -0,0 +1,141 @@
+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 { createVectorStoreNode } from '../shared/createVectorStoreNode';
+import { metadataFilterField } from '../../../utils/sharedFields';
+import { pineconeIndexRLC } from '../shared/descriptions';
+import { pineconeIndexSearch } from '../shared/methods/listSearch';
+
+const sharedFields: INodeProperties[] = [pineconeIndexRLC];
+
+const retrieveFields: INodeProperties[] = [
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			{
+				displayName: 'Pinecone Namespace',
+				name: 'pineconeNamespace',
+				type: 'string',
+				description:
+					'Partition the records in an index into namespaces. Queries and other operations are then limited to one namespace, so different requests can search different subsets of your index.',
+				default: '',
+			},
+			metadataFilterField,
+		],
+	},
+];
+
+const insertFields: INodeProperties[] = [
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			{
+				displayName: 'Clear Namespace',
+				name: 'clearNamespace',
+				type: 'boolean',
+				default: false,
+				description: 'Whether to clear the namespace before inserting new data',
+			},
+			{
+				displayName: 'Pinecone Namespace',
+				name: 'pineconeNamespace',
+				type: 'string',
+				description:
+					'Partition the records in an index into namespaces. Queries and other operations are then limited to one namespace, so different requests can search different subsets of your index.',
+				default: '',
+			},
+		],
+	},
+];
+export const VectorStorePinecone = createVectorStoreNode({
+	meta: {
+		displayName: 'Pinecone Vector Store',
+		name: 'vectorStorePinecone',
+		description: 'Work with your data in Pinecone Vector Store',
+		icon: 'file:pinecone.svg',
+		docsUrl:
+			'https://docs.n8n.io/integrations/builtin/cluster-nodes/root-nodes/n8n-nodes-langchain.vectorstorepinecone/',
+		credentials: [
+			{
+				name: 'pineconeApi',
+				required: true,
+			},
+		],
+	},
+	methods: { listSearch: { pineconeIndexSearch } },
+	retrieveFields,
+	loadFields: retrieveFields,
+	insertFields,
+	sharedFields,
+	async getVectorStoreClient(context, filter, embeddings, itemIndex) {
+		const index = context.getNodeParameter('pineconeIndex', itemIndex, '', {
+			extractValue: true,
+		}) as string;
+		const options = context.getNodeParameter('options', itemIndex, {}) as {
+			pineconeNamespace?: string;
+		};
+		const credentials = await context.getCredentials('pineconeApi');
+
+		const client = new Pinecone({
+			apiKey: credentials.apiKey as string,
+		});
+
+		const pineconeIndex = client.Index(index);
+		const config: PineconeStoreParams = {
+			namespace: options.pineconeNamespace ?? undefined,
+			pineconeIndex,
+			filter,
+		};
+
+		return await PineconeStore.fromExistingIndex(embeddings, config);
+	},
+	async populateVectorStore(context, embeddings, documents, itemIndex) {
+		const index = context.getNodeParameter('pineconeIndex', itemIndex, '', {
+			extractValue: true,
+		}) as string;
+		const options = context.getNodeParameter('options', itemIndex, {}) as {
+			pineconeNamespace?: string;
+			clearNamespace?: boolean;
+		};
+		const credentials = await context.getCredentials('pineconeApi');
+
+		const client = new Pinecone({
+			apiKey: credentials.apiKey as string,
+		});
+
+		const indexes = ((await client.listIndexes()).indexes ?? []).map((i) => i.name);
+
+		if (!indexes.includes(index)) {
+			throw new NodeOperationError(context.getNode(), `Index ${index} not found`, {
+				itemIndex,
+				description: 'Please check that the index exists in your vector store',
+			});
+		}
+
+		const pineconeIndex = client.Index(index);
+
+		if (options.pineconeNamespace && options.clearNamespace) {
+			const namespace = pineconeIndex.namespace(options.pineconeNamespace);
+			try {
+				await namespace.deleteAll();
+			} catch (error) {
+				// Namespace doesn't exist yet
+				context.logger.info(`Namespace ${options.pineconeNamespace} does not exist yet`);
+			}
+		}
+
+		await PineconeStore.fromDocuments(documents, embeddings, {
+			namespace: options.pineconeNamespace ?? undefined,
+			pineconeIndex,
+		});
+	},
+});
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePinecone/pinecone.svg b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePinecone/pinecone.svg
new file mode 100644
index 0000000000000..b94b8b3af6696
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePinecone/pinecone.svg
@@ -0,0 +1 @@
+<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
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
new file mode 100644
index 0000000000000..b024f9b09bd49
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePineconeInsert/VectorStorePineconeInsert.node.ts
@@ -0,0 +1,139 @@
+import {
+	type IExecuteFunctions,
+	type INodeType,
+	type INodeTypeDescription,
+	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 { pineconeIndexRLC } from '../shared/descriptions';
+import { pineconeIndexSearch } from '../shared/methods/listSearch';
+
+// This node is deprecated. Use VectorStorePinecone instead.
+export class VectorStorePineconeInsert implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Pinecone: Insert',
+		hidden: true,
+		name: 'vectorStorePineconeInsert',
+		icon: 'file:pinecone.svg',
+		group: ['transform'],
+		version: 1,
+		description: 'Insert data into Pinecone Vector Store index',
+		defaults: {
+			name: 'Pinecone: Insert',
+			// eslint-disable-next-line n8n-nodes-base/node-class-description-non-core-color-present
+			color: '#1321A7',
+		},
+		codex: {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Vector Stores'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/root-nodes/n8n-nodes-langchain.vectorstorepinecone/',
+					},
+				],
+			},
+		},
+		credentials: [
+			{
+				name: 'pineconeApi',
+				required: true,
+			},
+		],
+		inputs: [
+			NodeConnectionType.Main,
+			{
+				displayName: 'Document',
+				maxConnections: 1,
+				type: NodeConnectionType.AiDocument,
+				required: true,
+			},
+			{
+				displayName: 'Embedding',
+				maxConnections: 1,
+				type: NodeConnectionType.AiEmbedding,
+				required: true,
+			},
+		],
+		outputs: [NodeConnectionType.Main],
+		properties: [
+			pineconeIndexRLC,
+			{
+				displayName: 'Pinecone Namespace',
+				name: 'pineconeNamespace',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Specify the document to load in the document loader sub-node',
+				name: 'notice',
+				type: 'notice',
+				default: '',
+			},
+			{
+				displayName: 'Clear Namespace',
+				name: 'clearNamespace',
+				type: 'boolean',
+				default: false,
+				description: 'Whether to clear the namespace before inserting new data',
+			},
+		],
+	};
+
+	methods = {
+		listSearch: {
+			pineconeIndexSearch,
+		},
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = this.getInputData(0);
+		this.logger.verbose('Executing data for Pinecone Insert Vector Store');
+
+		const namespace = this.getNodeParameter('pineconeNamespace', 0) as string;
+		const index = this.getNodeParameter('pineconeIndex', 0, '', { extractValue: true }) as string;
+		const clearNamespace = this.getNodeParameter('clearNamespace', 0) as boolean;
+
+		const credentials = await this.getCredentials('pineconeApi');
+
+		const documentInput = (await this.getInputConnectionData(NodeConnectionType.AiDocument, 0)) as
+			| N8nJsonLoader
+			| Array<Document<Record<string, unknown>>>;
+
+		const embeddings = (await this.getInputConnectionData(
+			NodeConnectionType.AiEmbedding,
+			0,
+		)) as Embeddings;
+
+		const client = new Pinecone({
+			apiKey: credentials.apiKey as string,
+		});
+
+		const pineconeIndex = client.Index(index);
+
+		if (namespace && clearNamespace) {
+			await pineconeIndex.namespace(namespace).deleteAll();
+		}
+
+		const { processedDocuments, serializedDocuments } = await processDocuments(
+			documentInput,
+			items,
+		);
+
+		await PineconeStore.fromDocuments(processedDocuments, embeddings, {
+			namespace: namespace || undefined,
+			pineconeIndex,
+		});
+
+		return await this.prepareOutputData(serializedDocuments);
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePineconeInsert/pinecone.svg b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePineconeInsert/pinecone.svg
new file mode 100644
index 0000000000000..b94b8b3af6696
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePineconeInsert/pinecone.svg
@@ -0,0 +1 @@
+<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
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
new file mode 100644
index 0000000000000..c4ac6e3754cb1
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePineconeLoad/VectorStorePineconeLoad.node.ts
@@ -0,0 +1,118 @@
+import {
+	NodeConnectionType,
+	type IExecuteFunctions,
+	type INodeType,
+	type INodeTypeDescription,
+	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 { pineconeIndexRLC } from '../shared/descriptions';
+import { pineconeIndexSearch } from '../shared/methods/listSearch';
+
+// This node is deprecated. Use VectorStorePinecone instead.
+export class VectorStorePineconeLoad implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Pinecone: Load',
+		// Vector Store nodes got merged into a single node
+		hidden: true,
+		name: 'vectorStorePineconeLoad',
+		icon: 'file:pinecone.svg',
+		group: ['transform'],
+		version: 1,
+		description: 'Load data from Pinecone Vector Store index',
+		defaults: {
+			name: 'Pinecone: Load',
+		},
+		codex: {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Vector Stores'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/root-nodes/n8n-nodes-langchain.vectorstorepinecone/',
+					},
+				],
+			},
+		},
+		credentials: [
+			{
+				name: 'pineconeApi',
+				required: true,
+			},
+		],
+		inputs: [
+			{
+				displayName: 'Embedding',
+				maxConnections: 1,
+				type: NodeConnectionType.AiEmbedding,
+				required: true,
+			},
+		],
+		outputs: [NodeConnectionType.AiVectorStore],
+		outputNames: ['Vector Store'],
+		properties: [
+			pineconeIndexRLC,
+			{
+				displayName: 'Pinecone Namespace',
+				name: 'pineconeNamespace',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Options',
+				name: 'options',
+				type: 'collection',
+				placeholder: 'Add Option',
+				default: {},
+				options: [metadataFilterField],
+			},
+		],
+	};
+
+	methods = {
+		listSearch: {
+			pineconeIndexSearch,
+		},
+	};
+
+	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
+		this.logger.verbose('Supplying data for Pinecone Load Vector Store');
+
+		const namespace = this.getNodeParameter('pineconeNamespace', itemIndex) as string;
+		const index = this.getNodeParameter('pineconeIndex', itemIndex, '', {
+			extractValue: true,
+		}) as string;
+
+		const credentials = await this.getCredentials('pineconeApi');
+		const embeddings = (await this.getInputConnectionData(
+			NodeConnectionType.AiEmbedding,
+			itemIndex,
+		)) as Embeddings;
+
+		const client = new Pinecone({
+			apiKey: credentials.apiKey as string,
+		});
+
+		const pineconeIndex = client.Index(index);
+		const config: PineconeStoreParams = {
+			namespace: namespace || undefined,
+			pineconeIndex,
+			filter: getMetadataFiltersValues(this, itemIndex),
+		};
+
+		const vectorStore = await PineconeStore.fromExistingIndex(embeddings, config);
+
+		return {
+			response: logWrapper(vectorStore, this),
+		};
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePineconeLoad/pinecone.svg b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePineconeLoad/pinecone.svg
new file mode 100644
index 0000000000000..b94b8b3af6696
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePineconeLoad/pinecone.svg
@@ -0,0 +1 @@
+<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
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
new file mode 100644
index 0000000000000..f183d1b1fe9e6
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreQdrant/VectorStoreQdrant.node.ts
@@ -0,0 +1,85 @@
+import { type INodeProperties } from 'n8n-workflow';
+import type { QdrantLibArgs } from '@langchain/community/vectorstores/qdrant';
+import { QdrantVectorStore } from '@langchain/community/vectorstores/qdrant';
+import type { Schemas as QdrantSchemas } from '@qdrant/js-client-rest';
+import { createVectorStoreNode } from '../shared/createVectorStoreNode';
+import { qdrantCollectionRLC } from '../shared/descriptions';
+import { qdrantCollectionsSearch } from '../shared/methods/listSearch';
+
+const sharedFields: INodeProperties[] = [qdrantCollectionRLC];
+
+const insertFields: INodeProperties[] = [
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			{
+				displayName: 'Collection Config',
+				name: 'collectionConfig',
+				type: 'json',
+				default: '',
+				description:
+					'JSON options for creating a collection. <a href="https://qdrant.tech/documentation/concepts/collections">Learn more</a>.',
+			},
+		],
+	},
+];
+
+export const VectorStoreQdrant = createVectorStoreNode({
+	meta: {
+		displayName: 'Qdrant Vector Store',
+		name: 'vectorStoreQdrant',
+		description: 'Work with your data in a Qdrant collection',
+		icon: 'file:qdrant.svg',
+		docsUrl:
+			'https://docs.n8n.io/integrations/builtin/cluster-nodes/root-nodes/n8n-nodes-langchain.vectorstoreqdrant/',
+		credentials: [
+			{
+				name: 'qdrantApi',
+				required: true,
+			},
+		],
+	},
+	methods: { listSearch: { qdrantCollectionsSearch } },
+	insertFields,
+	sharedFields,
+	async getVectorStoreClient(context, filter, embeddings, itemIndex) {
+		const collection = context.getNodeParameter('qdrantCollection', itemIndex, '', {
+			extractValue: true,
+		}) as string;
+
+		const credentials = await context.getCredentials('qdrantApi');
+
+		const config: QdrantLibArgs = {
+			url: credentials.qdrantUrl as string,
+			apiKey: credentials.apiKey as string,
+			collectionName: collection,
+		};
+
+		return await QdrantVectorStore.fromExistingCollection(embeddings, config);
+	},
+	async populateVectorStore(context, embeddings, documents, itemIndex) {
+		const collectionName = context.getNodeParameter('qdrantCollection', itemIndex, '', {
+			extractValue: true,
+		}) as string;
+
+		// If collection config is not provided, the collection will be created with default settings
+		// i.e. with the size of the passed embeddings and "Cosine" distance metric
+		const { collectionConfig } = context.getNodeParameter('options', itemIndex, {}) as {
+			collectionConfig?: QdrantSchemas['CreateCollection'];
+		};
+		const credentials = await context.getCredentials('qdrantApi');
+
+		const config: QdrantLibArgs = {
+			url: credentials.qdrantUrl as string,
+			apiKey: credentials.apiKey as string,
+			collectionName,
+			collectionConfig,
+		};
+
+		await QdrantVectorStore.fromDocuments(documents, embeddings, config);
+	},
+});
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreQdrant/qdrant.svg b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreQdrant/qdrant.svg
new file mode 100644
index 0000000000000..be9350cd287c6
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreQdrant/qdrant.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="256px" height="296px" viewBox="0 0 256 296" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMidYMid">
+    <title>qdrant</title>
+    <defs>
+        <linearGradient x1="81.5619048%" y1="44.8421053%" x2="-18.0857143%" y2="44.8421053%" id="linearGradient-1">
+            <stop stop-color="#FF3364" offset="0%"></stop>
+            <stop stop-color="#C91540" stop-opacity="0" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g>
+        <polygon fill="#24386C" points="201.31705 271.722427 195.422715 109.21267 184.747781 66.3682368 256 73.9112545 256 270.492509 212.474757 295.612626"></polygon>
+        <polygon fill="#7589BE" points="255.995151 73.8998107 212.469908 99.037384 122.649634 79.3346471 17.5160008 122.140288 1.1370484e-14 73.8998107 63.9883137 36.9499053 127.996024 0 191.986277 36.9499053"></polygon>
+        <polyline fill="#B2BFE8" points="0.00310340412 73.8998107 43.5283462 99.037384 68.7590217 174.073816 153.949405 242.236209 128.001067 295.599243 63.9933568 258.647398 0.00310340412 221.697492 0.00310340412 73.897871"></polyline>
+        <polyline fill="#24386C" points="156.856906 202.807459 128.001067 245.347371 128.001067 295.603122 168.946605 271.978458 190.043934 240.475027"></polyline>
+        <polygon fill="#7589BE" points="128.018523 195.107138 87.0555287 124.184656 95.8787005 100.678309 129.42068 84.4156955 168.946411 124.185819"></polygon>
+        <polyline fill="#B2BFE8" points="87.0555287 124.178837 128.001067 147.803501 128.001067 195.091621 90.131778 196.720927 67.2247763 167.471344 87.0555287 124.178856"></polyline>
+        <polygon fill="#24386C" points="128.001067 147.799621 168.946605 124.176897 196.813234 170.576668 163.090869 198.439418 128.001067 195.089293"></polygon>
+        <path d="M168.946605,271.974579 L212.471848,295.601182 L212.471848,99.0393237 L170.226759,74.658205 L128.001067,50.2770864 L85.7559782,74.658205 L43.5302858,99.0393237 L43.5302858,196.581255 L85.7559782,220.962373 L128.001067,245.345432 L168.946605,221.699432 L168.946605,271.974579 Z M168.946605,171.443681 L128.001067,195.087742 L87.0555287,171.443681 L87.0555287,124.174957 L128.001067,100.530897 L168.946605,124.174957 L168.946605,171.443681" fill="#DC244C"></path>
+        <polygon fill="url(#linearGradient-1)" points="128.018523 245.362888 128.018523 195.099379 87.2863443 171.657041 87.2863443 221.837146"></polygon>
+    </g>
+</svg>
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
new file mode 100644
index 0000000000000..ebeacd9a33f87
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreSupabase/VectorStoreSupabase.node.ts
@@ -0,0 +1,115 @@
+import { NodeOperationError, type INodeProperties } from 'n8n-workflow';
+import { createClient } from '@supabase/supabase-js';
+import { SupabaseVectorStore } from '@langchain/community/vectorstores/supabase';
+import { createVectorStoreNode } from '../shared/createVectorStoreNode';
+import { metadataFilterField } from '../../../utils/sharedFields';
+import { supabaseTableNameRLC } from '../shared/descriptions';
+import { supabaseTableNameSearch } from '../shared/methods/listSearch';
+
+const sharedFields: INodeProperties[] = [supabaseTableNameRLC];
+const insertFields: INodeProperties[] = [
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			{
+				displayName: 'Query Name',
+				name: 'queryName',
+				type: 'string',
+				default: 'match_documents',
+				description: 'Name of the query to use for matching documents',
+			},
+		],
+	},
+];
+const retrieveFields: INodeProperties[] = [
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			{
+				displayName: 'Query Name',
+				name: 'queryName',
+				type: 'string',
+				default: 'match_documents',
+				description: 'Name of the query to use for matching documents',
+			},
+			metadataFilterField,
+		],
+	},
+];
+export const VectorStoreSupabase = createVectorStoreNode({
+	meta: {
+		description: 'Work with your data in Supabase Vector Store',
+		icon: 'file:supabase.svg',
+		displayName: 'Supabase Vector Store',
+		docsUrl:
+			'https://docs.n8n.io/integrations/builtin/cluster-nodes/root-nodes/n8n-nodes-langchain.vectorstoresupabase/',
+		name: 'vectorStoreSupabase',
+		credentials: [
+			{
+				name: 'supabaseApi',
+				required: true,
+			},
+		],
+	},
+	methods: {
+		listSearch: { supabaseTableNameSearch },
+	},
+	sharedFields,
+	insertFields,
+	loadFields: retrieveFields,
+	retrieveFields,
+	async getVectorStoreClient(context, filter, embeddings, itemIndex) {
+		const tableName = context.getNodeParameter('tableName', itemIndex, '', {
+			extractValue: true,
+		}) as string;
+		const options = context.getNodeParameter('options', itemIndex, {}) as {
+			queryName: string;
+		};
+		const credentials = await context.getCredentials('supabaseApi');
+		const client = createClient(credentials.host as string, credentials.serviceRole as string);
+
+		return await SupabaseVectorStore.fromExistingIndex(embeddings, {
+			client,
+			tableName,
+			queryName: options.queryName ?? 'match_documents',
+			filter,
+		});
+	},
+	async populateVectorStore(context, embeddings, documents, itemIndex) {
+		const tableName = context.getNodeParameter('tableName', itemIndex, '', {
+			extractValue: true,
+		}) as string;
+		const options = context.getNodeParameter('options', itemIndex, {}) as {
+			queryName: string;
+		};
+		const credentials = await context.getCredentials('supabaseApi');
+		const client = createClient(credentials.host as string, credentials.serviceRole as string);
+
+		try {
+			await SupabaseVectorStore.fromDocuments(documents, embeddings, {
+				client,
+				tableName,
+				queryName: options.queryName ?? 'match_documents',
+			});
+		} catch (error) {
+			if ((error as Error).message === 'Error inserting: undefined 404 Not Found') {
+				throw new NodeOperationError(context.getNode(), `Table ${tableName} not found`, {
+					itemIndex,
+					description: 'Please check that the table exists in your vector store',
+				});
+			} else {
+				throw new NodeOperationError(context.getNode(), error as Error, {
+					itemIndex,
+				});
+			}
+		}
+	},
+});
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreSupabase/supabase.svg b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreSupabase/supabase.svg
new file mode 100644
index 0000000000000..7f00f09fc9d03
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreSupabase/supabase.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="109" height="113" fill="none"><path fill="url(#a)" d="M63.708 110.284c-2.86 3.601-8.658 1.628-8.727-2.97l-1.007-67.251h45.22c8.19 0 12.758 9.46 7.665 15.874z"/><path fill="url(#b)" fill-opacity=".2" d="M63.708 110.284c-2.86 3.601-8.658 1.628-8.727-2.97l-1.007-67.251h45.22c8.19 0 12.758 9.46 7.665 15.874z"/><path fill="#3ECF8E" d="M45.317 2.071c2.86-3.601 8.657-1.628 8.726 2.97l.442 67.251H9.83c-8.19 0-12.759-9.46-7.665-15.875z"/><defs><linearGradient id="a" x1="53.974" x2="94.163" y1="54.974" y2="71.829" gradientUnits="userSpaceOnUse"><stop stop-color="#249361"/><stop offset="1" stop-color="#3ECF8E"/></linearGradient><linearGradient id="b" x1="36.156" x2="54.484" y1="30.578" y2="65.081" gradientUnits="userSpaceOnUse"><stop/><stop offset="1" stop-opacity="0"/></linearGradient></defs></svg>
\ No newline at end of file
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
new file mode 100644
index 0000000000000..d2e772af9e4f3
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreSupabaseInsert/VectorStoreSupabaseInsert.node.ts
@@ -0,0 +1,127 @@
+import {
+	type IExecuteFunctions,
+	type INodeType,
+	type INodeTypeDescription,
+	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 { supabaseTableNameRLC } from '../shared/descriptions';
+import { supabaseTableNameSearch } from '../shared/methods/listSearch';
+
+// This node is deprecated. Use VectorStoreSupabase instead.
+export class VectorStoreSupabaseInsert implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Supabase: Insert',
+		// Vector Store nodes got merged into a single node
+		hidden: true,
+		name: 'vectorStoreSupabaseInsert',
+		icon: 'file:supabase.svg',
+		group: ['transform'],
+		version: 1,
+		description:
+			'Insert data into Supabase Vector Store index [https://supabase.com/docs/guides/ai/langchain]',
+		defaults: {
+			name: 'Supabase: Insert',
+		},
+		codex: {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Vector Stores'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/root-nodes/n8n-nodes-langchain.vectorstoresupabase/',
+					},
+				],
+			},
+		},
+		credentials: [
+			{
+				name: 'supabaseApi',
+				required: true,
+			},
+		],
+		inputs: [
+			NodeConnectionType.Main,
+			{
+				displayName: 'Document',
+				maxConnections: 1,
+				type: NodeConnectionType.AiDocument,
+				required: true,
+			},
+			{
+				displayName: 'Embedding',
+				maxConnections: 1,
+				type: NodeConnectionType.AiEmbedding,
+				required: true,
+			},
+		],
+		outputs: [NodeConnectionType.Main],
+		properties: [
+			{
+				displayName:
+					'Please refer to the <a href="https://supabase.com/docs/guides/ai/langchain" target="_blank">Supabase documentation</a> for more information on how to setup your database as a Vector Store.',
+				name: 'setupNotice',
+				type: 'notice',
+				default: '',
+			},
+			supabaseTableNameRLC,
+			{
+				displayName: 'Query Name',
+				name: 'queryName',
+				type: 'string',
+				default: 'match_documents',
+				required: true,
+				description: 'Name of the query to use for matching documents',
+			},
+			{
+				displayName: 'Specify the document to load in the document loader sub-node',
+				name: 'notice',
+				type: 'notice',
+				default: '',
+			},
+		],
+	};
+
+	methods = { listSearch: { supabaseTableNameSearch } };
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		this.logger.verbose('Executing data for Supabase Insert Vector Store');
+
+		const items = this.getInputData(0);
+		const tableName = this.getNodeParameter('tableName', 0, '', { extractValue: true }) as string;
+		const queryName = this.getNodeParameter('queryName', 0) as string;
+		const credentials = await this.getCredentials('supabaseApi');
+
+		const documentInput = (await this.getInputConnectionData(NodeConnectionType.AiDocument, 0)) as
+			| N8nJsonLoader
+			| Array<Document<Record<string, unknown>>>;
+
+		const embeddings = (await this.getInputConnectionData(
+			NodeConnectionType.AiEmbedding,
+			0,
+		)) as Embeddings;
+		const client = createClient(credentials.host as string, credentials.serviceRole as string);
+
+		const { processedDocuments, serializedDocuments } = await processDocuments(
+			documentInput,
+			items,
+		);
+
+		await SupabaseVectorStore.fromDocuments(processedDocuments, embeddings, {
+			client,
+			tableName,
+			queryName,
+		});
+
+		return await this.prepareOutputData(serializedDocuments);
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreSupabaseInsert/supabase.svg b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreSupabaseInsert/supabase.svg
new file mode 100644
index 0000000000000..7f00f09fc9d03
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreSupabaseInsert/supabase.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="109" height="113" fill="none"><path fill="url(#a)" d="M63.708 110.284c-2.86 3.601-8.658 1.628-8.727-2.97l-1.007-67.251h45.22c8.19 0 12.758 9.46 7.665 15.874z"/><path fill="url(#b)" fill-opacity=".2" d="M63.708 110.284c-2.86 3.601-8.658 1.628-8.727-2.97l-1.007-67.251h45.22c8.19 0 12.758 9.46 7.665 15.874z"/><path fill="#3ECF8E" d="M45.317 2.071c2.86-3.601 8.657-1.628 8.726 2.97l.442 67.251H9.83c-8.19 0-12.759-9.46-7.665-15.875z"/><defs><linearGradient id="a" x1="53.974" x2="94.163" y1="54.974" y2="71.829" gradientUnits="userSpaceOnUse"><stop stop-color="#249361"/><stop offset="1" stop-color="#3ECF8E"/></linearGradient><linearGradient id="b" x1="36.156" x2="54.484" y1="30.578" y2="65.081" gradientUnits="userSpaceOnUse"><stop/><stop offset="1" stop-opacity="0"/></linearGradient></defs></svg>
\ No newline at end of file
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
new file mode 100644
index 0000000000000..267277b36ec89
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreSupabaseLoad/VectorStoreSupabaseLoad.node.ts
@@ -0,0 +1,113 @@
+import {
+	type IExecuteFunctions,
+	type INodeType,
+	type INodeTypeDescription,
+	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 { supabaseTableNameRLC } from '../shared/descriptions';
+import { supabaseTableNameSearch } from '../shared/methods/listSearch';
+
+// This node is deprecated. Use VectorStoreSupabase instead.
+export class VectorStoreSupabaseLoad implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Supabase: Load',
+		name: 'vectorStoreSupabaseLoad',
+		icon: 'file:supabase.svg',
+		// Vector Store nodes got merged into a single node
+		hidden: true,
+		group: ['transform'],
+		version: 1,
+		description: 'Load data from Supabase Vector Store index',
+		defaults: {
+			name: 'Supabase: Load',
+		},
+		codex: {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Vector Stores'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/root-nodes/n8n-nodes-langchain.vectorstoresupabase/',
+					},
+				],
+			},
+		},
+		credentials: [
+			{
+				name: 'supabaseApi',
+				required: true,
+			},
+		],
+		inputs: [
+			{
+				displayName: 'Embedding',
+				maxConnections: 1,
+				type: NodeConnectionType.AiEmbedding,
+				required: true,
+			},
+		],
+		outputs: [NodeConnectionType.AiVectorStore],
+		outputNames: ['Vector Store'],
+		properties: [
+			supabaseTableNameRLC,
+			{
+				displayName: 'Query Name',
+				name: 'queryName',
+				type: 'string',
+				default: 'match_documents',
+				required: true,
+				description: 'Name of the query to use for matching documents',
+			},
+			{
+				displayName: 'Options',
+				name: 'options',
+				type: 'collection',
+				placeholder: 'Add Option',
+				default: {},
+				options: [metadataFilterField],
+			},
+		],
+	};
+
+	methods = { listSearch: { supabaseTableNameSearch } };
+
+	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
+		this.logger.verbose('Supply Supabase Load Vector Store');
+
+		const tableName = this.getNodeParameter('tableName', itemIndex, '', {
+			extractValue: true,
+		}) as string;
+		const queryName = this.getNodeParameter('queryName', itemIndex) as string;
+
+		const credentials = await this.getCredentials('supabaseApi');
+		const embeddings = (await this.getInputConnectionData(
+			NodeConnectionType.AiEmbedding,
+			0,
+		)) as Embeddings;
+
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+		const client = createClient(credentials.host as string, credentials.serviceRole as string);
+		const config: SupabaseLibArgs = {
+			client,
+			tableName,
+			queryName,
+			filter: getMetadataFiltersValues(this, itemIndex),
+		};
+
+		const vectorStore = await SupabaseVectorStore.fromExistingIndex(embeddings, config);
+
+		return {
+			response: logWrapper(vectorStore, this),
+		};
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreSupabaseLoad/supabase.svg b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreSupabaseLoad/supabase.svg
new file mode 100644
index 0000000000000..7f00f09fc9d03
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreSupabaseLoad/supabase.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="109" height="113" fill="none"><path fill="url(#a)" d="M63.708 110.284c-2.86 3.601-8.658 1.628-8.727-2.97l-1.007-67.251h45.22c8.19 0 12.758 9.46 7.665 15.874z"/><path fill="url(#b)" fill-opacity=".2" d="M63.708 110.284c-2.86 3.601-8.658 1.628-8.727-2.97l-1.007-67.251h45.22c8.19 0 12.758 9.46 7.665 15.874z"/><path fill="#3ECF8E" d="M45.317 2.071c2.86-3.601 8.657-1.628 8.726 2.97l.442 67.251H9.83c-8.19 0-12.759-9.46-7.665-15.875z"/><defs><linearGradient id="a" x1="53.974" x2="94.163" y1="54.974" y2="71.829" gradientUnits="userSpaceOnUse"><stop stop-color="#249361"/><stop offset="1" stop-color="#3ECF8E"/></linearGradient><linearGradient id="b" x1="36.156" x2="54.484" y1="30.578" y2="65.081" gradientUnits="userSpaceOnUse"><stop/><stop offset="1" stop-opacity="0"/></linearGradient></defs></svg>
\ No newline at end of file
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
new file mode 100644
index 0000000000000..4f999bb16fc55
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreZep/VectorStoreZep.node.ts
@@ -0,0 +1,133 @@
+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 { createVectorStoreNode } from '../shared/createVectorStoreNode';
+import { metadataFilterField } from '../../../utils/sharedFields';
+
+const embeddingDimensions: INodeProperties = {
+	displayName: 'Embedding Dimensions',
+	name: 'embeddingDimensions',
+	type: 'number',
+	default: 1536,
+	description: 'Whether to allow using characters from the Unicode surrogate blocks',
+};
+
+const insertFields: INodeProperties[] = [
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			embeddingDimensions,
+			{
+				displayName: 'Is Auto Embedded',
+				name: 'isAutoEmbedded',
+				type: 'boolean',
+				default: true,
+				description: 'Whether to automatically embed documents when they are added',
+			},
+		],
+	},
+];
+
+const retrieveFields: INodeProperties[] = [
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [embeddingDimensions, metadataFilterField],
+	},
+];
+
+export const VectorStoreZep = createVectorStoreNode({
+	meta: {
+		displayName: 'Zep Vector Store',
+		name: 'vectorStoreZep',
+		description: 'Work with your data in Zep Vector Store',
+		credentials: [
+			{
+				name: 'zepApi',
+				required: true,
+			},
+		],
+		icon: 'file:zep.png',
+		docsUrl:
+			'https://docs.n8n.io/integrations/builtin/cluster-nodes/root-nodes/n8n-nodes-langchain.vectorstorezep/',
+	},
+	sharedFields: [
+		{
+			displayName: 'Collection Name',
+			name: 'collectionName',
+			type: 'string',
+			default: '',
+			required: true,
+		},
+	],
+	insertFields,
+	loadFields: retrieveFields,
+	retrieveFields,
+	async getVectorStoreClient(context, filter, embeddings, itemIndex) {
+		const collectionName = context.getNodeParameter('collectionName', itemIndex) as string;
+
+		const options =
+			(context.getNodeParameter('options', itemIndex) as {
+				embeddingDimensions?: number;
+			}) || {};
+
+		const credentials = (await context.getCredentials('zepApi')) as {
+			apiKey?: string;
+			apiUrl: string;
+		};
+
+		const zepConfig: IZepConfig = {
+			apiUrl: credentials.apiUrl,
+			apiKey: credentials.apiKey,
+			collectionName,
+			embeddingDimensions: options.embeddingDimensions ?? 1536,
+			metadata: filter,
+		};
+
+		return new ZepVectorStore(embeddings, zepConfig);
+	},
+	async populateVectorStore(context, embeddings, documents, itemIndex) {
+		const collectionName = context.getNodeParameter('collectionName', itemIndex) as string;
+		const options =
+			(context.getNodeParameter('options', itemIndex) as {
+				isAutoEmbedded?: boolean;
+				embeddingDimensions?: number;
+			}) || {};
+
+		const credentials = (await context.getCredentials('zepApi')) as {
+			apiKey?: string;
+			apiUrl: string;
+		};
+
+		const zepConfig = {
+			apiUrl: credentials.apiUrl,
+			apiKey: credentials.apiKey,
+			collectionName,
+			embeddingDimensions: options.embeddingDimensions ?? 1536,
+			isAutoEmbedded: options.isAutoEmbedded ?? true,
+		};
+
+		try {
+			await ZepVectorStore.fromDocuments(documents, embeddings, zepConfig);
+		} catch (error) {
+			const errorCode = (error as IDataObject).code as number;
+			const responseData = (error as IDataObject).responseData as string;
+			if (errorCode === 400 && responseData.includes('CreateDocumentCollectionRequest')) {
+				throw new NodeOperationError(context.getNode(), `Collection ${collectionName} not found`, {
+					itemIndex,
+					description:
+						'Please check that the collection exists in your vector store, or make sure that collection name contains only alphanumeric characters',
+				});
+			}
+			throw new NodeOperationError(context.getNode(), error as Error, { itemIndex });
+		}
+	},
+});
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreZep/zep.png b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreZep/zep.png
new file mode 100644
index 0000000000000..12d5d975ffdd5
Binary files /dev/null and b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreZep/zep.png differ
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
new file mode 100644
index 0000000000000..53606927700b2
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreZepInsert/VectorStoreZepInsert.node.ts
@@ -0,0 +1,144 @@
+import {
+	type IExecuteFunctions,
+	type INodeType,
+	type INodeTypeDescription,
+	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 { processDocuments } from '../shared/processDocuments';
+
+// This node is deprecated. Use VectorStoreZep instead.
+export class VectorStoreZepInsert implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Zep Vector Store: Insert',
+		name: 'vectorStoreZepInsert',
+		hidden: true,
+		// eslint-disable-next-line n8n-nodes-base/node-class-description-icon-not-svg
+		icon: 'file:zep.png',
+		group: ['transform'],
+		version: 1,
+		description: 'Insert data into Zep Vector Store index',
+		defaults: {
+			name: 'Zep: Insert',
+		},
+		codex: {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Vector Stores'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/root-nodes/n8n-nodes-langchain.vectorstorezep/',
+					},
+				],
+			},
+		},
+		credentials: [
+			{
+				name: 'zepApi',
+				required: true,
+			},
+		],
+		inputs: [
+			NodeConnectionType.Main,
+			{
+				displayName: 'Document',
+				maxConnections: 1,
+				type: NodeConnectionType.AiDocument,
+				required: true,
+			},
+			{
+				displayName: 'Embedding',
+				maxConnections: 1,
+				type: NodeConnectionType.AiEmbedding,
+				required: true,
+			},
+		],
+		outputs: [NodeConnectionType.Main],
+		properties: [
+			{
+				displayName: 'Collection Name',
+				name: 'collectionName',
+				type: 'string',
+				default: '',
+				required: true,
+			},
+			{
+				displayName: 'Specify the document to load in the document loader sub-node',
+				name: 'notice',
+				type: 'notice',
+				default: '',
+			},
+			{
+				displayName: 'Options',
+				name: 'options',
+				type: 'collection',
+				placeholder: 'Add Option',
+				default: {},
+				options: [
+					{
+						displayName: 'Embedding Dimensions',
+						name: 'embeddingDimensions',
+						type: 'number',
+						default: 1536,
+						description: 'Whether to allow using characters from the Unicode surrogate blocks',
+					},
+					{
+						displayName: 'Is Auto Embedded',
+						name: 'isAutoEmbedded',
+						type: 'boolean',
+						default: true,
+						description: 'Whether to automatically embed documents when they are added',
+					},
+				],
+			},
+		],
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		this.logger.verbose('Executing data for Zep Insert Vector Store');
+		const items = this.getInputData(0);
+		const collectionName = this.getNodeParameter('collectionName', 0) as string;
+		const options =
+			(this.getNodeParameter('options', 0, {}) as {
+				isAutoEmbedded?: boolean;
+				embeddingDimensions?: number;
+			}) || {};
+
+		const credentials = (await this.getCredentials('zepApi')) as {
+			apiKey?: string;
+			apiUrl: string;
+		};
+
+		const documentInput = (await this.getInputConnectionData(NodeConnectionType.AiDocument, 0)) as
+			| N8nJsonLoader
+			| Array<Document<Record<string, unknown>>>;
+
+		const embeddings = (await this.getInputConnectionData(
+			NodeConnectionType.AiEmbedding,
+			0,
+		)) as Embeddings;
+
+		const { processedDocuments, serializedDocuments } = await processDocuments(
+			documentInput,
+			items,
+		);
+
+		const zepConfig = {
+			apiUrl: credentials.apiUrl,
+			apiKey: credentials.apiKey,
+			collectionName,
+			embeddingDimensions: options.embeddingDimensions ?? 1536,
+			isAutoEmbedded: options.isAutoEmbedded ?? true,
+		};
+
+		await ZepVectorStore.fromDocuments(processedDocuments, embeddings, zepConfig);
+
+		return await this.prepareOutputData(serializedDocuments);
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreZepInsert/zep.png b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreZepInsert/zep.png
new file mode 100644
index 0000000000000..12d5d975ffdd5
Binary files /dev/null and b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreZepInsert/zep.png differ
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
new file mode 100644
index 0000000000000..56313e1634da6
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreZepLoad/VectorStoreZepLoad.node.ts
@@ -0,0 +1,119 @@
+import {
+	NodeConnectionType,
+	type IExecuteFunctions,
+	type INodeType,
+	type INodeTypeDescription,
+	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';
+
+// This node is deprecated. Use VectorStoreZep instead.
+export class VectorStoreZepLoad implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Zep Vector Store: Load',
+		name: 'vectorStoreZepLoad',
+		hidden: true,
+		// eslint-disable-next-line n8n-nodes-base/node-class-description-icon-not-svg
+		icon: 'file:zep.png',
+		group: ['transform'],
+		version: 1,
+		description: 'Load data from Zep Vector Store index',
+		defaults: {
+			name: 'Zep: Load',
+		},
+		codex: {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Vector Stores'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/root-nodes/n8n-nodes-langchain.vectorstorezep/',
+					},
+				],
+			},
+		},
+		credentials: [
+			{
+				name: 'zepApi',
+				required: true,
+			},
+		],
+		inputs: [
+			{
+				displayName: 'Embedding',
+				maxConnections: 1,
+				type: NodeConnectionType.AiEmbedding,
+				required: true,
+			},
+		],
+		outputs: [NodeConnectionType.AiVectorStore],
+		outputNames: ['Vector Store'],
+		properties: [
+			{
+				displayName: 'Collection Name',
+				name: 'collectionName',
+				type: 'string',
+				default: '',
+				required: true,
+			},
+			{
+				displayName: 'Options',
+				name: 'options',
+				type: 'collection',
+				placeholder: 'Add Option',
+				default: {},
+				options: [
+					{
+						displayName: 'Embedding Dimensions',
+						name: 'embeddingDimensions',
+						type: 'number',
+						default: 1536,
+						description: 'Whether to allow using characters from the Unicode surrogate blocks',
+					},
+					metadataFilterField,
+				],
+			},
+		],
+	};
+
+	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
+		this.logger.verbose('Supplying data for Zep Load Vector Store');
+
+		const collectionName = this.getNodeParameter('collectionName', itemIndex) as string;
+
+		const options =
+			(this.getNodeParameter('options', itemIndex) as {
+				embeddingDimensions?: number;
+			}) || {};
+
+		const credentials = (await this.getCredentials('zepApi')) as {
+			apiKey?: string;
+			apiUrl: string;
+		};
+		const embeddings = (await this.getInputConnectionData(
+			NodeConnectionType.AiEmbedding,
+			0,
+		)) as Embeddings;
+
+		const zepConfig: IZepConfig = {
+			apiUrl: credentials.apiUrl,
+			apiKey: credentials.apiKey,
+			collectionName,
+			embeddingDimensions: options.embeddingDimensions ?? 1536,
+			metadata: getMetadataFiltersValues(this, itemIndex),
+		};
+
+		const vectorStore = new ZepVectorStore(embeddings, zepConfig);
+
+		return {
+			response: logWrapper(vectorStore, this),
+		};
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreZepLoad/zep.png b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreZepLoad/zep.png
new file mode 100644
index 0000000000000..12d5d975ffdd5
Binary files /dev/null and b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreZepLoad/zep.png differ
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/shared/MemoryVectorStoreManager.ts b/packages/@n8n/nodes-langchain/nodes/vector_store/shared/MemoryVectorStoreManager.ts
new file mode 100644
index 0000000000000..806a5129c55eb
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/shared/MemoryVectorStoreManager.ts
@@ -0,0 +1,46 @@
+import type { Document } from '@langchain/core/documents';
+import type { Embeddings } from '@langchain/core/embeddings';
+import { MemoryVectorStore } from 'langchain/vectorstores/memory';
+
+export class MemoryVectorStoreManager {
+	private static instance: MemoryVectorStoreManager | null = null;
+
+	private vectorStoreBuffer: Map<string, MemoryVectorStore>;
+
+	private embeddings: Embeddings;
+
+	private constructor(embeddings: Embeddings) {
+		this.vectorStoreBuffer = new Map();
+		this.embeddings = embeddings;
+	}
+
+	public static getInstance(embeddings: Embeddings): MemoryVectorStoreManager {
+		if (!MemoryVectorStoreManager.instance) {
+			MemoryVectorStoreManager.instance = new MemoryVectorStoreManager(embeddings);
+		}
+		return MemoryVectorStoreManager.instance;
+	}
+
+	public async getVectorStore(memoryKey: string): Promise<MemoryVectorStore> {
+		let vectorStoreInstance = this.vectorStoreBuffer.get(memoryKey);
+
+		if (!vectorStoreInstance) {
+			vectorStoreInstance = await MemoryVectorStore.fromExistingIndex(this.embeddings);
+			this.vectorStoreBuffer.set(memoryKey, vectorStoreInstance);
+		}
+
+		return vectorStoreInstance;
+	}
+
+	public async addDocuments(
+		memoryKey: string,
+		documents: Document[],
+		clearStore?: boolean,
+	): Promise<void> {
+		if (clearStore) {
+			this.vectorStoreBuffer.delete(memoryKey);
+		}
+		const vectorStoreInstance = await this.getVectorStore(memoryKey);
+		await vectorStoreInstance.addDocuments(documents);
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/shared/createVectorStoreNode.ts b/packages/@n8n/nodes-langchain/nodes/vector_store/shared/createVectorStoreNode.ts
new file mode 100644
index 0000000000000..e9045bd107309
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/shared/createVectorStoreNode.ts
@@ -0,0 +1,302 @@
+/* eslint-disable n8n-nodes-base/node-filename-against-convention */
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import type { VectorStore } from '@langchain/core/vectorstores';
+import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
+import type {
+	INodeCredentialDescription,
+	INodeProperties,
+	INodeExecutionData,
+	IExecuteFunctions,
+	INodeTypeDescription,
+	SupplyData,
+	INodeType,
+	ILoadOptionsFunctions,
+	INodeListSearchResult,
+} from 'n8n-workflow';
+import type { Embeddings } from '@langchain/core/embeddings';
+import type { Document } from '@langchain/core/documents';
+import { logWrapper } from '../../../utils/logWrapper';
+import type { N8nJsonLoader } from '../../../utils/N8nJsonLoader';
+import type { N8nBinaryLoader } from '../../../utils/N8nBinaryLoader';
+import { getMetadataFiltersValues, logAiEvent } from '../../../utils/helpers';
+import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+import { processDocument } from './processDocuments';
+
+interface NodeMeta {
+	displayName: string;
+	name: string;
+	description: string;
+	docsUrl: string;
+	icon: string;
+	credentials?: INodeCredentialDescription[];
+}
+interface VectorStoreNodeConstructorArgs {
+	meta: NodeMeta;
+	methods?: {
+		listSearch?: {
+			[key: string]: (
+				this: ILoadOptionsFunctions,
+				filter?: string,
+				paginationToken?: string,
+			) => Promise<INodeListSearchResult>;
+		};
+	};
+	sharedFields: INodeProperties[];
+	insertFields?: INodeProperties[];
+	loadFields?: INodeProperties[];
+	retrieveFields?: INodeProperties[];
+	populateVectorStore: (
+		context: IExecuteFunctions,
+		embeddings: Embeddings,
+		documents: Array<Document<Record<string, unknown>>>,
+		itemIndex: number,
+	) => Promise<void>;
+	getVectorStoreClient: (
+		context: IExecuteFunctions,
+		filter: Record<string, never> | undefined,
+		embeddings: Embeddings,
+		itemIndex: number,
+	) => Promise<VectorStore>;
+}
+
+function transformDescriptionForOperationMode(
+	fields: INodeProperties[],
+	mode: 'insert' | 'load' | 'retrieve',
+) {
+	return fields.map((field) => ({
+		...field,
+		displayOptions: { show: { mode: [mode] } },
+	}));
+}
+export const createVectorStoreNode = (args: VectorStoreNodeConstructorArgs) =>
+	class VectorStoreNodeType implements INodeType {
+		description: INodeTypeDescription = {
+			displayName: args.meta.displayName,
+			name: args.meta.name,
+			description: args.meta.description,
+			icon: args.meta.icon,
+			group: ['transform'],
+			version: 1,
+			defaults: {
+				name: args.meta.displayName,
+			},
+			codex: {
+				categories: ['AI'],
+				subcategories: {
+					AI: ['Vector Stores'],
+				},
+				resources: {
+					primaryDocumentation: [
+						{
+							url: args.meta.docsUrl,
+						},
+					],
+				},
+			},
+			credentials: args.meta.credentials,
+			// eslint-disable-next-line n8n-nodes-base/node-class-description-inputs-wrong-regular-node
+			inputs: `={{
+			((parameters) => {
+				const mode = parameters?.mode;
+				const inputs = [{ displayName: "Embedding", type: "${NodeConnectionType.AiEmbedding}", required: true, maxConnections: 1}]
+
+				if (['insert', 'load'].includes(mode)) {
+					inputs.push({ displayName: "", type: "${NodeConnectionType.Main}"})
+				}
+
+				if (mode === 'insert') {
+					inputs.push({ displayName: "Document", type: "${NodeConnectionType.AiDocument}", required: true, maxConnections: 1})
+				}
+				return inputs
+			})($parameter)
+		}}`,
+			outputs: `={{
+			((parameters) => {
+				const mode = parameters?.mode ?? 'retrieve';
+				if (mode === 'retrieve') {
+					return [{ displayName: "Vector Store", type: "${NodeConnectionType.AiVectorStore}"}]
+				}
+				return [{ displayName: "", type: "${NodeConnectionType.Main}"}]
+			})($parameter)
+		}}`,
+			properties: [
+				{
+					displayName: 'Operation Mode',
+					name: 'mode',
+					type: 'options',
+					noDataExpression: true,
+					default: 'retrieve',
+					options: [
+						{
+							name: 'Get Many',
+							value: 'load',
+							description: 'Get many ranked documents from vector store for query',
+							action: 'Get many ranked documents from vector store for query',
+						},
+						{
+							name: 'Insert Documents',
+							value: 'insert',
+							description: 'Insert documents into vector store',
+							action: 'Insert documents into vector store',
+						},
+						{
+							name: 'Retrieve Documents (For Agent/Chain)',
+							value: 'retrieve',
+							description: 'Retrieve documents from vector store to be used with AI nodes',
+							action: 'Retrieve documents from vector store to be used with AI nodes',
+						},
+					],
+				},
+				{
+					...getConnectionHintNoticeField([NodeConnectionType.AiRetriever]),
+					displayOptions: {
+						show: {
+							mode: ['retrieve'],
+						},
+					},
+				},
+				...args.sharedFields,
+				...transformDescriptionForOperationMode(args.insertFields ?? [], 'insert'),
+				// Prompt and topK are always used for the load operation
+				{
+					displayName: 'Prompt',
+					name: 'prompt',
+					type: 'string',
+					default: '',
+					required: true,
+					description:
+						'Search prompt to retrieve matching documents from the vector store using similarity-based ranking',
+					displayOptions: {
+						show: {
+							mode: ['load'],
+						},
+					},
+				},
+				{
+					displayName: 'Limit',
+					name: 'topK',
+					type: 'number',
+					default: 4,
+					description: 'Number of top results to fetch from vector store',
+					displayOptions: {
+						show: {
+							mode: ['load'],
+						},
+					},
+				},
+				...transformDescriptionForOperationMode(args.loadFields ?? [], 'load'),
+				...transformDescriptionForOperationMode(args.retrieveFields ?? [], 'retrieve'),
+			],
+		};
+
+		methods = args.methods;
+
+		async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+			const mode = this.getNodeParameter('mode', 0) as 'load' | 'insert' | 'retrieve';
+
+			const embeddings = (await this.getInputConnectionData(
+				NodeConnectionType.AiEmbedding,
+				0,
+			)) as Embeddings;
+
+			if (mode === 'load') {
+				const items = this.getInputData(0);
+
+				const resultData = [];
+				for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
+					const filter = getMetadataFiltersValues(this, itemIndex);
+					const vectorStore = await args.getVectorStoreClient(
+						this,
+						// We'll pass filter to similaritySearchVectorWithScore instaed of getVectorStoreClient
+						undefined,
+						embeddings,
+						itemIndex,
+					);
+					const prompt = this.getNodeParameter('prompt', itemIndex) as string;
+					const topK = this.getNodeParameter('topK', itemIndex, 4) as number;
+
+					const embeddedPrompt = await embeddings.embedQuery(prompt);
+					const docs = await vectorStore.similaritySearchVectorWithScore(
+						embeddedPrompt,
+						topK,
+						filter,
+					);
+
+					const serializedDocs = docs.map(([doc, score]) => {
+						const document = {
+							metadata: doc.metadata,
+							pageContent: doc.pageContent,
+						};
+
+						return {
+							json: { document, score },
+							pairedItem: {
+								item: itemIndex,
+							},
+						};
+					});
+
+					resultData.push(...serializedDocs);
+					void logAiEvent(this, 'n8n.ai.vector.store.searched', { query: prompt });
+				}
+
+				return await this.prepareOutputData(resultData);
+			}
+
+			if (mode === 'insert') {
+				const items = this.getInputData();
+
+				const documentInput = (await this.getInputConnectionData(
+					NodeConnectionType.AiDocument,
+					0,
+				)) as N8nJsonLoader | N8nBinaryLoader | Array<Document<Record<string, unknown>>>;
+
+				const resultData = [];
+				for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
+					const itemData = items[itemIndex];
+					const { processedDocuments, serializedDocuments } = await processDocument(
+						documentInput,
+						itemData,
+						itemIndex,
+					);
+					resultData.push(...serializedDocuments);
+
+					try {
+						await args.populateVectorStore(this, embeddings, processedDocuments, itemIndex);
+
+						void logAiEvent(this, 'n8n.ai.vector.store.populated');
+					} catch (error) {
+						throw error;
+					}
+				}
+
+				return await this.prepareOutputData(resultData);
+			}
+
+			throw new NodeOperationError(
+				this.getNode(),
+				'Only the "load" and "insert" operation modes are supported with execute',
+			);
+		}
+
+		async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
+			const mode = this.getNodeParameter('mode', 0) as 'load' | 'insert' | 'retrieve';
+			const filter = getMetadataFiltersValues(this, itemIndex);
+			const embeddings = (await this.getInputConnectionData(
+				NodeConnectionType.AiEmbedding,
+				0,
+			)) as Embeddings;
+
+			if (mode === 'retrieve') {
+				const vectorStore = await args.getVectorStoreClient(this, filter, embeddings, itemIndex);
+				return {
+					response: logWrapper(vectorStore, this),
+				};
+			}
+
+			throw new NodeOperationError(
+				this.getNode(),
+				'Only the "retrieve" operation mode is supported to supply data',
+			);
+		}
+	};
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/shared/descriptions.ts b/packages/@n8n/nodes-langchain/nodes/vector_store/shared/descriptions.ts
new file mode 100644
index 0000000000000..483e73c1fe793
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/shared/descriptions.ts
@@ -0,0 +1,70 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+export const pineconeIndexRLC: INodeProperties = {
+	displayName: 'Pinecone Index',
+	name: 'pineconeIndex',
+	type: 'resourceLocator',
+	default: { mode: 'list', value: '' },
+	required: true,
+	modes: [
+		{
+			displayName: 'From List',
+			name: 'list',
+			type: 'list',
+			typeOptions: {
+				searchListMethod: 'pineconeIndexSearch',
+			},
+		},
+		{
+			displayName: 'ID',
+			name: 'id',
+			type: 'string',
+		},
+	],
+};
+
+export const supabaseTableNameRLC: INodeProperties = {
+	displayName: 'Table Name',
+	name: 'tableName',
+	type: 'resourceLocator',
+	default: { mode: 'list', value: '' },
+	required: true,
+	modes: [
+		{
+			displayName: 'From List',
+			name: 'list',
+			type: 'list',
+			typeOptions: {
+				searchListMethod: 'supabaseTableNameSearch',
+			},
+		},
+		{
+			displayName: 'ID',
+			name: 'id',
+			type: 'string',
+		},
+	],
+};
+
+export const qdrantCollectionRLC: INodeProperties = {
+	displayName: 'Qdrant Collection',
+	name: 'qdrantCollection',
+	type: 'resourceLocator',
+	default: { mode: 'list', value: '' },
+	required: true,
+	modes: [
+		{
+			displayName: 'From List',
+			name: 'list',
+			type: 'list',
+			typeOptions: {
+				searchListMethod: 'qdrantCollectionsSearch',
+			},
+		},
+		{
+			displayName: 'ID',
+			name: 'id',
+			type: 'string',
+		},
+	],
+};
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
new file mode 100644
index 0000000000000..f12ff5d5cf0b9
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/shared/methods/listSearch.ts
@@ -0,0 +1,69 @@
+import { ApplicationError, type IDataObject, type ILoadOptionsFunctions } from 'n8n-workflow';
+import { Pinecone } from '@pinecone-database/pinecone';
+import { QdrantClient } from '@qdrant/js-client-rest';
+
+export async function pineconeIndexSearch(this: ILoadOptionsFunctions) {
+	const credentials = await this.getCredentials('pineconeApi');
+
+	const client = new Pinecone({
+		apiKey: credentials.apiKey as string,
+	});
+
+	const indexes = await client.listIndexes();
+
+	const results = (indexes.indexes ?? []).map((index) => ({
+		name: index.name,
+		value: index.name,
+	}));
+
+	return { results };
+}
+
+export async function supabaseTableNameSearch(this: ILoadOptionsFunctions) {
+	const credentials = await this.getCredentials('supabaseApi');
+
+	const results = [];
+
+	if (typeof credentials.host !== 'string') {
+		throw new ApplicationError('Expected Supabase credentials host to be a string');
+	}
+
+	const { paths } = (await this.helpers.requestWithAuthentication.call(this, 'supabaseApi', {
+		headers: {
+			Prefer: 'return=representation',
+		},
+		method: 'GET',
+		uri: `${credentials.host}/rest/v1/`,
+		json: true,
+	})) as { paths: IDataObject };
+
+	for (const path of Object.keys(paths)) {
+		//omit introspection path
+		if (path === '/') continue;
+
+		results.push({
+			name: path.replace('/', ''),
+			value: path.replace('/', ''),
+		});
+	}
+
+	return { results };
+}
+
+export async function qdrantCollectionsSearch(this: ILoadOptionsFunctions) {
+	const credentials = await this.getCredentials('qdrantApi');
+
+	const client = new QdrantClient({
+		url: credentials.qdrantUrl as string,
+		apiKey: credentials.apiKey as string,
+	});
+
+	const response = await client.getCollections();
+
+	const results = response.collections.map((collection) => ({
+		name: collection.name,
+		value: collection.name,
+	}));
+
+	return { results };
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/shared/processDocuments.ts b/packages/@n8n/nodes-langchain/nodes/vector_store/shared/processDocuments.ts
new file mode 100644
index 0000000000000..5a3847d6911a1
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/shared/processDocuments.ts
@@ -0,0 +1,51 @@
+import type { Document } from '@langchain/core/documents';
+import type { INodeExecutionData } from 'n8n-workflow';
+import { N8nJsonLoader } from '../../../utils/N8nJsonLoader';
+import { N8nBinaryLoader } from '../../../utils/N8nBinaryLoader';
+
+export async function processDocuments(
+	documentInput: N8nJsonLoader | N8nBinaryLoader | Array<Document<Record<string, unknown>>>,
+	inputItems: INodeExecutionData[],
+) {
+	let processedDocuments: Document[];
+
+	if (documentInput instanceof N8nJsonLoader || documentInput instanceof N8nBinaryLoader) {
+		processedDocuments = await documentInput.processAll(inputItems);
+	} else {
+		processedDocuments = documentInput;
+	}
+
+	const serializedDocuments = processedDocuments.map(({ metadata, pageContent }) => ({
+		json: { metadata, pageContent },
+	}));
+
+	return {
+		processedDocuments,
+		serializedDocuments,
+	};
+}
+export async function processDocument(
+	documentInput: N8nJsonLoader | N8nBinaryLoader | Array<Document<Record<string, unknown>>>,
+	inputItem: INodeExecutionData,
+	itemIndex: number,
+) {
+	let processedDocuments: Document[];
+
+	if (documentInput instanceof N8nJsonLoader || documentInput instanceof N8nBinaryLoader) {
+		processedDocuments = await documentInput.processItem(inputItem, itemIndex);
+	} else {
+		processedDocuments = documentInput;
+	}
+
+	const serializedDocuments = processedDocuments.map(({ metadata, pageContent }) => ({
+		json: { metadata, pageContent },
+		pairedItem: {
+			item: itemIndex,
+		},
+	}));
+
+	return {
+		processedDocuments,
+		serializedDocuments,
+	};
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/OpenAi.node.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/OpenAi.node.ts
new file mode 100644
index 0000000000000..1743c6961859f
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/OpenAi.node.ts
@@ -0,0 +1,17 @@
+import type { IExecuteFunctions, INodeType } from 'n8n-workflow';
+import { router } from './actions/router';
+import { versionDescription } from './actions/versionDescription';
+import { listSearch, loadOptions } from './methods';
+
+export class OpenAi implements INodeType {
+	description = versionDescription;
+
+	methods = {
+		listSearch,
+		loadOptions,
+	};
+
+	async execute(this: IExecuteFunctions) {
+		return await router.call(this);
+	}
+}
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
new file mode 100644
index 0000000000000..30664aebcc12b
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/assistant/create.operation.ts
@@ -0,0 +1,256 @@
+import type {
+	INodeProperties,
+	IExecuteFunctions,
+	INodeExecutionData,
+	IDataObject,
+} from 'n8n-workflow';
+import { NodeOperationError, updateDisplayOptions } from 'n8n-workflow';
+import { apiRequest } from '../../transport';
+import { modelRLC } from '../descriptions';
+
+const properties: INodeProperties[] = [
+	modelRLC,
+	{
+		displayName: 'Name',
+		name: 'name',
+		type: 'string',
+		default: '',
+		description: 'The name of the assistant. The maximum length is 256 characters.',
+		placeholder: 'e.g. My Assistant',
+		required: true,
+	},
+	{
+		displayName: 'Description',
+		name: 'description',
+		type: 'string',
+		default: '',
+		description: 'The description of the assistant. The maximum length is 512 characters.',
+		placeholder: 'e.g. My personal assistant',
+	},
+	{
+		displayName: 'Instructions',
+		name: 'instructions',
+		type: 'string',
+		description:
+			'The system instructions that the assistant uses. The maximum length is 32768 characters.',
+		default: '',
+		typeOptions: {
+			rows: 2,
+		},
+	},
+	{
+		displayName: 'Code Interpreter',
+		name: 'codeInterpreter',
+		type: 'boolean',
+		default: false,
+		description:
+			'Whether to enable the code interpreter that allows the assistants to write and run Python code in a sandboxed execution environment, find more <a href="https://platform.openai.com/docs/assistants/tools/code-interpreter" target="_blank">here</a>',
+	},
+	{
+		displayName: 'Knowledge Retrieval',
+		name: 'knowledgeRetrieval',
+		type: 'boolean',
+		default: false,
+		description:
+			'Whether to augments the assistant with knowledge from outside its model, such as proprietary product information or documents, find more <a href="https://platform.openai.com/docs/assistants/tools/knowledge-retrieval" target="_blank">here</a>',
+	},
+	//we want to display Files selector only when codeInterpreter true or knowledgeRetrieval true or both
+	{
+		// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-multi-options
+		displayName: 'Files',
+		name: 'file_ids',
+		type: 'multiOptions',
+		// eslint-disable-next-line n8n-nodes-base/node-param-description-wrong-for-dynamic-multi-options
+		description:
+			'The files to be used by the assistant, there can be a maximum of 20 files attached to the assistant. You can use expression to pass file IDs as an array or comma-separated string.',
+		typeOptions: {
+			loadOptionsMethod: 'getFiles',
+		},
+		default: [],
+		hint: "Add more files by using the 'Upload a File' operation",
+		displayOptions: {
+			show: {
+				codeInterpreter: [true],
+			},
+			hide: {
+				knowledgeRetrieval: [true],
+			},
+		},
+	},
+	{
+		// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-multi-options
+		displayName: 'Files',
+		name: 'file_ids',
+		type: 'multiOptions',
+		// eslint-disable-next-line n8n-nodes-base/node-param-description-wrong-for-dynamic-multi-options
+		description:
+			'The files to be used by the assistant, there can be a maximum of 20 files attached to the assistant',
+		typeOptions: {
+			loadOptionsMethod: 'getFiles',
+		},
+		default: [],
+		hint: "Add more files by using the 'Upload a File' operation",
+		displayOptions: {
+			show: {
+				knowledgeRetrieval: [true],
+			},
+			hide: {
+				codeInterpreter: [true],
+			},
+		},
+	},
+	{
+		// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-multi-options
+		displayName: 'Files',
+		name: 'file_ids',
+		type: 'multiOptions',
+		// eslint-disable-next-line n8n-nodes-base/node-param-description-wrong-for-dynamic-multi-options
+		description:
+			'The files to be used by the assistant, there can be a maximum of 20 files attached to the assistant',
+		typeOptions: {
+			loadOptionsMethod: 'getFiles',
+		},
+		default: [],
+		hint: "Add more files by using the 'Upload a File' operation",
+		displayOptions: {
+			show: {
+				knowledgeRetrieval: [true],
+				codeInterpreter: [true],
+			},
+		},
+	},
+	{
+		displayName:
+			'Add custom n8n tools when you <i>message</i> your assistant (rather than when creating it)',
+		name: 'noticeTools',
+		type: 'notice',
+		default: '',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		placeholder: 'Add Option',
+		type: 'collection',
+		default: {},
+		options: [
+			{
+				displayName: 'Fail if Assistant Already Exists',
+				name: 'failIfExists',
+				type: 'boolean',
+				default: false,
+				description:
+					'Whether to fail an operation if the assistant with the same name already exists',
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		operation: ['create'],
+		resource: ['assistant'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	const model = this.getNodeParameter('modelId', i, '', { extractValue: true }) as string;
+	const name = this.getNodeParameter('name', i) as string;
+	const assistantDescription = this.getNodeParameter('description', i) as string;
+	const instructions = this.getNodeParameter('instructions', i) as string;
+	const codeInterpreter = this.getNodeParameter('codeInterpreter', i) as boolean;
+	const knowledgeRetrieval = this.getNodeParameter('knowledgeRetrieval', i) as boolean;
+	let file_ids = this.getNodeParameter('file_ids', i, []) as string[] | string;
+	if (typeof file_ids === 'string') {
+		file_ids = file_ids.split(',').map((file_id) => file_id.trim());
+	}
+	const options = this.getNodeParameter('options', i, {});
+
+	if (options.failIfExists) {
+		const assistants: string[] = [];
+
+		let has_more = true;
+		let after: string | undefined;
+
+		do {
+			const response = (await apiRequest.call(this, 'GET', '/assistants', {
+				headers: {
+					'OpenAI-Beta': 'assistants=v1',
+				},
+				qs: {
+					limit: 100,
+					after,
+				},
+			})) as { data: IDataObject[]; has_more: boolean; last_id: string };
+
+			for (const assistant of response.data || []) {
+				assistants.push(assistant.name as string);
+			}
+
+			has_more = response.has_more;
+
+			if (has_more) {
+				after = response.last_id;
+			} else {
+				break;
+			}
+		} while (has_more);
+
+		if (assistants.includes(name)) {
+			throw new NodeOperationError(
+				this.getNode(),
+				`An assistant with the same name '${name}' already exists`,
+				{ itemIndex: i },
+			);
+		}
+	}
+
+	if (file_ids.length > 20) {
+		throw new NodeOperationError(
+			this.getNode(),
+			'The maximum number of files that can be attached to the assistant is 20',
+			{ itemIndex: i },
+		);
+	}
+
+	const body: IDataObject = {
+		model,
+		name,
+		description: assistantDescription,
+		instructions,
+		file_ids,
+	};
+
+	const tools = [];
+
+	if (codeInterpreter) {
+		tools.push({
+			type: 'code_interpreter',
+		});
+	}
+
+	if (knowledgeRetrieval) {
+		tools.push({
+			type: 'retrieval',
+		});
+	}
+
+	if (tools.length) {
+		body.tools = tools;
+	}
+
+	const response = await apiRequest.call(this, 'POST', '/assistants', {
+		body,
+		headers: {
+			'OpenAI-Beta': 'assistants=v1',
+		},
+	});
+
+	return [
+		{
+			json: response,
+			pairedItem: { item: i },
+		},
+	];
+}
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
new file mode 100644
index 0000000000000..83f958e866228
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/assistant/deleteAssistant.operation.ts
@@ -0,0 +1,32 @@
+import type { INodeProperties, IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
+import { updateDisplayOptions } from 'n8n-workflow';
+import { apiRequest } from '../../transport';
+import { assistantRLC } from '../descriptions';
+
+const properties: INodeProperties[] = [assistantRLC];
+
+const displayOptions = {
+	show: {
+		operation: ['deleteAssistant'],
+		resource: ['assistant'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	const assistantId = this.getNodeParameter('assistantId', i, '', { extractValue: true }) as string;
+
+	const response = await apiRequest.call(this, 'DELETE', `/assistants/${assistantId}`, {
+		headers: {
+			'OpenAI-Beta': 'assistants=v1',
+		},
+	});
+
+	return [
+		{
+			json: response,
+			pairedItem: { item: i },
+		},
+	];
+}
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
new file mode 100644
index 0000000000000..3f869ffcc877c
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/assistant/index.ts
@@ -0,0 +1,62 @@
+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 update from './update.operation';
+
+export { create, deleteAssistant, message, list, update };
+
+export const description: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		options: [
+			{
+				name: 'Create an Assistant',
+				value: 'create',
+				action: 'Create an assistant',
+				description: 'Create a new assistant',
+			},
+			{
+				name: 'Delete an Assistant',
+				value: 'deleteAssistant',
+				action: 'Delete an assistant',
+				description: 'Delete an assistant from the account',
+			},
+			{
+				name: 'List Assistants',
+				value: 'list',
+				action: 'List assistants',
+				description: 'List assistants in the organization',
+			},
+			{
+				name: 'Message an Assistant',
+				value: 'message',
+				action: 'Message an assistant',
+				description: 'Send messages to an assistant',
+			},
+			{
+				name: 'Update an Assistant',
+				value: 'update',
+				action: 'Update an assistant',
+				description: 'Update an existing assistant',
+			},
+		],
+		default: 'message',
+		displayOptions: {
+			show: {
+				resource: ['assistant'],
+			},
+		},
+	},
+
+	...create.description,
+	...deleteAssistant.description,
+	...message.description,
+	...list.description,
+	...update.description,
+];
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
new file mode 100644
index 0000000000000..ac9adfa169bc2
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/assistant/list.operation.ts
@@ -0,0 +1,75 @@
+import type { INodeProperties, IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
+import { updateDisplayOptions } from 'n8n-workflow';
+import { apiRequest } from '../../transport';
+
+const properties: INodeProperties[] = [
+	{
+		displayName: 'Simplify Output',
+		name: 'simplify',
+		type: 'boolean',
+		default: true,
+		description: 'Whether to return a simplified version of the response instead of the raw data',
+	},
+];
+
+const displayOptions = {
+	show: {
+		operation: ['list'],
+		resource: ['assistant'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	const returnData: INodeExecutionData[] = [];
+
+	let has_more = true;
+	let after: string | undefined;
+
+	do {
+		const response = await apiRequest.call(this, 'GET', '/assistants', {
+			headers: {
+				'OpenAI-Beta': 'assistants=v1',
+			},
+			qs: {
+				limit: 100,
+				after,
+			},
+		});
+
+		for (const assistant of response.data || []) {
+			try {
+				assistant.created_at = new Date(assistant.created_at * 1000).toISOString();
+			} catch (error) {}
+
+			returnData.push({ json: assistant, pairedItem: { item: i } });
+		}
+
+		has_more = response.has_more;
+
+		if (has_more) {
+			after = response.last_id as string;
+		} else {
+			break;
+		}
+	} while (has_more);
+
+	const simplify = this.getNodeParameter('simplify', i) as boolean;
+
+	if (simplify) {
+		return returnData.map((item) => {
+			const { id, name, model } = item.json;
+			return {
+				json: {
+					id,
+					name,
+					model,
+				},
+				pairedItem: { item: i },
+			};
+		});
+	}
+
+	return returnData;
+}
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
new file mode 100644
index 0000000000000..2f49f30c64942
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/assistant/message.operation.ts
@@ -0,0 +1,202 @@
+import { AgentExecutor } from 'langchain/agents';
+
+import { OpenAIAssistantRunnable } from 'langchain/experimental/openai_assistant';
+import type { OpenAIToolType } from 'langchain/dist/experimental/openai_assistant/schema';
+import { OpenAI as OpenAIClient } from 'openai';
+
+import { NodeOperationError, updateDisplayOptions } from 'n8n-workflow';
+import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
+
+import { formatToOpenAIAssistantTool } from '../../helpers/utils';
+import { assistantRLC } from '../descriptions';
+
+import { getConnectedTools } from '../../../../../utils/helpers';
+import { getTracingConfig } from '../../../../../utils/tracing';
+
+const properties: INodeProperties[] = [
+	assistantRLC,
+	{
+		displayName: 'Prompt',
+		name: 'prompt',
+		type: 'options',
+		options: [
+			{
+				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+				name: 'Take from previous node automatically',
+				value: 'auto',
+				description: 'Looks for an input field called chatInput',
+			},
+			{
+				// 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',
+			},
+		],
+		default: 'auto',
+	},
+	{
+		displayName: 'Text',
+		name: 'text',
+		type: 'string',
+		default: '',
+		placeholder: 'e.g. Hello, how can you help me?',
+		typeOptions: {
+			rows: 2,
+		},
+		displayOptions: {
+			show: {
+				prompt: ['define'],
+			},
+		},
+	},
+	{
+		displayName: 'Connect your own custom n8n tools to this node on the canvas',
+		name: 'noticeTools',
+		type: 'notice',
+		default: '',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		placeholder: 'Add Option',
+		description: 'Additional options to add',
+		type: 'collection',
+		default: {},
+		options: [
+			{
+				displayName: 'Base URL',
+				name: 'baseURL',
+				default: 'https://api.openai.com/v1',
+				description: 'Override the default base URL for the API',
+				type: 'string',
+			},
+			{
+				displayName: 'Max Retries',
+				name: 'maxRetries',
+				default: 2,
+				description: 'Maximum number of retries to attempt',
+				type: 'number',
+			},
+			{
+				displayName: 'Timeout',
+				name: 'timeout',
+				default: 10000,
+				description: 'Maximum amount of time a request is allowed to take in milliseconds',
+				type: 'number',
+			},
+			{
+				displayName: 'Preserve Original Tools',
+				name: 'preserveOriginalTools',
+				type: 'boolean',
+				default: true,
+				description:
+					'Whether to preserve the original tools of the assistant after the execution of this node, otherwise the tools will be replaced with the connected tools, if any, default is true',
+				displayOptions: {
+					show: {
+						'@version': [{ _cnd: { gte: 1.3 } }],
+					},
+				},
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		operation: ['message'],
+		resource: ['assistant'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	const credentials = await this.getCredentials('openAiApi');
+	const nodeVersion = this.getNode().typeVersion;
+
+	const prompt = this.getNodeParameter('prompt', i) as string;
+
+	let input;
+	if (prompt === 'auto') {
+		input = this.evaluateExpression('{{ $json["chatInput"] }}', i) as string;
+	} else {
+		input = this.getNodeParameter('text', i) as string;
+	}
+
+	if (input === undefined) {
+		throw new NodeOperationError(this.getNode(), 'No prompt specified', {
+			description:
+				"Expected to find the prompt in an input field called 'chatInput' (this is what the chat trigger node outputs). To use something else, change the 'Prompt' parameter",
+		});
+	}
+
+	const assistantId = this.getNodeParameter('assistantId', i, '', { extractValue: true }) as string;
+
+	const options = this.getNodeParameter('options', i, {}) as {
+		baseURL?: string;
+		maxRetries: number;
+		timeout: number;
+		preserveOriginalTools?: boolean;
+	};
+
+	const client = new OpenAIClient({
+		apiKey: credentials.apiKey as string,
+		maxRetries: options.maxRetries ?? 2,
+		timeout: options.timeout ?? 10000,
+		baseURL: options.baseURL,
+	});
+
+	const agent = new OpenAIAssistantRunnable({ assistantId, client, asAgent: true });
+
+	const tools = await getConnectedTools(this, nodeVersion > 1);
+	let assistantTools;
+
+	if (tools.length) {
+		const transformedConnectedTools = tools?.map(formatToOpenAIAssistantTool) ?? [];
+		const nativeToolsParsed: OpenAIToolType = [];
+
+		assistantTools = (await client.beta.assistants.retrieve(assistantId)).tools;
+
+		const useCodeInterpreter = assistantTools.some((tool) => tool.type === 'code_interpreter');
+		if (useCodeInterpreter) {
+			nativeToolsParsed.push({
+				type: 'code_interpreter',
+			});
+		}
+
+		const useRetrieval = assistantTools.some((tool) => tool.type === 'file_search');
+		if (useRetrieval) {
+			nativeToolsParsed.push({
+				type: 'file_search',
+			});
+		}
+
+		await client.beta.assistants.update(assistantId, {
+			tools: [...nativeToolsParsed, ...transformedConnectedTools],
+		});
+	}
+
+	const agentExecutor = AgentExecutor.fromAgentAndTools({
+		agent,
+		tools: tools ?? [],
+	});
+
+	const response = await agentExecutor.withConfig(getTracingConfig(this)).invoke({
+		content: input,
+		signal: this.getExecutionCancelSignal(),
+		timeout: options.timeout ?? 10000,
+	});
+
+	if (
+		options.preserveOriginalTools !== false &&
+		nodeVersion >= 1.3 &&
+		(assistantTools ?? [])?.length
+	) {
+		await client.beta.assistants.update(assistantId, {
+			tools: assistantTools,
+		});
+	}
+
+	return [{ json: response, pairedItem: { item: i } }];
+}
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
new file mode 100644
index 0000000000000..bdf92c0d6b1ae
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/assistant/update.operation.ts
@@ -0,0 +1,198 @@
+import type {
+	INodeProperties,
+	IExecuteFunctions,
+	INodeExecutionData,
+	IDataObject,
+} from 'n8n-workflow';
+import { NodeOperationError, updateDisplayOptions } from 'n8n-workflow';
+import { apiRequest } from '../../transport';
+import { assistantRLC, modelRLC } from '../descriptions';
+
+const properties: INodeProperties[] = [
+	assistantRLC,
+	{
+		displayName: 'Options',
+		name: 'options',
+		placeholder: 'Add Option',
+		type: 'collection',
+		default: {},
+		options: [
+			{
+				displayName: 'Code Interpreter',
+				name: 'codeInterpreter',
+				type: 'boolean',
+				default: false,
+				description:
+					'Whether to enable the code interpreter that allows the assistants to write and run Python code in a sandboxed execution environment, find more <a href="https://platform.openai.com/docs/assistants/tools/code-interpreter" target="_blank">here</a>',
+			},
+			{
+				displayName: 'Description',
+				name: 'description',
+				type: 'string',
+				default: '',
+				description: 'The description of the assistant. The maximum length is 512 characters.',
+				placeholder: 'e.g. My personal assistant',
+			},
+
+			{
+				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-multi-options
+				displayName: 'Files',
+				name: 'file_ids',
+				type: 'multiOptions',
+				// eslint-disable-next-line n8n-nodes-base/node-param-description-wrong-for-dynamic-multi-options
+				description:
+					'The files to be used by the assistant, there can be a maximum of 20 files attached to the assistant. You can use expression to pass file IDs as an array or comma-separated string.',
+				typeOptions: {
+					loadOptionsMethod: 'getFiles',
+				},
+				default: [],
+				hint: "Add more files by using the 'Upload a File' operation, any existing files not selected here will be removed.",
+			},
+			{
+				displayName: 'Instructions',
+				name: 'instructions',
+				type: 'string',
+				description:
+					'The system instructions that the assistant uses. The maximum length is 32768 characters.',
+				default: '',
+				typeOptions: {
+					rows: 2,
+				},
+			},
+			{
+				displayName: 'Knowledge Retrieval',
+				name: 'knowledgeRetrieval',
+				type: 'boolean',
+				default: false,
+				description:
+					'Whether to augments the assistant with knowledge from outside its model, such as proprietary product information or documents, find more <a href="https://platform.openai.com/docs/assistants/tools/knowledge-retrieval" target="_blank">here</a>',
+			},
+			{ ...modelRLC, required: false },
+			{
+				displayName: 'Name',
+				name: 'name',
+				type: 'string',
+				default: '',
+				description: 'The name of the assistant. The maximum length is 256 characters.',
+				placeholder: 'e.g. My Assistant',
+			},
+
+			{
+				displayName: 'Remove All Custom Tools (Functions)',
+				name: 'removeCustomTools',
+				type: 'boolean',
+				default: false,
+				description: 'Whether to remove all custom tools (functions) from the assistant',
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		operation: ['update'],
+		resource: ['assistant'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	const assistantId = this.getNodeParameter('assistantId', i, '', { extractValue: true }) as string;
+	const options = this.getNodeParameter('options', i, {});
+
+	const {
+		modelId,
+		name,
+		instructions,
+		codeInterpreter,
+		knowledgeRetrieval,
+		file_ids,
+		removeCustomTools,
+	} = options;
+
+	const assistantDescription = options.description as string;
+
+	const body: IDataObject = {};
+
+	if (file_ids) {
+		let files = file_ids;
+		if (typeof files === 'string') {
+			files = files.split(',').map((file_id) => file_id.trim());
+		}
+		if ((file_ids as IDataObject[]).length > 20) {
+			throw new NodeOperationError(
+				this.getNode(),
+				'The maximum number of files that can be attached to the assistant is 20',
+				{ itemIndex: i },
+			);
+		}
+
+		body.file_ids = files;
+	}
+
+	if (modelId) {
+		body.model = this.getNodeParameter('options.modelId', i, '', { extractValue: true }) as string;
+	}
+
+	if (name) {
+		body.name = name;
+	}
+
+	if (assistantDescription) {
+		body.description = assistantDescription;
+	}
+
+	if (instructions) {
+		body.instructions = instructions;
+	}
+
+	let tools =
+		((
+			await apiRequest.call(this, 'GET', `/assistants/${assistantId}`, {
+				headers: {
+					'OpenAI-Beta': 'assistants=v1',
+				},
+			})
+		).tools as IDataObject[]) || [];
+
+	if (codeInterpreter && !tools.find((tool) => tool.type === 'code_interpreter')) {
+		tools.push({
+			type: 'code_interpreter',
+		});
+	}
+
+	if (codeInterpreter === false && tools.find((tool) => tool.type === 'code_interpreter')) {
+		tools = tools.filter((tool) => tool.type !== 'code_interpreter');
+	}
+
+	if (knowledgeRetrieval && !tools.find((tool) => tool.type === 'retrieval')) {
+		tools.push({
+			type: 'retrieval',
+		});
+	}
+
+	if (knowledgeRetrieval === false && tools.find((tool) => tool.type === 'retrieval')) {
+		tools = tools.filter((tool) => tool.type !== 'retrieval');
+	}
+
+	if (removeCustomTools) {
+		tools = tools.filter((tool) => tool.type !== 'function');
+	}
+
+	body.tools = tools;
+
+	const response = await apiRequest.call(this, 'POST', `/assistants/${assistantId}`, {
+		body,
+		headers: {
+			'OpenAI-Beta': 'assistants=v1',
+		},
+	});
+
+	return [
+		{
+			json: response,
+			pairedItem: { item: i },
+		},
+	];
+}
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
new file mode 100644
index 0000000000000..2a1c59090d1db
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/audio/generate.operation.ts
@@ -0,0 +1,187 @@
+import type {
+	INodeProperties,
+	IExecuteFunctions,
+	IDataObject,
+	INodeExecutionData,
+} from 'n8n-workflow';
+import { updateDisplayOptions } from 'n8n-workflow';
+import { apiRequest } from '../../transport';
+
+const properties: INodeProperties[] = [
+	{
+		displayName: 'Model',
+		name: 'model',
+		type: 'options',
+		default: 'tts-1',
+		options: [
+			{
+				name: 'TTS-1',
+				value: 'tts-1',
+			},
+			{
+				name: 'TTS-1-HD',
+				value: 'tts-1-hd',
+			},
+		],
+	},
+	{
+		displayName: 'Text Input',
+		name: 'input',
+		type: 'string',
+		placeholder: 'e.g. The quick brown fox jumped over the lazy dog',
+		description: 'The text to generate audio for. The maximum length is 4096 characters.',
+		default: '',
+		typeOptions: {
+			rows: 2,
+		},
+	},
+	{
+		displayName: 'Voice',
+		name: 'voice',
+		type: 'options',
+		default: 'alloy',
+		description: 'The voice to use when generating the audio',
+		options: [
+			{
+				name: 'Alloy',
+				value: 'alloy',
+			},
+			{
+				name: 'Echo',
+				value: 'echo',
+			},
+			{
+				name: 'Fable',
+				value: 'fable',
+			},
+			{
+				name: 'Nova',
+				value: 'nova',
+			},
+			{
+				name: 'Onyx',
+				value: 'onyx',
+			},
+			{
+				name: 'Shimmer',
+				value: 'shimmer',
+			},
+		],
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		placeholder: 'Add Option',
+		type: 'collection',
+		default: {},
+		options: [
+			{
+				displayName: 'Response Format',
+				name: 'response_format',
+				type: 'options',
+				default: 'mp3',
+				options: [
+					{
+						name: 'MP3',
+						value: 'mp3',
+					},
+					{
+						name: 'OPUS',
+						value: 'opus',
+					},
+					{
+						name: 'AAC',
+						value: 'aac',
+					},
+					{
+						name: 'FLAC',
+						value: 'flac',
+					},
+				],
+			},
+			{
+				displayName: 'Audio Speed',
+				name: 'speed',
+				type: 'number',
+				default: 1,
+				typeOptions: {
+					minValue: 0.25,
+					maxValue: 4,
+					numberPrecision: 1,
+				},
+			},
+			{
+				displayName: 'Put Output in Field',
+				name: 'binaryPropertyOutput',
+				type: 'string',
+				default: 'data',
+				hint: 'The name of the output field to put the binary file data in',
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		operation: ['generate'],
+		resource: ['audio'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	const model = this.getNodeParameter('model', i) as string;
+	const input = this.getNodeParameter('input', i) as string;
+	const voice = this.getNodeParameter('voice', i) as string;
+	let response_format = 'mp3';
+	let speed = 1;
+
+	const options = this.getNodeParameter('options', i, {});
+
+	if (options.response_format) {
+		response_format = options.response_format as string;
+	}
+
+	if (options.speed) {
+		speed = options.speed as number;
+	}
+
+	const body: IDataObject = {
+		model,
+		input,
+		voice,
+		response_format,
+		speed,
+	};
+
+	const option = {
+		useStream: true,
+		returnFullResponse: true,
+		encoding: 'arraybuffer',
+		json: false,
+	};
+
+	const response = await apiRequest.call(this, 'POST', '/audio/speech', { body, option });
+
+	const binaryData = await this.helpers.prepareBinaryData(
+		response,
+		`audio.${response_format}`,
+		`audio/${response_format}`,
+	);
+
+	const binaryPropertyOutput = (options.binaryPropertyOutput as string) || 'data';
+
+	const newItem: INodeExecutionData = {
+		json: {
+			...binaryData,
+			data: undefined,
+		},
+		pairedItem: { item: i },
+		binary: {
+			[binaryPropertyOutput]: binaryData,
+		},
+	};
+
+	return [newItem];
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/audio/index.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/audio/index.ts
new file mode 100644
index 0000000000000..c6e4fb5f613ea
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/audio/index.ts
@@ -0,0 +1,57 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+import * as generate from './generate.operation';
+import * as transcribe from './transcribe.operation';
+import * as translate from './translate.operation';
+
+export { generate, transcribe, translate };
+
+export const description: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		options: [
+			{
+				name: 'Generate Audio',
+				value: 'generate',
+				action: 'Generate audio',
+				description: 'Creates audio from a text prompt',
+			},
+			{
+				name: 'Transcribe a Recording',
+				value: 'transcribe',
+				action: 'Transcribe a recording',
+				description: 'Transcribes audio into the text',
+			},
+			{
+				name: 'Translate a Recording',
+				value: 'translate',
+				action: 'Translate a recording',
+				description: 'Translate audio into the text in the english language',
+			},
+		],
+		default: 'generate',
+		displayOptions: {
+			show: {
+				resource: ['audio'],
+			},
+		},
+	},
+	{
+		displayName: 'OpenAI API limits the size of the audio file to 25 MB',
+		name: 'fileSizeLimitNotice',
+		type: 'notice',
+		default: ' ',
+		displayOptions: {
+			show: {
+				resource: ['audio'],
+				operation: ['translate', 'transcribe'],
+			},
+		},
+	},
+	...generate.description,
+	...transcribe.description,
+	...translate.description,
+];
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
new file mode 100644
index 0000000000000..1f419066ad3e6
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/audio/transcribe.operation.ts
@@ -0,0 +1,95 @@
+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[] = [
+	{
+		displayName: 'Input Data Field Name',
+		name: 'binaryPropertyName',
+		type: 'string',
+		default: 'data',
+		placeholder: 'e.g. data',
+		hint: 'The name of the input field containing the binary file data to be processed',
+		description:
+			'Name of the binary property which contains the audio file in one of these formats: flac, mp3, mp4, mpeg, mpga, m4a, ogg, wav, or webm',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		placeholder: 'Add Option',
+		type: 'collection',
+		default: {},
+		options: [
+			{
+				displayName: 'Language of the Audio File',
+				name: 'language',
+				type: 'string',
+				description:
+					'The language of the input audio. Supplying the input language in <a href="https://en.wikipedia.org/wiki/List_of_ISO_639_language_codes" target="_blank">ISO-639-1</a> format will improve accuracy and latency.',
+				default: '',
+			},
+			{
+				displayName: 'Output Randomness (Temperature)',
+				name: 'temperature',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+					maxValue: 1,
+					numberPrecision: 1,
+				},
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		operation: ['transcribe'],
+		resource: ['audio'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	const model = 'whisper-1';
+	const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i);
+	const options = this.getNodeParameter('options', i, {});
+
+	const formData = new FormData();
+
+	formData.append('model', model);
+
+	if (options.language) {
+		formData.append('language', options.language);
+	}
+
+	if (options.temperature) {
+		formData.append('temperature', options.temperature.toString());
+	}
+
+	const binaryData = this.helpers.assertBinaryData(i, binaryPropertyName);
+	const dataBuffer = await this.helpers.getBinaryDataBuffer(i, binaryPropertyName);
+
+	formData.append('file', dataBuffer, {
+		filename: binaryData.fileName,
+		contentType: binaryData.mimeType,
+	});
+
+	const response = await apiRequest.call(this, 'POST', '/audio/transcriptions', {
+		option: { formData },
+		headers: {
+			'Content-Type': 'multipart/form-data',
+		},
+	});
+
+	return [
+		{
+			json: response,
+			pairedItem: { item: i },
+		},
+	];
+}
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
new file mode 100644
index 0000000000000..3ba7e53c64991
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/audio/translate.operation.ts
@@ -0,0 +1,82 @@
+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[] = [
+	{
+		displayName: 'Input Data Field Name',
+		name: 'binaryPropertyName',
+		type: 'string',
+		default: 'data',
+		hint: 'The name of the input field containing the binary file data to be processed',
+		placeholder: 'e.g. data',
+		description:
+			'Name of the binary property which contains the audio file in one of these formats: flac, mp3, mp4, mpeg, mpga, m4a, ogg, wav, or webm',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		placeholder: 'Add Option',
+		type: 'collection',
+		default: {},
+		options: [
+			{
+				displayName: 'Output Randomness (Temperature)',
+				name: 'temperature',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+					maxValue: 1,
+					numberPrecision: 1,
+				},
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		operation: ['translate'],
+		resource: ['audio'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	const model = 'whisper-1';
+	const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i);
+	const options = this.getNodeParameter('options', i, {});
+
+	const formData = new FormData();
+
+	formData.append('model', model);
+
+	if (options.temperature) {
+		formData.append('temperature', options.temperature.toString());
+	}
+
+	const binaryData = this.helpers.assertBinaryData(i, binaryPropertyName);
+	const dataBuffer = await this.helpers.getBinaryDataBuffer(i, binaryPropertyName);
+
+	formData.append('file', dataBuffer, {
+		filename: binaryData.fileName,
+		contentType: binaryData.mimeType,
+	});
+
+	const response = await apiRequest.call(this, 'POST', '/audio/translations', {
+		option: { formData },
+		headers: {
+			'Content-Type': 'multipart/form-data',
+		},
+	});
+
+	return [
+		{
+			json: response,
+			pairedItem: { item: i },
+		},
+	];
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/descriptions.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/descriptions.ts
new file mode 100644
index 0000000000000..8416e794d2bbc
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/descriptions.ts
@@ -0,0 +1,53 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+export const modelRLC: INodeProperties = {
+	displayName: 'Model',
+	name: 'modelId',
+	type: 'resourceLocator',
+	default: { mode: 'list', value: '' },
+	required: true,
+	modes: [
+		{
+			displayName: 'From List',
+			name: 'list',
+			type: 'list',
+			typeOptions: {
+				searchListMethod: 'modelSearch',
+				searchable: true,
+			},
+		},
+		{
+			displayName: 'ID',
+			name: 'id',
+			type: 'string',
+			placeholder: 'e.g. gpt-4',
+		},
+	],
+};
+
+export const assistantRLC: INodeProperties = {
+	displayName: 'Assistant',
+	name: 'assistantId',
+	type: 'resourceLocator',
+	description:
+		'Assistant to respond to the message. You can add, modify or remove assistants in the <a href="https://platform.openai.com/playground?mode=assistant" target="_blank">playground</a>.',
+	default: { mode: 'list', value: '' },
+	required: true,
+	modes: [
+		{
+			displayName: 'From List',
+			name: 'list',
+			type: 'list',
+			typeOptions: {
+				searchListMethod: 'assistantSearch',
+				searchable: true,
+			},
+		},
+		{
+			displayName: 'ID',
+			name: 'id',
+			type: 'string',
+			placeholder: 'e.g. asst_abc123',
+		},
+	],
+};
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/file/deleteFile.operation.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/file/deleteFile.operation.ts
new file mode 100644
index 0000000000000..8ffc438565675
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/file/deleteFile.operation.ts
@@ -0,0 +1,62 @@
+import type { INodeProperties, IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
+import { updateDisplayOptions } from 'n8n-workflow';
+
+import { apiRequest } from '../../transport';
+
+const properties: INodeProperties[] = [
+	{
+		displayName: 'File',
+		name: 'fileId',
+		type: 'resourceLocator',
+		default: { mode: 'list', value: '' },
+		required: true,
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				typeOptions: {
+					searchListMethod: 'fileSearch',
+					searchable: true,
+				},
+			},
+			{
+				displayName: 'ID',
+				name: 'id',
+				type: 'string',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex: 'file-[a-zA-Z0-9]',
+							errorMessage: 'Not a valid File ID',
+						},
+					},
+				],
+				placeholder: 'e.g. file-1234567890',
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		operation: ['deleteFile'],
+		resource: ['file'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	const fileId = this.getNodeParameter('fileId', i, '', { extractValue: true });
+
+	const response = await apiRequest.call(this, 'DELETE', `/files/${fileId}`);
+
+	return [
+		{
+			json: response,
+			pairedItem: { item: i },
+		},
+	];
+}
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
new file mode 100644
index 0000000000000..809c1ec94751f
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/file/index.ts
@@ -0,0 +1,46 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+import * as upload from './upload.operation';
+import * as deleteFile from './deleteFile.operation';
+import * as list from './list.operation';
+
+export { upload, deleteFile, list };
+
+export const description: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		options: [
+			{
+				name: 'Delete a File',
+				value: 'deleteFile',
+				action: 'Delete a file',
+				description: 'Delete a file from the server',
+			},
+			{
+				name: 'List Files',
+				value: 'list',
+				action: 'List files',
+				description: "Returns a list of files that belong to the user's organization",
+			},
+			{
+				name: 'Upload a File',
+				value: 'upload',
+				action: 'Upload a file',
+				description: 'Upload a file that can be used across various endpoints',
+			},
+		],
+		default: 'upload',
+		displayOptions: {
+			show: {
+				resource: ['file'],
+			},
+		},
+	},
+
+	...upload.description,
+	...deleteFile.description,
+	...list.description,
+];
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/file/list.operation.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/file/list.operation.ts
new file mode 100644
index 0000000000000..305267613e461
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/file/list.operation.ts
@@ -0,0 +1,67 @@
+import type {
+	IDataObject,
+	INodeProperties,
+	IExecuteFunctions,
+	INodeExecutionData,
+} from 'n8n-workflow';
+import { updateDisplayOptions } from 'n8n-workflow';
+
+import { apiRequest } from '../../transport';
+
+const properties: INodeProperties[] = [
+	{
+		displayName: 'Options',
+		name: 'options',
+		placeholder: 'Add Option',
+		type: 'collection',
+		default: {},
+		options: [
+			{
+				displayName: 'Purpose',
+				name: 'purpose',
+				type: 'options',
+				default: 'any',
+				description: 'Only return files with the given purpose',
+				options: [
+					{
+						name: 'Any [Default]',
+						value: 'any',
+					},
+					{
+						name: 'Assistants',
+						value: 'assistants',
+					},
+					{
+						name: 'Fine-Tune',
+						value: 'fine-tune',
+					},
+				],
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		operation: ['list'],
+		resource: ['file'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	const options = this.getNodeParameter('options', i, {});
+	const qs: IDataObject = {};
+
+	if (options.purpose && options.purpose !== 'any') {
+		qs.purpose = options.purpose as string;
+	}
+
+	const { data } = await apiRequest.call(this, 'GET', '/files', { qs });
+
+	return (data || []).map((file: IDataObject) => ({
+		json: file,
+		pairedItem: { item: i },
+	}));
+}
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
new file mode 100644
index 0000000000000..9776c0f38558e
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/file/upload.operation.ts
@@ -0,0 +1,97 @@
+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[] = [
+	{
+		displayName: 'Input Data Field Name',
+		name: 'binaryPropertyName',
+		type: 'string',
+		default: 'data',
+		hint: 'The name of the input field containing the binary file data to be processed',
+		placeholder: 'e.g. data',
+		description:
+			'Name of the binary property which contains the file. The size of individual files can be a maximum of 512 MB or 2 million tokens for Assistants.',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		placeholder: 'Add Option',
+		type: 'collection',
+		default: {},
+		options: [
+			{
+				displayName: 'Purpose',
+				name: 'purpose',
+				type: 'options',
+				default: 'assistants',
+				description:
+					"The intended purpose of the uploaded file, the 'Fine-tuning' only supports .jsonl files",
+				options: [
+					{
+						name: 'Assistants',
+						value: 'assistants',
+					},
+					{
+						name: 'Fine-Tune',
+						value: 'fine-tune',
+					},
+				],
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		operation: ['upload'],
+		resource: ['file'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i);
+	const options = this.getNodeParameter('options', i, {});
+
+	const formData = new FormData();
+
+	formData.append('purpose', options.purpose || 'assistants');
+
+	const binaryData = this.helpers.assertBinaryData(i, binaryPropertyName);
+	const dataBuffer = await this.helpers.getBinaryDataBuffer(i, binaryPropertyName);
+
+	formData.append('file', dataBuffer, {
+		filename: binaryData.fileName,
+		contentType: binaryData.mimeType,
+	});
+
+	try {
+		const response = await apiRequest.call(this, 'POST', '/files', {
+			option: { formData },
+			headers: {
+				'Content-Type': 'multipart/form-data',
+			},
+		});
+
+		return [
+			{
+				json: response,
+				pairedItem: { item: i },
+			},
+		];
+	} catch (error) {
+		if (
+			error.message.includes('Bad request') &&
+			error.description?.includes('Expected file to have JSONL format')
+		) {
+			throw new NodeOperationError(this.getNode(), 'The file content is not in JSONL format', {
+				description:
+					'Fine-tuning accepts only files in JSONL format, where every line is a valid JSON dictionary',
+			});
+		}
+		throw error;
+	}
+}
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
new file mode 100644
index 0000000000000..b29019602afb2
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/image/analyze.operation.ts
@@ -0,0 +1,211 @@
+import type {
+	INodeProperties,
+	IExecuteFunctions,
+	INodeExecutionData,
+	IDataObject,
+} from 'n8n-workflow';
+import { updateDisplayOptions, NodeOperationError } from 'n8n-workflow';
+import { apiRequest } from '../../transport';
+
+const properties: INodeProperties[] = [
+	{
+		displayName: 'Text Input',
+		name: 'text',
+		type: 'string',
+		placeholder: "e.g. What's in this image?",
+		default: "What's in this image?",
+		typeOptions: {
+			rows: 2,
+		},
+	},
+	{
+		displayName: 'Input Type',
+		name: 'inputType',
+		type: 'options',
+		default: 'url',
+		options: [
+			{
+				name: 'Image URL(s)',
+				value: 'url',
+			},
+			{
+				name: 'Binary File(s)',
+				value: 'base64',
+			},
+		],
+	},
+	{
+		displayName: 'URL(s)',
+		name: 'imageUrls',
+		type: 'string',
+		placeholder: 'e.g. https://example.com/image.jpeg',
+		description: 'URL(s) of the image(s) to analyze, multiple URLs can be added separated by comma',
+		default: '',
+		displayOptions: {
+			show: {
+				inputType: ['url'],
+			},
+		},
+	},
+	{
+		displayName: 'Input Data Field Name',
+		name: 'binaryPropertyName',
+		type: 'string',
+		default: 'data',
+		placeholder: 'e.g. data',
+		hint: 'The name of the input field containing the binary file data to be processed',
+		description: 'Name of the binary property which contains the image(s)',
+		displayOptions: {
+			show: {
+				inputType: ['base64'],
+			},
+		},
+	},
+	{
+		displayName: 'Simplify Output',
+		name: 'simplify',
+		type: 'boolean',
+		default: true,
+		description: 'Whether to simplify the response or not',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		placeholder: 'Add Option',
+		type: 'collection',
+		default: {},
+		options: [
+			{
+				displayName: 'Detail',
+				name: 'detail',
+				type: 'options',
+				default: 'auto',
+				options: [
+					{
+						name: 'Auto',
+						value: 'auto',
+						description:
+							'Model will look at the image input size and decide if it should use the low or high setting',
+					},
+					{
+						name: 'Low',
+						value: 'low',
+						description: 'Return faster responses and consume fewer tokens',
+					},
+					{
+						name: 'High',
+						value: 'high',
+						description: 'Return more detailed responses, consumes more tokens',
+					},
+				],
+			},
+			{
+				displayName: 'Length of Description (Max Tokens)',
+				description: 'Fewer tokens will result in shorter, less detailed image description',
+				name: 'maxTokens',
+				type: 'number',
+				default: 300,
+				typeOptions: {
+					minValue: 1,
+				},
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		operation: ['analyze'],
+		resource: ['image'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	const model = 'gpt-4-vision-preview';
+	const text = this.getNodeParameter('text', i, '') as string;
+	const inputType = this.getNodeParameter('inputType', i) as string;
+	const options = this.getNodeParameter('options', i, {});
+
+	const content: IDataObject[] = [
+		{
+			type: 'text',
+			text,
+		},
+	];
+
+	const detail = (options.detail as string) || 'auto';
+
+	if (inputType === 'url') {
+		const imageUrls = (this.getNodeParameter('imageUrls', i) as string)
+			.split(',')
+			.map((url) => url.trim());
+
+		for (const url of imageUrls) {
+			content.push({
+				type: 'image_url',
+				image_url: {
+					url,
+					detail,
+				},
+			});
+		}
+	} else {
+		const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i)
+			.split(',')
+			.map((propertyName) => propertyName.trim());
+
+		for (const propertyName of binaryPropertyName) {
+			const binaryData = this.helpers.assertBinaryData(i, propertyName);
+
+			let fileBase64;
+			if (binaryData.id) {
+				const chunkSize = 256 * 1024;
+				const stream = await this.helpers.getBinaryStream(binaryData.id, chunkSize);
+				const buffer = await this.helpers.binaryToBuffer(stream);
+				fileBase64 = buffer.toString('base64');
+			} else {
+				fileBase64 = binaryData.data;
+			}
+
+			if (!binaryData) {
+				throw new NodeOperationError(this.getNode(), 'No binary data exists on item!');
+			}
+
+			content.push({
+				type: 'image_url',
+				image_url: {
+					url: `data:${binaryData.mimeType};base64,${fileBase64}`,
+					detail,
+				},
+			});
+		}
+	}
+
+	const body = {
+		model,
+		messages: [
+			{
+				role: 'user',
+				content,
+			},
+		],
+		max_tokens: (options.maxTokens as number) || 300,
+	};
+
+	let response = await apiRequest.call(this, 'POST', '/chat/completions', { body });
+
+	const simplify = this.getNodeParameter('simplify', i) as boolean;
+
+	if (simplify && response.choices) {
+		response = { content: response.choices[0].message.content };
+	}
+
+	return [
+		{
+			json: response,
+			pairedItem: { item: i },
+		},
+	];
+}
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
new file mode 100644
index 0000000000000..48a03158b5e85
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/image/generate.operation.ts
@@ -0,0 +1,244 @@
+import type {
+	INodeProperties,
+	IExecuteFunctions,
+	INodeExecutionData,
+	IDataObject,
+} from 'n8n-workflow';
+import { updateDisplayOptions } from 'n8n-workflow';
+import { apiRequest } from '../../transport';
+
+const properties: INodeProperties[] = [
+	{
+		displayName: 'Model',
+		name: 'model',
+		type: 'options',
+		default: 'dall-e-3',
+		description: 'The model to use for image generation',
+		options: [
+			{
+				name: 'DALL-E-2',
+				value: 'dall-e-2',
+			},
+			{
+				name: 'DALL-E-3',
+				value: 'dall-e-3',
+			},
+		],
+	},
+	{
+		displayName: 'Prompt',
+		name: 'prompt',
+		type: 'string',
+		placeholder: 'e.g. A cute cat eating a dinosaur',
+		description:
+			'A text description of the desired image(s). The maximum length is 1000 characters for dall-e-2 and 4000 characters for dall-e-3.',
+		default: '',
+		typeOptions: {
+			rows: 2,
+		},
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		placeholder: 'Add Option',
+		type: 'collection',
+		default: {},
+		options: [
+			{
+				displayName: 'Number of Images',
+				name: 'n',
+				default: 1,
+				description: 'Number of images to generate',
+				type: 'number',
+				typeOptions: {
+					minValue: 1,
+					maxValue: 10,
+				},
+				displayOptions: {
+					show: {
+						'/model': ['dall-e-2'],
+					},
+				},
+			},
+			{
+				displayName: 'Quality',
+				name: 'quality',
+				type: 'options',
+				description:
+					'The quality of the image that will be generated, HD creates images with finer details and greater consistency across the image',
+				options: [
+					{
+						name: 'HD',
+						value: 'hd',
+					},
+					{
+						name: 'Standard',
+						value: 'standard',
+					},
+				],
+				displayOptions: {
+					show: {
+						'/model': ['dall-e-3'],
+					},
+				},
+				default: 'standard',
+			},
+			{
+				displayName: 'Resolution',
+				name: 'size',
+				type: 'options',
+				options: [
+					{
+						name: '256x256',
+						value: '256x256',
+					},
+					{
+						name: '512x512',
+						value: '512x512',
+					},
+					{
+						name: '1024x1024',
+						value: '1024x1024',
+					},
+				],
+				displayOptions: {
+					show: {
+						'/model': ['dall-e-2'],
+					},
+				},
+				default: '1024x1024',
+			},
+			{
+				displayName: 'Resolution',
+				name: 'size',
+				type: 'options',
+				options: [
+					{
+						name: '1024x1024',
+						value: '1024x1024',
+					},
+					{
+						name: '1792x1024',
+						value: '1792x1024',
+					},
+					{
+						name: '1024x1792',
+						value: '1024x1792',
+					},
+				],
+				displayOptions: {
+					show: {
+						'/model': ['dall-e-3'],
+					},
+				},
+				default: '1024x1024',
+			},
+			{
+				displayName: 'Style',
+				name: 'style',
+				type: 'options',
+				options: [
+					{
+						name: 'Natural',
+						value: 'natural',
+						description: 'Produce more natural looking images',
+					},
+					{
+						name: 'Vivid',
+						value: 'vivid',
+						description: 'Lean towards generating hyper-real and dramatic images',
+					},
+				],
+				displayOptions: {
+					show: {
+						'/model': ['dall-e-3'],
+					},
+				},
+				default: 'vivid',
+			},
+			{
+				displayName: 'Respond with Image URL(s)',
+				name: 'returnImageUrls',
+				type: 'boolean',
+				default: false,
+				description: 'Whether to return image URL(s) instead of binary file(s)',
+			},
+			{
+				displayName: 'Put Output in Field',
+				name: 'binaryPropertyOutput',
+				type: 'string',
+				default: 'data',
+				hint: 'The name of the output field to put the binary file data in',
+				displayOptions: {
+					show: {
+						returnImageUrls: [false],
+					},
+				},
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		operation: ['generate'],
+		resource: ['image'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	const model = this.getNodeParameter('model', i) as string;
+	const prompt = this.getNodeParameter('prompt', i) as string;
+	const options = this.getNodeParameter('options', i, {});
+	let response_format = 'b64_json';
+	let binaryPropertyOutput = 'data';
+
+	if (options.returnImageUrls) {
+		response_format = 'url';
+	}
+
+	if (options.binaryPropertyOutput) {
+		binaryPropertyOutput = options.binaryPropertyOutput as string;
+		delete options.binaryPropertyOutput;
+	}
+
+	delete options.returnImageUrls;
+
+	const body: IDataObject = {
+		prompt,
+		model,
+		response_format,
+		...options,
+	};
+
+	const { data } = await apiRequest.call(this, 'POST', '/images/generations', { body });
+
+	if (response_format === 'url') {
+		return ((data as IDataObject[]) || []).map((entry) => ({
+			json: entry,
+			pairedItem: { item: i },
+		}));
+	} else {
+		const returnData: INodeExecutionData[] = [];
+
+		for (const entry of data) {
+			const binaryData = await this.helpers.prepareBinaryData(
+				Buffer.from(entry.b64_json as string, 'base64'),
+				'data',
+			);
+			returnData.push({
+				json: Object.assign({}, binaryData, {
+					data: undefined,
+				}),
+				binary: {
+					[binaryPropertyOutput]: binaryData,
+				},
+				pairedItem: { item: i },
+			});
+		}
+
+		return returnData;
+	}
+}
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
new file mode 100644
index 0000000000000..0516ae3ce4bee
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/image/index.ts
@@ -0,0 +1,37 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+import * as generate from './generate.operation';
+import * as analyze from './analyze.operation';
+
+export { generate, analyze };
+
+export const description: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		options: [
+			{
+				name: 'Analyze Image',
+				value: 'analyze',
+				action: 'Analyze image',
+				description: 'Take in images and answer questions about them',
+			},
+			{
+				name: 'Generate an Image',
+				value: 'generate',
+				action: 'Generate an image',
+				description: 'Creates an image from a text prompt',
+			},
+		],
+		default: 'generate',
+		displayOptions: {
+			show: {
+				resource: ['image'],
+			},
+		},
+	},
+	...generate.description,
+	...analyze.description,
+];
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/node.type.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/node.type.ts
new file mode 100644
index 0000000000000..e998aa2c2613e
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/node.type.ts
@@ -0,0 +1,11 @@
+import type { AllEntities } from 'n8n-workflow';
+
+type NodeMap = {
+	assistant: 'message' | 'create' | 'deleteAssistant' | 'list' | 'update';
+	audio: 'generate' | 'transcribe' | 'translate';
+	file: 'upload' | 'deleteFile' | 'list';
+	image: 'generate' | 'analyze';
+	text: 'message' | 'classify';
+};
+
+export type OpenAiType = AllEntities<NodeMap>;
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/router.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/router.ts
new file mode 100644
index 0000000000000..b0ce414ce89c7
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/router.ts
@@ -0,0 +1,79 @@
+import {
+	NodeOperationError,
+	type IExecuteFunctions,
+	type INodeExecutionData,
+	NodeApiError,
+} from 'n8n-workflow';
+
+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';
+
+export async function router(this: IExecuteFunctions) {
+	const returnData: INodeExecutionData[] = [];
+
+	const items = this.getInputData();
+	const resource = this.getNodeParameter<OpenAiType>('resource', 0);
+	const operation = this.getNodeParameter('operation', 0);
+
+	const openAiTypeData = {
+		resource,
+		operation,
+	} as OpenAiType;
+
+	let execute;
+	switch (openAiTypeData.resource) {
+		case 'assistant':
+			execute = assistant[openAiTypeData.operation].execute;
+			break;
+		case 'audio':
+			execute = audio[openAiTypeData.operation].execute;
+			break;
+		case 'file':
+			execute = file[openAiTypeData.operation].execute;
+			break;
+		case 'image':
+			execute = image[openAiTypeData.operation].execute;
+			break;
+		case 'text':
+			execute = text[openAiTypeData.operation].execute;
+			break;
+		default:
+			throw new NodeOperationError(
+				this.getNode(),
+				`The operation "${operation}" is not supported!`,
+			);
+	}
+
+	for (let i = 0; i < items.length; i++) {
+		try {
+			const responseData = await execute.call(this, i);
+
+			returnData.push(...responseData);
+		} catch (error) {
+			if (this.continueOnFail()) {
+				returnData.push({ json: { error: error.message }, pairedItem: { item: i } });
+				continue;
+			}
+
+			if (error instanceof NodeApiError) {
+				error.context = {
+					itemIndex: i,
+				};
+
+				throw error;
+			}
+
+			throw new NodeOperationError(this.getNode(), error, {
+				itemIndex: i,
+				description: error.description,
+			});
+		}
+	}
+
+	return [returnData];
+}
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
new file mode 100644
index 0000000000000..338d4ade1e32c
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/text/classify.operation.ts
@@ -0,0 +1,83 @@
+import type { INodeProperties, IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
+import { updateDisplayOptions } from 'n8n-workflow';
+import { apiRequest } from '../../transport';
+
+const properties: INodeProperties[] = [
+	{
+		displayName: 'Text Input',
+		name: 'input',
+		type: 'string',
+		placeholder: 'e.g. Sample text goes here',
+		description: 'The input text to classify if it is violates the moderation policy',
+		default: '',
+		typeOptions: {
+			rows: 2,
+		},
+	},
+	{
+		displayName: 'Simplify Output',
+		name: 'simplify',
+		type: 'boolean',
+		default: false,
+		description: 'Whether to return a simplified version of the response instead of the raw data',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		placeholder: 'Add Option',
+		type: 'collection',
+		default: {},
+		options: [
+			{
+				displayName: 'Use Stable Model',
+				name: 'useStableModel',
+				type: 'boolean',
+				default: false,
+				description:
+					'Whether to use the stable version of the model instead of the latest version, accuracy may be slightly lower',
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		operation: ['classify'],
+		resource: ['text'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	const input = this.getNodeParameter('input', i) as string;
+	const options = this.getNodeParameter('options', i);
+	const model = options.useStableModel ? 'text-moderation-stable' : 'text-moderation-latest';
+
+	const body = {
+		input,
+		model,
+	};
+
+	const { results } = await apiRequest.call(this, 'POST', '/moderations', { body });
+
+	if (!results) return [];
+
+	const simplify = this.getNodeParameter('simplify', i) as boolean;
+
+	if (simplify && results) {
+		return [
+			{
+				json: { flagged: results[0].flagged },
+				pairedItem: { item: i },
+			},
+		];
+	} else {
+		return [
+			{
+				json: results[0],
+				pairedItem: { item: i },
+			},
+		];
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/text/index.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/text/index.ts
new file mode 100644
index 0000000000000..0b9d344d7167e
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/text/index.ts
@@ -0,0 +1,39 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+import * as classify from './classify.operation';
+import * as message from './message.operation';
+
+export { classify, message };
+
+export const description: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		options: [
+			{
+				name: 'Message a Model',
+				value: 'message',
+				action: 'Message a model',
+				// eslint-disable-next-line n8n-nodes-base/node-param-description-excess-final-period
+				description: 'Create a completion with GPT 3, 4, etc.',
+			},
+			{
+				name: 'Classify Text for Violations',
+				value: 'classify',
+				action: 'Classify text for violations',
+				description: 'Check whether content complies with usage policies',
+			},
+		],
+		default: 'message',
+		displayOptions: {
+			show: {
+				resource: ['text'],
+			},
+		},
+	},
+
+	...classify.description,
+	...message.description,
+];
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
new file mode 100644
index 0000000000000..ddcb250d26e93
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/text/message.operation.ts
@@ -0,0 +1,304 @@
+import type {
+	INodeProperties,
+	IExecuteFunctions,
+	INodeExecutionData,
+	IDataObject,
+} from 'n8n-workflow';
+import { jsonParse, updateDisplayOptions } from 'n8n-workflow';
+import type { Tool } from '@langchain/core/tools';
+import { apiRequest } from '../../transport';
+import type { ChatCompletion } from '../../helpers/interfaces';
+import { formatToOpenAIAssistantTool } from '../../helpers/utils';
+import { modelRLC } from '../descriptions';
+import { getConnectedTools } from '../../../../../utils/helpers';
+import { MODELS_NOT_SUPPORT_FUNCTION_CALLS } from '../../helpers/constants';
+
+const properties: INodeProperties[] = [
+	modelRLC,
+	{
+		displayName: 'Messages',
+		name: 'messages',
+		type: 'fixedCollection',
+		typeOptions: {
+			sortable: true,
+			multipleValues: true,
+		},
+		placeholder: 'Add Message',
+		default: { values: [{ content: '' }] },
+		options: [
+			{
+				displayName: 'Values',
+				name: 'values',
+				values: [
+					{
+						displayName: 'Text',
+						name: 'content',
+						type: 'string',
+						description: 'The content of the message to be send',
+						default: '',
+						typeOptions: {
+							rows: 2,
+						},
+					},
+					{
+						displayName: 'Role',
+						name: 'role',
+						type: 'options',
+						description:
+							"Role in shaping the model's response, it tells the model how it should behave and interact with the user",
+						options: [
+							{
+								name: 'User',
+								value: 'user',
+								description: 'Send a message as a user and get a response from the model',
+							},
+							{
+								name: 'Assistant',
+								value: 'assistant',
+								description: 'Tell the model to adopt a specific tone or personality',
+							},
+							{
+								name: 'System',
+								value: 'system',
+								description:
+									"Usually used to set the model's behavior or context for the next user message",
+							},
+						],
+						default: 'user',
+					},
+				],
+			},
+		],
+	},
+	{
+		displayName: 'Simplify Output',
+		name: 'simplify',
+		type: 'boolean',
+		default: true,
+		description: 'Whether to return a simplified version of the response instead of the raw data',
+	},
+	{
+		displayName: 'Output Content as JSON',
+		name: 'jsonOutput',
+		type: 'boolean',
+		description:
+			'Whether to attempt to return the response in JSON format. Compatible with GPT-4 Turbo and all GPT-3.5 Turbo models newer than gpt-3.5-turbo-1106.',
+		default: false,
+	},
+	{
+		displayName: 'Hide Tools',
+		name: 'hideTools',
+		type: 'hidden',
+		default: 'hide',
+		displayOptions: {
+			show: {
+				modelId: MODELS_NOT_SUPPORT_FUNCTION_CALLS,
+				'@version': [{ _cnd: { gte: 1.2 } }],
+			},
+		},
+	},
+	{
+		displayName: 'Connect your own custom n8n tools to this node on the canvas',
+		name: 'noticeTools',
+		type: 'notice',
+		default: '',
+		displayOptions: {
+			hide: {
+				hideTools: ['hide'],
+			},
+		},
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		placeholder: 'Add Option',
+		type: 'collection',
+		default: {},
+		options: [
+			{
+				displayName: 'Frequency Penalty',
+				name: 'frequency_penalty',
+				default: 0,
+				typeOptions: { maxValue: 2, minValue: -2, numberPrecision: 1 },
+				description:
+					"Positive values penalize new tokens based on their existing frequency in the text so far, decreasing the model's likelihood to repeat the same line verbatim",
+				type: 'number',
+			},
+			{
+				displayName: 'Maximum Number of Tokens',
+				name: 'maxTokens',
+				default: 16,
+				description:
+					'The maximum number of tokens to generate in the completion. Most models have a context length of 2048 tokens (except for the newest models, which support 32,768).',
+				type: 'number',
+				typeOptions: {
+					maxValue: 32768,
+				},
+			},
+			{
+				displayName: 'Number of Completions',
+				name: 'n',
+				default: 1,
+				description:
+					'How many completions to generate for each prompt. Note: Because this parameter generates many completions, it can quickly consume your token quota. Use carefully and ensure that you have reasonable settings for max_tokens and stop.',
+				type: 'number',
+			},
+			{
+				displayName: 'Presence Penalty',
+				name: 'presence_penalty',
+				default: 0,
+				typeOptions: { maxValue: 2, minValue: -2, numberPrecision: 1 },
+				description:
+					"Positive values penalize new tokens based on whether they appear in the text so far, increasing the model's likelihood to talk about new topics",
+				type: 'number',
+			},
+			{
+				displayName: 'Output Randomness (Temperature)',
+				name: 'temperature',
+				default: 1,
+				typeOptions: { maxValue: 1, minValue: 0, numberPrecision: 1 },
+				description:
+					'Controls randomness: Lowering results in less random completions. As the temperature approaches zero, the model will become deterministic and repetitive. We generally recommend altering this or temperature but not both.',
+				type: 'number',
+			},
+			{
+				displayName: 'Output Randomness (Top P)',
+				name: 'topP',
+				default: 1,
+				typeOptions: { maxValue: 1, minValue: 0, numberPrecision: 1 },
+				description:
+					'An alternative to sampling with temperature, controls diversity via nucleus sampling: 0.5 means half of all likelihood-weighted options are considered. We generally recommend altering this or temperature but not both.',
+				type: 'number',
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		operation: ['message'],
+		resource: ['text'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	const nodeVersion = this.getNode().typeVersion;
+	const model = this.getNodeParameter('modelId', i, '', { extractValue: true });
+	let messages = this.getNodeParameter('messages.values', i, []) as IDataObject[];
+	const options = this.getNodeParameter('options', i, {});
+	const jsonOutput = this.getNodeParameter('jsonOutput', i, false) as boolean;
+
+	if (options.maxTokens !== undefined) {
+		options.max_tokens = options.maxTokens;
+		delete options.maxTokens;
+	}
+
+	if (options.topP !== undefined) {
+		options.top_p = options.topP;
+		delete options.topP;
+	}
+
+	let response_format;
+	if (jsonOutput) {
+		response_format = { type: 'json_object' };
+		messages = [
+			{
+				role: 'system',
+				content: 'You are a helpful assistant designed to output JSON.',
+			},
+			...messages,
+		];
+	}
+
+	const hideTools = this.getNodeParameter('hideTools', i, '') as string;
+
+	let tools;
+	let externalTools: Tool[] = [];
+
+	if (hideTools !== 'hide') {
+		const enforceUniqueNames = nodeVersion > 1;
+		externalTools = await getConnectedTools(this, enforceUniqueNames);
+	}
+
+	if (externalTools.length) {
+		tools = externalTools.length ? externalTools?.map(formatToOpenAIAssistantTool) : undefined;
+	}
+
+	const body: IDataObject = {
+		model,
+		messages,
+		tools,
+		response_format,
+		...options,
+	};
+
+	let response = (await apiRequest.call(this, 'POST', '/chat/completions', {
+		body,
+	})) as ChatCompletion;
+
+	if (!response) return [];
+
+	let toolCalls = response?.choices[0]?.message?.tool_calls;
+
+	while (toolCalls?.length) {
+		messages.push(response.choices[0].message);
+
+		for (const toolCall of toolCalls) {
+			const functionName = toolCall.function.name;
+			const functionArgs = toolCall.function.arguments;
+
+			let functionResponse;
+			for (const tool of externalTools ?? []) {
+				if (tool.name === functionName) {
+					const parsedArgs: { input: string } = jsonParse(functionArgs);
+					const functionInput = parsedArgs.input ?? functionArgs;
+					functionResponse = await tool.invoke(functionInput);
+				}
+			}
+
+			if (typeof functionResponse === 'object') {
+				functionResponse = JSON.stringify(functionResponse);
+			}
+
+			messages.push({
+				tool_call_id: toolCall.id,
+				role: 'tool',
+				content: functionResponse,
+			});
+		}
+
+		response = (await apiRequest.call(this, 'POST', '/chat/completions', {
+			body,
+		})) as ChatCompletion;
+
+		toolCalls = response.choices[0].message.tool_calls;
+	}
+
+	if (response_format) {
+		response.choices = response.choices.map((choice) => {
+			try {
+				choice.message.content = JSON.parse(choice.message.content);
+			} catch (error) {}
+			return choice;
+		});
+	}
+
+	const simplify = this.getNodeParameter('simplify', i) as boolean;
+
+	const returnData: INodeExecutionData[] = [];
+
+	if (simplify) {
+		for (const entry of response.choices) {
+			returnData.push({
+				json: entry,
+				pairedItem: { item: i },
+			});
+		}
+	} else {
+		returnData.push({ json: response, pairedItem: { item: i } });
+	}
+
+	return returnData;
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/versionDescription.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/versionDescription.ts
new file mode 100644
index 0000000000000..080680b776604
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/versionDescription.ts
@@ -0,0 +1,136 @@
+/* eslint-disable n8n-nodes-base/node-filename-against-convention */
+import type { INodeTypeDescription } from 'n8n-workflow';
+import { NodeConnectionType } from 'n8n-workflow';
+
+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';
+
+const prettifyOperation = (resource: string, operation: string) => {
+	if (operation === 'deleteAssistant') {
+		return 'Delete Assistant';
+	}
+
+	if (operation === 'deleteFile') {
+		return 'Delete File';
+	}
+
+	if (operation === 'classify') {
+		return 'Classify Text';
+	}
+
+	if (operation === 'message' && resource === 'text') {
+		return 'Message Model';
+	}
+
+	const capitalize = (str: string) => {
+		const chars = str.split('');
+		chars[0] = chars[0].toUpperCase();
+		return chars.join('');
+	};
+
+	if (['transcribe', 'translate'].includes(operation)) {
+		resource = 'recording';
+	}
+
+	if (operation === 'list') {
+		resource = resource + 's';
+	}
+
+	return `${capitalize(operation)} ${capitalize(resource)}`;
+};
+
+const configureNodeInputs = (resource: string, operation: string, hideTools: string) => {
+	if (resource === 'assistant' && operation === 'message') {
+		return [
+			{ type: NodeConnectionType.Main },
+			{ type: NodeConnectionType.AiTool, displayName: 'Tools' },
+		];
+	}
+	if (resource === 'text' && operation === 'message') {
+		if (hideTools === 'hide') {
+			return [NodeConnectionType.Main];
+		}
+		return [
+			{ type: NodeConnectionType.Main },
+			{ type: NodeConnectionType.AiTool, displayName: 'Tools' },
+		];
+	}
+
+	return [NodeConnectionType.Main];
+};
+
+// eslint-disable-next-line n8n-nodes-base/node-class-description-missing-subtitle
+export const versionDescription: INodeTypeDescription = {
+	displayName: 'OpenAI',
+	name: 'openAi',
+	icon: 'file:openAi.svg',
+	group: ['transform'],
+	version: [1, 1.1, 1.2, 1.3],
+	subtitle: `={{(${prettifyOperation})($parameter.resource, $parameter.operation)}}`,
+	description: 'Message an assistant or GPT, analyze images, generate audio, etc.',
+	defaults: {
+		name: 'OpenAI',
+	},
+	codex: {
+		alias: ['LangChain', 'ChatGPT', 'DallE'],
+		categories: ['AI'],
+		subcategories: {
+			AI: ['Agents', 'Miscellaneous'],
+		},
+		resources: {
+			primaryDocumentation: [
+				{
+					url: 'https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-langchain.openai/',
+				},
+			],
+		},
+	},
+	inputs: `={{(${configureNodeInputs})($parameter.resource, $parameter.operation, $parameter.hideTools)}}`,
+	outputs: ['main'],
+	credentials: [
+		{
+			name: 'openAiApi',
+			required: true,
+		},
+	],
+	properties: [
+		{
+			displayName: 'Resource',
+			name: 'resource',
+			type: 'options',
+			noDataExpression: true,
+			// eslint-disable-next-line n8n-nodes-base/node-param-options-type-unsorted-items
+			options: [
+				{
+					name: 'Assistant',
+					value: 'assistant',
+				},
+				{
+					name: 'Text',
+					value: 'text',
+				},
+				{
+					name: 'Image',
+					value: 'image',
+				},
+				{
+					name: 'Audio',
+					value: 'audio',
+				},
+				{
+					name: 'File',
+					value: 'file',
+				},
+			],
+			default: 'text',
+		},
+		...assistant.description,
+		...audio.description,
+		...file.description,
+		...image.description,
+		...text.description,
+	],
+};
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/helpers/constants.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/helpers/constants.ts
new file mode 100644
index 0000000000000..8eacc0fb1592e
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/helpers/constants.ts
@@ -0,0 +1,22 @@
+export const MODELS_NOT_SUPPORT_FUNCTION_CALLS = [
+	'gpt-3.5-turbo-16k-0613',
+	'dall-e-3',
+	'text-embedding-3-large',
+	'dall-e-2',
+	'whisper-1',
+	'tts-1-hd-1106',
+	'tts-1-hd',
+	'gpt-4-0314',
+	'text-embedding-3-small',
+	'gpt-4-32k-0314',
+	'gpt-3.5-turbo-0301',
+	'gpt-4-vision-preview',
+	'gpt-3.5-turbo-16k',
+	'gpt-3.5-turbo-instruct-0914',
+	'tts-1',
+	'davinci-002',
+	'gpt-3.5-turbo-instruct',
+	'babbage-002',
+	'tts-1-1106',
+	'text-embedding-ada-002',
+];
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/helpers/interfaces.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/helpers/interfaces.ts
new file mode 100644
index 0000000000000..1db7db6f742cb
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/helpers/interfaces.ts
@@ -0,0 +1,58 @@
+import type { IDataObject } from 'n8n-workflow';
+
+export type ChatCompletion = {
+	id: string;
+	object: string;
+	created: number;
+	model: string;
+	choices: Array<{
+		index: number;
+		message: {
+			role: string;
+			content: string;
+			tool_calls?: Array<{
+				id: string;
+				type: 'function';
+				function: {
+					name: string;
+					arguments: string;
+				};
+			}>;
+		};
+		finish_reason?: 'tool_calls';
+	}>;
+	usage: {
+		prompt_tokens: number;
+		completion_tokens: number;
+		total_tokens: number;
+	};
+	system_fingerprint: string;
+};
+
+export type ThreadMessage = {
+	id: string;
+	object: string;
+	created_at: number;
+	thread_id: string;
+	role: string;
+	content: Array<{
+		type: string;
+		text: {
+			value: string;
+			annotations: string[];
+		};
+	}>;
+	file_ids: string[];
+	assistant_id: string;
+	run_id: string;
+	metadata: IDataObject;
+};
+
+export type ExternalApiCallOptions = {
+	callExternalApi: boolean;
+	url: string;
+	path: string;
+	method: string;
+	requestOptions: IDataObject;
+	sendParametersIn: string;
+};
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/helpers/utils.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/helpers/utils.ts
new file mode 100644
index 0000000000000..294fc47847f0f
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/helpers/utils.ts
@@ -0,0 +1,45 @@
+import { zodToJsonSchema } from 'zod-to-json-schema';
+import type { OpenAIClient } from '@langchain/openai';
+import type { StructuredTool } from '@langchain/core/tools';
+
+// Copied from langchain(`langchain/src/tools/convert_to_openai.ts`)
+// since these functions are not exported
+
+/**
+ * Formats a `StructuredTool` instance into a format that is compatible
+ * with OpenAI's ChatCompletionFunctions. It uses the `zodToJsonSchema`
+ * function to convert the schema of the `StructuredTool` into a JSON
+ * schema, which is then used as the parameters for the OpenAI function.
+ */
+export function formatToOpenAIFunction(
+	tool: StructuredTool,
+): OpenAIClient.Chat.ChatCompletionCreateParams.Function {
+	return {
+		name: tool.name,
+		description: tool.description,
+		parameters: zodToJsonSchema(tool.schema),
+	};
+}
+
+export function formatToOpenAITool(tool: StructuredTool): OpenAIClient.Chat.ChatCompletionTool {
+	const schema = zodToJsonSchema(tool.schema);
+	return {
+		type: 'function',
+		function: {
+			name: tool.name,
+			description: tool.description,
+			parameters: schema,
+		},
+	};
+}
+
+export function formatToOpenAIAssistantTool(tool: StructuredTool): OpenAIClient.Beta.AssistantTool {
+	return {
+		type: 'function',
+		function: {
+			name: tool.name,
+			description: tool.description,
+			parameters: zodToJsonSchema(tool.schema),
+		},
+	};
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/methods/index.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/methods/index.ts
new file mode 100644
index 0000000000000..073c80a2eacca
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/methods/index.ts
@@ -0,0 +1,2 @@
+export * as listSearch from './listSearch';
+export * as loadOptions from './loadOptions';
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/methods/listSearch.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/methods/listSearch.ts
new file mode 100644
index 0000000000000..ae46fde099947
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/methods/listSearch.ts
@@ -0,0 +1,119 @@
+import type {
+	IDataObject,
+	ILoadOptionsFunctions,
+	INodeListSearchItems,
+	INodeListSearchResult,
+} from 'n8n-workflow';
+
+import { apiRequest } from '../transport';
+
+export async function fileSearch(
+	this: ILoadOptionsFunctions,
+	filter?: string,
+): Promise<INodeListSearchResult> {
+	const { data } = await apiRequest.call(this, 'GET', '/files');
+
+	if (filter) {
+		const results: INodeListSearchItems[] = [];
+
+		for (const file of data || []) {
+			if ((file.filename as string)?.toLowerCase().includes(filter.toLowerCase())) {
+				results.push({
+					name: file.filename as string,
+					value: file.id as string,
+				});
+			}
+		}
+
+		return {
+			results,
+		};
+	} else {
+		return {
+			results: (data || []).map((file: IDataObject) => ({
+				name: file.filename as string,
+				value: file.id as string,
+			})),
+		};
+	}
+}
+
+export async function modelSearch(
+	this: ILoadOptionsFunctions,
+	filter?: string,
+): Promise<INodeListSearchResult> {
+	let { data } = await apiRequest.call(this, 'GET', '/models');
+
+	data = data?.filter((model: IDataObject) => (model.id as string).startsWith('gpt-'));
+
+	let results: INodeListSearchItems[] = [];
+
+	if (filter) {
+		for (const model of data || []) {
+			if ((model.id as string)?.toLowerCase().includes(filter.toLowerCase())) {
+				results.push({
+					name: (model.id as string).toUpperCase(),
+					value: model.id as string,
+				});
+			}
+		}
+	} else {
+		results = (data || []).map((model: IDataObject) => ({
+			name: (model.id as string).toUpperCase(),
+			value: model.id as string,
+		}));
+	}
+
+	results = results.sort((a, b) => a.name.localeCompare(b.name));
+
+	return {
+		results,
+	};
+}
+
+export async function assistantSearch(
+	this: ILoadOptionsFunctions,
+	filter?: string,
+	paginationToken?: string,
+): Promise<INodeListSearchResult> {
+	const { data, has_more, last_id } = await apiRequest.call(this, 'GET', '/assistants', {
+		headers: {
+			'OpenAI-Beta': 'assistants=v1',
+		},
+		qs: {
+			limit: 100,
+			after: paginationToken,
+		},
+	});
+
+	if (has_more === true) {
+		paginationToken = last_id;
+	} else {
+		paginationToken = undefined;
+	}
+
+	if (filter) {
+		const results: INodeListSearchItems[] = [];
+
+		for (const assistant of data || []) {
+			if ((assistant.name as string)?.toLowerCase().includes(filter.toLowerCase())) {
+				results.push({
+					name: assistant.name as string,
+					value: assistant.id as string,
+				});
+			}
+		}
+
+		return {
+			results,
+		};
+	} else {
+		return {
+			results: (data || []).map((assistant: IDataObject) => ({
+				name: assistant.name as string,
+				value: assistant.id as string,
+			})),
+			paginationToken,
+		};
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/methods/loadOptions.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/methods/loadOptions.ts
new file mode 100644
index 0000000000000..a25f24c6988cd
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/methods/loadOptions.ts
@@ -0,0 +1,17 @@
+import type { ILoadOptionsFunctions, INodePropertyOptions } from 'n8n-workflow';
+import { apiRequest } from '../transport';
+
+export async function getFiles(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+	const { data } = await apiRequest.call(this, 'GET', '/files', { qs: { purpose: 'assistants' } });
+
+	const returnData: INodePropertyOptions[] = [];
+
+	for (const file of data || []) {
+		returnData.push({
+			name: file.filename as string,
+			value: file.id as string,
+		});
+	}
+
+	return returnData;
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/openAi.svg b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/openAi.svg
new file mode 100644
index 0000000000000..4f8812da72e68
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/openAi.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="260" preserveAspectRatio="xMidYMid"><path d="M239.184 106.203a64.72 64.72 0 0 0-5.576-53.103C219.452 28.459 191 15.784 163.213 21.74A65.586 65.586 0 0 0 52.096 45.22a64.72 64.72 0 0 0-43.23 31.36c-14.31 24.602-11.061 55.634 8.033 76.74a64.67 64.67 0 0 0 5.525 53.102c14.174 24.65 42.644 37.324 70.446 31.36a64.72 64.72 0 0 0 48.754 21.744c28.481.025 53.714-18.361 62.414-45.481a64.77 64.77 0 0 0 43.229-31.36c14.137-24.558 10.875-55.423-8.083-76.483m-97.56 136.338a48.4 48.4 0 0 1-31.105-11.255l1.535-.87 51.67-29.825a8.6 8.6 0 0 0 4.247-7.367v-72.85l21.845 12.636c.218.111.37.32.409.563v60.367c-.056 26.818-21.783 48.545-48.601 48.601M37.158 197.93a48.35 48.35 0 0 1-5.781-32.589l1.534.921 51.722 29.826a8.34 8.34 0 0 0 8.441 0l63.181-36.425v25.221a.87.87 0 0 1-.358.665l-52.335 30.184c-23.257 13.398-52.97 5.431-66.404-17.803M23.549 85.38a48.5 48.5 0 0 1 25.58-21.333v61.39a8.29 8.29 0 0 0 4.195 7.316l62.874 36.272-21.845 12.636a.82.82 0 0 1-.767 0L41.353 151.53c-23.211-13.454-31.171-43.144-17.804-66.405zm179.466 41.695-63.08-36.63L161.73 77.86a.82.82 0 0 1 .768 0l52.233 30.184a48.6 48.6 0 0 1-7.316 87.635v-61.391a8.54 8.54 0 0 0-4.4-7.213m21.742-32.69-1.535-.922-51.619-30.081a8.39 8.39 0 0 0-8.492 0L99.98 99.808V74.587a.72.72 0 0 1 .307-.665l52.233-30.133a48.652 48.652 0 0 1 72.236 50.391zM88.061 139.097l-21.845-12.585a.87.87 0 0 1-.41-.614V65.685a48.652 48.652 0 0 1 79.757-37.346l-1.535.87-51.67 29.825a8.6 8.6 0 0 0-4.246 7.367zm11.868-25.58L128.067 97.3l28.188 16.218v32.434l-28.086 16.218-28.188-16.218z"/></svg>
\ No newline at end of file
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
new file mode 100644
index 0000000000000..87e975455197c
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/test/OpenAi.node.test.ts
@@ -0,0 +1,521 @@
+import type { IDataObject, IExecuteFunctions } from 'n8n-workflow';
+import get from 'lodash/get';
+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) => {
+	const nodeParameters = parameters;
+	return {
+		getNodeParameter(parameter: string) {
+			return get(nodeParameters, parameter);
+		},
+		getNode() {
+			return {};
+		},
+		getInputConnectionData() {
+			return undefined;
+		},
+		helpers: {
+			prepareBinaryData() {
+				return {};
+			},
+			assertBinaryData() {
+				return {
+					filename: 'filenale.flac',
+					contentType: 'audio/flac',
+				};
+			},
+			getBinaryDataBuffer() {
+				return 'data buffer data';
+			},
+		},
+	} as unknown as IExecuteFunctions;
+};
+
+describe('OpenAi, Assistant resource', () => {
+	beforeEach(() => {
+		(transport as any).apiRequest = jest.fn();
+	});
+
+	it('create => should throw an error if an assistant with the same name already exists', async () => {
+		(transport.apiRequest as jest.Mock).mockResolvedValueOnce({
+			data: [{ name: 'name' }],
+			has_more: false,
+		});
+
+		try {
+			await assistant.create.execute.call(
+				createExecuteFunctionsMock({
+					name: 'name',
+					options: {
+						failIfExists: true,
+					},
+				}),
+				0,
+			);
+			expect(true).toBe(false);
+		} catch (error) {
+			expect(error.message).toBe("An assistant with the same name 'name' already exists");
+		}
+	});
+
+	it('create => should call apiRequest with correct parameters', async () => {
+		(transport.apiRequest as jest.Mock).mockResolvedValueOnce({});
+
+		await assistant.create.execute.call(
+			createExecuteFunctionsMock({
+				modelId: 'gpt-model',
+				name: 'name',
+				description: 'description',
+				instructions: 'some instructions',
+				codeInterpreter: true,
+				knowledgeRetrieval: true,
+				file_ids: [],
+				options: {},
+			}),
+			0,
+		);
+
+		expect(transport.apiRequest).toHaveBeenCalledWith('POST', '/assistants', {
+			body: {
+				description: 'description',
+				file_ids: [],
+				instructions: 'some instructions',
+				model: 'gpt-model',
+				name: 'name',
+				tools: [{ type: 'code_interpreter' }, { type: 'retrieval' }],
+			},
+			headers: { 'OpenAI-Beta': 'assistants=v1' },
+		});
+	});
+
+	it('create => should throw error if more then 20 files selected', async () => {
+		(transport.apiRequest as jest.Mock).mockResolvedValueOnce({});
+
+		try {
+			await assistant.create.execute.call(
+				createExecuteFunctionsMock({
+					file_ids: Array.from({ length: 25 }),
+					options: {},
+				}),
+				0,
+			);
+			expect(true).toBe(false);
+		} catch (error) {
+			expect(error.message).toBe(
+				'The maximum number of files that can be attached to the assistant is 20',
+			);
+		}
+	});
+
+	it('delete => should call apiRequest with correct parameters', async () => {
+		(transport.apiRequest as jest.Mock).mockResolvedValueOnce({});
+
+		await assistant.deleteAssistant.execute.call(
+			createExecuteFunctionsMock({
+				assistantId: 'assistant-id',
+			}),
+			0,
+		);
+
+		expect(transport.apiRequest).toHaveBeenCalledWith('DELETE', '/assistants/assistant-id', {
+			headers: { 'OpenAI-Beta': 'assistants=v1' },
+		});
+	});
+
+	it('list => should call apiRequest with correct parameters', async () => {
+		(transport.apiRequest as jest.Mock).mockResolvedValueOnce({
+			data: [
+				{ name: 'name1', id: 'id-1', model: 'gpt-model', other: 'other' },
+				{ name: 'name2', id: 'id-2', model: 'gpt-model', other: 'other' },
+				{ name: 'name3', id: 'id-3', model: 'gpt-model', other: 'other' },
+			],
+			has_more: false,
+		});
+
+		const response = await assistant.list.execute.call(
+			createExecuteFunctionsMock({
+				simplify: true,
+			}),
+			0,
+		);
+
+		expect(response).toEqual([
+			{
+				json: { name: 'name1', id: 'id-1', model: 'gpt-model' },
+				pairedItem: { item: 0 },
+			},
+			{
+				json: { name: 'name2', id: 'id-2', model: 'gpt-model' },
+				pairedItem: { item: 0 },
+			},
+			{
+				json: { name: 'name3', id: 'id-3', model: 'gpt-model' },
+				pairedItem: { item: 0 },
+			},
+		]);
+	});
+
+	it('update => should call apiRequest with correct parameters', async () => {
+		(transport.apiRequest as jest.Mock).mockResolvedValueOnce({
+			tools: [{ type: 'existing_tool' }],
+		});
+		(transport.apiRequest as jest.Mock).mockResolvedValueOnce({});
+
+		await assistant.update.execute.call(
+			createExecuteFunctionsMock({
+				assistantId: 'assistant-id',
+				options: {
+					modelId: 'gpt-model',
+					name: 'name',
+					instructions: 'some instructions',
+					codeInterpreter: true,
+					knowledgeRetrieval: true,
+					file_ids: [],
+					removeCustomTools: false,
+				},
+			}),
+			0,
+		);
+
+		expect(transport.apiRequest).toHaveBeenCalledTimes(2);
+		expect(transport.apiRequest).toHaveBeenCalledWith('GET', '/assistants/assistant-id', {
+			headers: { 'OpenAI-Beta': 'assistants=v1' },
+		});
+		expect(transport.apiRequest).toHaveBeenCalledWith('POST', '/assistants/assistant-id', {
+			body: {
+				file_ids: [],
+				instructions: 'some instructions',
+				model: 'gpt-model',
+				name: 'name',
+				tools: [{ type: 'existing_tool' }, { type: 'code_interpreter' }, { type: 'retrieval' }],
+			},
+			headers: { 'OpenAI-Beta': 'assistants=v1' },
+		});
+	});
+});
+
+describe('OpenAi, Audio resource', () => {
+	beforeEach(() => {
+		(transport as any).apiRequest = jest.fn();
+	});
+
+	it('generate => should call apiRequest with correct parameters', async () => {
+		(transport.apiRequest as jest.Mock).mockResolvedValueOnce({});
+
+		const returnData = await audio.generate.execute.call(
+			createExecuteFunctionsMock({
+				model: 'tts-model',
+				input: 'input',
+				voice: 'fable',
+				options: {
+					response_format: 'flac',
+					speed: 1.25,
+					binaryPropertyOutput: 'myData',
+				},
+			}),
+			0,
+		);
+
+		expect(returnData.length).toEqual(1);
+		expect(returnData[0].binary?.myData).toBeDefined();
+		expect(returnData[0].pairedItem).toBeDefined();
+
+		expect(transport.apiRequest).toHaveBeenCalledWith('POST', '/audio/speech', {
+			body: {
+				input: 'input',
+				model: 'tts-model',
+				response_format: 'flac',
+				speed: 1.25,
+				voice: 'fable',
+			},
+			option: { encoding: 'arraybuffer', json: false, returnFullResponse: true, useStream: true },
+		});
+	});
+
+	it('transcribe => should call apiRequest with correct parameters', async () => {
+		(transport.apiRequest as jest.Mock).mockResolvedValueOnce({ text: 'transcribtion' });
+
+		const returnData = await audio.transcribe.execute.call(
+			createExecuteFunctionsMock({
+				binaryPropertyName: 'myData',
+				options: {
+					language: 'en',
+					temperature: 1.1,
+				},
+			}),
+			0,
+		);
+
+		expect(returnData.length).toEqual(1);
+		expect(returnData[0].pairedItem).toBeDefined();
+		expect(returnData[0].json).toEqual({ text: 'transcribtion' });
+
+		expect(transport.apiRequest).toHaveBeenCalledWith(
+			'POST',
+			'/audio/transcriptions',
+			expect.objectContaining({
+				headers: { 'Content-Type': 'multipart/form-data' },
+			}),
+		);
+	});
+
+	it('translate => should call apiRequest with correct parameters', async () => {
+		(transport.apiRequest as jest.Mock).mockResolvedValueOnce({ text: 'translations' });
+
+		const returnData = await audio.translate.execute.call(
+			createExecuteFunctionsMock({
+				binaryPropertyName: 'myData',
+				options: {},
+			}),
+			0,
+		);
+
+		expect(returnData.length).toEqual(1);
+		expect(returnData[0].pairedItem).toBeDefined();
+		expect(returnData[0].json).toEqual({ text: 'translations' });
+
+		expect(transport.apiRequest).toHaveBeenCalledWith(
+			'POST',
+			'/audio/translations',
+			expect.objectContaining({
+				headers: { 'Content-Type': 'multipart/form-data' },
+			}),
+		);
+	});
+});
+
+describe('OpenAi, File resource', () => {
+	beforeEach(() => {
+		(transport as any).apiRequest = jest.fn();
+	});
+
+	it('deleteFile => should call apiRequest with correct parameters', async () => {
+		(transport.apiRequest as jest.Mock).mockResolvedValueOnce({});
+
+		await file.deleteFile.execute.call(
+			createExecuteFunctionsMock({
+				fileId: 'file-id',
+			}),
+			0,
+		);
+
+		expect(transport.apiRequest).toHaveBeenCalledWith('DELETE', '/files/file-id');
+	});
+
+	it('list => should return list of files', async () => {
+		(transport.apiRequest as jest.Mock).mockResolvedValueOnce({
+			data: [{ file: 'file1' }, { file: 'file2' }, { file: 'file3' }],
+		});
+
+		const returnData = await file.list.execute.call(createExecuteFunctionsMock({ options: {} }), 2);
+
+		expect(returnData.length).toEqual(3);
+		expect(returnData).toEqual([
+			{
+				json: { file: 'file1' },
+				pairedItem: { item: 2 },
+			},
+			{
+				json: { file: 'file2' },
+				pairedItem: { item: 2 },
+			},
+			{
+				json: { file: 'file3' },
+				pairedItem: { item: 2 },
+			},
+		]);
+	});
+
+	it('upload => should call apiRequest with correct parameters', async () => {
+		(transport.apiRequest as jest.Mock).mockResolvedValueOnce({ success: true });
+
+		const returnData = await file.upload.execute.call(
+			createExecuteFunctionsMock({
+				binaryPropertyName: 'myData',
+				options: {},
+			}),
+			0,
+		);
+
+		expect(returnData.length).toEqual(1);
+		expect(returnData[0].pairedItem).toBeDefined();
+		expect(returnData[0].json).toEqual({ success: true });
+
+		expect(transport.apiRequest).toHaveBeenCalledWith(
+			'POST',
+			'/files',
+			expect.objectContaining({
+				headers: { 'Content-Type': 'multipart/form-data' },
+			}),
+		);
+	});
+});
+
+describe('OpenAi, Image resource', () => {
+	beforeEach(() => {
+		(transport as any).apiRequest = jest.fn();
+	});
+
+	it('generate => should call apiRequest with correct parameters, return binary', async () => {
+		(transport.apiRequest as jest.Mock).mockResolvedValueOnce({ data: [{ b64_json: 'image1' }] });
+
+		const returnData = await image.generate.execute.call(
+			createExecuteFunctionsMock({
+				model: 'dall-e-3',
+				prompt: 'cat with a hat',
+				options: {
+					size: '1024x1024',
+					style: 'vivid',
+					quality: 'hd',
+					binaryPropertyOutput: 'myData',
+				},
+			}),
+			0,
+		);
+
+		expect(returnData.length).toEqual(1);
+		expect(returnData[0].binary?.myData).toBeDefined();
+		expect(returnData[0].pairedItem).toBeDefined();
+
+		expect(transport.apiRequest).toHaveBeenCalledWith('POST', '/images/generations', {
+			body: {
+				model: 'dall-e-3',
+				prompt: 'cat with a hat',
+				quality: 'hd',
+				response_format: 'b64_json',
+				size: '1024x1024',
+				style: 'vivid',
+			},
+		});
+	});
+
+	it('generate => should call apiRequest with correct parameters, return urls', async () => {
+		(transport.apiRequest as jest.Mock).mockResolvedValueOnce({ data: [{ url: 'image-url' }] });
+
+		const returnData = await image.generate.execute.call(
+			createExecuteFunctionsMock({
+				model: 'dall-e-3',
+				prompt: 'cat with a hat',
+				options: {
+					size: '1024x1024',
+					style: 'vivid',
+					quality: 'hd',
+					binaryPropertyOutput: 'myData',
+					returnImageUrls: true,
+				},
+			}),
+			0,
+		);
+
+		expect(returnData.length).toEqual(1);
+		expect(returnData[0].pairedItem).toBeDefined();
+		expect(returnData).toEqual([{ json: { url: 'image-url' }, pairedItem: { item: 0 } }]);
+
+		expect(transport.apiRequest).toHaveBeenCalledWith('POST', '/images/generations', {
+			body: {
+				model: 'dall-e-3',
+				prompt: 'cat with a hat',
+				quality: 'hd',
+				response_format: 'url',
+				size: '1024x1024',
+				style: 'vivid',
+			},
+		});
+	});
+
+	it('analyze => should call apiRequest with correct parameters', async () => {
+		(transport.apiRequest as jest.Mock).mockResolvedValueOnce({ success: true });
+
+		const returnData = await image.analyze.execute.call(
+			createExecuteFunctionsMock({
+				text: 'image text',
+				inputType: 'url',
+				imageUrls: 'image-url1, image-url2',
+				options: {
+					detail: 'low',
+				},
+			}),
+			0,
+		);
+
+		expect(returnData.length).toEqual(1);
+		expect(returnData[0].pairedItem).toBeDefined();
+		expect(returnData[0].json).toEqual({ success: true });
+
+		expect(transport.apiRequest).toHaveBeenCalledWith('POST', '/chat/completions', {
+			body: {
+				max_tokens: 300,
+				messages: [
+					{
+						content: [
+							{ text: 'image text', type: 'text' },
+							{ image_url: { detail: 'low', url: 'image-url1' }, type: 'image_url' },
+							{ image_url: { detail: 'low', url: 'image-url2' }, type: 'image_url' },
+						],
+						role: 'user',
+					},
+				],
+				model: 'gpt-4-vision-preview',
+			},
+		});
+	});
+});
+
+describe('OpenAi, Text resource', () => {
+	beforeEach(() => {
+		(transport as any).apiRequest = jest.fn();
+	});
+
+	it('classify => should call apiRequest with correct parameters', async () => {
+		(transport.apiRequest as jest.Mock).mockResolvedValueOnce({ results: [{ flagged: true }] });
+
+		const returnData = await text.classify.execute.call(
+			createExecuteFunctionsMock({
+				input: 'input',
+				options: { useStableModel: true },
+			}),
+			0,
+		);
+
+		expect(returnData.length).toEqual(1);
+		expect(returnData[0].pairedItem).toBeDefined();
+		expect(returnData[0].json).toEqual({ flagged: true });
+
+		expect(transport.apiRequest).toHaveBeenCalledWith('POST', '/moderations', {
+			body: { input: 'input', model: 'text-moderation-stable' },
+		});
+	});
+
+	it('message => should call apiRequest with correct parameters, no tool call', async () => {
+		(transport.apiRequest as jest.Mock).mockResolvedValueOnce({
+			choices: [{ message: { tool_calls: undefined } }],
+		});
+
+		await text.message.execute.call(
+			createExecuteFunctionsMock({
+				modelId: 'gpt-model',
+				messages: {
+					values: [{ role: 'user', content: 'message' }],
+				},
+
+				options: {},
+			}),
+			0,
+		);
+
+		expect(transport.apiRequest).toHaveBeenCalledWith('POST', '/chat/completions', {
+			body: {
+				messages: [{ content: 'message', role: 'user' }],
+				model: 'gpt-model',
+				response_format: undefined,
+				tools: undefined,
+			},
+		});
+	});
+});
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/transport/index.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/transport/index.ts
new file mode 100644
index 0000000000000..36a5773245e4b
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/transport/index.ts
@@ -0,0 +1,37 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	IHttpRequestMethods,
+	ILoadOptionsFunctions,
+} from 'n8n-workflow';
+type RequestParameters = {
+	headers?: IDataObject;
+	body?: IDataObject | string;
+	qs?: IDataObject;
+	uri?: string;
+	option?: IDataObject;
+};
+
+export async function apiRequest(
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
+	endpoint: string,
+	parameters?: RequestParameters,
+) {
+	const { body, qs, uri, option, headers } = parameters ?? {};
+
+	const options = {
+		headers,
+		method,
+		body,
+		qs,
+		uri: uri ?? `https://api.openai.com/v1${endpoint}`,
+		json: true,
+	};
+
+	if (option && Object.keys(option).length !== 0) {
+		Object.assign(options, option);
+	}
+
+	return await this.helpers.requestWithAuthentication.call(this, 'openAiApi', options);
+}
diff --git a/packages/@n8n/nodes-langchain/package.json b/packages/@n8n/nodes-langchain/package.json
new file mode 100644
index 0000000000000..c51b714c2fa61
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/package.json
@@ -0,0 +1,178 @@
+{
+  "name": "@n8n/n8n-nodes-langchain",
+  "version": "1.41.0",
+  "description": "",
+  "license": "SEE LICENSE IN LICENSE.md",
+  "homepage": "https://n8n.io",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/n8n-io/n8n-nodes-langchain.git"
+  },
+  "main": "index.js",
+  "scripts": {
+    "clean": "rimraf dist .turbo",
+    "dev": "pnpm run watch",
+    "typecheck": "tsc",
+    "build": "tsc -p tsconfig.build.json && pnpm n8n-copy-icons && pnpm build:metadata",
+    "build:metadata": "pnpm n8n-generate-known && pnpm n8n-generate-ui-types",
+    "format": "prettier nodes credentials --write",
+    "lint": "eslint nodes credentials",
+    "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\"",
+    "test": "jest",
+    "test:dev": "jest --watch"
+  },
+  "files": [
+    "dist"
+  ],
+  "n8n": {
+    "n8nNodesApiVersion": 1,
+    "credentials": [
+      "dist/credentials/AnthropicApi.credentials.js",
+      "dist/credentials/AzureOpenAiApi.credentials.js",
+      "dist/credentials/CohereApi.credentials.js",
+      "dist/credentials/GooglePalmApi.credentials.js",
+      "dist/credentials/GroqApi.credentials.js",
+      "dist/credentials/HuggingFaceApi.credentials.js",
+      "dist/credentials/MotorheadApi.credentials.js",
+      "dist/credentials/MistralCloudApi.credentials.js",
+      "dist/credentials/OllamaApi.credentials.js",
+      "dist/credentials/PineconeApi.credentials.js",
+      "dist/credentials/QdrantApi.credentials.js",
+      "dist/credentials/SerpApi.credentials.js",
+      "dist/credentials/WolframAlphaApi.credentials.js",
+      "dist/credentials/XataApi.credentials.js",
+      "dist/credentials/ZepApi.credentials.js"
+    ],
+    "nodes": [
+      "dist/nodes/vendors/OpenAi/OpenAi.node.js",
+      "dist/nodes/agents/Agent/Agent.node.js",
+      "dist/nodes/agents/OpenAiAssistant/OpenAiAssistant.node.js",
+      "dist/nodes/chains/ChainSummarization/ChainSummarization.node.js",
+      "dist/nodes/chains/ChainLLM/ChainLlm.node.js",
+      "dist/nodes/chains/ChainRetrievalQA/ChainRetrievalQa.node.js",
+      "dist/nodes/code/Code.node.js",
+      "dist/nodes/document_loaders/DocumentDefaultDataLoader/DocumentDefaultDataLoader.node.js",
+      "dist/nodes/document_loaders/DocumentBinaryInputLoader/DocumentBinaryInputLoader.node.js",
+      "dist/nodes/document_loaders/DocumentGithubLoader/DocumentGithubLoader.node.js",
+      "dist/nodes/document_loaders/DocumentJSONInputLoader/DocumentJsonInputLoader.node.js",
+      "dist/nodes/embeddings/EmbeddingsCohere/EmbeddingsCohere.node.js",
+      "dist/nodes/embeddings/EmbeddingsAwsBedrock/EmbeddingsAwsBedrock.node.js",
+      "dist/nodes/embeddings/EmbeddingsAzureOpenAi/EmbeddingsAzureOpenAi.node.js",
+      "dist/nodes/embeddings/EmbeddingsGooglePalm/EmbeddingsGooglePalm.node.js",
+      "dist/nodes/embeddings/EmbeddingsGoogleGemini/EmbeddingsGoogleGemini.node.js",
+      "dist/nodes/embeddings/EmbeddingsHuggingFaceInference/EmbeddingsHuggingFaceInference.node.js",
+      "dist/nodes/embeddings/EmbeddingsMistralCloud/EmbeddingsMistralCloud.node.js",
+      "dist/nodes/embeddings/EmbeddingsOpenAI/EmbeddingsOpenAi.node.js",
+      "dist/nodes/embeddings/EmbeddingsOllama/EmbeddingsOllama.node.js",
+      "dist/nodes/llms/LMChatAnthropic/LmChatAnthropic.node.js",
+      "dist/nodes/llms/LmChatAzureOpenAi/LmChatAzureOpenAi.node.js",
+      "dist/nodes/llms/LmGooglePalm/LmGooglePalm.node.js",
+      "dist/nodes/llms/LmChatAwsBedrock/LmChatAwsBedrock.node.js",
+      "dist/nodes/llms/LmChatGooglePalm/LmChatGooglePalm.node.js",
+      "dist/nodes/llms/LmChatGoogleGemini/LmChatGoogleGemini.node.js",
+      "dist/nodes/llms/LmChatGroq/LmChatGroq.node.js",
+      "dist/nodes/llms/LmChatMistralCloud/LmChatMistralCloud.node.js",
+      "dist/nodes/llms/LMChatOllama/LmChatOllama.node.js",
+      "dist/nodes/llms/LMChatOpenAi/LmChatOpenAi.node.js",
+      "dist/nodes/llms/LMOpenAi/LmOpenAi.node.js",
+      "dist/nodes/llms/LMCohere/LmCohere.node.js",
+      "dist/nodes/llms/LMOllama/LmOllama.node.js",
+      "dist/nodes/llms/LMOpenHuggingFaceInference/LmOpenHuggingFaceInference.node.js",
+      "dist/nodes/memory/MemoryBufferWindow/MemoryBufferWindow.node.js",
+      "dist/nodes/memory/MemoryMotorhead/MemoryMotorhead.node.js",
+      "dist/nodes/memory/MemoryRedisChat/MemoryRedisChat.node.js",
+      "dist/nodes/memory/MemoryManager/MemoryManager.node.js",
+      "dist/nodes/memory/MemoryChatRetriever/MemoryChatRetriever.node.js",
+      "dist/nodes/memory/MemoryXata/MemoryXata.node.js",
+      "dist/nodes/memory/MemoryZep/MemoryZep.node.js",
+      "dist/nodes/output_parser/OutputParserAutofixing/OutputParserAutofixing.node.js",
+      "dist/nodes/output_parser/OutputParserItemList/OutputParserItemList.node.js",
+      "dist/nodes/output_parser/OutputParserStructured/OutputParserStructured.node.js",
+      "dist/nodes/retrievers/RetrieverContextualCompression/RetrieverContextualCompression.node.js",
+      "dist/nodes/retrievers/RetrieverVectorStore/RetrieverVectorStore.node.js",
+      "dist/nodes/retrievers/RetrieverMultiQuery/RetrieverMultiQuery.node.js",
+      "dist/nodes/retrievers/RetrieverWorkflow/RetrieverWorkflow.node.js",
+      "dist/nodes/text_splitters/TextSplitterCharacterTextSplitter/TextSplitterCharacterTextSplitter.node.js",
+      "dist/nodes/text_splitters/TextSplitterRecursiveCharacterTextSplitter/TextSplitterRecursiveCharacterTextSplitter.node.js",
+      "dist/nodes/text_splitters/TextSplitterTokenSplitter/TextSplitterTokenSplitter.node.js",
+      "dist/nodes/tools/ToolCalculator/ToolCalculator.node.js",
+      "dist/nodes/tools/ToolCode/ToolCode.node.js",
+      "dist/nodes/tools/ToolSerpApi/ToolSerpApi.node.js",
+      "dist/nodes/tools/ToolWikipedia/ToolWikipedia.node.js",
+      "dist/nodes/tools/ToolWolframAlpha/ToolWolframAlpha.node.js",
+      "dist/nodes/tools/ToolWorkflow/ToolWorkflow.node.js",
+      "dist/nodes/trigger/ManualChatTrigger/ManualChatTrigger.node.js",
+      "dist/nodes/trigger/ChatTrigger/ChatTrigger.node.js",
+      "dist/nodes/vector_store/VectorStoreInMemory/VectorStoreInMemory.node.js",
+      "dist/nodes/vector_store/VectorStoreInMemoryInsert/VectorStoreInMemoryInsert.node.js",
+      "dist/nodes/vector_store/VectorStoreInMemoryLoad/VectorStoreInMemoryLoad.node.js",
+      "dist/nodes/vector_store/VectorStorePinecone/VectorStorePinecone.node.js",
+      "dist/nodes/vector_store/VectorStorePineconeInsert/VectorStorePineconeInsert.node.js",
+      "dist/nodes/vector_store/VectorStorePineconeLoad/VectorStorePineconeLoad.node.js",
+      "dist/nodes/vector_store/VectorStoreQdrant/VectorStoreQdrant.node.js",
+      "dist/nodes/vector_store/VectorStoreSupabase/VectorStoreSupabase.node.js",
+      "dist/nodes/vector_store/VectorStoreSupabaseInsert/VectorStoreSupabaseInsert.node.js",
+      "dist/nodes/vector_store/VectorStoreSupabaseLoad/VectorStoreSupabaseLoad.node.js",
+      "dist/nodes/vector_store/VectorStoreZep/VectorStoreZep.node.js",
+      "dist/nodes/vector_store/VectorStoreZepInsert/VectorStoreZepInsert.node.js",
+      "dist/nodes/vector_store/VectorStoreZepLoad/VectorStoreZepLoad.node.js"
+    ]
+  },
+  "devDependencies": {
+    "@aws-sdk/types": "3.357.0",
+    "@types/basic-auth": "^1.1.3",
+    "@types/express": "^4.17.21",
+    "@types/html-to-text": "^9.0.1",
+    "@types/json-schema": "^7.0.15",
+    "@types/temp": "^0.9.1",
+    "eslint-plugin-n8n-nodes-base": "^1.16.0",
+    "n8n-core": "workspace:*"
+  },
+  "dependencies": {
+    "@aws-sdk/client-bedrock-runtime": "3.549.0",
+    "@aws-sdk/credential-provider-node": "3.549.0",
+    "@getzep/zep-js": "0.9.0",
+    "@google-ai/generativelanguage": "0.2.1",
+    "@google/generative-ai": "0.8.0",
+    "@huggingface/inference": "2.6.4",
+    "@langchain/anthropic": "^0.1.16",
+    "@langchain/cohere": "^0.0.8",
+    "@langchain/community": "0.0.53",
+    "@langchain/core": "0.1.61",
+    "@langchain/google-genai": "^0.0.12",
+    "@langchain/groq": "^0.0.8",
+    "@langchain/mistralai": "0.0.19",
+    "@langchain/openai": "^0.0.28",
+    "@langchain/pinecone": "^0.0.4",
+    "@langchain/redis": "^0.0.2",
+    "@n8n/typeorm": "0.3.20-9",
+    "@n8n/vm2": "3.9.20",
+    "@pinecone-database/pinecone": "2.2.0",
+    "@qdrant/js-client-rest": "1.7.0",
+    "@supabase/supabase-js": "2.38.5",
+    "@xata.io/client": "0.28.0",
+    "basic-auth": "2.0.1",
+    "cohere-ai": "6.2.2",
+    "d3-dsv": "2.0.0",
+    "epub2": "3.0.2",
+    "form-data": "4.0.0",
+    "html-to-text": "9.0.5",
+    "jest-mock-extended": "^3.0.4",
+    "json-schema-to-zod": "2.0.14",
+    "langchain": "0.1.36",
+    "lodash": "4.17.21",
+    "mammoth": "1.6.0",
+    "n8n-nodes-base": "workspace:*",
+    "n8n-workflow": "workspace:*",
+    "openai": "4.38.5",
+    "pdf-parse": "1.1.1",
+    "pg": "8.11.3",
+    "redis": "4.6.12",
+    "sqlite3": "5.1.7",
+    "temp": "0.9.4",
+    "tmp-promise": "3.0.3",
+    "zod": "3.22.4",
+    "zod-to-json-schema": "3.22.4"
+  }
+}
diff --git a/packages/@n8n/nodes-langchain/tsconfig.build.json b/packages/@n8n/nodes-langchain/tsconfig.build.json
new file mode 100644
index 0000000000000..d7b07412f61eb
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/tsconfig.build.json
@@ -0,0 +1,17 @@
+{
+	"extends": ["./tsconfig.json"],
+	"compilerOptions": {
+		"types": ["node"],
+		"noEmit": false,
+		"declaration": true,
+		"outDir": "dist",
+		"tsBuildInfoFile": "dist/build.tsbuildinfo"
+	},
+	"include": [
+		"credentials/**/*.ts",
+		"nodes/**/*.ts",
+		"nodes/**/*.json",
+		"credentials/translations/**/*.json"
+	],
+	"exclude": ["nodes/**/*.test.ts", "test/**"]
+}
diff --git a/packages/@n8n/nodes-langchain/tsconfig.json b/packages/@n8n/nodes-langchain/tsconfig.json
new file mode 100644
index 0000000000000..8377c89500383
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/tsconfig.json
@@ -0,0 +1,24 @@
+{
+	"compilerOptions": {
+		"strict": true,
+		"module": "commonjs",
+		"moduleResolution": "node",
+		"target": "es2019",
+		"lib": ["es2019", "es2020", "es2022.error"],
+		"removeComments": true,
+		"useUnknownInCatchVariables": false,
+		"forceConsistentCasingInFileNames": true,
+		"noImplicitAny": true,
+		"noImplicitReturns": true,
+		"strictNullChecks": true,
+		"preserveConstEnums": true,
+		"esModuleInterop": true,
+		"resolveJsonModule": true,
+		"incremental": true,
+		"declaration": true,
+		"sourceMap": true,
+		"skipLibCheck": true,
+		"outDir": "./dist/"
+	},
+	"include": ["credentials/**/*", "nodes/**/*", "utils/**/*.ts", "nodes/**/*.json"]
+}
diff --git a/packages/@n8n/nodes-langchain/utils/N8nBinaryLoader.ts b/packages/@n8n/nodes-langchain/utils/N8nBinaryLoader.ts
new file mode 100644
index 0000000000000..9bbd953a6e8b1
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/utils/N8nBinaryLoader.ts
@@ -0,0 +1,208 @@
+import { pipeline } from 'stream/promises';
+import { createWriteStream } from 'fs';
+import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
+import { NodeOperationError, BINARY_ENCODING } from 'n8n-workflow';
+
+import type { TextSplitter } from 'langchain/text_splitter';
+import type { Document } from '@langchain/core/documents';
+import { CSVLoader } from 'langchain/document_loaders/fs/csv';
+import { DocxLoader } from 'langchain/document_loaders/fs/docx';
+import { JSONLoader } from 'langchain/document_loaders/fs/json';
+import { PDFLoader } from 'langchain/document_loaders/fs/pdf';
+import { TextLoader } from 'langchain/document_loaders/fs/text';
+import { EPubLoader } from 'langchain/document_loaders/fs/epub';
+import { file as tmpFile, type DirectoryResult } from 'tmp-promise';
+
+import { getMetadataFiltersValues } from './helpers';
+
+const SUPPORTED_MIME_TYPES = {
+	auto: ['*/*'],
+	pdfLoader: ['application/pdf'],
+	csvLoader: ['text/csv'],
+	epubLoader: ['application/epub+zip'],
+	docxLoader: ['application/vnd.openxmlformats-officedocument.wordprocessingml.document'],
+	textLoader: ['text/plain', 'text/mdx', 'text/md'],
+	jsonLoader: ['application/json'],
+};
+
+export class N8nBinaryLoader {
+	private context: IExecuteFunctions;
+
+	private optionsPrefix: string;
+
+	private binaryDataKey: string;
+
+	private textSplitter?: TextSplitter;
+
+	constructor(
+		context: IExecuteFunctions,
+		optionsPrefix = '',
+		binaryDataKey = '',
+		textSplitter?: TextSplitter,
+	) {
+		this.context = context;
+		this.textSplitter = textSplitter;
+		this.optionsPrefix = optionsPrefix;
+		this.binaryDataKey = binaryDataKey;
+	}
+
+	async processAll(items?: INodeExecutionData[]): Promise<Document[]> {
+		const docs: Document[] = [];
+
+		if (!items) return [];
+
+		for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
+			const processedDocuments = await this.processItem(items[itemIndex], itemIndex);
+
+			docs.push(...processedDocuments);
+		}
+
+		return docs;
+	}
+
+	async processItem(item: INodeExecutionData, itemIndex: number): Promise<Document[]> {
+		const selectedLoader: keyof typeof SUPPORTED_MIME_TYPES = this.context.getNodeParameter(
+			'loader',
+			itemIndex,
+			'auto',
+		) as keyof typeof SUPPORTED_MIME_TYPES;
+
+		const docs: Document[] = [];
+		const metadata = getMetadataFiltersValues(this.context, itemIndex);
+
+		if (!item) return [];
+
+		const binaryData = this.context.helpers.assertBinaryData(itemIndex, this.binaryDataKey);
+		const { mimeType } = binaryData;
+
+		// Check if loader matches the mime-type of the data
+		if (selectedLoader !== 'auto' && !SUPPORTED_MIME_TYPES[selectedLoader].includes(mimeType)) {
+			const neededLoader = Object.keys(SUPPORTED_MIME_TYPES).find((loader) =>
+				SUPPORTED_MIME_TYPES[loader as keyof typeof SUPPORTED_MIME_TYPES].includes(mimeType),
+			);
+
+			throw new NodeOperationError(
+				this.context.getNode(),
+				`Mime type doesn't match selected loader. Please select under "Loader Type": ${neededLoader}`,
+			);
+		}
+
+		if (!Object.values(SUPPORTED_MIME_TYPES).flat().includes(mimeType)) {
+			throw new NodeOperationError(this.context.getNode(), `Unsupported mime type: ${mimeType}`);
+		}
+		if (
+			!SUPPORTED_MIME_TYPES[selectedLoader].includes(mimeType) &&
+			selectedLoader !== 'textLoader' &&
+			selectedLoader !== 'auto'
+		) {
+			throw new NodeOperationError(
+				this.context.getNode(),
+				`Unsupported mime type: ${mimeType} for selected loader: ${selectedLoader}`,
+			);
+		}
+
+		let filePathOrBlob: string | Blob;
+		if (binaryData.id) {
+			const binaryBuffer = await this.context.helpers.binaryToBuffer(
+				await this.context.helpers.getBinaryStream(binaryData.id),
+			);
+			filePathOrBlob = new Blob([binaryBuffer], {
+				type: mimeType,
+			});
+		} else {
+			filePathOrBlob = new Blob([Buffer.from(binaryData.data, BINARY_ENCODING)], {
+				type: mimeType,
+			});
+		}
+
+		let loader: PDFLoader | CSVLoader | EPubLoader | DocxLoader | TextLoader | JSONLoader;
+		let cleanupTmpFile: DirectoryResult['cleanup'] | undefined = undefined;
+
+		switch (mimeType) {
+			case 'application/pdf':
+				const splitPages = this.context.getNodeParameter(
+					`${this.optionsPrefix}splitPages`,
+					itemIndex,
+					false,
+				) as boolean;
+				loader = new PDFLoader(filePathOrBlob, {
+					splitPages,
+				});
+				break;
+			case 'text/csv':
+				const column = this.context.getNodeParameter(
+					`${this.optionsPrefix}column`,
+					itemIndex,
+					null,
+				) as string;
+				const separator = this.context.getNodeParameter(
+					`${this.optionsPrefix}separator`,
+					itemIndex,
+					',',
+				) as string;
+
+				loader = new CSVLoader(filePathOrBlob, {
+					column: column ?? undefined,
+					separator,
+				});
+				break;
+			case 'application/epub+zip':
+				// EPubLoader currently does not accept Blobs https://github.com/langchain-ai/langchainjs/issues/1623
+				let filePath: string;
+				if (filePathOrBlob instanceof Blob) {
+					const tmpFileData = await tmpFile({ prefix: 'epub-loader-' });
+					cleanupTmpFile = tmpFileData.cleanup;
+					try {
+						const bufferData = await filePathOrBlob.arrayBuffer();
+						await pipeline([new Uint8Array(bufferData)], createWriteStream(tmpFileData.path));
+						loader = new EPubLoader(tmpFileData.path);
+						break;
+					} catch (error) {
+						await cleanupTmpFile();
+						throw new NodeOperationError(this.context.getNode(), error as Error);
+					}
+				} else {
+					filePath = filePathOrBlob;
+				}
+				loader = new EPubLoader(filePath);
+				break;
+			case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document':
+				loader = new DocxLoader(filePathOrBlob);
+				break;
+			case 'text/plain':
+				loader = new TextLoader(filePathOrBlob);
+				break;
+			case 'application/json':
+				const pointers = this.context.getNodeParameter(
+					`${this.optionsPrefix}pointers`,
+					itemIndex,
+					'',
+				) as string;
+				const pointersArray = pointers.split(',').map((pointer) => pointer.trim());
+				loader = new JSONLoader(filePathOrBlob, pointersArray);
+				break;
+			default:
+				loader = new TextLoader(filePathOrBlob);
+		}
+
+		const loadedDoc = this.textSplitter
+			? await loader.loadAndSplit(this.textSplitter)
+			: await loader.load();
+
+		docs.push(...loadedDoc);
+
+		if (metadata) {
+			docs.forEach((document) => {
+				document.metadata = {
+					...document.metadata,
+					...metadata,
+				};
+			});
+		}
+
+		if (cleanupTmpFile) {
+			await cleanupTmpFile();
+		}
+		return docs;
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/utils/N8nJsonLoader.ts b/packages/@n8n/nodes-langchain/utils/N8nJsonLoader.ts
new file mode 100644
index 0000000000000..0648885b9fffb
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/utils/N8nJsonLoader.ts
@@ -0,0 +1,91 @@
+import { type IExecuteFunctions, type INodeExecutionData, NodeOperationError } from 'n8n-workflow';
+
+import type { TextSplitter } from 'langchain/text_splitter';
+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 {
+	private context: IExecuteFunctions;
+
+	private optionsPrefix: string;
+
+	private textSplitter?: TextSplitter;
+
+	constructor(context: IExecuteFunctions, optionsPrefix = '', textSplitter?: TextSplitter) {
+		this.context = context;
+		this.textSplitter = textSplitter;
+		this.optionsPrefix = optionsPrefix;
+	}
+
+	async processAll(items?: INodeExecutionData[]): Promise<Document[]> {
+		const docs: Document[] = [];
+
+		if (!items) return [];
+
+		for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
+			const processedDocuments = await this.processItem(items[itemIndex], itemIndex);
+
+			docs.push(...processedDocuments);
+		}
+
+		return docs;
+	}
+
+	async processItem(item: INodeExecutionData, itemIndex: number): Promise<Document[]> {
+		const mode = this.context.getNodeParameter('jsonMode', itemIndex, 'allInputData') as
+			| 'allInputData'
+			| 'expressionData';
+
+		const pointers = this.context.getNodeParameter(
+			`${this.optionsPrefix}pointers`,
+			itemIndex,
+			'',
+		) as string;
+		const pointersArray = pointers.split(',').map((pointer) => pointer.trim());
+		const metadata = getMetadataFiltersValues(this.context, itemIndex) ?? [];
+
+		if (!item) return [];
+
+		let documentLoader: JSONLoader | TextLoader | null = null;
+
+		if (mode === 'allInputData') {
+			const itemString = JSON.stringify(item.json);
+			const itemBlob = new Blob([itemString], { type: 'application/json' });
+			documentLoader = new JSONLoader(itemBlob, pointersArray);
+		}
+
+		if (mode === 'expressionData') {
+			const dataString = this.context.getNodeParameter('jsonData', itemIndex) as string | object;
+			if (typeof dataString === 'object') {
+				const itemBlob = new Blob([JSON.stringify(dataString)], { type: 'application/json' });
+				documentLoader = new JSONLoader(itemBlob, pointersArray);
+			}
+
+			if (typeof dataString === 'string') {
+				const itemBlob = new Blob([dataString], { type: 'text/plain' });
+				documentLoader = new TextLoader(itemBlob);
+			}
+		}
+
+		if (documentLoader === null) {
+			// This should never happen
+			throw new NodeOperationError(this.context.getNode(), 'Document loader is not initialized');
+		}
+
+		const docs = this.textSplitter
+			? await documentLoader.loadAndSplit(this.textSplitter)
+			: await documentLoader.load();
+
+		if (metadata) {
+			docs.forEach((doc) => {
+				doc.metadata = {
+					...doc.metadata,
+					...metadata,
+				};
+			});
+		}
+		return docs;
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/utils/descriptions.ts b/packages/@n8n/nodes-langchain/utils/descriptions.ts
new file mode 100644
index 0000000000000..19ef99213fb6e
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/utils/descriptions.ts
@@ -0,0 +1,34 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+export const promptTypeOptions: INodeProperties = {
+	displayName: 'Prompt',
+	name: 'promptType',
+	type: 'options',
+	options: [
+		{
+			// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+			name: 'Take from previous node automatically',
+			value: 'auto',
+			description: 'Looks for an input field called chatInput',
+		},
+		{
+			// 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',
+		},
+	],
+	default: 'auto',
+};
+
+export const textInput: INodeProperties = {
+	displayName: 'Text',
+	name: 'text',
+	type: 'string',
+	required: true,
+	default: '',
+	placeholder: 'e.g. Hello, how can you help me?',
+	typeOptions: {
+		rows: 2,
+	},
+};
diff --git a/packages/@n8n/nodes-langchain/utils/helpers.ts b/packages/@n8n/nodes-langchain/utils/helpers.ts
new file mode 100644
index 0000000000000..b67fa7bdcd96d
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/utils/helpers.ts
@@ -0,0 +1,152 @@
+import { NodeConnectionType, NodeOperationError, jsonStringify } from 'n8n-workflow';
+import type { EventNamesAiNodesType, IDataObject, IExecuteFunctions } from 'n8n-workflow';
+import type { BaseChatModel } from '@langchain/core/language_models/chat_models';
+import type { BaseOutputParser } from '@langchain/core/output_parsers';
+import type { BaseMessage } from '@langchain/core/messages';
+import { DynamicTool, type Tool } from '@langchain/core/tools';
+import type { BaseLLM } from '@langchain/core/language_models/llms';
+
+export function getMetadataFiltersValues(
+	ctx: IExecuteFunctions,
+	itemIndex: number,
+): Record<string, never> | undefined {
+	const metadata = ctx.getNodeParameter('options.metadata.metadataValues', itemIndex, []) as Array<{
+		name: string;
+		value: string;
+	}>;
+	if (metadata.length > 0) {
+		return metadata.reduce((acc, { name, value }) => ({ ...acc, [name]: value }), {});
+	}
+
+	return undefined;
+}
+
+export function isChatInstance(model: unknown): model is BaseChatModel {
+	const namespace = (model as BaseLLM | BaseChatModel)?.lc_namespace ?? [];
+
+	return namespace.includes('chat_models');
+}
+
+export async function getOptionalOutputParsers(
+	ctx: IExecuteFunctions,
+): Promise<Array<BaseOutputParser<unknown>>> {
+	let outputParsers: BaseOutputParser[] = [];
+
+	if (ctx.getNodeParameter('hasOutputParser', 0, true) === true) {
+		outputParsers = (await ctx.getInputConnectionData(
+			NodeConnectionType.AiOutputParser,
+			0,
+		)) as BaseOutputParser[];
+	}
+
+	return outputParsers;
+}
+
+export function getPromptInputByType(options: {
+	ctx: IExecuteFunctions;
+	i: number;
+	promptTypeKey: string;
+	inputKey: string;
+}) {
+	const { ctx, i, promptTypeKey, inputKey } = options;
+	const prompt = ctx.getNodeParameter(promptTypeKey, i) as string;
+
+	let input;
+	if (prompt === 'auto') {
+		input = ctx.evaluateExpression('{{ $json["chatInput"] }}', i) as string;
+	} else {
+		input = ctx.getNodeParameter(inputKey, i) as string;
+	}
+
+	if (input === undefined) {
+		throw new NodeOperationError(ctx.getNode(), 'No prompt specified', {
+			description:
+				"Expected to find the prompt in an input field called 'chatInput' (this is what the chat trigger node outputs). To use something else, change the 'Prompt' parameter",
+		});
+	}
+
+	return input;
+}
+
+export function getSessionId(
+	ctx: IExecuteFunctions,
+	itemIndex: number,
+	selectorKey = 'sessionIdType',
+	autoSelect = 'fromInput',
+	customKey = 'sessionKey',
+) {
+	let sessionId = '';
+	const selectorType = ctx.getNodeParameter(selectorKey, itemIndex) as string;
+
+	if (selectorType === autoSelect) {
+		sessionId = ctx.evaluateExpression('{{ $json.sessionId }}', itemIndex) as string;
+		if (sessionId === '' || sessionId === undefined) {
+			throw new NodeOperationError(ctx.getNode(), 'No session ID found', {
+				description:
+					"Expected to find the session ID in an input field called 'sessionId' (this is what the chat trigger node outputs). To use something else, change the 'Session ID' parameter",
+				itemIndex,
+			});
+		}
+	} else {
+		sessionId = ctx.getNodeParameter(customKey, itemIndex, '') as string;
+		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",
+				itemIndex,
+			});
+		}
+	}
+
+	return sessionId;
+}
+
+export async function logAiEvent(
+	executeFunctions: IExecuteFunctions,
+	event: EventNamesAiNodesType,
+	data?: IDataObject,
+) {
+	try {
+		await executeFunctions.logAiEvent(event, data ? jsonStringify(data) : undefined);
+	} catch (error) {
+		executeFunctions.logger.debug(`Error logging AI event: ${event}`);
+	}
+}
+
+export function serializeChatHistory(chatHistory: BaseMessage[]): string {
+	return chatHistory
+		.map((chatMessage) => {
+			if (chatMessage._getType() === 'human') {
+				return `Human: ${chatMessage.content}`;
+			} else if (chatMessage._getType() === 'ai') {
+				return `Assistant: ${chatMessage.content}`;
+			} else {
+				return `${chatMessage.content}`;
+			}
+		})
+		.join('\n');
+}
+
+export const getConnectedTools = async (ctx: IExecuteFunctions, enforceUniqueNames: boolean) => {
+	const connectedTools =
+		((await ctx.getInputConnectionData(NodeConnectionType.AiTool, 0)) as Tool[]) || [];
+
+	if (!enforceUniqueNames) return connectedTools;
+
+	const seenNames = new Set<string>();
+
+	for (const tool of connectedTools) {
+		if (!(tool instanceof DynamicTool)) continue;
+
+		const { name } = tool;
+		if (seenNames.has(name)) {
+			throw new NodeOperationError(
+				ctx.getNode(),
+				`You have multiple tools with the same name: '${name}', please rename them to avoid conflicts`,
+			);
+		}
+		seenNames.add(name);
+	}
+
+	return connectedTools;
+};
diff --git a/packages/@n8n/nodes-langchain/utils/logWrapper.ts b/packages/@n8n/nodes-langchain/utils/logWrapper.ts
new file mode 100644
index 0000000000000..c4bb7e59e8198
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/utils/logWrapper.ts
@@ -0,0 +1,535 @@
+import { NodeOperationError, NodeConnectionType } from 'n8n-workflow';
+import type { ConnectionTypes, IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
+
+import { Tool } from '@langchain/core/tools';
+import type { BaseMessage } from '@langchain/core/messages';
+import type { InputValues, MemoryVariables, OutputValues } from '@langchain/core/memory';
+import type { ChatResult } from '@langchain/core/outputs';
+import { BaseChatMessageHistory } from '@langchain/core/chat_history';
+import type { BaseChatModel } from '@langchain/core/language_models/chat_models';
+import type {
+	CallbackManagerForLLMRun,
+	BaseCallbackConfig,
+	Callbacks,
+} from '@langchain/core/callbacks/manager';
+
+import { Embeddings } from '@langchain/core/embeddings';
+import { VectorStore } from '@langchain/core/vectorstores';
+import type { Document } from '@langchain/core/documents';
+import { TextSplitter } from 'langchain/text_splitter';
+import { BaseLLM } from '@langchain/core/language_models/llms';
+import { BaseChatMemory } from '@langchain/community/memory/chat_memory';
+import { BaseRetriever } from '@langchain/core/retrievers';
+import type { FormatInstructionsOptions } from '@langchain/core/output_parsers';
+import { BaseOutputParser, OutputParserException } from '@langchain/core/output_parsers';
+import { isObject } from 'lodash';
+import type { BaseDocumentLoader } from 'langchain/dist/document_loaders/base';
+import { N8nJsonLoader } from './N8nJsonLoader';
+import { N8nBinaryLoader } from './N8nBinaryLoader';
+import { isChatInstance, logAiEvent } from './helpers';
+
+const errorsMap: { [key: string]: { message: string; description: string } } = {
+	'You exceeded your current quota, please check your plan and billing details.': {
+		message: 'OpenAI quota exceeded',
+		description: 'You exceeded your current quota, please check your plan and billing details.',
+	},
+};
+
+export async function callMethodAsync<T>(
+	this: T,
+	parameters: {
+		executeFunctions: IExecuteFunctions;
+		connectionType: ConnectionTypes;
+		currentNodeRunIndex: number;
+		method: (...args: any[]) => Promise<unknown>;
+		arguments: unknown[];
+	},
+): Promise<unknown> {
+	try {
+		return await parameters.method.call(this, ...parameters.arguments);
+	} catch (e) {
+		// Langchain checks for OutputParserException to run retry chain
+		// for auto-fixing the output so skip wrapping in this case
+		if (e instanceof OutputParserException) throw e;
+
+		// Propagate errors from sub-nodes
+		if (e.functionality === 'configuration-node') throw e;
+		const connectedNode = parameters.executeFunctions.getNode();
+
+		const error = new NodeOperationError(connectedNode, e, {
+			functionality: 'configuration-node',
+		});
+
+		if (errorsMap[error.message]) {
+			error.description = errorsMap[error.message].description;
+			error.message = errorsMap[error.message].message;
+		}
+
+		parameters.executeFunctions.addOutputData(
+			parameters.connectionType,
+			parameters.currentNodeRunIndex,
+			error,
+		);
+		if (error.message) {
+			error.description = error.message;
+			throw error;
+		}
+		throw new NodeOperationError(
+			connectedNode,
+			`Error on node "${connectedNode.name}" which is connected via input "${parameters.connectionType}"`,
+			{ functionality: 'configuration-node' },
+		);
+	}
+}
+
+export function callMethodSync<T>(
+	this: T,
+	parameters: {
+		executeFunctions: IExecuteFunctions;
+		connectionType: ConnectionTypes;
+		currentNodeRunIndex: number;
+		method: (...args: any[]) => T;
+		arguments: unknown[];
+	},
+): unknown {
+	try {
+		return parameters.method.call(this, ...parameters.arguments);
+	} catch (e) {
+		// Propagate errors from sub-nodes
+		if (e.functionality === 'configuration-node') throw e;
+		const connectedNode = parameters.executeFunctions.getNode();
+		const error = new NodeOperationError(connectedNode, e);
+		parameters.executeFunctions.addOutputData(
+			parameters.connectionType,
+			parameters.currentNodeRunIndex,
+			error,
+		);
+		throw new NodeOperationError(
+			connectedNode,
+			`Error on node "${connectedNode.name}" which is connected via input "${parameters.connectionType}"`,
+			{ functionality: 'configuration-node' },
+		);
+	}
+}
+
+export function logWrapper(
+	originalInstance:
+		| Tool
+		| BaseChatModel
+		| BaseChatMemory
+		| BaseLLM
+		| BaseChatMessageHistory
+		| BaseOutputParser
+		| BaseRetriever
+		| Embeddings
+		| Document[]
+		| Document
+		| BaseDocumentLoader
+		| TextSplitter
+		| VectorStore
+		| N8nBinaryLoader
+		| N8nJsonLoader,
+	executeFunctions: IExecuteFunctions,
+) {
+	return new Proxy(originalInstance, {
+		get: (target, prop) => {
+			let connectionType: ConnectionTypes | undefined;
+			// ========== BaseChatMemory ==========
+			if (originalInstance instanceof BaseChatMemory) {
+				if (prop === 'loadMemoryVariables' && 'loadMemoryVariables' in target) {
+					return async (values: InputValues): Promise<MemoryVariables> => {
+						connectionType = NodeConnectionType.AiMemory;
+
+						const { index } = executeFunctions.addInputData(connectionType, [
+							[{ json: { action: 'loadMemoryVariables', values } }],
+						]);
+
+						const response = (await callMethodAsync.call(target, {
+							executeFunctions,
+							connectionType,
+							currentNodeRunIndex: index,
+							method: target[prop],
+							arguments: [values],
+						})) as MemoryVariables;
+
+						const chatHistory = (response?.chat_history as BaseMessage[]) ?? response;
+
+						executeFunctions.addOutputData(connectionType, index, [
+							[{ json: { action: 'loadMemoryVariables', chatHistory } }],
+						]);
+						return response;
+					};
+				} else if (prop === 'saveContext' && 'saveContext' in target) {
+					return async (input: InputValues, output: OutputValues): Promise<MemoryVariables> => {
+						connectionType = NodeConnectionType.AiMemory;
+
+						const { index } = executeFunctions.addInputData(connectionType, [
+							[{ json: { action: 'saveContext', input, output } }],
+						]);
+
+						const response = (await callMethodAsync.call(target, {
+							executeFunctions,
+							connectionType,
+							currentNodeRunIndex: index,
+							method: target[prop],
+							arguments: [input, output],
+						})) as MemoryVariables;
+
+						const chatHistory = await target.chatHistory.getMessages();
+
+						executeFunctions.addOutputData(connectionType, index, [
+							[{ json: { action: 'saveContext', chatHistory } }],
+						]);
+
+						return response;
+					};
+				}
+			}
+
+			// ========== BaseChatMessageHistory ==========
+			if (originalInstance instanceof BaseChatMessageHistory) {
+				if (prop === 'getMessages' && 'getMessages' in target) {
+					return async (): Promise<BaseMessage[]> => {
+						connectionType = NodeConnectionType.AiMemory;
+						const { index } = executeFunctions.addInputData(connectionType, [
+							[{ json: { action: 'getMessages' } }],
+						]);
+
+						const response = (await callMethodAsync.call(target, {
+							executeFunctions,
+							connectionType,
+							currentNodeRunIndex: index,
+							method: target[prop],
+							arguments: [],
+						})) as BaseMessage[];
+
+						const payload = { action: 'getMessages', response };
+						executeFunctions.addOutputData(connectionType, index, [[{ json: payload }]]);
+
+						void logAiEvent(executeFunctions, 'n8n.ai.memory.get.messages', { response });
+						return response;
+					};
+				} else if (prop === 'addMessage' && 'addMessage' in target) {
+					return async (message: BaseMessage): Promise<void> => {
+						connectionType = NodeConnectionType.AiMemory;
+						const payload = { action: 'addMessage', message };
+						const { index } = executeFunctions.addInputData(connectionType, [[{ json: payload }]]);
+
+						await callMethodAsync.call(target, {
+							executeFunctions,
+							connectionType,
+							currentNodeRunIndex: index,
+							method: target[prop],
+							arguments: [message],
+						});
+
+						void logAiEvent(executeFunctions, 'n8n.ai.memory.added.message', { message });
+						executeFunctions.addOutputData(connectionType, index, [[{ json: payload }]]);
+					};
+				}
+			}
+
+			// ========== BaseChatModel ==========
+			if (originalInstance instanceof BaseLLM || isChatInstance(originalInstance)) {
+				if (prop === '_generate' && '_generate' in target) {
+					return async (
+						messages: BaseMessage[] & string[],
+						options: any,
+						runManager?: CallbackManagerForLLMRun,
+					): Promise<ChatResult> => {
+						connectionType = NodeConnectionType.AiLanguageModel;
+						const { index } = executeFunctions.addInputData(connectionType, [
+							[{ json: { messages, options } }],
+						]);
+						try {
+							const response = (await callMethodAsync.call(target, {
+								executeFunctions,
+								connectionType,
+								currentNodeRunIndex: index,
+								method: target[prop],
+								arguments: [
+									messages,
+									{ ...options, signal: executeFunctions.getExecutionCancelSignal() },
+									runManager,
+								],
+							})) as ChatResult;
+							const parsedMessages =
+								typeof messages === 'string'
+									? messages
+									: messages.map((message) => {
+											if (typeof message === 'string') return message;
+											if (typeof message?.toJSON === 'function') return message.toJSON();
+
+											return message;
+									  });
+
+							void logAiEvent(executeFunctions, 'n8n.ai.llm.generated', {
+								messages: parsedMessages,
+								options,
+								response,
+							});
+							executeFunctions.addOutputData(connectionType, index, [[{ json: { response } }]]);
+							return response;
+						} catch (error) {
+							// Mute AbortError as they are expected
+							if (error?.name === 'AbortError') return { generations: [] };
+							throw error;
+						}
+					};
+				}
+			}
+
+			// ========== BaseOutputParser ==========
+			if (originalInstance instanceof BaseOutputParser) {
+				if (prop === 'getFormatInstructions' && 'getFormatInstructions' in target) {
+					return (options?: FormatInstructionsOptions): string => {
+						connectionType = NodeConnectionType.AiOutputParser;
+						const { index } = executeFunctions.addInputData(connectionType, [
+							[{ json: { action: 'getFormatInstructions' } }],
+						]);
+
+						// @ts-ignore
+						const response = callMethodSync.call(target, {
+							executeFunctions,
+							connectionType,
+							currentNodeRunIndex: index,
+							method: target[prop],
+							arguments: [options],
+						}) as string;
+
+						executeFunctions.addOutputData(connectionType, index, [
+							[{ json: { action: 'getFormatInstructions', response } }],
+						]);
+						void logAiEvent(executeFunctions, 'n8n.ai.output.parser.get.instructions', {
+							response,
+						});
+						return response;
+					};
+				} else if (prop === 'parse' && 'parse' in target) {
+					return async (text: string | Record<string, unknown>): Promise<unknown> => {
+						connectionType = NodeConnectionType.AiOutputParser;
+						const stringifiedText = isObject(text) ? JSON.stringify(text) : text;
+						const { index } = executeFunctions.addInputData(connectionType, [
+							[{ json: { action: 'parse', text: stringifiedText } }],
+						]);
+
+						const response = (await callMethodAsync.call(target, {
+							executeFunctions,
+							connectionType,
+							currentNodeRunIndex: index,
+							method: target[prop],
+							arguments: [stringifiedText],
+						})) as object;
+
+						void logAiEvent(executeFunctions, 'n8n.ai.output.parser.parsed', { text, response });
+						executeFunctions.addOutputData(connectionType, index, [
+							[{ json: { action: 'parse', response } }],
+						]);
+						return response;
+					};
+				}
+			}
+
+			// ========== BaseRetriever ==========
+			if (originalInstance instanceof BaseRetriever) {
+				if (prop === 'getRelevantDocuments' && 'getRelevantDocuments' in target) {
+					return async (
+						query: string,
+						config?: Callbacks | BaseCallbackConfig,
+					): Promise<Document[]> => {
+						connectionType = NodeConnectionType.AiRetriever;
+						const { index } = executeFunctions.addInputData(connectionType, [
+							[{ json: { query, config } }],
+						]);
+
+						const response = (await callMethodAsync.call(target, {
+							executeFunctions,
+							connectionType,
+							currentNodeRunIndex: index,
+							method: target[prop],
+							arguments: [query, config],
+						})) as Array<Document<Record<string, any>>>;
+
+						void logAiEvent(executeFunctions, 'n8n.ai.retriever.get.relevant.documents', { query });
+						executeFunctions.addOutputData(connectionType, index, [[{ json: { response } }]]);
+						return response;
+					};
+				}
+			}
+
+			// ========== Embeddings ==========
+			if (originalInstance instanceof Embeddings) {
+				// Docs -> Embeddings
+				if (prop === 'embedDocuments' && 'embedDocuments' in target) {
+					return async (documents: string[]): Promise<number[][]> => {
+						connectionType = NodeConnectionType.AiEmbedding;
+						const { index } = executeFunctions.addInputData(connectionType, [
+							[{ json: { documents } }],
+						]);
+
+						const response = (await callMethodAsync.call(target, {
+							executeFunctions,
+							connectionType,
+							currentNodeRunIndex: index,
+							method: target[prop],
+							arguments: [documents],
+						})) as number[][];
+
+						void logAiEvent(executeFunctions, 'n8n.ai.embeddings.embedded.document');
+						executeFunctions.addOutputData(connectionType, index, [[{ json: { response } }]]);
+						return response;
+					};
+				}
+				// Query -> Embeddings
+				if (prop === 'embedQuery' && 'embedQuery' in target) {
+					return async (query: string): Promise<number[]> => {
+						connectionType = NodeConnectionType.AiEmbedding;
+						const { index } = executeFunctions.addInputData(connectionType, [
+							[{ json: { query } }],
+						]);
+
+						const response = (await callMethodAsync.call(target, {
+							executeFunctions,
+							connectionType,
+							currentNodeRunIndex: index,
+							method: target[prop],
+							arguments: [query],
+						})) as number[];
+						void logAiEvent(executeFunctions, 'n8n.ai.embeddings.embedded.query');
+						executeFunctions.addOutputData(connectionType, index, [[{ json: { response } }]]);
+						return response;
+					};
+				}
+			}
+
+			// ========== N8n Loaders Process All ==========
+			if (
+				originalInstance instanceof N8nJsonLoader ||
+				originalInstance instanceof N8nBinaryLoader
+			) {
+				// Process All
+				if (prop === 'processAll' && 'processAll' in target) {
+					return async (items: INodeExecutionData[]): Promise<number[]> => {
+						connectionType = NodeConnectionType.AiDocument;
+						const { index } = executeFunctions.addInputData(connectionType, [items]);
+
+						const response = (await callMethodAsync.call(target, {
+							executeFunctions,
+							connectionType,
+							currentNodeRunIndex: index,
+							method: target[prop],
+							arguments: [items],
+						})) as number[];
+
+						executeFunctions.addOutputData(connectionType, index, [[{ json: { response } }]]);
+						return response;
+					};
+				}
+
+				// Process Each
+				if (prop === 'processItem' && 'processItem' in target) {
+					return async (item: INodeExecutionData, itemIndex: number): Promise<number[]> => {
+						connectionType = NodeConnectionType.AiDocument;
+						const { index } = executeFunctions.addInputData(connectionType, [[item]]);
+
+						const response = (await callMethodAsync.call(target, {
+							executeFunctions,
+							connectionType,
+							currentNodeRunIndex: index,
+							method: target[prop],
+							arguments: [item, itemIndex],
+						})) as number[];
+
+						void logAiEvent(executeFunctions, 'n8n.ai.document.processed');
+						executeFunctions.addOutputData(connectionType, index, [
+							[{ json: { response }, pairedItem: { item: itemIndex } }],
+						]);
+						return response;
+					};
+				}
+			}
+
+			// ========== TextSplitter ==========
+			if (originalInstance instanceof TextSplitter) {
+				if (prop === 'splitText' && 'splitText' in target) {
+					return async (text: string): Promise<string[]> => {
+						connectionType = NodeConnectionType.AiTextSplitter;
+						const { index } = executeFunctions.addInputData(connectionType, [
+							[{ json: { textSplitter: text } }],
+						]);
+
+						const response = (await callMethodAsync.call(target, {
+							executeFunctions,
+							connectionType,
+							currentNodeRunIndex: index,
+							method: target[prop],
+							arguments: [text],
+						})) as string[];
+
+						void logAiEvent(executeFunctions, 'n8n.ai.text.splitter.split');
+						executeFunctions.addOutputData(connectionType, index, [[{ json: { response } }]]);
+						return response;
+					};
+				}
+			}
+
+			// ========== Tool ==========
+			if (originalInstance instanceof Tool) {
+				if (prop === '_call' && '_call' in target) {
+					return async (query: string): Promise<string> => {
+						connectionType = NodeConnectionType.AiTool;
+						const { index } = executeFunctions.addInputData(connectionType, [
+							[{ json: { query } }],
+						]);
+
+						const response = (await callMethodAsync.call(target, {
+							executeFunctions,
+							connectionType,
+							currentNodeRunIndex: index,
+							method: target[prop],
+							arguments: [query],
+						})) as string;
+
+						void logAiEvent(executeFunctions, 'n8n.ai.tool.called', { query, response });
+						executeFunctions.addOutputData(connectionType, index, [[{ json: { response } }]]);
+						return response;
+					};
+				}
+			}
+
+			// ========== VectorStore ==========
+			if (originalInstance instanceof VectorStore) {
+				if (prop === 'similaritySearch' && 'similaritySearch' in target) {
+					return async (
+						query: string,
+						k?: number,
+						// @ts-ignore
+						filter?: BiquadFilterType | undefined,
+						_callbacks?: Callbacks | undefined,
+					): Promise<Document[]> => {
+						connectionType = NodeConnectionType.AiVectorStore;
+						const { index } = executeFunctions.addInputData(connectionType, [
+							[{ json: { query, k, filter } }],
+						]);
+
+						const response = (await callMethodAsync.call(target, {
+							executeFunctions,
+							connectionType,
+							currentNodeRunIndex: index,
+							method: target[prop],
+							arguments: [query, k, filter, _callbacks],
+						})) as Array<Document<Record<string, any>>>;
+
+						void logAiEvent(executeFunctions, 'n8n.ai.vector.store.searched', { query });
+						executeFunctions.addOutputData(connectionType, index, [[{ json: { response } }]]);
+
+						return response;
+					};
+				}
+			}
+
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-return
+			return (target as any)[prop];
+		},
+	});
+}
diff --git a/packages/@n8n/nodes-langchain/utils/sharedFields.ts b/packages/@n8n/nodes-langchain/utils/sharedFields.ts
new file mode 100644
index 0000000000000..ffc9640aafe03
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/utils/sharedFields.ts
@@ -0,0 +1,154 @@
+import { NodeConnectionType, type INodeProperties } from 'n8n-workflow';
+
+export const metadataFilterField: INodeProperties = {
+	displayName: 'Metadata Filter',
+	name: 'metadata',
+	type: 'fixedCollection',
+	description: 'Metadata to filter the document by',
+	typeOptions: {
+		multipleValues: true,
+	},
+	default: {},
+	placeholder: 'Add filter field',
+	options: [
+		{
+			name: 'metadataValues',
+			displayName: 'Fields to Set',
+			values: [
+				{
+					displayName: 'Name',
+					name: 'name',
+					type: 'string',
+					default: '',
+					required: true,
+				},
+				{
+					displayName: 'Value',
+					name: 'value',
+					type: 'string',
+					default: '',
+				},
+			],
+		},
+	],
+};
+
+export function getTemplateNoticeField(templateId: number): INodeProperties {
+	return {
+		displayName: `Save time with an <a href="/templates/${templateId}" target="_blank">example</a> of how this node works`,
+		name: 'notice',
+		type: 'notice',
+		default: '',
+	};
+}
+
+const connectionsString = {
+	[NodeConnectionType.AiAgent]: {
+		// Root AI view
+		connection: '',
+		locale: 'AI Agent',
+	},
+	[NodeConnectionType.AiChain]: {
+		// Root AI view
+		connection: '',
+		locale: 'AI Chain',
+	},
+	[NodeConnectionType.AiDocument]: {
+		connection: NodeConnectionType.AiDocument,
+		locale: 'Document Loader',
+	},
+	[NodeConnectionType.AiVectorStore]: {
+		connection: NodeConnectionType.AiVectorStore,
+		locale: 'Vector Store',
+	},
+	[NodeConnectionType.AiRetriever]: {
+		connection: NodeConnectionType.AiRetriever,
+		locale: 'Vector Store Retriever',
+	},
+};
+
+type AllowedConnectionTypes =
+	| NodeConnectionType.AiAgent
+	| NodeConnectionType.AiChain
+	| NodeConnectionType.AiDocument
+	| NodeConnectionType.AiVectorStore
+	| NodeConnectionType.AiRetriever;
+
+function determineArticle(nextWord: string): string {
+	// check if the next word starts with a vowel sound
+	const vowels = /^[aeiouAEIOU]/;
+	return vowels.test(nextWord) ? 'an' : 'a';
+}
+const getConnectionParameterString = (connectionType: string) => {
+	if (connectionType === '') return "data-action-parameter-creatorview='AI'";
+
+	return `data-action-parameter-connectiontype='${connectionType}'`;
+};
+const getAhref = (connectionType: { connection: string; locale: string }) =>
+	`<a class="test" data-action='openSelectiveNodeCreator'${getConnectionParameterString(
+		connectionType.connection,
+	)}'>${connectionType.locale}</a>`;
+
+export function getConnectionHintNoticeField(
+	connectionTypes: AllowedConnectionTypes[],
+): INodeProperties {
+	const groupedConnections = new Map<string, string[]>();
+
+	// group connection types by their 'connection' value
+	// to not create multiple links
+	connectionTypes.forEach((connectionType) => {
+		const connectionString = connectionsString[connectionType].connection;
+		const localeString = connectionsString[connectionType].locale;
+
+		if (!groupedConnections.has(connectionString)) {
+			groupedConnections.set(connectionString, [localeString]);
+			return;
+		}
+
+		groupedConnections.get(connectionString)?.push(localeString);
+	});
+
+	let displayName;
+
+	if (groupedConnections.size === 1) {
+		const [[connection, locales]] = Array.from(groupedConnections);
+
+		displayName = `This node must be connected to ${determineArticle(locales[0])} ${locales[0]
+			.toLowerCase()
+			.replace(
+				/^ai /,
+				'AI ',
+			)}. <a data-action='openSelectiveNodeCreator' ${getConnectionParameterString(
+			connection,
+		)}>Insert one</a>`;
+	} else {
+		const ahrefs = Array.from(groupedConnections, ([connection, locales]) => {
+			// If there are multiple locales, join them with ' or '
+			// use determineArticle to insert the correct article
+			const locale =
+				locales.length > 1
+					? locales
+							.map((localeString, index, { length }) => {
+								return (
+									(index === 0 ? `${determineArticle(localeString)} ` : '') +
+									(index < length - 1 ? `${localeString} or ` : localeString)
+								);
+							})
+							.join('')
+					: `${determineArticle(locales[0])} ${locales[0]}`;
+			return getAhref({ connection, locale });
+		});
+
+		displayName = `This node needs to be connected to ${ahrefs.join(' or ')}.`;
+	}
+
+	return {
+		displayName,
+		name: 'notice',
+		type: 'notice',
+		default: '',
+		typeOptions: {
+			containerClass: 'ndv-connection-hint-notice',
+		},
+	};
+}
diff --git a/packages/@n8n/nodes-langchain/utils/tracing.ts b/packages/@n8n/nodes-langchain/utils/tracing.ts
new file mode 100644
index 0000000000000..b9b3699859358
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/utils/tracing.ts
@@ -0,0 +1,26 @@
+import type { BaseCallbackConfig } from '@langchain/core/callbacks/manager';
+import type { IExecuteFunctions } from 'n8n-workflow';
+
+interface TracingConfig {
+	additionalMetadata?: Record<string, unknown>;
+}
+
+export function getTracingConfig(
+	context: IExecuteFunctions,
+	config: TracingConfig = {},
+): BaseCallbackConfig {
+	const parentRunManager = context.getParentCallbackManager
+		? context.getParentCallbackManager()
+		: undefined;
+
+	return {
+		runName: `[${context.getWorkflow().name}] ${context.getNode().name}`,
+		metadata: {
+			execution_id: context.getExecutionId(),
+			workflow: context.getWorkflow(),
+			node: context.getNode().name,
+			...(config.additionalMetadata ?? {}),
+		},
+		callbacks: parentRunManager,
+	};
+}
diff --git a/packages/@n8n/permissions/.eslintrc.js b/packages/@n8n/permissions/.eslintrc.js
new file mode 100644
index 0000000000000..f60180296c7f9
--- /dev/null
+++ b/packages/@n8n/permissions/.eslintrc.js
@@ -0,0 +1,10 @@
+const sharedOptions = require('@n8n_io/eslint-config/shared');
+
+/**
+ * @type {import('@types/eslint').ESLint.ConfigData}
+ */
+module.exports = {
+	extends: ['@n8n_io/eslint-config/base'],
+
+	...sharedOptions(__dirname),
+};
diff --git a/packages/@n8n/permissions/jest.config.js b/packages/@n8n/permissions/jest.config.js
new file mode 100644
index 0000000000000..d6c48554a79a4
--- /dev/null
+++ b/packages/@n8n/permissions/jest.config.js
@@ -0,0 +1,2 @@
+/** @type {import('jest').Config} */
+module.exports = require('../../../jest.config');
diff --git a/packages/@n8n/permissions/package.json b/packages/@n8n/permissions/package.json
new file mode 100644
index 0000000000000..914aba2955501
--- /dev/null
+++ b/packages/@n8n/permissions/package.json
@@ -0,0 +1,22 @@
+{
+  "name": "@n8n/permissions",
+  "version": "0.6.0",
+  "scripts": {
+    "clean": "rimraf dist .turbo",
+    "dev": "pnpm watch",
+    "typecheck": "tsc",
+    "build": "tsc -p tsconfig.build.json",
+    "format": "prettier --write . --ignore-path ../../../.prettierignore",
+    "lint": "eslint . --quiet",
+    "lintfix": "eslint . --fix",
+    "watch": "tsc -p tsconfig.build.json --watch",
+    "test": "jest",
+    "test:dev": "jest --watch"
+  },
+  "main": "dist/index.js",
+  "module": "src/index.ts",
+  "types": "dist/index.d.ts",
+  "files": [
+    "dist/**/*"
+  ]
+}
diff --git a/packages/@n8n/permissions/src/hasScope.ts b/packages/@n8n/permissions/src/hasScope.ts
new file mode 100644
index 0000000000000..76c22f7b19d56
--- /dev/null
+++ b/packages/@n8n/permissions/src/hasScope.ts
@@ -0,0 +1,29 @@
+import type { Scope, ScopeLevels, GlobalScopes, ScopeOptions } from './types';
+
+export function hasScope(
+	scope: Scope | Scope[],
+	userScopes: GlobalScopes,
+	options?: ScopeOptions,
+): boolean;
+export function hasScope(
+	scope: Scope | Scope[],
+	userScopes: ScopeLevels,
+	options?: ScopeOptions,
+): boolean;
+export function hasScope(
+	scope: Scope | Scope[],
+	userScopes: GlobalScopes | ScopeLevels,
+	options: ScopeOptions = { mode: 'oneOf' },
+): boolean {
+	if (!Array.isArray(scope)) {
+		scope = [scope];
+	}
+
+	const userScopeSet = new Set(Object.values(userScopes).flat());
+
+	if (options.mode === 'allOf') {
+		return !!scope.length && scope.every((s) => userScopeSet.has(s));
+	}
+
+	return scope.some((s) => userScopeSet.has(s));
+}
diff --git a/packages/@n8n/permissions/src/index.ts b/packages/@n8n/permissions/src/index.ts
new file mode 100644
index 0000000000000..5934473ce7835
--- /dev/null
+++ b/packages/@n8n/permissions/src/index.ts
@@ -0,0 +1,2 @@
+export type * from './types';
+export * from './hasScope';
diff --git a/packages/@n8n/permissions/src/types.ts b/packages/@n8n/permissions/src/types.ts
new file mode 100644
index 0000000000000..1707d1c35e2db
--- /dev/null
+++ b/packages/@n8n/permissions/src/types.ts
@@ -0,0 +1,88 @@
+export type DefaultOperations = 'create' | 'read' | 'update' | 'delete' | 'list';
+export type Resource =
+	| 'auditLogs'
+	| 'banner'
+	| 'communityPackage'
+	| 'credential'
+	| 'externalSecretsProvider'
+	| 'externalSecret'
+	| 'eventBusEvent'
+	| 'eventBusDestination'
+	| 'ldap'
+	| 'license'
+	| 'logStreaming'
+	| 'orchestration'
+	| 'sourceControl'
+	| 'saml'
+	| 'tag'
+	| 'user'
+	| 'variable'
+	| 'workersView'
+	| 'workflow';
+
+export type ResourceScope<
+	R extends Resource,
+	Operation extends string = DefaultOperations,
+> = `${R}:${Operation}`;
+
+export type WildcardScope = `${Resource}:*` | '*';
+
+export type AuditLogsScope = ResourceScope<'auditLogs', 'manage'>;
+export type BannerScope = ResourceScope<'banner', 'dismiss'>;
+export type CommunityPackageScope = ResourceScope<
+	'communityPackage',
+	'install' | 'uninstall' | 'update' | 'list' | 'manage'
+>;
+export type CredentialScope = ResourceScope<'credential', DefaultOperations | 'share'>;
+export type ExternalSecretScope = ResourceScope<'externalSecret', 'list' | 'use'>;
+export type ExternalSecretProviderScope = ResourceScope<
+	'externalSecretsProvider',
+	DefaultOperations | 'sync'
+>;
+export type EventBusDestinationScope = ResourceScope<
+	'eventBusDestination',
+	DefaultOperations | 'test'
+>;
+export type EventBusEventScope = ResourceScope<'eventBusEvent', DefaultOperations | 'query'>;
+export type LdapScope = ResourceScope<'ldap', 'manage' | 'sync'>;
+export type LicenseScope = ResourceScope<'license', 'manage'>;
+export type LogStreamingScope = ResourceScope<'logStreaming', 'manage'>;
+export type OrchestrationScope = ResourceScope<'orchestration', 'read' | 'list'>;
+export type SamlScope = ResourceScope<'saml', 'manage'>;
+export type SourceControlScope = ResourceScope<'sourceControl', 'pull' | 'push' | 'manage'>;
+export type TagScope = ResourceScope<'tag'>;
+export type UserScope = ResourceScope<'user', DefaultOperations | 'resetPassword' | 'changeRole'>;
+export type VariableScope = ResourceScope<'variable'>;
+export type WorkersViewScope = ResourceScope<'workersView', 'manage'>;
+export type WorkflowScope = ResourceScope<'workflow', DefaultOperations | 'share' | 'execute'>;
+
+export type Scope =
+	| AuditLogsScope
+	| BannerScope
+	| CommunityPackageScope
+	| CredentialScope
+	| ExternalSecretProviderScope
+	| ExternalSecretScope
+	| EventBusEventScope
+	| EventBusDestinationScope
+	| LdapScope
+	| LicenseScope
+	| LogStreamingScope
+	| OrchestrationScope
+	| SamlScope
+	| SourceControlScope
+	| TagScope
+	| UserScope
+	| VariableScope
+	| WorkersViewScope
+	| WorkflowScope;
+
+export type ScopeLevel = 'global' | 'project' | 'resource';
+export type GetScopeLevel<T extends ScopeLevel> = Record<T, Scope[]>;
+export type GlobalScopes = GetScopeLevel<'global'>;
+export type ProjectScopes = GetScopeLevel<'project'>;
+export type ResourceScopes = GetScopeLevel<'resource'>;
+export type ScopeLevels = GlobalScopes & (ProjectScopes | (ProjectScopes & ResourceScopes));
+
+export type ScopeMode = 'oneOf' | 'allOf';
+export type ScopeOptions = { mode: ScopeMode };
diff --git a/packages/@n8n/permissions/test/hasScope.test.ts b/packages/@n8n/permissions/test/hasScope.test.ts
new file mode 100644
index 0000000000000..22137d6326637
--- /dev/null
+++ b/packages/@n8n/permissions/test/hasScope.test.ts
@@ -0,0 +1,132 @@
+import { hasScope } from '@/hasScope';
+import type { Scope } from '@/types';
+
+const ownerPermissions: Scope[] = [
+	'workflow:create',
+	'workflow:read',
+	'workflow:update',
+	'workflow:delete',
+	'workflow:list',
+	'user:create',
+	'user:read',
+	'user:update',
+	'user:delete',
+	'user:list',
+	'credential:create',
+	'credential:read',
+	'credential:update',
+	'credential:delete',
+	'credential:list',
+	'variable:create',
+	'variable:read',
+	'variable:update',
+	'variable:delete',
+	'variable:list',
+];
+const memberPermissions: Scope[] = ['user:list', 'variable:list', 'variable:read'];
+
+describe('hasScope', () => {
+	test('should work with a single permission on both modes with only global scopes', () => {
+		expect(
+			hasScope(
+				'user:list',
+				{
+					global: memberPermissions,
+				},
+				{ mode: 'oneOf' },
+			),
+		).toBe(true);
+
+		expect(
+			hasScope(
+				'user:list',
+				{
+					global: memberPermissions,
+				},
+				{ mode: 'allOf' },
+			),
+		).toBe(true);
+
+		expect(
+			hasScope(
+				'workflow:read',
+				{
+					global: memberPermissions,
+				},
+				{ mode: 'oneOf' },
+			),
+		).toBe(false);
+
+		expect(
+			hasScope(
+				'workflow:read',
+				{
+					global: memberPermissions,
+				},
+				{ mode: 'allOf' },
+			),
+		).toBe(false);
+	});
+
+	test('should work with oneOf mode', () => {
+		expect(
+			hasScope(['workflow:create', 'workflow:read'], {
+				global: ownerPermissions,
+			}),
+		).toBe(true);
+
+		expect(
+			hasScope(['workflow:create', 'workflow:read'], {
+				global: memberPermissions,
+			}),
+		).toBe(false);
+
+		expect(
+			hasScope([], {
+				global: memberPermissions,
+			}),
+		).toBe(false);
+	});
+
+	test('should work with allOf mode', () => {
+		expect(
+			hasScope(
+				['workflow:create', 'workflow:read'],
+				{
+					global: ownerPermissions,
+				},
+				{ mode: 'allOf' },
+			),
+		).toBe(true);
+
+		expect(
+			hasScope(
+				['workflow:create', 'workflow:read'],
+				{
+					global: memberPermissions,
+				},
+				{ mode: 'allOf' },
+			),
+		).toBe(false);
+
+		expect(
+			hasScope(
+				['workflow:create', 'user:list'],
+				{
+					global: memberPermissions,
+				},
+				{ mode: 'allOf' },
+			),
+		).toBe(false);
+
+		expect(
+			hasScope(
+				[],
+				{
+					global: memberPermissions,
+				},
+				{ mode: 'allOf' },
+			),
+		).toBe(false);
+	});
+});
diff --git a/packages/@n8n/permissions/tsconfig.build.json b/packages/@n8n/permissions/tsconfig.build.json
new file mode 100644
index 0000000000000..30910a3bf1ebb
--- /dev/null
+++ b/packages/@n8n/permissions/tsconfig.build.json
@@ -0,0 +1,10 @@
+{
+	"extends": ["./tsconfig.json", "../../../tsconfig.build.json"],
+	"compilerOptions": {
+		"rootDir": "src",
+		"outDir": "dist",
+		"tsBuildInfoFile": "dist/build.tsbuildinfo"
+	},
+	"include": ["src/**/*.ts"],
+	"exclude": ["test/**"]
+}
diff --git a/packages/@n8n/permissions/tsconfig.json b/packages/@n8n/permissions/tsconfig.json
new file mode 100644
index 0000000000000..a693815582818
--- /dev/null
+++ b/packages/@n8n/permissions/tsconfig.json
@@ -0,0 +1,15 @@
+{
+	"extends": "../../../tsconfig.json",
+	"compilerOptions": {
+		"rootDir": ".",
+		"types": ["node", "jest"],
+		"composite": true,
+		"noEmit": true,
+		"baseUrl": "src",
+		"paths": {
+			"@/*": ["./*"]
+		},
+		"tsBuildInfoFile": "dist/typecheck.tsbuildinfo"
+	},
+	"include": ["src/**/*.ts", "test/**/*.ts"]
+}
diff --git a/packages/@n8n/storybook/main.ts b/packages/@n8n/storybook/main.ts
new file mode 100644
index 0000000000000..79521753be84a
--- /dev/null
+++ b/packages/@n8n/storybook/main.ts
@@ -0,0 +1,23 @@
+import type { StorybookConfig } from '@storybook/vue3-vite';
+
+export const sharedConfig: StorybookConfig = {
+	stories: ['../src/**/*.stories.ts'],
+	addons: [
+		'@chromatic-com/storybook',
+		'@storybook/addon-a11y',
+		'@storybook/addon-essentials',
+		'@storybook/addon-interactions',
+		'@storybook/addon-links',
+	],
+	staticDirs: ['../public'],
+	framework: {
+		name: '@storybook/vue3-vite',
+		options: {},
+	},
+	core: {
+		disableTelemetry: true,
+	},
+	docs: {
+		autodocs: true,
+	},
+};
diff --git a/packages/@n8n/storybook/package.json b/packages/@n8n/storybook/package.json
new file mode 100644
index 0000000000000..231b1aacc945a
--- /dev/null
+++ b/packages/@n8n/storybook/package.json
@@ -0,0 +1,20 @@
+{
+  "name": "@n8n/storybook",
+  "private": true,
+  "version": "0.0.1",
+  "devDependencies": {
+    "@chromatic-com/storybook": "^1.2.18",
+    "@storybook/addon-a11y": "^8.0.0",
+    "@storybook/addon-actions": "^8.0.0",
+    "@storybook/addon-docs": "^8.0.0",
+    "@storybook/addon-essentials": "^8.0.0",
+    "@storybook/addon-interactions": "^8.0.0",
+    "@storybook/addon-links": "^8.0.0",
+    "@storybook/blocks": "^8.0.0",
+    "@storybook/test": "^8.0.0",
+    "@storybook/vue3": "^8.0.0",
+    "@storybook/vue3-vite": "^8.0.0",
+    "chromatic": "^11.0.8",
+    "storybook": "^8.0.0"
+  }
+}
diff --git a/packages/@n8n_io/eslint-config/base.js b/packages/@n8n_io/eslint-config/base.js
index db7803a40c294..ce8cab90078cf 100644
--- a/packages/@n8n_io/eslint-config/base.js
+++ b/packages/@n8n_io/eslint-config/base.js
@@ -6,9 +6,7 @@ const config = (module.exports = {
 		'node_modules/**',
 		'dist/**',
 		// TODO: remove these
-		'test/**',
-		'.eslintrc.js',
-		'jest.config.js',
+		'*.js',
 	],
 
 	plugins: [
@@ -36,8 +34,14 @@ const config = (module.exports = {
 		 */
 		'eslint-plugin-n8n-local-rules',
 
+		/** https://github.com/sweepline/eslint-plugin-unused-imports */
+		'unused-imports',
+
 		/** https://github.com/sindresorhus/eslint-plugin-unicorn */
 		'eslint-plugin-unicorn',
+
+		/** https://github.com/wix-incubator/eslint-plugin-lodash */
+		'eslint-plugin-lodash',
 	],
 
 	extends: [
@@ -133,6 +137,11 @@ const config = (module.exports = {
 		 */
 		indent: 'off',
 
+		/**
+		 * https://eslint.org/docs/latest/rules/no-constant-binary-expression
+		 */
+		'no-constant-binary-expression': 'error',
+
 		/**
 		 * https://eslint.org/docs/latest/rules/sort-imports
 		 */
@@ -147,6 +156,9 @@ const config = (module.exports = {
 		 */
 		'@typescript-eslint/array-type': ['error', { default: 'array-simple' }],
 
+		/** https://typescript-eslint.io/rules/await-thenable/ */
+		'@typescript-eslint/await-thenable': 'error',
+
 		/**
 		 * https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/docs/rules/ban-ts-comment.md
 		 */
@@ -230,7 +242,7 @@ const config = (module.exports = {
 			},
 			{
 				selector: 'variable',
-				format: ['camelCase', 'snake_case', 'UPPER_CASE'],
+				format: ['camelCase', 'snake_case', 'UPPER_CASE', 'PascalCase'],
 				leadingUnderscore: 'allowSingleOrDouble',
 				trailingUnderscore: 'allowSingleOrDouble',
 			},
@@ -245,16 +257,16 @@ const config = (module.exports = {
 				format: ['PascalCase'],
 			},
 			{
-				selector: ['method', 'function'],
+				selector: ['method', 'function', 'parameter'],
 				format: ['camelCase'],
 				leadingUnderscore: 'allowSingleOrDouble',
 			},
 		],
 
 		/**
-		 * https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/docs/rules/no-duplicate-imports.md
+		 * https://github.com/import-js/eslint-plugin-import/blob/HEAD/docs/rules/no-duplicates.md
 		 */
-		'@typescript-eslint/no-duplicate-imports': 'error',
+		'import/no-duplicates': 'error',
 
 		/**
 		 * https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/docs/rules/no-invalid-void-type.md
@@ -316,6 +328,22 @@ const config = (module.exports = {
 		 */
 		'@typescript-eslint/triple-slash-reference': 'off', // @TECH_DEBT: Enable, disallowing in all cases - N8N-5820
 
+		/**
+		 * https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/docs/rules/naming-convention.md
+		 */
+		'@typescript-eslint/naming-convention': [
+			'error',
+			{
+				selector: 'import',
+				format: ['camelCase', 'PascalCase'],
+			},
+		],
+
+		/**
+		 * https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/docs/rules/return-await.md
+		 */
+		'@typescript-eslint/return-await': ['error', 'always'],
+
 		// ----------------------------------
 		//       eslint-plugin-import
 		// ----------------------------------
@@ -323,7 +351,7 @@ const config = (module.exports = {
 		/**
 		 * https://github.com/import-js/eslint-plugin-import/blob/main/docs/rules/no-cycle.md
 		 */
-		'import/no-cycle': 'error',
+		'import/no-cycle': ['error', { ignoreExternal: false, maxDepth: 3 }],
 
 		/**
 		 * https://github.com/import-js/eslint-plugin-import/blob/master/docs/rules/no-default-export.md
@@ -343,6 +371,7 @@ const config = (module.exports = {
 		// ----------------------------------
 		//   eslint-plugin-n8n-local-rules
 		// ----------------------------------
+
 		'n8n-local-rules/no-uncaught-json-parse': 'error',
 
 		'n8n-local-rules/no-json-parse-json-stringify': 'error',
@@ -353,6 +382,8 @@ const config = (module.exports = {
 
 		'n8n-local-rules/no-unused-param-in-catch-clause': 'error',
 
+		'n8n-local-rules/no-plain-errors': 'error',
+
 		// ******************************************************************
 		//                    overrides to base ruleset
 		// ******************************************************************
@@ -391,19 +422,9 @@ const config = (module.exports = {
 		 */
 		'prefer-spread': 'error',
 
-		/**
-		 * https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/docs/rules/no-unused-vars.md
-		 */
+		// These are tuned off since we use `noUnusedLocals` and `noUnusedParameters` now
 		'no-unused-vars': 'off',
-		'@typescript-eslint/no-unused-vars': [
-			process.env.CI_LINT_MASTER ? 'warn' : 'error',
-			{
-				argsIgnorePattern: '^_',
-				destructuredArrayIgnorePattern: '^_',
-				varsIgnorePattern: '^_',
-				ignoreRestSiblings: true,
-			},
-		],
+		'@typescript-eslint/no-unused-vars': 'off',
 
 		/**
 		 * https://www.typescriptlang.org/docs/handbook/enums.html#const-enums
@@ -426,35 +447,62 @@ const config = (module.exports = {
 		 */
 		'import/prefer-default-export': 'off',
 
+		// ----------------------------------
+		//         no-unused-imports
+		// ----------------------------------
+
+		/**
+		 * https://github.com/sweepline/eslint-plugin-unused-imports/blob/master/docs/rules/no-unused-imports.md
+		 */
+		'unused-imports/no-unused-imports': process.env.NODE_ENV === 'development' ? 'warn' : 'error',
+
 		/** https://github.com/sindresorhus/eslint-plugin-unicorn/blob/main/docs/rules/no-unnecessary-await.md */
 		'unicorn/no-unnecessary-await': 'error',
 
 		/** https://github.com/sindresorhus/eslint-plugin-unicorn/blob/main/docs/rules/no-useless-promise-resolve-reject.md */
 		'unicorn/no-useless-promise-resolve-reject': 'error',
+
+		'lodash/path-style': ['error', 'as-needed'],
 	},
 
 	overrides: [
 		{
-			files: ['**/*.d.ts'],
+			files: ['test/**/*.ts', '**/__tests__/*.ts'],
 			rules: {
-				'@typescript-eslint/no-unused-vars': 'off',
+				'n8n-local-rules/no-plain-errors': 'off',
+				'n8n-local-rules/no-skipped-tests':
+					process.env.NODE_ENV === 'development' ? 'warn' : 'error',
+
+				// TODO: Remove these
+				'@typescript-eslint/ban-ts-comment': 'off',
+				'@typescript-eslint/naming-convention': 'off',
+				'import/no-duplicates': 'off',
+				'@typescript-eslint/no-empty-function': 'off',
+				'@typescript-eslint/no-loop-func': 'off',
+				'@typescript-eslint/no-non-null-assertion': 'off',
+				'@typescript-eslint/no-shadow': 'off',
+				'@typescript-eslint/no-throw-literal': 'off',
+				'@typescript-eslint/no-unsafe-argument': 'off',
+				'@typescript-eslint/no-unsafe-assignment': 'off',
+				'@typescript-eslint/no-unsafe-call': 'off',
+				'@typescript-eslint/no-unsafe-member-access': 'off',
+				'@typescript-eslint/no-unsafe-return': 'off',
+				'@typescript-eslint/no-unused-expressions': 'off',
+				'@typescript-eslint/no-use-before-define': 'off',
+				'@typescript-eslint/no-var-requires': 'off',
+				'@typescript-eslint/prefer-nullish-coalescing': 'off',
+				'@typescript-eslint/prefer-optional-chain': 'off',
+				'@typescript-eslint/restrict-plus-operands': 'off',
+				'@typescript-eslint/restrict-template-expressions': 'off',
+				'@typescript-eslint/unbound-method': 'off',
+				'id-denylist': 'off',
+				'import/no-cycle': 'off',
+				'import/no-default-export': 'off',
+				'import/no-extraneous-dependencies': 'off',
+				'n8n-local-rules/no-uncaught-json-parse': 'off',
+				'prefer-const': 'off',
+				'prefer-spread': 'off',
 			},
 		},
 	],
 });
-
-if ('ESLINT_PLUGIN_DIFF_COMMIT' in process.env) {
-	/**
-	 * Plugin to lint only changes
-	 *
-	 * https://github.com/paleite/eslint-plugin-diff#plugindiffdiff-recommended
-	 */
-	config.plugins.push('eslint-plugin-diff');
-
-	/**
-	 * Config for eslint-plugin-diff
-	 *
-	 * https://github.com/paleite/eslint-plugin-diff#plugindiffdiff-recommended
-	 */
-	config.extends.push('plugin:diff/diff');
-}
diff --git a/packages/@n8n_io/eslint-config/frontend.js b/packages/@n8n_io/eslint-config/frontend.js
index 804f1949b0b42..91379afd1a339 100644
--- a/packages/@n8n_io/eslint-config/frontend.js
+++ b/packages/@n8n_io/eslint-config/frontend.js
@@ -4,7 +4,7 @@
 module.exports = {
 	plugins: ['vue'],
 
-	extends: ['plugin:vue/essential', '@vue/typescript', './base'],
+	extends: ['plugin:vue/vue3-recommended', '@vue/typescript', './base'],
 
 	env: {
 		browser: true,
@@ -14,6 +14,20 @@ module.exports = {
 
 	ignorePatterns: ['**/*.js', '**/*.d.ts', 'vite.config.ts', '**/*.ts.snap'],
 
+	overrides: [
+		{
+			files: [
+				'**/*.test.ts',
+				'**/test/**/*.ts',
+				'**/__tests__/**/*.ts',
+				'**/*.stories.ts',
+			],
+			rules: {
+				'import/no-extraneous-dependencies': 'off',
+			},
+		},
+	],
+
 	rules: {
 		'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
 		'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
@@ -25,5 +39,42 @@ module.exports = {
 		'vue/no-deprecated-slot-scope-attribute': 'error',
 		'vue/no-multiple-template-root': 'error',
 		'vue/v-slot-style': 'error',
+		'vue/no-unused-components': 'error',
+		'vue/multi-word-component-names': 'off',
+		'@typescript-eslint/no-use-before-define': 'off',
+		'@typescript-eslint/no-explicit-any': 'error',
+		'vue/component-name-in-template-casing': [
+			'error',
+			'PascalCase',
+			{
+				registeredComponentsOnly: true,
+			},
+		],
+		'vue/no-reserved-component-names': [
+			'error',
+			{
+				disallowVueBuiltInComponents: true,
+				disallowVue3BuiltInComponents: false,
+			},
+		],
+		'vue/prop-name-casing': ['error', 'camelCase'],
+		'vue/attribute-hyphenation': ['error', 'always'],
+		'import/no-extraneous-dependencies': 'warn',
+
+		// TODO: fix these
+		'@typescript-eslint/no-unsafe-call': 'off',
+		'@typescript-eslint/no-unsafe-assignment': 'off',
+		'@typescript-eslint/no-unsafe-argument': 'off',
+		'@typescript-eslint/no-unsafe-return': 'off',
+		'@typescript-eslint/restrict-template-expressions': 'off',
+		'@typescript-eslint/unbound-method': 'off',
+		'@typescript-eslint/no-unsafe-member-access': 'off',
+
+		// TODO: remove these
+		'vue/no-mutating-props': 'warn',
+		'vue/no-side-effects-in-computed-properties': 'warn',
+		'vue/no-v-text-v-html-on-component': 'warn',
+		'vue/return-in-computed-property': 'warn',
+		'n8n-local-rules/no-plain-errors': 'off',
 	},
 };
diff --git a/packages/@n8n_io/eslint-config/local-rules.js b/packages/@n8n_io/eslint-config/local-rules.js
index 3d085b7731426..0d3ff867b3cff 100644
--- a/packages/@n8n_io/eslint-config/local-rules.js
+++ b/packages/@n8n_io/eslint-config/local-rules.js
@@ -1,5 +1,7 @@
 'use strict';
 
+const path = require('path');
+
 /**
  * This file contains any locally defined ESLint rules. They are picked up by
  * eslint-plugin-n8n-local-rules and exposed as 'n8n-local-rules/<rule-name>'.
@@ -170,6 +172,46 @@ module.exports = {
 		},
 	},
 
+	'no-skipped-tests': {
+		meta: {
+			type: 'problem',
+			docs: {
+				description: 'Tests must not be skipped.',
+				recommended: 'error',
+			},
+			messages: {
+				removeSkip: 'Remove `.skip()` call',
+				removeOnly: 'Remove `.only()` call',
+			},
+			fixable: 'code',
+		},
+		create(context) {
+			const TESTING_FUNCTIONS = new Set(['test', 'it', 'describe']);
+			const SKIPPING_METHODS = new Set(['skip', 'only']);
+			const toMessageId = (s) => 'remove' + s.charAt(0).toUpperCase() + s.slice(1);
+
+			return {
+				MemberExpression(node) {
+					if (
+						node.object.type === 'Identifier' &&
+						TESTING_FUNCTIONS.has(node.object.name) &&
+						node.property.type === 'Identifier' &&
+						SKIPPING_METHODS.has(node.property.name)
+					) {
+						context.report({
+							messageId: toMessageId(node.property.name),
+							node,
+							fix: (fixer) => {
+								const [start, end] = node.property.range;
+								return fixer.removeRange([start - '.'.length, end]);
+							},
+						});
+					}
+				},
+			};
+		},
+	},
+
 	'no-interpolation-in-regular-string': {
 		meta: {
 			type: 'problem',
@@ -199,6 +241,187 @@ module.exports = {
 			};
 		},
 	},
+
+	'dangerously-use-html-string-missing': {
+		meta: {
+			type: 'error',
+			docs: {
+				description:
+					'Calls to the `showToast` and `showMessage` methods must include `dangerouslyUseHTMLString: true` when at least one of the values in `title` or `message` contains HTML.',
+				recommended: 'error',
+				/**
+				 * @note This rule does not yet cover cases where the result of calling
+				 * `this.$locale.someMethod()` is assigned to a variable that is then
+				 * assigned to `title or `message`, e.g. `message: errorMessage`.
+				 */
+			},
+		},
+		create(context) {
+			const cwd = context.getCwd();
+			const locale = 'src/plugins/i18n/locales/en.json';
+
+			const LOCALE_NAMESPACE = '$locale';
+			const LOCALE_FILEPATH = cwd.endsWith('editor-ui')
+				? path.join(cwd, locale)
+				: path.join(cwd, 'packages/editor-ui', locale);
+
+			let LOCALE_MAP;
+
+			try {
+				LOCALE_MAP = JSON.parse(require('fs').readFileSync(LOCALE_FILEPATH));
+			} catch {
+				console.log(
+					'[dangerously-use-html-string-missing] Failed to load locale map, skipping rule...',
+				);
+				return {};
+			}
+
+			const METHODS_POSSIBLY_REQUIRING_HTML = new Set(['showToast', 'showMessage']);
+			const PROPERTIES_POSSIBLY_CONTAINING_HTML = new Set(['title', 'message']);
+			const USE_HTML_PROPERTY = 'dangerouslyUseHTMLString';
+
+			const isMethodPossiblyRequiringRawHtml = (node) =>
+				node.callee.type === 'MemberExpression' &&
+				node.callee.object.type === 'ThisExpression' &&
+				node.callee.property.type === 'Identifier' &&
+				METHODS_POSSIBLY_REQUIRING_HTML.has(node.callee.property.name) &&
+				node.arguments.length === 1 &&
+				node.arguments.at(0).type === 'ObjectExpression';
+
+			const isPropertyWithLocaleStringAsValue = (property) =>
+				property.key.type === 'Identifier' &&
+				PROPERTIES_POSSIBLY_CONTAINING_HTML.has(property.key.name) &&
+				property.value.type === 'CallExpression' &&
+				property.value.callee.type === 'MemberExpression' &&
+				property.value.callee.object.type === 'MemberExpression' &&
+				property.value.callee.object.property.type === 'Identifier' &&
+				property.value.callee.object.property.name === LOCALE_NAMESPACE &&
+				property.value.arguments.length >= 1 &&
+				property.value.arguments.at(0).type === 'Literal' &&
+				typeof property.value.arguments.at(0).value === 'string';
+
+			const containsHtml = (str) => {
+				let insideTag = false;
+
+				for (let char of str) {
+					if (char === '<') {
+						insideTag = true;
+					} else if (char === '>') {
+						if (insideTag) return true;
+						insideTag = false;
+					}
+				}
+
+				return false;
+			};
+
+			return {
+				CallExpression(node) {
+					if (!isMethodPossiblyRequiringRawHtml(node)) return;
+
+					const arg = node.arguments.at(0);
+
+					const hasArgWitHtml = arg.properties
+						.reduce(
+							(acc, p) =>
+								isPropertyWithLocaleStringAsValue(p)
+									? [...acc, p.value.arguments.at(0).value]
+									: acc,
+							[],
+						)
+						.some((i) => containsHtml(LOCALE_MAP[i]));
+
+					if (!hasArgWitHtml) return;
+
+					const hasRawHtmlPropertyAsTrue = arg.properties.some(
+						(p) =>
+							p.key.type === 'Identifier' &&
+							p.key.name === USE_HTML_PROPERTY &&
+							p.value.type === 'Literal' &&
+							p.value.value === true,
+					);
+
+					if (hasRawHtmlPropertyAsTrue) return;
+
+					const methodName = node.callee.property.name;
+
+					context.report({
+						node,
+						message: `Set \`${USE_HTML_PROPERTY}: true\` in the argument to \`${methodName}\`. At least one of the values in \`title\` or \`message\` contains HTML.`,
+					});
+				},
+			};
+		},
+	},
+
+	'no-plain-errors': {
+		meta: {
+			type: 'problem',
+			docs: {
+				description:
+					'Only `ApplicationError` (from the `workflow` package) or its child classes must be thrown. This ensures the error will be normalized when reported to Sentry, if applicable.',
+				recommended: 'error',
+			},
+			messages: {
+				useApplicationError:
+					'Throw an `ApplicationError` (from the `workflow` package) or its child classes.',
+			},
+			fixable: 'code',
+		},
+		create(context) {
+			return {
+				ThrowStatement(node) {
+					if (!node.argument) return;
+
+					const isNewError =
+						node.argument.type === 'NewExpression' && node.argument.callee.name === 'Error';
+
+					const isNewlessError =
+						node.argument.type === 'CallExpression' && node.argument.callee.name === 'Error';
+
+					if (isNewError || isNewlessError) {
+						return context.report({
+							messageId: 'useApplicationError',
+							node,
+							fix: (fixer) =>
+								fixer.replaceText(
+									node,
+									`throw new ApplicationError(${node.argument.arguments
+										.map((arg) => arg.raw)
+										.join(', ')})`,
+								),
+						});
+					}
+				},
+			};
+		},
+	},
+
+	'no-dynamic-import-template': {
+		meta: {
+			type: 'error',
+			docs: {
+				description:
+					'Disallow non-relative imports in template string argument to `await import()`, because `tsc-alias` as of 1.8.7 is unable to resolve aliased paths in this scenario.',
+				recommended: true,
+			},
+		},
+		create: function (context) {
+			return {
+				'AwaitExpression > ImportExpression TemplateLiteral'(node) {
+					const templateValue = node.quasis[0].value.cooked;
+
+					if (!templateValue?.startsWith('@/')) return;
+
+					context.report({
+						node,
+						message:
+							'Use relative imports in template string argument to `await import()`, because `tsc-alias` as of 1.8.7 is unable to resolve aliased paths in this scenario.',
+					});
+				},
+			};
+		},
+	},
 };
 
 const isJsonParseCall = (node) =>
diff --git a/packages/@n8n_io/eslint-config/package.json b/packages/@n8n_io/eslint-config/package.json
index 65c1b7c74551f..6f776d0e64756 100644
--- a/packages/@n8n_io/eslint-config/package.json
+++ b/packages/@n8n_io/eslint-config/package.json
@@ -3,20 +3,23 @@
   "private": true,
   "version": "0.0.1",
   "devDependencies": {
-    "@types/eslint": "~8.37",
-    "@typescript-eslint/eslint-plugin": "~5.59",
-    "@typescript-eslint/parser": "~5.59",
-    "@vue/eslint-config-typescript": "~8.0",
-    "eslint": "~8.39",
-    "eslint-config-airbnb-typescript": "~17.0",
-    "eslint-config-prettier": "~8.8",
-    "eslint-import-resolver-typescript": "~3.5",
-    "eslint-plugin-diff": "~2.0",
-    "eslint-plugin-import": "~2.27",
-    "eslint-plugin-n8n-local-rules": "~1.0",
-    "eslint-plugin-prettier": "~4.2",
-    "eslint-plugin-unicorn": "~46.0",
-    "eslint-plugin-vue": "~7.17"
+    "@types/eslint": "^8.56.5",
+    "@typescript-eslint/eslint-plugin": "^7.2.0",
+    "@typescript-eslint/parser": "^7.2.0",
+    "@vue/eslint-config-prettier": "^9.0.0",
+    "@vue/eslint-config-typescript": "^13.0.0",
+    "eslint": "^8.57.0",
+    "eslint-config-airbnb-typescript": "^18.0.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-import-resolver-typescript": "^3.6.1",
+    "eslint-plugin-import": "^2.29.1",
+    "eslint-plugin-lodash": "^7.4.0",
+    "eslint-plugin-n8n-local-rules": "^1.0.0",
+    "eslint-plugin-prettier": "^5.1.3",
+    "eslint-plugin-unicorn": "^51.0.1",
+    "eslint-plugin-unused-imports": "^3.1.0",
+    "eslint-plugin-vue": "^9.23.0",
+    "vue-eslint-parser": "^9.4.2"
   },
   "scripts": {
     "clean": "rimraf .turbo",
diff --git a/packages/@n8n_io/eslint-config/shared.js b/packages/@n8n_io/eslint-config/shared.js
index 27f9292eb01a4..0332606f0c6a2 100644
--- a/packages/@n8n_io/eslint-config/shared.js
+++ b/packages/@n8n_io/eslint-config/shared.js
@@ -1,7 +1,7 @@
 /**
  * @type {(dir: string, mode: 'frontend' | undefined) => import('@types/eslint').ESLint.ConfigData}
  */
-exports.sharedOptions = (tsconfigRootDir, mode) => {
+module.exports = (tsconfigRootDir, mode) => {
 	const isFrontend = mode === 'frontend';
 	const parser = isFrontend ? 'vue-eslint-parser' : '@typescript-eslint/parser';
 	const extraParserOptions = isFrontend
diff --git a/packages/cli/.eslintrc.js b/packages/cli/.eslintrc.js
index 2a24787f80e76..736003d7b842e 100644
--- a/packages/cli/.eslintrc.js
+++ b/packages/cli/.eslintrc.js
@@ -1,4 +1,4 @@
-const { sharedOptions } = require('@n8n_io/eslint-config/shared');
+const sharedOptions = require('@n8n_io/eslint-config/shared');
 
 /**
  * @type {import('@types/eslint').ESLint.ConfigData}
@@ -8,18 +8,31 @@ module.exports = {
 
 	...sharedOptions(__dirname),
 
+	parserOptions: {
+		project: './tsconfig.json',
+	},
+
 	ignorePatterns: [
 		'jest.config.js',
 		// TODO: Remove these
-		'src/databases/migrations/**',
 		'src/databases/ormconfig.ts',
 	],
 
 	rules: {
+		'n8n-local-rules/no-dynamic-import-template': 'error',
+		complexity: 'error',
+
 		// TODO: Remove this
 		'import/no-cycle': 'warn',
 		'import/order': 'off',
-		'import/extensions': 'off',
+		'import/extensions': 'warn',
 		'@typescript-eslint/ban-ts-comment': ['warn', { 'ts-ignore': true }],
+		'@typescript-eslint/no-explicit-any': 'warn',
+		'@typescript-eslint/no-base-to-string': 'warn',
+		'@typescript-eslint/prefer-nullish-coalescing': 'warn',
+		'@typescript-eslint/no-redundant-type-constituents': 'warn',
+		'@typescript-eslint/ban-types': 'warn',
+		'@typescript-eslint/no-unsafe-enum-comparison': 'warn',
+		'@typescript-eslint/no-unsafe-declaration-merging': 'warn',
 	},
 };
diff --git a/packages/cli/.npmignore b/packages/cli/.npmignore
deleted file mode 100644
index e0c12320426e4..0000000000000
--- a/packages/cli/.npmignore
+++ /dev/null
@@ -1 +0,0 @@
-dist/ReloadNodesAndCredentials.*
diff --git a/packages/cli/BREAKING-CHANGES.md b/packages/cli/BREAKING-CHANGES.md
index f260be6fa2fb5..f03f1b262310e 100644
--- a/packages/cli/BREAKING-CHANGES.md
+++ b/packages/cli/BREAKING-CHANGES.md
@@ -2,6 +2,224 @@
 
 This list shows all the versions which include breaking changes and how to upgrade.
 
+## 1.40.0
+
+### What changed?
+
+The default value for the `DB_POSTGRESDB_USER` environment variable was switched from `root` to `postgres`.
+
+### When is action necessary?
+
+If your Postgres connection is relying on the old default value `root` for the `DB_POSTGRESDB_USER` environment variable, you must now explicitly set `DB_POSTGRESDB_USER` to `root` in your environment.
+
+## 1.37.0
+
+### What changed?
+
+The `--file` flag for the `execute` CLI command has been removed.
+
+### When is action necessary?
+
+If you have scripts relying on the `--file` flag for the `execute` CLI command, update them to first import the workflow and then execute it using the `--id` flag.
+
+## 1.32.0
+
+### What changed?
+
+n8n auth cookie has `Secure` flag set by default now.
+
+### When is action necessary?
+
+If you are running n8n without HTTP**S** on a domain other than `localhost`, you need to either setup HTTPS, or you can disable the secure flag by setting the env variable `N8N_SECURE_COOKIE` to `false`.
+
+## 1.27.0
+
+### What changed?
+
+The execution mode `own` was removed.
+If `EXECUTIONS_PROCESS` is set to `main` or if `executions.process` in a config file is set to `main` n8n will print a warning, but start up normally.
+If `EXECUTIONS_PROCESS` is set to `own` or if `executions.process` in a config file is set to `own` n8n will print an error message and refuse to start up.
+
+### When is action necessary?
+
+If you use `own` mode and need the isolation and performance gains, please consider using queue mode instead, otherwise switch to main mode by removing the environment variable or config field.
+If you have the environment variable `EXECUTIONS_PROCESS` or the config field `executions.process` set, please remove them. The environment variable has no effect anymore and the configuration field will be removed in future releases, prevent n8n from starting if it is still set.
+
+## 1.25.0
+
+### What changed?
+
+If the `N8N_ENCRYPTION_KEY` environment variable on a main instance does not match the `encryptionKey` in the config file, the main instance will not initialize. If the `N8N_ENCRYPTION_KEY` environment variable is missing on a worker, the worker will not initialize.
+
+### When is action necessary?
+
+If passing an `N8N_ENCRYPTION_KEY` environment variable to the main instance, make sure it matches the `encryptionKey` in the config file. If you are using workers, pass the `N8N_ENCRYPTION_KEY` environment variable to them.
+
+## 1.24.0
+
+### What changed?
+
+The flag `N8N_CACHE_ENABLED` was removed. The cache is now always enabled.
+
+Additionally, expressions in credentials now follow the paired item, so if you have multiple input items, n8n will try to pair the matching row to fill in the credential details.
+
+In the Monday.com Node, due to API changes, the data structure of entries in `column_values` array has changed
+
+### When is action necessary?
+
+If you are using the flag `N8N_CACHE_ENABLED`, remove it from your settings.
+
+In regards to credentials, if you use expression in credentials, you might want to revisit them. Previously, n8n would stick to the first item only, but now it will try to match the proper paired item.
+
+If you are using the Monday.com node and refering to `column_values` property, check in table below if you are using any of the affected properties of its entries.
+
+| Resource   | Operation           | Previous        | New                 |
+| ---------- | ------------------- | --------------- | ------------------- |
+| Board      | Get                 | owner           | owners              |
+| Board      | Get All             | owner           | owners              |
+| Board Item | Get                 | title           | column.title        |
+| Board Item | Get All             | title           | column.title        |
+| Board Item | Get By Column Value | title           | column.title        |
+| Board Item | Get                 | additional_info | column.settings_str |
+| Board Item | Get All             | additional_info | column.settings_str |
+| Board Item | Get By Column Value | additional_info | column.settings_str |
+
+\*column.settings_str is not a complete equivalent additional_info
+
+## 1.22.0
+
+### What changed?
+
+Hash algorithm `ripemd160` is dropped from `.hash()` expressions.
+`sha3` hash algorithm now returns a valid sha3-512 has, unlike the previous implementation that returned a `Keccak` hash instead.
+
+### When is action necessary?
+
+If you are using `.hash` helpers in expressions with hash algorithm `ripemd160`, you need to switch to one of the other supported algorithms.
+
+## 1.15.0
+
+### What changed?
+
+Until now, in main mode, n8n used to deregister webhooks at shutdown and reregister them at startup. Queue mode and the flag `N8N_SKIP_WEBHOOK_DEREGISTRATION_SHUTDOWN` skipped webhook deregistration.
+
+As from now, in both main and queue modes, n8n no longer deregisters webhooks at startup and shutdown, and the flag `N8N_SKIP_WEBHOOK_DEREGISTRATION_SHUTDOWN` is removed. n8n assumes that third-party services will retry unhandled webhook requests.
+
+### When is action necessary?
+
+If using the flag `N8N_SKIP_WEBHOOK_DEREGISTRATION_SHUTDOWN`, note that it no longer has effect and can be removed from your settings.
+
+## 1.9.0
+
+### What changed?
+
+In nodes, `this.helpers.getBinaryStream()` is now async.
+
+### When is action necessary?
+
+If your node uses `this.helpers.getBinaryStream()`, add `await` when calling it.
+
+Example:
+
+```typescript
+const binaryStream = this.helpers.getBinaryStream(id); // until 1.9.0
+const binaryStream = await this.helpers.getBinaryStream(id); // since 1.9.0
+```
+
+### What changed?
+
+The env vars `N8N_BINARY_DATA_TTL` and `EXECUTIONS_DATA_PRUNE_TIMEOUT` no longer have any effect and can be safely removed. Instead of relying on a TTL system for binary data, n8n currently cleans up binary data together with executions during pruning.
+
+### When is action necessary?
+
+If using these flags, remove them from your settings and be mindful of the new behavior.
+
+## 1.6.0
+
+### What changed?
+
+The env var `N8N_PERSISTED_BINARY_DATA_TTL` no longer has any effect and can be removed. This legacy flag was originally introduced to support ephemeral executions (see [details](https://github.com/n8n-io/n8n/pull/7046)), which are no longer supported.
+
+### When is action necessary?
+
+If using this flag, remove it from your settings.
+
+## 1.5.0
+
+### What changed?
+
+In the Code node, `console.log` does not output to stdout by default.
+
+### When is action necessary?
+
+If you were relying on `console.log` for non-manual executions of a Code node, you need to set the env variable `CODE_ENABLE_STDOUT` to `true` to send Code node logs to process's stdout.
+
+## 1.2.0
+
+### What changed?
+
+For the Linear node, priority in issue creation is `4` (previously incorrectly `3`) for `Low`.
+
+### When is action necessary?
+
+If you were using `Low`, you were setting a priority of `Normal`, so please double check you are setting the priority you intend.
+
+## 1.0.0
+
+### What changed?
+
+The minimum Node.js version required for n8n is now v18.
+
+### When is action necessary?
+
+If you're using n8n via npm or PM2 or if you're contributing to n8n.
+
+### How to upgrade:
+
+Update the Node.js version to v18 or above.
+
+## 0.234.0
+
+### What changed?
+
+This release introduces two irreversible changes:
+
+- The n8n database will use strings instead of numeric values to identify workflows and credentials
+- Execution data is split into a separate database table
+
+### When is action necessary?
+
+It will not be possible to read a n8n@0.234.0 database with older versions of n8n, so we recommend that you take a full backup before migrating.
+
+## 0.232.0
+
+### What changed?
+
+Due to Node.js/OpenSSL upgrade, the following crypto algorithms are not supported anymore.
+
+- RSA-MD4
+- RSA-MDC2
+- md4
+- md4WithRSAEncryption
+- mdc2
+- mdc2WithRSA
+
+### When is action necessary?
+
+If you're using any of the above mentioned crypto algorithms in Crypto node in any of your workflows, then please update the algorithm property in the node to one of the supported values.
+
+### What changed?
+
+The `LoneScale List` node has been renamed to `LoneScale`.
+
+### When is action necessary?
+
+If you have used the `LoneScale List` node in any of your workflows.
+
+### How to upgrade:
+
+Update any workflows using `LoneScale List` to use the updated node.
+
 ## 0.226.0
 
 ### What changed?
diff --git a/packages/cli/LICENSE.md b/packages/cli/LICENSE.md
index c1d74239754fd..aab68b6d9301b 100644
--- a/packages/cli/LICENSE.md
+++ b/packages/cli/LICENSE.md
@@ -3,8 +3,9 @@
 Portions of this software are licensed as follows:
 
 - Content of branches other than the main branch (i.e. "master") are not licensed.
-- All source code files that contain ".ee." in their filename are licensed under the
-  "n8n Enterprise License" defined in "LICENSE_EE.md".
+- Source code files that contain ".ee." in their filename are NOT licensed under the Sustainable Use License.
+  To use source code files that contain ".ee." in their filename you must hold a valid n8n Enterprise License
+  specifically allowing you access to such source code files and as defined in "LICENSE_EE.md".
 - All third party components incorporated into the n8n Software are licensed under the original license
   provided by the owner of the applicable component.
 - Content outside of the above mentioned files or restrictions is available under the "Sustainable Use
diff --git a/packages/cli/README.md b/packages/cli/README.md
index a47326922694f..beeac69369b2f 100644
--- a/packages/cli/README.md
+++ b/packages/cli/README.md
@@ -2,7 +2,7 @@
 
 # n8n - Workflow Automation Tool
 
-n8n is a free and open [fair-code](http://faircode.io) distributed node-based Workflow Automation Tool. You can self-host n8n, easily extend it, and even use it with internal tools.
+n8n is a free and open [fair-code](https://faircode.io) distributed node-based Workflow Automation Tool. You can self-host n8n, easily extend it, and even use it with internal tools.
 
 <a href="https://raw.githubusercontent.com/n8n-io/n8n/master/assets/n8n-screenshot.png"><img src="https://raw.githubusercontent.com/n8n-io/n8n/master/assets/n8n-screenshot.png" alt="n8n.io - Screenshot"></a>
 
@@ -147,7 +147,7 @@ You can also find breaking changes here: [Breaking Changes](./BREAKING-CHANGES.m
 
 ## License
 
-n8n is [fair-code](http://faircode.io) distributed under the [**Sustainable Use License**](https://github.com/n8n-io/n8n/blob/master/packages/cli/LICENSE.md).
+n8n is [fair-code](https://faircode.io) distributed under the [**Sustainable Use License**](https://github.com/n8n-io/n8n/blob/master/packages/cli/LICENSE.md).
 
 Proprietary licenses are available for enterprise customers. [Get in touch](mailto:license@n8n.io)
 
diff --git a/packages/cli/bin/logs/2024-05-09/GENERAL/combined_logs.log b/packages/cli/bin/logs/2024-05-09/GENERAL/combined_logs.log
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/packages/cli/bin/logs/2024-05-09/GENERAL/error_logs.log b/packages/cli/bin/logs/2024-05-09/GENERAL/error_logs.log
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/packages/cli/bin/logs/2024-05-09/MANAGER/combined_logs.log b/packages/cli/bin/logs/2024-05-09/MANAGER/combined_logs.log
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/packages/cli/bin/logs/2024-05-09/MANAGER/error_logs.log b/packages/cli/bin/logs/2024-05-09/MANAGER/error_logs.log
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/packages/cli/bin/logs/2024-05-09/ROUTER/combined_logs.log b/packages/cli/bin/logs/2024-05-09/ROUTER/combined_logs.log
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/packages/cli/bin/logs/2024-05-09/ROUTER/error_logs.log b/packages/cli/bin/logs/2024-05-09/ROUTER/error_logs.log
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/packages/cli/bin/logs/2024-05-09/SCRIPTS/combined_logs.log b/packages/cli/bin/logs/2024-05-09/SCRIPTS/combined_logs.log
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/packages/cli/bin/logs/2024-05-09/SCRIPTS/error_logs.log b/packages/cli/bin/logs/2024-05-09/SCRIPTS/error_logs.log
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/packages/cli/bin/logs/2024-05-09/ZOHO/combined_logs.log b/packages/cli/bin/logs/2024-05-09/ZOHO/combined_logs.log
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/packages/cli/bin/logs/2024-05-09/ZOHO/error_logs.log b/packages/cli/bin/logs/2024-05-09/ZOHO/error_logs.log
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/packages/cli/bin/logs/2024-05-10/GENERAL/combined_logs.log b/packages/cli/bin/logs/2024-05-10/GENERAL/combined_logs.log
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/packages/cli/bin/logs/2024-05-10/GENERAL/error_logs.log b/packages/cli/bin/logs/2024-05-10/GENERAL/error_logs.log
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/packages/cli/bin/logs/2024-05-10/MANAGER/combined_logs.log b/packages/cli/bin/logs/2024-05-10/MANAGER/combined_logs.log
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/packages/cli/bin/logs/2024-05-10/MANAGER/error_logs.log b/packages/cli/bin/logs/2024-05-10/MANAGER/error_logs.log
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/packages/cli/bin/logs/2024-05-10/ROUTER/combined_logs.log b/packages/cli/bin/logs/2024-05-10/ROUTER/combined_logs.log
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/packages/cli/bin/logs/2024-05-10/ROUTER/error_logs.log b/packages/cli/bin/logs/2024-05-10/ROUTER/error_logs.log
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/packages/cli/bin/logs/2024-05-10/SCRIPTS/combined_logs.log b/packages/cli/bin/logs/2024-05-10/SCRIPTS/combined_logs.log
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/packages/cli/bin/logs/2024-05-10/SCRIPTS/error_logs.log b/packages/cli/bin/logs/2024-05-10/SCRIPTS/error_logs.log
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/packages/cli/bin/logs/2024-05-10/ZOHO/combined_logs.log b/packages/cli/bin/logs/2024-05-10/ZOHO/combined_logs.log
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/packages/cli/bin/logs/2024-05-10/ZOHO/error_logs.log b/packages/cli/bin/logs/2024-05-10/ZOHO/error_logs.log
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/packages/cli/bin/logs/2024-05-11/GENERAL/combined_logs.log b/packages/cli/bin/logs/2024-05-11/GENERAL/combined_logs.log
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/packages/cli/bin/logs/2024-05-11/GENERAL/error_logs.log b/packages/cli/bin/logs/2024-05-11/GENERAL/error_logs.log
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/packages/cli/bin/logs/2024-05-11/MANAGER/combined_logs.log b/packages/cli/bin/logs/2024-05-11/MANAGER/combined_logs.log
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/packages/cli/bin/logs/2024-05-11/MANAGER/error_logs.log b/packages/cli/bin/logs/2024-05-11/MANAGER/error_logs.log
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/packages/cli/bin/logs/2024-05-11/ROUTER/combined_logs.log b/packages/cli/bin/logs/2024-05-11/ROUTER/combined_logs.log
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/packages/cli/bin/logs/2024-05-11/ROUTER/error_logs.log b/packages/cli/bin/logs/2024-05-11/ROUTER/error_logs.log
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/packages/cli/bin/logs/2024-05-11/SCRIPTS/combined_logs.log b/packages/cli/bin/logs/2024-05-11/SCRIPTS/combined_logs.log
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/packages/cli/bin/logs/2024-05-11/SCRIPTS/error_logs.log b/packages/cli/bin/logs/2024-05-11/SCRIPTS/error_logs.log
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/packages/cli/bin/logs/2024-05-11/ZOHO/combined_logs.log b/packages/cli/bin/logs/2024-05-11/ZOHO/combined_logs.log
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/packages/cli/bin/logs/2024-05-11/ZOHO/error_logs.log b/packages/cli/bin/logs/2024-05-11/ZOHO/error_logs.log
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/packages/cli/bin/logs/2024-05-12/GENERAL/combined_logs.log b/packages/cli/bin/logs/2024-05-12/GENERAL/combined_logs.log
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/packages/cli/bin/logs/2024-05-12/GENERAL/error_logs.log b/packages/cli/bin/logs/2024-05-12/GENERAL/error_logs.log
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/packages/cli/bin/logs/2024-05-12/MANAGER/combined_logs.log b/packages/cli/bin/logs/2024-05-12/MANAGER/combined_logs.log
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/packages/cli/bin/logs/2024-05-12/MANAGER/error_logs.log b/packages/cli/bin/logs/2024-05-12/MANAGER/error_logs.log
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/packages/cli/bin/logs/2024-05-12/ROUTER/combined_logs.log b/packages/cli/bin/logs/2024-05-12/ROUTER/combined_logs.log
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/packages/cli/bin/logs/2024-05-12/ROUTER/error_logs.log b/packages/cli/bin/logs/2024-05-12/ROUTER/error_logs.log
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/packages/cli/bin/logs/2024-05-12/SCRIPTS/combined_logs.log b/packages/cli/bin/logs/2024-05-12/SCRIPTS/combined_logs.log
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/packages/cli/bin/logs/2024-05-12/SCRIPTS/error_logs.log b/packages/cli/bin/logs/2024-05-12/SCRIPTS/error_logs.log
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/packages/cli/bin/logs/2024-05-12/ZOHO/combined_logs.log b/packages/cli/bin/logs/2024-05-12/ZOHO/combined_logs.log
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/packages/cli/bin/logs/2024-05-12/ZOHO/error_logs.log b/packages/cli/bin/logs/2024-05-12/ZOHO/error_logs.log
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/packages/cli/bin/n8n b/packages/cli/bin/n8n
index 92c38b416b048..005cd983cfcea 100755
--- a/packages/cli/bin/n8n
+++ b/packages/cli/bin/n8n
@@ -21,10 +21,10 @@ if (process.argv.length === 2) {
 const nodeVersion = process.versions.node;
 const nodeVersionMajor = require('semver').major(nodeVersion);
 
-if (![16, 18].includes(nodeVersionMajor)) {
+if (![18, 20].includes(nodeVersionMajor)) {
 	console.log(`
 	Your Node.js version (${nodeVersion}) is currently not supported by n8n.
-	Please use Node.js v16 (recommended), or v18 instead!
+	Please use Node.js v18 (recommended), or v20 instead!
 	`);
 	process.exit(1);
 }
@@ -32,11 +32,19 @@ if (![16, 18].includes(nodeVersionMajor)) {
 // Prevent oclif from loading ts-node and typescript
 process.env.OCLIF_TS_NODE = '0';
 
+// Disable nodejs custom inspection across the app
+const { inspect } = require('util');
+inspect.defaultOptions.customInspect = false;
+
 require('express-async-errors');
 require('source-map-support').install();
 require('reflect-metadata');
 
-require('@oclif/command')
-	.run()
-	.then(require('@oclif/command/flush'))
-	.catch(require('@oclif/errors/handle'));
+if (process.env.NODEJS_PREFER_IPV4 === 'true') {
+	require('dns').setDefaultResultOrder('ipv4first');
+}
+
+(async () => {
+	const oclif = await import('@oclif/core');
+	await oclif.execute({});
+})();
diff --git a/packages/cli/jest.config.js b/packages/cli/jest.config.js
index 8f61a80caa969..9c1d248a000df 100644
--- a/packages/cli/jest.config.js
+++ b/packages/cli/jest.config.js
@@ -6,10 +6,11 @@ module.exports = {
 	},
 	globalSetup: '<rootDir>/test/setup.ts',
 	globalTeardown: '<rootDir>/test/teardown.ts',
-	setupFilesAfterEnv: ['<rootDir>/test/setup-mocks.ts', '<rootDir>/test/extend-expect.ts'],
-	moduleNameMapper: {
-		'^@/(.*)$': '<rootDir>/src/$1',
-		'^@db/(.*)$': '<rootDir>/src/databases/$1',
-	},
+	setupFilesAfterEnv: [
+		'<rootDir>/test/setup-test-folder.ts',
+		'<rootDir>/test/setup-mocks.ts',
+		'<rootDir>/test/extend-expect.ts',
+	],
 	coveragePathIgnorePatterns: ['/src/databases/migrations/'],
+	testTimeout: 10_000,
 };
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 59a3e49c52887..9745827c9e74b 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n",
-  "version": "0.225.0",
+  "version": "1.41.0",
   "description": "n8n Workflow Automation Tool",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",
@@ -16,6 +16,7 @@
   "types": "dist/index.d.ts",
   "oclif": {
     "commands": "./dist/commands",
+    "helpClass": "./dist/help",
     "bin": "n8n"
   },
   "scripts": {
@@ -25,23 +26,18 @@
     "buildAndDev": "pnpm run build && pnpm run dev",
     "dev": "concurrently -k -n \"TypeScript,Node\" -c \"yellow.bold,cyan.bold\" \"npm run watch\" \"nodemon\"",
     "dev:worker": "concurrently -k -n \"TypeScript,Node\" -c \"yellow.bold,cyan.bold\" \"npm run watch\" \"nodemon worker\"",
+    "dev:webhook": "concurrently -k -n \"TypeScript,Node\" -c \"yellow.bold,cyan.bold\" \"npm run watch\" \"nodemon webhook\"",
     "format": "prettier --write . --ignore-path ../../.prettierignore",
-    "lint": "eslint --quiet .",
+    "lint": "eslint . --quiet",
     "lintfix": "eslint . --fix",
-    "postpack": "rm -f oclif.manifest.json",
-    "prepack": "oclif-dev manifest",
     "start": "run-script-os",
     "start:default": "cd bin && ./n8n",
     "start:windows": "cd bin && n8n",
-    "swagger": "swagger-cli",
     "test": "pnpm test:sqlite",
     "test:sqlite": "N8N_LOG_LEVEL=silent DB_TYPE=sqlite jest",
-    "test:postgres": "N8N_LOG_LEVEL=silent DB_TYPE=postgresdb jest --no-coverage",
-    "test:postgres:alt-schema": "DB_POSTGRESDB_SCHEMA=alt_schema pnpm test:postgres",
-    "test:postgres:with-table-prefix": "DB_TABLE_PREFIX=xyz_ pnpm test:postgres",
-    "test:mysql": "N8N_LOG_LEVEL=silent DB_TYPE=mysqldb jest --no-coverage",
-    "watch": "concurrently \"tsc -w -p tsconfig.build.json\" \"tsc-alias -w -p tsconfig.build.json\"",
-    "typeorm": "ts-node -T ../../node_modules/typeorm/cli.js"
+    "test:postgres": "N8N_LOG_LEVEL=silent DB_TYPE=postgresdb DB_POSTGRESDB_SCHEMA=alt_schema DB_TABLE_PREFIX=test_ jest --no-coverage",
+    "test:mysql": "N8N_LOG_LEVEL=silent DB_TYPE=mysqldb DB_TABLE_PREFIX=test_ jest --no-coverage",
+    "watch": "concurrently \"tsc -w -p tsconfig.build.json\" \"tsc-alias -w -p tsconfig.build.json\""
   },
   "bin": {
     "n8n": "./bin/n8n"
@@ -55,169 +51,142 @@
     "workflow"
   ],
   "engines": {
-    "node": ">=16.9"
+    "node": ">=18.10"
   },
   "files": [
     "bin",
     "templates",
     "dist",
-    "oclif.manifest.json"
+    "!dist/**/e2e.*"
   ],
   "devDependencies": {
-    "@apidevtools/swagger-cli": "4.0.0",
-    "@oclif/dev-cli": "^1.22.2",
+    "@redocly/cli": "^1.6.0",
+    "@types/aws4": "^1.5.1",
     "@types/basic-auth": "^1.1.3",
     "@types/bcryptjs": "^2.4.2",
-    "@types/body-parser-xml": "^2.0.2",
     "@types/compression": "1.0.1",
-    "@types/connect-history-api-fallback": "^1.3.1",
     "@types/convict": "^6.1.1",
     "@types/cookie-parser": "^1.4.2",
-    "@types/express": "^4.17.6",
-    "@types/json-diff": "^0.5.1",
-    "@types/jsonwebtoken": "^9.0.1",
-    "@types/localtunnel": "^1.9.0",
-    "@types/lodash.debounce": "^4.0.7",
-    "@types/lodash.get": "^4.4.6",
-    "@types/lodash.intersection": "^4.4.7",
-    "@types/lodash.iteratee": "^4.7.7",
-    "@types/lodash.merge": "^4.6.6",
-    "@types/lodash.omit": "^4.5.7",
-    "@types/lodash.pick": "^4.4.7",
-    "@types/lodash.remove": "^4.7.7",
-    "@types/lodash.set": "^4.3.6",
-    "@types/lodash.split": "^4.4.7",
-    "@types/lodash.unionby": "^4.8.7",
-    "@types/lodash.uniq": "^4.5.7",
-    "@types/lodash.uniqby": "^4.7.7",
-    "@types/lodash.unset": "^4.5.7",
-    "@types/openapi-to-postmanv2": "^3.2.0",
-    "@types/parseurl": "^1.3.1",
-    "@types/passport-jwt": "^3.0.6",
-    "@types/postman-collection": "^3.5.7",
+    "@types/express": "^4.17.21",
+    "@types/formidable": "^3.4.5",
+    "@types/json-diff": "^1.0.0",
+    "@types/jsonwebtoken": "^9.0.6",
+    "@types/lodash": "^4.14.195",
     "@types/psl": "^1.1.0",
     "@types/replacestream": "^4.0.1",
-    "@types/send": "^0.17.1",
     "@types/shelljs": "^0.8.11",
     "@types/speakeasy": "^2.0.7",
     "@types/sshpk": "^1.17.1",
-    "@types/superagent": "4.1.13",
-    "@types/swagger-ui-express": "^4.1.3",
+    "@types/superagent": "^8.1.4",
+    "@types/swagger-ui-express": "^4.1.6",
     "@types/syslog-client": "^1.1.2",
     "@types/uuid": "^8.3.2",
     "@types/validator": "^13.7.0",
     "@types/ws": "^8.5.4",
+    "@types/xml2js": "^0.4.14",
     "@types/yamljs": "^0.2.31",
     "chokidar": "^3.5.2",
-    "concurrently": "^5.1.0",
-    "lodash.debounce": "^4.0.8",
-    "mock-jwks": "^1.0.9",
-    "nodemon": "^2.0.2",
-    "run-script-os": "^1.0.7",
-    "ts-essentials": "^7.0.3",
-    "ts-node": "^10.9.1",
-    "tsc-alias": "^1.8.2",
-    "tsconfig-paths": "^4.1.2"
+    "concurrently": "^8.2.0",
+    "ioredis-mock": "^8.8.1",
+    "ts-essentials": "^7.0.3"
   },
   "dependencies": {
-    "@deep-consulting-solutions/incident-handling": "^0.0.25",
-    "@n8n_io/license-sdk": "~2.3.0",
-    "@oclif/command": "^1.8.16",
-    "@oclif/core": "^1.16.4",
-    "@oclif/errors": "^1.3.6",
-    "@rudderstack/rudder-sdk-node": "1.0.6",
-    "@sentry/integrations": "^7.28.1",
-    "@sentry/node": "^7.28.1",
-    "axios": "^0.21.1",
-    "basic-auth": "^2.0.1",
-    "bcryptjs": "^2.4.3",
-    "body-parser": "^1.20.1",
-    "body-parser-xml": "^2.0.3",
-    "bull": "^4.10.2",
-    "callsites": "^3.1.0",
-    "change-case": "^4.1.1",
-    "class-transformer": "^0.5.1",
-    "class-validator": "^0.14.0",
-    "client-oauth2": "^4.2.5",
-    "compression": "^1.7.4",
-    "connect-history-api-fallback": "^1.6.0",
-    "convict": "^6.2.4",
-    "cookie-parser": "^1.4.6",
-    "crypto-js": "~4.1.1",
-    "csrf": "^3.1.0",
-    "curlconverter": "^3.0.0",
-    "dotenv": "^8.0.0",
-    "express": "^4.18.2",
-    "express-async-errors": "^3.1.1",
-    "express-handlebars": "^7.0.2",
-    "express-openapi-validator": "^4.13.6",
-    "express-prom-bundle": "^6.6.0",
-    "fast-glob": "^3.2.5",
-    "flatted": "^3.2.4",
-    "google-timezones-json": "^1.1.0",
-    "handlebars": "4.7.7",
-    "inquirer": "^7.0.1",
-    "ioredis": "^5.2.4",
-    "json-diff": "^0.5.4",
-    "jsonschema": "^1.4.1",
-    "jsonwebtoken": "^9.0.0",
-    "jwks-rsa": "^3.0.1",
-    "ldapts": "^4.2.2",
-    "localtunnel": "^2.0.0",
-    "lodash.get": "^4.4.2",
-    "lodash.intersection": "^4.4.0",
-    "lodash.iteratee": "^4.7.0",
-    "lodash.merge": "^4.6.2",
-    "lodash.omit": "^4.5.0",
-    "lodash.pick": "^4.4.0",
-    "lodash.remove": "^4.7.0",
-    "lodash.set": "^4.3.2",
-    "lodash.split": "^4.4.2",
-    "lodash.unionby": "^4.8.0",
-    "lodash.uniq": "^4.5.0",
-    "lodash.uniqby": "^4.7.0",
-    "lodash.unset": "^4.5.2",
-    "luxon": "^3.3.0",
-    "mysql2": "~2.3.3",
+    "@langchain/community": "0.0.53",
+    "@langchain/core": "0.1.61",
+    "@langchain/openai": "0.0.28",
+    "@langchain/pinecone": "^0.0.3",
+    "@n8n/client-oauth2": "workspace:*",
+    "@n8n/localtunnel": "2.1.0",
+    "@n8n/n8n-nodes-langchain": "workspace:*",
+    "@n8n/permissions": "workspace:*",
+    "@n8n/typeorm": "0.3.20-9",
+    "@n8n_io/license-sdk": "2.10.0",
+    "@oclif/core": "3.18.1",
+    "@pinecone-database/pinecone": "2.1.0",
+    "@rudderstack/rudder-sdk-node": "2.0.7",
+    "@sentry/integrations": "7.87.0",
+    "@sentry/node": "7.87.0",
+    "aws4": "1.11.0",
+    "axios": "1.6.7",
+    "basic-auth": "2.0.1",
+    "bcryptjs": "2.4.3",
+    "bull": "4.12.1",
+    "cache-manager": "5.2.3",
+    "callsites": "3.1.0",
+    "change-case": "4.1.2",
+    "class-transformer": "0.5.1",
+    "class-validator": "0.14.0",
+    "compression": "1.7.4",
+    "convict": "6.2.4",
+    "cookie-parser": "1.4.6",
+    "csrf": "3.1.0",
+    "curlconverter": "3.21.0",
+    "dotenv": "8.6.0",
+    "express": "4.19.2",
+    "express-async-errors": "3.1.1",
+    "express-handlebars": "7.1.2",
+    "express-openapi-validator": "5.1.6",
+    "express-prom-bundle": "6.6.0",
+    "express-rate-limit": "7.2.0",
+    "fast-glob": "3.2.12",
+    "flatted": "3.2.7",
+    "formidable": "3.5.1",
+    "fuse.js": "^7.0.0",
+    "google-timezones-json": "1.1.0",
+    "handlebars": "4.7.8",
+    "helmet": "7.1.0",
+    "infisical-node": "1.3.0",
+    "inquirer": "7.3.3",
+    "ioredis": "5.3.2",
+    "isbot": "3.6.13",
+    "json-diff": "1.0.6",
+    "jsonschema": "1.4.1",
+    "jsonwebtoken": "9.0.2",
+    "langchain": "0.1.36",
+    "ldapts": "4.2.6",
+    "lodash": "4.17.21",
+    "luxon": "3.3.0",
+    "mysql2": "3.9.7",
     "n8n-core": "workspace:*",
     "n8n-editor-ui": "workspace:*",
     "n8n-nodes-base": "workspace:*",
     "n8n-workflow": "workspace:*",
-    "nodemailer": "^6.7.1",
-    "oauth-1.0a": "^2.2.6",
-    "open": "^7.0.0",
-    "openapi-to-postmanv2": "^4.12.0",
-    "openapi-types": "^10.0.0",
-    "p-cancelable": "^2.0.0",
-    "parseurl": "^1.3.3",
-    "passport": "^0.6.0",
-    "passport-cookie": "^1.0.9",
-    "passport-jwt": "^4.0.0",
-    "pg": "^8.8.0",
-    "picocolors": "^1.0.0",
-    "posthog-node": "^2.2.2",
-    "prom-client": "^13.1.0",
-    "psl": "^1.8.0",
-    "reflect-metadata": "^0.1.13",
-    "replacestream": "^4.0.3",
-    "samlify": "^2.8.9",
-    "semver": "^7.3.8",
-    "shelljs": "^0.8.5",
-    "source-map-support": "^0.5.21",
-    "speakeasy": "^2.0.0",
-    "sqlite3": "^5.1.6",
-    "sse-channel": "^4.0.0",
-    "sshpk": "^1.17.0",
-    "swagger-ui-express": "^4.3.0",
-    "syslog-client": "^1.1.1",
-    "typedi": "^0.10.0",
-    "typeorm": "^0.3.12",
-    "url-pattern": "^1.0.3",
-    "uuid": "^8.3.2",
+    "nanoid": "3.3.6",
+    "nodemailer": "6.9.9",
+    "oauth-1.0a": "2.2.6",
+    "open": "7.4.2",
+    "openapi-types": "10.0.0",
+    "otpauth": "9.1.1",
+    "p-cancelable": "2.1.1",
+    "p-lazy": "3.1.0",
+    "pg": "8.11.3",
+    "picocolors": "1.0.0",
+    "pkce-challenge": "3.0.0",
+    "posthog-node": "3.2.1",
+    "prom-client": "13.2.0",
+    "psl": "1.9.0",
+    "raw-body": "2.5.1",
+    "reflect-metadata": "0.2.1",
+    "replacestream": "4.0.3",
+    "samlify": "2.8.9",
+    "semver": "7.5.4",
+    "shelljs": "0.8.5",
+    "simple-git": "3.17.0",
+    "source-map-support": "0.5.21",
+    "sqlite3": "5.1.7",
+    "sse-channel": "4.0.0",
+    "sshpk": "1.17.0",
+    "swagger-ui-express": "5.0.0",
+    "syslog-client": "1.1.1",
+    "typedi": "0.10.0",
+    "uuid": "8.3.2",
     "validator": "13.7.0",
-    "winston": "^3.3.3",
-    "ws": "^8.12.0",
-    "xmllint-wasm": "^3.0.1",
-    "yamljs": "^0.3.0"
+    "winston": "3.8.2",
+    "ws": "8.14.2",
+    "xml2js": "0.6.2",
+    "xmllint-wasm": "3.0.1",
+    "yamljs": "0.3.0",
+    "zod": "3.22.4",
+    "zod-to-json-schema": "3.22.4"
   }
 }
diff --git a/packages/cli/scripts/build.mjs b/packages/cli/scripts/build.mjs
index 63a9cb2f6f79a..621e36bdff856 100644
--- a/packages/cli/scripts/build.mjs
+++ b/packages/cli/scripts/build.mjs
@@ -9,12 +9,9 @@ const ROOT_DIR = path.resolve(__dirname, '..');
 const SPEC_FILENAME = 'openapi.yml';
 const SPEC_THEME_FILENAME = 'swaggerTheme.css';
 
-const userManagementEnabled = process.env.N8N_USER_MANAGEMENT_DISABLED !== 'true';
 const publicApiEnabled = process.env.N8N_PUBLIC_API_DISABLED !== 'true';
 
-if (userManagementEnabled) {
-	copyUserManagementEmailTemplates();
-}
+copyUserManagementEmailTemplates();
 
 if (publicApiEnabled) {
 	copySwaggerTheme();
@@ -49,7 +46,7 @@ function bundleOpenApiSpecs(rootDir = ROOT_DIR, specFileName = SPEC_FILENAME) {
 		}, [])
 		.forEach((specPath) => {
 			const distSpecPath = path.resolve(rootDir, 'dist', specPath);
-			const command = `npm run swagger -- bundle src/${specPath} --type yaml --outfile ${distSpecPath}`;
+			const command = `pnpm openapi bundle src/${specPath} --output ${distSpecPath}`;
 			shell.exec(command, { silent: true });
 		});
 }
diff --git a/packages/cli/src/AbstractServer.ts b/packages/cli/src/AbstractServer.ts
index ff0b8cf6e93f3..1610600e50e88 100644
--- a/packages/cli/src/AbstractServer.ts
+++ b/packages/cli/src/AbstractServer.ts
@@ -1,81 +1,95 @@
-import { Container } from 'typedi';
+import { Container, Service } from 'typedi';
 import { readFile } from 'fs/promises';
 import type { Server } from 'http';
-import type { Url } from 'url';
 import express from 'express';
-import bodyParser from 'body-parser';
-import bodyParserXml from 'body-parser-xml';
+import { engine as expressHandlebars } from 'express-handlebars';
 import compression from 'compression';
-import parseUrl from 'parseurl';
-import type { RedisOptions } from 'ioredis';
+import isbot from 'isbot';
 
-import type { WebhookHttpMethod } from 'n8n-workflow';
-import { ErrorReporterProxy as ErrorReporter, LoggerProxy as Logger } from 'n8n-workflow';
 import config from '@/config';
-import { N8N_VERSION, inDevelopment } from '@/constants';
-import { ActiveWorkflowRunner } from '@/ActiveWorkflowRunner';
+import { N8N_VERSION, TEMPLATES_DIR, inDevelopment, inTest } from '@/constants';
 import * as Db from '@/Db';
-import type { IExternalHooksClass } from '@/Interfaces';
+import { N8nInstanceType } from '@/Interfaces';
 import { ExternalHooks } from '@/ExternalHooks';
-import {
-	send,
-	sendErrorResponse,
-	sendSuccessResponse,
-	ServiceUnavailableError,
-} from '@/ResponseHelper';
-import { corsMiddleware } from '@/middlewares';
+import { send, sendErrorResponse } from '@/ResponseHelper';
+import { rawBodyReader, bodyParser, corsMiddleware } from '@/middlewares';
 import { TestWebhooks } from '@/TestWebhooks';
+import { WaitingForms } from '@/WaitingForms';
 import { WaitingWebhooks } from '@/WaitingWebhooks';
-import { WEBHOOK_METHODS } from '@/WebhookHelpers';
-
-const emptyBuffer = Buffer.alloc(0);
-
+import { webhookRequestHandler } from '@/WebhookHelpers';
+import { generateHostInstanceId } from './databases/utils/generators';
+import { Logger } from '@/Logger';
+import { ServiceUnavailableError } from './errors/response-errors/service-unavailable.error';
+import { OnShutdown } from '@/decorators/OnShutdown';
+import { ActiveWebhooks } from '@/ActiveWebhooks';
+
+@Service()
 export abstract class AbstractServer {
-	protected server: Server;
+	protected logger: Logger;
 
-	public app: express.Application;
+	protected server: Server;
 
-	protected externalHooks: IExternalHooksClass;
+	readonly app: express.Application;
 
-	protected activeWorkflowRunner: ActiveWorkflowRunner;
+	protected externalHooks: ExternalHooks;
 
-	protected protocol: string;
+	protected protocol = config.getEnv('protocol');
 
 	protected sslKey: string;
 
 	protected sslCert: string;
 
-	protected timezone: string;
-
 	protected restEndpoint: string;
 
+	protected endpointForm: string;
+
+	protected endpointFormTest: string;
+
+	protected endpointFormWaiting: string;
+
 	protected endpointWebhook: string;
 
 	protected endpointWebhookTest: string;
 
 	protected endpointWebhookWaiting: string;
 
-	protected instanceId = '';
+	protected webhooksEnabled = true;
 
-	abstract configure(): Promise<void>;
+	protected testWebhooksEnabled = false;
 
-	constructor() {
+	readonly uniqueInstanceId: string;
+
+	constructor(instanceType: N8nInstanceType = 'main') {
 		this.app = express();
 		this.app.disable('x-powered-by');
 
-		this.protocol = config.getEnv('protocol');
+		this.app.engine('handlebars', expressHandlebars({ defaultLayout: false }));
+		this.app.set('view engine', 'handlebars');
+		this.app.set('views', TEMPLATES_DIR);
+
+		const proxyHops = config.getEnv('proxy_hops');
+		if (proxyHops > 0) this.app.set('trust proxy', proxyHops);
+
 		this.sslKey = config.getEnv('ssl_key');
 		this.sslCert = config.getEnv('ssl_cert');
 
-		this.timezone = config.getEnv('generic.timezone');
-
 		this.restEndpoint = config.getEnv('endpoints.rest');
+
+		this.endpointForm = config.getEnv('endpoints.form');
+		this.endpointFormTest = config.getEnv('endpoints.formTest');
+		this.endpointFormWaiting = config.getEnv('endpoints.formWaiting');
+
 		this.endpointWebhook = config.getEnv('endpoints.webhook');
 		this.endpointWebhookTest = config.getEnv('endpoints.webhookTest');
 		this.endpointWebhookWaiting = config.getEnv('endpoints.webhookWaiting');
 
-		this.externalHooks = Container.get(ExternalHooks);
-		this.activeWorkflowRunner = Container.get(ActiveWorkflowRunner);
+		this.uniqueInstanceId = generateHostInstanceId(instanceType);
+
+		this.logger = Container.get(Logger);
+	}
+
+	async configure(): Promise<void> {
+		// Additional configuration in derived classes
 	}
 
 	private async setupErrorHandlers() {
@@ -89,67 +103,12 @@ export abstract class AbstractServer {
 		app.use(errorHandler());
 	}
 
-	private async setupCommonMiddlewares() {
-		const { app } = this;
-
+	private setupCommonMiddlewares() {
 		// Compress the response data
-		app.use(compression());
-
-		// Make sure that each request has the "parsedUrl" parameter
-		app.use((req, res, next) => {
-			// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-			req.parsedUrl = parseUrl(req)!;
-			req.rawBody = emptyBuffer;
-			next();
-		});
-
-		const payloadSizeMax = config.getEnv('endpoints.payloadSizeMax');
+		this.app.use(compression());
 
-		// Support application/json type post data
-		app.use(
-			bodyParser.json({
-				limit: `${payloadSizeMax}mb`,
-				verify: (req, res, buf) => {
-					req.rawBody = buf;
-				},
-			}),
-		);
-
-		// Support application/xml type post data
-		bodyParserXml(bodyParser);
-		app.use(
-			bodyParser.xml({
-				limit: `${payloadSizeMax}mb`,
-				xmlParseOptions: {
-					normalize: true, // Trim whitespace inside text nodes
-					normalizeTags: true, // Transform tags to lowercase
-					explicitArray: false, // Only put properties in array if length > 1
-				},
-				verify: (req, res, buf) => {
-					req.rawBody = buf;
-				},
-			}),
-		);
-
-		app.use(
-			bodyParser.text({
-				limit: `${payloadSizeMax}mb`,
-				verify: (req, res, buf) => {
-					req.rawBody = buf;
-				},
-			}),
-		);
-
-		// support application/x-www-form-urlencoded post data
-		app.use(
-			bodyParser.urlencoded({
-				limit: `${payloadSizeMax}mb`,
-				extended: false,
-				verify: (req, res, buf) => {
-					req.rawBody = buf;
-				},
-			}),
-		);
+		// Read incoming data into `rawBody`
+		this.app.use(rawBodyReader);
 	}
 
 	private setupDevMiddlewares() {
@@ -159,250 +118,22 @@ export abstract class AbstractServer {
 	protected setupPushServer() {}
 
 	private async setupHealthCheck() {
-		this.app.use((req, res, next) => {
-			if (!Db.isInitialized) {
-				sendErrorResponse(res, new ServiceUnavailableError('Database is not ready!'));
-			} else next();
+		// health check should not care about DB connections
+		this.app.get('/healthz', async (_req, res) => {
+			res.send({ status: 'ok' });
 		});
 
-		// Does very basic health check
-		this.app.get('/healthz', async (req, res) => {
-			Logger.debug('Health check started!');
-
-			const connection = Db.getConnection();
-
-			try {
-				if (!connection.isInitialized) {
-					// Connection is not active
-					throw new ServiceUnavailableError('No active database connection!');
-				}
-				// DB ping
-				await connection.query('SELECT 1');
-			} catch (error) {
-				ErrorReporter.error(error);
-				Logger.error('No Database connection!');
-				return sendErrorResponse(res, new ServiceUnavailableError('No Database connection!'));
-			}
-
-			Logger.debug('Health check completed successfully!');
-			sendSuccessResponse(res, { status: 'ok' }, true, 200);
+		const { connectionState } = Db;
+		this.app.use((_req, res, next) => {
+			if (connectionState.connected) {
+				if (connectionState.migrated) next();
+				else res.send('n8n is starting up. Please wait');
+			} else sendErrorResponse(res, new ServiceUnavailableError('Database is not ready!'));
 		});
-
-		if (config.getEnv('executions.mode') === 'queue') {
-			await this.setupRedisChecks();
-		}
 	}
 
-	// This connection is going to be our heartbeat
-	// IORedis automatically pings redis and tries to reconnect
-	// We will be using a retryStrategy to control how and when to exit.
-	private async setupRedisChecks() {
-		// eslint-disable-next-line @typescript-eslint/naming-convention
-		const { default: Redis } = await import('ioredis');
-
-		let lastTimer = 0;
-		let cumulativeTimeout = 0;
-		const { host, port, username, password, db }: RedisOptions = config.getEnv('queue.bull.redis');
-		const redisConnectionTimeoutLimit = config.getEnv('queue.bull.redis.timeoutThreshold');
-
-		const redis = new Redis({
-			host,
-			port,
-			db,
-			username,
-			password,
-			retryStrategy: (): number | null => {
-				const now = Date.now();
-				if (now - lastTimer > 30000) {
-					// Means we had no timeout at all or last timeout was temporary and we recovered
-					lastTimer = now;
-					cumulativeTimeout = 0;
-				} else {
-					cumulativeTimeout += now - lastTimer;
-					lastTimer = now;
-					if (cumulativeTimeout > redisConnectionTimeoutLimit) {
-						Logger.error(
-							`Unable to connect to Redis after ${redisConnectionTimeoutLimit}. Exiting process.`,
-						);
-						process.exit(1);
-					}
-				}
-				return 500;
-			},
-		});
-
-		redis.on('close', () => {
-			Logger.warn('Redis unavailable - trying to reconnect...');
-		});
-
-		redis.on('error', (error) => {
-			if (!String(error).includes('ECONNREFUSED')) {
-				// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-				Logger.warn('Error with Redis: ', error);
-			}
-		});
-	}
-
-	// ----------------------------------------
-	// Regular Webhooks
-	// ----------------------------------------
-	protected setupWebhookEndpoint() {
-		const endpoint = this.endpointWebhook;
-		const activeWorkflowRunner = this.activeWorkflowRunner;
-
-		// Register all webhook requests
-		this.app.all(`/${endpoint}/*`, async (req, res) => {
-			// Cut away the "/webhook/" to get the registered part of the url
-			const requestUrl = req.parsedUrl.pathname!.slice(endpoint.length + 2);
-
-			const method = req.method.toUpperCase() as WebhookHttpMethod;
-			if (method === 'OPTIONS') {
-				let allowedMethods: string[];
-				try {
-					allowedMethods = await activeWorkflowRunner.getWebhookMethods(requestUrl);
-					allowedMethods.push('OPTIONS');
-
-					// Add custom "Allow" header to satisfy OPTIONS response.
-					res.append('Allow', allowedMethods);
-				} catch (error) {
-					// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-					sendErrorResponse(res, error);
-					return;
-				}
-
-				res.header('Access-Control-Allow-Origin', '*');
-				res.header('Access-Control-Allow-Headers', req.header('Access-Control-Request-Headers'));
-
-				sendSuccessResponse(res, {}, true, 204);
-				return;
-			}
-
-			if (!WEBHOOK_METHODS.includes(method)) {
-				sendErrorResponse(res, new Error(`The method ${method} is not supported.`));
-				return;
-			}
-
-			let response;
-			try {
-				response = await activeWorkflowRunner.executeWebhook(method, requestUrl, req, res);
-			} catch (error) {
-				// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-				sendErrorResponse(res, error);
-				return;
-			}
-
-			if (response.noWebhookResponse === true) {
-				// Nothing else to do as the response got already sent
-				return;
-			}
-
-			sendSuccessResponse(res, response.data, true, response.responseCode, response.headers);
-		});
-	}
-
-	// ----------------------------------------
-	// Waiting Webhooks
-	// ----------------------------------------
-	protected setupWaitingWebhookEndpoint() {
-		const endpoint = this.endpointWebhookWaiting;
-		const waitingWebhooks = Container.get(WaitingWebhooks);
-
-		// Register all webhook-waiting requests
-		this.app.all(`/${endpoint}/*`, async (req, res) => {
-			// Cut away the "/webhook-waiting/" to get the registered part of the url
-			const requestUrl = req.parsedUrl.pathname!.slice(endpoint.length + 2);
-
-			const method = req.method.toUpperCase() as WebhookHttpMethod;
-
-			if (!WEBHOOK_METHODS.includes(method)) {
-				sendErrorResponse(res, new Error(`The method ${method} is not supported.`));
-				return;
-			}
-
-			let response;
-			try {
-				response = await waitingWebhooks.executeWebhook(method, requestUrl, req, res);
-			} catch (error) {
-				// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-				sendErrorResponse(res, error);
-				return;
-			}
-
-			if (response.noWebhookResponse === true) {
-				// Nothing else to do as the response got already sent
-				return;
-			}
-
-			sendSuccessResponse(res, response.data, true, response.responseCode, response.headers);
-		});
-	}
-
-	// ----------------------------------------
-	// Testing Webhooks
-	// ----------------------------------------
-	protected setupTestWebhookEndpoint() {
-		const endpoint = this.endpointWebhookTest;
-		const testWebhooks = Container.get(TestWebhooks);
-
-		// Register all test webhook requests (for testing via the UI)
-		this.app.all(`/${endpoint}/*`, async (req, res) => {
-			// Cut away the "/webhook-test/" to get the registered part of the url
-			const requestUrl = req.parsedUrl.pathname!.slice(endpoint.length + 2);
-
-			const method = req.method.toUpperCase() as WebhookHttpMethod;
-
-			if (method === 'OPTIONS') {
-				let allowedMethods: string[];
-				try {
-					allowedMethods = await testWebhooks.getWebhookMethods(requestUrl);
-					allowedMethods.push('OPTIONS');
-
-					// Add custom "Allow" header to satisfy OPTIONS response.
-					res.append('Allow', allowedMethods);
-				} catch (error) {
-					// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-					sendErrorResponse(res, error);
-					return;
-				}
-
-				res.header('Access-Control-Allow-Origin', '*');
-
-				sendSuccessResponse(res, {}, true, 204);
-				return;
-			}
-
-			if (!WEBHOOK_METHODS.includes(method)) {
-				sendErrorResponse(res, new Error(`The method ${method} is not supported.`));
-				return;
-			}
-
-			let response;
-			try {
-				response = await testWebhooks.callTestWebhook(method, requestUrl, req, res);
-			} catch (error) {
-				// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-				sendErrorResponse(res, error);
-				return;
-			}
-
-			if (response.noWebhookResponse === true) {
-				// Nothing else to do as the response got already sent
-				return;
-			}
-
-			sendSuccessResponse(res, response.data, true, response.responseCode, response.headers);
-		});
-
-		// Removes a test webhook
-		// TODO UM: check if this needs validation with user management.
-		this.app.delete(
-			`/${this.restEndpoint}/test-webhook/:id`,
-			send(async (req) => testWebhooks.cancelTestWebhook(req.params.id)),
-		);
-	}
-
-	async start(): Promise<void> {
-		const { app, externalHooks, protocol, sslKey, sslCert } = this;
+	async init(): Promise<void> {
+		const { app, protocol, sslKey, sslCert } = this;
 
 		if (protocol === 'https' && sslKey && sslCert) {
 			const https = await import('https');
@@ -423,7 +154,7 @@ export abstract class AbstractServer {
 
 		this.server.on('error', (error: Error & { code: string }) => {
 			if (error.code === 'EADDRINUSE') {
-				console.log(
+				this.logger.info(
 					`n8n's port ${PORT} is already in use. Do you have another instance of n8n running already?`,
 				);
 				process.exit(1);
@@ -432,31 +163,109 @@ export abstract class AbstractServer {
 
 		await new Promise<void>((resolve) => this.server.listen(PORT, ADDRESS, () => resolve()));
 
-		await this.setupErrorHandlers();
-		this.setupPushServer();
-		await this.setupCommonMiddlewares();
+		this.externalHooks = Container.get(ExternalHooks);
+
+		await this.setupHealthCheck();
+
+		this.logger.info(`n8n ready on ${ADDRESS}, port ${PORT}`);
+	}
+
+	async start(): Promise<void> {
+		if (!inTest) {
+			await this.setupErrorHandlers();
+			this.setupPushServer();
+		}
+
+		this.setupCommonMiddlewares();
+
+		// Setup webhook handlers before bodyParser, to let the Webhook node handle binary data in requests
+		if (this.webhooksEnabled) {
+			const activeWebhooks = Container.get(ActiveWebhooks);
+
+			// Register a handler for active forms
+			this.app.all(`/${this.endpointForm}/:path(*)`, webhookRequestHandler(activeWebhooks));
+
+			// Register a handler for active webhooks
+			this.app.all(`/${this.endpointWebhook}/:path(*)`, webhookRequestHandler(activeWebhooks));
+
+			// Register a handler for waiting forms
+			this.app.all(
+				`/${this.endpointFormWaiting}/:path/:suffix?`,
+				webhookRequestHandler(Container.get(WaitingForms)),
+			);
+
+			// Register a handler for waiting webhooks
+			this.app.all(
+				`/${this.endpointWebhookWaiting}/:path/:suffix?`,
+				webhookRequestHandler(Container.get(WaitingWebhooks)),
+			);
+		}
+
+		if (this.testWebhooksEnabled) {
+			const testWebhooks = Container.get(TestWebhooks);
+
+			// Register a handler
+			this.app.all(`/${this.endpointFormTest}/:path(*)`, webhookRequestHandler(testWebhooks));
+			this.app.all(`/${this.endpointWebhookTest}/:path(*)`, webhookRequestHandler(testWebhooks));
+
+			// Removes a test webhook
+			// TODO UM: check if this needs validation with user management.
+			this.app.delete(
+				`/${this.restEndpoint}/test-webhook/:id`,
+				send(async (req) => await testWebhooks.cancelWebhook(req.params.id)),
+			);
+		}
+
+		// Block bots from scanning the application
+		const checkIfBot = isbot.spawn(['bot']);
+		this.app.use((req, res, next) => {
+			const userAgent = req.headers['user-agent'];
+			if (userAgent && checkIfBot(userAgent)) {
+				this.logger.info(`Blocked ${req.method} ${req.url} for "${userAgent}"`);
+				res.status(204).end();
+			} else next();
+		});
+
 		if (inDevelopment) {
 			this.setupDevMiddlewares();
 		}
 
-		await this.setupHealthCheck();
+		// Setup body parsing middleware after the webhook handlers are setup
+		this.app.use(bodyParser);
 
 		await this.configure();
 
-		console.log(`n8n ready on ${ADDRESS}, port ${PORT}`);
-		console.log(`Version: ${N8N_VERSION}`);
+		if (!inTest) {
+			this.logger.info(`Version: ${N8N_VERSION}`);
 
-		const defaultLocale = config.getEnv('defaultLocale');
-		if (defaultLocale !== 'en') {
-			console.log(`Locale: ${defaultLocale}`);
-		}
+			const defaultLocale = config.getEnv('defaultLocale');
+			if (defaultLocale !== 'en') {
+				this.logger.info(`Locale: ${defaultLocale}`);
+			}
 
-		await externalHooks.run('n8n.ready', [this, config]);
+			await this.externalHooks.run('n8n.ready', [this, config]);
+		}
 	}
-}
 
-declare module 'http' {
-	export interface IncomingMessage {
-		parsedUrl: Url;
+	/**
+	 * Stops the HTTP(S) server from accepting new connections. Gives all
+	 * connections configured amount of time to finish their work and
+	 * then closes them forcefully.
+	 */
+	@OnShutdown()
+	async onShutdown(): Promise<void> {
+		if (!this.server) {
+			return;
+		}
+
+		this.logger.debug(`Shutting down ${this.protocol} server`);
+
+		this.server.close((error) => {
+			if (error) {
+				this.logger.error(`Error while shutting down ${this.protocol} server`, { error });
+			}
+
+			this.logger.debug(`${this.protocol} server shut down`);
+		});
 	}
 }
diff --git a/packages/cli/src/ActivationErrors.service.ts b/packages/cli/src/ActivationErrors.service.ts
new file mode 100644
index 0000000000000..e06dcf6dee0e5
--- /dev/null
+++ b/packages/cli/src/ActivationErrors.service.ts
@@ -0,0 +1,37 @@
+import { Service } from 'typedi';
+import { CacheService } from '@/services/cache/cache.service';
+
+@Service()
+export class ActivationErrorsService {
+	private readonly cacheKey = 'workflow-activation-errors';
+
+	constructor(private readonly cacheService: CacheService) {}
+
+	async register(workflowId: string, errorMessage: string) {
+		await this.cacheService.setHash(this.cacheKey, { [workflowId]: errorMessage });
+	}
+
+	async deregister(workflowId: string) {
+		await this.cacheService.deleteFromHash(this.cacheKey, workflowId);
+	}
+
+	async get(workflowId: string) {
+		const activationError = await this.cacheService.getHashValue<string>(this.cacheKey, workflowId);
+
+		if (!activationError) return null;
+
+		return activationError;
+	}
+
+	async getAll() {
+		const activationErrors = await this.cacheService.getHash<string>(this.cacheKey);
+
+		if (!activationErrors) return {};
+
+		return activationErrors;
+	}
+
+	async clearAll() {
+		await this.cacheService.delete(this.cacheKey);
+	}
+}
diff --git a/packages/cli/src/ActiveExecutions.ts b/packages/cli/src/ActiveExecutions.ts
index 590cba36cc713..e799dba13e65c 100644
--- a/packages/cli/src/ActiveExecutions.ts
+++ b/packages/cli/src/ActiveExecutions.ts
@@ -1,55 +1,54 @@
-/* eslint-disable @typescript-eslint/no-unnecessary-type-assertion */
-/* eslint-disable @typescript-eslint/no-unsafe-call */
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
+import { Service } from 'typedi';
+import type PCancelable from 'p-cancelable';
 import type {
 	IDeferredPromise,
 	IExecuteResponsePromiseData,
 	IRun,
 	ExecutionStatus,
 } from 'n8n-workflow';
-import { createDeferredPromise, LoggerProxy } from 'n8n-workflow';
+import { ApplicationError, createDeferredPromise, sleep } from 'n8n-workflow';
 
-import type { ChildProcess } from 'child_process';
-import { stringify } from 'flatted';
-import type PCancelable from 'p-cancelable';
-import * as Db from '@/Db';
 import type {
+	ExecutionPayload,
 	IExecutingWorkflowData,
 	IExecutionDb,
-	IExecutionFlattedDb,
 	IExecutionsCurrentSummary,
 	IWorkflowExecutionDataProcess,
 } from '@/Interfaces';
-import * as ResponseHelper from '@/ResponseHelper';
 import { isWorkflowIdValid } from '@/utils';
-import { Service } from 'typedi';
+import { ExecutionRepository } from '@db/repositories/execution.repository';
+import { Logger } from '@/Logger';
 
 @Service()
 export class ActiveExecutions {
+	/**
+	 * Active executions in the current process, not globally.
+	 */
 	private activeExecutions: {
-		[index: string]: IExecutingWorkflowData;
+		[executionId: string]: IExecutingWorkflowData;
 	} = {};
 
+	constructor(
+		private readonly logger: Logger,
+		private readonly executionRepository: ExecutionRepository,
+	) {}
+
 	/**
 	 * Add a new active execution
 	 */
-	async add(
-		executionData: IWorkflowExecutionDataProcess,
-		process?: ChildProcess,
-		executionId?: string,
-	): Promise<string> {
+	async add(executionData: IWorkflowExecutionDataProcess, executionId?: string): Promise<string> {
 		let executionStatus: ExecutionStatus = executionId ? 'running' : 'new';
 		if (executionId === undefined) {
 			// Is a new execution so save in DB
 
-			const fullExecutionData: IExecutionDb = {
+			const fullExecutionData: ExecutionPayload = {
 				data: executionData.executionData!,
 				mode: executionData.executionMode,
 				finished: false,
 				startedAt: new Date(),
 				workflowData: executionData.workflowData,
 				status: executionStatus,
+				workflowId: executionData.workflowData.id,
 			};
 
 			if (executionData.retryOf !== undefined) {
@@ -61,35 +60,26 @@ export class ActiveExecutions {
 				fullExecutionData.workflowId = workflowId;
 			}
 
-			const execution = ResponseHelper.flattenExecutionData(fullExecutionData);
-
-			const executionResult = await Db.collections.Execution.save(execution as IExecutionFlattedDb);
-			// TODO: what is going on here?
-			executionId =
-				typeof executionResult.id === 'object'
-					? // @ts-ignore
-					  executionResult.id!.toString()
-					: executionResult.id + '';
+			executionId = await this.executionRepository.createNewExecution(fullExecutionData);
 			if (executionId === undefined) {
-				throw new Error('There was an issue assigning an execution id to the execution');
+				throw new ApplicationError('There was an issue assigning an execution id to the execution');
 			}
 			executionStatus = 'running';
 		} else {
 			// Is an existing execution we want to finish so update in DB
 
-			const execution: Pick<IExecutionFlattedDb, 'id' | 'data' | 'waitTill' | 'status'> = {
+			const execution: Pick<IExecutionDb, 'id' | 'data' | 'waitTill' | 'status'> = {
 				id: executionId,
-				data: stringify(executionData.executionData!),
+				data: executionData.executionData!,
 				waitTill: null,
 				status: executionStatus,
 			};
 
-			await Db.collections.Execution.update(executionId, execution);
+			await this.executionRepository.updateExistingExecution(executionId, execution);
 		}
 
 		this.activeExecutions[executionId] = {
 			executionData,
-			process,
 			startedAt: new Date(),
 			postExecutePromises: [],
 			status: executionStatus,
@@ -100,53 +90,39 @@ export class ActiveExecutions {
 
 	/**
 	 * Attaches an execution
-	 *
 	 */
-	// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
-	attachWorkflowExecution(executionId: string, workflowExecution: PCancelable<IRun>) {
-		if (this.activeExecutions[executionId] === undefined) {
-			throw new Error(
-				`No active execution with id "${executionId}" got found to attach to workflowExecution to!`,
-			);
-		}
 
-		this.activeExecutions[executionId].workflowExecution = workflowExecution;
+	attachWorkflowExecution(executionId: string, workflowExecution: PCancelable<IRun>) {
+		this.getExecution(executionId).workflowExecution = workflowExecution;
 	}
 
 	attachResponsePromise(
 		executionId: string,
 		responsePromise: IDeferredPromise<IExecuteResponsePromiseData>,
 	): void {
-		if (this.activeExecutions[executionId] === undefined) {
-			throw new Error(
-				`No active execution with id "${executionId}" got found to attach to workflowExecution to!`,
-			);
-		}
-
-		this.activeExecutions[executionId].responsePromise = responsePromise;
+		this.getExecution(executionId).responsePromise = responsePromise;
 	}
 
 	resolveResponsePromise(executionId: string, response: IExecuteResponsePromiseData): void {
-		if (this.activeExecutions[executionId] === undefined) {
-			return;
-		}
+		const execution = this.activeExecutions[executionId];
+		execution?.responsePromise?.resolve(response);
+	}
 
-		// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-		this.activeExecutions[executionId].responsePromise?.resolve(response);
+	getPostExecutePromiseCount(executionId: string): number {
+		return this.activeExecutions[executionId]?.postExecutePromises.length ?? 0;
 	}
 
 	/**
 	 * Remove an active execution
-	 *
 	 */
 	remove(executionId: string, fullRunData?: IRun): void {
-		if (this.activeExecutions[executionId] === undefined) {
+		const execution = this.activeExecutions[executionId];
+		if (execution === undefined) {
 			return;
 		}
 
 		// Resolve all the waiting promises
-		// eslint-disable-next-line no-restricted-syntax
-		for (const promise of this.activeExecutions[executionId].postExecutePromises) {
+		for (const promise of execution.postExecutePromises) {
 			promise.resolve(fullRunData);
 		}
 
@@ -156,75 +132,45 @@ export class ActiveExecutions {
 
 	/**
 	 * Forces an execution to stop
-	 *
-	 * @param {string} executionId The id of the execution to stop
-	 * @param {string} timeout String 'timeout' given if stop due to timeout
 	 */
-	async stopExecution(executionId: string, timeout?: string): Promise<IRun | undefined> {
-		if (this.activeExecutions[executionId] === undefined) {
+	async stopExecution(executionId: string): Promise<IRun | undefined> {
+		const execution = this.activeExecutions[executionId];
+		if (execution === undefined) {
 			// There is no execution running with that id
 			return;
 		}
 
-		// In case something goes wrong make sure that promise gets first
-		// returned that it gets then also resolved correctly.
-		if (this.activeExecutions[executionId].process !== undefined) {
-			// Workflow is running in subprocess
-			if (this.activeExecutions[executionId].process!.connected) {
-				setTimeout(() => {
-					// execute on next event loop tick;
-					this.activeExecutions[executionId].process!.send({
-						// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-						type: timeout || 'stopExecution',
-					});
-				}, 1);
-			}
-		} else {
-			// Workflow is running in current process
-			this.activeExecutions[executionId].workflowExecution!.cancel();
-		}
+		execution.workflowExecution!.cancel();
 
-		// eslint-disable-next-line consistent-return
-		return this.getPostExecutePromise(executionId);
+		return await this.getPostExecutePromise(executionId);
 	}
 
 	/**
-	 * Returns a promise which will resolve with the data of the execution
-	 * with the given id
-	 *
-	 * @param {string} executionId The id of the execution to wait for
+	 * Returns a promise which will resolve with the data of the execution with the given id
 	 */
 	async getPostExecutePromise(executionId: string): Promise<IRun | undefined> {
 		// Create the promise which will be resolved when the execution finished
 		const waitPromise = await createDeferredPromise<IRun | undefined>();
-
-		if (this.activeExecutions[executionId] === undefined) {
-			throw new Error(`There is no active execution with id "${executionId}".`);
-		}
-
-		this.activeExecutions[executionId].postExecutePromises.push(waitPromise);
-
-		// eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-member-access
-		return waitPromise.promise();
+		this.getExecution(executionId).postExecutePromises.push(waitPromise);
+		return await waitPromise.promise();
 	}
 
 	/**
 	 * Returns all the currently active executions
-	 *
 	 */
 	getActiveExecutions(): IExecutionsCurrentSummary[] {
 		const returnData: IExecutionsCurrentSummary[] = [];
 
 		let data;
-		// eslint-disable-next-line no-restricted-syntax
+
 		for (const id of Object.keys(this.activeExecutions)) {
 			data = this.activeExecutions[id];
 			returnData.push({
 				id,
-				retryOf: data.executionData.retryOf as string | undefined,
+				retryOf: data.executionData.retryOf,
 				startedAt: data.startedAt,
 				mode: data.executionData.executionMode,
-				workflowId: data.executionData.workflowData.id! as string,
+				workflowId: data.executionData.workflowData.id,
 				status: data.status,
 			});
 		}
@@ -232,22 +178,42 @@ export class ActiveExecutions {
 		return returnData;
 	}
 
-	async setStatus(executionId: string, status: ExecutionStatus): Promise<void> {
-		if (this.activeExecutions[executionId] === undefined) {
-			LoggerProxy.debug(
-				`There is no active execution with id "${executionId}", can't update status to ${status}.`,
+	setStatus(executionId: string, status: ExecutionStatus) {
+		this.getExecution(executionId).status = status;
+	}
+
+	getStatus(executionId: string): ExecutionStatus {
+		return this.getExecution(executionId).status;
+	}
+
+	/** Wait for all active executions to finish */
+	async shutdown(cancelAll = false) {
+		let executionIds = Object.keys(this.activeExecutions);
+
+		if (cancelAll) {
+			const stopPromises = executionIds.map(
+				async (executionId) => await this.stopExecution(executionId),
 			);
-			return;
+
+			await Promise.allSettled(stopPromises);
 		}
 
-		this.activeExecutions[executionId].status = status;
-	}
+		let count = 0;
+		while (executionIds.length !== 0) {
+			if (count++ % 4 === 0) {
+				this.logger.info(`Waiting for ${executionIds.length} active executions to finish...`);
+			}
 
-	getStatus(executionId: string): ExecutionStatus {
-		if (this.activeExecutions[executionId] === undefined) {
-			return 'unknown';
+			await sleep(500);
+			executionIds = Object.keys(this.activeExecutions);
 		}
+	}
 
-		return this.activeExecutions[executionId].status;
+	private getExecution(executionId: string): IExecutingWorkflowData {
+		const execution = this.activeExecutions[executionId];
+		if (!execution) {
+			throw new ApplicationError('No active execution found', { extra: { executionId } });
+		}
+		return execution;
 	}
 }
diff --git a/packages/cli/src/ActiveWebhooks.ts b/packages/cli/src/ActiveWebhooks.ts
index 8e3dcda62ddca..6b9717341bb3a 100644
--- a/packages/cli/src/ActiveWebhooks.ts
+++ b/packages/cli/src/ActiveWebhooks.ts
@@ -1,228 +1,161 @@
 import { Service } from 'typedi';
-import type {
-	IWebhookData,
-	WebhookHttpMethod,
-	Workflow,
-	WorkflowActivateMode,
-	WorkflowExecuteMode,
-} from 'n8n-workflow';
+import type { Response } from 'express';
+import { Workflow, NodeHelpers } from 'n8n-workflow';
+import type { INode, IWebhookData, IHttpRequestMethods } from 'n8n-workflow';
 
-import * as NodeExecuteFunctions from 'n8n-core';
+import { WorkflowRepository } from '@db/repositories/workflow.repository';
+import type {
+	IResponseCallbackData,
+	IWebhookManager,
+	WebhookAccessControlOptions,
+	WebhookRequest,
+} from '@/Interfaces';
+import { Logger } from '@/Logger';
+import { NodeTypes } from '@/NodeTypes';
+import { WebhookService } from '@/services/webhook.service';
+import { WebhookNotFoundError } from '@/errors/response-errors/webhook-not-found.error';
+import { NotFoundError } from '@/errors/response-errors/not-found.error';
+import * as WorkflowExecuteAdditionalData from '@/WorkflowExecuteAdditionalData';
+import * as WebhookHelpers from '@/WebhookHelpers';
+import { WorkflowStaticDataService } from '@/workflows/workflowStaticData.service';
 
 @Service()
-export class ActiveWebhooks {
-	private workflowWebhooks: {
-		[key: string]: IWebhookData[];
-	} = {};
-
-	private webhookUrls: {
-		[key: string]: IWebhookData[];
-	} = {};
+export class ActiveWebhooks implements IWebhookManager {
+	constructor(
+		private readonly logger: Logger,
+		private readonly nodeTypes: NodeTypes,
+		private readonly webhookService: WebhookService,
+		private readonly workflowRepository: WorkflowRepository,
+		private readonly workflowStaticDataService: WorkflowStaticDataService,
+	) {}
+
+	async getWebhookMethods(path: string) {
+		return await this.webhookService.getWebhookMethods(path);
+	}
 
-	testWebhooks = false;
+	async findAccessControlOptions(path: string, httpMethod: IHttpRequestMethods) {
+		const webhook = await this.findWebhook(path, httpMethod);
 
-	/**
-	 * Adds a new webhook
-	 *
-	 */
-	async add(
-		workflow: Workflow,
-		webhookData: IWebhookData,
-		mode: WorkflowExecuteMode,
-		activation: WorkflowActivateMode,
-	): Promise<void> {
-		if (workflow.id === undefined) {
-			throw new Error('Webhooks can only be added for saved workflows as an id is needed!');
-		}
-		if (webhookData.path.endsWith('/')) {
-			// eslint-disable-next-line no-param-reassign
-			webhookData.path = webhookData.path.slice(0, -1);
-		}
+		const workflowData = await this.workflowRepository.findOne({
+			where: { id: webhook.workflowId },
+			select: ['nodes'],
+		});
 
-		const webhookKey = this.getWebhookKey(
-			webhookData.httpMethod,
-			webhookData.path,
-			webhookData.webhookId,
+		const nodes = workflowData?.nodes;
+		const webhookNode = nodes?.find(
+			({ type, parameters, typeVersion }) =>
+				parameters?.path === path &&
+				(parameters?.httpMethod ?? 'GET') === httpMethod &&
+				'webhook' in this.nodeTypes.getByNameAndVersion(type, typeVersion),
 		);
-
-		// check that there is not a webhook already registered with that path/method
-		if (this.webhookUrls[webhookKey] && !webhookData.webhookId) {
-			throw new Error(
-				`The URL path that the "${webhookData.node}" node uses is already taken. Please change it to something else.`,
-			);
-		}
-
-		if (this.workflowWebhooks[webhookData.workflowId] === undefined) {
-			this.workflowWebhooks[webhookData.workflowId] = [];
-		}
-
-		// Make the webhook available directly because sometimes to create it successfully
-		// it gets called
-		if (!this.webhookUrls[webhookKey]) {
-			this.webhookUrls[webhookKey] = [];
-		}
-		this.webhookUrls[webhookKey].push(webhookData);
-
-		try {
-			const webhookExists = await workflow.runWebhookMethod(
-				'checkExists',
-				webhookData,
-				NodeExecuteFunctions,
-				mode,
-				activation,
-				this.testWebhooks,
-			);
-			if (webhookExists !== true) {
-				// If webhook does not exist yet create it
-				await workflow.runWebhookMethod(
-					'create',
-					webhookData,
-					NodeExecuteFunctions,
-					mode,
-					activation,
-					this.testWebhooks,
-				);
-			}
-		} catch (error) {
-			// If there was a problem unregister the webhook again
-			if (this.webhookUrls[webhookKey].length <= 1) {
-				delete this.webhookUrls[webhookKey];
-			} else {
-				this.webhookUrls[webhookKey] = this.webhookUrls[webhookKey].filter(
-					(webhook) => webhook.path !== webhookData.path,
-				);
-			}
-
-			throw error;
-		}
-		this.workflowWebhooks[webhookData.workflowId].push(webhookData);
+		return webhookNode?.parameters?.options as WebhookAccessControlOptions;
 	}
 
 	/**
-	 * Returns webhookData if a webhook with matches is currently registered
-	 *
-	 * @param {(string | undefined)} webhookId
+	 * Checks if a webhook for the given method and path exists and executes the workflow.
 	 */
-	get(httpMethod: WebhookHttpMethod, path: string, webhookId?: string): IWebhookData | undefined {
-		const webhookKey = this.getWebhookKey(httpMethod, path, webhookId);
-		if (this.webhookUrls[webhookKey] === undefined) {
-			return undefined;
+	async executeWebhook(
+		request: WebhookRequest,
+		response: Response,
+	): Promise<IResponseCallbackData> {
+		const httpMethod = request.method;
+		const path = request.params.path;
+
+		this.logger.debug(`Received webhook "${httpMethod}" for path "${path}"`);
+
+		// Reset request parameters
+		request.params = {} as WebhookRequest['params'];
+
+		const webhook = await this.findWebhook(path, httpMethod);
+
+		if (webhook.isDynamic) {
+			const pathElements = path.split('/').slice(1);
+
+			// extracting params from path
+			// @ts-ignore
+			webhook.webhookPath.split('/').forEach((ele, index) => {
+				if (ele.startsWith(':')) {
+					// write params to req.params
+					// @ts-ignore
+					request.params[ele.slice(1)] = pathElements[index];
+				}
+			});
 		}
 
-		let webhook: IWebhookData | undefined;
-		let maxMatches = 0;
-		const pathElementsSet = new Set(path.split('/'));
-		// check if static elements match in path
-		// if more results have been returned choose the one with the most static-route matches
-		this.webhookUrls[webhookKey].forEach((dynamicWebhook) => {
-			const staticElements = dynamicWebhook.path.split('/').filter((ele) => !ele.startsWith(':'));
-			const allStaticExist = staticElements.every((staticEle) => pathElementsSet.has(staticEle));
-
-			if (allStaticExist && staticElements.length > maxMatches) {
-				maxMatches = staticElements.length;
-				webhook = dynamicWebhook;
-			}
-			// handle routes with no static elements
-			else if (staticElements.length === 0 && !webhook) {
-				webhook = dynamicWebhook;
-			}
+		const workflowData = await this.workflowRepository.findOne({
+			where: { id: webhook.workflowId },
+			relations: ['shared', 'shared.user'],
 		});
 
-		return webhook;
-	}
-
-	/**
-	 * Gets all request methods associated with a single webhook
-	 */
-	getWebhookMethods(path: string): string[] {
-		const methods: string[] = [];
-
-		Object.keys(this.webhookUrls)
-			.filter((key) => key.includes(path))
-			// eslint-disable-next-line array-callback-return
-			.map((key) => {
-				methods.push(key.split('|')[0]);
-			});
+		if (workflowData === null) {
+			throw new NotFoundError(`Could not find workflow with id "${webhook.workflowId}"`);
+		}
 
-		return methods;
-	}
+		const workflow = new Workflow({
+			id: webhook.workflowId,
+			name: workflowData.name,
+			nodes: workflowData.nodes,
+			connections: workflowData.connections,
+			active: workflowData.active,
+			nodeTypes: this.nodeTypes,
+			staticData: workflowData.staticData,
+			settings: workflowData.settings,
+		});
 
-	/**
-	 * Returns the ids of all the workflows which have active webhooks
-	 *
-	 */
-	getWorkflowIds(): string[] {
-		return Object.keys(this.workflowWebhooks);
-	}
+		const additionalData = await WorkflowExecuteAdditionalData.getBase(
+			workflowData.shared[0].user.id,
+		);
 
-	/**
-	 * Returns key to uniquely identify a webhook
-	 *
-	 * @param {(string | undefined)} webhookId
-	 */
-	getWebhookKey(httpMethod: WebhookHttpMethod, path: string, webhookId?: string): string {
-		if (webhookId) {
-			if (path.startsWith(webhookId)) {
-				const cutFromIndex = path.indexOf('/') + 1;
-				// eslint-disable-next-line no-param-reassign
-				path = path.slice(cutFromIndex);
-			}
-			return `${httpMethod}|${webhookId}|${path.split('/').length}`;
-		}
-		return `${httpMethod}|${path}`;
-	}
+		const webhookData = NodeHelpers.getNodeWebhooks(
+			workflow,
+			workflow.getNode(webhook.node) as INode,
+			additionalData,
+		).find((w) => w.httpMethod === httpMethod && w.path === webhook.webhookPath) as IWebhookData;
 
-	/**
-	 * Removes all webhooks of a workflow
-	 *
-	 */
-	async removeWorkflow(workflow: Workflow): Promise<boolean> {
-		// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-		const workflowId = workflow.id!.toString();
+		// Get the node which has the webhook defined to know where to start from and to
+		// get additional data
+		const workflowStartNode = workflow.getNode(webhookData.node);
 
-		if (this.workflowWebhooks[workflowId] === undefined) {
-			// If it did not exist then there is nothing to remove
-			return false;
+		if (workflowStartNode === null) {
+			throw new NotFoundError('Could not find node to process webhook.');
 		}
 
-		const webhooks = this.workflowWebhooks[workflowId];
-
-		const mode = 'internal';
-
-		// Go through all the registered webhooks of the workflow and remove them
-		// eslint-disable-next-line no-restricted-syntax
-		for (const webhookData of webhooks) {
-			// eslint-disable-next-line no-await-in-loop
-			await workflow.runWebhookMethod(
-				'delete',
+		return await new Promise((resolve, reject) => {
+			const executionMode = 'webhook';
+			void WebhookHelpers.executeWebhook(
+				workflow,
 				webhookData,
-				NodeExecuteFunctions,
-				mode,
-				'update',
-				this.testWebhooks,
+				workflowData,
+				workflowStartNode,
+				executionMode,
+				undefined,
+				undefined,
+				undefined,
+				request,
+				response,
+				async (error: Error | null, data: object) => {
+					if (error !== null) {
+						return reject(error);
+					}
+					// Save static data if it changed
+					await this.workflowStaticDataService.saveStaticData(workflow);
+					resolve(data);
+				},
 			);
+		});
+	}
 
-			delete this.webhookUrls[
-				this.getWebhookKey(webhookData.httpMethod, webhookData.path, webhookData.webhookId)
-			];
+	private async findWebhook(path: string, httpMethod: IHttpRequestMethods) {
+		// Remove trailing slash
+		if (path.endsWith('/')) {
+			path = path.slice(0, -1);
 		}
 
-		// Remove also the workflow-webhook entry
-		delete this.workflowWebhooks[workflowId];
-
-		return true;
-	}
-
-	/**
-	 * Removes all the webhooks of the given workflows
-	 */
-	async removeAll(workflows: Workflow[]): Promise<void> {
-		const removePromises = [];
-		// eslint-disable-next-line no-restricted-syntax
-		for (const workflow of workflows) {
-			removePromises.push(this.removeWorkflow(workflow));
+		const webhook = await this.webhookService.findWebhook(httpMethod, path);
+		if (webhook === null) {
+			throw new WebhookNotFoundError({ path, httpMethod }, { hint: 'production' });
 		}
 
-		await Promise.all(removePromises);
+		return webhook;
 	}
 }
diff --git a/packages/cli/src/ActiveWorkflowManager.ts b/packages/cli/src/ActiveWorkflowManager.ts
new file mode 100644
index 0000000000000..f0d1f2fbff07a
--- /dev/null
+++ b/packages/cli/src/ActiveWorkflowManager.ts
@@ -0,0 +1,818 @@
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+
+import { Service } from 'typedi';
+import { ActiveWorkflows, NodeExecuteFunctions } from 'n8n-core';
+
+import type {
+	ExecutionError,
+	IDeferredPromise,
+	IExecuteResponsePromiseData,
+	IGetExecutePollFunctions,
+	IGetExecuteTriggerFunctions,
+	INode,
+	INodeExecutionData,
+	IRun,
+	IWorkflowBase,
+	IWorkflowExecuteAdditionalData,
+	WorkflowActivateMode,
+	WorkflowExecuteMode,
+	INodeType,
+} from 'n8n-workflow';
+import {
+	Workflow,
+	WorkflowActivationError,
+	ErrorReporterProxy as ErrorReporter,
+	WebhookPathTakenError,
+	ApplicationError,
+} from 'n8n-workflow';
+
+import type { IWorkflowDb } from '@/Interfaces';
+import * as WebhookHelpers from '@/WebhookHelpers';
+import * as WorkflowExecuteAdditionalData from '@/WorkflowExecuteAdditionalData';
+
+import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
+import { ActiveExecutions } from '@/ActiveExecutions';
+import { ExecutionService } from './executions/execution.service';
+import {
+	STARTING_NODES,
+	WORKFLOW_REACTIVATE_INITIAL_TIMEOUT,
+	WORKFLOW_REACTIVATE_MAX_TIMEOUT,
+} from '@/constants';
+import { NodeTypes } from '@/NodeTypes';
+import { ExternalHooks } from '@/ExternalHooks';
+import { WebhookService } from './services/webhook.service';
+import { Logger } from './Logger';
+import { WorkflowRepository } from '@db/repositories/workflow.repository';
+import { OrchestrationService } from '@/services/orchestration.service';
+import { ActivationErrorsService } from '@/ActivationErrors.service';
+import { ActiveWorkflowsService } from '@/services/activeWorkflows.service';
+import { WorkflowExecutionService } from '@/workflows/workflowExecution.service';
+import { WorkflowStaticDataService } from '@/workflows/workflowStaticData.service';
+import { OnShutdown } from '@/decorators/OnShutdown';
+
+interface QueuedActivation {
+	activationMode: WorkflowActivateMode;
+	lastTimeout: number;
+	timeout: NodeJS.Timeout;
+	workflowData: IWorkflowDb;
+}
+
+@Service()
+export class ActiveWorkflowManager {
+	private queuedActivations: { [workflowId: string]: QueuedActivation } = {};
+
+	constructor(
+		private readonly logger: Logger,
+		private readonly activeWorkflows: ActiveWorkflows,
+		private readonly activeExecutions: ActiveExecutions,
+		private readonly externalHooks: ExternalHooks,
+		private readonly nodeTypes: NodeTypes,
+		private readonly webhookService: WebhookService,
+		private readonly workflowRepository: WorkflowRepository,
+		private readonly orchestrationService: OrchestrationService,
+		private readonly activationErrorsService: ActivationErrorsService,
+		private readonly executionService: ExecutionService,
+		private readonly workflowStaticDataService: WorkflowStaticDataService,
+		private readonly activeWorkflowsService: ActiveWorkflowsService,
+		private readonly workflowExecutionService: WorkflowExecutionService,
+	) {}
+
+	async init() {
+		await this.orchestrationService.init();
+
+		await this.addActiveWorkflows('init');
+
+		await this.externalHooks.run('activeWorkflows.initialized', []);
+		await this.webhookService.populateCache();
+	}
+
+	async getAllWorkflowActivationErrors() {
+		return await this.activationErrorsService.getAll();
+	}
+
+	/**
+	 * Removes all the currently active workflows from memory.
+	 */
+	async removeAll() {
+		let activeWorkflowIds: string[] = [];
+		this.logger.verbose('Call to remove all active workflows received (removeAll)');
+
+		activeWorkflowIds.push(...this.activeWorkflows.allActiveWorkflows());
+
+		const activeWorkflows = await this.activeWorkflowsService.getAllActiveIdsInStorage();
+		activeWorkflowIds = [...activeWorkflowIds, ...activeWorkflows];
+		// Make sure IDs are unique
+		activeWorkflowIds = Array.from(new Set(activeWorkflowIds));
+
+		const removePromises = [];
+		for (const workflowId of activeWorkflowIds) {
+			removePromises.push(this.remove(workflowId));
+		}
+
+		await Promise.all(removePromises);
+	}
+
+	/**
+	 * Returns the ids of the currently active workflows from memory.
+	 */
+	allActiveInMemory() {
+		return this.activeWorkflows.allActiveWorkflows();
+	}
+
+	/**
+	 * Returns if the workflow is stored as `active`.
+	 *
+	 * @important Do not confuse with `ActiveWorkflows.isActive()`,
+	 * which checks if the workflow is active in memory.
+	 */
+	async isActive(workflowId: string) {
+		const workflow = await this.workflowRepository.findOne({
+			select: ['active'],
+			where: { id: workflowId },
+		});
+
+		return !!workflow?.active;
+	}
+
+	/**
+	 * Register workflow-defined webhooks in the `workflow_entity` table.
+	 */
+	async addWebhooks(
+		workflow: Workflow,
+		additionalData: IWorkflowExecuteAdditionalData,
+		mode: WorkflowExecuteMode,
+		activation: WorkflowActivateMode,
+	) {
+		const webhooks = WebhookHelpers.getWorkflowWebhooks(workflow, additionalData, undefined, true);
+		let path = '';
+
+		if (webhooks.length === 0) return;
+
+		this.logger.debug(`Adding webhooks for workflow "${workflow.name}" (ID ${workflow.id})`);
+
+		for (const webhookData of webhooks) {
+			const node = workflow.getNode(webhookData.node) as INode;
+			node.name = webhookData.node;
+
+			path = webhookData.path;
+
+			const webhook = this.webhookService.createWebhook({
+				workflowId: webhookData.workflowId,
+				webhookPath: path,
+				node: node.name,
+				method: webhookData.httpMethod,
+			});
+
+			if (webhook.webhookPath.startsWith('/')) {
+				webhook.webhookPath = webhook.webhookPath.slice(1);
+			}
+			if (webhook.webhookPath.endsWith('/')) {
+				webhook.webhookPath = webhook.webhookPath.slice(0, -1);
+			}
+
+			if ((path.startsWith(':') || path.includes('/:')) && node.webhookId) {
+				webhook.webhookId = node.webhookId;
+				webhook.pathLength = webhook.webhookPath.split('/').length;
+			}
+
+			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,
+				);
+			} catch (error) {
+				if (activation === 'init' && error.name === 'QueryFailedError') {
+					// n8n does not remove the registered webhooks on exit.
+					// This means that further initializations will always fail
+					// when inserting to database. This is why we ignore this error
+					// as it's expected to happen.
+
+					continue;
+				}
+
+				try {
+					await this.clearWebhooks(workflow.id);
+				} catch (error1) {
+					ErrorReporter.error(error1);
+					this.logger.error(
+						`Could not remove webhooks of workflow "${workflow.id}" because of error: "${error1.message}"`,
+					);
+				}
+
+				// if it's a workflow from the insert
+				// TODO check if there is standard error code for duplicate key violation that works
+				// with all databases
+				if (error instanceof Error && error.name === 'QueryFailedError') {
+					error = new WebhookPathTakenError(webhook.node, error);
+				} else if (error.detail) {
+					// it's a error running the webhook methods (checkExists, create)
+					// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+					error.message = error.detail;
+				}
+
+				throw error;
+			}
+		}
+		await this.webhookService.populateCache();
+
+		await this.workflowStaticDataService.saveStaticData(workflow);
+	}
+
+	/**
+	 * Remove all webhooks of a workflow from the database, and
+	 * deregister those webhooks from external services.
+	 */
+	async clearWebhooks(workflowId: string) {
+		const workflowData = await this.workflowRepository.findOne({
+			where: { id: workflowId },
+			relations: ['shared', 'shared.user'],
+		});
+
+		if (workflowData === null) {
+			throw new ApplicationError('Could not find workflow', { extra: { workflowId } });
+		}
+
+		const workflow = new Workflow({
+			id: workflowId,
+			name: workflowData.name,
+			nodes: workflowData.nodes,
+			connections: workflowData.connections,
+			active: workflowData.active,
+			nodeTypes: this.nodeTypes,
+			staticData: workflowData.staticData,
+			settings: workflowData.settings,
+		});
+
+		const mode = 'internal';
+
+		const additionalData = await WorkflowExecuteAdditionalData.getBase(
+			workflowData.shared[0].user.id,
+		);
+
+		const webhooks = WebhookHelpers.getWorkflowWebhooks(workflow, additionalData, undefined, true);
+
+		for (const webhookData of webhooks) {
+			await workflow.deleteWebhook(webhookData, NodeExecuteFunctions, mode, 'update');
+		}
+
+		await this.workflowStaticDataService.saveStaticData(workflow);
+
+		await this.webhookService.deleteWorkflowWebhooks(workflowId);
+	}
+
+	/**
+	 * Return poll function which gets the global functions from n8n-core
+	 * and overwrites the emit to be able to start it in subprocess
+	 */
+	getExecutePollFunctions(
+		workflowData: IWorkflowDb,
+		additionalData: IWorkflowExecuteAdditionalData,
+		mode: WorkflowExecuteMode,
+		activation: WorkflowActivateMode,
+	): IGetExecutePollFunctions {
+		return (workflow: Workflow, node: INode) => {
+			const returnFunctions = NodeExecuteFunctions.getExecutePollFunctions(
+				workflow,
+				node,
+				additionalData,
+				mode,
+				activation,
+			);
+			returnFunctions.__emit = (
+				data: INodeExecutionData[][],
+				responsePromise?: IDeferredPromise<IExecuteResponsePromiseData>,
+				donePromise?: IDeferredPromise<IRun | undefined>,
+			): void => {
+				this.logger.debug(`Received event to trigger execution for workflow "${workflow.name}"`);
+				void this.workflowStaticDataService.saveStaticData(workflow);
+				const executePromise = this.workflowExecutionService.runWorkflow(
+					workflowData,
+					node,
+					data,
+					additionalData,
+					mode,
+					responsePromise,
+				);
+
+				if (donePromise) {
+					void executePromise.then((executionId) => {
+						this.activeExecutions
+							.getPostExecutePromise(executionId)
+							.then(donePromise.resolve)
+							.catch(donePromise.reject);
+					});
+				} else {
+					void executePromise.catch((error: Error) => this.logger.error(error.message, { error }));
+				}
+			};
+
+			returnFunctions.__emitError = (error: ExecutionError): void => {
+				void this.executionService
+					.createErrorExecution(error, node, workflowData, workflow, mode)
+					.then(() => {
+						this.executeErrorWorkflow(error, workflowData, mode);
+					});
+			};
+			return returnFunctions;
+		};
+	}
+
+	/**
+	 * Return trigger function which gets the global functions from n8n-core
+	 * and overwrites the emit to be able to start it in subprocess
+	 */
+	getExecuteTriggerFunctions(
+		workflowData: IWorkflowDb,
+		additionalData: IWorkflowExecuteAdditionalData,
+		mode: WorkflowExecuteMode,
+		activation: WorkflowActivateMode,
+	): IGetExecuteTriggerFunctions {
+		return (workflow: Workflow, node: INode) => {
+			const returnFunctions = NodeExecuteFunctions.getExecuteTriggerFunctions(
+				workflow,
+				node,
+				additionalData,
+				mode,
+				activation,
+			);
+			returnFunctions.emit = (
+				data: INodeExecutionData[][],
+				responsePromise?: IDeferredPromise<IExecuteResponsePromiseData>,
+				donePromise?: IDeferredPromise<IRun | undefined>,
+			): void => {
+				this.logger.debug(`Received trigger for workflow "${workflow.name}"`);
+				void this.workflowStaticDataService.saveStaticData(workflow);
+
+				const executePromise = this.workflowExecutionService.runWorkflow(
+					workflowData,
+					node,
+					data,
+					additionalData,
+					mode,
+					responsePromise,
+				);
+
+				if (donePromise) {
+					void executePromise.then((executionId) => {
+						this.activeExecutions
+							.getPostExecutePromise(executionId)
+							.then(donePromise.resolve)
+							.catch(donePromise.reject);
+					});
+				} else {
+					executePromise.catch((error: Error) => this.logger.error(error.message, { error }));
+				}
+			};
+			returnFunctions.emitError = (error: Error): void => {
+				this.logger.info(
+					`The trigger node "${node.name}" of workflow "${workflowData.name}" failed with the error: "${error.message}". Will try to reactivate.`,
+					{
+						nodeName: node.name,
+						workflowId: workflowData.id,
+						workflowName: workflowData.name,
+					},
+				);
+
+				// Remove the workflow as "active"
+
+				void this.activeWorkflows.remove(workflowData.id);
+
+				void this.activationErrorsService.register(workflowData.id, error.message);
+
+				// Run Error Workflow if defined
+				const activationError = new WorkflowActivationError(
+					`There was a problem with the trigger node "${node.name}", for that reason did the workflow had to be deactivated`,
+					{ cause: error, node },
+				);
+				this.executeErrorWorkflow(activationError, workflowData, mode);
+
+				this.addQueuedWorkflowActivation(activation, workflowData as WorkflowEntity);
+			};
+			return returnFunctions;
+		};
+	}
+
+	executeErrorWorkflow(
+		error: ExecutionError,
+		workflowData: IWorkflowBase,
+		mode: WorkflowExecuteMode,
+	) {
+		const fullRunData: IRun = {
+			data: {
+				resultData: {
+					error,
+					runData: {},
+				},
+			},
+			finished: false,
+			mode,
+			startedAt: new Date(),
+			stoppedAt: new Date(),
+			status: 'running',
+		};
+
+		WorkflowExecuteAdditionalData.executeErrorWorkflow(workflowData, fullRunData, mode);
+	}
+
+	/**
+	 * Register as active in memory all workflows stored as `active`,
+	 * only on instance init or (in multi-main setup) on leadership change.
+	 */
+	async addActiveWorkflows(activationMode: 'init' | 'leadershipChange') {
+		const dbWorkflows = await this.workflowRepository.getAllActive();
+
+		if (dbWorkflows.length === 0) return;
+
+		if (this.orchestrationService.isLeader) {
+			this.logger.info(' ================================');
+			this.logger.info('   Start Active Workflows:');
+			this.logger.info(' ================================');
+		}
+
+		for (const dbWorkflow of dbWorkflows) {
+			try {
+				const wasActivated = await this.add(dbWorkflow.id, activationMode, dbWorkflow, {
+					shouldPublish: false,
+				});
+
+				if (wasActivated) {
+					this.logger.verbose(`Successfully started workflow ${dbWorkflow.display()}`, {
+						workflowName: dbWorkflow.name,
+						workflowId: dbWorkflow.id,
+					});
+					this.logger.info('     => Started');
+				}
+			} catch (error) {
+				ErrorReporter.error(error);
+				this.logger.info(
+					'     => ERROR: Workflow could not be activated on first try, keep on trying if not an auth issue',
+				);
+
+				this.logger.info(`               ${error.message}`);
+				this.logger.error(
+					`Issue on initial workflow activation try of ${dbWorkflow.display()} (startup)`,
+					{
+						workflowName: dbWorkflow.name,
+						workflowId: dbWorkflow.id,
+					},
+				);
+
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+				this.executeErrorWorkflow(error, dbWorkflow, 'internal');
+
+				// do not keep trying to activate on authorization error
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-call
+				if (error.message.includes('Authorization')) continue;
+
+				this.addQueuedWorkflowActivation('init', dbWorkflow);
+			}
+		}
+
+		this.logger.verbose('Finished activating workflows (startup)');
+	}
+
+	async clearAllActivationErrors() {
+		this.logger.debug('Clearing all activation errors');
+
+		await this.activationErrorsService.clearAll();
+	}
+
+	async addAllTriggerAndPollerBasedWorkflows() {
+		this.logger.debug('Adding all trigger- and poller-based workflows');
+
+		await this.addActiveWorkflows('leadershipChange');
+	}
+
+	@OnShutdown()
+	async removeAllTriggerAndPollerBasedWorkflows() {
+		this.logger.debug('Removing all trigger- and poller-based workflows');
+
+		await this.activeWorkflows.removeAllTriggerAndPollerBasedWorkflows();
+	}
+
+	/**
+	 * Register a workflow as active.
+	 *
+	 * An activatable workflow may be webhook-, trigger-, or poller-based:
+	 *
+	 * - A `webhook` is an HTTP-based node that can start a workflow when called
+	 * by a third-party service.
+	 * - A `poller` is an HTTP-based node that can start a workflow when detecting
+	 * a change while regularly checking a third-party service.
+	 * - A `trigger` is any non-HTTP-based node that can start a workflow, e.g. a
+	 * time-based node like Schedule Trigger or a message-queue-based node.
+	 *
+	 * Note that despite the name, most "trigger" nodes are actually webhook-based
+	 * and so qualify as `webhook`, e.g. Stripe Trigger.
+	 *
+	 * Triggers and pollers are registered as active in memory at `ActiveWorkflows`,
+	 * but webhooks are registered by being entered in the `webhook_entity` table,
+	 * since webhooks do not require continuous execution.
+	 */
+	async add(
+		workflowId: string,
+		activationMode: WorkflowActivateMode,
+		existingWorkflow?: WorkflowEntity,
+		{ shouldPublish } = { shouldPublish: true },
+	) {
+		if (this.orchestrationService.isMultiMainSetupEnabled && shouldPublish) {
+			await this.orchestrationService.publish('add-webhooks-triggers-and-pollers', {
+				workflowId,
+			});
+
+			return;
+		}
+
+		let workflow: Workflow;
+
+		const shouldAddWebhooks = this.orchestrationService.shouldAddWebhooks(activationMode);
+		const shouldAddTriggersAndPollers = this.orchestrationService.shouldAddTriggersAndPollers();
+
+		const shouldDisplayActivationMessage =
+			(shouldAddWebhooks || shouldAddTriggersAndPollers) &&
+			['init', 'leadershipChange'].includes(activationMode);
+
+		try {
+			const dbWorkflow = existingWorkflow ?? (await this.workflowRepository.findById(workflowId));
+
+			if (!dbWorkflow) {
+				throw new WorkflowActivationError(`Failed to find workflow with ID "${workflowId}"`);
+			}
+
+			if (shouldDisplayActivationMessage) {
+				this.logger.info(`   - ${dbWorkflow.display()}`);
+				this.logger.debug(`Initializing active workflow ${dbWorkflow.display()} (startup)`, {
+					workflowName: dbWorkflow.name,
+					workflowId: dbWorkflow.id,
+				});
+			}
+
+			workflow = new Workflow({
+				id: dbWorkflow.id,
+				name: dbWorkflow.name,
+				nodes: dbWorkflow.nodes,
+				connections: dbWorkflow.connections,
+				active: dbWorkflow.active,
+				nodeTypes: this.nodeTypes,
+				staticData: dbWorkflow.staticData,
+				settings: dbWorkflow.settings,
+			});
+
+			const canBeActivated = workflow.checkIfWorkflowCanBeActivated(STARTING_NODES);
+
+			if (!canBeActivated) {
+				throw new WorkflowActivationError(
+					`Workflow ${dbWorkflow.display()} has no node to start the workflow - at least one trigger, poller or webhook node is required`,
+				);
+			}
+
+			const sharing = dbWorkflow.shared.find((shared) => shared.role === 'workflow:owner');
+
+			if (!sharing) {
+				throw new WorkflowActivationError(`Workflow ${dbWorkflow.display()} has no owner`);
+			}
+
+			const additionalData = await WorkflowExecuteAdditionalData.getBase(sharing.user.id);
+
+			if (shouldAddWebhooks) {
+				await this.addWebhooks(workflow, additionalData, 'trigger', activationMode);
+			}
+
+			if (shouldAddTriggersAndPollers) {
+				await this.addTriggersAndPollers(dbWorkflow, workflow, {
+					activationMode,
+					executionMode: 'trigger',
+					additionalData,
+				});
+			}
+
+			// Workflow got now successfully activated so make sure nothing is left in the queue
+			this.removeQueuedWorkflowActivation(workflowId);
+
+			await this.activationErrorsService.deregister(workflowId);
+
+			const triggerCount = this.countTriggers(workflow, additionalData);
+			await this.workflowRepository.updateWorkflowTriggerCount(workflow.id, triggerCount);
+		} catch (e) {
+			const error = e instanceof Error ? e : new Error(`${e}`);
+			await this.activationErrorsService.register(workflowId, error.message);
+
+			throw e;
+		}
+
+		// If for example webhooks get created it sometimes has to save the
+		// id of them in the static data. So make sure that data gets persisted.
+		await this.workflowStaticDataService.saveStaticData(workflow);
+
+		return shouldDisplayActivationMessage;
+	}
+
+	/**
+	 * Count all triggers in the workflow, excluding Manual Trigger.
+	 */
+	private countTriggers(workflow: Workflow, additionalData: IWorkflowExecuteAdditionalData) {
+		const triggerFilter = (nodeType: INodeType) =>
+			!!nodeType.trigger && !nodeType.description.name.includes('manualTrigger');
+
+		return (
+			workflow.queryNodes(triggerFilter).length +
+			workflow.getPollNodes().length +
+			WebhookHelpers.getWorkflowWebhooks(workflow, additionalData, undefined, true).length
+		);
+	}
+
+	/**
+	 * Add a workflow to the activation queue.
+	 * Meaning it will keep on trying to activate it in regular
+	 * amounts indefinitely.
+	 */
+	private addQueuedWorkflowActivation(
+		activationMode: WorkflowActivateMode,
+		workflowData: WorkflowEntity,
+	) {
+		const workflowId = workflowData.id;
+		const workflowName = workflowData.name;
+
+		const retryFunction = async () => {
+			this.logger.info(`Try to activate workflow "${workflowName}" (${workflowId})`, {
+				workflowId,
+				workflowName,
+			});
+			try {
+				await this.add(workflowId, activationMode, workflowData);
+			} catch (error) {
+				ErrorReporter.error(error);
+				let lastTimeout = this.queuedActivations[workflowId].lastTimeout;
+				if (lastTimeout < WORKFLOW_REACTIVATE_MAX_TIMEOUT) {
+					lastTimeout = Math.min(lastTimeout * 2, WORKFLOW_REACTIVATE_MAX_TIMEOUT);
+				}
+
+				this.logger.info(
+					` -> Activation of workflow "${workflowName}" (${workflowId}) did fail with error: "${
+						error.message as string
+					}" | retry in ${Math.floor(lastTimeout / 1000)} seconds`,
+					{
+						workflowId,
+						workflowName,
+					},
+				);
+
+				this.queuedActivations[workflowId].lastTimeout = lastTimeout;
+				this.queuedActivations[workflowId].timeout = setTimeout(retryFunction, lastTimeout);
+				return;
+			}
+			this.logger.info(
+				` -> Activation of workflow "${workflowName}" (${workflowId}) was successful!`,
+				{
+					workflowId,
+					workflowName,
+				},
+			);
+		};
+
+		// Just to be sure that there is not chance that for any reason
+		// multiple run in parallel
+		this.removeQueuedWorkflowActivation(workflowId);
+
+		this.queuedActivations[workflowId] = {
+			activationMode,
+			lastTimeout: WORKFLOW_REACTIVATE_INITIAL_TIMEOUT,
+			timeout: setTimeout(retryFunction, WORKFLOW_REACTIVATE_INITIAL_TIMEOUT),
+			workflowData,
+		};
+	}
+
+	/**
+	 * Remove a workflow from the activation queue
+	 */
+	private removeQueuedWorkflowActivation(workflowId: string) {
+		if (this.queuedActivations[workflowId]) {
+			clearTimeout(this.queuedActivations[workflowId].timeout);
+			delete this.queuedActivations[workflowId];
+		}
+	}
+
+	/**
+	 * Remove all workflows from the activation queue
+	 */
+	removeAllQueuedWorkflowActivations() {
+		for (const workflowId in this.queuedActivations) {
+			this.removeQueuedWorkflowActivation(workflowId);
+		}
+	}
+
+	/**
+	 * Makes a workflow inactive
+	 *
+	 * @param {string} workflowId The id of the workflow to deactivate
+	 */
+	// TODO: this should happen in a transaction
+	async remove(workflowId: string) {
+		if (this.orchestrationService.isMultiMainSetupEnabled) {
+			try {
+				await this.clearWebhooks(workflowId);
+			} catch (error) {
+				ErrorReporter.error(error);
+				this.logger.error(
+					`Could not remove webhooks of workflow "${workflowId}" because of error: "${error.message}"`,
+				);
+			}
+
+			await this.orchestrationService.publish('remove-triggers-and-pollers', { workflowId });
+
+			return;
+		}
+
+		try {
+			await this.clearWebhooks(workflowId);
+		} catch (error) {
+			ErrorReporter.error(error);
+			this.logger.error(
+				`Could not remove webhooks of workflow "${workflowId}" because of error: "${error.message}"`,
+			);
+		}
+
+		await this.activationErrorsService.deregister(workflowId);
+
+		if (this.queuedActivations[workflowId] !== undefined) {
+			this.removeQueuedWorkflowActivation(workflowId);
+		}
+
+		// if it's active in memory then it's a trigger
+		// so remove from list of actives workflows
+		await this.removeWorkflowTriggersAndPollers(workflowId);
+	}
+
+	/**
+	 * Stop running active triggers and pollers for a workflow.
+	 */
+	async removeWorkflowTriggersAndPollers(workflowId: string) {
+		if (!this.activeWorkflows.isActive(workflowId)) return;
+
+		const wasRemoved = await this.activeWorkflows.remove(workflowId);
+
+		if (wasRemoved) {
+			this.logger.warn(`Removed triggers and pollers for workflow "${workflowId}"`, {
+				workflowId,
+			});
+		}
+	}
+
+	/**
+	 * Register as active in memory a trigger- or poller-based workflow.
+	 */
+	async addTriggersAndPollers(
+		dbWorkflow: WorkflowEntity,
+		workflow: Workflow,
+		{
+			activationMode,
+			executionMode,
+			additionalData,
+		}: {
+			activationMode: WorkflowActivateMode;
+			executionMode: WorkflowExecuteMode;
+			additionalData: IWorkflowExecuteAdditionalData;
+		},
+	) {
+		const getTriggerFunctions = this.getExecuteTriggerFunctions(
+			dbWorkflow,
+			additionalData,
+			executionMode,
+			activationMode,
+		);
+
+		const getPollFunctions = this.getExecutePollFunctions(
+			dbWorkflow,
+			additionalData,
+			executionMode,
+			activationMode,
+		);
+
+		if (workflow.getTriggerNodes().length !== 0 || workflow.getPollNodes().length !== 0) {
+			this.logger.debug(`Adding triggers and pollers for workflow ${dbWorkflow.display()}`);
+
+			await this.activeWorkflows.add(
+				workflow.id,
+				workflow,
+				additionalData,
+				executionMode,
+				activationMode,
+				getTriggerFunctions,
+				getPollFunctions,
+			);
+
+			this.logger.verbose(`Workflow ${dbWorkflow.display()} activated`, {
+				workflowId: dbWorkflow.id,
+				workflowName: dbWorkflow.name,
+			});
+		}
+	}
+
+	async removeActivationError(workflowId: string) {
+		await this.activationErrorsService.deregister(workflowId);
+	}
+}
diff --git a/packages/cli/src/ActiveWorkflowRunner.ts b/packages/cli/src/ActiveWorkflowRunner.ts
deleted file mode 100644
index 632318c3e3536..0000000000000
--- a/packages/cli/src/ActiveWorkflowRunner.ts
+++ /dev/null
@@ -1,1039 +0,0 @@
-/* eslint-disable prefer-spread */
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
-/* eslint-disable no-param-reassign */
-/* eslint-disable no-await-in-loop */
-/* eslint-disable no-restricted-syntax */
-/* eslint-disable @typescript-eslint/no-floating-promises */
-/* eslint-disable @typescript-eslint/no-shadow */
-/* eslint-disable @typescript-eslint/no-unsafe-call */
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
-
-import { Service } from 'typedi';
-import { ActiveWorkflows, NodeExecuteFunctions } from 'n8n-core';
-
-import type {
-	ExecutionError,
-	IDeferredPromise,
-	IExecuteData,
-	IExecuteResponsePromiseData,
-	IGetExecutePollFunctions,
-	IGetExecuteTriggerFunctions,
-	INode,
-	INodeExecutionData,
-	IRun,
-	IRunExecutionData,
-	IWorkflowBase,
-	IWorkflowExecuteAdditionalData as IWorkflowExecuteAdditionalDataWorkflow,
-	WebhookHttpMethod,
-	WorkflowActivateMode,
-	WorkflowExecuteMode,
-	INodeType,
-} from 'n8n-workflow';
-import {
-	NodeHelpers,
-	Workflow,
-	WorkflowActivationError,
-	LoggerProxy as Logger,
-	ErrorReporterProxy as ErrorReporter,
-} from 'n8n-workflow';
-
-import type express from 'express';
-
-import * as Db from '@/Db';
-import type {
-	IActivationError,
-	IQueuedWorkflowActivations,
-	IResponseCallbackData,
-	IWorkflowDb,
-	IWorkflowExecutionDataProcess,
-} from '@/Interfaces';
-import * as ResponseHelper from '@/ResponseHelper';
-import * as WebhookHelpers from '@/WebhookHelpers';
-import * as WorkflowHelpers from '@/WorkflowHelpers';
-import * as WorkflowExecuteAdditionalData from '@/WorkflowExecuteAdditionalData';
-
-import config from '@/config';
-import type { User } from '@db/entities/User';
-import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
-import type { WebhookEntity } from '@db/entities/WebhookEntity';
-import { ActiveExecutions } from '@/ActiveExecutions';
-import { createErrorExecution } from '@/GenericHelpers';
-import { WORKFLOW_REACTIVATE_INITIAL_TIMEOUT, WORKFLOW_REACTIVATE_MAX_TIMEOUT } from '@/constants';
-import { NodeTypes } from '@/NodeTypes';
-import { WorkflowRunner } from '@/WorkflowRunner';
-import { ExternalHooks } from '@/ExternalHooks';
-import { whereClause } from './UserManagement/UserManagementHelper';
-import { WorkflowsService } from './workflows/workflows.services';
-import { START_NODES } from './constants';
-import UrlPattern from 'url-pattern';
-
-const WEBHOOK_PROD_UNREGISTERED_HINT =
-	"The workflow must be active for a production URL to run successfully. You can activate the workflow using the toggle in the top-right of the editor. Note that unlike test URL calls, production URL calls aren't shown on the canvas (only in the executions list)";
-
-@Service()
-export class ActiveWorkflowRunner {
-	private activeWorkflows = new ActiveWorkflows();
-
-	private activationErrors: {
-		[key: string]: IActivationError;
-	} = {};
-
-	private queuedWorkflowActivations: {
-		[key: string]: IQueuedWorkflowActivations;
-	} = {};
-
-	constructor(
-		private activeExecutions: ActiveExecutions,
-		private externalHooks: ExternalHooks,
-		private nodeTypes: NodeTypes,
-	) {}
-
-	// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
-	async init() {
-		// Get the active workflows from database
-
-		// NOTE
-		// Here I guess we can have a flag on the workflow table like hasTrigger
-		// so instead of pulling all the active webhooks just pull the actives that have a trigger
-		const workflowsData: IWorkflowDb[] = (await Db.collections.Workflow.find({
-			where: { active: true },
-			relations: ['shared', 'shared.user', 'shared.user.globalRole', 'shared.role'],
-		})) as IWorkflowDb[];
-
-		if (!config.getEnv('endpoints.skipWebhooksDeregistrationOnShutdown')) {
-			// Do not clean up database when skip registration is done.
-			// This flag is set when n8n is running in scaled mode.
-			// Impact is minimal, but for a short while, n8n will stop accepting requests.
-			// Also, users had issues when running multiple "main process"
-			// instances if many of them start at the same time
-			// This is not officially supported but there is no reason
-			// it should not work.
-			// Clear up active workflow table
-			await Db.collections.Webhook.clear();
-		}
-
-		if (workflowsData.length !== 0) {
-			Logger.info(' ================================');
-			Logger.info('   Start Active Workflows:');
-			Logger.info(' ================================');
-
-			for (const workflowData of workflowsData) {
-				Logger.info(`   - ${workflowData.name} (ID: ${workflowData.id})`);
-				Logger.debug(`Initializing active workflow "${workflowData.name}" (startup)`, {
-					workflowName: workflowData.name,
-					workflowId: workflowData.id,
-				});
-				try {
-					await this.add(workflowData.id, 'init', workflowData);
-					Logger.verbose(`Successfully started workflow "${workflowData.name}"`, {
-						workflowName: workflowData.name,
-						workflowId: workflowData.id,
-					});
-					Logger.info('     => Started');
-				} catch (error) {
-					ErrorReporter.error(error);
-					Logger.info(
-						'     => ERROR: Workflow could not be activated on first try, keep on trying',
-					);
-					// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-					Logger.info(`               ${error.message}`);
-					Logger.error(
-						`Issue on initial workflow activation try "${workflowData.name}" (startup)`,
-						{
-							workflowName: workflowData.name,
-							workflowId: workflowData.id,
-						},
-					);
-					// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-					this.executeErrorWorkflow(error, workflowData, 'internal');
-
-					// Keep on trying to activate the workflow
-					this.addQueuedWorkflowActivation('init', workflowData);
-				}
-			}
-			Logger.verbose('Finished initializing active workflows (startup)');
-		}
-
-		await this.externalHooks.run('activeWorkflows.initialized', []);
-	}
-
-	/**
-	 * Removes all the currently active workflows
-	 */
-	async removeAll(): Promise<void> {
-		let activeWorkflowIds: string[] = [];
-		Logger.verbose('Call to remove all active workflows received (removeAll)');
-
-		activeWorkflowIds.push.apply(activeWorkflowIds, this.activeWorkflows.allActiveWorkflows());
-
-		const activeWorkflows = await this.getActiveWorkflows();
-		activeWorkflowIds = [
-			...activeWorkflowIds,
-			...activeWorkflows.map((workflow) => workflow.id.toString()),
-		];
-
-		// Make sure IDs are unique
-		activeWorkflowIds = Array.from(new Set(activeWorkflowIds));
-
-		const removePromises = [];
-		for (const workflowId of activeWorkflowIds) {
-			removePromises.push(this.remove(workflowId));
-		}
-
-		await Promise.all(removePromises);
-	}
-
-	/**
-	 * Checks if a webhook for the given method and path exists and executes the workflow.
-	 */
-	async executeWebhook(
-		httpMethod: WebhookHttpMethod,
-		path: string,
-		req: express.Request,
-		res: express.Response,
-	): Promise<IResponseCallbackData> {
-		Logger.debug(`Received webhook "${httpMethod}" for path "${path}"`);
-
-		path = path.split(/[?#]/)[0];
-
-		// Reset request parameters
-		req.params = {};
-
-		// Remove trailing slash
-		if (path.endsWith('/')) {
-			path = path.slice(0, -1);
-		}
-
-		let webhook = await Db.collections.Webhook.findOneBy({
-			webhookPath: path,
-			method: httpMethod,
-		});
-		let webhookId: string | undefined;
-
-		// check if path is dynamic
-		if (webhook === null) {
-			// check if a dynamic webhook path exists
-
-			const workflowsData = await Db.collections.Workflow.find({
-				where: { active: true },
-			});
-
-			for (const workflowData of workflowsData) {
-				const webhooks = await Db.collections.Webhook.findBy({
-					workflowId: workflowData.id,
-				});
-
-				for (const webhook of webhooks) {
-					// using this approach means that all webhooks in all workflows must have a unique httpMetod and path combined to avoid matching a request to the wrong webhook
-					// which in this case the first one that matches is selected
-					if (
-						webhook.method.toLowerCase() === httpMethod.toLowerCase() &&
-						new UrlPattern(webhook.webhookPath.split(/[?#]/)[0]).match(path)
-					) {
-						webhookId = webhook.webhookId;
-						break;
-					}
-				}
-
-				if (webhookId) break;
-			}
-
-			const pathElements = path.split('/');
-
-			const dynamicWebhooks = await Db.collections.Webhook.findBy({
-				webhookId,
-				method: httpMethod,
-				pathLength: pathElements.length,
-			});
-			if (dynamicWebhooks === undefined || dynamicWebhooks.length === 0) {
-				// The requested webhook is not registered
-				throw new ResponseHelper.NotFoundError(
-					`The requested webhook "${httpMethod} ${path}" is not registered.`,
-					WEBHOOK_PROD_UNREGISTERED_HINT,
-				);
-			}
-
-			let maxMatches = 0;
-			const pathElementsSet = new Set(pathElements);
-			// check if static elements match in path
-			// if more results have been returned choose the one with the most static-route matches
-			dynamicWebhooks.forEach((dynamicWebhook) => {
-				const staticElements = dynamicWebhook.webhookPath
-					.split('/')
-					.filter((ele) => !ele.startsWith(':'));
-				const allStaticExist = staticElements.every((staticEle) => pathElementsSet.has(staticEle));
-
-				if (allStaticExist && staticElements.length > maxMatches) {
-					maxMatches = staticElements.length;
-					webhook = dynamicWebhook;
-				}
-				// handle routes with no static elements
-				else if (staticElements.length === 0 && !webhook) {
-					webhook = dynamicWebhook;
-				}
-			});
-			if (webhook === null) {
-				throw new ResponseHelper.NotFoundError(
-					`The requested webhook "${httpMethod} ${path}" is not registered.`,
-					WEBHOOK_PROD_UNREGISTERED_HINT,
-				);
-			}
-
-			// @ts-ignore
-			// eslint-disable-next-line no-param-reassign
-			path = webhook.webhookPath;
-			// extracting params from path
-			// @ts-ignore
-			webhook.webhookPath.split('/').forEach((ele, index) => {
-				if (ele.startsWith(':')) {
-					// write params to req.params
-					req.params[ele.slice(1)] = pathElements[index];
-				}
-			});
-		}
-
-		const workflowData = await Db.collections.Workflow.findOne({
-			where: { id: webhook.workflowId },
-			relations: ['shared', 'shared.user', 'shared.user.globalRole'],
-		});
-		if (workflowData === null) {
-			throw new ResponseHelper.NotFoundError(
-				`Could not find workflow with id "${webhook.workflowId}"`,
-			);
-		}
-
-		const workflow = new Workflow({
-			id: webhook.workflowId,
-			name: workflowData.name,
-			nodes: workflowData.nodes,
-			connections: workflowData.connections,
-			active: workflowData.active,
-			nodeTypes: this.nodeTypes,
-			staticData: workflowData.staticData,
-			settings: workflowData.settings,
-		});
-
-		const additionalData = await WorkflowExecuteAdditionalData.getBase(
-			workflowData.shared[0].user.id,
-		);
-
-		const webhookData = NodeHelpers.getNodeWebhooks(
-			workflow,
-			workflow.getNode(webhook.node) as INode,
-			additionalData,
-		).filter((webhook) => {
-			return webhook.httpMethod === httpMethod && webhook.path === path;
-		})[0];
-
-		// Get the node which has the webhook defined to know where to start from and to
-		// get additional data
-		const workflowStartNode = workflow.getNode(webhookData.node);
-
-		if (workflowStartNode === null) {
-			throw new ResponseHelper.NotFoundError('Could not find node to process webhook.');
-		}
-
-		return new Promise((resolve, reject) => {
-			const executionMode = 'webhook';
-			// @ts-ignore
-			WebhookHelpers.executeWebhook(
-				workflow,
-				webhookData,
-				workflowData,
-				workflowStartNode,
-				executionMode,
-				undefined,
-				undefined,
-				undefined,
-				req,
-				res,
-				// eslint-disable-next-line consistent-return
-				(error: Error | null, data: object) => {
-					if (error !== null) {
-						return reject(error);
-					}
-					resolve(data);
-				},
-			);
-		});
-	}
-
-	/**
-	 * Gets all request methods associated with a single webhook
-	 */
-	async getWebhookMethods(path: string): Promise<string[]> {
-		const webhooks = await Db.collections.Webhook.find({
-			select: ['method'],
-			where: { webhookPath: path },
-		});
-
-		// Gather all request methods in string array
-		return webhooks.map((webhook) => webhook.method);
-	}
-
-	/**
-	 * Returns the ids of the currently active workflows
-	 */
-	async getActiveWorkflows(user?: User): Promise<IWorkflowDb[]> {
-		let activeWorkflows: WorkflowEntity[] = [];
-
-		if (!user || user.globalRole.name === 'owner') {
-			activeWorkflows = await Db.collections.Workflow.find({
-				select: ['id'],
-				where: { active: true },
-			});
-		} else {
-			const shared =
-				process.env.ONLY_OWNER_OR_ADMIN_CAN_ACCESS_WORKFLOW === 'true'
-					? await Db.collections.SharedWorkflow.find({
-							relations: ['workflow'],
-							where: whereClause({
-								user,
-								entityType: 'workflow',
-							}),
-					  })
-					: await Db.collections.SharedWorkflow.find({
-							relations: ['workflow'],
-					  });
-
-			activeWorkflows = shared.reduce<WorkflowEntity[]>((acc, cur) => {
-				if (cur.workflow.active) acc.push(cur.workflow);
-				return acc;
-			}, []);
-		}
-
-		return activeWorkflows.filter((workflow) => this.activationErrors[workflow.id] === undefined);
-	}
-
-	/**
-	 * Returns if the workflow is active
-	 *
-	 * @param {string} id The id of the workflow to check
-	 */
-	async isActive(id: string): Promise<boolean> {
-		const workflow = await Db.collections.Workflow.findOne({
-			select: ['active'],
-			where: { id },
-		});
-		return !!workflow?.active;
-	}
-
-	/**
-	 * Return error if there was a problem activating the workflow
-	 *
-	 * @param {string} id The id of the workflow to return the error of
-	 */
-	getActivationError(id: string): IActivationError | undefined {
-		if (this.activationErrors[id] === undefined) {
-			return undefined;
-		}
-
-		return this.activationErrors[id];
-	}
-
-	/**
-	 * Adds all the webhooks of the workflow
-	 */
-	async addWorkflowWebhooks(
-		workflow: Workflow,
-		additionalData: IWorkflowExecuteAdditionalDataWorkflow,
-		mode: WorkflowExecuteMode,
-		activation: WorkflowActivateMode,
-	): Promise<void> {
-		const webhooks = WebhookHelpers.getWorkflowWebhooks(workflow, additionalData, undefined, true);
-		let path = '' as string | undefined;
-
-		for (const webhookData of webhooks) {
-			const node = workflow.getNode(webhookData.node) as INode;
-			node.name = webhookData.node;
-
-			path = webhookData.path.split(/[?#]/)[0];
-
-			/*
-				Remove trailing slash
-			*/
-			if (path.endsWith('/')) {
-				path = path.slice(0, -1);
-			}
-
-			const webhook: WebhookEntity = {
-				workflowId: webhookData.workflowId,
-				// remove querystring and hashtag
-				webhookPath: path,
-				node: node.name,
-				method: webhookData.httpMethod,
-			};
-
-			if (webhook.webhookPath.startsWith('/')) {
-				webhook.webhookPath = webhook.webhookPath.slice(1);
-			}
-			if (webhook.webhookPath.endsWith('/')) {
-				webhook.webhookPath = webhook.webhookPath.slice(0, -1);
-			}
-
-			if ((path.startsWith(':') || path.includes('/:')) && node.webhookId) {
-				webhook.webhookId = node.webhookId;
-				webhook.pathLength = webhook.webhookPath.split('/').length;
-			}
-
-			try {
-				// eslint-disable-next-line no-await-in-loop
-				// TODO: this should happen in a transaction, that way we don't need to manually remove this in `catch`
-				await Db.collections.Webhook.insert(webhook);
-				const webhookExists = await workflow.runWebhookMethod(
-					'checkExists',
-					webhookData,
-					NodeExecuteFunctions,
-					mode,
-					activation,
-					false,
-				);
-				if (webhookExists !== true) {
-					// If webhook does not exist yet create it
-					await workflow.runWebhookMethod(
-						'create',
-						webhookData,
-						NodeExecuteFunctions,
-						mode,
-						activation,
-						false,
-					);
-				}
-			} catch (error) {
-				if (
-					activation === 'init' &&
-					config.getEnv('endpoints.skipWebhooksDeregistrationOnShutdown') &&
-					error.name === 'QueryFailedError'
-				) {
-					// When skipWebhooksDeregistrationOnShutdown is enabled,
-					// n8n does not remove the registered webhooks on exit.
-					// This means that further initializations will always fail
-					// when inserting to database. This is why we ignore this error
-					// as it's expected to happen.
-					// eslint-disable-next-line no-continue
-					continue;
-				}
-
-				try {
-					await this.removeWorkflowWebhooks(workflow.id as string);
-				} catch (error) {
-					ErrorReporter.error(error);
-					Logger.error(
-						// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-						`Could not remove webhooks of workflow "${workflow.id}" because of error: "${error.message}"`,
-					);
-				}
-
-				// if it's a workflow from the the insert
-				// TODO check if there is standard error code for duplicate key violation that works
-				// with all databases
-				if (error.name === 'QueryFailedError') {
-					error = new Error(
-						`The URL path that the "${webhook.node}" node uses is already taken. Please change it to something else.`,
-						{ cause: error },
-					);
-				} else if (error.detail) {
-					// it's a error running the webhook methods (checkExists, create)
-					error.message = error.detail;
-				}
-
-				throw error;
-			}
-		}
-		// Save static data!
-		await WorkflowHelpers.saveStaticData(workflow);
-	}
-
-	/**
-	 * Remove all the webhooks of the workflow
-	 *
-	 */
-	async removeWorkflowWebhooks(workflowId: string): Promise<void> {
-		const workflowData = await Db.collections.Workflow.findOne({
-			where: { id: workflowId },
-			relations: ['shared', 'shared.user', 'shared.user.globalRole'],
-		});
-		if (workflowData === null) {
-			throw new Error(`Could not find workflow with id "${workflowId}"`);
-		}
-
-		const workflow = new Workflow({
-			id: workflowId,
-			name: workflowData.name,
-			nodes: workflowData.nodes,
-			connections: workflowData.connections,
-			active: workflowData.active,
-			nodeTypes: this.nodeTypes,
-			staticData: workflowData.staticData,
-			settings: workflowData.settings,
-		});
-
-		const mode = 'internal';
-
-		const additionalData = await WorkflowExecuteAdditionalData.getBase(
-			workflowData.shared[0].user.id,
-		);
-
-		const webhooks = WebhookHelpers.getWorkflowWebhooks(workflow, additionalData, undefined, true);
-
-		for (const webhookData of webhooks) {
-			await workflow.runWebhookMethod(
-				'delete',
-				webhookData,
-				NodeExecuteFunctions,
-				mode,
-				'update',
-				false,
-			);
-		}
-
-		await WorkflowHelpers.saveStaticData(workflow);
-
-		await Db.collections.Webhook.delete({
-			workflowId: workflowData.id,
-		});
-	}
-
-	/**
-	 * Runs the given workflow
-	 *
-	 */
-	// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
-	async runWorkflow(
-		workflowData: IWorkflowDb,
-		node: INode,
-		data: INodeExecutionData[][],
-		additionalData: IWorkflowExecuteAdditionalDataWorkflow,
-		mode: WorkflowExecuteMode,
-		responsePromise?: IDeferredPromise<IExecuteResponsePromiseData>,
-	) {
-		const nodeExecutionStack: IExecuteData[] = [
-			{
-				node,
-				data: {
-					main: data,
-				},
-				source: null,
-			},
-		];
-
-		const executionData: IRunExecutionData = {
-			startData: {},
-			resultData: {
-				runData: {},
-			},
-			executionData: {
-				contextData: {},
-				nodeExecutionStack,
-				waitingExecution: {},
-				waitingExecutionSource: {},
-			},
-		};
-
-		// Start the workflow
-		const runData: IWorkflowExecutionDataProcess = {
-			userId: additionalData.userId,
-			executionMode: mode,
-			executionData,
-			workflowData,
-		};
-
-		const workflowRunner = new WorkflowRunner();
-		return workflowRunner.run(runData, true, undefined, undefined, responsePromise);
-	}
-
-	/**
-	 * Return poll function which gets the global functions from n8n-core
-	 * and overwrites the emit to be able to start it in subprocess
-	 *
-	 */
-	getExecutePollFunctions(
-		workflowData: IWorkflowDb,
-		additionalData: IWorkflowExecuteAdditionalDataWorkflow,
-		mode: WorkflowExecuteMode,
-		activation: WorkflowActivateMode,
-	): IGetExecutePollFunctions {
-		return (workflow: Workflow, node: INode) => {
-			const returnFunctions = NodeExecuteFunctions.getExecutePollFunctions(
-				workflow,
-				node,
-				additionalData,
-				mode,
-				activation,
-			);
-			returnFunctions.__emit = (
-				data: INodeExecutionData[][],
-				responsePromise?: IDeferredPromise<IExecuteResponsePromiseData>,
-				donePromise?: IDeferredPromise<IRun | undefined>,
-			): void => {
-				// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-				Logger.debug(`Received event to trigger execution for workflow "${workflow.name}"`);
-				WorkflowHelpers.saveStaticData(workflow);
-				const executePromise = this.runWorkflow(
-					workflowData,
-					node,
-					data,
-					additionalData,
-					mode,
-					responsePromise,
-				);
-
-				if (donePromise) {
-					executePromise.then((executionId) => {
-						this.activeExecutions
-							.getPostExecutePromise(executionId)
-							.then(donePromise.resolve)
-							.catch(donePromise.reject);
-					});
-				} else {
-					executePromise.catch(Logger.error);
-				}
-			};
-
-			returnFunctions.__emitError = async (error: ExecutionError): Promise<void> => {
-				await createErrorExecution(error, node, workflowData, workflow, mode);
-				this.executeErrorWorkflow(error, workflowData, mode);
-			};
-			return returnFunctions;
-		};
-	}
-
-	/**
-	 * Return trigger function which gets the global functions from n8n-core
-	 * and overwrites the emit to be able to start it in subprocess
-	 *
-	 */
-	getExecuteTriggerFunctions(
-		workflowData: IWorkflowDb,
-		additionalData: IWorkflowExecuteAdditionalDataWorkflow,
-		mode: WorkflowExecuteMode,
-		activation: WorkflowActivateMode,
-	): IGetExecuteTriggerFunctions {
-		return (workflow: Workflow, node: INode) => {
-			const returnFunctions = NodeExecuteFunctions.getExecuteTriggerFunctions(
-				workflow,
-				node,
-				additionalData,
-				mode,
-				activation,
-			);
-			returnFunctions.emit = (
-				data: INodeExecutionData[][],
-				responsePromise?: IDeferredPromise<IExecuteResponsePromiseData>,
-				donePromise?: IDeferredPromise<IRun | undefined>,
-			): void => {
-				// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-				Logger.debug(`Received trigger for workflow "${workflow.name}"`);
-				WorkflowHelpers.saveStaticData(workflow);
-				// eslint-disable-next-line id-denylist
-				const executePromise = this.runWorkflow(
-					workflowData,
-					node,
-					data,
-					additionalData,
-					mode,
-					responsePromise,
-				);
-
-				if (donePromise) {
-					executePromise.then((executionId) => {
-						this.activeExecutions
-							.getPostExecutePromise(executionId)
-							.then(donePromise.resolve)
-							.catch(donePromise.reject);
-					});
-				} else {
-					executePromise.catch(Logger.error);
-				}
-			};
-			returnFunctions.emitError = async (error: Error): Promise<void> => {
-				Logger.info(
-					`The trigger node "${node.name}" of workflow "${workflowData.name}" failed with the error: "${error.message}". Will try to reactivate.`,
-					{
-						nodeName: node.name,
-						workflowId: workflowData.id,
-						workflowName: workflowData.name,
-					},
-				);
-
-				// Remove the workflow as "active"
-
-				await this.activeWorkflows.remove(workflowData.id);
-				this.activationErrors[workflowData.id] = {
-					time: new Date().getTime(),
-					error: {
-						message: error.message,
-					},
-				};
-
-				// Run Error Workflow if defined
-				const activationError = new WorkflowActivationError(
-					`There was a problem with the trigger node "${node.name}", for that reason did the workflow had to be deactivated`,
-					{ cause: error, node },
-				);
-				this.executeErrorWorkflow(activationError, workflowData, mode);
-
-				this.addQueuedWorkflowActivation(activation, workflowData);
-			};
-			return returnFunctions;
-		};
-	}
-
-	executeErrorWorkflow(
-		error: ExecutionError,
-		workflowData: IWorkflowBase,
-		mode: WorkflowExecuteMode,
-	): void {
-		const fullRunData: IRun = {
-			data: {
-				resultData: {
-					error,
-					runData: {},
-				},
-			},
-			finished: false,
-			mode,
-			startedAt: new Date(),
-			stoppedAt: new Date(),
-			status: 'running',
-		};
-
-		WorkflowExecuteAdditionalData.executeErrorWorkflow(workflowData, fullRunData, mode);
-	}
-
-	/**
-	 * Makes a workflow active
-	 *
-	 * @param {string} workflowId The id of the workflow to activate
-	 * @param {IWorkflowDb} [workflowData] If workflowData is given it saves the DB query
-	 */
-	async add(
-		workflowId: string,
-		activation: WorkflowActivateMode,
-		workflowData?: IWorkflowDb,
-	): Promise<void> {
-		let workflowInstance: Workflow;
-		try {
-			if (workflowData === undefined) {
-				workflowData = (await Db.collections.Workflow.findOne({
-					where: { id: workflowId },
-					relations: ['shared', 'shared.user', 'shared.user.globalRole', 'shared.role'],
-				})) as IWorkflowDb;
-			}
-
-			if (!workflowData) {
-				throw new Error(`Could not find workflow with id "${workflowId}".`);
-			}
-			workflowInstance = new Workflow({
-				id: workflowId,
-				name: workflowData.name,
-				nodes: workflowData.nodes,
-				connections: workflowData.connections,
-				active: workflowData.active,
-				nodeTypes: this.nodeTypes,
-				staticData: workflowData.staticData,
-				settings: workflowData.settings,
-			});
-
-			const canBeActivated = workflowInstance.checkIfWorkflowCanBeActivated(START_NODES);
-			if (!canBeActivated) {
-				Logger.error(`Unable to activate workflow "${workflowData.name}"`);
-				throw new Error(
-					'The workflow can not be activated because it does not contain any nodes which could start the workflow. Only workflows which have trigger or webhook nodes can be activated.',
-				);
-			}
-
-			const mode = 'trigger';
-			const workflowOwner = (workflowData as WorkflowEntity).shared.find(
-				(shared) => shared.role.name === 'owner',
-			);
-			if (!workflowOwner) {
-				throw new Error('Workflow cannot be activated because it has no owner');
-			}
-			const additionalData = await WorkflowExecuteAdditionalData.getBase(workflowOwner.user.id);
-			const getTriggerFunctions = this.getExecuteTriggerFunctions(
-				workflowData,
-				additionalData,
-				mode,
-				activation,
-			);
-			const getPollFunctions = this.getExecutePollFunctions(
-				workflowData,
-				additionalData,
-				mode,
-				activation,
-			);
-
-			// Add the workflows which have webhooks defined
-			await this.addWorkflowWebhooks(workflowInstance, additionalData, mode, activation);
-
-			if (
-				workflowInstance.getTriggerNodes().length !== 0 ||
-				workflowInstance.getPollNodes().length !== 0
-			) {
-				await this.activeWorkflows.add(
-					workflowId,
-					workflowInstance,
-					additionalData,
-					mode,
-					activation,
-					getTriggerFunctions,
-					getPollFunctions,
-				);
-				Logger.verbose(`Successfully activated workflow "${workflowData.name}"`, {
-					workflowId,
-					workflowName: workflowData.name,
-				});
-			}
-
-			// Workflow got now successfully activated so make sure nothing is left in the queue
-			this.removeQueuedWorkflowActivation(workflowId);
-
-			if (this.activationErrors[workflowId] !== undefined) {
-				// If there were activation errors delete them
-				delete this.activationErrors[workflowId];
-			}
-
-			if (workflowInstance.id) {
-				// Sum all triggers in the workflow, EXCLUDING the manual trigger
-				const triggerFilter = (nodeType: INodeType) =>
-					!!nodeType.trigger && !nodeType.description.name.includes('manualTrigger');
-				const triggerCount =
-					workflowInstance.queryNodes(triggerFilter).length +
-					workflowInstance.getPollNodes().length +
-					WebhookHelpers.getWorkflowWebhooks(workflowInstance, additionalData, undefined, true)
-						.length;
-				await WorkflowsService.updateWorkflowTriggerCount(workflowInstance.id, triggerCount);
-			}
-		} catch (error) {
-			// There was a problem activating the workflow
-
-			// Save the error
-			this.activationErrors[workflowId] = {
-				time: new Date().getTime(),
-				error: {
-					message: error.message,
-				},
-			};
-
-			throw error;
-		}
-
-		// If for example webhooks get created it sometimes has to save the
-		// id of them in the static data. So make sure that data gets persisted.
-		await WorkflowHelpers.saveStaticData(workflowInstance!);
-	}
-
-	/**
-	 * Add a workflow to the activation queue.
-	 * Meaning it will keep on trying to activate it in regular
-	 * amounts indefinitely.
-	 */
-	addQueuedWorkflowActivation(
-		activationMode: WorkflowActivateMode,
-		workflowData: IWorkflowDb,
-	): void {
-		const workflowId = workflowData.id;
-		const workflowName = workflowData.name;
-
-		const retryFunction = async () => {
-			Logger.info(`Try to activate workflow "${workflowName}" (${workflowId})`, {
-				workflowId,
-				workflowName,
-			});
-			try {
-				await this.add(workflowId, activationMode, workflowData);
-			} catch (error) {
-				ErrorReporter.error(error);
-				let lastTimeout = this.queuedWorkflowActivations[workflowId].lastTimeout;
-				if (lastTimeout < WORKFLOW_REACTIVATE_MAX_TIMEOUT) {
-					lastTimeout = Math.min(lastTimeout * 2, WORKFLOW_REACTIVATE_MAX_TIMEOUT);
-				}
-
-				Logger.info(
-					` -> Activation of workflow "${workflowName}" (${workflowId}) did fail with error: "${
-						error.message as string
-					}" | retry in ${Math.floor(lastTimeout / 1000)} seconds`,
-					{
-						workflowId,
-						workflowName,
-					},
-				);
-
-				this.queuedWorkflowActivations[workflowId].lastTimeout = lastTimeout;
-				this.queuedWorkflowActivations[workflowId].timeout = setTimeout(retryFunction, lastTimeout);
-				return;
-			}
-			Logger.info(` -> Activation of workflow "${workflowName}" (${workflowId}) was successful!`, {
-				workflowId,
-				workflowName,
-			});
-		};
-
-		// Just to be sure that there is not chance that for any reason
-		// multiple run in parallel
-		this.removeQueuedWorkflowActivation(workflowId);
-
-		this.queuedWorkflowActivations[workflowId] = {
-			activationMode,
-			lastTimeout: WORKFLOW_REACTIVATE_INITIAL_TIMEOUT,
-			timeout: setTimeout(retryFunction, WORKFLOW_REACTIVATE_INITIAL_TIMEOUT),
-			workflowData,
-		};
-	}
-
-	/**
-	 * Remove a workflow from the activation queue
-	 */
-	removeQueuedWorkflowActivation(workflowId: string): void {
-		if (this.queuedWorkflowActivations[workflowId]) {
-			clearTimeout(this.queuedWorkflowActivations[workflowId].timeout);
-			delete this.queuedWorkflowActivations[workflowId];
-		}
-	}
-
-	/**
-	 * Remove all workflows from the activation queue
-	 */
-	removeAllQueuedWorkflowActivations(): void {
-		for (const workflowId in this.queuedWorkflowActivations) {
-			this.removeQueuedWorkflowActivation(workflowId);
-		}
-	}
-
-	/**
-	 * Makes a workflow inactive
-	 *
-	 * @param {string} workflowId The id of the workflow to deactivate
-	 */
-	// TODO: this should happen in a transaction
-	async remove(workflowId: string): Promise<void> {
-		// Remove all the webhooks of the workflow
-		try {
-			await this.removeWorkflowWebhooks(workflowId);
-		} catch (error) {
-			ErrorReporter.error(error);
-			Logger.error(
-				// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-				`Could not remove webhooks of workflow "${workflowId}" because of error: "${error.message}"`,
-			);
-		}
-
-		if (this.activationErrors[workflowId] !== undefined) {
-			// If there were any activation errors delete them
-			delete this.activationErrors[workflowId];
-		}
-
-		if (this.queuedWorkflowActivations[workflowId] !== undefined) {
-			this.removeQueuedWorkflowActivation(workflowId);
-		}
-
-		// if it's active in memory then it's a trigger
-		// so remove from list of actives workflows
-		if (this.activeWorkflows.isActive(workflowId)) {
-			await this.activeWorkflows.remove(workflowId);
-			Logger.verbose(`Successfully deactivated workflow "${workflowId}"`, { workflowId });
-		}
-	}
-}
diff --git a/packages/cli/src/CommunityNodes/helpers.ts b/packages/cli/src/CommunityNodes/helpers.ts
deleted file mode 100644
index 328a3f6a32732..0000000000000
--- a/packages/cli/src/CommunityNodes/helpers.ts
+++ /dev/null
@@ -1,236 +0,0 @@
-/* eslint-disable no-restricted-syntax */
-/* eslint-disable @typescript-eslint/naming-convention */
-import { promisify } from 'util';
-import { exec } from 'child_process';
-import { access as fsAccess, mkdir as fsMkdir } from 'fs/promises';
-import axios from 'axios';
-import { UserSettings } from 'n8n-core';
-import type { PublicInstalledPackage } from 'n8n-workflow';
-import { LoggerProxy } from 'n8n-workflow';
-
-import {
-	NODE_PACKAGE_PREFIX,
-	NPM_COMMAND_TOKENS,
-	NPM_PACKAGE_STATUS_GOOD,
-	RESPONSE_ERROR_MESSAGES,
-	UNKNOWN_FAILURE_REASON,
-} from '@/constants';
-import type { InstalledPackages } from '@db/entities/InstalledPackages';
-import config from '@/config';
-
-import type { CommunityPackages } from '@/Interfaces';
-
-const {
-	PACKAGE_NAME_NOT_PROVIDED,
-	DISK_IS_FULL,
-	PACKAGE_FAILED_TO_INSTALL,
-	PACKAGE_VERSION_NOT_FOUND,
-	PACKAGE_DOES_NOT_CONTAIN_NODES,
-	PACKAGE_NOT_FOUND,
-} = RESPONSE_ERROR_MESSAGES;
-
-const {
-	NPM_PACKAGE_NOT_FOUND_ERROR,
-	NPM_NO_VERSION_AVAILABLE,
-	NPM_DISK_NO_SPACE,
-	NPM_DISK_INSUFFICIENT_SPACE,
-	NPM_PACKAGE_VERSION_NOT_FOUND_ERROR,
-} = NPM_COMMAND_TOKENS;
-
-const execAsync = promisify(exec);
-
-const INVALID_OR_SUSPICIOUS_PACKAGE_NAME = /[^0-9a-z@\-./]/;
-
-export const parseNpmPackageName = (rawString?: string): CommunityPackages.ParsedPackageName => {
-	if (!rawString) throw new Error(PACKAGE_NAME_NOT_PROVIDED);
-
-	if (INVALID_OR_SUSPICIOUS_PACKAGE_NAME.test(rawString))
-		throw new Error('Package name must be a single word');
-
-	const scope = rawString.includes('/') ? rawString.split('/')[0] : undefined;
-
-	const packageNameWithoutScope = scope ? rawString.replace(`${scope}/`, '') : rawString;
-
-	if (!packageNameWithoutScope.startsWith(NODE_PACKAGE_PREFIX)) {
-		throw new Error(`Package name must start with ${NODE_PACKAGE_PREFIX}`);
-	}
-
-	const version = packageNameWithoutScope.includes('@')
-		? packageNameWithoutScope.split('@')[1]
-		: undefined;
-
-	const packageName = version ? rawString.replace(`@${version}`, '') : rawString;
-
-	return {
-		packageName,
-		scope,
-		version,
-		rawString,
-	};
-};
-
-export const sanitizeNpmPackageName = parseNpmPackageName;
-
-export const executeCommand = async (
-	command: string,
-	options?: { doNotHandleError?: boolean },
-): Promise<string> => {
-	const downloadFolder = UserSettings.getUserN8nFolderDownloadedNodesPath();
-
-	const execOptions = {
-		cwd: downloadFolder,
-		env: {
-			NODE_PATH: process.env.NODE_PATH,
-			PATH: process.env.PATH,
-			APPDATA: process.env.APPDATA,
-		},
-	};
-
-	try {
-		await fsAccess(downloadFolder);
-	} catch {
-		await fsMkdir(downloadFolder);
-		// Also init the folder since some versions
-		// of npm complain if the folder is empty
-		await execAsync('npm init -y', execOptions);
-	}
-
-	try {
-		const commandResult = await execAsync(command, execOptions);
-
-		return commandResult.stdout;
-	} catch (error) {
-		if (options?.doNotHandleError) throw error;
-
-		const errorMessage = error instanceof Error ? error.message : UNKNOWN_FAILURE_REASON;
-
-		const map = {
-			[NPM_PACKAGE_NOT_FOUND_ERROR]: PACKAGE_NOT_FOUND,
-			[NPM_NO_VERSION_AVAILABLE]: PACKAGE_NOT_FOUND,
-			[NPM_PACKAGE_VERSION_NOT_FOUND_ERROR]: PACKAGE_VERSION_NOT_FOUND,
-			[NPM_DISK_NO_SPACE]: DISK_IS_FULL,
-			[NPM_DISK_INSUFFICIENT_SPACE]: DISK_IS_FULL,
-		};
-
-		Object.entries(map).forEach(([npmMessage, n8nMessage]) => {
-			if (errorMessage.includes(npmMessage)) throw new Error(n8nMessage);
-		});
-
-		LoggerProxy.warn('npm command failed', { errorMessage });
-
-		throw new Error(PACKAGE_FAILED_TO_INSTALL);
-	}
-};
-
-export function matchPackagesWithUpdates(
-	packages: InstalledPackages[],
-	updates?: CommunityPackages.AvailableUpdates,
-): PublicInstalledPackage[] {
-	if (!updates) return packages;
-
-	return packages.reduce<PublicInstalledPackage[]>((acc, cur) => {
-		const publicPackage: PublicInstalledPackage = { ...cur };
-
-		const update = updates[cur.packageName];
-
-		if (update) publicPackage.updateAvailable = update.latest;
-
-		acc.push(publicPackage);
-
-		return acc;
-	}, []);
-}
-
-export function matchMissingPackages(
-	installedPackages: PublicInstalledPackage[],
-	missingPackages: string,
-): PublicInstalledPackage[] {
-	const missingPackageNames = missingPackages.split(' ');
-
-	const missingPackagesList = missingPackageNames.map((missingPackageName: string) => {
-		// Strip away versions but maintain scope and package name
-		try {
-			const parsedPackageData = parseNpmPackageName(missingPackageName);
-			return parsedPackageData.packageName;
-
-			// eslint-disable-next-line no-empty
-		} catch {}
-		return undefined;
-	});
-
-	const hydratedPackageList = [] as PublicInstalledPackage[];
-
-	installedPackages.forEach((installedPackage) => {
-		const hydratedInstalledPackage = { ...installedPackage };
-		if (missingPackagesList.includes(hydratedInstalledPackage.packageName)) {
-			hydratedInstalledPackage.failedLoading = true;
-		}
-		hydratedPackageList.push(hydratedInstalledPackage);
-	});
-
-	return hydratedPackageList;
-}
-
-export async function checkNpmPackageStatus(
-	packageName: string,
-): Promise<CommunityPackages.PackageStatusCheck> {
-	const N8N_BACKEND_SERVICE_URL = 'https://api.n8n.io/api/package';
-
-	try {
-		const response = await axios.post<CommunityPackages.PackageStatusCheck>(
-			N8N_BACKEND_SERVICE_URL,
-			{ name: packageName },
-			{ method: 'POST' },
-		);
-
-		if (response.data.status !== NPM_PACKAGE_STATUS_GOOD) return response.data;
-	} catch (error) {
-		// Do nothing if service is unreachable
-	}
-
-	return { status: NPM_PACKAGE_STATUS_GOOD };
-}
-
-export function hasPackageLoaded(packageName: string): boolean {
-	const missingPackages = config.get('nodes.packagesMissing') as string | undefined;
-
-	if (!missingPackages) return true;
-
-	return !missingPackages
-		.split(' ')
-		.some(
-			(packageNameAndVersion) =>
-				packageNameAndVersion.startsWith(packageName) &&
-				packageNameAndVersion.replace(packageName, '').startsWith('@'),
-		);
-}
-
-export function removePackageFromMissingList(packageName: string): void {
-	try {
-		const failedPackages = config.get('nodes.packagesMissing').split(' ');
-
-		const packageFailedToLoad = failedPackages.filter(
-			(packageNameAndVersion) =>
-				!packageNameAndVersion.startsWith(packageName) ||
-				!packageNameAndVersion.replace(packageName, '').startsWith('@'),
-		);
-
-		config.set('nodes.packagesMissing', packageFailedToLoad.join(' '));
-	} catch {
-		// Do nothing
-	}
-}
-
-export const isClientError = (error: Error): boolean => {
-	const clientErrors = [
-		PACKAGE_VERSION_NOT_FOUND,
-		PACKAGE_DOES_NOT_CONTAIN_NODES,
-		PACKAGE_NOT_FOUND,
-	];
-
-	return clientErrors.some((message) => error.message.includes(message));
-};
-
-export function isNpmError(error: unknown): error is { code: number; stdout: string } {
-	return typeof error === 'object' && error !== null && 'code' in error && 'stdout' in error;
-}
diff --git a/packages/cli/src/CommunityNodes/packageModel.ts b/packages/cli/src/CommunityNodes/packageModel.ts
deleted file mode 100644
index 522dbc8dbc1e1..0000000000000
--- a/packages/cli/src/CommunityNodes/packageModel.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-import { LoggerProxy } from 'n8n-workflow';
-import type { PackageDirectoryLoader } from 'n8n-core';
-import * as Db from '@/Db';
-import { InstalledNodes } from '@db/entities/InstalledNodes';
-import { InstalledPackages } from '@db/entities/InstalledPackages';
-
-export async function findInstalledPackage(packageName: string): Promise<InstalledPackages | null> {
-	return Db.collections.InstalledPackages.findOne({
-		where: { packageName },
-		relations: ['installedNodes'],
-	});
-}
-
-export async function isPackageInstalled(packageName: string): Promise<boolean> {
-	return Db.collections.InstalledPackages.exist({
-		where: { packageName },
-	});
-}
-
-export async function getAllInstalledPackages(): Promise<InstalledPackages[]> {
-	return Db.collections.InstalledPackages.find({ relations: ['installedNodes'] });
-}
-
-export async function removePackageFromDatabase(
-	packageName: InstalledPackages,
-): Promise<InstalledPackages> {
-	return Db.collections.InstalledPackages.remove(packageName);
-}
-
-export async function persistInstalledPackageData(
-	packageLoader: PackageDirectoryLoader,
-): Promise<InstalledPackages> {
-	const { packageJson, nodeTypes, loadedNodes } = packageLoader;
-	const { name: packageName, version: installedVersion, author } = packageJson;
-
-	let installedPackage: InstalledPackages;
-
-	try {
-		await Db.transaction(async (transactionManager) => {
-			const promises = [];
-
-			const installedPackagePayload = Object.assign(new InstalledPackages(), {
-				packageName,
-				installedVersion,
-				authorName: author?.name,
-				authorEmail: author?.email,
-			});
-			installedPackage = await transactionManager.save<InstalledPackages>(installedPackagePayload);
-			installedPackage.installedNodes = [];
-
-			promises.push(
-				...loadedNodes.map(async (loadedNode) => {
-					const installedNodePayload = Object.assign(new InstalledNodes(), {
-						name: nodeTypes[loadedNode.name].type.description.displayName,
-						type: loadedNode.name,
-						latestVersion: loadedNode.version,
-						package: packageName,
-					});
-					installedPackage.installedNodes.push(installedNodePayload);
-					return transactionManager.save<InstalledNodes>(installedNodePayload);
-				}),
-			);
-
-			return promises;
-		});
-		// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-		return installedPackage!;
-	} catch (error) {
-		LoggerProxy.error('Failed to save installed packages and nodes', {
-			// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-			error,
-			packageName,
-		});
-		throw error;
-	}
-}
diff --git a/packages/cli/src/CrashJournal.ts b/packages/cli/src/CrashJournal.ts
index b0cd5ad3f8015..ab13f2cb121f5 100644
--- a/packages/cli/src/CrashJournal.ts
+++ b/packages/cli/src/CrashJournal.ts
@@ -1,9 +1,11 @@
 import { existsSync } from 'fs';
 import { mkdir, utimes, open, rm } from 'fs/promises';
 import { join, dirname } from 'path';
-import { UserSettings } from 'n8n-core';
-import { LoggerProxy, sleep } from 'n8n-workflow';
+import { Container } from 'typedi';
+import { InstanceSettings } from 'n8n-core';
+import { sleep } from 'n8n-workflow';
 import { inProduction } from '@/constants';
+import { Logger } from '@/Logger';
 
 export const touchFile = async (filePath: string): Promise<void> => {
 	await mkdir(dirname(filePath), { recursive: true });
@@ -16,14 +18,15 @@ export const touchFile = async (filePath: string): Promise<void> => {
 	}
 };
 
-const journalFile = join(UserSettings.getUserN8nFolderPath(), 'crash.journal');
+const { n8nFolder } = Container.get(InstanceSettings);
+const journalFile = join(n8nFolder, 'crash.journal');
 
 export const init = async () => {
 	if (!inProduction) return;
 
 	if (existsSync(journalFile)) {
 		// Crash detected
-		LoggerProxy.error('Last session crashed');
+		Container.get(Logger).error('Last session crashed');
 		// add a 10 seconds pause to slow down crash-looping
 		await sleep(10_000);
 	}
diff --git a/packages/cli/src/CredentialTypes.ts b/packages/cli/src/CredentialTypes.ts
index 597ff1dfa78da..d97825a67223d 100644
--- a/packages/cli/src/CredentialTypes.ts
+++ b/packages/cli/src/CredentialTypes.ts
@@ -1,64 +1,58 @@
-import { loadClassInIsolation } from 'n8n-core';
-import type { ICredentialType, ICredentialTypes, LoadedClass } from 'n8n-workflow';
 import { Service } from 'typedi';
-import { RESPONSE_ERROR_MESSAGES } from './constants';
-import { LoadNodesAndCredentials } from './LoadNodesAndCredentials';
+import { loadClassInIsolation } from 'n8n-core';
+import {
+	ApplicationError,
+	type ICredentialType,
+	type ICredentialTypes,
+	type LoadedClass,
+} from 'n8n-workflow';
+import { RESPONSE_ERROR_MESSAGES } from '@/constants';
+import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
 
 @Service()
 export class CredentialTypes implements ICredentialTypes {
-	constructor(private nodesAndCredentials: LoadNodesAndCredentials) {
-		nodesAndCredentials.credentialTypes = this;
-	}
+	constructor(private loadNodesAndCredentials: LoadNodesAndCredentials) {}
 
 	recognizes(type: string) {
-		return type in this.knownCredentials || type in this.loadedCredentials;
+		const { loadedCredentials, knownCredentials } = this.loadNodesAndCredentials;
+		return type in knownCredentials || type in loadedCredentials;
 	}
 
 	getByName(credentialType: string): ICredentialType {
 		return this.getCredential(credentialType).type;
 	}
 
-	getNodeTypesToTestWith(type: string): string[] {
-		return this.knownCredentials[type]?.nodesToTestWith ?? [];
+	getSupportedNodes(type: string): string[] {
+		return this.loadNodesAndCredentials.knownCredentials[type]?.supportedNodes ?? [];
 	}
 
 	/**
 	 * Returns all parent types of the given credential type
 	 */
 	getParentTypes(typeName: string): string[] {
-		const credentialType = this.getByName(typeName);
-		if (credentialType?.extends === undefined) return [];
-
-		const types: string[] = [];
-		credentialType.extends.forEach((type: string) => {
-			types.push(type);
-			types.push(...this.getParentTypes(type));
-		});
-
-		return types;
+		const extendsArr = this.loadNodesAndCredentials.knownCredentials[typeName]?.extends ?? [];
+		if (extendsArr.length) {
+			extendsArr.forEach((type) => {
+				extendsArr.push(...this.getParentTypes(type));
+			});
+		}
+		return extendsArr;
 	}
 
 	private getCredential(type: string): LoadedClass<ICredentialType> {
-		const loadedCredentials = this.loadedCredentials;
+		const { loadedCredentials, knownCredentials } = this.loadNodesAndCredentials;
 		if (type in loadedCredentials) {
 			return loadedCredentials[type];
 		}
 
-		const knownCredentials = this.knownCredentials;
 		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 Error(`${RESPONSE_ERROR_MESSAGES.NO_CREDENTIAL}: ${type}`);
-	}
-
-	private get loadedCredentials() {
-		return this.nodesAndCredentials.loaded.credentials;
-	}
-
-	private get knownCredentials() {
-		return this.nodesAndCredentials.known.credentials;
+		throw new ApplicationError(RESPONSE_ERROR_MESSAGES.NO_CREDENTIAL, {
+			tags: { credentialType: type },
+		});
 	}
 }
diff --git a/packages/cli/src/CredentialsHelper.ts b/packages/cli/src/CredentialsHelper.ts
index cfc86bfd263af..c20ddd4798bad 100644
--- a/packages/cli/src/CredentialsHelper.ts
+++ b/packages/cli/src/CredentialsHelper.ts
@@ -1,59 +1,44 @@
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
-/* eslint-disable no-restricted-syntax */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-unsafe-return */
-/* eslint-disable @typescript-eslint/no-unsafe-call */
-
+import { Service } from 'typedi';
 import { Credentials, NodeExecuteFunctions } from 'n8n-core';
-import get from 'lodash.get';
 
 import type {
 	ICredentialDataDecryptedObject,
-	ICredentialsDecrypted,
 	ICredentialsExpressionResolveValues,
-	ICredentialTestFunction,
-	ICredentialTestRequestData,
 	IHttpRequestOptions,
 	INode,
 	INodeCredentialsDetails,
-	INodeCredentialTestResult,
-	INodeExecutionData,
 	INodeParameters,
 	INodeProperties,
 	INodeType,
 	IVersionedNodeType,
 	IRequestOptionsSimplified,
-	IRunExecutionData,
 	IWorkflowDataProxyAdditionalKeys,
 	WorkflowExecuteMode,
-	ITaskDataConnections,
 	IHttpRequestHelper,
 	INodeTypeData,
 	INodeTypes,
+	IWorkflowExecuteAdditionalData,
+	IExecuteData,
+	IDataObject,
 } from 'n8n-workflow';
-import {
-	ICredentialsHelper,
-	VersionedNodeType,
-	NodeHelpers,
-	RoutingNode,
-	Workflow,
-	LoggerProxy as Logger,
-	ErrorReporterProxy as ErrorReporter,
-} from 'n8n-workflow';
+import { ICredentialsHelper, NodeHelpers, Workflow, ApplicationError } from 'n8n-workflow';
 
-import * as Db from '@/Db';
 import type { ICredentialsDb } from '@/Interfaces';
-import * as WorkflowExecuteAdditionalData from '@/WorkflowExecuteAdditionalData';
-import type { User } from '@db/entities/User';
+
 import type { CredentialsEntity } from '@db/entities/CredentialsEntity';
 import { NodeTypes } from '@/NodeTypes';
 import { CredentialTypes } from '@/CredentialTypes';
 import { CredentialsOverwrites } from '@/CredentialsOverwrites';
-import { whereClause } from './UserManagement/UserManagementHelper';
 import { RESPONSE_ERROR_MESSAGES } from './constants';
-import { Container } from 'typedi';
+
+import { Logger } from '@/Logger';
+import { CredentialsRepository } from '@db/repositories/credentials.repository';
+import { SharedCredentialsRepository } from '@db/repositories/sharedCredentials.repository';
+import { CredentialNotFoundError } from './errors/credential-not-found.error';
 
 const mockNode = {
 	name: '',
@@ -73,24 +58,33 @@ const mockNodesData: INodeTypeData = {
 };
 
 const mockNodeTypes: INodeTypes = {
+	getKnownTypes(): IDataObject {
+		return {};
+	},
 	getByName(nodeType: string): INodeType | IVersionedNodeType {
 		return mockNodesData[nodeType]?.type;
 	},
 	getByNameAndVersion(nodeType: string, version?: number): INodeType {
 		if (!mockNodesData[nodeType]) {
-			throw new Error(`${RESPONSE_ERROR_MESSAGES.NO_NODE}: ${nodeType}`);
+			throw new ApplicationError(RESPONSE_ERROR_MESSAGES.NO_NODE, {
+				tags: { nodeType },
+			});
 		}
 		return NodeHelpers.getVersionedNodeType(mockNodesData[nodeType].type, version);
 	},
 };
 
+@Service()
 export class CredentialsHelper extends ICredentialsHelper {
 	constructor(
-		encryptionKey: string,
-		private credentialTypes = Container.get(CredentialTypes),
-		private nodeTypes = Container.get(NodeTypes),
+		private readonly logger: Logger,
+		private readonly credentialTypes: CredentialTypes,
+		private readonly nodeTypes: NodeTypes,
+		private readonly credentialsOverwrites: CredentialsOverwrites,
+		private readonly credentialsRepository: CredentialsRepository,
+		private readonly sharedCredentialsRepository: SharedCredentialsRepository,
 	) {
-		super(encryptionKey);
+		super();
 	}
 
 	/**
@@ -102,7 +96,6 @@ export class CredentialsHelper extends ICredentialsHelper {
 		incomingRequestOptions: IHttpRequestOptions | IRequestOptionsSimplified,
 		workflow: Workflow,
 		node: INode,
-		defaultTimezone: string,
 	): Promise<IHttpRequestOptions> {
 		const requestOptions = incomingRequestOptions;
 		const credentialType = this.credentialTypes.getByName(typeName);
@@ -110,8 +103,11 @@ export class CredentialsHelper extends ICredentialsHelper {
 		if (credentialType.authenticate) {
 			if (typeof credentialType.authenticate === 'function') {
 				// Special authentication function is defined
-				// eslint-disable-next-line @typescript-eslint/no-unsafe-call
-				return credentialType.authenticate(credentials, requestOptions as IHttpRequestOptions);
+
+				return await credentialType.authenticate(
+					credentials,
+					requestOptions as IHttpRequestOptions,
+				);
 			}
 
 			if (typeof credentialType.authenticate === 'object') {
@@ -127,20 +123,13 @@ export class CredentialsHelper extends ICredentialsHelper {
 				if (authenticate.type === 'generic') {
 					Object.entries(authenticate.properties).forEach(([outerKey, outerValue]) => {
 						Object.entries(outerValue).forEach(([key, value]) => {
-							keyResolved = this.resolveValue(
-								key,
-								{ $credentials: credentials },
-								workflow,
-								node,
-								defaultTimezone,
-							);
+							keyResolved = this.resolveValue(key, { $credentials: credentials }, workflow, node);
 
 							valueResolved = this.resolveValue(
 								value as string,
 								{ $credentials: credentials },
 								workflow,
 								node,
-								defaultTimezone,
 							);
 
 							// @ts-ignore
@@ -172,7 +161,7 @@ export class CredentialsHelper extends ICredentialsHelper {
 			(property) => property.type === 'hidden' && property?.typeOptions?.expirable === true,
 		);
 
-		if (expirableProperty === undefined || expirableProperty.name === undefined) {
+		if (expirableProperty?.name === undefined) {
 			return undefined;
 		}
 
@@ -217,12 +206,11 @@ export class CredentialsHelper extends ICredentialsHelper {
 	/**
 	 * Resolves the given value in case it is an expression
 	 */
-	resolveValue(
+	private resolveValue(
 		parameterValue: string,
 		additionalKeys: IWorkflowDataProxyAdditionalKeys,
 		workflow: Workflow,
 		node: INode,
-		defaultTimezone: string,
 	): string {
 		if (typeof parameterValue !== 'string' || parameterValue.charAt(0) !== '=') {
 			return parameterValue;
@@ -232,7 +220,6 @@ export class CredentialsHelper extends ICredentialsHelper {
 			node,
 			parameterValue,
 			'internal',
-			defaultTimezone,
 			additionalKeys,
 			undefined,
 			'',
@@ -254,9 +241,6 @@ export class CredentialsHelper extends ICredentialsHelper {
 
 	/**
 	 * Returns the credentials instance
-	 *
-	 * @param {INodeCredentialsDetails} nodeCredential id and name to return instance of
-	 * @param {string} type Type of the credential to return instance of
 	 */
 	async getCredentials(
 		nodeCredential: INodeCredentialsDetails,
@@ -264,40 +248,42 @@ export class CredentialsHelper extends ICredentialsHelper {
 		userId?: string,
 	): Promise<Credentials> {
 		if (!nodeCredential.id) {
-			throw new Error(`Credential "${nodeCredential.name}" of type "${type}" has no ID.`);
+			throw new ApplicationError('Found credential with no ID.', {
+				extra: { credentialName: nodeCredential.name },
+				tags: { credentialType: type },
+			});
 		}
 
-		const credential = userId
-			? await Db.collections.SharedCredentials.findOneOrFail({
-					relations: ['credentials'],
-					where: { credentials: { id: nodeCredential.id, type }, userId },
-			  }).then((shared) => shared.credentials)
-			: await Db.collections.Credentials.findOneByOrFail({ id: nodeCredential.id, type });
+		let credential: CredentialsEntity;
 
-		if (!credential) {
-			throw new Error(
-				`Credential with ID "${nodeCredential.id}" does not exist for type "${type}".`,
-			);
+		try {
+			credential = userId
+				? await this.sharedCredentialsRepository
+						.findOneOrFail({
+							relations: ['credentials'],
+							where: { credentials: { id: nodeCredential.id, type }, userId },
+						})
+						.then((shared) => shared.credentials)
+				: await this.credentialsRepository.findOneByOrFail({ id: nodeCredential.id, type });
+		} catch (error) {
+			throw new CredentialNotFoundError(nodeCredential.id, type);
 		}
 
 		return new Credentials(
 			{ id: credential.id, name: credential.name },
 			credential.type,
-			credential.nodesAccess,
 			credential.data,
 		);
 	}
 
 	/**
 	 * Returns all the properties of the credentials with the given name
-	 *
-	 * @param {string} type The name of the type to return credentials off
 	 */
 	getCredentialsProperties(type: string): INodeProperties[] {
 		const credentialTypeData = this.credentialTypes.getByName(type);
 
 		if (credentialTypeData === undefined) {
-			throw new Error(`The credentials of type "${type}" are not known.`);
+			throw new ApplicationError('Unknown credential type', { tags: { credentialType: type } });
 		}
 
 		if (credentialTypeData.extends === undefined) {
@@ -333,32 +319,35 @@ export class CredentialsHelper extends ICredentialsHelper {
 
 	/**
 	 * Returns the decrypted credential data with applied overwrites
-	 *
-	 * @param {INodeCredentialsDetails} nodeCredentials id and name to return instance of
-	 * @param {string} type Type of the credentials to return data of
-	 * @param {boolean} [raw] Return the data as supplied without defaults or overwrites
 	 */
 	async getDecrypted(
+		additionalData: IWorkflowExecuteAdditionalData,
 		nodeCredentials: INodeCredentialsDetails,
 		type: string,
 		mode: WorkflowExecuteMode,
-		defaultTimezone: string,
+		executeData?: IExecuteData,
 		raw?: boolean,
 		expressionResolveValues?: ICredentialsExpressionResolveValues,
 	): Promise<ICredentialDataDecryptedObject> {
 		const credentials = await this.getCredentials(nodeCredentials, type);
-		const decryptedDataOriginal = credentials.getData(this.encryptionKey);
+		const decryptedDataOriginal = credentials.getData();
 
 		if (raw === true) {
 			return decryptedDataOriginal;
 		}
 
+		await additionalData?.secretsHelpers?.waitForInit();
+
+		const canUseSecrets = await this.credentialOwnedByOwner(nodeCredentials);
+
 		return this.applyDefaultsAndOverwrites(
+			additionalData,
 			decryptedDataOriginal,
 			type,
 			mode,
-			defaultTimezone,
+			executeData,
 			expressionResolveValues,
+			canUseSecrets,
 		);
 	}
 
@@ -366,16 +355,21 @@ export class CredentialsHelper extends ICredentialsHelper {
 	 * Applies credential default data and overwrites
 	 */
 	applyDefaultsAndOverwrites(
+		additionalData: IWorkflowExecuteAdditionalData,
 		decryptedDataOriginal: ICredentialDataDecryptedObject,
 		type: string,
 		mode: WorkflowExecuteMode,
-		defaultTimezone: string,
+		executeData?: IExecuteData,
 		expressionResolveValues?: ICredentialsExpressionResolveValues,
+		canUseSecrets?: boolean,
 	): ICredentialDataDecryptedObject {
 		const credentialsProperties = this.getCredentialsProperties(type);
 
 		// Load and apply the credentials overwrites if any exist
-		const dataWithOverwrites = CredentialsOverwrites().applyOverwrite(type, decryptedDataOriginal);
+		const dataWithOverwrites = this.credentialsOverwrites.applyOverwrite(
+			type,
+			decryptedDataOriginal,
+		);
 
 		// Add the default credential values
 		let decryptedData = NodeHelpers.getNodeParameters(
@@ -392,9 +386,11 @@ export class CredentialsHelper extends ICredentialsHelper {
 			decryptedData.oauthTokenData = decryptedDataOriginal.oauthTokenData;
 		}
 
-		if (expressionResolveValues) {
-			const timezone = expressionResolveValues.workflow.settings.timezone ?? defaultTimezone;
+		const additionalKeys = NodeExecuteFunctions.getAdditionalKeys(additionalData, mode, null, {
+			secretsEnabled: canUseSecrets,
+		});
 
+		if (expressionResolveValues) {
 			try {
 				decryptedData = expressionResolveValues.workflow.expression.getParameterValue(
 					decryptedData as INodeParameters,
@@ -404,14 +400,12 @@ export class CredentialsHelper extends ICredentialsHelper {
 					expressionResolveValues.node.name,
 					expressionResolveValues.connectionInputData,
 					mode,
-					timezone,
-					{},
-					undefined,
+					additionalKeys,
+					executeData,
 					false,
 					decryptedData,
 				) as ICredentialDataDecryptedObject;
 			} catch (e) {
-				// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 				e.message += ' [Error resolving credentials]';
 				throw e;
 			}
@@ -428,8 +422,7 @@ export class CredentialsHelper extends ICredentialsHelper {
 				mockNode,
 				decryptedData as INodeParameters,
 				mode,
-				defaultTimezone,
-				{},
+				additionalKeys,
 				undefined,
 				undefined,
 				decryptedData,
@@ -441,10 +434,6 @@ export class CredentialsHelper extends ICredentialsHelper {
 
 	/**
 	 * Updates credentials in the database
-	 *
-	 * @param {string} name Name of the credentials to set data of
-	 * @param {string} type Type of the credentials to set data of
-	 * @param {ICredentialDataDecryptedObject} data The data to set
 	 */
 	async updateCredentials(
 		nodeCredentials: INodeCredentialsDetails,
@@ -453,13 +442,7 @@ export class CredentialsHelper extends ICredentialsHelper {
 	): Promise<void> {
 		const credentials = await this.getCredentials(nodeCredentials, type);
 
-		if (!Db.isInitialized) {
-			// The first time executeWorkflow gets called the Database has
-			// to get initialized first
-			await Db.init();
-		}
-
-		credentials.setData(data, this.encryptionKey);
+		credentials.setData(data);
 		const newCredentialsData = credentials.getDataToSave() as ICredentialsDb;
 
 		// Add special database related data
@@ -471,311 +454,41 @@ export class CredentialsHelper extends ICredentialsHelper {
 			type,
 		};
 
-		await Db.collections.Credentials.update(findQuery, newCredentialsData);
+		await this.credentialsRepository.update(findQuery, newCredentialsData);
 	}
 
-	private getCredentialTestFunction(
-		credentialType: string,
-	): ICredentialTestFunction | ICredentialTestRequestData | undefined {
-		// Check if test is defined on credentials
-		const type = this.credentialTypes.getByName(credentialType);
-		if (type.test) {
-			return {
-				testRequest: type.test,
-			};
-		}
-
-		const nodeTypesToTestWith = this.credentialTypes.getNodeTypesToTestWith(credentialType);
-		for (const nodeName of nodeTypesToTestWith) {
-			const node = this.nodeTypes.getByName(nodeName);
-
-			// Always set to an array even if node is not versioned to not having
-			// to duplicate the logic
-			const allNodeTypes: INodeType[] = [];
-			if (node instanceof VersionedNodeType) {
-				// Node is versioned
-				allNodeTypes.push(...Object.values(node.nodeVersions));
-			} else {
-				// Node is not versioned
-				allNodeTypes.push(node as INodeType);
-			}
-
-			// Check each of the node versions for credential tests
-			for (const nodeType of allNodeTypes) {
-				// Check each of teh credentials
-				for (const { name, testedBy } of nodeType.description.credentials ?? []) {
-					if (name === credentialType && !!testedBy) {
-						if (typeof testedBy === 'string') {
-							if (node instanceof VersionedNodeType) {
-								// The node is versioned. So check all versions for test function
-								// starting with the latest
-								const versions = Object.keys(node.nodeVersions).sort().reverse();
-								for (const version of versions) {
-									const versionedNode = node.nodeVersions[parseInt(version, 10)];
-									const credentialTest = versionedNode.methods?.credentialTest;
-									if (credentialTest && testedBy in credentialTest) {
-										return credentialTest[testedBy];
-									}
-								}
-							}
-							// Test is defined as string which links to a function
-							return (node as unknown as INodeType).methods?.credentialTest![testedBy];
-						}
-
-						// Test is defined as JSON with a definition for the request to make
-						return {
-							nodeType,
-							testRequest: testedBy,
-						};
-					}
-				}
-			}
-		}
-
-		return undefined;
-	}
-
-	async testCredentials(
-		user: User,
-		credentialType: string,
-		credentialsDecrypted: ICredentialsDecrypted,
-	): Promise<INodeCredentialTestResult> {
-		const credentialTestFunction = this.getCredentialTestFunction(credentialType);
-		if (credentialTestFunction === undefined) {
-			return {
-				status: 'Error',
-				message: 'No testing function found for this credential.',
-			};
-		}
-
-		if (credentialsDecrypted.data) {
-			credentialsDecrypted.data = CredentialsOverwrites().applyOverwrite(
-				credentialType,
-				credentialsDecrypted.data,
-			);
-		}
-
-		if (typeof credentialTestFunction === 'function') {
-			// The credentials get tested via a function that is defined on the node
-			const credentialTestFunctions = NodeExecuteFunctions.getCredentialTestFunctions();
-			// eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
-			return credentialTestFunction.call(credentialTestFunctions, credentialsDecrypted);
-		}
-
-		// Credentials get tested via request instructions
-
-		// TODO: Temp workflows get created at multiple locations (for example also LoadNodeParameterOptions),
-		//       check if some of them are identical enough that it can be combined
-
-		let nodeType: INodeType;
-		if (credentialTestFunction.nodeType) {
-			nodeType = credentialTestFunction.nodeType;
-		} else {
-			nodeType = this.nodeTypes.getByNameAndVersion('n8n-nodes-base.noOp');
+	async credentialOwnedByOwner(nodeCredential: INodeCredentialsDetails): Promise<boolean> {
+		if (!nodeCredential.id) {
+			return false;
 		}
 
-		const node: INode = {
-			id: 'temp',
-			parameters: {},
-			name: 'Temp-Node',
-			type: nodeType.description.name,
-			typeVersion: Array.isArray(nodeType.description.version)
-				? nodeType.description.version.slice(-1)[0]
-				: nodeType.description.version,
-			position: [0, 0],
-			credentials: {
-				[credentialType]: {
-					id: credentialsDecrypted.id,
-					name: credentialsDecrypted.name,
+		const credential = await this.sharedCredentialsRepository.findOne({
+			where: {
+				role: 'credential:owner',
+				user: {
+					role: 'global:owner',
+				},
+				credentials: {
+					id: nodeCredential.id,
 				},
 			},
-		};
-
-		const workflowData = {
-			nodes: [node],
-			connections: {},
-		};
-
-		const nodeTypeCopy: INodeType = {
-			description: {
-				...nodeType.description,
-				credentials: [
-					{
-						name: credentialType,
-						required: true,
-					},
-				],
-				properties: [
-					{
-						displayName: 'Temp',
-						name: 'temp',
-						type: 'string',
-						routing: {
-							request: credentialTestFunction.testRequest.request,
-						},
-						default: '',
-					},
-				],
-			},
-		};
-
-		mockNodesData[nodeTypeCopy.description.name] = {
-			sourcePath: '',
-			type: nodeTypeCopy,
-		};
-
-		const workflow = new Workflow({
-			nodes: workflowData.nodes,
-			connections: workflowData.connections,
-			active: false,
-			nodeTypes: mockNodeTypes,
 		});
 
-		const mode = 'internal';
-		const runIndex = 0;
-		const inputData: ITaskDataConnections = {
-			main: [[{ json: {} }]],
-		};
-		const connectionInputData: INodeExecutionData[] = [];
-		const runExecutionData: IRunExecutionData = {
-			resultData: {
-				runData: {},
-			},
-		};
-
-		const additionalData = await WorkflowExecuteAdditionalData.getBase(user.id, node.parameters);
-
-		const routingNode = new RoutingNode(
-			workflow,
-			node,
-			connectionInputData,
-			runExecutionData ?? null,
-			additionalData,
-			mode,
-		);
-
-		let response: INodeExecutionData[][] | null | undefined;
-
-		try {
-			response = await routingNode.runNode(
-				inputData,
-				runIndex,
-				nodeTypeCopy,
-				{ node, data: {}, source: null },
-				NodeExecuteFunctions,
-				credentialsDecrypted,
-			);
-		} catch (error) {
-			ErrorReporter.error(error);
-			// Do not fail any requests to allow custom error messages and
-			// make logic easier
-			if (error.cause?.response) {
-				const errorResponseData = {
-					statusCode: error.cause.response.status,
-					statusMessage: error.cause.response.statusText,
-				};
-				if (credentialTestFunction.testRequest.rules) {
-					// Special testing rules are defined so check all in order
-					for (const rule of credentialTestFunction.testRequest.rules) {
-						if (rule.type === 'responseCode') {
-							if (errorResponseData.statusCode === rule.properties.value) {
-								return {
-									status: 'Error',
-									message: rule.properties.message,
-								};
-							}
-						}
-					}
-				}
-
-				if (errorResponseData.statusCode < 199 || errorResponseData.statusCode > 299) {
-					// All requests with response codes that are not 2xx are treated by default as failed
-					return {
-						status: 'Error',
-						message:
-							// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-							errorResponseData.statusMessage ||
-							// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-							`Received HTTP status code: ${errorResponseData.statusCode}`,
-					};
-				}
-			} else if (error.cause?.code) {
-				return {
-					status: 'Error',
-					message: error.cause.code,
-				};
-			}
-			Logger.debug('Credential test failed', error);
-			return {
-				status: 'Error',
-				message: error.message.toString(),
-			};
-		} finally {
-			delete mockNodesData[nodeTypeCopy.description.name];
-		}
-
-		if (
-			credentialTestFunction.testRequest.rules &&
-			Array.isArray(credentialTestFunction.testRequest.rules)
-		) {
-			// Special testing rules are defined so check all in order
-			for (const rule of credentialTestFunction.testRequest.rules) {
-				if (rule.type === 'responseSuccessBody') {
-					const responseData = response![0][0].json;
-					if (get(responseData, rule.properties.key) === rule.properties.value) {
-						return {
-							status: 'Error',
-							message: rule.properties.message,
-						};
-					}
-				}
-			}
+		if (!credential) {
+			return false;
 		}
 
-		return {
-			status: 'OK',
-			message: 'Connection successful!',
-		};
+		return true;
 	}
 }
 
-/**
- * Get a credential if it has been shared with a user.
- */
-export async function getCredentialForUser(
-	credentialId: string,
-	user: User,
-): Promise<ICredentialsDb | null> {
-	const sharedCredential = await Db.collections.SharedCredentials.findOne({
-		relations: ['credentials'],
-		where: whereClause({
-			user,
-			entityType: 'credentials',
-			entityId: credentialId,
-		}),
-	});
-
-	if (!sharedCredential) return null;
-
-	return sharedCredential.credentials as ICredentialsDb;
-}
-
-/**
- * Get a credential without user check
- */
-export async function getCredentialWithoutUser(
-	credentialId: string,
-): Promise<ICredentialsDb | null> {
-	return Db.collections.Credentials.findOneBy({ id: credentialId });
-}
-
 export function createCredentialsFromCredentialsEntity(
 	credential: CredentialsEntity,
 	encrypt = false,
 ): Credentials {
-	const { id, name, type, nodesAccess, data } = credential;
+	const { id, name, type, data } = credential;
 	if (encrypt) {
-		return new Credentials({ id: null, name }, type, nodesAccess);
+		return new Credentials({ id: null, name }, type);
 	}
-	return new Credentials({ id, name }, type, nodesAccess, data);
+	return new Credentials({ id, name }, type, data);
 }
diff --git a/packages/cli/src/CredentialsOverwrites.ts b/packages/cli/src/CredentialsOverwrites.ts
index c3a5702df113f..f65dc6c68888c 100644
--- a/packages/cli/src/CredentialsOverwrites.ts
+++ b/packages/cli/src/CredentialsOverwrites.ts
@@ -1,14 +1,21 @@
+import { Service } from 'typedi';
+import type { ICredentialDataDecryptedObject } from 'n8n-workflow';
+import { deepCopy, jsonParse } from 'n8n-workflow';
 import config from '@/config';
-import type { ICredentialDataDecryptedObject, ICredentialTypes } from 'n8n-workflow';
-import { deepCopy, LoggerProxy as Logger, jsonParse } from 'n8n-workflow';
 import type { ICredentialsOverwrite } from '@/Interfaces';
+import { CredentialTypes } from '@/CredentialTypes';
+import { Logger } from '@/Logger';
 
-class CredentialsOverwritesClass {
+@Service()
+export class CredentialsOverwrites {
 	private overwriteData: ICredentialsOverwrite = {};
 
 	private resolvedTypes: string[] = [];
 
-	constructor(private credentialTypes: ICredentialTypes) {
+	constructor(
+		private readonly credentialTypes: CredentialTypes,
+		private readonly logger: Logger,
+	) {
 		const data = config.getEnv('credentials.overwrite.data');
 		const overwriteData = jsonParse<ICredentialsOverwrite>(data, {
 			errorMessage: 'The credentials-overwrite is not valid JSON.',
@@ -58,7 +65,7 @@ class CredentialsOverwritesClass {
 		}
 
 		if (!this.credentialTypes.recognizes(type)) {
-			Logger.warn(`Unknown credential type ${type} in Credential overwrites`);
+			this.logger.warn(`Unknown credential type ${type} in Credential overwrites`);
 			return;
 		}
 
@@ -96,20 +103,3 @@ class CredentialsOverwritesClass {
 		return this.overwriteData;
 	}
 }
-
-let credentialsOverwritesInstance: CredentialsOverwritesClass | undefined;
-
-// eslint-disable-next-line @typescript-eslint/naming-convention
-export function CredentialsOverwrites(
-	credentialTypes?: ICredentialTypes,
-): CredentialsOverwritesClass {
-	if (!credentialsOverwritesInstance) {
-		if (credentialTypes) {
-			credentialsOverwritesInstance = new CredentialsOverwritesClass(credentialTypes);
-		} else {
-			throw new Error('CredentialsOverwrites not initialized yet');
-		}
-	}
-
-	return credentialsOverwritesInstance;
-}
diff --git a/packages/cli/src/CurlConverterHelper.ts b/packages/cli/src/CurlConverterHelper.ts
index 06da059030549..5e1e3fa16b209 100644
--- a/packages/cli/src/CurlConverterHelper.ts
+++ b/packages/cli/src/CurlConverterHelper.ts
@@ -1,6 +1,5 @@
-/* eslint-disable @typescript-eslint/no-unused-vars */
 import curlconverter from 'curlconverter';
-import get from 'lodash.get';
+import get from 'lodash/get';
 import type { IDataObject } from 'n8n-workflow';
 import { jsonParse } from 'n8n-workflow';
 
@@ -263,6 +262,7 @@ const mapCookies = (cookies: CurlJson['cookies']): { cookie: string } | {} => {
 	};
 };
 
+// eslint-disable-next-line complexity
 export const toHttpNodeParameters = (curlCommand: string): HttpNodeParameters => {
 	const curlJson = curlToJson(curlCommand);
 
@@ -417,7 +417,7 @@ export const toHttpNodeParameters = (curlCommand: string): HttpNodeParameters =>
 				// json body
 				Object.assign(httpNodeParameters, {
 					specifyBody: 'json',
-					jsonBody: JSON.stringify(json),
+					jsonBody: JSON.stringify(json, null, 2),
 				});
 			} else {
 				// key-value body
diff --git a/packages/cli/src/Db.ts b/packages/cli/src/Db.ts
index ee44c438b02fe..57be16975df75 100644
--- a/packages/cli/src/Db.ts
+++ b/packages/cli/src/Db.ts
@@ -1,193 +1,91 @@
-/* eslint-disable import/no-mutable-exports */
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/restrict-template-expressions */
-/* eslint-disable no-case-declarations */
-/* eslint-disable @typescript-eslint/naming-convention */
 import { Container } from 'typedi';
-import type { DataSourceOptions as ConnectionOptions, EntityManager, LoggerOptions } from 'typeorm';
-import { DataSource as Connection } from 'typeorm';
-import type { TlsOptions } from 'tls';
-import type { DatabaseType, IDatabaseCollections } from '@/Interfaces';
+import type { EntityManager } from '@n8n/typeorm';
+import { DataSource as Connection } from '@n8n/typeorm';
+import { ErrorReporterProxy as ErrorReporter } from 'n8n-workflow';
 
 import config from '@/config';
-
-import { entities } from '@db/entities';
-import {
-	getMariaDBConnectionOptions,
-	getMysqlConnectionOptions,
-	getOptionOverrides,
-	getPostgresConnectionOptions,
-	getSqliteConnectionOptions,
-} from '@db/config';
-import {
-	AuthIdentityRepository,
-	AuthProviderSyncHistoryRepository,
-	CredentialsRepository,
-	EventDestinationsRepository,
-	ExecutionMetadataRepository,
-	ExecutionRepository,
-	InstalledNodesRepository,
-	InstalledPackagesRepository,
-	RoleRepository,
-	SaveRequestLogRepository,
-	SettingsRepository,
-	SharedCredentialsRepository,
-	SharedWorkflowRepository,
-	TagRepository,
-	UserRepository,
-	VariablesRepository,
-	WebhookRepository,
-	WorkflowRepository,
-	WorkflowStatisticsRepository,
-	WorkflowTagMappingRepository,
-} from '@db/repositories';
-
-export let isInitialized = false;
-export const collections = {} as IDatabaseCollections;
+import { inTest } from '@/constants';
+import { wrapMigration } from '@db/utils/migrationHelpers';
+import type { Migration } from '@db/types';
+import { getConnectionOptions } from '@db/config';
 
 let connection: Connection;
 
 export const getConnection = () => connection!;
 
-export async function transaction<T>(fn: (entityManager: EntityManager) => Promise<T>): Promise<T> {
-	return connection.transaction(fn);
+type ConnectionState = {
+	connected: boolean;
+	migrated: boolean;
+};
+
+export const connectionState: ConnectionState = {
+	connected: false,
+	migrated: false,
+};
+
+// Ping DB connection every 2 seconds
+let pingTimer: NodeJS.Timer | undefined;
+if (!inTest) {
+	const pingDBFn = async () => {
+		if (connection?.isInitialized) {
+			try {
+				await connection.query('SELECT 1');
+				connectionState.connected = true;
+				return;
+			} catch (error) {
+				ErrorReporter.error(error);
+			} finally {
+				pingTimer = setTimeout(pingDBFn, 2000);
+			}
+		}
+		connectionState.connected = false;
+	};
+	pingTimer = setTimeout(pingDBFn, 2000);
 }
 
-export function getConnectionOptions(dbType: DatabaseType): ConnectionOptions {
-	switch (dbType) {
-		case 'postgresdb':
-			const sslCa = config.getEnv('database.postgresdb.ssl.ca');
-			const sslCert = config.getEnv('database.postgresdb.ssl.cert');
-			const sslKey = config.getEnv('database.postgresdb.ssl.key');
-			const sslRejectUnauthorized = config.getEnv('database.postgresdb.ssl.rejectUnauthorized');
-
-			let ssl: TlsOptions | undefined;
-			if (sslCa !== '' || sslCert !== '' || sslKey !== '' || !sslRejectUnauthorized) {
-				ssl = {
-					ca: sslCa || undefined,
-					cert: sslCert || undefined,
-					key: sslKey || undefined,
-					rejectUnauthorized: sslRejectUnauthorized,
-				};
-			}
+export async function transaction<T>(fn: (entityManager: EntityManager) => Promise<T>): Promise<T> {
+	return await connection.transaction(fn);
+}
 
-			return {
-				...getPostgresConnectionOptions(),
-				...getOptionOverrides('postgresdb'),
-				ssl,
-			};
-
-		case 'mariadb':
-		case 'mysqldb':
-			return {
-				...(dbType === 'mysqldb' ? getMysqlConnectionOptions() : getMariaDBConnectionOptions()),
-				...getOptionOverrides('mysqldb'),
-				timezone: 'Z', // set UTC as default
-			};
-
-		case 'sqlite':
-			return getSqliteConnectionOptions();
-
-		default:
-			throw new Error(`The database "${dbType}" is currently not supported!`);
+export async function setSchema(conn: Connection) {
+	const schema = config.getEnv('database.postgresdb.schema');
+	const searchPath = ['public'];
+	if (schema !== 'public') {
+		await conn.query(`CREATE SCHEMA IF NOT EXISTS ${schema}`);
+		searchPath.unshift(schema);
 	}
+	await conn.query(`SET search_path TO ${searchPath.join(',')};`);
 }
 
-export async function init(
-	testConnectionOptions?: ConnectionOptions,
-): Promise<IDatabaseCollections> {
-	if (isInitialized) return collections;
+export async function init(): Promise<void> {
+	if (connectionState.connected) return;
 
 	const dbType = config.getEnv('database.type');
-	const connectionOptions = testConnectionOptions ?? getConnectionOptions(dbType);
-
-	let loggingOption: LoggerOptions = config.getEnv('database.logging.enabled');
-
-	if (loggingOption) {
-		const optionsString = config.getEnv('database.logging.options').replace(/\s+/g, '');
-
-		if (optionsString === 'all') {
-			loggingOption = optionsString;
-		} else {
-			loggingOption = optionsString.split(',') as LoggerOptions;
-		}
-	}
-
-	const maxQueryExecutionTime = config.getEnv('database.logging.maxQueryExecutionTime');
-
-	Object.assign(connectionOptions, {
-		entities: Object.values(entities),
-		synchronize: false,
-		logging: loggingOption,
-		maxQueryExecutionTime,
-		migrationsTransactionMode: 'each',
-	});
+	const connectionOptions = getConnectionOptions();
 
 	connection = new Connection(connectionOptions);
 	Container.set(Connection, connection);
 	await connection.initialize();
 
 	if (dbType === 'postgresdb') {
-		const schema = config.getEnv('database.postgresdb.schema');
-		const searchPath = ['public'];
-		if (schema !== 'public') {
-			await connection.query(`CREATE SCHEMA IF NOT EXISTS ${schema}`);
-			searchPath.unshift(schema);
-		}
-		await connection.query(`SET search_path TO ${searchPath.join(',')};`);
+		await setSchema(connection);
 	}
 
-	if (!testConnectionOptions && dbType === 'sqlite') {
-		// This specific migration changes database metadata.
-		// A field is now nullable. We need to reconnect so that
-		// n8n knows it has changed. Happens only on sqlite.
-		let migrations = [];
-		try {
-			const entityPrefix = config.getEnv('database.tablePrefix');
-			migrations = await connection.query(
-				`SELECT id FROM ${entityPrefix}migrations where name = "MakeStoppedAtNullable1607431743769"`,
-			);
-		} catch (error) {
-			// Migration table does not exist yet - it will be created after migrations run for the first time.
-		}
+	connectionState.connected = true;
+}
 
-		// If you remove this call, remember to turn back on the
-		// setting to run migrations automatically above.
-		await connection.runMigrations({ transaction: 'each' });
+export async function migrate() {
+	(connection.options.migrations as Migration[]).forEach(wrapMigration);
+	await connection.runMigrations({ transaction: 'each' });
+	connectionState.migrated = true;
+}
 
-		// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-		if (migrations.length === 0) {
-			await connection.destroy();
-			connection = new Connection(connectionOptions);
-			Container.set(Connection, connection);
-			await connection.initialize();
-		}
-	} else {
-		await connection.runMigrations({ transaction: 'each' });
+export const close = async () => {
+	if (pingTimer) {
+		clearTimeout(pingTimer);
+		pingTimer = undefined;
 	}
 
-	collections.AuthIdentity = Container.get(AuthIdentityRepository);
-	collections.AuthProviderSyncHistory = Container.get(AuthProviderSyncHistoryRepository);
-	collections.Credentials = Container.get(CredentialsRepository);
-	collections.EventDestinations = Container.get(EventDestinationsRepository);
-	collections.Execution = Container.get(ExecutionRepository);
-	collections.ExecutionMetadata = Container.get(ExecutionMetadataRepository);
-	collections.InstalledNodes = Container.get(InstalledNodesRepository);
-	collections.InstalledPackages = Container.get(InstalledPackagesRepository);
-	collections.Role = Container.get(RoleRepository);
-	collections.Settings = Container.get(SettingsRepository);
-	collections.SharedCredentials = Container.get(SharedCredentialsRepository);
-	collections.SharedWorkflow = Container.get(SharedWorkflowRepository);
-	collections.Tag = Container.get(TagRepository);
-	collections.User = Container.get(UserRepository);
-	collections.Variables = Container.get(VariablesRepository);
-	collections.Webhook = Container.get(WebhookRepository);
-	collections.Workflow = Container.get(WorkflowRepository);
-	collections.WorkflowStatistics = Container.get(WorkflowStatisticsRepository);
-	collections.WorkflowTagMapping = Container.get(WorkflowTagMappingRepository);
-	collections.SaveRequestLog = Container.get(SaveRequestLogRepository);
-
-	isInitialized = true;
-
-	return collections;
-}
+	if (connection.isInitialized) await connection.destroy();
+};
diff --git a/packages/cli/src/ErrorReporting.ts b/packages/cli/src/ErrorReporting.ts
index f5f34d63f9754..33a1da0c39d57 100644
--- a/packages/cli/src/ErrorReporting.ts
+++ b/packages/cli/src/ErrorReporting.ts
@@ -1,12 +1,18 @@
+import { createHash } from 'crypto';
 import config from '@/config';
-import { ErrorReporterProxy } from 'n8n-workflow';
+import { ErrorReporterProxy, ApplicationError } from 'n8n-workflow';
 
 let initialized = false;
 
 export const initErrorHandling = async () => {
 	if (initialized) return;
 
-	if (!config.getEnv('diagnostics.enabled')) {
+	process.on('uncaughtException', (error) => {
+		ErrorReporterProxy.error(error);
+	});
+
+	const dsn = config.getEnv('diagnostics.config.sentry.dsn');
+	if (!dsn) {
 		initialized = true;
 		return;
 	}
@@ -14,32 +20,64 @@ export const initErrorHandling = async () => {
 	// Collect longer stacktraces
 	Error.stackTraceLimit = 50;
 
-	const dsn = config.getEnv('diagnostics.config.sentry.dsn');
-	const { N8N_VERSION: release, ENVIRONMENT: environment } = process.env;
+	const {
+		N8N_VERSION: release,
+		ENVIRONMENT: environment,
+		DEPLOYMENT_NAME: serverName,
+	} = process.env;
+
+	const { init, captureException, addEventProcessor } = await import('@sentry/node');
 
-	const { init, captureException } = await import('@sentry/node');
-	// eslint-disable-next-line @typescript-eslint/naming-convention
 	const { RewriteFrames } = await import('@sentry/integrations');
+	const { Integrations } = await import('@sentry/node');
 
+	const enabledIntegrations = [
+		'InboundFilters',
+		'FunctionToString',
+		'LinkedErrors',
+		'OnUnhandledRejection',
+		'ContextLines',
+	];
 	init({
 		dsn,
 		release,
 		environment,
-		integrations: (integrations) => {
-			integrations = integrations.filter(({ name }) => name !== 'OnUncaughtException');
-			integrations.push(new RewriteFrames({ root: process.cwd() }));
-			return integrations;
-		},
+		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,
+				},
+			}),
+		],
 	});
 
-	process.on('uncaughtException', (error) => {
-		ErrorReporterProxy.error(error);
-		if (
-			error.constructor?.name !== 'AxiosError' &&
-			!error.name.includes('ApplicationError') &&
-			!error.message.includes('Invalid URL Passed')
-		)
-			throw error;
+	const seenErrors = new Set<string>();
+	addEventProcessor((event, { originalException }) => {
+		if (!originalException) 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 };
+		}
+
+		const eventHash = createHash('sha1').update(JSON.stringify(originalException)).digest('base64');
+		if (seenErrors.has(eventHash)) return null;
+		seenErrors.add(eventHash);
+
+		return event;
 	});
 
 	ErrorReporterProxy.init({
diff --git a/packages/cli/src/ExpressionEvaluator.ts b/packages/cli/src/ExpressionEvaluator.ts
new file mode 100644
index 0000000000000..1b53f845dc1c5
--- /dev/null
+++ b/packages/cli/src/ExpressionEvaluator.ts
@@ -0,0 +1,14 @@
+import config from '@/config';
+import { ErrorReporterProxy, ExpressionEvaluatorProxy } from 'n8n-workflow';
+
+export const initExpressionEvaluator = () => {
+	ExpressionEvaluatorProxy.setEvaluator(config.getEnv('expression.evaluator'));
+	ExpressionEvaluatorProxy.setDifferEnabled(config.getEnv('expression.reportDifference'));
+	ExpressionEvaluatorProxy.setDiffReporter((expr) => {
+		ErrorReporterProxy.warn('Expression difference', {
+			extra: {
+				expression: expr,
+			},
+		});
+	});
+};
diff --git a/packages/cli/src/ExternalHooks.ts b/packages/cli/src/ExternalHooks.ts
index 56743062797b9..4fa404e2c531e 100644
--- a/packages/cli/src/ExternalHooks.ts
+++ b/packages/cli/src/ExternalHooks.ts
@@ -1,23 +1,47 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
-/* eslint-disable import/no-dynamic-require */
-/* eslint-disable no-restricted-syntax */
 import { Service } from 'typedi';
-import * as Db from '@/Db';
-import type {
-	IExternalHooksClass,
-	IExternalHooksFileData,
-	IExternalHooksFunctions,
-} from '@/Interfaces';
-
+import type { IExternalHooksFileData, IExternalHooksFunctions } from '@/Interfaces';
 import config from '@/config';
+import { UserRepository } from '@db/repositories/user.repository';
+import { CredentialsRepository } from '@db/repositories/credentials.repository';
+import { SettingsRepository } from '@db/repositories/settings.repository';
+import { WorkflowRepository } from '@db/repositories/workflow.repository';
+import { WorkflowTestRepository } from '@db/repositories/workflowTest.repository';
+import { NodeOutputRepository } from '@db/repositories/nodeOutput.repository';
+import { ResumeWorkflowTimerRepository } from '@db/repositories/resumeWorkflowTimer.repository';
+import { ApplicationError } from 'n8n-workflow';
 
 @Service()
-export class ExternalHooks implements IExternalHooksClass {
+export class ExternalHooks {
 	externalHooks: {
 		[key: string]: Array<() => {}>;
 	} = {};
 
-	initDidRun = false;
+	private initDidRun = false;
+
+	private dbCollections: IExternalHooksFunctions['dbCollections'];
+
+	constructor(
+		userRepository: UserRepository,
+		settingsRepository: SettingsRepository,
+		credentialsRepository: CredentialsRepository,
+		workflowRepository: WorkflowRepository,
+		workflowTestRepository: WorkflowTestRepository,
+		nodeOutputRepository: NodeOutputRepository,
+		resumeWorkflowTimerRepository: ResumeWorkflowTimerRepository,
+	) {
+		/* eslint-disable @typescript-eslint/naming-convention */
+		this.dbCollections = {
+			User: userRepository,
+			Settings: settingsRepository,
+			Credentials: credentialsRepository,
+			Workflow: workflowRepository,
+			WorkflowTest: workflowTestRepository,
+			NodeOutput: nodeOutputRepository,
+			ResumeWorkflowTimer: resumeWorkflowTimerRepository,
+		};
+		/* eslint-enable @typescript-eslint/naming-convention */
+	}
 
 	async init(): Promise<void> {
 		if (this.initDidRun) {
@@ -51,16 +75,15 @@ export class ExternalHooks implements IExternalHooksClass {
 						delete require.cache[require.resolve(hookFilePath)];
 					}
 
-					// eslint-disable-next-line import/no-dynamic-require
-					// eslint-disable-next-line global-require
 					const hookFile = require(hookFilePath) as IExternalHooksFileData;
 					this.loadHooks(hookFile);
-				} catch (error) {
-					throw new Error(
-						// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/restrict-template-expressions
-						`Problem loading external hook file "${hookFilePath}": ${error.message}`,
-						{ cause: error as Error },
-					);
+				} catch (e) {
+					const error = e instanceof Error ? e : new Error(`${e}`);
+
+					throw new ApplicationError('Problem loading external hook file', {
+						extra: { errorMessage: error.message, hookFilePath },
+						cause: error,
+					});
 				}
 			}
 		}
@@ -85,18 +108,16 @@ export class ExternalHooks implements IExternalHooksClass {
 		}
 	}
 
-	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	async run(hookName: string, hookParameters?: any[]): Promise<void> {
-		const externalHookFunctions: IExternalHooksFunctions = {
-			dbCollections: Db.collections,
-		};
-
 		if (this.externalHooks[hookName] === undefined) {
 			return;
 		}
 
+		const externalHookFunctions: IExternalHooksFunctions = {
+			dbCollections: this.dbCollections,
+		};
+
 		for (const externalHookFunction of this.externalHooks[hookName]) {
-			// eslint-disable-next-line no-await-in-loop, @typescript-eslint/await-thenable
 			await externalHookFunction.apply(externalHookFunctions, hookParameters);
 		}
 	}
diff --git a/packages/cli/src/ExternalSecrets/ExternalSecrets.controller.ee.ts b/packages/cli/src/ExternalSecrets/ExternalSecrets.controller.ee.ts
new file mode 100644
index 0000000000000..86a61b75a0a76
--- /dev/null
+++ b/packages/cli/src/ExternalSecrets/ExternalSecrets.controller.ee.ts
@@ -0,0 +1,107 @@
+import { Get, Post, RestController, GlobalScope } from '@/decorators';
+import { ExternalSecretsRequest } from '@/requests';
+import { Response } from 'express';
+import { ExternalSecretsService } from './ExternalSecrets.service.ee';
+import { ExternalSecretsProviderNotFoundError } from '@/errors/external-secrets-provider-not-found.error';
+import { NotFoundError } from '@/errors/response-errors/not-found.error';
+
+@RestController('/external-secrets')
+export class ExternalSecretsController {
+	constructor(private readonly secretsService: ExternalSecretsService) {}
+
+	@Get('/providers')
+	@GlobalScope('externalSecretsProvider:list')
+	async getProviders() {
+		return await this.secretsService.getProviders();
+	}
+
+	@Get('/providers/:provider')
+	@GlobalScope('externalSecretsProvider:read')
+	async getProvider(req: ExternalSecretsRequest.GetProvider) {
+		const providerName = req.params.provider;
+		try {
+			return this.secretsService.getProvider(providerName);
+		} catch (e) {
+			if (e instanceof ExternalSecretsProviderNotFoundError) {
+				throw new NotFoundError(`Could not find provider "${e.providerName}"`);
+			}
+			throw e;
+		}
+	}
+
+	@Post('/providers/:provider/test')
+	@GlobalScope('externalSecretsProvider:read')
+	async testProviderSettings(req: ExternalSecretsRequest.TestProviderSettings, res: Response) {
+		const providerName = req.params.provider;
+		try {
+			const result = await this.secretsService.testProviderSettings(providerName, req.body);
+			if (result.success) {
+				res.statusCode = 200;
+			} else {
+				res.statusCode = 400;
+			}
+			return result;
+		} catch (e) {
+			if (e instanceof ExternalSecretsProviderNotFoundError) {
+				throw new NotFoundError(`Could not find provider "${e.providerName}"`);
+			}
+			throw e;
+		}
+	}
+
+	@Post('/providers/:provider')
+	@GlobalScope('externalSecretsProvider:create')
+	async setProviderSettings(req: ExternalSecretsRequest.SetProviderSettings) {
+		const providerName = req.params.provider;
+		try {
+			await this.secretsService.saveProviderSettings(providerName, req.body, req.user.id);
+		} catch (e) {
+			if (e instanceof ExternalSecretsProviderNotFoundError) {
+				throw new NotFoundError(`Could not find provider "${e.providerName}"`);
+			}
+			throw e;
+		}
+		return {};
+	}
+
+	@Post('/providers/:provider/connect')
+	@GlobalScope('externalSecretsProvider:update')
+	async setProviderConnected(req: ExternalSecretsRequest.SetProviderConnected) {
+		const providerName = req.params.provider;
+		try {
+			await this.secretsService.saveProviderConnected(providerName, req.body.connected);
+		} catch (e) {
+			if (e instanceof ExternalSecretsProviderNotFoundError) {
+				throw new NotFoundError(`Could not find provider "${e.providerName}"`);
+			}
+			throw e;
+		}
+		return {};
+	}
+
+	@Post('/providers/:provider/update')
+	@GlobalScope('externalSecretsProvider:sync')
+	async updateProvider(req: ExternalSecretsRequest.UpdateProvider, res: Response) {
+		const providerName = req.params.provider;
+		try {
+			const resp = await this.secretsService.updateProvider(providerName);
+			if (resp) {
+				res.statusCode = 200;
+			} else {
+				res.statusCode = 400;
+			}
+			return { updated: resp };
+		} catch (e) {
+			if (e instanceof ExternalSecretsProviderNotFoundError) {
+				throw new NotFoundError(`Could not find provider "${e.providerName}"`);
+			}
+			throw e;
+		}
+	}
+
+	@Get('/secrets')
+	@GlobalScope('externalSecret:list')
+	getSecretNames() {
+		return this.secretsService.getAllSecrets();
+	}
+}
diff --git a/packages/cli/src/ExternalSecrets/ExternalSecrets.service.ee.ts b/packages/cli/src/ExternalSecrets/ExternalSecrets.service.ee.ts
new file mode 100644
index 0000000000000..0c378540acc18
--- /dev/null
+++ b/packages/cli/src/ExternalSecrets/ExternalSecrets.service.ee.ts
@@ -0,0 +1,148 @@
+import { CREDENTIAL_BLANKING_VALUE } from '@/constants';
+import type { SecretsProvider } from '@/Interfaces';
+import type { ExternalSecretsRequest } from '@/requests';
+import type { IDataObject } from 'n8n-workflow';
+import { deepCopy } from 'n8n-workflow';
+import Container, { Service } from 'typedi';
+import { ExternalSecretsManager } from './ExternalSecretsManager.ee';
+import { ExternalSecretsProviderNotFoundError } from '@/errors/external-secrets-provider-not-found.error';
+
+@Service()
+export class ExternalSecretsService {
+	getProvider(providerName: string): ExternalSecretsRequest.GetProviderResponse | null {
+		const providerAndSettings =
+			Container.get(ExternalSecretsManager).getProviderWithSettings(providerName);
+		if (!providerAndSettings) {
+			throw new ExternalSecretsProviderNotFoundError(providerName);
+		}
+		const { provider, settings } = providerAndSettings;
+		return {
+			displayName: provider.displayName,
+			name: provider.name,
+			icon: provider.name,
+			state: provider.state,
+			connected: settings.connected,
+			connectedAt: settings.connectedAt,
+			properties: provider.properties,
+			data: this.redact(settings.settings, provider),
+		};
+	}
+
+	async getProviders() {
+		return Container.get(ExternalSecretsManager)
+			.getProvidersWithSettings()
+			.map(({ provider, settings }) => ({
+				displayName: provider.displayName,
+				name: provider.name,
+				icon: provider.name,
+				state: provider.state,
+				connected: !!settings.connected,
+				connectedAt: settings.connectedAt,
+				data: this.redact(settings.settings, provider),
+			}));
+	}
+
+	// Take data and replace all sensitive values with a sentinel value.
+	// This will replace password fields and oauth data.
+	redact(data: IDataObject, provider: SecretsProvider): IDataObject {
+		const copiedData = deepCopy(data || {});
+
+		const properties = provider.properties;
+
+		for (const dataKey of Object.keys(copiedData)) {
+			// The frontend only cares that this value isn't falsy.
+			if (dataKey === 'oauthTokenData') {
+				copiedData[dataKey] = CREDENTIAL_BLANKING_VALUE;
+				continue;
+			}
+			const prop = properties.find((v) => v.name === dataKey);
+			if (!prop) {
+				continue;
+			}
+
+			if (
+				prop.typeOptions?.password &&
+				(!(copiedData[dataKey] as string).startsWith('=') || prop.noDataExpression)
+			) {
+				copiedData[dataKey] = CREDENTIAL_BLANKING_VALUE;
+			}
+		}
+
+		return copiedData;
+	}
+
+	private unredactRestoreValues(unmerged: any, replacement: any) {
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+		for (const [key, value] of Object.entries(unmerged)) {
+			if (value === CREDENTIAL_BLANKING_VALUE) {
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
+				unmerged[key] = replacement[key];
+			} else if (
+				typeof value === 'object' &&
+				value !== null &&
+				key in replacement &&
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+				typeof replacement[key] === 'object' &&
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+				replacement[key] !== null
+			) {
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+				this.unredactRestoreValues(value, replacement[key]);
+			}
+		}
+	}
+
+	// Take unredacted data (probably from the DB) and merge it with
+	// redacted data to create an unredacted version.
+	unredact(redactedData: IDataObject, savedData: IDataObject): IDataObject {
+		// Replace any blank sentinel values with their saved version
+		const mergedData = deepCopy(redactedData ?? {});
+		this.unredactRestoreValues(mergedData, savedData);
+		return mergedData;
+	}
+
+	async saveProviderSettings(providerName: string, data: IDataObject, userId: string) {
+		const providerAndSettings =
+			Container.get(ExternalSecretsManager).getProviderWithSettings(providerName);
+		if (!providerAndSettings) {
+			throw new ExternalSecretsProviderNotFoundError(providerName);
+		}
+		const { settings } = providerAndSettings;
+		const newData = this.unredact(data, settings.settings);
+		await Container.get(ExternalSecretsManager).setProviderSettings(providerName, newData, userId);
+	}
+
+	async saveProviderConnected(providerName: string, connected: boolean) {
+		const providerAndSettings =
+			Container.get(ExternalSecretsManager).getProviderWithSettings(providerName);
+		if (!providerAndSettings) {
+			throw new ExternalSecretsProviderNotFoundError(providerName);
+		}
+		await Container.get(ExternalSecretsManager).setProviderConnected(providerName, connected);
+		return this.getProvider(providerName);
+	}
+
+	getAllSecrets(): Record<string, string[]> {
+		return Container.get(ExternalSecretsManager).getAllSecretNames();
+	}
+
+	async testProviderSettings(providerName: string, data: IDataObject) {
+		const providerAndSettings =
+			Container.get(ExternalSecretsManager).getProviderWithSettings(providerName);
+		if (!providerAndSettings) {
+			throw new ExternalSecretsProviderNotFoundError(providerName);
+		}
+		const { settings } = providerAndSettings;
+		const newData = this.unredact(data, settings.settings);
+		return await Container.get(ExternalSecretsManager).testProviderSettings(providerName, newData);
+	}
+
+	async updateProvider(providerName: string) {
+		const providerAndSettings =
+			Container.get(ExternalSecretsManager).getProviderWithSettings(providerName);
+		if (!providerAndSettings) {
+			throw new ExternalSecretsProviderNotFoundError(providerName);
+		}
+		return await Container.get(ExternalSecretsManager).updateProvider(providerName);
+	}
+}
diff --git a/packages/cli/src/ExternalSecrets/ExternalSecretsManager.ee.ts b/packages/cli/src/ExternalSecrets/ExternalSecretsManager.ee.ts
new file mode 100644
index 0000000000000..597c782c25b4b
--- /dev/null
+++ b/packages/cli/src/ExternalSecrets/ExternalSecretsManager.ee.ts
@@ -0,0 +1,389 @@
+import { SettingsRepository } from '@db/repositories/settings.repository';
+import type {
+	ExternalSecretsSettings,
+	SecretsProvider,
+	SecretsProviderSettings,
+} from '@/Interfaces';
+
+import { Cipher } from 'n8n-core';
+import Container, { Service } from 'typedi';
+
+import { Logger } from '@/Logger';
+
+import { jsonParse, type IDataObject, ApplicationError } from 'n8n-workflow';
+import { EXTERNAL_SECRETS_INITIAL_BACKOFF, EXTERNAL_SECRETS_MAX_BACKOFF } from './constants';
+import { License } from '@/License';
+import { InternalHooks } from '@/InternalHooks';
+import { updateIntervalTime } from './externalSecretsHelper.ee';
+import { ExternalSecretsProviders } from './ExternalSecretsProviders.ee';
+import { OrchestrationService } from '@/services/orchestration.service';
+
+@Service()
+export class ExternalSecretsManager {
+	private providers: Record<string, SecretsProvider> = {};
+
+	private initializingPromise?: Promise<void>;
+
+	private cachedSettings: ExternalSecretsSettings = {};
+
+	initialized = false;
+
+	updateInterval: NodeJS.Timer;
+
+	initRetryTimeouts: Record<string, NodeJS.Timer> = {};
+
+	constructor(
+		private readonly logger: Logger,
+		private readonly settingsRepo: SettingsRepository,
+		private readonly license: License,
+		private readonly secretsProviders: ExternalSecretsProviders,
+		private readonly cipher: Cipher,
+	) {}
+
+	async init(): Promise<void> {
+		if (!this.initialized) {
+			if (!this.initializingPromise) {
+				this.initializingPromise = new Promise<void>(async (resolve) => {
+					await this.internalInit();
+					this.initialized = true;
+					resolve();
+					this.initializingPromise = undefined;
+					this.updateInterval = setInterval(
+						async () => await this.updateSecrets(),
+						updateIntervalTime(),
+					);
+				});
+			}
+			return await this.initializingPromise;
+		}
+	}
+
+	shutdown() {
+		clearInterval(this.updateInterval);
+		Object.values(this.providers).forEach((p) => {
+			// Disregard any errors as we're shutting down anyway
+			void p.disconnect().catch(() => {});
+		});
+		Object.values(this.initRetryTimeouts).forEach((v) => clearTimeout(v));
+	}
+
+	async reloadAllProviders(backoff?: number) {
+		this.logger.debug('Reloading all external secrets providers');
+		const providers = this.getProviderNames();
+		if (!providers) {
+			return;
+		}
+		for (const provider of providers) {
+			await this.reloadProvider(provider, backoff);
+		}
+	}
+
+	async broadcastReloadExternalSecretsProviders() {
+		await Container.get(OrchestrationService).publish('reloadExternalSecretsProviders');
+	}
+
+	private decryptSecretsSettings(value: string): ExternalSecretsSettings {
+		const decryptedData = this.cipher.decrypt(value);
+		try {
+			return jsonParse(decryptedData);
+		} catch (e) {
+			throw new ApplicationError(
+				'External Secrets Settings could not be decrypted. The likely reason is that a different "encryptionKey" was used to encrypt the data.',
+			);
+		}
+	}
+
+	private async getDecryptedSettings(
+		settingsRepo: SettingsRepository,
+	): Promise<ExternalSecretsSettings | null> {
+		const encryptedSettings = await settingsRepo.getEncryptedSecretsProviderSettings();
+		if (encryptedSettings === null) {
+			return null;
+		}
+		return this.decryptSecretsSettings(encryptedSettings);
+	}
+
+	private async internalInit() {
+		const settings = await this.getDecryptedSettings(this.settingsRepo);
+		if (!settings) {
+			return;
+		}
+		const providers: Array<SecretsProvider | null> = (
+			await Promise.allSettled(
+				Object.entries(settings).map(
+					async ([name, providerSettings]) => await this.initProvider(name, providerSettings),
+				),
+			)
+		).map((i) => (i.status === 'rejected' ? null : i.value));
+		this.providers = Object.fromEntries(
+			(providers.filter((p) => p !== null) as SecretsProvider[]).map((s) => [s.name, s]),
+		);
+		this.cachedSettings = settings;
+		await this.updateSecrets();
+	}
+
+	private async initProvider(
+		name: string,
+		providerSettings: SecretsProviderSettings,
+		currentBackoff = EXTERNAL_SECRETS_INITIAL_BACKOFF,
+	) {
+		const providerClass = this.secretsProviders.getProvider(name);
+		if (!providerClass) {
+			return null;
+		}
+		const provider: SecretsProvider = new providerClass();
+
+		try {
+			await provider.init(providerSettings);
+		} catch (e) {
+			this.logger.error(
+				`Error initializing secrets provider ${provider.displayName} (${provider.name}).`,
+			);
+			this.retryInitWithBackoff(name, currentBackoff);
+			return provider;
+		}
+
+		try {
+			if (providerSettings.connected) {
+				await provider.connect();
+			}
+		} catch (e) {
+			try {
+				await provider.disconnect();
+			} catch {}
+			this.logger.error(
+				`Error initializing secrets provider ${provider.displayName} (${provider.name}).`,
+			);
+			this.retryInitWithBackoff(name, currentBackoff);
+			return provider;
+		}
+
+		return provider;
+	}
+
+	private retryInitWithBackoff(name: string, currentBackoff: number) {
+		if (name in this.initRetryTimeouts) {
+			clearTimeout(this.initRetryTimeouts[name]);
+			delete this.initRetryTimeouts[name];
+		}
+		this.initRetryTimeouts[name] = setTimeout(() => {
+			delete this.initRetryTimeouts[name];
+			if (this.providers[name] && this.providers[name].state !== 'error') {
+				return;
+			}
+			void this.reloadProvider(name, Math.min(currentBackoff * 2, EXTERNAL_SECRETS_MAX_BACKOFF));
+		}, currentBackoff);
+	}
+
+	async updateSecrets() {
+		if (!this.license.isExternalSecretsEnabled()) {
+			return;
+		}
+		await Promise.allSettled(
+			Object.entries(this.providers).map(async ([k, p]) => {
+				try {
+					if (this.cachedSettings[k].connected && p.state === 'connected') {
+						await p.update();
+					}
+				} catch {
+					this.logger.error(`Error updating secrets provider ${p.displayName} (${p.name}).`);
+				}
+			}),
+		);
+	}
+
+	getProvider(provider: string): SecretsProvider | undefined {
+		return this.providers[provider];
+	}
+
+	hasProvider(provider: string): boolean {
+		return provider in this.providers;
+	}
+
+	getProviderNames(): string[] | undefined {
+		return Object.keys(this.providers);
+	}
+
+	getSecret(provider: string, name: string) {
+		return this.getProvider(provider)?.getSecret(name);
+	}
+
+	hasSecret(provider: string, name: string): boolean {
+		return this.getProvider(provider)?.hasSecret(name) ?? false;
+	}
+
+	getSecretNames(provider: string): string[] | undefined {
+		return this.getProvider(provider)?.getSecretNames();
+	}
+
+	getAllSecretNames(): Record<string, string[]> {
+		return Object.fromEntries(
+			Object.keys(this.providers).map((provider) => [
+				provider,
+				this.getSecretNames(provider) ?? [],
+			]),
+		);
+	}
+
+	getProvidersWithSettings(): Array<{
+		provider: SecretsProvider;
+		settings: SecretsProviderSettings;
+	}> {
+		return Object.entries(this.secretsProviders.getAllProviders()).map(([k, c]) => ({
+			provider: this.getProvider(k) ?? new c(),
+			settings: this.cachedSettings[k] ?? {},
+		}));
+	}
+
+	getProviderWithSettings(provider: string):
+		| {
+				provider: SecretsProvider;
+				settings: SecretsProviderSettings;
+		  }
+		| undefined {
+		const providerConstructor = this.secretsProviders.getProvider(provider);
+		if (!providerConstructor) {
+			return undefined;
+		}
+		return {
+			provider: this.getProvider(provider) ?? new providerConstructor(),
+			settings: this.cachedSettings[provider] ?? {},
+		};
+	}
+
+	async reloadProvider(provider: string, backoff = EXTERNAL_SECRETS_INITIAL_BACKOFF) {
+		if (provider in this.providers) {
+			await this.providers[provider].disconnect();
+			delete this.providers[provider];
+		}
+		const newProvider = await this.initProvider(provider, this.cachedSettings[provider], backoff);
+		if (newProvider) {
+			this.providers[provider] = newProvider;
+		}
+	}
+
+	async setProviderSettings(provider: string, data: IDataObject, userId?: string) {
+		let isNewProvider = false;
+		let settings = await this.getDecryptedSettings(this.settingsRepo);
+		if (!settings) {
+			settings = {};
+		}
+		if (!(provider in settings)) {
+			isNewProvider = true;
+		}
+		settings[provider] = {
+			connected: settings[provider]?.connected ?? false,
+			connectedAt: settings[provider]?.connectedAt ?? new Date(),
+			settings: data,
+		};
+
+		await this.saveAndSetSettings(settings, this.settingsRepo);
+		this.cachedSettings = settings;
+		await this.reloadProvider(provider);
+		await this.broadcastReloadExternalSecretsProviders();
+
+		void this.trackProviderSave(provider, isNewProvider, userId);
+	}
+
+	async setProviderConnected(provider: string, connected: boolean) {
+		let settings = await this.getDecryptedSettings(this.settingsRepo);
+		if (!settings) {
+			settings = {};
+		}
+		settings[provider] = {
+			connected,
+			connectedAt: connected ? new Date() : settings[provider]?.connectedAt ?? null,
+			settings: settings[provider]?.settings ?? {},
+		};
+
+		await this.saveAndSetSettings(settings, this.settingsRepo);
+		this.cachedSettings = settings;
+		await this.reloadProvider(provider);
+		await this.updateSecrets();
+		await this.broadcastReloadExternalSecretsProviders();
+	}
+
+	private async trackProviderSave(vaultType: string, isNew: boolean, userId?: string) {
+		let testResult: [boolean] | [boolean, string] | undefined;
+		try {
+			testResult = await this.getProvider(vaultType)?.test();
+		} catch {}
+		void Container.get(InternalHooks).onExternalSecretsProviderSettingsSaved({
+			user_id: userId,
+			vault_type: vaultType,
+			is_new: isNew,
+			is_valid: testResult?.[0] ?? false,
+			error_message: testResult?.[1],
+		});
+	}
+
+	private encryptSecretsSettings(settings: ExternalSecretsSettings): string {
+		return this.cipher.encrypt(settings);
+	}
+
+	async saveAndSetSettings(settings: ExternalSecretsSettings, settingsRepo: SettingsRepository) {
+		const encryptedSettings = this.encryptSecretsSettings(settings);
+		await settingsRepo.saveEncryptedSecretsProviderSettings(encryptedSettings);
+	}
+
+	async testProviderSettings(
+		provider: string,
+		data: IDataObject,
+	): Promise<{
+		success: boolean;
+		testState: 'connected' | 'tested' | 'error';
+		error?: string;
+	}> {
+		let testProvider: SecretsProvider | null = null;
+		try {
+			testProvider = await this.initProvider(provider, {
+				connected: true,
+				connectedAt: new Date(),
+				settings: data,
+			});
+			if (!testProvider) {
+				return {
+					success: false,
+					testState: 'error',
+				};
+			}
+			const [success, error] = await testProvider.test();
+			let testState: 'connected' | 'tested' | 'error' = 'error';
+			if (success && this.cachedSettings[provider]?.connected) {
+				testState = 'connected';
+			} else if (success) {
+				testState = 'tested';
+			}
+			return {
+				success,
+				testState,
+				error,
+			};
+		} catch {
+			return {
+				success: false,
+				testState: 'error',
+			};
+		} finally {
+			if (testProvider) {
+				await testProvider.disconnect();
+			}
+		}
+	}
+
+	async updateProvider(provider: string): Promise<boolean> {
+		if (!this.license.isExternalSecretsEnabled()) {
+			return false;
+		}
+		if (!this.providers[provider] || this.providers[provider].state !== 'connected') {
+			return false;
+		}
+		try {
+			await this.providers[provider].update();
+			await this.broadcastReloadExternalSecretsProviders();
+			return true;
+		} catch {
+			return false;
+		}
+	}
+}
diff --git a/packages/cli/src/ExternalSecrets/ExternalSecretsProviders.ee.ts b/packages/cli/src/ExternalSecrets/ExternalSecretsProviders.ee.ts
new file mode 100644
index 0000000000000..f7367064a3413
--- /dev/null
+++ b/packages/cli/src/ExternalSecrets/ExternalSecretsProviders.ee.ts
@@ -0,0 +1,26 @@
+import type { SecretsProvider } from '@/Interfaces';
+import { Service } from 'typedi';
+import { InfisicalProvider } from './providers/infisical';
+import { VaultProvider } from './providers/vault';
+import { AwsSecretsManager } from './providers/aws-secrets/aws-secrets-manager';
+
+@Service()
+export class ExternalSecretsProviders {
+	providers: Record<string, { new (): SecretsProvider }> = {
+		awsSecretsManager: AwsSecretsManager,
+		infisical: InfisicalProvider,
+		vault: VaultProvider,
+	};
+
+	getProvider(name: string): { new (): SecretsProvider } | null {
+		return this.providers[name] ?? null;
+	}
+
+	hasProvider(name: string) {
+		return name in this.providers;
+	}
+
+	getAllProviders() {
+		return this.providers;
+	}
+}
diff --git a/packages/cli/src/ExternalSecrets/constants.ts b/packages/cli/src/ExternalSecrets/constants.ts
new file mode 100644
index 0000000000000..d62dd1e459ae6
--- /dev/null
+++ b/packages/cli/src/ExternalSecrets/constants.ts
@@ -0,0 +1,5 @@
+export const EXTERNAL_SECRETS_DB_KEY = 'feature.externalSecrets';
+export const EXTERNAL_SECRETS_INITIAL_BACKOFF = 10 * 1000;
+export const EXTERNAL_SECRETS_MAX_BACKOFF = 5 * 60 * 1000;
+
+export const EXTERNAL_SECRETS_NAME_REGEX = /^[a-zA-Z0-9\-\_\/]+$/;
diff --git a/packages/cli/src/ExternalSecrets/externalSecretsHelper.ee.ts b/packages/cli/src/ExternalSecrets/externalSecretsHelper.ee.ts
new file mode 100644
index 0000000000000..b498216744add
--- /dev/null
+++ b/packages/cli/src/ExternalSecrets/externalSecretsHelper.ee.ts
@@ -0,0 +1,11 @@
+import { License } from '@/License';
+import config from '@/config';
+import Container from 'typedi';
+
+export const updateIntervalTime = () => config.getEnv('externalSecrets.updateInterval') * 1000;
+export const preferGet = () => config.getEnv('externalSecrets.preferGet');
+
+export function isExternalSecretsEnabled() {
+	const license = Container.get(License);
+	return license.isExternalSecretsEnabled();
+}
diff --git a/packages/cli/src/ExternalSecrets/providers/aws-secrets/aws-secrets-client.ts b/packages/cli/src/ExternalSecrets/providers/aws-secrets/aws-secrets-client.ts
new file mode 100644
index 0000000000000..0241f719bc8ec
--- /dev/null
+++ b/packages/cli/src/ExternalSecrets/providers/aws-secrets/aws-secrets-client.ts
@@ -0,0 +1,151 @@
+import axios from 'axios';
+import * as aws4 from 'aws4';
+import type { AxiosRequestConfig } from 'axios';
+import type { Request as Aws4Options } from 'aws4';
+import type {
+	AwsSecretsManagerContext,
+	ConnectionTestResult,
+	Secret,
+	SecretsNamesPage,
+	SecretsPage,
+	AwsSecretsClientSettings,
+} from './types';
+
+export class AwsSecretsClient {
+	private settings: AwsSecretsClientSettings = {
+		region: '',
+		host: '',
+		url: '',
+		accessKeyId: '',
+		secretAccessKey: '',
+	};
+
+	constructor(settings: AwsSecretsManagerContext['settings']) {
+		const { region, accessKeyId, secretAccessKey } = settings;
+
+		this.settings = {
+			region,
+			host: `secretsmanager.${region}.amazonaws.com`,
+			url: `https://secretsmanager.${region}.amazonaws.com`,
+			accessKeyId,
+			secretAccessKey,
+		};
+	}
+
+	/**
+	 * Check whether the client can connect to AWS Secrets Manager.
+	 */
+	async checkConnection(): ConnectionTestResult {
+		try {
+			await this.fetchSecretsNamesPage();
+			return [true];
+		} catch (e) {
+			const error = e instanceof Error ? e : new Error(`${e}`);
+			return [false, error.message];
+		}
+	}
+
+	/**
+	 * Fetch all secrets from AWS Secrets Manager.
+	 */
+	async fetchAllSecrets() {
+		const secrets: Secret[] = [];
+
+		const allSecretsNames = await this.fetchAllSecretsNames();
+
+		const batches = this.batch(allSecretsNames);
+
+		for (const batch of batches) {
+			const page = await this.fetchSecretsPage(batch);
+
+			secrets.push(
+				...page.SecretValues.map((s) => ({ secretName: s.Name, secretValue: s.SecretString })),
+			);
+		}
+
+		return secrets;
+	}
+
+	private batch<T>(arr: T[], size = 20): T[][] {
+		return Array.from({ length: Math.ceil(arr.length / size) }, (_, index) =>
+			arr.slice(index * size, (index + 1) * size),
+		);
+	}
+
+	private toRequestOptions(
+		action: 'ListSecrets' | 'BatchGetSecretValue',
+		body: string,
+	): Aws4Options {
+		return {
+			method: 'POST',
+			service: 'secretsmanager',
+			region: this.settings.region,
+			host: this.settings.host,
+			headers: {
+				'X-Amz-Target': `secretsmanager.${action}`,
+				'Content-Type': 'application/x-amz-json-1.1',
+			},
+			body,
+		};
+	}
+
+	/**
+	 * @doc https://docs.aws.amazon.com/secretsmanager/latest/apireference/API_BatchGetSecretValue.html
+	 */
+	private async fetchSecretsPage(secretsNames: string[], nextToken?: string) {
+		const body = JSON.stringify(
+			nextToken
+				? { SecretIdList: secretsNames, NextToken: nextToken }
+				: { SecretIdList: secretsNames },
+		);
+
+		const options = this.toRequestOptions('BatchGetSecretValue', body);
+		const { headers } = aws4.sign(options, this.settings);
+
+		const config: AxiosRequestConfig = {
+			method: 'POST',
+			url: this.settings.url,
+			headers,
+			data: body,
+		};
+
+		const response = await axios.request<SecretsPage>(config);
+
+		return response.data;
+	}
+
+	private async fetchAllSecretsNames() {
+		const names: string[] = [];
+
+		let nextToken: string | undefined;
+
+		do {
+			const page = await this.fetchSecretsNamesPage(nextToken);
+			names.push(...page.SecretList.map((s) => s.Name));
+			nextToken = page.NextToken;
+		} while (nextToken);
+
+		return names;
+	}
+
+	/**
+	 * @doc https://docs.aws.amazon.com/secretsmanager/latest/apireference/API_ListSecrets.html
+	 */
+	private async fetchSecretsNamesPage(nextToken?: string) {
+		const body = JSON.stringify(nextToken ? { NextToken: nextToken } : {});
+
+		const options = this.toRequestOptions('ListSecrets', body);
+		const { headers } = aws4.sign(options, this.settings);
+
+		const config: AxiosRequestConfig = {
+			method: 'POST',
+			url: this.settings.url,
+			headers,
+			data: body,
+		};
+
+		const response = await axios.request<SecretsNamesPage>(config);
+
+		return response.data;
+	}
+}
diff --git a/packages/cli/src/ExternalSecrets/providers/aws-secrets/aws-secrets-manager.ts b/packages/cli/src/ExternalSecrets/providers/aws-secrets/aws-secrets-manager.ts
new file mode 100644
index 0000000000000..986b2fcadc104
--- /dev/null
+++ b/packages/cli/src/ExternalSecrets/providers/aws-secrets/aws-secrets-manager.ts
@@ -0,0 +1,131 @@
+import { AwsSecretsClient } from './aws-secrets-client';
+import { UnknownAuthTypeError } from '@/errors/unknown-auth-type.error';
+import { EXTERNAL_SECRETS_NAME_REGEX } from '@/ExternalSecrets/constants';
+import type { SecretsProvider, SecretsProviderState } from '@/Interfaces';
+import type { INodeProperties } from 'n8n-workflow';
+import type { AwsSecretsManagerContext } from './types';
+
+export class AwsSecretsManager implements SecretsProvider {
+	name = 'awsSecretsManager';
+
+	displayName = 'AWS Secrets Manager';
+
+	state: SecretsProviderState = 'initializing';
+
+	properties: INodeProperties[] = [
+		{
+			displayName:
+				'Need help filling out these fields? <a href="https://docs.n8n.io/external-secrets/#connect-n8n-to-your-secrets-store" target="_blank">Open docs</a>',
+			name: 'notice',
+			type: 'notice',
+			default: '',
+			noDataExpression: true,
+		},
+		{
+			displayName: 'Region',
+			name: 'region',
+			type: 'string',
+			default: '',
+			required: true,
+			placeholder: 'e.g. eu-west-3',
+			noDataExpression: true,
+		},
+		{
+			displayName: 'Authentication Method',
+			name: 'authMethod',
+			type: 'options',
+			options: [
+				{
+					name: 'IAM User',
+					value: 'iamUser',
+					description:
+						'Credentials for IAM user having <code>secretsmanager:ListSecrets</code> and <code>secretsmanager:BatchGetSecretValue</code> permissions. <a href="https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_access-keys.html" target="_blank">Learn more</a>',
+				},
+			],
+			default: 'iamUser',
+			required: true,
+			noDataExpression: true,
+		},
+		{
+			displayName: 'Access Key ID',
+			name: 'accessKeyId',
+			type: 'string',
+			default: '',
+			required: true,
+			placeholder: 'e.g. ACHXUQMBAQEVTE2RKMWP',
+			noDataExpression: true,
+			displayOptions: {
+				show: {
+					authMethod: ['iamUser'],
+				},
+			},
+		},
+		{
+			displayName: 'Secret Access Key',
+			name: 'secretAccessKey',
+			type: 'string',
+			default: '',
+			required: true,
+			placeholder: 'e.g. cbmjrH/xNAjPwlQR3i/1HRSDD+esQX/Lan3gcmBc',
+			typeOptions: { password: true },
+			noDataExpression: true,
+			displayOptions: {
+				show: {
+					authMethod: ['iamUser'],
+				},
+			},
+		},
+	];
+
+	private cachedSecrets: Record<string, string> = {};
+
+	private client: AwsSecretsClient;
+
+	async init(context: AwsSecretsManagerContext) {
+		this.assertAuthType(context);
+
+		this.client = new AwsSecretsClient(context.settings);
+	}
+
+	async test() {
+		return await this.client.checkConnection();
+	}
+
+	async connect() {
+		const [wasSuccessful] = await this.test();
+
+		this.state = wasSuccessful ? 'connected' : 'error';
+	}
+
+	async disconnect() {
+		return;
+	}
+
+	async update() {
+		const secrets = await this.client.fetchAllSecrets();
+
+		const supportedSecrets = secrets.filter((s) => EXTERNAL_SECRETS_NAME_REGEX.test(s.secretName));
+
+		this.cachedSecrets = Object.fromEntries(
+			supportedSecrets.map((s) => [s.secretName, s.secretValue]),
+		);
+	}
+
+	getSecret(name: string) {
+		return this.cachedSecrets[name];
+	}
+
+	hasSecret(name: string) {
+		return name in this.cachedSecrets;
+	}
+
+	getSecretNames() {
+		return Object.keys(this.cachedSecrets);
+	}
+
+	private assertAuthType(context: AwsSecretsManagerContext) {
+		if (context.settings.authMethod === 'iamUser') return;
+
+		throw new UnknownAuthTypeError(context.settings.authMethod);
+	}
+}
diff --git a/packages/cli/src/ExternalSecrets/providers/aws-secrets/types.ts b/packages/cli/src/ExternalSecrets/providers/aws-secrets/types.ts
new file mode 100644
index 0000000000000..dd48377b9e871
--- /dev/null
+++ b/packages/cli/src/ExternalSecrets/providers/aws-secrets/types.ts
@@ -0,0 +1,50 @@
+import type { SecretsProviderSettings } from '@/Interfaces';
+
+export type SecretsNamesPage = {
+	NextToken?: string;
+	SecretList: SecretName[];
+};
+
+export type SecretsPage = {
+	NextToken?: string;
+	SecretValues: SecretValue[];
+};
+
+type SecretName = {
+	ARN: string;
+	CreatedDate: number;
+	LastAccessedDate: number;
+	LastChangedDate: number;
+	Name: string;
+	Tags: string[];
+};
+
+type SecretValue = {
+	ARN: string;
+	CreatedDate: number;
+	Name: string;
+	SecretString: string;
+	VersionId: string;
+};
+
+export type Secret = {
+	secretName: string;
+	secretValue: string;
+};
+
+export type ConnectionTestResult = Promise<[boolean] | [boolean, string]>;
+
+export type AwsSecretsManagerContext = SecretsProviderSettings<{
+	region: string;
+	authMethod: 'iamUser';
+	accessKeyId: string;
+	secretAccessKey: string;
+}>;
+
+export type AwsSecretsClientSettings = {
+	region: string;
+	host: string;
+	url: string;
+	accessKeyId: string;
+	secretAccessKey: string;
+};
diff --git a/packages/cli/src/ExternalSecrets/providers/infisical.ts b/packages/cli/src/ExternalSecrets/providers/infisical.ts
new file mode 100644
index 0000000000000..0d700486a7603
--- /dev/null
+++ b/packages/cli/src/ExternalSecrets/providers/infisical.ts
@@ -0,0 +1,153 @@
+import type { SecretsProvider, SecretsProviderSettings, SecretsProviderState } from '@/Interfaces';
+import InfisicalClient from 'infisical-node';
+import { populateClientWorkspaceConfigsHelper } from 'infisical-node/lib/helpers/key';
+import { getServiceTokenData } from 'infisical-node/lib/api/serviceTokenData';
+import { ApplicationError, type IDataObject, type INodeProperties } from 'n8n-workflow';
+import { EXTERNAL_SECRETS_NAME_REGEX } from '../constants';
+
+export interface InfisicalSettings {
+	token: string;
+	siteURL: string;
+	cacheTTL: number;
+	debug: boolean;
+}
+
+interface InfisicalSecret {
+	secretName: string;
+	secretValue?: string;
+}
+
+interface InfisicalServiceToken {
+	environment?: string;
+	scopes?: Array<{ environment: string; path: string }>;
+}
+
+export class InfisicalProvider implements SecretsProvider {
+	properties: INodeProperties[] = [
+		{
+			displayName:
+				'Need help filling out these fields? <a href="https://docs.n8n.io/external-secrets/#connect-n8n-to-your-secrets-store" target="_blank">Open docs</a>',
+			name: 'notice',
+			type: 'notice',
+			default: '',
+		},
+		{
+			displayName: 'Service Token',
+			name: 'token',
+			type: 'string',
+			hint: 'The Infisical Service Token with read access',
+			default: '',
+			required: true,
+			placeholder: 'e.g. st.64ae963e1874ea.374226a166439dce.39557e4a1b7bdd82',
+			noDataExpression: true,
+			typeOptions: { password: true },
+		},
+		{
+			displayName: 'Site URL',
+			name: 'siteURL',
+			type: 'string',
+			hint: "The absolute URL of the Infisical instance. Change it only if you're self-hosting Infisical.",
+			required: true,
+			noDataExpression: true,
+			placeholder: 'https://app.infisical.com',
+			default: 'https://app.infisical.com',
+		},
+	];
+
+	displayName = 'Infisical';
+
+	name = 'infisical';
+
+	state: SecretsProviderState = 'initializing';
+
+	private cachedSecrets: Record<string, string> = {};
+
+	private client: InfisicalClient;
+
+	private settings: InfisicalSettings;
+
+	private environment: string;
+
+	async init(settings: SecretsProviderSettings): Promise<void> {
+		this.settings = settings.settings as unknown as InfisicalSettings;
+	}
+
+	async update(): Promise<void> {
+		if (!this.client) {
+			throw new ApplicationError('Updated attempted on Infisical when initialization failed');
+		}
+		if (!(await this.test())[0]) {
+			throw new ApplicationError('Infisical provider test failed during update');
+		}
+		const secrets = (await this.client.getAllSecrets({
+			environment: this.environment,
+			path: '/',
+			attachToProcessEnv: false,
+			includeImports: true,
+		})) as InfisicalSecret[];
+		const newCache = Object.fromEntries(
+			secrets.map((s) => [s.secretName, s.secretValue]),
+		) as Record<string, string>;
+		if (Object.keys(newCache).length === 1 && '' in newCache) {
+			this.cachedSecrets = {};
+		} else {
+			this.cachedSecrets = newCache;
+		}
+	}
+
+	async connect(): Promise<void> {
+		this.client = new InfisicalClient(this.settings);
+		if ((await this.test())[0]) {
+			try {
+				this.environment = await this.getEnvironment();
+				this.state = 'connected';
+			} catch {
+				this.state = 'error';
+			}
+		} else {
+			this.state = 'error';
+		}
+	}
+
+	async getEnvironment(): Promise<string> {
+		const serviceTokenData = (await getServiceTokenData(
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+			this.client.clientConfig,
+		)) as InfisicalServiceToken;
+		if (serviceTokenData.environment) {
+			return serviceTokenData.environment;
+		}
+		if (serviceTokenData.scopes) {
+			return serviceTokenData.scopes[0].environment;
+		}
+		throw new ApplicationError("Couldn't find environment for Infisical");
+	}
+
+	async test(): Promise<[boolean] | [boolean, string]> {
+		if (!this.client) {
+			return [false, 'Client not initialized'];
+		}
+		try {
+			await populateClientWorkspaceConfigsHelper(this.client.clientConfig);
+			return [true];
+		} catch (e) {
+			return [false];
+		}
+	}
+
+	async disconnect(): Promise<void> {
+		//
+	}
+
+	getSecret(name: string): IDataObject {
+		return this.cachedSecrets[name] as unknown as IDataObject;
+	}
+
+	getSecretNames(): string[] {
+		return Object.keys(this.cachedSecrets).filter((k) => EXTERNAL_SECRETS_NAME_REGEX.test(k));
+	}
+
+	hasSecret(name: string): boolean {
+		return name in this.cachedSecrets;
+	}
+}
diff --git a/packages/cli/src/ExternalSecrets/providers/vault.ts b/packages/cli/src/ExternalSecrets/providers/vault.ts
new file mode 100644
index 0000000000000..0bd68f7fb1090
--- /dev/null
+++ b/packages/cli/src/ExternalSecrets/providers/vault.ts
@@ -0,0 +1,565 @@
+import type { SecretsProviderSettings, SecretsProviderState } from '@/Interfaces';
+import { SecretsProvider } from '@/Interfaces';
+import type { IDataObject, INodeProperties } from 'n8n-workflow';
+import type { AxiosInstance, AxiosResponse } from 'axios';
+import axios from 'axios';
+import { Logger } from '@/Logger';
+import { EXTERNAL_SECRETS_NAME_REGEX } from '../constants';
+import { preferGet } from '../externalSecretsHelper.ee';
+import { Container } from 'typedi';
+
+type VaultAuthMethod = 'token' | 'usernameAndPassword' | 'appRole';
+
+interface VaultSettings {
+	url: string;
+	namespace?: string;
+	authMethod: VaultAuthMethod;
+
+	// Token
+	token: string;
+	renewToken: boolean;
+
+	// Username and Password
+	username: string;
+	password: string;
+
+	// AppRole
+	roleId: string;
+	secretId: string;
+}
+
+interface VaultResponse<T> {
+	data: T;
+}
+
+interface VaultTokenInfo {
+	accessor: string;
+	creation_time: number;
+	creation_ttl: number;
+	display_name: string;
+	entity_id: string;
+	expire_time: string | null;
+	explicit_max_ttl: number;
+	id: string;
+	issue_time: string;
+	meta: Record<string, string | number>;
+	num_uses: number;
+	orphan: boolean;
+	path: string;
+	policies: string[];
+	ttl: number;
+	renewable: boolean;
+	type: 'kv' | string;
+}
+
+interface VaultMount {
+	accessor: string;
+	config: Record<string, string | number | boolean | null>;
+	description: string;
+	external_entropy_access: boolean;
+	local: boolean;
+	options: Record<string, string | number | boolean | null>;
+	plugin_version: string;
+	running_plugin_version: string;
+	running_sha256: string;
+	seal_wrap: number;
+	type: string;
+	uuid: string;
+}
+
+interface VaultMountsResp {
+	[path: string]: VaultMount;
+}
+
+interface VaultUserPassLoginResp {
+	auth: {
+		client_token: string;
+	};
+}
+
+type VaultAppRoleResp = VaultUserPassLoginResp;
+
+interface VaultSecretList {
+	keys: string[];
+}
+
+export class VaultProvider extends SecretsProvider {
+	properties: INodeProperties[] = [
+		{
+			displayName:
+				'Need help filling out these fields? <a href="https://docs.n8n.io/external-secrets/#connect-n8n-to-your-secrets-store" target="_blank">Open docs</a>',
+			name: 'notice',
+			type: 'notice',
+			default: '',
+		},
+		{
+			displayName: 'Vault URL',
+			name: 'url',
+			type: 'string',
+			required: true,
+			noDataExpression: true,
+			placeholder: 'e.g. https://example.com/v1/',
+			default: '',
+		},
+		{
+			displayName: 'Vault Namespace (optional)',
+			name: 'namespace',
+			type: 'string',
+			hint: 'Leave blank if not using namespaces',
+			required: false,
+			noDataExpression: true,
+			placeholder: 'e.g. admin',
+			default: '',
+		},
+		{
+			displayName: 'Authentication Method',
+			name: 'authMethod',
+			type: 'options',
+			required: true,
+			noDataExpression: true,
+			options: [
+				{ name: 'Token', value: 'token' },
+				{ name: 'Username and Password', value: 'usernameAndPassword' },
+				{ name: 'AppRole', value: 'appRole' },
+			],
+			default: 'token',
+		},
+
+		// Token Auth
+		{
+			displayName: 'Token',
+			name: 'token',
+			type: 'string',
+			default: '',
+			required: true,
+			noDataExpression: true,
+			placeholder: 'e.g. hvs.2OCsZxZA6Z9lChbt0janOOZI',
+			typeOptions: { password: true },
+			displayOptions: {
+				show: {
+					authMethod: ['token'],
+				},
+			},
+		},
+		// {
+		// 	displayName: 'Renew Token',
+		// 	name: 'renewToken',
+		// 	description:
+		// 		'Try to renew Vault token. This will update the settings on this provider when doing so.',
+		// 	type: 'boolean',
+		// 	noDataExpression: true,
+		// 	default: true,
+		// 	displayOptions: {
+		// 		show: {
+		// 			authMethod: ['token'],
+		// 		},
+		// 	},
+		// },
+
+		// Username and Password
+		{
+			displayName: 'Username',
+			name: 'username',
+			type: 'string',
+			default: '',
+			required: true,
+			noDataExpression: true,
+			placeholder: 'Username',
+			displayOptions: {
+				show: {
+					authMethod: ['usernameAndPassword'],
+				},
+			},
+		},
+		{
+			displayName: 'Password',
+			name: 'password',
+			type: 'string',
+			default: '',
+			required: true,
+			noDataExpression: true,
+			placeholder: '***************',
+			typeOptions: { password: true },
+			displayOptions: {
+				show: {
+					authMethod: ['usernameAndPassword'],
+				},
+			},
+		},
+
+		// Username and Password
+		{
+			displayName: 'Role ID',
+			name: 'roleId',
+			type: 'string',
+			default: '',
+			required: true,
+			noDataExpression: true,
+			placeholder: '59d6d1ca-47bb-4e7e-a40b-8be3bc5a0ba8',
+			displayOptions: {
+				show: {
+					authMethod: ['appRole'],
+				},
+			},
+		},
+		{
+			displayName: 'Secret ID',
+			name: 'secretId',
+			type: 'string',
+			default: '',
+			required: true,
+			noDataExpression: true,
+			placeholder: '84896a0c-1347-aa90-a4f6-aca8b7558780',
+			typeOptions: { password: true },
+			displayOptions: {
+				show: {
+					authMethod: ['appRole'],
+				},
+			},
+		},
+	];
+
+	displayName = 'HashiCorp Vault';
+
+	name = 'vault';
+
+	state: SecretsProviderState = 'initializing';
+
+	private cachedSecrets: Record<string, IDataObject> = {};
+
+	private settings: VaultSettings;
+
+	#currentToken: string | null = null;
+
+	#tokenInfo: VaultTokenInfo | null = null;
+
+	#http: AxiosInstance;
+
+	private refreshTimeout: NodeJS.Timer | null;
+
+	private refreshAbort = new AbortController();
+
+	constructor(readonly logger = Container.get(Logger)) {
+		super();
+	}
+
+	async init(settings: SecretsProviderSettings): Promise<void> {
+		this.settings = settings.settings as unknown as VaultSettings;
+
+		const baseURL = new URL(this.settings.url);
+
+		this.#http = axios.create({ baseURL: baseURL.toString() });
+		if (this.settings.namespace) {
+			this.#http.interceptors.request.use((config) => {
+				config.headers['X-Vault-Namespace'] = this.settings.namespace;
+				return config;
+			});
+		}
+		this.#http.interceptors.request.use((config) => {
+			if (this.#currentToken) {
+				config.headers['X-Vault-Token'] = this.#currentToken;
+			}
+			return config;
+		});
+	}
+
+	async connect(): Promise<void> {
+		if (this.settings.authMethod === 'token') {
+			this.#currentToken = this.settings.token;
+		} else if (this.settings.authMethod === 'usernameAndPassword') {
+			try {
+				this.#currentToken = await this.authUsernameAndPassword(
+					this.settings.username,
+					this.settings.password,
+				);
+			} catch {
+				this.state = 'error';
+				this.logger.error('Failed to connect to Vault using Username and Password credentials.');
+				return;
+			}
+		} else if (this.settings.authMethod === 'appRole') {
+			try {
+				this.#currentToken = await this.authAppRole(this.settings.roleId, this.settings.secretId);
+			} catch {
+				this.state = 'error';
+				this.logger.error('Failed to connect to Vault using AppRole credentials.');
+				return;
+			}
+		}
+		try {
+			if (!(await this.test())[0]) {
+				this.state = 'error';
+			} else {
+				this.state = 'connected';
+
+				[this.#tokenInfo] = await this.getTokenInfo();
+				this.setupTokenRefresh();
+			}
+		} catch (e) {
+			this.state = 'error';
+			this.logger.error('Failed credentials test on Vault connect.');
+		}
+
+		try {
+			await this.update();
+		} catch {
+			this.logger.warn('Failed to update Vault secrets');
+		}
+	}
+
+	async disconnect(): Promise<void> {
+		if (this.refreshTimeout !== null) {
+			clearTimeout(this.refreshTimeout);
+		}
+		this.refreshAbort.abort();
+	}
+
+	private setupTokenRefresh() {
+		if (!this.#tokenInfo) {
+			return;
+		}
+		// Token never expires
+		if (this.#tokenInfo.expire_time === null) {
+			return;
+		}
+		// Token can't be renewed
+		if (!this.#tokenInfo.renewable) {
+			return;
+		}
+
+		const expireDate = new Date(this.#tokenInfo.expire_time);
+		setTimeout(this.tokenRefresh, (expireDate.valueOf() - Date.now()) / 2);
+	}
+
+	private tokenRefresh = async () => {
+		if (this.refreshAbort.signal.aborted) {
+			return;
+		}
+		try {
+			// We don't actually care about the result of this since it doesn't
+			// return an expire_time
+			await this.#http.post('auth/token/renew-self');
+
+			[this.#tokenInfo] = await this.getTokenInfo();
+
+			if (!this.#tokenInfo) {
+				this.logger.error(
+					'Failed to fetch token info during renewal. Cancelling all future renewals.',
+				);
+				return;
+			}
+
+			if (this.refreshAbort.signal.aborted) {
+				return;
+			}
+
+			this.setupTokenRefresh();
+		} catch {
+			this.logger.error('Failed to renew Vault token. Attempting to reconnect.');
+			void this.connect();
+		}
+	};
+
+	private async authUsernameAndPassword(
+		username: string,
+		password: string,
+	): Promise<string | null> {
+		try {
+			const resp = await this.#http.request<VaultUserPassLoginResp>({
+				method: 'POST',
+				url: `auth/userpass/login/${username}`,
+				responseType: 'json',
+				data: { password },
+			});
+
+			return resp.data.auth.client_token;
+		} catch {
+			return null;
+		}
+	}
+
+	private async authAppRole(roleId: string, secretId: string): Promise<string | null> {
+		try {
+			const resp = await this.#http.request<VaultAppRoleResp>({
+				method: 'POST',
+				url: 'auth/approle/login',
+				responseType: 'json',
+				data: { role_id: roleId, secret_id: secretId },
+			});
+
+			return resp.data.auth.client_token;
+		} catch (e) {
+			return null;
+		}
+	}
+
+	private async getTokenInfo(): Promise<[VaultTokenInfo | null, AxiosResponse]> {
+		const resp = await this.#http.request<VaultResponse<VaultTokenInfo>>({
+			method: 'GET',
+			url: 'auth/token/lookup-self',
+			responseType: 'json',
+			validateStatus: () => true,
+		});
+
+		if (resp.status !== 200 || !resp.data.data) {
+			return [null, resp];
+		}
+		return [resp.data.data, resp];
+	}
+
+	private async getKVSecrets(
+		mountPath: string,
+		kvVersion: string,
+		path: string,
+	): Promise<[string, IDataObject] | null> {
+		let listPath = mountPath;
+		if (kvVersion === '2') {
+			listPath += 'metadata/';
+		}
+		listPath += path;
+		let listResp: AxiosResponse<VaultResponse<VaultSecretList>>;
+		try {
+			const shouldPreferGet = preferGet();
+			const url = `${listPath}${shouldPreferGet ? '?list=true' : ''}`;
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+			const method = shouldPreferGet ? 'GET' : ('LIST' as any);
+			listResp = await this.#http.request<VaultResponse<VaultSecretList>>({
+				url,
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+				method,
+			});
+		} catch {
+			return null;
+		}
+		const data = Object.fromEntries(
+			(
+				await Promise.allSettled(
+					listResp.data.data.keys.map(async (key): Promise<[string, IDataObject] | null> => {
+						if (key.endsWith('/')) {
+							return await this.getKVSecrets(mountPath, kvVersion, path + key);
+						}
+						let secretPath = mountPath;
+						if (kvVersion === '2') {
+							secretPath += 'data/';
+						}
+						secretPath += path + key;
+						try {
+							const secretResp = await this.#http.get<VaultResponse<IDataObject>>(secretPath);
+							return [
+								key,
+								kvVersion === '2'
+									? (secretResp.data.data.data as IDataObject)
+									: secretResp.data.data,
+							];
+						} catch {
+							return null;
+						}
+					}),
+				)
+			)
+				.map((i) => (i.status === 'rejected' ? null : i.value))
+				.filter((v) => v !== null) as Array<[string, IDataObject]>,
+		);
+		const name = path.substring(0, path.length - 1);
+		return [name, data];
+	}
+
+	async update(): Promise<void> {
+		const mounts = await this.#http.get<VaultResponse<VaultMountsResp>>('sys/mounts');
+
+		const kvs = Object.entries(mounts.data.data).filter(([, v]) => v.type === 'kv');
+
+		const secrets = Object.fromEntries(
+			(
+				await Promise.all(
+					kvs.map(async ([basePath, data]): Promise<[string, IDataObject] | null> => {
+						const value = await this.getKVSecrets(basePath, data.options.version as string, '');
+						if (value === null) {
+							return null;
+						}
+						return [basePath.substring(0, basePath.length - 1), value[1]];
+					}),
+				)
+			).filter((v) => v !== null) as Array<[string, IDataObject]>,
+		);
+		this.cachedSecrets = secrets;
+	}
+
+	async test(): Promise<[boolean] | [boolean, string]> {
+		try {
+			const [token, tokenResp] = await this.getTokenInfo();
+
+			if (token === null) {
+				if (tokenResp.status === 404) {
+					return [false, 'Could not find auth path. Try adding /v1/ to the end of your base URL.'];
+				}
+				return [false, 'Invalid credentials'];
+			}
+
+			const resp = await this.#http.request<VaultResponse<VaultTokenInfo>>({
+				method: 'GET',
+				url: 'sys/mounts',
+				responseType: 'json',
+				validateStatus: () => true,
+			});
+
+			if (resp.status === 403) {
+				return [
+					false,
+					"Couldn't list mounts. Please give these credentials 'read' access to sys/mounts.",
+				];
+			} else if (resp.status !== 200) {
+				return [
+					false,
+					"Couldn't list mounts but wasn't a permissions issue. Please consult your Vault admin.",
+				];
+			}
+
+			return [true];
+		} catch (e) {
+			if (axios.isAxiosError(e)) {
+				if (e.code === 'ECONNREFUSED') {
+					return [
+						false,
+						'Connection refused. Please check the host and port of the server are correct.',
+					];
+				}
+			}
+
+			return [false];
+		}
+	}
+
+	getSecret(name: string): IDataObject {
+		return this.cachedSecrets[name];
+	}
+
+	hasSecret(name: string): boolean {
+		return name in this.cachedSecrets;
+	}
+
+	getSecretNames(): string[] {
+		const getKeys = ([k, v]: [string, IDataObject]): string[] => {
+			if (!EXTERNAL_SECRETS_NAME_REGEX.test(k)) {
+				return [];
+			}
+			if (typeof v === 'object') {
+				const keys: string[] = [];
+				for (const key of Object.keys(v)) {
+					if (!EXTERNAL_SECRETS_NAME_REGEX.test(key)) {
+						continue;
+					}
+					const value = v[key];
+					if (typeof value === 'object' && value !== null) {
+						keys.push(...getKeys([key, value as IDataObject]).map((ok) => `${k}.${ok}`));
+					} else {
+						keys.push(`${k}.${key}`);
+					}
+				}
+				return keys;
+			}
+			return [k];
+		};
+		return Object.entries(this.cachedSecrets).flatMap(getKeys);
+	}
+}
diff --git a/packages/cli/src/GenericHelpers.ts b/packages/cli/src/GenericHelpers.ts
index c33e4dff88cc5..a84e7b5c9eae5 100644
--- a/packages/cli/src/GenericHelpers.ts
+++ b/packages/cli/src/GenericHelpers.ts
@@ -1,106 +1,30 @@
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
-/* eslint-disable @typescript-eslint/restrict-template-expressions */
-/* eslint-disable @typescript-eslint/no-unsafe-return */
-/* eslint-disable no-param-reassign */
-/* eslint-disable no-underscore-dangle */
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
-import type express from 'express';
-import type {
-	ExecutionError,
-	INode,
-	IRunExecutionData,
-	Workflow,
-	WorkflowExecuteMode,
-} from 'n8n-workflow';
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
+import { Container } from 'typedi';
 import { validate } from 'class-validator';
-import { Like } from 'typeorm';
-import config from '@/config';
-import * as Db from '@/Db';
-import type { ICredentialsDb, IExecutionDb, IExecutionFlattedDb, IWorkflowDb } from '@/Interfaces';
-import * as ResponseHelper from '@/ResponseHelper';
+import type { INode, IRunExecutionData, Workflow, WorkflowExecuteMode } from 'n8n-workflow';
+
+import type { IExecutionDb, IExecutionFlattedDb, IWorkflowDb, IExecutionResponse } from '@/Interfaces';
 import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
 import type { CredentialsEntity } from '@db/entities/CredentialsEntity';
 import type { TagEntity } from '@db/entities/TagEntity';
 import type { User } from '@db/entities/User';
-import type { UserUpdatePayload } from '@/requests';
-
-/**
- * Returns the base URL n8n is reachable from
- */
-export function getBaseUrl(): string {
-	const protocol = config.getEnv('protocol');
-	const host = config.getEnv('host');
-	const port = config.getEnv('port');
-	const path = config.getEnv('path');
-
-	if ((protocol === 'http' && port === 80) || (protocol === 'https' && port === 443)) {
-		return `${protocol}://${host}${path}`;
-	}
-	return `${protocol}://${host}:${port}${path}`;
-}
-
-/**
- * Returns the session id if one is set
- */
-export function getSessionId(req: express.Request): string | undefined {
-	return req.headers.sessionid as string | undefined;
-}
-
-/**
- * Generate a unique name for a workflow or credentials entity.
- *
- * - If the name does not yet exist, it returns the requested name.
- * - If the name already exists once, it returns the requested name suffixed with 2.
- * - If the name already exists more than once with suffixes, it looks for the max suffix
- * and returns the requested name with max suffix + 1.
- */
-// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
-export async function generateUniqueName(
-	requestedName: string,
-	entityType: 'workflow' | 'credentials',
-) {
-	const findConditions = {
-		select: ['name' as const],
-		where: {
-			name: Like(`${requestedName}%`),
-		},
-	};
-
-	const found: Array<WorkflowEntity | ICredentialsDb> =
-		entityType === 'workflow'
-			? await Db.collections.Workflow.find(findConditions)
-			: await Db.collections.Credentials.find(findConditions);
-
-	// name is unique
-	if (found.length === 0) {
-		return requestedName;
-	}
-
-	const maxSuffix = found.reduce((acc, { name }) => {
-		const parts = name.split(`${requestedName} `);
-
-		if (parts.length > 2) return acc;
-
-		const suffix = Number(parts[1]);
-
-		// eslint-disable-next-line no-restricted-globals
-		if (!isNaN(suffix) && Math.ceil(suffix) > acc) {
-			acc = Math.ceil(suffix);
-		}
-
-		return acc;
-	}, 0);
-
-	// name is duplicate but no numeric suffixes exist yet
-	if (maxSuffix === 0) {
-		return `${requestedName} 2`;
-	}
-
-	return `${requestedName} ${maxSuffix + 1}`;
-}
+import type { WorkflowTest } from '@db/entities/WorkflowTest';
+import type { NodeOutput } from '@db/entities/NodeOutput';
+import { ExecutionRepository } from './databases/repositories/execution.repository';
+import type { UserRoleChangePayload, UserUpdatePayload } from '@/requests';
+import { BadRequestError } from './errors/response-errors/bad-request.error';
+import * as ResponseHelper from '@/ResponseHelper';
 
 export async function validateEntity(
-	entity: WorkflowEntity | CredentialsEntity | TagEntity | User | UserUpdatePayload,
+	entity:
+		| WorkflowEntity
+		| CredentialsEntity
+		| TagEntity
+		| User
+		| UserUpdatePayload
+		| UserRoleChangePayload
+		| WorkflowTest
+		| NodeOutput,
 ): Promise<void> {
 	const errors = await validate(entity);
 
@@ -113,7 +37,7 @@ export async function validateEntity(
 		.join(' | ');
 
 	if (errorMessages) {
-		throw new ResponseHelper.BadRequestError(errorMessages);
+		throw new BadRequestError(errorMessages);
 	}
 }
 
@@ -128,13 +52,12 @@ export async function validateEntity(
  * @memberof ActiveWorkflowRunner
  */
 // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
-export async function createErrorExecution(
-	error: ExecutionError,
+export async function createPartialExecution(
 	node: INode,
 	workflowData: IWorkflowDb,
 	workflow: Workflow,
 	mode: WorkflowExecuteMode,
-): Promise<void> {
+): Promise<any> {
 	const saveDataErrorExecutionDisabled = workflowData?.settings?.saveDataErrorExecution === 'none';
 
 	if (saveDataErrorExecutionDisabled) return;
@@ -145,6 +68,7 @@ export async function createErrorExecution(
 			runNodeFilter: [node.name],
 		},
 		executionData: {
+			metadata: {},
 			contextData: {},
 			nodeExecutionStack: [
 				{
@@ -173,17 +97,18 @@ export async function createErrorExecution(
 					{
 						startTime: 0,
 						executionTime: 0,
-						error,
+						error: undefined,
 						source: [],
 					},
 				],
 			},
-			error,
+			error: undefined,
 			lastNodeExecuted: node.name,
 		},
 	};
 
 	const fullExecutionData: IExecutionDb = {
+		id: '',
 		data: executionData,
 		mode,
 		finished: false,
@@ -191,12 +116,13 @@ export async function createErrorExecution(
 		workflowData,
 		workflowId: workflow.id,
 		stoppedAt: new Date(),
-		status: 'new',
+		status: 'running',
 	};
 
-	const execution = ResponseHelper.flattenExecutionData(fullExecutionData);
+	let execution = ResponseHelper.flattenExecutionData(fullExecutionData);
 
-	await Db.collections.Execution.save(execution as IExecutionFlattedDb);
+	execution = await Container.get(ExecutionRepository).save(execution as IExecutionResponse);
+	return execution;
 }
 
 export const DEFAULT_EXECUTIONS_GET_ALL_LIMIT = 20;
diff --git a/packages/cli/src/Interfaces.ts b/packages/cli/src/Interfaces.ts
index 4d18890c8ec95..703b1352b6f6a 100644
--- a/packages/cli/src/Interfaces.ts
+++ b/packages/cli/src/Interfaces.ts
@@ -1,4 +1,4 @@
-import type { Application } from 'express';
+import type { Application, Request, Response } from 'express';
 import type {
 	ExecutionError,
 	ICredentialDataDecryptedObject,
@@ -16,63 +16,38 @@ import type {
 	IWorkflowBase,
 	CredentialLoadingDetails,
 	Workflow,
-	WorkflowActivateMode,
 	WorkflowExecuteMode,
 	ExecutionStatus,
-	IExecutionsSummary,
+	ExecutionSummary,
 	FeatureFlags,
+	INodeProperties,
+	IUserSettings,
+	IHttpRequestMethods,
+	StartNodeData,
 } from 'n8n-workflow';
 
-import type { ActiveWorkflowRunner } from '@/ActiveWorkflowRunner';
+import type { ActiveWorkflowManager } from '@/ActiveWorkflowManager';
 
 import type { WorkflowExecute } from 'n8n-core';
 
 import type PCancelable from 'p-cancelable';
-import type { FindOperator } from 'typeorm';
-
-import type { ChildProcess } from 'child_process';
 
 import type { AuthProviderType } from '@db/entities/AuthIdentity';
-import type { Role } from '@db/entities/Role';
 import type { SharedCredentials } from '@db/entities/SharedCredentials';
 import type { TagEntity } from '@db/entities/TagEntity';
-import type { User } from '@db/entities/User';
-import type {
-	AuthIdentityRepository,
-	AuthProviderSyncHistoryRepository,
-	CredentialsRepository,
-	EventDestinationsRepository,
-	ExecutionMetadataRepository,
-	ExecutionRepository,
-	InstalledNodesRepository,
-	InstalledPackagesRepository,
-	RoleRepository,
-	SaveRequestLogRepository,
-	SettingsRepository,
-	SharedCredentialsRepository,
-	SharedWorkflowRepository,
-	TagRepository,
-	UserRepository,
-	VariablesRepository,
-	WebhookRepository,
-	WorkflowRepository,
-	WorkflowStatisticsRepository,
-	WorkflowTagMappingRepository,
-} from '@db/repositories';
-
-export interface IActivationError {
-	time: number;
-	error: {
-		message: string;
-	};
-}
-
-export interface IQueuedWorkflowActivations {
-	activationMode: WorkflowActivateMode;
-	lastTimeout: number;
-	timeout: NodeJS.Timeout;
-	workflowData: IWorkflowDb;
-}
+import type { GlobalRole, User } from '@db/entities/User';
+import type { CredentialsRepository } from '@db/repositories/credentials.repository';
+import type { SettingsRepository } from '@db/repositories/settings.repository';
+import type { UserRepository } from '@db/repositories/user.repository';
+import type { WorkflowRepository } from '@db/repositories/workflow.repository';
+import type { WorkflowTestRepository } from '@db/repositories/workflowTest.repository';
+import type { NodeOutputRepository } from '@db/repositories/nodeOutput.repository';
+import type { ResumeWorkflowTimerRepository } from '@db/repositories/resumeWorkflowTimer.repository';
+import type { ExternalHooks } from './ExternalHooks';
+import type { LICENSE_FEATURES, LICENSE_QUOTAS } from './constants';
+import type { WorkflowWithSharingsAndCredentials } from './workflows/workflows.types';
+import type { WorkerJobStatusSummary } from './services/orchestration/worker/types';
+import type { Scope } from '@n8n/permissions';
 
 export interface ICredentialsTypeData {
 	[key: string]: CredentialLoadingDetails;
@@ -82,31 +57,6 @@ export interface ICredentialsOverwrite {
 	[key: string]: ICredentialDataDecryptedObject;
 }
 
-/* eslint-disable @typescript-eslint/naming-convention */
-export interface IDatabaseCollections {
-	AuthIdentity: AuthIdentityRepository;
-	AuthProviderSyncHistory: AuthProviderSyncHistoryRepository;
-	Credentials: CredentialsRepository;
-	EventDestinations: EventDestinationsRepository;
-	Execution: ExecutionRepository;
-	ExecutionMetadata: ExecutionMetadataRepository;
-	InstalledNodes: InstalledNodesRepository;
-	InstalledPackages: InstalledPackagesRepository;
-	Role: RoleRepository;
-	Settings: SettingsRepository;
-	SharedCredentials: SharedCredentialsRepository;
-	SharedWorkflow: SharedWorkflowRepository;
-	Tag: TagRepository;
-	User: UserRepository;
-	Variables: VariablesRepository;
-	Webhook: WebhookRepository;
-	Workflow: WorkflowRepository;
-	WorkflowStatistics: WorkflowStatisticsRepository;
-	WorkflowTagMapping: WorkflowTagMappingRepository;
-	SaveRequestLog: SaveRequestLogRepository;
-}
-/* eslint-enable @typescript-eslint/naming-convention */
-
 // ----------------------------------
 //               tags
 // ----------------------------------
@@ -131,7 +81,6 @@ export type ITagWithCountDb = Pick<TagEntity, 'id' | 'name' | 'createdAt' | 'upd
 
 // Almost identical to editor-ui.Interfaces.ts
 export interface IWorkflowDb extends IWorkflowBase {
-	id: string;
 	tags?: TagEntity[];
 }
 
@@ -162,28 +111,32 @@ export type ICredentialsDecryptedDb = ICredentialsBase & ICredentialsDecrypted;
 
 export type ICredentialsDecryptedResponse = ICredentialsDecryptedDb;
 
-export type DatabaseType = 'mariadb' | 'postgresdb' | 'mysqldb' | 'sqlite';
 export type SaveExecutionDataType = 'all' | 'none';
 
 export interface IExecutionBase {
-	id?: string;
+	id: string;
 	mode: WorkflowExecuteMode;
 	startedAt: Date;
 	stoppedAt?: Date; // empty value means execution is still running
-	workflowId?: string; // To be able to filter executions easily //
+	workflowId: string;
 	finished: boolean;
 	retryOf?: string; // If it is a retry, the id of the execution it is a retry of.
 	retrySuccessId?: string; // If it failed and a retry did succeed. The id of the successful retry.
 	status: ExecutionStatus;
+	waitTill?: Date | null;
 }
 
 // Data in regular format with references
 export interface IExecutionDb extends IExecutionBase {
 	data: IRunExecutionData;
-	waitTill?: Date | null;
-	workflowData?: IWorkflowBase;
+	workflowData: IWorkflowBase;
 }
 
+/**
+ * Payload for creating or updating an execution.
+ */
+export type ExecutionPayload = Omit<IExecutionDb, 'id'>;
+
 export interface IExecutionPushResponse {
 	executionId?: string;
 	waitingForWebhook?: boolean;
@@ -194,8 +147,7 @@ export interface IExecutionResponse extends IExecutionBase {
 	data: IRunExecutionData;
 	retryOf?: string;
 	retrySuccessId?: string;
-	waitTill?: Date | null;
-	workflowData: IWorkflowBase;
+	workflowData: IWorkflowBase | WorkflowWithSharingsAndCredentials;
 }
 
 // Flatted data to save memory when saving in database or transferring
@@ -208,9 +160,7 @@ export interface IExecutionFlatted extends IExecutionBase {
 export interface IExecutionFlattedDb extends IExecutionBase {
 	id: string;
 	data: string;
-	waitTill?: Date | null;
 	workflowData: Omit<IWorkflowBase, 'pinData'>;
-	status: ExecutionStatus;
 }
 
 export interface IExecutionFlattedResponse extends IExecutionFlatted {
@@ -218,27 +168,13 @@ export interface IExecutionFlattedResponse extends IExecutionFlatted {
 	retryOf?: string;
 }
 
-export interface IExecutionResponseApi {
-	id: string;
-	mode: WorkflowExecuteMode;
-	startedAt: Date;
-	stoppedAt?: Date;
-	workflowId?: string;
-	finished: boolean;
-	retryOf?: string;
-	retrySuccessId?: string;
-	data?: object;
-	waitTill?: Date | null;
-	workflowData: IWorkflowBase;
-}
 export interface IExecutionsListResponse {
 	count: number;
-	// results: IExecutionShortResponse[];
-	results: IExecutionsSummary[];
+	results: ExecutionSummary[];
 	estimated: boolean;
 }
 
-export interface IExecutionsStopData {
+export interface ExecutionStopResult {
 	finished?: boolean;
 	mode: WorkflowExecuteMode;
 	startedAt: Date;
@@ -255,15 +191,8 @@ export interface IExecutionsCurrentSummary {
 	status?: ExecutionStatus;
 }
 
-export interface IExecutionDeleteFilter {
-	deleteBefore?: Date;
-	filters?: IDataObject;
-	ids?: string[];
-}
-
 export interface IExecutingWorkflowData {
 	executionData: IWorkflowExecutionDataProcess;
-	process?: ChildProcess;
 	startedAt: Date;
 	postExecutePromises: Array<IDeferredPromise<IRun | undefined>>;
 	responsePromise?: IDeferredPromise<IExecuteResponsePromiseData>;
@@ -298,47 +227,50 @@ export interface IExternalHooks {
 
 export interface IExternalHooksFileData {
 	[key: string]: {
-		// eslint-disable-next-line @typescript-eslint/no-explicit-any
 		[key: string]: Array<(...args: any[]) => Promise<void>>;
 	};
 }
 
 export interface IExternalHooksFunctions {
-	dbCollections: IDatabaseCollections;
+	dbCollections: {
+		/* eslint-disable @typescript-eslint/naming-convention */
+		User: UserRepository;
+		Settings: SettingsRepository;
+		Credentials: CredentialsRepository;
+		Workflow: WorkflowRepository;
+		WorkflowTest: WorkflowTestRepository;
+		NodeOutput: NodeOutputRepository;
+		ResumeWorkflowTimer: ResumeWorkflowTimerRepository;
+		/* eslint-enable @typescript-eslint/naming-convention */
+	};
 }
 
-export interface IExternalHooksClass {
-	init(): Promise<void>;
-	// eslint-disable-next-line @typescript-eslint/no-explicit-any
-	run(hookName: string, hookParameters?: any[]): Promise<void>;
+export type WebhookCORSRequest = Request & { method: 'OPTIONS' };
+
+export type WebhookRequest = Request<{ path: string }> & {
+	method: IHttpRequestMethods;
+	params: Record<string, string>;
+};
+
+export type WaitingWebhookRequest = WebhookRequest & {
+	params: WebhookRequest['path'] & { suffix?: string };
+};
+
+export interface WebhookAccessControlOptions {
+	allowedOrigins?: string;
 }
 
-export interface IDiagnosticInfo {
-	versionCli: string;
-	databaseType: DatabaseType;
-	notificationsEnabled: boolean;
-	disableProductionWebhooksOnMainProcess: boolean;
-	basicAuthActive: boolean;
-	systemInfo: {
-		os: {
-			type?: string;
-			version?: string;
-		};
-		memory?: number;
-		cpus: {
-			count?: number;
-			model?: string;
-			speed?: number;
-		};
-	};
-	executionVariables: {
-		[key: string]: string | number | boolean | undefined;
-	};
-	deploymentType: string;
-	binaryDataMode: string;
-	n8n_multi_user_allowed: boolean;
-	smtp_set_up: boolean;
-	ldap_allowed: boolean;
+export interface IWebhookManager {
+	/** Gets all request methods associated with a webhook path*/
+	getWebhookMethods?: (path: string) => Promise<IHttpRequestMethods[]>;
+
+	/** Find the CORS options matching a path and method */
+	findAccessControlOptions?: (
+		path: string,
+		httpMethod: IHttpRequestMethods,
+	) => Promise<WebhookAccessControlOptions | undefined>;
+
+	executeWebhook(req: WebhookRequest, res: Response): Promise<IResponseCallbackData>;
 }
 
 export interface ITelemetryUserDeletionData {
@@ -349,120 +281,6 @@ export interface ITelemetryUserDeletionData {
 	migration_user_id?: string;
 }
 
-export interface IInternalHooksClass {
-	onN8nStop(): Promise<void>;
-	onServerStarted(
-		diagnosticInfo: IDiagnosticInfo,
-		firstWorkflowCreatedAt?: Date,
-	): Promise<unknown[]>;
-	onPersonalizationSurveySubmitted(userId: string, answers: Record<string, string>): Promise<void>;
-	onWorkflowCreated(user: User, workflow: IWorkflowBase, publicApi: boolean): Promise<void>;
-	onWorkflowDeleted(user: User, workflowId: string, publicApi: boolean): Promise<void>;
-	onWorkflowSaved(user: User, workflow: IWorkflowBase, publicApi: boolean): Promise<void>;
-	onWorkflowBeforeExecute(executionId: string, data: IWorkflowExecutionDataProcess): Promise<void>;
-	onWorkflowPostExecute(
-		executionId: string,
-		workflow: IWorkflowBase,
-		runData?: IRun,
-		userId?: string,
-	): Promise<void>;
-	onNodeBeforeExecute(
-		executionId: string,
-		workflow: IWorkflowBase,
-		nodeName: string,
-	): Promise<void>;
-	onNodePostExecute(executionId: string, workflow: IWorkflowBase, nodeName: string): Promise<void>;
-	onUserDeletion(userDeletionData: {
-		user: User;
-		telemetryData: ITelemetryUserDeletionData;
-		publicApi: boolean;
-	}): Promise<void>;
-	onUserInvite(userInviteData: {
-		user: User;
-		target_user_id: string[];
-		public_api: boolean;
-		email_sent: boolean;
-	}): Promise<void>;
-	onUserReinvite(userReinviteData: {
-		user: User;
-		target_user_id: string;
-		public_api: boolean;
-	}): Promise<void>;
-	onUserUpdate(userUpdateData: { user: User; fields_changed: string[] }): Promise<void>;
-	onUserInviteEmailClick(userInviteClickData: { inviter: User; invitee: User }): Promise<void>;
-	onUserPasswordResetEmailClick(userPasswordResetData: { user: User }): Promise<void>;
-	onUserTransactionalEmail(
-		userTransactionalEmailData: {
-			user_id: string;
-			message_type: 'Reset password' | 'New user invite' | 'Resend invite';
-			public_api: boolean;
-		},
-		user?: User,
-	): Promise<void>;
-	onEmailFailed(failedEmailData: {
-		user: User;
-		message_type: 'Reset password' | 'New user invite' | 'Resend invite';
-		public_api: boolean;
-	}): Promise<void>;
-	onUserCreatedCredentials(userCreatedCredentialsData: {
-		user: User;
-		credential_name: string;
-		credential_type: string;
-		credential_id: string;
-		public_api: boolean;
-	}): Promise<void>;
-
-	onUserSharedCredentials(userSharedCredentialsData: {
-		user: User;
-		credential_name: string;
-		credential_type: string;
-		credential_id: string;
-		user_id_sharer: string;
-		user_ids_sharees_added: string[];
-		sharees_removed: number | null;
-	}): Promise<void>;
-	onUserPasswordResetRequestClick(userPasswordResetData: { user: User }): Promise<void>;
-	onInstanceOwnerSetup(instanceOwnerSetupData: { user_id: string }, user?: User): Promise<void>;
-	onUserSignup(
-		user: User,
-		userSignupData: {
-			user_type: AuthProviderType;
-			was_disabled_ldap_user: boolean;
-		},
-	): Promise<void>;
-	onCommunityPackageInstallFinished(installationData: {
-		user: User;
-		input_string: string;
-		package_name: string;
-		success: boolean;
-		package_version?: string;
-		package_node_names?: string[];
-		package_author?: string;
-		package_author_email?: string;
-		failure_reason?: string;
-	}): Promise<void>;
-	onCommunityPackageUpdateFinished(updateData: {
-		user: User;
-		package_name: string;
-		package_version_current: string;
-		package_version_new: string;
-		package_node_names: string[];
-		package_author?: string;
-		package_author_email?: string;
-	}): Promise<void>;
-	onCommunityPackageDeleteFinished(deleteData: {
-		user: User;
-		package_name: string;
-		package_version?: string;
-		package_node_names?: string[];
-		package_author?: string;
-		package_author_email?: string;
-	}): Promise<void>;
-	onApiKeyCreated(apiKeyDeletedData: { user: User; public_api: boolean }): Promise<void>;
-	onApiKeyDeleted(apiKeyDeletedData: { user: User; public_api: boolean }): Promise<void>;
-	onVariableCreated(createData: { variable_type: string }): Promise<void>;
-}
-
 export interface IVersionNotificationSettings {
 	enabled: boolean;
 	endpoint: string;
@@ -479,13 +297,6 @@ export interface IPersonalizationSurveyAnswers {
 	workArea: string[] | string | null;
 }
 
-export interface IUserSettings {
-	isOnboarded?: boolean;
-	showUserActivationSurvey?: boolean;
-	firstSuccessfulWorkflowId?: string;
-	userActivated?: boolean;
-}
-
 export interface IActiveDirectorySettings {
 	enabled: boolean;
 }
@@ -506,58 +317,111 @@ export type IPushData =
 	| PushDataRemoveNodeType
 	| PushDataTestWebhook
 	| PushDataNodeDescriptionUpdated
-	| PushDataExecutionRecovered;
+	| PushDataExecutionRecovered
+	| PushDataActiveWorkflowUsersChanged
+	| PushDataWorkerStatusMessage
+	| PushDataWorkflowActivated
+	| PushDataWorkflowDeactivated
+	| PushDataWorkflowFailedToActivate;
+
+type PushDataWorkflowFailedToActivate = {
+	data: IWorkflowFailedToActivate;
+	type: 'workflowFailedToActivate';
+};
+
+type PushDataWorkflowActivated = {
+	data: IActiveWorkflowChanged;
+	type: 'workflowActivated';
+};
+
+type PushDataWorkflowDeactivated = {
+	data: IActiveWorkflowChanged;
+	type: 'workflowDeactivated';
+};
+
+type PushDataActiveWorkflowUsersChanged = {
+	data: IActiveWorkflowUsersChanged;
+	type: 'activeWorkflowUsersChanged';
+};
 
-type PushDataExecutionRecovered = {
+export type PushDataExecutionRecovered = {
 	data: IPushDataExecutionRecovered;
 	type: 'executionRecovered';
 };
 
-type PushDataExecutionFinished = {
+export type PushDataExecutionFinished = {
 	data: IPushDataExecutionFinished;
 	type: 'executionFinished';
 };
 
-type PushDataExecutionStarted = {
+export type PushDataExecutionStarted = {
 	data: IPushDataExecutionStarted;
 	type: 'executionStarted';
 };
 
-type PushDataExecuteAfter = {
+export type PushDataExecuteAfter = {
 	data: IPushDataNodeExecuteAfter;
 	type: 'nodeExecuteAfter';
 };
 
-type PushDataExecuteBefore = {
+export type PushDataExecuteBefore = {
 	data: IPushDataNodeExecuteBefore;
 	type: 'nodeExecuteBefore';
 };
 
-type PushDataConsoleMessage = {
+export type PushDataConsoleMessage = {
 	data: IPushDataConsoleMessage;
 	type: 'sendConsoleMessage';
 };
 
+type PushDataWorkerStatusMessage = {
+	data: IPushDataWorkerStatusMessage;
+	type: 'sendWorkerStatusMessage';
+};
+
 type PushDataReloadNodeType = {
 	data: IPushDataReloadNodeType;
 	type: 'reloadNodeType';
 };
 
-type PushDataRemoveNodeType = {
+export type PushDataRemoveNodeType = {
 	data: IPushDataRemoveNodeType;
 	type: 'removeNodeType';
 };
 
-type PushDataTestWebhook = {
+export type PushDataTestWebhook = {
 	data: IPushDataTestWebhook;
 	type: 'testWebhookDeleted' | 'testWebhookReceived';
 };
 
-type PushDataNodeDescriptionUpdated = {
+export type PushDataNodeDescriptionUpdated = {
 	data: undefined;
 	type: 'nodeDescriptionUpdated';
 };
 
+export interface IActiveWorkflowUser {
+	user: User;
+	lastSeen: Date;
+}
+
+export interface IActiveWorkflowAdded {
+	workflowId: Workflow['id'];
+}
+
+export interface IActiveWorkflowUsersChanged {
+	workflowId: Workflow['id'];
+	activeUsers: IActiveWorkflowUser[];
+}
+
+interface IActiveWorkflowChanged {
+	workflowId: Workflow['id'];
+}
+
+interface IWorkflowFailedToActivate {
+	workflowId: Workflow['id'];
+	errorMessage: string;
+}
+
 export interface IPushDataExecutionRecovered {
 	executionId: string;
 }
@@ -608,6 +472,30 @@ export interface IPushDataConsoleMessage {
 	message: string;
 }
 
+export interface IPushDataWorkerStatusMessage {
+	workerId: string;
+	status: IPushDataWorkerStatusPayload;
+}
+
+export interface IPushDataWorkerStatusPayload {
+	workerId: string;
+	runningJobsSummary: WorkerJobStatusSummary[];
+	freeMem: number;
+	totalMem: number;
+	uptime: number;
+	loadAvg: number[];
+	cpus: string;
+	arch: string;
+	platform: NodeJS.Platform;
+	hostname: string;
+	interfaces: Array<{
+		family: 'IPv4' | 'IPv6';
+		address: string;
+		internal: boolean;
+	}>;
+	version: string;
+}
+
 export interface IResponseCallbackData {
 	data?: IDataObject | IDataObject[];
 	headers?: object;
@@ -623,7 +511,6 @@ export interface INodesTypeData {
 }
 
 export interface IWorkflowErrorData {
-	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	[key: string]: any;
 	execution?: {
 		id?: string;
@@ -643,12 +530,6 @@ export interface IWorkflowErrorData {
 	};
 }
 
-export interface IProcessMessageDataHook {
-	hook: string;
-	// eslint-disable-next-line @typescript-eslint/no-explicit-any
-	parameters: any[];
-}
-
 export interface IWorkflowExecutionDataProcess {
 	destinationNode?: string;
 	restartExecutionId?: string;
@@ -657,43 +538,22 @@ export interface IWorkflowExecutionDataProcess {
 	runData?: IRunData;
 	pinData?: IPinData;
 	retryOf?: string;
-	sessionId?: string;
-	startNodes?: string[];
+	pushRef?: string;
+	startNodes?: StartNodeData[];
 	workflowData: IWorkflowBase;
 	userId: string;
 }
 
-export interface IWorkflowExecutionDataProcessWithExecution extends IWorkflowExecutionDataProcess {
-	executionId: string;
-	userId: string;
-}
-
 export interface IWorkflowExecuteProcess {
 	startedAt: Date;
 	workflow: Workflow;
 	workflowExecute: WorkflowExecute;
 }
 
-export interface IWorkflowStatisticsCounts {
-	productionSuccess: number;
-	productionError: number;
-	manualSuccess: number;
-	manualError: number;
-}
-
 export interface IWorkflowStatisticsDataLoaded {
 	dataLoaded: boolean;
 }
 
-export interface IWorkflowStatisticsTimestamps {
-	productionSuccess: Date | null;
-	productionError: Date | null;
-	manualSuccess: Date | null;
-	manualError: Date | null;
-}
-
-export type WhereClause = Record<string, { [key: string]: string | FindOperator<unknown> }>;
-
 // ----------------------------------
 //          community nodes
 // ----------------------------------
@@ -736,6 +596,11 @@ export interface IExecutionTrackProperties extends ITelemetryTrackProperties {
 //               license
 // ----------------------------------
 
+type ValuesOf<T> = T[keyof T];
+
+export type BooleanLicenseFeature = ValuesOf<typeof LICENSE_FEATURES>;
+export type NumericLicenseFeature = ValuesOf<typeof LICENSE_QUOTAS>;
+
 export interface ILicenseReadResponse {
 	usage: {
 		executions: {
@@ -754,17 +619,6 @@ export interface ILicensePostResponse extends ILicenseReadResponse {
 	managementToken: string;
 }
 
-export interface JwtToken {
-	token: string;
-	expiresIn: number;
-}
-
-export interface JwtPayload {
-	id: string;
-	email: string | null;
-	password: string | null;
-}
-
 export interface PublicUser {
 	id: string;
 	email?: string;
@@ -775,22 +629,77 @@ export interface PublicUser {
 	passwordResetToken?: string;
 	createdAt: Date;
 	isPending: boolean;
-	globalRole?: Role;
+	hasRecoveryCodesLeft: boolean;
+	role?: GlobalRole;
+	globalScopes?: Scope[];
 	signInType: AuthProviderType;
 	disabled: boolean;
 	settings?: IUserSettings | null;
 	inviteAcceptUrl?: string;
-}
-
-export interface CurrentUser extends PublicUser {
+	isOwner?: boolean;
 	featureFlags?: FeatureFlags;
 }
 
 export interface N8nApp {
 	app: Application;
 	restEndpoint: string;
-	externalHooks: IExternalHooksClass;
-	activeWorkflowRunner: ActiveWorkflowRunner;
+	externalHooks: ExternalHooks;
+	activeWorkflowManager: ActiveWorkflowManager;
 }
 
 export type UserSettings = Pick<User, 'id' | 'settings'>;
+
+export interface SecretsProviderSettings<T = IDataObject> {
+	connected: boolean;
+	connectedAt: Date | null;
+	settings: T;
+}
+
+export interface ExternalSecretsSettings {
+	[key: string]: SecretsProviderSettings;
+}
+
+export interface TestSuiteDb {
+	name: string;
+	id: string;
+	createdAt: string;
+	updatedAt: string;
+	description: string;
+}
+
+export interface NodeOutputDb {
+	[key: string]: any;
+	id: string;
+	workflowTestId: string;
+	nodeId: string;
+	outputType: 'error' | 'data' | null;
+	errorMessage?: string;
+	data?: any;
+}
+
+export interface NodeOutputDbMap {
+	[name: string]: NodeOutputDb;
+}
+
+export type SecretsProviderState = 'initializing' | 'connected' | 'error';
+
+export abstract class SecretsProvider {
+	displayName: string;
+
+	name: string;
+
+	properties: INodeProperties[];
+
+	state: SecretsProviderState;
+
+	abstract init(settings: SecretsProviderSettings): Promise<void>;
+	abstract connect(): Promise<void>;
+	abstract disconnect(): Promise<void>;
+	abstract update(): Promise<void>;
+	abstract test(): Promise<[boolean] | [boolean, string]>;
+	abstract getSecret(name: string): unknown;
+	abstract hasSecret(name: string): boolean;
+	abstract getSecretNames(): string[];
+}
+
+export type N8nInstanceType = 'main' | 'webhook' | 'worker';
diff --git a/packages/cli/src/InternalHooks.ts b/packages/cli/src/InternalHooks.ts
index 965f84642b6fa..70b3030f23c10 100644
--- a/packages/cli/src/InternalHooks.ts
+++ b/packages/cli/src/InternalHooks.ts
@@ -1,10 +1,9 @@
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
-/* eslint-disable @typescript-eslint/no-unsafe-call */
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
 import { Service } from 'typedi';
 import { snakeCase } from 'change-case';
-import { BinaryDataManager } from 'n8n-core';
+import os from 'node:os';
+import { get as pslGet } from 'psl';
 import type {
+	AuthenticationMethod,
 	ExecutionStatus,
 	INodesGraphResult,
 	IRun,
@@ -13,86 +12,140 @@ import type {
 	WorkflowExecuteMode,
 } from 'n8n-workflow';
 import { TelemetryHelpers } from 'n8n-workflow';
-import { get as pslGet } from 'psl';
+import { InstanceSettings } from 'n8n-core';
+
+import config from '@/config';
+import { N8N_VERSION } from '@/constants';
+import type { AuthProviderType } from '@db/entities/AuthIdentity';
+import type { GlobalRole, User } from '@db/entities/User';
+import type { ExecutionMetadata } from '@db/entities/ExecutionMetadata';
+import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
+import { WorkflowRepository } from '@db/repositories/workflow.repository';
+import type { EventPayloadWorkflow } from '@/eventbus';
+import { MessageEventBus } from '@/eventbus/MessageEventBus/MessageEventBus';
+import { determineFinalExecutionStatus } from '@/executionLifecycleHooks/shared/sharedHookFunctions';
 import type {
-	IDiagnosticInfo,
-	IInternalHooksClass,
 	ITelemetryUserDeletionData,
 	IWorkflowDb,
 	IExecutionTrackProperties,
 	IWorkflowExecutionDataProcess,
 } from '@/Interfaces';
+import { License } from '@/License';
+import { EventsService } from '@/services/events.service';
+import { NodeTypes } from '@/NodeTypes';
 import { Telemetry } from '@/telemetry';
-import type { AuthProviderType } from '@db/entities/AuthIdentity';
-import { RoleService } from './role/role.service';
-import { eventBus } from './eventbus';
-import type { User } from '@db/entities/User';
-import { N8N_VERSION } from '@/constants';
-import * as Db from '@/Db';
-import { NodeTypes } from './NodeTypes';
 
 function userToPayload(user: User): {
 	userId: string;
 	_email: string;
 	_firstName: string;
 	_lastName: string;
-	globalRole?: string;
+	globalRole: GlobalRole;
 } {
 	return {
 		userId: user.id,
 		_email: user.email,
 		_firstName: user.firstName,
 		_lastName: user.lastName,
-		globalRole: user.globalRole?.name,
+		globalRole: user.role,
 	};
 }
 
 @Service()
-export class InternalHooks implements IInternalHooksClass {
-	private instanceId: string;
-
+export class InternalHooks {
 	constructor(
-		private telemetry: Telemetry,
-		private nodeTypes: NodeTypes,
-		private roleService: RoleService,
-	) {}
-
-	async init(instanceId: string) {
-		this.instanceId = instanceId;
-		this.telemetry.setInstanceId(instanceId);
+		private readonly telemetry: Telemetry,
+		private readonly nodeTypes: NodeTypes,
+		private readonly sharedWorkflowRepository: SharedWorkflowRepository,
+		private readonly workflowRepository: WorkflowRepository,
+		eventsService: EventsService,
+		private readonly instanceSettings: InstanceSettings,
+		private readonly eventBus: MessageEventBus,
+		private readonly license: License,
+	) {
+		eventsService.on(
+			'telemetry.onFirstProductionWorkflowSuccess',
+			async (metrics) => await this.onFirstProductionWorkflowSuccess(metrics),
+		);
+		eventsService.on(
+			'telemetry.onFirstWorkflowDataLoad',
+			async (metrics) => await this.onFirstWorkflowDataLoad(metrics),
+		);
+	}
+
+	async init() {
 		await this.telemetry.init();
 	}
 
-	async onServerStarted(
-		diagnosticInfo: IDiagnosticInfo,
-		earliestWorkflowCreatedAt?: Date,
-	): Promise<unknown[]> {
+	async onServerStarted(): Promise<unknown[]> {
+		const cpus = os.cpus();
+		const binaryDataConfig = config.getEnv('binaryDataManager');
+
+		const isS3Selected = config.getEnv('binaryDataManager.mode') === 's3';
+		const isS3Available = config.getEnv('binaryDataManager.availableModes').includes('s3');
+		const isS3Licensed = this.license.isBinaryDataS3Licensed();
+		const authenticationMethod = config.getEnv('userManagement.authenticationMethod');
+
 		const info = {
-			version_cli: diagnosticInfo.versionCli,
-			db_type: diagnosticInfo.databaseType,
-			n8n_version_notifications_enabled: diagnosticInfo.notificationsEnabled,
-			n8n_disable_production_main_process: diagnosticInfo.disableProductionWebhooksOnMainProcess,
-			n8n_basic_auth_active: diagnosticInfo.basicAuthActive,
-			system_info: diagnosticInfo.systemInfo,
-			execution_variables: diagnosticInfo.executionVariables,
-			n8n_deployment_type: diagnosticInfo.deploymentType,
-			n8n_binary_data_mode: diagnosticInfo.binaryDataMode,
-			n8n_multi_user_allowed: diagnosticInfo.n8n_multi_user_allowed,
-			smtp_set_up: diagnosticInfo.smtp_set_up,
-			ldap_allowed: diagnosticInfo.ldap_allowed,
+			version_cli: N8N_VERSION,
+			db_type: config.getEnv('database.type'),
+			n8n_version_notifications_enabled: config.getEnv('versionNotifications.enabled'),
+			n8n_disable_production_main_process: config.getEnv(
+				'endpoints.disableProductionWebhooksOnMainProcess',
+			),
+			system_info: {
+				os: {
+					type: os.type(),
+					version: os.version(),
+				},
+				memory: os.totalmem() / 1024,
+				cpus: {
+					count: cpus.length,
+					model: cpus[0].model,
+					speed: cpus[0].speed,
+				},
+			},
+			execution_variables: {
+				executions_mode: config.getEnv('executions.mode'),
+				executions_timeout: config.getEnv('executions.timeout'),
+				executions_timeout_max: config.getEnv('executions.maxTimeout'),
+				executions_data_save_on_error: config.getEnv('executions.saveDataOnError'),
+				executions_data_save_on_success: config.getEnv('executions.saveDataOnSuccess'),
+				executions_data_save_on_progress: config.getEnv('executions.saveExecutionProgress'),
+				executions_data_save_manual_executions: config.getEnv(
+					'executions.saveDataManualExecutions',
+				),
+				executions_data_prune: config.getEnv('executions.pruneData'),
+				executions_data_max_age: config.getEnv('executions.pruneDataMaxAge'),
+			},
+			n8n_deployment_type: config.getEnv('deployment.type'),
+			n8n_binary_data_mode: binaryDataConfig.mode,
+			smtp_set_up: config.getEnv('userManagement.emails.mode') === 'smtp',
+			ldap_allowed: authenticationMethod === 'ldap',
+			saml_enabled: authenticationMethod === 'saml',
+			license_plan_name: this.license.getPlanName(),
+			license_tenant_id: config.getEnv('license.tenantId'),
+			binary_data_s3: isS3Available && isS3Selected && isS3Licensed,
+			multi_main_setup_enabled: config.getEnv('multiMainSetup.enabled'),
 		};
 
-		return Promise.all([
+		const firstWorkflow = await this.workflowRepository.findOne({
+			select: ['createdAt'],
+			order: { createdAt: 'ASC' },
+			where: {},
+		});
+
+		return await Promise.all([
 			this.telemetry.identify(info),
 			this.telemetry.track('Instance started', {
 				...info,
-				earliest_workflow_created: earliestWorkflowCreatedAt,
+				earliest_workflow_created: firstWorkflow?.createdAt,
 			}),
 		]);
 	}
 
-	async onFrontendSettingsAPI(sessionId?: string): Promise<void> {
-		return this.telemetry.track('Session started', { session_id: sessionId });
+	async onFrontendSettingsAPI(pushRef?: string): Promise<void> {
+		return await this.telemetry.track('Session started', { session_id: pushRef });
 	}
 
 	async onPersonalizationSurveySubmitted(
@@ -105,17 +158,16 @@ export class InternalHooks implements IInternalHooksClass {
 			personalizationSurveyData[snakeCase(camelCaseKey)] = answers[camelCaseKey];
 		});
 
-		return this.telemetry.track(
+		return await this.telemetry.track(
 			'User responded to personalization questions',
 			personalizationSurveyData,
-			{ withPostHog: true },
 		);
 	}
 
 	async onWorkflowCreated(user: User, workflow: IWorkflowBase, publicApi: boolean): Promise<void> {
 		const { nodeGraph } = TelemetryHelpers.generateNodesGraph(workflow, this.nodeTypes);
 		void Promise.all([
-			eventBus.sendAuditEvent({
+			this.eventBus.sendAuditEvent({
 				eventName: 'n8n.audit.workflow.created',
 				payload: {
 					...userToPayload(user),
@@ -134,7 +186,7 @@ export class InternalHooks implements IInternalHooksClass {
 
 	async onWorkflowDeleted(user: User, workflowId: string, publicApi: boolean): Promise<void> {
 		void Promise.all([
-			eventBus.sendAuditEvent({
+			this.eventBus.sendAuditEvent({
 				eventName: 'n8n.audit.workflow.deleted',
 				payload: {
 					...userToPayload(user),
@@ -150,7 +202,11 @@ export class InternalHooks implements IInternalHooksClass {
 	}
 
 	async onWorkflowSaved(user: User, workflow: IWorkflowDb, publicApi: boolean): Promise<void> {
-		const { nodeGraph } = TelemetryHelpers.generateNodesGraph(workflow, this.nodeTypes);
+		const isCloudDeployment = config.getEnv('deployment.type') === 'cloud';
+
+		const { nodeGraph } = TelemetryHelpers.generateNodesGraph(workflow, this.nodeTypes, {
+			isCloudDeployment,
+		});
 
 		const notesCount = Object.keys(nodeGraph.notes).length;
 		const overlappingCount = Object.values(nodeGraph.notes).filter(
@@ -159,14 +215,14 @@ export class InternalHooks implements IInternalHooksClass {
 
 		let userRole: 'owner' | 'sharee' | undefined = undefined;
 		if (user.id && workflow.id) {
-			const role = await this.roleService.getUserRoleForWorkflow(user.id, workflow.id);
+			const role = await this.sharedWorkflowRepository.findSharingRole(user.id, workflow.id);
 			if (role) {
-				userRole = role.name === 'owner' ? 'owner' : 'sharee';
+				userRole = role === 'workflow:owner' ? 'owner' : 'sharee';
 			}
 		}
 
 		void Promise.all([
-			eventBus.sendAuditEvent({
+			this.eventBus.sendAuditEvent({
 				eventName: 'n8n.audit.workflow.updated',
 				payload: {
 					...userToPayload(user),
@@ -174,21 +230,17 @@ export class InternalHooks implements IInternalHooksClass {
 					workflowName: workflow.name,
 				},
 			}),
-			this.telemetry.track(
-				'User saved workflow',
-				{
-					user_id: user.id,
-					workflow_id: workflow.id,
-					node_graph_string: JSON.stringify(nodeGraph),
-					notes_count_overlapping: overlappingCount,
-					notes_count_non_overlapping: notesCount - overlappingCount,
-					version_cli: N8N_VERSION,
-					num_tags: workflow.tags?.length ?? 0,
-					public_api: publicApi,
-					sharing_role: userRole,
-				},
-				{ withPostHog: true },
-			),
+			this.telemetry.track('User saved workflow', {
+				user_id: user.id,
+				workflow_id: workflow.id,
+				node_graph_string: JSON.stringify(nodeGraph),
+				notes_count_overlapping: overlappingCount,
+				notes_count_non_overlapping: notesCount - overlappingCount,
+				version_cli: N8N_VERSION,
+				num_tags: workflow.tags?.length ?? 0,
+				public_api: publicApi,
+				sharing_role: userRole,
+			}),
 		]);
 	}
 
@@ -198,7 +250,7 @@ export class InternalHooks implements IInternalHooksClass {
 		nodeName: string,
 	): Promise<void> {
 		const nodeInWorkflow = workflow.nodes.find((node) => node.name === nodeName);
-		void eventBus.sendNodeEvent({
+		void this.eventBus.sendNodeEvent({
 			eventName: 'n8n.node.started',
 			payload: {
 				executionId,
@@ -216,7 +268,7 @@ export class InternalHooks implements IInternalHooksClass {
 		nodeName: string,
 	): Promise<void> {
 		const nodeInWorkflow = workflow.nodes.find((node) => node.name === nodeName);
-		void eventBus.sendNodeEvent({
+		void this.eventBus.sendNodeEvent({
 			eventName: 'n8n.node.finished',
 			payload: {
 				executionId,
@@ -230,41 +282,64 @@ export class InternalHooks implements IInternalHooksClass {
 
 	async onWorkflowBeforeExecute(
 		executionId: string,
-		data: IWorkflowExecutionDataProcess,
+		data: IWorkflowExecutionDataProcess | IWorkflowBase,
 	): Promise<void> {
-		void Promise.all([
-			Db.collections.Execution.update(executionId, { status: 'running' }),
-			eventBus.sendWorkflowEvent({
-				eventName: 'n8n.workflow.started',
-				payload: {
-					executionId,
-					userId: data.userId,
-					workflowId: data.workflowData.id?.toString(),
-					isManual: data.executionMode === 'manual',
-					workflowName: data.workflowData.name,
-				},
-			}),
-		]);
+		let payload: EventPayloadWorkflow;
+		// this hook is called slightly differently depending on whether it's from a worker or the main instance
+		// in the worker context, meaning in queue mode, only IWorkflowBase is available
+		if ('executionData' in data) {
+			payload = {
+				executionId,
+				userId: data.userId ?? undefined,
+				workflowId: data.workflowData.id?.toString(),
+				isManual: data.executionMode === 'manual',
+				workflowName: data.workflowData.name,
+			};
+		} else {
+			payload = {
+				executionId,
+				userId: undefined,
+				workflowId: (data as IWorkflowBase).id?.toString(),
+				isManual: false,
+				workflowName: (data as IWorkflowBase).name,
+			};
+		}
+		void this.eventBus.sendWorkflowEvent({
+			eventName: 'n8n.workflow.started',
+			payload,
+		});
 	}
 
 	async onWorkflowCrashed(
 		executionId: string,
 		executionMode: WorkflowExecuteMode,
 		workflowData?: IWorkflowBase,
+		executionMetadata?: ExecutionMetadata[],
 	): Promise<void> {
+		let metaData;
+		try {
+			if (executionMetadata) {
+				metaData = executionMetadata.reduce((acc, meta) => {
+					return { ...acc, [meta.key]: meta.value };
+				}, {});
+			}
+		} catch {}
+
 		void Promise.all([
-			eventBus.sendWorkflowEvent({
+			this.eventBus.sendWorkflowEvent({
 				eventName: 'n8n.workflow.crashed',
 				payload: {
 					executionId,
 					isManual: executionMode === 'manual',
 					workflowId: workflowData?.id?.toString(),
 					workflowName: workflowData?.name,
+					metaData,
 				},
 			}),
 		]);
 	}
 
+	// eslint-disable-next-line complexity
 	async onWorkflowPostExecute(
 		executionId: string,
 		workflow: IWorkflowBase,
@@ -275,9 +350,14 @@ export class InternalHooks implements IInternalHooksClass {
 			return;
 		}
 
+		if (runData?.status === 'waiting') {
+			// No need to send telemetry or logs when the workflow hasn't finished yet.
+			return;
+		}
+
 		const promises = [];
 
-		const properties: IExecutionTrackProperties = {
+		const telemetryProperties: IExecutionTrackProperties = {
 			workflow_id: workflow.id,
 			is_manual: false,
 			version_cli: N8N_VERSION,
@@ -285,33 +365,33 @@ export class InternalHooks implements IInternalHooksClass {
 		};
 
 		if (userId) {
-			properties.user_id = userId;
+			telemetryProperties.user_id = userId;
 		}
 
-		properties.success = !!runData?.finished;
-
-		let executionStatus: ExecutionStatus;
-		if (runData?.status === 'crashed') {
-			executionStatus = 'crashed';
-		} else if (runData?.status === 'waiting' || runData?.data?.waitTill) {
-			executionStatus = 'waiting';
-		} else {
-			executionStatus = properties.success ? 'success' : 'failed';
+		if (runData?.data.resultData.error?.message?.includes('canceled')) {
+			runData.status = 'canceled';
 		}
 
+		telemetryProperties.success = !!runData?.finished;
+
+		// const executionStatus: ExecutionStatus = runData?.status ?? 'unknown';
+		const executionStatus: ExecutionStatus = runData
+			? determineFinalExecutionStatus(runData)
+			: 'unknown';
+
 		if (runData !== undefined) {
-			properties.execution_mode = runData.mode;
-			properties.is_manual = runData.mode === 'manual';
+			telemetryProperties.execution_mode = runData.mode;
+			telemetryProperties.is_manual = runData.mode === 'manual';
 
 			let nodeGraphResult: INodesGraphResult | null = null;
 
-			if (!properties.success && runData?.data.resultData.error) {
-				properties.error_message = runData?.data.resultData.error.message;
+			if (!telemetryProperties.success && runData?.data.resultData.error) {
+				telemetryProperties.error_message = runData?.data.resultData.error.message;
 				let errorNodeName =
 					'node' in runData?.data.resultData.error
 						? runData?.data.resultData.error.node?.name
 						: undefined;
-				properties.error_node_type =
+				telemetryProperties.error_node_type =
 					'node' in runData?.data.resultData.error
 						? runData?.data.resultData.error.node?.type
 						: undefined;
@@ -323,32 +403,32 @@ export class InternalHooks implements IInternalHooksClass {
 					);
 
 					if (lastNode !== undefined) {
-						properties.error_node_type = lastNode.type;
+						telemetryProperties.error_node_type = lastNode.type;
 						errorNodeName = lastNode.name;
 					}
 				}
 
-				if (properties.is_manual) {
+				if (telemetryProperties.is_manual) {
 					nodeGraphResult = TelemetryHelpers.generateNodesGraph(workflow, this.nodeTypes);
-					properties.node_graph = nodeGraphResult.nodeGraph;
-					properties.node_graph_string = JSON.stringify(nodeGraphResult.nodeGraph);
+					telemetryProperties.node_graph = nodeGraphResult.nodeGraph;
+					telemetryProperties.node_graph_string = JSON.stringify(nodeGraphResult.nodeGraph);
 
 					if (errorNodeName) {
-						properties.error_node_id = nodeGraphResult.nameIndices[errorNodeName];
+						telemetryProperties.error_node_id = nodeGraphResult.nameIndices[errorNodeName];
 					}
 				}
 			}
 
-			if (properties.is_manual) {
+			if (telemetryProperties.is_manual) {
 				if (!nodeGraphResult) {
 					nodeGraphResult = TelemetryHelpers.generateNodesGraph(workflow, this.nodeTypes);
 				}
 
 				let userRole: 'owner' | 'sharee' | undefined = undefined;
 				if (userId) {
-					const role = await this.roleService.getUserRoleForWorkflow(userId, workflow.id);
+					const role = await this.sharedWorkflowRepository.findSharingRole(userId, workflow.id);
 					if (role) {
-						userRole = role.name === 'owner' ? 'owner' : 'sharee';
+						userRole = role === 'workflow:owner' ? 'owner' : 'sharee';
 					}
 				}
 
@@ -357,10 +437,10 @@ export class InternalHooks implements IInternalHooksClass {
 					workflow_id: workflow.id,
 					status: executionStatus,
 					executionStatus: runData?.status ?? 'unknown',
-					error_message: properties.error_message as string,
-					error_node_type: properties.error_node_type,
-					node_graph_string: properties.node_graph_string as string,
-					error_node_id: properties.error_node_id as string,
+					error_message: telemetryProperties.error_message as string,
+					error_node_type: telemetryProperties.error_node_type,
+					node_graph_string: telemetryProperties.node_graph_string as string,
+					error_node_id: telemetryProperties.error_node_id as string,
 					webhook_domain: null,
 					sharing_role: userRole,
 				};
@@ -380,11 +460,7 @@ export class InternalHooks implements IInternalHooksClass {
 						node_id: nodeGraphResult.nameIndices[runData.data.startData?.destinationNode],
 					};
 
-					promises.push(
-						this.telemetry.track('Manual node exec finished', telemetryPayload, {
-							withPostHog: true,
-						}),
-					);
+					promises.push(this.telemetry.track('Manual node exec finished', telemetryPayload));
 				} else {
 					nodeGraphResult.webhookNodeNames.forEach((name: string) => {
 						const execJson = runData.data.resultData.runData[name]?.[0]?.data?.main?.[0]?.[0]
@@ -397,53 +473,43 @@ export class InternalHooks implements IInternalHooksClass {
 					});
 
 					promises.push(
-						this.telemetry.track('Manual workflow exec finished', manualExecEventProperties, {
-							withPostHog: true,
-						}),
+						this.telemetry.track('Manual workflow exec finished', manualExecEventProperties),
 					);
 				}
 			}
 		}
 
-		promises.push(
-			Db.collections.Execution.update(executionId, {
-				status: executionStatus,
-			}) as unknown as Promise<void>,
-		);
-
-		promises.push(
-			properties.success
-				? eventBus.sendWorkflowEvent({
-						eventName: 'n8n.workflow.success',
-						payload: {
-							executionId,
-							success: properties.success,
-							userId: properties.user_id,
-							workflowId: properties.workflow_id,
-							isManual: properties.is_manual,
-							workflowName: workflow.name,
-						},
-				  })
-				: eventBus.sendWorkflowEvent({
-						eventName: 'n8n.workflow.failed',
-						payload: {
-							executionId,
-							success: properties.success,
-							userId: properties.user_id,
-							workflowId: properties.workflow_id,
-							lastNodeExecuted: runData?.data.resultData.lastNodeExecuted,
-							errorNodeType: properties.error_node_type,
-							errorNodeId: properties.error_node_id?.toString(),
-							errorMessage: properties.error_message?.toString(),
-							isManual: properties.is_manual,
-							workflowName: workflow.name,
-						},
-				  }),
-		);
+		const sharedEventPayload: EventPayloadWorkflow = {
+			executionId,
+			success: telemetryProperties.success,
+			userId: telemetryProperties.user_id,
+			workflowId: workflow.id,
+			isManual: telemetryProperties.is_manual,
+			workflowName: workflow.name,
+			metaData: runData?.data?.resultData?.metadata,
+		};
+		let event;
+		if (telemetryProperties.success) {
+			event = this.eventBus.sendWorkflowEvent({
+				eventName: 'n8n.workflow.success',
+				payload: sharedEventPayload,
+			});
+		} else {
+			event = this.eventBus.sendWorkflowEvent({
+				eventName: 'n8n.workflow.failed',
+				payload: {
+					...sharedEventPayload,
+					lastNodeExecuted: runData?.data.resultData.lastNodeExecuted,
+					errorNodeType: telemetryProperties.error_node_type,
+					errorNodeId: telemetryProperties.error_node_id?.toString(),
+					errorMessage: telemetryProperties.error_message?.toString(),
+				},
+			});
+		}
 
-		await BinaryDataManager.getInstance().persistBinaryDataForExecutionId(executionId);
+		promises.push(event);
 
-		void Promise.all([...promises, this.telemetry.trackWorkflowExecution(properties)]);
+		void Promise.all([...promises, this.telemetry.trackWorkflowExecution(telemetryProperties)]);
 	}
 
 	async onWorkflowSharingUpdate(workflowId: string, userId: string, userList: string[]) {
@@ -453,7 +519,7 @@ export class InternalHooks implements IInternalHooksClass {
 			user_id_list: userList,
 		};
 
-		return this.telemetry.track('User updated workflow sharing', properties, { withPostHog: true });
+		return await this.telemetry.track('User updated workflow sharing', properties);
 	}
 
 	async onN8nStop(): Promise<void> {
@@ -463,7 +529,7 @@ export class InternalHooks implements IInternalHooksClass {
 			}, 3000);
 		});
 
-		return Promise.race([timeoutPromise, this.telemetry.trackN8nStop()]);
+		return await Promise.race([timeoutPromise, this.telemetry.trackN8nStop()]);
 	}
 
 	async onUserDeletion(userDeletionData: {
@@ -472,7 +538,7 @@ export class InternalHooks implements IInternalHooksClass {
 		publicApi: boolean;
 	}): Promise<void> {
 		void Promise.all([
-			eventBus.sendAuditEvent({
+			this.eventBus.sendAuditEvent({
 				eventName: 'n8n.audit.user.deleted',
 				payload: {
 					...userToPayload(userDeletionData.user),
@@ -491,31 +557,45 @@ export class InternalHooks implements IInternalHooksClass {
 		target_user_id: string[];
 		public_api: boolean;
 		email_sent: boolean;
+		invitee_role: string;
 	}): Promise<void> {
 		void Promise.all([
-			eventBus.sendAuditEvent({
+			this.eventBus.sendAuditEvent({
 				eventName: 'n8n.audit.user.invited',
 				payload: {
 					...userToPayload(userInviteData.user),
 					targetUserId: userInviteData.target_user_id,
 				},
 			}),
+
 			this.telemetry.track('User invited new user', {
 				user_id: userInviteData.user.id,
 				target_user_id: userInviteData.target_user_id,
 				public_api: userInviteData.public_api,
 				email_sent: userInviteData.email_sent,
+				invitee_role: userInviteData.invitee_role,
 			}),
 		]);
 	}
 
+	async onUserRoleChange(userRoleChangeData: {
+		user: User;
+		target_user_id: string;
+		public_api: boolean;
+		target_user_new_role: string;
+	}) {
+		const { user, ...rest } = userRoleChangeData;
+
+		void this.telemetry.track('User changed role', { user_id: user.id, ...rest });
+	}
+
 	async onUserReinvite(userReinviteData: {
 		user: User;
 		target_user_id: string;
 		public_api: boolean;
 	}): Promise<void> {
 		void Promise.all([
-			eventBus.sendAuditEvent({
+			this.eventBus.sendAuditEvent({
 				eventName: 'n8n.audit.user.reinvited',
 				payload: {
 					...userToPayload(userReinviteData.user),
@@ -534,47 +614,47 @@ export class InternalHooks implements IInternalHooksClass {
 		user_id: string;
 		public_api: boolean;
 	}): Promise<void> {
-		return this.telemetry.track('User retrieved user', userRetrievedData);
+		return await this.telemetry.track('User retrieved user', userRetrievedData);
 	}
 
 	async onUserRetrievedAllUsers(userRetrievedData: {
 		user_id: string;
 		public_api: boolean;
 	}): Promise<void> {
-		return this.telemetry.track('User retrieved all users', userRetrievedData);
+		return await this.telemetry.track('User retrieved all users', userRetrievedData);
 	}
 
 	async onUserRetrievedExecution(userRetrievedData: {
 		user_id: string;
 		public_api: boolean;
 	}): Promise<void> {
-		return this.telemetry.track('User retrieved execution', userRetrievedData);
+		return await this.telemetry.track('User retrieved execution', userRetrievedData);
 	}
 
 	async onUserRetrievedAllExecutions(userRetrievedData: {
 		user_id: string;
 		public_api: boolean;
 	}): Promise<void> {
-		return this.telemetry.track('User retrieved all executions', userRetrievedData);
+		return await this.telemetry.track('User retrieved all executions', userRetrievedData);
 	}
 
 	async onUserRetrievedWorkflow(userRetrievedData: {
 		user_id: string;
 		public_api: boolean;
 	}): Promise<void> {
-		return this.telemetry.track('User retrieved workflow', userRetrievedData);
+		return await this.telemetry.track('User retrieved workflow', userRetrievedData);
 	}
 
 	async onUserRetrievedAllWorkflows(userRetrievedData: {
 		user_id: string;
 		public_api: boolean;
 	}): Promise<void> {
-		return this.telemetry.track('User retrieved all workflows', userRetrievedData);
+		return await this.telemetry.track('User retrieved all workflows', userRetrievedData);
 	}
 
 	async onUserUpdate(userUpdateData: { user: User; fields_changed: string[] }): Promise<void> {
 		void Promise.all([
-			eventBus.sendAuditEvent({
+			this.eventBus.sendAuditEvent({
 				eventName: 'n8n.audit.user.updated',
 				payload: {
 					...userToPayload(userUpdateData.user),
@@ -593,7 +673,7 @@ export class InternalHooks implements IInternalHooksClass {
 		invitee: User;
 	}): Promise<void> {
 		void Promise.all([
-			eventBus.sendAuditEvent({
+			this.eventBus.sendAuditEvent({
 				eventName: 'n8n.audit.user.invitation.accepted',
 				payload: {
 					invitee: {
@@ -612,7 +692,7 @@ export class InternalHooks implements IInternalHooksClass {
 
 	async onUserPasswordResetEmailClick(userPasswordResetData: { user: User }): Promise<void> {
 		void Promise.all([
-			eventBus.sendAuditEvent({
+			this.eventBus.sendAuditEvent({
 				eventName: 'n8n.audit.user.reset',
 				payload: {
 					...userToPayload(userPasswordResetData.user),
@@ -626,10 +706,15 @@ export class InternalHooks implements IInternalHooksClass {
 
 	async onUserTransactionalEmail(userTransactionalEmailData: {
 		user_id: string;
-		message_type: 'Reset password' | 'New user invite' | 'Resend invite';
+		message_type:
+			| 'Reset password'
+			| 'New user invite'
+			| 'Resend invite'
+			| 'Workflow shared'
+			| 'Credentials shared';
 		public_api: boolean;
 	}): Promise<void> {
-		return this.telemetry.track(
+		return await this.telemetry.track(
 			'Instance sent transactional email to user',
 			userTransactionalEmailData,
 		);
@@ -641,12 +726,12 @@ export class InternalHooks implements IInternalHooksClass {
 		method: string;
 		api_version: string;
 	}): Promise<void> {
-		return this.telemetry.track('User invoked API', userInvokedApiData);
+		return await this.telemetry.track('User invoked API', userInvokedApiData);
 	}
 
 	async onApiKeyDeleted(apiKeyDeletedData: { user: User; public_api: boolean }): Promise<void> {
 		void Promise.all([
-			eventBus.sendAuditEvent({
+			this.eventBus.sendAuditEvent({
 				eventName: 'n8n.audit.user.api.deleted',
 				payload: {
 					...userToPayload(apiKeyDeletedData.user),
@@ -661,7 +746,7 @@ export class InternalHooks implements IInternalHooksClass {
 
 	async onApiKeyCreated(apiKeyCreatedData: { user: User; public_api: boolean }): Promise<void> {
 		void Promise.all([
-			eventBus.sendAuditEvent({
+			this.eventBus.sendAuditEvent({
 				eventName: 'n8n.audit.user.api.created',
 				payload: {
 					...userToPayload(apiKeyCreatedData.user),
@@ -676,7 +761,7 @@ export class InternalHooks implements IInternalHooksClass {
 
 	async onUserPasswordResetRequestClick(userPasswordResetData: { user: User }): Promise<void> {
 		void Promise.all([
-			eventBus.sendAuditEvent({
+			this.eventBus.sendAuditEvent({
 				eventName: 'n8n.audit.user.reset.requested',
 				payload: {
 					...userToPayload(userPasswordResetData.user),
@@ -689,7 +774,7 @@ export class InternalHooks implements IInternalHooksClass {
 	}
 
 	async onInstanceOwnerSetup(instanceOwnerSetupData: { user_id: string }): Promise<void> {
-		return this.telemetry.track('Owner finished instance setup', instanceOwnerSetupData);
+		return await this.telemetry.track('Owner finished instance setup', instanceOwnerSetupData);
 	}
 
 	async onUserSignup(
@@ -700,7 +785,7 @@ export class InternalHooks implements IInternalHooksClass {
 		},
 	): Promise<void> {
 		void Promise.all([
-			eventBus.sendAuditEvent({
+			this.eventBus.sendAuditEvent({
 				eventName: 'n8n.audit.user.signedup',
 				payload: {
 					...userToPayload(user),
@@ -715,11 +800,16 @@ export class InternalHooks implements IInternalHooksClass {
 
 	async onEmailFailed(failedEmailData: {
 		user: User;
-		message_type: 'Reset password' | 'New user invite' | 'Resend invite';
+		message_type:
+			| 'Reset password'
+			| 'New user invite'
+			| 'Resend invite'
+			| 'Workflow shared'
+			| 'Credentials shared';
 		public_api: boolean;
 	}): Promise<void> {
 		void Promise.all([
-			eventBus.sendAuditEvent({
+			this.eventBus.sendAuditEvent({
 				eventName: 'n8n.audit.user.email.failed',
 				payload: {
 					messageType: failedEmailData.message_type,
@@ -732,6 +822,38 @@ export class InternalHooks implements IInternalHooksClass {
 		]);
 	}
 
+	async onUserLoginSuccess(userLoginData: {
+		user: User;
+		authenticationMethod: AuthenticationMethod;
+	}): Promise<void> {
+		void Promise.all([
+			this.eventBus.sendAuditEvent({
+				eventName: 'n8n.audit.user.login.success',
+				payload: {
+					authenticationMethod: userLoginData.authenticationMethod,
+					...userToPayload(userLoginData.user),
+				},
+			}),
+		]);
+	}
+
+	async onUserLoginFailed(userLoginData: {
+		user: string;
+		authenticationMethod: AuthenticationMethod;
+		reason?: string;
+	}): Promise<void> {
+		void Promise.all([
+			this.eventBus.sendAuditEvent({
+				eventName: 'n8n.audit.user.login.failed',
+				payload: {
+					authenticationMethod: userLoginData.authenticationMethod,
+					user: userLoginData.user,
+					reason: userLoginData.reason,
+				},
+			}),
+		]);
+	}
+
 	/**
 	 * Credentials
 	 */
@@ -744,7 +866,7 @@ export class InternalHooks implements IInternalHooksClass {
 		public_api: boolean;
 	}): Promise<void> {
 		void Promise.all([
-			eventBus.sendAuditEvent({
+			this.eventBus.sendAuditEvent({
 				eventName: 'n8n.audit.user.credentials.created',
 				payload: {
 					...userToPayload(userCreatedCredentialsData.user),
@@ -757,7 +879,7 @@ export class InternalHooks implements IInternalHooksClass {
 				user_id: userCreatedCredentialsData.user.id,
 				credential_type: userCreatedCredentialsData.credential_type,
 				credential_id: userCreatedCredentialsData.credential_id,
-				instance_id: this.instanceId,
+				instance_id: this.instanceSettings.instanceId,
 			}),
 		]);
 	}
@@ -772,7 +894,7 @@ export class InternalHooks implements IInternalHooksClass {
 		sharees_removed: number | null;
 	}): Promise<void> {
 		void Promise.all([
-			eventBus.sendAuditEvent({
+			this.eventBus.sendAuditEvent({
 				eventName: 'n8n.audit.user.credentials.shared',
 				payload: {
 					...userToPayload(userSharedCredentialsData.user),
@@ -791,7 +913,56 @@ export class InternalHooks implements IInternalHooksClass {
 				user_id_sharer: userSharedCredentialsData.user_id_sharer,
 				user_ids_sharees_added: userSharedCredentialsData.user_ids_sharees_added,
 				sharees_removed: userSharedCredentialsData.sharees_removed,
-				instance_id: this.instanceId,
+				instance_id: this.instanceSettings.instanceId,
+			}),
+		]);
+	}
+
+	async onUserUpdatedCredentials(userUpdatedCredentialsData: {
+		user: User;
+		credential_name: string;
+		credential_type: string;
+		credential_id: string;
+	}): Promise<void> {
+		void Promise.all([
+			this.eventBus.sendAuditEvent({
+				eventName: 'n8n.audit.user.credentials.updated',
+				payload: {
+					...userToPayload(userUpdatedCredentialsData.user),
+					credentialName: userUpdatedCredentialsData.credential_name,
+					credentialType: userUpdatedCredentialsData.credential_type,
+					credentialId: userUpdatedCredentialsData.credential_id,
+				},
+			}),
+			this.telemetry.track('User updated credentials', {
+				user_id: userUpdatedCredentialsData.user.id,
+				credential_type: userUpdatedCredentialsData.credential_type,
+				credential_id: userUpdatedCredentialsData.credential_id,
+			}),
+		]);
+	}
+
+	async onUserDeletedCredentials(userUpdatedCredentialsData: {
+		user: User;
+		credential_name: string;
+		credential_type: string;
+		credential_id: string;
+	}): Promise<void> {
+		void Promise.all([
+			this.eventBus.sendAuditEvent({
+				eventName: 'n8n.audit.user.credentials.deleted',
+				payload: {
+					...userToPayload(userUpdatedCredentialsData.user),
+					credentialName: userUpdatedCredentialsData.credential_name,
+					credentialType: userUpdatedCredentialsData.credential_type,
+					credentialId: userUpdatedCredentialsData.credential_id,
+				},
+			}),
+			this.telemetry.track('User deleted credentials', {
+				user_id: userUpdatedCredentialsData.user.id,
+				credential_type: userUpdatedCredentialsData.credential_type,
+				credential_id: userUpdatedCredentialsData.credential_id,
+				instance_id: this.instanceSettings.instanceId,
 			}),
 		]);
 	}
@@ -812,7 +983,7 @@ export class InternalHooks implements IInternalHooksClass {
 		failure_reason?: string;
 	}): Promise<void> {
 		void Promise.all([
-			eventBus.sendAuditEvent({
+			this.eventBus.sendAuditEvent({
 				eventName: 'n8n.audit.package.installed',
 				payload: {
 					...userToPayload(installationData.user),
@@ -850,7 +1021,7 @@ export class InternalHooks implements IInternalHooksClass {
 		package_author_email?: string;
 	}): Promise<void> {
 		void Promise.all([
-			eventBus.sendAuditEvent({
+			this.eventBus.sendAuditEvent({
 				eventName: 'n8n.audit.package.updated',
 				payload: {
 					...userToPayload(updateData.user),
@@ -883,7 +1054,7 @@ export class InternalHooks implements IInternalHooksClass {
 		package_author_email?: string;
 	}): Promise<void> {
 		void Promise.all([
-			eventBus.sendAuditEvent({
+			this.eventBus.sendAuditEvent({
 				eventName: 'n8n.audit.package.deleted',
 				payload: {
 					...userToPayload(deleteData.user),
@@ -911,15 +1082,7 @@ export class InternalHooks implements IInternalHooksClass {
 		users_synced: number;
 		error: string;
 	}): Promise<void> {
-		return this.telemetry.track('Ldap general sync finished', data);
-	}
-
-	async onLdapUsersDisabled(data: {
-		reason: 'ldap_update' | 'ldap_feature_deactivated';
-		users: number;
-		user_ids: string[];
-	}): Promise<void> {
-		return this.telemetry.track('Ldap users disabled', data);
+		return await this.telemetry.track('Ldap general sync finished', data);
 	}
 
 	async onUserUpdatedLdapSettings(data: {
@@ -936,15 +1099,15 @@ export class InternalHooks implements IInternalHooksClass {
 		loginLabel: string;
 		loginEnabled: boolean;
 	}): Promise<void> {
-		return this.telemetry.track('Ldap general sync finished', data);
+		return await this.telemetry.track('Ldap general sync finished', data);
 	}
 
 	async onLdapLoginSyncFailed(data: { error: string }): Promise<void> {
-		return this.telemetry.track('Ldap login sync failed', data);
+		return await this.telemetry.track('Ldap login sync failed', data);
 	}
 
 	async userLoginFailedDueToLdapDisabled(data: { user_id: string }): Promise<void> {
-		return this.telemetry.track('User login failed since ldap disabled', data);
+		return await this.telemetry.track('User login failed since ldap disabled', data);
 	}
 
 	/*
@@ -954,7 +1117,7 @@ export class InternalHooks implements IInternalHooksClass {
 		user_id: string;
 		workflow_id: string;
 	}): Promise<void> {
-		return this.telemetry.track('Workflow first prod success', data, { withPostHog: true });
+		return await this.telemetry.track('Workflow first prod success', data);
 	}
 
 	async onFirstWorkflowDataLoad(data: {
@@ -965,7 +1128,7 @@ export class InternalHooks implements IInternalHooksClass {
 		credential_type?: string;
 		credential_id?: string;
 	}): Promise<void> {
-		return this.telemetry.track('Workflow first data fetched', data, { withPostHog: true });
+		return await this.telemetry.track('Workflow first data fetched', data);
 	}
 
 	/**
@@ -979,10 +1142,69 @@ export class InternalHooks implements IInternalHooksClass {
 	 * Audit
 	 */
 	async onAuditGeneratedViaCli() {
-		return this.telemetry.track('Instance generated security audit via CLI command');
+		return await this.telemetry.track('Instance generated security audit via CLI command');
 	}
 
 	async onVariableCreated(createData: { variable_type: string }): Promise<void> {
-		return this.telemetry.track('User created variable', createData);
+		return await this.telemetry.track('User created variable', createData);
+	}
+
+	async onSourceControlSettingsUpdated(data: {
+		branch_name: string;
+		read_only_instance: boolean;
+		repo_type: 'github' | 'gitlab' | 'other';
+		connected: boolean;
+	}): Promise<void> {
+		return await this.telemetry.track('User updated source control settings', data);
+	}
+
+	async onSourceControlUserStartedPullUI(data: {
+		workflow_updates: number;
+		workflow_conflicts: number;
+		cred_conflicts: number;
+	}): Promise<void> {
+		return await this.telemetry.track('User started pull via UI', data);
+	}
+
+	async onSourceControlUserFinishedPullUI(data: { workflow_updates: number }): Promise<void> {
+		return await this.telemetry.track('User finished pull via UI', {
+			workflow_updates: data.workflow_updates,
+		});
+	}
+
+	async onSourceControlUserPulledAPI(data: {
+		workflow_updates: number;
+		forced: boolean;
+	}): Promise<void> {
+		return await this.telemetry.track('User pulled via API', data);
+	}
+
+	async onSourceControlUserStartedPushUI(data: {
+		workflows_eligible: number;
+		workflows_eligible_with_conflicts: number;
+		creds_eligible: number;
+		creds_eligible_with_conflicts: number;
+		variables_eligible: number;
+	}): Promise<void> {
+		return await this.telemetry.track('User started push via UI', data);
+	}
+
+	async onSourceControlUserFinishedPushUI(data: {
+		workflows_eligible: number;
+		workflows_pushed: number;
+		creds_pushed: number;
+		variables_pushed: number;
+	}): Promise<void> {
+		return await this.telemetry.track('User finished push via UI', data);
+	}
+
+	async onExternalSecretsProviderSettingsSaved(saveData: {
+		user_id?: string | undefined;
+		vault_type: string;
+		is_valid: boolean;
+		is_new: boolean;
+		error_message?: string | undefined;
+	}): Promise<void> {
+		return await this.telemetry.track('User updated external secrets settings', saveData);
 	}
 }
diff --git a/packages/cli/src/Ldap/LdapManager.ee.ts b/packages/cli/src/Ldap/LdapManager.ee.ts
deleted file mode 100644
index d4e4a39511c17..0000000000000
--- a/packages/cli/src/Ldap/LdapManager.ee.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { LdapService } from './LdapService.ee';
-import { LdapSync } from './LdapSync.ee';
-import type { LdapConfig } from './types';
-
-export class LdapManager {
-	private static ldap: {
-		service: LdapService;
-		sync: LdapSync;
-	};
-
-	private static initialized: boolean;
-
-	static getInstance(): {
-		service: LdapService;
-		sync: LdapSync;
-	} {
-		if (!this.initialized) {
-			throw new Error('LDAP Manager has not been initialized');
-		}
-		return this.ldap;
-	}
-
-	static init(config: LdapConfig): void {
-		this.ldap = {
-			service: new LdapService(),
-			sync: new LdapSync(),
-		};
-		this.ldap.service.config = config;
-		this.ldap.sync.config = config;
-		this.ldap.sync.ldapService = this.ldap.service;
-		this.initialized = true;
-	}
-
-	static updateConfig(config: LdapConfig): void {
-		this.ldap.service.config = config;
-		this.ldap.sync.config = config;
-	}
-}
diff --git a/packages/cli/src/Ldap/LdapService.ee.ts b/packages/cli/src/Ldap/LdapService.ee.ts
deleted file mode 100644
index 63394a4145fe4..0000000000000
--- a/packages/cli/src/Ldap/LdapService.ee.ts
+++ /dev/null
@@ -1,105 +0,0 @@
-/* eslint-disable no-underscore-dangle */
-import type { Entry as LdapUser, ClientOptions } from 'ldapts';
-import { Client } from 'ldapts';
-import type { LdapConfig } from './types';
-import { formatUrl, getMappingAttributes } from './helpers';
-import { BINARY_AD_ATTRIBUTES } from './constants';
-import type { ConnectionOptions } from 'tls';
-
-export class LdapService {
-	private client: Client | undefined;
-
-	private _config: LdapConfig;
-
-	/**
-	 * Set the LDAP configuration and expire the current client
-	 */
-	set config(config: LdapConfig) {
-		this._config = config;
-		this.client = undefined;
-	}
-
-	/**
-	 * Get new/existing LDAP client,
-	 * depending on whether the credentials
-	 * were updated or not
-	 */
-	private async getClient() {
-		if (this._config === undefined) {
-			throw new Error('Service cannot be used without setting the property config');
-		}
-		if (this.client === undefined) {
-			const url = formatUrl(
-				this._config.connectionUrl,
-				this._config.connectionPort,
-				this._config.connectionSecurity,
-			);
-			const ldapOptions: ClientOptions = { url };
-			const tlsOptions: ConnectionOptions = {};
-
-			if (this._config.connectionSecurity !== 'none') {
-				Object.assign(tlsOptions, {
-					rejectUnauthorized: !this._config.allowUnauthorizedCerts,
-				});
-				if (this._config.connectionSecurity === 'tls') {
-					ldapOptions.tlsOptions = tlsOptions;
-				}
-			}
-
-			this.client = new Client(ldapOptions);
-			if (this._config.connectionSecurity === 'startTls') {
-				await this.client.startTLS(tlsOptions);
-			}
-		}
-	}
-
-	/**
-	 * Attempt a binding with the admin credentials
-	 */
-	private async bindAdmin(): Promise<void> {
-		await this.getClient();
-		if (this.client) {
-			await this.client.bind(this._config.bindingAdminDn, this._config.bindingAdminPassword);
-		}
-	}
-
-	/**
-	 * Search the LDAP server using the administrator binding
-	 * (if any, else a anonymous binding will be attempted)
-	 */
-	async searchWithAdminBinding(filter: string): Promise<LdapUser[]> {
-		await this.bindAdmin();
-		if (this.client) {
-			const { searchEntries } = await this.client.search(this._config.baseDn, {
-				attributes: getMappingAttributes(this._config),
-				explicitBufferAttributes: BINARY_AD_ATTRIBUTES,
-				filter,
-				timeLimit: this._config.searchTimeout,
-				paged: { pageSize: this._config.searchPageSize },
-				...(this._config.searchPageSize === 0 && { paged: true }),
-			});
-
-			await this.client.unbind();
-			return searchEntries;
-		}
-		return [];
-	}
-
-	/**
-	 * Attempt binding with the user's credentials
-	 */
-	async validUser(dn: string, password: string): Promise<void> {
-		await this.getClient();
-		if (this.client) {
-			await this.client.bind(dn, password);
-			await this.client.unbind();
-		}
-	}
-
-	/**
-	 * Attempt binding with the administrator credentials, to test the connection
-	 */
-	async testConnection(): Promise<void> {
-		await this.bindAdmin();
-	}
-}
diff --git a/packages/cli/src/Ldap/LdapSync.ee.ts b/packages/cli/src/Ldap/LdapSync.ee.ts
deleted file mode 100644
index 5b8d552f0c87e..0000000000000
--- a/packages/cli/src/Ldap/LdapSync.ee.ts
+++ /dev/null
@@ -1,217 +0,0 @@
-import type { Entry as LdapUser } from 'ldapts';
-import { LoggerProxy as Logger } from 'n8n-workflow';
-import { QueryFailedError } from 'typeorm/error/QueryFailedError';
-import type { LdapService } from './LdapService.ee';
-import type { LdapConfig } from './types';
-import {
-	getLdapUserRole,
-	mapLdapUserToDbUser,
-	processUsers,
-	saveLdapSynchronization,
-	createFilter,
-	resolveBinaryAttributes,
-	getLdapIds,
-} from './helpers';
-import type { User } from '@db/entities/User';
-import type { Role } from '@db/entities/Role';
-import type { RunningMode, SyncStatus } from '@db/entities/AuthProviderSyncHistory';
-import { Container } from 'typedi';
-import { InternalHooks } from '@/InternalHooks';
-
-export class LdapSync {
-	private intervalId: NodeJS.Timeout | undefined = undefined;
-
-	private _config: LdapConfig;
-
-	private _ldapService: LdapService;
-
-	/**
-	 * Updates the LDAP configuration
-	 */
-	set config(config: LdapConfig) {
-		this._config = config;
-		// If user disabled synchronization in the UI and there a job schedule,
-		// stop it
-		if (this.intervalId && !this._config.synchronizationEnabled) {
-			this.stop();
-			// If instance crashed with a job scheduled, once the server starts
-			// again, reschedule it.
-		} else if (!this.intervalId && this._config.synchronizationEnabled) {
-			this.scheduleRun();
-			// If job scheduled and the run interval got updated in the UI
-			// stop the current one and schedule a new one with the new internal
-		} else if (this.intervalId && this._config.synchronizationEnabled) {
-			this.stop();
-			this.scheduleRun();
-		}
-	}
-
-	/**
-	 * Set the LDAP service instance
-	 */
-	set ldapService(service: LdapService) {
-		this._ldapService = service;
-	}
-
-	/**
-	 * Schedule a synchronization job based on the interval set in the LDAP config
-	 */
-	scheduleRun(): void {
-		if (!this._config.synchronizationInterval) {
-			throw new Error('Interval variable has to be defined');
-		}
-		this.intervalId = setInterval(async () => {
-			await this.run('live');
-		}, this._config.synchronizationInterval * 60000);
-	}
-
-	/**
-	 * Run the synchronization job.
-	 * If the job runs in "live" mode, changes to LDAP users are persisted in the database,
-	 * else the users are not modified
-	 */
-	async run(mode: RunningMode): Promise<void> {
-		Logger.debug(`LDAP - Starting a synchronization run in ${mode} mode`);
-
-		let adUsers: LdapUser[] = [];
-
-		try {
-			adUsers = await this._ldapService.searchWithAdminBinding(
-				createFilter(`(${this._config.loginIdAttribute}=*)`, this._config.userFilter),
-			);
-
-			Logger.debug('LDAP - Users return by the query', {
-				users: adUsers,
-			});
-
-			resolveBinaryAttributes(adUsers);
-		} catch (e) {
-			if (e instanceof Error) {
-				Logger.error(`LDAP - ${e.message}`);
-				throw e;
-			}
-		}
-
-		const startedAt = new Date();
-
-		const localAdUsers = await getLdapIds();
-
-		const role = await getLdapUserRole();
-
-		const { usersToCreate, usersToUpdate, usersToDisable } = this.getUsersToProcess(
-			adUsers,
-			localAdUsers,
-			role,
-		);
-
-		if (usersToDisable.length) {
-			void Container.get(InternalHooks).onLdapUsersDisabled({
-				reason: 'ldap_update',
-				users: usersToDisable.length,
-				user_ids: usersToDisable,
-			});
-		}
-
-		Logger.debug('LDAP - Users processed', {
-			created: usersToCreate.length,
-			updated: usersToUpdate.length,
-			disabled: usersToDisable.length,
-		});
-
-		const endedAt = new Date();
-		let status: SyncStatus = 'success';
-		let errorMessage = '';
-
-		try {
-			if (mode === 'live') {
-				await processUsers(usersToCreate, usersToUpdate, usersToDisable);
-			}
-		} catch (error) {
-			if (error instanceof QueryFailedError) {
-				status = 'error';
-				errorMessage = `${error.message}`;
-			}
-		}
-
-		await saveLdapSynchronization({
-			startedAt,
-			endedAt,
-			created: usersToCreate.length,
-			updated: usersToUpdate.length,
-			disabled: usersToDisable.length,
-			scanned: adUsers.length,
-			runMode: mode,
-			status,
-			error: errorMessage,
-		});
-
-		void Container.get(InternalHooks).onLdapSyncFinished({
-			type: !this.intervalId ? 'scheduled' : `manual_${mode}`,
-			succeeded: true,
-			users_synced: usersToCreate.length + usersToUpdate.length + usersToDisable.length,
-			error: errorMessage,
-		});
-
-		Logger.debug('LDAP - Synchronization finished successfully');
-	}
-
-	/**
-	 * Stop the current job scheduled, if any
-	 */
-	stop(): void {
-		clearInterval(this.intervalId);
-		this.intervalId = undefined;
-	}
-
-	/**
-	 * Get all the user that will be changed (created, updated, disabled), in the database
-	 */
-	private getUsersToProcess(
-		adUsers: LdapUser[],
-		localAdUsers: string[],
-		role: Role,
-	): {
-		usersToCreate: Array<[string, User]>;
-		usersToUpdate: Array<[string, User]>;
-		usersToDisable: string[];
-	} {
-		return {
-			usersToCreate: this.getUsersToCreate(adUsers, localAdUsers, role),
-			usersToUpdate: this.getUsersToUpdate(adUsers, localAdUsers),
-			usersToDisable: this.getUsersToDisable(adUsers, localAdUsers),
-		};
-	}
-
-	/**
-	 * Get users in LDAP that are not in the database yet
-	 */
-	private getUsersToCreate(
-		remoteAdUsers: LdapUser[],
-		localLdapIds: string[],
-		role: Role,
-	): Array<[string, User]> {
-		return remoteAdUsers
-			.filter((adUser) => !localLdapIds.includes(adUser[this._config.ldapIdAttribute] as string))
-			.map((adUser) => mapLdapUserToDbUser(adUser, this._config, role));
-	}
-
-	/**
-	 * Get users in LDAP that are already in the database
-	 */
-	private getUsersToUpdate(
-		remoteAdUsers: LdapUser[],
-		localLdapIds: string[],
-	): Array<[string, User]> {
-		return remoteAdUsers
-			.filter((adUser) => localLdapIds.includes(adUser[this._config.ldapIdAttribute] as string))
-			.map((adUser) => mapLdapUserToDbUser(adUser, this._config));
-	}
-
-	/**
-	 * Get users that are in the database but not in the LDAP server
-	 */
-	private getUsersToDisable(remoteAdUsers: LdapUser[], localLdapIds: string[]): string[] {
-		const remoteAdUserIds = remoteAdUsers.map((adUser) => adUser[this._config.ldapIdAttribute]);
-		return localLdapIds.filter((user) => !remoteAdUserIds.includes(user));
-	}
-}
diff --git a/packages/cli/src/Ldap/helpers.ts b/packages/cli/src/Ldap/helpers.ts
index 8c51add60be37..12f1b402e66b6 100644
--- a/packages/cli/src/Ldap/helpers.ts
+++ b/packages/cli/src/Ldap/helpers.ts
@@ -1,78 +1,33 @@
 /* eslint-disable @typescript-eslint/no-use-before-define */
-import { AES, enc } from 'crypto-js';
 import type { Entry as LdapUser } from 'ldapts';
 import { Filter } from 'ldapts/filters/Filter';
 import { Container } from 'typedi';
-import { UserSettings } from 'n8n-core';
 import { validate } from 'jsonschema';
 import * as Db from '@/Db';
 import config from '@/config';
-import type { Role } from '@db/entities/Role';
 import { User } from '@db/entities/User';
 import { AuthIdentity } from '@db/entities/AuthIdentity';
-import { RoleRepository } from '@db/repositories';
 import type { AuthProviderSyncHistory } from '@db/entities/AuthProviderSyncHistory';
-import { isUserManagementEnabled } from '@/UserManagement/UserManagementHelper';
-import { LdapManager } from './LdapManager.ee';
 
 import {
 	BINARY_AD_ATTRIBUTES,
 	LDAP_CONFIG_SCHEMA,
-	LDAP_FEATURE_NAME,
 	LDAP_LOGIN_ENABLED,
 	LDAP_LOGIN_LABEL,
 } from './constants';
 import type { ConnectionSecurity, LdapConfig } from './types';
-import { jsonParse, LoggerProxy as Logger } from 'n8n-workflow';
 import { License } from '@/License';
-import { InternalHooks } from '@/InternalHooks';
-import {
-	getCurrentAuthenticationMethod,
-	isEmailCurrentAuthenticationMethod,
-	isLdapCurrentAuthenticationMethod,
-	setCurrentAuthenticationMethod,
-} from '@/sso/ssoHelpers';
-import { InternalServerError } from '../ResponseHelper';
+import { UserRepository } from '@db/repositories/user.repository';
+import { AuthProviderSyncHistoryRepository } from '@db/repositories/authProviderSyncHistory.repository';
+import { AuthIdentityRepository } from '@db/repositories/authIdentity.repository';
 
 /**
  *  Check whether the LDAP feature is disabled in the instance
  */
-export const isLdapEnabled = (): boolean => {
-	const license = Container.get(License);
-	return isUserManagementEnabled() && license.isLdapEnabled();
+export const isLdapEnabled = () => {
+	return Container.get(License).isLdapEnabled();
 };
 
-/**
- * 	Check whether the LDAP feature is enabled in the instance
- */
-export const isLdapDisabled = (): boolean => !isLdapEnabled();
-
-/**
- * Set the LDAP login label to the configuration object
- */
-export const setLdapLoginLabel = (value: string): void => {
-	config.set(LDAP_LOGIN_LABEL, value);
-};
-
-/**
- * Set the LDAP login enabled to the configuration object
- */
-export async function setLdapLoginEnabled(enabled: boolean): Promise<void> {
-	if (isEmailCurrentAuthenticationMethod() || isLdapCurrentAuthenticationMethod()) {
-		if (enabled) {
-			config.set(LDAP_LOGIN_ENABLED, true);
-			await setCurrentAuthenticationMethod('ldap');
-		} else if (!enabled) {
-			config.set(LDAP_LOGIN_ENABLED, false);
-			await setCurrentAuthenticationMethod('email');
-		}
-	} else {
-		throw new InternalServerError(
-			`Cannot switch LDAP login enabled state when an authentication method other than email or ldap is active (current: ${getCurrentAuthenticationMethod()})`,
-		);
-	}
-}
-
 /**
  * Retrieve the LDAP login label from the configuration object
  */
@@ -90,13 +45,6 @@ export const randomPassword = (): string => {
 	return Math.random().toString(36).slice(-8);
 };
 
-/**
- * Return the user role to be assigned to LDAP users
- */
-export const getLdapUserRole = async (): Promise<Role> => {
-	return Container.get(RoleRepository).findGlobalMemberRoleOrFail();
-};
-
 /**
  * Validate the structure of the LDAP configuration schema
  */
@@ -112,45 +60,7 @@ export const validateLdapConfigurationSchema = (
 	return { valid, message };
 };
 
-/**
- * Encrypt password using the instance's encryption key
- */
-export const encryptPassword = async (password: string): Promise<string> => {
-	const encryptionKey = await UserSettings.getEncryptionKey();
-	return AES.encrypt(password, encryptionKey).toString();
-};
-
-/**
- * Decrypt password using the instance's encryption key
- */
-export const decryptPassword = async (password: string): Promise<string> => {
-	const encryptionKey = await UserSettings.getEncryptionKey();
-	return AES.decrypt(password, encryptionKey).toString(enc.Utf8);
-};
-
-/**
- * Retrieve the LDAP configuration (decrypted) form the database
- */
-export const getLdapConfig = async (): Promise<LdapConfig> => {
-	const configuration = await Db.collections.Settings.findOneByOrFail({
-		key: LDAP_FEATURE_NAME,
-	});
-	const configurationData = jsonParse<LdapConfig>(configuration.value);
-	configurationData.bindingAdminPassword = await decryptPassword(
-		configurationData.bindingAdminPassword,
-	);
-	return configurationData;
-};
-
-/**
- * Take the LDAP configuration and set login enabled and login label to the config object
- */
-export const setGlobalLdapConfigVariables = async (ldapConfig: LdapConfig): Promise<void> => {
-	await setLdapLoginEnabled(ldapConfig.loginEnabled);
-	setLdapLoginLabel(ldapConfig.loginLabel);
-};
-
-const resolveEntryBinaryAttributes = (entry: LdapUser): LdapUser => {
+export const resolveEntryBinaryAttributes = (entry: LdapUser): LdapUser => {
 	Object.entries(entry)
 		.filter(([k]) => BINARY_AD_ATTRIBUTES.includes(k))
 		.forEach(([k]) => {
@@ -163,74 +73,6 @@ export const resolveBinaryAttributes = (entries: LdapUser[]): void => {
 	entries.forEach((entry) => resolveEntryBinaryAttributes(entry));
 };
 
-/**
- * Update the LDAP configuration in the database
- */
-export const updateLdapConfig = async (ldapConfig: LdapConfig): Promise<void> => {
-	const { valid, message } = validateLdapConfigurationSchema(ldapConfig);
-
-	if (!valid) {
-		throw new Error(message);
-	}
-
-	LdapManager.updateConfig({ ...ldapConfig });
-
-	ldapConfig.bindingAdminPassword = await encryptPassword(ldapConfig.bindingAdminPassword);
-
-	if (!ldapConfig.loginEnabled) {
-		ldapConfig.synchronizationEnabled = false;
-		const ldapUsers = await getLdapUsers();
-		if (ldapUsers.length) {
-			await deleteAllLdapIdentities();
-			void Container.get(InternalHooks).onLdapUsersDisabled({
-				reason: 'ldap_update',
-				users: ldapUsers.length,
-				user_ids: ldapUsers.map((user) => user.id),
-			});
-		}
-	}
-
-	await Db.collections.Settings.update(
-		{ key: LDAP_FEATURE_NAME },
-		{ value: JSON.stringify(ldapConfig), loadOnStartup: true },
-	);
-	await setGlobalLdapConfigVariables(ldapConfig);
-};
-
-/**
- * Handle the LDAP initialization.
- * If it's the first run of this feature, all the default data is created in the database
- */
-export const handleLdapInit = async (): Promise<void> => {
-	if (!isLdapEnabled()) {
-		const ldapUsers = await getLdapUsers();
-		if (ldapUsers.length) {
-			void Container.get(InternalHooks).onLdapUsersDisabled({
-				reason: 'ldap_feature_deactivated',
-				users: ldapUsers.length,
-				user_ids: ldapUsers.map((user) => user.id),
-			});
-		}
-		return;
-	}
-
-	const ldapConfig = await getLdapConfig();
-
-	try {
-		await setGlobalLdapConfigVariables(ldapConfig);
-	} catch (error) {
-		Logger.error(
-			`Cannot set LDAP login enabled state when an authentication method other than email or ldap is active (current: ${getCurrentAuthenticationMethod()})`,
-			// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-			error,
-		);
-	}
-
-	// init LDAP manager with the current
-	// configuration
-	LdapManager.init(ldapConfig);
-};
-
 export const createFilter = (filter: string, userFilter: string) => {
 	let _filter = `(&(|(objectClass=person)(objectClass=user))${filter})`;
 	if (userFilter) {
@@ -244,75 +86,14 @@ export const escapeFilter = (filter: string): string => {
 	return new Filter().escape(filter); /* eslint-disable-line */
 };
 
-/**
- * Find and authenticate user in the LDAP server.
- */
-export const findAndAuthenticateLdapUser = async (
-	loginId: string,
-	password: string,
-	loginIdAttribute: string,
-	userFilter: string,
-): Promise<LdapUser | undefined> => {
-	const ldapService = LdapManager.getInstance().service;
-
-	// Search for the user with the administrator binding using the
-	// the Login ID attribute and whatever was inputted in the UI's
-	// email input.
-	let searchResult: LdapUser[] = [];
-
-	try {
-		searchResult = await ldapService.searchWithAdminBinding(
-			createFilter(`(${loginIdAttribute}=${escapeFilter(loginId)})`, userFilter),
-		);
-	} catch (e) {
-		if (e instanceof Error) {
-			void Container.get(InternalHooks).onLdapLoginSyncFailed({
-				error: e.message,
-			});
-			Logger.error('LDAP - Error during search', { message: e.message });
-		}
-		return undefined;
-	}
-
-	if (!searchResult.length) {
-		return undefined;
-	}
-
-	// In the unlikely scenario that more than one user is found (
-	// can happen depending on how the LDAP database is structured
-	// and the LDAP configuration), return the last one found as it
-	// should be the less important in the hierarchy.
-	let user = searchResult.pop();
-
-	if (user === undefined) {
-		user = { dn: '' };
-	}
-
-	try {
-		// Now with the user distinguished name (unique identifier
-		// for the user) and the password, attempt to validate the
-		// user by binding
-		await ldapService.validUser(user.dn, password);
-	} catch (e) {
-		if (e instanceof Error) {
-			Logger.error('LDAP - Error validating user against LDAP server', { message: e.message });
-		}
-		return undefined;
-	}
-
-	resolveEntryBinaryAttributes(user);
-
-	return user;
-};
-
 /**
  * Retrieve auth identity by LDAP ID from database
  */
 export const getAuthIdentityByLdapId = async (
 	idAttributeValue: string,
 ): Promise<AuthIdentity | null> => {
-	return Db.collections.AuthIdentity.findOne({
-		relations: ['user', 'user.globalRole'],
+	return await Container.get(AuthIdentityRepository).findOne({
+		relations: ['user'],
 		where: {
 			providerId: idAttributeValue,
 			providerType: 'ldap',
@@ -321,9 +102,8 @@ export const getAuthIdentityByLdapId = async (
 };
 
 export const getUserByEmail = async (email: string): Promise<User | null> => {
-	return Db.collections.User.findOne({
+	return await Container.get(UserRepository).findOne({
 		where: { email },
-		relations: ['globalRole'],
 	});
 };
 
@@ -349,7 +129,7 @@ export const mapLdapAttributesToUser = (
  * Retrieve LDAP ID of all LDAP users in the database
  */
 export const getLdapIds = async (): Promise<string[]> => {
-	const identities = await Db.collections.AuthIdentity.find({
+	const identities = await Container.get(AuthIdentityRepository).find({
 		select: ['providerId'],
 		where: {
 			providerType: 'ldap',
@@ -359,7 +139,7 @@ export const getLdapIds = async (): Promise<string[]> => {
 };
 
 export const getLdapUsers = async (): Promise<User[]> => {
-	const identities = await Db.collections.AuthIdentity.find({
+	const identities = await Container.get(AuthIdentityRepository).find({
 		relations: ['user'],
 		where: {
 			providerType: 'ldap',
@@ -374,13 +154,13 @@ export const getLdapUsers = async (): Promise<User[]> => {
 export const mapLdapUserToDbUser = (
 	ldapUser: LdapUser,
 	ldapConfig: LdapConfig,
-	role?: Role,
+	toCreate = false,
 ): [string, User] => {
 	const user = new User();
 	const [ldapId, data] = mapLdapAttributesToUser(ldapUser, ldapConfig);
 	Object.assign(user, data);
-	if (role) {
-		user.globalRole = role;
+	if (toCreate) {
+		user.role = 'global:member';
 		user.password = randomPassword();
 		user.disabled = false;
 	} else {
@@ -400,10 +180,10 @@ export const processUsers = async (
 	toDisableUsers: string[],
 ): Promise<void> => {
 	await Db.transaction(async (transactionManager) => {
-		return Promise.all([
+		return await Promise.all([
 			...toCreateUsers.map(async ([ldapId, user]) => {
 				const authIdentity = AuthIdentity.create(await transactionManager.save(user), ldapId);
-				return transactionManager.save(authIdentity);
+				return await transactionManager.save(authIdentity);
 			}),
 			...toUpdateUsers.map(async ([ldapId, user]) => {
 				const authIdentity = await transactionManager.findOneBy(AuthIdentity, {
@@ -436,10 +216,13 @@ export const processUsers = async (
 export const saveLdapSynchronization = async (
 	data: Omit<AuthProviderSyncHistory, 'id' | 'providerType'>,
 ): Promise<void> => {
-	await Db.collections.AuthProviderSyncHistory.save({
-		...data,
-		providerType: 'ldap',
-	});
+	await Container.get(AuthProviderSyncHistoryRepository).save(
+		{
+			...data,
+			providerType: 'ldap',
+		},
+		{ transaction: false },
+	);
 };
 
 /**
@@ -450,7 +233,7 @@ export const getLdapSynchronizations = async (
 	perPage: number,
 ): Promise<AuthProviderSyncHistory[]> => {
 	const _page = Math.abs(page);
-	return Db.collections.AuthProviderSyncHistory.find({
+	return await Container.get(AuthProviderSyncHistoryRepository).find({
 		where: { providerType: 'ldap' },
 		order: { id: 'DESC' },
 		take: perPage,
@@ -477,15 +260,20 @@ export const getMappingAttributes = (ldapConfig: LdapConfig): string[] => {
 };
 
 export const createLdapAuthIdentity = async (user: User, ldapId: string) => {
-	return Db.collections.AuthIdentity.save(AuthIdentity.create(user, ldapId));
+	return await Container.get(AuthIdentityRepository).save(AuthIdentity.create(user, ldapId), {
+		transaction: false,
+	});
 };
 
-export const createLdapUserOnLocalDb = async (role: Role, data: Partial<User>, ldapId: string) => {
-	const user = await Db.collections.User.save({
-		password: randomPassword(),
-		globalRole: role,
-		...data,
-	});
+export const createLdapUserOnLocalDb = async (data: Partial<User>, ldapId: string) => {
+	const user = await Container.get(UserRepository).save(
+		{
+			password: randomPassword(),
+			role: 'global:member',
+			...data,
+		},
+		{ transaction: false },
+	);
 	await createLdapAuthIdentity(user, ldapId);
 	return user;
 };
@@ -493,10 +281,10 @@ export const createLdapUserOnLocalDb = async (role: Role, data: Partial<User>, l
 export const updateLdapUserOnLocalDb = async (identity: AuthIdentity, data: Partial<User>) => {
 	const userId = identity?.user?.id;
 	if (userId) {
-		await Db.collections.User.update({ id: userId }, data);
+		await Container.get(UserRepository).update({ id: userId }, data);
 	}
 };
 
-const deleteAllLdapIdentities = async () => {
-	return Db.collections.AuthIdentity.delete({ providerType: 'ldap' });
+export const deleteAllLdapIdentities = async () => {
+	return await Container.get(AuthIdentityRepository).delete({ providerType: 'ldap' });
 };
diff --git a/packages/cli/src/Ldap/ldap.controller.ts b/packages/cli/src/Ldap/ldap.controller.ts
new file mode 100644
index 0000000000000..e7715630bfa48
--- /dev/null
+++ b/packages/cli/src/Ldap/ldap.controller.ts
@@ -0,0 +1,69 @@
+import pick from 'lodash/pick';
+import { Get, Post, Put, RestController, GlobalScope } from '@/decorators';
+import { InternalHooks } from '@/InternalHooks';
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
+
+import { NON_SENSIBLE_LDAP_CONFIG_PROPERTIES } from './constants';
+import { getLdapSynchronizations } from './helpers';
+import { LdapConfiguration } from './types';
+import { LdapService } from './ldap.service';
+
+@RestController('/ldap')
+export class LdapController {
+	constructor(
+		private readonly internalHooks: InternalHooks,
+		private readonly ldapService: LdapService,
+	) {}
+
+	@Get('/config')
+	@GlobalScope('ldap:manage')
+	async getConfig() {
+		return await this.ldapService.loadConfig();
+	}
+
+	@Post('/test-connection')
+	@GlobalScope('ldap:manage')
+	async testConnection() {
+		try {
+			await this.ldapService.testConnection();
+		} catch (error) {
+			throw new BadRequestError((error as { message: string }).message);
+		}
+	}
+
+	@Put('/config')
+	@GlobalScope('ldap:manage')
+	async updateConfig(req: LdapConfiguration.Update) {
+		try {
+			await this.ldapService.updateConfig(req.body);
+		} catch (error) {
+			throw new BadRequestError((error as { message: string }).message);
+		}
+
+		const data = await this.ldapService.loadConfig();
+
+		void this.internalHooks.onUserUpdatedLdapSettings({
+			user_id: req.user.id,
+			...pick(data, NON_SENSIBLE_LDAP_CONFIG_PROPERTIES),
+		});
+
+		return data;
+	}
+
+	@Get('/sync')
+	@GlobalScope('ldap:sync')
+	async getLdapSync(req: LdapConfiguration.GetSync) {
+		const { page = '0', perPage = '20' } = req.query;
+		return await getLdapSynchronizations(parseInt(page, 10), parseInt(perPage, 10));
+	}
+
+	@Post('/sync')
+	@GlobalScope('ldap:sync')
+	async syncLdap(req: LdapConfiguration.Sync) {
+		try {
+			await this.ldapService.runSync(req.body.type);
+		} catch (error) {
+			throw new BadRequestError((error as { message: string }).message);
+		}
+	}
+}
diff --git a/packages/cli/src/Ldap/ldap.service.ts b/packages/cli/src/Ldap/ldap.service.ts
new file mode 100644
index 0000000000000..0d7f45e58dfeb
--- /dev/null
+++ b/packages/cli/src/Ldap/ldap.service.ts
@@ -0,0 +1,442 @@
+import { Service } from 'typedi';
+import { QueryFailedError } from '@n8n/typeorm';
+import type { Entry as LdapUser, ClientOptions } from 'ldapts';
+import { Client } from 'ldapts';
+import type { ConnectionOptions } from 'tls';
+import { ApplicationError, jsonParse } from 'n8n-workflow';
+import { Cipher } from 'n8n-core';
+
+import config from '@/config';
+import type { User } from '@db/entities/User';
+import type { RunningMode, SyncStatus } from '@db/entities/AuthProviderSyncHistory';
+import { SettingsRepository } from '@db/repositories/settings.repository';
+import { InternalHooks } from '@/InternalHooks';
+import { Logger } from '@/Logger';
+
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
+import { InternalServerError } from '@/errors/response-errors/internal-server.error';
+import {
+	getCurrentAuthenticationMethod,
+	isEmailCurrentAuthenticationMethod,
+	isLdapCurrentAuthenticationMethod,
+	setCurrentAuthenticationMethod,
+} from '@/sso/ssoHelpers';
+
+import type { LdapConfig } from './types';
+import {
+	createFilter,
+	deleteAllLdapIdentities,
+	escapeFilter,
+	formatUrl,
+	getLdapIds,
+	getLdapUsers,
+	getMappingAttributes,
+	mapLdapUserToDbUser,
+	processUsers,
+	resolveBinaryAttributes,
+	resolveEntryBinaryAttributes,
+	saveLdapSynchronization,
+	validateLdapConfigurationSchema,
+} from './helpers';
+import {
+	BINARY_AD_ATTRIBUTES,
+	LDAP_FEATURE_NAME,
+	LDAP_LOGIN_ENABLED,
+	LDAP_LOGIN_LABEL,
+} from './constants';
+
+@Service()
+export class LdapService {
+	private client: Client | undefined;
+
+	private syncTimer: NodeJS.Timeout | undefined = undefined;
+
+	config: LdapConfig;
+
+	constructor(
+		private readonly logger: Logger,
+		private readonly internalHooks: InternalHooks,
+		private readonly settingsRepository: SettingsRepository,
+		private readonly cipher: Cipher,
+	) {}
+
+	async init() {
+		const ldapConfig = await this.loadConfig();
+
+		try {
+			await this.setGlobalLdapConfigVariables(ldapConfig);
+		} catch (error) {
+			this.logger.warn(
+				`Cannot set LDAP login enabled state when an authentication method other than email or ldap is active (current: ${getCurrentAuthenticationMethod()})`,
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+				error,
+			);
+		}
+
+		this.setConfig(ldapConfig);
+	}
+
+	/** Retrieve the LDAP configuration (decrypted) from the database */
+	async loadConfig() {
+		const { value } = await this.settingsRepository.findOneByOrFail({
+			key: LDAP_FEATURE_NAME,
+		});
+		const ldapConfig = jsonParse<LdapConfig>(value);
+		ldapConfig.bindingAdminPassword = this.cipher.decrypt(ldapConfig.bindingAdminPassword);
+		return ldapConfig;
+	}
+
+	async updateConfig(ldapConfig: LdapConfig): Promise<void> {
+		const { valid, message } = validateLdapConfigurationSchema(ldapConfig);
+
+		if (!valid) {
+			throw new ApplicationError(message);
+		}
+
+		if (ldapConfig.loginEnabled && getCurrentAuthenticationMethod() === 'saml') {
+			throw new BadRequestError('LDAP cannot be enabled if SSO in enabled');
+		}
+
+		this.setConfig({ ...ldapConfig });
+
+		ldapConfig.bindingAdminPassword = this.cipher.encrypt(ldapConfig.bindingAdminPassword);
+
+		if (!ldapConfig.loginEnabled) {
+			ldapConfig.synchronizationEnabled = false;
+			const ldapUsers = await getLdapUsers();
+			if (ldapUsers.length) {
+				await deleteAllLdapIdentities();
+			}
+		}
+
+		await this.settingsRepository.update(
+			{ key: LDAP_FEATURE_NAME },
+			{ value: JSON.stringify(ldapConfig), loadOnStartup: true },
+		);
+		await this.setGlobalLdapConfigVariables(ldapConfig);
+	}
+
+	/** Set the LDAP configuration and expire the current client */
+	setConfig(ldapConfig: LdapConfig) {
+		this.config = ldapConfig;
+		this.client = undefined;
+		// If user disabled synchronization in the UI and there a job schedule,
+		// stop it
+		if (this.syncTimer && !this.config.synchronizationEnabled) {
+			this.stopSync();
+			// If instance crashed with a job scheduled, once the server starts
+			// again, reschedule it.
+		} else if (!this.syncTimer && this.config.synchronizationEnabled) {
+			this.scheduleSync();
+			// If job scheduled and the run interval got updated in the UI
+			// stop the current one and schedule a new one with the new internal
+		} else if (this.syncTimer && this.config.synchronizationEnabled) {
+			this.stopSync();
+			this.scheduleSync();
+		}
+	}
+
+	/** Take the LDAP configuration and set login enabled and login label to the config object */
+	private async setGlobalLdapConfigVariables(ldapConfig: LdapConfig): Promise<void> {
+		await this.setLdapLoginEnabled(ldapConfig.loginEnabled);
+		config.set(LDAP_LOGIN_LABEL, ldapConfig.loginLabel);
+	}
+
+	/** Set the LDAP login enabled to the configuration object */
+	private async setLdapLoginEnabled(enabled: boolean): Promise<void> {
+		if (isEmailCurrentAuthenticationMethod() || isLdapCurrentAuthenticationMethod()) {
+			if (enabled) {
+				config.set(LDAP_LOGIN_ENABLED, true);
+				await setCurrentAuthenticationMethod('ldap');
+			} else if (!enabled) {
+				config.set(LDAP_LOGIN_ENABLED, false);
+				await setCurrentAuthenticationMethod('email');
+			}
+		} else {
+			throw new InternalServerError(
+				`Cannot switch LDAP login enabled state when an authentication method other than email or ldap is active (current: ${getCurrentAuthenticationMethod()})`,
+			);
+		}
+	}
+
+	/**
+	 * Get new/existing LDAP client,
+	 * depending on whether the credentials
+	 * were updated or not
+	 */
+	private async getClient() {
+		if (this.config === undefined) {
+			throw new ApplicationError('Service cannot be used without setting the property config');
+		}
+		if (this.client === undefined) {
+			const url = formatUrl(
+				this.config.connectionUrl,
+				this.config.connectionPort,
+				this.config.connectionSecurity,
+			);
+			const ldapOptions: ClientOptions = { url };
+			const tlsOptions: ConnectionOptions = {};
+
+			if (this.config.connectionSecurity !== 'none') {
+				Object.assign(tlsOptions, {
+					rejectUnauthorized: !this.config.allowUnauthorizedCerts,
+				});
+				if (this.config.connectionSecurity === 'tls') {
+					ldapOptions.tlsOptions = tlsOptions;
+				}
+			}
+
+			this.client = new Client(ldapOptions);
+			if (this.config.connectionSecurity === 'startTls') {
+				await this.client.startTLS(tlsOptions);
+			}
+		}
+	}
+
+	/**
+	 * Attempt a binding with the admin credentials
+	 */
+	private async bindAdmin(): Promise<void> {
+		await this.getClient();
+		if (this.client) {
+			await this.client.bind(this.config.bindingAdminDn, this.config.bindingAdminPassword);
+		}
+	}
+
+	/**
+	 * Search the LDAP server using the administrator binding
+	 * (if any, else a anonymous binding will be attempted)
+	 */
+	async searchWithAdminBinding(filter: string): Promise<LdapUser[]> {
+		await this.bindAdmin();
+		if (this.client) {
+			const { searchEntries } = await this.client.search(this.config.baseDn, {
+				attributes: getMappingAttributes(this.config),
+				explicitBufferAttributes: BINARY_AD_ATTRIBUTES,
+				filter,
+				timeLimit: this.config.searchTimeout,
+				paged: { pageSize: this.config.searchPageSize },
+				...(this.config.searchPageSize === 0 && { paged: true }),
+			});
+
+			await this.client.unbind();
+			return searchEntries;
+		}
+		return [];
+	}
+
+	/**
+	 * Attempt binding with the user's credentials
+	 */
+	async validUser(dn: string, password: string): Promise<void> {
+		await this.getClient();
+		if (this.client) {
+			await this.client.bind(dn, password);
+			await this.client.unbind();
+		}
+	}
+
+	/**
+	 * Find and authenticate user in the LDAP server.
+	 */
+	async findAndAuthenticateLdapUser(
+		loginId: string,
+		password: string,
+		loginIdAttribute: string,
+		userFilter: string,
+	): Promise<LdapUser | undefined> {
+		// Search for the user with the administrator binding using the
+		// the Login ID attribute and whatever was inputted in the UI's
+		// email input.
+		let searchResult: LdapUser[] = [];
+
+		try {
+			searchResult = await this.searchWithAdminBinding(
+				createFilter(`(${loginIdAttribute}=${escapeFilter(loginId)})`, userFilter),
+			);
+		} catch (e) {
+			if (e instanceof Error) {
+				void this.internalHooks.onLdapLoginSyncFailed({
+					error: e.message,
+				});
+				this.logger.error('LDAP - Error during search', { message: e.message });
+			}
+			return undefined;
+		}
+
+		if (!searchResult.length) {
+			return undefined;
+		}
+
+		// In the unlikely scenario that more than one user is found (
+		// can happen depending on how the LDAP database is structured
+		// and the LDAP configuration), return the last one found as it
+		// should be the less important in the hierarchy.
+		let user = searchResult.pop();
+
+		if (user === undefined) {
+			user = { dn: '' };
+		}
+
+		try {
+			// Now with the user distinguished name (unique identifier
+			// for the user) and the password, attempt to validate the
+			// user by binding
+			await this.validUser(user.dn, password);
+		} catch (e) {
+			if (e instanceof Error) {
+				this.logger.error('LDAP - Error validating user against LDAP server', {
+					message: e.message,
+				});
+			}
+			return undefined;
+		}
+
+		resolveEntryBinaryAttributes(user);
+
+		return user;
+	}
+
+	/**
+	 * Attempt binding with the administrator credentials, to test the connection
+	 */
+	async testConnection(): Promise<void> {
+		await this.bindAdmin();
+	}
+
+	/** Schedule a synchronization job based on the interval set in the LDAP config */
+	private scheduleSync(): void {
+		if (!this.config.synchronizationInterval) {
+			throw new ApplicationError('Interval variable has to be defined');
+		}
+		this.syncTimer = setInterval(async () => {
+			await this.runSync('live');
+		}, this.config.synchronizationInterval * 60000);
+	}
+
+	/**
+	 * Run the synchronization job.
+	 * If the job runs in "live" mode, changes to LDAP users are persisted in the database, else the users are not modified
+	 */
+	async runSync(mode: RunningMode): Promise<void> {
+		this.logger.debug(`LDAP - Starting a synchronization run in ${mode} mode`);
+
+		let adUsers: LdapUser[] = [];
+
+		try {
+			adUsers = await this.searchWithAdminBinding(
+				createFilter(`(${this.config.loginIdAttribute}=*)`, this.config.userFilter),
+			);
+
+			this.logger.debug('LDAP - Users return by the query', {
+				users: adUsers,
+			});
+
+			resolveBinaryAttributes(adUsers);
+		} catch (e) {
+			if (e instanceof Error) {
+				this.logger.error(`LDAP - ${e.message}`);
+				throw e;
+			}
+		}
+
+		const startedAt = new Date();
+
+		const localAdUsers = await getLdapIds();
+
+		const { usersToCreate, usersToUpdate, usersToDisable } = this.getUsersToProcess(
+			adUsers,
+			localAdUsers,
+		);
+
+		this.logger.debug('LDAP - Users processed', {
+			created: usersToCreate.length,
+			updated: usersToUpdate.length,
+			disabled: usersToDisable.length,
+		});
+
+		const endedAt = new Date();
+		let status: SyncStatus = 'success';
+		let errorMessage = '';
+
+		try {
+			if (mode === 'live') {
+				await processUsers(usersToCreate, usersToUpdate, usersToDisable);
+			}
+		} catch (error) {
+			if (error instanceof QueryFailedError) {
+				status = 'error';
+				errorMessage = `${error.message}`;
+			}
+		}
+
+		await saveLdapSynchronization({
+			startedAt,
+			endedAt,
+			created: usersToCreate.length,
+			updated: usersToUpdate.length,
+			disabled: usersToDisable.length,
+			scanned: adUsers.length,
+			runMode: mode,
+			status,
+			error: errorMessage,
+		});
+
+		void this.internalHooks.onLdapSyncFinished({
+			type: !this.syncTimer ? 'scheduled' : `manual_${mode}`,
+			succeeded: true,
+			users_synced: usersToCreate.length + usersToUpdate.length + usersToDisable.length,
+			error: errorMessage,
+		});
+
+		this.logger.debug('LDAP - Synchronization finished successfully');
+	}
+
+	/** Stop the current job scheduled, if any */
+	stopSync(): void {
+		clearInterval(this.syncTimer);
+		this.syncTimer = undefined;
+	}
+
+	/** Get all the user that will be changed (created, updated, disabled), in the database */
+	private getUsersToProcess(
+		adUsers: LdapUser[],
+		localAdUsers: string[],
+	): {
+		usersToCreate: Array<[string, User]>;
+		usersToUpdate: Array<[string, User]>;
+		usersToDisable: string[];
+	} {
+		return {
+			usersToCreate: this.getUsersToCreate(adUsers, localAdUsers),
+			usersToUpdate: this.getUsersToUpdate(adUsers, localAdUsers),
+			usersToDisable: this.getUsersToDisable(adUsers, localAdUsers),
+		};
+	}
+
+	/** Get users in LDAP that are not in the database yet */
+	private getUsersToCreate(
+		remoteAdUsers: LdapUser[],
+		localLdapIds: string[],
+	): Array<[string, User]> {
+		return remoteAdUsers
+			.filter((adUser) => !localLdapIds.includes(adUser[this.config.ldapIdAttribute] as string))
+			.map((adUser) => mapLdapUserToDbUser(adUser, this.config, true));
+	}
+
+	/** Get users in LDAP that are already in the database */
+	private getUsersToUpdate(
+		remoteAdUsers: LdapUser[],
+		localLdapIds: string[],
+	): Array<[string, User]> {
+		return remoteAdUsers
+			.filter((adUser) => localLdapIds.includes(adUser[this.config.ldapIdAttribute] as string))
+			.map((adUser) => mapLdapUserToDbUser(adUser, this.config));
+	}
+
+	/** Get users that are in the database but not in the LDAP server */
+	private getUsersToDisable(remoteAdUsers: LdapUser[], localLdapIds: string[]): string[] {
+		const remoteAdUserIds = remoteAdUsers.map((adUser) => adUser[this.config.ldapIdAttribute]);
+		return localLdapIds.filter((user) => !remoteAdUserIds.includes(user));
+	}
+}
diff --git a/packages/cli/src/License.ts b/packages/cli/src/License.ts
index 1b820931e1ed6..1e31222571b10 100644
--- a/packages/cli/src/License.ts
+++ b/packages/cli/src/License.ts
@@ -1,47 +1,107 @@
-import type { TEntitlement, TLicenseBlock } from '@n8n_io/license-sdk';
+import type { TEntitlement, TFeatures, TLicenseBlock } from '@n8n_io/license-sdk';
 import { LicenseManager } from '@n8n_io/license-sdk';
-import type { ILogger } from 'n8n-workflow';
-import { getLogger } from './Logger';
+import { InstanceSettings, ObjectStoreService } from 'n8n-core';
+import Container, { Service } from 'typedi';
+import { Logger } from '@/Logger';
 import config from '@/config';
-import * as Db from '@/Db';
 import {
 	LICENSE_FEATURES,
 	LICENSE_QUOTAS,
 	N8N_VERSION,
 	SETTINGS_LICENSE_CERT_KEY,
+	UNLIMITED_LICENSE_QUOTA,
 } from './constants';
-import { Service } from 'typedi';
+import { SettingsRepository } from '@db/repositories/settings.repository';
+import type { BooleanLicenseFeature, N8nInstanceType, NumericLicenseFeature } from './Interfaces';
+import type { RedisServicePubSubPublisher } from './services/redis/RedisServicePubSubPublisher';
+import { RedisService } from './services/redis.service';
+import { OrchestrationService } from '@/services/orchestration.service';
+import { OnShutdown } from '@/decorators/OnShutdown';
+import { UsageMetricsService } from './services/usageMetrics.service';
+
+type FeatureReturnType = Partial<
+	{
+		planName: string;
+	} & { [K in NumericLicenseFeature]: number } & { [K in BooleanLicenseFeature]: boolean }
+>;
 
 @Service()
 export class License {
-	private logger: ILogger;
-
 	private manager: LicenseManager | undefined;
 
-	constructor() {
-		this.logger = getLogger();
+	private redisPublisher: RedisServicePubSubPublisher;
+
+	private isShuttingDown = false;
+
+	constructor(
+		private readonly logger: Logger,
+		private readonly instanceSettings: InstanceSettings,
+		private readonly orchestrationService: OrchestrationService,
+		private readonly settingsRepository: SettingsRepository,
+		private readonly usageMetricsService: UsageMetricsService,
+	) {}
+
+	/**
+	 * Whether this instance should renew the license - on init and periodically.
+	 */
+	private renewalEnabled(instanceType: N8nInstanceType) {
+		if (instanceType !== 'main') return false;
+
+		const autoRenewEnabled = config.getEnv('license.autoRenewEnabled');
+
+		/**
+		 * In multi-main setup, all mains start off with `unset` status and so renewal disabled.
+		 * On becoming leader or follower, each will enable or disable renewal, respectively.
+		 * This ensures the mains do not cause a 429 (too many requests) on license init.
+		 */
+		if (config.getEnv('multiMainSetup.enabled')) {
+			return autoRenewEnabled && config.getEnv('multiMainSetup.instanceType') === 'leader';
+		}
+
+		return autoRenewEnabled;
 	}
 
-	async init(instanceId: string) {
+	async init(instanceType: N8nInstanceType = 'main') {
 		if (this.manager) {
+			this.logger.warn('License manager already initialized or shutting down');
+			return;
+		}
+		if (this.isShuttingDown) {
+			this.logger.warn('License manager already shutting down');
 			return;
 		}
 
+		const isMainInstance = instanceType === 'main';
 		const server = config.getEnv('license.serverUrl');
-		const autoRenewEnabled = config.getEnv('license.autoRenewEnabled');
+		const offlineMode = !isMainInstance;
 		const autoRenewOffset = config.getEnv('license.autoRenewOffset');
+		const saveCertStr = isMainInstance
+			? async (value: TLicenseBlock) => await this.saveCertStr(value)
+			: async () => {};
+		const onFeatureChange = isMainInstance
+			? async (features: TFeatures) => await this.onFeatureChange(features)
+			: async () => {};
+		const collectUsageMetrics = isMainInstance
+			? async () => await this.usageMetricsService.collectUsageMetrics()
+			: async () => [];
+
+		const renewalEnabled = this.renewalEnabled(instanceType);
 
 		try {
 			this.manager = new LicenseManager({
 				server,
 				tenantId: config.getEnv('license.tenantId'),
 				productIdentifier: `n8n-${N8N_VERSION}`,
-				autoRenewEnabled,
+				autoRenewEnabled: renewalEnabled,
+				renewOnInit: renewalEnabled,
 				autoRenewOffset,
+				offlineMode,
 				logger: this.logger,
-				loadCertStr: async () => this.loadCertStr(),
-				saveCertStr: async (value: TLicenseBlock) => this.saveCertStr(value),
-				deviceFingerprint: () => instanceId,
+				loadCertStr: async () => await this.loadCertStr(),
+				saveCertStr,
+				deviceFingerprint: () => this.instanceSettings.instanceId,
+				collectUsageMetrics,
+				onFeatureChange,
 			});
 
 			await this.manager.initialize();
@@ -58,7 +118,7 @@ export class License {
 		if (ephemeralLicense) {
 			return ephemeralLicense;
 		}
-		const databaseSettings = await Db.collections.Settings.findOne({
+		const databaseSettings = await this.settingsRepository.findOne({
 			where: {
 				key: SETTINGS_LICENSE_CERT_KEY,
 			},
@@ -67,10 +127,58 @@ export class License {
 		return databaseSettings?.value ?? '';
 	}
 
+	async onFeatureChange(_features: TFeatures): Promise<void> {
+		if (config.getEnv('executions.mode') === 'queue' && config.getEnv('multiMainSetup.enabled')) {
+			const isMultiMainLicensed = _features[LICENSE_FEATURES.MULTIPLE_MAIN_INSTANCES] as
+				| boolean
+				| undefined;
+
+			this.orchestrationService.setMultiMainSetupLicensed(isMultiMainLicensed ?? false);
+
+			if (
+				this.orchestrationService.isMultiMainSetupEnabled &&
+				this.orchestrationService.isFollower
+			) {
+				this.logger.debug(
+					'[Multi-main setup] Instance is follower, skipping sending of "reloadLicense" 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 (config.getEnv('executions.mode') === 'queue') {
+			if (!this.redisPublisher) {
+				this.logger.debug('Initializing Redis publisher for License Service');
+				this.redisPublisher = await Container.get(RedisService).getPubSubPublisher();
+			}
+			await this.redisPublisher.publishToCommandChannel({
+				command: 'reloadLicense',
+			});
+		}
+
+		const isS3Selected = config.getEnv('binaryDataManager.mode') === 's3';
+		const isS3Available = config.getEnv('binaryDataManager.availableModes').includes('s3');
+		const isS3Licensed = _features['feat:binaryDataS3'];
+
+		if (isS3Selected && isS3Available && !isS3Licensed) {
+			this.logger.debug(
+				'License changed with no support for external storage - blocking writes on object store. To restore writes, please upgrade to a license that supports this feature.',
+			);
+
+			Container.get(ObjectStoreService).setReadonly(true);
+		}
+	}
+
 	async saveCertStr(value: TLicenseBlock): Promise<void> {
 		// if we have an ephemeral license, we don't want to save it to the database
 		if (config.get('license.cert')) return;
-		await Db.collections.Settings.upsert(
+		await this.settingsRepository.upsert(
 			{
 				key: SETTINGS_LICENSE_CERT_KEY,
 				value,
@@ -88,6 +196,14 @@ export class License {
 		await this.manager.activate(activationKey);
 	}
 
+	async reload(): Promise<void> {
+		if (!this.manager) {
+			return;
+		}
+		this.logger.debug('Reloading license');
+		await this.manager.reload();
+	}
+
 	async renew() {
 		if (!this.manager) {
 			return;
@@ -96,12 +212,21 @@ export class License {
 		await this.manager.renew();
 	}
 
-	isFeatureEnabled(feature: string): boolean {
+	@OnShutdown()
+	async shutdown() {
+		// Shut down License manager to unclaim any floating entitlements
+		// Note: While this saves a new license cert to DB, the previous entitlements are still kept in memory so that the shutdown process can complete
+		this.isShuttingDown = true;
+
 		if (!this.manager) {
-			return false;
+			return;
 		}
 
-		return this.manager.hasFeatureEnabled(feature);
+		await this.manager.shutdown();
+	}
+
+	isFeatureEnabled(feature: BooleanLicenseFeature) {
+		return this.manager?.hasFeatureEnabled(feature) ?? false;
 	}
 
 	isSharingEnabled() {
@@ -124,27 +249,52 @@ export class License {
 		return this.isFeatureEnabled(LICENSE_FEATURES.ADVANCED_EXECUTION_FILTERS);
 	}
 
+	isAdvancedPermissionsLicensed() {
+		return this.isFeatureEnabled(LICENSE_FEATURES.ADVANCED_PERMISSIONS);
+	}
+
+	isDebugInEditorLicensed() {
+		return this.isFeatureEnabled(LICENSE_FEATURES.DEBUG_IN_EDITOR);
+	}
+
+	isBinaryDataS3Licensed() {
+		return this.isFeatureEnabled(LICENSE_FEATURES.BINARY_DATA_S3);
+	}
+
+	isMultipleMainInstancesLicensed() {
+		return this.isFeatureEnabled(LICENSE_FEATURES.MULTIPLE_MAIN_INSTANCES);
+	}
+
 	isVariablesEnabled() {
 		return this.isFeatureEnabled(LICENSE_FEATURES.VARIABLES);
 	}
 
-	isVersionControlLicensed() {
-		return this.isFeatureEnabled(LICENSE_FEATURES.VERSION_CONTROL);
+	isSourceControlLicensed() {
+		return this.isFeatureEnabled(LICENSE_FEATURES.SOURCE_CONTROL);
+	}
+
+	isExternalSecretsEnabled() {
+		return this.isFeatureEnabled(LICENSE_FEATURES.EXTERNAL_SECRETS);
+	}
+
+	isWorkflowHistoryLicensed() {
+		return this.isFeatureEnabled(LICENSE_FEATURES.WORKFLOW_HISTORY);
+	}
+
+	isAPIDisabled() {
+		return this.isFeatureEnabled(LICENSE_FEATURES.API_DISABLED);
+	}
+
+	isWorkerViewLicensed() {
+		return this.isFeatureEnabled(LICENSE_FEATURES.WORKER_VIEW);
 	}
 
 	getCurrentEntitlements() {
 		return this.manager?.getCurrentEntitlements() ?? [];
 	}
 
-	getFeatureValue(
-		feature: string,
-		requireValidCert?: boolean,
-	): undefined | boolean | number | string {
-		if (!this.manager) {
-			return undefined;
-		}
-
-		return this.manager.getFeatureValue(feature, requireValidCert);
+	getFeatureValue<T extends keyof FeatureReturnType>(feature: T): FeatureReturnType[T] {
+		return this.manager?.getFeatureValue(feature) as FeatureReturnType[T];
 	}
 
 	getManagementJwt(): string {
@@ -168,22 +318,31 @@ export class License {
 		}
 
 		return entitlements.find(
-			(entitlement) =>
-				(entitlement.productMetadata.terms as unknown as { isMainPlan: boolean }).isMainPlan,
+			(entitlement) => (entitlement.productMetadata?.terms as { isMainPlan?: boolean })?.isMainPlan,
 		);
 	}
 
 	// Helper functions for computed data
-	getTriggerLimit(): number {
-		return (this.getFeatureValue(LICENSE_QUOTAS.TRIGGER_LIMIT) ?? -1) as number;
+	getUsersLimit() {
+		return this.getFeatureValue(LICENSE_QUOTAS.USERS_LIMIT) ?? UNLIMITED_LICENSE_QUOTA;
+	}
+
+	getTriggerLimit() {
+		return this.getFeatureValue(LICENSE_QUOTAS.TRIGGER_LIMIT) ?? UNLIMITED_LICENSE_QUOTA;
+	}
+
+	getVariablesLimit() {
+		return this.getFeatureValue(LICENSE_QUOTAS.VARIABLES_LIMIT) ?? UNLIMITED_LICENSE_QUOTA;
 	}
 
-	getVariablesLimit(): number {
-		return (this.getFeatureValue(LICENSE_QUOTAS.VARIABLES_LIMIT) ?? -1) as number;
+	getWorkflowHistoryPruneLimit() {
+		return (
+			this.getFeatureValue(LICENSE_QUOTAS.WORKFLOW_HISTORY_PRUNE_LIMIT) ?? UNLIMITED_LICENSE_QUOTA
+		);
 	}
 
 	getPlanName(): string {
-		return (this.getFeatureValue('planName') ?? 'Community') as string;
+		return this.getFeatureValue('planName') ?? 'Community';
 	}
 
 	getInfo(): string {
@@ -193,4 +352,13 @@ export class License {
 
 		return this.manager.toString();
 	}
+
+	isWithinUsersLimit() {
+		return this.getUsersLimit() === UNLIMITED_LICENSE_QUOTA;
+	}
+
+	async reinit() {
+		this.manager?.reset();
+		await this.init();
+	}
 }
diff --git a/packages/cli/src/LoadNodesAndCredentials.ts b/packages/cli/src/LoadNodesAndCredentials.ts
index 47623076c4ff6..f4d39ed447e80 100644
--- a/packages/cli/src/LoadNodesAndCredentials.ts
+++ b/packages/cli/src/LoadNodesAndCredentials.ts
@@ -1,43 +1,42 @@
-import uniq from 'lodash.uniq';
 import glob from 'fast-glob';
-import type { DirectoryLoader, Types } from 'n8n-core';
+import { Container, Service } from 'typedi';
+import path from 'path';
+import fsPromises from 'fs/promises';
+
+import type { Class, DirectoryLoader, Types } from 'n8n-core';
 import {
 	CUSTOM_EXTENSION_ENV,
-	UserSettings,
+	InstanceSettings,
 	CustomDirectoryLoader,
 	PackageDirectoryLoader,
 	LazyPackageDirectoryLoader,
 } from 'n8n-core';
 import type {
-	ICredentialTypes,
-	ILogger,
-	INodesAndCredentials,
 	KnownNodesAndCredentials,
 	INodeTypeDescription,
-	LoadedNodesAndCredentials,
+	INodeTypeData,
+	ICredentialTypeData,
 } from 'n8n-workflow';
-import { LoggerProxy, ErrorReporterProxy as ErrorReporter } from 'n8n-workflow';
+import { ApplicationError, ErrorReporterProxy as ErrorReporter } from 'n8n-workflow';
 
-import { createWriteStream } from 'fs';
-import { mkdir } from 'fs/promises';
-import path from 'path';
 import config from '@/config';
-import type { InstalledPackages } from '@db/entities/InstalledPackages';
-import { executeCommand } from '@/CommunityNodes/helpers';
 import {
-	GENERATED_STATIC_DIR,
-	RESPONSE_ERROR_MESSAGES,
 	CUSTOM_API_CALL_KEY,
 	CUSTOM_API_CALL_NAME,
 	inTest,
 	CLI_DIR,
+	inE2ETests,
 } from '@/constants';
-import { CredentialsOverwrites } from '@/CredentialsOverwrites';
-import { Service } from 'typedi';
+import { Logger } from '@/Logger';
+
+interface LoadedNodesAndCredentials {
+	nodes: INodeTypeData;
+	credentials: ICredentialTypeData;
+}
 
 @Service()
-export class LoadNodesAndCredentials implements INodesAndCredentials {
-	known: KnownNodesAndCredentials = { nodes: {}, credentials: {} };
+export class LoadNodesAndCredentials {
+	private known: KnownNodesAndCredentials = { nodes: {}, credentials: {} };
 
 	loaded: LoadedNodesAndCredentials = { nodes: {}, credentials: {} };
 
@@ -49,90 +48,92 @@ export class LoadNodesAndCredentials implements INodesAndCredentials {
 
 	includeNodes = config.getEnv('nodes.include');
 
-	credentialTypes: ICredentialTypes;
+	private postProcessors: Array<() => Promise<void>> = [];
 
-	logger: ILogger;
-
-	private downloadFolder: string;
+	constructor(
+		private readonly logger: Logger,
+		private readonly instanceSettings: InstanceSettings,
+	) {}
 
 	async init() {
+		if (inTest) throw new ApplicationError('Not available in tests');
+
 		// Make sure the imported modules can resolve dependencies fine.
 		const delimiter = process.platform === 'win32' ? ';' : ':';
 		process.env.NODE_PATH = module.paths.join(delimiter);
 
 		// @ts-ignore
 		// eslint-disable-next-line @typescript-eslint/no-unsafe-call
-		if (!inTest) module.constructor._initPaths();
+		module.constructor._initPaths();
 
-		this.downloadFolder = UserSettings.getUserN8nFolderDownloadedNodesPath();
+		if (!inE2ETests) {
+			this.excludeNodes = this.excludeNodes ?? [];
+			this.excludeNodes.push('n8n-nodes-base.e2eTest');
+		}
 
-		// Load nodes from `n8n-nodes-base` and any other `n8n-nodes-*` package in the main `node_modules`
-		const pathsToScan = [
+		// Load nodes from `n8n-nodes-base`
+		const basePathsToScan = [
 			// In case "n8n" package is in same node_modules folder.
 			path.join(CLI_DIR, '..'),
 			// In case "n8n" package is the root and the packages are
 			// in the "node_modules" folder underneath it.
 			path.join(CLI_DIR, 'node_modules'),
-			// Path where all community nodes are installed
-			path.join(this.downloadFolder, 'node_modules'),
 		];
 
-		for (const nodeModulesDir of pathsToScan) {
-			await this.loadNodesFromNodeModules(nodeModulesDir);
+		for (const nodeModulesDir of basePathsToScan) {
+			await this.loadNodesFromNodeModules(nodeModulesDir, 'n8n-nodes-base');
+			await this.loadNodesFromNodeModules(nodeModulesDir, '@n8n/n8n-nodes-langchain');
 		}
 
+		// Load nodes from any other `n8n-nodes-*` packages in the download directory
+		// This includes the community nodes
+		await this.loadNodesFromNodeModules(
+			path.join(this.instanceSettings.nodesDownloadDir, 'node_modules'),
+		);
+
 		await this.loadNodesFromCustomDirectories();
 		await this.postProcessLoaders();
-		this.injectCustomApiCallOptions();
 	}
 
-	async generateTypesForFrontend() {
-		const credentialsOverwrites = CredentialsOverwrites().getAll();
-		for (const credential of this.types.credentials) {
-			const overwrittenProperties = [];
-			this.credentialTypes
-				.getParentTypes(credential.name)
-				.reverse()
-				.map((name) => credentialsOverwrites[name])
-				.forEach((overwrite) => {
-					if (overwrite) overwrittenProperties.push(...Object.keys(overwrite));
-				});
+	addPostProcessor(fn: () => Promise<void>) {
+		this.postProcessors.push(fn);
+	}
 
-			if (credential.name in credentialsOverwrites) {
-				overwrittenProperties.push(...Object.keys(credentialsOverwrites[credential.name]));
-			}
+	isKnownNode(type: string) {
+		return type in this.known.nodes;
+	}
 
-			if (overwrittenProperties.length) {
-				credential.__overwrittenProperties = uniq(overwrittenProperties);
-			}
-		}
+	get loadedCredentials() {
+		return this.loaded.credentials;
+	}
 
-		// pre-render all the node and credential types as static json files
-		await mkdir(path.join(GENERATED_STATIC_DIR, 'types'), { recursive: true });
-
-		const writeStaticJSON = async (name: string, data: object[]) => {
-			const filePath = path.join(GENERATED_STATIC_DIR, `types/${name}.json`);
-			const stream = createWriteStream(filePath, 'utf-8');
-			stream.write('[\n');
-			data.forEach((entry, index) => {
-				stream.write(JSON.stringify(entry));
-				if (index !== data.length - 1) stream.write(',');
-				stream.write('\n');
-			});
-			stream.write(']\n');
-			stream.end();
-		};
+	get loadedNodes() {
+		return this.loaded.nodes;
+	}
 
-		await writeStaticJSON('nodes', this.types.nodes);
-		await writeStaticJSON('credentials', this.types.credentials);
+	get knownCredentials() {
+		return this.known.credentials;
 	}
 
-	private async loadNodesFromNodeModules(nodeModulesDir: string): Promise<void> {
-		const globOptions = { cwd: nodeModulesDir, onlyDirectories: true };
-		const installedPackagePaths = [
-			...(await glob('n8n-nodes-*', { ...globOptions, deep: 1 })),
-			...(await glob('@*/n8n-nodes-*', { ...globOptions, deep: 2 })),
-		];
+	get knownNodes() {
+		return this.known.nodes;
+	}
+
+	private async loadNodesFromNodeModules(
+		nodeModulesDir: string,
+		packageName?: string,
+	): Promise<void> {
+		const globOptions = {
+			cwd: nodeModulesDir,
+			onlyDirectories: true,
+			deep: 1,
+		};
+		const installedPackagePaths = packageName
+			? await glob(packageName, globOptions)
+			: [
+					...(await glob('n8n-nodes-*', globOptions)),
+					...(await glob('@*/n8n-nodes-*', { ...globOptions, deep: 2 })),
+				];
 
 		for (const packagePath of installedPackagePaths) {
 			try {
@@ -146,8 +147,20 @@ export class LoadNodesAndCredentials implements INodesAndCredentials {
 		}
 	}
 
+	resolveIcon(packageName: string, url: string): string | undefined {
+		const loader = this.loaders[packageName];
+		if (loader) {
+			const pathPrefix = `/icons/${packageName}/`;
+			const filePath = path.resolve(loader.directory, url.substring(pathPrefix.length));
+			if (!path.relative(loader.directory, filePath).includes('..')) {
+				return filePath;
+			}
+		}
+		return undefined;
+	}
+
 	getCustomDirectories(): string[] {
-		const customDirectories = [UserSettings.getUserN8nFolderCustomExtensionPath()];
+		const customDirectories = [this.instanceSettings.customExtensionDir];
 
 		if (process.env[CUSTOM_EXTENSION_ENV] !== undefined) {
 			const customExtensionFolders = process.env[CUSTOM_EXTENSION_ENV].split(';');
@@ -163,93 +176,20 @@ export class LoadNodesAndCredentials implements INodesAndCredentials {
 		}
 	}
 
-	private async installOrUpdateNpmModule(
-		packageName: string,
-		options: { version?: string } | { installedPackage: InstalledPackages },
-	) {
-		const isUpdate = 'installedPackage' in options;
-		const command = isUpdate
-			? `npm update ${packageName}`
-			: `npm install ${packageName}${options.version ? `@${options.version}` : ''}`;
-
-		try {
-			await executeCommand(command);
-		} catch (error) {
-			if (error instanceof Error && error.message === RESPONSE_ERROR_MESSAGES.PACKAGE_NOT_FOUND) {
-				throw new Error(`The npm package "${packageName}" could not be found.`);
-			}
-			throw error;
-		}
-
-		const finalNodeUnpackedPath = path.join(this.downloadFolder, 'node_modules', packageName);
-
-		let loader: PackageDirectoryLoader;
-		try {
-			loader = await this.runDirectoryLoader(PackageDirectoryLoader, finalNodeUnpackedPath);
-		} catch (error) {
-			// Remove this package since loading it failed
-			const removeCommand = `npm remove ${packageName}`;
-			try {
-				await executeCommand(removeCommand);
-			} catch {}
-			throw new Error(RESPONSE_ERROR_MESSAGES.PACKAGE_LOADING_FAILED, { cause: error });
-		}
-
-		if (loader.loadedNodes.length > 0) {
-			// Save info to DB
-			try {
-				const { persistInstalledPackageData, removePackageFromDatabase } = await import(
-					'@/CommunityNodes/packageModel'
-				);
-				if (isUpdate) await removePackageFromDatabase(options.installedPackage);
-				const installedPackage = await persistInstalledPackageData(loader);
-				await this.postProcessLoaders();
-				await this.generateTypesForFrontend();
-				return installedPackage;
-			} catch (error) {
-				LoggerProxy.error('Failed to save installed packages and nodes', {
-					error: error as Error,
-					packageName,
-				});
-				throw error;
-			}
-		} else {
-			// Remove this package since it contains no loadable nodes
-			const removeCommand = `npm remove ${packageName}`;
-			try {
-				await executeCommand(removeCommand);
-			} catch {}
-
-			throw new Error(RESPONSE_ERROR_MESSAGES.PACKAGE_DOES_NOT_CONTAIN_NODES);
-		}
-	}
-
-	async installNpmModule(packageName: string, version?: string): Promise<InstalledPackages> {
-		return this.installOrUpdateNpmModule(packageName, { version });
+	async loadPackage(packageName: string) {
+		const finalNodeUnpackedPath = path.join(
+			this.instanceSettings.nodesDownloadDir,
+			'node_modules',
+			packageName,
+		);
+		return await this.runDirectoryLoader(PackageDirectoryLoader, finalNodeUnpackedPath);
 	}
 
-	async removeNpmModule(packageName: string, installedPackage: InstalledPackages): Promise<void> {
-		const command = `npm remove ${packageName}`;
-
-		await executeCommand(command);
-
-		const { removePackageFromDatabase } = await import('@/CommunityNodes/packageModel');
-		await removePackageFromDatabase(installedPackage);
-
+	async unloadPackage(packageName: string) {
 		if (packageName in this.loaders) {
 			this.loaders[packageName].reset();
 			delete this.loaders[packageName];
 		}
-
-		await this.postProcessLoaders();
-		await this.generateTypesForFrontend();
-	}
-
-	async updateNpmModule(
-		packageName: string,
-		installedPackage: InstalledPackages,
-	): Promise<InstalledPackages> {
-		return this.installOrUpdateNpmModule(packageName, { installedPackage });
 	}
 
 	/**
@@ -262,7 +202,7 @@ export class LoadNodesAndCredentials implements INodesAndCredentials {
 		return description.credentials.some(({ name }) => {
 			const credType = this.types.credentials.find((t) => t.name === name);
 			if (!credType) {
-				LoggerProxy.warn(
+				this.logger.warn(
 					`Failed to load Custom API options for the node "${description.name}": Unknown credential name "${name}"`,
 				);
 				return false;
@@ -310,7 +250,7 @@ export class LoadNodesAndCredentials implements INodesAndCredentials {
 	 * Run a loader of source files of nodes and credentials in a directory.
 	 */
 	private async runDirectoryLoader<T extends DirectoryLoader>(
-		constructor: new (...args: ConstructorParameters<typeof DirectoryLoader>) => T,
+		constructor: Class<T, ConstructorParameters<typeof DirectoryLoader>>,
 		dir: string,
 	) {
 		const loader = new constructor(dir, this.excludeNodes, this.includeNodes);
@@ -326,7 +266,7 @@ export class LoadNodesAndCredentials implements INodesAndCredentials {
 
 		for (const loader of Object.values(this.loaders)) {
 			// list of node & credential types that will be sent to the frontend
-			const { types, directory } = loader;
+			const { known, types, directory } = loader;
 			this.types.nodes = this.types.nodes.concat(types.nodes);
 			this.types.credentials = this.types.credentials.concat(types.credentials);
 
@@ -339,27 +279,75 @@ export class LoadNodesAndCredentials implements INodesAndCredentials {
 				this.loaded.credentials[credentialTypeName] = loader.credentialTypes[credentialTypeName];
 			}
 
-			// Nodes and credentials that will be lazy loaded
-			if (loader instanceof PackageDirectoryLoader) {
-				const { packageName, known } = loader;
-
-				for (const type in known.nodes) {
-					const { className, sourcePath } = known.nodes[type];
-					this.known.nodes[type] = {
-						className,
-						sourcePath: path.join(directory, sourcePath),
-					};
-				}
-
-				for (const type in known.credentials) {
-					const { className, sourcePath, nodesToTestWith } = known.credentials[type];
-					this.known.credentials[type] = {
-						className,
-						sourcePath: path.join(directory, sourcePath),
-						nodesToTestWith: nodesToTestWith?.map((nodeName) => `${packageName}.${nodeName}`),
-					};
-				}
+			for (const type in known.nodes) {
+				const { className, sourcePath } = known.nodes[type];
+				this.known.nodes[type] = {
+					className,
+					sourcePath: path.join(directory, sourcePath),
+				};
+			}
+
+			for (const type in known.credentials) {
+				const {
+					className,
+					sourcePath,
+					supportedNodes,
+					extends: extendsArr,
+				} = known.credentials[type];
+				this.known.credentials[type] = {
+					className,
+					sourcePath: path.join(directory, sourcePath),
+					supportedNodes:
+						loader instanceof PackageDirectoryLoader
+							? supportedNodes?.map((nodeName) => `${loader.packageName}.${nodeName}`)
+							: undefined,
+					extends: extendsArr,
+				};
 			}
 		}
+
+		this.injectCustomApiCallOptions();
+
+		for (const postProcessor of this.postProcessors) {
+			await postProcessor();
+		}
+	}
+
+	async setupHotReload() {
+		const { default: debounce } = await import('lodash/debounce');
+		// eslint-disable-next-line import/no-extraneous-dependencies
+		const { watch } = await import('chokidar');
+
+		const { Push } = await import('@/push');
+		const push = Container.get(Push);
+
+		Object.values(this.loaders).forEach(async (loader) => {
+			try {
+				await fsPromises.access(loader.directory);
+			} catch {
+				// If directory doesn't exist, there is nothing to watch
+				return;
+			}
+
+			const realModulePath = path.join(await fsPromises.realpath(loader.directory), path.sep);
+			const reloader = debounce(async () => {
+				const modulesToUnload = Object.keys(require.cache).filter((filePath) =>
+					filePath.startsWith(realModulePath),
+				);
+				modulesToUnload.forEach((filePath) => {
+					delete require.cache[filePath];
+				});
+
+				loader.reset();
+				await loader.loadAll();
+				await this.postProcessLoaders();
+				push.broadcast('nodeDescriptionUpdated');
+			}, 100);
+
+			const toWatch = loader.isLazyLoaded
+				? ['**/nodes.json', '**/credentials.json']
+				: ['**/*.js', '**/*.json'];
+			watch(toWatch, { cwd: realModulePath }).on('change', reloader);
+		});
 	}
 }
diff --git a/packages/cli/src/Logger.ts b/packages/cli/src/Logger.ts
index bbfc2213fab3a..dc23a6f3477ae 100644
--- a/packages/cli/src/Logger.ts
+++ b/packages/cli/src/Logger.ts
@@ -1,34 +1,39 @@
-/* eslint-disable @typescript-eslint/no-unsafe-return */
-/* eslint-disable @typescript-eslint/no-shadow */
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
-/* eslint-disable @typescript-eslint/no-unsafe-return */
-
-import { inspect } from 'util';
+import { Service } from 'typedi';
 import winston from 'winston';
-
-import type { IDataObject, ILogger, LogTypes } from 'n8n-workflow';
-
 import callsites from 'callsites';
+import { inspect } from 'util';
 import { basename } from 'path';
+
+import { LoggerProxy, type IDataObject, LOG_LEVELS } from 'n8n-workflow';
+
 import config from '@/config';
 
-export class Logger implements ILogger {
+const noOp = () => {};
+
+@Service()
+export class Logger {
 	private logger: winston.Logger;
 
 	constructor() {
 		const level = config.getEnv('logs.level');
 
-		const output = config
-			.getEnv('logs.output')
-			.split(',')
-			.map((output) => output.trim());
-
 		this.logger = winston.createLogger({
-			// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 			level,
 			silent: level === 'silent',
 		});
 
+		// Change all methods with higher log-level to no-op
+		for (const levelName of LOG_LEVELS) {
+			if (this.logger.levels[levelName] > this.logger.levels[level]) {
+				Object.defineProperty(this, levelName, { value: noOp });
+			}
+		}
+
+		const output = config
+			.getEnv('logs.output')
+			.split(',')
+			.map((line) => line.trim());
+
 		if (output.includes('console')) {
 			let format: winston.Logform.Format;
 			if (['debug', 'verbose'].includes(level)) {
@@ -36,10 +41,9 @@ export class Logger implements ILogger {
 					winston.format.metadata(),
 					winston.format.timestamp(),
 					winston.format.colorize({ all: true }),
-					// eslint-disable-next-line @typescript-eslint/no-shadow
-					winston.format.printf(({ level, message, timestamp, metadata }) => {
-						// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-						return `${timestamp} | ${level.padEnd(18)} | ${message}${
+
+					winston.format.printf(({ level: logLevel, message, timestamp, metadata }) => {
+						return `${timestamp} | ${logLevel.padEnd(18)} | ${message}${
 							// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
 							Object.keys(metadata).length ? ` ${JSON.stringify(inspect(metadata))}` : ''
 						}`;
@@ -71,58 +75,48 @@ export class Logger implements ILogger {
 				}),
 			);
 		}
+
+		LoggerProxy.init(this);
 	}
 
-	log(type: LogTypes, message: string, meta: object = {}): void {
+	private log(level: (typeof LOG_LEVELS)[number], message: string, meta: object = {}): void {
 		const callsite = callsites();
 		// We are using the third array element as the structure is as follows:
 		// [0]: this file
-		// [1]: Should be LoggerProxy
+		// [1]: Should be Logger
 		// [2]: Should point to the caller.
 		// Note: getting line number is useless because at this point
 		// We are in runtime, so it means we are looking at compiled js files
 		const logDetails = {} as IDataObject;
 		if (callsite[2] !== undefined) {
-			// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
 			logDetails.file = basename(callsite[2].getFileName() || '');
 			const functionName = callsite[2].getFunctionName();
 			if (functionName) {
 				logDetails.function = functionName;
 			}
 		}
-		this.logger.log(type, message, { ...meta, ...logDetails });
+		this.logger.log(level, message, { ...meta, ...logDetails });
 	}
 
 	// Convenience methods below
 
-	debug(message: string, meta: object = {}): void {
-		this.log('debug', message, meta);
-	}
-
-	info(message: string, meta: object = {}): void {
-		this.log('info', message, meta);
-	}
-
 	error(message: string, meta: object = {}): void {
 		this.log('error', message, meta);
 	}
 
-	verbose(message: string, meta: object = {}): void {
-		this.log('verbose', message, meta);
-	}
-
 	warn(message: string, meta: object = {}): void {
 		this.log('warn', message, meta);
 	}
-}
 
-let activeLoggerInstance: Logger | undefined;
+	info(message: string, meta: object = {}): void {
+		this.log('info', message, meta);
+	}
 
-// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
-export function getLogger() {
-	if (activeLoggerInstance === undefined) {
-		activeLoggerInstance = new Logger();
+	debug(message: string, meta: object = {}): void {
+		this.log('debug', message, meta);
 	}
 
-	return activeLoggerInstance;
+	verbose(message: string, meta: object = {}): void {
+		this.log('verbose', message, meta);
+	}
 }
diff --git a/packages/cli/src/Mfa/constants.ts b/packages/cli/src/Mfa/constants.ts
new file mode 100644
index 0000000000000..bf5e34c3457dd
--- /dev/null
+++ b/packages/cli/src/Mfa/constants.ts
@@ -0,0 +1 @@
+export const MFA_FEATURE_ENABLED = 'mfa.enabled';
diff --git a/packages/cli/src/Mfa/helpers.ts b/packages/cli/src/Mfa/helpers.ts
new file mode 100644
index 0000000000000..54ebad078b5c6
--- /dev/null
+++ b/packages/cli/src/Mfa/helpers.ts
@@ -0,0 +1,22 @@
+import Container from 'typedi';
+import config from '@/config';
+import { MFA_FEATURE_ENABLED } from './constants';
+import { UserRepository } from '@db/repositories/user.repository';
+
+export const isMfaFeatureEnabled = () => config.get(MFA_FEATURE_ENABLED);
+
+const isMfaFeatureDisabled = () => !isMfaFeatureEnabled();
+
+const getUsersWithMfaEnabled = async () =>
+	await Container.get(UserRepository).count({ where: { mfaEnabled: true } });
+
+export const handleMfaDisable = async () => {
+	if (isMfaFeatureDisabled()) {
+		// check for users with MFA enabled, and if there are
+		// users, then keep the feature enabled
+		const users = await getUsersWithMfaEnabled();
+		if (users) {
+			config.set(MFA_FEATURE_ENABLED, true);
+		}
+	}
+};
diff --git a/packages/cli/src/Mfa/mfa.service.ts b/packages/cli/src/Mfa/mfa.service.ts
new file mode 100644
index 0000000000000..019005054d891
--- /dev/null
+++ b/packages/cli/src/Mfa/mfa.service.ts
@@ -0,0 +1,73 @@
+import { v4 as uuid } from 'uuid';
+import { Service } from 'typedi';
+import { Cipher } from 'n8n-core';
+import { UserRepository } from '@db/repositories/user.repository';
+import { TOTPService } from './totp.service';
+
+@Service()
+export class MfaService {
+	constructor(
+		private userRepository: UserRepository,
+		public totp: TOTPService,
+		private cipher: Cipher,
+	) {}
+
+	public generateRecoveryCodes(n = 10) {
+		return Array.from(Array(n)).map(() => uuid());
+	}
+
+	public generateEncryptedRecoveryCodes() {
+		return this.generateRecoveryCodes().map((code) => this.cipher.encrypt(code));
+	}
+
+	public async saveSecretAndRecoveryCodes(userId: string, secret: string, recoveryCodes: string[]) {
+		const { encryptedSecret, encryptedRecoveryCodes } = this.encryptSecretAndRecoveryCodes(
+			secret,
+			recoveryCodes,
+		);
+		return await this.userRepository.update(userId, {
+			mfaSecret: encryptedSecret,
+			mfaRecoveryCodes: encryptedRecoveryCodes,
+		});
+	}
+
+	public encryptSecretAndRecoveryCodes(rawSecret: string, rawRecoveryCodes: string[]) {
+		const encryptedSecret = this.cipher.encrypt(rawSecret),
+			encryptedRecoveryCodes = rawRecoveryCodes.map((code) => this.cipher.encrypt(code));
+		return {
+			encryptedRecoveryCodes,
+			encryptedSecret,
+		};
+	}
+
+	private decryptSecretAndRecoveryCodes(mfaSecret: string, mfaRecoveryCodes: string[]) {
+		return {
+			decryptedSecret: this.cipher.decrypt(mfaSecret),
+			decryptedRecoveryCodes: mfaRecoveryCodes.map((code) => this.cipher.decrypt(code)),
+		};
+	}
+
+	public async getSecretAndRecoveryCodes(userId: string) {
+		const { mfaSecret, mfaRecoveryCodes } = await this.userRepository.findOneOrFail({
+			where: { id: userId },
+			select: ['id', 'mfaSecret', 'mfaRecoveryCodes'],
+		});
+		return this.decryptSecretAndRecoveryCodes(mfaSecret ?? '', mfaRecoveryCodes ?? []);
+	}
+
+	public async enableMfa(userId: string) {
+		await this.userRepository.update(userId, { mfaEnabled: true });
+	}
+
+	public encryptRecoveryCodes(mfaRecoveryCodes: string[]) {
+		return mfaRecoveryCodes.map((code) => this.cipher.encrypt(code));
+	}
+
+	public async disableMfa(userId: string) {
+		await this.userRepository.update(userId, {
+			mfaEnabled: false,
+			mfaSecret: null,
+			mfaRecoveryCodes: [],
+		});
+	}
+}
diff --git a/packages/cli/src/Mfa/totp.service.ts b/packages/cli/src/Mfa/totp.service.ts
new file mode 100644
index 0000000000000..cbb1f65aacab6
--- /dev/null
+++ b/packages/cli/src/Mfa/totp.service.ts
@@ -0,0 +1,39 @@
+import OTPAuth from 'otpauth';
+import { Service } from 'typedi';
+
+@Service()
+export class TOTPService {
+	generateSecret(): string {
+		return new OTPAuth.Secret()?.base32;
+	}
+
+	generateTOTPUri({
+		issuer = 'n8n',
+		secret,
+		label,
+	}: {
+		secret: string;
+		label: string;
+		issuer?: string;
+	}) {
+		return new OTPAuth.TOTP({
+			secret: OTPAuth.Secret.fromBase32(secret),
+			issuer,
+			label,
+		}).toString();
+	}
+
+	verifySecret({ secret, token, window = 2 }: { secret: string; token: string; window?: number }) {
+		return new OTPAuth.TOTP({
+			secret: OTPAuth.Secret.fromBase32(secret),
+		}).validate({ token, window }) === null
+			? false
+			: true;
+	}
+
+	generateTOTP(secret: string) {
+		return OTPAuth.TOTP.generate({
+			secret: OTPAuth.Secret.fromBase32(secret),
+		});
+	}
+}
diff --git a/packages/cli/src/NodeTypes.ts b/packages/cli/src/NodeTypes.ts
index b2dfb4d2d8f66..4d9e773167e3f 100644
--- a/packages/cli/src/NodeTypes.ts
+++ b/packages/cli/src/NodeTypes.ts
@@ -6,17 +6,18 @@ import type {
 	IVersionedNodeType,
 	LoadedClass,
 } from 'n8n-workflow';
-import { NodeHelpers } from 'n8n-workflow';
+import { ApplicationError, NodeHelpers } from 'n8n-workflow';
 import { Service } from 'typedi';
-import { RESPONSE_ERROR_MESSAGES } from './constants';
 import { LoadNodesAndCredentials } from './LoadNodesAndCredentials';
+import { join, dirname } from 'path';
+import { readdir } from 'fs/promises';
+import type { Dirent } from 'fs';
+import { UnrecognizedNodeTypeError } from './errors/unrecognized-node-type.error';
 
 @Service()
 export class NodeTypes implements INodeTypes {
-	constructor(private nodesAndCredentials: LoadNodesAndCredentials) {
-		// Some nodeTypes need to get special parameters applied like the
-		// polling nodes the polling times
-		this.applySpecialNodeParameters();
+	constructor(private loadNodesAndCredentials: LoadNodesAndCredentials) {
+		loadNodesAndCredentials.addPostProcessor(async () => this.applySpecialNodeParameters());
 	}
 
 	/**
@@ -29,7 +30,7 @@ export class NodeTypes implements INodeTypes {
 		const nodeType = this.getNode(nodeTypeName);
 
 		if (!nodeType) {
-			throw new Error(`Unknown node type: ${nodeTypeName}`);
+			throw new ApplicationError('Unknown node type', { tags: { nodeTypeName } });
 		}
 
 		const { description } = NodeHelpers.getVersionedNodeType(nodeType.type, version);
@@ -45,20 +46,24 @@ export class NodeTypes implements INodeTypes {
 		return NodeHelpers.getVersionedNodeType(this.getNode(nodeType).type, version);
 	}
 
+	/* Some nodeTypes need to get special parameters applied like the polling nodes the polling times */
 	applySpecialNodeParameters() {
-		for (const nodeTypeData of Object.values(this.loadedNodes)) {
+		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 = this.loadedNodes;
+		const { loadedNodes, knownNodes } = this.loadNodesAndCredentials;
 		if (type in loadedNodes) {
 			return loadedNodes[type];
 		}
 
-		const knownNodes = this.knownNodes;
 		if (type in knownNodes) {
 			const { className, sourcePath } = knownNodes[type];
 			const loaded: INodeType = loadClassInIsolation(sourcePath, className);
@@ -66,14 +71,49 @@ export class NodeTypes implements INodeTypes {
 			loadedNodes[type] = { sourcePath, type: loaded };
 			return loadedNodes[type];
 		}
-		throw new Error(`${RESPONSE_ERROR_MESSAGES.NO_NODE}: ${type}`);
+
+		throw new UnrecognizedNodeTypeError(type);
 	}
 
-	private get loadedNodes() {
-		return this.nodesAndCredentials.loaded.nodes;
+	async getNodeTranslationPath({
+		nodeSourcePath,
+		longNodeType,
+		locale,
+	}: {
+		nodeSourcePath: string;
+		longNodeType: string;
+		locale: string;
+	}) {
+		const nodeDir = dirname(nodeSourcePath);
+		const maxVersion = await this.getMaxVersion(nodeDir);
+		const nodeType = longNodeType.replace('n8n-nodes-base.', '');
+
+		return maxVersion
+			? join(nodeDir, `v${maxVersion}`, 'translations', locale, `${nodeType}.json`)
+			: join(nodeDir, 'translations', locale, `${nodeType}.json`);
 	}
 
-	private get knownNodes() {
-		return this.nodesAndCredentials.known.nodes;
+	private async getMaxVersion(dir: string) {
+		const entries = await readdir(dir, { withFileTypes: true });
+
+		const dirnames = entries.reduce<string[]>((acc, cur) => {
+			if (this.isVersionedDirname(cur)) acc.push(cur.name);
+			return acc;
+		}, []);
+
+		if (!dirnames.length) return null;
+
+		return Math.max(...dirnames.map((d) => parseInt(d.charAt(1), 10)));
+	}
+
+	private isVersionedDirname(dirent: Dirent) {
+		if (!dirent.isDirectory()) return false;
+
+		const ALLOWED_VERSIONED_DIRNAME_LENGTH = [2, 3]; // e.g. v1, v10
+
+		return (
+			ALLOWED_VERSIONED_DIRNAME_LENGTH.includes(dirent.name.length) &&
+			dirent.name.toLowerCase().startsWith('v')
+		);
 	}
 }
diff --git a/packages/cli/src/PublicApi/index.ts b/packages/cli/src/PublicApi/index.ts
index fa27212db42c4..104f92bd1843d 100644
--- a/packages/cli/src/PublicApi/index.ts
+++ b/packages/cli/src/PublicApi/index.ts
@@ -1,21 +1,23 @@
 /* eslint-disable @typescript-eslint/naming-convention */
+import { Container } from 'typedi';
 import type { Router } from 'express';
 import express from 'express';
 import fs from 'fs/promises';
 import path from 'path';
 
 import validator from 'validator';
-import { middleware as openapiValidatorMiddleware } from 'express-openapi-validator';
 import YAML from 'yamljs';
 import type { HttpError } from 'express-openapi-validator/dist/framework/types';
 import type { OpenAPIV3 } from 'openapi-types';
 import type { JsonObject } from 'swagger-ui-express';
 
 import config from '@/config';
-import * as Db from '@/Db';
-import { getInstanceBaseUrl } from '@/UserManagement/UserManagementHelper';
-import { Container } from 'typedi';
+
 import { InternalHooks } from '@/InternalHooks';
+import { License } from '@/License';
+import { UserRepository } from '@db/repositories/user.repository';
+import { UrlService } from '@/services/url.service';
+import type { AuthenticatedRequest } from '@/requests';
 
 async function createApiRouter(
 	version: string,
@@ -29,7 +31,7 @@ async function createApiRouter(
 	// from the Swagger UI
 	swaggerDocument.server = [
 		{
-			url: `${getInstanceBaseUrl()}/${publicApiEndpoint}/${version}}`,
+			url: `${Container.get(UrlService).getInstanceBaseUrl()}/${publicApiEndpoint}/${version}}`,
 		},
 	];
 	const apiController = express.Router();
@@ -50,32 +52,30 @@ async function createApiRouter(
 		);
 	}
 
-	apiController.get(`/${publicApiEndpoint}/${version}/openapi.yml`, (req, res) => {
+	apiController.get(`/${publicApiEndpoint}/${version}/openapi.yml`, (_, res) => {
 		res.sendFile(openApiSpecPath);
 	});
 
+	const { middleware: openApiValidatorMiddleware } = await import('express-openapi-validator');
 	apiController.use(
 		`/${publicApiEndpoint}/${version}`,
 		express.json(),
-		openapiValidatorMiddleware({
+		openApiValidatorMiddleware({
 			apiSpec: openApiSpecPath,
 			operationHandlers: handlersDirectory,
 			validateRequests: true,
 			validateApiSpec: true,
-			formats: [
-				{
-					name: 'email',
+			formats: {
+				email: {
 					type: 'string',
 					validate: (email: string) => validator.isEmail(email),
 				},
-				{
-					name: 'identifier',
+				identifier: {
 					type: 'string',
 					validate: (identifier: string) =>
 						validator.isUUID(identifier) || validator.isEmail(identifier),
 				},
-				{
-					name: 'jsonString',
+				jsonString: {
 					validate: (data: string) => {
 						try {
 							JSON.parse(data);
@@ -85,18 +85,17 @@ async function createApiRouter(
 						}
 					},
 				},
-			],
+			},
 			validateSecurity: {
 				handlers: {
 					ApiKeyAuth: async (
-						req: express.Request,
+						req: AuthenticatedRequest,
 						_scopes: unknown,
 						schema: OpenAPIV3.ApiKeySecurityScheme,
 					): Promise<boolean> => {
 						const apiKey = req.headers[schema.name.toLowerCase()] as string;
-						const user = await Db.collections.User.findOne({
+						const user = await Container.get(UserRepository).findOne({
 							where: { apiKey },
-							relations: ['globalRole'],
 						});
 
 						if (!user) return false;
@@ -142,12 +141,23 @@ export const loadPublicApiVersions = async (
 	const apiRouters = await Promise.all(
 		versions.map(async (version) => {
 			const openApiPath = path.join(__dirname, version, 'openapi.yml');
-			return createApiRouter(version, openApiPath, __dirname, publicApiEndpoint);
+			return await createApiRouter(version, openApiPath, __dirname, publicApiEndpoint);
 		}),
 	);
 
+	const version = versions.pop()?.charAt(1);
+
 	return {
 		apiRouters,
-		apiLatestVersion: Number(versions.pop()?.charAt(1)) ?? 1,
+		apiLatestVersion: version ? Number(version) : 1,
 	};
 };
+
+function isApiEnabledByLicense(): boolean {
+	const license = Container.get(License);
+	return !license.isAPIDisabled();
+}
+
+export function isApiEnabled(): boolean {
+	return !config.get('publicApi.disabled') && isApiEnabledByLicense();
+}
diff --git a/packages/cli/src/PublicApi/types.d.ts b/packages/cli/src/PublicApi/types.d.ts
deleted file mode 100644
index b1bd59d6dc57d..0000000000000
--- a/packages/cli/src/PublicApi/types.d.ts
+++ /dev/null
@@ -1,176 +0,0 @@
-import type express from 'express';
-import type { IDataObject, ExecutionStatus } from 'n8n-workflow';
-
-import type { User } from '@db/entities/User';
-
-import type { Role } from '@db/entities/Role';
-
-import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
-
-import type { UserManagementMailer } from '@/UserManagement/email';
-
-import type { Risk } from '@/audit/types';
-
-export type AuthlessRequest<
-	RouteParams = {},
-	ResponseBody = {},
-	RequestBody = {},
-	RequestQuery = {},
-> = express.Request<RouteParams, ResponseBody, RequestBody, RequestQuery>;
-
-export type AuthenticatedRequest<
-	RouteParams = {},
-	ResponseBody = {},
-	RequestBody = {},
-	RequestQuery = {},
-> = express.Request<RouteParams, ResponseBody, RequestBody, RequestQuery> & {
-	user: User;
-	globalMemberRole?: Role;
-	mailer?: UserManagementMailer;
-};
-
-export type PaginatedRequest = AuthenticatedRequest<
-	{},
-	{},
-	{},
-	{
-		limit?: number;
-		cursor?: string;
-		offset?: number;
-		lastId?: string;
-	}
->;
-export declare namespace ExecutionRequest {
-	type GetAll = AuthenticatedRequest<
-		{},
-		{},
-		{},
-		{
-			status?: ExecutionStatus;
-			limit?: number;
-			cursor?: string;
-			offset?: number;
-			includeData?: boolean;
-			workflowId?: string;
-			lastId?: string;
-		}
-	>;
-
-	type Get = AuthenticatedRequest<{ id: string }, {}, {}, { includeData?: boolean }>;
-	type Delete = Get;
-}
-
-export declare namespace CredentialTypeRequest {
-	type Get = AuthenticatedRequest<{ credentialTypeName: string }, {}, {}, {}>;
-}
-
-export declare namespace WorkflowRequest {
-	type GetAll = AuthenticatedRequest<
-		{},
-		{},
-		{},
-		{
-			tags?: string;
-			status?: ExecutionStatus;
-			limit?: number;
-			cursor?: string;
-			offset?: number;
-			workflowId?: number;
-			active: boolean;
-		}
-	>;
-
-	type Create = AuthenticatedRequest<{}, {}, WorkflowEntity, {}>;
-	type Get = AuthenticatedRequest<{ id: string }, {}, {}, {}>;
-	type Delete = Get;
-	type Update = AuthenticatedRequest<{ id: string }, {}, WorkflowEntity, {}>;
-	type Activate = Get;
-}
-
-export declare namespace UserRequest {
-	export type Invite = AuthenticatedRequest<{}, {}, Array<{ email: string }>>;
-
-	export type ResolveSignUp = AuthlessRequest<
-		{},
-		{},
-		{},
-		{ inviterId?: string; inviteeId?: string }
-	>;
-
-	export type SignUp = AuthenticatedRequest<
-		{ id: string },
-		{ inviterId?: string; inviteeId?: string }
-	>;
-
-	export type Delete = AuthenticatedRequest<
-		{ id: string; email: string },
-		{},
-		{},
-		{ transferId?: string; includeRole: boolean }
-	>;
-
-	export type Get = AuthenticatedRequest<
-		{ id: string; email: string },
-		{},
-		{},
-		{ limit?: number; offset?: number; cursor?: string; includeRole?: boolean }
-	>;
-
-	export type Reinvite = AuthenticatedRequest<{ id: string }>;
-
-	export type Update = AuthlessRequest<
-		{ id: string },
-		{},
-		{
-			inviterId: string;
-			firstName: string;
-			lastName: string;
-			password: string;
-		}
-	>;
-}
-
-export declare namespace CredentialRequest {
-	type Create = AuthenticatedRequest<{}, {}, { type: string; name: string; data: IDataObject }, {}>;
-}
-
-export type OperationID = 'getUsers' | 'getUser';
-
-type PaginationBase = { limit: number };
-
-type PaginationOffsetDecoded = PaginationBase & { offset: number };
-
-type PaginationCursorDecoded = PaginationBase & { lastId: string };
-
-type OffsetPagination = PaginationBase & { offset: number; numberOfTotalRecords: number };
-
-type CursorPagination = PaginationBase & { lastId: string; numberOfNextRecords: number };
-export interface IRequired {
-	required?: string[];
-	not?: { required?: string[] };
-}
-export interface IDependency {
-	if?: { properties: {} };
-	then?: { allOf: IRequired[] };
-	else?: { allOf: IRequired[] };
-}
-
-export interface IJsonSchema {
-	additionalProperties: boolean;
-	type: 'object';
-	properties: { [key: string]: { type: string } };
-	allOf?: IDependency[];
-	required: string[];
-}
-
-// ----------------------------------
-//           /audit
-// ----------------------------------
-
-export declare namespace AuditRequest {
-	type Generate = AuthenticatedRequest<
-		{},
-		{},
-		{ additionalOptions?: { categories?: Risk.Category[]; daysAbandonedWorkflow?: number } }
-	>;
-}
diff --git a/packages/cli/src/PublicApi/types.ts b/packages/cli/src/PublicApi/types.ts
new file mode 100644
index 0000000000000..c7e1bddadfe1f
--- /dev/null
+++ b/packages/cli/src/PublicApi/types.ts
@@ -0,0 +1,182 @@
+import type { IDataObject, ExecutionStatus } from 'n8n-workflow';
+import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
+import type { TagEntity } from '@db/entities/TagEntity';
+import type { Risk } from '@/security-audit/types';
+import type { AuthlessRequest, AuthenticatedRequest } from '@/requests';
+
+export type PaginatedRequest = AuthenticatedRequest<
+	{},
+	{},
+	{},
+	{
+		limit?: number;
+		cursor?: string;
+		offset?: number;
+		lastId?: string;
+	}
+>;
+export declare namespace ExecutionRequest {
+	type GetAll = AuthenticatedRequest<
+		{},
+		{},
+		{},
+		{
+			status?: ExecutionStatus;
+			limit?: number;
+			cursor?: string;
+			offset?: number;
+			includeData?: boolean;
+			workflowId?: string;
+			lastId?: string;
+		}
+	>;
+
+	type Get = AuthenticatedRequest<{ id: string }, {}, {}, { includeData?: boolean }>;
+	type Delete = Get;
+}
+
+export declare namespace TagRequest {
+	type GetAll = AuthenticatedRequest<
+		{},
+		{},
+		{},
+		{
+			limit?: number;
+			cursor?: string;
+			offset?: number;
+		}
+	>;
+
+	type Create = AuthenticatedRequest<{}, {}, TagEntity>;
+	type Get = AuthenticatedRequest<{ id: string }>;
+	type Delete = Get;
+	type Update = AuthenticatedRequest<{ id: string }, {}, TagEntity>;
+}
+
+export declare namespace CredentialTypeRequest {
+	type Get = AuthenticatedRequest<{ credentialTypeName: string }, {}, {}, {}>;
+}
+
+export declare namespace WorkflowRequest {
+	type GetAll = AuthenticatedRequest<
+		{},
+		{},
+		{},
+		{
+			tags?: string;
+			status?: ExecutionStatus;
+			limit?: number;
+			cursor?: string;
+			offset?: number;
+			workflowId?: number;
+			active: boolean;
+			name?: string;
+		}
+	>;
+
+	type Create = AuthenticatedRequest<{}, {}, WorkflowEntity, {}>;
+	type Get = AuthenticatedRequest<{ id: string }, {}, {}, {}>;
+	type Delete = Get;
+	type Update = AuthenticatedRequest<{ id: string }, {}, WorkflowEntity, {}>;
+	type Activate = Get;
+	type GetTags = Get;
+	type UpdateTags = AuthenticatedRequest<{ id: string }, {}, TagEntity[]>;
+}
+
+export declare namespace UserRequest {
+	export type Invite = AuthenticatedRequest<{}, {}, Array<{ email: string }>>;
+
+	export type ResolveSignUp = AuthlessRequest<
+		{},
+		{},
+		{},
+		{ inviterId?: string; inviteeId?: string }
+	>;
+
+	export type SignUp = AuthenticatedRequest<
+		{ id: string },
+		{ inviterId?: string; inviteeId?: string }
+	>;
+
+	export type Delete = AuthenticatedRequest<
+		{ id: string; email: string },
+		{},
+		{},
+		{ transferId?: string; includeRole: boolean }
+	>;
+
+	export type Get = AuthenticatedRequest<
+		{ id: string; email: string },
+		{},
+		{},
+		{ limit?: number; offset?: number; cursor?: string; includeRole?: boolean }
+	>;
+
+	export type Reinvite = AuthenticatedRequest<{ id: string }>;
+
+	export type Update = AuthlessRequest<
+		{ id: string },
+		{},
+		{
+			inviterId: string;
+			firstName: string;
+			lastName: string;
+			password: string;
+		}
+	>;
+}
+
+export declare namespace CredentialRequest {
+	type Create = AuthenticatedRequest<{}, {}, { type: string; name: string; data: IDataObject }, {}>;
+}
+
+export type OperationID = 'getUsers' | 'getUser';
+
+type PaginationBase = { limit: number };
+
+export type PaginationOffsetDecoded = PaginationBase & { offset: number };
+
+export type PaginationCursorDecoded = PaginationBase & { lastId: string };
+
+export type OffsetPagination = PaginationBase & { offset: number; numberOfTotalRecords: number };
+
+export type CursorPagination = PaginationBase & { lastId: string; numberOfNextRecords: number };
+export interface IRequired {
+	required?: string[];
+	not?: { required?: string[] };
+}
+export interface IDependency {
+	if?: { properties: {} };
+	then?: { allOf: IRequired[] };
+	else?: { allOf: IRequired[] };
+}
+
+export interface IJsonSchema {
+	additionalProperties: boolean;
+	type: 'object';
+	properties: { [key: string]: { type: string } };
+	allOf?: IDependency[];
+	required: string[];
+}
+
+export class SourceControlPull {
+	force?: boolean;
+
+	variables?: { [key: string]: string };
+}
+
+export declare namespace PublicSourceControlRequest {
+	type Pull = AuthenticatedRequest<{}, {}, SourceControlPull, {}>;
+}
+
+// ----------------------------------
+//           /audit
+// ----------------------------------
+
+export declare namespace AuditRequest {
+	type Generate = AuthenticatedRequest<
+		{},
+		{},
+		{ additionalOptions?: { categories?: Risk.Category[]; daysAbandonedWorkflow?: number } }
+	>;
+}
diff --git a/packages/cli/src/PublicApi/v1/handlers/audit/audit.handler.ts b/packages/cli/src/PublicApi/v1/handlers/audit/audit.handler.ts
index 89e4479944411..9fd2d028ff793 100644
--- a/packages/cli/src/PublicApi/v1/handlers/audit/audit.handler.ts
+++ b/packages/cli/src/PublicApi/v1/handlers/audit/audit.handler.ts
@@ -1,14 +1,15 @@
 import { authorize } from '@/PublicApi/v1/shared/middlewares/global.middleware';
-import { audit } from '@/audit';
 import type { Response } from 'express';
 import type { AuditRequest } from '@/PublicApi/types';
+import Container from 'typedi';
 
 export = {
 	generateAudit: [
-		authorize(['owner']),
+		authorize(['global:owner', 'global:admin']),
 		async (req: AuditRequest.Generate, res: Response): Promise<Response> => {
 			try {
-				const result = await audit(
+				const { SecurityAuditService } = await import('@/security-audit/SecurityAudit.service');
+				const result = await Container.get(SecurityAuditService).run(
 					req.body?.additionalOptions?.categories,
 					req.body?.additionalOptions?.daysAbandonedWorkflow,
 				);
diff --git a/packages/cli/src/PublicApi/v1/handlers/credentials/credentials.handler.ts b/packages/cli/src/PublicApi/v1/handlers/credentials/credentials.handler.ts
index 22f814a209637..165c7f9116b49 100644
--- a/packages/cli/src/PublicApi/v1/handlers/credentials/credentials.handler.ts
+++ b/packages/cli/src/PublicApi/v1/handlers/credentials/credentials.handler.ts
@@ -23,7 +23,7 @@ import { Container } from 'typedi';
 
 export = {
 	createCredential: [
-		authorize(['owner', 'member']),
+		authorize(['global:owner', 'global:admin', 'global:member']),
 		validCredentialType,
 		validCredentialsProperties,
 		async (
@@ -39,11 +39,6 @@ export = {
 
 				const savedCredential = await saveCredential(newCredential, req.user, encryptedData);
 
-				// LoggerProxy.verbose('New credential created', {
-				// 	credentialsId: newCredential.id,
-				// 	ownerId: req.user.id,
-				// });
-
 				return res.json(sanitizeCredentials(savedCredential));
 			} catch ({ message, httpStatusCode }) {
 				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
@@ -52,7 +47,7 @@ export = {
 		},
 	],
 	deleteCredential: [
-		authorize(['owner', 'member']),
+		authorize(['global:owner', 'global:admin', 'global:member']),
 		async (
 			req: CredentialRequest.Delete,
 			res: express.Response,
@@ -60,13 +55,10 @@ export = {
 			const { id: credentialId } = req.params;
 			let credential: CredentialsEntity | undefined;
 
-			if (req.user.globalRole.name !== 'owner') {
-				const shared = await getSharedCredentials(req.user.id, credentialId, [
-					'credentials',
-					'role',
-				]);
+			if (!['global:owner', 'global:admin'].includes(req.user.role)) {
+				const shared = await getSharedCredentials(req.user.id, credentialId);
 
-				if (shared?.role.name === 'owner') {
+				if (shared?.role === 'credential:owner') {
 					credential = shared.credentials;
 				}
 			} else {
@@ -77,13 +69,13 @@ export = {
 				return res.status(404).json({ message: 'Not Found' });
 			}
 
-			await removeCredential(credential);
+			await removeCredential(req.user, credential);
 			return res.json(sanitizeCredentials(credential));
 		},
 	],
 
 	getCredentialType: [
-		authorize(['owner', 'member']),
+		authorize(['global:owner', 'global:admin', 'global:member']),
 		async (req: CredentialTypeRequest.Get, res: express.Response): Promise<express.Response> => {
 			const { credentialTypeName } = req.params;
 
@@ -93,7 +85,7 @@ export = {
 				return res.status(404).json({ message: 'Not Found' });
 			}
 
-			const schema = new CredentialsHelper('')
+			const schema = Container.get(CredentialsHelper)
 				.getCredentialsProperties(credentialTypeName)
 				.filter((property) => property.type !== 'hidden');
 
diff --git a/packages/cli/src/PublicApi/v1/handlers/credentials/credentials.middleware.ts b/packages/cli/src/PublicApi/v1/handlers/credentials/credentials.middleware.ts
index d314151f9581d..b7c2412923ecd 100644
--- a/packages/cli/src/PublicApi/v1/handlers/credentials/credentials.middleware.ts
+++ b/packages/cli/src/PublicApi/v1/handlers/credentials/credentials.middleware.ts
@@ -30,7 +30,7 @@ export const validCredentialsProperties = (
 ): express.Response | void => {
 	const { type, data } = req.body;
 
-	const properties = new CredentialsHelper('')
+	const properties = Container.get(CredentialsHelper)
 		.getCredentialsProperties(type)
 		.filter((property) => property.type !== 'hidden');
 
diff --git a/packages/cli/src/PublicApi/v1/handlers/credentials/credentials.service.ts b/packages/cli/src/PublicApi/v1/handlers/credentials/credentials.service.ts
index e207ac55bc7bf..935956df2ecdb 100644
--- a/packages/cli/src/PublicApi/v1/handlers/credentials/credentials.service.ts
+++ b/packages/cli/src/PublicApi/v1/handlers/credentials/credentials.service.ts
@@ -1,31 +1,37 @@
-import { UserSettings, Credentials } from 'n8n-core';
-import type { IDataObject, INodeProperties, INodePropertyOptions } from 'n8n-workflow';
+import { Credentials } from 'n8n-core';
+import type {
+	DisplayCondition,
+	IDataObject,
+	INodeProperties,
+	INodePropertyOptions,
+} from 'n8n-workflow';
 import * as Db from '@/Db';
 import type { ICredentialsDb } from '@/Interfaces';
 import { CredentialsEntity } from '@db/entities/CredentialsEntity';
 import { SharedCredentials } from '@db/entities/SharedCredentials';
 import type { User } from '@db/entities/User';
-import { RoleRepository } from '@db/repositories';
 import { ExternalHooks } from '@/ExternalHooks';
 import type { IDependency, IJsonSchema } from '../../../types';
 import type { CredentialRequest } from '@/requests';
 import { Container } from 'typedi';
+import { CredentialsRepository } from '@db/repositories/credentials.repository';
+import { SharedCredentialsRepository } from '@db/repositories/sharedCredentials.repository';
+import { InternalHooks } from '@/InternalHooks';
 
 export async function getCredentials(credentialId: string): Promise<ICredentialsDb | null> {
-	return Db.collections.Credentials.findOneBy({ id: credentialId });
+	return await Container.get(CredentialsRepository).findOneBy({ id: credentialId });
 }
 
 export async function getSharedCredentials(
 	userId: string,
 	credentialId: string,
-	relations?: string[],
 ): Promise<SharedCredentials | null> {
-	return Db.collections.SharedCredentials.findOne({
+	return await Container.get(SharedCredentialsRepository).findOne({
 		where: {
 			userId,
 			credentialsId: credentialId,
 		},
-		relations,
+		relations: ['credentials'],
 	});
 }
 
@@ -36,21 +42,6 @@ export async function createCredential(
 
 	Object.assign(newCredential, properties);
 
-	if (!newCredential.nodesAccess || newCredential.nodesAccess.length === 0) {
-		newCredential.nodesAccess = [
-			{
-				nodeType: `n8n-nodes-base.${properties.type?.toLowerCase() ?? 'unknown'}`,
-				date: new Date(),
-			},
-		];
-	} else {
-		// Add the added date for node access permissions
-		newCredential.nodesAccess.forEach((nodeAccess) => {
-			// eslint-disable-next-line no-param-reassign
-			nodeAccess.date = new Date();
-		});
-	}
-
 	return newCredential;
 }
 
@@ -59,11 +50,16 @@ export async function saveCredential(
 	user: User,
 	encryptedData: ICredentialsDb,
 ): Promise<CredentialsEntity> {
-	const role = await Container.get(RoleRepository).findCredentialOwnerRoleOrFail();
-
 	await Container.get(ExternalHooks).run('credentials.create', [encryptedData]);
+	void Container.get(InternalHooks).onUserCreatedCredentials({
+		user,
+		credential_name: credential.name,
+		credential_type: credential.type,
+		credential_id: credential.id,
+		public_api: true,
+	});
 
-	return Db.transaction(async (transactionManager) => {
+	return await Db.transaction(async (transactionManager) => {
 		const savedCredential = await transactionManager.save<CredentialsEntity>(credential);
 
 		savedCredential.data = credential.data;
@@ -71,7 +67,7 @@ export async function saveCredential(
 		const newSharedCredential = new SharedCredentials();
 
 		Object.assign(newSharedCredential, {
-			role,
+			role: 'credential:owner',
 			user,
 			credentials: savedCredential,
 		});
@@ -82,23 +78,26 @@ export async function saveCredential(
 	});
 }
 
-export async function removeCredential(credentials: CredentialsEntity): Promise<ICredentialsDb> {
+export async function removeCredential(
+	user: User,
+	credentials: CredentialsEntity,
+): Promise<ICredentialsDb> {
 	await Container.get(ExternalHooks).run('credentials.delete', [credentials.id]);
-	return Db.collections.Credentials.remove(credentials);
+	void Container.get(InternalHooks).onUserDeletedCredentials({
+		user,
+		credential_name: credentials.name,
+		credential_type: credentials.type,
+		credential_id: credentials.id,
+	});
+	return await Container.get(CredentialsRepository).remove(credentials);
 }
 
 export async function encryptCredential(credential: CredentialsEntity): Promise<ICredentialsDb> {
-	const encryptionKey = await UserSettings.getEncryptionKey();
-
 	// Encrypt the data
-	const coreCredential = new Credentials(
-		{ id: null, name: credential.name },
-		credential.type,
-		credential.nodesAccess,
-	);
+	const coreCredential = new Credentials({ id: null, name: credential.name }, credential.type);
 
 	// @ts-ignore
-	coreCredential.setData(credential.data, encryptionKey);
+	coreCredential.setData(credential.data);
 
 	return coreCredential.getDataToSave() as ICredentialsDb;
 }
@@ -115,8 +114,7 @@ export function sanitizeCredentials(
 	const credentialsList = argIsArray ? credentials : [credentials];
 
 	const sanitizedCredentials = credentialsList.map((credential) => {
-		// eslint-disable-next-line @typescript-eslint/no-unused-vars
-		const { data, nodesAccess, shared, ...rest } = credential;
+		const { data, shared, ...rest } = credential;
 		return rest;
 	});
 
@@ -160,6 +158,7 @@ export function toJsonSchema(properties: INodeProperties[]): IDataObject {
 	// object in the JSON Schema definition. This allows us
 	// to later validate that only this properties are set in
 	// the credentials sent in the API call.
+	// eslint-disable-next-line complexity
 	properties.forEach((property) => {
 		if (property.required) {
 			requiredFields.push(property.name);
@@ -188,10 +187,9 @@ export function toJsonSchema(properties: INodeProperties[]): IDataObject {
 		if (property.displayOptions?.show) {
 			const dependantName = Object.keys(property.displayOptions?.show)[0] || '';
 			const displayOptionsValues = property.displayOptions.show[dependantName];
-			let dependantValue: string | number | boolean = '';
+			let dependantValue: DisplayCondition | string | number | boolean = '';
 
 			if (displayOptionsValues && Array.isArray(displayOptionsValues) && displayOptionsValues[0]) {
-				// eslint-disable-next-line prefer-destructuring
 				dependantValue = displayOptionsValues[0];
 			}
 
@@ -200,12 +198,75 @@ export function toJsonSchema(properties: INodeProperties[]): IDataObject {
 			}
 
 			if (!resolveProperties.includes(dependantName)) {
+				let conditionalValue;
+				if (typeof dependantValue === 'object' && dependantValue._cnd) {
+					// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+					const [key, targetValue] = Object.entries(dependantValue._cnd)[0];
+
+					if (key === 'eq') {
+						conditionalValue = {
+							const: [targetValue],
+						};
+					} else if (key === 'not') {
+						conditionalValue = {
+							not: {
+								const: [targetValue],
+							},
+						};
+					} else if (key === 'gt') {
+						conditionalValue = {
+							type: 'number',
+							exclusiveMinimum: [targetValue],
+						};
+					} else if (key === 'gte') {
+						conditionalValue = {
+							type: 'number',
+							minimum: [targetValue],
+						};
+					} else if (key === 'lt') {
+						conditionalValue = {
+							type: 'number',
+							exclusiveMaximum: [targetValue],
+						};
+					} else if (key === 'lte') {
+						conditionalValue = {
+							type: 'number',
+							maximum: [targetValue],
+						};
+					} else if (key === 'startsWith') {
+						conditionalValue = {
+							type: 'string',
+							pattern: `^${targetValue}`,
+						};
+					} else if (key === 'endsWith') {
+						conditionalValue = {
+							type: 'string',
+							pattern: `${targetValue}$`,
+						};
+					} else if (key === 'includes') {
+						conditionalValue = {
+							type: 'string',
+							pattern: `${targetValue}`,
+						};
+					} else if (key === 'regex') {
+						conditionalValue = {
+							type: 'string',
+							pattern: `${targetValue}`,
+						};
+					} else {
+						conditionalValue = {
+							enum: [dependantValue],
+						};
+					}
+				} else {
+					conditionalValue = {
+						enum: [dependantValue],
+					};
+				}
 				propertyRequiredDependencies[dependantName] = {
 					if: {
 						properties: {
-							[dependantName]: {
-								enum: [dependantValue],
-							},
+							[dependantName]: conditionalValue,
 						},
 					},
 					then: {
diff --git a/packages/cli/src/PublicApi/v1/handlers/credentials/spec/paths/credentials.id.yml b/packages/cli/src/PublicApi/v1/handlers/credentials/spec/paths/credentials.id.yml
index b80f81ac02bba..7ab682ffabd46 100644
--- a/packages/cli/src/PublicApi/v1/handlers/credentials/spec/paths/credentials.id.yml
+++ b/packages/cli/src/PublicApi/v1/handlers/credentials/spec/paths/credentials.id.yml
@@ -12,7 +12,7 @@ delete:
       description: The credential ID that needs to be deleted
       required: true
       schema:
-        type: number
+        type: string
   responses:
     '200':
       description: Operation successful.
diff --git a/packages/cli/src/PublicApi/v1/handlers/credentials/spec/schemas/credential.yml b/packages/cli/src/PublicApi/v1/handlers/credentials/spec/schemas/credential.yml
index 9c66817475c02..08c208f59a208 100644
--- a/packages/cli/src/PublicApi/v1/handlers/credentials/spec/schemas/credential.yml
+++ b/packages/cli/src/PublicApi/v1/handlers/credentials/spec/schemas/credential.yml
@@ -5,9 +5,9 @@ required:
 type: object
 properties:
   id:
-    type: number
+    type: string
     readOnly: true
-    example: 42
+    example: R2DjclaysHbqn778
   name:
     type: string
     example: Joe's Github Credentials
diff --git a/packages/cli/src/PublicApi/v1/handlers/executions/executions.handler.ts b/packages/cli/src/PublicApi/v1/handlers/executions/executions.handler.ts
index 2ac5f72a55a4e..3a63fb9aa0635 100644
--- a/packages/cli/src/PublicApi/v1/handlers/executions/executions.handler.ts
+++ b/packages/cli/src/PublicApi/v1/handlers/executions/executions.handler.ts
@@ -1,24 +1,18 @@
 import type express from 'express';
+import { Container } from 'typedi';
+import { replaceCircularReferences } from 'n8n-workflow';
 
-import { BinaryDataManager } from 'n8n-core';
-
-import {
-	getExecutions,
-	getExecutionInWorkflows,
-	deleteExecution,
-	getExecutionsCount,
-} from './executions.service';
 import { ActiveExecutions } from '@/ActiveExecutions';
 import { authorize, validCursor } from '../../shared/middlewares/global.middleware';
 import type { ExecutionRequest } from '../../../types';
 import { getSharedWorkflowIds } from '../workflows/workflows.service';
 import { encodeNextCursor } from '../../shared/services/pagination.service';
-import { Container } from 'typedi';
 import { InternalHooks } from '@/InternalHooks';
+import { ExecutionRepository } from '@db/repositories/execution.repository';
 
 export = {
 	deleteExecution: [
-		authorize(['owner', 'member']),
+		authorize(['global:owner', 'global:admin', 'global:member']),
 		async (req: ExecutionRequest.Delete, res: express.Response): Promise<express.Response> => {
 			const sharedWorkflowsIds = await getSharedWorkflowIds(req.user);
 
@@ -31,23 +25,26 @@ export = {
 			const { id } = req.params;
 
 			// look for the execution on the workflow the user owns
-			const execution = await getExecutionInWorkflows(id, sharedWorkflowsIds, false);
+			const execution = await Container.get(
+				ExecutionRepository,
+			).getExecutionInWorkflowsForPublicApi(id, sharedWorkflowsIds, false);
 
 			if (!execution) {
 				return res.status(404).json({ message: 'Not Found' });
 			}
 
-			await BinaryDataManager.getInstance().deleteBinaryDataByExecutionId(execution.id);
-
-			await deleteExecution(execution);
+			await Container.get(ExecutionRepository).hardDelete({
+				workflowId: execution.workflowId,
+				executionId: execution.id,
+			});
 
 			execution.id = id;
 
-			return res.json(execution);
+			return res.json(replaceCircularReferences(execution));
 		},
 	],
 	getExecution: [
-		authorize(['owner', 'member']),
+		authorize(['global:owner', 'global:admin', 'global:member']),
 		async (req: ExecutionRequest.Get, res: express.Response): Promise<express.Response> => {
 			const sharedWorkflowsIds = await getSharedWorkflowIds(req.user);
 
@@ -61,7 +58,9 @@ export = {
 			const { includeData = false } = req.query;
 
 			// look for the execution on the workflow the user owns
-			const execution = await getExecutionInWorkflows(id, sharedWorkflowsIds, includeData);
+			const execution = await Container.get(
+				ExecutionRepository,
+			).getExecutionInWorkflowsForPublicApi(id, sharedWorkflowsIds, includeData);
 
 			if (!execution) {
 				return res.status(404).json({ message: 'Not Found' });
@@ -72,11 +71,11 @@ export = {
 				public_api: true,
 			});
 
-			return res.json(execution);
+			return res.json(replaceCircularReferences(execution));
 		},
 	],
 	getExecutions: [
-		authorize(['owner', 'member']),
+		authorize(['global:owner', 'global:admin', 'global:member']),
 		validCursor,
 		async (req: ExecutionRequest.GetAll, res: express.Response): Promise<express.Response> => {
 			const {
@@ -109,13 +108,15 @@ export = {
 				excludedExecutionsIds: runningExecutionsIds,
 			};
 
-			const executions = await getExecutions(filters);
+			const executions =
+				await Container.get(ExecutionRepository).getExecutionsForPublicApi(filters);
 
 			const newLastId = !executions.length ? '0' : executions.slice(-1)[0].id;
 
 			filters.lastId = newLastId;
 
-			const count = await getExecutionsCount(filters);
+			const count =
+				await Container.get(ExecutionRepository).getExecutionsCountForPublicApi(filters);
 
 			void Container.get(InternalHooks).onUserRetrievedAllExecutions({
 				user_id: req.user.id,
@@ -123,7 +124,7 @@ export = {
 			});
 
 			return res.json({
-				data: executions,
+				data: replaceCircularReferences(executions),
 				nextCursor: encodeNextCursor({
 					lastId: newLastId,
 					limit,
diff --git a/packages/cli/src/PublicApi/v1/handlers/executions/executions.service.ts b/packages/cli/src/PublicApi/v1/handlers/executions/executions.service.ts
deleted file mode 100644
index 4ae709dea649a..0000000000000
--- a/packages/cli/src/PublicApi/v1/handlers/executions/executions.service.ts
+++ /dev/null
@@ -1,139 +0,0 @@
-import { parse } from 'flatted';
-import type { FindOptionsWhere } from 'typeorm';
-import { In, Not, Raw, LessThan, IsNull } from 'typeorm';
-
-import * as Db from '@/Db';
-import type { IExecutionFlattedDb, IExecutionResponseApi } from '@/Interfaces';
-import type { ExecutionStatus } from 'n8n-workflow';
-
-function prepareExecutionData(
-	execution: IExecutionFlattedDb | null,
-): IExecutionResponseApi | undefined {
-	if (!execution) return undefined;
-
-	// @ts-ignore
-	if (!execution.data) return execution;
-
-	return {
-		...execution,
-		data: parse(execution.data) as object,
-	};
-}
-
-function getStatusCondition(status: ExecutionStatus) {
-	const condition: Pick<
-		FindOptionsWhere<IExecutionFlattedDb>,
-		'finished' | 'waitTill' | 'stoppedAt'
-	> = {};
-
-	if (status === 'success') {
-		condition.finished = true;
-	} else if (status === 'waiting') {
-		condition.waitTill = Not(IsNull());
-	} else if (status === 'error') {
-		condition.stoppedAt = Not(IsNull());
-		condition.finished = false;
-	}
-
-	return condition;
-}
-
-function getExecutionSelectableProperties(includeData?: boolean): Array<keyof IExecutionFlattedDb> {
-	const selectFields: Array<keyof IExecutionFlattedDb> = [
-		'id',
-		'mode',
-		'retryOf',
-		'retrySuccessId',
-		'startedAt',
-		'stoppedAt',
-		'workflowId',
-		'waitTill',
-		'finished',
-	];
-
-	if (includeData) selectFields.push('data');
-
-	return selectFields;
-}
-
-export async function getExecutions(params: {
-	limit: number;
-	includeData?: boolean;
-	lastId?: string;
-	workflowIds?: string[];
-	status?: ExecutionStatus;
-	excludedExecutionsIds?: string[];
-}): Promise<IExecutionResponseApi[]> {
-	let where: FindOptionsWhere<IExecutionFlattedDb> = {};
-
-	if (params.lastId && params.excludedExecutionsIds?.length) {
-		where.id = Raw((id) => `${id} < :lastId AND ${id} NOT IN (:...excludedExecutionsIds)`, {
-			lastId: params.lastId,
-			excludedExecutionsIds: params.excludedExecutionsIds,
-		});
-	} else if (params.lastId) {
-		where.id = LessThan(params.lastId);
-	} else if (params.excludedExecutionsIds?.length) {
-		where.id = Not(In(params.excludedExecutionsIds));
-	}
-
-	if (params.status) {
-		where = { ...where, ...getStatusCondition(params.status) };
-	}
-
-	if (params.workflowIds) {
-		where = { ...where, workflowId: In(params.workflowIds) };
-	}
-
-	const executions = await Db.collections.Execution.find({
-		select: getExecutionSelectableProperties(params.includeData),
-		where,
-		order: { id: 'DESC' },
-		take: params.limit,
-	});
-
-	return executions.map(prepareExecutionData) as IExecutionResponseApi[];
-}
-
-export async function getExecutionsCount(data: {
-	limit: number;
-	lastId?: string;
-	workflowIds?: string[];
-	status?: ExecutionStatus;
-	excludedWorkflowIds?: string[];
-}): Promise<number> {
-	const executions = await Db.collections.Execution.count({
-		where: {
-			...(data.lastId && { id: LessThan(data.lastId) }),
-			...(data.status && { ...getStatusCondition(data.status) }),
-			...(data.workflowIds && { workflowId: In(data.workflowIds) }),
-			...(data.excludedWorkflowIds && { workflowId: Not(In(data.excludedWorkflowIds)) }),
-		},
-		take: data.limit,
-	});
-
-	return executions;
-}
-
-export async function getExecutionInWorkflows(
-	id: string,
-	workflowIds: string[],
-	includeData?: boolean,
-): Promise<IExecutionResponseApi | undefined> {
-	const execution = await Db.collections.Execution.findOne({
-		select: getExecutionSelectableProperties(includeData),
-		where: {
-			id,
-			workflowId: In(workflowIds),
-		},
-	});
-
-	return prepareExecutionData(execution);
-}
-
-export async function deleteExecution(
-	execution: IExecutionResponseApi | undefined,
-): Promise<IExecutionFlattedDb> {
-	// @ts-ignore
-	return Db.collections.Execution.remove(execution);
-}
diff --git a/packages/cli/src/PublicApi/v1/handlers/executions/spec/paths/executions.id.yml b/packages/cli/src/PublicApi/v1/handlers/executions/spec/paths/executions.id.yml
index 2199d683c37f2..f8b60da7a25c0 100644
--- a/packages/cli/src/PublicApi/v1/handlers/executions/spec/paths/executions.id.yml
+++ b/packages/cli/src/PublicApi/v1/handlers/executions/spec/paths/executions.id.yml
@@ -4,7 +4,7 @@ get:
   tags:
     - Execution
   summary: Retrieve an execution
-  description: Retrieve an execution from you instance.
+  description: Retrieve an execution from your instance.
   parameters:
     - $ref: '../schemas/parameters/executionId.yml'
     - $ref: '../schemas/parameters/includeData.yml'
diff --git a/packages/cli/src/PublicApi/v1/handlers/sourceControl/sourceControl.handler.ts b/packages/cli/src/PublicApi/v1/handlers/sourceControl/sourceControl.handler.ts
new file mode 100644
index 0000000000000..66233867debdb
--- /dev/null
+++ b/packages/cli/src/PublicApi/v1/handlers/sourceControl/sourceControl.handler.ts
@@ -0,0 +1,55 @@
+import type express from 'express';
+import { Container } from 'typedi';
+import type { StatusResult } from 'simple-git';
+import type { PublicSourceControlRequest } from '../../../types';
+import { authorize } from '../../shared/middlewares/global.middleware';
+import type { ImportResult } from '@/environments/sourceControl/types/importResult';
+import { SourceControlService } from '@/environments/sourceControl/sourceControl.service.ee';
+import { SourceControlPreferencesService } from '@/environments/sourceControl/sourceControlPreferences.service.ee';
+import {
+	getTrackingInformationFromPullResult,
+	isSourceControlLicensed,
+} from '@/environments/sourceControl/sourceControlHelper.ee';
+import { InternalHooks } from '@/InternalHooks';
+
+export = {
+	pull: [
+		authorize(['global:owner', 'global:admin']),
+		async (
+			req: PublicSourceControlRequest.Pull,
+			res: express.Response,
+		): Promise<ImportResult | StatusResult | Promise<express.Response>> => {
+			const sourceControlPreferencesService = Container.get(SourceControlPreferencesService);
+			if (!isSourceControlLicensed()) {
+				return res
+					.status(401)
+					.json({ status: 'Error', message: 'Source Control feature is not licensed' });
+			}
+			if (!sourceControlPreferencesService.isSourceControlConnected()) {
+				return res
+					.status(400)
+					.json({ status: 'Error', message: 'Source Control is not connected to a repository' });
+			}
+			try {
+				const sourceControlService = Container.get(SourceControlService);
+				const result = await sourceControlService.pullWorkfolder({
+					force: req.body.force,
+					variables: req.body.variables,
+					userId: req.user.id,
+				});
+
+				if (result.statusCode === 200) {
+					void Container.get(InternalHooks).onSourceControlUserPulledAPI({
+						...getTrackingInformationFromPullResult(result.statusResult),
+						forced: req.body.force ?? false,
+					});
+					return res.status(200).send(result.statusResult);
+				} else {
+					return res.status(409).send(result.statusResult);
+				}
+			} catch (error) {
+				return res.status(400).send((error as { message: string }).message);
+			}
+		},
+	],
+};
diff --git a/packages/cli/src/PublicApi/v1/handlers/sourceControl/spec/paths/sourceControl.yml b/packages/cli/src/PublicApi/v1/handlers/sourceControl/spec/paths/sourceControl.yml
new file mode 100644
index 0000000000000..21a9d882f318e
--- /dev/null
+++ b/packages/cli/src/PublicApi/v1/handlers/sourceControl/spec/paths/sourceControl.yml
@@ -0,0 +1,25 @@
+post:
+  x-eov-operation-id: pull
+  x-eov-operation-handler: v1/handlers/sourceControl/sourceControl.handler
+  tags:
+    - SourceControl
+  summary: Pull changes from the remote repository
+  description: Requires the Source Control feature to be licensed and connected to a repository.
+  requestBody:
+    description: Pull options
+    required: true
+    content:
+      application/json:
+        schema:
+          $ref: '../schemas/pull.yml'
+  responses:
+    '200':
+      description: Import result
+      content:
+        application/json:
+          schema:
+            $ref: '../schemas/importResult.yml'
+    '400':
+      $ref: '../../../../shared/spec/responses/badRequest.yml'
+    '409':
+      $ref: '../../../../shared/spec/responses/conflict.yml'
diff --git a/packages/cli/src/PublicApi/v1/handlers/sourceControl/spec/schemas/importResult.yml b/packages/cli/src/PublicApi/v1/handlers/sourceControl/spec/schemas/importResult.yml
new file mode 100644
index 0000000000000..ea726f4249314
--- /dev/null
+++ b/packages/cli/src/PublicApi/v1/handlers/sourceControl/spec/schemas/importResult.yml
@@ -0,0 +1,55 @@
+type: object
+additionalProperties: true
+properties:
+  variables:
+    type: object
+    properties:
+      added:
+        type: array
+        items:
+          type: string
+      changed:
+        type: array
+        items:
+          type: string
+  credentials:
+    type: array
+    items:
+      type: object
+      properties:
+        id:
+          type: string
+        name:
+          type: string
+        type:
+          type: string
+  workflows:
+    type: array
+    items:
+      type: object
+      properties:
+        id:
+          type: string
+        name:
+          type: string
+  tags:
+    type: object
+    properties:
+      tags:
+        type: array
+        items:
+          type: object
+          properties:
+            id:
+              type: string
+            name:
+              type: string
+      mappings:
+        type: array
+        items:
+          type: object
+          properties:
+            workflowId:
+              type: string
+            tagId:
+              type: string
diff --git a/packages/cli/src/PublicApi/v1/handlers/sourceControl/spec/schemas/pull.yml b/packages/cli/src/PublicApi/v1/handlers/sourceControl/spec/schemas/pull.yml
new file mode 100644
index 0000000000000..8e19e449ab8d2
--- /dev/null
+++ b/packages/cli/src/PublicApi/v1/handlers/sourceControl/spec/schemas/pull.yml
@@ -0,0 +1,8 @@
+type: object
+properties:
+  force:
+    type: boolean
+    example: true
+  variables:
+    type: object
+    example: { 'foo': 'bar' }
diff --git a/packages/cli/src/PublicApi/v1/handlers/tags/spec/paths/tags.id.yml b/packages/cli/src/PublicApi/v1/handlers/tags/spec/paths/tags.id.yml
new file mode 100644
index 0000000000000..8dfea3613e80e
--- /dev/null
+++ b/packages/cli/src/PublicApi/v1/handlers/tags/spec/paths/tags.id.yml
@@ -0,0 +1,73 @@
+get:
+  x-eov-operation-id: getTag
+  x-eov-operation-handler: v1/handlers/tags/tags.handler
+  tags:
+    - Tags
+  summary: Retrieves a tag
+  description: Retrieves a tag.
+  parameters:
+    - $ref: '../schemas/parameters/tagId.yml'
+  responses:
+    '200':
+      description: Operation successful.
+      content:
+        application/json:
+          schema:
+            $ref: '../schemas/tag.yml'
+    '401':
+      $ref: '../../../../shared/spec/responses/unauthorized.yml'
+    '404':
+      $ref: '../../../../shared/spec/responses/notFound.yml'
+delete:
+  x-eov-operation-id: deleteTag
+  x-eov-operation-handler: v1/handlers/tags/tags.handler
+  tags:
+    - Tags
+  summary: Delete a tag
+  description: Deletes a tag.
+  parameters:
+    - $ref: '../schemas/parameters/tagId.yml'
+  responses:
+    '200':
+      description: Operation successful.
+      content:
+        application/json:
+          schema:
+            $ref: '../schemas/tag.yml'
+    '401':
+      $ref: '../../../../shared/spec/responses/unauthorized.yml'
+    '403':
+      $ref: '../../../../shared/spec/responses/forbidden.yml'
+    '404':
+      $ref: '../../../../shared/spec/responses/notFound.yml'
+put:
+  x-eov-operation-id: updateTag
+  x-eov-operation-handler: v1/handlers/tags/tags.handler
+  tags:
+    - Tags
+  summary: Update a tag
+  description: Update a tag.
+  parameters:
+    - $ref: '../schemas/parameters/tagId.yml'
+  requestBody:
+    description: Updated tag object.
+    content:
+      application/json:
+        schema:
+          $ref: '../schemas/tag.yml'
+    required: true
+  responses:
+    '200':
+      description: Tag object
+      content:
+        application/json:
+          schema:
+            $ref: '../schemas/tag.yml'
+    '400':
+      $ref: '../../../../shared/spec/responses/badRequest.yml'
+    '401':
+      $ref: '../../../../shared/spec/responses/unauthorized.yml'
+    '404':
+      $ref: '../../../../shared/spec/responses/notFound.yml'
+    '409':
+      $ref: '../../../../shared/spec/responses/conflict.yml'
\ No newline at end of file
diff --git a/packages/cli/src/PublicApi/v1/handlers/tags/spec/paths/tags.yml b/packages/cli/src/PublicApi/v1/handlers/tags/spec/paths/tags.yml
new file mode 100644
index 0000000000000..dfef5e97225f4
--- /dev/null
+++ b/packages/cli/src/PublicApi/v1/handlers/tags/spec/paths/tags.yml
@@ -0,0 +1,46 @@
+post:
+  x-eov-operation-id: createTag
+  x-eov-operation-handler: v1/handlers/tags/tags.handler
+  tags:
+    - Tags
+  summary: Create a tag
+  description: Create a tag in your instance.
+  requestBody:
+    description: Created tag object.
+    content:
+      application/json:
+        schema:
+          $ref: '../schemas/tag.yml'
+    required: true
+  responses:
+    '201':
+      description: A tag object
+      content:
+        application/json:
+          schema:
+            $ref: '../schemas/tag.yml'
+    '400':
+      $ref: '../../../../shared/spec/responses/badRequest.yml'
+    '409':
+      $ref: '../../../../shared/spec/responses/conflict.yml'
+    '401':
+      $ref: '../../../../shared/spec/responses/unauthorized.yml'
+get:
+  x-eov-operation-id: getTags
+  x-eov-operation-handler: v1/handlers/tags/tags.handler
+  tags:
+    - Tags
+  summary: Retrieve all tags
+  description: Retrieve all tags from your instance.
+  parameters:
+    - $ref: '../../../../shared/spec/parameters/limit.yml'
+    - $ref: '../../../../shared/spec/parameters/cursor.yml'
+  responses:
+    '200':
+      description: Operation successful.
+      content:
+        application/json:
+          schema:
+            $ref: '../schemas/tagList.yml'
+    '401':
+      $ref: '../../../../shared/spec/responses/unauthorized.yml'
diff --git a/packages/cli/src/PublicApi/v1/handlers/tags/spec/schemas/parameters/tagId.yml b/packages/cli/src/PublicApi/v1/handlers/tags/spec/schemas/parameters/tagId.yml
new file mode 100644
index 0000000000000..9a218184213ec
--- /dev/null
+++ b/packages/cli/src/PublicApi/v1/handlers/tags/spec/schemas/parameters/tagId.yml
@@ -0,0 +1,6 @@
+name: id
+in: path
+description: The ID of the tag.
+required: true
+schema:
+  type: string
diff --git a/packages/cli/src/PublicApi/v1/handlers/tags/spec/schemas/tag.yml b/packages/cli/src/PublicApi/v1/handlers/tags/spec/schemas/tag.yml
new file mode 100644
index 0000000000000..d0df086574e17
--- /dev/null
+++ b/packages/cli/src/PublicApi/v1/handlers/tags/spec/schemas/tag.yml
@@ -0,0 +1,20 @@
+type: object
+additionalProperties: false
+required:
+  - name
+properties:
+  id:
+    type: string
+    readOnly: true
+    example: 2tUt1wbLX592XDdX
+  name:
+    type: string
+    example: Production
+  createdAt:
+    type: string
+    format: date-time
+    readOnly: true
+  updatedAt:
+    type: string
+    format: date-time
+    readOnly: true
diff --git a/packages/cli/src/PublicApi/v1/handlers/tags/spec/schemas/tagList.yml b/packages/cli/src/PublicApi/v1/handlers/tags/spec/schemas/tagList.yml
new file mode 100644
index 0000000000000..37b63f98190ff
--- /dev/null
+++ b/packages/cli/src/PublicApi/v1/handlers/tags/spec/schemas/tagList.yml
@@ -0,0 +1,11 @@
+type: object
+properties:
+  data:
+    type: array
+    items:
+      $ref: './tag.yml'
+  nextCursor:
+    type: string
+    description: Paginate through tags by setting the cursor parameter to a nextCursor attribute returned by a previous request. Default value fetches the first "page" of the collection.
+    nullable: true
+    example: MTIzZTQ1NjctZTg5Yi0xMmQzLWE0NTYtNDI2NjE0MTc0MDA
diff --git a/packages/cli/src/PublicApi/v1/handlers/tags/tags.handler.ts b/packages/cli/src/PublicApi/v1/handlers/tags/tags.handler.ts
new file mode 100644
index 0000000000000..56e8f3b4b39b1
--- /dev/null
+++ b/packages/cli/src/PublicApi/v1/handlers/tags/tags.handler.ts
@@ -0,0 +1,103 @@
+import type express from 'express';
+
+import type { TagEntity } from '@db/entities/TagEntity';
+import { authorize, validCursor } from '../../shared/middlewares/global.middleware';
+import type { TagRequest } from '../../../types';
+import { encodeNextCursor } from '../../shared/services/pagination.service';
+
+import { Container } from 'typedi';
+import type { FindManyOptions } from '@n8n/typeorm';
+import { TagRepository } from '@db/repositories/tag.repository';
+import { TagService } from '@/services/tag.service';
+
+export = {
+	createTag: [
+		authorize(['global:owner', 'global:admin', 'global:member']),
+		async (req: TagRequest.Create, res: express.Response): Promise<express.Response> => {
+			const { name } = req.body;
+
+			const newTag = Container.get(TagService).toEntity({ name: name.trim() });
+
+			try {
+				const createdTag = await Container.get(TagService).save(newTag, 'create');
+				return res.status(201).json(createdTag);
+			} catch (error) {
+				return res.status(409).json({ message: 'Tag already exists' });
+			}
+		},
+	],
+	updateTag: [
+		authorize(['global:owner', 'global:admin', 'global:member']),
+		async (req: TagRequest.Update, res: express.Response): Promise<express.Response> => {
+			const { id } = req.params;
+			const { name } = req.body;
+
+			try {
+				await Container.get(TagService).getById(id);
+			} catch (error) {
+				return res.status(404).json({ message: 'Not Found' });
+			}
+
+			const updateTag = Container.get(TagService).toEntity({ id, name: name.trim() });
+
+			try {
+				const updatedTag = await Container.get(TagService).save(updateTag, 'update');
+				return res.json(updatedTag);
+			} catch (error) {
+				return res.status(409).json({ message: 'Tag already exists' });
+			}
+		},
+	],
+	deleteTag: [
+		authorize(['global:owner', 'global:admin']),
+		async (req: TagRequest.Delete, res: express.Response): Promise<express.Response> => {
+			const { id } = req.params;
+
+			let tag;
+			try {
+				tag = await Container.get(TagService).getById(id);
+			} catch (error) {
+				return res.status(404).json({ message: 'Not Found' });
+			}
+
+			await Container.get(TagService).delete(id);
+			return res.json(tag);
+		},
+	],
+	getTags: [
+		authorize(['global:owner', 'global:admin', 'global:member']),
+		validCursor,
+		async (req: TagRequest.GetAll, res: express.Response): Promise<express.Response> => {
+			const { offset = 0, limit = 100 } = req.query;
+
+			const query: FindManyOptions<TagEntity> = {
+				skip: offset,
+				take: limit,
+			};
+
+			const [tags, count] = await Container.get(TagRepository).findAndCount(query);
+
+			return res.json({
+				data: tags,
+				nextCursor: encodeNextCursor({
+					offset,
+					limit,
+					numberOfTotalRecords: count,
+				}),
+			});
+		},
+	],
+	getTag: [
+		authorize(['global:owner', 'global:admin', 'global:member']),
+		async (req: TagRequest.Get, res: express.Response): Promise<express.Response> => {
+			const { id } = req.params;
+
+			try {
+				const tag = await Container.get(TagService).getById(id);
+				return res.json(tag);
+			} catch (error) {
+				return res.status(404).json({ message: 'Not Found' });
+			}
+		},
+	],
+};
diff --git a/packages/cli/src/PublicApi/v1/handlers/users/spec/paths/users.id.yml b/packages/cli/src/PublicApi/v1/handlers/users/spec/paths/users.id.yml
new file mode 100644
index 0000000000000..0d3c86c4cef97
--- /dev/null
+++ b/packages/cli/src/PublicApi/v1/handlers/users/spec/paths/users.id.yml
@@ -0,0 +1,19 @@
+get:
+  x-eov-operation-id: getUser
+  x-eov-operation-handler: v1/handlers/users/users.handler.ee
+  tags:
+    - User
+  summary: Get user by ID/Email
+  description: Retrieve a user from your instance. Only available for the instance owner.
+  parameters:
+    - $ref: '../schemas/parameters/userIdentifier.yml'
+    - $ref: '../schemas/parameters/includeRole.yml'
+  responses:
+    '200':
+      description: Operation successful.
+      content:
+        application/json:
+          schema:
+            $ref: '../schemas/user.yml'
+    '401':
+      $ref: '../../../../shared/spec/responses/unauthorized.yml'
diff --git a/packages/cli/src/PublicApi/v1/handlers/users/spec/paths/users.yml b/packages/cli/src/PublicApi/v1/handlers/users/spec/paths/users.yml
new file mode 100644
index 0000000000000..1d618435531b5
--- /dev/null
+++ b/packages/cli/src/PublicApi/v1/handlers/users/spec/paths/users.yml
@@ -0,0 +1,20 @@
+get:
+  x-eov-operation-id: getUsers
+  x-eov-operation-handler: v1/handlers/users/users.handler.ee
+  tags:
+    - User
+  summary: Retrieve all users
+  description: Retrieve all users from your instance. Only available for the instance owner.
+  parameters:
+    - $ref: '../../../../shared/spec/parameters/limit.yml'
+    - $ref: '../../../../shared/spec/parameters/cursor.yml'
+    - $ref: '../schemas/parameters/includeRole.yml'
+  responses:
+    '200':
+      description: Operation successful.
+      content:
+        application/json:
+          schema:
+            $ref: '../schemas/userList.yml'
+    '401':
+      $ref: '../../../../shared/spec/responses/unauthorized.yml'
diff --git a/packages/cli/src/PublicApi/v1/handlers/users/spec/schemas/parameters/includeRole.yml b/packages/cli/src/PublicApi/v1/handlers/users/spec/schemas/parameters/includeRole.yml
new file mode 100644
index 0000000000000..5c560b8f671c4
--- /dev/null
+++ b/packages/cli/src/PublicApi/v1/handlers/users/spec/schemas/parameters/includeRole.yml
@@ -0,0 +1,8 @@
+name: includeRole
+in: query
+description: Whether to include the user's role or not.
+required: false
+schema:
+  type: boolean
+  example: true
+  default: false
diff --git a/packages/cli/src/PublicApi/v1/handlers/users/spec/schemas/parameters/userIdentifier.yml b/packages/cli/src/PublicApi/v1/handlers/users/spec/schemas/parameters/userIdentifier.yml
new file mode 100644
index 0000000000000..2292813a137f7
--- /dev/null
+++ b/packages/cli/src/PublicApi/v1/handlers/users/spec/schemas/parameters/userIdentifier.yml
@@ -0,0 +1,7 @@
+name: id
+in: path
+description: The ID or email of the user.
+required: true
+schema:
+  type: string
+  format: identifier
diff --git a/packages/cli/src/PublicApi/v1/handlers/users/spec/schemas/role.yml b/packages/cli/src/PublicApi/v1/handlers/users/spec/schemas/role.yml
new file mode 100644
index 0000000000000..4bd1faaa8105f
--- /dev/null
+++ b/packages/cli/src/PublicApi/v1/handlers/users/spec/schemas/role.yml
@@ -0,0 +1,25 @@
+readOnly: true
+type: object
+properties:
+  id:
+    type: number
+    readOnly: true
+    example: 1
+  name:
+    type: string
+    example: owner
+    readOnly: true
+  scope:
+    type: string
+    readOnly: true
+    example: global
+  createdAt:
+    type: string
+    description: Time the role was created.
+    format: date-time
+    readOnly: true
+  updatedAt:
+    type: string
+    description: Last time the role was updated.
+    format: date-time
+    readOnly: true
diff --git a/packages/cli/src/PublicApi/v1/handlers/users/spec/schemas/user.yml b/packages/cli/src/PublicApi/v1/handlers/users/spec/schemas/user.yml
new file mode 100644
index 0000000000000..532ee987368aa
--- /dev/null
+++ b/packages/cli/src/PublicApi/v1/handlers/users/spec/schemas/user.yml
@@ -0,0 +1,42 @@
+required:
+  - email
+type: object
+properties:
+  id:
+    type: string
+    readOnly: true
+    example: 123e4567-e89b-12d3-a456-426614174000
+  email:
+    type: string
+    format: email
+    example: john.doe@company.com
+  firstName:
+    maxLength: 32
+    type: string
+    description: User's first name
+    readOnly: true
+    example: john
+  lastName:
+    maxLength: 32
+    type: string
+    description: User's last name
+    readOnly: true
+    example: Doe
+  isPending:
+    type: boolean
+    description: Whether the user finished setting up their account in response to the invitation (true) or not (false).
+    readOnly: true
+  createdAt:
+    type: string
+    description: Time the user was created.
+    format: date-time
+    readOnly: true
+  updatedAt:
+    type: string
+    description: Last time the user was updated.
+    format: date-time
+    readOnly: true
+  role:
+    type: string
+    example: owner
+    readOnly: true
diff --git a/packages/cli/src/PublicApi/v1/handlers/users/spec/schemas/userList.yml b/packages/cli/src/PublicApi/v1/handlers/users/spec/schemas/userList.yml
new file mode 100644
index 0000000000000..212b26d64ac70
--- /dev/null
+++ b/packages/cli/src/PublicApi/v1/handlers/users/spec/schemas/userList.yml
@@ -0,0 +1,11 @@
+type: object
+properties:
+  data:
+    type: array
+    items:
+      $ref: './user.yml'
+  nextCursor:
+    type: string
+    description: Paginate through users by setting the cursor parameter to a nextCursor attribute returned by a previous request. Default value fetches the first "page" of the collection.
+    nullable: true
+    example: MTIzZTQ1NjctZTg5Yi0xMmQzLWE0NTYtNDI2NjE0MTc0MDA
diff --git a/packages/cli/src/PublicApi/v1/handlers/users/users.handler.ee.ts b/packages/cli/src/PublicApi/v1/handlers/users/users.handler.ee.ts
new file mode 100644
index 0000000000000..8fd36b1dbbef2
--- /dev/null
+++ b/packages/cli/src/PublicApi/v1/handlers/users/users.handler.ee.ts
@@ -0,0 +1,71 @@
+import type express from 'express';
+import { Container } from 'typedi';
+
+import { clean, getAllUsersAndCount, getUser } from './users.service.ee';
+
+import { encodeNextCursor } from '../../shared/services/pagination.service';
+import {
+	authorize,
+	validCursor,
+	validLicenseWithUserQuota,
+} from '../../shared/middlewares/global.middleware';
+import type { UserRequest } from '@/requests';
+import { InternalHooks } from '@/InternalHooks';
+
+export = {
+	getUser: [
+		validLicenseWithUserQuota,
+		authorize(['global:owner', 'global:admin']),
+		async (req: UserRequest.Get, res: express.Response) => {
+			const { includeRole = false } = req.query;
+			const { id } = req.params;
+
+			const user = await getUser({ withIdentifier: id, includeRole });
+
+			if (!user) {
+				return res.status(404).json({
+					message: `Could not find user with id: ${id}`,
+				});
+			}
+
+			const telemetryData = {
+				user_id: req.user.id,
+				public_api: true,
+			};
+
+			void Container.get(InternalHooks).onUserRetrievedUser(telemetryData);
+
+			return res.json(clean(user, { includeRole }));
+		},
+	],
+	getUsers: [
+		validLicenseWithUserQuota,
+		validCursor,
+		authorize(['global:owner', 'global:admin']),
+		async (req: UserRequest.Get, res: express.Response) => {
+			const { offset = 0, limit = 100, includeRole = false } = req.query;
+
+			const [users, count] = await getAllUsersAndCount({
+				includeRole,
+				limit,
+				offset,
+			});
+
+			const telemetryData = {
+				user_id: req.user.id,
+				public_api: true,
+			};
+
+			void Container.get(InternalHooks).onUserRetrievedAllUsers(telemetryData);
+
+			return res.json({
+				data: clean(users, { includeRole }),
+				nextCursor: encodeNextCursor({
+					offset,
+					limit,
+					numberOfTotalRecords: count,
+				}),
+			});
+		},
+	],
+};
diff --git a/packages/cli/src/PublicApi/v1/handlers/users/users.service.ee.ts b/packages/cli/src/PublicApi/v1/handlers/users/users.service.ee.ts
new file mode 100644
index 0000000000000..f7bf6618168f0
--- /dev/null
+++ b/packages/cli/src/PublicApi/v1/handlers/users/users.service.ee.ts
@@ -0,0 +1,66 @@
+import { Container } from 'typedi';
+import { UserRepository } from '@db/repositories/user.repository';
+import type { User } from '@db/entities/User';
+import pick from 'lodash/pick';
+import { validate as uuidValidate } from 'uuid';
+
+export async function getUser(data: {
+	withIdentifier: string;
+	includeRole?: boolean;
+}): Promise<User | null> {
+	return await Container.get(UserRepository)
+		.findOne({
+			where: {
+				...(uuidValidate(data.withIdentifier) && { id: data.withIdentifier }),
+				...(!uuidValidate(data.withIdentifier) && { email: data.withIdentifier }),
+			},
+		})
+		.then((user) => {
+			if (user && !data?.includeRole) delete (user as Partial<User>).role;
+			return user;
+		});
+}
+
+export async function getAllUsersAndCount(data: {
+	includeRole?: boolean;
+	limit?: number;
+	offset?: number;
+}): Promise<[User[], number]> {
+	const users = await Container.get(UserRepository).find({
+		where: {},
+		skip: data.offset,
+		take: data.limit,
+	});
+	if (!data?.includeRole) {
+		users.forEach((user) => {
+			delete (user as Partial<User>).role;
+		});
+	}
+	const count = await Container.get(UserRepository).count();
+	return [users, count];
+}
+
+const userProperties = [
+	'id',
+	'email',
+	'firstName',
+	'lastName',
+	'createdAt',
+	'updatedAt',
+	'isPending',
+];
+function pickUserSelectableProperties(user: User, options?: { includeRole: boolean }) {
+	return pick(user, userProperties.concat(options?.includeRole ? ['role'] : []));
+}
+
+export function clean(user: User, options?: { includeRole: boolean }): Partial<User>;
+export function clean(users: User[], options?: { includeRole: boolean }): Array<Partial<User>>;
+
+export function clean(
+	users: User[] | User,
+	options?: { includeRole: boolean },
+): Array<Partial<User>> | Partial<User> {
+	return Array.isArray(users)
+		? users.map((user) => pickUserSelectableProperties(user, options))
+		: pickUserSelectableProperties(users, options);
+}
diff --git a/packages/cli/src/PublicApi/v1/handlers/users/users.service.ts b/packages/cli/src/PublicApi/v1/handlers/users/users.service.ts
deleted file mode 100644
index 064d0be471416..0000000000000
--- a/packages/cli/src/PublicApi/v1/handlers/users/users.service.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Container } from 'typedi';
-import { RoleRepository } from '@db/repositories';
-import type { Role } from '@db/entities/Role';
-import type { User } from '@db/entities/User';
-
-export function isInstanceOwner(user: User): boolean {
-	return user.globalRole.name === 'owner';
-}
-
-export async function getWorkflowOwnerRole(): Promise<Role> {
-	return Container.get(RoleRepository).findWorkflowOwnerRoleOrFail();
-}
diff --git a/packages/cli/src/PublicApi/v1/handlers/workflows/spec/paths/workflows.id.tags.yml b/packages/cli/src/PublicApi/v1/handlers/workflows/spec/paths/workflows.id.tags.yml
new file mode 100644
index 0000000000000..1f5166d736481
--- /dev/null
+++ b/packages/cli/src/PublicApi/v1/handlers/workflows/spec/paths/workflows.id.tags.yml
@@ -0,0 +1,51 @@
+get:
+  x-eov-operation-id: getWorkflowTags
+  x-eov-operation-handler: v1/handlers/workflows/workflows.handler
+  tags:
+    - Workflow
+  summary: Get workflow tags
+  description: Get workflow tags.
+  parameters:
+    - $ref: '../schemas/parameters/workflowId.yml'
+  responses:
+    '200':
+      description: List of tags
+      content:
+        application/json:
+          schema:
+            $ref: '../schemas/workflowTags.yml'
+    '400':
+      $ref: '../../../../shared/spec/responses/badRequest.yml'
+    '401':
+      $ref: '../../../../shared/spec/responses/unauthorized.yml'
+    '404':
+      $ref: '../../../../shared/spec/responses/notFound.yml'
+put:
+  x-eov-operation-id: updateWorkflowTags
+  x-eov-operation-handler: v1/handlers/workflows/workflows.handler
+  tags:
+    - Workflow
+  summary: Update tags of a workflow
+  description: Update tags of a workflow.
+  parameters:
+    - $ref: '../schemas/parameters/workflowId.yml'
+  requestBody:
+    description: List of tags
+    content:
+      application/json:
+        schema:
+            $ref: '../schemas/tagIds.yml'
+    required: true
+  responses:
+    '200':
+      description: List of tags after add the tag
+      content:
+        application/json:
+          schema:
+            $ref: '../schemas/workflowTags.yml'
+    '400':
+      $ref: '../../../../shared/spec/responses/badRequest.yml'
+    '401':
+      $ref: '../../../../shared/spec/responses/unauthorized.yml'
+    '404':
+      $ref: '../../../../shared/spec/responses/notFound.yml'
\ No newline at end of file
diff --git a/packages/cli/src/PublicApi/v1/handlers/workflows/spec/paths/workflows.yml b/packages/cli/src/PublicApi/v1/handlers/workflows/spec/paths/workflows.yml
index 1ff9f0a70d2fd..6db149195df26 100644
--- a/packages/cli/src/PublicApi/v1/handlers/workflows/spec/paths/workflows.yml
+++ b/packages/cli/src/PublicApi/v1/handlers/workflows/spec/paths/workflows.yml
@@ -44,6 +44,14 @@ get:
       schema:
         type: string
         example: test,production
+    - name: name
+      in: query
+      required: false
+      explode: false
+      allowReserved: true
+      schema:
+        type: string
+        example: My Workflow
     - $ref: '../../../../shared/spec/parameters/limit.yml'
     - $ref: '../../../../shared/spec/parameters/cursor.yml'
   responses:
diff --git a/packages/cli/src/PublicApi/v1/handlers/workflows/spec/schemas/node.yml b/packages/cli/src/PublicApi/v1/handlers/workflows/spec/schemas/node.yml
index b05a105b90843..6f5fe2b759490 100644
--- a/packages/cli/src/PublicApi/v1/handlers/workflows/spec/schemas/node.yml
+++ b/packages/cli/src/PublicApi/v1/handlers/workflows/spec/schemas/node.yml
@@ -37,6 +37,11 @@ properties:
   continueOnFail:
     type: boolean
     example: false
+    description: 'use onError instead'
+    deprecated: true
+  onError:
+    type: string
+    example: 'stopWorkflow'
   position:
     type: array
     items:
diff --git a/packages/cli/src/PublicApi/v1/handlers/workflows/spec/schemas/parameters/workflowId.yml b/packages/cli/src/PublicApi/v1/handlers/workflows/spec/schemas/parameters/workflowId.yml
index fb802e67a2775..e8389a78b051b 100644
--- a/packages/cli/src/PublicApi/v1/handlers/workflows/spec/schemas/parameters/workflowId.yml
+++ b/packages/cli/src/PublicApi/v1/handlers/workflows/spec/schemas/parameters/workflowId.yml
@@ -3,4 +3,4 @@ in: path
 description: The ID of the workflow.
 required: true
 schema:
-  type: number
+  type: string
diff --git a/packages/cli/src/PublicApi/v1/handlers/workflows/spec/schemas/tag.yml b/packages/cli/src/PublicApi/v1/handlers/workflows/spec/schemas/tag.yml
deleted file mode 100644
index fb9d0242869f2..0000000000000
--- a/packages/cli/src/PublicApi/v1/handlers/workflows/spec/schemas/tag.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-type: object
-properties:
-  id:
-    type: number
-    example: 12
-  name:
-    type: string
-    example: Production
-  createdAt:
-    type: string
-    format: date-time
-    readOnly: true
-  updatedAt:
-    type: string
-    format: date-time
-    readOnly: true
diff --git a/packages/cli/src/PublicApi/v1/handlers/workflows/spec/schemas/tagIds.yml b/packages/cli/src/PublicApi/v1/handlers/workflows/spec/schemas/tagIds.yml
new file mode 100644
index 0000000000000..65ec23c7d6948
--- /dev/null
+++ b/packages/cli/src/PublicApi/v1/handlers/workflows/spec/schemas/tagIds.yml
@@ -0,0 +1,10 @@
+type: array
+items:
+  type: object
+  additionalProperties: false
+  required:
+    - id
+  properties:
+    id:
+      type: string
+      example: 2tUt1wbLX592XDdX
\ No newline at end of file
diff --git a/packages/cli/src/PublicApi/v1/handlers/workflows/spec/schemas/workflow.yml b/packages/cli/src/PublicApi/v1/handlers/workflows/spec/schemas/workflow.yml
index f04070f85b5d7..317e1543e87f6 100644
--- a/packages/cli/src/PublicApi/v1/handlers/workflows/spec/schemas/workflow.yml
+++ b/packages/cli/src/PublicApi/v1/handlers/workflows/spec/schemas/workflow.yml
@@ -7,9 +7,9 @@ required:
   - settings
 properties:
   id:
-    type: number
+    type: string
     readOnly: true
-    example: 1
+    example: 2tUt1wbLX592XDdX
   name:
     type: string
     example: Workflow 1
@@ -35,7 +35,6 @@ properties:
     $ref: './workflowSettings.yml'
   staticData:
     example: { lastId: 1 }
-    nullable: true
     anyOf:
       - type: string
         format: 'jsonString'
@@ -45,5 +44,5 @@ properties:
   tags:
     type: array
     items:
-      $ref: './tag.yml'
+      $ref: '../../../tags/spec/schemas/tag.yml'
     readOnly: true
diff --git a/packages/cli/src/PublicApi/v1/handlers/workflows/spec/schemas/workflowSettings.yml b/packages/cli/src/PublicApi/v1/handlers/workflows/spec/schemas/workflowSettings.yml
index d14bba0741844..c969b2eec8204 100644
--- a/packages/cli/src/PublicApi/v1/handlers/workflows/spec/schemas/workflowSettings.yml
+++ b/packages/cli/src/PublicApi/v1/handlers/workflows/spec/schemas/workflowSettings.yml
@@ -16,9 +16,12 @@ properties:
     example: 3600
     maxLength: 3600
   errorWorkflow:
-    type: number
-    example: 10
+    type: string
+    example: 'VzqKEW0ShTXA5vPj'
     description: The ID of the workflow that contains the error trigger node.
   timezone:
     type: string
     example: America/New_York
+  executionOrder:
+    type: string
+    example: v1
diff --git a/packages/cli/src/PublicApi/v1/handlers/workflows/spec/schemas/workflowTags.yml b/packages/cli/src/PublicApi/v1/handlers/workflows/spec/schemas/workflowTags.yml
new file mode 100644
index 0000000000000..f5fbe154e59cf
--- /dev/null
+++ b/packages/cli/src/PublicApi/v1/handlers/workflows/spec/schemas/workflowTags.yml
@@ -0,0 +1,3 @@
+type: array
+items:
+  $ref: '../../../tags/spec/schemas/tag.yml'
diff --git a/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.handler.ts b/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.handler.ts
index 5eaa8fd232dd1..1083d33edf087 100644
--- a/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.handler.ts
+++ b/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.handler.ts
@@ -1,9 +1,11 @@
 import type express from 'express';
+
 import { Container } from 'typedi';
-import type { FindOptionsWhere } from 'typeorm';
-import { In } from 'typeorm';
+import type { FindOptionsWhere } from '@n8n/typeorm';
+import { In, Like, QueryFailedError } from '@n8n/typeorm';
+import { v4 as uuid } from 'uuid';
 
-import { ActiveWorkflowRunner } from '@/ActiveWorkflowRunner';
+import { ActiveWorkflowManager } from '@/ActiveWorkflowManager';
 import config from '@/config';
 import { WorkflowEntity } from '@db/entities/WorkflowEntity';
 import { ExternalHooks } from '@/ExternalHooks';
@@ -11,43 +13,44 @@ import { addNodeIds, replaceInvalidCredentials } from '@/WorkflowHelpers';
 import type { WorkflowRequest } from '../../../types';
 import { authorize, validCursor } from '../../shared/middlewares/global.middleware';
 import { encodeNextCursor } from '../../shared/services/pagination.service';
-import { getWorkflowOwnerRole, isInstanceOwner } from '../users/users.service';
 import {
 	getWorkflowById,
 	getSharedWorkflow,
 	setWorkflowAsActive,
 	setWorkflowAsInactive,
 	updateWorkflow,
-	hasStartNode,
-	getStartNode,
-	getSharedWorkflows,
 	createWorkflow,
-	getWorkflowIdsViaTags,
 	parseTagNames,
-	getWorkflowsAndCount,
+	getWorkflowTags,
+	updateTags,
 } from './workflows.service';
-import { WorkflowsService } from '@/workflows/workflows.services';
+import { WorkflowService } from '@/workflows/workflow.service';
 import { InternalHooks } from '@/InternalHooks';
+import { WorkflowHistoryService } from '@/workflows/workflowHistory/workflowHistory.service.ee';
+import { SharedWorkflowRepository } from '@/databases/repositories/sharedWorkflow.repository';
+import { TagRepository } from '@/databases/repositories/tag.repository';
+import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 
 export = {
 	createWorkflow: [
-		authorize(['owner', 'member']),
+		authorize(['global:owner', 'global:admin', 'global:member']),
 		async (req: WorkflowRequest.Create, res: express.Response): Promise<express.Response> => {
 			const workflow = req.body;
 
 			workflow.active = false;
-
-			if (!hasStartNode(workflow)) {
-				workflow.nodes.push(getStartNode());
-			}
+			workflow.versionId = uuid();
 
 			await replaceInvalidCredentials(workflow);
 
 			addNodeIds(workflow);
 
-			const role = await getWorkflowOwnerRole();
+			const createdWorkflow = await createWorkflow(workflow, req.user, 'workflow:owner');
 
-			const createdWorkflow = await createWorkflow(workflow, req.user, role);
+			await Container.get(WorkflowHistoryService).saveVersion(
+				req.user,
+				createdWorkflow,
+				createdWorkflow.id,
+			);
 
 			await Container.get(ExternalHooks).run('workflow.afterCreate', [createdWorkflow]);
 			void Container.get(InternalHooks).onWorkflowCreated(req.user, createdWorkflow, true);
@@ -56,11 +59,11 @@ export = {
 		},
 	],
 	deleteWorkflow: [
-		authorize(['owner', 'member']),
+		authorize(['global:owner', 'global:admin', 'global:member']),
 		async (req: WorkflowRequest.Get, res: express.Response): Promise<express.Response> => {
 			const { id: workflowId } = req.params;
 
-			const workflow = await WorkflowsService.delete(req.user, workflowId);
+			const workflow = await Container.get(WorkflowService).delete(req.user, workflowId);
 			if (!workflow) {
 				// user trying to access a workflow they do not own
 				// or workflow does not exist
@@ -71,7 +74,7 @@ export = {
 		},
 	],
 	getWorkflow: [
-		authorize(['owner', 'member']),
+		authorize(['global:owner', 'global:admin', 'global:member']),
 		async (req: WorkflowRequest.Get, res: express.Response): Promise<express.Response> => {
 			const { id } = req.params;
 
@@ -92,28 +95,36 @@ export = {
 		},
 	],
 	getWorkflows: [
-		authorize(['owner', 'member']),
+		authorize(['global:owner', 'global:admin', 'global:member']),
 		validCursor,
 		async (req: WorkflowRequest.GetAll, res: express.Response): Promise<express.Response> => {
-			const { offset = 0, limit = 100, active = undefined, tags = undefined } = req.query;
+			const { offset = 0, limit = 100, active, tags, name } = req.query;
 
 			const where: FindOptionsWhere<WorkflowEntity> = {
 				...(active !== undefined && { active }),
+				...(name !== undefined && { name: Like('%' + name.trim() + '%') }),
 			};
 
-			if (isInstanceOwner(req.user)) {
+			if (['global:owner', 'global:admin'].includes(req.user.role)) {
 				if (tags) {
-					const workflowIds = await getWorkflowIdsViaTags(parseTagNames(tags));
+					const workflowIds = await Container.get(TagRepository).getWorkflowIdsViaTags(
+						parseTagNames(tags),
+					);
 					where.id = In(workflowIds);
 				}
 			} else {
 				const options: { workflowIds?: string[] } = {};
 
 				if (tags) {
-					options.workflowIds = await getWorkflowIdsViaTags(parseTagNames(tags));
+					options.workflowIds = await Container.get(TagRepository).getWorkflowIdsViaTags(
+						parseTagNames(tags),
+					);
 				}
 
-				const sharedWorkflows = await getSharedWorkflows(req.user, options);
+				const sharedWorkflows = await Container.get(SharedWorkflowRepository).getSharedWorkflows(
+					req.user,
+					options,
+				);
 
 				if (!sharedWorkflows.length) {
 					return res.status(200).json({
@@ -126,7 +137,7 @@ export = {
 				where.id = In(workflowsIds);
 			}
 
-			const [workflows, count] = await getWorkflowsAndCount({
+			const [workflows, count] = await Container.get(WorkflowRepository).findAndCount({
 				skip: offset,
 				take: limit,
 				where,
@@ -149,11 +160,13 @@ export = {
 		},
 	],
 	updateWorkflow: [
-		authorize(['owner', 'member']),
+		authorize(['global:owner', 'global:admin', 'global:member']),
 		async (req: WorkflowRequest.Update, res: express.Response): Promise<express.Response> => {
 			const { id } = req.params;
 			const updateData = new WorkflowEntity();
 			Object.assign(updateData, req.body);
+			updateData.id = id;
+			updateData.versionId = uuid();
 
 			const sharedWorkflow = await getSharedWorkflow(req.user, id);
 
@@ -163,19 +176,15 @@ export = {
 				return res.status(404).json({ message: 'Not Found' });
 			}
 
-			if (!hasStartNode(updateData)) {
-				updateData.nodes.push(getStartNode());
-			}
-
 			await replaceInvalidCredentials(updateData);
 			addNodeIds(updateData);
 
-			const workflowRunner = Container.get(ActiveWorkflowRunner);
+			const workflowManager = Container.get(ActiveWorkflowManager);
 
 			if (sharedWorkflow.workflow.active) {
 				// When workflow gets saved always remove it as the triggers could have been
 				// changed and so the changes would not take effect
-				await workflowRunner.remove(id);
+				await workflowManager.remove(id);
 			}
 
 			try {
@@ -188,7 +197,7 @@ export = {
 
 			if (sharedWorkflow.workflow.active) {
 				try {
-					await workflowRunner.add(sharedWorkflow.workflowId, 'update');
+					await workflowManager.add(sharedWorkflow.workflowId, 'update');
 				} catch (error) {
 					if (error instanceof Error) {
 						return res.status(400).json({ message: error.message });
@@ -198,6 +207,14 @@ export = {
 
 			const updatedWorkflow = await getWorkflowById(sharedWorkflow.workflowId);
 
+			if (updatedWorkflow) {
+				await Container.get(WorkflowHistoryService).saveVersion(
+					req.user,
+					updatedWorkflow,
+					sharedWorkflow.workflowId,
+				);
+			}
+
 			await Container.get(ExternalHooks).run('workflow.afterUpdate', [updateData]);
 			void Container.get(InternalHooks).onWorkflowSaved(req.user, updateData, true);
 
@@ -205,7 +222,7 @@ export = {
 		},
 	],
 	activateWorkflow: [
-		authorize(['owner', 'member']),
+		authorize(['global:owner', 'global:admin', 'global:member']),
 		async (req: WorkflowRequest.Activate, res: express.Response): Promise<express.Response> => {
 			const { id } = req.params;
 
@@ -219,7 +236,7 @@ export = {
 
 			if (!sharedWorkflow.workflow.active) {
 				try {
-					await Container.get(ActiveWorkflowRunner).add(sharedWorkflow.workflowId, 'activate');
+					await Container.get(ActiveWorkflowManager).add(sharedWorkflow.workflowId, 'activate');
 				} catch (error) {
 					if (error instanceof Error) {
 						return res.status(400).json({ message: error.message });
@@ -239,7 +256,7 @@ export = {
 		},
 	],
 	deactivateWorkflow: [
-		authorize(['owner', 'member']),
+		authorize(['global:owner', 'global:admin', 'global:member']),
 		async (req: WorkflowRequest.Activate, res: express.Response): Promise<express.Response> => {
 			const { id } = req.params;
 
@@ -251,10 +268,10 @@ export = {
 				return res.status(404).json({ message: 'Not Found' });
 			}
 
-			const workflowRunner = Container.get(ActiveWorkflowRunner);
+			const activeWorkflowManager = Container.get(ActiveWorkflowManager);
 
 			if (sharedWorkflow.workflow.active) {
-				await workflowRunner.remove(sharedWorkflow.workflowId);
+				await activeWorkflowManager.remove(sharedWorkflow.workflowId);
 
 				await setWorkflowAsInactive(sharedWorkflow.workflow);
 
@@ -267,4 +284,60 @@ export = {
 			return res.json(sharedWorkflow.workflow);
 		},
 	],
+	getWorkflowTags: [
+		authorize(['global:owner', 'global:admin', 'global:member']),
+		async (req: WorkflowRequest.GetTags, res: express.Response): Promise<express.Response> => {
+			const { id } = req.params;
+
+			if (config.getEnv('workflowTagsDisabled')) {
+				return res.status(400).json({ message: 'Workflow Tags Disabled' });
+			}
+
+			const sharedWorkflow = await getSharedWorkflow(req.user, id);
+
+			if (!sharedWorkflow) {
+				// user trying to access a workflow he does not own
+				// or workflow does not exist
+				return res.status(404).json({ message: 'Not Found' });
+			}
+
+			const tags = await getWorkflowTags(id);
+
+			return res.json(tags);
+		},
+	],
+	updateWorkflowTags: [
+		authorize(['global:owner', 'global:admin', 'global:member']),
+		async (req: WorkflowRequest.UpdateTags, res: express.Response): Promise<express.Response> => {
+			const { id } = req.params;
+			const newTags = req.body.map((newTag) => newTag.id);
+
+			if (config.getEnv('workflowTagsDisabled')) {
+				return res.status(400).json({ message: 'Workflow Tags Disabled' });
+			}
+
+			const sharedWorkflow = await getSharedWorkflow(req.user, id);
+
+			if (!sharedWorkflow) {
+				// user trying to access a workflow he does not own
+				// or workflow does not exist
+				return res.status(404).json({ message: 'Not Found' });
+			}
+
+			let tags;
+			try {
+				await updateTags(id, newTags);
+				tags = await getWorkflowTags(id);
+			} catch (error) {
+				// TODO: add a `ConstraintFailureError` in typeorm to handle when tags are missing here
+				if (error instanceof QueryFailedError) {
+					return res.status(404).json({ message: 'Some tags not found' });
+				} else {
+					throw error;
+				}
+			}
+
+			return res.json(tags);
+		},
+	],
 };
diff --git a/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.service.ts b/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.service.ts
index 4b2b8a5aca468..10a80138ba3bd 100644
--- a/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.service.ts
+++ b/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.service.ts
@@ -1,17 +1,14 @@
-import type { FindManyOptions, UpdateResult } from 'typeorm';
-import { In } from 'typeorm';
-import intersection from 'lodash.intersection';
-import type { INode } from 'n8n-workflow';
-import { v4 as uuid } from 'uuid';
-
+import { Container } from 'typedi';
 import * as Db from '@/Db';
 import type { User } from '@db/entities/User';
 import { WorkflowEntity } from '@db/entities/WorkflowEntity';
-import { SharedWorkflow } from '@db/entities/SharedWorkflow';
-import { isInstanceOwner } from '../users/users.service';
-import type { Role } from '@db/entities/Role';
+import { WorkflowTagMapping } from '@db/entities/WorkflowTagMapping';
+import { SharedWorkflow, type WorkflowSharingRole } from '@db/entities/SharedWorkflow';
 import config from '@/config';
-import { START_NODES } from '@/constants';
+import { WorkflowRepository } from '@db/repositories/workflow.repository';
+import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
+import { WorkflowTagMappingRepository } from '@db/repositories/workflowTagMapping.repository';
+import { TagRepository } from '@db/repositories/tag.repository';
 
 function insertIf(condition: boolean, elements: string[]): string[] {
 	return condition ? elements : [];
@@ -19,16 +16,11 @@ function insertIf(condition: boolean, elements: string[]): string[] {
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 export async function getSharedWorkflowIds(user: User): Promise<string[]> {
-	const where = user.globalRole.name === 'owner' ? {} : { userId: user.id };
-	const sharedWorkflows =
-		process.env.ONLY_OWNER_OR_ADMIN_CAN_ACCESS_WORKFLOW === 'true'
-			? await Db.collections.SharedWorkflow.find({
-					where,
-					select: ['workflowId'],
-			  })
-			: await Db.collections.SharedWorkflow.find({
-					select: ['workflowId'],
-			  });
+	const where = ['global:owner', 'global:admin'].includes(user.role) ? {} : { userId: user.id };
+	const sharedWorkflows = await Container.get(SharedWorkflowRepository).find({
+		where,
+		select: ['workflowId'],
+	});
 	return sharedWorkflows.map(({ workflowId }) => workflowId);
 }
 
@@ -36,58 +28,27 @@ export async function getSharedWorkflow(
 	user: User,
 	workflowId?: string | undefined,
 ): Promise<SharedWorkflow | null> {
-	return Db.collections.SharedWorkflow.findOne({
+	return await Container.get(SharedWorkflowRepository).findOne({
 		where: {
-			...(!isInstanceOwner(user) && { userId: user.id }),
+			...(!['global:owner', 'global:admin'].includes(user.role) && { userId: user.id }),
 			...(workflowId && { workflowId }),
 		},
 		relations: [...insertIf(!config.getEnv('workflowTagsDisabled'), ['workflow.tags']), 'workflow'],
 	});
 }
 
-export async function getSharedWorkflows(
-	user: User,
-	options: {
-		relations?: string[];
-		workflowIds?: string[];
-	},
-): Promise<SharedWorkflow[]> {
-	return Db.collections.SharedWorkflow.find({
-		where: {
-			...(!isInstanceOwner(user) && { userId: user.id }),
-			...(options.workflowIds && { workflowId: In(options.workflowIds) }),
-		},
-		...(options.relations && { relations: options.relations }),
-	});
-}
-
 export async function getWorkflowById(id: string): Promise<WorkflowEntity | null> {
-	return Db.collections.Workflow.findOne({
+	return await Container.get(WorkflowRepository).findOne({
 		where: { id },
 	});
 }
 
-/**
- * Returns the workflow IDs that have certain tags.
- * Intersection! e.g. workflow needs to have all provided tags.
- */
-export async function getWorkflowIdsViaTags(tags: string[]): Promise<string[]> {
-	const dbTags = await Db.collections.Tag.find({
-		where: { name: In(tags) },
-		relations: ['workflows'],
-	});
-
-	const workflowIdsPerTag = dbTags.map((tag) => tag.workflows.map((workflow) => workflow.id));
-
-	return intersection(...workflowIdsPerTag);
-}
-
 export async function createWorkflow(
 	workflow: WorkflowEntity,
 	user: User,
-	role: Role,
+	role: WorkflowSharingRole,
 ): Promise<WorkflowEntity> {
-	return Db.transaction(async (transactionManager) => {
+	return await Db.transaction(async (transactionManager) => {
 		const newWorkflow = new WorkflowEntity();
 		Object.assign(newWorkflow, workflow);
 		const savedWorkflow = await transactionManager.save<WorkflowEntity>(newWorkflow);
@@ -104,50 +65,54 @@ export async function createWorkflow(
 	});
 }
 
-export async function setWorkflowAsActive(workflow: WorkflowEntity): Promise<UpdateResult> {
-	return Db.collections.Workflow.update(workflow.id, { active: true, updatedAt: new Date() });
+export async function setWorkflowAsActive(workflow: WorkflowEntity) {
+	await Container.get(WorkflowRepository).update(workflow.id, {
+		active: true,
+		updatedAt: new Date(),
+	});
 }
 
-export async function setWorkflowAsInactive(workflow: WorkflowEntity): Promise<UpdateResult> {
-	return Db.collections.Workflow.update(workflow.id, { active: false, updatedAt: new Date() });
+export async function setWorkflowAsInactive(workflow: WorkflowEntity) {
+	return await Container.get(WorkflowRepository).update(workflow.id, {
+		active: false,
+		updatedAt: new Date(),
+	});
 }
 
 export async function deleteWorkflow(workflow: WorkflowEntity): Promise<WorkflowEntity> {
-	return Db.collections.Workflow.remove(workflow);
-}
-
-export async function getWorkflowsAndCount(
-	options: FindManyOptions<WorkflowEntity>,
-): Promise<[WorkflowEntity[], number]> {
-	return Db.collections.Workflow.findAndCount(options);
+	return await Container.get(WorkflowRepository).remove(workflow);
 }
 
-export async function updateWorkflow(
-	workflowId: string,
-	updateData: WorkflowEntity,
-): Promise<UpdateResult> {
-	return Db.collections.Workflow.update(workflowId, updateData);
+export async function updateWorkflow(workflowId: string, updateData: WorkflowEntity) {
+	return await Container.get(WorkflowRepository).update(workflowId, updateData);
 }
 
-export function hasStartNode(workflow: WorkflowEntity): boolean {
-	if (!workflow.nodes.length) return false;
-
-	const found = workflow.nodes.find((node) => START_NODES.includes(node.type));
-
-	return Boolean(found);
+export function parseTagNames(tags: string): string[] {
+	return tags.split(',').map((tag) => tag.trim());
 }
 
-export function getStartNode(): INode {
-	return {
-		id: uuid(),
-		parameters: {},
-		name: 'Start',
-		type: 'n8n-nodes-base.start',
-		typeVersion: 1,
-		position: [240, 300],
-	};
+export async function getWorkflowTags(workflowId: string) {
+	return await Container.get(TagRepository).find({
+		select: ['id', 'name', 'createdAt', 'updatedAt'],
+		where: {
+			workflowMappings: {
+				...(workflowId && { workflowId }),
+			},
+		},
+	});
 }
 
-export function parseTagNames(tags: string): string[] {
-	return tags.split(',').map((tag) => tag.trim());
+export async function updateTags(workflowId: string, newTags: string[]): Promise<any> {
+	await Db.transaction(async (transactionManager) => {
+		const oldTags = await Container.get(WorkflowTagMappingRepository).findBy({
+			workflowId,
+		});
+		if (oldTags.length > 0) {
+			await transactionManager.delete(WorkflowTagMapping, oldTags);
+		}
+		await transactionManager.insert(
+			WorkflowTagMapping,
+			newTags.map((tagId) => ({ tagId, workflowId })),
+		);
+	});
 }
diff --git a/packages/cli/src/PublicApi/v1/openapi.yml b/packages/cli/src/PublicApi/v1/openapi.yml
index 216ae07521173..9d8249983511c 100644
--- a/packages/cli/src/PublicApi/v1/openapi.yml
+++ b/packages/cli/src/PublicApi/v1/openapi.yml
@@ -9,13 +9,15 @@ info:
   license:
     name: Sustainable Use License
     url: https://github.com/n8n-io/n8n/blob/master/packages/cli/LICENSE.md
-  version: 1.1.0
+  version: 1.1.1
 externalDocs:
   description: n8n API documentation
   url: https://docs.n8n.io/api/
 servers:
   - url: /api/v1
 tags:
+  - name: User
+    description: Operations about users
   - name: Audit
     description: Operations about security audit
   - name: Execution
@@ -24,6 +26,10 @@ tags:
     description: Operations about workflows
   - name: Credential
     description: Operations about credentials
+  - name: Tags
+    description: Operations about tags
+  - name: SourceControl
+    description: Operations about source control
 
 paths:
   /audit:
@@ -38,6 +44,10 @@ paths:
     $ref: './handlers/executions/spec/paths/executions.yml'
   /executions/{id}:
     $ref: './handlers/executions/spec/paths/executions.id.yml'
+  /tags:
+    $ref: './handlers/tags/spec/paths/tags.yml'
+  /tags/{id}:
+    $ref: './handlers/tags/spec/paths/tags.id.yml'
   /workflows:
     $ref: './handlers/workflows/spec/paths/workflows.yml'
   /workflows/{id}:
@@ -46,6 +56,14 @@ paths:
     $ref: './handlers/workflows/spec/paths/workflows.id.activate.yml'
   /workflows/{id}/deactivate:
     $ref: './handlers/workflows/spec/paths/workflows.id.deactivate.yml'
+  /workflows/{id}/tags:
+    $ref: './handlers/workflows/spec/paths/workflows.id.tags.yml'
+  /users:
+    $ref: './handlers/users/spec/paths/users.yml'
+  /users/{id}:
+    $ref: './handlers/users/spec/paths/users.id.yml'
+  /source-control/pull:
+    $ref: './handlers/sourceControl/spec/paths/sourceControl.yml'
 components:
   schemas:
     $ref: './shared/spec/schemas/_index.yml'
diff --git a/packages/cli/src/PublicApi/v1/shared/middlewares/global.middleware.ts b/packages/cli/src/PublicApi/v1/shared/middlewares/global.middleware.ts
index 1fe122e8f6af3..6baf96607e094 100644
--- a/packages/cli/src/PublicApi/v1/shared/middlewares/global.middleware.ts
+++ b/packages/cli/src/PublicApi/v1/shared/middlewares/global.middleware.ts
@@ -1,20 +1,24 @@
 /* eslint-disable @typescript-eslint/no-invalid-void-type */
-
 import type express from 'express';
+import { Container } from 'typedi';
+
+import { License } from '@/License';
+import type { GlobalRole } from '@db/entities/User';
+import type { AuthenticatedRequest } from '@/requests';
 
-import type { AuthenticatedRequest, PaginatedRequest } from '../../../types';
+import type { PaginatedRequest } from '../../../types';
 import { decodeCursor } from '../services/pagination.service';
 
+const UNLIMITED_USERS_QUOTA = -1;
+
 export const authorize =
-	(authorizedRoles: readonly string[]) =>
+	(authorizedRoles: readonly GlobalRole[]) =>
 	(
 		req: AuthenticatedRequest,
 		res: express.Response,
 		next: express.NextFunction,
 	): express.Response | void => {
-		const { name } = req.user.globalRole;
-
-		if (!authorizedRoles.includes(name)) {
+		if (!authorizedRoles.includes(req.user.role)) {
 			return res.status(403).json({ message: 'Forbidden' });
 		}
 
@@ -46,3 +50,18 @@ export const validCursor = (
 
 	return next();
 };
+
+export const validLicenseWithUserQuota = (
+	_: express.Request,
+	res: express.Response,
+	next: express.NextFunction,
+): express.Response | void => {
+	const license = Container.get(License);
+	if (license.getUsersLimit() !== UNLIMITED_USERS_QUOTA) {
+		return res.status(403).json({
+			message: '/users path can only be used with a valid license. See https://n8n.io/pricing/',
+		});
+	}
+
+	return next();
+};
diff --git a/packages/cli/src/PublicApi/v1/shared/spec/parameters/_index.yml b/packages/cli/src/PublicApi/v1/shared/spec/parameters/_index.yml
index b994cdc8725ec..c11178a7ae8db 100644
--- a/packages/cli/src/PublicApi/v1/shared/spec/parameters/_index.yml
+++ b/packages/cli/src/PublicApi/v1/shared/spec/parameters/_index.yml
@@ -6,5 +6,11 @@ ExecutionId:
   $ref: '../../../handlers/executions/spec/schemas/parameters/executionId.yml'
 WorkflowId:
   $ref: '../../../handlers/workflows/spec/schemas/parameters/workflowId.yml'
+TagId:
+  $ref: '../../../handlers/tags/spec/schemas/parameters/tagId.yml'
 IncludeData:
   $ref: '../../../handlers/executions/spec/schemas/parameters/includeData.yml'
+UserIdentifier:
+  $ref: '../../../handlers/users/spec/schemas/parameters/userIdentifier.yml'
+IncludeRole:
+  $ref: '../../../handlers/users/spec/schemas/parameters/includeRole.yml'
diff --git a/packages/cli/src/PublicApi/v1/shared/spec/parameters/cursor.yml b/packages/cli/src/PublicApi/v1/shared/spec/parameters/cursor.yml
index a7fcc012a3460..1854713e6ba42 100644
--- a/packages/cli/src/PublicApi/v1/shared/spec/parameters/cursor.yml
+++ b/packages/cli/src/PublicApi/v1/shared/spec/parameters/cursor.yml
@@ -1,6 +1,6 @@
 name: cursor
 in: query
-description: Paginate through users by setting the cursor parameter to a nextCursor attribute returned by a previous request's response. Default value fetches the first "page" of the collection. See pagination for more detail.
+description: Paginate by setting the cursor parameter to the nextCursor attribute returned by the previous request's response. Default value fetches the first "page" of the collection. See pagination for more detail.
 required: false
 style: form
 schema:
diff --git a/packages/cli/src/PublicApi/v1/shared/spec/responses/_index.yml b/packages/cli/src/PublicApi/v1/shared/spec/responses/_index.yml
index 1d02bb8156aec..f7894f665ef6c 100644
--- a/packages/cli/src/PublicApi/v1/shared/spec/responses/_index.yml
+++ b/packages/cli/src/PublicApi/v1/shared/spec/responses/_index.yml
@@ -4,3 +4,7 @@ Unauthorized:
   $ref: './unauthorized.yml'
 BadRequest:
   $ref: './badRequest.yml'
+Conflict:
+  $ref: './conflict.yml'
+Forbidden:
+  $ref: './forbidden.yml'
diff --git a/packages/cli/src/PublicApi/v1/shared/spec/responses/conflict.yml b/packages/cli/src/PublicApi/v1/shared/spec/responses/conflict.yml
new file mode 100644
index 0000000000000..3399c0afe52fa
--- /dev/null
+++ b/packages/cli/src/PublicApi/v1/shared/spec/responses/conflict.yml
@@ -0,0 +1 @@
+description: Conflict
diff --git a/packages/cli/src/PublicApi/v1/shared/spec/responses/forbidden.yml b/packages/cli/src/PublicApi/v1/shared/spec/responses/forbidden.yml
new file mode 100644
index 0000000000000..d977831a01f0c
--- /dev/null
+++ b/packages/cli/src/PublicApi/v1/shared/spec/responses/forbidden.yml
@@ -0,0 +1 @@
+description: Forbidden
diff --git a/packages/cli/src/PublicApi/v1/shared/spec/schemas/_index.yml b/packages/cli/src/PublicApi/v1/shared/spec/schemas/_index.yml
index d3c3d128dc298..270bd060706b0 100644
--- a/packages/cli/src/PublicApi/v1/shared/spec/schemas/_index.yml
+++ b/packages/cli/src/PublicApi/v1/shared/spec/schemas/_index.yml
@@ -1,11 +1,13 @@
 Error:
   $ref: './error.yml'
+Role:
+  $ref: './../../../handlers/users/spec/schemas/role.yml'
 Execution:
   $ref: './../../../handlers/executions/spec/schemas/execution.yml'
 Node:
   $ref: './../../../handlers/workflows/spec/schemas/node.yml'
 Tag:
-  $ref: './../../../handlers/workflows/spec/schemas/tag.yml'
+  $ref: './../../../handlers/tags/spec/schemas/tag.yml'
 Workflow:
   $ref: './../../../handlers/workflows/spec/schemas/workflow.yml'
 WorkflowSettings:
@@ -20,3 +22,11 @@ CredentialType:
   $ref: './../../../handlers/credentials/spec/schemas/credentialType.yml'
 Audit:
   $ref: './../../../handlers/audit/spec/schemas/audit.yml'
+Pull:
+  $ref: './../../../handlers/sourceControl/spec/schemas/pull.yml'
+ImportResult:
+  $ref: './../../../handlers/sourceControl/spec/schemas/importResult.yml'
+UserList:
+  $ref: './../../../handlers/users/spec/schemas/userList.yml'
+User:
+  $ref: './../../../handlers/users/spec/schemas/user.yml'
diff --git a/packages/cli/src/Queue.ts b/packages/cli/src/Queue.ts
index 1bd7fb5fcf4c0..e524aed0495fa 100644
--- a/packages/cli/src/Queue.ts
+++ b/packages/cli/src/Queue.ts
@@ -1,10 +1,21 @@
 import type Bull from 'bull';
-import type { RedisOptions } from 'ioredis';
 import { Service } from 'typedi';
-import type { IExecuteResponsePromiseData } from 'n8n-workflow';
-import config from '@/config';
+import {
+	ApplicationError,
+	type ExecutionError,
+	type IExecuteResponsePromiseData,
+} from 'n8n-workflow';
 import { ActiveExecutions } from '@/ActiveExecutions';
-import * as WebhookHelpers from '@/WebhookHelpers';
+import { decodeWebhookResponse } from '@/helpers/decodeWebhookResponse';
+
+import {
+	getRedisClusterClient,
+	getRedisClusterNodes,
+	getRedisPrefix,
+	getRedisStandardClient,
+} from './services/redis/RedisServiceHelper';
+import type { RedisClientType } from './services/redis/RedisServiceBaseClasses';
+import config from '@/config';
 
 export type JobId = Bull.JobId;
 export type Job = Bull.Job<JobData>;
@@ -17,6 +28,7 @@ export interface JobData {
 
 export interface JobResponse {
 	success: boolean;
+	error?: ExecutionError;
 }
 
 export interface WebhookResponse {
@@ -31,42 +43,65 @@ export class Queue {
 	constructor(private activeExecutions: ActiveExecutions) {}
 
 	async init() {
-		const prefix = config.getEnv('queue.bull.prefix');
-		const redisOptions: RedisOptions = config.getEnv('queue.bull.redis');
+		const bullPrefix = config.getEnv('queue.bull.prefix');
+		const prefix = getRedisPrefix(bullPrefix);
+		const clusterNodes = getRedisClusterNodes();
+		const usesRedisCluster = clusterNodes.length > 0;
 
-		// eslint-disable-next-line @typescript-eslint/naming-convention
 		const { default: Bull } = await import('bull');
 
+		const { default: Redis } = await import('ioredis');
 		// Disabling ready check is necessary as it allows worker to
 		// quickly reconnect to Redis if Redis crashes or is unreachable
 		// for some time. With it enabled, worker might take minutes to realize
 		// redis is back up and resume working.
 		// More here: https://github.com/OptimalBits/bull/issues/890
-		// @ts-ignore
-		this.jobQueue = new Bull('jobs', { prefix, redis: redisOptions, enableReadyCheck: false });
+		this.jobQueue = new Bull('jobs', {
+			prefix,
+			settings: config.get('queue.bull.settings'),
+			createClient: (type, clientConfig) =>
+				usesRedisCluster
+					? getRedisClusterClient(Redis, clientConfig, (type + '(bull)') as RedisClientType)
+					: getRedisStandardClient(Redis, clientConfig, (type + '(bull)') as RedisClientType),
+		});
 
 		this.jobQueue.on('global:progress', (jobId, progress: WebhookResponse) => {
 			this.activeExecutions.resolveResponsePromise(
-				// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 				progress.executionId,
-				WebhookHelpers.decodeWebhookResponse(progress.response),
+				decodeWebhookResponse(progress.response),
 			);
 		});
 	}
 
 	async add(jobData: JobData, jobOptions: object): Promise<Job> {
-		return this.jobQueue.add(jobData, jobOptions);
+		return await this.jobQueue.add(jobData, jobOptions);
 	}
 
 	async getJob(jobId: JobId): Promise<Job | null> {
-		return this.jobQueue.getJob(jobId);
+		return await this.jobQueue.getJob(jobId);
 	}
 
 	async getJobs(jobTypes: Bull.JobStatus[]): Promise<Job[]> {
-		return this.jobQueue.getJobs(jobTypes);
+		return await this.jobQueue.getJobs(jobTypes);
+	}
+
+	async process(concurrency: number, fn: Bull.ProcessCallbackFunction<JobData>): Promise<void> {
+		return await this.jobQueue.process(concurrency, fn);
+	}
+
+	async ping(): Promise<string> {
+		return await this.jobQueue.client.ping();
+	}
+
+	async pause(isLocal?: boolean): Promise<void> {
+		return await this.jobQueue.pause(isLocal);
 	}
 
 	getBullObjectInstance(): JobQueue {
+		if (this.jobQueue === undefined) {
+			// if queue is not initialized yet throw an error, since we do not want to hand around an undefined queue
+			throw new ApplicationError('Queue is not initialized yet!');
+		}
 		return this.jobQueue;
 	}
 
diff --git a/packages/cli/src/ReloadNodesAndCredentials.ts b/packages/cli/src/ReloadNodesAndCredentials.ts
deleted file mode 100644
index 9abc08c7f4bfe..0000000000000
--- a/packages/cli/src/ReloadNodesAndCredentials.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import path from 'path';
-import { realpath, access } from 'fs/promises';
-
-import type { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
-import type { NodeTypes } from '@/NodeTypes';
-import type { Push } from '@/push';
-
-export const reloadNodesAndCredentials = async (
-	loadNodesAndCredentials: LoadNodesAndCredentials,
-	nodeTypes: NodeTypes,
-	push: Push,
-) => {
-	// eslint-disable-next-line import/no-extraneous-dependencies
-	const { default: debounce } = await import('lodash.debounce');
-	// eslint-disable-next-line import/no-extraneous-dependencies
-	const { watch } = await import('chokidar');
-
-	Object.values(loadNodesAndCredentials.loaders).forEach(async (loader) => {
-		try {
-			await access(loader.directory);
-		} catch {
-			// If directory doesn't exist, there is nothing to watch
-			return;
-		}
-
-		const realModulePath = path.join(await realpath(loader.directory), path.sep);
-		const reloader = debounce(async () => {
-			const modulesToUnload = Object.keys(require.cache).filter((filePath) =>
-				filePath.startsWith(realModulePath),
-			);
-			modulesToUnload.forEach((filePath) => {
-				delete require.cache[filePath];
-			});
-
-			loader.reset();
-			await loader.loadAll();
-			await loadNodesAndCredentials.postProcessLoaders();
-			await loadNodesAndCredentials.generateTypesForFrontend();
-			nodeTypes.applySpecialNodeParameters();
-			push.send('nodeDescriptionUpdated', undefined);
-		}, 100);
-
-		const toWatch = loader.isLazyLoaded
-			? ['**/nodes.json', '**/credentials.json']
-			: ['**/*.js', '**/*.json'];
-		watch(toWatch, { cwd: realModulePath }).on('change', reloader);
-	});
-};
diff --git a/packages/cli/src/ResponseHelper.ts b/packages/cli/src/ResponseHelper.ts
index f69349de26f12..aa4f05fe0a76f 100644
--- a/packages/cli/src/ResponseHelper.ts
+++ b/packages/cli/src/ResponseHelper.ts
@@ -1,102 +1,19 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-/* eslint-disable no-console */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
-/* eslint-disable no-param-reassign */
-/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 import type { Request, Response } from 'express';
-import { parse, stringify } from 'flatted';
 import picocolors from 'picocolors';
-import { ErrorReporterProxy as ErrorReporter, NodeApiError } from 'n8n-workflow';
-
-import type {
-	IExecutionDb,
-	IExecutionFlatted,
-	IExecutionFlattedDb,
-	IExecutionResponse,
-	IWorkflowDb,
-} from '@/Interfaces';
-import { inDevelopment } from '@/constants';
-
-/**
- * Special Error which allows to return also an error code and http status code
- */
-abstract class ResponseError extends Error {
-	/**
-	 * Creates an instance of ResponseError.
-	 * Must be used inside a block with `ResponseHelper.send()`.
-	 */
-	constructor(
-		message: string,
-		// The HTTP status code of  response
-		readonly httpStatusCode: number,
-		// The error code in the response
-		readonly errorCode: number = httpStatusCode,
-		// The error hint the response
-		readonly hint: string | undefined = undefined,
-	) {
-		super(message);
-		this.name = 'ResponseError';
-	}
-}
-
-export class BadRequestError extends ResponseError {
-	constructor(message: string, errorCode?: number) {
-		super(message, 400, errorCode);
-	}
-}
-
-export class AuthError extends ResponseError {
-	constructor(message: string) {
-		super(message, 401);
-	}
-}
-
-export class UnauthorizedError extends ResponseError {
-	constructor(message: string, hint: string | undefined = undefined) {
-		super(message, 403, 403, hint);
-	}
-}
-
-export class NotFoundError extends ResponseError {
-	constructor(message: string, hint: string | undefined = undefined) {
-		super(message, 404, 404, hint);
-	}
-}
-
-export class ConflictError extends ResponseError {
-	constructor(message: string, hint: string | undefined = undefined) {
-		super(message, 409, 409, hint);
-	}
-}
-
-export class UnprocessableRequestError extends ResponseError {
-	constructor(message: string) {
-		super(message, 422);
-	}
-}
-
-export class InternalServerError extends ResponseError {
-	constructor(message: string, errorCode = 500) {
-		super(message, 500, errorCode);
-	}
-}
-
-export class ServiceUnavailableError extends ResponseError {
-	constructor(message: string, errorCode = 503) {
-		super(message, 503, errorCode);
-	}
-}
-
-export function basicAuthAuthorizationError(resp: Response, realm: string, message?: string) {
-	resp.statusCode = 401;
-	resp.setHeader('WWW-Authenticate', `Basic realm="${realm}"`);
-	resp.json({ code: resp.statusCode, message });
-}
+import {
+	ErrorReporterProxy as ErrorReporter,
+	FORM_TRIGGER_PATH_IDENTIFIER,
+	NodeApiError,
+} from 'n8n-workflow';
+import { Readable } from 'node:stream';
+import { stringify } from 'flatted';
 
-export function jwtAuthAuthorizationError(resp: Response, message?: string) {
-	resp.statusCode = 403;
-	resp.json({ code: resp.statusCode, message });
-}
+import { inDevelopment } from '@/constants';
+import type { IExecutionDb, IExecutionFlatted, IExecutionResponse } from '@/Interfaces';
+import { ResponseError } from './errors/response-errors/abstract/response.error';
+import Container from 'typedi';
+import { Logger } from './Logger';
 
 export function sendSuccessResponse(
 	res: Response,
@@ -113,6 +30,11 @@ export function sendSuccessResponse(
 		res.header(responseHeader);
 	}
 
+	if (data instanceof Readable) {
+		data.pipe(res);
+		return;
+	}
+
 	if (raw === true) {
 		if (typeof data === 'string') {
 			res.send(data);
@@ -126,6 +48,28 @@ export function sendSuccessResponse(
 	}
 }
 
+/**
+ * Checks if the given error is a ResponseError. It can be either an
+ * instance of ResponseError or an error which has the same properties.
+ * The latter case is for external hooks.
+ */
+function isResponseError(error: Error): error is ResponseError {
+	if (error instanceof ResponseError) {
+		return true;
+	}
+
+	if (error instanceof Error) {
+		return (
+			'httpStatusCode' in error &&
+			typeof error.httpStatusCode === 'number' &&
+			'errorCode' in error &&
+			typeof error.errorCode === 'number'
+		);
+	}
+
+	return false;
+}
+
 interface ErrorResponse {
 	code: number;
 	message: string;
@@ -141,9 +85,23 @@ export function sendErrorResponse(res: Response, error: Error) {
 		message: error.message ?? 'Unknown error',
 	};
 
-	if (error instanceof ResponseError) {
+	if (isResponseError(error)) {
 		if (inDevelopment) {
-			console.error(picocolors.red(error.httpStatusCode), error.message);
+			Container.get(Logger).error(picocolors.red([error.httpStatusCode, error.message].join(' ')));
+		}
+
+		//render custom 404 page for form triggers
+		const { originalUrl } = res.req;
+		if (error.errorCode === 404 && originalUrl) {
+			const basePath = originalUrl.split('/')[1];
+			const isLegacyFormTrigger = originalUrl.includes(FORM_TRIGGER_PATH_IDENTIFIER);
+			const isFormTrigger = basePath.includes('form');
+
+			if (isFormTrigger || isLegacyFormTrigger) {
+				const isTestWebhook = basePath.includes('test');
+				res.status(404);
+				return res.render('form-trigger-404', { isTestWebhook });
+			}
 		}
 
 		httpStatusCode = error.httpStatusCode;
@@ -158,7 +116,7 @@ export function sendErrorResponse(res: Response, error: Error) {
 
 	if (error instanceof NodeApiError) {
 		if (inDevelopment) {
-			console.error(picocolors.red(error.name), error.message);
+			Container.get(Logger).error([picocolors.red(error.name), error.message].join(' '));
 		}
 
 		Object.assign(response, error);
@@ -171,9 +129,15 @@ export function sendErrorResponse(res: Response, error: Error) {
 	res.status(httpStatusCode).json(response);
 }
 
-const isUniqueConstraintError = (error: Error) =>
+export const isUniqueConstraintError = (error: Error) =>
 	['unique', 'duplicate'].some((s) => error.message.toLowerCase().includes(s));
 
+export function reportError(error: Error) {
+	if (!(error instanceof ResponseError) || error.httpStatusCode > 404) {
+		ErrorReporter.error(error);
+	}
+}
+
 /**
  * A helper function which does not just allow to return Promises it also makes sure that
  * all the responses have the same format
@@ -193,9 +157,7 @@ export function send<T, R extends Request, S extends Response>(
 			if (!res.headersSent) sendSuccessResponse(res, data, raw);
 		} catch (error) {
 			if (error instanceof Error) {
-				if (!(error instanceof ResponseError) || error.httpStatusCode > 404) {
-					ErrorReporter.error(error);
-				}
+				reportError(error);
 
 				if (isUniqueConstraintError(error)) {
 					error.message = 'There is already an entry with this name';
@@ -208,6 +170,16 @@ export function send<T, R extends Request, S extends Response>(
 	};
 }
 
+export const flattenObject = (obj: { [x: string]: any }, prefix = '') =>
+	Object.keys(obj).reduce((acc, k) => {
+		const pre = prefix.length ? prefix + '.' : '';
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+		if (typeof obj[k] === 'object') Object.assign(acc, flattenObject(obj[k], pre + k));
+		//@ts-ignore
+		else acc[pre + k] = obj[k];
+		return acc;
+	}, {});
+
 /**
  * Flattens the Execution data.
  * As it contains a lot of references which normally would be saved as duplicate data
@@ -215,19 +187,19 @@ export function send<T, R extends Request, S extends Response>(
  *
  * @param {IExecutionDb} fullExecutionData The data to flatten
  */
-export function flattenExecutionData(fullExecutionData: IExecutionDb): IExecutionFlatted {
+export function flattenExecutionData(fullExecutionData: IExecutionDb): IExecutionResponse {
 	// Flatten the data
-	const returnData: IExecutionFlatted = {
-		data: stringify(fullExecutionData.data),
+	const returnData: IExecutionResponse = {
+		id: fullExecutionData.id,
+		data: fullExecutionData.data,
 		mode: fullExecutionData.mode,
-		// @ts-ignore
 		waitTill: fullExecutionData.waitTill,
 		startedAt: fullExecutionData.startedAt,
 		stoppedAt: fullExecutionData.stoppedAt,
 		finished: fullExecutionData.finished ? fullExecutionData.finished : false,
 		workflowId: fullExecutionData.workflowId,
 		// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-		workflowData: fullExecutionData.workflowData!,
+		workflowData: fullExecutionData.workflowData,
 		status: fullExecutionData.status,
 	};
 
@@ -245,35 +217,3 @@ export function flattenExecutionData(fullExecutionData: IExecutionDb): IExecutio
 
 	return returnData;
 }
-
-/**
- * Unflattens the Execution data.
- *
- * @param {IExecutionFlattedDb} fullExecutionData The data to unflatten
- */
-export function unflattenExecutionData(fullExecutionData: IExecutionFlattedDb): IExecutionResponse {
-	const returnData: IExecutionResponse = {
-		id: fullExecutionData.id,
-		workflowData: fullExecutionData.workflowData as IWorkflowDb,
-		data: parse(fullExecutionData.data),
-		mode: fullExecutionData.mode,
-		waitTill: fullExecutionData.waitTill ? fullExecutionData.waitTill : undefined,
-		startedAt: fullExecutionData.startedAt,
-		stoppedAt: fullExecutionData.stoppedAt,
-		finished: fullExecutionData.finished ? fullExecutionData.finished : false,
-		workflowId: fullExecutionData.workflowId,
-		status: fullExecutionData.status,
-	};
-
-	return returnData;
-}
-
-export const flattenObject = (obj: { [x: string]: any }, prefix = '') =>
-	Object.keys(obj).reduce((acc, k) => {
-		const pre = prefix.length ? prefix + '.' : '';
-		// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-		if (typeof obj[k] === 'object') Object.assign(acc, flattenObject(obj[k], pre + k));
-		//@ts-ignore
-		else acc[pre + k] = obj[k];
-		return acc;
-	}, {});
diff --git a/packages/cli/src/SecretsHelpers.ts b/packages/cli/src/SecretsHelpers.ts
new file mode 100644
index 0000000000000..8555adb36eaac
--- /dev/null
+++ b/packages/cli/src/SecretsHelpers.ts
@@ -0,0 +1,41 @@
+import type { SecretsHelpersBase } from 'n8n-workflow';
+import { Service } from 'typedi';
+import { ExternalSecretsManager } from './ExternalSecrets/ExternalSecretsManager.ee';
+
+@Service()
+export class SecretsHelper implements SecretsHelpersBase {
+	constructor(private service: ExternalSecretsManager) {}
+
+	async update() {
+		if (!this.service.initialized) {
+			await this.service.init();
+		}
+		await this.service.updateSecrets();
+	}
+
+	async waitForInit() {
+		if (!this.service.initialized) {
+			await this.service.init();
+		}
+	}
+
+	getSecret(provider: string, name: string) {
+		return this.service.getSecret(provider, name);
+	}
+
+	hasSecret(provider: string, name: string): boolean {
+		return this.service.hasSecret(provider, name);
+	}
+
+	hasProvider(provider: string): boolean {
+		return this.service.hasProvider(provider);
+	}
+
+	listProviders(): string[] {
+		return this.service.getProviderNames() ?? [];
+	}
+
+	listSecrets(provider: string): string[] {
+		return this.service.getSecretNames(provider) ?? [];
+	}
+}
diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts
index ca9f8c90f8b41..de2657c4a0510 100644
--- a/packages/cli/src/Server.ts
+++ b/packages/cli/src/Server.ts
@@ -1,558 +1,247 @@
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
-/* eslint-disable @typescript-eslint/no-unnecessary-boolean-literal-compare */
-/* eslint-disable @typescript-eslint/no-unnecessary-type-assertion */
-/* eslint-disable prefer-const */
-/* eslint-disable @typescript-eslint/no-invalid-void-type */
-/* eslint-disable @typescript-eslint/restrict-template-expressions */
-/* eslint-disable @typescript-eslint/no-var-requires */
 /* eslint-disable @typescript-eslint/no-shadow */
 /* eslint-disable @typescript-eslint/no-unsafe-return */
-/* eslint-disable @typescript-eslint/no-unused-vars */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
-import assert from 'assert';
+import { Container, Service } from 'typedi';
 import { exec as callbackExec } from 'child_process';
 import { access as fsAccess } from 'fs/promises';
-import os from 'os';
-import { join as pathJoin, resolve as pathResolve } from 'path';
-import { createHmac } from 'crypto';
 import { promisify } from 'util';
 import cookieParser from 'cookie-parser';
 import express from 'express';
-import { engine as expressHandlebars } from 'express-handlebars';
-import type { ServeStaticOptions } from 'serve-static';
-import type { FindManyOptions } from 'typeorm';
-import { Not, In } from 'typeorm';
-import type { AxiosRequestConfig } from 'axios';
-import axios from 'axios';
-import type { RequestOptions } from 'oauth-1.0a';
-import clientOAuth1 from 'oauth-1.0a';
-
-import {
-	BinaryDataManager,
-	Credentials,
-	LoadNodeParameterOptions,
-	LoadNodeListSearch,
-	UserSettings,
-	FileNotFoundError,
-} from 'n8n-core';
-
-import type {
-	INodeCredentials,
-	INodeCredentialsDetails,
-	INodeListSearchResult,
-	INodeParameters,
-	INodePropertyOptions,
-	INodeTypeNameVersion,
-	ITelemetrySettings,
-	WorkflowExecuteMode,
-	ICredentialTypes,
-	ExecutionStatus,
-	IExecutionsSummary,
-	IN8nUISettings,
-} from 'n8n-workflow';
-import { LoggerProxy, jsonParse } from 'n8n-workflow';
+import helmet from 'helmet';
+import { type Class, InstanceSettings } from 'n8n-core';
+import type { IN8nUISettings } from 'n8n-workflow';
 
 // @ts-ignore
 import timezones from 'google-timezones-json';
-import history from 'connect-history-api-fallback';
 
 import config from '@/config';
 import { Queue } from '@/Queue';
-import { getSharedWorkflowIds } from '@/WorkflowHelpers';
 
-import { workflowsController } from '@/workflows/workflows.controller';
-import {
-	EDITOR_UI_DIST_DIR,
-	GENERATED_STATIC_DIR,
-	SWAGGER_DIR,
-	inDevelopment,
-	N8N_VERSION,
-	RESPONSE_ERROR_MESSAGES,
-	TEMPLATES_DIR,
-} from '@/constants';
-import { credentialsController } from '@/credentials/credentials.controller';
-import { oauth2CredentialController } from '@/credentials/oauth2Credential.api';
-import type {
-	BinaryDataRequest,
-	CurlHelper,
-	ExecutionRequest,
-	NodeListSearchRequest,
-	NodeParameterOptionsRequest,
-	OAuthRequest,
-	WorkflowRequest,
-} from '@/requests';
+import { WorkflowsController } from '@/workflows/workflows.controller';
+import { EDITOR_UI_DIST_DIR, inDevelopment, inE2ETests, N8N_VERSION, Time } from '@/constants';
+import { CredentialsController } from '@/credentials/credentials.controller';
+import type { APIRequest, CurlHelper } from '@/requests';
 import { registerController } from '@/decorators';
-import {
-	AuthController,
-	LdapController,
-	MeController,
-	NodesController,
-	NodeTypesController,
-	OwnerController,
-	PasswordResetController,
-	TagsController,
-	TranslationController,
-	UsersController,
-	SaveRequestLogController,
-} from '@/controllers';
-
-import { executionsController } from '@/executions/executions.controller';
-import { workflowStatsController } from '@/api/workflowStats.api';
-import { loadPublicApiVersions } from '@/PublicApi';
-import {
-	getInstanceBaseUrl,
-	isEmailSetUp,
-	isSharingEnabled,
-	isUserManagementEnabled,
-	whereClause,
-} from '@/UserManagement/UserManagementHelper';
-import { UserManagementMailer } from '@/UserManagement/email';
-import * as Db from '@/Db';
-import type {
-	ICredentialsDb,
-	ICredentialsOverwrite,
-	IDiagnosticInfo,
-	IExecutionFlattedDb,
-	IExecutionsStopData,
-} from '@/Interfaces';
-import { ActiveExecutions } from '@/ActiveExecutions';
-import {
-	CredentialsHelper,
-	getCredentialForUser,
-	getCredentialWithoutUser,
-} from '@/CredentialsHelper';
+import { AuthController } from '@/controllers/auth.controller';
+import { BinaryDataController } from '@/controllers/binaryData.controller';
+import { DynamicNodeParametersController } from '@/controllers/dynamicNodeParameters.controller';
+import { MeController } from '@/controllers/me.controller';
+import { MFAController } from '@/controllers/mfa.controller';
+import { NodeTypesController } from '@/controllers/nodeTypes.controller';
+import { OAuth1CredentialController } from '@/controllers/oauth/oAuth1Credential.controller';
+import { OAuth2CredentialController } from '@/controllers/oauth/oAuth2Credential.controller';
+import { OwnerController } from '@/controllers/owner.controller';
+import { PasswordResetController } from '@/controllers/passwordReset.controller';
+import { TagsController } from '@/controllers/tags.controller';
+import { TranslationController } from '@/controllers/translation.controller';
+import { UsersController } from '@/controllers/users.controller';
+import { WorkflowStatisticsController } from '@/controllers/workflowStatistics.controller';
+import { ExternalSecretsController } from '@/ExternalSecrets/ExternalSecrets.controller.ee';
+import { ExecutionsController } from '@/executions/executions.controller';
+import { isApiEnabled, loadPublicApiVersions } from '@/PublicApi';
+import type { ICredentialsOverwrite } from '@/Interfaces';
 import { CredentialsOverwrites } from '@/CredentialsOverwrites';
-import { CredentialTypes } from '@/CredentialTypes';
 import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
-import { NodeTypes } from '@/NodeTypes';
 import * as ResponseHelper from '@/ResponseHelper';
-import { WaitTracker } from '@/WaitTracker';
-import * as WebhookHelpers from '@/WebhookHelpers';
-import * as WorkflowExecuteAdditionalData from '@/WorkflowExecuteAdditionalData';
 import { toHttpNodeParameters } from '@/CurlConverterHelper';
 import { EventBusController } from '@/eventbus/eventBus.controller';
-import { isLogStreamingEnabled } from '@/eventbus/MessageEventBus/MessageEventBusHelper';
-import { licenseController } from './license/license.controller';
-import { Push, setupPushServer, setupPushHandler } from '@/push';
-import { setupAuthMiddlewares } from './middlewares';
-import { initEvents } from './events';
-import {
-	getLdapLoginLabel,
-	handleLdapInit,
-	isLdapEnabled,
-	isLdapLoginEnabled,
-} from './Ldap/helpers';
+import { EventBusControllerEE } from '@/eventbus/eventBus.controller.ee';
+import { LicenseController } from '@/license/license.controller';
+import { setupPushServer, setupPushHandler } from '@/push';
+import { isLdapEnabled } from './Ldap/helpers';
 import { AbstractServer } from './AbstractServer';
-import { configureMetrics } from './metrics';
-import { setupBasicAuth } from './middlewares/basicAuth';
-import { setupExternalJWTAuth } from './middlewares/externalJWTAuth';
 import { PostHogClient } from './posthog';
-import { eventBus } from './eventbus';
-import { Container } from 'typedi';
+import { MessageEventBus } from '@/eventbus/MessageEventBus/MessageEventBus';
 import { InternalHooks } from './InternalHooks';
-import {
-	getStatusUsingPreviousExecutionStatusMethod,
-	isAdvancedExecutionFiltersEnabled,
-} from './executions/executionHelpers';
-import { getSamlLoginLabel, isSamlLoginEnabled, isSamlLicensed } from './sso/saml/samlHelpers';
 import { SamlController } from './sso/saml/routes/saml.controller.ee';
 import { SamlService } from './sso/saml/saml.service.ee';
-import { variablesController } from './environments/variables/variables.controller';
-import { LdapManager } from './Ldap/LdapManager.ee';
-import { getVariablesLimit, isVariablesEnabled } from '@/environments/variables/enviromentHelpers';
-import { getCurrentAuthenticationMethod } from './sso/ssoHelpers';
-import { isVersionControlLicensed } from '@/environments/versionControl/versionControlHelper';
-import { VersionControlService } from '@/environments/versionControl/versionControl.service.ee';
-import { VersionControlController } from '@/environments/versionControl/versionControl.controller.ee';
-import { setupReusablesAndRoutes } from './reusables';
+import { VariablesController } from './environments/variables/variables.controller.ee';
+import { SourceControlService } from '@/environments/sourceControl/sourceControl.service.ee';
+import { SourceControlController } from '@/environments/sourceControl/sourceControl.controller.ee';
+import { AIController } from '@/controllers/ai.controller';
+
+import { handleMfaDisable, isMfaFeatureEnabled } from './Mfa/helpers';
+import type { FrontendService } from './services/frontend.service';
+import { ActiveWorkflowsController } from './controllers/activeWorkflows.controller';
+import { OrchestrationController } from './controllers/orchestration.controller';
+import { WorkflowTestsController } from './workflowTests/workflowTests.controller';
+import { WorkflowHistoryController } from './workflows/workflowHistory/workflowHistory.controller.ee';
+import { InvitationController } from './controllers/invitation.controller';
+// import { CollaborationService } from './collaboration/collaboration.service';
+import { BadRequestError } from './errors/response-errors/bad-request.error';
+import { OrchestrationService } from '@/services/orchestration.service';
 
 const exec = promisify(callbackExec);
 
-class Server extends AbstractServer {
-	endpointPresetCredentials: string;
-
-	waitTracker: WaitTracker;
-
-	activeExecutionsInstance: ActiveExecutions;
+@Service()
+export class Server extends AbstractServer {
+	private endpointPresetCredentials: string;
 
-	frontendSettings: IN8nUISettings;
+	private presetCredentialsLoaded: boolean;
 
-	presetCredentialsLoaded: boolean;
+	private loadNodesAndCredentials: LoadNodesAndCredentials;
 
-	loadNodesAndCredentials: LoadNodesAndCredentials;
-
-	nodeTypes: NodeTypes;
-
-	credentialTypes: ICredentialTypes;
-
-	postHog: PostHogClient;
-
-	push: Push;
+	private frontendService?: FrontendService;
 
 	constructor() {
-		super();
+		super('main');
 
-		this.app.engine('handlebars', expressHandlebars({ defaultLayout: false }));
-		this.app.set('view engine', 'handlebars');
-		this.app.set('views', TEMPLATES_DIR);
+		this.testWebhooksEnabled = true;
+		this.webhooksEnabled = !config.getEnv('endpoints.disableProductionWebhooksOnMainProcess');
+	}
 
+	async start() {
 		this.loadNodesAndCredentials = Container.get(LoadNodesAndCredentials);
-		this.credentialTypes = Container.get(CredentialTypes);
-		this.nodeTypes = Container.get(NodeTypes);
 
-		this.activeExecutionsInstance = Container.get(ActiveExecutions);
-		this.waitTracker = Container.get(WaitTracker);
-		this.postHog = Container.get(PostHogClient);
+		if (!config.getEnv('endpoints.disableUi')) {
+			// eslint-disable-next-line @typescript-eslint/no-var-requires
+			this.frontendService = Container.get(require('@/services/frontend.service').FrontendService);
+		}
 
 		this.presetCredentialsLoaded = false;
 		this.endpointPresetCredentials = config.getEnv('credentials.overwrite.endpoint');
 
-		this.push = Container.get(Push);
-
-		if (process.env.E2E_TESTS === 'true') {
-			this.app.use('/e2e', require('./api/e2e.api').e2eController);
-		}
-
-		const urlBaseWebhook = WebhookHelpers.getWebhookBaseUrl();
-		const telemetrySettings: ITelemetrySettings = {
-			enabled: config.getEnv('diagnostics.enabled'),
-		};
+		await super.start();
+		this.logger.debug(`Server ID: ${this.uniqueInstanceId}`);
 
-		if (telemetrySettings.enabled) {
-			const conf = config.getEnv('diagnostics.config.frontend');
-			const [key, url] = conf.split(';');
-
-			if (!key || !url) {
-				LoggerProxy.warn('Diagnostics frontend config is invalid');
-				telemetrySettings.enabled = false;
-			}
-
-			telemetrySettings.config = { key, url };
+		if (inDevelopment && process.env.N8N_DEV_RELOAD === 'true') {
+			void this.loadNodesAndCredentials.setupHotReload();
 		}
 
-		// Define it here to avoid calling the function multiple times
-		const instanceBaseUrl = getInstanceBaseUrl();
-
-		this.frontendSettings = {
-			endpointWebhook: this.endpointWebhook,
-			endpointWebhookTest: this.endpointWebhookTest,
-			saveDataErrorExecution: config.getEnv('executions.saveDataOnError'),
-			saveDataSuccessExecution: config.getEnv('executions.saveDataOnSuccess'),
-			saveManualExecutions: config.getEnv('executions.saveDataManualExecutions'),
-			executionTimeout: config.getEnv('executions.timeout'),
-			maxExecutionTimeout: config.getEnv('executions.maxTimeout'),
-			workflowCallerPolicyDefaultOption: config.getEnv('workflows.callerPolicyDefaultOption'),
-			timezone: this.timezone,
-			urlBaseWebhook,
-			urlBaseEditor: instanceBaseUrl,
-			versionCli: '',
-			oauthCallbackUrls: {
-				oauth1: `${instanceBaseUrl}/${this.restEndpoint}/oauth1-credential/callback`,
-				oauth2: `${instanceBaseUrl}/${this.restEndpoint}/oauth2-credential/callback`,
-			},
-			versionNotifications: {
-				enabled: config.getEnv('versionNotifications.enabled'),
-				endpoint: config.getEnv('versionNotifications.endpoint'),
-				infoUrl: config.getEnv('versionNotifications.infoUrl'),
-			},
-			instanceId: '',
-			telemetry: telemetrySettings,
-			posthog: {
-				enabled: config.getEnv('diagnostics.enabled'),
-				apiHost: config.getEnv('diagnostics.config.posthog.apiHost'),
-				apiKey: config.getEnv('diagnostics.config.posthog.apiKey'),
-				autocapture: false,
-				disableSessionRecording: config.getEnv(
-					'diagnostics.config.posthog.disableSessionRecording',
-				),
-				debug: config.getEnv('logs.level') === 'debug',
-			},
-			personalizationSurveyEnabled:
-				config.getEnv('personalization.enabled') && config.getEnv('diagnostics.enabled'),
-			userActivationSurveyEnabled:
-				config.getEnv('userActivationSurvey.enabled') && config.getEnv('diagnostics.enabled'),
-			defaultLocale: config.getEnv('defaultLocale'),
-			userManagement: {
-				enabled: isUserManagementEnabled(),
-				showSetupOnFirstLoad:
-					config.getEnv('userManagement.disabled') === false &&
-					config.getEnv('userManagement.isInstanceOwnerSetUp') === false &&
-					config.getEnv('userManagement.skipInstanceOwnerSetup') === false,
-				smtpSetup: isEmailSetUp(),
-				authenticationMethod: getCurrentAuthenticationMethod(),
-			},
-			sso: {
-				saml: {
-					loginEnabled: false,
-					loginLabel: '',
-				},
-				ldap: {
-					loginEnabled: false,
-					loginLabel: '',
-				},
-			},
-			publicApi: {
-				enabled: !config.getEnv('publicApi.disabled'),
-				latestVersion: 1,
-				path: config.getEnv('publicApi.path'),
-				swaggerUi: {
-					enabled: !config.getEnv('publicApi.swaggerUi.disabled'),
-				},
-			},
-			workflowTagsDisabled: config.getEnv('workflowTagsDisabled'),
-			logLevel: config.getEnv('logs.level'),
-			hiringBannerEnabled: config.getEnv('hiringBanner.enabled'),
-			templates: {
-				enabled: config.getEnv('templates.enabled'),
-				host: config.getEnv('templates.host'),
-			},
-			onboardingCallPromptEnabled: config.getEnv('onboardingCallPrompt.enabled'),
-			executionMode: config.getEnv('executions.mode'),
-			pushBackend: config.getEnv('push.backend'),
-			communityNodesEnabled: config.getEnv('nodes.communityPackages.enabled'),
-			deployment: {
-				type: config.getEnv('deployment.type'),
-			},
-			isNpmAvailable: false,
-			allowedModules: {
-				builtIn: process.env.NODE_FUNCTION_ALLOW_BUILTIN?.split(',') ?? undefined,
-				external: process.env.NODE_FUNCTION_ALLOW_EXTERNAL?.split(',') ?? undefined,
-			},
-			enterprise: {
-				sharing: false,
-				ldap: false,
-				saml: false,
-				logStreaming: false,
-				advancedExecutionFilters: false,
-				variables: false,
-				versionControl: false,
-			},
-			hideUsagePage: config.getEnv('hideUsagePage'),
-			license: {
-				environment: config.getEnv('license.tenantId') === 1 ? 'production' : 'staging',
-			},
-			variables: {
-				limit: 0,
-			},
-		};
+		void Container.get(InternalHooks).onServerStarted();
+		// Container.get(CollaborationService);
 	}
 
-	/**
-	 * Returns the current settings for the frontend
-	 */
-	getSettingsForFrontend(): IN8nUISettings {
-		// refresh user management status
-		Object.assign(this.frontendSettings.userManagement, {
-			enabled: isUserManagementEnabled(),
-			authenticationMethod: getCurrentAuthenticationMethod(),
-			showSetupOnFirstLoad:
-				config.getEnv('userManagement.disabled') === false &&
-				config.getEnv('userManagement.isInstanceOwnerSetUp') === false &&
-				config.getEnv('userManagement.skipInstanceOwnerSetup') === false &&
-				config.getEnv('deployment.type').startsWith('desktop_') === false,
-		});
+	private async registerControllers() {
+		const { app } = this;
+
+		const controllers: Array<Class<object>> = [
+			EventBusController,
+			EventBusControllerEE,
+			AuthController,
+			LicenseController,
+			OAuth1CredentialController,
+			OAuth2CredentialController,
+			OwnerController,
+			MeController,
+			DynamicNodeParametersController,
+			NodeTypesController,
+			PasswordResetController,
+			TagsController,
+			TranslationController,
+			UsersController,
+			SamlController,
+			SourceControlController,
+			WorkflowStatisticsController,
+			ExternalSecretsController,
+			OrchestrationController,
+			WorkflowHistoryController,
+			BinaryDataController,
+			VariablesController,
+			InvitationController,
+			VariablesController,
+			ActiveWorkflowsController,
+			WorkflowsController,
+			ExecutionsController,
+			CredentialsController,
+			AIController,
+			WorkflowTestsController,
+		];
 
-		// refresh enterprise status
-		Object.assign(this.frontendSettings.enterprise, {
-			sharing: isSharingEnabled(),
-			logStreaming: isLogStreamingEnabled(),
-			ldap: isLdapEnabled(),
-			saml: isSamlLicensed(),
-			advancedExecutionFilters: isAdvancedExecutionFiltersEnabled(),
-			variables: isVariablesEnabled(),
-			versionControl: isVersionControlLicensed(),
-		});
+		if (
+			process.env.NODE_ENV !== 'production' &&
+			Container.get(OrchestrationService).isMultiMainSetupEnabled
+		) {
+			const { DebugController } = await import('@/controllers/debug.controller');
+			controllers.push(DebugController);
+		}
 
 		if (isLdapEnabled()) {
-			Object.assign(this.frontendSettings.sso.ldap, {
-				loginLabel: getLdapLoginLabel(),
-				loginEnabled: isLdapLoginEnabled(),
-			});
+			const { LdapService } = await import('@/Ldap/ldap.service');
+			const { LdapController } = await require('@/Ldap/ldap.controller');
+			await Container.get(LdapService).init();
+			controllers.push(LdapController);
 		}
 
-		if (isSamlLicensed()) {
-			Object.assign(this.frontendSettings.sso.saml, {
-				loginLabel: getSamlLoginLabel(),
-				loginEnabled: isSamlLoginEnabled(),
-			});
+		if (config.getEnv('nodes.communityPackages.enabled')) {
+			const { CommunityPackagesController } = await import(
+				'@/controllers/communityPackages.controller'
+			);
+			controllers.push(CommunityPackagesController);
 		}
 
-		if (isVariablesEnabled()) {
-			this.frontendSettings.variables.limit = getVariablesLimit();
+		if (inE2ETests) {
+			const { E2EController } = await import('./controllers/e2e.controller');
+			controllers.push(E2EController);
 		}
 
-		if (config.get('nodes.packagesMissing').length > 0) {
-			this.frontendSettings.missingPackages = true;
+		if (isMfaFeatureEnabled()) {
+			controllers.push(MFAController);
 		}
-		return this.frontendSettings;
-	}
-
-	private registerControllers(ignoredEndpoints: Readonly<string[]>) {
-		const { app, externalHooks, activeWorkflowRunner, nodeTypes } = this;
-		const repositories = Db.collections;
-		setupAuthMiddlewares(app, ignoredEndpoints, this.restEndpoint, repositories.User);
-
-		const logger = LoggerProxy;
-		const internalHooks = Container.get(InternalHooks);
-		const mailer = Container.get(UserManagementMailer);
-		const postHog = this.postHog;
-		const samlService = Container.get(SamlService);
-		const versionControlService = Container.get(VersionControlService);
-
-		const controllers: object[] = [
-			new EventBusController(),
-			new AuthController({ config, internalHooks, repositories, logger, postHog }),
-			new OwnerController({ config, internalHooks, repositories, logger }),
-			new MeController({ externalHooks, internalHooks, repositories, logger }),
-			new NodeTypesController({ config, nodeTypes }),
-			new PasswordResetController({
-				config,
-				externalHooks,
-				internalHooks,
-				mailer,
-				repositories,
-				logger,
-			}),
-			new TagsController({ config, repositories, externalHooks }),
-			new TranslationController(config, this.credentialTypes),
-			new UsersController({
-				config,
-				mailer,
-				externalHooks,
-				internalHooks,
-				repositories,
-				activeWorkflowRunner,
-				logger,
-				postHog,
-			}),
-			new SamlController(samlService),
-			new VersionControlController(versionControlService),
-			new SaveRequestLogController({ logger, repositories }),
-		];
 
-		if (isLdapEnabled()) {
-			const { service, sync } = LdapManager.getInstance();
-			controllers.push(new LdapController(service, sync, internalHooks));
-		}
-
-		if (config.getEnv('nodes.communityPackages.enabled')) {
-			controllers.push(
-				new NodesController(config, this.loadNodesAndCredentials, this.push, internalHooks),
-			);
+		if (!config.getEnv('endpoints.disableUi')) {
+			const { CtaController } = await import('@/controllers/cta.controller');
+			controllers.push(CtaController);
 		}
 
-		controllers.forEach((controller) => registerController(app, config, controller));
+		controllers.forEach((controller) => registerController(app, controller));
 	}
 
 	async configure(): Promise<void> {
-		configureMetrics(this.app);
-
-		this.instanceId = await UserSettings.getInstanceId();
-
-		this.frontendSettings.isNpmAvailable = await exec('npm --version')
-			.then(() => true)
-			.catch(() => false);
-
-		this.frontendSettings.versionCli = N8N_VERSION;
-
-		this.frontendSettings.instanceId = this.instanceId;
-
-		await this.externalHooks.run('frontend.settings', [this.frontendSettings]);
-
-		await this.postHog.init(this.frontendSettings.instanceId);
-
-		const publicApiEndpoint = config.getEnv('publicApi.path');
-		const excludeEndpoints = config.getEnv('security.excludeEndpoints');
-
-		const ignoredEndpoints: Readonly<string[]> = [
-			'assets',
-			'healthz',
-			'metrics',
-			'e2e',
-			this.endpointWebhook,
-			this.endpointWebhookTest,
-			this.endpointPresetCredentials,
-			config.getEnv('publicApi.disabled') ? publicApiEndpoint : '',
-			...excludeEndpoints.split(':'),
-		].filter((u) => !!u);
-
-		assert(
-			!ignoredEndpoints.includes(this.restEndpoint),
-			`REST endpoint cannot be set to any of these values: ${ignoredEndpoints.join()} `,
-		);
+		if (config.getEnv('endpoints.metrics.enable')) {
+			const { MetricsService } = await import('@/services/metrics.service');
+			await Container.get(MetricsService).configureMetrics(this.app);
+		}
 
-		// eslint-disable-next-line no-useless-escape
-		const authIgnoreRegex = new RegExp(`^\/(${ignoredEndpoints.join('|')})\/?.*$`);
+		const { frontendService } = this;
+		if (frontendService) {
+			frontendService.addToSettings({
+				isNpmAvailable: await exec('npm --version')
+					.then(() => true)
+					.catch(() => false),
+				versionCli: N8N_VERSION,
+			});
 
-		// Check for basic auth credentials if activated
-		if (config.getEnv('security.basicAuth.active')) {
-			await setupBasicAuth(this.app, config, authIgnoreRegex);
+			await this.externalHooks.run('frontend.settings', [frontendService.getSettings()]);
 		}
 
-		// Check for and validate JWT if configured
-		if (config.getEnv('security.jwtAuth.active')) {
-			await setupExternalJWTAuth(this.app, config, authIgnoreRegex);
-		}
+		await Container.get(PostHogClient).init();
 
-		// ----------------------------------------
-		// Route for Swagger editor assets
-		// ----------------------------------------
-		this.app.use('/deep-consulting-swagger', express.static(SWAGGER_DIR));
+		const publicApiEndpoint = config.getEnv('publicApi.path');
 
 		// ----------------------------------------
 		// Public API
 		// ----------------------------------------
 
-		if (!config.getEnv('publicApi.disabled')) {
+		if (isApiEnabled()) {
 			const { apiRouters, apiLatestVersion } = await loadPublicApiVersions(publicApiEndpoint);
 			this.app.use(...apiRouters);
-			this.frontendSettings.publicApi.latestVersion = apiLatestVersion;
+			if (frontendService) {
+				frontendService.settings.publicApi.latestVersion = apiLatestVersion;
+			}
 		}
+
+		// Extract BrowserId from headers
+		this.app.use((req: APIRequest, _, next) => {
+			req.browserId = req.headers['browser-id'] as string;
+			next();
+		});
+
 		// Parse cookies for easier access
 		this.app.use(cookieParser());
 
 		const { restEndpoint, app } = this;
-		setupPushHandler(restEndpoint, app, isUserManagementEnabled());
-
-		// Make sure that Vue history mode works properly
-		this.app.use(
-			history({
-				rewrites: [
-					{
-						from: new RegExp(`^/(${[this.restEndpoint, ...ignoredEndpoints].join('|')})/?.*$`),
-						to: (context) => {
-							return context.parsedUrl.pathname!.toString();
-						},
-					},
-				],
-			}),
-		);
+		setupPushHandler(restEndpoint, app);
 
 		if (config.getEnv('executions.mode') === 'queue') {
 			await Container.get(Queue).init();
 		}
 
-		await handleLdapInit();
+		await handleMfaDisable();
 
-		this.registerControllers(ignoredEndpoints);
-
-		this.app.use(`/${this.restEndpoint}/credentials`, credentialsController);
-
-		// ----------------------------------------
-		// Workflow
-		// ----------------------------------------
-		this.app.use(`/${this.restEndpoint}/workflows`, workflowsController);
-
-		// ----------------------------------------
-		// License
-		// ----------------------------------------
-		this.app.use(`/${this.restEndpoint}/license`, licenseController);
-
-		// ----------------------------------------
-		// Workflow Statistics
-		// ----------------------------------------
-		this.app.use(`/${this.restEndpoint}/workflow-stats`, workflowStatsController);
+		await this.registerControllers();
 
 		// ----------------------------------------
 		// SAML
@@ -563,663 +252,32 @@ class Server extends AbstractServer {
 		try {
 			await Container.get(SamlService).init();
 		} catch (error) {
-			LoggerProxy.warn(`SAML initialization failed: ${error.message}`);
+			this.logger.warn(`SAML initialization failed: ${error.message}`);
 		}
 
 		// ----------------------------------------
-		// Variables
+		// Source Control
 		// ----------------------------------------
-
-		this.app.use(`/${this.restEndpoint}/variables`, variablesController);
-
-		// ----------------------------------------
-		// Version Control
-		// ----------------------------------------
-
-		// initialize SamlService if it is licensed, even if not enabled, to
-		// set up the initial environment
 		try {
-			await Container.get(VersionControlService).init();
+			await Container.get(SourceControlService).init();
 		} catch (error) {
-			LoggerProxy.warn(`Version Control initialization failed: ${error.message}`);
+			this.logger.warn(`Source Control initialization failed: ${error.message}`);
 		}
 
-		// ----------------------------------------
-
-		// Returns parameter values which normally get loaded from an external API or
-		// get generated dynamically
-		this.app.get(
-			`/${this.restEndpoint}/node-parameter-options`,
-			ResponseHelper.send(
-				async (req: NodeParameterOptionsRequest): Promise<INodePropertyOptions[]> => {
-					const nodeTypeAndVersion = jsonParse(
-						req.query.nodeTypeAndVersion,
-					) as INodeTypeNameVersion;
-
-					const { path, methodName } = req.query;
-
-					const currentNodeParameters = jsonParse(
-						req.query.currentNodeParameters,
-					) as INodeParameters;
-
-					let credentials: INodeCredentials | undefined;
-
-					if (req.query.credentials) {
-						credentials = jsonParse(req.query.credentials);
-					}
-
-					const loadDataInstance = new LoadNodeParameterOptions(
-						nodeTypeAndVersion,
-						this.nodeTypes,
-						path,
-						currentNodeParameters,
-						credentials,
-					);
-
-					const additionalData = await WorkflowExecuteAdditionalData.getBase(
-						req.user.id,
-						currentNodeParameters,
-					);
-
-					if (methodName) {
-						return loadDataInstance.getOptionsViaMethodName(methodName, additionalData);
-					}
-					// @ts-ignore
-					if (req.query.loadOptions) {
-						return loadDataInstance.getOptionsViaRequestProperty(
-							// @ts-ignore
-							jsonParse(req.query.loadOptions as string),
-							additionalData,
-						);
-					}
-
-					return [];
-				},
-			),
-		);
-
-		// Returns parameter values which normally get loaded from an external API or
-		// get generated dynamically
-		this.app.get(
-			`/${this.restEndpoint}/nodes-list-search`,
-			ResponseHelper.send(
-				async (
-					req: NodeListSearchRequest,
-					res: express.Response,
-				): Promise<INodeListSearchResult | undefined> => {
-					const nodeTypeAndVersion = jsonParse(
-						req.query.nodeTypeAndVersion,
-					) as INodeTypeNameVersion;
-
-					const { path, methodName } = req.query;
-
-					if (!req.query.currentNodeParameters) {
-						throw new ResponseHelper.BadRequestError(
-							'Parameter currentNodeParameters is required.',
-						);
-					}
-
-					const currentNodeParameters = jsonParse(
-						req.query.currentNodeParameters,
-					) as INodeParameters;
-
-					let credentials: INodeCredentials | undefined;
-
-					if (req.query.credentials) {
-						credentials = jsonParse(req.query.credentials);
-					}
-
-					const listSearchInstance = new LoadNodeListSearch(
-						nodeTypeAndVersion,
-						this.nodeTypes,
-						path,
-						currentNodeParameters,
-						credentials,
-					);
-
-					const additionalData = await WorkflowExecuteAdditionalData.getBase(
-						req.user.id,
-						currentNodeParameters,
-					);
-
-					if (methodName) {
-						return listSearchInstance.getOptionsViaMethodName(
-							methodName,
-							additionalData,
-							req.query.filter,
-							req.query.paginationToken,
-						);
-					}
-
-					throw new ResponseHelper.BadRequestError('Parameter methodName is required.');
-				},
-			),
-		);
-
-		// ----------------------------------------
-		// Active Workflows
-		// ----------------------------------------
-
-		// Returns the active workflow ids
-		this.app.get(
-			`/${this.restEndpoint}/active`,
-			ResponseHelper.send(async (req: WorkflowRequest.GetAllActive) => {
-				const activeWorkflows = await this.activeWorkflowRunner.getActiveWorkflows(req.user);
-				return activeWorkflows.map(({ id }) => id);
-			}),
-		);
-
-		// Returns if the workflow with the given id had any activation errors
-		this.app.get(
-			`/${this.restEndpoint}/active/error/:id`,
-			ResponseHelper.send(async (req: WorkflowRequest.GetAllActivationErrors) => {
-				const { id: workflowId } = req.params;
-
-				const shared =
-					process.env.ONLY_OWNER_OR_ADMIN_CAN_ACCESS_WORKFLOW === 'true'
-						? await Db.collections.SharedWorkflow.findOne({
-								relations: ['workflow'],
-								where: whereClause({
-									user: req.user,
-									entityType: 'workflow',
-									entityId: workflowId,
-								}),
-						  })
-						: await Db.collections.SharedWorkflow.findOne({
-								relations: ['workflow'],
-								where: { ['workflow']: { id: workflowId } },
-						  });
-
-				if (!shared) {
-					// eslint-disable-next-line @typescript-eslint/no-unsafe-call
-					LoggerProxy.verbose('User attempted to access workflow errors without permissions', {
-						workflowId,
-						userId: req.user.id,
-					});
-
-					throw new ResponseHelper.BadRequestError(
-						`Workflow with ID "${workflowId}" could not be found.`,
-					);
-				}
-
-				return this.activeWorkflowRunner.getActivationError(workflowId);
-			}),
-		);
-
 		// ----------------------------------------
 		// curl-converter
 		// ----------------------------------------
 		this.app.post(
 			`/${this.restEndpoint}/curl-to-json`,
-			ResponseHelper.send(
-				async (
-					req: CurlHelper.ToJson,
-					res: express.Response,
-				): Promise<{ [key: string]: string }> => {
-					const curlCommand = req.body.curlCommand ?? '';
-
-					try {
-						const parameters = toHttpNodeParameters(curlCommand);
-						return ResponseHelper.flattenObject(parameters, 'parameters');
-					} catch (e) {
-						throw new ResponseHelper.BadRequestError('Invalid cURL command');
-					}
-				},
-			),
-		);
-
-		// ----------------------------------------
-		// OAuth1-Credential/Auth
-		// ----------------------------------------
-
-		// Authorize OAuth Data
-		this.app.get(
-			`/${this.restEndpoint}/oauth1-credential/auth`,
-			ResponseHelper.send(async (req: OAuthRequest.OAuth1Credential.Auth): Promise<string> => {
-				const { id: credentialId } = req.query;
-
-				if (!credentialId) {
-					LoggerProxy.error('OAuth1 credential authorization failed due to missing credential ID');
-					throw new ResponseHelper.BadRequestError('Required credential ID is missing');
-				}
-
-				const credential = await getCredentialForUser(credentialId, req.user);
-
-				if (!credential) {
-					LoggerProxy.error(
-						'OAuth1 credential authorization failed because the current user does not have the correct permissions',
-						{ userId: req.user.id },
-					);
-					throw new ResponseHelper.NotFoundError(RESPONSE_ERROR_MESSAGES.NO_CREDENTIAL);
-				}
-
-				let encryptionKey: string;
-				try {
-					encryptionKey = await UserSettings.getEncryptionKey();
-				} catch (error) {
-					throw new ResponseHelper.InternalServerError(error.message);
-				}
-
-				const mode: WorkflowExecuteMode = 'internal';
-				const timezone = config.getEnv('generic.timezone');
-				const credentialsHelper = new CredentialsHelper(encryptionKey);
-				const decryptedDataOriginal = await credentialsHelper.getDecrypted(
-					credential as INodeCredentialsDetails,
-					credential.type,
-					mode,
-					timezone,
-					true,
-				);
-
-				const oauthCredentials = credentialsHelper.applyDefaultsAndOverwrites(
-					decryptedDataOriginal,
-					credential.type,
-					mode,
-					timezone,
-				);
-
-				const signatureMethod = oauthCredentials.signatureMethod as string;
-
-				const oAuthOptions: clientOAuth1.Options = {
-					consumer: {
-						key: oauthCredentials.consumerKey as string,
-						secret: oauthCredentials.consumerSecret as string,
-					},
-					signature_method: signatureMethod,
-					// eslint-disable-next-line @typescript-eslint/naming-convention
-					hash_function(base, key) {
-						const algorithm = signatureMethod === 'HMAC-SHA1' ? 'sha1' : 'sha256';
-						return createHmac(algorithm, key).update(base).digest('base64');
-					},
-				};
+			ResponseHelper.send(async (req: CurlHelper.ToJson) => {
+				const curlCommand = req.body.curlCommand ?? '';
 
-				const oauthRequestData = {
-					oauth_callback: `${WebhookHelpers.getWebhookBaseUrl()}${
-						this.restEndpoint
-					}/oauth1-credential/callback?cid=${credentialId}`,
-				};
-
-				await this.externalHooks.run('oauth1.authenticate', [oAuthOptions, oauthRequestData]);
-
-				// eslint-disable-next-line new-cap
-				const oauth = new clientOAuth1(oAuthOptions);
-
-				const options: RequestOptions = {
-					method: 'POST',
-					url: oauthCredentials.requestTokenUrl as string,
-					data: oauthRequestData,
-				};
-
-				const data = oauth.toHeader(oauth.authorize(options));
-
-				// @ts-ignore
-				options.headers = data;
-
-				const { data: response } = await axios.request(options as Partial<AxiosRequestConfig>);
-
-				// Response comes as x-www-form-urlencoded string so convert it to JSON
-
-				const paramsParser = new URLSearchParams(response);
-
-				const responseJson = Object.fromEntries(paramsParser.entries());
-
-				const returnUri = `${oauthCredentials.authUrl}?oauth_token=${responseJson.oauth_token}`;
-
-				// Encrypt the data
-				const credentials = new Credentials(
-					credential as INodeCredentialsDetails,
-					credential.type,
-					credential.nodesAccess,
-				);
-
-				credentials.setData(decryptedDataOriginal, encryptionKey);
-				const newCredentialsData = credentials.getDataToSave() as unknown as ICredentialsDb;
-
-				// Add special database related data
-				newCredentialsData.updatedAt = new Date();
-
-				// Update the credentials in DB
-				await Db.collections.Credentials.update(credentialId, newCredentialsData);
-
-				LoggerProxy.verbose('OAuth1 authorization successful for new credential', {
-					userId: req.user.id,
-					credentialId,
-				});
-
-				return returnUri;
-			}),
-		);
-
-		// Verify and store app code. Generate access tokens and store for respective credential.
-		this.app.get(
-			`/${this.restEndpoint}/oauth1-credential/callback`,
-			async (req: OAuthRequest.OAuth1Credential.Callback, res: express.Response) => {
 				try {
-					const { oauth_verifier, oauth_token, cid: credentialId } = req.query;
-
-					if (!oauth_verifier || !oauth_token) {
-						const errorResponse = new ResponseHelper.ServiceUnavailableError(
-							`Insufficient parameters for OAuth1 callback. Received following query parameters: ${JSON.stringify(
-								req.query,
-							)}`,
-						);
-						LoggerProxy.error(
-							'OAuth1 callback failed because of insufficient parameters received',
-							{
-								userId: req.user?.id,
-								credentialId,
-							},
-						);
-						return ResponseHelper.sendErrorResponse(res, errorResponse);
-					}
-
-					const credential = await getCredentialWithoutUser(credentialId);
-
-					if (!credential) {
-						LoggerProxy.error('OAuth1 callback failed because of insufficient user permissions', {
-							userId: req.user?.id,
-							credentialId,
-						});
-						const errorResponse = new ResponseHelper.NotFoundError(
-							RESPONSE_ERROR_MESSAGES.NO_CREDENTIAL,
-						);
-						return ResponseHelper.sendErrorResponse(res, errorResponse);
-					}
-
-					let encryptionKey: string;
-					try {
-						encryptionKey = await UserSettings.getEncryptionKey();
-					} catch (error) {
-						throw new ResponseHelper.InternalServerError(error.message);
-					}
-
-					const mode: WorkflowExecuteMode = 'internal';
-					const timezone = config.getEnv('generic.timezone');
-					const credentialsHelper = new CredentialsHelper(encryptionKey);
-					const decryptedDataOriginal = await credentialsHelper.getDecrypted(
-						credential as INodeCredentialsDetails,
-						credential.type,
-						mode,
-						timezone,
-						true,
-					);
-					const oauthCredentials = credentialsHelper.applyDefaultsAndOverwrites(
-						decryptedDataOriginal,
-						credential.type,
-						mode,
-						timezone,
-					);
-
-					const options: AxiosRequestConfig = {
-						method: 'POST',
-						url: oauthCredentials.accessTokenUrl as string,
-						params: {
-							oauth_token,
-							oauth_verifier,
-						},
-					};
-
-					let oauthToken;
-
-					try {
-						oauthToken = await axios.request(options);
-					} catch (error) {
-						LoggerProxy.error('Unable to fetch tokens for OAuth1 callback', {
-							userId: req.user?.id,
-							credentialId,
-						});
-						const errorResponse = new ResponseHelper.NotFoundError('Unable to get access tokens!');
-						return ResponseHelper.sendErrorResponse(res, errorResponse);
-					}
-
-					// Response comes as x-www-form-urlencoded string so convert it to JSON
-
-					const paramParser = new URLSearchParams(oauthToken.data);
-
-					const oauthTokenJson = Object.fromEntries(paramParser.entries());
-
-					decryptedDataOriginal.oauthTokenData = oauthTokenJson;
-
-					const credentials = new Credentials(
-						credential as INodeCredentialsDetails,
-						credential.type,
-						credential.nodesAccess,
-					);
-					credentials.setData(decryptedDataOriginal, encryptionKey);
-					const newCredentialsData = credentials.getDataToSave() as unknown as ICredentialsDb;
-					// Add special database related data
-					newCredentialsData.updatedAt = new Date();
-					// Save the credentials in DB
-					await Db.collections.Credentials.update(credentialId, newCredentialsData);
-
-					LoggerProxy.verbose('OAuth1 callback successful for new credential', {
-						userId: req.user?.id,
-						credentialId,
-					});
-					res.sendFile(pathResolve(TEMPLATES_DIR, 'oauth-callback.html'));
-				} catch (error) {
-					LoggerProxy.error('OAuth1 callback failed because of insufficient user permissions', {
-						userId: req.user?.id,
-						credentialId: req.query.cid,
-					});
-					// Error response
-					return ResponseHelper.sendErrorResponse(res, error);
+					const parameters = toHttpNodeParameters(curlCommand);
+					return ResponseHelper.flattenObject(parameters, 'parameters');
+				} catch (e) {
+					throw new BadRequestError('Invalid cURL command');
 				}
-			},
-		);
-
-		// ----------------------------------------
-		// OAuth2-Credential
-		// ----------------------------------------
-
-		this.app.use(`/${this.restEndpoint}/oauth2-credential`, oauth2CredentialController);
-
-		// ----------------------------------------
-		// Executions
-		// ----------------------------------------
-
-		this.app.use(`/${this.restEndpoint}/executions`, executionsController);
-
-		// ----------------------------------------
-		// Executing Workflows
-		// ----------------------------------------
-
-		// Returns all the currently working executions
-		this.app.get(
-			`/${this.restEndpoint}/executions-current`,
-			ResponseHelper.send(
-				async (req: ExecutionRequest.GetAllCurrent): Promise<IExecutionsSummary[]> => {
-					if (config.getEnv('executions.mode') === 'queue') {
-						const queue = Container.get(Queue);
-						const currentJobs = await queue.getJobs(['active', 'waiting']);
-
-						const currentlyRunningQueueIds = currentJobs.map((job) => job.data.executionId);
-
-						const currentlyRunningManualExecutions =
-							this.activeExecutionsInstance.getActiveExecutions();
-						const manualExecutionIds = currentlyRunningManualExecutions.map(
-							(execution) => execution.id,
-						);
-
-						const currentlyRunningExecutionIds =
-							currentlyRunningQueueIds.concat(manualExecutionIds);
-
-						if (!currentlyRunningExecutionIds.length) return [];
-
-						const findOptions: FindManyOptions<IExecutionFlattedDb> = {
-							select: ['id', 'workflowId', 'mode', 'retryOf', 'startedAt', 'stoppedAt', 'status'],
-							order: { id: 'DESC' },
-							where: {
-								id: In(currentlyRunningExecutionIds),
-								status: Not(In(['finished', 'stopped', 'failed', 'crashed'] as ExecutionStatus[])),
-							},
-						};
-
-						const sharedWorkflowIds = await getSharedWorkflowIds(req.user);
-
-						if (!sharedWorkflowIds.length) return [];
-
-						if (req.query.filter) {
-							const { workflowId, status, finished } = jsonParse<any>(req.query.filter);
-							if (workflowId && sharedWorkflowIds.includes(workflowId)) {
-								Object.assign(findOptions.where!, { workflowId });
-							}
-							if (status) {
-								Object.assign(findOptions.where!, { status: In(status) });
-							}
-							if (finished) {
-								Object.assign(findOptions.where!, { finished });
-							}
-						} else {
-							Object.assign(findOptions.where!, { workflowId: In(sharedWorkflowIds) });
-						}
-
-						const executions = await Db.collections.Execution.find(findOptions);
-
-						if (!executions.length) return [];
-
-						return executions.map((execution) => {
-							if (!execution.status) {
-								execution.status = getStatusUsingPreviousExecutionStatusMethod(execution);
-							}
-							return {
-								id: execution.id,
-								workflowId: execution.workflowId,
-								mode: execution.mode,
-								retryOf: execution.retryOf !== null ? execution.retryOf : undefined,
-								startedAt: new Date(execution.startedAt),
-								status: execution.status ?? null,
-								stoppedAt: execution.stoppedAt ?? null,
-							} as IExecutionsSummary;
-						});
-					}
-
-					const executingWorkflows = this.activeExecutionsInstance.getActiveExecutions();
-
-					const returnData: IExecutionsSummary[] = [];
-
-					const filter = req.query.filter ? jsonParse<any>(req.query.filter) : {};
-
-					const sharedWorkflowIds = await getSharedWorkflowIds(req.user);
-
-					for (const data of executingWorkflows) {
-						if (
-							(filter.workflowId !== undefined && filter.workflowId !== data.workflowId) ||
-							(data.workflowId !== undefined && !sharedWorkflowIds.includes(data.workflowId))
-						) {
-							continue;
-						}
-
-						returnData.push({
-							id: data.id,
-							workflowId: data.workflowId === undefined ? '' : data.workflowId,
-							mode: data.mode,
-							retryOf: data.retryOf,
-							startedAt: new Date(data.startedAt),
-							status: data.status,
-						});
-					}
-
-					returnData.sort((a, b) => Number(b.id) - Number(a.id));
-
-					return returnData;
-				},
-			),
-		);
-
-		// Forces the execution to stop
-		this.app.post(
-			`/${this.restEndpoint}/executions-current/:id/stop`,
-			ResponseHelper.send(async (req: ExecutionRequest.Stop): Promise<IExecutionsStopData> => {
-				const { id: executionId } = req.params;
-
-				const sharedWorkflowIds = await getSharedWorkflowIds(req.user);
-
-				if (!sharedWorkflowIds.length) {
-					throw new ResponseHelper.NotFoundError('Execution not found');
-				}
-
-				const execution = await Db.collections.Execution.findOne({
-					where: {
-						id: executionId,
-						workflowId: In(sharedWorkflowIds),
-					},
-				});
-
-				if (!execution) {
-					throw new ResponseHelper.NotFoundError('Execution not found');
-				}
-
-				if (config.getEnv('executions.mode') === 'queue') {
-					// Manual executions should still be stoppable, so
-					// try notifying the `activeExecutions` to stop it.
-					const result = await this.activeExecutionsInstance.stopExecution(req.params.id);
-
-					if (result === undefined) {
-						// If active execution could not be found check if it is a waiting one
-						try {
-							return await this.waitTracker.stopExecution(req.params.id);
-						} catch (error) {
-							// Ignore, if it errors as then it is probably a currently running
-							// execution
-						}
-					} else {
-						return {
-							mode: result.mode,
-							startedAt: new Date(result.startedAt),
-							stoppedAt: result.stoppedAt ? new Date(result.stoppedAt) : undefined,
-							finished: result.finished,
-							status: result.status,
-						} as IExecutionsStopData;
-					}
-
-					const queue = Container.get(Queue);
-					const currentJobs = await queue.getJobs(['active', 'waiting']);
-
-					const job = currentJobs.find((job) => job.data.executionId === req.params.id);
-
-					if (!job) {
-						throw new Error(`Could not stop "${req.params.id}" as it is no longer in queue.`);
-					} else {
-						await queue.stopJob(job);
-					}
-
-					const executionDb = (await Db.collections.Execution.findOneBy({
-						id: req.params.id,
-					})) as IExecutionFlattedDb;
-					const fullExecutionData = ResponseHelper.unflattenExecutionData(executionDb);
-
-					const returnData: IExecutionsStopData = {
-						mode: fullExecutionData.mode,
-						startedAt: new Date(fullExecutionData.startedAt),
-						stoppedAt: fullExecutionData.stoppedAt
-							? new Date(fullExecutionData.stoppedAt)
-							: undefined,
-						finished: fullExecutionData.finished,
-						status: fullExecutionData.status,
-					};
-
-					return returnData;
-				}
-
-				// Stop the execution and wait till it is done and we got the data
-				const result = await this.activeExecutionsInstance.stopExecution(executionId);
-
-				let returnData: IExecutionsStopData;
-				if (result === undefined) {
-					// If active execution could not be found check if it is a waiting one
-					returnData = await this.waitTracker.stopExecution(executionId);
-				} else {
-					returnData = {
-						mode: result.mode,
-						startedAt: new Date(result.startedAt),
-						stoppedAt: result.stoppedAt ? new Date(result.stoppedAt) : undefined,
-						finished: result.finished,
-						status: result.status,
-					};
-				}
-
-				return returnData;
 			}),
 		);
 
@@ -1230,79 +288,29 @@ class Server extends AbstractServer {
 		// Returns all the available timezones
 		this.app.get(
 			`/${this.restEndpoint}/options/timezones`,
-			ResponseHelper.send(async (req: express.Request, res: express.Response): Promise<object> => {
-				return timezones;
-			}),
-		);
-
-		// ----------------------------------------
-		// Binary data
-		// ----------------------------------------
-
-		// Download binary
-		this.app.get(
-			`/${this.restEndpoint}/data/:path`,
-			async (req: BinaryDataRequest, res: express.Response): Promise<void> => {
-				// TODO UM: check if this needs permission check for UM
-				const identifier = req.params.path;
-				const binaryDataManager = BinaryDataManager.getInstance();
-				try {
-					const binaryPath = binaryDataManager.getBinaryPath(identifier);
-					let { mode, fileName, mimeType } = req.query;
-					if (!fileName || !mimeType) {
-						try {
-							const metadata = await binaryDataManager.getBinaryMetadata(identifier);
-							fileName = metadata.fileName;
-							mimeType = metadata.mimeType;
-							res.setHeader('Content-Length', metadata.fileSize);
-						} catch {}
-					}
-					if (mimeType) res.setHeader('Content-Type', mimeType);
-					if (mode === 'download') {
-						res.setHeader('Content-Disposition', `attachment; filename="${fileName}"`);
-					}
-					res.sendFile(binaryPath);
-				} catch (error) {
-					if (error instanceof FileNotFoundError) res.writeHead(404).end();
-					else throw error;
-				}
-			},
+			ResponseHelper.send(async () => timezones),
 		);
 
 		// ----------------------------------------
 		// Settings
 		// ----------------------------------------
 
-		// Returns the current settings for the UI
-		this.app.get(
-			`/${this.restEndpoint}/settings`,
-			ResponseHelper.send(
-				async (req: express.Request, res: express.Response): Promise<IN8nUISettings> => {
-					void Container.get(InternalHooks).onFrontendSettingsAPI(req.headers.sessionid as string);
-
-					return this.getSettingsForFrontend();
-				},
-			),
-		);
-
-		// ----------------------------------------
-		// EventBus Setup
-		// ----------------------------------------
-
-		if (!eventBus.isInitialized) {
-			await eventBus.initialize();
+		if (frontendService) {
+			// Returns the current settings for the UI
+			this.app.get(
+				`/${this.restEndpoint}/settings`,
+				ResponseHelper.send(
+					async (req: express.Request): Promise<IN8nUISettings> =>
+						frontendService.getSettings(req.headers['push-ref'] as string),
+				),
+			);
 		}
 
 		// ----------------------------------------
-		// Webhooks
+		// EventBus Setup
 		// ----------------------------------------
-
-		if (!config.getEnv('endpoints.disableProductionWebhooksOnMainProcess')) {
-			this.setupWebhookEndpoint();
-			this.setupWaitingWebhookEndpoint();
-		}
-
-		this.setupTestWebhookEndpoint();
+		const eventBus = Container.get(MessageEventBus);
+		await eventBus.initialize();
 
 		if (this.endpointPresetCredentials !== '') {
 			// POST endpoint to set preset credentials
@@ -1312,7 +320,7 @@ class Server extends AbstractServer {
 					if (!this.presetCredentialsLoaded) {
 						const body = req.body as ICredentialsOverwrite;
 
-						if (req.headers['content-type'] !== 'application/json') {
+						if (req.contentType !== 'application/json') {
 							ResponseHelper.sendErrorResponse(
 								res,
 								new Error(
@@ -1322,9 +330,9 @@ class Server extends AbstractServer {
 							return;
 						}
 
-						CredentialsOverwrites().setData(body);
+						Container.get(CredentialsOverwrites).setData(body);
 
-						await this.loadNodesAndCredentials.generateTypesForFrontend();
+						await frontendService?.generateTypes();
 
 						this.presetCredentialsLoaded = true;
 
@@ -1336,53 +344,89 @@ class Server extends AbstractServer {
 			);
 		}
 
-		if (!config.getEnv('endpoints.disableUi')) {
-			const staticOptions: ServeStaticOptions = {
-				cacheControl: false,
-				setHeaders: (res: express.Response, path: string) => {
-					const isIndex = path === pathJoin(GENERATED_STATIC_DIR, 'index.html');
-					const cacheControl = isIndex
-						? 'no-cache, no-store, must-revalidate'
-						: 'max-age=86400, immutable';
-					res.header('Cache-Control', cacheControl);
-				},
-			};
-
+		const maxAge = Time.days.toMilliseconds;
+		const cacheOptions = inE2ETests || inDevelopment ? {} : { maxAge };
+		const { staticCacheDir } = Container.get(InstanceSettings);
+		if (frontendService) {
 			const serveIcons: express.RequestHandler = async (req, res) => {
+				// eslint-disable-next-line prefer-const
 				let { scope, packageName } = req.params;
 				if (scope) packageName = `@${scope}/${packageName}`;
-				const loader = this.loadNodesAndCredentials.loaders[packageName];
-				if (loader) {
-					const pathPrefix = `/icons/${packageName}/`;
-					const filePath = pathResolve(
-						loader.directory,
-						req.originalUrl.substring(pathPrefix.length),
-					);
+				const filePath = this.loadNodesAndCredentials.resolveIcon(packageName, req.originalUrl);
+				if (filePath) {
 					try {
 						await fsAccess(filePath);
-						return res.sendFile(filePath);
+						return res.sendFile(filePath, cacheOptions);
 					} catch {}
 				}
-
 				res.sendStatus(404);
 			};
 
 			this.app.use('/icons/@:scope/:packageName/*/*.(svg|png)', serveIcons);
 			this.app.use('/icons/:packageName/*/*.(svg|png)', serveIcons);
 
+			const isTLSEnabled = this.protocol === 'https' && !!(this.sslKey && this.sslCert);
+			const isPreviewMode = process.env.N8N_PREVIEW_MODE === 'true';
+			const securityHeadersMiddleware = helmet({
+				contentSecurityPolicy: false,
+				xFrameOptions: isPreviewMode || inE2ETests ? false : { action: 'sameorigin' },
+				dnsPrefetchControl: false,
+				// This is only relevant for Internet-explorer, which we do not support
+				ieNoOpen: false,
+				// This is already disabled in AbstractServer
+				xPoweredBy: false,
+				// Enable HSTS headers only when n8n handles TLS.
+				// if n8n is behind a reverse-proxy, then these headers needs to be configured there
+				strictTransportSecurity: isTLSEnabled
+					? {
+							maxAge: 180 * Time.days.toSeconds,
+							includeSubDomains: false,
+							preload: false,
+						}
+					: false,
+			});
+
+			// Route all UI urls to index.html to support history-api
+			const nonUIRoutes: Readonly<string[]> = [
+				'assets',
+				'types',
+				'healthz',
+				'metrics',
+				'e2e',
+				this.restEndpoint,
+				this.endpointPresetCredentials,
+				isApiEnabled() ? '' : publicApiEndpoint,
+				...config.getEnv('endpoints.additionalNonUIRoutes').split(':'),
+			].filter((u) => !!u);
+			const nonUIRoutesRegex = new RegExp(`^/(${nonUIRoutes.join('|')})/?.*$`);
+			const historyApiHandler: express.RequestHandler = (req, res, next) => {
+				const {
+					method,
+					headers: { accept },
+				} = req;
+				if (
+					method === 'GET' &&
+					accept &&
+					(accept.includes('text/html') || accept.includes('*/*')) &&
+					!nonUIRoutesRegex.test(req.path)
+				) {
+					res.setHeader('Cache-Control', 'no-cache, no-store, must-revalidate');
+					securityHeadersMiddleware(req, res, () => {
+						res.sendFile('index.html', { root: staticCacheDir, maxAge, lastModified: true });
+					});
+				} else {
+					next();
+				}
+			};
+
 			this.app.use(
 				'/',
-				express.static(GENERATED_STATIC_DIR),
-				express.static(EDITOR_UI_DIST_DIR, staticOptions),
+				express.static(staticCacheDir, cacheOptions),
+				express.static(EDITOR_UI_DIST_DIR, cacheOptions),
+				historyApiHandler,
 			);
-
-			const startTime = new Date().toUTCString();
-			this.app.use('/index.html', (req, res, next) => {
-				res.setHeader('Last-Modified', startTime);
-				next();
-			});
 		} else {
-			this.app.use('/', express.static(GENERATED_STATIC_DIR));
+			this.app.use('/', express.static(staticCacheDir, cacheOptions));
 		}
 	}
 
@@ -1391,68 +435,3 @@ class Server extends AbstractServer {
 		setupPushServer(restEndpoint, server, app);
 	}
 }
-
-export async function start(): Promise<void> {
-	const app = new Server();
-	await setupReusablesAndRoutes(app.app);
-
-	await app.start();
-
-	const cpus = os.cpus();
-	const binaryDataConfig = config.getEnv('binaryDataManager');
-	const diagnosticInfo: IDiagnosticInfo = {
-		basicAuthActive: config.getEnv('security.basicAuth.active'),
-		databaseType: config.getEnv('database.type'),
-		disableProductionWebhooksOnMainProcess: config.getEnv(
-			'endpoints.disableProductionWebhooksOnMainProcess',
-		),
-		notificationsEnabled: config.getEnv('versionNotifications.enabled'),
-		versionCli: N8N_VERSION,
-		systemInfo: {
-			os: {
-				type: os.type(),
-				version: os.version(),
-			},
-			memory: os.totalmem() / 1024,
-			cpus: {
-				count: cpus.length,
-				model: cpus[0].model,
-				speed: cpus[0].speed,
-			},
-		},
-		executionVariables: {
-			executions_process: config.getEnv('executions.process'),
-			executions_mode: config.getEnv('executions.mode'),
-			executions_timeout: config.getEnv('executions.timeout'),
-			executions_timeout_max: config.getEnv('executions.maxTimeout'),
-			executions_data_save_on_error: config.getEnv('executions.saveDataOnError'),
-			executions_data_save_on_success: config.getEnv('executions.saveDataOnSuccess'),
-			executions_data_save_on_progress: config.getEnv('executions.saveExecutionProgress'),
-			executions_data_save_manual_executions: config.getEnv('executions.saveDataManualExecutions'),
-			executions_data_prune: config.getEnv('executions.pruneData'),
-			executions_data_max_age: config.getEnv('executions.pruneDataMaxAge'),
-			executions_data_prune_timeout: config.getEnv('executions.pruneDataTimeout'),
-		},
-		deploymentType: config.getEnv('deployment.type'),
-		binaryDataMode: binaryDataConfig.mode,
-		n8n_multi_user_allowed: isUserManagementEnabled(),
-		smtp_set_up: config.getEnv('userManagement.emails.mode') === 'smtp',
-		ldap_allowed: isLdapEnabled(),
-	};
-
-	// Set up event handling
-	initEvents();
-
-	if (inDevelopment && process.env.N8N_DEV_RELOAD === 'true') {
-		const { reloadNodesAndCredentials } = await import('@/ReloadNodesAndCredentials');
-		await reloadNodesAndCredentials(app.loadNodesAndCredentials, app.nodeTypes, app.push);
-	}
-
-	void Db.collections.Workflow.findOne({
-		select: ['createdAt'],
-		order: { createdAt: 'ASC' },
-		where: {},
-	}).then(async (workflow) =>
-		Container.get(InternalHooks).onServerStarted(diagnosticInfo, workflow?.createdAt),
-	);
-}
diff --git a/packages/cli/src/TagHelpers.ts b/packages/cli/src/TagHelpers.ts
deleted file mode 100644
index b433149236d97..0000000000000
--- a/packages/cli/src/TagHelpers.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-import type { EntityManager } from 'typeorm';
-import { TagEntity } from '@db/entities/TagEntity';
-import type { ITagToImport, IWorkflowToImport } from '@/Interfaces';
-
-// ----------------------------------
-//              utils
-// ----------------------------------
-
-/**
- * Sort tags based on the order of the tag IDs in the request.
- */
-export function sortByRequestOrder(
-	tags: TagEntity[],
-	{ requestOrder }: { requestOrder: string[] },
-) {
-	const tagMap = tags.reduce<Record<string, TagEntity>>((acc, tag) => {
-		acc[tag.id] = tag;
-		return acc;
-	}, {});
-
-	return requestOrder.map((tagId) => tagMap[tagId]);
-}
-
-// ----------------------------------
-//             mutations
-// ----------------------------------
-
-const createTag = async (transactionManager: EntityManager, name: string): Promise<TagEntity> => {
-	const tag = new TagEntity();
-	tag.name = name;
-	return transactionManager.save<TagEntity>(tag);
-};
-
-const findOrCreateTag = async (
-	transactionManager: EntityManager,
-	importTag: ITagToImport,
-	tagsEntities: TagEntity[],
-): Promise<TagEntity> => {
-	// Assume tag is identical if createdAt date is the same to preserve a changed tag name
-	const identicalMatch = tagsEntities.find(
-		(existingTag) =>
-			existingTag.id === importTag.id &&
-			existingTag.createdAt &&
-			importTag.createdAt &&
-			existingTag.createdAt.getTime() === new Date(importTag.createdAt).getTime(),
-	);
-	if (identicalMatch) {
-		return identicalMatch;
-	}
-
-	const nameMatch = tagsEntities.find((existingTag) => existingTag.name === importTag.name);
-	if (nameMatch) {
-		return nameMatch;
-	}
-
-	const created = await createTag(transactionManager, importTag.name);
-	tagsEntities.push(created);
-	return created;
-};
-
-const hasTags = (workflow: IWorkflowToImport) =>
-	'tags' in workflow && Array.isArray(workflow.tags) && workflow.tags.length > 0;
-
-/**
- * Set tag IDs to use existing tags, creates a new tag if no matching tag could be found
- */
-export async function setTagsForImport(
-	transactionManager: EntityManager,
-	workflow: IWorkflowToImport,
-	tags: TagEntity[],
-): Promise<void> {
-	if (!hasTags(workflow)) {
-		return;
-	}
-
-	const workflowTags = workflow.tags;
-	const tagLookupPromises = [];
-	for (let i = 0; i < workflowTags.length; i++) {
-		if (workflowTags[i]?.name) {
-			const lookupPromise = findOrCreateTag(transactionManager, workflowTags[i], tags).then(
-				(tag) => {
-					workflowTags[i] = {
-						id: tag.id,
-						name: tag.name,
-					};
-				},
-			);
-			tagLookupPromises.push(lookupPromise);
-		}
-	}
-
-	await Promise.all(tagLookupPromises);
-}
diff --git a/packages/cli/src/TestWebhooks.ts b/packages/cli/src/TestWebhooks.ts
index 92d241aefac4a..827226ee546be 100644
--- a/packages/cli/src/TestWebhooks.ts
+++ b/packages/cli/src/TestWebhooks.ts
@@ -1,172 +1,120 @@
-/* eslint-disable consistent-return */
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
-/* eslint-disable no-param-reassign */
 import type express from 'express';
 import { Service } from 'typedi';
-
+import { WebhookPathTakenError, Workflow } from 'n8n-workflow';
 import type {
 	IWebhookData,
 	IWorkflowExecuteAdditionalData,
-	WebhookHttpMethod,
-	Workflow,
-	WorkflowActivateMode,
-	WorkflowExecuteMode,
+	IHttpRequestMethods,
+	IRunData,
 } from 'n8n-workflow';
-
-import { ActiveWebhooks } from '@/ActiveWebhooks';
-import type { IResponseCallbackData, IWorkflowDb } from '@/Interfaces';
+import type {
+	IResponseCallbackData,
+	IWebhookManager,
+	IWorkflowDb,
+	WebhookAccessControlOptions,
+	WebhookRequest,
+} from '@/Interfaces';
 import { Push } from '@/push';
-import * as ResponseHelper from '@/ResponseHelper';
+import { NodeTypes } from '@/NodeTypes';
 import * as WebhookHelpers from '@/WebhookHelpers';
-import { getWorkflowOwner } from './UserManagement/UserManagementHelper';
+import { TEST_WEBHOOK_TIMEOUT } from '@/constants';
+import { NotFoundError } from '@/errors/response-errors/not-found.error';
+import { WorkflowMissingIdError } from '@/errors/workflow-missing-id.error';
+import { WebhookNotFoundError } from '@/errors/response-errors/webhook-not-found.error';
+import * as NodeExecuteFunctions from 'n8n-core';
+import { removeTrailingSlash } from './utils';
+import type { TestWebhookRegistration } from '@/services/test-webhook-registrations.service';
+import { TestWebhookRegistrationsService } from '@/services/test-webhook-registrations.service';
+import { OrchestrationService } from '@/services/orchestration.service';
 import * as WorkflowExecuteAdditionalData from '@/WorkflowExecuteAdditionalData';
-import UrlPattern from 'url-pattern';
-
-const WEBHOOK_TEST_UNREGISTERED_HINT =
-	"Click the 'Execute workflow' button on the canvas, then try again. (In test mode, the webhook only works for one call after you click this button)";
 
 @Service()
-export class TestWebhooks {
-	private testWebhookData: {
-		[key: string]: {
-			sessionId?: string;
-			timeout: NodeJS.Timeout;
-			workflowData: IWorkflowDb;
-			workflow: Workflow;
-			destinationNode?: string;
-		};
-	} = {};
-
-	constructor(private activeWebhooks: ActiveWebhooks, private push: Push) {
-		activeWebhooks.testWebhooks = true;
-	}
+export class TestWebhooks implements IWebhookManager {
+	constructor(
+		private readonly push: Push,
+		private readonly nodeTypes: NodeTypes,
+		private readonly registrations: TestWebhookRegistrationsService,
+		private readonly orchestrationService: OrchestrationService,
+	) {}
+
+	private timeouts: { [webhookKey: string]: NodeJS.Timeout } = {};
 
 	/**
-	 * Executes a test-webhook and returns the data. It also makes sure that the
-	 * data gets additionally send to the UI. After the request got handled it
-	 * automatically remove the test-webhook.
+	 * Return a promise that resolves when the test webhook is called.
+	 * Also inform the FE of the result and remove the test webhook.
 	 */
-	async callTestWebhook(
-		httpMethod: WebhookHttpMethod,
-		path: string,
-		request: express.Request,
+	async executeWebhook(
+		request: WebhookRequest,
 		response: express.Response,
 	): Promise<IResponseCallbackData> {
-		// Reset request parameters
-		request.params = {};
+		const httpMethod = request.method;
 
-		path = path.split(/[?#]/)[0];
+		let path = removeTrailingSlash(request.params.path);
 
-		// Remove trailing slash
-		if (path.endsWith('/')) {
-			path = path.slice(0, -1);
-		}
+		request.params = {} as WebhookRequest['params'];
 
-		const { activeWebhooks, push, testWebhookData } = this;
+		let webhook = await this.getActiveWebhook(httpMethod, path);
 
-		let webhookData: IWebhookData | undefined = activeWebhooks.get(httpMethod, path);
+		if (!webhook) {
+			// no static webhook, so check if dynamic
+			// e.g. `/webhook-test/<uuid>/user/:id/create`
 
-		// check if path is dynamic
-		if (webhookData === undefined) {
-			let webhookId: string | undefined;
+			const [webhookId, ...segments] = path.split('/');
 
-			for (const [, { workflow }] of Object.entries(testWebhookData)) {
-				const workflowOwner = await getWorkflowOwner(workflow.id!);
+			webhook = await this.getActiveWebhook(httpMethod, segments.join('/'), webhookId);
 
-				const additionalData = await WorkflowExecuteAdditionalData.getBase(workflowOwner.id);
+			if (!webhook)
+				throw new WebhookNotFoundError({
+					path,
+					httpMethod,
+					webhookMethods: await this.getWebhookMethods(path),
+				});
 
-				const webhooks = WebhookHelpers.getWorkflowWebhooks(
-					workflow,
-					additionalData,
-					undefined,
-					true,
-				);
+			path = webhook.path;
 
-				for (const webhook of webhooks) {
-					/**
-					 * @TODO: move the removal from hashtag,querystring and trailing slash to where the webhook( including its path ) will be saved
-					 */
-					let webhookPath = webhook.path.split(/[?#]/)[0];
-
-					// remove trailing slash
-					if (webhookPath.endsWith('/')) {
-						webhookPath = webhookPath.slice(0, -1);
-					}
-
-					// using this approach means that all webhooks in all workflows must have a unique httpMetod and path combined to avoid matching a request to the wrong webhook
-					// which in this case the first one that matches is selected
-					if (
-						webhook.httpMethod.toLowerCase() === httpMethod.toLowerCase() &&
-						new UrlPattern(webhookPath).match(path)
-					) {
-						webhookId = webhook.webhookId;
-						break;
-					}
+			path.split('/').forEach((segment, index) => {
+				if (segment.startsWith(':')) {
+					request.params[segment.slice(1)] = segments[index];
 				}
+			});
+		}
 
-				if (webhookId) break;
-			}
+		const key = this.registrations.toKey(webhook);
 
-			// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-			webhookData = activeWebhooks.get(httpMethod, path, webhookId);
-			if (webhookData === undefined) {
-				// The requested webhook is not registered
-				throw new ResponseHelper.NotFoundError(
-					`The requested webhook "${httpMethod} ${path}" is not registered.`,
-					WEBHOOK_TEST_UNREGISTERED_HINT,
-				);
-			}
+		const registration = await this.registrations.get(key);
 
-			const pathElements = path.split('/');
-			path = webhookData.path;
-			// extracting params from path
-			path.split('/').forEach((ele, index) => {
-				if (ele.startsWith(':')) {
-					// write params to req.params
-					request.params[ele.slice(1)] = pathElements[index];
-				}
+		if (!registration) {
+			throw new WebhookNotFoundError({
+				path,
+				httpMethod,
+				webhookMethods: await this.getWebhookMethods(path),
 			});
 		}
 
-		const { workflowId } = webhookData;
-		const webhookKey = `${activeWebhooks.getWebhookKey(
-			webhookData.httpMethod,
-			webhookData.path,
-			webhookData.webhookId,
-		)}|${workflowId}`;
-
-		// TODO: Clean that duplication up one day and improve code generally
-		if (testWebhookData[webhookKey] === undefined) {
-			// The requested webhook is not registered
-			throw new ResponseHelper.NotFoundError(
-				`The requested webhook "${httpMethod} ${path}" is not registered.`,
-				WEBHOOK_TEST_UNREGISTERED_HINT,
-			);
-		}
+		const { destinationNode, pushRef, workflowEntity, webhook: testWebhook } = registration;
+
+		const workflow = this.toWorkflow(workflowEntity);
+
+		if (testWebhook.staticData) workflow.setTestStaticData(testWebhook.staticData);
 
-		const { destinationNode, sessionId, workflow, workflowData, timeout } =
-			testWebhookData[webhookKey];
+		const workflowStartNode = workflow.getNode(webhook.node);
 
-		// Get the node which has the webhook defined to know where to start from and to
-		// get additional data
-		const workflowStartNode = workflow.getNode(webhookData.node);
 		if (workflowStartNode === null) {
-			throw new ResponseHelper.NotFoundError('Could not find node to process webhook.');
+			throw new NotFoundError('Could not find node to process webhook.');
 		}
 
-		// eslint-disable-next-line no-async-promise-executor
-		return new Promise(async (resolve, reject) => {
+		return await new Promise(async (resolve, reject) => {
 			try {
 				const executionMode = 'manual';
 				const executionId = await WebhookHelpers.executeWebhook(
 					workflow,
-					webhookData!,
-					workflowData,
+					webhook,
+					workflowEntity,
 					workflowStartNode,
 					executionMode,
-					sessionId,
-					undefined,
-					undefined,
+					pushRef,
+					undefined, // IRunExecutionData
+					undefined, // executionId
 					request,
 					response,
 					(error: Error | null, data: IResponseCallbackData) => {
@@ -182,104 +130,168 @@ export class TestWebhooks {
 				if (executionId === undefined) return;
 
 				// Inform editor-ui that webhook got received
-				if (sessionId !== undefined) {
-					push.send('testWebhookReceived', { workflowId, executionId }, sessionId);
+				if (pushRef !== undefined) {
+					this.push.send(
+						'testWebhookReceived',
+						{ workflowId: webhook?.workflowId, executionId },
+						pushRef,
+					);
 				}
 			} catch {}
 
-			// Delete webhook also if an error is thrown
-			if (timeout) clearTimeout(timeout);
-			delete testWebhookData[webhookKey];
+			/**
+			 * 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, after the test webhook has been successfully executed,
+			 * the handler process commands the creator process to clear its test webhooks.
+			 */
+			if (
+				this.orchestrationService.isMultiMainSetupEnabled &&
+				pushRef &&
+				!this.push.getBackend().hasPushRef(pushRef)
+			) {
+				const payload = { webhookKey: key, workflowEntity, pushRef };
+				void this.orchestrationService.publish('clear-test-webhooks', payload);
+				return;
+			}
+
+			this.clearTimeout(key);
 
-			await activeWebhooks.removeWorkflow(workflow);
+			await this.deactivateWebhooks(workflow);
 		});
 	}
 
-	/**
-	 * Gets all request methods associated with a single test webhook
-	 */
-	async getWebhookMethods(path: string): Promise<string[]> {
-		const webhookMethods = this.activeWebhooks.getWebhookMethods(path);
-		if (!webhookMethods.length) {
-			// The requested webhook is not registered
-			throw new ResponseHelper.NotFoundError(
-				`The requested webhook "${path}" is not registered.`,
-				WEBHOOK_TEST_UNREGISTERED_HINT,
-			);
-		}
+	clearTimeout(key: string) {
+		const timeout = this.timeouts[key];
+
+		if (timeout) clearTimeout(timeout);
+	}
+
+	async getWebhookMethods(path: string) {
+		const allKeys = await this.registrations.getAllKeys();
+
+		const webhookMethods = allKeys
+			.filter((key) => key.includes(path))
+			.map((key) => key.split('|')[0] as IHttpRequestMethods);
+
+		if (!webhookMethods.length) throw new WebhookNotFoundError({ path });
 
 		return webhookMethods;
 	}
 
+	async findAccessControlOptions(path: string, httpMethod: IHttpRequestMethods) {
+		const allKeys = await this.registrations.getAllKeys();
+
+		const webhookKey = allKeys.find((key) => key.includes(path) && key.startsWith(httpMethod));
+
+		if (!webhookKey) return;
+
+		const registration = await this.registrations.get(webhookKey);
+
+		if (!registration) return;
+
+		const { workflowEntity } = registration;
+
+		const workflow = this.toWorkflow(workflowEntity);
+
+		const webhookNode = Object.values(workflow.nodes).find(
+			({ type, parameters, typeVersion }) =>
+				parameters?.path === path &&
+				(parameters?.httpMethod ?? 'GET') === httpMethod &&
+				'webhook' in this.nodeTypes.getByNameAndVersion(type, typeVersion),
+		);
+
+		return webhookNode?.parameters?.options as WebhookAccessControlOptions;
+	}
+
 	/**
-	 * Checks if it has to wait for webhook data to execute the workflow.
-	 * If yes it waits for it and resolves with the result of the workflow if not it simply resolves with undefined
+	 * Return whether activating a workflow requires listening for webhook calls.
+	 * For every webhook call to listen for, also activate the webhook.
 	 */
-	async needsWebhookData(
-		workflowData: IWorkflowDb,
-		workflow: Workflow,
+	async needsWebhook(
+		userId: string,
+		workflowEntity: IWorkflowDb,
 		additionalData: IWorkflowExecuteAdditionalData,
-		mode: WorkflowExecuteMode,
-		activation: WorkflowActivateMode,
-		sessionId?: string,
+		runData?: IRunData,
+		pushRef?: string,
 		destinationNode?: string,
-	): Promise<boolean> {
+	) {
+		if (!workflowEntity.id) throw new WorkflowMissingIdError(workflowEntity);
+
+		const workflow = this.toWorkflow(workflowEntity);
+
 		const webhooks = WebhookHelpers.getWorkflowWebhooks(
 			workflow,
 			additionalData,
 			destinationNode,
 			true,
 		);
-		if (!webhooks.find((webhook) => webhook.webhookDescription.restartWebhook !== true)) {
-			// No webhooks found to start a workflow
-			return false;
-		}
 
-		if (workflow.id === undefined) {
-			throw new Error('Webhooks can only be added for saved workflows as an id is needed!');
+		if (!webhooks.some((w) => w.webhookDescription.restartWebhook !== true)) {
+			return false; // no webhooks found to start a workflow
 		}
 
-		// Remove test-webhooks automatically if they do not get called (after 120 seconds)
-		const timeout = setTimeout(() => {
-			this.cancelTestWebhook(workflowData.id);
-		}, 120000);
+		const timeout = setTimeout(
+			async () => await this.cancelWebhook(workflow.id),
+			TEST_WEBHOOK_TIMEOUT,
+		);
 
-		const { activeWebhooks, testWebhookData } = this;
+		for (const webhook of webhooks) {
+			const key = this.registrations.toKey(webhook);
+			const registrationByKey = await this.registrations.get(key);
 
-		let key: string;
-		const activatedKey: string[] = [];
-		// eslint-disable-next-line no-restricted-syntax
-		for (const webhookData of webhooks) {
-			webhookData.path = webhookData.path.split(/[?#]/)[0];
+			if (runData && webhook.node in runData) {
+				return false;
+			}
 
-			// remove trailing
-			if (webhookData.path.endsWith('/')) {
-				webhookData.path = webhookData.path.slice(0, -1);
+			// if registration already exists and is not a test webhook created by this user in this workflow throw an error
+			if (
+				registrationByKey &&
+				!webhook.webhookId &&
+				!registrationByKey.webhook.isTest &&
+				registrationByKey.webhook.userId !== userId &&
+				registrationByKey.webhook.workflowId !== workflow.id
+			) {
+				throw new WebhookPathTakenError(webhook.node);
 			}
 
-			key = `${activeWebhooks.getWebhookKey(
-				webhookData.httpMethod,
-				webhookData.path,
-				webhookData.webhookId,
-			)}|${workflowData.id}`;
+			webhook.path = removeTrailingSlash(webhook.path);
+			webhook.isTest = true;
+
+			/**
+			 * Additional data cannot be cached because of circular refs.
+			 * Hence store the `userId` and recreate additional data when needed.
+			 */
+			const { workflowExecuteAdditionalData: _, ...cacheableWebhook } = webhook;
 
-			activatedKey.push(key);
+			cacheableWebhook.userId = userId;
 
-			testWebhookData[key] = {
-				sessionId,
-				timeout,
-				workflow,
-				workflowData,
+			const registration: TestWebhookRegistration = {
+				pushRef,
+				workflowEntity,
 				destinationNode,
+				webhook: cacheableWebhook as IWebhookData,
 			};
 
 			try {
-				// eslint-disable-next-line no-await-in-loop
-				await activeWebhooks.add(workflow, webhookData, mode, activation);
+				/**
+				 * Register the test webhook _before_ creation at third-party service
+				 * in case service sends a confirmation request immediately on creation.
+				 */
+				await this.registrations.register(registration);
+
+				await workflow.createWebhookIfNotExists(webhook, NodeExecuteFunctions, 'manual', 'manual');
+
+				cacheableWebhook.staticData = workflow.staticData;
+
+				await this.registrations.register(registration);
+
+				this.timeouts[key] = timeout;
 			} catch (error) {
-				activatedKey.forEach((deleteKey) => delete testWebhookData[deleteKey]);
-				// eslint-disable-next-line no-await-in-loop
-				await activeWebhooks.removeWorkflow(workflow);
+				await this.deactivateWebhooks(workflow);
+
+				delete this.timeouts[key];
+
 				throw error;
 			}
 		}
@@ -287,40 +299,35 @@ export class TestWebhooks {
 		return true;
 	}
 
-	/**
-	 * Removes a test webhook of the workflow with the given id
-	 *
-	 */
-	cancelTestWebhook(workflowId: string): boolean {
+	async cancelWebhook(workflowId: string) {
 		let foundWebhook = false;
-		const { activeWebhooks, push, testWebhookData } = this;
-		// eslint-disable-next-line no-restricted-syntax
-		for (const webhookKey of Object.keys(testWebhookData)) {
-			const { sessionId, timeout, workflow, workflowData } = testWebhookData[webhookKey];
-
-			if (workflowData.id !== workflowId) {
-				// eslint-disable-next-line no-continue
-				continue;
-			}
 
-			clearTimeout(timeout);
+		const allWebhookKeys = await this.registrations.getAllKeys();
+
+		for (const key of allWebhookKeys) {
+			const registration = await this.registrations.get(key);
+
+			if (!registration) continue;
+
+			const { pushRef, workflowEntity } = registration;
 
-			// Inform editor-ui that webhook got received
-			if (sessionId !== undefined) {
+			const workflow = this.toWorkflow(workflowEntity);
+
+			if (workflowEntity.id !== workflowId) continue;
+
+			this.clearTimeout(key);
+
+			if (pushRef !== undefined) {
 				try {
-					push.send('testWebhookDeleted', { workflowId }, sessionId);
+					this.push.send('testWebhookDeleted', { workflowId }, pushRef);
 				} catch {
 					// Could not inform editor, probably is not connected anymore. So simply go on.
 				}
 			}
 
-			// Remove the webhook
-			delete testWebhookData[webhookKey];
-
 			if (!foundWebhook) {
 				// As it removes all webhooks of the workflow execute only once
-				// eslint-disable-next-line @typescript-eslint/no-floating-promises
-				activeWebhooks.removeWorkflow(workflow);
+				void this.deactivateWebhooks(workflow);
 			}
 
 			foundWebhook = true;
@@ -329,11 +336,86 @@ export class TestWebhooks {
 		return foundWebhook;
 	}
 
+	async getActiveWebhook(httpMethod: IHttpRequestMethods, path: string, webhookId?: string) {
+		const key = this.registrations.toKey({ httpMethod, path, webhookId });
+
+		let webhook: IWebhookData | undefined;
+		let maxMatches = 0;
+		const pathElementsSet = new Set(path.split('/'));
+		// check if static elements match in path
+		// if more results have been returned choose the one with the most static-route matches
+		const registration = await this.registrations.get(key);
+
+		if (!registration) return;
+
+		const { webhook: dynamicWebhook } = registration;
+
+		const staticElements = dynamicWebhook.path.split('/').filter((ele) => !ele.startsWith(':'));
+		const allStaticExist = staticElements.every((staticEle) => pathElementsSet.has(staticEle));
+
+		if (allStaticExist && staticElements.length > maxMatches) {
+			maxMatches = staticElements.length;
+			webhook = dynamicWebhook;
+		}
+		// handle routes with no static elements
+		else if (staticElements.length === 0 && !webhook) {
+			webhook = dynamicWebhook;
+		}
+
+		return webhook;
+	}
+
+	/**
+	 * Deactivate all registered test webhooks of a workflow.
+	 */
+	async deactivateWebhooks(workflow: Workflow) {
+		const allRegistrations = await this.registrations.getAllRegistrations();
+
+		if (!allRegistrations.length) return; // nothing to deactivate
+
+		type WebhooksByWorkflow = { [workflowId: string]: IWebhookData[] };
+
+		const webhooksByWorkflow = allRegistrations.reduce<WebhooksByWorkflow>((acc, cur) => {
+			const { workflowId } = cur.webhook;
+
+			acc[workflowId] ||= [];
+			acc[workflowId].push(cur.webhook);
+
+			return acc;
+		}, {});
+
+		const webhooks = webhooksByWorkflow[workflow.id];
+
+		if (!webhooks) return; // nothing to deactivate
+
+		for (const webhook of webhooks) {
+			const { userId, staticData } = webhook;
+
+			if (userId) {
+				webhook.workflowExecuteAdditionalData = await WorkflowExecuteAdditionalData.getBase(userId);
+			}
+
+			if (staticData) workflow.staticData = staticData;
+
+			await workflow.deleteWebhook(webhook, NodeExecuteFunctions, 'internal', 'update');
+		}
+
+		await this.registrations.deregisterAll();
+	}
+
 	/**
-	 * Removes all the currently active test webhooks
+	 * Convert a `WorkflowEntity` from `typeorm` to a temporary `Workflow` from `n8n-workflow`.
 	 */
-	async removeAll(): Promise<void> {
-		const workflows = Object.values(this.testWebhookData).map(({ workflow }) => workflow);
-		return this.activeWebhooks.removeAll(workflows);
+	toWorkflow(workflowEntity: IWorkflowDb) {
+		return new Workflow({
+			id: workflowEntity.id,
+			name: workflowEntity.name,
+			nodes: workflowEntity.nodes,
+			connections: workflowEntity.connections,
+			active: false,
+			nodeTypes: this.nodeTypes,
+			staticData: {},
+			settings: workflowEntity.settings,
+		});
 	}
 }
diff --git a/packages/cli/src/TranslationHelpers.ts b/packages/cli/src/TranslationHelpers.ts
deleted file mode 100644
index dd829534a6d78..0000000000000
--- a/packages/cli/src/TranslationHelpers.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { join, dirname } from 'path';
-import { readdir } from 'fs/promises';
-import type { Dirent } from 'fs';
-
-const ALLOWED_VERSIONED_DIRNAME_LENGTH = [2, 3]; // e.g. v1, v10
-
-function isVersionedDirname(dirent: Dirent) {
-	if (!dirent.isDirectory()) return false;
-
-	return (
-		ALLOWED_VERSIONED_DIRNAME_LENGTH.includes(dirent.name.length) &&
-		dirent.name.toLowerCase().startsWith('v')
-	);
-}
-
-async function getMaxVersion(from: string) {
-	const entries = await readdir(from, { withFileTypes: true });
-
-	const dirnames = entries.reduce<string[]>((acc, cur) => {
-		if (isVersionedDirname(cur)) acc.push(cur.name);
-		return acc;
-	}, []);
-
-	if (!dirnames.length) return null;
-
-	return Math.max(...dirnames.map((d) => parseInt(d.charAt(1), 10)));
-}
-
-/**
- * Get the full path to a node translation file in `/dist`.
- */
-export async function getNodeTranslationPath({
-	nodeSourcePath,
-	longNodeType,
-	locale,
-}: {
-	nodeSourcePath: string;
-	longNodeType: string;
-	locale: string;
-}): Promise<string> {
-	const nodeDir = dirname(nodeSourcePath);
-	const maxVersion = await getMaxVersion(nodeDir);
-	const nodeType = longNodeType.replace('n8n-nodes-base.', '');
-
-	return maxVersion
-		? join(nodeDir, `v${maxVersion}`, 'translations', locale, `${nodeType}.json`)
-		: join(nodeDir, 'translations', locale, `${nodeType}.json`);
-}
diff --git a/packages/cli/src/UserManagement/PermissionChecker.ts b/packages/cli/src/UserManagement/PermissionChecker.ts
index fb2e7b19e1fb1..9cd9590ecb87b 100644
--- a/packages/cli/src/UserManagement/PermissionChecker.ts
+++ b/packages/cli/src/UserManagement/PermissionChecker.ts
@@ -1,26 +1,31 @@
+import { Service } from 'typedi';
 import type { INode, Workflow } from 'n8n-workflow';
-import {
-	NodeOperationError,
-	SubworkflowOperationError,
-	WorkflowOperationError,
-} from 'n8n-workflow';
-import type { FindOptionsWhere } from 'typeorm';
-import { In } from 'typeorm';
-import * as Db from '@/Db';
+import { CredentialAccessError, NodeOperationError, WorkflowOperationError } from 'n8n-workflow';
+
 import config from '@/config';
-import type { SharedCredentials } from '@db/entities/SharedCredentials';
-import { getRoleId, getWorkflowOwner, isSharingEnabled } from './UserManagementHelper';
-import { WorkflowsService } from '@/workflows/workflows.services';
-import { UserService } from '@/user/user.service';
+import { License } from '@/License';
+import { OwnershipService } from '@/services/ownership.service';
+import { UserRepository } from '@db/repositories/user.repository';
+import { SharedCredentialsRepository } from '@db/repositories/sharedCredentials.repository';
+import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
 
+@Service()
 export class PermissionChecker {
+	constructor(
+		private readonly userRepository: UserRepository,
+		private readonly sharedCredentialsRepository: SharedCredentialsRepository,
+		private readonly sharedWorkflowRepository: SharedWorkflowRepository,
+		private readonly ownershipService: OwnershipService,
+		private readonly license: License,
+	) {}
+
 	/**
 	 * Check if a user is permitted to execute a workflow.
 	 */
-	static async check(workflow: Workflow, userId: string) {
+	async check(workflowId: string, userId: string, nodes: INode[]) {
 		// allow if no nodes in this workflow use creds
 
-		const credIdsToNodes = PermissionChecker.mapCredIdsToNodes(workflow);
+		const credIdsToNodes = this.mapCredIdsToNodes(nodes);
 
 		const workflowCredIds = Object.keys(credIdsToNodes);
 
@@ -28,56 +33,42 @@ export class PermissionChecker {
 
 		// allow if requesting user is instance owner
 
-		const user = await Db.collections.User.findOneOrFail({
+		const user = await this.userRepository.findOneOrFail({
 			where: { id: userId },
-			relations: ['globalRole'],
 		});
 
-		if (user.globalRole.name === 'owner') return;
+		if (user.hasGlobalScope('workflow:execute')) return;
+
+		const isSharingEnabled = this.license.isSharingEnabled();
 
 		// allow if all creds used in this workflow are a subset of
 		// all creds accessible to users who have access to this workflow
 
 		let workflowUserIds = [userId];
 
-		if (workflow.id && isSharingEnabled()) {
-			const workflowSharings = await Db.collections.SharedWorkflow.find({
-				relations: ['workflow'],
-				where: { workflowId: workflow.id },
-			});
-			workflowUserIds = workflowSharings.map((s) => s.userId);
-		}
-
-		const credentialsWhere: FindOptionsWhere<SharedCredentials> = { userId: In(workflowUserIds) };
-
-		if (!isSharingEnabled()) {
-			// If credential sharing is not enabled, get only credentials owned by this user
-			credentialsWhere.roleId = await getRoleId('credential', 'owner');
+		if (workflowId && isSharingEnabled) {
+			workflowUserIds = await this.sharedWorkflowRepository.getSharedUserIds(workflowId);
 		}
 
-		const credentialSharings = await Db.collections.SharedCredentials.find({
-			where: credentialsWhere,
-		});
-
-		const accessibleCredIds = credentialSharings.map((s) => s.credentialsId);
+		const accessibleCredIds = isSharingEnabled
+			? await this.sharedCredentialsRepository.getAccessibleCredentialIds(workflowUserIds)
+			: await this.sharedCredentialsRepository.getOwnedCredentialIds(workflowUserIds);
 
 		const inaccessibleCredIds = workflowCredIds.filter((id) => !accessibleCredIds.includes(id));
 
 		if (inaccessibleCredIds.length === 0) return;
 
 		// if disallowed, flag only first node using first inaccessible cred
+		const inaccessibleCredId = inaccessibleCredIds[0];
+		const nodeToFlag = credIdsToNodes[inaccessibleCredId][0];
 
-		const nodeToFlag = credIdsToNodes[inaccessibleCredIds[0]][0];
-
-		throw new NodeOperationError(nodeToFlag, 'Node has no access to credential', {
-			description: 'Please recreate the credential or ask its owner to share it with you.',
-		});
+		throw new CredentialAccessError(nodeToFlag, inaccessibleCredId, workflowId);
 	}
 
-	static async checkSubworkflowExecutePolicy(
+	async checkSubworkflowExecutePolicy(
 		subworkflow: Workflow,
-		userId: string,
-		parentWorkflowId?: string,
+		parentWorkflowId: string,
+		node?: INode,
 	) {
 		/**
 		 * Important considerations: both the current workflow and the parent can have empty IDs.
@@ -94,18 +85,25 @@ export class PermissionChecker {
 		let policy =
 			subworkflow.settings?.callerPolicy ?? config.getEnv('workflows.callerPolicyDefaultOption');
 
-		if (!isSharingEnabled()) {
+		if (!this.license.isSharingEnabled()) {
 			// Community version allows only same owner workflows
 			policy = 'workflowsFromSameOwner';
 		}
 
-		const subworkflowOwner = await getWorkflowOwner(subworkflow.id);
+		const parentWorkflowOwner =
+			await this.ownershipService.getWorkflowOwnerCached(parentWorkflowId);
+
+		const subworkflowOwner = await this.ownershipService.getWorkflowOwnerCached(subworkflow.id);
 
-		const errorToThrow = new SubworkflowOperationError(
-			`Target workflow ID ${subworkflow.id ?? ''} may not be called`,
-			subworkflowOwner.id === userId
+		const description =
+			subworkflowOwner.id === parentWorkflowOwner.id
 				? 'Change the settings of the sub-workflow so it can be called by this one.'
-				: `${subworkflowOwner.firstName} (${subworkflowOwner.email}) can make this change. You may need to tell them the ID of this workflow, which is ${subworkflow.id}`,
+				: `${subworkflowOwner.firstName} (${subworkflowOwner.email}) can make this change. You may need to tell them the ID of the sub-workflow, which is ${subworkflow.id}`;
+
+		const errorToThrow = new WorkflowOperationError(
+			`Target workflow ID ${subworkflow.id} may not be called`,
+			node,
+			description,
 		);
 
 		if (policy === 'none') {
@@ -126,38 +124,27 @@ export class PermissionChecker {
 			}
 		}
 
-		if (policy === 'workflowsFromSameOwner') {
-			const user = await UserService.get({ id: userId });
-			if (!user) {
-				throw new WorkflowOperationError(
-					'Fatal error: user not found. Please contact the system administrator.',
-				);
-			}
-			const sharing = await WorkflowsService.getSharing(user, subworkflow.id, ['role', 'user']);
-			if (!sharing || sharing.role.name !== 'owner') {
-				throw errorToThrow;
-			}
+		if (policy === 'workflowsFromSameOwner' && subworkflowOwner?.id !== parentWorkflowOwner.id) {
+			throw errorToThrow;
 		}
 	}
 
-	private static mapCredIdsToNodes(workflow: Workflow) {
-		return Object.values(workflow.nodes).reduce<{ [credentialId: string]: INode[] }>(
-			(map, node) => {
-				if (node.disabled || !node.credentials) return map;
+	private mapCredIdsToNodes(nodes: INode[]) {
+		return nodes.reduce<{ [credentialId: string]: INode[] }>((map, node) => {
+			if (node.disabled || !node.credentials) return map;
 
-				Object.values(node.credentials).forEach((cred) => {
-					if (!cred.id) {
-						throw new NodeOperationError(node, 'Node uses invalid credential', {
-							description: 'Please recreate the credential.',
-						});
-					}
+			Object.values(node.credentials).forEach((cred) => {
+				if (!cred.id) {
+					throw new NodeOperationError(node, 'Node uses invalid credential', {
+						description: 'Please recreate the credential.',
+						level: 'warning',
+					});
+				}
 
-					map[cred.id] = map[cred.id] ? [...map[cred.id], node] : [node];
-				});
+				map[cred.id] = map[cred.id] ? [...map[cred.id], node] : [node];
+			});
 
-				return map;
-			},
-			{},
-		);
+			return map;
+		}, {});
 	}
 }
diff --git a/packages/cli/src/UserManagement/UserManagementHelper.ts b/packages/cli/src/UserManagement/UserManagementHelper.ts
deleted file mode 100644
index 88927f4c73acb..0000000000000
--- a/packages/cli/src/UserManagement/UserManagementHelper.ts
+++ /dev/null
@@ -1,267 +0,0 @@
-/* eslint-disable @typescript-eslint/no-unused-vars */
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
-import { In } from 'typeorm';
-import type express from 'express';
-import { compare, genSaltSync, hash } from 'bcryptjs';
-import { Container } from 'typedi';
-
-import * as Db from '@/Db';
-import * as ResponseHelper from '@/ResponseHelper';
-import type { CurrentUser, PublicUser, WhereClause } from '@/Interfaces';
-import type { User } from '@db/entities/User';
-import { MAX_PASSWORD_LENGTH, MIN_PASSWORD_LENGTH } from '@db/entities/User';
-import type { Role } from '@db/entities/Role';
-import { RoleRepository } from '@db/repositories';
-import type { AuthenticatedRequest } from '@/requests';
-import config from '@/config';
-import { getWebhookBaseUrl } from '@/WebhookHelpers';
-import { License } from '@/License';
-import type { PostHogClient } from '@/posthog';
-
-export async function getWorkflowOwner(workflowId: string): Promise<User> {
-	const workflowOwnerRole = await Container.get(RoleRepository).findWorkflowOwnerRole();
-
-	const sharedWorkflow = await Db.collections.SharedWorkflow.findOneOrFail({
-		where: { workflowId, roleId: workflowOwnerRole?.id ?? undefined },
-		relations: ['user', 'user.globalRole'],
-	});
-
-	return sharedWorkflow.user;
-}
-
-export function isEmailSetUp(): boolean {
-	const smtp = config.getEnv('userManagement.emails.mode') === 'smtp';
-	const host = !!config.getEnv('userManagement.emails.smtp.host');
-	const user = !!config.getEnv('userManagement.emails.smtp.auth.user');
-	const pass = !!config.getEnv('userManagement.emails.smtp.auth.pass');
-
-	return smtp && host && user && pass;
-}
-
-export function isUserManagementEnabled(): boolean {
-	// This can be simplified but readability is more important here
-
-	if (config.getEnv('userManagement.isInstanceOwnerSetUp')) {
-		// Short circuit - if owner is set up, UM cannot be disabled.
-		// Users must reset their instance in order to do so.
-		return true;
-	}
-
-	// UM is disabled for desktop by default
-	if (config.getEnv('deployment.type').startsWith('desktop_')) {
-		return false;
-	}
-
-	return config.getEnv('userManagement.disabled') ? false : true;
-}
-
-export function isSharingEnabled(): boolean {
-	const license = Container.get(License);
-	return isUserManagementEnabled() && license.isSharingEnabled();
-}
-
-export async function getRoleId(scope: Role['scope'], name: Role['name']): Promise<Role['id']> {
-	return Container.get(RoleRepository)
-		.findRoleOrFail(scope, name)
-		.then((role) => role.id);
-}
-
-export async function getInstanceOwner(): Promise<User> {
-	const ownerRoleId = await getRoleId('global', 'owner');
-
-	const owner = await Db.collections.User.findOneOrFail({
-		relations: ['globalRole'],
-		where: {
-			globalRoleId: ownerRoleId,
-		},
-	});
-	return owner;
-}
-
-/**
- * Return the n8n instance base URL without trailing slash.
- */
-export function getInstanceBaseUrl(): string {
-	const n8nBaseUrl = config.getEnv('editorBaseUrl') || getWebhookBaseUrl();
-
-	return n8nBaseUrl.endsWith('/') ? n8nBaseUrl.slice(0, n8nBaseUrl.length - 1) : n8nBaseUrl;
-}
-
-export function generateUserInviteUrl(inviterId: string, inviteeId: string): string {
-	return `${getInstanceBaseUrl()}/signup?inviterId=${inviterId}&inviteeId=${inviteeId}`;
-}
-
-// TODO: Enforce at model level
-export function validatePassword(password?: string): string {
-	if (!password) {
-		throw new ResponseHelper.BadRequestError('Password is mandatory');
-	}
-
-	const hasInvalidLength =
-		password.length < MIN_PASSWORD_LENGTH || password.length > MAX_PASSWORD_LENGTH;
-
-	const hasNoNumber = !/\d/.test(password);
-
-	const hasNoUppercase = !/[A-Z]/.test(password);
-
-	if (hasInvalidLength || hasNoNumber || hasNoUppercase) {
-		const message: string[] = [];
-
-		if (hasInvalidLength) {
-			message.push(
-				`Password must be ${MIN_PASSWORD_LENGTH} to ${MAX_PASSWORD_LENGTH} characters long.`,
-			);
-		}
-
-		if (hasNoNumber) {
-			message.push('Password must contain at least 1 number.');
-		}
-
-		if (hasNoUppercase) {
-			message.push('Password must contain at least 1 uppercase letter.');
-		}
-
-		throw new ResponseHelper.BadRequestError(message.join(' '));
-	}
-
-	return password;
-}
-
-/**
- * Remove sensitive properties from the user to return to the client.
- */
-export function sanitizeUser(user: User, withoutKeys?: string[]): PublicUser {
-	const {
-		password,
-		resetPasswordToken,
-		resetPasswordTokenExpiration,
-		updatedAt,
-		apiKey,
-		authIdentities,
-		...rest
-	} = user;
-	if (withoutKeys) {
-		withoutKeys.forEach((key) => {
-			// @ts-ignore
-			delete rest[key];
-		});
-	}
-	const sanitizedUser: PublicUser = {
-		...rest,
-		signInType: 'email',
-	};
-	const ldapIdentity = authIdentities?.find((i) => i.providerType === 'ldap');
-	if (ldapIdentity) {
-		sanitizedUser.signInType = 'ldap';
-	}
-	return sanitizedUser;
-}
-
-export async function withFeatureFlags(
-	postHog: PostHogClient | undefined,
-	user: CurrentUser,
-): Promise<CurrentUser> {
-	if (!postHog) {
-		return user;
-	}
-
-	// native PostHog implementation has default 10s timeout and 3 retries.. which cannot be updated without affecting other functionality
-	// https://github.com/PostHog/posthog-js-lite/blob/a182de80a433fb0ffa6859c10fb28084d0f825c2/posthog-core/src/index.ts#L67
-	const timeoutPromise = new Promise<CurrentUser>((resolve) => {
-		setTimeout(() => {
-			resolve(user);
-		}, 1500);
-	});
-
-	const fetchPromise = new Promise<CurrentUser>(async (resolve) => {
-		user.featureFlags = await postHog.getFeatureFlags(user);
-		resolve(user);
-	});
-
-	return Promise.race([fetchPromise, timeoutPromise]);
-}
-
-export function addInviteLinkToUser(user: PublicUser, inviterId: string): PublicUser {
-	if (user.isPending) {
-		user.inviteAcceptUrl = generateUserInviteUrl(inviterId, user.id);
-	}
-	return user;
-}
-
-export async function getUserById(userId: string): Promise<User> {
-	const user = await Db.collections.User.findOneOrFail({
-		where: { id: userId },
-		relations: ['globalRole'],
-	});
-	return user;
-}
-
-// ----------------------------------
-//            hashing
-// ----------------------------------
-
-export const hashPassword = async (validPassword: string): Promise<string> =>
-	hash(validPassword, genSaltSync(10));
-
-export async function compareHash(plaintext: string, hashed: string): Promise<boolean | undefined> {
-	try {
-		return await compare(plaintext, hashed);
-	} catch (error) {
-		if (error instanceof Error && error.message.includes('Invalid salt version')) {
-			error.message +=
-				'. Comparison against unhashed string. Please check that the value compared against has been hashed.';
-		}
-
-		// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-		throw new Error(error);
-	}
-}
-
-// return the difference between two arrays
-export function rightDiff<T1, T2>(
-	[arr1, keyExtractor1]: [T1[], (item: T1) => string],
-	[arr2, keyExtractor2]: [T2[], (item: T2) => string],
-): T2[] {
-	// create map { itemKey => true } for fast lookup for diff
-	const keyMap = arr1.reduce<{ [key: string]: true }>((map, item) => {
-		// eslint-disable-next-line no-param-reassign
-		map[keyExtractor1(item)] = true;
-		return map;
-	}, {});
-
-	// diff against map
-	return arr2.reduce<T2[]>((acc, item) => {
-		if (!keyMap[keyExtractor2(item)]) {
-			acc.push(item);
-		}
-		return acc;
-	}, []);
-}
-
-/**
- * Build a `where` clause for a TypeORM entity search,
- * checking for member access if the user is not an owner.
- */
-export function whereClause({
-	user,
-	entityType,
-	entityId = '',
-	roles = [],
-}: {
-	user: User;
-	entityType: 'workflow' | 'credentials';
-	entityId?: string;
-	roles?: string[];
-}): WhereClause {
-	const where: WhereClause = entityId ? { [entityType]: { id: entityId } } : {};
-
-	// TODO: Decide if owner access should be restricted
-	if (user.globalRole.name !== 'owner') {
-		where.user = { id: user.id };
-		if (roles?.length) {
-			where.role = { name: In(roles) };
-		}
-	}
-
-	return where;
-}
diff --git a/packages/cli/src/UserManagement/email/NodeMailer.ts b/packages/cli/src/UserManagement/email/NodeMailer.ts
index 32ee1b02380a2..824a6801f4195 100644
--- a/packages/cli/src/UserManagement/email/NodeMailer.ts
+++ b/packages/cli/src/UserManagement/email/NodeMailer.ts
@@ -1,23 +1,51 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import type { Transporter } from 'nodemailer';
 import { createTransport } from 'nodemailer';
-import { ErrorReporterProxy as ErrorReporter, LoggerProxy as Logger } from 'n8n-workflow';
+import type SMTPConnection from 'nodemailer/lib/smtp-connection';
+import { Service } from 'typedi';
+import { ErrorReporterProxy as ErrorReporter } from 'n8n-workflow';
 import config from '@/config';
 import type { MailData, SendEmailResult } from './Interfaces';
+import { Logger } from '@/Logger';
 
+@Service()
 export class NodeMailer {
 	private transport?: Transporter;
 
+	constructor(private readonly logger: Logger) {}
+
 	async init(): Promise<void> {
-		this.transport = createTransport({
+		const transportConfig: SMTPConnection.Options = {
 			host: config.getEnv('userManagement.emails.smtp.host'),
 			port: config.getEnv('userManagement.emails.smtp.port'),
 			secure: config.getEnv('userManagement.emails.smtp.secure'),
-			auth: {
+		};
+
+		if (
+			config.getEnv('userManagement.emails.smtp.auth.user') &&
+			config.getEnv('userManagement.emails.smtp.auth.pass')
+		) {
+			transportConfig.auth = {
 				user: config.getEnv('userManagement.emails.smtp.auth.user'),
 				pass: config.getEnv('userManagement.emails.smtp.auth.pass'),
-			},
-		});
+			};
+		}
+
+		if (
+			config.getEnv('userManagement.emails.smtp.auth.serviceClient') &&
+			config.getEnv('userManagement.emails.smtp.auth.privateKey')
+		) {
+			transportConfig.auth = {
+				type: 'OAuth2',
+				user: config.getEnv('userManagement.emails.smtp.auth.user'),
+				serviceClient: config.getEnv('userManagement.emails.smtp.auth.serviceClient'),
+				privateKey: config
+					.getEnv('userManagement.emails.smtp.auth.privateKey')
+					.replace(/\\n/g, '\n'),
+			};
+		}
+
+		this.transport = createTransport(transportConfig);
 	}
 
 	async verifyConnection(): Promise<void> {
@@ -58,12 +86,12 @@ export class NodeMailer {
 				text: mailData.textOnly,
 				html: mailData.body,
 			});
-			Logger.verbose(
+			this.logger.verbose(
 				`Email sent successfully to the following recipients: ${mailData.emailRecipients.toString()}`,
 			);
 		} catch (error) {
 			ErrorReporter.error(error);
-			Logger.error('Failed to send email', { recipients: mailData.emailRecipients, error });
+			this.logger.error('Failed to send email', { recipients: mailData.emailRecipients, error });
 			throw error;
 		}
 
diff --git a/packages/cli/src/UserManagement/email/UserManagementMailer.ts b/packages/cli/src/UserManagement/email/UserManagementMailer.ts
index 4a140184cfe69..b350da8e4c183 100644
--- a/packages/cli/src/UserManagement/email/UserManagementMailer.ts
+++ b/packages/cli/src/UserManagement/email/UserManagementMailer.ts
@@ -1,14 +1,25 @@
+import { Container, Service } from 'typedi';
 import { existsSync } from 'fs';
 import { readFile } from 'fs/promises';
 import Handlebars from 'handlebars';
 import { join as pathJoin } from 'path';
-import { Service } from 'typedi';
+import { ApplicationError } from 'n8n-workflow';
+
 import config from '@/config';
+import type { User } from '@db/entities/User';
+import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
+import { UserRepository } from '@db/repositories/user.repository';
+import { InternalHooks } from '@/InternalHooks';
+import { Logger } from '@/Logger';
+import { UrlService } from '@/services/url.service';
+import { InternalServerError } from '@/errors/response-errors/internal-server.error';
+import { toError } from '@/utils';
+
 import type { InviteEmailData, PasswordResetData, SendEmailResult } from './Interfaces';
 import { NodeMailer } from './NodeMailer';
 
 type Template = HandlebarsTemplateDelegate<unknown>;
-type TemplateName = 'invite' | 'passwordReset';
+type TemplateName = 'invite' | 'passwordReset' | 'workflowShared' | 'credentialsShared';
 
 const templates: Partial<Record<TemplateName, Template>> = {};
 
@@ -34,22 +45,29 @@ async function getTemplate(
 
 @Service()
 export class UserManagementMailer {
+	readonly isEmailSetUp: boolean;
+
 	private mailer: NodeMailer | undefined;
 
-	constructor() {
-		// Other implementations can be used in the future.
-		if (
+	constructor(
+		private readonly userRepository: UserRepository,
+		private readonly logger: Logger,
+		private readonly urlService: UrlService,
+	) {
+		this.isEmailSetUp =
 			config.getEnv('userManagement.emails.mode') === 'smtp' &&
-			config.getEnv('userManagement.emails.smtp.host') !== ''
-		) {
-			this.mailer = new NodeMailer();
+			config.getEnv('userManagement.emails.smtp.host') !== '';
+
+		// Other implementations can be used in the future.
+		if (this.isEmailSetUp) {
+			this.mailer = Container.get(NodeMailer);
 		}
 	}
 
 	async verifyConnection(): Promise<void> {
-		if (!this.mailer) throw new Error('No mailer configured.');
+		if (!this.mailer) throw new ApplicationError('No mailer configured.');
 
-		return this.mailer.verifyConnection();
+		return await this.mailer.verifyConnection();
 	}
 
 	async invite(inviteEmailData: InviteEmailData): Promise<SendEmailResult> {
@@ -77,4 +95,111 @@ export class UserManagementMailer {
 		// No error, just say no email was sent.
 		return result ?? { emailSent: false };
 	}
+
+	async notifyWorkflowShared({
+		sharer,
+		newShareeIds,
+		workflow,
+	}: {
+		sharer: User;
+		newShareeIds: string[];
+		workflow: WorkflowEntity;
+	}) {
+		if (!this.mailer) return;
+
+		const recipients = await this.userRepository.getEmailsByIds(newShareeIds);
+
+		if (recipients.length === 0) return;
+
+		const emailRecipients = recipients.map(({ email }) => email);
+
+		const populateTemplate = await getTemplate('workflowShared', 'workflowShared.html');
+
+		const baseUrl = this.urlService.getInstanceBaseUrl();
+
+		try {
+			const result = await this.mailer.sendMail({
+				emailRecipients,
+				subject: `${sharer.firstName} has shared an n8n workflow with you`,
+				body: populateTemplate({
+					workflowName: workflow.name,
+					workflowUrl: `${baseUrl}/workflow/${workflow.id}`,
+				}),
+			});
+
+			if (!result) return { emailSent: false };
+
+			this.logger.info('Sent workflow shared email successfully', { sharerId: sharer.id });
+
+			void Container.get(InternalHooks).onUserTransactionalEmail({
+				user_id: sharer.id,
+				message_type: 'Workflow shared',
+				public_api: false,
+			});
+
+			return result;
+		} catch (e) {
+			void Container.get(InternalHooks).onEmailFailed({
+				user: sharer,
+				message_type: 'Workflow shared',
+				public_api: false,
+			});
+
+			const error = toError(e);
+
+			throw new InternalServerError(`Please contact your administrator: ${error.message}`);
+		}
+	}
+
+	async notifyCredentialsShared({
+		sharer,
+		newShareeIds,
+		credentialsName,
+	}: {
+		sharer: User;
+		newShareeIds: string[];
+		credentialsName: string;
+	}) {
+		if (!this.mailer) return;
+
+		const recipients = await this.userRepository.getEmailsByIds(newShareeIds);
+
+		if (recipients.length === 0) return;
+
+		const emailRecipients = recipients.map(({ email }) => email);
+
+		const populateTemplate = await getTemplate('credentialsShared', 'credentialsShared.html');
+
+		const baseUrl = this.urlService.getInstanceBaseUrl();
+
+		try {
+			const result = await this.mailer.sendMail({
+				emailRecipients,
+				subject: `${sharer.firstName} has shared an n8n credential with you`,
+				body: populateTemplate({ credentialsName, credentialsListUrl: `${baseUrl}/credentials` }),
+			});
+
+			if (!result) return { emailSent: false };
+
+			this.logger.info('Sent credentials shared email successfully', { sharerId: sharer.id });
+
+			void Container.get(InternalHooks).onUserTransactionalEmail({
+				user_id: sharer.id,
+				message_type: 'Credentials shared',
+				public_api: false,
+			});
+
+			return result;
+		} catch (e) {
+			void Container.get(InternalHooks).onEmailFailed({
+				user: sharer,
+				message_type: 'Credentials shared',
+				public_api: false,
+			});
+
+			const error = toError(e);
+
+			throw new InternalServerError(`Please contact your administrator: ${error.message}`);
+		}
+	}
 }
diff --git a/packages/cli/src/UserManagement/email/templates/credentialsShared.html b/packages/cli/src/UserManagement/email/templates/credentialsShared.html
new file mode 100644
index 0000000000000..b4634a9ddfdf2
--- /dev/null
+++ b/packages/cli/src/UserManagement/email/templates/credentialsShared.html
@@ -0,0 +1,4 @@
+<p>Hi there,</p>
+<p><b>"{{ credentialsName }}" credential</b> has been shared with you.</p>
+<p>To view all the credentials you have access to within n8n, click the following link:</p>
+<p><a href="{{ credentialsListUrl }}" target="_blank">{{ credentialsListUrl }}</a></p>
diff --git a/packages/cli/src/UserManagement/email/templates/passwordReset.html b/packages/cli/src/UserManagement/email/templates/passwordReset.html
index e7f5bce5dae4a..865072275e39e 100644
--- a/packages/cli/src/UserManagement/email/templates/passwordReset.html
+++ b/packages/cli/src/UserManagement/email/templates/passwordReset.html
@@ -1,5 +1,5 @@
 <p>Hi {{firstName}},</p>
 <p>Somebody asked to reset your password on n8n ({{ domain }}).</p>
 <br />
-<p>Click the following link to choose a new password. The link is valid for 2 hours.</p>
+<p>Click the following link to choose a new password. The link is valid for 20 minutes.</p>
 <a href="{{ passwordResetUrl }}">{{ passwordResetUrl }}</a>
diff --git a/packages/cli/src/UserManagement/email/templates/workflowShared.html b/packages/cli/src/UserManagement/email/templates/workflowShared.html
new file mode 100644
index 0000000000000..d6fa692759ff7
--- /dev/null
+++ b/packages/cli/src/UserManagement/email/templates/workflowShared.html
@@ -0,0 +1,4 @@
+<p>Hi there,</p>
+<p><b>"{{ workflowName }}" workflow</b> has been shared with you.</p>
+<p>To access the workflow, click the following link:</p>
+<p><a href="{{ workflowUrl }}" target="_blank">{{ workflowUrl }}</a></p>
diff --git a/packages/cli/src/WaitTracker.ts b/packages/cli/src/WaitTracker.ts
index e04daee126ae5..6b79d10a9bd7b 100644
--- a/packages/cli/src/WaitTracker.ts
+++ b/packages/cli/src/WaitTracker.ts
@@ -1,30 +1,15 @@
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
-/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
-/* eslint-disable @typescript-eslint/naming-convention */
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* eslint-disable @typescript-eslint/restrict-template-expressions */
-/* eslint-disable @typescript-eslint/no-floating-promises */
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
 import {
+	ApplicationError,
 	ErrorReporterProxy as ErrorReporter,
-	LoggerProxy as Logger,
 	WorkflowOperationError,
 } from 'n8n-workflow';
-import { Service } from 'typedi';
-import type { FindManyOptions, ObjectLiteral } from 'typeorm';
-import { Not, LessThanOrEqual } from 'typeorm';
-import { DateUtils } from 'typeorm/util/DateUtils';
-
-import config from '@/config';
-import * as Db from '@/Db';
-import * as ResponseHelper from '@/ResponseHelper';
-import type {
-	IExecutionFlattedDb,
-	IExecutionsStopData,
-	IWorkflowExecutionDataProcess,
-} from '@/Interfaces';
+import { Container, Service } from 'typedi';
+import type { ExecutionStopResult, IWorkflowExecutionDataProcess } from '@/Interfaces';
 import { WorkflowRunner } from '@/WorkflowRunner';
-import { getWorkflowOwner } from '@/UserManagement/UserManagementHelper';
+import { ExecutionRepository } from '@db/repositories/execution.repository';
+import { OwnershipService } from '@/services/ownership.service';
+import { Logger } from '@/Logger';
+import { OrchestrationService } from '@/services/orchestration.service';
 
 @Service()
 export class WaitTracker {
@@ -37,55 +22,72 @@ export class WaitTracker {
 
 	mainTimer: NodeJS.Timeout;
 
-	constructor() {
+	constructor(
+		private readonly logger: Logger,
+		private readonly executionRepository: ExecutionRepository,
+		private readonly ownershipService: OwnershipService,
+		private readonly workflowRunner: WorkflowRunner,
+		readonly orchestrationService: OrchestrationService,
+	) {
+		const { isSingleMainSetup, isLeader, multiMainSetup } = orchestrationService;
+
+		if (isSingleMainSetup) {
+			this.startTracking();
+			return;
+		}
+
+		if (isLeader) this.startTracking();
+
+		multiMainSetup
+			.on('leader-takeover', () => this.startTracking())
+			.on('leader-stepdown', () => this.stopTracking());
+	}
+
+	startTracking() {
+		this.logger.debug('Wait tracker started tracking waiting executions');
+
 		// Poll every 60 seconds a list of upcoming executions
 		this.mainTimer = setInterval(() => {
-			this.getWaitingExecutions();
+			void this.getWaitingExecutions();
 		}, 60000);
 
-		this.getWaitingExecutions();
+		void this.getWaitingExecutions();
 	}
 
-	// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 	async getWaitingExecutions() {
-		Logger.debug('Wait tracker querying database for waiting executions');
-		// Find all the executions which should be triggered in the next 70 seconds
-		const findQuery: FindManyOptions<IExecutionFlattedDb> = {
-			select: ['id', 'waitTill'],
-			where: {
-				waitTill: LessThanOrEqual(new Date(Date.now() + 70000)),
-				status: Not('crashed'),
-			},
-			order: {
-				waitTill: 'ASC',
-			},
-		};
-
-		const dbType = config.getEnv('database.type');
-		if (dbType === 'sqlite') {
-			// This is needed because of issue in TypeORM <> SQLite:
-			// https://github.com/typeorm/typeorm/issues/2286
-			(findQuery.where! as ObjectLiteral).waitTill = LessThanOrEqual(
-				DateUtils.mixedDateToUtcDatetimeString(new Date(Date.now() + 70000)),
-			);
-		}
+		this.logger.debug('Wait tracker querying database for waiting executions');
 
-		const executions = await Db.collections.Execution.find(findQuery);
+		const executions = await this.executionRepository.getWaitingExecutions();
 
 		if (executions.length === 0) {
 			return;
 		}
 
 		const executionIds = executions.map((execution) => execution.id).join(', ');
-		Logger.debug(
+		this.logger.debug(
 			`Wait tracker found ${executions.length} executions. Setting timer for IDs: ${executionIds}`,
 		);
 
 		// Add timers for each waiting execution that they get started at the correct time
-		// eslint-disable-next-line no-restricted-syntax
+
 		for (const execution of executions) {
 			const executionId = execution.id;
 			if (this.waitingExecutions[executionId] === undefined) {
+				if (!(execution.waitTill instanceof Date)) {
+					// n8n expects waitTill to be a date object
+					// but for some reason it's not being converted
+					// we are handling this like this since it seems to address the issue
+					// for some users, as reported by Jon when using a custom image.
+					// Once we figure out why this it not a Date object, we can remove this.
+					ErrorReporter.error('Wait Till is not a date object', {
+						extra: {
+							variableType: typeof execution.waitTill,
+						},
+					});
+					if (typeof execution.waitTill === 'string') {
+						execution.waitTill = new Date(execution.waitTill);
+					}
+				}
 				const triggerTime = execution.waitTill!.getTime() - new Date().getTime();
 				this.waitingExecutions[executionId] = {
 					executionId,
@@ -97,7 +99,7 @@ export class WaitTracker {
 		}
 	}
 
-	async stopExecution(executionId: string): Promise<IExecutionsStopData> {
+	async stopExecution(executionId: string): Promise<ExecutionStopResult> {
 		if (this.waitingExecutions[executionId] !== undefined) {
 			// The waiting execution was already scheduled to execute.
 			// So stop timer and remove.
@@ -106,14 +108,22 @@ export class WaitTracker {
 		}
 
 		// Also check in database
-		const execution = await Db.collections.Execution.findOneBy({ id: executionId });
+		const fullExecutionData = await this.executionRepository.findSingleExecution(executionId, {
+			includeData: true,
+			unflattenData: true,
+		});
 
-		if (execution === null || !execution.waitTill) {
-			throw new Error(`The execution ID "${executionId}" could not be found.`);
+		if (!fullExecutionData) {
+			throw new ApplicationError('Execution not found.', {
+				extra: { executionId },
+			});
 		}
 
-		const fullExecutionData = ResponseHelper.unflattenExecutionData(execution);
-
+		if (!['new', 'unknown', 'waiting', 'running'].includes(fullExecutionData.status)) {
+			throw new WorkflowOperationError(
+				`Only running or waiting executions can be stopped and ${executionId} is currently ${fullExecutionData.status}.`,
+			);
+		}
 		// Set in execution in DB as failed and remove waitTill time
 		const error = new WorkflowOperationError('Workflow-Execution has been canceled!');
 
@@ -127,11 +137,9 @@ export class WaitTracker {
 		fullExecutionData.waitTill = null;
 		fullExecutionData.status = 'canceled';
 
-		await Db.collections.Execution.update(
+		await Container.get(ExecutionRepository).updateExistingExecution(
 			executionId,
-			ResponseHelper.flattenExecutionData({
-				...fullExecutionData,
-			}) as IExecutionFlattedDb,
+			fullExecutionData,
 		);
 
 		return {
@@ -144,29 +152,28 @@ export class WaitTracker {
 	}
 
 	startExecution(executionId: string) {
-		Logger.debug(`Wait tracker resuming execution ${executionId}`, { executionId });
+		this.logger.debug(`Wait tracker resuming execution ${executionId}`, { executionId });
 		delete this.waitingExecutions[executionId];
 
 		(async () => {
 			// Get the data to execute
-			const fullExecutionDataFlatted = await Db.collections.Execution.findOneBy({
-				id: executionId,
+			const fullExecutionData = await this.executionRepository.findSingleExecution(executionId, {
+				includeData: true,
+				unflattenData: true,
 			});
 
-			if (fullExecutionDataFlatted === null) {
-				throw new Error(`The execution with the id "${executionId}" does not exist.`);
+			if (!fullExecutionData) {
+				throw new ApplicationError('Execution does not exist.', { extra: { executionId } });
 			}
-
-			const fullExecutionData = ResponseHelper.unflattenExecutionData(fullExecutionDataFlatted);
-
 			if (fullExecutionData.finished) {
-				throw new Error('The execution did succeed and can so not be started again.');
+				throw new ApplicationError('The execution did succeed and can so not be started again.');
 			}
 
 			if (!fullExecutionData.workflowData.id) {
-				throw new Error('Only saved workflows can be resumed.');
+				throw new ApplicationError('Only saved workflows can be resumed.');
 			}
-			const user = await getWorkflowOwner(fullExecutionData.workflowData.id);
+			const workflowId = fullExecutionData.workflowData.id;
+			const user = await this.ownershipService.getWorkflowOwnerCached(workflowId);
 
 			const data: IWorkflowExecutionDataProcess = {
 				executionMode: fullExecutionData.mode,
@@ -176,14 +183,22 @@ export class WaitTracker {
 			};
 
 			// Start the execution again
-			const workflowRunner = new WorkflowRunner();
-			await workflowRunner.run(data, false, false, executionId);
+			await this.workflowRunner.run(data, false, false, executionId);
 		})().catch((error: Error) => {
 			ErrorReporter.error(error);
-			Logger.error(
+			this.logger.error(
 				`There was a problem starting the waiting execution with id "${executionId}": "${error.message}"`,
 				{ executionId },
 			);
 		});
 	}
+
+	stopTracking() {
+		this.logger.debug('Wait tracker shutting down');
+
+		clearInterval(this.mainTimer);
+		Object.keys(this.waitingExecutions).forEach((executionId) => {
+			clearTimeout(this.waitingExecutions[executionId].timer);
+		});
+	}
 }
diff --git a/packages/cli/src/WaitingForms.ts b/packages/cli/src/WaitingForms.ts
new file mode 100644
index 0000000000000..0625acd7e40c4
--- /dev/null
+++ b/packages/cli/src/WaitingForms.ts
@@ -0,0 +1,19 @@
+import { Service } from 'typedi';
+
+import type { IExecutionResponse } from '@/Interfaces';
+import { WaitingWebhooks } from '@/WaitingWebhooks';
+
+@Service()
+export class WaitingForms extends WaitingWebhooks {
+	protected override includeForms = true;
+
+	protected override logReceivedWebhook(method: string, executionId: string) {
+		this.logger.debug(`Received waiting-form "${method}" for execution "${executionId}"`);
+	}
+
+	protected disableNode(execution: IExecutionResponse, method?: string) {
+		if (method === 'POST') {
+			execution.data.executionData!.nodeExecutionStack[0].node.disabled = true;
+		}
+	}
+}
diff --git a/packages/cli/src/WaitingWebhooks.ts b/packages/cli/src/WaitingWebhooks.ts
index f5e9ac6344e8e..c745644dbeb7a 100644
--- a/packages/cli/src/WaitingWebhooks.ts
+++ b/packages/cli/src/WaitingWebhooks.ts
@@ -1,88 +1,84 @@
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
-/* eslint-disable @typescript-eslint/restrict-template-expressions */
-/* eslint-disable no-param-reassign */
-import type { INode, WebhookHttpMethod } from 'n8n-workflow';
-import { NodeHelpers, Workflow, LoggerProxy as Logger } from 'n8n-workflow';
+import { NodeHelpers, Workflow } from 'n8n-workflow';
 import { Service } from 'typedi';
 import type express from 'express';
 
-import * as Db from '@/Db';
-import * as ResponseHelper from '@/ResponseHelper';
 import * as WebhookHelpers from '@/WebhookHelpers';
 import { NodeTypes } from '@/NodeTypes';
-import type { IExecutionResponse, IResponseCallbackData, IWorkflowDb } from '@/Interfaces';
+import type {
+	IExecutionResponse,
+	IResponseCallbackData,
+	IWebhookManager,
+	IWorkflowDb,
+	WaitingWebhookRequest,
+} from '@/Interfaces';
 import * as WorkflowExecuteAdditionalData from '@/WorkflowExecuteAdditionalData';
-import { getWorkflowOwner } from '@/UserManagement/UserManagementHelper';
+import { ExecutionRepository } from '@db/repositories/execution.repository';
+import { OwnershipService } from './services/ownership.service';
+import { Logger } from '@/Logger';
+import { ConflictError } from './errors/response-errors/conflict.error';
+import { NotFoundError } from './errors/response-errors/not-found.error';
 
 @Service()
-export class WaitingWebhooks {
-	constructor(private nodeTypes: NodeTypes) {}
+export class WaitingWebhooks implements IWebhookManager {
+	protected includeForms = false;
 
-	async executeWebhook(
-		httpMethod: WebhookHttpMethod,
-		fullPath: string,
-		req: express.Request,
-		res: express.Response,
-	): Promise<IResponseCallbackData> {
-		Logger.debug(`Received waiting-webhook "${httpMethod}" for path "${fullPath}"`);
+	constructor(
+		protected readonly logger: Logger,
+		private readonly nodeTypes: NodeTypes,
+		private readonly executionRepository: ExecutionRepository,
+		private readonly ownershipService: OwnershipService,
+	) {}
 
-		// Reset request parameters
-		req.params = {};
+	// TODO: implement `getWebhookMethods` for CORS support
 
-		// Remove trailing slash
-		if (fullPath.endsWith('/')) {
-			fullPath = fullPath.slice(0, -1);
-		}
+	protected logReceivedWebhook(method: string, executionId: string) {
+		this.logger.debug(`Received waiting-webhook "${method}" for execution "${executionId}"`);
+	}
 
-		const pathParts = fullPath.split('/');
+	protected disableNode(execution: IExecutionResponse, _method?: string) {
+		execution.data.executionData!.nodeExecutionStack[0].node.disabled = true;
+	}
 
-		const executionId = pathParts.shift();
-		const path = pathParts.join('/');
+	async executeWebhook(
+		req: WaitingWebhookRequest,
+		res: express.Response,
+	): Promise<IResponseCallbackData> {
+		const { path: executionId, suffix } = req.params;
 
-		const execution = await Db.collections.Execution.findOneBy({ id: executionId });
+		this.logReceivedWebhook(req.method, executionId);
 
-		if (execution === null) {
-			throw new ResponseHelper.NotFoundError(`The execution "${executionId} does not exist.`);
-		}
+		// Reset request parameters
+		req.params = {} as WaitingWebhookRequest['params'];
 
-		const fullExecutionData = ResponseHelper.unflattenExecutionData(execution);
+		const execution = await this.executionRepository.findSingleExecution(executionId, {
+			includeData: true,
+			unflattenData: true,
+		});
 
-		if (fullExecutionData.finished || fullExecutionData.data.resultData.error) {
-			throw new ResponseHelper.ConflictError(`The execution "${executionId} has finished already.`);
+		if (!execution) {
+			throw new NotFoundError(`The execution "${executionId} does not exist.`);
 		}
 
-		return this.startExecution(httpMethod, path, fullExecutionData, req, res);
-	}
-
-	async startExecution(
-		httpMethod: WebhookHttpMethod,
-		path: string,
-		fullExecutionData: IExecutionResponse,
-		req: express.Request,
-		res: express.Response,
-	): Promise<IResponseCallbackData> {
-		const executionId = fullExecutionData.id;
-
-		if (fullExecutionData.finished) {
-			throw new Error('The execution did succeed and can so not be started again.');
+		if (execution.finished || execution.data.resultData.error) {
+			throw new ConflictError(`The execution "${executionId} has finished already.`);
 		}
 
-		const lastNodeExecuted = fullExecutionData.data.resultData.lastNodeExecuted as string;
+		const lastNodeExecuted = execution.data.resultData.lastNodeExecuted as string;
 
 		// Set the node as disabled so that the data does not get executed again as it would result
 		// in starting the wait all over again
-		fullExecutionData.data.executionData!.nodeExecutionStack[0].node.disabled = true;
+		this.disableNode(execution, req.method);
 
 		// Remove waitTill information else the execution would stop
-		fullExecutionData.data.waitTill = undefined;
+		execution.data.waitTill = undefined;
 
 		// Remove the data of the node execution again else it will display the node as executed twice
-		fullExecutionData.data.resultData.runData[lastNodeExecuted].pop();
+		execution.data.resultData.runData[lastNodeExecuted].pop();
 
-		const { workflowData } = fullExecutionData;
+		const { workflowData } = execution;
 
 		const workflow = new Workflow({
-			id: workflowData.id!.toString(),
+			id: workflowData.id,
 			name: workflowData.name,
 			nodes: workflowData.nodes,
 			connections: workflowData.connections,
@@ -94,44 +90,41 @@ export class WaitingWebhooks {
 
 		let workflowOwner;
 		try {
-			workflowOwner = await getWorkflowOwner(workflowData.id!.toString());
+			workflowOwner = await this.ownershipService.getWorkflowOwnerCached(workflowData.id);
 		} catch (error) {
-			throw new ResponseHelper.NotFoundError('Could not find workflow');
+			throw new NotFoundError('Could not find workflow');
 		}
 
-		const additionalData = await WorkflowExecuteAdditionalData.getBase(workflowOwner.id);
+		const workflowStartNode = workflow.getNode(lastNodeExecuted);
+		if (workflowStartNode === null) {
+			throw new NotFoundError('Could not find node to process webhook.');
+		}
 
+		const additionalData = await WorkflowExecuteAdditionalData.getBase(workflowOwner.id);
 		const webhookData = NodeHelpers.getNodeWebhooks(
 			workflow,
-			workflow.getNode(lastNodeExecuted) as INode,
+			workflowStartNode,
 			additionalData,
-		).filter((webhook) => {
-			return (
-				webhook.httpMethod === httpMethod &&
-				webhook.path === path &&
-				webhook.webhookDescription.restartWebhook === true
-			);
-		})[0];
+		).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.
 			// Return 404 because we do not want to give any data if the execution exists or not.
-			const errorMessage = `The execution "${executionId}" with webhook suffix path "${path}" is not known.`;
-			throw new ResponseHelper.NotFoundError(errorMessage);
+			const errorMessage = `The workflow for execution "${executionId}" does not contain a waiting webhook with a matching path/method.`;
+			throw new NotFoundError(errorMessage);
 		}
 
-		const workflowStartNode = workflow.getNode(lastNodeExecuted);
+		const runExecutionData = execution.data;
 
-		if (workflowStartNode === null) {
-			throw new ResponseHelper.NotFoundError('Could not find node to process webhook.');
-		}
-
-		const runExecutionData = fullExecutionData.data;
-
-		return new Promise((resolve, reject) => {
+		return await new Promise((resolve, reject) => {
 			const executionMode = 'webhook';
-			// eslint-disable-next-line @typescript-eslint/no-floating-promises
-			WebhookHelpers.executeWebhook(
+			void WebhookHelpers.executeWebhook(
 				workflow,
 				webhookData,
 				workflowData as IWorkflowDb,
@@ -139,10 +132,10 @@ export class WaitingWebhooks {
 				executionMode,
 				undefined,
 				runExecutionData,
-				fullExecutionData.id,
+				execution.id,
 				req,
 				res,
-				// eslint-disable-next-line consistent-return
+
 				(error: Error | null, data: object) => {
 					if (error !== null) {
 						return reject(error);
diff --git a/packages/cli/src/WebhookHelpers.ts b/packages/cli/src/WebhookHelpers.ts
index e399f10beb657..2682e928edd46 100644
--- a/packages/cli/src/WebhookHelpers.ts
+++ b/packages/cli/src/WebhookHelpers.ts
@@ -1,54 +1,56 @@
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
-/* eslint-disable @typescript-eslint/no-unsafe-call */
-/* eslint-disable no-param-reassign */
 /* eslint-disable @typescript-eslint/prefer-optional-chain */
 /* eslint-disable @typescript-eslint/no-shadow */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable id-denylist */
 /* eslint-disable prefer-spread */
-/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
-/* eslint-disable @typescript-eslint/prefer-nullish-coalescing */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* eslint-disable no-restricted-syntax */
 /* eslint-disable @typescript-eslint/restrict-template-expressions */
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
-/* eslint-disable prefer-destructuring */
 import type express from 'express';
-import get from 'lodash.get';
+import { Container } from 'typedi';
+import get from 'lodash/get';
+import { finished } from 'stream/promises';
+import formidable from 'formidable';
 
-import { BinaryDataManager, NodeExecuteFunctions, eventEmitter } from 'n8n-core';
+import { BinaryDataService, NodeExecuteFunctions } from 'n8n-core';
 
 import type {
+	IBinaryData,
 	IBinaryKeyData,
 	IDataObject,
 	IDeferredPromise,
 	IExecuteData,
 	IExecuteResponsePromiseData,
+	IHttpRequestMethods,
 	IN8nHttpFullResponse,
 	INode,
+	IPinData,
 	IRunExecutionData,
 	IWebhookData,
 	IWebhookResponseData,
 	IWorkflowDataProxyAdditionalKeys,
 	IWorkflowExecuteAdditionalData,
+	WebhookResponseMode,
 	Workflow,
 	WorkflowExecuteMode,
 } from 'n8n-workflow';
 import {
+	ApplicationError,
 	BINARY_ENCODING,
 	createDeferredPromise,
 	ErrorReporterProxy as ErrorReporter,
-	LoggerProxy as Logger,
 	NodeHelpers,
 } from 'n8n-workflow';
 
 import type {
 	IExecutionDb,
 	IResponseCallbackData,
+	IWebhookManager,
 	IWorkflowDb,
 	IWorkflowExecutionDataProcess,
+	WebhookCORSRequest,
+	WebhookRequest,
 } from '@/Interfaces';
-import * as GenericHelpers from '@/GenericHelpers';
 import * as ResponseHelper from '@/ResponseHelper';
 import * as WorkflowHelpers from '@/WorkflowHelpers';
 import { WorkflowRunner } from '@/WorkflowRunner';
@@ -56,14 +58,107 @@ import * as WorkflowExecuteAdditionalData from '@/WorkflowExecuteAdditionalData'
 import { ActiveExecutions } from '@/ActiveExecutions';
 import type { User } from '@db/entities/User';
 import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
-import { getWorkflowOwner } from '@/UserManagement/UserManagementHelper';
-import { Container } from 'typedi';
+import { EventsService } from '@/services/events.service';
+import { OwnershipService } from './services/ownership.service';
+import { parseBody } from './middlewares';
+import { Logger } from './Logger';
+import { NotFoundError } from './errors/response-errors/not-found.error';
+import { InternalServerError } from './errors/response-errors/internal-server.error';
+import { UnprocessableRequestError } from './errors/response-errors/unprocessable.error';
+
+export const WEBHOOK_METHODS: IHttpRequestMethods[] = [
+	'DELETE',
+	'GET',
+	'HEAD',
+	'PATCH',
+	'POST',
+	'PUT',
+];
+
+export const webhookRequestHandler =
+	(webhookManager: IWebhookManager) =>
+	async (req: WebhookRequest | WebhookCORSRequest, res: express.Response) => {
+		const { path } = req.params;
+		const method = req.method;
+
+		if (method !== 'OPTIONS' && !WEBHOOK_METHODS.includes(method)) {
+			return ResponseHelper.sendErrorResponse(
+				res,
+				new Error(`The method ${method} is not supported.`),
+			);
+		}
+
+		// Setup CORS headers only if the incoming request has an `origin` header
+		if ('origin' in req.headers) {
+			if (webhookManager.getWebhookMethods) {
+				try {
+					const allowedMethods = await webhookManager.getWebhookMethods(path);
+					res.header('Access-Control-Allow-Methods', ['OPTIONS', ...allowedMethods].join(', '));
+				} catch (error) {
+					return ResponseHelper.sendErrorResponse(res, error as Error);
+				}
+			}
+
+			const requestedMethod =
+				method === 'OPTIONS'
+					? (req.headers['access-control-request-method'] as IHttpRequestMethods)
+					: method;
+			if (webhookManager.findAccessControlOptions && requestedMethod) {
+				const options = await webhookManager.findAccessControlOptions(path, requestedMethod);
+				const { allowedOrigins } = options ?? {};
+
+				if (allowedOrigins && allowedOrigins !== '*' && allowedOrigins !== req.headers.origin) {
+					const originsList = allowedOrigins.split(',');
+					const defaultOrigin = originsList[0];
 
-export const WEBHOOK_METHODS = ['DELETE', 'GET', 'HEAD', 'PATCH', 'POST', 'PUT'];
+					if (originsList.length === 1) {
+						res.header('Access-Control-Allow-Origin', defaultOrigin);
+					}
+
+					if (originsList.includes(req.headers.origin as string)) {
+						res.header('Access-Control-Allow-Origin', req.headers.origin);
+					} else {
+						res.header('Access-Control-Allow-Origin', defaultOrigin);
+					}
+				} else {
+					res.header('Access-Control-Allow-Origin', req.headers.origin);
+				}
+
+				if (method === 'OPTIONS') {
+					res.header('Access-Control-Max-Age', '300');
+					const requestedHeaders = req.headers['access-control-request-headers'];
+					if (requestedHeaders?.length) {
+						res.header('Access-Control-Allow-Headers', requestedHeaders);
+					}
+				}
+			}
+		}
+
+		if (method === 'OPTIONS') {
+			return ResponseHelper.sendSuccessResponse(res, {}, true, 204);
+		}
+
+		let response;
+		try {
+			response = await webhookManager.executeWebhook(req, res);
+		} catch (error) {
+			return ResponseHelper.sendErrorResponse(res, error as Error);
+		}
+
+		// Don't respond, if already responded
+		if (response.noWebhookResponse !== true) {
+			ResponseHelper.sendSuccessResponse(
+				res,
+				response.data,
+				true,
+				response.responseCode,
+				response.headers,
+			);
+		}
+	};
 
 /**
  * Returns all the webhooks which should be created for the given workflow
- *
  */
 export function getWorkflowWebhooks(
 	workflow: Workflow,
@@ -86,7 +181,7 @@ export function getWorkflowWebhooks(
 		if (parentNodes !== undefined && !parentNodes.includes(node.name)) {
 			// If parentNodes are given check only them if they have webhooks
 			// and no other ones
-			// eslint-disable-next-line no-continue
+
 			continue;
 		}
 		returnData.push.apply(
@@ -98,23 +193,6 @@ export function getWorkflowWebhooks(
 	return returnData;
 }
 
-export function decodeWebhookResponse(
-	response: IExecuteResponsePromiseData,
-): IExecuteResponsePromiseData {
-	if (
-		typeof response === 'object' &&
-		typeof response.body === 'object' &&
-		(response.body as IDataObject)['__@N8nEncodedBuffer@__']
-	) {
-		response.body = Buffer.from(
-			(response.body as IDataObject)['__@N8nEncodedBuffer@__'] as string,
-			BINARY_ENCODING,
-		);
-	}
-
-	return response;
-}
-
 export function encodeWebhookResponse(
 	response: IExecuteResponsePromiseData,
 ): IExecuteResponsePromiseData {
@@ -128,22 +206,29 @@ export function encodeWebhookResponse(
 	return response;
 }
 
+const normalizeFormData = <T>(values: Record<string, T | T[]>) => {
+	for (const key in values) {
+		const value = values[key];
+		if (Array.isArray(value) && value.length === 1) {
+			values[key] = value[0];
+		}
+	}
+};
+
 /**
  * Executes a webhook
- *
- * @param {(string | undefined)} sessionId
- * @param {((error: Error | null, data: IResponseCallbackData) => void)} responseCallback
  */
+// eslint-disable-next-line complexity
 export async function executeWebhook(
 	workflow: Workflow,
 	webhookData: IWebhookData,
 	workflowData: IWorkflowDb,
 	workflowStartNode: INode,
 	executionMode: WorkflowExecuteMode,
-	sessionId: string | undefined,
+	pushRef: string | undefined,
 	runExecutionData: IRunExecutionData | undefined,
 	executionId: string | undefined,
-	req: express.Request,
+	req: WebhookRequest,
 	res: express.Response,
 	responseCallback: (error: Error | null, data: IResponseCallbackData) => void,
 	destinationNode?: string,
@@ -156,7 +241,7 @@ export async function executeWebhook(
 	if (nodeType === undefined) {
 		const errorMessage = `The type of the webhook node "${workflowStartNode.name}" is not known`;
 		responseCallback(new Error(errorMessage), {});
-		throw new ResponseHelper.InternalServerError(errorMessage);
+		throw new InternalServerError(errorMessage);
 	}
 
 	const additionalKeys: IWorkflowDataProxyAdditionalKeys = {
@@ -171,9 +256,9 @@ export async function executeWebhook(
 		user = (workflowData as WorkflowEntity).shared[0].user;
 	} else {
 		try {
-			user = await getWorkflowOwner(workflowData.id);
+			user = await Container.get(OwnershipService).getWorkflowOwnerCached(workflowData.id);
 		} catch (error) {
-			throw new ResponseHelper.NotFoundError('Cannot find workflow');
+			throw new NotFoundError('Cannot find workflow');
 		}
 	}
 
@@ -185,44 +270,56 @@ export async function executeWebhook(
 		workflowStartNode,
 		webhookData.webhookDescription.responseMode,
 		executionMode,
-		additionalData.timezone,
 		additionalKeys,
 		undefined,
 		'onReceived',
-	);
+	) as WebhookResponseMode;
 	const responseCode = workflow.expression.getSimpleParameterValue(
 		workflowStartNode,
-		webhookData.webhookDescription.responseCode,
+		webhookData.webhookDescription.responseCode as string,
 		executionMode,
-		additionalData.timezone,
 		additionalKeys,
 		undefined,
 		200,
 	) as number;
 
-	const responseData = workflow.expression.getSimpleParameterValue(
+	const responseData = workflow.expression.getComplexParameterValue(
 		workflowStartNode,
 		webhookData.webhookDescription.responseData,
 		executionMode,
-		additionalData.timezone,
 		additionalKeys,
 		undefined,
 		'firstEntryJson',
 	);
 
-	if (!['onReceived', 'lastNode', 'responseNode'].includes(responseMode as string)) {
+	if (!['onReceived', 'lastNode', 'responseNode'].includes(responseMode)) {
 		// If the mode is not known we error. Is probably best like that instead of using
 		// the default that people know as early as possible (probably already testing phase)
 		// that something does not resolve properly.
 		const errorMessage = `The response mode '${responseMode}' is not valid!`;
 		responseCallback(new Error(errorMessage), {});
-		throw new ResponseHelper.InternalServerError(errorMessage);
+		throw new InternalServerError(errorMessage);
 	}
 
 	// Add the Response and Request so that this data can be accessed in the node
 	additionalData.httpRequest = req;
 	additionalData.httpResponse = res;
 
+	let binaryData;
+
+	const nodeVersion = workflowStartNode.typeVersion;
+	if (nodeVersion === 1) {
+		// binaryData option is removed in versions higher than 1
+		binaryData = workflow.expression.getSimpleParameterValue(
+			workflowStartNode,
+			'={{$parameter["options"]["binaryData"]}}',
+			executionMode,
+			additionalKeys,
+			undefined,
+			false,
+		);
+	}
+
 	let didSendResponse = false;
 	let runExecutionDataMerge = {};
 	try {
@@ -230,6 +327,40 @@ export async function executeWebhook(
 		// the workflow should be executed or not
 		let webhookResultData: IWebhookResponseData;
 
+		// if `Webhook` or `Wait` node, and binaryData is enabled, skip pre-parse the request-body
+		// always falsy for versions higher than 1
+		if (!binaryData) {
+			const { contentType, encoding } = req;
+			if (contentType === 'multipart/form-data') {
+				const form = formidable({
+					multiples: true,
+					encoding: encoding as formidable.BufferEncoding,
+					// TODO: pass a custom `fileWriteStreamHandler` to create binary data files directly
+				});
+				req.body = await new Promise((resolve) => {
+					form.parse(req, async (_err, data, files) => {
+						normalizeFormData(data);
+						normalizeFormData(files);
+						resolve({ data, files });
+					});
+				});
+			} else {
+				if (nodeVersion > 1) {
+					if (
+						contentType?.startsWith('application/json') ||
+						contentType?.startsWith('text/plain') ||
+						contentType?.startsWith('application/x-www-form-urlencoded') ||
+						contentType?.endsWith('/xml') ||
+						contentType?.endsWith('+xml')
+					) {
+						await parseBody(req);
+					}
+				} else {
+					await parseBody(req);
+				}
+			}
+		}
+
 		try {
 			webhookResultData = await workflow.runWebhook(
 				webhookData,
@@ -238,7 +369,7 @@ export async function executeWebhook(
 				NodeExecuteFunctions,
 				executionMode,
 			);
-			eventEmitter.emit(eventEmitter.types.nodeFetchedData, workflow.id, workflowStartNode);
+			Container.get(EventsService).emit('nodeFetchedData', workflow.id, workflowStartNode);
 		} catch (err) {
 			// Send error response to webhook caller
 			const errorMessage = 'Workflow Webhook Error: Workflow could not be started!';
@@ -266,9 +397,6 @@ export async function executeWebhook(
 			};
 		}
 
-		// Save static data if it changed
-		await WorkflowHelpers.saveStaticData(workflow);
-
 		const additionalKeys: IWorkflowDataProxyAdditionalKeys = {
 			$executionId: executionId,
 		};
@@ -278,7 +406,6 @@ export async function executeWebhook(
 				workflowStartNode,
 				webhookData.webhookDescription.responseHeaders,
 				executionMode,
-				additionalData.timezone,
 				additionalKeys,
 				undefined,
 				undefined,
@@ -319,7 +446,7 @@ export async function executeWebhook(
 				}
 			} else {
 				// Send default response
-				// eslint-disable-next-line no-lonely-if
+
 				if (!didSendResponse) {
 					responseCallback(null, {
 						data: {
@@ -342,6 +469,12 @@ export async function executeWebhook(
 				responseCallback(null, {
 					responseCode,
 				});
+			} else if (responseData) {
+				// Return the data specified in the response data option
+				responseCallback(null, {
+					data: responseData as IDataObject,
+					responseCode,
+				});
 			} else if (webhookResultData.webhookResponse !== undefined) {
 				// Data to respond with is given
 				responseCallback(null, {
@@ -400,11 +533,19 @@ export async function executeWebhook(
 			Object.assign(runExecutionData, runExecutionDataMerge);
 		}
 
+		let pinData: IPinData | undefined;
+		const usePinData = executionMode === 'manual';
+		if (usePinData) {
+			pinData = workflowData.pinData;
+			runExecutionData.resultData.pinData = pinData;
+		}
+
 		const runData: IWorkflowExecutionDataProcess = {
 			executionMode,
 			executionData: runExecutionData,
-			sessionId,
+			pushRef,
 			workflowData,
+			pinData,
 			userId: user.id,
 		};
 
@@ -413,33 +554,55 @@ export async function executeWebhook(
 			responsePromise = await createDeferredPromise<IN8nHttpFullResponse>();
 			responsePromise
 				.promise()
-				.then((response: IN8nHttpFullResponse) => {
+				.then(async (response: IN8nHttpFullResponse) => {
 					if (didSendResponse) {
 						return;
 					}
 
-					if (Buffer.isBuffer(response.body)) {
+					const binaryData = (response.body as IDataObject)?.binaryData as IBinaryData;
+					if (binaryData?.id) {
+						res.header(response.headers);
+						const stream = await Container.get(BinaryDataService).getAsStream(binaryData.id);
+						stream.pipe(res, { end: false });
+						await finished(stream);
+						responseCallback(null, { noWebhookResponse: true });
+					} else if (Buffer.isBuffer(response.body)) {
 						res.header(response.headers);
 						res.end(response.body);
-
-						responseCallback(null, {
-							noWebhookResponse: true,
-						});
+						responseCallback(null, { noWebhookResponse: true });
 					} else {
 						// TODO: This probably needs some more changes depending on the options on the
 						//       Webhook Response node
+						const headers = response.headers;
+						let responseCode = response.statusCode;
+						let data = response.body as IDataObject;
+
+						// for formTrigger node redirection has to be handled by sending redirectURL in response body
+						if (
+							nodeType.description.name === 'formTrigger' &&
+							headers.location &&
+							String(responseCode).startsWith('3')
+						) {
+							responseCode = 200;
+							data = {
+								redirectURL: headers.location,
+							};
+							headers.location = undefined;
+						}
+
 						responseCallback(null, {
-							data: response.body as IDataObject,
-							headers: response.headers,
-							responseCode: response.statusCode,
+							data,
+							headers,
+							responseCode,
 						});
 					}
 
+					process.nextTick(() => res.end());
 					didSendResponse = true;
 				})
 				.catch(async (error) => {
 					ErrorReporter.error(error);
-					Logger.error(
+					Container.get(Logger).error(
 						`Error with Webhook-Response for execution "${executionId}": "${error.message}"`,
 						{ executionId, workflowId: workflow.id },
 					);
@@ -447,8 +610,7 @@ export async function executeWebhook(
 		}
 
 		// Start now to run the workflow
-		const workflowRunner = new WorkflowRunner();
-		executionId = await workflowRunner.run(
+		executionId = await Container.get(WorkflowRunner).run(
 			runData,
 			true,
 			!didSendResponse,
@@ -456,250 +618,236 @@ export async function executeWebhook(
 			responsePromise,
 		);
 
-		Logger.verbose(
+		Container.get(Logger).verbose(
 			`Started execution of workflow "${workflow.name}" from webhook with execution ID ${executionId}`,
 			{ executionId },
 		);
 
-		// Get a promise which resolves when the workflow did execute and send then response
-		const executePromise = Container.get(ActiveExecutions).getPostExecutePromise(
-			executionId,
-		) as Promise<IExecutionDb | undefined>;
-		executePromise
-			.then(async (data) => {
-				if (data === undefined) {
-					if (!didSendResponse) {
-						responseCallback(null, {
-							data: {
-								message: 'Workflow executed successfully but no data was returned',
-							},
-							responseCode,
-						});
-						didSendResponse = true;
+		if (!didSendResponse) {
+			// Get a promise which resolves when the workflow did execute and send then response
+			const executePromise = Container.get(ActiveExecutions).getPostExecutePromise(
+				executionId,
+			) as Promise<IExecutionDb | undefined>;
+			executePromise
+				// eslint-disable-next-line complexity
+				.then(async (data) => {
+					if (data === undefined) {
+						if (!didSendResponse) {
+							responseCallback(null, {
+								data: {
+									message: 'Workflow executed successfully but no data was returned',
+								},
+								responseCode,
+							});
+							didSendResponse = true;
+						}
+						return undefined;
 					}
-					return undefined;
-				}
-
-				if (workflowData.pinData) {
-					data.data.resultData.pinData = workflowData.pinData;
-				}
 
-				const returnData = WorkflowHelpers.getDataLastExecutedNodeData(data);
-				if (data.data.resultData.error || returnData?.error !== undefined) {
-					if (!didSendResponse) {
-						responseCallback(null, {
-							data: {
-								message: 'Error in workflow',
-							},
-							responseCode: 500,
-						});
+					if (usePinData) {
+						data.data.resultData.pinData = pinData;
 					}
-					didSendResponse = true;
-					return data;
-				}
 
-				if (responseMode === 'responseNode') {
-					if (!didSendResponse) {
-						// Return an error if no Webhook-Response node did send any data
-						responseCallback(null, {
-							data: {
-								message: 'Workflow executed successfully',
-							},
-							responseCode,
-						});
+					const returnData = WorkflowHelpers.getDataLastExecutedNodeData(data);
+					if (data.data.resultData.error || returnData?.error !== undefined) {
+						if (!didSendResponse) {
+							responseCallback(null, {
+								data: {
+									message: 'Error in workflow',
+								},
+								responseCode: 500,
+							});
+						}
 						didSendResponse = true;
+						return data;
 					}
-					return undefined;
-				}
 
-				if (returnData === undefined) {
-					if (!didSendResponse) {
-						responseCallback(null, {
-							data: {
-								message: 'Workflow executed successfully but the last node did not return any data',
-							},
-							responseCode,
-						});
+					// in `responseNode` mode `responseCallback` is called by `responsePromise`
+					if (responseMode === 'responseNode' && responsePromise) {
+						await Promise.allSettled([responsePromise.promise()]);
+						return undefined;
 					}
-					didSendResponse = true;
-					return data;
-				}
-
-				const additionalKeys: IWorkflowDataProxyAdditionalKeys = {
-					$executionId: executionId,
-				};
 
-				if (!didSendResponse) {
-					let data: IDataObject | IDataObject[] | undefined;
+					if (returnData === undefined) {
+						if (!didSendResponse) {
+							responseCallback(null, {
+								data: {
+									message:
+										'Workflow executed successfully but the last node did not return any data',
+								},
+								responseCode,
+							});
+						}
+						didSendResponse = true;
+						return data;
+					}
 
-					if (responseData === 'firstEntryJson') {
-						// Return the JSON data of the first entry
+					const additionalKeys: IWorkflowDataProxyAdditionalKeys = {
+						$executionId: executionId,
+					};
 
-						if (returnData.data!.main[0]![0] === undefined) {
-							responseCallback(new Error('No item to return got found'), {});
-							didSendResponse = true;
-							return undefined;
-						}
+					if (!didSendResponse) {
+						let data: IDataObject | IDataObject[] | undefined;
 
-						data = returnData.data!.main[0]![0].json;
+						if (responseData === 'firstEntryJson') {
+							// Return the JSON data of the first entry
 
-						const responsePropertyName = workflow.expression.getSimpleParameterValue(
-							workflowStartNode,
-							webhookData.webhookDescription.responsePropertyName,
-							executionMode,
-							additionalData.timezone,
-							additionalKeys,
-							undefined,
-							undefined,
-						);
+							if (returnData.data!.main[0]![0] === undefined) {
+								responseCallback(new Error('No item to return got found'), {});
+								didSendResponse = true;
+								return undefined;
+							}
 
-						if (responsePropertyName !== undefined) {
-							data = get(data, responsePropertyName as string) as IDataObject;
-						}
+							data = returnData.data!.main[0]![0].json;
 
-						const responseContentType = workflow.expression.getSimpleParameterValue(
-							workflowStartNode,
-							webhookData.webhookDescription.responseContentType,
-							executionMode,
-							additionalData.timezone,
-							additionalKeys,
-							undefined,
-							undefined,
-						);
+							const responsePropertyName = workflow.expression.getSimpleParameterValue(
+								workflowStartNode,
+								webhookData.webhookDescription.responsePropertyName,
+								executionMode,
+								additionalKeys,
+								undefined,
+								undefined,
+							);
 
-						if (responseContentType !== undefined) {
-							// Send the webhook response manually to be able to set the content-type
-							res.setHeader('Content-Type', responseContentType as string);
-
-							// Returning an object, boolean, number, ... causes problems so make sure to stringify if needed
-							if (
-								data !== null &&
-								data !== undefined &&
-								['Buffer', 'String'].includes(data.constructor.name)
-							) {
-								res.end(data);
-							} else {
-								res.end(JSON.stringify(data));
+							if (responsePropertyName !== undefined) {
+								data = get(data, responsePropertyName as string) as IDataObject;
 							}
 
-							responseCallback(null, {
-								noWebhookResponse: true,
-							});
-							didSendResponse = true;
-						}
-					} else if (responseData === 'firstEntryBinary') {
-						// Return the binary data of the first entry
-						data = returnData.data!.main[0]![0];
+							const responseContentType = workflow.expression.getSimpleParameterValue(
+								workflowStartNode,
+								webhookData.webhookDescription.responseContentType,
+								executionMode,
+								additionalKeys,
+								undefined,
+								undefined,
+							);
 
-						if (data === undefined) {
-							responseCallback(new Error('No item was found to return'), {});
-							didSendResponse = true;
-							return undefined;
-						}
+							if (responseContentType !== undefined) {
+								// Send the webhook response manually to be able to set the content-type
+								res.setHeader('Content-Type', responseContentType as string);
+
+								// Returning an object, boolean, number, ... causes problems so make sure to stringify if needed
+								if (
+									data !== null &&
+									data !== undefined &&
+									['Buffer', 'String'].includes(data.constructor.name)
+								) {
+									res.end(data);
+								} else {
+									res.end(JSON.stringify(data));
+								}
+
+								responseCallback(null, {
+									noWebhookResponse: true,
+								});
+								didSendResponse = true;
+							}
+						} else if (responseData === 'firstEntryBinary') {
+							// Return the binary data of the first entry
+							data = returnData.data!.main[0]![0];
+
+							if (data === undefined) {
+								responseCallback(new Error('No item was found to return'), {});
+								didSendResponse = true;
+								return undefined;
+							}
 
-						if (data.binary === undefined) {
-							responseCallback(new Error('No binary data was found to return'), {});
-							didSendResponse = true;
-							return undefined;
-						}
+							if (data.binary === undefined) {
+								responseCallback(new Error('No binary data was found to return'), {});
+								didSendResponse = true;
+								return undefined;
+							}
 
-						const responseBinaryPropertyName = workflow.expression.getSimpleParameterValue(
-							workflowStartNode,
-							webhookData.webhookDescription.responseBinaryPropertyName,
-							executionMode,
-							additionalData.timezone,
-							additionalKeys,
-							undefined,
-							'data',
-						);
+							const responseBinaryPropertyName = workflow.expression.getSimpleParameterValue(
+								workflowStartNode,
+								webhookData.webhookDescription.responseBinaryPropertyName,
+								executionMode,
+								additionalKeys,
+								undefined,
+								'data',
+							);
 
-						if (responseBinaryPropertyName === undefined && !didSendResponse) {
-							responseCallback(new Error("No 'responseBinaryPropertyName' is set"), {});
-							didSendResponse = true;
-						}
+							if (responseBinaryPropertyName === undefined && !didSendResponse) {
+								responseCallback(new Error("No 'responseBinaryPropertyName' is set"), {});
+								didSendResponse = true;
+							}
 
-						const binaryData = (data.binary as IBinaryKeyData)[
-							responseBinaryPropertyName as string
-						];
-						if (binaryData === undefined && !didSendResponse) {
-							responseCallback(
-								new Error(
-									`The binary property '${responseBinaryPropertyName}' which should be returned does not exist`,
-								),
-								{},
-							);
-							didSendResponse = true;
+							const binaryData = (data.binary as IBinaryKeyData)[
+								responseBinaryPropertyName as string
+							];
+							if (binaryData === undefined && !didSendResponse) {
+								responseCallback(
+									new Error(
+										`The binary property '${responseBinaryPropertyName}' which should be returned does not exist`,
+									),
+									{},
+								);
+								didSendResponse = true;
+							}
+
+							if (!didSendResponse) {
+								// Send the webhook response manually
+								res.setHeader('Content-Type', binaryData.mimeType);
+								if (binaryData.id) {
+									const stream = await Container.get(BinaryDataService).getAsStream(binaryData.id);
+									stream.pipe(res, { end: false });
+									await finished(stream);
+								} else {
+									res.write(Buffer.from(binaryData.data, BINARY_ENCODING));
+								}
+
+								responseCallback(null, {
+									noWebhookResponse: true,
+								});
+								process.nextTick(() => res.end());
+							}
+						} else if (responseData === 'noData') {
+							// Return without data
+							data = undefined;
+						} else {
+							// Return the JSON data of all the entries
+							data = [];
+							for (const entry of returnData.data!.main[0]!) {
+								data.push(entry.json);
+							}
 						}
 
 						if (!didSendResponse) {
-							// Send the webhook response manually
-							res.setHeader('Content-Type', binaryData.mimeType);
-							const binaryDataBuffer = await BinaryDataManager.getInstance().retrieveBinaryData(
-								binaryData,
-							);
-							res.end(binaryDataBuffer);
-
 							responseCallback(null, {
-								noWebhookResponse: true,
+								data,
+								responseCode,
 							});
 						}
-					} else if (responseData === 'noData') {
-						// Return without data
-						data = undefined;
-					} else {
-						// Return the JSON data of all the entries
-						data = [];
-						for (const entry of returnData.data!.main[0]!) {
-							data.push(entry.json);
-						}
 					}
+					didSendResponse = true;
 
+					return data;
+				})
+				.catch((e) => {
 					if (!didSendResponse) {
-						responseCallback(null, {
-							data,
-							responseCode,
-						});
+						responseCallback(
+							new ApplicationError('There was a problem executing the workflow', {
+								level: 'warning',
+								cause: e,
+							}),
+							{},
+						);
 					}
-				}
-				didSendResponse = true;
 
-				return data;
-			})
-			.catch((e) => {
-				if (!didSendResponse) {
-					responseCallback(new Error('There was a problem executing the workflow'), {});
-				}
-
-				throw new ResponseHelper.InternalServerError(e.message);
-			});
-
-		// eslint-disable-next-line consistent-return
+					throw new InternalServerError(e.message);
+				});
+		}
 		return executionId;
 	} catch (e) {
-		if (!didSendResponse) {
-			responseCallback(new Error('There was a problem executing the workflow'), {});
-		}
-
-		throw new ResponseHelper.InternalServerError(e.message);
-	}
-}
-
-/**
- * Returns the base URL of the webhooks
- *
- */
-export function getWebhookBaseUrl() {
-	let urlBaseWebhook = GenericHelpers.getBaseUrl();
-
-	// We renamed WEBHOOK_TUNNEL_URL to WEBHOOK_URL. This is here to maintain
-	// backward compatibility. Will be deprecated and removed in the future.
-	if (process.env.WEBHOOK_TUNNEL_URL !== undefined || process.env.WEBHOOK_URL !== undefined) {
-		// @ts-ignore
-		urlBaseWebhook = process.env.WEBHOOK_TUNNEL_URL || process.env.WEBHOOK_URL;
-	}
-	if (!urlBaseWebhook.endsWith('/')) {
-		urlBaseWebhook += '/';
+		const error =
+			e instanceof UnprocessableRequestError
+				? e
+				: new ApplicationError('There was a problem executing the workflow', {
+						level: 'warning',
+						cause: e,
+					});
+		if (didSendResponse) throw error;
+		responseCallback(error, {});
+		return;
 	}
-
-	return urlBaseWebhook;
 }
diff --git a/packages/cli/src/WebhookServer.ts b/packages/cli/src/WebhookServer.ts
index efae9be78bbe6..60f59f606d95e 100644
--- a/packages/cli/src/WebhookServer.ts
+++ b/packages/cli/src/WebhookServer.ts
@@ -1,8 +1,9 @@
+import { Service } from 'typedi';
 import { AbstractServer } from '@/AbstractServer';
 
+@Service()
 export class WebhookServer extends AbstractServer {
-	async configure() {
-		this.setupWebhookEndpoint();
-		this.setupWaitingWebhookEndpoint();
+	constructor() {
+		super('webhook');
 	}
 }
diff --git a/packages/cli/src/WorkflowCredentials.ts b/packages/cli/src/WorkflowCredentials.ts
deleted file mode 100644
index 94d31f49a4ed9..0000000000000
--- a/packages/cli/src/WorkflowCredentials.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-/* eslint-disable no-prototype-builtins */
-import type { INode, IWorkflowCredentials } from 'n8n-workflow';
-import * as Db from '@/Db';
-
-// eslint-disable-next-line @typescript-eslint/naming-convention
-export async function WorkflowCredentials(nodes: INode[]): Promise<IWorkflowCredentials> {
-	// Go through all nodes to find which credentials are needed to execute the workflow
-	const returnCredentials: IWorkflowCredentials = {};
-
-	let node;
-	let type;
-	let nodeCredentials;
-	let foundCredentials;
-	// eslint-disable-next-line no-restricted-syntax
-	for (node of nodes) {
-		if (node.disabled === true || !node.credentials) {
-			// eslint-disable-next-line no-continue
-			continue;
-		}
-
-		// eslint-disable-next-line no-restricted-syntax
-		for (type of Object.keys(node.credentials)) {
-			if (!returnCredentials[type]) {
-				returnCredentials[type] = {};
-			}
-			nodeCredentials = node.credentials[type];
-
-			if (!nodeCredentials.id) {
-				throw new Error(
-					`Credentials with name "${nodeCredentials.name}" for type "${type}" miss an ID.`,
-				);
-			}
-
-			if (!returnCredentials[type][nodeCredentials.id]) {
-				// eslint-disable-next-line no-await-in-loop
-				foundCredentials = await Db.collections.Credentials.findOneBy({
-					id: nodeCredentials.id,
-					type,
-				});
-				if (!foundCredentials) {
-					throw new Error(
-						`Could not find credentials for type "${type}" with ID "${nodeCredentials.id}".`,
-					);
-				}
-				// eslint-disable-next-line prefer-destructuring
-				returnCredentials[type][nodeCredentials.id] = foundCredentials;
-			}
-		}
-	}
-
-	return returnCredentials;
-}
diff --git a/packages/cli/src/WorkflowExecuteAdditionalData.ts b/packages/cli/src/WorkflowExecuteAdditionalData.ts
index 701d72f073728..676d0dd985864 100644
--- a/packages/cli/src/WorkflowExecuteAdditionalData.ts
+++ b/packages/cli/src/WorkflowExecuteAdditionalData.ts
@@ -1,21 +1,9 @@
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
-/* eslint-disable no-restricted-syntax */
-/* eslint-disable @typescript-eslint/restrict-plus-operands */
-/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
-/* eslint-disable @typescript-eslint/await-thenable */
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
 /* eslint-disable @typescript-eslint/no-use-before-define */
-/* eslint-disable @typescript-eslint/prefer-nullish-coalescing */
-/* eslint-disable no-param-reassign */
-/* eslint-disable @typescript-eslint/no-unsafe-call */
-/* eslint-disable @typescript-eslint/prefer-optional-chain */
 /* eslint-disable id-denylist */
-/* eslint-disable @typescript-eslint/restrict-template-expressions */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* eslint-disable @typescript-eslint/no-unused-vars */
-/* eslint-disable func-names */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
-import { BinaryDataManager, eventEmitter, UserSettings, WorkflowExecute } from 'n8n-core';
+import { WorkflowExecute } from 'n8n-core';
 
 import type {
 	IDataObject,
@@ -34,47 +22,99 @@ import type {
 	IWorkflowSettings,
 	WorkflowExecuteMode,
 	ExecutionStatus,
+	ExecutionError,
+	EventNamesAiNodesType,
+	CallbackManager,
 } from 'n8n-workflow';
 import {
+	ApplicationError,
 	ErrorReporterProxy as ErrorReporter,
-	LoggerProxy as Logger,
+	NodeOperationError,
 	Workflow,
 	WorkflowHooks,
 } from 'n8n-workflow';
 
-import pick from 'lodash.pick';
-import type { FindOptionsWhere } from 'typeorm';
-import { LessThanOrEqual, In } from 'typeorm';
-import { DateUtils } from 'typeorm/util/DateUtils';
+import { Container } from 'typedi';
 import config from '@/config';
-import * as Db from '@/Db';
 import { ActiveExecutions } from '@/ActiveExecutions';
 import { CredentialsHelper } from '@/CredentialsHelper';
 import { ExternalHooks } from '@/ExternalHooks';
 import type {
-	IExecutionDb,
-	IExecutionFlattedDb,
-	IExecutionResponse,
 	IPushDataExecutionFinished,
 	IWorkflowExecuteProcess,
 	IWorkflowExecutionDataProcess,
 	IWorkflowErrorData,
+	IPushDataType,
+	ExecutionPayload,
 } from '@/Interfaces';
 import { NodeTypes } from '@/NodeTypes';
 import { Push } from '@/push';
-import * as ResponseHelper from '@/ResponseHelper';
-import * as WebhookHelpers from '@/WebhookHelpers';
 import * as WorkflowHelpers from '@/WorkflowHelpers';
-import { getWorkflowOwner } from '@/UserManagement/UserManagementHelper';
 import { findSubworkflowStart, isWorkflowIdValid } from '@/utils';
 import { PermissionChecker } from './UserManagement/PermissionChecker';
-import { WorkflowsService } from './workflows/workflows.services';
-import { Container } from 'typedi';
 import { InternalHooks } from '@/InternalHooks';
-import type { ExecutionMetadata } from '@db/entities/ExecutionMetadata';
+import { ExecutionRepository } from '@db/repositories/execution.repository';
+import { EventsService } from '@/services/events.service';
+import { SecretsHelper } from './SecretsHelpers';
+import { OwnershipService } from './services/ownership.service';
+import {
+	determineFinalExecutionStatus,
+	prepareExecutionDataForDbUpdate,
+	updateExistingExecution,
+} from './executionLifecycleHooks/shared/sharedHookFunctions';
+import { restoreBinaryDataId } from './executionLifecycleHooks/restoreBinaryDataId';
+import { toSaveSettings } from './executionLifecycleHooks/toSaveSettings';
+import { Logger } from './Logger';
+import { saveExecutionProgress } from './executionLifecycleHooks/saveExecutionProgress';
+import { WorkflowStaticDataService } from './workflows/workflowStaticData.service';
+import { WorkflowRepository } from './databases/repositories/workflow.repository';
+import { UrlService } from './services/url.service';
+import { WorkflowExecutionService } from './workflows/workflowExecution.service';
+import { MessageEventBus } from '@/eventbus/MessageEventBus/MessageEventBus';
 
 const ERROR_TRIGGER_TYPE = config.getEnv('nodes.errorTriggerType');
 
+export function objectToError(errorObject: unknown, workflow: Workflow): Error {
+	// TODO: Expand with other error types
+	if (errorObject instanceof Error) {
+		// If it's already an Error instance, return it as is.
+		return errorObject;
+	} else if (errorObject && typeof errorObject === 'object' && 'message' in errorObject) {
+		// If it's an object with a 'message' property, create a new Error instance.
+		let error: Error | undefined;
+		if ('node' in errorObject) {
+			const node = workflow.getNode((errorObject.node as { name: string }).name);
+			if (node) {
+				error = new NodeOperationError(
+					node,
+					errorObject as unknown as Error,
+					errorObject as object,
+				);
+			}
+		}
+
+		if (error === undefined) {
+			error = new Error(errorObject.message as string);
+		}
+
+		if ('description' in errorObject) {
+			// @ts-expect-error Error descriptions are surfaced by the UI but
+			// not all backend errors account for this property yet.
+			error.description = errorObject.description as string;
+		}
+
+		if ('stack' in errorObject) {
+			// If there's a 'stack' property, set it on the new Error instance.
+			error.stack = errorObject.stack as string;
+		}
+
+		return error;
+	} else {
+		// If it's neither an Error nor an object with a 'message' property, create a generic Error.
+		return new Error('An error occurred');
+	}
+}
+
 /**
  * Checks if there was an error and if errorWorkflow or a trigger is defined. If so it collects
  * all the data and executes it
@@ -91,11 +131,12 @@ export function executeErrorWorkflow(
 	executionId?: string,
 	retryOf?: string,
 ): void {
-	// Check if there was an error and if so if an errorWorkflow or a trigger is set
+	const logger = Container.get(Logger);
 
+	// Check if there was an error and if so if an errorWorkflow or a trigger is set
 	let pastExecutionUrl: string | undefined;
 	if (executionId !== undefined) {
-		pastExecutionUrl = `${WebhookHelpers.getWebhookBaseUrl()}workflow/${
+		pastExecutionUrl = `${Container.get(UrlService).getWebhookBaseUrl()}workflow/${
 			workflowData.id
 		}/executions/${executionId}`;
 	}
@@ -138,7 +179,7 @@ export function executeErrorWorkflow(
 		// To avoid an infinite loop do not run the error workflow again if the error-workflow itself failed and it is its own error-workflow.
 		const { errorWorkflow } = workflowData.settings ?? {};
 		if (errorWorkflow && !(mode === 'error' && workflowId && errorWorkflow === workflowId)) {
-			Logger.verbose('Start external error workflow', {
+			logger.verbose('Start external error workflow', {
 				executionId,
 				errorWorkflowId: errorWorkflow,
 				workflowId,
@@ -152,13 +193,19 @@ export function executeErrorWorkflow(
 				// make sure there are no possible security gaps
 				return;
 			}
-			getWorkflowOwner(workflowId)
+
+			Container.get(OwnershipService)
+				.getWorkflowOwnerCached(workflowId)
 				.then((user) => {
-					void WorkflowHelpers.executeErrorWorkflow(errorWorkflow, workflowErrorData, user);
+					void Container.get(WorkflowExecutionService).executeErrorWorkflow(
+						errorWorkflow,
+						workflowErrorData,
+						user,
+					);
 				})
 				.catch((error: Error) => {
 					ErrorReporter.error(error);
-					Logger.error(
+					logger.error(
 						`Could not execute ErrorWorkflow for execution ID ${this.executionId} because of error querying the workflow owner`,
 						{
 							executionId,
@@ -174,160 +221,76 @@ export function executeErrorWorkflow(
 			workflowId !== undefined &&
 			workflowData.nodes.some((node) => node.type === ERROR_TRIGGER_TYPE)
 		) {
-			Logger.verbose('Start internal error workflow', { executionId, workflowId });
-			void getWorkflowOwner(workflowId).then((user) => {
-				void WorkflowHelpers.executeErrorWorkflow(workflowId, workflowErrorData, user);
-			});
-		}
-	}
-}
-
-/**
- * Prunes Saved Execution which are older than configured.
- * Throttled to be executed just once in configured timeframe.
- *
- */
-let throttling = false;
-async function pruneExecutionData(this: WorkflowHooks): Promise<void> {
-	if (!throttling) {
-		Logger.verbose('Pruning execution data from database');
-
-		throttling = true;
-		const timeout = config.getEnv('executions.pruneDataTimeout'); // in seconds
-		const maxAge = config.getEnv('executions.pruneDataMaxAge'); // in h
-		const maxCount = config.getEnv('executions.pruneDataMaxCount');
-		const date = new Date(); // today
-		date.setHours(date.getHours() - maxAge);
-
-		// date reformatting needed - see https://github.com/typeorm/typeorm/issues/2286
-		// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-		const utcDate = DateUtils.mixedDateToUtcDatetimeString(date);
-
-		const toPrune: Array<FindOptionsWhere<IExecutionFlattedDb>> = [
-			{ stoppedAt: LessThanOrEqual(utcDate) },
-		];
-
-		if (maxCount > 0) {
-			const executions = await Db.collections.Execution.find({
-				select: ['id'],
-				skip: maxCount,
-				take: 1,
-				order: { id: 'DESC' },
-			});
-
-			if (executions[0]) {
-				toPrune.push({ id: LessThanOrEqual(executions[0].id) });
-			}
-		}
-
-		const isBinaryModeDefaultMode = config.getEnv('binaryDataManager.mode') === 'default';
-		try {
-			setTimeout(() => {
-				throttling = false;
-			}, timeout * 1000);
-			let executionIds: Array<IExecutionFlattedDb['id']>;
-			do {
-				executionIds = (
-					await Db.collections.Execution.find({
-						select: ['id'],
-						where: toPrune,
-						take: 100,
-					})
-				).map(({ id }) => id);
-				await Db.collections.Execution.delete({ id: In(executionIds) });
-				// Mark binary data for deletion for all executions
-				if (!isBinaryModeDefaultMode)
-					await BinaryDataManager.getInstance().markDataForDeletionByExecutionIds(executionIds);
-			} while (executionIds.length > 0);
-		} catch (error) {
-			ErrorReporter.error(error);
-			throttling = false;
-			Logger.error(
-				`Failed pruning execution data from database for execution ID ${this.executionId} (hookFunctionsSave)`,
-				{
-					...error,
-					executionId: this.executionId,
-					sessionId: this.sessionId,
-					workflowId: this.workflowData.id,
-				},
-			);
+			logger.verbose('Start internal error workflow', { executionId, workflowId });
+			void Container.get(OwnershipService)
+				.getWorkflowOwnerCached(workflowId)
+				.then((user) => {
+					void Container.get(WorkflowExecutionService).executeErrorWorkflow(
+						workflowId,
+						workflowErrorData,
+						user,
+					);
+				});
 		}
 	}
 }
 
-export async function saveExecutionMetadata(
-	executionId: string,
-	executionMetadata: Record<string, string>,
-): Promise<ExecutionMetadata[]> {
-	const metadataRows = [];
-	for (const [key, value] of Object.entries(executionMetadata)) {
-		metadataRows.push({
-			execution: { id: executionId },
-			key,
-			value,
-		});
-	}
-
-	return Db.collections.ExecutionMetadata.save(metadataRows);
-}
-
 /**
  * Returns hook functions to push data to Editor-UI
  *
  */
 function hookFunctionsPush(): IWorkflowExecuteHooks {
+	const logger = Container.get(Logger);
+	const pushInstance = Container.get(Push);
 	return {
 		nodeExecuteBefore: [
 			async function (this: WorkflowHooks, nodeName: string): Promise<void> {
-				const { sessionId, executionId } = this;
+				const { pushRef, executionId } = this;
 				// Push data to session which started workflow before each
 				// node which starts rendering
-				if (sessionId === undefined) {
+				if (pushRef === undefined) {
 					return;
 				}
 
-				Logger.debug(`Executing hook on node "${nodeName}" (hookFunctionsPush)`, {
+				logger.debug(`Executing hook on node "${nodeName}" (hookFunctionsPush)`, {
 					executionId,
-					sessionId,
+					pushRef,
 					workflowId: this.workflowData.id,
 				});
 
-				const pushInstance = Container.get(Push);
-				pushInstance.send('nodeExecuteBefore', { executionId, nodeName }, sessionId);
+				pushInstance.send('nodeExecuteBefore', { executionId, nodeName }, pushRef);
 			},
 		],
 		nodeExecuteAfter: [
 			async function (this: WorkflowHooks, nodeName: string, data: ITaskData): Promise<void> {
-				const { sessionId, executionId } = this;
+				const { pushRef, executionId } = this;
 				// Push data to session which started workflow after each rendered node
-				if (sessionId === undefined) {
+				if (pushRef === undefined) {
 					return;
 				}
 
-				Logger.debug(`Executing hook on node "${nodeName}" (hookFunctionsPush)`, {
+				logger.debug(`Executing hook on node "${nodeName}" (hookFunctionsPush)`, {
 					executionId,
-					sessionId,
+					pushRef,
 					workflowId: this.workflowData.id,
 				});
 
-				const pushInstance = Container.get(Push);
-				pushInstance.send('nodeExecuteAfter', { executionId, nodeName, data }, sessionId);
+				pushInstance.send('nodeExecuteAfter', { executionId, nodeName, data }, pushRef);
 			},
 		],
 		workflowExecuteBefore: [
 			async function (this: WorkflowHooks): Promise<void> {
-				const { sessionId, executionId } = this;
+				const { pushRef, executionId } = this;
 				const { id: workflowId, name: workflowName } = this.workflowData;
-				Logger.debug('Executing hook (hookFunctionsPush)', {
+				logger.debug('Executing hook (hookFunctionsPush)', {
 					executionId,
-					sessionId,
+					pushRef,
 					workflowId,
 				});
 				// Push data to session which started the workflow
-				if (sessionId === undefined) {
+				if (pushRef === undefined) {
 					return;
 				}
-				const pushInstance = Container.get(Push);
 				pushInstance.send(
 					'executionStarted',
 					{
@@ -336,28 +299,24 @@ function hookFunctionsPush(): IWorkflowExecuteHooks {
 						startedAt: new Date(),
 						retryOf: this.retryOf,
 						workflowId,
-						sessionId,
+						pushRef,
 						workflowName,
 					},
-					sessionId,
+					pushRef,
 				);
 			},
 		],
 		workflowExecuteAfter: [
-			async function (
-				this: WorkflowHooks,
-				fullRunData: IRun,
-				newStaticData: IDataObject,
-			): Promise<void> {
-				const { sessionId, executionId, retryOf } = this;
+			async function (this: WorkflowHooks, fullRunData: IRun): Promise<void> {
+				const { pushRef, executionId, retryOf } = this;
 				const { id: workflowId } = this.workflowData;
-				Logger.debug('Executing hook (hookFunctionsPush)', {
+				logger.debug('Executing hook (hookFunctionsPush)', {
 					executionId,
-					sessionId,
+					pushRef,
 					workflowId,
 				});
 				// Push data to session which started the workflow
-				if (sessionId === undefined) {
+				if (pushRef === undefined) {
 					return;
 				}
 
@@ -382,7 +341,7 @@ function hookFunctionsPush(): IWorkflowExecuteHooks {
 				}
 
 				// Push data to editor-ui once workflow finished
-				Logger.debug(`Save execution progress to database for execution ID ${executionId} `, {
+				logger.debug(`Save execution progress to database for execution ID ${executionId} `, {
 					executionId,
 					workflowId,
 				});
@@ -393,16 +352,14 @@ function hookFunctionsPush(): IWorkflowExecuteHooks {
 					retryOf,
 				};
 
-				const pushInstance = Container.get(Push);
-				pushInstance.send('executionFinished', sendData, sessionId);
+				pushInstance.send('executionFinished', sendData, pushRef);
 			},
 		],
 	};
 }
 
-export function hookFunctionsPreExecute(parentProcessMode?: string): IWorkflowExecuteHooks {
+export function hookFunctionsPreExecute(): IWorkflowExecuteHooks {
 	const externalHooks = Container.get(ExternalHooks);
-
 	return {
 		workflowExecuteBefore: [
 			async function (this: WorkflowHooks, workflow: Workflow): Promise<void> {
@@ -416,94 +373,14 @@ export function hookFunctionsPreExecute(parentProcessMode?: string): IWorkflowEx
 				data: ITaskData,
 				executionData: IRunExecutionData,
 			): Promise<void> {
-				const saveExecutionProgress = config.getEnv('executions.saveExecutionProgress');
-				const workflowSettings = this.workflowData.settings;
-				if (workflowSettings !== undefined) {
-					if (workflowSettings.saveExecutionProgress === false) {
-						return;
-					}
-					if (workflowSettings.saveExecutionProgress !== true && !saveExecutionProgress) {
-						return;
-					}
-				} else if (!saveExecutionProgress) {
-					return;
-				}
-
-				try {
-					Logger.debug(
-						`Save execution progress to database for execution ID ${this.executionId} `,
-						{ executionId: this.executionId, nodeName },
-					);
-
-					const execution = await Db.collections.Execution.findOneBy({ id: this.executionId });
-
-					if (execution === null) {
-						// Something went badly wrong if this happens.
-						// This check is here mostly to make typescript happy.
-						return;
-					}
-					const fullExecutionData: IExecutionResponse =
-						ResponseHelper.unflattenExecutionData(execution);
-
-					if (fullExecutionData.finished) {
-						// We already received ´workflowExecuteAfter´ webhook, so this is just an async call
-						// that was left behind. We skip saving because the other call should have saved everything
-						// so this one is safe to ignore
-						return;
-					}
-
-					if (fullExecutionData.data === undefined) {
-						fullExecutionData.data = {
-							startData: {},
-							resultData: {
-								runData: {},
-							},
-							executionData: {
-								contextData: {},
-								nodeExecutionStack: [],
-								waitingExecution: {},
-								waitingExecutionSource: {},
-							},
-						};
-					}
-
-					if (Array.isArray(fullExecutionData.data.resultData.runData[nodeName])) {
-						// Append data if array exists
-						fullExecutionData.data.resultData.runData[nodeName].push(data);
-					} else {
-						// Initialize array and save data
-						fullExecutionData.data.resultData.runData[nodeName] = [data];
-					}
-
-					fullExecutionData.data.executionData = executionData.executionData;
-
-					// Set last executed node so that it may resume on failure
-					fullExecutionData.data.resultData.lastNodeExecuted = nodeName;
-
-					fullExecutionData.status = 'running';
-
-					const flattenedExecutionData = ResponseHelper.flattenExecutionData(fullExecutionData);
-					await Db.collections.Execution.update(
-						this.executionId,
-						flattenedExecutionData as IExecutionFlattedDb,
-					);
-				} catch (err) {
-					ErrorReporter.error(err);
-					// TODO: Improve in the future!
-					// Errors here might happen because of database access
-					// For busy machines, we may get "Database is locked" errors.
-
-					// We do this to prevent crashes and executions ending in `unknown` state.
-					Logger.error(
-						`Failed saving execution progress to database for execution ID ${this.executionId} (hookFunctionsPreExecute, nodeExecuteAfter)`,
-						{
-							...err,
-							executionId: this.executionId,
-							sessionId: this.sessionId,
-							workflowId: this.workflowData.id,
-						},
-					);
-				}
+				await saveExecutionProgress(
+					this.workflowData,
+					this.executionId,
+					nodeName,
+					data,
+					executionData,
+					this.pushRef,
+				);
 			},
 		],
 	};
@@ -513,10 +390,21 @@ export function hookFunctionsPreExecute(parentProcessMode?: string): IWorkflowEx
  * Returns hook functions to save workflow execution and call error workflow
  *
  */
-function hookFunctionsSave(parentProcessMode?: string): IWorkflowExecuteHooks {
+function hookFunctionsSave(): IWorkflowExecuteHooks {
+	const logger = Container.get(Logger);
+	const internalHooks = Container.get(InternalHooks);
+	const eventsService = Container.get(EventsService);
 	return {
-		nodeExecuteBefore: [],
-		nodeExecuteAfter: [],
+		nodeExecuteBefore: [
+			async function (this: WorkflowHooks, nodeName: string): Promise<void> {
+				void internalHooks.onNodeBeforeExecute(this.executionId, this.workflowData, nodeName);
+			},
+		],
+		nodeExecuteAfter: [
+			async function (this: WorkflowHooks, nodeName: string): Promise<void> {
+				void internalHooks.onNodePostExecute(this.executionId, this.workflowData, nodeName);
+			},
+		],
 		workflowExecuteBefore: [],
 		workflowExecuteAfter: [
 			async function (
@@ -524,88 +412,67 @@ function hookFunctionsSave(parentProcessMode?: string): IWorkflowExecuteHooks {
 				fullRunData: IRun,
 				newStaticData: IDataObject,
 			): Promise<void> {
-				Logger.debug('Executing hook (hookFunctionsSave)', {
+				logger.debug('Executing hook (hookFunctionsSave)', {
 					executionId: this.executionId,
 					workflowId: this.workflowData.id,
 				});
 
-				// Prune old execution data
-				if (config.getEnv('executions.pruneData')) {
-					await pruneExecutionData.call(this);
-				}
+				await restoreBinaryDataId(fullRunData, this.executionId, this.mode);
 
-				const isManualMode = [this.mode, parentProcessMode].includes('manual');
+				const isManualMode = this.mode === 'manual';
 
 				try {
 					if (!isManualMode && isWorkflowIdValid(this.workflowData.id) && newStaticData) {
 						// Workflow is saved so update in database
 						try {
-							await WorkflowHelpers.saveStaticDataById(
-								this.workflowData.id as string,
+							await Container.get(WorkflowStaticDataService).saveStaticDataById(
+								this.workflowData.id,
 								newStaticData,
 							);
 						} catch (e) {
 							ErrorReporter.error(e);
-							Logger.error(
+							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 },
 							);
 						}
 					}
 
-					const workflowSettings = this.workflowData.settings;
-					let saveManualExecutions = config.getEnv('executions.saveDataManualExecutions');
-					if (workflowSettings?.saveManualExecutions !== undefined) {
-						// Apply to workflow override
-						saveManualExecutions = workflowSettings.saveManualExecutions as boolean;
-					}
+					const saveSettings = toSaveSettings(this.workflowData.settings);
 
-					if (isManualMode && !saveManualExecutions && !fullRunData.waitTill) {
-						// Data is always saved, so we remove from database
-						await Db.collections.Execution.delete(this.executionId);
-						await BinaryDataManager.getInstance().markDataForDeletionByExecutionId(
-							this.executionId,
-						);
+					if (isManualMode && !saveSettings.manual && !fullRunData.waitTill) {
+						/**
+						 * When manual executions are not being saved, we only soft-delete
+						 * the execution so that the user can access its binary data
+						 * while building their workflow.
+						 *
+						 * The manual execution and its binary data will be hard-deleted
+						 * on the next pruning cycle after the grace period set by
+						 * `EXECUTIONS_DATA_HARD_DELETE_BUFFER`.
+						 */
+						await Container.get(ExecutionRepository).softDelete(this.executionId);
 
 						return;
 					}
 
-					// Check config to know if execution should be saved or not
-					let saveDataErrorExecution = config.getEnv('executions.saveDataOnError') as string;
-					let saveDataSuccessExecution = config.getEnv('executions.saveDataOnSuccess') as string;
-					if (this.workflowData.settings !== undefined) {
-						saveDataErrorExecution =
-							(this.workflowData.settings.saveDataErrorExecution as string) ||
-							saveDataErrorExecution;
-						saveDataSuccessExecution =
-							(this.workflowData.settings.saveDataSuccessExecution as string) ||
-							saveDataSuccessExecution;
-					}
-
-					const workflowHasCrashed = fullRunData.status === 'crashed';
-					const workflowDidSucceed = !fullRunData.data.resultData.error && !workflowHasCrashed;
-					let workflowStatusFinal: ExecutionStatus = workflowDidSucceed ? 'success' : 'failed';
-					if (workflowHasCrashed) workflowStatusFinal = 'crashed';
-
-					if (
-						(workflowDidSucceed && saveDataSuccessExecution === 'none') ||
-						(!workflowDidSucceed && saveDataErrorExecution === 'none')
-					) {
-						if (!fullRunData.waitTill) {
-							if (!isManualMode) {
-								executeErrorWorkflow(
-									this.workflowData,
-									fullRunData,
-									this.mode,
-									this.executionId,
-									this.retryOf,
-								);
-							}
-							// Data is always saved, so we remove from database
-							await Db.collections.Execution.delete(this.executionId);
-							await BinaryDataManager.getInstance().markDataForDeletionByExecutionId(
+					const executionStatus = determineFinalExecutionStatus(fullRunData);
+					const shouldNotSave =
+						(executionStatus === 'success' && !saveSettings.success) ||
+						(executionStatus !== 'success' && !saveSettings.error);
+
+					if (shouldNotSave) {
+						if (!fullRunData.waitTill && !isManualMode) {
+							executeErrorWorkflow(
+								this.workflowData,
+								fullRunData,
+								this.mode,
 								this.executionId,
+								this.retryOf,
 							);
+							await Container.get(ExecutionRepository).hardDelete({
+								workflowId: this.workflowData.id,
+								executionId: this.executionId,
+							});
 
 							return;
 						}
@@ -613,71 +480,19 @@ function hookFunctionsSave(parentProcessMode?: string): IWorkflowExecuteHooks {
 
 					// Although it is treated as IWorkflowBase here, it's being instantiated elsewhere with properties that may be sensitive
 					// As a result, we should create an IWorkflowBase object with only the data we want to save in it.
-					const pristineWorkflowData: IWorkflowBase = pick(this.workflowData, [
-						'id',
-						'name',
-						'active',
-						'createdAt',
-						'updatedAt',
-						'nodes',
-						'connections',
-						'settings',
-						'staticData',
-						'pinData',
-					]);
-
-					const fullExecutionData: IExecutionDb = {
-						data: fullRunData.data,
-						mode: fullRunData.mode,
-						finished: fullRunData.finished ? fullRunData.finished : false,
-						startedAt: fullRunData.startedAt,
-						stoppedAt: fullRunData.stoppedAt,
-						workflowData: pristineWorkflowData,
-						waitTill: fullRunData.waitTill,
-						status: workflowStatusFinal,
-					};
-
-					if (this.retryOf !== undefined) {
-						fullExecutionData.retryOf = this.retryOf?.toString();
-					}
-
-					const workflowId = this.workflowData.id;
-					if (isWorkflowIdValid(workflowId)) {
-						fullExecutionData.workflowId = workflowId;
-					}
+					const fullExecutionData = prepareExecutionDataForDbUpdate({
+						runData: fullRunData,
+						workflowData: this.workflowData,
+						workflowStatusFinal: executionStatus,
+						retryOf: this.retryOf,
+					});
 
-					// Leave log message before flatten as that operation increased memory usage a lot and the chance of a crash is highest here
-					Logger.debug(`Save execution data to database for execution ID ${this.executionId}`, {
+					await updateExistingExecution({
 						executionId: this.executionId,
-						workflowId,
-						finished: fullExecutionData.finished,
-						stoppedAt: fullExecutionData.stoppedAt,
+						workflowId: this.workflowData.id,
+						executionData: fullExecutionData,
 					});
 
-					const executionData = ResponseHelper.flattenExecutionData(fullExecutionData);
-
-					// Save the Execution in DB
-					await Db.collections.Execution.update(
-						this.executionId,
-						executionData as IExecutionFlattedDb,
-					);
-
-					try {
-						if (fullRunData.data.resultData.metadata) {
-							await saveExecutionMetadata(this.executionId, fullRunData.data.resultData.metadata);
-						}
-					} catch (e) {
-						Logger.error(`Failed to save metadata for execution ID ${this.executionId}`, e);
-					}
-
-					if (fullRunData.finished === true && this.retryOf !== undefined) {
-						// If the retry was successful save the reference it on the original execution
-						// await Db.collections.Execution.save(executionData as IExecutionFlattedDb);
-						await Db.collections.Execution.update(this.retryOf, {
-							retrySuccessId: this.executionId,
-						});
-					}
-
 					if (!isManualMode) {
 						executeErrorWorkflow(
 							this.workflowData,
@@ -689,7 +504,7 @@ function hookFunctionsSave(parentProcessMode?: string): IWorkflowExecuteHooks {
 					}
 				} catch (error) {
 					ErrorReporter.error(error);
-					Logger.error(`Failed saving execution data to DB on execution ID ${this.executionId}`, {
+					logger.error(`Failed saving execution data to DB on execution ID ${this.executionId}`, {
 						executionId: this.executionId,
 						workflowId: this.workflowData.id,
 						error,
@@ -704,17 +519,13 @@ function hookFunctionsSave(parentProcessMode?: string): IWorkflowExecuteHooks {
 						);
 					}
 				} finally {
-					eventEmitter.emit(
-						eventEmitter.types.workflowExecutionCompleted,
-						this.workflowData,
-						fullRunData,
-					);
+					eventsService.emit('workflowExecutionCompleted', this.workflowData, fullRunData);
 				}
 			},
 		],
 		nodeFetchedData: [
 			async (workflowId: string, node: INode) => {
-				eventEmitter.emit(eventEmitter.types.nodeFetchedData, workflowId, node);
+				eventsService.emit('nodeFetchedData', workflowId, node);
 			},
 		],
 	};
@@ -727,39 +538,55 @@ function hookFunctionsSave(parentProcessMode?: string): IWorkflowExecuteHooks {
  *
  */
 function hookFunctionsSaveWorker(): IWorkflowExecuteHooks {
+	const logger = Container.get(Logger);
+	const internalHooks = Container.get(InternalHooks);
+	const eventsService = Container.get(EventsService);
 	return {
-		nodeExecuteBefore: [],
-		nodeExecuteAfter: [],
-		workflowExecuteBefore: [],
+		nodeExecuteBefore: [
+			async function (this: WorkflowHooks, nodeName: string): Promise<void> {
+				void internalHooks.onNodeBeforeExecute(this.executionId, this.workflowData, nodeName);
+			},
+		],
+		nodeExecuteAfter: [
+			async function (this: WorkflowHooks, nodeName: string): Promise<void> {
+				void internalHooks.onNodePostExecute(this.executionId, this.workflowData, nodeName);
+			},
+		],
+		workflowExecuteBefore: [
+			async function (): Promise<void> {
+				void internalHooks.onWorkflowBeforeExecute(this.executionId, this.workflowData);
+			},
+		],
 		workflowExecuteAfter: [
 			async function (
 				this: WorkflowHooks,
 				fullRunData: IRun,
 				newStaticData: IDataObject,
 			): Promise<void> {
+				logger.debug('Executing hook (hookFunctionsSaveWorker)', {
+					executionId: this.executionId,
+					workflowId: this.workflowData.id,
+				});
 				try {
 					if (isWorkflowIdValid(this.workflowData.id) && newStaticData) {
 						// Workflow is saved so update in database
 						try {
-							await WorkflowHelpers.saveStaticDataById(
-								this.workflowData.id as string,
+							await Container.get(WorkflowStaticDataService).saveStaticDataById(
+								this.workflowData.id,
 								newStaticData,
 							);
 						} catch (e) {
 							ErrorReporter.error(e);
-							Logger.error(
+							logger.error(
 								`There was a problem saving the workflow with id "${this.workflowData.id}" to save changed staticData: "${e.message}" (workflowExecuteAfter)`,
-								{ sessionId: this.sessionId, workflowId: this.workflowData.id },
+								{ pushRef: this.pushRef, workflowId: this.workflowData.id },
 							);
 						}
 					}
 
-					const workflowHasCrashed = fullRunData.status === 'crashed';
-					const workflowDidSucceed = !fullRunData.data.resultData.error && !workflowHasCrashed;
-					let workflowStatusFinal: ExecutionStatus = workflowDidSucceed ? 'success' : 'failed';
-					if (workflowHasCrashed) workflowStatusFinal = 'crashed';
+					const workflowStatusFinal = determineFinalExecutionStatus(fullRunData);
 
-					if (!workflowDidSucceed) {
+					if (workflowStatusFinal !== 'success' && workflowStatusFinal !== 'waiting') {
 						executeErrorWorkflow(
 							this.workflowData,
 							fullRunData,
@@ -769,53 +596,20 @@ function hookFunctionsSaveWorker(): IWorkflowExecuteHooks {
 						);
 					}
 
-					const fullExecutionData: IExecutionDb = {
-						data: fullRunData.data,
-						mode: fullRunData.mode,
-						finished: fullRunData.finished ? fullRunData.finished : false,
-						startedAt: fullRunData.startedAt,
-						stoppedAt: fullRunData.stoppedAt,
+					// Although it is treated as IWorkflowBase here, it's being instantiated elsewhere with properties that may be sensitive
+					// As a result, we should create an IWorkflowBase object with only the data we want to save in it.
+					const fullExecutionData = prepareExecutionDataForDbUpdate({
+						runData: fullRunData,
 						workflowData: this.workflowData,
-						waitTill: fullRunData.data.waitTill,
-						status: workflowStatusFinal,
-					};
-
-					if (this.retryOf !== undefined) {
-						fullExecutionData.retryOf = this.retryOf.toString();
-					}
-
-					const workflowId = this.workflowData.id;
-					if (isWorkflowIdValid(workflowId)) {
-						fullExecutionData.workflowId = workflowId;
-					}
-
-					const executionData = ResponseHelper.flattenExecutionData(fullExecutionData);
-
-					// Save the Execution in DB
-					await Db.collections.Execution.update(
-						this.executionId,
-						executionData as IExecutionFlattedDb,
-					);
-
-					// For reasons(tm) the execution status is not updated correctly in the first update, so has to be written again (tbd)
-					await Db.collections.Execution.update(this.executionId, {
-						status: executionData.status,
+						workflowStatusFinal,
+						retryOf: this.retryOf,
 					});
 
-					try {
-						if (fullRunData.data.resultData.metadata) {
-							await saveExecutionMetadata(this.executionId, fullRunData.data.resultData.metadata);
-						}
-					} catch (e) {
-						Logger.error(`Failed to save metadata for execution ID ${this.executionId}`, e);
-					}
-
-					if (fullRunData.finished === true && this.retryOf !== undefined) {
-						// If the retry was successful save the reference it on the original execution
-						await Db.collections.Execution.update(this.retryOf, {
-							retrySuccessId: this.executionId,
-						});
-					}
+					await updateExistingExecution({
+						executionId: this.executionId,
+						workflowId: this.workflowData.id,
+						executionData: fullExecutionData,
+					});
 				} catch (error) {
 					executeErrorWorkflow(
 						this.workflowData,
@@ -825,17 +619,35 @@ function hookFunctionsSaveWorker(): IWorkflowExecuteHooks {
 						this.retryOf,
 					);
 				} finally {
-					eventEmitter.emit(
-						eventEmitter.types.workflowExecutionCompleted,
-						this.workflowData,
-						fullRunData,
-					);
+					eventsService.emit('workflowExecutionCompleted', this.workflowData, fullRunData);
+				}
+			},
+			async function (this: WorkflowHooks, fullRunData: IRun): Promise<void> {
+				// send tracking and event log events, but don't wait for them
+				void internalHooks.onWorkflowPostExecute(this.executionId, this.workflowData, fullRunData);
+			},
+			async function (this: WorkflowHooks, fullRunData: IRun) {
+				const externalHooks = Container.get(ExternalHooks);
+				if (externalHooks.exists('workflow.postExecute')) {
+					try {
+						await externalHooks.run('workflow.postExecute', [
+							fullRunData,
+							this.workflowData,
+							this.executionId,
+						]);
+					} catch (error) {
+						ErrorReporter.error(error);
+						Container.get(Logger).error(
+							'There was a problem running hook "workflow.postExecute"',
+							error,
+						);
+					}
 				}
 			},
 		],
 		nodeFetchedData: [
 			async (workflowId: string, node: INode) => {
-				eventEmitter.emit(eventEmitter.types.nodeFetchedData, workflowId, node);
+				eventsService.emit('nodeFetchedData', workflowId, node);
 			},
 		],
 	};
@@ -845,11 +657,18 @@ export async function getRunData(
 	workflowData: IWorkflowBase,
 	userId: string,
 	inputData?: INodeExecutionData[],
-	parentWorkflowId?: string,
+	startNode?: any,
+	isFullWorkflow?: boolean,
+	resultData?: any,
 ): Promise<IWorkflowExecutionDataProcess> {
 	const mode = 'integrated';
 
-	const startingNode = findSubworkflowStart(workflowData.nodes);
+	let startingNode;
+	if (isFullWorkflow) {
+		startingNode = startNode;
+	} else {
+		startingNode = findSubworkflowStart(workflowData.nodes);
+	}
 
 	// Always start with empty data if no inputData got supplied
 	inputData = inputData || [
@@ -875,12 +694,17 @@ export async function getRunData(
 		},
 		executionData: {
 			contextData: {},
+			metadata: {},
 			nodeExecutionStack,
 			waitingExecution: {},
 			waitingExecutionSource: {},
 		},
 	};
 
+	if (!!resultData) {
+		runExecutionData.resultData = resultData;
+	}
+
 	const runData: IWorkflowExecutionDataProcess = {
 		executionMode: mode,
 		executionData: runExecutionData,
@@ -894,29 +718,28 @@ export async function getRunData(
 
 export async function getWorkflowData(
 	workflowInfo: IExecuteWorkflowInfo,
-	parentWorkflowId?: string,
+	parentWorkflowId: string,
 	parentWorkflowSettings?: IWorkflowSettings,
 ): Promise<IWorkflowBase> {
 	if (workflowInfo.id === undefined && workflowInfo.code === undefined) {
-		throw new Error(
+		throw new ApplicationError(
 			'No information about the workflow to execute found. Please provide either the "id" or "code"!',
 		);
 	}
 
 	let workflowData: IWorkflowBase | null;
 	if (workflowInfo.id !== undefined) {
-		if (!Db.isInitialized) {
-			// The first time executeWorkflow gets called the Database has
-			// to get initialized first
-			await Db.init();
-		}
-
 		const relations = config.getEnv('workflowTagsDisabled') ? [] : ['tags'];
 
-		workflowData = await WorkflowsService.get({ id: workflowInfo.id }, { relations });
+		workflowData = await Container.get(WorkflowRepository).get(
+			{ id: workflowInfo.id },
+			{ relations },
+		);
 
-		if (workflowData === undefined) {
-			throw new Error(`The workflow with the id "${workflowInfo.id}" does not exist.`);
+		if (workflowData === undefined || workflowData === null) {
+			throw new ApplicationError('Workflow does not exist.', {
+				extra: { workflowId: workflowInfo.id },
+			});
 		}
 	} else {
 		workflowData = workflowInfo.code ?? null;
@@ -940,18 +763,22 @@ async function executeWorkflow(
 	workflowInfo: IExecuteWorkflowInfo,
 	additionalData: IWorkflowExecuteAdditionalData,
 	options: {
-		parentWorkflowId?: string;
+		node?: INode;
+		parentWorkflowId: string;
 		inputData?: INodeExecutionData[];
 		parentExecutionId?: string;
 		loadedWorkflowData?: IWorkflowBase;
 		loadedRunData?: IWorkflowExecutionDataProcess;
 		parentWorkflowSettings?: IWorkflowSettings;
+		parentCallbackManager?: CallbackManager;
 	},
 ): Promise<Array<INodeExecutionData[] | null> | IWorkflowExecuteProcess> {
+	const internalHooks = Container.get(InternalHooks);
 	const externalHooks = Container.get(ExternalHooks);
 	await externalHooks.init();
 
 	const nodeTypes = Container.get(NodeTypes);
+	const activeExecutions = Container.get(ActiveExecutions);
 
 	const workflowData =
 		options.loadedWorkflowData ??
@@ -959,7 +786,7 @@ async function executeWorkflow(
 
 	const workflowName = workflowData ? workflowData.name : undefined;
 	const workflow = new Workflow({
-		id: workflowData.id?.toString(),
+		id: workflowData.id,
 		name: workflowName,
 		nodes: workflowData.nodes,
 		connections: workflowData.connections,
@@ -978,21 +805,22 @@ async function executeWorkflow(
 	if (options.parentExecutionId !== undefined) {
 		executionId = options.parentExecutionId;
 	} else {
-		executionId =
-			options.parentExecutionId !== undefined
-				? options.parentExecutionId
-				: await Container.get(ActiveExecutions).add(runData);
+		executionId = options.parentExecutionId ?? (await activeExecutions.add(runData));
 	}
 
-	void Container.get(InternalHooks).onWorkflowBeforeExecute(executionId || '', runData);
+	void internalHooks.onWorkflowBeforeExecute(executionId || '', runData);
 
 	let data;
 	try {
-		await PermissionChecker.check(workflow, additionalData.userId);
-		await PermissionChecker.checkSubworkflowExecutePolicy(
-			workflow,
+		await Container.get(PermissionChecker).check(
+			workflowData.id,
 			additionalData.userId,
+			workflowData.nodes,
+		);
+		await Container.get(PermissionChecker).checkSubworkflowExecutePolicy(
+			workflow,
 			options.parentWorkflowId,
+			options.node,
 		);
 
 		// Create new additionalData to have different workflow loaded and to call
@@ -1002,9 +830,9 @@ async function executeWorkflow(
 			runData.executionMode,
 			executionId,
 			workflowData,
-			{ parentProcessMode: additionalData.hooks!.mode },
 		);
 		additionalDataIntegrated.executionId = executionId;
+		additionalDataIntegrated.parentCallbackManager = options.parentCallbackManager;
 
 		// Make sure we pass on the original executeWorkflow function we received
 		// This one already contains changes to talk to parent process
@@ -1041,13 +869,16 @@ async function executeWorkflow(
 				workflowExecute,
 			};
 		}
-		data = await workflowExecute.processRunExecutionData(workflow);
-		console.log('processRunExecutionData in WorkflowExecuteAdditionalData:', data.data.resultData);
+		console.log('we got here for workflowExecuteAdditonalData.js');
+		const execution = workflowExecute.processRunExecutionData(workflow);
+		activeExecutions.attachWorkflowExecution(executionId, execution);
+		data = await execution;
 	} catch (error) {
+		const executionError = error ? (error as ExecutionError) : undefined;
 		const fullRunData: IRun = {
 			data: {
 				resultData: {
-					error,
+					error: executionError,
 					runData: {},
 				},
 			},
@@ -1055,13 +886,13 @@ async function executeWorkflow(
 			mode: 'integrated',
 			startedAt: new Date(),
 			stoppedAt: new Date(),
-			status: 'failed',
+			status: 'error',
 		};
 		// When failing, we might not have finished the execution
 		// Therefore, database might not contain finished errors.
 		// Force an update to db as there should be no harm doing this
 
-		const fullExecutionData: IExecutionDb = {
+		const fullExecutionData: ExecutionPayload = {
 			data: fullRunData.data,
 			mode: fullRunData.mode,
 			finished: fullRunData.finished ? fullRunData.finished : false,
@@ -1069,113 +900,105 @@ async function executeWorkflow(
 			stoppedAt: fullRunData.stoppedAt,
 			status: fullRunData.status,
 			workflowData,
+			workflowId: workflowData.id,
 		};
 		if (workflowData.id) {
 			fullExecutionData.workflowId = workflowData.id;
 		}
 
 		// remove execution from active executions
-		Container.get(ActiveExecutions).remove(executionId, fullRunData);
-
-		const executionData = ResponseHelper.flattenExecutionData(fullExecutionData);
+		activeExecutions.remove(executionId, fullRunData);
 
-		await Db.collections.Execution.update(executionId, executionData as IExecutionFlattedDb);
-		throw {
-			...error,
-			stack: error.stack,
-			message: error.message,
-		};
+		await Container.get(ExecutionRepository).updateExistingExecution(
+			executionId,
+			fullExecutionData,
+		);
+		throw objectToError(
+			{
+				...executionError,
+				stack: executionError?.stack,
+				message: executionError?.message,
+			},
+			workflow,
+		);
 	}
 
 	await externalHooks.run('workflow.postExecute', [data, workflowData, executionId]);
 
-	void Container.get(InternalHooks).onWorkflowPostExecute(
-		executionId,
-		workflowData,
-		data,
-		additionalData.userId,
-	);
+	void internalHooks.onWorkflowPostExecute(executionId, workflowData, data, additionalData.userId);
 
-	if (data.finished === true) {
+	// subworkflow either finished, or is in status waiting due to a wait node, both cases are considered successes here
+	if (data.finished === true || data.status === 'waiting') {
 		// Workflow did finish successfully
 
-		Container.get(ActiveExecutions).remove(executionId, data);
+		activeExecutions.remove(executionId, data);
 		const returnData = WorkflowHelpers.getDataLastExecutedNodeData(data);
 		return returnData!.data!.main;
 	}
-	Container.get(ActiveExecutions).remove(executionId, data);
+	activeExecutions.remove(executionId, data);
+
 	// Workflow did fail
 	const { error } = data.data.resultData;
-	// eslint-disable-next-line @typescript-eslint/no-throw-literal
-	throw {
-		...error,
-		stack: error!.stack,
-	};
+
+	throw objectToError(
+		{
+			...error,
+			stack: error?.stack,
+		},
+		workflow,
+	);
 }
 
 export function setExecutionStatus(status: ExecutionStatus) {
+	const logger = Container.get(Logger);
 	if (this.executionId === undefined) {
-		Logger.debug(`Setting execution status "${status}" failed because executionId is undefined`);
+		logger.debug(`Setting execution status "${status}" failed because executionId is undefined`);
 		return;
 	}
-	Logger.debug(`Setting execution status for ${this.executionId} to "${status}"`);
-	Container.get(ActiveExecutions)
-		.setStatus(this.executionId, status)
-		.catch((error) => {
-			Logger.debug(`Setting execution status "${status}" failed: ${error.message}`);
-		});
+	logger.debug(`Setting execution status for ${this.executionId} to "${status}"`);
+	Container.get(ActiveExecutions).setStatus(this.executionId, status);
 }
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function sendMessageToUI(source: string, messages: any[]) {
-	const { sessionId } = this;
-	if (sessionId === undefined) {
+export function sendDataToUI(type: string, data: IDataObject | IDataObject[]) {
+	const { pushRef } = this;
+	if (pushRef === undefined) {
 		return;
 	}
 
 	// Push data to session which started workflow
 	try {
 		const pushInstance = Container.get(Push);
-		pushInstance.send(
-			'sendConsoleMessage',
-			{
-				source: `[Node: "${source}"]`,
-				messages,
-			},
-			sessionId,
-		);
+		pushInstance.send(type as IPushDataType, data, pushRef);
 	} catch (error) {
-		Logger.warn(`There was a problem sending message to UI: ${error.message}`);
+		const logger = Container.get(Logger);
+		logger.warn(`There was a problem sending message to UI: ${error.message}`);
 	}
 }
 
 /**
  * Returns the base additional data without webhooks
- *
  */
 export async function getBase(
 	userId: string,
 	currentNodeParameters?: INodeParameters,
 	executionTimeoutTimestamp?: number,
 ): Promise<IWorkflowExecuteAdditionalData> {
-	const urlBaseWebhook = WebhookHelpers.getWebhookBaseUrl();
+	const urlBaseWebhook = Container.get(UrlService).getWebhookBaseUrl();
+
+	const formWaitingBaseUrl = urlBaseWebhook + config.getEnv('endpoints.formWaiting');
 
-	const timezone = config.getEnv('generic.timezone');
 	const webhookBaseUrl = urlBaseWebhook + config.getEnv('endpoints.webhook');
-	const webhookWaitingBaseUrl = urlBaseWebhook + config.getEnv('endpoints.webhookWaiting');
 	const webhookTestBaseUrl = urlBaseWebhook + config.getEnv('endpoints.webhookTest');
+	const webhookWaitingBaseUrl = urlBaseWebhook + config.getEnv('endpoints.webhookWaiting');
 
-	const [encryptionKey, variables] = await Promise.all([
-		UserSettings.getEncryptionKey(),
-		WorkflowHelpers.getVariables(),
-	]);
+	const variables = await WorkflowHelpers.getVariables();
 
 	return {
-		credentialsHelper: new CredentialsHelper(encryptionKey),
-		encryptionKey,
+		credentialsHelper: Container.get(CredentialsHelper),
 		executeWorkflow,
 		restApiUrl: urlBaseWebhook + config.getEnv('endpoints.rest'),
-		timezone,
+		instanceBaseUrl: urlBaseWebhook,
+		formWaitingBaseUrl,
 		webhookBaseUrl,
 		webhookWaitingBaseUrl,
 		webhookTestBaseUrl,
@@ -1184,6 +1007,23 @@ export async function getBase(
 		userId,
 		setExecutionStatus,
 		variables,
+		secretsHelpers: Container.get(SecretsHelper),
+		logAiEvent: async (
+			eventName: EventNamesAiNodesType,
+			payload: {
+				msg?: string | undefined;
+				executionId: string;
+				nodeName: string;
+				workflowId?: string | undefined;
+				workflowName: string;
+				nodeType?: string | undefined;
+			},
+		) => {
+			return await Container.get(MessageEventBus).sendAiNodeEvent({
+				eventName,
+				payload,
+			});
+		},
 	};
 }
 
@@ -1195,18 +1035,16 @@ function getWorkflowHooksIntegrated(
 	mode: WorkflowExecuteMode,
 	executionId: string,
 	workflowData: IWorkflowBase,
-	optionalParameters?: IWorkflowHooksOptionalParameters,
 ): WorkflowHooks {
-	optionalParameters = optionalParameters || {};
-	const hookFunctions = hookFunctionsSave(optionalParameters.parentProcessMode);
-	const preExecuteFunctions = hookFunctionsPreExecute(optionalParameters.parentProcessMode);
+	const hookFunctions = hookFunctionsSave();
+	const preExecuteFunctions = hookFunctionsPreExecute();
 	for (const key of Object.keys(preExecuteFunctions)) {
 		if (hookFunctions[key] === undefined) {
 			hookFunctions[key] = [];
 		}
 		hookFunctions[key]!.push.apply(hookFunctions[key], preExecuteFunctions[key]);
 	}
-	return new WorkflowHooks(hookFunctions, mode, executionId, workflowData, optionalParameters);
+	return new WorkflowHooks(hookFunctions, mode, executionId, workflowData);
 }
 
 /**
@@ -1221,13 +1059,14 @@ export function getWorkflowHooksWorkerExecuter(
 ): WorkflowHooks {
 	optionalParameters = optionalParameters || {};
 	const hookFunctions = hookFunctionsSaveWorker();
-	const preExecuteFunctions = hookFunctionsPreExecute(optionalParameters.parentProcessMode);
+	const preExecuteFunctions = hookFunctionsPreExecute();
 	for (const key of Object.keys(preExecuteFunctions)) {
 		if (hookFunctions[key] === undefined) {
 			hookFunctions[key] = [];
 		}
 		hookFunctions[key]!.push.apply(hookFunctions[key], preExecuteFunctions[key]);
 	}
+
 	return new WorkflowHooks(hookFunctions, mode, executionId, workflowData, optionalParameters);
 }
 
@@ -1241,41 +1080,43 @@ export function getWorkflowHooksWorkerMain(
 	optionalParameters?: IWorkflowHooksOptionalParameters,
 ): WorkflowHooks {
 	optionalParameters = optionalParameters || {};
-	const hookFunctions = hookFunctionsPush();
-	const preExecuteFunctions = hookFunctionsPreExecute(optionalParameters.parentProcessMode);
-	for (const key of Object.keys(preExecuteFunctions)) {
-		if (hookFunctions[key] === undefined) {
-			hookFunctions[key] = [];
-		}
-		hookFunctions[key]!.push.apply(hookFunctions[key], preExecuteFunctions[key]);
-	}
+	const hookFunctions = hookFunctionsPreExecute();
+
+	// TODO: why are workers pushing to frontend?
+	// TODO: simplifying this for now to just leave the bare minimum hooks
+
+	// const hookFunctions = hookFunctionsPush();
+	// const preExecuteFunctions = hookFunctionsPreExecute();
+	// for (const key of Object.keys(preExecuteFunctions)) {
+	// 	if (hookFunctions[key] === undefined) {
+	// 		hookFunctions[key] = [];
+	// 	}
+	// 	hookFunctions[key]!.push.apply(hookFunctions[key], preExecuteFunctions[key]);
+	// }
 
 	// When running with worker mode, main process executes
 	// Only workflowExecuteBefore + workflowExecuteAfter
 	// So to avoid confusion, we are removing other hooks.
 	hookFunctions.nodeExecuteBefore = [];
 	hookFunctions.nodeExecuteAfter = [];
+	hookFunctions.workflowExecuteAfter = [
+		async function (this: WorkflowHooks, fullRunData: IRun): Promise<void> {
+			const executionStatus = determineFinalExecutionStatus(fullRunData);
+			const saveSettings = toSaveSettings(this.workflowData.settings);
+
+			const shouldNotSave =
+				(executionStatus === 'success' && !saveSettings.success) ||
+				(executionStatus !== 'success' && !saveSettings.error);
+
+			if (shouldNotSave) {
+				await Container.get(ExecutionRepository).hardDelete({
+					workflowId: this.workflowData.id,
+					executionId: this.executionId,
+				});
+			}
+		},
+	];
 
-	hookFunctions.nodeExecuteBefore.push(async function (
-		this: WorkflowHooks,
-		nodeName: string,
-	): Promise<void> {
-		void Container.get(InternalHooks).onNodeBeforeExecute(
-			this.executionId,
-			this.workflowData,
-			nodeName,
-		);
-	});
-	hookFunctions.nodeExecuteAfter.push(async function (
-		this: WorkflowHooks,
-		nodeName: string,
-	): Promise<void> {
-		void Container.get(InternalHooks).onNodePostExecute(
-			this.executionId,
-			this.workflowData,
-			nodeName,
-		);
-	});
 	return new WorkflowHooks(hookFunctions, mode, executionId, workflowData, optionalParameters);
 }
 
@@ -1286,7 +1127,6 @@ export function getWorkflowHooksWorkerMain(
 export function getWorkflowHooksMain(
 	data: IWorkflowExecutionDataProcess,
 	executionId: string,
-	isMainProcess = false,
 ): WorkflowHooks {
 	const hookFunctions = hookFunctionsSave();
 	const pushFunctions = hookFunctionsPush();
@@ -1297,41 +1137,19 @@ export function getWorkflowHooksMain(
 		hookFunctions[key]!.push.apply(hookFunctions[key], pushFunctions[key]);
 	}
 
-	if (isMainProcess) {
-		const preExecuteFunctions = hookFunctionsPreExecute();
-		for (const key of Object.keys(preExecuteFunctions)) {
-			if (hookFunctions[key] === undefined) {
-				hookFunctions[key] = [];
-			}
-			hookFunctions[key]!.push.apply(hookFunctions[key], preExecuteFunctions[key]);
+	const preExecuteFunctions = hookFunctionsPreExecute();
+	for (const key of Object.keys(preExecuteFunctions)) {
+		if (hookFunctions[key] === undefined) {
+			hookFunctions[key] = [];
 		}
+		hookFunctions[key]!.push.apply(hookFunctions[key], preExecuteFunctions[key]);
 	}
 
 	if (!hookFunctions.nodeExecuteBefore) hookFunctions.nodeExecuteBefore = [];
-	hookFunctions.nodeExecuteBefore?.push(async function (
-		this: WorkflowHooks,
-		nodeName: string,
-	): Promise<void> {
-		void Container.get(InternalHooks).onNodeBeforeExecute(
-			this.executionId,
-			this.workflowData,
-			nodeName,
-		);
-	});
 	if (!hookFunctions.nodeExecuteAfter) hookFunctions.nodeExecuteAfter = [];
-	hookFunctions.nodeExecuteAfter.push(async function (
-		this: WorkflowHooks,
-		nodeName: string,
-	): Promise<void> {
-		void Container.get(InternalHooks).onNodePostExecute(
-			this.executionId,
-			this.workflowData,
-			nodeName,
-		);
-	});
 
 	return new WorkflowHooks(hookFunctions, data.executionMode, executionId, data.workflowData, {
-		sessionId: data.sessionId,
+		pushRef: data.pushRef,
 		retryOf: data.retryOf as string,
 	});
 }
diff --git a/packages/cli/src/WorkflowHelpers.ts b/packages/cli/src/WorkflowHelpers.ts
index 86378f30c6b6f..00b655317a5ad 100644
--- a/packages/cli/src/WorkflowHelpers.ts
+++ b/packages/cli/src/WorkflowHelpers.ts
@@ -1,47 +1,80 @@
-import { In } from 'typeorm';
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
+/* eslint-disable @typescript-eslint/no-use-before-define */
+/* eslint-disable id-denylist */
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import { Container } from 'typedi';
+import { In } from '@n8n/typeorm';
+import { v4 as uuid } from 'uuid';
 import type {
 	IDataObject,
-	IExecuteData,
 	INode,
 	INodeCredentialsDetails,
 	IRun,
-	IRunExecutionData,
 	ITaskData,
 	NodeApiError,
 	WorkflowExecuteMode,
-} from 'n8n-workflow';
-import {
-	ErrorReporterProxy as ErrorReporter,
-	LoggerProxy as Logger,
-	NodeOperationError,
+	WorkflowOperationError,
 	Workflow,
+	NodeOperationError,
 } from 'n8n-workflow';
-import { v4 as uuid } from 'uuid';
-import * as Db from '@/Db';
-import type {
-	ICredentialsDb,
-	IWorkflowErrorData,
-	IWorkflowExecutionDataProcess,
-} from '@/Interfaces';
-import { NodeTypes } from '@/NodeTypes';
-import { WorkflowRunner } from '@/WorkflowRunner';
 
-import config from '@/config';
+import type { IWorkflowExecutionDataProcess } from '@/Interfaces';
 import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
+import { CredentialsRepository } from '@db/repositories/credentials.repository';
+import { SharedWorkflowRepository } from './databases/repositories/sharedWorkflow.repository';
+import { VariablesService } from '@/environments/variables/variables.service.ee';
 import type { User } from '@db/entities/User';
-import { RoleRepository } from '@db/repositories';
-import { whereClause } from '@/UserManagement/UserManagementHelper';
-import omit from 'lodash.omit';
-import { PermissionChecker } from './UserManagement/PermissionChecker';
-import { isWorkflowIdValid } from './utils';
-import { UserService } from './user/user.service';
 
-const ERROR_TRIGGER_TYPE = config.getEnv('nodes.errorTriggerType');
+export function generateFailedExecutionFromError(
+	mode: WorkflowExecuteMode,
+	error: NodeApiError | NodeOperationError | WorkflowOperationError,
+	node: INode,
+): IRun {
+	return {
+		data: {
+			startData: {
+				destinationNode: node.name,
+				runNodeFilter: [node.name],
+			},
+			resultData: {
+				error,
+				runData: {
+					[node.name]: [
+						{
+							startTime: 0,
+							executionTime: 0,
+							error,
+							source: [],
+						},
+					],
+				},
+				lastNodeExecuted: node.name,
+			},
+			executionData: {
+				contextData: {},
+				metadata: {},
+				nodeExecutionStack: [
+					{
+						node,
+						data: {},
+						source: null,
+					},
+				],
+				waitingExecution: {},
+				waitingExecutionSource: {},
+			},
+		},
+		finished: false,
+		mode,
+		startedAt: new Date(),
+		stoppedAt: new Date(),
+		status: 'error',
+	};
+}
 
 /**
  * Returns the data of the last executed node
- *
  */
 export function getDataLastExecutedNodeData(inputData: IRun): ITaskData | undefined {
 	const { runData, pinData = {} } = inputData.data.resultData;
@@ -77,176 +110,6 @@ export function getDataLastExecutedNodeData(inputData: IRun): ITaskData | undefi
 	return lastNodeRunData;
 }
 
-/**
- * Executes the error workflow
- *
- * @param {string} workflowId The id of the error workflow
- * @param {IWorkflowErrorData} workflowErrorData The error data
- */
-export async function executeErrorWorkflow(
-	workflowId: string,
-	workflowErrorData: IWorkflowErrorData,
-	runningUser: User,
-): Promise<void> {
-	// Wrap everything in try/catch to make sure that no errors bubble up and all get caught here
-	try {
-		const workflowData = await Db.collections.Workflow.findOneBy({ id: workflowId });
-
-		if (workflowData === null) {
-			// The error workflow could not be found
-			Logger.error(
-				// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-				`Calling Error Workflow for "${workflowErrorData.workflow.id}". Could not find error workflow "${workflowId}"`,
-				{ workflowId },
-			);
-			return;
-		}
-
-		const executionMode = 'error';
-		const nodeTypes = Container.get(NodeTypes);
-
-		const workflowInstance = new Workflow({
-			id: workflowId,
-			name: workflowData.name,
-			nodeTypes,
-			nodes: workflowData.nodes,
-			connections: workflowData.connections,
-			active: workflowData.active,
-			staticData: workflowData.staticData,
-			settings: workflowData.settings,
-		});
-
-		try {
-			await PermissionChecker.checkSubworkflowExecutePolicy(
-				workflowInstance,
-				runningUser.id,
-				workflowErrorData.workflow.id,
-			);
-		} catch (error) {
-			Logger.info('Error workflow execution blocked due to subworkflow settings', {
-				erroredWorkflowId: workflowErrorData.workflow.id,
-				errorWorkflowId: workflowId,
-			});
-			return;
-		}
-
-		let node: INode;
-		let workflowStartNode: INode | undefined;
-		for (const nodeName of Object.keys(workflowInstance.nodes)) {
-			node = workflowInstance.nodes[nodeName];
-			if (node.type === ERROR_TRIGGER_TYPE) {
-				workflowStartNode = node;
-			}
-		}
-
-		if (workflowStartNode === undefined) {
-			Logger.error(
-				// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-				`Calling Error Workflow for "${workflowErrorData.workflow.id}". Could not find "${ERROR_TRIGGER_TYPE}" in workflow "${workflowId}"`,
-			);
-			return;
-		}
-
-		// Can execute without webhook so go on
-
-		// Initialize the data of the webhook node
-		const nodeExecutionStack: IExecuteData[] = [];
-		nodeExecutionStack.push({
-			node: workflowStartNode,
-			data: {
-				main: [
-					[
-						{
-							json: workflowErrorData,
-						},
-					],
-				],
-			},
-			source: null,
-		});
-
-		const runExecutionData: IRunExecutionData = {
-			startData: {},
-			resultData: {
-				runData: {},
-			},
-			executionData: {
-				contextData: {},
-				nodeExecutionStack,
-				waitingExecution: {},
-				waitingExecutionSource: {},
-			},
-		};
-
-		const runData: IWorkflowExecutionDataProcess = {
-			executionMode,
-			executionData: runExecutionData,
-			workflowData,
-			userId: runningUser.id,
-		};
-
-		const workflowRunner = new WorkflowRunner();
-		await workflowRunner.run(runData);
-	} catch (error) {
-		ErrorReporter.error(error);
-		Logger.error(
-			// eslint-disable-next-line @typescript-eslint/restrict-template-expressions, @typescript-eslint/no-unsafe-member-access
-			`Calling Error Workflow for "${workflowErrorData.workflow.id}": "${error.message}"`,
-			{ workflowId: workflowErrorData.workflow.id },
-		);
-	}
-}
-
-/**
- * Saves the static data if it changed
- */
-export async function saveStaticData(workflow: Workflow): Promise<void> {
-	if (workflow.staticData.__dataChanged === true) {
-		// Static data of workflow changed and so has to be saved
-		if (isWorkflowIdValid(workflow.id)) {
-			// Workflow is saved so update in database
-			try {
-				// eslint-disable-next-line @typescript-eslint/no-use-before-define, @typescript-eslint/no-non-null-assertion
-				await saveStaticDataById(workflow.id!, workflow.staticData);
-				workflow.staticData.__dataChanged = false;
-			} catch (error) {
-				ErrorReporter.error(error);
-				Logger.error(
-					// eslint-disable-next-line @typescript-eslint/restrict-template-expressions, @typescript-eslint/no-unsafe-member-access
-					`There was a problem saving the workflow with id "${workflow.id}" to save changed staticData: "${error.message}"`,
-					{ workflowId: workflow.id },
-				);
-			}
-		}
-	}
-}
-
-/**
- * Saves the given static data on workflow
- *
- * @param {(string)} workflowId The id of the workflow to save data on
- * @param {IDataObject} newStaticData The static data to save
- */
-export async function saveStaticDataById(
-	workflowId: string,
-	newStaticData: IDataObject,
-): Promise<void> {
-	await Db.collections.Workflow.update(workflowId, {
-		staticData: newStaticData,
-	});
-}
-
-/**
- * Returns the static data of workflow
- */
-export async function getStaticDataById(workflowId: string) {
-	const workflowData = await Db.collections.Workflow.findOne({
-		select: ['staticData'],
-		where: { id: workflowId },
-	});
-	return workflowData?.staticData ?? {};
-}
-
 /**
  * Set node ids if not already set
  */
@@ -272,7 +135,7 @@ export async function replaceInvalidCredentials(workflow: WorkflowEntity): Promi
 
 	// for loop to run DB fetches sequential and use cache to keep pressure off DB
 	// trade-off: longer response time for less DB queries
-	/* eslint-disable no-await-in-loop */
+
 	for (const node of nodes) {
 		if (!node.credentials || node.disabled) {
 			continue;
@@ -288,7 +151,7 @@ export async function replaceInvalidCredentials(workflow: WorkflowEntity): Promi
 					credentialsByName[nodeCredentialType] = {};
 				}
 				if (credentialsByName[nodeCredentialType][name] === undefined) {
-					const credentials = await Db.collections.Credentials.findBy({
+					const credentials = await Container.get(CredentialsRepository).findBy({
 						name,
 						type: nodeCredentialType,
 					});
@@ -324,7 +187,7 @@ export async function replaceInvalidCredentials(workflow: WorkflowEntity): Promi
 			// check if credentials for ID-type are not yet cached
 			if (credentialsById[nodeCredentialType][nodeCredentials.id] === undefined) {
 				// check first if ID-type combination exists
-				const credentials = await Db.collections.Credentials.findOneBy({
+				const credentials = await Container.get(CredentialsRepository).findOneBy({
 					id: nodeCredentials.id,
 					type: nodeCredentialType,
 				});
@@ -338,7 +201,7 @@ export async function replaceInvalidCredentials(workflow: WorkflowEntity): Promi
 					continue;
 				}
 				// no credentials found for ID, check if some exist for name
-				const credsByName = await Db.collections.Credentials.findBy({
+				const credsByName = await Container.get(CredentialsRepository).findBy({
 					name: nodeCredentials.name,
 					type: nodeCredentialType,
 				});
@@ -368,211 +231,45 @@ export async function replaceInvalidCredentials(workflow: WorkflowEntity): Promi
 	return workflow;
 }
 
-/**
- * Get the IDs of the workflows that have been shared with the user.
- * Returns all IDs if user is global owner (see `whereClause`)
- */
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
+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 getSharedWorkflowIds(user: User, roles?: string[]): Promise<string[]> {
+	const where: Record<string, any> = {}
+	if (!user.isOwner) {
+		where.user = { id: user.id };
+		if (roles?.length) {
+			where.role = In(roles);
+		}
+	}
 	const sharedWorkflows =
 		process.env.ONLY_OWNER_OR_ADMIN_CAN_ACCESS_WORKFLOW === 'true'
-			? await Db.collections.SharedWorkflow.find({
-					relations: ['workflow', 'role'],
+			? await Container.get(SharedWorkflowRepository).find({
+					relations: ['workflow'],
 					select: ['workflowId'],
-					where: whereClause({ user, entityType: 'workflow', roles }),
+					where,
 			  })
-			: await Db.collections.SharedWorkflow.find({
-					relations: ['workflow', 'role'],
+			: await Container.get(SharedWorkflowRepository).find({
+					relations: ['workflow'],
 					select: ['workflowId'],
 			  });
 
 	return sharedWorkflows.map(({ workflowId }) => workflowId);
 }
 
-/**
- * Check if user owns more than 15 workflows or more than 2 workflows with at least 2 nodes.
- * If user does, set flag in its settings.
- */
-export async function isBelowOnboardingThreshold(user: User): Promise<boolean> {
-	let belowThreshold = true;
-	const skippedTypes = ['n8n-nodes-base.start', 'n8n-nodes-base.stickyNote'];
-
-	const workflowOwnerRole = await Container.get(RoleRepository).findWorkflowOwnerRole();
-	const ownedWorkflowsIds = await Db.collections.SharedWorkflow.find({
-		where: {
-			userId: user.id,
-			roleId: workflowOwnerRole?.id,
-		},
-		select: ['workflowId'],
-	}).then((ownedWorkflows) => ownedWorkflows.map(({ workflowId }) => workflowId));
-
-	if (ownedWorkflowsIds.length > 15) {
-		belowThreshold = false;
-	} else {
-		// just fetch workflows' nodes to keep memory footprint low
-		const workflows = await Db.collections.Workflow.find({
-			where: { id: In(ownedWorkflowsIds) },
-			select: ['nodes'],
-		});
-
-		// valid workflow: 2+ nodes without start node
-		const validWorkflowCount = workflows.reduce((counter, workflow) => {
-			if (counter <= 2 && workflow.nodes.length > 2) {
-				const nodes = workflow.nodes.filter((node) => !skippedTypes.includes(node.type));
-				if (nodes.length >= 2) {
-					return counter + 1;
-				}
-			}
-			return counter;
-		}, 0);
-
-		// more than 2 valid workflows required
-		belowThreshold = validWorkflowCount <= 2;
-	}
-
-	// user is above threshold --> set flag in settings
-	if (!belowThreshold) {
-		void UserService.updateUserSettings(user.id, { isOnboarded: true });
-	}
-
-	return belowThreshold;
-}
-
-export function generateFailedExecutionFromError(
-	mode: WorkflowExecuteMode,
-	error: NodeApiError | NodeOperationError,
-	node: INode,
-): IRun {
-	return {
-		data: {
-			startData: {
-				destinationNode: node.name,
-				runNodeFilter: [node.name],
-			},
-			resultData: {
-				error,
-				runData: {
-					[node.name]: [
-						{
-							startTime: 0,
-							executionTime: 0,
-							error,
-							source: [],
-						},
-					],
-				},
-				lastNodeExecuted: node.name,
-			},
-			executionData: {
-				contextData: {},
-				nodeExecutionStack: [
-					{
-						node,
-						data: {},
-						source: null,
-					},
-				],
-				waitingExecution: {},
-				waitingExecutionSource: {},
-			},
-		},
-		finished: false,
-		mode,
-		startedAt: new Date(),
-		stoppedAt: new Date(),
-		status: 'failed',
-	};
-}
-
-/** Get all nodes in a workflow where the node credential is not accessible to the user. */
-export function getNodesWithInaccessibleCreds(workflow: WorkflowEntity, userCredIds: string[]) {
-	if (!workflow.nodes) {
-		return [];
-	}
-	return workflow.nodes.filter((node) => {
-		if (!node.credentials) return false;
-
-		const allUsedCredentials = Object.values(node.credentials);
-
-		const allUsedCredentialIds = allUsedCredentials.map((nodeCred) => nodeCred.id?.toString());
-		return allUsedCredentialIds.some(
-			(nodeCredId) => nodeCredId && !userCredIds.includes(nodeCredId),
-		);
-	});
-}
-
-export function validateWorkflowCredentialUsage(
-	newWorkflowVersion: WorkflowEntity,
-	previousWorkflowVersion: WorkflowEntity,
-	credentialsUserHasAccessTo: ICredentialsDb[],
-) {
-	/**
-	 * We only need to check nodes that use credentials the current user cannot access,
-	 * since these can be 2 possibilities:
-	 * - Same ID already exist: it's a read only node and therefore cannot be changed
-	 * - It's a new node which indicates tampering and therefore must fail saving
-	 */
-
-	const allowedCredentialIds = credentialsUserHasAccessTo.map((cred) => cred.id);
-
-	const nodesWithCredentialsUserDoesNotHaveAccessTo = getNodesWithInaccessibleCreds(
-		newWorkflowVersion,
-		allowedCredentialIds,
-	);
-
-	// If there are no nodes with credentials the user does not have access to we can skip the rest
-	if (nodesWithCredentialsUserDoesNotHaveAccessTo.length === 0) {
-		return newWorkflowVersion;
-	}
-
-	const previouslyExistingNodeIds = previousWorkflowVersion.nodes.map((node) => node.id);
-
-	// If it's a new node we can't allow it to be saved
-	// since it uses creds the node doesn't have access
-	const isTamperingAttempt = (inaccessibleCredNodeId: string) =>
-		!previouslyExistingNodeIds.includes(inaccessibleCredNodeId);
-
-	nodesWithCredentialsUserDoesNotHaveAccessTo.forEach((node) => {
-		if (isTamperingAttempt(node.id)) {
-			Logger.verbose('Blocked workflow update due to tampering attempt', {
-				nodeType: node.type,
-				nodeName: node.name,
-				nodeId: node.id,
-				nodeCredentials: node.credentials,
-			});
-			// Node is new, so this is probably a tampering attempt. Throw an error
-			throw new NodeOperationError(
-				node,
-				`You don't have access to the credentials in the '${node.name}' node. Ask the owner to share them with you.`,
-			);
-		}
-		// Replace the node with the previous version of the node
-		// Since it cannot be modified (read only node)
-		const nodeIdx = newWorkflowVersion.nodes.findIndex(
-			(newWorkflowNode) => newWorkflowNode.id === node.id,
-		);
-
-		Logger.debug('Replacing node with previous version when saving updated workflow', {
-			nodeType: node.type,
-			nodeName: node.name,
-			nodeId: node.id,
-		});
-		const previousNodeVersion = previousWorkflowVersion.nodes.find(
-			(previousNode) => previousNode.id === node.id,
-		);
-		// Allow changing only name, position and disabled status for read-only nodes
-		Object.assign(
-			newWorkflowVersion.nodes[nodeIdx],
-			omit(previousNodeVersion, ['name', 'position', 'disabled']),
-		);
-	});
-
-	return newWorkflowVersion;
-}
-
 export async function getVariables(): Promise<IDataObject> {
+	const variables = await Container.get(VariablesService).getAllCached();
 	return Object.freeze(
-		(await Db.collections.Variables.find()).reduce((prev, curr) => {
+		variables.reduce((prev, curr) => {
 			prev[curr.key] = curr.value;
 			return prev;
 		}, {} as IDataObject),
diff --git a/packages/cli/src/WorkflowRunner.ts b/packages/cli/src/WorkflowRunner.ts
index dbac6a7fa694c..95f69b917bcf4 100644
--- a/packages/cli/src/WorkflowRunner.ts
+++ b/packages/cli/src/WorkflowRunner.ts
@@ -1,89 +1,82 @@
+/* eslint-disable complexity */
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
-/* eslint-disable no-restricted-syntax */
-/* eslint-disable no-console */
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* eslint-disable @typescript-eslint/restrict-template-expressions */
 /* eslint-disable @typescript-eslint/no-shadow */
-/* eslint-disable @typescript-eslint/no-floating-promises */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
-/* eslint-disable @typescript-eslint/prefer-optional-chain */
-/* eslint-disable no-param-reassign */
-/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
-/* eslint-disable @typescript-eslint/no-unused-vars */
-import type { IProcessMessage } from 'n8n-core';
-import { BinaryDataManager, WorkflowExecute } from 'n8n-core';
+import { Container, Service } from 'typedi';
+import { WorkflowExecute } from 'n8n-core';
 
 import type {
 	ExecutionError,
 	IDeferredPromise,
 	IExecuteResponsePromiseData,
+	IPinData,
 	IRun,
 	WorkflowExecuteMode,
 	WorkflowHooks,
-	WorkflowSettings,
 } from 'n8n-workflow';
+import { NodeOperationError } from 'n8n-workflow';
 import {
 	ErrorReporterProxy as ErrorReporter,
-	LoggerProxy as Logger,
 	Workflow,
 	WorkflowOperationError,
 } from 'n8n-workflow';
 
 import PCancelable from 'p-cancelable';
-import { join as pathJoin } from 'path';
-import { fork } from 'child_process';
 
 import { ActiveExecutions } from '@/ActiveExecutions';
 import config from '@/config';
-import * as Db from '@/Db';
+import { ExecutionRepository } from '@db/repositories/execution.repository';
+import { WorkflowTestRepository } from '@db/repositories/workflowTest.repository';
+import { NodeOutputRepository } from '@db/repositories/nodeOutput.repository';
+import { ResumeWorkflowTimerRepository } from './databases/repositories/resumeWorkflowTimer.repository';
+import { MessageEventBus } from '@/eventbus/MessageEventBus/MessageEventBus';
+import { ExecutionDataRecoveryService } from '@/eventbus/executionDataRecovery.service';
 import { ExternalHooks } from '@/ExternalHooks';
-import type {
-	IExecutionFlattedDb,
-	IProcessMessageDataHook,
-	IWorkflowExecutionDataProcess,
-	IWorkflowExecutionDataProcessWithExecution,
-} from '@/Interfaces';
+import type { IExecutionResponse, IWorkflowExecutionDataProcess } from '@/Interfaces';
 import { NodeTypes } from '@/NodeTypes';
-import type { Job, JobData, JobQueue, JobResponse } from '@/Queue';
+import type { Job, JobData, JobResponse } from '@/Queue';
 import { Queue } from '@/Queue';
-import * as ResponseHelper from '@/ResponseHelper';
-import * as WebhookHelpers from '@/WebhookHelpers';
 import * as WorkflowHelpers from '@/WorkflowHelpers';
 import * as WorkflowExecuteAdditionalData from '@/WorkflowExecuteAdditionalData';
 import { generateFailedExecutionFromError } from '@/WorkflowHelpers';
-import { initErrorHandling } from '@/ErrorReporting';
 import { PermissionChecker } from '@/UserManagement/PermissionChecker';
-import { Push } from '@/push';
-import { eventBus } from './eventbus';
-import { recoverExecutionDataFromEventLogMessages } from './eventbus/MessageEventBus/recoverEvents';
-import { Container } from 'typedi';
-import { InternalHooks } from './InternalHooks';
+import { InternalHooks } from '@/InternalHooks';
+import { Logger } from '@/Logger';
+import { WorkflowStaticDataService } from '@/workflows/workflowStaticData.service';
 import { logIncidentFromWorkflowExecute } from './lib/incidentLogger';
+import { ResumeWorkflowTimer } from './databases/entities/ResumeWorkflowTimer';
 
-export class WorkflowRunner {
-	activeExecutions: ActiveExecutions;
-
-	push: Push;
-
-	jobQueue: JobQueue;
-
-	constructor() {
-		this.push = Container.get(Push);
-		this.activeExecutions = Container.get(ActiveExecutions);
-	}
+const createResumeTimerEntity = async (data: any) => {
+	let resumeWorkflowEntity = new ResumeWorkflowTimer();
+	Object.assign(resumeWorkflowEntity, data);
+	resumeWorkflowEntity = await Container.get(ResumeWorkflowTimerRepository).save(resumeWorkflowEntity);
+	return resumeWorkflowEntity;
+};
 
-	/**
-	 * The process did send a hook message so execute the appropriate hook
-	 */
-	processHookMessage(workflowHooks: WorkflowHooks, hookData: IProcessMessageDataHook) {
-		// eslint-disable-next-line @typescript-eslint/no-floating-promises
-		workflowHooks.executeHookFunctions(hookData.hook, hookData.parameters);
+@Service()
+export class WorkflowRunner {
+	private jobQueue: Queue;
+
+	private executionsMode = config.getEnv('executions.mode');
+
+	constructor(
+		private readonly logger: Logger,
+		private readonly activeExecutions: ActiveExecutions,
+		private readonly executionRepository: ExecutionRepository,
+		private readonly externalHooks: ExternalHooks,
+		private readonly workflowStaticDataService: WorkflowStaticDataService,
+		private readonly nodeTypes: NodeTypes,
+		private readonly permissionChecker: PermissionChecker,
+		private readonly workflowTestRepository: WorkflowTestRepository,
+		private readonly nodeOutputRepository: NodeOutputRepository,
+	) {
+		if (this.executionsMode === 'queue') {
+			this.jobQueue = Container.get(Queue);
+		}
 	}
 
-	/**
-	 * The process did error
-	 */
+	/** The process did error */
 	async processError(
 		error: ExecutionError,
 		startedAt: Date,
@@ -93,6 +86,21 @@ export class WorkflowRunner {
 	) {
 		ErrorReporter.error(error);
 
+		const isQueueMode = config.getEnv('executions.mode') === 'queue';
+
+		// in queue mode, first do a sanity run for the edge case that the execution was not marked as stalled
+		// by Bull even though it executed successfully, see https://github.com/OptimalBits/bull/issues/1415
+
+		if (isQueueMode && executionMode !== 'manual') {
+			const executionWithoutData = await this.executionRepository.findSingleExecution(executionId, {
+				includeData: false,
+			});
+			if (executionWithoutData?.finished === true && executionWithoutData?.status === 'success') {
+				// false positive, execution was successful
+				return;
+			}
+		}
+
 		const fullRunData: IRun = {
 			data: {
 				resultData: {
@@ -117,27 +125,32 @@ export class WorkflowRunner {
 		// does contain those messages.
 		try {
 			// Search for messages for this executionId in event logs
+			const eventBus = Container.get(MessageEventBus);
 			const eventLogMessages = await eventBus.getEventsByExecutionId(executionId);
 			// Attempt to recover more better runData from these messages (but don't update the execution db entry yet)
 			if (eventLogMessages.length > 0) {
-				const eventLogExecutionData = await recoverExecutionDataFromEventLogMessages(
-					executionId,
-					eventLogMessages,
-					false,
-				);
+				const eventLogExecutionData = await Container.get(
+					ExecutionDataRecoveryService,
+				).recoverExecutionData(executionId, eventLogMessages, false);
 				if (eventLogExecutionData) {
 					fullRunData.data.resultData.runData = eventLogExecutionData.resultData.runData;
 					fullRunData.status = 'crashed';
 				}
 			}
 
-			const executionFlattedData = await Db.collections.Execution.findOneBy({ id: executionId });
+			const executionFlattedData = await this.executionRepository.findSingleExecution(executionId, {
+				includeData: true,
+			});
 
-			void Container.get(InternalHooks).onWorkflowCrashed(
-				executionId,
-				executionMode,
-				executionFlattedData?.workflowData,
-			);
+			if (executionFlattedData) {
+				void Container.get(InternalHooks).onWorkflowCrashed(
+					executionId,
+					executionMode,
+					executionFlattedData?.workflowData,
+					// TODO: get metadata to be sent here
+					// executionFlattedData?.metadata,
+				);
+			}
 		} catch {
 			// Ignore errors
 		}
@@ -151,100 +164,145 @@ export class WorkflowRunner {
 		}
 	}
 
-	/**
-	 * Run the workflow
-	 *
-	 * @param {boolean} [loadStaticData] If set will the static data be loaded from
-	 *                                   the workflow and added to input data
-	 */
+	/** Run the workflow */
 	async run(
 		data: IWorkflowExecutionDataProcess,
 		loadStaticData?: boolean,
 		realtime?: boolean,
-		executionId?: string,
+		restartExecutionId?: string,
 		responsePromise?: IDeferredPromise<IExecuteResponsePromiseData>,
 	): Promise<string> {
-		const executionsMode = config.getEnv('executions.mode');
-		const executionsProcess = config.getEnv('executions.process');
+		// Register a new execution
+		const executionId = await this.activeExecutions.add(data, restartExecutionId);
 
-		await initErrorHandling();
+		const { id: workflowId, nodes } = data.workflowData;
+		try {
+			await this.permissionChecker.check(workflowId, data.userId, nodes);
+		} catch (error) {
+			// Create a failed execution with the data for the node, save it and abort execution
+			const runData = generateFailedExecutionFromError(data.executionMode, error, error.node);
+			const workflowHooks = WorkflowExecuteAdditionalData.getWorkflowHooksMain(data, executionId);
+			await workflowHooks.executeHookFunctions('workflowExecuteBefore', []);
+			await workflowHooks.executeHookFunctions('workflowExecuteAfter', [runData]);
+			responsePromise?.reject(error);
+			this.activeExecutions.remove(executionId);
+			return executionId;
+		}
 
-		if (executionsMode === 'queue') {
-			const queue = Container.get(Queue);
-			this.jobQueue = queue.getBullObjectInstance();
+		if (responsePromise) {
+			this.activeExecutions.attachResponsePromise(executionId, responsePromise);
 		}
 
-		if (executionsMode === 'queue' && data.executionMode !== 'manual') {
+		if (this.executionsMode === 'queue' && data.executionMode !== 'manual') {
 			// Do not run "manual" executions in bull because sending events to the
 			// frontend would not be possible
-			executionId = await this.enqueueExecution(
-				data,
-				loadStaticData,
-				realtime,
-				executionId,
-				responsePromise,
-			);
-		} else if (executionsProcess === 'main') {
-			executionId = await this.runMainProcess(data, loadStaticData, executionId, responsePromise);
+			await this.enqueueExecution(executionId, data, loadStaticData, realtime);
 		} else {
-			executionId = await this.runSubprocess(data, loadStaticData, executionId, responsePromise);
+			await this.runMainProcess(executionId, data, loadStaticData, executionId);
+			void Container.get(InternalHooks).onWorkflowBeforeExecute(executionId, data);
 		}
 
-		void Container.get(InternalHooks).onWorkflowBeforeExecute(executionId, data);
-
-		const postExecutePromise = this.activeExecutions.getPostExecutePromise(executionId);
-
-		const externalHooks = Container.get(ExternalHooks);
-		postExecutePromise
-			.then(async (executionData) => {
-				void Container.get(InternalHooks).onWorkflowPostExecute(
-					executionId!,
-					data.workflowData,
-					executionData,
-					data.userId,
-				);
-			})
-			.catch((error) => {
-				ErrorReporter.error(error);
-				console.error('There was a problem running internal hook "onWorkflowPostExecute"', error);
-			});
-
-		if (externalHooks.exists('workflow.postExecute')) {
+		// only run these when not in queue mode or when the execution is manual,
+		// since these calls are now done by the worker directly
+		if (
+			this.executionsMode !== 'queue' ||
+			config.getEnv('generic.instanceType') === 'worker' ||
+			data.executionMode === 'manual'
+		) {
+			const postExecutePromise = this.activeExecutions.getPostExecutePromise(executionId);
 			postExecutePromise
 				.then(async (executionData) => {
-					await externalHooks.run('workflow.postExecute', [
-						executionData,
-						data.workflowData,
+					void Container.get(InternalHooks).onWorkflowPostExecute(
 						executionId,
-					]);
+						data.workflowData,
+						executionData,
+						data.userId,
+					);
+					if (this.externalHooks.exists('workflow.postExecute')) {
+						try {
+							await this.externalHooks.run('workflow.postExecute', [
+								executionData,
+								data.workflowData,
+								executionId,
+							]);
+						} catch (error) {
+							ErrorReporter.error(error);
+							this.logger.error('There was a problem running hook "workflow.postExecute"', error);
+						}
+					}
 				})
 				.catch((error) => {
 					ErrorReporter.error(error);
-					console.error('There was a problem running hook "workflow.postExecute"', error);
+					this.logger.error(
+						'There was a problem running internal hook "onWorkflowPostExecute"',
+						error,
+					);
 				});
 		}
 
 		return executionId;
 	}
 
-	/**
-	 * Run the workflow in current process
-	 *
-	 * @param {boolean} [loadStaticData] If set will the static data be loaded from
-	 *                                   the workflow and added to input data
-	 */
-	async runMainProcess(
+	/** Run the workflow in current process */
+	private async runMainProcess(
+		executionId: string,
 		data: IWorkflowExecutionDataProcess,
 		loadStaticData?: boolean,
 		restartExecutionId?: string,
-		responsePromise?: IDeferredPromise<IExecuteResponsePromiseData>,
-	): Promise<string> {
+	): Promise<void> {
 		const workflowId = data.workflowData.id;
 		if (loadStaticData === true && workflowId) {
-			data.workflowData.staticData = await WorkflowHelpers.getStaticDataById(workflowId);
+			data.workflowData.staticData =
+				await this.workflowStaticDataService.getStaticDataById(workflowId);
 		}
 
-		const nodeTypes = Container.get(NodeTypes);
+		const nodeOutputs = [];
+		let isTest = false;
+		if (data.executionMode === 'webhook') {
+			const webhookExecutionStack = data.executionData?.executionData?.nodeExecutionStack[0];
+			if (webhookExecutionStack?.node?.type === 'n8n-nodes-base.webhook') {
+				const webhookExecutionData = webhookExecutionStack.data.main as any;
+				const testId = webhookExecutionData[0][0]?.json?.query?.testId;
+				if (testId) {
+					const workflowTest = await this.workflowTestRepository.findOneBy({ name: testId, workflowId });
+					if (workflowTest) {
+						if (workflowTest.workflowId !== workflowId) {
+							const error = new NodeOperationError(
+								webhookExecutionStack?.node,
+								`Test ID does not belong to the workflow with ${workflowId}`,
+							);
+							ErrorReporter.error(error);
+							await this.processError(error, new Date(), data.executionMode, '');
+							return void 0;
+						}
+						isTest = true;
+						const worfklowNodes = data.workflowData.nodes;
+						const dcsZohoNodes = [
+							'@deep-consulting-solutions/n8n-nodes-dcs-crm.dcsZohoCrm',
+							'@deep-consulting-solutions/n8n-nodes-dcs-crm.dcsZohoDesk',
+							'@deep-consulting-solutions/n8n-nodes-dcs-crm.dcsZohoSign',
+							'@deep-consulting-solutions/n8n-nodes-dcs-crm.dcsZohoBooks',
+						];
+						for await (const node of worfklowNodes) {
+							const nodeOutput = await this.nodeOutputRepository.findOneBy({
+								nodeId: node.id,
+								workflowTestId: workflowTest.id
+							});
+							if (!nodeOutput && dcsZohoNodes.includes(node.type)) {
+								const error = new NodeOperationError(
+									webhookExecutionStack?.node,
+									'Some zoho nodes do not have output set',
+								);
+								ErrorReporter.error(error);
+								await this.processError(error, new Date(), data.executionMode, '');
+								return void 0;
+							}
+							if (nodeOutput) nodeOutputs.push(nodeOutput);
+						}
+					}
+				}
+			}
+		}
 
 		// Soft timeout to stop workflow execution after current running node
 		// Changes were made by adding the `workflowTimeout` to the `additionalData`
@@ -257,69 +315,45 @@ export class WorkflowRunner {
 			workflowTimeout = Math.min(workflowTimeout, config.getEnv('executions.maxTimeout'));
 		}
 
+		let pinData: IPinData | undefined;
+		if (data.executionMode === 'manual') {
+			pinData = data.pinData ?? data.workflowData.pinData;
+		}
+
 		const workflow = new Workflow({
 			id: workflowId,
 			name: data.workflowData.name,
 			nodes: data.workflowData.nodes,
 			connections: data.workflowData.connections,
 			active: data.workflowData.active,
-			nodeTypes,
+			nodeTypes: this.nodeTypes,
 			staticData: data.workflowData.staticData,
 			settings: workflowSettings,
+			pinData,
 		});
 		const additionalData = await WorkflowExecuteAdditionalData.getBase(
 			data.userId,
 			undefined,
 			workflowTimeout <= 0 ? undefined : Date.now() + workflowTimeout * 1000,
 		);
+		// TODO: set this in queue mode as well
 		additionalData.restartExecutionId = restartExecutionId;
 
-		// Register the active execution
-		const executionId = await this.activeExecutions.add(data, undefined, restartExecutionId);
 		additionalData.executionId = executionId;
 
-		Logger.verbose(
+		this.logger.verbose(
 			`Execution for workflow ${data.workflowData.name} was assigned id ${executionId}`,
 			{ executionId },
 		);
 		let workflowExecution: PCancelable<IRun>;
+		await this.executionRepository.updateStatus(executionId, 'running');
 
 		try {
-			Logger.verbose(
-				`Execution for workflow ${data.workflowData.name} was assigned id ${executionId}`,
-				{ executionId },
-			);
-
-			additionalData.hooks = WorkflowExecuteAdditionalData.getWorkflowHooksMain(
-				data,
-				executionId,
-				true,
-			);
-
-			try {
-				await PermissionChecker.check(workflow, data.userId);
-			} catch (error) {
-				ErrorReporter.error(error);
-				// Create a failed execution with the data for the node
-				// save it and abort execution
-				const failedExecution = generateFailedExecutionFromError(
-					data.executionMode,
-					error,
-					error.node,
-				);
-				additionalData.hooks
-					.executeHookFunctions('workflowExecuteAfter', [failedExecution])
-					.then(() => {
-						this.activeExecutions.remove(executionId, failedExecution);
-					});
-				return executionId;
-			}
+			additionalData.hooks = WorkflowExecuteAdditionalData.getWorkflowHooksMain(data, executionId);
 
 			additionalData.hooks.hookFunctions.sendResponse = [
 				async (response: IExecuteResponsePromiseData): Promise<void> => {
-					if (responsePromise) {
-						responsePromise.resolve(response);
-					}
+					this.activeExecutions.resolveResponsePromise(executionId, response);
 				},
 			];
 
@@ -327,12 +361,13 @@ export class WorkflowRunner {
 				executionId,
 			});
 
-			additionalData.sendMessageToUI = WorkflowExecuteAdditionalData.sendMessageToUI.bind({
-				sessionId: data.sessionId,
+			additionalData.sendDataToUI = WorkflowExecuteAdditionalData.sendDataToUI.bind({
+				pushRef: data.pushRef,
 			});
 
+			await additionalData.hooks.executeHookFunctions('workflowExecuteBefore', []);
 			if (data.executionData !== undefined) {
-				Logger.debug(`Execution ID ${executionId} had Execution data. Running with payload.`, {
+				this.logger.debug(`Execution ID ${executionId} had Execution data. Running with payload.`, {
 					executionId,
 				});
 				const workflowExecute = new WorkflowExecute(
@@ -340,7 +375,11 @@ export class WorkflowRunner {
 					data.executionMode,
 					data.executionData,
 				);
-				workflowExecution = workflowExecute.processRunExecutionData(workflow);
+				workflowExecution = workflowExecute.processRunExecutionData(workflow, {
+					isTest,
+					nodeOutputs,
+					createResumeTimerEntity,
+				});
 				workflowExecution.then(async (data) => {
 					await logIncidentFromWorkflowExecute(data, workflow);
 					return data;
@@ -348,19 +387,14 @@ export class WorkflowRunner {
 			} else if (
 				data.runData === undefined ||
 				data.startNodes === undefined ||
-				data.startNodes.length === 0 ||
-				data.destinationNode === undefined
+				data.startNodes.length === 0
 			) {
-				Logger.debug(`Execution ID ${executionId} will run executing all nodes.`, { executionId });
+				this.logger.debug(`Execution ID ${executionId} will run executing all nodes.`, {
+					executionId,
+				});
 				// Execute all nodes
 
-				let startNode;
-				if (
-					data.startNodes?.length === 1 &&
-					Object.keys(data.pinData ?? {}).includes(data.startNodes[0])
-				) {
-					startNode = workflow.getNode(data.startNodes[0]) ?? undefined;
-				}
+				const startNode = WorkflowHelpers.getExecutionStartNode(data, workflow);
 
 				// Can execute without webhook so go on
 				const workflowExecute = new WorkflowExecute(additionalData, data.executionMode);
@@ -371,7 +405,7 @@ export class WorkflowRunner {
 					data.pinData,
 				);
 			} else {
-				Logger.debug(`Execution ID ${executionId} is a partial execution.`, { executionId });
+				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);
 				workflowExecution = workflowExecute.runPartialWorkflow(
@@ -388,7 +422,7 @@ export class WorkflowRunner {
 			if (workflowTimeout > 0) {
 				const timeout = Math.min(workflowTimeout, config.getEnv('executions.maxTimeout')) * 1000; // as seconds
 				executionTimeout = setTimeout(() => {
-					this.activeExecutions.stopExecution(executionId, 'timeout');
+					void this.activeExecutions.stopExecution(executionId);
 				}, timeout);
 			}
 
@@ -401,15 +435,16 @@ export class WorkflowRunner {
 					fullRunData.status = this.activeExecutions.getStatus(executionId);
 					this.activeExecutions.remove(executionId, fullRunData);
 				})
-				.catch((error) => {
-					this.processError(
-						error,
-						new Date(),
-						data.executionMode,
-						executionId,
-						additionalData.hooks,
-					);
-				});
+				.catch(
+					async (error) =>
+						await this.processError(
+							error,
+							new Date(),
+							data.executionMode,
+							executionId,
+							additionalData.hooks,
+						),
+				);
 		} catch (error) {
 			await this.processError(
 				error,
@@ -421,25 +456,14 @@ export class WorkflowRunner {
 
 			throw error;
 		}
-
-		return executionId;
 	}
 
-	async enqueueExecution(
+	private async enqueueExecution(
+		executionId: string,
 		data: IWorkflowExecutionDataProcess,
 		loadStaticData?: boolean,
 		realtime?: boolean,
-		restartExecutionId?: string,
-		responsePromise?: IDeferredPromise<IExecuteResponsePromiseData>,
-	): Promise<string> {
-		// TODO: If "loadStaticData" is set to true it has to load data new on worker
-
-		// Register the active execution
-		const executionId = await this.activeExecutions.add(data, undefined, restartExecutionId);
-		if (responsePromise) {
-			this.activeExecutions.attachResponsePromise(executionId, responsePromise);
-		}
-
+	): Promise<void> {
 		const jobData: JobData = {
 			executionId,
 			loadStaticData: !!loadStaticData,
@@ -462,7 +486,7 @@ export class WorkflowRunner {
 		try {
 			job = await this.jobQueue.add(jobData, jobOptions);
 
-			console.log(`Started with job ID: ${job.id.toString()} (Execution ID: ${executionId})`);
+			this.logger.info(`Started with job ID: ${job.id.toString()} (Execution ID: ${executionId})`);
 
 			hooks = WorkflowExecuteAdditionalData.getWorkflowHooksWorkerMain(
 				data.executionMode,
@@ -473,7 +497,7 @@ export class WorkflowRunner {
 
 			// Normally also workflow should be supplied here but as it only used for sending
 			// data to editor-UI is not needed.
-			hooks.executeHookFunctions('workflowExecuteBefore', []);
+			await hooks.executeHookFunctions('workflowExecuteBefore', []);
 		} catch (error) {
 			// We use "getWorkflowHooksWorkerExecuter" as "getWorkflowHooksWorkerMain" does not contain the
 			// "workflowExecuteAfter" which we require.
@@ -513,7 +537,7 @@ export class WorkflowRunner {
 
 				const queueRecoveryInterval = config.getEnv('queue.bull.queueRecoveryInterval');
 
-				const racingPromises: Array<Promise<JobResponse | object>> = [jobData];
+				const racingPromises: Array<Promise<JobResponse>> = [jobData];
 
 				let clearWatchdogInterval;
 				if (queueRecoveryInterval > 0) {
@@ -531,7 +555,7 @@ export class WorkflowRunner {
 					 ************************************************ */
 					let watchDogInterval: NodeJS.Timeout | undefined;
 
-					const watchDog: Promise<object> = new Promise((res) => {
+					const watchDog: Promise<JobResponse> = new Promise((res) => {
 						watchDogInterval = setInterval(async () => {
 							const currentJob = await this.jobQueue.getJob(job.id);
 							// When null means job is finished (not found in queue)
@@ -567,7 +591,7 @@ export class WorkflowRunner {
 						data.workflowData,
 						{ retryOf: data.retryOf ? data.retryOf.toString() : undefined },
 					);
-					Logger.error(`Problem with execution ${executionId}: ${error.message}. Aborting.`);
+					this.logger.error(`Problem with execution ${executionId}: ${error.message}. Aborting.`);
 					if (clearWatchdogInterval !== undefined) {
 						clearWatchdogInterval();
 					}
@@ -576,45 +600,49 @@ export class WorkflowRunner {
 					reject(error);
 				}
 
-				const executionDb = (await Db.collections.Execution.findOneBy({
-					id: executionId,
-				})) as IExecutionFlattedDb;
-				const fullExecutionData = ResponseHelper.unflattenExecutionData(executionDb);
-				const runData = {
-					data: fullExecutionData.data,
+				// optimization: only pull and unflatten execution data from the Db when it is needed
+				const executionHasPostExecutionPromises =
+					this.activeExecutions.getPostExecutePromiseCount(executionId) > 0;
+
+				if (executionHasPostExecutionPromises) {
+					this.logger.debug(
+						`Reading execution data for execution ${executionId} from db for PostExecutionPromise.`,
+					);
+				} else {
+					this.logger.debug(
+						`Skipping execution data for execution ${executionId} since there are no PostExecutionPromise.`,
+					);
+				}
+
+				const fullExecutionData = await this.executionRepository.findSingleExecution(executionId, {
+					includeData: executionHasPostExecutionPromises,
+					unflattenData: executionHasPostExecutionPromises,
+				});
+				if (!fullExecutionData) {
+					return reject(new Error(`Could not find execution with id "${executionId}"`));
+				}
+
+				const runData: IRun = {
+					data: {},
 					finished: fullExecutionData.finished,
 					mode: fullExecutionData.mode,
 					startedAt: fullExecutionData.startedAt,
 					stoppedAt: fullExecutionData.stoppedAt,
+					status: fullExecutionData.status,
 				} as IRun;
 
+				if (executionHasPostExecutionPromises) {
+					runData.data = (fullExecutionData as IExecutionResponse).data;
+				}
+
+				// NOTE: due to the optimization of not loading the execution data from the db when no post execution promises are present,
+				// the execution data in runData.data MAY not be available here.
+				// This means that any function expecting with runData has to check if the runData.data defined from this point
 				this.activeExecutions.remove(executionId, runData);
+
 				// Normally also static data should be supplied here but as it only used for sending
 				// data to editor-UI is not needed.
-				hooks.executeHookFunctions('workflowExecuteAfter', [runData]);
-				try {
-					// Check if this execution data has to be removed from database
-					// based on workflow settings.
-					const workflowSettings = data.workflowData.settings ?? {};
-					const saveDataErrorExecution =
-						workflowSettings.saveDataErrorExecution ?? config.getEnv('executions.saveDataOnError');
-					const saveDataSuccessExecution =
-						workflowSettings.saveDataSuccessExecution ??
-						config.getEnv('executions.saveDataOnSuccess');
-
-					const workflowDidSucceed = !runData.data.resultData.error;
-					if (
-						(workflowDidSucceed && saveDataSuccessExecution === 'none') ||
-						(!workflowDidSucceed && saveDataErrorExecution === 'none')
-					) {
-						await Db.collections.Execution.delete(executionId);
-						await BinaryDataManager.getInstance().markDataForDeletionByExecutionId(executionId);
-					}
-					// eslint-disable-next-line id-denylist
-				} catch (err) {
-					// We don't want errors here to crash n8n. Just log and proceed.
-					console.log('Error removing saved execution from database. More details: ', err);
-				}
+				await hooks.executeHookFunctions('workflowExecuteAfter', [runData]);
 
 				resolve(runData);
 			},
@@ -627,193 +655,5 @@ export class WorkflowRunner {
 		});
 
 		this.activeExecutions.attachWorkflowExecution(executionId, workflowExecution);
-		return executionId;
-	}
-
-	/**
-	 * Run the workflow
-	 *
-	 * @param {boolean} [loadStaticData] If set will the static data be loaded from
-	 *                                   the workflow and added to input data
-	 */
-	async runSubprocess(
-		data: IWorkflowExecutionDataProcess,
-		loadStaticData?: boolean,
-		restartExecutionId?: string,
-		responsePromise?: IDeferredPromise<IExecuteResponsePromiseData>,
-	): Promise<string> {
-		const workflowId = data.workflowData.id;
-		let startedAt = new Date();
-		const subprocess = fork(pathJoin(__dirname, 'WorkflowRunnerProcess.js'));
-
-		if (loadStaticData === true && workflowId) {
-			data.workflowData.staticData = await WorkflowHelpers.getStaticDataById(workflowId);
-		}
-
-		data.restartExecutionId = restartExecutionId;
-
-		// Register the active execution
-		const executionId = await this.activeExecutions.add(data, subprocess, restartExecutionId);
-
-		(data as unknown as IWorkflowExecutionDataProcessWithExecution).executionId = executionId;
-
-		const workflowHooks = WorkflowExecuteAdditionalData.getWorkflowHooksMain(data, executionId);
-
-		try {
-			// Send all data to subprocess it needs to run the workflow
-			subprocess.send({ type: 'startWorkflow', data } as IProcessMessage);
-		} catch (error) {
-			await this.processError(error, new Date(), data.executionMode, executionId, workflowHooks);
-			return executionId;
-		}
-
-		// Start timeout for the execution
-		let executionTimeout: NodeJS.Timeout;
-
-		const workflowSettings = data.workflowData.settings ?? {};
-		let workflowTimeout = workflowSettings.executionTimeout ?? config.getEnv('executions.timeout'); // initialize with default
-
-		const processTimeoutFunction = (timeout: number) => {
-			this.activeExecutions.stopExecution(executionId, 'timeout');
-			executionTimeout = setTimeout(() => subprocess.kill(), Math.max(timeout * 0.2, 5000)); // minimum 5 seconds
-		};
-
-		if (workflowTimeout > 0) {
-			workflowTimeout = Math.min(workflowTimeout, config.getEnv('executions.maxTimeout')) * 1000; // as seconds
-			// Start timeout already now but give process at least 5 seconds to start.
-			// Without it could would it be possible that the workflow executions times out before it even got started if
-			// the timeout time is very short as the process start time can be quite long.
-			executionTimeout = setTimeout(
-				processTimeoutFunction,
-				Math.max(5000, workflowTimeout),
-				workflowTimeout,
-			);
-		}
-
-		// Create a list of child spawned executions
-		// If after the child process exits we have
-		// outstanding executions, we remove them
-		const childExecutionIds: string[] = [];
-
-		// Listen to data from the subprocess
-		subprocess.on('message', async (message: IProcessMessage) => {
-			Logger.debug(
-				`Received child process message of type ${message.type} for execution ID ${executionId}.`,
-				{ executionId },
-			);
-			if (message.type === 'start') {
-				// Now that the execution actually started set the timeout again so that does not time out to early.
-				startedAt = new Date();
-				if (workflowTimeout > 0) {
-					clearTimeout(executionTimeout);
-					executionTimeout = setTimeout(processTimeoutFunction, workflowTimeout, workflowTimeout);
-				}
-			} else if (message.type === 'end') {
-				clearTimeout(executionTimeout);
-				this.activeExecutions.remove(executionId, message.data.runData);
-			} else if (message.type === 'sendResponse') {
-				if (responsePromise) {
-					responsePromise.resolve(WebhookHelpers.decodeWebhookResponse(message.data.response));
-				}
-			} else if (message.type === 'sendMessageToUI') {
-				// eslint-disable-next-line @typescript-eslint/no-unsafe-call
-				WorkflowExecuteAdditionalData.sendMessageToUI.bind({ sessionId: data.sessionId })(
-					message.data.source,
-					message.data.message,
-				);
-			} else if (message.type === 'processError') {
-				clearTimeout(executionTimeout);
-				const executionError = message.data.executionError as ExecutionError;
-				await this.processError(
-					executionError,
-					startedAt,
-					data.executionMode,
-					executionId,
-					workflowHooks,
-				);
-			} else if (message.type === 'processHook') {
-				this.processHookMessage(workflowHooks, message.data as IProcessMessageDataHook);
-			} else if (message.type === 'timeout') {
-				// Execution timed out and its process has been terminated
-				const timeoutError = new WorkflowOperationError('Workflow execution timed out!');
-
-				// No need to add hook here as the subprocess takes care of calling the hooks
-				this.processError(timeoutError, startedAt, data.executionMode, executionId);
-			} else if (message.type === 'startExecution') {
-				const executionId = await this.activeExecutions.add(message.data.runData);
-				childExecutionIds.push(executionId);
-				subprocess.send({ type: 'executionId', data: { executionId } } as IProcessMessage);
-			} else if (message.type === 'finishExecution') {
-				const executionIdIndex = childExecutionIds.indexOf(message.data.executionId);
-				if (executionIdIndex !== -1) {
-					childExecutionIds.splice(executionIdIndex, 1);
-				}
-
-				if (message.data.result === undefined) {
-					const noDataError = new WorkflowOperationError('Workflow finished with no result data');
-					const subWorkflowHooks = WorkflowExecuteAdditionalData.getWorkflowHooksMain(
-						data,
-						message.data.executionId,
-					);
-					await this.processError(
-						noDataError,
-						startedAt,
-						data.executionMode,
-						message.data?.executionId,
-						subWorkflowHooks,
-					);
-				} else {
-					this.activeExecutions.remove(message.data.executionId, message.data.result);
-				}
-			}
-		});
-
-		// Also get informed when the processes does exit especially when it did crash or timed out
-		subprocess.on('exit', async (code, signal) => {
-			if (signal === 'SIGTERM') {
-				Logger.debug(`Subprocess for execution ID ${executionId} timed out.`, { executionId });
-				// Execution timed out and its process has been terminated
-				const timeoutError = new WorkflowOperationError('Workflow execution timed out!');
-
-				await this.processError(
-					timeoutError,
-					startedAt,
-					data.executionMode,
-					executionId,
-					workflowHooks,
-				);
-			} else if (code !== 0) {
-				Logger.debug(
-					`Subprocess for execution ID ${executionId} finished with error code ${code}.`,
-					{ executionId },
-				);
-				// Process did exit with error code, so something went wrong.
-				const executionError = new WorkflowOperationError(
-					'Workflow execution process crashed for an unknown reason!',
-				);
-
-				await this.processError(
-					executionError,
-					startedAt,
-					data.executionMode,
-					executionId,
-					workflowHooks,
-				);
-			}
-
-			for (const executionId of childExecutionIds) {
-				// When the child process exits, if we still have
-				// pending child executions, we mark them as finished
-				// They will display as unknown to the user
-				// Instead of pending forever as executing when it
-				// actually isn't anymore.
-				// eslint-disable-next-line @typescript-eslint/await-thenable, no-await-in-loop
-				this.activeExecutions.remove(executionId);
-			}
-
-			clearTimeout(executionTimeout);
-		});
-
-		return executionId;
 	}
 }
diff --git a/packages/cli/src/WorkflowRunnerProcess.ts b/packages/cli/src/WorkflowRunnerProcess.ts
deleted file mode 100644
index 80c846e1706d9..0000000000000
--- a/packages/cli/src/WorkflowRunnerProcess.ts
+++ /dev/null
@@ -1,538 +0,0 @@
-/* eslint-disable @typescript-eslint/no-unsafe-argument */
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* eslint-disable consistent-return */
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
-/* eslint-disable @typescript-eslint/no-shadow */
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
-/* eslint-disable @typescript-eslint/no-use-before-define */
-/* eslint-disable @typescript-eslint/unbound-method */
-import 'source-map-support/register';
-import 'reflect-metadata';
-import { Container } from 'typedi';
-import type { IProcessMessage } from 'n8n-core';
-import { BinaryDataManager, UserSettings, WorkflowExecute } from 'n8n-core';
-import express from 'express';
-
-import type {
-	ExecutionError,
-	IDataObject,
-	IExecuteResponsePromiseData,
-	IExecuteWorkflowInfo,
-	ILogger,
-	INode,
-	INodeExecutionData,
-	IRun,
-	ITaskData,
-	IWorkflowExecuteAdditionalData,
-	IWorkflowExecuteHooks,
-	IWorkflowSettings,
-	NodeOperationError,
-	WorkflowExecuteMode,
-} from 'n8n-workflow';
-import {
-	ErrorReporterProxy as ErrorReporter,
-	LoggerProxy,
-	Workflow,
-	WorkflowHooks,
-	WorkflowOperationError,
-} from 'n8n-workflow';
-import { CredentialTypes } from '@/CredentialTypes';
-import { CredentialsOverwrites } from '@/CredentialsOverwrites';
-import * as Db from '@/Db';
-import { ExternalHooks } from '@/ExternalHooks';
-import type {
-	IWorkflowExecuteProcess,
-	IWorkflowExecutionDataProcessWithExecution,
-} from '@/Interfaces';
-import { NodeTypes } from '@/NodeTypes';
-import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
-import * as WebhookHelpers from '@/WebhookHelpers';
-import * as WorkflowHelpers from '@/WorkflowHelpers';
-import * as WorkflowExecuteAdditionalData from '@/WorkflowExecuteAdditionalData';
-import { getLogger } from '@/Logger';
-
-import config from '@/config';
-import { generateFailedExecutionFromError } from '@/WorkflowHelpers';
-import { initErrorHandling } from '@/ErrorReporting';
-import { PermissionChecker } from '@/UserManagement/PermissionChecker';
-import { License } from '@/License';
-import { InternalHooks } from '@/InternalHooks';
-import { PostHogClient } from '@/posthog';
-import { logIncidentFromWorkflowExecute } from './lib/incidentLogger';
-
-class WorkflowRunnerProcess {
-	data: IWorkflowExecutionDataProcessWithExecution | undefined;
-
-	logger: ILogger;
-
-	startedAt = new Date();
-
-	workflow: Workflow | undefined;
-
-	workflowExecute: WorkflowExecute | undefined;
-
-	// eslint-disable-next-line @typescript-eslint/no-invalid-void-type
-	executionIdCallback: (executionId: string) => void | undefined;
-
-	childExecutions: {
-		[key: string]: IWorkflowExecuteProcess;
-	} = {};
-
-	// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
-	static async stopProcess() {
-		setTimeout(() => {
-			// Attempt a graceful shutdown, giving executions 30 seconds to finish
-			process.exit(0);
-		}, 30000);
-	}
-
-	async runWorkflow(inputData: IWorkflowExecutionDataProcessWithExecution): Promise<IRun> {
-		console.log('Running workflow...');
-
-		process.once('SIGTERM', WorkflowRunnerProcess.stopProcess);
-		process.once('SIGINT', WorkflowRunnerProcess.stopProcess);
-
-		await initErrorHandling();
-
-		// eslint-disable-next-line no-multi-assign
-		const logger = (this.logger = getLogger());
-		LoggerProxy.init(logger);
-
-		this.data = inputData;
-		const { userId } = inputData;
-
-		logger.verbose('Initializing n8n sub-process', {
-			pid: process.pid,
-			workflowId: this.data.workflowData.id,
-		});
-
-		this.startedAt = new Date();
-
-		const userSettings = await UserSettings.prepareUserSettings();
-
-		const loadNodesAndCredentials = Container.get(LoadNodesAndCredentials);
-		await loadNodesAndCredentials.init();
-
-		const nodeTypes = Container.get(NodeTypes);
-		const credentialTypes = Container.get(CredentialTypes);
-		CredentialsOverwrites(credentialTypes);
-
-		// Load all external hooks
-		const externalHooks = Container.get(ExternalHooks);
-		await externalHooks.init();
-
-		// Init db since we need to read the license.
-		await Db.init();
-
-		const instanceId = userSettings.instanceId ?? '';
-		await Container.get(PostHogClient).init(instanceId);
-		await Container.get(InternalHooks).init(instanceId);
-
-		const binaryDataConfig = config.getEnv('binaryDataManager');
-		await BinaryDataManager.init(binaryDataConfig);
-
-		const license = Container.get(License);
-		await license.init(instanceId);
-
-		const workflowSettings = this.data.workflowData.settings ?? {};
-
-		// Start timeout for the execution
-		let workflowTimeout = workflowSettings.executionTimeout ?? config.getEnv('executions.timeout'); // initialize with default
-		if (workflowTimeout > 0) {
-			workflowTimeout = Math.min(workflowTimeout, config.getEnv('executions.maxTimeout'));
-		}
-
-		this.workflow = new Workflow({
-			id: this.data.workflowData.id,
-			name: this.data.workflowData.name,
-			nodes: this.data.workflowData.nodes,
-			connections: this.data.workflowData.connections,
-			active: this.data.workflowData.active,
-			nodeTypes,
-			staticData: this.data.workflowData.staticData,
-			settings: this.data.workflowData.settings,
-			pinData: this.data.pinData,
-		});
-		try {
-			await PermissionChecker.check(this.workflow, userId);
-		} catch (error) {
-			const caughtError = error as NodeOperationError;
-			const failedExecutionData = generateFailedExecutionFromError(
-				this.data.executionMode,
-				caughtError,
-				caughtError.node,
-			);
-
-			// Force the `workflowExecuteAfter` hook to run since
-			// it's the one responsible for saving the execution
-			await this.sendHookToParentProcess('workflowExecuteAfter', [failedExecutionData]);
-			// Interrupt the workflow execution since we don't have all necessary creds.
-			return failedExecutionData;
-		}
-		const additionalData = await WorkflowExecuteAdditionalData.getBase(
-			userId,
-			undefined,
-			workflowTimeout <= 0 ? undefined : Date.now() + workflowTimeout * 1000,
-		);
-		additionalData.restartExecutionId = this.data.restartExecutionId;
-		additionalData.hooks = this.getProcessForwardHooks();
-
-		additionalData.hooks.hookFunctions.sendResponse = [
-			async (response: IExecuteResponsePromiseData): Promise<void> => {
-				await sendToParentProcess('sendResponse', {
-					response: WebhookHelpers.encodeWebhookResponse(response),
-				});
-			},
-		];
-
-		additionalData.executionId = inputData.executionId;
-
-		additionalData.setExecutionStatus = WorkflowExecuteAdditionalData.setExecutionStatus.bind({
-			executionId: inputData.executionId,
-		});
-		// eslint-disable-next-line @typescript-eslint/no-explicit-any
-		additionalData.sendMessageToUI = async (source: string, message: any) => {
-			if (workflowRunner.data!.executionMode !== 'manual') {
-				return;
-			}
-
-			try {
-				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-				await sendToParentProcess('sendMessageToUI', { source, message });
-			} catch (error) {
-				ErrorReporter.error(error);
-				this.logger.error(
-					// eslint-disable-next-line @typescript-eslint/restrict-template-expressions, @typescript-eslint/no-unsafe-member-access
-					`There was a problem sending UI data to parent process: "${error.message}"`,
-				);
-			}
-		};
-		const executeWorkflowFunction = additionalData.executeWorkflow;
-		additionalData.executeWorkflow = async (
-			workflowInfo: IExecuteWorkflowInfo,
-			additionalData: IWorkflowExecuteAdditionalData,
-			options?: {
-				parentWorkflowId?: string;
-				inputData?: INodeExecutionData[];
-				parentWorkflowSettings?: IWorkflowSettings;
-			},
-		): Promise<Array<INodeExecutionData[] | null> | IRun> => {
-			const workflowData = await WorkflowExecuteAdditionalData.getWorkflowData(
-				workflowInfo,
-				options?.parentWorkflowId,
-				options?.parentWorkflowSettings,
-			);
-			const runData = await WorkflowExecuteAdditionalData.getRunData(
-				workflowData,
-				additionalData.userId,
-				options?.inputData,
-				options?.parentWorkflowId,
-			);
-			await sendToParentProcess('startExecution', { runData });
-			const executionId: string = await new Promise((resolve) => {
-				this.executionIdCallback = (executionId: string) => {
-					resolve(executionId);
-				};
-			});
-
-			void Container.get(InternalHooks).onWorkflowBeforeExecute(executionId || '', runData);
-
-			let result: IRun;
-			try {
-				const executeWorkflowFunctionOutput = (await executeWorkflowFunction(
-					workflowInfo,
-					additionalData,
-					{
-						parentWorkflowId: options?.parentWorkflowId,
-						inputData: options?.inputData,
-						parentExecutionId: executionId,
-						loadedWorkflowData: workflowData,
-						loadedRunData: runData,
-						parentWorkflowSettings: options?.parentWorkflowSettings,
-					},
-				)) as { workflowExecute: WorkflowExecute; workflow: Workflow } as IWorkflowExecuteProcess;
-				const { workflowExecute } = executeWorkflowFunctionOutput;
-				this.childExecutions[executionId] = executeWorkflowFunctionOutput;
-				const { workflow } = executeWorkflowFunctionOutput;
-				result = await workflowExecute.processRunExecutionData(workflow);
-				console.log('processRunExecutionData in WorkflowRunnerProcess 1:', result.data.resultData);
-				await externalHooks.run('workflow.postExecute', [result, workflowData, executionId]);
-				void Container.get(InternalHooks).onWorkflowPostExecute(
-					executionId,
-					workflowData,
-					result,
-					additionalData.userId,
-				);
-				await sendToParentProcess('finishExecution', { executionId, result });
-				delete this.childExecutions[executionId];
-			} catch (e) {
-				await sendToParentProcess('finishExecution', { executionId });
-				delete this.childExecutions[executionId];
-				// Throw same error we had
-				throw e;
-			}
-
-			await sendToParentProcess('finishExecution', { executionId, result });
-
-			const returnData = WorkflowHelpers.getDataLastExecutedNodeData(result);
-
-			if (returnData!.error) {
-				const error = new Error(returnData!.error.message);
-				error.stack = returnData!.error.stack;
-				throw error;
-			}
-
-			return returnData!.data!.main;
-		};
-		console.log('Workflow Execution Data:', this.data.executionData);
-		if (this.data.executionData !== undefined) {
-			this.workflowExecute = new WorkflowExecute(
-				additionalData,
-				this.data.executionMode,
-				this.data.executionData,
-			);
-
-			const data = await this.workflowExecute.processRunExecutionData(this.workflow);
-			console.log('processRunExecutionData in WorkflowRunnerProcess 2:', data.data.resultData);
-			await logIncidentFromWorkflowExecute(data, this.workflow, true);
-
-			return data;
-		}
-		if (
-			this.data.runData === undefined ||
-			this.data.startNodes === undefined ||
-			this.data.startNodes.length === 0 ||
-			this.data.destinationNode === undefined
-		) {
-			// Execute all nodes
-
-			let startNode;
-			if (
-				this.data.startNodes?.length === 1 &&
-				Object.keys(this.data.pinData ?? {}).includes(this.data.startNodes[0])
-			) {
-				startNode = this.workflow.getNode(this.data.startNodes[0]) ?? undefined;
-			}
-
-			// Can execute without webhook so go on
-			this.workflowExecute = new WorkflowExecute(additionalData, this.data.executionMode);
-			return this.workflowExecute.run(
-				this.workflow,
-				startNode,
-				this.data.destinationNode,
-				this.data.pinData,
-			);
-		}
-		// Execute only the nodes between start and destination nodes
-		this.workflowExecute = new WorkflowExecute(additionalData, this.data.executionMode);
-		return this.workflowExecute.runPartialWorkflow(
-			this.workflow,
-			this.data.runData,
-			this.data.startNodes,
-			this.data.destinationNode,
-			this.data.pinData,
-		);
-	}
-
-	/**
-	 * Sends hook data to the parent process that it executes them
-	 *
-	 */
-	// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types, @typescript-eslint/no-explicit-any
-	async sendHookToParentProcess(hook: string, parameters: any[]) {
-		try {
-			await sendToParentProcess('processHook', {
-				hook,
-				parameters,
-			});
-		} catch (error) {
-			ErrorReporter.error(error);
-			this.logger.error(`There was a problem sending hook: "${hook}"`, { parameters, error });
-		}
-	}
-
-	/**
-	 * Create a wrapper for hooks which simply forwards the data to
-	 * the parent process where they then can be executed with access
-	 * to database and to PushService
-	 *
-	 */
-	getProcessForwardHooks(): WorkflowHooks {
-		const hookFunctions: IWorkflowExecuteHooks = {
-			nodeExecuteBefore: [
-				async (nodeName: string): Promise<void> => {
-					await this.sendHookToParentProcess('nodeExecuteBefore', [nodeName]);
-				},
-			],
-			nodeExecuteAfter: [
-				async (nodeName: string, data: ITaskData): Promise<void> => {
-					await this.sendHookToParentProcess('nodeExecuteAfter', [nodeName, data]);
-				},
-			],
-			workflowExecuteBefore: [
-				async (): Promise<void> => {
-					await this.sendHookToParentProcess('workflowExecuteBefore', []);
-				},
-			],
-			workflowExecuteAfter: [
-				async (fullRunData: IRun, newStaticData?: IDataObject): Promise<void> => {
-					await this.sendHookToParentProcess('workflowExecuteAfter', [fullRunData, newStaticData]);
-				},
-			],
-			nodeFetchedData: [
-				async (workflowId: string, node: INode) => {
-					await this.sendHookToParentProcess('nodeFetchedData', [workflowId, node]);
-				},
-			],
-		};
-
-		const preExecuteFunctions = WorkflowExecuteAdditionalData.hookFunctionsPreExecute();
-		// eslint-disable-next-line no-restricted-syntax
-		for (const key of Object.keys(preExecuteFunctions)) {
-			if (hookFunctions[key] === undefined) {
-				hookFunctions[key] = [];
-			}
-			hookFunctions[key]!.push.apply(hookFunctions[key], preExecuteFunctions[key]);
-		}
-
-		return new WorkflowHooks(
-			hookFunctions,
-			this.data!.executionMode,
-			this.data!.executionId,
-			this.data!.workflowData,
-			{ sessionId: this.data!.sessionId, retryOf: this.data!.retryOf as string },
-		);
-	}
-}
-
-/**
- * Sends data to parent process
- *
- * @param {string} type The type of data to send
- * @param {*} data The data
- */
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-async function sendToParentProcess(type: string, data: any): Promise<void> {
-	return new Promise((resolve, reject) => {
-		process.send!(
-			{
-				type,
-				data,
-			},
-			(error: Error) => {
-				if (error) {
-					return reject(error);
-				}
-
-				resolve();
-			},
-		);
-	});
-}
-
-const workflowRunner = new WorkflowRunnerProcess();
-
-// Listen to messages from parent process which send the data of
-// the workflow to process
-process.on('message', async (message: IProcessMessage) => {
-	try {
-		if (message.type === 'startWorkflow') {
-			await sendToParentProcess('start', {});
-
-			const runData = await workflowRunner.runWorkflow(message.data);
-
-			await sendToParentProcess('end', {
-				runData,
-			});
-
-			// Once the workflow got executed make sure the process gets killed again
-			process.exit();
-		} else if (message.type === 'stopExecution' || message.type === 'timeout') {
-			// The workflow execution should be stopped
-			let runData: IRun;
-
-			if (workflowRunner.workflowExecute !== undefined) {
-				const executionIds = Object.keys(workflowRunner.childExecutions);
-
-				// eslint-disable-next-line no-restricted-syntax
-				for (const executionId of executionIds) {
-					const childWorkflowExecute = workflowRunner.childExecutions[executionId];
-					runData = childWorkflowExecute.workflowExecute.getFullRunData(
-						workflowRunner.childExecutions[executionId].startedAt,
-					);
-					const timeOutError =
-						message.type === 'timeout'
-							? new WorkflowOperationError('Workflow execution timed out!')
-							: new WorkflowOperationError('Workflow-Execution has been canceled!');
-
-					// If there is any data send it to parent process, if execution timedout add the error
-					// eslint-disable-next-line no-await-in-loop
-					await childWorkflowExecute.workflowExecute.processSuccessExecution(
-						workflowRunner.childExecutions[executionId].startedAt,
-						childWorkflowExecute.workflow,
-						timeOutError,
-					);
-				}
-
-				// Workflow started already executing
-				runData = workflowRunner.workflowExecute.getFullRunData(workflowRunner.startedAt);
-
-				const timeOutError =
-					message.type === 'timeout'
-						? new WorkflowOperationError('Workflow execution timed out!')
-						: new WorkflowOperationError('Workflow-Execution has been canceled!');
-
-				// If there is any data send it to parent process, if execution timedout add the error
-				await workflowRunner.workflowExecute.processSuccessExecution(
-					workflowRunner.startedAt,
-					workflowRunner.workflow!,
-					timeOutError,
-				);
-			} else {
-				// Workflow did not get started yet
-				runData = {
-					data: {
-						resultData: {
-							runData: {},
-						},
-					},
-					finished: false,
-					mode: workflowRunner.data
-						? workflowRunner.data.executionMode
-						: ('own' as WorkflowExecuteMode),
-					startedAt: workflowRunner.startedAt,
-					stoppedAt: new Date(),
-					status: 'canceled',
-				};
-
-				// eslint-disable-next-line @typescript-eslint/no-floating-promises
-				workflowRunner.sendHookToParentProcess('workflowExecuteAfter', [runData]);
-			}
-
-			await sendToParentProcess(message.type === 'timeout' ? message.type : 'end', {
-				runData,
-			});
-
-			// Stop process
-			process.exit();
-		} else if (message.type === 'executionId') {
-			// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-			workflowRunner.executionIdCallback(message.data.executionId);
-		}
-	} catch (error) {
-		workflowRunner.logger.error(error.message);
-
-		// Catch all uncaught errors and forward them to parent process
-		const executionError = {
-			...error,
-			name: error.name || 'Error',
-			message: error.message,
-			stack: error.stack,
-		} as ExecutionError;
-
-		await sendToParentProcess('processError', {
-			executionError,
-		});
-		process.exit();
-	}
-});
diff --git a/packages/cli/src/api/e2e.api.ts b/packages/cli/src/api/e2e.api.ts
deleted file mode 100644
index 73adae880dbf9..0000000000000
--- a/packages/cli/src/api/e2e.api.ts
+++ /dev/null
@@ -1,146 +0,0 @@
-/* eslint-disable @typescript-eslint/no-unsafe-return */
-/* eslint-disable @typescript-eslint/no-unsafe-call */
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* eslint-disable @typescript-eslint/no-unsafe-argument */
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
-/* eslint-disable @typescript-eslint/naming-convention */
-import { Router } from 'express';
-import type { Request } from 'express';
-import bodyParser from 'body-parser';
-import { v4 as uuid } from 'uuid';
-import { Container } from 'typedi';
-import config from '@/config';
-import * as Db from '@/Db';
-import type { Role } from '@db/entities/Role';
-import { RoleRepository } from '@db/repositories';
-import { hashPassword } from '@/UserManagement/UserManagementHelper';
-import { eventBus } from '@/eventbus/MessageEventBus/MessageEventBus';
-import { License } from '../License';
-import { LICENSE_FEATURES } from '@/constants';
-
-if (process.env.E2E_TESTS !== 'true') {
-	console.error('E2E endpoints only allowed during E2E tests');
-	process.exit(1);
-}
-
-const enabledFeatures = {
-	[LICENSE_FEATURES.SHARING]: true, //default to true here instead of setting it in config/index.ts for e2e
-	[LICENSE_FEATURES.LDAP]: false,
-	[LICENSE_FEATURES.SAML]: false,
-	[LICENSE_FEATURES.LOG_STREAMING]: false,
-	[LICENSE_FEATURES.ADVANCED_EXECUTION_FILTERS]: false,
-	[LICENSE_FEATURES.VERSION_CONTROL]: false,
-};
-
-type Feature = keyof typeof enabledFeatures;
-
-Container.get(License).isFeatureEnabled = (feature: Feature) => enabledFeatures[feature] ?? false;
-
-const tablesToTruncate = [
-	'auth_identity',
-	'auth_provider_sync_history',
-	'event_destinations',
-	'shared_workflow',
-	'shared_credentials',
-	'webhook_entity',
-	'workflows_tags',
-	'credentials_entity',
-	'tag_entity',
-	'workflow_statistics',
-	'workflow_entity',
-	'execution_entity',
-	'settings',
-	'installed_packages',
-	'installed_nodes',
-	'user',
-	'role',
-];
-
-const truncateAll = async () => {
-	const connection = Db.getConnection();
-	for (const table of tablesToTruncate) {
-		await connection.query(
-			`DELETE FROM ${table}; DELETE FROM sqlite_sequence WHERE name=${table};`,
-		);
-	}
-};
-
-const setupUserManagement = async () => {
-	const connection = Db.getConnection();
-	await connection.query('INSERT INTO role (name, scope) VALUES ("owner", "global");');
-	const instanceOwnerRole = (await connection.query(
-		'SELECT last_insert_rowid() as insertId',
-	)) as Array<{ insertId: number }>;
-
-	const roles: Array<[Role['name'], Role['scope']]> = [
-		['member', 'global'],
-		['owner', 'workflow'],
-		['owner', 'credential'],
-		['user', 'credential'],
-		['editor', 'workflow'],
-	];
-
-	await Promise.all(
-		roles.map(async ([name, scope]) =>
-			connection.query(`INSERT INTO role (name, scope) VALUES ("${name}", "${scope}");`),
-		),
-	);
-	await connection.query(
-		`INSERT INTO user (id, globalRoleId) values ("${uuid()}", ${instanceOwnerRole[0].insertId})`,
-	);
-	await connection.query(
-		"INSERT INTO \"settings\" (key, value, loadOnStartup) values ('userManagement.isInstanceOwnerSetUp', 'false', true), ('userManagement.skipInstanceOwnerSetup', 'false', true)",
-	);
-
-	config.set('userManagement.isInstanceOwnerSetUp', false);
-};
-
-const resetLogStreaming = async () => {
-	enabledFeatures[LICENSE_FEATURES.LOG_STREAMING] = false;
-	for (const id in eventBus.destinations) {
-		await eventBus.removeDestination(id);
-	}
-};
-
-export const e2eController = Router();
-
-e2eController.post('/db/reset', async (req, res) => {
-	await resetLogStreaming();
-	await truncateAll();
-	await setupUserManagement();
-
-	res.writeHead(204).end();
-});
-
-e2eController.post('/db/setup-owner', bodyParser.json(), async (req, res) => {
-	if (config.get('userManagement.isInstanceOwnerSetUp')) {
-		res.writeHead(500).send({ error: 'Owner already setup' });
-		return;
-	}
-
-	const globalRole = await Container.get(RoleRepository).findGlobalOwnerRoleOrFail();
-
-	const owner = await Db.collections.User.findOneByOrFail({ globalRoleId: globalRole.id });
-
-	await Db.collections.User.update(owner.id, {
-		email: req.body.email,
-		password: await hashPassword(req.body.password),
-		firstName: req.body.firstName,
-		lastName: req.body.lastName,
-	});
-
-	await Db.collections.Settings.update(
-		{ key: 'userManagement.isInstanceOwnerSetUp' },
-		{ value: 'true' },
-	);
-
-	config.set('userManagement.isInstanceOwnerSetUp', true);
-
-	res.writeHead(204).end();
-});
-
-e2eController.post('/enable-feature/:feature', async (req: Request<{ feature: Feature }>, res) => {
-	const { feature } = req.params;
-	enabledFeatures[feature] = true;
-	res.writeHead(204).end();
-});
diff --git a/packages/cli/src/api/workflowStats.api.ts b/packages/cli/src/api/workflowStats.api.ts
deleted file mode 100644
index 887bc291857c1..0000000000000
--- a/packages/cli/src/api/workflowStats.api.ts
+++ /dev/null
@@ -1,194 +0,0 @@
-import type { User } from '@db/entities/User';
-import { whereClause } from '@/UserManagement/UserManagementHelper';
-import express from 'express';
-import { LoggerProxy } from 'n8n-workflow';
-import * as Db from '@/Db';
-import * as ResponseHelper from '@/ResponseHelper';
-import type {
-	IWorkflowStatisticsCounts,
-	IWorkflowStatisticsDataLoaded,
-	IWorkflowStatisticsTimestamps,
-} from '@/Interfaces';
-import { StatisticsNames } from '@db/entities/WorkflowStatistics';
-import { getLogger } from '../Logger';
-import type { ExecutionRequest } from '../requests';
-
-export const workflowStatsController = express.Router();
-
-// Helper function that validates the ID, return a flag stating whether the request is allowed
-async function checkWorkflowId(workflowId: string, user: User): Promise<boolean> {
-	// Check permissions
-	const shared =
-		process.env.ONLY_OWNER_OR_ADMIN_CAN_ACCESS_WORKFLOW === 'true'
-			? await Db.collections.SharedWorkflow.findOne({
-					relations: ['workflow'],
-					where: whereClause({
-						user,
-						entityType: 'workflow',
-						entityId: workflowId,
-					}),
-			  })
-			: await Db.collections.SharedWorkflow.findOne({
-					relations: ['workflow'],
-					where: { ['workflow']: { id: workflowId } },
-			  });
-
-	if (!shared) {
-		// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
-		LoggerProxy.verbose('User attempted to read a workflow without permissions', {
-			workflowId,
-			userId: user.id,
-		});
-		return false;
-	}
-	return true;
-}
-
-/**
- * Initialize Logger if needed
- */
-workflowStatsController.use((req, res, next) => {
-	try {
-		LoggerProxy.getInstance();
-	} catch (error) {
-		LoggerProxy.init(getLogger());
-	}
-
-	next();
-});
-
-/**
- * Check that the workflow ID is valid and allowed to be read by the user
- */
-workflowStatsController.use(async (req: ExecutionRequest.Get, res, next) => {
-	const allowed = await checkWorkflowId(req.params.id, req.user);
-	if (allowed) {
-		next();
-	} else {
-		// Otherwise, make and return an error
-		const response = new ResponseHelper.NotFoundError(`Workflow ${req.params.id} does not exist.`);
-		next(response);
-	}
-});
-
-/**
- * GET /workflow-stats/:id/counts/
- */
-workflowStatsController.get(
-	'/:id/counts/',
-	ResponseHelper.send(async (req: ExecutionRequest.Get): Promise<IWorkflowStatisticsCounts> => {
-		// Get counts from DB
-		const workflowId = req.params.id;
-
-		// Find the stats for this workflow
-		const stats = await Db.collections.WorkflowStatistics.find({
-			select: ['count', 'name'],
-			where: {
-				workflowId,
-			},
-		});
-
-		const data: IWorkflowStatisticsCounts = {
-			productionSuccess: 0,
-			productionError: 0,
-			manualSuccess: 0,
-			manualError: 0,
-		};
-
-		// There will be a maximum of 4 stats (currently)
-		stats.forEach(({ count, name }) => {
-			switch (name) {
-				case StatisticsNames.manualError:
-					data.manualError = count;
-					break;
-
-				case StatisticsNames.manualSuccess:
-					data.manualSuccess = count;
-					break;
-
-				case StatisticsNames.productionError:
-					data.productionError = count;
-					break;
-
-				case StatisticsNames.productionSuccess:
-					data.productionSuccess = count;
-			}
-		});
-
-		return data;
-	}),
-);
-
-/**
- * GET /workflow-stats/:id/times/
- */
-workflowStatsController.get(
-	'/:id/times/',
-	ResponseHelper.send(async (req: ExecutionRequest.Get): Promise<IWorkflowStatisticsTimestamps> => {
-		// Get times from DB
-		const workflowId = req.params.id;
-
-		// Find the stats for this workflow
-		const stats = await Db.collections.WorkflowStatistics.find({
-			select: ['latestEvent', 'name'],
-			where: {
-				workflowId,
-			},
-		});
-
-		const data: IWorkflowStatisticsTimestamps = {
-			productionSuccess: null,
-			productionError: null,
-			manualSuccess: null,
-			manualError: null,
-		};
-
-		// There will be a maximum of 4 stats (currently)
-		stats.forEach(({ latestEvent, name }) => {
-			switch (name) {
-				case StatisticsNames.manualError:
-					data.manualError = latestEvent;
-					break;
-
-				case StatisticsNames.manualSuccess:
-					data.manualSuccess = latestEvent;
-					break;
-
-				case StatisticsNames.productionError:
-					data.productionError = latestEvent;
-					break;
-
-				case StatisticsNames.productionSuccess:
-					data.productionSuccess = latestEvent;
-			}
-		});
-
-		return data;
-	}),
-);
-
-/**
- * GET /workflow-stats/:id/data-loaded/
- */
-workflowStatsController.get(
-	'/:id/data-loaded/',
-	ResponseHelper.send(async (req: ExecutionRequest.Get): Promise<IWorkflowStatisticsDataLoaded> => {
-		// Get flag
-		const workflowId = req.params.id;
-
-		// Get the flag
-		const stats = await Db.collections.WorkflowStatistics.findOne({
-			select: ['latestEvent'],
-			where: {
-				workflowId,
-				name: StatisticsNames.dataLoaded,
-			},
-		});
-
-		const data: IWorkflowStatisticsDataLoaded = {
-			dataLoaded: stats ? true : false,
-		};
-
-		return data;
-	}),
-);
diff --git a/packages/cli/src/audit/constants.ts b/packages/cli/src/audit/constants.ts
deleted file mode 100644
index dae6fd44c59de..0000000000000
--- a/packages/cli/src/audit/constants.ts
+++ /dev/null
@@ -1,121 +0,0 @@
-import type { Risk } from '@/audit/types';
-
-/**
- * Risk categories
- */
-
-export const RISK_CATEGORIES: Risk.Category[] = [
-	'credentials',
-	'database',
-	'nodes',
-	'instance',
-	'filesystem',
-];
-
-/**
- * Node types
- */
-
-export const SQL_NODE_TYPES_WITH_QUERY_PARAMS = new Set([
-	'n8n-nodes-base.postgres',
-	'n8n-nodes-base.crateDb',
-	'n8n-nodes-base.questDb',
-	'n8n-nodes-base.timescaleDb',
-]);
-
-export const SQL_NODE_TYPES = new Set([
-	...SQL_NODE_TYPES_WITH_QUERY_PARAMS,
-	'n8n-nodes-base.mySql',
-	'n8n-nodes-base.microsoftSql',
-	'n8n-nodes-base.snowflake',
-]);
-
-export const WEBHOOK_NODE_TYPE = 'n8n-nodes-base.webhook';
-
-export const WEBHOOK_VALIDATOR_NODE_TYPES = new Set([
-	'n8n-nodes-base.if',
-	'n8n-nodes-base.switch',
-	'n8n-nodes-base.code',
-	'n8n-nodes-base.function',
-	'n8n-nodes-base.functionItem',
-]);
-
-export const FILESYSTEM_INTERACTION_NODE_TYPES = new Set([
-	'n8n-nodes-base.readPdf',
-	'n8n-nodes-base.readBinaryFile',
-	'n8n-nodes-base.readBinaryFiles',
-	'n8n-nodes-base.spreadsheetFile',
-	'n8n-nodes-base.writeBinaryFile',
-]);
-
-export const OFFICIAL_RISKY_NODE_TYPES = new Set([
-	'n8n-nodes-base.executeCommand',
-	'n8n-nodes-base.code',
-	'n8n-nodes-base.function',
-	'n8n-nodes-base.functionItem',
-	'n8n-nodes-base.httpRequest',
-	'n8n-nodes-base.ssh',
-	'n8n-nodes-base.ftp',
-]);
-
-/**
- * Risk reports
- */
-
-export const DATABASE_REPORT = {
-	RISK: 'database',
-	SECTIONS: {
-		EXPRESSIONS_IN_QUERIES: 'Expressions in "Execute Query" fields in SQL nodes',
-		EXPRESSIONS_IN_QUERY_PARAMS: 'Expressions in "Query Parameters" fields in SQL nodes',
-		UNUSED_QUERY_PARAMS: 'Unused "Query Parameters" fields in SQL nodes',
-	},
-} as const;
-
-export const CREDENTIALS_REPORT = {
-	RISK: 'credentials',
-	SECTIONS: {
-		CREDS_NOT_IN_ANY_USE: 'Credentials not used in any workflow',
-		CREDS_NOT_IN_ACTIVE_USE: 'Credentials not used in any active workflow',
-		CREDS_NOT_RECENTLY_EXECUTED: 'Credentials not used in recently executed workflows',
-	},
-} as const;
-
-export const FILESYSTEM_REPORT = {
-	RISK: 'filesystem',
-	SECTIONS: {
-		FILESYSTEM_INTERACTION_NODES: 'Nodes that interact with the filesystem',
-	},
-} as const;
-
-export const NODES_REPORT = {
-	RISK: 'nodes',
-	SECTIONS: {
-		OFFICIAL_RISKY_NODES: 'Official risky nodes',
-		COMMUNITY_NODES: 'Community nodes',
-		CUSTOM_NODES: 'Custom nodes',
-	},
-} as const;
-
-export const INSTANCE_REPORT = {
-	RISK: 'instance',
-	SECTIONS: {
-		UNPROTECTED_WEBHOOKS: 'Unprotected webhooks in instance',
-		OUTDATED_INSTANCE: 'Outdated instance',
-		SECURITY_SETTINGS: 'Security settings',
-	},
-} as const;
-
-/**
- * URLs
- */
-
-export const ENV_VARS_DOCS_URL = 'https://docs.n8n.io/reference/environment-variables.html';
-
-export const DB_QUERY_PARAMS_DOCS_URL =
-	'https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.postgres#use-query-parameters';
-
-export const COMMUNITY_NODES_RISKS_URL = 'https://docs.n8n.io/integrations/community-nodes/risks';
-
-export const SELF_HOSTED_AUTH_DOCS_URL = 'https://docs.n8n.io/hosting/authentication';
-
-export const NPM_PACKAGE_URL = 'https://www.npmjs.com/package';
diff --git a/packages/cli/src/audit/index.ts b/packages/cli/src/audit/index.ts
deleted file mode 100644
index a8c3e79e1855c..0000000000000
--- a/packages/cli/src/audit/index.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-import * as Db from '@/Db';
-import { separate } from '@/utils';
-import config from '@/config';
-import { RISK_CATEGORIES } from '@/audit/constants';
-import { toReportTitle } from '@/audit/utils';
-import { reportCredentialsRisk } from '@/audit/risks/credentials.risk';
-import { reportDatabaseRisk } from '@/audit/risks/database.risk';
-import { reportNodesRisk } from '@/audit/risks/nodes.risk';
-import { reportFilesystemRisk } from '@/audit/risks/filesystem.risk';
-import { reportInstanceRisk } from '@/audit/risks/instance.risk';
-import type { Risk } from '@/audit/types';
-
-export const SYNC_MAP: Record<string, Risk.SyncReportFn> = {
-	database: reportDatabaseRisk,
-	filesystem: reportFilesystemRisk,
-};
-
-export const ASYNC_MAP: Record<string, Risk.AsyncReportFn> = {
-	credentials: reportCredentialsRisk,
-	nodes: reportNodesRisk,
-	instance: reportInstanceRisk,
-};
-
-export const isAsync = (c: Risk.Category) => Object.keys(ASYNC_MAP).includes(c);
-
-export async function audit(
-	categories: Risk.Category[] = RISK_CATEGORIES,
-	daysAbandonedWorkflow?: number,
-) {
-	if (categories.length === 0) categories = RISK_CATEGORIES;
-
-	const daysFromEnv = config.getEnv('security.audit.daysAbandonedWorkflow');
-
-	if (daysAbandonedWorkflow) {
-		config.set('security.audit.daysAbandonedWorkflow', daysAbandonedWorkflow);
-	}
-
-	const workflows = await Db.collections.Workflow.find({
-		select: ['id', 'name', 'active', 'nodes', 'connections'],
-	});
-
-	const [asyncCategories, syncCategories] = separate(categories, isAsync);
-
-	const reports: Risk.Report[] = [];
-
-	if (asyncCategories.length > 0) {
-		const promises = asyncCategories.map(async (c) => ASYNC_MAP[c](workflows));
-		const asyncReports = await Promise.all(promises);
-		asyncReports.forEach((r) => r !== null && reports.push(r));
-	}
-
-	if (syncCategories.length > 0) {
-		const syncReports = syncCategories.map((c) => SYNC_MAP[c](workflows));
-		syncReports.forEach((r) => r !== null && reports.push(r));
-	}
-
-	if (daysAbandonedWorkflow) {
-		config.set('security.audit.daysAbandonedWorkflow', daysFromEnv); // restore env
-	}
-
-	if (reports.length === 0) return []; // trigger empty state
-
-	return reports.reduce<Risk.Audit>((acc, cur) => {
-		acc[toReportTitle(cur.risk)] = cur;
-
-		return acc;
-	}, {});
-}
diff --git a/packages/cli/src/audit/risks/credentials.risk.ts b/packages/cli/src/audit/risks/credentials.risk.ts
deleted file mode 100644
index 804e642a4f566..0000000000000
--- a/packages/cli/src/audit/risks/credentials.risk.ts
+++ /dev/null
@@ -1,134 +0,0 @@
-import type { FindOperator } from 'typeorm';
-import { MoreThanOrEqual } from 'typeorm';
-import { DateUtils } from 'typeorm/util/DateUtils';
-import * as Db from '@/Db';
-import config from '@/config';
-import { CREDENTIALS_REPORT } from '@/audit/constants';
-import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
-import type { Risk } from '@/audit/types';
-
-async function getAllCredsInUse(workflows: WorkflowEntity[]) {
-	const credsInAnyUse = new Set<string>();
-	const credsInActiveUse = new Set<string>();
-
-	workflows.forEach((workflow) => {
-		workflow.nodes.forEach((node) => {
-			if (!node.credentials) return;
-
-			Object.values(node.credentials).forEach((cred) => {
-				if (!cred?.id) return;
-
-				credsInAnyUse.add(cred.id);
-
-				if (workflow.active) credsInActiveUse.add(cred.id);
-			});
-		});
-	});
-
-	return {
-		credsInAnyUse,
-		credsInActiveUse,
-	};
-}
-
-async function getAllExistingCreds() {
-	const credentials = await Db.collections.Credentials.find({ select: ['id', 'name'] });
-
-	return credentials.map(({ id, name }) => ({ kind: 'credential' as const, id, name }));
-}
-
-async function getExecutionsInPastDays(days: number) {
-	const date = new Date();
-
-	date.setDate(date.getDate() - days);
-
-	const utcDate = DateUtils.mixedDateToUtcDatetimeString(date) as string;
-
-	return Db.collections.Execution.find({
-		select: ['workflowData'],
-		where: {
-			startedAt: MoreThanOrEqual(utcDate) as unknown as FindOperator<Date>,
-		},
-	});
-}
-
-/**
- * Return IDs of credentials in workflows executed in the past n days.
- */
-async function getCredsInRecentlyExecutedWorkflows(days: number) {
-	const recentExecutions = await getExecutionsInPastDays(days);
-
-	return recentExecutions.reduce<Set<string>>((acc, execution) => {
-		execution.workflowData?.nodes.forEach((node) => {
-			if (node.credentials) {
-				Object.values(node.credentials).forEach((c) => {
-					if (c.id) acc.add(c.id);
-				});
-			}
-		});
-
-		return acc;
-	}, new Set());
-}
-
-export async function reportCredentialsRisk(workflows: WorkflowEntity[]) {
-	const days = config.getEnv('security.audit.daysAbandonedWorkflow');
-
-	const allExistingCreds = await getAllExistingCreds();
-	const { credsInAnyUse, credsInActiveUse } = await getAllCredsInUse(workflows);
-	const recentlyExecutedCreds = await getCredsInRecentlyExecutedWorkflows(days);
-
-	const credsNotInAnyUse = allExistingCreds.filter((c) => !credsInAnyUse.has(c.id));
-	const credsNotInActiveUse = allExistingCreds.filter((c) => !credsInActiveUse.has(c.id));
-	const credsNotRecentlyExecuted = allExistingCreds.filter((c) => !recentlyExecutedCreds.has(c.id));
-
-	const issues = [credsNotInAnyUse, credsNotInActiveUse, credsNotRecentlyExecuted];
-
-	if (issues.every((i) => i.length === 0)) return null;
-
-	const report: Risk.StandardReport = {
-		risk: CREDENTIALS_REPORT.RISK,
-		sections: [],
-	};
-
-	const hint = 'Keeping unused credentials in your instance is an unneeded security risk.';
-	const recommendation = 'Consider deleting these credentials if you no longer need them.';
-
-	const sentenceStart = ({ length }: { length: number }) =>
-		length > 1 ? 'These credentials are' : 'This credential is';
-
-	if (credsNotInAnyUse.length > 0) {
-		report.sections.push({
-			title: CREDENTIALS_REPORT.SECTIONS.CREDS_NOT_IN_ANY_USE,
-			description: [sentenceStart(credsNotInAnyUse), 'not used in any workflow.', hint].join(' '),
-			recommendation,
-			location: credsNotInAnyUse,
-		});
-	}
-
-	if (credsNotInActiveUse.length > 0) {
-		report.sections.push({
-			title: CREDENTIALS_REPORT.SECTIONS.CREDS_NOT_IN_ACTIVE_USE,
-			description: [sentenceStart(credsNotInActiveUse), 'not used in active workflows.', hint].join(
-				' ',
-			),
-			recommendation,
-			location: credsNotInActiveUse,
-		});
-	}
-
-	if (credsNotRecentlyExecuted.length > 0) {
-		report.sections.push({
-			title: CREDENTIALS_REPORT.SECTIONS.CREDS_NOT_RECENTLY_EXECUTED,
-			description: [
-				sentenceStart(credsNotRecentlyExecuted),
-				`not used in recently executed workflows, i.e. workflows executed in the past ${days} days.`,
-				hint,
-			].join(' '),
-			recommendation,
-			location: credsNotRecentlyExecuted,
-		});
-	}
-
-	return report;
-}
diff --git a/packages/cli/src/audit/risks/database.risk.ts b/packages/cli/src/audit/risks/database.risk.ts
deleted file mode 100644
index c0f62438c38d7..0000000000000
--- a/packages/cli/src/audit/risks/database.risk.ts
+++ /dev/null
@@ -1,106 +0,0 @@
-import { toFlaggedNode } from '@/audit/utils';
-import {
-	SQL_NODE_TYPES,
-	DATABASE_REPORT,
-	DB_QUERY_PARAMS_DOCS_URL,
-	SQL_NODE_TYPES_WITH_QUERY_PARAMS,
-} from '@/audit/constants';
-import type { WorkflowEntity as Workflow } from '@db/entities/WorkflowEntity';
-import type { Risk } from '@/audit/types';
-
-function getIssues(workflows: Workflow[]) {
-	return workflows.reduce<{ [sectionTitle: string]: Risk.NodeLocation[] }>(
-		(acc, workflow) => {
-			workflow.nodes.forEach((node) => {
-				if (!SQL_NODE_TYPES.has(node.type)) return;
-				if (node.parameters === undefined) return;
-				if (node.parameters.operation !== 'executeQuery') return;
-
-				if (typeof node.parameters.query === 'string' && node.parameters.query.startsWith('=')) {
-					acc.expressionsInQueries.push(toFlaggedNode({ node, workflow }));
-				}
-
-				if (!SQL_NODE_TYPES_WITH_QUERY_PARAMS.has(node.type)) return;
-
-				if (!node.parameters.additionalFields) {
-					acc.unusedQueryParams.push(toFlaggedNode({ node, workflow }));
-				}
-
-				if (typeof node.parameters.additionalFields !== 'object') return;
-				if (node.parameters.additionalFields === null) return;
-
-				if (!('queryParams' in node.parameters.additionalFields)) {
-					acc.unusedQueryParams.push(toFlaggedNode({ node, workflow }));
-				}
-
-				if (
-					'queryParams' in node.parameters.additionalFields &&
-					typeof node.parameters.additionalFields.queryParams === 'string' &&
-					node.parameters.additionalFields.queryParams.startsWith('=')
-				) {
-					acc.expressionsInQueryParams.push(toFlaggedNode({ node, workflow }));
-				}
-			});
-
-			return acc;
-		},
-		{ expressionsInQueries: [], expressionsInQueryParams: [], unusedQueryParams: [] },
-	);
-}
-
-export function reportDatabaseRisk(workflows: Workflow[]) {
-	const { expressionsInQueries, expressionsInQueryParams, unusedQueryParams } =
-		getIssues(workflows);
-
-	const issues = [expressionsInQueries, expressionsInQueryParams, unusedQueryParams];
-
-	if (issues.every((i) => i.length === 0)) return null;
-
-	const report: Risk.StandardReport = {
-		risk: DATABASE_REPORT.RISK,
-		sections: [],
-	};
-
-	const sentenceStart = ({ length }: { length: number }) =>
-		length > 1 ? 'These SQL nodes have' : 'This SQL node has';
-
-	if (expressionsInQueries.length > 0) {
-		report.sections.push({
-			title: DATABASE_REPORT.SECTIONS.EXPRESSIONS_IN_QUERIES,
-			description: [
-				sentenceStart(expressionsInQueries),
-				'an expression in the "Query" field of an "Execute Query" operation. Building a SQL query with an expression may lead to a SQL injection attack.',
-			].join(' '),
-			recommendation:
-				'Consider using the "Query Parameters" field to pass parameters to the query, or validating the input of the expression in the "Query" field.',
-			location: expressionsInQueries,
-		});
-	}
-
-	if (expressionsInQueryParams.length > 0) {
-		report.sections.push({
-			title: DATABASE_REPORT.SECTIONS.EXPRESSIONS_IN_QUERY_PARAMS,
-			description: [
-				sentenceStart(expressionsInQueryParams),
-				'an expression in the "Query Parameters" field of an "Execute Query" operation. Building a SQL query with an expression may lead to a SQL injection attack.',
-			].join(' '),
-			recommendation:
-				'Consider validating the input of the expression in the "Query Parameters" field.',
-			location: expressionsInQueryParams,
-		});
-	}
-
-	if (unusedQueryParams.length > 0) {
-		report.sections.push({
-			title: DATABASE_REPORT.SECTIONS.UNUSED_QUERY_PARAMS,
-			description: [
-				sentenceStart(unusedQueryParams),
-				'no "Query Parameters" field in the "Execute Query" operation. Building a SQL query with unsanitized data may lead to a SQL injection attack.',
-			].join(' '),
-			recommendation: `Consider using the "Query Parameters" field to sanitize parameters passed to the query. See: ${DB_QUERY_PARAMS_DOCS_URL}`,
-			location: unusedQueryParams,
-		});
-	}
-
-	return report;
-}
diff --git a/packages/cli/src/audit/risks/filesystem.risk.ts b/packages/cli/src/audit/risks/filesystem.risk.ts
deleted file mode 100644
index 6e1033d5a6287..0000000000000
--- a/packages/cli/src/audit/risks/filesystem.risk.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { getNodeTypes } from '@/audit/utils';
-import { FILESYSTEM_INTERACTION_NODE_TYPES, FILESYSTEM_REPORT } from '@/audit/constants';
-import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
-import type { Risk } from '@/audit/types';
-
-export function reportFilesystemRisk(workflows: WorkflowEntity[]) {
-	const fsInteractionNodeTypes = getNodeTypes(workflows, (node) =>
-		FILESYSTEM_INTERACTION_NODE_TYPES.has(node.type),
-	);
-
-	if (fsInteractionNodeTypes.length === 0) return null;
-
-	const report: Risk.StandardReport = {
-		risk: FILESYSTEM_REPORT.RISK,
-		sections: [],
-	};
-
-	const sentenceStart = ({ length }: { length: number }) =>
-		length > 1 ? 'These nodes read from and write to' : 'This node reads from and writes to';
-
-	if (fsInteractionNodeTypes.length > 0) {
-		report.sections.push({
-			title: FILESYSTEM_REPORT.SECTIONS.FILESYSTEM_INTERACTION_NODES,
-			description: [
-				sentenceStart(fsInteractionNodeTypes),
-				'any accessible file in the host filesystem. Sensitive file content may be manipulated through a node operation.',
-			].join(' '),
-			recommendation:
-				'Consider protecting any sensitive files in the host filesystem, or refactoring the workflow so that it does not require host filesystem interaction.',
-			location: fsInteractionNodeTypes,
-		});
-	}
-
-	return report;
-}
diff --git a/packages/cli/src/audit/risks/instance.risk.ts b/packages/cli/src/audit/risks/instance.risk.ts
deleted file mode 100644
index 0bd0c18fb30e8..0000000000000
--- a/packages/cli/src/audit/risks/instance.risk.ts
+++ /dev/null
@@ -1,220 +0,0 @@
-import axios from 'axios';
-import { UserSettings } from 'n8n-core';
-import config from '@/config';
-import { toFlaggedNode } from '@/audit/utils';
-import { separate } from '@/utils';
-import {
-	SELF_HOSTED_AUTH_DOCS_URL,
-	ENV_VARS_DOCS_URL,
-	INSTANCE_REPORT,
-	WEBHOOK_NODE_TYPE,
-	WEBHOOK_VALIDATOR_NODE_TYPES,
-} from '@/audit/constants';
-import { getN8nPackageJson, inDevelopment } from '@/constants';
-import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
-import type { Risk, n8n } from '@/audit/types';
-
-function getSecuritySettings() {
-	if (config.getEnv('deployment.type') === 'cloud') return null;
-
-	const userManagementEnabled = !config.getEnv('userManagement.disabled');
-	const basicAuthActive = config.getEnv('security.basicAuth.active');
-	const jwtAuthActive = config.getEnv('security.jwtAuth.active');
-
-	const isInstancePubliclyAccessible = !userManagementEnabled && !basicAuthActive && !jwtAuthActive;
-
-	const settings: Record<string, unknown> = {};
-
-	if (isInstancePubliclyAccessible) {
-		settings.publiclyAccessibleInstance =
-			'Important! Your n8n instance is publicly accessible. Any third party who knows your instance URL can access your data.'.toUpperCase();
-	}
-
-	settings.features = {
-		communityPackagesEnabled: config.getEnv('nodes.communityPackages.enabled'),
-		versionNotificationsEnabled: config.getEnv('versionNotifications.enabled'),
-		templatesEnabled: config.getEnv('templates.enabled'),
-		publicApiEnabled: !config.getEnv('publicApi.disabled'),
-		userManagementEnabled,
-	};
-
-	settings.auth = {
-		authExcludeEndpoints: config.getEnv('security.excludeEndpoints') || 'none',
-		basicAuthActive,
-		jwtAuthActive,
-	};
-
-	settings.nodes = {
-		nodesExclude: config.getEnv('nodes.exclude') ?? 'none',
-		nodesInclude: config.getEnv('nodes.include') ?? 'none',
-	};
-
-	settings.telemetry = {
-		diagnosticsEnabled: config.getEnv('diagnostics.enabled'),
-	};
-
-	return settings;
-}
-
-/**
- * Whether a webhook node has a direct child assumed to validate its payload.
- */
-function hasValidatorChild({
-	node,
-	workflow,
-}: {
-	node: WorkflowEntity['nodes'][number];
-	workflow: WorkflowEntity;
-}) {
-	const childNodeNames = workflow.connections[node.name]?.main[0].map((i) => i.node);
-
-	if (!childNodeNames) return false;
-
-	return childNodeNames.some((name) =>
-		workflow.nodes.find((n) => n.name === name && WEBHOOK_VALIDATOR_NODE_TYPES.has(n.type)),
-	);
-}
-
-function getUnprotectedWebhookNodes(workflows: WorkflowEntity[]) {
-	return workflows.reduce<Risk.NodeLocation[]>((acc, workflow) => {
-		if (!workflow.active) return acc;
-
-		workflow.nodes.forEach((node) => {
-			if (
-				node.type === WEBHOOK_NODE_TYPE &&
-				node.parameters.authentication === undefined &&
-				!hasValidatorChild({ node, workflow })
-			) {
-				acc.push(toFlaggedNode({ node, workflow }));
-			}
-		});
-
-		return acc;
-	}, []);
-}
-
-async function getNextVersions(currentVersionName: string) {
-	const BASE_URL = config.getEnv('versionNotifications.endpoint');
-	const instanceId = await UserSettings.getInstanceId();
-
-	const response = await axios.get<n8n.Version[]>(BASE_URL + currentVersionName, {
-		// eslint-disable-next-line @typescript-eslint/naming-convention
-		headers: { 'n8n-instance-id': instanceId },
-	});
-
-	return response.data;
-}
-
-function removeIconData(versions: n8n.Version[]) {
-	return versions.map((version) => {
-		if (version.nodes.length === 0) return version;
-
-		version.nodes.forEach((node) => delete node.iconData);
-
-		return version;
-	});
-}
-
-function classify(versions: n8n.Version[], currentVersionName: string) {
-	const [pass, fail] = separate(versions, (v) => v.name === currentVersionName);
-
-	return { currentVersion: pass[0], nextVersions: fail };
-}
-
-export async function getOutdatedState() {
-	let versions = [];
-
-	const localVersion = getN8nPackageJson().version;
-
-	try {
-		versions = await getNextVersions(localVersion).then(removeIconData);
-	} catch (error) {
-		if (inDevelopment) {
-			console.error('Failed to fetch n8n versions. Skipping outdated instance report...');
-		}
-		return null;
-	}
-
-	const { currentVersion, nextVersions } = classify(versions, localVersion);
-
-	const nextVersionsNumber = nextVersions.length;
-
-	if (nextVersionsNumber === 0) return null;
-
-	const description = [
-		`This n8n instance is outdated. Currently at version ${
-			currentVersion.name
-		}, missing ${nextVersionsNumber} ${nextVersionsNumber > 1 ? 'updates' : 'update'}.`,
-	];
-
-	const upcomingSecurityUpdates = nextVersions.some((v) => v.hasSecurityIssue || v.hasSecurityFix);
-
-	if (upcomingSecurityUpdates) description.push('Newer versions contain security updates.');
-
-	return {
-		description: description.join(' '),
-		nextVersions,
-	};
-}
-
-export async function reportInstanceRisk(workflows: WorkflowEntity[]) {
-	const unprotectedWebhooks = getUnprotectedWebhookNodes(workflows);
-	const outdatedState = await getOutdatedState();
-	const securitySettings = getSecuritySettings();
-
-	if (unprotectedWebhooks.length === 0 && outdatedState === null && securitySettings === null) {
-		return null;
-	}
-
-	const report: Risk.InstanceReport = {
-		risk: INSTANCE_REPORT.RISK,
-		sections: [],
-	};
-
-	if (unprotectedWebhooks.length > 0) {
-		const sentenceStart = ({ length }: { length: number }) =>
-			length > 1 ? 'These webhook nodes have' : 'This webhook node has';
-
-		const recommendedValidators = [...WEBHOOK_VALIDATOR_NODE_TYPES]
-			.filter((nodeType) => !nodeType.endsWith('function') || !nodeType.endsWith('functionItem'))
-			.join(',');
-
-		report.sections.push({
-			title: INSTANCE_REPORT.SECTIONS.UNPROTECTED_WEBHOOKS,
-			description: [
-				sentenceStart(unprotectedWebhooks),
-				`the "Authentication" field set to "None" and ${
-					unprotectedWebhooks.length > 1 ? 'are' : 'is'
-				} not directly connected to a node to validate the payload. Every unprotected webhook allows your workflow to be called by any third party who knows the webhook URL.`,
-			].join(' '),
-			recommendation: `Consider setting the "Authentication" field to an option other than "None", or validating the payload with one of the following nodes: ${recommendedValidators}.`,
-			location: unprotectedWebhooks,
-		});
-	}
-
-	if (outdatedState !== null) {
-		report.sections.push({
-			title: INSTANCE_REPORT.SECTIONS.OUTDATED_INSTANCE,
-			description: outdatedState.description,
-			recommendation:
-				'Consider updating this n8n instance to the latest version to prevent security vulnerabilities.',
-			nextVersions: outdatedState.nextVersions,
-		});
-	}
-
-	if (securitySettings !== null) {
-		report.sections.push({
-			title: INSTANCE_REPORT.SECTIONS.SECURITY_SETTINGS,
-			description: 'This n8n instance has the following security settings.',
-			recommendation: securitySettings.publiclyAccessibleInstance
-				? [
-						'Important! Your n8n instance is publicly accessible. Set up user management or basic/JWT auth to protect access to your n8n instance.'.toUpperCase(),
-						`See: ${SELF_HOSTED_AUTH_DOCS_URL}`,
-				  ].join(' ')
-				: `Consider adjusting the security settings for your n8n instance based on your needs. See: ${ENV_VARS_DOCS_URL}`,
-			settings: securitySettings,
-		});
-	}
-
-	return report;
-}
diff --git a/packages/cli/src/audit/risks/nodes.risk.ts b/packages/cli/src/audit/risks/nodes.risk.ts
deleted file mode 100644
index 042f34aa8b29e..0000000000000
--- a/packages/cli/src/audit/risks/nodes.risk.ts
+++ /dev/null
@@ -1,113 +0,0 @@
-import * as path from 'path';
-import glob from 'fast-glob';
-import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
-import { getNodeTypes } from '@/audit/utils';
-import { getAllInstalledPackages } from '@/CommunityNodes/packageModel';
-import {
-	OFFICIAL_RISKY_NODE_TYPES,
-	ENV_VARS_DOCS_URL,
-	NODES_REPORT,
-	COMMUNITY_NODES_RISKS_URL,
-	NPM_PACKAGE_URL,
-} from '@/audit/constants';
-import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
-import type { Risk } from '@/audit/types';
-import { Container } from 'typedi';
-
-async function getCommunityNodeDetails() {
-	const installedPackages = await getAllInstalledPackages();
-
-	return installedPackages.reduce<Risk.CommunityNodeDetails[]>((acc, pkg) => {
-		pkg.installedNodes.forEach((node) =>
-			acc.push({
-				kind: 'community',
-				nodeType: node.type,
-				packageUrl: [NPM_PACKAGE_URL, pkg.packageName].join('/'),
-			}),
-		);
-
-		return acc;
-	}, []);
-}
-
-async function getCustomNodeDetails() {
-	const customNodeTypes: Risk.CustomNodeDetails[] = [];
-
-	const nodesAndCredentials = Container.get(LoadNodesAndCredentials);
-	for (const customDir of nodesAndCredentials.getCustomDirectories()) {
-		const customNodeFiles = await glob('**/*.node.js', { cwd: customDir, absolute: true });
-
-		for (const nodeFile of customNodeFiles) {
-			const [fileName] = path.parse(nodeFile).name.split('.');
-			customNodeTypes.push({
-				kind: 'custom',
-				nodeType: ['CUSTOM', fileName].join('.'),
-				filePath: nodeFile,
-			});
-		}
-	}
-
-	return customNodeTypes;
-}
-
-export async function reportNodesRisk(workflows: WorkflowEntity[]) {
-	const officialRiskyNodes = getNodeTypes(workflows, (node) =>
-		OFFICIAL_RISKY_NODE_TYPES.has(node.type),
-	);
-
-	const [communityNodes, customNodes] = await Promise.all([
-		getCommunityNodeDetails(),
-		getCustomNodeDetails(),
-	]);
-
-	const issues = [officialRiskyNodes, communityNodes, customNodes];
-
-	if (issues.every((i) => i.length === 0)) return null;
-
-	const report: Risk.StandardReport = {
-		risk: NODES_REPORT.RISK,
-		sections: [],
-	};
-
-	const sentenceStart = (length: number) => (length > 1 ? 'These nodes are' : 'This node is');
-
-	if (officialRiskyNodes.length > 0) {
-		report.sections.push({
-			title: NODES_REPORT.SECTIONS.OFFICIAL_RISKY_NODES,
-			description: [
-				sentenceStart(officialRiskyNodes.length),
-				"part of n8n's official nodes and may be used to fetch and run any arbitrary code in the host system. This may lead to exploits such as remote code execution.",
-			].join(' '),
-			recommendation: `Consider reviewing the parameters in these nodes, replacing them with app nodes where possible, and not loading unneeded node types with the NODES_EXCLUDE environment variable. See: ${ENV_VARS_DOCS_URL}`,
-			location: officialRiskyNodes,
-		});
-	}
-
-	if (communityNodes.length > 0) {
-		report.sections.push({
-			title: NODES_REPORT.SECTIONS.COMMUNITY_NODES,
-			description: [
-				sentenceStart(communityNodes.length),
-				`sourced from the n8n community. Community nodes are not vetted by the n8n team and have full access to the host system. See: ${COMMUNITY_NODES_RISKS_URL}`,
-			].join(' '),
-			recommendation:
-				'Consider reviewing the source code in any community nodes installed in this n8n instance, and uninstalling any community nodes no longer in use.',
-			location: communityNodes,
-		});
-	}
-
-	if (customNodes.length > 0) {
-		report.sections.push({
-			title: NODES_REPORT.SECTIONS.CUSTOM_NODES,
-			description: [
-				sentenceStart(communityNodes.length),
-				'unpublished and located in the host system. Custom nodes are not vetted by the n8n team and have full access to the host system.',
-			].join(' '),
-			recommendation:
-				'Consider reviewing the source code in any custom node installed in this n8n instance, and removing any custom nodes no longer in use.',
-			location: customNodes,
-		});
-	}
-
-	return report;
-}
diff --git a/packages/cli/src/audit/types.ts b/packages/cli/src/audit/types.ts
deleted file mode 100644
index aa88f21aa512f..0000000000000
--- a/packages/cli/src/audit/types.ts
+++ /dev/null
@@ -1,86 +0,0 @@
-import type { WorkflowEntity as Workflow } from '@db/entities/WorkflowEntity';
-
-export namespace Risk {
-	export type Category = 'database' | 'credentials' | 'nodes' | 'instance' | 'filesystem';
-
-	type CredLocation = {
-		kind: 'credential';
-		id: string;
-		name: string;
-	};
-
-	export type NodeLocation = {
-		kind: 'node';
-		workflowId: string;
-		workflowName: string;
-		nodeId: string;
-		nodeName: string;
-		nodeType: string;
-	};
-
-	export type CommunityNodeDetails = {
-		kind: 'community';
-		nodeType: string;
-		packageUrl: string;
-	};
-
-	export type CustomNodeDetails = {
-		kind: 'custom';
-		nodeType: string;
-		filePath: string;
-	};
-
-	type SectionBase = {
-		title: string;
-		description: string;
-		recommendation: string;
-	};
-
-	export type Report = StandardReport | InstanceReport;
-
-	export type StandardSection = SectionBase & {
-		location: NodeLocation[] | CredLocation[] | CommunityNodeDetails[] | CustomNodeDetails[];
-	};
-
-	export type InstanceSection = SectionBase & {
-		location?: NodeLocation[];
-		settings?: Record<string, unknown>;
-		nextVersions?: n8n.Version[];
-	};
-
-	export type StandardReport = {
-		risk: Exclude<Category, 'instance'>;
-		sections: StandardSection[];
-	};
-
-	export type InstanceReport = {
-		risk: 'instance';
-		sections: InstanceSection[];
-	};
-
-	export type Audit = {
-		[reportTitle: string]: Report;
-	};
-
-	export type SyncReportFn = (workflows: Workflow[]) => StandardReport | null;
-
-	export type AsyncReportFn = (workflows: Workflow[]) => Promise<Report | null>;
-}
-
-export namespace n8n {
-	export type Version = {
-		name: string;
-		nodes: Array<
-			Workflow['nodes'][number] & {
-				iconData?: { type: string; fileBuffer: string }; // removed to declutter report
-			}
-		>;
-		createdAt: string;
-		description: string;
-		documentationUrl: string;
-		hasBreakingChange: boolean;
-		hasSecurityFix: boolean;
-		hasSecurityIssue: boolean;
-		securityIssueFixVersion: string;
-	};
-}
diff --git a/packages/cli/src/audit/utils.ts b/packages/cli/src/audit/utils.ts
deleted file mode 100644
index 9a0bf208e673d..0000000000000
--- a/packages/cli/src/audit/utils.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import type { WorkflowEntity as Workflow } from '@db/entities/WorkflowEntity';
-import type { Risk } from '@/audit/types';
-
-type Node = Workflow['nodes'][number];
-
-export const toFlaggedNode = ({ node, workflow }: { node: Node; workflow: Workflow }) => ({
-	kind: 'node' as const,
-	workflowId: workflow.id,
-	workflowName: workflow.name,
-	nodeId: node.id,
-	nodeName: node.name,
-	nodeType: node.type,
-});
-
-export const toReportTitle = (riskCategory: Risk.Category) =>
-	riskCategory.charAt(0).toUpperCase() + riskCategory.slice(1) + ' Risk Report';
-
-export function getNodeTypes(workflows: Workflow[], test: (element: Node) => boolean) {
-	return workflows.reduce<Risk.NodeLocation[]>((acc, workflow) => {
-		workflow.nodes.forEach((node) => {
-			if (test(node)) acc.push(toFlaggedNode({ node, workflow }));
-		});
-
-		return acc;
-	}, []);
-}
diff --git a/packages/cli/src/auth/auth.service.ts b/packages/cli/src/auth/auth.service.ts
new file mode 100644
index 0000000000000..9032b446de6a0
--- /dev/null
+++ b/packages/cli/src/auth/auth.service.ts
@@ -0,0 +1,230 @@
+import { Service } from 'typedi';
+import type { NextFunction, Response } from 'express';
+import { createHash } from 'crypto';
+import { JsonWebTokenError, TokenExpiredError } from 'jsonwebtoken';
+
+import config from '@/config';
+import { AUTH_COOKIE_NAME, RESPONSE_ERROR_MESSAGES, Time } from '@/constants';
+import type { User } from '@db/entities/User';
+import { UserRepository } from '@db/repositories/user.repository';
+import { AuthError } from '@/errors/response-errors/auth.error';
+import { UnauthorizedError } from '@/errors/response-errors/unauthorized.error';
+import { License } from '@/License';
+import { Logger } from '@/Logger';
+import type { AuthenticatedRequest } from '@/requests';
+import { JwtService } from '@/services/jwt.service';
+import { UrlService } from '@/services/url.service';
+
+interface AuthJwtPayload {
+	/** User Id */
+	id: string;
+	/** This hash is derived from email and bcrypt of password */
+	hash: string;
+	/** This is a client generated unique string to prevent session hijacking */
+	browserId?: string;
+}
+
+interface IssuedJWT extends AuthJwtPayload {
+	exp: number;
+}
+
+interface PasswordResetToken {
+	sub: string;
+	hash: string;
+}
+
+const restEndpoint = config.get('endpoints.rest');
+// The browser-id check needs to be skipped on these endpoints
+const skipBrowserIdCheckEndpoints = [
+	// we need to exclude push endpoint because we can't send custom header on websocket requests
+	// TODO: Implement a custom handshake for push, to avoid having to send any data on querystring or headers
+	`/${restEndpoint}/push`,
+
+	// We need to exclude binary-data downloading endpoint because we can't send custom headers on `<embed>` tags
+	`/${restEndpoint}/binary-data/`,
+
+	// oAuth callback urls aren't called by the frontend. therefore we can't send custom header on these requests
+	`/${restEndpoint}/oauth1-credential/callback`,
+	`/${restEndpoint}/oauth2-credential/callback`,
+];
+
+@Service()
+export class AuthService {
+	constructor(
+		private readonly logger: Logger,
+		private readonly license: License,
+		private readonly jwtService: JwtService,
+		private readonly urlService: UrlService,
+		private readonly userRepository: UserRepository,
+	) {
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+		this.authMiddleware = this.authMiddleware.bind(this);
+	}
+
+	async authMiddleware(req: AuthenticatedRequest, res: Response, next: NextFunction) {
+		const token = req.cookies[AUTH_COOKIE_NAME];
+		if (token) {
+			try {
+				req.user = await this.resolveJwt(token, req, res);
+			} catch (error) {
+				if (error instanceof JsonWebTokenError || error instanceof AuthError) {
+					this.clearCookie(res);
+				} else {
+					throw error;
+				}
+			}
+		}
+
+		if (req.user) next();
+		else res.status(401).json({ status: 'error', message: 'Unauthorized' });
+	}
+
+	clearCookie(res: Response) {
+		res.clearCookie(AUTH_COOKIE_NAME);
+	}
+
+	issueCookie(res: Response, user: User, browserId?: string) {
+		// TODO: move this check to the login endpoint in AuthController
+		// If the instance has exceeded its user quota, prevent non-owners from logging in
+		const isWithinUsersLimit = this.license.isWithinUsersLimit();
+		if (
+			config.getEnv('userManagement.isInstanceOwnerSetUp') &&
+			!user.isOwner &&
+			!isWithinUsersLimit
+		) {
+			throw new UnauthorizedError(RESPONSE_ERROR_MESSAGES.USERS_QUOTA_REACHED);
+		}
+
+		const token = this.issueJWT(user, browserId);
+		res.cookie(AUTH_COOKIE_NAME, token, {
+			maxAge: this.jwtExpiration * Time.seconds.toMilliseconds,
+			httpOnly: true,
+			sameSite: 'lax',
+			secure: config.getEnv('secure_cookie'),
+		});
+	}
+
+	issueJWT(user: User, browserId?: string) {
+		const payload: AuthJwtPayload = {
+			id: user.id,
+			hash: this.createJWTHash(user),
+			browserId: browserId && this.hash(browserId),
+		};
+		return this.jwtService.sign(payload, {
+			expiresIn: this.jwtExpiration,
+		});
+	}
+
+	async resolveJwt(token: string, req: AuthenticatedRequest, res: Response): Promise<User> {
+		const jwtPayload: IssuedJWT = this.jwtService.verify(token, {
+			algorithms: ['HS256'],
+		});
+
+		// TODO: Use an in-memory ttl-cache to cache the User object for upto a minute
+		const user = await this.userRepository.findOne({
+			where: { id: jwtPayload.id },
+		});
+
+		if (
+			// If not user is found
+			!user ||
+			// or, If the user has been deactivated (i.e. LDAP users)
+			user.disabled ||
+			// or, If the email or password has been updated
+			jwtPayload.hash !== this.createJWTHash(user)
+		) {
+			throw new AuthError('Unauthorized');
+		}
+
+		// Check if the token was issued for another browser session, ignoring the endpoints that can't send custom headers
+		const endpoint = req.route ? `${req.baseUrl}${req.route.path}` : req.baseUrl;
+		if (req.method === 'GET' && skipBrowserIdCheckEndpoints.includes(endpoint)) {
+			this.logger.debug(`Skipped browserId check on ${endpoint}`);
+		} else if (
+			jwtPayload.browserId &&
+			(!req.browserId || jwtPayload.browserId !== this.hash(req.browserId))
+		) {
+			this.logger.warn(`browserId check failed on ${endpoint}`);
+			throw new AuthError('Unauthorized');
+		}
+
+		if (jwtPayload.exp * 1000 - Date.now() < this.jwtRefreshTimeout) {
+			this.logger.debug('JWT about to expire. Will be refreshed');
+			this.issueCookie(res, user, req.browserId);
+		}
+
+		return user;
+	}
+
+	generatePasswordResetToken(user: User, expiresIn = '20m') {
+		const payload: PasswordResetToken = { sub: user.id, hash: this.createJWTHash(user) };
+		return this.jwtService.sign(payload, { expiresIn });
+	}
+
+	generatePasswordResetUrl(user: User) {
+		const instanceBaseUrl = this.urlService.getInstanceBaseUrl();
+		const url = new URL(`${instanceBaseUrl}/change-password`);
+
+		url.searchParams.append('token', this.generatePasswordResetToken(user));
+		url.searchParams.append('mfaEnabled', user.mfaEnabled.toString());
+
+		return url.toString();
+	}
+
+	async resolvePasswordResetToken(token: string): Promise<User | undefined> {
+		let decodedToken: PasswordResetToken;
+		try {
+			decodedToken = this.jwtService.verify(token);
+		} catch (e) {
+			if (e instanceof TokenExpiredError) {
+				this.logger.debug('Reset password token expired', { token });
+			} else {
+				this.logger.debug('Error verifying token', { token });
+			}
+			return;
+		}
+
+		const user = await this.userRepository.findOne({
+			where: { id: decodedToken.sub },
+			relations: ['authIdentities'],
+		});
+
+		if (!user) {
+			this.logger.debug(
+				'Request to resolve password token failed because no user was found for the provided user ID',
+				{ userId: decodedToken.sub, token },
+			);
+			return;
+		}
+
+		if (decodedToken.hash !== this.createJWTHash(user)) {
+			this.logger.debug('Password updated since this token was generated');
+			return;
+		}
+
+		return user;
+	}
+
+	createJWTHash({ email, password }: User) {
+		return this.hash(email + ':' + password).substring(0, 10);
+	}
+
+	private hash(input: string) {
+		return createHash('sha256').update(input).digest('base64');
+	}
+
+	/** How many **milliseconds** before expiration should a JWT be renewed */
+	get jwtRefreshTimeout() {
+		const { jwtRefreshTimeoutHours, jwtSessionDurationHours } = config.get('userManagement');
+		if (jwtRefreshTimeoutHours === 0) {
+			return Math.floor(jwtSessionDurationHours * 0.25 * Time.hours.toMilliseconds);
+		} else {
+			return Math.floor(jwtRefreshTimeoutHours * Time.hours.toMilliseconds);
+		}
+	}
+
+	/** How many **seconds** is an issued JWT valid for */
+	get jwtExpiration() {
+		return config.get('userManagement.jwtSessionDurationHours') * Time.hours.toSeconds;
+	}
+}
diff --git a/packages/cli/src/auth/jwt.ts b/packages/cli/src/auth/jwt.ts
index 5a1db63f03cc8..1d63f97fa3c6d 100644
--- a/packages/cli/src/auth/jwt.ts
+++ b/packages/cli/src/auth/jwt.ts
@@ -1,81 +1,12 @@
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
-
-import jwt from 'jsonwebtoken';
+import { Container } from 'typedi';
 import type { Response } from 'express';
-import { createHash } from 'crypto';
-import * as Db from '@/Db';
-import { AUTH_COOKIE_NAME } from '@/constants';
-import type { JwtPayload, JwtToken } from '@/Interfaces';
-import type { User } from '@db/entities/User';
-import config from '@/config';
-import * as ResponseHelper from '@/ResponseHelper';
-
-export function issueJWT(user: User): JwtToken {
-	const { id, email, password } = user;
-	const expiresIn = 7 * 86400000; // 7 days
-
-	const payload: JwtPayload = {
-		id,
-		email,
-		password: password ?? null,
-	};
-
-	if (password) {
-		payload.password = createHash('sha256')
-			.update(password.slice(password.length / 2))
-			.digest('hex');
-	}
-
-	const signedToken = jwt.sign(payload, config.getEnv('userManagement.jwtSecret'), {
-		expiresIn: expiresIn / 1000 /* in seconds */,
-		algorithm: 'HS256',
-	});
-
-	return {
-		token: signedToken,
-		expiresIn,
-	};
-}
 
-export async function resolveJwtContent(jwtPayload: JwtPayload): Promise<User> {
-	const user = await Db.collections.User.findOne({
-		where: { id: jwtPayload.id },
-		relations: ['globalRole'],
-	});
-
-	let passwordHash = null;
-	if (user?.password) {
-		passwordHash = createHash('sha256')
-			.update(user.password.slice(user.password.length / 2))
-			.digest('hex');
-	}
-
-	// currently only LDAP users during synchronization
-	// can be set to disabled
-	if (user?.disabled) {
-		throw new ResponseHelper.AuthError('Unauthorized');
-	}
-
-	if (!user || jwtPayload.password !== passwordHash || user.email !== jwtPayload.email) {
-		// When owner hasn't been set up, the default user
-		// won't have email nor password (both equals null)
-		throw new Error('Invalid token content');
-	}
-	return user;
-}
-
-export async function resolveJwt(token: string): Promise<User> {
-	const jwtPayload = jwt.verify(token, config.getEnv('userManagement.jwtSecret'), {
-		algorithms: ['HS256'],
-	}) as JwtPayload;
-	return resolveJwtContent(jwtPayload);
-}
+import type { User } from '@db/entities/User';
+import { AuthService } from './auth.service';
 
-export async function issueCookie(res: Response, user: User): Promise<void> {
-	const userData = issueJWT(user);
-	res.cookie(AUTH_COOKIE_NAME, userData.token, {
-		maxAge: userData.expiresIn,
-		httpOnly: true,
-		sameSite: 'lax',
-	});
+// This method is still used by cloud hooks.
+// DO NOT DELETE until the hooks have been updated
+/** @deprecated Use `AuthService` instead */
+export function issueCookie(res: Response, user: User) {
+	return Container.get(AuthService).issueCookie(res, user);
 }
diff --git a/packages/cli/src/auth/methods/email.ts b/packages/cli/src/auth/methods/email.ts
index c55d8a2964237..ba839fa4e6d9c 100644
--- a/packages/cli/src/auth/methods/email.ts
+++ b/packages/cli/src/auth/methods/email.ts
@@ -1,32 +1,33 @@
-import * as Db from '@/Db';
 import type { User } from '@db/entities/User';
-import { compareHash } from '@/UserManagement/UserManagementHelper';
-import * as ResponseHelper from '@/ResponseHelper';
+import { PasswordUtility } from '@/services/password.utility';
 import { Container } from 'typedi';
 import { InternalHooks } from '@/InternalHooks';
+import { isLdapLoginEnabled } from '@/Ldap/helpers';
+import { UserRepository } from '@db/repositories/user.repository';
+import { AuthError } from '@/errors/response-errors/auth.error';
 
 export const handleEmailLogin = async (
 	email: string,
 	password: string,
 ): Promise<User | undefined> => {
-	const user = await Db.collections.User.findOne({
+	const user = await Container.get(UserRepository).findOne({
 		where: { email },
-		relations: ['globalRole', 'authIdentities'],
+		relations: ['authIdentities'],
 	});
 
-	if (user?.password && (await compareHash(password, user.password))) {
+	if (user?.password && (await Container.get(PasswordUtility).compare(password, user.password))) {
 		return user;
 	}
 
 	// At this point if the user has a LDAP ID, means it was previously an LDAP user,
 	// so suggest to reset the password to gain access to the instance.
 	const ldapIdentity = user?.authIdentities?.find((i) => i.providerType === 'ldap');
-	if (user && ldapIdentity) {
+	if (user && ldapIdentity && !isLdapLoginEnabled()) {
 		void Container.get(InternalHooks).userLoginFailedDueToLdapDisabled({
 			user_id: user.id,
 		});
 
-		throw new ResponseHelper.AuthError('Reset your password to gain access to the instance.');
+		throw new AuthError('Reset your password to gain access to the instance.');
 	}
 
 	return undefined;
diff --git a/packages/cli/src/auth/methods/ldap.ts b/packages/cli/src/auth/methods/ldap.ts
index 826c33bbb417a..964fc9f485f56 100644
--- a/packages/cli/src/auth/methods/ldap.ts
+++ b/packages/cli/src/auth/methods/ldap.ts
@@ -1,32 +1,31 @@
+import { Container } from 'typedi';
+
 import { InternalHooks } from '@/InternalHooks';
+import { LdapService } from '@/Ldap/ldap.service';
 import {
 	createLdapUserOnLocalDb,
-	findAndAuthenticateLdapUser,
-	getLdapConfig,
-	getLdapUserRole,
 	getUserByEmail,
 	getAuthIdentityByLdapId,
-	isLdapDisabled,
+	isLdapEnabled,
 	mapLdapAttributesToUser,
 	createLdapAuthIdentity,
 	updateLdapUserOnLocalDb,
 } from '@/Ldap/helpers';
 import type { User } from '@db/entities/User';
-import { Container } from 'typedi';
 
 export const handleLdapLogin = async (
 	loginId: string,
 	password: string,
 ): Promise<User | undefined> => {
-	if (isLdapDisabled()) return undefined;
+	if (!isLdapEnabled()) return undefined;
 
-	const ldapConfig = await getLdapConfig();
+	const ldapService = Container.get(LdapService);
 
-	if (!ldapConfig.loginEnabled) return undefined;
+	if (!ldapService.config.loginEnabled) return undefined;
 
-	const { loginIdAttribute, userFilter } = ldapConfig;
+	const { loginIdAttribute, userFilter } = ldapService.config;
 
-	const ldapUser = await findAndAuthenticateLdapUser(
+	const ldapUser = await ldapService.findAndAuthenticateLdapUser(
 		loginId,
 		password,
 		loginIdAttribute,
@@ -35,7 +34,7 @@ export const handleLdapLogin = async (
 
 	if (!ldapUser) return undefined;
 
-	const [ldapId, ldapAttributesValues] = mapLdapAttributesToUser(ldapUser, ldapConfig);
+	const [ldapId, ldapAttributesValues] = mapLdapAttributesToUser(ldapUser, ldapService.config);
 
 	const { email: emailAttributeValue } = ldapAttributesValues;
 
@@ -50,8 +49,7 @@ export const handleLdapLogin = async (
 			const identity = await createLdapAuthIdentity(emailUser, ldapId);
 			await updateLdapUserOnLocalDb(identity, ldapAttributesValues);
 		} else {
-			const role = await getLdapUserRole();
-			const user = await createLdapUserOnLocalDb(role, ldapAttributesValues, ldapId);
+			const user = await createLdapUserOnLocalDb(ldapAttributesValues, ldapId);
 			void Container.get(InternalHooks).onUserSignup(user, {
 				user_type: 'ldap',
 				was_disabled_ldap_user: false,
diff --git a/packages/cli/src/collaboration/collaboration.message.ts b/packages/cli/src/collaboration/collaboration.message.ts
new file mode 100644
index 0000000000000..0980bdccbbdb2
--- /dev/null
+++ b/packages/cli/src/collaboration/collaboration.message.ts
@@ -0,0 +1,23 @@
+export type CollaborationMessage = WorkflowOpenedMessage | WorkflowClosedMessage;
+
+export type WorkflowOpenedMessage = {
+	type: 'workflowOpened';
+	workflowId: string;
+};
+
+export type WorkflowClosedMessage = {
+	type: 'workflowClosed';
+	workflowId: string;
+};
+
+const isWorkflowMessage = (msg: unknown): msg is CollaborationMessage => {
+	return typeof msg === 'object' && msg !== null && 'type' in msg;
+};
+
+export const isWorkflowOpenedMessage = (msg: unknown): msg is WorkflowOpenedMessage => {
+	return isWorkflowMessage(msg) && msg.type === 'workflowOpened';
+};
+
+export const isWorkflowClosedMessage = (msg: unknown): msg is WorkflowClosedMessage => {
+	return isWorkflowMessage(msg) && msg.type === 'workflowClosed';
+};
diff --git a/packages/cli/src/collaboration/collaboration.service.ts b/packages/cli/src/collaboration/collaboration.service.ts
new file mode 100644
index 0000000000000..6d52d2655806a
--- /dev/null
+++ b/packages/cli/src/collaboration/collaboration.service.ts
@@ -0,0 +1,109 @@
+import type { Workflow } from 'n8n-workflow';
+import { Service } from 'typedi';
+import config from '@/config';
+import { Push } from '../push';
+import { Logger } from '@/Logger';
+import type { WorkflowClosedMessage, WorkflowOpenedMessage } from './collaboration.message';
+import { isWorkflowClosedMessage, isWorkflowOpenedMessage } from './collaboration.message';
+import { UserService } from '../services/user.service';
+import type { IActiveWorkflowUsersChanged } from '../Interfaces';
+import type { OnPushMessageEvent } from '@/push/types';
+import { CollaborationState } from '@/collaboration/collaboration.state';
+import { TIME } from '@/constants';
+import { UserRepository } from '@/databases/repositories/user.repository';
+
+/**
+ * After how many minutes of inactivity a user should be removed
+ * as being an active user of a workflow.
+ */
+const INACTIVITY_CLEAN_UP_TIME_IN_MS = 15 * TIME.MINUTE;
+
+/**
+ * Service for managing collaboration feature between users. E.g. keeping
+ * track of active users for a workflow.
+ */
+@Service()
+export class CollaborationService {
+	constructor(
+		private readonly logger: Logger,
+		private readonly push: Push,
+		private readonly state: CollaborationState,
+		private readonly userService: UserService,
+		private readonly userRepository: UserRepository,
+	) {
+		if (!push.isBidirectional) {
+			logger.warn(
+				'Collaboration features are disabled because push is configured unidirectional. Use N8N_PUSH_BACKEND=websocket environment variable to enable them.',
+			);
+			return;
+		}
+
+		const isMultiMainSetup = config.get('multiMainSetup.enabled');
+		if (isMultiMainSetup) {
+			// TODO: We should support collaboration in multi-main setup as well
+			// This requires using redis as the state store instead of in-memory
+			logger.warn('Collaboration features are disabled because multi-main setup is enabled.');
+			return;
+		}
+
+		this.push.on('message', async (event: OnPushMessageEvent) => {
+			try {
+				await this.handleUserMessage(event.userId, event.msg);
+			} catch (error) {
+				this.logger.error('Error handling user message', {
+					error: error as unknown,
+					msg: event.msg,
+					userId: event.userId,
+				});
+			}
+		});
+	}
+
+	async handleUserMessage(userId: string, msg: unknown) {
+		if (isWorkflowOpenedMessage(msg)) {
+			await this.handleWorkflowOpened(userId, msg);
+		} else if (isWorkflowClosedMessage(msg)) {
+			await this.handleWorkflowClosed(userId, msg);
+		}
+	}
+
+	private async handleWorkflowOpened(userId: string, msg: WorkflowOpenedMessage) {
+		const { workflowId } = msg;
+
+		this.state.addActiveWorkflowUser(workflowId, userId);
+		this.state.cleanInactiveUsers(workflowId, INACTIVITY_CLEAN_UP_TIME_IN_MS);
+
+		await this.sendWorkflowUsersChangedMessage(workflowId);
+	}
+
+	private async handleWorkflowClosed(userId: string, msg: WorkflowClosedMessage) {
+		const { workflowId } = msg;
+
+		this.state.removeActiveWorkflowUser(workflowId, userId);
+
+		await this.sendWorkflowUsersChangedMessage(workflowId);
+	}
+
+	private async sendWorkflowUsersChangedMessage(workflowId: Workflow['id']) {
+		const activeWorkflowUsers = this.state.getActiveWorkflowUsers(workflowId);
+		const workflowUserIds = activeWorkflowUsers.map((user) => user.userId);
+
+		if (workflowUserIds.length === 0) {
+			return;
+		}
+		const users = await this.userRepository.getByIds(
+			this.userService.getManager(),
+			workflowUserIds,
+		);
+
+		const msgData: IActiveWorkflowUsersChanged = {
+			workflowId,
+			activeUsers: users.map((user) => ({
+				user,
+				lastSeen: activeWorkflowUsers.find((activeUser) => activeUser.userId === user.id)!.lastSeen,
+			})),
+		};
+
+		this.push.sendToUsers('activeWorkflowUsersChanged', msgData, workflowUserIds);
+	}
+}
diff --git a/packages/cli/src/collaboration/collaboration.state.ts b/packages/cli/src/collaboration/collaboration.state.ts
new file mode 100644
index 0000000000000..530a529650068
--- /dev/null
+++ b/packages/cli/src/collaboration/collaboration.state.ts
@@ -0,0 +1,79 @@
+import type { User } from '@db/entities/User';
+import type { Workflow } from 'n8n-workflow';
+import { Service } from 'typedi';
+
+type ActiveWorkflowUser = {
+	userId: User['id'];
+	lastSeen: Date;
+};
+
+type UserStateByUserId = Map<User['id'], ActiveWorkflowUser>;
+
+type State = {
+	activeUsersByWorkflowId: Map<Workflow['id'], UserStateByUserId>;
+};
+
+/**
+ * State management for the collaboration service
+ */
+@Service()
+export class CollaborationState {
+	private state: State = {
+		activeUsersByWorkflowId: new Map(),
+	};
+
+	addActiveWorkflowUser(workflowId: Workflow['id'], userId: User['id']) {
+		const { activeUsersByWorkflowId } = this.state;
+
+		let activeUsers = activeUsersByWorkflowId.get(workflowId);
+		if (!activeUsers) {
+			activeUsers = new Map();
+			activeUsersByWorkflowId.set(workflowId, activeUsers);
+		}
+
+		activeUsers.set(userId, {
+			userId,
+			lastSeen: new Date(),
+		});
+	}
+
+	removeActiveWorkflowUser(workflowId: Workflow['id'], userId: User['id']) {
+		const { activeUsersByWorkflowId } = this.state;
+
+		const activeUsers = activeUsersByWorkflowId.get(workflowId);
+		if (!activeUsers) {
+			return;
+		}
+
+		activeUsers.delete(userId);
+		if (activeUsers.size === 0) {
+			activeUsersByWorkflowId.delete(workflowId);
+		}
+	}
+
+	getActiveWorkflowUsers(workflowId: Workflow['id']): ActiveWorkflowUser[] {
+		const workflowState = this.state.activeUsersByWorkflowId.get(workflowId);
+		if (!workflowState) {
+			return [];
+		}
+
+		return [...workflowState.values()];
+	}
+
+	/**
+	 * Removes all users that have not been seen in a given time
+	 */
+	cleanInactiveUsers(workflowId: Workflow['id'], inactivityCleanUpTimeInMs: number) {
+		const activeUsers = this.state.activeUsersByWorkflowId.get(workflowId);
+		if (!activeUsers) {
+			return;
+		}
+
+		const now = Date.now();
+		for (const user of activeUsers.values()) {
+			if (now - user.lastSeen.getTime() > inactivityCleanUpTimeInMs) {
+				activeUsers.delete(user.userId);
+			}
+		}
+	}
+}
diff --git a/packages/cli/src/commands/BaseCommand.ts b/packages/cli/src/commands/BaseCommand.ts
index 418382073b003..c10b7a372c7bf 100644
--- a/packages/cli/src/commands/BaseCommand.ts
+++ b/packages/cli/src/commands/BaseCommand.ts
@@ -1,63 +1,129 @@
-import { Command } from '@oclif/command';
-import { ExitError } from '@oclif/errors';
+import 'reflect-metadata';
 import { Container } from 'typedi';
-import type { INodeTypes } from 'n8n-workflow';
-import { LoggerProxy, ErrorReporterProxy as ErrorReporter, sleep } from 'n8n-workflow';
-import type { IUserSettings } from 'n8n-core';
-import { BinaryDataManager, UserSettings } from 'n8n-core';
-import { getLogger } from '@/Logger';
+import { Command } from '@oclif/core';
+import { ExitError } from '@oclif/core/lib/errors';
+import { ApplicationError, ErrorReporterProxy as ErrorReporter, sleep } from 'n8n-workflow';
+import { BinaryDataService, InstanceSettings, ObjectStoreService } from 'n8n-core';
+import type { AbstractServer } from '@/AbstractServer';
+import { Logger } from '@/Logger';
 import config from '@/config';
 import * as Db from '@/Db';
 import * as CrashJournal from '@/CrashJournal';
-import { inTest } from '@/constants';
-import { CredentialTypes } from '@/CredentialTypes';
-import { CredentialsOverwrites } from '@/CredentialsOverwrites';
+import { LICENSE_FEATURES, inDevelopment, inTest } from '@/constants';
 import { initErrorHandling } from '@/ErrorReporting';
 import { ExternalHooks } from '@/ExternalHooks';
 import { NodeTypes } from '@/NodeTypes';
 import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
-import type { IExternalHooksClass } from '@/Interfaces';
+import type { N8nInstanceType } from '@/Interfaces';
 import { InternalHooks } from '@/InternalHooks';
 import { PostHogClient } from '@/posthog';
-
-export const UM_FIX_INSTRUCTION =
-	'Please fix the database by running ./packages/cli/bin/n8n user-management:reset';
+import { License } from '@/License';
+import { ExternalSecretsManager } from '@/ExternalSecrets/ExternalSecretsManager.ee';
+import { initExpressionEvaluator } from '@/ExpressionEvaluator';
+import { generateHostInstanceId } from '@db/utils/generators';
+import { WorkflowHistoryManager } from '@/workflows/workflowHistory/workflowHistoryManager.ee';
+import { ShutdownService } from '@/shutdown/Shutdown.service';
 
 export abstract class BaseCommand extends Command {
-	protected logger = LoggerProxy.init(getLogger());
+	protected logger = Container.get(Logger);
+
+	protected externalHooks?: ExternalHooks;
+
+	protected nodeTypes: NodeTypes;
 
-	protected externalHooks: IExternalHooksClass;
+	protected instanceSettings: InstanceSettings;
 
-	protected loadNodesAndCredentials: LoadNodesAndCredentials;
+	private instanceType: N8nInstanceType = 'main';
 
-	protected nodeTypes: INodeTypes;
+	queueModeId: string;
 
-	protected userSettings: IUserSettings;
+	protected server?: AbstractServer;
 
-	protected instanceId: string;
+	protected shutdownService: ShutdownService = Container.get(ShutdownService);
+
+	protected license: License;
+
+	/**
+	 * How long to wait for graceful shutdown before force killing the process.
+	 */
+	protected gracefulShutdownTimeoutInS = config.getEnv('generic.gracefulShutdownTimeout');
 
 	async init(): Promise<void> {
 		await initErrorHandling();
+		initExpressionEvaluator();
 
-		process.once('SIGTERM', async () => this.stopProcess());
-		process.once('SIGINT', async () => this.stopProcess());
+		process.once('SIGTERM', this.onTerminationSignal('SIGTERM'));
+		process.once('SIGINT', this.onTerminationSignal('SIGINT'));
 
 		// Make sure the settings exist
-		this.userSettings = await UserSettings.prepareUserSettings();
+		this.instanceSettings = Container.get(InstanceSettings);
 
-		this.loadNodesAndCredentials = Container.get(LoadNodesAndCredentials);
-		await this.loadNodesAndCredentials.init();
 		this.nodeTypes = Container.get(NodeTypes);
-		const credentialTypes = Container.get(CredentialTypes);
-		CredentialsOverwrites(credentialTypes);
+		await Container.get(LoadNodesAndCredentials).init();
 
-		await Db.init().catch(async (error: Error) =>
-			this.exitWithCrash('There was an error initializing DB', error),
+		await Db.init().catch(
+			async (error: Error) => await this.exitWithCrash('There was an error initializing DB', error),
 		);
 
-		this.instanceId = this.userSettings.instanceId ?? '';
-		await Container.get(PostHogClient).init(this.instanceId);
-		await Container.get(InternalHooks).init(this.instanceId);
+		// This needs to happen after DB.init() or otherwise DB Connection is not
+		// available via the dependency Container that services depend on.
+		if (inDevelopment || inTest) {
+			this.shutdownService.validate();
+		}
+
+		await this.server?.init();
+
+		await Db.migrate().catch(
+			async (error: Error) =>
+				await this.exitWithCrash('There was an error running database migrations', error),
+		);
+
+		const dbType = config.getEnv('database.type');
+
+		if (['mysqldb', 'mariadb'].includes(dbType)) {
+			this.logger.warn(
+				'Support for MySQL/MariaDB has been deprecated and will be removed with an upcoming version of n8n. Please migrate to PostgreSQL.',
+			);
+		}
+
+		if (process.env.N8N_SKIP_WEBHOOK_DEREGISTRATION_SHUTDOWN) {
+			this.logger.warn(
+				'The flag to skip webhook deregistration N8N_SKIP_WEBHOOK_DEREGISTRATION_SHUTDOWN has been removed. n8n no longer deregisters webhooks at startup and shutdown, in main and queue mode.',
+			);
+		}
+
+		if (config.getEnv('executions.mode') === 'queue' && dbType === 'sqlite') {
+			this.logger.warn(
+				'Queue mode is not officially supported with sqlite. Please switch to PostgreSQL.',
+			);
+		}
+
+		if (
+			process.env.N8N_BINARY_DATA_TTL ??
+			process.env.N8N_PERSISTED_BINARY_DATA_TTL ??
+			process.env.EXECUTIONS_DATA_PRUNE_TIMEOUT
+		) {
+			this.logger.warn(
+				'The env vars N8N_BINARY_DATA_TTL and N8N_PERSISTED_BINARY_DATA_TTL and EXECUTIONS_DATA_PRUNE_TIMEOUT no longer have any effect and can be safely removed. Instead of relying on a TTL system for binary data, n8n currently cleans up binary data together with executions during pruning.',
+			);
+		}
+
+		await Container.get(PostHogClient).init();
+		await Container.get(InternalHooks).init();
+	}
+
+	protected setInstanceType(instanceType: N8nInstanceType) {
+		this.instanceType = instanceType;
+		config.set('generic.instanceType', instanceType);
+	}
+
+	protected setInstanceQueueModeId() {
+		if (config.get('redis.queueModeId')) {
+			this.queueModeId = config.get('redis.queueModeId');
+			return;
+		}
+		this.queueModeId = generateHostInstanceId(this.instanceType);
+		config.set('redis.queueModeId', this.queueModeId);
 	}
 
 	protected async stopProcess() {
@@ -70,7 +136,7 @@ export abstract class BaseCommand extends Command {
 
 	protected async exitSuccessFully() {
 		try {
-			await CrashJournal.cleanup();
+			await Promise.all([CrashJournal.cleanup(), Db.close()]);
 		} finally {
 			process.exit();
 		}
@@ -83,23 +149,191 @@ export abstract class BaseCommand extends Command {
 		process.exit(1);
 	}
 
-	protected async initBinaryManager() {
+	async initObjectStoreService() {
+		const isSelected = config.getEnv('binaryDataManager.mode') === 's3';
+		const isAvailable = config.getEnv('binaryDataManager.availableModes').includes('s3');
+
+		if (!isSelected && !isAvailable) return;
+
+		if (isSelected && !isAvailable) {
+			throw new ApplicationError(
+				'External storage selected but unavailable. Please make external storage available by adding "s3" to `N8N_AVAILABLE_BINARY_DATA_MODES`.',
+			);
+		}
+
+		const isLicensed = Container.get(License).isFeatureEnabled(LICENSE_FEATURES.BINARY_DATA_S3);
+
+		if (isSelected && isAvailable && isLicensed) {
+			this.logger.debug(
+				'License found for external storage - object store to init in read-write mode',
+			);
+
+			await this._initObjectStoreService();
+
+			return;
+		}
+
+		if (isSelected && isAvailable && !isLicensed) {
+			this.logger.debug(
+				'No license found for external storage - object store to init with writes blocked. To enable writes, please upgrade to a license that supports this feature.',
+			);
+
+			await this._initObjectStoreService({ isReadOnly: true });
+
+			return;
+		}
+
+		if (!isSelected && isAvailable) {
+			this.logger.debug(
+				'External storage unselected but available - object store to init with writes unused',
+			);
+
+			await this._initObjectStoreService();
+
+			return;
+		}
+	}
+
+	private async _initObjectStoreService(options = { isReadOnly: false }) {
+		const objectStoreService = Container.get(ObjectStoreService);
+
+		const host = config.getEnv('externalStorage.s3.host');
+
+		if (host === '') {
+			throw new ApplicationError(
+				'External storage host not configured. Please set `N8N_EXTERNAL_STORAGE_S3_HOST`.',
+			);
+		}
+
+		const bucket = {
+			name: config.getEnv('externalStorage.s3.bucket.name'),
+			region: config.getEnv('externalStorage.s3.bucket.region'),
+		};
+
+		if (bucket.name === '') {
+			throw new ApplicationError(
+				'External storage bucket name not configured. Please set `N8N_EXTERNAL_STORAGE_S3_BUCKET_NAME`.',
+			);
+		}
+
+		if (bucket.region === '') {
+			throw new ApplicationError(
+				'External storage bucket region not configured. Please set `N8N_EXTERNAL_STORAGE_S3_BUCKET_REGION`.',
+			);
+		}
+
+		const credentials = {
+			accessKey: config.getEnv('externalStorage.s3.credentials.accessKey'),
+			accessSecret: config.getEnv('externalStorage.s3.credentials.accessSecret'),
+		};
+
+		if (credentials.accessKey === '') {
+			throw new ApplicationError(
+				'External storage access key not configured. Please set `N8N_EXTERNAL_STORAGE_S3_ACCESS_KEY`.',
+			);
+		}
+
+		if (credentials.accessSecret === '') {
+			throw new ApplicationError(
+				'External storage access secret not configured. Please set `N8N_EXTERNAL_STORAGE_S3_ACCESS_SECRET`.',
+			);
+		}
+
+		this.logger.debug('Initializing object store service');
+
+		try {
+			await objectStoreService.init(host, bucket, credentials);
+			objectStoreService.setReadonly(options.isReadOnly);
+
+			this.logger.debug('Object store init completed');
+		} catch (e) {
+			const error = e instanceof Error ? e : new Error(`${e}`);
+
+			this.logger.debug('Object store init failed', { error });
+		}
+	}
+
+	async initBinaryDataService() {
+		try {
+			await this.initObjectStoreService();
+		} catch (e) {
+			const error = e instanceof Error ? e : new Error(`${e}`);
+			this.logger.error(`Failed to init object store: ${error.message}`, { error });
+			process.exit(1);
+		}
+
 		const binaryDataConfig = config.getEnv('binaryDataManager');
-		await BinaryDataManager.init(binaryDataConfig, true);
+		await Container.get(BinaryDataService).init(binaryDataConfig);
 	}
 
-	protected async initExternalHooks() {
+	async initExternalHooks() {
 		this.externalHooks = Container.get(ExternalHooks);
 		await this.externalHooks.init();
 	}
 
+	async initLicense(): Promise<void> {
+		this.license = Container.get(License);
+		await this.license.init(this.instanceType ?? 'main');
+
+		const activationKey = config.getEnv('license.activationKey');
+
+		if (activationKey) {
+			const hasCert = (await this.license.loadCertStr()).length > 0;
+
+			if (hasCert) {
+				return this.logger.debug('Skipping license activation');
+			}
+
+			try {
+				this.logger.debug('Attempting license activation');
+				await this.license.activate(activationKey);
+				this.logger.debug('License init complete');
+			} catch (e) {
+				this.logger.error('Could not activate license', e as Error);
+			}
+		}
+	}
+
+	async initExternalSecrets() {
+		const secretsManager = Container.get(ExternalSecretsManager);
+		await secretsManager.init();
+	}
+
+	initWorkflowHistory() {
+		Container.get(WorkflowHistoryManager).init();
+	}
+
 	async finally(error: Error | undefined) {
 		if (inTest || this.id === 'start') return;
-		if (Db.isInitialized) {
+		if (Db.connectionState.connected) {
 			await sleep(100); // give any in-flight query some time to finish
-			await Db.getConnection().destroy();
+			await Db.close();
 		}
 		const exitCode = error instanceof ExitError ? error.oclif.exit : error ? 1 : 0;
 		this.exit(exitCode);
 	}
+
+	private onTerminationSignal(signal: string) {
+		return async () => {
+			if (this.shutdownService.isShuttingDown()) {
+				this.logger.info(`Received ${signal}. Already shutting down...`);
+				return;
+			}
+
+			const forceShutdownTimer = setTimeout(async () => {
+				// In case that something goes wrong with shutdown we
+				// kill after timeout no matter what
+				this.logger.info(`process exited after ${this.gracefulShutdownTimeoutInS}s`);
+				const errorMsg = `Shutdown timed out after ${this.gracefulShutdownTimeoutInS} seconds`;
+				await this.exitWithCrash(errorMsg, new Error(errorMsg));
+			}, this.gracefulShutdownTimeoutInS * 1000);
+
+			this.logger.info(`Received ${signal}. Shutting down...`);
+			this.shutdownService.shutdown();
+
+			await Promise.all([this.stopProcess(), this.shutdownService.waitForShutdown()]);
+
+			clearTimeout(forceShutdownTimer);
+		};
+	}
 }
diff --git a/packages/cli/src/commands/Interfaces.d.ts b/packages/cli/src/commands/Interfaces.d.ts
deleted file mode 100644
index e06bb83abd495..0000000000000
--- a/packages/cli/src/commands/Interfaces.d.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-interface IResult {
-	totalWorkflows: number;
-	summary: {
-		failedExecutions: number;
-		successfulExecutions: number;
-		warningExecutions: number;
-		errors: IExecutionError[];
-		warnings: IExecutionError[];
-	};
-	coveredNodes: {
-		[nodeType: string]: number;
-	};
-	executions: IExecutionResult[];
-}
-
-interface IExecutionResult {
-	workflowId: string;
-	workflowName: string;
-	executionTime: number; // Given in seconds with decimals for milliseconds
-	finished: boolean;
-	executionStatus: ExecutionStatus;
-	error?: string;
-	changes?: string;
-	coveredNodes: {
-		[nodeType: string]: number;
-	};
-}
-
-interface IExecutionError {
-	workflowId: string;
-	error: string;
-}
-
-interface IWorkflowExecutionProgress {
-	workflowId: string;
-	status: ExecutionStatus;
-}
-
-interface INodeSpecialCases {
-	[nodeName: string]: INodeSpecialCase;
-}
-
-interface INodeSpecialCase {
-	ignoredProperties?: string[];
-	capResults?: number;
-	keepOnlyProperties?: string[];
-}
-
-declare module 'json-diff' {
-	interface IDiffOptions {
-		keysOnly?: boolean;
-	}
-	export function diff(obj1: unknown, obj2: unknown, diffOptions: IDiffOptions): string;
-}
diff --git a/packages/cli/src/commands/audit.ts b/packages/cli/src/commands/audit.ts
index 0c1555ccdf86c..2414c09fc7c12 100644
--- a/packages/cli/src/commands/audit.ts
+++ b/packages/cli/src/commands/audit.ts
@@ -1,10 +1,12 @@
-import { flags } from '@oclif/command';
-import { audit } from '@/audit';
-import { RISK_CATEGORIES } from '@/audit/constants';
+import { Container } from 'typedi';
+import { Flags } from '@oclif/core';
+import { ApplicationError } from 'n8n-workflow';
+
+import { SecurityAuditService } from '@/security-audit/SecurityAudit.service';
+import { RISK_CATEGORIES } from '@/security-audit/constants';
 import config from '@/config';
-import type { Risk } from '@/audit/types';
+import type { Risk } from '@/security-audit/types';
 import { BaseCommand } from './BaseCommand';
-import { Container } from 'typedi';
 import { InternalHooks } from '@/InternalHooks';
 
 export class SecurityAudit extends BaseCommand {
@@ -17,20 +19,20 @@ export class SecurityAudit extends BaseCommand {
 	];
 
 	static flags = {
-		help: flags.help({ char: 'h' }),
-		categories: flags.string({
+		help: Flags.help({ char: 'h' }),
+		categories: Flags.string({
 			default: RISK_CATEGORIES.join(','),
 			description: 'Comma-separated list of categories to include in the audit',
 		}),
 		// eslint-disable-next-line @typescript-eslint/naming-convention
-		'days-abandoned-workflow': flags.integer({
+		'days-abandoned-workflow': Flags.integer({
 			default: config.getEnv('security.audit.daysAbandonedWorkflow'),
 			description: 'Days for a workflow to be considered abandoned if not executed',
 		}),
 	};
 
 	async run() {
-		const { flags: auditFlags } = this.parse(SecurityAudit);
+		const { flags: auditFlags } = await this.parse(SecurityAudit);
 
 		const categories =
 			auditFlags.categories?.split(',').filter((c): c is Risk.Category => c !== '') ??
@@ -46,10 +48,13 @@ export class SecurityAudit extends BaseCommand {
 
 			const hint = `Valid categories are: ${RISK_CATEGORIES.join(', ')}`;
 
-			throw new Error([message, hint].join('. '));
+			throw new ApplicationError([message, hint].join('. '));
 		}
 
-		const result = await audit(categories, auditFlags['days-abandoned-workflow']);
+		const result = await Container.get(SecurityAuditService).run(
+			categories,
+			auditFlags['days-abandoned-workflow'],
+		);
 
 		if (Array.isArray(result) && result.length === 0) {
 			this.logger.info('No security issues found');
diff --git a/packages/cli/src/commands/db/revert.ts b/packages/cli/src/commands/db/revert.ts
index 56de3b566372a..4ac9a06733ccf 100644
--- a/packages/cli/src/commands/db/revert.ts
+++ b/packages/cli/src/commands/db/revert.ts
@@ -1,32 +1,66 @@
-import { Command, flags } from '@oclif/command';
-import type { DataSourceOptions as ConnectionOptions } from 'typeorm';
-import { DataSource as Connection } from 'typeorm';
-import { LoggerProxy } from 'n8n-workflow';
-import { getLogger } from '@/Logger';
-import { getConnectionOptions } from '@/Db';
+import { Command, Flags } from '@oclif/core';
+import type { DataSourceOptions as ConnectionOptions } from '@n8n/typeorm';
+import { DataSource as Connection } from '@n8n/typeorm';
+import { Container } from 'typedi';
+import { Logger } from '@/Logger';
+import { setSchema } from '@/Db';
+import { getConnectionOptions } from '@db/config';
+import type { Migration } from '@db/types';
+import { wrapMigration } from '@db/utils/migrationHelpers';
 import config from '@/config';
 
+// This function is extracted to make it easier to unit test it.
+// Mocking turned into a mess due to this command using typeorm and the db
+// config directly and customizing and monkey patching parts.
+export async function main(
+	connectionOptions: ConnectionOptions,
+	logger: Logger,
+	DataSource: typeof Connection,
+) {
+	const dbType = config.getEnv('database.type');
+
+	(connectionOptions.migrations as Migration[]).forEach(wrapMigration);
+
+	const connection = new DataSource(connectionOptions);
+	await connection.initialize();
+	if (dbType === 'postgresdb') await setSchema(connection);
+
+	const lastMigration = connection.migrations.at(-1);
+
+	if (lastMigration === undefined) {
+		logger.error('There is no migration to reverse.');
+		return;
+	}
+
+	if (!lastMigration.down) {
+		logger.error('The last migration was irreversible and cannot be reverted.');
+		return;
+	}
+
+	await connection.undoLastMigration();
+	await connection.destroy();
+}
+
 export class DbRevertMigrationCommand extends Command {
 	static description = 'Revert last database migration';
 
 	static examples = ['$ n8n db:revert'];
 
 	static flags = {
-		help: flags.help({ char: 'h' }),
+		help: Flags.help({ char: 'h' }),
 	};
 
-	protected logger = LoggerProxy.init(getLogger());
+	protected logger = Container.get(Logger);
 
 	private connection: Connection;
 
 	async init() {
-		this.parse(DbRevertMigrationCommand);
+		await this.parse(DbRevertMigrationCommand);
 	}
 
 	async run() {
-		const dbType = config.getEnv('database.type');
 		const connectionOptions: ConnectionOptions = {
-			...getConnectionOptions(dbType),
+			...getConnectionOptions(),
 			subscribers: [],
 			synchronize: false,
 			migrationsRun: false,
@@ -34,10 +68,7 @@ export class DbRevertMigrationCommand extends Command {
 			logging: ['query', 'error', 'schema'],
 		};
 
-		this.connection = new Connection(connectionOptions);
-		await this.connection.initialize();
-		await this.connection.undoLastMigration();
-		await this.connection.destroy();
+		return await main(connectionOptions, this.logger, Connection);
 	}
 
 	async catch(error: Error) {
diff --git a/packages/cli/src/commands/execute.ts b/packages/cli/src/commands/execute.ts
index 16631a962e0e2..a375d19c31034 100644
--- a/packages/cli/src/commands/execute.ts
+++ b/packages/cli/src/commands/execute.ts
@@ -1,95 +1,60 @@
-import { promises as fs } from 'fs';
-import { flags } from '@oclif/command';
-import { PLACEHOLDER_EMPTY_WORKFLOW_ID } from 'n8n-core';
+import { Container } from 'typedi';
+import { Flags } from '@oclif/core';
 import type { IWorkflowBase } from 'n8n-workflow';
-import { ExecutionBaseError } from 'n8n-workflow';
+import { ApplicationError, ExecutionBaseError } from 'n8n-workflow';
 
 import { ActiveExecutions } from '@/ActiveExecutions';
-import * as Db from '@/Db';
 import { WorkflowRunner } from '@/WorkflowRunner';
 import type { IWorkflowExecutionDataProcess } from '@/Interfaces';
-import { getInstanceOwner } from '@/UserManagement/UserManagementHelper';
 import { findCliWorkflowStart, isWorkflowIdValid } from '@/utils';
-import { initEvents } from '@/events';
 import { BaseCommand } from './BaseCommand';
-import { Container } from 'typedi';
+
+import { WorkflowRepository } from '@db/repositories/workflow.repository';
+import { OwnershipService } from '@/services/ownership.service';
 
 export class Execute extends BaseCommand {
 	static description = '\nExecutes a given workflow';
 
-	static examples = ['$ n8n execute --id=5', '$ n8n execute --file=workflow.json'];
+	static examples = ['$ n8n execute --id=5'];
 
 	static flags = {
-		help: flags.help({ char: 'h' }),
-		file: flags.string({
-			description: 'path to a workflow file to execute',
-		}),
-		id: flags.string({
+		help: Flags.help({ char: 'h' }),
+		id: Flags.string({
 			description: 'id of the workflow to execute',
 		}),
-		rawOutput: flags.boolean({
+		rawOutput: Flags.boolean({
 			description: 'Outputs only JSON data, with no other text',
 		}),
 	};
 
 	async init() {
 		await super.init();
-		await this.initBinaryManager();
+		await this.initBinaryDataService();
 		await this.initExternalHooks();
-
-		// Add event handlers
-		initEvents();
 	}
 
 	async run() {
-		// eslint-disable-next-line @typescript-eslint/no-shadow
-		const { flags } = this.parse(Execute);
+		const { flags } = await this.parse(Execute);
 
-		if (!flags.id && !flags.file) {
-			this.logger.info('Either option "--id" or "--file" have to be set!');
+		if (!flags.id) {
+			this.logger.info('"--id" has to be set!');
 			return;
 		}
 
-		if (flags.id && flags.file) {
-			this.logger.info('Either "id" or "file" can be set never both!');
-			return;
+		if (flags.file) {
+			throw new ApplicationError(
+				'The --file flag is no longer supported. Please first import the workflow and then execute it using the --id flag.',
+				{ level: 'warning' },
+			);
 		}
 
 		let workflowId: string | undefined;
 		let workflowData: IWorkflowBase | null = null;
-		if (flags.file) {
-			// Path to workflow is given
-			try {
-				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-				workflowData = JSON.parse(await fs.readFile(flags.file, 'utf8'));
-			} catch (error) {
-				// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-				if (error.code === 'ENOENT') {
-					this.logger.info(`The file "${flags.file}" could not be found.`);
-					return;
-				}
-
-				throw error;
-			}
-
-			// Do a basic check if the data in the file looks right
-			// TODO: Later check with the help of TypeScript data if it is valid or not
-			if (
-				workflowData === null ||
-				workflowData.nodes === undefined ||
-				workflowData.connections === undefined
-			) {
-				this.logger.info(`The file "${flags.file}" does not contain valid workflow data.`);
-				return;
-			}
-
-			workflowId = workflowData.id ?? PLACEHOLDER_EMPTY_WORKFLOW_ID;
-		}
 
 		if (flags.id) {
 			// Id of workflow is given
 			workflowId = flags.id;
-			workflowData = await Db.collections.Workflow.findOneBy({ id: workflowId });
+			workflowData = await Container.get(WorkflowRepository).findOneBy({ id: workflowId });
 			if (workflowData === null) {
 				this.logger.info(`The workflow with the id "${workflowId}" does not exist.`);
 				process.exit(1);
@@ -97,7 +62,7 @@ export class Execute extends BaseCommand {
 		}
 
 		if (!workflowData) {
-			throw new Error('Failed to retrieve workflow data for requested workflow');
+			throw new ApplicationError('Failed to retrieve workflow data for requested workflow');
 		}
 
 		if (!isWorkflowIdValid(workflowId)) {
@@ -106,22 +71,21 @@ export class Execute extends BaseCommand {
 
 		const startingNode = findCliWorkflowStart(workflowData.nodes);
 
-		const user = await getInstanceOwner();
+		const user = await Container.get(OwnershipService).getInstanceOwner();
 		const runData: IWorkflowExecutionDataProcess = {
 			executionMode: 'cli',
-			startNodes: [startingNode.name],
+			startNodes: [{ name: startingNode.name, sourceData: null }],
 			workflowData,
 			userId: user.id,
 		};
 
-		const workflowRunner = new WorkflowRunner();
-		const executionId = await workflowRunner.run(runData);
+		const executionId = await Container.get(WorkflowRunner).run(runData);
 
 		const activeExecutions = Container.get(ActiveExecutions);
 		const data = await activeExecutions.getPostExecutePromise(executionId);
 
 		if (data === undefined) {
-			throw new Error('Workflow did not return any data!');
+			throw new ApplicationError('Workflow did not return any data');
 		}
 
 		if (data.data.resultData.error) {
diff --git a/packages/cli/src/commands/executeBatch.ts b/packages/cli/src/commands/executeBatch.ts
index f0c60bf20f749..cd01c9c99b207 100644
--- a/packages/cli/src/commands/executeBatch.ts
+++ b/packages/cli/src/commands/executeBatch.ts
@@ -1,22 +1,30 @@
 /* eslint-disable @typescript-eslint/no-loop-func */
+import { Container } from 'typedi';
+import { Flags } from '@oclif/core';
 import fs from 'fs';
-import { flags } from '@oclif/command';
-import type { ITaskData } from 'n8n-workflow';
-import { sleep } from 'n8n-workflow';
+import os from 'os';
+import type { IRun, ITaskData } from 'n8n-workflow';
+import { ApplicationError, jsonParse } from 'n8n-workflow';
 import { sep } from 'path';
 import { diff } from 'json-diff';
-import pick from 'lodash.pick';
+import pick from 'lodash/pick';
 
 import { ActiveExecutions } from '@/ActiveExecutions';
-import * as Db from '@/Db';
 import { WorkflowRunner } from '@/WorkflowRunner';
 import type { IWorkflowDb, IWorkflowExecutionDataProcess } from '@/Interfaces';
 import type { User } from '@db/entities/User';
-import { getInstanceOwner } from '@/UserManagement/UserManagementHelper';
+import { WorkflowRepository } from '@db/repositories/workflow.repository';
+import { OwnershipService } from '@/services/ownership.service';
 import { findCliWorkflowStart } from '@/utils';
-import { initEvents } from '@/events';
+
 import { BaseCommand } from './BaseCommand';
-import { Container } from 'typedi';
+import type {
+	IExecutionResult,
+	INodeSpecialCase,
+	INodeSpecialCases,
+	IResult,
+	IWorkflowExecutionProgress,
+} from '../types/commands.types';
 
 const re = /\d+/;
 
@@ -35,6 +43,8 @@ export class ExecuteBatch extends BaseCommand {
 
 	static concurrency = 1;
 
+	static githubWorkflow = false;
+
 	static debug = false;
 
 	static executionTimeout = 3 * 60 * 1000;
@@ -51,43 +61,49 @@ export class ExecuteBatch extends BaseCommand {
 	];
 
 	static flags = {
-		help: flags.help({ char: 'h' }),
-		debug: flags.boolean({
+		help: Flags.help({ char: 'h' }),
+		debug: Flags.boolean({
 			description: 'Toggles on displaying all errors and debug messages.',
 		}),
-		ids: flags.string({
+		ids: Flags.string({
 			description:
 				'Specifies workflow IDs to get executed, separated by a comma or a file containing the ids',
 		}),
-		concurrency: flags.integer({
+		concurrency: Flags.integer({
 			default: 1,
 			description:
 				'How many workflows can run in parallel. Defaults to 1 which means no concurrency.',
 		}),
-		output: flags.string({
+		output: Flags.string({
 			description:
 				'Enable execution saving, You must inform an existing folder to save execution via this param',
 		}),
-		snapshot: flags.string({
+		snapshot: Flags.string({
 			description:
 				'Enables snapshot saving. You must inform an existing folder to save snapshots via this param.',
 		}),
-		compare: flags.string({
+		compare: Flags.string({
 			description:
 				'Compares current execution with an existing snapshot. You must inform an existing folder where the snapshots are saved.',
 		}),
-		shallow: flags.boolean({
+		shallow: Flags.boolean({
 			description:
 				'Compares only if attributes output from node are the same, with no regards to nested JSON objects.',
 		}),
-		skipList: flags.string({
+
+		githubWorkflow: Flags.boolean({
+			description:
+				'Enables more lenient comparison for GitHub workflows. This is useful for reducing false positives when comparing Test workflows.',
+		}),
+
+		skipList: Flags.string({
 			description: 'File containing a comma separated list of workflow IDs to skip.',
 		}),
-		retries: flags.integer({
+		retries: Flags.integer({
 			description: 'Retries failed workflows up to N tries. Default is 1. Set 0 to disable.',
 			default: 1,
 		}),
-		shortOutput: flags.boolean({
+		shortOutput: Flags.boolean({
 			description: 'Omits the full execution information from output, displaying only summary.',
 		}),
 	};
@@ -102,28 +118,9 @@ export class ExecuteBatch extends BaseCommand {
 		}
 
 		ExecuteBatch.cancelled = true;
-		const activeExecutionsInstance = Container.get(ActiveExecutions);
-		const stopPromises = activeExecutionsInstance
-			.getActiveExecutions()
-			.map(async (execution) => activeExecutionsInstance.stopExecution(execution.id));
-
-		await Promise.allSettled(stopPromises);
 
-		setTimeout(() => process.exit(0), 30000);
+		await Container.get(ActiveExecutions).shutdown(true);
 
-		let executingWorkflows = activeExecutionsInstance.getActiveExecutions();
-
-		let count = 0;
-		while (executingWorkflows.length !== 0) {
-			if (count++ % 4 === 0) {
-				console.log(`Waiting for ${executingWorkflows.length} active executions to finish...`);
-				executingWorkflows.map((execution) => {
-					console.log(` - Execution ID ${execution.id}, workflow ID: ${execution.workflowId}`);
-				});
-			}
-			await sleep(500);
-			executingWorkflows = activeExecutionsInstance.getActiveExecutions();
-		}
 		// We may receive true but when called from `process.on`
 		// we get the signal (SIGINT, etc.)
 		if (skipExit !== true) {
@@ -165,17 +162,13 @@ export class ExecuteBatch extends BaseCommand {
 
 	async init() {
 		await super.init();
-		await this.initBinaryManager();
+		await this.initBinaryDataService();
 		await this.initExternalHooks();
-
-		// Add event handlers
-		initEvents();
 	}
 
+	// eslint-disable-next-line complexity
 	async run() {
-		// eslint-disable-next-line @typescript-eslint/no-shadow
-		const { flags } = this.parse(ExecuteBatch);
-
+		const { flags } = await this.parse(ExecuteBatch);
 		ExecuteBatch.debug = flags.debug;
 		ExecuteBatch.concurrency = flags.concurrency || 1;
 
@@ -185,11 +178,11 @@ export class ExecuteBatch extends BaseCommand {
 		if (flags.snapshot !== undefined) {
 			if (fs.existsSync(flags.snapshot)) {
 				if (!fs.lstatSync(flags.snapshot).isDirectory()) {
-					console.log('The parameter --snapshot must be an existing directory');
+					this.logger.error('The parameter --snapshot must be an existing directory');
 					return;
 				}
 			} else {
-				console.log('The parameter --snapshot must be an existing directory');
+				this.logger.error('The parameter --snapshot must be an existing directory');
 				return;
 			}
 
@@ -198,11 +191,11 @@ export class ExecuteBatch extends BaseCommand {
 		if (flags.compare !== undefined) {
 			if (fs.existsSync(flags.compare)) {
 				if (!fs.lstatSync(flags.compare).isDirectory()) {
-					console.log('The parameter --compare must be an existing directory');
+					this.logger.error('The parameter --compare must be an existing directory');
 					return;
 				}
 			} else {
-				console.log('The parameter --compare must be an existing directory');
+				this.logger.error('The parameter --compare must be an existing directory');
 				return;
 			}
 
@@ -212,7 +205,7 @@ export class ExecuteBatch extends BaseCommand {
 		if (flags.output !== undefined) {
 			if (fs.existsSync(flags.output)) {
 				if (fs.lstatSync(flags.output).isDirectory()) {
-					console.log('The parameter --output must be a writable file');
+					this.logger.error('The parameter --output must be a writable file');
 					return;
 				}
 			}
@@ -221,13 +214,18 @@ export class ExecuteBatch extends BaseCommand {
 		if (flags.ids !== undefined) {
 			if (fs.existsSync(flags.ids)) {
 				const contents = fs.readFileSync(flags.ids, { encoding: 'utf-8' });
-				ids.push(...contents.split(',').filter((id) => re.exec(id)));
+				ids.push(
+					...contents
+						.trimEnd()
+						.split(',')
+						.filter((id) => re.exec(id)),
+				);
 			} else {
 				const paramIds = flags.ids.split(',');
 				const matchedIds = paramIds.filter((id) => re.exec(id));
 
 				if (matchedIds.length === 0) {
-					console.log(
+					this.logger.error(
 						'The parameter --ids must be a list of numeric IDs separated by a comma or a file with this content.',
 					);
 					return;
@@ -240,9 +238,14 @@ export class ExecuteBatch extends BaseCommand {
 		if (flags.skipList !== undefined) {
 			if (fs.existsSync(flags.skipList)) {
 				const contents = fs.readFileSync(flags.skipList, { encoding: 'utf-8' });
-				skipIds.push(...contents.split(',').filter((id) => re.exec(id)));
+				skipIds.push(
+					...contents
+						.trimEnd()
+						.split(',')
+						.filter((id) => re.exec(id)),
+				);
 			} else {
-				console.log('Skip list file not found. Exiting.');
+				this.logger.error('Skip list file not found. Exiting.');
 				return;
 			}
 		}
@@ -251,9 +254,13 @@ export class ExecuteBatch extends BaseCommand {
 			ExecuteBatch.shallow = true;
 		}
 
-		ExecuteBatch.instanceOwner = await getInstanceOwner();
+		if (flags.githubWorkflow) {
+			ExecuteBatch.githubWorkflow = true;
+		}
 
-		const query = Db.collections.Workflow.createQueryBuilder('workflows');
+		ExecuteBatch.instanceOwner = await Container.get(OwnershipService).getInstanceOwner();
+
+		const query = Container.get(WorkflowRepository).createQueryBuilder('workflows');
 
 		if (ids.length > 0) {
 			query.andWhere('workflows.id in (:...ids)', { ids });
@@ -295,18 +302,18 @@ export class ExecuteBatch extends BaseCommand {
 
 		if (flags.output !== undefined) {
 			fs.writeFileSync(flags.output, this.formatJsonOutput(results));
-			console.log('\nExecution finished.');
-			console.log('Summary:');
-			console.log(`\tSuccess: ${results.summary.successfulExecutions}`);
-			console.log(`\tFailures: ${results.summary.failedExecutions}`);
-			console.log(`\tWarnings: ${results.summary.warningExecutions}`);
-			console.log('\nNodes successfully tested:');
+			this.logger.info('\nExecution finished.');
+			this.logger.info('Summary:');
+			this.logger.info(`\tSuccess: ${results.summary.successfulExecutions}`);
+			this.logger.info(`\tFailures: ${results.summary.failedExecutions}`);
+			this.logger.info(`\tWarnings: ${results.summary.warningExecutions}`);
+			this.logger.info('\nNodes successfully tested:');
 			Object.entries(results.coveredNodes).forEach(([nodeName, nodeCount]) => {
-				console.log(`\t${nodeName}: ${nodeCount}`);
+				this.logger.info(`\t${nodeName}: ${nodeCount}`);
 			});
-			console.log('\nCheck the JSON file for more details.');
+			this.logger.info('\nCheck the JSON file for more details.');
 		} else if (flags.shortOutput) {
-			console.log(
+			this.logger.info(
 				this.formatJsonOutput({
 					...results,
 					executions: results.executions.filter(
@@ -315,7 +322,7 @@ export class ExecuteBatch extends BaseCommand {
 				}),
 			);
 		} else {
-			console.log(this.formatJsonOutput(results));
+			this.logger.info(this.formatJsonOutput(results));
 		}
 
 		await this.stopProcess(true);
@@ -369,6 +376,7 @@ export class ExecuteBatch extends BaseCommand {
 	private async runTests(allWorkflows: IWorkflowDb[]): Promise<IResult> {
 		const result: IResult = {
 			totalWorkflows: allWorkflows.length,
+			slackMessage: '',
 			summary: {
 				failedExecutions: 0,
 				warningExecutions: 0,
@@ -384,7 +392,7 @@ export class ExecuteBatch extends BaseCommand {
 			this.initializeLogs();
 		}
 
-		return new Promise(async (res) => {
+		return await new Promise(async (res) => {
 			const promisesArray = [];
 			for (let i = 0; i < ExecuteBatch.concurrency; i++) {
 				const promise = new Promise(async (resolve) => {
@@ -460,7 +468,7 @@ export class ExecuteBatch extends BaseCommand {
 									this.updateStatus();
 								}
 							} else {
-								throw new Error('Wrong execution status - cannot proceed');
+								throw new ApplicationError('Wrong execution status - cannot proceed');
 							}
 						});
 					}
@@ -472,11 +480,30 @@ export class ExecuteBatch extends BaseCommand {
 			}
 
 			await Promise.allSettled(promisesArray);
-
+			if (ExecuteBatch.githubWorkflow) {
+				if (result.summary.errors.length < 6) {
+					const errorMessage = result.summary.errors.map((error) => {
+						return `*${error.workflowId}*: ${error.error}`;
+					});
+					result.slackMessage = `*${
+						result.summary.errors.length
+					} Executions errors*. Workflows failing: ${errorMessage.join(' ')} `;
+				} else {
+					result.slackMessage = `*${result.summary.errors.length} Executions errors*`;
+				}
+				this.setOutput('slackMessage', JSON.stringify(result.slackMessage));
+			}
 			res(result);
 		});
 	}
 
+	setOutput(key: string, value: any) {
+		// Temporary hack until we move to the new action.
+		const output = process.env.GITHUB_OUTPUT;
+
+		fs.appendFileSync(output as unknown as fs.PathOrFileDescriptor, `${key}=${value}${os.EOL}`);
+	}
+
 	updateStatus() {
 		if (ExecuteBatch.cancelled) {
 			return;
@@ -578,7 +605,7 @@ export class ExecuteBatch extends BaseCommand {
 			}
 		});
 
-		return new Promise(async (resolve) => {
+		return await new Promise(async (resolve) => {
 			let gotCancel = false;
 
 			// Timeouts execution after 5 minutes.
@@ -594,13 +621,12 @@ export class ExecuteBatch extends BaseCommand {
 
 				const runData: IWorkflowExecutionDataProcess = {
 					executionMode: 'cli',
-					startNodes: [startingNode.name],
+					startNodes: [{ name: startingNode.name, sourceData: null }],
 					workflowData,
 					userId: ExecuteBatch.instanceOwner.id,
 				};
 
-				const workflowRunner = new WorkflowRunner();
-				const executionId = await workflowRunner.run(runData);
+				const executionId = await Container.get(WorkflowRunner).run(runData);
 
 				const activeExecutions = Container.get(ActiveExecutions);
 				const data = await activeExecutions.getPostExecutePromise(executionId);
@@ -622,11 +648,7 @@ export class ExecuteBatch extends BaseCommand {
 
 					const resultError = data.data.resultData.error;
 					if (resultError) {
-						// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-						executionResult.error =
-							resultError.hasOwnProperty('description') && resultError.description !== null
-								? resultError.description
-								: resultError.message;
+						executionResult.error = resultError.description || resultError.message;
 						if (data.data.resultData.lastNodeExecuted !== undefined) {
 							executionResult.error += ` on node ${data.data.resultData.lastNodeExecuted}`;
 						}
@@ -746,8 +768,9 @@ export class ExecuteBatch extends BaseCommand {
 							}${workflowData.id}-snapshot.json`;
 							if (fs.existsSync(fileName)) {
 								const contents = fs.readFileSync(fileName, { encoding: 'utf-8' });
-
-								const changes = diff(JSON.parse(contents), data, { keysOnly: true });
+								const expected = jsonParse<IRun>(contents);
+								const received = jsonParse<IRun>(serializedData);
+								const changes = diff(expected, received, { keysOnly: true }) as object;
 
 								if (changes !== undefined) {
 									// If we had only additions with no removals
@@ -756,8 +779,13 @@ export class ExecuteBatch extends BaseCommand {
 									// and search for the `__deleted` string
 									const changesJson = JSON.stringify(changes);
 									if (changesJson.includes('__deleted')) {
-										// we have structural changes. Report them.
-										executionResult.error = 'Workflow may contain breaking changes';
+										if (ExecuteBatch.githubWorkflow) {
+											const deletedChanges = changesJson.match(/__deleted/g) ?? [];
+											// we have structural changes. Report them.
+											executionResult.error = `Workflow contains ${deletedChanges.length} deleted data.`;
+										} else {
+											executionResult.error = 'Workflow may contain breaking changes';
+										}
 										executionResult.changes = changes;
 										executionResult.executionStatus = 'error';
 									} else {
diff --git a/packages/cli/src/commands/export/credentials.ts b/packages/cli/src/commands/export/credentials.ts
index 7d8734f13aa96..5fb10dcb2caa0 100644
--- a/packages/cli/src/commands/export/credentials.ts
+++ b/packages/cli/src/commands/export/credentials.ts
@@ -1,11 +1,12 @@
-import { flags } from '@oclif/command';
+import { Flags } from '@oclif/core';
 import fs from 'fs';
 import path from 'path';
-import type { FindOptionsWhere } from 'typeorm';
-import { Credentials, UserSettings } from 'n8n-core';
-import * as Db from '@/Db';
+import { Credentials } from 'n8n-core';
 import type { ICredentialsDb, ICredentialsDecryptedDb } from '@/Interfaces';
 import { BaseCommand } from '../BaseCommand';
+import { CredentialsRepository } from '@db/repositories/credentials.repository';
+import Container from 'typedi';
+import { ApplicationError } from 'n8n-workflow';
 
 export class ExportCredentialsCommand extends BaseCommand {
 	static description = 'Export credentials';
@@ -19,37 +20,37 @@ export class ExportCredentialsCommand extends BaseCommand {
 	];
 
 	static flags = {
-		help: flags.help({ char: 'h' }),
-		all: flags.boolean({
+		help: Flags.help({ char: 'h' }),
+		all: Flags.boolean({
 			description: 'Export all credentials',
 		}),
-		backup: flags.boolean({
+		backup: Flags.boolean({
 			description:
 				'Sets --all --pretty --separate for simple backups. Only --output has to be set additionally.',
 		}),
-		id: flags.string({
+		id: Flags.string({
 			description: 'The ID of the credential to export',
 		}),
-		output: flags.string({
+		output: Flags.string({
 			char: 'o',
 			description: 'Output file name or directory if using separate files',
 		}),
-		pretty: flags.boolean({
+		pretty: Flags.boolean({
 			description: 'Format the output in an easier to read fashion',
 		}),
-		separate: flags.boolean({
+		separate: Flags.boolean({
 			description:
 				'Exports one file per credential (useful for versioning). Must inform a directory via --output.',
 		}),
-		decrypted: flags.boolean({
+		decrypted: Flags.boolean({
 			description:
 				'Exports data decrypted / in plain text. ALL SENSITIVE INFORMATION WILL BE VISIBLE IN THE FILES. Use to migrate from a installation to another that have a different secret key (in the config file).',
 		}),
 	};
 
+	// eslint-disable-next-line complexity
 	async run() {
-		// eslint-disable-next-line @typescript-eslint/no-shadow
-		const { flags } = this.parse(ExportCredentialsCommand);
+		const { flags } = await this.parse(ExportCredentialsCommand);
 
 		if (flags.backup) {
 			flags.all = true;
@@ -105,27 +106,22 @@ export class ExportCredentialsCommand extends BaseCommand {
 			}
 		}
 
-		const findQuery: FindOptionsWhere<ICredentialsDb> = {};
-		if (flags.id) {
-			findQuery.id = flags.id;
-		}
-
-		const credentials: ICredentialsDb[] = await Db.collections.Credentials.findBy(findQuery);
+		const credentials: ICredentialsDb[] = await Container.get(CredentialsRepository).findBy(
+			flags.id ? { id: flags.id } : {},
+		);
 
 		if (flags.decrypted) {
-			const encryptionKey = await UserSettings.getEncryptionKey();
-
 			for (let i = 0; i < credentials.length; i++) {
-				const { name, type, nodesAccess, data } = credentials[i];
+				const { name, type, data } = credentials[i];
 				const id = credentials[i].id;
-				const credential = new Credentials({ id, name }, type, nodesAccess, data);
-				const plainData = credential.getData(encryptionKey);
+				const credential = new Credentials({ id, name }, type, data);
+				const plainData = credential.getData();
 				(credentials[i] as ICredentialsDecryptedDb).data = plainData;
 			}
 		}
 
 		if (credentials.length === 0) {
-			throw new Error('No credentials found with specified filters.');
+			throw new ApplicationError('No credentials found with specified filters');
 		}
 
 		if (flags.separate) {
@@ -134,7 +130,6 @@ export class ExportCredentialsCommand extends BaseCommand {
 			for (i = 0; i < credentials.length; i++) {
 				fileContents = JSON.stringify(credentials[i], null, flags.pretty ? 2 : undefined);
 				const filename = `${
-					// eslint-disable-next-line @typescript-eslint/no-non-null-assertion, @typescript-eslint/restrict-plus-operands
 					(flags.output!.endsWith(path.sep) ? flags.output! : flags.output + path.sep) +
 					credentials[i].id
 				}.json`;
diff --git a/packages/cli/src/commands/export/workflow.ts b/packages/cli/src/commands/export/workflow.ts
index 69f795e5bc998..19aa2b9e0876b 100644
--- a/packages/cli/src/commands/export/workflow.ts
+++ b/packages/cli/src/commands/export/workflow.ts
@@ -1,10 +1,10 @@
-import { flags } from '@oclif/command';
+import { Flags } from '@oclif/core';
 import fs from 'fs';
 import path from 'path';
-import type { FindOptionsWhere } from 'typeorm';
-import * as Db from '@/Db';
-import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
 import { BaseCommand } from '../BaseCommand';
+import { WorkflowRepository } from '@db/repositories/workflow.repository';
+import Container from 'typedi';
+import { ApplicationError } from 'n8n-workflow';
 
 export class ExportWorkflowsCommand extends BaseCommand {
 	static description = 'Export workflows';
@@ -17,33 +17,33 @@ export class ExportWorkflowsCommand extends BaseCommand {
 	];
 
 	static flags = {
-		help: flags.help({ char: 'h' }),
-		all: flags.boolean({
+		help: Flags.help({ char: 'h' }),
+		all: Flags.boolean({
 			description: 'Export all workflows',
 		}),
-		backup: flags.boolean({
+		backup: Flags.boolean({
 			description:
 				'Sets --all --pretty --separate for simple backups. Only --output has to be set additionally.',
 		}),
-		id: flags.string({
+		id: Flags.string({
 			description: 'The ID of the workflow to export',
 		}),
-		output: flags.string({
+		output: Flags.string({
 			char: 'o',
 			description: 'Output file name or directory if using separate files',
 		}),
-		pretty: flags.boolean({
+		pretty: Flags.boolean({
 			description: 'Format the output in an easier to read fashion',
 		}),
-		separate: flags.boolean({
+		separate: Flags.boolean({
 			description:
 				'Exports one file per workflow (useful for versioning). Must inform a directory via --output.',
 		}),
 	};
 
+	// eslint-disable-next-line complexity
 	async run() {
-		// eslint-disable-next-line @typescript-eslint/no-shadow
-		const { flags } = this.parse(ExportWorkflowsCommand);
+		const { flags } = await this.parse(ExportWorkflowsCommand);
 
 		if (flags.backup) {
 			flags.all = true;
@@ -99,18 +99,13 @@ export class ExportWorkflowsCommand extends BaseCommand {
 			}
 		}
 
-		const findQuery: FindOptionsWhere<WorkflowEntity> = {};
-		if (flags.id) {
-			findQuery.id = flags.id;
-		}
-
-		const workflows = await Db.collections.Workflow.find({
-			where: findQuery,
+		const workflows = await Container.get(WorkflowRepository).find({
+			where: flags.id ? { id: flags.id } : {},
 			relations: ['tags'],
 		});
 
 		if (workflows.length === 0) {
-			throw new Error('No workflows found with specified filters.');
+			throw new ApplicationError('No workflows found with specified filters');
 		}
 
 		if (flags.separate) {
@@ -119,7 +114,6 @@ export class ExportWorkflowsCommand extends BaseCommand {
 			for (i = 0; i < workflows.length; i++) {
 				fileContents = JSON.stringify(workflows[i], null, flags.pretty ? 2 : undefined);
 				const filename = `${
-					// eslint-disable-next-line @typescript-eslint/restrict-plus-operands, @typescript-eslint/no-non-null-assertion
 					(flags.output!.endsWith(path.sep) ? flags.output! : flags.output + path.sep) +
 					workflows[i].id
 				}.json`;
diff --git a/packages/cli/src/commands/import/credentials.ts b/packages/cli/src/commands/import/credentials.ts
index 27af3b12b63da..52440e1149bf7 100644
--- a/packages/cli/src/commands/import/credentials.ts
+++ b/packages/cli/src/commands/import/credentials.ts
@@ -1,20 +1,20 @@
-import { flags } from '@oclif/command';
-import { Credentials } from 'n8n-core';
+import { Container } from 'typedi';
+import { Flags } from '@oclif/core';
+import { Cipher } from 'n8n-core';
 import fs from 'fs';
 import glob from 'fast-glob';
-import { Container } from 'typedi';
-import type { EntityManager } from 'typeorm';
-import config from '@/config';
+import type { EntityManager } from '@n8n/typeorm';
+
 import * as Db from '@/Db';
 import type { User } from '@db/entities/User';
 import { SharedCredentials } from '@db/entities/SharedCredentials';
-import type { Role } from '@db/entities/Role';
 import { CredentialsEntity } from '@db/entities/CredentialsEntity';
-import { RoleRepository } from '@db/repositories';
 import { disableAutoGeneratedIds } from '@db/utils/commandHelpers';
-import { BaseCommand, UM_FIX_INSTRUCTION } from '../BaseCommand';
+import { BaseCommand } from '../BaseCommand';
 import type { ICredentialsEncrypted } from 'n8n-workflow';
-import { jsonParse } from 'n8n-workflow';
+import { ApplicationError, jsonParse } from 'n8n-workflow';
+import { UM_FIX_INSTRUCTION } from '@/constants';
+import { UserRepository } from '@db/repositories/user.repository';
 
 export class ImportCredentialsCommand extends BaseCommand {
 	static description = 'Import credentials';
@@ -27,21 +27,19 @@ export class ImportCredentialsCommand extends BaseCommand {
 	];
 
 	static flags = {
-		help: flags.help({ char: 'h' }),
-		input: flags.string({
+		help: Flags.help({ char: 'h' }),
+		input: Flags.string({
 			char: 'i',
 			description: 'Input file name or directory if --separate is used',
 		}),
-		separate: flags.boolean({
+		separate: Flags.boolean({
 			description: 'Imports *.json files from directory provided by --input',
 		}),
-		userId: flags.string({
+		userId: Flags.string({
 			description: 'The ID of the user to assign the imported credentials to',
 		}),
 	};
 
-	private ownerCredentialRole: Role;
-
 	private transactionManager: EntityManager;
 
 	async init() {
@@ -50,8 +48,7 @@ export class ImportCredentialsCommand extends BaseCommand {
 	}
 
 	async run(): Promise<void> {
-		// eslint-disable-next-line @typescript-eslint/no-shadow
-		const { flags } = this.parse(ImportCredentialsCommand);
+		const { flags } = await this.parse(ImportCredentialsCommand);
 
 		if (!flags.input) {
 			this.logger.info('An input file or directory with --input must be provided');
@@ -67,71 +64,25 @@ export class ImportCredentialsCommand extends BaseCommand {
 			}
 		}
 
-		let totalImported = 0;
-
-		await this.initOwnerCredentialRole();
 		const user = flags.userId ? await this.getAssignee(flags.userId) : await this.getOwner();
 
-		const encryptionKey = this.userSettings.encryptionKey;
-
-		if (flags.separate) {
-			let { input: inputPath } = flags;
-
-			if (process.platform === 'win32') {
-				inputPath = inputPath.replace(/\\/g, '/');
-			}
-
-			const files = await glob('*.json', {
-				cwd: inputPath,
-				absolute: true,
-			});
-
-			totalImported = files.length;
-
-			await Db.getConnection().transaction(async (transactionManager) => {
-				this.transactionManager = transactionManager;
-				for (const file of files) {
-					const credential = jsonParse<ICredentialsEncrypted>(
-						fs.readFileSync(file, { encoding: 'utf8' }),
-					);
+		const credentials = await this.readCredentials(flags.input, flags.separate);
 
-					if (typeof credential.data === 'object') {
-						// plain data / decrypted input. Should be encrypted first.
-						Credentials.prototype.setData.call(credential, credential.data, encryptionKey);
-					}
-
-					await this.storeCredential(credential, user);
-				}
-			});
-
-			this.reportSuccess(totalImported);
-			return;
-		}
-
-		const credentials = jsonParse<ICredentialsEncrypted[]>(
-			fs.readFileSync(flags.input, { encoding: 'utf8' }),
-		);
+		await Db.getConnection().transaction(async (transactionManager) => {
+			this.transactionManager = transactionManager;
 
-		totalImported = credentials.length;
+			const result = await this.checkRelations(credentials, flags.userId);
 
-		if (!Array.isArray(credentials)) {
-			throw new Error(
-				'File does not seem to contain credentials. Make sure the credentials are contained in an array.',
-			);
-		}
+			if (!result.success) {
+				throw new ApplicationError(result.message);
+			}
 
-		await Db.getConnection().transaction(async (transactionManager) => {
-			this.transactionManager = transactionManager;
 			for (const credential of credentials) {
-				if (typeof credential.data === 'object') {
-					// plain data / decrypted input. Should be encrypted first.
-					Credentials.prototype.setData.call(credential, credential.data, encryptionKey);
-				}
 				await this.storeCredential(credential, user);
 			}
 		});
 
-		this.reportSuccess(totalImported);
+		this.reportSuccess(credentials.length);
 	}
 
 	async catch(error: Error) {
@@ -147,56 +98,134 @@ export class ImportCredentialsCommand extends BaseCommand {
 		);
 	}
 
-	private async initOwnerCredentialRole() {
-		const ownerCredentialRole = await Container.get(RoleRepository).findCredentialOwnerRole();
+	private async storeCredential(credential: Partial<CredentialsEntity>, user: User) {
+		const result = await this.transactionManager.upsert(CredentialsEntity, credential, ['id']);
 
-		if (!ownerCredentialRole) {
-			throw new Error(`Failed to find owner credential role. ${UM_FIX_INSTRUCTION}`);
+		const sharingExists = await this.transactionManager.existsBy(SharedCredentials, {
+			credentialsId: credential.id,
+			role: 'credential:owner',
+		});
+
+		if (!sharingExists) {
+			await this.transactionManager.upsert(
+				SharedCredentials,
+				{
+					credentialsId: result.identifiers[0].id as string,
+					userId: user.id,
+					role: 'credential:owner',
+				},
+				['credentialsId', 'userId'],
+			);
 		}
+	}
 
-		this.ownerCredentialRole = ownerCredentialRole;
+	private async getOwner() {
+		const owner = await Container.get(UserRepository).findOneBy({ role: 'global:owner' });
+		if (!owner) {
+			throw new ApplicationError(`Failed to find owner. ${UM_FIX_INSTRUCTION}`);
+		}
+
+		return owner;
 	}
 
-	private async storeCredential(credential: object, user: User) {
-		const result = await this.transactionManager.upsert(CredentialsEntity, credential, ['id']);
-		await this.transactionManager.upsert(
-			SharedCredentials,
-			{
-				credentialsId: result.identifiers[0].id as string,
-				userId: user.id,
-				roleId: this.ownerCredentialRole.id,
-			},
-			['credentialsId', 'userId'],
-		);
-		if (config.getEnv('database.type') === 'postgresdb') {
-			const tablePrefix = config.getEnv('database.tablePrefix');
-			await this.transactionManager.query(
-				`SELECT setval('${tablePrefix}credentials_entity_id_seq', (SELECT MAX(id) from ${tablePrefix}credentials_entity))`,
-			);
+	private async checkRelations(credentials: ICredentialsEncrypted[], userId?: string) {
+		if (!userId) {
+			return {
+				success: true as const,
+				message: undefined,
+			};
 		}
+
+		for (const credential of credentials) {
+			if (credential.id === undefined) {
+				continue;
+			}
+
+			if (!(await this.credentialExists(credential.id))) {
+				continue;
+			}
+
+			const ownerId = await this.getCredentialOwner(credential.id);
+			if (!ownerId) {
+				continue;
+			}
+
+			if (ownerId !== userId) {
+				return {
+					success: false as const,
+					message: `The credential with id "${credential.id}" is already owned by the user with the id "${ownerId}". It can't be re-owned by the user with the id "${userId}"`,
+				};
+			}
+		}
+
+		return {
+			success: true as const,
+			message: undefined,
+		};
 	}
 
-	private async getOwner() {
-		const ownerGlobalRole = await Container.get(RoleRepository).findGlobalOwnerRole();
+	private async readCredentials(path: string, separate: boolean): Promise<ICredentialsEncrypted[]> {
+		const cipher = Container.get(Cipher);
+
+		if (process.platform === 'win32') {
+			path = path.replace(/\\/g, '/');
+		}
 
-		const owner =
-			ownerGlobalRole &&
-			(await Db.collections.User.findOneBy({ globalRoleId: ownerGlobalRole.id }));
+		let credentials: ICredentialsEncrypted[];
 
-		if (!owner) {
-			throw new Error(`Failed to find owner. ${UM_FIX_INSTRUCTION}`);
+		if (separate) {
+			const files = await glob('*.json', {
+				cwd: path,
+				absolute: true,
+			});
+
+			credentials = files.map((file) =>
+				jsonParse<ICredentialsEncrypted>(fs.readFileSync(file, { encoding: 'utf8' })),
+			);
+		} else {
+			const credentialsUnchecked = jsonParse<ICredentialsEncrypted[]>(
+				fs.readFileSync(path, { encoding: 'utf8' }),
+			);
+
+			if (!Array.isArray(credentialsUnchecked)) {
+				throw new ApplicationError(
+					'File does not seem to contain credentials. Make sure the credentials are contained in an array.',
+				);
+			}
+
+			credentials = credentialsUnchecked;
 		}
 
-		return owner;
+		return credentials.map((credential) => {
+			if (typeof credential.data === 'object') {
+				// plain data / decrypted input. Should be encrypted first.
+				credential.data = cipher.encrypt(credential.data);
+			}
+
+			return credential;
+		});
 	}
 
 	private async getAssignee(userId: string) {
-		const user = await Db.collections.User.findOneBy({ id: userId });
+		const user = await Container.get(UserRepository).findOneBy({ id: userId });
 
 		if (!user) {
-			throw new Error(`Failed to find user with ID ${userId}`);
+			throw new ApplicationError('Failed to find user', { extra: { userId } });
 		}
 
 		return user;
 	}
+
+	private async getCredentialOwner(credentialsId: string) {
+		const sharedCredential = await this.transactionManager.findOneBy(SharedCredentials, {
+			credentialsId,
+			role: 'credential:owner',
+		});
+
+		return sharedCredential?.userId;
+	}
+
+	private async credentialExists(credentialId: string) {
+		return await this.transactionManager.existsBy(CredentialsEntity, { id: credentialId });
+	}
 }
diff --git a/packages/cli/src/commands/import/workflow.ts b/packages/cli/src/commands/import/workflow.ts
index 7faa184e5e541..40404482fb455 100644
--- a/packages/cli/src/commands/import/workflow.ts
+++ b/packages/cli/src/commands/import/workflow.ts
@@ -1,27 +1,23 @@
-import { flags } from '@oclif/command';
-import type { INode, INodeCredentialsDetails } from 'n8n-workflow';
-import { jsonParse } from 'n8n-workflow';
+import { Container } from 'typedi';
+import { Flags } from '@oclif/core';
+import { ApplicationError, jsonParse } from 'n8n-workflow';
 import fs from 'fs';
 import glob from 'fast-glob';
-import { Container } from 'typedi';
-import type { EntityManager } from 'typeorm';
-import { v4 as uuid } from 'uuid';
-import config from '@/config';
-import * as Db from '@/Db';
-import { SharedWorkflow } from '@db/entities/SharedWorkflow';
+
+import { UM_FIX_INSTRUCTION } from '@/constants';
 import { WorkflowEntity } from '@db/entities/WorkflowEntity';
-import type { Role } from '@db/entities/Role';
-import type { User } from '@db/entities/User';
-import { setTagsForImport } from '@/TagHelpers';
-import { RoleRepository } from '@db/repositories';
 import { disableAutoGeneratedIds } from '@db/utils/commandHelpers';
-import type { ICredentialsDb, IWorkflowToImport } from '@/Interfaces';
-import { replaceInvalidCredentials } from '@/WorkflowHelpers';
-import { BaseCommand, UM_FIX_INSTRUCTION } from '../BaseCommand';
+import { generateNanoId } from '@db/utils/generators';
+import { UserRepository } from '@db/repositories/user.repository';
+import { WorkflowRepository } from '@db/repositories/workflow.repository';
+import type { IWorkflowToImport } from '@/Interfaces';
+import { ImportService } from '@/services/import.service';
+import { BaseCommand } from '../BaseCommand';
+import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
 
 function assertHasWorkflowsToImport(workflows: unknown): asserts workflows is IWorkflowToImport[] {
 	if (!Array.isArray(workflows)) {
-		throw new Error(
+		throw new ApplicationError(
 			'File does not seem to contain workflows. Make sure the workflows are contained in an array.',
 		);
 	}
@@ -32,7 +28,7 @@ function assertHasWorkflowsToImport(workflows: unknown): asserts workflows is IW
 			!Object.prototype.hasOwnProperty.call(workflow, 'nodes') ||
 			!Object.prototype.hasOwnProperty.call(workflow, 'connections')
 		) {
-			throw new Error('File does not seem to contain valid workflows.');
+			throw new ApplicationError('File does not seem to contain valid workflows.');
 		}
 	}
 }
@@ -48,31 +44,26 @@ export class ImportWorkflowsCommand extends BaseCommand {
 	];
 
 	static flags = {
-		help: flags.help({ char: 'h' }),
-		input: flags.string({
+		help: Flags.help({ char: 'h' }),
+		input: Flags.string({
 			char: 'i',
 			description: 'Input file name or directory if --separate is used',
 		}),
-		separate: flags.boolean({
+		separate: Flags.boolean({
 			description: 'Imports *.json files from directory provided by --input',
 		}),
-		userId: flags.string({
+		userId: Flags.string({
 			description: 'The ID of the user to assign the imported workflows to',
 		}),
 	};
 
-	private ownerWorkflowRole: Role;
-
-	private transactionManager: EntityManager;
-
 	async init() {
 		disableAutoGeneratedIds(WorkflowEntity);
 		await super.init();
 	}
 
 	async run(): Promise<void> {
-		// eslint-disable-next-line @typescript-eslint/no-shadow
-		const { flags } = this.parse(ImportWorkflowsCommand);
+		const { flags } = await this.parse(ImportWorkflowsCommand);
 
 		if (!flags.input) {
 			this.logger.info('An input file or directory with --input must be provided');
@@ -88,113 +79,52 @@ export class ImportWorkflowsCommand extends BaseCommand {
 			}
 		}
 
-		await this.initOwnerWorkflowRole();
-		const user = flags.userId ? await this.getAssignee(flags.userId) : await this.getOwner();
-
-		const credentials = await Db.collections.Credentials.find();
-		const tags = await Db.collections.Tag.find();
+		const owner = await this.getOwner();
 
-		let totalImported = 0;
+		const workflows = await this.readWorkflows(flags.input, flags.separate);
 
-		if (flags.separate) {
-			let { input: inputPath } = flags;
+		const result = await this.checkRelations(workflows, flags.userId);
+		if (!result.success) {
+			throw new ApplicationError(result.message);
+		}
 
-			if (process.platform === 'win32') {
-				inputPath = inputPath.replace(/\\/g, '/');
-			}
+		this.logger.info(`Importing ${workflows.length} workflows...`);
 
-			const files = await glob('*.json', {
-				cwd: inputPath,
-				absolute: true,
-			});
+		await Container.get(ImportService).importWorkflows(workflows, flags.userId ?? owner.id);
 
-			totalImported = files.length;
-			this.logger.info(`Importing ${totalImported} workflows...`);
-			await Db.getConnection().transaction(async (transactionManager) => {
-				this.transactionManager = transactionManager;
-
-				for (const file of files) {
-					const workflow = jsonParse<IWorkflowToImport>(
-						fs.readFileSync(file, { encoding: 'utf8' }),
-					);
-
-					if (credentials.length > 0) {
-						workflow.nodes.forEach((node: INode) => {
-							this.transformCredentials(node, credentials);
-
-							if (!node.id) {
-								// eslint-disable-next-line no-param-reassign
-								node.id = uuid();
-							}
-						});
-					}
-
-					if (Object.prototype.hasOwnProperty.call(workflow, 'tags')) {
-						await setTagsForImport(transactionManager, workflow, tags);
-					}
-
-					if (workflow.active) {
-						this.logger.info(
-							`Deactivating workflow "${workflow.name}" during import, remember to activate it later.`,
-						);
-						workflow.active = false;
-					}
-
-					await this.storeWorkflow(workflow, user);
-				}
-			});
+		this.reportSuccess(workflows.length);
+	}
 
-			this.reportSuccess(totalImported);
-			process.exit();
+	private async checkRelations(workflows: WorkflowEntity[], userId: string | undefined) {
+		if (!userId) {
+			return {
+				success: true as const,
+				message: undefined,
+			};
 		}
 
-		const workflows = jsonParse<IWorkflowToImport[]>(
-			fs.readFileSync(flags.input, { encoding: 'utf8' }),
-		);
+		for (const workflow of workflows) {
+			if (!(await this.workflowExists(workflow))) {
+				continue;
+			}
 
-		assertHasWorkflowsToImport(workflows);
-
-		totalImported = workflows.length;
-
-		await Db.getConnection().transaction(async (transactionManager) => {
-			this.transactionManager = transactionManager;
-
-			for (const workflow of workflows) {
-				let oldCredentialFormat = false;
-				if (credentials.length > 0) {
-					workflow.nodes.forEach((node: INode) => {
-						this.transformCredentials(node, credentials);
-						if (!node.id) {
-							// eslint-disable-next-line no-param-reassign
-							node.id = uuid();
-						}
-						if (!node.credentials?.id) {
-							oldCredentialFormat = true;
-						}
-					});
-				}
-				if (oldCredentialFormat) {
-					try {
-						await replaceInvalidCredentials(workflow as unknown as WorkflowEntity);
-					} catch (error) {
-						this.logger.error('Failed to replace invalid credential', error as Error);
-					}
-				}
-				if (Object.prototype.hasOwnProperty.call(workflow, 'tags')) {
-					await setTagsForImport(transactionManager, workflow, tags);
-				}
-				if (workflow.active) {
-					this.logger.info(
-						`Deactivating workflow "${workflow.name}" during import, remember to activate it later.`,
-					);
-					workflow.active = false;
-				}
+			const ownerId = await this.getWorkflowOwner(workflow);
+			if (!ownerId) {
+				continue;
+			}
 
-				await this.storeWorkflow(workflow, user);
+			if (ownerId !== userId) {
+				return {
+					success: false as const,
+					message: `The credential with id "${workflow.id}" is already owned by the user with the id "${ownerId}". It can't be re-owned by the user with the id "${userId}"`,
+				};
 			}
-		});
+		}
 
-		this.reportSuccess(totalImported);
+		return {
+			success: true as const,
+			message: undefined,
+		};
 	}
 
 	async catch(error: Error) {
@@ -206,81 +136,57 @@ export class ImportWorkflowsCommand extends BaseCommand {
 		this.logger.info(`Successfully imported ${total} ${total === 1 ? 'workflow.' : 'workflows.'}`);
 	}
 
-	private async initOwnerWorkflowRole() {
-		const ownerWorkflowRole = await Container.get(RoleRepository).findWorkflowOwnerRole();
-
-		if (!ownerWorkflowRole) {
-			throw new Error(`Failed to find owner workflow role. ${UM_FIX_INSTRUCTION}`);
+	private async getOwner() {
+		const owner = await Container.get(UserRepository).findOneBy({ role: 'global:owner' });
+		if (!owner) {
+			throw new ApplicationError(`Failed to find owner. ${UM_FIX_INSTRUCTION}`);
 		}
 
-		this.ownerWorkflowRole = ownerWorkflowRole;
+		return owner;
 	}
 
-	private async storeWorkflow(workflow: object, user: User) {
-		const result = await this.transactionManager.upsert(WorkflowEntity, workflow, ['id']);
-		await this.transactionManager.upsert(
-			SharedWorkflow,
-			{
-				workflowId: result.identifiers[0].id as string,
-				userId: user.id,
-				roleId: this.ownerWorkflowRole.id,
-			},
-			['workflowId', 'userId'],
-		);
-		if (config.getEnv('database.type') === 'postgresdb') {
-			const tablePrefix = config.getEnv('database.tablePrefix');
-			await this.transactionManager.query(
-				`SELECT setval('${tablePrefix}workflow_entity_id_seq', (SELECT MAX(id) from "${tablePrefix}workflow_entity"))`,
-			);
-		}
-	}
+	private async getWorkflowOwner(workflow: WorkflowEntity) {
+		const sharing = await Container.get(SharedWorkflowRepository).findOneBy({
+			workflowId: workflow.id,
+			role: 'workflow:owner',
+		});
 
-	private async getOwner() {
-		const ownerGlobalRole = await Container.get(RoleRepository).findGlobalOwnerRole();
+		return sharing?.userId;
+	}
 
-		const owner =
-			ownerGlobalRole &&
-			(await Db.collections.User.findOneBy({ globalRoleId: ownerGlobalRole?.id }));
+	private async workflowExists(workflow: WorkflowEntity) {
+		return await Container.get(WorkflowRepository).existsBy({ id: workflow.id });
+	}
 
-		if (!owner) {
-			throw new Error(`Failed to find owner. ${UM_FIX_INSTRUCTION}`);
+	private async readWorkflows(path: string, separate: boolean): Promise<WorkflowEntity[]> {
+		if (process.platform === 'win32') {
+			path = path.replace(/\\/g, '/');
 		}
 
-		return owner;
-	}
+		if (separate) {
+			const files = await glob('*.json', {
+				cwd: path,
+				absolute: true,
+			});
+			const workflowInstances = files.map((file) => {
+				const workflow = jsonParse<IWorkflowToImport>(fs.readFileSync(file, { encoding: 'utf8' }));
+				if (!workflow.id) {
+					workflow.id = generateNanoId();
+				}
 
-	private async getAssignee(userId: string) {
-		const user = await Db.collections.User.findOneBy({ id: userId });
+				const workflowInstance = Container.get(WorkflowRepository).create(workflow);
 
-		if (!user) {
-			throw new Error(`Failed to find user with ID ${userId}`);
-		}
+				return workflowInstance;
+			});
 
-		return user;
-	}
+			return workflowInstances;
+		} else {
+			const workflows = jsonParse<IWorkflowToImport[]>(fs.readFileSync(path, { encoding: 'utf8' }));
 
-	private transformCredentials(node: INode, credentialsEntities: ICredentialsDb[]) {
-		if (node.credentials) {
-			const allNodeCredentials = Object.entries(node.credentials);
-			for (const [type, name] of allNodeCredentials) {
-				if (typeof name === 'string') {
-					const nodeCredentials: INodeCredentialsDetails = {
-						id: null,
-						name,
-					};
-
-					const matchingCredentials = credentialsEntities.filter(
-						(credentials) => credentials.name === name && credentials.type === type,
-					);
-
-					if (matchingCredentials.length === 1) {
-						nodeCredentials.id = matchingCredentials[0].id;
-					}
-
-					// eslint-disable-next-line no-param-reassign
-					node.credentials[type] = nodeCredentials;
-				}
-			}
+			const workflowInstances = workflows.map((w) => Container.get(WorkflowRepository).create(w));
+			assertHasWorkflowsToImport(workflows);
+
+			return workflowInstances;
 		}
 	}
 }
diff --git a/packages/cli/src/commands/ldap/reset.ts b/packages/cli/src/commands/ldap/reset.ts
index db276c40c124b..2693465239755 100644
--- a/packages/cli/src/commands/ldap/reset.ts
+++ b/packages/cli/src/commands/ldap/reset.ts
@@ -1,23 +1,24 @@
-import * as Db from '@/Db';
+import Container from 'typedi';
 import { LDAP_DEFAULT_CONFIGURATION, LDAP_FEATURE_NAME } from '@/Ldap/constants';
-import { In } from 'typeorm';
+import { AuthIdentityRepository } from '@db/repositories/authIdentity.repository';
+import { AuthProviderSyncHistoryRepository } from '@db/repositories/authProviderSyncHistory.repository';
+import { SettingsRepository } from '@db/repositories/settings.repository';
+import { UserRepository } from '@db/repositories/user.repository';
 import { BaseCommand } from '../BaseCommand';
 
 export class Reset extends BaseCommand {
 	static description = '\nResets the database to the default ldap state';
 
 	async run(): Promise<void> {
-		// eslint-disable-next-line @typescript-eslint/naming-convention
-		const { AuthIdentity, AuthProviderSyncHistory, Settings, User } = Db.collections;
-		const ldapIdentities = await AuthIdentity.find({
+		const ldapIdentities = await Container.get(AuthIdentityRepository).find({
 			where: { providerType: 'ldap' },
 			select: ['userId'],
 		});
-		await AuthProviderSyncHistory.delete({ providerType: 'ldap' });
-		await AuthIdentity.delete({ providerType: 'ldap' });
-		await User.delete({ id: In(ldapIdentities.map((i) => i.userId)) });
-		await Settings.delete({ key: LDAP_FEATURE_NAME });
-		await Settings.insert({
+		await Container.get(AuthProviderSyncHistoryRepository).delete({ providerType: 'ldap' });
+		await Container.get(AuthIdentityRepository).delete({ providerType: 'ldap' });
+		await Container.get(UserRepository).deleteMany(ldapIdentities.map((i) => i.userId));
+		await Container.get(SettingsRepository).delete({ key: LDAP_FEATURE_NAME });
+		await Container.get(SettingsRepository).insert({
 			key: LDAP_FEATURE_NAME,
 			value: JSON.stringify(LDAP_DEFAULT_CONFIGURATION),
 			loadOnStartup: true,
diff --git a/packages/cli/src/commands/license/clear.ts b/packages/cli/src/commands/license/clear.ts
index d7e3bf51d34f0..0191136cafa8d 100644
--- a/packages/cli/src/commands/license/clear.ts
+++ b/packages/cli/src/commands/license/clear.ts
@@ -1,6 +1,7 @@
-import * as Db from '@/Db';
+import { Container } from 'typedi';
 import { SETTINGS_LICENSE_CERT_KEY } from '@/constants';
 import { BaseCommand } from '../BaseCommand';
+import { SettingsRepository } from '@db/repositories/settings.repository';
 
 export class ClearLicenseCommand extends BaseCommand {
 	static description = 'Clear license';
@@ -9,7 +10,7 @@ export class ClearLicenseCommand extends BaseCommand {
 
 	async run() {
 		this.logger.info('Clearing license from database.');
-		await Db.collections.Settings.delete({
+		await Container.get(SettingsRepository).delete({
 			key: SETTINGS_LICENSE_CERT_KEY,
 		});
 		this.logger.info('Done. Restart n8n to take effect.');
diff --git a/packages/cli/src/commands/license/info.ts b/packages/cli/src/commands/license/info.ts
index f4ebd406dc1e9..a4e9e42cf27e4 100644
--- a/packages/cli/src/commands/license/info.ts
+++ b/packages/cli/src/commands/license/info.ts
@@ -1,5 +1,5 @@
-import { License } from '@/License';
 import { Container } from 'typedi';
+import { License } from '@/License';
 import { BaseCommand } from '../BaseCommand';
 
 export class LicenseInfoCommand extends BaseCommand {
@@ -9,7 +9,7 @@ export class LicenseInfoCommand extends BaseCommand {
 
 	async run() {
 		const license = Container.get(License);
-		await license.init(this.instanceId);
+		await license.init();
 
 		this.logger.info('Printing license information:\n' + license.getInfo());
 	}
diff --git a/packages/cli/src/commands/list/workflow.ts b/packages/cli/src/commands/list/workflow.ts
index da9d37f81c18f..2d33de19e3e4a 100644
--- a/packages/cli/src/commands/list/workflow.ts
+++ b/packages/cli/src/commands/list/workflow.ts
@@ -1,7 +1,6 @@
-import { flags } from '@oclif/command';
-import type { FindOptionsWhere } from 'typeorm';
-import * as Db from '@/Db';
-import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
+import Container from 'typedi';
+import { Flags } from '@oclif/core';
+import { WorkflowRepository } from '@db/repositories/workflow.repository';
 import { BaseCommand } from '../BaseCommand';
 
 export class ListWorkflowCommand extends BaseCommand {
@@ -14,29 +13,29 @@ export class ListWorkflowCommand extends BaseCommand {
 	];
 
 	static flags = {
-		help: flags.help({ char: 'h' }),
-		active: flags.string({
+		help: Flags.help({ char: 'h' }),
+		active: Flags.string({
 			description: 'Filters workflows by active status. Can be true or false',
 		}),
-		onlyId: flags.boolean({
+		onlyId: Flags.boolean({
 			description: 'Outputs workflow IDs only, one per line.',
 		}),
 	};
 
 	async run() {
-		// eslint-disable-next-line @typescript-eslint/no-shadow
-		const { flags } = this.parse(ListWorkflowCommand);
+		const { flags } = await this.parse(ListWorkflowCommand);
 
 		if (flags.active !== undefined && !['true', 'false'].includes(flags.active)) {
 			this.error('The --active flag has to be passed using true or false');
 		}
 
-		const findQuery: FindOptionsWhere<WorkflowEntity> = {};
-		if (flags.active !== undefined) {
-			findQuery.active = flags.active === 'true';
-		}
+		const workflowRepository = Container.get(WorkflowRepository);
+
+		const workflows =
+			flags.active !== undefined
+				? await workflowRepository.findByActiveState(flags.active === 'true')
+				: await workflowRepository.find();
 
-		const workflows = await Db.collections.Workflow.findBy(findQuery);
 		if (flags.onlyId) {
 			workflows.forEach((workflow) => this.logger.info(workflow.id));
 		} else {
diff --git a/packages/cli/src/commands/mfa/disable.ts b/packages/cli/src/commands/mfa/disable.ts
new file mode 100644
index 0000000000000..fb39aed79595e
--- /dev/null
+++ b/packages/cli/src/commands/mfa/disable.ts
@@ -0,0 +1,55 @@
+import Container from 'typedi';
+import { Flags } from '@oclif/core';
+import { UserRepository } from '@db/repositories/user.repository';
+import { BaseCommand } from '../BaseCommand';
+
+export class DisableMFACommand extends BaseCommand {
+	static description = 'Disable MFA authentication for a user';
+
+	static examples = ['$ n8n mfa:disable --email=johndoe@example.com'];
+
+	static flags = {
+		help: Flags.help({ char: 'h' }),
+		email: Flags.string({
+			description: 'The email of the user to disable the MFA authentication',
+		}),
+	};
+
+	async init() {
+		await super.init();
+	}
+
+	async run(): Promise<void> {
+		const { flags } = await this.parse(DisableMFACommand);
+
+		if (!flags.email) {
+			this.logger.info('An email with --email must be provided');
+			return;
+		}
+
+		const updateOperationResult = await Container.get(UserRepository).update(
+			{ email: flags.email },
+			{ mfaSecret: null, mfaRecoveryCodes: [], mfaEnabled: false },
+		);
+
+		if (!updateOperationResult.affected) {
+			this.reportUserDoesNotExistError(flags.email);
+			return;
+		}
+
+		this.reportSuccess(flags.email);
+	}
+
+	async catch(error: Error) {
+		this.logger.error('An error occurred while disabling MFA in account');
+		this.logger.error(error.message);
+	}
+
+	private reportSuccess(email: string) {
+		this.logger.info(`Successfully disabled MFA for user with email: ${email}`);
+	}
+
+	private reportUserDoesNotExistError(email: string) {
+		this.logger.info(`User with email: ${email} does not exist`);
+	}
+}
diff --git a/packages/cli/src/commands/start.ts b/packages/cli/src/commands/start.ts
index 358d8091eb692..cb934db84fd12 100644
--- a/packages/cli/src/commands/start.ts
+++ b/packages/cli/src/commands/start.ts
@@ -1,38 +1,36 @@
-/* eslint-disable @typescript-eslint/await-thenable */
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 import { Container } from 'typedi';
+import { Flags, type Config } from '@oclif/core';
 import path from 'path';
 import { mkdir } from 'fs/promises';
 import { createReadStream, createWriteStream, existsSync } from 'fs';
-import localtunnel from 'localtunnel';
-import { TUNNEL_SUBDOMAIN_ENV, UserSettings } from 'n8n-core';
-import { flags } from '@oclif/command';
-import stream from 'stream';
+import { pipeline } from 'stream/promises';
 import replaceStream from 'replacestream';
-import { promisify } from 'util';
 import glob from 'fast-glob';
+import { jsonParse } from 'n8n-workflow';
 
-import { LoggerProxy, sleep, jsonParse } from 'n8n-workflow';
-import { createHash } from 'crypto';
 import config from '@/config';
-
 import { ActiveExecutions } from '@/ActiveExecutions';
-import { ActiveWorkflowRunner } from '@/ActiveWorkflowRunner';
-import * as Db from '@/Db';
-import * as GenericHelpers from '@/GenericHelpers';
-import * as Server from '@/Server';
-import { TestWebhooks } from '@/TestWebhooks';
-import { getAllInstalledPackages } from '@/CommunityNodes/packageModel';
-import { EDITOR_UI_DIST_DIR, GENERATED_STATIC_DIR } from '@/constants';
-import { eventBus } from '@/eventbus';
-import { BaseCommand } from './BaseCommand';
+import { ActiveWorkflowManager } from '@/ActiveWorkflowManager';
+import { Server } from '@/Server';
+import { EDITOR_UI_DIST_DIR, LICENSE_FEATURES } from '@/constants';
+import { MessageEventBus } from '@/eventbus/MessageEventBus/MessageEventBus';
 import { InternalHooks } from '@/InternalHooks';
 import { License } from '@/License';
+import { OrchestrationService } from '@/services/orchestration.service';
+import { OrchestrationHandlerMainService } from '@/services/orchestration/main/orchestration.handler.main.service';
+import { PruningService } from '@/services/pruning.service';
+import { UrlService } from '@/services/url.service';
+import { SettingsRepository } from '@db/repositories/settings.repository';
+import { ExecutionRepository } from '@db/repositories/execution.repository';
+import { FeatureNotLicensedError } from '@/errors/feature-not-licensed.error';
+import { WaitTracker } from '@/WaitTracker';
+import { BaseCommand } from './BaseCommand';
+import { retryWorkflows } from '../crons/retryWorkflows';
 
 // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-var-requires
 const open = require('open');
-const pipeline = promisify(stream.pipeline);
 
 export class Start extends BaseCommand {
 	static description = 'Starts n8n. Makes Web-UI available and starts active workflows';
@@ -45,32 +43,41 @@ export class Start extends BaseCommand {
 	];
 
 	static flags = {
-		help: flags.help({ char: 'h' }),
-		open: flags.boolean({
+		help: Flags.help({ char: 'h' }),
+		open: Flags.boolean({
 			char: 'o',
 			description: 'opens the UI automatically in browser',
 		}),
-		tunnel: flags.boolean({
+		tunnel: Flags.boolean({
 			description:
 				'runs the webhooks via a hooks.n8n.cloud tunnel server. Use only for testing and development!',
 		}),
-		reinstallMissingPackages: flags.boolean({
+		reinstallMissingPackages: Flags.boolean({
 			description:
 				'Attempts to self heal n8n if packages with nodes are missing. Might drastically increase startup times.',
 		}),
 	};
 
-	protected activeWorkflowRunner: ActiveWorkflowRunner;
+	protected activeWorkflowManager: ActiveWorkflowManager;
+
+	protected server = Container.get(Server);
+
+	private pruningService: PruningService;
+
+	constructor(argv: string[], cmdConfig: Config) {
+		super(argv, cmdConfig);
+		this.setInstanceType('main');
+		this.setInstanceQueueModeId();
+	}
 
 	/**
 	 * Opens the UI in browser
 	 */
 	private openBrowser() {
-		const editorUrl = GenericHelpers.getBaseUrl();
+		const editorUrl = Container.get(UrlService).baseUrl;
 
-		// eslint-disable-next-line @typescript-eslint/no-unused-vars
-		open(editorUrl, { wait: true }).catch((error: Error) => {
-			console.log(
+		open(editorUrl, { wait: true }).catch(() => {
+			this.logger.info(
 				`\nWas not able to open URL in browser. Please open manually by visiting:\n${editorUrl}\n`,
 			);
 		});
@@ -86,54 +93,24 @@ export class Start extends BaseCommand {
 
 		try {
 			// Stop with trying to activate workflows that could not be activated
-			this.activeWorkflowRunner.removeAllQueuedWorkflowActivations();
+			this.activeWorkflowManager.removeAllQueuedWorkflowActivations();
 
-			await this.externalHooks.run('n8n.stop', []);
+			Container.get(WaitTracker).stopTracking();
 
-			setTimeout(async () => {
-				// In case that something goes wrong with shutdown we
-				// kill after max. 30 seconds no matter what
-				console.log('process exited after 30s');
-				await this.exitSuccessFully();
-			}, 30000);
+			await this.externalHooks?.run('n8n.stop', []);
 
-			await Container.get(InternalHooks).onN8nStop();
+			if (Container.get(OrchestrationService).isMultiMainSetupEnabled) {
+				await this.activeWorkflowManager.removeAllTriggerAndPollerBasedWorkflows();
 
-			const skipWebhookDeregistration = config.getEnv(
-				'endpoints.skipWebhooksDeregistrationOnShutdown',
-			);
-
-			const removePromises = [];
-			if (!skipWebhookDeregistration) {
-				removePromises.push(this.activeWorkflowRunner.removeAll());
+				await Container.get(OrchestrationService).shutdown();
 			}
 
-			// Remove all test webhooks
-			const testWebhooks = Container.get(TestWebhooks);
-			removePromises.push(testWebhooks.removeAll());
-
-			await Promise.all(removePromises);
-
-			// Wait for active workflow executions to finish
-			const activeExecutionsInstance = Container.get(ActiveExecutions);
-			let executingWorkflows = activeExecutionsInstance.getActiveExecutions();
+			await Container.get(InternalHooks).onN8nStop();
 
-			let count = 0;
-			while (executingWorkflows.length !== 0) {
-				if (count++ % 4 === 0) {
-					console.log(`Waiting for ${executingWorkflows.length} active executions to finish...`);
-					// eslint-disable-next-line array-callback-return
-					executingWorkflows.map((execution) => {
-						console.log(` - Execution ID ${execution.id}, workflow ID: ${execution.workflowId}`);
-					});
-				}
-				// eslint-disable-next-line no-await-in-loop
-				await sleep(500);
-				executingWorkflows = activeExecutionsInstance.getActiveExecutions();
-			}
+			await Container.get(ActiveExecutions).shutdown();
 
-			//finally shut down Event Bus
-			await eventBus.close();
+			// Finally shut down Event Bus
+			await Container.get(MessageEventBus).close();
 		} catch (error) {
 			await this.exitWithCrash('There was an error shutting down n8n.', error);
 		}
@@ -155,10 +132,11 @@ export class Start extends BaseCommand {
 		}
 
 		const closingTitleTag = '</title>';
+		const { staticCacheDir } = this.instanceSettings;
 		const compileFile = async (fileName: string) => {
 			const filePath = path.join(EDITOR_UI_DIST_DIR, fileName);
 			if (/(index\.html)|.*\.(js|css)/.test(filePath) && existsSync(filePath)) {
-				const destFile = path.join(GENERATED_STATIC_DIR, fileName);
+				const destFile = path.join(staticCacheDir, fileName);
 				await mkdir(path.dirname(destFile), { recursive: true });
 				const streams = [
 					createReadStream(filePath, 'utf-8'),
@@ -175,7 +153,7 @@ export class Start extends BaseCommand {
 					);
 				}
 				streams.push(createWriteStream(destFile, 'utf-8'));
-				return pipeline(streams);
+				return await pipeline(streams);
 			}
 		};
 
@@ -184,165 +162,118 @@ export class Start extends BaseCommand {
 		await Promise.all(files.map(compileFile));
 	}
 
-	async initLicense(): Promise<void> {
-		const license = Container.get(License);
-		await license.init(this.instanceId);
-
-		const activationKey = config.getEnv('license.activationKey');
-
-		if (activationKey) {
-			const hasCert = (await license.loadCertStr()).length > 0;
-
-			if (hasCert) {
-				return LoggerProxy.debug('Skipping license activation');
-			}
+	async init() {
+		await this.initCrashJournal();
 
-			try {
-				LoggerProxy.debug('Attempting license activation');
-				await license.activate(activationKey);
-			} catch (e) {
-				LoggerProxy.error('Could not activate license', e as Error);
-			}
+		this.logger.info('Initializing n8n process');
+		if (config.getEnv('executions.mode') === 'queue') {
+			this.logger.debug('Main Instance running in queue mode');
+			this.logger.debug(`Queue mode id: ${this.queueModeId}`);
 		}
-	}
 
-	async init() {
-		await this.initCrashJournal();
 		await super.init();
-		this.logger.info('Initializing n8n process');
-		this.activeWorkflowRunner = Container.get(ActiveWorkflowRunner);
+		this.activeWorkflowManager = Container.get(ActiveWorkflowManager);
 
 		await this.initLicense();
-		await this.initBinaryManager();
+
+		await this.initOrchestration();
+		this.logger.debug('Orchestration init complete');
+		await this.initBinaryDataService();
+		this.logger.debug('Binary data service init complete');
 		await this.initExternalHooks();
+		this.logger.debug('External hooks init complete');
+		await this.initExternalSecrets();
+		this.logger.debug('External secrets init complete');
+		this.initWorkflowHistory();
+		this.logger.debug('Workflow history init complete');
 
 		if (!config.getEnv('endpoints.disableUi')) {
 			await this.generateStaticAssets();
 		}
 	}
 
-	async run() {
-		// eslint-disable-next-line @typescript-eslint/no-shadow
-		const { flags } = this.parse(Start);
-
-		if (!config.getEnv('userManagement.jwtSecret')) {
-			// If we don't have a JWT secret set, generate
-			// one based and save to config.
-			const encryptionKey = await UserSettings.getEncryptionKey();
-
-			// For a key off every other letter from encryption key
-			// CAREFUL: do not change this or it breaks all existing tokens.
-			let baseKey = '';
-			for (let i = 0; i < encryptionKey.length; i += 2) {
-				baseKey += encryptionKey[i];
-			}
-			config.set('userManagement.jwtSecret', createHash('sha256').update(baseKey).digest('hex'));
+	async initOrchestration() {
+		if (config.getEnv('executions.mode') !== 'queue') return;
+
+		if (
+			config.getEnv('multiMainSetup.enabled') &&
+			!Container.get(License).isMultipleMainInstancesLicensed()
+		) {
+			throw new FeatureNotLicensedError(LICENSE_FEATURES.MULTIPLE_MAIN_INSTANCES);
 		}
 
-		await this.loadNodesAndCredentials.generateTypesForFrontend();
-
-		const installedPackages = await getAllInstalledPackages();
-		const missingPackages = new Set<{
-			packageName: string;
-			version: string;
-		}>();
-		installedPackages.forEach((installedPackage) => {
-			installedPackage.installedNodes.forEach((installedNode) => {
-				if (!this.loadNodesAndCredentials.known.nodes[installedNode.type]) {
-					// Leave the list ready for installing in case we need.
-					missingPackages.add({
-						packageName: installedPackage.packageName,
-						version: installedPackage.installedVersion,
-					});
-				}
+		const orchestrationService = Container.get(OrchestrationService);
+
+		await orchestrationService.init();
+
+		await Container.get(OrchestrationHandlerMainService).init();
+
+		if (!orchestrationService.isMultiMainSetupEnabled) return;
+
+		orchestrationService.multiMainSetup
+			.on('leader-stepdown', async () => {
+				await this.license.reinit(); // to disable renewal
+				await this.activeWorkflowManager.removeAllTriggerAndPollerBasedWorkflows();
+			})
+			.on('leader-takeover', async () => {
+				await this.license.reinit(); // to enable renewal
+				await this.activeWorkflowManager.addAllTriggerAndPollerBasedWorkflows();
 			});
-		});
+	}
 
-		await UserSettings.getEncryptionKey();
+	async run() {
+		const { flags } = await this.parse(Start);
 
 		// Load settings from database and set them to config.
-		const databaseSettings = await Db.collections.Settings.findBy({ loadOnStartup: true });
+		const databaseSettings = await Container.get(SettingsRepository).findBy({
+			loadOnStartup: true,
+		});
 		databaseSettings.forEach((setting) => {
 			config.set(setting.key, jsonParse(setting.value, { fallbackValue: setting.value }));
 		});
 
-		config.set('nodes.packagesMissing', '');
-		if (missingPackages.size) {
-			LoggerProxy.error(
-				'n8n detected that some packages are missing. For more information, visit https://docs.n8n.io/integrations/community-nodes/troubleshooting/',
-			);
+		const areCommunityPackagesEnabled = config.getEnv('nodes.communityPackages.enabled');
 
-			if (flags.reinstallMissingPackages || process.env.N8N_REINSTALL_MISSING_PACKAGES) {
-				LoggerProxy.info('Attempting to reinstall missing packages', { missingPackages });
-				try {
-					// Optimistic approach - stop if any installation fails
-					// eslint-disable-next-line no-restricted-syntax
-					for (const missingPackage of missingPackages) {
-						await this.loadNodesAndCredentials.installNpmModule(
-							missingPackage.packageName,
-							missingPackage.version,
-						);
-						missingPackages.delete(missingPackage);
-					}
-					LoggerProxy.info('Packages reinstalled successfully. Resuming regular initialization.');
-				} catch (error) {
-					LoggerProxy.error('n8n was unable to install the missing packages.');
-				}
-			}
-
-			config.set(
-				'nodes.packagesMissing',
-				Array.from(missingPackages)
-					.map((missingPackage) => `${missingPackage.packageName}@${missingPackage.version}`)
-					.join(' '),
-			);
+		if (areCommunityPackagesEnabled) {
+			const { CommunityPackagesService } = await import('@/services/communityPackages.service');
+			await Container.get(CommunityPackagesService).setMissingPackages({
+				reinstallMissingPackages: flags.reinstallMissingPackages,
+			});
 		}
 
 		const dbType = config.getEnv('database.type');
 		if (dbType === 'sqlite') {
 			const shouldRunVacuum = config.getEnv('database.sqlite.executeVacuumOnStartup');
 			if (shouldRunVacuum) {
-				// eslint-disable-next-line @typescript-eslint/no-floating-promises
-				await Db.collections.Execution.query('VACUUM;');
+				await Container.get(ExecutionRepository).query('VACUUM;');
 			}
 		}
 
 		if (flags.tunnel) {
 			this.log('\nWaiting for tunnel ...');
 
-			let tunnelSubdomain;
-			if (
-				process.env[TUNNEL_SUBDOMAIN_ENV] !== undefined &&
-				process.env[TUNNEL_SUBDOMAIN_ENV] !== ''
-			) {
-				tunnelSubdomain = process.env[TUNNEL_SUBDOMAIN_ENV];
-			} else if (this.userSettings.tunnelSubdomain !== undefined) {
-				tunnelSubdomain = this.userSettings.tunnelSubdomain;
-			}
+			let tunnelSubdomain =
+				process.env.N8N_TUNNEL_SUBDOMAIN ?? this.instanceSettings.tunnelSubdomain ?? '';
 
-			if (tunnelSubdomain === undefined) {
+			if (tunnelSubdomain === '') {
 				// When no tunnel subdomain did exist yet create a new random one
 				const availableCharacters = 'abcdefghijklmnopqrstuvwxyz0123456789';
-				this.userSettings.tunnelSubdomain = Array.from({ length: 24 })
-					.map(() => {
-						return availableCharacters.charAt(
-							Math.floor(Math.random() * availableCharacters.length),
-						);
-					})
+				tunnelSubdomain = Array.from({ length: 24 })
+					.map(() =>
+						availableCharacters.charAt(Math.floor(Math.random() * availableCharacters.length)),
+					)
 					.join('');
 
-				await UserSettings.writeUserSettings(this.userSettings);
+				this.instanceSettings.update({ tunnelSubdomain });
 			}
 
-			const tunnelSettings: localtunnel.TunnelConfig = {
-				host: 'https://hooks.n8n.cloud',
-				subdomain: tunnelSubdomain,
-			};
-
+			const { default: localtunnel } = await import('@n8n/localtunnel');
 			const port = config.getEnv('port');
 
-			// @ts-ignore
-			const webhookTunnel = await localtunnel(port, tunnelSettings);
+			const webhookTunnel = await localtunnel(port, {
+				host: 'https://hooks.n8n.cloud',
+				subdomain: tunnelSubdomain,
+			});
 
 			process.env.WEBHOOK_URL = `${webhookTunnel.url}/`;
 			this.log(`Tunnel URL: ${process.env.WEBHOOK_URL}\n`);
@@ -351,19 +282,17 @@ export class Start extends BaseCommand {
 			);
 		}
 
-		await Server.start();
+		await this.server.start();
 
-		// Start to get active workflows and run their triggers
-		await this.activeWorkflowRunner.init();
+		setInterval(retryWorkflows, 1000 * 60);
 
-		const editorUrl = GenericHelpers.getBaseUrl();
-		this.log(`\nEditor is now accessible via:\n${editorUrl}`);
+		await this.initPruning();
 
-		const saveManualExecutions = config.getEnv('executions.saveDataManualExecutions');
+		// Start to get active workflows and run their triggers
+		await this.activeWorkflowManager.init();
 
-		if (saveManualExecutions) {
-			this.log('\nManual executions will be visible only for the owner');
-		}
+		const editorUrl = Container.get(UrlService).baseUrl;
+		this.log(`\nEditor is now accessible via:\n${editorUrl}`);
 
 		// Allow to open n8n editor by pressing "o"
 		if (Boolean(process.stdout.isTTY) && process.stdin.setRawMode) {
@@ -380,11 +309,10 @@ export class Start extends BaseCommand {
 					this.openBrowser();
 				} else if (key.charCodeAt(0) === 3) {
 					// Ctrl + c got pressed
-					// eslint-disable-next-line @typescript-eslint/no-floating-promises
-					this.stopProcess();
+					void this.stopProcess();
 				} else {
 					// When anything else got pressed, record it and send it on enter into the child process
-					// eslint-disable-next-line no-lonely-if
+
 					if (key.charCodeAt(0) === 13) {
 						// send to child process and print in terminal
 						process.stdout.write('\n');
@@ -397,8 +325,26 @@ export class Start extends BaseCommand {
 		}
 	}
 
+	async initPruning() {
+		this.pruningService = Container.get(PruningService);
+
+		this.pruningService.startPruning();
+
+		if (config.getEnv('executions.mode') !== 'queue') return;
+
+		const orchestrationService = Container.get(OrchestrationService);
+
+		await orchestrationService.init();
+
+		if (!orchestrationService.isMultiMainSetupEnabled) return;
+
+		orchestrationService.multiMainSetup
+			.on('leader-stepdown', () => this.pruningService.stopPruning())
+			.on('leader-takeover', () => this.pruningService.startPruning());
+	}
+
 	async catch(error: Error) {
-		console.log(error.stack);
+		if (error.stack) this.logger.error(error.stack);
 		await this.exitWithCrash('Exiting due to an error.', error);
 	}
 }
diff --git a/packages/cli/src/commands/update/workflow.ts b/packages/cli/src/commands/update/workflow.ts
index a13721ce66a09..f365db2d9814a 100644
--- a/packages/cli/src/commands/update/workflow.ts
+++ b/packages/cli/src/commands/update/workflow.ts
@@ -1,11 +1,6 @@
-/* eslint-disable @typescript-eslint/no-unsafe-argument */
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* eslint-disable no-console */
-import { flags } from '@oclif/command';
-import type { FindOptionsWhere } from 'typeorm';
-import type { QueryDeepPartialEntity } from 'typeorm/query-builder/QueryPartialEntity';
-import * as Db from '@/Db';
-import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
+import { Container } from 'typedi';
+import { Flags } from '@oclif/core';
+import { WorkflowRepository } from '@db/repositories/workflow.repository';
 import { BaseCommand } from '../BaseCommand';
 
 export class UpdateWorkflowCommand extends BaseCommand {
@@ -17,58 +12,60 @@ export class UpdateWorkflowCommand extends BaseCommand {
 	];
 
 	static flags = {
-		help: flags.help({ char: 'h' }),
-		active: flags.string({
+		help: Flags.help({ char: 'h' }),
+		active: Flags.string({
 			description: 'Active state the workflow/s should be set to',
 		}),
-		all: flags.boolean({
+		all: Flags.boolean({
 			description: 'Operate on all workflows',
 		}),
-		id: flags.string({
+		id: Flags.string({
 			description: 'The ID of the workflow to operate on',
 		}),
 	};
 
 	async run() {
-		// eslint-disable-next-line @typescript-eslint/no-shadow
-		const { flags } = this.parse(UpdateWorkflowCommand);
+		const { flags } = await this.parse(UpdateWorkflowCommand);
 
 		if (!flags.all && !flags.id) {
-			console.info('Either option "--all" or "--id" have to be set!');
+			this.logger.error('Either option "--all" or "--id" have to be set!');
 			return;
 		}
 
 		if (flags.all && flags.id) {
-			console.info(
+			this.logger.error(
 				'Either something else on top should be "--all" or "--id" can be set never both!',
 			);
 			return;
 		}
 
-		const updateQuery: QueryDeepPartialEntity<WorkflowEntity> = {};
 		if (flags.active === undefined) {
-			console.info('No update flag like "--active=true" has been set!');
+			this.logger.error('No update flag like "--active=true" has been set!');
 			return;
 		}
 
 		if (!['false', 'true'].includes(flags.active)) {
-			console.info('Valid values for flag "--active" are only "false" or "true"!');
+			this.logger.error('Valid values for flag "--active" are only "false" or "true"!');
 			return;
 		}
 
-		updateQuery.active = flags.active === 'true';
+		const newState = flags.active === 'true';
+		const action = newState ? 'Activating' : 'Deactivating';
 
-		const findQuery: FindOptionsWhere<WorkflowEntity> = {};
 		if (flags.id) {
-			this.logger.info(`Deactivating workflow with ID: ${flags.id}`);
-			findQuery.id = flags.id;
+			this.logger.info(`${action} workflow with ID: ${flags.id}`);
+			await Container.get(WorkflowRepository).updateActiveState(flags.id, newState);
 		} else {
-			this.logger.info('Deactivating all workflows');
-			findQuery.active = true;
+			this.logger.info(`${action} all workflows`);
+			if (newState) {
+				await Container.get(WorkflowRepository).activateAll();
+			} else {
+				await Container.get(WorkflowRepository).deactivateAll();
+			}
 		}
 
-		await Db.collections.Workflow.update(findQuery, updateQuery);
-		this.logger.info('Done');
+		this.logger.info('Activation or deactivation will not take effect if n8n is running.');
+		this.logger.info('Please restart n8n for changes to take effect if n8n is currently running.');
 	}
 
 	async catch(error: Error) {
diff --git a/packages/cli/src/commands/user-management/reset.ts b/packages/cli/src/commands/user-management/reset.ts
index 66c8de0117cd5..188183e7d4fdb 100644
--- a/packages/cli/src/commands/user-management/reset.ts
+++ b/packages/cli/src/commands/user-management/reset.ts
@@ -1,9 +1,11 @@
 import { Container } from 'typedi';
-import { Not } from 'typeorm';
-import * as Db from '@/Db';
 import type { CredentialsEntity } from '@db/entities/CredentialsEntity';
 import { User } from '@db/entities/User';
-import { RoleRepository } from '@db/repositories';
+import { CredentialsRepository } from '@db/repositories/credentials.repository';
+import { SettingsRepository } from '@db/repositories/settings.repository';
+import { SharedCredentialsRepository } from '@db/repositories/sharedCredentials.repository';
+import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
+import { UserRepository } from '@db/repositories/user.repository';
 import { BaseCommand } from '../BaseCommand';
 
 const defaultUserProps = {
@@ -11,7 +13,7 @@ const defaultUserProps = {
 	lastName: null,
 	email: null,
 	password: null,
-	resetPasswordToken: null,
+	role: 'global:owner',
 };
 
 export class Reset extends BaseCommand {
@@ -22,62 +24,46 @@ export class Reset extends BaseCommand {
 	async run(): Promise<void> {
 		const owner = await this.getInstanceOwner();
 
-		const ownerWorkflowRole = await Container.get(RoleRepository).findWorkflowOwnerRoleOrFail();
-		const ownerCredentialRole = await Container.get(RoleRepository).findCredentialOwnerRoleOrFail();
+		await Container.get(SharedWorkflowRepository).makeOwnerOfAllWorkflows(owner);
+		await Container.get(SharedCredentialsRepository).makeOwnerOfAllCredentials(owner);
 
-		await Db.collections.SharedWorkflow.update(
-			{ userId: Not(owner.id), roleId: ownerWorkflowRole.id },
-			{ user: owner },
-		);
-
-		await Db.collections.SharedCredentials.update(
-			{ userId: Not(owner.id), roleId: ownerCredentialRole.id },
-			{ user: owner },
-		);
-
-		await Db.collections.User.delete({ id: Not(owner.id) });
-		await Db.collections.User.save(Object.assign(owner, defaultUserProps));
+		await Container.get(UserRepository).deleteAllExcept(owner);
+		await Container.get(UserRepository).save(Object.assign(owner, defaultUserProps));
 
-		const danglingCredentials: CredentialsEntity[] =
-			await Db.collections.Credentials.createQueryBuilder('credentials')
-				.leftJoinAndSelect('credentials.shared', 'shared')
-				.where('shared.credentialsId is null')
-				.getMany();
+		const danglingCredentials: CredentialsEntity[] = await Container.get(CredentialsRepository)
+			.createQueryBuilder('credentials')
+			.leftJoinAndSelect('credentials.shared', 'shared')
+			.where('shared.credentialsId is null')
+			.getMany();
 		const newSharedCredentials = danglingCredentials.map((credentials) =>
-			Db.collections.SharedCredentials.create({
+			Container.get(SharedCredentialsRepository).create({
 				credentials,
 				user: owner,
-				role: ownerCredentialRole,
+				role: 'credential:owner',
 			}),
 		);
-		await Db.collections.SharedCredentials.save(newSharedCredentials);
+		await Container.get(SharedCredentialsRepository).save(newSharedCredentials);
 
-		await Db.collections.Settings.update(
+		await Container.get(SettingsRepository).update(
 			{ key: 'userManagement.isInstanceOwnerSetUp' },
 			{ value: 'false' },
 		);
-		await Db.collections.Settings.update(
-			{ key: 'userManagement.skipInstanceOwnerSetup' },
-			{ value: 'false' },
-		);
 
 		this.logger.info('Successfully reset the database to default user state.');
 	}
 
 	async getInstanceOwner(): Promise<User> {
-		const globalRole = await Container.get(RoleRepository).findGlobalOwnerRoleOrFail();
-
-		const owner = await Db.collections.User.findOneBy({ globalRoleId: globalRole.id });
+		const owner = await Container.get(UserRepository).findOneBy({ role: 'global:owner' });
 
 		if (owner) return owner;
 
 		const user = new User();
 
-		Object.assign(user, { ...defaultUserProps, globalRole });
+		Object.assign(user, defaultUserProps);
 
-		await Db.collections.User.save(user);
+		await Container.get(UserRepository).save(user);
 
-		return Db.collections.User.findOneByOrFail({ globalRoleId: globalRole.id });
+		return await Container.get(UserRepository).findOneByOrFail({ role: 'global:owner' });
 	}
 
 	async catch(error: Error): Promise<void> {
diff --git a/packages/cli/src/commands/webhook.ts b/packages/cli/src/commands/webhook.ts
index cc1ac53b35389..5b72c1eb86a9b 100644
--- a/packages/cli/src/commands/webhook.ts
+++ b/packages/cli/src/commands/webhook.ts
@@ -1,11 +1,15 @@
-import { flags } from '@oclif/command';
-import { LoggerProxy, sleep } from 'n8n-workflow';
+import { Container } from 'typedi';
+import { Flags, type Config } from '@oclif/core';
+import { ApplicationError } from 'n8n-workflow';
+
 import config from '@/config';
 import { ActiveExecutions } from '@/ActiveExecutions';
 import { WebhookServer } from '@/WebhookServer';
 import { Queue } from '@/Queue';
 import { BaseCommand } from './BaseCommand';
-import { Container } from 'typedi';
+
+import { OrchestrationWebhookService } from '@/services/orchestration/webhook/orchestration.webhook.service';
+import { OrchestrationHandlerWebhookService } from '@/services/orchestration/webhook/orchestration.handler.webhook.service';
 
 export class Webhook extends BaseCommand {
 	static description = 'Starts n8n webhook process. Intercepts only production URLs.';
@@ -13,41 +17,32 @@ export class Webhook extends BaseCommand {
 	static examples = ['$ n8n webhook'];
 
 	static flags = {
-		help: flags.help({ char: 'h' }),
+		help: Flags.help({ char: 'h' }),
 	};
 
+	protected server = Container.get(WebhookServer);
+
+	constructor(argv: string[], cmdConfig: Config) {
+		super(argv, cmdConfig);
+		this.setInstanceType('webhook');
+		if (this.queueModeId) {
+			this.logger.debug(`Webhook Instance queue mode id: ${this.queueModeId}`);
+		}
+		this.setInstanceQueueModeId();
+	}
+
 	/**
 	 * Stops n8n in a graceful way.
 	 * Make for example sure that all the webhooks from third party services
 	 * get removed.
 	 */
 	async stopProcess() {
-		LoggerProxy.info('\nStopping n8n...');
+		this.logger.info('\nStopping n8n...');
 
 		try {
-			await this.externalHooks.run('n8n.stop', []);
-
-			setTimeout(async () => {
-				// In case that something goes wrong with shutdown we
-				// kill after max. 30 seconds no matter what
-				await this.exitSuccessFully();
-			}, 30000);
-
-			// Wait for active workflow executions to finish
-			const activeExecutionsInstance = Container.get(ActiveExecutions);
-			let executingWorkflows = activeExecutionsInstance.getActiveExecutions();
-
-			let count = 0;
-			while (executingWorkflows.length !== 0) {
-				if (count++ % 4 === 0) {
-					LoggerProxy.info(
-						`Waiting for ${executingWorkflows.length} active executions to finish...`,
-					);
-				}
-				// eslint-disable-next-line no-await-in-loop
-				await sleep(500);
-				executingWorkflows = activeExecutionsInstance.getActiveExecutions();
-			}
+			await this.externalHooks?.run('n8n.stop', []);
+
+			await Container.get(ActiveExecutions).shutdown();
 		} catch (error) {
 			await this.exitWithCrash('There was an error shutting down n8n.', error);
 		}
@@ -73,15 +68,35 @@ export class Webhook extends BaseCommand {
 		}
 
 		await this.initCrashJournal();
+		this.logger.debug('Crash journal initialized');
+
+		this.logger.info('Initializing n8n webhook process');
+		this.logger.debug(`Queue mode id: ${this.queueModeId}`);
+
 		await super.init();
 
-		await this.initBinaryManager();
+		await this.initLicense();
+		this.logger.debug('License init complete');
+		await this.initOrchestration();
+		this.logger.debug('Orchestration init complete');
+		await this.initBinaryDataService();
+		this.logger.debug('Binary data service init complete');
 		await this.initExternalHooks();
+		this.logger.debug('External hooks init complete');
+		await this.initExternalSecrets();
+		this.logger.debug('External seecrets init complete');
 	}
 
 	async run() {
+		if (config.getEnv('multiMainSetup.enabled')) {
+			throw new ApplicationError(
+				'Webhook process cannot be started when multi-main setup is enabled.',
+			);
+		}
+
 		await Container.get(Queue).init();
-		await new WebhookServer().start();
+		await this.server.start();
+		this.logger.debug(`Webhook listener ID: ${this.server.uniqueInstanceId}`);
 		this.logger.info('Webhook listener waiting for requests.');
 
 		// Make sure that the process does not close
@@ -91,4 +106,9 @@ export class Webhook extends BaseCommand {
 	async catch(error: Error) {
 		await this.exitWithCrash('Exiting due to an error.', error);
 	}
+
+	async initOrchestration() {
+		await Container.get(OrchestrationWebhookService).init();
+		await Container.get(OrchestrationHandlerWebhookService).init();
+	}
 }
diff --git a/packages/cli/src/commands/worker.ts b/packages/cli/src/commands/worker.ts
index 408060947eea1..c87a0c80608d0 100644
--- a/packages/cli/src/commands/worker.ts
+++ b/packages/cli/src/commands/worker.ts
@@ -1,27 +1,35 @@
+import { Container } from 'typedi';
+import { Flags, type Config } from '@oclif/core';
 import express from 'express';
 import http from 'http';
 import type PCancelable from 'p-cancelable';
-import { Container } from 'typedi';
-
-import { flags } from '@oclif/command';
 import { WorkflowExecute } from 'n8n-core';
-
 import type { ExecutionStatus, IExecuteResponsePromiseData, INodeTypes, IRun } from 'n8n-workflow';
-import { Workflow, NodeOperationError, LoggerProxy, sleep } from 'n8n-workflow';
+import { Workflow, sleep, ApplicationError } from 'n8n-workflow';
 
 import * as Db from '@/Db';
 import * as ResponseHelper from '@/ResponseHelper';
 import * as WebhookHelpers from '@/WebhookHelpers';
 import * as WorkflowExecuteAdditionalData from '@/WorkflowExecuteAdditionalData';
-import { PermissionChecker } from '@/UserManagement/PermissionChecker';
-
 import config from '@/config';
-import type { Job, JobId, JobQueue, JobResponse, WebhookResponse } from '@/Queue';
+import type { Job, JobId, JobResponse, WebhookResponse } from '@/Queue';
 import { Queue } from '@/Queue';
-import { getWorkflowOwner } from '@/UserManagement/UserManagementHelper';
-import { generateFailedExecutionFromError } from '@/WorkflowHelpers';
 import { N8N_VERSION } from '@/constants';
+import { ExecutionRepository } from '@db/repositories/execution.repository';
+import { WorkflowRepository } from '@db/repositories/workflow.repository';
+import { OwnershipService } from '@/services/ownership.service';
+import type { ICredentialsOverwrite } from '@/Interfaces';
+import { CredentialsOverwrites } from '@/CredentialsOverwrites';
+import { rawBodyReader, bodyParser } from '@/middlewares';
+import { MessageEventBus } from '@/eventbus/MessageEventBus/MessageEventBus';
+import type { RedisServicePubSubSubscriber } from '@/services/redis/RedisServicePubSubSubscriber';
+import { EventMessageGeneric } from '@/eventbus/EventMessageClasses/EventMessageGeneric';
+import { OrchestrationHandlerWorkerService } from '@/services/orchestration/worker/orchestration.handler.worker.service';
+import { OrchestrationWorkerService } from '@/services/orchestration/worker/orchestration.worker.service';
+import type { WorkerJobStatusSummary } from '@/services/orchestration/worker/types';
+import { ServiceUnavailableError } from '@/errors/response-errors/service-unavailable.error';
 import { BaseCommand } from './BaseCommand';
+import { MaxStalledCountError } from '@/errors/max-stalled-count.error';
 
 export class Worker extends BaseCommand {
 	static description = '\nStarts a n8n worker';
@@ -29,8 +37,8 @@ export class Worker extends BaseCommand {
 	static examples = ['$ n8n worker --concurrency=5'];
 
 	static flags = {
-		help: flags.help({ char: 'h' }),
-		concurrency: flags.integer({
+		help: Flags.help({ char: 'h' }),
+		concurrency: Flags.integer({
 			default: 10,
 			description: 'How many jobs can run in parallel.',
 		}),
@@ -40,7 +48,13 @@ export class Worker extends BaseCommand {
 		[key: string]: PCancelable<IRun>;
 	} = {};
 
-	static jobQueue: JobQueue;
+	static runningJobsSummary: {
+		[jobId: string]: WorkerJobStatusSummary;
+	} = {};
+
+	static jobQueue: Queue;
+
+	redisSubscriber: RedisServicePubSubSubscriber;
 
 	/**
 	 * Stop n8n in a graceful way.
@@ -48,37 +62,28 @@ export class Worker extends BaseCommand {
 	 * get removed.
 	 */
 	async stopProcess() {
-		LoggerProxy.info('Stopping n8n...');
+		this.logger.info('Stopping n8n...');
 
 		// Stop accepting new jobs
-		// eslint-disable-next-line @typescript-eslint/no-floating-promises
-		Worker.jobQueue.pause(true);
+		await Worker.jobQueue.pause(true);
 
 		try {
-			await this.externalHooks.run('n8n.stop', []);
-
-			const maxStopTime = config.getEnv('queue.bull.gracefulShutdownTimeout') * 1000;
+			await this.externalHooks?.run('n8n.stop', []);
 
-			const stopTime = new Date().getTime() + maxStopTime;
-
-			setTimeout(async () => {
-				// In case that something goes wrong with shutdown we
-				// kill after max. 30 seconds no matter what
-				await this.exitSuccessFully();
-			}, maxStopTime);
+			const hardStopTime = Date.now() + this.gracefulShutdownTimeoutInS;
 
 			// Wait for active workflow executions to finish
 			let count = 0;
 			while (Object.keys(Worker.runningJobs).length !== 0) {
 				if (count++ % 4 === 0) {
-					const waitLeft = Math.ceil((stopTime - new Date().getTime()) / 1000);
-					LoggerProxy.info(
+					const waitLeft = Math.ceil((hardStopTime - Date.now()) / 1000);
+					this.logger.info(
 						`Waiting for ${
 							Object.keys(Worker.runningJobs).length
 						} active executions to finish... (wait ${waitLeft} more seconds)`,
 					);
 				}
-				// eslint-disable-next-line no-await-in-loop
+
 				await sleep(500);
 			}
 		} catch (error) {
@@ -90,44 +95,50 @@ export class Worker extends BaseCommand {
 
 	async runJob(job: Job, nodeTypes: INodeTypes): Promise<JobResponse> {
 		const { executionId, loadStaticData } = job.data;
-		const executionDb = await Db.collections.Execution.findOneBy({ id: executionId });
+		const executionRepository = Container.get(ExecutionRepository);
+		const fullExecutionData = await executionRepository.findSingleExecution(executionId, {
+			includeData: true,
+			unflattenData: true,
+		});
 
-		if (!executionDb) {
-			LoggerProxy.error(
+		if (!fullExecutionData) {
+			this.logger.error(
 				`Worker failed to find data of execution "${executionId}" in database. Cannot continue.`,
 				{ executionId },
 			);
-			throw new Error(
-				`Unable to find data of execution "${executionId}" in database. Aborting execution.`,
+			throw new ApplicationError(
+				'Unable to find data of execution in database. Aborting execution.',
+				{ extra: { executionId } },
 			);
 		}
-		const currentExecutionDb = ResponseHelper.unflattenExecutionData(executionDb);
-		const workflowId = currentExecutionDb.workflowData.id!;
-		LoggerProxy.info(
+		const workflowId = fullExecutionData.workflowData.id;
+
+		this.logger.info(
 			`Start job: ${job.id} (Workflow ID: ${workflowId} | Execution: ${executionId})`,
 		);
+		await executionRepository.updateStatus(executionId, 'running');
 
-		const workflowOwner = await getWorkflowOwner(workflowId);
+		const workflowOwner = await Container.get(OwnershipService).getWorkflowOwnerCached(workflowId);
 
-		let { staticData } = currentExecutionDb.workflowData;
+		let { staticData } = fullExecutionData.workflowData;
 		if (loadStaticData) {
-			const workflowData = await Db.collections.Workflow.findOne({
+			const workflowData = await Container.get(WorkflowRepository).findOne({
 				select: ['id', 'staticData'],
 				where: {
 					id: workflowId,
 				},
 			});
 			if (workflowData === null) {
-				LoggerProxy.error(
+				this.logger.error(
 					'Worker execution failed because workflow could not be found in database.',
 					{ workflowId, executionId },
 				);
-				throw new Error(`The workflow with the ID "${workflowId}" could not be found`);
+				throw new ApplicationError('Workflow could not be found', { extra: { workflowId } });
 			}
 			staticData = workflowData.staticData;
 		}
 
-		const workflowSettings = currentExecutionDb.workflowData.settings ?? {};
+		const workflowSettings = fullExecutionData.workflowData.settings ?? {};
 
 		let workflowTimeout = workflowSettings.executionTimeout ?? config.getEnv('executions.timeout'); // initialize with default
 
@@ -139,13 +150,13 @@ export class Worker extends BaseCommand {
 
 		const workflow = new Workflow({
 			id: workflowId,
-			name: currentExecutionDb.workflowData.name,
-			nodes: currentExecutionDb.workflowData.nodes,
-			connections: currentExecutionDb.workflowData.connections,
-			active: currentExecutionDb.workflowData.active,
+			name: fullExecutionData.workflowData.name,
+			nodes: fullExecutionData.workflowData.nodes,
+			connections: fullExecutionData.workflowData.connections,
+			active: fullExecutionData.workflowData.active,
 			nodeTypes,
 			staticData,
-			settings: currentExecutionDb.workflowData.settings,
+			settings: fullExecutionData.workflowData.settings,
 		});
 
 		const additionalData = await WorkflowExecuteAdditionalData.getBase(
@@ -154,26 +165,14 @@ export class Worker extends BaseCommand {
 			executionTimeoutTimestamp,
 		);
 		additionalData.hooks = WorkflowExecuteAdditionalData.getWorkflowHooksWorkerExecuter(
-			currentExecutionDb.mode,
+			fullExecutionData.mode,
 			job.data.executionId,
-			currentExecutionDb.workflowData,
-			{ retryOf: currentExecutionDb.retryOf as string },
+			fullExecutionData.workflowData,
+			{
+				retryOf: fullExecutionData.retryOf as string,
+			},
 		);
 
-		try {
-			await PermissionChecker.check(workflow, workflowOwner.id);
-		} catch (error) {
-			if (error instanceof NodeOperationError) {
-				const failedExecution = generateFailedExecutionFromError(
-					currentExecutionDb.mode,
-					error,
-					error.node,
-				);
-				await additionalData.hooks.executeHookFunctions('workflowExecuteAfter', [failedExecution]);
-			}
-			return { success: true };
-		}
-
 		additionalData.hooks.hookFunctions.sendResponse = [
 			async (response: IExecuteResponsePromiseData): Promise<void> => {
 				const progress: WebhookResponse = {
@@ -188,66 +187,147 @@ export class Worker extends BaseCommand {
 
 		additionalData.setExecutionStatus = (status: ExecutionStatus) => {
 			// Can't set the status directly in the queued worker, but it will happen in InternalHook.onWorkflowPostExecute
-			LoggerProxy.debug(`Queued worker execution status for ${executionId} is "${status}"`);
+			this.logger.debug(`Queued worker execution status for ${executionId} is "${status}"`);
 		};
 
 		let workflowExecute: WorkflowExecute;
 		let workflowRun: PCancelable<IRun>;
-		if (currentExecutionDb.data !== undefined) {
+		if (fullExecutionData.data !== undefined) {
 			workflowExecute = new WorkflowExecute(
 				additionalData,
-				currentExecutionDb.mode,
-				currentExecutionDb.data,
+				fullExecutionData.mode,
+				fullExecutionData.data,
 			);
+			console.log('we got here for worker.js');
 			workflowRun = workflowExecute.processRunExecutionData(workflow);
 		} else {
 			// Execute all nodes
 			// Can execute without webhook so go on
-			workflowExecute = new WorkflowExecute(additionalData, currentExecutionDb.mode);
+			workflowExecute = new WorkflowExecute(additionalData, fullExecutionData.mode);
 			workflowRun = workflowExecute.run(workflow);
 		}
 
 		Worker.runningJobs[job.id] = workflowRun;
+		Worker.runningJobsSummary[job.id] = {
+			jobId: job.id.toString(),
+			executionId,
+			workflowId: fullExecutionData.workflowId ?? '',
+			workflowName: fullExecutionData.workflowData.name,
+			mode: fullExecutionData.mode,
+			startedAt: fullExecutionData.startedAt,
+			retryOf: fullExecutionData.retryOf ?? '',
+			status: fullExecutionData.status,
+		};
 
 		// Wait till the execution is finished
 		const data = await workflowRun;
 		console.log('processRunExecutionData in worker.ts:', data.data.resultData);
 
 		delete Worker.runningJobs[job.id];
+		delete Worker.runningJobsSummary[job.id];
+
+		// do NOT call workflowExecuteAfter hook here, since it is being called from processSuccessExecution()
+		// already!
 
 		return {
 			success: true,
 		};
 	}
 
+	constructor(argv: string[], cmdConfig: Config) {
+		super(argv, cmdConfig);
+
+		if (!process.env.N8N_ENCRYPTION_KEY) {
+			throw new ApplicationError(
+				'Missing encryption key. Worker started without the required N8N_ENCRYPTION_KEY env var. More information: https://docs.n8n.io/hosting/environment-variables/configuration-methods/#encryption-key',
+			);
+		}
+
+		this.setInstanceType('worker');
+		this.setInstanceQueueModeId();
+	}
+
 	async init() {
+		const { QUEUE_WORKER_TIMEOUT } = process.env;
+		if (QUEUE_WORKER_TIMEOUT) {
+			this.gracefulShutdownTimeoutInS =
+				parseInt(QUEUE_WORKER_TIMEOUT, 10) || config.default('queue.bull.gracefulShutdownTimeout');
+			this.logger.warn(
+				'QUEUE_WORKER_TIMEOUT has been deprecated. Rename it to N8N_GRACEFUL_SHUTDOWN_TIMEOUT.',
+			);
+		}
 		await this.initCrashJournal();
-		await super.init();
+
 		this.logger.debug('Starting n8n worker...');
+		this.logger.debug(`Queue mode id: ${this.queueModeId}`);
+
+		await super.init();
 
-		await this.initBinaryManager();
+		await this.initLicense();
+		this.logger.debug('License init complete');
+		await this.initBinaryDataService();
+		this.logger.debug('Binary data service init complete');
 		await this.initExternalHooks();
+		this.logger.debug('External hooks init complete');
+		await this.initExternalSecrets();
+		this.logger.debug('External secrets init complete');
+		await this.initEventBus();
+		this.logger.debug('Event bus init complete');
+		await this.initQueue();
+		this.logger.debug('Queue init complete');
+		await this.initOrchestration();
+		this.logger.debug('Orchestration init complete');
+
+		await Container.get(OrchestrationWorkerService).publishToEventLog(
+			new EventMessageGeneric({
+				eventName: 'n8n.worker.started',
+				payload: {
+					workerId: this.queueModeId,
+				},
+			}),
+		);
 	}
 
-	async run() {
-		// eslint-disable-next-line @typescript-eslint/no-shadow
-		const { flags } = this.parse(Worker);
+	async initEventBus() {
+		await Container.get(MessageEventBus).initialize({
+			workerId: this.queueModeId,
+		});
+	}
+
+	/**
+	 * Initializes the redis connection
+	 * A publishing connection to redis is created to publish events to the event log
+	 * A subscription connection to redis is created to subscribe to commands from the main process
+	 * The subscription connection adds a handler to handle the command messages
+	 */
+	async initOrchestration() {
+		await Container.get(OrchestrationWorkerService).init();
+		await Container.get(OrchestrationHandlerWorkerService).initWithOptions({
+			queueModeId: this.queueModeId,
+			redisPublisher: Container.get(OrchestrationWorkerService).redisPublisher,
+			getRunningJobIds: () => Object.keys(Worker.runningJobs),
+			getRunningJobsSummary: () => Object.values(Worker.runningJobsSummary),
+		});
+	}
+
+	async initQueue() {
+		const { flags } = await this.parse(Worker);
 
-		// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 		const redisConnectionTimeoutLimit = config.getEnv('queue.bull.redis.timeoutThreshold');
 
-		const queue = Container.get(Queue);
-		await queue.init();
-		Worker.jobQueue = queue.getBullObjectInstance();
-		// eslint-disable-next-line @typescript-eslint/no-floating-promises
-		Worker.jobQueue.process(flags.concurrency, async (job) => this.runJob(job, this.nodeTypes));
+		this.logger.debug(
+			`Opening Redis connection to listen to messages with timeout ${redisConnectionTimeoutLimit}`,
+		);
 
-		this.logger.info('\nn8n worker is now ready');
-		this.logger.info(` * Version: ${N8N_VERSION}`);
-		this.logger.info(` * Concurrency: ${flags.concurrency}`);
-		this.logger.info('');
+		Worker.jobQueue = Container.get(Queue);
+		await Worker.jobQueue.init();
+		this.logger.debug('Queue singleton ready');
+		void Worker.jobQueue.process(
+			flags.concurrency,
+			async (job) => await this.runJob(job, this.nodeTypes),
+		);
 
-		Worker.jobQueue.on('global:progress', (jobId: JobId, progress) => {
+		Worker.jobQueue.getBullObjectInstance().on('global:progress', (jobId: JobId, progress) => {
 			// Progress of a job got updated which does get used
 			// to communicate that a job got canceled.
 
@@ -263,7 +343,7 @@ export class Worker extends BaseCommand {
 
 		let lastTimer = 0;
 		let cumulativeTimeout = 0;
-		Worker.jobQueue.on('error', (error: Error) => {
+		Worker.jobQueue.getBullObjectInstance().on('error', (error: Error) => {
 			if (error.toString().includes('ECONNREFUSED')) {
 				const now = Date.now();
 				if (now - lastTimer > 30000) {
@@ -289,73 +369,123 @@ export class Worker extends BaseCommand {
 				process.exit(2);
 			} else {
 				this.logger.error('Error from queue: ', error);
+
+				if (error.message.includes('job stalled more than maxStalledCount')) {
+					throw new MaxStalledCountError(error);
+				}
+
 				throw error;
 			}
 		});
+	}
 
-		if (config.getEnv('queue.health.active')) {
-			const port = config.getEnv('queue.health.port');
+	async setupHealthMonitor() {
+		const port = config.getEnv('queue.health.port');
 
-			const app = express();
-			app.disable('x-powered-by');
+		const app = express();
+		app.disable('x-powered-by');
 
-			const server = http.createServer(app);
+		const server = http.createServer(app);
 
-			app.get(
-				'/healthz',
-				// eslint-disable-next-line consistent-return
-				async (req: express.Request, res: express.Response) => {
-					LoggerProxy.debug('Health check started!');
+		app.get(
+			'/healthz',
 
-					const connection = Db.getConnection();
+			async (req: express.Request, res: express.Response) => {
+				this.logger.debug('Health check started!');
 
-					try {
-						if (!connection.isInitialized) {
-							// Connection is not active
-							throw new Error('No active database connection!');
-						}
-						// DB ping
-						await connection.query('SELECT 1');
-					} catch (e) {
-						LoggerProxy.error('No Database connection!', e as Error);
-						const error = new ResponseHelper.ServiceUnavailableError('No Database connection!');
-						return ResponseHelper.sendErrorResponse(res, error);
-					}
+				const connection = Db.getConnection();
 
-					// Just to be complete, generally will the worker stop automatically
-					// if it loses the connection to redis
-					try {
-						// Redis ping
-						await Worker.jobQueue.client.ping();
-					} catch (e) {
-						LoggerProxy.error('No Redis connection!', e as Error);
-						const error = new ResponseHelper.ServiceUnavailableError('No Redis connection!');
-						return ResponseHelper.sendErrorResponse(res, error);
+				try {
+					if (!connection.isInitialized) {
+						// Connection is not active
+						throw new ApplicationError('No active database connection');
 					}
+					// DB ping
+					await connection.query('SELECT 1');
+				} catch (e) {
+					this.logger.error('No Database connection!', e as Error);
+					const error = new ServiceUnavailableError('No Database connection!');
+					return ResponseHelper.sendErrorResponse(res, error);
+				}
 
-					// Everything fine
-					const responseData = {
-						status: 'ok',
-					};
+				// Just to be complete, generally will the worker stop automatically
+				// if it loses the connection to redis
+				try {
+					// Redis ping
+					await Worker.jobQueue.ping();
+				} catch (e) {
+					this.logger.error('No Redis connection!', e as Error);
+					const error = new ServiceUnavailableError('No Redis connection!');
+					return ResponseHelper.sendErrorResponse(res, error);
+				}
+
+				// Everything fine
+				const responseData = {
+					status: 'ok',
+				};
+
+				this.logger.debug('Health check completed successfully!');
+
+				ResponseHelper.sendSuccessResponse(res, responseData, true, 200);
+			},
+		);
 
-					LoggerProxy.debug('Health check completed successfully!');
+		let presetCredentialsLoaded = false;
+		const endpointPresetCredentials = config.getEnv('credentials.overwrite.endpoint');
+		if (endpointPresetCredentials !== '') {
+			// POST endpoint to set preset credentials
+			app.post(
+				`/${endpointPresetCredentials}`,
+				rawBodyReader,
+				bodyParser,
+				async (req: express.Request, res: express.Response) => {
+					if (!presetCredentialsLoaded) {
+						const body = req.body as ICredentialsOverwrite;
+
+						if (req.contentType !== 'application/json') {
+							ResponseHelper.sendErrorResponse(
+								res,
+								new Error(
+									'Body must be a valid JSON, make sure the content-type is application/json',
+								),
+							);
+							return;
+						}
 
-					ResponseHelper.sendSuccessResponse(res, responseData, true, 200);
+						Container.get(CredentialsOverwrites).setData(body);
+						presetCredentialsLoaded = true;
+						ResponseHelper.sendSuccessResponse(res, { success: true }, true, 200);
+					} else {
+						ResponseHelper.sendErrorResponse(res, new Error('Preset credentials can be set once'));
+					}
 				},
 			);
+		}
 
-			server.listen(port, () => {
-				this.logger.info(`\nn8n worker health check via, port ${port}`);
-			});
+		server.on('error', (error: Error & { code: string }) => {
+			if (error.code === 'EADDRINUSE') {
+				this.logger.error(
+					`n8n's port ${port} is already in use. Do you have the n8n main process running on that port?`,
+				);
+				process.exit(1);
+			}
+		});
 
-			server.on('error', (error: Error & { code: string }) => {
-				if (error.code === 'EADDRINUSE') {
-					this.logger.error(
-						`n8n's port ${port} is already in use. Do you have the n8n main process running on that port?`,
-					);
-					process.exit(1);
-				}
-			});
+		await new Promise<void>((resolve) => server.listen(port, () => resolve()));
+		await this.externalHooks?.run('worker.ready');
+		this.logger.info(`\nn8n worker health check via, port ${port}`);
+	}
+
+	async run() {
+		const { flags } = await this.parse(Worker);
+
+		this.logger.info('\nn8n worker is now ready');
+		this.logger.info(` * Version: ${N8N_VERSION}`);
+		this.logger.info(` * Concurrency: ${flags.concurrency}`);
+		this.logger.info('');
+
+		if (config.getEnv('queue.health.active')) {
+			await this.setupHealthMonitor();
 		}
 
 		// Make sure that the process does not close
diff --git a/packages/cli/src/config/index.ts b/packages/cli/src/config/index.ts
index 4b87524611196..2ad950837a03b 100644
--- a/packages/cli/src/config/index.ts
+++ b/packages/cli/src/config/index.ts
@@ -1,29 +1,27 @@
 import convict from 'convict';
 import dotenv from 'dotenv';
-import { tmpdir } from 'os';
-import { mkdtempSync, readFileSync } from 'fs';
-import { join } from 'path';
-import { schema } from './schema';
+import { readFileSync } from 'fs';
+import { ApplicationError, setGlobalState } from 'n8n-workflow';
 import { inTest, inE2ETests } from '@/constants';
 
 if (inE2ETests) {
 	// Skip loading config from env variables in end-to-end tests
-	process.env = {
-		E2E_TESTS: 'true',
-		N8N_USER_FOLDER: mkdtempSync(join(tmpdir(), 'n8n-e2e-')),
-		EXECUTIONS_PROCESS: 'main',
-		N8N_DIAGNOSTICS_ENABLED: 'false',
-		N8N_PUBLIC_API_DISABLED: 'true',
-		EXTERNAL_FRONTEND_HOOKS_URLS: '',
-		N8N_PERSONALIZATION_ENABLED: 'false',
-	};
+	process.env.N8N_DIAGNOSTICS_ENABLED = 'false';
+	process.env.N8N_PUBLIC_API_DISABLED = 'true';
+	process.env.EXTERNAL_FRONTEND_HOOKS_URLS = '';
+	process.env.N8N_PERSONALIZATION_ENABLED = 'false';
+	process.env.N8N_AI_ENABLED = 'true';
 } else if (inTest) {
+	process.env.N8N_LOG_LEVEL = 'silent';
 	process.env.N8N_PUBLIC_API_DISABLED = 'true';
-	process.env.N8N_PUBLIC_API_SWAGGERUI_DISABLED = 'true';
+	process.env.SKIP_STATISTICS_EVENTS = 'true';
+	process.env.N8N_SECURE_COOKIE = 'false';
 } else {
 	dotenv.config();
 }
 
+// Load schema after process.env has been overwritten
+import { schema } from './schema';
 const config = convict(schema, { args: [] });
 
 // eslint-disable-next-line @typescript-eslint/unbound-method
@@ -54,7 +52,7 @@ if (!inE2ETests && !inTest) {
 				} catch (error) {
 					// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 					if (error.code === 'ENOENT') {
-						throw new Error(`The file "${fileName}" could not be found.`);
+						throw new ApplicationError('File not found', { extra: { fileName } });
 					}
 					throw error;
 				}
@@ -64,10 +62,42 @@ if (!inE2ETests && !inTest) {
 	});
 }
 
+// Validate Configuration
 config.validate({
 	allowed: 'strict',
 });
+const userManagement = config.get('userManagement');
+if (userManagement.jwtRefreshTimeoutHours >= userManagement.jwtSessionDurationHours) {
+	console.warn(
+		'N8N_USER_MANAGEMENT_JWT_REFRESH_TIMEOUT_HOURS needs to smaller than N8N_USER_MANAGEMENT_JWT_DURATION_HOURS. Setting N8N_USER_MANAGEMENT_JWT_REFRESH_TIMEOUT_HOURS to 0 for now.',
+	);
+
+	config.set('userManagement.jwtRefreshTimeoutHours', 0);
+}
+
+import colors from 'picocolors';
+const executionProcess = config.getEnv('executions.process');
+if (executionProcess) {
+	console.error(
+		colors.yellow('Please unset the deprecated env variable'),
+		colors.bold(colors.yellow('EXECUTIONS_PROCESS')),
+	);
+}
+if (executionProcess === 'own') {
+	console.error(
+		colors.bold(colors.red('Application failed to start because "Own" mode has been removed.')),
+	);
+	console.error(
+		colors.red(
+			'If you need the isolation and performance gains, please consider using queue mode instead.\n\n',
+		),
+	);
+	process.exit(-1);
+}
+
+setGlobalState({
+	defaultTimezone: config.getEnv('generic.timezone'),
+});
 
 // eslint-disable-next-line import/no-default-export
 export default config;
-export type Config = typeof config;
diff --git a/packages/cli/src/config/schema.ts b/packages/cli/src/config/schema.ts
index e570109f11240..15e746f2d9837 100644
--- a/packages/cli/src/config/schema.ts
+++ b/packages/cli/src/config/schema.ts
@@ -1,31 +1,23 @@
-/* eslint-disable no-restricted-syntax */
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import path from 'path';
 import convict from 'convict';
-import { UserSettings } from 'n8n-core';
-import { jsonParse } from 'n8n-workflow';
+import { Container } from 'typedi';
+import { InstanceSettings } from 'n8n-core';
+import { LOG_LEVELS, jsonParse } from 'n8n-workflow';
+import { ensureStringArray } from './utils';
 
 convict.addFormat({
-	name: 'nodes-list',
-	// @ts-ignore
-	validate(values: string[], { env }: { env: string }): void {
-		try {
-			if (!Array.isArray(values)) {
-				throw new Error();
-			}
+	name: 'json-string-array',
+	coerce: (rawStr: string) =>
+		jsonParse<string[]>(rawStr, {
+			errorMessage: `Expected this value "${rawStr}" to be valid JSON`,
+		}),
+	validate: ensureStringArray,
+});
 
-			for (const value of values) {
-				if (typeof value !== 'string') {
-					throw new Error();
-				}
-			}
-		} catch (error) {
-			throw new TypeError(`${env} is not a valid Array of strings.`);
-		}
-	},
-	coerce(rawValue: string): string[] {
-		return jsonParse(rawValue, { errorMessage: 'nodes-list needs to be valid JSON' });
-	},
+convict.addFormat({
+	name: 'comma-separated-list',
+	coerce: (rawStr: string) => rawStr.split(','),
+	validate: ensureStringArray,
 });
 
 export const schema = {
@@ -58,7 +50,7 @@ export const schema = {
 			maxQueryExecutionTime: {
 				doc: 'Maximum number of milliseconds query should be executed before logger logs a warning. Set 0 to disable long running query warning',
 				format: Number,
-				default: 1000,
+				default: 0, // 0 disables the slow-query log
 				env: 'DB_LOGGING_MAX_EXECUTION_TIME',
 			},
 		},
@@ -90,7 +82,7 @@ export const schema = {
 			user: {
 				doc: 'PostgresDB User',
 				format: String,
-				default: 'root',
+				default: 'postgres',
 				env: 'DB_POSTGRESDB_USER',
 			},
 			schema: {
@@ -99,8 +91,20 @@ export const schema = {
 				default: 'public',
 				env: 'DB_POSTGRESDB_SCHEMA',
 			},
+			poolSize: {
+				doc: 'PostgresDB Pool Size',
+				format: Number,
+				default: 2,
+				env: 'DB_POSTGRESDB_POOL_SIZE',
+			},
 
 			ssl: {
+				enabled: {
+					doc: 'If SSL should be enabled. If `ca`, `cert`, or `key` are defined, this will automatically default to true',
+					format: Boolean,
+					default: false,
+					env: 'DB_POSTGRESDB_SSL_ENABLED',
+				},
 				ca: {
 					doc: 'SSL certificate authority',
 					format: String,
@@ -121,7 +125,7 @@ export const schema = {
 				},
 				rejectUnauthorized: {
 					doc: 'If unauthorized SSL connections should be rejected',
-					format: 'Boolean',
+					format: Boolean,
 					default: true,
 					env: 'DB_POSTGRESDB_SSL_REJECT_UNAUTHORIZED',
 				},
@@ -129,7 +133,7 @@ export const schema = {
 		},
 		mysqldb: {
 			database: {
-				doc: 'MySQL Database',
+				doc: '[DEPRECATED] MySQL Database',
 				format: String,
 				default: 'n8n',
 				env: 'DB_MYSQLDB_DATABASE',
@@ -166,6 +170,18 @@ export const schema = {
 				default: 'database.sqlite',
 				env: 'DB_SQLITE_DATABASE',
 			},
+			enableWAL: {
+				doc: 'Enable SQLite WAL mode (Always enabled for pool-size > 1)',
+				format: Boolean,
+				default: false,
+				env: 'DB_SQLITE_ENABLE_WAL',
+			},
+			poolSize: {
+				doc: 'SQLite Pool Size (Setting this to 0 disables pooling)',
+				format: Number,
+				default: 0,
+				env: 'DB_SQLITE_POOL_SIZE',
+			},
 			executeVacuumOnStartup: {
 				doc: 'Runs VACUUM operation on startup to rebuild the database. Reduces filesize and optimizes indexes. WARNING: This is a long running blocking operation. Will increase start-up time.',
 				format: Boolean,
@@ -211,7 +227,7 @@ export const schema = {
 		},
 		onboardingFlowDisabled: {
 			doc: 'Show onboarding flow in new workflow',
-			format: 'Boolean',
+			format: Boolean,
 			default: false,
 			env: 'N8N_ONBOARDING_FLOW_DISABLED',
 		},
@@ -224,16 +240,13 @@ export const schema = {
 	},
 
 	executions: {
-		// By default workflows get always executed in their own process.
-		// If this option gets set to "main" it will run them in the
-		// main-process instead.
+		// TODO: remove this and all usage of `executions.process` when we're sure that nobody has this in their config file anymore.
 		process: {
-			doc: 'In what process workflows should be executed',
-			format: ['main', 'own'] as const,
-			default: 'own',
+			doc: 'Deprecated key, that will be removed in the future. Please remove it from your configuration and environment variables to prevent issues in the future.',
+			format: String,
+			default: '',
 			env: 'EXECUTIONS_PROCESS',
 		},
-
 		mode: {
 			doc: 'If it should run executions directly or via queue',
 			format: ['regular', 'queue'] as const,
@@ -285,7 +298,7 @@ export const schema = {
 		},
 		saveExecutionProgress: {
 			doc: 'Whether or not to save progress for each node executed',
-			format: 'Boolean',
+			format: Boolean,
 			default: false,
 			env: 'EXECUTIONS_DATA_SAVE_ON_PROGRESS',
 		},
@@ -297,42 +310,56 @@ export const schema = {
 		// in the editor.
 		saveDataManualExecutions: {
 			doc: 'Save data of executions when started manually via editor',
-			format: 'Boolean',
-			default: false,
+			format: Boolean,
+			default: true,
 			env: 'EXECUTIONS_DATA_SAVE_MANUAL_EXECUTIONS',
 		},
 
 		// To not exceed the database's capacity and keep its size moderate
-		// the execution data gets pruned regularly (default: 1 hour interval).
+		// the execution data gets pruned regularly (default: 15 minute interval).
 		// All saved execution data older than the max age will be deleted.
 		// Pruning is currently not activated by default, which will change in
 		// a future version.
 		pruneData: {
 			doc: 'Delete data of past executions on a rolling basis',
-			format: 'Boolean',
-			default: false,
+			format: Boolean,
+			default: true,
 			env: 'EXECUTIONS_DATA_PRUNE',
 		},
 		pruneDataMaxAge: {
-			doc: 'How old (hours) the execution data has to be to get deleted',
+			doc: 'How old (hours) the finished execution data has to be to get soft-deleted',
 			format: Number,
 			default: 336,
 			env: 'EXECUTIONS_DATA_MAX_AGE',
 		},
-		pruneDataTimeout: {
-			doc: 'Timeout (seconds) after execution data has been pruned',
+		pruneDataHardDeleteBuffer: {
+			doc: 'How old (hours) the finished execution data has to be to get hard-deleted. By default, this buffer excludes recent executions as the user may need them while building a workflow.',
 			format: Number,
-			default: 3600,
-			env: 'EXECUTIONS_DATA_PRUNE_TIMEOUT',
+			default: 1,
+			env: 'EXECUTIONS_DATA_HARD_DELETE_BUFFER',
+		},
+		pruneDataIntervals: {
+			hardDelete: {
+				doc: 'How often (minutes) execution data should be hard-deleted',
+				format: Number,
+				default: 15,
+				env: 'EXECUTIONS_DATA_PRUNE_HARD_DELETE_INTERVAL',
+			},
+			softDelete: {
+				doc: 'How often (minutes) execution data should be soft-deleted',
+				format: Number,
+				default: 60,
+				env: 'EXECUTIONS_DATA_PRUNE_SOFT_DELETE_INTERVAL',
+			},
 		},
 
 		// Additional pruning option to delete executions if total count exceeds the configured max.
 		// Deletes the oldest entries first
-		// Default is 0 = No limit
+		// Set to 0 for No limit
 		pruneDataMaxCount: {
-			doc: 'Maximum number of executions to keep in DB. Default 0 = no limit',
+			doc: "Maximum number of finished executions to keep in DB. Doesn't necessarily prune exactly to max number. 0 = no limit",
 			format: Number,
-			default: 0,
+			default: 10000,
 			env: 'EXECUTIONS_DATA_PRUNE_MAX_COUNT',
 		},
 	},
@@ -341,7 +368,7 @@ export const schema = {
 		health: {
 			active: {
 				doc: 'If health checks should be enabled',
-				format: 'Boolean',
+				format: Boolean,
 				default: false,
 				env: 'QUEUE_HEALTH_CHECK_ACTIVE',
 			},
@@ -354,9 +381,9 @@ export const schema = {
 		},
 		bull: {
 			prefix: {
-				doc: 'Prefix for all queue keys',
+				doc: 'Prefix for all bull queue keys',
 				format: String,
-				default: '',
+				default: 'bull',
 				env: 'QUEUE_BULL_PREFIX',
 			},
 			redis: {
@@ -396,6 +423,18 @@ export const schema = {
 					default: '',
 					env: 'QUEUE_BULL_REDIS_USERNAME',
 				},
+				clusterNodes: {
+					doc: 'Redis Cluster startup nodes (comma separated list of host:port pairs)',
+					format: String,
+					default: '',
+					env: 'QUEUE_BULL_REDIS_CLUSTER_NODES',
+				},
+				tls: {
+					format: Boolean,
+					default: false,
+					env: 'QUEUE_BULL_REDIS_TLS',
+					doc: 'Enable TLS on Redis connections. Default: false',
+				},
 			},
 			queueRecoveryInterval: {
 				doc: 'If > 0 enables an active polling to the queue that can recover for Redis crashes. Given in seconds; 0 is disabled. May increase Redis traffic significantly.',
@@ -404,11 +443,37 @@ export const schema = {
 				env: 'QUEUE_RECOVERY_INTERVAL',
 			},
 			gracefulShutdownTimeout: {
-				doc: 'How long should n8n wait for running executions before exiting worker process',
+				doc: '[DEPRECATED] (Use N8N_GRACEFUL_SHUTDOWN_TIMEOUT instead) How long should n8n wait for running executions before exiting worker process (seconds)',
 				format: Number,
 				default: 30,
 				env: 'QUEUE_WORKER_TIMEOUT',
 			},
+			settings: {
+				lockDuration: {
+					doc: 'How long (ms) is the lease period for a worker to work on a message',
+					format: Number,
+					default: 30000,
+					env: 'QUEUE_WORKER_LOCK_DURATION',
+				},
+				lockRenewTime: {
+					doc: 'How frequently (ms) should a worker renew the lease time',
+					format: Number,
+					default: 15000,
+					env: 'QUEUE_WORKER_LOCK_RENEW_TIME',
+				},
+				stalledInterval: {
+					doc: 'How often check for stalled jobs (use 0 for never checking)',
+					format: Number,
+					default: 30000,
+					env: 'QUEUE_WORKER_STALLED_INTERVAL',
+				},
+				maxStalledCount: {
+					doc: 'Max amount of times a stalled job will be re-processed',
+					format: Number,
+					default: 1,
+					env: 'QUEUE_WORKER_MAX_STALLED_COUNT',
+				},
+			},
 		},
 	},
 
@@ -423,6 +488,26 @@ export const schema = {
 			default: 'America/New_York',
 			env: 'GENERIC_TIMEZONE',
 		},
+
+		instanceType: {
+			doc: 'Type of n8n instance',
+			format: ['main', 'webhook', 'worker'] as const,
+			default: 'main',
+		},
+
+		releaseChannel: {
+			doc: 'N8N release channel',
+			format: ['stable', 'beta', 'nightly', 'dev'] as const,
+			default: 'dev',
+			env: 'N8N_RELEASE_TYPE',
+		},
+
+		gracefulShutdownTimeout: {
+			doc: 'How long should n8n process wait for components to shut down before exiting the process (seconds)',
+			format: Number,
+			default: 30,
+			env: 'N8N_GRACEFUL_SHUTDOWN_TIMEOUT',
+		},
 	},
 
 	// How n8n can be reached (Editor & REST-API)
@@ -459,6 +544,12 @@ export const schema = {
 		env: 'N8N_PROTOCOL',
 		doc: 'HTTP Protocol via which n8n can be reached',
 	},
+	secure_cookie: {
+		doc: 'This sets the `Secure` flag on n8n auth cookie',
+		format: Boolean,
+		default: true,
+		env: 'N8N_SECURE_COOKIE',
+	},
 	ssl_key: {
 		format: String,
 		default: '',
@@ -479,6 +570,18 @@ export const schema = {
 	},
 
 	security: {
+		restrictFileAccessTo: {
+			doc: 'If set only files in that directories can be accessed. Multiple directories can be separated by semicolon (";").',
+			format: String,
+			default: '',
+			env: 'N8N_RESTRICT_FILE_ACCESS_TO',
+		},
+		blockFileAccessToN8nFiles: {
+			doc: 'If set to true it will block access to all files in the ".n8n" directory and user defined config files.',
+			format: Boolean,
+			default: true,
+			env: 'N8N_BLOCK_FILE_ACCESS_TO_N8N_FILES',
+		},
 		audit: {
 			daysAbandonedWorkflow: {
 				doc: 'Days for a workflow to be considered abandoned if not executed',
@@ -487,88 +590,6 @@ export const schema = {
 				env: 'N8N_SECURITY_AUDIT_DAYS_ABANDONED_WORKFLOW',
 			},
 		},
-		excludeEndpoints: {
-			doc: 'Additional endpoints to exclude auth checks. Multiple endpoints can be separated by colon (":")',
-			format: String,
-			default: '',
-			env: 'N8N_AUTH_EXCLUDE_ENDPOINTS',
-		},
-		basicAuth: {
-			active: {
-				format: 'Boolean',
-				default: false,
-				env: 'N8N_BASIC_AUTH_ACTIVE',
-				doc: 'If basic auth should be activated for editor and REST-API',
-			},
-			user: {
-				format: String,
-				default: '',
-				env: 'N8N_BASIC_AUTH_USER',
-				doc: 'The name of the basic auth user',
-			},
-			password: {
-				format: String,
-				default: '',
-				env: 'N8N_BASIC_AUTH_PASSWORD',
-				doc: 'The password of the basic auth user',
-			},
-			hash: {
-				format: 'Boolean',
-				default: false,
-				env: 'N8N_BASIC_AUTH_HASH',
-				doc: 'If password for basic auth is hashed',
-			},
-		},
-		jwtAuth: {
-			active: {
-				format: 'Boolean',
-				default: false,
-				env: 'N8N_JWT_AUTH_ACTIVE',
-				doc: 'If JWT auth should be activated for editor and REST-API',
-			},
-			jwtHeader: {
-				format: String,
-				default: '',
-				env: 'N8N_JWT_AUTH_HEADER',
-				doc: 'The request header containing a signed JWT',
-			},
-			jwtHeaderValuePrefix: {
-				format: String,
-				default: '',
-				env: 'N8N_JWT_AUTH_HEADER_VALUE_PREFIX',
-				doc: 'The request header value prefix to strip (optional)',
-			},
-			jwksUri: {
-				format: String,
-				default: '',
-				env: 'N8N_JWKS_URI',
-				doc: 'The URI to fetch JWK Set for JWT authentication',
-			},
-			jwtIssuer: {
-				format: String,
-				default: '',
-				env: 'N8N_JWT_ISSUER',
-				doc: 'JWT issuer to expect (optional)',
-			},
-			jwtNamespace: {
-				format: String,
-				default: '',
-				env: 'N8N_JWT_NAMESPACE',
-				doc: 'JWT namespace to expect (optional)',
-			},
-			jwtAllowedTenantKey: {
-				format: String,
-				default: '',
-				env: 'N8N_JWT_ALLOWED_TENANT_KEY',
-				doc: 'JWT tenant key name to inspect within JWT namespace (optional)',
-			},
-			jwtAllowedTenant: {
-				format: String,
-				default: '',
-				env: 'N8N_JWT_ALLOWED_TENANT',
-				doc: 'JWT tenant to allow (optional)',
-			},
-		},
 	},
 
 	endpoints: {
@@ -580,7 +601,7 @@ export const schema = {
 		},
 		metrics: {
 			enable: {
-				format: 'Boolean',
+				format: Boolean,
 				default: false,
 				env: 'N8N_METRICS',
 				doc: 'Enable /metrics endpoint. Default: false',
@@ -639,6 +660,18 @@ export const schema = {
 				env: 'N8N_METRICS_INCLUDE_API_STATUS_CODE_LABEL',
 				doc: 'Whether to include a label for the HTTP status code (200, 404, ...) of API invocations. Default: false',
 			},
+			includeCacheMetrics: {
+				format: Boolean,
+				default: false,
+				env: 'N8N_METRICS_INCLUDE_CACHE_METRICS',
+				doc: 'Whether to include metrics for cache hits and misses. Default: false',
+			},
+			includeMessageEventBusMetrics: {
+				format: Boolean,
+				default: true,
+				env: 'N8N_METRICS_INCLUDE_MESSAGE_EVENT_BUS_METRICS',
+				doc: 'Whether to include metrics for events. Default: false',
+			},
 		},
 		rest: {
 			format: String,
@@ -646,6 +679,24 @@ export const schema = {
 			env: 'N8N_ENDPOINT_REST',
 			doc: 'Path for rest endpoint',
 		},
+		form: {
+			format: String,
+			default: 'form',
+			env: 'N8N_ENDPOINT_FORM',
+			doc: 'Path for form endpoint',
+		},
+		formTest: {
+			format: String,
+			default: 'form-test',
+			env: 'N8N_ENDPOINT_FORM_TEST',
+			doc: 'Path for test form endpoint',
+		},
+		formWaiting: {
+			format: String,
+			default: 'form-waiting',
+			env: 'N8N_ENDPOINT_FORM_WAIT',
+			doc: 'Path for waiting form endpoint',
+		},
 		webhook: {
 			format: String,
 			default: 'webhook',
@@ -676,23 +727,11 @@ export const schema = {
 			env: 'N8N_DISABLE_PRODUCTION_MAIN_PROCESS',
 			doc: 'Disable production webhooks from main process. This helps ensures no http traffic load to main process when using webhook-specific processes.',
 		},
-		skipWebhooksDeregistrationOnShutdown: {
-			/**
-			 * Longer explanation: n8n de-registers webhooks on shutdown / deactivation
-			 * and registers on startup / activation. If we skip
-			 * deactivation on shutdown, webhooks will remain active on 3rd party services.
-			 * We don't have to worry about startup as it always
-			 * checks if webhooks already exist.
-			 * If users want to upgrade n8n, it is possible to run
-			 * two instances simultaneously without downtime, similar
-			 * to blue/green deployment.
-			 * WARNING: Trigger nodes (like Cron) will cause duplication
-			 * of work, so be aware when using.
-			 */
-			doc: 'Deregister webhooks on external services only when workflows are deactivated.',
-			format: Boolean,
-			default: false,
-			env: 'N8N_SKIP_WEBHOOK_DEREGISTRATION_SHUTDOWN',
+		additionalNonUIRoutes: {
+			doc: 'Additional endpoints to not open the UI on. Multiple endpoints can be separated by colon (":")',
+			format: String,
+			default: '',
+			env: 'N8N_ADDITIONAL_NON_UI_ROUTES',
 		},
 	},
 
@@ -727,30 +766,30 @@ export const schema = {
 	},
 
 	userManagement: {
-		disabled: {
-			doc: 'Disable user management and hide it completely.',
-			format: Boolean,
-			default: false,
-			env: 'N8N_USER_MANAGEMENT_DISABLED',
-		},
 		jwtSecret: {
 			doc: 'Set a specific JWT secret (optional - n8n can generate one)', // Generated @ start.ts
 			format: String,
 			default: '',
 			env: 'N8N_USER_MANAGEMENT_JWT_SECRET',
 		},
+		jwtSessionDurationHours: {
+			doc: 'Set a specific expiration date for the JWTs in hours.',
+			format: Number,
+			default: 168,
+			env: 'N8N_USER_MANAGEMENT_JWT_DURATION_HOURS',
+		},
+		jwtRefreshTimeoutHours: {
+			doc: 'How long before the JWT expires to automatically refresh it. 0 means 25% of N8N_USER_MANAGEMENT_JWT_DURATION_HOURS. -1 means it will never refresh, which forces users to login again after the defined period in N8N_USER_MANAGEMENT_JWT_DURATION_HOURS.',
+			format: Number,
+			default: 0,
+			env: 'N8N_USER_MANAGEMENT_JWT_REFRESH_TIMEOUT_HOURS',
+		},
 		isInstanceOwnerSetUp: {
 			// n8n loads this setting from DB on startup
 			doc: "Whether the instance owner's account has been set up",
 			format: Boolean,
 			default: false,
 		},
-		skipInstanceOwnerSetup: {
-			// n8n loads this setting from DB on startup
-			doc: 'Whether to hide the prompt the first time n8n starts with UM enabled',
-			format: Boolean,
-			default: false,
-		},
 		emails: {
 			mode: {
 				doc: 'How to send emails',
@@ -790,6 +829,18 @@ export const schema = {
 						default: '',
 						env: 'N8N_SMTP_PASS',
 					},
+					serviceClient: {
+						doc: 'SMTP OAuth Service Client',
+						format: String,
+						default: '',
+						env: 'N8N_SMTP_OAUTH_SERVICE_CLIENT',
+					},
+					privateKey: {
+						doc: 'SMTP OAuth Private Key',
+						format: String,
+						default: '',
+						env: 'N8N_SMTP_OAUTH_PRIVATE_KEY',
+					},
 				},
 				sender: {
 					doc: 'How to display sender name',
@@ -811,6 +862,18 @@ export const schema = {
 					default: '',
 					env: 'N8N_UM_EMAIL_TEMPLATES_PWRESET',
 				},
+				workflowShared: {
+					doc: 'Overrides default HTML template for notifying that a workflow was shared (use full path)',
+					format: String,
+					default: '',
+					env: 'N8N_UM_EMAIL_TEMPLATES_WORKFLOW_SHARED',
+				},
+				credentialsShared: {
+					doc: 'Overrides default HTML template for notifying that credentials were shared (use full path)',
+					format: String,
+					default: '',
+					env: 'N8N_UM_EMAIL_TEMPLATES_CREDENTIALS_SHARED',
+				},
 			},
 		},
 		authenticationMethod: {
@@ -823,7 +886,7 @@ export const schema = {
 	externalFrontendHooksUrls: {
 		doc: 'URLs to external frontend hooks files, ; separated',
 		format: String,
-		default: 'https://public.n8n.cloud/posthog-hooks.js',
+		default: '',
 		env: 'EXTERNAL_FRONTEND_HOOKS_URLS',
 	},
 
@@ -837,13 +900,13 @@ export const schema = {
 	nodes: {
 		include: {
 			doc: 'Nodes to load',
-			format: 'nodes-list',
+			format: 'json-string-array',
 			default: undefined,
 			env: 'NODES_INCLUDE',
 		},
 		exclude: {
 			doc: 'Nodes not to load',
-			format: 'nodes-list',
+			format: 'json-string-array',
 			default: undefined,
 			env: 'NODES_EXCLUDE',
 		},
@@ -861,18 +924,12 @@ export const schema = {
 				env: 'N8N_COMMUNITY_PACKAGES_ENABLED',
 			},
 		},
-		packagesMissing: {
-			// Used to have a persistent list of packages
-			doc: 'Contains a comma separated list of packages that failed to load during startup',
-			format: String,
-			default: '',
-		},
 	},
 
 	logs: {
 		level: {
 			doc: 'Log output level',
-			format: ['error', 'warn', 'info', 'verbose', 'debug', 'silent'] as const,
+			format: LOG_LEVELS,
 			default: 'info',
 			env: 'N8N_LOG_LEVEL',
 		},
@@ -898,7 +955,7 @@ export const schema = {
 			location: {
 				doc: 'Log file location; only used if log output is set to file.',
 				format: String,
-				default: path.join(UserSettings.getUserN8nFolderPath(), 'logs/n8n.log'),
+				default: path.join(Container.get(InstanceSettings).n8nFolder, 'logs/n8n.log'),
 				env: 'N8N_LOG_FILE_LOCATION',
 			},
 		},
@@ -943,7 +1000,7 @@ export const schema = {
 	push: {
 		backend: {
 			format: ['sse', 'websocket'] as const,
-			default: 'sse',
+			default: 'websocket',
 			env: 'N8N_PUSH_BACKEND',
 			doc: 'Backend to use for push notifications',
 		},
@@ -951,34 +1008,76 @@ export const schema = {
 
 	binaryDataManager: {
 		availableModes: {
-			format: String,
+			format: 'comma-separated-list',
 			default: 'filesystem',
 			env: 'N8N_AVAILABLE_BINARY_DATA_MODES',
 			doc: 'Available modes of binary data storage, as comma separated strings',
 		},
 		mode: {
-			format: ['default', 'filesystem'] as const,
+			format: ['default', 'filesystem', 's3'] as const,
 			default: 'default',
 			env: 'N8N_DEFAULT_BINARY_DATA_MODE',
 			doc: 'Storage mode for binary data',
 		},
 		localStoragePath: {
 			format: String,
-			default: path.join(UserSettings.getUserN8nFolderPath(), 'binaryData'),
+			default: path.join(Container.get(InstanceSettings).n8nFolder, 'binaryData'),
 			env: 'N8N_BINARY_DATA_STORAGE_PATH',
 			doc: 'Path for binary data storage in "filesystem" mode',
 		},
-		binaryDataTTL: {
-			format: Number,
-			default: 60,
-			env: 'N8N_BINARY_DATA_TTL',
-			doc: 'TTL for binary data of unsaved executions in minutes',
+	},
+
+	externalStorage: {
+		s3: {
+			host: {
+				format: String,
+				default: '',
+				env: 'N8N_EXTERNAL_STORAGE_S3_HOST',
+				doc: 'Host of the n8n bucket in S3-compatible external storage, e.g. `s3.us-east-1.amazonaws.com`',
+			},
+			bucket: {
+				name: {
+					format: String,
+					default: '',
+					env: 'N8N_EXTERNAL_STORAGE_S3_BUCKET_NAME',
+					doc: 'Name of the n8n bucket in S3-compatible external storage',
+				},
+				region: {
+					format: String,
+					default: '',
+					env: 'N8N_EXTERNAL_STORAGE_S3_BUCKET_REGION',
+					doc: 'Region of the n8n bucket in S3-compatible external storage, e.g. `us-east-1`',
+				},
+			},
+			credentials: {
+				accessKey: {
+					format: String,
+					default: '',
+					env: 'N8N_EXTERNAL_STORAGE_S3_ACCESS_KEY',
+					doc: 'Access key in S3-compatible external storage',
+				},
+				accessSecret: {
+					format: String,
+					default: '',
+					env: 'N8N_EXTERNAL_STORAGE_S3_ACCESS_SECRET',
+					doc: 'Access secret in S3-compatible external storage',
+				},
+			},
 		},
-		persistedBinaryDataTTL: {
+	},
+
+	externalSecrets: {
+		updateInterval: {
 			format: Number,
-			default: 1440,
-			env: 'N8N_PERSISTED_BINARY_DATA_TTL',
-			doc: 'TTL for persisted binary data in minutes (binary data gets deleted if not persisted before TTL expires)',
+			default: 300,
+			env: 'N8N_EXTERNAL_SECRETS_UPDATE_INTERVAL',
+			doc: 'How often (in seconds) to check for secret updates.',
+		},
+		preferGet: {
+			format: Boolean,
+			default: false,
+			env: 'N8N_EXTERNAL_SECRETS_PREFER_GET',
+			doc: 'Whether to prefer GET over LIST when fetching secrets from Hashicorp Vault.',
 		},
 	},
 
@@ -990,6 +1089,15 @@ export const schema = {
 		},
 	},
 
+	mfa: {
+		enabled: {
+			format: Boolean,
+			default: true,
+			doc: 'Whether to enable MFA feature in instance.',
+			env: 'N8N_MFA_ENABLED',
+		},
+	},
+
 	sso: {
 		justInTimeProvisioning: {
 			format: Boolean,
@@ -1042,15 +1150,6 @@ export const schema = {
 		},
 	},
 
-	userActivationSurvey: {
-		enabled: {
-			doc: 'Whether user activation survey is enabled.',
-			format: Boolean,
-			default: true,
-			env: 'N8N_USER_ACTIVATION_SURVEY_ENABLED',
-		},
-	},
-
 	diagnostics: {
 		enabled: {
 			doc: 'Whether diagnostic mode is enabled.',
@@ -1072,19 +1171,12 @@ export const schema = {
 					default: 'https://ph.n8n.io',
 					env: 'N8N_DIAGNOSTICS_POSTHOG_API_HOST',
 				},
-				disableSessionRecording: {
-					doc: 'Disable posthog session recording',
-					format: Boolean,
-					default: true,
-					env: 'N8N_DIAGNOSTICS_POSTHOG_DISABLE_RECORDING',
-				},
 			},
 			sentry: {
 				dsn: {
 					doc: 'Data source name for error tracking on Sentry',
 					format: String,
-					default:
-						'https://1f954e089a054b8e943ae4f4042b2bff@o1420875.ingest.sentry.io/4504016528408576',
+					default: '',
 					env: 'N8N_SENTRY_DSN',
 				},
 			},
@@ -1097,7 +1189,7 @@ export const schema = {
 			backend: {
 				doc: 'Diagnostics config for backend.',
 				format: String,
-				default: '1zPn7YoGC3ZXE9zLeTKLuQCB4F6;https://telemetry.n8n.io/v1/batch',
+				default: '1zPn7YoGC3ZXE9zLeTKLuQCB4F6;https://telemetry.n8n.io',
 				env: 'N8N_DIAGNOSTICS_CONFIG_BACKEND',
 			},
 		},
@@ -1192,5 +1284,172 @@ export const schema = {
 				env: 'N8N_EVENTBUS_LOGWRITER_LOGBASENAME',
 			},
 		},
+		crashRecoveryMode: {
+			doc: 'Should n8n try to recover execution details after a crash, or just mark pending executions as crashed',
+			format: ['simple', 'extensive'] as const,
+			default: 'extensive',
+			env: 'N8N_EVENTBUS_RECOVERY_MODE',
+		},
+	},
+
+	redis: {
+		prefix: {
+			doc: 'Prefix for all n8n related keys',
+			format: String,
+			default: 'n8n',
+			env: 'N8N_REDIS_KEY_PREFIX',
+		},
+		queueModeId: {
+			doc: 'Unique ID for this n8n instance, is usually set automatically by n8n during startup',
+			format: String,
+			default: '',
+		},
+	},
+
+	cache: {
+		backend: {
+			doc: 'Backend to use for caching',
+			format: ['memory', 'redis', 'auto'] as const,
+			default: 'auto',
+			env: 'N8N_CACHE_BACKEND',
+		},
+		memory: {
+			maxSize: {
+				doc: 'Maximum size of memory cache in bytes',
+				format: Number,
+				default: 3 * 1024 * 1024, // 3 MB
+				env: 'N8N_CACHE_MEMORY_MAX_SIZE',
+			},
+			ttl: {
+				doc: 'Time to live for cached items in memory (in ms)',
+				format: Number,
+				default: 3600 * 1000, // 1 hour
+				env: 'N8N_CACHE_MEMORY_TTL',
+			},
+		},
+		redis: {
+			prefix: {
+				doc: 'Prefix for all cache keys',
+				format: String,
+				default: 'cache',
+				env: 'N8N_CACHE_REDIS_KEY_PREFIX',
+			},
+			ttl: {
+				doc: 'Time to live for cached items in redis (in ms), 0 for no TTL',
+				format: Number,
+				default: 3600 * 1000, // 1 hour
+				env: 'N8N_CACHE_REDIS_TTL',
+			},
+		},
+	},
+
+	ai: {
+		enabled: {
+			doc: 'Whether AI features are enabled',
+			format: Boolean,
+			default: false,
+			env: 'N8N_AI_ENABLED',
+		},
+		provider: {
+			doc: 'AI provider to use. Currently only "openai" is supported.',
+			format: String,
+			default: 'openai',
+			env: 'N8N_AI_PROVIDER',
+		},
+		openAI: {
+			apiKey: {
+				doc: 'Enable AI features using OpenAI API key',
+				format: String,
+				default: '',
+				env: 'N8N_AI_OPENAI_API_KEY',
+			},
+			model: {
+				doc: 'OpenAI model to use',
+				format: String,
+				default: 'gpt-4-turbo',
+				env: 'N8N_AI_OPENAI_MODEL',
+			},
+		},
+		pinecone: {
+			apiKey: {
+				doc: 'Enable AI features using Pinecone API key',
+				format: String,
+				default: '',
+				env: 'N8N_AI_PINECONE_API_KEY',
+			},
+		},
+	},
+
+	expression: {
+		evaluator: {
+			doc: 'Expression evaluator to use',
+			format: ['tmpl', 'tournament'] as const,
+			default: 'tournament',
+			env: 'N8N_EXPRESSION_EVALUATOR',
+		},
+		reportDifference: {
+			doc: 'Whether to report differences in the evaluator outputs',
+			format: Boolean,
+			default: false,
+			env: 'N8N_EXPRESSION_REPORT_DIFFERENCE',
+		},
+	},
+
+	sourceControl: {
+		defaultKeyPairType: {
+			doc: 'Default SSH key type to use when generating SSH keys',
+			format: ['rsa', 'ed25519'] as const,
+			default: 'ed25519',
+			env: 'N8N_SOURCECONTROL_DEFAULT_SSH_KEY_TYPE',
+		},
+	},
+
+	workflowHistory: {
+		enabled: {
+			doc: 'Whether to save workflow history versions',
+			format: Boolean,
+			default: true,
+			env: 'N8N_WORKFLOW_HISTORY_ENABLED',
+		},
+
+		pruneTime: {
+			doc: 'Time (in hours) to keep workflow history versions for',
+			format: Number,
+			default: -1,
+			env: 'N8N_WORKFLOW_HISTORY_PRUNE_TIME',
+		},
+	},
+
+	multiMainSetup: {
+		instanceType: {
+			doc: 'Type of instance in multi-main setup',
+			format: ['unset', 'leader', 'follower'] as const,
+			default: 'unset', // only until first leader key check
+		},
+		enabled: {
+			doc: 'Whether to enable multi-main setup for queue mode (license required)',
+			format: Boolean,
+			default: false,
+			env: 'N8N_MULTI_MAIN_SETUP_ENABLED',
+		},
+		ttl: {
+			doc: 'Time to live (in seconds) for leader key in multi-main setup',
+			format: Number,
+			default: 10,
+			env: 'N8N_MULTI_MAIN_SETUP_KEY_TTL',
+		},
+		interval: {
+			doc: 'Interval (in seconds) for leader check in multi-main setup',
+			format: Number,
+			default: 3,
+			env: 'N8N_MULTI_MAIN_SETUP_CHECK_INTERVAL',
+		},
+	},
+
+	proxy_hops: {
+		format: Number,
+		default: 0,
+		env: 'N8N_PROXY_HOPS',
+		doc: 'Number of reverse-proxies n8n is running behind',
 	},
 };
diff --git a/packages/cli/src/config/types.d.ts b/packages/cli/src/config/types.d.ts
deleted file mode 100644
index 4dfd71a6b75fc..0000000000000
--- a/packages/cli/src/config/types.d.ts
+++ /dev/null
@@ -1,134 +0,0 @@
-/* eslint-disable @typescript-eslint/naming-convention */
-/* eslint-disable @typescript-eslint/no-unused-vars */
-
-import type { IBinaryDataConfig } from 'n8n-core';
-import type { schema } from './schema';
-
-// -----------------------------------
-//          transformers
-// -----------------------------------
-
-/**
- * Transform an object (convict schema) into a union of string arrays (path segments),
- * one for every valid path in the schema object, filtered by type.
- *
- * ```ts
- * ["port", "default"] | ["queue", "bull", "redis", "port", "default"] | ["queue", "bull", "redis", "db", "default"] | ["queue", "bull", "redis", "timeoutThreshold", "default"] | etc
- * ```
- */
-type GetPathSegments<Traversable, Filter> = Traversable extends Filter
-	? []
-	: {
-			[K in ValidKeys<Traversable>]: [K, ...GetPathSegments<Traversable[K], Filter>];
-	  }[ValidKeys<Traversable>];
-
-/**
- * Transform a union of string arrays (path segments) into a union of strings (dotted paths).
- *
- * ```ts
- * "port" | "queue.bull.redis.port" | "queue.bull.redis.db" | "queue.bull.redis.timeoutThreshold" | etc
- * ```
- */
-type JoinByDotting<T extends string[]> = T extends [infer F]
-	? F
-	: T extends [infer F, ...infer R]
-	? F extends string
-		? R extends string[]
-			? `${F}.${JoinByDotting<R>}`
-			: never
-		: never
-	: string;
-
-type ToDottedPath<T> = JoinByDotting<RemoveExcess<T>>;
-
-type CollectPathsByType<T> = ToDottedPath<GetPathSegments<typeof schema, T>>;
-
-// -----------------------------------
-//     path-to-return-type mapper
-// -----------------------------------
-
-type NumericPath = CollectPathsByType<number>;
-
-type BooleanPath = CollectPathsByType<boolean>;
-
-type StringLiteralArrayPath = CollectPathsByType<Readonly<string[]>>;
-
-type StringPath = CollectPathsByType<string>;
-
-type ConfigOptionPath =
-	| NumericPath
-	| BooleanPath
-	| StringPath
-	| StringLiteralArrayPath
-	| keyof ExceptionPaths;
-
-type ToReturnType<T extends ConfigOptionPath> = T extends NumericPath
-	? number
-	: T extends BooleanPath
-	? boolean
-	: T extends StringLiteralArrayPath
-	? StringLiteralMap[T]
-	: T extends keyof ExceptionPaths
-	? ExceptionPaths[T]
-	: T extends StringPath
-	? string
-	: unknown;
-
-type ExceptionPaths = {
-	'queue.bull.redis': object;
-	binaryDataManager: IBinaryDataConfig;
-	'nodes.exclude': string[] | undefined;
-	'nodes.include': string[] | undefined;
-	'userManagement.isInstanceOwnerSetUp': boolean;
-	'userManagement.skipInstanceOwnerSetup': boolean;
-};
-
-// -----------------------------------
-//        string literals map
-// -----------------------------------
-
-type GetPathSegmentsWithUnions<T> = T extends ReadonlyArray<infer C>
-	? [C]
-	: {
-			[K in ValidKeys<T>]: [K, ...GetPathSegmentsWithUnions<T[K]>];
-	  }[ValidKeys<T>];
-
-type ToPathUnionPair<T extends string[]> = T extends [...infer Path, infer Union]
-	? Path extends string[]
-		? { path: ToDottedPath<Path>; union: Union }
-		: never
-	: never;
-
-type ToStringLiteralMap<T extends { path: string; union: string }> = {
-	[Path in T['path']]: Extract<T, { path: Path }>['union'];
-};
-
-type StringLiteralMap = ToStringLiteralMap<
-	ToPathUnionPair<GetPathSegmentsWithUnions<typeof schema>>
->;
-
-// -----------------------------------
-//             utils
-// -----------------------------------
-
-type ValidKeys<T> = keyof T extends string
-	? keyof T extends keyof NumberConstructor
-		? never
-		: keyof T
-	: never;
-
-type RemoveExcess<T> = T extends [...infer Path, 'format' | 'default']
-	? Path extends string[]
-		? Path
-		: never
-	: never;
-
-// -----------------------------------
-//        module augmentation
-// -----------------------------------
-
-declare module 'convict' {
-	interface Config<T> {
-		getEnv<Path extends ConfigOptionPath>(path: Path): ToReturnType<Path>;
-	}
-}
diff --git a/packages/cli/src/config/types.ts b/packages/cli/src/config/types.ts
new file mode 100644
index 0000000000000..220f579239a4f
--- /dev/null
+++ b/packages/cli/src/config/types.ts
@@ -0,0 +1,134 @@
+/* eslint-disable @typescript-eslint/naming-convention */
+
+import type { BinaryData } from 'n8n-core';
+import type { schema } from './schema';
+
+// -----------------------------------
+//          transformers
+// -----------------------------------
+
+/**
+ * Transform an object (convict schema) into a union of string arrays (path segments),
+ * one for every valid path in the schema object, filtered by type.
+ *
+ * ```ts
+ * ["port", "default"] | ["queue", "bull", "redis", "port", "default"] | ["queue", "bull", "redis", "db", "default"] | ["queue", "bull", "redis", "timeoutThreshold", "default"] | etc
+ * ```
+ */
+type GetPathSegments<Traversable, Filter> = Traversable extends Filter
+	? []
+	: {
+			[K in ValidKeys<Traversable>]: [K, ...GetPathSegments<Traversable[K], Filter>];
+		}[ValidKeys<Traversable>];
+
+/**
+ * Transform a union of string arrays (path segments) into a union of strings (dotted paths).
+ *
+ * ```ts
+ * "port" | "queue.bull.redis.port" | "queue.bull.redis.db" | "queue.bull.redis.timeoutThreshold" | etc
+ * ```
+ */
+type JoinByDotting<T extends string[]> = T extends [infer F]
+	? F
+	: T extends [infer F, ...infer R]
+		? F extends string
+			? R extends string[]
+				? `${F}.${JoinByDotting<R>}`
+				: never
+			: never
+		: string;
+
+type ToDottedPath<T> = JoinByDotting<RemoveExcess<T>>;
+
+type CollectPathsByType<T> = ToDottedPath<GetPathSegments<typeof schema, T>>;
+
+// -----------------------------------
+//     path-to-return-type mapper
+// -----------------------------------
+
+type NumericPath = CollectPathsByType<number>;
+
+type BooleanPath = CollectPathsByType<boolean>;
+
+type StringLiteralArrayPath = CollectPathsByType<Readonly<string[]>>;
+
+type StringPath = CollectPathsByType<string>;
+
+type ConfigOptionPath =
+	| NumericPath
+	| BooleanPath
+	| StringPath
+	| StringLiteralArrayPath
+	| keyof ExceptionPaths;
+
+type ToReturnType<T extends ConfigOptionPath> = T extends NumericPath
+	? number
+	: T extends BooleanPath
+		? boolean
+		: T extends StringLiteralArrayPath
+			? StringLiteralMap[T]
+			: T extends keyof ExceptionPaths
+				? ExceptionPaths[T]
+				: T extends StringPath
+					? string
+					: unknown;
+
+type ExceptionPaths = {
+	'queue.bull.redis': object;
+	binaryDataManager: BinaryData.Config;
+	'nodes.exclude': string[] | undefined;
+	'nodes.include': string[] | undefined;
+	'userManagement.isInstanceOwnerSetUp': boolean;
+	'ui.banners.dismissed': string[] | undefined;
+};
+
+// -----------------------------------
+//        string literals map
+// -----------------------------------
+
+type GetPathSegmentsWithUnions<T> =
+	T extends ReadonlyArray<infer C>
+		? [C]
+		: {
+				[K in ValidKeys<T>]: [K, ...GetPathSegmentsWithUnions<T[K]>];
+			}[ValidKeys<T>];
+
+type ToPathUnionPair<T extends string[]> = T extends [...infer Path, infer Union]
+	? Path extends string[]
+		? { path: ToDottedPath<Path>; union: Union }
+		: never
+	: never;
+
+type ToStringLiteralMap<T extends { path: string; union: string }> = {
+	[Path in T['path']]: Extract<T, { path: Path }>['union'];
+};
+
+type StringLiteralMap = ToStringLiteralMap<
+	ToPathUnionPair<GetPathSegmentsWithUnions<typeof schema>>
+>;
+
+// -----------------------------------
+//             utils
+// -----------------------------------
+
+type ValidKeys<T> = keyof T extends string
+	? keyof T extends keyof NumberConstructor
+		? never
+		: keyof T
+	: never;
+
+type RemoveExcess<T> = T extends [...infer Path, 'format' | 'default']
+	? Path extends string[]
+		? Path
+		: never
+	: never;
+
+// -----------------------------------
+//        module augmentation
+// -----------------------------------
+
+declare module 'convict' {
+	interface Config<T> {
+		getEnv<Path extends ConfigOptionPath>(path: Path): ToReturnType<Path>;
+	}
+}
diff --git a/packages/cli/src/config/utils.ts b/packages/cli/src/config/utils.ts
new file mode 100644
index 0000000000000..918bd9b97e669
--- /dev/null
+++ b/packages/cli/src/config/utils.ts
@@ -0,0 +1,13 @@
+import { NotStringArrayError } from '@/errors/not-string-array.error';
+import type { SchemaObj } from 'convict';
+import { ApplicationError } from 'n8n-workflow';
+
+export const ensureStringArray = (values: string[], { env }: SchemaObj<string>) => {
+	if (!env) throw new ApplicationError('Missing env', { extra: { env } });
+
+	if (!Array.isArray(values)) throw new NotStringArrayError(env);
+
+	for (const value of values) {
+		if (typeof value !== 'string') throw new NotStringArrayError(env);
+	}
+};
diff --git a/packages/cli/src/constants.ts b/packages/cli/src/constants.ts
index 1b115c5ac7a9b..031039e361d0e 100644
--- a/packages/cli/src/constants.ts
+++ b/packages/cli/src/constants.ts
@@ -1,10 +1,6 @@
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* eslint-disable @typescript-eslint/naming-convention */
 import { readFileSync } from 'fs';
 import { resolve, join, dirname } from 'path';
 import type { n8n } from 'n8n-core';
-import { RESPONSE_ERROR_MESSAGES as CORE_RESPONSE_ERROR_MESSAGES, UserSettings } from 'n8n-core';
 import { jsonParse } from 'n8n-workflow';
 
 const { NODE_ENV, E2E_TESTS } = process.env;
@@ -20,14 +16,17 @@ export const CLI_DIR = resolve(__dirname, '..');
 export const TEMPLATES_DIR = join(CLI_DIR, 'templates');
 export const SWAGGER_DIR = join(CLI_DIR, 'swagger-frontend');
 export const NODES_BASE_DIR = dirname(require.resolve('n8n-nodes-base'));
-export const GENERATED_STATIC_DIR = join(UserSettings.getUserHome(), '.cache/n8n/public');
 export const EDITOR_UI_DIST_DIR = join(dirname(require.resolve('n8n-editor-ui')), 'dist');
 
 export function getN8nPackageJson() {
 	return jsonParse<n8n.PackageJson>(readFileSync(join(CLI_DIR, 'package.json'), 'utf8'));
 }
 
-export const START_NODES = ['n8n-nodes-base.start', 'n8n-nodes-base.manualTrigger'];
+export const STARTING_NODES = [
+	'@n8n/n8n-nodes-langchain.manualChatTrigger',
+	'n8n-nodes-base.start',
+	'n8n-nodes-base.manualTrigger',
+];
 
 export const N8N_VERSION = getN8nPackageJson().version;
 
@@ -38,7 +37,6 @@ export const STARTER_TEMPLATE_NAME = `${NODE_PACKAGE_PREFIX}starter`;
 export const RESPONSE_ERROR_MESSAGES = {
 	NO_CREDENTIAL: 'Credential not found',
 	NO_NODE: 'Node not found',
-	NO_ENCRYPTION_KEY: CORE_RESPONSE_ERROR_MESSAGES.NO_ENCRYPTION_KEY,
 	PACKAGE_NAME_NOT_PROVIDED: 'Package name is required',
 	PACKAGE_NAME_NOT_VALID: `Package name is not valid - it must start with "${NODE_PACKAGE_PREFIX}"`,
 	PACKAGE_NOT_INSTALLED: 'This package is not installed - you must install it first',
@@ -48,6 +46,9 @@ export const RESPONSE_ERROR_MESSAGES = {
 	PACKAGE_DOES_NOT_CONTAIN_NODES: 'The specified package does not contain any nodes',
 	PACKAGE_LOADING_FAILED: 'The specified package could not be loaded',
 	DISK_IS_FULL: 'There appears to be insufficient disk space',
+	USERS_QUOTA_REACHED: 'Maximum number of users reached',
+	OAUTH2_CREDENTIAL_TEST_SUCCEEDED: 'Connection Successful!',
+	OAUTH2_CREDENTIAL_TEST_FAILED: 'This OAuth2 credential was not connected to an account.',
 };
 
 export const AUTH_COOKIE_NAME = 'n8n-auth';
@@ -69,19 +70,78 @@ export const WORKFLOW_REACTIVATE_MAX_TIMEOUT = 24 * 60 * 60 * 1000; // 1 day
 
 export const SETTINGS_LICENSE_CERT_KEY = 'license.cert';
 
-export const enum LICENSE_FEATURES {
-	SHARING = 'feat:sharing',
-	LDAP = 'feat:ldap',
-	SAML = 'feat:saml',
-	LOG_STREAMING = 'feat:logStreaming',
-	ADVANCED_EXECUTION_FILTERS = 'feat:advancedExecutionFilters',
-	VARIABLES = 'feat:variables',
-	VERSION_CONTROL = 'feat:versionControl',
-}
-
-export const enum LICENSE_QUOTAS {
-	TRIGGER_LIMIT = 'quota:activeWorkflows',
-	VARIABLES_LIMIT = 'quota:maxVariables',
-}
+export const LICENSE_FEATURES = {
+	SHARING: 'feat:sharing',
+	LDAP: 'feat:ldap',
+	SAML: 'feat:saml',
+	LOG_STREAMING: 'feat:logStreaming',
+	ADVANCED_EXECUTION_FILTERS: 'feat:advancedExecutionFilters',
+	VARIABLES: 'feat:variables',
+	SOURCE_CONTROL: 'feat:sourceControl',
+	API_DISABLED: 'feat:apiDisabled',
+	EXTERNAL_SECRETS: 'feat:externalSecrets',
+	SHOW_NON_PROD_BANNER: 'feat:showNonProdBanner',
+	WORKFLOW_HISTORY: 'feat:workflowHistory',
+	DEBUG_IN_EDITOR: 'feat:debugInEditor',
+	BINARY_DATA_S3: 'feat:binaryDataS3',
+	MULTIPLE_MAIN_INSTANCES: 'feat:multipleMainInstances',
+	WORKER_VIEW: 'feat:workerView',
+	ADVANCED_PERMISSIONS: 'feat:advancedPermissions',
+} as const;
+
+export const LICENSE_QUOTAS = {
+	TRIGGER_LIMIT: 'quota:activeWorkflows',
+	VARIABLES_LIMIT: 'quota:maxVariables',
+	USERS_LIMIT: 'quota:users',
+	WORKFLOW_HISTORY_PRUNE_LIMIT: 'quota:workflowHistoryPrune',
+} as const;
+export const UNLIMITED_LICENSE_QUOTA = -1;
 
 export const CREDENTIAL_BLANKING_VALUE = '__n8n_BLANK_VALUE_e5362baf-c777-4d57-a609-6eaf1f9e87f6';
+
+export const UM_FIX_INSTRUCTION =
+	'Please fix the database by running ./packages/cli/bin/n8n user-management:reset';
+
+/**
+ * Units of time in milliseconds
+ * @deprecated Please use constants.Time instead.
+ */
+export const TIME = {
+	SECOND: 1000,
+	MINUTE: 60 * 1000,
+	HOUR: 60 * 60 * 1000,
+	DAY: 24 * 60 * 60 * 1000,
+} as const;
+
+/**
+ * Convert time from any unit to any other unit
+ *
+ * Please amend conversions as necessary.
+ * Eventually this will superseed `TIME` above
+ */
+export const Time = {
+	seconds: {
+		toMilliseconds: 1000,
+	},
+	minutes: {
+		toMilliseconds: 60 * 1000,
+	},
+	hours: {
+		toMilliseconds: 60 * 60 * 1000,
+		toSeconds: 60 * 60,
+	},
+	days: {
+		toSeconds: 24 * 60 * 60,
+		toMilliseconds: 24 * 60 * 60 * 1000,
+	},
+};
+
+export const MIN_PASSWORD_CHAR_LENGTH = 8;
+
+export const MAX_PASSWORD_CHAR_LENGTH = 64;
+
+export const TEST_WEBHOOK_TIMEOUT = 2 * TIME.MINUTE;
+
+export const TEST_WEBHOOK_TIMEOUT_BUFFER = 30 * TIME.SECOND;
+
+export const N8N_DOCS_URL = 'https://docs.n8n.io';
diff --git a/packages/cli/src/controllers/activeWorkflows.controller.ts b/packages/cli/src/controllers/activeWorkflows.controller.ts
new file mode 100644
index 0000000000000..20e75208c86b6
--- /dev/null
+++ b/packages/cli/src/controllers/activeWorkflows.controller.ts
@@ -0,0 +1,22 @@
+import { Get, RestController } from '@/decorators';
+import { ActiveWorkflowRequest } from '@/requests';
+import { ActiveWorkflowsService } from '@/services/activeWorkflows.service';
+
+@RestController('/active-workflows')
+export class ActiveWorkflowsController {
+	constructor(private readonly activeWorkflowsService: ActiveWorkflowsService) {}
+
+	@Get('/')
+	async getActiveWorkflows(req: ActiveWorkflowRequest.GetAllActive) {
+		return await this.activeWorkflowsService.getAllActiveIdsFor(req.user);
+	}
+
+	@Get('/error/:id')
+	async getActivationError(req: ActiveWorkflowRequest.GetActivationError) {
+		const {
+			user,
+			params: { id: workflowId },
+		} = req;
+		return await this.activeWorkflowsService.getActivationError(workflowId, user);
+	}
+}
diff --git a/packages/cli/src/controllers/ai.controller.ts b/packages/cli/src/controllers/ai.controller.ts
new file mode 100644
index 0000000000000..c22e8a524bca6
--- /dev/null
+++ b/packages/cli/src/controllers/ai.controller.ts
@@ -0,0 +1,26 @@
+import { Post, RestController } from '@/decorators';
+import { AIRequest } from '@/requests';
+import { AIService } from '@/services/ai.service';
+import { FailedDependencyError } from '@/errors/response-errors/failed-dependency.error';
+
+@RestController('/ai')
+export class AIController {
+	constructor(private readonly aiService: AIService) {}
+
+	/**
+	 * Generate CURL request and additional HTTP Node metadata for given service and request
+	 */
+	@Post('/generate-curl')
+	async generateCurl(req: AIRequest.GenerateCurl): Promise<{ curl: string; metadata?: object }> {
+		const { service, request } = req.body;
+
+		try {
+			return await this.aiService.generateCurl(service, request);
+		} catch (aiServiceError) {
+			throw new FailedDependencyError(
+				(aiServiceError as Error).message ||
+					'Failed to generate HTTP Request Node parameters due to an issue with an external dependency. Please try again later.',
+			);
+		}
+	}
+}
diff --git a/packages/cli/src/controllers/auth.controller.ts b/packages/cli/src/controllers/auth.controller.ts
index df7a6d5fca95e..57897a4a0ed2e 100644
--- a/packages/cli/src/controllers/auth.controller.ts
+++ b/packages/cli/src/controllers/auth.controller.ts
@@ -1,109 +1,83 @@
 import validator from 'validator';
+
+import { AuthService } from '@/auth/auth.service';
 import speakeasy from 'speakeasy';
-import { Authorized, Get, Post, RestController } from '@/decorators';
-import { AuthError, BadRequestError, InternalServerError } from '@/ResponseHelper';
-import { sanitizeUser, withFeatureFlags } from '@/UserManagement/UserManagementHelper';
-import { issueCookie, resolveJwt } from '@/auth/jwt';
-import { AUTH_COOKIE_NAME } from '@/constants';
+import { Get, Post, RestController } from '@/decorators';
+import { RESPONSE_ERROR_MESSAGES } from '@/constants';
 import { Request, Response } from 'express';
-import type { ILogger } from 'n8n-workflow';
 import type { User } from '@db/entities/User';
-import { LoginRequest, UserRequest } from '@/requests';
-import { In } from 'typeorm';
-import type { Config } from '@/config';
-import type {
-	PublicUser,
-	IDatabaseCollections,
-	IInternalHooksClass,
-	CurrentUser,
-} from '@/Interfaces';
+import { AuthenticatedRequest, LoginRequest, UserRequest } from '@/requests';
+import type { PublicUser } from '@/Interfaces';
 import { handleEmailLogin, handleLdapLogin } from '@/auth';
-import type { PostHogClient } from '@/posthog';
+import { PostHogClient } from '@/posthog';
 import {
+	getCurrentAuthenticationMethod,
 	isLdapCurrentAuthenticationMethod,
 	isSamlCurrentAuthenticationMethod,
 } from '@/sso/ssoHelpers';
-import type { UserRepository } from '@db/repositories';
+import { InternalHooks } from '../InternalHooks';
+import { License } from '@/License';
+import { UserService } from '@/services/user.service';
+import { MfaService } from '@/Mfa/mfa.service';
+import { Logger } from '@/Logger';
+import { AuthError } from '@/errors/response-errors/auth.error';
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
+import { UnauthorizedError } from '@/errors/response-errors/unauthorized.error';
+import { ApplicationError } from 'n8n-workflow';
+import { UserRepository } from '@/databases/repositories/user.repository';
 
 @RestController()
 export class AuthController {
-	private readonly config: Config;
-
-	private readonly logger: ILogger;
-
-	private readonly internalHooks: IInternalHooksClass;
-
-	private readonly userRepository: UserRepository;
-
-	private readonly postHog?: PostHogClient;
-
-	constructor({
-		config,
-		logger,
-		internalHooks,
-		repositories,
-		postHog,
-	}: {
-		config: Config;
-		logger: ILogger;
-		internalHooks: IInternalHooksClass;
-		repositories: Pick<IDatabaseCollections, 'User'>;
-		postHog?: PostHogClient;
-	}) {
-		this.config = config;
-		this.logger = logger;
-		this.internalHooks = internalHooks;
-		this.userRepository = repositories.User;
-		this.postHog = postHog;
-	}
-
-	/**
-	 * Generate OTP Secret
-	 */
-	@Post('/otp-secret')
-	generateOTPSecret() {
-		const secret = speakeasy.generateSecret();
-
-		return {
-			base32: secret.base32,
-			otpauth_url: secret.otpauth_url,
-		};
-	}
-
-	/**
-	 * Log in a user.
-	 */
-	@Post('/login')
+	constructor(
+		private readonly logger: Logger,
+		private readonly internalHooks: InternalHooks,
+		private readonly authService: AuthService,
+		private readonly mfaService: MfaService,
+		private readonly userService: UserService,
+		private readonly license: License,
+		private readonly userRepository: UserRepository,
+		private readonly postHog?: PostHogClient,
+	) {}
+
+	/** Log in a user */
+	@Post('/login', { skipAuth: true, rateLimit: true })
 	async login(req: LoginRequest, res: Response): Promise<PublicUser | undefined> {
-		const { email, password, otp } = req.body;
-		if (!email) throw new Error('Email is required to log in');
-		if (!password) throw new Error('Password is required to log in');
+		const { email, password, mfaToken, mfaRecoveryCode, otp } = req.body;
+		if (!email) throw new ApplicationError('Email is required to log in');
+		if (!password) throw new ApplicationError('Password is required to log in');
 		if (!otp) throw new Error('OTP is required to log in');
 
 		let user: User | undefined;
 
+		let usedAuthenticationMethod = getCurrentAuthenticationMethod();
 		if (isSamlCurrentAuthenticationMethod()) {
 			// attempt to fetch user data with the credentials, but don't log in yet
 			const preliminaryUser = await handleEmailLogin(email, password);
 			// if the user is an owner, continue with the login
-			if (preliminaryUser?.globalRole?.name === 'owner') {
+			if (
+				preliminaryUser?.role === 'global:owner' ||
+				preliminaryUser?.settings?.allowSSOManualLogin
+			) {
 				user = preliminaryUser;
+				usedAuthenticationMethod = 'email';
 			} else {
-				throw new AuthError('SAML is enabled, please log in with SAML');
+				throw new AuthError('SSO is enabled, please log in with SSO');
 			}
 		} else if (isLdapCurrentAuthenticationMethod()) {
-			user = await handleLdapLogin(email, password);
+			const preliminaryUser = await handleEmailLogin(email, password);
+			if (preliminaryUser?.role === 'global:owner') {
+				user = preliminaryUser;
+				usedAuthenticationMethod = 'email';
+			} else {
+				user = await handleLdapLogin(email, password);
+			}
 		} else {
 			user = await handleEmailLogin(email, password);
 		}
 
-		if (!user) {
-			throw new AuthError('Wrong username or password. Do you have caps lock on?');
-		}
-
-		if (user.otpsecret) {
+		if (user?.otpsecret) {
 			const verified = speakeasy.totp.verify({
-				secret: user.otpsecret,
+				secret: user?.otpsecret,
 				encoding: 'base32',
 				token: otp,
 			});
@@ -113,59 +87,78 @@ export class AuthController {
 			}
 		}
 
-		await issueCookie(res, user);
-		return withFeatureFlags(this.postHog, sanitizeUser(user));
-	}
+		if (user) {
+			if (user.mfaEnabled) {
+				if (!mfaToken && !mfaRecoveryCode) {
+					throw new AuthError('MFA Error', 998);
+				}
 
-	/**
-	 * Manually check the `n8n-auth` cookie.
-	 */
-	@Get('/login')
-	async currentUser(req: Request, res: Response): Promise<CurrentUser> {
-		// Manually check the existing cookie.
-		// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-		const cookieContents = req.cookies?.[AUTH_COOKIE_NAME] as string | undefined;
-
-		let user: User;
-		if (cookieContents) {
-			// If logged in, return user
-			try {
-				user = await resolveJwt(cookieContents);
-				return await withFeatureFlags(this.postHog, sanitizeUser(user));
-			} catch (error) {
-				res.clearCookie(AUTH_COOKIE_NAME);
-			}
-		}
+				const { decryptedRecoveryCodes, decryptedSecret } =
+					await this.mfaService.getSecretAndRecoveryCodes(user.id);
 
-		if (this.config.getEnv('userManagement.isInstanceOwnerSetUp')) {
-			throw new AuthError('Not logged in');
-		}
+				user.mfaSecret = decryptedSecret;
+				user.mfaRecoveryCodes = decryptedRecoveryCodes;
+
+				const isMFATokenValid =
+					(await this.validateMfaToken(user, mfaToken)) ||
+					(await this.validateMfaRecoveryCode(user, mfaRecoveryCode));
 
-		try {
-			user = await this.userRepository.findOneOrFail({
-				relations: ['globalRole'],
-				where: {},
+				if (!isMFATokenValid) {
+					throw new AuthError('Invalid mfa token or recovery code');
+				}
+			}
+
+			this.authService.issueCookie(res, user, req.browserId);
+			void this.internalHooks.onUserLoginSuccess({
+				user,
+				authenticationMethod: usedAuthenticationMethod,
 			});
-		} catch (error) {
-			throw new InternalServerError(
-				'No users found in database - did you wipe the users table? Create at least one user.',
-			);
-		}
 
-		if (user.email || user.password) {
-			throw new InternalServerError('Invalid database state - user has password set.');
+			return await this.userService.toPublic(user, { posthog: this.postHog, withScopes: true });
 		}
+		void this.internalHooks.onUserLoginFailed({
+			user: email,
+			authenticationMethod: usedAuthenticationMethod,
+			reason: 'wrong credentials',
+		});
+		throw new AuthError('Wrong username or password. Do you have caps lock on?');
+	}
 
-		await issueCookie(res, user);
-		return withFeatureFlags(this.postHog, sanitizeUser(user));
+	/** Check if the user is already logged in */
+	@Get('/login')
+	async currentUser(req: AuthenticatedRequest): Promise<PublicUser> {
+		return await this.userService.toPublic(req.user, {
+			posthog: this.postHog,
+			withScopes: true,
+		});
 	}
 
 	/**
-	 * Validate invite token to enable invitee to set up their account.
+	 * Generate OTP Secret
 	 */
-	@Get('/resolve-signup-token')
+	@Post('/otp-secret', { skipAuth: true, rateLimit: true })
+	async generateOTPSecret() {
+		const secret = speakeasy.generateSecret();
+
+		return {
+			base32: secret.base32,
+			otpauth_url: secret.otpauth_url,
+		};
+	}
+
+	/** Validate invite token to enable invitee to set up their account */
+	@Get('/resolve-signup-token', { skipAuth: true })
 	async resolveSignupToken(req: UserRequest.ResolveSignUp) {
 		const { inviterId, inviteeId } = req.query;
+		const isWithinUsersLimit = this.license.isWithinUsersLimit();
+
+		if (!isWithinUsersLimit) {
+			this.logger.debug('Request to resolve signup token failed because of users quota reached', {
+				inviterId,
+				inviteeId,
+			});
+			throw new UnauthorizedError(RESPONSE_ERROR_MESSAGES.USERS_QUOTA_REACHED);
+		}
 
 		if (!inviterId || !inviteeId) {
 			this.logger.debug(
@@ -185,7 +178,8 @@ export class AuthController {
 			}
 		}
 
-		const users = await this.userRepository.find({ where: { id: In([inviterId, inviteeId]) } });
+		const users = await this.userRepository.findManyByIds([inviterId, inviteeId]);
+
 		if (users.length !== 2) {
 			this.logger.debug(
 				'Request to resolve signup token failed because the ID of the inviter and/or the ID of the invitee were not found in database',
@@ -220,13 +214,33 @@ export class AuthController {
 		return { inviter: { firstName, lastName } };
 	}
 
-	/**
-	 * Log out a user.
-	 */
-	@Authorized()
+	/** Log out a user */
 	@Post('/logout')
-	logout(req: Request, res: Response) {
-		res.clearCookie(AUTH_COOKIE_NAME);
+	logout(_: Request, res: Response) {
+		this.authService.clearCookie(res);
 		return { loggedOut: true };
 	}
+
+	private async validateMfaToken(user: User, token?: string) {
+		if (!!!token) return false;
+		return this.mfaService.totp.verifySecret({
+			secret: user.mfaSecret ?? '',
+			token,
+		});
+	}
+
+	private async validateMfaRecoveryCode(user: User, mfaRecoveryCode?: string) {
+		if (!!!mfaRecoveryCode) return false;
+		const index = user.mfaRecoveryCodes.indexOf(mfaRecoveryCode);
+		if (index === -1) return false;
+
+		// remove used recovery code
+		user.mfaRecoveryCodes.splice(index, 1);
+
+		await this.userService.update(user.id, {
+			mfaRecoveryCodes: this.mfaService.encryptRecoveryCodes(user.mfaRecoveryCodes),
+		});
+
+		return true;
+	}
 }
diff --git a/packages/cli/src/controllers/binaryData.controller.ts b/packages/cli/src/controllers/binaryData.controller.ts
new file mode 100644
index 0000000000000..63390f46ab989
--- /dev/null
+++ b/packages/cli/src/controllers/binaryData.controller.ts
@@ -0,0 +1,53 @@
+import express from 'express';
+import { BinaryDataService, FileNotFoundError, isValidNonDefaultMode } from 'n8n-core';
+import { Get, RestController } from '@/decorators';
+import { BinaryDataRequest } from '@/requests';
+
+@RestController('/binary-data')
+export class BinaryDataController {
+	constructor(private readonly binaryDataService: BinaryDataService) {}
+
+	@Get('/')
+	async get(req: BinaryDataRequest, res: express.Response) {
+		const { id: binaryDataId, action } = req.query;
+
+		if (!binaryDataId) {
+			return res.status(400).end('Missing binary data ID');
+		}
+
+		if (!binaryDataId.includes(':')) {
+			return res.status(400).end('Missing binary data mode');
+		}
+
+		const [mode] = binaryDataId.split(':');
+
+		if (!isValidNonDefaultMode(mode)) {
+			return res.status(400).end('Invalid binary data mode');
+		}
+
+		let { fileName, mimeType } = req.query;
+
+		try {
+			if (!fileName || !mimeType) {
+				try {
+					const metadata = await this.binaryDataService.getMetadata(binaryDataId);
+					fileName = metadata.fileName;
+					mimeType = metadata.mimeType;
+					res.setHeader('Content-Length', metadata.fileSize);
+				} catch {}
+			}
+
+			if (mimeType) res.setHeader('Content-Type', mimeType);
+
+			if (action === 'download' && fileName) {
+				const encodedFilename = encodeURIComponent(fileName);
+				res.setHeader('Content-Disposition', `attachment; filename="${encodedFilename}"`);
+			}
+
+			return await this.binaryDataService.getAsStream(binaryDataId);
+		} catch (error) {
+			if (error instanceof FileNotFoundError) return res.writeHead(404).end();
+			else throw error;
+		}
+	}
+}
diff --git a/packages/cli/src/controllers/communityPackages.controller.ts b/packages/cli/src/controllers/communityPackages.controller.ts
new file mode 100644
index 0000000000000..681acd9d234cf
--- /dev/null
+++ b/packages/cli/src/controllers/communityPackages.controller.ts
@@ -0,0 +1,302 @@
+import { Request, Response, NextFunction } from 'express';
+import config from '@/config';
+import {
+	RESPONSE_ERROR_MESSAGES,
+	STARTER_TEMPLATE_NAME,
+	UNKNOWN_FAILURE_REASON,
+} from '@/constants';
+import { Delete, Get, Middleware, Patch, Post, RestController, GlobalScope } from '@/decorators';
+import { NodeRequest } from '@/requests';
+import type { InstalledPackages } from '@db/entities/InstalledPackages';
+import type { CommunityPackages } from '@/Interfaces';
+import { InternalHooks } from '@/InternalHooks';
+import { Push } from '@/push';
+import { CommunityPackagesService } from '@/services/communityPackages.service';
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
+import { InternalServerError } from '@/errors/response-errors/internal-server.error';
+
+const {
+	PACKAGE_NOT_INSTALLED,
+	PACKAGE_NAME_NOT_PROVIDED,
+	PACKAGE_VERSION_NOT_FOUND,
+	PACKAGE_DOES_NOT_CONTAIN_NODES,
+	PACKAGE_NOT_FOUND,
+} = RESPONSE_ERROR_MESSAGES;
+
+const isClientError = (error: Error) =>
+	[PACKAGE_VERSION_NOT_FOUND, PACKAGE_DOES_NOT_CONTAIN_NODES, PACKAGE_NOT_FOUND].some((msg) =>
+		error.message.includes(msg),
+	);
+
+export function isNpmError(error: unknown): error is { code: number; stdout: string } {
+	return typeof error === 'object' && error !== null && 'code' in error && 'stdout' in error;
+}
+
+@RestController('/community-packages')
+export class CommunityPackagesController {
+	constructor(
+		private readonly push: Push,
+		private readonly internalHooks: InternalHooks,
+		private readonly communityPackagesService: CommunityPackagesService,
+	) {}
+
+	// TODO: move this into a new decorator `@IfConfig('executions.mode', 'queue')`
+	@Middleware()
+	checkIfCommunityNodesEnabled(req: Request, res: Response, next: NextFunction) {
+		if (config.getEnv('executions.mode') === 'queue' && req.method !== 'GET')
+			res.status(400).json({
+				status: 'error',
+				message: 'Package management is disabled when running in "queue" mode',
+			});
+		else next();
+	}
+
+	@Post('/')
+	@GlobalScope('communityPackage:install')
+	async installPackage(req: NodeRequest.Post) {
+		const { name } = req.body;
+
+		if (!name) {
+			throw new BadRequestError(PACKAGE_NAME_NOT_PROVIDED);
+		}
+
+		let parsed: CommunityPackages.ParsedPackageName;
+
+		try {
+			parsed = this.communityPackagesService.parseNpmPackageName(name);
+		} catch (error) {
+			throw new BadRequestError(
+				error instanceof Error ? error.message : 'Failed to parse package name',
+			);
+		}
+
+		if (parsed.packageName === STARTER_TEMPLATE_NAME) {
+			throw new BadRequestError(
+				[
+					`Package "${parsed.packageName}" is only a template`,
+					'Please enter an actual package to install',
+				].join('.'),
+			);
+		}
+
+		const isInstalled = await this.communityPackagesService.isPackageInstalled(parsed.packageName);
+		const hasLoaded = this.communityPackagesService.hasPackageLoaded(name);
+
+		if (isInstalled && hasLoaded) {
+			throw new BadRequestError(
+				[
+					`Package "${parsed.packageName}" is already installed`,
+					'To update it, click the corresponding button in the UI',
+				].join('.'),
+			);
+		}
+
+		const packageStatus = await this.communityPackagesService.checkNpmPackageStatus(name);
+
+		if (packageStatus.status !== 'OK') {
+			throw new BadRequestError(`Package "${name}" is banned so it cannot be installed`);
+		}
+
+		let installedPackage: InstalledPackages;
+		try {
+			installedPackage = await this.communityPackagesService.installNpmModule(
+				parsed.packageName,
+				parsed.version,
+			);
+		} catch (error) {
+			const errorMessage = error instanceof Error ? error.message : UNKNOWN_FAILURE_REASON;
+
+			void this.internalHooks.onCommunityPackageInstallFinished({
+				user: req.user,
+				input_string: name,
+				package_name: parsed.packageName,
+				success: false,
+				package_version: parsed.version,
+				failure_reason: errorMessage,
+			});
+
+			let message = [`Error loading package "${name}" `, errorMessage].join(':');
+			if (error instanceof Error && error.cause instanceof Error) {
+				message += `\nCause: ${error.cause.message}`;
+			}
+
+			const clientError = error instanceof Error ? isClientError(error) : false;
+			throw new (clientError ? BadRequestError : InternalServerError)(message);
+		}
+
+		if (!hasLoaded) this.communityPackagesService.removePackageFromMissingList(name);
+
+		// broadcast to connected frontends that node list has been updated
+		installedPackage.installedNodes.forEach((node) => {
+			this.push.broadcast('reloadNodeType', {
+				name: node.type,
+				version: node.latestVersion,
+			});
+		});
+
+		void this.internalHooks.onCommunityPackageInstallFinished({
+			user: req.user,
+			input_string: name,
+			package_name: parsed.packageName,
+			success: true,
+			package_version: parsed.version,
+			package_node_names: installedPackage.installedNodes.map((node) => node.name),
+			package_author: installedPackage.authorName,
+			package_author_email: installedPackage.authorEmail,
+		});
+
+		return installedPackage;
+	}
+
+	@Get('/')
+	@GlobalScope('communityPackage:list')
+	async getInstalledPackages() {
+		const installedPackages = await this.communityPackagesService.getAllInstalledPackages();
+
+		if (installedPackages.length === 0) return [];
+
+		let pendingUpdates: CommunityPackages.AvailableUpdates | undefined;
+
+		try {
+			const command = ['npm', 'outdated', '--json'].join(' ');
+			await this.communityPackagesService.executeNpmCommand(command, { doNotHandleError: true });
+		} catch (error) {
+			// when there are updates, npm exits with code 1
+			// when there are no updates, command succeeds
+			// https://github.com/npm/rfcs/issues/473
+			if (isNpmError(error) && error.code === 1) {
+				pendingUpdates = JSON.parse(error.stdout) as CommunityPackages.AvailableUpdates;
+			}
+		}
+
+		let hydratedPackages = this.communityPackagesService.matchPackagesWithUpdates(
+			installedPackages,
+			pendingUpdates,
+		);
+
+		try {
+			if (this.communityPackagesService.hasMissingPackages) {
+				hydratedPackages = this.communityPackagesService.matchMissingPackages(hydratedPackages);
+			}
+		} catch {}
+
+		return hydratedPackages;
+	}
+
+	@Delete('/')
+	@GlobalScope('communityPackage:uninstall')
+	async uninstallPackage(req: NodeRequest.Delete) {
+		const { name } = req.query;
+
+		if (!name) {
+			throw new BadRequestError(PACKAGE_NAME_NOT_PROVIDED);
+		}
+
+		try {
+			this.communityPackagesService.parseNpmPackageName(name); // sanitize input
+		} catch (error) {
+			const message = error instanceof Error ? error.message : UNKNOWN_FAILURE_REASON;
+
+			throw new BadRequestError(message);
+		}
+
+		const installedPackage = await this.communityPackagesService.findInstalledPackage(name);
+
+		if (!installedPackage) {
+			throw new BadRequestError(PACKAGE_NOT_INSTALLED);
+		}
+
+		try {
+			await this.communityPackagesService.removeNpmModule(name, installedPackage);
+		} catch (error) {
+			const message = [
+				`Error removing package "${name}"`,
+				error instanceof Error ? error.message : UNKNOWN_FAILURE_REASON,
+			].join(':');
+
+			throw new InternalServerError(message);
+		}
+
+		// broadcast to connected frontends that node list has been updated
+		installedPackage.installedNodes.forEach((node) => {
+			this.push.broadcast('removeNodeType', {
+				name: node.type,
+				version: node.latestVersion,
+			});
+		});
+
+		void this.internalHooks.onCommunityPackageDeleteFinished({
+			user: req.user,
+			package_name: name,
+			package_version: installedPackage.installedVersion,
+			package_node_names: installedPackage.installedNodes.map((node) => node.name),
+			package_author: installedPackage.authorName,
+			package_author_email: installedPackage.authorEmail,
+		});
+	}
+
+	@Patch('/')
+	@GlobalScope('communityPackage:update')
+	async updatePackage(req: NodeRequest.Update) {
+		const { name } = req.body;
+
+		if (!name) {
+			throw new BadRequestError(PACKAGE_NAME_NOT_PROVIDED);
+		}
+
+		const previouslyInstalledPackage =
+			await this.communityPackagesService.findInstalledPackage(name);
+
+		if (!previouslyInstalledPackage) {
+			throw new BadRequestError(PACKAGE_NOT_INSTALLED);
+		}
+
+		try {
+			const newInstalledPackage = await this.communityPackagesService.updateNpmModule(
+				this.communityPackagesService.parseNpmPackageName(name).packageName,
+				previouslyInstalledPackage,
+			);
+
+			// broadcast to connected frontends that node list has been updated
+			previouslyInstalledPackage.installedNodes.forEach((node) => {
+				this.push.broadcast('removeNodeType', {
+					name: node.type,
+					version: node.latestVersion,
+				});
+			});
+
+			newInstalledPackage.installedNodes.forEach((node) => {
+				this.push.broadcast('reloadNodeType', {
+					name: node.name,
+					version: node.latestVersion,
+				});
+			});
+
+			void this.internalHooks.onCommunityPackageUpdateFinished({
+				user: req.user,
+				package_name: name,
+				package_version_current: previouslyInstalledPackage.installedVersion,
+				package_version_new: newInstalledPackage.installedVersion,
+				package_node_names: newInstalledPackage.installedNodes.map((node) => node.name),
+				package_author: newInstalledPackage.authorName,
+				package_author_email: newInstalledPackage.authorEmail,
+			});
+
+			return newInstalledPackage;
+		} catch (error) {
+			previouslyInstalledPackage.installedNodes.forEach((node) => {
+				this.push.broadcast('removeNodeType', {
+					name: node.type,
+					version: node.latestVersion,
+				});
+			});
+
+			const message = [
+				`Error removing package "${name}"`,
+				error instanceof Error ? error.message : UNKNOWN_FAILURE_REASON,
+			].join(':');
+
+			throw new InternalServerError(message);
+		}
+	}
+}
diff --git a/packages/cli/src/controllers/cta.controller.ts b/packages/cli/src/controllers/cta.controller.ts
new file mode 100644
index 0000000000000..5cd41a1dcd810
--- /dev/null
+++ b/packages/cli/src/controllers/cta.controller.ts
@@ -0,0 +1,20 @@
+import express from 'express';
+import { Get, RestController } from '@/decorators';
+import { AuthenticatedRequest } from '@/requests';
+import { CtaService } from '@/services/cta.service';
+
+/**
+ * Controller for Call to Action (CTA) endpoints. CTAs are certain
+ * messages that are shown to users in the UI.
+ */
+@RestController('/cta')
+export class CtaController {
+	constructor(private readonly ctaService: CtaService) {}
+
+	@Get('/become-creator')
+	async getCta(req: AuthenticatedRequest, res: express.Response) {
+		const becomeCreator = await this.ctaService.getBecomeCreatorCta(req.user.id);
+
+		res.json(becomeCreator);
+	}
+}
diff --git a/packages/cli/src/controllers/debug.controller.ts b/packages/cli/src/controllers/debug.controller.ts
new file mode 100644
index 0000000000000..663c3756119d6
--- /dev/null
+++ b/packages/cli/src/controllers/debug.controller.ts
@@ -0,0 +1,37 @@
+import { Get, RestController } from '@/decorators';
+import { ActiveWorkflowManager } from '@/ActiveWorkflowManager';
+import { OrchestrationService } from '@/services/orchestration.service';
+import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
+
+@RestController('/debug')
+export class DebugController {
+	constructor(
+		private readonly orchestrationService: OrchestrationService,
+		private readonly activeWorkflowManager: ActiveWorkflowManager,
+		private readonly workflowRepository: WorkflowRepository,
+	) {}
+
+	@Get('/multi-main-setup', { skipAuth: true })
+	async getMultiMainSetupDetails() {
+		const leaderKey = await this.orchestrationService.multiMainSetup.fetchLeaderKey();
+
+		const triggersAndPollers = await this.workflowRepository.findIn(
+			this.activeWorkflowManager.allActiveInMemory(),
+		);
+
+		const webhooks = await this.workflowRepository.findWebhookBasedActiveWorkflows();
+
+		const activationErrors = await this.activeWorkflowManager.getAllWorkflowActivationErrors();
+
+		return {
+			instanceId: this.orchestrationService.instanceId,
+			leaderKey,
+			isLeader: this.orchestrationService.isLeader,
+			activeWorkflows: {
+				webhooks, // webhook-based active workflows
+				triggersAndPollers, // poller- and trigger-based active workflows
+			},
+			activationErrors,
+		};
+	}
+}
diff --git a/packages/cli/src/controllers/dynamicNodeParameters.controller.ts b/packages/cli/src/controllers/dynamicNodeParameters.controller.ts
new file mode 100644
index 0000000000000..0c70862956bf6
--- /dev/null
+++ b/packages/cli/src/controllers/dynamicNodeParameters.controller.ts
@@ -0,0 +1,113 @@
+import type { RequestHandler } from 'express';
+import { NextFunction, Response } from 'express';
+import type {
+	INodeListSearchResult,
+	INodePropertyOptions,
+	ResourceMapperFields,
+} from 'n8n-workflow';
+import { jsonParse } from 'n8n-workflow';
+
+import { Get, Middleware, RestController } from '@/decorators';
+import { getBase } from '@/WorkflowExecuteAdditionalData';
+import { DynamicNodeParametersService } from '@/services/dynamicNodeParameters.service';
+import { DynamicNodeParametersRequest } from '@/requests';
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
+
+const assertMethodName: RequestHandler = (req, res, next) => {
+	const { methodName } = req.query as DynamicNodeParametersRequest.BaseRequest['query'];
+	if (!methodName) {
+		throw new BadRequestError('Parameter methodName is required.');
+	}
+	next();
+};
+
+@RestController('/dynamic-node-parameters')
+export class DynamicNodeParametersController {
+	constructor(private readonly service: DynamicNodeParametersService) {}
+
+	@Middleware()
+	parseQueryParams(req: DynamicNodeParametersRequest.BaseRequest, _: Response, next: NextFunction) {
+		const { credentials, currentNodeParameters, nodeTypeAndVersion } = req.query;
+		if (!nodeTypeAndVersion) {
+			throw new BadRequestError('Parameter nodeTypeAndVersion is required.');
+		}
+		if (!currentNodeParameters) {
+			throw new BadRequestError('Parameter currentNodeParameters is required.');
+		}
+
+		req.params = {
+			nodeTypeAndVersion: jsonParse(nodeTypeAndVersion),
+			currentNodeParameters: jsonParse(currentNodeParameters),
+			credentials: credentials ? jsonParse(credentials) : undefined,
+		};
+
+		next();
+	}
+
+	/** Returns parameter values which normally get loaded from an external API or get generated dynamically */
+	@Get('/options')
+	async getOptions(req: DynamicNodeParametersRequest.Options): Promise<INodePropertyOptions[]> {
+		const { path, methodName, loadOptions } = req.query;
+		const { credentials, currentNodeParameters, nodeTypeAndVersion } = req.params;
+		const additionalData = await getBase(req.user.id, currentNodeParameters);
+
+		if (methodName) {
+			return await this.service.getOptionsViaMethodName(
+				methodName,
+				path,
+				additionalData,
+				nodeTypeAndVersion,
+				currentNodeParameters,
+				credentials,
+			);
+		}
+
+		if (loadOptions) {
+			return await this.service.getOptionsViaLoadOptions(
+				jsonParse(loadOptions),
+				additionalData,
+				nodeTypeAndVersion,
+				currentNodeParameters,
+				credentials,
+			);
+		}
+
+		return [];
+	}
+
+	@Get('/resource-locator-results', { middlewares: [assertMethodName] })
+	async getResourceLocatorResults(
+		req: DynamicNodeParametersRequest.ResourceLocatorResults,
+	): Promise<INodeListSearchResult | undefined> {
+		const { path, methodName, filter, paginationToken } = req.query;
+		const { credentials, currentNodeParameters, nodeTypeAndVersion } = req.params;
+		const additionalData = await getBase(req.user.id, currentNodeParameters);
+		return await this.service.getResourceLocatorResults(
+			methodName,
+			path,
+			additionalData,
+			nodeTypeAndVersion,
+			currentNodeParameters,
+			credentials,
+			filter,
+			paginationToken,
+		);
+	}
+
+	@Get('/resource-mapper-fields', { middlewares: [assertMethodName] })
+	async getResourceMappingFields(
+		req: DynamicNodeParametersRequest.ResourceMapperFields,
+	): Promise<ResourceMapperFields | undefined> {
+		const { path, methodName } = req.query;
+		const { credentials, currentNodeParameters, nodeTypeAndVersion } = req.params;
+		const additionalData = await getBase(req.user.id, currentNodeParameters);
+		return await this.service.getResourceMappingFields(
+			methodName,
+			path,
+			additionalData,
+			nodeTypeAndVersion,
+			currentNodeParameters,
+			credentials,
+		);
+	}
+}
diff --git a/packages/cli/src/controllers/e2e.controller.ts b/packages/cli/src/controllers/e2e.controller.ts
new file mode 100644
index 0000000000000..2f431de0835e5
--- /dev/null
+++ b/packages/cli/src/controllers/e2e.controller.ts
@@ -0,0 +1,215 @@
+import { Request } from 'express';
+import { v4 as uuid } from 'uuid';
+import config from '@/config';
+import { SettingsRepository } from '@db/repositories/settings.repository';
+import { UserRepository } from '@db/repositories/user.repository';
+import { ActiveWorkflowManager } from '@/ActiveWorkflowManager';
+import { MessageEventBus } from '@/eventbus/MessageEventBus/MessageEventBus';
+import { License } from '@/License';
+import { LICENSE_FEATURES, inE2ETests } from '@/constants';
+import { Patch, Post, RestController } from '@/decorators';
+import type { UserSetupPayload } from '@/requests';
+import type { BooleanLicenseFeature, IPushDataType } from '@/Interfaces';
+import { MfaService } from '@/Mfa/mfa.service';
+import { Push } from '@/push';
+import { CacheService } from '@/services/cache/cache.service';
+import { PasswordUtility } from '@/services/password.utility';
+import Container from 'typedi';
+import { Logger } from '@/Logger';
+
+if (!inE2ETests) {
+	Container.get(Logger).error('E2E endpoints only allowed during E2E tests');
+	process.exit(1);
+}
+
+const tablesToTruncate = [
+	'auth_identity',
+	'auth_provider_sync_history',
+	'event_destinations',
+	'shared_workflow',
+	'shared_credentials',
+	'webhook_entity',
+	'workflows_tags',
+	'credentials_entity',
+	'tag_entity',
+	'workflow_statistics',
+	'workflow_entity',
+	'execution_entity',
+	'settings',
+	'installed_packages',
+	'installed_nodes',
+	'user',
+	'variables',
+];
+
+type ResetRequest = Request<
+	{},
+	{},
+	{
+		owner: UserSetupPayload;
+		members: UserSetupPayload[];
+		admin: UserSetupPayload;
+	}
+>;
+
+type PushRequest = Request<
+	{},
+	{},
+	{
+		type: IPushDataType;
+		pushRef: string;
+		data: object;
+	}
+>;
+
+@RestController('/e2e')
+export class E2EController {
+	private enabledFeatures: Record<BooleanLicenseFeature, boolean> = {
+		[LICENSE_FEATURES.SHARING]: false,
+		[LICENSE_FEATURES.LDAP]: false,
+		[LICENSE_FEATURES.SAML]: false,
+		[LICENSE_FEATURES.LOG_STREAMING]: false,
+		[LICENSE_FEATURES.ADVANCED_EXECUTION_FILTERS]: false,
+		[LICENSE_FEATURES.SOURCE_CONTROL]: false,
+		[LICENSE_FEATURES.VARIABLES]: false,
+		[LICENSE_FEATURES.API_DISABLED]: false,
+		[LICENSE_FEATURES.EXTERNAL_SECRETS]: false,
+		[LICENSE_FEATURES.SHOW_NON_PROD_BANNER]: false,
+		[LICENSE_FEATURES.WORKFLOW_HISTORY]: false,
+		[LICENSE_FEATURES.DEBUG_IN_EDITOR]: false,
+		[LICENSE_FEATURES.BINARY_DATA_S3]: false,
+		[LICENSE_FEATURES.MULTIPLE_MAIN_INSTANCES]: false,
+		[LICENSE_FEATURES.WORKER_VIEW]: false,
+		[LICENSE_FEATURES.ADVANCED_PERMISSIONS]: false,
+	};
+
+	constructor(
+		license: License,
+		private readonly settingsRepo: SettingsRepository,
+		private readonly userRepo: UserRepository,
+		private readonly workflowRunner: ActiveWorkflowManager,
+		private readonly mfaService: MfaService,
+		private readonly cacheService: CacheService,
+		private readonly push: Push,
+		private readonly passwordUtility: PasswordUtility,
+		private readonly eventBus: MessageEventBus,
+	) {
+		license.isFeatureEnabled = (feature: BooleanLicenseFeature) =>
+			this.enabledFeatures[feature] ?? false;
+	}
+
+	@Post('/reset', { skipAuth: true })
+	async reset(req: ResetRequest) {
+		this.resetFeatures();
+		await this.resetLogStreaming();
+		await this.removeActiveWorkflows();
+		await this.truncateAll();
+		await this.resetCache();
+		await this.setupUserManagement(req.body.owner, req.body.members, req.body.admin);
+	}
+
+	@Post('/push', { skipAuth: true })
+	async pushSend(req: PushRequest) {
+		this.push.broadcast(req.body.type, req.body.data);
+	}
+
+	@Patch('/feature', { skipAuth: true })
+	setFeature(req: Request<{}, {}, { feature: BooleanLicenseFeature; enabled: boolean }>) {
+		const { enabled, feature } = req.body;
+		this.enabledFeatures[feature] = enabled;
+	}
+
+	@Patch('/queue-mode', { skipAuth: true })
+	async setQueueMode(req: Request<{}, {}, { enabled: boolean }>) {
+		const { enabled } = req.body;
+		config.set('executions.mode', enabled ? 'queue' : 'regular');
+		return { success: true, message: `Queue mode set to ${config.getEnv('executions.mode')}` };
+	}
+
+	private resetFeatures() {
+		for (const feature of Object.keys(this.enabledFeatures)) {
+			this.enabledFeatures[feature as BooleanLicenseFeature] = false;
+		}
+	}
+
+	private async removeActiveWorkflows() {
+		this.workflowRunner.removeAllQueuedWorkflowActivations();
+		await this.workflowRunner.removeAll();
+	}
+
+	private async resetLogStreaming() {
+		for (const id in this.eventBus.destinations) {
+			await this.eventBus.removeDestination(id, false);
+		}
+	}
+
+	private async truncateAll() {
+		for (const table of tablesToTruncate) {
+			try {
+				const { connection } = this.settingsRepo.manager;
+				await connection.query(
+					`DELETE FROM ${table}; DELETE FROM sqlite_sequence WHERE name=${table};`,
+				);
+			} catch (error) {
+				Container.get(Logger).warn('Dropping Table for E2E Reset error', {
+					error: error as Error,
+				});
+			}
+		}
+	}
+
+	private async setupUserManagement(
+		owner: UserSetupPayload,
+		members: UserSetupPayload[],
+		admin: UserSetupPayload,
+	) {
+		const instanceOwner = this.userRepo.create({
+			id: uuid(),
+			...owner,
+			password: await this.passwordUtility.hash(owner.password),
+			role: 'global:owner',
+		});
+
+		if (owner?.mfaSecret && owner.mfaRecoveryCodes?.length) {
+			const { encryptedRecoveryCodes, encryptedSecret } =
+				this.mfaService.encryptSecretAndRecoveryCodes(owner.mfaSecret, owner.mfaRecoveryCodes);
+			instanceOwner.mfaSecret = encryptedSecret;
+			instanceOwner.mfaRecoveryCodes = encryptedRecoveryCodes;
+		}
+
+		const adminUser = this.userRepo.create({
+			id: uuid(),
+			...admin,
+			password: await this.passwordUtility.hash(admin.password),
+			role: 'global:admin',
+		});
+
+		const users = [];
+
+		users.push(instanceOwner, adminUser);
+
+		for (const { password, ...payload } of members) {
+			users.push(
+				this.userRepo.create({
+					id: uuid(),
+					...payload,
+					password: await this.passwordUtility.hash(password),
+					role: 'global:member',
+				}),
+			);
+		}
+
+		await this.userRepo.insert(users);
+
+		await this.settingsRepo.update(
+			{ key: 'userManagement.isInstanceOwnerSetUp' },
+			{ value: 'true' },
+		);
+
+		config.set('userManagement.isInstanceOwnerSetUp', true);
+	}
+
+	private async resetCache() {
+		await this.cacheService.reset();
+	}
+}
diff --git a/packages/cli/src/controllers/index.ts b/packages/cli/src/controllers/index.ts
deleted file mode 100644
index bb4a297950b34..0000000000000
--- a/packages/cli/src/controllers/index.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-export { AuthController } from './auth.controller';
-export { LdapController } from './ldap.controller';
-export { MeController } from './me.controller';
-export { NodesController } from './nodes.controller';
-export { NodeTypesController } from './nodeTypes.controller';
-export { OwnerController } from './owner.controller';
-export { PasswordResetController } from './passwordReset.controller';
-export { TagsController } from './tags.controller';
-export { TranslationController } from './translation.controller';
-export { UsersController } from './users.controller';
-export { SaveRequestLogController } from './saveRequestLog.controller';
diff --git a/packages/cli/src/controllers/invitation.controller.ts b/packages/cli/src/controllers/invitation.controller.ts
new file mode 100644
index 0000000000000..e1ca3dcc182e6
--- /dev/null
+++ b/packages/cli/src/controllers/invitation.controller.ts
@@ -0,0 +1,184 @@
+import { Response } from 'express';
+import validator from 'validator';
+
+import { AuthService } from '@/auth/auth.service';
+import config from '@/config';
+import { Post, GlobalScope, RestController } from '@/decorators';
+import { RESPONSE_ERROR_MESSAGES } from '@/constants';
+import { UserRequest } from '@/requests';
+import { License } from '@/License';
+import { UserService } from '@/services/user.service';
+import { Logger } from '@/Logger';
+import { isSamlLicensedAndEnabled } from '@/sso/saml/samlHelpers';
+import { PasswordUtility } from '@/services/password.utility';
+import { PostHogClient } from '@/posthog';
+import type { User } from '@/databases/entities/User';
+import { UserRepository } from '@db/repositories/user.repository';
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
+import { UnauthorizedError } from '@/errors/response-errors/unauthorized.error';
+import { InternalHooks } from '@/InternalHooks';
+import { ExternalHooks } from '@/ExternalHooks';
+
+@RestController('/invitations')
+export class InvitationController {
+	constructor(
+		private readonly logger: Logger,
+		private readonly internalHooks: InternalHooks,
+		private readonly externalHooks: ExternalHooks,
+		private readonly authService: AuthService,
+		private readonly userService: UserService,
+		private readonly license: License,
+		private readonly passwordUtility: PasswordUtility,
+		private readonly userRepository: UserRepository,
+		private readonly postHog: PostHogClient,
+	) {}
+
+	/**
+	 * Send email invite(s) to one or multiple users and create user shell(s).
+	 */
+
+	@Post('/')
+	@GlobalScope('user:create')
+	async inviteUser(req: UserRequest.Invite) {
+		const isWithinUsersLimit = this.license.isWithinUsersLimit();
+
+		if (isSamlLicensedAndEnabled()) {
+			this.logger.debug(
+				'SAML is enabled, so users are managed by the Identity Provider and cannot be added through invites',
+			);
+			throw new BadRequestError(
+				'SAML is enabled, so users are managed by the Identity Provider and cannot be added through invites',
+			);
+		}
+
+		if (!isWithinUsersLimit) {
+			this.logger.debug(
+				'Request to send email invite(s) to user(s) failed because the user limit quota has been reached',
+			);
+			throw new UnauthorizedError(RESPONSE_ERROR_MESSAGES.USERS_QUOTA_REACHED);
+		}
+
+		if (!config.getEnv('userManagement.isInstanceOwnerSetUp')) {
+			this.logger.debug(
+				'Request to send email invite(s) to user(s) failed because the owner account is not set up',
+			);
+			throw new BadRequestError('You must set up your own account before inviting others');
+		}
+
+		if (!Array.isArray(req.body)) {
+			this.logger.debug(
+				'Request to send email invite(s) to user(s) failed because the payload is not an array',
+				{
+					payload: req.body,
+				},
+			);
+			throw new BadRequestError('Invalid payload');
+		}
+
+		if (!req.body.length) return [];
+
+		req.body.forEach((invite) => {
+			if (typeof invite !== 'object' || !invite.email) {
+				throw new BadRequestError(
+					'Request to send email invite(s) to user(s) failed because the payload is not an array shaped Array<{ email: string }>',
+				);
+			}
+
+			if (!validator.isEmail(invite.email)) {
+				this.logger.debug('Invalid email in payload', { invalidEmail: invite.email });
+				throw new BadRequestError(
+					`Request to send email invite(s) to user(s) failed because of an invalid email address: ${invite.email}`,
+				);
+			}
+
+			if (invite.role && !['global:member', 'global:admin'].includes(invite.role)) {
+				throw new BadRequestError(
+					`Cannot invite user with invalid role: ${invite.role}. Please ensure all invitees' roles are either 'global:member' or 'global:admin'.`,
+				);
+			}
+
+			if (invite.role === 'global:admin' && !this.license.isAdvancedPermissionsLicensed()) {
+				throw new UnauthorizedError(
+					'Cannot invite admin user without advanced permissions. Please upgrade to a license that includes this feature.',
+				);
+			}
+		});
+
+		const attributes = req.body.map(({ email, role }) => ({
+			email,
+			role: role ?? 'global:member',
+		}));
+
+		const { usersInvited, usersCreated } = await this.userService.inviteUsers(req.user, attributes);
+
+		await this.externalHooks.run('user.invited', [usersCreated]);
+
+		return usersInvited;
+	}
+
+	/**
+	 * Fill out user shell with first name, last name, and password.
+	 */
+	@Post('/:id/accept', { skipAuth: true })
+	async acceptInvitation(req: UserRequest.Update, res: Response) {
+		const { id: inviteeId } = req.params;
+
+		const { inviterId, firstName, lastName, password } = req.body;
+
+		if (!inviterId || !inviteeId || !firstName || !lastName || !password) {
+			this.logger.debug(
+				'Request to fill out a user shell failed because of missing properties in payload',
+				{ payload: req.body },
+			);
+			throw new BadRequestError('Invalid payload');
+		}
+
+		const validPassword = this.passwordUtility.validate(password);
+
+		const users = await this.userRepository.findManyByIds([inviterId, inviteeId]);
+
+		if (users.length !== 2) {
+			this.logger.debug(
+				'Request to fill out a user shell failed because the inviter ID and/or invitee ID were not found in database',
+				{
+					inviterId,
+					inviteeId,
+				},
+			);
+			throw new BadRequestError('Invalid payload or URL');
+		}
+
+		const invitee = users.find((user) => user.id === inviteeId) as User;
+
+		if (invitee.password) {
+			this.logger.debug(
+				'Request to fill out a user shell failed because the invite had already been accepted',
+				{ inviteeId },
+			);
+			throw new BadRequestError('This invite has been accepted already');
+		}
+
+		invitee.firstName = firstName;
+		invitee.lastName = lastName;
+		invitee.password = await this.passwordUtility.hash(validPassword);
+
+		const updatedUser = await this.userRepository.save(invitee, { transaction: false });
+
+		this.authService.issueCookie(res, updatedUser, req.browserId);
+
+		void this.internalHooks.onUserSignup(updatedUser, {
+			user_type: 'email',
+			was_disabled_ldap_user: false,
+		});
+
+		const publicInvitee = await this.userService.toPublic(invitee);
+
+		await this.externalHooks.run('user.profile.update', [invitee.email, publicInvitee]);
+		await this.externalHooks.run('user.password.update', [invitee.email, invitee.password]);
+
+		return await this.userService.toPublic(updatedUser, {
+			posthog: this.postHog,
+			withScopes: true,
+		});
+	}
+}
diff --git a/packages/cli/src/controllers/ldap.controller.ts b/packages/cli/src/controllers/ldap.controller.ts
deleted file mode 100644
index b354ef660021c..0000000000000
--- a/packages/cli/src/controllers/ldap.controller.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-import pick from 'lodash.pick';
-import { Authorized, Get, Post, Put, RestController } from '@/decorators';
-import { getLdapConfig, getLdapSynchronizations, updateLdapConfig } from '@/Ldap/helpers';
-import { LdapService } from '@/Ldap/LdapService.ee';
-import { LdapSync } from '@/Ldap/LdapSync.ee';
-import { LdapConfiguration } from '@/Ldap/types';
-import { BadRequestError } from '@/ResponseHelper';
-import { NON_SENSIBLE_LDAP_CONFIG_PROPERTIES } from '@/Ldap/constants';
-import { InternalHooks } from '@/InternalHooks';
-
-@Authorized(['global', 'owner'])
-@RestController('/ldap')
-export class LdapController {
-	constructor(
-		private ldapService: LdapService,
-		private ldapSync: LdapSync,
-		private internalHooks: InternalHooks,
-	) {}
-
-	@Get('/config')
-	async getConfig() {
-		return getLdapConfig();
-	}
-
-	@Post('/test-connection')
-	async testConnection() {
-		try {
-			await this.ldapService.testConnection();
-		} catch (error) {
-			throw new BadRequestError((error as { message: string }).message);
-		}
-	}
-
-	@Put('/config')
-	async updateConfig(req: LdapConfiguration.Update) {
-		try {
-			await updateLdapConfig(req.body);
-		} catch (error) {
-			throw new BadRequestError((error as { message: string }).message);
-		}
-
-		const data = await getLdapConfig();
-
-		void this.internalHooks.onUserUpdatedLdapSettings({
-			user_id: req.user.id,
-			...pick(data, NON_SENSIBLE_LDAP_CONFIG_PROPERTIES),
-		});
-
-		return data;
-	}
-
-	@Get('/sync')
-	async getLdapSync(req: LdapConfiguration.GetSync) {
-		const { page = '0', perPage = '20' } = req.query;
-		return getLdapSynchronizations(parseInt(page, 10), parseInt(perPage, 10));
-	}
-
-	@Post('/sync')
-	async syncLdap(req: LdapConfiguration.Sync) {
-		try {
-			await this.ldapSync.run(req.body.type);
-		} catch (error) {
-			throw new BadRequestError((error as { message: string }).message);
-		}
-	}
-}
diff --git a/packages/cli/src/controllers/me.controller.ts b/packages/cli/src/controllers/me.controller.ts
index 0ff4cd78f0a5c..3a3149d4e955c 100644
--- a/packages/cli/src/controllers/me.controller.ts
+++ b/packages/cli/src/controllers/me.controller.ts
@@ -1,62 +1,39 @@
 import validator from 'validator';
 import { plainToInstance } from 'class-transformer';
-import { Authorized, Delete, Get, Patch, Post, RestController } from '@/decorators';
-import {
-	compareHash,
-	hashPassword,
-	sanitizeUser,
-	validatePassword,
-} from '@/UserManagement/UserManagementHelper';
-import { BadRequestError } from '@/ResponseHelper';
+import { Response } from 'express';
+import { randomBytes } from 'crypto';
+
+import { AuthService } from '@/auth/auth.service';
+import { Delete, Get, Patch, Post, RestController } from '@/decorators';
+import { PasswordUtility } from '@/services/password.utility';
 import { validateEntity } from '@/GenericHelpers';
-import { issueCookie } from '@/auth/jwt';
 import type { User } from '@db/entities/User';
-import type { UserRepository } from '@db/repositories';
-import { Response } from 'express';
-import type { ILogger } from 'n8n-workflow';
 import {
 	AuthenticatedRequest,
 	MeRequest,
 	UserSettingsUpdatePayload,
 	UserUpdatePayload,
 } from '@/requests';
-import type {
-	PublicUser,
-	IDatabaseCollections,
-	IExternalHooksClass,
-	IInternalHooksClass,
-} from '@/Interfaces';
-import { randomBytes } from 'crypto';
-import { isSamlLicensedAndEnabled } from '../sso/saml/samlHelpers';
-import { UserService } from '@/user/user.service';
+import type { PublicUser } from '@/Interfaces';
+import { isSamlLicensedAndEnabled } from '@/sso/saml/samlHelpers';
+import { UserService } from '@/services/user.service';
+import { Logger } from '@/Logger';
+import { ExternalHooks } from '@/ExternalHooks';
+import { InternalHooks } from '@/InternalHooks';
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
+import { UserRepository } from '@/databases/repositories/user.repository';
 
-@Authorized()
 @RestController('/me')
 export class MeController {
-	private readonly logger: ILogger;
-
-	private readonly externalHooks: IExternalHooksClass;
-
-	private readonly internalHooks: IInternalHooksClass;
-
-	private readonly userRepository: UserRepository;
-
-	constructor({
-		logger,
-		externalHooks,
-		internalHooks,
-		repositories,
-	}: {
-		logger: ILogger;
-		externalHooks: IExternalHooksClass;
-		internalHooks: IInternalHooksClass;
-		repositories: Pick<IDatabaseCollections, 'User'>;
-	}) {
-		this.logger = logger;
-		this.externalHooks = externalHooks;
-		this.internalHooks = internalHooks;
-		this.userRepository = repositories.User;
-	}
+	constructor(
+		private readonly logger: Logger,
+		private readonly externalHooks: ExternalHooks,
+		private readonly internalHooks: InternalHooks,
+		private readonly authService: AuthService,
+		private readonly userService: UserService,
+		private readonly passwordUtility: PasswordUtility,
+		private readonly userRepository: UserRepository,
+	) {}
 
 	/**
 	 * Update the logged-in user's properties, except password.
@@ -64,7 +41,7 @@ export class MeController {
 	@Patch('/')
 	async updateCurrentUser(req: MeRequest.UserUpdate, res: Response): Promise<PublicUser> {
 		const { id: userId, email: currentEmail } = req.user;
-		const payload = plainToInstance(UserUpdatePayload, req.body);
+		const payload = plainToInstance(UserUpdatePayload, req.body, { excludeExtraneousValues: true });
 
 		const { email } = payload;
 		if (!email) {
@@ -99,15 +76,16 @@ export class MeController {
 			}
 		}
 
-		await this.userRepository.update(userId, payload);
+		await this.externalHooks.run('user.profile.beforeUpdate', [userId, currentEmail, payload]);
+
+		await this.userService.update(userId, payload);
 		const user = await this.userRepository.findOneOrFail({
 			where: { id: userId },
-			relations: { globalRole: true },
 		});
 
 		this.logger.info('User updated successfully', { userId });
 
-		await issueCookie(res, user);
+		this.authService.issueCookie(res, user, req.browserId);
 
 		const updatedKeys = Object.keys(payload);
 		void this.internalHooks.onUserUpdate({
@@ -115,9 +93,11 @@ export class MeController {
 			fields_changed: updatedKeys,
 		});
 
-		await this.externalHooks.run('user.profile.update', [currentEmail, sanitizeUser(user)]);
+		const publicUser = await this.userService.toPublic(user);
+
+		await this.externalHooks.run('user.profile.update', [currentEmail, publicUser]);
 
-		return sanitizeUser(user);
+		return publicUser;
 	}
 
 	/**
@@ -125,12 +105,13 @@ export class MeController {
 	 */
 	@Patch('/password')
 	async updatePassword(req: MeRequest.Password, res: Response) {
+		const { user } = req;
 		const { currentPassword, newPassword } = req.body;
 
 		// If SAML is enabled, we don't allow the user to change their email address
 		if (isSamlLicensedAndEnabled()) {
 			this.logger.debug('Attempted to change password for user, while SAML is enabled', {
-				userId: req.user?.id,
+				userId: user.id,
 			});
 			throw new BadRequestError(
 				'With SAML enabled, users need to use their SAML provider to change passwords',
@@ -141,30 +122,30 @@ export class MeController {
 			throw new BadRequestError('Invalid payload.');
 		}
 
-		if (!req.user.password) {
+		if (!user.password) {
 			throw new BadRequestError('Requesting user not set up.');
 		}
 
-		const isCurrentPwCorrect = await compareHash(currentPassword, req.user.password);
+		const isCurrentPwCorrect = await this.passwordUtility.compare(currentPassword, user.password);
 		if (!isCurrentPwCorrect) {
 			throw new BadRequestError('Provided current password is incorrect.');
 		}
 
-		const validPassword = validatePassword(newPassword);
+		const validPassword = this.passwordUtility.validate(newPassword);
 
-		req.user.password = await hashPassword(validPassword);
+		user.password = await this.passwordUtility.hash(validPassword);
 
-		const user = await this.userRepository.save(req.user);
+		const updatedUser = await this.userRepository.save(user, { transaction: false });
 		this.logger.info('Password updated successfully', { userId: user.id });
 
-		await issueCookie(res, user);
+		this.authService.issueCookie(res, updatedUser, req.browserId);
 
 		void this.internalHooks.onUserUpdate({
-			user,
+			user: updatedUser,
 			fields_changed: ['password'],
 		});
 
-		await this.externalHooks.run('user.password.update', [user.email, req.user.password]);
+		await this.externalHooks.run('user.password.update', [updatedUser.email, updatedUser.password]);
 
 		return { success: true };
 	}
@@ -186,10 +167,13 @@ export class MeController {
 			throw new BadRequestError('Personalization answers are mandatory');
 		}
 
-		await this.userRepository.save({
-			id: req.user.id,
-			personalizationAnswers,
-		});
+		await this.userRepository.save(
+			{
+				id: req.user.id,
+				personalizationAnswers,
+			},
+			{ transaction: false },
+		);
 
 		this.logger.info('User survey updated successfully', { userId: req.user.id });
 
@@ -205,9 +189,7 @@ export class MeController {
 	async createAPIKey(req: AuthenticatedRequest) {
 		const apiKey = `n8n_api_${randomBytes(40).toString('hex')}`;
 
-		await this.userRepository.update(req.user.id, {
-			apiKey,
-		});
+		await this.userService.update(req.user.id, { apiKey });
 
 		void this.internalHooks.onApiKeyCreated({
 			user: req.user,
@@ -230,9 +212,7 @@ export class MeController {
 	 */
 	@Delete('/api-key')
 	async deleteAPIKey(req: AuthenticatedRequest) {
-		await this.userRepository.update(req.user.id, {
-			apiKey: null,
-		});
+		await this.userService.update(req.user.id, { apiKey: null });
 
 		void this.internalHooks.onApiKeyDeleted({
 			user: req.user,
@@ -247,10 +227,12 @@ export class MeController {
 	 */
 	@Patch('/settings')
 	async updateCurrentUserSettings(req: MeRequest.UserSettingsUpdate): Promise<User['settings']> {
-		const payload = plainToInstance(UserSettingsUpdatePayload, req.body);
+		const payload = plainToInstance(UserSettingsUpdatePayload, req.body, {
+			excludeExtraneousValues: true,
+		});
 		const { id } = req.user;
 
-		await UserService.updateUserSettings(id, payload);
+		await this.userService.updateSettings(id, payload);
 
 		const user = await this.userRepository.findOneOrFail({
 			select: ['settings'],
diff --git a/packages/cli/src/controllers/mfa.controller.ts b/packages/cli/src/controllers/mfa.controller.ts
new file mode 100644
index 0000000000000..3c58b944d57d0
--- /dev/null
+++ b/packages/cli/src/controllers/mfa.controller.ts
@@ -0,0 +1,96 @@
+import { Delete, Get, Post, RestController } from '@/decorators';
+import { AuthenticatedRequest, MFA } from '@/requests';
+import { MfaService } from '@/Mfa/mfa.service';
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
+
+@RestController('/mfa')
+export class MFAController {
+	constructor(private mfaService: MfaService) {}
+
+	@Get('/qr')
+	async getQRCode(req: AuthenticatedRequest) {
+		const { email, id, mfaEnabled } = req.user;
+
+		if (mfaEnabled)
+			throw new BadRequestError(
+				'MFA already enabled. Disable it to generate new secret and recovery codes',
+			);
+
+		const { decryptedSecret: secret, decryptedRecoveryCodes: recoveryCodes } =
+			await this.mfaService.getSecretAndRecoveryCodes(id);
+
+		if (secret && recoveryCodes.length) {
+			const qrCode = this.mfaService.totp.generateTOTPUri({
+				secret,
+				label: email,
+			});
+
+			return {
+				secret,
+				recoveryCodes,
+				qrCode,
+			};
+		}
+
+		const newRecoveryCodes = this.mfaService.generateRecoveryCodes();
+
+		const newSecret = this.mfaService.totp.generateSecret();
+
+		const qrCode = this.mfaService.totp.generateTOTPUri({ secret: newSecret, label: email });
+
+		await this.mfaService.saveSecretAndRecoveryCodes(id, newSecret, newRecoveryCodes);
+
+		return {
+			secret: newSecret,
+			qrCode,
+			recoveryCodes: newRecoveryCodes,
+		};
+	}
+
+	@Post('/enable')
+	async activateMFA(req: MFA.Activate) {
+		const { token = null } = req.body;
+		const { id, mfaEnabled } = req.user;
+
+		const { decryptedSecret: secret, decryptedRecoveryCodes: recoveryCodes } =
+			await this.mfaService.getSecretAndRecoveryCodes(id);
+
+		if (!token) throw new BadRequestError('Token is required to enable MFA feature');
+
+		if (mfaEnabled) throw new BadRequestError('MFA already enabled');
+
+		if (!secret || !recoveryCodes.length) {
+			throw new BadRequestError('Cannot enable MFA without generating secret and recovery codes');
+		}
+
+		const verified = this.mfaService.totp.verifySecret({ secret, token, window: 10 });
+
+		if (!verified)
+			throw new BadRequestError('MFA token expired. Close the modal and enable MFA again', 997);
+
+		await this.mfaService.enableMfa(id);
+	}
+
+	@Delete('/disable')
+	async disableMFA(req: AuthenticatedRequest) {
+		const { id } = req.user;
+
+		await this.mfaService.disableMfa(id);
+	}
+
+	@Post('/verify')
+	async verifyMFA(req: MFA.Verify) {
+		const { id } = req.user;
+		const { token } = req.body;
+
+		const { decryptedSecret: secret } = await this.mfaService.getSecretAndRecoveryCodes(id);
+
+		if (!token) throw new BadRequestError('Token is required to enable MFA feature');
+
+		if (!secret) throw new BadRequestError('No MFA secret se for this user');
+
+		const verified = this.mfaService.totp.verifySecret({ secret, token });
+
+		if (!verified) throw new BadRequestError('MFA secret could not be verified');
+	}
+}
diff --git a/packages/cli/src/controllers/nodeTypes.controller.ts b/packages/cli/src/controllers/nodeTypes.controller.ts
index 63002c7c122a9..fddefb7e10d12 100644
--- a/packages/cli/src/controllers/nodeTypes.controller.ts
+++ b/packages/cli/src/controllers/nodeTypes.controller.ts
@@ -1,29 +1,20 @@
 import { readFile } from 'fs/promises';
-import get from 'lodash.get';
+import get from 'lodash/get';
 import { Request } from 'express';
 import type { INodeTypeDescription, INodeTypeNameVersion } from 'n8n-workflow';
-import { Authorized, Post, RestController } from '@/decorators';
-import { getNodeTranslationPath } from '@/TranslationHelpers';
-import type { Config } from '@/config';
-import type { NodeTypes } from '@/NodeTypes';
+import { Post, RestController } from '@/decorators';
+import config from '@/config';
+import { NodeTypes } from '@/NodeTypes';
 
-@Authorized()
 @RestController('/node-types')
 export class NodeTypesController {
-	private readonly config: Config;
-
-	private readonly nodeTypes: NodeTypes;
-
-	constructor({ config, nodeTypes }: { config: Config; nodeTypes: NodeTypes }) {
-		this.config = config;
-		this.nodeTypes = nodeTypes;
-	}
+	constructor(private readonly nodeTypes: NodeTypes) {}
 
 	@Post('/')
 	async getNodeInfo(req: Request) {
 		const nodeInfos = get(req, 'body.nodeInfos', []) as INodeTypeNameVersion[];
 
-		const defaultLocale = this.config.getEnv('defaultLocale');
+		const defaultLocale = config.getEnv('defaultLocale');
 
 		if (defaultLocale === 'en') {
 			return nodeInfos.reduce<INodeTypeDescription[]>((acc, { name, version }) => {
@@ -39,7 +30,7 @@ export class NodeTypesController {
 			nodeTypes: INodeTypeDescription[],
 		) => {
 			const { description, sourcePath } = this.nodeTypes.getWithSourcePath(name, version);
-			const translationPath = await getNodeTranslationPath({
+			const translationPath = await this.nodeTypes.getNodeTranslationPath({
 				nodeSourcePath: sourcePath,
 				longNodeType: description.name,
 				locale: defaultLocale,
@@ -58,8 +49,8 @@ export class NodeTypesController {
 
 		const nodeTypes: INodeTypeDescription[] = [];
 
-		const promises = nodeInfos.map(async ({ name, version }) =>
-			populateTranslation(name, version, nodeTypes),
+		const promises = nodeInfos.map(
+			async ({ name, version }) => await populateTranslation(name, version, nodeTypes),
 		);
 
 		await Promise.all(promises);
diff --git a/packages/cli/src/controllers/nodes.controller.ts b/packages/cli/src/controllers/nodes.controller.ts
deleted file mode 100644
index 9d872c8693d56..0000000000000
--- a/packages/cli/src/controllers/nodes.controller.ts
+++ /dev/null
@@ -1,298 +0,0 @@
-import { Request, Response, NextFunction } from 'express';
-import {
-	RESPONSE_ERROR_MESSAGES,
-	STARTER_TEMPLATE_NAME,
-	UNKNOWN_FAILURE_REASON,
-} from '@/constants';
-import { Authorized, Delete, Get, Middleware, Patch, Post, RestController } from '@/decorators';
-import { NodeRequest } from '@/requests';
-import { BadRequestError, InternalServerError } from '@/ResponseHelper';
-import {
-	checkNpmPackageStatus,
-	executeCommand,
-	hasPackageLoaded,
-	isClientError,
-	isNpmError,
-	matchMissingPackages,
-	matchPackagesWithUpdates,
-	parseNpmPackageName,
-	removePackageFromMissingList,
-	sanitizeNpmPackageName,
-} from '@/CommunityNodes/helpers';
-import {
-	findInstalledPackage,
-	getAllInstalledPackages,
-	isPackageInstalled,
-} from '@/CommunityNodes/packageModel';
-import type { InstalledPackages } from '@db/entities/InstalledPackages';
-import type { CommunityPackages } from '@/Interfaces';
-import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
-import { InternalHooks } from '@/InternalHooks';
-import { Push } from '@/push';
-import { Config } from '@/config';
-
-const { PACKAGE_NOT_INSTALLED, PACKAGE_NAME_NOT_PROVIDED } = RESPONSE_ERROR_MESSAGES;
-
-@Authorized(['global', 'owner'])
-@RestController('/nodes')
-export class NodesController {
-	constructor(
-		private config: Config,
-		private loadNodesAndCredentials: LoadNodesAndCredentials,
-		private push: Push,
-		private internalHooks: InternalHooks,
-	) {}
-
-	// TODO: move this into a new decorator `@IfConfig('executions.mode', 'queue')`
-	@Middleware()
-	checkIfCommunityNodesEnabled(req: Request, res: Response, next: NextFunction) {
-		if (this.config.getEnv('executions.mode') === 'queue' && req.method !== 'GET')
-			res.status(400).json({
-				status: 'error',
-				message: 'Package management is disabled when running in "queue" mode',
-			});
-		else next();
-	}
-
-	@Post('/')
-	async installPackage(req: NodeRequest.Post) {
-		const { name } = req.body;
-
-		if (!name) {
-			throw new BadRequestError(PACKAGE_NAME_NOT_PROVIDED);
-		}
-
-		let parsed: CommunityPackages.ParsedPackageName;
-
-		try {
-			parsed = parseNpmPackageName(name);
-		} catch (error) {
-			throw new BadRequestError(
-				error instanceof Error ? error.message : 'Failed to parse package name',
-			);
-		}
-
-		if (parsed.packageName === STARTER_TEMPLATE_NAME) {
-			throw new BadRequestError(
-				[
-					`Package "${parsed.packageName}" is only a template`,
-					'Please enter an actual package to install',
-				].join('.'),
-			);
-		}
-
-		const isInstalled = await isPackageInstalled(parsed.packageName);
-		const hasLoaded = hasPackageLoaded(name);
-
-		if (isInstalled && hasLoaded) {
-			throw new BadRequestError(
-				[
-					`Package "${parsed.packageName}" is already installed`,
-					'To update it, click the corresponding button in the UI',
-				].join('.'),
-			);
-		}
-
-		const packageStatus = await checkNpmPackageStatus(name);
-
-		if (packageStatus.status !== 'OK') {
-			throw new BadRequestError(`Package "${name}" is banned so it cannot be installed`);
-		}
-
-		let installedPackage: InstalledPackages;
-		try {
-			installedPackage = await this.loadNodesAndCredentials.installNpmModule(
-				parsed.packageName,
-				parsed.version,
-			);
-		} catch (error) {
-			const errorMessage = error instanceof Error ? error.message : UNKNOWN_FAILURE_REASON;
-
-			void this.internalHooks.onCommunityPackageInstallFinished({
-				user: req.user,
-				input_string: name,
-				package_name: parsed.packageName,
-				success: false,
-				package_version: parsed.version,
-				failure_reason: errorMessage,
-			});
-
-			let message = [`Error loading package "${name}" `, errorMessage].join(':');
-			if (error instanceof Error && error.cause instanceof Error) {
-				message += `\nCause: ${error.cause.message}`;
-			}
-
-			const clientError = error instanceof Error ? isClientError(error) : false;
-			throw new (clientError ? BadRequestError : InternalServerError)(message);
-		}
-
-		if (!hasLoaded) removePackageFromMissingList(name);
-
-		// broadcast to connected frontends that node list has been updated
-		installedPackage.installedNodes.forEach((node) => {
-			this.push.send('reloadNodeType', {
-				name: node.type,
-				version: node.latestVersion,
-			});
-		});
-
-		void this.internalHooks.onCommunityPackageInstallFinished({
-			user: req.user,
-			input_string: name,
-			package_name: parsed.packageName,
-			success: true,
-			package_version: parsed.version,
-			package_node_names: installedPackage.installedNodes.map((node) => node.name),
-			package_author: installedPackage.authorName,
-			package_author_email: installedPackage.authorEmail,
-		});
-
-		return installedPackage;
-	}
-
-	@Get('/')
-	async getInstalledPackages() {
-		const installedPackages = await getAllInstalledPackages();
-
-		if (installedPackages.length === 0) return [];
-
-		let pendingUpdates: CommunityPackages.AvailableUpdates | undefined;
-
-		try {
-			const command = ['npm', 'outdated', '--json'].join(' ');
-			await executeCommand(command, { doNotHandleError: true });
-		} catch (error) {
-			// when there are updates, npm exits with code 1
-			// when there are no updates, command succeeds
-			// https://github.com/npm/rfcs/issues/473
-			if (isNpmError(error) && error.code === 1) {
-				pendingUpdates = JSON.parse(error.stdout) as CommunityPackages.AvailableUpdates;
-			}
-		}
-
-		let hydratedPackages = matchPackagesWithUpdates(installedPackages, pendingUpdates);
-
-		try {
-			const missingPackages = this.config.get('nodes.packagesMissing') as string | undefined;
-			if (missingPackages) {
-				hydratedPackages = matchMissingPackages(hydratedPackages, missingPackages);
-			}
-		} catch {}
-
-		return hydratedPackages;
-	}
-
-	@Delete('/')
-	async uninstallPackage(req: NodeRequest.Delete) {
-		const { name } = req.query;
-
-		if (!name) {
-			throw new BadRequestError(PACKAGE_NAME_NOT_PROVIDED);
-		}
-
-		try {
-			sanitizeNpmPackageName(name);
-		} catch (error) {
-			const message = error instanceof Error ? error.message : UNKNOWN_FAILURE_REASON;
-
-			throw new BadRequestError(message);
-		}
-
-		const installedPackage = await findInstalledPackage(name);
-
-		if (!installedPackage) {
-			throw new BadRequestError(PACKAGE_NOT_INSTALLED);
-		}
-
-		try {
-			await this.loadNodesAndCredentials.removeNpmModule(name, installedPackage);
-		} catch (error) {
-			const message = [
-				`Error removing package "${name}"`,
-				error instanceof Error ? error.message : UNKNOWN_FAILURE_REASON,
-			].join(':');
-
-			throw new InternalServerError(message);
-		}
-
-		// broadcast to connected frontends that node list has been updated
-		installedPackage.installedNodes.forEach((node) => {
-			this.push.send('removeNodeType', {
-				name: node.type,
-				version: node.latestVersion,
-			});
-		});
-
-		void this.internalHooks.onCommunityPackageDeleteFinished({
-			user: req.user,
-			package_name: name,
-			package_version: installedPackage.installedVersion,
-			package_node_names: installedPackage.installedNodes.map((node) => node.name),
-			package_author: installedPackage.authorName,
-			package_author_email: installedPackage.authorEmail,
-		});
-	}
-
-	@Patch('/')
-	async updatePackage(req: NodeRequest.Update) {
-		const { name } = req.body;
-
-		if (!name) {
-			throw new BadRequestError(PACKAGE_NAME_NOT_PROVIDED);
-		}
-
-		const previouslyInstalledPackage = await findInstalledPackage(name);
-
-		if (!previouslyInstalledPackage) {
-			throw new BadRequestError(PACKAGE_NOT_INSTALLED);
-		}
-
-		try {
-			const newInstalledPackage = await this.loadNodesAndCredentials.updateNpmModule(
-				parseNpmPackageName(name).packageName,
-				previouslyInstalledPackage,
-			);
-
-			// broadcast to connected frontends that node list has been updated
-			previouslyInstalledPackage.installedNodes.forEach((node) => {
-				this.push.send('removeNodeType', {
-					name: node.type,
-					version: node.latestVersion,
-				});
-			});
-
-			newInstalledPackage.installedNodes.forEach((node) => {
-				this.push.send('reloadNodeType', {
-					name: node.name,
-					version: node.latestVersion,
-				});
-			});
-
-			void this.internalHooks.onCommunityPackageUpdateFinished({
-				user: req.user,
-				package_name: name,
-				package_version_current: previouslyInstalledPackage.installedVersion,
-				package_version_new: newInstalledPackage.installedVersion,
-				package_node_names: newInstalledPackage.installedNodes.map((node) => node.name),
-				package_author: newInstalledPackage.authorName,
-				package_author_email: newInstalledPackage.authorEmail,
-			});
-
-			return newInstalledPackage;
-		} catch (error) {
-			previouslyInstalledPackage.installedNodes.forEach((node) => {
-				this.push.send('removeNodeType', {
-					name: node.type,
-					version: node.latestVersion,
-				});
-			});
-
-			const message = [
-				`Error removing package "${name}"`,
-				error instanceof Error ? error.message : UNKNOWN_FAILURE_REASON,
-			].join(':');
-
-			throw new InternalServerError(message);
-		}
-	}
-}
diff --git a/packages/cli/src/controllers/oauth/abstractOAuth.controller.ts b/packages/cli/src/controllers/oauth/abstractOAuth.controller.ts
new file mode 100644
index 0000000000000..6f21069150ee5
--- /dev/null
+++ b/packages/cli/src/controllers/oauth/abstractOAuth.controller.ts
@@ -0,0 +1,110 @@
+import { Service } from 'typedi';
+import { Credentials } from 'n8n-core';
+import type { ICredentialDataDecryptedObject, IWorkflowExecuteAdditionalData } from 'n8n-workflow';
+import config from '@/config';
+import type { CredentialsEntity } from '@db/entities/CredentialsEntity';
+import type { User } from '@db/entities/User';
+import { CredentialsRepository } from '@db/repositories/credentials.repository';
+import { SharedCredentialsRepository } from '@db/repositories/sharedCredentials.repository';
+import type { ICredentialsDb } from '@/Interfaces';
+import type { OAuthRequest } from '@/requests';
+import { RESPONSE_ERROR_MESSAGES } from '@/constants';
+import { CredentialsHelper } from '@/CredentialsHelper';
+import * as WorkflowExecuteAdditionalData from '@/WorkflowExecuteAdditionalData';
+import { Logger } from '@/Logger';
+import { ExternalHooks } from '@/ExternalHooks';
+import { UrlService } from '@/services/url.service';
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
+import { NotFoundError } from '@/errors/response-errors/not-found.error';
+
+@Service()
+export abstract class AbstractOAuthController {
+	abstract oauthVersion: number;
+
+	constructor(
+		protected readonly logger: Logger,
+		protected readonly externalHooks: ExternalHooks,
+		private readonly credentialsHelper: CredentialsHelper,
+		private readonly credentialsRepository: CredentialsRepository,
+		private readonly sharedCredentialsRepository: SharedCredentialsRepository,
+		private readonly urlService: UrlService,
+	) {}
+
+	get baseUrl() {
+		const restUrl = `${this.urlService.getInstanceBaseUrl()}/${config.getEnv('endpoints.rest')}`;
+		return `${restUrl}/oauth${this.oauthVersion}-credential`;
+	}
+
+	protected async getCredential(
+		req: OAuthRequest.OAuth2Credential.Auth,
+	): Promise<CredentialsEntity> {
+		const { id: credentialId } = req.query;
+
+		if (!credentialId) {
+			throw new BadRequestError('Required credential ID is missing');
+		}
+
+		const credential = await this.sharedCredentialsRepository.findCredentialForUser(
+			credentialId,
+			req.user,
+		);
+
+		if (!credential) {
+			this.logger.error(
+				`OAuth${this.oauthVersion} credential authorization failed because the current user does not have the correct permissions`,
+				{ userId: req.user.id },
+			);
+			throw new NotFoundError(RESPONSE_ERROR_MESSAGES.NO_CREDENTIAL);
+		}
+
+		return credential;
+	}
+
+	protected async getAdditionalData(user: User) {
+		return await WorkflowExecuteAdditionalData.getBase(user.id);
+	}
+
+	protected async getDecryptedData(
+		credential: ICredentialsDb,
+		additionalData: IWorkflowExecuteAdditionalData,
+	) {
+		return await this.credentialsHelper.getDecrypted(
+			additionalData,
+			credential,
+			credential.type,
+			'internal',
+			undefined,
+			true,
+		);
+	}
+
+	protected applyDefaultsAndOverwrites<T>(
+		credential: ICredentialsDb,
+		decryptedData: ICredentialDataDecryptedObject,
+		additionalData: IWorkflowExecuteAdditionalData,
+	) {
+		return this.credentialsHelper.applyDefaultsAndOverwrites(
+			additionalData,
+			decryptedData,
+			credential.type,
+			'internal',
+		) as unknown as T;
+	}
+
+	protected async encryptAndSaveData(
+		credential: ICredentialsDb,
+		decryptedData: ICredentialDataDecryptedObject,
+	) {
+		const credentials = new Credentials(credential, credential.type);
+		credentials.setData(decryptedData);
+		await this.credentialsRepository.update(credential.id, {
+			...credentials.getDataToSave(),
+			updatedAt: new Date(),
+		});
+	}
+
+	/** Get a credential without user check */
+	protected async getCredentialWithoutUser(credentialId: string): Promise<ICredentialsDb | null> {
+		return await this.credentialsRepository.findOneBy({ id: credentialId });
+	}
+}
diff --git a/packages/cli/src/controllers/oauth/oAuth1Credential.controller.ts b/packages/cli/src/controllers/oauth/oAuth1Credential.controller.ts
new file mode 100644
index 0000000000000..0c3f0fb2046e4
--- /dev/null
+++ b/packages/cli/src/controllers/oauth/oAuth1Credential.controller.ts
@@ -0,0 +1,187 @@
+import { Response } from 'express';
+import type { AxiosRequestConfig } from 'axios';
+import axios from 'axios';
+import type { RequestOptions } from 'oauth-1.0a';
+import clientOAuth1 from 'oauth-1.0a';
+import { createHmac } from 'crypto';
+import { RESPONSE_ERROR_MESSAGES } from '@/constants';
+import { Get, RestController } from '@/decorators';
+import { OAuthRequest } from '@/requests';
+import { sendErrorResponse } from '@/ResponseHelper';
+import { AbstractOAuthController } from './abstractOAuth.controller';
+import { NotFoundError } from '@/errors/response-errors/not-found.error';
+import { ServiceUnavailableError } from '@/errors/response-errors/service-unavailable.error';
+
+interface OAuth1CredentialData {
+	signatureMethod: 'HMAC-SHA256' | 'HMAC-SHA512' | 'HMAC-SHA1';
+	consumerKey: string;
+	consumerSecret: string;
+	authUrl: string;
+	accessTokenUrl: string;
+	requestTokenUrl: string;
+}
+
+const algorithmMap = {
+	/* eslint-disable @typescript-eslint/naming-convention */
+	'HMAC-SHA256': 'sha256',
+	'HMAC-SHA512': 'sha512',
+	'HMAC-SHA1': 'sha1',
+	/* eslint-enable */
+} as const;
+
+@RestController('/oauth1-credential')
+export class OAuth1CredentialController extends AbstractOAuthController {
+	override oauthVersion = 1;
+
+	/** Get Authorization url */
+	@Get('/auth')
+	async getAuthUri(req: OAuthRequest.OAuth1Credential.Auth): Promise<string> {
+		const credential = await this.getCredential(req);
+		const additionalData = await this.getAdditionalData(req.user);
+		const decryptedDataOriginal = await this.getDecryptedData(credential, additionalData);
+		const oauthCredentials = this.applyDefaultsAndOverwrites<OAuth1CredentialData>(
+			credential,
+			decryptedDataOriginal,
+			additionalData,
+		);
+
+		const signatureMethod = oauthCredentials.signatureMethod;
+
+		const oAuthOptions: clientOAuth1.Options = {
+			consumer: {
+				key: oauthCredentials.consumerKey,
+				secret: oauthCredentials.consumerSecret,
+			},
+			signature_method: signatureMethod,
+			// eslint-disable-next-line @typescript-eslint/naming-convention
+			hash_function(base, key) {
+				const algorithm = algorithmMap[signatureMethod] ?? 'sha1';
+				return createHmac(algorithm, key).update(base).digest('base64');
+			},
+		};
+
+		const oauthRequestData = {
+			oauth_callback: `${this.baseUrl}/callback?cid=${credential.id}`,
+		};
+
+		await this.externalHooks.run('oauth1.authenticate', [oAuthOptions, oauthRequestData]);
+
+		const oauth = new clientOAuth1(oAuthOptions);
+
+		const options: RequestOptions = {
+			method: 'POST',
+			url: oauthCredentials.requestTokenUrl,
+			data: oauthRequestData,
+		};
+
+		const data = oauth.toHeader(oauth.authorize(options));
+
+		// @ts-ignore
+		options.headers = data;
+
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+		const { data: response } = await axios.request(options as Partial<AxiosRequestConfig>);
+
+		// Response comes as x-www-form-urlencoded string so convert it to JSON
+
+		const paramsParser = new URLSearchParams(response as string);
+
+		const responseJson = Object.fromEntries(paramsParser.entries());
+
+		const returnUri = `${oauthCredentials.authUrl}?oauth_token=${responseJson.oauth_token}`;
+
+		await this.encryptAndSaveData(credential, decryptedDataOriginal);
+
+		this.logger.verbose('OAuth1 authorization successful for new credential', {
+			userId: req.user.id,
+			credentialId: credential.id,
+		});
+
+		return returnUri;
+	}
+
+	/** Verify and store app code. Generate access tokens and store for respective credential */
+	@Get('/callback', { usesTemplates: true })
+	async handleCallback(req: OAuthRequest.OAuth1Credential.Callback, res: Response) {
+		try {
+			const { oauth_verifier, oauth_token, cid: credentialId } = req.query;
+
+			if (!oauth_verifier || !oauth_token) {
+				const errorResponse = new ServiceUnavailableError(
+					`Insufficient parameters for OAuth1 callback. Received following query parameters: ${JSON.stringify(
+						req.query,
+					)}`,
+				);
+				this.logger.error('OAuth1 callback failed because of insufficient parameters received', {
+					userId: req.user?.id,
+					credentialId,
+				});
+				return sendErrorResponse(res, errorResponse);
+			}
+
+			const credential = await this.getCredentialWithoutUser(credentialId);
+
+			if (!credential) {
+				this.logger.error('OAuth1 callback failed because of insufficient user permissions', {
+					userId: req.user?.id,
+					credentialId,
+				});
+				const errorResponse = new NotFoundError(RESPONSE_ERROR_MESSAGES.NO_CREDENTIAL);
+				return sendErrorResponse(res, errorResponse);
+			}
+
+			const additionalData = await this.getAdditionalData(req.user);
+			const decryptedDataOriginal = await this.getDecryptedData(credential, additionalData);
+			const oauthCredentials = this.applyDefaultsAndOverwrites<OAuth1CredentialData>(
+				credential,
+				decryptedDataOriginal,
+				additionalData,
+			);
+
+			const options: AxiosRequestConfig = {
+				method: 'POST',
+				url: oauthCredentials.accessTokenUrl,
+				params: {
+					oauth_token,
+					oauth_verifier,
+				},
+			};
+
+			let oauthToken;
+
+			try {
+				oauthToken = await axios.request(options);
+			} catch (error) {
+				this.logger.error('Unable to fetch tokens for OAuth1 callback', {
+					userId: req.user?.id,
+					credentialId,
+				});
+				const errorResponse = new NotFoundError('Unable to get access tokens!');
+				return sendErrorResponse(res, errorResponse);
+			}
+
+			// Response comes as x-www-form-urlencoded string so convert it to JSON
+
+			const paramParser = new URLSearchParams(oauthToken.data as string);
+
+			const oauthTokenJson = Object.fromEntries(paramParser.entries());
+
+			decryptedDataOriginal.oauthTokenData = oauthTokenJson;
+
+			await this.encryptAndSaveData(credential, decryptedDataOriginal);
+
+			this.logger.verbose('OAuth1 callback successful for new credential', {
+				userId: req.user?.id,
+				credentialId,
+			});
+			return res.render('oauth-callback');
+		} catch (error) {
+			this.logger.error('OAuth1 callback failed because of insufficient user permissions', {
+				userId: req.user?.id,
+				credentialId: req.query.cid,
+			});
+			// Error response
+			return sendErrorResponse(res, error as Error);
+		}
+	}
+}
diff --git a/packages/cli/src/controllers/oauth/oAuth2Credential.controller.ts b/packages/cli/src/controllers/oauth/oAuth2Credential.controller.ts
new file mode 100644
index 0000000000000..66aec58e99604
--- /dev/null
+++ b/packages/cli/src/controllers/oauth/oAuth2Credential.controller.ts
@@ -0,0 +1,247 @@
+import type { ClientOAuth2Options, OAuth2CredentialData } from '@n8n/client-oauth2';
+import { ClientOAuth2 } from '@n8n/client-oauth2';
+import Csrf from 'csrf';
+import { Response } from 'express';
+import pkceChallenge from 'pkce-challenge';
+import * as qs from 'querystring';
+import omit from 'lodash/omit';
+import set from 'lodash/set';
+import split from 'lodash/split';
+import { ApplicationError, jsonParse, jsonStringify } from 'n8n-workflow';
+import { Get, RestController } from '@/decorators';
+import { OAuthRequest } from '@/requests';
+import { AbstractOAuthController } from './abstractOAuth.controller';
+
+interface CsrfStateParam {
+	cid: string;
+	token: string;
+}
+
+@RestController('/oauth2-credential')
+export class OAuth2CredentialController extends AbstractOAuthController {
+	override oauthVersion = 2;
+
+	/** Get Authorization url */
+	@Get('/auth')
+	async getAuthUri(req: OAuthRequest.OAuth2Credential.Auth): Promise<string> {
+		const credential = await this.getCredential(req);
+		const additionalData = await this.getAdditionalData(req.user);
+		const decryptedDataOriginal = await this.getDecryptedData(credential, additionalData);
+
+		// At some point in the past we saved hidden scopes to credentials (but shouldn't)
+		// Delete scope before applying defaults to make sure new scopes are present on reconnect
+		// Generic Oauth2 API is an exception because it needs to save the scope
+		const genericOAuth2 = ['oAuth2Api', 'googleOAuth2Api', 'microsoftOAuth2Api'];
+		if (
+			decryptedDataOriginal?.scope &&
+			credential.type.includes('OAuth2') &&
+			!genericOAuth2.includes(credential.type)
+		) {
+			delete decryptedDataOriginal.scope;
+		}
+
+		const oauthCredentials = this.applyDefaultsAndOverwrites<OAuth2CredentialData>(
+			credential,
+			decryptedDataOriginal,
+			additionalData,
+		);
+
+		// Generate a CSRF prevention token and send it as an OAuth2 state string
+		const [csrfSecret, state] = this.createCsrfState(credential.id);
+
+		const oAuthOptions = {
+			...this.convertCredentialToOptions(oauthCredentials),
+			state,
+		};
+
+		if (oauthCredentials.authQueryParameters) {
+			oAuthOptions.query = qs.parse(oauthCredentials.authQueryParameters);
+		}
+
+		await this.externalHooks.run('oauth2.authenticate', [oAuthOptions]);
+
+		decryptedDataOriginal.csrfSecret = csrfSecret;
+		if (oauthCredentials.grantType === 'pkce') {
+			const { code_verifier, code_challenge } = pkceChallenge();
+			oAuthOptions.query = {
+				...oAuthOptions.query,
+				code_challenge,
+				code_challenge_method: 'S256',
+			};
+			decryptedDataOriginal.codeVerifier = code_verifier;
+		}
+
+		await this.encryptAndSaveData(credential, decryptedDataOriginal);
+
+		const oAuthObj = new ClientOAuth2(oAuthOptions);
+		const returnUri = oAuthObj.code.getUri();
+
+		this.logger.verbose('OAuth2 authorization url created for credential', {
+			userId: req.user.id,
+			credentialId: credential.id,
+		});
+
+		return returnUri.toString();
+	}
+
+	/** Verify and store app code. Generate access tokens and store for respective credential */
+	@Get('/callback', { usesTemplates: true })
+	async handleCallback(req: OAuthRequest.OAuth2Credential.Callback, res: Response) {
+		try {
+			// realmId it's currently just use for the quickbook OAuth2 flow
+			const { code, state: encodedState } = req.query;
+			if (!code || !encodedState) {
+				return this.renderCallbackError(
+					res,
+					'Insufficient parameters for OAuth2 callback.',
+					`Received following query parameters: ${JSON.stringify(req.query)}`,
+				);
+			}
+
+			let state: CsrfStateParam;
+			try {
+				state = this.decodeCsrfState(encodedState);
+			} catch (error) {
+				return this.renderCallbackError(res, (error as Error).message);
+			}
+
+			const credential = await this.getCredentialWithoutUser(state.cid);
+			if (!credential) {
+				const errorMessage = 'OAuth2 callback failed because of insufficient permissions';
+				this.logger.error(errorMessage, {
+					userId: req.user?.id,
+					credentialId: state.cid,
+				});
+				return this.renderCallbackError(res, errorMessage);
+			}
+
+			const additionalData = await this.getAdditionalData(req.user);
+			const decryptedDataOriginal = await this.getDecryptedData(credential, additionalData);
+			const oauthCredentials = this.applyDefaultsAndOverwrites<OAuth2CredentialData>(
+				credential,
+				decryptedDataOriginal,
+				additionalData,
+			);
+
+			const token = new Csrf();
+			if (
+				decryptedDataOriginal.csrfSecret === undefined ||
+				!token.verify(decryptedDataOriginal.csrfSecret as string, state.token)
+			) {
+				const errorMessage = 'The OAuth2 callback state is invalid!';
+				this.logger.debug(errorMessage, {
+					userId: req.user?.id,
+					credentialId: credential.id,
+				});
+				return this.renderCallbackError(res, errorMessage);
+			}
+
+			let options: Partial<ClientOAuth2Options> = {};
+
+			const oAuthOptions = this.convertCredentialToOptions(oauthCredentials);
+
+			if (oauthCredentials.grantType === 'pkce') {
+				options = {
+					body: { code_verifier: decryptedDataOriginal.codeVerifier },
+				};
+			} else if (oauthCredentials.authentication === 'body') {
+				options = {
+					body: {
+						client_id: oAuthOptions.clientId,
+						client_secret: oAuthOptions.clientSecret,
+					},
+				};
+				delete oAuthOptions.clientSecret;
+			}
+
+			await this.externalHooks.run('oauth2.callback', [oAuthOptions]);
+
+			const oAuthObj = new ClientOAuth2(oAuthOptions);
+
+			const queryParameters = req.originalUrl.split('?').splice(1, 1).join('');
+
+			const oauthToken = await oAuthObj.code.getToken(
+				`${oAuthOptions.redirectUri as string}?${queryParameters}`,
+				options,
+			);
+
+			if (Object.keys(req.query).length > 2) {
+				set(oauthToken.data, 'callbackQueryString', omit(req.query, 'state', 'code'));
+			}
+
+			if (oauthToken === undefined) {
+				const errorMessage = 'Unable to get OAuth2 access tokens!';
+				this.logger.error(errorMessage, {
+					userId: req.user?.id,
+					credentialId: credential.id,
+				});
+				return this.renderCallbackError(res, errorMessage);
+			}
+
+			if (decryptedDataOriginal.oauthTokenData) {
+				// Only overwrite supplied data as some providers do for example just return the
+				// refresh_token on the very first request and not on subsequent ones.
+				Object.assign(decryptedDataOriginal.oauthTokenData, oauthToken.data);
+			} else {
+				// No data exists so simply set
+				decryptedDataOriginal.oauthTokenData = oauthToken.data;
+			}
+
+			delete decryptedDataOriginal.csrfSecret;
+			await this.encryptAndSaveData(credential, decryptedDataOriginal);
+
+			this.logger.verbose('OAuth2 callback successful for credential', {
+				userId: req.user?.id,
+				credentialId: credential.id,
+			});
+
+			return res.render('oauth-callback');
+		} catch (error) {
+			return this.renderCallbackError(
+				res,
+				(error as Error).message,
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+				'body' in error ? jsonStringify(error.body) : undefined,
+			);
+		}
+	}
+
+	private convertCredentialToOptions(credential: OAuth2CredentialData): ClientOAuth2Options {
+		return {
+			clientId: credential.clientId,
+			clientSecret: credential.clientSecret ?? '',
+			accessTokenUri: credential.accessTokenUrl ?? '',
+			authorizationUri: credential.authUrl ?? '',
+			authentication: credential.authentication ?? 'header',
+			redirectUri: `${this.baseUrl}/callback`,
+			scopes: split(credential.scope ?? 'openid', ','),
+			scopesSeparator: credential.scope?.includes(',') ? ',' : ' ',
+			ignoreSSLIssues: credential.ignoreSSLIssues ?? false,
+		};
+	}
+
+	private renderCallbackError(res: Response, message: string, reason?: string) {
+		res.render('oauth-error-callback', { error: { message, reason } });
+	}
+
+	private createCsrfState(credentialsId: string): [string, string] {
+		const token = new Csrf();
+		const csrfSecret = token.secretSync();
+		const state: CsrfStateParam = {
+			token: token.create(csrfSecret),
+			cid: credentialsId,
+		};
+		return [csrfSecret, Buffer.from(JSON.stringify(state)).toString('base64')];
+	}
+
+	private decodeCsrfState(encodedState: string): CsrfStateParam {
+		const errorMessage = 'Invalid state format';
+		const decoded = jsonParse<CsrfStateParam>(Buffer.from(encodedState, 'base64').toString(), {
+			errorMessage,
+		});
+		if (typeof decoded.cid !== 'string' || typeof decoded.token !== 'string') {
+			throw new ApplicationError(errorMessage);
+		}
+		return decoded;
+	}
+}
diff --git a/packages/cli/src/controllers/orchestration.controller.ts b/packages/cli/src/controllers/orchestration.controller.ts
new file mode 100644
index 0000000000000..74a9665e1e2d3
--- /dev/null
+++ b/packages/cli/src/controllers/orchestration.controller.ts
@@ -0,0 +1,38 @@
+import { Post, RestController, GlobalScope } from '@/decorators';
+import { OrchestrationRequest } from '@/requests';
+import { OrchestrationService } from '@/services/orchestration.service';
+import { License } from '@/License';
+
+@RestController('/orchestration')
+export class OrchestrationController {
+	constructor(
+		private readonly orchestrationService: OrchestrationService,
+		private readonly licenseService: License,
+	) {}
+
+	/**
+	 * These endpoints do not return anything, they just trigger the message to
+	 * the workers to respond on Redis with their status.
+	 */
+	@GlobalScope('orchestration:read')
+	@Post('/worker/status/:id')
+	async getWorkersStatus(req: OrchestrationRequest.Get) {
+		if (!this.licenseService.isWorkerViewLicensed()) return;
+		const id = req.params.id;
+		return await this.orchestrationService.getWorkerStatus(id);
+	}
+
+	@GlobalScope('orchestration:read')
+	@Post('/worker/status')
+	async getWorkersStatusAll() {
+		if (!this.licenseService.isWorkerViewLicensed()) return;
+		return await this.orchestrationService.getWorkerStatus();
+	}
+
+	@GlobalScope('orchestration:list')
+	@Post('/worker/ids')
+	async getWorkerIdsAll() {
+		if (!this.licenseService.isWorkerViewLicensed()) return;
+		return await this.orchestrationService.getWorkerIds();
+	}
+}
diff --git a/packages/cli/src/controllers/owner.controller.ts b/packages/cli/src/controllers/owner.controller.ts
index 6c659ce01a01b..c12e08818bdde 100644
--- a/packages/cli/src/controllers/owner.controller.ts
+++ b/packages/cli/src/controllers/owner.controller.ts
@@ -1,109 +1,61 @@
 import validator from 'validator';
-import speakeasy from 'speakeasy';
-import { validateEntity } from '@/GenericHelpers';
-import { Authorized, Get, Post, RestController } from '@/decorators';
-import { BadRequestError } from '@/ResponseHelper';
-import {
-	hashPassword,
-	sanitizeUser,
-	validatePassword,
-} from '@/UserManagement/UserManagementHelper';
-import { issueCookie } from '@/auth/jwt';
 import { Response } from 'express';
-import type { ILogger } from 'n8n-workflow';
-import type { Config } from '@/config';
+
+import { AuthService } from '@/auth/auth.service';
+import config from '@/config';
+import { validateEntity } from '@/GenericHelpers';
+import { GlobalScope, Post, RestController } from '@/decorators';
+import { PasswordUtility } from '@/services/password.utility';
 import { OwnerRequest } from '@/requests';
-import type { IDatabaseCollections, IInternalHooksClass } from '@/Interfaces';
-import type {
-	CredentialsRepository,
-	SettingsRepository,
-	UserRepository,
-	WorkflowRepository,
-} from '@db/repositories';
-
-@Authorized(['global', 'owner'])
+import { SettingsRepository } from '@db/repositories/settings.repository';
+import { UserRepository } from '@db/repositories/user.repository';
+import { PostHogClient } from '@/posthog';
+import { UserService } from '@/services/user.service';
+import { Logger } from '@/Logger';
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
+import { InternalHooks } from '@/InternalHooks';
+
 @RestController('/owner')
 export class OwnerController {
-	private readonly config: Config;
-
-	private readonly logger: ILogger;
-
-	private readonly internalHooks: IInternalHooksClass;
-
-	private readonly userRepository: UserRepository;
-
-	private readonly settingsRepository: SettingsRepository;
-
-	private readonly credentialsRepository: CredentialsRepository;
-
-	private readonly workflowsRepository: WorkflowRepository;
-
-	constructor({
-		config,
-		logger,
-		internalHooks,
-		repositories,
-	}: {
-		config: Config;
-		logger: ILogger;
-		internalHooks: IInternalHooksClass;
-		repositories: Pick<IDatabaseCollections, 'User' | 'Settings' | 'Credentials' | 'Workflow'>;
-	}) {
-		this.config = config;
-		this.logger = logger;
-		this.internalHooks = internalHooks;
-		this.userRepository = repositories.User;
-		this.settingsRepository = repositories.Settings;
-		this.credentialsRepository = repositories.Credentials;
-		this.workflowsRepository = repositories.Workflow;
-	}
-
-	@Get('/pre-setup')
-	async preSetup(): Promise<{ credentials: number; workflows: number }> {
-		if (this.config.getEnv('userManagement.isInstanceOwnerSetUp')) {
-			throw new BadRequestError('Instance owner already setup');
-		}
-
-		const [credentials, workflows] = await Promise.all([
-			this.credentialsRepository.countBy({}),
-			this.workflowsRepository.countBy({}),
-		]);
-		return { credentials, workflows };
-	}
+	constructor(
+		private readonly logger: Logger,
+		private readonly internalHooks: InternalHooks,
+		private readonly settingsRepository: SettingsRepository,
+		private readonly authService: AuthService,
+		private readonly userService: UserService,
+		private readonly passwordUtility: PasswordUtility,
+		private readonly postHog: PostHogClient,
+		private readonly userRepository: UserRepository,
+	) {}
 
 	/**
 	 * Promote a shell into the owner of the n8n instance,
 	 * and enable `isInstanceOwnerSetUp` setting.
 	 */
-	@Post('/setup')
+	@Post('/setup', { skipAuth: true })
 	async setupOwner(req: OwnerRequest.Post, res: Response) {
 		const { email, firstName, lastName, password, otpSecret, otp } = req.body;
-		const { id: userId, globalRole } = req.user;
 
-		if (this.config.getEnv('userManagement.isInstanceOwnerSetUp')) {
+		if (config.getEnv('userManagement.isInstanceOwnerSetUp')) {
 			this.logger.debug(
 				'Request to claim instance ownership failed because instance owner already exists',
-				{
-					userId,
-				},
 			);
 			throw new BadRequestError('Instance owner already setup');
 		}
 
 		if (!email || !validator.isEmail(email)) {
 			this.logger.debug('Request to claim instance ownership failed because of invalid email', {
-				userId,
 				invalidEmail: email,
 			});
 			throw new BadRequestError('Invalid email address');
 		}
 
-		const validPassword = validatePassword(password);
+		const validPassword = this.passwordUtility.validate(password);
 
 		if (!firstName || !lastName) {
 			this.logger.debug(
 				'Request to claim instance ownership failed because of missing first name or last name in payload',
-				{ userId, payload: req.body },
+				{ payload: req.body },
 			);
 			throw new BadRequestError('First and last names are mandatory');
 		}
@@ -111,76 +63,46 @@ export class OwnerController {
 		if (!otpSecret || !otp) {
 			this.logger.debug(
 				'Request to claim instance ownership failed because of missing otpSecret or otp in payload',
-				{ userId, payload: req.body },
+				{ otp, payload: req.body },
 			);
 			throw new BadRequestError('otpSecret and otp are mandatory');
 		}
 
-		// TODO: This check should be in a middleware outside this class
-		if (globalRole.scope === 'global' && globalRole.name !== 'owner') {
-			this.logger.debug(
-				'Request to claim instance ownership failed because user shell does not exist or has wrong role!',
-				{
-					userId,
-				},
-			);
-			throw new BadRequestError('Invalid request');
-		}
-
-		const verified = speakeasy.totp.verify({
-			secret: otpSecret,
-			encoding: 'base32',
-			token: otp,
-		});
-
-		if (!verified) {
-			throw new BadRequestError('OTP token is not valid');
-		}
-
-		let owner = req.user;
-
-		Object.assign(owner, {
-			email,
-			firstName,
-			lastName,
-			password: await hashPassword(validPassword),
-			otpSecret,
+		let owner = await this.userRepository.findOneOrFail({
+			where: { role: 'global:owner' },
 		});
+		owner.email = email;
+		owner.firstName = firstName;
+		owner.lastName = lastName;
+		owner.password = await this.passwordUtility.hash(validPassword);
+		owner.otpsecret = otpSecret;
 
 		await validateEntity(owner);
 
-		owner = await this.userRepository.save(owner);
+		owner = await this.userRepository.save(owner, { transaction: false });
 
-		this.logger.info('Owner was set up successfully', { userId });
+		this.logger.info('Owner was set up successfully');
 
 		await this.settingsRepository.update(
 			{ key: 'userManagement.isInstanceOwnerSetUp' },
 			{ value: JSON.stringify(true) },
 		);
 
-		this.config.set('userManagement.isInstanceOwnerSetUp', true);
+		config.set('userManagement.isInstanceOwnerSetUp', true);
 
-		this.logger.debug('Setting isInstanceOwnerSetUp updated successfully', { userId });
+		this.logger.debug('Setting isInstanceOwnerSetUp updated successfully');
 
-		await issueCookie(res, owner);
+		this.authService.issueCookie(res, owner, req.browserId);
 
-		void this.internalHooks.onInstanceOwnerSetup({ user_id: userId });
+		void this.internalHooks.onInstanceOwnerSetup({ user_id: owner.id });
 
-		return sanitizeUser(owner);
+		return await this.userService.toPublic(owner, { posthog: this.postHog, withScopes: true });
 	}
 
-	/**
-	 * Persist that the instance owner setup has been skipped
-	 */
-	@Post('/skip-setup')
-	async skipSetup() {
-		await this.settingsRepository.update(
-			{ key: 'userManagement.skipInstanceOwnerSetup' },
-			{ value: JSON.stringify(true) },
-		);
-
-		this.config.set('userManagement.skipInstanceOwnerSetup', true);
-
-		return { success: true };
+	@Post('/dismiss-banner')
+	@GlobalScope('banner:dismiss')
+	async dismissBanner(req: OwnerRequest.DismissBanner) {
+		const bannerName = 'banner' in req.body ? (req.body.banner as string) : '';
+		return await this.settingsRepository.dismissBanner({ bannerName });
 	}
 }
diff --git a/packages/cli/src/controllers/passwordReset.controller.ts b/packages/cli/src/controllers/passwordReset.controller.ts
index 64e46582066bd..bf8034a0d78af 100644
--- a/packages/cli/src/controllers/passwordReset.controller.ts
+++ b/packages/cli/src/controllers/passwordReset.controller.ts
@@ -1,74 +1,49 @@
-import { IsNull, MoreThanOrEqual, Not } from 'typeorm';
-import { v4 as uuid } from 'uuid';
+import { Response } from 'express';
 import validator from 'validator';
-import { Get, Post, RestController } from '@/decorators';
-import {
-	BadRequestError,
-	InternalServerError,
-	NotFoundError,
-	UnauthorizedError,
-	UnprocessableRequestError,
-} from '@/ResponseHelper';
-import {
-	getInstanceBaseUrl,
-	hashPassword,
-	validatePassword,
-} from '@/UserManagement/UserManagementHelper';
-import type { UserManagementMailer } from '@/UserManagement/email';
 
-import { Response } from 'express';
-import type { ILogger } from 'n8n-workflow';
-import type { Config } from '@/config';
-import type { UserRepository } from '@db/repositories';
+import { AuthService } from '@/auth/auth.service';
+import { Get, Post, RestController } from '@/decorators';
+import { PasswordUtility } from '@/services/password.utility';
+import { UserManagementMailer } from '@/UserManagement/email';
 import { PasswordResetRequest } from '@/requests';
-import type { IDatabaseCollections, IExternalHooksClass, IInternalHooksClass } from '@/Interfaces';
-import { issueCookie } from '@/auth/jwt';
-import { isLdapEnabled } from '@/Ldap/helpers';
-import { isSamlCurrentAuthenticationMethod } from '../sso/ssoHelpers';
+import { isSamlCurrentAuthenticationMethod } from '@/sso/ssoHelpers';
+import { UserService } from '@/services/user.service';
+import { License } from '@/License';
+import { RESPONSE_ERROR_MESSAGES } from '@/constants';
+import { MfaService } from '@/Mfa/mfa.service';
+import { Logger } from '@/Logger';
+import { ExternalHooks } from '@/ExternalHooks';
+import { InternalHooks } from '@/InternalHooks';
+import { UrlService } from '@/services/url.service';
+import { InternalServerError } from '@/errors/response-errors/internal-server.error';
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
+import { UnauthorizedError } from '@/errors/response-errors/unauthorized.error';
+import { NotFoundError } from '@/errors/response-errors/not-found.error';
+import { UnprocessableRequestError } from '@/errors/response-errors/unprocessable.error';
+import { UserRepository } from '@/databases/repositories/user.repository';
 
 @RestController()
 export class PasswordResetController {
-	private readonly config: Config;
-
-	private readonly logger: ILogger;
-
-	private readonly externalHooks: IExternalHooksClass;
-
-	private readonly internalHooks: IInternalHooksClass;
-
-	private readonly mailer: UserManagementMailer;
-
-	private readonly userRepository: UserRepository;
-
-	constructor({
-		config,
-		logger,
-		externalHooks,
-		internalHooks,
-		mailer,
-		repositories,
-	}: {
-		config: Config;
-		logger: ILogger;
-		externalHooks: IExternalHooksClass;
-		internalHooks: IInternalHooksClass;
-		mailer: UserManagementMailer;
-		repositories: Pick<IDatabaseCollections, 'User'>;
-	}) {
-		this.config = config;
-		this.logger = logger;
-		this.externalHooks = externalHooks;
-		this.internalHooks = internalHooks;
-		this.mailer = mailer;
-		this.userRepository = repositories.User;
-	}
+	constructor(
+		private readonly logger: Logger,
+		private readonly externalHooks: ExternalHooks,
+		private readonly internalHooks: InternalHooks,
+		private readonly mailer: UserManagementMailer,
+		private readonly authService: AuthService,
+		private readonly userService: UserService,
+		private readonly mfaService: MfaService,
+		private readonly urlService: UrlService,
+		private readonly license: License,
+		private readonly passwordUtility: PasswordUtility,
+		private readonly userRepository: UserRepository,
+	) {}
 
 	/**
 	 * Send a password reset email.
 	 */
-	@Post('/forgot-password')
+	@Post('/forgot-password', { skipAuth: true, rateLimit: true })
 	async forgotPassword(req: PasswordResetRequest.Email) {
-		if (this.config.getEnv('userManagement.emails.mode') === '') {
+		if (!this.mailer.isEmailSetUp) {
 			this.logger.debug(
 				'Request to send password reset email failed because emailing was not set up',
 			);
@@ -95,15 +70,21 @@ export class PasswordResetController {
 		}
 
 		// User should just be able to reset password if one is already present
-		const user = await this.userRepository.findOne({
-			where: {
-				email,
-				password: Not(IsNull()),
-			},
-			relations: ['authIdentities', 'globalRole'],
-		});
+		const user = await this.userRepository.findNonShellUser(email);
 
-		if (isSamlCurrentAuthenticationMethod() && user?.globalRole.name !== 'owner') {
+		if (!user?.isOwner && !this.license.isWithinUsersLimit()) {
+			this.logger.debug(
+				'Request to send password reset email failed because the user limit was reached',
+			);
+			throw new UnauthorizedError(RESPONSE_ERROR_MESSAGES.USERS_QUOTA_REACHED);
+		}
+		if (
+			isSamlCurrentAuthenticationMethod() &&
+			!(
+				user?.hasGlobalScope('user:resetPassword') === true ||
+				user?.settings?.allowSSOManualLogin === true
+			)
+		) {
 			this.logger.debug(
 				'Request to send password reset email failed because login is handled by SAML',
 			);
@@ -113,7 +94,6 @@ export class PasswordResetController {
 		}
 
 		const ldapIdentity = user?.authIdentities?.find((i) => i.providerType === 'ldap');
-
 		if (!user?.password || (ldapIdentity && user.disabled)) {
 			this.logger.debug(
 				'Request to send password reset email failed because no user was found for the provided email',
@@ -122,30 +102,20 @@ export class PasswordResetController {
 			return;
 		}
 
-		if (isLdapEnabled() && ldapIdentity) {
+		if (this.license.isLdapEnabled() && ldapIdentity) {
 			throw new UnprocessableRequestError('forgotPassword.ldapUserPasswordResetUnavailable');
 		}
 
-		user.resetPasswordToken = uuid();
-
-		const { id, firstName, lastName, resetPasswordToken } = user;
-
-		const resetPasswordTokenExpiration = Math.floor(Date.now() / 1000) + 7200;
-
-		await this.userRepository.update(id, { resetPasswordToken, resetPasswordTokenExpiration });
-
-		const baseUrl = getInstanceBaseUrl();
-		const url = new URL(`${baseUrl}/change-password`);
-		url.searchParams.append('userId', id);
-		url.searchParams.append('token', resetPasswordToken);
+		const url = this.authService.generatePasswordResetUrl(user);
 
+		const { id, firstName, lastName } = user;
 		try {
 			await this.mailer.passwordReset({
 				email,
 				firstName,
 				lastName,
-				passwordResetUrl: url.toString(),
-				domain: baseUrl,
+				passwordResetUrl: url,
+				domain: this.urlService.getInstanceBaseUrl(),
 			});
 		} catch (error) {
 			void this.internalHooks.onEmailFailed({
@@ -171,13 +141,13 @@ export class PasswordResetController {
 	/**
 	 * Verify password reset token and user ID.
 	 */
-	@Get('/resolve-password-token')
+	@Get('/resolve-password-token', { skipAuth: true })
 	async resolvePasswordToken(req: PasswordResetRequest.Credentials) {
-		const { token: resetPasswordToken, userId: id } = req.query;
+		const { token } = req.query;
 
-		if (!resetPasswordToken || !id) {
+		if (!token) {
 			this.logger.debug(
-				'Request to resolve password token failed because of missing password reset token or user ID in query string',
+				'Request to resolve password token failed because of missing password reset token',
 				{
 					queryString: req.query,
 				},
@@ -185,38 +155,29 @@ export class PasswordResetController {
 			throw new BadRequestError('');
 		}
 
-		// Timestamp is saved in seconds
-		const currentTimestamp = Math.floor(Date.now() / 1000);
-
-		const user = await this.userRepository.findOneBy({
-			id,
-			resetPasswordToken,
-			resetPasswordTokenExpiration: MoreThanOrEqual(currentTimestamp),
-		});
+		const user = await this.authService.resolvePasswordResetToken(token);
+		if (!user) throw new NotFoundError('');
 
-		if (!user) {
+		if (!user?.isOwner && !this.license.isWithinUsersLimit()) {
 			this.logger.debug(
-				'Request to resolve password token failed because no user was found for the provided user ID and reset password token',
-				{
-					userId: id,
-					resetPasswordToken,
-				},
+				'Request to resolve password token failed because the user limit was reached',
+				{ userId: user.id },
 			);
-			throw new NotFoundError('');
+			throw new UnauthorizedError(RESPONSE_ERROR_MESSAGES.USERS_QUOTA_REACHED);
 		}
 
-		this.logger.info('Reset-password token resolved successfully', { userId: id });
+		this.logger.info('Reset-password token resolved successfully', { userId: user.id });
 		void this.internalHooks.onUserPasswordResetEmailClick({ user });
 	}
 
 	/**
-	 * Verify password reset token and user ID and update password.
+	 * Verify password reset token and update password.
 	 */
-	@Post('/change-password')
+	@Post('/change-password', { skipAuth: true })
 	async changePassword(req: PasswordResetRequest.NewPassword, res: Response) {
-		const { token: resetPasswordToken, userId, password } = req.body;
+		const { token, password, mfaToken } = req.body;
 
-		if (!resetPasswordToken || !userId || !password) {
+		if (!token || !password) {
 			this.logger.debug(
 				'Request to change password failed because of missing user ID or password or reset password token in payload',
 				{
@@ -226,42 +187,28 @@ export class PasswordResetController {
 			throw new BadRequestError('Missing user ID or password or reset password token');
 		}
 
-		const validPassword = validatePassword(password);
+		const validPassword = this.passwordUtility.validate(password);
 
-		// Timestamp is saved in seconds
-		const currentTimestamp = Math.floor(Date.now() / 1000);
+		const user = await this.authService.resolvePasswordResetToken(token);
+		if (!user) throw new NotFoundError('');
 
-		const user = await this.userRepository.findOne({
-			where: {
-				id: userId,
-				resetPasswordToken,
-				resetPasswordTokenExpiration: MoreThanOrEqual(currentTimestamp),
-			},
-			relations: ['authIdentities'],
-		});
+		if (user.mfaEnabled) {
+			if (!mfaToken) throw new BadRequestError('If MFA enabled, mfaToken is required.');
 
-		if (!user) {
-			this.logger.debug(
-				'Request to resolve password token failed because no user was found for the provided user ID and reset password token',
-				{
-					userId,
-					resetPasswordToken,
-				},
-			);
-			throw new NotFoundError('');
+			const { decryptedSecret: secret } = await this.mfaService.getSecretAndRecoveryCodes(user.id);
+
+			const validToken = this.mfaService.totp.verifySecret({ secret, token: mfaToken });
+
+			if (!validToken) throw new BadRequestError('Invalid MFA token.');
 		}
 
-		const passwordHash = await hashPassword(validPassword);
+		const passwordHash = await this.passwordUtility.hash(validPassword);
 
-		await this.userRepository.update(userId, {
-			password: passwordHash,
-			resetPasswordToken: null,
-			resetPasswordTokenExpiration: null,
-		});
+		await this.userService.update(user.id, { password: passwordHash });
 
-		this.logger.info('User password updated successfully', { userId });
+		this.logger.info('User password updated successfully', { userId: user.id });
 
-		await issueCookie(res, user);
+		this.authService.issueCookie(res, user, req.browserId);
 
 		void this.internalHooks.onUserUpdate({
 			user,
diff --git a/packages/cli/src/controllers/saveRequestLog.controller.ts b/packages/cli/src/controllers/saveRequestLog.controller.ts
index a177e0efb9604..731089ea7e2bc 100644
--- a/packages/cli/src/controllers/saveRequestLog.controller.ts
+++ b/packages/cli/src/controllers/saveRequestLog.controller.ts
@@ -1,36 +1,33 @@
-import type { IDatabaseCollections } from '@/Interfaces';
 import type { SaveRequestStatusEnum } from '@/databases/entities/SaveRequestLog';
 import { SaveRequestLog } from '@/databases/entities/SaveRequestLog';
-import type {
-	SaveRequestLogRepository,
-	UserRepository,
-	WorkflowRepository,
-} from '@/databases/repositories';
+import type { UserRepository } from '@db/repositories/user.repository';
+import type { SaveRequestLogRepository } from '@db/repositories/saveRequestLog.repository';
+import type { WorkflowRepository } from '@db/repositories/workflow.repository';
 import { Post, RestController } from '@/decorators';
 import { SaveRequestLogRequest } from '@/requests';
-import type { ILogger } from 'n8n-workflow';
+import { Logger } from '@/Logger';
 
 @RestController('/save-request-log')
 export class SaveRequestLogController {
-	private readonly logger: ILogger;
-
 	private saveRequestLogRepository: SaveRequestLogRepository;
 
 	private userRepository: UserRepository;
 
 	private workFlowRepository: WorkflowRepository;
 
+	private logger: Logger
+
 	constructor({
 		logger,
 		repositories,
 	}: {
-		logger: ILogger;
-		repositories: Pick<IDatabaseCollections, 'User' | 'Workflow' | 'SaveRequestLog'>;
+		logger: Logger;
+		repositories: { User?: UserRepository; SaveRequestLog?: SaveRequestLogRepository; Workflow?: WorkflowRepository };
 	}) {
 		this.logger = logger;
-		this.saveRequestLogRepository = repositories.SaveRequestLog;
-		this.userRepository = repositories.User;
-		this.workFlowRepository = repositories.Workflow;
+		this.saveRequestLogRepository = repositories.SaveRequestLog!;
+		this.userRepository = repositories.User!;
+		this.workFlowRepository = repositories.Workflow!;
 	}
 
 	@Post('/')
diff --git a/packages/cli/src/controllers/tags.controller.ts b/packages/cli/src/controllers/tags.controller.ts
index 7b68d95aafb06..f097002eace2b 100644
--- a/packages/cli/src/controllers/tags.controller.ts
+++ b/packages/cli/src/controllers/tags.controller.ts
@@ -1,35 +1,15 @@
 import { Request, Response, NextFunction } from 'express';
-import type { Config } from '@/config';
-import { Authorized, Delete, Get, Middleware, Patch, Post, RestController } from '@/decorators';
-import type { IDatabaseCollections, IExternalHooksClass, ITagWithCountDb } from '@/Interfaces';
-import { TagEntity } from '@db/entities/TagEntity';
-import type { TagRepository } from '@db/repositories';
-import { validateEntity } from '@/GenericHelpers';
-import { BadRequestError } from '@/ResponseHelper';
+import config from '@/config';
+import { Delete, Get, Middleware, Patch, Post, RestController, GlobalScope } from '@/decorators';
+import { TagService } from '@/services/tag.service';
 import { TagsRequest } from '@/requests';
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 
-@Authorized()
 @RestController('/tags')
 export class TagsController {
-	private config: Config;
+	private config = config;
 
-	private externalHooks: IExternalHooksClass;
-
-	private tagsRepository: TagRepository;
-
-	constructor({
-		config,
-		externalHooks,
-		repositories,
-	}: {
-		config: Config;
-		externalHooks: IExternalHooksClass;
-		repositories: Pick<IDatabaseCollections, 'Tag'>;
-	}) {
-		this.config = config;
-		this.externalHooks = externalHooks;
-		this.tagsRepository = repositories.Tag;
-	}
+	constructor(private readonly tagService: TagService) {}
 
 	// TODO: move this into a new decorator `@IfEnabled('workflowTagsDisabled')`
 	@Middleware()
@@ -39,67 +19,35 @@ export class TagsController {
 		next();
 	}
 
-	// Retrieves all tags, with or without usage count
 	@Get('/')
-	async getAll(req: TagsRequest.GetAll): Promise<TagEntity[] | ITagWithCountDb[]> {
-		const { withUsageCount } = req.query;
-		if (withUsageCount === 'true') {
-			return this.tagsRepository
-				.find({
-					select: ['id', 'name', 'createdAt', 'updatedAt'],
-					relations: ['workflowMappings'],
-				})
-				.then((tags) =>
-					tags.map(({ workflowMappings, ...rest }) => ({
-						...rest,
-						usageCount: workflowMappings.length,
-					})),
-				);
-		}
-
-		return this.tagsRepository.find({ select: ['id', 'name', 'createdAt', 'updatedAt'] });
+	@GlobalScope('tag:list')
+	async getAll(req: TagsRequest.GetAll) {
+		return await this.tagService.getAll({ withUsageCount: req.query.withUsageCount === 'true' });
 	}
 
-	// Creates a tag
 	@Post('/')
-	async createTag(req: TagsRequest.Create): Promise<TagEntity> {
-		const newTag = new TagEntity();
-		newTag.name = req.body.name.trim();
-
-		await this.externalHooks.run('tag.beforeCreate', [newTag]);
-		await validateEntity(newTag);
+	@GlobalScope('tag:create')
+	async createTag(req: TagsRequest.Create) {
+		const tag = this.tagService.toEntity({ name: req.body.name });
 
-		const tag = await this.tagsRepository.save(newTag);
-		await this.externalHooks.run('tag.afterCreate', [tag]);
-		return tag;
+		return await this.tagService.save(tag, 'create');
 	}
 
-	// Updates a tag
-	@Patch('/:id(\\d+)')
-	async updateTag(req: TagsRequest.Update): Promise<TagEntity> {
-		const { name } = req.body;
-		const { id } = req.params;
-
-		const newTag = new TagEntity();
-		newTag.id = id;
-		newTag.name = name.trim();
+	@Patch('/:id(\\w+)')
+	@GlobalScope('tag:update')
+	async updateTag(req: TagsRequest.Update) {
+		const newTag = this.tagService.toEntity({ id: req.params.id, name: req.body.name.trim() });
 
-		await this.externalHooks.run('tag.beforeUpdate', [newTag]);
-		await validateEntity(newTag);
-
-		const tag = await this.tagsRepository.save(newTag);
-		await this.externalHooks.run('tag.afterUpdate', [tag]);
-		return tag;
+		return await this.tagService.save(newTag, 'update');
 	}
 
-	@Authorized(['global', 'owner'])
-	@Delete('/:id(\\d+)')
+	@Delete('/:id(\\w+)')
+	@GlobalScope('tag:delete')
 	async deleteTag(req: TagsRequest.Delete) {
 		const { id } = req.params;
-		await this.externalHooks.run('tag.beforeDelete', [id]);
 
-		await this.tagsRepository.delete({ id });
-		await this.externalHooks.run('tag.afterDelete', [id]);
+		await this.tagService.delete(id);
+
 		return true;
 	}
 }
diff --git a/packages/cli/src/controllers/translation.controller.ts b/packages/cli/src/controllers/translation.controller.ts
index 6d36d650d2e2c..f359ec2b3a540 100644
--- a/packages/cli/src/controllers/translation.controller.ts
+++ b/packages/cli/src/controllers/translation.controller.ts
@@ -1,11 +1,12 @@
 import type { Request } from 'express';
-import { ICredentialTypes } from 'n8n-workflow';
 import { join } from 'path';
 import { access } from 'fs/promises';
-import { Authorized, Get, RestController } from '@/decorators';
-import { BadRequestError, InternalServerError } from '@/ResponseHelper';
-import { Config } from '@/config';
+import { Get, RestController } from '@/decorators';
+import config from '@/config';
 import { NODES_BASE_DIR } from '@/constants';
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
+import { InternalServerError } from '@/errors/response-errors/internal-server.error';
+import { CredentialTypes } from '@/CredentialTypes';
 
 export const CREDENTIAL_TRANSLATIONS_DIR = 'n8n-nodes-base/dist/credentials/translations';
 export const NODE_HEADERS_PATH = join(NODES_BASE_DIR, 'dist/nodes/headers');
@@ -14,10 +15,9 @@ export declare namespace TranslationRequest {
 	export type Credential = Request<{}, {}, {}, { credentialType: string }>;
 }
 
-@Authorized()
 @RestController('/')
 export class TranslationController {
-	constructor(private config: Config, private credentialTypes: ICredentialTypes) {}
+	constructor(private readonly credentialTypes: CredentialTypes) {}
 
 	@Get('/credential-translation')
 	async getCredentialTranslation(req: TranslationRequest.Credential) {
@@ -26,7 +26,7 @@ export class TranslationController {
 		if (!this.credentialTypes.recognizes(credentialType))
 			throw new BadRequestError(`Invalid Credential type: "${credentialType}"`);
 
-		const defaultLocale = this.config.getEnv('defaultLocale');
+		const defaultLocale = config.getEnv('defaultLocale');
 		const translationPath = join(
 			CREDENTIAL_TRANSLATIONS_DIR,
 			defaultLocale,
diff --git a/packages/cli/src/controllers/users.controller.ts b/packages/cli/src/controllers/users.controller.ts
index a10a71c2f9696..9cc1fd0321f78 100644
--- a/packages/cli/src/controllers/users.controller.ts
+++ b/packages/cli/src/controllers/users.controller.ts
@@ -1,376 +1,143 @@
-import validator from 'validator';
-import { In } from 'typeorm';
-import type { ILogger } from 'n8n-workflow';
-import { ErrorReporterProxy as ErrorReporter } from 'n8n-workflow';
-import speakeasy from 'speakeasy';
+import { plainToInstance } from 'class-transformer';
+
+import { AuthService } from '@/auth/auth.service';
 import { User } from '@db/entities/User';
 import { SharedCredentials } from '@db/entities/SharedCredentials';
 import { SharedWorkflow } from '@db/entities/SharedWorkflow';
-import { Authorized, NoAuthRequired, Delete, Get, Post, RestController } from '@/decorators';
+import { GlobalScope, Delete, Get, RestController, Patch, Licensed } from '@/decorators';
 import {
-	addInviteLinkToUser,
-	generateUserInviteUrl,
-	getInstanceBaseUrl,
-	hashPassword,
-	isEmailSetUp,
-	sanitizeUser,
-	validatePassword,
-	withFeatureFlags,
-} from '@/UserManagement/UserManagementHelper';
-import { issueCookie } from '@/auth/jwt';
-import { BadRequestError, InternalServerError, NotFoundError } from '@/ResponseHelper';
-import { Response } from 'express';
-import type { Config } from '@/config';
-import { UserRequest } from '@/requests';
-import type { UserManagementMailer } from '@/UserManagement/email';
-import type {
-	PublicUser,
-	IDatabaseCollections,
-	IExternalHooksClass,
-	IInternalHooksClass,
-	ITelemetryUserDeletionData,
-} from '@/Interfaces';
-import type { ActiveWorkflowRunner } from '@/ActiveWorkflowRunner';
+	ListQuery,
+	UserRequest,
+	UserRoleChangePayload,
+	UserSettingsUpdatePayload,
+} from '@/requests';
+import { ActiveWorkflowManager } from '@/ActiveWorkflowManager';
+import type { PublicUser, ITelemetryUserDeletionData } from '@/Interfaces';
 import { AuthIdentity } from '@db/entities/AuthIdentity';
-import type { PostHogClient } from '@/posthog';
-import { userManagementEnabledMiddleware } from '../middlewares/userManagementEnabled';
-import { isSamlLicensedAndEnabled } from '../sso/saml/samlHelpers';
-import type {
-	RoleRepository,
-	SharedCredentialsRepository,
-	SharedWorkflowRepository,
-	UserRepository,
-} from '@db/repositories';
-
-@Authorized(['global', 'owner'])
+import { SharedCredentialsRepository } from '@db/repositories/sharedCredentials.repository';
+import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
+import { UserRepository } from '@db/repositories/user.repository';
+import { UserService } from '@/services/user.service';
+import { listQueryMiddleware } from '@/middlewares';
+import { Logger } from '@/Logger';
+import { UnauthorizedError } from '@/errors/response-errors/unauthorized.error';
+import { NotFoundError } from '@/errors/response-errors/not-found.error';
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
+import { ExternalHooks } from '@/ExternalHooks';
+import { InternalHooks } from '@/InternalHooks';
+import { validateEntity } from '@/GenericHelpers';
+
 @RestController('/users')
 export class UsersController {
-	private config: Config;
-
-	private logger: ILogger;
-
-	private externalHooks: IExternalHooksClass;
-
-	private internalHooks: IInternalHooksClass;
-
-	private userRepository: UserRepository;
-
-	private roleRepository: RoleRepository;
-
-	private sharedCredentialsRepository: SharedCredentialsRepository;
-
-	private sharedWorkflowRepository: SharedWorkflowRepository;
-
-	private activeWorkflowRunner: ActiveWorkflowRunner;
-
-	private mailer: UserManagementMailer;
-
-	private postHog?: PostHogClient;
-
-	constructor({
-		config,
-		logger,
-		externalHooks,
-		internalHooks,
-		repositories,
-		activeWorkflowRunner,
-		mailer,
-		postHog,
-	}: {
-		config: Config;
-		logger: ILogger;
-		externalHooks: IExternalHooksClass;
-		internalHooks: IInternalHooksClass;
-		repositories: Pick<
-			IDatabaseCollections,
-			'User' | 'Role' | 'SharedCredentials' | 'SharedWorkflow'
-		>;
-		activeWorkflowRunner: ActiveWorkflowRunner;
-		mailer: UserManagementMailer;
-		postHog?: PostHogClient;
-	}) {
-		this.config = config;
-		this.logger = logger;
-		this.externalHooks = externalHooks;
-		this.internalHooks = internalHooks;
-		this.userRepository = repositories.User;
-		this.roleRepository = repositories.Role;
-		this.sharedCredentialsRepository = repositories.SharedCredentials;
-		this.sharedWorkflowRepository = repositories.SharedWorkflow;
-		this.activeWorkflowRunner = activeWorkflowRunner;
-		this.mailer = mailer;
-		this.postHog = postHog;
-	}
-
-	/**
-	 * Send email invite(s) to one or multiple users and create user shell(s).
-	 */
-	@Post('/', { middlewares: [userManagementEnabledMiddleware] })
-	async sendEmailInvites(req: UserRequest.Invite) {
-		if (isSamlLicensedAndEnabled()) {
-			this.logger.debug(
-				'SAML is enabled, so users are managed by the Identity Provider and cannot be added through invites',
-			);
-			throw new BadRequestError(
-				'SAML is enabled, so users are managed by the Identity Provider and cannot be added through invites',
-			);
+	constructor(
+		private readonly logger: Logger,
+		private readonly externalHooks: ExternalHooks,
+		private readonly internalHooks: InternalHooks,
+		private readonly sharedCredentialsRepository: SharedCredentialsRepository,
+		private readonly sharedWorkflowRepository: SharedWorkflowRepository,
+		private readonly userRepository: UserRepository,
+		private readonly activeWorkflowManager: ActiveWorkflowManager,
+		private readonly authService: AuthService,
+		private readonly userService: UserService,
+	) {}
+
+	static ERROR_MESSAGES = {
+		CHANGE_ROLE: {
+			NO_USER: 'Target user not found',
+			NO_ADMIN_ON_OWNER: 'Admin cannot change role on global owner',
+			NO_OWNER_ON_OWNER: 'Owner cannot change role on global owner',
+		},
+	} as const;
+
+	private removeSupplementaryFields(
+		publicUsers: Array<Partial<PublicUser>>,
+		listQueryOptions: ListQuery.Options,
+	) {
+		const { take, select, filter } = listQueryOptions;
+
+		// remove fields added to satisfy query
+
+		if (take && select && !select?.id) {
+			for (const user of publicUsers) delete user.id;
 		}
 
-		if (!this.config.getEnv('userManagement.isInstanceOwnerSetUp')) {
-			this.logger.debug(
-				'Request to send email invite(s) to user(s) failed because the owner account is not set up',
-			);
-			throw new BadRequestError('You must set up your own account before inviting others');
-		}
-
-		if (!Array.isArray(req.body)) {
-			this.logger.debug(
-				'Request to send email invite(s) to user(s) failed because the payload is not an array',
-				{
-					payload: req.body,
-				},
-			);
-			throw new BadRequestError('Invalid payload');
+		if (filter?.isOwner) {
+			for (const user of publicUsers) delete user.role;
 		}
 
-		if (!req.body.length) return [];
-
-		const createUsers: { [key: string]: string | null } = {};
-		// Validate payload
-		req.body.forEach((invite) => {
-			if (typeof invite !== 'object' || !invite.email) {
-				throw new BadRequestError(
-					'Request to send email invite(s) to user(s) failed because the payload is not an array shaped Array<{ email: string }>',
-				);
-			}
-
-			if (!validator.isEmail(invite.email)) {
-				this.logger.debug('Invalid email in payload', { invalidEmail: invite.email });
-				throw new BadRequestError(
-					`Request to send email invite(s) to user(s) failed because of an invalid email address: ${invite.email}`,
-				);
-			}
-			createUsers[invite.email.toLowerCase()] = null;
-		});
-
-		const role = await this.roleRepository.findGlobalMemberRole();
-
-		if (!role) {
-			this.logger.error(
-				'Request to send email invite(s) to user(s) failed because no global member role was found in database',
-			);
-			throw new InternalServerError('Members role not found in database - inconsistent state');
-		}
+		// remove computed fields (unselectable)
 
-		// remove/exclude existing users from creation
-		const existingUsers = await this.userRepository.find({
-			where: { email: In(Object.keys(createUsers)) },
-		});
-		existingUsers.forEach((user) => {
-			if (user.password) {
-				delete createUsers[user.email];
-				return;
+		if (select) {
+			for (const user of publicUsers) {
+				delete user.isOwner;
+				delete user.isPending;
+				delete user.signInType;
+				delete user.hasRecoveryCodesLeft;
 			}
-			createUsers[user.email] = user.id;
-		});
-
-		const usersToSetUp = Object.keys(createUsers).filter((email) => createUsers[email] === null);
-		const total = usersToSetUp.length;
-
-		this.logger.debug(total > 1 ? `Creating ${total} user shells...` : 'Creating 1 user shell...');
-
-		try {
-			await this.userRepository.manager.transaction(async (transactionManager) =>
-				Promise.all(
-					usersToSetUp.map(async (email) => {
-						const newUser = Object.assign(new User(), {
-							email,
-							globalRole: role,
-						});
-						const savedUser = await transactionManager.save<User>(newUser);
-						createUsers[savedUser.email] = savedUser.id;
-						return savedUser;
-					}),
-				),
-			);
-		} catch (error) {
-			ErrorReporter.error(error);
-			this.logger.error('Failed to create user shells', { userShells: createUsers });
-			throw new InternalServerError('An error occurred during user creation');
 		}
 
-		this.logger.debug('Created user shell(s) successfully', { userId: req.user.id });
-		this.logger.verbose(total > 1 ? `${total} user shells created` : '1 user shell created', {
-			userShells: createUsers,
-		});
+		return publicUsers;
+	}
 
-		const baseUrl = getInstanceBaseUrl();
-
-		const usersPendingSetup = Object.entries(createUsers).filter(([email, id]) => id && email);
-
-		// send invite email to new or not yet setup users
-
-		const emailingResults = await Promise.all(
-			usersPendingSetup.map(async ([email, id]) => {
-				if (!id) {
-					// This should never happen since those are removed from the list before reaching this point
-					throw new InternalServerError('User ID is missing for user with email address');
-				}
-				const inviteAcceptUrl = generateUserInviteUrl(req.user.id, id);
-				const resp: {
-					user: { id: string | null; email: string; inviteAcceptUrl: string; emailSent: boolean };
-					error?: string;
-				} = {
-					user: {
-						id,
-						email,
-						inviteAcceptUrl,
-						emailSent: false,
-					},
-				};
-				try {
-					const result = await this.mailer.invite({
-						email,
-						inviteAcceptUrl,
-						domain: baseUrl,
-					});
-					if (result.emailSent) {
-						resp.user.emailSent = true;
-						void this.internalHooks.onUserTransactionalEmail({
-							user_id: id,
-							message_type: 'New user invite',
-							public_api: false,
-						});
-					}
+	@Get('/', { middlewares: listQueryMiddleware })
+	@GlobalScope('user:list')
+	async listUsers(req: ListQuery.Request) {
+		const { listQueryOptions } = req;
 
-					void this.internalHooks.onUserInvite({
-						user: req.user,
-						target_user_id: Object.values(createUsers) as string[],
-						public_api: false,
-						email_sent: result.emailSent,
-					});
-				} catch (error) {
-					if (error instanceof Error) {
-						void this.internalHooks.onEmailFailed({
-							user: req.user,
-							message_type: 'New user invite',
-							public_api: false,
-						});
-						this.logger.error('Failed to send email', {
-							userId: req.user.id,
-							inviteAcceptUrl,
-							domain: baseUrl,
-							email,
-						});
-						resp.error = error.message;
-					}
-				}
-				return resp;
-			}),
-		);
+		const findManyOptions = await this.userRepository.toFindManyOptions(listQueryOptions);
 
-		await this.externalHooks.run('user.invited', [usersToSetUp]);
+		const users = await this.userRepository.find(findManyOptions);
 
-		this.logger.debug(
-			usersPendingSetup.length > 1
-				? `Sent ${usersPendingSetup.length} invite emails successfully`
-				: 'Sent 1 invite email successfully',
-			{ userShells: createUsers },
+		const publicUsers: Array<Partial<PublicUser>> = await Promise.all(
+			users.map(
+				async (u) =>
+					await this.userService.toPublic(u, { withInviteUrl: true, inviterId: req.user.id }),
+			),
 		);
 
-		return emailingResults;
+		return listQueryOptions
+			? this.removeSupplementaryFields(publicUsers, listQueryOptions)
+			: publicUsers;
 	}
 
-	/**
-	 * Fill out user shell with first name, last name, and password.
-	 */
-	@NoAuthRequired()
-	@Post('/:id')
-	async updateUser(req: UserRequest.Update, res: Response) {
-		const { id: inviteeId } = req.params;
-
-		const { inviterId, firstName, lastName, password, otpSecret, otp } = req.body;
-
-		if (!inviterId || !inviteeId || !firstName || !lastName || !password || !otpSecret || !otp) {
-			this.logger.debug(
-				'Request to fill out a user shell failed because of missing properties in payload',
-				{ payload: req.body },
-			);
-			throw new BadRequestError('Invalid payload');
-		}
-
-		const validPassword = validatePassword(password);
-
-		const users = await this.userRepository.find({
-			where: { id: In([inviterId, inviteeId]) },
-			relations: ['globalRole'],
+	@Get('/:id/password-reset-link')
+	@GlobalScope('user:resetPassword')
+	async getUserPasswordResetLink(req: UserRequest.PasswordResetLink) {
+		const user = await this.userRepository.findOneOrFail({
+			where: { id: req.params.id },
 		});
-
-		if (users.length !== 2) {
-			this.logger.debug(
-				'Request to fill out a user shell failed because the inviter ID and/or invitee ID were not found in database',
-				{
-					inviterId,
-					inviteeId,
-				},
-			);
-			throw new BadRequestError('Invalid payload or URL');
+		if (!user) {
+			throw new NotFoundError('User not found');
 		}
 
-		const invitee = users.find((user) => user.id === inviteeId) as User;
-
-		if (invitee.password || invitee.otpsecret) {
-			this.logger.debug(
-				'Request to fill out a user shell failed because the invite had already been accepted',
-				{ inviteeId },
-			);
-			throw new BadRequestError('This invite has been accepted already');
-		}
+		const link = this.authService.generatePasswordResetUrl(user);
+		return { link };
+	}
 
-		const verified = speakeasy.totp.verify({
-			secret: otpSecret,
-			encoding: 'base32',
-			token: otp,
+	@Patch('/:id/settings')
+	@GlobalScope('user:update')
+	async updateUserSettings(req: UserRequest.UserSettingsUpdate) {
+		const payload = plainToInstance(UserSettingsUpdatePayload, req.body, {
+			excludeExtraneousValues: true,
 		});
 
-		if (!verified) {
-			throw new BadRequestError('OTP token is not valid');
-		}
-
-		invitee.firstName = firstName;
-		invitee.lastName = lastName;
-		invitee.password = await hashPassword(validPassword);
-		invitee.otpsecret = otpSecret;
+		const id = req.params.id;
 
-		const updatedUser = await this.userRepository.save(invitee);
+		await this.userService.updateSettings(id, payload);
 
-		await issueCookie(res, updatedUser);
-
-		void this.internalHooks.onUserSignup(updatedUser, {
-			user_type: 'email',
-			was_disabled_ldap_user: false,
+		const user = await this.userRepository.findOneOrFail({
+			select: ['settings'],
+			where: { id },
 		});
 
-		await this.externalHooks.run('user.profile.update', [invitee.email, sanitizeUser(invitee)]);
-		await this.externalHooks.run('user.password.update', [invitee.email, invitee.password]);
-
-		return withFeatureFlags(this.postHog, sanitizeUser(updatedUser));
-	}
-
-	@Authorized('any')
-	@Get('/')
-	async listUsers(req: UserRequest.List) {
-		const users = await this.userRepository.find({ relations: ['globalRole', 'authIdentities'] });
-		return users.map(
-			(user): PublicUser =>
-				addInviteLinkToUser(sanitizeUser(user, ['personalizationAnswers']), req.user.id),
-		);
+		return user.settings;
 	}
 
 	/**
 	 * Delete a user. Optionally, designate a transferee for their workflows and credentials.
 	 */
 	@Delete('/:id')
+	@GlobalScope('user:delete')
 	async deleteUser(req: UserRequest.Delete) {
 		const { id: idToDelete } = req.params;
 
@@ -390,9 +157,9 @@ export class UsersController {
 			);
 		}
 
-		const users = await this.userRepository.find({
-			where: { id: In([transferId, idToDelete]) },
-		});
+		const userIds = transferId ? [transferId, idToDelete] : [idToDelete];
+
+		const users = await this.userRepository.findManyByIds(userIds);
 
 		if (!users.length || (transferId && users.length !== 2)) {
 			throw new NotFoundError(
@@ -414,35 +181,31 @@ export class UsersController {
 			telemetryData.migration_user_id = transferId;
 		}
 
-		const [workflowOwnerRole, credentialOwnerRole] = await Promise.all([
-			this.roleRepository.findWorkflowOwnerRole(),
-			this.roleRepository.findCredentialOwnerRole(),
-		]);
-
 		if (transferId) {
 			const transferee = users.find((user) => user.id === transferId);
 
-			await this.userRepository.manager.transaction(async (transactionManager) => {
+			await this.userService.getManager().transaction(async (transactionManager) => {
 				// Get all workflow ids belonging to user to delete
 				const sharedWorkflowIds = await transactionManager
 					.getRepository(SharedWorkflow)
 					.find({
 						select: ['workflowId'],
-						where: { userId: userToDelete.id, roleId: workflowOwnerRole?.id },
+						where: { userId: userToDelete.id, role: 'workflow:owner' },
 					})
 					.then((sharedWorkflows) => sharedWorkflows.map(({ workflowId }) => workflowId));
 
 				// Prevents issues with unique key constraints since user being assigned
 				// workflows and credentials might be a sharee
-				await transactionManager.delete(SharedWorkflow, {
-					user: transferee,
-					workflowId: In(sharedWorkflowIds),
-				});
+				await this.sharedWorkflowRepository.deleteByIds(
+					transactionManager,
+					sharedWorkflowIds,
+					transferee,
+				);
 
 				// Transfer ownership of owned workflows
 				await transactionManager.update(
 					SharedWorkflow,
-					{ user: userToDelete, role: workflowOwnerRole },
+					{ user: userToDelete, role: 'workflow:owner' },
 					{ user: transferee },
 				);
 
@@ -453,21 +216,22 @@ export class UsersController {
 					.getRepository(SharedCredentials)
 					.find({
 						select: ['credentialsId'],
-						where: { userId: userToDelete.id, roleId: credentialOwnerRole?.id },
+						where: { userId: userToDelete.id, role: 'credential:owner' },
 					})
 					.then((sharedCredentials) => sharedCredentials.map(({ credentialsId }) => credentialsId));
 
 				// Prevents issues with unique key constraints since user being assigned
 				// workflows and credentials might be a sharee
-				await transactionManager.delete(SharedCredentials, {
-					user: transferee,
-					credentialsId: In(sharedCredentialIds),
-				});
+				await this.sharedCredentialsRepository.deleteByIds(
+					transactionManager,
+					sharedCredentialIds,
+					transferee,
+				);
 
 				// Transfer ownership of owned credentials
 				await transactionManager.update(
 					SharedCredentials,
-					{ user: userToDelete, role: credentialOwnerRole },
+					{ user: userToDelete, role: 'credential:owner' },
 					{ user: transferee },
 				);
 
@@ -482,27 +246,27 @@ export class UsersController {
 				telemetryData,
 				publicApi: false,
 			});
-			await this.externalHooks.run('user.deleted', [sanitizeUser(userToDelete)]);
+			await this.externalHooks.run('user.deleted', [await this.userService.toPublic(userToDelete)]);
 			return { success: true };
 		}
 
 		const [ownedSharedWorkflows, ownedSharedCredentials] = await Promise.all([
 			this.sharedWorkflowRepository.find({
 				relations: ['workflow'],
-				where: { userId: userToDelete.id, roleId: workflowOwnerRole?.id },
+				where: { userId: userToDelete.id, role: 'workflow:owner' },
 			}),
 			this.sharedCredentialsRepository.find({
 				relations: ['credentials'],
-				where: { userId: userToDelete.id, roleId: credentialOwnerRole?.id },
+				where: { userId: userToDelete.id, role: 'credential:owner' },
 			}),
 		]);
 
-		await this.userRepository.manager.transaction(async (transactionManager) => {
+		await this.userService.getManager().transaction(async (transactionManager) => {
 			const ownedWorkflows = await Promise.all(
 				ownedSharedWorkflows.map(async ({ workflow }) => {
 					if (workflow.active) {
 						// deactivate before deleting
-						await this.activeWorkflowRunner.remove(workflow.id);
+						await this.activeWorkflowManager.remove(workflow.id);
 					}
 					return workflow;
 				}),
@@ -520,73 +284,46 @@ export class UsersController {
 			publicApi: false,
 		});
 
-		await this.externalHooks.run('user.deleted', [sanitizeUser(userToDelete)]);
+		await this.externalHooks.run('user.deleted', [await this.userService.toPublic(userToDelete)]);
 		return { success: true };
 	}
 
-	/**
-	 * Resend email invite to user.
-	 */
-	@Post('/:id/reinvite')
-	async reinviteUser(req: UserRequest.Reinvite) {
-		const { id: idToReinvite } = req.params;
+	@Patch('/:id/role')
+	@GlobalScope('user:changeRole')
+	@Licensed('feat:advancedPermissions')
+	async changeGlobalRole(req: UserRequest.ChangeRole) {
+		const { NO_ADMIN_ON_OWNER, NO_USER, NO_OWNER_ON_OWNER } =
+			UsersController.ERROR_MESSAGES.CHANGE_ROLE;
 
-		if (!isEmailSetUp()) {
-			this.logger.error('Request to reinvite a user failed because email sending was not set up');
-			throw new InternalServerError('Email sending must be set up in order to invite other users');
+		const payload = plainToInstance(UserRoleChangePayload, req.body, {
+			excludeExtraneousValues: true,
+		});
+		await validateEntity(payload);
+
+		const targetUser = await this.userRepository.findOne({
+			where: { id: req.params.id },
+		});
+		if (targetUser === null) {
+			throw new NotFoundError(NO_USER);
 		}
 
-		const reinvitee = await this.userRepository.findOneBy({ id: idToReinvite });
-		if (!reinvitee) {
-			this.logger.debug(
-				'Request to reinvite a user failed because the ID of the reinvitee was not found in database',
-			);
-			throw new NotFoundError('Could not find user');
+		if (req.user.role === 'global:admin' && targetUser.role === 'global:owner') {
+			throw new UnauthorizedError(NO_ADMIN_ON_OWNER);
 		}
 
-		if (reinvitee.password) {
-			this.logger.debug(
-				'Request to reinvite a user failed because the invite had already been accepted',
-				{ userId: reinvitee.id },
-			);
-			throw new BadRequestError('User has already accepted the invite');
+		if (req.user.role === 'global:owner' && targetUser.role === 'global:owner') {
+			throw new UnauthorizedError(NO_OWNER_ON_OWNER);
 		}
 
-		const baseUrl = getInstanceBaseUrl();
-		const inviteAcceptUrl = `${baseUrl}/signup?inviterId=${req.user.id}&inviteeId=${reinvitee.id}`;
+		await this.userService.update(targetUser.id, { role: payload.newRoleName });
+
+		void this.internalHooks.onUserRoleChange({
+			user: req.user,
+			target_user_id: targetUser.id,
+			target_user_new_role: ['global', payload.newRoleName].join(' '),
+			public_api: false,
+		});
 
-		try {
-			const result = await this.mailer.invite({
-				email: reinvitee.email,
-				inviteAcceptUrl,
-				domain: baseUrl,
-			});
-			if (result.emailSent) {
-				void this.internalHooks.onUserReinvite({
-					user: req.user,
-					target_user_id: reinvitee.id,
-					public_api: false,
-				});
-
-				void this.internalHooks.onUserTransactionalEmail({
-					user_id: reinvitee.id,
-					message_type: 'Resend invite',
-					public_api: false,
-				});
-			}
-		} catch (error) {
-			void this.internalHooks.onEmailFailed({
-				user: reinvitee,
-				message_type: 'Resend invite',
-				public_api: false,
-			});
-			this.logger.error('Failed to send email', {
-				email: reinvitee.email,
-				inviteAcceptUrl,
-				domain: baseUrl,
-			});
-			throw new InternalServerError(`Failed to send email to ${reinvitee.email}`);
-		}
 		return { success: true };
 	}
 }
diff --git a/packages/cli/src/controllers/workflow-statistics.types.ts b/packages/cli/src/controllers/workflow-statistics.types.ts
new file mode 100644
index 0000000000000..124f48f2529b4
--- /dev/null
+++ b/packages/cli/src/controllers/workflow-statistics.types.ts
@@ -0,0 +1,5 @@
+import type { ExecutionRequest } from '@/executions/execution.types';
+
+export namespace StatisticsRequest {
+	export type GetOne = ExecutionRequest.GetOne;
+}
diff --git a/packages/cli/src/controllers/workflowStatistics.controller.ts b/packages/cli/src/controllers/workflowStatistics.controller.ts
new file mode 100644
index 0000000000000..99aa5ac789493
--- /dev/null
+++ b/packages/cli/src/controllers/workflowStatistics.controller.ts
@@ -0,0 +1,116 @@
+import { Response, NextFunction } from 'express';
+import { Get, Middleware, RestController } from '@/decorators';
+import type { WorkflowStatistics } from '@db/entities/WorkflowStatistics';
+import { StatisticsNames } from '@db/entities/WorkflowStatistics';
+import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
+import { WorkflowStatisticsRepository } from '@db/repositories/workflowStatistics.repository';
+import type { IWorkflowStatisticsDataLoaded } from '@/Interfaces';
+import { Logger } from '@/Logger';
+import { NotFoundError } from '@/errors/response-errors/not-found.error';
+import { StatisticsRequest } from './workflow-statistics.types';
+
+interface WorkflowStatisticsData<T> {
+	productionSuccess: T;
+	productionError: T;
+	manualSuccess: T;
+	manualError: T;
+}
+
+@RestController('/workflow-stats')
+export class WorkflowStatisticsController {
+	constructor(
+		private readonly sharedWorkflowRepository: SharedWorkflowRepository,
+		private readonly workflowStatisticsRepository: WorkflowStatisticsRepository,
+		private readonly logger: Logger,
+	) {}
+
+	/**
+	 * Check that the workflow ID is valid and allowed to be read by the user
+	 */
+	// TODO: move this into a new decorator `@ValidateWorkflowPermission`
+	@Middleware()
+	async hasWorkflowAccess(req: StatisticsRequest.GetOne, res: Response, next: NextFunction) {
+		const { user } = req;
+		const workflowId = req.params.id;
+
+		const hasAccess = await this.sharedWorkflowRepository.hasAccess(workflowId!, user);
+
+		if (hasAccess) {
+			next();
+		} else {
+			this.logger.verbose('User attempted to read a workflow without permissions', {
+				workflowId,
+				userId: user.id,
+			});
+			// Otherwise, make and return an error
+			throw new NotFoundError(`Workflow ${workflowId} does not exist.`);
+		}
+	}
+
+	@Get('/:id/counts/')
+	async getCounts(req: StatisticsRequest.GetOne): Promise<WorkflowStatisticsData<number>> {
+		return await this.getData(req.params.id!, 'count', 0);
+	}
+
+	@Get('/:id/times/')
+	async getTimes(req: StatisticsRequest.GetOne): Promise<WorkflowStatisticsData<Date | null>> {
+		return await this.getData(req.params.id!, 'latestEvent', null);
+	}
+
+	@Get('/:id/data-loaded/')
+	async getDataLoaded(req: StatisticsRequest.GetOne): Promise<IWorkflowStatisticsDataLoaded> {
+		// Get flag
+		const workflowId = req.params.id;
+
+		// Get the flag
+		const stats = await this.workflowStatisticsRepository.findOne({
+			select: ['latestEvent'],
+			where: {
+				workflowId,
+				name: StatisticsNames.dataLoaded,
+			},
+		});
+
+		return {
+			dataLoaded: stats ? true : false,
+		};
+	}
+
+	private async getData<
+		C extends 'count' | 'latestEvent',
+		D = WorkflowStatistics[C] extends number ? 0 : null,
+	>(workflowId: string, columnName: C, defaultValue: WorkflowStatistics[C] | D) {
+		const stats = await this.workflowStatisticsRepository.find({
+			select: [columnName, 'name'],
+			where: { workflowId },
+		});
+
+		const data: WorkflowStatisticsData<WorkflowStatistics[C] | D> = {
+			productionSuccess: defaultValue,
+			productionError: defaultValue,
+			manualSuccess: defaultValue,
+			manualError: defaultValue,
+		};
+
+		stats.forEach(({ name, [columnName]: value }) => {
+			switch (name) {
+				case StatisticsNames.manualError:
+					data.manualError = value;
+					break;
+
+				case StatisticsNames.manualSuccess:
+					data.manualSuccess = value;
+					break;
+
+				case StatisticsNames.productionError:
+					data.productionError = value;
+					break;
+
+				case StatisticsNames.productionSuccess:
+					data.productionSuccess = value;
+			}
+		});
+
+		return data;
+	}
+}
diff --git a/packages/cli/src/credentials/credentials.controller.ee.ts b/packages/cli/src/credentials/credentials.controller.ee.ts
deleted file mode 100644
index c780aec062c53..0000000000000
--- a/packages/cli/src/credentials/credentials.controller.ee.ts
+++ /dev/null
@@ -1,188 +0,0 @@
-import express from 'express';
-import type { INodeCredentialTestResult } from 'n8n-workflow';
-import { deepCopy, LoggerProxy } from 'n8n-workflow';
-import * as Db from '@/Db';
-import * as ResponseHelper from '@/ResponseHelper';
-import type { CredentialsEntity } from '@db/entities/CredentialsEntity';
-
-import type { CredentialRequest } from '@/requests';
-import { isSharingEnabled, rightDiff } from '@/UserManagement/UserManagementHelper';
-import { EECredentialsService as EECredentials } from './credentials.service.ee';
-import type { CredentialWithSharings } from './credentials.types';
-import { Container } from 'typedi';
-import { InternalHooks } from '@/InternalHooks';
-
-// eslint-disable-next-line @typescript-eslint/naming-convention
-export const EECredentialsController = express.Router();
-
-EECredentialsController.use((req, res, next) => {
-	if (!isSharingEnabled()) {
-		// skip ee router and use free one
-		next('router');
-		return;
-	}
-	// use ee router
-	next();
-});
-
-/**
- * GET /credentials
- */
-EECredentialsController.get(
-	'/',
-	ResponseHelper.send(async (req: CredentialRequest.GetAll): Promise<CredentialWithSharings[]> => {
-		try {
-			const allCredentials = await EECredentials.getAll(req.user, {
-				relations: ['shared', 'shared.role', 'shared.user'],
-			});
-
-			// eslint-disable-next-line @typescript-eslint/unbound-method
-			return allCredentials.map((credential: CredentialsEntity & CredentialWithSharings) =>
-				EECredentials.addOwnerAndSharings(credential),
-			);
-		} catch (error) {
-			LoggerProxy.error('Request to list credentials failed', error as Error);
-			throw error;
-		}
-	}),
-);
-
-/**
- * GET /credentials/:id
- */
-EECredentialsController.get(
-	'/:id(\\d+)',
-	(req, res, next) => (req.params.id === 'new' ? next('router') : next()), // skip ee router and use free one for naming
-	ResponseHelper.send(async (req: CredentialRequest.Get) => {
-		const { id: credentialId } = req.params;
-		const includeDecryptedData = req.query.includeData === 'true';
-
-		let credential = (await EECredentials.get(
-			{ id: credentialId },
-			{ relations: ['shared', 'shared.role', 'shared.user'] },
-		)) as CredentialsEntity & CredentialWithSharings;
-
-		if (!credential) {
-			throw new ResponseHelper.NotFoundError(
-				'Could not load the credential. If you think this is an error, ask the owner to share it with you again',
-			);
-		}
-
-		const userSharing = credential.shared?.find((shared) => shared.user.id === req.user.id);
-
-		if (!userSharing && req.user.globalRole.name !== 'owner') {
-			throw new ResponseHelper.UnauthorizedError('Forbidden.');
-		}
-
-		credential = EECredentials.addOwnerAndSharings(credential);
-
-		if (!includeDecryptedData || !userSharing || userSharing.role.name !== 'owner') {
-			const { data: _, ...rest } = credential;
-			return { ...rest };
-		}
-
-		const { data: _, ...rest } = credential;
-
-		const key = await EECredentials.getEncryptionKey();
-		const decryptedData = EECredentials.redact(
-			await EECredentials.decrypt(key, credential),
-			credential,
-		);
-
-		return { data: decryptedData, ...rest };
-	}),
-);
-
-/**
- * POST /credentials/test
- *
- * Test if a credential is valid.
- */
-EECredentialsController.post(
-	'/test',
-	ResponseHelper.send(async (req: CredentialRequest.Test): Promise<INodeCredentialTestResult> => {
-		const { credentials } = req.body;
-
-		const encryptionKey = await EECredentials.getEncryptionKey();
-
-		const credentialId = credentials.id;
-		const { ownsCredential } = await EECredentials.isOwned(req.user, credentialId);
-
-		const sharing = await EECredentials.getSharing(req.user, credentialId);
-		if (!ownsCredential) {
-			if (!sharing) {
-				throw new ResponseHelper.UnauthorizedError('Forbidden');
-			}
-
-			const decryptedData = await EECredentials.decrypt(encryptionKey, sharing.credentials);
-			Object.assign(credentials, { data: decryptedData });
-		}
-
-		const mergedCredentials = deepCopy(credentials);
-		if (mergedCredentials.data && sharing?.credentials) {
-			const decryptedData = await EECredentials.decrypt(encryptionKey, sharing.credentials);
-			mergedCredentials.data = EECredentials.unredact(mergedCredentials.data, decryptedData);
-		}
-
-		return EECredentials.test(req.user, encryptionKey, mergedCredentials);
-	}),
-);
-
-/**
- * (EE) PUT /credentials/:id/share
- *
- * Grant or remove users' access to a credential.
- */
-
-EECredentialsController.put(
-	'/:credentialId/share',
-	ResponseHelper.send(async (req: CredentialRequest.Share) => {
-		const { credentialId } = req.params;
-		const { shareWithIds } = req.body;
-
-		if (
-			!Array.isArray(shareWithIds) ||
-			!shareWithIds.every((userId) => typeof userId === 'string')
-		) {
-			throw new ResponseHelper.BadRequestError('Bad request');
-		}
-
-		const { ownsCredential, credential } = await EECredentials.isOwned(req.user, credentialId);
-		if (!ownsCredential || !credential) {
-			throw new ResponseHelper.UnauthorizedError('Forbidden');
-		}
-
-		let amountRemoved: number | null = null;
-		let newShareeIds: string[] = [];
-		await Db.transaction(async (trx) => {
-			// remove all sharings that are not supposed to exist anymore
-			const { affected } = await EECredentials.pruneSharings(trx, credentialId, [
-				req.user.id,
-				...shareWithIds,
-			]);
-			if (affected) amountRemoved = affected;
-
-			const sharings = await EECredentials.getSharings(trx, credentialId);
-
-			// extract the new sharings that need to be added
-			newShareeIds = rightDiff(
-				[sharings, (sharing) => sharing.userId],
-				[shareWithIds, (shareeId) => shareeId],
-			);
-
-			if (newShareeIds.length) {
-				await EECredentials.share(trx, credential, newShareeIds);
-			}
-		});
-
-		void Container.get(InternalHooks).onUserSharedCredentials({
-			user: req.user,
-			credential_name: credential.name,
-			credential_type: credential.type,
-			credential_id: credential.id,
-			user_id_sharer: req.user.id,
-			user_ids_sharees_added: newShareeIds,
-			sharees_removed: amountRemoved,
-		});
-	}),
-);
diff --git a/packages/cli/src/credentials/credentials.controller.ts b/packages/cli/src/credentials/credentials.controller.ts
index 6a4223ba2b9a8..aba4e15437409 100644
--- a/packages/cli/src/credentials/credentials.controller.ts
+++ b/packages/cli/src/credentials/credentials.controller.ts
@@ -1,81 +1,109 @@
-/* eslint-disable no-param-reassign */
-/* eslint-disable @typescript-eslint/no-unused-vars */
-import express from 'express';
-import type { INodeCredentialTestResult } from 'n8n-workflow';
-import { deepCopy, LoggerProxy } from 'n8n-workflow';
-
-import * as GenericHelpers from '@/GenericHelpers';
-import * as ResponseHelper from '@/ResponseHelper';
+import { deepCopy } from 'n8n-workflow';
 import config from '@/config';
-import { getLogger } from '@/Logger';
-import { EECredentialsController } from './credentials.controller.ee';
 import { CredentialsService } from './credentials.service';
-
-import type { ICredentialsDb } from '@/Interfaces';
-import type { CredentialRequest } from '@/requests';
-import { Container } from 'typedi';
+import { CredentialRequest, ListQuery } from '@/requests';
 import { InternalHooks } from '@/InternalHooks';
-
-export const credentialsController = express.Router();
-
-/**
- * Initialize Logger if needed
- */
-credentialsController.use((req, res, next) => {
-	try {
-		LoggerProxy.getInstance();
-	} catch (error) {
-		LoggerProxy.init(getLogger());
+import { Logger } from '@/Logger';
+import { NotFoundError } from '@/errors/response-errors/not-found.error';
+import { UnauthorizedError } from '@/errors/response-errors/unauthorized.error';
+import { NamingService } from '@/services/naming.service';
+import { License } from '@/License';
+import { CredentialsRepository } from '@/databases/repositories/credentials.repository';
+import { OwnershipService } from '@/services/ownership.service';
+import { EnterpriseCredentialsService } from './credentials.service.ee';
+import { Delete, Get, Licensed, Patch, Post, Put, RestController } from '@/decorators';
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
+import { UserManagementMailer } from '@/UserManagement/email';
+import * as Db from '@/Db';
+import * as utils from '@/utils';
+import { listQueryMiddleware } from '@/middlewares';
+
+@RestController('/credentials')
+export class CredentialsController {
+	constructor(
+		private readonly credentialsService: CredentialsService,
+		private readonly enterpriseCredentialsService: EnterpriseCredentialsService,
+		private readonly credentialsRepository: CredentialsRepository,
+		private readonly namingService: NamingService,
+		private readonly license: License,
+		private readonly logger: Logger,
+		private readonly ownershipService: OwnershipService,
+		private readonly internalHooks: InternalHooks,
+		private readonly userManagementMailer: UserManagementMailer,
+	) {}
+
+	@Get('/', { middlewares: listQueryMiddleware })
+	async getMany(req: ListQuery.Request) {
+		return await this.credentialsService.getMany(req.user, {
+			listQueryOptions: req.listQueryOptions,
+		});
 	}
-	next();
-});
-
-credentialsController.use('/', EECredentialsController);
-
-/**
- * GET /credentials
- */
-credentialsController.get(
-	'/',
-	ResponseHelper.send(async (req: CredentialRequest.GetAll): Promise<ICredentialsDb[]> => {
-		return CredentialsService.getAll(req.user, { roles: ['owner'] });
-	}),
-);
-
-/**
- * GET /credentials/new
- *
- * Generate a unique credential name.
- */
-credentialsController.get(
-	'/new',
-	ResponseHelper.send(async (req: CredentialRequest.NewName): Promise<{ name: string }> => {
-		const { name: newName } = req.query;
+
+	@Get('/new')
+	async generateUniqueName(req: CredentialRequest.NewName) {
+		const requestedName = req.query.name ?? config.getEnv('credentials.defaultName');
 
 		return {
-			name: await GenericHelpers.generateUniqueName(
-				newName ?? config.getEnv('credentials.defaultName'),
-				'credentials',
-			),
+			name: await this.namingService.getUniqueCredentialName(requestedName),
 		};
-	}),
-);
-
-/**
- * GET /credentials/:id
- */
-credentialsController.get(
-	'/:id(\\d+)',
-	ResponseHelper.send(async (req: CredentialRequest.Get) => {
+	}
+
+	@Get('/:id')
+	async getOne(req: CredentialRequest.Get) {
+		if (this.license.isSharingEnabled()) {
+			const { id: credentialId } = req.params;
+			const includeDecryptedData = req.query.includeData === 'true';
+
+			let credential = await this.credentialsRepository.findOne({
+				where: { id: credentialId },
+				relations: ['shared', 'shared.user'],
+			});
+
+			if (!credential) {
+				throw new NotFoundError(
+					'Could not load the credential. If you think this is an error, ask the owner to share it with you again',
+				);
+			}
+
+			const userSharing = credential.shared?.find((shared) => shared.user.id === req.user.id);
+
+			if (!userSharing && !req.user.hasGlobalScope('credential:read')) {
+				throw new UnauthorizedError('Forbidden.');
+			}
+
+			credential = this.ownershipService.addOwnedByAndSharedWith(credential);
+
+			// Below, if `userSharing` does not exist, it means this credential is being
+			// fetched by the instance owner or an admin. In this case, they get the full data
+			if (!includeDecryptedData || userSharing?.role === 'credential:user') {
+				const { data: _, ...rest } = credential;
+				return { ...rest };
+			}
+
+			const { data: _, ...rest } = credential;
+
+			const decryptedData = this.credentialsService.redact(
+				this.credentialsService.decrypt(credential),
+				credential,
+			);
+
+			return { data: decryptedData, ...rest };
+		}
+
+		// non-enterprise
+
 		const { id: credentialId } = req.params;
 		const includeDecryptedData = req.query.includeData === 'true';
 
-		const sharing = await CredentialsService.getSharing(req.user, credentialId, ['credentials']);
+		const sharing = await this.credentialsService.getSharing(
+			req.user,
+			credentialId,
+			{ allowGlobalScope: true, globalScope: 'credential:read' },
+			['credentials'],
+		);
 
 		if (!sharing) {
-			throw new ResponseHelper.NotFoundError(
-				`Credential with ID "${credentialId}" could not be found.`,
-			);
+			throw new NotFoundError(`Credential with ID "${credentialId}" could not be found.`);
 		}
 
 		const { credentials: credential } = sharing;
@@ -86,52 +114,79 @@ credentialsController.get(
 			return { ...rest };
 		}
 
-		const key = await CredentialsService.getEncryptionKey();
-		const decryptedData = CredentialsService.redact(
-			await CredentialsService.decrypt(key, credential),
+		const decryptedData = this.credentialsService.redact(
+			this.credentialsService.decrypt(credential),
 			credential,
 		);
 
 		return { data: decryptedData, ...rest };
-	}),
-);
-
-/**
- * POST /credentials/test
- *
- * Test if a credential is valid.
- */
-credentialsController.post(
-	'/test',
-	ResponseHelper.send(async (req: CredentialRequest.Test): Promise<INodeCredentialTestResult> => {
+	}
+
+	@Post('/test')
+	async testCredentials(req: CredentialRequest.Test) {
+		if (this.license.isSharingEnabled()) {
+			const { credentials } = req.body;
+
+			const credentialId = credentials.id;
+			const { ownsCredential } = await this.enterpriseCredentialsService.isOwned(
+				req.user,
+				credentialId,
+			);
+
+			const sharing = await this.enterpriseCredentialsService.getSharing(req.user, credentialId, {
+				allowGlobalScope: true,
+				globalScope: 'credential:read',
+			});
+			if (!ownsCredential) {
+				if (!sharing) {
+					throw new UnauthorizedError('Forbidden');
+				}
+
+				const decryptedData = this.credentialsService.decrypt(sharing.credentials);
+				Object.assign(credentials, { data: decryptedData });
+			}
+
+			const mergedCredentials = deepCopy(credentials);
+			if (mergedCredentials.data && sharing?.credentials) {
+				const decryptedData = this.credentialsService.decrypt(sharing.credentials);
+				mergedCredentials.data = this.credentialsService.unredact(
+					mergedCredentials.data,
+					decryptedData,
+				);
+			}
+
+			return await this.credentialsService.test(req.user, mergedCredentials);
+		}
+
+		// non-enterprise
+
 		const { credentials } = req.body;
 
-		const encryptionKey = await CredentialsService.getEncryptionKey();
-		const sharing = await CredentialsService.getSharing(req.user, credentials.id);
+		const sharing = await this.credentialsService.getSharing(req.user, credentials.id, {
+			allowGlobalScope: true,
+			globalScope: 'credential:read',
+		});
 
 		const mergedCredentials = deepCopy(credentials);
 		if (mergedCredentials.data && sharing?.credentials) {
-			const decryptedData = await CredentialsService.decrypt(encryptionKey, sharing.credentials);
-			mergedCredentials.data = CredentialsService.unredact(mergedCredentials.data, decryptedData);
+			const decryptedData = this.credentialsService.decrypt(sharing.credentials);
+			mergedCredentials.data = this.credentialsService.unredact(
+				mergedCredentials.data,
+				decryptedData,
+			);
 		}
 
-		return CredentialsService.test(req.user, encryptionKey, mergedCredentials);
-	}),
-);
+		return await this.credentialsService.test(req.user, mergedCredentials);
+	}
 
-/**
- * POST /credentials
- */
-credentialsController.post(
-	'/',
-	ResponseHelper.send(async (req: CredentialRequest.Create) => {
-		const newCredential = await CredentialsService.prepareCreateData(req.body);
+	@Post('/')
+	async createCredentials(req: CredentialRequest.Create) {
+		const newCredential = await this.credentialsService.prepareCreateData(req.body);
 
-		const key = await CredentialsService.getEncryptionKey();
-		const encryptedData = CredentialsService.createEncryptedData(key, null, newCredential);
-		const credential = await CredentialsService.save(newCredential, encryptedData, req.user);
+		const encryptedData = this.credentialsService.createEncryptedData(null, newCredential);
+		const credential = await this.credentialsService.save(newCredential, encryptedData, req.user);
 
-		void Container.get(InternalHooks).onUserCreatedCredentials({
+		void this.internalHooks.onUserCreatedCredentials({
 			user: req.user,
 			credential_name: newCredential.name,
 			credential_type: credential.type,
@@ -140,84 +195,201 @@ credentialsController.post(
 		});
 
 		return credential;
-	}),
-);
-
-/**
- * PATCH /credentials/:id
- */
-credentialsController.patch(
-	'/:id(\\d+)',
-	ResponseHelper.send(async (req: CredentialRequest.Update): Promise<ICredentialsDb> => {
+	}
+
+	@Patch('/:id')
+	async updateCredentials(req: CredentialRequest.Update) {
 		const { id: credentialId } = req.params;
 
-		const sharing = await CredentialsService.getSharing(req.user, credentialId);
+		const sharing = await this.credentialsService.getSharing(
+			req.user,
+			credentialId,
+			{
+				allowGlobalScope: true,
+				globalScope: 'credential:update',
+			},
+			['credentials'],
+		);
 
 		if (!sharing) {
-			LoggerProxy.info('Attempt to update credential blocked due to lack of permissions', {
+			this.logger.info('Attempt to update credential blocked due to lack of permissions', {
 				credentialId,
 				userId: req.user.id,
 			});
-			throw new ResponseHelper.NotFoundError(
+			throw new NotFoundError(
 				'Credential to be updated not found. You can only update credentials owned by you',
 			);
 		}
 
+		if (sharing.role !== 'credential:owner' && !req.user.hasGlobalScope('credential:update')) {
+			this.logger.info('Attempt to update credential blocked due to lack of permissions', {
+				credentialId,
+				userId: req.user.id,
+			});
+			throw new UnauthorizedError('You can only update credentials owned by you');
+		}
+
 		const { credentials: credential } = sharing;
 
-		const key = await CredentialsService.getEncryptionKey();
-		const decryptedData = await CredentialsService.decrypt(key, credential);
-		const preparedCredentialData = await CredentialsService.prepareUpdateData(
+		const decryptedData = this.credentialsService.decrypt(credential);
+		const preparedCredentialData = await this.credentialsService.prepareUpdateData(
 			req.body,
 			decryptedData,
 		);
-		const newCredentialData = CredentialsService.createEncryptedData(
-			key,
+		const newCredentialData = this.credentialsService.createEncryptedData(
 			credentialId,
 			preparedCredentialData,
 		);
 
-		const responseData = await CredentialsService.update(credentialId, newCredentialData);
+		const responseData = await this.credentialsService.update(credentialId, newCredentialData);
 
 		if (responseData === null) {
-			throw new ResponseHelper.NotFoundError(
-				`Credential ID "${credentialId}" could not be found to be updated.`,
-			);
+			throw new NotFoundError(`Credential ID "${credentialId}" could not be found to be updated.`);
 		}
 
 		// Remove the encrypted data as it is not needed in the frontend
 		const { data: _, ...rest } = responseData;
 
-		LoggerProxy.verbose('Credential updated', { credentialId });
+		this.logger.verbose('Credential updated', { credentialId });
+
+		void this.internalHooks.onUserUpdatedCredentials({
+			user: req.user,
+			credential_name: credential.name,
+			credential_type: credential.type,
+			credential_id: credential.id,
+		});
 
 		return { ...rest };
-	}),
-);
-
-/**
- * DELETE /credentials/:id
- */
-credentialsController.delete(
-	'/:id(\\d+)',
-	ResponseHelper.send(async (req: CredentialRequest.Delete) => {
+	}
+
+	@Delete('/:id')
+	async deleteCredentials(req: CredentialRequest.Delete) {
 		const { id: credentialId } = req.params;
 
-		const sharing = await CredentialsService.getSharing(req.user, credentialId);
+		const sharing = await this.credentialsService.getSharing(
+			req.user,
+			credentialId,
+			{
+				allowGlobalScope: true,
+				globalScope: 'credential:delete',
+			},
+			['credentials'],
+		);
 
 		if (!sharing) {
-			LoggerProxy.info('Attempt to delete credential blocked due to lack of permissions', {
+			this.logger.info('Attempt to delete credential blocked due to lack of permissions', {
 				credentialId,
 				userId: req.user.id,
 			});
-			throw new ResponseHelper.NotFoundError(
+			throw new NotFoundError(
 				'Credential to be deleted not found. You can only removed credentials owned by you',
 			);
 		}
 
+		if (sharing.role !== 'credential:owner' && !req.user.hasGlobalScope('credential:delete')) {
+			this.logger.info('Attempt to delete credential blocked due to lack of permissions', {
+				credentialId,
+				userId: req.user.id,
+			});
+			throw new UnauthorizedError('You can only remove credentials owned by you');
+		}
+
 		const { credentials: credential } = sharing;
 
-		await CredentialsService.delete(credential);
+		await this.credentialsService.delete(credential);
+
+		void this.internalHooks.onUserDeletedCredentials({
+			user: req.user,
+			credential_name: credential.name,
+			credential_type: credential.type,
+			credential_id: credential.id,
+		});
 
 		return true;
-	}),
-);
+	}
+
+	@Licensed('feat:sharing')
+	@Put('/:id/share')
+	async shareCredentials(req: CredentialRequest.Share) {
+		const { id: credentialId } = req.params;
+		const { shareWithIds } = req.body;
+
+		if (
+			!Array.isArray(shareWithIds) ||
+			!shareWithIds.every((userId) => typeof userId === 'string')
+		) {
+			throw new BadRequestError('Bad request');
+		}
+
+		const isOwnedRes = await this.enterpriseCredentialsService.isOwned(req.user, credentialId);
+		const { ownsCredential } = isOwnedRes;
+		let { credential } = isOwnedRes;
+		if (!ownsCredential || !credential) {
+			credential = undefined;
+			// Allow owners/admins to share
+			if (req.user.hasGlobalScope('credential:share')) {
+				const sharedRes = await this.enterpriseCredentialsService.getSharing(
+					req.user,
+					credentialId,
+					{
+						allowGlobalScope: true,
+						globalScope: 'credential:share',
+					},
+				);
+				credential = sharedRes?.credentials;
+			}
+			if (!credential) {
+				throw new UnauthorizedError('Forbidden');
+			}
+		}
+
+		const ownerIds = (
+			await this.enterpriseCredentialsService.getSharings(
+				Db.getConnection().createEntityManager(),
+				credentialId,
+				['shared'],
+			)
+		)
+			.filter((e) => e.role === 'credential:owner')
+			.map((e) => e.userId);
+
+		let amountRemoved: number | null = null;
+		let newShareeIds: string[] = [];
+		await Db.transaction(async (trx) => {
+			// remove all sharings that are not supposed to exist anymore
+			const { affected } = await this.credentialsRepository.pruneSharings(trx, credentialId, [
+				...ownerIds,
+				...shareWithIds,
+			]);
+			if (affected) amountRemoved = affected;
+
+			const sharings = await this.enterpriseCredentialsService.getSharings(trx, credentialId);
+
+			// extract the new sharings that need to be added
+			newShareeIds = utils.rightDiff(
+				[sharings, (sharing) => sharing.userId],
+				[shareWithIds, (shareeId) => shareeId],
+			);
+
+			if (newShareeIds.length) {
+				await this.enterpriseCredentialsService.share(trx, credential, newShareeIds);
+			}
+		});
+
+		void this.internalHooks.onUserSharedCredentials({
+			user: req.user,
+			credential_name: credential.name,
+			credential_type: credential.type,
+			credential_id: credential.id,
+			user_id_sharer: req.user.id,
+			user_ids_sharees_added: newShareeIds,
+			sharees_removed: amountRemoved,
+		});
+
+		await this.userManagementMailer.notifyCredentialsShared({
+			sharer: req.user,
+			newShareeIds,
+			credentialsName: credential.name,
+		});
+	}
+}
diff --git a/packages/cli/src/credentials/credentials.service.ee.ts b/packages/cli/src/credentials/credentials.service.ee.ts
index 2defaaaea9158..0958a02db8d68 100644
--- a/packages/cli/src/credentials/credentials.service.ee.ts
+++ b/packages/cli/src/credentials/credentials.service.ee.ts
@@ -1,25 +1,25 @@
-/* eslint-disable no-param-reassign */
-import type { DeleteResult, EntityManager, FindOptionsWhere } from 'typeorm';
-import { In, Not } from 'typeorm';
-import * as Db from '@/Db';
-import { RoleService } from '@/role/role.service';
-import { CredentialsEntity } from '@db/entities/CredentialsEntity';
-import { SharedCredentials } from '@db/entities/SharedCredentials';
+import type { EntityManager, FindOptionsWhere } from '@n8n/typeorm';
+import type { SharedCredentials } from '@db/entities/SharedCredentials';
 import type { User } from '@db/entities/User';
-import { UserService } from '@/user/user.service';
-import { CredentialsService } from './credentials.service';
-import type { CredentialWithSharings } from './credentials.types';
-
-export class EECredentialsService extends CredentialsService {
-	static async isOwned(
-		user: User,
-		credentialId: string,
-	): Promise<{ ownsCredential: boolean; credential?: CredentialsEntity }> {
-		const sharing = await this.getSharing(user, credentialId, ['credentials', 'role'], {
-			allowGlobalOwner: false,
-		});
+import { type CredentialsGetSharedOptions } from './credentials.service';
+import { SharedCredentialsRepository } from '@db/repositories/sharedCredentials.repository';
+import { UserRepository } from '@/databases/repositories/user.repository';
+import { CredentialsEntity } from '@/databases/entities/CredentialsEntity';
+import { Service } from 'typedi';
+
+@Service()
+export class EnterpriseCredentialsService {
+	constructor(
+		private readonly userRepository: UserRepository,
+		private readonly sharedCredentialsRepository: SharedCredentialsRepository,
+	) {}
+
+	async isOwned(user: User, credentialId: string) {
+		const sharing = await this.getSharing(user, credentialId, { allowGlobalScope: false }, [
+			'credentials',
+		]);
 
-		if (!sharing || sharing.role.name !== 'owner') return { ownsCredential: false };
+		if (!sharing || sharing.role !== 'credential:owner') return { ownsCredential: false };
 
 		const { credentials: credential } = sharing;
 
@@ -29,93 +29,49 @@ export class EECredentialsService extends CredentialsService {
 	/**
 	 * Retrieve the sharing that matches a user and a credential.
 	 */
-	static async getSharing(
+	async getSharing(
 		user: User,
 		credentialId: string,
+		options: CredentialsGetSharedOptions,
 		relations: string[] = ['credentials'],
-		{ allowGlobalOwner } = { allowGlobalOwner: true },
-	): Promise<SharedCredentials | null> {
+	) {
 		const where: FindOptionsWhere<SharedCredentials> = { credentialsId: credentialId };
 
-		// Omit user from where if the requesting user is the global
-		// owner. This allows the global owner to view and delete
-		// credentials they don't own.
-		if (!allowGlobalOwner || user.globalRole.name !== 'owner') {
+		// Omit user from where if the requesting user has relevant
+		// global credential permissions. This allows the user to
+		// access credentials they don't own.
+		if (!options.allowGlobalScope || !user.hasGlobalScope(options.globalScope)) {
 			where.userId = user.id;
 		}
 
-		return Db.collections.SharedCredentials.findOne({
+		return await this.sharedCredentialsRepository.findOne({
 			where,
 			relations,
 		});
 	}
 
-	static async getSharings(
-		transaction: EntityManager,
-		credentialId: string,
-	): Promise<SharedCredentials[]> {
+	async getSharings(transaction: EntityManager, credentialId: string, relations = ['shared']) {
 		const credential = await transaction.findOne(CredentialsEntity, {
 			where: { id: credentialId },
-			relations: ['shared'],
+			relations,
 		});
-		return credential?.shared ?? [];
-	}
 
-	static async pruneSharings(
-		transaction: EntityManager,
-		credentialId: string,
-		userIds: string[],
-	): Promise<DeleteResult> {
-		const conditions: FindOptionsWhere<SharedCredentials> = {
-			credentialsId: credentialId,
-			userId: Not(In(userIds)),
-		};
-		return transaction.delete(SharedCredentials, conditions);
+		return credential?.shared ?? [];
 	}
 
-	static async share(
-		transaction: EntityManager,
-		credential: CredentialsEntity,
-		shareWithIds: string[],
-	): Promise<SharedCredentials[]> {
-		const [users, role] = await Promise.all([
-			UserService.getByIds(transaction, shareWithIds),
-			RoleService.trxGet(transaction, { scope: 'credential', name: 'user' }),
-		]);
+	async share(transaction: EntityManager, credential: CredentialsEntity, shareWithIds: string[]) {
+		const users = await this.userRepository.getByIds(transaction, shareWithIds);
 
 		const newSharedCredentials = users
 			.filter((user) => !user.isPending)
 			.map((user) =>
-				Db.collections.SharedCredentials.create({
+				this.sharedCredentialsRepository.create({
 					credentialsId: credential.id,
 					userId: user.id,
-					roleId: role?.id,
+					role: 'credential:user',
 				}),
 			);
 
-		return transaction.save(newSharedCredentials);
-	}
-
-	static addOwnerAndSharings(
-		credential: CredentialsEntity & CredentialWithSharings,
-	): CredentialsEntity & CredentialWithSharings {
-		credential.ownedBy = null;
-		credential.sharedWith = [];
-
-		credential.shared?.forEach(({ user, role }) => {
-			const { id, email, firstName, lastName } = user;
-
-			if (role.name === 'owner') {
-				credential.ownedBy = { id, email, firstName, lastName };
-				return;
-			}
-
-			credential.sharedWith?.push({ id, email, firstName, lastName });
-		});
-
-		// @ts-ignore
-		delete credential.shared;
-
-		return credential;
+		return await transaction.save(newSharedCredentials);
 	}
 }
diff --git a/packages/cli/src/credentials/credentials.service.ts b/packages/cli/src/credentials/credentials.service.ts
index 2eb0f559613c1..ac0598aa3f91e 100644
--- a/packages/cli/src/credentials/credentials.service.ts
+++ b/packages/cli/src/credentials/credentials.service.ts
@@ -1,134 +1,118 @@
-/* eslint-disable no-restricted-syntax */
-import { Credentials, UserSettings } from 'n8n-core';
+import { Credentials } from 'n8n-core';
 import type {
 	ICredentialDataDecryptedObject,
 	ICredentialsDecrypted,
 	ICredentialType,
-	INodeCredentialTestResult,
 	INodeProperties,
 } from 'n8n-workflow';
-import { deepCopy, LoggerProxy, NodeHelpers } from 'n8n-workflow';
-import { Container } from 'typedi';
-import type { FindManyOptions, FindOptionsWhere } from 'typeorm';
-import { In } from 'typeorm';
-
+import { CREDENTIAL_EMPTY_VALUE, deepCopy, NodeHelpers } from 'n8n-workflow';
+import type { FindOptionsWhere } from '@n8n/typeorm';
+import type { Scope } from '@n8n/permissions';
 import * as Db from '@/Db';
-import * as ResponseHelper from '@/ResponseHelper';
 import type { ICredentialsDb } from '@/Interfaces';
-import { CredentialsHelper, createCredentialsFromCredentialsEntity } from '@/CredentialsHelper';
-import { CREDENTIAL_BLANKING_VALUE, RESPONSE_ERROR_MESSAGES } from '@/constants';
+import { createCredentialsFromCredentialsEntity } from '@/CredentialsHelper';
+import { CREDENTIAL_BLANKING_VALUE } from '@/constants';
 import { CredentialsEntity } from '@db/entities/CredentialsEntity';
 import { SharedCredentials } from '@db/entities/SharedCredentials';
 import { validateEntity } from '@/GenericHelpers';
 import { ExternalHooks } from '@/ExternalHooks';
 import type { User } from '@db/entities/User';
-import { RoleRepository } from '@db/repositories';
-import type { CredentialRequest } from '@/requests';
+import type { CredentialRequest, ListQuery } from '@/requests';
 import { CredentialTypes } from '@/CredentialTypes';
-
+import { OwnershipService } from '@/services/ownership.service';
+import { Logger } from '@/Logger';
+import { CredentialsRepository } from '@db/repositories/credentials.repository';
+import { SharedCredentialsRepository } from '@db/repositories/sharedCredentials.repository';
+import { Service } from 'typedi';
+import { CredentialsTester } from '@/services/credentials-tester.service';
+
+export type CredentialsGetSharedOptions =
+	| { allowGlobalScope: true; globalScope: Scope }
+	| { allowGlobalScope: false };
+
+@Service()
 export class CredentialsService {
-	static async get(
-		where: FindOptionsWhere<ICredentialsDb>,
-		options?: { relations: string[] },
-	): Promise<ICredentialsDb | null> {
-		return Db.collections.Credentials.findOne({
+	constructor(
+		private readonly credentialsRepository: CredentialsRepository,
+		private readonly sharedCredentialsRepository: SharedCredentialsRepository,
+		private readonly ownershipService: OwnershipService,
+		private readonly logger: Logger,
+		private readonly credentialsTester: CredentialsTester,
+		private readonly externalHooks: ExternalHooks,
+		private readonly credentialTypes: CredentialTypes,
+	) {}
+
+	async get(where: FindOptionsWhere<ICredentialsDb>, options?: { relations: string[] }) {
+		return await this.credentialsRepository.findOne({
 			relations: options?.relations,
 			where,
 		});
 	}
 
-	static async getAll(
+	async getMany(
 		user: User,
-		options?: { relations?: string[]; roles?: string[]; disableGlobalRole?: boolean },
-	): Promise<ICredentialsDb[]> {
-		const SELECT_FIELDS: Array<keyof ICredentialsDb> = [
-			'id',
-			'name',
-			'type',
-			'nodesAccess',
-			'createdAt',
-			'updatedAt',
-		];
-
-		// if instance owner, return all credentials
-
-		if (user.globalRole.name === 'owner' && options?.disableGlobalRole !== true) {
-			return Db.collections.Credentials.find({
-				select: SELECT_FIELDS,
-				relations: options?.relations,
-			});
+		options: { listQueryOptions?: ListQuery.Options; onlyOwn?: boolean } = {},
+	) {
+		const returnAll = user.hasGlobalScope('credential:list') && !options.onlyOwn;
+		const isDefaultSelect = !options.listQueryOptions?.select;
+
+		if (returnAll) {
+			const credentials = await this.credentialsRepository.findMany(options.listQueryOptions);
+
+			return isDefaultSelect
+				? credentials.map((c) => this.ownershipService.addOwnedByAndSharedWith(c))
+				: credentials;
 		}
 
-		// if member, return credentials owned by or shared with member
-		const userSharings = await Db.collections.SharedCredentials.find({
-			where: {
-				userId: user.id,
-				...(options?.roles?.length ? { role: { name: In(options.roles) } } : {}),
-			},
-			relations: options?.roles?.length ? ['role'] : [],
-		});
+		const ids = await this.sharedCredentialsRepository.getAccessibleCredentialIds([user.id]);
 
-		return Db.collections.Credentials.find({
-			select: SELECT_FIELDS,
-			relations: options?.relations,
-			where: {
-				id: In(userSharings.map((x) => x.credentialsId)),
-			},
-		});
-	}
+		const credentials = await this.credentialsRepository.findMany(
+			options.listQueryOptions,
+			ids, // only accessible credentials
+		);
 
-	static async getMany(filter: FindManyOptions<ICredentialsDb>): Promise<ICredentialsDb[]> {
-		return Db.collections.Credentials.find(filter);
+		return isDefaultSelect
+			? credentials.map((c) => this.ownershipService.addOwnedByAndSharedWith(c))
+			: credentials;
 	}
 
 	/**
 	 * Retrieve the sharing that matches a user and a credential.
 	 */
-	static async getSharing(
+	async getSharing(
 		user: User,
 		credentialId: string,
+		options: CredentialsGetSharedOptions,
 		relations: string[] = ['credentials'],
-		{ allowGlobalOwner } = { allowGlobalOwner: true },
 	): Promise<SharedCredentials | null> {
 		const where: FindOptionsWhere<SharedCredentials> = { credentialsId: credentialId };
 
-		// Omit user from where if the requesting user is the global
-		// owner. This allows the global owner to view and delete
-		// credentials they don't own.
-		if (!allowGlobalOwner || user.globalRole.name !== 'owner') {
-			Object.assign(where, {
-				userId: user.id,
-				role: { name: 'owner' },
-			});
-			if (!relations.includes('role')) {
-				relations.push('role');
-			}
+		// Omit user from where if the requesting user has relevant
+		// global credential permissions. This allows the user to
+		// access credentials they don't own.
+		if (!options.allowGlobalScope || !user.hasGlobalScope(options.globalScope)) {
+			where.userId = user.id;
+			where.role = 'credential:owner';
 		}
 
-		return Db.collections.SharedCredentials.findOne({ where, relations });
+		return await this.sharedCredentialsRepository.findOne({ where, relations });
 	}
 
-	static async prepareCreateData(
+	async prepareCreateData(
 		data: CredentialRequest.CredentialProperties,
 	): Promise<CredentialsEntity> {
-		// eslint-disable-next-line @typescript-eslint/no-unused-vars
 		const { id, ...rest } = data;
 
 		// This saves us a merge but requires some type casting. These
 		// types are compatible for this case.
-		const newCredentials = Db.collections.Credentials.create(rest as ICredentialsDb);
+		const newCredentials = this.credentialsRepository.create(rest as ICredentialsDb);
 
 		await validateEntity(newCredentials);
 
-		// Add the date for newly added node access permissions
-		for (const nodeAccess of newCredentials.nodesAccess) {
-			nodeAccess.date = new Date();
-		}
-
 		return newCredentials;
 	}
 
-	static async prepareUpdateData(
+	async prepareUpdateData(
 		data: CredentialRequest.CredentialProperties,
 		decryptedData: ICredentialDataDecryptedObject,
 	): Promise<CredentialsEntity> {
@@ -139,17 +123,10 @@ export class CredentialsService {
 
 		// This saves us a merge but requires some type casting. These
 		// types are compatible for this case.
-		const updateData = Db.collections.Credentials.create(mergedData as ICredentialsDb);
+		const updateData = this.credentialsRepository.create(mergedData as ICredentialsDb);
 
 		await validateEntity(updateData);
 
-		// Add the date for newly added node access permissions
-		for (const nodeAccess of updateData.nodesAccess) {
-			if (!nodeAccess.date) {
-				nodeAccess.date = new Date();
-			}
-		}
-
 		// Do not overwrite the oauth data else data like the access or refresh token would get lost
 		// everytime anybody changes anything on the credentials even if it is just the name.
 		if (decryptedData.oauthTokenData) {
@@ -159,18 +136,10 @@ export class CredentialsService {
 		return updateData;
 	}
 
-	static createEncryptedData(
-		encryptionKey: string,
-		credentialId: string | null,
-		data: CredentialsEntity,
-	): ICredentialsDb {
-		const credentials = new Credentials(
-			{ id: credentialId, name: data.name },
-			data.type,
-			data.nodesAccess,
-		);
+	createEncryptedData(credentialId: string | null, data: CredentialsEntity): ICredentialsDb {
+		const credentials = new Credentials({ id: credentialId, name: data.name }, data.type);
 
-		credentials.setData(data.data as unknown as ICredentialDataDecryptedObject, encryptionKey);
+		credentials.setData(data.data as unknown as ICredentialDataDecryptedObject);
 
 		const newCredentialData = credentials.getDataToSave() as ICredentialsDb;
 
@@ -180,50 +149,28 @@ export class CredentialsService {
 		return newCredentialData;
 	}
 
-	static async getEncryptionKey(): Promise<string> {
-		try {
-			return await UserSettings.getEncryptionKey();
-		} catch (error) {
-			throw new ResponseHelper.InternalServerError(RESPONSE_ERROR_MESSAGES.NO_ENCRYPTION_KEY);
-		}
-	}
-
-	static async decrypt(
-		encryptionKey: string,
-		credential: CredentialsEntity,
-	): Promise<ICredentialDataDecryptedObject> {
+	decrypt(credential: CredentialsEntity) {
 		const coreCredential = createCredentialsFromCredentialsEntity(credential);
-		const data = coreCredential.getData(encryptionKey);
-
-		return data;
+		return coreCredential.getData();
 	}
 
-	static async update(
-		credentialId: string,
-		newCredentialData: ICredentialsDb,
-	): Promise<ICredentialsDb | null> {
-		await Container.get(ExternalHooks).run('credentials.update', [newCredentialData]);
+	async update(credentialId: string, newCredentialData: ICredentialsDb) {
+		await this.externalHooks.run('credentials.update', [newCredentialData]);
 
 		// Update the credentials in DB
-		await Db.collections.Credentials.update(credentialId, newCredentialData);
+		await this.credentialsRepository.update(credentialId, newCredentialData);
 
 		// We sadly get nothing back from "update". Neither if it updated a record
 		// nor the new value. So query now the updated entry.
-		return Db.collections.Credentials.findOneBy({ id: credentialId });
+		return await this.credentialsRepository.findOneBy({ id: credentialId });
 	}
 
-	static async save(
-		credential: CredentialsEntity,
-		encryptedData: ICredentialsDb,
-		user: User,
-	): Promise<CredentialsEntity> {
+	async save(credential: CredentialsEntity, encryptedData: ICredentialsDb, user: User) {
 		// To avoid side effects
 		const newCredential = new CredentialsEntity();
 		Object.assign(newCredential, credential, encryptedData);
 
-		await Container.get(ExternalHooks).run('credentials.create', [encryptedData]);
-
-		const role = await Container.get(RoleRepository).findCredentialOwnerRoleOrFail();
+		await this.externalHooks.run('credentials.create', [encryptedData]);
 
 		const result = await Db.transaction(async (transactionManager) => {
 			const savedCredential = await transactionManager.save<CredentialsEntity>(newCredential);
@@ -233,7 +180,7 @@ export class CredentialsService {
 			const newSharedCredential = new SharedCredentials();
 
 			Object.assign(newSharedCredential, {
-				role,
+				role: 'credential:owner',
 				user,
 				credentials: savedCredential,
 			});
@@ -242,41 +189,31 @@ export class CredentialsService {
 
 			return savedCredential;
 		});
-		LoggerProxy.verbose('New credential created', {
+		this.logger.verbose('New credential created', {
 			credentialId: newCredential.id,
 			ownerId: user.id,
 		});
 		return result;
 	}
 
-	static async delete(credentials: CredentialsEntity): Promise<void> {
-		await Container.get(ExternalHooks).run('credentials.delete', [credentials.id]);
+	async delete(credentials: CredentialsEntity) {
+		await this.externalHooks.run('credentials.delete', [credentials.id]);
 
-		await Db.collections.Credentials.remove(credentials);
+		await this.credentialsRepository.remove(credentials);
 	}
 
-	static async test(
-		user: User,
-		encryptionKey: string,
-		credentials: ICredentialsDecrypted,
-	): Promise<INodeCredentialTestResult> {
-		const helper = new CredentialsHelper(encryptionKey);
-
-		return helper.testCredentials(user, credentials.type, credentials);
+	async test(user: User, credentials: ICredentialsDecrypted) {
+		return await this.credentialsTester.testCredentials(user, credentials.type, credentials);
 	}
 
 	// Take data and replace all sensitive values with a sentinel value.
 	// This will replace password fields and oauth data.
-	static redact(
-		data: ICredentialDataDecryptedObject,
-		credential: CredentialsEntity,
-	): ICredentialDataDecryptedObject {
+	redact(data: ICredentialDataDecryptedObject, credential: CredentialsEntity) {
 		const copiedData = deepCopy(data);
 
-		const credTypes = Container.get(CredentialTypes);
 		let credType: ICredentialType;
 		try {
-			credType = credTypes.getByName(credential.type);
+			credType = this.credentialTypes.getByName(credential.type);
 		} catch {
 			// This _should_ only happen when testing. If it does happen in
 			// production it means it's either a mangled credential or a
@@ -288,7 +225,7 @@ export class CredentialsService {
 		const getExtendedProps = (type: ICredentialType) => {
 			const props: INodeProperties[] = [];
 			for (const e of type.extends ?? []) {
-				const extendsType = credTypes.getByName(e);
+				const extendsType = this.credentialTypes.getByName(e);
 				const extendedProps = getExtendedProps(extendsType);
 				NodeHelpers.mergeNodeProperties(props, extendedProps);
 			}
@@ -300,28 +237,36 @@ export class CredentialsService {
 		for (const dataKey of Object.keys(copiedData)) {
 			// The frontend only cares that this value isn't falsy.
 			if (dataKey === 'oauthTokenData') {
-				copiedData[dataKey] = CREDENTIAL_BLANKING_VALUE;
+				if (copiedData[dataKey].toString().length > 0) {
+					copiedData[dataKey] = CREDENTIAL_BLANKING_VALUE;
+				} else {
+					copiedData[dataKey] = CREDENTIAL_EMPTY_VALUE;
+				}
 				continue;
 			}
 			const prop = properties.find((v) => v.name === dataKey);
 			if (!prop) {
 				continue;
 			}
-			if (prop.typeOptions?.password) {
-				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
-				copiedData[dataKey] = CREDENTIAL_BLANKING_VALUE;
+			if (
+				prop.typeOptions?.password &&
+				(!(copiedData[dataKey] as string).startsWith('={{') || prop.noDataExpression)
+			) {
+				if (copiedData[dataKey].toString().length > 0) {
+					copiedData[dataKey] = CREDENTIAL_BLANKING_VALUE;
+				} else {
+					copiedData[dataKey] = CREDENTIAL_EMPTY_VALUE;
+				}
 			}
 		}
 
 		return copiedData;
 	}
 
-	// eslint-disable-next-line @typescript-eslint/no-explicit-any
-	private static unredactRestoreValues(unmerged: any, replacement: any) {
+	private unredactRestoreValues(unmerged: any, replacement: any) {
 		// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
 		for (const [key, value] of Object.entries(unmerged)) {
-			// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-			if (value === CREDENTIAL_BLANKING_VALUE) {
+			if (value === CREDENTIAL_BLANKING_VALUE || value === CREDENTIAL_EMPTY_VALUE) {
 				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
 				unmerged[key] = replacement[key];
 			} else if (
@@ -333,7 +278,7 @@ export class CredentialsService {
 				// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 				replacement[key] !== null
 			) {
-				// eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-member-access
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 				this.unredactRestoreValues(value, replacement[key]);
 			}
 		}
@@ -341,10 +286,10 @@ export class CredentialsService {
 
 	// Take unredacted data (probably from the DB) and merge it with
 	// redacted data to create an unredacted version.
-	static unredact(
+	unredact(
 		redactedData: ICredentialDataDecryptedObject,
 		savedData: ICredentialDataDecryptedObject,
-	): ICredentialDataDecryptedObject {
+	) {
 		// Replace any blank sentinel values with their saved version
 		const mergedData = deepCopy(redactedData);
 		this.unredactRestoreValues(mergedData, savedData);
diff --git a/packages/cli/src/credentials/credentials.types.ts b/packages/cli/src/credentials/credentials.types.ts
deleted file mode 100644
index f1f063b7e0801..0000000000000
--- a/packages/cli/src/credentials/credentials.types.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import type { IUser } from 'n8n-workflow';
-import type { ICredentialsDb } from '@/Interfaces';
-
-export interface CredentialWithSharings extends ICredentialsDb {
-	ownedBy?: IUser | null;
-	sharedWith?: IUser[];
-}
diff --git a/packages/cli/src/credentials/oauth2Credential.api.ts b/packages/cli/src/credentials/oauth2Credential.api.ts
deleted file mode 100644
index a8fd84cef7967..0000000000000
--- a/packages/cli/src/credentials/oauth2Credential.api.ts
+++ /dev/null
@@ -1,332 +0,0 @@
-import ClientOAuth2 from 'client-oauth2';
-import Csrf from 'csrf';
-import express from 'express';
-import get from 'lodash.get';
-import omit from 'lodash.omit';
-import set from 'lodash.set';
-import split from 'lodash.split';
-import unset from 'lodash.unset';
-import { Credentials, UserSettings } from 'n8n-core';
-import type {
-	WorkflowExecuteMode,
-	INodeCredentialsDetails,
-	ICredentialsEncrypted,
-} from 'n8n-workflow';
-import { LoggerProxy } from 'n8n-workflow';
-import { resolve as pathResolve } from 'path';
-
-import * as Db from '@/Db';
-import * as ResponseHelper from '@/ResponseHelper';
-import type { ICredentialsDb } from '@/Interfaces';
-import { RESPONSE_ERROR_MESSAGES, TEMPLATES_DIR } from '@/constants';
-import {
-	CredentialsHelper,
-	getCredentialForUser,
-	getCredentialWithoutUser,
-} from '@/CredentialsHelper';
-import { getLogger } from '@/Logger';
-import type { OAuthRequest } from '@/requests';
-import { ExternalHooks } from '@/ExternalHooks';
-import config from '@/config';
-import { getInstanceBaseUrl } from '@/UserManagement/UserManagementHelper';
-import { Container } from 'typedi';
-
-export const oauth2CredentialController = express.Router();
-
-/**
- * Initialize Logger if needed
- */
-oauth2CredentialController.use((req, res, next) => {
-	try {
-		LoggerProxy.getInstance();
-	} catch (error) {
-		LoggerProxy.init(getLogger());
-	}
-	next();
-});
-
-const restEndpoint = config.getEnv('endpoints.rest');
-
-/**
- * GET /oauth2-credential/auth
- *
- * Authorize OAuth Data
- */
-oauth2CredentialController.get(
-	'/auth',
-	ResponseHelper.send(async (req: OAuthRequest.OAuth1Credential.Auth): Promise<string> => {
-		const { id: credentialId } = req.query;
-
-		if (!credentialId) {
-			throw new ResponseHelper.BadRequestError('Required credential ID is missing');
-		}
-
-		const credential = await getCredentialForUser(credentialId, req.user);
-
-		if (!credential) {
-			LoggerProxy.error('Failed to authorize OAuth2 due to lack of permissions', {
-				userId: req.user.id,
-				credentialId,
-			});
-			throw new ResponseHelper.NotFoundError(RESPONSE_ERROR_MESSAGES.NO_CREDENTIAL);
-		}
-
-		let encryptionKey: string;
-		try {
-			encryptionKey = await UserSettings.getEncryptionKey();
-		} catch (error) {
-			throw new ResponseHelper.InternalServerError((error as Error).message);
-		}
-
-		const credentialType = (credential as unknown as ICredentialsEncrypted).type;
-
-		const mode: WorkflowExecuteMode = 'internal';
-		const timezone = config.getEnv('generic.timezone');
-		const credentialsHelper = new CredentialsHelper(encryptionKey);
-		const decryptedDataOriginal = await credentialsHelper.getDecrypted(
-			credential as INodeCredentialsDetails,
-			credentialType,
-			mode,
-			timezone,
-			true,
-		);
-
-		// At some point in the past we saved hidden scopes to credentials (but shouldn't)
-		// Delete scope before applying defaults to make sure new scopes are present on reconnect
-		// Generic Oauth2 API is an exception because it needs to save the scope
-		const genericOAuth2 = ['oAuth2Api', 'googleOAuth2Api', 'microsoftOAuth2Api'];
-		if (
-			decryptedDataOriginal?.scope &&
-			credentialType.includes('OAuth2') &&
-			!genericOAuth2.includes(credentialType)
-		) {
-			delete decryptedDataOriginal.scope;
-		}
-
-		const oauthCredentials = credentialsHelper.applyDefaultsAndOverwrites(
-			decryptedDataOriginal,
-			credentialType,
-			mode,
-			timezone,
-		);
-
-		const token = new Csrf();
-		// Generate a CSRF prevention token and send it as an OAuth2 state string
-		const csrfSecret = token.secretSync();
-		const state = {
-			token: token.create(csrfSecret),
-			cid: req.query.id,
-		};
-		const stateEncodedStr = Buffer.from(JSON.stringify(state)).toString('base64');
-
-		const oAuthOptions: ClientOAuth2.Options = {
-			clientId: get(oauthCredentials, 'clientId') as string,
-			clientSecret: get(oauthCredentials, 'clientSecret', '') as string,
-			accessTokenUri: get(oauthCredentials, 'accessTokenUrl', '') as string,
-			authorizationUri: get(oauthCredentials, 'authUrl', '') as string,
-			redirectUri: `${getInstanceBaseUrl()}/${restEndpoint}/oauth2-credential/callback`,
-			scopes: split(get(oauthCredentials, 'scope', 'openid,') as string, ','),
-			state: stateEncodedStr,
-		};
-
-		await Container.get(ExternalHooks).run('oauth2.authenticate', [oAuthOptions]);
-
-		const oAuthObj = new ClientOAuth2(oAuthOptions);
-
-		// Encrypt the data
-		const credentials = new Credentials(
-			credential as INodeCredentialsDetails,
-			credentialType,
-			(credential as unknown as ICredentialsEncrypted).nodesAccess,
-		);
-		decryptedDataOriginal.csrfSecret = csrfSecret;
-
-		credentials.setData(decryptedDataOriginal, encryptionKey);
-		const newCredentialsData = credentials.getDataToSave() as unknown as ICredentialsDb;
-
-		// Add special database related data
-		newCredentialsData.updatedAt = new Date();
-
-		// Update the credentials in DB
-		await Db.collections.Credentials.update(req.query.id, newCredentialsData);
-
-		const authQueryParameters = get(oauthCredentials, 'authQueryParameters', '') as string;
-		let returnUri = oAuthObj.code.getUri();
-
-		// if scope uses comma, change it as the library always return then with spaces
-		if ((get(oauthCredentials, 'scope') as string).includes(',')) {
-			const data = returnUri.split('?')[1];
-			const scope = get(oauthCredentials, 'scope') as string;
-			const percentEncoded = [data, `scope=${encodeURIComponent(scope)}`].join('&');
-			returnUri = `${get(oauthCredentials, 'authUrl', '') as string}?${percentEncoded}`;
-		}
-
-		if (authQueryParameters) {
-			returnUri += `&${authQueryParameters}`;
-		}
-
-		LoggerProxy.verbose('OAuth2 authentication successful for new credential', {
-			userId: req.user.id,
-			credentialId,
-		});
-		return returnUri;
-	}),
-);
-
-const renderCallbackError = (res: express.Response, errorMessage: string) =>
-	res.render('oauth-error-callback', { error: { message: errorMessage } });
-
-/**
- * GET /oauth2-credential/callback
- *
- * Verify and store app code. Generate access tokens and store for respective credential.
- */
-
-oauth2CredentialController.get(
-	'/callback',
-	async (req: OAuthRequest.OAuth2Credential.Callback, res: express.Response) => {
-		try {
-			// realmId it's currently just use for the quickbook OAuth2 flow
-			const { code, state: stateEncoded } = req.query;
-
-			if (!code || !stateEncoded) {
-				return renderCallbackError(
-					res,
-					`Insufficient parameters for OAuth2 callback. Received following query parameters: ${JSON.stringify(
-						req.query,
-					)}`,
-				);
-			}
-
-			let state;
-			try {
-				state = JSON.parse(Buffer.from(stateEncoded, 'base64').toString()) as {
-					cid: string;
-					token: string;
-				};
-			} catch (error) {
-				return renderCallbackError(res, 'Invalid state format returned');
-			}
-
-			const credential = await getCredentialWithoutUser(state.cid);
-
-			if (!credential) {
-				const errorMessage = 'OAuth2 callback failed because of insufficient permissions';
-				LoggerProxy.error(errorMessage, {
-					userId: req.user?.id,
-					credentialId: state.cid,
-				});
-				return renderCallbackError(res, errorMessage);
-			}
-
-			const encryptionKey = await UserSettings.getEncryptionKey();
-
-			const mode: WorkflowExecuteMode = 'internal';
-			const timezone = config.getEnv('generic.timezone');
-			const credentialsHelper = new CredentialsHelper(encryptionKey);
-			const decryptedDataOriginal = await credentialsHelper.getDecrypted(
-				credential as INodeCredentialsDetails,
-				(credential as unknown as ICredentialsEncrypted).type,
-				mode,
-				timezone,
-				true,
-			);
-			const oauthCredentials = credentialsHelper.applyDefaultsAndOverwrites(
-				decryptedDataOriginal,
-				(credential as unknown as ICredentialsEncrypted).type,
-				mode,
-				timezone,
-			);
-
-			const token = new Csrf();
-			if (
-				decryptedDataOriginal.csrfSecret === undefined ||
-				!token.verify(decryptedDataOriginal.csrfSecret as string, state.token)
-			) {
-				const errorMessage = 'The OAuth2 callback state is invalid!';
-				LoggerProxy.debug(errorMessage, {
-					userId: req.user?.id,
-					credentialId: state.cid,
-				});
-				return renderCallbackError(res, errorMessage);
-			}
-
-			let options = {};
-
-			const oAuth2Parameters = {
-				clientId: get(oauthCredentials, 'clientId') as string,
-				clientSecret: get(oauthCredentials, 'clientSecret', '') as string | undefined,
-				accessTokenUri: get(oauthCredentials, 'accessTokenUrl', '') as string,
-				authorizationUri: get(oauthCredentials, 'authUrl', '') as string,
-				redirectUri: `${getInstanceBaseUrl()}/${restEndpoint}/oauth2-credential/callback`,
-				scopes: split(get(oauthCredentials, 'scope', 'openid,') as string, ','),
-			};
-
-			if ((get(oauthCredentials, 'authentication', 'header') as string) === 'body') {
-				options = {
-					body: {
-						client_id: get(oauthCredentials, 'clientId') as string,
-						client_secret: get(oauthCredentials, 'clientSecret', '') as string,
-					},
-				};
-				delete oAuth2Parameters.clientSecret;
-			}
-
-			await Container.get(ExternalHooks).run('oauth2.callback', [oAuth2Parameters]);
-
-			const oAuthObj = new ClientOAuth2(oAuth2Parameters);
-
-			const queryParameters = req.originalUrl.split('?').splice(1, 1).join('');
-
-			const oauthToken = await oAuthObj.code.getToken(
-				`${oAuth2Parameters.redirectUri}?${queryParameters}`,
-				options,
-			);
-
-			if (Object.keys(req.query).length > 2) {
-				set(oauthToken.data, 'callbackQueryString', omit(req.query, 'state', 'code'));
-			}
-
-			if (oauthToken === undefined) {
-				const errorMessage = 'Unable to get OAuth2 access tokens!';
-				LoggerProxy.error(errorMessage, {
-					userId: req.user?.id,
-					credentialId: state.cid,
-				});
-				return renderCallbackError(res, errorMessage);
-			}
-
-			if (decryptedDataOriginal.oauthTokenData) {
-				// Only overwrite supplied data as some providers do for example just return the
-				// refresh_token on the very first request and not on subsequent ones.
-				Object.assign(decryptedDataOriginal.oauthTokenData, oauthToken.data);
-			} else {
-				// No data exists so simply set
-				decryptedDataOriginal.oauthTokenData = oauthToken.data;
-			}
-
-			// eslint-disable-next-line @typescript-eslint/no-unsafe-call
-			unset(decryptedDataOriginal, 'csrfSecret');
-
-			const credentials = new Credentials(
-				credential as INodeCredentialsDetails,
-				(credential as unknown as ICredentialsEncrypted).type,
-				(credential as unknown as ICredentialsEncrypted).nodesAccess,
-			);
-			credentials.setData(decryptedDataOriginal, encryptionKey);
-			const newCredentialsData = credentials.getDataToSave() as unknown as ICredentialsDb;
-			// Add special database related data
-			newCredentialsData.updatedAt = new Date();
-			// Save the credentials in DB
-			await Db.collections.Credentials.update(state.cid, newCredentialsData);
-			LoggerProxy.verbose('OAuth2 callback successful for new credential', {
-				userId: req.user?.id,
-				credentialId: state.cid,
-			});
-
-			return res.sendFile(pathResolve(TEMPLATES_DIR, 'oauth-callback.html'));
-		} catch (error) {
-			return renderCallbackError(res, (error as Error).message);
-		}
-	},
-);
diff --git a/packages/cli/src/crons/retryWorkflows.ts b/packages/cli/src/crons/retryWorkflows.ts
new file mode 100644
index 0000000000000..101cb5361bece
--- /dev/null
+++ b/packages/cli/src/crons/retryWorkflows.ts
@@ -0,0 +1,150 @@
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
+import { ExecutionService } from '../executions/execution.service';
+
+import { LessThanOrEqual } from '@n8n/typeorm';
+import type { IWorkflowBase } from 'n8n-workflow';
+import { Workflow } from 'n8n-workflow';
+import { NodeTypes } from '@/NodeTypes';
+import { Container } from 'typedi';
+import { getRunData } from '../WorkflowExecuteAdditionalData';
+import type { IExecutionDb, IExecutionResponse } from '@/Interfaces';
+import * as ResponseHelper from '@/ResponseHelper';
+import { ResumeWorkflowTimerRepository } from '@/databases/repositories/resumeWorkflowTimer.repository';
+import { SharedWorkflowRepository } from '@/databases/repositories/sharedWorkflow.repository';
+import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
+import { UserRepository } from '@/databases/repositories/user.repository';
+import { getSharedWorkflowIds } from '../WorkflowHelpers';
+import type { ExecutionRequest } from '../executions/execution.types';
+
+const getWorkflowOwner = async (workflowId: string) => {
+	const sharing = await Container.get(SharedWorkflowRepository).findOneBy({
+		workflowId,
+		role: 'workflow:owner',
+	});
+
+	const user = await Container.get(UserRepository).findOneBy({ id: sharing?.userId });
+	return user;
+};
+
+const getExecutionId = async (
+	workflowId: string,
+	nodeId: string,
+	userId: string,
+	resultData?: any,
+) => {
+	// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+	let workflow = {} as IWorkflowBase;
+    workflow = await Container.get(WorkflowRepository).findOneBy({ id: workflowId }) as IWorkflowBase;	
+	const nodeTypes = Container.get(NodeTypes);
+	if (!workflow) return null;
+	const nodes = workflow.nodes;
+	console.log('nodes');
+	console.dir(nodes, { depth: null });
+	let waitNode = null;
+	for (const node of nodes) {
+		if (node.id === nodeId) {
+			waitNode = node;
+			break;
+		}
+	}
+	if (!waitNode) return null;
+	const workflowInstance = new Workflow({
+		id: workflow.id,
+		name: workflow.name,
+		nodes: workflow.nodes,
+		connections: workflow.connections,
+		active: workflow.active,
+		nodeTypes,
+		staticData: workflow.staticData,
+		settings: workflow.settings,
+	});
+	const destinationNodes = workflowInstance.getConnectedNodes(
+		workflowInstance.connectionsByDestinationNode,
+		waitNode.name,
+	);
+	console.dir(destinationNodes);
+	const sourceNodes = workflowInstance.getConnectedNodes(
+		workflowInstance.connectionsBySourceNode,
+		waitNode.name,
+	);
+	console.dir(sourceNodes);
+	const nextNodeName = sourceNodes.reverse()[0];
+	const nextNode = workflowInstance.getNode(nextNodeName);
+	const connectedNodes = [...destinationNodes, ...sourceNodes, waitNode.name];
+	for (const node of nodes) {
+		if (!connectedNodes.includes(node.name)) {
+			workflow.nodes = workflow.nodes.filter((no) => no.name !== node.name);
+			delete workflow.connections[node.name];
+		}
+	}
+
+	let runData;
+	if (resultData) {
+		runData = await getRunData(workflow, userId, undefined, nextNode, true, resultData);
+	} else {
+		runData = await getRunData(workflow, userId, undefined, nextNode, true);
+	}
+	const fullExecutionData: IExecutionDb = {
+		id: '', // mustafa
+		workflowId,
+		data: runData.executionData!,
+		mode: runData.executionMode,
+		finished: false,
+		startedAt: new Date(),
+		workflowData: runData.workflowData,
+		status: 'running',
+	};
+
+	if (runData.retryOf !== undefined) {
+		fullExecutionData.retryOf = runData.retryOf.toString();
+	}
+
+	console.dir(fullExecutionData, { depth: null });
+
+	const execution = ResponseHelper.flattenExecutionData(fullExecutionData);
+
+	return execution as IExecutionResponse;
+};
+
+export async function retryWorkflows() {
+	const resumeWorkflowTimerRecords = await Container.get(ResumeWorkflowTimerRepository).findBy({
+		resumptionTime: LessThanOrEqual(new Date(Date.now() + 60 * 1000)),
+	});
+
+	const promises: Array<Promise<boolean>> = [];
+
+	for (const resumeWorkflowTimerRecord of resumeWorkflowTimerRecords) {
+		// TODO: Get new execution id
+		const workflowId = resumeWorkflowTimerRecord.executionId;
+		const nodeId = resumeWorkflowTimerRecord.waitNodeId;
+		const resultData = resumeWorkflowTimerRecord.resultData;
+		const owner = await getWorkflowOwner(workflowId);
+		const execution = await getExecutionId(workflowId, nodeId, owner!.id, resultData);
+
+		const executionPayload = {
+			user: owner,
+			params: {
+				id: '',
+			},
+			body: {
+				loadWorkflow: false,
+			},
+		} as ExecutionRequest.Retry;
+
+		const executionService = Container.get(ExecutionService);
+		const sharedWorkflowIds = await getSharedWorkflowIds(owner!);
+
+		promises.push(
+			executionService.retry(
+				executionPayload,
+				sharedWorkflowIds,
+				resumeWorkflowTimerRecord.id,
+				execution!,
+			),
+		);
+	}
+
+	await Promise.allSettled(promises);
+}
diff --git a/packages/cli/src/curlconverter.d.ts b/packages/cli/src/curlconverter.d.ts
index f55cf6c9683b4..8808f9b5c7ee3 100644
--- a/packages/cli/src/curlconverter.d.ts
+++ b/packages/cli/src/curlconverter.d.ts
@@ -1,5 +1,3 @@
-/* eslint-disable @typescript-eslint/naming-convention */
-/* eslint-disable import/no-default-export */
 declare module 'curlconverter' {
 	export function toJsonString(data: string): string;
 }
diff --git a/packages/cli/src/databases/config.ts b/packages/cli/src/databases/config.ts
index 739c2138e3bed..7db8e1b9558ca 100644
--- a/packages/cli/src/databases/config.ts
+++ b/packages/cli/src/databases/config.ts
@@ -1,44 +1,42 @@
 import path from 'path';
-import type { SqliteConnectionOptions } from 'typeorm/driver/sqlite/SqliteConnectionOptions';
-import type { PostgresConnectionOptions } from 'typeorm/driver/postgres/PostgresConnectionOptions';
-import type { MysqlConnectionOptions } from 'typeorm/driver/mysql/MysqlConnectionOptions';
-import { UserSettings } from 'n8n-core';
+import { Container } from 'typedi';
+import type { TlsOptions } from 'tls';
+import type { DataSourceOptions, LoggerOptions } from '@n8n/typeorm';
+import type { SqliteConnectionOptions } from '@n8n/typeorm/driver/sqlite/SqliteConnectionOptions';
+import type { SqlitePooledConnectionOptions } from '@n8n/typeorm/driver/sqlite-pooled/SqlitePooledConnectionOptions';
+import type { PostgresConnectionOptions } from '@n8n/typeorm/driver/postgres/PostgresConnectionOptions';
+import type { MysqlConnectionOptions } from '@n8n/typeorm/driver/mysql/MysqlConnectionOptions';
+import { InstanceSettings } from 'n8n-core';
+import { ApplicationError } from 'n8n-workflow';
 
+import config from '@/config';
 import { entities } from './entities';
 import { mysqlMigrations } from './migrations/mysqldb';
 import { postgresMigrations } from './migrations/postgresdb';
 import { sqliteMigrations } from './migrations/sqlite';
-import type { DatabaseType } from '@/Interfaces';
-import config from '@/config';
-
-const entitiesDir = path.resolve(__dirname, 'entities');
 
-const getDBConnectionOptions = (dbType: DatabaseType) => {
+const getCommonOptions = () => {
 	const entityPrefix = config.getEnv('database.tablePrefix');
-	const migrationsDir = path.resolve(__dirname, 'migrations', dbType);
-	const configDBType = dbType === 'mariadb' ? 'mysqldb' : dbType;
-	const connectionDetails =
-		configDBType === 'sqlite'
-			? {
-					database: path.resolve(
-						UserSettings.getUserN8nFolderPath(),
-						config.getEnv('database.sqlite.database'),
-					),
-			  }
-			: {
-					database: config.getEnv(`database.${configDBType}.database`),
-					username: config.getEnv(`database.${configDBType}.user`),
-					password: config.getEnv(`database.${configDBType}.password`),
-					host: config.getEnv(`database.${configDBType}.host`),
-					port: config.getEnv(`database.${configDBType}.port`),
-			  };
+	const maxQueryExecutionTime = config.getEnv('database.logging.maxQueryExecutionTime');
+
+	let loggingOption: LoggerOptions = config.getEnv('database.logging.enabled');
+	if (loggingOption) {
+		const optionsString = config.getEnv('database.logging.options').replace(/\s+/g, '');
+
+		if (optionsString === 'all') {
+			loggingOption = optionsString;
+		} else {
+			loggingOption = optionsString.split(',') as LoggerOptions;
+		}
+	}
 	return {
 		entityPrefix,
 		entities: Object.values(entities),
-		migrationsRun: false,
 		migrationsTableName: `${entityPrefix}migrations`,
-		cli: { entitiesDir, migrationsDir },
-		...connectionDetails,
+		migrationsRun: false,
+		synchronize: false,
+		maxQueryExecutionTime,
+		logging: loggingOption,
 	};
 };
 
@@ -50,27 +48,80 @@ export const getOptionOverrides = (dbType: 'postgresdb' | 'mysqldb') => ({
 	password: config.getEnv(`database.${dbType}.password`),
 });
 
-export const getSqliteConnectionOptions = (): SqliteConnectionOptions => ({
-	type: 'sqlite',
-	...getDBConnectionOptions('sqlite'),
-	migrations: sqliteMigrations,
-});
+const getSqliteConnectionOptions = (): SqliteConnectionOptions | SqlitePooledConnectionOptions => {
+	const poolSize = config.getEnv('database.sqlite.poolSize');
+	const commonOptions = {
+		...getCommonOptions(),
+		database: path.resolve(
+			Container.get(InstanceSettings).n8nFolder,
+			config.getEnv('database.sqlite.database'),
+		),
+		migrations: sqliteMigrations,
+	};
+	if (poolSize > 0) {
+		return {
+			type: 'sqlite-pooled',
+			poolSize,
+			enableWAL: true,
+			acquireTimeout: 60_000,
+			destroyTimeout: 5_000,
+			...commonOptions,
+		};
+	} else {
+		return {
+			type: 'sqlite',
+			enableWAL: config.getEnv('database.sqlite.enableWAL'),
+			...commonOptions,
+		};
+	}
+};
 
-export const getPostgresConnectionOptions = (): PostgresConnectionOptions => ({
-	type: 'postgres',
-	...getDBConnectionOptions('postgresdb'),
-	schema: config.getEnv('database.postgresdb.schema'),
-	migrations: postgresMigrations,
-});
+const getPostgresConnectionOptions = (): PostgresConnectionOptions => {
+	const sslCa = config.getEnv('database.postgresdb.ssl.ca');
+	const sslCert = config.getEnv('database.postgresdb.ssl.cert');
+	const sslKey = config.getEnv('database.postgresdb.ssl.key');
+	const sslRejectUnauthorized = config.getEnv('database.postgresdb.ssl.rejectUnauthorized');
 
-export const getMysqlConnectionOptions = (): MysqlConnectionOptions => ({
-	type: 'mysql',
-	...getDBConnectionOptions('mysqldb'),
-	migrations: mysqlMigrations,
-});
+	let ssl: TlsOptions | boolean = config.getEnv('database.postgresdb.ssl.enabled');
+	if (sslCa !== '' || sslCert !== '' || sslKey !== '' || !sslRejectUnauthorized) {
+		ssl = {
+			ca: sslCa || undefined,
+			cert: sslCert || undefined,
+			key: sslKey || undefined,
+			rejectUnauthorized: sslRejectUnauthorized,
+		};
+	}
 
-export const getMariaDBConnectionOptions = (): MysqlConnectionOptions => ({
-	type: 'mariadb',
-	...getDBConnectionOptions('mysqldb'),
+	return {
+		type: 'postgres',
+		...getCommonOptions(),
+		...getOptionOverrides('postgresdb'),
+		schema: config.getEnv('database.postgresdb.schema'),
+		poolSize: config.getEnv('database.postgresdb.poolSize'),
+		migrations: postgresMigrations,
+		ssl,
+	};
+};
+
+const getMysqlConnectionOptions = (dbType: 'mariadb' | 'mysqldb'): MysqlConnectionOptions => ({
+	type: dbType === 'mysqldb' ? 'mysql' : 'mariadb',
+	...getCommonOptions(),
+	...getOptionOverrides('mysqldb'),
 	migrations: mysqlMigrations,
+	timezone: 'Z', // set UTC as default
 });
+
+export function getConnectionOptions(): DataSourceOptions {
+	const dbType = config.getEnv('database.type');
+	switch (dbType) {
+		case 'sqlite':
+			return getSqliteConnectionOptions();
+		case 'postgresdb':
+			return getPostgresConnectionOptions();
+		case 'mariadb':
+		case 'mysqldb':
+			return getMysqlConnectionOptions(dbType);
+		default:
+			throw new ApplicationError('Database type currently not supported', { extra: { dbType } });
+	}
+}
diff --git a/packages/cli/src/databases/dsl/Column.ts b/packages/cli/src/databases/dsl/Column.ts
new file mode 100644
index 0000000000000..359ffd65af0d7
--- /dev/null
+++ b/packages/cli/src/databases/dsl/Column.ts
@@ -0,0 +1,127 @@
+import type { Driver, TableColumnOptions } from '@n8n/typeorm';
+
+export class Column {
+	private type: 'int' | 'boolean' | 'varchar' | 'text' | 'json' | 'timestamp' | 'uuid';
+
+	private isGenerated = false;
+
+	private isNullable = true;
+
+	private isPrimary = false;
+
+	private length: number | 'auto';
+
+	private defaultValue: unknown;
+
+	constructor(private name: string) {}
+
+	get bool() {
+		this.type = 'boolean';
+		return this;
+	}
+
+	get int() {
+		this.type = 'int';
+		return this;
+	}
+
+	varchar(length?: number) {
+		this.type = 'varchar';
+		this.length = length ?? 'auto';
+		return this;
+	}
+
+	get text() {
+		this.type = 'text';
+		return this;
+	}
+
+	get json() {
+		this.type = 'json';
+		return this;
+	}
+
+	timestamp(msPrecision = 3) {
+		this.type = 'timestamp';
+		this.length = msPrecision ?? 'auto';
+		return this;
+	}
+
+	get uuid() {
+		this.type = 'uuid';
+		return this;
+	}
+
+	get primary() {
+		this.isPrimary = true;
+		return this;
+	}
+
+	get notNull() {
+		this.isNullable = false;
+		return this;
+	}
+
+	default(value: unknown) {
+		this.defaultValue = value;
+		return this;
+	}
+
+	get autoGenerate() {
+		this.isGenerated = true;
+		return this;
+	}
+
+	// eslint-disable-next-line complexity
+	toOptions(driver: Driver): TableColumnOptions {
+		const { name, type, isNullable, isPrimary, isGenerated, length } = this;
+		const isMysql = 'mysql' in driver;
+		const isPostgres = 'postgres' in driver;
+		const isSqlite = 'sqlite' in driver;
+
+		const options: TableColumnOptions = {
+			name,
+			isNullable,
+			isPrimary,
+			type,
+		};
+
+		if (options.type === 'int' && isSqlite) {
+			options.type = 'integer';
+		} else if (type === 'boolean' && isMysql) {
+			options.type = 'tinyint(1)';
+		} else if (type === 'timestamp') {
+			options.type = isPostgres ? 'timestamptz' : 'datetime';
+		} else if (type === 'json' && isSqlite) {
+			options.type = 'text';
+		} else if (type === 'uuid' && isMysql) {
+			// mysql does not support uuid type
+			options.type = 'varchar(36)';
+		}
+
+		if ((type === 'varchar' || type === 'timestamp') && length !== 'auto') {
+			options.type = `${options.type}(${length})`;
+		}
+
+		if (isGenerated) {
+			options.isGenerated = true;
+			options.generationStrategy = type === 'uuid' ? 'uuid' : 'increment';
+		}
+
+		if (isPrimary || isGenerated) {
+			options.isNullable = false;
+		}
+
+		if (this.defaultValue !== undefined) {
+			if (type === 'timestamp' && this.defaultValue === 'NOW()') {
+				options.default = isSqlite
+					? "STRFTIME('%Y-%m-%d %H:%M:%f', 'NOW')"
+					: 'CURRENT_TIMESTAMP(3)';
+			} else {
+				options.default = this.defaultValue;
+			}
+		}
+
+		return options;
+	}
+}
diff --git a/packages/cli/src/databases/dsl/Indices.ts b/packages/cli/src/databases/dsl/Indices.ts
new file mode 100644
index 0000000000000..a5ec95e1012ed
--- /dev/null
+++ b/packages/cli/src/databases/dsl/Indices.ts
@@ -0,0 +1,57 @@
+import type { QueryRunner } from '@n8n/typeorm';
+import { TableIndex } from '@n8n/typeorm';
+import LazyPromise from 'p-lazy';
+
+abstract class IndexOperation extends LazyPromise<void> {
+	abstract execute(queryRunner: QueryRunner): Promise<void>;
+
+	get fullTableName() {
+		return [this.tablePrefix, this.tableName].join('');
+	}
+
+	get fullIndexName() {
+		return ['IDX', `${this.tablePrefix}${this.tableName}`, ...this.columnNames].join('_');
+	}
+
+	constructor(
+		protected tableName: string,
+		protected columnNames: string[],
+		protected tablePrefix: string,
+		queryRunner: QueryRunner,
+		protected customIndexName?: string,
+	) {
+		super((resolve) => {
+			void this.execute(queryRunner).then(resolve);
+		});
+	}
+}
+
+export class CreateIndex extends IndexOperation {
+	constructor(
+		tableName: string,
+		columnNames: string[],
+		protected isUnique: boolean,
+		tablePrefix: string,
+		queryRunner: QueryRunner,
+		customIndexName?: string,
+	) {
+		super(tableName, columnNames, tablePrefix, queryRunner, customIndexName);
+	}
+
+	async execute(queryRunner: QueryRunner) {
+		const { columnNames, isUnique } = this;
+		return await queryRunner.createIndex(
+			this.fullTableName,
+			new TableIndex({ name: this.customIndexName ?? this.fullIndexName, columnNames, isUnique }),
+		);
+	}
+}
+
+export class DropIndex extends IndexOperation {
+	async execute(queryRunner: QueryRunner) {
+		return await queryRunner.dropIndex(
+			this.fullTableName,
+			this.customIndexName ?? this.fullIndexName,
+		);
+	}
+}
diff --git a/packages/cli/src/databases/dsl/Table.ts b/packages/cli/src/databases/dsl/Table.ts
new file mode 100644
index 0000000000000..08cea8d29d40e
--- /dev/null
+++ b/packages/cli/src/databases/dsl/Table.ts
@@ -0,0 +1,199 @@
+import type { TableForeignKeyOptions, TableIndexOptions, QueryRunner } from '@n8n/typeorm';
+import { Table, TableColumn, TableForeignKey } from '@n8n/typeorm';
+import LazyPromise from 'p-lazy';
+import { Column } from './Column';
+import { ApplicationError } from 'n8n-workflow';
+
+abstract class TableOperation<R = void> extends LazyPromise<R> {
+	abstract execute(queryRunner: QueryRunner): Promise<R>;
+
+	constructor(
+		protected tableName: string,
+		protected prefix: string,
+		queryRunner: QueryRunner,
+	) {
+		super((resolve, reject) => {
+			void this.execute(queryRunner).then(resolve).catch(reject);
+		});
+	}
+}
+
+export class CreateTable extends TableOperation {
+	private columns: Column[] = [];
+
+	private indices = new Set<TableIndexOptions>();
+
+	private foreignKeys = new Set<TableForeignKeyOptions>();
+
+	withColumns(...columns: Column[]) {
+		this.columns.push(...columns);
+		return this;
+	}
+
+	get withTimestamps() {
+		this.columns.push(
+			new Column('createdAt').timestamp().notNull.default('NOW()'),
+			new Column('updatedAt').timestamp().notNull.default('NOW()'),
+		);
+		return this;
+	}
+
+	withIndexOn(columnName: string | string[], isUnique = false) {
+		const columnNames = Array.isArray(columnName) ? columnName : [columnName];
+		this.indices.add({ columnNames, isUnique });
+		return this;
+	}
+
+	withForeignKey(
+		columnName: string,
+		ref: { tableName: string; columnName: string; onDelete?: 'CASCADE'; onUpdate?: 'CASCADE' },
+	) {
+		const foreignKey: TableForeignKeyOptions = {
+			columnNames: [columnName],
+			referencedTableName: `${this.prefix}${ref.tableName}`,
+			referencedColumnNames: [ref.columnName],
+		};
+		if (ref.onDelete) foreignKey.onDelete = ref.onDelete;
+		if (ref.onUpdate) foreignKey.onUpdate = ref.onUpdate;
+		this.foreignKeys.add(foreignKey);
+		return this;
+	}
+
+	async execute(queryRunner: QueryRunner) {
+		const { driver } = queryRunner.connection;
+		const { columns, tableName: name, prefix, indices, foreignKeys } = this;
+		return await queryRunner.createTable(
+			new Table({
+				name: `${prefix}${name}`,
+				columns: columns.map((c) => c.toOptions(driver)),
+				...(indices.size ? { indices: [...indices] } : {}),
+				...(foreignKeys.size ? { foreignKeys: [...foreignKeys] } : {}),
+				...('mysql' in driver ? { engine: 'InnoDB' } : {}),
+			}),
+			true,
+		);
+	}
+}
+
+export class DropTable extends TableOperation {
+	async execute(queryRunner: QueryRunner) {
+		const { tableName: name, prefix } = this;
+		return await queryRunner.dropTable(`${prefix}${name}`, true);
+	}
+}
+
+export class AddColumns extends TableOperation {
+	constructor(
+		tableName: string,
+		protected columns: Column[],
+		prefix: string,
+		queryRunner: QueryRunner,
+	) {
+		super(tableName, prefix, queryRunner);
+	}
+
+	async execute(queryRunner: QueryRunner) {
+		const { driver } = queryRunner.connection;
+		const { tableName, prefix, columns } = this;
+		return await queryRunner.addColumns(
+			`${prefix}${tableName}`,
+			columns.map((c) => new TableColumn(c.toOptions(driver))),
+		);
+	}
+}
+
+export class DropColumns extends TableOperation {
+	constructor(
+		tableName: string,
+		protected columnNames: string[],
+		prefix: string,
+		queryRunner: QueryRunner,
+	) {
+		super(tableName, prefix, queryRunner);
+	}
+
+	async execute(queryRunner: QueryRunner) {
+		const { tableName, prefix, columnNames } = this;
+		return await queryRunner.dropColumns(`${prefix}${tableName}`, columnNames);
+	}
+}
+
+abstract class ForeignKeyOperation extends TableOperation {
+	protected foreignKey: TableForeignKey;
+
+	constructor(
+		tableName: string,
+		columnName: string,
+		[referencedTableName, referencedColumnName]: [string, string],
+		prefix: string,
+		queryRunner: QueryRunner,
+		customConstraintName?: string,
+	) {
+		super(tableName, prefix, queryRunner);
+
+		this.foreignKey = new TableForeignKey({
+			name: customConstraintName,
+			columnNames: [columnName],
+			referencedTableName: `${prefix}${referencedTableName}`,
+			referencedColumnNames: [referencedColumnName],
+		});
+	}
+}
+
+export class AddForeignKey extends ForeignKeyOperation {
+	async execute(queryRunner: QueryRunner) {
+		const { tableName, prefix } = this;
+		return await queryRunner.createForeignKey(`${prefix}${tableName}`, this.foreignKey);
+	}
+}
+
+export class DropForeignKey extends ForeignKeyOperation {
+	async execute(queryRunner: QueryRunner) {
+		const { tableName, prefix } = this;
+		return await queryRunner.dropForeignKey(`${prefix}${tableName}`, this.foreignKey);
+	}
+}
+
+class ModifyNotNull extends TableOperation {
+	constructor(
+		tableName: string,
+		protected columnName: string,
+		protected isNullable: boolean,
+		prefix: string,
+		queryRunner: QueryRunner,
+	) {
+		super(tableName, prefix, queryRunner);
+	}
+
+	async execute(queryRunner: QueryRunner) {
+		const { tableName, prefix, columnName, isNullable } = this;
+		const table = await queryRunner.getTable(`${prefix}${tableName}`);
+		if (!table) throw new ApplicationError('No table found', { extra: { tableName } });
+		const oldColumn = table.findColumnByName(columnName)!;
+		const newColumn = oldColumn.clone();
+		newColumn.isNullable = isNullable;
+		return await queryRunner.changeColumn(table, oldColumn, newColumn);
+	}
+}
+
+export class AddNotNull extends ModifyNotNull {
+	constructor(
+		tableName: string,
+		protected columnName: string,
+		prefix: string,
+		queryRunner: QueryRunner,
+	) {
+		super(tableName, columnName, false, prefix, queryRunner);
+	}
+}
+
+export class DropNotNull extends ModifyNotNull {
+	constructor(
+		tableName: string,
+		protected columnName: string,
+		prefix: string,
+		queryRunner: QueryRunner,
+	) {
+		super(tableName, columnName, true, prefix, queryRunner);
+	}
+}
diff --git a/packages/cli/src/databases/dsl/index.ts b/packages/cli/src/databases/dsl/index.ts
new file mode 100644
index 0000000000000..bb5ef859ecf8f
--- /dev/null
+++ b/packages/cli/src/databases/dsl/index.ts
@@ -0,0 +1,74 @@
+import type { QueryRunner } from '@n8n/typeorm';
+import { Column } from './Column';
+import {
+	AddColumns,
+	AddForeignKey,
+	AddNotNull,
+	CreateTable,
+	DropColumns,
+	DropForeignKey,
+	DropNotNull,
+	DropTable,
+} from './Table';
+import { CreateIndex, DropIndex } from './Indices';
+
+export const createSchemaBuilder = (tablePrefix: string, queryRunner: QueryRunner) => ({
+	column: (name: string) => new Column(name),
+	/* eslint-disable @typescript-eslint/promise-function-async */
+	// NOTE: Do not add `async` to these functions, as that messes up the lazy-evaluation of LazyPromise
+	createTable: (tableName: string) => new CreateTable(tableName, tablePrefix, queryRunner),
+
+	dropTable: (tableName: string) => new DropTable(tableName, tablePrefix, queryRunner),
+
+	addColumns: (tableName: string, columns: Column[]) =>
+		new AddColumns(tableName, columns, tablePrefix, queryRunner),
+	dropColumns: (tableName: string, columnNames: string[]) =>
+		new DropColumns(tableName, columnNames, tablePrefix, queryRunner),
+
+	createIndex: (
+		tableName: string,
+		columnNames: string[],
+		isUnique = false,
+		customIndexName?: string,
+	) => new CreateIndex(tableName, columnNames, isUnique, tablePrefix, queryRunner, customIndexName),
+
+	dropIndex: (tableName: string, columnNames: string[], customIndexName?: string) =>
+		new DropIndex(tableName, columnNames, tablePrefix, queryRunner, customIndexName),
+
+	addForeignKey: (
+		tableName: string,
+		columnName: string,
+		reference: [string, string],
+		customConstraintName?: string,
+	) =>
+		new AddForeignKey(
+			tableName,
+			columnName,
+			reference,
+			tablePrefix,
+			queryRunner,
+			customConstraintName,
+		),
+
+	dropForeignKey: (
+		tableName: string,
+		columnName: string,
+		reference: [string, string],
+		customConstraintName?: string,
+	) =>
+		new DropForeignKey(
+			tableName,
+			columnName,
+			reference,
+			tablePrefix,
+			queryRunner,
+			customConstraintName,
+		),
+
+	addNotNull: (tableName: string, columnName: string) =>
+		new AddNotNull(tableName, columnName, tablePrefix, queryRunner),
+	dropNotNull: (tableName: string, columnName: string) =>
+		new DropNotNull(tableName, columnName, tablePrefix, queryRunner),
+
+	/* eslint-enable */
+});
diff --git a/packages/cli/src/databases/entities/AbstractEntity.ts b/packages/cli/src/databases/entities/AbstractEntity.ts
index e12933572ce4a..48ed0079c5b34 100644
--- a/packages/cli/src/databases/entities/AbstractEntity.ts
+++ b/packages/cli/src/databases/entities/AbstractEntity.ts
@@ -1,6 +1,14 @@
-import { BeforeUpdate, CreateDateColumn, UpdateDateColumn } from 'typeorm';
-import { IsDate, IsOptional } from 'class-validator';
+import type { ColumnOptions } from '@n8n/typeorm';
+import {
+	BeforeInsert,
+	BeforeUpdate,
+	CreateDateColumn,
+	PrimaryColumn,
+	UpdateDateColumn,
+} from '@n8n/typeorm';
 import config from '@/config';
+import type { Class } from 'n8n-core';
+import { generateNanoId } from '../utils/generators';
 
 const dbType = config.getEnv('database.type');
 
@@ -14,26 +22,45 @@ const timestampSyntax = {
 export const jsonColumnType = dbType === 'sqlite' ? 'simple-json' : 'json';
 export const datetimeColumnType = dbType === 'postgresdb' ? 'timestamptz' : 'datetime';
 
-export abstract class AbstractEntity {
-	@CreateDateColumn({
-		precision: 3,
-		default: () => timestampSyntax,
-	})
-	@IsOptional() // ignored by validation because set at DB level
-	@IsDate()
-	createdAt: Date;
-
-	@UpdateDateColumn({
-		precision: 3,
-		default: () => timestampSyntax,
-		onUpdate: timestampSyntax,
-	})
-	@IsOptional() // ignored by validation because set at DB level
-	@IsDate()
-	updatedAt: Date;
-
-	@BeforeUpdate()
-	setUpdateDate(): void {
-		this.updatedAt = new Date();
+const tsColumnOptions: ColumnOptions = {
+	precision: 3,
+	default: () => timestampSyntax,
+	type: datetimeColumnType,
+};
+
+function mixinStringId<T extends Class<{}, any[]>>(base: T) {
+	class Derived extends base {
+		@PrimaryColumn('varchar')
+		id: string;
+
+		@BeforeInsert()
+		generateId() {
+			if (!this.id) {
+				this.id = generateNanoId();
+			}
+		}
 	}
+	return Derived;
 }
+
+function mixinTimestamps<T extends Class<{}, any[]>>(base: T) {
+	class Derived extends base {
+		@CreateDateColumn(tsColumnOptions)
+		createdAt: Date;
+
+		@UpdateDateColumn(tsColumnOptions)
+		updatedAt: Date;
+
+		@BeforeUpdate()
+		setUpdateDate(): void {
+			this.updatedAt = new Date();
+		}
+	}
+	return Derived;
+}
+
+class BaseEntity {}
+
+export const WithStringId = mixinStringId(BaseEntity);
+export const WithTimestamps = mixinTimestamps(BaseEntity);
+export const WithTimestampsAndStringId = mixinStringId(WithTimestamps);
diff --git a/packages/cli/src/databases/entities/AuthIdentity.ts b/packages/cli/src/databases/entities/AuthIdentity.ts
index 7069206287826..ba3dd9d1c4052 100644
--- a/packages/cli/src/databases/entities/AuthIdentity.ts
+++ b/packages/cli/src/databases/entities/AuthIdentity.ts
@@ -1,12 +1,12 @@
-import { Column, Entity, ManyToOne, PrimaryColumn, Unique } from 'typeorm';
-import { AbstractEntity } from './AbstractEntity';
+import { Column, Entity, ManyToOne, PrimaryColumn, Unique } from '@n8n/typeorm';
+import { WithTimestamps } from './AbstractEntity';
 import { User } from './User';
 
 export type AuthProviderType = 'ldap' | 'email' | 'saml'; // | 'google';
 
 @Entity()
 @Unique(['providerId', 'providerType'])
-export class AuthIdentity extends AbstractEntity {
+export class AuthIdentity extends WithTimestamps {
 	@Column()
 	userId: string;
 
diff --git a/packages/cli/src/databases/entities/AuthProviderSyncHistory.ts b/packages/cli/src/databases/entities/AuthProviderSyncHistory.ts
index 51ef0077770f2..bb899b9da677e 100644
--- a/packages/cli/src/databases/entities/AuthProviderSyncHistory.ts
+++ b/packages/cli/src/databases/entities/AuthProviderSyncHistory.ts
@@ -1,4 +1,4 @@
-import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
+import { Column, Entity, PrimaryGeneratedColumn } from '@n8n/typeorm';
 import { datetimeColumnType } from './AbstractEntity';
 import { AuthProviderType } from './AuthIdentity';
 
diff --git a/packages/cli/src/databases/entities/CredentialsEntity.ts b/packages/cli/src/databases/entities/CredentialsEntity.ts
index b02b1fb0a8384..2c6206590e17f 100644
--- a/packages/cli/src/databases/entities/CredentialsEntity.ts
+++ b/packages/cli/src/databases/entities/CredentialsEntity.ts
@@ -1,17 +1,11 @@
-import type { ICredentialNodeAccess } from 'n8n-workflow';
-import { Column, Entity, Generated, Index, OneToMany, PrimaryColumn } from 'typeorm';
-import { IsArray, IsObject, IsString, Length } from 'class-validator';
+import { Column, Entity, Index, OneToMany } from '@n8n/typeorm';
+import { IsObject, IsString, Length } from 'class-validator';
 import type { SharedCredentials } from './SharedCredentials';
-import { AbstractEntity, jsonColumnType } from './AbstractEntity';
+import { WithTimestampsAndStringId } from './AbstractEntity';
 import type { ICredentialsDb } from '@/Interfaces';
-import { idStringifier } from '../utils/transformers';
 
 @Entity()
-export class CredentialsEntity extends AbstractEntity implements ICredentialsDb {
-	@Generated()
-	@PrimaryColumn({ transformer: idStringifier })
-	id: string;
-
+export class CredentialsEntity extends WithTimestampsAndStringId implements ICredentialsDb {
 	@Column({ length: 128 })
 	@IsString({ message: 'Credential `name` must be of type string.' })
 	@Length(3, 128, {
@@ -32,8 +26,4 @@ export class CredentialsEntity extends AbstractEntity implements ICredentialsDb
 
 	@OneToMany('SharedCredentials', 'credentials')
 	shared: SharedCredentials[];
-
-	@Column(jsonColumnType)
-	@IsArray()
-	nodesAccess: ICredentialNodeAccess[];
 }
diff --git a/packages/cli/src/databases/entities/DataRecoveryActivity.ts b/packages/cli/src/databases/entities/DataRecoveryActivity.ts
index 15e9b94b1f214..916336d3a3704 100644
--- a/packages/cli/src/databases/entities/DataRecoveryActivity.ts
+++ b/packages/cli/src/databases/entities/DataRecoveryActivity.ts
@@ -1,4 +1,4 @@
-import { Column, Entity } from 'typeorm';
+import { Column, Entity } from '@n8n/typeorm';
 import { SyncStatus } from '@deep-consulting-solutions/incident-handling';
 
 import GenericEntity from './GenericEntity';
diff --git a/packages/cli/src/databases/entities/EsaEnumData.ts b/packages/cli/src/databases/entities/EsaEnumData.ts
new file mode 100644
index 0000000000000..83a88e5325ea1
--- /dev/null
+++ b/packages/cli/src/databases/entities/EsaEnumData.ts
@@ -0,0 +1,21 @@
+import { Entity, PrimaryGeneratedColumn, Column, PrimaryColumn, ManyToOne } from '@n8n/typeorm';
+import { WithTimestampsAndStringId } from './AbstractEntity';
+import { EsaEnums } from './EsaEnums';
+
+@Entity({ name: 'esa_enum_data' })
+export class EsaEnumData extends WithTimestampsAndStringId {
+	@PrimaryGeneratedColumn('uuid')
+	id: string;
+
+	@PrimaryColumn()
+	esaEnumId: string;
+
+	@Column({ type: 'varchar' })
+	key: string;
+
+    @Column({ type: 'varchar' })
+	value: string;
+
+    @ManyToOne('EsaEnums', 'esaEnumDatas')
+    esaEnum: EsaEnums
+}
diff --git a/packages/cli/src/databases/entities/EsaEnums.ts b/packages/cli/src/databases/entities/EsaEnums.ts
new file mode 100644
index 0000000000000..85ddcd9202345
--- /dev/null
+++ b/packages/cli/src/databases/entities/EsaEnums.ts
@@ -0,0 +1,15 @@
+import { Entity, PrimaryGeneratedColumn, Column, OneToMany } from '@n8n/typeorm';
+import { WithTimestampsAndStringId } from './AbstractEntity';
+import { EsaEnumData } from './EsaEnumData';
+
+@Entity({ name: 'esa_enums' })
+export class EsaEnums extends WithTimestampsAndStringId {
+	@PrimaryGeneratedColumn('uuid')
+	id: string;
+
+	@Column({ type: 'text' })
+	name: string;
+
+    @OneToMany('EsaEnumData', 'esaEnum')
+    esaEnumData: EsaEnumData[];
+}
diff --git a/packages/cli/src/databases/entities/EventDestinations.ts b/packages/cli/src/databases/entities/EventDestinations.ts
index 8f3452936cc6b..27e594efa1707 100644
--- a/packages/cli/src/databases/entities/EventDestinations.ts
+++ b/packages/cli/src/databases/entities/EventDestinations.ts
@@ -1,9 +1,9 @@
 import { MessageEventBusDestinationOptions } from 'n8n-workflow';
-import { Column, Entity, PrimaryColumn } from 'typeorm';
-import { AbstractEntity, jsonColumnType } from './AbstractEntity';
+import { Column, Entity, PrimaryColumn } from '@n8n/typeorm';
+import { WithTimestamps, jsonColumnType } from './AbstractEntity';
 
 @Entity({ name: 'event_destinations' })
-export class EventDestinations extends AbstractEntity {
+export class EventDestinations extends WithTimestamps {
 	@PrimaryColumn('uuid')
 	id: string;
 
diff --git a/packages/cli/src/databases/entities/ExecutionData.ts b/packages/cli/src/databases/entities/ExecutionData.ts
new file mode 100644
index 0000000000000..5a1bd0cf587ce
--- /dev/null
+++ b/packages/cli/src/databases/entities/ExecutionData.ts
@@ -0,0 +1,27 @@
+import { Column, Entity, ManyToOne, PrimaryColumn } from '@n8n/typeorm';
+import { idStringifier } from '../utils/transformers';
+import { ExecutionEntity } from './ExecutionEntity';
+import { jsonColumnType } from './AbstractEntity';
+import { IWorkflowBase } from 'n8n-workflow';
+
+@Entity()
+export class ExecutionData {
+	@Column('text')
+	data: string;
+
+	// WARNING: the workflowData column has been changed from IWorkflowDb to IWorkflowBase
+	// when ExecutionData was introduced as a separate entity.
+	// This is because manual executions of unsaved workflows have no workflow id
+	// and IWorkflowDb has it as a mandatory field. IWorkflowBase reflects the correct
+	// data structure for this entity.
+	@Column(jsonColumnType)
+	workflowData: IWorkflowBase;
+
+	@PrimaryColumn({ transformer: idStringifier })
+	executionId: string;
+
+	@ManyToOne('ExecutionEntity', 'data', {
+		onDelete: 'CASCADE',
+	})
+	execution: ExecutionEntity;
+}
diff --git a/packages/cli/src/databases/entities/ExecutionEntity.ts b/packages/cli/src/databases/entities/ExecutionEntity.ts
index c16365bbcf638..14fad4d50e905 100644
--- a/packages/cli/src/databases/entities/ExecutionEntity.ts
+++ b/packages/cli/src/databases/entities/ExecutionEntity.ts
@@ -1,10 +1,21 @@
 import { ExecutionStatus, WorkflowExecuteMode } from 'n8n-workflow';
-import { Column, Entity, Generated, Index, OneToMany, PrimaryColumn } from 'typeorm';
-import { datetimeColumnType, jsonColumnType } from './AbstractEntity';
-import { IWorkflowDb } from '@/Interfaces';
-import type { IExecutionFlattedDb } from '@/Interfaces';
+import {
+	Column,
+	Entity,
+	Generated,
+	Index,
+	ManyToOne,
+	OneToMany,
+	OneToOne,
+	PrimaryColumn,
+	Relation,
+	DeleteDateColumn,
+} from '@n8n/typeorm';
+import { datetimeColumnType } from './AbstractEntity';
 import { idStringifier } from '../utils/transformers';
+import type { ExecutionData } from './ExecutionData';
 import type { ExecutionMetadata } from './ExecutionMetadata';
+import { WorkflowEntity } from './WorkflowEntity';
 
 @Entity()
 @Index(['workflowId', 'id'])
@@ -12,14 +23,11 @@ import type { ExecutionMetadata } from './ExecutionMetadata';
 @Index(['finished', 'id'])
 @Index(['workflowId', 'finished', 'id'])
 @Index(['workflowId', 'waitTill', 'id'])
-export class ExecutionEntity implements IExecutionFlattedDb {
+export class ExecutionEntity {
 	@Generated()
 	@PrimaryColumn({ transformer: idStringifier })
 	id: string;
 
-	@Column('text')
-	data: string;
-
 	@Column()
 	finished: boolean;
 
@@ -42,10 +50,10 @@ export class ExecutionEntity implements IExecutionFlattedDb {
 	@Column({ type: datetimeColumnType, nullable: true })
 	stoppedAt: Date;
 
-	@Column(jsonColumnType)
-	workflowData: IWorkflowDb;
+	@DeleteDateColumn({ type: datetimeColumnType, nullable: true })
+	deletedAt: Date;
 
-	@Column({ nullable: true, transformer: idStringifier })
+	@Column({ nullable: true })
 	workflowId: string;
 
 	@Column({ type: datetimeColumnType, nullable: true })
@@ -53,4 +61,10 @@ export class ExecutionEntity implements IExecutionFlattedDb {
 
 	@OneToMany('ExecutionMetadata', 'execution')
 	metadata: ExecutionMetadata[];
+
+	@OneToOne('ExecutionData', 'execution')
+	executionData: Relation<ExecutionData>;
+
+	@ManyToOne('WorkflowEntity')
+	workflow: WorkflowEntity;
 }
diff --git a/packages/cli/src/databases/entities/ExecutionMetadata.ts b/packages/cli/src/databases/entities/ExecutionMetadata.ts
index 99ea8e01cec24..6e316ecfd7f04 100644
--- a/packages/cli/src/databases/entities/ExecutionMetadata.ts
+++ b/packages/cli/src/databases/entities/ExecutionMetadata.ts
@@ -1,4 +1,4 @@
-import { Column, Entity, ManyToOne, PrimaryGeneratedColumn, RelationId } from 'typeorm';
+import { Column, Entity, ManyToOne, PrimaryGeneratedColumn, RelationId } from '@n8n/typeorm';
 import { ExecutionEntity } from './ExecutionEntity';
 
 @Entity()
diff --git a/packages/cli/src/databases/entities/GenericEntity.ts b/packages/cli/src/databases/entities/GenericEntity.ts
index b7dc4a1afd05c..1634975629af0 100644
--- a/packages/cli/src/databases/entities/GenericEntity.ts
+++ b/packages/cli/src/databases/entities/GenericEntity.ts
@@ -1,4 +1,4 @@
-import { Column, CreateDateColumn, PrimaryGeneratedColumn, UpdateDateColumn } from 'typeorm';
+import { Column, CreateDateColumn, PrimaryGeneratedColumn, UpdateDateColumn } from '@n8n/typeorm';
 
 // eslint-disable-next-line import/no-default-export
 export default abstract class GenericEntity {
diff --git a/packages/cli/src/databases/entities/InstalledNodes.ts b/packages/cli/src/databases/entities/InstalledNodes.ts
index 7f2e94b6bca59..f3eee3ab9a7e6 100644
--- a/packages/cli/src/databases/entities/InstalledNodes.ts
+++ b/packages/cli/src/databases/entities/InstalledNodes.ts
@@ -1,4 +1,4 @@
-import { Column, Entity, JoinColumn, ManyToOne, PrimaryColumn } from 'typeorm';
+import { Column, Entity, JoinColumn, ManyToOne, PrimaryColumn } from '@n8n/typeorm';
 import { InstalledPackages } from './InstalledPackages';
 
 @Entity()
diff --git a/packages/cli/src/databases/entities/InstalledPackages.ts b/packages/cli/src/databases/entities/InstalledPackages.ts
index ec406ca5d6929..38cd52cd31c2f 100644
--- a/packages/cli/src/databases/entities/InstalledPackages.ts
+++ b/packages/cli/src/databases/entities/InstalledPackages.ts
@@ -1,9 +1,9 @@
-import { Column, Entity, JoinColumn, OneToMany, PrimaryColumn } from 'typeorm';
+import { Column, Entity, JoinColumn, OneToMany, PrimaryColumn } from '@n8n/typeorm';
 import type { InstalledNodes } from './InstalledNodes';
-import { AbstractEntity } from './AbstractEntity';
+import { WithTimestamps } from './AbstractEntity';
 
 @Entity()
-export class InstalledPackages extends AbstractEntity {
+export class InstalledPackages extends WithTimestamps {
 	@PrimaryColumn()
 	packageName: string;
 
diff --git a/packages/cli/src/databases/entities/NodeOutput.ts b/packages/cli/src/databases/entities/NodeOutput.ts
new file mode 100644
index 0000000000000..94369428c3d7d
--- /dev/null
+++ b/packages/cli/src/databases/entities/NodeOutput.ts
@@ -0,0 +1,23 @@
+import { Entity, PrimaryGeneratedColumn, Column, PrimaryColumn } from '@n8n/typeorm';
+import { WithTimestampsAndStringId } from './AbstractEntity';
+
+@Entity({ name: 'node_output' })
+export class NodeOutput extends WithTimestampsAndStringId {
+	@PrimaryGeneratedColumn('uuid')
+	id: string;
+
+	@PrimaryColumn()
+	workflowTestId: string;
+
+	@PrimaryColumn({ type: 'varchar' })
+	nodeId: string;
+
+	@Column({
+		type: 'text',
+		default: '[]',
+	})
+	data: any;
+
+	@Column({ type: 'varchar' })
+	errorMessage: string;
+}
diff --git a/packages/cli/src/databases/entities/ResumeWorkflowTimer.ts b/packages/cli/src/databases/entities/ResumeWorkflowTimer.ts
new file mode 100644
index 0000000000000..e2ad9411f4bf8
--- /dev/null
+++ b/packages/cli/src/databases/entities/ResumeWorkflowTimer.ts
@@ -0,0 +1,26 @@
+import { Entity, Column, PrimaryGeneratedColumn } from '@n8n/typeorm';
+import { WithTimestampsAndStringId } from './AbstractEntity';
+
+@Entity({ name: 'resume_workflow_timer' })
+export class ResumeWorkflowTimer extends WithTimestampsAndStringId {
+	@PrimaryGeneratedColumn('uuid')
+	id: string;
+
+	@Column({ type: 'timestamp' })
+	resumptionTime: Date;
+
+	@Column({ type: 'varchar' })
+	executionId: string;
+
+	@Column({ type: 'varchar' })
+	waitNodeId: string;
+
+	@Column({ type: 'varchar' })
+	status: string;
+
+	@Column({
+		type: 'jsonb',
+		default: {},
+	})
+	resultData: any;
+}
diff --git a/packages/cli/src/databases/entities/Role.ts b/packages/cli/src/databases/entities/Role.ts
deleted file mode 100644
index b1943866d48d8..0000000000000
--- a/packages/cli/src/databases/entities/Role.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { Column, Entity, OneToMany, PrimaryColumn, Unique } from 'typeorm';
-import { IsString, Length } from 'class-validator';
-
-import type { User } from './User';
-import type { SharedWorkflow } from './SharedWorkflow';
-import type { SharedCredentials } from './SharedCredentials';
-import { AbstractEntity } from './AbstractEntity';
-import { idStringifier } from '../utils/transformers';
-
-export type RoleNames = 'owner' | 'member' | 'user' | 'editor';
-export type RoleScopes = 'global' | 'workflow' | 'credential';
-
-@Entity()
-@Unique(['scope', 'name'])
-export class Role extends AbstractEntity {
-	@PrimaryColumn({ transformer: idStringifier })
-	id: string;
-
-	@Column({ length: 32 })
-	@IsString({ message: 'Role name must be of type string.' })
-	@Length(1, 32, { message: 'Role name must be 1 to 32 characters long.' })
-	name: RoleNames;
-
-	@Column()
-	scope: RoleScopes;
-
-	@OneToMany('User', 'globalRole')
-	globalForUsers: User[];
-
-	@OneToMany('SharedWorkflow', 'role')
-	sharedWorkflows: SharedWorkflow[];
-
-	@OneToMany('SharedCredentials', 'role')
-	sharedCredentials: SharedCredentials[];
-}
diff --git a/packages/cli/src/databases/entities/SaveRequestLog.ts b/packages/cli/src/databases/entities/SaveRequestLog.ts
index 7e716ba4b239e..d42583dfef62a 100644
--- a/packages/cli/src/databases/entities/SaveRequestLog.ts
+++ b/packages/cli/src/databases/entities/SaveRequestLog.ts
@@ -1,5 +1,5 @@
-import { Column, Entity, ManyToOne, PrimaryGeneratedColumn } from 'typeorm';
-import { AbstractEntity } from './AbstractEntity';
+import { Column, Entity, ManyToOne, PrimaryGeneratedColumn } from '@n8n/typeorm';
+import { WithTimestampsAndStringId } from './AbstractEntity';
 import { User } from './User';
 import { WorkflowEntity } from './WorkflowEntity';
 
@@ -9,7 +9,7 @@ export const enum SaveRequestStatusEnum {
 }
 
 @Entity()
-export class SaveRequestLog extends AbstractEntity {
+export class SaveRequestLog extends WithTimestampsAndStringId {
 	@PrimaryGeneratedColumn('uuid')
 	id: string;
 
diff --git a/packages/cli/src/databases/entities/ServerIncident.ts b/packages/cli/src/databases/entities/ServerIncident.ts
index b8e8e7194906e..48fa902a77880 100644
--- a/packages/cli/src/databases/entities/ServerIncident.ts
+++ b/packages/cli/src/databases/entities/ServerIncident.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/naming-convention */
-import { Column, Entity } from 'typeorm';
+import { Column, Entity } from '@n8n/typeorm';
 
 import GenericEntity from './GenericEntity';
 
@@ -13,7 +13,7 @@ export class ServerIncident extends GenericEntity {
 	APIMethod: string;
 
 	@Column({ type: 'json', nullable: true })
-	APIBody: any;
+	APIBody: unknown;
 
 	@Column({ nullable: true })
 	queueName: string;
@@ -28,7 +28,7 @@ export class ServerIncident extends GenericEntity {
 	incidentTime: Date;
 
 	@Column({ type: 'json', nullable: true })
-	additionalInformation: any;
+	additionalInformation: unknown;
 
 	@Column({ nullable: true })
 	zohoDeskTicketId: string;
diff --git a/packages/cli/src/databases/entities/Settings.ts b/packages/cli/src/databases/entities/Settings.ts
index 7f1f99cd1e1e3..8fcb38325a43d 100644
--- a/packages/cli/src/databases/entities/Settings.ts
+++ b/packages/cli/src/databases/entities/Settings.ts
@@ -1,5 +1,5 @@
 import type { IDataObject } from 'n8n-workflow';
-import { Column, Entity, PrimaryColumn } from 'typeorm';
+import { Column, Entity, PrimaryColumn } from '@n8n/typeorm';
 
 interface ISettingsDb {
 	key: string;
diff --git a/packages/cli/src/databases/entities/SharedCredentials.ts b/packages/cli/src/databases/entities/SharedCredentials.ts
index d1c46fd8a3bf4..e43f3031d88f7 100644
--- a/packages/cli/src/databases/entities/SharedCredentials.ts
+++ b/packages/cli/src/databases/entities/SharedCredentials.ts
@@ -1,17 +1,14 @@
-import { Column, Entity, ManyToOne, PrimaryColumn } from 'typeorm';
+import { Column, Entity, ManyToOne, PrimaryColumn } from '@n8n/typeorm';
 import { CredentialsEntity } from './CredentialsEntity';
 import { User } from './User';
-import { Role } from './Role';
-import { AbstractEntity } from './AbstractEntity';
-import { idStringifier } from '../utils/transformers';
+import { WithTimestamps } from './AbstractEntity';
 
-@Entity()
-export class SharedCredentials extends AbstractEntity {
-	@ManyToOne('Role', 'sharedCredentials', { nullable: false })
-	role: Role;
+export type CredentialSharingRole = 'credential:owner' | 'credential:user';
 
+@Entity()
+export class SharedCredentials extends WithTimestamps {
 	@Column()
-	roleId: string;
+	role: CredentialSharingRole;
 
 	@ManyToOne('User', 'sharedCredentials')
 	user: User;
@@ -22,6 +19,6 @@ export class SharedCredentials extends AbstractEntity {
 	@ManyToOne('CredentialsEntity', 'shared')
 	credentials: CredentialsEntity;
 
-	@PrimaryColumn({ transformer: idStringifier })
+	@PrimaryColumn()
 	credentialsId: string;
 }
diff --git a/packages/cli/src/databases/entities/SharedWorkflow.ts b/packages/cli/src/databases/entities/SharedWorkflow.ts
index 57d8a8b506301..d5681f6467eae 100644
--- a/packages/cli/src/databases/entities/SharedWorkflow.ts
+++ b/packages/cli/src/databases/entities/SharedWorkflow.ts
@@ -1,17 +1,14 @@
-import { Column, Entity, ManyToOne, PrimaryColumn } from 'typeorm';
+import { Column, Entity, ManyToOne, PrimaryColumn } from '@n8n/typeorm';
 import { WorkflowEntity } from './WorkflowEntity';
 import { User } from './User';
-import { Role } from './Role';
-import { AbstractEntity } from './AbstractEntity';
-import { idStringifier } from '../utils/transformers';
+import { WithTimestamps } from './AbstractEntity';
 
-@Entity()
-export class SharedWorkflow extends AbstractEntity {
-	@ManyToOne('Role', 'sharedWorkflows', { nullable: false })
-	role: Role;
+export type WorkflowSharingRole = 'workflow:owner' | 'workflow:editor' | 'workflow:user';
 
+@Entity()
+export class SharedWorkflow extends WithTimestamps {
 	@Column()
-	roleId: string;
+	role: WorkflowSharingRole;
 
 	@ManyToOne('User', 'sharedWorkflows')
 	user: User;
@@ -22,6 +19,6 @@ export class SharedWorkflow extends AbstractEntity {
 	@ManyToOne('WorkflowEntity', 'shared')
 	workflow: WorkflowEntity;
 
-	@PrimaryColumn({ transformer: idStringifier })
+	@PrimaryColumn()
 	workflowId: string;
 }
diff --git a/packages/cli/src/databases/entities/TagEntity.ts b/packages/cli/src/databases/entities/TagEntity.ts
index de25ba482bd81..5e7954df6665e 100644
--- a/packages/cli/src/databases/entities/TagEntity.ts
+++ b/packages/cli/src/databases/entities/TagEntity.ts
@@ -1,17 +1,11 @@
-import { Column, Entity, Generated, Index, ManyToMany, OneToMany, PrimaryColumn } from 'typeorm';
+import { Column, Entity, Index, ManyToMany, OneToMany } from '@n8n/typeorm';
 import { IsString, Length } from 'class-validator';
-
-import { idStringifier } from '../utils/transformers';
 import type { WorkflowEntity } from './WorkflowEntity';
 import type { WorkflowTagMapping } from './WorkflowTagMapping';
-import { AbstractEntity } from './AbstractEntity';
+import { WithTimestampsAndStringId } from './AbstractEntity';
 
 @Entity()
-export class TagEntity extends AbstractEntity {
-	@Generated()
-	@PrimaryColumn({ transformer: idStringifier })
-	id: string;
-
+export class TagEntity extends WithTimestampsAndStringId {
 	@Column({ length: 24 })
 	@Index({ unique: true })
 	@IsString({ message: 'Tag name must be of type string.' })
diff --git a/packages/cli/src/databases/entities/User.ts b/packages/cli/src/databases/entities/User.ts
index 51cdc49e6285d..0a2cead8a5d63 100644
--- a/packages/cli/src/databases/entities/User.ts
+++ b/packages/cli/src/databases/entities/User.ts
@@ -6,28 +6,33 @@ import {
 	Entity,
 	Index,
 	OneToMany,
-	ManyToOne,
 	PrimaryGeneratedColumn,
 	BeforeInsert,
-} from 'typeorm';
+} from '@n8n/typeorm';
 import { IsEmail, IsString, Length } from 'class-validator';
-import type { IUser } from 'n8n-workflow';
-import { Role } from './Role';
+import type { IUser, IUserSettings } from 'n8n-workflow';
 import type { SharedWorkflow } from './SharedWorkflow';
 import type { SharedCredentials } from './SharedCredentials';
 import { NoXss } from '../utils/customValidators';
 import { objectRetriever, lowerCaser } from '../utils/transformers';
-import { AbstractEntity, jsonColumnType } from './AbstractEntity';
-import type { IPersonalizationSurveyAnswers, IUserSettings } from '@/Interfaces';
+import { WithTimestamps, jsonColumnType } from './AbstractEntity';
+import type { IPersonalizationSurveyAnswers } from '@/Interfaces';
 import type { AuthIdentity } from './AuthIdentity';
-import type { SaveRequestLog } from './SaveRequestLog';
+// import type { SaveRequestLog } from './SaveRequestLog';
+import { ownerPermissions, memberPermissions, adminPermissions } from '@/permissions/roles';
+import { hasScope, type ScopeOptions, type Scope } from '@n8n/permissions';
 
-export const MIN_PASSWORD_LENGTH = 8;
+export type GlobalRole = 'global:owner' | 'global:admin' | 'global:member';
+export type AssignableRole = Exclude<GlobalRole, 'global:owner'>;
 
-export const MAX_PASSWORD_LENGTH = 64;
+const STATIC_SCOPE_MAP: Record<GlobalRole, Scope[]> = {
+	'global:owner': ownerPermissions,
+	'global:member': memberPermissions,
+	'global:admin': adminPermissions,
+};
 
 @Entity()
-export class User extends AbstractEntity implements IUser {
+export class User extends WithTimestamps implements IUser {
 	@PrimaryGeneratedColumn('uuid')
 	id: string;
 
@@ -56,13 +61,6 @@ export class User extends AbstractEntity implements IUser {
 	@IsString({ message: 'Password must be of type string.' })
 	password: string;
 
-	@Column({ type: String, nullable: true })
-	resetPasswordToken?: string | null;
-
-	// Expiration timestamp saved in seconds
-	@Column({ type: Number, nullable: true })
-	resetPasswordTokenExpiration?: number | null;
-
 	@Column({
 		type: jsonColumnType,
 		nullable: true,
@@ -76,11 +74,8 @@ export class User extends AbstractEntity implements IUser {
 	})
 	settings: IUserSettings | null;
 
-	@ManyToOne('Role', 'globalForUsers', { nullable: false })
-	globalRole: Role;
-
 	@Column()
-	globalRoleId: string;
+	role: GlobalRole;
 
 	@OneToMany('AuthIdentity', 'user')
 	authIdentities: AuthIdentity[];
@@ -104,6 +99,21 @@ export class User extends AbstractEntity implements IUser {
 	@Index({ unique: true })
 	apiKey?: string | null;
 
+	@Column({ type: Boolean, default: false })
+	mfaEnabled: boolean;
+
+	@Column({ type: String, nullable: true, select: false })
+	mfaSecret?: string | null;
+
+	@Column({ type: 'simple-array', default: '', select: false })
+	mfaRecoveryCodes: string[];
+
+	@Column({ nullable: true, type: String })
+	otpsecret?: string | null;
+
+	// @OneToMany('SaveRequestLog', 'user')
+	// saveRequestLogs: SaveRequestLog[];
+
 	/**
 	 * Whether the user is pending setup completion.
 	 */
@@ -112,12 +122,35 @@ export class User extends AbstractEntity implements IUser {
 	@AfterLoad()
 	@AfterUpdate()
 	computeIsPending(): void {
-		this.isPending = this.password === null;
+		this.isPending = this.password === null && this.role !== 'global:owner';
 	}
 
-	@Column({ nullable: true, type: String })
-	otpsecret?: string | null;
+	/**
+	 * Whether the user is instance owner
+	 */
+	isOwner: boolean;
+
+	@AfterLoad()
+	computeIsOwner(): void {
+		this.isOwner = this.role === 'global:owner';
+	}
+
+	get globalScopes() {
+		return STATIC_SCOPE_MAP[this.role] ?? [];
+	}
 
-	@OneToMany('SaveRequestLog', 'user')
-	saveRequestLogs: SaveRequestLog[];
+	hasGlobalScope(scope: Scope | Scope[], scopeOptions?: ScopeOptions): boolean {
+		return hasScope(
+			scope,
+			{
+				global: this.globalScopes,
+			},
+			scopeOptions,
+		);
+	}
+
+	toJSON() {
+		const { password, apiKey, mfaSecret, mfaRecoveryCodes, otpsecret, ...rest } = this;
+		return rest;
+	}
 }
diff --git a/packages/cli/src/databases/entities/Variables.ts b/packages/cli/src/databases/entities/Variables.ts
index 64eef5a9fc8f9..da8272853f73b 100644
--- a/packages/cli/src/databases/entities/Variables.ts
+++ b/packages/cli/src/databases/entities/Variables.ts
@@ -1,10 +1,8 @@
-import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
+import { Column, Entity } from '@n8n/typeorm';
+import { WithStringId } from './AbstractEntity';
 
 @Entity()
-export class Variables {
-	@PrimaryGeneratedColumn()
-	id: number;
-
+export class Variables extends WithStringId {
 	@Column('text')
 	key: string;
 
diff --git a/packages/cli/src/databases/entities/WebhookEntity.ts b/packages/cli/src/databases/entities/WebhookEntity.ts
index 0ef75dc84f991..b8dafabe2b897 100644
--- a/packages/cli/src/databases/entities/WebhookEntity.ts
+++ b/packages/cli/src/databases/entities/WebhookEntity.ts
@@ -1,18 +1,17 @@
-import { Column, Entity, Index, PrimaryColumn } from 'typeorm';
-
-import { idStringifier } from '../utils/transformers';
+import { IHttpRequestMethods } from 'n8n-workflow';
+import { Column, Entity, Index, PrimaryColumn } from '@n8n/typeorm';
 
 @Entity()
 @Index(['webhookId', 'method', 'pathLength'])
 export class WebhookEntity {
-	@Column({ transformer: idStringifier })
+	@Column()
 	workflowId: string;
 
 	@PrimaryColumn()
 	webhookPath: string;
 
-	@PrimaryColumn()
-	method: string;
+	@PrimaryColumn({ type: 'text' })
+	method: IHttpRequestMethods;
 
 	@Column()
 	node: string;
@@ -22,4 +21,33 @@ export class WebhookEntity {
 
 	@Column({ nullable: true })
 	pathLength?: number;
+
+	/**
+	 * Unique section of webhook path.
+	 *
+	 * - Static: `${uuid}` or `user/defined/path`
+	 * - Dynamic: `${uuid}/user/:id/posts`
+	 *
+	 * Appended to `${instanceUrl}/webhook/` or `${instanceUrl}/test-webhook/`.
+	 */
+	private get uniquePath() {
+		return this.webhookPath.includes(':')
+			? [this.webhookId, this.webhookPath].join('/')
+			: this.webhookPath;
+	}
+
+	get cacheKey() {
+		return `webhook:${this.method}-${this.uniquePath}`;
+	}
+
+	get staticSegments() {
+		return this.webhookPath.split('/').filter((s) => !s.startsWith(':'));
+	}
+
+	/**
+	 * Whether the webhook has at least one dynamic path segment, e.g. `:id` in `<uuid>/user/:id/posts`.
+	 */
+	get isDynamic() {
+		return this.webhookPath.split('/').some((s) => s.startsWith(':'));
+	}
 }
diff --git a/packages/cli/src/databases/entities/WorkflowEntity.ts b/packages/cli/src/databases/entities/WorkflowEntity.ts
index fd98074c61fee..2108f12e95b0b 100644
--- a/packages/cli/src/databases/entities/WorkflowEntity.ts
+++ b/packages/cli/src/databases/entities/WorkflowEntity.ts
@@ -1,36 +1,22 @@
 import { Length } from 'class-validator';
 
-import { IConnections, IDataObject, IWorkflowSettings } from 'n8n-workflow';
+import { IConnections, IDataObject, IWorkflowSettings, WorkflowFEMeta } from 'n8n-workflow';
 import type { IBinaryKeyData, INode, IPairedItemData } from 'n8n-workflow';
 
-import {
-	Column,
-	Entity,
-	Generated,
-	Index,
-	JoinColumn,
-	JoinTable,
-	ManyToMany,
-	OneToMany,
-	PrimaryColumn,
-} from 'typeorm';
+import { Column, Entity, Index, JoinColumn, JoinTable, ManyToMany, OneToMany } from '@n8n/typeorm';
 
 import config from '@/config';
 import type { TagEntity } from './TagEntity';
 import type { SharedWorkflow } from './SharedWorkflow';
 import type { WorkflowStatistics } from './WorkflowStatistics';
 import type { WorkflowTagMapping } from './WorkflowTagMapping';
-import { idStringifier, objectRetriever, sqlite } from '../utils/transformers';
-import { AbstractEntity, jsonColumnType } from './AbstractEntity';
+import { objectRetriever, sqlite } from '../utils/transformers';
+import { WithTimestampsAndStringId, jsonColumnType } from './AbstractEntity';
 import type { IWorkflowDb } from '@/Interfaces';
-import type { SaveRequestLog } from './SaveRequestLog';
+// import type { SaveRequestLog } from './SaveRequestLog';
 
 @Entity()
-export class WorkflowEntity extends AbstractEntity implements IWorkflowDb {
-	@Generated()
-	@PrimaryColumn({ transformer: idStringifier })
-	id: string;
-
+export class WorkflowEntity extends WithTimestampsAndStringId implements IWorkflowDb {
 	// TODO: Add XSS check
 	@Index({ unique: true })
 	@Length(1, 128, {
@@ -61,6 +47,13 @@ export class WorkflowEntity extends AbstractEntity implements IWorkflowDb {
 	})
 	staticData?: IDataObject;
 
+	@Column({
+		type: jsonColumnType,
+		nullable: true,
+		transformer: objectRetriever,
+	})
+	meta?: WorkflowFEMeta;
+
 	@ManyToMany('TagEntity', 'workflows')
 	@JoinTable({
 		name: 'workflows_tags', // table name for the junction table of this relation
@@ -98,8 +91,9 @@ export class WorkflowEntity extends AbstractEntity implements IWorkflowDb {
 	@Column({ default: 0 })
 	triggerCount: number;
 
-	@OneToMany('SaveRequestLog', 'workflow')
-	saveRequestLogs: SaveRequestLog[];
+	display() {
+		return `"${this.name}" (ID: ${this.id})`;
+	}
 }
 
 /**
diff --git a/packages/cli/src/databases/entities/WorkflowHistory.ts b/packages/cli/src/databases/entities/WorkflowHistory.ts
new file mode 100644
index 0000000000000..b66bbff21014c
--- /dev/null
+++ b/packages/cli/src/databases/entities/WorkflowHistory.ts
@@ -0,0 +1,28 @@
+import { Column, Entity, ManyToOne, PrimaryColumn } from '@n8n/typeorm';
+import { WithTimestamps, jsonColumnType } from './AbstractEntity';
+import { IConnections } from 'n8n-workflow';
+import type { INode } from 'n8n-workflow';
+import { WorkflowEntity } from './WorkflowEntity';
+
+@Entity()
+export class WorkflowHistory extends WithTimestamps {
+	@PrimaryColumn()
+	versionId: string;
+
+	@Column()
+	workflowId: string;
+
+	@Column(jsonColumnType)
+	nodes: INode[];
+
+	@Column(jsonColumnType)
+	connections: IConnections;
+
+	@Column()
+	authors: string;
+
+	@ManyToOne('WorkflowEntity', {
+		onDelete: 'CASCADE',
+	})
+	workflow: WorkflowEntity;
+}
diff --git a/packages/cli/src/databases/entities/WorkflowStatistics.ts b/packages/cli/src/databases/entities/WorkflowStatistics.ts
index 5181bb257c54a..5bdeffcb7cae4 100644
--- a/packages/cli/src/databases/entities/WorkflowStatistics.ts
+++ b/packages/cli/src/databases/entities/WorkflowStatistics.ts
@@ -1,5 +1,4 @@
-import { Column, Entity, ManyToOne, PrimaryColumn } from 'typeorm';
-import { idStringifier } from '../utils/transformers';
+import { Column, Entity, ManyToOne, PrimaryColumn } from '@n8n/typeorm';
 import { datetimeColumnType } from './AbstractEntity';
 import { WorkflowEntity } from './WorkflowEntity';
 
@@ -25,6 +24,6 @@ export class WorkflowStatistics {
 	@ManyToOne('WorkflowEntity', 'shared')
 	workflow: WorkflowEntity;
 
-	@PrimaryColumn({ transformer: idStringifier })
+	@PrimaryColumn()
 	workflowId: string;
 }
diff --git a/packages/cli/src/databases/entities/WorkflowTagMapping.ts b/packages/cli/src/databases/entities/WorkflowTagMapping.ts
index 88b92b0b194bc..2f0727272c638 100644
--- a/packages/cli/src/databases/entities/WorkflowTagMapping.ts
+++ b/packages/cli/src/databases/entities/WorkflowTagMapping.ts
@@ -1,11 +1,10 @@
-import { Entity, JoinColumn, ManyToOne, PrimaryColumn } from 'typeorm';
-import { idStringifier } from '../utils/transformers';
+import { Entity, JoinColumn, ManyToOne, PrimaryColumn } from '@n8n/typeorm';
 import type { TagEntity } from './TagEntity';
 import type { WorkflowEntity } from './WorkflowEntity';
 
 @Entity({ name: 'workflows_tags' })
 export class WorkflowTagMapping {
-	@PrimaryColumn({ transformer: idStringifier })
+	@PrimaryColumn()
 	workflowId: string;
 
 	@ManyToOne('WorkflowEntity', 'tagMappings')
diff --git a/packages/cli/src/databases/entities/WorkflowTest.ts b/packages/cli/src/databases/entities/WorkflowTest.ts
new file mode 100644
index 0000000000000..bf559044d427d
--- /dev/null
+++ b/packages/cli/src/databases/entities/WorkflowTest.ts
@@ -0,0 +1,29 @@
+import { Entity, PrimaryGeneratedColumn, Column, OneToMany, BeforeInsert } from '@n8n/typeorm';
+import  { Container } from 'typedi';
+import type { NodeOutput } from './NodeOutput';
+import { WithTimestampsAndStringId } from './AbstractEntity';
+import { WorkflowTestRepository } from '../repositories/workflowTest.repository'
+
+@Entity({ name: 'workflow_test' })
+export class WorkflowTest extends WithTimestampsAndStringId {
+	@PrimaryGeneratedColumn('uuid')
+	id: string;
+
+	@Column()
+	workflowId: string;
+
+	@Column({ type: 'text' })
+	name: string;
+
+	@Column({ type: 'text', nullable: true })
+	description: string;
+
+	@OneToMany('NodeOutput', 'workflowTest')
+	nodeOutputs: NodeOutput[];
+
+	@BeforeInsert()
+	async generateSequentialName() {
+		const count: number = await Container.get(WorkflowTestRepository).count();
+		this.name = `WorkflowTest_${count + 1}`;
+	}
+}
diff --git a/packages/cli/src/databases/entities/index.ts b/packages/cli/src/databases/entities/index.ts
index cdf9bef25bdeb..d4378115f07b7 100644
--- a/packages/cli/src/databases/entities/index.ts
+++ b/packages/cli/src/databases/entities/index.ts
@@ -6,7 +6,6 @@ import { EventDestinations } from './EventDestinations';
 import { ExecutionEntity } from './ExecutionEntity';
 import { InstalledNodes } from './InstalledNodes';
 import { InstalledPackages } from './InstalledPackages';
-import { Role } from './Role';
 import { Settings } from './Settings';
 import { SharedCredentials } from './SharedCredentials';
 import { SharedWorkflow } from './SharedWorkflow';
@@ -18,9 +17,16 @@ import { WorkflowEntity } from './WorkflowEntity';
 import { WorkflowTagMapping } from './WorkflowTagMapping';
 import { WorkflowStatistics } from './WorkflowStatistics';
 import { ExecutionMetadata } from './ExecutionMetadata';
-import { SaveRequestLog } from './SaveRequestLog';
-import { DataRecoveryActivity } from './DataRecoveryActivity';
+import { ExecutionData } from './ExecutionData';
+import { WorkflowHistory } from './WorkflowHistory';
 import { ServerIncident } from './ServerIncident';
+import { DataRecoveryActivity } from './DataRecoveryActivity';
+import { WorkflowTest } from './WorkflowTest';
+import { NodeOutput } from './NodeOutput';
+import { ResumeWorkflowTimer } from './ResumeWorkflowTimer';
+import { SaveRequestLog } from './SaveRequestLog';
+import { EsaEnums } from './EsaEnums';
+import { EsaEnumData } from './EsaEnumData';
 
 export const entities = {
 	AuthIdentity,
@@ -30,7 +36,6 @@ export const entities = {
 	ExecutionEntity,
 	InstalledNodes,
 	InstalledPackages,
-	Role,
 	Settings,
 	SharedCredentials,
 	SharedWorkflow,
@@ -42,7 +47,14 @@ export const entities = {
 	WorkflowTagMapping,
 	WorkflowStatistics,
 	ExecutionMetadata,
-	SaveRequestLog,
-	DataRecoveryActivity,
+	ExecutionData,
+	WorkflowHistory,
 	ServerIncident,
+	DataRecoveryActivity,
+	WorkflowTest,
+	NodeOutput,
+	ResumeWorkflowTimer,
+	SaveRequestLog,
+	EsaEnums,
+	EsaEnumData,
 };
diff --git a/packages/cli/src/databases/migrations/common/1620821879465-UniqueWorkflowNames.ts b/packages/cli/src/databases/migrations/common/1620821879465-UniqueWorkflowNames.ts
new file mode 100644
index 0000000000000..d867dcd51c5f6
--- /dev/null
+++ b/packages/cli/src/databases/migrations/common/1620821879465-UniqueWorkflowNames.ts
@@ -0,0 +1,47 @@
+import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
+import type { MigrationContext, ReversibleMigration } from '@db/types';
+
+export class UniqueWorkflowNames1620821879465 implements ReversibleMigration {
+	protected indexSuffix = '943d8f922be094eb507cb9a7f9';
+
+	async up({ isMysql, escape, runQuery }: MigrationContext) {
+		const tableName = escape.tableName('workflow_entity');
+		const workflowNames: Array<Pick<WorkflowEntity, 'name'>> = await runQuery(
+			`SELECT name FROM ${tableName}`,
+		);
+
+		for (const { name } of workflowNames) {
+			const duplicates: Array<Pick<WorkflowEntity, 'id' | 'name'>> = await runQuery(
+				`SELECT id, name FROM ${tableName} WHERE name = :name ORDER BY createdAt ASC`,
+				{ name },
+			);
+
+			if (duplicates.length > 1) {
+				await Promise.all(
+					duplicates.map(async (workflow, index) => {
+						if (index === 0) return;
+						return await runQuery(`UPDATE ${tableName} SET name = :name WHERE id = :id`, {
+							name: `${workflow.name} ${index + 1}`,
+							id: workflow.id,
+						});
+					}),
+				);
+			}
+		}
+
+		const indexName = escape.indexName(this.indexSuffix);
+		await runQuery(
+			isMysql
+				? `ALTER TABLE ${tableName} ADD UNIQUE INDEX ${indexName} (${escape.columnName('name')})`
+				: `CREATE UNIQUE INDEX ${indexName} ON ${tableName} ("name")`,
+		);
+	}
+
+	async down({ isMysql, escape, runQuery }: MigrationContext) {
+		const tableName = escape.tableName('workflow_entity');
+		const indexName = escape.indexName(this.indexSuffix);
+		await runQuery(
+			isMysql ? `ALTER TABLE ${tableName} DROP INDEX ${indexName}` : `DROP INDEX ${indexName}`,
+		);
+	}
+}
diff --git a/packages/cli/src/databases/migrations/common/1630330987096-UpdateWorkflowCredentials.ts b/packages/cli/src/databases/migrations/common/1630330987096-UpdateWorkflowCredentials.ts
new file mode 100644
index 0000000000000..e8de8dd9fc1a6
--- /dev/null
+++ b/packages/cli/src/databases/migrations/common/1630330987096-UpdateWorkflowCredentials.ts
@@ -0,0 +1,252 @@
+import type { IWorkflowBase } from 'n8n-workflow';
+import type { CredentialsEntity } from '@db/entities/CredentialsEntity';
+import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
+import type { MigrationContext, ReversibleMigration } from '@db/types';
+
+type Credential = Pick<CredentialsEntity, 'id' | 'name' | 'type'>;
+type ExecutionWithData = { id: string; workflowData: string | IWorkflowBase };
+type Workflow = Pick<WorkflowEntity, 'id'> & { nodes: string | WorkflowEntity['nodes'] };
+
+// replacing the credentials in workflows and execution
+// `nodeType: name` changes to `nodeType: { id, name }`
+
+export class UpdateWorkflowCredentials1630330987096 implements ReversibleMigration {
+	async up({ dbType, escape, parseJson, runQuery, runInBatches }: MigrationContext) {
+		const credentialsTable = escape.tableName('credentials_entity');
+		const workflowsTable = escape.tableName('workflow_entity');
+		const executionsTable = escape.tableName('execution_entity');
+		const dataColumn = escape.columnName('workflowData');
+		const waitTillColumn = escape.columnName('waitTill');
+
+		const credentialsEntities: Credential[] = await runQuery(
+			`SELECT id, name, type FROM ${credentialsTable}`,
+		);
+
+		const workflowsQuery = `SELECT id, nodes FROM ${workflowsTable}`;
+		await runInBatches<Workflow>(workflowsQuery, async (workflows) => {
+			workflows.forEach(async (workflow) => {
+				let credentialsUpdated = false;
+				const nodes = parseJson(workflow.nodes);
+				nodes.forEach((node) => {
+					if (node.credentials) {
+						const allNodeCredentials = Object.entries(node.credentials);
+						for (const [type, name] of allNodeCredentials) {
+							if (typeof name === 'string') {
+								const matchingCredentials = credentialsEntities.find(
+									(credentials) => credentials.name === name && credentials.type === type,
+								);
+								node.credentials[type] = { id: matchingCredentials?.id ?? null, name };
+								credentialsUpdated = true;
+							}
+						}
+					}
+				});
+				if (credentialsUpdated) {
+					await runQuery(`UPDATE ${workflowsTable} SET nodes = :nodes WHERE id = :id`, {
+						nodes: JSON.stringify(nodes),
+						id: workflow.id,
+					});
+				}
+			});
+		});
+
+		const finishedValue = dbType === 'postgresdb' ? 'FALSE' : '0';
+		const waitingExecutionsQuery = `
+			SELECT id, ${dataColumn}
+			FROM ${executionsTable}
+			WHERE ${waitTillColumn} IS NOT NULL AND finished = ${finishedValue}
+		`;
+		await runInBatches<ExecutionWithData>(waitingExecutionsQuery, async (waitingExecutions) => {
+			waitingExecutions.forEach(async (execution) => {
+				let credentialsUpdated = false;
+				const workflowData = parseJson(execution.workflowData);
+				workflowData.nodes.forEach((node) => {
+					if (node.credentials) {
+						const allNodeCredentials = Object.entries(node.credentials);
+						for (const [type, name] of allNodeCredentials) {
+							if (typeof name === 'string') {
+								const matchingCredentials = credentialsEntities.find(
+									(credentials) => credentials.name === name && credentials.type === type,
+								);
+								node.credentials[type] = { id: matchingCredentials?.id ?? null, name };
+								credentialsUpdated = true;
+							}
+						}
+					}
+				});
+				if (credentialsUpdated) {
+					await runQuery(
+						`UPDATE ${executionsTable}
+						 SET ${escape.columnName('workflowData')} = :data WHERE id = :id`,
+						{ data: JSON.stringify(workflowData), id: execution.id },
+					);
+				}
+			});
+		});
+
+		const retryableExecutions: ExecutionWithData[] = await runQuery(`
+			SELECT id, ${dataColumn}
+			FROM ${executionsTable}
+			WHERE ${waitTillColumn} IS NULL AND finished = ${finishedValue} AND mode != 'retry'
+			ORDER BY ${escape.columnName('startedAt')} DESC
+			LIMIT 200
+		`);
+		retryableExecutions.forEach(async (execution) => {
+			let credentialsUpdated = false;
+			const workflowData = parseJson(execution.workflowData);
+			workflowData.nodes.forEach((node) => {
+				if (node.credentials) {
+					const allNodeCredentials = Object.entries(node.credentials);
+					for (const [type, name] of allNodeCredentials) {
+						if (typeof name === 'string') {
+							const matchingCredentials = credentialsEntities.find(
+								(credentials) => credentials.name === name && credentials.type === type,
+							);
+							node.credentials[type] = { id: matchingCredentials?.id ?? null, name };
+							credentialsUpdated = true;
+						}
+					}
+				}
+			});
+			if (credentialsUpdated) {
+				await runQuery(
+					`UPDATE ${executionsTable}
+					 SET ${escape.columnName('workflowData')} = :data WHERE id = :id`,
+					{ data: JSON.stringify(workflowData), id: execution.id },
+				);
+			}
+		});
+	}
+
+	async down({ dbType, escape, parseJson, runQuery, runInBatches }: MigrationContext) {
+		const credentialsTable = escape.tableName('credentials_entity');
+		const workflowsTable = escape.tableName('workflow_entity');
+		const executionsTable = escape.tableName('execution_entity');
+		const dataColumn = escape.columnName('workflowData');
+		const waitTillColumn = escape.columnName('waitTill');
+
+		const credentialsEntities: Credential[] = await runQuery(
+			`SELECT id, name, type FROM ${credentialsTable}`,
+		);
+
+		const workflowsQuery = `SELECT id, nodes FROM ${workflowsTable}`;
+		await runInBatches<Workflow>(workflowsQuery, async (workflows) => {
+			workflows.forEach(async (workflow) => {
+				let credentialsUpdated = false;
+				const nodes = parseJson(workflow.nodes);
+				nodes.forEach((node) => {
+					if (node.credentials) {
+						const allNodeCredentials = Object.entries(node.credentials);
+						for (const [type, creds] of allNodeCredentials) {
+							if (typeof creds === 'object') {
+								const matchingCredentials = credentialsEntities.find(
+									// double-equals because creds.id can be string or number
+									// eslint-disable-next-line eqeqeq
+									(credentials) => credentials.id == creds.id && credentials.type === type,
+								);
+								if (matchingCredentials) {
+									// @ts-ignore
+									node.credentials[type] = matchingCredentials.name;
+								} else {
+									// @ts-ignore
+									node.credentials[type] = creds.name;
+								}
+								credentialsUpdated = true;
+							}
+						}
+					}
+				});
+				if (credentialsUpdated) {
+					await runQuery(`UPDATE ${workflowsTable} SET nodes = :nodes WHERE id = :id`, {
+						nodes: JSON.stringify(nodes),
+						id: workflow.id,
+					});
+				}
+			});
+		});
+
+		const finishedValue = dbType === 'postgresdb' ? 'FALSE' : '0';
+		const waitingExecutionsQuery = `
+			SELECT id, ${dataColumn}
+			FROM ${executionsTable}
+			WHERE ${waitTillColumn} IS NOT NULL AND finished = ${finishedValue}
+		`;
+
+		await runInBatches<ExecutionWithData>(waitingExecutionsQuery, async (waitingExecutions) => {
+			waitingExecutions.forEach(async (execution) => {
+				let credentialsUpdated = false;
+				const workflowData = parseJson(execution.workflowData);
+				workflowData.nodes.forEach((node) => {
+					if (node.credentials) {
+						const allNodeCredentials = Object.entries(node.credentials);
+						for (const [type, creds] of allNodeCredentials) {
+							if (typeof creds === 'object') {
+								const matchingCredentials = credentialsEntities.find(
+									// double-equals because creds.id can be string or number
+									// eslint-disable-next-line eqeqeq
+									(credentials) => credentials.id == creds.id && credentials.type === type,
+								);
+								if (matchingCredentials) {
+									// @ts-ignore
+									node.credentials[type] = matchingCredentials.name;
+								} else {
+									// @ts-ignore
+									node.credentials[type] = creds.name;
+								}
+								credentialsUpdated = true;
+							}
+						}
+					}
+				});
+				if (credentialsUpdated) {
+					await runQuery(
+						`UPDATE ${executionsTable}
+						 SET ${escape.columnName('workflowData')} = :data WHERE id = :id`,
+						{ data: JSON.stringify(workflowData), id: execution.id },
+					);
+				}
+			});
+		});
+
+		const retryableExecutions: ExecutionWithData[] = await runQuery(`
+			SELECT id, ${dataColumn}
+			FROM ${executionsTable}
+			WHERE ${waitTillColumn} IS NULL AND finished = ${finishedValue} AND mode != 'retry'
+			ORDER BY ${escape.columnName('startedAt')} DESC
+			LIMIT 200
+		`);
+		retryableExecutions.forEach(async (execution) => {
+			let credentialsUpdated = false;
+			const workflowData = parseJson(execution.workflowData);
+			workflowData.nodes.forEach((node) => {
+				if (node.credentials) {
+					const allNodeCredentials = Object.entries(node.credentials);
+					for (const [type, creds] of allNodeCredentials) {
+						if (typeof creds === 'object') {
+							const matchingCredentials = credentialsEntities.find(
+								// double-equals because creds.id can be string or number
+								// eslint-disable-next-line eqeqeq
+								(credentials) => credentials.id == creds.id && credentials.type === type,
+							);
+							if (matchingCredentials) {
+								// @ts-ignore
+								node.credentials[type] = matchingCredentials.name;
+							} else {
+								// @ts-ignore
+								node.credentials[type] = creds.name;
+							}
+							credentialsUpdated = true;
+						}
+					}
+				}
+			});
+			if (credentialsUpdated) {
+				await runQuery(
+					`UPDATE ${executionsTable}
+					 SET ${escape.columnName('workflowData')} = :data WHERE id = :id`,
+					{ data: JSON.stringify(workflowData), id: execution.id },
+				);
+			}
+		});
+	}
+}
diff --git a/packages/cli/src/databases/migrations/common/1658930531669-AddNodeIds.ts b/packages/cli/src/databases/migrations/common/1658930531669-AddNodeIds.ts
new file mode 100644
index 0000000000000..84f1218e9864a
--- /dev/null
+++ b/packages/cli/src/databases/migrations/common/1658930531669-AddNodeIds.ts
@@ -0,0 +1,42 @@
+import type { INode } from 'n8n-workflow';
+import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
+import type { MigrationContext, ReversibleMigration } from '@db/types';
+import { v4 as uuid } from 'uuid';
+
+type Workflow = Pick<WorkflowEntity, 'id'> & { nodes: string | INode[] };
+
+export class AddNodeIds1658930531669 implements ReversibleMigration {
+	async up({ escape, runQuery, runInBatches, parseJson }: MigrationContext) {
+		const tableName = escape.tableName('workflow_entity');
+		const workflowsQuery = `SELECT id, nodes FROM ${tableName}`;
+		await runInBatches<Workflow>(workflowsQuery, async (workflows) => {
+			workflows.forEach(async (workflow) => {
+				const nodes = parseJson(workflow.nodes);
+				nodes.forEach((node: INode) => {
+					if (!node.id) {
+						node.id = uuid();
+					}
+				});
+
+				await runQuery(`UPDATE ${tableName} SET nodes = :nodes WHERE id = :id`, {
+					nodes: JSON.stringify(nodes),
+					id: workflow.id,
+				});
+			});
+		});
+	}
+
+	async down({ escape, runQuery, runInBatches, parseJson }: MigrationContext) {
+		const tableName = escape.tableName('workflow_entity');
+		const workflowsQuery = `SELECT id, nodes FROM ${tableName}`;
+		await runInBatches<Workflow>(workflowsQuery, async (workflows) => {
+			workflows.forEach(async (workflow) => {
+				const nodes = parseJson(workflow.nodes).map(({ id, ...rest }) => rest);
+				await runQuery(`UPDATE ${tableName} SET nodes = :nodes WHERE id = :id`, {
+					nodes: JSON.stringify(nodes),
+					id: workflow.id,
+				});
+			});
+		});
+	}
+}
diff --git a/packages/cli/src/databases/migrations/common/1659888469333-AddJsonKeyPinData.ts b/packages/cli/src/databases/migrations/common/1659888469333-AddJsonKeyPinData.ts
new file mode 100644
index 0000000000000..dfdaee213f827
--- /dev/null
+++ b/packages/cli/src/databases/migrations/common/1659888469333-AddJsonKeyPinData.ts
@@ -0,0 +1,82 @@
+import { isObjectLiteral } from '@/utils';
+import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { MigrationContext, IrreversibleMigration } from '@db/types';
+
+type OldPinnedData = { [nodeName: string]: IDataObject[] };
+type NewPinnedData = { [nodeName: string]: INodeExecutionData[] };
+type Workflow = { id: number; pinData: string | OldPinnedData };
+
+function isJsonKeyObject(item: unknown): item is {
+	json: unknown;
+	[keys: string]: unknown;
+} {
+	if (!isObjectLiteral(item)) return false;
+	return Object.keys(item).includes('json');
+}
+
+/**
+ * Convert TEXT-type `pinData` column in `workflow_entity` table from
+ * `{ [nodeName: string]: IDataObject[] }` to `{ [nodeName: string]: INodeExecutionData[] }`
+ */
+export class AddJsonKeyPinData1659888469333 implements IrreversibleMigration {
+	async up({ escape, runQuery, runInBatches }: MigrationContext) {
+		const tableName = escape.tableName('workflow_entity');
+		const columnName = escape.columnName('pinData');
+
+		const selectQuery = `SELECT id, ${columnName} FROM ${tableName} WHERE ${columnName} IS NOT NULL`;
+		await runInBatches<Workflow>(selectQuery, async (workflows) => {
+			await Promise.all(
+				this.makeUpdateParams(workflows).map(
+					async (workflow) =>
+						await runQuery(`UPDATE ${tableName} SET ${columnName} = :pinData WHERE id = :id;`, {
+							pinData: workflow.pinData,
+							id: workflow.id,
+						}),
+				),
+			);
+		});
+	}
+
+	private makeUpdateParams(fetchedWorkflows: Workflow[]) {
+		return fetchedWorkflows.reduce<Workflow[]>((updateParams, { id, pinData: rawPinData }) => {
+			let pinDataPerWorkflow: OldPinnedData | NewPinnedData;
+
+			if (typeof rawPinData === 'string') {
+				try {
+					// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+					pinDataPerWorkflow = JSON.parse(rawPinData);
+				} catch {
+					pinDataPerWorkflow = {};
+				}
+			} else {
+				pinDataPerWorkflow = rawPinData;
+			}
+
+			const newPinDataPerWorkflow = Object.keys(pinDataPerWorkflow).reduce<NewPinnedData>(
+				// eslint-disable-next-line @typescript-eslint/no-shadow
+				(newPinDataPerWorkflow, nodeName) => {
+					let pinDataPerNode = pinDataPerWorkflow[nodeName];
+
+					if (!Array.isArray(pinDataPerNode)) {
+						pinDataPerNode = [pinDataPerNode];
+					}
+
+					if (pinDataPerNode.every((item) => item.json)) return newPinDataPerWorkflow;
+
+					newPinDataPerWorkflow[nodeName] = pinDataPerNode.map((item) =>
+						isJsonKeyObject(item) ? item : { json: item },
+					);
+
+					return newPinDataPerWorkflow;
+				},
+				{},
+			);
+
+			if (Object.keys(newPinDataPerWorkflow).length > 0) {
+				updateParams.push({ id, pinData: JSON.stringify(newPinDataPerWorkflow) });
+			}
+
+			return updateParams;
+		}, []);
+	}
+}
diff --git a/packages/cli/src/databases/migrations/common/1669739707124-AddWorkflowVersionIdColumn.ts b/packages/cli/src/databases/migrations/common/1669739707124-AddWorkflowVersionIdColumn.ts
new file mode 100644
index 0000000000000..004af7d2dff23
--- /dev/null
+++ b/packages/cli/src/databases/migrations/common/1669739707124-AddWorkflowVersionIdColumn.ts
@@ -0,0 +1,27 @@
+import type { MigrationContext, ReversibleMigration } from '@db/types';
+import { v4 as uuidv4 } from 'uuid';
+
+type Workflow = { id: number };
+
+export class AddWorkflowVersionIdColumn1669739707124 implements ReversibleMigration {
+	async up({ escape, runQuery }: MigrationContext) {
+		const tableName = escape.tableName('workflow_entity');
+		const columnName = escape.columnName('versionId');
+
+		await runQuery(`ALTER TABLE ${tableName} ADD COLUMN ${columnName} CHAR(36)`);
+
+		const workflowIds: Workflow[] = await runQuery(`SELECT id FROM ${tableName}`);
+		for (const { id } of workflowIds) {
+			await runQuery(`UPDATE ${tableName} SET ${columnName} = :versionId WHERE id = :id`, {
+				versionId: uuidv4(),
+				id,
+			});
+		}
+	}
+
+	async down({ escape, runQuery }: MigrationContext) {
+		const tableName = escape.tableName('workflow_entity');
+		const columnName = escape.columnName('versionId');
+		await runQuery(`ALTER TABLE ${tableName} DROP COLUMN ${columnName}`);
+	}
+}
diff --git a/packages/cli/src/databases/migrations/common/1671726148419-RemoveWorkflowDataLoadedFlag.ts b/packages/cli/src/databases/migrations/common/1671726148419-RemoveWorkflowDataLoadedFlag.ts
new file mode 100644
index 0000000000000..a310f8b30b4d6
--- /dev/null
+++ b/packages/cli/src/databases/migrations/common/1671726148419-RemoveWorkflowDataLoadedFlag.ts
@@ -0,0 +1,62 @@
+import type { MigrationContext, ReversibleMigration } from '@db/types';
+import { StatisticsNames } from '@db/entities/WorkflowStatistics';
+
+export class RemoveWorkflowDataLoadedFlag1671726148419 implements ReversibleMigration {
+	async up({ escape, dbType, runQuery }: MigrationContext) {
+		const workflowTableName = escape.tableName('workflow_entity');
+		const statisticsTableName = escape.tableName('workflow_statistics');
+		const columnName = escape.columnName('dataLoaded');
+
+		// If any existing workflow has dataLoaded set to true, insert the relevant information to the statistics table
+		const workflowIds: Array<{ id: number; dataLoaded: boolean }> = await runQuery(
+			`SELECT id, ${columnName} FROM ${workflowTableName}`,
+		);
+
+		const now =
+			dbType === 'sqlite' ? "STRFTIME('%Y-%m-%d %H:%M:%f', 'NOW')" : 'CURRENT_TIMESTAMP(3)';
+
+		await Promise.all(
+			workflowIds.map(
+				async ({ id, dataLoaded }) =>
+					await (dataLoaded &&
+						runQuery(
+							`INSERT INTO ${statisticsTableName}
+						(${escape.columnName('workflowId')}, name, count, ${escape.columnName('latestEvent')})
+						VALUES (:id, :name, 1, ${now})`,
+							{ id, name: StatisticsNames.dataLoaded },
+						)),
+			),
+		);
+
+		await runQuery(`ALTER TABLE ${workflowTableName} DROP COLUMN ${columnName}`);
+	}
+
+	async down({ escape, runQuery }: MigrationContext) {
+		const workflowTableName = escape.tableName('workflow_entity');
+		const statisticsTableName = escape.tableName('workflow_statistics');
+		const columnName = escape.columnName('dataLoaded');
+
+		await runQuery(
+			`ALTER TABLE ${workflowTableName} ADD COLUMN ${columnName} BOOLEAN DEFAULT false`,
+		);
+
+		// Search through statistics for any workflows that have the dataLoaded stat
+		const workflowsIds: Array<{ workflowId: string }> = await runQuery(
+			`SELECT ${escape.columnName('workflowId')} FROM ${statisticsTableName} WHERE name = :name`,
+			{ name: StatisticsNames.dataLoaded },
+		);
+
+		await Promise.all(
+			workflowsIds.map(
+				async ({ workflowId }) =>
+					await runQuery(`UPDATE ${workflowTableName} SET ${columnName} = true WHERE id = :id`, {
+						id: workflowId,
+					}),
+			),
+		);
+
+		await runQuery(`DELETE FROM ${statisticsTableName} WHERE name = :name`, {
+			name: StatisticsNames.dataLoaded,
+		});
+	}
+}
diff --git a/packages/cli/src/databases/migrations/common/1674509946020-CreateLdapEntities.ts b/packages/cli/src/databases/migrations/common/1674509946020-CreateLdapEntities.ts
new file mode 100644
index 0000000000000..2115cbeffd856
--- /dev/null
+++ b/packages/cli/src/databases/migrations/common/1674509946020-CreateLdapEntities.ts
@@ -0,0 +1,68 @@
+import type { MigrationContext, ReversibleMigration } from '@db/types';
+import { LDAP_DEFAULT_CONFIGURATION, LDAP_FEATURE_NAME } from '@/Ldap/constants';
+
+export class CreateLdapEntities1674509946020 implements ReversibleMigration {
+	async up({ escape, dbType, isMysql, runQuery }: MigrationContext) {
+		const userTable = escape.tableName('user');
+		await runQuery(`ALTER TABLE ${userTable} ADD COLUMN disabled BOOLEAN NOT NULL DEFAULT false;`);
+
+		await runQuery(`
+			INSERT INTO ${escape.tableName('settings')}
+			(${escape.columnName('key')}, value, ${escape.columnName('loadOnStartup')})
+			VALUES ('${LDAP_FEATURE_NAME}', '${JSON.stringify(LDAP_DEFAULT_CONFIGURATION)}', true)
+		`);
+
+		const uuidColumnType = dbType === 'postgresdb' ? 'UUID' : 'VARCHAR(36)';
+
+		await runQuery(
+			`CREATE TABLE IF NOT EXISTS ${escape.tableName('auth_identity')} (
+				${escape.columnName('userId')} ${uuidColumnType} REFERENCES ${userTable} (id),
+				${escape.columnName('providerId')} VARCHAR(64) NOT NULL,
+				${escape.columnName('providerType')} VARCHAR(32) NOT NULL,
+				${escape.columnName('createdAt')} timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+				${escape.columnName('updatedAt')} timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+				PRIMARY KEY(${escape.columnName('providerId')}, ${escape.columnName('providerType')})
+			)${isMysql ? "ENGINE='InnoDB'" : ''}`,
+		);
+
+		const idColumn =
+			dbType === 'sqlite'
+				? 'INTEGER PRIMARY KEY AUTOINCREMENT'
+				: dbType === 'postgresdb'
+					? 'SERIAL NOT NULL PRIMARY KEY'
+					: 'INTEGER NOT NULL AUTO_INCREMENT';
+
+		const timestampColumn =
+			dbType === 'sqlite'
+				? 'DATETIME NOT NULL'
+				: dbType === 'postgresdb'
+					? 'TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP'
+					: 'DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP';
+
+		await runQuery(
+			`CREATE TABLE IF NOT EXISTS ${escape.tableName('auth_provider_sync_history')} (
+				${escape.columnName('id')} ${idColumn},
+				${escape.columnName('providerType')} VARCHAR(32) NOT NULL,
+				${escape.columnName('runMode')} TEXT NOT NULL,
+				${escape.columnName('status')} TEXT NOT NULL,
+				${escape.columnName('startedAt')} ${timestampColumn},
+				${escape.columnName('endedAt')} ${timestampColumn},
+				${escape.columnName('scanned')} INTEGER NOT NULL,
+				${escape.columnName('created')} INTEGER NOT NULL,
+				${escape.columnName('updated')} INTEGER NOT NULL,
+				${escape.columnName('disabled')} INTEGER NOT NULL,
+				${escape.columnName('error')} TEXT
+				${isMysql ? ',PRIMARY KEY (`id`)' : ''}
+			)${isMysql ? "ENGINE='InnoDB'" : ''}`,
+		);
+	}
+
+	async down({ escape, runQuery }: MigrationContext) {
+		await runQuery(`DROP TABLE "${escape.tableName('auth_provider_sync_history')}`);
+		await runQuery(`DROP TABLE "${escape.tableName('auth_identity')}`);
+		await runQuery(`DELETE FROM ${escape.tableName('settings')} WHERE key = :key`, {
+			key: LDAP_FEATURE_NAME,
+		});
+		await runQuery(`ALTER TABLE ${escape.tableName('user')} DROP COLUMN disabled`);
+	}
+}
diff --git a/packages/cli/src/databases/migrations/common/1675940580449-PurgeInvalidWorkflowConnections.ts b/packages/cli/src/databases/migrations/common/1675940580449-PurgeInvalidWorkflowConnections.ts
new file mode 100644
index 0000000000000..51526aaead776
--- /dev/null
+++ b/packages/cli/src/databases/migrations/common/1675940580449-PurgeInvalidWorkflowConnections.ts
@@ -0,0 +1,60 @@
+import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
+import type { MigrationContext, IrreversibleMigration } from '@db/types';
+
+interface Workflow {
+	id: number;
+	nodes: WorkflowEntity['nodes'] | string;
+	connections: WorkflowEntity['connections'] | string;
+}
+
+export class PurgeInvalidWorkflowConnections1675940580449 implements IrreversibleMigration {
+	async up({ escape, parseJson, runQuery, nodeTypes }: MigrationContext) {
+		const workflowsTable = escape.tableName('workflow_entity');
+		const workflows: Workflow[] = await runQuery(
+			`SELECT id, nodes, connections FROM ${workflowsTable}`,
+		);
+
+		await Promise.all(
+			workflows.map(async (workflow) => {
+				const connections = parseJson(workflow.connections);
+				const nodes = parseJson(workflow.nodes);
+
+				const nodesThatCannotReceiveInput = nodes.reduce<string[]>((acc, node) => {
+					try {
+						const nodeType = nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
+						if ((nodeType.description.inputs?.length ?? []) === 0) {
+							acc.push(node.name);
+						}
+					} catch (error) {}
+					return acc;
+				}, []);
+
+				Object.keys(connections).forEach((sourceNodeName) => {
+					const connection = connections[sourceNodeName];
+					const outputs = Object.keys(connection);
+
+					outputs.forEach((outputConnectionName /* Like `main` */) => {
+						const outputConnection = connection[outputConnectionName];
+
+						// It filters out all connections that are connected to a node that cannot receive input
+						outputConnection.forEach((outputConnectionItem, outputConnectionItemIdx) => {
+							outputConnection[outputConnectionItemIdx] = outputConnectionItem.filter(
+								(outgoingConnections) =>
+									!nodesThatCannotReceiveInput.includes(outgoingConnections.node),
+							);
+						});
+					});
+				});
+
+				// Update database with new connections
+				return await runQuery(
+					`UPDATE ${workflowsTable} SET connections = :connections WHERE id = :id`,
+					{
+						connections: JSON.stringify(connections),
+						id: workflow.id,
+					},
+				);
+			}),
+		);
+	}
+}
diff --git a/packages/cli/src/databases/migrations/common/1690000000030-RemoveResetPasswordColumns.ts b/packages/cli/src/databases/migrations/common/1690000000030-RemoveResetPasswordColumns.ts
new file mode 100644
index 0000000000000..76a38898d8d5d
--- /dev/null
+++ b/packages/cli/src/databases/migrations/common/1690000000030-RemoveResetPasswordColumns.ts
@@ -0,0 +1,14 @@
+import type { MigrationContext, ReversibleMigration } from '@db/types';
+
+export class RemoveResetPasswordColumns1690000000030 implements ReversibleMigration {
+	async up({ schemaBuilder: { dropColumns } }: MigrationContext) {
+		await dropColumns('user', ['resetPasswordToken', 'resetPasswordTokenExpiration']);
+	}
+
+	async down({ schemaBuilder: { addColumns, column } }: MigrationContext) {
+		await addColumns('user', [
+			column('resetPasswordToken').varchar(),
+			column('resetPasswordTokenExpiration').int,
+		]);
+	}
+}
diff --git a/packages/cli/src/databases/migrations/common/1690000000040-AddMfaColumns.ts b/packages/cli/src/databases/migrations/common/1690000000040-AddMfaColumns.ts
new file mode 100644
index 0000000000000..12f1000ffe676
--- /dev/null
+++ b/packages/cli/src/databases/migrations/common/1690000000040-AddMfaColumns.ts
@@ -0,0 +1,15 @@
+import type { MigrationContext, ReversibleMigration } from '@/databases/types';
+
+export class AddMfaColumns1690000000030 implements ReversibleMigration {
+	async up({ schemaBuilder: { addColumns, column } }: MigrationContext) {
+		await addColumns('user', [
+			column('mfaEnabled').bool.notNull.default(false),
+			column('mfaSecret').text,
+			column('mfaRecoveryCodes').text,
+		]);
+	}
+
+	async down({ schemaBuilder: { dropColumns } }: MigrationContext) {
+		await dropColumns('user', ['mfaEnabled', 'mfaSecret', 'mfaRecoveryCodes']);
+	}
+}
diff --git a/packages/cli/src/databases/migrations/common/1691088862123-CreateWorkflowNameIndex.ts b/packages/cli/src/databases/migrations/common/1691088862123-CreateWorkflowNameIndex.ts
new file mode 100644
index 0000000000000..c38cd6067d3e1
--- /dev/null
+++ b/packages/cli/src/databases/migrations/common/1691088862123-CreateWorkflowNameIndex.ts
@@ -0,0 +1,11 @@
+import type { MigrationContext, ReversibleMigration } from '@db/types';
+
+export class CreateWorkflowNameIndex1691088862123 implements ReversibleMigration {
+	async up({ schemaBuilder: { createIndex } }: MigrationContext) {
+		await createIndex('workflow_entity', ['name']);
+	}
+
+	async down({ schemaBuilder: { dropIndex } }: MigrationContext) {
+		await dropIndex('workflow_entity', ['name']);
+	}
+}
diff --git a/packages/cli/src/databases/migrations/common/1692967111175-CreateWorkflowHistoryTable.ts b/packages/cli/src/databases/migrations/common/1692967111175-CreateWorkflowHistoryTable.ts
new file mode 100644
index 0000000000000..73d411e464955
--- /dev/null
+++ b/packages/cli/src/databases/migrations/common/1692967111175-CreateWorkflowHistoryTable.ts
@@ -0,0 +1,26 @@
+import type { MigrationContext, ReversibleMigration } from '@db/types';
+
+const tableName = 'workflow_history';
+
+export class CreateWorkflowHistoryTable1692967111175 implements ReversibleMigration {
+	async up({ schemaBuilder: { createTable, column } }: MigrationContext) {
+		await createTable(tableName)
+			.withColumns(
+				column('versionId').varchar(36).primary.notNull,
+				column('workflowId').varchar(36).notNull,
+				column('nodes').text.notNull,
+				column('connections').text.notNull,
+				column('authors').varchar(255).notNull,
+			)
+			.withTimestamps.withIndexOn('workflowId')
+			.withForeignKey('workflowId', {
+				tableName: 'workflow_entity',
+				columnName: 'id',
+				onDelete: 'CASCADE',
+			});
+	}
+
+	async down({ schemaBuilder: { dropTable } }: MigrationContext) {
+		await dropTable(tableName);
+	}
+}
diff --git a/packages/cli/src/databases/migrations/common/1693491613982-ExecutionSoftDelete.ts b/packages/cli/src/databases/migrations/common/1693491613982-ExecutionSoftDelete.ts
new file mode 100644
index 0000000000000..50e31e809b5aa
--- /dev/null
+++ b/packages/cli/src/databases/migrations/common/1693491613982-ExecutionSoftDelete.ts
@@ -0,0 +1,19 @@
+import type { MigrationContext, ReversibleMigration } from '@/databases/types';
+
+/**
+ * Add an indexed column `deletedAt` to track soft-deleted executions.
+ * Add an index on `stoppedAt`, used by executions pruning.
+ */
+export class ExecutionSoftDelete1693491613982 implements ReversibleMigration {
+	async up({ schemaBuilder: { addColumns, column, createIndex } }: MigrationContext) {
+		await addColumns('execution_entity', [column('deletedAt').timestamp()]);
+		await createIndex('execution_entity', ['deletedAt']);
+		await createIndex('execution_entity', ['stoppedAt']);
+	}
+
+	async down({ schemaBuilder: { dropColumns, dropIndex } }: MigrationContext) {
+		await dropIndex('execution_entity', ['stoppedAt']);
+		await dropIndex('execution_entity', ['deletedAt']);
+		await dropColumns('execution_entity', ['deletedAt']);
+	}
+}
diff --git a/packages/cli/src/databases/migrations/common/1693554410387-DisallowOrphanExecutions.ts b/packages/cli/src/databases/migrations/common/1693554410387-DisallowOrphanExecutions.ts
new file mode 100644
index 0000000000000..c0f74ec0bb2f2
--- /dev/null
+++ b/packages/cli/src/databases/migrations/common/1693554410387-DisallowOrphanExecutions.ts
@@ -0,0 +1,22 @@
+import type { MigrationContext, ReversibleMigration } from '@db/types';
+
+export class DisallowOrphanExecutions1693554410387 implements ReversibleMigration {
+	/**
+	 * Ensure all executions point to a workflow.
+	 */
+	async up({ escape, schemaBuilder: { addNotNull }, runQuery }: MigrationContext) {
+		const executionEntity = escape.tableName('execution_entity');
+		const workflowId = escape.columnName('workflowId');
+
+		await runQuery(`DELETE FROM ${executionEntity} WHERE ${workflowId} IS NULL;`);
+
+		await addNotNull('execution_entity', 'workflowId');
+	}
+
+	/**
+	 * Reversal excludes restoring deleted rows.
+	 */
+	async down({ schemaBuilder: { dropNotNull } }: MigrationContext) {
+		await dropNotNull('execution_entity', 'workflowId');
+	}
+}
diff --git a/packages/cli/src/databases/migrations/common/1695128658538-AddWorkflowMetadata.ts b/packages/cli/src/databases/migrations/common/1695128658538-AddWorkflowMetadata.ts
new file mode 100644
index 0000000000000..84ab2ba47abed
--- /dev/null
+++ b/packages/cli/src/databases/migrations/common/1695128658538-AddWorkflowMetadata.ts
@@ -0,0 +1,11 @@
+import type { MigrationContext, ReversibleMigration } from '@db/types';
+
+export class AddWorkflowMetadata1695128658538 implements ReversibleMigration {
+	async up({ schemaBuilder: { addColumns, column } }: MigrationContext) {
+		await addColumns('workflow_entity', [column('meta').json]);
+	}
+
+	async down({ schemaBuilder: { dropColumns } }: MigrationContext) {
+		await dropColumns('workflow_entity', ['meta']);
+	}
+}
diff --git a/packages/cli/src/databases/migrations/common/1695829275184-ModifyWorkflowHistoryNodesAndConnections.ts b/packages/cli/src/databases/migrations/common/1695829275184-ModifyWorkflowHistoryNodesAndConnections.ts
new file mode 100644
index 0000000000000..6973d00214761
--- /dev/null
+++ b/packages/cli/src/databases/migrations/common/1695829275184-ModifyWorkflowHistoryNodesAndConnections.ts
@@ -0,0 +1,15 @@
+import type { MigrationContext, ReversibleMigration } from '@db/types';
+
+const tableName = 'workflow_history';
+
+export class ModifyWorkflowHistoryNodesAndConnections1695829275184 implements ReversibleMigration {
+	async up({ schemaBuilder: { addColumns, dropColumns, column } }: MigrationContext) {
+		await dropColumns(tableName, ['nodes', 'connections']);
+		await addColumns(tableName, [column('nodes').json.notNull, column('connections').json.notNull]);
+	}
+
+	async down({ schemaBuilder: { dropColumns, addColumns, column } }: MigrationContext) {
+		await dropColumns(tableName, ['nodes', 'connections']);
+		await addColumns(tableName, [column('nodes').text.notNull, column('connections').text.notNull]);
+	}
+}
diff --git a/packages/cli/src/databases/migrations/common/1700571993961-AddGlobalAdminRole.ts b/packages/cli/src/databases/migrations/common/1700571993961-AddGlobalAdminRole.ts
new file mode 100644
index 0000000000000..c9077d79a0d8a
--- /dev/null
+++ b/packages/cli/src/databases/migrations/common/1700571993961-AddGlobalAdminRole.ts
@@ -0,0 +1,59 @@
+import type { MigrationContext, ReversibleMigration } from '@db/types';
+import { ApplicationError } from 'n8n-workflow';
+
+export class AddGlobalAdminRole1700571993961 implements ReversibleMigration {
+	async up({ escape, runQuery }: MigrationContext) {
+		const tableName = escape.tableName('role');
+
+		await runQuery(`INSERT INTO ${tableName} (name, scope) VALUES (:name, :scope)`, {
+			name: 'admin',
+			scope: 'global',
+		});
+	}
+
+	async down({ escape, runQuery }: MigrationContext) {
+		const roleTableName = escape.tableName('role');
+		const userTableName = escape.tableName('user');
+
+		const adminRoleIdResult = await runQuery<Array<{ id: number }>>(
+			`SELECT id FROM ${roleTableName} WHERE name = :name AND scope = :scope`,
+			{
+				name: 'admin',
+				scope: 'global',
+			},
+		);
+
+		const memberRoleIdResult = await runQuery<Array<{ id: number }>>(
+			`SELECT id FROM ${roleTableName} WHERE name = :name AND scope = :scope`,
+			{
+				name: 'member',
+				scope: 'global',
+			},
+		);
+
+		const adminRoleId = adminRoleIdResult[0]?.id;
+		if (adminRoleId === undefined) {
+			// Couldn't find admin role. It's a bit odd but it means we don't
+			// have anything to do.
+			return;
+		}
+
+		const memberRoleId = memberRoleIdResult[0]?.id;
+		if (!memberRoleId) {
+			throw new ApplicationError('Could not find global member role!');
+		}
+
+		await runQuery(
+			`UPDATE ${userTableName} SET globalRoleId = :memberRoleId WHERE globalRoleId = :adminRoleId`,
+			{
+				memberRoleId,
+				adminRoleId,
+			},
+		);
+
+		await runQuery(`DELETE FROM ${roleTableName} WHERE name = :name AND scope = :scope`, {
+			name: 'admin',
+			scope: 'global',
+		});
+	}
+}
diff --git a/packages/cli/src/databases/migrations/common/1705429061930-DropRoleMapping.ts b/packages/cli/src/databases/migrations/common/1705429061930-DropRoleMapping.ts
new file mode 100644
index 0000000000000..2fa897707aee9
--- /dev/null
+++ b/packages/cli/src/databases/migrations/common/1705429061930-DropRoleMapping.ts
@@ -0,0 +1,143 @@
+import type { MigrationContext, ReversibleMigration } from '@db/types';
+
+type Table = 'user' | 'shared_workflow' | 'shared_credentials';
+
+const idColumns: Record<Table, string> = {
+	user: 'id',
+	shared_credentials: 'credentialsId',
+	shared_workflow: 'workflowId',
+};
+
+const uidColumns: Record<Table, string> = {
+	user: 'id',
+	shared_credentials: 'userId',
+	shared_workflow: 'userId',
+};
+
+const roleScopes: Record<Table, string> = {
+	user: 'global',
+	shared_credentials: 'credential',
+	shared_workflow: 'workflow',
+};
+
+const foreignKeySuffixes: Record<Table, string> = {
+	user: 'f0609be844f9200ff4365b1bb3d',
+	shared_credentials: 'c68e056637562000b68f480815a',
+	shared_workflow: '3540da03964527aa24ae014b780',
+};
+
+export class DropRoleMapping1705429061930 implements ReversibleMigration {
+	async up(context: MigrationContext) {
+		await this.migrateUp('user', context);
+		await this.migrateUp('shared_workflow', context);
+		await this.migrateUp('shared_credentials', context);
+	}
+
+	async down(context: MigrationContext) {
+		await this.migrateDown('shared_workflow', context);
+		await this.migrateDown('shared_credentials', context);
+		await this.migrateDown('user', context);
+	}
+
+	private async migrateUp(
+		table: Table,
+		{
+			dbType,
+			escape,
+			runQuery,
+			schemaBuilder: { addNotNull, addColumns, dropColumns, dropForeignKey, column },
+			tablePrefix,
+		}: MigrationContext,
+	) {
+		await addColumns(table, [column('role').text]);
+
+		const roleTable = escape.tableName('role');
+		const tableName = escape.tableName(table);
+		const idColumn = escape.columnName(idColumns[table]);
+		const uidColumn = escape.columnName(uidColumns[table]);
+		const roleColumnName = table === 'user' ? 'globalRoleId' : 'roleId';
+		const roleColumn = escape.columnName(roleColumnName);
+		const scope = roleScopes[table];
+		const isMySQL = ['mariadb', 'mysqldb'].includes(dbType);
+		const roleField = isMySQL ? `CONCAT('${scope}:', R.name)` : `'${scope}:' || R.name`;
+		const subQuery = `
+        SELECT ${roleField} as role, T.${idColumn} as id${
+					table !== 'user' ? `, T.${uidColumn} as uid` : ''
+				}
+        FROM ${tableName} T
+        LEFT JOIN ${roleTable} R
+        ON T.${roleColumn} = R.id and R.scope = '${scope}'`;
+		const where = `WHERE ${tableName}.${idColumn} = mapping.id${
+			table !== 'user' ? ` AND ${tableName}.${uidColumn} = mapping.uid` : ''
+		}`;
+		const swQuery = isMySQL
+			? `UPDATE ${tableName}, (${subQuery}) as mapping
+            SET ${tableName}.role = mapping.role
+            ${where}`
+			: `UPDATE ${tableName}
+            SET role = mapping.role
+            FROM (${subQuery}) as mapping
+            ${where}`;
+		await runQuery(swQuery);
+
+		await addNotNull(table, 'role');
+
+		await dropForeignKey(
+			table,
+			roleColumnName,
+			['role', 'id'],
+			`FK_${tablePrefix}${foreignKeySuffixes[table]}`,
+		);
+		await dropColumns(table, [roleColumnName]);
+	}
+
+	private async migrateDown(
+		table: Table,
+		{
+			dbType,
+			escape,
+			runQuery,
+			schemaBuilder: { addNotNull, addColumns, dropColumns, addForeignKey, column },
+			tablePrefix,
+		}: MigrationContext,
+	) {
+		const roleColumnName = table === 'user' ? 'globalRoleId' : 'roleId';
+		await addColumns(table, [column(roleColumnName).int]);
+
+		const roleTable = escape.tableName('role');
+		const tableName = escape.tableName(table);
+		const idColumn = escape.columnName(idColumns[table]);
+		const uidColumn = escape.columnName(uidColumns[table]);
+		const roleColumn = escape.columnName(roleColumnName);
+		const scope = roleScopes[table];
+		const isMySQL = ['mariadb', 'mysqldb'].includes(dbType);
+		const roleField = isMySQL ? `CONCAT('${scope}:', R.name)` : `'${scope}:' || R.name`;
+		const subQuery = `
+			SELECT R.id as role_id, T.${idColumn} as id${table !== 'user' ? `, T.${uidColumn} as uid` : ''}
+			FROM ${tableName} T
+			LEFT JOIN ${roleTable} R
+			ON T.role = ${roleField} and R.scope = '${scope}'`;
+		const where = `WHERE ${tableName}.${idColumn} = mapping.id${
+			table !== 'user' ? ` AND ${tableName}.${uidColumn} = mapping.uid` : ''
+		}`;
+		const query = isMySQL
+			? `UPDATE ${tableName}, (${subQuery}) as mapping
+				SET ${tableName}.${roleColumn} = mapping.role_id
+				${where}`
+			: `UPDATE ${tableName}
+				SET ${roleColumn} = mapping.role_id
+				FROM (${subQuery}) as mapping
+				${where}`;
+		await runQuery(query);
+
+		await addNotNull(table, roleColumnName);
+		await addForeignKey(
+			table,
+			roleColumnName,
+			['role', 'id'],
+			`FK_${tablePrefix}${foreignKeySuffixes[table]}`,
+		);
+
+		await dropColumns(table, ['role']);
+	}
+}
diff --git a/packages/cli/src/databases/migrations/common/1711018413374-RemoveFailedExecutionStatus.ts b/packages/cli/src/databases/migrations/common/1711018413374-RemoveFailedExecutionStatus.ts
new file mode 100644
index 0000000000000..2f48fdbc1f93f
--- /dev/null
+++ b/packages/cli/src/databases/migrations/common/1711018413374-RemoveFailedExecutionStatus.ts
@@ -0,0 +1,9 @@
+import type { IrreversibleMigration, MigrationContext } from '@db/types';
+
+export class RemoveFailedExecutionStatus1711018413374 implements IrreversibleMigration {
+	async up({ escape, runQuery }: MigrationContext) {
+		const executionEntity = escape.tableName('execution_entity');
+
+		await runQuery(`UPDATE ${executionEntity} SET status = 'error' WHERE status = 'failed';`);
+	}
+}
diff --git a/packages/cli/src/databases/migrations/common/1711390882123-MoveSshKeysToDatabase.ts b/packages/cli/src/databases/migrations/common/1711390882123-MoveSshKeysToDatabase.ts
new file mode 100644
index 0000000000000..30d7d87c4ac6a
--- /dev/null
+++ b/packages/cli/src/databases/migrations/common/1711390882123-MoveSshKeysToDatabase.ts
@@ -0,0 +1,114 @@
+import path from 'node:path';
+import { readFile, writeFile, rm } from 'node:fs/promises';
+import Container from 'typedi';
+import { Cipher, InstanceSettings } from 'n8n-core';
+import { jsonParse } from 'n8n-workflow';
+import type { MigrationContext, ReversibleMigration } from '@db/types';
+
+/**
+ * Move SSH key pair from file system to database, to enable SSH connections
+ * when running n8n in multiple containers - mains, webhooks, workers, etc.
+ */
+export class MoveSshKeysToDatabase1711390882123 implements ReversibleMigration {
+	private readonly settingsKey = 'features.sourceControl.sshKeys';
+
+	private readonly privateKeyPath = path.join(
+		Container.get(InstanceSettings).n8nFolder,
+		'ssh',
+		'key',
+	);
+
+	private readonly publicKeyPath = this.privateKeyPath + '.pub';
+
+	private readonly cipher = Container.get(Cipher);
+
+	async up({ escape, runQuery, logger, migrationName }: MigrationContext) {
+		let privateKey, publicKey;
+
+		try {
+			[privateKey, publicKey] = await Promise.all([
+				readFile(this.privateKeyPath, { encoding: 'utf8' }),
+				readFile(this.publicKeyPath, { encoding: 'utf8' }),
+			]);
+		} catch {
+			logger.info(`[${migrationName}] No SSH keys in filesystem, skipping`);
+			return;
+		}
+
+		const settings = escape.tableName('settings');
+		const key = escape.columnName('key');
+		const value = escape.columnName('value');
+
+		const rows: Array<{ value: string }> = await runQuery(
+			`SELECT value FROM ${settings} WHERE ${key} = '${this.settingsKey}';`,
+		);
+
+		if (rows.length === 1) {
+			logger.info(`[${migrationName}] SSH keys already in database, skipping`);
+			return;
+		}
+
+		if (!privateKey) {
+			logger.error(`[${migrationName}] No private key found, skipping`);
+			return;
+		}
+
+		const settingsValue = JSON.stringify({
+			encryptedPrivateKey: this.cipher.encrypt(privateKey),
+			publicKey,
+		});
+
+		await runQuery(
+			`INSERT INTO ${settings} (${key}, ${value}) VALUES ('${this.settingsKey}', '${settingsValue}');`,
+		);
+
+		try {
+			await Promise.all([rm(this.privateKeyPath), rm(this.publicKeyPath)]);
+		} catch (e) {
+			const error = e instanceof Error ? e : new Error(`${e}`);
+			logger.error(
+				`[${migrationName}] Failed to remove SSH keys from filesystem: ${error.message}`,
+			);
+		}
+	}
+
+	async down({ escape, runQuery, logger, migrationName }: MigrationContext) {
+		const settings = escape.tableName('settings');
+		const key = escape.columnName('key');
+
+		const rows: Array<{ value: string }> = await runQuery(
+			`SELECT value FROM ${settings} WHERE ${key} = '${this.settingsKey}';`,
+		);
+
+		if (rows.length !== 1) {
+			logger.info(`[${migrationName}] No SSH keys in database, skipping revert`);
+			return;
+		}
+
+		const [row] = rows;
+
+		type KeyPair = { publicKey: string; encryptedPrivateKey: string };
+
+		const dbKeyPair = jsonParse<KeyPair | null>(row.value, { fallbackValue: null });
+
+		if (!dbKeyPair) {
+			logger.info(`[${migrationName}] Malformed SSH keys in database, skipping revert`);
+			return;
+		}
+
+		const privateKey = this.cipher.decrypt(dbKeyPair.encryptedPrivateKey);
+		const { publicKey } = dbKeyPair;
+
+		try {
+			await Promise.all([
+				writeFile(this.privateKeyPath, privateKey, { encoding: 'utf8', mode: 0o600 }),
+				writeFile(this.publicKeyPath, publicKey, { encoding: 'utf8', mode: 0o600 }),
+			]);
+		} catch {
+			logger.error(`[${migrationName}] Failed to write SSH keys to filesystem, skipping revert`);
+			return;
+		}
+
+		await runQuery(`DELETE FROM ${settings} WHERE ${key} = 'features.sourceControl.sshKeys';`);
+	}
+}
diff --git a/packages/cli/src/databases/migrations/common/1712044305787-RemoveNodesAccess.ts b/packages/cli/src/databases/migrations/common/1712044305787-RemoveNodesAccess.ts
new file mode 100644
index 0000000000000..8460af61c4c97
--- /dev/null
+++ b/packages/cli/src/databases/migrations/common/1712044305787-RemoveNodesAccess.ts
@@ -0,0 +1,7 @@
+import type { IrreversibleMigration, MigrationContext } from '@db/types';
+
+export class RemoveNodesAccess1712044305787 implements IrreversibleMigration {
+	async up({ schemaBuilder: { dropColumns } }: MigrationContext) {
+		await dropColumns('credentials_entity', ['nodesAccess']);
+	}
+}
diff --git a/packages/cli/src/databases/migrations/mysqldb/1588157391238-InitialMigration.ts b/packages/cli/src/databases/migrations/mysqldb/1588157391238-InitialMigration.ts
index 700bbc26491f1..0cf659d285f25 100644
--- a/packages/cli/src/databases/migrations/mysqldb/1588157391238-InitialMigration.ts
+++ b/packages/cli/src/databases/migrations/mysqldb/1588157391238-InitialMigration.ts
@@ -1,20 +1,13 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-
-import config from '@/config';
-
-export class InitialMigration1588157391238 implements MigrationInterface {
-	name = 'InitialMigration1588157391238';
-
-	async up(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
+export class InitialMigration1588157391238 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			'CREATE TABLE IF NOT EXISTS `' +
 				tablePrefix +
 				'credentials_entity` (`id` int NOT NULL AUTO_INCREMENT, `name` varchar(128) NOT NULL, `data` text NOT NULL, `type` varchar(32) NOT NULL, `nodesAccess` json NOT NULL, `createdAt` datetime NOT NULL, `updatedAt` datetime NOT NULL, INDEX `IDX_' +
 				tablePrefix +
 				'07fde106c0b471d8cc80a64fc8` (`type`), PRIMARY KEY (`id`)) ENGINE=InnoDB',
-			undefined,
 		);
 		await queryRunner.query(
 			'CREATE TABLE IF NOT EXISTS `' +
@@ -22,37 +15,31 @@ export class InitialMigration1588157391238 implements MigrationInterface {
 				'execution_entity` (`id` int NOT NULL AUTO_INCREMENT, `data` text NOT NULL, `finished` tinyint NOT NULL, `mode` varchar(255) NOT NULL, `retryOf` varchar(255) NULL, `retrySuccessId` varchar(255) NULL, `startedAt` datetime NOT NULL, `stoppedAt` datetime NOT NULL, `workflowData` json NOT NULL, `workflowId` varchar(255) NULL, INDEX `IDX_' +
 				tablePrefix +
 				'c4d999a5e90784e8caccf5589d` (`workflowId`), PRIMARY KEY (`id`)) ENGINE=InnoDB',
-			undefined,
 		);
 		await queryRunner.query(
 			'CREATE TABLE IF NOT EXISTS`' +
 				tablePrefix +
 				'workflow_entity` (`id` int NOT NULL AUTO_INCREMENT, `name` varchar(128) NOT NULL, `active` tinyint NOT NULL, `nodes` json NOT NULL, `connections` json NOT NULL, `createdAt` datetime NOT NULL, `updatedAt` datetime NOT NULL, `settings` json NULL, `staticData` json NULL, PRIMARY KEY (`id`)) ENGINE=InnoDB',
-			undefined,
 		);
 	}
 
-	async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
-
-		await queryRunner.query('DROP TABLE `' + tablePrefix + 'workflow_entity`', undefined);
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
+		await queryRunner.query('DROP TABLE `' + tablePrefix + 'workflow_entity`');
 		await queryRunner.query(
 			'DROP INDEX `IDX_' +
 				tablePrefix +
 				'c4d999a5e90784e8caccf5589d` ON `' +
 				tablePrefix +
 				'execution_entity`',
-			undefined,
 		);
-		await queryRunner.query('DROP TABLE `' + tablePrefix + 'execution_entity`', undefined);
+		await queryRunner.query('DROP TABLE `' + tablePrefix + 'execution_entity`');
 		await queryRunner.query(
 			'DROP INDEX `IDX_' +
 				tablePrefix +
 				'07fde106c0b471d8cc80a64fc8` ON `' +
 				tablePrefix +
 				'credentials_entity`',
-			undefined,
 		);
-		await queryRunner.query('DROP TABLE `' + tablePrefix + 'credentials_entity`', undefined);
+		await queryRunner.query('DROP TABLE `' + tablePrefix + 'credentials_entity`');
 	}
 }
diff --git a/packages/cli/src/databases/migrations/mysqldb/1592447867632-WebhookModel.ts b/packages/cli/src/databases/migrations/mysqldb/1592447867632-WebhookModel.ts
index 55c8da1b38241..0ffa4b10c28b1 100644
--- a/packages/cli/src/databases/migrations/mysqldb/1592447867632-WebhookModel.ts
+++ b/packages/cli/src/databases/migrations/mysqldb/1592447867632-WebhookModel.ts
@@ -1,20 +1,13 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-
-import config from '@/config';
-
-export class WebhookModel1592447867632 implements MigrationInterface {
-	name = 'WebhookModel1592447867632';
-
-	async up(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
+export class WebhookModel1592447867632 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			`CREATE TABLE IF NOT EXISTS ${tablePrefix}webhook_entity (workflowId int NOT NULL, webhookPath varchar(255) NOT NULL, method varchar(255) NOT NULL, node varchar(255) NOT NULL, PRIMARY KEY (webhookPath, method)) ENGINE=InnoDB`,
 		);
 	}
 
-	async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`DROP TABLE ${tablePrefix}webhook_entity`);
 	}
 }
diff --git a/packages/cli/src/databases/migrations/mysqldb/1594902918301-CreateIndexStoppedAt.ts b/packages/cli/src/databases/migrations/mysqldb/1594902918301-CreateIndexStoppedAt.ts
index 8cc6f254c7e40..5ec7bc08fcc33 100644
--- a/packages/cli/src/databases/migrations/mysqldb/1594902918301-CreateIndexStoppedAt.ts
+++ b/packages/cli/src/databases/migrations/mysqldb/1594902918301-CreateIndexStoppedAt.ts
@@ -1,13 +1,7 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-
-import config from '@/config';
-
-export class CreateIndexStoppedAt1594902918301 implements MigrationInterface {
-	name = 'CreateIndexStoppedAt1594902918301';
-
-	async up(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
+export class CreateIndexStoppedAt1594902918301 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			'CREATE INDEX `IDX_' +
 				tablePrefix +
@@ -17,9 +11,7 @@ export class CreateIndexStoppedAt1594902918301 implements MigrationInterface {
 		);
 	}
 
-	async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
-
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			'DROP INDEX `IDX_' +
 				tablePrefix +
diff --git a/packages/cli/src/databases/migrations/mysqldb/1607431743767-MakeStoppedAtNullable.ts b/packages/cli/src/databases/migrations/mysqldb/1607431743767-MakeStoppedAtNullable.ts
index b149d5e100a60..2d9e1efd41a95 100644
--- a/packages/cli/src/databases/migrations/mysqldb/1607431743767-MakeStoppedAtNullable.ts
+++ b/packages/cli/src/databases/migrations/mysqldb/1607431743767-MakeStoppedAtNullable.ts
@@ -1,21 +1,15 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
-import config from '@/config';
-
-export class MakeStoppedAtNullable1607431743767 implements MigrationInterface {
-	async up(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
+export class MakeStoppedAtNullable1607431743767 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			'ALTER TABLE `' + tablePrefix + 'execution_entity` MODIFY `stoppedAt` datetime',
-			undefined,
 		);
 	}
 
-	async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			'ALTER TABLE `' + tablePrefix + 'execution_entity` MODIFY `stoppedAt` datetime NOT NULL',
-			undefined,
 		);
 	}
 }
diff --git a/packages/cli/src/databases/migrations/mysqldb/1611149998770-AddWebhookId.ts b/packages/cli/src/databases/migrations/mysqldb/1611149998770-AddWebhookId.ts
index c3b10def61b63..bbccd94ed2581 100644
--- a/packages/cli/src/databases/migrations/mysqldb/1611149998770-AddWebhookId.ts
+++ b/packages/cli/src/databases/migrations/mysqldb/1611149998770-AddWebhookId.ts
@@ -1,12 +1,7 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import config from '@/config';
-
-export class AddWebhookId1611149998770 implements MigrationInterface {
-	name = 'AddWebhookId1611149998770';
-
-	async up(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
+export class AddWebhookId1611149998770 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			'ALTER TABLE `' + tablePrefix + 'webhook_entity` ADD `webhookId` varchar(255) NULL',
 		);
@@ -22,9 +17,7 @@ export class AddWebhookId1611149998770 implements MigrationInterface {
 		);
 	}
 
-	async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
-
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			'DROP INDEX `IDX_' +
 				tablePrefix +
diff --git a/packages/cli/src/databases/migrations/mysqldb/1615306975123-ChangeDataSize.ts b/packages/cli/src/databases/migrations/mysqldb/1615306975123-ChangeDataSize.ts
index 953fef8bcb1d6..211dee64e7522 100644
--- a/packages/cli/src/databases/migrations/mysqldb/1615306975123-ChangeDataSize.ts
+++ b/packages/cli/src/databases/migrations/mysqldb/1615306975123-ChangeDataSize.ts
@@ -1,20 +1,13 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import config from '@/config';
-
-export class ChangeDataSize1615306975123 implements MigrationInterface {
-	name = 'ChangeDataSize1615306975123';
-
-	async up(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
+export class ChangeDataSize1615306975123 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			'ALTER TABLE `' + tablePrefix + 'execution_entity` MODIFY COLUMN `data` MEDIUMTEXT NOT NULL',
 		);
 	}
 
-	async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
-
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			'ALTER TABLE `' + tablePrefix + 'execution_entity` MODIFY COLUMN `data` TEXT NOT NULL',
 		);
diff --git a/packages/cli/src/databases/migrations/mysqldb/1617268711084-CreateTagEntity.ts b/packages/cli/src/databases/migrations/mysqldb/1617268711084-CreateTagEntity.ts
index 7d4d752129998..986db2d110ffe 100644
--- a/packages/cli/src/databases/migrations/mysqldb/1617268711084-CreateTagEntity.ts
+++ b/packages/cli/src/databases/migrations/mysqldb/1617268711084-CreateTagEntity.ts
@@ -1,12 +1,7 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import config from '@/config';
-
-export class CreateTagEntity1617268711084 implements MigrationInterface {
-	name = 'CreateTagEntity1617268711084';
-
-	async up(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
+export class CreateTagEntity1617268711084 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		// create tags table + relationship with workflow entity
 
 		await queryRunner.query(
@@ -78,9 +73,7 @@ export class CreateTagEntity1617268711084 implements MigrationInterface {
 		);
 	}
 
-	async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
-
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		// `createdAt` and `updatedAt`
 
 		await queryRunner.query(
diff --git a/packages/cli/src/databases/migrations/mysqldb/1620729500000-ChangeCredentialDataSize.ts b/packages/cli/src/databases/migrations/mysqldb/1620729500000-ChangeCredentialDataSize.ts
index 2ad39bd7b08eb..cec34715cd5e1 100644
--- a/packages/cli/src/databases/migrations/mysqldb/1620729500000-ChangeCredentialDataSize.ts
+++ b/packages/cli/src/databases/migrations/mysqldb/1620729500000-ChangeCredentialDataSize.ts
@@ -1,12 +1,7 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import config from '@/config';
-
-export class ChangeCredentialDataSize1620729500000 implements MigrationInterface {
-	name = 'ChangeCredentialDataSize1620729500000';
-
-	async up(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
+export class ChangeCredentialDataSize1620729500000 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			'ALTER TABLE `' +
 				tablePrefix +
@@ -14,9 +9,7 @@ export class ChangeCredentialDataSize1620729500000 implements MigrationInterface
 		);
 	}
 
-	async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
-
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			'ALTER TABLE `' +
 				tablePrefix +
diff --git a/packages/cli/src/databases/migrations/mysqldb/1620826335440-UniqueWorkflowNames.ts b/packages/cli/src/databases/migrations/mysqldb/1620826335440-UniqueWorkflowNames.ts
index e631dc686184b..b453f6b73228b 100644
--- a/packages/cli/src/databases/migrations/mysqldb/1620826335440-UniqueWorkflowNames.ts
+++ b/packages/cli/src/databases/migrations/mysqldb/1620826335440-UniqueWorkflowNames.ts
@@ -1,70 +1,3 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import config from '@/config';
+import { UniqueWorkflowNames1620821879465 } from '../common/1620821879465-UniqueWorkflowNames';
 
-export class UniqueWorkflowNames1620826335440 implements MigrationInterface {
-	name = 'UniqueWorkflowNames1620826335440';
-
-	async up(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
-
-		const workflowNames = await queryRunner.query(`
-				SELECT name
-				FROM ${tablePrefix}workflow_entity
-			`);
-
-		for (const { name } of workflowNames) {
-			const [duplicatesQuery, parameters] = queryRunner.connection.driver.escapeQueryWithParameters(
-				`
-					SELECT id, name
-					FROM ${tablePrefix}workflow_entity
-					WHERE name = :name
-					ORDER BY createdAt ASC
-				`,
-				{ name },
-				{},
-			);
-
-			const duplicates = await queryRunner.query(duplicatesQuery, parameters);
-
-			if (duplicates.length > 1) {
-				await Promise.all(
-					duplicates.map(({ id, name }: { id: number; name: string }, index: number) => {
-						if (index === 0) return Promise.resolve();
-						const [updateQuery, updateParams] =
-							queryRunner.connection.driver.escapeQueryWithParameters(
-								`
-							UPDATE ${tablePrefix}workflow_entity
-							SET name = :name
-							WHERE id = '${id}'
-						`,
-								{ name: `${name} ${index + 1}` },
-								{},
-							);
-
-						return queryRunner.query(updateQuery, updateParams);
-					}),
-				);
-			}
-		}
-
-		await queryRunner.query(
-			'ALTER TABLE `' +
-				tablePrefix +
-				'workflow_entity` ADD UNIQUE INDEX `IDX_' +
-				tablePrefix +
-				'943d8f922be094eb507cb9a7f9` (`name`)',
-		);
-	}
-
-	async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
-
-		await queryRunner.query(
-			'ALTER TABLE `' +
-				tablePrefix +
-				'workflow_entity` DROP INDEX `IDX_' +
-				tablePrefix +
-				'943d8f922be094eb507cb9a7f9`',
-		);
-	}
-}
+export class UniqueWorkflowNames1620826335440 extends UniqueWorkflowNames1620821879465 {}
diff --git a/packages/cli/src/databases/migrations/mysqldb/1623936588000-CertifyCorrectCollation.ts b/packages/cli/src/databases/migrations/mysqldb/1623936588000-CertifyCorrectCollation.ts
index 01bb084ebe65a..27ef69edc345e 100644
--- a/packages/cli/src/databases/migrations/mysqldb/1623936588000-CertifyCorrectCollation.ts
+++ b/packages/cli/src/databases/migrations/mysqldb/1623936588000-CertifyCorrectCollation.ts
@@ -1,30 +1,22 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import config from '@/config';
+import type { MigrationContext, IrreversibleMigration } from '@db/types';
 
-export class CertifyCorrectCollation1623936588000 implements MigrationInterface {
-	name = 'CertifyCorrectCollation1623936588000';
-
-	async up(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
-		const databaseType = config.getEnv('database.type');
-
-		if (databaseType === 'mariadb') {
+export class CertifyCorrectCollation1623936588000 implements IrreversibleMigration {
+	async up({ queryRunner, tablePrefix, dbType, dbName }: MigrationContext) {
+		if (dbType === 'mariadb') {
 			// This applies to MySQL only.
 			return;
 		}
 
-		const checkCollationExistence = await queryRunner.query(
-			`show collation where collation like 'utf8mb4_0900_ai_ci';`,
-		);
+		const checkCollationExistence = (await queryRunner.query(
+			"show collation where collation like 'utf8mb4_0900_ai_ci';",
+		)) as unknown[];
 		let collation = 'utf8mb4_general_ci';
 		if (checkCollationExistence.length > 0) {
 			collation = 'utf8mb4_0900_ai_ci';
 		}
 
-		const databaseName = config.getEnv(`database.mysqldb.database`);
-
 		await queryRunner.query(
-			`ALTER DATABASE \`${databaseName}\` CHARACTER SET utf8mb4 COLLATE ${collation};`,
+			`ALTER DATABASE \`${dbName}\` CHARACTER SET utf8mb4 COLLATE ${collation};`,
 		);
 
 		for (const tableName of [
@@ -41,9 +33,6 @@ export class CertifyCorrectCollation1623936588000 implements MigrationInterface
 		}
 	}
 
-	async down(queryRunner: QueryRunner): Promise<void> {
-		// There is nothing to undo in this case as we already expect default collation to be utf8mb4
-		// This migration exists simply to enforce that n8n will work with
-		// older mysql versions
-	}
+	// There is no down migration in this case as we already expect default collation to be utf8mb4
+	// The up migration exists simply to enforce that n8n will work with older mysql versions
 }
diff --git a/packages/cli/src/databases/migrations/mysqldb/1626183952959-AddWaitColumn.ts b/packages/cli/src/databases/migrations/mysqldb/1626183952959-AddWaitColumn.ts
index cada1259072f6..86adde6058392 100644
--- a/packages/cli/src/databases/migrations/mysqldb/1626183952959-AddWaitColumn.ts
+++ b/packages/cli/src/databases/migrations/mysqldb/1626183952959-AddWaitColumn.ts
@@ -1,12 +1,7 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import config from '@/config';
-
-export class AddWaitColumnId1626183952959 implements MigrationInterface {
-	name = 'AddWaitColumnId1626183952959';
-
-	async up(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
+export class AddWaitColumnId1626183952959 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			'ALTER TABLE `' + tablePrefix + 'execution_entity` ADD `waitTill` DATETIME NULL',
 		);
@@ -19,9 +14,7 @@ export class AddWaitColumnId1626183952959 implements MigrationInterface {
 		);
 	}
 
-	async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
-
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			'DROP INDEX `IDX_' +
 				tablePrefix +
diff --git a/packages/cli/src/databases/migrations/mysqldb/1630451444017-UpdateWorkflowCredentials.ts b/packages/cli/src/databases/migrations/mysqldb/1630451444017-UpdateWorkflowCredentials.ts
index 63a102496fd8e..cbc3464cb4882 100644
--- a/packages/cli/src/databases/migrations/mysqldb/1630451444017-UpdateWorkflowCredentials.ts
+++ b/packages/cli/src/databases/migrations/mysqldb/1630451444017-UpdateWorkflowCredentials.ts
@@ -1,300 +1,3 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import config from '@/config';
-import { runInBatches } from '@db/utils/migrationHelpers';
+import { UpdateWorkflowCredentials1630330987096 } from '../common/1630330987096-UpdateWorkflowCredentials';
 
-// replacing the credentials in workflows and execution
-// `nodeType: name` changes to `nodeType: { id, name }`
-
-export class UpdateWorkflowCredentials1630451444017 implements MigrationInterface {
-	name = 'UpdateWorkflowCredentials1630451444017';
-
-	public async up(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
-
-		const credentialsEntities = await queryRunner.query(`
-			SELECT id, name, type
-			FROM ${tablePrefix}credentials_entity
-		`);
-
-		const workflowsQuery = `
-			SELECT id, nodes
-			FROM ${tablePrefix}workflow_entity
-		`;
-
-		// @ts-ignore
-		await runInBatches(queryRunner, workflowsQuery, (workflows) => {
-			workflows.forEach(async (workflow) => {
-				const nodes = workflow.nodes;
-				let credentialsUpdated = false;
-				// @ts-ignore
-				nodes.forEach((node) => {
-					if (node.credentials) {
-						const allNodeCredentials = Object.entries(node.credentials);
-						for (const [type, name] of allNodeCredentials) {
-							if (typeof name === 'string') {
-								const matchingCredentials = credentialsEntities.find(
-									// @ts-ignore
-									(credentials) => credentials.name === name && credentials.type === type,
-								);
-								node.credentials[type] = { id: matchingCredentials?.id || null, name };
-								credentialsUpdated = true;
-							}
-						}
-					}
-				});
-				if (credentialsUpdated) {
-					const [updateQuery, updateParams] =
-						queryRunner.connection.driver.escapeQueryWithParameters(
-							`
-								UPDATE ${tablePrefix}workflow_entity
-								SET nodes = :nodes
-								WHERE id = '${workflow.id}'
-							`,
-							{ nodes: JSON.stringify(nodes) },
-							{},
-						);
-
-					queryRunner.query(updateQuery, updateParams);
-				}
-			});
-		});
-
-		const waitingExecutionsQuery = `
-			SELECT id, workflowData
-			FROM ${tablePrefix}execution_entity
-			WHERE waitTill IS NOT NULL AND finished = 0
-		`;
-		// @ts-ignore
-		await runInBatches(queryRunner, waitingExecutionsQuery, (waitingExecutions) => {
-			waitingExecutions.forEach(async (execution) => {
-				const data = execution.workflowData;
-				let credentialsUpdated = false;
-				// @ts-ignore
-				data.nodes.forEach((node) => {
-					if (node.credentials) {
-						const allNodeCredentials = Object.entries(node.credentials);
-						for (const [type, name] of allNodeCredentials) {
-							if (typeof name === 'string') {
-								const matchingCredentials = credentialsEntities.find(
-									// @ts-ignore
-									(credentials) => credentials.name === name && credentials.type === type,
-								);
-								node.credentials[type] = { id: matchingCredentials?.id || null, name };
-								credentialsUpdated = true;
-							}
-						}
-					}
-				});
-				if (credentialsUpdated) {
-					const [updateQuery, updateParams] =
-						queryRunner.connection.driver.escapeQueryWithParameters(
-							`
-								UPDATE ${tablePrefix}execution_entity
-								SET workflowData = :data
-								WHERE id = '${execution.id}'
-							`,
-							{ data: JSON.stringify(data) },
-							{},
-						);
-
-					queryRunner.query(updateQuery, updateParams);
-				}
-			});
-		});
-
-		const retryableExecutions = await queryRunner.query(`
-			SELECT id, workflowData
-			FROM ${tablePrefix}execution_entity
-			WHERE waitTill IS NULL AND finished = 0 AND mode != 'retry'
-			ORDER BY startedAt DESC
-			LIMIT 200
-		`);
-		// @ts-ignore
-		retryableExecutions.forEach(async (execution) => {
-			const data = execution.workflowData;
-			let credentialsUpdated = false;
-			// @ts-ignore
-			data.nodes.forEach((node) => {
-				if (node.credentials) {
-					const allNodeCredentials = Object.entries(node.credentials);
-					for (const [type, name] of allNodeCredentials) {
-						if (typeof name === 'string') {
-							const matchingCredentials = credentialsEntities.find(
-								// @ts-ignore
-								(credentials) => credentials.name === name && credentials.type === type,
-							);
-							node.credentials[type] = { id: matchingCredentials?.id || null, name };
-							credentialsUpdated = true;
-						}
-					}
-				}
-			});
-			if (credentialsUpdated) {
-				const [updateQuery, updateParams] = queryRunner.connection.driver.escapeQueryWithParameters(
-					`
-						UPDATE ${tablePrefix}execution_entity
-						SET workflowData = :data
-						WHERE id = '${execution.id}'
-					`,
-					{ data: JSON.stringify(data) },
-					{},
-				);
-
-				queryRunner.query(updateQuery, updateParams);
-			}
-		});
-	}
-
-	public async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
-
-		const credentialsEntities = await queryRunner.query(`
-			SELECT id, name, type
-			FROM ${tablePrefix}credentials_entity
-		`);
-
-		const workflowsQuery = `
-			SELECT id, nodes
-			FROM ${tablePrefix}workflow_entity
-		`;
-		// @ts-ignore
-		await runInBatches(queryRunner, workflowsQuery, (workflows) => {
-			workflows.forEach(async (workflow) => {
-				const nodes = workflow.nodes;
-				let credentialsUpdated = false;
-				// @ts-ignore
-				nodes.forEach((node) => {
-					if (node.credentials) {
-						const allNodeCredentials = Object.entries(node.credentials);
-						for (const [type, creds] of allNodeCredentials) {
-							if (typeof creds === 'object') {
-								const matchingCredentials = credentialsEntities.find(
-									// @ts-ignore
-									(credentials) => credentials.id === creds.id && credentials.type === type,
-								);
-								if (matchingCredentials) {
-									node.credentials[type] = matchingCredentials.name;
-								} else {
-									// @ts-ignore
-									node.credentials[type] = creds.name;
-								}
-								credentialsUpdated = true;
-							}
-						}
-					}
-				});
-				if (credentialsUpdated) {
-					const [updateQuery, updateParams] =
-						queryRunner.connection.driver.escapeQueryWithParameters(
-							`
-								UPDATE ${tablePrefix}workflow_entity
-								SET nodes = :nodes
-								WHERE id = '${workflow.id}'
-							`,
-							{ nodes: JSON.stringify(nodes) },
-							{},
-						);
-
-					queryRunner.query(updateQuery, updateParams);
-				}
-			});
-		});
-
-		const waitingExecutionsQuery = `
-			SELECT id, workflowData
-			FROM ${tablePrefix}execution_entity
-			WHERE waitTill IS NOT NULL AND finished = 0
-		`;
-		// @ts-ignore
-		await runInBatches(queryRunner, waitingExecutionsQuery, (waitingExecutions) => {
-			waitingExecutions.forEach(async (execution) => {
-				const data = execution.workflowData;
-				let credentialsUpdated = false;
-				// @ts-ignore
-				data.nodes.forEach((node) => {
-					if (node.credentials) {
-						const allNodeCredentials = Object.entries(node.credentials);
-						for (const [type, creds] of allNodeCredentials) {
-							if (typeof creds === 'object') {
-								// @ts-ignore
-								const matchingCredentials = credentialsEntities.find(
-									// @ts-ignore
-									(credentials) => credentials.id === creds.id && credentials.type === type,
-								);
-								if (matchingCredentials) {
-									node.credentials[type] = matchingCredentials.name;
-								} else {
-									// @ts-ignore
-									node.credentials[type] = creds.name;
-								}
-								credentialsUpdated = true;
-							}
-						}
-					}
-				});
-				if (credentialsUpdated) {
-					const [updateQuery, updateParams] =
-						queryRunner.connection.driver.escapeQueryWithParameters(
-							`
-								UPDATE ${tablePrefix}execution_entity
-								SET workflowData = :data
-								WHERE id = '${execution.id}'
-							`,
-							{ data: JSON.stringify(data) },
-							{},
-						);
-
-					queryRunner.query(updateQuery, updateParams);
-				}
-			});
-		});
-
-		const retryableExecutions = await queryRunner.query(`
-			SELECT id, workflowData
-			FROM ${tablePrefix}execution_entity
-			WHERE waitTill IS NULL AND finished = 0 AND mode != 'retry'
-			ORDER BY startedAt DESC
-			LIMIT 200
-		`);
-		// @ts-ignore
-		retryableExecutions.forEach(async (execution) => {
-			const data = execution.workflowData;
-			let credentialsUpdated = false;
-			// @ts-ignore
-			data.nodes.forEach((node) => {
-				if (node.credentials) {
-					const allNodeCredentials = Object.entries(node.credentials);
-					for (const [type, creds] of allNodeCredentials) {
-						if (typeof creds === 'object') {
-							// @ts-ignore
-							const matchingCredentials = credentialsEntities.find(
-								// @ts-ignore
-								(credentials) => credentials.id === creds.id && credentials.type === type,
-							);
-							if (matchingCredentials) {
-								node.credentials[type] = matchingCredentials.name;
-							} else {
-								// @ts-ignore
-								node.credentials[type] = creds.name;
-							}
-							credentialsUpdated = true;
-						}
-					}
-				}
-			});
-			if (credentialsUpdated) {
-				const [updateQuery, updateParams] = queryRunner.connection.driver.escapeQueryWithParameters(
-					`
-						UPDATE ${tablePrefix}execution_entity
-						SET workflowData = :data
-						WHERE id = '${execution.id}'
-					`,
-					{ data: JSON.stringify(data) },
-					{},
-				);
-
-				queryRunner.query(updateQuery, updateParams);
-			}
-		});
-	}
-}
+export class UpdateWorkflowCredentials1630451444017 extends UpdateWorkflowCredentials1630330987096 {}
diff --git a/packages/cli/src/databases/migrations/mysqldb/1644424784709-AddExecutionEntityIndexes.ts b/packages/cli/src/databases/migrations/mysqldb/1644424784709-AddExecutionEntityIndexes.ts
index d5252eb0b7a76..aaa493fb81640 100644
--- a/packages/cli/src/databases/migrations/mysqldb/1644424784709-AddExecutionEntityIndexes.ts
+++ b/packages/cli/src/databases/migrations/mysqldb/1644424784709-AddExecutionEntityIndexes.ts
@@ -1,12 +1,7 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import config from '@/config';
-
-export class AddExecutionEntityIndexes1644424784709 implements MigrationInterface {
-	name = 'AddExecutionEntityIndexes1644424784709';
-
-	public async up(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
+export class AddExecutionEntityIndexes1644424784709 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			`DROP INDEX \`IDX_${tablePrefix}c4d999a5e90784e8caccf5589d\` ON \`${tablePrefix}execution_entity\``,
 		);
@@ -30,8 +25,7 @@ export class AddExecutionEntityIndexes1644424784709 implements MigrationInterfac
 		);
 	}
 
-	public async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			`DROP INDEX \`IDX_${tablePrefix}81fc04c8a17de15835713505e4\` ON \`${tablePrefix}execution_entity\``,
 		);
diff --git a/packages/cli/src/databases/migrations/mysqldb/1646992772331-CreateUserManagement.ts b/packages/cli/src/databases/migrations/mysqldb/1646992772331-CreateUserManagement.ts
index ed46e004f037d..e36bec5e0fee7 100644
--- a/packages/cli/src/databases/migrations/mysqldb/1646992772331-CreateUserManagement.ts
+++ b/packages/cli/src/databases/migrations/mysqldb/1646992772331-CreateUserManagement.ts
@@ -1,14 +1,8 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
+import type { InsertResult, MigrationContext, ReversibleMigration } from '@db/types';
 import { v4 as uuid } from 'uuid';
-import config from '@/config';
-import { loadSurveyFromDisk } from '@db/utils/migrationHelpers';
-
-export class CreateUserManagement1646992772331 implements MigrationInterface {
-	name = 'CreateUserManagement1646992772331';
-
-	public async up(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
 
+export class CreateUserManagement1646992772331 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix, loadSurveyFromDisk }: MigrationContext) {
 		await queryRunner.query(
 			`CREATE TABLE ${tablePrefix}role (
 				\`id\` int NOT NULL AUTO_INCREMENT,
@@ -114,7 +108,9 @@ export class CreateUserManagement1646992772331 implements MigrationInterface {
 			`INSERT INTO ${tablePrefix}role (name, scope) VALUES ("owner", "global");`,
 		);
 
-		const instanceOwnerRole = await queryRunner.query('SELECT LAST_INSERT_ID() as insertId');
+		const instanceOwnerRole = (await queryRunner.query(
+			'SELECT LAST_INSERT_ID() as insertId',
+		)) as InsertResult;
 
 		await queryRunner.query(
 			`INSERT INTO ${tablePrefix}role (name, scope) VALUES ("member", "global");`,
@@ -124,13 +120,17 @@ export class CreateUserManagement1646992772331 implements MigrationInterface {
 			`INSERT INTO ${tablePrefix}role (name, scope) VALUES ("owner", "workflow");`,
 		);
 
-		const workflowOwnerRole = await queryRunner.query('SELECT LAST_INSERT_ID() as insertId');
+		const workflowOwnerRole = (await queryRunner.query(
+			'SELECT LAST_INSERT_ID() as insertId',
+		)) as InsertResult;
 
 		await queryRunner.query(
 			`INSERT INTO ${tablePrefix}role (name, scope) VALUES ("owner", "credential");`,
 		);
 
-		const credentialOwnerRole = await queryRunner.query('SELECT LAST_INSERT_ID() as insertId');
+		const credentialOwnerRole = (await queryRunner.query(
+			'SELECT LAST_INSERT_ID() as insertId',
+		)) as InsertResult;
 
 		const survey = loadSurveyFromDisk();
 
@@ -153,11 +153,13 @@ export class CreateUserManagement1646992772331 implements MigrationInterface {
 		await queryRunner.query(
 			`INSERT INTO ${tablePrefix}settings (\`key\`, value, loadOnStartup) VALUES ("userManagement.isInstanceOwnerSetUp", "false", 1), ("userManagement.skipInstanceOwnerSetup", "false", 1)`,
 		);
-	}
 
-	public async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
+		await queryRunner.query(
+			`INSERT INTO ${tablePrefix}settings (\`key\`, value, loadOnStartup) VALUES ("ui.banners.dismissed", JSON_ARRAY('V1'), 1)`,
+		);
+	}
 
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			`ALTER TABLE ${tablePrefix}workflow_entity ADD UNIQUE INDEX \`IDX_${tablePrefix}943d8f922be094eb507cb9a7f9\` (\`name\`)`,
 		);
diff --git a/packages/cli/src/databases/migrations/mysqldb/1648740597343-LowerCaseUserEmail.ts b/packages/cli/src/databases/migrations/mysqldb/1648740597343-LowerCaseUserEmail.ts
index 47decf46deb77..aa4804357b4ec 100644
--- a/packages/cli/src/databases/migrations/mysqldb/1648740597343-LowerCaseUserEmail.ts
+++ b/packages/cli/src/databases/migrations/mysqldb/1648740597343-LowerCaseUserEmail.ts
@@ -1,17 +1,10 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import config from '@/config';
-
-export class LowerCaseUserEmail1648740597343 implements MigrationInterface {
-	name = 'LowerCaseUserEmail1648740597343';
-
-	public async up(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.get('database.tablePrefix');
+import type { MigrationContext, IrreversibleMigration } from '@db/types';
 
+export class LowerCaseUserEmail1648740597343 implements IrreversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`
 			UPDATE ${tablePrefix}user
 			SET email = LOWER(email);
 		`);
 	}
-
-	public async down(queryRunner: QueryRunner): Promise<void> {}
 }
diff --git a/packages/cli/src/databases/migrations/mysqldb/1652254514003-CommunityNodes.ts b/packages/cli/src/databases/migrations/mysqldb/1652254514003-CommunityNodes.ts
index 0632e8de5aa9f..1b3b270689f5c 100644
--- a/packages/cli/src/databases/migrations/mysqldb/1652254514003-CommunityNodes.ts
+++ b/packages/cli/src/databases/migrations/mysqldb/1652254514003-CommunityNodes.ts
@@ -1,12 +1,7 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import config from '@/config';
-
-export class CommunityNodes1652254514003 implements MigrationInterface {
-	name = 'CommunityNodes1652254514003';
-
-	public async up(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
+export class CommunityNodes1652254514003 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			`CREATE TABLE \`${tablePrefix}installed_packages\` (` +
 				'`packageName` char(214) NOT NULL,' +
@@ -35,9 +30,7 @@ export class CommunityNodes1652254514003 implements MigrationInterface {
 		);
 	}
 
-	public async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
-
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			`ALTER TABLE ${tablePrefix}workflow_entity ADD UNIQUE INDEX \`IDX_${tablePrefix}943d8f922be094eb507cb9a7f9\` (\`name\`)`,
 		);
diff --git a/packages/cli/src/databases/migrations/mysqldb/1652367743993-AddUserSettings.ts b/packages/cli/src/databases/migrations/mysqldb/1652367743993-AddUserSettings.ts
index ccbaad072db0e..33020e7545a72 100644
--- a/packages/cli/src/databases/migrations/mysqldb/1652367743993-AddUserSettings.ts
+++ b/packages/cli/src/databases/migrations/mysqldb/1652367743993-AddUserSettings.ts
@@ -1,12 +1,7 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import config from '@/config';
-
-export class AddUserSettings1652367743993 implements MigrationInterface {
-	name = 'AddUserSettings1652367743993';
-
-	public async up(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
+export class AddUserSettings1652367743993 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			'ALTER TABLE `' + tablePrefix + 'user` ADD COLUMN `settings` json NULL DEFAULT NULL',
 		);
@@ -17,9 +12,7 @@ export class AddUserSettings1652367743993 implements MigrationInterface {
 		);
 	}
 
-	public async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
-
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query('ALTER TABLE `' + tablePrefix + 'user` DROP COLUMN `settings`');
 	}
 }
diff --git a/packages/cli/src/databases/migrations/mysqldb/1652905585850-AddAPIKeyColumn.ts b/packages/cli/src/databases/migrations/mysqldb/1652905585850-AddAPIKeyColumn.ts
index 4e51d9156f7fd..ba390d3f6cfa9 100644
--- a/packages/cli/src/databases/migrations/mysqldb/1652905585850-AddAPIKeyColumn.ts
+++ b/packages/cli/src/databases/migrations/mysqldb/1652905585850-AddAPIKeyColumn.ts
@@ -1,12 +1,7 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import config from '@/config';
-
-export class AddAPIKeyColumn1652905585850 implements MigrationInterface {
-	name = 'AddAPIKeyColumn1652905585850';
-
-	public async up(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
+export class AddAPIKeyColumn1652905585850 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			'ALTER TABLE `' + tablePrefix + 'user` ADD COLUMN `apiKey` VARCHAR(255)',
 		);
@@ -19,8 +14,7 @@ export class AddAPIKeyColumn1652905585850 implements MigrationInterface {
 		);
 	}
 
-	public async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.get('database.tablePrefix');
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			`DROP INDEX \`UQ_${tablePrefix}ie0zomxves9w3p774drfrkxtj5\` ON \`${tablePrefix}user\``,
 		);
diff --git a/packages/cli/src/databases/migrations/mysqldb/1654090101303-IntroducePinData.ts b/packages/cli/src/databases/migrations/mysqldb/1654090101303-IntroducePinData.ts
index 57fdccfa0f1a2..4d0eb25ec3964 100644
--- a/packages/cli/src/databases/migrations/mysqldb/1654090101303-IntroducePinData.ts
+++ b/packages/cli/src/databases/migrations/mysqldb/1654090101303-IntroducePinData.ts
@@ -1,23 +1,11 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
-import config from '@/config';
-
-export class IntroducePinData1654090101303 implements MigrationInterface {
-	name = 'IntroducePinData1654090101303';
-
-	async up(queryRunner: QueryRunner): Promise<void> {
-		logMigrationStart(this.name);
-
-		const tablePrefix = config.getEnv('database.tablePrefix');
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
+export class IntroducePinData1654090101303 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`ALTER TABLE \`${tablePrefix}workflow_entity\` ADD \`pinData\` json`);
-
-		logMigrationEnd(this.name);
 	}
 
-	async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
-
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			`ALTER TABLE \`${tablePrefix}workflow_entity\` DROP COLUMN \`pinData\``,
 		);
diff --git a/packages/cli/src/databases/migrations/mysqldb/1658932910559-AddNodeIds.ts b/packages/cli/src/databases/migrations/mysqldb/1658932910559-AddNodeIds.ts
index 9e5257666569e..2d05873470b81 100644
--- a/packages/cli/src/databases/migrations/mysqldb/1658932910559-AddNodeIds.ts
+++ b/packages/cli/src/databases/migrations/mysqldb/1658932910559-AddNodeIds.ts
@@ -1,78 +1,3 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import config from '@/config';
-import { runInBatches } from '@db/utils/migrationHelpers';
-import { v4 as uuid } from 'uuid';
+import { AddNodeIds1658930531669 } from '../common/1658930531669-AddNodeIds';
 
-// add node ids in workflow objects
-
-export class AddNodeIds1658932910559 implements MigrationInterface {
-	name = 'AddNodeIds1658932910559';
-
-	public async up(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
-
-		const workflowsQuery = `
-			SELECT id, nodes
-			FROM ${tablePrefix}workflow_entity
-		`;
-
-		// @ts-ignore
-		await runInBatches(queryRunner, workflowsQuery, (workflows) => {
-			workflows.forEach(async (workflow) => {
-				let nodes = workflow.nodes;
-				if (typeof nodes === 'string') {
-					nodes = JSON.parse(nodes);
-				}
-
-				// @ts-ignore
-				nodes.forEach((node) => {
-					if (!node.id) {
-						node.id = uuid();
-					}
-				});
-
-				const [updateQuery, updateParams] = queryRunner.connection.driver.escapeQueryWithParameters(
-					`
-							UPDATE ${tablePrefix}workflow_entity
-							SET nodes = :nodes
-							WHERE id = '${workflow.id}'
-						`,
-					{ nodes: JSON.stringify(nodes) },
-					{},
-				);
-
-				queryRunner.query(updateQuery, updateParams);
-			});
-		});
-	}
-
-	public async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
-
-		const workflowsQuery = `
-			SELECT id, nodes
-			FROM ${tablePrefix}workflow_entity
-		`;
-
-		// @ts-ignore
-		await runInBatches(queryRunner, workflowsQuery, (workflows) => {
-			workflows.forEach(async (workflow) => {
-				const nodes = workflow.nodes;
-				// @ts-ignore
-				nodes.forEach((node) => delete node.id);
-
-				const [updateQuery, updateParams] = queryRunner.connection.driver.escapeQueryWithParameters(
-					`
-							UPDATE ${tablePrefix}workflow_entity
-							SET nodes = :nodes
-							WHERE id = '${workflow.id}'
-						`,
-					{ nodes: JSON.stringify(nodes) },
-					{},
-				);
-
-				queryRunner.query(updateQuery, updateParams);
-			});
-		});
-	}
-}
+export class AddNodeIds1658932910559 extends AddNodeIds1658930531669 {}
diff --git a/packages/cli/src/databases/migrations/mysqldb/1659895550980-AddJsonKeyPinData.ts b/packages/cli/src/databases/migrations/mysqldb/1659895550980-AddJsonKeyPinData.ts
index f42c0dc86e036..656197a645d79 100644
--- a/packages/cli/src/databases/migrations/mysqldb/1659895550980-AddJsonKeyPinData.ts
+++ b/packages/cli/src/databases/migrations/mysqldb/1659895550980-AddJsonKeyPinData.ts
@@ -1,46 +1,3 @@
-import {
-	logMigrationStart,
-	logMigrationEnd,
-	runInBatches,
-	getTablePrefix,
-} from '@db/utils/migrationHelpers';
-import { addJsonKeyToPinDataColumn } from '../sqlite/1659888469333-AddJsonKeyPinData';
-import type { MigrationInterface, QueryRunner } from 'typeorm';
+import { AddJsonKeyPinData1659888469333 } from '../common/1659888469333-AddJsonKeyPinData';
 
-/**
- * Convert JSON-type `pinData` column in `workflow_entity` table from
- * `{ [nodeName: string]: IDataObject[] }` to `{ [nodeName: string]: INodeExecutionData[] }`
- */
-export class AddJsonKeyPinData1659895550980 implements MigrationInterface {
-	name = 'AddJsonKeyPinData1659895550980';
-
-	async up(queryRunner: QueryRunner) {
-		logMigrationStart(this.name);
-
-		const workflowTable = `${getTablePrefix()}workflow_entity`;
-
-		const PINDATA_SELECT_QUERY = `
-			SELECT id, pinData
-			FROM \`${workflowTable}\`
-			WHERE pinData IS NOT NULL;
-		`;
-
-		const PINDATA_UPDATE_STATEMENT = `
-			UPDATE \`${workflowTable}\`
-			SET \`pinData\` = :pinData
-			WHERE id = :id;
-		`;
-
-		await runInBatches(
-			queryRunner,
-			PINDATA_SELECT_QUERY,
-			addJsonKeyToPinDataColumn(queryRunner, PINDATA_UPDATE_STATEMENT),
-		);
-
-		logMigrationEnd(this.name);
-	}
-
-	async down() {
-		// irreversible migration
-	}
-}
+export class AddJsonKeyPinData1659895550980 extends AddJsonKeyPinData1659888469333 {}
diff --git a/packages/cli/src/databases/migrations/mysqldb/1660062385367-CreateCredentialsUserRole.ts b/packages/cli/src/databases/migrations/mysqldb/1660062385367-CreateCredentialsUserRole.ts
index de061448ed337..98a8158081d8b 100644
--- a/packages/cli/src/databases/migrations/mysqldb/1660062385367-CreateCredentialsUserRole.ts
+++ b/packages/cli/src/databases/migrations/mysqldb/1660062385367-CreateCredentialsUserRole.ts
@@ -1,21 +1,14 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import config from '@/config';
-
-export class CreateCredentialsUserRole1660062385367 implements MigrationInterface {
-	name = 'CreateCredentialsUserRole1660062385367';
-
-	async up(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
+export class CreateCredentialsUserRole1660062385367 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`
 			INSERT IGNORE INTO ${tablePrefix}role (name, scope)
 			VALUES ("user", "credential");
 		`);
 	}
 
-	async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
-
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`
 			DELETE FROM ${tablePrefix}role WHERE name='user' AND scope='credential';
 		`);
diff --git a/packages/cli/src/databases/migrations/mysqldb/1663755770894-CreateWorkflowsEditorRole.ts b/packages/cli/src/databases/migrations/mysqldb/1663755770894-CreateWorkflowsEditorRole.ts
index 5a49e3a40e996..d11f1c5f57ae8 100644
--- a/packages/cli/src/databases/migrations/mysqldb/1663755770894-CreateWorkflowsEditorRole.ts
+++ b/packages/cli/src/databases/migrations/mysqldb/1663755770894-CreateWorkflowsEditorRole.ts
@@ -1,24 +1,14 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { getTablePrefix, logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
-
-export class CreateWorkflowsEditorRole1663755770894 implements MigrationInterface {
-	name = 'CreateWorkflowsEditorRole1663755770894';
-
-	async up(queryRunner: QueryRunner) {
-		logMigrationStart(this.name);
-		const tablePrefix = getTablePrefix();
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
+export class CreateWorkflowsEditorRole1663755770894 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`
 			INSERT IGNORE INTO ${tablePrefix}role (name, scope)
 			VALUES ("editor", "workflow")
 		`);
-
-		logMigrationEnd(this.name);
 	}
 
-	async down(queryRunner: QueryRunner) {
-		const tablePrefix = getTablePrefix();
-
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`
 			DELETE FROM ${tablePrefix}role WHERE name='user' AND scope='workflow';
 		`);
diff --git a/packages/cli/src/databases/migrations/mysqldb/1664196174002-WorkflowStatistics.ts b/packages/cli/src/databases/migrations/mysqldb/1664196174002-WorkflowStatistics.ts
index a4ef5f9d4bd97..f4c8e2cc0f016 100644
--- a/packages/cli/src/databases/migrations/mysqldb/1664196174002-WorkflowStatistics.ts
+++ b/packages/cli/src/databases/migrations/mysqldb/1664196174002-WorkflowStatistics.ts
@@ -1,15 +1,7 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { logMigrationEnd, logMigrationStart } from '../../utils/migrationHelpers';
-import config from '@/config';
-
-export class WorkflowStatistics1664196174002 implements MigrationInterface {
-	name = 'WorkflowStatistics1664196174002';
-
-	async up(queryRunner: QueryRunner): Promise<void> {
-		logMigrationStart(this.name);
-
-		const tablePrefix = config.getEnv('database.tablePrefix');
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
+export class WorkflowStatistics1664196174002 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			`CREATE TABLE ${tablePrefix}workflow_statistics (
 				count INTEGER DEFAULT 0,
@@ -25,13 +17,9 @@ export class WorkflowStatistics1664196174002 implements MigrationInterface {
 		await queryRunner.query(
 			`ALTER TABLE ${tablePrefix}workflow_entity ADD COLUMN dataLoaded BOOLEAN DEFAULT false`,
 		);
-
-		logMigrationEnd(this.name);
 	}
 
-	async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
-
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`DROP TABLE "${tablePrefix}workflow_statistics"`);
 		await queryRunner.query(`ALTER TABLE ${tablePrefix}workflow_entity DROP COLUMN dataLoaded`);
 	}
diff --git a/packages/cli/src/databases/migrations/mysqldb/1665484192213-CreateCredentialUsageTable.ts b/packages/cli/src/databases/migrations/mysqldb/1665484192213-CreateCredentialUsageTable.ts
index fa060155559a4..e35185185f60d 100644
--- a/packages/cli/src/databases/migrations/mysqldb/1665484192213-CreateCredentialUsageTable.ts
+++ b/packages/cli/src/databases/migrations/mysqldb/1665484192213-CreateCredentialUsageTable.ts
@@ -1,20 +1,14 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { getTablePrefix, logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
-
-export class CreateCredentialUsageTable1665484192213 implements MigrationInterface {
-	name = 'CreateCredentialUsageTable1665484192213';
-
-	async up(queryRunner: QueryRunner) {
-		logMigrationStart(this.name);
-		const tablePrefix = getTablePrefix();
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
+export class CreateCredentialUsageTable1665484192213 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			`CREATE TABLE \`${tablePrefix}credential_usage\` (` +
 				'`workflowId` int NOT NULL,' +
 				'`nodeId` char(200) NOT NULL,' +
 				"`credentialId` int NOT NULL DEFAULT '1'," +
-				`\`createdAt\` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,` +
-				`\`updatedAt\` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,` +
+				'`createdAt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,' +
+				'`updatedAt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,' +
 				'PRIMARY KEY (`workflowId`, `nodeId`, `credentialId`)' +
 				") ENGINE='InnoDB';",
 		);
@@ -26,13 +20,9 @@ export class CreateCredentialUsageTable1665484192213 implements MigrationInterfa
 		await queryRunner.query(
 			`ALTER TABLE \`${tablePrefix}credential_usage\` ADD CONSTRAINT \`FK_${tablePrefix}7ce200a20ade7ae89fa7901da896993f\` FOREIGN KEY (\`credentialId\`) REFERENCES \`${tablePrefix}credentials_entity\`(\`id\`) ON DELETE CASCADE ON UPDATE CASCADE`,
 		);
-
-		logMigrationEnd(this.name);
 	}
 
-	async down(queryRunner: QueryRunner) {
-		const tablePrefix = getTablePrefix();
-
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`DROP TABLE "${tablePrefix}credential_usage"`);
 	}
 }
diff --git a/packages/cli/src/databases/migrations/mysqldb/1665754637026-RemoveCredentialUsageTable.ts b/packages/cli/src/databases/migrations/mysqldb/1665754637026-RemoveCredentialUsageTable.ts
index 6849bfdfd2910..b7e86a29697bb 100644
--- a/packages/cli/src/databases/migrations/mysqldb/1665754637026-RemoveCredentialUsageTable.ts
+++ b/packages/cli/src/databases/migrations/mysqldb/1665754637026-RemoveCredentialUsageTable.ts
@@ -1,27 +1,18 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { getTablePrefix, logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
-export class RemoveCredentialUsageTable1665754637026 implements MigrationInterface {
-	name = 'RemoveCredentialUsageTable1665754637026';
-
-	async up(queryRunner: QueryRunner) {
-		logMigrationStart(this.name);
-		const tablePrefix = getTablePrefix();
+export class RemoveCredentialUsageTable1665754637026 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`DROP TABLE \`${tablePrefix}credential_usage\``);
-
-		logMigrationEnd(this.name);
 	}
 
-	async down(queryRunner: QueryRunner) {
-		const tablePrefix = getTablePrefix();
-
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			`CREATE TABLE \`${tablePrefix}credential_usage\` (` +
 				'`workflowId` int NOT NULL,' +
 				'`nodeId` char(200) NOT NULL,' +
 				"`credentialId` int NOT NULL DEFAULT '1'," +
-				`\`createdAt\` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,` +
-				`\`updatedAt\` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,` +
+				'`createdAt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,' +
+				'`updatedAt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,' +
 				'PRIMARY KEY (`workflowId`, `nodeId`, `credentialId`)' +
 				") ENGINE='InnoDB';",
 		);
diff --git a/packages/cli/src/databases/migrations/mysqldb/1669739707125-AddWorkflowVersionIdColumn.ts b/packages/cli/src/databases/migrations/mysqldb/1669739707125-AddWorkflowVersionIdColumn.ts
index a752fc1b36d35..84844f4251c37 100644
--- a/packages/cli/src/databases/migrations/mysqldb/1669739707125-AddWorkflowVersionIdColumn.ts
+++ b/packages/cli/src/databases/migrations/mysqldb/1669739707125-AddWorkflowVersionIdColumn.ts
@@ -1,45 +1,3 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
-import config from '@/config';
-import { v4 as uuidv4 } from 'uuid';
+import { AddWorkflowVersionIdColumn1669739707124 } from '../common/1669739707124-AddWorkflowVersionIdColumn';
 
-export class AddWorkflowVersionIdColumn1669739707125 implements MigrationInterface {
-	name = 'AddWorkflowVersionIdColumn1669739707125';
-
-	async up(queryRunner: QueryRunner): Promise<void> {
-		logMigrationStart(this.name);
-
-		const tablePrefix = config.getEnv('database.tablePrefix');
-
-		await queryRunner.query(
-			`ALTER TABLE ${tablePrefix}workflow_entity ADD COLUMN versionId CHAR(36)`,
-		);
-
-		const workflowIds: Array<{ id: number }> = await queryRunner.query(`
-			SELECT id
-			FROM ${tablePrefix}workflow_entity
-		`);
-
-		workflowIds.map(({ id }) => {
-			const [updateQuery, updateParams] = queryRunner.connection.driver.escapeQueryWithParameters(
-				`
-					UPDATE ${tablePrefix}workflow_entity
-					SET versionId = :versionId
-					WHERE id = '${id}'
-				`,
-				{ versionId: uuidv4() },
-				{},
-			);
-
-			return queryRunner.query(updateQuery, updateParams);
-		});
-
-		logMigrationEnd(this.name);
-	}
-
-	async down(queryRunner: QueryRunner) {
-		const tablePrefix = config.getEnv('database.tablePrefix');
-
-		await queryRunner.query(`ALTER TABLE ${tablePrefix}workflow_entity DROP COLUMN versionId`);
-	}
-}
+export class AddWorkflowVersionIdColumn1669739707125 extends AddWorkflowVersionIdColumn1669739707124 {}
diff --git a/packages/cli/src/databases/migrations/mysqldb/1669823906994-AddTriggerCountColumn.ts b/packages/cli/src/databases/migrations/mysqldb/1669823906994-AddTriggerCountColumn.ts
index f332aa08acf52..8371c865d351e 100644
--- a/packages/cli/src/databases/migrations/mysqldb/1669823906994-AddTriggerCountColumn.ts
+++ b/packages/cli/src/databases/migrations/mysqldb/1669823906994-AddTriggerCountColumn.ts
@@ -1,26 +1,14 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
-import config from '@/config';
-
-export class AddTriggerCountColumn1669823906994 implements MigrationInterface {
-	name = 'AddTriggerCountColumn1669823906994';
-
-	async up(queryRunner: QueryRunner): Promise<void> {
-		logMigrationStart(this.name);
-
-		const tablePrefix = config.getEnv('database.tablePrefix');
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
+export class AddTriggerCountColumn1669823906994 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			`ALTER TABLE ${tablePrefix}workflow_entity ADD COLUMN triggerCount integer NOT NULL DEFAULT 0`,
 		);
-		// Table will be populated by n8n startup - see ActiveWorkflowRunner.ts
-
-		logMigrationEnd(this.name);
+		// Table will be populated by n8n startup - see ActiveWorkflowManager.ts
 	}
 
-	async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
-
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`ALTER TABLE ${tablePrefix}workflow_entity DROP COLUMN triggerCount`);
 	}
 }
diff --git a/packages/cli/src/databases/migrations/mysqldb/1671535397530-MessageEventBusDestinations.ts b/packages/cli/src/databases/migrations/mysqldb/1671535397530-MessageEventBusDestinations.ts
index 4f820b15812fa..0fb0eef513faf 100644
--- a/packages/cli/src/databases/migrations/mysqldb/1671535397530-MessageEventBusDestinations.ts
+++ b/packages/cli/src/databases/migrations/mysqldb/1671535397530-MessageEventBusDestinations.ts
@@ -1,12 +1,7 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { getTablePrefix, logMigrationEnd, logMigrationStart } from '../../utils/migrationHelpers';
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
-export class MessageEventBusDestinations1671535397530 implements MigrationInterface {
-	name = 'MessageEventBusDestinations1671535397530';
-
-	async up(queryRunner: QueryRunner) {
-		logMigrationStart(this.name);
-		const tablePrefix = getTablePrefix();
+export class MessageEventBusDestinations1671535397530 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			`CREATE TABLE ${tablePrefix}event_destinations (` +
 				'`id` varchar(36) PRIMARY KEY NOT NULL,' +
@@ -15,13 +10,9 @@ export class MessageEventBusDestinations1671535397530 implements MigrationInterf
 				'`updatedAt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP' +
 				") ENGINE='InnoDB';",
 		);
-		logMigrationEnd(this.name);
 	}
 
-	async down(queryRunner: QueryRunner) {
-		logMigrationStart(this.name);
-		const tablePrefix = getTablePrefix();
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`DROP TABLE "${tablePrefix}event_destinations"`);
-		logMigrationEnd(this.name);
 	}
 }
diff --git a/packages/cli/src/databases/migrations/mysqldb/1671726148420-RemoveWorkflowDataLoadedFlag.ts b/packages/cli/src/databases/migrations/mysqldb/1671726148420-RemoveWorkflowDataLoadedFlag.ts
index 471548d086e88..dc96f7d591ca0 100644
--- a/packages/cli/src/databases/migrations/mysqldb/1671726148420-RemoveWorkflowDataLoadedFlag.ts
+++ b/packages/cli/src/databases/migrations/mysqldb/1671726148420-RemoveWorkflowDataLoadedFlag.ts
@@ -1,64 +1,3 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
-import config from '@/config';
-import { StatisticsNames } from '@db/entities/WorkflowStatistics';
+import { RemoveWorkflowDataLoadedFlag1671726148419 } from '../common/1671726148419-RemoveWorkflowDataLoadedFlag';
 
-export class RemoveWorkflowDataLoadedFlag1671726148420 implements MigrationInterface {
-	name = 'RemoveWorkflowDataLoadedFlag1671726148420';
-
-	async up(queryRunner: QueryRunner) {
-		logMigrationStart(this.name);
-		const tablePrefix = config.getEnv('database.tablePrefix');
-
-		// If any existing workflow has dataLoaded set to true, insert the relevant information to the statistics table
-		const workflowIds: Array<{ id: number; dataLoaded: boolean }> = await queryRunner.query(`
-			SELECT id, dataLoaded
-			FROM ${tablePrefix}workflow_entity
-		`);
-
-		workflowIds.map(({ id, dataLoaded }) => {
-			if (dataLoaded) {
-				const [insertQuery, insertParams] = queryRunner.connection.driver.escapeQueryWithParameters(
-					`
-					INSERT INTO ${tablePrefix}workflow_statistics (workflowId, name, count, latestEvent) VALUES
-					(:id, :name, 1, CURRENT_TIMESTAMP(3))
-					`,
-					{ id, name: StatisticsNames.dataLoaded },
-					{},
-				);
-
-				return queryRunner.query(insertQuery, insertParams);
-			}
-			return undefined;
-		});
-
-		await queryRunner.query(`ALTER TABLE ${tablePrefix}workflow_entity DROP COLUMN dataLoaded`);
-
-		logMigrationEnd(this.name);
-	}
-
-	async down(queryRunner: QueryRunner) {
-		const tablePrefix = config.getEnv('database.tablePrefix');
-
-		await queryRunner.query(
-			`ALTER TABLE ${tablePrefix}workflow_entity ADD COLUMN dataLoaded BOOLEAN DEFAULT false`,
-		);
-
-		// Search through statistics for any workflows that have the dataLoaded stat
-		const workflowsIds: Array<{ workflowId: string }> = await queryRunner.query(`
-			SELECT workflowId
-			FROM ${tablePrefix}workflow_statistics
-			WHERE name = '${StatisticsNames.dataLoaded}'
-		`);
-		workflowsIds.map(({ workflowId }) => {
-			return queryRunner.query(`
-				UPDATE ${tablePrefix}workflow_entity
-				SET dataLoaded = true
-				WHERE id = '${workflowId}'`);
-		});
-
-		await queryRunner.query(
-			`DELETE FROM ${tablePrefix}workflow_statistics WHERE name = '${StatisticsNames.dataLoaded}'`,
-		);
-	}
-}
+export class RemoveWorkflowDataLoadedFlag1671726148420 extends RemoveWorkflowDataLoadedFlag1671726148419 {}
diff --git a/packages/cli/src/databases/migrations/mysqldb/1673268682475-DeleteExecutionsWithWorkflows.ts b/packages/cli/src/databases/migrations/mysqldb/1673268682475-DeleteExecutionsWithWorkflows.ts
index 9313b1736a141..a76f1508c6716 100644
--- a/packages/cli/src/databases/migrations/mysqldb/1673268682475-DeleteExecutionsWithWorkflows.ts
+++ b/packages/cli/src/databases/migrations/mysqldb/1673268682475-DeleteExecutionsWithWorkflows.ts
@@ -1,17 +1,12 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { getTablePrefix, logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
-
-export class DeleteExecutionsWithWorkflows1673268682475 implements MigrationInterface {
-	name = 'DeleteExecutionsWithWorkflows1673268682475';
-	public async up(queryRunner: QueryRunner): Promise<void> {
-		logMigrationStart(this.name);
-		const tablePrefix = getTablePrefix();
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
+export class DeleteExecutionsWithWorkflows1673268682475 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`ALTER TABLE \`${tablePrefix}execution_entity\` MODIFY workflowId INT`);
 
-		const workflowIds: Array<{ id: number }> = await queryRunner.query(`
+		const workflowIds = (await queryRunner.query(`
 			SELECT id FROM \`${tablePrefix}workflow_entity\`
-		`);
+		`)) as Array<{ id: number }>;
 
 		await queryRunner.query(
 			`DELETE FROM \`${tablePrefix}execution_entity\`
@@ -25,12 +20,9 @@ export class DeleteExecutionsWithWorkflows1673268682475 implements MigrationInte
 			 FOREIGN KEY (\`workflowId\`) REFERENCES \`${tablePrefix}workflow_entity\`(\`id\`)
 			 ON DELETE CASCADE`,
 		);
-
-		logMigrationEnd(this.name);
 	}
 
-	public async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = getTablePrefix();
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			`ALTER TABLE \`${tablePrefix}execution_entity\`
 			 DROP FOREIGN KEY \`FK_${tablePrefix}execution_entity_workflowId\``,
diff --git a/packages/cli/src/databases/migrations/mysqldb/1674138566000-AddStatusToExecutions.ts b/packages/cli/src/databases/migrations/mysqldb/1674138566000-AddStatusToExecutions.ts
index ef41dc9758ed7..c193df2125fca 100644
--- a/packages/cli/src/databases/migrations/mysqldb/1674138566000-AddStatusToExecutions.ts
+++ b/packages/cli/src/databases/migrations/mysqldb/1674138566000-AddStatusToExecutions.ts
@@ -1,24 +1,13 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
-import config from '@/config';
-
-export class AddStatusToExecutions1674138566000 implements MigrationInterface {
-	name = 'AddStatusToExecutions1674138566000';
-	public async up(queryRunner: QueryRunner): Promise<void> {
-		logMigrationStart(this.name);
-		const tablePrefix = config.getEnv('database.tablePrefix');
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
+export class AddStatusToExecutions1674138566000 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
-			// 'ALTER TABLE `' + tablePrefix + 'execution_entity` ADD COLUMN `status` varchar',
 			`ALTER TABLE \`${tablePrefix}execution_entity\`	ADD COLUMN \`status\` VARCHAR(255)`,
 		);
-
-		logMigrationEnd(this.name);
 	}
 
-	public async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
-
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`ALTER TABLE \`${tablePrefix}execution_entity\`	DROP COLUMN \`status\``);
 	}
 }
diff --git a/packages/cli/src/databases/migrations/mysqldb/1674509946020-CreateLdapEntities.ts b/packages/cli/src/databases/migrations/mysqldb/1674509946020-CreateLdapEntities.ts
deleted file mode 100644
index d75c58238779c..0000000000000
--- a/packages/cli/src/databases/migrations/mysqldb/1674509946020-CreateLdapEntities.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { LDAP_DEFAULT_CONFIGURATION, LDAP_FEATURE_NAME } from '@/Ldap/constants';
-import { getTablePrefix, logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
-
-export class CreateLdapEntities1674509946020 implements MigrationInterface {
-	name = 'CreateLdapEntities1674509946020';
-
-	async up(queryRunner: QueryRunner): Promise<void> {
-		logMigrationStart(this.name);
-
-		const tablePrefix = getTablePrefix();
-
-		await queryRunner.query(
-			`ALTER TABLE \`${tablePrefix}user\` ADD COLUMN disabled BOOLEAN NOT NULL DEFAULT false;`,
-		);
-
-		await queryRunner.query(`
-			INSERT INTO ${tablePrefix}settings(\`key\`, value, loadOnStartup)
-			VALUES ('${LDAP_FEATURE_NAME}', '${JSON.stringify(LDAP_DEFAULT_CONFIGURATION)}', 1);
-		`);
-
-		await queryRunner.query(
-			`CREATE TABLE IF NOT EXISTS \`${tablePrefix}auth_identity\` (
-				\`userId\` VARCHAR(36) REFERENCES \`${tablePrefix}user\` (id),
-				\`providerId\` VARCHAR(64) NOT NULL,
-				\`providerType\` VARCHAR(32) NOT NULL,
-				\`createdAt\` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-				\`updatedAt\` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-				PRIMARY KEY(\`providerId\`, \`providerType\`)
-			) ENGINE='InnoDB';`,
-		);
-
-		await queryRunner.query(
-			`CREATE TABLE IF NOT EXISTS \`${tablePrefix}auth_provider_sync_history\` (
-				\`id\` INTEGER NOT NULL AUTO_INCREMENT,
-				\`providerType\` VARCHAR(32) NOT NULL,
-				\`runMode\` TEXT NOT NULL,
-				\`status\`	TEXT NOT NULL,
-				\`startedAt\` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-				\`endedAt\` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-				\`scanned\`	INTEGER NOT NULL,
-				\`created\`	INTEGER NOT NULL,
-				\`updated\`	INTEGER NOT NULL,
-				\`disabled\`	INTEGER NOT NULL,
-				\`error\` TEXT,
-				PRIMARY KEY (\`id\`)
-			) ENGINE='InnoDB';`,
-		);
-
-		logMigrationEnd(this.name);
-	}
-
-	async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = getTablePrefix();
-		await queryRunner.query(`DROP TABLE \`${tablePrefix}auth_provider_sync_history\``);
-		await queryRunner.query(`DROP TABLE \`${tablePrefix}auth_identity\``);
-
-		await queryRunner.query(
-			`DELETE FROM ${tablePrefix}settings WHERE \`key\` = '${LDAP_FEATURE_NAME}'`,
-		);
-		await queryRunner.query(`ALTER TABLE \`${tablePrefix}user\` DROP COLUMN disabled`);
-	}
-}
diff --git a/packages/cli/src/databases/migrations/mysqldb/1675940580449-PurgeInvalidWorkflowConnections.ts b/packages/cli/src/databases/migrations/mysqldb/1675940580449-PurgeInvalidWorkflowConnections.ts
deleted file mode 100644
index 5acf8c8b264f4..0000000000000
--- a/packages/cli/src/databases/migrations/mysqldb/1675940580449-PurgeInvalidWorkflowConnections.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { getTablePrefix, logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
-import { NodeTypes } from '@/NodeTypes';
-import { IConnections, INode } from 'n8n-workflow';
-import { getLogger } from '@/Logger';
-import { Container } from 'typedi';
-
-export class PurgeInvalidWorkflowConnections1675940580449 implements MigrationInterface {
-	name = 'PurgeInvalidWorkflowConnections1675940580449';
-
-	async up(queryRunner: QueryRunner): Promise<void> {
-		logMigrationStart(this.name);
-
-		const tablePrefix = getTablePrefix();
-
-		const workflows: Array<{
-			id: number;
-			nodes: INode[] | string;
-			connections: IConnections | string;
-		}> = await queryRunner.query(`
-			SELECT id, nodes, connections
-			FROM \`${tablePrefix}workflow_entity\`
-		`);
-
-		const nodeTypes = Container.get(NodeTypes);
-
-		workflows.forEach(async (workflow) => {
-			let connections: IConnections =
-				typeof workflow.connections === 'string'
-					? JSON.parse(workflow.connections)
-					: workflow.connections;
-			const nodes: INode[] =
-				typeof workflow.nodes === 'string' ? JSON.parse(workflow.nodes) : workflow.nodes;
-
-			const nodesThatCannotReceiveInput: string[] = nodes.reduce((acc, node) => {
-				try {
-					const nodeType = nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
-					if ((nodeType.description.inputs?.length ?? []) === 0) {
-						acc.push(node.name);
-					}
-				} catch (error) {
-					getLogger().warn(`Migration ${this.name} failed with error: ${error.message}`);
-				}
-				return acc;
-			}, [] as string[]);
-
-			Object.keys(connections).forEach((sourceNodeName) => {
-				const connection = connections[sourceNodeName];
-				const outputs = Object.keys(connection);
-
-				outputs.forEach((outputConnectionName /* Like `main` */, idx) => {
-					const outputConnection = connection[outputConnectionName];
-
-					// It filters out all connections that are connected to a node that cannot receive input
-					outputConnection.forEach((outputConnectionItem, outputConnectionItemIdx) => {
-						outputConnection[outputConnectionItemIdx] = outputConnectionItem.filter(
-							(outgoingConnections) =>
-								!nodesThatCannotReceiveInput.includes(outgoingConnections.node),
-						);
-					});
-				});
-			});
-
-			// Update database with new connections
-			const [updateQuery, updateParams] = queryRunner.connection.driver.escapeQueryWithParameters(
-				`
-							UPDATE \`${tablePrefix}workflow_entity\`
-							SET connections = :connections
-							WHERE id = '${workflow.id}'
-						`,
-				{ connections: JSON.stringify(connections) },
-				{},
-			);
-
-			await queryRunner.query(updateQuery, updateParams);
-		});
-
-		logMigrationEnd(this.name);
-	}
-
-	async down(queryRunner: QueryRunner): Promise<void> {
-		// No need to revert this migration
-	}
-}
diff --git a/packages/cli/src/databases/migrations/mysqldb/1676996103000-MigrateExecutionStatus.ts b/packages/cli/src/databases/migrations/mysqldb/1676996103000-MigrateExecutionStatus.ts
index 6c196148fc571..38a51292d426a 100644
--- a/packages/cli/src/databases/migrations/mysqldb/1676996103000-MigrateExecutionStatus.ts
+++ b/packages/cli/src/databases/migrations/mysqldb/1676996103000-MigrateExecutionStatus.ts
@@ -1,13 +1,7 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
-import config from '@/config';
-
-export class MigrateExecutionStatus1676996103000 implements MigrationInterface {
-	name = 'MigrateExecutionStatus1676996103000';
-	public async up(queryRunner: QueryRunner): Promise<void> {
-		logMigrationStart(this.name);
-		const tablePrefix = config.getEnv('database.tablePrefix');
+import type { MigrationContext, IrreversibleMigration } from '@db/types';
 
+export class MigrateExecutionStatus1676996103000 implements IrreversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			`UPDATE \`${tablePrefix}execution_entity\` SET status='waiting' WHERE status IS NULL AND \`waitTill\` IS NOT NULL;`,
 		);
@@ -20,9 +14,5 @@ export class MigrateExecutionStatus1676996103000 implements MigrationInterface {
 		await queryRunner.query(
 			`UPDATE \`${tablePrefix}execution_entity\` SET status='crashed' WHERE status IS NULL;`,
 		);
-
-		logMigrationEnd(this.name);
 	}
-
-	public async down(queryRunner: QueryRunner): Promise<void> {}
 }
diff --git a/packages/cli/src/databases/migrations/mysqldb/1677236788851-UpdateRunningExecutionStatus.ts b/packages/cli/src/databases/migrations/mysqldb/1677236788851-UpdateRunningExecutionStatus.ts
index 12225e7623e01..16ac4c606b71a 100644
--- a/packages/cli/src/databases/migrations/mysqldb/1677236788851-UpdateRunningExecutionStatus.ts
+++ b/packages/cli/src/databases/migrations/mysqldb/1677236788851-UpdateRunningExecutionStatus.ts
@@ -1,22 +1,12 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
-import config from '@/config';
-
-export class UpdateRunningExecutionStatus1677236788851 implements MigrationInterface {
-	name = 'UpdateRunningExecutionStatus1677236788851';
-	public async up(queryRunner: QueryRunner): Promise<void> {
-		logMigrationStart(this.name);
-		const tablePrefix = config.getEnv('database.tablePrefix');
+import type { MigrationContext, IrreversibleMigration } from '@db/types';
 
+export class UpdateRunningExecutionStatus1677236788851 implements IrreversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			`UPDATE \`${tablePrefix}execution_entity\` SET status='failed' WHERE status = 'running' AND finished=0 AND \`stoppedAt\` IS NOT NULL;`,
 		);
 		await queryRunner.query(
 			`UPDATE \`${tablePrefix}execution_entity\` SET status='success' WHERE status = 'running' AND finished=1 AND \`stoppedAt\` IS NOT NULL;`,
 		);
-
-		logMigrationEnd(this.name);
 	}
-
-	public async down(queryRunner: QueryRunner): Promise<void> {}
 }
diff --git a/packages/cli/src/databases/migrations/mysqldb/1677501636753-CreateVariables.ts b/packages/cli/src/databases/migrations/mysqldb/1677501636753-CreateVariables.ts
index 1e35fe5574518..08df64dcfb005 100644
--- a/packages/cli/src/databases/migrations/mysqldb/1677501636753-CreateVariables.ts
+++ b/packages/cli/src/databases/migrations/mysqldb/1677501636753-CreateVariables.ts
@@ -1,13 +1,7 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { logMigrationEnd, logMigrationStart, getTablePrefix } from '@db/utils/migrationHelpers';
-import config from '@/config';
-
-export class CreateVariables1677501636753 implements MigrationInterface {
-	name = 'CreateVariables1677501636753';
-	public async up(queryRunner: QueryRunner): Promise<void> {
-		logMigrationStart(this.name);
-		const tablePrefix = getTablePrefix();
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
+export class CreateVariables1677501636753 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`
 			CREATE TABLE ${tablePrefix}variables (
 				id int(11) auto_increment NOT NULL PRIMARY KEY,
@@ -18,16 +12,9 @@ export class CreateVariables1677501636753 implements MigrationInterface {
 			)
 			ENGINE=InnoDB;
 		`);
-
-		logMigrationEnd(this.name);
 	}
 
-	public async down(queryRunner: QueryRunner): Promise<void> {
-		logMigrationStart(this.name);
-		const tablePrefix = getTablePrefix();
-
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`DROP TABLE ${tablePrefix}variables;`);
-
-		logMigrationEnd(this.name);
 	}
 }
diff --git a/packages/cli/src/databases/migrations/mysqldb/1679416281779-CreateExecutionMetadataTable.ts b/packages/cli/src/databases/migrations/mysqldb/1679416281779-CreateExecutionMetadataTable.ts
index 89a53d340e280..4a601af7ca5f4 100644
--- a/packages/cli/src/databases/migrations/mysqldb/1679416281779-CreateExecutionMetadataTable.ts
+++ b/packages/cli/src/databases/migrations/mysqldb/1679416281779-CreateExecutionMetadataTable.ts
@@ -1,13 +1,7 @@
-import { MigrationInterface, QueryRunner, Table } from 'typeorm';
-import { getTablePrefix, logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
-
-export class CreateExecutionMetadataTable1679416281779 implements MigrationInterface {
-	name = 'CreateExecutionMetadataTable1679416281779';
-
-	public async up(queryRunner: QueryRunner): Promise<void> {
-		logMigrationStart(this.name);
-		const tablePrefix = getTablePrefix();
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
+export class CreateExecutionMetadataTable1679416281779 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			`CREATE TABLE ${tablePrefix}execution_metadata (
 				id int(11) auto_increment NOT NULL PRIMARY KEY,
@@ -38,13 +32,9 @@ export class CreateExecutionMetadataTable1679416281779 implements MigrationInter
 		await queryRunner.query(
 			`CREATE INDEX \`IDX_${tablePrefix}8b6f3f9ae234f137d707b98f3bf43584\` ON \`${tablePrefix}execution_entity\` (\`status\`, \`workflowId\`)`,
 		);
-
-		logMigrationEnd(this.name);
 	}
 
-	public async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = getTablePrefix();
-
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`DROP TABLE "${tablePrefix}execution_metadata"`);
 		await queryRunner.query(
 			`CREATE INDEX \`IDX_${tablePrefix}06da892aaf92a48e7d3e400003\` ON \`${tablePrefix}execution_entity\` (\`workflowId\`, \`waitTill\`, \`id\`)`,
diff --git a/packages/cli/src/databases/migrations/mysqldb/1681134145996-AddUserActivatedProperty.ts b/packages/cli/src/databases/migrations/mysqldb/1681134145996-AddUserActivatedProperty.ts
index e1c193a959935..d3b6b2f72c9e5 100644
--- a/packages/cli/src/databases/migrations/mysqldb/1681134145996-AddUserActivatedProperty.ts
+++ b/packages/cli/src/databases/migrations/mysqldb/1681134145996-AddUserActivatedProperty.ts
@@ -1,16 +1,9 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { getTablePrefix, logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 import type { UserSettings } from '@/Interfaces';
 
-export class AddUserActivatedProperty1681134145996 implements MigrationInterface {
-	name = 'AddUserActivatedProperty1681134145996';
-
-	async up(queryRunner: QueryRunner): Promise<void> {
-		logMigrationStart(this.name);
-
-		const tablePrefix = getTablePrefix();
-
-		const activatedUsers: UserSettings[] = await queryRunner.query(
+export class AddUserActivatedProperty1681134145996 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
+		const activatedUsers = (await queryRunner.query(
 			`SELECT DISTINCT sw.userId AS id,
 				JSON_SET(COALESCE(u.settings, '{}'), '$.userActivated', true) AS settings
 			FROM ${tablePrefix}workflow_statistics AS ws
@@ -23,15 +16,18 @@ export class AddUserActivatedProperty1681134145996 implements MigrationInterface
 			WHERE ws.name = 'production_success'
 						AND r.name = 'owner'
 						AND r.scope = 'workflow'`,
-		);
-
-		const updatedUsers = activatedUsers.map((user) =>
-			queryRunner.query(
-				`UPDATE ${tablePrefix}user SET settings = '${JSON.stringify(user.settings)}' WHERE id = '${
-					user.id
-				}' `,
-			),
-		);
+		)) as UserSettings[];
+
+		const updatedUsers = activatedUsers.map(async (user) => {
+			/*
+				MariaDB returns settings as a string and MySQL as a JSON
+			*/
+			const userSettings =
+				typeof user.settings === 'string' ? user.settings : JSON.stringify(user.settings);
+			await queryRunner.query(
+				`UPDATE ${tablePrefix}user SET settings = '${userSettings}' WHERE id = '${user.id}' `,
+			);
+		});
 
 		await Promise.all(updatedUsers);
 
@@ -46,12 +42,9 @@ export class AddUserActivatedProperty1681134145996 implements MigrationInterface
 				`UPDATE ${tablePrefix}user SET settings = JSON_SET(COALESCE(settings, '{}'), '$.userActivated', false) WHERE id NOT IN (${activatedUserIds})`,
 			);
 		}
-
-		logMigrationEnd(this.name);
 	}
 
-	async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = getTablePrefix();
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			`UPDATE ${tablePrefix}user SET settings = JSON_REMOVE(settings, '$.userActivated')`,
 		);
diff --git a/packages/cli/src/databases/migrations/mysqldb/1681134145997-RemoveSkipOwnerSetup.ts b/packages/cli/src/databases/migrations/mysqldb/1681134145997-RemoveSkipOwnerSetup.ts
new file mode 100644
index 0000000000000..c756b5839a963
--- /dev/null
+++ b/packages/cli/src/databases/migrations/mysqldb/1681134145997-RemoveSkipOwnerSetup.ts
@@ -0,0 +1,9 @@
+import type { IrreversibleMigration, MigrationContext } from '@db/types';
+
+export class RemoveSkipOwnerSetup1681134145997 implements IrreversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
+		await queryRunner.query(
+			`DELETE FROM ${tablePrefix}settings WHERE \`key\` = 'userManagement.skipInstanceOwnerSetup';`,
+		);
+	}
+}
diff --git a/packages/cli/src/databases/migrations/mysqldb/1690000000001-MigrateIntegerKeysToString.ts b/packages/cli/src/databases/migrations/mysqldb/1690000000001-MigrateIntegerKeysToString.ts
new file mode 100644
index 0000000000000..4a9f71fda8f4a
--- /dev/null
+++ b/packages/cli/src/databases/migrations/mysqldb/1690000000001-MigrateIntegerKeysToString.ts
@@ -0,0 +1,274 @@
+import type { MigrationContext, IrreversibleMigration } from '@db/types';
+import config from '@/config';
+
+const COLLATION_57 = 'utf8mb4_general_ci';
+const COLLATION_80 = 'utf8mb4_0900_ai_ci';
+
+export class MigrateIntegerKeysToString1690000000001 implements IrreversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
+		const databaseType = config.get('database.type');
+		let collation: string;
+		if (databaseType === 'mariadb') {
+			collation = COLLATION_57;
+		} else {
+			const dbVersionQuery = (await queryRunner.query('SELECT @@version')) as  // eslint-disable-next-line @typescript-eslint/naming-convention
+				| Array<{ '@@version': string }>
+				| undefined;
+			collation = COLLATION_80;
+			if (dbVersionQuery?.length === 1) {
+				const dbVersion = dbVersionQuery[0]['@@version'];
+				if (dbVersion.startsWith('5.7')) {
+					collation = COLLATION_57;
+				}
+			}
+		}
+
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}workflow_entity CHANGE id tmp_id int NOT NULL AUTO_INCREMENT;`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}workflow_entity ADD COLUMN id varchar(36) NOT NULL;`,
+		);
+		await queryRunner.query(`UPDATE ${tablePrefix}workflow_entity SET id = CONVERT(tmp_id, CHAR);`);
+		await queryRunner.query(
+			`CREATE INDEX \`TMP_idx_${tablePrefix}workflow_entity_id\` ON ${tablePrefix}workflow_entity (\`id\`);`,
+		);
+
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}tag_entity CHANGE id tmp_id int NOT NULL AUTO_INCREMENT;`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}tag_entity ADD COLUMN id varchar(36) NOT NULL;`,
+		);
+		await queryRunner.query(`UPDATE ${tablePrefix}tag_entity SET id = CONVERT(tmp_id, CHAR);`);
+		await queryRunner.query(
+			`CREATE INDEX \`TMP_idx_${tablePrefix}tag_entity_id\` ON ${tablePrefix}tag_entity (\`id\`);`,
+		);
+
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}workflows_tags CHANGE workflowId tmp_workflowId int NOT NULL;`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}workflows_tags ADD COLUMN \`workflowId\` varchar(36) CHARACTER SET utf8mb4 COLLATE ${collation} NOT NULL;`,
+		);
+		await queryRunner.query(
+			`UPDATE ${tablePrefix}workflows_tags SET \`workflowId\` = CONVERT(\`tmp_workflowId\`, CHAR);`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}workflows_tags CHANGE tagId tmp_tagId int NOT NULL;`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}workflows_tags ADD COLUMN \`tagId\` varchar(36) NOT NULL;`,
+		);
+		await queryRunner.query(
+			`UPDATE ${tablePrefix}workflows_tags SET \`tagId\` = CONVERT(\`tmp_tagId\`, CHAR);`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}workflows_tags DROP PRIMARY KEY, ADD PRIMARY KEY (\`workflowId\`, \`tagId\`);`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX \`idx_${tablePrefix}workflows_tags_workflowid\` ON ${tablePrefix}workflows_tags (\`workflowId\`);`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}workflows_tags DROP FOREIGN KEY \`FK_${tablePrefix}54b2f0343d6a2078fa137443869\`;`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}workflows_tags ADD CONSTRAINT \`fk_${tablePrefix}workflows_tags_workflow_id\` FOREIGN KEY (\`workflowId\`) REFERENCES ${tablePrefix}workflow_entity(id) ON DELETE CASCADE ON UPDATE NO ACTION;`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}workflows_tags DROP FOREIGN KEY \`FK_${tablePrefix}77505b341625b0b4768082e2171\`;`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}workflows_tags ADD CONSTRAINT \`fk_${tablePrefix}workflows_tags_tag_id\` FOREIGN KEY (\`tagId\`) REFERENCES ${tablePrefix}tag_entity(id) ON DELETE CASCADE ON UPDATE NO ACTION;`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}workflows_tags DROP COLUMN \`tmp_workflowId\`;`,
+		);
+		await queryRunner.query(`ALTER TABLE ${tablePrefix}workflows_tags DROP COLUMN \`tmp_tagId\`;`);
+
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}shared_workflow CHANGE workflowId tmp_workflowId int NOT NULL;`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}shared_workflow ADD COLUMN \`workflowId\` varchar(36) CHARACTER SET utf8mb4 COLLATE ${collation} NOT NULL;`,
+		);
+		await queryRunner.query(
+			`UPDATE ${tablePrefix}shared_workflow SET \`workflowId\` = CONVERT(\`tmp_workflowId\`, CHAR);`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}shared_workflow DROP PRIMARY KEY, ADD PRIMARY KEY (\`userId\`, \`workflowId\`);`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX \`idx_${tablePrefix}shared_workflow_workflow_id\` ON ${tablePrefix}shared_workflow (\`workflowId\`);`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}shared_workflow DROP FOREIGN KEY \`FK_${tablePrefix}b83f8d2530884b66a9c848c8b88\`;`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}shared_workflow ADD CONSTRAINT \`fk_${tablePrefix}shared_workflow_workflow_id\` FOREIGN KEY (\`workflowId\`) REFERENCES ${tablePrefix}workflow_entity(id) ON DELETE CASCADE ON UPDATE NO ACTION;`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}shared_workflow DROP COLUMN \`tmp_workflowId\`;`,
+		);
+
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}workflow_statistics CHANGE workflowId tmp_workflowId int NOT NULL;`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}workflow_statistics ADD COLUMN \`workflowId\` varchar(36) CHARACTER SET utf8mb4 COLLATE ${collation} NOT NULL;`,
+		);
+		await queryRunner.query(
+			`UPDATE ${tablePrefix}workflow_statistics SET \`workflowId\` = CONVERT(\`tmp_workflowId\`, CHAR);`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX \`idx_${tablePrefix}workflow_statistics_workflow_id\` ON ${tablePrefix}workflow_statistics (\`workflowId\`);`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}workflow_statistics DROP FOREIGN KEY \`${tablePrefix}workflow_statistics_ibfk_1\`;`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}workflow_statistics ADD CONSTRAINT \`fk_${tablePrefix}workflow_statistics_workflow_id\` FOREIGN KEY (\`workflowId\`) REFERENCES ${tablePrefix}workflow_entity(id) ON DELETE CASCADE ON UPDATE NO ACTION;`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}workflow_statistics DROP PRIMARY KEY, ADD PRIMARY KEY (\`workflowId\`, \`name\`);`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}workflow_statistics DROP COLUMN \`tmp_workflowId\`;`,
+		);
+
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}webhook_entity CHANGE workflowId tmp_workflowId int NOT NULL;`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}webhook_entity ADD COLUMN \`workflowId\` varchar(36) CHARACTER SET utf8mb4 COLLATE ${collation} NOT NULL;`,
+		);
+		await queryRunner.query(
+			`UPDATE ${tablePrefix}webhook_entity SET \`workflowId\` = CONVERT(\`tmp_workflowId\`, CHAR);`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}webhook_entity DROP COLUMN \`tmp_workflowId\`;`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}webhook_entity ADD CONSTRAINT \`fk_${tablePrefix}webhook_entity_workflow_id\` FOREIGN KEY (\`workflowId\`) REFERENCES ${tablePrefix}workflow_entity(id) ON DELETE CASCADE ON UPDATE NO ACTION;`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}execution_entity CHANGE workflowId tmp_workflowId int NULL;`,
+		);
+
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}execution_entity ADD COLUMN \`workflowId\` varchar(36) CHARACTER SET utf8mb4 COLLATE ${collation};`,
+		);
+		await queryRunner.query(
+			`UPDATE ${tablePrefix}execution_entity SET \`workflowId\` = CONVERT(\`tmp_workflowId\`, CHAR);`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX \`idx_${tablePrefix}execution_entity_workflow_id_id\` ON ${tablePrefix}execution_entity (\`workflowId\`,\`id\`);`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}execution_entity DROP FOREIGN KEY \`FK_${tablePrefix}execution_entity_workflowId\`;`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}execution_entity ADD CONSTRAINT \`fk_${tablePrefix}execution_entity_workflow_id\` FOREIGN KEY (\`workflowId\`) REFERENCES ${tablePrefix}workflow_entity(id) ON DELETE CASCADE ON UPDATE NO ACTION;`,
+		);
+		await queryRunner.query(
+			`DROP INDEX \`IDX_${tablePrefix}81fc04c8a17de15835713505e4\` ON ${tablePrefix}execution_entity;`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}execution_entity DROP COLUMN \`tmp_workflowId\`;`,
+		);
+
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}workflow_entity MODIFY COLUMN tmp_id INT NOT NULL;`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}workflow_entity DROP PRIMARY KEY, ADD PRIMARY KEY (\`id\`);`,
+		);
+		await queryRunner.query(
+			`DROP INDEX \`TMP_idx_${tablePrefix}workflow_entity_id\` ON ${tablePrefix}workflow_entity;`,
+		);
+		await queryRunner.query(`ALTER TABLE ${tablePrefix}workflow_entity DROP COLUMN tmp_id;`);
+
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}tag_entity MODIFY COLUMN tmp_id INT NOT NULL;`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}tag_entity DROP PRIMARY KEY, ADD PRIMARY KEY (\`id\`);`,
+		);
+		await queryRunner.query(
+			`DROP INDEX \`TMP_idx_${tablePrefix}tag_entity_id\` ON ${tablePrefix}tag_entity;`,
+		);
+		await queryRunner.query(`ALTER TABLE ${tablePrefix}tag_entity DROP COLUMN tmp_id;`);
+
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}credentials_entity CHANGE id tmp_id int NOT NULL AUTO_INCREMENT;`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}credentials_entity ADD COLUMN id varchar(36) CHARACTER SET utf8mb4 COLLATE ${collation} NOT NULL;`,
+		);
+		await queryRunner.query(
+			`UPDATE ${tablePrefix}credentials_entity SET id = CONVERT(tmp_id, CHAR);`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX \`TMP_idx_${tablePrefix}credentials_entity_id\` ON ${tablePrefix}credentials_entity (\`id\`);`,
+		);
+
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}shared_credentials CHANGE credentialsId tmp_credentialsId int NOT NULL;`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}shared_credentials ADD COLUMN credentialsId varchar(36) CHARACTER SET utf8mb4 COLLATE ${collation} NOT NULL;`,
+		);
+		await queryRunner.query(
+			`UPDATE ${tablePrefix}shared_credentials SET credentialsId = CONVERT(tmp_credentialsId, CHAR);`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX \`idx_${tablePrefix}shared_credentials_id\` ON ${tablePrefix}shared_credentials (\`credentialsId\`);`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}shared_credentials DROP FOREIGN KEY \`FK_${tablePrefix}68661def1d4bcf2451ac8dbd949\`;`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}shared_credentials ADD CONSTRAINT \`fk_${tablePrefix}shared_credentials_credentials_id\` FOREIGN KEY (\`credentialsId\`) REFERENCES ${tablePrefix}credentials_entity(id) ON DELETE CASCADE ON UPDATE NO ACTION;`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}shared_credentials MODIFY COLUMN tmp_credentialsId INT NOT NULL;`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}shared_credentials DROP PRIMARY KEY, ADD PRIMARY KEY (\`userId\`,\`credentialsId\`);`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}shared_credentials DROP COLUMN tmp_credentialsId;`,
+		);
+
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}credentials_entity MODIFY COLUMN tmp_id INT NOT NULL;`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}credentials_entity DROP PRIMARY KEY, ADD PRIMARY KEY (\`id\`);`,
+		);
+		await queryRunner.query(
+			`DROP INDEX \`TMP_idx_${tablePrefix}credentials_entity_id\` ON ${tablePrefix}credentials_entity;`,
+		);
+		await queryRunner.query(`ALTER TABLE ${tablePrefix}credentials_entity DROP COLUMN tmp_id;`);
+
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}variables CHANGE id tmp_id int NOT NULL AUTO_INCREMENT;`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}variables ADD COLUMN \`id\` varchar(36) NOT NULL;`,
+		);
+		await queryRunner.query(
+			`UPDATE ${tablePrefix}variables SET \`id\` = CONVERT(\`tmp_id\`, CHAR);`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX \`TMP_idx_${tablePrefix}variables_id\` ON ${tablePrefix}variables (\`id\`);`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}variables CHANGE \`tmp_id\` \`tmp_id\` int NOT NULL;`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}variables DROP PRIMARY KEY, ADD PRIMARY KEY (\`id\`);`,
+		);
+		await queryRunner.query(`ALTER TABLE ${tablePrefix}variables DROP COLUMN \`tmp_id\`;`);
+	}
+}
diff --git a/packages/cli/src/databases/migrations/mysqldb/1690000000030-SeparateExecutionData.ts b/packages/cli/src/databases/migrations/mysqldb/1690000000030-SeparateExecutionData.ts
new file mode 100644
index 0000000000000..cb56cf7b63e11
--- /dev/null
+++ b/packages/cli/src/databases/migrations/mysqldb/1690000000030-SeparateExecutionData.ts
@@ -0,0 +1,43 @@
+import type { MigrationContext, ReversibleMigration } from '@db/types';
+
+export class SeparateExecutionData1690000000030 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
+		await queryRunner.query(
+			`CREATE TABLE ${tablePrefix}execution_data (
+				executionId int(11) NOT NULL primary key,
+				workflowData json NOT NULL,
+				data MEDIUMTEXT NOT NULL,
+				CONSTRAINT \`${tablePrefix}execution_data_FK\` FOREIGN KEY (\`executionId\`) REFERENCES \`${tablePrefix}execution_entity\` (\`id\`) ON DELETE CASCADE
+			)
+			ENGINE=InnoDB`,
+		);
+
+		await queryRunner.query(
+			`INSERT INTO ${tablePrefix}execution_data (
+				executionId,
+				workflowData,
+				data)
+				SELECT id, workflowData, data FROM ${tablePrefix}execution_entity
+			`,
+		);
+
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}execution_entity DROP COLUMN workflowData, DROP COLUMN data`,
+		);
+	}
+
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}execution_entity
+			ADD workflowData json NULL,
+			ADD data MEDIUMTEXT NULL`,
+		);
+
+		await queryRunner.query(
+			`UPDATE ${tablePrefix}execution_entity SET workflowData = ${tablePrefix}execution_data.workflowData, data = ${tablePrefix}execution_data.data
+			FROM ${tablePrefix}execution_data WHERE ${tablePrefix}execution_data.executionId = ${tablePrefix}execution_entity.id`,
+		);
+
+		await queryRunner.query(`DROP TABLE ${tablePrefix}execution_data`);
+	}
+}
diff --git a/packages/cli/src/databases/migrations/mysqldb/1690000000031-FixExecutionDataType.ts b/packages/cli/src/databases/migrations/mysqldb/1690000000031-FixExecutionDataType.ts
new file mode 100644
index 0000000000000..7107eaec1363d
--- /dev/null
+++ b/packages/cli/src/databases/migrations/mysqldb/1690000000031-FixExecutionDataType.ts
@@ -0,0 +1,17 @@
+import type { MigrationContext, IrreversibleMigration } from '@db/types';
+
+export class FixExecutionDataType1690000000031 implements IrreversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
+		/**
+		 * SeparateExecutionData migration for MySQL/MariaDB accidentally changed the data-type for `data` column to `TEXT`.
+		 * This migration changes it back.
+		 * The previous migration has been patched to avoid converting to `TEXT`, which might fail.
+		 *
+		 * For any users who already ran the previous migration, this migration should fix the column type.
+		 * For any users who run these migrations in the same batch, this migration would be no-op, as the column type is already `MEDIUMTEXT`
+		 */
+		await queryRunner.query(
+			'ALTER TABLE `' + tablePrefix + 'execution_data` MODIFY COLUMN `data` MEDIUMTEXT',
+		);
+	}
+}
diff --git a/packages/cli/src/databases/migrations/mysqldb/index.ts b/packages/cli/src/databases/migrations/mysqldb/index.ts
index 3f53f8b24af55..7952a923ab0a9 100644
--- a/packages/cli/src/databases/migrations/mysqldb/index.ts
+++ b/packages/cli/src/databases/migrations/mysqldb/index.ts
@@ -1,3 +1,4 @@
+import type { Migration } from '@db/types';
 import { InitialMigration1588157391238 } from './1588157391238-InitialMigration';
 import { WebhookModel1592447867632 } from './1592447867632-WebhookModel';
 import { CreateIndexStoppedAt1594902918301 } from './1594902918301-CreateIndexStoppedAt';
@@ -29,16 +30,33 @@ import { AddTriggerCountColumn1669823906994 } from './1669823906994-AddTriggerCo
 import { RemoveWorkflowDataLoadedFlag1671726148420 } from './1671726148420-RemoveWorkflowDataLoadedFlag';
 import { MessageEventBusDestinations1671535397530 } from './1671535397530-MessageEventBusDestinations';
 import { DeleteExecutionsWithWorkflows1673268682475 } from './1673268682475-DeleteExecutionsWithWorkflows';
-import { CreateLdapEntities1674509946020 } from './1674509946020-CreateLdapEntities';
-import { PurgeInvalidWorkflowConnections1675940580449 } from './1675940580449-PurgeInvalidWorkflowConnections';
+import { CreateLdapEntities1674509946020 } from '../common/1674509946020-CreateLdapEntities';
+import { PurgeInvalidWorkflowConnections1675940580449 } from '../common/1675940580449-PurgeInvalidWorkflowConnections';
 import { AddStatusToExecutions1674138566000 } from './1674138566000-AddStatusToExecutions';
 import { MigrateExecutionStatus1676996103000 } from './1676996103000-MigrateExecutionStatus';
 import { UpdateRunningExecutionStatus1677236788851 } from './1677236788851-UpdateRunningExecutionStatus';
 import { CreateExecutionMetadataTable1679416281779 } from './1679416281779-CreateExecutionMetadataTable';
 import { CreateVariables1677501636753 } from './1677501636753-CreateVariables';
 import { AddUserActivatedProperty1681134145996 } from './1681134145996-AddUserActivatedProperty';
+import { MigrateIntegerKeysToString1690000000001 } from './1690000000001-MigrateIntegerKeysToString';
+import { SeparateExecutionData1690000000030 } from './1690000000030-SeparateExecutionData';
+import { FixExecutionDataType1690000000031 } from './1690000000031-FixExecutionDataType';
+import { RemoveSkipOwnerSetup1681134145997 } from './1681134145997-RemoveSkipOwnerSetup';
+import { RemoveResetPasswordColumns1690000000030 } from '../common/1690000000030-RemoveResetPasswordColumns';
+import { CreateWorkflowNameIndex1691088862123 } from '../common/1691088862123-CreateWorkflowNameIndex';
+import { AddMfaColumns1690000000030 } from './../common/1690000000040-AddMfaColumns';
+import { CreateWorkflowHistoryTable1692967111175 } from '../common/1692967111175-CreateWorkflowHistoryTable';
+import { DisallowOrphanExecutions1693554410387 } from '../common/1693554410387-DisallowOrphanExecutions';
+import { ExecutionSoftDelete1693491613982 } from '../common/1693491613982-ExecutionSoftDelete';
+import { AddWorkflowMetadata1695128658538 } from '../common/1695128658538-AddWorkflowMetadata';
+import { ModifyWorkflowHistoryNodesAndConnections1695829275184 } from '../common/1695829275184-ModifyWorkflowHistoryNodesAndConnections';
+import { AddGlobalAdminRole1700571993961 } from '../common/1700571993961-AddGlobalAdminRole';
+import { DropRoleMapping1705429061930 } from '../common/1705429061930-DropRoleMapping';
+import { RemoveFailedExecutionStatus1711018413374 } from '../common/1711018413374-RemoveFailedExecutionStatus';
+import { MoveSshKeysToDatabase1711390882123 } from '../common/1711390882123-MoveSshKeysToDatabase';
+import { RemoveNodesAccess1712044305787 } from '../common/1712044305787-RemoveNodesAccess';
 
-export const mysqlMigrations = [
+export const mysqlMigrations: Migration[] = [
 	InitialMigration1588157391238,
 	WebhookModel1592447867632,
 	CreateIndexStoppedAt1594902918301,
@@ -78,4 +96,21 @@ export const mysqlMigrations = [
 	CreateExecutionMetadataTable1679416281779,
 	CreateVariables1677501636753,
 	AddUserActivatedProperty1681134145996,
+	MigrateIntegerKeysToString1690000000001,
+	SeparateExecutionData1690000000030,
+	FixExecutionDataType1690000000031,
+	RemoveSkipOwnerSetup1681134145997,
+	RemoveResetPasswordColumns1690000000030,
+	CreateWorkflowNameIndex1691088862123,
+	AddMfaColumns1690000000030,
+	CreateWorkflowHistoryTable1692967111175,
+	DisallowOrphanExecutions1693554410387,
+	ExecutionSoftDelete1693491613982,
+	AddWorkflowMetadata1695128658538,
+	ModifyWorkflowHistoryNodesAndConnections1695829275184,
+	AddGlobalAdminRole1700571993961,
+	DropRoleMapping1705429061930,
+	RemoveFailedExecutionStatus1711018413374,
+	MoveSshKeysToDatabase1711390882123,
+	RemoveNodesAccess1712044305787,
 ];
diff --git a/packages/cli/src/databases/migrations/postgresdb/1587669153312-InitialMigration.ts b/packages/cli/src/databases/migrations/postgresdb/1587669153312-InitialMigration.ts
index e1607a773241f..7d3c948e1ee82 100644
--- a/packages/cli/src/databases/migrations/postgresdb/1587669153312-InitialMigration.ts
+++ b/packages/cli/src/databases/migrations/postgresdb/1587669153312-InitialMigration.ts
@@ -1,41 +1,29 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { getTablePrefix } from '@db/utils/migrationHelpers';
-
-export class InitialMigration1587669153312 implements MigrationInterface {
-	name = 'InitialMigration1587669153312';
-
-	async up(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = getTablePrefix();
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
+export class InitialMigration1587669153312 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			`CREATE TABLE IF NOT EXISTS ${tablePrefix}credentials_entity ("id" SERIAL NOT NULL, "name" character varying(128) NOT NULL, "data" text NOT NULL, "type" character varying(32) NOT NULL, "nodesAccess" json NOT NULL, "createdAt" TIMESTAMP NOT NULL, "updatedAt" TIMESTAMP NOT NULL, CONSTRAINT PK_${tablePrefix}814c3d3c36e8a27fa8edb761b0e PRIMARY KEY ("id"))`,
-			undefined,
 		);
 		await queryRunner.query(
 			`CREATE INDEX IF NOT EXISTS IDX_${tablePrefix}07fde106c0b471d8cc80a64fc8 ON ${tablePrefix}credentials_entity (type) `,
-			undefined,
 		);
 		await queryRunner.query(
 			`CREATE TABLE IF NOT EXISTS ${tablePrefix}execution_entity ("id" SERIAL NOT NULL, "data" text NOT NULL, "finished" boolean NOT NULL, "mode" character varying NOT NULL, "retryOf" character varying, "retrySuccessId" character varying, "startedAt" TIMESTAMP NOT NULL, "stoppedAt" TIMESTAMP NOT NULL, "workflowData" json NOT NULL, "workflowId" character varying, CONSTRAINT PK_${tablePrefix}e3e63bbf986767844bbe1166d4e PRIMARY KEY ("id"))`,
-			undefined,
 		);
 		await queryRunner.query(
 			`CREATE INDEX IF NOT EXISTS IDX_${tablePrefix}c4d999a5e90784e8caccf5589d ON ${tablePrefix}execution_entity ("workflowId") `,
-			undefined,
 		);
 		await queryRunner.query(
 			`CREATE TABLE IF NOT EXISTS ${tablePrefix}workflow_entity ("id" SERIAL NOT NULL, "name" character varying(128) NOT NULL, "active" boolean NOT NULL, "nodes" json NOT NULL, "connections" json NOT NULL, "createdAt" TIMESTAMP NOT NULL, "updatedAt" TIMESTAMP NOT NULL, "settings" json, "staticData" json, CONSTRAINT PK_${tablePrefix}eded7d72664448da7745d551207 PRIMARY KEY ("id"))`,
-			undefined,
 		);
 	}
 
-	async down(queryRunner: QueryRunner): Promise<void> {
-		let tablePrefix = getTablePrefix();
-
-		await queryRunner.query(`DROP TABLE ${tablePrefix}workflow_entity`, undefined);
-		await queryRunner.query(`DROP INDEX IDX_${tablePrefix}c4d999a5e90784e8caccf5589d`, undefined);
-		await queryRunner.query(`DROP TABLE ${tablePrefix}execution_entity`, undefined);
-		await queryRunner.query(`DROP INDEX IDX_${tablePrefix}07fde106c0b471d8cc80a64fc8`, undefined);
-		await queryRunner.query(`DROP TABLE ${tablePrefix}credentials_entity`, undefined);
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
+		await queryRunner.query(`DROP TABLE ${tablePrefix}workflow_entity`);
+		await queryRunner.query(`DROP INDEX IDX_${tablePrefix}c4d999a5e90784e8caccf5589d`);
+		await queryRunner.query(`DROP TABLE ${tablePrefix}execution_entity`);
+		await queryRunner.query(`DROP INDEX IDX_${tablePrefix}07fde106c0b471d8cc80a64fc8`);
+		await queryRunner.query(`DROP TABLE ${tablePrefix}credentials_entity`);
 	}
 }
diff --git a/packages/cli/src/databases/migrations/postgresdb/1589476000887-WebhookModel.ts b/packages/cli/src/databases/migrations/postgresdb/1589476000887-WebhookModel.ts
index 6e91124b2ed6b..3b1617a098dfd 100644
--- a/packages/cli/src/databases/migrations/postgresdb/1589476000887-WebhookModel.ts
+++ b/packages/cli/src/databases/migrations/postgresdb/1589476000887-WebhookModel.ts
@@ -1,19 +1,13 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { getTablePrefix } from '@db/utils/migrationHelpers';
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
-export class WebhookModel1589476000887 implements MigrationInterface {
-	name = 'WebhookModel1589476000887';
-
-	async up(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = getTablePrefix();
+export class WebhookModel1589476000887 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			`CREATE TABLE IF NOT EXISTS ${tablePrefix}webhook_entity ("workflowId" integer NOT NULL, "webhookPath" character varying NOT NULL, "method" character varying NOT NULL, "node" character varying NOT NULL, CONSTRAINT "PK_${tablePrefix}b21ace2e13596ccd87dc9bf4ea6" PRIMARY KEY ("webhookPath", "method"))`,
-			undefined,
 		);
 	}
 
-	async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = getTablePrefix();
-		await queryRunner.query(`DROP TABLE ${tablePrefix}webhook_entity`, undefined);
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
+		await queryRunner.query(`DROP TABLE ${tablePrefix}webhook_entity`);
 	}
 }
diff --git a/packages/cli/src/databases/migrations/postgresdb/1594828256133-CreateIndexStoppedAt.ts b/packages/cli/src/databases/migrations/postgresdb/1594828256133-CreateIndexStoppedAt.ts
index f8d315e54fed2..1fb468b1640ac 100644
--- a/packages/cli/src/databases/migrations/postgresdb/1594828256133-CreateIndexStoppedAt.ts
+++ b/packages/cli/src/databases/migrations/postgresdb/1594828256133-CreateIndexStoppedAt.ts
@@ -1,18 +1,13 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { getTablePrefix } from '@db/utils/migrationHelpers';
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
-export class CreateIndexStoppedAt1594828256133 implements MigrationInterface {
-	name = 'CreateIndexStoppedAt1594828256133';
-
-	async up(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = getTablePrefix();
+export class CreateIndexStoppedAt1594828256133 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			`CREATE INDEX IF NOT EXISTS IDX_${tablePrefix}33228da131bb1112247cf52a42 ON ${tablePrefix}execution_entity ("stoppedAt") `,
 		);
 	}
 
-	async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = getTablePrefix();
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`DROP INDEX IDX_${tablePrefix}33228da131bb1112247cf52a42`);
 	}
 }
diff --git a/packages/cli/src/databases/migrations/postgresdb/1607431743768-MakeStoppedAtNullable.ts b/packages/cli/src/databases/migrations/postgresdb/1607431743768-MakeStoppedAtNullable.ts
index 809f1de2e31fa..bfedccd0cd607 100644
--- a/packages/cli/src/databases/migrations/postgresdb/1607431743768-MakeStoppedAtNullable.ts
+++ b/packages/cli/src/databases/migrations/postgresdb/1607431743768-MakeStoppedAtNullable.ts
@@ -1,18 +1,9 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { getTablePrefix } from '@db/utils/migrationHelpers';
+import type { MigrationContext, IrreversibleMigration } from '@db/types';
 
-export class MakeStoppedAtNullable1607431743768 implements MigrationInterface {
-	name = 'MakeStoppedAtNullable1607431743768';
-
-	async up(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = getTablePrefix();
+export class MakeStoppedAtNullable1607431743768 implements IrreversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			'ALTER TABLE ' + tablePrefix + 'execution_entity ALTER COLUMN "stoppedAt" DROP NOT NULL',
-			undefined,
 		);
 	}
-
-	async down(queryRunner: QueryRunner): Promise<void> {
-		// Cannot be undone as column might already have null values
-	}
 }
diff --git a/packages/cli/src/databases/migrations/postgresdb/1611144599516-AddWebhookId.ts b/packages/cli/src/databases/migrations/postgresdb/1611144599516-AddWebhookId.ts
index 71057557f72e5..5a5df368649b9 100644
--- a/packages/cli/src/databases/migrations/postgresdb/1611144599516-AddWebhookId.ts
+++ b/packages/cli/src/databases/migrations/postgresdb/1611144599516-AddWebhookId.ts
@@ -1,11 +1,7 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { getTablePrefix } from '@db/utils/migrationHelpers';
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
-export class AddWebhookId1611144599516 implements MigrationInterface {
-	name = 'AddWebhookId1611144599516';
-
-	async up(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = getTablePrefix();
+export class AddWebhookId1611144599516 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			`ALTER TABLE ${tablePrefix}webhook_entity ADD "webhookId" character varying`,
 		);
@@ -15,8 +11,7 @@ export class AddWebhookId1611144599516 implements MigrationInterface {
 		);
 	}
 
-	async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = getTablePrefix();
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`DROP INDEX IDX_${tablePrefix}16f4436789e804e3e1c9eeb240`);
 		await queryRunner.query(`ALTER TABLE ${tablePrefix}webhook_entity DROP COLUMN "pathLength"`);
 		await queryRunner.query(`ALTER TABLE ${tablePrefix}webhook_entity DROP COLUMN "webhookId"`);
diff --git a/packages/cli/src/databases/migrations/postgresdb/1617270242566-CreateTagEntity.ts b/packages/cli/src/databases/migrations/postgresdb/1617270242566-CreateTagEntity.ts
index acfda7410b336..00a17d7088ec0 100644
--- a/packages/cli/src/databases/migrations/postgresdb/1617270242566-CreateTagEntity.ts
+++ b/packages/cli/src/databases/migrations/postgresdb/1617270242566-CreateTagEntity.ts
@@ -1,12 +1,7 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { getTablePrefix } from '@db/utils/migrationHelpers';
-
-export class CreateTagEntity1617270242566 implements MigrationInterface {
-	name = 'CreateTagEntity1617270242566';
-
-	async up(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = getTablePrefix();
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
+export class CreateTagEntity1617270242566 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		// create tags table + relationship with workflow entity
 
 		await queryRunner.query(
@@ -72,9 +67,7 @@ export class CreateTagEntity1617270242566 implements MigrationInterface {
 		);
 	}
 
-	async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = getTablePrefix();
-
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		// `createdAt` and `updatedAt`
 
 		await queryRunner.query(
diff --git a/packages/cli/src/databases/migrations/postgresdb/1620824779533-UniqueWorkflowNames.ts b/packages/cli/src/databases/migrations/postgresdb/1620824779533-UniqueWorkflowNames.ts
index 54f22a8fef6f7..1cc2f849e13b9 100644
--- a/packages/cli/src/databases/migrations/postgresdb/1620824779533-UniqueWorkflowNames.ts
+++ b/packages/cli/src/databases/migrations/postgresdb/1620824779533-UniqueWorkflowNames.ts
@@ -1,59 +1,5 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { getTablePrefix } from '@db/utils/migrationHelpers';
+import { UniqueWorkflowNames1620821879465 } from '../common/1620821879465-UniqueWorkflowNames';
 
-export class UniqueWorkflowNames1620824779533 implements MigrationInterface {
-	name = 'UniqueWorkflowNames1620824779533';
-
-	async up(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = getTablePrefix();
-
-		const workflowNames = await queryRunner.query(`
-				SELECT name
-				FROM ${tablePrefix}workflow_entity
-			`);
-
-		for (const { name } of workflowNames) {
-			const [duplicatesQuery, parameters] = queryRunner.connection.driver.escapeQueryWithParameters(
-				`
-					SELECT id, name
-					FROM ${tablePrefix}workflow_entity
-					WHERE name = :name
-					ORDER BY "createdAt" ASC
-				`,
-				{ name },
-				{},
-			);
-
-			const duplicates = await queryRunner.query(duplicatesQuery, parameters);
-
-			if (duplicates.length > 1) {
-				await Promise.all(
-					duplicates.map(({ id, name }: { id: number; name: string }, index: number) => {
-						if (index === 0) return Promise.resolve();
-						const [updateQuery, updateParams] =
-							queryRunner.connection.driver.escapeQueryWithParameters(
-								`
-							UPDATE ${tablePrefix}workflow_entity
-							SET name = :name
-							WHERE id = '${id}'
-						`,
-								{ name: `${name} ${index + 1}` },
-								{},
-							);
-
-						return queryRunner.query(updateQuery, updateParams);
-					}),
-				);
-			}
-		}
-
-		await queryRunner.query(
-			`CREATE UNIQUE INDEX "IDX_${tablePrefix}a252c527c4c89237221fe2c0ab" ON ${tablePrefix}workflow_entity ("name") `,
-		);
-	}
-
-	async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = getTablePrefix();
-		await queryRunner.query(`DROP INDEX "IDX_${tablePrefix}a252c527c4c89237221fe2c0ab"`);
-	}
+export class UniqueWorkflowNames1620824779533 extends UniqueWorkflowNames1620821879465 {
+	indexSuffix = 'a252c527c4c89237221fe2c0ab';
 }
diff --git a/packages/cli/src/databases/migrations/postgresdb/1626176912946-AddwaitTill.ts b/packages/cli/src/databases/migrations/postgresdb/1626176912946-AddwaitTill.ts
index 917934e7dcc59..eff0301a4ce23 100644
--- a/packages/cli/src/databases/migrations/postgresdb/1626176912946-AddwaitTill.ts
+++ b/packages/cli/src/databases/migrations/postgresdb/1626176912946-AddwaitTill.ts
@@ -1,19 +1,14 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { getTablePrefix } from '@db/utils/migrationHelpers';
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
-export class AddwaitTill1626176912946 implements MigrationInterface {
-	name = 'AddwaitTill1626176912946';
-
-	async up(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = getTablePrefix();
+export class AddwaitTill1626176912946 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`ALTER TABLE ${tablePrefix}execution_entity ADD "waitTill" TIMESTAMP`);
 		await queryRunner.query(
 			`CREATE INDEX IF NOT EXISTS IDX_${tablePrefix}ca4a71b47f28ac6ea88293a8e2 ON ${tablePrefix}execution_entity ("waitTill")`,
 		);
 	}
 
-	async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = getTablePrefix();
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`DROP INDEX IDX_${tablePrefix}ca4a71b47f28ac6ea88293a8e2`);
 		await queryRunner.query(`ALTER TABLE ${tablePrefix}webhook_entity DROP COLUMN "waitTill"`);
 	}
diff --git a/packages/cli/src/databases/migrations/postgresdb/1630419189837-UpdateWorkflowCredentials.ts b/packages/cli/src/databases/migrations/postgresdb/1630419189837-UpdateWorkflowCredentials.ts
index 2a2f0d6898545..873c44d385331 100644
--- a/packages/cli/src/databases/migrations/postgresdb/1630419189837-UpdateWorkflowCredentials.ts
+++ b/packages/cli/src/databases/migrations/postgresdb/1630419189837-UpdateWorkflowCredentials.ts
@@ -1,302 +1,3 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { getTablePrefix, runInBatches } from '@db/utils/migrationHelpers';
+import { UpdateWorkflowCredentials1630330987096 } from '../common/1630330987096-UpdateWorkflowCredentials';
 
-// replacing the credentials in workflows and execution
-// `nodeType: name` changes to `nodeType: { id, name }`
-
-export class UpdateWorkflowCredentials1630419189837 implements MigrationInterface {
-	name = 'UpdateWorkflowCredentials1630419189837';
-
-	public async up(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = getTablePrefix();
-
-		const credentialsEntities = await queryRunner.query(`
-			SELECT id, name, type
-			FROM ${tablePrefix}credentials_entity
-		`);
-
-		const workflowsQuery = `
-			SELECT id, nodes
-			FROM ${tablePrefix}workflow_entity
-		`;
-
-		// @ts-ignore
-		await runInBatches(queryRunner, workflowsQuery, (workflows) => {
-			workflows.forEach(async (workflow) => {
-				const nodes = workflow.nodes;
-				let credentialsUpdated = false;
-				// @ts-ignore
-				nodes.forEach((node) => {
-					if (node.credentials) {
-						const allNodeCredentials = Object.entries(node.credentials);
-						for (const [type, name] of allNodeCredentials) {
-							if (typeof name === 'string') {
-								const matchingCredentials = credentialsEntities.find(
-									// @ts-ignore
-									(credentials) => credentials.name === name && credentials.type === type,
-								);
-								node.credentials[type] = { id: matchingCredentials?.id || null, name };
-								credentialsUpdated = true;
-							}
-						}
-					}
-				});
-				if (credentialsUpdated) {
-					const [updateQuery, updateParams] =
-						queryRunner.connection.driver.escapeQueryWithParameters(
-							`
-								UPDATE ${tablePrefix}workflow_entity
-								SET nodes = :nodes
-								WHERE id = '${workflow.id}'
-							`,
-							{ nodes: JSON.stringify(nodes) },
-							{},
-						);
-
-					queryRunner.query(updateQuery, updateParams);
-				}
-			});
-		});
-
-		const waitingExecutionsQuery = `
-			SELECT id, "workflowData"
-			FROM ${tablePrefix}execution_entity
-			WHERE "waitTill" IS NOT NULL AND finished = FALSE
-		`;
-		// @ts-ignore
-		await runInBatches(queryRunner, waitingExecutionsQuery, (waitingExecutions) => {
-			waitingExecutions.forEach(async (execution) => {
-				const data = execution.workflowData;
-				let credentialsUpdated = false;
-				// @ts-ignore
-				data.nodes.forEach((node) => {
-					if (node.credentials) {
-						const allNodeCredentials = Object.entries(node.credentials);
-						for (const [type, name] of allNodeCredentials) {
-							if (typeof name === 'string') {
-								const matchingCredentials = credentialsEntities.find(
-									// @ts-ignore
-									(credentials) => credentials.name === name && credentials.type === type,
-								);
-								node.credentials[type] = { id: matchingCredentials?.id || null, name };
-								credentialsUpdated = true;
-							}
-						}
-					}
-				});
-				if (credentialsUpdated) {
-					const [updateQuery, updateParams] =
-						queryRunner.connection.driver.escapeQueryWithParameters(
-							`
-							UPDATE ${tablePrefix}execution_entity
-							SET "workflowData" = :data
-							WHERE id = '${execution.id}'
-						`,
-							{ data: JSON.stringify(data) },
-							{},
-						);
-
-					queryRunner.query(updateQuery, updateParams);
-				}
-			});
-		});
-
-		const retryableExecutions = await queryRunner.query(`
-			SELECT id, "workflowData"
-			FROM ${tablePrefix}execution_entity
-			WHERE "waitTill" IS NULL AND finished = FALSE AND mode != 'retry'
-			ORDER BY "startedAt" DESC
-			LIMIT 200
-		`);
-
-		// @ts-ignore
-		retryableExecutions.forEach(async (execution) => {
-			const data = execution.workflowData;
-			let credentialsUpdated = false;
-			// @ts-ignore
-			data.nodes.forEach((node) => {
-				if (node.credentials) {
-					const allNodeCredentials = Object.entries(node.credentials);
-					for (const [type, name] of allNodeCredentials) {
-						if (typeof name === 'string') {
-							// @ts-ignore
-							const matchingCredentials = credentialsEntities.find(
-								// @ts-ignore
-								(credentials) => credentials.name === name && credentials.type === type,
-							);
-							node.credentials[type] = { id: matchingCredentials?.id || null, name };
-							credentialsUpdated = true;
-						}
-					}
-				}
-			});
-			if (credentialsUpdated) {
-				const [updateQuery, updateParams] = queryRunner.connection.driver.escapeQueryWithParameters(
-					`
-				UPDATE ${tablePrefix}execution_entity
-				SET "workflowData" = :data
-				WHERE id = '${execution.id}'
-				`,
-					{ data: JSON.stringify(data) },
-					{},
-				);
-
-				queryRunner.query(updateQuery, updateParams);
-			}
-		});
-	}
-
-	public async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = getTablePrefix();
-
-		const credentialsEntities = await queryRunner.query(`
-			SELECT id, name, type
-			FROM ${tablePrefix}credentials_entity
-		`);
-
-		const workflowsQuery = `
-			SELECT id, nodes
-			FROM ${tablePrefix}workflow_entity
-		`;
-		// @ts-ignore
-		await runInBatches(queryRunner, workflowsQuery, (workflows) => {
-			workflows.forEach(async (workflow) => {
-				const nodes = workflow.nodes;
-				let credentialsUpdated = false;
-				// @ts-ignore
-				nodes.forEach((node) => {
-					if (node.credentials) {
-						const allNodeCredentials = Object.entries(node.credentials);
-						for (const [type, creds] of allNodeCredentials) {
-							if (typeof creds === 'object') {
-								// @ts-ignore
-								const matchingCredentials = credentialsEntities.find(
-									// @ts-ignore
-									(credentials) => credentials.id === creds.id && credentials.type === type,
-								);
-								if (matchingCredentials) {
-									node.credentials[type] = matchingCredentials.name;
-								} else {
-									// @ts-ignore
-									node.credentials[type] = creds.name;
-								}
-								credentialsUpdated = true;
-							}
-						}
-					}
-				});
-				if (credentialsUpdated) {
-					const [updateQuery, updateParams] =
-						queryRunner.connection.driver.escapeQueryWithParameters(
-							`
-								UPDATE ${tablePrefix}workflow_entity
-								SET nodes = :nodes
-								WHERE id = '${workflow.id}'
-							`,
-							{ nodes: JSON.stringify(nodes) },
-							{},
-						);
-
-					queryRunner.query(updateQuery, updateParams);
-				}
-			});
-		});
-
-		const waitingExecutionsQuery = `
-			SELECT id, "workflowData"
-			FROM ${tablePrefix}execution_entity
-			WHERE "waitTill" IS NOT NULL AND finished = FALSE
-		`;
-		// @ts-ignore
-		await runInBatches(queryRunner, waitingExecutionsQuery, (waitingExecutions) => {
-			waitingExecutions.forEach(async (execution) => {
-				const data = execution.workflowData;
-				let credentialsUpdated = false;
-				// @ts-ignore
-				data.nodes.forEach((node) => {
-					if (node.credentials) {
-						const allNodeCredentials = Object.entries(node.credentials);
-						for (const [type, creds] of allNodeCredentials) {
-							if (typeof creds === 'object') {
-								// @ts-ignore
-								const matchingCredentials = credentialsEntities.find(
-									// @ts-ignore
-									(credentials) => credentials.id === creds.id && credentials.type === type,
-								);
-								if (matchingCredentials) {
-									node.credentials[type] = matchingCredentials.name;
-								} else {
-									// @ts-ignore
-									node.credentials[type] = creds.name;
-								}
-								credentialsUpdated = true;
-							}
-						}
-					}
-				});
-				if (credentialsUpdated) {
-					const [updateQuery, updateParams] =
-						queryRunner.connection.driver.escapeQueryWithParameters(
-							`
-								UPDATE ${tablePrefix}execution_entity
-								SET "workflowData" = :data
-								WHERE id = '${execution.id}'
-							`,
-							{ data: JSON.stringify(data) },
-							{},
-						);
-
-					queryRunner.query(updateQuery, updateParams);
-				}
-			});
-		});
-
-		const retryableExecutions = await queryRunner.query(`
-			SELECT id, "workflowData"
-			FROM ${tablePrefix}execution_entity
-			WHERE "waitTill" IS NULL AND finished = FALSE AND mode != 'retry'
-			ORDER BY "startedAt" DESC
-			LIMIT 200
-		`);
-		// @ts-ignore
-		retryableExecutions.forEach(async (execution) => {
-			const data = execution.workflowData;
-			let credentialsUpdated = false;
-			// @ts-ignore
-			data.nodes.forEach((node) => {
-				if (node.credentials) {
-					const allNodeCredentials = Object.entries(node.credentials);
-					for (const [type, creds] of allNodeCredentials) {
-						if (typeof creds === 'object') {
-							// @ts-ignore
-							const matchingCredentials = credentialsEntities.find(
-								// @ts-ignore
-								(credentials) => credentials.id === creds.id && credentials.type === type,
-							);
-							if (matchingCredentials) {
-								node.credentials[type] = matchingCredentials.name;
-							} else {
-								// @ts-ignore
-								node.credentials[type] = creds.name;
-							}
-							credentialsUpdated = true;
-						}
-					}
-				}
-			});
-			if (credentialsUpdated) {
-				const [updateQuery, updateParams] = queryRunner.connection.driver.escapeQueryWithParameters(
-					`
-						UPDATE ${tablePrefix}execution_entity
-						SET "workflowData" = :data
-						WHERE id = '${execution.id}'
-					`,
-					{ data: JSON.stringify(data) },
-					{},
-				);
-
-				queryRunner.query(updateQuery, updateParams);
-			}
-		});
-	}
-}
+export class UpdateWorkflowCredentials1630419189837 extends UpdateWorkflowCredentials1630330987096 {}
diff --git a/packages/cli/src/databases/migrations/postgresdb/1644422880309-AddExecutionEntityIndexes.ts b/packages/cli/src/databases/migrations/postgresdb/1644422880309-AddExecutionEntityIndexes.ts
index 5f3d4c55f71af..7426fb0ed148c 100644
--- a/packages/cli/src/databases/migrations/postgresdb/1644422880309-AddExecutionEntityIndexes.ts
+++ b/packages/cli/src/databases/migrations/postgresdb/1644422880309-AddExecutionEntityIndexes.ts
@@ -1,12 +1,7 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { getTablePrefix } from '@db/utils/migrationHelpers';
-
-export class AddExecutionEntityIndexes1644422880309 implements MigrationInterface {
-	name = 'AddExecutionEntityIndexes1644422880309';
-
-	public async up(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = getTablePrefix();
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
+export class AddExecutionEntityIndexes1644422880309 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`DROP INDEX IF EXISTS IDX_${tablePrefix}c4d999a5e90784e8caccf5589d`);
 		await queryRunner.query(`DROP INDEX IF EXISTS IDX_${tablePrefix}ca4a71b47f28ac6ea88293a8e2`);
 		await queryRunner.query(
@@ -29,9 +24,7 @@ export class AddExecutionEntityIndexes1644422880309 implements MigrationInterfac
 		);
 	}
 
-	public async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = getTablePrefix();
-
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`DROP INDEX "IDX_${tablePrefix}d160d4771aba5a0d78943edbe3"`);
 		await queryRunner.query(`DROP INDEX "IDX_${tablePrefix}85b981df7b444f905f8bf50747"`);
 		await queryRunner.query(`DROP INDEX "IDX_${tablePrefix}72ffaaab9f04c2c1f1ea86e662"`);
diff --git a/packages/cli/src/databases/migrations/postgresdb/1646834195327-IncreaseTypeVarcharLimit.ts b/packages/cli/src/databases/migrations/postgresdb/1646834195327-IncreaseTypeVarcharLimit.ts
index ea4e2b4896b78..576e8c80a0f87 100644
--- a/packages/cli/src/databases/migrations/postgresdb/1646834195327-IncreaseTypeVarcharLimit.ts
+++ b/packages/cli/src/databases/migrations/postgresdb/1646834195327-IncreaseTypeVarcharLimit.ts
@@ -1,15 +1,9 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { getTablePrefix } from '@db/utils/migrationHelpers';
+import type { MigrationContext, IrreversibleMigration } from '@db/types';
 
-export class IncreaseTypeVarcharLimit1646834195327 implements MigrationInterface {
-	name = 'IncreaseTypeVarcharLimit1646834195327';
-
-	async up(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = getTablePrefix();
+export class IncreaseTypeVarcharLimit1646834195327 implements IrreversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			`ALTER TABLE ${tablePrefix}credentials_entity ALTER COLUMN "type" TYPE VARCHAR(128)`,
 		);
 	}
-
-	async down(queryRunner: QueryRunner): Promise<void> {}
 }
diff --git a/packages/cli/src/databases/migrations/postgresdb/1646992772331-CreateUserManagement.ts b/packages/cli/src/databases/migrations/postgresdb/1646992772331-CreateUserManagement.ts
index 741a81f8a3c01..a69bcb4297b33 100644
--- a/packages/cli/src/databases/migrations/postgresdb/1646992772331-CreateUserManagement.ts
+++ b/packages/cli/src/databases/migrations/postgresdb/1646992772331-CreateUserManagement.ts
@@ -1,13 +1,8 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
+import type { InsertResult, MigrationContext, ReversibleMigration } from '@db/types';
 import { v4 as uuid } from 'uuid';
-import { getTablePrefix, loadSurveyFromDisk } from '@db/utils/migrationHelpers';
-
-export class CreateUserManagement1646992772331 implements MigrationInterface {
-	name = 'CreateUserManagement1646992772331';
-
-	public async up(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = getTablePrefix();
 
+export class CreateUserManagement1646992772331 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix, loadSurveyFromDisk }: MigrationContext) {
 		await queryRunner.query(
 			`CREATE TABLE ${tablePrefix}role (
 				"id" serial NOT NULL,
@@ -92,7 +87,9 @@ export class CreateUserManagement1646992772331 implements MigrationInterface {
 			`INSERT INTO ${tablePrefix}role (name, scope) VALUES ('owner', 'global');`,
 		);
 
-		const instanceOwnerRole = await queryRunner.query('SELECT lastval() as "insertId"');
+		const instanceOwnerRole = (await queryRunner.query(
+			'SELECT lastval() as "insertId"',
+		)) as InsertResult;
 
 		await queryRunner.query(
 			`INSERT INTO ${tablePrefix}role (name, scope) VALUES ('member', 'global');`,
@@ -102,13 +99,17 @@ export class CreateUserManagement1646992772331 implements MigrationInterface {
 			`INSERT INTO ${tablePrefix}role (name, scope) VALUES ('owner', 'workflow');`,
 		);
 
-		const workflowOwnerRole = await queryRunner.query('SELECT lastval() as "insertId"');
+		const workflowOwnerRole = (await queryRunner.query(
+			'SELECT lastval() as "insertId"',
+		)) as InsertResult;
 
 		await queryRunner.query(
 			`INSERT INTO ${tablePrefix}role (name, scope) VALUES ('owner', 'credential');`,
 		);
 
-		const credentialOwnerRole = await queryRunner.query('SELECT lastval() as "insertId"');
+		const credentialOwnerRole = (await queryRunner.query(
+			'SELECT lastval() as "insertId"',
+		)) as InsertResult;
 
 		const survey = loadSurveyFromDisk();
 
@@ -131,11 +132,14 @@ export class CreateUserManagement1646992772331 implements MigrationInterface {
 		await queryRunner.query(
 			`INSERT INTO ${tablePrefix}settings ("key", "value", "loadOnStartup") VALUES ('userManagement.isInstanceOwnerSetUp', 'false', true), ('userManagement.skipInstanceOwnerSetup', 'false', true)`,
 		);
-	}
 
-	public async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = getTablePrefix();
+		await queryRunner.query(
+			`INSERT INTO ${tablePrefix}settings ("key", "value", "loadOnStartup") VALUES ($1, $2, $3)`,
+			['ui.banners.dismissed', '["V1"]', true],
+		);
+	}
 
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			`CREATE UNIQUE INDEX "IDX_${tablePrefix}a252c527c4c89237221fe2c0ab" ON ${tablePrefix}workflow_entity ("name")`,
 		);
diff --git a/packages/cli/src/databases/migrations/postgresdb/1648740597343-LowerCaseUserEmail.ts b/packages/cli/src/databases/migrations/postgresdb/1648740597343-LowerCaseUserEmail.ts
index 31f33849ed576..2f2ee528f1e0a 100644
--- a/packages/cli/src/databases/migrations/postgresdb/1648740597343-LowerCaseUserEmail.ts
+++ b/packages/cli/src/databases/migrations/postgresdb/1648740597343-LowerCaseUserEmail.ts
@@ -1,16 +1,10 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { getTablePrefix } from '@db/utils/migrationHelpers';
+import type { MigrationContext, IrreversibleMigration } from '@db/types';
 
-export class LowerCaseUserEmail1648740597343 implements MigrationInterface {
-	name = 'LowerCaseUserEmail1648740597343';
-
-	public async up(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = getTablePrefix();
+export class LowerCaseUserEmail1648740597343 implements IrreversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`
 			UPDATE "${tablePrefix}user"
 			SET email = LOWER(email);
 		`);
 	}
-
-	public async down(queryRunner: QueryRunner): Promise<void> {}
 }
diff --git a/packages/cli/src/databases/migrations/postgresdb/1652254514002-CommunityNodes.ts b/packages/cli/src/databases/migrations/postgresdb/1652254514002-CommunityNodes.ts
index a35395b15583d..f0f429627357e 100644
--- a/packages/cli/src/databases/migrations/postgresdb/1652254514002-CommunityNodes.ts
+++ b/packages/cli/src/databases/migrations/postgresdb/1652254514002-CommunityNodes.ts
@@ -1,14 +1,7 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { getTablePrefix, logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
-
-export class CommunityNodes1652254514002 implements MigrationInterface {
-	name = 'CommunityNodes1652254514002';
-
-	public async up(queryRunner: QueryRunner): Promise<void> {
-		logMigrationStart(this.name);
-
-		const tablePrefix = getTablePrefix();
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
+export class CommunityNodes1652254514002 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			`CREATE TABLE ${tablePrefix}installed_packages (` +
 				'"packageName" VARCHAR(214) NOT NULL,' +
@@ -31,11 +24,9 @@ export class CommunityNodes1652254514002 implements MigrationInterface {
 				`CONSTRAINT "FK_${tablePrefix}73f857fc5dce682cef8a99c11dbddbc969618951" FOREIGN KEY ("package") REFERENCES ${tablePrefix}installed_packages ("packageName") ON DELETE CASCADE ON UPDATE CASCADE ` +
 				');',
 		);
-		logMigrationEnd(this.name);
 	}
 
-	public async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = getTablePrefix();
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`DROP TABLE "${tablePrefix}installed_nodes"`);
 		await queryRunner.query(`DROP TABLE "${tablePrefix}installed_packages"`);
 	}
diff --git a/packages/cli/src/databases/migrations/postgresdb/1652367743993-AddUserSettings.ts b/packages/cli/src/databases/migrations/postgresdb/1652367743993-AddUserSettings.ts
index 1c4439aff28eb..d3f9ad6bdd818 100644
--- a/packages/cli/src/databases/migrations/postgresdb/1652367743993-AddUserSettings.ts
+++ b/packages/cli/src/databases/migrations/postgresdb/1652367743993-AddUserSettings.ts
@@ -1,12 +1,7 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { getTablePrefix } from '@db/utils/migrationHelpers';
-
-export class AddUserSettings1652367743993 implements MigrationInterface {
-	name = 'AddUserSettings1652367743993';
-
-	public async up(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = getTablePrefix();
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
+export class AddUserSettings1652367743993 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`ALTER TABLE "${tablePrefix}user" ADD COLUMN settings json`);
 
 		await queryRunner.query(
@@ -14,8 +9,7 @@ export class AddUserSettings1652367743993 implements MigrationInterface {
 		);
 	}
 
-	public async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = getTablePrefix();
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`ALTER TABLE "${tablePrefix}user" DROP COLUMN settings`);
 	}
 }
diff --git a/packages/cli/src/databases/migrations/postgresdb/1652905585850-AddAPIKeyColumn.ts b/packages/cli/src/databases/migrations/postgresdb/1652905585850-AddAPIKeyColumn.ts
index 2462e9556ef39..80b2876a1be18 100644
--- a/packages/cli/src/databases/migrations/postgresdb/1652905585850-AddAPIKeyColumn.ts
+++ b/packages/cli/src/databases/migrations/postgresdb/1652905585850-AddAPIKeyColumn.ts
@@ -1,19 +1,14 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { getTablePrefix } from '@db/utils/migrationHelpers';
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
-export class AddAPIKeyColumn1652905585850 implements MigrationInterface {
-	name = 'AddAPIKeyColumn1652905585850';
-
-	public async up(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = getTablePrefix();
+export class AddAPIKeyColumn1652905585850 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`ALTER TABLE "${tablePrefix}user" ADD COLUMN "apiKey" VARCHAR(255)`);
 		await queryRunner.query(
 			`CREATE UNIQUE INDEX "UQ_${tablePrefix}ie0zomxves9w3p774drfrkxtj5" ON "${tablePrefix}user" ("apiKey")`,
 		);
 	}
 
-	public async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = getTablePrefix();
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`DROP INDEX "UQ_${tablePrefix}ie0zomxves9w3p774drfrkxtj5"`);
 		await queryRunner.query(`ALTER TABLE "${tablePrefix}user" DROP COLUMN "apiKey"`);
 	}
diff --git a/packages/cli/src/databases/migrations/postgresdb/1654090467022-IntroducePinData.ts b/packages/cli/src/databases/migrations/postgresdb/1654090467022-IntroducePinData.ts
index 651c700b1c253..3a27cc7894cc2 100644
--- a/packages/cli/src/databases/migrations/postgresdb/1654090467022-IntroducePinData.ts
+++ b/packages/cli/src/databases/migrations/postgresdb/1654090467022-IntroducePinData.ts
@@ -1,20 +1,11 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { getTablePrefix, logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
-export class IntroducePinData1654090467022 implements MigrationInterface {
-	name = 'IntroducePinData1654090467022';
-
-	async up(queryRunner: QueryRunner) {
-		logMigrationStart(this.name);
-
-		const tablePrefix = getTablePrefix();
+export class IntroducePinData1654090467022 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`ALTER TABLE ${tablePrefix}workflow_entity ADD "pinData" json`);
-
-		logMigrationEnd(this.name);
 	}
 
-	async down(queryRunner: QueryRunner) {
-		const tablePrefix = getTablePrefix();
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`ALTER TABLE ${tablePrefix}workflow_entity DROP COLUMN "pinData"`);
 	}
 }
diff --git a/packages/cli/src/databases/migrations/postgresdb/1658932090381-AddNodeIds.ts b/packages/cli/src/databases/migrations/postgresdb/1658932090381-AddNodeIds.ts
index aad02eca8f777..3f8514b7bb63b 100644
--- a/packages/cli/src/databases/migrations/postgresdb/1658932090381-AddNodeIds.ts
+++ b/packages/cli/src/databases/migrations/postgresdb/1658932090381-AddNodeIds.ts
@@ -1,73 +1,3 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { v4 as uuid } from 'uuid';
-import { getTablePrefix, runInBatches } from '@db/utils/migrationHelpers';
+import { AddNodeIds1658930531669 } from '../common/1658930531669-AddNodeIds';
 
-// add node ids in workflow objects
-
-export class AddNodeIds1658932090381 implements MigrationInterface {
-	name = 'AddNodeIds1658932090381';
-
-	public async up(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = getTablePrefix();
-
-		const workflowsQuery = `
-			SELECT id, nodes
-			FROM ${tablePrefix}workflow_entity
-		`;
-
-		// @ts-ignore
-		await runInBatches(queryRunner, workflowsQuery, (workflows) => {
-			workflows.forEach(async (workflow) => {
-				const nodes = workflow.nodes;
-				// @ts-ignore
-				nodes.forEach((node) => {
-					if (!node.id) {
-						node.id = uuid();
-					}
-				});
-
-				const [updateQuery, updateParams] = queryRunner.connection.driver.escapeQueryWithParameters(
-					`
-							UPDATE ${tablePrefix}workflow_entity
-							SET nodes = :nodes
-							WHERE id = '${workflow.id}'
-						`,
-					{ nodes: JSON.stringify(nodes) },
-					{},
-				);
-
-				queryRunner.query(updateQuery, updateParams);
-			});
-		});
-	}
-
-	public async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = getTablePrefix();
-
-		const workflowsQuery = `
-			SELECT id, nodes
-			FROM ${tablePrefix}workflow_entity
-		`;
-
-		// @ts-ignore
-		await runInBatches(queryRunner, workflowsQuery, (workflows) => {
-			workflows.forEach(async (workflow) => {
-				const nodes = workflow.nodes;
-				// @ts-ignore
-				nodes.forEach((node) => delete node.id);
-
-				const [updateQuery, updateParams] = queryRunner.connection.driver.escapeQueryWithParameters(
-					`
-							UPDATE ${tablePrefix}workflow_entity
-							SET nodes = :nodes
-							WHERE id = '${workflow.id}'
-						`,
-					{ nodes: JSON.stringify(nodes) },
-					{},
-				);
-
-				queryRunner.query(updateQuery, updateParams);
-			});
-		});
-	}
-}
+export class AddNodeIds1658932090381 extends AddNodeIds1658930531669 {}
diff --git a/packages/cli/src/databases/migrations/postgresdb/1659902242948-AddJsonKeyPinData.ts b/packages/cli/src/databases/migrations/postgresdb/1659902242948-AddJsonKeyPinData.ts
index 4cf7a98307301..fbb335027ccb7 100644
--- a/packages/cli/src/databases/migrations/postgresdb/1659902242948-AddJsonKeyPinData.ts
+++ b/packages/cli/src/databases/migrations/postgresdb/1659902242948-AddJsonKeyPinData.ts
@@ -1,46 +1,3 @@
-import {
-	getTablePrefix,
-	logMigrationEnd,
-	logMigrationStart,
-	runInBatches,
-} from '@db/utils/migrationHelpers';
-import { addJsonKeyToPinDataColumn } from '../sqlite/1659888469333-AddJsonKeyPinData';
-import type { MigrationInterface, QueryRunner } from 'typeorm';
+import { AddJsonKeyPinData1659888469333 } from '../common/1659888469333-AddJsonKeyPinData';
 
-/**
- * Convert JSON-type `pinData` column in `workflow_entity` table from
- * `{ [nodeName: string]: IDataObject[] }` to `{ [nodeName: string]: INodeExecutionData[] }`
- */
-export class AddJsonKeyPinData1659902242948 implements MigrationInterface {
-	name = 'AddJsonKeyPinData1659902242948';
-
-	async up(queryRunner: QueryRunner) {
-		logMigrationStart(this.name);
-
-		const workflowTable = `${getTablePrefix()}workflow_entity`;
-
-		const PINDATA_SELECT_QUERY = `
-			SELECT id, "pinData"
-			FROM ${workflowTable}
-			WHERE "pinData" IS NOT NULL;
-		`;
-
-		const PINDATA_UPDATE_STATEMENT = `
-			UPDATE ${workflowTable}
-			SET "pinData" = :pinData
-			WHERE id = :id;
-		`;
-
-		await runInBatches(
-			queryRunner,
-			PINDATA_SELECT_QUERY,
-			addJsonKeyToPinDataColumn(queryRunner, PINDATA_UPDATE_STATEMENT),
-		);
-
-		logMigrationEnd(this.name);
-	}
-
-	async down() {
-		// irreversible migration
-	}
-}
+export class AddJsonKeyPinData1659902242948 extends AddJsonKeyPinData1659888469333 {}
diff --git a/packages/cli/src/databases/migrations/postgresdb/1660062385367-CreateCredentialsUserRole.ts b/packages/cli/src/databases/migrations/postgresdb/1660062385367-CreateCredentialsUserRole.ts
index 6d94c29fd12b8..0a4f3c2cd1f2c 100644
--- a/packages/cli/src/databases/migrations/postgresdb/1660062385367-CreateCredentialsUserRole.ts
+++ b/packages/cli/src/databases/migrations/postgresdb/1660062385367-CreateCredentialsUserRole.ts
@@ -1,11 +1,7 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { getTablePrefix } from '@db/utils/migrationHelpers';
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
-export class CreateCredentialsUserRole1660062385367 implements MigrationInterface {
-	name = 'CreateCredentialsUserRole1660062385367';
-
-	async up(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = getTablePrefix();
+export class CreateCredentialsUserRole1660062385367 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`
 			INSERT INTO ${tablePrefix}role (name, scope)
 			VALUES ('user', 'credential')
@@ -13,8 +9,7 @@ export class CreateCredentialsUserRole1660062385367 implements MigrationInterfac
 		`);
 	}
 
-	async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = getTablePrefix();
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`
 			DELETE FROM ${tablePrefix}role WHERE name='user' AND scope='credential';
 		`);
diff --git a/packages/cli/src/databases/migrations/postgresdb/1663755770893-CreateWorkflowsEditorRole.ts b/packages/cli/src/databases/migrations/postgresdb/1663755770893-CreateWorkflowsEditorRole.ts
index 74498ddd783d8..4951a637a03e2 100644
--- a/packages/cli/src/databases/migrations/postgresdb/1663755770893-CreateWorkflowsEditorRole.ts
+++ b/packages/cli/src/databases/migrations/postgresdb/1663755770893-CreateWorkflowsEditorRole.ts
@@ -1,25 +1,15 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { getTablePrefix, logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
-
-export class CreateWorkflowsEditorRole1663755770893 implements MigrationInterface {
-	name = 'CreateWorkflowsEditorRole1663755770893';
-
-	async up(queryRunner: QueryRunner) {
-		logMigrationStart(this.name);
-		const tablePrefix = getTablePrefix();
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
+export class CreateWorkflowsEditorRole1663755770893 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`
 			INSERT INTO ${tablePrefix}role (name, scope)
 			VALUES ('editor', 'workflow')
 			ON CONFLICT DO NOTHING;
 		`);
-
-		logMigrationEnd(this.name);
 	}
 
-	async down(queryRunner: QueryRunner) {
-		const tablePrefix = getTablePrefix();
-
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`
 			DELETE FROM ${tablePrefix}role WHERE name='user' AND scope='workflow';
 		`);
diff --git a/packages/cli/src/databases/migrations/postgresdb/1664196174001-WorkflowStatistics.ts b/packages/cli/src/databases/migrations/postgresdb/1664196174001-WorkflowStatistics.ts
index efe835dffabf7..2dffdafd64bb2 100644
--- a/packages/cli/src/databases/migrations/postgresdb/1664196174001-WorkflowStatistics.ts
+++ b/packages/cli/src/databases/migrations/postgresdb/1664196174001-WorkflowStatistics.ts
@@ -1,13 +1,7 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { getTablePrefix, logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
-
-export class WorkflowStatistics1664196174001 implements MigrationInterface {
-	name = 'WorkflowStatistics1664196174001';
-
-	async up(queryRunner: QueryRunner): Promise<void> {
-		logMigrationStart(this.name);
-		const tablePrefix = getTablePrefix();
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
+export class WorkflowStatistics1664196174001 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		// Create statistics table
 		await queryRunner.query(
 			`CREATE TABLE ${tablePrefix}workflow_statistics (
@@ -24,12 +18,9 @@ export class WorkflowStatistics1664196174001 implements MigrationInterface {
 		await queryRunner.query(
 			`ALTER TABLE ${tablePrefix}workflow_entity ADD COLUMN "dataLoaded" BOOLEAN DEFAULT false;`,
 		);
-
-		logMigrationEnd(this.name);
 	}
 
-	async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = getTablePrefix();
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`DROP TABLE ${tablePrefix}workflow_statistics`);
 		await queryRunner.query(`ALTER TABLE ${tablePrefix}workflow_entity DROP COLUMN dataLoaded`);
 	}
diff --git a/packages/cli/src/databases/migrations/postgresdb/1665484192212-CreateCredentialUsageTable.ts b/packages/cli/src/databases/migrations/postgresdb/1665484192212-CreateCredentialUsageTable.ts
index d9bc4bb4edcb5..929d668d93957 100644
--- a/packages/cli/src/databases/migrations/postgresdb/1665484192212-CreateCredentialUsageTable.ts
+++ b/packages/cli/src/databases/migrations/postgresdb/1665484192212-CreateCredentialUsageTable.ts
@@ -1,13 +1,7 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { getTablePrefix, logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
-
-export class CreateCredentialUsageTable1665484192212 implements MigrationInterface {
-	name = 'CreateCredentialUsageTable1665484192212';
-
-	async up(queryRunner: QueryRunner) {
-		logMigrationStart(this.name);
-		const tablePrefix = getTablePrefix();
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
+export class CreateCredentialUsageTable1665484192212 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			`CREATE TABLE ${tablePrefix}credential_usage (` +
 				'"workflowId" int NOT NULL,' +
@@ -20,13 +14,9 @@ export class CreateCredentialUsageTable1665484192212 implements MigrationInterfa
 				`CONSTRAINT "FK_${tablePrefix}7ce200a20ade7ae89fa7901da896993f" FOREIGN KEY ("credentialId") REFERENCES ${tablePrefix}credentials_entity ("id") ON DELETE CASCADE ON UPDATE CASCADE ` +
 				');',
 		);
-
-		logMigrationEnd(this.name);
 	}
 
-	async down(queryRunner: QueryRunner) {
-		const tablePrefix = getTablePrefix();
-
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`DROP TABLE "${tablePrefix}credential_usage"`);
 	}
 }
diff --git a/packages/cli/src/databases/migrations/postgresdb/1665754637025-RemoveCredentialUsageTable.ts b/packages/cli/src/databases/migrations/postgresdb/1665754637025-RemoveCredentialUsageTable.ts
index e5c3a6784fc32..a37236a228ae1 100644
--- a/packages/cli/src/databases/migrations/postgresdb/1665754637025-RemoveCredentialUsageTable.ts
+++ b/packages/cli/src/databases/migrations/postgresdb/1665754637025-RemoveCredentialUsageTable.ts
@@ -1,19 +1,11 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { getTablePrefix, logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
-export class RemoveCredentialUsageTable1665754637025 implements MigrationInterface {
-	name = 'RemoveCredentialUsageTable1665754637025';
-
-	async up(queryRunner: QueryRunner) {
-		logMigrationStart(this.name);
-		const tablePrefix = getTablePrefix();
+export class RemoveCredentialUsageTable1665754637025 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`DROP TABLE ${tablePrefix}credential_usage`);
-		logMigrationEnd(this.name);
 	}
 
-	async down(queryRunner: QueryRunner) {
-		const tablePrefix = getTablePrefix();
-
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			`CREATE TABLE ${tablePrefix}credential_usage (` +
 				'"workflowId" int NOT NULL,' +
diff --git a/packages/cli/src/databases/migrations/postgresdb/1669739707126-AddWorkflowVersionIdColumn.ts b/packages/cli/src/databases/migrations/postgresdb/1669739707126-AddWorkflowVersionIdColumn.ts
index 207187d978f72..168282484aff7 100644
--- a/packages/cli/src/databases/migrations/postgresdb/1669739707126-AddWorkflowVersionIdColumn.ts
+++ b/packages/cli/src/databases/migrations/postgresdb/1669739707126-AddWorkflowVersionIdColumn.ts
@@ -1,42 +1,3 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { v4 as uuidv4 } from 'uuid';
-import { getTablePrefix, logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
+import { AddWorkflowVersionIdColumn1669739707124 } from '../common/1669739707124-AddWorkflowVersionIdColumn';
 
-export class AddWorkflowVersionIdColumn1669739707126 implements MigrationInterface {
-	name = 'AddWorkflowVersionIdColumn1669739707126';
-
-	async up(queryRunner: QueryRunner) {
-		logMigrationStart(this.name);
-
-		const tablePrefix = getTablePrefix();
-		await queryRunner.query(
-			`ALTER TABLE ${tablePrefix}workflow_entity ADD COLUMN "versionId" CHAR(36)`,
-		);
-
-		const workflowIds: Array<{ id: number }> = await queryRunner.query(`
-			SELECT id
-			FROM ${tablePrefix}workflow_entity
-		`);
-
-		workflowIds.map(({ id }) => {
-			const [updateQuery, updateParams] = queryRunner.connection.driver.escapeQueryWithParameters(
-				`
-					UPDATE ${tablePrefix}workflow_entity
-					SET "versionId" = :versionId
-					WHERE id = '${id}'
-				`,
-				{ versionId: uuidv4() },
-				{},
-			);
-
-			return queryRunner.query(updateQuery, updateParams);
-		});
-
-		logMigrationEnd(this.name);
-	}
-
-	async down(queryRunner: QueryRunner) {
-		const tablePrefix = getTablePrefix();
-		await queryRunner.query(`ALTER TABLE ${tablePrefix}workflow_entity DROP COLUMN "versionId"`);
-	}
-}
+export class AddWorkflowVersionIdColumn1669739707126 extends AddWorkflowVersionIdColumn1669739707124 {}
diff --git a/packages/cli/src/databases/migrations/postgresdb/1669823906995-AddTriggerCountColumn.ts b/packages/cli/src/databases/migrations/postgresdb/1669823906995-AddTriggerCountColumn.ts
index 355e1e64c63e4..3094f9662490f 100644
--- a/packages/cli/src/databases/migrations/postgresdb/1669823906995-AddTriggerCountColumn.ts
+++ b/packages/cli/src/databases/migrations/postgresdb/1669823906995-AddTriggerCountColumn.ts
@@ -1,25 +1,14 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { getTablePrefix, logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
-
-export class AddTriggerCountColumn1669823906995 implements MigrationInterface {
-	name = 'AddTriggerCountColumn1669823906995';
-
-	async up(queryRunner: QueryRunner): Promise<void> {
-		logMigrationStart(this.name);
-
-		const tablePrefix = getTablePrefix();
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
+export class AddTriggerCountColumn1669823906995 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			`ALTER TABLE ${tablePrefix}workflow_entity ADD COLUMN "triggerCount" integer NOT NULL DEFAULT 0`,
 		);
-		// Table will be populated by n8n startup - see ActiveWorkflowRunner.ts
-
-		logMigrationEnd(this.name);
+		// Table will be populated by n8n startup - see ActiveWorkflowManager.ts
 	}
 
-	async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = getTablePrefix();
-
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`ALTER TABLE ${tablePrefix}workflow_entity DROP COLUMN "triggerCount"`);
 	}
 }
diff --git a/packages/cli/src/databases/migrations/postgresdb/1671535397530-MessageEventBusDestinations.ts b/packages/cli/src/databases/migrations/postgresdb/1671535397530-MessageEventBusDestinations.ts
index b743c165f3d1d..1082c56d242da 100644
--- a/packages/cli/src/databases/migrations/postgresdb/1671535397530-MessageEventBusDestinations.ts
+++ b/packages/cli/src/databases/migrations/postgresdb/1671535397530-MessageEventBusDestinations.ts
@@ -1,27 +1,17 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { getTablePrefix, logMigrationEnd, logMigrationStart } from '../../utils/migrationHelpers';
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
-export class MessageEventBusDestinations1671535397530 implements MigrationInterface {
-	name = 'MessageEventBusDestinations1671535397530';
-
-	async up(queryRunner: QueryRunner) {
-		logMigrationStart(this.name);
-		const tablePrefix = getTablePrefix();
+export class MessageEventBusDestinations1671535397530 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			`CREATE TABLE ${tablePrefix}event_destinations (` +
-				`"id" UUID PRIMARY KEY NOT NULL,` +
-				`"destination" JSONB NOT NULL,` +
-				`"createdAt" TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,` +
-				`"updatedAt" TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP);`,
+				'"id" UUID PRIMARY KEY NOT NULL,' +
+				'"destination" JSONB NOT NULL,' +
+				'"createdAt" TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,' +
+				'"updatedAt" TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP);',
 		);
-
-		logMigrationEnd(this.name);
 	}
 
-	async down(queryRunner: QueryRunner) {
-		logMigrationStart(this.name);
-		const tablePrefix = getTablePrefix();
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`DROP TABLE "${tablePrefix}event_destinations"`);
-		logMigrationEnd(this.name);
 	}
 }
diff --git a/packages/cli/src/databases/migrations/postgresdb/1671726148421-RemoveWorkflowDataLoadedFlag.ts b/packages/cli/src/databases/migrations/postgresdb/1671726148421-RemoveWorkflowDataLoadedFlag.ts
index a651c43946d25..22577b2154aef 100644
--- a/packages/cli/src/databases/migrations/postgresdb/1671726148421-RemoveWorkflowDataLoadedFlag.ts
+++ b/packages/cli/src/databases/migrations/postgresdb/1671726148421-RemoveWorkflowDataLoadedFlag.ts
@@ -1,63 +1,3 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { getTablePrefix, logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
-import { StatisticsNames } from '@db/entities/WorkflowStatistics';
+import { RemoveWorkflowDataLoadedFlag1671726148419 } from '../common/1671726148419-RemoveWorkflowDataLoadedFlag';
 
-export class RemoveWorkflowDataLoadedFlag1671726148421 implements MigrationInterface {
-	name = 'RemoveWorkflowDataLoadedFlag1671726148421';
-
-	async up(queryRunner: QueryRunner) {
-		logMigrationStart(this.name);
-		const tablePrefix = getTablePrefix();
-
-		// If any existing workflow has dataLoaded set to true, insert the relevant information to the statistics table
-		const workflowIds: Array<{ id: number; dataLoaded: boolean }> = await queryRunner.query(`
-			SELECT id, "dataLoaded"
-			FROM ${tablePrefix}workflow_entity
-		`);
-
-		workflowIds.map(({ id, dataLoaded }) => {
-			if (dataLoaded) {
-				const [insertQuery, insertParams] = queryRunner.connection.driver.escapeQueryWithParameters(
-					`
-					INSERT INTO ${tablePrefix}workflow_statistics ("workflowId", name, count, "latestEvent") VALUES
-					(:id, :name, 1, CURRENT_TIMESTAMP(3))
-					`,
-					{ id, name: StatisticsNames.dataLoaded },
-					{},
-				);
-
-				return queryRunner.query(insertQuery, insertParams);
-			}
-			return undefined;
-		});
-
-		await queryRunner.query(`ALTER TABLE ${tablePrefix}workflow_entity DROP COLUMN "dataLoaded"`);
-
-		logMigrationEnd(this.name);
-	}
-
-	async down(queryRunner: QueryRunner) {
-		const tablePrefix = getTablePrefix();
-
-		await queryRunner.query(
-			`ALTER TABLE ${tablePrefix}workflow_entity ADD COLUMN "dataLoaded" BOOLEAN DEFAULT false`,
-		);
-
-		// Search through statistics for any workflows that have the dataLoaded stat
-		const workflowsIds: Array<{ workflowId: string }> = await queryRunner.query(`
-			SELECT "workflowId"
-			FROM ${tablePrefix}workflow_statistics
-			WHERE name = '${StatisticsNames.dataLoaded}'
-		`);
-		workflowsIds.map(({ workflowId }) => {
-			return queryRunner.query(`
-				UPDATE ${tablePrefix}workflow_entity
-				SET "dataLoaded" = true
-				WHERE id = '${workflowId}'`);
-		});
-
-		await queryRunner.query(
-			`DELETE FROM ${tablePrefix}workflow_statistics WHERE name = '${StatisticsNames.dataLoaded}'`,
-		);
-	}
-}
+export class RemoveWorkflowDataLoadedFlag1671726148421 extends RemoveWorkflowDataLoadedFlag1671726148419 {}
diff --git a/packages/cli/src/databases/migrations/postgresdb/1673268682475-DeleteExecutionsWithWorkflows.ts b/packages/cli/src/databases/migrations/postgresdb/1673268682475-DeleteExecutionsWithWorkflows.ts
index 08fc25d88bb03..c31c51f5a5339 100644
--- a/packages/cli/src/databases/migrations/postgresdb/1673268682475-DeleteExecutionsWithWorkflows.ts
+++ b/packages/cli/src/databases/migrations/postgresdb/1673268682475-DeleteExecutionsWithWorkflows.ts
@@ -1,20 +1,15 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { getTablePrefix, logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
-
-export class DeleteExecutionsWithWorkflows1673268682475 implements MigrationInterface {
-	name = 'DeleteExecutionsWithWorkflows1673268682475';
-	public async up(queryRunner: QueryRunner): Promise<void> {
-		logMigrationStart(this.name);
-		const tablePrefix = getTablePrefix();
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
+export class DeleteExecutionsWithWorkflows1673268682475 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			`ALTER TABLE ${tablePrefix}execution_entity
 			 ALTER COLUMN "workflowId" TYPE INTEGER USING "workflowId"::integer`,
 		);
 
-		const workflowIds: Array<{ id: number }> = await queryRunner.query(`
+		const workflowIds = (await queryRunner.query(`
 			SELECT id FROM ${tablePrefix}workflow_entity
-		`);
+		`)) as Array<{ id: number }>;
 
 		await queryRunner.query(
 			`DELETE FROM ${tablePrefix}execution_entity
@@ -32,12 +27,9 @@ export class DeleteExecutionsWithWorkflows1673268682475 implements MigrationInte
 			 FOREIGN KEY ("workflowId") REFERENCES ${tablePrefix}workflow_entity ("id")
 			 ON DELETE CASCADE`,
 		);
-
-		logMigrationEnd(this.name);
 	}
 
-	public async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = getTablePrefix();
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			`ALTER TABLE ${tablePrefix}execution_entity
 			 DROP CONSTRAINT "FK_${tablePrefix}execution_entity_workflowId"`,
diff --git a/packages/cli/src/databases/migrations/postgresdb/1674138566000-AddStatusToExecutions.ts b/packages/cli/src/databases/migrations/postgresdb/1674138566000-AddStatusToExecutions.ts
index b8cc0e2b00d43..7c3efea2f1961 100644
--- a/packages/cli/src/databases/migrations/postgresdb/1674138566000-AddStatusToExecutions.ts
+++ b/packages/cli/src/databases/migrations/postgresdb/1674138566000-AddStatusToExecutions.ts
@@ -1,21 +1,11 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
-import config from '@/config';
-
-export class AddStatusToExecutions1674138566000 implements MigrationInterface {
-	name = 'AddStatusToExecutions1674138566000';
-	public async up(queryRunner: QueryRunner): Promise<void> {
-		logMigrationStart(this.name);
-		const tablePrefix = config.getEnv('database.tablePrefix');
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
+export class AddStatusToExecutions1674138566000 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`ALTER TABLE ${tablePrefix}execution_entity ADD COLUMN status varchar`);
-
-		logMigrationEnd(this.name);
 	}
 
-	public async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
-
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`ALTER TABLE ${tablePrefix}execution_entity DROP COLUMN status`);
 	}
 }
diff --git a/packages/cli/src/databases/migrations/postgresdb/1674509946020-CreateLdapEntities.ts b/packages/cli/src/databases/migrations/postgresdb/1674509946020-CreateLdapEntities.ts
deleted file mode 100644
index 478bef686eb8a..0000000000000
--- a/packages/cli/src/databases/migrations/postgresdb/1674509946020-CreateLdapEntities.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { LDAP_DEFAULT_CONFIGURATION, LDAP_FEATURE_NAME } from '@/Ldap/constants';
-import { getTablePrefix, logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
-
-export class CreateLdapEntities1674509946020 implements MigrationInterface {
-	name = 'CreateLdapEntities1674509946020';
-
-	async up(queryRunner: QueryRunner): Promise<void> {
-		logMigrationStart(this.name);
-
-		const tablePrefix = getTablePrefix();
-
-		await queryRunner.query(
-			`ALTER TABLE "${tablePrefix}user" ADD COLUMN disabled BOOLEAN NOT NULL DEFAULT false;`,
-		);
-
-		await queryRunner.query(`
-			INSERT INTO ${tablePrefix}settings (key, value, "loadOnStartup")
-			VALUES ('${LDAP_FEATURE_NAME}', '${JSON.stringify(LDAP_DEFAULT_CONFIGURATION)}', true)
-		`);
-
-		await queryRunner.query(
-			`CREATE TABLE IF NOT EXISTS "${tablePrefix}auth_identity" (
-				"userId" uuid REFERENCES "${tablePrefix}user" (id),
-				"providerId" VARCHAR(64) NOT NULL,
-				"providerType" VARCHAR(32) NOT NULL,
-				"createdAt" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-				"updatedAt" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-				PRIMARY KEY("providerId", "providerType")
-			);`,
-		);
-
-		await queryRunner.query(
-			`CREATE TABLE IF NOT EXISTS "${tablePrefix}auth_provider_sync_history" (
-				"id" serial NOT NULL PRIMARY KEY,
-				"providerType" VARCHAR(32) NOT NULL,
-				"runMode" TEXT NOT NULL,
-				"status" TEXT NOT NULL,
-				"startedAt" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-				"endedAt" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-				"scanned" INTEGER NOT NULL,
-				"created" INTEGER NOT NULL,
-				"updated" INTEGER NOT NULL,
-				"disabled" INTEGER NOT NULL,
-				"error" TEXT
-			);`,
-		);
-
-		logMigrationEnd(this.name);
-	}
-
-	async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = getTablePrefix();
-		await queryRunner.query(`DROP TABLE "${tablePrefix}auth_provider_sync_history"`);
-		await queryRunner.query(`DROP TABLE "${tablePrefix}auth_identity"`);
-
-		await queryRunner.query(
-			`DELETE FROM ${tablePrefix}settings WHERE key = '${LDAP_FEATURE_NAME}'`,
-		);
-		await queryRunner.query(`ALTER TABLE "${tablePrefix}user" DROP COLUMN disabled`);
-	}
-}
diff --git a/packages/cli/src/databases/migrations/postgresdb/1675940580449-PurgeInvalidWorkflowConnections.ts b/packages/cli/src/databases/migrations/postgresdb/1675940580449-PurgeInvalidWorkflowConnections.ts
deleted file mode 100644
index 1da69497e765c..0000000000000
--- a/packages/cli/src/databases/migrations/postgresdb/1675940580449-PurgeInvalidWorkflowConnections.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { getTablePrefix, logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
-import { NodeTypes } from '@/NodeTypes';
-import { IConnections, INode } from 'n8n-workflow';
-import { getLogger } from '@/Logger';
-import { Container } from 'typedi';
-export class PurgeInvalidWorkflowConnections1675940580449 implements MigrationInterface {
-	name = 'PurgeInvalidWorkflowConnections1675940580449';
-
-	async up(queryRunner: QueryRunner): Promise<void> {
-		logMigrationStart(this.name);
-
-		const tablePrefix = getTablePrefix();
-
-		const workflows: Array<{ id: number; nodes: INode[]; connections: IConnections }> =
-			await queryRunner.query(`
-			SELECT id, nodes, connections
-			FROM "${tablePrefix}workflow_entity"
-		`);
-
-		const nodeTypes = Container.get(NodeTypes);
-
-		workflows.forEach(async (workflow) => {
-			let connections: IConnections = workflow.connections;
-			const nodes: INode[] = workflow.nodes;
-
-			const nodesThatCannotReceiveInput: string[] = nodes.reduce((acc, node) => {
-				try {
-					const nodeType = nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
-					if ((nodeType.description.inputs?.length ?? []) === 0) {
-						acc.push(node.name);
-					}
-				} catch (error) {
-					getLogger().warn(`Migration ${this.name} failed with error: ${error.message}`);
-				}
-				return acc;
-			}, [] as string[]);
-
-			Object.keys(connections).forEach((sourceNodeName) => {
-				const connection = connections[sourceNodeName];
-				const outputs = Object.keys(connection);
-
-				outputs.forEach((outputConnectionName /* Like `main` */, idx) => {
-					const outputConnection = connection[outputConnectionName];
-
-					// It filters out all connections that are connected to a node that cannot receive input
-					outputConnection.forEach((outputConnectionItem, outputConnectionItemIdx) => {
-						outputConnection[outputConnectionItemIdx] = outputConnectionItem.filter(
-							(outgoingConnections) =>
-								!nodesThatCannotReceiveInput.includes(outgoingConnections.node),
-						);
-					});
-				});
-			});
-
-			// Update database with new connections
-			const [updateQuery, updateParams] = queryRunner.connection.driver.escapeQueryWithParameters(
-				`
-						UPDATE "${tablePrefix}workflow_entity"
-						SET connections = :connections
-						WHERE id = '${workflow.id}'
-					`,
-				{ connections: JSON.stringify(connections) },
-				{},
-			);
-
-			await queryRunner.query(updateQuery, updateParams);
-		});
-
-		logMigrationEnd(this.name);
-	}
-
-	async down(queryRunner: QueryRunner): Promise<void> {
-		// No need to revert this migration
-	}
-}
diff --git a/packages/cli/src/databases/migrations/postgresdb/1676996103000-MigrateExecutionStatus.ts b/packages/cli/src/databases/migrations/postgresdb/1676996103000-MigrateExecutionStatus.ts
index fdfec47d7ed34..fcc82e31064b9 100644
--- a/packages/cli/src/databases/migrations/postgresdb/1676996103000-MigrateExecutionStatus.ts
+++ b/packages/cli/src/databases/migrations/postgresdb/1676996103000-MigrateExecutionStatus.ts
@@ -1,13 +1,7 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
-import config from '@/config';
-
-export class MigrateExecutionStatus1676996103000 implements MigrationInterface {
-	name = 'MigrateExecutionStatus1676996103000';
-	public async up(queryRunner: QueryRunner): Promise<void> {
-		logMigrationStart(this.name);
-		const tablePrefix = config.getEnv('database.tablePrefix');
+import type { MigrationContext, IrreversibleMigration } from '@db/types';
 
+export class MigrateExecutionStatus1676996103000 implements IrreversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			`UPDATE "${tablePrefix}execution_entity" SET "status" = 'waiting' WHERE "status" IS NULL AND "waitTill" IS NOT NULL;`,
 		);
@@ -20,9 +14,5 @@ export class MigrateExecutionStatus1676996103000 implements MigrationInterface {
 		await queryRunner.query(
 			`UPDATE "${tablePrefix}execution_entity" SET "status" = 'crashed' WHERE "status" IS NULL;`,
 		);
-
-		logMigrationEnd(this.name);
 	}
-
-	public async down(queryRunner: QueryRunner): Promise<void> {}
 }
diff --git a/packages/cli/src/databases/migrations/postgresdb/1677236854063-UpdateRunningExecutionStatus.ts b/packages/cli/src/databases/migrations/postgresdb/1677236854063-UpdateRunningExecutionStatus.ts
index cc017549039c8..5403732c831ce 100644
--- a/packages/cli/src/databases/migrations/postgresdb/1677236854063-UpdateRunningExecutionStatus.ts
+++ b/packages/cli/src/databases/migrations/postgresdb/1677236854063-UpdateRunningExecutionStatus.ts
@@ -1,22 +1,12 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
-import config from '@/config';
-
-export class UpdateRunningExecutionStatus1677236854063 implements MigrationInterface {
-	name = 'UpdateRunningExecutionStatus1677236854063';
-	public async up(queryRunner: QueryRunner): Promise<void> {
-		logMigrationStart(this.name);
-		const tablePrefix = config.getEnv('database.tablePrefix');
+import type { MigrationContext, IrreversibleMigration } from '@db/types';
 
+export class UpdateRunningExecutionStatus1677236854063 implements IrreversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			`UPDATE "${tablePrefix}execution_entity" SET "status" = 'failed' WHERE "status" = 'running' AND "finished"=false AND "stoppedAt" IS NOT NULL;`,
 		);
 		await queryRunner.query(
 			`UPDATE "${tablePrefix}execution_entity" SET "status" = 'success' WHERE "status" = 'running' AND "finished"=true AND "stoppedAt" IS NOT NULL;`,
 		);
-
-		logMigrationEnd(this.name);
 	}
-
-	public async down(queryRunner: QueryRunner): Promise<void> {}
 }
diff --git a/packages/cli/src/databases/migrations/postgresdb/1677501636754-CreateVariables.ts b/packages/cli/src/databases/migrations/postgresdb/1677501636754-CreateVariables.ts
index 59842d73b1c8d..ef0281dc22d31 100644
--- a/packages/cli/src/databases/migrations/postgresdb/1677501636754-CreateVariables.ts
+++ b/packages/cli/src/databases/migrations/postgresdb/1677501636754-CreateVariables.ts
@@ -1,13 +1,7 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { logMigrationEnd, logMigrationStart, getTablePrefix } from '@db/utils/migrationHelpers';
-import config from '@/config';
-
-export class CreateVariables1677501636754 implements MigrationInterface {
-	name = 'CreateVariables1677501636754';
-	public async up(queryRunner: QueryRunner): Promise<void> {
-		logMigrationStart(this.name);
-		const tablePrefix = getTablePrefix();
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
+export class CreateVariables1677501636754 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`
 			CREATE TABLE ${tablePrefix}variables (
 				id serial4 NOT NULL PRIMARY KEY,
@@ -17,16 +11,9 @@ export class CreateVariables1677501636754 implements MigrationInterface {
 				UNIQUE ("key")
 			);
 		`);
-
-		logMigrationEnd(this.name);
 	}
 
-	public async down(queryRunner: QueryRunner): Promise<void> {
-		logMigrationStart(this.name);
-		const tablePrefix = getTablePrefix();
-
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`DROP TABLE ${tablePrefix}variables;`);
-
-		logMigrationEnd(this.name);
 	}
 }
diff --git a/packages/cli/src/databases/migrations/postgresdb/1679416281778-CreateExecutionMetadataTable.ts b/packages/cli/src/databases/migrations/postgresdb/1679416281778-CreateExecutionMetadataTable.ts
index 384d3f2c03c74..ef47c075fcb9c 100644
--- a/packages/cli/src/databases/migrations/postgresdb/1679416281778-CreateExecutionMetadataTable.ts
+++ b/packages/cli/src/databases/migrations/postgresdb/1679416281778-CreateExecutionMetadataTable.ts
@@ -1,13 +1,7 @@
-import { MigrationInterface, QueryRunner, Table } from 'typeorm';
-import { getTablePrefix, logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
-
-export class CreateExecutionMetadataTable1679416281778 implements MigrationInterface {
-	name = 'CreateExecutionMetadataTable1679416281778';
-
-	public async up(queryRunner: QueryRunner): Promise<void> {
-		logMigrationStart(this.name);
-		const tablePrefix = getTablePrefix();
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
+export class CreateExecutionMetadataTable1679416281778 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			`CREATE TABLE ${tablePrefix}execution_metadata (
 				"id" serial4 NOT NULL PRIMARY KEY,
@@ -32,13 +26,9 @@ export class CreateExecutionMetadataTable1679416281778 implements MigrationInter
 		await queryRunner.query(
 			`CREATE INDEX "IDX_${tablePrefix}8b6f3f9ae234f137d707b98f3bf43584" ON "${tablePrefix}execution_entity" ("status", "workflowId");`,
 		);
-
-		logMigrationEnd(this.name);
 	}
 
-	public async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = getTablePrefix();
-
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		// Re-add removed indices
 		await queryRunner.query(
 			`CREATE INDEX IF NOT EXISTS "IDX_${tablePrefix}33228da131bb1112247cf52a42" ON ${tablePrefix}execution_entity ("stoppedAt") `,
diff --git a/packages/cli/src/databases/migrations/postgresdb/1681134145996-AddUserActivatedProperty.ts b/packages/cli/src/databases/migrations/postgresdb/1681134145996-AddUserActivatedProperty.ts
index bf4293d4ddaae..38c1b22da4162 100644
--- a/packages/cli/src/databases/migrations/postgresdb/1681134145996-AddUserActivatedProperty.ts
+++ b/packages/cli/src/databases/migrations/postgresdb/1681134145996-AddUserActivatedProperty.ts
@@ -1,16 +1,9 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { getTablePrefix, logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 import type { UserSettings } from '@/Interfaces';
 
-export class AddUserActivatedProperty1681134145996 implements MigrationInterface {
-	name = 'AddUserActivatedProperty1681134145996';
-
-	async up(queryRunner: QueryRunner): Promise<void> {
-		logMigrationStart(this.name);
-
-		const tablePrefix = getTablePrefix();
-
-		const activatedUsers: UserSettings[] = await queryRunner.query(
+export class AddUserActivatedProperty1681134145996 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
+		const activatedUsers = (await queryRunner.query(
 			`SELECT DISTINCT sw."userId" AS id,
 				JSONB_SET(COALESCE(u.settings::jsonb, '{}'), '{userActivated}', 'true', true) as settings
 			FROM  ${tablePrefix}workflow_statistics ws
@@ -23,17 +16,17 @@ export class AddUserActivatedProperty1681134145996 implements MigrationInterface
 			WHERE ws.name = 'production_success'
 						AND r.name = 'owner'
 						AND r.scope = 'workflow'`,
-		);
+		)) as UserSettings[];
 
-		const updatedUsers = activatedUsers.map((user) =>
-			queryRunner.query(
+		const updatedUserPromises = activatedUsers.map(async (user) => {
+			await queryRunner.query(
 				`UPDATE "${tablePrefix}user" SET settings = '${JSON.stringify(
 					user.settings,
 				)}' WHERE id = '${user.id}' `,
-			),
-		);
+			);
+		});
 
-		await Promise.all(updatedUsers);
+		await Promise.all(updatedUserPromises);
 
 		if (!activatedUsers.length) {
 			await queryRunner.query(
@@ -46,12 +39,9 @@ export class AddUserActivatedProperty1681134145996 implements MigrationInterface
 				`UPDATE "${tablePrefix}user" SET settings = JSONB_SET(COALESCE(settings::jsonb, '{}'), '{userActivated}', 'false', true) WHERE id NOT IN (${activatedUserIds})`,
 			);
 		}
-
-		logMigrationEnd(this.name);
 	}
 
-	async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = getTablePrefix();
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			`UPDATE "${tablePrefix}user" SET settings = settings::jsonb - 'userActivated'`,
 		);
diff --git a/packages/cli/src/databases/migrations/postgresdb/1681134145997-AddUserOTPSecret.ts b/packages/cli/src/databases/migrations/postgresdb/1681134145997-AddUserOTPSecret.ts
index 7b5d0d2c53178..4ae855963159e 100644
--- a/packages/cli/src/databases/migrations/postgresdb/1681134145997-AddUserOTPSecret.ts
+++ b/packages/cli/src/databases/migrations/postgresdb/1681134145997-AddUserOTPSecret.ts
@@ -1,20 +1,13 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { getTablePrefix, logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
-export class AddUserOTPSecret1681134145997 implements MigrationInterface {
+export class AddUserOTPSecret1681134145997 implements ReversibleMigration {
 	name = 'AddUserOTPSecret1681134145997';
 
-	async up(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = getTablePrefix();
-		logMigrationStart(this.name);
+	async up({ queryRunner, tablePrefix }: MigrationContext): Promise<void> {
 		await queryRunner.query(`ALTER TABLE "${tablePrefix}user" ADD COLUMN otpsecret varchar`);
-
-		logMigrationEnd(this.name);
 	}
 
-	async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = getTablePrefix();
-
+	async down({ queryRunner, tablePrefix }: MigrationContext): Promise<void> {
 		await queryRunner.query(`ALTER TABLE "${tablePrefix}user" DROP COLUMN otpsecret`);
 	}
 }
diff --git a/packages/cli/src/databases/migrations/postgresdb/1681134145997-RemoveSkipOwnerSetup.ts b/packages/cli/src/databases/migrations/postgresdb/1681134145997-RemoveSkipOwnerSetup.ts
new file mode 100644
index 0000000000000..958cf30199444
--- /dev/null
+++ b/packages/cli/src/databases/migrations/postgresdb/1681134145997-RemoveSkipOwnerSetup.ts
@@ -0,0 +1,9 @@
+import type { IrreversibleMigration, MigrationContext } from '@db/types';
+
+export class RemoveSkipOwnerSetup1681134145997 implements IrreversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
+		await queryRunner.query(
+			`DELETE FROM ${tablePrefix}settings WHERE key = 'userManagement.skipInstanceOwnerSetup';`,
+		);
+	}
+}
diff --git a/packages/cli/src/databases/migrations/postgresdb/1681134145998-AddSaveRequestLog.ts b/packages/cli/src/databases/migrations/postgresdb/1681134145998-AddSaveRequestLog.ts
index a1f60ceedbf0c..83474e989e97e 100644
--- a/packages/cli/src/databases/migrations/postgresdb/1681134145998-AddSaveRequestLog.ts
+++ b/packages/cli/src/databases/migrations/postgresdb/1681134145998-AddSaveRequestLog.ts
@@ -1,13 +1,9 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { getTablePrefix, logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
-export class AddSaveRequestLog1681134145998 implements MigrationInterface {
+export class AddSaveRequestLog1681134145998 implements ReversibleMigration {
 	name = 'AddSaveRequestLog1681134145998';
 
-	async up(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = getTablePrefix();
-		logMigrationStart(this.name);
-
+	async up({ queryRunner, tablePrefix }: MigrationContext): Promise<void> {
 		await queryRunner.query(`
 			CREATE TABLE "${tablePrefix}save_request_log" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "userId" uuid NOT NULL, "request" jsonb DEFAULT '{}', "createdAt" TIMESTAMP NOT NULL DEFAULT ('now'::text)::timestamp(6) with time zone, "updatedAt" TIMESTAMP NOT NULL DEFAULT ('now'::text)::timestamp(6) with time zone, "workflowId" integer NOT NULL, "response" jsonb DEFAULT '{}', "status" VARCHAR(128) NOT NULL, CONSTRAINT "PK_a2a6978768567cd32a5d6cc2797" PRIMARY KEY ("id"))
 		`);
@@ -23,13 +19,9 @@ export class AddSaveRequestLog1681134145998 implements MigrationInterface {
 				ALTER TABLE "${tablePrefix}save_request_log" ADD CONSTRAINT "FK_9a3caef176a6bd386c9ca3b3799" FOREIGN KEY ("workflowId") REFERENCES "workflow_entity"("id") ON DELETE NO ACTION ON UPDATE NO action
 			`,
 		);
-
-		logMigrationEnd(this.name);
 	}
 
-	async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = getTablePrefix();
-
+	async down({ queryRunner, tablePrefix }: MigrationContext): Promise<void> {
 		await queryRunner.query(
 			`ALTER TABLE "${tablePrefix}save_request_log" DROP CONSTRAINT "FK_9a3caef176a6bd386c9ca3b3799"`,
 		);
diff --git a/packages/cli/src/databases/migrations/postgresdb/1689942863738-addIncidentHandlingTables.ts b/packages/cli/src/databases/migrations/postgresdb/1689942863738-addIncidentHandlingTables.ts
index a52cb43513fa3..e0ddd7e33df6c 100644
--- a/packages/cli/src/databases/migrations/postgresdb/1689942863738-addIncidentHandlingTables.ts
+++ b/packages/cli/src/databases/migrations/postgresdb/1689942863738-addIncidentHandlingTables.ts
@@ -1,9 +1,9 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
-export class addIncidentHandlingTables1689942863738 implements MigrationInterface {
+export class addIncidentHandlingTables1689942863738 implements ReversibleMigration {
 	name = 'addIncidentHandlingTables1689942863738';
 
-	public async up(queryRunner: QueryRunner): Promise<void> {
+	public async up({ queryRunner, tablePrefix }: MigrationContext): Promise<void> {
 		await queryRunner.query(
 			`CREATE TABLE "server_incident" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "lastUpdateByAppUserId" character varying, "lastUpdateByZohoUserId" character varying, "lastUpdateSource" character varying, "createdAt" TIMESTAMP NOT NULL DEFAULT ('now'::text)::timestamp(6) with time zone, "updatedAt" TIMESTAMP NOT NULL DEFAULT ('now'::text)::timestamp(6) with time zone, "API" character varying, "APIMethod" character varying, "APIBody" json, "queueName" character varying, "errorMessage" character varying NOT NULL, "errorStackTrace" character varying, "incidentTime" TIMESTAMP NOT NULL, "additionalInformation" json, "zohoDeskTicketId" character varying, "correlationId" character varying, "isResolved" boolean NOT NULL DEFAULT false, CONSTRAINT "PK_c24ae1e5263dccb981312915dfc" PRIMARY KEY ("id"))`,
 		);
@@ -15,7 +15,7 @@ export class addIncidentHandlingTables1689942863738 implements MigrationInterfac
 		);
 	}
 
-	public async down(queryRunner: QueryRunner): Promise<void> {
+	public async down({ queryRunner, tablePrefix }: MigrationContext): Promise<void> {
 		await queryRunner.query(`DROP TABLE "data_recovery_activity"`);
 		await queryRunner.query(`DROP TYPE "public"."data_recovery_activity_status_enum"`);
 		await queryRunner.query(`DROP TABLE "server_incident"`);
diff --git a/packages/cli/src/databases/migrations/postgresdb/1689942863739-dropConstraintOnSaveRequestLog.ts b/packages/cli/src/databases/migrations/postgresdb/1689942863739-dropConstraintOnSaveRequestLog.ts
new file mode 100644
index 0000000000000..92de5d2d01bf9
--- /dev/null
+++ b/packages/cli/src/databases/migrations/postgresdb/1689942863739-dropConstraintOnSaveRequestLog.ts
@@ -0,0 +1,19 @@
+import type { MigrationContext, ReversibleMigration } from '@db/types';
+
+export class dropConstraintOnSaveRequestLog1689942863739 implements ReversibleMigration {
+	name = 'dropConstraintOnSaveRequestLog1689942863739';
+
+	public async up({ queryRunner, tablePrefix }: MigrationContext): Promise<void> {	
+        await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}save_request_log DROP CONSTRAINT IF EXISTS "FK_9a3caef176a6bd386c9ca3b3799";`,
+		);
+	}
+
+	public async down({ queryRunner, tablePrefix }: MigrationContext): Promise<void> {
+		await queryRunner.query(
+			`
+				ALTER TABLE ${tablePrefix}save_request_log ADD CONSTRAINT "FK_9a3caef176a6bd386c9ca3b3799" FOREIGN KEY ("workflowId") REFERENCES "workflow_entity"("id") ON DELETE NO ACTION ON UPDATE NO action
+			`,
+		);
+	}
+}
diff --git a/packages/cli/src/databases/migrations/postgresdb/1689942865738-N8NTestingFramework.ts b/packages/cli/src/databases/migrations/postgresdb/1689942865738-N8NTestingFramework.ts
new file mode 100644
index 0000000000000..8e8d2ab29456e
--- /dev/null
+++ b/packages/cli/src/databases/migrations/postgresdb/1689942865738-N8NTestingFramework.ts
@@ -0,0 +1,37 @@
+import type { MigrationContext, ReversibleMigration } from '@db/types';
+
+export class N8NTestingFramework1689942863738 implements ReversibleMigration {
+    name = 'N8NTestingFramework1689942863738'
+
+    public async up({ queryRunner, tablePrefix }: MigrationContext): Promise<void> {
+        await queryRunner.query(`
+            CREATE TABLE "workflow_test" (
+                "id" uuid NOT NULL DEFAULT uuid_generate_v4(),
+                "workflowId" character varying NOT NULL,
+                "name" text NOT NULL,
+                "description" text,
+                "createdAt" TIMESTAMP NOT NULL DEFAULT now(), 
+                "updatedAt" TIMESTAMP NOT NULL DEFAULT now(),
+                CONSTRAINT "PK_ae525a832798b58de2d89d46c10" PRIMARY KEY ("id")
+            )
+        `);
+        await queryRunner.query(`
+            CREATE TABLE "node_output" (
+                "id" uuid NOT NULL DEFAULT uuid_generate_v4(),
+                "workflowTestId" uuid NOT NULL,
+                "nodeId" character varying NOT NULL,
+                "data" jsonb DEFAULT '{}'::jsonb,
+                "errorMessage" character varying,
+                "createdAt" TIMESTAMP NOT NULL DEFAULT now(), 
+                "updatedAt" TIMESTAMP NOT NULL DEFAULT now(),
+                CONSTRAINT "PK_node_output" PRIMARY KEY ("workflowTestId", "nodeId"),
+                CONSTRAINT "FK_workflow_test_id" FOREIGN KEY ("workflowTestId") REFERENCES "workflow_test"("id") ON DELETE CASCADE
+            )
+        `);
+    }
+
+    public async down({ queryRunner, tablePrefix }: MigrationContext): Promise<void> {
+        await queryRunner.query(`DROP TABLE "node_output"`);
+        await queryRunner.query(`DROP TABLE "workflow_test"`);
+    }
+}
diff --git a/packages/cli/src/databases/migrations/postgresdb/1689949863759-ResumeWorfklowTimer.ts b/packages/cli/src/databases/migrations/postgresdb/1689949863759-ResumeWorfklowTimer.ts
new file mode 100644
index 0000000000000..0c4ae924a4016
--- /dev/null
+++ b/packages/cli/src/databases/migrations/postgresdb/1689949863759-ResumeWorfklowTimer.ts
@@ -0,0 +1,25 @@
+import type { MigrationContext, ReversibleMigration } from '@db/types';
+
+export class ResumeWorkflowTimerTable1689949863759 implements ReversibleMigration {
+    name = 'ResumeWorkflowTimerTable1689949863759'
+
+    public async up({ queryRunner, tablePrefix }: MigrationContext): Promise<void> {
+        await queryRunner.query(`
+            CREATE TABLE "resume_workflow_timer" (
+                "id" uuid NOT NULL DEFAULT uuid_generate_v4(),
+                "createdAt" TIMESTAMP NOT NULL DEFAULT now(),
+                "updatedAt" TIMESTAMP NOT NULL DEFAULT now(),
+                "resumptionTime" TIMESTAMP NOT NULL,
+                "executionId" character varying NOT NULL,
+                CONSTRAINT "PK_e2b6a0b014f9aa7c1e0f88b3b69" PRIMARY KEY ("id")
+            )
+        `);
+    }
+
+    public async down({ queryRunner, tablePrefix }: MigrationContext): Promise<void> {
+        await queryRunner.query(`
+            DROP TABLE "resume_workflow_timer"
+        `);
+    }
+
+}
diff --git a/packages/cli/src/databases/migrations/postgresdb/1690000000000-MigrateIntegerKeysToString.ts b/packages/cli/src/databases/migrations/postgresdb/1690000000000-MigrateIntegerKeysToString.ts
new file mode 100644
index 0000000000000..e06bcfb334aee
--- /dev/null
+++ b/packages/cli/src/databases/migrations/postgresdb/1690000000000-MigrateIntegerKeysToString.ts
@@ -0,0 +1,262 @@
+import type { MigrationContext, IrreversibleMigration } from '@db/types';
+
+export class MigrateIntegerKeysToString1690000000000 implements IrreversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}workflow_entity RENAME COLUMN id to tmp_id;`,
+		);
+		await queryRunner.query(`ALTER TABLE ${tablePrefix}workflow_entity ADD COLUMN id varchar(36);`);
+		await queryRunner.query(`UPDATE ${tablePrefix}workflow_entity SET id = tmp_id::text;`);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}workflow_entity ALTER COLUMN id SET NOT NULL;`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}workflow_entity ALTER COLUMN tmp_id DROP DEFAULT;`,
+		);
+		await queryRunner.query(`DROP SEQUENCE IF EXISTS ${tablePrefix}workflow_entity_id_seq;`);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "pk_${tablePrefix}workflow_entity_id" ON ${tablePrefix}workflow_entity ("id");`,
+		);
+
+		await queryRunner.query(`ALTER TABLE ${tablePrefix}tag_entity RENAME COLUMN id to tmp_id;`);
+		await queryRunner.query(`ALTER TABLE ${tablePrefix}tag_entity ADD COLUMN id varchar(36);`);
+		await queryRunner.query(`UPDATE ${tablePrefix}tag_entity SET id = tmp_id::text;`);
+		await queryRunner.query(`ALTER TABLE ${tablePrefix}tag_entity ALTER COLUMN id SET NOT NULL;`);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}tag_entity ALTER COLUMN tmp_id DROP DEFAULT;`,
+		);
+		await queryRunner.query(`DROP SEQUENCE IF EXISTS ${tablePrefix}tag_entity_id_seq;`);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "pk_${tablePrefix}tag_entity_id" ON ${tablePrefix}tag_entity ("id");`,
+		);
+
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}workflows_tags RENAME COLUMN "workflowId" to "tmp_workflowId";`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}workflows_tags ADD COLUMN "workflowId" varchar(36);`,
+		);
+		await queryRunner.query(
+			`UPDATE ${tablePrefix}workflows_tags SET "workflowId" = "tmp_workflowId"::text;`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}workflows_tags ALTER COLUMN "workflowId" SET NOT NULL;`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}workflows_tags RENAME COLUMN "tagId" to "tmp_tagId";`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}workflows_tags ADD COLUMN "tagId" varchar(36);`,
+		);
+		await queryRunner.query(`UPDATE ${tablePrefix}workflows_tags SET "tagId" = "tmp_tagId"::text;`);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}workflows_tags ALTER COLUMN "tagId" SET NOT NULL;`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}workflows_tags DROP CONSTRAINT IF EXISTS "FK_${tablePrefix}31140eb41f019805b40d0087449";`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}workflows_tags DROP CONSTRAINT IF EXISTS "FK_${tablePrefix}5e29bfe9e22c5d6567f509d4a46";`,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "pk_${tablePrefix}workflows_tags" ON ${tablePrefix}workflows_tags ("workflowId","tagId");`,
+		);
+		await queryRunner.query(`DROP INDEX IF EXISTS "idx_${tablePrefix}31140eb41f019805b40d008744";`);
+		await queryRunner.query(`ALTER TABLE ${tablePrefix}workflows_tags DROP CONSTRAINT IF EXISTS "PK_${tablePrefix}a60448a90e51a114e95e2a125b3",
+	ADD CONSTRAINT "pk_${tablePrefix}workflows_tags" PRIMARY KEY USING INDEX "pk_${tablePrefix}workflows_tags";`);
+		await queryRunner.query(
+			`CREATE INDEX "idx_${tablePrefix}workflows_tags_workflow_id" ON ${tablePrefix}workflows_tags ("workflowId");`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}workflows_tags ADD CONSTRAINT "fk_${tablePrefix}workflows_tags_workflow_id" FOREIGN KEY ("workflowId") REFERENCES ${tablePrefix}workflow_entity(id) ON DELETE CASCADE ON UPDATE NO ACTION;`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}workflows_tags ADD CONSTRAINT "fk_${tablePrefix}workflows_tags_tag_id" FOREIGN KEY ("tagId") REFERENCES ${tablePrefix}tag_entity(id) ON DELETE CASCADE ON UPDATE NO ACTION;`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}workflows_tags DROP COLUMN "tmp_workflowId";`,
+		);
+		await queryRunner.query(`ALTER TABLE ${tablePrefix}workflows_tags DROP COLUMN "tmp_tagId";`);
+
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}shared_workflow RENAME COLUMN "workflowId" to "tmp_workflowId";`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}shared_workflow ADD COLUMN "workflowId" varchar(36);`,
+		);
+		await queryRunner.query(
+			`UPDATE ${tablePrefix}shared_workflow SET "workflowId" = "tmp_workflowId"::text;`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}shared_workflow ALTER COLUMN "workflowId" SET NOT NULL;`,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "pk_${tablePrefix}shared_workflow_id" ON ${tablePrefix}shared_workflow ("userId","workflowId");`,
+		);
+		await queryRunner.query(
+			`DROP INDEX IF EXISTS "IDX_${tablePrefix}65a0933c0f19d278881653bf81d35064";`,
+		);
+		await queryRunner.query(`ALTER TABLE ${tablePrefix}shared_workflow DROP CONSTRAINT "PK_${tablePrefix}cc5d5a71c7b2591f5154ffb0c785e85e",
+	ADD CONSTRAINT "pk_${tablePrefix}shared_workflow_id" PRIMARY KEY USING INDEX "pk_${tablePrefix}shared_workflow_id";`);
+		await queryRunner.query(
+			`CREATE INDEX "idx_${tablePrefix}shared_workflow_workflow_id" ON ${tablePrefix}shared_workflow ("workflowId");`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}shared_workflow ADD CONSTRAINT "fk_${tablePrefix}shared_workflow_workflow_id" FOREIGN KEY ("workflowId") REFERENCES ${tablePrefix}workflow_entity(id) ON DELETE CASCADE ON UPDATE NO ACTION;`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}shared_workflow DROP COLUMN "tmp_workflowId";`,
+		);
+
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}workflow_statistics RENAME COLUMN "workflowId" to "tmp_workflowId";`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}workflow_statistics ADD COLUMN "workflowId" varchar(36);`,
+		);
+		await queryRunner.query(
+			`UPDATE ${tablePrefix}workflow_statistics SET "workflowId" = "tmp_workflowId"::text;`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}workflow_statistics ALTER COLUMN "workflowId" SET NOT NULL;`,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "pk_${tablePrefix}workflow_statistics" ON ${tablePrefix}workflow_statistics ("workflowId","name");`,
+		);
+		await queryRunner.query(`ALTER TABLE ${tablePrefix}workflow_statistics DROP CONSTRAINT IF EXISTS "${tablePrefix}workflow_statistics_pkey",
+	ADD CONSTRAINT "pk_${tablePrefix}workflow_statistics" PRIMARY KEY USING INDEX "pk_${tablePrefix}workflow_statistics";`);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}workflow_statistics DROP COLUMN "tmp_workflowId";`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}workflow_statistics ADD CONSTRAINT "fk_${tablePrefix}workflow_statistics_workflow_id" FOREIGN KEY ("workflowId") REFERENCES ${tablePrefix}workflow_entity(id) ON DELETE CASCADE ON UPDATE NO ACTION;`,
+		);
+
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}webhook_entity RENAME COLUMN "workflowId" to "tmp_workflowId";`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}webhook_entity ADD COLUMN "workflowId" varchar(36);`,
+		);
+		await queryRunner.query(
+			`UPDATE ${tablePrefix}webhook_entity SET "workflowId" = "tmp_workflowId"::text;`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}webhook_entity ALTER COLUMN "workflowId" SET NOT NULL;`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}webhook_entity DROP COLUMN "tmp_workflowId";`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}webhook_entity ADD CONSTRAINT "fk_${tablePrefix}webhook_entity_workflow_id" FOREIGN KEY ("workflowId") REFERENCES ${tablePrefix}workflow_entity(id) ON DELETE CASCADE ON UPDATE NO ACTION;`,
+		);
+
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}execution_entity RENAME COLUMN "workflowId" to "tmp_workflowId";`,
+		);
+		// -- Intentionally NOT setting colum to NOT NULL
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}execution_entity ADD COLUMN "workflowId" varchar(36);`,
+		);
+		await queryRunner.query(
+			`UPDATE ${tablePrefix}execution_entity SET "workflowId" = "tmp_workflowId"::text;`,
+		);
+		await queryRunner.query(`DROP INDEX IF EXISTS "IDX_${tablePrefix}d160d4771aba5a0d78943edbe3";`);
+		await queryRunner.query(`DROP INDEX IF EXISTS "IDX_${tablePrefix}4f474ac92be81610439aaad61e";`);
+		await queryRunner.query(`DROP INDEX IF EXISTS "IDX_${tablePrefix}58154df94c686818c99fb754ce";`);
+		// -- index idx_33228da131bb1112247cf52a42 is a duplicate of IDX_33228da131bb1112247cf52a42
+		await queryRunner.query(`DROP INDEX IF EXISTS "idx_${tablePrefix}33228da131bb1112247cf52a42";`);
+		await queryRunner.query(
+			`CREATE INDEX "idx_${tablePrefix}execution_entity_workflow_id_id" ON ${tablePrefix}execution_entity ("workflowId","id");`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}execution_entity DROP COLUMN "tmp_workflowId";`,
+		);
+		// -- FK was missing in prev schema - should it be added?
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}execution_entity ADD CONSTRAINT "fk_${tablePrefix}execution_entity_workflow_id" FOREIGN KEY ("workflowId") REFERENCES ${tablePrefix}workflow_entity(id) ON DELETE CASCADE ON UPDATE NO ACTION;`,
+		);
+
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}workflow_entity DROP CONSTRAINT IF EXISTS "pk_${tablePrefix}eded7d72664448da7745d551207";`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}tag_entity DROP CONSTRAINT IF EXISTS "PK_${tablePrefix}7a50a9b74ae6855c0dcaee25052";`,
+		);
+		await queryRunner.query(`ALTER TABLE ${tablePrefix}workflow_entity DROP COLUMN tmp_id;`);
+		await queryRunner.query(`ALTER TABLE ${tablePrefix}tag_entity DROP COLUMN tmp_id;`);
+		await queryRunner.query(`ALTER TABLE ${tablePrefix}workflow_entity ADD PRIMARY KEY (id);`);
+		await queryRunner.query(`ALTER TABLE ${tablePrefix}tag_entity ADD PRIMARY KEY (id);`);
+
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}credentials_entity RENAME COLUMN id to tmp_id;`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}credentials_entity ADD COLUMN id varchar(36);`,
+		);
+		await queryRunner.query(`UPDATE ${tablePrefix}credentials_entity SET id = tmp_id::text;`);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}credentials_entity ALTER COLUMN id SET NOT NULL;`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}credentials_entity ALTER COLUMN tmp_id DROP DEFAULT;`,
+		);
+		await queryRunner.query(`DROP SEQUENCE IF EXISTS ${tablePrefix}credentials_entity_id_seq;`);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "pk_${tablePrefix}credentials_entity_id" ON ${tablePrefix}credentials_entity ("id");`,
+		);
+
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}shared_credentials RENAME COLUMN "credentialsId" to "tmp_credentialsId";`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}shared_credentials ADD COLUMN "credentialsId" varchar(36);`,
+		);
+		await queryRunner.query(
+			`UPDATE ${tablePrefix}shared_credentials SET "credentialsId" = "tmp_credentialsId"::text;`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}shared_credentials ALTER COLUMN "credentialsId" SET NOT NULL;`,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "pk_${tablePrefix}shared_credentials_id" ON ${tablePrefix}shared_credentials ("userId","credentialsId");`,
+		);
+		await queryRunner.query(
+			`DROP INDEX IF EXISTS "IDX_${tablePrefix}829d16efa0e265cb076d50eca8d21733";`,
+		);
+		await queryRunner.query(`ALTER TABLE ${tablePrefix}shared_credentials DROP CONSTRAINT "PK_${tablePrefix}10dd1527ffb639609be7aadd98f628c6",
+	ADD CONSTRAINT "pk_${tablePrefix}shared_credentials_id" PRIMARY KEY USING INDEX "pk_${tablePrefix}shared_credentials_id";`);
+		await queryRunner.query(
+			`CREATE INDEX "idx_${tablePrefix}shared_credentials_credentials_id" ON ${tablePrefix}shared_credentials ("credentialsId");`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}shared_credentials ADD CONSTRAINT "fk_${tablePrefix}shared_credentials_credentials_id" FOREIGN KEY ("credentialsId") REFERENCES ${tablePrefix}credentials_entity(id) ON DELETE CASCADE ON UPDATE NO ACTION;`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}shared_credentials DROP COLUMN "tmp_credentialsId";`,
+		);
+
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}credentials_entity DROP CONSTRAINT IF EXISTS "pk_${tablePrefix}814c3d3c36e8a27fa8edb761b0e";`,
+		);
+		await queryRunner.query(`ALTER TABLE ${tablePrefix}credentials_entity DROP COLUMN tmp_id;`);
+		await queryRunner.query(`ALTER TABLE ${tablePrefix}credentials_entity ADD PRIMARY KEY (id);`);
+
+		await queryRunner.query(`ALTER TABLE ${tablePrefix}variables RENAME COLUMN id to tmp_id;`);
+		await queryRunner.query(`ALTER TABLE ${tablePrefix}variables ADD COLUMN id varchar(36);`);
+		await queryRunner.query(`UPDATE ${tablePrefix}variables SET id = tmp_id::text;`);
+		await queryRunner.query(`ALTER TABLE ${tablePrefix}variables ALTER COLUMN id SET NOT NULL;`);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}variables ALTER COLUMN tmp_id DROP DEFAULT;`,
+		);
+		await queryRunner.query(`DROP SEQUENCE IF EXISTS ${tablePrefix}variables_id_seq;`);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "pk_${tablePrefix}variables_id" ON ${tablePrefix}variables ("id");`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}variables DROP CONSTRAINT IF EXISTS "${tablePrefix}variables_pkey";`,
+		);
+		await queryRunner.query(`ALTER TABLE ${tablePrefix}variables DROP COLUMN tmp_id;`);
+		await queryRunner.query(`ALTER TABLE ${tablePrefix}variables ADD PRIMARY KEY (id);`);
+	}
+}
diff --git a/packages/cli/src/databases/migrations/postgresdb/1690000000020-SeparateExecutionData.ts b/packages/cli/src/databases/migrations/postgresdb/1690000000020-SeparateExecutionData.ts
new file mode 100644
index 0000000000000..4ee413b4b3eee
--- /dev/null
+++ b/packages/cli/src/databases/migrations/postgresdb/1690000000020-SeparateExecutionData.ts
@@ -0,0 +1,42 @@
+import type { MigrationContext, ReversibleMigration } from '@db/types';
+
+export class SeparateExecutionData1690000000020 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
+		await queryRunner.query(
+			`CREATE TABLE "${tablePrefix}execution_data" (
+				"executionId" integer NOT NULL,
+				"workflowData" json NOT NULL,
+				"data" text NOT NULL,
+				CONSTRAINT "${tablePrefix}execution_data_fk" FOREIGN KEY ("executionId") REFERENCES ${tablePrefix}execution_entity(id) ON DELETE CASCADE
+			)`,
+		);
+
+		await queryRunner.query(
+			`INSERT INTO "${tablePrefix}execution_data" (
+				"executionId",
+				"workflowData",
+				"data")
+				SELECT "id", "workflowData", "data" FROM "${tablePrefix}execution_entity"
+			`,
+		);
+
+		await queryRunner.query(
+			`ALTER TABLE "${tablePrefix}execution_entity" DROP COLUMN "workflowData",  DROP COLUMN "data"`,
+		);
+	}
+
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
+		await queryRunner.query(
+			`ALTER TABLE "${tablePrefix}execution_entity"
+			ADD "workflowData" json NULL,
+			ADD "data" text NULL`,
+		);
+
+		await queryRunner.query(
+			`UPDATE "${tablePrefix}execution_entity" SET "workflowData" = "execution_data"."workflowData", "data" = "execution_data"."data"
+			FROM "${tablePrefix}execution_data" WHERE "${tablePrefix}execution_data"."executionId" = "${tablePrefix}execution_entity"."id"`,
+		);
+
+		await queryRunner.query(`DROP TABLE "${tablePrefix}execution_data"`);
+	}
+}
diff --git a/packages/cli/src/databases/migrations/postgresdb/1690787606731-AddMissingPrimaryKeyOnExecutionData.ts b/packages/cli/src/databases/migrations/postgresdb/1690787606731-AddMissingPrimaryKeyOnExecutionData.ts
new file mode 100644
index 0000000000000..dbf0d1346fade
--- /dev/null
+++ b/packages/cli/src/databases/migrations/postgresdb/1690787606731-AddMissingPrimaryKeyOnExecutionData.ts
@@ -0,0 +1,9 @@
+import type { IrreversibleMigration, MigrationContext } from '@/databases/types';
+
+export class AddMissingPrimaryKeyOnExecutionData1690787606731 implements IrreversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
+		await queryRunner.query(
+			`ALTER TABLE "${tablePrefix}execution_data" ADD PRIMARY KEY("executionId");`,
+		);
+	}
+}
diff --git a/packages/cli/src/databases/migrations/postgresdb/1694091729095-MigrateToTimestampTz.ts b/packages/cli/src/databases/migrations/postgresdb/1694091729095-MigrateToTimestampTz.ts
new file mode 100644
index 0000000000000..34f12bd457cad
--- /dev/null
+++ b/packages/cli/src/databases/migrations/postgresdb/1694091729095-MigrateToTimestampTz.ts
@@ -0,0 +1,44 @@
+import type { IrreversibleMigration, MigrationContext } from '@/databases/types';
+
+const defaultTimestampColumns = ['createdAt', 'updatedAt'];
+const tablesWithDefaultTimestamps = [
+	'auth_identity',
+	'credentials_entity',
+	'event_destinations',
+	'installed_packages',
+	'role',
+	'shared_credentials',
+	'shared_workflow',
+	'tag_entity',
+	'user',
+	'workflow_entity',
+];
+
+const additionalColumns = {
+	auth_provider_sync_history: ['endedAt', 'startedAt'],
+	execution_entity: ['startedAt', 'stoppedAt', 'waitTill'],
+	workflow_statistics: ['latestEvent'],
+};
+
+export class MigrateToTimestampTz1694091729095 implements IrreversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
+		const changeColumnType = async (tableName: string, columnName: string, setDefault: boolean) => {
+			const alterColumnQuery = `ALTER TABLE "${tablePrefix}${tableName}" ALTER COLUMN "${columnName}"`;
+			await queryRunner.query(`${alterColumnQuery} TYPE TIMESTAMP(3) WITH TIME ZONE`);
+			if (setDefault)
+				await queryRunner.query(`${alterColumnQuery} SET DEFAULT CURRENT_TIMESTAMP(3)`);
+		};
+
+		for (const tableName of tablesWithDefaultTimestamps) {
+			for (const columnName of defaultTimestampColumns) {
+				await changeColumnType(tableName, columnName, true);
+			}
+		}
+
+		for (const [tableName, columnNames] of Object.entries(additionalColumns)) {
+			for (const columnName of columnNames) {
+				await changeColumnType(tableName, columnName, false);
+			}
+		}
+	}
+}
diff --git a/packages/cli/src/databases/migrations/postgresdb/1694091729096-addConstarinToSvaeRequestLog.ts b/packages/cli/src/databases/migrations/postgresdb/1694091729096-addConstarinToSvaeRequestLog.ts
new file mode 100644
index 0000000000000..4490e521ba501
--- /dev/null
+++ b/packages/cli/src/databases/migrations/postgresdb/1694091729096-addConstarinToSvaeRequestLog.ts
@@ -0,0 +1,29 @@
+import type { MigrationContext, ReversibleMigration } from '@db/types';
+
+export class addConstarinToSvaeRequestLog1694091729096 implements ReversibleMigration {
+	name = 'addConstarinToSvaeRequestLog1694091729096';
+
+	public async up({ queryRunner, tablePrefix }: MigrationContext): Promise<void> {
+		await queryRunner.query(
+			`
+			ALTER TABLE ${tablePrefix}save_request_log ALTER COLUMN "workflowId" TYPE VARCHAR(36)
+			`,
+		);	
+		await queryRunner.query(
+			`
+				ALTER TABLE ${tablePrefix}save_request_log ADD CONSTRAINT "FK_9a3caef176a6bd386c9ca3b3799" FOREIGN KEY ("workflowId") REFERENCES "workflow_entity"("id") ON DELETE NO ACTION ON UPDATE NO action
+			`,
+		);
+	}
+
+	public async down({ queryRunner, tablePrefix }: MigrationContext): Promise<void> {
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}save_request_log DROP CONSTRAINT IF EXISTS "FK_9a3caef176a6bd386c9ca3b3799";`,
+		);
+		await queryRunner.query(
+			`
+			ALTER TABLE ${tablePrefix}save_request_log ALTER COLUMN "workflowId" TYPE integer
+			`,
+		);
+	}
+}
diff --git a/packages/cli/src/databases/migrations/postgresdb/1779949863759-UpdateResumeWorfklowTimer.ts b/packages/cli/src/databases/migrations/postgresdb/1779949863759-UpdateResumeWorfklowTimer.ts
new file mode 100644
index 0000000000000..9bb55ea34a46b
--- /dev/null
+++ b/packages/cli/src/databases/migrations/postgresdb/1779949863759-UpdateResumeWorfklowTimer.ts
@@ -0,0 +1,14 @@
+import type { MigrationContext, ReversibleMigration } from '@db/types';
+
+
+export class UpdateResumeWorfklowTimer1779949863759 implements ReversibleMigration {
+	name = 'UpdateResumeWorfklowTimer1779949863759';
+
+	async up({ queryRunner, tablePrefix }: MigrationContext): Promise<void> {
+		await queryRunner.query(`ALTER TABLE "resume_workflow_timer" ADD COLUMN status varchar`);
+	}
+
+	async down({ queryRunner, tablePrefix }: MigrationContext): Promise<void> {
+		await queryRunner.query(`ALTER TABLE "resume_workflow_timer" DROP COLUMN status`);
+	}
+}
diff --git a/packages/cli/src/databases/migrations/postgresdb/1879949869859-UpdateResumeWorfklowTimer.ts b/packages/cli/src/databases/migrations/postgresdb/1879949869859-UpdateResumeWorfklowTimer.ts
new file mode 100644
index 0000000000000..c0b2be014e85d
--- /dev/null
+++ b/packages/cli/src/databases/migrations/postgresdb/1879949869859-UpdateResumeWorfklowTimer.ts
@@ -0,0 +1,14 @@
+import type { MigrationContext, ReversibleMigration } from '@db/types';
+
+
+export class UpdateResumeWorfklowTimer1879949869859 implements ReversibleMigration {
+	name = 'UpdateResumeWorfklowTimer1879949869859';
+
+	async up({ queryRunner, tablePrefix }: MigrationContext): Promise<void> {
+		await queryRunner.query(`ALTER TABLE "resume_workflow_timer" ADD COLUMN "waitNodeId" varchar`);
+	}
+
+	async down({ queryRunner, tablePrefix }: MigrationContext): Promise<void> {
+		await queryRunner.query(`ALTER TABLE "resume_workflow_timer" DROP COLUMN "waitNodeId"`);
+	}
+}
diff --git a/packages/cli/src/databases/migrations/postgresdb/1899949999859-ResultDataResumeWorfklowTimer.ts b/packages/cli/src/databases/migrations/postgresdb/1899949999859-ResultDataResumeWorfklowTimer.ts
new file mode 100644
index 0000000000000..0f92018dda3fc
--- /dev/null
+++ b/packages/cli/src/databases/migrations/postgresdb/1899949999859-ResultDataResumeWorfklowTimer.ts
@@ -0,0 +1,14 @@
+import type { MigrationContext, ReversibleMigration } from '@db/types';
+
+
+export class ResultDataResumeWorfklowTimer1899949999859 implements ReversibleMigration {
+	name = 'ResultDataResumeWorfklowTimer1899949999859';
+
+	async up({ queryRunner, tablePrefix }: MigrationContext): Promise<void> {
+		await queryRunner.query(`ALTER TABLE "resume_workflow_timer" ADD COLUMN "resultData" jsonb DEFAULT '{}'::jsonb`);
+	}
+
+	async down({ queryRunner, tablePrefix }: MigrationContext): Promise<void> {
+		await queryRunner.query(`ALTER TABLE "resume_workflow_timer" DROP COLUMN "resultData"`);
+	}
+}
diff --git a/packages/cli/src/databases/migrations/postgresdb/1899949999969-ExecutionIdResumeWorkflowTimer.ts b/packages/cli/src/databases/migrations/postgresdb/1899949999969-ExecutionIdResumeWorkflowTimer.ts
new file mode 100644
index 0000000000000..ae671a3707b0b
--- /dev/null
+++ b/packages/cli/src/databases/migrations/postgresdb/1899949999969-ExecutionIdResumeWorkflowTimer.ts
@@ -0,0 +1,13 @@
+import type { MigrationContext, ReversibleMigration } from '@db/types';
+
+
+export class ExecutionIdResumeWorkflowTimer1899949999969 implements ReversibleMigration {
+	name = 'ExecutionIdResumeWorkflowTimer1899949999969';
+
+	async up({ queryRunner, tablePrefix }: MigrationContext): Promise<void> {
+		await queryRunner.query(`ALTER TABLE "resume_workflow_timer" ALTER COLUMN "executionId" TYPE uuid USING "executionId"::uuid`);
+	}
+
+	async down({ queryRunner, tablePrefix }: MigrationContext): Promise<void> {
+	}
+}
diff --git a/packages/cli/src/databases/migrations/postgresdb/1899999999969-IdResumeWorkflowTimer.ts b/packages/cli/src/databases/migrations/postgresdb/1899999999969-IdResumeWorkflowTimer.ts
new file mode 100644
index 0000000000000..261b31baa9565
--- /dev/null
+++ b/packages/cli/src/databases/migrations/postgresdb/1899999999969-IdResumeWorkflowTimer.ts
@@ -0,0 +1,14 @@
+import type { MigrationContext, ReversibleMigration } from '@db/types';
+
+
+export class IdResumeWorkflowTimer1899999999969 implements ReversibleMigration {
+	name = 'IdResumeWorkflowTimer1899999999969';
+
+	async up({ queryRunner, tablePrefix }: MigrationContext): Promise<void> {
+		await queryRunner.query(`ALTER TABLE "resume_workflow_timer" ALTER COLUMN "id" TYPE varchar USING "id"::varchar`);
+		await queryRunner.query(`ALTER TABLE "resume_workflow_timer" ALTER COLUMN "executionId" TYPE varchar USING "executionId"::varchar`);
+	}
+
+	async down({ queryRunner, tablePrefix }: MigrationContext): Promise<void> {
+	}
+}
diff --git a/packages/cli/src/databases/migrations/postgresdb/1899999999979-UpdateIdTypeOnEntites.ts b/packages/cli/src/databases/migrations/postgresdb/1899999999979-UpdateIdTypeOnEntites.ts
new file mode 100644
index 0000000000000..f0915d6844e63
--- /dev/null
+++ b/packages/cli/src/databases/migrations/postgresdb/1899999999979-UpdateIdTypeOnEntites.ts
@@ -0,0 +1,21 @@
+import type { MigrationContext, ReversibleMigration } from '@db/types';
+
+
+export class UpdateIdTypeOnEntites1899999999979 implements ReversibleMigration {
+	name = 'UpdateIdTypeOnEntites1899999999979';
+
+	async up({ queryRunner, tablePrefix }: MigrationContext): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "node_output" DROP CONSTRAINT "FK_workflow_test_id"`);
+        await queryRunner.query(`ALTER TABLE "node_output" DROP CONSTRAINT "PK_node_output"`);
+        await queryRunner.query(`ALTER TABLE "node_output" ALTER COLUMN "workflowTestId" TYPE varchar`);
+		await queryRunner.query(`ALTER TABLE "workflow_test" ALTER COLUMN "id" TYPE varchar USING "id"::varchar`);
+		await queryRunner.query(`ALTER TABLE "node_output" ALTER COLUMN "id" TYPE varchar USING "id"::varchar`);
+        await queryRunner.query(`ALTER TABLE "server_incident" ALTER COLUMN "id" TYPE varchar USING "id"::varchar`);
+        await queryRunner.query(`ALTER TABLE "data_recovery_activity" ALTER COLUMN "id" TYPE varchar USING "id"::varchar`);
+        await queryRunner.query(`ALTER TABLE "node_output" ADD CONSTRAINT "PK_node_output" PRIMARY KEY ("workflowTestId", "nodeId")`);
+        await queryRunner.query(`ALTER TABLE "node_output" ADD CONSTRAINT "FK_workflow_test_id" FOREIGN KEY ("workflowTestId") REFERENCES "workflow_test"("id") ON DELETE CASCADE`);
+	}
+
+	async down({ queryRunner, tablePrefix }: MigrationContext): Promise<void> {
+	}
+}
diff --git a/packages/cli/src/databases/migrations/postgresdb/1899999999989-AddEnumsEntity.ts b/packages/cli/src/databases/migrations/postgresdb/1899999999989-AddEnumsEntity.ts
new file mode 100644
index 0000000000000..1e6361b4f824d
--- /dev/null
+++ b/packages/cli/src/databases/migrations/postgresdb/1899999999989-AddEnumsEntity.ts
@@ -0,0 +1,39 @@
+import type { MigrationContext, ReversibleMigration } from '@db/types';
+
+export class AddEnumsEntity1899999999989 implements ReversibleMigration {
+    name = 'AddEnumsEntity1899999999989'
+
+    public async up({ queryRunner, tablePrefix }: MigrationContext): Promise<void> {
+        await queryRunner.query(`
+            CREATE TABLE "esa_enums" (
+                "id" character varying NOT NULL,
+                "createdAt" TIMESTAMP NOT NULL DEFAULT now(),
+                "updatedAt" TIMESTAMP NOT NULL DEFAULT now(),
+                "name" character varying NOT NULL,
+                CONSTRAINT "PK_f2b7a0b314f9aa7c1d0f88b3b69" PRIMARY KEY ("id")
+            )
+        `);
+        await queryRunner.query(`
+            CREATE TABLE "esa_enum_data" (
+                "id" character varying NOT NULL,
+                "createdAt" TIMESTAMP NOT NULL DEFAULT now(),
+                "updatedAt" TIMESTAMP NOT NULL DEFAULT now(),
+                "key" character varying NOT NULL,
+                "value" character varying NOT NULL,
+                "esaEnumId" character varying NOT NULL,
+                CONSTRAINT "PK_b2b8a0b315f9aa7c1d0f8cb3b69" PRIMARY KEY ("id"),
+                CONSTRAINT "FK_esa_enum_id" FOREIGN KEY ("esaEnumId") REFERENCES "esa_enums"("id") ON DELETE CASCADE
+            )
+        `);
+    }
+
+    public async down({ queryRunner, tablePrefix }: MigrationContext): Promise<void> {
+        await queryRunner.query(`
+            DROP TABLE "esa_enum_data"
+        `);
+        await queryRunner.query(`
+            DROP TABLE "esa_enums"
+        `);
+    }
+
+}
diff --git a/packages/cli/src/databases/migrations/postgresdb/1999999999989-AlterNodeOutput.ts b/packages/cli/src/databases/migrations/postgresdb/1999999999989-AlterNodeOutput.ts
new file mode 100644
index 0000000000000..050996472b6a8
--- /dev/null
+++ b/packages/cli/src/databases/migrations/postgresdb/1999999999989-AlterNodeOutput.ts
@@ -0,0 +1,38 @@
+import type { MigrationContext, ReversibleMigration } from '@db/types';
+
+
+export class AlterNodeOutput1999999999989 implements ReversibleMigration {
+    public async up({ queryRunner, tablePrefix }: MigrationContext): Promise<void> {
+        await queryRunner.query(`
+            ALTER TABLE "node_output"
+            ADD COLUMN "temp_data" text DEFAULT '[]';
+        `);
+
+        await queryRunner.query(`
+            ALTER TABLE "node_output"
+            DROP COLUMN "data";
+        `);
+
+        await queryRunner.query(`
+            ALTER TABLE "node_output"
+            RENAME COLUMN "temp_data" TO "data";
+        `);
+    }
+
+    public async down({ queryRunner, tablePrefix }: MigrationContext): Promise<void> {
+        await queryRunner.query(`
+            ALTER TABLE "node_output"
+            ADD COLUMN "temp_data" jsonb DEFAULT '{}'::jsonb;
+        `);
+
+        await queryRunner.query(`
+            ALTER TABLE "node_output"
+            DROP COLUMN "data";
+        `);
+
+        await queryRunner.query(`
+            ALTER TABLE "node_output"
+            RENAME COLUMN "temp_data" TO "data";
+        `);
+    }
+}
diff --git a/packages/cli/src/databases/migrations/postgresdb/index.ts b/packages/cli/src/databases/migrations/postgresdb/index.ts
index b082f476004e6..25429a317a6b1 100644
--- a/packages/cli/src/databases/migrations/postgresdb/index.ts
+++ b/packages/cli/src/databases/migrations/postgresdb/index.ts
@@ -1,3 +1,4 @@
+import type { Migration } from '@db/types';
 import { InitialMigration1587669153312 } from './1587669153312-InitialMigration';
 import { WebhookModel1589476000887 } from './1589476000887-WebhookModel';
 import { CreateIndexStoppedAt1594828256133 } from './1594828256133-CreateIndexStoppedAt';
@@ -27,8 +28,8 @@ import { AddTriggerCountColumn1669823906995 } from './1669823906995-AddTriggerCo
 import { RemoveWorkflowDataLoadedFlag1671726148421 } from './1671726148421-RemoveWorkflowDataLoadedFlag';
 import { MessageEventBusDestinations1671535397530 } from './1671535397530-MessageEventBusDestinations';
 import { DeleteExecutionsWithWorkflows1673268682475 } from './1673268682475-DeleteExecutionsWithWorkflows';
-import { CreateLdapEntities1674509946020 } from './1674509946020-CreateLdapEntities';
-import { PurgeInvalidWorkflowConnections1675940580449 } from './1675940580449-PurgeInvalidWorkflowConnections';
+import { CreateLdapEntities1674509946020 } from '../common/1674509946020-CreateLdapEntities';
+import { PurgeInvalidWorkflowConnections1675940580449 } from '../common/1675940580449-PurgeInvalidWorkflowConnections';
 import { AddStatusToExecutions1674138566000 } from './1674138566000-AddStatusToExecutions';
 import { MigrateExecutionStatus1676996103000 } from './1676996103000-MigrateExecutionStatus';
 import { UpdateRunningExecutionStatus1677236854063 } from './1677236854063-UpdateRunningExecutionStatus';
@@ -38,8 +39,38 @@ import { AddUserActivatedProperty1681134145996 } from './1681134145996-AddUserAc
 import { AddUserOTPSecret1681134145997 } from './1681134145997-AddUserOTPSecret';
 import { AddSaveRequestLog1681134145998 } from './1681134145998-AddSaveRequestLog';
 import { addIncidentHandlingTables1689942863738 } from './1689942863738-addIncidentHandlingTables';
+import { dropConstraintOnSaveRequestLog1689942863739 } from './1689942863739-dropConstraintOnSaveRequestLog';
+import { MigrateIntegerKeysToString1690000000000 } from './1690000000000-MigrateIntegerKeysToString';
+import { SeparateExecutionData1690000000020 } from './1690000000020-SeparateExecutionData';
+import { RemoveSkipOwnerSetup1681134145997 } from './1681134145997-RemoveSkipOwnerSetup';
+import { addConstarinToSvaeRequestLog1694091729096 } from './1694091729096-addConstarinToSvaeRequestLog';
+import { RemoveResetPasswordColumns1690000000030 } from '../common/1690000000030-RemoveResetPasswordColumns';
+import { AddMissingPrimaryKeyOnExecutionData1690787606731 } from './1690787606731-AddMissingPrimaryKeyOnExecutionData';
+import { CreateWorkflowNameIndex1691088862123 } from '../common/1691088862123-CreateWorkflowNameIndex';
+import { AddMfaColumns1690000000030 } from './../common/1690000000040-AddMfaColumns';
+import { CreateWorkflowHistoryTable1692967111175 } from '../common/1692967111175-CreateWorkflowHistoryTable';
+import { DisallowOrphanExecutions1693554410387 } from '../common/1693554410387-DisallowOrphanExecutions';
+import { ExecutionSoftDelete1693491613982 } from '../common/1693491613982-ExecutionSoftDelete';
+import { AddWorkflowMetadata1695128658538 } from '../common/1695128658538-AddWorkflowMetadata';
+import { MigrateToTimestampTz1694091729095 } from './1694091729095-MigrateToTimestampTz';
+import { ModifyWorkflowHistoryNodesAndConnections1695829275184 } from '../common/1695829275184-ModifyWorkflowHistoryNodesAndConnections';
+import { AddGlobalAdminRole1700571993961 } from '../common/1700571993961-AddGlobalAdminRole';
+import { DropRoleMapping1705429061930 } from '../common/1705429061930-DropRoleMapping';
+import { RemoveFailedExecutionStatus1711018413374 } from '../common/1711018413374-RemoveFailedExecutionStatus';
+import { MoveSshKeysToDatabase1711390882123 } from '../common/1711390882123-MoveSshKeysToDatabase';
+import { RemoveNodesAccess1712044305787 } from '../common/1712044305787-RemoveNodesAccess';
+import { N8NTestingFramework1689942863738 } from './1689942865738-N8NTestingFramework';
+import { ResumeWorkflowTimerTable1689949863759 } from './1689949863759-ResumeWorfklowTimer';
+import { UpdateResumeWorfklowTimer1779949863759 } from './1779949863759-UpdateResumeWorfklowTimer';
+import { UpdateResumeWorfklowTimer1879949869859 } from './1879949869859-UpdateResumeWorfklowTimer';
+import { ResultDataResumeWorfklowTimer1899949999859 } from './1899949999859-ResultDataResumeWorfklowTimer';
+import { ExecutionIdResumeWorkflowTimer1899949999969 } from './1899949999969-ExecutionIdResumeWorkflowTimer';
+import { IdResumeWorkflowTimer1899999999969 } from './1899999999969-IdResumeWorkflowTimer';
+import { UpdateIdTypeOnEntites1899999999979 } from './1899999999979-UpdateIdTypeOnEntites';
+import { AddEnumsEntity1899999999989 } from './1899999999989-AddEnumsEntity'
+import { AlterNodeOutput1999999999989 } from './1999999999989-AlterNodeOutput'
 
-export const postgresMigrations = [
+export const postgresMigrations: Migration[] = [
 	InitialMigration1587669153312,
 	WebhookModel1589476000887,
 	CreateIndexStoppedAt1594828256133,
@@ -80,4 +111,34 @@ export const postgresMigrations = [
 	AddUserOTPSecret1681134145997,
 	AddSaveRequestLog1681134145998,
 	addIncidentHandlingTables1689942863738,
+	dropConstraintOnSaveRequestLog1689942863739,
+	MigrateIntegerKeysToString1690000000000,
+	SeparateExecutionData1690000000020,
+	RemoveSkipOwnerSetup1681134145997,
+	addConstarinToSvaeRequestLog1694091729096,
+	RemoveResetPasswordColumns1690000000030,
+	AddMissingPrimaryKeyOnExecutionData1690787606731,
+	CreateWorkflowNameIndex1691088862123,
+	AddMfaColumns1690000000030,
+	CreateWorkflowHistoryTable1692967111175,
+	DisallowOrphanExecutions1693554410387,
+	ExecutionSoftDelete1693491613982,
+	AddWorkflowMetadata1695128658538,
+	MigrateToTimestampTz1694091729095,
+	ModifyWorkflowHistoryNodesAndConnections1695829275184,
+	AddGlobalAdminRole1700571993961,
+	DropRoleMapping1705429061930,
+	RemoveFailedExecutionStatus1711018413374,
+	MoveSshKeysToDatabase1711390882123,
+	RemoveNodesAccess1712044305787,
+	N8NTestingFramework1689942863738,
+	ResumeWorkflowTimerTable1689949863759,
+	UpdateResumeWorfklowTimer1779949863759,
+	UpdateResumeWorfklowTimer1879949869859,
+	ResultDataResumeWorfklowTimer1899949999859,
+	ExecutionIdResumeWorkflowTimer1899949999969,
+	IdResumeWorkflowTimer1899999999969,
+	UpdateIdTypeOnEntites1899999999979,
+	AddEnumsEntity1899999999989,
+	AlterNodeOutput1999999999989,
 ];
diff --git a/packages/cli/src/databases/migrations/sqlite/1588102412422-InitialMigration.ts b/packages/cli/src/databases/migrations/sqlite/1588102412422-InitialMigration.ts
index 2537328036819..baf99502cc789 100644
--- a/packages/cli/src/databases/migrations/sqlite/1588102412422-InitialMigration.ts
+++ b/packages/cli/src/databases/migrations/sqlite/1588102412422-InitialMigration.ts
@@ -1,46 +1,29 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import config from '@/config';
-import { logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
-
-export class InitialMigration1588102412422 implements MigrationInterface {
-	name = 'InitialMigration1588102412422';
-
-	async up(queryRunner: QueryRunner): Promise<void> {
-		logMigrationStart(this.name);
-
-		const tablePrefix = config.getEnv('database.tablePrefix');
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
+export class InitialMigration1588102412422 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			`CREATE TABLE IF NOT EXISTS "${tablePrefix}credentials_entity" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(128) NOT NULL, "data" text NOT NULL, "type" varchar(128) NOT NULL, "nodesAccess" text NOT NULL, "createdAt" datetime NOT NULL, "updatedAt" datetime NOT NULL)`,
-			undefined,
 		);
 		await queryRunner.query(
 			`CREATE INDEX IF NOT EXISTS "IDX_${tablePrefix}07fde106c0b471d8cc80a64fc8" ON "${tablePrefix}credentials_entity" ("type") `,
-			undefined,
 		);
 		await queryRunner.query(
 			`CREATE TABLE IF NOT EXISTS "${tablePrefix}execution_entity" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "data" text NOT NULL, "finished" boolean NOT NULL, "mode" varchar NOT NULL, "retryOf" varchar, "retrySuccessId" varchar, "startedAt" datetime NOT NULL, "stoppedAt" datetime NOT NULL, "workflowData" text NOT NULL, "workflowId" varchar)`,
-			undefined,
 		);
 		await queryRunner.query(
 			`CREATE INDEX IF NOT EXISTS "IDX_${tablePrefix}c4d999a5e90784e8caccf5589d" ON "${tablePrefix}execution_entity" ("workflowId") `,
-			undefined,
 		);
 		await queryRunner.query(
 			`CREATE TABLE IF NOT EXISTS "${tablePrefix}workflow_entity" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(128) NOT NULL, "active" boolean NOT NULL, "nodes" text NOT NULL, "connections" text NOT NULL, "createdAt" datetime NOT NULL, "updatedAt" datetime NOT NULL, "settings" text, "staticData" text)`,
-			undefined,
 		);
-
-		logMigrationEnd(this.name);
 	}
 
-	async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
-
-		await queryRunner.query(`DROP TABLE "${tablePrefix}workflow_entity"`, undefined);
-		await queryRunner.query(`DROP INDEX "IDX_${tablePrefix}c4d999a5e90784e8caccf5589d"`, undefined);
-		await queryRunner.query(`DROP TABLE "${tablePrefix}execution_entity"`, undefined);
-		await queryRunner.query(`DROP INDEX "IDX_${tablePrefix}07fde106c0b471d8cc80a64fc8"`, undefined);
-		await queryRunner.query(`DROP TABLE "${tablePrefix}credentials_entity"`, undefined);
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
+		await queryRunner.query(`DROP TABLE "${tablePrefix}workflow_entity"`);
+		await queryRunner.query(`DROP INDEX "IDX_${tablePrefix}c4d999a5e90784e8caccf5589d"`);
+		await queryRunner.query(`DROP TABLE "${tablePrefix}execution_entity"`);
+		await queryRunner.query(`DROP INDEX "IDX_${tablePrefix}07fde106c0b471d8cc80a64fc8"`);
+		await queryRunner.query(`DROP TABLE "${tablePrefix}credentials_entity"`);
 	}
 }
diff --git a/packages/cli/src/databases/migrations/sqlite/1592445003908-WebhookModel.ts b/packages/cli/src/databases/migrations/sqlite/1592445003908-WebhookModel.ts
index 378abac4dc879..eddde3176272f 100644
--- a/packages/cli/src/databases/migrations/sqlite/1592445003908-WebhookModel.ts
+++ b/packages/cli/src/databases/migrations/sqlite/1592445003908-WebhookModel.ts
@@ -1,24 +1,13 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import config from '@/config';
-import { logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
-
-export class WebhookModel1592445003908 implements MigrationInterface {
-	name = 'WebhookModel1592445003908';
-
-	async up(queryRunner: QueryRunner): Promise<void> {
-		logMigrationStart(this.name);
-
-		const tablePrefix = config.getEnv('database.tablePrefix');
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
+export class WebhookModel1592445003908 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			`CREATE TABLE IF NOT EXISTS ${tablePrefix}webhook_entity ("workflowId" integer NOT NULL, "webhookPath" varchar NOT NULL, "method" varchar NOT NULL, "node" varchar NOT NULL, PRIMARY KEY ("webhookPath", "method"))`,
 		);
-
-		logMigrationEnd(this.name);
 	}
 
-	async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`DROP TABLE ${tablePrefix}webhook_entity`);
 	}
 }
diff --git a/packages/cli/src/databases/migrations/sqlite/1594825041918-CreateIndexStoppedAt.ts b/packages/cli/src/databases/migrations/sqlite/1594825041918-CreateIndexStoppedAt.ts
index e5be8676e5fb3..b363b1623e8f5 100644
--- a/packages/cli/src/databases/migrations/sqlite/1594825041918-CreateIndexStoppedAt.ts
+++ b/packages/cli/src/databases/migrations/sqlite/1594825041918-CreateIndexStoppedAt.ts
@@ -1,25 +1,13 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import config from '@/config';
-import { logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
-
-export class CreateIndexStoppedAt1594825041918 implements MigrationInterface {
-	name = 'CreateIndexStoppedAt1594825041918';
-
-	async up(queryRunner: QueryRunner): Promise<void> {
-		logMigrationStart(this.name);
-
-		const tablePrefix = config.getEnv('database.tablePrefix');
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
+export class CreateIndexStoppedAt1594825041918 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			`CREATE INDEX "IDX_${tablePrefix}cefb067df2402f6aed0638a6c1" ON "${tablePrefix}execution_entity" ("stoppedAt") `,
 		);
-
-		logMigrationEnd(this.name);
 	}
 
-	async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
-
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`DROP INDEX "IDX_${tablePrefix}cefb067df2402f6aed0638a6c1"`);
 	}
 }
diff --git a/packages/cli/src/databases/migrations/sqlite/1607431743769-MakeStoppedAtNullable.ts b/packages/cli/src/databases/migrations/sqlite/1607431743769-MakeStoppedAtNullable.ts
index 7395c92dd33ba..800d605ba6ab4 100644
--- a/packages/cli/src/databases/migrations/sqlite/1607431743769-MakeStoppedAtNullable.ts
+++ b/packages/cli/src/databases/migrations/sqlite/1607431743769-MakeStoppedAtNullable.ts
@@ -1,30 +1,16 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import config from '@/config';
-import { logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
+import type { MigrationContext, IrreversibleMigration } from '@db/types';
 
-export class MakeStoppedAtNullable1607431743769 implements MigrationInterface {
-	name = 'MakeStoppedAtNullable1607431743769';
-
-	async up(queryRunner: QueryRunner): Promise<void> {
-		logMigrationStart(this.name);
-
-		const tablePrefix = config.getEnv('database.tablePrefix');
+export class MakeStoppedAtNullable1607431743769 implements IrreversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		// SQLite does not allow us to simply "alter column"
 		// We're hacking the way sqlite identifies tables
 		// Allowing a column to become nullable
 		// This is a very strict case when this can be done safely
 		// As no collateral effects exist.
-		await queryRunner.query(`PRAGMA writable_schema = 1; `, undefined);
+		await queryRunner.query('PRAGMA writable_schema = 1;');
 		await queryRunner.query(
 			`UPDATE SQLITE_MASTER SET SQL = 'CREATE TABLE IF NOT EXISTS "${tablePrefix}execution_entity" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "data" text NOT NULL, "finished" boolean NOT NULL, "mode" varchar NOT NULL, "retryOf" varchar, "retrySuccessId" varchar, "startedAt" datetime NOT NULL, "stoppedAt" datetime, "workflowData" text NOT NULL, "workflowId" varchar)' WHERE NAME = "${tablePrefix}execution_entity";`,
-			undefined,
 		);
-		await queryRunner.query(`PRAGMA writable_schema = 0;`, undefined);
-
-		logMigrationEnd(this.name);
-	}
-
-	async down(queryRunner: QueryRunner): Promise<void> {
-		// This cannot be undone as the table might already have nullable values
+		await queryRunner.query('PRAGMA writable_schema = 0;');
 	}
 }
diff --git a/packages/cli/src/databases/migrations/sqlite/1611071044839-AddWebhookId.ts b/packages/cli/src/databases/migrations/sqlite/1611071044839-AddWebhookId.ts
index 71c1adbe8a8c9..8d1d64f4de698 100644
--- a/packages/cli/src/databases/migrations/sqlite/1611071044839-AddWebhookId.ts
+++ b/packages/cli/src/databases/migrations/sqlite/1611071044839-AddWebhookId.ts
@@ -1,17 +1,9 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import config from '@/config';
-import { logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
-
-export class AddWebhookId1611071044839 implements MigrationInterface {
-	name = 'AddWebhookId1611071044839';
-
-	async up(queryRunner: QueryRunner): Promise<void> {
-		logMigrationStart(this.name);
-
-		const tablePrefix = config.getEnv('database.tablePrefix');
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
+export class AddWebhookId1611071044839 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
-			`CREATE TABLE "temporary_webhook_entity" ("workflowId" integer NOT NULL, "webhookPath" varchar NOT NULL, "method" varchar NOT NULL, "node" varchar NOT NULL, "webhookId" varchar, "pathLength" integer, PRIMARY KEY ("webhookPath", "method"))`,
+			'CREATE TABLE "temporary_webhook_entity" ("workflowId" integer NOT NULL, "webhookPath" varchar NOT NULL, "method" varchar NOT NULL, "node" varchar NOT NULL, "webhookId" varchar, "pathLength" integer, PRIMARY KEY ("webhookPath", "method"))',
 		);
 		await queryRunner.query(
 			`INSERT INTO "temporary_webhook_entity"("workflowId", "webhookPath", "method", "node") SELECT "workflowId", "webhookPath", "method", "node" FROM "${tablePrefix}webhook_entity"`,
@@ -23,13 +15,9 @@ export class AddWebhookId1611071044839 implements MigrationInterface {
 		await queryRunner.query(
 			`CREATE INDEX "IDX_${tablePrefix}742496f199721a057051acf4c2" ON "${tablePrefix}webhook_entity" ("webhookId", "method", "pathLength") `,
 		);
-
-		logMigrationEnd(this.name);
 	}
 
-	async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
-
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`DROP INDEX "IDX_${tablePrefix}742496f199721a057051acf4c2"`);
 		await queryRunner.query(
 			`ALTER TABLE "${tablePrefix}webhook_entity" RENAME TO "temporary_webhook_entity"`,
@@ -40,6 +28,6 @@ export class AddWebhookId1611071044839 implements MigrationInterface {
 		await queryRunner.query(
 			`INSERT INTO "${tablePrefix}webhook_entity"("workflowId", "webhookPath", "method", "node") SELECT "workflowId", "webhookPath", "method", "node" FROM "temporary_webhook_entity"`,
 		);
-		await queryRunner.query(`DROP TABLE "temporary_webhook_entity"`);
+		await queryRunner.query('DROP TABLE "temporary_webhook_entity"');
 	}
 }
diff --git a/packages/cli/src/databases/migrations/sqlite/1617213344594-CreateTagEntity.ts b/packages/cli/src/databases/migrations/sqlite/1617213344594-CreateTagEntity.ts
index 09b845b322ef2..314eded6d128a 100644
--- a/packages/cli/src/databases/migrations/sqlite/1617213344594-CreateTagEntity.ts
+++ b/packages/cli/src/databases/migrations/sqlite/1617213344594-CreateTagEntity.ts
@@ -1,15 +1,7 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import config from '@/config';
-import { logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
-
-export class CreateTagEntity1617213344594 implements MigrationInterface {
-	name = 'CreateTagEntity1617213344594';
-
-	async up(queryRunner: QueryRunner): Promise<void> {
-		logMigrationStart(this.name);
-
-		const tablePrefix = config.getEnv('database.tablePrefix');
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
+export class CreateTagEntity1617213344594 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		// create tags table + relationship with workflow entity
 
 		await queryRunner.query(
@@ -68,13 +60,9 @@ export class CreateTagEntity1617213344594 implements MigrationInterface {
 		await queryRunner.query(
 			`ALTER TABLE "${tablePrefix}temporary_workflow_entity" RENAME TO "${tablePrefix}workflow_entity"`,
 		);
-
-		logMigrationEnd(this.name);
 	}
 
-	async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
-
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		// `createdAt` and `updatedAt`
 
 		await queryRunner.query(
diff --git a/packages/cli/src/databases/migrations/sqlite/1620821879465-UniqueWorkflowNames.ts b/packages/cli/src/databases/migrations/sqlite/1620821879465-UniqueWorkflowNames.ts
deleted file mode 100644
index 001096b903bb7..0000000000000
--- a/packages/cli/src/databases/migrations/sqlite/1620821879465-UniqueWorkflowNames.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import config from '@/config';
-import { logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
-
-export class UniqueWorkflowNames1620821879465 implements MigrationInterface {
-	name = 'UniqueWorkflowNames1620821879465';
-
-	async up(queryRunner: QueryRunner): Promise<void> {
-		logMigrationStart(this.name);
-
-		const tablePrefix = config.getEnv('database.tablePrefix');
-
-		const workflowNames = await queryRunner.query(`
-				SELECT name
-				FROM "${tablePrefix}workflow_entity"
-			`);
-
-		for (const { name } of workflowNames) {
-			const [duplicatesQuery, parameters] = queryRunner.connection.driver.escapeQueryWithParameters(
-				`
-					SELECT id, name
-					FROM "${tablePrefix}workflow_entity"
-					WHERE name = :name
-					ORDER BY createdAt ASC
-				`,
-				{ name },
-				{},
-			);
-
-			const duplicates = await queryRunner.query(duplicatesQuery, parameters);
-
-			if (duplicates.length > 1) {
-				await Promise.all(
-					duplicates.map(({ id, name }: { id: number; name: string }, index: number) => {
-						if (index === 0) return Promise.resolve();
-						const [updateQuery, updateParams] =
-							queryRunner.connection.driver.escapeQueryWithParameters(
-								`
-							UPDATE "${tablePrefix}workflow_entity"
-							SET name = :name
-							WHERE id = '${id}'
-						`,
-								{ name: `${name} ${index + 1}` },
-								{},
-							);
-
-						return queryRunner.query(updateQuery, updateParams);
-					}),
-				);
-			}
-		}
-
-		await queryRunner.query(
-			`CREATE UNIQUE INDEX "IDX_${tablePrefix}943d8f922be094eb507cb9a7f9" ON "${tablePrefix}workflow_entity" ("name") `,
-		);
-
-		logMigrationEnd(this.name);
-	}
-
-	async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
-		await queryRunner.query(`DROP INDEX "IDX_${tablePrefix}943d8f922be094eb507cb9a7f9"`);
-	}
-}
diff --git a/packages/cli/src/databases/migrations/sqlite/1621707690587-AddWaitColumn.ts b/packages/cli/src/databases/migrations/sqlite/1621707690587-AddWaitColumn.ts
index ebe65d48819fc..95c5cd51b1e83 100644
--- a/packages/cli/src/databases/migrations/sqlite/1621707690587-AddWaitColumn.ts
+++ b/packages/cli/src/databases/migrations/sqlite/1621707690587-AddWaitColumn.ts
@@ -1,19 +1,10 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import config from '@/config';
-import { logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
-
-export class AddWaitColumn1621707690587 implements MigrationInterface {
-	name = 'AddWaitColumn1621707690587';
-
-	async up(queryRunner: QueryRunner): Promise<void> {
-		logMigrationStart(this.name);
-
-		const tablePrefix = config.getEnv('database.tablePrefix');
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
+export class AddWaitColumn1621707690587 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`DROP TABLE IF EXISTS "${tablePrefix}temporary_execution_entity"`);
 		await queryRunner.query(
 			`CREATE TABLE "${tablePrefix}temporary_execution_entity" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "data" text NOT NULL, "finished" boolean NOT NULL, "mode" varchar NOT NULL, "retryOf" varchar, "retrySuccessId" varchar, "startedAt" datetime NOT NULL, "stoppedAt" datetime, "workflowData" text NOT NULL, "workflowId" varchar, "waitTill" DATETIME)`,
-			undefined,
 		);
 		await queryRunner.query(
 			`INSERT INTO "${tablePrefix}temporary_execution_entity"("id", "data", "finished", "mode", "retryOf", "retrySuccessId", "startedAt", "stoppedAt", "workflowData", "workflowId") SELECT "id", "data", "finished", "mode", "retryOf", "retrySuccessId", "startedAt", "stoppedAt", "workflowData", "workflowId" FROM "${tablePrefix}execution_entity"`,
@@ -28,16 +19,11 @@ export class AddWaitColumn1621707690587 implements MigrationInterface {
 		await queryRunner.query(
 			`CREATE INDEX "IDX_${tablePrefix}ca4a71b47f28ac6ea88293a8e2" ON "${tablePrefix}execution_entity" ("waitTill")`,
 		);
-
-		logMigrationEnd(this.name);
 	}
 
-	async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
-
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			`CREATE TABLE IF NOT EXISTS "${tablePrefix}temporary_execution_entity" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "data" text NOT NULL, "finished" boolean NOT NULL, "mode" varchar NOT NULL, "retryOf" varchar, "retrySuccessId" varchar, "startedAt" datetime NOT NULL, "stoppedAt" datetime, "workflowData" text NOT NULL, "workflowId" varchar)`,
-			undefined,
 		);
 		await queryRunner.query(
 			`INSERT INTO "${tablePrefix}temporary_execution_entity"("id", "data", "finished", "mode", "retryOf", "retrySuccessId", "startedAt", "stoppedAt", "workflowData", "workflowId") SELECT "id", "data", "finished", "mode", "retryOf", "retrySuccessId", "startedAt", "stoppedAt", "workflowData", "workflowId" FROM "${tablePrefix}execution_entity"`,
diff --git a/packages/cli/src/databases/migrations/sqlite/1630330987096-UpdateWorkflowCredentials.ts b/packages/cli/src/databases/migrations/sqlite/1630330987096-UpdateWorkflowCredentials.ts
deleted file mode 100644
index f855575e70e7f..0000000000000
--- a/packages/cli/src/databases/migrations/sqlite/1630330987096-UpdateWorkflowCredentials.ts
+++ /dev/null
@@ -1,308 +0,0 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import config from '@/config';
-import { logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
-import { runInBatches } from '@db/utils/migrationHelpers';
-
-// replacing the credentials in workflows and execution
-// `nodeType: name` changes to `nodeType: { id, name }`
-
-export class UpdateWorkflowCredentials1630330987096 implements MigrationInterface {
-	name = 'UpdateWorkflowCredentials1630330987096';
-
-	public async up(queryRunner: QueryRunner): Promise<void> {
-		logMigrationStart(this.name);
-
-		const tablePrefix = config.getEnv('database.tablePrefix');
-
-		const credentialsEntities = await queryRunner.query(`
-			SELECT id, name, type
-			FROM "${tablePrefix}credentials_entity"
-		`);
-
-		const workflowsQuery = `
-			SELECT id, nodes
-			FROM "${tablePrefix}workflow_entity"
-		`;
-
-		// @ts-ignore
-		await runInBatches(queryRunner, workflowsQuery, (workflows) => {
-			workflows.forEach(async (workflow) => {
-				const nodes = JSON.parse(workflow.nodes);
-				let credentialsUpdated = false;
-				// @ts-ignore
-				nodes.forEach((node) => {
-					if (node.credentials) {
-						const allNodeCredentials = Object.entries(node.credentials);
-						for (const [type, name] of allNodeCredentials) {
-							if (typeof name === 'string') {
-								const matchingCredentials = credentialsEntities.find(
-									// @ts-ignore
-									(credentials) => credentials.name === name && credentials.type === type,
-								);
-								node.credentials[type] = { id: matchingCredentials?.id || null, name };
-								credentialsUpdated = true;
-							}
-						}
-					}
-				});
-				if (credentialsUpdated) {
-					const [updateQuery, updateParams] =
-						queryRunner.connection.driver.escapeQueryWithParameters(
-							`
-								UPDATE "${tablePrefix}workflow_entity"
-								SET nodes = :nodes
-								WHERE id = '${workflow.id}'
-							`,
-							{ nodes: JSON.stringify(nodes) },
-							{},
-						);
-
-					queryRunner.query(updateQuery, updateParams);
-				}
-			});
-		});
-
-		const waitingExecutionsQuery = `
-			SELECT id, "workflowData"
-			FROM "${tablePrefix}execution_entity"
-			WHERE "waitTill" IS NOT NULL AND finished = 0
-		`;
-		// @ts-ignore
-		await runInBatches(queryRunner, waitingExecutionsQuery, (waitingExecutions) => {
-			waitingExecutions.forEach(async (execution) => {
-				const data = JSON.parse(execution.workflowData);
-				let credentialsUpdated = false;
-				// @ts-ignore
-				data.nodes.forEach((node) => {
-					if (node.credentials) {
-						const allNodeCredentials = Object.entries(node.credentials);
-						for (const [type, name] of allNodeCredentials) {
-							if (typeof name === 'string') {
-								const matchingCredentials = credentialsEntities.find(
-									// @ts-ignore
-									(credentials) => credentials.name === name && credentials.type === type,
-								);
-								node.credentials[type] = { id: matchingCredentials?.id || null, name };
-								credentialsUpdated = true;
-							}
-						}
-					}
-				});
-				if (credentialsUpdated) {
-					const [updateQuery, updateParams] =
-						queryRunner.connection.driver.escapeQueryWithParameters(
-							`
-								UPDATE "${tablePrefix}execution_entity"
-								SET "workflowData" = :data
-								WHERE id = '${execution.id}'
-							`,
-							{ data: JSON.stringify(data) },
-							{},
-						);
-
-					queryRunner.query(updateQuery, updateParams);
-				}
-			});
-		});
-
-		const retryableExecutions = await queryRunner.query(`
-			SELECT id, "workflowData"
-			FROM "${tablePrefix}execution_entity"
-			WHERE "waitTill" IS NULL AND finished = 0 AND mode != 'retry'
-			ORDER BY "startedAt" DESC
-			LIMIT 200
-		`);
-		// @ts-ignore
-		retryableExecutions.forEach(async (execution) => {
-			const data = JSON.parse(execution.workflowData);
-			let credentialsUpdated = false;
-			// @ts-ignore
-			data.nodes.forEach((node) => {
-				if (node.credentials) {
-					const allNodeCredentials = Object.entries(node.credentials);
-					for (const [type, name] of allNodeCredentials) {
-						if (typeof name === 'string') {
-							const matchingCredentials = credentialsEntities.find(
-								// @ts-ignore
-								(credentials) => credentials.name === name && credentials.type === type,
-							);
-							node.credentials[type] = { id: matchingCredentials?.id || null, name };
-							credentialsUpdated = true;
-						}
-					}
-				}
-			});
-			if (credentialsUpdated) {
-				const [updateQuery, updateParams] = queryRunner.connection.driver.escapeQueryWithParameters(
-					`
-						UPDATE "${tablePrefix}execution_entity"
-						SET "workflowData" = :data
-						WHERE id = '${execution.id}'
-					`,
-					{ data: JSON.stringify(data) },
-					{},
-				);
-
-				queryRunner.query(updateQuery, updateParams);
-			}
-		});
-
-		logMigrationEnd(this.name);
-	}
-
-	public async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
-
-		const credentialsEntities = await queryRunner.query(`
-			SELECT id, name, type
-			FROM "${tablePrefix}credentials_entity"
-		`);
-
-		const workflowsQuery = `
-			SELECT id, nodes
-			FROM "${tablePrefix}workflow_entity"
-		`;
-
-		// @ts-ignore
-		await runInBatches(queryRunner, workflowsQuery, (workflows) => {
-			// @ts-ignore
-			workflows.forEach(async (workflow) => {
-				const nodes = JSON.parse(workflow.nodes);
-				let credentialsUpdated = false;
-				// @ts-ignore
-				nodes.forEach((node) => {
-					if (node.credentials) {
-						const allNodeCredentials = Object.entries(node.credentials);
-						for (const [type, creds] of allNodeCredentials) {
-							if (typeof creds === 'object') {
-								const matchingCredentials = credentialsEntities.find(
-									// @ts-ignore double-equals because creds.id can be string or number
-									(credentials) => credentials.id == creds.id && credentials.type === type,
-								);
-								if (matchingCredentials) {
-									node.credentials[type] = matchingCredentials.name;
-								} else {
-									// @ts-ignore
-									node.credentials[type] = creds.name;
-								}
-								credentialsUpdated = true;
-							}
-						}
-					}
-				});
-				if (credentialsUpdated) {
-					const [updateQuery, updateParams] =
-						queryRunner.connection.driver.escapeQueryWithParameters(
-							`
-								UPDATE "${tablePrefix}workflow_entity"
-								SET nodes = :nodes
-								WHERE id = '${workflow.id}'
-							`,
-							{ nodes: JSON.stringify(nodes) },
-							{},
-						);
-
-					queryRunner.query(updateQuery, updateParams);
-				}
-			});
-		});
-
-		const waitingExecutionsQuery = `
-			SELECT id, "workflowData"
-			FROM "${tablePrefix}execution_entity"
-			WHERE "waitTill" IS NOT NULL AND finished = 0
-		`;
-
-		// @ts-ignore
-		await runInBatches(queryRunner, waitingExecutionsQuery, (waitingExecutions) => {
-			// @ts-ignore
-			waitingExecutions.forEach(async (execution) => {
-				const data = JSON.parse(execution.workflowData);
-				let credentialsUpdated = false;
-				// @ts-ignore
-				data.nodes.forEach((node) => {
-					if (node.credentials) {
-						const allNodeCredentials = Object.entries(node.credentials);
-						for (const [type, creds] of allNodeCredentials) {
-							if (typeof creds === 'object') {
-								const matchingCredentials = credentialsEntities.find(
-									// @ts-ignore double-equals because creds.id can be string or number
-									(credentials) => credentials.id == creds.id && credentials.type === type,
-								);
-								if (matchingCredentials) {
-									node.credentials[type] = matchingCredentials.name;
-								} else {
-									// @ts-ignore
-									node.credentials[type] = creds.name;
-								}
-								credentialsUpdated = true;
-							}
-						}
-					}
-				});
-				if (credentialsUpdated) {
-					const [updateQuery, updateParams] =
-						queryRunner.connection.driver.escapeQueryWithParameters(
-							`
-								UPDATE "${tablePrefix}execution_entity"
-								SET "workflowData" = :data
-								WHERE id = '${execution.id}'
-							`,
-							{ data: JSON.stringify(data) },
-							{},
-						);
-
-					await queryRunner.query(updateQuery, updateParams);
-				}
-			});
-		});
-
-		const retryableExecutions = await queryRunner.query(`
-			SELECT id, "workflowData"
-			FROM "${tablePrefix}execution_entity"
-			WHERE "waitTill" IS NULL AND finished = 0 AND mode != 'retry'
-			ORDER BY "startedAt" DESC
-			LIMIT 200
-		`);
-
-		// @ts-ignore
-		retryableExecutions.forEach(async (execution) => {
-			const data = JSON.parse(execution.workflowData);
-			let credentialsUpdated = false;
-			// @ts-ignore
-			data.nodes.forEach((node) => {
-				if (node.credentials) {
-					const allNodeCredentials = Object.entries(node.credentials);
-					for (const [type, creds] of allNodeCredentials) {
-						if (typeof creds === 'object') {
-							const matchingCredentials = credentialsEntities.find(
-								// @ts-ignore double-equals because creds.id can be string or number
-								(credentials) => credentials.id == creds.id && credentials.type === type,
-							);
-							if (matchingCredentials) {
-								node.credentials[type] = matchingCredentials.name;
-							} else {
-								// @ts-ignore
-								node.credentials[type] = creds.name;
-							}
-							credentialsUpdated = true;
-						}
-					}
-				}
-			});
-			if (credentialsUpdated) {
-				const [updateQuery, updateParams] = queryRunner.connection.driver.escapeQueryWithParameters(
-					`
-						UPDATE "${tablePrefix}execution_entity"
-						SET "workflowData" = :data
-						WHERE id = '${execution.id}'
-					`,
-					{ data: JSON.stringify(data) },
-					{},
-				);
-
-				queryRunner.query(updateQuery, updateParams);
-			}
-		});
-	}
-}
diff --git a/packages/cli/src/databases/migrations/sqlite/1644421939510-AddExecutionEntityIndexes.ts b/packages/cli/src/databases/migrations/sqlite/1644421939510-AddExecutionEntityIndexes.ts
index a534043afc0fb..babf466f01db0 100644
--- a/packages/cli/src/databases/migrations/sqlite/1644421939510-AddExecutionEntityIndexes.ts
+++ b/packages/cli/src/databases/migrations/sqlite/1644421939510-AddExecutionEntityIndexes.ts
@@ -1,14 +1,7 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import config from '@/config';
-import { logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
-
-export class AddExecutionEntityIndexes1644421939510 implements MigrationInterface {
-	name = 'AddExecutionEntityIndexes1644421939510';
-
-	public async up(queryRunner: QueryRunner): Promise<void> {
-		logMigrationStart(this.name);
-		const tablePrefix = config.getEnv('database.tablePrefix');
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
+export class AddExecutionEntityIndexes1644421939510 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`DROP INDEX IF EXISTS 'IDX_${tablePrefix}c4d999a5e90784e8caccf5589d'`);
 
 		await queryRunner.query(`DROP INDEX IF EXISTS 'IDX_${tablePrefix}ca4a71b47f28ac6ea88293a8e2'`);
@@ -28,12 +21,9 @@ export class AddExecutionEntityIndexes1644421939510 implements MigrationInterfac
 		await queryRunner.query(
 			`CREATE INDEX IF NOT EXISTS 'IDX_${tablePrefix}81fc04c8a17de15835713505e4' ON '${tablePrefix}execution_entity' ('workflowId', 'id') `,
 		);
-		logMigrationEnd(this.name);
 	}
 
-	public async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
-
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`DROP INDEX 'IDX_${tablePrefix}81fc04c8a17de15835713505e4'`);
 		await queryRunner.query(`DROP INDEX 'IDX_${tablePrefix}b94b45ce2c73ce46c54f20b5f9'`);
 		await queryRunner.query(`DROP INDEX 'IDX_${tablePrefix}1688846335d274033e15c846a4'`);
diff --git a/packages/cli/src/databases/migrations/sqlite/1646992772331-CreateUserManagement.ts b/packages/cli/src/databases/migrations/sqlite/1646992772331-CreateUserManagement.ts
index a5282e065d8dd..3794f5cd04a01 100644
--- a/packages/cli/src/databases/migrations/sqlite/1646992772331-CreateUserManagement.ts
+++ b/packages/cli/src/databases/migrations/sqlite/1646992772331-CreateUserManagement.ts
@@ -1,16 +1,8 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
+import type { InsertResult, MigrationContext, ReversibleMigration } from '@db/types';
 import { v4 as uuid } from 'uuid';
-import config from '@/config';
-import { loadSurveyFromDisk, logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
-
-export class CreateUserManagement1646992772331 implements MigrationInterface {
-	name = 'CreateUserManagement1646992772331';
-
-	public async up(queryRunner: QueryRunner): Promise<void> {
-		logMigrationStart(this.name);
-
-		const tablePrefix = config.getEnv('database.tablePrefix');
 
+export class CreateUserManagement1646992772331 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix, loadSurveyFromDisk }: MigrationContext) {
 		await queryRunner.query(
 			`CREATE TABLE "${tablePrefix}role" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(32) NOT NULL, "scope" varchar NOT NULL, "createdAt" datetime(3) NOT NULL DEFAULT (STRFTIME('%Y-%m-%d %H:%M:%f', 'NOW')), "updatedAt" datetime(3) NOT NULL DEFAULT (STRFTIME('%Y-%m-%d %H:%M:%f', 'NOW')), CONSTRAINT "UQ_${tablePrefix}5b49d0f504f7ef31045a1fb2eb8" UNIQUE ("scope", "name"))`,
 		);
@@ -49,7 +41,9 @@ export class CreateUserManagement1646992772331 implements MigrationInterface {
 			VALUES ("owner", "global");
 		`);
 
-		const instanceOwnerRole = await queryRunner.query('SELECT last_insert_rowid() as insertId');
+		const instanceOwnerRole = (await queryRunner.query(
+			'SELECT last_insert_rowid() as insertId',
+		)) as InsertResult;
 
 		await queryRunner.query(`
 			INSERT INTO "${tablePrefix}role" (name, scope)
@@ -61,14 +55,18 @@ export class CreateUserManagement1646992772331 implements MigrationInterface {
 			VALUES ("owner", "workflow");
 		`);
 
-		const workflowOwnerRole = await queryRunner.query('SELECT last_insert_rowid() as insertId');
+		const workflowOwnerRole = (await queryRunner.query(
+			'SELECT last_insert_rowid() as insertId',
+		)) as InsertResult;
 
 		await queryRunner.query(`
 			INSERT INTO "${tablePrefix}role" (name, scope)
 			VALUES ("owner", "credential");
 		`);
 
-		const credentialOwnerRole = await queryRunner.query('SELECT last_insert_rowid() as insertId');
+		const credentialOwnerRole = (await queryRunner.query(
+			'SELECT last_insert_rowid() as insertId',
+		)) as InsertResult;
 
 		const survey = loadSurveyFromDisk();
 
@@ -96,11 +94,16 @@ export class CreateUserManagement1646992772331 implements MigrationInterface {
 			('userManagement.isInstanceOwnerSetUp', 'false', true), ('userManagement.skipInstanceOwnerSetup', 'false', true)
 		`);
 
-		logMigrationEnd(this.name);
+		await queryRunner.query(
+			`
+			INSERT INTO "${tablePrefix}settings" (key, value, loadOnStartup)
+				VALUES (?, ?, ?)
+		`,
+			['ui.banners.dismissed', '["V1"]', true],
+		);
 	}
 
-	public async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			`CREATE UNIQUE INDEX "IDX_${tablePrefix}943d8f922be094eb507cb9a7f9" ON "${tablePrefix}workflow_entity" ("name") `,
 		);
diff --git a/packages/cli/src/databases/migrations/sqlite/1648740597343-LowerCaseUserEmail.ts b/packages/cli/src/databases/migrations/sqlite/1648740597343-LowerCaseUserEmail.ts
index 95c81401f2832..2f2ee528f1e0a 100644
--- a/packages/cli/src/databases/migrations/sqlite/1648740597343-LowerCaseUserEmail.ts
+++ b/packages/cli/src/databases/migrations/sqlite/1648740597343-LowerCaseUserEmail.ts
@@ -1,22 +1,10 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import config from '@/config';
-import { logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
-
-export class LowerCaseUserEmail1648740597343 implements MigrationInterface {
-	name = 'LowerCaseUserEmail1648740597343';
-
-	public async up(queryRunner: QueryRunner): Promise<void> {
-		logMigrationStart(this.name);
-
-		const tablePrefix = config.getEnv('database.tablePrefix');
+import type { MigrationContext, IrreversibleMigration } from '@db/types';
 
+export class LowerCaseUserEmail1648740597343 implements IrreversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`
 			UPDATE "${tablePrefix}user"
 			SET email = LOWER(email);
 		`);
-
-		logMigrationEnd(this.name);
 	}
-
-	public async down(queryRunner: QueryRunner): Promise<void> {}
 }
diff --git a/packages/cli/src/databases/migrations/sqlite/1652254514001-CommunityNodes.ts b/packages/cli/src/databases/migrations/sqlite/1652254514001-CommunityNodes.ts
index 89d31f30f7170..fc79d63e0dc10 100644
--- a/packages/cli/src/databases/migrations/sqlite/1652254514001-CommunityNodes.ts
+++ b/packages/cli/src/databases/migrations/sqlite/1652254514001-CommunityNodes.ts
@@ -1,42 +1,32 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import config from '@/config';
-import { logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
-
-export class CommunityNodes1652254514001 implements MigrationInterface {
-	name = 'CommunityNodes1652254514001';
-
-	public async up(queryRunner: QueryRunner): Promise<void> {
-		logMigrationStart(this.name);
-
-		const tablePrefix = config.get('database.tablePrefix');
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
+export class CommunityNodes1652254514001 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			`CREATE TABLE "${tablePrefix}installed_packages" (` +
-				`"packageName"	char(214) NOT NULL,` +
-				`"installedVersion"	char(50) NOT NULL,` +
-				`"authorName"	char(70) NULL,` +
-				`"authorEmail"	char(70) NULL,` +
-				`"createdAt"	datetime(3) NOT NULL DEFAULT 'STRFTIME(''%Y-%m-%d %H:%M:%f'', ''NOW'')',` +
-				`"updatedAt"	datetime(3) NOT NULL DEFAULT 'STRFTIME(''%Y-%m-%d %H:%M:%f'', ''NOW'')',` +
-				`PRIMARY KEY("packageName")` +
-				`);`,
+				'"packageName"	char(214) NOT NULL,' +
+				'"installedVersion"	char(50) NOT NULL,' +
+				'"authorName"	char(70) NULL,' +
+				'"authorEmail"	char(70) NULL,' +
+				"\"createdAt\"	datetime(3) NOT NULL DEFAULT 'STRFTIME(''%Y-%m-%d %H:%M:%f'', ''NOW'')'," +
+				"\"updatedAt\"	datetime(3) NOT NULL DEFAULT 'STRFTIME(''%Y-%m-%d %H:%M:%f'', ''NOW'')'," +
+				'PRIMARY KEY("packageName")' +
+				');',
 		);
 
 		await queryRunner.query(
 			`CREATE TABLE "${tablePrefix}installed_nodes" (` +
-				`"name"	char(200) NOT NULL,` +
-				`"type"	char(200) NOT NULL,` +
-				`"latestVersion"	INTEGER DEFAULT 1,` +
-				`"package"	char(214) NOT NULL,` +
-				`PRIMARY KEY("name"),` +
+				'"name"	char(200) NOT NULL,' +
+				'"type"	char(200) NOT NULL,' +
+				'"latestVersion"	INTEGER DEFAULT 1,' +
+				'"package"	char(214) NOT NULL,' +
+				'PRIMARY KEY("name"),' +
 				`FOREIGN KEY("package") REFERENCES "${tablePrefix}installed_packages"("packageName") ON DELETE CASCADE ON UPDATE CASCADE` +
-				`);`,
+				');',
 		);
-		logMigrationEnd(this.name);
 	}
 
-	public async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.get('database.tablePrefix');
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`DROP TABLE "${tablePrefix}installed_nodes"`);
 		await queryRunner.query(`DROP TABLE "${tablePrefix}installed_packages"`);
 	}
diff --git a/packages/cli/src/databases/migrations/sqlite/1652367743993-AddUserSettings.ts b/packages/cli/src/databases/migrations/sqlite/1652367743993-AddUserSettings.ts
index 111e3545bc1b4..ee7339547870a 100644
--- a/packages/cli/src/databases/migrations/sqlite/1652367743993-AddUserSettings.ts
+++ b/packages/cli/src/databases/migrations/sqlite/1652367743993-AddUserSettings.ts
@@ -1,19 +1,9 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import config from '@/config';
-import { logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
-export class AddUserSettings1652367743993 implements MigrationInterface {
-	name = 'AddUserSettings1652367743993';
-
-	transaction = false;
-
-	public async up(queryRunner: QueryRunner): Promise<void> {
-		logMigrationStart(this.name);
-
-		const tablePrefix = config.getEnv('database.tablePrefix');
-
-		await queryRunner.query('PRAGMA foreign_keys=OFF');
+export class AddUserSettings1652367743993 implements ReversibleMigration {
+	transaction = false as const;
 
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			`CREATE TABLE "temporary_user" ("id" varchar PRIMARY KEY NOT NULL, "email" varchar(255), "firstName" varchar(32), "lastName" varchar(32), "password" varchar, "resetPasswordToken" varchar, "resetPasswordTokenExpiration" integer DEFAULT NULL, "personalizationAnswers" text, "createdAt" datetime(3) NOT NULL DEFAULT (STRFTIME('%Y-%m-%d %H:%M:%f', 'NOW')), "updatedAt" datetime(3) NOT NULL DEFAULT (STRFTIME('%Y-%m-%d %H:%M:%f', 'NOW')), "globalRoleId" integer NOT NULL, "settings" text, CONSTRAINT "FK_${tablePrefix}f0609be844f9200ff4365b1bb3d" FOREIGN KEY ("globalRoleId") REFERENCES "${tablePrefix}role" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION)`,
 		);
@@ -26,15 +16,9 @@ export class AddUserSettings1652367743993 implements MigrationInterface {
 		await queryRunner.query(
 			`CREATE UNIQUE INDEX "UQ_${tablePrefix}e12875dfb3b1d92d7d7c5377e2" ON "${tablePrefix}user" ("email")`,
 		);
-
-		await queryRunner.query('PRAGMA foreign_keys=ON');
-
-		logMigrationEnd(this.name);
 	}
 
-	public async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
-
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`ALTER TABLE "${tablePrefix}user" RENAME TO "temporary_user"`);
 		await queryRunner.query(
 			`CREATE TABLE "${tablePrefix}user" ("id" varchar PRIMARY KEY NOT NULL, "email" varchar(255), "firstName" varchar(32), "lastName" varchar(32), "password" varchar, "resetPasswordToken" varchar, "resetPasswordTokenExpiration" integer DEFAULT NULL, "personalizationAnswers" text, "createdAt" datetime(3) NOT NULL DEFAULT (STRFTIME('%Y-%m-%d %H:%M:%f', 'NOW')), "updatedAt" datetime(3) NOT NULL DEFAULT (STRFTIME('%Y-%m-%d %H:%M:%f', 'NOW')), "globalRoleId" integer NOT NULL, CONSTRAINT "FK_${tablePrefix}f0609be844f9200ff4365b1bb3d" FOREIGN KEY ("globalRoleId") REFERENCES "${tablePrefix}role" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION)`,
@@ -42,7 +26,7 @@ export class AddUserSettings1652367743993 implements MigrationInterface {
 		await queryRunner.query(
 			`INSERT INTO "${tablePrefix}user"("id", "email", "firstName", "lastName", "password", "resetPasswordToken", "resetPasswordTokenExpiration", "personalizationAnswers", "createdAt", "updatedAt", "globalRoleId") SELECT "id", "email", "firstName", "lastName", "password", "resetPasswordToken", "resetPasswordTokenExpiration", "personalizationAnswers", "createdAt", "updatedAt", "globalRoleId" FROM "temporary_user"`,
 		);
-		await queryRunner.query(`DROP TABLE "temporary_user"`);
+		await queryRunner.query('DROP TABLE "temporary_user"');
 		await queryRunner.query(
 			`CREATE UNIQUE INDEX "UQ_${tablePrefix}e12875dfb3b1d92d7d7c5377e2" ON "${tablePrefix}user" ("email")`,
 		);
diff --git a/packages/cli/src/databases/migrations/sqlite/1652905585850-AddAPIKeyColumn.ts b/packages/cli/src/databases/migrations/sqlite/1652905585850-AddAPIKeyColumn.ts
index 3ec1d85c98975..74440331bb19a 100644
--- a/packages/cli/src/databases/migrations/sqlite/1652905585850-AddAPIKeyColumn.ts
+++ b/packages/cli/src/databases/migrations/sqlite/1652905585850-AddAPIKeyColumn.ts
@@ -1,19 +1,9 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import config from '@/config';
-import { logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
-export class AddAPIKeyColumn1652905585850 implements MigrationInterface {
-	name = 'AddAPIKeyColumn1652905585850';
-
-	transaction = false;
-
-	async up(queryRunner: QueryRunner): Promise<void> {
-		logMigrationStart(this.name);
-
-		const tablePrefix = config.getEnv('database.tablePrefix');
-
-		await queryRunner.query('PRAGMA foreign_keys=OFF');
+export class AddAPIKeyColumn1652905585850 implements ReversibleMigration {
+	transaction = false as const;
 
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			`CREATE TABLE "temporary_user" ("id" varchar PRIMARY KEY NOT NULL, "email" varchar(255), "firstName" varchar(32), "lastName" varchar(32), "password" varchar, "resetPasswordToken" varchar, "resetPasswordTokenExpiration" integer DEFAULT NULL, "personalizationAnswers" text, "createdAt" datetime(3) NOT NULL DEFAULT (STRFTIME('%Y-%m-%d %H:%M:%f', 'NOW')), "updatedAt" datetime(3) NOT NULL DEFAULT (STRFTIME('%Y-%m-%d %H:%M:%f', 'NOW')), "globalRoleId" integer NOT NULL, "settings" text, "apiKey" varchar, CONSTRAINT "FK_${tablePrefix}f0609be844f9200ff4365b1bb3d" FOREIGN KEY ("globalRoleId") REFERENCES "${tablePrefix}role" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION)`,
 		);
@@ -29,15 +19,9 @@ export class AddAPIKeyColumn1652905585850 implements MigrationInterface {
 		await queryRunner.query(
 			`CREATE UNIQUE INDEX "UQ_${tablePrefix}ie0zomxves9w3p774drfrkxtj5" ON "${tablePrefix}user" ("apiKey")`,
 		);
-
-		await queryRunner.query('PRAGMA foreign_keys=ON');
-
-		logMigrationEnd(this.name);
 	}
 
-	async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
-
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`ALTER TABLE "${tablePrefix}user" RENAME TO "temporary_user"`);
 		await queryRunner.query(
 			`CREATE TABLE "${tablePrefix}user" ("id" varchar PRIMARY KEY NOT NULL, "email" varchar(255), "firstName" varchar(32), "lastName" varchar(32), "password" varchar, "resetPasswordToken" varchar, "resetPasswordTokenExpiration" integer DEFAULT NULL, "personalizationAnswers" text, "createdAt" datetime(3) NOT NULL DEFAULT (STRFTIME('%Y-%m-%d %H:%M:%f', 'NOW')), "updatedAt" datetime(3) NOT NULL DEFAULT (STRFTIME('%Y-%m-%d %H:%M:%f', 'NOW')), "globalRoleId" integer NOT NULL, "settings" text, CONSTRAINT "FK_${tablePrefix}f0609be844f9200ff4365b1bb3d" FOREIGN KEY ("globalRoleId") REFERENCES "${tablePrefix}role" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION)`,
@@ -45,7 +29,7 @@ export class AddAPIKeyColumn1652905585850 implements MigrationInterface {
 		await queryRunner.query(
 			`INSERT INTO "${tablePrefix}user"("id", "email", "firstName", "lastName", "password", "resetPasswordToken", "resetPasswordTokenExpiration", "personalizationAnswers", "createdAt", "updatedAt", "globalRoleId", "settings") SELECT "id", "email", "firstName", "lastName", "password", "resetPasswordToken", "resetPasswordTokenExpiration", "personalizationAnswers", "createdAt", "updatedAt", "globalRoleId", "settings" FROM "temporary_user"`,
 		);
-		await queryRunner.query(`DROP TABLE "temporary_user"`);
+		await queryRunner.query('DROP TABLE "temporary_user"');
 		await queryRunner.query(
 			`CREATE UNIQUE INDEX "UQ_${tablePrefix}e12875dfb3b1d92d7d7c5377e2" ON "${tablePrefix}user" ("email")`,
 		);
diff --git a/packages/cli/src/databases/migrations/sqlite/1654089251344-IntroducePinData.ts b/packages/cli/src/databases/migrations/sqlite/1654089251344-IntroducePinData.ts
index f951647216b03..cdf424aec2888 100644
--- a/packages/cli/src/databases/migrations/sqlite/1654089251344-IntroducePinData.ts
+++ b/packages/cli/src/databases/migrations/sqlite/1654089251344-IntroducePinData.ts
@@ -1,25 +1,13 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
-import config from '@/config';
-
-export class IntroducePinData1654089251344 implements MigrationInterface {
-	name = 'IntroducePinData1654089251344';
-
-	async up(queryRunner: QueryRunner): Promise<void> {
-		logMigrationStart(this.name);
-
-		const tablePrefix = config.getEnv('database.tablePrefix');
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
+export class IntroducePinData1654089251344 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			`ALTER TABLE \`${tablePrefix}workflow_entity\` ADD COLUMN "pinData" text`,
 		);
-
-		logMigrationEnd(this.name);
 	}
 
-	async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
-
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			`ALTER TABLE \`${tablePrefix}workflow_entity\` RENAME TO "temporary_workflow_entity"`,
 		);
@@ -30,6 +18,6 @@ export class IntroducePinData1654089251344 implements MigrationInterface {
 		await queryRunner.query(
 			`INSERT INTO \`${tablePrefix}workflow_entity\` ("id", "name", "active", "nodes", "connections", "createdAt", "updatedAt", "settings", "staticData") SELECT "id", "name", "active", "nodes", "connections", "createdAt", "updatedAt", "settings", "staticData" FROM "temporary_workflow_entity"`,
 		);
-		await queryRunner.query(`DROP TABLE "temporary_workflow_entity"`);
+		await queryRunner.query('DROP TABLE "temporary_workflow_entity"');
 	}
 }
diff --git a/packages/cli/src/databases/migrations/sqlite/1658930531669-AddNodeIds.ts b/packages/cli/src/databases/migrations/sqlite/1658930531669-AddNodeIds.ts
deleted file mode 100644
index 47f5d5c759fc5..0000000000000
--- a/packages/cli/src/databases/migrations/sqlite/1658930531669-AddNodeIds.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-import { INode } from 'n8n-workflow';
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import config from '@/config';
-import { logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
-import { runInBatches } from '@db/utils/migrationHelpers';
-import { v4 as uuid } from 'uuid';
-
-// add node ids in workflow objects
-
-export class AddNodeIds1658930531669 implements MigrationInterface {
-	name = 'AddNodeIds1658930531669';
-
-	public async up(queryRunner: QueryRunner): Promise<void> {
-		logMigrationStart(this.name);
-
-		const tablePrefix = config.getEnv('database.tablePrefix');
-
-		const workflowsQuery = `
-			SELECT id, nodes
-			FROM "${tablePrefix}workflow_entity"
-		`;
-
-		// @ts-ignore
-		await runInBatches(queryRunner, workflowsQuery, (workflows) => {
-			workflows.forEach(async (workflow) => {
-				const nodes = JSON.parse(workflow.nodes);
-				nodes.forEach((node: INode) => {
-					if (!node.id) {
-						node.id = uuid();
-					}
-				});
-
-				const [updateQuery, updateParams] = queryRunner.connection.driver.escapeQueryWithParameters(
-					`
-							UPDATE "${tablePrefix}workflow_entity"
-							SET nodes = :nodes
-							WHERE id = '${workflow.id}'
-						`,
-					{ nodes: JSON.stringify(nodes) },
-					{},
-				);
-
-				queryRunner.query(updateQuery, updateParams);
-			});
-		});
-
-		logMigrationEnd(this.name);
-	}
-
-	public async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
-
-		const workflowsQuery = `
-			SELECT id, nodes
-			FROM "${tablePrefix}workflow_entity"
-		`;
-
-		// @ts-ignore
-		await runInBatches(queryRunner, workflowsQuery, (workflows) => {
-			workflows.forEach(async (workflow) => {
-				const nodes = JSON.parse(workflow.nodes);
-				// @ts-ignore
-				nodes.forEach((node) => delete node.id);
-
-				const [updateQuery, updateParams] = queryRunner.connection.driver.escapeQueryWithParameters(
-					`
-							UPDATE "${tablePrefix}workflow_entity"
-							SET nodes = :nodes
-							WHERE id = '${workflow.id}'
-						`,
-					{ nodes: JSON.stringify(nodes) },
-					{},
-				);
-
-				queryRunner.query(updateQuery, updateParams);
-			});
-		});
-	}
-}
diff --git a/packages/cli/src/databases/migrations/sqlite/1659888469333-AddJsonKeyPinData.ts b/packages/cli/src/databases/migrations/sqlite/1659888469333-AddJsonKeyPinData.ts
deleted file mode 100644
index f2ce0f0badd0a..0000000000000
--- a/packages/cli/src/databases/migrations/sqlite/1659888469333-AddJsonKeyPinData.ts
+++ /dev/null
@@ -1,106 +0,0 @@
-import {
-	logMigrationStart,
-	logMigrationEnd,
-	runInBatches,
-	getTablePrefix,
-	escapeQuery,
-} from '@db/utils/migrationHelpers';
-import type { MigrationInterface, QueryRunner } from 'typeorm';
-import { isJsonKeyObject, PinData } from '@db/utils/migrations.types';
-
-/**
- * Convert TEXT-type `pinData` column in `workflow_entity` table from
- * `{ [nodeName: string]: IDataObject[] }` to `{ [nodeName: string]: INodeExecutionData[] }`
- */
-export class AddJsonKeyPinData1659888469333 implements MigrationInterface {
-	name = 'AddJsonKeyPinData1659888469333';
-
-	async up(queryRunner: QueryRunner) {
-		logMigrationStart(this.name);
-
-		const workflowTable = `${getTablePrefix()}workflow_entity`;
-
-		const PINDATA_SELECT_QUERY = `
-			SELECT id, pinData
-			FROM "${workflowTable}"
-			WHERE pinData IS NOT NULL;
-		`;
-
-		const PINDATA_UPDATE_STATEMENT = `
-			UPDATE "${workflowTable}"
-			SET "pinData" = :pinData
-			WHERE id = :id;
-		`;
-
-		await runInBatches(
-			queryRunner,
-			PINDATA_SELECT_QUERY,
-			addJsonKeyToPinDataColumn(queryRunner, PINDATA_UPDATE_STATEMENT),
-		);
-
-		logMigrationEnd(this.name);
-	}
-
-	async down() {
-		// irreversible migration
-	}
-}
-
-export const addJsonKeyToPinDataColumn =
-	(queryRunner: QueryRunner, updateStatement: string) =>
-	async (fetchedWorkflows: PinData.FetchedWorkflow[]) => {
-		makeUpdateParams(fetchedWorkflows).forEach((param) => {
-			const params = {
-				pinData: param.pinData,
-				id: param.id,
-			};
-
-			const [escapedStatement, escapedParams] = escapeQuery(queryRunner, updateStatement, params);
-
-			queryRunner.query(escapedStatement, escapedParams);
-		});
-	};
-
-function makeUpdateParams(fetchedWorkflows: PinData.FetchedWorkflow[]) {
-	return fetchedWorkflows.reduce<PinData.FetchedWorkflow[]>(
-		(updateParams, { id, pinData: rawPinData }) => {
-			let pinDataPerWorkflow: PinData.Old | PinData.New;
-
-			if (typeof rawPinData === 'string') {
-				try {
-					pinDataPerWorkflow = JSON.parse(rawPinData);
-				} catch {
-					pinDataPerWorkflow = {};
-				}
-			} else {
-				pinDataPerWorkflow = rawPinData;
-			}
-
-			const newPinDataPerWorkflow = Object.keys(pinDataPerWorkflow).reduce<PinData.New>(
-				(newPinDataPerWorkflow, nodeName) => {
-					let pinDataPerNode = pinDataPerWorkflow[nodeName];
-
-					if (!Array.isArray(pinDataPerNode)) {
-						pinDataPerNode = [pinDataPerNode];
-					}
-
-					if (pinDataPerNode.every((item) => item.json)) return newPinDataPerWorkflow;
-
-					newPinDataPerWorkflow[nodeName] = pinDataPerNode.map((item) =>
-						isJsonKeyObject(item) ? item : { json: item },
-					);
-
-					return newPinDataPerWorkflow;
-				},
-				{},
-			);
-
-			if (Object.keys(newPinDataPerWorkflow).length > 0) {
-				updateParams.push({ id, pinData: JSON.stringify(newPinDataPerWorkflow) });
-			}
-
-			return updateParams;
-		},
-		[],
-	);
-}
diff --git a/packages/cli/src/databases/migrations/sqlite/1660062385367-CreateCredentialsUserRole.ts b/packages/cli/src/databases/migrations/sqlite/1660062385367-CreateCredentialsUserRole.ts
index 2d2f4c5a08141..f3481a387696b 100644
--- a/packages/cli/src/databases/migrations/sqlite/1660062385367-CreateCredentialsUserRole.ts
+++ b/packages/cli/src/databases/migrations/sqlite/1660062385367-CreateCredentialsUserRole.ts
@@ -1,27 +1,15 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import config from '@/config';
-import { logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
-
-export class CreateCredentialsUserRole1660062385367 implements MigrationInterface {
-	name = 'CreateCredentialsUserRole1660062385367';
-
-	async up(queryRunner: QueryRunner): Promise<void> {
-		logMigrationStart(this.name);
-
-		const tablePrefix = config.getEnv('database.tablePrefix');
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
+export class CreateCredentialsUserRole1660062385367 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`
 			INSERT INTO "${tablePrefix}role" (name, scope)
 			VALUES ("user", "credential")
 			ON CONFLICT DO NOTHING;
 		`);
-
-		logMigrationEnd(this.name);
 	}
 
-	async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
-
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`
 			DELETE FROM "${tablePrefix}role" WHERE name='user' AND scope='credential';
 		`);
diff --git a/packages/cli/src/databases/migrations/sqlite/1663755770892-CreateWorkflowsUserRole.ts b/packages/cli/src/databases/migrations/sqlite/1663755770892-CreateWorkflowsUserRole.ts
index 2bcf993c8e17a..3f590a20b056e 100644
--- a/packages/cli/src/databases/migrations/sqlite/1663755770892-CreateWorkflowsUserRole.ts
+++ b/packages/cli/src/databases/migrations/sqlite/1663755770892-CreateWorkflowsUserRole.ts
@@ -1,26 +1,15 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { getTablePrefix, logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
-
-export class CreateWorkflowsEditorRole1663755770892 implements MigrationInterface {
-	name = 'CreateWorkflowsEditorRole1663755770892';
-
-	async up(queryRunner: QueryRunner) {
-		logMigrationStart(this.name);
-
-		const tablePrefix = getTablePrefix();
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
+export class CreateWorkflowsEditorRole1663755770892 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`
 			INSERT INTO "${tablePrefix}role" (name, scope)
 			VALUES ("editor", "workflow")
 			ON CONFLICT DO NOTHING;
 		`);
-
-		logMigrationEnd(this.name);
 	}
 
-	async down(queryRunner: QueryRunner) {
-		const tablePrefix = getTablePrefix();
-
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`
 			DELETE FROM "${tablePrefix}role" WHERE name='user' AND scope='workflow';
 		`);
diff --git a/packages/cli/src/databases/migrations/sqlite/1664196174000-WorkflowStatistics.ts b/packages/cli/src/databases/migrations/sqlite/1664196174000-WorkflowStatistics.ts
index f400350ccd4e4..842af220f8dbb 100644
--- a/packages/cli/src/databases/migrations/sqlite/1664196174000-WorkflowStatistics.ts
+++ b/packages/cli/src/databases/migrations/sqlite/1664196174000-WorkflowStatistics.ts
@@ -1,15 +1,7 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { logMigrationEnd, logMigrationStart } from '../../utils/migrationHelpers';
-import config from '@/config';
-
-export class WorkflowStatistics1664196174000 implements MigrationInterface {
-	name = 'WorkflowStatistics1664196174000';
-
-	async up(queryRunner: QueryRunner): Promise<void> {
-		logMigrationStart(this.name);
-
-		const tablePrefix = config.getEnv('database.tablePrefix');
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
+export class WorkflowStatistics1664196174000 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			`CREATE TABLE \`${tablePrefix}workflow_statistics\` (
 				"count" INTEGER DEFAULT 0,
@@ -25,13 +17,9 @@ export class WorkflowStatistics1664196174000 implements MigrationInterface {
 		await queryRunner.query(
 			`ALTER TABLE \`${tablePrefix}workflow_entity\` ADD COLUMN "dataLoaded" BOOLEAN DEFAULT false`,
 		);
-
-		logMigrationEnd(this.name);
 	}
 
-	async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
-
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`DROP TABLE "${tablePrefix}workflow_statistics"`);
 		await queryRunner.query(
 			`ALTER TABLE \`${tablePrefix}workflow_entity\` DROP COLUMN "dataLoaded"`,
diff --git a/packages/cli/src/databases/migrations/sqlite/1665484192211-CreateCredentialUsageTable.ts b/packages/cli/src/databases/migrations/sqlite/1665484192211-CreateCredentialUsageTable.ts
index adda3742e97bd..3bc30e5c4d8e2 100644
--- a/packages/cli/src/databases/migrations/sqlite/1665484192211-CreateCredentialUsageTable.ts
+++ b/packages/cli/src/databases/migrations/sqlite/1665484192211-CreateCredentialUsageTable.ts
@@ -1,33 +1,22 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { getTablePrefix, logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
-
-export class CreateCredentialUsageTable1665484192211 implements MigrationInterface {
-	name = 'CreateCredentialUsageTable1665484192211';
-
-	async up(queryRunner: QueryRunner) {
-		logMigrationStart(this.name);
-
-		const tablePrefix = getTablePrefix();
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
+export class CreateCredentialUsageTable1665484192211 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			`CREATE TABLE "${tablePrefix}credential_usage" (` +
-				`"workflowId"	integer NOT NULL,` +
-				`"nodeId"	varchar NOT NULL,` +
-				`"credentialId"	integer NOT NULL,` +
-				`"createdAt"	datetime(3) NOT NULL DEFAULT 'STRFTIME(''%Y-%m-%d %H:%M:%f'', ''NOW'')',` +
-				`"updatedAt"	datetime(3) NOT NULL DEFAULT 'STRFTIME(''%Y-%m-%d %H:%M:%f'', ''NOW'')',` +
-				`PRIMARY KEY("workflowId", "nodeId", "credentialId"), ` +
+				'"workflowId"	integer NOT NULL,' +
+				'"nodeId"	varchar NOT NULL,' +
+				'"credentialId"	integer NOT NULL,' +
+				"\"createdAt\"	datetime(3) NOT NULL DEFAULT 'STRFTIME(''%Y-%m-%d %H:%M:%f'', ''NOW'')'," +
+				"\"updatedAt\"	datetime(3) NOT NULL DEFAULT 'STRFTIME(''%Y-%m-%d %H:%M:%f'', ''NOW'')'," +
+				'PRIMARY KEY("workflowId", "nodeId", "credentialId"), ' +
 				`CONSTRAINT "FK_${tablePrefix}518e1ece107b859ca6ce9ed2487f7e23" FOREIGN KEY ("workflowId") REFERENCES "${tablePrefix}workflow_entity" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, ` +
 				`CONSTRAINT "FK_${tablePrefix}7ce200a20ade7ae89fa7901da896993f" FOREIGN KEY ("credentialId") REFERENCES "${tablePrefix}credentials_entity" ("id") ON DELETE CASCADE ON UPDATE NO ACTION ` +
-				`);`,
+				');',
 		);
-
-		logMigrationEnd(this.name);
 	}
 
-	async down(queryRunner: QueryRunner) {
-		const tablePrefix = getTablePrefix();
-
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`DROP TABLE "${tablePrefix}credential_usage"`);
 	}
 }
diff --git a/packages/cli/src/databases/migrations/sqlite/1665754637024-RemoveCredentialUsageTable.ts b/packages/cli/src/databases/migrations/sqlite/1665754637024-RemoveCredentialUsageTable.ts
index b92ee11ef7767..54be01f00afe3 100644
--- a/packages/cli/src/databases/migrations/sqlite/1665754637024-RemoveCredentialUsageTable.ts
+++ b/packages/cli/src/databases/migrations/sqlite/1665754637024-RemoveCredentialUsageTable.ts
@@ -1,30 +1,22 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { getTablePrefix, logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
-export class RemoveCredentialUsageTable1665754637024 implements MigrationInterface {
-	name = 'RemoveCredentialUsageTable1665754637024';
-
-	async up(queryRunner: QueryRunner) {
-		logMigrationStart(this.name);
-		const tablePrefix = getTablePrefix();
+export class RemoveCredentialUsageTable1665754637024 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`DROP TABLE "${tablePrefix}credential_usage"`);
-		logMigrationEnd(this.name);
 	}
 
-	async down(queryRunner: QueryRunner) {
-		const tablePrefix = getTablePrefix();
-
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			`CREATE TABLE "${tablePrefix}credential_usage" (` +
-				`"workflowId"	integer NOT NULL,` +
-				`"nodeId"	varchar NOT NULL,` +
-				`"credentialId"	integer NOT NULL,` +
-				`"createdAt"	datetime(3) NOT NULL DEFAULT 'STRFTIME(''%Y-%m-%d %H:%M:%f'', ''NOW'')',` +
-				`"updatedAt"	datetime(3) NOT NULL DEFAULT 'STRFTIME(''%Y-%m-%d %H:%M:%f'', ''NOW'')',` +
-				`PRIMARY KEY("workflowId", "nodeId", "credentialId"), ` +
+				'"workflowId"	integer NOT NULL,' +
+				'"nodeId"	varchar NOT NULL,' +
+				'"credentialId"	integer NOT NULL,' +
+				"\"createdAt\"	datetime(3) NOT NULL DEFAULT 'STRFTIME(''%Y-%m-%d %H:%M:%f'', ''NOW'')'," +
+				"\"updatedAt\"	datetime(3) NOT NULL DEFAULT 'STRFTIME(''%Y-%m-%d %H:%M:%f'', ''NOW'')'," +
+				'PRIMARY KEY("workflowId", "nodeId", "credentialId"), ' +
 				`CONSTRAINT "FK_${tablePrefix}518e1ece107b859ca6ce9ed2487f7e23" FOREIGN KEY ("workflowId") REFERENCES "${tablePrefix}workflow_entity" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, ` +
 				`CONSTRAINT "FK_${tablePrefix}7ce200a20ade7ae89fa7901da896993f" FOREIGN KEY ("credentialId") REFERENCES "${tablePrefix}credentials_entity" ("id") ON DELETE CASCADE ON UPDATE NO ACTION ` +
-				`);`,
+				');',
 		);
 	}
 }
diff --git a/packages/cli/src/databases/migrations/sqlite/1669739707124-AddWorkflowVersionIdColumn.ts b/packages/cli/src/databases/migrations/sqlite/1669739707124-AddWorkflowVersionIdColumn.ts
deleted file mode 100644
index 17483e8b9841f..0000000000000
--- a/packages/cli/src/databases/migrations/sqlite/1669739707124-AddWorkflowVersionIdColumn.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
-import config from '@/config';
-import { v4 as uuidv4 } from 'uuid';
-
-export class AddWorkflowVersionIdColumn1669739707124 implements MigrationInterface {
-	name = 'AddWorkflowVersionIdColumn1669739707124';
-
-	async up(queryRunner: QueryRunner) {
-		logMigrationStart(this.name);
-
-		const tablePrefix = config.getEnv('database.tablePrefix');
-
-		await queryRunner.query(
-			`ALTER TABLE \`${tablePrefix}workflow_entity\` ADD COLUMN "versionId" char(36)`,
-		);
-
-		const workflowIds: Array<{ id: number }> = await queryRunner.query(`
-			SELECT id
-			FROM "${tablePrefix}workflow_entity"
-		`);
-
-		workflowIds.map(({ id }) => {
-			const [updateQuery, updateParams] = queryRunner.connection.driver.escapeQueryWithParameters(
-				`
-					UPDATE "${tablePrefix}workflow_entity"
-					SET versionId = :versionId
-					WHERE id = '${id}'
-				`,
-				{ versionId: uuidv4() },
-				{},
-			);
-
-			return queryRunner.query(updateQuery, updateParams);
-		});
-
-		logMigrationEnd(this.name);
-	}
-
-	async down(queryRunner: QueryRunner) {
-		const tablePrefix = config.getEnv('database.tablePrefix');
-
-		await queryRunner.query(
-			`ALTER TABLE \`${tablePrefix}workflow_entity\` DROP COLUMN "versionId"`,
-		);
-	}
-}
diff --git a/packages/cli/src/databases/migrations/sqlite/1669823906993-AddTriggerCountColumn.ts b/packages/cli/src/databases/migrations/sqlite/1669823906993-AddTriggerCountColumn.ts
index b5727e9b0107b..0386b37550118 100644
--- a/packages/cli/src/databases/migrations/sqlite/1669823906993-AddTriggerCountColumn.ts
+++ b/packages/cli/src/databases/migrations/sqlite/1669823906993-AddTriggerCountColumn.ts
@@ -1,26 +1,14 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
-import config from '@/config';
-
-export class AddTriggerCountColumn1669823906993 implements MigrationInterface {
-	name = 'AddTriggerCountColumn1669823906993';
-
-	async up(queryRunner: QueryRunner): Promise<void> {
-		logMigrationStart(this.name);
-
-		const tablePrefix = config.getEnv('database.tablePrefix');
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
+export class AddTriggerCountColumn1669823906993 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			`ALTER TABLE \`${tablePrefix}workflow_entity\` ADD COLUMN "triggerCount" integer NOT NULL DEFAULT 0`,
 		);
-		// Table will be populated by n8n startup - see ActiveWorkflowRunner.ts
-
-		logMigrationEnd(this.name);
+		// Table will be populated by n8n startup - see ActiveWorkflowManager.ts
 	}
 
-	async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
-
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			`ALTER TABLE \`${tablePrefix}workflow_entity\` DROP COLUMN "triggerCount"`,
 		);
diff --git a/packages/cli/src/databases/migrations/sqlite/1671535397530-MessageEventBusDestinations.ts b/packages/cli/src/databases/migrations/sqlite/1671535397530-MessageEventBusDestinations.ts
index 84536e3f1143b..92a67e4e414c5 100644
--- a/packages/cli/src/databases/migrations/sqlite/1671535397530-MessageEventBusDestinations.ts
+++ b/packages/cli/src/databases/migrations/sqlite/1671535397530-MessageEventBusDestinations.ts
@@ -1,27 +1,18 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { getTablePrefix, logMigrationEnd, logMigrationStart } from '../../utils/migrationHelpers';
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
-export class MessageEventBusDestinations1671535397530 implements MigrationInterface {
-	name = 'MessageEventBusDestinations1671535397530';
-
-	async up(queryRunner: QueryRunner) {
-		logMigrationStart(this.name);
-		const tablePrefix = getTablePrefix();
+export class MessageEventBusDestinations1671535397530 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			`CREATE TABLE "${tablePrefix}event_destinations" (` +
-				`"id"	varchar(36) PRIMARY KEY NOT NULL,` +
-				`"destination" text NOT NULL,` +
-				`"createdAt"	datetime(3) NOT NULL DEFAULT 'STRFTIME(''%Y-%m-%d %H:%M:%f'', ''NOW'')',` +
-				`"updatedAt"	datetime(3) NOT NULL DEFAULT 'STRFTIME(''%Y-%m-%d %H:%M:%f'', ''NOW'')'` +
-				`);`,
+				'"id"	varchar(36) PRIMARY KEY NOT NULL,' +
+				'"destination" text NOT NULL,' +
+				"\"createdAt\"	datetime(3) NOT NULL DEFAULT 'STRFTIME(''%Y-%m-%d %H:%M:%f'', ''NOW'')'," +
+				"\"updatedAt\"	datetime(3) NOT NULL DEFAULT 'STRFTIME(''%Y-%m-%d %H:%M:%f'', ''NOW'')'" +
+				');',
 		);
-		logMigrationEnd(this.name);
 	}
 
-	async down(queryRunner: QueryRunner) {
-		logMigrationStart(this.name);
-		const tablePrefix = getTablePrefix();
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`DROP TABLE "${tablePrefix}event_destinations"`);
-		logMigrationEnd(this.name);
 	}
 }
diff --git a/packages/cli/src/databases/migrations/sqlite/1671726148419-RemoveWorkflowDataLoadedFlag.ts b/packages/cli/src/databases/migrations/sqlite/1671726148419-RemoveWorkflowDataLoadedFlag.ts
deleted file mode 100644
index 36ac917b60575..0000000000000
--- a/packages/cli/src/databases/migrations/sqlite/1671726148419-RemoveWorkflowDataLoadedFlag.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
-import config from '@/config';
-import { v4 as uuidv4 } from 'uuid';
-import { StatisticsNames } from '@db/entities/WorkflowStatistics';
-
-export class RemoveWorkflowDataLoadedFlag1671726148419 implements MigrationInterface {
-	name = 'RemoveWorkflowDataLoadedFlag1671726148419';
-
-	async up(queryRunner: QueryRunner) {
-		logMigrationStart(this.name);
-		const tablePrefix = config.getEnv('database.tablePrefix');
-
-		// If any existing workflow has dataLoaded set to true, insert the relevant information to the statistics table
-		const workflowIds: Array<{ id: number; dataLoaded: boolean }> = await queryRunner.query(`
-			SELECT id, dataLoaded
-			FROM "${tablePrefix}workflow_entity"
-		`);
-
-		workflowIds.map(({ id, dataLoaded }) => {
-			if (dataLoaded) {
-				const [insertQuery, insertParams] = queryRunner.connection.driver.escapeQueryWithParameters(
-					`
-					INSERT INTO "${tablePrefix}workflow_statistics" (workflowId, name, count, latestEvent) VALUES
-					(:id, :name, 1, STRFTIME('%Y-%m-%d %H:%M:%f', 'NOW'))
-					`,
-					{ id, name: StatisticsNames.dataLoaded },
-					{},
-				);
-
-				return queryRunner.query(insertQuery, insertParams);
-			}
-			return undefined;
-		});
-
-		await queryRunner.query(
-			`ALTER TABLE \`${tablePrefix}workflow_entity\` DROP COLUMN "dataLoaded"`,
-		);
-
-		logMigrationEnd(this.name);
-	}
-
-	async down(queryRunner: QueryRunner) {
-		const tablePrefix = config.getEnv('database.tablePrefix');
-
-		await queryRunner.query(
-			`ALTER TABLE \`${tablePrefix}workflow_entity\` ADD COLUMN "dataLoaded" BOOLEAN DEFAULT false`,
-		);
-
-		// Search through statistics for any workflows that have the dataLoaded stat
-		const workflowsIds: Array<{ workflowId: string }> = await queryRunner.query(`
-			SELECT workflowId
-			FROM "${tablePrefix}workflow_statistics"
-			WHERE name = '${StatisticsNames.dataLoaded}'
-		`);
-		workflowsIds.map(({ workflowId }) => {
-			return queryRunner.query(`
-				UPDATE "${tablePrefix}workflow_entity"
-				SET dataLoaded = true
-				WHERE id = '${workflowId}'`);
-		});
-
-		await queryRunner.query(
-			`DELETE FROM "${tablePrefix}workflow_statistics" WHERE name = '${StatisticsNames.dataLoaded}'`,
-		);
-	}
-}
diff --git a/packages/cli/src/databases/migrations/sqlite/1673268682475-DeleteExecutionsWithWorkflows.ts b/packages/cli/src/databases/migrations/sqlite/1673268682475-DeleteExecutionsWithWorkflows.ts
index d9f0fd2d6c737..cfd670bc62be3 100644
--- a/packages/cli/src/databases/migrations/sqlite/1673268682475-DeleteExecutionsWithWorkflows.ts
+++ b/packages/cli/src/databases/migrations/sqlite/1673268682475-DeleteExecutionsWithWorkflows.ts
@@ -1,18 +1,12 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { getTablePrefix, logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
-export class DeleteExecutionsWithWorkflows1673268682475 implements MigrationInterface {
-	name = 'DeleteExecutionsWithWorkflows1673268682475';
+export class DeleteExecutionsWithWorkflows1673268682475 implements ReversibleMigration {
+	transaction = false as const;
 
-	transaction = false;
-
-	public async up(queryRunner: QueryRunner): Promise<void> {
-		logMigrationStart(this.name);
-		const tablePrefix = getTablePrefix();
-
-		const workflowIds: Array<{ id: number }> = await queryRunner.query(`
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
+		const workflowIds = (await queryRunner.query(`
 			SELECT id FROM "${tablePrefix}workflow_entity"
-		`);
+		`)) as Array<{ id: number }>;
 
 		await queryRunner.query(
 			`DELETE FROM "${tablePrefix}execution_entity"
@@ -24,8 +18,6 @@ export class DeleteExecutionsWithWorkflows1673268682475 implements MigrationInte
 				}`,
 		);
 
-		await queryRunner.query('PRAGMA foreign_keys=OFF');
-
 		await queryRunner.query(`DROP TABLE IF EXISTS "${tablePrefix}temporary_execution_entity"`);
 		await queryRunner.query(
 			`CREATE TABLE "${tablePrefix}temporary_execution_entity" (
@@ -59,15 +51,9 @@ export class DeleteExecutionsWithWorkflows1673268682475 implements MigrationInte
 		await queryRunner.query(
 			`CREATE INDEX "IDX_${tablePrefix}ca4a71b47f28ac6ea88293a8e2" ON "${tablePrefix}execution_entity" ("waitTill")`,
 		);
-
-		await queryRunner.query('PRAGMA foreign_keys=ON');
-
-		logMigrationEnd(this.name);
 	}
 
-	public async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = getTablePrefix();
-
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`DROP TABLE IF EXISTS "${tablePrefix}temporary_execution_entity"`);
 		await queryRunner.query(
 			`CREATE TABLE "${tablePrefix}temporary_execution_entity" (
diff --git a/packages/cli/src/databases/migrations/sqlite/1674138566000-AddStatusToExecutions.ts b/packages/cli/src/databases/migrations/sqlite/1674138566000-AddStatusToExecutions.ts
index b77a57f45e349..8633fe8e004d7 100644
--- a/packages/cli/src/databases/migrations/sqlite/1674138566000-AddStatusToExecutions.ts
+++ b/packages/cli/src/databases/migrations/sqlite/1674138566000-AddStatusToExecutions.ts
@@ -1,23 +1,13 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
-import config from '@/config';
-
-export class AddStatusToExecutions1674138566000 implements MigrationInterface {
-	name = 'AddStatusToExecutions1674138566000';
-	public async up(queryRunner: QueryRunner): Promise<void> {
-		logMigrationStart(this.name);
-		const tablePrefix = config.getEnv('database.tablePrefix');
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
+export class AddStatusToExecutions1674138566000 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			`ALTER TABLE \`${tablePrefix}execution_entity\` ADD COLUMN "status" varchar`,
 		);
-
-		logMigrationEnd(this.name);
 	}
 
-	public async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
-
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`ALTER TABLE \`${tablePrefix}execution_entity\` DROP COLUMN "status"`);
 	}
 }
diff --git a/packages/cli/src/databases/migrations/sqlite/1674509946020-CreateLdapEntities.ts b/packages/cli/src/databases/migrations/sqlite/1674509946020-CreateLdapEntities.ts
deleted file mode 100644
index ce885221749e8..0000000000000
--- a/packages/cli/src/databases/migrations/sqlite/1674509946020-CreateLdapEntities.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { LDAP_DEFAULT_CONFIGURATION, LDAP_FEATURE_NAME } from '@/Ldap/constants';
-import { getTablePrefix, logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
-export class CreateLdapEntities1674509946020 implements MigrationInterface {
-	name = 'CreateLdapEntities1674509946020';
-
-	async up(queryRunner: QueryRunner): Promise<void> {
-		logMigrationStart(this.name);
-
-		const tablePrefix = getTablePrefix();
-
-		await queryRunner.query(
-			`ALTER TABLE ${tablePrefix}user ADD COLUMN disabled BOOLEAN NOT NULL DEFAULT false;`,
-		);
-
-		await queryRunner.query(`
-			INSERT INTO "${tablePrefix}settings" (key, value, loadOnStartup)
-			VALUES ('${LDAP_FEATURE_NAME}', '${JSON.stringify(LDAP_DEFAULT_CONFIGURATION)}', true)
-		`);
-
-		await queryRunner.query(
-			`CREATE TABLE IF NOT EXISTS "${tablePrefix}auth_identity" (
-				"userId" VARCHAR(36) REFERENCES "${tablePrefix}user" (id),
-				"providerId" VARCHAR(64) NOT NULL,
-				"providerType" VARCHAR(32) NOT NULL,
-				"createdAt" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-				"updatedAt" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-				PRIMARY KEY("providerId", "providerType")
-			);`,
-		);
-
-		await queryRunner.query(
-			`CREATE TABLE IF NOT EXISTS "${tablePrefix}auth_provider_sync_history" (
-				"id" INTEGER PRIMARY KEY AUTOINCREMENT,
-				"providerType" VARCHAR(32) NOT NULL,
-				"runMode" TEXT NOT NULL,
-				"status" TEXT NOT NULL,
-				"startedAt" DATETIME NOT NULL,
-				"endedAt" DATETIME NOT NULL,
-				"scanned" INTEGER NOT NULL,
-				"created" INTEGER NOT NULL,
-				"updated" INTEGER NOT NULL,
-				"disabled" INTEGER NOT NULL,
-				"error" TEXT
-			);`,
-		);
-
-		logMigrationEnd(this.name);
-	}
-
-	async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = getTablePrefix();
-		await queryRunner.query(`DROP TABLE "${tablePrefix}auth_provider_sync_history"`);
-		await queryRunner.query(`DROP TABLE "${tablePrefix}auth_identity"`);
-
-		await queryRunner.query(
-			`DELETE FROM "${tablePrefix}settings" WHERE key = '${LDAP_FEATURE_NAME}'`,
-		);
-		await queryRunner.query(`ALTER TABLE "${tablePrefix}user" DROP COLUMN disabled`);
-	}
-}
diff --git a/packages/cli/src/databases/migrations/sqlite/1675940580449-PurgeInvalidWorkflowConnections.ts b/packages/cli/src/databases/migrations/sqlite/1675940580449-PurgeInvalidWorkflowConnections.ts
deleted file mode 100644
index 8207f2c8f3f2d..0000000000000
--- a/packages/cli/src/databases/migrations/sqlite/1675940580449-PurgeInvalidWorkflowConnections.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { getTablePrefix, logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
-import { NodeTypes } from '@/NodeTypes';
-import { IConnections, INode } from 'n8n-workflow';
-import { getLogger } from '@/Logger';
-import { Container } from 'typedi';
-
-export class PurgeInvalidWorkflowConnections1675940580449 implements MigrationInterface {
-	name = 'PurgeInvalidWorkflowConnections1675940580449';
-
-	async up(queryRunner: QueryRunner): Promise<void> {
-		logMigrationStart(this.name);
-
-		const tablePrefix = getTablePrefix();
-
-		const workflows: Array<{ id: number; nodes: string; connections: string }> =
-			await queryRunner.query(`
-			SELECT id, nodes, connections
-			FROM "${tablePrefix}workflow_entity"
-		`);
-
-		const nodeTypes = Container.get(NodeTypes);
-
-		workflows.forEach(async (workflow) => {
-			let connections: IConnections = JSON.parse(workflow.connections);
-			const nodes: INode[] = JSON.parse(workflow.nodes);
-
-			const nodesThatCannotReceiveInput: string[] = nodes.reduce((acc, node) => {
-				try {
-					const nodeType = nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
-					if ((nodeType.description.inputs?.length ?? []) === 0) {
-						acc.push(node.name);
-					}
-				} catch (error) {
-					getLogger().warn(`Migration ${this.name} failed with error: ${error.message}`);
-				}
-				return acc;
-			}, [] as string[]);
-
-			Object.keys(connections).forEach((sourceNodeName) => {
-				const connection = connections[sourceNodeName];
-				const outputs = Object.keys(connection);
-
-				outputs.forEach((outputConnectionName /* Like `main` */, idx) => {
-					const outputConnection = connection[outputConnectionName];
-
-					// It filters out all connections that are connected to a node that cannot receive input
-					outputConnection.forEach((outputConnectionItem, outputConnectionItemIdx) => {
-						outputConnection[outputConnectionItemIdx] = outputConnectionItem.filter(
-							(outgoingConnections) =>
-								!nodesThatCannotReceiveInput.includes(outgoingConnections.node),
-						);
-					});
-				});
-			});
-
-			// Update database with new connections
-			const [updateQuery, updateParams] = queryRunner.connection.driver.escapeQueryWithParameters(
-				`
-							UPDATE "${tablePrefix}workflow_entity"
-							SET connections = :connections
-							WHERE id = '${workflow.id}'
-						`,
-				{ connections: JSON.stringify(connections) },
-				{},
-			);
-
-			await queryRunner.query(updateQuery, updateParams);
-		});
-
-		logMigrationEnd(this.name);
-	}
-
-	async down(queryRunner: QueryRunner): Promise<void> {
-		// No need to revert this migration
-	}
-}
diff --git a/packages/cli/src/databases/migrations/sqlite/1676996103000-MigrateExecutionStatus.ts b/packages/cli/src/databases/migrations/sqlite/1676996103000-MigrateExecutionStatus.ts
index 78334751ed7fa..71de0e434820d 100644
--- a/packages/cli/src/databases/migrations/sqlite/1676996103000-MigrateExecutionStatus.ts
+++ b/packages/cli/src/databases/migrations/sqlite/1676996103000-MigrateExecutionStatus.ts
@@ -1,13 +1,7 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
-import config from '@/config';
-
-export class MigrateExecutionStatus1676996103000 implements MigrationInterface {
-	name = 'MigrateExecutionStatus1676996103000';
-	public async up(queryRunner: QueryRunner): Promise<void> {
-		logMigrationStart(this.name);
-		const tablePrefix = config.getEnv('database.tablePrefix');
+import type { MigrationContext, IrreversibleMigration } from '@db/types';
 
+export class MigrateExecutionStatus1676996103000 implements IrreversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			`UPDATE "${tablePrefix}execution_entity" SET "status" = 'waiting' WHERE "status" IS NULL AND "waitTill" IS NOT NULL;`,
 		);
@@ -20,9 +14,5 @@ export class MigrateExecutionStatus1676996103000 implements MigrationInterface {
 		await queryRunner.query(
 			`UPDATE "${tablePrefix}execution_entity" SET "status" = 'crashed' WHERE "status" IS NULL;`,
 		);
-
-		logMigrationEnd(this.name);
 	}
-
-	public async down(queryRunner: QueryRunner): Promise<void> {}
 }
diff --git a/packages/cli/src/databases/migrations/sqlite/1677237073720-UpdateRunningExecutionStatus.ts b/packages/cli/src/databases/migrations/sqlite/1677237073720-UpdateRunningExecutionStatus.ts
index 335fd27c1f376..0fe69a57ff90c 100644
--- a/packages/cli/src/databases/migrations/sqlite/1677237073720-UpdateRunningExecutionStatus.ts
+++ b/packages/cli/src/databases/migrations/sqlite/1677237073720-UpdateRunningExecutionStatus.ts
@@ -1,22 +1,12 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
-import config from '@/config';
-
-export class UpdateRunningExecutionStatus1677237073720 implements MigrationInterface {
-	name = 'UpdateRunningExecutionStatus1677237073720';
-	public async up(queryRunner: QueryRunner): Promise<void> {
-		logMigrationStart(this.name);
-		const tablePrefix = config.getEnv('database.tablePrefix');
+import type { MigrationContext, IrreversibleMigration } from '@db/types';
 
+export class UpdateRunningExecutionStatus1677237073720 implements IrreversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			`UPDATE "${tablePrefix}execution_entity" SET "status" = 'failed' WHERE "status" = 'running' AND "finished"=0 AND "stoppedAt" IS NOT NULL;`,
 		);
 		await queryRunner.query(
 			`UPDATE "${tablePrefix}execution_entity" SET "status" = 'success' WHERE "status" = 'running' AND "finished"=1 AND "stoppedAt" IS NOT NULL;`,
 		);
-
-		logMigrationEnd(this.name);
 	}
-
-	public async down(queryRunner: QueryRunner): Promise<void> {}
 }
diff --git a/packages/cli/src/databases/migrations/sqlite/1677501636752-CreateVariables.ts b/packages/cli/src/databases/migrations/sqlite/1677501636752-CreateVariables.ts
index da6265defa9e1..adc7d2ead4f54 100644
--- a/packages/cli/src/databases/migrations/sqlite/1677501636752-CreateVariables.ts
+++ b/packages/cli/src/databases/migrations/sqlite/1677501636752-CreateVariables.ts
@@ -1,13 +1,7 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { logMigrationEnd, logMigrationStart, getTablePrefix } from '@db/utils/migrationHelpers';
-import config from '@/config';
-
-export class CreateVariables1677501636752 implements MigrationInterface {
-	name = 'CreateVariables1677501636752';
-	public async up(queryRunner: QueryRunner): Promise<void> {
-		logMigrationStart(this.name);
-		const tablePrefix = getTablePrefix();
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
+export class CreateVariables1677501636752 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`
 			CREATE TABLE ${tablePrefix}variables (
 				id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
@@ -17,16 +11,9 @@ export class CreateVariables1677501636752 implements MigrationInterface {
 				UNIQUE("key")
 			);
 		`);
-
-		logMigrationEnd(this.name);
 	}
 
-	public async down(queryRunner: QueryRunner): Promise<void> {
-		logMigrationStart(this.name);
-		const tablePrefix = getTablePrefix();
-
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`DROP TABLE ${tablePrefix}variables;`);
-
-		logMigrationEnd(this.name);
 	}
 }
diff --git a/packages/cli/src/databases/migrations/sqlite/1679416281777-CreateExecutionMetadataTable.ts b/packages/cli/src/databases/migrations/sqlite/1679416281777-CreateExecutionMetadataTable.ts
index 39c39ff522662..e521c8494f36c 100644
--- a/packages/cli/src/databases/migrations/sqlite/1679416281777-CreateExecutionMetadataTable.ts
+++ b/packages/cli/src/databases/migrations/sqlite/1679416281777-CreateExecutionMetadataTable.ts
@@ -1,13 +1,7 @@
-import { MigrationInterface, QueryRunner, Table } from 'typeorm';
-import { getTablePrefix, logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
-
-export class CreateExecutionMetadataTable1679416281777 implements MigrationInterface {
-	name = 'CreateExecutionMetadataTable1679416281777';
-
-	public async up(queryRunner: QueryRunner): Promise<void> {
-		logMigrationStart(this.name);
-		const tablePrefix = getTablePrefix();
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
+export class CreateExecutionMetadataTable1679416281777 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			`CREATE TABLE "${tablePrefix}execution_metadata" (
 				id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
@@ -41,13 +35,9 @@ export class CreateExecutionMetadataTable1679416281777 implements MigrationInter
 		await queryRunner.query(`DROP INDEX IF EXISTS 'IDX_${tablePrefix}ca4a71b47f28ac6ea88293a8e2'`);
 		// Remove index for stoppedAt since it's not used anymore
 		await queryRunner.query(`DROP INDEX IF EXISTS 'IDX_${tablePrefix}cefb067df2402f6aed0638a6c1'`);
-
-		logMigrationEnd(this.name);
 	}
 
-	public async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = getTablePrefix();
-
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(`DROP TABLE "${tablePrefix}execution_metadata"`);
 		await queryRunner.query(`DROP INDEX IF EXISTS 'IDX_${tablePrefix}b94b45ce2c73ce46c54f20b5f9'`);
 		await queryRunner.query(`DROP INDEX IF EXISTS 'IDX_${tablePrefix}81fc04c8a17de15835713505e4'`);
diff --git a/packages/cli/src/databases/migrations/sqlite/1681134145996-AddUserActivatedProperty.ts b/packages/cli/src/databases/migrations/sqlite/1681134145996-AddUserActivatedProperty.ts
index 335c4b29a8e0f..d4e73014a7edb 100644
--- a/packages/cli/src/databases/migrations/sqlite/1681134145996-AddUserActivatedProperty.ts
+++ b/packages/cli/src/databases/migrations/sqlite/1681134145996-AddUserActivatedProperty.ts
@@ -1,16 +1,9 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { getTablePrefix, logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 import type { UserSettings } from '@/Interfaces';
 
-export class AddUserActivatedProperty1681134145996 implements MigrationInterface {
-	name = 'AddUserActivatedProperty1681134145996';
-
-	async up(queryRunner: QueryRunner): Promise<void> {
-		logMigrationStart(this.name);
-
-		const tablePrefix = getTablePrefix();
-
-		const activatedUsers: UserSettings[] = await queryRunner.query(
+export class AddUserActivatedProperty1681134145996 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
+		const activatedUsers = (await queryRunner.query(
 			`SELECT DISTINCT sw.userId AS id,
 				JSON_SET(COALESCE(u.settings, '{}'), '$.userActivated', JSON('true')) AS settings
 			FROM  ${tablePrefix}workflow_statistics AS ws
@@ -23,15 +16,16 @@ export class AddUserActivatedProperty1681134145996 implements MigrationInterface
 			WHERE ws.name = 'production_success'
 						AND r.name = 'owner'
 						AND r.scope = "workflow"`,
-		);
+		)) as UserSettings[];
 
-		const updatedUsers = activatedUsers.map((user) =>
-			queryRunner.query(
+		const updatedUserPromises = activatedUsers.map(async (user) => {
+			await queryRunner.query(
+				// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
 				`UPDATE ${tablePrefix}user SET settings = '${user.settings}' WHERE id = '${user.id}' `,
-			),
-		);
+			);
+		});
 
-		await Promise.all(updatedUsers);
+		await Promise.all(updatedUserPromises);
 
 		if (!activatedUsers.length) {
 			await queryRunner.query(
@@ -43,12 +37,9 @@ export class AddUserActivatedProperty1681134145996 implements MigrationInterface
 				`UPDATE ${tablePrefix}user SET settings = JSON_SET(COALESCE(settings, '{}'), '$.userActivated', JSON('false')) WHERE id NOT IN (${activatedUserIds})`,
 			);
 		}
-
-		logMigrationEnd(this.name);
 	}
 
-	async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = getTablePrefix();
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
 		await queryRunner.query(
 			`UPDATE ${tablePrefix}user SET settings = JSON_REMOVE(settings, '$.userActivated')`,
 		);
diff --git a/packages/cli/src/databases/migrations/sqlite/1681134145997-AddUserOTPSecret.ts b/packages/cli/src/databases/migrations/sqlite/1681134145997-AddUserOTPSecret.ts
index 7b5d0d2c53178..4ae855963159e 100644
--- a/packages/cli/src/databases/migrations/sqlite/1681134145997-AddUserOTPSecret.ts
+++ b/packages/cli/src/databases/migrations/sqlite/1681134145997-AddUserOTPSecret.ts
@@ -1,20 +1,13 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { getTablePrefix, logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
-export class AddUserOTPSecret1681134145997 implements MigrationInterface {
+export class AddUserOTPSecret1681134145997 implements ReversibleMigration {
 	name = 'AddUserOTPSecret1681134145997';
 
-	async up(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = getTablePrefix();
-		logMigrationStart(this.name);
+	async up({ queryRunner, tablePrefix }: MigrationContext): Promise<void> {
 		await queryRunner.query(`ALTER TABLE "${tablePrefix}user" ADD COLUMN otpsecret varchar`);
-
-		logMigrationEnd(this.name);
 	}
 
-	async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = getTablePrefix();
-
+	async down({ queryRunner, tablePrefix }: MigrationContext): Promise<void> {
 		await queryRunner.query(`ALTER TABLE "${tablePrefix}user" DROP COLUMN otpsecret`);
 	}
 }
diff --git a/packages/cli/src/databases/migrations/sqlite/1681134145997-RemoveSkipOwnerSetup.ts b/packages/cli/src/databases/migrations/sqlite/1681134145997-RemoveSkipOwnerSetup.ts
new file mode 100644
index 0000000000000..4d8f7d47c6b24
--- /dev/null
+++ b/packages/cli/src/databases/migrations/sqlite/1681134145997-RemoveSkipOwnerSetup.ts
@@ -0,0 +1,9 @@
+import type { IrreversibleMigration, MigrationContext } from '@db/types';
+
+export class RemoveSkipOwnerSetup1681134145997 implements IrreversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
+		await queryRunner.query(
+			`DELETE FROM "${tablePrefix}settings" WHERE key = 'userManagement.skipInstanceOwnerSetup';`,
+		);
+	}
+}
diff --git a/packages/cli/src/databases/migrations/sqlite/1681134145998-AddSaveRequestLog.ts b/packages/cli/src/databases/migrations/sqlite/1681134145998-AddSaveRequestLog.ts
index a1f60ceedbf0c..83474e989e97e 100644
--- a/packages/cli/src/databases/migrations/sqlite/1681134145998-AddSaveRequestLog.ts
+++ b/packages/cli/src/databases/migrations/sqlite/1681134145998-AddSaveRequestLog.ts
@@ -1,13 +1,9 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { getTablePrefix, logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
-export class AddSaveRequestLog1681134145998 implements MigrationInterface {
+export class AddSaveRequestLog1681134145998 implements ReversibleMigration {
 	name = 'AddSaveRequestLog1681134145998';
 
-	async up(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = getTablePrefix();
-		logMigrationStart(this.name);
-
+	async up({ queryRunner, tablePrefix }: MigrationContext): Promise<void> {
 		await queryRunner.query(`
 			CREATE TABLE "${tablePrefix}save_request_log" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "userId" uuid NOT NULL, "request" jsonb DEFAULT '{}', "createdAt" TIMESTAMP NOT NULL DEFAULT ('now'::text)::timestamp(6) with time zone, "updatedAt" TIMESTAMP NOT NULL DEFAULT ('now'::text)::timestamp(6) with time zone, "workflowId" integer NOT NULL, "response" jsonb DEFAULT '{}', "status" VARCHAR(128) NOT NULL, CONSTRAINT "PK_a2a6978768567cd32a5d6cc2797" PRIMARY KEY ("id"))
 		`);
@@ -23,13 +19,9 @@ export class AddSaveRequestLog1681134145998 implements MigrationInterface {
 				ALTER TABLE "${tablePrefix}save_request_log" ADD CONSTRAINT "FK_9a3caef176a6bd386c9ca3b3799" FOREIGN KEY ("workflowId") REFERENCES "workflow_entity"("id") ON DELETE NO ACTION ON UPDATE NO action
 			`,
 		);
-
-		logMigrationEnd(this.name);
 	}
 
-	async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = getTablePrefix();
-
+	async down({ queryRunner, tablePrefix }: MigrationContext): Promise<void> {
 		await queryRunner.query(
 			`ALTER TABLE "${tablePrefix}save_request_log" DROP CONSTRAINT "FK_9a3caef176a6bd386c9ca3b3799"`,
 		);
diff --git a/packages/cli/src/databases/migrations/sqlite/1689942863738-addIncidentHandlingTables.ts b/packages/cli/src/databases/migrations/sqlite/1689942863738-addIncidentHandlingTables.ts
index a52cb43513fa3..e0ddd7e33df6c 100644
--- a/packages/cli/src/databases/migrations/sqlite/1689942863738-addIncidentHandlingTables.ts
+++ b/packages/cli/src/databases/migrations/sqlite/1689942863738-addIncidentHandlingTables.ts
@@ -1,9 +1,9 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
+import type { MigrationContext, ReversibleMigration } from '@db/types';
 
-export class addIncidentHandlingTables1689942863738 implements MigrationInterface {
+export class addIncidentHandlingTables1689942863738 implements ReversibleMigration {
 	name = 'addIncidentHandlingTables1689942863738';
 
-	public async up(queryRunner: QueryRunner): Promise<void> {
+	public async up({ queryRunner, tablePrefix }: MigrationContext): Promise<void> {
 		await queryRunner.query(
 			`CREATE TABLE "server_incident" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "lastUpdateByAppUserId" character varying, "lastUpdateByZohoUserId" character varying, "lastUpdateSource" character varying, "createdAt" TIMESTAMP NOT NULL DEFAULT ('now'::text)::timestamp(6) with time zone, "updatedAt" TIMESTAMP NOT NULL DEFAULT ('now'::text)::timestamp(6) with time zone, "API" character varying, "APIMethod" character varying, "APIBody" json, "queueName" character varying, "errorMessage" character varying NOT NULL, "errorStackTrace" character varying, "incidentTime" TIMESTAMP NOT NULL, "additionalInformation" json, "zohoDeskTicketId" character varying, "correlationId" character varying, "isResolved" boolean NOT NULL DEFAULT false, CONSTRAINT "PK_c24ae1e5263dccb981312915dfc" PRIMARY KEY ("id"))`,
 		);
@@ -15,7 +15,7 @@ export class addIncidentHandlingTables1689942863738 implements MigrationInterfac
 		);
 	}
 
-	public async down(queryRunner: QueryRunner): Promise<void> {
+	public async down({ queryRunner, tablePrefix }: MigrationContext): Promise<void> {
 		await queryRunner.query(`DROP TABLE "data_recovery_activity"`);
 		await queryRunner.query(`DROP TYPE "public"."data_recovery_activity_status_enum"`);
 		await queryRunner.query(`DROP TABLE "server_incident"`);
diff --git a/packages/cli/src/databases/migrations/sqlite/1690000000002-MigrateIntegerKeysToString.ts b/packages/cli/src/databases/migrations/sqlite/1690000000002-MigrateIntegerKeysToString.ts
new file mode 100644
index 0000000000000..83b55787b2f51
--- /dev/null
+++ b/packages/cli/src/databases/migrations/sqlite/1690000000002-MigrateIntegerKeysToString.ts
@@ -0,0 +1,233 @@
+import { statSync } from 'fs';
+import path from 'path';
+import { Container } from 'typedi';
+import { InstanceSettings } from 'n8n-core';
+import type { MigrationContext, IrreversibleMigration } from '@db/types';
+import config from '@/config';
+
+export class MigrateIntegerKeysToString1690000000002 implements IrreversibleMigration {
+	transaction = false as const;
+
+	async up(context: MigrationContext) {
+		// eslint-disable-next-line @typescript-eslint/no-use-before-define
+		await pruneExecutionsData(context);
+
+		const { queryRunner, tablePrefix } = context;
+
+		await queryRunner.query(`
+			CREATE TABLE "${tablePrefix}TMP_workflow_entity" ("id" varchar(36) PRIMARY KEY NOT NULL, "name" varchar(128) NOT NULL, "active" boolean NOT NULL, "nodes" text, "connections" text NOT NULL, "createdAt" datetime(3) NOT NULL DEFAULT (STRFTIME('%Y-%m-%d %H:%M:%f', 'NOW')), "updatedAt" datetime(3) NOT NULL DEFAULT (STRFTIME('%Y-%m-%d %H:%M:%f', 'NOW')), "settings" text, "staticData" text, "pinData" text, "versionId" varchar(36), "triggerCount" integer NOT NULL DEFAULT 0);`);
+		await queryRunner.query(
+			`INSERT INTO "${tablePrefix}TMP_workflow_entity" (id, name, active, nodes, connections, createdAt, updatedAt, settings, staticData, pinData, triggerCount, versionId) SELECT id, name, active, nodes, connections, createdAt, updatedAt, settings, staticData, pinData, triggerCount, versionId FROM "${tablePrefix}workflow_entity";`,
+		);
+		await queryRunner.query(`DROP TABLE "${tablePrefix}workflow_entity";`);
+		await queryRunner.query(
+			`ALTER TABLE "${tablePrefix}TMP_workflow_entity" RENAME TO "${tablePrefix}workflow_entity"`,
+		);
+
+		await queryRunner.query(`
+			CREATE TABLE "${tablePrefix}TMP_tag_entity" ("id" varchar(36) PRIMARY KEY NOT NULL, "name" varchar(24) NOT NULL, "createdAt" datetime(3) NOT NULL DEFAULT (STRFTIME('%Y-%m-%d %H:%M:%f', 'NOW')), "updatedAt" datetime(3) NOT NULL DEFAULT (STRFTIME('%Y-%m-%d %H:%M:%f', 'NOW')));`);
+		await queryRunner.query(
+			`INSERT INTO "${tablePrefix}TMP_tag_entity" SELECT * FROM "${tablePrefix}tag_entity";`,
+		);
+		await queryRunner.query(`DROP TABLE "${tablePrefix}tag_entity";`);
+		await queryRunner.query(
+			`ALTER TABLE "${tablePrefix}TMP_tag_entity" RENAME TO "${tablePrefix}tag_entity";`,
+		);
+
+		await queryRunner.query(`
+			CREATE TABLE "${tablePrefix}TMP_workflows_tags" ("workflowId" varchar(36) NOT NULL, "tagId" integer NOT NULL, CONSTRAINT "FK_${tablePrefix}workflows_tags_workflow_entity" FOREIGN KEY ("workflowId") REFERENCES "${tablePrefix}workflow_entity" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_${tablePrefix}workflows_tags_tag_entity" FOREIGN KEY ("tagId") REFERENCES "${tablePrefix}tag_entity" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, PRIMARY KEY ("workflowId", "tagId"));`);
+		await queryRunner.query(
+			`INSERT INTO "${tablePrefix}TMP_workflows_tags" SELECT * FROM "${tablePrefix}workflows_tags";`,
+		);
+		await queryRunner.query(`DROP TABLE "${tablePrefix}workflows_tags";`);
+		await queryRunner.query(
+			`ALTER TABLE "${tablePrefix}TMP_workflows_tags" RENAME TO "${tablePrefix}workflows_tags";`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "idx_${tablePrefix}workflows_tags_tag_id" ON "${tablePrefix}workflows_tags" ("tagId");`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "idx_${tablePrefix}workflows_tags_workflow_id" ON "${tablePrefix}workflows_tags" ("workflowId");`,
+		);
+
+		await queryRunner.query(`CREATE TABLE "${tablePrefix}TMP_workflow_statistics" (
+				"count" INTEGER DEFAULT 0,
+				"latestEvent" DATETIME,
+				"name" VARCHAR(128) NOT NULL,
+				"workflowId" VARCHAR(36),
+				PRIMARY KEY("workflowId", "name"),
+				FOREIGN KEY("workflowId") REFERENCES "${tablePrefix}workflow_entity"("id") ON DELETE CASCADE
+			);`);
+		await queryRunner.query(
+			`INSERT INTO "${tablePrefix}TMP_workflow_statistics" SELECT * FROM "${tablePrefix}workflow_statistics";`,
+		);
+		await queryRunner.query(`DROP TABLE "${tablePrefix}workflow_statistics";`);
+		await queryRunner.query(
+			`ALTER TABLE "${tablePrefix}TMP_workflow_statistics" RENAME TO "${tablePrefix}workflow_statistics";`,
+		);
+
+		await queryRunner.query(
+			`CREATE TABLE "${tablePrefix}TMP_shared_workflow" (
+				"createdAt" datetime(3) NOT NULL DEFAULT (STRFTIME('%Y-%m-%d %H:%M:%f', 'NOW')),
+				"updatedAt" datetime(3) NOT NULL DEFAULT (STRFTIME('%Y-%m-%d %H:%M:%f', 'NOW')),
+				"roleId" integer NOT NULL, "userId" varchar NOT NULL,
+				"workflowId" VARCHAR(36) NOT NULL,
+				CONSTRAINT "FK_${tablePrefix}shared_workflow_role" FOREIGN KEY ("roleId") REFERENCES "${tablePrefix}role" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION,
+				CONSTRAINT "FK_${tablePrefix}shared_workflow_user" FOREIGN KEY ("userId") REFERENCES "${tablePrefix}user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION,
+				CONSTRAINT "FK_${tablePrefix}shared_workflow_workflow_entity" FOREIGN KEY ("workflowId") REFERENCES "${tablePrefix}workflow_entity" ("id") ON DELETE CASCADE ON UPDATE NO ACTION,
+				PRIMARY KEY ("userId", "workflowId"));`,
+		);
+
+		await queryRunner.query(
+			`INSERT INTO "${tablePrefix}TMP_shared_workflow" SELECT * FROM "${tablePrefix}shared_workflow";`,
+		);
+
+		await queryRunner.query(`DROP TABLE "${tablePrefix}shared_workflow";`);
+		await queryRunner.query(
+			`ALTER TABLE "${tablePrefix}TMP_shared_workflow" RENAME TO "${tablePrefix}shared_workflow";`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "idx_${tablePrefix}shared_workflow_workflow_id" ON "${tablePrefix}shared_workflow" ("workflowId");`,
+		);
+
+		await queryRunner.query(
+			`CREATE TABLE "${tablePrefix}TMP_webhook_entity" ("workflowId" varchar(36) NOT NULL, "webhookPath" varchar NOT NULL, "method" varchar NOT NULL, "node" varchar NOT NULL, "webhookId" varchar, "pathLength" integer, PRIMARY KEY ("webhookPath", "method"));`,
+		);
+		await queryRunner.query(
+			`INSERT INTO "${tablePrefix}TMP_webhook_entity" SELECT * FROM "${tablePrefix}webhook_entity";`,
+		);
+		await queryRunner.query(`DROP TABLE "${tablePrefix}webhook_entity";`);
+		await queryRunner.query(
+			`ALTER TABLE "${tablePrefix}TMP_webhook_entity" RENAME TO "${tablePrefix}webhook_entity";`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "idx_${tablePrefix}webhook_entity_webhook_path_method" ON "${tablePrefix}webhook_entity" ("webhookId","method","pathLength");`,
+		);
+
+		await queryRunner.query(`CREATE TABLE "${tablePrefix}TMP_execution_entity" (
+				"id" integer PRIMARY KEY AUTOINCREMENT NOT NULL,
+				"workflowId" varchar(36),
+				"finished" boolean NOT NULL,
+				"mode" varchar NOT NULL,
+				"retryOf" varchar,
+				"retrySuccessId" varchar,
+				"startedAt" datetime NOT NULL,
+				"stoppedAt" datetime,
+				"waitTill" datetime,
+				"workflowData" text NOT NULL,
+				"data" text NOT NULL, "status" varchar,
+				FOREIGN KEY("workflowId") REFERENCES "${tablePrefix}workflow_entity" ("id") ON DELETE CASCADE
+			);`);
+		await context.copyTable('execution_entity', 'TMP_execution_entity');
+		await queryRunner.query(`DROP TABLE "${tablePrefix}execution_entity";`);
+		await queryRunner.query(
+			`ALTER TABLE "${tablePrefix}TMP_execution_entity" RENAME TO "${tablePrefix}execution_entity";`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "idx_${tablePrefix}execution_entity_stopped_at" ON "${tablePrefix}execution_entity" ("stoppedAt");`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "idx_${tablePrefix}execution_entity_wait_till" ON "${tablePrefix}execution_entity" ("waitTill");`,
+		);
+
+		await queryRunner.query(
+			`CREATE TABLE "${tablePrefix}TMP_credentials_entity" ("id" varchar(36) PRIMARY KEY NOT NULL, "name" varchar(128) NOT NULL, "data" text NOT NULL, "type" varchar(32) NOT NULL, "nodesAccess" text NOT NULL, "createdAt" datetime(3) NOT NULL DEFAULT (STRFTIME('%Y-%m-%d %H:%M:%f', 'NOW')), "updatedAt" datetime(3) NOT NULL DEFAULT (STRFTIME('%Y-%m-%d %H:%M:%f', 'NOW')));`,
+		);
+		await queryRunner.query(
+			`INSERT INTO "${tablePrefix}TMP_credentials_entity" SELECT * FROM "${tablePrefix}credentials_entity";`,
+		);
+		await queryRunner.query(`DROP TABLE "${tablePrefix}credentials_entity";`);
+		await queryRunner.query(
+			`ALTER TABLE "${tablePrefix}TMP_credentials_entity" RENAME TO "${tablePrefix}credentials_entity";`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "idx_${tablePrefix}credentials_entity_type" ON "${tablePrefix}credentials_entity" ("type");`,
+		);
+
+		await queryRunner.query(
+			`CREATE TABLE "${tablePrefix}TMP_shared_credentials" ("createdAt" datetime(3) NOT NULL DEFAULT (STRFTIME('%Y-%m-%d %H:%M:%f', 'NOW')),
+			"updatedAt" datetime(3) NOT NULL DEFAULT (STRFTIME('%Y-%m-%d %H:%M:%f', 'NOW')),
+			"roleId" integer NOT NULL,
+			"userId" varchar NOT NULL, "credentialsId" varchar(36) NOT NULL,
+			CONSTRAINT "FK_${tablePrefix}shared_credentials_role" FOREIGN KEY ("roleId") REFERENCES "${tablePrefix}role" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION,
+			CONSTRAINT "FK_${tablePrefix}shared_credentials_user" FOREIGN KEY ("userId") REFERENCES "${tablePrefix}user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION,
+			CONSTRAINT "FK_${tablePrefix}shared_credentials_credentials" FOREIGN KEY ("credentialsId") REFERENCES "${tablePrefix}credentials_entity" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, PRIMARY KEY ("userId", "credentialsId"));`,
+		);
+		await queryRunner.query(
+			`INSERT INTO "${tablePrefix}TMP_shared_credentials" SELECT * FROM "${tablePrefix}shared_credentials";`,
+		);
+		await queryRunner.query(`DROP TABLE "${tablePrefix}shared_credentials";`);
+		await queryRunner.query(
+			`ALTER TABLE "${tablePrefix}TMP_shared_credentials" RENAME TO "${tablePrefix}shared_credentials";`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "idx_${tablePrefix}shared_credentials_credentials" ON "${tablePrefix}shared_credentials" ("credentialsId");`,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "idx_${tablePrefix}shared_credentials_user_credentials" ON "${tablePrefix}shared_credentials" ("userId","credentialsId");`,
+		);
+
+		await queryRunner.query(`CREATE TABLE "${tablePrefix}TMP_variables" (
+				id varchar(36) PRIMARY KEY NOT NULL,
+				"key" TEXT NOT NULL,
+				"type" TEXT NOT NULL DEFAULT ('string'),
+				value TEXT,
+				UNIQUE("key")
+			);`);
+		await queryRunner.query(
+			`INSERT INTO "${tablePrefix}TMP_variables" SELECT * FROM "${tablePrefix}variables";`,
+		);
+		await queryRunner.query(`DROP TABLE "${tablePrefix}variables";`);
+		await queryRunner.query(
+			`ALTER TABLE "${tablePrefix}TMP_variables" RENAME TO "${tablePrefix}variables";`,
+		);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "idx_${tablePrefix}variables_key" ON "${tablePrefix}variables" ("key")`,
+		);
+	}
+}
+
+const DESIRED_DATABASE_FILE_SIZE = 1 * 1024 * 1024 * 1024; // 1 GB
+const migrationsPruningEnabled = process.env.MIGRATIONS_PRUNING_ENABLED === 'true';
+
+function getSqliteDbFileSize(): number {
+	const filename = path.resolve(
+		Container.get(InstanceSettings).n8nFolder,
+		config.getEnv('database.sqlite.database'),
+	);
+	const { size } = statSync(filename);
+	return size;
+}
+
+const pruneExecutionsData = async ({ queryRunner, tablePrefix, logger }: MigrationContext) => {
+	if (migrationsPruningEnabled) {
+		const dbFileSize = getSqliteDbFileSize();
+		if (dbFileSize < DESIRED_DATABASE_FILE_SIZE) {
+			logger.debug(`DB Size not large enough to prune: ${dbFileSize}`);
+			return;
+		}
+
+		console.time('pruningData');
+		const [{ rowCount }] = (await queryRunner.query(
+			`select count(id) as rowCount from "${tablePrefix}execution_entity";`,
+		)) as Array<{ rowCount: number }>;
+
+		if (rowCount > 0) {
+			const averageExecutionSize = dbFileSize / rowCount;
+			const numberOfExecutionsToKeep = Math.floor(
+				DESIRED_DATABASE_FILE_SIZE / averageExecutionSize,
+			);
+
+			const query = `SELECT id FROM "${tablePrefix}execution_entity" ORDER BY id DESC limit ${numberOfExecutionsToKeep}, 1`;
+			const idToKeep = await queryRunner
+				.query(query)
+				.then((rows: Array<{ id: number }>) => rows[0].id);
+
+			const removalQuery = `DELETE FROM "${tablePrefix}execution_entity" WHERE id < ${idToKeep} and status IN ('success')`;
+			await queryRunner.query(removalQuery);
+		}
+		console.timeEnd('pruningData');
+	} else {
+		logger.debug('Pruning was requested, but was not enabled');
+	}
+};
diff --git a/packages/cli/src/databases/migrations/sqlite/1690000000010-SeparateExecutionData.ts b/packages/cli/src/databases/migrations/sqlite/1690000000010-SeparateExecutionData.ts
new file mode 100644
index 0000000000000..8ea0053d9fc1a
--- /dev/null
+++ b/packages/cli/src/databases/migrations/sqlite/1690000000010-SeparateExecutionData.ts
@@ -0,0 +1,46 @@
+import type { MigrationContext, ReversibleMigration } from '@db/types';
+
+export class SeparateExecutionData1690000000010 implements ReversibleMigration {
+	async up(context: MigrationContext): Promise<void> {
+		const { queryRunner, tablePrefix } = context;
+
+		await queryRunner.query(
+			`CREATE TABLE "${tablePrefix}execution_data" (
+				"executionId" int PRIMARY KEY NOT NULL,
+				"workflowData" text NOT NULL,
+				"data" text NOT NULL,
+				FOREIGN KEY("executionId") REFERENCES "${tablePrefix}execution_entity" ("id") ON DELETE CASCADE
+			)`,
+		);
+
+		await context.copyTable(
+			'execution_entity',
+			'execution_data',
+			['id', 'workflowData', 'data'],
+			['executionId', 'workflowData', 'data'],
+		);
+
+		await queryRunner.query(
+			`ALTER TABLE \`${tablePrefix}execution_entity\` DROP COLUMN "workflowData"`,
+		);
+		await queryRunner.query(`ALTER TABLE \`${tablePrefix}execution_entity\` DROP COLUMN "data"`);
+	}
+
+	async down({ queryRunner, tablePrefix }: MigrationContext): Promise<void> {
+		await queryRunner.query(
+			`ALTER TABLE \`${tablePrefix}execution_entity\` ADD COLUMN "workflowData" text NULL`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE \`${tablePrefix}execution_entity\` ADD COLUMN "data" text NULL`,
+		);
+
+		await queryRunner.query(
+			`UPDATE "${tablePrefix}execution_entity" SET "workflowData" = (SELECT "workflowData" FROM "${tablePrefix}execution_data" WHERE "${tablePrefix}execution_data"."executionId" = "${tablePrefix}execution_entity"."id")`,
+		);
+		await queryRunner.query(
+			`UPDATE "${tablePrefix}execution_entity" SET "data" = (SELECT "data" FROM "${tablePrefix}execution_data" WHERE "${tablePrefix}execution_data"."executionId" = "${tablePrefix}execution_entity"."id")`,
+		);
+
+		await queryRunner.query(`DROP TABLE "${tablePrefix}execution_data"`);
+	}
+}
diff --git a/packages/cli/src/databases/migrations/sqlite/1690000000020-FixMissingIndicesFromStringIdMigration.ts b/packages/cli/src/databases/migrations/sqlite/1690000000020-FixMissingIndicesFromStringIdMigration.ts
new file mode 100644
index 0000000000000..f950ff70da432
--- /dev/null
+++ b/packages/cli/src/databases/migrations/sqlite/1690000000020-FixMissingIndicesFromStringIdMigration.ts
@@ -0,0 +1,40 @@
+import type { IrreversibleMigration, MigrationContext } from '@db/types';
+
+export class FixMissingIndicesFromStringIdMigration1690000000020 implements IrreversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext): Promise<void> {
+		const toMerge = (await queryRunner.query(
+			`SELECT id, name, COUNT(*) c FROM ${tablePrefix}tag_entity GROUP BY name HAVING c > 1`,
+		)) as Array<{ id: string; name: string }>;
+
+		for (const m of toMerge) {
+			const tags = (await queryRunner.query(
+				`SELECT id FROM ${tablePrefix}tag_entity WHERE name = ?`,
+				[m.name],
+			)) as Array<{ id: string }>;
+			for (const t of tags) {
+				if (t.id === m.id) {
+					continue;
+				}
+				await queryRunner.query(
+					`UPDATE ${tablePrefix}workflows_tags SET tagId = ? WHERE tagId = ?`,
+					[m.id, t.id],
+				);
+				await queryRunner.query(`DELETE FROM ${tablePrefix}tag_entity WHERE id = ?`, [t.id]);
+			}
+		}
+
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_${tablePrefix}8f949d7a3a984759044054e89b" ON "${tablePrefix}tag_entity" ("name") `,
+		);
+
+		await queryRunner.query(
+			`CREATE INDEX 'IDX_${tablePrefix}b94b45ce2c73ce46c54f20b5f9' ON '${tablePrefix}execution_entity' ('waitTill', 'id');`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX 'IDX_${tablePrefix}81fc04c8a17de15835713505e4' ON '${tablePrefix}execution_entity' ('workflowId', 'id');`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX 'IDX_${tablePrefix}8b6f3f9ae234f137d707b98f3bf43584' ON '${tablePrefix}execution_entity' ('status', 'workflowId');`,
+		);
+	}
+}
diff --git a/packages/cli/src/databases/migrations/sqlite/1690000000030-RemoveResetPasswordColumns.ts b/packages/cli/src/databases/migrations/sqlite/1690000000030-RemoveResetPasswordColumns.ts
new file mode 100644
index 0000000000000..c65752d8bf16a
--- /dev/null
+++ b/packages/cli/src/databases/migrations/sqlite/1690000000030-RemoveResetPasswordColumns.ts
@@ -0,0 +1,5 @@
+import { RemoveResetPasswordColumns1690000000030 as BaseMigration } from '../common/1690000000030-RemoveResetPasswordColumns';
+
+export class RemoveResetPasswordColumns1690000000030 extends BaseMigration {
+	transaction = false as const;
+}
diff --git a/packages/cli/src/databases/migrations/sqlite/1690000000040-AddMfaColumns.ts b/packages/cli/src/databases/migrations/sqlite/1690000000040-AddMfaColumns.ts
new file mode 100644
index 0000000000000..1047f44f5fc73
--- /dev/null
+++ b/packages/cli/src/databases/migrations/sqlite/1690000000040-AddMfaColumns.ts
@@ -0,0 +1,5 @@
+import { AddMfaColumns1690000000030 as BaseMigration } from '../common/1690000000040-AddMfaColumns';
+
+export class AddMfaColumns1690000000030 extends BaseMigration {
+	transaction = false as const;
+}
diff --git a/packages/cli/src/databases/migrations/sqlite/1693491613982-ExecutionSoftDelete.ts b/packages/cli/src/databases/migrations/sqlite/1693491613982-ExecutionSoftDelete.ts
new file mode 100644
index 0000000000000..2a5dd30cf8e9d
--- /dev/null
+++ b/packages/cli/src/databases/migrations/sqlite/1693491613982-ExecutionSoftDelete.ts
@@ -0,0 +1,5 @@
+import { ExecutionSoftDelete1693491613982 as BaseMigration } from '../common/1693491613982-ExecutionSoftDelete';
+
+export class ExecutionSoftDelete1693491613982 extends BaseMigration {
+	transaction = false as const;
+}
diff --git a/packages/cli/src/databases/migrations/sqlite/1695128658538-AddWorkflowMetadata.ts b/packages/cli/src/databases/migrations/sqlite/1695128658538-AddWorkflowMetadata.ts
new file mode 100644
index 0000000000000..15cb2b72030b1
--- /dev/null
+++ b/packages/cli/src/databases/migrations/sqlite/1695128658538-AddWorkflowMetadata.ts
@@ -0,0 +1,5 @@
+import { AddWorkflowMetadata1695128658538 as BaseMigration } from '../common/1695128658538-AddWorkflowMetadata';
+
+export class AddWorkflowMetadata1695128658538 extends BaseMigration {
+	transaction = false as const;
+}
diff --git a/packages/cli/src/databases/migrations/sqlite/1705429061930-DropRoleMapping.ts b/packages/cli/src/databases/migrations/sqlite/1705429061930-DropRoleMapping.ts
new file mode 100644
index 0000000000000..73f559b7aac34
--- /dev/null
+++ b/packages/cli/src/databases/migrations/sqlite/1705429061930-DropRoleMapping.ts
@@ -0,0 +1,5 @@
+import { DropRoleMapping1705429061930 as BaseMigration } from '../common/1705429061930-DropRoleMapping';
+
+export class DropRoleMapping1705429061930 extends BaseMigration {
+	transaction = false as const;
+}
diff --git a/packages/cli/src/databases/migrations/sqlite/index.ts b/packages/cli/src/databases/migrations/sqlite/index.ts
index 5740b7e071d65..1db943b3203b5 100644
--- a/packages/cli/src/databases/migrations/sqlite/index.ts
+++ b/packages/cli/src/databases/migrations/sqlite/index.ts
@@ -1,12 +1,13 @@
+import type { Migration } from '@db/types';
 import { InitialMigration1588102412422 } from './1588102412422-InitialMigration';
 import { WebhookModel1592445003908 } from './1592445003908-WebhookModel';
 import { CreateIndexStoppedAt1594825041918 } from './1594825041918-CreateIndexStoppedAt';
 import { AddWebhookId1611071044839 } from './1611071044839-AddWebhookId';
 import { MakeStoppedAtNullable1607431743769 } from './1607431743769-MakeStoppedAtNullable';
 import { CreateTagEntity1617213344594 } from './1617213344594-CreateTagEntity';
-import { UniqueWorkflowNames1620821879465 } from './1620821879465-UniqueWorkflowNames';
+import { UniqueWorkflowNames1620821879465 } from '../common/1620821879465-UniqueWorkflowNames';
 import { AddWaitColumn1621707690587 } from './1621707690587-AddWaitColumn';
-import { UpdateWorkflowCredentials1630330987096 } from './1630330987096-UpdateWorkflowCredentials';
+import { UpdateWorkflowCredentials1630330987096 } from '../common/1630330987096-UpdateWorkflowCredentials';
 import { AddExecutionEntityIndexes1644421939510 } from './1644421939510-AddExecutionEntityIndexes';
 import { CreateUserManagement1646992772331 } from './1646992772331-CreateUserManagement';
 import { LowerCaseUserEmail1648740597343 } from './1648740597343-LowerCaseUserEmail';
@@ -14,20 +15,20 @@ import { AddUserSettings1652367743993 } from './1652367743993-AddUserSettings';
 import { CommunityNodes1652254514001 } from './1652254514001-CommunityNodes';
 import { AddAPIKeyColumn1652905585850 } from './1652905585850-AddAPIKeyColumn';
 import { IntroducePinData1654089251344 } from './1654089251344-IntroducePinData';
-import { AddNodeIds1658930531669 } from './1658930531669-AddNodeIds';
-import { AddJsonKeyPinData1659888469333 } from './1659888469333-AddJsonKeyPinData';
+import { AddNodeIds1658930531669 } from '../common/1658930531669-AddNodeIds';
+import { AddJsonKeyPinData1659888469333 } from '../common/1659888469333-AddJsonKeyPinData';
 import { CreateCredentialsUserRole1660062385367 } from './1660062385367-CreateCredentialsUserRole';
 import { CreateWorkflowsEditorRole1663755770892 } from './1663755770892-CreateWorkflowsUserRole';
 import { CreateCredentialUsageTable1665484192211 } from './1665484192211-CreateCredentialUsageTable';
 import { RemoveCredentialUsageTable1665754637024 } from './1665754637024-RemoveCredentialUsageTable';
-import { AddWorkflowVersionIdColumn1669739707124 } from './1669739707124-AddWorkflowVersionIdColumn';
+import { AddWorkflowVersionIdColumn1669739707124 } from '../common/1669739707124-AddWorkflowVersionIdColumn';
 import { WorkflowStatistics1664196174000 } from './1664196174000-WorkflowStatistics';
 import { AddTriggerCountColumn1669823906993 } from './1669823906993-AddTriggerCountColumn';
-import { RemoveWorkflowDataLoadedFlag1671726148419 } from './1671726148419-RemoveWorkflowDataLoadedFlag';
+import { RemoveWorkflowDataLoadedFlag1671726148419 } from '../common/1671726148419-RemoveWorkflowDataLoadedFlag';
 import { MessageEventBusDestinations1671535397530 } from './1671535397530-MessageEventBusDestinations';
 import { DeleteExecutionsWithWorkflows1673268682475 } from './1673268682475-DeleteExecutionsWithWorkflows';
-import { CreateLdapEntities1674509946020 } from './1674509946020-CreateLdapEntities';
-import { PurgeInvalidWorkflowConnections1675940580449 } from './1675940580449-PurgeInvalidWorkflowConnections';
+import { CreateLdapEntities1674509946020 } from '../common/1674509946020-CreateLdapEntities';
+import { PurgeInvalidWorkflowConnections1675940580449 } from '../common/1675940580449-PurgeInvalidWorkflowConnections';
 import { AddStatusToExecutions1674138566000 } from './1674138566000-AddStatusToExecutions';
 import { MigrateExecutionStatus1676996103000 } from './1676996103000-MigrateExecutionStatus';
 import { UpdateRunningExecutionStatus1677237073720 } from './1677237073720-UpdateRunningExecutionStatus';
@@ -37,8 +38,25 @@ import { AddUserActivatedProperty1681134145996 } from './1681134145996-AddUserAc
 import { AddUserOTPSecret1681134145997 } from './1681134145997-AddUserOTPSecret';
 import { AddSaveRequestLog1681134145998 } from './1681134145998-AddSaveRequestLog';
 import { addIncidentHandlingTables1689942863738 } from './1689942863738-addIncidentHandlingTables';
+import { MigrateIntegerKeysToString1690000000002 } from './1690000000002-MigrateIntegerKeysToString';
+import { SeparateExecutionData1690000000010 } from './1690000000010-SeparateExecutionData';
+import { RemoveSkipOwnerSetup1681134145997 } from './1681134145997-RemoveSkipOwnerSetup';
+import { FixMissingIndicesFromStringIdMigration1690000000020 } from './1690000000020-FixMissingIndicesFromStringIdMigration';
+import { RemoveResetPasswordColumns1690000000030 } from './1690000000030-RemoveResetPasswordColumns';
+import { CreateWorkflowNameIndex1691088862123 } from '../common/1691088862123-CreateWorkflowNameIndex';
+import { AddMfaColumns1690000000030 } from './1690000000040-AddMfaColumns';
+import { CreateWorkflowHistoryTable1692967111175 } from '../common/1692967111175-CreateWorkflowHistoryTable';
+import { DisallowOrphanExecutions1693554410387 } from '../common/1693554410387-DisallowOrphanExecutions';
+import { ExecutionSoftDelete1693491613982 } from './1693491613982-ExecutionSoftDelete';
+import { AddWorkflowMetadata1695128658538 } from '../common/1695128658538-AddWorkflowMetadata';
+import { ModifyWorkflowHistoryNodesAndConnections1695829275184 } from '../common/1695829275184-ModifyWorkflowHistoryNodesAndConnections';
+import { AddGlobalAdminRole1700571993961 } from '../common/1700571993961-AddGlobalAdminRole';
+import { DropRoleMapping1705429061930 } from './1705429061930-DropRoleMapping';
+import { RemoveFailedExecutionStatus1711018413374 } from '../common/1711018413374-RemoveFailedExecutionStatus';
+import { MoveSshKeysToDatabase1711390882123 } from '../common/1711390882123-MoveSshKeysToDatabase';
+import { RemoveNodesAccess1712044305787 } from '../common/1712044305787-RemoveNodesAccess';
 
-const sqliteMigrations = [
+const sqliteMigrations: Migration[] = [
 	InitialMigration1588102412422,
 	WebhookModel1592445003908,
 	CreateIndexStoppedAt1594825041918,
@@ -78,6 +96,23 @@ const sqliteMigrations = [
 	AddUserOTPSecret1681134145997,
 	AddSaveRequestLog1681134145998,
 	addIncidentHandlingTables1689942863738,
+	MigrateIntegerKeysToString1690000000002,
+	SeparateExecutionData1690000000010,
+	RemoveSkipOwnerSetup1681134145997,
+	FixMissingIndicesFromStringIdMigration1690000000020,
+	RemoveResetPasswordColumns1690000000030,
+	CreateWorkflowNameIndex1691088862123,
+	AddMfaColumns1690000000030,
+	CreateWorkflowHistoryTable1692967111175,
+	DisallowOrphanExecutions1693554410387,
+	ExecutionSoftDelete1693491613982,
+	AddWorkflowMetadata1695128658538,
+	ModifyWorkflowHistoryNodesAndConnections1695829275184,
+	AddGlobalAdminRole1700571993961,
+	DropRoleMapping1705429061930,
+	RemoveFailedExecutionStatus1711018413374,
+	MoveSshKeysToDatabase1711390882123,
+	RemoveNodesAccess1712044305787,
 ];
 
 export { sqliteMigrations };
diff --git a/packages/cli/src/databases/ormconfig.ts b/packages/cli/src/databases/ormconfig.ts
deleted file mode 100644
index dced87e075678..0000000000000
--- a/packages/cli/src/databases/ormconfig.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import {
-	getMariaDBConnectionOptions,
-	getMysqlConnectionOptions,
-	getPostgresConnectionOptions,
-	getSqliteConnectionOptions,
-} from './config';
-
-export default [
-	getSqliteConnectionOptions(),
-	getPostgresConnectionOptions(),
-	getMysqlConnectionOptions(),
-	getMariaDBConnectionOptions(),
-];
diff --git a/packages/cli/src/databases/repositories/authIdentity.repository.ts b/packages/cli/src/databases/repositories/authIdentity.repository.ts
index 6ec5fe2310b85..d285d6858204e 100644
--- a/packages/cli/src/databases/repositories/authIdentity.repository.ts
+++ b/packages/cli/src/databases/repositories/authIdentity.repository.ts
@@ -1,5 +1,5 @@
 import { Service } from 'typedi';
-import { DataSource, Repository } from 'typeorm';
+import { DataSource, Repository } from '@n8n/typeorm';
 import { AuthIdentity } from '../entities/AuthIdentity';
 
 @Service()
diff --git a/packages/cli/src/databases/repositories/authProviderSyncHistory.repository.ts b/packages/cli/src/databases/repositories/authProviderSyncHistory.repository.ts
index 092f4273ee00e..86bacfae1b43c 100644
--- a/packages/cli/src/databases/repositories/authProviderSyncHistory.repository.ts
+++ b/packages/cli/src/databases/repositories/authProviderSyncHistory.repository.ts
@@ -1,5 +1,5 @@
 import { Service } from 'typedi';
-import { DataSource, Repository } from 'typeorm';
+import { DataSource, Repository } from '@n8n/typeorm';
 import { AuthProviderSyncHistory } from '../entities/AuthProviderSyncHistory';
 
 @Service()
diff --git a/packages/cli/src/databases/repositories/credentials.repository.ts b/packages/cli/src/databases/repositories/credentials.repository.ts
index 43bc18dfb128b..02ed714cad395 100644
--- a/packages/cli/src/databases/repositories/credentials.repository.ts
+++ b/packages/cli/src/databases/repositories/credentials.repository.ts
@@ -1,10 +1,89 @@
 import { Service } from 'typedi';
-import { DataSource, Repository } from 'typeorm';
+import { DataSource, In, Not, Repository, Like } from '@n8n/typeorm';
+import type { FindManyOptions, DeleteResult, EntityManager, FindOptionsWhere } from '@n8n/typeorm';
 import { CredentialsEntity } from '../entities/CredentialsEntity';
+import { SharedCredentials } from '../entities/SharedCredentials';
+import type { ListQuery } from '@/requests';
 
 @Service()
 export class CredentialsRepository extends Repository<CredentialsEntity> {
 	constructor(dataSource: DataSource) {
 		super(CredentialsEntity, dataSource.manager);
 	}
+
+	async pruneSharings(
+		transaction: EntityManager,
+		credentialId: string,
+		userIds: string[],
+	): Promise<DeleteResult> {
+		const conditions: FindOptionsWhere<SharedCredentials> = {
+			credentialsId: credentialId,
+			userId: Not(In(userIds)),
+		};
+		return await transaction.delete(SharedCredentials, conditions);
+	}
+
+	async findStartingWith(credentialName: string) {
+		return await this.find({
+			select: ['name'],
+			where: { name: Like(`${credentialName}%`) },
+		});
+	}
+
+	async findMany(listQueryOptions?: ListQuery.Options, credentialIds?: string[]) {
+		const findManyOptions = this.toFindManyOptions(listQueryOptions);
+
+		if (credentialIds) {
+			findManyOptions.where = { ...findManyOptions.where, id: In(credentialIds) };
+		}
+
+		return await this.find(findManyOptions);
+	}
+
+	private toFindManyOptions(listQueryOptions?: ListQuery.Options) {
+		const findManyOptions: FindManyOptions<CredentialsEntity> = {};
+
+		type Select = Array<keyof CredentialsEntity>;
+
+		const defaultRelations = ['shared', 'shared.user'];
+		const defaultSelect: Select = ['id', 'name', 'type', 'createdAt', 'updatedAt'];
+
+		if (!listQueryOptions) return { select: defaultSelect, relations: defaultRelations };
+
+		const { filter, select, take, skip } = listQueryOptions;
+
+		if (typeof filter?.name === 'string' && filter?.name !== '') {
+			filter.name = Like(`%${filter.name}%`);
+		}
+
+		if (typeof filter?.type === 'string' && filter?.type !== '') {
+			filter.type = Like(`%${filter.type}%`);
+		}
+
+		if (filter) findManyOptions.where = filter;
+		if (select) findManyOptions.select = select;
+		if (take) findManyOptions.take = take;
+		if (skip) findManyOptions.skip = skip;
+
+		if (take && select && !select?.id) {
+			findManyOptions.select = { ...findManyOptions.select, id: true }; // pagination requires id
+		}
+
+		if (!findManyOptions.select) {
+			findManyOptions.select = defaultSelect;
+			findManyOptions.relations = defaultRelations;
+		}
+
+		return findManyOptions;
+	}
+
+	async getManyByIds(ids: string[], { withSharings } = { withSharings: false }) {
+		const findManyOptions: FindManyOptions<CredentialsEntity> = { where: { id: In(ids) } };
+
+		if (withSharings) {
+			findManyOptions.relations = ['shared', 'shared.user'];
+		}
+
+		return await this.find(findManyOptions);
+	}
 }
diff --git a/packages/cli/src/databases/repositories/esaEnumData.repository.ts b/packages/cli/src/databases/repositories/esaEnumData.repository.ts
new file mode 100644
index 0000000000000..54d59a08f408f
--- /dev/null
+++ b/packages/cli/src/databases/repositories/esaEnumData.repository.ts
@@ -0,0 +1,10 @@
+import { Service } from 'typedi';
+import { DataSource, Repository } from '@n8n/typeorm';
+import { EsaEnumData } from '../entities/EsaEnumData';
+
+@Service()
+export class EsaEnumDataRepository extends Repository<EsaEnumData> {
+	constructor(dataSource: DataSource) {
+		super(EsaEnumData, dataSource.manager);
+	}
+}
diff --git a/packages/cli/src/databases/repositories/esaEnums.repository.ts b/packages/cli/src/databases/repositories/esaEnums.repository.ts
new file mode 100644
index 0000000000000..3fdd0631846b8
--- /dev/null
+++ b/packages/cli/src/databases/repositories/esaEnums.repository.ts
@@ -0,0 +1,10 @@
+import { Service } from 'typedi';
+import { DataSource, Repository } from '@n8n/typeorm';
+import { EsaEnums } from '../entities/EsaEnums';
+
+@Service()
+export class EsaEnumsRepository extends Repository<EsaEnums> {
+	constructor(dataSource: DataSource) {
+		super(EsaEnums, dataSource.manager);
+	}
+}
diff --git a/packages/cli/src/databases/repositories/eventDestinations.repository.ts b/packages/cli/src/databases/repositories/eventDestinations.repository.ts
index 627a9638f18e5..98882bbb509c9 100644
--- a/packages/cli/src/databases/repositories/eventDestinations.repository.ts
+++ b/packages/cli/src/databases/repositories/eventDestinations.repository.ts
@@ -1,5 +1,5 @@
 import { Service } from 'typedi';
-import { DataSource, Repository } from 'typeorm';
+import { DataSource, Repository } from '@n8n/typeorm';
 import { EventDestinations } from '../entities/EventDestinations';
 
 @Service()
diff --git a/packages/cli/src/databases/repositories/execution.repository.ts b/packages/cli/src/databases/repositories/execution.repository.ts
index bc332ed96609e..8043ee5e5d396 100644
--- a/packages/cli/src/databases/repositories/execution.repository.ts
+++ b/packages/cli/src/databases/repositories/execution.repository.ts
@@ -1,10 +1,747 @@
 import { Service } from 'typedi';
-import { DataSource, Repository } from 'typeorm';
+import {
+	Brackets,
+	DataSource,
+	In,
+	IsNull,
+	LessThan,
+	LessThanOrEqual,
+	MoreThanOrEqual,
+	Not,
+	Raw,
+	Repository,
+} from '@n8n/typeorm';
+import { DateUtils } from '@n8n/typeorm/util/DateUtils';
+import type {
+	FindManyOptions,
+	FindOneOptions,
+	FindOperator,
+	FindOptionsWhere,
+	SelectQueryBuilder,
+} from '@n8n/typeorm';
+import { parse, stringify } from 'flatted';
+import {
+	ApplicationError,
+	type ExecutionStatus,
+	type ExecutionSummary,
+	type IRunExecutionData,
+} from 'n8n-workflow';
+import { BinaryDataService } from 'n8n-core';
+import type {
+	ExecutionPayload,
+	IExecutionBase,
+	IExecutionFlattedDb,
+	IExecutionResponse,
+} from '@/Interfaces';
+
+import config from '@/config';
+import { isAdvancedExecutionFiltersEnabled } from '@/executions/executionHelpers';
+import type { ExecutionData } from '../entities/ExecutionData';
 import { ExecutionEntity } from '../entities/ExecutionEntity';
+import { ExecutionMetadata } from '../entities/ExecutionMetadata';
+import { ExecutionDataRepository } from './executionData.repository';
+import { Logger } from '@/Logger';
+import type { ExecutionSummaries } from '@/executions/execution.types';
+import { PostgresLiveRowsRetrievalError } from '@/errors/postgres-live-rows-retrieval.error';
+
+export interface IGetExecutionsQueryFilter {
+	id?: FindOperator<string> | string;
+	finished?: boolean;
+	mode?: string;
+	retryOf?: string;
+	retrySuccessId?: string;
+	status?: ExecutionStatus[];
+	workflowId?: string;
+	waitTill?: FindOperator<any> | boolean;
+	metadata?: Array<{ key: string; value: string }>;
+	startedAfter?: string;
+	startedBefore?: string;
+}
+
+function parseFiltersToQueryBuilder(
+	qb: SelectQueryBuilder<ExecutionEntity>,
+	filters?: IGetExecutionsQueryFilter,
+) {
+	if (filters?.status) {
+		qb.andWhere('execution.status IN (:...workflowStatus)', {
+			workflowStatus: filters.status,
+		});
+	}
+	if (filters?.finished) {
+		qb.andWhere({ finished: filters.finished });
+	}
+	if (filters?.metadata && isAdvancedExecutionFiltersEnabled()) {
+		qb.leftJoin(ExecutionMetadata, 'md', 'md.executionId = execution.id');
+		for (const md of filters.metadata) {
+			qb.andWhere('md.key = :key AND md.value = :value', md);
+		}
+	}
+	if (filters?.startedAfter) {
+		qb.andWhere({
+			startedAt: MoreThanOrEqual(
+				DateUtils.mixedDateToUtcDatetimeString(new Date(filters.startedAfter)),
+			),
+		});
+	}
+	if (filters?.startedBefore) {
+		qb.andWhere({
+			startedAt: LessThanOrEqual(
+				DateUtils.mixedDateToUtcDatetimeString(new Date(filters.startedBefore)),
+			),
+		});
+	}
+	if (filters?.workflowId) {
+		qb.andWhere({
+			workflowId: filters.workflowId,
+		});
+	}
+}
+
+const lessThanOrEqual = (date: string): unknown => {
+	return LessThanOrEqual(DateUtils.mixedDateToUtcDatetimeString(new Date(date)));
+};
+
+const moreThanOrEqual = (date: string): unknown => {
+	return MoreThanOrEqual(DateUtils.mixedDateToUtcDatetimeString(new Date(date)));
+};
 
 @Service()
 export class ExecutionRepository extends Repository<ExecutionEntity> {
-	constructor(dataSource: DataSource) {
+	private hardDeletionBatchSize = 100;
+
+	constructor(
+		dataSource: DataSource,
+		private readonly logger: Logger,
+		private readonly executionDataRepository: ExecutionDataRepository,
+		private readonly binaryDataService: BinaryDataService,
+	) {
 		super(ExecutionEntity, dataSource.manager);
 	}
+
+	async findMultipleExecutions(
+		queryParams: FindManyOptions<ExecutionEntity>,
+		options?: {
+			unflattenData: true;
+			includeData?: true;
+		},
+	): Promise<IExecutionResponse[]>;
+	async findMultipleExecutions(
+		queryParams: FindManyOptions<ExecutionEntity>,
+		options?: {
+			unflattenData?: false | undefined;
+			includeData?: true;
+		},
+	): Promise<IExecutionFlattedDb[]>;
+	async findMultipleExecutions(
+		queryParams: FindManyOptions<ExecutionEntity>,
+		options?: {
+			unflattenData?: boolean;
+			includeData?: boolean;
+		},
+	): Promise<IExecutionBase[]>;
+	async findMultipleExecutions(
+		queryParams: FindManyOptions<ExecutionEntity>,
+		options?: {
+			unflattenData?: boolean;
+			includeData?: boolean;
+		},
+	): Promise<IExecutionFlattedDb[] | IExecutionResponse[] | IExecutionBase[]> {
+		if (options?.includeData) {
+			if (!queryParams.relations) {
+				queryParams.relations = [];
+			}
+			(queryParams.relations as string[]).push('executionData');
+		}
+
+		const executions = await this.find(queryParams);
+
+		if (options?.includeData && options?.unflattenData) {
+			return executions.map((execution) => {
+				const { executionData, ...rest } = execution;
+				return {
+					...rest,
+					data: parse(executionData.data) as IRunExecutionData,
+					workflowData: executionData.workflowData,
+				} as IExecutionResponse;
+			});
+		} else if (options?.includeData) {
+			return executions.map((execution) => {
+				const { executionData, ...rest } = execution;
+				return {
+					...rest,
+					data: execution.executionData.data,
+					workflowData: execution.executionData.workflowData,
+				} as IExecutionFlattedDb;
+			});
+		}
+
+		return executions.map((execution) => {
+			const { executionData, ...rest } = execution;
+			return rest;
+		});
+	}
+
+	async findSingleExecution(
+		id: string,
+		options?: {
+			includeData: true;
+			unflattenData: true;
+			where?: FindOptionsWhere<ExecutionEntity>;
+		},
+	): Promise<IExecutionResponse | undefined>;
+	async findSingleExecution(
+		id: string,
+		options?: {
+			includeData: true;
+			unflattenData?: false | undefined;
+			where?: FindOptionsWhere<ExecutionEntity>;
+		},
+	): Promise<IExecutionFlattedDb | undefined>;
+	async findSingleExecution(
+		id: string,
+		options?: {
+			includeData?: boolean;
+			unflattenData?: boolean;
+			where?: FindOptionsWhere<ExecutionEntity>;
+		},
+	): Promise<IExecutionBase | undefined>;
+	async findSingleExecution(
+		id: string,
+		options?: {
+			includeData?: boolean;
+			unflattenData?: boolean;
+			where?: FindOptionsWhere<ExecutionEntity>;
+		},
+	): Promise<IExecutionFlattedDb | IExecutionResponse | IExecutionBase | undefined> {
+		const findOptions: FindOneOptions<ExecutionEntity> = {
+			where: {
+				id,
+				...options?.where,
+			},
+		};
+		if (options?.includeData) {
+			findOptions.relations = ['executionData'];
+		}
+
+		const execution = await this.findOne(findOptions);
+
+		if (!execution) {
+			return undefined;
+		}
+
+		const { executionData, ...rest } = execution;
+
+		if (options?.includeData && options?.unflattenData) {
+			return {
+				...rest,
+				data: parse(execution.executionData.data) as IRunExecutionData,
+				workflowData: execution.executionData.workflowData,
+			} as IExecutionResponse;
+		} else if (options?.includeData) {
+			return {
+				...rest,
+				data: execution.executionData.data,
+				workflowData: execution.executionData.workflowData,
+			} as IExecutionFlattedDb;
+		}
+
+		return rest;
+	}
+
+	async createNewExecution(execution: ExecutionPayload): Promise<string> {
+		const { data, workflowData, ...rest } = execution;
+		const { identifiers: inserted } = await this.insert(rest);
+		const { id: executionId } = inserted[0] as { id: string };
+		const { connections, nodes, name, settings } = workflowData ?? {};
+		await this.executionDataRepository.insert({
+			executionId,
+			workflowData: { connections, nodes, name, settings, id: workflowData.id },
+			data: stringify(data),
+		});
+		return String(executionId);
+	}
+
+	async markAsCrashed(executionIds: string[]) {
+		await this.update(
+			{ id: In(executionIds) },
+			{
+				status: 'crashed',
+				stoppedAt: new Date(),
+			},
+		);
+	}
+
+	/**
+	 * Permanently remove a single execution and its binary data.
+	 */
+	async hardDelete(ids: { workflowId: string; executionId: string }) {
+		return await Promise.all([
+			this.delete(ids.executionId),
+			this.binaryDataService.deleteMany([ids]),
+		]);
+	}
+
+	async updateStatus(executionId: string, status: ExecutionStatus) {
+		await this.update({ id: executionId }, { status });
+	}
+
+	async updateExistingExecution(executionId: string, execution: Partial<IExecutionResponse>) {
+		// Se isolate startedAt because it must be set when the execution starts and should never change.
+		// So we prevent updating it, if it's sent (it usually is and causes problems to executions that
+		// are resumed after waiting for some time, as a new startedAt is set)
+		const { id, data, workflowId, workflowData, startedAt, ...executionInformation } = execution;
+		if (Object.keys(executionInformation).length > 0) {
+			await this.update({ id: executionId }, executionInformation);
+		}
+
+		if (data || workflowData) {
+			const executionData: Partial<ExecutionData> = {};
+			if (workflowData) {
+				executionData.workflowData = workflowData;
+			}
+			if (data) {
+				executionData.data = stringify(data);
+			}
+			// @ts-ignore
+			await this.executionDataRepository.update({ executionId }, executionData);
+		}
+	}
+
+	async deleteExecutionsByFilter(
+		filters: IGetExecutionsQueryFilter | undefined,
+		accessibleWorkflowIds: string[],
+		deleteConditions: {
+			deleteBefore?: Date;
+			ids?: string[];
+		},
+	) {
+		if (!deleteConditions?.deleteBefore && !deleteConditions?.ids) {
+			throw new ApplicationError(
+				'Either "deleteBefore" or "ids" must be present in the request body',
+			);
+		}
+
+		const query = this.createQueryBuilder('execution')
+			.select(['execution.id', 'execution.workflowId'])
+			.andWhere('execution.workflowId IN (:...accessibleWorkflowIds)', { accessibleWorkflowIds });
+
+		if (deleteConditions.deleteBefore) {
+			// delete executions by date, if user may access the underlying workflows
+			query.andWhere('execution.startedAt <= :deleteBefore', {
+				deleteBefore: deleteConditions.deleteBefore,
+			});
+			// Filters are only used when filtering by date
+			parseFiltersToQueryBuilder(query, filters);
+		} else if (deleteConditions.ids) {
+			// delete executions by IDs, if user may access the underlying workflows
+			query.andWhere('execution.id IN (:...executionIds)', { executionIds: deleteConditions.ids });
+		}
+
+		const executions = await query.getMany();
+
+		if (!executions.length) {
+			if (deleteConditions.ids) {
+				this.logger.error('Failed to delete an execution due to insufficient permissions', {
+					executionIds: deleteConditions.ids,
+				});
+			}
+			return;
+		}
+
+		const ids = executions.map(({ id, workflowId }) => ({
+			executionId: id,
+			workflowId,
+		}));
+
+		do {
+			// Delete in batches to avoid "SQLITE_ERROR: Expression tree is too large (maximum depth 1000)" error
+			const batch = ids.splice(0, this.hardDeletionBatchSize);
+			await Promise.all([
+				this.delete(batch.map(({ executionId }) => executionId)),
+				this.binaryDataService.deleteMany(batch),
+			]);
+		} while (ids.length > 0);
+	}
+
+	async getIdsSince(date: Date) {
+		return await this.find({
+			select: ['id'],
+			where: {
+				startedAt: MoreThanOrEqual(DateUtils.mixedDateToUtcDatetimeString(date)),
+			},
+		}).then((executions) => executions.map(({ id }) => id));
+	}
+
+	async softDeletePrunableExecutions() {
+		const maxAge = config.getEnv('executions.pruneDataMaxAge'); // in h
+		const maxCount = config.getEnv('executions.pruneDataMaxCount');
+
+		// Find ids of all executions that were stopped longer that pruneDataMaxAge ago
+		const date = new Date();
+		date.setHours(date.getHours() - maxAge);
+
+		const toPrune: Array<FindOptionsWhere<ExecutionEntity>> = [
+			// date reformatting needed - see https://github.com/typeorm/typeorm/issues/2286
+			{ stoppedAt: LessThanOrEqual(DateUtils.mixedDateToUtcDatetimeString(date)) },
+		];
+
+		if (maxCount > 0) {
+			const executions = await this.find({
+				select: ['id'],
+				skip: maxCount,
+				take: 1,
+				order: { id: 'DESC' },
+			});
+
+			if (executions[0]) {
+				toPrune.push({ id: LessThanOrEqual(executions[0].id) });
+			}
+		}
+
+		const [timeBasedWhere, countBasedWhere] = toPrune;
+
+		return await this.createQueryBuilder()
+			.update(ExecutionEntity)
+			.set({ deletedAt: new Date() })
+			.where({
+				deletedAt: IsNull(),
+				// Only mark executions as deleted if they are in an end state
+				status: Not(In(['new', 'running', 'waiting'])),
+			})
+			.andWhere(
+				new Brackets((qb) =>
+					countBasedWhere
+						? qb.where(timeBasedWhere).orWhere(countBasedWhere)
+						: qb.where(timeBasedWhere),
+				),
+			)
+			.execute();
+	}
+
+	async hardDeleteSoftDeletedExecutions() {
+		const date = new Date();
+		date.setHours(date.getHours() - config.getEnv('executions.pruneDataHardDeleteBuffer'));
+
+		const workflowIdsAndExecutionIds = (
+			await this.find({
+				select: ['workflowId', 'id'],
+				where: {
+					deletedAt: LessThanOrEqual(DateUtils.mixedDateToUtcDatetimeString(date)),
+				},
+				take: this.hardDeletionBatchSize,
+
+				/**
+				 * @important This ensures soft-deleted executions are included,
+				 * else `@DeleteDateColumn()` at `deletedAt` will exclude them.
+				 */
+				withDeleted: true,
+			})
+		).map(({ id: executionId, workflowId }) => ({ workflowId, executionId }));
+
+		return workflowIdsAndExecutionIds;
+	}
+
+	async deleteByIds(executionIds: string[]) {
+		return await this.delete({ id: In(executionIds) });
+	}
+
+	async getWaitingExecutions() {
+		// Find all the executions which should be triggered in the next 70 seconds
+		const waitTill = new Date(Date.now() + 70000);
+		const where: FindOptionsWhere<ExecutionEntity> = {
+			waitTill: LessThanOrEqual(waitTill),
+			status: Not('crashed'),
+		};
+
+		const dbType = config.getEnv('database.type');
+		if (dbType === 'sqlite') {
+			// This is needed because of issue in TypeORM <> SQLite:
+			// https://github.com/typeorm/typeorm/issues/2286
+			where.waitTill = LessThanOrEqual(DateUtils.mixedDateToUtcDatetimeString(waitTill));
+		}
+
+		return await this.findMultipleExecutions({
+			select: ['id', 'waitTill'],
+			where,
+			order: {
+				waitTill: 'ASC',
+			},
+		});
+	}
+
+	async getExecutionsCountForPublicApi(data: {
+		limit: number;
+		lastId?: string;
+		workflowIds?: string[];
+		status?: ExecutionStatus;
+		excludedWorkflowIds?: string[];
+	}): Promise<number> {
+		const executions = await this.count({
+			where: {
+				...(data.lastId && { id: LessThan(data.lastId) }),
+				...(data.status && { ...this.getStatusCondition(data.status) }),
+				...(data.workflowIds && { workflowId: In(data.workflowIds) }),
+				...(data.excludedWorkflowIds && { workflowId: Not(In(data.excludedWorkflowIds)) }),
+			},
+			take: data.limit,
+		});
+
+		return executions;
+	}
+
+	private getStatusCondition(status: ExecutionStatus) {
+		const condition: Pick<FindOptionsWhere<IExecutionFlattedDb>, 'status'> = {};
+
+		if (status === 'success') {
+			condition.status = 'success';
+		} else if (status === 'waiting') {
+			condition.status = 'waiting';
+		} else if (status === 'error') {
+			condition.status = In(['error', 'crashed']);
+		}
+
+		return condition;
+	}
+
+	async getExecutionsForPublicApi(params: {
+		limit: number;
+		includeData?: boolean;
+		lastId?: string;
+		workflowIds?: string[];
+		status?: ExecutionStatus;
+		excludedExecutionsIds?: string[];
+	}): Promise<IExecutionBase[]> {
+		let where: FindOptionsWhere<IExecutionFlattedDb> = {};
+
+		if (params.lastId && params.excludedExecutionsIds?.length) {
+			where.id = Raw((id) => `${id} < :lastId AND ${id} NOT IN (:...excludedExecutionsIds)`, {
+				lastId: params.lastId,
+				excludedExecutionsIds: params.excludedExecutionsIds,
+			});
+		} else if (params.lastId) {
+			where.id = LessThan(params.lastId);
+		} else if (params.excludedExecutionsIds?.length) {
+			where.id = Not(In(params.excludedExecutionsIds));
+		}
+
+		if (params.status) {
+			where = { ...where, ...this.getStatusCondition(params.status) };
+		}
+
+		if (params.workflowIds) {
+			where = { ...where, workflowId: In(params.workflowIds) };
+		}
+
+		return await this.findMultipleExecutions(
+			{
+				select: [
+					'id',
+					'mode',
+					'retryOf',
+					'retrySuccessId',
+					'startedAt',
+					'stoppedAt',
+					'workflowId',
+					'waitTill',
+					'finished',
+				],
+				where,
+				order: { id: 'DESC' },
+				take: params.limit,
+				relations: ['executionData'],
+			},
+			{
+				includeData: params.includeData,
+				unflattenData: true,
+			},
+		);
+	}
+
+	async getExecutionInWorkflowsForPublicApi(
+		id: string,
+		workflowIds: string[],
+		includeData?: boolean,
+	): Promise<IExecutionBase | undefined> {
+		return await this.findSingleExecution(id, {
+			where: {
+				workflowId: In(workflowIds),
+			},
+			includeData,
+			unflattenData: true,
+		});
+	}
+
+	async findWithUnflattenedData(executionId: string, accessibleWorkflowIds: string[]) {
+		return await this.findSingleExecution(executionId, {
+			where: {
+				workflowId: In(accessibleWorkflowIds),
+			},
+			includeData: true,
+			unflattenData: true,
+		});
+	}
+
+	async findIfShared(executionId: string, sharedWorkflowIds: string[]) {
+		return await this.findSingleExecution(executionId, {
+			where: {
+				workflowId: In(sharedWorkflowIds),
+			},
+			includeData: true,
+			unflattenData: false,
+		});
+	}
+
+	async findIfAccessible(executionId: string, accessibleWorkflowIds: string[]) {
+		return await this.findSingleExecution(executionId, {
+			where: { workflowId: In(accessibleWorkflowIds) },
+		});
+	}
+
+	// ----------------------------------
+	//            new API
+	// ----------------------------------
+
+	/**
+	 * Fields to include in the summary of an execution when querying for many.
+	 */
+	private summaryFields = {
+		id: true,
+		workflowId: true,
+		mode: true,
+		retryOf: true,
+		status: true,
+		startedAt: true,
+		stoppedAt: true,
+	};
+
+	async findManyByRangeQuery(query: ExecutionSummaries.RangeQuery): Promise<ExecutionSummary[]> {
+		if (query?.accessibleWorkflowIds?.length === 0) {
+			throw new ApplicationError('Expected accessible workflow IDs');
+		}
+
+		const executions: ExecutionSummary[] = await this.toQueryBuilder(query).getRawMany();
+
+		return executions.map((execution) => this.toSummary(execution));
+	}
+
+	// @tech_debt: These transformations should not be needed
+	private toSummary(execution: {
+		id: number | string;
+		startedAt?: Date | string;
+		stoppedAt?: Date | string;
+		waitTill?: Date | string | null;
+	}): ExecutionSummary {
+		execution.id = execution.id.toString();
+
+		const normalizeDateString = (date: string) => {
+			if (date.includes(' ')) return date.replace(' ', 'T') + 'Z';
+			return date;
+		};
+
+		if (execution.startedAt) {
+			execution.startedAt =
+				execution.startedAt instanceof Date
+					? execution.startedAt.toISOString()
+					: normalizeDateString(execution.startedAt);
+		}
+
+		if (execution.waitTill) {
+			execution.waitTill =
+				execution.waitTill instanceof Date
+					? execution.waitTill.toISOString()
+					: normalizeDateString(execution.waitTill);
+		}
+
+		if (execution.stoppedAt) {
+			execution.stoppedAt =
+				execution.stoppedAt instanceof Date
+					? execution.stoppedAt.toISOString()
+					: normalizeDateString(execution.stoppedAt);
+		}
+
+		return execution as ExecutionSummary;
+	}
+
+	async fetchCount(query: ExecutionSummaries.CountQuery) {
+		return await this.toQueryBuilder(query).getCount();
+	}
+
+	async getLiveExecutionRowsOnPostgres() {
+		const tableName = `${config.getEnv('database.tablePrefix')}execution_entity`;
+
+		const pgSql = `SELECT n_live_tup as result FROM pg_stat_all_tables WHERE relname = '${tableName}';`;
+
+		try {
+			const rows = (await this.query(pgSql)) as Array<{ result: string }>;
+
+			if (rows.length !== 1) throw new PostgresLiveRowsRetrievalError(rows);
+
+			const [row] = rows;
+
+			return parseInt(row.result, 10);
+		} catch (error) {
+			if (error instanceof Error) this.logger.error(error.message, { error });
+
+			return -1;
+		}
+	}
+
+	private toQueryBuilder(query: ExecutionSummaries.Query) {
+		const {
+			accessibleWorkflowIds,
+			status,
+			finished,
+			workflowId,
+			startedBefore,
+			startedAfter,
+			metadata,
+		} = query;
+
+		const fields = Object.keys(this.summaryFields)
+			.concat(['waitTill', 'retrySuccessId'])
+			.map((key) => `execution.${key} AS "${key}"`)
+			.concat('workflow.name AS "workflowName"');
+
+		const qb = this.createQueryBuilder('execution')
+			.select(fields)
+			.innerJoin('execution.workflow', 'workflow')
+			.where('execution.workflowId IN (:...accessibleWorkflowIds)', { accessibleWorkflowIds });
+
+		if (query.kind === 'range') {
+			const { limit, firstId, lastId } = query.range;
+
+			qb.limit(limit);
+
+			if (firstId) qb.andWhere('execution.id > :firstId', { firstId });
+			if (lastId) qb.andWhere('execution.id < :lastId', { lastId });
+
+			if (query.order?.stoppedAt === 'DESC') {
+				qb.orderBy({ 'execution.stoppedAt': 'DESC' });
+			} else {
+				qb.orderBy({ 'execution.id': 'DESC' });
+			}
+		}
+
+		if (status) qb.andWhere('execution.status IN (:...status)', { status });
+		if (finished) qb.andWhere({ finished });
+		if (workflowId) qb.andWhere({ workflowId });
+		if (startedBefore) qb.andWhere({ startedAt: lessThanOrEqual(startedBefore) });
+		if (startedAfter) qb.andWhere({ startedAt: moreThanOrEqual(startedAfter) });
+
+		if (metadata) {
+			qb.leftJoin(ExecutionMetadata, 'md', 'md.executionId = execution.id');
+
+			for (const item of metadata) {
+				qb.andWhere('md.key = :key AND md.value = :value', item);
+			}
+		}
+
+		return qb;
+	}
+
+	async getAllIds() {
+		const executions = await this.find({ select: ['id'], order: { id: 'ASC' } });
+
+		return executions.map(({ id }) => id);
+	}
 }
diff --git a/packages/cli/src/databases/repositories/executionData.repository.ts b/packages/cli/src/databases/repositories/executionData.repository.ts
new file mode 100644
index 0000000000000..5872f9888cd66
--- /dev/null
+++ b/packages/cli/src/databases/repositories/executionData.repository.ts
@@ -0,0 +1,19 @@
+import { Service } from 'typedi';
+import { DataSource, In, Repository } from '@n8n/typeorm';
+import { ExecutionData } from '../entities/ExecutionData';
+
+@Service()
+export class ExecutionDataRepository extends Repository<ExecutionData> {
+	constructor(dataSource: DataSource) {
+		super(ExecutionData, dataSource.manager);
+	}
+
+	async findByExecutionIds(executionIds: string[]) {
+		return await this.find({
+			select: ['workflowData'],
+			where: {
+				executionId: In(executionIds),
+			},
+		}).then((executionData) => executionData.map(({ workflowData }) => workflowData));
+	}
+}
diff --git a/packages/cli/src/databases/repositories/executionMetadata.repository.ts b/packages/cli/src/databases/repositories/executionMetadata.repository.ts
index 917ce755c81c0..d80cca12a6115 100644
--- a/packages/cli/src/databases/repositories/executionMetadata.repository.ts
+++ b/packages/cli/src/databases/repositories/executionMetadata.repository.ts
@@ -1,5 +1,5 @@
 import { Service } from 'typedi';
-import { DataSource, Repository } from 'typeorm';
+import { DataSource, Repository } from '@n8n/typeorm';
 import { ExecutionMetadata } from '../entities/ExecutionMetadata';
 
 @Service()
diff --git a/packages/cli/src/databases/repositories/index.ts b/packages/cli/src/databases/repositories/index.ts
deleted file mode 100644
index 90fc02bd3530b..0000000000000
--- a/packages/cli/src/databases/repositories/index.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-export { AuthIdentityRepository } from './authIdentity.repository';
-export { AuthProviderSyncHistoryRepository } from './authProviderSyncHistory.repository';
-export { CredentialsRepository } from './credentials.repository';
-export { EventDestinationsRepository } from './eventDestinations.repository';
-export { ExecutionMetadataRepository } from './executionMetadata.repository';
-export { ExecutionRepository } from './execution.repository';
-export { InstalledNodesRepository } from './installedNodes.repository';
-export { InstalledPackagesRepository } from './installedPackages.repository';
-export { RoleRepository } from './role.repository';
-export { SettingsRepository } from './settings.repository';
-export { SharedCredentialsRepository } from './sharedCredentials.repository';
-export { SharedWorkflowRepository } from './sharedWorkflow.repository';
-export { TagRepository } from './tag.repository';
-export { UserRepository } from './user.repository';
-export { VariablesRepository } from './variables.repository';
-export { WebhookRepository } from './webhook.repository';
-export { WorkflowRepository } from './workflow.repository';
-export { WorkflowStatisticsRepository } from './workflowStatistics.repository';
-export { WorkflowTagMappingRepository } from './workflowTagMapping.repository';
-export { SaveRequestLogRepository } from './saveRequestLog.repository';
diff --git a/packages/cli/src/databases/repositories/installedNodes.repository.ts b/packages/cli/src/databases/repositories/installedNodes.repository.ts
index 021535c31fd88..6750f5dc84592 100644
--- a/packages/cli/src/databases/repositories/installedNodes.repository.ts
+++ b/packages/cli/src/databases/repositories/installedNodes.repository.ts
@@ -1,5 +1,5 @@
 import { Service } from 'typedi';
-import { DataSource, Repository } from 'typeorm';
+import { DataSource, Repository } from '@n8n/typeorm';
 import { InstalledNodes } from '../entities/InstalledNodes';
 
 @Service()
diff --git a/packages/cli/src/databases/repositories/installedPackages.repository.ts b/packages/cli/src/databases/repositories/installedPackages.repository.ts
index 7a0a1fff29277..c7a39cded5bb3 100644
--- a/packages/cli/src/databases/repositories/installedPackages.repository.ts
+++ b/packages/cli/src/databases/repositories/installedPackages.repository.ts
@@ -1,10 +1,50 @@
 import { Service } from 'typedi';
-import { DataSource, Repository } from 'typeorm';
+import { DataSource, Repository } from '@n8n/typeorm';
 import { InstalledPackages } from '../entities/InstalledPackages';
+import { InstalledNodesRepository } from './installedNodes.repository';
+import type { PackageDirectoryLoader } from 'n8n-core';
 
 @Service()
 export class InstalledPackagesRepository extends Repository<InstalledPackages> {
-	constructor(dataSource: DataSource) {
+	constructor(
+		dataSource: DataSource,
+		private installedNodesRepository: InstalledNodesRepository,
+	) {
 		super(InstalledPackages, dataSource.manager);
 	}
+
+	async saveInstalledPackageWithNodes(packageLoader: PackageDirectoryLoader) {
+		const { packageJson, nodeTypes, loadedNodes } = packageLoader;
+		const { name: packageName, version: installedVersion, author } = packageJson;
+
+		let installedPackage: InstalledPackages;
+
+		await this.manager.transaction(async (manager) => {
+			installedPackage = await manager.save(
+				this.create({
+					packageName,
+					installedVersion,
+					authorName: author?.name,
+					authorEmail: author?.email,
+				}),
+			);
+
+			installedPackage.installedNodes = [];
+
+			for (const loadedNode of loadedNodes) {
+				const installedNode = this.installedNodesRepository.create({
+					name: nodeTypes[loadedNode.name].type.description.displayName,
+					type: loadedNode.name,
+					latestVersion: loadedNode.version.toString(),
+					package: { packageName },
+				});
+
+				installedPackage.installedNodes.push(installedNode);
+
+				await manager.save(installedNode);
+			}
+		});
+
+		return installedPackage!;
+	}
 }
diff --git a/packages/cli/src/databases/repositories/nodeOutput.repository.ts b/packages/cli/src/databases/repositories/nodeOutput.repository.ts
new file mode 100644
index 0000000000000..7b2677e430903
--- /dev/null
+++ b/packages/cli/src/databases/repositories/nodeOutput.repository.ts
@@ -0,0 +1,10 @@
+import { Service } from 'typedi';
+import { DataSource, Repository } from '@n8n/typeorm';
+import { NodeOutput } from '../entities/NodeOutput';
+
+@Service()
+export class NodeOutputRepository extends Repository<NodeOutput> {
+	constructor(dataSource: DataSource) {
+		super(NodeOutput, dataSource.manager);
+	}
+}
diff --git a/packages/cli/src/databases/repositories/resumeWorkflowTimer.repository.ts b/packages/cli/src/databases/repositories/resumeWorkflowTimer.repository.ts
new file mode 100644
index 0000000000000..d216ae9f2dc95
--- /dev/null
+++ b/packages/cli/src/databases/repositories/resumeWorkflowTimer.repository.ts
@@ -0,0 +1,10 @@
+import { Service } from 'typedi';
+import { DataSource, Repository } from '@n8n/typeorm';
+import { ResumeWorkflowTimer } from '../entities/ResumeWorkflowTimer';
+
+@Service()
+export class ResumeWorkflowTimerRepository extends Repository<ResumeWorkflowTimer> {
+	constructor(dataSource: DataSource) {
+		super(ResumeWorkflowTimer, dataSource.manager);
+	}
+}
diff --git a/packages/cli/src/databases/repositories/role.repository.ts b/packages/cli/src/databases/repositories/role.repository.ts
deleted file mode 100644
index 6b2537a26de74..0000000000000
--- a/packages/cli/src/databases/repositories/role.repository.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import { Service } from 'typedi';
-import { DataSource, Repository } from 'typeorm';
-import type { RoleNames, RoleScopes } from '../entities/Role';
-import { Role } from '../entities/Role';
-
-@Service()
-export class RoleRepository extends Repository<Role> {
-	constructor(dataSource: DataSource) {
-		super(Role, dataSource.manager);
-	}
-
-	async findGlobalOwnerRole(): Promise<Role | null> {
-		return this.findRole('global', 'owner');
-	}
-
-	async findGlobalOwnerRoleOrFail(): Promise<Role> {
-		return this.findRoleOrFail('global', 'owner');
-	}
-
-	async findGlobalMemberRole(): Promise<Role | null> {
-		return this.findRole('global', 'member');
-	}
-
-	async findGlobalMemberRoleOrFail(): Promise<Role> {
-		return this.findRoleOrFail('global', 'member');
-	}
-
-	async findWorkflowOwnerRole(): Promise<Role | null> {
-		return this.findRole('workflow', 'owner');
-	}
-
-	async findWorkflowOwnerRoleOrFail(): Promise<Role> {
-		return this.findRoleOrFail('workflow', 'owner');
-	}
-
-	async findWorkflowEditorRoleOrFail(): Promise<Role> {
-		return this.findRoleOrFail('workflow', 'editor');
-	}
-
-	async findCredentialOwnerRole(): Promise<Role | null> {
-		return this.findRole('credential', 'owner');
-	}
-
-	async findCredentialOwnerRoleOrFail(): Promise<Role> {
-		return this.findRoleOrFail('credential', 'owner');
-	}
-
-	async findCredentialUserRole(): Promise<Role | null> {
-		return this.findRole('credential', 'user');
-	}
-
-	async findRole(scope: RoleScopes, name: RoleNames): Promise<Role | null> {
-		return this.findOne({ where: { scope, name } });
-	}
-
-	async findRoleOrFail(scope: RoleScopes, name: RoleNames): Promise<Role> {
-		return this.findOneOrFail({ where: { scope, name } });
-	}
-}
diff --git a/packages/cli/src/databases/repositories/saveRequestLog.repository.ts b/packages/cli/src/databases/repositories/saveRequestLog.repository.ts
index af20e68184692..68b32a7bb43ee 100644
--- a/packages/cli/src/databases/repositories/saveRequestLog.repository.ts
+++ b/packages/cli/src/databases/repositories/saveRequestLog.repository.ts
@@ -1,5 +1,5 @@
 import { Service } from 'typedi';
-import { DataSource, Repository } from 'typeorm';
+import { DataSource, Repository } from '@n8n/typeorm';
 import { SaveRequestLog } from '../entities/SaveRequestLog';
 
 @Service()
diff --git a/packages/cli/src/databases/repositories/settings.repository.ts b/packages/cli/src/databases/repositories/settings.repository.ts
index d0ae091ce69e8..94cb32305a45e 100644
--- a/packages/cli/src/databases/repositories/settings.repository.ts
+++ b/packages/cli/src/databases/repositories/settings.repository.ts
@@ -1,10 +1,54 @@
+import { EXTERNAL_SECRETS_DB_KEY } from '@/ExternalSecrets/constants';
 import { Service } from 'typedi';
-import { DataSource, Repository } from 'typeorm';
+import { DataSource, Repository } from '@n8n/typeorm';
+import { ErrorReporterProxy as ErrorReporter } from 'n8n-workflow';
 import { Settings } from '../entities/Settings';
+import config from '@/config';
 
 @Service()
 export class SettingsRepository extends Repository<Settings> {
 	constructor(dataSource: DataSource) {
 		super(Settings, dataSource.manager);
 	}
+
+	async getEncryptedSecretsProviderSettings(): Promise<string | null> {
+		return (await this.findByKey(EXTERNAL_SECRETS_DB_KEY))?.value ?? null;
+	}
+
+	async findByKey(key: string): Promise<Settings | null> {
+		return await this.findOneBy({ key });
+	}
+
+	async saveEncryptedSecretsProviderSettings(data: string): Promise<void> {
+		await this.upsert(
+			{
+				key: EXTERNAL_SECRETS_DB_KEY,
+				value: data,
+				loadOnStartup: false,
+			},
+			['key'],
+		);
+	}
+
+	async dismissBanner({ bannerName }: { bannerName: string }): Promise<{ success: boolean }> {
+		const key = 'ui.banners.dismissed';
+		const dismissedBannersSetting = await this.findOneBy({ key });
+		try {
+			let value: string;
+			if (dismissedBannersSetting) {
+				const dismissedBanners = JSON.parse(dismissedBannersSetting.value) as string[];
+				const updatedValue = [...new Set([...dismissedBanners, bannerName].sort())];
+				value = JSON.stringify(updatedValue);
+				await this.update({ key }, { value, loadOnStartup: true });
+			} else {
+				value = JSON.stringify([bannerName]);
+				await this.save({ key, value, loadOnStartup: true }, { transaction: false });
+			}
+			config.set(key, value);
+			return { success: true };
+		} catch (error) {
+			ErrorReporter.error(error);
+		}
+		return { success: false };
+	}
 }
diff --git a/packages/cli/src/databases/repositories/sharedCredentials.repository.ts b/packages/cli/src/databases/repositories/sharedCredentials.repository.ts
index 29e473b885455..4b08c2174f8fe 100644
--- a/packages/cli/src/databases/repositories/sharedCredentials.repository.ts
+++ b/packages/cli/src/databases/repositories/sharedCredentials.repository.ts
@@ -1,10 +1,69 @@
 import { Service } from 'typedi';
-import { DataSource, Repository } from 'typeorm';
-import { SharedCredentials } from '../entities/SharedCredentials';
+import type { EntityManager } from '@n8n/typeorm';
+import { DataSource, In, Not, Repository } from '@n8n/typeorm';
+import { type CredentialSharingRole, SharedCredentials } from '../entities/SharedCredentials';
+import type { User } from '../entities/User';
 
 @Service()
 export class SharedCredentialsRepository extends Repository<SharedCredentials> {
 	constructor(dataSource: DataSource) {
 		super(SharedCredentials, dataSource.manager);
 	}
+
+	/** Get a credential if it has been shared with a user */
+	async findCredentialForUser(credentialsId: string, user: User) {
+		const sharedCredential = await this.findOne({
+			relations: ['credentials'],
+			where: {
+				credentialsId,
+				...(!user.hasGlobalScope('credential:read') ? { userId: user.id } : {}),
+			},
+		});
+		if (!sharedCredential) return null;
+		return sharedCredential.credentials;
+	}
+
+	async findByCredentialIds(credentialIds: string[], role: CredentialSharingRole) {
+		return await this.find({
+			relations: ['credentials', 'user'],
+			where: {
+				credentialsId: In(credentialIds),
+				role,
+			},
+		});
+	}
+
+	async makeOwnerOfAllCredentials(user: User) {
+		return await this.update({ userId: Not(user.id), role: 'credential:owner' }, { user });
+	}
+
+	/** Get the IDs of all credentials owned by a user */
+	async getOwnedCredentialIds(userIds: string[]) {
+		return await this.getCredentialIdsByUserAndRole(userIds, ['credential:owner']);
+	}
+
+	/** Get the IDs of all credentials owned by or shared with a user */
+	async getAccessibleCredentialIds(userIds: string[]) {
+		return await this.getCredentialIdsByUserAndRole(userIds, [
+			'credential:owner',
+			'credential:user',
+		]);
+	}
+
+	private async getCredentialIdsByUserAndRole(userIds: string[], roles: CredentialSharingRole[]) {
+		const sharings = await this.find({
+			where: {
+				userId: In(userIds),
+				role: In(roles),
+			},
+		});
+		return sharings.map((s) => s.credentialsId);
+	}
+
+	async deleteByIds(transaction: EntityManager, sharedCredentialsIds: string[], user?: User) {
+		return await transaction.delete(SharedCredentials, {
+			user,
+			credentialsId: In(sharedCredentialsIds),
+		});
+	}
 }
diff --git a/packages/cli/src/databases/repositories/sharedWorkflow.repository.ts b/packages/cli/src/databases/repositories/sharedWorkflow.repository.ts
index e8c21df37985c..3716daa45ecad 100644
--- a/packages/cli/src/databases/repositories/sharedWorkflow.repository.ts
+++ b/packages/cli/src/databases/repositories/sharedWorkflow.repository.ts
@@ -1,10 +1,162 @@
 import { Service } from 'typedi';
-import { DataSource, Repository } from 'typeorm';
-import { SharedWorkflow } from '../entities/SharedWorkflow';
+import { DataSource, Repository, In, Not } from '@n8n/typeorm';
+import type { EntityManager, FindManyOptions, FindOptionsWhere } from '@n8n/typeorm';
+import { SharedWorkflow, type WorkflowSharingRole } from '../entities/SharedWorkflow';
+import { type User } from '../entities/User';
+import type { Scope } from '@n8n/permissions';
+import type { WorkflowEntity } from '../entities/WorkflowEntity';
 
 @Service()
 export class SharedWorkflowRepository extends Repository<SharedWorkflow> {
 	constructor(dataSource: DataSource) {
 		super(SharedWorkflow, dataSource.manager);
 	}
+
+	async hasAccess(workflowId: string, user: User) {
+		const where: FindOptionsWhere<SharedWorkflow> = {
+			workflowId,
+		};
+		if (!user.hasGlobalScope('workflow:read')) {
+			where.userId = user.id;
+		}
+		return await this.exist({ where });
+	}
+
+	/** Get the IDs of all users this workflow is shared with */
+	async getSharedUserIds(workflowId: string) {
+		const sharedWorkflows = await this.find({
+			select: ['userId'],
+			where: { workflowId },
+		});
+		return sharedWorkflows.map((sharing) => sharing.userId);
+	}
+
+	async getSharedWorkflowIds(workflowIds: string[]) {
+		const sharedWorkflows = await this.find({
+			select: ['workflowId'],
+			where: {
+				workflowId: In(workflowIds),
+			},
+		});
+		return sharedWorkflows.map((sharing) => sharing.workflowId);
+	}
+
+	async findByWorkflowIds(workflowIds: string[]) {
+		return await this.find({
+			relations: ['user'],
+			where: {
+				role: 'workflow:owner',
+				workflowId: In(workflowIds),
+			},
+		});
+	}
+
+	async findSharingRole(
+		userId: string,
+		workflowId: string,
+	): Promise<WorkflowSharingRole | undefined> {
+		return await this.findOne({
+			select: ['role'],
+			where: { workflowId, userId },
+		}).then((shared) => shared?.role);
+	}
+
+	async findSharing(
+		workflowId: string,
+		user: User,
+		scope: Scope,
+		{ roles, extraRelations }: { roles?: WorkflowSharingRole[]; extraRelations?: string[] } = {},
+	) {
+		const where: FindOptionsWhere<SharedWorkflow> = {
+			workflow: { id: workflowId },
+		};
+
+		if (!user.hasGlobalScope(scope)) {
+			where.user = { id: user.id };
+		}
+
+		if (roles) {
+			where.role = In(roles);
+		}
+
+		const relations = ['workflow'];
+
+		if (extraRelations) relations.push(...extraRelations);
+
+		return await this.findOne({ relations, where });
+	}
+
+	async makeOwnerOfAllWorkflows(user: User) {
+		return await this.update({ userId: Not(user.id), role: 'workflow:owner' }, { user });
+	}
+
+	async getSharing(
+		user: User,
+		workflowId: string,
+		options: { allowGlobalScope: true; globalScope: Scope } | { allowGlobalScope: false },
+		relations: string[] = ['workflow'],
+	): Promise<SharedWorkflow | null> {
+		const where: FindOptionsWhere<SharedWorkflow> = { workflowId };
+
+		// Omit user from where if the requesting user has relevant
+		// global workflow permissions. This allows the user to
+		// access workflows they don't own.
+		if (!options.allowGlobalScope || !user.hasGlobalScope(options.globalScope)) {
+			where.userId = user.id;
+		}
+
+		return await this.findOne({ where, relations });
+	}
+
+	async getSharedWorkflows(
+		user: User,
+		options: {
+			relations?: string[];
+			workflowIds?: string[];
+		},
+	): Promise<SharedWorkflow[]> {
+		return await this.find({
+			where: {
+				...(!['global:owner', 'global:admin'].includes(user.role) && { userId: user.id }),
+				...(options.workflowIds && { workflowId: In(options.workflowIds) }),
+			},
+			...(options.relations && { relations: options.relations }),
+		});
+	}
+
+	async share(transaction: EntityManager, workflow: WorkflowEntity, users: User[]) {
+		const newSharedWorkflows = users.reduce<SharedWorkflow[]>((acc, user) => {
+			if (user.isPending) {
+				return acc;
+			}
+			const entity: Partial<SharedWorkflow> = {
+				workflowId: workflow.id,
+				userId: user.id,
+				role: 'workflow:editor',
+			};
+			acc.push(this.create(entity));
+			return acc;
+		}, []);
+
+		return await transaction.save(newSharedWorkflows);
+	}
+
+	async findWithFields(
+		workflowIds: string[],
+		{ select }: Pick<FindManyOptions<SharedWorkflow>, 'select'>,
+	) {
+		return await this.find({
+			where: {
+				workflowId: In(workflowIds),
+			},
+			select,
+		});
+	}
+
+	async deleteByIds(transaction: EntityManager, sharedWorkflowIds: string[], user?: User) {
+		return await transaction.delete(SharedWorkflow, {
+			user,
+			workflowId: In(sharedWorkflowIds),
+		});
+	}
 }
diff --git a/packages/cli/src/databases/repositories/tag.repository.ts b/packages/cli/src/databases/repositories/tag.repository.ts
index 3eb848446d996..1667ff29839f9 100644
--- a/packages/cli/src/databases/repositories/tag.repository.ts
+++ b/packages/cli/src/databases/repositories/tag.repository.ts
@@ -1,10 +1,73 @@
 import { Service } from 'typedi';
-import { DataSource, Repository } from 'typeorm';
+import type { EntityManager } from '@n8n/typeorm';
+import { DataSource, In, Repository } from '@n8n/typeorm';
 import { TagEntity } from '../entities/TagEntity';
+import type { WorkflowEntity } from '../entities/WorkflowEntity';
+import intersection from 'lodash/intersection';
 
 @Service()
 export class TagRepository extends Repository<TagEntity> {
 	constructor(dataSource: DataSource) {
 		super(TagEntity, dataSource.manager);
 	}
+
+	async findMany(tagIds: string[]) {
+		return await this.find({
+			select: ['id', 'name'],
+			where: { id: In(tagIds) },
+		});
+	}
+
+	/**
+	 * Set tags on workflow to import while ensuring all tags exist in the database,
+	 * either by matching incoming to existing tags or by creating them first.
+	 */
+	async setTags(tx: EntityManager, dbTags: TagEntity[], workflow: WorkflowEntity) {
+		if (!workflow?.tags?.length) return;
+
+		for (let i = 0; i < workflow.tags.length; i++) {
+			const importTag = workflow.tags[i];
+
+			if (!importTag.name) continue;
+
+			const identicalMatch = dbTags.find(
+				(dbTag) =>
+					dbTag.id === importTag.id &&
+					dbTag.createdAt &&
+					importTag.createdAt &&
+					dbTag.createdAt.getTime() === new Date(importTag.createdAt).getTime(),
+			);
+
+			if (identicalMatch) {
+				workflow.tags[i] = identicalMatch;
+				continue;
+			}
+
+			const nameMatch = dbTags.find((dbTag) => dbTag.name === importTag.name);
+
+			if (nameMatch) {
+				workflow.tags[i] = nameMatch;
+				continue;
+			}
+
+			const tagEntity = this.create(importTag);
+
+			workflow.tags[i] = await tx.save<TagEntity>(tagEntity);
+		}
+	}
+
+	/**
+	 * Returns the workflow IDs that have certain tags.
+	 * Intersection! e.g. workflow needs to have all provided tags.
+	 */
+	async getWorkflowIdsViaTags(tags: string[]): Promise<string[]> {
+		const dbTags = await this.find({
+			where: { name: In(tags) },
+			relations: ['workflows'],
+		});
+
+		const workflowIdsPerTag = dbTags.map((tag) => tag.workflows.map((workflow) => workflow.id));
+
+		return intersection(...workflowIdsPerTag);
+	}
 }
diff --git a/packages/cli/src/databases/repositories/usageMetrics.repository.ts b/packages/cli/src/databases/repositories/usageMetrics.repository.ts
new file mode 100644
index 0000000000000..01f093c193619
--- /dev/null
+++ b/packages/cli/src/databases/repositories/usageMetrics.repository.ts
@@ -0,0 +1,79 @@
+import config from '@/config';
+import { Service } from 'typedi';
+import { DataSource, Repository, Entity } from '@n8n/typeorm';
+
+@Entity()
+export class UsageMetrics {}
+
+@Service()
+export class UsageMetricsRepository extends Repository<UsageMetrics> {
+	constructor(dataSource: DataSource) {
+		super(UsageMetrics, dataSource.manager);
+	}
+
+	toTableName(name: string) {
+		const tablePrefix = config.getEnv('database.tablePrefix');
+
+		let tableName =
+			config.getEnv('database.type') === 'mysqldb'
+				? `\`${tablePrefix}${name}\``
+				: `"${tablePrefix}${name}"`;
+
+		const pgSchema = config.getEnv('database.postgresdb.schema');
+
+		if (pgSchema !== 'public') tableName = [pgSchema, tablePrefix + name].join('.');
+
+		return tableName;
+	}
+
+	async getLicenseRenewalMetrics() {
+		type Row = {
+			enabled_user_count: string | number;
+			total_user_count: string | number;
+			active_workflow_count: string | number;
+			total_workflow_count: string | number;
+			total_credentials_count: string | number;
+			production_executions_count: string | number;
+			manual_executions_count: string | number;
+		};
+
+		const userTable = this.toTableName('user');
+		const workflowTable = this.toTableName('workflow_entity');
+		const credentialTable = this.toTableName('credentials_entity');
+		const workflowStatsTable = this.toTableName('workflow_statistics');
+
+		const [
+			{
+				enabled_user_count: enabledUsers,
+				total_user_count: totalUsers,
+				active_workflow_count: activeWorkflows,
+				total_workflow_count: totalWorkflows,
+				total_credentials_count: totalCredentials,
+				production_executions_count: productionExecutions,
+				manual_executions_count: manualExecutions,
+			},
+		] = (await this.query(`
+			SELECT
+				(SELECT COUNT(*) FROM ${userTable} WHERE disabled = false) AS enabled_user_count,
+				(SELECT COUNT(*) FROM ${userTable}) AS total_user_count,
+				(SELECT COUNT(*) FROM ${workflowTable} WHERE active = true) AS active_workflow_count,
+				(SELECT COUNT(*) FROM ${workflowTable}) AS total_workflow_count,
+				(SELECT COUNT(*) FROM ${credentialTable}) AS total_credentials_count,
+				(SELECT SUM(count) FROM ${workflowStatsTable} WHERE name IN ('production_success', 'production_error')) AS production_executions_count,
+				(SELECT SUM(count) FROM ${workflowStatsTable} WHERE name IN ('manual_success', 'manual_error')) AS manual_executions_count;
+		`)) as Row[];
+
+		const toNumber = (value: string | number) =>
+			(typeof value === 'number' ? value : parseInt(value, 10)) || 0;
+
+		return {
+			enabledUsers: toNumber(enabledUsers),
+			totalUsers: toNumber(totalUsers),
+			activeWorkflows: toNumber(activeWorkflows),
+			totalWorkflows: toNumber(totalWorkflows),
+			totalCredentials: toNumber(totalCredentials),
+			productionExecutions: toNumber(productionExecutions),
+			manualExecutions: toNumber(manualExecutions),
+		};
+	}
+}
diff --git a/packages/cli/src/databases/repositories/user.repository.ts b/packages/cli/src/databases/repositories/user.repository.ts
index 863a797a45d84..6b81f8984bff0 100644
--- a/packages/cli/src/databases/repositories/user.repository.ts
+++ b/packages/cli/src/databases/repositories/user.repository.ts
@@ -1,10 +1,107 @@
 import { Service } from 'typedi';
-import { DataSource, Repository } from 'typeorm';
-import { User } from '../entities/User';
+import type { EntityManager, FindManyOptions } from '@n8n/typeorm';
+import { DataSource, In, IsNull, Not, Repository } from '@n8n/typeorm';
+import type { ListQuery } from '@/requests';
 
+import { type GlobalRole, User } from '../entities/User';
 @Service()
 export class UserRepository extends Repository<User> {
 	constructor(dataSource: DataSource) {
 		super(User, dataSource.manager);
 	}
+
+	async findManyByIds(userIds: string[]) {
+		return await this.find({
+			where: { id: In(userIds) },
+		});
+	}
+
+	async deleteAllExcept(user: User) {
+		await this.delete({ id: Not(user.id) });
+	}
+
+	async getByIds(transaction: EntityManager, ids: string[]) {
+		return await transaction.find(User, { where: { id: In(ids) } });
+	}
+
+	async findManyByEmail(emails: string[]) {
+		return await this.find({
+			where: { email: In(emails) },
+			select: ['email', 'password', 'id'],
+		});
+	}
+
+	async deleteMany(userIds: string[]) {
+		return await this.delete({ id: In(userIds) });
+	}
+
+	async findNonShellUser(email: string) {
+		return await this.findOne({
+			where: {
+				email,
+				password: Not(IsNull()),
+			},
+			relations: ['authIdentities'],
+		});
+	}
+
+	/** Counts the number of users in each role, e.g. `{ admin: 2, member: 6, owner: 1 }` */
+	async countUsersByRole() {
+		const rows = (await this.createQueryBuilder()
+			.select(['role', 'COUNT(role) as count'])
+			.groupBy('role')
+			.execute()) as Array<{ role: GlobalRole; count: string }>;
+		return rows.reduce(
+			(acc, row) => {
+				acc[row.role] = parseInt(row.count, 10);
+				return acc;
+			},
+			{} as Record<GlobalRole, number>,
+		);
+	}
+
+	async toFindManyOptions(listQueryOptions?: ListQuery.Options) {
+		const findManyOptions: FindManyOptions<User> = {};
+
+		if (!listQueryOptions) {
+			findManyOptions.relations = ['authIdentities'];
+			return findManyOptions;
+		}
+
+		const { filter, select, take, skip } = listQueryOptions;
+
+		if (select) findManyOptions.select = select;
+		if (take) findManyOptions.take = take;
+		if (skip) findManyOptions.skip = skip;
+
+		if (take && !select) {
+			findManyOptions.relations = ['authIdentities'];
+		}
+
+		if (take && select && !select?.id) {
+			findManyOptions.select = { ...findManyOptions.select, id: true }; // pagination requires id
+		}
+
+		if (filter) {
+			const { isOwner, ...otherFilters } = filter;
+
+			findManyOptions.where = otherFilters;
+
+			if (isOwner !== undefined) {
+				findManyOptions.where.role = isOwner ? 'global:owner' : Not('global:owner');
+			}
+		}
+
+		return findManyOptions;
+	}
+
+	/**
+	 * Get emails of users who have completed setup, by user IDs.
+	 */
+	async getEmailsByIds(userIds: string[]) {
+		return await this.find({
+			select: ['email'],
+			where: { id: In(userIds), password: Not(IsNull()) },
+		});
+	}
 }
diff --git a/packages/cli/src/databases/repositories/variables.repository.ts b/packages/cli/src/databases/repositories/variables.repository.ts
index d787a8b98431e..e2a321ce576af 100644
--- a/packages/cli/src/databases/repositories/variables.repository.ts
+++ b/packages/cli/src/databases/repositories/variables.repository.ts
@@ -1,5 +1,5 @@
 import { Service } from 'typedi';
-import { DataSource, Repository } from 'typeorm';
+import { DataSource, Repository } from '@n8n/typeorm';
 import { Variables } from '../entities/Variables';
 
 @Service()
diff --git a/packages/cli/src/databases/repositories/webhook.repository.ts b/packages/cli/src/databases/repositories/webhook.repository.ts
index 64bb49a643ecb..9f211ec0ad746 100644
--- a/packages/cli/src/databases/repositories/webhook.repository.ts
+++ b/packages/cli/src/databases/repositories/webhook.repository.ts
@@ -1,5 +1,5 @@
 import { Service } from 'typedi';
-import { DataSource, Repository } from 'typeorm';
+import { DataSource, Repository } from '@n8n/typeorm';
 import { WebhookEntity } from '../entities/WebhookEntity';
 
 @Service()
diff --git a/packages/cli/src/databases/repositories/workflow.repository.ts b/packages/cli/src/databases/repositories/workflow.repository.ts
index 5085f47be4fda..9d0c09ea8ac9b 100644
--- a/packages/cli/src/databases/repositories/workflow.repository.ts
+++ b/packages/cli/src/databases/repositories/workflow.repository.ts
@@ -1,10 +1,223 @@
 import { Service } from 'typedi';
-import { DataSource, Repository } from 'typeorm';
+import {
+	DataSource,
+	Repository,
+	In,
+	Like,
+	type UpdateResult,
+	type FindOptionsWhere,
+	type FindOptionsSelect,
+	type FindManyOptions,
+	type EntityManager,
+	type DeleteResult,
+	Not,
+} from '@n8n/typeorm';
+import type { ListQuery } from '@/requests';
+import { isStringArray } from '@/utils';
+import config from '@/config';
 import { WorkflowEntity } from '../entities/WorkflowEntity';
+import { SharedWorkflow } from '../entities/SharedWorkflow';
+import { WebhookEntity } from '../entities/WebhookEntity';
 
 @Service()
 export class WorkflowRepository extends Repository<WorkflowEntity> {
 	constructor(dataSource: DataSource) {
 		super(WorkflowEntity, dataSource.manager);
 	}
+
+	async get(where: FindOptionsWhere<WorkflowEntity>, options?: { relations: string[] }) {
+		return await this.findOne({
+			where,
+			relations: options?.relations,
+		});
+	}
+
+	async getAllActive() {
+		return await this.find({
+			where: { active: true },
+			relations: ['shared', 'shared.user'],
+		});
+	}
+
+	async getActiveIds() {
+		const activeWorkflows = await this.find({
+			select: ['id'],
+			where: { active: true },
+		});
+		return activeWorkflows.map((workflow) => workflow.id);
+	}
+
+	async findById(workflowId: string) {
+		return await this.findOne({
+			where: { id: workflowId },
+			relations: ['shared', 'shared.user'],
+		});
+	}
+
+	async findByIds(workflowIds: string[], { fields }: { fields?: string[] } = {}) {
+		const options: FindManyOptions<WorkflowEntity> = {
+			where: { id: In(workflowIds) },
+		};
+
+		if (fields?.length) options.select = fields as FindOptionsSelect<WorkflowEntity>;
+
+		return await this.find(options);
+	}
+
+	async getActiveTriggerCount() {
+		const totalTriggerCount = await this.sum('triggerCount', {
+			active: true,
+		});
+		return totalTriggerCount ?? 0;
+	}
+
+	async getSharings(
+		transaction: EntityManager,
+		workflowId: string,
+		relations = ['shared'],
+	): Promise<SharedWorkflow[]> {
+		const workflow = await transaction.findOne(WorkflowEntity, {
+			where: { id: workflowId },
+			relations,
+		});
+		return workflow?.shared ?? [];
+	}
+
+	async pruneSharings(
+		transaction: EntityManager,
+		workflowId: string,
+		userIds: string[],
+	): Promise<DeleteResult> {
+		return await transaction.delete(SharedWorkflow, {
+			workflowId,
+			userId: Not(In(userIds)),
+		});
+	}
+
+	async updateWorkflowTriggerCount(id: string, triggerCount: number): Promise<UpdateResult> {
+		const qb = this.createQueryBuilder('workflow');
+		return await qb
+			.update()
+			.set({
+				triggerCount,
+				updatedAt: () => {
+					if (['mysqldb', 'mariadb'].includes(config.getEnv('database.type'))) {
+						return 'updatedAt';
+					}
+					return '"updatedAt"';
+				},
+			})
+			.where('id = :id', { id })
+			.execute();
+	}
+
+	async getMany(sharedWorkflowIds: string[], options?: ListQuery.Options) {
+		if (sharedWorkflowIds.length === 0) return { workflows: [], count: 0 };
+
+		const where: FindOptionsWhere<WorkflowEntity> = {
+			...options?.filter,
+			id: In(sharedWorkflowIds),
+		};
+
+		const reqTags = options?.filter?.tags;
+
+		if (isStringArray(reqTags)) {
+			where.tags = reqTags.map((tag) => ({ name: tag }));
+		}
+
+		type Select = FindOptionsSelect<WorkflowEntity> & { ownedBy?: true };
+
+		const select: Select = options?.select
+			? { ...options.select } // copy to enable field removal without affecting original
+			: {
+					name: true,
+					active: true,
+					createdAt: true,
+					updatedAt: true,
+					versionId: true,
+					shared: { userId: true, role: true },
+				};
+
+		delete select?.ownedBy; // remove non-entity field, handled after query
+
+		const relations: string[] = [];
+
+		const areTagsEnabled = !config.getEnv('workflowTagsDisabled');
+		const isDefaultSelect = options?.select === undefined;
+		const areTagsRequested = isDefaultSelect || options?.select?.tags === true;
+		const isOwnedByIncluded = isDefaultSelect || options?.select?.ownedBy === true;
+
+		if (areTagsEnabled && areTagsRequested) {
+			relations.push('tags');
+			select.tags = { id: true, name: true };
+		}
+
+		if (isOwnedByIncluded) relations.push('shared', 'shared.user');
+
+		if (typeof where.name === 'string' && where.name !== '') {
+			where.name = Like(`%${where.name}%`);
+		}
+
+		const findManyOptions: FindManyOptions<WorkflowEntity> = {
+			select: { ...select, id: true },
+			where,
+		};
+
+		if (isDefaultSelect || options?.select?.updatedAt === true) {
+			findManyOptions.order = { updatedAt: 'ASC' };
+		}
+
+		if (relations.length > 0) {
+			findManyOptions.relations = relations;
+		}
+
+		if (options?.take) {
+			findManyOptions.skip = options.skip;
+			findManyOptions.take = options.take;
+		}
+
+		const [workflows, count] = (await this.findAndCount(findManyOptions)) as [
+			ListQuery.Workflow.Plain[] | ListQuery.Workflow.WithSharing[],
+			number,
+		];
+
+		return { workflows, count };
+	}
+
+	async findStartingWith(workflowName: string): Promise<Array<{ name: string }>> {
+		return await this.find({
+			select: ['name'],
+			where: { name: Like(`${workflowName}%`) },
+		});
+	}
+
+	async findIn(workflowIds: string[]) {
+		return await this.find({
+			select: ['id', 'name'],
+			where: { id: In(workflowIds) },
+		});
+	}
+
+	async findWebhookBasedActiveWorkflows() {
+		return await (this.createQueryBuilder('workflow')
+			.select('DISTINCT workflow.id, workflow.name')
+			.innerJoin(WebhookEntity, 'webhook_entity', 'workflow.id = webhook_entity.workflowId')
+			.execute() as Promise<Array<{ id: string; name: string }>>);
+	}
+
+	async updateActiveState(workflowId: string, newState: boolean) {
+		return await this.update({ id: workflowId }, { active: newState });
+	}
+
+	async deactivateAll() {
+		return await this.update({ active: true }, { active: false });
+	}
+
+	async activateAll() {
+		return await this.update({ active: false }, { active: true });
+	}
+
+	async findByActiveState(activeState: boolean) {
+		return await this.findBy({ active: activeState });
+	}
 }
diff --git a/packages/cli/src/databases/repositories/workflowHistory.repository.ts b/packages/cli/src/databases/repositories/workflowHistory.repository.ts
new file mode 100644
index 0000000000000..4eb05b60fed1d
--- /dev/null
+++ b/packages/cli/src/databases/repositories/workflowHistory.repository.ts
@@ -0,0 +1,14 @@
+import { Service } from 'typedi';
+import { DataSource, LessThan, Repository } from '@n8n/typeorm';
+import { WorkflowHistory } from '../entities/WorkflowHistory';
+
+@Service()
+export class WorkflowHistoryRepository extends Repository<WorkflowHistory> {
+	constructor(dataSource: DataSource) {
+		super(WorkflowHistory, dataSource.manager);
+	}
+
+	async deleteEarlierThan(date: Date) {
+		return await this.delete({ createdAt: LessThan(date) });
+	}
+}
diff --git a/packages/cli/src/databases/repositories/workflowStatistics.repository.ts b/packages/cli/src/databases/repositories/workflowStatistics.repository.ts
index 90ebd510d0e74..0faef01840aec 100644
--- a/packages/cli/src/databases/repositories/workflowStatistics.repository.ts
+++ b/packages/cli/src/databases/repositories/workflowStatistics.repository.ts
@@ -1,10 +1,119 @@
 import { Service } from 'typedi';
-import { DataSource, Repository } from 'typeorm';
-import { WorkflowStatistics } from '../entities/WorkflowStatistics';
+import { DataSource, QueryFailedError, Repository } from '@n8n/typeorm';
+import config from '@/config';
+import { StatisticsNames, WorkflowStatistics } from '../entities/WorkflowStatistics';
+import type { User } from '@/databases/entities/User';
+import { WorkflowEntity } from '@/databases/entities/WorkflowEntity';
+import { SharedWorkflow } from '@/databases/entities/SharedWorkflow';
+
+type StatisticsInsertResult = 'insert' | 'failed' | 'alreadyExists';
+type StatisticsUpsertResult = StatisticsInsertResult | 'update';
 
 @Service()
 export class WorkflowStatisticsRepository extends Repository<WorkflowStatistics> {
+	private readonly dbType = config.getEnv('database.type');
+
 	constructor(dataSource: DataSource) {
 		super(WorkflowStatistics, dataSource.manager);
 	}
+
+	async insertWorkflowStatistics(
+		eventName: StatisticsNames,
+		workflowId: string,
+	): Promise<StatisticsInsertResult> {
+		// Try to insert the data loaded statistic
+		try {
+			const exists = await this.findOne({
+				where: {
+					workflowId,
+					name: eventName,
+				},
+			});
+			if (exists) return 'alreadyExists';
+			await this.insert({
+				workflowId,
+				name: eventName,
+				count: 1,
+				latestEvent: new Date(),
+			});
+			return 'insert';
+		} catch (error) {
+			// if it's a duplicate key error then that's fine, otherwise throw the error
+			if (!(error instanceof QueryFailedError)) {
+				throw error;
+			}
+			// If it is a query failed error, we return
+			return 'failed';
+		}
+	}
+
+	async upsertWorkflowStatistics(
+		eventName: StatisticsNames,
+		workflowId: string,
+	): Promise<StatisticsUpsertResult> {
+		const { tableName } = this.metadata;
+		try {
+			if (this.dbType === 'sqlite') {
+				await this.query(
+					`INSERT INTO "${tableName}" ("count", "name", "workflowId", "latestEvent")
+					VALUES (1, "${eventName}", "${workflowId}", CURRENT_TIMESTAMP)
+					ON CONFLICT (workflowId, name)
+					DO UPDATE SET count = count + 1, latestEvent = CURRENT_TIMESTAMP`,
+				);
+				// SQLite does not offer a reliable way to know whether or not an insert or update happened.
+				// We'll use a naive approach in this case. Query again after and it might cause us to miss the
+				// first production execution sometimes due to concurrency, but it's the only way.
+				const counter = await this.findOne({
+					select: ['count'],
+					where: {
+						name: eventName,
+						workflowId,
+					},
+				});
+
+				return counter?.count === 1 ? 'insert' : 'failed';
+			} else if (this.dbType === 'postgresdb') {
+				const queryResult = (await this.query(
+					`INSERT INTO "${tableName}" ("count", "name", "workflowId", "latestEvent")
+					VALUES (1, '${eventName}', '${workflowId}', CURRENT_TIMESTAMP)
+					ON CONFLICT ("name", "workflowId")
+					DO UPDATE SET "count" = "${tableName}"."count" + 1, "latestEvent" = CURRENT_TIMESTAMP
+					RETURNING *;`,
+				)) as Array<{
+					count: number;
+				}>;
+				return queryResult[0].count === 1 ? 'insert' : 'update';
+			} else {
+				const queryResult = (await this.query(
+					`INSERT INTO \`${tableName}\` (count, name, workflowId, latestEvent)
+					VALUES (1, "${eventName}", "${workflowId}", NOW())
+					ON DUPLICATE KEY
+					UPDATE count = count + 1, latestEvent = NOW();`,
+				)) as {
+					affectedRows: number;
+				};
+				// MySQL returns 2 affected rows on update
+				return queryResult.affectedRows === 1 ? 'insert' : 'update';
+			}
+		} catch (error) {
+			if (error instanceof QueryFailedError) return 'failed';
+			throw error;
+		}
+	}
+
+	async queryNumWorkflowsUserHasWithFiveOrMoreProdExecs(userId: User['id']): Promise<number> {
+		return await this.createQueryBuilder('workflow_statistics')
+			.innerJoin(WorkflowEntity, 'workflow', 'workflow.id = workflow_statistics.workflowId')
+			.innerJoin(
+				SharedWorkflow,
+				'shared_workflow',
+				'shared_workflow.workflowId = workflow_statistics.workflowId',
+			)
+			.where('shared_workflow.userId = :userId', { userId })
+			.andWhere('workflow.active = :isActive', { isActive: true })
+			.andWhere('workflow_statistics.name = :name', { name: StatisticsNames.productionSuccess })
+			.andWhere('workflow_statistics.count >= 5')
+			.andWhere('role = :roleName', { roleName: 'workflow:owner' })
+			.getCount();
+	}
 }
diff --git a/packages/cli/src/databases/repositories/workflowTagMapping.repository.ts b/packages/cli/src/databases/repositories/workflowTagMapping.repository.ts
index c3a45e862459f..6bf4aa6b2a80e 100644
--- a/packages/cli/src/databases/repositories/workflowTagMapping.repository.ts
+++ b/packages/cli/src/databases/repositories/workflowTagMapping.repository.ts
@@ -1,5 +1,5 @@
 import { Service } from 'typedi';
-import { DataSource, Repository } from 'typeorm';
+import { DataSource, Repository } from '@n8n/typeorm';
 import { WorkflowTagMapping } from '../entities/WorkflowTagMapping';
 
 @Service()
@@ -7,4 +7,14 @@ export class WorkflowTagMappingRepository extends Repository<WorkflowTagMapping>
 	constructor(dataSource: DataSource) {
 		super(WorkflowTagMapping, dataSource.manager);
 	}
+
+	async overwriteTaggings(workflowId: string, tagIds: string[]) {
+		return await this.manager.transaction(async (tx) => {
+			await tx.delete(WorkflowTagMapping, { workflowId });
+
+			const taggings = tagIds.map((tagId) => this.create({ workflowId, tagId }));
+
+			return await tx.insert(WorkflowTagMapping, taggings);
+		});
+	}
 }
diff --git a/packages/cli/src/databases/repositories/workflowTest.repository.ts b/packages/cli/src/databases/repositories/workflowTest.repository.ts
new file mode 100644
index 0000000000000..347e9e6fea957
--- /dev/null
+++ b/packages/cli/src/databases/repositories/workflowTest.repository.ts
@@ -0,0 +1,10 @@
+import { Service } from 'typedi';
+import { DataSource, Repository } from '@n8n/typeorm';
+import { WorkflowTest } from '../entities/WorkflowTest';
+
+@Service()
+export class WorkflowTestRepository extends Repository<WorkflowTest> {
+	constructor(dataSource: DataSource) {
+		super(WorkflowTest, dataSource.manager);
+	}
+}
diff --git a/packages/cli/src/databases/types.ts b/packages/cli/src/databases/types.ts
new file mode 100644
index 0000000000000..e1dc8f20e9b2d
--- /dev/null
+++ b/packages/cli/src/databases/types.ts
@@ -0,0 +1,63 @@
+import type { INodeTypes } from 'n8n-workflow';
+import type { QueryRunner, ObjectLiteral } from '@n8n/typeorm';
+import type { Logger } from '@/Logger';
+import type { createSchemaBuilder } from './dsl';
+
+export type DatabaseType = 'mariadb' | 'postgresdb' | 'mysqldb' | 'sqlite';
+
+export interface MigrationContext {
+	logger: Logger;
+	queryRunner: QueryRunner;
+	tablePrefix: string;
+	dbType: DatabaseType;
+	isMysql: boolean;
+	dbName: string;
+	migrationName: string;
+	nodeTypes: INodeTypes;
+	schemaBuilder: ReturnType<typeof createSchemaBuilder>;
+	loadSurveyFromDisk(): string | null;
+	parseJson<T>(data: string | T): T;
+	escape: {
+		columnName(name: string): string;
+		tableName(name: string): string;
+		indexName(name: string): string;
+	};
+	runQuery<T>(sql: string, namedParameters?: ObjectLiteral): Promise<T>;
+	runInBatches<T>(
+		query: string,
+		operation: (results: T[]) => Promise<void>,
+		limit?: number,
+	): Promise<void>;
+	copyTable(fromTable: string, toTable: string): Promise<void>;
+	copyTable(
+		fromTable: string,
+		toTable: string,
+		fromFields?: string[],
+		toFields?: string[],
+		batchSize?: number,
+	): Promise<void>;
+}
+
+export type MigrationFn = (ctx: MigrationContext) => Promise<void>;
+
+export interface BaseMigration {
+	up: MigrationFn;
+	down?: MigrationFn | never;
+	transaction?: false;
+}
+
+export interface ReversibleMigration extends BaseMigration {
+	down: MigrationFn;
+}
+
+export interface IrreversibleMigration extends BaseMigration {
+	down?: never;
+}
+
+export interface Migration extends Function {
+	prototype: ReversibleMigration | IrreversibleMigration;
+}
+
+export type InsertResult = Array<{ insertId: number }>;
+
+export { QueryFailedError } from '@n8n/typeorm/error/QueryFailedError';
diff --git a/packages/cli/src/databases/utils/commandHelpers.ts b/packages/cli/src/databases/utils/commandHelpers.ts
index 775d6cb6edcaf..f522da354e1a7 100644
--- a/packages/cli/src/databases/utils/commandHelpers.ts
+++ b/packages/cli/src/databases/utils/commandHelpers.ts
@@ -1,6 +1,6 @@
 import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
 import type { CredentialsEntity } from '@db/entities/CredentialsEntity';
-import { getMetadataArgsStorage } from 'typeorm';
+import { getMetadataArgsStorage } from '@n8n/typeorm';
 
 export const disableAutoGeneratedIds = (
 	entityClass: typeof WorkflowEntity | typeof CredentialsEntity,
diff --git a/packages/cli/src/databases/utils/customValidators.ts b/packages/cli/src/databases/utils/customValidators.ts
index f84832fe5507b..8d397e982a0c3 100644
--- a/packages/cli/src/databases/utils/customValidators.ts
+++ b/packages/cli/src/databases/utils/customValidators.ts
@@ -11,7 +11,7 @@ export function NoXss() {
 			options: { message: `Malicious ${propertyName}` },
 			validator: {
 				validate(value: string) {
-					return !/<(\s*)?(script|a|http)/.test(value);
+					return !/(^http|^www)|<(\s*)?(script|a)|(\.[\p{L}\d-]+)/u.test(value);
 				},
 			},
 		});
diff --git a/packages/cli/src/databases/utils/generators.ts b/packages/cli/src/databases/utils/generators.ts
new file mode 100644
index 0000000000000..20748052401f3
--- /dev/null
+++ b/packages/cli/src/databases/utils/generators.ts
@@ -0,0 +1,12 @@
+import { customAlphabet } from 'nanoid';
+import type { N8nInstanceType } from '@/Interfaces';
+
+const nanoid = customAlphabet('0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz', 16);
+
+export function generateNanoId() {
+	return nanoid();
+}
+
+export function generateHostInstanceId(instanceType: N8nInstanceType) {
+	return `${instanceType}-${nanoid()}`;
+}
diff --git a/packages/cli/src/databases/utils/migrationHelpers.ts b/packages/cli/src/databases/utils/migrationHelpers.ts
index 88bb8b0598069..f87076394a8aa 100644
--- a/packages/cli/src/databases/utils/migrationHelpers.ts
+++ b/packages/cli/src/databases/utils/migrationHelpers.ts
@@ -1,33 +1,38 @@
-/* eslint-disable no-await-in-loop */
+import { Container } from 'typedi';
 import { readFileSync, rmSync } from 'fs';
-import { UserSettings } from 'n8n-core';
-import type { QueryRunner } from 'typeorm/query-runner/QueryRunner';
+import { InstanceSettings } from 'n8n-core';
+import type { ObjectLiteral } from '@n8n/typeorm';
+import type { QueryRunner } from '@n8n/typeorm/query-runner/QueryRunner';
+import { ApplicationError, jsonParse } from 'n8n-workflow';
 import config from '@/config';
-import { getLogger } from '@/Logger';
 import { inTest } from '@/constants';
+import type { BaseMigration, Migration, MigrationContext, MigrationFn } from '@db/types';
+import { createSchemaBuilder } from '@db/dsl';
+import { NodeTypes } from '@/NodeTypes';
+import { Logger } from '@/Logger';
 
 const PERSONALIZATION_SURVEY_FILENAME = 'personalizationSurvey.json';
 
-export function loadSurveyFromDisk(): string | null {
-	const userSettingsPath = UserSettings.getUserN8nFolderPath();
+function loadSurveyFromDisk(): string | null {
 	try {
-		const filename = `${userSettingsPath}/${PERSONALIZATION_SURVEY_FILENAME}`;
+		const filename = `${
+			Container.get(InstanceSettings).n8nFolder
+		}/${PERSONALIZATION_SURVEY_FILENAME}`;
 		const surveyFile = readFileSync(filename, 'utf-8');
 		rmSync(filename);
 		const personalizationSurvey = JSON.parse(surveyFile) as object;
 		const kvPairs = Object.entries(personalizationSurvey);
 		if (!kvPairs.length) {
-			throw new Error('personalizationSurvey is empty');
+			throw new ApplicationError('personalizationSurvey is empty');
 		} else {
-			// eslint-disable-next-line @typescript-eslint/naming-convention
-			const emptyKeys = kvPairs.reduce((acc, [_key, value]) => {
+			const emptyKeys = kvPairs.reduce((acc, [, value]) => {
 				if (!value || (Array.isArray(value) && !value.length)) {
 					return acc + 1;
 				}
 				return acc;
 			}, 0);
 			if (emptyKeys === kvPairs.length) {
-				throw new Error('incomplete personalizationSurvey');
+				throw new ApplicationError('incomplete personalizationSurvey');
 			}
 		}
 		return surveyFile;
@@ -36,73 +41,169 @@ export function loadSurveyFromDisk(): string | null {
 	}
 }
 
-let logFinishTimeout: NodeJS.Timeout;
+let runningMigrations = false;
 
-export function logMigrationStart(migrationName: string, disableLogging = inTest): void {
-	if (disableLogging) return;
+function logMigrationStart(migrationName: string): void {
+	if (inTest) return;
 
-	if (!logFinishTimeout) {
-		getLogger().warn('Migrations in progress, please do NOT stop the process.');
+	const logger = Container.get(Logger);
+	if (!runningMigrations) {
+		logger.warn('Migrations in progress, please do NOT stop the process.');
+		runningMigrations = true;
 	}
 
-	getLogger().debug(`Starting migration ${migrationName}`);
-
-	clearTimeout(logFinishTimeout);
+	logger.info(`Starting migration ${migrationName}`);
 }
 
-export function logMigrationEnd(migrationName: string, disableLogging = inTest): void {
-	if (disableLogging) return;
-
-	getLogger().debug(`Finished migration ${migrationName}`);
+function logMigrationEnd(migrationName: string): void {
+	if (inTest) return;
 
-	logFinishTimeout = setTimeout(() => {
-		getLogger().warn('Migrations finished.');
-	}, 100);
+	const logger = Container.get(Logger);
+	logger.info(`Finished migration ${migrationName}`);
 }
 
-function batchQuery(query: string, limit: number, offset = 0): string {
-	return `
-			${query}
-			LIMIT ${limit}
-			OFFSET ${offset}
-		`;
-}
+const runDisablingForeignKeys = async (
+	migration: BaseMigration,
+	context: MigrationContext,
+	fn: MigrationFn,
+) => {
+	const { dbType, queryRunner } = context;
+	if (dbType !== 'sqlite')
+		throw new ApplicationError('Disabling transactions only available in sqlite');
+	await queryRunner.query('PRAGMA foreign_keys=OFF');
+	await queryRunner.startTransaction();
+	try {
+		await fn.call(migration, context);
+		await queryRunner.commitTransaction();
+	} catch (e) {
+		try {
+			await queryRunner.rollbackTransaction();
+		} catch {}
+		throw e;
+	} finally {
+		await queryRunner.query('PRAGMA foreign_keys=ON');
+	}
+};
 
-export async function runInBatches(
-	queryRunner: QueryRunner,
-	query: string,
-	// eslint-disable-next-line @typescript-eslint/no-explicit-any
-	operation: (results: any[]) => Promise<void>,
-	limit = 100,
-): Promise<void> {
-	let offset = 0;
-	let batchedQuery: string;
-	let batchedQueryResults: unknown[];
-
-	// eslint-disable-next-line no-param-reassign
-	if (query.trim().endsWith(';')) query = query.trim().slice(0, -1);
-
-	do {
-		batchedQuery = batchQuery(query, limit, offset);
-		batchedQueryResults = (await queryRunner.query(batchedQuery)) as unknown[];
-		// pass a copy to prevent errors from mutation
-		await operation([...batchedQueryResults]);
-		offset += limit;
-	} while (batchedQueryResults.length === limit);
+function parseJson<T>(data: string | T): T {
+	return typeof data === 'string' ? jsonParse<T>(data) : data;
 }
 
-export const getTablePrefix = () => config.getEnv('database.tablePrefix');
-
-export const escapeQuery = (
-	queryRunner: QueryRunner,
-	query: string,
-	params: { [property: string]: unknown },
-): [string, unknown[]] =>
-	queryRunner.connection.driver.escapeQueryWithParameters(
-		query,
-		{
-			pinData: params.pinData,
-			id: params.id,
-		},
-		{},
-	);
+const dbType = config.getEnv('database.type');
+const isMysql = ['mariadb', 'mysqldb'].includes(dbType);
+const dbName = config.getEnv(`database.${dbType === 'mariadb' ? 'mysqldb' : dbType}.database`);
+const tablePrefix = config.getEnv('database.tablePrefix');
+
+const createContext = (queryRunner: QueryRunner, migration: Migration): MigrationContext => ({
+	logger: Container.get(Logger),
+	tablePrefix,
+	dbType,
+	isMysql,
+	dbName,
+	migrationName: migration.name,
+	queryRunner,
+	schemaBuilder: createSchemaBuilder(tablePrefix, queryRunner),
+	nodeTypes: Container.get(NodeTypes),
+	loadSurveyFromDisk,
+	parseJson,
+	escape: {
+		columnName: (name) => queryRunner.connection.driver.escape(name),
+		tableName: (name) => queryRunner.connection.driver.escape(`${tablePrefix}${name}`),
+		indexName: (name) => queryRunner.connection.driver.escape(`IDX_${tablePrefix}${name}`),
+	},
+	runQuery: async <T>(sql: string, namedParameters?: ObjectLiteral) => {
+		if (namedParameters) {
+			const [query, parameters] = queryRunner.connection.driver.escapeQueryWithParameters(
+				sql,
+				namedParameters,
+				{},
+			);
+			return await (queryRunner.query(query, parameters) as Promise<T>);
+		} else {
+			return await (queryRunner.query(sql) as Promise<T>);
+		}
+	},
+	runInBatches: async <T>(
+		query: string,
+		operation: (results: T[]) => Promise<void>,
+		limit = 100,
+	) => {
+		let offset = 0;
+		let batchedQuery: string;
+		let batchedQueryResults: T[];
+
+		if (query.trim().endsWith(';')) query = query.trim().slice(0, -1);
+
+		do {
+			batchedQuery = `${query} LIMIT ${limit} OFFSET ${offset}`;
+			batchedQueryResults = (await queryRunner.query(batchedQuery)) as T[];
+			// pass a copy to prevent errors from mutation
+			await operation([...batchedQueryResults]);
+			offset += limit;
+		} while (batchedQueryResults.length === limit);
+	},
+	copyTable: async (
+		fromTable: string,
+		toTable: string,
+		fromFields?: string[],
+		toFields?: string[],
+		batchSize?: number,
+	) => {
+		const { driver } = queryRunner.connection;
+		fromTable = driver.escape(`${tablePrefix}${fromTable}`);
+		toTable = driver.escape(`${tablePrefix}${toTable}`);
+		const fromFieldsStr = fromFields?.length
+			? fromFields.map((f) => driver.escape(f)).join(', ')
+			: '*';
+		const toFieldsStr = toFields?.length
+			? `(${toFields.map((f) => driver.escape(f)).join(', ')})`
+			: '';
+
+		const total = await queryRunner
+			.query(`SELECT COUNT(*) AS count FROM ${fromTable}`)
+			.then((rows: Array<{ count: number }>) => rows[0].count);
+
+		batchSize = batchSize ?? 10;
+		let migrated = 0;
+		while (migrated < total) {
+			await queryRunner.query(
+				`INSERT INTO ${toTable} ${toFieldsStr} SELECT ${fromFieldsStr} FROM ${fromTable} LIMIT ${migrated}, ${batchSize}`,
+			);
+			migrated += batchSize;
+		}
+	},
+});
+
+export const wrapMigration = (migration: Migration) => {
+	const { up, down } = migration.prototype;
+	if (up) {
+		Object.assign(migration.prototype, {
+			async up(this: BaseMigration, queryRunner: QueryRunner) {
+				logMigrationStart(migration.name);
+				const context = createContext(queryRunner, migration);
+				if (this.transaction === false) {
+					await runDisablingForeignKeys(this, context, up);
+				} else {
+					await up.call(this, context);
+				}
+				logMigrationEnd(migration.name);
+			},
+		});
+	} else {
+		throw new ApplicationError(
+			'At least on migration is missing the method `up`. Make sure all migrations are valid.',
+		);
+	}
+	if (down) {
+		Object.assign(migration.prototype, {
+			async down(this: BaseMigration, queryRunner: QueryRunner) {
+				const context = createContext(queryRunner, migration);
+				if (this.transaction === false) {
+					await runDisablingForeignKeys(this, context, down);
+				} else {
+					await down.call(this, context);
+				}
+			},
+		});
+	}
+};
diff --git a/packages/cli/src/databases/utils/migrations.types.ts b/packages/cli/src/databases/utils/migrations.types.ts
deleted file mode 100644
index bb3fbca85bb3e..0000000000000
--- a/packages/cli/src/databases/utils/migrations.types.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
-
-export namespace PinData {
-	export type Old = { [nodeName: string]: IDataObject[] };
-
-	export type New = { [nodeName: string]: INodeExecutionData[] };
-
-	export type FetchedWorkflow = { id: number; pinData: string | Old };
-}
-
-export function isObjectLiteral(maybeObject: unknown): maybeObject is { [key: string]: string } {
-	return typeof maybeObject === 'object' && maybeObject !== null && !Array.isArray(maybeObject);
-}
-
-export function isJsonKeyObject(item: unknown): item is {
-	json: unknown;
-	[otherKeys: string]: unknown;
-} {
-	if (!isObjectLiteral(item)) return false;
-
-	return Object.keys(item).includes('json');
-}
diff --git a/packages/cli/src/databases/utils/transformers.ts b/packages/cli/src/databases/utils/transformers.ts
index df084889565df..2ddd784c750c4 100644
--- a/packages/cli/src/databases/utils/transformers.ts
+++ b/packages/cli/src/databases/utils/transformers.ts
@@ -1,5 +1,5 @@
 import { jsonParse } from 'n8n-workflow';
-import type { ValueTransformer, FindOperator } from 'typeorm';
+import type { ValueTransformer, FindOperator } from '@n8n/typeorm';
 import config from '@/config';
 
 export const idStringifier = {
diff --git a/packages/cli/src/decorators/Authorized.ts b/packages/cli/src/decorators/Authorized.ts
deleted file mode 100644
index 880938ae5ce72..0000000000000
--- a/packages/cli/src/decorators/Authorized.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/* eslint-disable @typescript-eslint/ban-types */
-/* eslint-disable @typescript-eslint/naming-convention */
-import { CONTROLLER_AUTH_ROLES } from './constants';
-import type { AuthRoleMetadata } from './types';
-
-export function Authorized(authRole: AuthRoleMetadata[string] = 'any'): Function {
-	return function (target: Function | Object, handlerName?: string) {
-		const controllerClass = handlerName ? target.constructor : target;
-		const authRoles = (Reflect.getMetadata(CONTROLLER_AUTH_ROLES, controllerClass) ??
-			{}) as AuthRoleMetadata;
-		authRoles[handlerName ?? '*'] = authRole;
-		Reflect.defineMetadata(CONTROLLER_AUTH_ROLES, authRoles, controllerClass);
-	};
-}
-
-export const NoAuthRequired = () => Authorized('none');
diff --git a/packages/cli/src/decorators/Licensed.ts b/packages/cli/src/decorators/Licensed.ts
new file mode 100644
index 0000000000000..b411e8fa1601d
--- /dev/null
+++ b/packages/cli/src/decorators/Licensed.ts
@@ -0,0 +1,14 @@
+import type { BooleanLicenseFeature } from '@/Interfaces';
+import type { LicenseMetadata } from './types';
+import { CONTROLLER_LICENSE_FEATURES } from './constants';
+
+export const Licensed = (features: BooleanLicenseFeature | BooleanLicenseFeature[]) => {
+	// eslint-disable-next-line @typescript-eslint/ban-types
+	return (target: Function | object, handlerName?: string) => {
+		const controllerClass = handlerName ? target.constructor : target;
+		const license = (Reflect.getMetadata(CONTROLLER_LICENSE_FEATURES, controllerClass) ??
+			{}) as LicenseMetadata;
+		license[handlerName ?? '*'] = Array.isArray(features) ? features : [features];
+		Reflect.defineMetadata(CONTROLLER_LICENSE_FEATURES, license, controllerClass);
+	};
+};
diff --git a/packages/cli/src/decorators/Middleware.ts b/packages/cli/src/decorators/Middleware.ts
index 6d5e957f6eccf..ed26fe5bf4d9f 100644
--- a/packages/cli/src/decorators/Middleware.ts
+++ b/packages/cli/src/decorators/Middleware.ts
@@ -1,7 +1,6 @@
 import { CONTROLLER_MIDDLEWARES } from './constants';
 import type { MiddlewareMetadata } from './types';
 
-// eslint-disable-next-line @typescript-eslint/naming-convention
 export const Middleware = (): MethodDecorator => (target, handlerName) => {
 	const controllerClass = target.constructor;
 	const middlewares = (Reflect.getMetadata(CONTROLLER_MIDDLEWARES, controllerClass) ??
diff --git a/packages/cli/src/decorators/OnShutdown.ts b/packages/cli/src/decorators/OnShutdown.ts
new file mode 100644
index 0000000000000..88eaf8fb11cc7
--- /dev/null
+++ b/packages/cli/src/decorators/OnShutdown.ts
@@ -0,0 +1,39 @@
+import { Container } from 'typedi';
+import { ApplicationError } from 'n8n-workflow';
+import { type ServiceClass, ShutdownService } from '@/shutdown/Shutdown.service';
+
+/**
+ * Decorator that registers a method as a shutdown hook. The method will
+ * be called when the application is shutting down.
+ *
+ * Priority is used to determine the order in which the hooks are called.
+ *
+ * NOTE: Requires also @Service() decorator to be used on the class.
+ *
+ * @example
+ * ```ts
+ * @Service()
+ * class MyClass {
+ *   @OnShutdown()
+ *   async shutdown() {
+ * 	   // Will be called when the app is shutting down
+ *   }
+ * }
+ * ```
+ */
+export const OnShutdown =
+	(priority = 100): MethodDecorator =>
+	(prototype, propertyKey, descriptor) => {
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+		const serviceClass = prototype.constructor as ServiceClass;
+		const methodName = String(propertyKey);
+		// TODO: assert that serviceClass is decorated with @Service
+		if (typeof descriptor?.value === 'function') {
+			Container.get(ShutdownService).register(priority, { serviceClass, methodName });
+		} else {
+			const name = `${serviceClass.name}.${methodName}()`;
+			throw new ApplicationError(
+				`${name} must be a method on ${serviceClass.name} to use "OnShutdown"`,
+			);
+		}
+	};
diff --git a/packages/cli/src/decorators/RestController.ts b/packages/cli/src/decorators/RestController.ts
index 11c2d55665b39..ca235cba59d66 100644
--- a/packages/cli/src/decorators/RestController.ts
+++ b/packages/cli/src/decorators/RestController.ts
@@ -1,8 +1,10 @@
-/* eslint-disable @typescript-eslint/naming-convention */
+import { Service } from 'typedi';
 import { CONTROLLER_BASE_PATH } from './constants';
 
 export const RestController =
 	(basePath: `/${string}` = '/'): ClassDecorator =>
 	(target: object) => {
 		Reflect.defineMetadata(CONTROLLER_BASE_PATH, basePath, target);
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-return
+		return Service()(target);
 	};
diff --git a/packages/cli/src/decorators/Route.ts b/packages/cli/src/decorators/Route.ts
index e51369a64ce43..dee79350405b2 100644
--- a/packages/cli/src/decorators/Route.ts
+++ b/packages/cli/src/decorators/Route.ts
@@ -4,9 +4,13 @@ import type { Method, RouteMetadata } from './types';
 
 interface RouteOptions {
 	middlewares?: RequestHandler[];
+	usesTemplates?: boolean;
+	/** When this flag is set to true, auth cookie isn't validated, and req.user will not be set */
+	skipAuth?: boolean;
+	/** When this flag is set to true, calls to this endpoint is rate limited to a max of 5 over a window of 5 minutes **/
+	rateLimit?: boolean;
 }
 
-/* eslint-disable @typescript-eslint/naming-convention */
 const RouteFactory =
 	(method: Method) =>
 	(path: `/${string}`, options: RouteOptions = {}): MethodDecorator =>
@@ -19,6 +23,9 @@ const RouteFactory =
 			path,
 			middlewares: options.middlewares ?? [],
 			handlerName: String(handlerName),
+			usesTemplates: options.usesTemplates ?? false,
+			skipAuth: options.skipAuth ?? false,
+			rateLimit: options.rateLimit ?? false,
 		});
 		Reflect.defineMetadata(CONTROLLER_ROUTES, routes, controllerClass);
 	};
diff --git a/packages/cli/src/decorators/Scopes.ts b/packages/cli/src/decorators/Scopes.ts
new file mode 100644
index 0000000000000..aa2518017d699
--- /dev/null
+++ b/packages/cli/src/decorators/Scopes.ts
@@ -0,0 +1,14 @@
+import type { Scope } from '@n8n/permissions';
+import type { ScopeMetadata } from './types';
+import { CONTROLLER_REQUIRED_SCOPES } from './constants';
+
+export const GlobalScope = (scope: Scope | Scope[]) => {
+	// eslint-disable-next-line @typescript-eslint/ban-types
+	return (target: Function | object, handlerName?: string) => {
+		const controllerClass = handlerName ? target.constructor : target;
+		const scopes = (Reflect.getMetadata(CONTROLLER_REQUIRED_SCOPES, controllerClass) ??
+			[]) as ScopeMetadata;
+		scopes[handlerName ?? '*'] = Array.isArray(scope) ? scope : [scope];
+		Reflect.defineMetadata(CONTROLLER_REQUIRED_SCOPES, scopes, controllerClass);
+	};
+};
diff --git a/packages/cli/src/decorators/constants.ts b/packages/cli/src/decorators/constants.ts
index 5a5efc938db6c..1487f91a0fc56 100644
--- a/packages/cli/src/decorators/constants.ts
+++ b/packages/cli/src/decorators/constants.ts
@@ -1,4 +1,5 @@
 export const CONTROLLER_ROUTES = 'CONTROLLER_ROUTES';
 export const CONTROLLER_BASE_PATH = 'CONTROLLER_BASE_PATH';
 export const CONTROLLER_MIDDLEWARES = 'CONTROLLER_MIDDLEWARES';
-export const CONTROLLER_AUTH_ROLES = 'CONTROLLER_AUTH_ROLES';
+export const CONTROLLER_LICENSE_FEATURES = 'CONTROLLER_LICENSE_FEATURES';
+export const CONTROLLER_REQUIRED_SCOPES = 'CONTROLLER_REQUIRED_SCOPES';
diff --git a/packages/cli/src/decorators/index.ts b/packages/cli/src/decorators/index.ts
index 0e683d410cbc9..94c94ef184f79 100644
--- a/packages/cli/src/decorators/index.ts
+++ b/packages/cli/src/decorators/index.ts
@@ -1,5 +1,6 @@
-export { Authorized, NoAuthRequired } from './Authorized';
 export { RestController } from './RestController';
 export { Get, Post, Put, Patch, Delete } from './Route';
 export { Middleware } from './Middleware';
 export { registerController } from './registerController';
+export { Licensed } from './Licensed';
+export { GlobalScope } from './Scopes';
diff --git a/packages/cli/src/decorators/registerController.ts b/packages/cli/src/decorators/registerController.ts
index fe792040b6067..ab4c3c4f40843 100644
--- a/packages/cli/src/decorators/registerController.ts
+++ b/packages/cli/src/decorators/registerController.ts
@@ -1,49 +1,93 @@
-/* eslint-disable @typescript-eslint/naming-convention */
+import { Container } from 'typedi';
 import { Router } from 'express';
 import type { Application, Request, Response, RequestHandler } from 'express';
-import type { Config } from '@/config';
+import { rateLimit as expressRateLimit } from 'express-rate-limit';
+import type { Scope } from '@n8n/permissions';
+import { ApplicationError } from 'n8n-workflow';
+import type { Class } from 'n8n-core';
+
+import { AuthService } from '@/auth/auth.service';
+import config from '@/config';
+import { inE2ETests, inTest } from '@/constants';
+import type { BooleanLicenseFeature } from '@/Interfaces';
+import { License } from '@/License';
 import type { AuthenticatedRequest } from '@/requests';
 import { send } from '@/ResponseHelper'; // TODO: move `ResponseHelper.send` to this file
 import {
-	CONTROLLER_AUTH_ROLES,
 	CONTROLLER_BASE_PATH,
+	CONTROLLER_LICENSE_FEATURES,
 	CONTROLLER_MIDDLEWARES,
+	CONTROLLER_REQUIRED_SCOPES,
 	CONTROLLER_ROUTES,
 } from './constants';
 import type {
-	AuthRole,
-	AuthRoleMetadata,
 	Controller,
+	LicenseMetadata,
 	MiddlewareMetadata,
 	RouteMetadata,
+	ScopeMetadata,
 } from './types';
 
-export const createAuthMiddleware =
-	(authRole: AuthRole): RequestHandler =>
-	({ user }: AuthenticatedRequest, res, next) => {
-		if (authRole === 'none') return next();
+const throttle = expressRateLimit({
+	windowMs: 5 * 60 * 1000, // 5 minutes
+	limit: 5, // Limit each IP to 5 requests per `window` (here, per 5 minutes).
+	message: { message: 'Too many requests' },
+});
 
-		if (!user) return res.status(401).json({ status: 'error', message: 'Unauthorized' });
+export const createLicenseMiddleware =
+	(features: BooleanLicenseFeature[]): RequestHandler =>
+	(_req, res, next) => {
+		if (features.length === 0) {
+			return next();
+		}
+
+		const licenseService = Container.get(License);
+
+		const hasAllFeatures = features.every((feature) => licenseService.isFeatureEnabled(feature));
+		if (!hasAllFeatures) {
+			return res
+				.status(403)
+				.json({ status: 'error', message: 'Plan lacks license for this feature' });
+		}
 
-		const { globalRole } = user;
-		if (authRole === 'any' || (globalRole.scope === authRole[0] && globalRole.name === authRole[1]))
+		return next();
+	};
+
+export const createGlobalScopeMiddleware =
+	(scopes: Scope[]): RequestHandler =>
+	async ({ user }: AuthenticatedRequest, res, next) => {
+		if (scopes.length === 0) {
 			return next();
+		}
+
+		if (!user) return res.status(401).json({ status: 'error', message: 'Unauthorized' });
+
+		const hasScopes = user.hasGlobalScope(scopes);
+		if (!hasScopes) {
+			return res.status(403).json({ status: 'error', message: 'Unauthorized' });
+		}
 
-		res.status(403).json({ status: 'error', message: 'Unauthorized' });
+		return next();
 	};
 
-export const registerController = (app: Application, config: Config, controller: object) => {
-	const controllerClass = controller.constructor;
+export const registerController = (app: Application, controllerClass: Class<object>) => {
+	const controller = Container.get(controllerClass as Class<Controller>);
 	const controllerBasePath = Reflect.getMetadata(CONTROLLER_BASE_PATH, controllerClass) as
 		| string
 		| undefined;
 	if (!controllerBasePath)
-		throw new Error(`${controllerClass.name} is missing the RestController decorator`);
+		throw new ApplicationError('Controller is missing the RestController decorator', {
+			extra: { controllerName: controllerClass.name },
+		});
 
-	const authRoles = Reflect.getMetadata(CONTROLLER_AUTH_ROLES, controllerClass) as
-		| AuthRoleMetadata
-		| undefined;
 	const routes = Reflect.getMetadata(CONTROLLER_ROUTES, controllerClass) as RouteMetadata[];
+	const licenseFeatures = Reflect.getMetadata(CONTROLLER_LICENSE_FEATURES, controllerClass) as
+		| LicenseMetadata
+		| undefined;
+	const requiredScopes = Reflect.getMetadata(CONTROLLER_REQUIRED_SCOPES, controllerClass) as
+		| ScopeMetadata
+		| undefined;
+
 	if (routes.length > 0) {
 		const router = Router({ mergeParams: true });
 		const restBasePath = config.getEnv('endpoints.rest');
@@ -53,23 +97,37 @@ export const registerController = (app: Application, config: Config, controller:
 
 		const controllerMiddlewares = (
 			(Reflect.getMetadata(CONTROLLER_MIDDLEWARES, controllerClass) ?? []) as MiddlewareMetadata[]
-		).map(
-			({ handlerName }) =>
-				(controller as Controller)[handlerName].bind(controller) as RequestHandler,
-		);
+		).map(({ handlerName }) => controller[handlerName].bind(controller) as RequestHandler);
+
+		const authService = Container.get(AuthService);
 
-		routes.forEach(({ method, path, middlewares: routeMiddlewares, handlerName }) => {
-			const authRole = authRoles && (authRoles[handlerName] ?? authRoles['*']);
-			router[method](
+		routes.forEach(
+			({
+				method,
 				path,
-				...(authRole ? [createAuthMiddleware(authRole)] : []),
-				...controllerMiddlewares,
-				...routeMiddlewares,
-				send(async (req: Request, res: Response) =>
-					(controller as Controller)[handlerName](req, res),
-				),
-			);
-		});
+				middlewares: routeMiddlewares,
+				handlerName,
+				usesTemplates,
+				skipAuth,
+				rateLimit,
+			}) => {
+				const features = licenseFeatures?.[handlerName] ?? licenseFeatures?.['*'];
+				const scopes = requiredScopes?.[handlerName] ?? requiredScopes?.['*'];
+				const handler = async (req: Request, res: Response) =>
+					await controller[handlerName](req, res);
+				router[method](
+					path,
+					...(!inTest && !inE2ETests && rateLimit ? [throttle] : []),
+					// eslint-disable-next-line @typescript-eslint/unbound-method
+					...(skipAuth ? [] : [authService.authMiddleware]),
+					...(features ? [createLicenseMiddleware(features)] : []),
+					...(scopes ? [createGlobalScopeMiddleware(scopes)] : []),
+					...controllerMiddlewares,
+					...routeMiddlewares,
+					usesTemplates ? handler : send(handler),
+				);
+			},
+		);
 
 		app.use(prefix, router);
 	}
diff --git a/packages/cli/src/decorators/types.ts b/packages/cli/src/decorators/types.ts
index d118e6e6c9cbd..de47a23333e1b 100644
--- a/packages/cli/src/decorators/types.ts
+++ b/packages/cli/src/decorators/types.ts
@@ -1,10 +1,12 @@
 import type { Request, Response, RequestHandler } from 'express';
-import type { RoleNames, RoleScopes } from '@db/entities/Role';
+import type { BooleanLicenseFeature } from '@/Interfaces';
+import type { Scope } from '@n8n/permissions';
 
 export type Method = 'get' | 'post' | 'put' | 'patch' | 'delete';
 
-export type AuthRole = [RoleScopes, RoleNames] | 'any' | 'none';
-export type AuthRoleMetadata = Record<string, AuthRole>;
+export type LicenseMetadata = Record<string, BooleanLicenseFeature[]>;
+
+export type ScopeMetadata = Record<string, Scope[]>;
 
 export interface MiddlewareMetadata {
 	handlerName: string;
@@ -15,6 +17,9 @@ export interface RouteMetadata {
 	path: string;
 	handlerName: string;
 	middlewares: RequestHandler[];
+	usesTemplates: boolean;
+	skipAuth: boolean;
+	rateLimit: boolean;
 }
 
 export type Controller = Record<
diff --git a/packages/cli/src/elitesoftwareautomation/utils.ts b/packages/cli/src/elitesoftwareautomation/utils.ts
index 03d66a217f35c..f1b00355260fa 100644
--- a/packages/cli/src/elitesoftwareautomation/utils.ts
+++ b/packages/cli/src/elitesoftwareautomation/utils.ts
@@ -81,7 +81,7 @@ export const createPostmanCollectionRequestsForWorkflowWebhooks = async (
 					},
 					{},
 					// eslint-disable-next-line @typescript-eslint/no-explicit-any
-					(error: any, conversionResult) => {
+					(error: any, conversionResult: any) => {
 						if (!conversionResult.result) {
 							const message =
 								// eslint-disable-next-line @typescript-eslint/restrict-plus-operands
@@ -91,7 +91,7 @@ export const createPostmanCollectionRequestsForWorkflowWebhooks = async (
 							reject(new Error(message));
 						} else {
 							const foundCollection = conversionResult.output.find(
-								(collection) => collection.type === 'collection',
+								(collection: any) => collection.type === 'collection',
 							);
 							if (foundCollection) {
 								resolve(foundCollection.data);
@@ -174,7 +174,7 @@ export const createPostmanCollectionRequestsForWorkflowWebhooks = async (
 
 				if (collectionItems) {
 					// find it directly in the collection, i.e. not within folders
-					collectionRequestItemIndex = collectionItems.findIndex((requestItem) => {
+					collectionRequestItemIndex = collectionItems.findIndex((requestItem: any) => {
 						if ('request' in requestItem) {
 							const requestItemUrlData =
 								typeof requestItem.request?.url === 'string'
diff --git a/packages/cli/src/environments/sourceControl/constants.ts b/packages/cli/src/environments/sourceControl/constants.ts
new file mode 100644
index 0000000000000..6580ce99793bf
--- /dev/null
+++ b/packages/cli/src/environments/sourceControl/constants.ts
@@ -0,0 +1,17 @@
+export const SOURCE_CONTROL_PREFERENCES_DB_KEY = 'features.sourceControl';
+export const SOURCE_CONTROL_GIT_FOLDER = 'git';
+export const SOURCE_CONTROL_GIT_KEY_COMMENT = 'n8n deploy key';
+export const SOURCE_CONTROL_WORKFLOW_EXPORT_FOLDER = 'workflows';
+export const SOURCE_CONTROL_CREDENTIAL_EXPORT_FOLDER = 'credential_stubs';
+export const SOURCE_CONTROL_VARIABLES_EXPORT_FILE = 'variable_stubs.json';
+export const SOURCE_CONTROL_TAGS_EXPORT_FILE = 'tags.json';
+export const SOURCE_CONTROL_OWNERS_EXPORT_FILE = 'workflow_owners.json';
+export const SOURCE_CONTROL_SSH_FOLDER = 'ssh';
+export const SOURCE_CONTROL_SSH_KEY_NAME = 'key';
+export const SOURCE_CONTROL_DEFAULT_BRANCH = 'main';
+export const SOURCE_CONTROL_ORIGIN = 'origin';
+export const SOURCE_CONTROL_README = `
+# n8n Source Control
+`;
+export const SOURCE_CONTROL_DEFAULT_NAME = 'n8n user';
+export const SOURCE_CONTROL_DEFAULT_EMAIL = 'n8n@example.com';
diff --git a/packages/cli/src/environments/sourceControl/middleware/sourceControlEnabledMiddleware.ee.ts b/packages/cli/src/environments/sourceControl/middleware/sourceControlEnabledMiddleware.ee.ts
new file mode 100644
index 0000000000000..2bf64f7ba91b5
--- /dev/null
+++ b/packages/cli/src/environments/sourceControl/middleware/sourceControlEnabledMiddleware.ee.ts
@@ -0,0 +1,28 @@
+import type { RequestHandler } from 'express';
+import { Container } from 'typedi';
+import { isSourceControlLicensed } from '../sourceControlHelper.ee';
+import { SourceControlPreferencesService } from '../sourceControlPreferences.service.ee';
+
+export const sourceControlLicensedAndEnabledMiddleware: RequestHandler = (req, res, next) => {
+	const sourceControlPreferencesService = Container.get(SourceControlPreferencesService);
+	if (sourceControlPreferencesService.isSourceControlLicensedAndEnabled()) {
+		next();
+	} else {
+		if (!sourceControlPreferencesService.isSourceControlConnected()) {
+			res.status(412).json({
+				status: 'error',
+				message: 'source_control_not_connected',
+			});
+		} else {
+			res.status(401).json({ status: 'error', message: 'Unauthorized' });
+		}
+	}
+};
+
+export const sourceControlLicensedMiddleware: RequestHandler = (req, res, next) => {
+	if (isSourceControlLicensed()) {
+		next();
+	} else {
+		res.status(401).json({ status: 'error', message: 'Unauthorized' });
+	}
+};
diff --git a/packages/cli/src/environments/sourceControl/sourceControl.controller.ee.ts b/packages/cli/src/environments/sourceControl/sourceControl.controller.ee.ts
new file mode 100644
index 0000000000000..77d733079982d
--- /dev/null
+++ b/packages/cli/src/environments/sourceControl/sourceControl.controller.ee.ts
@@ -0,0 +1,248 @@
+import type { PullResult } from 'simple-git';
+import express from 'express';
+import { Get, Post, Patch, RestController, GlobalScope } from '@/decorators';
+import {
+	sourceControlLicensedMiddleware,
+	sourceControlLicensedAndEnabledMiddleware,
+} from './middleware/sourceControlEnabledMiddleware.ee';
+import { SourceControlService } from './sourceControl.service.ee';
+import { SourceControlRequest } from './types/requests';
+import { SourceControlPreferencesService } from './sourceControlPreferences.service.ee';
+import type { SourceControlPreferences } from './types/sourceControlPreferences';
+import type { SourceControlledFile } from './types/sourceControlledFile';
+import { SOURCE_CONTROL_DEFAULT_BRANCH } from './constants';
+import type { ImportResult } from './types/importResult';
+import { InternalHooks } from '@/InternalHooks';
+import { getRepoType } from './sourceControlHelper.ee';
+import { SourceControlGetStatus } from './types/sourceControlGetStatus';
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
+
+@RestController('/source-control')
+export class SourceControlController {
+	constructor(
+		private readonly sourceControlService: SourceControlService,
+		private readonly sourceControlPreferencesService: SourceControlPreferencesService,
+		private readonly internalHooks: InternalHooks,
+	) {}
+
+	@Get('/preferences', { middlewares: [sourceControlLicensedMiddleware], skipAuth: true })
+	async getPreferences(): Promise<SourceControlPreferences> {
+		// returns the settings with the privateKey property redacted
+		const publicKey = await this.sourceControlPreferencesService.getPublicKey();
+		return { ...this.sourceControlPreferencesService.getPreferences(), publicKey };
+	}
+
+	@Post('/preferences', { middlewares: [sourceControlLicensedMiddleware] })
+	@GlobalScope('sourceControl:manage')
+	async setPreferences(req: SourceControlRequest.UpdatePreferences) {
+		if (
+			req.body.branchReadOnly === undefined &&
+			this.sourceControlPreferencesService.isSourceControlConnected()
+		) {
+			throw new BadRequestError(
+				'Cannot change preferences while connected to a source control provider. Please disconnect first.',
+			);
+		}
+		try {
+			const sanitizedPreferences: Partial<SourceControlPreferences> = {
+				...req.body,
+				initRepo: req.body.initRepo ?? true, // default to true if not specified
+				connected: undefined,
+				publicKey: undefined,
+			};
+			await this.sourceControlPreferencesService.validateSourceControlPreferences(
+				sanitizedPreferences,
+			);
+			const updatedPreferences =
+				await this.sourceControlPreferencesService.setPreferences(sanitizedPreferences);
+			if (sanitizedPreferences.initRepo === true) {
+				try {
+					await this.sourceControlService.initializeRepository(
+						{
+							...updatedPreferences,
+							branchName:
+								updatedPreferences.branchName === ''
+									? SOURCE_CONTROL_DEFAULT_BRANCH
+									: updatedPreferences.branchName,
+							initRepo: true,
+						},
+						req.user,
+					);
+					if (this.sourceControlPreferencesService.getPreferences().branchName !== '') {
+						await this.sourceControlPreferencesService.setPreferences({
+							connected: true,
+						});
+					}
+				} catch (error) {
+					// if initialization fails, run cleanup to remove any intermediate state and throw the error
+					await this.sourceControlService.disconnect({ keepKeyPair: true });
+					throw error;
+				}
+			}
+			await this.sourceControlService.init();
+			const resultingPreferences = this.sourceControlPreferencesService.getPreferences();
+			// #region Tracking Information
+			// located in controller so as to not call this multiple times when updating preferences
+			void this.internalHooks.onSourceControlSettingsUpdated({
+				branch_name: resultingPreferences.branchName,
+				connected: resultingPreferences.connected,
+				read_only_instance: resultingPreferences.branchReadOnly,
+				repo_type: getRepoType(resultingPreferences.repositoryUrl),
+			});
+			// #endregion
+			return resultingPreferences;
+		} catch (error) {
+			throw new BadRequestError((error as { message: string }).message);
+		}
+	}
+
+	@Patch('/preferences', { middlewares: [sourceControlLicensedMiddleware] })
+	@GlobalScope('sourceControl:manage')
+	async updatePreferences(req: SourceControlRequest.UpdatePreferences) {
+		try {
+			const sanitizedPreferences: Partial<SourceControlPreferences> = {
+				...req.body,
+				initRepo: false,
+				connected: undefined,
+				publicKey: undefined,
+				repositoryUrl: undefined,
+			};
+			const currentPreferences = this.sourceControlPreferencesService.getPreferences();
+			await this.sourceControlPreferencesService.validateSourceControlPreferences(
+				sanitizedPreferences,
+			);
+			if (
+				sanitizedPreferences.branchName &&
+				sanitizedPreferences.branchName !== currentPreferences.branchName
+			) {
+				await this.sourceControlService.setBranch(sanitizedPreferences.branchName);
+			}
+			if (sanitizedPreferences.branchColor ?? sanitizedPreferences.branchReadOnly !== undefined) {
+				await this.sourceControlPreferencesService.setPreferences(
+					{
+						branchColor: sanitizedPreferences.branchColor,
+						branchReadOnly: sanitizedPreferences.branchReadOnly,
+					},
+					true,
+				);
+			}
+			await this.sourceControlService.init();
+			const resultingPreferences = this.sourceControlPreferencesService.getPreferences();
+			void this.internalHooks.onSourceControlSettingsUpdated({
+				branch_name: resultingPreferences.branchName,
+				connected: resultingPreferences.connected,
+				read_only_instance: resultingPreferences.branchReadOnly,
+				repo_type: getRepoType(resultingPreferences.repositoryUrl),
+			});
+			return resultingPreferences;
+		} catch (error) {
+			throw new BadRequestError((error as { message: string }).message);
+		}
+	}
+
+	@Post('/disconnect', { middlewares: [sourceControlLicensedMiddleware] })
+	@GlobalScope('sourceControl:manage')
+	async disconnect(req: SourceControlRequest.Disconnect) {
+		try {
+			return await this.sourceControlService.disconnect(req.body);
+		} catch (error) {
+			throw new BadRequestError((error as { message: string }).message);
+		}
+	}
+
+	@Get('/get-branches', { middlewares: [sourceControlLicensedMiddleware] })
+	async getBranches() {
+		try {
+			return await this.sourceControlService.getBranches();
+		} catch (error) {
+			throw new BadRequestError((error as { message: string }).message);
+		}
+	}
+
+	@Post('/push-workfolder', { middlewares: [sourceControlLicensedAndEnabledMiddleware] })
+	@GlobalScope('sourceControl:push')
+	async pushWorkfolder(
+		req: SourceControlRequest.PushWorkFolder,
+		res: express.Response,
+	): Promise<SourceControlledFile[]> {
+		if (this.sourceControlPreferencesService.isBranchReadOnly()) {
+			throw new BadRequestError('Cannot push onto read-only branch.');
+		}
+		try {
+			await this.sourceControlService.setGitUserDetails(
+				`${req.user.firstName} ${req.user.lastName}`,
+				req.user.email,
+			);
+			const result = await this.sourceControlService.pushWorkfolder(req.body);
+			res.statusCode = result.statusCode;
+			return result.statusResult;
+		} catch (error) {
+			throw new BadRequestError((error as { message: string }).message);
+		}
+	}
+
+	@Post('/pull-workfolder', { middlewares: [sourceControlLicensedAndEnabledMiddleware] })
+	@GlobalScope('sourceControl:pull')
+	async pullWorkfolder(
+		req: SourceControlRequest.PullWorkFolder,
+		res: express.Response,
+	): Promise<SourceControlledFile[] | ImportResult | PullResult | undefined> {
+		try {
+			const result = await this.sourceControlService.pullWorkfolder({
+				force: req.body.force,
+				variables: req.body.variables,
+				userId: req.user.id,
+			});
+			res.statusCode = result.statusCode;
+			return result.statusResult;
+		} catch (error) {
+			throw new BadRequestError((error as { message: string }).message);
+		}
+	}
+
+	@Get('/reset-workfolder', { middlewares: [sourceControlLicensedAndEnabledMiddleware] })
+	@GlobalScope('sourceControl:manage')
+	async resetWorkfolder(): Promise<ImportResult | undefined> {
+		try {
+			return await this.sourceControlService.resetWorkfolder();
+		} catch (error) {
+			throw new BadRequestError((error as { message: string }).message);
+		}
+	}
+
+	@Get('/get-status', { middlewares: [sourceControlLicensedAndEnabledMiddleware] })
+	async getStatus(req: SourceControlRequest.GetStatus) {
+		try {
+			const result = (await this.sourceControlService.getStatus(
+				new SourceControlGetStatus(req.query),
+			)) as SourceControlledFile[];
+			return result;
+		} catch (error) {
+			throw new BadRequestError((error as { message: string }).message);
+		}
+	}
+
+	@Get('/status', { middlewares: [sourceControlLicensedMiddleware] })
+	async status(req: SourceControlRequest.GetStatus) {
+		try {
+			return await this.sourceControlService.getStatus(new SourceControlGetStatus(req.query));
+		} catch (error) {
+			throw new BadRequestError((error as { message: string }).message);
+		}
+	}
+
+	@Post('/generate-key-pair', { middlewares: [sourceControlLicensedMiddleware] })
+	@GlobalScope('sourceControl:manage')
+	async generateKeyPair(
+		req: SourceControlRequest.GenerateKeyPair,
+	): Promise<SourceControlPreferences> {
+		try {
+			const keyPairType = req.body.keyGeneratorType;
+			const result = await this.sourceControlPreferencesService.generateAndSaveKeyPair(keyPairType);
+			const publicKey = await this.sourceControlPreferencesService.getPublicKey();
+			return { ...result, publicKey };
+		} catch (error) {
+			throw new BadRequestError((error as { message: string }).message);
+		}
+	}
+}
diff --git a/packages/cli/src/environments/sourceControl/sourceControl.service.ee.ts b/packages/cli/src/environments/sourceControl/sourceControl.service.ee.ts
new file mode 100644
index 0000000000000..c52c0300d5c17
--- /dev/null
+++ b/packages/cli/src/environments/sourceControl/sourceControl.service.ee.ts
@@ -0,0 +1,765 @@
+import Container, { Service } from 'typedi';
+import path from 'path';
+import {
+	getTagsPath,
+	getTrackingInformationFromPostPushResult,
+	getTrackingInformationFromPrePushResult,
+	getTrackingInformationFromPullResult,
+	getVariablesPath,
+	sourceControlFoldersExistCheck,
+} from './sourceControlHelper.ee';
+import type { SourceControlPreferences } from './types/sourceControlPreferences';
+import {
+	SOURCE_CONTROL_DEFAULT_EMAIL,
+	SOURCE_CONTROL_DEFAULT_NAME,
+	SOURCE_CONTROL_README,
+} from './constants';
+import { SourceControlGitService } from './sourceControlGit.service.ee';
+import type { PushResult } from 'simple-git';
+import { SourceControlExportService } from './sourceControlExport.service.ee';
+import type { ImportResult } from './types/importResult';
+import type { SourceControlPushWorkFolder } from './types/sourceControlPushWorkFolder';
+import type { SourceControllPullOptions } from './types/sourceControlPullWorkFolder';
+import type { SourceControlledFile } from './types/sourceControlledFile';
+import { SourceControlPreferencesService } from './sourceControlPreferences.service.ee';
+import { writeFileSync } from 'fs';
+import { SourceControlImportService } from './sourceControlImport.service.ee';
+import type { User } from '@db/entities/User';
+import type { SourceControlGetStatus } from './types/sourceControlGetStatus';
+import type { TagEntity } from '@db/entities/TagEntity';
+import type { Variables } from '@db/entities/Variables';
+import type { SourceControlWorkflowVersionId } from './types/sourceControlWorkflowVersionId';
+import type { ExportableCredential } from './types/exportableCredential';
+import { InternalHooks } from '@/InternalHooks';
+import { TagRepository } from '@db/repositories/tag.repository';
+import { Logger } from '@/Logger';
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
+import { ApplicationError } from 'n8n-workflow';
+
+@Service()
+export class SourceControlService {
+	/** Path to SSH private key in filesystem. */
+	private sshKeyName: string;
+
+	private sshFolder: string;
+
+	private gitFolder: string;
+
+	constructor(
+		private readonly logger: Logger,
+		private gitService: SourceControlGitService,
+		private sourceControlPreferencesService: SourceControlPreferencesService,
+		private sourceControlExportService: SourceControlExportService,
+		private sourceControlImportService: SourceControlImportService,
+		private tagRepository: TagRepository,
+	) {
+		const { gitFolder, sshFolder, sshKeyName } = sourceControlPreferencesService;
+		this.gitFolder = gitFolder;
+		this.sshFolder = sshFolder;
+		this.sshKeyName = sshKeyName;
+	}
+
+	async init(): Promise<void> {
+		this.gitService.resetService();
+		sourceControlFoldersExistCheck([this.gitFolder, this.sshFolder]);
+		await this.sourceControlPreferencesService.loadFromDbAndApplySourceControlPreferences();
+		if (this.sourceControlPreferencesService.isSourceControlLicensedAndEnabled()) {
+			await this.initGitService();
+		}
+	}
+
+	private async initGitService(): Promise<void> {
+		await this.gitService.initService({
+			sourceControlPreferences: this.sourceControlPreferencesService.getPreferences(),
+			gitFolder: this.gitFolder,
+			sshKeyName: this.sshKeyName,
+			sshFolder: this.sshFolder,
+		});
+	}
+
+	private async sanityCheck(): Promise<void> {
+		try {
+			const foldersExisted = sourceControlFoldersExistCheck(
+				[this.gitFolder, this.sshFolder],
+				false,
+			);
+			if (!foldersExisted) {
+				throw new ApplicationError('No folders exist');
+			}
+			if (!this.gitService.git) {
+				await this.initGitService();
+			}
+			const branches = await this.gitService.getCurrentBranch();
+			if (
+				branches.current === '' ||
+				branches.current !==
+					this.sourceControlPreferencesService.sourceControlPreferences.branchName
+			) {
+				throw new ApplicationError('Branch is not set up correctly');
+			}
+		} catch (error) {
+			throw new BadRequestError(
+				'Source control is not properly set up, please disconnect and reconnect.',
+			);
+		}
+	}
+
+	async disconnect(options: { keepKeyPair?: boolean } = {}) {
+		try {
+			await this.sourceControlPreferencesService.setPreferences({
+				connected: false,
+				branchName: '',
+			});
+			await this.sourceControlExportService.deleteRepositoryFolder();
+			if (!options.keepKeyPair) {
+				await this.sourceControlPreferencesService.deleteKeyPair();
+			}
+			this.gitService.resetService();
+			return this.sourceControlPreferencesService.sourceControlPreferences;
+		} catch (error) {
+			throw new ApplicationError('Failed to disconnect from source control', { cause: error });
+		}
+	}
+
+	async initializeRepository(preferences: SourceControlPreferences, user: User) {
+		if (!this.gitService.git) {
+			await this.initGitService();
+		}
+		this.logger.debug('Initializing repository...');
+		await this.gitService.initRepository(preferences, user);
+		let getBranchesResult;
+		try {
+			getBranchesResult = await this.getBranches();
+		} catch (error) {
+			if ((error as Error).message.includes('Warning: Permanently added')) {
+				this.logger.debug('Added repository host to the list of known hosts. Retrying...');
+				getBranchesResult = await this.getBranches();
+			} else {
+				throw error;
+			}
+		}
+		if (getBranchesResult.branches.includes(preferences.branchName)) {
+			await this.gitService.setBranch(preferences.branchName);
+		} else {
+			if (getBranchesResult.branches?.length === 0) {
+				try {
+					writeFileSync(path.join(this.gitFolder, '/README.md'), SOURCE_CONTROL_README);
+
+					await this.gitService.stage(new Set<string>(['README.md']));
+					await this.gitService.commit('Initial commit');
+					await this.gitService.push({
+						branch: preferences.branchName,
+						force: true,
+					});
+					getBranchesResult = await this.getBranches();
+					await this.gitService.setBranch(preferences.branchName);
+				} catch (fileError) {
+					this.logger.error(`Failed to create initial commit: ${(fileError as Error).message}`);
+				}
+			}
+		}
+		await this.sourceControlPreferencesService.setPreferences({
+			branchName: getBranchesResult.currentBranch,
+			connected: true,
+		});
+		return getBranchesResult;
+	}
+
+	async getBranches(): Promise<{ branches: string[]; currentBranch: string }> {
+		// fetch first to get include remote changes
+		if (!this.gitService.git) {
+			await this.initGitService();
+		}
+		await this.gitService.fetch();
+		return await this.gitService.getBranches();
+	}
+
+	async setBranch(branch: string): Promise<{ branches: string[]; currentBranch: string }> {
+		if (!this.gitService.git) {
+			await this.initGitService();
+		}
+		await this.sourceControlPreferencesService.setPreferences({
+			branchName: branch,
+			connected: branch?.length > 0,
+		});
+		return await this.gitService.setBranch(branch);
+	}
+
+	// will reset the branch to the remote branch and pull
+	// this will discard all local changes
+	async resetWorkfolder(): Promise<ImportResult | undefined> {
+		if (!this.gitService.git) {
+			await this.initGitService();
+		}
+		try {
+			await this.gitService.resetBranch();
+			await this.gitService.pull();
+		} catch (error) {
+			this.logger.error(`Failed to reset workfolder: ${(error as Error).message}`);
+			throw new ApplicationError(
+				'Unable to fetch updates from git - your folder might be out of sync. Try reconnecting from the Source Control settings page.',
+			);
+		}
+		return;
+	}
+
+	async pushWorkfolder(options: SourceControlPushWorkFolder): Promise<{
+		statusCode: number;
+		pushResult: PushResult | undefined;
+		statusResult: SourceControlledFile[];
+	}> {
+		await this.sanityCheck();
+
+		if (this.sourceControlPreferencesService.isBranchReadOnly()) {
+			throw new BadRequestError('Cannot push onto read-only branch.');
+		}
+
+		// only determine file status if not provided by the frontend
+		let statusResult: SourceControlledFile[] = options.fileNames;
+		if (statusResult.length === 0) {
+			statusResult = (await this.getStatus({
+				direction: 'push',
+				verbose: false,
+				preferLocalVersion: true,
+			})) as SourceControlledFile[];
+		}
+
+		if (!options.force) {
+			const possibleConflicts = statusResult?.filter((file) => file.conflict);
+			if (possibleConflicts?.length > 0) {
+				return {
+					statusCode: 409,
+					pushResult: undefined,
+					statusResult,
+				};
+			}
+		}
+
+		const filesToBePushed = new Set<string>();
+		const filesToBeDeleted = new Set<string>();
+		options.fileNames.forEach((e) => {
+			if (e.status !== 'deleted') {
+				filesToBePushed.add(e.file);
+			} else {
+				filesToBeDeleted.add(e.file);
+			}
+		});
+
+		this.sourceControlExportService.rmFilesFromExportFolder(filesToBeDeleted);
+
+		const workflowsToBeExported = options.fileNames.filter(
+			(e) => e.type === 'workflow' && e.status !== 'deleted',
+		);
+		await this.sourceControlExportService.exportWorkflowsToWorkFolder(workflowsToBeExported);
+
+		const credentialsToBeExported = options.fileNames.filter(
+			(e) => e.type === 'credential' && e.status !== 'deleted',
+		);
+		const credentialExportResult =
+			await this.sourceControlExportService.exportCredentialsToWorkFolder(credentialsToBeExported);
+		if (credentialExportResult.missingIds && credentialExportResult.missingIds.length > 0) {
+			credentialExportResult.missingIds.forEach((id) => {
+				filesToBePushed.delete(this.sourceControlExportService.getCredentialsPath(id));
+				statusResult = statusResult.filter(
+					(e) => e.file !== this.sourceControlExportService.getCredentialsPath(id),
+				);
+			});
+		}
+
+		if (options.fileNames.find((e) => e.type === 'tags')) {
+			await this.sourceControlExportService.exportTagsToWorkFolder();
+		}
+
+		if (options.fileNames.find((e) => e.type === 'variables')) {
+			await this.sourceControlExportService.exportVariablesToWorkFolder();
+		}
+
+		await this.gitService.stage(filesToBePushed, filesToBeDeleted);
+
+		for (let i = 0; i < statusResult.length; i++) {
+			// eslint-disable-next-line @typescript-eslint/no-loop-func
+			if (options.fileNames.find((file) => file.file === statusResult[i].file)) {
+				statusResult[i].pushed = true;
+			}
+		}
+
+		await this.gitService.commit(options.message ?? 'Updated Workfolder');
+
+		const pushResult = await this.gitService.push({
+			branch: this.sourceControlPreferencesService.getBranchName(),
+			force: options.force ?? false,
+		});
+
+		// #region Tracking Information
+		void Container.get(InternalHooks).onSourceControlUserFinishedPushUI(
+			getTrackingInformationFromPostPushResult(statusResult),
+		);
+		// #endregion
+
+		return {
+			statusCode: 200,
+			pushResult,
+			statusResult,
+		};
+	}
+
+	async pullWorkfolder(
+		options: SourceControllPullOptions,
+	): Promise<{ statusCode: number; statusResult: SourceControlledFile[] }> {
+		await this.sanityCheck();
+
+		const statusResult = (await this.getStatus({
+			direction: 'pull',
+			verbose: false,
+			preferLocalVersion: false,
+		})) as SourceControlledFile[];
+
+		// filter out items that will not effect a local change and thus should not
+		// trigger a conflict warning in the frontend
+		const filteredResult = statusResult.filter((e) => {
+			// locally created credentials will not create a conflict on pull
+			if (e.status === 'created' && e.location === 'local') {
+				return false;
+			}
+			// remotely deleted credentials will not delete local credentials
+			if (e.type === 'credential' && e.status === 'deleted') {
+				return false;
+			}
+			return true;
+		});
+
+		if (options.force !== true) {
+			const possibleConflicts = filteredResult?.filter(
+				(file) => (file.conflict || file.status === 'modified') && file.type === 'workflow',
+			);
+			if (possibleConflicts?.length > 0) {
+				await this.gitService.resetBranch();
+				return {
+					statusCode: 409,
+					statusResult: filteredResult,
+				};
+			}
+		}
+
+		const workflowsToBeImported = statusResult.filter(
+			(e) => e.type === 'workflow' && e.status !== 'deleted',
+		);
+		await this.sourceControlImportService.importWorkflowFromWorkFolder(
+			workflowsToBeImported,
+			options.userId,
+		);
+
+		const credentialsToBeImported = statusResult.filter(
+			(e) => e.type === 'credential' && e.status !== 'deleted',
+		);
+		await this.sourceControlImportService.importCredentialsFromWorkFolder(
+			credentialsToBeImported,
+			options.userId,
+		);
+
+		const tagsToBeImported = statusResult.find((e) => e.type === 'tags');
+		if (tagsToBeImported) {
+			await this.sourceControlImportService.importTagsFromWorkFolder(tagsToBeImported);
+		}
+
+		const variablesToBeImported = statusResult.find((e) => e.type === 'variables');
+		if (variablesToBeImported) {
+			await this.sourceControlImportService.importVariablesFromWorkFolder(variablesToBeImported);
+		}
+
+		// #region Tracking Information
+		void Container.get(InternalHooks).onSourceControlUserFinishedPullUI(
+			getTrackingInformationFromPullResult(statusResult),
+		);
+		// #endregion
+
+		return {
+			statusCode: 200,
+			statusResult: filteredResult,
+		};
+	}
+
+	/**
+	 * Does a comparison between the local and remote workfolder based on NOT the git status,
+	 * but certain parameters within the items being synced.
+	 * For workflows, it compares the versionIds
+	 * For credentials, it compares the name and type
+	 * For variables, it compares the name
+	 * For tags, it compares the name and mapping
+	 * @returns either SourceControlledFile[] if verbose is false,
+	 * or multiple SourceControlledFile[] with all determined differences for debugging purposes
+	 */
+	async getStatus(options: SourceControlGetStatus) {
+		await this.sanityCheck();
+
+		const sourceControlledFiles: SourceControlledFile[] = [];
+
+		// fetch and reset hard first
+		await this.resetWorkfolder();
+
+		const {
+			wfRemoteVersionIds,
+			wfLocalVersionIds,
+			wfMissingInLocal,
+			wfMissingInRemote,
+			wfModifiedInEither,
+		} = await this.getStatusWorkflows(options, sourceControlledFiles);
+
+		const { credMissingInLocal, credMissingInRemote, credModifiedInEither } =
+			await this.getStatusCredentials(options, sourceControlledFiles);
+
+		const { varMissingInLocal, varMissingInRemote, varModifiedInEither } =
+			await this.getStatusVariables(options, sourceControlledFiles);
+
+		const {
+			tagsMissingInLocal,
+			tagsMissingInRemote,
+			tagsModifiedInEither,
+			mappingsMissingInLocal,
+			mappingsMissingInRemote,
+		} = await this.getStatusTagsMappings(options, sourceControlledFiles);
+
+		// #region Tracking Information
+		if (options.direction === 'push') {
+			void Container.get(InternalHooks).onSourceControlUserStartedPushUI(
+				getTrackingInformationFromPrePushResult(sourceControlledFiles),
+			);
+		} else if (options.direction === 'pull') {
+			void Container.get(InternalHooks).onSourceControlUserStartedPullUI(
+				getTrackingInformationFromPullResult(sourceControlledFiles),
+			);
+		}
+		// #endregion
+
+		if (options?.verbose) {
+			return {
+				wfRemoteVersionIds,
+				wfLocalVersionIds,
+				wfMissingInLocal,
+				wfMissingInRemote,
+				wfModifiedInEither,
+				credMissingInLocal,
+				credMissingInRemote,
+				credModifiedInEither,
+				varMissingInLocal,
+				varMissingInRemote,
+				varModifiedInEither,
+				tagsMissingInLocal,
+				tagsMissingInRemote,
+				tagsModifiedInEither,
+				mappingsMissingInLocal,
+				mappingsMissingInRemote,
+				sourceControlledFiles,
+			};
+		} else {
+			return sourceControlledFiles;
+		}
+	}
+
+	private async getStatusWorkflows(
+		options: SourceControlGetStatus,
+		sourceControlledFiles: SourceControlledFile[],
+	) {
+		const wfRemoteVersionIds = await this.sourceControlImportService.getRemoteVersionIdsFromFiles();
+		const wfLocalVersionIds = await this.sourceControlImportService.getLocalVersionIdsFromDb();
+
+		const wfMissingInLocal = wfRemoteVersionIds.filter(
+			(remote) => wfLocalVersionIds.findIndex((local) => local.id === remote.id) === -1,
+		);
+
+		const wfMissingInRemote = wfLocalVersionIds.filter(
+			(local) => wfRemoteVersionIds.findIndex((remote) => remote.id === local.id) === -1,
+		);
+
+		const wfModifiedInEither: SourceControlWorkflowVersionId[] = [];
+		wfLocalVersionIds.forEach((local) => {
+			const mismatchingIds = wfRemoteVersionIds.find(
+				(remote) => remote.id === local.id && remote.versionId !== local.versionId,
+			);
+			let name = (options?.preferLocalVersion ? local?.name : mismatchingIds?.name) ?? 'Workflow';
+			if (local.name && mismatchingIds?.name && local.name !== mismatchingIds.name) {
+				name = options?.preferLocalVersion
+					? `${local.name} (Remote: ${mismatchingIds.name})`
+					: (name = `${mismatchingIds.name} (Local: ${local.name})`);
+			}
+			if (mismatchingIds) {
+				wfModifiedInEither.push({
+					...local,
+					name,
+					versionId: options.preferLocalVersion ? local.versionId : mismatchingIds.versionId,
+					localId: local.versionId,
+					remoteId: mismatchingIds.versionId,
+				});
+			}
+		});
+
+		wfMissingInLocal.forEach((item) => {
+			sourceControlledFiles.push({
+				id: item.id,
+				name: item.name ?? 'Workflow',
+				type: 'workflow',
+				status: options.direction === 'push' ? 'deleted' : 'created',
+				location: options.direction === 'push' ? 'local' : 'remote',
+				conflict: false,
+				file: item.filename,
+				updatedAt: item.updatedAt ?? new Date().toISOString(),
+			});
+		});
+
+		wfMissingInRemote.forEach((item) => {
+			sourceControlledFiles.push({
+				id: item.id,
+				name: item.name ?? 'Workflow',
+				type: 'workflow',
+				status: options.direction === 'push' ? 'created' : 'deleted',
+				location: options.direction === 'push' ? 'local' : 'remote',
+				conflict: false,
+				file: item.filename,
+				updatedAt: item.updatedAt ?? new Date().toISOString(),
+			});
+		});
+
+		wfModifiedInEither.forEach((item) => {
+			sourceControlledFiles.push({
+				id: item.id,
+				name: item.name ?? 'Workflow',
+				type: 'workflow',
+				status: 'modified',
+				location: options.direction === 'push' ? 'local' : 'remote',
+				conflict: true,
+				file: item.filename,
+				updatedAt: item.updatedAt ?? new Date().toISOString(),
+			});
+		});
+
+		return {
+			wfRemoteVersionIds,
+			wfLocalVersionIds,
+			wfMissingInLocal,
+			wfMissingInRemote,
+			wfModifiedInEither,
+		};
+	}
+
+	private async getStatusCredentials(
+		options: SourceControlGetStatus,
+		sourceControlledFiles: SourceControlledFile[],
+	) {
+		const credRemoteIds = await this.sourceControlImportService.getRemoteCredentialsFromFiles();
+		const credLocalIds = await this.sourceControlImportService.getLocalCredentialsFromDb();
+
+		const credMissingInLocal = credRemoteIds.filter(
+			(remote) => credLocalIds.findIndex((local) => local.id === remote.id) === -1,
+		);
+
+		const credMissingInRemote = credLocalIds.filter(
+			(local) => credRemoteIds.findIndex((remote) => remote.id === local.id) === -1,
+		);
+
+		// only compares the name, since that is the only change synced for credentials
+		const credModifiedInEither: Array<
+			ExportableCredential & {
+				filename: string;
+			}
+		> = [];
+		credLocalIds.forEach((local) => {
+			const mismatchingCreds = credRemoteIds.find((remote) => {
+				return remote.id === local.id && (remote.name !== local.name || remote.type !== local.type);
+			});
+			if (mismatchingCreds) {
+				credModifiedInEither.push({
+					...local,
+					name: options?.preferLocalVersion ? local.name : mismatchingCreds.name,
+				});
+			}
+		});
+
+		credMissingInLocal.forEach((item) => {
+			sourceControlledFiles.push({
+				id: item.id,
+				name: item.name ?? 'Credential',
+				type: 'credential',
+				status: options.direction === 'push' ? 'deleted' : 'created',
+				location: options.direction === 'push' ? 'local' : 'remote',
+				conflict: false,
+				file: item.filename,
+				updatedAt: new Date().toISOString(),
+			});
+		});
+
+		credMissingInRemote.forEach((item) => {
+			sourceControlledFiles.push({
+				id: item.id,
+				name: item.name ?? 'Credential',
+				type: 'credential',
+				status: options.direction === 'push' ? 'created' : 'deleted',
+				location: options.direction === 'push' ? 'local' : 'remote',
+				conflict: false,
+				file: item.filename,
+				updatedAt: new Date().toISOString(),
+			});
+		});
+
+		credModifiedInEither.forEach((item) => {
+			sourceControlledFiles.push({
+				id: item.id,
+				name: item.name ?? 'Credential',
+				type: 'credential',
+				status: 'modified',
+				location: options.direction === 'push' ? 'local' : 'remote',
+				conflict: true,
+				file: item.filename,
+				updatedAt: new Date().toISOString(),
+			});
+		});
+		return {
+			credMissingInLocal,
+			credMissingInRemote,
+			credModifiedInEither,
+		};
+	}
+
+	private async getStatusVariables(
+		options: SourceControlGetStatus,
+		sourceControlledFiles: SourceControlledFile[],
+	) {
+		const varRemoteIds = await this.sourceControlImportService.getRemoteVariablesFromFile();
+		const varLocalIds = await this.sourceControlImportService.getLocalVariablesFromDb();
+
+		const varMissingInLocal = varRemoteIds.filter(
+			(remote) => varLocalIds.findIndex((local) => local.id === remote.id) === -1,
+		);
+
+		const varMissingInRemote = varLocalIds.filter(
+			(local) => varRemoteIds.findIndex((remote) => remote.id === local.id) === -1,
+		);
+
+		const varModifiedInEither: Variables[] = [];
+		varLocalIds.forEach((local) => {
+			const mismatchingIds = varRemoteIds.find(
+				(remote) =>
+					(remote.id === local.id && remote.key !== local.key) ||
+					(remote.id !== local.id && remote.key === local.key),
+			);
+			if (mismatchingIds) {
+				varModifiedInEither.push(options.preferLocalVersion ? local : mismatchingIds);
+			}
+		});
+
+		if (
+			varMissingInLocal.length > 0 ||
+			varMissingInRemote.length > 0 ||
+			varModifiedInEither.length > 0
+		) {
+			if (options.direction === 'pull' && varRemoteIds.length === 0) {
+				// if there's nothing to pull, don't show difference as modified
+			} else {
+				sourceControlledFiles.push({
+					id: 'variables',
+					name: 'variables',
+					type: 'variables',
+					status: 'modified',
+					location: options.direction === 'push' ? 'local' : 'remote',
+					conflict: false,
+					file: getVariablesPath(this.gitFolder),
+					updatedAt: new Date().toISOString(),
+				});
+			}
+		}
+		return {
+			varMissingInLocal,
+			varMissingInRemote,
+			varModifiedInEither,
+		};
+	}
+
+	private async getStatusTagsMappings(
+		options: SourceControlGetStatus,
+		sourceControlledFiles: SourceControlledFile[],
+	) {
+		const lastUpdatedTag = await this.tagRepository.find({
+			order: { updatedAt: 'DESC' },
+			take: 1,
+			select: ['updatedAt'],
+		});
+
+		const tagMappingsRemote =
+			await this.sourceControlImportService.getRemoteTagsAndMappingsFromFile();
+		const tagMappingsLocal = await this.sourceControlImportService.getLocalTagsAndMappingsFromDb();
+
+		const tagsMissingInLocal = tagMappingsRemote.tags.filter(
+			(remote) => tagMappingsLocal.tags.findIndex((local) => local.id === remote.id) === -1,
+		);
+
+		const tagsMissingInRemote = tagMappingsLocal.tags.filter(
+			(local) => tagMappingsRemote.tags.findIndex((remote) => remote.id === local.id) === -1,
+		);
+
+		const tagsModifiedInEither: TagEntity[] = [];
+		tagMappingsLocal.tags.forEach((local) => {
+			const mismatchingIds = tagMappingsRemote.tags.find(
+				(remote) => remote.id === local.id && remote.name !== local.name,
+			);
+			if (!mismatchingIds) {
+				return;
+			}
+			tagsModifiedInEither.push(options.preferLocalVersion ? local : mismatchingIds);
+		});
+
+		const mappingsMissingInLocal = tagMappingsRemote.mappings.filter(
+			(remote) =>
+				tagMappingsLocal.mappings.findIndex(
+					(local) => local.tagId === remote.tagId && local.workflowId === remote.workflowId,
+				) === -1,
+		);
+
+		const mappingsMissingInRemote = tagMappingsLocal.mappings.filter(
+			(local) =>
+				tagMappingsRemote.mappings.findIndex(
+					(remote) => remote.tagId === local.tagId && remote.workflowId === remote.workflowId,
+				) === -1,
+		);
+
+		if (
+			tagsMissingInLocal.length > 0 ||
+			tagsMissingInRemote.length > 0 ||
+			tagsModifiedInEither.length > 0 ||
+			mappingsMissingInLocal.length > 0 ||
+			mappingsMissingInRemote.length > 0
+		) {
+			if (
+				options.direction === 'pull' &&
+				tagMappingsRemote.tags.length === 0 &&
+				tagMappingsRemote.mappings.length === 0
+			) {
+				// if there's nothing to pull, don't show difference as modified
+			} else {
+				sourceControlledFiles.push({
+					id: 'mappings',
+					name: 'tags',
+					type: 'tags',
+					status: 'modified',
+					location: options.direction === 'push' ? 'local' : 'remote',
+					conflict: false,
+					file: getTagsPath(this.gitFolder),
+					updatedAt: lastUpdatedTag[0]?.updatedAt.toISOString(),
+				});
+			}
+		}
+		return {
+			tagsMissingInLocal,
+			tagsMissingInRemote,
+			tagsModifiedInEither,
+			mappingsMissingInLocal,
+			mappingsMissingInRemote,
+		};
+	}
+
+	async setGitUserDetails(
+		name = SOURCE_CONTROL_DEFAULT_NAME,
+		email = SOURCE_CONTROL_DEFAULT_EMAIL,
+	): Promise<void> {
+		await this.sanityCheck();
+		await this.gitService.setGitUserDetails(name, email);
+	}
+}
diff --git a/packages/cli/src/environments/sourceControl/sourceControlExport.service.ee.ts b/packages/cli/src/environments/sourceControl/sourceControlExport.service.ee.ts
new file mode 100644
index 0000000000000..eb8269493033d
--- /dev/null
+++ b/packages/cli/src/environments/sourceControl/sourceControlExport.service.ee.ts
@@ -0,0 +1,274 @@
+import Container, { Service } from 'typedi';
+import path from 'path';
+import {
+	SOURCE_CONTROL_CREDENTIAL_EXPORT_FOLDER,
+	SOURCE_CONTROL_GIT_FOLDER,
+	SOURCE_CONTROL_TAGS_EXPORT_FILE,
+	SOURCE_CONTROL_WORKFLOW_EXPORT_FOLDER,
+} from './constants';
+import { ApplicationError, type ICredentialDataDecryptedObject } from 'n8n-workflow';
+import { writeFile as fsWriteFile, rm as fsRm } from 'fs/promises';
+import { rmSync } from 'fs';
+import { Credentials, InstanceSettings } from 'n8n-core';
+import type { ExportableWorkflow } from './types/exportableWorkflow';
+import type { ExportableCredential } from './types/exportableCredential';
+import type { ExportResult } from './types/exportResult';
+import {
+	getCredentialExportPath,
+	getVariablesPath,
+	getWorkflowExportPath,
+	sourceControlFoldersExistCheck,
+	stringContainsExpression,
+} from './sourceControlHelper.ee';
+import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
+import type { SourceControlledFile } from './types/sourceControlledFile';
+import { VariablesService } from '../variables/variables.service.ee';
+import { TagRepository } from '@db/repositories/tag.repository';
+import { WorkflowRepository } from '@db/repositories/workflow.repository';
+import { Logger } from '@/Logger';
+import { SharedCredentialsRepository } from '@db/repositories/sharedCredentials.repository';
+import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
+import { WorkflowTagMappingRepository } from '@db/repositories/workflowTagMapping.repository';
+
+@Service()
+export class SourceControlExportService {
+	private gitFolder: string;
+
+	private workflowExportFolder: string;
+
+	private credentialExportFolder: string;
+
+	constructor(
+		private readonly logger: Logger,
+		private readonly variablesService: VariablesService,
+		private readonly tagRepository: TagRepository,
+		instanceSettings: InstanceSettings,
+	) {
+		this.gitFolder = path.join(instanceSettings.n8nFolder, SOURCE_CONTROL_GIT_FOLDER);
+		this.workflowExportFolder = path.join(this.gitFolder, SOURCE_CONTROL_WORKFLOW_EXPORT_FOLDER);
+		this.credentialExportFolder = path.join(
+			this.gitFolder,
+			SOURCE_CONTROL_CREDENTIAL_EXPORT_FOLDER,
+		);
+	}
+
+	getWorkflowPath(workflowId: string): string {
+		return getWorkflowExportPath(workflowId, this.workflowExportFolder);
+	}
+
+	getCredentialsPath(credentialsId: string): string {
+		return getCredentialExportPath(credentialsId, this.credentialExportFolder);
+	}
+
+	async deleteRepositoryFolder() {
+		try {
+			await fsRm(this.gitFolder, { recursive: true });
+		} catch (error) {
+			this.logger.error(`Failed to delete work folder: ${(error as Error).message}`);
+		}
+	}
+
+	public rmFilesFromExportFolder(filesToBeDeleted: Set<string>): Set<string> {
+		try {
+			filesToBeDeleted.forEach((e) => rmSync(e));
+		} catch (error) {
+			this.logger.error(`Failed to delete workflows from work folder: ${(error as Error).message}`);
+		}
+		return filesToBeDeleted;
+	}
+
+	private async writeExportableWorkflowsToExportFolder(
+		workflowsToBeExported: WorkflowEntity[],
+		owners: Record<string, string>,
+	) {
+		await Promise.all(
+			workflowsToBeExported.map(async (e) => {
+				const fileName = this.getWorkflowPath(e.id);
+				const sanitizedWorkflow: ExportableWorkflow = {
+					id: e.id,
+					name: e.name,
+					nodes: e.nodes,
+					connections: e.connections,
+					settings: e.settings,
+					triggerCount: e.triggerCount,
+					versionId: e.versionId,
+					owner: owners[e.id],
+				};
+				this.logger.debug(`Writing workflow ${e.id} to ${fileName}`);
+				return await fsWriteFile(fileName, JSON.stringify(sanitizedWorkflow, null, 2));
+			}),
+		);
+	}
+
+	async exportWorkflowsToWorkFolder(candidates: SourceControlledFile[]): Promise<ExportResult> {
+		try {
+			sourceControlFoldersExistCheck([this.workflowExportFolder]);
+			const workflowIds = candidates.map((e) => e.id);
+			const sharedWorkflows =
+				await Container.get(SharedWorkflowRepository).findByWorkflowIds(workflowIds);
+			const workflows = await Container.get(WorkflowRepository).findByIds(workflowIds);
+
+			// determine owner of each workflow to be exported
+			const owners: Record<string, string> = {};
+			sharedWorkflows.forEach((e) => (owners[e.workflowId] = e.user.email));
+
+			// write the workflows to the export folder as json files
+			await this.writeExportableWorkflowsToExportFolder(workflows, owners);
+
+			// await fsWriteFile(ownersFileName, JSON.stringify(owners, null, 2));
+			return {
+				count: sharedWorkflows.length,
+				folder: this.workflowExportFolder,
+				files: workflows.map((e) => ({
+					id: e?.id,
+					name: this.getWorkflowPath(e?.name),
+				})),
+			};
+		} catch (error) {
+			throw new ApplicationError('Failed to export workflows to work folder', { cause: error });
+		}
+	}
+
+	async exportVariablesToWorkFolder(): Promise<ExportResult> {
+		try {
+			sourceControlFoldersExistCheck([this.gitFolder]);
+			const variables = await this.variablesService.getAllCached();
+			// do not export empty variables
+			if (variables.length === 0) {
+				return {
+					count: 0,
+					folder: this.gitFolder,
+					files: [],
+				};
+			}
+			const fileName = getVariablesPath(this.gitFolder);
+			const sanitizedVariables = variables.map((e) => ({ ...e, value: '' }));
+			await fsWriteFile(fileName, JSON.stringify(sanitizedVariables, null, 2));
+			return {
+				count: sanitizedVariables.length,
+				folder: this.gitFolder,
+				files: [
+					{
+						id: '',
+						name: fileName,
+					},
+				],
+			};
+		} catch (error) {
+			throw new ApplicationError('Failed to export variables to work folder', {
+				cause: error,
+			});
+		}
+	}
+
+	async exportTagsToWorkFolder(): Promise<ExportResult> {
+		try {
+			sourceControlFoldersExistCheck([this.gitFolder]);
+			const tags = await this.tagRepository.find();
+			// do not export empty tags
+			if (tags.length === 0) {
+				return {
+					count: 0,
+					folder: this.gitFolder,
+					files: [],
+				};
+			}
+			const mappings = await Container.get(WorkflowTagMappingRepository).find();
+			const fileName = path.join(this.gitFolder, SOURCE_CONTROL_TAGS_EXPORT_FILE);
+			await fsWriteFile(
+				fileName,
+				JSON.stringify(
+					{
+						tags: tags.map((tag) => ({ id: tag.id, name: tag.name })),
+						mappings,
+					},
+					null,
+					2,
+				),
+			);
+			return {
+				count: tags.length,
+				folder: this.gitFolder,
+				files: [
+					{
+						id: '',
+						name: fileName,
+					},
+				],
+			};
+		} catch (error) {
+			throw new ApplicationError('Failed to export variables to work folder', { cause: error });
+		}
+	}
+
+	private replaceCredentialData = (
+		data: ICredentialDataDecryptedObject,
+	): ICredentialDataDecryptedObject => {
+		for (const [key] of Object.entries(data)) {
+			try {
+				if (data[key] === null) {
+					delete data[key]; // remove invalid null values
+				} else if (typeof data[key] === 'object') {
+					data[key] = this.replaceCredentialData(data[key] as ICredentialDataDecryptedObject);
+				} else if (typeof data[key] === 'string') {
+					data[key] = stringContainsExpression(data[key] as string) ? data[key] : '';
+				} else if (typeof data[key] === 'number') {
+					// TODO: leaving numbers in for now, but maybe we should remove them
+					continue;
+				}
+			} catch (error) {
+				this.logger.error(`Failed to sanitize credential data: ${(error as Error).message}`);
+				throw error;
+			}
+		}
+		return data;
+	};
+
+	async exportCredentialsToWorkFolder(candidates: SourceControlledFile[]): Promise<ExportResult> {
+		try {
+			sourceControlFoldersExistCheck([this.credentialExportFolder]);
+			const credentialIds = candidates.map((e) => e.id);
+			const credentialsToBeExported = await Container.get(
+				SharedCredentialsRepository,
+			).findByCredentialIds(credentialIds, 'credential:owner');
+			let missingIds: string[] = [];
+			if (credentialsToBeExported.length !== credentialIds.length) {
+				const foundCredentialIds = credentialsToBeExported.map((e) => e.credentialsId);
+				missingIds = credentialIds.filter(
+					(remote) => foundCredentialIds.findIndex((local) => local === remote) === -1,
+				);
+			}
+			await Promise.all(
+				credentialsToBeExported.map(async (sharing) => {
+					const { name, type, data, id } = sharing.credentials;
+					const credentials = new Credentials({ id, name }, type, data);
+
+					const stub: ExportableCredential = {
+						id,
+						name,
+						type,
+						data: this.replaceCredentialData(credentials.getData()),
+						ownedBy: sharing.user.email,
+					};
+
+					const filePath = this.getCredentialsPath(id);
+					this.logger.debug(`Writing credentials stub "${name}" (ID ${id}) to: ${filePath}`);
+
+					return await fsWriteFile(filePath, JSON.stringify(stub, null, 2));
+				}),
+			);
+
+			return {
+				count: credentialsToBeExported.length,
+				folder: this.credentialExportFolder,
+				files: credentialsToBeExported.map((e) => ({
+					id: e.credentials.id,
+					name: path.join(this.credentialExportFolder, `${e.credentials.name}.json`),
+				})),
+				missingIds,
+			};
+		} catch (error) {
+			throw new ApplicationError('Failed to export credentials to work folder', { cause: error });
+		}
+	}
+}
diff --git a/packages/cli/src/environments/sourceControl/sourceControlGit.service.ee.ts b/packages/cli/src/environments/sourceControl/sourceControlGit.service.ee.ts
new file mode 100644
index 0000000000000..cdaa264c97a98
--- /dev/null
+++ b/packages/cli/src/environments/sourceControl/sourceControlGit.service.ee.ts
@@ -0,0 +1,359 @@
+import { Service } from 'typedi';
+import { execSync } from 'child_process';
+import path from 'path';
+import type {
+	CommitResult,
+	DiffResult,
+	FetchResult,
+	PullResult,
+	PushResult,
+	SimpleGit,
+	SimpleGitOptions,
+	StatusResult,
+} from 'simple-git';
+import type { SourceControlPreferences } from './types/sourceControlPreferences';
+import {
+	SOURCE_CONTROL_DEFAULT_BRANCH,
+	SOURCE_CONTROL_DEFAULT_EMAIL,
+	SOURCE_CONTROL_DEFAULT_NAME,
+	SOURCE_CONTROL_ORIGIN,
+} from './constants';
+import { sourceControlFoldersExistCheck } from './sourceControlHelper.ee';
+import type { User } from '@db/entities/User';
+import { Logger } from '@/Logger';
+import { ApplicationError } from 'n8n-workflow';
+import { OwnershipService } from '@/services/ownership.service';
+import { SourceControlPreferencesService } from './sourceControlPreferences.service.ee';
+
+@Service()
+export class SourceControlGitService {
+	git: SimpleGit | null = null;
+
+	private gitOptions: Partial<SimpleGitOptions> = {};
+
+	constructor(
+		private readonly logger: Logger,
+		private readonly ownershipService: OwnershipService,
+		private readonly sourceControlPreferencesService: SourceControlPreferencesService,
+	) {}
+
+	/**
+	 * Run pre-checks before initialising git
+	 * Checks for existence of required binaries (git and ssh)
+	 */
+	private preInitCheck(): boolean {
+		this.logger.debug('GitService.preCheck');
+		try {
+			const gitResult = execSync('git --version', {
+				stdio: ['pipe', 'pipe', 'pipe'],
+			});
+			this.logger.debug(`Git binary found: ${gitResult.toString()}`);
+		} catch (error) {
+			throw new ApplicationError('Git binary not found', { cause: error });
+		}
+		try {
+			const sshResult = execSync('ssh -V', {
+				stdio: ['pipe', 'pipe', 'pipe'],
+			});
+			this.logger.debug(`SSH binary found: ${sshResult.toString()}`);
+		} catch (error) {
+			throw new ApplicationError('SSH binary not found', { cause: error });
+		}
+		return true;
+	}
+
+	async initService(options: {
+		sourceControlPreferences: SourceControlPreferences;
+		gitFolder: string;
+		sshFolder: string;
+		sshKeyName: string;
+	}): Promise<void> {
+		const { sourceControlPreferences: sourceControlPreferences, gitFolder, sshFolder } = options;
+		this.logger.debug('GitService.init');
+		if (this.git !== null) {
+			return;
+		}
+
+		this.preInitCheck();
+		this.logger.debug('Git pre-check passed');
+
+		sourceControlFoldersExistCheck([gitFolder, sshFolder]);
+
+		await this.setGitSshCommand(gitFolder, sshFolder);
+
+		if (!(await this.checkRepositorySetup())) {
+			await (this.git as unknown as SimpleGit).init();
+		}
+		if (!(await this.hasRemote(sourceControlPreferences.repositoryUrl))) {
+			if (sourceControlPreferences.connected && sourceControlPreferences.repositoryUrl) {
+				const instanceOwner = await this.ownershipService.getInstanceOwner();
+				await this.initRepository(sourceControlPreferences, instanceOwner);
+			}
+		}
+	}
+
+	/**
+	 * Update the SSH command with the path to the temp file containing the private key from the DB.
+	 */
+	async setGitSshCommand(
+		gitFolder = this.sourceControlPreferencesService.gitFolder,
+		sshFolder = this.sourceControlPreferencesService.sshFolder,
+	) {
+		const privateKeyPath = await this.sourceControlPreferencesService.getPrivateKeyPath();
+
+		const sshKnownHosts = path.join(sshFolder, 'known_hosts');
+		const sshCommand = `ssh -o UserKnownHostsFile=${sshKnownHosts} -o StrictHostKeyChecking=no -i ${privateKeyPath}`;
+
+		this.gitOptions = {
+			baseDir: gitFolder,
+			binary: 'git',
+			maxConcurrentProcesses: 6,
+			trimmed: false,
+		};
+
+		const { simpleGit } = await import('simple-git');
+
+		this.git = simpleGit(this.gitOptions)
+			.env('GIT_SSH_COMMAND', sshCommand)
+			.env('GIT_TERMINAL_PROMPT', '0');
+	}
+
+	resetService() {
+		this.git = null;
+	}
+
+	private async checkRepositorySetup(): Promise<boolean> {
+		if (!this.git) {
+			throw new ApplicationError('Git is not initialized (async)');
+		}
+		if (!(await this.git.checkIsRepo())) {
+			return false;
+		}
+		try {
+			await this.git.status();
+			return true;
+		} catch (error) {
+			return false;
+		}
+	}
+
+	private async hasRemote(remote: string): Promise<boolean> {
+		if (!this.git) {
+			throw new ApplicationError('Git is not initialized (async)');
+		}
+		try {
+			const remotes = await this.git.getRemotes(true);
+			const foundRemote = remotes.find(
+				(e) => e.name === SOURCE_CONTROL_ORIGIN && e.refs.push === remote,
+			);
+			if (foundRemote) {
+				this.logger.debug(`Git remote found: ${foundRemote.name}: ${foundRemote.refs.push}`);
+				return true;
+			}
+		} catch (error) {
+			throw new ApplicationError('Git is not initialized', { cause: error });
+		}
+		this.logger.debug(`Git remote not found: ${remote}`);
+		return false;
+	}
+
+	async initRepository(
+		sourceControlPreferences: Pick<
+			SourceControlPreferences,
+			'repositoryUrl' | 'branchName' | 'initRepo'
+		>,
+		user: User,
+	): Promise<void> {
+		if (!this.git) {
+			throw new ApplicationError('Git is not initialized (Promise)');
+		}
+		if (sourceControlPreferences.initRepo) {
+			try {
+				await this.git.init();
+			} catch (error) {
+				this.logger.debug(`Git init: ${(error as Error).message}`);
+			}
+		}
+		try {
+			await this.git.addRemote(SOURCE_CONTROL_ORIGIN, sourceControlPreferences.repositoryUrl);
+		} catch (error) {
+			if ((error as Error).message.includes('remote origin already exists')) {
+				this.logger.debug(`Git remote already exists: ${(error as Error).message}`);
+			} else {
+				throw error;
+			}
+		}
+		await this.setGitUserDetails(
+			user.firstName && user.lastName
+				? `${user.firstName} ${user.lastName}`
+				: SOURCE_CONTROL_DEFAULT_NAME,
+			user.email ?? SOURCE_CONTROL_DEFAULT_EMAIL,
+		);
+		if (sourceControlPreferences.initRepo) {
+			try {
+				const branches = await this.getBranches();
+				if (branches.branches?.length === 0) {
+					await this.git.raw(['branch', '-M', sourceControlPreferences.branchName]);
+				}
+			} catch (error) {
+				this.logger.debug(`Git init: ${(error as Error).message}`);
+			}
+		}
+	}
+
+	async setGitUserDetails(name: string, email: string): Promise<void> {
+		if (!this.git) {
+			throw new ApplicationError('Git is not initialized (setGitUserDetails)');
+		}
+		await this.git.addConfig('user.email', email);
+		await this.git.addConfig('user.name', name);
+	}
+
+	async getBranches(): Promise<{ branches: string[]; currentBranch: string }> {
+		if (!this.git) {
+			throw new ApplicationError('Git is not initialized (getBranches)');
+		}
+
+		try {
+			// Get remote branches
+			const { branches } = await this.git.branch(['-r']);
+			const remoteBranches = Object.keys(branches)
+				.map((name) => name.split('/')[1])
+				.filter((name) => name !== 'HEAD');
+
+			const { current } = await this.git.branch();
+
+			return {
+				branches: remoteBranches,
+				currentBranch: current,
+			};
+		} catch (error) {
+			throw new ApplicationError('Could not get remote branches from repository', { cause: error });
+		}
+	}
+
+	async setBranch(branch: string): Promise<{ branches: string[]; currentBranch: string }> {
+		if (!this.git) {
+			throw new ApplicationError('Git is not initialized (setBranch)');
+		}
+		await this.git.checkout(branch);
+		await this.git.branch([`--set-upstream-to=${SOURCE_CONTROL_ORIGIN}/${branch}`, branch]);
+		return await this.getBranches();
+	}
+
+	async getCurrentBranch(): Promise<{ current: string; remote: string }> {
+		if (!this.git) {
+			throw new ApplicationError('Git is not initialized (getCurrentBranch)');
+		}
+		const currentBranch = (await this.git.branch()).current;
+		return {
+			current: currentBranch,
+			remote: 'origin/' + currentBranch,
+		};
+	}
+
+	async diffRemote(): Promise<DiffResult | undefined> {
+		if (!this.git) {
+			throw new ApplicationError('Git is not initialized (diffRemote)');
+		}
+		const currentBranch = await this.getCurrentBranch();
+		if (currentBranch.remote) {
+			const target = currentBranch.remote;
+			return await this.git.diffSummary(['...' + target, '--ignore-all-space']);
+		}
+		return;
+	}
+
+	async diffLocal(): Promise<DiffResult | undefined> {
+		if (!this.git) {
+			throw new ApplicationError('Git is not initialized (diffLocal)');
+		}
+		const currentBranch = await this.getCurrentBranch();
+		if (currentBranch.remote) {
+			const target = currentBranch.current;
+			return await this.git.diffSummary([target, '--ignore-all-space']);
+		}
+		return;
+	}
+
+	async fetch(): Promise<FetchResult> {
+		if (!this.git) {
+			throw new ApplicationError('Git is not initialized (fetch)');
+		}
+		await this.setGitSshCommand();
+		return await this.git.fetch();
+	}
+
+	async pull(options: { ffOnly: boolean } = { ffOnly: true }): Promise<PullResult> {
+		if (!this.git) {
+			throw new ApplicationError('Git is not initialized (pull)');
+		}
+		await this.setGitSshCommand();
+		const params = {};
+		if (options.ffOnly) {
+			// eslint-disable-next-line @typescript-eslint/naming-convention
+			Object.assign(params, { '--ff-only': true });
+		}
+		return await this.git.pull(params);
+	}
+
+	async push(
+		options: { force: boolean; branch: string } = {
+			force: false,
+			branch: SOURCE_CONTROL_DEFAULT_BRANCH,
+		},
+	): Promise<PushResult> {
+		const { force, branch } = options;
+		if (!this.git) {
+			throw new ApplicationError('Git is not initialized ({)');
+		}
+		await this.setGitSshCommand();
+		if (force) {
+			return await this.git.push(SOURCE_CONTROL_ORIGIN, branch, ['-f']);
+		}
+		return await this.git.push(SOURCE_CONTROL_ORIGIN, branch);
+	}
+
+	async stage(files: Set<string>, deletedFiles?: Set<string>): Promise<string> {
+		if (!this.git) {
+			throw new ApplicationError('Git is not initialized (stage)');
+		}
+		if (deletedFiles?.size) {
+			try {
+				await this.git.rm(Array.from(deletedFiles));
+			} catch (error) {
+				this.logger.debug(`Git rm: ${(error as Error).message}`);
+			}
+		}
+		return await this.git.add(Array.from(files));
+	}
+
+	async resetBranch(
+		options: { hard: boolean; target: string } = { hard: true, target: 'HEAD' },
+	): Promise<string> {
+		if (!this.git) {
+			throw new ApplicationError('Git is not initialized (Promise)');
+		}
+		if (options?.hard) {
+			return await this.git.raw(['reset', '--hard', options.target]);
+		}
+		return await this.git.raw(['reset', options.target]);
+		// built-in reset method does not work
+		// return this.git.reset();
+	}
+
+	async commit(message: string): Promise<CommitResult> {
+		if (!this.git) {
+			throw new ApplicationError('Git is not initialized (commit)');
+		}
+		return await this.git.commit(message);
+	}
+
+	async status(): Promise<StatusResult> {
+		if (!this.git) {
+			throw new ApplicationError('Git is not initialized (status)');
+		}
+		const statusResult = await this.git.status();
+		return statusResult;
+	}
+}
diff --git a/packages/cli/src/environments/sourceControl/sourceControlHelper.ee.ts b/packages/cli/src/environments/sourceControl/sourceControlHelper.ee.ts
new file mode 100644
index 0000000000000..6c09f3fd562de
--- /dev/null
+++ b/packages/cli/src/environments/sourceControl/sourceControlHelper.ee.ts
@@ -0,0 +1,178 @@
+import { Container } from 'typedi';
+import { License } from '@/License';
+import { generateKeyPairSync } from 'crypto';
+import type { KeyPair } from './types/keyPair';
+import { constants as fsConstants, mkdirSync, accessSync } from 'fs';
+import {
+	SOURCE_CONTROL_GIT_KEY_COMMENT,
+	SOURCE_CONTROL_TAGS_EXPORT_FILE,
+	SOURCE_CONTROL_VARIABLES_EXPORT_FILE,
+} from './constants';
+import type { SourceControlledFile } from './types/sourceControlledFile';
+import path from 'path';
+import type { KeyPairType } from './types/keyPairType';
+import { Logger } from '@/Logger';
+
+export function stringContainsExpression(testString: string): boolean {
+	return /^=.*\{\{.*\}\}/.test(testString);
+}
+
+export function getWorkflowExportPath(workflowId: string, workflowExportFolder: string): string {
+	return path.join(workflowExportFolder, `${workflowId}.json`);
+}
+
+export function getCredentialExportPath(
+	credentialId: string,
+	credentialExportFolder: string,
+): string {
+	return path.join(credentialExportFolder, `${credentialId}.json`);
+}
+
+export function getVariablesPath(gitFolder: string): string {
+	return path.join(gitFolder, SOURCE_CONTROL_VARIABLES_EXPORT_FILE);
+}
+
+export function getTagsPath(gitFolder: string): string {
+	return path.join(gitFolder, SOURCE_CONTROL_TAGS_EXPORT_FILE);
+}
+
+export function sourceControlFoldersExistCheck(
+	folders: string[],
+	createIfNotExists = true,
+): boolean {
+	// running these file access function synchronously to avoid race conditions
+	let existed = true;
+	folders.forEach((folder) => {
+		try {
+			accessSync(folder, fsConstants.F_OK);
+		} catch {
+			existed = false;
+			if (createIfNotExists) {
+				try {
+					mkdirSync(folder, { recursive: true });
+				} catch (error) {
+					Container.get(Logger).error((error as Error).message);
+				}
+			}
+		}
+	});
+	return existed;
+}
+
+export function isSourceControlLicensed() {
+	const license = Container.get(License);
+	return license.isSourceControlLicensed();
+}
+
+export async function generateSshKeyPair(keyType: KeyPairType) {
+	const sshpk = await import('sshpk');
+	const keyPair: KeyPair = {
+		publicKey: '',
+		privateKey: '',
+	};
+	let generatedKeyPair: KeyPair;
+	switch (keyType) {
+		case 'ed25519':
+			generatedKeyPair = generateKeyPairSync('ed25519', {
+				privateKeyEncoding: { format: 'pem', type: 'pkcs8' },
+				publicKeyEncoding: { format: 'pem', type: 'spki' },
+			});
+			break;
+		case 'rsa':
+			generatedKeyPair = generateKeyPairSync('rsa', {
+				modulusLength: 4096,
+				publicKeyEncoding: {
+					type: 'spki',
+					format: 'pem',
+				},
+				privateKeyEncoding: {
+					type: 'pkcs8',
+					format: 'pem',
+				},
+			});
+			break;
+	}
+	const keyPublic = sshpk.parseKey(generatedKeyPair.publicKey, 'pem');
+	keyPublic.comment = SOURCE_CONTROL_GIT_KEY_COMMENT;
+	keyPair.publicKey = keyPublic.toString('ssh');
+	const keyPrivate = sshpk.parsePrivateKey(generatedKeyPair.privateKey, 'pem');
+	keyPrivate.comment = SOURCE_CONTROL_GIT_KEY_COMMENT;
+	keyPair.privateKey = keyPrivate.toString('ssh-private');
+	return {
+		privateKey: keyPair.privateKey,
+		publicKey: keyPair.publicKey,
+	};
+}
+
+export function getRepoType(repoUrl: string): 'github' | 'gitlab' | 'other' {
+	if (repoUrl.includes('github.com')) {
+		return 'github';
+	} else if (repoUrl.includes('gitlab.com')) {
+		return 'gitlab';
+	}
+	return 'other';
+}
+
+function filterSourceControlledFilesUniqueIds(files: SourceControlledFile[]) {
+	return (
+		files.filter((file, index, self) => {
+			return self.findIndex((f) => f.id === file.id) === index;
+		}) || []
+	);
+}
+
+export function getTrackingInformationFromPullResult(result: SourceControlledFile[]): {
+	cred_conflicts: number;
+	workflow_conflicts: number;
+	workflow_updates: number;
+} {
+	const uniques = filterSourceControlledFilesUniqueIds(result);
+	return {
+		cred_conflicts: uniques.filter(
+			(file) =>
+				file.type === 'credential' && file.status === 'modified' && file.location === 'local',
+		).length,
+		workflow_conflicts: uniques.filter(
+			(file) => file.type === 'workflow' && file.status === 'modified' && file.location === 'local',
+		).length,
+		workflow_updates: uniques.filter((file) => file.type === 'workflow').length,
+	};
+}
+
+export function getTrackingInformationFromPrePushResult(result: SourceControlledFile[]): {
+	workflows_eligible: number;
+	workflows_eligible_with_conflicts: number;
+	creds_eligible: number;
+	creds_eligible_with_conflicts: number;
+	variables_eligible: number;
+} {
+	const uniques = filterSourceControlledFilesUniqueIds(result);
+	return {
+		workflows_eligible: uniques.filter((file) => file.type === 'workflow').length,
+		workflows_eligible_with_conflicts: uniques.filter(
+			(file) => file.type === 'workflow' && file.conflict,
+		).length,
+		creds_eligible: uniques.filter((file) => file.type === 'credential').length,
+		creds_eligible_with_conflicts: uniques.filter(
+			(file) => file.type === 'credential' && file.conflict,
+		).length,
+		variables_eligible: uniques.filter((file) => file.type === 'variables').length,
+	};
+}
+
+export function getTrackingInformationFromPostPushResult(result: SourceControlledFile[]): {
+	workflows_eligible: number;
+	workflows_pushed: number;
+	creds_pushed: number;
+	variables_pushed: number;
+} {
+	const uniques = filterSourceControlledFilesUniqueIds(result);
+	return {
+		workflows_pushed: uniques.filter((file) => file.pushed && file.type === 'workflow').length ?? 0,
+		workflows_eligible: uniques.filter((file) => file.type === 'workflow').length ?? 0,
+		creds_pushed:
+			uniques.filter((file) => file.pushed && file.file.startsWith('credential_stubs')).length ?? 0,
+		variables_pushed:
+			uniques.filter((file) => file.pushed && file.file.startsWith('variable_stubs')).length ?? 0,
+	};
+}
diff --git a/packages/cli/src/environments/sourceControl/sourceControlImport.service.ee.ts b/packages/cli/src/environments/sourceControl/sourceControlImport.service.ee.ts
new file mode 100644
index 0000000000000..604e733e5712f
--- /dev/null
+++ b/packages/cli/src/environments/sourceControl/sourceControlImport.service.ee.ts
@@ -0,0 +1,514 @@
+import { Container, Service } from 'typedi';
+import path from 'path';
+import {
+	SOURCE_CONTROL_CREDENTIAL_EXPORT_FOLDER,
+	SOURCE_CONTROL_GIT_FOLDER,
+	SOURCE_CONTROL_TAGS_EXPORT_FILE,
+	SOURCE_CONTROL_VARIABLES_EXPORT_FILE,
+	SOURCE_CONTROL_WORKFLOW_EXPORT_FOLDER,
+} from './constants';
+import glob from 'fast-glob';
+import { ApplicationError, jsonParse, ErrorReporterProxy as ErrorReporter } from 'n8n-workflow';
+import { readFile as fsReadFile } from 'fs/promises';
+import { Credentials, InstanceSettings } from 'n8n-core';
+import type { IWorkflowToImport } from '@/Interfaces';
+import type { ExportableCredential } from './types/exportableCredential';
+import type { Variables } from '@db/entities/Variables';
+import { SharedCredentials } from '@db/entities/SharedCredentials';
+import type { WorkflowTagMapping } from '@db/entities/WorkflowTagMapping';
+import type { TagEntity } from '@db/entities/TagEntity';
+import { ActiveWorkflowManager } from '@/ActiveWorkflowManager';
+import { In } from '@n8n/typeorm';
+import { isUniqueConstraintError } from '@/ResponseHelper';
+import type { SourceControlWorkflowVersionId } from './types/sourceControlWorkflowVersionId';
+import { getCredentialExportPath, getWorkflowExportPath } from './sourceControlHelper.ee';
+import type { SourceControlledFile } from './types/sourceControlledFile';
+import { VariablesService } from '../variables/variables.service.ee';
+import { TagRepository } from '@db/repositories/tag.repository';
+import { WorkflowRepository } from '@db/repositories/workflow.repository';
+import { UserRepository } from '@db/repositories/user.repository';
+import { Logger } from '@/Logger';
+import { CredentialsRepository } from '@db/repositories/credentials.repository';
+import { SharedCredentialsRepository } from '@db/repositories/sharedCredentials.repository';
+import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
+import { WorkflowTagMappingRepository } from '@db/repositories/workflowTagMapping.repository';
+import { VariablesRepository } from '@db/repositories/variables.repository';
+
+@Service()
+export class SourceControlImportService {
+	private gitFolder: string;
+
+	private workflowExportFolder: string;
+
+	private credentialExportFolder: string;
+
+	constructor(
+		private readonly logger: Logger,
+		private readonly variablesService: VariablesService,
+		private readonly activeWorkflowManager: ActiveWorkflowManager,
+		private readonly tagRepository: TagRepository,
+		instanceSettings: InstanceSettings,
+	) {
+		this.gitFolder = path.join(instanceSettings.n8nFolder, SOURCE_CONTROL_GIT_FOLDER);
+		this.workflowExportFolder = path.join(this.gitFolder, SOURCE_CONTROL_WORKFLOW_EXPORT_FOLDER);
+		this.credentialExportFolder = path.join(
+			this.gitFolder,
+			SOURCE_CONTROL_CREDENTIAL_EXPORT_FOLDER,
+		);
+	}
+
+	public async getRemoteVersionIdsFromFiles(): Promise<SourceControlWorkflowVersionId[]> {
+		const remoteWorkflowFiles = await glob('*.json', {
+			cwd: this.workflowExportFolder,
+			absolute: true,
+		});
+		const remoteWorkflowFilesParsed = await Promise.all(
+			remoteWorkflowFiles.map(async (file) => {
+				this.logger.debug(`Parsing workflow file ${file}`);
+				const remote = jsonParse<IWorkflowToImport>(await fsReadFile(file, { encoding: 'utf8' }));
+				if (!remote?.id) {
+					return undefined;
+				}
+				return {
+					id: remote.id,
+					versionId: remote.versionId,
+					name: remote.name,
+					remoteId: remote.id,
+					filename: getWorkflowExportPath(remote.id, this.workflowExportFolder),
+				} as SourceControlWorkflowVersionId;
+			}),
+		);
+		return remoteWorkflowFilesParsed.filter(
+			(e) => e !== undefined,
+		) as SourceControlWorkflowVersionId[];
+	}
+
+	public async getLocalVersionIdsFromDb(): Promise<SourceControlWorkflowVersionId[]> {
+		const localWorkflows = await Container.get(WorkflowRepository).find({
+			select: ['id', 'name', 'versionId', 'updatedAt'],
+		});
+		return localWorkflows.map((local) => {
+			let updatedAt: Date;
+			if (local.updatedAt instanceof Date) {
+				updatedAt = local.updatedAt;
+			} else {
+				ErrorReporter.warn('updatedAt is not a Date', {
+					extra: {
+						type: typeof local.updatedAt,
+						value: local.updatedAt,
+					},
+				});
+				updatedAt = isNaN(Date.parse(local.updatedAt)) ? new Date() : new Date(local.updatedAt);
+			}
+			return {
+				id: local.id,
+				versionId: local.versionId,
+				name: local.name,
+				localId: local.id,
+				filename: getWorkflowExportPath(local.id, this.workflowExportFolder),
+				updatedAt: updatedAt.toISOString(),
+			};
+		}) as SourceControlWorkflowVersionId[];
+	}
+
+	public async getRemoteCredentialsFromFiles(): Promise<
+		Array<ExportableCredential & { filename: string }>
+	> {
+		const remoteCredentialFiles = await glob('*.json', {
+			cwd: this.credentialExportFolder,
+			absolute: true,
+		});
+		const remoteCredentialFilesParsed = await Promise.all(
+			remoteCredentialFiles.map(async (file) => {
+				this.logger.debug(`Parsing credential file ${file}`);
+				const remote = jsonParse<ExportableCredential>(
+					await fsReadFile(file, { encoding: 'utf8' }),
+				);
+				if (!remote?.id) {
+					return undefined;
+				}
+				return {
+					...remote,
+					filename: getCredentialExportPath(remote.id, this.credentialExportFolder),
+				};
+			}),
+		);
+		return remoteCredentialFilesParsed.filter((e) => e !== undefined) as Array<
+			ExportableCredential & { filename: string }
+		>;
+	}
+
+	public async getLocalCredentialsFromDb(): Promise<
+		Array<ExportableCredential & { filename: string }>
+	> {
+		const localCredentials = await Container.get(CredentialsRepository).find({
+			select: ['id', 'name', 'type'],
+		});
+		return localCredentials.map((local) => ({
+			id: local.id,
+			name: local.name,
+			type: local.type,
+			filename: getCredentialExportPath(local.id, this.credentialExportFolder),
+		})) as Array<ExportableCredential & { filename: string }>;
+	}
+
+	public async getRemoteVariablesFromFile(): Promise<Variables[]> {
+		const variablesFile = await glob(SOURCE_CONTROL_VARIABLES_EXPORT_FILE, {
+			cwd: this.gitFolder,
+			absolute: true,
+		});
+		if (variablesFile.length > 0) {
+			this.logger.debug(`Importing variables from file ${variablesFile[0]}`);
+			return jsonParse<Variables[]>(await fsReadFile(variablesFile[0], { encoding: 'utf8' }), {
+				fallbackValue: [],
+			});
+		}
+		return [];
+	}
+
+	public async getLocalVariablesFromDb(): Promise<Variables[]> {
+		return await this.variablesService.getAllCached();
+	}
+
+	public async getRemoteTagsAndMappingsFromFile(): Promise<{
+		tags: TagEntity[];
+		mappings: WorkflowTagMapping[];
+	}> {
+		const tagsFile = await glob(SOURCE_CONTROL_TAGS_EXPORT_FILE, {
+			cwd: this.gitFolder,
+			absolute: true,
+		});
+		if (tagsFile.length > 0) {
+			this.logger.debug(`Importing tags from file ${tagsFile[0]}`);
+			const mappedTags = jsonParse<{ tags: TagEntity[]; mappings: WorkflowTagMapping[] }>(
+				await fsReadFile(tagsFile[0], { encoding: 'utf8' }),
+				{ fallbackValue: { tags: [], mappings: [] } },
+			);
+			return mappedTags;
+		}
+		return { tags: [], mappings: [] };
+	}
+
+	public async getLocalTagsAndMappingsFromDb(): Promise<{
+		tags: TagEntity[];
+		mappings: WorkflowTagMapping[];
+	}> {
+		const localTags = await this.tagRepository.find({
+			select: ['id', 'name'],
+		});
+		const localMappings = await Container.get(WorkflowTagMappingRepository).find({
+			select: ['workflowId', 'tagId'],
+		});
+		return { tags: localTags, mappings: localMappings };
+	}
+
+	public async importWorkflowFromWorkFolder(candidates: SourceControlledFile[], userId: string) {
+		const workflowRunner = this.activeWorkflowManager;
+		const candidateIds = candidates.map((c) => c.id);
+		const existingWorkflows = await Container.get(WorkflowRepository).findByIds(candidateIds, {
+			fields: ['id', 'name', 'versionId', 'active'],
+		});
+		const allSharedWorkflows = await Container.get(SharedWorkflowRepository).findWithFields(
+			candidateIds,
+			{ select: ['workflowId', 'role', 'userId'] },
+		);
+		const cachedOwnerIds = new Map<string, string>();
+		const importWorkflowsResult = await Promise.all(
+			candidates.map(async (candidate) => {
+				this.logger.debug(`Parsing workflow file ${candidate.file}`);
+				const importedWorkflow = jsonParse<IWorkflowToImport & { owner: string }>(
+					await fsReadFile(candidate.file, { encoding: 'utf8' }),
+				);
+				if (!importedWorkflow?.id) {
+					return;
+				}
+				const existingWorkflow = existingWorkflows.find((e) => e.id === importedWorkflow.id);
+				importedWorkflow.active = existingWorkflow?.active ?? false;
+				this.logger.debug(`Updating workflow id ${importedWorkflow.id ?? 'new'}`);
+				const upsertResult = await Container.get(WorkflowRepository).upsert(
+					{ ...importedWorkflow },
+					['id'],
+				);
+				if (upsertResult?.identifiers?.length !== 1) {
+					throw new ApplicationError('Failed to upsert workflow', {
+						extra: { workflowId: importedWorkflow.id ?? 'new' },
+					});
+				}
+				// Update workflow owner to the user who exported the workflow, if that user exists
+				// in the instance, and the workflow doesn't already have an owner
+				let workflowOwnerId = userId;
+				if (cachedOwnerIds.has(importedWorkflow.owner)) {
+					workflowOwnerId = cachedOwnerIds.get(importedWorkflow.owner) ?? userId;
+				} else {
+					const foundUser = await Container.get(UserRepository).findOne({
+						where: {
+							email: importedWorkflow.owner,
+						},
+						select: ['id'],
+					});
+					if (foundUser) {
+						cachedOwnerIds.set(importedWorkflow.owner, foundUser.id);
+						workflowOwnerId = foundUser.id;
+					}
+				}
+
+				const existingSharedWorkflowOwnerByRoleId = allSharedWorkflows.find(
+					(e) => e.workflowId === importedWorkflow.id && e.role === 'workflow:owner',
+				);
+				const existingSharedWorkflowOwnerByUserId = allSharedWorkflows.find(
+					(e) => e.workflowId === importedWorkflow.id && e.role === 'workflow:owner',
+				);
+				if (!existingSharedWorkflowOwnerByUserId && !existingSharedWorkflowOwnerByRoleId) {
+					// no owner exists yet, so create one
+					await Container.get(SharedWorkflowRepository).insert({
+						workflowId: importedWorkflow.id,
+						userId: workflowOwnerId,
+						role: 'workflow:owner',
+					});
+				} else if (existingSharedWorkflowOwnerByRoleId) {
+					// skip, because the workflow already has a global owner
+				} else if (existingSharedWorkflowOwnerByUserId && !existingSharedWorkflowOwnerByRoleId) {
+					// if the workflow has a non-global owner that is referenced by the owner file,
+					// and no existing global owner, update the owner to the user referenced in the owner file
+					await Container.get(SharedWorkflowRepository).update(
+						{
+							workflowId: importedWorkflow.id,
+							userId: workflowOwnerId,
+						},
+						{ role: 'workflow:owner' },
+					);
+				}
+				if (existingWorkflow?.active) {
+					try {
+						// remove active pre-import workflow
+						this.logger.debug(`Deactivating workflow id ${existingWorkflow.id}`);
+						await workflowRunner.remove(existingWorkflow.id);
+						// try activating the imported workflow
+						this.logger.debug(`Reactivating workflow id ${existingWorkflow.id}`);
+						await workflowRunner.add(existingWorkflow.id, 'activate');
+						// update the versionId of the workflow to match the imported workflow
+					} catch (error) {
+						this.logger.error(`Failed to activate workflow ${existingWorkflow.id}`, error as Error);
+					} finally {
+						await Container.get(WorkflowRepository).update(
+							{ id: existingWorkflow.id },
+							{ versionId: importedWorkflow.versionId },
+						);
+					}
+				}
+
+				return {
+					id: importedWorkflow.id ?? 'unknown',
+					name: candidate.file,
+				};
+			}),
+		);
+		return importWorkflowsResult.filter((e) => e !== undefined) as Array<{
+			id: string;
+			name: string;
+		}>;
+	}
+
+	public async importCredentialsFromWorkFolder(
+		candidates: SourceControlledFile[],
+		importingUserId: string,
+	) {
+		const candidateIds = candidates.map((c) => c.id);
+		const existingCredentials = await Container.get(CredentialsRepository).find({
+			where: {
+				id: In(candidateIds),
+			},
+			select: ['id', 'name', 'type', 'data'],
+		});
+		const existingSharedCredentials = await Container.get(SharedCredentialsRepository).find({
+			select: ['userId', 'credentialsId', 'role'],
+			where: {
+				credentialsId: In(candidateIds),
+				role: 'credential:owner',
+			},
+		});
+		let importCredentialsResult: Array<{ id: string; name: string; type: string }> = [];
+		importCredentialsResult = await Promise.all(
+			candidates.map(async (candidate) => {
+				this.logger.debug(`Importing credentials file ${candidate.file}`);
+				const credential = jsonParse<ExportableCredential>(
+					await fsReadFile(candidate.file, { encoding: 'utf8' }),
+				);
+				const existingCredential = existingCredentials.find(
+					(e) => e.id === credential.id && e.type === credential.type,
+				);
+
+				const { name, type, data, id } = credential;
+				const newCredentialObject = new Credentials({ id, name }, type);
+				if (existingCredential?.data) {
+					newCredentialObject.data = existingCredential.data;
+				} else {
+					newCredentialObject.setData(data);
+				}
+
+				this.logger.debug(`Updating credential id ${newCredentialObject.id as string}`);
+				await Container.get(CredentialsRepository).upsert(newCredentialObject, ['id']);
+
+				const isOwnedLocally = existingSharedCredentials.some(
+					(c) => c.credentialsId === credential.id,
+				);
+
+				if (!isOwnedLocally) {
+					const remoteOwnerId = credential.ownedBy
+						? await Container.get(UserRepository)
+								.findOne({
+									where: { email: credential.ownedBy },
+									select: { id: true },
+								})
+								.then((user) => user?.id)
+						: null;
+
+					const newSharedCredential = new SharedCredentials();
+					newSharedCredential.credentialsId = newCredentialObject.id as string;
+					newSharedCredential.userId = remoteOwnerId ?? importingUserId;
+					newSharedCredential.role = 'credential:owner';
+
+					await Container.get(SharedCredentialsRepository).upsert({ ...newSharedCredential }, [
+						'credentialsId',
+						'userId',
+					]);
+				}
+
+				return {
+					id: newCredentialObject.id as string,
+					name: newCredentialObject.name,
+					type: newCredentialObject.type,
+				};
+			}),
+		);
+		return importCredentialsResult.filter((e) => e !== undefined);
+	}
+
+	public async importTagsFromWorkFolder(candidate: SourceControlledFile) {
+		let mappedTags;
+		try {
+			this.logger.debug(`Importing tags from file ${candidate.file}`);
+			mappedTags = jsonParse<{ tags: TagEntity[]; mappings: WorkflowTagMapping[] }>(
+				await fsReadFile(candidate.file, { encoding: 'utf8' }),
+				{ fallbackValue: { tags: [], mappings: [] } },
+			);
+		} catch (error) {
+			this.logger.error(`Failed to import tags from file ${candidate.file}`, error as Error);
+			return;
+		}
+
+		if (mappedTags.mappings.length === 0 && mappedTags.tags.length === 0) {
+			return;
+		}
+
+		const existingWorkflowIds = new Set(
+			(
+				await Container.get(WorkflowRepository).find({
+					select: ['id'],
+				})
+			).map((e) => e.id),
+		);
+
+		await Promise.all(
+			mappedTags.tags.map(async (tag) => {
+				const findByName = await this.tagRepository.findOne({
+					where: { name: tag.name },
+					select: ['id'],
+				});
+				if (findByName && findByName.id !== tag.id) {
+					throw new ApplicationError(
+						`A tag with the name <strong>${tag.name}</strong> already exists locally.<br />Please either rename the local tag, or the remote one with the id <strong>${tag.id}</strong> in the tags.json file.`,
+					);
+				}
+
+				const tagCopy = this.tagRepository.create(tag);
+				await this.tagRepository.upsert(tagCopy, {
+					skipUpdateIfNoValuesChanged: true,
+					conflictPaths: { id: true },
+				});
+			}),
+		);
+
+		await Promise.all(
+			mappedTags.mappings.map(async (mapping) => {
+				if (!existingWorkflowIds.has(String(mapping.workflowId))) return;
+				await Container.get(WorkflowTagMappingRepository).upsert(
+					{ tagId: String(mapping.tagId), workflowId: String(mapping.workflowId) },
+					{
+						skipUpdateIfNoValuesChanged: true,
+						conflictPaths: { tagId: true, workflowId: true },
+					},
+				);
+			}),
+		);
+
+		return mappedTags;
+	}
+
+	public async importVariablesFromWorkFolder(
+		candidate: SourceControlledFile,
+		valueOverrides?: {
+			[key: string]: string;
+		},
+	) {
+		const result: { imported: string[] } = { imported: [] };
+		let importedVariables;
+		try {
+			this.logger.debug(`Importing variables from file ${candidate.file}`);
+			importedVariables = jsonParse<Array<Partial<Variables>>>(
+				await fsReadFile(candidate.file, { encoding: 'utf8' }),
+				{ fallbackValue: [] },
+			);
+		} catch (error) {
+			this.logger.error(`Failed to import tags from file ${candidate.file}`, error as Error);
+			return;
+		}
+		const overriddenKeys = Object.keys(valueOverrides ?? {});
+
+		for (const variable of importedVariables) {
+			if (!variable.key) {
+				continue;
+			}
+			// by default no value is stored remotely, so an empty string is retuned
+			// it must be changed to undefined so as to not overwrite existing values!
+			if (variable.value === '') {
+				variable.value = undefined;
+			}
+			if (overriddenKeys.includes(variable.key) && valueOverrides) {
+				variable.value = valueOverrides[variable.key];
+				overriddenKeys.splice(overriddenKeys.indexOf(variable.key), 1);
+			}
+			try {
+				await Container.get(VariablesRepository).upsert({ ...variable }, ['id']);
+			} catch (errorUpsert) {
+				if (isUniqueConstraintError(errorUpsert as Error)) {
+					this.logger.debug(`Variable ${variable.key} already exists, updating instead`);
+					try {
+						await Container.get(VariablesRepository).update({ key: variable.key }, { ...variable });
+					} catch (errorUpdate) {
+						this.logger.debug(`Failed to update variable ${variable.key}, skipping`);
+						this.logger.debug((errorUpdate as Error).message);
+					}
+				}
+			} finally {
+				result.imported.push(variable.key);
+			}
+		}
+
+		// add remaining overrides as new variables
+		if (overriddenKeys.length > 0 && valueOverrides) {
+			for (const key of overriddenKeys) {
+				result.imported.push(key);
+				const newVariable = Container.get(VariablesRepository).create({
+					key,
+					value: valueOverrides[key],
+				});
+				await Container.get(VariablesRepository).save(newVariable, { transaction: false });
+			}
+		}
+
+		await this.variablesService.updateCache();
+
+		return result;
+	}
+}
diff --git a/packages/cli/src/environments/sourceControl/sourceControlPreferences.service.ee.ts b/packages/cli/src/environments/sourceControl/sourceControlPreferences.service.ee.ts
new file mode 100644
index 0000000000000..f33cfc2dc630c
--- /dev/null
+++ b/packages/cli/src/environments/sourceControl/sourceControlPreferences.service.ee.ts
@@ -0,0 +1,251 @@
+import { writeFile, chmod, readFile } from 'node:fs/promises';
+import Container, { Service } from 'typedi';
+import { SourceControlPreferences } from './types/sourceControlPreferences';
+import type { ValidationError } from 'class-validator';
+import { validate } from 'class-validator';
+import { rm as fsRm } from 'fs/promises';
+import { generateSshKeyPair, isSourceControlLicensed } from './sourceControlHelper.ee';
+import { Cipher, InstanceSettings } from 'n8n-core';
+import { ApplicationError, jsonParse } from 'n8n-workflow';
+import {
+	SOURCE_CONTROL_SSH_FOLDER,
+	SOURCE_CONTROL_GIT_FOLDER,
+	SOURCE_CONTROL_SSH_KEY_NAME,
+	SOURCE_CONTROL_PREFERENCES_DB_KEY,
+} from './constants';
+import path from 'path';
+import type { KeyPairType } from './types/keyPairType';
+import config from '@/config';
+import { Logger } from '@/Logger';
+import { SettingsRepository } from '@db/repositories/settings.repository';
+
+@Service()
+export class SourceControlPreferencesService {
+	private _sourceControlPreferences: SourceControlPreferences = new SourceControlPreferences();
+
+	readonly sshKeyName: string;
+
+	readonly sshFolder: string;
+
+	readonly gitFolder: string;
+
+	constructor(
+		private readonly instanceSettings: InstanceSettings,
+		private readonly logger: Logger,
+		private readonly cipher: Cipher,
+	) {
+		this.sshFolder = path.join(instanceSettings.n8nFolder, SOURCE_CONTROL_SSH_FOLDER);
+		this.gitFolder = path.join(instanceSettings.n8nFolder, SOURCE_CONTROL_GIT_FOLDER);
+		this.sshKeyName = path.join(this.sshFolder, SOURCE_CONTROL_SSH_KEY_NAME);
+	}
+
+	public get sourceControlPreferences(): SourceControlPreferences {
+		return {
+			...this._sourceControlPreferences,
+			connected: this._sourceControlPreferences.connected ?? false,
+		};
+	}
+
+	// merge the new preferences with the existing preferences when setting
+	public set sourceControlPreferences(preferences: Partial<SourceControlPreferences>) {
+		this._sourceControlPreferences = SourceControlPreferences.merge(
+			preferences,
+			this._sourceControlPreferences,
+		);
+	}
+
+	public isSourceControlSetup() {
+		return (
+			this.isSourceControlLicensedAndEnabled() &&
+			this.getPreferences().repositoryUrl &&
+			this.getPreferences().branchName
+		);
+	}
+
+	private async getKeyPairFromDatabase() {
+		const dbSetting = await Container.get(SettingsRepository).findByKey(
+			'features.sourceControl.sshKeys',
+		);
+
+		if (!dbSetting?.value) return null;
+
+		type KeyPair = { publicKey: string; encryptedPrivateKey: string };
+
+		return jsonParse<KeyPair | null>(dbSetting.value, { fallbackValue: null });
+	}
+
+	private async getPrivateKeyFromDatabase() {
+		const dbKeyPair = await this.getKeyPairFromDatabase();
+
+		if (!dbKeyPair) throw new ApplicationError('Failed to find key pair in database');
+
+		return this.cipher.decrypt(dbKeyPair.encryptedPrivateKey);
+	}
+
+	private async getPublicKeyFromDatabase() {
+		const dbKeyPair = await this.getKeyPairFromDatabase();
+
+		if (!dbKeyPair) throw new ApplicationError('Failed to find key pair in database');
+
+		return dbKeyPair.publicKey;
+	}
+
+	async getPrivateKeyPath() {
+		const dbPrivateKey = await this.getPrivateKeyFromDatabase();
+
+		const tempFilePath = path.join(this.instanceSettings.n8nFolder, 'ssh_private_key_temp');
+
+		await writeFile(tempFilePath, dbPrivateKey);
+
+		await chmod(tempFilePath, 0o600);
+
+		return tempFilePath;
+	}
+
+	async getPublicKey() {
+		try {
+			const dbPublicKey = await this.getPublicKeyFromDatabase();
+
+			if (dbPublicKey) return dbPublicKey;
+
+			return await readFile(this.sshKeyName + '.pub', { encoding: 'utf8' });
+		} catch (e) {
+			const error = e instanceof Error ? e : new Error(`${e}`);
+			this.logger.error(`Failed to read SSH public key: ${error.message}`);
+		}
+		return '';
+	}
+
+	async deleteKeyPair() {
+		try {
+			await fsRm(this.sshFolder, { recursive: true });
+			await Container.get(SettingsRepository).delete({ key: 'features.sourceControl.sshKeys' });
+		} catch (e) {
+			const error = e instanceof Error ? e : new Error(`${e}`);
+			this.logger.error(`Failed to delete SSH key pair: ${error.message}`);
+		}
+	}
+
+	/**
+	 * Generate an SSH key pair and write it to the database, overwriting any existing key pair.
+	 */
+	async generateAndSaveKeyPair(keyPairType?: KeyPairType): Promise<SourceControlPreferences> {
+		if (!keyPairType) {
+			keyPairType =
+				this.getPreferences().keyGeneratorType ??
+				(config.get('sourceControl.defaultKeyPairType') as KeyPairType) ??
+				'ed25519';
+		}
+		const keyPair = await generateSshKeyPair(keyPairType);
+
+		try {
+			await Container.get(SettingsRepository).save({
+				key: 'features.sourceControl.sshKeys',
+				value: JSON.stringify({
+					encryptedPrivateKey: this.cipher.encrypt(keyPair.privateKey),
+					publicKey: keyPair.publicKey,
+				}),
+				loadOnStartup: true,
+			});
+		} catch (error) {
+			throw new ApplicationError('Failed to write key pair to database', { cause: error });
+		}
+
+		// update preferences only after generating key pair to prevent endless loop
+		if (keyPairType !== this.getPreferences().keyGeneratorType) {
+			await this.setPreferences({ keyGeneratorType: keyPairType });
+		}
+
+		return this.getPreferences();
+	}
+
+	isBranchReadOnly(): boolean {
+		return this._sourceControlPreferences.branchReadOnly;
+	}
+
+	isSourceControlConnected(): boolean {
+		return this.sourceControlPreferences.connected;
+	}
+
+	isSourceControlLicensedAndEnabled(): boolean {
+		return this.isSourceControlConnected() && isSourceControlLicensed();
+	}
+
+	getBranchName(): string {
+		return this.sourceControlPreferences.branchName;
+	}
+
+	getPreferences(): SourceControlPreferences {
+		return this.sourceControlPreferences;
+	}
+
+	async validateSourceControlPreferences(
+		preferences: Partial<SourceControlPreferences>,
+		allowMissingProperties = true,
+	): Promise<ValidationError[]> {
+		const preferencesObject = new SourceControlPreferences(preferences);
+		const validationResult = await validate(preferencesObject, {
+			forbidUnknownValues: false,
+			skipMissingProperties: allowMissingProperties,
+			stopAtFirstError: false,
+			validationError: { target: false },
+		});
+		if (validationResult.length > 0) {
+			throw new ApplicationError('Invalid source control preferences', {
+				extra: { preferences: validationResult },
+			});
+		}
+		return validationResult;
+	}
+
+	async setPreferences(
+		preferences: Partial<SourceControlPreferences>,
+		saveToDb = true,
+	): Promise<SourceControlPreferences> {
+		const noKeyPair = (await this.getKeyPairFromDatabase()) === null;
+
+		if (noKeyPair) await this.generateAndSaveKeyPair();
+
+		this.sourceControlPreferences = preferences;
+		if (saveToDb) {
+			const settingsValue = JSON.stringify(this._sourceControlPreferences);
+			try {
+				await Container.get(SettingsRepository).save(
+					{
+						key: SOURCE_CONTROL_PREFERENCES_DB_KEY,
+						value: settingsValue,
+						loadOnStartup: true,
+					},
+					{ transaction: false },
+				);
+			} catch (error) {
+				throw new ApplicationError('Failed to save source control preferences', { cause: error });
+			}
+		}
+		return this.sourceControlPreferences;
+	}
+
+	async loadFromDbAndApplySourceControlPreferences(): Promise<
+		SourceControlPreferences | undefined
+	> {
+		const loadedPreferences = await Container.get(SettingsRepository).findOne({
+			where: { key: SOURCE_CONTROL_PREFERENCES_DB_KEY },
+		});
+		if (loadedPreferences) {
+			try {
+				const preferences = jsonParse<SourceControlPreferences>(loadedPreferences.value);
+				if (preferences) {
+					// set local preferences but don't write back to db
+					await this.setPreferences(preferences, false);
+					return preferences;
+				}
+			} catch (error) {
+				this.logger.warn(
+					`Could not parse Source Control settings from database: ${(error as Error).message}`,
+				);
+			}
+		}
+		await this.setPreferences(new SourceControlPreferences(), true);
+		return this.sourceControlPreferences;
+	}
+}
diff --git a/packages/cli/src/environments/sourceControl/types/exportResult.ts b/packages/cli/src/environments/sourceControl/types/exportResult.ts
new file mode 100644
index 0000000000000..976b4ca0c325f
--- /dev/null
+++ b/packages/cli/src/environments/sourceControl/types/exportResult.ts
@@ -0,0 +1,10 @@
+export interface ExportResult {
+	count: number;
+	folder: string;
+	files: Array<{
+		id: string;
+		name: string;
+	}>;
+	removedFiles?: string[];
+	missingIds?: string[];
+}
diff --git a/packages/cli/src/environments/sourceControl/types/exportableCredential.ts b/packages/cli/src/environments/sourceControl/types/exportableCredential.ts
new file mode 100644
index 0000000000000..36197da6caa80
--- /dev/null
+++ b/packages/cli/src/environments/sourceControl/types/exportableCredential.ts
@@ -0,0 +1,14 @@
+import type { ICredentialDataDecryptedObject } from 'n8n-workflow';
+
+export interface ExportableCredential {
+	id: string;
+	name: string;
+	type: string;
+	data: ICredentialDataDecryptedObject;
+
+	/**
+	 * Email of the user who owns this credential at the source instance.
+	 * Ownership is mirrored at target instance if user is also present there.
+	 */
+	ownedBy: string | null;
+}
diff --git a/packages/cli/src/environments/sourceControl/types/exportableWorkflow.ts b/packages/cli/src/environments/sourceControl/types/exportableWorkflow.ts
new file mode 100644
index 0000000000000..26b866ddc0231
--- /dev/null
+++ b/packages/cli/src/environments/sourceControl/types/exportableWorkflow.ts
@@ -0,0 +1,12 @@
+import type { INode, IConnections, IWorkflowSettings } from 'n8n-workflow';
+
+export interface ExportableWorkflow {
+	id: string;
+	name: string;
+	nodes: INode[];
+	connections: IConnections;
+	settings?: IWorkflowSettings;
+	triggerCount: number;
+	versionId: string;
+	owner: string;
+}
diff --git a/packages/cli/src/environments/sourceControl/types/importResult.ts b/packages/cli/src/environments/sourceControl/types/importResult.ts
new file mode 100644
index 0000000000000..2d90b409046ca
--- /dev/null
+++ b/packages/cli/src/environments/sourceControl/types/importResult.ts
@@ -0,0 +1,13 @@
+import type { TagEntity } from '@db/entities/TagEntity';
+import type { WorkflowTagMapping } from '@db/entities/WorkflowTagMapping';
+
+export interface ImportResult {
+	workflows: Array<{
+		id: string;
+		name: string;
+	}>;
+	credentials: Array<{ id: string; name: string; type: string }>;
+	variables: { imported: string[] };
+	tags: { tags: TagEntity[]; mappings: WorkflowTagMapping[] };
+	removedFiles?: string[];
+}
diff --git a/packages/cli/src/environments/versionControl/types/keyPair.ts b/packages/cli/src/environments/sourceControl/types/keyPair.ts
similarity index 100%
rename from packages/cli/src/environments/versionControl/types/keyPair.ts
rename to packages/cli/src/environments/sourceControl/types/keyPair.ts
diff --git a/packages/cli/src/environments/sourceControl/types/keyPairType.ts b/packages/cli/src/environments/sourceControl/types/keyPairType.ts
new file mode 100644
index 0000000000000..f9e4cf2d91cf4
--- /dev/null
+++ b/packages/cli/src/environments/sourceControl/types/keyPairType.ts
@@ -0,0 +1 @@
+export type KeyPairType = 'ed25519' | 'rsa';
diff --git a/packages/cli/src/environments/sourceControl/types/requests.ts b/packages/cli/src/environments/sourceControl/types/requests.ts
new file mode 100644
index 0000000000000..e48cf94681622
--- /dev/null
+++ b/packages/cli/src/environments/sourceControl/types/requests.ts
@@ -0,0 +1,26 @@
+import type { AuthenticatedRequest } from '@/requests';
+import type { SourceControlPreferences } from './sourceControlPreferences';
+import type { SourceControlSetBranch } from './sourceControlSetBranch';
+import type { SourceControlCommit } from './sourceControlCommit';
+import type { SourceControlStage } from './sourceControlStage';
+import type { SourceControlPush } from './sourceControlPush';
+import type { SourceControlPushWorkFolder } from './sourceControlPushWorkFolder';
+import type { SourceControlPullWorkFolder } from './sourceControlPullWorkFolder';
+import type { SourceControlDisconnect } from './sourceControlDisconnect';
+import type { SourceControlSetReadOnly } from './sourceControlSetReadOnly';
+import type { SourceControlGetStatus } from './sourceControlGetStatus';
+import type { SourceControlGenerateKeyPair } from './sourceControlGenerateKeyPair';
+
+export declare namespace SourceControlRequest {
+	type UpdatePreferences = AuthenticatedRequest<{}, {}, Partial<SourceControlPreferences>, {}>;
+	type SetReadOnly = AuthenticatedRequest<{}, {}, SourceControlSetReadOnly, {}>;
+	type SetBranch = AuthenticatedRequest<{}, {}, SourceControlSetBranch, {}>;
+	type Commit = AuthenticatedRequest<{}, {}, SourceControlCommit, {}>;
+	type Stage = AuthenticatedRequest<{}, {}, SourceControlStage, {}>;
+	type Push = AuthenticatedRequest<{}, {}, SourceControlPush, {}>;
+	type Disconnect = AuthenticatedRequest<{}, {}, SourceControlDisconnect, {}>;
+	type PushWorkFolder = AuthenticatedRequest<{}, {}, SourceControlPushWorkFolder, {}>;
+	type PullWorkFolder = AuthenticatedRequest<{}, {}, SourceControlPullWorkFolder, {}>;
+	type GetStatus = AuthenticatedRequest<{}, {}, {}, SourceControlGetStatus>;
+	type GenerateKeyPair = AuthenticatedRequest<{}, {}, SourceControlGenerateKeyPair, {}>;
+}
diff --git a/packages/cli/src/environments/sourceControl/types/sourceControlCommit.ts b/packages/cli/src/environments/sourceControl/types/sourceControlCommit.ts
new file mode 100644
index 0000000000000..cf5b5c02d9a2a
--- /dev/null
+++ b/packages/cli/src/environments/sourceControl/types/sourceControlCommit.ts
@@ -0,0 +1,6 @@
+import { IsString } from 'class-validator';
+
+export class SourceControlCommit {
+	@IsString()
+	message: string;
+}
diff --git a/packages/cli/src/environments/sourceControl/types/sourceControlDisconnect.ts b/packages/cli/src/environments/sourceControl/types/sourceControlDisconnect.ts
new file mode 100644
index 0000000000000..229faf7ed5633
--- /dev/null
+++ b/packages/cli/src/environments/sourceControl/types/sourceControlDisconnect.ts
@@ -0,0 +1,7 @@
+import { IsBoolean, IsOptional } from 'class-validator';
+
+export class SourceControlDisconnect {
+	@IsBoolean()
+	@IsOptional()
+	keepKeyPair?: boolean;
+}
diff --git a/packages/cli/src/environments/sourceControl/types/sourceControlGenerateKeyPair.ts b/packages/cli/src/environments/sourceControl/types/sourceControlGenerateKeyPair.ts
new file mode 100644
index 0000000000000..c625b1eb2bc52
--- /dev/null
+++ b/packages/cli/src/environments/sourceControl/types/sourceControlGenerateKeyPair.ts
@@ -0,0 +1,8 @@
+import { IsOptional, IsString } from 'class-validator';
+import { KeyPairType } from './keyPairType';
+
+export class SourceControlGenerateKeyPair {
+	@IsOptional()
+	@IsString()
+	readonly keyGeneratorType?: KeyPairType;
+}
diff --git a/packages/cli/src/environments/sourceControl/types/sourceControlGetStatus.ts b/packages/cli/src/environments/sourceControl/types/sourceControlGetStatus.ts
new file mode 100644
index 0000000000000..d8f30edff0e0a
--- /dev/null
+++ b/packages/cli/src/environments/sourceControl/types/sourceControlGetStatus.ts
@@ -0,0 +1,32 @@
+import { IsBoolean, IsOptional, IsString } from 'class-validator';
+
+function booleanFromString(value: string | boolean): boolean {
+	if (typeof value === 'boolean') {
+		return value;
+	}
+	return value === 'true';
+}
+
+export class SourceControlGetStatus {
+	@IsString()
+	@IsOptional()
+	direction: 'push' | 'pull';
+
+	@IsBoolean()
+	@IsOptional()
+	preferLocalVersion: boolean;
+
+	@IsBoolean()
+	@IsOptional()
+	verbose: boolean;
+
+	constructor(values: {
+		direction: 'push' | 'pull';
+		preferLocalVersion: string | boolean;
+		verbose: string | boolean;
+	}) {
+		this.direction = values.direction || 'push';
+		this.preferLocalVersion = booleanFromString(values.preferLocalVersion) || true;
+		this.verbose = booleanFromString(values.verbose) || false;
+	}
+}
diff --git a/packages/cli/src/environments/sourceControl/types/sourceControlPreferences.ts b/packages/cli/src/environments/sourceControl/types/sourceControlPreferences.ts
new file mode 100644
index 0000000000000..9b5c3a25ca1dc
--- /dev/null
+++ b/packages/cli/src/environments/sourceControl/types/sourceControlPreferences.ts
@@ -0,0 +1,53 @@
+import { IsBoolean, IsHexColor, IsOptional, IsString } from 'class-validator';
+import { KeyPairType } from './keyPairType';
+
+export class SourceControlPreferences {
+	constructor(preferences: Partial<SourceControlPreferences> | undefined = undefined) {
+		if (preferences) Object.assign(this, preferences);
+	}
+
+	@IsBoolean()
+	connected: boolean;
+
+	@IsString()
+	repositoryUrl: string;
+
+	@IsString()
+	branchName = 'main';
+
+	@IsBoolean()
+	branchReadOnly: boolean;
+
+	@IsHexColor()
+	branchColor: string;
+
+	@IsOptional()
+	@IsString()
+	readonly publicKey?: string;
+
+	@IsOptional()
+	@IsBoolean()
+	readonly initRepo?: boolean;
+
+	@IsOptional()
+	@IsString()
+	readonly keyGeneratorType?: KeyPairType;
+
+	static fromJSON(json: Partial<SourceControlPreferences>): SourceControlPreferences {
+		return new SourceControlPreferences(json);
+	}
+
+	static merge(
+		preferences: Partial<SourceControlPreferences>,
+		defaultPreferences: Partial<SourceControlPreferences>,
+	): SourceControlPreferences {
+		return new SourceControlPreferences({
+			connected: preferences.connected ?? defaultPreferences.connected,
+			repositoryUrl: preferences.repositoryUrl ?? defaultPreferences.repositoryUrl,
+			branchName: preferences.branchName ?? defaultPreferences.branchName,
+			branchReadOnly: preferences.branchReadOnly ?? defaultPreferences.branchReadOnly,
+			branchColor: preferences.branchColor ?? defaultPreferences.branchColor,
+			keyGeneratorType: preferences.keyGeneratorType ?? defaultPreferences.keyGeneratorType,
+		});
+	}
+}
diff --git a/packages/cli/src/environments/sourceControl/types/sourceControlPullWorkFolder.ts b/packages/cli/src/environments/sourceControl/types/sourceControlPullWorkFolder.ts
new file mode 100644
index 0000000000000..b87c970f0ed1d
--- /dev/null
+++ b/packages/cli/src/environments/sourceControl/types/sourceControlPullWorkFolder.ts
@@ -0,0 +1,28 @@
+import { IsBoolean, IsObject, IsOptional, IsString } from 'class-validator';
+
+export class SourceControlPullWorkFolder {
+	@IsBoolean()
+	@IsOptional()
+	force?: boolean;
+
+	@IsBoolean()
+	@IsOptional()
+	importAfterPull?: boolean = true;
+
+	@IsString({ each: true })
+	@IsOptional()
+	files?: Set<string>;
+
+	@IsObject()
+	@IsOptional()
+	variables?: { [key: string]: string };
+}
+
+export class SourceControllPullOptions {
+	/** ID of user performing a source control pull. */
+	userId: string;
+
+	force?: boolean;
+
+	variables?: { [key: string]: string };
+}
diff --git a/packages/cli/src/environments/sourceControl/types/sourceControlPush.ts b/packages/cli/src/environments/sourceControl/types/sourceControlPush.ts
new file mode 100644
index 0000000000000..94654e0b2ca42
--- /dev/null
+++ b/packages/cli/src/environments/sourceControl/types/sourceControlPush.ts
@@ -0,0 +1,7 @@
+import { IsBoolean, IsOptional } from 'class-validator';
+
+export class SourceControlPush {
+	@IsBoolean()
+	@IsOptional()
+	force?: boolean;
+}
diff --git a/packages/cli/src/environments/sourceControl/types/sourceControlPushWorkFolder.ts b/packages/cli/src/environments/sourceControl/types/sourceControlPushWorkFolder.ts
new file mode 100644
index 0000000000000..a6b23025d87aa
--- /dev/null
+++ b/packages/cli/src/environments/sourceControl/types/sourceControlPushWorkFolder.ts
@@ -0,0 +1,19 @@
+import { IsBoolean, IsOptional, IsString } from 'class-validator';
+import type { SourceControlledFile } from './sourceControlledFile';
+
+export class SourceControlPushWorkFolder {
+	@IsBoolean()
+	@IsOptional()
+	force?: boolean;
+
+	@IsString({ each: true })
+	fileNames: SourceControlledFile[];
+
+	@IsString()
+	@IsOptional()
+	message?: string;
+
+	@IsBoolean()
+	@IsOptional()
+	skipDiff?: boolean;
+}
diff --git a/packages/cli/src/environments/sourceControl/types/sourceControlSetBranch.ts b/packages/cli/src/environments/sourceControl/types/sourceControlSetBranch.ts
new file mode 100644
index 0000000000000..d5a2c72507591
--- /dev/null
+++ b/packages/cli/src/environments/sourceControl/types/sourceControlSetBranch.ts
@@ -0,0 +1,6 @@
+import { IsString } from 'class-validator';
+
+export class SourceControlSetBranch {
+	@IsString()
+	branch: string;
+}
diff --git a/packages/cli/src/environments/sourceControl/types/sourceControlSetReadOnly.ts b/packages/cli/src/environments/sourceControl/types/sourceControlSetReadOnly.ts
new file mode 100644
index 0000000000000..a5c1201563f2b
--- /dev/null
+++ b/packages/cli/src/environments/sourceControl/types/sourceControlSetReadOnly.ts
@@ -0,0 +1,6 @@
+import { IsBoolean } from 'class-validator';
+
+export class SourceControlSetReadOnly {
+	@IsBoolean()
+	branchReadOnly: boolean;
+}
diff --git a/packages/cli/src/environments/sourceControl/types/sourceControlStage.ts b/packages/cli/src/environments/sourceControl/types/sourceControlStage.ts
new file mode 100644
index 0000000000000..7569abf9b6602
--- /dev/null
+++ b/packages/cli/src/environments/sourceControl/types/sourceControlStage.ts
@@ -0,0 +1,15 @@
+import { IsOptional, IsString } from 'class-validator';
+
+export class SourceControlStage {
+	@IsString({ each: true })
+	@IsOptional()
+	fileNames?: Set<string>;
+
+	@IsString({ each: true })
+	@IsOptional()
+	workflowIds?: Set<string>;
+
+	@IsString({ each: true })
+	@IsOptional()
+	credentialIds?: Set<string>;
+}
diff --git a/packages/cli/src/environments/sourceControl/types/sourceControlWorkflowVersionId.ts b/packages/cli/src/environments/sourceControl/types/sourceControlWorkflowVersionId.ts
new file mode 100644
index 0000000000000..9afbf4e6fbb13
--- /dev/null
+++ b/packages/cli/src/environments/sourceControl/types/sourceControlWorkflowVersionId.ts
@@ -0,0 +1,9 @@
+export interface SourceControlWorkflowVersionId {
+	id: string;
+	versionId: string;
+	filename: string;
+	name?: string;
+	localId?: string;
+	remoteId?: string;
+	updatedAt?: string;
+}
diff --git a/packages/cli/src/environments/sourceControl/types/sourceControlledFile.ts b/packages/cli/src/environments/sourceControl/types/sourceControlledFile.ts
new file mode 100644
index 0000000000000..5bbf75921b2f8
--- /dev/null
+++ b/packages/cli/src/environments/sourceControl/types/sourceControlledFile.ts
@@ -0,0 +1,23 @@
+export type SourceControlledFileStatus =
+	| 'new'
+	| 'modified'
+	| 'deleted'
+	| 'created'
+	| 'renamed'
+	| 'conflicted'
+	| 'ignored'
+	| 'staged'
+	| 'unknown';
+export type SourceControlledFileLocation = 'local' | 'remote';
+export type SourceControlledFileType = 'credential' | 'workflow' | 'tags' | 'variables' | 'file';
+export type SourceControlledFile = {
+	file: string;
+	id: string;
+	name: string;
+	type: SourceControlledFileType;
+	status: SourceControlledFileStatus;
+	location: SourceControlledFileLocation;
+	conflict: boolean;
+	updatedAt: string;
+	pushed?: boolean;
+};
diff --git a/packages/cli/src/environments/variables/enviromentHelpers.ts b/packages/cli/src/environments/variables/enviromentHelpers.ts
deleted file mode 100644
index d7cc12249264b..0000000000000
--- a/packages/cli/src/environments/variables/enviromentHelpers.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { License } from '@/License';
-import Container from 'typedi';
-
-export function isVariablesEnabled(): boolean {
-	const license = Container.get(License);
-	return license.isVariablesEnabled();
-}
-
-export function canCreateNewVariable(variableCount: number): boolean {
-	if (!isVariablesEnabled()) {
-		return false;
-	}
-	const license = Container.get(License);
-	// This defaults to -1 which is what we want if we've enabled
-	// variables via the config
-	const limit = license.getVariablesLimit();
-	if (limit === -1) {
-		return true;
-	}
-	return limit > variableCount;
-}
-
-export function getVariablesLimit(): number {
-	const license = Container.get(License);
-	return license.getVariablesLimit();
-}
diff --git a/packages/cli/src/environments/variables/environmentHelpers.ts b/packages/cli/src/environments/variables/environmentHelpers.ts
new file mode 100644
index 0000000000000..7868f22715cab
--- /dev/null
+++ b/packages/cli/src/environments/variables/environmentHelpers.ts
@@ -0,0 +1,26 @@
+import { Container } from 'typedi';
+import { License } from '@/License';
+
+export function isVariablesEnabled(): boolean {
+	const license = Container.get(License);
+	return license.isVariablesEnabled();
+}
+
+export function canCreateNewVariable(variableCount: number): boolean {
+	if (!isVariablesEnabled()) {
+		return false;
+	}
+	const license = Container.get(License);
+	// This defaults to -1 which is what we want if we've enabled
+	// variables via the config
+	const limit = license.getVariablesLimit();
+	if (limit === -1) {
+		return true;
+	}
+	return limit > variableCount;
+}
+
+export function getVariablesLimit(): number {
+	const license = Container.get(License);
+	return license.getVariablesLimit();
+}
diff --git a/packages/cli/src/environments/variables/variables.controller.ee.ts b/packages/cli/src/environments/variables/variables.controller.ee.ts
index 3be05f32855d0..16a59f26d827a 100644
--- a/packages/cli/src/environments/variables/variables.controller.ee.ts
+++ b/packages/cli/src/environments/variables/variables.controller.ee.ts
@@ -1,79 +1,75 @@
-import express from 'express';
-import { LoggerProxy } from 'n8n-workflow';
+import { VariablesRequest } from '@/requests';
+import { Delete, Get, Licensed, Patch, Post, GlobalScope, RestController } from '@/decorators';
+import { VariablesService } from './variables.service.ee';
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
+import { NotFoundError } from '@/errors/response-errors/not-found.error';
+import { VariableValidationError } from '@/errors/variable-validation.error';
+import { VariableCountLimitReachedError } from '@/errors/variable-count-limit-reached.error';
 
-import * as ResponseHelper from '@/ResponseHelper';
-import type { VariablesRequest } from '@/requests';
-import {
-	VariablesLicenseError,
-	EEVariablesService,
-	VariablesValidationError,
-} from './variables.service.ee';
-import { isVariablesEnabled } from './enviromentHelpers';
+@RestController('/variables')
+export class VariablesController {
+	constructor(private readonly variablesService: VariablesService) {}
 
-// eslint-disable-next-line @typescript-eslint/naming-convention
-export const EEVariablesController = express.Router();
-
-/**
- * Initialize Logger if needed
- */
-EEVariablesController.use((req, res, next) => {
-	if (!isVariablesEnabled()) {
-		next('router');
-		return;
+	@Get('/')
+	@GlobalScope('variable:list')
+	async getVariables() {
+		return await this.variablesService.getAllCached();
 	}
 
-	next();
-});
-
-EEVariablesController.post(
-	'/',
-	ResponseHelper.send(async (req: VariablesRequest.Create) => {
-		if (req.user.globalRole.name !== 'owner') {
-			LoggerProxy.info('Attempt to update a variable blocked due to lack of permissions', {
-				userId: req.user.id,
-			});
-			throw new ResponseHelper.AuthError('Unauthorized');
-		}
+	@Post('/')
+	@Licensed('feat:variables')
+	@GlobalScope('variable:create')
+	async createVariable(req: VariablesRequest.Create) {
 		const variable = req.body;
 		delete variable.id;
 		try {
-			return await EEVariablesService.create(variable);
+			return await this.variablesService.create(variable);
 		} catch (error) {
-			if (error instanceof VariablesLicenseError) {
-				throw new ResponseHelper.BadRequestError(error.message);
-			} else if (error instanceof VariablesValidationError) {
-				throw new ResponseHelper.BadRequestError(error.message);
+			if (error instanceof VariableCountLimitReachedError) {
+				throw new BadRequestError(error.message);
+			} else if (error instanceof VariableValidationError) {
+				throw new BadRequestError(error.message);
 			}
 			throw error;
 		}
-	}),
-);
+	}
 
-EEVariablesController.patch(
-	'/:id(\\d+)',
-	ResponseHelper.send(async (req: VariablesRequest.Update) => {
-		const id = parseInt(req.params.id);
-		if (isNaN(id)) {
-			throw new ResponseHelper.BadRequestError('Invalid variable id ' + req.params.id);
-		}
-		if (req.user.globalRole.name !== 'owner') {
-			LoggerProxy.info('Attempt to update a variable blocked due to lack of permissions', {
-				id,
-				userId: req.user.id,
-			});
-			throw new ResponseHelper.AuthError('Unauthorized');
+	@Get('/:id')
+	@GlobalScope('variable:read')
+	async getVariable(req: VariablesRequest.Get) {
+		const id = req.params.id;
+		const variable = await this.variablesService.getCached(id);
+		if (variable === null) {
+			throw new NotFoundError(`Variable with id ${req.params.id} not found`);
 		}
+		return variable;
+	}
+
+	@Patch('/:id')
+	@Licensed('feat:variables')
+	@GlobalScope('variable:update')
+	async updateVariable(req: VariablesRequest.Update) {
+		const id = req.params.id;
 		const variable = req.body;
 		delete variable.id;
 		try {
-			return await EEVariablesService.update(id, variable);
+			return await this.variablesService.update(id, variable);
 		} catch (error) {
-			if (error instanceof VariablesLicenseError) {
-				throw new ResponseHelper.BadRequestError(error.message);
-			} else if (error instanceof VariablesValidationError) {
-				throw new ResponseHelper.BadRequestError(error.message);
+			if (error instanceof VariableCountLimitReachedError) {
+				throw new BadRequestError(error.message);
+			} else if (error instanceof VariableValidationError) {
+				throw new BadRequestError(error.message);
 			}
 			throw error;
 		}
-	}),
-);
+	}
+
+	@Delete('/:id(\\w+)')
+	@GlobalScope('variable:delete')
+	async deleteVariable(req: VariablesRequest.Delete) {
+		const id = req.params.id;
+		await this.variablesService.delete(id);
+
+		return true;
+	}
+}
diff --git a/packages/cli/src/environments/variables/variables.controller.ts b/packages/cli/src/environments/variables/variables.controller.ts
deleted file mode 100644
index 931df7784d8f1..0000000000000
--- a/packages/cli/src/environments/variables/variables.controller.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-import express from 'express';
-import { LoggerProxy } from 'n8n-workflow';
-
-import { getLogger } from '@/Logger';
-import * as ResponseHelper from '@/ResponseHelper';
-import type { VariablesRequest } from '@/requests';
-import { VariablesService } from './variables.service';
-import { EEVariablesController } from './variables.controller.ee';
-
-export const variablesController = express.Router();
-
-variablesController.use('/', EEVariablesController);
-
-/**
- * Initialize Logger if needed
- */
-variablesController.use((req, res, next) => {
-	try {
-		LoggerProxy.getInstance();
-	} catch (error) {
-		LoggerProxy.init(getLogger());
-	}
-	next();
-});
-
-variablesController.use(EEVariablesController);
-
-variablesController.get(
-	'/',
-	ResponseHelper.send(async () => {
-		return VariablesService.getAll();
-	}),
-);
-
-variablesController.post(
-	'/',
-	ResponseHelper.send(async () => {
-		throw new ResponseHelper.BadRequestError('No variables license found');
-	}),
-);
-
-variablesController.get(
-	'/:id(\\d+)',
-	ResponseHelper.send(async (req: VariablesRequest.Get) => {
-		const id = parseInt(req.params.id);
-		if (isNaN(id)) {
-			throw new ResponseHelper.BadRequestError('Invalid variable id ' + req.params.id);
-		}
-		const variable = await VariablesService.get(id);
-		if (variable === null) {
-			throw new ResponseHelper.NotFoundError(`Variable with id ${req.params.id} not found`);
-		}
-		return variable;
-	}),
-);
-
-variablesController.patch(
-	'/:id(\\d+)',
-	ResponseHelper.send(async () => {
-		throw new ResponseHelper.BadRequestError('No variables license found');
-	}),
-);
-
-variablesController.delete(
-	'/:id(\\d+)',
-	ResponseHelper.send(async (req: VariablesRequest.Delete) => {
-		const id = parseInt(req.params.id);
-		if (isNaN(id)) {
-			throw new ResponseHelper.BadRequestError('Invalid variable id ' + req.params.id);
-		}
-		if (req.user.globalRole.name !== 'owner') {
-			LoggerProxy.info('Attempt to delete a variable blocked due to lack of permissions', {
-				id,
-				userId: req.user.id,
-			});
-			throw new ResponseHelper.AuthError('Unauthorized');
-		}
-		await VariablesService.delete(id);
-
-		return true;
-	}),
-);
diff --git a/packages/cli/src/environments/variables/variables.service.ee.ts b/packages/cli/src/environments/variables/variables.service.ee.ts
index b5c48dcef08d7..80a4846252eb8 100644
--- a/packages/cli/src/environments/variables/variables.service.ee.ts
+++ b/packages/cli/src/environments/variables/variables.service.ee.ts
@@ -1,45 +1,91 @@
-import type { Variables } from '@/databases/entities/Variables';
-import { collections } from '@/Db';
+import { Container, Service } from 'typedi';
+import type { Variables } from '@db/entities/Variables';
 import { InternalHooks } from '@/InternalHooks';
-import Container from 'typedi';
-import { canCreateNewVariable } from './enviromentHelpers';
-import { VariablesService } from './variables.service';
+import { generateNanoId } from '@db/utils/generators';
+import { canCreateNewVariable } from './environmentHelpers';
+import { CacheService } from '@/services/cache/cache.service';
+import { VariablesRepository } from '@db/repositories/variables.repository';
+import { VariableCountLimitReachedError } from '@/errors/variable-count-limit-reached.error';
+import { VariableValidationError } from '@/errors/variable-validation.error';
 
-export class VariablesLicenseError extends Error {}
-export class VariablesValidationError extends Error {}
+@Service()
+export class VariablesService {
+	constructor(
+		protected cacheService: CacheService,
+		protected variablesRepository: VariablesRepository,
+	) {}
 
-export class EEVariablesService extends VariablesService {
-	static async getCount(): Promise<number> {
-		return collections.Variables.count();
+	async getAllCached(): Promise<Variables[]> {
+		const 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));
 	}
 
-	static validateVariable(variable: Omit<Variables, 'id'>): void {
+	async getCount(): Promise<number> {
+		return (await this.getAllCached()).length;
+	}
+
+	async getCached(id: string): Promise<Variables | null> {
+		const variables = await this.getAllCached();
+		const foundVariable = variables.find((variable) => variable.id === id);
+		if (!foundVariable) {
+			return null;
+		}
+		return this.variablesRepository.create(foundVariable as Partial<Variables>);
+	}
+
+	async delete(id: string): Promise<void> {
+		await this.variablesRepository.delete(id);
+		await this.updateCache();
+	}
+
+	async updateCache(): Promise<void> {
+		// TODO: log update cache metric
+		const variables = await this.findAll();
+		await this.cacheService.set('variables', variables);
+	}
+
+	async findAll(): Promise<Variables[]> {
+		return await this.variablesRepository.find();
+	}
+
+	validateVariable(variable: Omit<Variables, 'id'>): void {
 		if (variable.key.length > 50) {
-			throw new VariablesValidationError('key cannot be longer than 50 characters');
+			throw new VariableValidationError('key cannot be longer than 50 characters');
 		}
 		if (variable.key.replace(/[A-Za-z0-9_]/g, '').length !== 0) {
-			throw new VariablesValidationError('key can only contain characters A-Za-z0-9_');
+			throw new VariableValidationError('key can only contain characters A-Za-z0-9_');
 		}
-		if (variable.value.length > 255) {
-			throw new VariablesValidationError('value cannot be longer than 255 characters');
+		if (variable.value?.length > 255) {
+			throw new VariableValidationError('value cannot be longer than 255 characters');
 		}
 	}
 
-	static async create(variable: Omit<Variables, 'id'>): Promise<Variables> {
+	async create(variable: Omit<Variables, 'id'>): Promise<Variables> {
 		if (!canCreateNewVariable(await this.getCount())) {
-			throw new VariablesLicenseError('Variables limit reached');
+			throw new VariableCountLimitReachedError('Variables limit reached');
 		}
 		this.validateVariable(variable);
 
 		void Container.get(InternalHooks).onVariableCreated({ variable_type: variable.type });
-		return collections.Variables.save(variable);
+		const saveResult = await this.variablesRepository.save(
+			{
+				...variable,
+				id: generateNanoId(),
+			},
+			{ transaction: false },
+		);
+		await this.updateCache();
+		return saveResult;
 	}
 
-	static async update(id: number, variable: Omit<Variables, 'id'>): Promise<Variables> {
+	async update(id: string, variable: Omit<Variables, 'id'>): Promise<Variables> {
 		this.validateVariable(variable);
-
-		await collections.Variables.update(id, variable);
-		// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-		return (await this.get(id))!;
+		await this.variablesRepository.update(id, variable);
+		await this.updateCache();
+		return (await this.getCached(id))!;
 	}
 }
diff --git a/packages/cli/src/environments/variables/variables.service.ts b/packages/cli/src/environments/variables/variables.service.ts
deleted file mode 100644
index 646f9368f2382..0000000000000
--- a/packages/cli/src/environments/variables/variables.service.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import type { Variables } from '@/databases/entities/Variables';
-import { collections } from '@/Db';
-
-export class VariablesService {
-	static async getAll(): Promise<Variables[]> {
-		return collections.Variables.find();
-	}
-
-	static async getCount(): Promise<number> {
-		return collections.Variables.count();
-	}
-
-	static async get(id: number): Promise<Variables | null> {
-		return collections.Variables.findOne({ where: { id } });
-	}
-
-	static async delete(id: number): Promise<void> {
-		await collections.Variables.delete(id);
-	}
-}
diff --git a/packages/cli/src/environments/versionControl/constants.ts b/packages/cli/src/environments/versionControl/constants.ts
deleted file mode 100644
index dc415672beae8..0000000000000
--- a/packages/cli/src/environments/versionControl/constants.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const VERSION_CONTROL_PREFERENCES_DB_KEY = 'features.versionControl';
diff --git a/packages/cli/src/environments/versionControl/middleware/versionControlEnabledMiddleware.ts b/packages/cli/src/environments/versionControl/middleware/versionControlEnabledMiddleware.ts
deleted file mode 100644
index 5ed3a1293b443..0000000000000
--- a/packages/cli/src/environments/versionControl/middleware/versionControlEnabledMiddleware.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import type { RequestHandler } from 'express';
-import {
-	isVersionControlLicensed,
-	isVersionControlLicensedAndEnabled,
-} from '../versionControlHelper';
-
-export const versionControlLicensedAndEnabledMiddleware: RequestHandler = (req, res, next) => {
-	if (isVersionControlLicensedAndEnabled()) {
-		next();
-	} else {
-		res.status(401).json({ status: 'error', message: 'Unauthorized' });
-	}
-};
-
-export const versionControlLicensedMiddleware: RequestHandler = (req, res, next) => {
-	if (isVersionControlLicensed()) {
-		next();
-	} else {
-		res.status(401).json({ status: 'error', message: 'Unauthorized' });
-	}
-};
diff --git a/packages/cli/src/environments/versionControl/types/requests.ts b/packages/cli/src/environments/versionControl/types/requests.ts
deleted file mode 100644
index 0782873ba56ae..0000000000000
--- a/packages/cli/src/environments/versionControl/types/requests.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import type { AuthenticatedRequest } from '@/requests';
-import type { VersionControlPreferences } from './versionControlPreferences';
-
-export declare namespace VersionControlRequest {
-	type UpdatePreferences = AuthenticatedRequest<{}, {}, Partial<VersionControlPreferences>, {}>;
-}
diff --git a/packages/cli/src/environments/versionControl/types/versionControlPreferences.ts b/packages/cli/src/environments/versionControl/types/versionControlPreferences.ts
deleted file mode 100644
index 9481270ec5394..0000000000000
--- a/packages/cli/src/environments/versionControl/types/versionControlPreferences.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { IsBoolean, IsEmail, IsHexColor, IsOptional, IsString } from 'class-validator';
-
-export class VersionControlPreferences {
-	constructor(preferences: Partial<VersionControlPreferences> | undefined = undefined) {
-		if (preferences) Object.assign(this, preferences);
-	}
-
-	@IsBoolean()
-	connected: boolean;
-
-	@IsString()
-	repositoryUrl: string;
-
-	@IsString()
-	authorName: string;
-
-	@IsEmail()
-	authorEmail: string;
-
-	@IsString()
-	branchName: string;
-
-	@IsBoolean()
-	branchReadOnly: boolean;
-
-	@IsHexColor()
-	branchColor: string;
-
-	@IsOptional()
-	@IsString()
-	readonly privateKey?: string;
-
-	@IsOptional()
-	@IsString()
-	readonly publicKey?: string;
-}
diff --git a/packages/cli/src/environments/versionControl/versionControl.controller.ee.ts b/packages/cli/src/environments/versionControl/versionControl.controller.ee.ts
deleted file mode 100644
index 5bbac46f0bcb6..0000000000000
--- a/packages/cli/src/environments/versionControl/versionControl.controller.ee.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { Authorized, Get, Post, RestController } from '@/decorators';
-import { versionControlLicensedMiddleware } from './middleware/versionControlEnabledMiddleware';
-import { VersionControlService } from './versionControl.service.ee';
-import { VersionControlRequest } from './types/requests';
-import type { VersionControlPreferences } from './types/versionControlPreferences';
-
-@RestController('/versionControl')
-export class VersionControlController {
-	constructor(private versionControlService: VersionControlService) {}
-
-	@Authorized('any')
-	@Get('/preferences', { middlewares: [versionControlLicensedMiddleware] })
-	async getPreferences(): Promise<VersionControlPreferences> {
-		// returns the settings with the privateKey property redacted
-		return this.versionControlService.versionControlPreferences;
-	}
-
-	@Authorized(['global', 'owner'])
-	@Post('/preferences', { middlewares: [versionControlLicensedMiddleware] })
-	async setPreferences(req: VersionControlRequest.UpdatePreferences) {
-		const sanitizedPreferences: Partial<VersionControlPreferences> = {
-			...req.body,
-			privateKey: undefined,
-			publicKey: undefined,
-		};
-		await this.versionControlService.validateVersionControlPreferences(sanitizedPreferences);
-		return this.versionControlService.setPreferences(sanitizedPreferences);
-	}
-
-	//TODO: temporary function to generate key and save new pair
-	// REMOVE THIS FUNCTION AFTER TESTING
-	@Authorized(['global', 'owner'])
-	@Get('/generateKeyPair', { middlewares: [versionControlLicensedMiddleware] })
-	async generateKeyPair() {
-		return this.versionControlService.generateAndSaveKeyPair();
-	}
-}
diff --git a/packages/cli/src/environments/versionControl/versionControl.service.ee.ts b/packages/cli/src/environments/versionControl/versionControl.service.ee.ts
deleted file mode 100644
index d531935f00152..0000000000000
--- a/packages/cli/src/environments/versionControl/versionControl.service.ee.ts
+++ /dev/null
@@ -1,108 +0,0 @@
-import { Service } from 'typedi';
-import { generateSshKeyPair } from './versionControlHelper';
-import { VersionControlPreferences } from './types/versionControlPreferences';
-import { VERSION_CONTROL_PREFERENCES_DB_KEY } from './constants';
-import * as Db from '@/Db';
-import { jsonParse, LoggerProxy } from 'n8n-workflow';
-import type { ValidationError } from 'class-validator';
-import { validate } from 'class-validator';
-
-@Service()
-export class VersionControlService {
-	private _versionControlPreferences: VersionControlPreferences = new VersionControlPreferences();
-
-	async init(): Promise<void> {
-		await this.loadFromDbAndApplyVersionControlPreferences();
-	}
-
-	public get versionControlPreferences(): VersionControlPreferences {
-		return {
-			...this._versionControlPreferences,
-			privateKey: '(redacted)',
-		};
-	}
-
-	public set versionControlPreferences(preferences: Partial<VersionControlPreferences>) {
-		this._versionControlPreferences = {
-			connected: preferences.connected ?? this._versionControlPreferences.connected,
-			authorEmail: preferences.authorEmail ?? this._versionControlPreferences.authorEmail,
-			authorName: preferences.authorName ?? this._versionControlPreferences.authorName,
-			branchName: preferences.branchName ?? this._versionControlPreferences.branchName,
-			branchColor: preferences.branchColor ?? this._versionControlPreferences.branchColor,
-			branchReadOnly: preferences.branchReadOnly ?? this._versionControlPreferences.branchReadOnly,
-			privateKey: preferences.privateKey ?? this._versionControlPreferences.privateKey,
-			publicKey: preferences.publicKey ?? this._versionControlPreferences.publicKey,
-			repositoryUrl: preferences.repositoryUrl ?? this._versionControlPreferences.repositoryUrl,
-		};
-	}
-
-	async generateAndSaveKeyPair() {
-		const keyPair = generateSshKeyPair('ed25519');
-		if (keyPair.publicKey && keyPair.privateKey) {
-			await this.setPreferences({ ...keyPair });
-		} else {
-			LoggerProxy.error('Failed to generate key pair');
-		}
-		return keyPair;
-	}
-
-	async validateVersionControlPreferences(
-		preferences: Partial<VersionControlPreferences>,
-	): Promise<ValidationError[]> {
-		const preferencesObject = new VersionControlPreferences(preferences);
-		const validationResult = await validate(preferencesObject, {
-			forbidUnknownValues: false,
-			skipMissingProperties: true,
-			stopAtFirstError: false,
-			validationError: { target: false },
-		});
-		if (validationResult.length > 0) {
-			throw new Error(`Invalid version control preferences: ${JSON.stringify(validationResult)}`);
-		}
-		// TODO: if repositoryUrl is changed, check if it is valid
-		// TODO: if branchName is changed, check if it is valid
-		return validationResult;
-	}
-
-	async setPreferences(
-		preferences: Partial<VersionControlPreferences>,
-		saveToDb = true,
-	): Promise<VersionControlPreferences> {
-		this.versionControlPreferences = preferences;
-		if (saveToDb) {
-			const settingsValue = JSON.stringify(this._versionControlPreferences);
-			try {
-				await Db.collections.Settings.save({
-					key: VERSION_CONTROL_PREFERENCES_DB_KEY,
-					value: settingsValue,
-					loadOnStartup: true,
-				});
-			} catch (error) {
-				throw new Error(`Failed to save version control preferences: ${(error as Error).message}`);
-			}
-		}
-		return this.versionControlPreferences;
-	}
-
-	async loadFromDbAndApplyVersionControlPreferences(): Promise<
-		VersionControlPreferences | undefined
-	> {
-		const loadedPreferences = await Db.collections.Settings.findOne({
-			where: { key: VERSION_CONTROL_PREFERENCES_DB_KEY },
-		});
-		if (loadedPreferences) {
-			try {
-				const preferences = jsonParse<VersionControlPreferences>(loadedPreferences.value);
-				if (preferences) {
-					await this.setPreferences(preferences, false);
-					return preferences;
-				}
-			} catch (error) {
-				LoggerProxy.warn(
-					`Could not parse Version Control settings from database: ${(error as Error).message}`,
-				);
-			}
-		}
-		return;
-	}
-}
diff --git a/packages/cli/src/environments/versionControl/versionControlHelper.ts b/packages/cli/src/environments/versionControl/versionControlHelper.ts
deleted file mode 100644
index 9810977f91983..0000000000000
--- a/packages/cli/src/environments/versionControl/versionControlHelper.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import Container from 'typedi';
-import { License } from '../../License';
-import { generateKeyPairSync } from 'crypto';
-import sshpk from 'sshpk';
-import type { KeyPair } from './types/keyPair';
-
-export function isVersionControlLicensed() {
-	const license = Container.get(License);
-	return license.isVersionControlLicensed();
-}
-
-export function isVersionControlEnabled() {
-	// TODO: VERSION CONTROL check if enabled
-	return true;
-}
-
-export function isVersionControlLicensedAndEnabled() {
-	return isVersionControlLicensed() && isVersionControlEnabled();
-}
-
-export function generateSshKeyPair(keyType: 'ed25519' | 'rsa' = 'ed25519') {
-	const keyPair: KeyPair = {
-		publicKey: '',
-		privateKey: '',
-	};
-	let generatedKeyPair: KeyPair;
-	switch (keyType) {
-		case 'ed25519':
-			generatedKeyPair = generateKeyPairSync('ed25519', {
-				privateKeyEncoding: { format: 'pem', type: 'pkcs8' },
-				publicKeyEncoding: { format: 'pem', type: 'spki' },
-			});
-			break;
-		case 'rsa':
-			generatedKeyPair = generateKeyPairSync('rsa', {
-				modulusLength: 4096,
-				publicKeyEncoding: {
-					type: 'spki',
-					format: 'pem',
-				},
-				privateKeyEncoding: {
-					type: 'pkcs8',
-					format: 'pem',
-				},
-			});
-			break;
-	}
-	const keyPublic = sshpk.parseKey(generatedKeyPair.publicKey, 'pem');
-	keyPair.publicKey = keyPublic.toString('ssh');
-	const keyPrivate = sshpk.parsePrivateKey(generatedKeyPair.privateKey, 'pem');
-	keyPair.privateKey = keyPrivate.toString('ssh-private');
-	return {
-		privateKey: keyPair.privateKey,
-		publicKey: keyPair.publicKey,
-	};
-}
diff --git a/packages/cli/src/errors/cache-errors/malformed-refresh-value.error.ts b/packages/cli/src/errors/cache-errors/malformed-refresh-value.error.ts
new file mode 100644
index 0000000000000..178cbc85826ab
--- /dev/null
+++ b/packages/cli/src/errors/cache-errors/malformed-refresh-value.error.ts
@@ -0,0 +1,7 @@
+import { ApplicationError } from 'n8n-workflow';
+
+export class MalformedRefreshValueError extends ApplicationError {
+	constructor() {
+		super('Refresh value must have the same number of values as keys');
+	}
+}
diff --git a/packages/cli/src/errors/cache-errors/uncacheable-value.error.ts b/packages/cli/src/errors/cache-errors/uncacheable-value.error.ts
new file mode 100644
index 0000000000000..7888ee97b2b41
--- /dev/null
+++ b/packages/cli/src/errors/cache-errors/uncacheable-value.error.ts
@@ -0,0 +1,9 @@
+import { ApplicationError } from 'n8n-workflow';
+
+export class UncacheableValueError extends ApplicationError {
+	constructor(key: string) {
+		super('Value cannot be cached in Redis', {
+			extra: { key, hint: 'Does the value contain circular references?' },
+		});
+	}
+}
diff --git a/packages/cli/src/errors/credential-not-found.error.ts b/packages/cli/src/errors/credential-not-found.error.ts
new file mode 100644
index 0000000000000..ac47a0eaea261
--- /dev/null
+++ b/packages/cli/src/errors/credential-not-found.error.ts
@@ -0,0 +1,8 @@
+import { ApplicationError } from 'n8n-workflow';
+
+export class CredentialNotFoundError extends ApplicationError {
+	constructor(credentialId: string, credentialType: string) {
+		super(`Credential with ID "${credentialId}" does not exist for type "${credentialType}".`);
+		this.level = 'warning';
+	}
+}
diff --git a/packages/cli/src/errors/external-secrets-provider-not-found.error.ts b/packages/cli/src/errors/external-secrets-provider-not-found.error.ts
new file mode 100644
index 0000000000000..422236d14859f
--- /dev/null
+++ b/packages/cli/src/errors/external-secrets-provider-not-found.error.ts
@@ -0,0 +1,7 @@
+import { ApplicationError } from 'n8n-workflow';
+
+export class ExternalSecretsProviderNotFoundError extends ApplicationError {
+	constructor(public providerName: string) {
+		super(`External secrets provider not found: ${providerName}`);
+	}
+}
diff --git a/packages/cli/src/errors/feature-not-licensed.error.ts b/packages/cli/src/errors/feature-not-licensed.error.ts
new file mode 100644
index 0000000000000..1419501941575
--- /dev/null
+++ b/packages/cli/src/errors/feature-not-licensed.error.ts
@@ -0,0 +1,10 @@
+import type { LICENSE_FEATURES } from '@/constants';
+import { ApplicationError } from 'n8n-workflow';
+
+export class FeatureNotLicensedError extends ApplicationError {
+	constructor(feature: (typeof LICENSE_FEATURES)[keyof typeof LICENSE_FEATURES]) {
+		super(
+			`Your license does not allow for ${feature}. To enable ${feature}, please upgrade to a license that supports this feature.`,
+		);
+	}
+}
diff --git a/packages/cli/src/errors/invalid-role.error.ts b/packages/cli/src/errors/invalid-role.error.ts
new file mode 100644
index 0000000000000..fc5ebb8aa90f1
--- /dev/null
+++ b/packages/cli/src/errors/invalid-role.error.ts
@@ -0,0 +1,3 @@
+import { ApplicationError } from 'n8n-workflow';
+
+export class InvalidRoleError extends ApplicationError {}
diff --git a/packages/cli/src/errors/max-stalled-count.error.ts b/packages/cli/src/errors/max-stalled-count.error.ts
new file mode 100644
index 0000000000000..6715de0ade837
--- /dev/null
+++ b/packages/cli/src/errors/max-stalled-count.error.ts
@@ -0,0 +1,13 @@
+import { ApplicationError } from 'n8n-workflow';
+
+/**
+ * See https://github.com/OptimalBits/bull/blob/60fa88f08637f0325639988a3f054880a04ce402/docs/README.md?plain=1#L133
+ */
+export class MaxStalledCountError extends ApplicationError {
+	constructor(cause: Error) {
+		super('The execution has reached the maximum number of attempts and will no longer retry.', {
+			level: 'warning',
+			cause,
+		});
+	}
+}
diff --git a/packages/cli/src/errors/not-string-array.error.ts b/packages/cli/src/errors/not-string-array.error.ts
new file mode 100644
index 0000000000000..22e9fae90282b
--- /dev/null
+++ b/packages/cli/src/errors/not-string-array.error.ts
@@ -0,0 +1,7 @@
+import { ApplicationError } from 'n8n-workflow';
+
+export class NotStringArrayError extends ApplicationError {
+	constructor(env: string) {
+		super(`${env} is not a string array.`);
+	}
+}
diff --git a/packages/cli/src/errors/postgres-live-rows-retrieval.error.ts b/packages/cli/src/errors/postgres-live-rows-retrieval.error.ts
new file mode 100644
index 0000000000000..ea97f80684d52
--- /dev/null
+++ b/packages/cli/src/errors/postgres-live-rows-retrieval.error.ts
@@ -0,0 +1,7 @@
+import { ApplicationError } from 'n8n-workflow';
+
+export class PostgresLiveRowsRetrievalError extends ApplicationError {
+	constructor(rows: unknown) {
+		super('Failed to retrieve live execution rows in Postgres', { extra: { rows } });
+	}
+}
diff --git a/packages/cli/src/errors/response-errors/abstract/response.error.ts b/packages/cli/src/errors/response-errors/abstract/response.error.ts
new file mode 100644
index 0000000000000..f756afce413dc
--- /dev/null
+++ b/packages/cli/src/errors/response-errors/abstract/response.error.ts
@@ -0,0 +1,23 @@
+import { ApplicationError } from 'n8n-workflow';
+
+/**
+ * Special Error which allows to return also an error code and http status code
+ */
+export abstract class ResponseError extends ApplicationError {
+	/**
+	 * Creates an instance of ResponseError.
+	 * Must be used inside a block with `ResponseHelper.send()`.
+	 */
+	constructor(
+		message: string,
+		// The HTTP status code of  response
+		readonly httpStatusCode: number,
+		// The error code in the response
+		readonly errorCode: number = httpStatusCode,
+		// The error hint the response
+		readonly hint: string | undefined = undefined,
+	) {
+		super(message);
+		this.name = 'ResponseError';
+	}
+}
diff --git a/packages/cli/src/errors/response-errors/auth.error.ts b/packages/cli/src/errors/response-errors/auth.error.ts
new file mode 100644
index 0000000000000..cb3441211ba78
--- /dev/null
+++ b/packages/cli/src/errors/response-errors/auth.error.ts
@@ -0,0 +1,7 @@
+import { ResponseError } from './abstract/response.error';
+
+export class AuthError extends ResponseError {
+	constructor(message: string, errorCode?: number) {
+		super(message, 401, errorCode);
+	}
+}
diff --git a/packages/cli/src/errors/response-errors/bad-request.error.ts b/packages/cli/src/errors/response-errors/bad-request.error.ts
new file mode 100644
index 0000000000000..560688f2cbe7f
--- /dev/null
+++ b/packages/cli/src/errors/response-errors/bad-request.error.ts
@@ -0,0 +1,7 @@
+import { ResponseError } from './abstract/response.error';
+
+export class BadRequestError extends ResponseError {
+	constructor(message: string, errorCode?: number) {
+		super(message, 400, errorCode);
+	}
+}
diff --git a/packages/cli/src/errors/response-errors/conflict.error.ts b/packages/cli/src/errors/response-errors/conflict.error.ts
new file mode 100644
index 0000000000000..fdf33903717b0
--- /dev/null
+++ b/packages/cli/src/errors/response-errors/conflict.error.ts
@@ -0,0 +1,7 @@
+import { ResponseError } from './abstract/response.error';
+
+export class ConflictError extends ResponseError {
+	constructor(message: string, hint: string | undefined = undefined) {
+		super(message, 409, 409, hint);
+	}
+}
diff --git a/packages/cli/src/errors/response-errors/failed-dependency.error.ts b/packages/cli/src/errors/response-errors/failed-dependency.error.ts
new file mode 100644
index 0000000000000..243de02665466
--- /dev/null
+++ b/packages/cli/src/errors/response-errors/failed-dependency.error.ts
@@ -0,0 +1,7 @@
+import { ResponseError } from './abstract/response.error';
+
+export class FailedDependencyError extends ResponseError {
+	constructor(message: string, errorCode = 424) {
+		super(message, 424, errorCode);
+	}
+}
diff --git a/packages/cli/src/errors/response-errors/internal-server.error.ts b/packages/cli/src/errors/response-errors/internal-server.error.ts
new file mode 100644
index 0000000000000..4c10e93f95343
--- /dev/null
+++ b/packages/cli/src/errors/response-errors/internal-server.error.ts
@@ -0,0 +1,7 @@
+import { ResponseError } from './abstract/response.error';
+
+export class InternalServerError extends ResponseError {
+	constructor(message: string, errorCode = 500) {
+		super(message, 500, errorCode);
+	}
+}
diff --git a/packages/cli/src/errors/response-errors/not-found.error.ts b/packages/cli/src/errors/response-errors/not-found.error.ts
new file mode 100644
index 0000000000000..9d9e0e12d576a
--- /dev/null
+++ b/packages/cli/src/errors/response-errors/not-found.error.ts
@@ -0,0 +1,7 @@
+import { ResponseError } from './abstract/response.error';
+
+export class NotFoundError extends ResponseError {
+	constructor(message: string, hint: string | undefined = undefined) {
+		super(message, 404, 404, hint);
+	}
+}
diff --git a/packages/cli/src/errors/response-errors/service-unavailable.error.ts b/packages/cli/src/errors/response-errors/service-unavailable.error.ts
new file mode 100644
index 0000000000000..7736e85f5f233
--- /dev/null
+++ b/packages/cli/src/errors/response-errors/service-unavailable.error.ts
@@ -0,0 +1,7 @@
+import { ResponseError } from './abstract/response.error';
+
+export class ServiceUnavailableError extends ResponseError {
+	constructor(message: string, errorCode = 503) {
+		super(message, 503, errorCode);
+	}
+}
diff --git a/packages/cli/src/errors/response-errors/unauthorized.error.ts b/packages/cli/src/errors/response-errors/unauthorized.error.ts
new file mode 100644
index 0000000000000..bc8993c014874
--- /dev/null
+++ b/packages/cli/src/errors/response-errors/unauthorized.error.ts
@@ -0,0 +1,7 @@
+import { ResponseError } from './abstract/response.error';
+
+export class UnauthorizedError extends ResponseError {
+	constructor(message: string, hint: string | undefined = undefined) {
+		super(message, 403, 403, hint);
+	}
+}
diff --git a/packages/cli/src/errors/response-errors/unprocessable.error.ts b/packages/cli/src/errors/response-errors/unprocessable.error.ts
new file mode 100644
index 0000000000000..723acbfbafa9a
--- /dev/null
+++ b/packages/cli/src/errors/response-errors/unprocessable.error.ts
@@ -0,0 +1,7 @@
+import { ResponseError } from './abstract/response.error';
+
+export class UnprocessableRequestError extends ResponseError {
+	constructor(message: string, hint: string | undefined = undefined) {
+		super(message, 422, 422, hint);
+	}
+}
diff --git a/packages/cli/src/errors/response-errors/webhook-not-found.error.ts b/packages/cli/src/errors/response-errors/webhook-not-found.error.ts
new file mode 100644
index 0000000000000..648a7a01063fd
--- /dev/null
+++ b/packages/cli/src/errors/response-errors/webhook-not-found.error.ts
@@ -0,0 +1,57 @@
+import { NotFoundError } from './not-found.error';
+
+export const webhookNotFoundErrorMessage = ({
+	path,
+	httpMethod,
+	webhookMethods,
+}: {
+	path: string;
+	httpMethod?: string;
+	webhookMethods?: string[];
+}) => {
+	let webhookPath = path;
+
+	if (httpMethod) {
+		webhookPath = `${httpMethod} ${webhookPath}`;
+	}
+
+	if (webhookMethods?.length && httpMethod) {
+		let methods = '';
+
+		if (webhookMethods.length === 1) {
+			methods = webhookMethods[0];
+		} else {
+			const lastMethod = webhookMethods.pop();
+
+			methods = `${webhookMethods.join(', ')} or ${lastMethod as string}`;
+		}
+
+		return `This webhook is not registered for ${httpMethod} requests. Did you mean to make a ${methods} request?`;
+	} else {
+		return `The requested webhook "${webhookPath}" is not registered.`;
+	}
+};
+
+export class WebhookNotFoundError extends NotFoundError {
+	constructor(
+		{
+			path,
+			httpMethod,
+			webhookMethods,
+		}: {
+			path: string;
+			httpMethod?: string;
+			webhookMethods?: string[];
+		},
+		{ hint }: { hint: 'default' | 'production' } = { hint: 'default' },
+	) {
+		const errorMsg = webhookNotFoundErrorMessage({ path, httpMethod, webhookMethods });
+
+		const hintMsg =
+			hint === 'default'
+				? "Click the 'Test workflow' button on the canvas, then try again. (In test mode, the webhook only works for one call after you click this button)"
+				: "The workflow must be active for a production URL to run successfully. You can activate the workflow using the toggle in the top-right of the editor. Note that unlike test URL calls, production URL calls aren't shown on the canvas (only in the executions list)";
+
+		super(errorMsg, hintMsg);
+	}
+}
diff --git a/packages/cli/src/errors/shared-workflow-not-found.error.ts b/packages/cli/src/errors/shared-workflow-not-found.error.ts
new file mode 100644
index 0000000000000..ae4c99f3f302b
--- /dev/null
+++ b/packages/cli/src/errors/shared-workflow-not-found.error.ts
@@ -0,0 +1,3 @@
+import { ApplicationError } from 'n8n-workflow';
+
+export class SharedWorkflowNotFoundError extends ApplicationError {}
diff --git a/packages/cli/src/errors/unknown-auth-type.error.ts b/packages/cli/src/errors/unknown-auth-type.error.ts
new file mode 100644
index 0000000000000..b8ac45bf8e6fd
--- /dev/null
+++ b/packages/cli/src/errors/unknown-auth-type.error.ts
@@ -0,0 +1,7 @@
+import { ApplicationError } from 'n8n-workflow';
+
+export class UnknownAuthTypeError extends ApplicationError {
+	constructor(authType: string) {
+		super('Unknown auth type', { extra: { authType } });
+	}
+}
diff --git a/packages/cli/src/errors/unrecognized-node-type.error.ts b/packages/cli/src/errors/unrecognized-node-type.error.ts
new file mode 100644
index 0000000000000..1ca5281de5913
--- /dev/null
+++ b/packages/cli/src/errors/unrecognized-node-type.error.ts
@@ -0,0 +1,9 @@
+import { ApplicationError } from 'n8n-workflow';
+
+export class UnrecognizedNodeTypeError extends ApplicationError {
+	severity = 'warning';
+
+	constructor(nodeType: string) {
+		super(`Unrecognized node type: ${nodeType}".`);
+	}
+}
diff --git a/packages/cli/src/errors/variable-count-limit-reached.error.ts b/packages/cli/src/errors/variable-count-limit-reached.error.ts
new file mode 100644
index 0000000000000..67d14efebf605
--- /dev/null
+++ b/packages/cli/src/errors/variable-count-limit-reached.error.ts
@@ -0,0 +1,3 @@
+import { ApplicationError } from 'n8n-workflow';
+
+export class VariableCountLimitReachedError extends ApplicationError {}
diff --git a/packages/cli/src/errors/variable-validation.error.ts b/packages/cli/src/errors/variable-validation.error.ts
new file mode 100644
index 0000000000000..bd2026e7ef8b7
--- /dev/null
+++ b/packages/cli/src/errors/variable-validation.error.ts
@@ -0,0 +1,3 @@
+import { ApplicationError } from 'n8n-workflow';
+
+export class VariableValidationError extends ApplicationError {}
diff --git a/packages/cli/src/errors/workflow-history-version-not-found.error.ts b/packages/cli/src/errors/workflow-history-version-not-found.error.ts
new file mode 100644
index 0000000000000..104385672fcc5
--- /dev/null
+++ b/packages/cli/src/errors/workflow-history-version-not-found.error.ts
@@ -0,0 +1,3 @@
+import { ApplicationError } from 'n8n-workflow';
+
+export class WorkflowHistoryVersionNotFoundError extends ApplicationError {}
diff --git a/packages/cli/src/errors/workflow-missing-id.error.ts b/packages/cli/src/errors/workflow-missing-id.error.ts
new file mode 100644
index 0000000000000..469ee6f4f0848
--- /dev/null
+++ b/packages/cli/src/errors/workflow-missing-id.error.ts
@@ -0,0 +1,9 @@
+import type { IWorkflowDb } from '@/Interfaces';
+import type { Workflow } from 'n8n-workflow';
+import { ApplicationError } from 'n8n-workflow';
+
+export class WorkflowMissingIdError extends ApplicationError {
+	constructor(workflow: Workflow | IWorkflowDb) {
+		super('Detected ID-less worklfow', { extra: { workflow } });
+	}
+}
diff --git a/packages/cli/src/eventbus/EventMessageClasses/EventMessageAiNode.ts b/packages/cli/src/eventbus/EventMessageClasses/EventMessageAiNode.ts
new file mode 100644
index 0000000000000..44d9feafbde14
--- /dev/null
+++ b/packages/cli/src/eventbus/EventMessageClasses/EventMessageAiNode.ts
@@ -0,0 +1,52 @@
+import { AbstractEventMessage, isEventMessageOptionsWithType } from './AbstractEventMessage';
+import type { EventNamesAiNodesType, JsonObject } from 'n8n-workflow';
+import { EventMessageTypeNames } from 'n8n-workflow';
+import type { AbstractEventMessageOptions } from './AbstractEventMessageOptions';
+import type { AbstractEventPayload } from './AbstractEventPayload';
+
+// --------------------------------------
+// EventMessage class for Node events
+// --------------------------------------
+export interface EventPayloadAiNode extends AbstractEventPayload {
+	msg?: string;
+	executionId: string;
+	nodeName: string;
+	workflowId?: string;
+	workflowName: string;
+	nodeType?: string;
+}
+
+export interface EventMessageAiNodeOptions extends AbstractEventMessageOptions {
+	eventName: EventNamesAiNodesType;
+
+	payload?: EventPayloadAiNode | undefined;
+}
+
+export class EventMessageAiNode extends AbstractEventMessage {
+	readonly __type = EventMessageTypeNames.aiNode;
+
+	eventName: EventNamesAiNodesType;
+
+	payload: EventPayloadAiNode;
+
+	constructor(options: EventMessageAiNodeOptions) {
+		super(options);
+		if (options.payload) this.setPayload(options.payload);
+		if (options.anonymize) {
+			this.anonymize();
+		}
+	}
+
+	setPayload(payload: EventPayloadAiNode): this {
+		this.payload = payload;
+		return this;
+	}
+
+	deserialize(data: JsonObject): this {
+		if (isEventMessageOptionsWithType(data, this.__type)) {
+			this.setOptionsOrDefault(data);
+			if (data.payload) this.setPayload(data.payload as EventPayloadAiNode);
+		}
+		return this;
+	}
+}
diff --git a/packages/cli/src/eventbus/EventMessageClasses/EventMessageWorkflow.ts b/packages/cli/src/eventbus/EventMessageClasses/EventMessageWorkflow.ts
index 41cb442e395bd..146e0ffcd3229 100644
--- a/packages/cli/src/eventbus/EventMessageClasses/EventMessageWorkflow.ts
+++ b/packages/cli/src/eventbus/EventMessageClasses/EventMessageWorkflow.ts
@@ -9,7 +9,7 @@ import type { EventNamesWorkflowType } from '.';
 // --------------------------------------
 // EventMessage class for Workflow events
 // --------------------------------------
-interface EventPayloadWorkflow extends AbstractEventPayload {
+export interface EventPayloadWorkflow extends AbstractEventPayload {
 	msg?: string;
 
 	workflowData?: IWorkflowBase;
diff --git a/packages/cli/src/eventbus/EventMessageClasses/index.ts b/packages/cli/src/eventbus/EventMessageClasses/index.ts
index 4b4fe47f8d822..cecfcdbaf5188 100644
--- a/packages/cli/src/eventbus/EventMessageClasses/index.ts
+++ b/packages/cli/src/eventbus/EventMessageClasses/index.ts
@@ -1,7 +1,9 @@
+import type { EventMessageAiNode } from './EventMessageAiNode';
 import type { EventMessageAudit } from './EventMessageAudit';
 import type { EventMessageGeneric } from './EventMessageGeneric';
 import type { EventMessageNode } from './EventMessageNode';
 import type { EventMessageWorkflow } from './EventMessageWorkflow';
+import { eventNamesAiNodes, type EventNamesAiNodesType } from 'n8n-workflow';
 
 export const eventNamesWorkflow = [
 	'n8n.workflow.started',
@@ -9,8 +11,11 @@ export const eventNamesWorkflow = [
 	'n8n.workflow.failed',
 	'n8n.workflow.crashed',
 ] as const;
+export const eventNamesGeneric = ['n8n.worker.started', 'n8n.worker.stopped'] as const;
 export const eventNamesNode = ['n8n.node.started', 'n8n.node.finished'] as const;
 export const eventNamesAudit = [
+	'n8n.audit.user.login.success',
+	'n8n.audit.user.login.failed',
 	'n8n.audit.user.signedup',
 	'n8n.audit.user.updated',
 	'n8n.audit.user.deleted',
@@ -22,6 +27,8 @@ export const eventNamesAudit = [
 	'n8n.audit.user.reset',
 	'n8n.audit.user.credentials.created',
 	'n8n.audit.user.credentials.shared',
+	'n8n.audit.user.credentials.updated',
+	'n8n.audit.user.credentials.deleted',
 	'n8n.audit.user.api.created',
 	'n8n.audit.user.api.deleted',
 	'n8n.audit.package.installed',
@@ -35,20 +42,30 @@ export const eventNamesAudit = [
 export type EventNamesWorkflowType = (typeof eventNamesWorkflow)[number];
 export type EventNamesAuditType = (typeof eventNamesAudit)[number];
 export type EventNamesNodeType = (typeof eventNamesNode)[number];
+export type EventNamesGenericType = (typeof eventNamesGeneric)[number];
 
 export type EventNamesTypes =
 	| EventNamesAuditType
 	| EventNamesWorkflowType
 	| EventNamesNodeType
+	| EventNamesGenericType
+	| EventNamesAiNodesType
 	| 'n8n.destination.test';
 
-export const eventNamesAll = [...eventNamesAudit, ...eventNamesWorkflow, ...eventNamesNode];
+export const eventNamesAll = [
+	...eventNamesAudit,
+	...eventNamesWorkflow,
+	...eventNamesNode,
+	...eventNamesGeneric,
+	...eventNamesAiNodes,
+];
 
 export type EventMessageTypes =
 	| EventMessageGeneric
 	| EventMessageWorkflow
 	| EventMessageAudit
-	| EventMessageNode;
+	| EventMessageNode
+	| EventMessageAiNode;
 
 export interface FailedEventSummary {
 	lastNodeExecuted: string;
diff --git a/packages/cli/src/eventbus/MessageEventBus/MessageEventBus.ts b/packages/cli/src/eventbus/MessageEventBus/MessageEventBus.ts
index 5d63f57b26de3..2f8626f6e6cec 100644
--- a/packages/cli/src/eventbus/MessageEventBus/MessageEventBus.ts
+++ b/packages/cli/src/eventbus/MessageEventBus/MessageEventBus.ts
@@ -1,6 +1,18 @@
-import { LoggerProxy } from 'n8n-workflow';
+import { Service } from 'typedi';
+import type { DeleteResult } from '@n8n/typeorm';
+import { In } from '@n8n/typeorm';
+import EventEmitter from 'events';
+import uniqby from 'lodash/uniqBy';
+import { jsonParse } from 'n8n-workflow';
 import type { MessageEventBusDestinationOptions } from 'n8n-workflow';
-import type { DeleteResult } from 'typeorm';
+
+import config from '@/config';
+import { EventDestinationsRepository } from '@db/repositories/eventDestinations.repository';
+import { ExecutionRepository } from '@db/repositories/execution.repository';
+import { WorkflowRepository } from '@db/repositories/workflow.repository';
+import { OrchestrationService } from '@/services/orchestration.service';
+import { Logger } from '@/Logger';
+
 import type {
 	EventMessageTypes,
 	EventNamesTypes,
@@ -8,14 +20,7 @@ import type {
 } from '../EventMessageClasses/';
 import type { MessageEventBusDestination } from '../MessageEventBusDestination/MessageEventBusDestination.ee';
 import { MessageEventBusLogWriter } from '../MessageEventBusWriter/MessageEventBusLogWriter';
-import EventEmitter from 'events';
-import config from '@/config';
-import * as Db from '@/Db';
-import {
-	messageEventBusDestinationFromDb,
-	incrementPrometheusMetric,
-} from '../MessageEventBusDestination/Helpers.ee';
-import uniqby from 'lodash.uniqby';
+import { messageEventBusDestinationFromDb } from '../MessageEventBusDestination/MessageEventBusDestinationFromDb';
 import type { EventMessageConfirmSource } from '../EventMessageClasses/EventMessageConfirm';
 import type { EventMessageAuditOptions } from '../EventMessageClasses/EventMessageAudit';
 import { EventMessageAudit } from '../EventMessageClasses/EventMessageAudit';
@@ -28,7 +33,14 @@ import {
 	EventMessageGeneric,
 	eventMessageGenericDestinationTestEvent,
 } from '../EventMessageClasses/EventMessageGeneric';
-import { recoverExecutionDataFromEventLogMessages } from './recoverEvents';
+import { METRICS_EVENT_NAME } from '../MessageEventBusDestination/Helpers.ee';
+import type { AbstractEventMessageOptions } from '../EventMessageClasses/AbstractEventMessageOptions';
+import { getEventMessageObjectByType } from '../EventMessageClasses/Helpers';
+import { ExecutionDataRecoveryService } from '../executionDataRecovery.service';
+import {
+	EventMessageAiNode,
+	type EventMessageAiNodeOptions,
+} from '../EventMessageClasses/EventMessageAiNode';
 
 export type EventMessageReturnMode = 'sent' | 'unsent' | 'all' | 'unfinished';
 
@@ -37,10 +49,14 @@ export interface MessageWithCallback {
 	confirmCallback: (message: EventMessageTypes, src: EventMessageConfirmSource) => void;
 }
 
-export class MessageEventBus extends EventEmitter {
-	private static instance: MessageEventBus;
+export interface MessageEventBusInitializeOptions {
+	skipRecoveryPass?: boolean;
+	workerId?: string;
+}
 
-	isInitialized: boolean;
+@Service()
+export class MessageEventBus extends EventEmitter {
+	private isInitialized = false;
 
 	logWriter: MessageEventBusLogWriter;
 
@@ -50,16 +66,15 @@ export class MessageEventBus extends EventEmitter {
 
 	private pushIntervalTimer: NodeJS.Timer;
 
-	constructor() {
+	constructor(
+		private readonly logger: Logger,
+		private readonly executionRepository: ExecutionRepository,
+		private readonly eventDestinationsRepository: EventDestinationsRepository,
+		private readonly workflowRepository: WorkflowRepository,
+		private readonly orchestrationService: OrchestrationService,
+		private readonly recoveryService: ExecutionDataRecoveryService,
+	) {
 		super();
-		this.isInitialized = false;
-	}
-
-	static getInstance(): MessageEventBus {
-		if (!MessageEventBus.instance) {
-			MessageEventBus.instance = new MessageEventBus();
-		}
-		return MessageEventBus.instance;
 	}
 
 	/**
@@ -70,53 +85,122 @@ export class MessageEventBus extends EventEmitter {
 	 *
 	 * Sets `isInitialized` to `true` once finished.
 	 */
-	async initialize() {
+	// eslint-disable-next-line complexity
+	async initialize(options?: MessageEventBusInitializeOptions): Promise<void> {
 		if (this.isInitialized) {
 			return;
 		}
 
-		LoggerProxy.debug('Initializing event bus...');
+		this.logger.debug('Initializing event bus...');
 
-		const savedEventDestinations = await Db.collections.EventDestinations.find({});
+		const savedEventDestinations = await this.eventDestinationsRepository.find({});
 		if (savedEventDestinations.length > 0) {
 			for (const destinationData of savedEventDestinations) {
 				try {
 					const destination = messageEventBusDestinationFromDb(this, destinationData);
 					if (destination) {
-						await this.addDestination(destination);
+						await this.addDestination(destination, false);
 					}
 				} catch (error) {
 					// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-					if (error.message) LoggerProxy.debug(error.message as string);
+					if (error.message) this.logger.debug(error.message as string);
 				}
 			}
 		}
 
-		LoggerProxy.debug('Initializing event writer');
-		this.logWriter = await MessageEventBusLogWriter.getInstance();
-
-		// unsent event check:
-		// - find unsent messages in current event log(s)
-		// - cycle event logs and start the logging to a fresh file
-		// - retry sending events
-		LoggerProxy.debug('Checking for unsent event messages');
-		const unsentAndUnfinished = await this.getUnsentAndUnfinishedExecutions();
-		LoggerProxy.debug(
-			`Start logging into ${this.logWriter?.getLogFileName() ?? 'unknown filename'} `,
-		);
-		this.logWriter?.startLogging();
-		await this.send(unsentAndUnfinished.unsentMessages);
-
-		if (Object.keys(unsentAndUnfinished.unfinishedExecutions).length > 0) {
-			for (const executionId of Object.keys(unsentAndUnfinished.unfinishedExecutions)) {
-				await recoverExecutionDataFromEventLogMessages(
-					executionId,
-					unsentAndUnfinished.unfinishedExecutions[executionId],
-					true,
+		this.logger.debug('Initializing event writer');
+		if (options?.workerId) {
+			// only add 'worker' to log file name since the ID changes on every start and we
+			// would not be able to recover the log files from the previous run not knowing it
+			const logBaseName = config.getEnv('eventBus.logWriter.logBaseName') + '-worker';
+			this.logWriter = await MessageEventBusLogWriter.getInstance({
+				logBaseName,
+			});
+		} else {
+			this.logWriter = await MessageEventBusLogWriter.getInstance();
+		}
+
+		if (!this.logWriter) {
+			this.logger.warn('Could not initialize event writer');
+		}
+
+		if (options?.skipRecoveryPass) {
+			this.logger.debug('Skipping unsent event check');
+		} else {
+			// unsent event check:
+			// - find unsent messages in current event log(s)
+			// - cycle event logs and start the logging to a fresh file
+			// - retry sending events
+			this.logger.debug('Checking for unsent event messages');
+			const unsentAndUnfinished = await this.getUnsentAndUnfinishedExecutions();
+			this.logger.debug(
+				`Start logging into ${this.logWriter?.getLogFileName() ?? 'unknown filename'} `,
+			);
+			this.logWriter?.startLogging();
+			await this.send(unsentAndUnfinished.unsentMessages);
+
+			let unfinishedExecutionIds = Object.keys(unsentAndUnfinished.unfinishedExecutions);
+
+			// if we are in queue mode, running jobs may still be running on a worker despite the main process
+			// crashing, so we can't just mark them as crashed
+			if (config.get('executions.mode') !== 'queue') {
+				const dbUnfinishedExecutionIds = (
+					await this.executionRepository.find({
+						where: {
+							status: In(['running', 'new', 'unknown']),
+						},
+						select: ['id'],
+					})
+				).map((e) => e.id);
+				unfinishedExecutionIds = Array.from(
+					new Set<string>([...unfinishedExecutionIds, ...dbUnfinishedExecutionIds]),
 				);
 			}
-		}
 
+			if (unfinishedExecutionIds.length > 0) {
+				this.logger.warn(`Found unfinished executions: ${unfinishedExecutionIds.join(', ')}`);
+				this.logger.info('This could be due to a crash of an active workflow or a restart of n8n.');
+				const activeWorkflows = await this.workflowRepository.find({
+					where: { active: true },
+					select: ['id', 'name'],
+				});
+				if (activeWorkflows.length > 0) {
+					this.logger.info('Currently active workflows:');
+					for (const workflowData of activeWorkflows) {
+						this.logger.info(`   - ${workflowData.name} (ID: ${workflowData.id})`);
+					}
+				}
+				const recoveryAlreadyAttempted = this.logWriter?.isRecoveryProcessRunning();
+				if (recoveryAlreadyAttempted || config.getEnv('eventBus.crashRecoveryMode') === 'simple') {
+					await this.executionRepository.markAsCrashed(unfinishedExecutionIds);
+					// if we end up here, it means that the previous recovery process did not finish
+					// a possible reason would be that recreating the workflow data itself caused e.g an OOM error
+					// in that case, we do not want to retry the recovery process, but rather mark the executions as crashed
+					if (recoveryAlreadyAttempted)
+						this.logger.warn('Skipped recovery process since it previously failed.');
+				} else {
+					// start actual recovery process and write recovery process flag file
+					this.logWriter?.startRecoveryProcess();
+					for (const executionId of unfinishedExecutionIds) {
+						this.logger.warn(`Attempting to recover execution ${executionId}`);
+						if (!unsentAndUnfinished.unfinishedExecutions[executionId]?.length) {
+							this.logger.debug(
+								`No event messages found, marking execution ${executionId} as 'crashed'`,
+							);
+							await this.executionRepository.markAsCrashed([executionId]);
+						} else {
+							await this.recoveryService.recoverExecutionData(
+								executionId,
+								unsentAndUnfinished.unfinishedExecutions[executionId],
+								true,
+							);
+						}
+					}
+				}
+				// remove the recovery process flag file
+				this.logWriter?.endRecoveryProcess();
+			}
+		}
 		// if configured, run this test every n ms
 		if (config.getEnv('eventBus.checkUnsentInterval') > 0) {
 			if (this.pushIntervalTimer) {
@@ -127,14 +211,17 @@ export class MessageEventBus extends EventEmitter {
 			}, config.getEnv('eventBus.checkUnsentInterval'));
 		}
 
-		LoggerProxy.debug('MessageEventBus initialized');
+		this.logger.debug('MessageEventBus initialized');
 		this.isInitialized = true;
 	}
 
-	async addDestination(destination: MessageEventBusDestination) {
-		await this.removeDestination(destination.getId());
+	async addDestination(destination: MessageEventBusDestination, notifyWorkers: boolean = true) {
+		await this.removeDestination(destination.getId(), false);
 		this.destinations[destination.getId()] = destination;
 		this.destinations[destination.getId()].startListening();
+		if (notifyWorkers) {
+			await this.orchestrationService.publish('restartEventBus');
+		}
 		return destination;
 	}
 
@@ -148,37 +235,60 @@ export class MessageEventBus extends EventEmitter {
 		return result.sort((a, b) => (a.__type ?? '').localeCompare(b.__type ?? ''));
 	}
 
-	async removeDestination(id: string): Promise<DeleteResult | undefined> {
+	async removeDestination(
+		id: string,
+		notifyWorkers: boolean = true,
+	): Promise<DeleteResult | undefined> {
 		let result;
 		if (Object.keys(this.destinations).includes(id)) {
 			await this.destinations[id].close();
 			result = await this.destinations[id].deleteFromDb();
 			delete this.destinations[id];
 		}
+		if (notifyWorkers) {
+			await this.orchestrationService.publish('restartEventBus');
+		}
 		return result;
 	}
 
+	async handleRedisEventBusMessage(messageString: string) {
+		const eventData = jsonParse<AbstractEventMessageOptions>(messageString);
+		if (eventData) {
+			const eventMessage = getEventMessageObjectByType(eventData);
+			if (eventMessage) {
+				await this.send(eventMessage);
+			}
+		}
+		return eventData;
+	}
+
 	private async trySendingUnsent(msgs?: EventMessageTypes[]) {
 		const unsentMessages = msgs ?? (await this.getEventsUnsent());
 		if (unsentMessages.length > 0) {
-			LoggerProxy.debug(`Found unsent event messages: ${unsentMessages.length}`);
+			this.logger.debug(`Found unsent event messages: ${unsentMessages.length}`);
 			for (const unsentMsg of unsentMessages) {
-				LoggerProxy.debug(`Retrying: ${unsentMsg.id} ${unsentMsg.__type}`);
+				this.logger.debug(`Retrying: ${unsentMsg.id} ${unsentMsg.__type}`);
 				await this.emitMessage(unsentMsg);
 			}
 		}
 	}
 
 	async close() {
-		LoggerProxy.debug('Shutting down event writer...');
+		this.logger.debug('Shutting down event writer...');
 		await this.logWriter?.close();
 		for (const destinationName of Object.keys(this.destinations)) {
-			LoggerProxy.debug(
+			this.logger.debug(
 				`Shutting down event destination ${this.destinations[destinationName].getId()}...`,
 			);
 			await this.destinations[destinationName].close();
 		}
-		LoggerProxy.debug('EventBus shut down.');
+		this.isInitialized = false;
+		this.logger.debug('EventBus shut down.');
+	}
+
+	async restart() {
+		await this.close();
+		await this.initialize({ skipRecoveryPass: true });
 	}
 
 	async send(msgs: EventMessageTypes | EventMessageTypes[]) {
@@ -224,9 +334,7 @@ export class MessageEventBus extends EventEmitter {
 	}
 
 	private async emitMessage(msg: EventMessageTypes) {
-		if (config.getEnv('endpoints.metrics.enable')) {
-			await incrementPrometheusMetric(msg);
-		}
+		this.emit(METRICS_EVENT_NAME, msg);
 
 		// generic emit for external modules to capture events
 		// this is for internal use ONLY and not for use with custom destinations!
@@ -275,7 +383,7 @@ export class MessageEventBus extends EventEmitter {
 				.slice(-amount);
 
 			for (const execution of filteredExecutionIds) {
-				const data = await recoverExecutionDataFromEventLogMessages(
+				const data = await this.recoveryService.recoverExecutionData(
 					execution.executionId,
 					queryResult,
 					false,
@@ -354,6 +462,8 @@ export class MessageEventBus extends EventEmitter {
 	async sendNodeEvent(options: EventMessageNodeOptions) {
 		await this.send(new EventMessageNode(options));
 	}
-}
 
-export const eventBus = MessageEventBus.getInstance();
+	async sendAiNodeEvent(options: EventMessageAiNodeOptions) {
+		await this.send(new EventMessageAiNode(options));
+	}
+}
diff --git a/packages/cli/src/eventbus/MessageEventBus/recoverEvents.ts b/packages/cli/src/eventbus/MessageEventBus/recoverEvents.ts
deleted file mode 100644
index 516a3549ee994..0000000000000
--- a/packages/cli/src/eventbus/MessageEventBus/recoverEvents.ts
+++ /dev/null
@@ -1,217 +0,0 @@
-import { parse, stringify } from 'flatted';
-import type { IRun, IRunExecutionData, ITaskData } from 'n8n-workflow';
-import { NodeOperationError, WorkflowOperationError } from 'n8n-workflow';
-import * as Db from '@/Db';
-import type { EventMessageTypes, EventNamesTypes } from '../EventMessageClasses';
-import type { DateTime } from 'luxon';
-import { Push } from '@/push';
-import type { IPushDataExecutionRecovered } from '../../Interfaces';
-import { workflowExecutionCompleted } from '../../events/WorkflowStatistics';
-import { eventBus } from './MessageEventBus';
-import { Container } from 'typedi';
-import { InternalHooks } from '@/InternalHooks';
-import { getWorkflowHooksMain } from '@/WorkflowExecuteAdditionalData';
-
-export async function recoverExecutionDataFromEventLogMessages(
-	executionId: string,
-	messages: EventMessageTypes[],
-	applyToDb = true,
-): Promise<IRunExecutionData | undefined> {
-	const executionEntry = await Db.collections.Execution.findOne({
-		where: {
-			id: executionId,
-		},
-	});
-
-	if (executionEntry && messages) {
-		let executionData: IRunExecutionData | undefined;
-		let workflowError: WorkflowOperationError | undefined;
-		try {
-			executionData = parse(executionEntry.data) as IRunExecutionData;
-		} catch {}
-		if (!executionData) {
-			executionData = { resultData: { runData: {} } };
-		}
-		let nodeNames: string[] = [];
-		if (
-			executionData?.resultData?.runData &&
-			Object.keys(executionData.resultData.runData).length > 0
-		) {
-		} else {
-			if (!executionData.resultData) {
-				executionData.resultData = {
-					runData: {},
-				};
-			} else {
-				if (!executionData.resultData.runData) {
-					executionData.resultData.runData = {};
-				}
-			}
-		}
-		nodeNames = executionEntry.workflowData.nodes.map((n) => n.name);
-
-		let lastNodeRunTimestamp: DateTime | undefined = undefined;
-
-		for (const nodeName of nodeNames) {
-			const nodeByName = executionEntry?.workflowData.nodes.find((n) => n.name === nodeName);
-
-			if (!nodeByName) continue;
-
-			const nodeStartedMessage = messages.find(
-				(message) =>
-					message.eventName === 'n8n.node.started' && message.payload.nodeName === nodeName,
-			);
-			const nodeFinishedMessage = messages.find(
-				(message) =>
-					message.eventName === 'n8n.node.finished' && message.payload.nodeName === nodeName,
-			);
-
-			const executionTime =
-				nodeStartedMessage && nodeFinishedMessage
-					? nodeFinishedMessage.ts.diff(nodeStartedMessage.ts).toMillis()
-					: 0;
-
-			let taskData: ITaskData;
-			if (executionData.resultData.runData[nodeName]?.length > 0) {
-				taskData = executionData.resultData.runData[nodeName][0];
-			} else {
-				taskData = {
-					startTime: nodeStartedMessage ? nodeStartedMessage.ts.toUnixInteger() : 0,
-					executionTime,
-					source: [null],
-					executionStatus: 'unknown',
-				};
-			}
-
-			if (nodeStartedMessage && !nodeFinishedMessage) {
-				const nodeError = new NodeOperationError(
-					nodeByName,
-					'Node crashed, possible out-of-memory issue',
-					{
-						message: 'Execution stopped at this node',
-						description:
-							"n8n may have run out of memory while executing it. More context and tips on how to avoid this <a href='https://docs.n8n.io/flow-logic/error-handling/memory-errors' target='_blank'>in the docs</a>",
-					},
-				);
-				workflowError = new WorkflowOperationError(
-					'Workflow did not finish, possible out-of-memory issue',
-				);
-				taskData.error = nodeError;
-				taskData.executionStatus = 'crashed';
-				executionData.resultData.lastNodeExecuted = nodeName;
-				if (nodeStartedMessage) lastNodeRunTimestamp = nodeStartedMessage.ts;
-			} else if (nodeStartedMessage && nodeFinishedMessage) {
-				taskData.executionStatus = 'success';
-				if (taskData.data === undefined) {
-					taskData.data = {
-						main: [
-							[
-								{
-									json: {
-										isArtificialRecoveredEventItem: true,
-									},
-									pairedItem: undefined,
-								},
-							],
-						],
-					};
-				}
-			}
-
-			if (!executionData.resultData.runData[nodeName]) {
-				executionData.resultData.runData[nodeName] = [taskData];
-			}
-		}
-
-		if (!lastNodeRunTimestamp) {
-			const workflowEndedMessage = messages.find((message) =>
-				(
-					[
-						'n8n.workflow.success',
-						'n8n.workflow.crashed',
-						'n8n.workflow.failed',
-					] as EventNamesTypes[]
-				).includes(message.eventName),
-			);
-			if (workflowEndedMessage) {
-				lastNodeRunTimestamp = workflowEndedMessage.ts;
-			} else {
-				if (!workflowError) {
-					workflowError = new WorkflowOperationError(
-						'Workflow did not finish, possible out-of-memory issue',
-					);
-				}
-				const workflowStartedMessage = messages.find(
-					(message) => message.eventName === 'n8n.workflow.started',
-				);
-				if (workflowStartedMessage) {
-					lastNodeRunTimestamp = workflowStartedMessage.ts;
-				}
-			}
-		}
-
-		if (!executionData.resultData.error && workflowError) {
-			executionData.resultData.error = workflowError;
-		}
-
-		if (applyToDb) {
-			const newStatus = executionEntry.status === 'failed' ? 'failed' : 'crashed';
-			await Db.collections.Execution.update(executionId, {
-				data: stringify(executionData),
-				status: newStatus,
-				stoppedAt: lastNodeRunTimestamp?.toJSDate(),
-			});
-			await Container.get(InternalHooks).onWorkflowPostExecute(
-				executionId,
-				executionEntry.workflowData,
-				{
-					data: executionData,
-					finished: false,
-					mode: executionEntry.mode,
-					waitTill: executionEntry.waitTill ?? undefined,
-					startedAt: executionEntry.startedAt,
-					stoppedAt: lastNodeRunTimestamp?.toJSDate(),
-					status: newStatus,
-				},
-			);
-			const iRunData: IRun = {
-				data: executionData,
-				finished: false,
-				mode: executionEntry.mode,
-				waitTill: executionEntry.waitTill ?? undefined,
-				startedAt: executionEntry.startedAt,
-				stoppedAt: lastNodeRunTimestamp?.toJSDate(),
-				status: newStatus,
-			};
-			const workflowHooks = getWorkflowHooksMain(
-				{
-					userId: '',
-					workflowData: executionEntry.workflowData,
-					executionMode: executionEntry.mode,
-					executionData,
-					runData: executionData.resultData.runData,
-					retryOf: executionEntry.retryOf,
-				},
-				executionId,
-			);
-
-			// execute workflowExecuteAfter hook to trigger error workflow
-			await workflowHooks.executeHookFunctions('workflowExecuteAfter', [iRunData]);
-
-			// calling workflowExecutionCompleted directly because the eventEmitter is not up yet at this point
-			await workflowExecutionCompleted(executionEntry.workflowData, iRunData);
-
-			// wait for UI to be back up and send the execution data
-			eventBus.once('editorUiConnected', function handleUiBackUp() {
-				// add a small timeout to make sure the UI is back up
-				setTimeout(() => {
-					Container.get(Push).send('executionRecovered', {
-						executionId,
-					} as IPushDataExecutionRecovered);
-				}, 1000);
-			});
-		}
-		return executionData;
-	}
-	return;
-}
diff --git a/packages/cli/src/eventbus/MessageEventBusDestination/Helpers.ee.ts b/packages/cli/src/eventbus/MessageEventBusDestination/Helpers.ee.ts
index f69c417516ead..33a6e54bccee4 100644
--- a/packages/cli/src/eventbus/MessageEventBusDestination/Helpers.ee.ts
+++ b/packages/cli/src/eventbus/MessageEventBusDestination/Helpers.ee.ts
@@ -1,54 +1,23 @@
-import type { EventDestinations } from '@db/entities/EventDestinations';
-import { promClient } from '@/metrics';
-import {
-	EventMessageTypeNames,
-	LoggerProxy,
-	MessageEventBusDestinationTypeNames,
-} from 'n8n-workflow';
+import { EventMessageTypeNames } from 'n8n-workflow';
 import config from '@/config';
 import type { EventMessageTypes } from '../EventMessageClasses';
-import type { MessageEventBusDestination } from './MessageEventBusDestination.ee';
-import { MessageEventBusDestinationSentry } from './MessageEventBusDestinationSentry.ee';
-import { MessageEventBusDestinationSyslog } from './MessageEventBusDestinationSyslog.ee';
-import { MessageEventBusDestinationWebhook } from './MessageEventBusDestinationWebhook.ee';
-import type { MessageEventBus } from '../MessageEventBus/MessageEventBus';
 
-export function messageEventBusDestinationFromDb(
-	eventBusInstance: MessageEventBus,
-	dbData: EventDestinations,
-): MessageEventBusDestination | null {
-	const destinationData = dbData.destination;
-	if ('__type' in destinationData) {
-		switch (destinationData.__type) {
-			case MessageEventBusDestinationTypeNames.sentry:
-				return MessageEventBusDestinationSentry.deserialize(eventBusInstance, destinationData);
-			case MessageEventBusDestinationTypeNames.syslog:
-				return MessageEventBusDestinationSyslog.deserialize(eventBusInstance, destinationData);
-			case MessageEventBusDestinationTypeNames.webhook:
-				return MessageEventBusDestinationWebhook.deserialize(eventBusInstance, destinationData);
-			default:
-				LoggerProxy.debug('MessageEventBusDestination __type unknown');
-		}
-	}
-	return null;
-}
+export const METRICS_EVENT_NAME = 'metrics.messageEventBus.Event';
 
-const prometheusCounters: Record<string, promClient.Counter<string> | null> = {};
-
-function getMetricNameForEvent(event: EventMessageTypes): string {
+export function getMetricNameForEvent(event: EventMessageTypes): string {
 	const prefix = config.getEnv('endpoints.metrics.prefix');
 	return prefix + event.eventName.replace('n8n.', '').replace(/\./g, '_') + '_total';
 }
 
-function getLabelValueForNode(nodeType: string): string {
+export function getLabelValueForNode(nodeType: string): string {
 	return nodeType.replace('n8n-nodes-', '').replace(/\./g, '_');
 }
 
-function getLabelValueForCredential(credentialType: string): string {
+export function getLabelValueForCredential(credentialType: string): string {
 	return credentialType.replace(/\./g, '_');
 }
 
-function getLabelsForEvent(event: EventMessageTypes): Record<string, string> {
+export function getLabelsForEvent(event: EventMessageTypes): Record<string, string> {
 	switch (event.__type) {
 		case EventMessageTypeNames.audit:
 			if (event.eventName.startsWith('n8n.audit.user.credentials')) {
@@ -57,7 +26,7 @@ function getLabelsForEvent(event: EventMessageTypes): Record<string, string> {
 							credential_type: getLabelValueForCredential(
 								event.payload.credentialType ?? 'unknown',
 							),
-					  }
+						}
 					: {};
 			}
 
@@ -81,36 +50,3 @@ function getLabelsForEvent(event: EventMessageTypes): Record<string, string> {
 
 	return {};
 }
-
-function getCounterSingletonForEvent(event: EventMessageTypes) {
-	if (!prometheusCounters[event.eventName]) {
-		const metricName = getMetricNameForEvent(event);
-
-		if (!promClient.validateMetricName(metricName)) {
-			LoggerProxy.debug(`Invalid metric name: ${metricName}. Ignoring it!`);
-			prometheusCounters[event.eventName] = null;
-			return null;
-		}
-
-		const counter = new promClient.Counter({
-			name: metricName,
-			help: `Total number of ${event.eventName} events.`,
-			labelNames: Object.keys(getLabelsForEvent(event)),
-		});
-
-		promClient.register.registerMetric(counter);
-		prometheusCounters[event.eventName] = counter;
-	}
-
-	return prometheusCounters[event.eventName];
-}
-
-export async function incrementPrometheusMetric(event: EventMessageTypes): Promise<void> {
-	const counter = getCounterSingletonForEvent(event);
-
-	if (!counter) {
-		return;
-	}
-
-	counter.inc(getLabelsForEvent(event));
-}
diff --git a/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestination.ee.ts b/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestination.ee.ts
index 0a5117b00b73e..bf68bb859c7a1 100644
--- a/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestination.ee.ts
+++ b/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestination.ee.ts
@@ -1,12 +1,13 @@
 import { v4 as uuid } from 'uuid';
+import { Container } from 'typedi';
 import type { INodeCredentials, MessageEventBusDestinationOptions } from 'n8n-workflow';
-import { LoggerProxy, MessageEventBusDestinationTypeNames } from 'n8n-workflow';
-import * as Db from '@/Db';
+import { MessageEventBusDestinationTypeNames } from 'n8n-workflow';
+import { Logger } from '@/Logger';
 import type { AbstractEventMessage } from '../EventMessageClasses/AbstractEventMessage';
 import type { EventMessageTypes } from '../EventMessageClasses';
-import type { DeleteResult, InsertResult } from 'typeorm';
 import type { EventMessageConfirmSource } from '../EventMessageClasses/EventMessageConfirm';
 import type { MessageEventBus, MessageWithCallback } from '../MessageEventBus/MessageEventBus';
+import { EventDestinationsRepository } from '@db/repositories/eventDestinations.repository';
 
 export abstract class MessageEventBusDestination implements MessageEventBusDestinationOptions {
 	// Since you can't have static abstract functions - this just serves as a reminder that you need to implement these. Please.
@@ -15,6 +16,8 @@ export abstract class MessageEventBusDestination implements MessageEventBusDesti
 
 	readonly eventBusInstance: MessageEventBus;
 
+	protected readonly logger: Logger;
+
 	__type: MessageEventBusDestinationTypeNames;
 
 	label: string;
@@ -28,6 +31,7 @@ export abstract class MessageEventBusDestination implements MessageEventBusDesti
 	anonymizeAuditMessages: boolean;
 
 	constructor(eventBusInstance: MessageEventBus, options: MessageEventBusDestinationOptions) {
+		this.logger = Container.get(Logger);
 		this.eventBusInstance = eventBusInstance;
 		this.id = !options.id || options.id.length !== 36 ? uuid() : options.id;
 		this.__type = options.__type ?? MessageEventBusDestinationTypeNames.abstract;
@@ -36,7 +40,7 @@ export abstract class MessageEventBusDestination implements MessageEventBusDesti
 		this.subscribedEvents = options.subscribedEvents ?? [];
 		this.anonymizeAuditMessages = options.anonymizeAuditMessages ?? false;
 		if (options.credentials) this.credentials = options.credentials;
-		LoggerProxy.debug(`${this.__type}(${this.id}) event destination constructed`);
+		this.logger.debug(`${this.__type}(${this.id}) event destination constructed`);
 	}
 
 	startListening() {
@@ -50,7 +54,7 @@ export abstract class MessageEventBusDestination implements MessageEventBusDesti
 					await this.receiveFromEventBus({ msg, confirmCallback });
 				},
 			);
-			LoggerProxy.debug(`${this.id} listener started`);
+			this.logger.debug(`${this.id} listener started`);
 		}
 	}
 
@@ -87,7 +91,7 @@ export abstract class MessageEventBusDestination implements MessageEventBusDesti
 			id: this.getId(),
 			destination: this.serialize(),
 		};
-		const dbResult: InsertResult = await Db.collections.EventDestinations.upsert(data, {
+		const dbResult = await Container.get(EventDestinationsRepository).upsert(data, {
 			skipUpdateIfNoValuesChanged: true,
 			conflictPaths: ['id'],
 		});
@@ -95,11 +99,11 @@ export abstract class MessageEventBusDestination implements MessageEventBusDesti
 	}
 
 	async deleteFromDb() {
-		return MessageEventBusDestination.deleteFromDb(this.getId());
+		return await MessageEventBusDestination.deleteFromDb(this.getId());
 	}
 
-	static async deleteFromDb(id: string): Promise<DeleteResult> {
-		const dbResult = await Db.collections.EventDestinations.delete({ id });
+	static async deleteFromDb(id: string) {
+		const dbResult = await Container.get(EventDestinationsRepository).delete({ id });
 		return dbResult;
 	}
 
diff --git a/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationFromDb.ts b/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationFromDb.ts
new file mode 100644
index 0000000000000..27951448ced0f
--- /dev/null
+++ b/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationFromDb.ts
@@ -0,0 +1,29 @@
+import { MessageEventBusDestinationTypeNames } from 'n8n-workflow';
+import type { EventDestinations } from '@db/entities/EventDestinations';
+import type { MessageEventBus } from '../MessageEventBus/MessageEventBus';
+import type { MessageEventBusDestination } from './MessageEventBusDestination.ee';
+import { MessageEventBusDestinationSentry } from './MessageEventBusDestinationSentry.ee';
+import { MessageEventBusDestinationSyslog } from './MessageEventBusDestinationSyslog.ee';
+import { MessageEventBusDestinationWebhook } from './MessageEventBusDestinationWebhook.ee';
+import { Container } from 'typedi';
+import { Logger } from '@/Logger';
+
+export function messageEventBusDestinationFromDb(
+	eventBusInstance: MessageEventBus,
+	dbData: EventDestinations,
+): MessageEventBusDestination | null {
+	const destinationData = dbData.destination;
+	if ('__type' in destinationData) {
+		switch (destinationData.__type) {
+			case MessageEventBusDestinationTypeNames.sentry:
+				return MessageEventBusDestinationSentry.deserialize(eventBusInstance, destinationData);
+			case MessageEventBusDestinationTypeNames.syslog:
+				return MessageEventBusDestinationSyslog.deserialize(eventBusInstance, destinationData);
+			case MessageEventBusDestinationTypeNames.webhook:
+				return MessageEventBusDestinationWebhook.deserialize(eventBusInstance, destinationData);
+			default:
+				Container.get(Logger).debug('MessageEventBusDestination __type unknown');
+		}
+	}
+	return null;
+}
diff --git a/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationSentry.ee.ts b/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationSentry.ee.ts
index ab1c4ca379516..7c03927aac0e3 100644
--- a/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationSentry.ee.ts
+++ b/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationSentry.ee.ts
@@ -1,9 +1,8 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* eslint-disable @typescript-eslint/no-unsafe-return */
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
+
 import { MessageEventBusDestination } from './MessageEventBusDestination.ee';
 import * as Sentry from '@sentry/node';
-import { LoggerProxy, MessageEventBusDestinationTypeNames } from 'n8n-workflow';
+import { MessageEventBusDestinationTypeNames } from 'n8n-workflow';
 import type {
 	MessageEventBusDestinationOptions,
 	MessageEventBusDestinationSentryOptions,
@@ -89,7 +88,7 @@ export class MessageEventBusDestinationSentry
 				sendResult = true;
 			}
 		} catch (error) {
-			if (error.message) LoggerProxy.debug(error.message as string);
+			if (error.message) this.logger.debug(error.message as string);
 		}
 		return sendResult;
 	}
diff --git a/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationSyslog.ee.ts b/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationSyslog.ee.ts
index 13d6a1636c5ed..ac68d3856a675 100644
--- a/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationSyslog.ee.ts
+++ b/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationSyslog.ee.ts
@@ -1,17 +1,17 @@
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 import syslog from 'syslog-client';
+
 import type {
 	MessageEventBusDestinationOptions,
 	MessageEventBusDestinationSyslogOptions,
 } from 'n8n-workflow';
-import { LoggerProxy, MessageEventBusDestinationTypeNames } from 'n8n-workflow';
+import { MessageEventBusDestinationTypeNames } from 'n8n-workflow';
 import { MessageEventBusDestination } from './MessageEventBusDestination.ee';
 import { isLogStreamingEnabled } from '../MessageEventBus/MessageEventBusHelper';
 import { eventMessageGenericDestinationTestEvent } from '../EventMessageClasses/EventMessageGeneric';
 import type { MessageEventBus, MessageWithCallback } from '../MessageEventBus/MessageEventBus';
-
+import Container from 'typedi';
+import { Logger } from '@/Logger';
 export const isMessageEventBusDestinationSyslogOptions = (
 	candidate: unknown,
 ): candidate is MessageEventBusDestinationSyslogOptions => {
@@ -63,9 +63,9 @@ export class MessageEventBusDestinationSyslog
 					? syslog.Transport.Tcp
 					: syslog.Transport.Udp,
 		});
-		LoggerProxy.debug(`MessageEventBusDestinationSyslog with id ${this.getId()} initialized`);
+		this.logger.debug(`MessageEventBusDestinationSyslog with id ${this.getId()} initialized`);
 		this.client.on('error', function (error) {
-			console.error(error);
+			Container.get(Logger).error(`${error.message}`);
 		});
 	}
 
@@ -93,7 +93,7 @@ export class MessageEventBusDestinationSyslog
 				},
 				async (error) => {
 					if (error?.message) {
-						LoggerProxy.debug(error.message);
+						this.logger.debug(error.message);
 					} else {
 						// eventBus.confirmSent(msg, { id: this.id, name: this.label });
 						confirmCallback(msg, { id: this.id, name: this.label });
@@ -102,7 +102,7 @@ export class MessageEventBusDestinationSyslog
 				},
 			);
 		} catch (error) {
-			if (error.message) LoggerProxy.debug(error.message as string);
+			if (error.message) this.logger.debug(error.message as string);
 		}
 		if (msg.eventName === eventMessageGenericDestinationTestEvent) {
 			await new Promise((resolve) => setTimeout(resolve, 500));
diff --git a/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationWebhook.ee.ts b/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationWebhook.ee.ts
index daf63c39a8f39..6b23c2de78ecb 100644
--- a/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationWebhook.ee.ts
+++ b/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationWebhook.ee.ts
@@ -1,26 +1,24 @@
-/* eslint-disable @typescript-eslint/no-unsafe-call */
-/* eslint-disable @typescript-eslint/no-unsafe-return */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
-/* eslint-disable @typescript-eslint/no-unused-vars */
-/* eslint-disable @typescript-eslint/no-unnecessary-boolean-literal-compare */
+
 import { MessageEventBusDestination } from './MessageEventBusDestination.ee';
 import axios from 'axios';
 import type { AxiosRequestConfig, Method } from 'axios';
-import { jsonParse, LoggerProxy, MessageEventBusDestinationTypeNames } from 'n8n-workflow';
+import { jsonParse, MessageEventBusDestinationTypeNames } from 'n8n-workflow';
 import type {
 	MessageEventBusDestinationOptions,
-	MessageEventBusDestinationWebhookOptions,
 	MessageEventBusDestinationWebhookParameterItem,
 	MessageEventBusDestinationWebhookParameterOptions,
+	IWorkflowExecuteAdditionalData,
+	MessageEventBusDestinationWebhookOptions,
 } from 'n8n-workflow';
 import { CredentialsHelper } from '@/CredentialsHelper';
-import { UserSettings } from 'n8n-core';
 import { Agent as HTTPSAgent } from 'https';
-import config from '@/config';
 import { isLogStreamingEnabled } from '../MessageEventBus/MessageEventBusHelper';
 import { eventMessageGenericDestinationTestEvent } from '../EventMessageClasses/EventMessageGeneric';
 import type { MessageEventBus, MessageWithCallback } from '../MessageEventBus/MessageEventBus';
+import * as SecretsHelpers from '@/ExternalSecrets/externalSecretsHelper.ee';
+import Container from 'typedi';
 
 export const isMessageEventBusDestinationWebhookOptions = (
 	candidate: unknown,
@@ -97,18 +95,18 @@ export class MessageEventBusDestinationWebhook
 		if (options.sendPayload) this.sendPayload = options.sendPayload;
 		if (options.options) this.options = options.options;
 
-		LoggerProxy.debug(`MessageEventBusDestinationWebhook with id ${this.getId()} initialized`);
+		this.logger.debug(`MessageEventBusDestinationWebhook with id ${this.getId()} initialized`);
 	}
 
 	async matchDecryptedCredentialType(credentialType: string) {
 		const foundCredential = Object.entries(this.credentials).find((e) => e[0] === credentialType);
 		if (foundCredential) {
-			const timezone = config.getEnv('generic.timezone');
 			const credentialsDecrypted = await this.credentialsHelper?.getDecrypted(
+				{ secretsHelpers: SecretsHelpers } as unknown as IWorkflowExecuteAdditionalData,
 				foundCredential[1],
 				foundCredential[0],
 				'internal',
-				timezone,
+				undefined,
 				true,
 			);
 			return credentialsDecrypted;
@@ -129,18 +127,11 @@ export class MessageEventBusDestinationWebhook
 		} as AxiosRequestConfig;
 
 		if (this.credentialsHelper === undefined) {
-			let encryptionKey: string | undefined;
-			try {
-				encryptionKey = await UserSettings.getEncryptionKey();
-			} catch {}
-			if (encryptionKey) {
-				this.credentialsHelper = new CredentialsHelper(encryptionKey);
-			}
+			this.credentialsHelper = Container.get(CredentialsHelper);
 		}
 
 		const sendQuery = this.sendQuery;
 		const specifyQuery = this.specifyQuery;
-		const sendPayload = this.sendPayload;
 		const sendHeaders = this.sendHeaders;
 		const specifyHeaders = this.specifyHeaders;
 
@@ -169,7 +160,6 @@ export class MessageEventBusDestinationWebhook
 		}
 
 		const parametersToKeyValue = async (
-			// eslint-disable-next-line @typescript-eslint/no-explicit-any
 			acc: Promise<{ [key: string]: any }>,
 			cur: { name: string; value: string; parameterType?: string; inputDataFieldName?: string },
 		) => {
@@ -190,7 +180,7 @@ export class MessageEventBusDestinationWebhook
 				try {
 					JSON.parse(this.jsonQuery);
 				} catch {
-					console.log('JSON parameter need to be an valid JSON');
+					this.logger.error('JSON parameter need to be an valid JSON');
 				}
 				this.axiosRequestOptions.params = jsonParse(this.jsonQuery);
 			}
@@ -208,7 +198,7 @@ export class MessageEventBusDestinationWebhook
 				try {
 					JSON.parse(this.jsonHeaders);
 				} catch {
-					console.log('JSON parameter need to be an valid JSON');
+					this.logger.error('JSON parameter need to be an valid JSON');
 				}
 				this.axiosRequestOptions.headers = jsonParse(this.jsonHeaders);
 			}
@@ -260,6 +250,7 @@ export class MessageEventBusDestinationWebhook
 		return null;
 	}
 
+	// eslint-disable-next-line complexity
 	async receiveFromEventBus(emitterPayload: MessageWithCallback): Promise<boolean> {
 		const { msg, confirmCallback } = emitterPayload;
 		let sendResult = false;
@@ -295,8 +286,6 @@ export class MessageEventBusDestinationWebhook
 		let httpDigestAuth;
 		let httpHeaderAuth;
 		let httpQueryAuth;
-		let oAuth1Api;
-		let oAuth2Api;
 
 		if (this.authentication === 'genericCredentialType') {
 			if (this.genericAuthType === 'httpBasicAuth') {
@@ -315,14 +304,6 @@ export class MessageEventBusDestinationWebhook
 				try {
 					httpQueryAuth = await this.matchDecryptedCredentialType('httpQueryAuth');
 				} catch {}
-			} else if (this.genericAuthType === 'oAuth1Api') {
-				try {
-					oAuth1Api = await this.matchDecryptedCredentialType('oAuth1Api');
-				} catch {}
-			} else if (this.genericAuthType === 'oAuth2Api') {
-				try {
-					oAuth2Api = await this.matchDecryptedCredentialType('oAuth2Api');
-				} catch {}
 			}
 		}
 
@@ -333,9 +314,15 @@ export class MessageEventBusDestinationWebhook
 				password: httpBasicAuth.password as string,
 			};
 		} else if (httpHeaderAuth) {
-			this.axiosRequestOptions.headers[httpHeaderAuth.name as string] = httpHeaderAuth.value;
+			this.axiosRequestOptions.headers = {
+				...this.axiosRequestOptions.headers,
+				[httpHeaderAuth.name as string]: httpHeaderAuth.value as string,
+			};
 		} else if (httpQueryAuth) {
-			this.axiosRequestOptions.params[httpQueryAuth.name as string] = httpQueryAuth.value;
+			this.axiosRequestOptions.params = {
+				...this.axiosRequestOptions.params,
+				[httpQueryAuth.name as string]: httpQueryAuth.value as string,
+			};
 		} else if (httpDigestAuth) {
 			this.axiosRequestOptions.auth = {
 				username: httpDigestAuth.user as string,
@@ -359,7 +346,11 @@ export class MessageEventBusDestinationWebhook
 				}
 			}
 		} catch (error) {
-			console.error(error);
+			this.logger.warn(
+				`Webhook destination ${this.label} failed to send message to: ${this.url} - ${
+					(error as Error).message
+				}`,
+			);
 		}
 
 		return sendResult;
diff --git a/packages/cli/src/eventbus/MessageEventBusWriter/MessageEventBusLogWriter.ts b/packages/cli/src/eventbus/MessageEventBusWriter/MessageEventBusLogWriter.ts
index 87293f6149432..918e79e523ce3 100644
--- a/packages/cli/src/eventbus/MessageEventBusWriter/MessageEventBusLogWriter.ts
+++ b/packages/cli/src/eventbus/MessageEventBusWriter/MessageEventBusLogWriter.ts
@@ -1,13 +1,13 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* eslint-disable @typescript-eslint/no-explicit-any */
+
 import { isEventMessageOptions } from '../EventMessageClasses/AbstractEventMessage';
-import { UserSettings } from 'n8n-core';
+import { InstanceSettings } from 'n8n-core';
 import path, { parse } from 'path';
 import { Worker } from 'worker_threads';
 import { createReadStream, existsSync, rmSync } from 'fs';
 import readline from 'readline';
-import { jsonParse, LoggerProxy } from 'n8n-workflow';
-import remove from 'lodash.remove';
+import { jsonParse } from 'n8n-workflow';
+import remove from 'lodash/remove';
 import config from '@/config';
 import { getEventMessageObjectByType } from '../EventMessageClasses/Helpers';
 import type { EventMessageReturnMode } from '../MessageEventBus/MessageEventBus';
@@ -18,7 +18,9 @@ import {
 	isEventMessageConfirm,
 } from '../EventMessageClasses/EventMessageConfirm';
 import { once as eventOnce } from 'events';
-import { inTest } from '../../constants';
+import { inTest } from '@/constants';
+import { Logger } from '@/Logger';
+import Container from 'typedi';
 
 interface MessageEventBusLogWriterConstructorOptions {
 	logBaseName?: string;
@@ -47,8 +49,14 @@ export class MessageEventBusLogWriter {
 
 	static options: Required<MessageEventBusLogWriterOptions>;
 
+	private readonly logger: Logger;
+
 	private _worker: Worker | undefined;
 
+	constructor() {
+		this.logger = Container.get(Logger);
+	}
+
 	public get worker(): Worker | undefined {
 		return this._worker;
 	}
@@ -66,7 +74,7 @@ export class MessageEventBusLogWriter {
 			MessageEventBusLogWriter.instance = new MessageEventBusLogWriter();
 			MessageEventBusLogWriter.options = {
 				logFullBasePath: path.join(
-					options?.logBasePath ?? UserSettings.getUserN8nFolderPath(),
+					options?.logBasePath ?? Container.get(InstanceSettings).n8nFolder,
 					options?.logBaseName ?? config.getEnv('eventBus.logWriter.logBaseName'),
 				),
 				keepNumberOfFiles:
@@ -98,6 +106,22 @@ export class MessageEventBusLogWriter {
 		}
 	}
 
+	startRecoveryProcess() {
+		if (this.worker) {
+			this.worker.postMessage({ command: 'startRecoveryProcess', data: {} });
+		}
+	}
+
+	isRecoveryProcessRunning(): boolean {
+		return existsSync(this.getRecoveryInProgressFileName());
+	}
+
+	endRecoveryProcess() {
+		if (this.worker) {
+			this.worker.postMessage({ command: 'endRecoveryProcess', data: {} });
+		}
+	}
+
 	private async startThread() {
 		if (this.worker) {
 			await this.close();
@@ -119,7 +143,7 @@ export class MessageEventBusLogWriter {
 		this._worker = new Worker(workerFileName);
 		if (this.worker) {
 			this.worker.on('messageerror', async (error) => {
-				LoggerProxy.error('Event Bus Log Writer thread error, attempting to restart...', error);
+				this.logger.error('Event Bus Log Writer thread error, attempting to restart...', error);
 				await MessageEventBusLogWriter.instance.startThread();
 			});
 			return true;
@@ -218,8 +242,7 @@ export class MessageEventBusLogWriter {
 							}
 						}
 					} catch (error) {
-						LoggerProxy.error(
-							// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+						this.logger.error(
 							`Error reading line messages from file: ${logFileName}, line: ${line}, ${error.message}}`,
 						);
 					}
@@ -227,7 +250,7 @@ export class MessageEventBusLogWriter {
 				// wait for stream to finish before continue
 				await eventOnce(rl, 'close');
 			} catch {
-				LoggerProxy.error(`Error reading logged messages from file: ${logFileName}`);
+				this.logger.error(`Error reading logged messages from file: ${logFileName}`);
 			}
 		}
 		return results;
@@ -241,6 +264,10 @@ export class MessageEventBusLogWriter {
 		}
 	}
 
+	getRecoveryInProgressFileName(): string {
+		return `${MessageEventBusLogWriter.options.logFullBasePath}.recoveryInProgress`;
+	}
+
 	cleanAllLogs() {
 		for (let i = 0; i <= MessageEventBusLogWriter.options.keepNumberOfFiles; i++) {
 			if (existsSync(this.getLogFileName(i))) {
@@ -288,7 +315,7 @@ export class MessageEventBusLogWriter {
 							if (msg !== null) messages.push(msg);
 						}
 					} catch {
-						LoggerProxy.error(
+						this.logger.error(
 							`Error reading line messages from file: ${logFileName}, line: ${line}`,
 						);
 					}
@@ -296,7 +323,7 @@ export class MessageEventBusLogWriter {
 				// wait for stream to finish before continue
 				await eventOnce(rl, 'close');
 			} catch {
-				LoggerProxy.error(`Error reading logged messages from file: ${logFileName}`);
+				this.logger.error(`Error reading logged messages from file: ${logFileName}`);
 			}
 		}
 		return messages;
diff --git a/packages/cli/src/eventbus/MessageEventBusWriter/MessageEventBusLogWriterWorker.ts b/packages/cli/src/eventbus/MessageEventBusWriter/MessageEventBusLogWriterWorker.ts
index 2672a3b98784f..53bdc2a829726 100644
--- a/packages/cli/src/eventbus/MessageEventBusWriter/MessageEventBusLogWriterWorker.ts
+++ b/packages/cli/src/eventbus/MessageEventBusWriter/MessageEventBusLogWriterWorker.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
 import { appendFileSync, existsSync, rmSync, renameSync, openSync, closeSync } from 'fs';
 import { stat } from 'fs/promises';
 import { isMainThread, parentPort } from 'worker_threads';
@@ -25,6 +24,25 @@ function setKeepFiles(keepNumberOfFiles: number) {
 	keepFiles = keepNumberOfFiles;
 }
 
+function buildRecoveryInProgressFileName(): string {
+	return `${logFileBasePath}.recoveryInProgress`;
+}
+
+function startRecoveryProcess() {
+	if (existsSync(buildRecoveryInProgressFileName())) {
+		return false;
+	}
+	const fileHandle = openSync(buildRecoveryInProgressFileName(), 'a');
+	closeSync(fileHandle);
+	return true;
+}
+
+function endRecoveryProcess() {
+	if (existsSync(buildRecoveryInProgressFileName())) {
+		rmSync(buildRecoveryInProgressFileName());
+	}
+}
+
 function buildLogFileNameWithCounter(counter?: number): string {
 	if (counter) {
 		return `${logFileBasePath}-${counter}.log`;
@@ -90,7 +108,6 @@ if (!isMainThread) {
 					clearInterval(fileStatTimer);
 					break;
 				case 'initialize':
-					// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 					const settings: MessageEventBusLogWriterOptions = {
 						logFullBasePath: (data as MessageEventBusLogWriterOptions).logFullBasePath ?? '',
 						keepNumberOfFiles: (data as MessageEventBusLogWriterOptions).keepNumberOfFiles ?? 10,
@@ -113,6 +130,14 @@ if (!isMainThread) {
 					cleanAllLogs();
 					parentPort?.postMessage('cleanedAllLogs');
 					break;
+				case 'startRecoveryProcess':
+					const recoveryStarted = startRecoveryProcess();
+					parentPort?.postMessage({ command, data: recoveryStarted });
+					break;
+				case 'endRecoveryProcess':
+					endRecoveryProcess();
+					parentPort?.postMessage({ command, data: true });
+					break;
 				default:
 					break;
 			}
diff --git a/packages/cli/src/eventbus/eventBus.controller.ee.ts b/packages/cli/src/eventbus/eventBus.controller.ee.ts
new file mode 100644
index 0000000000000..95433a359b334
--- /dev/null
+++ b/packages/cli/src/eventbus/eventBus.controller.ee.ts
@@ -0,0 +1,135 @@
+import express from 'express';
+import type {
+	MessageEventBusDestinationWebhookOptions,
+	MessageEventBusDestinationOptions,
+} from 'n8n-workflow';
+import { MessageEventBusDestinationTypeNames } from 'n8n-workflow';
+
+import { RestController, Get, Post, Delete, GlobalScope } from '@/decorators';
+import { AuthenticatedRequest } from '@/requests';
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
+
+import { MessageEventBus } from './MessageEventBus/MessageEventBus';
+import {
+	isMessageEventBusDestinationSentryOptions,
+	MessageEventBusDestinationSentry,
+} from './MessageEventBusDestination/MessageEventBusDestinationSentry.ee';
+import {
+	isMessageEventBusDestinationSyslogOptions,
+	MessageEventBusDestinationSyslog,
+} from './MessageEventBusDestination/MessageEventBusDestinationSyslog.ee';
+import { MessageEventBusDestinationWebhook } from './MessageEventBusDestination/MessageEventBusDestinationWebhook.ee';
+import type { MessageEventBusDestination } from './MessageEventBusDestination/MessageEventBusDestination.ee';
+import { logStreamingLicensedMiddleware } from './middleware/logStreamingEnabled.middleware.ee';
+
+// ----------------------------------------
+// TypeGuards
+// ----------------------------------------
+
+const isWithIdString = (candidate: unknown): candidate is { id: string } => {
+	const o = candidate as { id: string };
+	if (!o) return false;
+	return o.id !== undefined;
+};
+
+const isMessageEventBusDestinationWebhookOptions = (
+	candidate: unknown,
+): candidate is MessageEventBusDestinationWebhookOptions => {
+	const o = candidate as MessageEventBusDestinationWebhookOptions;
+	if (!o) return false;
+	return o.url !== undefined;
+};
+
+const isMessageEventBusDestinationOptions = (
+	candidate: unknown,
+): candidate is MessageEventBusDestinationOptions => {
+	const o = candidate as MessageEventBusDestinationOptions;
+	if (!o) return false;
+	return o.__type !== undefined;
+};
+
+// ----------------------------------------
+// Controller
+// ----------------------------------------
+
+@RestController('/eventbus')
+export class EventBusControllerEE {
+	constructor(private readonly eventBus: MessageEventBus) {}
+
+	// ----------------------------------------
+	// Destinations
+	// ----------------------------------------
+
+	@Get('/destination', { middlewares: [logStreamingLicensedMiddleware] })
+	@GlobalScope('eventBusDestination:list')
+	async getDestination(req: express.Request): Promise<MessageEventBusDestinationOptions[]> {
+		if (isWithIdString(req.query)) {
+			return await this.eventBus.findDestination(req.query.id);
+		} else {
+			return await this.eventBus.findDestination();
+		}
+	}
+
+	@Post('/destination', { middlewares: [logStreamingLicensedMiddleware] })
+	@GlobalScope('eventBusDestination:create')
+	async postDestination(req: AuthenticatedRequest): Promise<any> {
+		let result: MessageEventBusDestination | undefined;
+		if (isMessageEventBusDestinationOptions(req.body)) {
+			switch (req.body.__type) {
+				case MessageEventBusDestinationTypeNames.sentry:
+					if (isMessageEventBusDestinationSentryOptions(req.body)) {
+						result = await this.eventBus.addDestination(
+							new MessageEventBusDestinationSentry(this.eventBus, req.body),
+						);
+					}
+					break;
+				case MessageEventBusDestinationTypeNames.webhook:
+					if (isMessageEventBusDestinationWebhookOptions(req.body)) {
+						result = await this.eventBus.addDestination(
+							new MessageEventBusDestinationWebhook(this.eventBus, req.body),
+						);
+					}
+					break;
+				case MessageEventBusDestinationTypeNames.syslog:
+					if (isMessageEventBusDestinationSyslogOptions(req.body)) {
+						result = await this.eventBus.addDestination(
+							new MessageEventBusDestinationSyslog(this.eventBus, req.body),
+						);
+					}
+					break;
+				default:
+					throw new BadRequestError(
+						`Body is missing ${req.body.__type} options or type ${req.body.__type} is unknown`,
+					);
+			}
+			if (result) {
+				await result.saveToDb();
+				return {
+					...result.serialize(),
+					eventBusInstance: undefined,
+				};
+			}
+			throw new BadRequestError('There was an error adding the destination');
+		}
+		throw new BadRequestError('Body is not configuring MessageEventBusDestinationOptions');
+	}
+
+	@Get('/testmessage', { middlewares: [logStreamingLicensedMiddleware] })
+	@GlobalScope('eventBusDestination:test')
+	async sendTestMessage(req: express.Request): Promise<boolean> {
+		if (isWithIdString(req.query)) {
+			return await this.eventBus.testDestination(req.query.id);
+		}
+		return false;
+	}
+
+	@Delete('/destination', { middlewares: [logStreamingLicensedMiddleware] })
+	@GlobalScope('eventBusDestination:delete')
+	async deleteDestination(req: AuthenticatedRequest) {
+		if (isWithIdString(req.query)) {
+			return await this.eventBus.removeDestination(req.query.id);
+		} else {
+			throw new BadRequestError('Query is missing id');
+		}
+	}
+}
diff --git a/packages/cli/src/eventbus/eventBus.controller.ts b/packages/cli/src/eventbus/eventBus.controller.ts
index 7c9ce21ccc5ee..179d44da41668 100644
--- a/packages/cli/src/eventbus/eventBus.controller.ts
+++ b/packages/cli/src/eventbus/eventBus.controller.ts
@@ -1,139 +1,107 @@
-/* eslint-disable @typescript-eslint/no-unsafe-call */
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* eslint-disable @typescript-eslint/no-explicit-any */
 import express from 'express';
+import type { IRunExecutionData } from 'n8n-workflow';
+import { EventMessageTypeNames } from 'n8n-workflow';
+
+import { RestController, Get, Post, GlobalScope } from '@/decorators';
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
+
 import { isEventMessageOptions } from './EventMessageClasses/AbstractEventMessage';
 import { EventMessageGeneric } from './EventMessageClasses/EventMessageGeneric';
 import type { EventMessageWorkflowOptions } from './EventMessageClasses/EventMessageWorkflow';
 import { EventMessageWorkflow } from './EventMessageClasses/EventMessageWorkflow';
 import type { EventMessageReturnMode } from './MessageEventBus/MessageEventBus';
-import { eventBus } from './MessageEventBus/MessageEventBus';
-import {
-	isMessageEventBusDestinationSentryOptions,
-	MessageEventBusDestinationSentry,
-} from './MessageEventBusDestination/MessageEventBusDestinationSentry.ee';
-import {
-	isMessageEventBusDestinationSyslogOptions,
-	MessageEventBusDestinationSyslog,
-} from './MessageEventBusDestination/MessageEventBusDestinationSyslog.ee';
-import { MessageEventBusDestinationWebhook } from './MessageEventBusDestination/MessageEventBusDestinationWebhook.ee';
+import { MessageEventBus } from './MessageEventBus/MessageEventBus';
 import type { EventMessageTypes, FailedEventSummary } from './EventMessageClasses';
 import { eventNamesAll } from './EventMessageClasses';
 import type { EventMessageAuditOptions } from './EventMessageClasses/EventMessageAudit';
 import { EventMessageAudit } from './EventMessageClasses/EventMessageAudit';
-import { BadRequestError } from '@/ResponseHelper';
-import type {
-	MessageEventBusDestinationWebhookOptions,
-	MessageEventBusDestinationOptions,
-	IRunExecutionData,
-} from 'n8n-workflow';
-import { MessageEventBusDestinationTypeNames, EventMessageTypeNames } from 'n8n-workflow';
 import type { EventMessageNodeOptions } from './EventMessageClasses/EventMessageNode';
 import { EventMessageNode } from './EventMessageClasses/EventMessageNode';
-import { recoverExecutionDataFromEventLogMessages } from './MessageEventBus/recoverEvents';
-import { RestController, Get, Post, Delete, Authorized } from '@/decorators';
-import type { MessageEventBusDestination } from './MessageEventBusDestination/MessageEventBusDestination.ee';
-import type { DeleteResult } from 'typeorm';
-import { AuthenticatedRequest } from '@/requests';
+import { ExecutionDataRecoveryService } from './executionDataRecovery.service';
 
 // ----------------------------------------
 // TypeGuards
 // ----------------------------------------
 
-const isWithIdString = (candidate: unknown): candidate is { id: string } => {
-	const o = candidate as { id: string };
-	if (!o) return false;
-	return o.id !== undefined;
-};
-
 const isWithQueryString = (candidate: unknown): candidate is { query: string } => {
 	const o = candidate as { query: string };
 	if (!o) return false;
 	return o.query !== undefined;
 };
 
-const isMessageEventBusDestinationWebhookOptions = (
-	candidate: unknown,
-): candidate is MessageEventBusDestinationWebhookOptions => {
-	const o = candidate as MessageEventBusDestinationWebhookOptions;
-	if (!o) return false;
-	return o.url !== undefined;
-};
-
-const isMessageEventBusDestinationOptions = (
-	candidate: unknown,
-): candidate is MessageEventBusDestinationOptions => {
-	const o = candidate as MessageEventBusDestinationOptions;
-	if (!o) return false;
-	return o.__type !== undefined;
-};
-
 // ----------------------------------------
 // Controller
 // ----------------------------------------
 
-@Authorized()
 @RestController('/eventbus')
 export class EventBusController {
+	constructor(
+		private readonly eventBus: MessageEventBus,
+		private readonly recoveryService: ExecutionDataRecoveryService,
+	) {}
+
 	// ----------------------------------------
 	// Events
 	// ----------------------------------------
-	@Authorized(['global', 'owner'])
 	@Get('/event')
+	@GlobalScope('eventBusEvent:query')
 	async getEvents(
 		req: express.Request,
 	): Promise<EventMessageTypes[] | Record<string, EventMessageTypes[]>> {
 		if (isWithQueryString(req.query)) {
 			switch (req.query.query as EventMessageReturnMode) {
 				case 'sent':
-					return eventBus.getEventsSent();
+					return await this.eventBus.getEventsSent();
 				case 'unsent':
-					return eventBus.getEventsUnsent();
+					return await this.eventBus.getEventsUnsent();
 				case 'unfinished':
-					return eventBus.getUnfinishedExecutions();
+					return await this.eventBus.getUnfinishedExecutions();
 				case 'all':
 				default:
-					return eventBus.getEventsAll();
+					return await this.eventBus.getEventsAll();
 			}
 		} else {
-			return eventBus.getEventsAll();
+			return await this.eventBus.getEventsAll();
 		}
 	}
 
 	@Get('/failed')
+	@GlobalScope('eventBusEvent:list')
 	async getFailedEvents(req: express.Request): Promise<FailedEventSummary[]> {
 		const amount = parseInt(req.query?.amount as string) ?? 5;
-		return eventBus.getEventsFailed(amount);
+		return await this.eventBus.getEventsFailed(amount);
 	}
 
 	@Get('/execution/:id')
+	@GlobalScope('eventBusEvent:read')
 	async getEventForExecutionId(req: express.Request): Promise<EventMessageTypes[] | undefined> {
 		if (req.params?.id) {
 			let logHistory;
 			if (req.query?.logHistory) {
 				logHistory = parseInt(req.query.logHistory as string, 10);
 			}
-			return eventBus.getEventsByExecutionId(req.params.id, logHistory);
+			return await this.eventBus.getEventsByExecutionId(req.params.id, logHistory);
 		}
 		return;
 	}
 
 	@Get('/execution-recover/:id')
+	@GlobalScope('eventBusEvent:read')
 	async getRecoveryForExecutionId(req: express.Request): Promise<IRunExecutionData | undefined> {
 		const { id } = req.params;
 		if (req.params?.id) {
 			const logHistory = parseInt(req.query.logHistory as string, 10) || undefined;
 			const applyToDb = req.query.applyToDb !== undefined ? !!req.query.applyToDb : true;
-			const messages = await eventBus.getEventsByExecutionId(id, logHistory);
+			const messages = await this.eventBus.getEventsByExecutionId(id, logHistory);
 			if (messages.length > 0) {
-				return recoverExecutionDataFromEventLogMessages(id, messages, applyToDb);
+				return await this.recoveryService.recoverExecutionData(id, messages, applyToDb);
 			}
 		}
 		return;
 	}
 
-	@Authorized(['global', 'owner'])
 	@Post('/event')
+	@GlobalScope('eventBusEvent:create')
 	async postEvent(req: express.Request): Promise<EventMessageTypes | undefined> {
 		let msg: EventMessageTypes | undefined;
 		if (isEventMessageOptions(req.body)) {
@@ -151,7 +119,7 @@ export class EventBusController {
 				default:
 					msg = new EventMessageGeneric(req.body);
 			}
-			await eventBus.send(msg);
+			await this.eventBus.send(msg);
 		} else {
 			throw new BadRequestError(
 				'Body is not a serialized EventMessage or eventName does not match format {namespace}.{domain}.{event}',
@@ -160,82 +128,6 @@ export class EventBusController {
 		return msg;
 	}
 
-	// ----------------------------------------
-	// Destinations
-	// ----------------------------------------
-
-	@Get('/destination')
-	async getDestination(req: express.Request): Promise<MessageEventBusDestinationOptions[]> {
-		if (isWithIdString(req.query)) {
-			return eventBus.findDestination(req.query.id);
-		} else {
-			return eventBus.findDestination();
-		}
-	}
-
-	@Authorized(['global', 'owner'])
-	@Post('/destination')
-	async postDestination(req: AuthenticatedRequest): Promise<any> {
-		let result: MessageEventBusDestination | undefined;
-		if (isMessageEventBusDestinationOptions(req.body)) {
-			switch (req.body.__type) {
-				case MessageEventBusDestinationTypeNames.sentry:
-					if (isMessageEventBusDestinationSentryOptions(req.body)) {
-						result = await eventBus.addDestination(
-							new MessageEventBusDestinationSentry(eventBus, req.body),
-						);
-					}
-					break;
-				case MessageEventBusDestinationTypeNames.webhook:
-					if (isMessageEventBusDestinationWebhookOptions(req.body)) {
-						result = await eventBus.addDestination(
-							new MessageEventBusDestinationWebhook(eventBus, req.body),
-						);
-					}
-					break;
-				case MessageEventBusDestinationTypeNames.syslog:
-					if (isMessageEventBusDestinationSyslogOptions(req.body)) {
-						result = await eventBus.addDestination(
-							new MessageEventBusDestinationSyslog(eventBus, req.body),
-						);
-					}
-					break;
-				default:
-					throw new BadRequestError(
-						// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-						`Body is missing ${req.body.__type} options or type ${req.body.__type} is unknown`,
-					);
-			}
-			if (result) {
-				await result.saveToDb();
-				return {
-					...result.serialize(),
-					eventBusInstance: undefined,
-				};
-			}
-			throw new BadRequestError('There was an error adding the destination');
-		}
-		throw new BadRequestError('Body is not configuring MessageEventBusDestinationOptions');
-	}
-
-	@Get('/testmessage')
-	async sendTestMessage(req: express.Request): Promise<boolean> {
-		if (isWithIdString(req.query)) {
-			return eventBus.testDestination(req.query.id);
-		}
-		return false;
-	}
-
-	@Authorized(['global', 'owner'])
-	@Delete('/destination')
-	async deleteDestination(req: AuthenticatedRequest): Promise<DeleteResult | undefined> {
-		if (isWithIdString(req.query)) {
-			return eventBus.removeDestination(req.query.id);
-		} else {
-			throw new BadRequestError('Query is missing id');
-		}
-	}
-
 	// ----------------------------------------
 	// Utilities
 	// ----------------------------------------
diff --git a/packages/cli/src/eventbus/executionDataRecovery.service.ts b/packages/cli/src/eventbus/executionDataRecovery.service.ts
new file mode 100644
index 0000000000000..3ddee5edc71e4
--- /dev/null
+++ b/packages/cli/src/eventbus/executionDataRecovery.service.ts
@@ -0,0 +1,213 @@
+import { Container, Service } from 'typedi';
+import type { DateTime } from 'luxon';
+import { Push } from '@/push';
+import { InternalHooks } from '@/InternalHooks';
+import type { IRun, IRunExecutionData, ITaskData } from 'n8n-workflow';
+import { NodeOperationError, WorkflowOperationError, sleep } from 'n8n-workflow';
+
+import { ExecutionRepository } from '@db/repositories/execution.repository';
+import { getWorkflowHooksMain } from '@/WorkflowExecuteAdditionalData';
+import type { EventMessageTypes, EventNamesTypes } from './EventMessageClasses';
+
+@Service()
+export class ExecutionDataRecoveryService {
+	constructor(
+		private readonly push: Push,
+		private readonly executionRepository: ExecutionRepository,
+	) {}
+
+	// eslint-disable-next-line complexity
+	async recoverExecutionData(
+		executionId: string,
+		messages: EventMessageTypes[],
+		applyToDb: boolean,
+	): Promise<IRunExecutionData | undefined> {
+		const executionEntry = await this.executionRepository.findSingleExecution(executionId, {
+			includeData: true,
+			unflattenData: true,
+		});
+
+		if (executionEntry && messages) {
+			let executionData = executionEntry.data;
+			let workflowError: WorkflowOperationError | undefined;
+			if (!executionData) {
+				executionData = { resultData: { runData: {} } };
+			}
+			let nodeNames: string[] = [];
+			if (
+				executionData?.resultData?.runData &&
+				Object.keys(executionData.resultData.runData).length > 0
+			) {
+			} else {
+				if (!executionData.resultData) {
+					executionData.resultData = {
+						runData: {},
+					};
+				} else {
+					if (!executionData.resultData.runData) {
+						executionData.resultData.runData = {};
+					}
+				}
+			}
+			nodeNames = executionEntry.workflowData.nodes.map((n) => n.name);
+
+			let lastNodeRunTimestamp: DateTime | undefined = undefined;
+
+			for (const nodeName of nodeNames) {
+				const nodeByName = executionEntry?.workflowData.nodes.find((n) => n.name === nodeName);
+
+				if (!nodeByName) continue;
+
+				const nodeStartedMessage = messages.find(
+					(message) =>
+						message.eventName === 'n8n.node.started' && message.payload.nodeName === nodeName,
+				);
+				const nodeFinishedMessage = messages.find(
+					(message) =>
+						message.eventName === 'n8n.node.finished' && message.payload.nodeName === nodeName,
+				);
+
+				const executionTime =
+					nodeStartedMessage && nodeFinishedMessage
+						? nodeFinishedMessage.ts.diff(nodeStartedMessage.ts).toMillis()
+						: 0;
+
+				let taskData: ITaskData;
+				if (executionData.resultData.runData[nodeName]?.length > 0) {
+					taskData = executionData.resultData.runData[nodeName][0];
+				} else {
+					taskData = {
+						startTime: nodeStartedMessage ? nodeStartedMessage.ts.toUnixInteger() : 0,
+						executionTime,
+						source: [null],
+						executionStatus: 'unknown',
+					};
+				}
+
+				if (nodeStartedMessage && !nodeFinishedMessage) {
+					const nodeError = new NodeOperationError(
+						nodeByName,
+						'Node crashed, possible out-of-memory issue',
+						{
+							message: 'Execution stopped at this node',
+							description:
+								"n8n may have run out of memory while executing it. More context and tips on how to avoid this <a href='https://docs.n8n.io/flow-logic/error-handling/memory-errors' target='_blank'>in the docs</a>",
+						},
+					);
+					workflowError = new WorkflowOperationError(
+						'Workflow did not finish, possible out-of-memory issue',
+					);
+					taskData.error = nodeError;
+					taskData.executionStatus = 'crashed';
+					executionData.resultData.lastNodeExecuted = nodeName;
+					if (nodeStartedMessage) lastNodeRunTimestamp = nodeStartedMessage.ts;
+				} else if (nodeStartedMessage && nodeFinishedMessage) {
+					taskData.executionStatus = 'success';
+					if (taskData.data === undefined) {
+						taskData.data = {
+							main: [
+								[
+									{
+										json: {
+											isArtificialRecoveredEventItem: true,
+										},
+										pairedItem: undefined,
+									},
+								],
+							],
+						};
+					}
+				}
+
+				if (!executionData.resultData.runData[nodeName]) {
+					executionData.resultData.runData[nodeName] = [taskData];
+				}
+			}
+
+			if (!lastNodeRunTimestamp) {
+				const workflowEndedMessage = messages.find((message) =>
+					(
+						[
+							'n8n.workflow.success',
+							'n8n.workflow.crashed',
+							'n8n.workflow.failed',
+						] as EventNamesTypes[]
+					).includes(message.eventName),
+				);
+				if (workflowEndedMessage) {
+					lastNodeRunTimestamp = workflowEndedMessage.ts;
+				} else {
+					if (!workflowError) {
+						workflowError = new WorkflowOperationError(
+							'Workflow did not finish, possible out-of-memory issue',
+						);
+					}
+					const workflowStartedMessage = messages.find(
+						(message) => message.eventName === 'n8n.workflow.started',
+					);
+					if (workflowStartedMessage) {
+						lastNodeRunTimestamp = workflowStartedMessage.ts;
+					}
+				}
+			}
+
+			if (!executionData.resultData.error && workflowError) {
+				executionData.resultData.error = workflowError;
+			}
+
+			if (applyToDb) {
+				const newStatus = executionEntry.status === 'error' ? 'error' : 'crashed';
+				await this.executionRepository.updateExistingExecution(executionId, {
+					data: executionData,
+					status: newStatus,
+					stoppedAt: lastNodeRunTimestamp?.toJSDate(),
+				});
+				await Container.get(InternalHooks).onWorkflowPostExecute(
+					executionId,
+					executionEntry.workflowData,
+					{
+						data: executionData,
+						finished: false,
+						mode: executionEntry.mode,
+						waitTill: executionEntry.waitTill ?? undefined,
+						startedAt: executionEntry.startedAt,
+						stoppedAt: lastNodeRunTimestamp?.toJSDate(),
+						status: newStatus,
+					},
+				);
+				const iRunData: IRun = {
+					data: executionData,
+					finished: false,
+					mode: executionEntry.mode,
+					waitTill: executionEntry.waitTill ?? undefined,
+					startedAt: executionEntry.startedAt,
+					stoppedAt: lastNodeRunTimestamp?.toJSDate(),
+					status: newStatus,
+				};
+				const workflowHooks = getWorkflowHooksMain(
+					{
+						userId: '',
+						workflowData: executionEntry.workflowData,
+						executionMode: executionEntry.mode,
+						executionData,
+						runData: executionData.resultData.runData,
+						retryOf: executionEntry.retryOf,
+					},
+					executionId,
+				);
+
+				// execute workflowExecuteAfter hook to trigger error workflow
+				await workflowHooks.executeHookFunctions('workflowExecuteAfter', [iRunData]);
+
+				// wait for UI to be back up and send the execution data
+				this.push.once('editorUiConnected', async () => {
+					// add a small timeout to make sure the UI is back up
+					await sleep(1000);
+					this.push.broadcast('executionRecovered', { executionId });
+				});
+			}
+			return executionData;
+		}
+		return;
+	}
+}
diff --git a/packages/cli/src/eventbus/index.ts b/packages/cli/src/eventbus/index.ts
index 1b3b48d7af4ba..b9a271bb81f18 100644
--- a/packages/cli/src/eventbus/index.ts
+++ b/packages/cli/src/eventbus/index.ts
@@ -1 +1,3 @@
-export { eventBus } from './MessageEventBus/MessageEventBus';
+export { EventMessageTypes } from './EventMessageClasses';
+export { EventPayloadWorkflow } from './EventMessageClasses/EventMessageWorkflow';
+export { METRICS_EVENT_NAME, getLabelsForEvent } from './MessageEventBusDestination/Helpers.ee';
diff --git a/packages/cli/src/eventbus/middleware/logStreamingEnabled.middleware.ee.ts b/packages/cli/src/eventbus/middleware/logStreamingEnabled.middleware.ee.ts
new file mode 100644
index 0000000000000..621fe3a5b4903
--- /dev/null
+++ b/packages/cli/src/eventbus/middleware/logStreamingEnabled.middleware.ee.ts
@@ -0,0 +1,15 @@
+import type { RequestHandler } from 'express';
+import Container from 'typedi';
+import { License } from '../../License';
+
+export function islogStreamingLicensed(): boolean {
+	return Container.get(License).isLogStreamingEnabled();
+}
+
+export const logStreamingLicensedMiddleware: RequestHandler = (req, res, next) => {
+	if (islogStreamingLicensed()) {
+		next();
+	} else {
+		res.status(403).json({ status: 'error', message: 'Unauthorized' });
+	}
+};
diff --git a/packages/cli/src/events/WorkflowStatistics.ts b/packages/cli/src/events/WorkflowStatistics.ts
deleted file mode 100644
index 863aeb6e1897c..0000000000000
--- a/packages/cli/src/events/WorkflowStatistics.ts
+++ /dev/null
@@ -1,176 +0,0 @@
-import type { INode, IRun, IWorkflowBase } from 'n8n-workflow';
-import { LoggerProxy } from 'n8n-workflow';
-import * as Db from '@/Db';
-import { StatisticsNames } from '@db/entities/WorkflowStatistics';
-import { getWorkflowOwner } from '@/UserManagement/UserManagementHelper';
-import { QueryFailedError } from 'typeorm';
-import { Container } from 'typedi';
-import { InternalHooks } from '@/InternalHooks';
-import config from '@/config';
-import { UserService } from '@/user/user.service';
-
-const enum StatisticsUpsertResult {
-	insert = 'insert',
-	update = 'update',
-	failed = 'failed',
-}
-
-async function upsertWorkflowStatistics(
-	eventName: StatisticsNames,
-	workflowId: string,
-): Promise<StatisticsUpsertResult> {
-	const dbType = config.getEnv('database.type');
-	const { tableName } = Db.collections.WorkflowStatistics.metadata;
-	try {
-		if (dbType === 'sqlite') {
-			await Db.collections.WorkflowStatistics.query(
-				`INSERT INTO "${tableName}" ("count", "name", "workflowId", "latestEvent")
-					VALUES (1, "${eventName}", "${workflowId}", CURRENT_TIMESTAMP)
-					ON CONFLICT (workflowId, name)
-					DO UPDATE SET count = count + 1, latestEvent = CURRENT_TIMESTAMP`,
-			);
-			// SQLite does not offer a reliable way to know whether or not an insert or update happened.
-			// We'll use a naive approach in this case. Query again after and it might cause us to miss the
-			// first production execution sometimes due to concurrency, but it's the only way.
-
-			const counter = await Db.collections.WorkflowStatistics.findOne({
-				select: ['count'],
-				where: {
-					name: eventName,
-					workflowId,
-				},
-			});
-
-			if (counter?.count === 1) {
-				return StatisticsUpsertResult.insert;
-			}
-			return StatisticsUpsertResult.update;
-		} else if (dbType === 'postgresdb') {
-			const queryResult = (await Db.collections.WorkflowStatistics.query(
-				`INSERT INTO "${tableName}" ("count", "name", "workflowId", "latestEvent")
-					VALUES (1, '${eventName}', '${workflowId}', CURRENT_TIMESTAMP)
-					ON CONFLICT ("name", "workflowId")
-					DO UPDATE SET "count" = "${tableName}"."count" + 1, "latestEvent" = CURRENT_TIMESTAMP
-					RETURNING *;`,
-			)) as Array<{
-				count: number;
-			}>;
-			if (queryResult[0].count === 1) {
-				return StatisticsUpsertResult.insert;
-			}
-			return StatisticsUpsertResult.update;
-		} else {
-			const queryResult = (await Db.collections.WorkflowStatistics.query(
-				`INSERT INTO \`${tableName}\` (count, name, workflowId, latestEvent)
-					VALUES (1, "${eventName}", "${workflowId}", NOW())
-					ON DUPLICATE KEY
-					UPDATE count = count + 1, latestEvent = NOW();`,
-			)) as {
-				affectedRows: number;
-			};
-			if (queryResult.affectedRows === 1) {
-				return StatisticsUpsertResult.insert;
-			}
-			// MySQL returns 2 affected rows on update
-			return StatisticsUpsertResult.update;
-		}
-	} catch (error) {
-		if (error instanceof QueryFailedError) return StatisticsUpsertResult.failed;
-		throw error;
-	}
-}
-
-export async function workflowExecutionCompleted(
-	workflowData: IWorkflowBase,
-	runData: IRun,
-): Promise<void> {
-	// Determine the name of the statistic
-	const finished = runData.finished ? runData.finished : false;
-	const manual = runData.mode === 'manual';
-	let name: StatisticsNames;
-
-	if (finished) {
-		if (manual) name = StatisticsNames.manualSuccess;
-		else name = StatisticsNames.productionSuccess;
-	} else {
-		if (manual) name = StatisticsNames.manualError;
-		else name = StatisticsNames.productionError;
-	}
-
-	// Get the workflow id
-	const workflowId = workflowData.id;
-	if (!workflowId) return;
-
-	try {
-		const upsertResult = await upsertWorkflowStatistics(name, workflowId);
-
-		if (
-			name === StatisticsNames.productionSuccess &&
-			upsertResult === StatisticsUpsertResult.insert
-		) {
-			const owner = await getWorkflowOwner(workflowId);
-			const metrics = {
-				user_id: owner.id,
-				workflow_id: workflowId,
-			};
-
-			if (!owner.settings?.firstSuccessfulWorkflowId) {
-				await UserService.updateUserSettings(owner.id, {
-					firstSuccessfulWorkflowId: workflowId,
-					userActivated: true,
-					showUserActivationSurvey: true,
-				});
-			}
-
-			// Send the metrics
-			await Container.get(InternalHooks).onFirstProductionWorkflowSuccess(metrics);
-		}
-	} catch (error) {
-		LoggerProxy.verbose('Unable to fire first workflow success telemetry event');
-	}
-}
-
-export async function nodeFetchedData(
-	workflowId: string | undefined | null,
-	node: INode,
-): Promise<void> {
-	if (!workflowId) return;
-	// Try to insert the data loaded statistic
-	try {
-		await Db.collections.WorkflowStatistics.insert({
-			workflowId,
-			name: StatisticsNames.dataLoaded,
-			count: 1,
-			latestEvent: new Date(),
-		});
-	} catch (error) {
-		// if it's a duplicate key error then that's fine, otherwise throw the error
-		if (!(error instanceof QueryFailedError)) {
-			throw error;
-		}
-		// If it is a query failed error, we return
-		return;
-	}
-
-	// Compile the metrics since this was a new data loaded event
-	const owner = await getWorkflowOwner(workflowId);
-	let metrics = {
-		user_id: owner.id,
-		workflow_id: workflowId,
-		node_type: node.type,
-		node_id: node.id,
-	};
-
-	// This is probably naive but I can't see a way for a node to have multiple credentials attached so..
-	if (node.credentials) {
-		Object.entries(node.credentials).forEach(([credName, credDetails]) => {
-			metrics = Object.assign(metrics, {
-				credential_type: credName,
-				credential_id: credDetails.id,
-			});
-		});
-	}
-
-	// Send metrics to posthog
-	await Container.get(InternalHooks).onFirstWorkflowDataLoad(metrics);
-}
diff --git a/packages/cli/src/events/index.ts b/packages/cli/src/events/index.ts
deleted file mode 100644
index a73a848f75d92..0000000000000
--- a/packages/cli/src/events/index.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { eventEmitter } from 'n8n-core';
-import { nodeFetchedData, workflowExecutionCompleted } from './WorkflowStatistics';
-
-export function initEvents() {
-	if ('SKIP_STATISTICS_EVENTS' in process.env) return;
-
-	// Check for undefined as during testing these functions end up undefined for some reason
-	if (nodeFetchedData) {
-		eventEmitter.on(eventEmitter.types.nodeFetchedData, nodeFetchedData);
-	}
-	if (workflowExecutionCompleted) {
-		eventEmitter.on(eventEmitter.types.workflowExecutionCompleted, workflowExecutionCompleted);
-	}
-}
diff --git a/packages/cli/src/executionLifecycleHooks/restoreBinaryDataId.ts b/packages/cli/src/executionLifecycleHooks/restoreBinaryDataId.ts
new file mode 100644
index 0000000000000..84780a785e410
--- /dev/null
+++ b/packages/cli/src/executionLifecycleHooks/restoreBinaryDataId.ts
@@ -0,0 +1,75 @@
+import Container from 'typedi';
+import { BinaryDataService } from 'n8n-core';
+import type { IRun, WorkflowExecuteMode } from 'n8n-workflow';
+import type { BinaryData } from 'n8n-core';
+import config from '@/config';
+import { Logger } from '@/Logger';
+
+/**
+ * Whenever the execution ID is not available to the binary data service at the
+ * time of writing a binary data file, its name is missing the execution ID.
+ * This function restores the ID in the file name and run data reference.
+ *
+ * This edge case can happen only for a Webhook node that accepts binary data,
+ * when the binary data manager is set to persist this binary data.
+ *
+ * ```txt
+ * filesystem-v2:workflows/123/executions/temp/binary_data/69055-83c4-4493-876a-9092c4708b9b ->
+ * filesystem-v2:workflows/123/executions/390/binary_data/69055-83c4-4493-876a-9092c4708b9b
+ *
+ * s3:workflows/123/executions/temp/binary_data/69055-83c4-4493-876a-9092c4708b9b ->
+ * s3:workflows/123/executions/390/binary_data/69055-83c4-4493-876a-9092c4708b9b
+ * ```
+ */
+export async function restoreBinaryDataId(
+	run: IRun,
+	executionId: string,
+	workflowExecutionMode: WorkflowExecuteMode,
+) {
+	if (
+		workflowExecutionMode !== 'webhook' ||
+		config.getEnv('binaryDataManager.mode') === 'default'
+	) {
+		return;
+	}
+
+	try {
+		const { runData } = run.data.resultData;
+
+		const promises = Object.keys(runData).map(async (nodeName) => {
+			const binaryDataId = runData[nodeName]?.[0]?.data?.main?.[0]?.[0]?.binary?.data?.id;
+
+			if (!binaryDataId) return;
+
+			const [mode, fileId] = binaryDataId.split(':') as [BinaryData.StoredMode, string];
+
+			const isMissingExecutionId = fileId.includes('/temp/');
+
+			if (!isMissingExecutionId) return;
+
+			const correctFileId = fileId.replace('temp', executionId);
+
+			await Container.get(BinaryDataService).rename(fileId, correctFileId);
+
+			const correctBinaryDataId = `${mode}:${correctFileId}`;
+
+			// @ts-expect-error Validated at the top
+			run.data.resultData.runData[nodeName][0].data.main[0][0].binary.data.id = correctBinaryDataId;
+		});
+
+		await Promise.all(promises);
+	} catch (e) {
+		const error = e instanceof Error ? e : new Error(`${e}`);
+		const logger = Container.get(Logger);
+
+		if (error.message.includes('ENOENT')) {
+			logger.warn('Failed to restore binary data ID - No such file or dir', {
+				executionId,
+				error,
+			});
+			return;
+		}
+
+		logger.error('Failed to restore binary data ID - Unknown error', { executionId, error });
+	}
+}
diff --git a/packages/cli/src/executionLifecycleHooks/saveExecutionProgress.ts b/packages/cli/src/executionLifecycleHooks/saveExecutionProgress.ts
new file mode 100644
index 0000000000000..933b81f788723
--- /dev/null
+++ b/packages/cli/src/executionLifecycleHooks/saveExecutionProgress.ts
@@ -0,0 +1,105 @@
+import { Container } from 'typedi';
+
+import type { IRunExecutionData, ITaskData, IWorkflowBase } from 'n8n-workflow';
+import { ErrorReporterProxy as ErrorReporter } from 'n8n-workflow';
+
+import { Logger } from '@/Logger';
+import { ExecutionRepository } from '@/databases/repositories/execution.repository';
+import { toSaveSettings } from '@/executionLifecycleHooks/toSaveSettings';
+
+export async function saveExecutionProgress(
+	workflowData: IWorkflowBase,
+	executionId: string,
+	nodeName: string,
+	data: ITaskData,
+	executionData: IRunExecutionData,
+	pushRef?: string,
+) {
+	const saveSettings = toSaveSettings(workflowData.settings);
+
+	if (!saveSettings.progress) return;
+
+	const logger = Container.get(Logger);
+
+	try {
+		logger.debug(`Save execution progress to database for execution ID ${executionId} `, {
+			executionId,
+			nodeName,
+		});
+
+		const fullExecutionData = await Container.get(ExecutionRepository).findSingleExecution(
+			executionId,
+			{
+				includeData: true,
+				unflattenData: true,
+			},
+		);
+
+		if (!fullExecutionData) {
+			// Something went badly wrong if this happens.
+			// This check is here mostly to make typescript happy.
+			return;
+		}
+
+		if (fullExecutionData.finished) {
+			// We already received ´workflowExecuteAfter´ webhook, so this is just an async call
+			// that was left behind. We skip saving because the other call should have saved everything
+			// so this one is safe to ignore
+			return;
+		}
+
+		if (fullExecutionData.data === undefined) {
+			fullExecutionData.data = {
+				startData: {},
+				resultData: {
+					runData: {},
+				},
+				executionData: {
+					contextData: {},
+					metadata: {},
+					nodeExecutionStack: [],
+					waitingExecution: {},
+					waitingExecutionSource: {},
+				},
+			};
+		}
+
+		if (Array.isArray(fullExecutionData.data.resultData.runData[nodeName])) {
+			// Append data if array exists
+			fullExecutionData.data.resultData.runData[nodeName].push(data);
+		} else {
+			// Initialize array and save data
+			fullExecutionData.data.resultData.runData[nodeName] = [data];
+		}
+
+		fullExecutionData.data.executionData = executionData.executionData;
+
+		// Set last executed node so that it may resume on failure
+		fullExecutionData.data.resultData.lastNodeExecuted = nodeName;
+
+		fullExecutionData.status = 'running';
+
+		await Container.get(ExecutionRepository).updateExistingExecution(
+			executionId,
+			fullExecutionData,
+		);
+	} catch (e) {
+		const error = e instanceof Error ? e : new Error(`${e}`);
+
+		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.
+
+		// We do this to prevent crashes and executions ending in `unknown` state.
+		logger.error(
+			`Failed saving execution progress to database for execution ID ${executionId} (hookFunctionsPreExecute, nodeExecuteAfter)`,
+			{
+				...error,
+				executionId,
+				pushRef,
+				workflowId: workflowData.id,
+			},
+		);
+	}
+}
diff --git a/packages/cli/src/executionLifecycleHooks/shared/sharedHookFunctions.ts b/packages/cli/src/executionLifecycleHooks/shared/sharedHookFunctions.ts
new file mode 100644
index 0000000000000..7a2e401919449
--- /dev/null
+++ b/packages/cli/src/executionLifecycleHooks/shared/sharedHookFunctions.ts
@@ -0,0 +1,105 @@
+import { Container } from 'typedi';
+import type { ExecutionStatus, IRun, IWorkflowBase } from 'n8n-workflow';
+import type { ExecutionPayload, IExecutionDb } from '@/Interfaces';
+import pick from 'lodash/pick';
+import { isWorkflowIdValid } from '@/utils';
+import { ExecutionRepository } from '@db/repositories/execution.repository';
+import { ExecutionMetadataService } from '@/services/executionMetadata.service';
+import { Logger } from '@/Logger';
+
+export function determineFinalExecutionStatus(runData: IRun): ExecutionStatus {
+	const workflowHasCrashed = runData.status === 'crashed';
+	const workflowWasCanceled = runData.status === 'canceled';
+	const workflowHasFailed = runData.status === 'error';
+	const workflowDidSucceed =
+		!runData.data.resultData?.error &&
+		!workflowHasCrashed &&
+		!workflowWasCanceled &&
+		!workflowHasFailed;
+	let workflowStatusFinal: ExecutionStatus = workflowDidSucceed ? 'success' : 'error';
+	if (workflowHasCrashed) workflowStatusFinal = 'crashed';
+	if (workflowWasCanceled) workflowStatusFinal = 'canceled';
+	if (runData.waitTill) workflowStatusFinal = 'waiting';
+	return workflowStatusFinal;
+}
+
+export function prepareExecutionDataForDbUpdate(parameters: {
+	runData: IRun;
+	workflowData: IWorkflowBase;
+	workflowStatusFinal: ExecutionStatus;
+	retryOf?: string;
+}) {
+	const { runData, workflowData, workflowStatusFinal, retryOf } = parameters;
+	// Although it is treated as IWorkflowBase here, it's being instantiated elsewhere with properties that may be sensitive
+	// As a result, we should create an IWorkflowBase object with only the data we want to save in it.
+	const pristineWorkflowData: IWorkflowBase = pick(workflowData, [
+		'id',
+		'name',
+		'active',
+		'createdAt',
+		'updatedAt',
+		'nodes',
+		'connections',
+		'settings',
+		'staticData',
+		'pinData',
+	]);
+
+	const fullExecutionData: ExecutionPayload = {
+		data: runData.data,
+		mode: runData.mode,
+		finished: runData.finished ? runData.finished : false,
+		startedAt: runData.startedAt,
+		stoppedAt: runData.stoppedAt,
+		workflowData: pristineWorkflowData,
+		waitTill: runData.waitTill,
+		status: workflowStatusFinal,
+		workflowId: pristineWorkflowData.id,
+	};
+
+	if (retryOf !== undefined) {
+		fullExecutionData.retryOf = retryOf.toString();
+	}
+
+	const workflowId = workflowData.id;
+	if (isWorkflowIdValid(workflowId)) {
+		fullExecutionData.workflowId = workflowId;
+	}
+
+	return fullExecutionData;
+}
+
+export async function updateExistingExecution(parameters: {
+	executionId: string;
+	workflowId: string;
+	executionData: Partial<IExecutionDb>;
+}) {
+	const logger = Container.get(Logger);
+	const { executionId, workflowId, executionData } = parameters;
+	// Leave log message before flatten as that operation increased memory usage a lot and the chance of a crash is highest here
+	logger.debug(`Save execution data to database for execution ID ${executionId}`, {
+		executionId,
+		workflowId,
+		finished: executionData.finished,
+		stoppedAt: executionData.stoppedAt,
+	});
+
+	await Container.get(ExecutionRepository).updateExistingExecution(executionId, executionData);
+
+	try {
+		if (executionData.data?.resultData.metadata) {
+			await Container.get(ExecutionMetadataService).save(
+				executionId,
+				executionData.data.resultData.metadata,
+			);
+		}
+	} catch (e) {
+		logger.error(`Failed to save metadata for execution ID ${executionId}`, e as Error);
+	}
+
+	if (executionData.finished === true && executionData.retryOf !== undefined) {
+		await Container.get(ExecutionRepository).updateExistingExecution(executionData.retryOf, {
+			retrySuccessId: executionId,
+		});
+	}
+}
diff --git a/packages/cli/src/executionLifecycleHooks/toSaveSettings.ts b/packages/cli/src/executionLifecycleHooks/toSaveSettings.ts
new file mode 100644
index 0000000000000..4b4aac2b8561c
--- /dev/null
+++ b/packages/cli/src/executionLifecycleHooks/toSaveSettings.ts
@@ -0,0 +1,36 @@
+import config from '@/config';
+import type { IWorkflowSettings } from 'n8n-workflow';
+
+/**
+ * Return whether a workflow execution is configured to be saved or not:
+ *
+ * - `error`: Whether to save failed executions in production.
+ * - `success`: Whether to successful executions in production.
+ * - `manual`: Whether to save successful or failed manual executions.
+ * - `progress`: Whether to save execution progress, i.e. after each node's execution.
+ */
+export function toSaveSettings(workflowSettings: IWorkflowSettings = {}) {
+	const DEFAULTS = {
+		ERROR: config.getEnv('executions.saveDataOnError'),
+		SUCCESS: config.getEnv('executions.saveDataOnSuccess'),
+		MANUAL: config.getEnv('executions.saveDataManualExecutions'),
+		PROGRESS: config.getEnv('executions.saveExecutionProgress'),
+	};
+
+	return {
+		error: workflowSettings.saveDataErrorExecution
+			? workflowSettings.saveDataErrorExecution !== 'none'
+			: DEFAULTS.ERROR !== 'none',
+		success: workflowSettings.saveDataSuccessExecution
+			? workflowSettings.saveDataSuccessExecution !== 'none'
+			: DEFAULTS.SUCCESS !== 'none',
+		manual:
+			workflowSettings === undefined || workflowSettings.saveManualExecutions === 'DEFAULT'
+				? DEFAULTS.MANUAL
+				: workflowSettings.saveManualExecutions ?? DEFAULTS.MANUAL,
+		progress:
+			workflowSettings === undefined || workflowSettings.saveExecutionProgress === 'DEFAULT'
+				? DEFAULTS.PROGRESS
+				: workflowSettings.saveExecutionProgress ?? DEFAULTS.PROGRESS,
+	};
+}
diff --git a/packages/cli/src/executions/execution.service.ee.ts b/packages/cli/src/executions/execution.service.ee.ts
new file mode 100644
index 0000000000000..29e2c5b8f36d6
--- /dev/null
+++ b/packages/cli/src/executions/execution.service.ee.ts
@@ -0,0 +1,46 @@
+import { ExecutionService } from './execution.service';
+import type { ExecutionRequest } from './execution.types';
+import type { IExecutionResponse, IExecutionFlattedResponse } from '@/Interfaces';
+import { EnterpriseWorkflowService } from '../workflows/workflow.service.ee';
+import type { WorkflowWithSharingsAndCredentials } from '@/workflows/workflows.types';
+import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
+import { Service } from 'typedi';
+
+@Service()
+export class EnterpriseExecutionsService {
+	constructor(
+		private readonly executionService: ExecutionService,
+		private readonly workflowRepository: WorkflowRepository,
+		private readonly enterpriseWorkflowService: EnterpriseWorkflowService,
+	) {}
+
+	async findOne(
+		req: ExecutionRequest.GetOne,
+		sharedWorkflowIds: string[],
+	): Promise<IExecutionResponse | IExecutionFlattedResponse | undefined> {
+		const execution = await this.executionService.findOne(req, sharedWorkflowIds);
+
+		if (!execution) return;
+
+		const relations = ['shared', 'shared.user'];
+
+		const workflow = (await this.workflowRepository.get(
+			{ id: execution.workflowId },
+			{ relations },
+		)) as WorkflowWithSharingsAndCredentials;
+
+		if (!workflow) return;
+
+		this.enterpriseWorkflowService.addOwnerAndSharings(workflow);
+		await this.enterpriseWorkflowService.addCredentialsToWorkflow(workflow, req.user);
+
+		execution.workflowData = {
+			...execution.workflowData,
+			ownedBy: workflow.ownedBy,
+			sharedWith: workflow.sharedWith,
+			usedCredentials: workflow.usedCredentials,
+		} as WorkflowWithSharingsAndCredentials;
+
+		return execution;
+	}
+}
diff --git a/packages/cli/src/executions/execution.service.ts b/packages/cli/src/executions/execution.service.ts
new file mode 100644
index 0000000000000..c4725c3275cc4
--- /dev/null
+++ b/packages/cli/src/executions/execution.service.ts
@@ -0,0 +1,445 @@
+import Container, { Service } from 'typedi';
+import { validate as jsonSchemaValidate } from 'jsonschema';
+import type {
+	IWorkflowBase,
+	ExecutionError,
+	INode,
+	IRunExecutionData,
+	WorkflowExecuteMode,
+	ExecutionStatus,
+} from 'n8n-workflow';
+import {
+	ApplicationError,
+	ExecutionStatusList,
+	Workflow,
+	WorkflowOperationError,
+} from 'n8n-workflow';
+import { ActiveExecutions } from '@/ActiveExecutions';
+import type {
+	ExecutionPayload,
+	IExecutionFlattedResponse,
+	IExecutionResponse,
+	IWorkflowDb,
+	IWorkflowExecutionDataProcess,
+} from '@/Interfaces';
+import { NodeTypes } from '@/NodeTypes';
+import { Queue } from '@/Queue';
+import type { ExecutionRequest, ExecutionSummaries } from './execution.types';
+import { WorkflowRunner } from '@/WorkflowRunner';
+import { getStatusUsingPreviousExecutionStatusMethod } from './executionHelpers';
+import type { IGetExecutionsQueryFilter } from '@db/repositories/execution.repository';
+import { ExecutionRepository } from '@db/repositories/execution.repository';
+import { WorkflowRepository } from '@db/repositories/workflow.repository';
+import { Logger } from '@/Logger';
+import { InternalServerError } from '@/errors/response-errors/internal-server.error';
+import { NotFoundError } from '@/errors/response-errors/not-found.error';
+import config from '@/config';
+import { WaitTracker } from '@/WaitTracker';
+import type { ExecutionEntity } from '@/databases/entities/ExecutionEntity';
+import type { IExecutionFlattedDb } from '../Interfaces';
+import { ResumeWorkflowTimerRepository } from '@/databases/repositories/resumeWorkflowTimer.repository';
+
+export const schemaGetExecutionsQueryFilter = {
+	$id: '/IGetExecutionsQueryFilter',
+	type: 'object',
+	properties: {
+		id: { type: 'string' },
+		finished: { type: 'boolean' },
+		mode: { type: 'string' },
+		retryOf: { type: 'string' },
+		retrySuccessId: { type: 'string' },
+		status: {
+			type: 'array',
+			items: { type: 'string' },
+		},
+		waitTill: { type: 'boolean' },
+		workflowId: { anyOf: [{ type: 'integer' }, { type: 'string' }] },
+		metadata: { type: 'array', items: { $ref: '#/$defs/metadata' } },
+		startedAfter: { type: 'date-time' },
+		startedBefore: { type: 'date-time' },
+	},
+	$defs: {
+		metadata: {
+			type: 'object',
+			required: ['key', 'value'],
+			properties: {
+				key: {
+					type: 'string',
+				},
+				value: { type: 'string' },
+			},
+		},
+	},
+};
+
+export const allowedExecutionsQueryFilterFields = Object.keys(
+	schemaGetExecutionsQueryFilter.properties,
+);
+
+@Service()
+export class ExecutionService {
+	constructor(
+		private readonly logger: Logger,
+		private readonly queue: Queue,
+		private readonly activeExecutions: ActiveExecutions,
+		private readonly executionRepository: ExecutionRepository,
+		private readonly workflowRepository: WorkflowRepository,
+		private readonly nodeTypes: NodeTypes,
+		private readonly waitTracker: WaitTracker,
+		private readonly workflowRunner: WorkflowRunner,
+	) {}
+
+	async findOne(
+		req: ExecutionRequest.GetOne,
+		sharedWorkflowIds: string[],
+	): Promise<IExecutionResponse | IExecutionFlattedResponse | undefined> {
+		if (!sharedWorkflowIds.length) return undefined;
+
+		const { id: executionId } = req.params;
+		const execution = await this.executionRepository.findIfShared(executionId!, sharedWorkflowIds);
+
+		if (!execution) {
+			this.logger.info('Attempt to read execution was blocked due to insufficient permissions', {
+				userId: req.user.id,
+				executionId,
+			});
+			return undefined;
+		}
+
+		if (!execution.status) {
+			execution.status = getStatusUsingPreviousExecutionStatusMethod(execution);
+		}
+
+		return execution;
+	}
+
+	async retry(
+		req: ExecutionRequest.Retry, 
+		sharedWorkflowIds: string[], 
+		resumeWorkflowTimerId?: string, 
+		executionEntity?: IExecutionResponse
+	) {
+		const { id: executionId } = req.params;
+		let execution;
+		if (executionEntity) {
+			execution = executionEntity;
+		} else {
+			execution = await Container.get(ExecutionRepository).findWithUnflattenedData(
+				executionId!,
+				sharedWorkflowIds,
+			);
+		}
+
+		if (!execution) {
+			this.logger.info(
+				'Attempt to retry an execution was blocked due to insufficient permissions',
+				{
+					userId: req.user.id,
+					executionId,
+				},
+			);
+			throw new NotFoundError(`The execution with the ID "${executionId}" does not exist.`);
+		}
+
+		if (execution.finished) {
+			throw new ApplicationError('The execution succeeded, so it cannot be retried.');
+		}
+
+		const executionMode = 'retry';
+
+		execution.workflowData.active = false;
+
+		// Start the workflow
+		const data: IWorkflowExecutionDataProcess = {
+			executionMode,
+			executionData: execution.data,
+			retryOf: req.params.id,
+			workflowData: execution.workflowData,
+			userId: req.user.id,
+		};
+
+		const { lastNodeExecuted } = data.executionData!.resultData;
+
+		if (lastNodeExecuted) {
+			// Remove the old error and the data of the last run of the node that it can be replaced
+			delete data.executionData!.resultData.error;
+			const { length } = data.executionData!.resultData.runData[lastNodeExecuted];
+			if (
+				length > 0 &&
+				data.executionData!.resultData.runData[lastNodeExecuted][length - 1].error !== undefined
+			) {
+				// Remove results only if it is an error.
+				// If we are retrying due to a crash, the information is simply success info from last node
+				data.executionData!.resultData.runData[lastNodeExecuted].pop();
+				// Stack will determine what to run next
+			}
+		}
+
+		if (req.body.loadWorkflow) {
+			// Loads the currently saved workflow to execute instead of the
+			// one saved at the time of the execution.
+			const workflowId = execution.workflowData.id;
+			const workflowData = (await this.workflowRepository.findOneBy({
+				id: workflowId,
+			})) as IWorkflowBase;
+
+			if (workflowData === undefined) {
+				throw new ApplicationError(
+					'Workflow could not be found and so the data not be loaded for the retry.',
+					{ extra: { workflowId } },
+				);
+			}
+
+			data.workflowData = workflowData;
+
+			const workflowInstance = new Workflow({
+				id: workflowData.id,
+				name: workflowData.name,
+				nodes: workflowData.nodes,
+				connections: workflowData.connections,
+				active: false,
+				nodeTypes: this.nodeTypes,
+				staticData: undefined,
+				settings: workflowData.settings,
+			});
+
+			// Replace all of the nodes in the execution stack with the ones of the new workflow
+			for (const stack of data.executionData!.executionData!.nodeExecutionStack) {
+				// Find the data of the last executed node in the new workflow
+				const node = workflowInstance.getNode(stack.node.name);
+				if (node === null) {
+					this.logger.error('Failed to retry an execution because a node could not be found', {
+						userId: req.user.id,
+						executionId,
+						nodeName: stack.node.name,
+					});
+					throw new WorkflowOperationError(
+						`Could not find the node "${stack.node.name}" in workflow. It probably got deleted or renamed. Without it the workflow can sadly not be retried.`,
+					);
+				}
+
+				// Replace the node data in the stack that it really uses the current data
+				stack.node = node;
+			}
+		}
+
+		const retriedExecutionId = await this.workflowRunner.run(data);
+
+		const executionData = await this.activeExecutions.getPostExecutePromise(retriedExecutionId);
+
+		if (!executionData) {
+			throw new ApplicationError('The retry did not start for an unknown reason.');
+		}
+
+		if (resumeWorkflowTimerId) {
+			await Container.get(ResumeWorkflowTimerRepository).delete({ id: resumeWorkflowTimerId });
+		}
+
+		return !!executionData.finished;
+	}
+
+	async delete(req: ExecutionRequest.Delete, sharedWorkflowIds: string[]) {
+		const { deleteBefore, ids, filters: requestFiltersRaw } = req.body;
+		let requestFilters;
+		if (requestFiltersRaw) {
+			try {
+				Object.keys(requestFiltersRaw).map((key) => {
+					if (!allowedExecutionsQueryFilterFields.includes(key)) delete requestFiltersRaw[key];
+				});
+				if (jsonSchemaValidate(requestFiltersRaw, schemaGetExecutionsQueryFilter).valid) {
+					requestFilters = requestFiltersRaw as IGetExecutionsQueryFilter;
+				}
+			} catch (error) {
+				throw new InternalServerError('Parameter "filter" contained invalid JSON string.');
+			}
+		}
+
+		return await this.executionRepository.deleteExecutionsByFilter(
+			requestFilters,
+			sharedWorkflowIds,
+			{
+				deleteBefore,
+				ids,
+			},
+		);
+	}
+
+	async createErrorExecution(
+		error: ExecutionError,
+		node: INode,
+		workflowData: IWorkflowDb,
+		workflow: Workflow,
+		mode: WorkflowExecuteMode,
+	) {
+		const saveDataErrorExecutionDisabled =
+			workflowData?.settings?.saveDataErrorExecution === 'none';
+
+		if (saveDataErrorExecutionDisabled) return;
+
+		const executionData: IRunExecutionData = {
+			startData: {
+				destinationNode: node.name,
+				runNodeFilter: [node.name],
+			},
+			executionData: {
+				contextData: {},
+				metadata: {},
+				nodeExecutionStack: [
+					{
+						node,
+						data: {
+							main: [
+								[
+									{
+										json: {},
+										pairedItem: {
+											item: 0,
+										},
+									},
+								],
+							],
+						},
+						source: null,
+					},
+				],
+				waitingExecution: {},
+				waitingExecutionSource: {},
+			},
+			resultData: {
+				runData: {
+					[node.name]: [
+						{
+							startTime: 0,
+							executionTime: 0,
+							error,
+							source: [],
+						},
+					],
+				},
+				error,
+				lastNodeExecuted: node.name,
+			},
+		};
+
+		const fullExecutionData: ExecutionPayload = {
+			data: executionData,
+			mode,
+			finished: false,
+			startedAt: new Date(),
+			workflowData,
+			workflowId: workflow.id,
+			stoppedAt: new Date(),
+			status: 'error',
+		};
+
+		await this.executionRepository.createNewExecution(fullExecutionData);
+	}
+
+	// ----------------------------------
+	//             new API
+	// ----------------------------------
+
+	private readonly isRegularMode = config.getEnv('executions.mode') === 'regular';
+
+	/**
+	 * Find summaries of executions that satisfy a query.
+	 *
+	 * Return also the total count of all executions that satisfy the query,
+	 * and whether the total is an estimate or not.
+	 */
+	async findRangeWithCount(query: ExecutionSummaries.RangeQuery) {
+		const results = await this.executionRepository.findManyByRangeQuery(query);
+
+		if (config.getEnv('database.type') === 'postgresdb') {
+			const liveRows = await this.executionRepository.getLiveExecutionRowsOnPostgres();
+
+			if (liveRows === -1) return { count: -1, estimated: false, results };
+
+			if (liveRows > 100_000) {
+				// likely too high to fetch exact count fast
+				return { count: liveRows, estimated: true, results };
+			}
+		}
+
+		const { range: _, ...countQuery } = query;
+
+		const count = await this.executionRepository.fetchCount({ ...countQuery, kind: 'count' });
+
+		return { results, count, estimated: false };
+	}
+
+	/**
+	 * Find summaries of active and finished executions that satisfy a query.
+	 *
+	 * Return also the total count of all finished executions that satisfy the query,
+	 * and whether the total is an estimate or not. Active executions are excluded
+	 * from the total and count for pagination purposes.
+	 */
+	async findAllRunningAndLatest(query: ExecutionSummaries.RangeQuery) {
+		const currentlyRunningStatuses: ExecutionStatus[] = ['new', 'running'];
+		const allStatuses = new Set(ExecutionStatusList);
+		currentlyRunningStatuses.forEach((status) => allStatuses.delete(status));
+		const notRunningStatuses: ExecutionStatus[] = Array.from(allStatuses);
+
+		const [activeResult, finishedResult] = await Promise.all([
+			this.findRangeWithCount({ ...query, status: currentlyRunningStatuses }),
+			this.findRangeWithCount({
+				...query,
+				status: notRunningStatuses,
+				order: { stoppedAt: 'DESC' },
+			}),
+		]);
+
+		return {
+			results: activeResult.results.concat(finishedResult.results),
+			count: finishedResult.count,
+			estimated: finishedResult.estimated,
+		};
+	}
+
+	/**
+	 * Stop an active execution.
+	 */
+	async stop(executionId: string) {
+		const execution = await this.executionRepository.findOneBy({ id: executionId });
+
+		if (!execution) throw new NotFoundError('Execution not found');
+
+		const stopResult = await this.activeExecutions.stopExecution(execution.id);
+
+		if (stopResult) return this.toExecutionStopResult(execution);
+
+		if (this.isRegularMode) {
+			return await this.waitTracker.stopExecution(execution.id);
+		}
+
+		// queue mode
+
+		try {
+			return await this.waitTracker.stopExecution(execution.id);
+		} catch {
+			// @TODO: Why are we swallowing this error in queue mode?
+		}
+
+		const activeJobs = await this.queue.getJobs(['active', 'waiting']);
+		const job = activeJobs.find(({ data }) => data.executionId === execution.id);
+
+		if (job) {
+			await this.queue.stopJob(job);
+		} else {
+			this.logger.debug('Job to stop no longer in queue', { jobId: execution.id });
+		}
+
+		return this.toExecutionStopResult(execution);
+	}
+
+	private toExecutionStopResult(execution: ExecutionEntity) {
+		return {
+			mode: execution.mode,
+			startedAt: new Date(execution.startedAt),
+			stoppedAt: execution.stoppedAt ? new Date(execution.stoppedAt) : undefined,
+			finished: execution.finished,
+			status: execution.status,
+		};
+	}
+}
diff --git a/packages/cli/src/executions/execution.types.ts b/packages/cli/src/executions/execution.types.ts
new file mode 100644
index 0000000000000..c02444f998166
--- /dev/null
+++ b/packages/cli/src/executions/execution.types.ts
@@ -0,0 +1,85 @@
+import type { ExecutionEntity } from '@/databases/entities/ExecutionEntity';
+import type { AuthenticatedRequest } from '@/requests';
+import type { ExecutionStatus, IDataObject } from 'n8n-workflow';
+
+export declare namespace ExecutionRequest {
+	namespace QueryParams {
+		type GetMany = {
+			filter: string; // stringified `FilterFields`
+			limit: string;
+			lastId: string;
+			firstId: string;
+		};
+
+		type GetOne = { unflattedResponse: 'true' | 'false' };
+	}
+
+	namespace BodyParams {
+		type DeleteFilter = {
+			deleteBefore?: Date;
+			filters?: IDataObject;
+			ids?: string[];
+		};
+	}
+
+	namespace RouteParams {
+		type ExecutionId = {
+			id?: ExecutionEntity['id'];
+		};
+	}
+
+	type GetMany = AuthenticatedRequest<{}, {}, {}, QueryParams.GetMany> & {
+		rangeQuery: ExecutionSummaries.RangeQuery; // parsed from query params
+	};
+
+	type GetOne = AuthenticatedRequest<RouteParams.ExecutionId, {}, {}, QueryParams.GetOne>;
+
+	type Delete = AuthenticatedRequest<{}, {}, BodyParams.DeleteFilter>;
+
+	type Retry = AuthenticatedRequest<RouteParams.ExecutionId, {}, { loadWorkflow: boolean }, {}>;
+
+	type Stop = AuthenticatedRequest<RouteParams.ExecutionId>;
+}
+
+export namespace ExecutionSummaries {
+	export type Query = RangeQuery | CountQuery;
+
+	export type RangeQuery = { kind: 'range' } & FilterFields &
+		AccessFields &
+		RangeFields &
+		OrderFields;
+
+	export type CountQuery = { kind: 'count' } & FilterFields & AccessFields;
+
+	type FilterFields = Partial<{
+		id: string;
+		finished: boolean;
+		mode: string;
+		retryOf: string;
+		retrySuccessId: string;
+		status: ExecutionStatus[];
+		workflowId: string;
+		waitTill: boolean;
+		metadata: Array<{ key: string; value: string }>;
+		startedAfter: string;
+		startedBefore: string;
+	}>;
+
+	type AccessFields = {
+		accessibleWorkflowIds?: string[];
+	};
+
+	type RangeFields = {
+		range: {
+			limit: number;
+			firstId?: string;
+			lastId?: string;
+		};
+	};
+
+	type OrderFields = {
+		order?: {
+			stoppedAt: 'DESC';
+		};
+	};
+}
diff --git a/packages/cli/src/executions/executionHelpers.ts b/packages/cli/src/executions/executionHelpers.ts
index 148bd9b8b9644..b0354aa1c6d9c 100644
--- a/packages/cli/src/executions/executionHelpers.ts
+++ b/packages/cli/src/executions/executionHelpers.ts
@@ -1,10 +1,10 @@
 import { Container } from 'typedi';
-import type { IExecutionFlattedDb } from '@/Interfaces';
 import type { ExecutionStatus } from 'n8n-workflow';
 import { License } from '@/License';
+import type { IExecutionFlattedDb, IExecutionResponse } from '@/Interfaces';
 
 export function getStatusUsingPreviousExecutionStatusMethod(
-	execution: IExecutionFlattedDb,
+	execution: IExecutionFlattedDb | IExecutionResponse,
 ): ExecutionStatus {
 	if (execution.waitTill) {
 		return 'waiting';
@@ -13,7 +13,7 @@ export function getStatusUsingPreviousExecutionStatusMethod(
 	} else if (execution.finished) {
 		return 'success';
 	} else if (execution.stoppedAt !== null) {
-		return 'failed';
+		return 'error';
 	} else {
 		return 'unknown';
 	}
diff --git a/packages/cli/src/executions/executions.controller.ee.ts b/packages/cli/src/executions/executions.controller.ee.ts
deleted file mode 100644
index 0a7a1c329d3b6..0000000000000
--- a/packages/cli/src/executions/executions.controller.ee.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-import express from 'express';
-import type {
-	IExecutionFlattedResponse,
-	IExecutionResponse,
-	IExecutionsListResponse,
-} from '@/Interfaces';
-import type { ExecutionRequest } from '@/requests';
-import * as ResponseHelper from '@/ResponseHelper';
-import { isSharingEnabled } from '@/UserManagement/UserManagementHelper';
-import { EEExecutionsService } from './executions.service.ee';
-
-// eslint-disable-next-line @typescript-eslint/naming-convention
-export const EEExecutionsController = express.Router();
-
-EEExecutionsController.use((req, res, next) => {
-	if (!isSharingEnabled()) {
-		// skip ee router and use free one
-		next('router');
-		return;
-	}
-	// use ee router
-	next();
-});
-
-/**
- * GET /executions
- */
-EEExecutionsController.get(
-	'/',
-	ResponseHelper.send(async (req: ExecutionRequest.GetAll): Promise<IExecutionsListResponse> => {
-		return EEExecutionsService.getExecutionsList(req);
-	}),
-);
-
-/**
- * GET /executions/:id
- */
-EEExecutionsController.get(
-	'/:id(\\d+)',
-	ResponseHelper.send(
-		async (
-			req: ExecutionRequest.Get,
-		): Promise<IExecutionResponse | IExecutionFlattedResponse | undefined> => {
-			return EEExecutionsService.getExecution(req);
-		},
-	),
-);
-
-/**
- * POST /executions/:id/retry
- */
-EEExecutionsController.post(
-	'/:id/retry',
-	ResponseHelper.send(async (req: ExecutionRequest.Retry): Promise<boolean> => {
-		return EEExecutionsService.retryExecution(req);
-	}),
-);
-
-/**
- * POST /executions/delete
- * INFORMATION: We use POST instead of DELETE to not run into any issues with the query data
- * getting too long
- */
-EEExecutionsController.post(
-	'/delete',
-	ResponseHelper.send(async (req: ExecutionRequest.Delete): Promise<void> => {
-		await EEExecutionsService.deleteExecutions(req);
-	}),
-);
diff --git a/packages/cli/src/executions/executions.controller.ts b/packages/cli/src/executions/executions.controller.ts
index 8df86382883a2..b163441943037 100644
--- a/packages/cli/src/executions/executions.controller.ts
+++ b/packages/cli/src/executions/executions.controller.ts
@@ -1,74 +1,91 @@
-import express from 'express';
-import { LoggerProxy } from 'n8n-workflow';
-import type {
-	IExecutionFlattedResponse,
-	IExecutionResponse,
-	IExecutionsListResponse,
-} from '@/Interfaces';
-import * as ResponseHelper from '@/ResponseHelper';
-import { getLogger } from '@/Logger';
-import type { ExecutionRequest } from '@/requests';
-import { EEExecutionsController } from './executions.controller.ee';
-import { ExecutionsService } from './executions.service';
-
-export const executionsController = express.Router();
-
-/**
- * Initialise Logger if needed
- */
-executionsController.use((req, res, next) => {
-	try {
-		LoggerProxy.getInstance();
-	} catch (error) {
-		LoggerProxy.init(getLogger());
+import { ExecutionRequest } from './execution.types';
+import { ExecutionService } from './execution.service';
+import { Get, Post, RestController } from '@/decorators';
+import { EnterpriseExecutionsService } from './execution.service.ee';
+import { License } from '@/License';
+import { WorkflowSharingService } from '@/workflows/workflowSharing.service';
+import { NotFoundError } from '@/errors/response-errors/not-found.error';
+import { parseRangeQuery } from './parse-range-query.middleware';
+import type { User } from '@/databases/entities/User';
+
+@RestController('/executions')
+export class ExecutionsController {
+	constructor(
+		private readonly executionService: ExecutionService,
+		private readonly enterpriseExecutionService: EnterpriseExecutionsService,
+		private readonly workflowSharingService: WorkflowSharingService,
+		private readonly license: License,
+	) {}
+
+	private async getAccessibleWorkflowIds(user: User) {
+		return this.license.isSharingEnabled()
+			? await this.workflowSharingService.getSharedWorkflowIds(user)
+			: await this.workflowSharingService.getSharedWorkflowIds(user, ['workflow:owner']);
+	}
+
+	@Get('/', { middlewares: [parseRangeQuery] })
+	async getMany(req: ExecutionRequest.GetMany) {
+		const accessibleWorkflowIds = await this.getAccessibleWorkflowIds(req.user);
+
+		if (accessibleWorkflowIds.length === 0) {
+			return { count: 0, estimated: false, results: [] };
+		}
+
+		const { rangeQuery: query } = req;
+
+		if (query.workflowId && !accessibleWorkflowIds.includes(query.workflowId)) {
+			return { count: 0, estimated: false, results: [] };
+		}
+
+		query.accessibleWorkflowIds = accessibleWorkflowIds;
+
+		if (!this.license.isAdvancedExecutionFiltersEnabled()) delete query.metadata;
+
+		const noStatus = !query.status || query.status.length === 0;
+		const noRange = !query.range.lastId || !query.range.firstId;
+
+		if (noStatus && noRange) {
+			return await this.executionService.findAllRunningAndLatest(query);
+		}
+
+		return await this.executionService.findRangeWithCount(query);
+	}
+
+	@Get('/:id')
+	async getOne(req: ExecutionRequest.GetOne) {
+		const workflowIds = await this.getAccessibleWorkflowIds(req.user);
+
+		if (workflowIds.length === 0) throw new NotFoundError('Execution not found');
+
+		return this.license.isSharingEnabled()
+			? await this.enterpriseExecutionService.findOne(req, workflowIds)
+			: await this.executionService.findOne(req, workflowIds);
+	}
+
+	@Post('/:id/stop')
+	async stop(req: ExecutionRequest.Stop) {
+		const workflowIds = await this.getAccessibleWorkflowIds(req.user);
+
+		if (workflowIds.length === 0) throw new NotFoundError('Execution not found');
+
+		return await this.executionService.stop(req.params.id!);
+	}
+
+	@Post('/:id/retry')
+	async retry(req: ExecutionRequest.Retry) {
+		const workflowIds = await this.getAccessibleWorkflowIds(req.user);
+
+		if (workflowIds.length === 0) throw new NotFoundError('Execution not found');
+
+		return await this.executionService.retry(req, workflowIds);
+	}
+
+	@Post('/delete')
+	async delete(req: ExecutionRequest.Delete) {
+		const workflowIds = await this.getAccessibleWorkflowIds(req.user);
+
+		if (workflowIds.length === 0) throw new NotFoundError('Execution not found');
+
+		return await this.executionService.delete(req, workflowIds);
 	}
-	next();
-});
-
-executionsController.use('/', EEExecutionsController);
-
-/**
- * GET /executions
- */
-executionsController.get(
-	'/',
-	ResponseHelper.send(async (req: ExecutionRequest.GetAll): Promise<IExecutionsListResponse> => {
-		return ExecutionsService.getExecutionsList(req);
-	}),
-);
-
-/**
- * GET /executions/:id
- */
-executionsController.get(
-	'/:id(\\d+)',
-	ResponseHelper.send(
-		async (
-			req: ExecutionRequest.Get,
-		): Promise<IExecutionResponse | IExecutionFlattedResponse | undefined> => {
-			return ExecutionsService.getExecution(req);
-		},
-	),
-);
-
-/**
- * POST /executions/:id/retry
- */
-executionsController.post(
-	'/:id/retry',
-	ResponseHelper.send(async (req: ExecutionRequest.Retry): Promise<boolean> => {
-		return ExecutionsService.retryExecution(req);
-	}),
-);
-
-/**
- * POST /executions/delete
- * INFORMATION: We use POST instead of DELETE to not run into any issues with the query data
- * getting too long
- */
-executionsController.post(
-	'/delete',
-	ResponseHelper.send(async (req: ExecutionRequest.Delete): Promise<void> => {
-		await ExecutionsService.deleteExecutions(req);
-	}),
-);
+}
diff --git a/packages/cli/src/executions/executions.service.ee.ts b/packages/cli/src/executions/executions.service.ee.ts
deleted file mode 100644
index 60a7167ae85b8..0000000000000
--- a/packages/cli/src/executions/executions.service.ee.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import type { User } from '@db/entities/User';
-import { getSharedWorkflowIds } from '@/WorkflowHelpers';
-import { ExecutionsService } from './executions.service';
-
-export class EEExecutionsService extends ExecutionsService {
-	/**
-	 * Function to get the workflow Ids for a User regardless of role
-	 */
-	static async getWorkflowIdsForUser(user: User): Promise<string[]> {
-		// Get all workflows
-		return getSharedWorkflowIds(user);
-	}
-}
diff --git a/packages/cli/src/executions/executions.service.ts b/packages/cli/src/executions/executions.service.ts
deleted file mode 100644
index 41372335f04e2..0000000000000
--- a/packages/cli/src/executions/executions.service.ts
+++ /dev/null
@@ -1,663 +0,0 @@
-/* eslint-disable @typescript-eslint/restrict-template-expressions */
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
-import { validate as jsonSchemaValidate } from 'jsonschema';
-import { BinaryDataManager } from 'n8n-core';
-import type {
-	IDataObject,
-	IWorkflowBase,
-	JsonObject,
-	ExecutionStatus,
-	IRunExecutionData,
-	NodeOperationError,
-	IExecutionsSummary,
-} from 'n8n-workflow';
-import { deepCopy, LoggerProxy, jsonParse, Workflow } from 'n8n-workflow';
-import type { FindOperator, FindOptionsWhere } from 'typeorm';
-import { In, IsNull, LessThanOrEqual, MoreThanOrEqual, Not, Raw } from 'typeorm';
-import { ActiveExecutions } from '@/ActiveExecutions';
-import config from '@/config';
-import type { User } from '@db/entities/User';
-import type { ExecutionEntity } from '@db/entities/ExecutionEntity';
-import type {
-	IExecutionFlattedResponse,
-	IExecutionResponse,
-	IExecutionsListResponse,
-	IWorkflowExecutionDataProcess,
-} from '@/Interfaces';
-import { NodeTypes } from '@/NodeTypes';
-import { Queue } from '@/Queue';
-import type { ExecutionRequest } from '@/requests';
-import * as ResponseHelper from '@/ResponseHelper';
-import { getSharedWorkflowIds } from '@/WorkflowHelpers';
-import { WorkflowRunner } from '@/WorkflowRunner';
-import * as Db from '@/Db';
-import * as GenericHelpers from '@/GenericHelpers';
-import { parse } from 'flatted';
-import { Container } from 'typedi';
-import {
-	getStatusUsingPreviousExecutionStatusMethod,
-	isAdvancedExecutionFiltersEnabled,
-} from './executionHelpers';
-import { ExecutionMetadata } from '@db/entities/ExecutionMetadata';
-import { DateUtils } from 'typeorm/util/DateUtils';
-
-interface IGetExecutionsQueryFilter {
-	id?: FindOperator<string> | string;
-	finished?: boolean;
-	mode?: string;
-	retryOf?: string;
-	retrySuccessId?: string;
-	status?: ExecutionStatus[];
-	workflowId?: string;
-	// eslint-disable-next-line @typescript-eslint/no-explicit-any
-	waitTill?: FindOperator<any> | boolean;
-	metadata?: Array<{ key: string; value: string }>;
-	startedAfter?: string;
-	startedBefore?: string;
-}
-
-const schemaGetExecutionsQueryFilter = {
-	$id: '/IGetExecutionsQueryFilter',
-	type: 'object',
-	properties: {
-		id: { type: 'string' },
-		finished: { type: 'boolean' },
-		mode: { type: 'string' },
-		retryOf: { type: 'string' },
-		retrySuccessId: { type: 'string' },
-		status: {
-			type: 'array',
-			items: { type: 'string' },
-		},
-		waitTill: { type: 'boolean' },
-		workflowId: { anyOf: [{ type: 'integer' }, { type: 'string' }] },
-		metadata: { type: 'array', items: { $ref: '#/$defs/metadata' } },
-		startedAfter: { type: 'date-time' },
-		startedBefore: { type: 'date-time' },
-	},
-	$defs: {
-		metadata: {
-			type: 'object',
-			required: ['key', 'value'],
-			properties: {
-				key: {
-					type: 'string',
-				},
-				value: { type: 'string' },
-			},
-		},
-	},
-};
-
-const allowedExecutionsQueryFilterFields = Object.keys(schemaGetExecutionsQueryFilter.properties);
-
-export class ExecutionsService {
-	/**
-	 * Function to get the workflow Ids for a User
-	 * Overridden in EE version to ignore roles
-	 */
-	static async getWorkflowIdsForUser(user: User): Promise<string[]> {
-		// Get all workflows using owner role
-		return getSharedWorkflowIds(user, ['owner']);
-	}
-
-	/**
-	 * Helper function to retrieve count of Executions
-	 */
-	static async getExecutionsCount(
-		countFilter: IDataObject,
-		user: User,
-		metadata?: Array<{ key: string; value: string }>,
-	): Promise<{ count: number; estimated: boolean }> {
-		const dbType = config.getEnv('database.type');
-		const filteredFields = Object.keys(countFilter).filter((field) => field !== 'id');
-
-		// For databases other than Postgres, do a regular count
-		// when filtering based on `workflowId` or `finished` fields.
-		if (
-			dbType !== 'postgresdb' ||
-			metadata?.length ||
-			filteredFields.length > 0 ||
-			user.globalRole.name !== 'owner'
-		) {
-			const sharedWorkflowIds = await this.getWorkflowIdsForUser(user);
-
-			let query = Db.collections.Execution.createQueryBuilder('execution')
-				.select()
-				.orderBy('execution.id', 'DESC')
-				.where({ workflowId: In(sharedWorkflowIds) });
-
-			if (metadata?.length) {
-				query = query.leftJoinAndSelect(ExecutionMetadata, 'md', 'md.executionId = execution.id');
-				for (const md of metadata) {
-					query = query.andWhere('md.key = :key AND md.value = :value', md);
-				}
-			}
-
-			if (filteredFields.length > 0) {
-				query = query.andWhere(countFilter);
-			}
-
-			const count = await query.getCount();
-			return { count, estimated: false };
-		}
-
-		try {
-			// Get an estimate of rows count.
-			const estimateRowsNumberSql =
-				"SELECT n_live_tup FROM pg_stat_all_tables WHERE relname = 'execution_entity';";
-			const rows: Array<{ n_live_tup: string }> = await Db.collections.Execution.query(
-				estimateRowsNumberSql,
-			);
-
-			const estimate = parseInt(rows[0].n_live_tup, 10);
-			// If over 100k, return just an estimate.
-			if (estimate > 100_000) {
-				// if less than 100k, we get the real count as even a full
-				// table scan should not take so long.
-				return { count: estimate, estimated: true };
-			}
-		} catch (error) {
-			LoggerProxy.warn(`Failed to get executions count from Postgres: ${error}`);
-		}
-
-		const sharedWorkflowIds = await getSharedWorkflowIds(user);
-
-		const count = await Db.collections.Execution.count({
-			where: {
-				workflowId: In(sharedWorkflowIds),
-			},
-		});
-
-		return { count, estimated: false };
-	}
-
-	static massageFilters(filter: IDataObject): void {
-		if (filter) {
-			if (filter.waitTill === true) {
-				filter.waitTill = Not(IsNull());
-				// eslint-disable-next-line @typescript-eslint/no-unnecessary-boolean-literal-compare
-			} else if (filter.finished === false) {
-				filter.waitTill = IsNull();
-			} else {
-				delete filter.waitTill;
-			}
-
-			if (Array.isArray(filter.metadata)) {
-				delete filter.metadata;
-			}
-
-			if ('startedAfter' in filter) {
-				delete filter.startedAfter;
-			}
-
-			if ('startedBefore' in filter) {
-				delete filter.startedBefore;
-			}
-		}
-	}
-
-	static async getExecutionsList(req: ExecutionRequest.GetAll): Promise<IExecutionsListResponse> {
-		const sharedWorkflowIds = await this.getWorkflowIdsForUser(req.user);
-		if (sharedWorkflowIds.length === 0) {
-			// return early since without shared workflows there can be no hits
-			// (note: getSharedWorkflowIds() returns _all_ workflow ids for global owners)
-			return {
-				count: 0,
-				estimated: false,
-				results: [],
-			};
-		}
-
-		// parse incoming filter object and remove non-valid fields
-		let filter: IGetExecutionsQueryFilter | undefined = undefined;
-		if (req.query.filter) {
-			try {
-				const filterJson: JsonObject = jsonParse(req.query.filter);
-				if (filterJson) {
-					Object.keys(filterJson).map((key) => {
-						if (!allowedExecutionsQueryFilterFields.includes(key)) delete filterJson[key];
-					});
-					if (jsonSchemaValidate(filterJson, schemaGetExecutionsQueryFilter).valid) {
-						filter = filterJson as IGetExecutionsQueryFilter;
-					}
-				}
-			} catch (error) {
-				LoggerProxy.error('Failed to parse filter', {
-					userId: req.user.id,
-					filter: req.query.filter,
-				});
-				throw new ResponseHelper.InternalServerError(
-					'Parameter "filter" contained invalid JSON string.',
-				);
-			}
-		}
-
-		// safeguard against querying workflowIds not shared with the user
-		const workflowId = filter?.workflowId?.toString();
-		if (workflowId !== undefined && !sharedWorkflowIds.includes(workflowId)) {
-			LoggerProxy.verbose(
-				`User ${req.user.id} attempted to query non-shared workflow ${workflowId}`,
-			);
-			return {
-				count: 0,
-				estimated: false,
-				results: [],
-			};
-		}
-
-		const limit = req.query.limit
-			? parseInt(req.query.limit, 10)
-			: GenericHelpers.DEFAULT_EXECUTIONS_GET_ALL_LIMIT;
-
-		const executingWorkflowIds: string[] = [];
-
-		if (config.getEnv('executions.mode') === 'queue') {
-			const queue = Container.get(Queue);
-			const currentJobs = await queue.getJobs(['active', 'waiting']);
-			executingWorkflowIds.push(...currentJobs.map(({ data }) => data.executionId));
-		}
-
-		// We may have manual executions even with queue so we must account for these.
-		executingWorkflowIds.push(
-			...Container.get(ActiveExecutions)
-				.getActiveExecutions()
-				.map(({ id }) => id),
-		);
-
-		const findWhere: FindOptionsWhere<ExecutionEntity> = {
-			workflowId: In(sharedWorkflowIds),
-		};
-		if (filter?.status) {
-			Object.assign(findWhere, { status: In(filter.status) });
-		}
-		if (filter?.finished) {
-			Object.assign(findWhere, { finished: filter.finished });
-		}
-
-		const rangeQuery: string[] = [];
-		const rangeQueryParams: {
-			lastId?: string;
-			firstId?: string;
-			executingWorkflowIds?: string[];
-		} = {};
-
-		if (req.query.lastId) {
-			rangeQuery.push('execution.id < :lastId');
-			rangeQueryParams.lastId = req.query.lastId;
-		}
-
-		if (req.query.firstId) {
-			rangeQuery.push('execution.id > :firstId');
-			rangeQueryParams.firstId = req.query.firstId;
-		}
-
-		if (executingWorkflowIds.length > 0) {
-			rangeQuery.push('execution.id NOT IN (:...executingWorkflowIds)');
-			rangeQueryParams.executingWorkflowIds = executingWorkflowIds;
-		}
-
-		if (rangeQuery.length) {
-			Object.assign(findWhere, {
-				id: Raw(() => rangeQuery.join(' and '), rangeQueryParams),
-			});
-		}
-
-		// Omit `data` from the Execution since it is the largest and not necessary for the list.
-		let query = Db.collections.Execution.createQueryBuilder('execution')
-			.select([
-				'execution.id',
-				'execution.finished',
-				'execution.mode',
-				'execution.retryOf',
-				'execution.retrySuccessId',
-				'execution.waitTill',
-				'execution.startedAt',
-				'execution.stoppedAt',
-				'execution.workflowData',
-				'execution.status',
-			])
-			.orderBy('execution.id', 'DESC')
-			.take(limit)
-			.where(findWhere);
-
-		const countFilter = deepCopy(filter ?? {});
-		const metadata = isAdvancedExecutionFiltersEnabled() ? filter?.metadata : undefined;
-
-		if (metadata?.length) {
-			query = query.leftJoin(ExecutionMetadata, 'md', 'md.executionId = execution.id');
-			for (const md of metadata) {
-				query = query.andWhere('md.key = :key AND md.value = :value', md);
-			}
-		}
-
-		if (filter?.startedAfter) {
-			query = query.andWhere({
-				startedAt: MoreThanOrEqual(
-					DateUtils.mixedDateToUtcDatetimeString(new Date(filter.startedAfter)),
-				),
-			});
-		}
-
-		if (filter?.startedBefore) {
-			query = query.andWhere({
-				startedAt: LessThanOrEqual(
-					DateUtils.mixedDateToUtcDatetimeString(new Date(filter.startedBefore)),
-				),
-			});
-		}
-
-		// deepcopy breaks the In operator so we need to reapply it
-		if (filter?.status) {
-			Object.assign(filter, { status: In(filter.status) });
-			Object.assign(countFilter, { status: In(filter.status) });
-		}
-
-		if (filter) {
-			this.massageFilters(filter as IDataObject);
-			query = query.andWhere(filter);
-		}
-
-		this.massageFilters(countFilter as IDataObject);
-		countFilter.id = Not(In(executingWorkflowIds));
-
-		const executions = await query.getMany();
-
-		const { count, estimated } = await this.getExecutionsCount(
-			countFilter as IDataObject,
-			req.user,
-			metadata,
-		);
-
-		const formattedExecutions: IExecutionsSummary[] = executions.map((execution) => {
-			// inject potential node execution errors into the execution response
-			const nodeExecutionStatus = {};
-			let lastNodeExecuted;
-			let executionError;
-			// fill execution status for old executions that will return null
-			if (!execution.status) {
-				execution.status = getStatusUsingPreviousExecutionStatusMethod(execution);
-			}
-			try {
-				const data = parse(execution.data) as IRunExecutionData;
-				lastNodeExecuted = data?.resultData?.lastNodeExecuted ?? '';
-				executionError = data?.resultData?.error;
-				if (data?.resultData?.runData) {
-					for (const key of Object.keys(data.resultData.runData)) {
-						const errors = data.resultData.runData[key]
-							?.filter((taskdata) => taskdata.error?.name)
-							?.map((taskdata) => {
-								if (taskdata.error?.name === 'NodeOperationError') {
-									return {
-										name: (taskdata.error as NodeOperationError).name,
-										message: (taskdata.error as NodeOperationError).message,
-										description: (taskdata.error as NodeOperationError).description,
-									};
-								} else {
-									return {
-										name: taskdata.error?.name,
-									};
-								}
-							});
-						Object.assign(nodeExecutionStatus, {
-							[key]: {
-								executionStatus: data.resultData.runData[key][0].executionStatus,
-								errors,
-								data: data.resultData.runData[key][0].data ?? undefined,
-							},
-						});
-					}
-				}
-			} catch {}
-			return {
-				id: execution.id,
-				finished: execution.finished,
-				mode: execution.mode,
-				retryOf: execution.retryOf?.toString(),
-				retrySuccessId: execution?.retrySuccessId?.toString(),
-				waitTill: execution.waitTill as Date | undefined,
-				startedAt: execution.startedAt,
-				stoppedAt: execution.stoppedAt,
-				workflowId: execution.workflowData?.id ?? '',
-				workflowName: execution.workflowData?.name,
-				status: execution.status,
-				lastNodeExecuted,
-				executionError,
-				nodeExecutionStatus,
-			} as IExecutionsSummary;
-		});
-		return {
-			count,
-			results: formattedExecutions,
-			estimated,
-		};
-	}
-
-	static async getExecution(
-		req: ExecutionRequest.Get,
-	): Promise<IExecutionResponse | IExecutionFlattedResponse | undefined> {
-		const sharedWorkflowIds = await this.getWorkflowIdsForUser(req.user);
-		if (!sharedWorkflowIds.length) return undefined;
-
-		const { id: executionId } = req.params;
-		const execution = await Db.collections.Execution.findOne({
-			where: {
-				id: executionId,
-				workflowId: In(sharedWorkflowIds),
-			},
-		});
-
-		if (!execution) {
-			LoggerProxy.info('Attempt to read execution was blocked due to insufficient permissions', {
-				userId: req.user.id,
-				executionId,
-			});
-			return undefined;
-		}
-
-		if (!execution.status) {
-			execution.status = getStatusUsingPreviousExecutionStatusMethod(execution);
-		}
-
-		if (req.query.unflattedResponse === 'true') {
-			return ResponseHelper.unflattenExecutionData(execution);
-		}
-
-		// @ts-ignore
-		return execution;
-	}
-
-	static async retryExecution(req: ExecutionRequest.Retry): Promise<boolean> {
-		const sharedWorkflowIds = await this.getWorkflowIdsForUser(req.user);
-		if (!sharedWorkflowIds.length) return false;
-
-		const { id: executionId } = req.params;
-		const execution = await Db.collections.Execution.findOne({
-			where: {
-				id: executionId,
-				workflowId: In(sharedWorkflowIds),
-			},
-		});
-
-		if (!execution) {
-			LoggerProxy.info(
-				'Attempt to retry an execution was blocked due to insufficient permissions',
-				{
-					userId: req.user.id,
-					executionId,
-				},
-			);
-			throw new ResponseHelper.NotFoundError(
-				`The execution with the ID "${executionId}" does not exist.`,
-			);
-		}
-
-		const fullExecutionData = ResponseHelper.unflattenExecutionData(execution);
-
-		if (fullExecutionData.finished) {
-			throw new Error('The execution succeeded, so it cannot be retried.');
-		}
-
-		const executionMode = 'retry';
-
-		fullExecutionData.workflowData.active = false;
-
-		// Start the workflow
-		const data: IWorkflowExecutionDataProcess = {
-			executionMode,
-			executionData: fullExecutionData.data,
-			retryOf: req.params.id,
-			workflowData: fullExecutionData.workflowData,
-			userId: req.user.id,
-		};
-
-		const { lastNodeExecuted } = data.executionData!.resultData;
-
-		if (lastNodeExecuted) {
-			// Remove the old error and the data of the last run of the node that it can be replaced
-			delete data.executionData!.resultData.error;
-			const { length } = data.executionData!.resultData.runData[lastNodeExecuted];
-			if (
-				length > 0 &&
-				data.executionData!.resultData.runData[lastNodeExecuted][length - 1].error !== undefined
-			) {
-				// Remove results only if it is an error.
-				// If we are retrying due to a crash, the information is simply success info from last node
-				data.executionData!.resultData.runData[lastNodeExecuted].pop();
-				// Stack will determine what to run next
-			}
-		}
-
-		if (req.body.loadWorkflow) {
-			// Loads the currently saved workflow to execute instead of the
-			// one saved at the time of the execution.
-			const workflowId = fullExecutionData.workflowData.id as string;
-			const workflowData = (await Db.collections.Workflow.findOneBy({
-				id: workflowId,
-			})) as IWorkflowBase;
-
-			if (workflowData === undefined) {
-				throw new Error(
-					`The workflow with the ID "${workflowId}" could not be found and so the data not be loaded for the retry.`,
-				);
-			}
-
-			data.workflowData = workflowData;
-			const nodeTypes = Container.get(NodeTypes);
-			const workflowInstance = new Workflow({
-				id: workflowData.id as string,
-				name: workflowData.name,
-				nodes: workflowData.nodes,
-				connections: workflowData.connections,
-				active: false,
-				nodeTypes,
-				staticData: undefined,
-				settings: workflowData.settings,
-			});
-
-			// Replace all of the nodes in the execution stack with the ones of the new workflow
-			for (const stack of data.executionData!.executionData!.nodeExecutionStack) {
-				// Find the data of the last executed node in the new workflow
-				const node = workflowInstance.getNode(stack.node.name);
-				if (node === null) {
-					LoggerProxy.error('Failed to retry an execution because a node could not be found', {
-						userId: req.user.id,
-						executionId,
-						nodeName: stack.node.name,
-					});
-					throw new Error(
-						`Could not find the node "${stack.node.name}" in workflow. It probably got deleted or renamed. Without it the workflow can sadly not be retried.`,
-					);
-				}
-
-				// Replace the node data in the stack that it really uses the current data
-				stack.node = node;
-			}
-		}
-
-		const workflowRunner = new WorkflowRunner();
-		const retriedExecutionId = await workflowRunner.run(data);
-
-		const executionData = await Container.get(ActiveExecutions).getPostExecutePromise(
-			retriedExecutionId,
-		);
-
-		if (!executionData) {
-			throw new Error('The retry did not start for an unknown reason.');
-		}
-
-		return !!executionData.finished;
-	}
-
-	static async deleteExecutions(req: ExecutionRequest.Delete): Promise<void> {
-		const sharedWorkflowIds = await this.getWorkflowIdsForUser(req.user);
-		if (sharedWorkflowIds.length === 0) {
-			// return early since without shared workflows there can be no hits
-			// (note: getSharedWorkflowIds() returns _all_ workflow ids for global owners)
-			return;
-		}
-		const { deleteBefore, ids, filters: requestFiltersRaw } = req.body;
-		let requestFilters;
-		if (requestFiltersRaw) {
-			try {
-				Object.keys(requestFiltersRaw).map((key) => {
-					if (!allowedExecutionsQueryFilterFields.includes(key)) delete requestFiltersRaw[key];
-				});
-				if (jsonSchemaValidate(requestFiltersRaw, schemaGetExecutionsQueryFilter).valid) {
-					requestFilters = requestFiltersRaw as IGetExecutionsQueryFilter;
-				}
-			} catch (error) {
-				throw new ResponseHelper.InternalServerError(
-					'Parameter "filter" contained invalid JSON string.',
-				);
-			}
-		}
-
-		if (!deleteBefore && !ids) {
-			throw new Error('Either "deleteBefore" or "ids" must be present in the request body');
-		}
-
-		const where: FindOptionsWhere<ExecutionEntity> = { workflowId: In(sharedWorkflowIds) };
-
-		if (deleteBefore) {
-			// delete executions by date, if user may access the underlying workflows
-			where.startedAt = LessThanOrEqual(deleteBefore);
-			Object.assign(where, requestFilters);
-			if (where.status) {
-				where.status = In(requestFiltersRaw!.status as string[]);
-			}
-		} else if (ids) {
-			// delete executions by IDs, if user may access the underlying workflows
-			where.id = In(ids);
-		} else return;
-
-		const executions = await Db.collections.Execution.find({
-			select: ['id'],
-			where,
-		});
-
-		if (!executions.length) {
-			if (ids) {
-				LoggerProxy.error('Failed to delete an execution due to insufficient permissions', {
-					userId: req.user.id,
-					executionIds: ids,
-				});
-			}
-			return;
-		}
-
-		const idsToDelete = executions.map(({ id }) => id);
-
-		const binaryDataManager = BinaryDataManager.getInstance();
-		await Promise.all(
-			idsToDelete.map(async (id) => binaryDataManager.deleteBinaryDataByExecutionId(id)),
-		);
-
-		do {
-			// Delete in batches to avoid "SQLITE_ERROR: Expression tree is too large (maximum depth 1000)" error
-			const batch = idsToDelete.splice(0, 500);
-			await Db.collections.Execution.delete(batch);
-		} while (idsToDelete.length > 0);
-	}
-}
diff --git a/packages/cli/src/executions/parse-range-query.middleware.ts b/packages/cli/src/executions/parse-range-query.middleware.ts
new file mode 100644
index 0000000000000..528c00f676e94
--- /dev/null
+++ b/packages/cli/src/executions/parse-range-query.middleware.ts
@@ -0,0 +1,56 @@
+import * as ResponseHelper from '@/ResponseHelper';
+import type { NextFunction, Response } from 'express';
+import type { ExecutionRequest } from './execution.types';
+import type { JsonObject } from 'n8n-workflow';
+import { ApplicationError, jsonParse } from 'n8n-workflow';
+import {
+	allowedExecutionsQueryFilterFields as ALLOWED_FILTER_FIELDS,
+	schemaGetExecutionsQueryFilter as SCHEMA,
+} from './execution.service';
+import { validate } from 'jsonschema';
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
+
+const isValid = (arg: JsonObject) => validate(arg, SCHEMA).valid;
+
+/**
+ * Middleware to parse the query string in a request to retrieve a range of execution summaries.
+ */
+export const parseRangeQuery = (
+	req: ExecutionRequest.GetMany,
+	res: Response,
+	next: NextFunction,
+) => {
+	const { limit, firstId, lastId } = req.query;
+
+	try {
+		req.rangeQuery = {
+			kind: 'range',
+			range: { limit: limit ? Math.min(parseInt(limit, 10), 100) : 20 },
+		};
+
+		if (firstId) req.rangeQuery.range.firstId = firstId;
+		if (lastId) req.rangeQuery.range.lastId = lastId;
+
+		if (req.query.filter) {
+			const jsonFilter = jsonParse<JsonObject>(req.query.filter, {
+				errorMessage: 'Failed to parse query string',
+			});
+
+			for (const key of Object.keys(jsonFilter)) {
+				if (!ALLOWED_FILTER_FIELDS.includes(key)) delete jsonFilter[key];
+			}
+
+			if (jsonFilter.waitTill) jsonFilter.waitTill = Boolean(jsonFilter.waitTill);
+
+			if (!isValid(jsonFilter)) throw new ApplicationError('Query does not match schema');
+
+			req.rangeQuery = { ...req.rangeQuery, ...jsonFilter };
+		}
+
+		next();
+	} catch (error) {
+		if (error instanceof Error) {
+			ResponseHelper.sendErrorResponse(res, new BadRequestError(error.message));
+		}
+	}
+};
diff --git a/packages/cli/src/help.ts b/packages/cli/src/help.ts
new file mode 100644
index 0000000000000..8581483577402
--- /dev/null
+++ b/packages/cli/src/help.ts
@@ -0,0 +1,13 @@
+import { Help } from '@oclif/core';
+import Container from 'typedi';
+import { Logger } from 'winston';
+
+// oclif expects a default export
+// eslint-disable-next-line import/no-default-export
+export default class CustomHelp extends Help {
+	async showRootHelp() {
+		Container.get(Logger).info(
+			'You can find up to date information about the CLI here:\nhttps://docs.n8n.io/hosting/cli-commands/',
+		);
+	}
+}
diff --git a/packages/cli/src/helpers/decodeWebhookResponse.ts b/packages/cli/src/helpers/decodeWebhookResponse.ts
new file mode 100644
index 0000000000000..dd0e464b5e992
--- /dev/null
+++ b/packages/cli/src/helpers/decodeWebhookResponse.ts
@@ -0,0 +1,18 @@
+import { BINARY_ENCODING, type IDataObject, type IExecuteResponsePromiseData } from 'n8n-workflow';
+
+export function decodeWebhookResponse(
+	response: IExecuteResponsePromiseData,
+): IExecuteResponsePromiseData {
+	if (
+		typeof response === 'object' &&
+		typeof response.body === 'object' &&
+		(response.body as IDataObject)['__@N8nEncodedBuffer@__']
+	) {
+		response.body = Buffer.from(
+			(response.body as IDataObject)['__@N8nEncodedBuffer@__'] as string,
+			BINARY_ENCODING,
+		);
+	}
+
+	return response;
+}
diff --git a/packages/cli/src/license/License.service.ts b/packages/cli/src/license/License.service.ts
deleted file mode 100644
index adba06ca9c8ab..0000000000000
--- a/packages/cli/src/license/License.service.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { Container } from 'typedi';
-import { License } from '@/License';
-import type { ILicenseReadResponse } from '@/Interfaces';
-import * as Db from '@/Db';
-
-export class LicenseService {
-	static async getActiveTriggerCount(): Promise<number> {
-		const totalTriggerCount = await Db.collections.Workflow.sum('triggerCount', { active: true });
-		return totalTriggerCount ?? 0;
-	}
-
-	// Helper for getting the basic license data that we want to return
-	static async getLicenseData(): Promise<ILicenseReadResponse> {
-		const triggerCount = await LicenseService.getActiveTriggerCount();
-		const license = Container.get(License);
-		const mainPlan = license.getMainPlan();
-
-		return {
-			usage: {
-				executions: {
-					value: triggerCount,
-					limit: license.getTriggerLimit(),
-					warningThreshold: 0.8,
-				},
-			},
-			license: {
-				planId: mainPlan?.productId ?? '',
-				planName: license.getPlanName(),
-			},
-		};
-	}
-}
diff --git a/packages/cli/src/license/license.controller.ts b/packages/cli/src/license/license.controller.ts
index e5dd13a18ba9c..086ab3d4f87b1 100644
--- a/packages/cli/src/license/license.controller.ts
+++ b/packages/cli/src/license/license.controller.ts
@@ -1,137 +1,34 @@
-/* eslint-disable no-param-reassign */
+import { Get, Post, GlobalScope, RestController } from '@/decorators';
+import { LicenseRequest } from '@/requests';
+import { LicenseService } from './license.service';
 
-import express from 'express';
-import { LoggerProxy } from 'n8n-workflow';
+@RestController('/license')
+export class LicenseController {
+	constructor(private readonly licenseService: LicenseService) {}
 
-import { getLogger } from '@/Logger';
-import * as ResponseHelper from '@/ResponseHelper';
-import type { ILicensePostResponse, ILicenseReadResponse } from '@/Interfaces';
-import { LicenseService } from './License.service';
-import { License } from '@/License';
-import type { AuthenticatedRequest, LicenseRequest } from '@/requests';
-import { isInstanceOwner } from '@/PublicApi/v1/handlers/users/users.service';
-import { Container } from 'typedi';
-import { InternalHooks } from '@/InternalHooks';
-
-export const licenseController = express.Router();
-
-const OWNER_ROUTES = ['/activate', '/renew'];
-
-/**
- * Initialize Logger if needed
- */
-licenseController.use((req, res, next) => {
-	try {
-		LoggerProxy.getInstance();
-	} catch (error) {
-		LoggerProxy.init(getLogger());
+	@Get('/')
+	async getLicenseData() {
+		return await this.licenseService.getLicenseData();
 	}
-	next();
-});
 
-/**
- * Owner checking
- */
-licenseController.use((req: AuthenticatedRequest, res, next) => {
-	if (OWNER_ROUTES.includes(req.path) && req.user) {
-		if (!isInstanceOwner(req.user)) {
-			LoggerProxy.info('Non-owner attempted to activate or renew a license', {
-				userId: req.user.id,
-			});
-			ResponseHelper.sendErrorResponse(
-				res,
-				new ResponseHelper.UnauthorizedError(
-					'Only an instance owner may activate or renew a license',
-				),
-			);
-			return;
-		}
+	@Post('/activate')
+	@GlobalScope('license:manage')
+	async activateLicense(req: LicenseRequest.Activate) {
+		const { activationKey } = req.body;
+		await this.licenseService.activateLicense(activationKey);
+		return await this.getTokenAndData();
 	}
-	next();
-});
-
-/**
- * GET /license
- * Get the license data, usable by everyone
- */
-licenseController.get(
-	'/',
-	ResponseHelper.send(async (): Promise<ILicenseReadResponse> => {
-		return LicenseService.getLicenseData();
-	}),
-);
-
-/**
- * POST /license/activate
- * Only usable by the instance owner, activates a license.
- */
-licenseController.post(
-	'/activate',
-	ResponseHelper.send(async (req: LicenseRequest.Activate): Promise<ILicensePostResponse> => {
-		// Call the license manager activate function and tell it to throw an error
-		const license = Container.get(License);
-		try {
-			await license.activate(req.body.activationKey);
-		} catch (e) {
-			const error = e as Error & { errorId?: string };
-
-			//override specific error messages (to map License Server vocabulary to n8n terms)
-			switch (error.errorId ?? 'UNSPECIFIED') {
-				case 'SCHEMA_VALIDATION':
-					error.message = 'Activation key is in the wrong format';
-					break;
-				case 'RESERVATION_EXHAUSTED':
-					error.message =
-						'Activation key has been used too many times. Please contact sales@n8n.io if you would like to extend it';
-					break;
-				case 'RESERVATION_EXPIRED':
-					error.message = 'Activation key has expired';
-					break;
-				case 'NOT_FOUND':
-				case 'RESERVATION_CONFLICT':
-					error.message = 'Activation key not found';
-					break;
-			}
 
-			throw new ResponseHelper.BadRequestError(error.message);
-		}
-
-		// Return the read data, plus the management JWT
-		return {
-			managementToken: license.getManagementJwt(),
-			...(await LicenseService.getLicenseData()),
-		};
-	}),
-);
-
-/**
- * POST /license/renew
- * Only usable by instance owner, renews a license
- */
-licenseController.post(
-	'/renew',
-	ResponseHelper.send(async (): Promise<ILicensePostResponse> => {
-		// Call the license manager activate function and tell it to throw an error
-		const license = Container.get(License);
-		try {
-			await license.renew();
-		} catch (e) {
-			const error = e as Error & { errorId?: string };
-
-			// not awaiting so as not to make the endpoint hang
-			void Container.get(InternalHooks).onLicenseRenewAttempt({ success: false });
-			if (error instanceof Error) {
-				throw new ResponseHelper.BadRequestError(error.message);
-			}
-		}
-
-		// not awaiting so as not to make the endpoint hang
-		void Container.get(InternalHooks).onLicenseRenewAttempt({ success: true });
+	@Post('/renew')
+	@GlobalScope('license:manage')
+	async renewLicense() {
+		await this.licenseService.renewLicense();
+		return await this.getTokenAndData();
+	}
 
-		// Return the read data, plus the management JWT
-		return {
-			managementToken: license.getManagementJwt(),
-			...(await LicenseService.getLicenseData()),
-		};
-	}),
-);
+	private async getTokenAndData() {
+		const managementToken = this.licenseService.getManagementJwt();
+		const data = await this.licenseService.getLicenseData();
+		return { ...data, managementToken };
+	}
+}
diff --git a/packages/cli/src/license/license.service.ts b/packages/cli/src/license/license.service.ts
new file mode 100644
index 0000000000000..32d30b16c57a1
--- /dev/null
+++ b/packages/cli/src/license/license.service.ts
@@ -0,0 +1,83 @@
+import { Service } from 'typedi';
+import { Logger } from '@/Logger';
+import { License } from '@/License';
+import { InternalHooks } from '@/InternalHooks';
+import { WorkflowRepository } from '@db/repositories/workflow.repository';
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
+
+type LicenseError = Error & { errorId?: keyof typeof LicenseErrors };
+
+export const LicenseErrors = {
+	SCHEMA_VALIDATION: 'Activation key is in the wrong format',
+	RESERVATION_EXHAUSTED:
+		'Activation key has been used too many times. Please contact sales@n8n.io if you would like to extend it',
+	RESERVATION_EXPIRED: 'Activation key has expired',
+	NOT_FOUND: 'Activation key not found',
+	RESERVATION_CONFLICT: 'Activation key not found',
+	RESERVATION_DUPLICATE: 'Activation key has already been used on this instance',
+};
+
+@Service()
+export class LicenseService {
+	constructor(
+		private readonly logger: Logger,
+		private readonly license: License,
+		private readonly internalHooks: InternalHooks,
+		private readonly workflowRepository: WorkflowRepository,
+	) {}
+
+	async getLicenseData() {
+		const triggerCount = await this.workflowRepository.getActiveTriggerCount();
+		const mainPlan = this.license.getMainPlan();
+
+		return {
+			usage: {
+				executions: {
+					value: triggerCount,
+					limit: this.license.getTriggerLimit(),
+					warningThreshold: 0.8,
+				},
+			},
+			license: {
+				planId: mainPlan?.productId ?? '',
+				planName: this.license.getPlanName(),
+			},
+		};
+	}
+
+	getManagementJwt(): string {
+		return this.license.getManagementJwt();
+	}
+
+	async activateLicense(activationKey: string) {
+		try {
+			await this.license.activate(activationKey);
+		} catch (e) {
+			const message = this.mapErrorMessage(e as LicenseError, 'activate');
+			throw new BadRequestError(message);
+		}
+	}
+
+	async renewLicense() {
+		try {
+			await this.license.renew();
+		} catch (e) {
+			const message = this.mapErrorMessage(e as LicenseError, 'renew');
+			// not awaiting so as not to make the endpoint hang
+			void this.internalHooks.onLicenseRenewAttempt({ success: false });
+			throw new BadRequestError(message);
+		}
+
+		// not awaiting so as not to make the endpoint hang
+		void this.internalHooks.onLicenseRenewAttempt({ success: true });
+	}
+
+	private mapErrorMessage(error: LicenseError, action: 'activate' | 'renew') {
+		let message = error.errorId && LicenseErrors[error.errorId];
+		if (!message) {
+			message = `Failed to ${action} license: ${error.message}`;
+			this.logger.error(message, { stack: error.stack ?? 'n/a' });
+		}
+		return message;
+	}
+}
diff --git a/packages/cli/src/metrics/index.ts b/packages/cli/src/metrics/index.ts
deleted file mode 100644
index c437ce230bc21..0000000000000
--- a/packages/cli/src/metrics/index.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-/* eslint-disable @typescript-eslint/no-use-before-define */
-import config from '@/config';
-import { N8N_VERSION } from '@/constants';
-import * as ResponseHelper from '@/ResponseHelper';
-import type express from 'express';
-import promBundle from 'express-prom-bundle';
-import promClient from 'prom-client';
-import semverParse from 'semver/functions/parse';
-
-export { promClient };
-
-export function configureMetrics(app: express.Application) {
-	if (!config.getEnv('endpoints.metrics.enable')) {
-		return;
-	}
-
-	setupDefaultMetrics();
-	setupN8nVersionMetric();
-	setupApiMetrics(app);
-	mountMetricsEndpoint(app);
-}
-
-function setupN8nVersionMetric() {
-	const n8nVersion = semverParse(N8N_VERSION || '0.0.0');
-
-	if (n8nVersion) {
-		const versionGauge = new promClient.Gauge({
-			name: config.getEnv('endpoints.metrics.prefix') + 'version_info',
-			help: 'n8n version info.',
-			labelNames: ['version', 'major', 'minor', 'patch'],
-		});
-
-		versionGauge.set(
-			{
-				version: 'v' + n8nVersion.version,
-				major: n8nVersion.major,
-				minor: n8nVersion.minor,
-				patch: n8nVersion.patch,
-			},
-			1,
-		);
-	}
-}
-
-function setupDefaultMetrics() {
-	if (config.getEnv('endpoints.metrics.includeDefaultMetrics')) {
-		promClient.collectDefaultMetrics();
-	}
-}
-
-function setupApiMetrics(app: express.Application) {
-	if (config.getEnv('endpoints.metrics.includeApiEndpoints')) {
-		const metricsMiddleware = promBundle({
-			autoregister: false,
-			includeUp: false,
-			includePath: config.getEnv('endpoints.metrics.includeApiPathLabel'),
-			includeMethod: config.getEnv('endpoints.metrics.includeApiMethodLabel'),
-			includeStatusCode: config.getEnv('endpoints.metrics.includeApiStatusCodeLabel'),
-		});
-
-		app.use(['/rest/', '/webhook/', 'webhook-test/', '/api/'], metricsMiddleware);
-	}
-}
-
-function mountMetricsEndpoint(app: express.Application) {
-	app.get('/metrics', async (req: express.Request, res: express.Response) => {
-		const response = await promClient.register.metrics();
-		res.setHeader('Content-Type', promClient.register.contentType);
-		ResponseHelper.sendSuccessResponse(res, response, true, 200);
-	});
-}
diff --git a/packages/cli/src/middlewares/auth.ts b/packages/cli/src/middlewares/auth.ts
deleted file mode 100644
index 606eca0e90100..0000000000000
--- a/packages/cli/src/middlewares/auth.ts
+++ /dev/null
@@ -1,121 +0,0 @@
-import type { Application, NextFunction, Request, RequestHandler, Response } from 'express';
-import jwt from 'jsonwebtoken';
-import cookieParser from 'cookie-parser';
-import passport from 'passport';
-import { Strategy } from 'passport-jwt';
-import { sync as globSync } from 'fast-glob';
-import { LoggerProxy as Logger } from 'n8n-workflow';
-import type { JwtPayload } from '@/Interfaces';
-import type { AuthenticatedRequest } from '@/requests';
-import config from '@/config';
-import { AUTH_COOKIE_NAME, EDITOR_UI_DIST_DIR } from '@/constants';
-import { issueCookie, resolveJwtContent } from '@/auth/jwt';
-import { isUserManagementEnabled } from '@/UserManagement/UserManagementHelper';
-import type { UserRepository } from '@db/repositories';
-
-const jwtFromRequest = (req: Request) => {
-	// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-	return (req.cookies?.[AUTH_COOKIE_NAME] as string | undefined) ?? null;
-};
-
-const jwtAuth = (): RequestHandler => {
-	const jwtStrategy = new Strategy(
-		{
-			jwtFromRequest,
-			secretOrKey: config.getEnv('userManagement.jwtSecret'),
-		},
-		async (jwtPayload: JwtPayload, done) => {
-			try {
-				const user = await resolveJwtContent(jwtPayload);
-				return done(null, user);
-			} catch (error) {
-				Logger.debug('Failed to extract user from JWT payload', { jwtPayload });
-				return done(null, false, { message: 'User not found' });
-			}
-		},
-	);
-
-	passport.use(jwtStrategy);
-	return passport.initialize();
-};
-
-/**
- * middleware to refresh cookie before it expires
- */
-const refreshExpiringCookie: RequestHandler = async (req: AuthenticatedRequest, res, next) => {
-	const cookieAuth = jwtFromRequest(req);
-	if (cookieAuth && req.user) {
-		const cookieContents = jwt.decode(cookieAuth) as JwtPayload & { exp: number };
-		if (cookieContents.exp * 1000 - Date.now() < 259200000) {
-			// if cookie expires in < 3 days, renew it.
-			await issueCookie(res, req.user);
-		}
-	}
-	next();
-};
-
-const passportMiddleware = passport.authenticate('jwt', { session: false }) as RequestHandler;
-
-const staticAssets = globSync(['**/*.html', '**/*.svg', '**/*.png', '**/*.ico'], {
-	cwd: EDITOR_UI_DIST_DIR,
-});
-
-// TODO: delete this
-const isPostUsersId = (req: Request, restEndpoint: string): boolean =>
-	req.method === 'POST' &&
-	new RegExp(`/${restEndpoint}/users/[\\w\\d-]*`).test(req.url) &&
-	!req.url.includes('reinvite');
-
-const isAuthExcluded = (url: string, ignoredEndpoints: Readonly<string[]>): boolean =>
-	!!ignoredEndpoints
-		.filter(Boolean) // skip empty paths
-		.find((ignoredEndpoint) => url.startsWith(`/${ignoredEndpoint}`));
-
-/**
- * This sets up the auth middlewares in the correct order
- */
-export const setupAuthMiddlewares = (
-	app: Application,
-	ignoredEndpoints: Readonly<string[]>,
-	restEndpoint: string,
-	userRepository: UserRepository,
-) => {
-	// needed for testing; not adding overhead since it directly returns if req.cookies exists
-	app.use(cookieParser());
-	app.use(jwtAuth());
-
-	app.use(async (req: Request, res: Response, next: NextFunction) => {
-		if (
-			// TODO: refactor me!!!
-			// skip authentication for preflight requests
-			req.method === 'OPTIONS' ||
-			staticAssets.includes(req.url.slice(1)) ||
-			isAuthExcluded(req.url, ignoredEndpoints) ||
-			req.url.startsWith(`/${restEndpoint}/settings`) ||
-			req.url.startsWith(`/${restEndpoint}/login`) ||
-			req.url.startsWith(`/${restEndpoint}/otp-secret`) ||
-			req.url.startsWith(`/${restEndpoint}/resolve-signup-token`) ||
-			isPostUsersId(req, restEndpoint) ||
-			req.url.startsWith(`/${restEndpoint}/forgot-password`) ||
-			req.url.startsWith(`/${restEndpoint}/resolve-password-token`) ||
-			req.url.startsWith(`/${restEndpoint}/change-password`) ||
-			req.url.startsWith(`/${restEndpoint}/oauth2-credential/callback`) ||
-			req.url.startsWith(`/${restEndpoint}/oauth1-credential/callback`)
-		) {
-			return next();
-		}
-
-		// skip authentication if user management is disabled
-		if (!isUserManagementEnabled()) {
-			req.user = await userRepository.findOneOrFail({
-				relations: ['globalRole'],
-				where: {},
-			});
-			return next();
-		}
-
-		return passportMiddleware(req, res, next);
-	});
-
-	app.use(refreshExpiringCookie);
-};
diff --git a/packages/cli/src/middlewares/basicAuth.ts b/packages/cli/src/middlewares/basicAuth.ts
deleted file mode 100644
index 7e41972fed20b..0000000000000
--- a/packages/cli/src/middlewares/basicAuth.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import type { Application } from 'express';
-import basicAuth from 'basic-auth';
-// IMPORTANT! Do not switch to anther bcrypt library unless really necessary and
-// tested with all possible systems like Windows, Alpine on ARM, FreeBSD, ...
-import { compare } from 'bcryptjs';
-import type { Config } from '@/config';
-import { basicAuthAuthorizationError } from '@/ResponseHelper';
-
-export const setupBasicAuth = async (app: Application, config: Config, authIgnoreRegex: RegExp) => {
-	const basicAuthUser = config.getEnv('security.basicAuth.user');
-	if (basicAuthUser === '') {
-		throw new Error('Basic auth is activated but no user got defined. Please set one!');
-	}
-
-	const basicAuthPassword = config.getEnv('security.basicAuth.password');
-	if (basicAuthPassword === '') {
-		throw new Error('Basic auth is activated but no password got defined. Please set one!');
-	}
-
-	const basicAuthHashEnabled = config.getEnv('security.basicAuth.hash');
-
-	let validPassword: null | string = null;
-
-	app.use(async (req, res, next) => {
-		// Skip basic auth for a few listed endpoints or when instance owner has been setup
-		if (authIgnoreRegex.exec(req.url) || config.getEnv('userManagement.isInstanceOwnerSetUp')) {
-			return next();
-		}
-		const realm = 'n8n - Editor UI';
-		const basicAuthData = basicAuth(req);
-
-		if (basicAuthData === undefined) {
-			// Authorization data is missing
-			return basicAuthAuthorizationError(res, realm, 'Authorization is required!');
-		}
-
-		if (basicAuthData.name === basicAuthUser) {
-			if (basicAuthHashEnabled) {
-				if (validPassword === null && (await compare(basicAuthData.pass, basicAuthPassword))) {
-					// Password is valid so save for future requests
-					validPassword = basicAuthData.pass;
-				}
-
-				if (validPassword === basicAuthData.pass && validPassword !== null) {
-					// Provided hash is correct
-					return next();
-				}
-			} else if (basicAuthData.pass === basicAuthPassword) {
-				// Provided password is correct
-				return next();
-			}
-		}
-
-		// Provided authentication data is wrong
-		return basicAuthAuthorizationError(res, realm, 'Authorization data is wrong!');
-	});
-};
diff --git a/packages/cli/src/middlewares/bodyParser.ts b/packages/cli/src/middlewares/bodyParser.ts
new file mode 100644
index 0000000000000..f7ee9615b427b
--- /dev/null
+++ b/packages/cli/src/middlewares/bodyParser.ts
@@ -0,0 +1,77 @@
+import getRawBody from 'raw-body';
+import { type Readable } from 'stream';
+import { createGunzip, createInflate } from 'zlib';
+import type { Request, RequestHandler } from 'express';
+import { parse as parseQueryString } from 'querystring';
+import { Parser as XmlParser } from 'xml2js';
+import { parseIncomingMessage } from 'n8n-core';
+import { jsonParse } from 'n8n-workflow';
+import config from '@/config';
+import { UnprocessableRequestError } from '@/errors/response-errors/unprocessable.error';
+
+const xmlParser = new XmlParser({
+	async: true,
+	normalize: true, // Trim whitespace inside text nodes
+	normalizeTags: true, // Transform tags to lowercase
+	explicitArray: false, // Only put properties in array if length > 1
+});
+
+const payloadSizeMax = config.getEnv('endpoints.payloadSizeMax');
+export const rawBodyReader: RequestHandler = async (req, res, next) => {
+	parseIncomingMessage(req);
+
+	req.readRawBody = async () => {
+		if (!req.rawBody) {
+			let stream: Readable = req;
+			let contentLength: string | undefined;
+			const contentEncoding = req.headers['content-encoding'];
+			switch (contentEncoding) {
+				case 'gzip':
+					stream = req.pipe(createGunzip());
+					break;
+				case 'deflate':
+					stream = req.pipe(createInflate());
+					break;
+				default:
+					contentLength = req.headers['content-length'];
+			}
+			req.rawBody = await getRawBody(stream, {
+				length: contentLength,
+				limit: `${String(payloadSizeMax)}mb`,
+			});
+			req._body = true;
+		}
+	};
+
+	next();
+};
+
+export const parseBody = async (req: Request) => {
+	await req.readRawBody();
+	const { rawBody, contentType, encoding } = req;
+	if (rawBody?.length) {
+		try {
+			if (contentType === 'application/json') {
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+				req.body = jsonParse(rawBody.toString(encoding));
+			} else if (contentType?.endsWith('/xml') || contentType?.endsWith('+xml')) {
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+				req.body = await xmlParser.parseStringPromise(rawBody.toString(encoding));
+			} else if (contentType === 'application/x-www-form-urlencoded') {
+				req.body = parseQueryString(rawBody.toString(encoding), undefined, undefined, {
+					maxKeys: 1000,
+				});
+			} else if (contentType === 'text/plain') {
+				req.body = rawBody.toString(encoding);
+			}
+		} catch (error) {
+			throw new UnprocessableRequestError('Failed to parse request body', (error as Error).message);
+		}
+	}
+};
+
+export const bodyParser: RequestHandler = async (req, res, next) => {
+	await parseBody(req);
+	if (!req.body) req.body = {};
+	next();
+};
diff --git a/packages/cli/src/middlewares/cors.ts b/packages/cli/src/middlewares/cors.ts
index a6c33dd55d4e5..d22b5a14f55f3 100644
--- a/packages/cli/src/middlewares/cors.ts
+++ b/packages/cli/src/middlewares/cors.ts
@@ -8,7 +8,7 @@ export const corsMiddleware: RequestHandler = (req, res, next) => {
 		res.header('Access-Control-Allow-Methods', 'GET, POST, OPTIONS, PUT, PATCH, DELETE');
 		res.header(
 			'Access-Control-Allow-Headers',
-			'Origin, X-Requested-With, Content-Type, Accept, sessionid',
+			'Origin, X-Requested-With, Content-Type, Accept, push-ref, browser-id',
 		);
 	}
 
diff --git a/packages/cli/src/middlewares/externalJWTAuth.ts b/packages/cli/src/middlewares/externalJWTAuth.ts
deleted file mode 100644
index 91f622312d95e..0000000000000
--- a/packages/cli/src/middlewares/externalJWTAuth.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-import type { Application } from 'express';
-import jwt from 'jsonwebtoken';
-import jwks from 'jwks-rsa';
-import type { Config } from '@/config';
-import { jwtAuthAuthorizationError } from '@/ResponseHelper';
-
-export const setupExternalJWTAuth = async (
-	app: Application,
-	config: Config,
-	authIgnoreRegex: RegExp,
-) => {
-	const jwtAuthHeader = config.getEnv('security.jwtAuth.jwtHeader');
-	if (jwtAuthHeader === '') {
-		throw new Error('JWT auth is activated but no request header was defined. Please set one!');
-	}
-
-	const jwksUri = config.getEnv('security.jwtAuth.jwksUri');
-	if (jwksUri === '') {
-		throw new Error('JWT auth is activated but no JWK Set URI was defined. Please set one!');
-	}
-
-	const jwtHeaderValuePrefix = config.getEnv('security.jwtAuth.jwtHeaderValuePrefix');
-	const jwtIssuer = config.getEnv('security.jwtAuth.jwtIssuer');
-	const jwtNamespace = config.getEnv('security.jwtAuth.jwtNamespace');
-	const jwtAllowedTenantKey = config.getEnv('security.jwtAuth.jwtAllowedTenantKey');
-	const jwtAllowedTenant = config.getEnv('security.jwtAuth.jwtAllowedTenant');
-
-	// eslint-disable-next-line no-inner-declarations
-	function isTenantAllowed(decodedToken: object): boolean {
-		if (jwtNamespace === '' || jwtAllowedTenantKey === '' || jwtAllowedTenant === '') {
-			return true;
-		}
-
-		for (const [k, v] of Object.entries(decodedToken)) {
-			if (k === jwtNamespace) {
-				// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-				for (const [kn, kv] of Object.entries(v)) {
-					if (kn === jwtAllowedTenantKey && kv === jwtAllowedTenant) {
-						return true;
-					}
-				}
-			}
-		}
-
-		return false;
-	}
-
-	// eslint-disable-next-line consistent-return
-	app.use((req, res, next) => {
-		if (authIgnoreRegex.exec(req.url)) {
-			return next();
-		}
-
-		let token = req.header(jwtAuthHeader) as string;
-		if (token === undefined || token === '') {
-			return jwtAuthAuthorizationError(res, 'Missing token');
-		}
-
-		if (jwtHeaderValuePrefix !== '' && token.startsWith(jwtHeaderValuePrefix)) {
-			token = token.replace(`${jwtHeaderValuePrefix} `, '').trimStart();
-		}
-
-		const jwkClient = jwks({ cache: true, jwksUri });
-		const getKey: jwt.GetPublicKeyOrSecret = (header, callbackFn) => {
-			// eslint-disable-next-line @typescript-eslint/no-throw-literal
-			if (!header.kid) throw jwtAuthAuthorizationError(res, 'No JWT key found');
-			jwkClient.getSigningKey(header.kid, (error, key) => {
-				// eslint-disable-next-line @typescript-eslint/no-throw-literal
-				if (error) throw jwtAuthAuthorizationError(res, error.message);
-				callbackFn(null, key?.getPublicKey());
-			});
-		};
-
-		const jwtVerifyOptions: jwt.VerifyOptions = {
-			issuer: jwtIssuer !== '' ? jwtIssuer : undefined,
-			ignoreExpiration: false,
-		};
-
-		jwt.verify(token, getKey, jwtVerifyOptions, (error: jwt.VerifyErrors, decoded: object) => {
-			if (error) {
-				jwtAuthAuthorizationError(res, 'Invalid token');
-			} else if (!isTenantAllowed(decoded)) {
-				jwtAuthAuthorizationError(res, 'Tenant not allowed');
-			} else {
-				next();
-			}
-		});
-	});
-};
diff --git a/packages/cli/src/middlewares/index.ts b/packages/cli/src/middlewares/index.ts
index e287c326a2487..75ebae01c66fe 100644
--- a/packages/cli/src/middlewares/index.ts
+++ b/packages/cli/src/middlewares/index.ts
@@ -1,2 +1,3 @@
-export * from './auth';
+export * from './bodyParser';
 export * from './cors';
+export * from './listQuery';
diff --git a/packages/cli/src/middlewares/listQuery/dtos/base.filter.dto.ts b/packages/cli/src/middlewares/listQuery/dtos/base.filter.dto.ts
new file mode 100644
index 0000000000000..d57def77cffb1
--- /dev/null
+++ b/packages/cli/src/middlewares/listQuery/dtos/base.filter.dto.ts
@@ -0,0 +1,30 @@
+/* eslint-disable @typescript-eslint/naming-convention */
+
+import { isObjectLiteral } from '@/utils';
+import { plainToInstance, instanceToPlain } from 'class-transformer';
+import { validate } from 'class-validator';
+import { ApplicationError, jsonParse } from 'n8n-workflow';
+
+export class BaseFilter {
+	protected static async toFilter(rawFilter: string, Filter: typeof BaseFilter) {
+		const dto = jsonParse(rawFilter, { errorMessage: 'Failed to parse filter JSON' });
+
+		if (!isObjectLiteral(dto)) throw new ApplicationError('Filter must be an object literal');
+
+		const instance = plainToInstance(Filter, dto, {
+			excludeExtraneousValues: true, // remove fields not in class
+		});
+
+		await instance.validate();
+
+		return instanceToPlain(instance, {
+			exposeUnsetFields: false, // remove in-class undefined fields
+		});
+	}
+
+	private async validate() {
+		const result = await validate(this);
+
+		if (result.length > 0) throw new ApplicationError('Parsed filter does not fit the schema');
+	}
+}
diff --git a/packages/cli/src/middlewares/listQuery/dtos/base.select.dto.ts b/packages/cli/src/middlewares/listQuery/dtos/base.select.dto.ts
new file mode 100644
index 0000000000000..fc947fdcc843d
--- /dev/null
+++ b/packages/cli/src/middlewares/listQuery/dtos/base.select.dto.ts
@@ -0,0 +1,19 @@
+/* eslint-disable @typescript-eslint/naming-convention */
+
+import { isStringArray } from '@/utils';
+import { ApplicationError, jsonParse } from 'n8n-workflow';
+
+export class BaseSelect {
+	static selectableFields: Set<string>;
+
+	protected static toSelect(rawFilter: string, Select: typeof BaseSelect) {
+		const dto = jsonParse(rawFilter, { errorMessage: 'Failed to parse filter JSON' });
+
+		if (!isStringArray(dto)) throw new ApplicationError('Parsed select is not a string array');
+
+		return dto.reduce<Record<string, true>>((acc, field) => {
+			if (!Select.selectableFields.has(field)) return acc;
+			return (acc[field] = true), acc;
+		}, {});
+	}
+}
diff --git a/packages/cli/src/middlewares/listQuery/dtos/credentials.filter.dto.ts b/packages/cli/src/middlewares/listQuery/dtos/credentials.filter.dto.ts
new file mode 100644
index 0000000000000..5b5cdb1a63b5b
--- /dev/null
+++ b/packages/cli/src/middlewares/listQuery/dtos/credentials.filter.dto.ts
@@ -0,0 +1,19 @@
+import { IsOptional, IsString } from 'class-validator';
+import { Expose } from 'class-transformer';
+import { BaseFilter } from './base.filter.dto';
+
+export class CredentialsFilter extends BaseFilter {
+	@IsString()
+	@IsOptional()
+	@Expose()
+	name?: string;
+
+	@IsString()
+	@IsOptional()
+	@Expose()
+	type?: string;
+
+	static async fromString(rawFilter: string) {
+		return await this.toFilter(rawFilter, CredentialsFilter);
+	}
+}
diff --git a/packages/cli/src/middlewares/listQuery/dtos/credentials.select.dto.ts b/packages/cli/src/middlewares/listQuery/dtos/credentials.select.dto.ts
new file mode 100644
index 0000000000000..0bcce83cf3e8a
--- /dev/null
+++ b/packages/cli/src/middlewares/listQuery/dtos/credentials.select.dto.ts
@@ -0,0 +1,15 @@
+import { BaseSelect } from './base.select.dto';
+
+export class CredentialsSelect extends BaseSelect {
+	static get selectableFields() {
+		return new Set([
+			'id', // always included downstream
+			'name',
+			'type',
+		]);
+	}
+
+	static fromString(rawFilter: string) {
+		return this.toSelect(rawFilter, CredentialsSelect);
+	}
+}
diff --git a/packages/cli/src/middlewares/listQuery/dtos/pagination.dto.ts b/packages/cli/src/middlewares/listQuery/dtos/pagination.dto.ts
new file mode 100644
index 0000000000000..1a837d159ce51
--- /dev/null
+++ b/packages/cli/src/middlewares/listQuery/dtos/pagination.dto.ts
@@ -0,0 +1,23 @@
+import { isIntegerString } from '@/utils';
+import { ApplicationError } from 'n8n-workflow';
+
+export class Pagination {
+	static fromString(rawTake: string, rawSkip: string) {
+		if (!isIntegerString(rawTake)) {
+			throw new ApplicationError('Parameter take is not an integer string');
+		}
+
+		if (!isIntegerString(rawSkip)) {
+			throw new ApplicationError('Parameter skip is not an integer string');
+		}
+
+		const [take, skip] = [rawTake, rawSkip].map((o) => parseInt(o, 10));
+
+		const MAX_ITEMS_PER_PAGE = 50;
+
+		return {
+			take: Math.min(take, MAX_ITEMS_PER_PAGE),
+			skip,
+		};
+	}
+}
diff --git a/packages/cli/src/middlewares/listQuery/dtos/user.filter.dto.ts b/packages/cli/src/middlewares/listQuery/dtos/user.filter.dto.ts
new file mode 100644
index 0000000000000..82f124c8e9795
--- /dev/null
+++ b/packages/cli/src/middlewares/listQuery/dtos/user.filter.dto.ts
@@ -0,0 +1,29 @@
+import { IsOptional, IsString, IsBoolean } from 'class-validator';
+import { Expose } from 'class-transformer';
+import { BaseFilter } from './base.filter.dto';
+
+export class UserFilter extends BaseFilter {
+	@IsString()
+	@IsOptional()
+	@Expose()
+	email?: string;
+
+	@IsString()
+	@IsOptional()
+	@Expose()
+	firstName?: string;
+
+	@IsString()
+	@IsOptional()
+	@Expose()
+	lastName?: string;
+
+	@IsBoolean()
+	@IsOptional()
+	@Expose()
+	isOwner?: boolean;
+
+	static async fromString(rawFilter: string) {
+		return await this.toFilter(rawFilter, UserFilter);
+	}
+}
diff --git a/packages/cli/src/middlewares/listQuery/dtos/user.select.dto.ts b/packages/cli/src/middlewares/listQuery/dtos/user.select.dto.ts
new file mode 100644
index 0000000000000..7da40be3e8975
--- /dev/null
+++ b/packages/cli/src/middlewares/listQuery/dtos/user.select.dto.ts
@@ -0,0 +1,11 @@
+import { BaseSelect } from './base.select.dto';
+
+export class UserSelect extends BaseSelect {
+	static get selectableFields() {
+		return new Set(['id', 'email', 'firstName', 'lastName']);
+	}
+
+	static fromString(rawFilter: string) {
+		return this.toSelect(rawFilter, UserSelect);
+	}
+}
diff --git a/packages/cli/src/middlewares/listQuery/dtos/workflow.filter.dto.ts b/packages/cli/src/middlewares/listQuery/dtos/workflow.filter.dto.ts
new file mode 100644
index 0000000000000..cadb945a60dbc
--- /dev/null
+++ b/packages/cli/src/middlewares/listQuery/dtos/workflow.filter.dto.ts
@@ -0,0 +1,26 @@
+import { IsOptional, IsString, IsBoolean, IsArray } from 'class-validator';
+import { Expose } from 'class-transformer';
+
+import { BaseFilter } from './base.filter.dto';
+
+export class WorkflowFilter extends BaseFilter {
+	@IsString()
+	@IsOptional()
+	@Expose()
+	name?: string;
+
+	@IsBoolean()
+	@IsOptional()
+	@Expose()
+	active?: boolean;
+
+	@IsArray()
+	@IsString({ each: true })
+	@IsOptional()
+	@Expose()
+	tags?: string[];
+
+	static async fromString(rawFilter: string) {
+		return await this.toFilter(rawFilter, WorkflowFilter);
+	}
+}
diff --git a/packages/cli/src/middlewares/listQuery/dtos/workflow.select.dto.ts b/packages/cli/src/middlewares/listQuery/dtos/workflow.select.dto.ts
new file mode 100644
index 0000000000000..0a905604623c0
--- /dev/null
+++ b/packages/cli/src/middlewares/listQuery/dtos/workflow.select.dto.ts
@@ -0,0 +1,20 @@
+import { BaseSelect } from './base.select.dto';
+
+export class WorkflowSelect extends BaseSelect {
+	static get selectableFields() {
+		return new Set([
+			'id', // always included downstream
+			'name',
+			'active',
+			'tags',
+			'createdAt',
+			'updatedAt',
+			'versionId',
+			'ownedBy', // non-entity field
+		]);
+	}
+
+	static fromString(rawFilter: string) {
+		return this.toSelect(rawFilter, WorkflowSelect);
+	}
+}
diff --git a/packages/cli/src/middlewares/listQuery/filter.ts b/packages/cli/src/middlewares/listQuery/filter.ts
new file mode 100644
index 0000000000000..9db1d85cd8392
--- /dev/null
+++ b/packages/cli/src/middlewares/listQuery/filter.ts
@@ -0,0 +1,42 @@
+import * as ResponseHelper from '@/ResponseHelper';
+import { WorkflowFilter } from './dtos/workflow.filter.dto';
+import { CredentialsFilter } from './dtos/credentials.filter.dto';
+import { UserFilter } from './dtos/user.filter.dto';
+import { toError } from '@/utils';
+
+import type { NextFunction, Response } from 'express';
+import type { ListQuery } from '@/requests';
+
+export const filterListQueryMiddleware = async (
+	req: ListQuery.Request,
+	res: Response,
+	next: NextFunction,
+) => {
+	const { filter: rawFilter } = req.query;
+
+	if (!rawFilter) return next();
+
+	let Filter;
+
+	if (req.baseUrl.endsWith('workflows')) {
+		Filter = WorkflowFilter;
+	} else if (req.baseUrl.endsWith('credentials')) {
+		Filter = CredentialsFilter;
+	} else if (req.baseUrl.endsWith('users')) {
+		Filter = UserFilter;
+	} else {
+		return next();
+	}
+
+	try {
+		const filter = await Filter.fromString(rawFilter);
+
+		if (Object.keys(filter).length === 0) return next();
+
+		req.listQueryOptions = { ...req.listQueryOptions, filter };
+
+		next();
+	} catch (maybeError) {
+		ResponseHelper.sendErrorResponse(res, toError(maybeError));
+	}
+};
diff --git a/packages/cli/src/middlewares/listQuery/index.ts b/packages/cli/src/middlewares/listQuery/index.ts
new file mode 100644
index 0000000000000..0c8e2c7427c54
--- /dev/null
+++ b/packages/cli/src/middlewares/listQuery/index.ts
@@ -0,0 +1,9 @@
+import { filterListQueryMiddleware } from './filter';
+import { selectListQueryMiddleware } from './select';
+import { paginationListQueryMiddleware } from './pagination';
+
+export const listQueryMiddleware = [
+	filterListQueryMiddleware,
+	selectListQueryMiddleware,
+	paginationListQueryMiddleware,
+];
diff --git a/packages/cli/src/middlewares/listQuery/pagination.ts b/packages/cli/src/middlewares/listQuery/pagination.ts
new file mode 100644
index 0000000000000..cb101af8c19d2
--- /dev/null
+++ b/packages/cli/src/middlewares/listQuery/pagination.ts
@@ -0,0 +1,30 @@
+import { toError } from '@/utils';
+import * as ResponseHelper from '@/ResponseHelper';
+import { Pagination } from './dtos/pagination.dto';
+import type { ListQuery } from '@/requests';
+import type { RequestHandler } from 'express';
+import { ApplicationError } from 'n8n-workflow';
+
+export const paginationListQueryMiddleware: RequestHandler = (
+	req: ListQuery.Request,
+	res,
+	next,
+) => {
+	const { take: rawTake, skip: rawSkip = '0' } = req.query;
+
+	try {
+		if (!rawTake && req.query.skip) {
+			throw new ApplicationError('Please specify `take` when using `skip`');
+		}
+
+		if (!rawTake) return next();
+
+		const { take, skip } = Pagination.fromString(rawTake, rawSkip);
+
+		req.listQueryOptions = { ...req.listQueryOptions, skip, take };
+
+		next();
+	} catch (maybeError) {
+		ResponseHelper.sendErrorResponse(res, toError(maybeError));
+	}
+};
diff --git a/packages/cli/src/middlewares/listQuery/select.ts b/packages/cli/src/middlewares/listQuery/select.ts
new file mode 100644
index 0000000000000..6511410a8c2d5
--- /dev/null
+++ b/packages/cli/src/middlewares/listQuery/select.ts
@@ -0,0 +1,38 @@
+import { WorkflowSelect } from './dtos/workflow.select.dto';
+import { UserSelect } from './dtos/user.select.dto';
+import { CredentialsSelect } from './dtos/credentials.select.dto';
+import * as ResponseHelper from '@/ResponseHelper';
+import { toError } from '@/utils';
+
+import type { RequestHandler } from 'express';
+import type { ListQuery } from '@/requests';
+
+export const selectListQueryMiddleware: RequestHandler = (req: ListQuery.Request, res, next) => {
+	const { select: rawSelect } = req.query;
+
+	if (!rawSelect) return next();
+
+	let Select;
+
+	if (req.baseUrl.endsWith('workflows')) {
+		Select = WorkflowSelect;
+	} else if (req.baseUrl.endsWith('credentials')) {
+		Select = CredentialsSelect;
+	} else if (req.baseUrl.endsWith('users')) {
+		Select = UserSelect;
+	} else {
+		return next();
+	}
+
+	try {
+		const select = Select.fromString(rawSelect);
+
+		if (Object.keys(select).length === 0) return next();
+
+		req.listQueryOptions = { ...req.listQueryOptions, select };
+
+		next();
+	} catch (maybeError) {
+		ResponseHelper.sendErrorResponse(res, toError(maybeError));
+	}
+};
diff --git a/packages/cli/src/middlewares/userManagementEnabled.ts b/packages/cli/src/middlewares/userManagementEnabled.ts
deleted file mode 100644
index c1f3c58c6f35d..0000000000000
--- a/packages/cli/src/middlewares/userManagementEnabled.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type { RequestHandler } from 'express';
-import { LoggerProxy } from 'n8n-workflow';
-import { isUserManagementEnabled } from '../UserManagement/UserManagementHelper';
-
-export const userManagementEnabledMiddleware: RequestHandler = (req, res, next) => {
-	if (isUserManagementEnabled()) {
-		next();
-	} else {
-		LoggerProxy.debug('Request failed because user management is disabled');
-		res.status(400).json({ status: 'error', message: 'User management is disabled' });
-	}
-};
diff --git a/packages/cli/src/permissions/roles.ts b/packages/cli/src/permissions/roles.ts
new file mode 100644
index 0000000000000..68d61af0b2afb
--- /dev/null
+++ b/packages/cli/src/permissions/roles.ts
@@ -0,0 +1,86 @@
+import type { Scope } from '@n8n/permissions';
+
+export const ownerPermissions: Scope[] = [
+	'auditLogs:manage',
+	'banner:dismiss',
+	'credential:create',
+	'credential:read',
+	'credential:update',
+	'credential:delete',
+	'credential:list',
+	'credential:share',
+	'communityPackage:install',
+	'communityPackage:uninstall',
+	'communityPackage:update',
+	'communityPackage:list',
+	'eventBusEvent:create',
+	'eventBusEvent:read',
+	'eventBusEvent:update',
+	'eventBusEvent:delete',
+	'eventBusEvent:list',
+	'eventBusEvent:query',
+	'eventBusEvent:create',
+	'eventBusDestination:create',
+	'eventBusDestination:read',
+	'eventBusDestination:update',
+	'eventBusDestination:delete',
+	'eventBusDestination:list',
+	'eventBusDestination:test',
+	'externalSecretsProvider:create',
+	'externalSecretsProvider:read',
+	'externalSecretsProvider:update',
+	'externalSecretsProvider:delete',
+	'externalSecretsProvider:list',
+	'externalSecretsProvider:sync',
+	'externalSecret:list',
+	'externalSecret:use',
+	'ldap:manage',
+	'ldap:sync',
+	'license:manage',
+	'logStreaming:manage',
+	'orchestration:read',
+	'orchestration:list',
+	'saml:manage',
+	'sourceControl:pull',
+	'sourceControl:push',
+	'sourceControl:manage',
+	'tag:create',
+	'tag:read',
+	'tag:update',
+	'tag:delete',
+	'tag:list',
+	'user:create',
+	'user:read',
+	'user:update',
+	'user:delete',
+	'user:list',
+	'user:resetPassword',
+	'user:changeRole',
+	'variable:create',
+	'variable:read',
+	'variable:update',
+	'variable:delete',
+	'variable:list',
+	'workflow:create',
+	'workflow:read',
+	'workflow:update',
+	'workflow:delete',
+	'workflow:list',
+	'workflow:share',
+	'workflow:execute',
+	'workersView:manage',
+];
+export const adminPermissions: Scope[] = ownerPermissions.concat();
+export const memberPermissions: Scope[] = [
+	'eventBusEvent:list',
+	'eventBusEvent:read',
+	'eventBusDestination:list',
+	'eventBusDestination:test',
+	'tag:create',
+	'tag:read',
+	'tag:update',
+	'tag:list',
+	'user:list',
+	'variable:list',
+	'variable:read',
+];
diff --git a/packages/cli/src/posthog/index.ts b/packages/cli/src/posthog/index.ts
index d206e1abfed35..db152a3bb9801 100644
--- a/packages/cli/src/posthog/index.ts
+++ b/packages/cli/src/posthog/index.ts
@@ -1,10 +1,12 @@
-import { Service } from 'typedi';
+import { Service, Container } from 'typedi';
 import type { PostHog } from 'posthog-node';
 import type { FeatureFlags, ITelemetryTrackProperties } from 'n8n-workflow';
+import { InstanceSettings } from 'n8n-core';
 import config from '@/config';
 import type { PublicUser } from '@/Interfaces';
 import * as Db from '@/Db';
 import { createIncidentLog, generateCreateCustomTicketSubjectFn } from '@/lib/incidentLogger';
+import { WorkflowRepository } from '@db/repositories/workflow.repository';
 
 const logWorkflowFailureScheduleOrNocoDBAuthWebhook = async ({
 	properties,
@@ -16,10 +18,8 @@ const logWorkflowFailureScheduleOrNocoDBAuthWebhook = async ({
 	if (!properties.workflow_id || properties.status !== 'failed') return;
 
 	const { workflow_id } = properties as { workflow_id: string };
-	const workflow = await Db.collections.Workflow.findOne({
-		where: {
-			id: workflow_id,
-		},
+	const workflow = await Container.get(WorkflowRepository).findOne({
+		where: { id: workflow_id },
 	});
 	if (!workflow) return;
 
@@ -37,16 +37,14 @@ const logWorkflowFailureScheduleOrNocoDBAuthWebhook = async ({
 export class PostHogClient {
 	private postHog?: PostHog;
 
-	private instanceId?: string;
+	constructor(private readonly instanceSettings: InstanceSettings) {}
 
-	async init(instanceId: string) {
-		this.instanceId = instanceId;
+	async init() {
 		const enabled = config.getEnv('diagnostics.enabled');
 		if (!enabled) {
 			return;
 		}
 
-		// eslint-disable-next-line @typescript-eslint/naming-convention
 		const { PostHog } = await import('posthog-node');
 		this.postHog = new PostHog(config.getEnv('diagnostics.config.posthog.apiKey'), {
 			host: config.getEnv('diagnostics.config.posthog.apiHost'),
@@ -78,11 +76,11 @@ export class PostHogClient {
 	async getFeatureFlags(user: Pick<PublicUser, 'id' | 'createdAt'>): Promise<FeatureFlags> {
 		if (!this.postHog) return {};
 
-		const fullId = [this.instanceId, user.id].join('#');
+		const fullId = [this.instanceSettings.instanceId, user.id].join('#');
 
 		// cannot use local evaluation because that requires PostHog personal api key with org-wide
 		// https://github.com/PostHog/posthog/issues/4849
-		return this.postHog.getAllFlags(fullId, {
+		return await this.postHog.getAllFlags(fullId, {
 			personProperties: {
 				created_at_timestamp: user.createdAt.getTime().toString(),
 			},
diff --git a/packages/cli/src/push/abstract.push.ts b/packages/cli/src/push/abstract.push.ts
index a9022bdc5cbd5..18e28d7c7b4db 100644
--- a/packages/cli/src/push/abstract.push.ts
+++ b/packages/cli/src/push/abstract.push.ts
@@ -1,51 +1,125 @@
-import { jsonStringify, LoggerProxy as Logger } from 'n8n-workflow';
+import { EventEmitter } from 'events';
+import { assert, jsonStringify } from 'n8n-workflow';
 import type { IPushDataType } from '@/Interfaces';
-import { eventBus } from '../eventbus';
+import type { Logger } from '@/Logger';
+import type { User } from '@db/entities/User';
+import type { OrchestrationService } from '@/services/orchestration.service';
 
-export abstract class AbstractPush<T> {
+/**
+ * Abstract class for two-way push communication.
+ * Keeps track of user sessions and enables sending messages.
+ *
+ * @emits message when a message is received from a client
+ */
+export abstract class AbstractPush<T> extends EventEmitter {
 	protected connections: Record<string, T> = {};
 
+	protected userIdByPushRef: Record<string, string> = {};
+
 	protected abstract close(connection: T): void;
-	protected abstract sendToOne(connection: T, data: string): void;
+	protected abstract sendToOneConnection(connection: T, data: string): void;
 
-	protected add(sessionId: string, connection: T): void {
-		const { connections } = this;
-		Logger.debug('Add editor-UI session', { sessionId });
-		eventBus.emit('editorUiConnected', sessionId);
+	constructor(
+		protected readonly logger: Logger,
+		private readonly orchestrationService: OrchestrationService,
+	) {
+		super();
+	}
+
+	protected add(pushRef: string, userId: User['id'], connection: T) {
+		const { connections, userIdByPushRef } = this;
+		this.logger.debug('Add editor-UI session', { pushRef });
+
+		const existingConnection = connections[pushRef];
 
-		const existingConnection = connections[sessionId];
 		if (existingConnection) {
-			// Make sure to remove existing connection with the same id
+			// Make sure to remove existing connection with the same ID
 			this.close(existingConnection);
 		}
 
-		connections[sessionId] = connection;
+		connections[pushRef] = connection;
+		userIdByPushRef[pushRef] = userId;
 	}
 
-	protected remove(sessionId?: string): void {
-		if (sessionId !== undefined) {
-			Logger.debug('Remove editor-UI session', { sessionId });
-			delete this.connections[sessionId];
+	protected onMessageReceived(pushRef: string, msg: unknown) {
+		this.logger.debug('Received message from editor-UI', { pushRef, msg });
+
+		const userId = this.userIdByPushRef[pushRef];
+
+		this.emit('message', { pushRef, userId, msg });
+	}
+
+	protected remove(pushRef?: string) {
+		if (!pushRef) return;
+
+		this.logger.debug('Removed editor-UI session', { pushRef });
+
+		delete this.connections[pushRef];
+		delete this.userIdByPushRef[pushRef];
+	}
+
+	private sendTo(type: IPushDataType, data: unknown, pushRefs: string[]) {
+		this.logger.debug(`Send data of type "${type}" to editor-UI`, {
+			dataType: type,
+			pushRefs: pushRefs.join(', '),
+		});
+
+		const stringifiedPayload = jsonStringify({ type, data }, { replaceCircularRefs: true });
+
+		for (const pushRef of pushRefs) {
+			const connection = this.connections[pushRef];
+			assert(connection);
+			this.sendToOneConnection(connection, stringifiedPayload);
 		}
 	}
 
-	send<D>(type: IPushDataType, data: D, sessionId: string | undefined) {
-		const { connections } = this;
-		if (sessionId !== undefined && connections[sessionId] === undefined) {
-			Logger.error(`The session "${sessionId}" is not registered.`, { sessionId });
+	sendToAll(type: IPushDataType, data?: unknown) {
+		this.sendTo(type, data, Object.keys(this.connections));
+	}
+
+	sendToOneSession(type: IPushDataType, data: unknown, 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.hasPushRef(pushRef)) {
+			const payload = { type, args: data, pushRef };
+
+			void this.orchestrationService.publish('relay-execution-lifecycle-event', payload);
+
+			return;
+		}
+
+		if (this.connections[pushRef] === undefined) {
+			this.logger.error(`The session "${pushRef}" is not registered.`, { pushRef });
 			return;
 		}
 
-		Logger.debug(`Send data of type "${type}" to editor-UI`, { dataType: type, sessionId });
+		this.sendTo(type, data, [pushRef]);
+	}
 
-		const sendData = jsonStringify({ type, data }, { replaceCircularRefs: true });
+	sendToUsers(type: IPushDataType, data: unknown, userIds: Array<User['id']>) {
+		const { connections } = this;
+		const userPushRefs = Object.keys(connections).filter((pushRef) =>
+			userIds.includes(this.userIdByPushRef[pushRef]),
+		);
 
-		if (sessionId === undefined) {
-			// Send to all connected clients
-			Object.values(connections).forEach((connection) => this.sendToOne(connection, sendData));
-		} else {
-			// Send only to a specific client
-			this.sendToOne(connections[sessionId], sendData);
+		this.sendTo(type, data, userPushRefs);
+	}
+
+	closeAllConnections() {
+		for (const pushRef in this.connections) {
+			// Signal the connection that we want to close it.
+			// We are not removing the sessions here because it should be
+			// the implementation's responsibility to do so once the connection
+			// has actually closed.
+			this.close(this.connections[pushRef]);
 		}
 	}
+
+	hasPushRef(pushRef: string) {
+		return this.connections[pushRef] !== undefined;
+	}
 }
diff --git a/packages/cli/src/push/index.ts b/packages/cli/src/push/index.ts
index 63615605d60fc..94c8a32bce8c4 100644
--- a/packages/cli/src/push/index.ts
+++ b/packages/cli/src/push/index.ts
@@ -1,36 +1,89 @@
+import { EventEmitter } from 'events';
 import { ServerResponse } from 'http';
 import type { Server } from 'http';
 import type { Socket } from 'net';
-import type { Application, RequestHandler } from 'express';
+import type { Application } from 'express';
 import { Server as WSServer } from 'ws';
 import { parse as parseUrl } from 'url';
 import { Container, Service } from 'typedi';
 import config from '@/config';
-import { resolveJwt } from '@/auth/jwt';
-import { AUTH_COOKIE_NAME } from '@/constants';
 import { SSEPush } from './sse.push';
 import { WebSocketPush } from './websocket.push';
 import type { PushResponse, SSEPushRequest, WebSocketPushRequest } from './types';
 import type { IPushDataType } from '@/Interfaces';
+import type { User } from '@db/entities/User';
+import { OnShutdown } from '@/decorators/OnShutdown';
+import { AuthService } from '@/auth/auth.service';
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 
 const useWebSockets = config.getEnv('push.backend') === 'websocket';
 
+/**
+ * Push service for uni- or bi-directional communication with frontend clients.
+ * Uses either server-sent events (SSE, unidirectional from backend --> frontend)
+ * or WebSocket (bidirectional backend <--> frontend) depending on the configuration.
+ *
+ * @emits message when a message is received from a client
+ */
 @Service()
-export class Push {
-	private backend = useWebSockets ? new WebSocketPush() : new SSEPush();
+export class Push extends EventEmitter {
+	public isBidirectional = useWebSockets;
+
+	private backend = useWebSockets ? Container.get(WebSocketPush) : Container.get(SSEPush);
+
+	constructor() {
+		super();
+
+		if (useWebSockets) this.backend.on('message', (msg) => this.emit('message', msg));
+	}
 
 	handleRequest(req: SSEPushRequest | WebSocketPushRequest, res: PushResponse) {
+		const {
+			user,
+			ws,
+			query: { pushRef },
+		} = req;
+
+		if (!pushRef) {
+			if (ws) {
+				ws.send('The query parameter "pushRef" is missing!');
+				ws.close(1008);
+				return;
+			}
+			throw new BadRequestError('The query parameter "pushRef" is missing!');
+		}
+
 		if (req.ws) {
-			(this.backend as WebSocketPush).add(req.query.sessionId, req.ws);
+			(this.backend as WebSocketPush).add(pushRef, user.id, req.ws);
 		} else if (!useWebSockets) {
-			(this.backend as SSEPush).add(req.query.sessionId, { req, res });
+			(this.backend as SSEPush).add(pushRef, user.id, { req, res });
 		} else {
 			res.status(401).send('Unauthorized');
+			return;
 		}
+
+		this.emit('editorUiConnected', pushRef);
+	}
+
+	broadcast(type: IPushDataType, data?: unknown) {
+		this.backend.sendToAll(type, data);
+	}
+
+	send(type: IPushDataType, data: unknown, pushRef: string) {
+		this.backend.sendToOneSession(type, data, pushRef);
 	}
 
-	send<D>(type: IPushDataType, data: D, sessionId: string | undefined = undefined) {
-		this.backend.send(type, data, sessionId);
+	getBackend() {
+		return this.backend;
+	}
+
+	sendToUsers(type: IPushDataType, data: unknown, userIds: Array<User['id']>) {
+		this.backend.sendToUsers(type, data, userIds);
+	}
+
+	@OnShutdown()
+	onShutdown() {
+		this.backend.closeAllConnections();
 	}
 }
 
@@ -57,55 +110,14 @@ export const setupPushServer = (restEndpoint: string, server: Server, app: Appli
 	}
 };
 
-export const setupPushHandler = (
-	restEndpoint: string,
-	app: Application,
-	isUserManagementEnabled: boolean,
-) => {
+export const setupPushHandler = (restEndpoint: string, app: Application) => {
 	const endpoint = `/${restEndpoint}/push`;
-
-	const pushValidationMiddleware: RequestHandler = async (
-		req: SSEPushRequest | WebSocketPushRequest,
-		res,
-		next,
-	) => {
-		const ws = req.ws;
-
-		const { sessionId } = req.query;
-		if (sessionId === undefined) {
-			if (ws) {
-				ws.send('The query parameter "sessionId" is missing!');
-				ws.close(400);
-			} else {
-				next(new Error('The query parameter "sessionId" is missing!'));
-			}
-			return;
-		}
-
-		// Handle authentication
-		if (isUserManagementEnabled) {
-			try {
-				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
-				const authCookie: string = req.cookies?.[AUTH_COOKIE_NAME] ?? '';
-				await resolveJwt(authCookie);
-			} catch (error) {
-				if (ws) {
-					ws.send(`Unauthorized: ${(error as Error).message}`);
-					ws.close(401);
-				} else {
-					res.status(401).send('Unauthorized');
-				}
-				return;
-			}
-		}
-
-		next();
-	};
-
 	const push = Container.get(Push);
+	const authService = Container.get(AuthService);
 	app.use(
 		endpoint,
-		pushValidationMiddleware,
+		// eslint-disable-next-line @typescript-eslint/unbound-method
+		authService.authMiddleware,
 		(req: SSEPushRequest | WebSocketPushRequest, res: PushResponse) => push.handleRequest(req, res),
 	);
 };
diff --git a/packages/cli/src/push/sse.push.ts b/packages/cli/src/push/sse.push.ts
index e3bae7dd1f6ee..d57b07ea1fffb 100644
--- a/packages/cli/src/push/sse.push.ts
+++ b/packages/cli/src/push/sse.push.ts
@@ -1,32 +1,38 @@
 import SSEChannel from 'sse-channel';
+import { Service } from 'typedi';
+import { Logger } from '@/Logger';
 import { AbstractPush } from './abstract.push';
 import type { PushRequest, PushResponse } from './types';
+import type { User } from '@db/entities/User';
+import { OrchestrationService } from '@/services/orchestration.service';
 
 type Connection = { req: PushRequest; res: PushResponse };
 
+@Service()
 export class SSEPush extends AbstractPush<Connection> {
 	readonly channel = new SSEChannel();
 
 	readonly connections: Record<string, Connection> = {};
 
-	constructor() {
-		super();
-		this.channel.on('disconnect', (channel, { req }) => {
-			this.remove(req?.query?.sessionId);
+	constructor(logger: Logger, orchestrationService: OrchestrationService) {
+		super(logger, orchestrationService);
+
+		this.channel.on('disconnect', (_, { req }) => {
+			this.remove(req?.query?.pushRef);
 		});
 	}
 
-	add(sessionId: string, connection: Connection) {
-		super.add(sessionId, connection);
+	add(pushRef: string, userId: User['id'], connection: Connection) {
+		super.add(pushRef, userId, connection);
 		this.channel.addClient(connection.req, connection.res);
 	}
 
-	protected close({ res }: Connection): void {
+	protected close({ res }: Connection) {
 		res.end();
 		this.channel.removeClient(res);
 	}
 
-	protected sendToOne(connection: Connection, data: string): void {
+	protected sendToOneConnection(connection: Connection, data: string) {
 		this.channel.send(data, [connection.res]);
 	}
 }
diff --git a/packages/cli/src/push/types.ts b/packages/cli/src/push/types.ts
index 26baea050b124..4068192b6c6c9 100644
--- a/packages/cli/src/push/types.ts
+++ b/packages/cli/src/push/types.ts
@@ -1,11 +1,20 @@
-import type { Request, Response } from 'express';
+import type { Response } from 'express';
 import type { WebSocket } from 'ws';
 
+import type { User } from '@db/entities/User';
+import type { AuthenticatedRequest } from '@/requests';
+
 // TODO: move all push related types here
 
-export type PushRequest = Request<{}, {}, {}, { sessionId: string }>;
+export type PushRequest = AuthenticatedRequest<{}, {}, {}, { pushRef: string }>;
 
 export type SSEPushRequest = PushRequest & { ws: undefined };
 export type WebSocketPushRequest = PushRequest & { ws: WebSocket };
 
 export type PushResponse = Response & { req: PushRequest };
+
+export type OnPushMessageEvent = {
+	pushRef: string;
+	userId: User['id'];
+	msg: unknown;
+};
diff --git a/packages/cli/src/push/websocket.push.ts b/packages/cli/src/push/websocket.push.ts
index 93c9a24220759..49c081b363054 100644
--- a/packages/cli/src/push/websocket.push.ts
+++ b/packages/cli/src/push/websocket.push.ts
@@ -1,19 +1,72 @@
 import type WebSocket from 'ws';
+import { Service } from 'typedi';
+import { Logger } from '@/Logger';
 import { AbstractPush } from './abstract.push';
+import type { User } from '@db/entities/User';
+import { OrchestrationService } from '@/services/orchestration.service';
 
+function heartbeat(this: WebSocket) {
+	this.isAlive = true;
+}
+
+@Service()
 export class WebSocketPush extends AbstractPush<WebSocket> {
-	add(sessionId: string, connection: WebSocket) {
-		super.add(sessionId, connection);
+	constructor(logger: Logger, orchestrationService: OrchestrationService) {
+		super(logger, orchestrationService);
+
+		// Ping all connected clients every 60 seconds
+		setInterval(() => this.pingAll(), 60 * 1000);
+	}
+
+	add(pushRef: string, userId: User['id'], connection: WebSocket) {
+		connection.isAlive = true;
+		connection.on('pong', heartbeat);
+
+		super.add(pushRef, userId, connection);
+
+		const onMessage = (data: WebSocket.RawData) => {
+			try {
+				const buffer = Array.isArray(data) ? Buffer.concat(data) : Buffer.from(data);
+
+				this.onMessageReceived(pushRef, JSON.parse(buffer.toString('utf8')));
+			} catch (error) {
+				this.logger.error("Couldn't parse message from editor-UI", {
+					error: error as unknown,
+					pushRef,
+					data,
+				});
+			}
+		};
 
 		// Makes sure to remove the session if the connection is closed
-		connection.once('close', () => this.remove(sessionId));
+		connection.once('close', () => {
+			connection.off('pong', heartbeat);
+			connection.off('message', onMessage);
+			this.remove(pushRef);
+		});
+
+		connection.on('message', onMessage);
 	}
 
 	protected close(connection: WebSocket): void {
 		connection.close();
 	}
 
-	protected sendToOne(connection: WebSocket, data: string): void {
+	protected sendToOneConnection(connection: WebSocket, data: string): void {
 		connection.send(data);
 	}
+
+	private pingAll() {
+		for (const pushRef in this.connections) {
+			const connection = this.connections[pushRef];
+			// If a connection did not respond with a `PONG` in the last 60 seconds, disconnect
+			if (!connection.isAlive) {
+				delete this.connections[pushRef];
+				return connection.terminate();
+			}
+
+			connection.isAlive = false;
+			connection.ping();
+		}
+	}
 }
diff --git a/packages/cli/src/requests.ts b/packages/cli/src/requests.ts
index 0cf04ce2137b4..5e34bc5003313 100644
--- a/packages/cli/src/requests.ts
+++ b/packages/cli/src/requests.ts
@@ -1,113 +1,218 @@
 import type express from 'express';
 import type {
-	IConnections,
+	BannerName,
 	ICredentialDataDecryptedObject,
-	ICredentialNodeAccess,
-	INode,
+	IDataObject,
 	INodeCredentialTestRequest,
-	IPinData,
-	IRunData,
-	IWorkflowSettings,
+	INodeCredentials,
+	INodeParameters,
+	INodeTypeNameVersion,
+	IUser,
 } from 'n8n-workflow';
 
-import { IsBoolean, IsEmail, IsOptional, IsString, Length } from 'class-validator';
+import { Expose } from 'class-transformer';
+import { IsBoolean, IsEmail, IsIn, IsOptional, IsString, Length } from 'class-validator';
 import { NoXss } from '@db/utils/customValidators';
-import type { PublicUser, IExecutionDeleteFilter, IWorkflowDb } from '@/Interfaces';
-import type { Role } from '@db/entities/Role';
-import type { User } from '@db/entities/User';
-import type { UserManagementMailer } from '@/UserManagement/email';
+import type { PublicUser, SecretsProvider, SecretsProviderState } from '@/Interfaces';
+import { AssignableRole, type User } from '@db/entities/User';
 import type { Variables } from '@db/entities/Variables';
+import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
+import type { CredentialsEntity } from '@db/entities/CredentialsEntity';
+import type { WorkflowHistory } from '@db/entities/WorkflowHistory';
 
 export class UserUpdatePayload implements Pick<User, 'email' | 'firstName' | 'lastName'> {
+	@Expose()
 	@IsEmail()
 	email: string;
 
+	@Expose()
 	@NoXss()
 	@IsString({ message: 'First name must be of type string.' })
 	@Length(1, 32, { message: 'First name must be $constraint1 to $constraint2 characters long.' })
 	firstName: string;
 
+	@Expose()
 	@NoXss()
 	@IsString({ message: 'Last name must be of type string.' })
 	@Length(1, 32, { message: 'Last name must be $constraint1 to $constraint2 characters long.' })
 	lastName: string;
 }
-export class UserSettingsUpdatePayload {
-	@IsBoolean({ message: 'showUserActivationSurvey should be a boolean' })
-	@IsOptional()
-	showUserActivationSurvey: boolean;
 
+export class UserSettingsUpdatePayload {
+	@Expose()
 	@IsBoolean({ message: 'userActivated should be a boolean' })
 	@IsOptional()
 	userActivated: boolean;
+
+	@Expose()
+	@IsBoolean({ message: 'allowSSOManualLogin should be a boolean' })
+	@IsOptional()
+	allowSSOManualLogin?: boolean;
+}
+
+// ----------------------------------
+//             /save-request-log
+// ----------------------------------
+
+export declare namespace SaveRequestLogRequest {
+	export type Add = AuthenticatedRequest<
+		{},
+		{},
+		{ request: unknown; response: unknown; workflowId: string; status: 'successful' | 'failed' }
+	>;
+}
+
+export class UserRoleChangePayload {
+	@Expose()
+	@IsIn(['global:admin', 'global:member'])
+	newRoleName: AssignableRole;
 }
 
+export type APIRequest<
+	RouteParams = {},
+	ResponseBody = {},
+	RequestBody = {},
+	RequestQuery = {},
+> = express.Request<RouteParams, ResponseBody, RequestBody, RequestQuery> & {
+	browserId?: string;
+};
+
 export type AuthlessRequest<
 	RouteParams = {},
 	ResponseBody = {},
 	RequestBody = {},
 	RequestQuery = {},
-> = express.Request<RouteParams, ResponseBody, RequestBody, RequestQuery>;
+> = APIRequest<RouteParams, ResponseBody, RequestBody, RequestQuery> & {
+	user: never;
+};
 
 export type AuthenticatedRequest<
 	RouteParams = {},
 	ResponseBody = {},
 	RequestBody = {},
 	RequestQuery = {},
-> = Omit<express.Request<RouteParams, ResponseBody, RequestBody, RequestQuery>, 'user'> & {
+> = Omit<APIRequest<RouteParams, ResponseBody, RequestBody, RequestQuery>, 'user' | 'cookies'> & {
 	user: User;
-	mailer?: UserManagementMailer;
-	globalMemberRole?: Role;
+	cookies: Record<string, string | undefined>;
 };
 
 // ----------------------------------
-//           /workflows
+//            list query
 // ----------------------------------
 
-export declare namespace WorkflowRequest {
-	type CreateUpdatePayload = Partial<{
-		id: string; // delete if sent
-		name: string;
-		nodes: INode[];
-		connections: IConnections;
-		settings: IWorkflowSettings;
-		active: boolean;
-		tags: string[];
-		hash: string;
-	}>;
+export namespace ListQuery {
+	export type Request = AuthenticatedRequest<{}, {}, {}, Params> & {
+		listQueryOptions?: Options;
+	};
 
-	type ManualRunPayload = {
-		workflowData: IWorkflowDb;
-		runData: IRunData;
-		pinData: IPinData;
-		startNodes?: string[];
-		destinationNode?: string;
+	export type Params = {
+		filter?: string;
+		skip?: string;
+		take?: string;
+		select?: string;
 	};
 
-	type Create = AuthenticatedRequest<{}, {}, CreateUpdatePayload>;
+	export type Options = {
+		filter?: Record<string, unknown>;
+		select?: Record<string, true>;
+		skip?: number;
+		take?: number;
+	};
 
-	type Get = AuthenticatedRequest<{ id: string }>;
+	/**
+	 * Slim workflow returned from a list query operation.
+	 */
+	export namespace Workflow {
+		type OptionalBaseFields = 'name' | 'active' | 'versionId' | 'createdAt' | 'updatedAt' | 'tags';
 
-	type Delete = Get;
+		type BaseFields = Pick<WorkflowEntity, 'id'> &
+			Partial<Pick<WorkflowEntity, OptionalBaseFields>>;
 
-	type Update = AuthenticatedRequest<
-		{ id: string },
-		{},
-		CreateUpdatePayload,
-		{ forceSave?: string }
-	>;
+		type SharedField = Partial<Pick<WorkflowEntity, 'shared'>>;
 
-	type NewName = AuthenticatedRequest<{}, {}, {}, { name?: string }>;
+		type OwnedByField = { ownedBy: SlimUser | null };
 
-	type GetAll = AuthenticatedRequest<{}, {}, {}, { filter: string }>;
+		export type Plain = BaseFields;
 
-	type GetAllActive = AuthenticatedRequest;
+		export type WithSharing = BaseFields & SharedField;
+
+		export type WithOwnership = BaseFields & OwnedByField;
 
-	type GetAllActivationErrors = Get;
+		type SharedWithField = { sharedWith: SlimUser[] };
 
-	type ManualRun = AuthenticatedRequest<{}, {}, ManualRunPayload>;
+		export type WithOwnedByAndSharedWith = BaseFields & OwnedByField & SharedWithField;
+	}
+
+	export namespace Credentials {
+		type OwnedByField = { ownedBy: SlimUser | null };
+
+		type SharedWithField = { sharedWith: SlimUser[] };
 
-	type Share = AuthenticatedRequest<{ workflowId: string }, {}, { shareWithIds: string[] }>;
+		export type WithSharing = CredentialsEntity & Partial<Pick<CredentialsEntity, 'shared'>>;
+
+		export type WithOwnedByAndSharedWith = CredentialsEntity & OwnedByField & SharedWithField;
+	}
+}
+
+type SlimUser = Pick<IUser, 'id' | 'email' | 'firstName' | 'lastName'>;
+
+export function hasSharing(
+	workflows: ListQuery.Workflow.Plain[] | ListQuery.Workflow.WithSharing[],
+): workflows is ListQuery.Workflow.WithSharing[] {
+	return workflows.some((w) => 'shared' in w);
+}
+
+// ----------------------------------
+//          /ai
+// ----------------------------------
+
+export declare namespace AIRequest {
+	export type GenerateCurl = AuthenticatedRequest<{}, {}, AIGenerateCurlPayload>;
+}
+
+export interface AIGenerateCurlPayload {
+	service: string;
+	request: string;
+}
+
+// ----------------------------------
+//           /workflowTests
+// ----------------------------------
+
+export declare namespace WorkflowTestRequest {
+	type CreateUpdatePayload = Partial<{
+		workflowId: string;
+		description: string;
+	}>;
+
+	type CreateNodePayload = Partial<{
+		workflowTestId: string;
+		outputType: string;
+		errorMessage?: string;
+		nodeId: string;
+		data?: object;
+	}>;
+
+	type UpdateNodePayload = {
+		id: string;
+		workflowTestId: string;
+		outputType: string;
+		errorMessage?: string;
+		nodeId: string;
+		data?: object;
+	};
+
+	type Create = AuthenticatedRequest<{}, {}, CreateUpdatePayload>;
+
+	type Get = AuthenticatedRequest<{ workflowId: string }>;
+
+	type GetNodesOutput = AuthenticatedRequest<{ workflowTestId: string }>;
+
+	type CreatNodesOutput = AuthenticatedRequest<{ workflowTestId: string }, {}, CreateNodePayload>;
+
+	type UpdateNodesOutput = AuthenticatedRequest<{ workflowTestId: string }, {}, UpdateNodePayload>;
+
+	type GetAll = AuthenticatedRequest<{}, {}, {}, { filter: string }>;
 }
 
 // ----------------------------------
@@ -119,7 +224,6 @@ export declare namespace CredentialRequest {
 		id: string; // delete if sent
 		name: string;
 		type: string;
-		nodesAccess: ICredentialNodeAccess[];
 		data: ICredentialDataDecryptedObject;
 	}>;
 
@@ -133,37 +237,11 @@ export declare namespace CredentialRequest {
 
 	type Update = AuthenticatedRequest<{ id: string }, {}, CredentialProperties>;
 
-	type NewName = WorkflowRequest.NewName;
+	type NewName = AuthenticatedRequest<{}, {}, {}, { name?: string }>;
 
 	type Test = AuthenticatedRequest<{}, {}, INodeCredentialTestRequest>;
 
-	type Share = AuthenticatedRequest<{ credentialId: string }, {}, { shareWithIds: string[] }>;
-}
-
-// ----------------------------------
-//           /executions
-// ----------------------------------
-
-export declare namespace ExecutionRequest {
-	namespace QueryParam {
-		type GetAll = {
-			filter: string; // '{ waitTill: string; finished: boolean, [other: string]: string }'
-			limit: string;
-			lastId: string;
-			firstId: string;
-		};
-
-		type GetAllCurrent = {
-			filter: string; // '{ workflowId: string }'
-		};
-	}
-
-	type GetAll = AuthenticatedRequest<{}, {}, {}, QueryParam.GetAll>;
-	type Get = AuthenticatedRequest<{ id: string }, {}, {}, { unflattedResponse: 'true' | 'false' }>;
-	type Delete = AuthenticatedRequest<{}, {}, IExecutionDeleteFilter>;
-	type Retry = AuthenticatedRequest<{ id: string }, {}, { loadWorkflow: boolean }, {}>;
-	type Stop = AuthenticatedRequest<{ id: string }>;
-	type GetAllCurrent = AuthenticatedRequest<{}, {}, {}, QueryParam.GetAllCurrent>;
+	type Share = AuthenticatedRequest<{ id: string }, {}, { shareWithIds: string[] }>;
 }
 
 // ----------------------------------
@@ -176,29 +254,31 @@ export declare namespace MeRequest {
 	export type Password = AuthenticatedRequest<
 		{},
 		{},
-		{ currentPassword: string; newPassword: string }
+		{ currentPassword: string; newPassword: string; token?: string }
 	>;
 	export type SurveyAnswers = AuthenticatedRequest<{}, {}, Record<string, string> | {}>;
 }
 
+export interface UserSetupPayload {
+	email: string;
+	password: string;
+	firstName: string;
+	lastName: string;
+	otp?: string;
+	otpSecret?: string;
+	mfaEnabled?: boolean;
+	mfaSecret?: string;
+	mfaRecoveryCodes?: string[];
+}
+
 // ----------------------------------
 //             /owner
 // ----------------------------------
 
 export declare namespace OwnerRequest {
-	type Post = AuthenticatedRequest<
-		{},
-		{},
-		Partial<{
-			email: string;
-			password: string;
-			firstName: string;
-			lastName: string;
-			otpSecret: string;
-			otp: string;
-		}>,
-		{}
-	>;
+	type Post = AuthenticatedRequest<{}, {}, UserSetupPayload, {}>;
+
+	type DismissBanner = AuthenticatedRequest<{}, {}, Partial<{ bannerName: BannerName }>, {}>;
 }
 
 // ----------------------------------
@@ -213,30 +293,25 @@ export declare namespace PasswordResetRequest {
 	export type NewPassword = AuthlessRequest<
 		{},
 		{},
-		Pick<PublicUser, 'password'> & { token?: string; userId?: string }
+		Pick<PublicUser, 'password'> & { token?: string; userId?: string; mfaToken?: string }
 	>;
 }
 
 // ----------------------------------
-//             /save-request-log
+//             /users
 // ----------------------------------
 
-export declare namespace SaveRequestLogRequest {
-	export type Add = AuthenticatedRequest<
+export declare namespace UserRequest {
+	export type Invite = AuthenticatedRequest<
 		{},
 		{},
-		{ request: unknown; response: unknown; workflowId: string; status: 'successful' | 'failed' }
+		Array<{ email: string; role?: AssignableRole }>
 	>;
-}
-
-// ----------------------------------
-//             /users
-// ----------------------------------
 
-export declare namespace UserRequest {
-	export type List = AuthenticatedRequest;
-
-	export type Invite = AuthenticatedRequest<{}, {}, Array<{ email: string }>>;
+	export type InviteResponse = {
+		user: { id: string; email: string; inviteAcceptUrl?: string; emailSent: boolean };
+		error?: string;
+	};
 
 	export type ResolveSignUp = AuthlessRequest<
 		{},
@@ -257,6 +332,8 @@ export declare namespace UserRequest {
 		{ transferId?: string; includeRole: boolean }
 	>;
 
+	export type ChangeRole = AuthenticatedRequest<{ id: string }, {}, UserRoleChangePayload, {}>;
+
 	export type Get = AuthenticatedRequest<
 		{ id: string; email: string; identifier: string },
 		{},
@@ -264,6 +341,14 @@ export declare namespace UserRequest {
 		{ limit?: number; offset?: number; cursor?: string; includeRole?: boolean }
 	>;
 
+	export type PasswordResetLink = AuthenticatedRequest<{ id: string }, {}, {}, {}>;
+
+	export type UserSettingsUpdate = AuthenticatedRequest<
+		{ id: string },
+		{},
+		UserSettingsUpdatePayload
+	>;
+
 	export type Reinvite = AuthenticatedRequest<{ id: string }>;
 
 	export type Update = AuthlessRequest<
@@ -291,9 +376,27 @@ export type LoginRequest = AuthlessRequest<
 		email: string;
 		password: string;
 		otp: string;
+		mfaToken?: string;
+		mfaRecoveryCode?: string;
 	}
 >;
 
+// ----------------------------------
+//          MFA endpoints
+// ----------------------------------
+
+export declare namespace MFA {
+	type Verify = AuthenticatedRequest<{}, {}, { token: string }, {}>;
+	type Activate = AuthenticatedRequest<{}, {}, { token: string }, {}>;
+	type Config = AuthenticatedRequest<{}, {}, { login: { enabled: boolean } }, {}>;
+	type ValidateRecoveryCode = AuthenticatedRequest<
+		{},
+		{},
+		{ recoveryCode: { enabled: boolean } },
+		{}
+	>;
+}
+
 // ----------------------------------
 //          oauth endpoints
 // ----------------------------------
@@ -312,46 +415,49 @@ export declare namespace OAuthRequest {
 	}
 
 	namespace OAuth2Credential {
-		type Auth = OAuth1Credential.Auth;
+		type Auth = AuthenticatedRequest<{}, {}, {}, { id: string }>;
 		type Callback = AuthenticatedRequest<{}, {}, {}, { code: string; state: string }>;
 	}
 }
 
 // ----------------------------------
-//      /node-parameter-options
+//      /dynamic-node-parameters
 // ----------------------------------
+export declare namespace DynamicNodeParametersRequest {
+	type BaseRequest<QueryParams = {}> = AuthenticatedRequest<
+		{
+			nodeTypeAndVersion: INodeTypeNameVersion;
+			currentNodeParameters: INodeParameters;
+			credentials?: INodeCredentials;
+		},
+		{},
+		{},
+		{
+			path: string;
+			nodeTypeAndVersion: string;
+			currentNodeParameters: string;
+			methodName?: string;
+			credentials?: string;
+		} & QueryParams
+	>;
 
-export type NodeParameterOptionsRequest = AuthenticatedRequest<
-	{},
-	{},
-	{},
-	{
-		nodeTypeAndVersion: string;
-		methodName: string;
-		path: string;
-		currentNodeParameters: string;
-		credentials: string;
-	}
->;
-
-// ----------------------------------
-//        /node-list-search
-// ----------------------------------
+	/** GET /dynamic-node-parameters/options */
+	type Options = BaseRequest<{
+		loadOptions?: string;
+	}>;
 
-export type NodeListSearchRequest = AuthenticatedRequest<
-	{},
-	{},
-	{},
-	{
-		nodeTypeAndVersion: string;
+	/** GET /dynamic-node-parameters/resource-locator-results */
+	type ResourceLocatorResults = BaseRequest<{
 		methodName: string;
-		path: string;
-		currentNodeParameters: string;
-		credentials: string;
 		filter?: string;
 		paginationToken?: string;
-	}
->;
+	}>;
+
+	/** GET dynamic-node-parameters/resource-mapper-fields */
+	type ResourceMapperFields = BaseRequest<{
+		methodName: string;
+	}>;
+}
 
 // ----------------------------------
 //             /tags
@@ -395,11 +501,12 @@ export declare namespace LicenseRequest {
 }
 
 export type BinaryDataRequest = AuthenticatedRequest<
-	{ path: string },
+	{},
 	{},
 	{},
 	{
-		mode: 'view' | 'download';
+		id: string;
+		action: 'view' | 'download';
 		fileName?: string;
 		mimeType?: string;
 	}
@@ -418,3 +525,61 @@ export declare namespace VariablesRequest {
 	type Update = AuthenticatedRequest<{ id: string }, {}, CreateUpdatePayload, {}>;
 	type Delete = Get;
 }
+
+export declare namespace ExternalSecretsRequest {
+	type GetProviderResponse = Pick<SecretsProvider, 'displayName' | 'name' | 'properties'> & {
+		icon: string;
+		connected: boolean;
+		connectedAt: Date | null;
+		state: SecretsProviderState;
+		data: IDataObject;
+	};
+
+	type GetProviders = AuthenticatedRequest;
+	type GetProvider = AuthenticatedRequest<{ provider: string }, GetProviderResponse>;
+	type SetProviderSettings = AuthenticatedRequest<{ provider: string }, {}, IDataObject>;
+	type TestProviderSettings = SetProviderSettings;
+	type SetProviderConnected = AuthenticatedRequest<
+		{ provider: string },
+		{},
+		{ connected: boolean }
+	>;
+
+	type UpdateProvider = AuthenticatedRequest<{ provider: string }>;
+}
+
+// ----------------------------------
+//           /orchestration
+// ----------------------------------
+//
+export declare namespace OrchestrationRequest {
+	type GetAll = AuthenticatedRequest;
+	type Get = AuthenticatedRequest<{ id: string }, {}, {}, {}>;
+}
+
+// ----------------------------------
+//           /workflow-history
+// ----------------------------------
+
+export declare namespace WorkflowHistoryRequest {
+	type GetList = AuthenticatedRequest<
+		{ workflowId: string },
+		Array<Omit<WorkflowHistory, 'nodes' | 'connections'>>,
+		{},
+		ListQuery.Options
+	>;
+	type GetVersion = AuthenticatedRequest<
+		{ workflowId: string; versionId: string },
+		WorkflowHistory
+	>;
+}
+
+// ----------------------------------
+//        /active-workflows
+// ----------------------------------
+
+export declare namespace ActiveWorkflowRequest {
+	type GetAllActive = AuthenticatedRequest;
+
+	type GetActivationError = AuthenticatedRequest<{ id: string }>;
+}
diff --git a/packages/cli/src/reusables/index.ts b/packages/cli/src/reusables/index.ts
index 13fd1c36ba734..50ace628dabda 100644
--- a/packages/cli/src/reusables/index.ts
+++ b/packages/cli/src/reusables/index.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/prefer-nullish-coalescing */
 /* eslint-disable @typescript-eslint/naming-convention */
 import type { Application } from 'express';
-import type { DataSource } from 'typeorm';
+// import type { DataSource } from '@n8n/typeorm';
 import config from '@/config';
 import type { RedisOptions } from 'ioredis';
 import Redis from 'ioredis';
@@ -22,7 +22,7 @@ export const getIncidentHandlerConfig = ({
 	connection,
 }: {
 	app: Application;
-	connection: DataSource;
+	connection: any;
 }): IncidentHandlerOptions => {
 	const { host, port, username, password, db }: RedisOptions = config.getEnv('queue.bull.redis');
 	const redis = new Redis({
@@ -50,6 +50,7 @@ export const getIncidentHandlerConfig = ({
 		},
 		redis,
 		zoho: {
+			concurrencyManagerUrl: process.env.CONCURRENCY_MANAGER_URL || '',
 			desk: {
 				config: {
 					accountsUrl:
diff --git a/packages/cli/src/role/role.service.ts b/packages/cli/src/role/role.service.ts
deleted file mode 100644
index d0d52cba35f05..0000000000000
--- a/packages/cli/src/role/role.service.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { Service } from 'typedi';
-import type { EntityManager, FindOptionsWhere } from 'typeorm';
-import { Role } from '@db/entities/Role';
-import { SharedWorkflowRepository } from '@db/repositories';
-
-@Service()
-export class RoleService {
-	constructor(private sharedWorkflowRepository: SharedWorkflowRepository) {}
-
-	static async trxGet(transaction: EntityManager, role: FindOptionsWhere<Role>) {
-		return transaction.findOneBy(Role, role);
-	}
-
-	async getUserRoleForWorkflow(userId: string, workflowId: string) {
-		const shared = await this.sharedWorkflowRepository.findOne({
-			where: { workflowId, userId },
-			relations: ['role'],
-		});
-		return shared?.role;
-	}
-}
diff --git a/packages/cli/src/security-audit/SecurityAudit.service.ts b/packages/cli/src/security-audit/SecurityAudit.service.ts
new file mode 100644
index 0000000000000..afec146065bc0
--- /dev/null
+++ b/packages/cli/src/security-audit/SecurityAudit.service.ts
@@ -0,0 +1,63 @@
+import Container, { Service } from 'typedi';
+
+import config from '@/config';
+import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
+
+import { RISK_CATEGORIES } from '@/security-audit/constants';
+import { toReportTitle } from '@/security-audit/utils';
+import type { Risk, RiskReporter } from '@/security-audit/types';
+
+@Service()
+export class SecurityAuditService {
+	constructor(private readonly workflowRepository: WorkflowRepository) {}
+
+	private reporters: {
+		[name: string]: RiskReporter;
+	} = {};
+
+	async run(categories: Risk.Category[] = RISK_CATEGORIES, daysAbandonedWorkflow?: number) {
+		if (categories.length === 0) categories = RISK_CATEGORIES;
+
+		await this.initReporters(categories);
+
+		const daysFromEnv = config.getEnv('security.audit.daysAbandonedWorkflow');
+
+		if (daysAbandonedWorkflow) {
+			config.set('security.audit.daysAbandonedWorkflow', daysAbandonedWorkflow);
+		}
+
+		const workflows = await this.workflowRepository.find({
+			select: ['id', 'name', 'active', 'nodes', 'connections'],
+		});
+
+		const promises = categories.map(async (c) => await this.reporters[c].report(workflows));
+
+		const reports = (await Promise.all(promises)).filter((r): r is Risk.Report => r !== null);
+
+		if (daysAbandonedWorkflow) {
+			config.set('security.audit.daysAbandonedWorkflow', daysFromEnv); // restore env
+		}
+
+		if (reports.length === 0) return []; // trigger empty state
+
+		return reports.reduce<Risk.Audit>((acc, cur) => {
+			acc[toReportTitle(cur.risk)] = cur;
+
+			return acc;
+		}, {});
+	}
+
+	async initReporters(categories: Risk.Category[]) {
+		for (const category of categories) {
+			const className = category.charAt(0).toUpperCase() + category.slice(1) + 'RiskReporter';
+
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+			const RiskReporterModule = await import(`./risk-reporters/${className}`);
+
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+			const RiskReporterClass = RiskReporterModule[className] as { new (): RiskReporter };
+
+			this.reporters[category] = Container.get(RiskReporterClass);
+		}
+	}
+}
diff --git a/packages/cli/src/security-audit/constants.ts b/packages/cli/src/security-audit/constants.ts
new file mode 100644
index 0000000000000..a47b39986cc3f
--- /dev/null
+++ b/packages/cli/src/security-audit/constants.ts
@@ -0,0 +1,119 @@
+import type { Risk } from '@/security-audit/types';
+
+/**
+ * Risk categories
+ */
+
+export const RISK_CATEGORIES: Risk.Category[] = [
+	'credentials',
+	'database',
+	'nodes',
+	'instance',
+	'filesystem',
+];
+
+/**
+ * Node types
+ */
+
+export const SQL_NODE_TYPES_WITH_QUERY_PARAMS = new Set([
+	'n8n-nodes-base.postgres',
+	'n8n-nodes-base.crateDb',
+	'n8n-nodes-base.questDb',
+	'n8n-nodes-base.timescaleDb',
+]);
+
+export const SQL_NODE_TYPES = new Set([
+	...SQL_NODE_TYPES_WITH_QUERY_PARAMS,
+	'n8n-nodes-base.mySql',
+	'n8n-nodes-base.microsoftSql',
+	'n8n-nodes-base.snowflake',
+]);
+
+export const WEBHOOK_NODE_TYPE = 'n8n-nodes-base.webhook';
+
+export const WEBHOOK_VALIDATOR_NODE_TYPES = new Set([
+	'n8n-nodes-base.if',
+	'n8n-nodes-base.switch',
+	'n8n-nodes-base.code',
+	'n8n-nodes-base.function',
+	'n8n-nodes-base.functionItem',
+]);
+
+export const FILESYSTEM_INTERACTION_NODE_TYPES = new Set([
+	'n8n-nodes-base.readPdf',
+	'n8n-nodes-base.readBinaryFile',
+	'n8n-nodes-base.readBinaryFiles',
+	'n8n-nodes-base.spreadsheetFile',
+	'n8n-nodes-base.writeBinaryFile',
+]);
+
+export const OFFICIAL_RISKY_NODE_TYPES = new Set([
+	'n8n-nodes-base.executeCommand',
+	'n8n-nodes-base.code',
+	'n8n-nodes-base.function',
+	'n8n-nodes-base.functionItem',
+	'n8n-nodes-base.httpRequest',
+	'n8n-nodes-base.ssh',
+	'n8n-nodes-base.ftp',
+]);
+
+/**
+ * Risk reports
+ */
+
+export const DATABASE_REPORT = {
+	RISK: 'database',
+	SECTIONS: {
+		EXPRESSIONS_IN_QUERIES: 'Expressions in "Execute Query" fields in SQL nodes',
+		EXPRESSIONS_IN_QUERY_PARAMS: 'Expressions in "Query Parameters" fields in SQL nodes',
+		UNUSED_QUERY_PARAMS: 'Unused "Query Parameters" fields in SQL nodes',
+	},
+} as const;
+
+export const CREDENTIALS_REPORT = {
+	RISK: 'credentials',
+	SECTIONS: {
+		CREDS_NOT_IN_ANY_USE: 'Credentials not used in any workflow',
+		CREDS_NOT_IN_ACTIVE_USE: 'Credentials not used in any active workflow',
+		CREDS_NOT_RECENTLY_EXECUTED: 'Credentials not used in recently executed workflows',
+	},
+} as const;
+
+export const FILESYSTEM_REPORT = {
+	RISK: 'filesystem',
+	SECTIONS: {
+		FILESYSTEM_INTERACTION_NODES: 'Nodes that interact with the filesystem',
+	},
+} as const;
+
+export const NODES_REPORT = {
+	RISK: 'nodes',
+	SECTIONS: {
+		OFFICIAL_RISKY_NODES: 'Official risky nodes',
+		COMMUNITY_NODES: 'Community nodes',
+		CUSTOM_NODES: 'Custom nodes',
+	},
+} as const;
+
+export const INSTANCE_REPORT = {
+	RISK: 'instance',
+	SECTIONS: {
+		UNPROTECTED_WEBHOOKS: 'Unprotected webhooks in instance',
+		OUTDATED_INSTANCE: 'Outdated instance',
+		SECURITY_SETTINGS: 'Security settings',
+	},
+} as const;
+
+/**
+ * URLs
+ */
+
+export const ENV_VARS_DOCS_URL = 'https://docs.n8n.io/reference/environment-variables.html';
+
+export const DB_QUERY_PARAMS_DOCS_URL =
+	'https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.postgres#use-query-parameters';
+
+export const COMMUNITY_NODES_RISKS_URL = 'https://docs.n8n.io/integrations/community-nodes/risks';
+
+export const NPM_PACKAGE_URL = 'https://www.npmjs.com/package';
diff --git a/packages/cli/src/security-audit/risk-reporters/CredentialsRiskReporter.ts b/packages/cli/src/security-audit/risk-reporters/CredentialsRiskReporter.ts
new file mode 100644
index 0000000000000..04d20199b6c8a
--- /dev/null
+++ b/packages/cli/src/security-audit/risk-reporters/CredentialsRiskReporter.ts
@@ -0,0 +1,143 @@
+import { Service } from 'typedi';
+import type { IWorkflowBase } from 'n8n-workflow';
+import config from '@/config';
+import { CREDENTIALS_REPORT } from '@/security-audit/constants';
+import type { RiskReporter, Risk } from '@/security-audit/types';
+import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
+import { CredentialsRepository } from '@db/repositories/credentials.repository';
+import { ExecutionRepository } from '@db/repositories/execution.repository';
+import { ExecutionDataRepository } from '@db/repositories/executionData.repository';
+
+@Service()
+export class CredentialsRiskReporter implements RiskReporter {
+	constructor(
+		private readonly credentialsRepository: CredentialsRepository,
+		private readonly executionRepository: ExecutionRepository,
+		private readonly executionDataRepository: ExecutionDataRepository,
+	) {}
+
+	async report(workflows: WorkflowEntity[]) {
+		const days = config.getEnv('security.audit.daysAbandonedWorkflow');
+
+		const allExistingCreds = await this.getAllExistingCreds();
+		const { credsInAnyUse, credsInActiveUse } = await this.getAllCredsInUse(workflows);
+		const recentlyExecutedCreds = await this.getCredsInRecentlyExecutedWorkflows(days);
+
+		const credsNotInAnyUse = allExistingCreds.filter((c) => !credsInAnyUse.has(c.id));
+		const credsNotInActiveUse = allExistingCreds.filter((c) => !credsInActiveUse.has(c.id));
+		const credsNotRecentlyExecuted = allExistingCreds.filter(
+			(c) => !recentlyExecutedCreds.has(c.id),
+		);
+
+		const issues = [credsNotInAnyUse, credsNotInActiveUse, credsNotRecentlyExecuted];
+
+		if (issues.every((i) => i.length === 0)) return null;
+
+		const report: Risk.StandardReport = {
+			risk: CREDENTIALS_REPORT.RISK,
+			sections: [],
+		};
+
+		const hint = 'Keeping unused credentials in your instance is an unneeded security risk.';
+		const recommendation = 'Consider deleting these credentials if you no longer need them.';
+
+		const sentenceStart = ({ length }: { length: number }) =>
+			length > 1 ? 'These credentials are' : 'This credential is';
+
+		if (credsNotInAnyUse.length > 0) {
+			report.sections.push({
+				title: CREDENTIALS_REPORT.SECTIONS.CREDS_NOT_IN_ANY_USE,
+				description: [sentenceStart(credsNotInAnyUse), 'not used in any workflow.', hint].join(' '),
+				recommendation,
+				location: credsNotInAnyUse,
+			});
+		}
+
+		if (credsNotInActiveUse.length > 0) {
+			report.sections.push({
+				title: CREDENTIALS_REPORT.SECTIONS.CREDS_NOT_IN_ACTIVE_USE,
+				description: [
+					sentenceStart(credsNotInActiveUse),
+					'not used in active workflows.',
+					hint,
+				].join(' '),
+				recommendation,
+				location: credsNotInActiveUse,
+			});
+		}
+
+		if (credsNotRecentlyExecuted.length > 0) {
+			report.sections.push({
+				title: CREDENTIALS_REPORT.SECTIONS.CREDS_NOT_RECENTLY_EXECUTED,
+				description: [
+					sentenceStart(credsNotRecentlyExecuted),
+					`not used in recently executed workflows, i.e. workflows executed in the past ${days} days.`,
+					hint,
+				].join(' '),
+				recommendation,
+				location: credsNotRecentlyExecuted,
+			});
+		}
+
+		return report;
+	}
+
+	private async getAllCredsInUse(workflows: WorkflowEntity[]) {
+		const credsInAnyUse = new Set<string>();
+		const credsInActiveUse = new Set<string>();
+
+		workflows.forEach((workflow) => {
+			workflow.nodes.forEach((node) => {
+				if (!node.credentials) return;
+
+				Object.values(node.credentials).forEach((cred) => {
+					if (!cred?.id) return;
+
+					credsInAnyUse.add(cred.id);
+
+					if (workflow.active) credsInActiveUse.add(cred.id);
+				});
+			});
+		});
+
+		return {
+			credsInAnyUse,
+			credsInActiveUse,
+		};
+	}
+
+	private async getAllExistingCreds() {
+		const credentials = await this.credentialsRepository.find({ select: ['id', 'name'] });
+
+		return credentials.map(({ id, name }) => ({ kind: 'credential' as const, id, name }));
+	}
+
+	private async getExecutedWorkflowsInPastDays(days: number): Promise<IWorkflowBase[]> {
+		const date = new Date();
+
+		date.setDate(date.getDate() - days);
+
+		const executionIds = await this.executionRepository.getIdsSince(date);
+
+		return await this.executionDataRepository.findByExecutionIds(executionIds);
+	}
+
+	/**
+	 * Return IDs of credentials in workflows executed in the past n days.
+	 */
+	private async getCredsInRecentlyExecutedWorkflows(days: number) {
+		const executedWorkflows = await this.getExecutedWorkflowsInPastDays(days);
+
+		return executedWorkflows.reduce<Set<string>>((acc, { nodes }) => {
+			nodes.forEach((node) => {
+				if (node.credentials) {
+					Object.values(node.credentials).forEach((c) => {
+						if (c.id) acc.add(c.id);
+					});
+				}
+			});
+
+			return acc;
+		}, new Set());
+	}
+}
diff --git a/packages/cli/src/security-audit/risk-reporters/DatabaseRiskReporter.ts b/packages/cli/src/security-audit/risk-reporters/DatabaseRiskReporter.ts
new file mode 100644
index 0000000000000..2632917f8f8da
--- /dev/null
+++ b/packages/cli/src/security-audit/risk-reporters/DatabaseRiskReporter.ts
@@ -0,0 +1,110 @@
+import { toFlaggedNode } from '@/security-audit/utils';
+import {
+	SQL_NODE_TYPES,
+	DATABASE_REPORT,
+	DB_QUERY_PARAMS_DOCS_URL,
+	SQL_NODE_TYPES_WITH_QUERY_PARAMS,
+} from '@/security-audit/constants';
+import type { WorkflowEntity as Workflow } from '@db/entities/WorkflowEntity';
+import type { RiskReporter, Risk } from '@/security-audit/types';
+import { Service } from 'typedi';
+
+@Service()
+export class DatabaseRiskReporter implements RiskReporter {
+	async report(workflows: Workflow[]) {
+		const { expressionsInQueries, expressionsInQueryParams, unusedQueryParams } =
+			this.getIssues(workflows);
+
+		const issues = [expressionsInQueries, expressionsInQueryParams, unusedQueryParams];
+
+		if (issues.every((i) => i.length === 0)) return null;
+
+		const report: Risk.StandardReport = {
+			risk: DATABASE_REPORT.RISK,
+			sections: [],
+		};
+
+		const sentenceStart = ({ length }: { length: number }) =>
+			length > 1 ? 'These SQL nodes have' : 'This SQL node has';
+
+		if (expressionsInQueries.length > 0) {
+			report.sections.push({
+				title: DATABASE_REPORT.SECTIONS.EXPRESSIONS_IN_QUERIES,
+				description: [
+					sentenceStart(expressionsInQueries),
+					'an expression in the "Query" field of an "Execute Query" operation. Building a SQL query with an expression may lead to a SQL injection attack.',
+				].join(' '),
+				recommendation:
+					'Consider using the "Query Parameters" field to pass parameters to the query, or validating the input of the expression in the "Query" field.',
+				location: expressionsInQueries,
+			});
+		}
+
+		if (expressionsInQueryParams.length > 0) {
+			report.sections.push({
+				title: DATABASE_REPORT.SECTIONS.EXPRESSIONS_IN_QUERY_PARAMS,
+				description: [
+					sentenceStart(expressionsInQueryParams),
+					'an expression in the "Query Parameters" field of an "Execute Query" operation. Building a SQL query with an expression may lead to a SQL injection attack.',
+				].join(' '),
+				recommendation:
+					'Consider validating the input of the expression in the "Query Parameters" field.',
+				location: expressionsInQueryParams,
+			});
+		}
+
+		if (unusedQueryParams.length > 0) {
+			report.sections.push({
+				title: DATABASE_REPORT.SECTIONS.UNUSED_QUERY_PARAMS,
+				description: [
+					sentenceStart(unusedQueryParams),
+					'no "Query Parameters" field in the "Execute Query" operation. Building a SQL query with unsanitized data may lead to a SQL injection attack.',
+				].join(' '),
+				recommendation: `Consider using the "Query Parameters" field to sanitize parameters passed to the query. See: ${DB_QUERY_PARAMS_DOCS_URL}`,
+				location: unusedQueryParams,
+			});
+		}
+
+		return report;
+	}
+
+	private getIssues(workflows: Workflow[]) {
+		return workflows.reduce<{ [sectionTitle: string]: Risk.NodeLocation[] }>(
+			(acc, workflow) => {
+				workflow.nodes.forEach((node) => {
+					if (!SQL_NODE_TYPES.has(node.type)) return;
+					if (node.parameters === undefined) return;
+					if (node.parameters.operation !== 'executeQuery') return;
+
+					if (typeof node.parameters.query === 'string' && node.parameters.query.startsWith('=')) {
+						acc.expressionsInQueries.push(toFlaggedNode({ node, workflow }));
+					}
+
+					if (!SQL_NODE_TYPES_WITH_QUERY_PARAMS.has(node.type)) return;
+
+					if (!node.parameters.additionalFields) {
+						acc.unusedQueryParams.push(toFlaggedNode({ node, workflow }));
+					}
+
+					if (typeof node.parameters.additionalFields !== 'object') return;
+					if (node.parameters.additionalFields === null) return;
+
+					if (!('queryParams' in node.parameters.additionalFields)) {
+						acc.unusedQueryParams.push(toFlaggedNode({ node, workflow }));
+					}
+
+					if (
+						'queryParams' in node.parameters.additionalFields &&
+						typeof node.parameters.additionalFields.queryParams === 'string' &&
+						node.parameters.additionalFields.queryParams.startsWith('=')
+					) {
+						acc.expressionsInQueryParams.push(toFlaggedNode({ node, workflow }));
+					}
+				});
+
+				return acc;
+			},
+			{ expressionsInQueries: [], expressionsInQueryParams: [], unusedQueryParams: [] },
+		);
+	}
+}
diff --git a/packages/cli/src/security-audit/risk-reporters/FilesystemRiskReporter.ts b/packages/cli/src/security-audit/risk-reporters/FilesystemRiskReporter.ts
new file mode 100644
index 0000000000000..f2cb5eb092575
--- /dev/null
+++ b/packages/cli/src/security-audit/risk-reporters/FilesystemRiskReporter.ts
@@ -0,0 +1,39 @@
+import { getNodeTypes } from '@/security-audit/utils';
+import { FILESYSTEM_INTERACTION_NODE_TYPES, FILESYSTEM_REPORT } from '@/security-audit/constants';
+import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
+import type { RiskReporter, Risk } from '@/security-audit/types';
+import { Service } from 'typedi';
+
+@Service()
+export class FilesystemRiskReporter implements RiskReporter {
+	async report(workflows: WorkflowEntity[]) {
+		const fsInteractionNodeTypes = getNodeTypes(workflows, (node) =>
+			FILESYSTEM_INTERACTION_NODE_TYPES.has(node.type),
+		);
+
+		if (fsInteractionNodeTypes.length === 0) return null;
+
+		const report: Risk.StandardReport = {
+			risk: FILESYSTEM_REPORT.RISK,
+			sections: [],
+		};
+
+		const sentenceStart = ({ length }: { length: number }) =>
+			length > 1 ? 'These nodes read from and write to' : 'This node reads from and writes to';
+
+		if (fsInteractionNodeTypes.length > 0) {
+			report.sections.push({
+				title: FILESYSTEM_REPORT.SECTIONS.FILESYSTEM_INTERACTION_NODES,
+				description: [
+					sentenceStart(fsInteractionNodeTypes),
+					'any accessible file in the host filesystem. Sensitive file content may be manipulated through a node operation.',
+				].join(' '),
+				recommendation:
+					'Consider protecting any sensitive files in the host filesystem, or refactoring the workflow so that it does not require host filesystem interaction.',
+				location: fsInteractionNodeTypes,
+			});
+		}
+
+		return report;
+	}
+}
diff --git a/packages/cli/src/security-audit/risk-reporters/InstanceRiskReporter.ts b/packages/cli/src/security-audit/risk-reporters/InstanceRiskReporter.ts
new file mode 100644
index 0000000000000..47568b06f3220
--- /dev/null
+++ b/packages/cli/src/security-audit/risk-reporters/InstanceRiskReporter.ts
@@ -0,0 +1,209 @@
+import axios from 'axios';
+import { Service } from 'typedi';
+import { InstanceSettings } from 'n8n-core';
+import config from '@/config';
+import { toFlaggedNode } from '@/security-audit/utils';
+import { separate } from '@/utils';
+import {
+	ENV_VARS_DOCS_URL,
+	INSTANCE_REPORT,
+	WEBHOOK_NODE_TYPE,
+	WEBHOOK_VALIDATOR_NODE_TYPES,
+} from '@/security-audit/constants';
+import { getN8nPackageJson, inDevelopment } from '@/constants';
+import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
+import type { RiskReporter, Risk, n8n } from '@/security-audit/types';
+import { isApiEnabled } from '@/PublicApi';
+import { Logger } from '@/Logger';
+
+@Service()
+export class InstanceRiskReporter implements RiskReporter {
+	constructor(
+		private readonly instanceSettings: InstanceSettings,
+		private readonly logger: Logger,
+	) {}
+
+	async report(workflows: WorkflowEntity[]) {
+		const unprotectedWebhooks = this.getUnprotectedWebhookNodes(workflows);
+		const outdatedState = await this.getOutdatedState();
+		const securitySettings = this.getSecuritySettings();
+
+		if (unprotectedWebhooks.length === 0 && outdatedState === null && securitySettings === null) {
+			return null;
+		}
+
+		const report: Risk.Report = {
+			risk: INSTANCE_REPORT.RISK,
+			sections: [],
+		};
+
+		if (unprotectedWebhooks.length > 0) {
+			const sentenceStart = ({ length }: { length: number }) =>
+				length > 1 ? 'These webhook nodes have' : 'This webhook node has';
+
+			const recommendedValidators = [...WEBHOOK_VALIDATOR_NODE_TYPES]
+				.filter((nodeType) => !nodeType.endsWith('function') || !nodeType.endsWith('functionItem'))
+				.join(',');
+
+			report.sections.push({
+				title: INSTANCE_REPORT.SECTIONS.UNPROTECTED_WEBHOOKS,
+				description: [
+					sentenceStart(unprotectedWebhooks),
+					`the "Authentication" field set to "None" and ${
+						unprotectedWebhooks.length > 1 ? 'are' : 'is'
+					} not directly connected to a node to validate the payload. Every unprotected webhook allows your workflow to be called by any third party who knows the webhook URL.`,
+				].join(' '),
+				recommendation: `Consider setting the "Authentication" field to an option other than "None", or validating the payload with one of the following nodes: ${recommendedValidators}.`,
+				location: unprotectedWebhooks,
+			});
+		}
+
+		if (outdatedState !== null) {
+			report.sections.push({
+				title: INSTANCE_REPORT.SECTIONS.OUTDATED_INSTANCE,
+				description: outdatedState.description,
+				recommendation:
+					'Consider updating this n8n instance to the latest version to prevent security vulnerabilities.',
+				nextVersions: outdatedState.nextVersions,
+			});
+		}
+
+		if (securitySettings !== null) {
+			report.sections.push({
+				title: INSTANCE_REPORT.SECTIONS.SECURITY_SETTINGS,
+				description: 'This n8n instance has the following security settings.',
+				recommendation: `Consider adjusting the security settings for your n8n instance based on your needs. See: ${ENV_VARS_DOCS_URL}`,
+				settings: securitySettings,
+			});
+		}
+
+		return report;
+	}
+
+	private getSecuritySettings() {
+		if (config.getEnv('deployment.type') === 'cloud') return null;
+
+		const settings: Record<string, unknown> = {};
+
+		settings.features = {
+			communityPackagesEnabled: config.getEnv('nodes.communityPackages.enabled'),
+			versionNotificationsEnabled: config.getEnv('versionNotifications.enabled'),
+			templatesEnabled: config.getEnv('templates.enabled'),
+			publicApiEnabled: isApiEnabled(),
+		};
+
+		settings.nodes = {
+			nodesExclude: config.getEnv('nodes.exclude') ?? 'none',
+			nodesInclude: config.getEnv('nodes.include') ?? 'none',
+		};
+
+		settings.telemetry = {
+			diagnosticsEnabled: config.getEnv('diagnostics.enabled'),
+		};
+
+		return settings;
+	}
+
+	/**
+	 * Whether a webhook node has a direct child assumed to validate its payload.
+	 */
+	private hasValidatorChild({
+		node,
+		workflow,
+	}: {
+		node: WorkflowEntity['nodes'][number];
+		workflow: WorkflowEntity;
+	}) {
+		const childNodeNames = workflow.connections[node.name]?.main[0].map((i) => i.node);
+
+		if (!childNodeNames) return false;
+
+		return childNodeNames.some((name) =>
+			workflow.nodes.find((n) => n.name === name && WEBHOOK_VALIDATOR_NODE_TYPES.has(n.type)),
+		);
+	}
+
+	private getUnprotectedWebhookNodes(workflows: WorkflowEntity[]) {
+		return workflows.reduce<Risk.NodeLocation[]>((acc, workflow) => {
+			if (!workflow.active) return acc;
+
+			workflow.nodes.forEach((node) => {
+				if (
+					node.type === WEBHOOK_NODE_TYPE &&
+					node.parameters.authentication === undefined &&
+					!this.hasValidatorChild({ node, workflow })
+				) {
+					acc.push(toFlaggedNode({ node, workflow }));
+				}
+			});
+
+			return acc;
+		}, []);
+	}
+
+	private async getNextVersions(currentVersionName: string) {
+		const BASE_URL = config.getEnv('versionNotifications.endpoint');
+		const { instanceId } = this.instanceSettings;
+
+		const response = await axios.get<n8n.Version[]>(BASE_URL + currentVersionName, {
+			// eslint-disable-next-line @typescript-eslint/naming-convention
+			headers: { 'n8n-instance-id': instanceId },
+		});
+
+		return response.data;
+	}
+
+	private removeIconData(versions: n8n.Version[]) {
+		return versions.map((version) => {
+			if (version.nodes.length === 0) return version;
+
+			version.nodes.forEach((node) => delete node.iconData);
+
+			return version;
+		});
+	}
+
+	private classify(versions: n8n.Version[], currentVersionName: string) {
+		const [pass, fail] = separate(versions, (v) => v.name === currentVersionName);
+
+		return { currentVersion: pass[0], nextVersions: fail };
+	}
+
+	private async getOutdatedState() {
+		let versions = [];
+
+		const localVersion = getN8nPackageJson().version;
+
+		try {
+			versions = await this.getNextVersions(localVersion).then((v) => this.removeIconData(v));
+		} catch (error) {
+			if (inDevelopment) {
+				this.logger.error('Failed to fetch n8n versions. Skipping outdated instance report...');
+			}
+			return null;
+		}
+
+		const { currentVersion, nextVersions } = this.classify(versions, localVersion);
+
+		const nextVersionsNumber = nextVersions.length;
+
+		if (nextVersionsNumber === 0) return null;
+
+		const description = [
+			`This n8n instance is outdated. Currently at version ${
+				currentVersion.name
+			}, missing ${nextVersionsNumber} ${nextVersionsNumber > 1 ? 'updates' : 'update'}.`,
+		];
+
+		const upcomingSecurityUpdates = nextVersions.some(
+			(v) => v.hasSecurityIssue || v.hasSecurityFix,
+		);
+
+		if (upcomingSecurityUpdates) description.push('Newer versions contain security updates.');
+
+		return {
+			description: description.join(' '),
+			nextVersions,
+		};
+	}
+}
diff --git a/packages/cli/src/security-audit/risk-reporters/NodesRiskReporter.ts b/packages/cli/src/security-audit/risk-reporters/NodesRiskReporter.ts
new file mode 100644
index 0000000000000..f98afb8a3df0f
--- /dev/null
+++ b/packages/cli/src/security-audit/risk-reporters/NodesRiskReporter.ts
@@ -0,0 +1,123 @@
+import * as path from 'path';
+import glob from 'fast-glob';
+import { Service } from 'typedi';
+import config from '@/config';
+import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
+import { getNodeTypes } from '@/security-audit/utils';
+import {
+	OFFICIAL_RISKY_NODE_TYPES,
+	ENV_VARS_DOCS_URL,
+	NODES_REPORT,
+	COMMUNITY_NODES_RISKS_URL,
+	NPM_PACKAGE_URL,
+} from '@/security-audit/constants';
+import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
+import type { Risk, RiskReporter } from '@/security-audit/types';
+import { CommunityPackagesService } from '@/services/communityPackages.service';
+
+@Service()
+export class NodesRiskReporter implements RiskReporter {
+	constructor(
+		private readonly loadNodesAndCredentials: LoadNodesAndCredentials,
+		private readonly communityPackagesService: CommunityPackagesService,
+	) {}
+
+	async report(workflows: WorkflowEntity[]) {
+		const officialRiskyNodes = getNodeTypes(workflows, (node) =>
+			OFFICIAL_RISKY_NODE_TYPES.has(node.type),
+		);
+
+		const [communityNodes, customNodes] = await Promise.all([
+			this.getCommunityNodeDetails(),
+			this.getCustomNodeDetails(),
+		]);
+
+		const issues = [officialRiskyNodes, communityNodes, customNodes];
+
+		if (issues.every((i) => i.length === 0)) return null;
+
+		const report: Risk.StandardReport = {
+			risk: NODES_REPORT.RISK,
+			sections: [],
+		};
+
+		const sentenceStart = (length: number) => (length > 1 ? 'These nodes are' : 'This node is');
+
+		if (officialRiskyNodes.length > 0) {
+			report.sections.push({
+				title: NODES_REPORT.SECTIONS.OFFICIAL_RISKY_NODES,
+				description: [
+					sentenceStart(officialRiskyNodes.length),
+					"part of n8n's official nodes and may be used to fetch and run any arbitrary code in the host system. This may lead to exploits such as remote code execution.",
+				].join(' '),
+				recommendation: `Consider reviewing the parameters in these nodes, replacing them with app nodes where possible, and not loading unneeded node types with the NODES_EXCLUDE environment variable. See: ${ENV_VARS_DOCS_URL}`,
+				location: officialRiskyNodes,
+			});
+		}
+
+		if (communityNodes.length > 0) {
+			report.sections.push({
+				title: NODES_REPORT.SECTIONS.COMMUNITY_NODES,
+				description: [
+					sentenceStart(communityNodes.length),
+					`sourced from the n8n community. Community nodes are not vetted by the n8n team and have full access to the host system. See: ${COMMUNITY_NODES_RISKS_URL}`,
+				].join(' '),
+				recommendation:
+					'Consider reviewing the source code in any community nodes installed in this n8n instance, and uninstalling any community nodes no longer in use.',
+				location: communityNodes,
+			});
+		}
+
+		if (customNodes.length > 0) {
+			report.sections.push({
+				title: NODES_REPORT.SECTIONS.CUSTOM_NODES,
+				description: [
+					sentenceStart(communityNodes.length),
+					'unpublished and located in the host system. Custom nodes are not vetted by the n8n team and have full access to the host system.',
+				].join(' '),
+				recommendation:
+					'Consider reviewing the source code in any custom node installed in this n8n instance, and removing any custom nodes no longer in use.',
+				location: customNodes,
+			});
+		}
+
+		return report;
+	}
+
+	private async getCommunityNodeDetails() {
+		if (!config.getEnv('nodes.communityPackages.enabled')) return [];
+
+		const installedPackages = await this.communityPackagesService.getAllInstalledPackages();
+
+		return installedPackages.reduce<Risk.CommunityNodeDetails[]>((acc, pkg) => {
+			pkg.installedNodes.forEach((node) =>
+				acc.push({
+					kind: 'community',
+					nodeType: node.type,
+					packageUrl: [NPM_PACKAGE_URL, pkg.packageName].join('/'),
+				}),
+			);
+
+			return acc;
+		}, []);
+	}
+
+	private async getCustomNodeDetails() {
+		const customNodeTypes: Risk.CustomNodeDetails[] = [];
+
+		for (const customDir of this.loadNodesAndCredentials.getCustomDirectories()) {
+			const customNodeFiles = await glob('**/*.node.js', { cwd: customDir, absolute: true });
+
+			for (const nodeFile of customNodeFiles) {
+				const [fileName] = path.parse(nodeFile).name.split('.');
+				customNodeTypes.push({
+					kind: 'custom',
+					nodeType: ['CUSTOM', fileName].join('.'),
+					filePath: nodeFile,
+				});
+			}
+		}
+
+		return customNodeTypes;
+	}
+}
diff --git a/packages/cli/src/security-audit/types.ts b/packages/cli/src/security-audit/types.ts
new file mode 100644
index 0000000000000..131eb0616decd
--- /dev/null
+++ b/packages/cli/src/security-audit/types.ts
@@ -0,0 +1,90 @@
+import type { WorkflowEntity as Workflow } from '@db/entities/WorkflowEntity';
+
+export namespace Risk {
+	export type Category = 'database' | 'credentials' | 'nodes' | 'instance' | 'filesystem';
+
+	type CredLocation = {
+		kind: 'credential';
+		id: string;
+		name: string;
+	};
+
+	export type NodeLocation = {
+		kind: 'node';
+		workflowId: string;
+		workflowName: string;
+		nodeId: string;
+		nodeName: string;
+		nodeType: string;
+	};
+
+	export type CommunityNodeDetails = {
+		kind: 'community';
+		nodeType: string;
+		packageUrl: string;
+	};
+
+	export type CustomNodeDetails = {
+		kind: 'custom';
+		nodeType: string;
+		filePath: string;
+	};
+
+	type SectionBase = {
+		title: string;
+		description: string;
+		recommendation: string;
+	};
+
+	export type Report = StandardReport | InstanceReport;
+
+	export type StandardSection = SectionBase & {
+		location: NodeLocation[] | CredLocation[] | CommunityNodeDetails[] | CustomNodeDetails[];
+	};
+
+	export type InstanceSection = SectionBase & {
+		location?: NodeLocation[];
+		settings?: Record<string, unknown>;
+		nextVersions?: n8n.Version[];
+	};
+
+	export type StandardReport = {
+		risk: Exclude<Category, 'instance'>;
+		sections: StandardSection[];
+	};
+
+	export type InstanceReport = {
+		risk: 'instance';
+		sections: InstanceSection[];
+	};
+
+	export type Audit = {
+		[reportTitle: string]: Report;
+	};
+
+	export type SyncReportFn = (workflows: Workflow[]) => StandardReport | null;
+
+	export type AsyncReportFn = (workflows: Workflow[]) => Promise<Report | null>;
+}
+
+export namespace n8n {
+	export type Version = {
+		name: string;
+		nodes: Array<
+			Workflow['nodes'][number] & {
+				iconData?: { type: string; fileBuffer: string }; // removed to declutter report
+			}
+		>;
+		createdAt: string;
+		description: string;
+		documentationUrl: string;
+		hasBreakingChange: boolean;
+		hasSecurityFix: boolean;
+		hasSecurityIssue: boolean;
+		securityIssueFixVersion: string;
+	};
+}
+
+export interface RiskReporter {
+	report(workflows: Workflow[]): Promise<Risk.Report | null>;
+}
diff --git a/packages/cli/src/security-audit/utils.ts b/packages/cli/src/security-audit/utils.ts
new file mode 100644
index 0000000000000..14dd1ff9d19e9
--- /dev/null
+++ b/packages/cli/src/security-audit/utils.ts
@@ -0,0 +1,26 @@
+import type { WorkflowEntity as Workflow } from '@db/entities/WorkflowEntity';
+import type { Risk } from '@/security-audit/types';
+
+type Node = Workflow['nodes'][number];
+
+export const toFlaggedNode = ({ node, workflow }: { node: Node; workflow: Workflow }) => ({
+	kind: 'node' as const,
+	workflowId: workflow.id,
+	workflowName: workflow.name,
+	nodeId: node.id,
+	nodeName: node.name,
+	nodeType: node.type,
+});
+
+export const toReportTitle = (riskCategory: Risk.Category) =>
+	riskCategory.charAt(0).toUpperCase() + riskCategory.slice(1) + ' Risk Report';
+
+export function getNodeTypes(workflows: Workflow[], test: (element: Node) => boolean) {
+	return workflows.reduce<Risk.NodeLocation[]>((acc, workflow) => {
+		workflow.nodes.forEach((node) => {
+			if (test(node)) acc.push(toFlaggedNode({ node, workflow }));
+		});
+
+		return acc;
+	}, []);
+}
diff --git a/packages/cli/src/services/activeWorkflows.service.ts b/packages/cli/src/services/activeWorkflows.service.ts
new file mode 100644
index 0000000000000..25de43fd1cced
--- /dev/null
+++ b/packages/cli/src/services/activeWorkflows.service.ts
@@ -0,0 +1,52 @@
+import { Service } from 'typedi';
+
+import type { User } from '@db/entities/User';
+import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
+import { WorkflowRepository } from '@db/repositories/workflow.repository';
+import { ActivationErrorsService } from '@/ActivationErrors.service';
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
+import { Logger } from '@/Logger';
+
+@Service()
+export class ActiveWorkflowsService {
+	constructor(
+		private readonly logger: Logger,
+		private readonly workflowRepository: WorkflowRepository,
+		private readonly sharedWorkflowRepository: SharedWorkflowRepository,
+		private readonly activationErrorsService: ActivationErrorsService,
+	) {}
+
+	async getAllActiveIdsInStorage() {
+		const activationErrors = await this.activationErrorsService.getAll();
+		const activeWorkflowIds = await this.workflowRepository.getActiveIds();
+		return activeWorkflowIds.filter((workflowId) => !activationErrors[workflowId]);
+	}
+
+	async getAllActiveIdsFor(user: User) {
+		const activationErrors = await this.activationErrorsService.getAll();
+		const activeWorkflowIds = await this.workflowRepository.getActiveIds();
+
+		const hasFullAccess = user.hasGlobalScope('workflow:list');
+		if (hasFullAccess) {
+			return activeWorkflowIds.filter((workflowId) => !activationErrors[workflowId]);
+		}
+
+		const sharedWorkflowIds =
+			await this.sharedWorkflowRepository.getSharedWorkflowIds(activeWorkflowIds);
+		return sharedWorkflowIds.filter((workflowId) => !activationErrors[workflowId]);
+	}
+
+	async getActivationError(workflowId: string, user: User) {
+		const hasAccess = await this.sharedWorkflowRepository.hasAccess(workflowId, user);
+		if (!hasAccess) {
+			this.logger.verbose('User attempted to access workflow errors without permissions', {
+				workflowId,
+				userId: user.id,
+			});
+
+			throw new BadRequestError(`Workflow with ID "${workflowId}" could not be found.`);
+		}
+
+		return await this.activationErrorsService.get(workflowId);
+	}
+}
diff --git a/packages/cli/src/services/ai.service.ts b/packages/cli/src/services/ai.service.ts
new file mode 100644
index 0000000000000..b2720d7cc6f47
--- /dev/null
+++ b/packages/cli/src/services/ai.service.ts
@@ -0,0 +1,192 @@
+import { Service } from 'typedi';
+import config from '@/config';
+import type { N8nAIProviderType } from 'n8n-workflow';
+import { ApplicationError, jsonParse } from 'n8n-workflow';
+import type { BaseMessageLike } from '@langchain/core/messages';
+import { AIProviderOpenAI } from '@/services/ai/providers/openai';
+import type { BaseChatModelCallOptions } from '@langchain/core/language_models/chat_models';
+import { Pinecone } from '@pinecone-database/pinecone';
+import type { z } from 'zod';
+import apiKnowledgebase from '@/services/ai/resources/api-knowledgebase.json';
+import { JsonOutputFunctionsParser } from 'langchain/output_parsers';
+import {
+	generateCurlCommandFallbackPromptTemplate,
+	generateCurlCommandPromptTemplate,
+} from '@/services/ai/prompts/generateCurl';
+import { generateCurlSchema } from '@/services/ai/schemas/generateCurl';
+import { PineconeStore } from '@langchain/pinecone';
+import Fuse from 'fuse.js';
+interface APIKnowledgebaseService {
+	id: string;
+	title: string;
+	description?: string;
+}
+
+function isN8nAIProviderType(value: string): value is N8nAIProviderType {
+	return ['openai'].includes(value);
+}
+
+@Service()
+export class AIService {
+	private providerType: N8nAIProviderType = 'unknown';
+
+	public provider: AIProviderOpenAI;
+
+	public pinecone: Pinecone;
+
+	private jsonOutputParser = new JsonOutputFunctionsParser();
+
+	constructor() {
+		const providerName = config.getEnv('ai.provider');
+
+		if (isN8nAIProviderType(providerName)) {
+			this.providerType = providerName;
+		}
+
+		if (this.providerType === 'openai') {
+			const openAIApiKey = config.getEnv('ai.openAI.apiKey');
+			const openAIModelName = config.getEnv('ai.openAI.model');
+
+			if (openAIApiKey) {
+				this.provider = new AIProviderOpenAI({ openAIApiKey, modelName: openAIModelName });
+			}
+		}
+
+		const pineconeApiKey = config.getEnv('ai.pinecone.apiKey');
+		if (pineconeApiKey) {
+			this.pinecone = new Pinecone({
+				apiKey: pineconeApiKey,
+			});
+		}
+	}
+
+	async prompt(messages: BaseMessageLike[], options?: BaseChatModelCallOptions) {
+		if (!this.provider) {
+			throw new ApplicationError('No AI provider has been configured.');
+		}
+
+		return await this.provider.invoke(messages, options);
+	}
+
+	validateCurl(result: { curl: string }) {
+		if (!result.curl.startsWith('curl')) {
+			throw new ApplicationError(
+				'The generated HTTP Request Node parameters format is incorrect. Please adjust your request and try again.',
+			);
+		}
+
+		result.curl = result.curl
+			/*
+			 * Replaces placeholders like `{VALUE}` or `{{VALUE}}` with quoted placeholders `"{VALUE}"` or `"{{VALUE}}"`,
+			 * ensuring that the placeholders are properly formatted within the curl command.
+			 * - ": a colon followed by a double quote and a space
+			 * - ( starts a capturing group
+			 *   - \{\{ two opening curly braces
+			 *   - [A-Za-z0-9_]+ one or more alphanumeric characters or underscores
+			 *   - }} two closing curly braces
+			 *   - | OR
+			 *   - \{ an opening curly brace
+			 *   - [A-Za-z0-9_]+ one or more alphanumeric characters or underscores
+			 *   - } a closing curly brace
+			 * - ) ends the capturing group
+			 * - /g performs a global search and replace
+			 *
+			 */
+			.replace(/": (\{\{[A-Za-z0-9_]+}}|\{[A-Za-z0-9_]+})/g, '": "$1"') // Fix for placeholders `curl -d '{ "key": {VALUE} }'`
+			/*
+			 * Removes the rogue curly bracket at the end of the curl command if it is present.
+			 * It ensures that the curl command is properly formatted and doesn't have an extra closing curly bracket.
+			 * - ( starts a capturing group
+			 *   - -d flag in the curl command
+			 *   - ' a single quote
+			 *   - [^']+ one or more characters that are not a single quote
+			 *   - ' a single quote
+			 * - ) ends the capturing group
+			 * - } a closing curly bracket
+			 */
+			.replace(/(-d '[^']+')}/, '$1'); // Fix for rogue curly bracket `curl -d '{ "key": "value" }'}`
+
+		return result;
+	}
+
+	async generateCurl(serviceName: string, serviceRequest: string) {
+		this.checkRequirements();
+
+		if (!this.pinecone) {
+			return await this.generateCurlGeneric(serviceName, serviceRequest);
+		}
+
+		const fuse = new Fuse(apiKnowledgebase as unknown as APIKnowledgebaseService[], {
+			threshold: 0.25,
+			useExtendedSearch: true,
+			keys: ['id', 'title'],
+		});
+
+		const matchedServices = fuse
+			.search(serviceName.replace(/ +/g, '|'))
+			.map((result) => result.item);
+
+		if (matchedServices.length === 0) {
+			return await this.generateCurlGeneric(serviceName, serviceRequest);
+		}
+
+		const pcIndex = this.pinecone.Index('api-knowledgebase');
+		const vectorStore = await PineconeStore.fromExistingIndex(this.provider.embeddings, {
+			namespace: 'endpoints',
+			pineconeIndex: pcIndex,
+		});
+
+		const matchedDocuments = await vectorStore.similaritySearch(
+			`${serviceName} ${serviceRequest}`,
+			4,
+			{
+				id: {
+					$in: matchedServices.map((service) => service.id),
+				},
+			},
+		);
+
+		if (matchedDocuments.length === 0) {
+			return await this.generateCurlGeneric(serviceName, serviceRequest);
+		}
+
+		const aggregatedDocuments = matchedDocuments.reduce<unknown[]>((acc, document) => {
+			const pageData = jsonParse(document.pageContent);
+
+			acc.push(pageData);
+
+			return acc;
+		}, []);
+
+		const generateCurlChain = generateCurlCommandPromptTemplate
+			.pipe(this.provider.modelWithOutputParser(generateCurlSchema))
+			.pipe(this.jsonOutputParser);
+		const result = (await generateCurlChain.invoke({
+			endpoints: JSON.stringify(aggregatedDocuments),
+			serviceName,
+			serviceRequest,
+		})) as z.infer<typeof generateCurlSchema>;
+
+		return this.validateCurl(result);
+	}
+
+	async generateCurlGeneric(serviceName: string, serviceRequest: string) {
+		this.checkRequirements();
+
+		const generateCurlFallbackChain = generateCurlCommandFallbackPromptTemplate
+			.pipe(this.provider.modelWithOutputParser(generateCurlSchema))
+			.pipe(this.jsonOutputParser);
+		const result = (await generateCurlFallbackChain.invoke({
+			serviceName,
+			serviceRequest,
+		})) as z.infer<typeof generateCurlSchema>;
+
+		return this.validateCurl(result);
+	}
+
+	checkRequirements() {
+		if (!this.provider) {
+			throw new ApplicationError('No AI provider has been configured.');
+		}
+	}
+}
diff --git a/packages/cli/src/services/ai/prompts/generateCurl.ts b/packages/cli/src/services/ai/prompts/generateCurl.ts
new file mode 100644
index 0000000000000..6c1dda57c6ed0
--- /dev/null
+++ b/packages/cli/src/services/ai/prompts/generateCurl.ts
@@ -0,0 +1,67 @@
+import {
+	ChatPromptTemplate,
+	HumanMessagePromptTemplate,
+	SystemMessagePromptTemplate,
+} from '@langchain/core/prompts';
+
+export const generateCurlCommandPromptTemplate = new ChatPromptTemplate({
+	promptMessages: [
+		SystemMessagePromptTemplate.fromTemplate(`# What you need to do
+
+You are a curl command generator engine. Your task is to provide a curl command that the user could run to call the endpoint they described.
+
+When generating the curl data, make sure it's a 100% valid stringified JSON format.
+
+Use placeholders with the \`{{PLACEHOLDER}}\` format for the parameters that need to be filled with real-world example values.
+
+# What you need to know
+
+Here is the specification for an API you will be working with:
+
+\`\`\`json
+{endpoints}
+\`\`\`
+
+# How to complete the task
+
+To do this, take your time to analyze the API specification entries and then follow these steps:
+
+1. Carefully read the user's prompt to determine which specific API endpoint and HTTP method (GET, POST, etc.) they need to use.
+2. List out the required parameters needed to make a successful request to that endpoint. Parameters can be included in the url, query string, headers, or request body.
+3. Include the correct authentication mechanism to make a successful request to that endpoint. Ensure the curl command includes all the necessary headers and authentication information.
+4. Outline the structure of the curl command, including the HTTP method, full URL, and all the required parameters.
+5. Write out the final curl command that the user could copy and paste to execute the API request they described.
+
+IMPORTANT: Only construct a curl command for the specific endpoint and method that matches what the user described. Ensure that the command is valid and respects the steps above. If you fail to provide a valid curl command, your response will be rejected.`),
+		HumanMessagePromptTemplate.fromTemplate(`Service name: {serviceName}
+Service request: {serviceRequest}`),
+	],
+	inputVariables: ['endpoints', 'serviceName', 'serviceRequest'],
+});
+
+export const generateCurlCommandFallbackPromptTemplate = new ChatPromptTemplate({
+	promptMessages: [
+		SystemMessagePromptTemplate.fromTemplate(`# What you need to do
+
+You are a curl command generator engine. Your task is to provide a curl command that the user could run to call the endpoint they described.
+
+When generating the curl data, make sure it's a 100% valid stringified JSON format.
+
+Use placeholders with the \`{{PLACEHOLDER}}\` format for the parameters that need to be filled with real-world example values.
+
+# How to complete the task
+
+To construct the curl command, follow these steps:
+
+1. Carefully read the user's prompt to determine which specific API the user will interact with based on the provided service name and description. List out the HTTP method (GET, POST, etc.), full endpoint URL, and all the required parameters, including the \`url\`, \`method\`, \`headers\`, \`query\`, \`body\`, and authentication mechanism.
+2. List out the required parameters needed to make a successful request to that endpoint. Parameters can be included in the url, query string, headers, or request body.
+3. Include the correct authentication mechanism to make a successful request to that endpoint. Ensure the curl command includes all the necessary headers and authentication information. If you are unsure about the authentication mechanism, you can infer the most likely authentication method based on the API specification.
+4. Outline the structure of the curl command, including the HTTP method, full URL, and all the required parameters. Fill the required parameters with real-world example values.
+5. Write out the final curl command that the user could copy and paste to execute the API request they described.
+
+IMPORTANT: Only construct a curl command for the specific endpoint and method that matches what the user described. Ensure that the command is valid and respects the steps above. If you fail to provide a valid curl command, your response will be rejected.`),
+		HumanMessagePromptTemplate.fromTemplate(`Service name: {serviceName}
+Service request: {serviceRequest}`),
+	],
+	inputVariables: ['serviceName', 'serviceRequest'],
+});
diff --git a/packages/cli/src/services/ai/prompts/retrieveService.ts b/packages/cli/src/services/ai/prompts/retrieveService.ts
new file mode 100644
index 0000000000000..b47c73ef0545d
--- /dev/null
+++ b/packages/cli/src/services/ai/prompts/retrieveService.ts
@@ -0,0 +1,21 @@
+import {
+	ChatPromptTemplate,
+	HumanMessagePromptTemplate,
+	SystemMessagePromptTemplate,
+} from '@langchain/core/prompts';
+
+export const retrieveServicePromptTemplate = new ChatPromptTemplate({
+	promptMessages: [
+		SystemMessagePromptTemplate.fromTemplate(`Based on the list of available service APIs in the CSV, please return the \`id\` of the CSV entry that is most relevant for the user provided request.
+
+List Available service APIs in the following CSV Format: \`id\` | \`title\` | \`description\`
+\`\`\`csv
+{services}
+\`\`\`
+
+IMPORTANT: Return the \`id\` of the service exactly as found in the CSV. If none of the services match perfectly, always return the \`id\` as empty string, NEVER hallucinate a service that is not on this list.`),
+		HumanMessagePromptTemplate.fromTemplate(`Service API name: {serviceName}
+Service API Request: {serviceRequest}`),
+	],
+	inputVariables: ['services', 'serviceName', 'serviceRequest'],
+});
diff --git a/packages/cli/src/services/ai/providers/openai.ts b/packages/cli/src/services/ai/providers/openai.ts
new file mode 100644
index 0000000000000..81e699b5072b7
--- /dev/null
+++ b/packages/cli/src/services/ai/providers/openai.ts
@@ -0,0 +1,64 @@
+import { ChatOpenAI, OpenAIEmbeddings } from '@langchain/openai';
+import type { BaseMessageChunk, BaseMessageLike } from '@langchain/core/messages';
+import type { N8nAIProvider } from '@/types/ai.types';
+import type { BaseChatModelCallOptions } from '@langchain/core/language_models/chat_models';
+import { zodToJsonSchema } from 'zod-to-json-schema';
+import type { ZodSchema } from 'zod';
+
+export class AIProviderOpenAI implements N8nAIProvider {
+	public model: ChatOpenAI;
+
+	public embeddings: OpenAIEmbeddings;
+
+	constructor({ openAIApiKey, modelName }: { openAIApiKey: string; modelName: string }) {
+		this.model = new ChatOpenAI({
+			openAIApiKey,
+			modelName,
+			timeout: 60000,
+			maxRetries: 2,
+			temperature: 0,
+		});
+
+		this.embeddings = new OpenAIEmbeddings({
+			openAIApiKey,
+			modelName: 'text-embedding-3-small',
+		});
+	}
+
+	modelWithOutputParser<T extends ZodSchema>(schema: T) {
+		return this.model.bind({
+			functions: [
+				{
+					name: 'output_formatter',
+					description: 'Should always be used to properly format output',
+					parameters: zodToJsonSchema(schema),
+				},
+			],
+			function_call: {
+				name: 'output_formatter',
+			},
+		});
+	}
+
+	mapResponse(data: BaseMessageChunk): string {
+		if (Array.isArray(data.content)) {
+			return data.content
+				.map((message): string =>
+					'text' in message
+						? (message.text as string)
+						: 'image_url' in message
+							? (message.image_url as string)
+							: '',
+				)
+				.join('\n');
+		}
+
+		return data.content;
+	}
+
+	async invoke(messages: BaseMessageLike[], options?: BaseChatModelCallOptions) {
+		const data = await this.model.invoke(messages, options);
+
+		return this.mapResponse(data);
+	}
+}
diff --git a/packages/cli/src/services/ai/resources/README.md b/packages/cli/src/services/ai/resources/README.md
new file mode 100644
index 0000000000000..d911864b4e27a
--- /dev/null
+++ b/packages/cli/src/services/ai/resources/README.md
@@ -0,0 +1,9 @@
+# AI Resources
+
+## API Knowledgebase
+
+**File**: `api-knowledgebase.json`
+
+The relevant repository for generating this file is [here](https://github.com/n8n-io/n8n-ai-apis-knowledgebase).
+
+This file is **auto-generated** for the AI Service, and it contains a list of all the available APIs that can be used to train the AI model from our Vector Store. Currently, this is used when generating a `curl` command for the HTTP Request Node.
diff --git a/packages/cli/src/services/ai/resources/api-knowledgebase.json b/packages/cli/src/services/ai/resources/api-knowledgebase.json
new file mode 100644
index 0000000000000..2f22e56e64a69
--- /dev/null
+++ b/packages/cli/src/services/ai/resources/api-knowledgebase.json
@@ -0,0 +1,2651 @@
+[
+	{
+		"title": "Pipedrive",
+		"id": "pipedrive.com"
+	},
+	{
+		"title": "OpenAI",
+		"id": "openai.com"
+	},
+	{
+		"title": "Discourse",
+		"id": "discourse.com"
+	},
+	{
+		"title": "Anthropic Claude",
+		"id": "anthropic.com"
+	},
+	{
+		"title": "Zoho CRM",
+		"id": "zoho.com-crm"
+	},
+	{
+		"title": "Notion",
+		"id": "notion.so"
+	},
+	{
+		"title": "Stripe",
+		"id": "stripe.com"
+	},
+	{
+		"title": "DocuSign",
+		"id": "docusign.com"
+	},
+	{
+		"title": "Plaid",
+		"id": "plaid.com"
+	},
+	{
+		"title": "Zendesk Support",
+		"id": "zendesk.com-support"
+	},
+	{
+		"title": "Salesforce Marketing Cloud",
+		"id": "salesforce.com-marketing-cloud"
+	},
+	{
+		"title": "Spoonacular",
+		"id": "spoonacular.com"
+	},
+	{
+		"title": "Datadog",
+		"id": "datadoghq.com"
+	},
+	{
+		"title": "WeChatPay",
+		"id": "wechat.com-pay",
+		"version": "v3"
+	},
+	{
+		"title": "ActiveCampaign",
+		"id": "activecampaign.com",
+		"version": "v3"
+	},
+	{
+		"title": "Feishu",
+		"id": "feishu.cn"
+	},
+	{
+		"title": "Whatsapp Business Management",
+		"id": "whatsapp.com-business-management"
+	},
+	{
+		"title": "Brevo",
+		"id": "brevo.com"
+	},
+	{
+		"title": "Salesforce Data Cloud",
+		"id": "salesforce.com-data-cloud"
+	},
+	{
+		"title": "Xendit",
+		"id": "xendit.co"
+	},
+	{
+		"title": "Amadeus for Developers",
+		"id": "amadeus.com-developers"
+	},
+	{
+		"title": "Pynt",
+		"id": "pynt.io"
+	},
+	{
+		"title": "ClickUp",
+		"id": "clickup.com"
+	},
+	{
+		"title": "Twilio Messaging / SMS",
+		"id": "twilio.com-messaging"
+	},
+	{
+		"title": "Amplitude Analytics",
+		"id": "amplitude.com-analytics"
+	},
+	{
+		"title": "Box Platform",
+		"id": "box.com-platform"
+	},
+	{
+		"title": "HotelBeds Booking",
+		"id": "hotelbeds.com-booking"
+	},
+	{
+		"title": "Monday.com",
+		"id": "monday.com"
+	},
+	{
+		"title": "Zoom",
+		"id": "zoom.com"
+	},
+	{
+		"title": "Zendesk Help Center",
+		"id": "zendesk.com-help-center"
+	},
+	{
+		"title": "GigaChat",
+		"id": "gigachat.app"
+	},
+	{
+		"title": "Shiprocket",
+		"id": "shiprocket.in"
+	},
+	{
+		"title": "Whatsapp On-Premises",
+		"id": "whatsapp.com-on-premises"
+	},
+	{
+		"title": "Customer.io Journeys Track",
+		"id": "customer.io-journeys-track"
+	},
+	{
+		"title": "Sportmonks",
+		"id": "sportmonks.com",
+		"version": "3"
+	},
+	{
+		"title": "Power BI",
+		"id": "microsoft.com-power-bi",
+		"version": "v1"
+	},
+	{
+		"title": "Flutterwave",
+		"id": "flutterwave.com",
+		"version": "3.0"
+	},
+	{
+		"title": "HotelBeds Content",
+		"id": "hotelbeds.com-content"
+	},
+	{
+		"title": "Salesforce Tableau",
+		"id": "salesforce.com-tableau"
+	},
+	{
+		"title": "Cashfree Payment Gateway",
+		"id": "cashfree.com-payment-gateway"
+	},
+	{
+		"title": "Belvo Docs",
+		"id": "belvo.com"
+	},
+	{
+		"title": "Discord",
+		"id": "discord.com"
+	},
+	{
+		"title": "Zoom Meeting",
+		"id": "zoom.com-meeting"
+	},
+	{
+		"title": "Salesforce Marketing Cloud Account Engagement (Pardot)",
+		"id": "salesforce.com-marketing-cloud-account-engagement",
+		"version": "v5"
+	},
+	{
+		"title": "Cloudinary Upload",
+		"id": "cloudinary.com-upload"
+	},
+	{
+		"title": "PingOne Platform",
+		"id": "pingone.com"
+	},
+	{
+		"title": "SEON",
+		"id": "seon.io"
+	},
+	{
+		"title": "Eden AI",
+		"id": "edenai.io"
+	},
+	{
+		"title": "Fireblocks",
+		"id": "fireblocks.com"
+	},
+	{
+		"title": "PagerDuty",
+		"id": "pagerduty.com"
+	},
+	{
+		"title": "WooCommerce",
+		"id": "woocommerce.com"
+	},
+	{
+		"title": "DocuSign Admin",
+		"id": "docusign.com-admin"
+	},
+	{
+		"title": "Google Books",
+		"id": "google.com-books"
+	},
+	{
+		"title": "CountriesNow Countries & Cities",
+		"id": "countriesnow.space"
+	},
+	{
+		"title": "Aadhaar KYC",
+		"id": "aadhaarkyc.io"
+	},
+	{
+		"title": "Zendesk Chat",
+		"id": "zendesk.com-chat"
+	},
+	{
+		"title": "Cloudflare R2",
+		"id": "cloudflare.com-r2"
+	},
+	{
+		"title": "ScrapingBee",
+		"id": "scrapingbee.com"
+	},
+	{
+		"title": "UiPath Add-ins",
+		"id": "uipath.com-add-ins"
+	},
+	{
+		"title": "Instagram",
+		"id": "instagram.com"
+	},
+	{
+		"title": "PandaDoc",
+		"id": "pandadoc.com"
+	},
+	{
+		"title": "CyberArk",
+		"id": "cyberark.com"
+	},
+	{
+		"title": "100ms",
+		"id": "100ms.live"
+	},
+	{
+		"title": "Shopify",
+		"id": "shopify.com"
+	},
+	{
+		"title": "Salesforce Commerce B2C",
+		"id": "salesforce.com-commerce-b2c"
+	},
+	{
+		"title": "Adyen Checkout",
+		"id": "adyen.com-checkout",
+		"version": "v71"
+	},
+	{
+		"title": "DoorDash Drive",
+		"id": "doordash.com-drive"
+	},
+	{
+		"title": "Airwallex",
+		"id": "airwallex.com"
+	},
+	{
+		"title": "Snowflake SQL",
+		"id": "snowflake.com-sql",
+		"version": "v2"
+	},
+	{
+		"title": "Twitter Developer Labs",
+		"id": "twitter.com-developer-labs"
+	},
+	{
+		"title": "Hyperledger Besu JSON-RPC",
+		"id": "hyperledger.org-besu"
+	},
+	{
+		"title": "Plivo",
+		"id": "plivo.com"
+	},
+	{
+		"title": "Facebook",
+		"id": "facebook.com"
+	},
+	{
+		"title": "LinkedIn Content",
+		"id": "linkedin.com-content"
+	},
+	{
+		"title": "Jira",
+		"id": "atlassian.com-jira"
+	},
+	{
+		"title": "OneSignal",
+		"id": "onesignal.com"
+	},
+	{
+		"title": "Immoscout24 OAuth1",
+		"id": "immoscout24.com-oauth"
+	},
+	{
+		"title": "DocuSign eSignature",
+		"id": "docusign.com-esignature"
+	},
+	{
+		"title": "Snowflake",
+		"id": "snowflake.com"
+	},
+	{
+		"title": "Cloudinary Admin",
+		"id": "cloudinary.com-admin"
+	},
+	{
+		"title": "Viva Payments",
+		"id": "viva.com-create-payment-order",
+		"version": "v2"
+	},
+	{
+		"title": "SportRadar",
+		"id": "sportradar.com"
+	},
+	{
+		"title": "Contentstack Content Delivery",
+		"id": "contentstack.io-content-delivery"
+	},
+	{
+		"title": "TikTok Business",
+		"id": "tiktok.com-business",
+		"version": "v1.3"
+	},
+	{
+		"title": "F1 Formula One",
+		"id": "f1.com"
+	},
+	{
+		"title": "TMDB The Movie Database",
+		"id": "themoviedb.org"
+	},
+	{
+		"title": "Wordpress",
+		"id": "wordpress.com",
+		"version": "v2"
+	},
+	{
+		"title": "SBER SaluteSpeech",
+		"id": "sber.ru"
+	},
+	{
+		"title": "Symbl AI",
+		"id": "symbl.ai"
+	},
+	{
+		"title": "Onfido",
+		"id": "onfido.com",
+		"version": "v3.6"
+	},
+	{
+		"title": "Binance Perpetual Future",
+		"id": "binance.com-futures"
+	},
+	{
+		"title": "Reloadly",
+		"id": "reloadly.com"
+	},
+	{
+		"title": "Nylas",
+		"id": "nylas.com",
+		"version": "v2"
+	},
+	{
+		"title": "Mist Cloud",
+		"id": "juniper.net-mist",
+		"version": "2402.1.0"
+	},
+	{
+		"title": "LinkedIn Campaign Management",
+		"id": "linkedin.com-campaign-management"
+	},
+	{
+		"title": "Shutterstock",
+		"id": "shutterstock.com"
+	},
+	{
+		"title": "OpenWeatherMap",
+		"id": "openweathermap.org"
+	},
+	{
+		"title": "Whatsapp Embedded Signup",
+		"id": "whatsapp.com-embedded-signup"
+	},
+	{
+		"title": "SailPoint IdentityNow",
+		"id": "sailpoint.com",
+		"version": "v3"
+	},
+	{
+		"title": "ChatBot.com",
+		"id": "chatbot.com"
+	},
+	{
+		"title": "Lob",
+		"id": "lob.com"
+	},
+	{
+		"title": "Binance Spot",
+		"id": "binance.com-spot"
+	},
+	{
+		"title": "MoMo E-Wallet Payments",
+		"id": "momo.com"
+	},
+	{
+		"title": "Mailosaur",
+		"id": "mailosaur.com"
+	},
+	{
+		"title": "Rasa Open Source HTTP",
+		"id": "rasa.com"
+	},
+	{
+		"title": "DingConnect",
+		"id": "dingconnect.com"
+	},
+	{
+		"title": "Withings Health Solutions",
+		"id": "withings.com"
+	},
+	{
+		"title": "Solid FinTech Platform",
+		"id": "solidfintech.com"
+	},
+	{
+		"title": "Chatwoot",
+		"id": "chatwoot.com",
+		"version": "v1.0"
+	},
+	{
+		"title": "Kontent.ai",
+		"id": "kontent.ai"
+	},
+	{
+		"title": "Gmail",
+		"id": "google.com-gmail"
+	},
+	{
+		"title": "PayBoxMoney PaymentPage",
+		"id": "payboxmoney.com"
+	},
+	{
+		"title": "Dropbox",
+		"id": "dropbox.com"
+	},
+	{
+		"title": "Quotable",
+		"id": "quotable.io"
+	},
+	{
+		"title": "ShipEngine",
+		"id": "shipengine.com"
+	},
+	{
+		"title": "Alpaca Market Data",
+		"id": "alpaca.markets",
+		"version": "v2"
+	},
+	{
+		"title": "Twitter Premium",
+		"id": "twitter.com-premium"
+	},
+	{
+		"title": "Livechat Authorization",
+		"id": "livechat.com-authorization"
+	},
+	{
+		"title": "NASA - Astronomy Picture of the Day (APOD)",
+		"id": "nasa.gov-apod"
+	},
+	{
+		"title": "Bridge",
+		"id": "bridgeapi.io",
+		"version": "v2021.06.01"
+	},
+	{
+		"title": "Contentstack Content Management",
+		"id": "contentstack.io-content-management"
+	},
+	{
+		"title": "SportRadar Soccer",
+		"id": "sportradar.com-soccer",
+		"version": "v4"
+	},
+	{
+		"title": "VIVA Payments OAuth2 Authentication",
+		"id": "viva.com-oauth"
+	},
+	{
+		"title": "Infura Ethereum JSON-RPC",
+		"id": "infura.io"
+	},
+	{
+		"title": "Box Dev Platform",
+		"id": "box.com"
+	},
+	{
+		"title": "Zomato",
+		"id": "zomato.com"
+	},
+	{
+		"title": "Temenos",
+		"id": "temenos.com"
+	},
+	{
+		"title": "Yousign",
+		"id": "yousign.com",
+		"version": "v3"
+	},
+	{
+		"title": "SportRadar NBA",
+		"id": "sportradar.com-nba",
+		"version": "v8"
+	},
+	{
+		"title": "MuleSoft Anypoint Platform",
+		"id": "mulesoft.com"
+	},
+	{
+		"title": "YouTube",
+		"id": "youtube.com"
+	},
+	{
+		"title": "Duffel",
+		"id": "duffel.com"
+	},
+	{
+		"title": "Sendbird Chat",
+		"id": "sendbird.com"
+	},
+	{
+		"title": "Checkr.com",
+		"id": "checkr.com"
+	},
+	{
+		"title": "LinkedIn Community Management",
+		"id": "linkedin.com-community-management"
+	},
+	{
+		"title": "Alpaca Broker",
+		"id": "alpaca.markets-broker"
+	},
+	{
+		"title": "Twilio",
+		"id": "twilio.com"
+	},
+	{
+		"title": "Akamai Application Security",
+		"id": "akamai.com-application-security"
+	},
+	{
+		"title": "ArcGIS Geocoding & Search (Geolocation)",
+		"id": "arcgis.com-geolocation"
+	},
+	{
+		"title": "Mux",
+		"id": "mux.com"
+	},
+	{
+		"title": "Change Healthcare Medical Network Eligibility",
+		"id": "changehealthcare.com-eligibility",
+		"version": "v3"
+	},
+	{
+		"title": "Mangopay",
+		"id": "mangopay.com"
+	},
+	{
+		"title": "Amazon Selling Partner for Orders",
+		"id": "amazon.com-selling-partner-orders"
+	},
+	{
+		"title": "Aisensy Campaign",
+		"id": "aisensy.com"
+	},
+	{
+		"title": "Akamai Property Manager",
+		"id": "akamai.com-property-manager"
+	},
+	{
+		"title": "Sendcloud",
+		"id": "sendcloud.com"
+	},
+	{
+		"title": "Viva Payments Request Access Token",
+		"id": "viva.com-request-access-token"
+	},
+	{
+		"title": "Akamai Fast Purge",
+		"id": "akamai.com-fast-purge",
+		"version": "v3"
+	},
+	{
+		"title": "Atlassian Confluence Cloud",
+		"id": "atlassian.com-confluence"
+	},
+	{
+		"title": "Azure Active Directory Protocols",
+		"id": "microsoft.com-aad",
+		"version": "v2.0"
+	},
+	{
+		"title": "LinkedIn Live Events",
+		"id": "linkedin.com-live-events"
+	},
+	{
+		"title": "Strava",
+		"id": "strava.com",
+		"version": "v3"
+	},
+	{
+		"title": "Creatio",
+		"id": "creatio.com"
+	},
+	{
+		"title": "WhatsApp Flows",
+		"id": "whatsapp.com-flows"
+	},
+	{
+		"title": "Docker HUB",
+		"id": "docker.com"
+	},
+	{
+		"title": "LinkedIn Reporting & ROI",
+		"id": "linkedin.com-reporting"
+	},
+	{
+		"title": "Xero Accounting",
+		"id": "xero.com-accounting"
+	},
+	{
+		"title": "Vonage Contact Center",
+		"id": "vonage.com"
+	},
+	{
+		"title": "AWS Amazon Web Services S3",
+		"id": "aws.com-s3"
+	},
+	{
+		"title": "Google Analytics",
+		"id": "google.com-analytics"
+	},
+	{
+		"title": "NFTPort",
+		"id": "nftport.com"
+	},
+	{
+		"title": "JVLcart - MERN Ecommerce",
+		"id": "jvlcart.com"
+	},
+	{
+		"title": "SendGrid",
+		"id": "sendgrid.com"
+	},
+	{
+		"title": "YouTrack",
+		"id": "youtrack.com"
+	},
+	{
+		"title": "USPS Web Tools Address Validation",
+		"id": "usps.com"
+	},
+	{
+		"title": "Strapi",
+		"id": "strapi.io"
+	},
+	{
+		"title": "MicroStrategy",
+		"id": "microstrategy.com"
+	},
+	{
+		"title": "Cisco IOS-XE",
+		"id": "cisco.com-ios-xe"
+	},
+	{
+		"title": "Proxycurl",
+		"id": "proxycurl.com"
+	},
+	{
+		"title": "Salesforce Commerce B2B/D2C",
+		"id": "salesforce.com-commerce"
+	},
+	{
+		"title": "Kroger",
+		"id": "kroger.com"
+	},
+	{
+		"title": "LinkedIn Job Posting",
+		"id": "linkedin.com-job-posting"
+	},
+	{
+		"title": "Twitter",
+		"id": "twitter.com",
+		"version": "v2"
+	},
+	{
+		"title": "EasyPost",
+		"id": "easypost.com"
+	},
+	{
+		"title": "Galileo Pro",
+		"id": "galileo.com"
+	},
+	{
+		"title": "Viessmann",
+		"id": "viessmann.com"
+	},
+	{
+		"title": "Magento Enterprise",
+		"id": "magento.com"
+	},
+	{
+		"title": "fiserv.dev",
+		"id": "fiserv.dev"
+	},
+	{
+		"title": "Okta Admin Management",
+		"id": "okta.com-admin"
+	},
+	{
+		"title": "Amazon Selling Partner for Authorization",
+		"id": "amazon.com-selling-partner-authorization"
+	},
+	{
+		"title": "Dwolla Balance",
+		"id": "dwolla.com-balance"
+	},
+	{
+		"title": "World News",
+		"id": "worldnewsapi.com"
+	},
+	{
+		"title": "GoCardless",
+		"id": "gocardless.com"
+	},
+	{
+		"title": "Rick and Morty",
+		"id": "rickandmortyapi.com"
+	},
+	{
+		"title": "DeepL",
+		"id": "deepl.com"
+	},
+	{
+		"title": "SportRadar NFL",
+		"id": "sportradar.com-nfl",
+		"version": "v7"
+	},
+	{
+		"title": "Mailinator",
+		"id": "mailinator.com"
+	},
+	{
+		"title": "Clickpost",
+		"id": "clickpost.com"
+	},
+	{
+		"title": "Gitlab",
+		"id": "gitlab.com"
+	},
+	{
+		"title": "Lemon Markets Data",
+		"id": "lemon.markets"
+	},
+	{
+		"title": "ETG Emerging Travel Group",
+		"id": "emergingtravelgroup.com",
+		"version": "v3"
+	},
+	{
+		"title": "Mailgun",
+		"id": "mailgun.com"
+	},
+	{
+		"title": "Livechat Agent Chat",
+		"id": "livechat.com-agent-chat",
+		"version": "v3.5"
+	},
+	{
+		"title": "Simple Books",
+		"id": "simplebooks.com"
+	},
+	{
+		"title": "TransferWise Send Money",
+		"id": "wise.com-send-money"
+	},
+	{
+		"title": "Zoho Sign",
+		"id": "zoho.com-sign"
+	},
+	{
+		"title": "Localazy",
+		"id": "localazy.com"
+	},
+	{
+		"title": "Zendesk Agent Availabilities",
+		"id": "zendesk.com-agent-availabilities"
+	},
+	{
+		"title": "Binance Delivery Futures",
+		"id": "binance.com-delivery-futures"
+	},
+	{
+		"title": "QuickChart",
+		"id": "quickchart.com"
+	},
+	{
+		"title": "Immoscout24 Search",
+		"id": "immoscout24.com-search"
+	},
+	{
+		"title": "Ayrshare Social Media",
+		"id": "ayrshare.com"
+	},
+	{
+		"title": "Simple book",
+		"id": "simplebook.com"
+	},
+	{
+		"title": "SportRadar Images",
+		"id": "sportradar.com-images",
+		"version": "v3"
+	},
+	{
+		"title": "Celcoin",
+		"id": "celcoin.com",
+		"version": "v2"
+	},
+	{
+		"title": "FHIR",
+		"id": "fhir.com"
+	},
+	{
+		"title": "TikAPI",
+		"id": "tikapi.io",
+		"version": "v3"
+	},
+	{
+		"title": "Zendesk Jira Integration",
+		"id": "zendesk.com-jira-integration"
+	},
+	{
+		"title": "SportRadar Cricket",
+		"id": "sportradar.com-cricket",
+		"version": "v2"
+	},
+	{
+		"title": "Asana",
+		"id": "asana.com"
+	},
+	{
+		"title": "CyberArk OAuth and OpenID Connect",
+		"id": "cyberark.com-oauth-openid"
+	},
+	{
+		"title": "OneDrive",
+		"id": "onedrive.com"
+	},
+	{
+		"title": "Qualtrics",
+		"id": "qualtrics.com"
+	},
+	{
+		"title": "Oracle Object Storage Service",
+		"id": "oracle.com-object-storage"
+	},
+	{
+		"title": "ShipStation",
+		"id": "shipstation.com"
+	},
+	{
+		"title": "Adyen Configuration",
+		"id": "adyen.com-configuration",
+		"version": "v2"
+	},
+	{
+		"title": "Dyte Documentation",
+		"id": "dyte.io"
+	},
+	{
+		"title": "Joomla Web Services",
+		"id": "joomla.com"
+	},
+	{
+		"title": "WHOIS XML",
+		"id": "whoisxmlapi.com"
+	},
+	{
+		"title": "BoldSign",
+		"id": "boldsign.com"
+	},
+	{
+		"title": "GoLogin",
+		"id": "gologin.com"
+	},
+	{
+		"title": "Telnyx Phone Numbers",
+		"id": "telnyx.com-phone-numbers"
+	},
+	{
+		"title": "Akamai Edge Compute",
+		"id": "akamai.com-edge-compute"
+	},
+	{
+		"title": "SPG Checkout",
+		"id": "spg.com-checkout"
+	},
+	{
+		"title": "Algorand Algod",
+		"id": "algorand.com"
+	},
+	{
+		"title": "SentinelOne",
+		"id": "sentinelone.com"
+	},
+	{
+		"title": "Humantic AI",
+		"id": "humantic.ai"
+	},
+	{
+		"title": "PDF Generator",
+		"id": "pdfgeneratorapi.com",
+		"version": "4.0.0"
+	},
+	{
+		"title": "MicroStrategy Workflows",
+		"id": "microstrategy.com-workflows"
+	},
+	{
+		"title": "Whereby Embedded",
+		"id": "whereby.com"
+	},
+	{
+		"title": "Hubspot CRM",
+		"id": "hubspot.com"
+	},
+	{
+		"title": "FedEx Track",
+		"id": "fedex.com-track"
+	},
+	{
+		"title": "Cloudinary Search",
+		"id": "cloudinary.com-search"
+	},
+	{
+		"title": "Infobip SMS",
+		"id": "infobip.com"
+	},
+	{
+		"title": "Tastytrade",
+		"id": "tastytrade.com"
+	},
+	{
+		"title": "Cal.com",
+		"id": "cal.com"
+	},
+	{
+		"title": "ISS MOEX",
+		"id": "iss.moex.com"
+	},
+	{
+		"title": "Juniper Mist Runner",
+		"id": "juniper.net",
+		"version": "0.3.14.1"
+	},
+	{
+		"title": "APIBRASIL",
+		"id": "apibrasil.com",
+		"version": "v2"
+	},
+	{
+		"title": "FatSecret",
+		"id": "fatsecret.com"
+	},
+	{
+		"title": "Swift Payment Pre-Validation Consumer",
+		"id": "swift.com-payment-pre-validation"
+	},
+	{
+		"title": "Adyen Legal Entity Management",
+		"id": "adyen.com-legal-entity",
+		"version": "v3"
+	},
+	{
+		"title": "Ebay",
+		"id": "ebay.com"
+	},
+	{
+		"title": "SportRadar Tennis",
+		"id": "sportradar.com-tennis",
+		"version": "v3"
+	},
+	{
+		"title": "Keystone Builder",
+		"id": "keystone.com"
+	},
+	{
+		"title": "SportRadar Soccer Extended",
+		"id": "sportradar.com-soccer-extended",
+		"version": "v4"
+	},
+	{
+		"title": "Pardot",
+		"id": "pardot.com"
+	},
+	{
+		"title": "Phyllo",
+		"id": "getphyllo.com"
+	},
+	{
+		"title": "Braze",
+		"id": "braze.com"
+	},
+	{
+		"title": "FortiManager",
+		"id": "fortinet.com"
+	},
+	{
+		"title": "GST Compliance",
+		"id": "gst.com"
+	},
+	{
+		"title": "SportRadar Formula 1",
+		"id": "sportradar.com-formula1",
+		"version": "v2"
+	},
+	{
+		"title": "Revolut Business",
+		"id": "revolut.com-business"
+	},
+	{
+		"title": "Oracle Core Services",
+		"id": "oracle.com-core-services"
+	},
+	{
+		"title": "TransferWise Payouts and third party payouts",
+		"id": "wise.com-payouts"
+	},
+	{
+		"title": "Typesense",
+		"id": "typesense.com"
+	},
+	{
+		"title": "CoinMarketCap DEX",
+		"id": "coinmarketcap.com-dex"
+	},
+	{
+		"title": "Vimeo",
+		"id": "vimeo.com"
+	},
+	{
+		"title": "Telnyx Messaging",
+		"id": "telnyx.com-messaging"
+	},
+	{
+		"title": "CoinMarketCap",
+		"id": "coinmarketcap.com"
+	},
+	{
+		"title": "Cisco DNA Center",
+		"id": "cisco.com-dna-center"
+	},
+	{
+		"title": "Paystack",
+		"id": "paystack.com"
+	},
+	{
+		"title": "Google OAuth2",
+		"id": "google.com-oauth2"
+	},
+	{
+		"title": "IHS RME FHIR",
+		"id": "ihs.com-fhir"
+	},
+	{
+		"title": "CNPJá!",
+		"id": "cnpja.com"
+	},
+	{
+		"title": "AUTENTI",
+		"id": "autenti.com",
+		"version": "v2"
+	},
+	{
+		"title": "COVID19 Tracker",
+		"id": "covid19tracker.com"
+	},
+	{
+		"title": "Anvil PDF",
+		"id": "anvil.com"
+	},
+	{
+		"title": "Zepto",
+		"id": "zepto.com"
+	},
+	{
+		"title": "VIVA Payments Authenticate using basic auth",
+		"id": "viva.com-authenticate"
+	},
+	{
+		"title": "SwiftRef",
+		"id": "swift.com-swiftref"
+	},
+	{
+		"title": "LinkedIn Apply Connect",
+		"id": "linkedin.com-apply-connect"
+	},
+	{
+		"title": "ChangeHealthcare Medical Network Professional Claims",
+		"id": "changehealthcare.com-medical-network",
+		"version": "v3"
+	},
+	{
+		"title": "Auth0 Management",
+		"id": "auth0.com-management"
+	},
+	{
+		"title": "Zapsign",
+		"id": "zapsign.com"
+	},
+	{
+		"title": "Yodlee",
+		"id": "yodlee.com"
+	},
+	{
+		"title": "Perenual",
+		"id": "perenual.com"
+	},
+	{
+		"title": "UPS OAuth Client Credentials",
+		"id": "ups.com-oauth-client-credentials"
+	},
+	{
+		"title": "Swift GPI Tracker",
+		"id": "swift.com-gpi-tracker",
+		"version": "v4"
+	},
+	{
+		"title": "FRC FirstRobotics Events",
+		"id": "firstrobotics.com-events"
+	},
+	{
+		"title": "Adyen Transfers",
+		"id": "adyen.com-transfers",
+		"version": "v4"
+	},
+	{
+		"title": "Scrape.do Web Scraping",
+		"id": "scrape.do"
+	},
+	{
+		"title": "WATI",
+		"id": "wati.com"
+	},
+	{
+		"title": "MoEngage - Data",
+		"id": "moengage.com-data"
+	},
+	{
+		"title": "CheapShark",
+		"id": "cheapshark.com"
+	},
+	{
+		"title": "Kong CE Admin",
+		"id": "kong.com-ce-admin",
+		"version": "v2.0"
+	},
+	{
+		"title": "Tatum",
+		"id": "tatum.io"
+	},
+	{
+		"title": "HyperSwitch",
+		"id": "hyperswitch.com"
+	},
+	{
+		"title": "Sapling AI",
+		"id": "saplingai.com"
+	},
+	{
+		"title": "Transfeera",
+		"id": "transfeera.com"
+	},
+	{
+		"title": "Canvas FHIR",
+		"id": "canvasmedical.com-fhir"
+	},
+	{
+		"title": "Tamara",
+		"id": "tamara.com",
+		"version": "v1.0"
+	},
+	{
+		"title": "Insider",
+		"id": "useinsider.com"
+	},
+	{
+		"title": "Salesforce Platform",
+		"id": "salesforce.com-platform"
+	},
+	{
+		"title": "Zendesk Talk",
+		"id": "zendesk.com-talk"
+	},
+	{
+		"title": "Zuora",
+		"id": "zuora.com"
+	},
+	{
+		"title": "HrFlow.ai",
+		"id": "hrflow.ai"
+	},
+	{
+		"title": "Speechace",
+		"id": "speechace.com"
+	},
+	{
+		"title": "Swift Messaging",
+		"id": "swift.com-messaging"
+	},
+	{
+		"title": "TalonOne Integration",
+		"id": "talonone.com"
+	},
+	{
+		"title": "Etherscan",
+		"id": "etherscan.io"
+	},
+	{
+		"title": "Payoneer Mass Payout",
+		"id": "payoneer.com-mass-payout"
+	},
+	{
+		"title": "Stark Bank",
+		"id": "starkbank.com",
+		"version": "v2"
+	},
+	{
+		"title": "VIVA Payments Generate webhook verification key",
+		"id": "viva.com-webhook-verification"
+	},
+	{
+		"title": "Customer.io Data Pipelines",
+		"id": "customer.io"
+	},
+	{
+		"title": "ZATCA",
+		"id": "zatca.com"
+	},
+	{
+		"title": "PingOne Authorize",
+		"id": "pingone.com-authorize"
+	},
+	{
+		"title": "Skyscanner B2B",
+		"id": "skyscanner.com-b2b",
+		"version": "v3"
+	},
+	{
+		"title": "Walmart Marketplace",
+		"id": "walmart.com-marketplace"
+	},
+	{
+		"title": "Focus NFe",
+		"id": "focusnfe.com"
+	},
+	{
+		"title": "Melissa",
+		"id": "melissa.com"
+	},
+	{
+		"title": "EODHD Historical Data",
+		"id": "eodhistoricaldata.com"
+	},
+	{
+		"title": "Zendesk Webhook",
+		"id": "zendesk.com-webhook"
+	},
+	{
+		"title": "Updivision.com",
+		"id": "updivision.com"
+	},
+	{
+		"title": "TradingView",
+		"id": "tradingview.com"
+	},
+	{
+		"title": "Akool Faceswap Web",
+		"id": "faceswap akool.com"
+	},
+	{
+		"title": "Viva Payments Retrieve transactions",
+		"id": "viva.com-retrieve-transactions",
+		"version": "v2"
+	},
+	{
+		"title": "CloudFlare",
+		"id": "cloudflare.com"
+	},
+	{
+		"title": "Elasticsearch",
+		"id": "elasticsearch.com"
+	},
+	{
+		"title": "Peach Payments Checkout",
+		"id": "peachpayments.com-checkout"
+	},
+	{
+		"title": "Zendesk AnswerBot",
+		"id": "zendesk.com-answerbot"
+	},
+	{
+		"title": "Zoom Phone",
+		"id": "zoom.com-phone"
+	},
+	{
+		"title": "Bitbucket",
+		"id": "bitbucket.com"
+	},
+	{
+		"title": "Oracle Identity and Access Management Service",
+		"id": "oracle.com-identity-access-management"
+	},
+	{
+		"title": "Flagsmith",
+		"id": "flagsmith.com"
+	},
+	{
+		"title": "CyberArk Identity",
+		"id": "cyberark.com-identity"
+	},
+	{
+		"title": "Mailjet",
+		"id": "mailjet.com"
+	},
+	{
+		"title": "LinkedIn Audiences",
+		"id": "linkedin.com-audiences"
+	},
+	{
+		"title": "FedEx Ship",
+		"id": "fedex.com-ship"
+	},
+	{
+		"title": "FedEx Rates and Transit Times",
+		"id": "fedex.com-rates-transit-times"
+	},
+	{
+		"title": "Telnyx Call Control",
+		"id": "telnyx.com-call-control"
+	},
+	{
+		"title": "AWS Amazon Web Services Cognito Identity Provider",
+		"id": "amazon.com-cognito-identity-provider"
+	},
+	{
+		"title": "Customer.io Journeys App",
+		"id": "customer.io-journeys"
+	},
+	{
+		"title": "Adyen Management",
+		"id": "adyen.com-management",
+		"version": "v3"
+	},
+	{
+		"title": "Frontapp Core",
+		"id": "frontapp.com-core"
+	},
+	{
+		"title": "Change Healthcare Medical Network Claim Status",
+		"id": "changehealthcare.com-claim-status",
+		"version": "v2"
+	},
+	{
+		"title": "Call of Duty",
+		"id": "callofduty.com"
+	},
+	{
+		"title": "UPS Shipping",
+		"id": "ups.com-shipping"
+	},
+	{
+		"title": "Geonode",
+		"id": "geonode.com"
+	},
+	{
+		"title": "Gusto",
+		"id": "gusto.com"
+	},
+	{
+		"title": "Primary Trading",
+		"id": "primary.com"
+	},
+	{
+		"title": "UPS OAuth Auth Code",
+		"id": "ups.com-oauth-auth-code"
+	},
+	{
+		"title": "Amazon Selling Partner Catalog Items",
+		"id": "amazon.com-selling-partner-catalog-items"
+	},
+	{
+		"title": "SYSCOM",
+		"id": "syscom.com"
+	},
+	{
+		"title": "Gitlab CI CD",
+		"id": "gitlab.com-ci-cd"
+	},
+	{
+		"title": "SportRadar MMA",
+		"id": "sportradar.com-mma",
+		"version": "v2"
+	},
+	{
+		"title": "HIKVISION",
+		"id": "hikvision.com"
+	},
+	{
+		"title": "Productboard",
+		"id": "productboard.com"
+	},
+	{
+		"title": "Infobip WhatsApp",
+		"id": "infobip.com-whatsapp"
+	},
+	{
+		"title": "Drophub",
+		"id": "drophub.com"
+	},
+	{
+		"title": "AvaTax",
+		"id": "avalara.com"
+	},
+	{
+		"title": "Revolut Merchant",
+		"id": "revolut.com-merchant"
+	},
+	{
+		"title": "Wildberries",
+		"id": "wildberries.com"
+	},
+	{
+		"title": "Solcast",
+		"id": "solcast.com"
+	},
+	{
+		"title": "AWS Amazon Web Services EC2",
+		"id": "amazon.com-ec2"
+	},
+	{
+		"title": "Rutter Commerce",
+		"id": "rutter.com-commerce"
+	},
+	{
+		"title": "Mastercard BIN Lookup",
+		"id": "mastercard.com-bin-lookup"
+	},
+	{
+		"title": "Acronis Account Management",
+		"id": "acronis.com-account-management"
+	},
+	{
+		"title": "IBANAPI",
+		"id": "ibanapi.com"
+	},
+	{
+		"title": "MongoDB Data",
+		"id": "mongodb.com-data-api"
+	},
+	{
+		"title": "Fastly",
+		"id": "fastly.com"
+	},
+	{
+		"title": "Payoneer Mass Payout & Services",
+		"id": "payoneer.com-mass-payout-services"
+	},
+	{
+		"title": "Mastercard Open Banking US",
+		"id": "mastercard.com-open-banking"
+	},
+	{
+		"title": "Durianpay Merchant",
+		"id": "durianpay.com-merchant",
+		"version": "v1"
+	},
+	{
+		"title": "Opsgenie",
+		"id": "opsgenie.com"
+	},
+	{
+		"title": "Cisco SD WAN AlwaysOn",
+		"id": "cisco.com-sd-wan-alwayson"
+	},
+	{
+		"title": "Zoho Desk",
+		"id": "zoho.com-desk"
+	},
+	{
+		"title": "Data.World",
+		"id": "data.world"
+	},
+	{
+		"title": "Immoscout24 Import/Export",
+		"id": "immoscout24.com-import-export"
+	},
+	{
+		"title": "Klaviyo",
+		"id": "klaviyo.com",
+		"version": "v2024-02-15"
+	},
+	{
+		"title": "Shyft",
+		"id": "shyft.com",
+		"version": "v1"
+	},
+	{
+		"title": "Twitter Ads",
+		"id": "twitter.com-ads"
+	},
+	{
+		"title": "Plant.id",
+		"id": "plant.id",
+		"version": "v3"
+	},
+	{
+		"title": "Immoscout24 Expose",
+		"id": "immoscout24.com-expose"
+	},
+	{
+		"title": "SW",
+		"id": "sw.com"
+	},
+	{
+		"title": "Tyk Gateway",
+		"id": "tyk.com-gateway",
+		"version": "v3.2.1"
+	},
+	{
+		"title": "LiveChat Customer Chat",
+		"id": "livechat.com-customer-chat",
+		"version": "v3.5"
+	},
+	{
+		"title": "Monoova Payments Platform",
+		"id": "monoova.com"
+	},
+	{
+		"title": "Africa's Talking Bulk SMS",
+		"id": "africastalking.com-bulk-sms"
+	},
+	{
+		"title": "DocuSign Rooms",
+		"id": "docusign.com-rooms",
+		"version": "v2"
+	},
+	{
+		"title": "Viva.com Cloud",
+		"id": "viva.com-cloud"
+	},
+	{
+		"title": "FPL Fantasy Premier League",
+		"id": "fantasy.premierleague.com"
+	},
+	{
+		"title": "Metapack Shipping",
+		"id": "metapack.com-shipping"
+	},
+	{
+		"title": "iRacing",
+		"id": "iracing.com"
+	},
+	{
+		"title": "LinkedIn Recruiter System Connect",
+		"id": "linkedin.com-recruiter-system-connect"
+	},
+	{
+		"title": "Duo",
+		"id": "duo.com"
+	},
+	{
+		"title": "Akamai Reporting",
+		"id": "akamai.com-reporting"
+	},
+	{
+		"title": "Merge HRIS",
+		"id": "merge.com-hris"
+	},
+	{
+		"title": "Frappe ERPNext",
+		"id": "frappe.com"
+	},
+	{
+		"title": "DHRU FUSION CLIENT",
+		"id": "dhru.com-fusion-client",
+		"version": "v2"
+	},
+	{
+		"title": "Vultr",
+		"id": "vultr.com",
+		"version": "v2"
+	},
+	{
+		"title": "Bigin",
+		"id": "bigin.com"
+	},
+	{
+		"title": "Salesforce Data Cloud Connect",
+		"id": "salesforce.com-data-cloud-connect"
+	},
+	{
+		"title": "SportRadar Odds Comparison Regular",
+		"id": "sportradar.com-odds-comparison-regular",
+		"version": "v1"
+	},
+	{
+		"title": "Imdb",
+		"id": "imdb.com"
+	},
+	{
+		"title": "JP Hotel",
+		"id": "jp.com-hotel"
+	},
+	{
+		"title": "Adobe Acrobat Sign",
+		"id": "adobe.com-acrobat-sign"
+	},
+	{
+		"title": "Etsy",
+		"id": "etsy.com"
+	},
+	{
+		"title": "Jamf Pro",
+		"id": "jamf.com-pro",
+		"version": "v11.2.0"
+	},
+	{
+		"title": "VAPIX",
+		"id": "vapix.com"
+	},
+	{
+		"title": "TransferWise",
+		"id": "wise.com"
+	},
+	{
+		"title": "Etherscan Tokens",
+		"id": "etherscan.com-tokens"
+	},
+	{
+		"title": "Firely Server",
+		"id": "firely.com-server"
+	},
+	{
+		"title": "Fine-Tuner",
+		"id": "fine-tuner.com"
+	},
+	{
+		"title": "Commvault",
+		"id": "commvault.com"
+	},
+	{
+		"title": "BigCommerce",
+		"id": "bigcommerce.com",
+		"version": "v3"
+	},
+	{
+		"title": "Dropbox Sign",
+		"id": "dropbox.com-sign"
+	},
+	{
+		"title": "TransferWise Partner Account",
+		"id": "wise.com-partner-account"
+	},
+	{
+		"title": "Stytch",
+		"id": "stytch.com"
+	},
+	{
+		"title": "Plaid Core Exchange",
+		"id": "plaid.com-core-exchange"
+	},
+	{
+		"title": "Okta OpenID Connect & OAuth",
+		"id": "okta.com-openid-connect-oauth-2"
+	},
+	{
+		"title": "Orange Sonatel",
+		"id": "orange-sonatel.com"
+	},
+	{
+		"title": "SportRadar MLB",
+		"id": "sportradar.com-mlb",
+		"version": "v7"
+	},
+	{
+		"title": "Bandwidth",
+		"id": "bandwidth.com",
+		"version": "v1"
+	},
+	{
+		"title": "Venus",
+		"id": "venus.com"
+	},
+	{
+		"title": "Akamai Edge Diagnostics",
+		"id": "akamai.com-edge-diagnostics"
+	},
+	{
+		"title": "Amazon Selling Partner Reports",
+		"id": "amazon.com-selling-partner-reports"
+	},
+	{
+		"title": "CoinMarketCal",
+		"id": "coinmarketcal.com"
+	},
+	{
+		"title": "SportRadar NCAA Men's Basketball",
+		"id": "sportradar.com-ncaa-mens-basketball",
+		"version": "v8"
+	},
+	{
+		"title": "Imperva",
+		"id": "imperva.com"
+	},
+	{
+		"title": "NewsCatcher News",
+		"id": "newscatcher.com",
+		"version": "v2"
+	},
+	{
+		"title": "Oracle Hospitality Property",
+		"id": "oracle.com-hospitality-property"
+	},
+	{
+		"title": "Route Mobile WhatsApp Business Messaging",
+		"id": "routemobile.com-whatsapp-business-messaging"
+	},
+	{
+		"title": "Sudo.Cards",
+		"id": "sudo.cards"
+	},
+	{
+		"title": "Autodesk PWS Sales & Customer Success",
+		"id": "autodesk.com-pws-sales-customer-success"
+	},
+	{
+		"title": "Google Vision",
+		"id": "google.com-vision"
+	},
+	{
+		"title": "NetSuite",
+		"id": "netsuite.com"
+	},
+	{
+		"title": "PayPal Payouts",
+		"id": "paypal.com-payouts"
+	},
+	{
+		"title": "Cisco ISE ERS",
+		"id": "cisco.com-ise-ers"
+	},
+	{
+		"title": "Huawei AppGallery Connect",
+		"id": "huawei.com-appgallery-connect"
+	},
+	{
+		"title": "CoWIN",
+		"id": "cowin.gov.in"
+	},
+	{
+		"title": "Veeva Vault",
+		"id": "veeva.com-vault",
+		"version": "v23.3"
+	},
+	{
+		"title": "Swagger Petstore",
+		"id": "swagger.io-petstore"
+	},
+	{
+		"title": "Sendbird Calls",
+		"id": "sendbird.com-calls"
+	},
+	{
+		"title": "GP GlobalProduct",
+		"id": "globalproduct.com"
+	},
+	{
+		"title": "Microsoft Graph Certificate Auth",
+		"id": "microsoft.com-graph-certificate-auth"
+	},
+	{
+		"title": "Amazon Payment Services",
+		"id": "amazonpaymentservices.com"
+	},
+	{
+		"title": "Moodle",
+		"id": "moodle.com"
+	},
+	{
+		"title": "Oracle Cloud Infrastructure Language",
+		"id": "oracle.com-cloud-infrastructure-language"
+	},
+	{
+		"title": "SportRadar Odds Comparison Player Props",
+		"id": "sportradar.com-odds-comparison-player-props",
+		"version": "v2"
+	},
+	{
+		"title": "Telnyx Number Lookup",
+		"id": "telnyx.com-number-lookup"
+	},
+	{
+		"title": "Football-data.org",
+		"id": "football-data.org",
+		"version": "v4"
+	},
+	{
+		"title": "Nigeria Open Banking",
+		"id": "openbankingnigeria.com",
+		"version": "v1"
+	},
+	{
+		"title": "Bitly",
+		"id": "bitly.com"
+	},
+	{
+		"title": "dbt Cloud Object Management",
+		"id": "dbt.com-cloud-object-management"
+	},
+	{
+		"title": "Treasury Prime",
+		"id": "treasuryprime.com"
+	},
+	{
+		"title": "Tiktok Traffic Objective",
+		"id": "tiktok.com-traffic-objective"
+	},
+	{
+		"title": "UPS Tracking",
+		"id": "ups.com-tracking"
+	},
+	{
+		"title": "Loket",
+		"id": "loket.com"
+	},
+	{
+		"title": "Signeasy eSignature",
+		"id": "signeasy.com",
+		"version": "v3.0"
+	},
+	{
+		"title": "Bolt",
+		"id": "bolt.com"
+	},
+	{
+		"title": "Akool Faceswap Web",
+		"id": "akool.com-faceswap-web"
+	},
+	{
+		"title": "SmartOLT",
+		"id": "smartolt.com"
+	},
+	{
+		"title": "TransferWise Wise for Banks",
+		"id": "wise.com-banks"
+	},
+	{
+		"title": "Tellelabs",
+		"id": "tellelabs.com"
+	},
+	{
+		"title": "Pagar.me",
+		"id": "pagar.me",
+		"version": "v5"
+	},
+	{
+		"title": "Docker Engine",
+		"id": "docker.com-engine"
+	},
+	{
+		"title": "CyberArk Identity User Management",
+		"id": "cyberark.com-identity-user-management"
+	},
+	{
+		"title": "Gong",
+		"id": "gong.com"
+	},
+	{
+		"title": "Google Cloud Firestore",
+		"id": "google.com-firestore"
+	},
+	{
+		"title": "OpenWeatherMap",
+		"id": "openweathermap.com"
+	},
+	{
+		"title": "ManageEngine - ServiceDesk plus",
+		"id": "manageengine.com-servicedeskplus"
+	},
+	{
+		"title": "UPS Rating",
+		"id": "ups.com-rating"
+	},
+	{
+		"title": "Pricempire.com",
+		"id": "pricempire.com"
+	},
+	{
+		"title": "PandaScore",
+		"id": "pandascore.com"
+	},
+	{
+		"title": "QuickBooks Online",
+		"id": "quickbooks.com"
+	},
+	{
+		"title": "LiveChat Configuration",
+		"id": "livechat.com-configuration",
+		"version": "v3.5"
+	},
+	{
+		"title": "Merge Accounting",
+		"id": "merge.com"
+	},
+	{
+		"title": "JAMF",
+		"id": "jamf.com",
+		"version": "v10.49.0"
+	},
+	{
+		"title": "VMWare vSphere Automation",
+		"id": "vmware.com-vcenter"
+	},
+	{
+		"title": "VMWare Carbon Black",
+		"id": "vmware.com-carbon-black"
+	},
+	{
+		"title": "Midjourney",
+		"id": "midjourney.com",
+		"version": "v2"
+	},
+	{
+		"title": "LinkedIn Lead Sync",
+		"id": "linkedin.com-lead-sync",
+		"version": "v2"
+	},
+	{
+		"title": "SailPoint IdentityNow NERM",
+		"id": "sailpoint.com-identitynow-nerm"
+	},
+	{
+		"title": "Microsoft SharePoint",
+		"id": "microsoft.com-sharepoint"
+	},
+	{
+		"title": "VTEX",
+		"id": "vtex.com"
+	},
+	{
+		"title": "Appcues",
+		"id": "appcues.com",
+		"version": "v2"
+	},
+	{
+		"title": "Airalo Partner",
+		"id": "airalo.com-partner"
+	},
+	{
+		"title": "Bond",
+		"id": "bond.com"
+	},
+	{
+		"title": "Mattermost",
+		"id": "mattermost.com"
+	},
+	{
+		"title": "Tenable Vulnerability Management",
+		"id": "tenable.com-vulnerability-management"
+	},
+	{
+		"title": "Tenable WAS Web Application Scanning",
+		"id": "tenable.com-was"
+	},
+	{
+		"title": "Tenable Platform",
+		"id": "tenable.com-platform"
+	},
+	{
+		"title": "Tenable MSSP Managed Security Service Provider",
+		"id": "tenable.com-mssp"
+	},
+	{
+		"title": "Tenable Downloads",
+		"id": "tenable.com-downloads"
+	},
+	{
+		"title": "Tenable Container Security",
+		"id": "tenable.com-container-security"
+	},
+	{
+		"title": "Cisco Webex Messaging",
+		"id": "cisco.com-webex-messaging"
+	},
+	{
+		"title": "Cisco SD WAN",
+		"id": "cisco.com-sd-wan"
+	},
+	{
+		"title": "Cisco Umbrella",
+		"id": "cisco.com-umbrella"
+	},
+	{
+		"title": "Cisco Meraki Webhooks Management",
+		"id": "cisco.com-meraki-webhooks"
+	},
+	{
+		"title": "Cisco Meraki",
+		"id": "cisco.com-meraki"
+	},
+	{
+		"title": "Cisco Webex Meetings",
+		"id": "cisco.com-webex-meetings"
+	},
+	{
+		"title": "Cisco Secure Firewall Management Center (FMC)",
+		"id": "cisco.com-secure-firewall-management-center"
+	},
+	{
+		"title": "Arsha BDO Market",
+		"id": "arsha.io-bdo-market"
+	},
+	{
+		"title": "Tremendous",
+		"id": "tremendous.com"
+	},
+	{
+		"title": "GMB Row",
+		"id": "gmb.com-row"
+	},
+	{
+		"title": "Pluggy",
+		"id": "pluggy.com"
+	},
+	{
+		"title": "Fortinet Fortimanager",
+		"id": "fortinet.com-fortimanager"
+	},
+	{
+		"title": "Hybrid Analysis",
+		"id": "hybrid-analysis.com"
+	},
+	{
+		"title": "Trellix ePO",
+		"id": "trellix.com-epo"
+	},
+	{
+		"title": "Trellix IVX",
+		"id": "trellix.com-ivx"
+	},
+	{
+		"title": "Trellix DLP",
+		"id": "trellix.com-dlp"
+	},
+	{
+		"title": "Greynoise",
+		"id": "greynoise.io"
+	},
+	{
+		"title": "Greynoise Enterprise",
+		"id": "greynoise.io-enterprise"
+	},
+	{
+		"title": "Azure Resource Management",
+		"id": "azure.com-resource-management"
+	},
+	{
+		"title": "Exotel Voice",
+		"id": "exotel.com-voice",
+		"version": "v1"
+	},
+	{
+		"title": "Github",
+		"id": "github.com"
+	},
+	{
+		"title": "Lipseys",
+		"id": "lipseys.com"
+	},
+	{
+		"title": "R-Series Authentication",
+		"id": "lightspeed.com-r-series-authentication"
+	},
+	{
+		"title": "Skyscanner Referrals",
+		"id": "skyscanner.com-referrals"
+	},
+	{
+		"title": "Swift GPI Transaction Details",
+		"id": "swift.com-gpi-transaction-details"
+	},
+	{
+		"title": "Luxand Cloud",
+		"id": "luxand.cloud"
+	},
+	{
+		"title": "Sonatel QRCODE OM",
+		"id": "sonatel.com-qrcode-om"
+	},
+	{
+		"title": "Keycloak",
+		"id": "keycloak.com"
+	},
+	{
+		"title": "Veriff",
+		"id": "veriff.com",
+		"version": "v1.0"
+	},
+	{
+		"title": "Transak",
+		"id": "transak.com"
+	},
+	{
+		"title": "Auth0",
+		"id": "auth0.com"
+	},
+	{
+		"title": "Google Search Console",
+		"id": "google.com-search-console"
+	},
+	{
+		"title": "PAN Palo Alto Networks PAN-OS XML",
+		"id": "paloaltonetworks.com-pan-os-xml"
+	},
+	{
+		"title": "PAN Palo Alto Networks Cloud Services Status",
+		"id": "paloaltonetworks.com-cloud-services-status"
+	},
+	{
+		"title": "PAN Palo Alto Networks Licensing",
+		"id": "paloaltonetworks.com-licensing"
+	},
+	{
+		"title": "PAN Palo Alto Networks Prisma Cloud",
+		"id": "paloaltonetworks.com-prisma-cloud"
+	},
+	{
+		"title": "AWS Amazon Web Services Security Token Service",
+		"id": "aws.com-security-token-service"
+	},
+	{
+		"title": "FHIRFLY",
+		"id": "fhirfly.com"
+	},
+	{
+		"title": "Okta Policy",
+		"id": "okta.com-policy"
+	},
+	{
+		"title": "Paypal Sandbox Paths",
+		"id": "paypal.com-sandbox-paths"
+	},
+	{
+		"title": "onlinesim.ru Receiving SMS",
+		"id": "onlinesim.ru-receiving-sms"
+	},
+	{
+		"title": "LightSpeedHQ R-Series Inventory",
+		"id": "lightspeed.com-r-series-inventory"
+	},
+	{
+		"title": "Akamai Certificate Provisioning System",
+		"id": "akamai.com-certificate-provisioning-system"
+	},
+	{
+		"title": "Knock",
+		"id": "knock.com"
+	},
+	{
+		"title": "Acrgis Data hosting",
+		"id": "arcgis.com-data-hosting"
+	},
+	{
+		"title": "Alpha Vantage",
+		"id": "alpha-vantage.com"
+	},
+	{
+		"title": "Anaplan",
+		"id": "anaplan.com"
+	},
+	{
+		"title": "MoMo E-Wallet Recurring Payments",
+		"id": "momo.com-recurring-payments"
+	},
+	{
+		"title": "Ethereum JSON-RPC",
+		"id": "ethereum.com-json-rpc"
+	},
+	{
+		"title": "SurrealDB",
+		"id": "surrealdb.com"
+	},
+	{
+		"title": "360Dialog Integrated Onboarding Partner",
+		"id": "360dialog.com-integrated-onboarding-partner"
+	},
+	{
+		"title": "Opencep",
+		"id": "opencep.com"
+	},
+	{
+		"title": "TravelTime",
+		"id": "traveltime.com"
+	},
+	{
+		"title": "Power BI Embedded Azure Resource Manager",
+		"id": "powerbi.com-embedded-azure-resource-manager",
+		"version": "v2017-10-01"
+	},
+	{
+		"title": "LinkedIn Apply With",
+		"id": "linkedin.com-apply-with",
+		"version": "v3"
+	},
+	{
+		"title": "DataCite",
+		"id": "datacite.com"
+	},
+	{
+		"title": "Flight",
+		"id": "flight.com",
+		"version": "v1"
+	},
+	{
+		"title": "Stuart",
+		"id": "stuart.com"
+	},
+	{
+		"title": "Aiia",
+		"id": "aiia.com"
+	},
+	{
+		"title": "Argyle",
+		"id": "argyle.com",
+		"version": "v2"
+	},
+	{
+		"title": "r/SpaceX",
+		"id": "spacexdata.com"
+	},
+	{
+		"title": "Peach Payments",
+		"id": "peachpayments.com"
+	},
+	{
+		"title": "Revolut Open Banking",
+		"id": "revolut.com-open-banking"
+	},
+	{
+		"title": "Coinbase",
+		"id": "coinbase.com"
+	},
+	{
+		"title": "AWS Amazon Web Services DynamoDB",
+		"id": "aws.com-dynamodb"
+	},
+	{
+		"title": "Azure DevOps",
+		"id": "azure.com-devops",
+		"version": "v5.0"
+	},
+	{
+		"title": "NinjaOne",
+		"id": "ninjaone.com",
+		"version": "v2.0"
+	},
+	{
+		"title": "Salla Merchant",
+		"id": "salla.com-merchant"
+	},
+	{
+		"title": "USPS Web Tools Track and Confirm",
+		"id": "usps.com-track-and-confirm"
+	},
+	{
+		"title": "Cartes.io",
+		"id": "cartes.io"
+	},
+	{
+		"title": "Oracle Monitoring",
+		"id": "oracle.com-monitoring"
+	},
+	{
+		"title": "DynamicDocs JSON to PDF Templates",
+		"id": "dynamicdocs.com-json-to-pdf-templates"
+	},
+	{
+		"title": "DuckDuckGo Instant Answer",
+		"id": "duckduckgo.com-instant-answer"
+	},
+	{
+		"title": "TikTok Shop Open",
+		"id": "tiktok.com-shop-open"
+	},
+	{
+		"title": "Rasa X HTTP",
+		"id": "rasa.com-x-http"
+	},
+	{
+		"title": "Adyen Balance Control",
+		"id": "adyen.com-balance-control",
+		"version": "v1"
+	},
+	{
+		"title": "Shopware Admin",
+		"id": "shopware.com-admin",
+		"version": "6"
+	},
+	{
+		"title": "PrestaShop eCommerce",
+		"id": "prestashop.com-ecommerce"
+	},
+	{
+		"title": "Transferwise Wise Partner KYC Platform",
+		"id": "wise.com-wise-partner-kyc"
+	},
+	{
+		"title": "8/24 NexHealth Synchronizer",
+		"id": "nexhealth.com-synchronizer"
+	},
+	{
+		"title": "MessageBird",
+		"id": "messagebird.com"
+	},
+	{
+		"title": "Rapid7 InsightVM",
+		"id": "rapid7.com-insightvm"
+	},
+	{
+		"title": "NICE CXone - User Hub NA1",
+		"id": "nice.com-user-hub-na1"
+	},
+	{
+		"title": "Cora Bank",
+		"id": "corabank.com"
+	},
+	{
+		"title": "Universign Transactions",
+		"id": "universign.com-transactions"
+	},
+	{
+		"title": "Delhivery",
+		"id": "delhivery.com"
+	},
+	{
+		"title": "Envia Shipping Multi Carrier Solution for Ecommerce",
+		"id": "envia.com"
+	},
+	{
+		"title": "LiveChat Reports",
+		"id": "livechat.com-reports",
+		"version": "v3.5"
+	},
+	{
+		"title": "RingCentral",
+		"id": "ringcentral.com"
+	},
+	{
+		"title": "ComplyCube",
+		"id": "complycube.com",
+		"version": "v1"
+	},
+	{
+		"title": "pVerify",
+		"id": "pverify.com"
+	},
+	{
+		"title": "Swift GPI Customer Credit Transfer",
+		"id": "swift.com-gpi-customer-credit-transfer"
+	},
+	{
+		"title": "Backblaze B2 Cloud Storage S3 Compatible",
+		"id": "backblaze.com-b2-cloud-storage-s3-compatible"
+	},
+	{
+		"title": "SportRadar NCAA Men's Football",
+		"id": "ncaa.com-mens-football",
+		"version": "v7"
+	},
+	{
+		"title": "Opencart Shopping Cart",
+		"id": "opencart.com"
+	},
+	{
+		"title": "Smartcar",
+		"id": "smartcar.com"
+	},
+	{
+		"title": "Instapack Instagram",
+		"id": "instapack.com-instagram"
+	},
+	{
+		"title": "Adyen Checkout",
+		"id": "adyen.com-checkout2"
+	},
+	{
+		"title": "Arcgis Demographics & GeoEnrichment",
+		"id": "arcgis.com-demographics-geoenrichment"
+	},
+	{
+		"title": "Zendesk JWT Authentication",
+		"id": "zendesk.com-jwt-authentication"
+	},
+	{
+		"title": "Mercadopago Checkout PRO",
+		"id": "mercadopago.com-checkout-pro"
+	},
+	{
+		"title": "ReqRes",
+		"id": "reqres.com"
+	},
+	{
+		"title": "SPG Get Status",
+		"id": "spg.com-get-status"
+	},
+	{
+		"title": "Miro",
+		"id": "miro.com"
+	},
+	{
+		"title": "GSM Arena",
+		"id": "gsmarena.com"
+	},
+	{
+		"title": "WeChat Pay",
+		"id": "wechat.com-pay-v3",
+		"version": "v3"
+	},
+	{
+		"title": "Riot",
+		"id": "riot.com"
+	},
+	{
+		"title": "Zendesk Sunshine Events",
+		"id": "zendesk.com-sunshine-events"
+	},
+	{
+		"title": "TourInSoft Syndications Webservice",
+		"id": "tourinsoft.com-syndications-webservice-v3",
+		"version": "v3"
+	},
+	{
+		"title": "LightSpeed K-Series",
+		"id": "lightspeed.com-k-series"
+	},
+	{
+		"title": "Commerce Layer Core",
+		"id": "commercelayer.com-core",
+		"version": "2024-03-12"
+	},
+	{
+		"title": "Wemeet OAuth",
+		"id": "wemeet.com-oauth"
+	},
+	{
+		"title": "Banxa",
+		"id": "banxa.com"
+	},
+	{
+		"title": "Transferwise Wise Multi-Currency Account",
+		"id": "wise.com-multi-currency-account"
+	},
+	{
+		"title": "AWS Amazon Web Services Simple Email Service",
+		"id": "aws.com-simple-email-service"
+	},
+	{
+		"title": "Akamai Billing",
+		"id": "akamai.com-billing"
+	},
+	{
+		"title": "Twilio Webhook",
+		"id": "twilio.com-webhook"
+	},
+	{
+		"title": "Bungie.Net",
+		"id": "bungie.net"
+	},
+	{
+		"title": "Transfeera ContaCerta",
+		"id": "transfeera.com-contacerta"
+	},
+	{
+		"title": "Oracle Vision",
+		"id": "oracle.com-vision"
+	},
+	{
+		"title": "CEX.io",
+		"id": "cex.io"
+	},
+	{
+		"title": "UPS Address Validation",
+		"id": "ups.com-address-validation"
+	},
+	{
+		"title": "SPG MB REFERENCE",
+		"id": "spg.com-mb-reference"
+	},
+	{
+		"title": "Infobip Email",
+		"id": "infobip.com-email"
+	},
+	{
+		"title": "Forte",
+		"id": "forte.com-rest-v3",
+		"version": "v3"
+	},
+	{
+		"title": "TaxJar SmartCalcs",
+		"id": "taxjar.com-smartcalcs"
+	},
+	{
+		"title": "ChangeHealthcare Medical Network Claims Responses and Reports",
+		"id": "changehealthcare.com-claims-responses-and-reports",
+		"version": "v2"
+	},
+	{
+		"title": "Senapedia",
+		"id": "senapedia.com"
+	},
+	{
+		"title": "Zoho Subscriptions",
+		"id": "zoho.com-subscriptions"
+	},
+	{
+		"title": "Jasmin",
+		"id": "jasminsoftware.com"
+	},
+	{
+		"title": "Huawei AGC AppGallery Connect Publishing",
+		"id": "huawei.com-appgallery-connect-publishing"
+	},
+	{
+		"title": "Zendesk Unified Agent Status",
+		"id": "zendesk.com-unified-agent-status"
+	},
+	{
+		"title": "Zoom Chatbot",
+		"id": "zoom.com-chatbot"
+	},
+	{
+		"title": "Hashicorp Vault",
+		"id": "hashicorp.com-vault"
+	},
+	{
+		"title": "SailPoint IdentityNow SCIM",
+		"id": "sailpoint.com-identitynow-scim"
+	},
+	{
+		"title": "OMDb Open Movie Database",
+		"id": "omdbapi.com"
+	},
+	{
+		"title": "FIWARE",
+		"id": "fiware.com"
+	},
+	{
+		"title": "Merge ATS",
+		"id": "merge.com-ats"
+	},
+	{
+		"title": "HuggingFace Datasets",
+		"id": "huggingface.co-datasets"
+	},
+	{
+		"title": "Quotable",
+		"id": "quotable.com"
+	},
+	{
+		"title": "ActiveFence",
+		"id": "activefence.com"
+	},
+	{
+		"title": "NS NeuralSpace",
+		"id": "neuralspace.com"
+	},
+	{
+		"title": "Rev AI",
+		"id": "rev.com"
+	},
+	{
+		"title": "Akamai Identity and Access Management",
+		"id": "akamai.com-identity-and-access-management",
+		"version": "v3"
+	},
+	{
+		"title": "Twilio SendGrid",
+		"id": "sendgrid.com-v3",
+		"version": "v3"
+	},
+	{
+		"title": "Intercom",
+		"id": "intercom.com",
+		"version": "2.10"
+	},
+	{
+		"title": "Microsoft Entra VerifiedID Request",
+		"id": "microsoft.com-entra-verifiedid-request"
+	},
+	{
+		"title": "Twilio Messaging SMS",
+		"id": "twilio.com-messaging-sms"
+	},
+	{
+		"title": "AlienVault OTX",
+		"id": "otx.alienvault.com"
+	},
+	{
+		"title": "Qualys",
+		"id": "qualys.com"
+	},
+	{
+		"title": "Recorded Future",
+		"id": "recordedfuture.com"
+	}
+]
diff --git a/packages/cli/src/services/ai/schemas/generateCurl.ts b/packages/cli/src/services/ai/schemas/generateCurl.ts
new file mode 100644
index 0000000000000..e5f9c8ccf35cd
--- /dev/null
+++ b/packages/cli/src/services/ai/schemas/generateCurl.ts
@@ -0,0 +1,7 @@
+import { z } from 'zod';
+
+export const generateCurlSchema = z.object({
+	curl: z
+		.string()
+		.describe('The curl command that the user could run to call the endpoint they described.'),
+});
diff --git a/packages/cli/src/services/ai/schemas/retrieveService.ts b/packages/cli/src/services/ai/schemas/retrieveService.ts
new file mode 100644
index 0000000000000..6d2b187ded9d4
--- /dev/null
+++ b/packages/cli/src/services/ai/schemas/retrieveService.ts
@@ -0,0 +1,9 @@
+import { z } from 'zod';
+
+export const retrieveServiceSchema = z.object({
+	id: z
+		.string()
+		.describe(
+			'The id of the service, has to match the `id` of one of the entries in the CSV file or empty string',
+		),
+});
diff --git a/packages/cli/src/services/ai/utils/summarizeNodeTypeProperties.ts b/packages/cli/src/services/ai/utils/summarizeNodeTypeProperties.ts
new file mode 100644
index 0000000000000..27fb90197a7fe
--- /dev/null
+++ b/packages/cli/src/services/ai/utils/summarizeNodeTypeProperties.ts
@@ -0,0 +1,35 @@
+/* eslint-disable @typescript-eslint/no-use-before-define */
+import type { INodeProperties, INodePropertyCollection, INodePropertyOptions } from 'n8n-workflow';
+
+export function summarizeOption(
+	option: INodePropertyOptions | INodeProperties | INodePropertyCollection,
+): Partial<INodePropertyOptions | INodeProperties | INodePropertyCollection> {
+	if ('value' in option) {
+		return {
+			name: option.name,
+			value: option.value,
+		};
+	} else if ('values' in option) {
+		return {
+			name: option.name,
+			values: option.values.map(summarizeProperty) as INodeProperties[],
+		};
+	} else {
+		return summarizeProperty(option);
+	}
+}
+
+export function summarizeProperty(property: INodeProperties): Partial<INodeProperties> {
+	return {
+		name: property.displayName,
+		type: property.type,
+		...(property.displayOptions ? { displayOptions: property.displayOptions } : {}),
+		...((property.options
+			? { options: property.options.map(summarizeOption) }
+			: {}) as INodeProperties['options']),
+	};
+}
+
+export function summarizeNodeTypeProperties(nodeTypeProperties: INodeProperties[]) {
+	return nodeTypeProperties.map(summarizeProperty);
+}
diff --git a/packages/cli/src/services/cache/cache.service.ts b/packages/cli/src/services/cache/cache.service.ts
new file mode 100644
index 0000000000000..226c68438fba8
--- /dev/null
+++ b/packages/cli/src/services/cache/cache.service.ts
@@ -0,0 +1,359 @@
+import EventEmitter from 'node:events';
+
+import { Service } from 'typedi';
+import { caching } from 'cache-manager';
+import { ApplicationError, jsonStringify } from 'n8n-workflow';
+
+import config from '@/config';
+import { getDefaultRedisClient, getRedisPrefix } from '@/services/redis/RedisServiceHelper';
+import { UncacheableValueError } from '@/errors/cache-errors/uncacheable-value.error';
+import { MalformedRefreshValueError } from '@/errors/cache-errors/malformed-refresh-value.error';
+import type {
+	TaggedRedisCache,
+	TaggedMemoryCache,
+	CacheEvent,
+	MaybeHash,
+	Hash,
+} from '@/services/cache/cache.types';
+import { TIME } from '@/constants';
+
+@Service()
+export class CacheService extends EventEmitter {
+	private cache: TaggedRedisCache | TaggedMemoryCache;
+
+	async init() {
+		const backend = config.getEnv('cache.backend');
+		const mode = config.getEnv('executions.mode');
+		const ttl = config.getEnv('cache.redis.ttl');
+
+		const useRedis = backend === 'redis' || (backend === 'auto' && mode === 'queue');
+
+		if (useRedis) {
+			const keyPrefix = `${getRedisPrefix()}:${config.getEnv('cache.redis.prefix')}:`;
+			const redisClient = await getDefaultRedisClient({ keyPrefix }, 'client(cache)');
+
+			const { redisStoreUsingClient } = await import('@/services/cache/redis.cache-manager');
+			const redisStore = redisStoreUsingClient(redisClient, { ttl });
+
+			const redisCache = await caching(redisStore);
+
+			this.cache = { ...redisCache, kind: 'redis' };
+
+			return;
+		}
+
+		const maxSize = config.getEnv('cache.memory.maxSize');
+
+		const sizeCalculation = (item: unknown) => {
+			const str = jsonStringify(item, { replaceCircularRefs: true });
+			return new TextEncoder().encode(str).length;
+		};
+
+		const memoryCache = await caching('memory', { ttl, maxSize, sizeCalculation });
+
+		this.cache = { ...memoryCache, kind: 'memory' };
+	}
+
+	async reset() {
+		await this.cache.store.reset();
+	}
+
+	emit(event: CacheEvent, ...args: unknown[]) {
+		return super.emit(event, ...args);
+	}
+
+	isRedis() {
+		return this.cache.kind === 'redis';
+	}
+
+	isMemory() {
+		return this.cache.kind === 'memory';
+	}
+
+	// ----------------------------------
+	//             storing
+	// ----------------------------------
+
+	async set(key: string, value: unknown, ttl?: number) {
+		if (!this.cache) await this.init();
+
+		if (!key || !value) return;
+
+		if (this.cache.kind === 'redis' && !this.cache.store.isCacheable(value)) {
+			throw new UncacheableValueError(key);
+		}
+
+		await this.cache.store.set(key, value, ttl);
+	}
+
+	async setMany(keysValues: Array<[key: string, value: unknown]>, ttl?: number) {
+		if (!this.cache) await this.init();
+
+		if (keysValues.length === 0) return;
+
+		const truthyKeysValues = keysValues.filter(
+			([key, value]) => key?.length > 0 && value !== undefined && value !== null,
+		);
+
+		if (this.cache.kind === 'redis') {
+			for (const [key, value] of truthyKeysValues) {
+				if (!this.cache.store.isCacheable(value)) {
+					throw new UncacheableValueError(key);
+				}
+			}
+		}
+
+		await this.cache.store.mset(truthyKeysValues, ttl);
+	}
+
+	/**
+	 * Set or append to a [Redis hash](https://redis.io/docs/data-types/hashes/)
+	 * stored under a key in the cache. If in-memory, the hash is a regular JS object.
+	 */
+	async setHash(key: string, hash: Hash) {
+		if (!this.cache) await this.init();
+
+		if (!key?.length) return;
+
+		for (const hashKey in hash) {
+			if (hash[hashKey] === undefined || hash[hashKey] === null) return;
+		}
+
+		if (this.cache.kind === 'redis') {
+			await this.cache.store.hset(key, hash);
+			return;
+		}
+
+		const hashObject: Hash = (await this.get(key)) ?? {};
+
+		Object.assign(hashObject, hash);
+
+		await this.set(key, hashObject);
+	}
+
+	async expire(key: string, ttlMs: number) {
+		if (!this.cache) await this.init();
+
+		if (!key?.length) return;
+
+		if (this.cache.kind === 'memory') {
+			throw new ApplicationError('Method `expire` not yet implemented for in-memory cache', {
+				level: 'warning',
+			});
+		}
+
+		await this.cache.store.expire(key, ttlMs / TIME.SECOND);
+	}
+
+	// ----------------------------------
+	//            retrieving
+	// ----------------------------------
+
+	/**
+	 * Retrieve a primitive value under a key. To retrieve a hash, use `getHash`, and
+	 * to retrieve a primitive value in a hash, use `getHashValue`.
+	 */
+	async get<T = unknown>(
+		key: string,
+		{
+			fallbackValue,
+			refreshFn,
+		}: { fallbackValue?: T; refreshFn?: (key: string) => Promise<T | undefined> } = {},
+	) {
+		if (!this.cache) await this.init();
+
+		if (key?.length === 0) return;
+
+		const value = await this.cache.store.get<T>(key);
+
+		if (value !== undefined) {
+			this.emit('metrics.cache.hit');
+
+			return value;
+		}
+
+		this.emit('metrics.cache.miss');
+
+		if (refreshFn) {
+			this.emit('metrics.cache.update');
+
+			const refreshValue = await refreshFn(key);
+			await this.set(key, refreshValue);
+
+			return refreshValue;
+		}
+
+		return fallbackValue;
+	}
+
+	async getMany<T = unknown[]>(
+		keys: string[],
+		{
+			fallbackValue,
+			refreshFn,
+		}: {
+			fallbackValue?: T[];
+			refreshFn?: (keys: string[]) => Promise<T[]>;
+		} = {},
+	) {
+		if (!this.cache) await this.init();
+
+		if (keys.length === 0) return [];
+
+		const values = await this.cache.store.mget(...keys);
+
+		if (values !== undefined) {
+			this.emit('metrics.cache.hit');
+
+			return values as T[];
+		}
+
+		this.emit('metrics.cache.miss');
+
+		if (refreshFn) {
+			this.emit('metrics.cache.update');
+
+			const refreshValue: T[] = await refreshFn(keys);
+
+			if (keys.length !== refreshValue.length) {
+				throw new MalformedRefreshValueError();
+			}
+
+			const newValue: Array<[key: string, value: unknown]> = keys.map((key, i) => [
+				key,
+				refreshValue[i],
+			]);
+
+			await this.setMany(newValue);
+
+			return refreshValue;
+		}
+
+		return fallbackValue;
+	}
+
+	/**
+	 * Retrieve a [Redis hash](https://redis.io/docs/data-types/hashes/) under a key.
+	 * If in-memory, the hash is a regular JS object. To retrieve a primitive value
+	 * in the hash, use `getHashValue`.
+	 */
+	async getHash<T = unknown>(
+		key: string,
+		{
+			fallbackValue,
+			refreshFn,
+		}: { fallbackValue?: T; refreshFn?: (key: string) => Promise<MaybeHash<T>> } = {},
+	) {
+		if (!this.cache) await this.init();
+
+		const hash: MaybeHash<T> =
+			this.cache.kind === 'redis' ? await this.cache.store.hgetall(key) : await this.get(key);
+
+		if (hash !== undefined) {
+			this.emit('metrics.cache.hit');
+
+			return hash;
+		}
+
+		this.emit('metrics.cache.miss');
+
+		if (refreshFn) {
+			this.emit('metrics.cache.update');
+
+			const refreshValue = await refreshFn(key);
+			await this.set(key, refreshValue);
+
+			return refreshValue;
+		}
+
+		return fallbackValue as MaybeHash<T>;
+	}
+
+	/**
+	 * Retrieve a primitive value in a [Redis hash](https://redis.io/docs/data-types/hashes/)
+	 * under a hash key. If in-memory, the hash is a regular JS object. To retrieve the hash
+	 * itself, use `getHash`.
+	 */
+	async getHashValue<T = unknown>(
+		cacheKey: string,
+		hashKey: string,
+		{
+			fallbackValue,
+			refreshFn,
+		}: { fallbackValue?: T; refreshFn?: (key: string) => Promise<T | undefined> } = {},
+	) {
+		if (!this.cache) await this.init();
+
+		let hashValue: MaybeHash<T>;
+
+		if (this.cache.kind === 'redis') {
+			hashValue = await this.cache.store.hget(cacheKey, hashKey);
+		} else {
+			const hashObject = await this.cache.store.get<Hash<T>>(cacheKey);
+
+			hashValue = hashObject?.[hashKey] as MaybeHash<T>;
+		}
+
+		if (hashValue !== undefined) {
+			this.emit('metrics.cache.hit');
+
+			return hashValue as T;
+		}
+
+		this.emit('metrics.cache.miss');
+
+		if (refreshFn) {
+			this.emit('metrics.cache.update');
+
+			const refreshValue = await refreshFn(cacheKey);
+			await this.set(cacheKey, refreshValue);
+
+			return refreshValue;
+		}
+
+		return fallbackValue;
+	}
+
+	// ----------------------------------
+	//            deleting
+	// ----------------------------------
+
+	async delete(key: string) {
+		if (!this.cache) await this.init();
+
+		if (!key?.length) return;
+
+		await this.cache.store.del(key);
+	}
+
+	async deleteMany(keys: string[]) {
+		if (!this.cache) await this.init();
+
+		if (keys.length === 0) return;
+
+		return await this.cache.store.mdel(...keys);
+	}
+
+	/**
+	 * Delete a value under a key in a [Redis hash](https://redis.io/docs/data-types/hashes/).
+	 * If in-memory, the hash is a regular JS object. To delete the hash itself, use `delete`.
+	 */
+	async deleteFromHash(cacheKey: string, hashKey: string) {
+		if (!this.cache) await this.init();
+
+		if (!cacheKey || !hashKey) return;
+
+		if (this.cache.kind === 'redis') {
+			await this.cache.store.hdel(cacheKey, hashKey);
+			return;
+		}
+
+		const hashObject = await this.get<Hash>(cacheKey);
+
+		if (!hashObject) return;
+
+		delete hashObject[hashKey];
+
+		await this.cache.store.set(cacheKey, hashObject);
+	}
+}
diff --git a/packages/cli/src/services/cache/cache.types.ts b/packages/cli/src/services/cache/cache.types.ts
new file mode 100644
index 0000000000000..4e96b8012a799
--- /dev/null
+++ b/packages/cli/src/services/cache/cache.types.ts
@@ -0,0 +1,12 @@
+import type { MemoryCache } from 'cache-manager';
+import type { RedisCache } from '@/services/cache/redis.cache-manager';
+
+export type TaggedRedisCache = RedisCache & { kind: 'redis' };
+
+export type TaggedMemoryCache = MemoryCache & { kind: 'memory' };
+
+export type Hash<T = unknown> = Record<string, T>;
+
+export type MaybeHash<T> = Hash<T> | undefined;
+
+export type CacheEvent = `metrics.cache.${'hit' | 'miss' | 'update'}`;
diff --git a/packages/cli/src/services/cache/redis.cache-manager.ts b/packages/cli/src/services/cache/redis.cache-manager.ts
new file mode 100644
index 0000000000000..429e0d93c0619
--- /dev/null
+++ b/packages/cli/src/services/cache/redis.cache-manager.ts
@@ -0,0 +1,174 @@
+/**
+ * Based on https://github.com/node-cache-manager/node-cache-manager-ioredis-yet
+ */
+
+import Redis from 'ioredis';
+import type { Cluster, ClusterNode, ClusterOptions, RedisOptions } from 'ioredis';
+import type { Cache, Store, Config } from 'cache-manager';
+import { ApplicationError, jsonParse } from 'n8n-workflow';
+
+export class NoCacheableError implements Error {
+	name = 'NoCacheableError';
+
+	constructor(public message: string) {}
+}
+
+export const avoidNoCacheable = async <T>(p: Promise<T>) => {
+	try {
+		return await p;
+	} catch (e) {
+		if (!(e instanceof NoCacheableError)) throw e;
+		return undefined;
+	}
+};
+
+export interface RedisClusterConfig {
+	nodes: ClusterNode[];
+	options?: ClusterOptions;
+}
+
+export type RedisCache = Cache<RedisStore>;
+
+export interface RedisStore extends Store {
+	readonly isCacheable: (value: unknown) => boolean;
+	get client(): Redis | Cluster;
+	hget<T>(key: string, field: string): Promise<T | undefined>;
+	hgetall<T>(key: string): Promise<Record<string, T> | undefined>;
+	hset(key: string, fieldValueRecord: Record<string, unknown>): Promise<void>;
+	hkeys(key: string): Promise<string[]>;
+	hvals<T>(key: string): Promise<T[]>;
+	hexists(key: string, field: string): Promise<boolean>;
+	hdel(key: string, field: string): Promise<number>;
+	expire(key: string, ttlSeconds: number): Promise<void>;
+}
+
+function builder(
+	redisCache: Redis | Cluster,
+	reset: () => Promise<void>,
+	keys: (pattern: string) => Promise<string[]>,
+	options?: Config,
+) {
+	const isCacheable = options?.isCacheable ?? ((value) => value !== undefined && value !== null);
+	const getVal = (value: unknown) => JSON.stringify(value) || '"undefined"';
+
+	return {
+		async get<T>(key: string) {
+			const val = await redisCache.get(key);
+			if (val === undefined || val === null) return undefined;
+			else return jsonParse<T>(val);
+		},
+		async expire(key: string, ttlSeconds: number) {
+			await redisCache.expire(key, ttlSeconds);
+		},
+		async set(key, value, ttl) {
+			// eslint-disable-next-line @typescript-eslint/no-throw-literal, @typescript-eslint/restrict-template-expressions
+			if (!isCacheable(value)) throw new NoCacheableError(`"${value}" is not a cacheable value`);
+			const t = ttl ?? options?.ttl;
+			if (t !== undefined && t !== 0) await redisCache.set(key, getVal(value), 'PX', t);
+			else await redisCache.set(key, getVal(value));
+		},
+		async mset(args, ttl) {
+			const t = ttl ?? options?.ttl;
+			if (t !== undefined && t !== 0) {
+				const multi = redisCache.multi();
+				for (const [key, value] of args) {
+					if (!isCacheable(value))
+						// eslint-disable-next-line @typescript-eslint/no-throw-literal
+						throw new NoCacheableError(`"${getVal(value)}" is not a cacheable value`);
+					multi.set(key, getVal(value), 'PX', t);
+				}
+				await multi.exec();
+			} else
+				await redisCache.mset(
+					args.flatMap(([key, value]) => {
+						if (!isCacheable(value))
+							throw new ApplicationError(`"${getVal(value)}" is not a cacheable value`);
+						return [key, getVal(value)] as [string, string];
+					}),
+				);
+		},
+		mget: async (...args) =>
+			await redisCache
+				.mget(args)
+				.then((results) =>
+					results.map((result) =>
+						result === null || result === undefined ? undefined : jsonParse(result),
+					),
+				),
+		async mdel(...args) {
+			await redisCache.del(args);
+		},
+		async del(key) {
+			await redisCache.del(key);
+		},
+		ttl: async (key) => await redisCache.pttl(key),
+		keys: async (pattern = '*') => await keys(pattern),
+		reset,
+		isCacheable,
+		get client() {
+			return redisCache;
+		},
+		// Redis Hash functions
+		async hget<T>(key: string, field: string) {
+			const val = await redisCache.hget(key, field);
+			if (val === undefined || val === null) return undefined;
+			else return jsonParse<T>(val);
+		},
+		async hgetall<T>(key: string) {
+			const val = await redisCache.hgetall(key);
+			if (val === undefined || val === null) return undefined;
+			else {
+				for (const field in val) {
+					const value = val[field];
+					val[field] = jsonParse(value);
+				}
+				return val as Record<string, T>;
+			}
+		},
+		async hset(key: string, fieldValueRecord: Record<string, unknown>) {
+			for (const field in fieldValueRecord) {
+				const value = fieldValueRecord[field];
+				if (!isCacheable(fieldValueRecord[field])) {
+					// eslint-disable-next-line @typescript-eslint/no-throw-literal, @typescript-eslint/restrict-template-expressions
+					throw new NoCacheableError(`"${value}" is not a cacheable value`);
+				}
+				fieldValueRecord[field] = getVal(value);
+			}
+			await redisCache.hset(key, fieldValueRecord);
+		},
+		async hkeys(key: string) {
+			return await redisCache.hkeys(key);
+		},
+		async hvals<T>(key: string): Promise<T[]> {
+			const values = await redisCache.hvals(key);
+			return values.map((value) => jsonParse<T>(value));
+		},
+		async hexists(key: string, field: string): Promise<boolean> {
+			return (await redisCache.hexists(key, field)) === 1;
+		},
+		async hdel(key: string, field: string) {
+			return await redisCache.hdel(key, field);
+		},
+	} as RedisStore;
+}
+
+export function redisStoreUsingClient(redisCache: Redis | Cluster, options?: Config) {
+	const reset = async () => {
+		await redisCache.flushdb();
+	};
+	const keys = async (pattern: string) => await redisCache.keys(pattern);
+
+	return builder(redisCache, reset, keys, options);
+}
+
+export async function redisStore(
+	options?: (RedisOptions | { clusterConfig: RedisClusterConfig }) & Config,
+) {
+	options ||= {};
+	const redisCache =
+		'clusterConfig' in options
+			? new Redis.Cluster(options.clusterConfig.nodes, options.clusterConfig.options)
+			: new Redis(options);
+
+	return redisStoreUsingClient(redisCache, options);
+}
diff --git a/packages/cli/src/services/communityPackages.service.ts b/packages/cli/src/services/communityPackages.service.ts
new file mode 100644
index 0000000000000..23bf9461d697d
--- /dev/null
+++ b/packages/cli/src/services/communityPackages.service.ts
@@ -0,0 +1,372 @@
+import { exec } from 'child_process';
+import { access as fsAccess, mkdir as fsMkdir } from 'fs/promises';
+
+import { Service } from 'typedi';
+import { promisify } from 'util';
+import axios from 'axios';
+
+import { ApplicationError, type PublicInstalledPackage } from 'n8n-workflow';
+import { InstanceSettings } from 'n8n-core';
+import type { PackageDirectoryLoader } from 'n8n-core';
+
+import { toError } from '@/utils';
+import { InstalledPackagesRepository } from '@db/repositories/installedPackages.repository';
+import type { InstalledPackages } from '@db/entities/InstalledPackages';
+import {
+	NODE_PACKAGE_PREFIX,
+	NPM_COMMAND_TOKENS,
+	NPM_PACKAGE_STATUS_GOOD,
+	RESPONSE_ERROR_MESSAGES,
+	UNKNOWN_FAILURE_REASON,
+} from '@/constants';
+import type { CommunityPackages } from '@/Interfaces';
+import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
+import { Logger } from '@/Logger';
+
+const {
+	PACKAGE_NAME_NOT_PROVIDED,
+	DISK_IS_FULL,
+	PACKAGE_FAILED_TO_INSTALL,
+	PACKAGE_VERSION_NOT_FOUND,
+	PACKAGE_NOT_FOUND,
+} = RESPONSE_ERROR_MESSAGES;
+
+const {
+	NPM_PACKAGE_NOT_FOUND_ERROR,
+	NPM_NO_VERSION_AVAILABLE,
+	NPM_DISK_NO_SPACE,
+	NPM_DISK_INSUFFICIENT_SPACE,
+	NPM_PACKAGE_VERSION_NOT_FOUND_ERROR,
+} = NPM_COMMAND_TOKENS;
+
+const asyncExec = promisify(exec);
+
+const INVALID_OR_SUSPICIOUS_PACKAGE_NAME = /[^0-9a-z@\-./]/;
+
+@Service()
+export class CommunityPackagesService {
+	missingPackages: string[] = [];
+
+	constructor(
+		private readonly instanceSettings: InstanceSettings,
+		private readonly logger: Logger,
+		private readonly installedPackageRepository: InstalledPackagesRepository,
+		private readonly loadNodesAndCredentials: LoadNodesAndCredentials,
+	) {}
+
+	get hasMissingPackages() {
+		return this.missingPackages.length > 0;
+	}
+
+	async findInstalledPackage(packageName: string) {
+		return await this.installedPackageRepository.findOne({
+			where: { packageName },
+			relations: ['installedNodes'],
+		});
+	}
+
+	async isPackageInstalled(packageName: string) {
+		return await this.installedPackageRepository.exist({ where: { packageName } });
+	}
+
+	async getAllInstalledPackages() {
+		return await this.installedPackageRepository.find({ relations: ['installedNodes'] });
+	}
+
+	async removePackageFromDatabase(packageName: InstalledPackages) {
+		return await this.installedPackageRepository.remove(packageName);
+	}
+
+	async persistInstalledPackage(packageLoader: PackageDirectoryLoader) {
+		try {
+			return await this.installedPackageRepository.saveInstalledPackageWithNodes(packageLoader);
+		} catch (maybeError) {
+			const error = toError(maybeError);
+
+			this.logger.error('Failed to save installed packages and nodes', {
+				error,
+				packageName: packageLoader.packageJson.name,
+			});
+
+			throw error;
+		}
+	}
+
+	parseNpmPackageName(rawString?: string): CommunityPackages.ParsedPackageName {
+		if (!rawString) throw new ApplicationError(PACKAGE_NAME_NOT_PROVIDED);
+
+		if (INVALID_OR_SUSPICIOUS_PACKAGE_NAME.test(rawString)) {
+			throw new ApplicationError('Package name must be a single word');
+		}
+
+		const scope = rawString.includes('/') ? rawString.split('/')[0] : undefined;
+
+		const packageNameWithoutScope = scope ? rawString.replace(`${scope}/`, '') : rawString;
+
+		if (!packageNameWithoutScope.startsWith(NODE_PACKAGE_PREFIX)) {
+			throw new ApplicationError(`Package name must start with ${NODE_PACKAGE_PREFIX}`);
+		}
+
+		const version = packageNameWithoutScope.includes('@')
+			? packageNameWithoutScope.split('@')[1]
+			: undefined;
+
+		const packageName = version ? rawString.replace(`@${version}`, '') : rawString;
+
+		return { packageName, scope, version, rawString };
+	}
+
+	async executeNpmCommand(command: string, options?: { doNotHandleError?: boolean }) {
+		const downloadFolder = this.instanceSettings.nodesDownloadDir;
+
+		const execOptions = {
+			cwd: downloadFolder,
+			env: {
+				NODE_PATH: process.env.NODE_PATH,
+				PATH: process.env.PATH,
+				APPDATA: process.env.APPDATA,
+			},
+		};
+
+		try {
+			await fsAccess(downloadFolder);
+		} catch {
+			await fsMkdir(downloadFolder);
+			// Also init the folder since some versions
+			// of npm complain if the folder is empty
+			await asyncExec('npm init -y', execOptions);
+		}
+
+		try {
+			const commandResult = await asyncExec(command, execOptions);
+
+			return commandResult.stdout;
+		} catch (error) {
+			if (options?.doNotHandleError) throw error;
+
+			const errorMessage = error instanceof Error ? error.message : UNKNOWN_FAILURE_REASON;
+
+			const map = {
+				[NPM_PACKAGE_NOT_FOUND_ERROR]: PACKAGE_NOT_FOUND,
+				[NPM_NO_VERSION_AVAILABLE]: PACKAGE_NOT_FOUND,
+				[NPM_PACKAGE_VERSION_NOT_FOUND_ERROR]: PACKAGE_VERSION_NOT_FOUND,
+				[NPM_DISK_NO_SPACE]: DISK_IS_FULL,
+				[NPM_DISK_INSUFFICIENT_SPACE]: DISK_IS_FULL,
+			};
+
+			Object.entries(map).forEach(([npmMessage, n8nMessage]) => {
+				if (errorMessage.includes(npmMessage)) throw new ApplicationError(n8nMessage);
+			});
+
+			this.logger.warn('npm command failed', { errorMessage });
+
+			throw new ApplicationError(PACKAGE_FAILED_TO_INSTALL);
+		}
+	}
+
+	matchPackagesWithUpdates(
+		packages: InstalledPackages[],
+		updates?: CommunityPackages.AvailableUpdates,
+	) {
+		if (!updates) return packages;
+
+		return packages.reduce<PublicInstalledPackage[]>((acc, cur) => {
+			const publicPackage: PublicInstalledPackage = { ...cur };
+
+			const update = updates[cur.packageName];
+
+			if (update) publicPackage.updateAvailable = update.latest;
+
+			acc.push(publicPackage);
+
+			return acc;
+		}, []);
+	}
+
+	matchMissingPackages(installedPackages: PublicInstalledPackage[]) {
+		const missingPackagesList = this.missingPackages
+			.map((name) => {
+				try {
+					// Strip away versions but maintain scope and package name
+					const parsedPackageData = this.parseNpmPackageName(name);
+					return parsedPackageData.packageName;
+				} catch {
+					return;
+				}
+			})
+			.filter((i): i is string => i !== undefined);
+
+		const hydratedPackageList: PublicInstalledPackage[] = [];
+
+		installedPackages.forEach((installedPackage) => {
+			const hydratedInstalledPackage = { ...installedPackage };
+
+			if (missingPackagesList.includes(hydratedInstalledPackage.packageName)) {
+				hydratedInstalledPackage.failedLoading = true;
+			}
+
+			hydratedPackageList.push(hydratedInstalledPackage);
+		});
+
+		return hydratedPackageList;
+	}
+
+	async checkNpmPackageStatus(packageName: string) {
+		const N8N_BACKEND_SERVICE_URL = 'https://api.n8n.io/api/package';
+
+		try {
+			const response = await axios.post<CommunityPackages.PackageStatusCheck>(
+				N8N_BACKEND_SERVICE_URL,
+				{ name: packageName },
+				{ method: 'POST' },
+			);
+
+			if (response.data.status !== NPM_PACKAGE_STATUS_GOOD) return response.data;
+		} catch {
+			// service unreachable, do nothing
+		}
+
+		return { status: NPM_PACKAGE_STATUS_GOOD };
+	}
+
+	hasPackageLoaded(packageName: string) {
+		if (!this.missingPackages.length) return true;
+
+		return !this.missingPackages.some(
+			(packageNameAndVersion) =>
+				packageNameAndVersion.startsWith(packageName) &&
+				packageNameAndVersion.replace(packageName, '').startsWith('@'),
+		);
+	}
+
+	removePackageFromMissingList(packageName: string) {
+		try {
+			this.missingPackages = this.missingPackages.filter(
+				(packageNameAndVersion) =>
+					!packageNameAndVersion.startsWith(packageName) ||
+					!packageNameAndVersion.replace(packageName, '').startsWith('@'),
+			);
+		} catch {
+			// do nothing
+		}
+	}
+
+	async setMissingPackages({ reinstallMissingPackages }: { reinstallMissingPackages: boolean }) {
+		const installedPackages = await this.getAllInstalledPackages();
+		const missingPackages = new Set<{ packageName: string; version: string }>();
+
+		installedPackages.forEach((installedPackage) => {
+			installedPackage.installedNodes.forEach((installedNode) => {
+				if (!this.loadNodesAndCredentials.isKnownNode(installedNode.type)) {
+					// Leave the list ready for installing in case we need.
+					missingPackages.add({
+						packageName: installedPackage.packageName,
+						version: installedPackage.installedVersion,
+					});
+				}
+			});
+		});
+
+		this.missingPackages = [];
+
+		if (missingPackages.size === 0) return;
+
+		this.logger.error(
+			'n8n detected that some packages are missing. For more information, visit https://docs.n8n.io/integrations/community-nodes/troubleshooting/',
+		);
+
+		if (reinstallMissingPackages || process.env.N8N_REINSTALL_MISSING_PACKAGES) {
+			this.logger.info('Attempting to reinstall missing packages', { missingPackages });
+			try {
+				// Optimistic approach - stop if any installation fails
+
+				for (const missingPackage of missingPackages) {
+					await this.installNpmModule(missingPackage.packageName, missingPackage.version);
+
+					missingPackages.delete(missingPackage);
+				}
+				this.logger.info('Packages reinstalled successfully. Resuming regular initialization.');
+			} catch (error) {
+				this.logger.error('n8n was unable to install the missing packages.');
+			}
+		}
+
+		this.missingPackages = [...missingPackages].map(
+			(missingPackage) => `${missingPackage.packageName}@${missingPackage.version}`,
+		);
+	}
+
+	async installNpmModule(packageName: string, version?: string): Promise<InstalledPackages> {
+		return await this.installOrUpdateNpmModule(packageName, { version });
+	}
+
+	async updateNpmModule(
+		packageName: string,
+		installedPackage: InstalledPackages,
+	): Promise<InstalledPackages> {
+		return await this.installOrUpdateNpmModule(packageName, { installedPackage });
+	}
+
+	async removeNpmModule(packageName: string, installedPackage: InstalledPackages): Promise<void> {
+		await this.executeNpmCommand(`npm remove ${packageName}`);
+		await this.removePackageFromDatabase(installedPackage);
+		await this.loadNodesAndCredentials.unloadPackage(packageName);
+		await this.loadNodesAndCredentials.postProcessLoaders();
+	}
+
+	private async installOrUpdateNpmModule(
+		packageName: string,
+		options: { version?: string } | { installedPackage: InstalledPackages },
+	) {
+		const isUpdate = 'installedPackage' in options;
+		const command = isUpdate
+			? `npm install ${packageName}@latest`
+			: `npm install ${packageName}${options.version ? `@${options.version}` : ''}`;
+
+		try {
+			await this.executeNpmCommand(command);
+		} catch (error) {
+			if (error instanceof Error && error.message === RESPONSE_ERROR_MESSAGES.PACKAGE_NOT_FOUND) {
+				throw new ApplicationError('npm package not found', { extra: { packageName } });
+			}
+			throw error;
+		}
+
+		let loader: PackageDirectoryLoader;
+		try {
+			loader = await this.loadNodesAndCredentials.loadPackage(packageName);
+		} catch (error) {
+			// Remove this package since loading it failed
+			const removeCommand = `npm remove ${packageName}`;
+			try {
+				await this.executeNpmCommand(removeCommand);
+			} catch {}
+			throw new ApplicationError(RESPONSE_ERROR_MESSAGES.PACKAGE_LOADING_FAILED, { cause: error });
+		}
+
+		if (loader.loadedNodes.length > 0) {
+			// Save info to DB
+			try {
+				if (isUpdate) {
+					await this.removePackageFromDatabase(options.installedPackage);
+				}
+				const installedPackage = await this.persistInstalledPackage(loader);
+				await this.loadNodesAndCredentials.postProcessLoaders();
+				return installedPackage;
+			} catch (error) {
+				throw new ApplicationError('Failed to save installed package', {
+					extra: { packageName },
+					cause: error,
+				});
+			}
+		} else {
+			// Remove this package since it contains no loadable nodes
+			const removeCommand = `npm remove ${packageName}`;
+			try {
+				await this.executeNpmCommand(removeCommand);
+			} catch {}
+
+			throw new ApplicationError(RESPONSE_ERROR_MESSAGES.PACKAGE_DOES_NOT_CONTAIN_NODES);
+		}
+	}
+}
diff --git a/packages/cli/src/services/credentials-tester.service.ts b/packages/cli/src/services/credentials-tester.service.ts
new file mode 100644
index 0000000000000..bcb48e495cbb4
--- /dev/null
+++ b/packages/cli/src/services/credentials-tester.service.ts
@@ -0,0 +1,388 @@
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
+/* eslint-disable @typescript-eslint/no-unsafe-return */
+/* eslint-disable @typescript-eslint/no-unsafe-call */
+import { Service } from 'typedi';
+import { NodeExecuteFunctions } from 'n8n-core';
+import get from 'lodash/get';
+
+import type {
+	ICredentialsDecrypted,
+	ICredentialTestFunction,
+	ICredentialTestRequestData,
+	INode,
+	INodeCredentialTestResult,
+	INodeExecutionData,
+	INodeProperties,
+	INodeType,
+	IVersionedNodeType,
+	IRunExecutionData,
+	WorkflowExecuteMode,
+	ITaskDataConnections,
+	INodeTypeData,
+	INodeTypes,
+	ICredentialTestFunctions,
+	IDataObject,
+} from 'n8n-workflow';
+import {
+	VersionedNodeType,
+	NodeHelpers,
+	RoutingNode,
+	Workflow,
+	ErrorReporterProxy as ErrorReporter,
+	ApplicationError,
+} from 'n8n-workflow';
+
+import * as WorkflowExecuteAdditionalData from '@/WorkflowExecuteAdditionalData';
+import type { User } from '@db/entities/User';
+import { NodeTypes } from '@/NodeTypes';
+import { CredentialTypes } from '@/CredentialTypes';
+import { RESPONSE_ERROR_MESSAGES } from '../constants';
+import { isObjectLiteral } from '../utils';
+import { Logger } from '@/Logger';
+import { CredentialsHelper } from '../CredentialsHelper';
+
+const { OAUTH2_CREDENTIAL_TEST_SUCCEEDED, OAUTH2_CREDENTIAL_TEST_FAILED } = RESPONSE_ERROR_MESSAGES;
+
+const mockNodesData: INodeTypeData = {
+	mock: {
+		sourcePath: '',
+		type: {
+			description: { properties: [] as INodeProperties[] },
+		} as INodeType,
+	},
+};
+
+const mockNodeTypes: INodeTypes = {
+	getKnownTypes(): IDataObject {
+		return {};
+	},
+	getByName(nodeType: string): INodeType | IVersionedNodeType {
+		return mockNodesData[nodeType]?.type;
+	},
+	getByNameAndVersion(nodeType: string, version?: number): INodeType {
+		if (!mockNodesData[nodeType]) {
+			throw new ApplicationError(RESPONSE_ERROR_MESSAGES.NO_NODE, {
+				tags: { nodeType },
+			});
+		}
+		return NodeHelpers.getVersionedNodeType(mockNodesData[nodeType].type, version);
+	},
+};
+
+@Service()
+export class CredentialsTester {
+	constructor(
+		private readonly logger: Logger,
+		private readonly credentialTypes: CredentialTypes,
+		private readonly nodeTypes: NodeTypes,
+		private readonly credentialsHelper: CredentialsHelper,
+	) {}
+
+	private static hasAccessToken(credentialsDecrypted: ICredentialsDecrypted) {
+		const oauthTokenData = credentialsDecrypted?.data?.oauthTokenData;
+
+		if (!isObjectLiteral(oauthTokenData)) return false;
+
+		return 'access_token' in oauthTokenData;
+	}
+
+	getCredentialTestFunction(
+		credentialType: string,
+	): ICredentialTestFunction | ICredentialTestRequestData | undefined {
+		// Check if test is defined on credentials
+		const type = this.credentialTypes.getByName(credentialType);
+		if (type.test) {
+			return {
+				testRequest: type.test,
+			};
+		}
+
+		const supportedNodes = this.credentialTypes.getSupportedNodes(credentialType);
+		for (const nodeName of supportedNodes) {
+			const node = this.nodeTypes.getByName(nodeName);
+
+			// Always set to an array even if node is not versioned to not having
+			// to duplicate the logic
+			const allNodeTypes: INodeType[] = [];
+			if (node instanceof VersionedNodeType) {
+				// Node is versioned
+				allNodeTypes.push(...Object.values(node.nodeVersions));
+			} else {
+				// Node is not versioned
+				allNodeTypes.push(node as INodeType);
+			}
+
+			// Check each of the node versions for credential tests
+			for (const nodeType of allNodeTypes) {
+				// Check each of teh credentials
+				for (const { name, testedBy } of nodeType.description.credentials ?? []) {
+					if (
+						name === credentialType &&
+						(this.credentialTypes.getParentTypes(name).includes('oAuth2Api') ||
+							name === 'oAuth2Api')
+					) {
+						return async function oauth2CredTest(
+							this: ICredentialTestFunctions,
+							cred: ICredentialsDecrypted,
+						): Promise<INodeCredentialTestResult> {
+							return CredentialsTester.hasAccessToken(cred)
+								? {
+										status: 'OK',
+										message: OAUTH2_CREDENTIAL_TEST_SUCCEEDED,
+									}
+								: {
+										status: 'Error',
+										message: OAUTH2_CREDENTIAL_TEST_FAILED,
+									};
+						};
+					}
+
+					if (name === credentialType && !!testedBy) {
+						if (typeof testedBy === 'string') {
+							if (node instanceof VersionedNodeType) {
+								// The node is versioned. So check all versions for test function
+								// starting with the latest
+								const versions = Object.keys(node.nodeVersions).sort().reverse();
+								for (const version of versions) {
+									const versionedNode = node.nodeVersions[parseInt(version, 10)];
+									const credentialTest = versionedNode.methods?.credentialTest;
+									if (credentialTest && testedBy in credentialTest) {
+										return credentialTest[testedBy];
+									}
+								}
+							}
+							// Test is defined as string which links to a function
+							return (node as unknown as INodeType).methods?.credentialTest![testedBy];
+						}
+
+						// Test is defined as JSON with a definition for the request to make
+						return {
+							nodeType,
+							testRequest: testedBy,
+						};
+					}
+				}
+			}
+		}
+
+		return undefined;
+	}
+
+	// eslint-disable-next-line complexity
+	async testCredentials(
+		user: User,
+		credentialType: string,
+		credentialsDecrypted: ICredentialsDecrypted,
+	): Promise<INodeCredentialTestResult> {
+		const credentialTestFunction = this.getCredentialTestFunction(credentialType);
+		if (credentialTestFunction === undefined) {
+			return {
+				status: 'Error',
+				message: 'No testing function found for this credential.',
+			};
+		}
+
+		if (credentialsDecrypted.data) {
+			try {
+				const additionalData = await WorkflowExecuteAdditionalData.getBase(user.id);
+				credentialsDecrypted.data = this.credentialsHelper.applyDefaultsAndOverwrites(
+					additionalData,
+					credentialsDecrypted.data,
+					credentialType,
+					'internal' as WorkflowExecuteMode,
+					undefined,
+					undefined,
+					user.hasGlobalScope('externalSecret:use'),
+				);
+			} catch (error) {
+				this.logger.debug('Credential test failed', error);
+				return {
+					status: 'Error',
+					message: error.message.toString(),
+				};
+			}
+		}
+
+		if (typeof credentialTestFunction === 'function') {
+			// The credentials get tested via a function that is defined on the node
+			const credentialTestFunctions = NodeExecuteFunctions.getCredentialTestFunctions();
+
+			return credentialTestFunction.call(credentialTestFunctions, credentialsDecrypted);
+		}
+
+		// Credentials get tested via request instructions
+
+		// TODO: Temp workflows get created at multiple locations (for example also LoadNodeParameterOptions),
+		//       check if some of them are identical enough that it can be combined
+
+		let nodeType: INodeType;
+		if (credentialTestFunction.nodeType) {
+			nodeType = credentialTestFunction.nodeType;
+		} else {
+			nodeType = this.nodeTypes.getByNameAndVersion('n8n-nodes-base.noOp');
+		}
+
+		const node: INode = {
+			id: 'temp',
+			parameters: {},
+			name: 'Temp-Node',
+			type: nodeType.description.name,
+			typeVersion: Array.isArray(nodeType.description.version)
+				? nodeType.description.version.slice(-1)[0]
+				: nodeType.description.version,
+			position: [0, 0],
+			credentials: {
+				[credentialType]: {
+					id: credentialsDecrypted.id,
+					name: credentialsDecrypted.name,
+				},
+			},
+		};
+
+		const workflowData = {
+			nodes: [node],
+			connections: {},
+		};
+
+		const nodeTypeCopy: INodeType = {
+			description: {
+				...nodeType.description,
+				credentials: [
+					{
+						name: credentialType,
+						required: true,
+					},
+				],
+				properties: [
+					{
+						displayName: 'Temp',
+						name: 'temp',
+						type: 'string',
+						routing: {
+							request: credentialTestFunction.testRequest.request,
+						},
+						default: '',
+					},
+				],
+			},
+		};
+
+		mockNodesData[nodeTypeCopy.description.name] = {
+			sourcePath: '',
+			type: nodeTypeCopy,
+		};
+
+		const workflow = new Workflow({
+			nodes: workflowData.nodes,
+			connections: workflowData.connections,
+			active: false,
+			nodeTypes: mockNodeTypes,
+		});
+
+		const mode = 'internal';
+		const runIndex = 0;
+		const inputData: ITaskDataConnections = {
+			main: [[{ json: {} }]],
+		};
+		const connectionInputData: INodeExecutionData[] = [];
+		const runExecutionData: IRunExecutionData = {
+			resultData: {
+				runData: {},
+			},
+		};
+
+		const additionalData = await WorkflowExecuteAdditionalData.getBase(user.id, node.parameters);
+
+		const routingNode = new RoutingNode(
+			workflow,
+			node,
+			connectionInputData,
+			runExecutionData ?? null,
+			additionalData,
+			mode,
+		);
+
+		let response: INodeExecutionData[][] | null | undefined;
+
+		try {
+			response = await routingNode.runNode(
+				inputData,
+				runIndex,
+				nodeTypeCopy,
+				{ node, data: {}, source: null },
+				NodeExecuteFunctions,
+				credentialsDecrypted,
+			);
+		} catch (error) {
+			ErrorReporter.error(error);
+			// Do not fail any requests to allow custom error messages and
+			// make logic easier
+			if (error.cause?.response) {
+				const errorResponseData = {
+					statusCode: error.cause.response.status,
+					statusMessage: error.cause.response.statusText,
+				};
+				if (credentialTestFunction.testRequest.rules) {
+					// Special testing rules are defined so check all in order
+					for (const rule of credentialTestFunction.testRequest.rules) {
+						if (rule.type === 'responseCode') {
+							if (errorResponseData.statusCode === rule.properties.value) {
+								return {
+									status: 'Error',
+									message: rule.properties.message,
+								};
+							}
+						}
+					}
+				}
+
+				if (errorResponseData.statusCode < 199 || errorResponseData.statusCode > 299) {
+					// All requests with response codes that are not 2xx are treated by default as failed
+					return {
+						status: 'Error',
+						message:
+							errorResponseData.statusMessage ||
+							`Received HTTP status code: ${errorResponseData.statusCode}`,
+					};
+				}
+			} else if (error.cause?.code) {
+				return {
+					status: 'Error',
+					message: error.cause.code,
+				};
+			}
+			this.logger.debug('Credential test failed', error);
+			return {
+				status: 'Error',
+				message: error.message.toString(),
+			};
+		} finally {
+			delete mockNodesData[nodeTypeCopy.description.name];
+		}
+
+		if (
+			credentialTestFunction.testRequest.rules &&
+			Array.isArray(credentialTestFunction.testRequest.rules)
+		) {
+			// Special testing rules are defined so check all in order
+			for (const rule of credentialTestFunction.testRequest.rules) {
+				if (rule.type === 'responseSuccessBody') {
+					const responseData = response![0][0].json;
+					if (get(responseData, rule.properties.key) === rule.properties.value) {
+						return {
+							status: 'Error',
+							message: rule.properties.message,
+						};
+					}
+				}
+			}
+		}
+
+		return {
+			status: 'OK',
+			message: 'Connection successful!',
+		};
+	}
+}
diff --git a/packages/cli/src/services/cta.service.ts b/packages/cli/src/services/cta.service.ts
new file mode 100644
index 0000000000000..e5c08a437bc54
--- /dev/null
+++ b/packages/cli/src/services/cta.service.ts
@@ -0,0 +1,18 @@
+import { Service } from 'typedi';
+import { WorkflowStatisticsRepository } from '@/databases/repositories/workflowStatistics.repository';
+import type { User } from '@/databases/entities/User';
+
+@Service()
+export class CtaService {
+	constructor(private readonly workflowStatisticsRepository: WorkflowStatisticsRepository) {}
+
+	async getBecomeCreatorCta(userId: User['id']) {
+		// There need to be at least 3 workflows with at least 5 executions
+		const numWfsWithOver5ProdExecutions =
+			await this.workflowStatisticsRepository.queryNumWorkflowsUserHasWithFiveOrMoreProdExecs(
+				userId,
+			);
+
+		return numWfsWithOver5ProdExecutions >= 3;
+	}
+}
diff --git a/packages/cli/src/services/dynamicNodeParameters.service.ts b/packages/cli/src/services/dynamicNodeParameters.service.ts
new file mode 100644
index 0000000000000..1788bac6e1877
--- /dev/null
+++ b/packages/cli/src/services/dynamicNodeParameters.service.ts
@@ -0,0 +1,232 @@
+import { Service } from 'typedi';
+import type {
+	ILoadOptions,
+	ILoadOptionsFunctions,
+	INode,
+	INodeExecutionData,
+	INodeListSearchResult,
+	INodeProperties,
+	INodePropertyOptions,
+	INodeType,
+	IRunExecutionData,
+	ITaskDataConnections,
+	IWorkflowExecuteAdditionalData,
+	ResourceMapperFields,
+	INodeCredentials,
+	INodeParameters,
+	INodeTypeNameVersion,
+} from 'n8n-workflow';
+import { Workflow, RoutingNode, ApplicationError } from 'n8n-workflow';
+import { NodeExecuteFunctions } from 'n8n-core';
+import { NodeTypes } from '@/NodeTypes';
+
+@Service()
+export class DynamicNodeParametersService {
+	constructor(private nodeTypes: NodeTypes) {}
+
+	/** Returns the available options via a predefined method */
+	async getOptionsViaMethodName(
+		methodName: string,
+		path: string,
+		additionalData: IWorkflowExecuteAdditionalData,
+		nodeTypeAndVersion: INodeTypeNameVersion,
+		currentNodeParameters: INodeParameters,
+		credentials?: INodeCredentials,
+	): Promise<INodePropertyOptions[]> {
+		const nodeType = this.getNodeType(nodeTypeAndVersion);
+		const method = this.getMethod('loadOptions', methodName, nodeType);
+		const workflow = this.getWorkflow(nodeTypeAndVersion, currentNodeParameters, credentials);
+		const thisArgs = this.getThisArg(path, additionalData, workflow);
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-return
+		return method.call(thisArgs);
+	}
+
+	/** Returns the available options via a loadOptions param */
+	async getOptionsViaLoadOptions(
+		loadOptions: ILoadOptions,
+		additionalData: IWorkflowExecuteAdditionalData,
+		nodeTypeAndVersion: INodeTypeNameVersion,
+		currentNodeParameters: INodeParameters,
+		credentials?: INodeCredentials,
+	): Promise<INodePropertyOptions[]> {
+		const nodeType = this.getNodeType(nodeTypeAndVersion);
+		if (!nodeType.description.requestDefaults?.baseURL) {
+			// This in in here for now for security reasons.
+			// Background: As the full data for the request to make does get send, and the auth data
+			// will then be applied, would it be possible to retrieve that data like that. By at least
+			// requiring a baseURL to be defined can at least not a random server be called.
+			// In the future this code has to get improved that it does not use the request information from
+			// the request rather resolves it via the parameter-path and nodeType data.
+			throw new ApplicationError(
+				'Node type does not exist or does not have "requestDefaults.baseURL" defined!',
+				{ tags: { nodeType: nodeType.description.name } },
+			);
+		}
+
+		const mode = 'internal';
+		const runIndex = 0;
+		const connectionInputData: INodeExecutionData[] = [];
+		const runExecutionData: IRunExecutionData = { resultData: { runData: {} } };
+		const workflow = this.getWorkflow(nodeTypeAndVersion, currentNodeParameters, credentials);
+		const node = workflow.nodes['Temp-Node'];
+
+		const routingNode = new RoutingNode(
+			workflow,
+			node,
+			connectionInputData,
+			runExecutionData ?? null,
+			additionalData,
+			mode,
+		);
+
+		// Create copy of node-type with the single property we want to get the data off
+		const tempNode: INodeType = {
+			...nodeType,
+			...{
+				description: {
+					...nodeType.description,
+					properties: [
+						{
+							displayName: '',
+							type: 'string',
+							name: '',
+							default: '',
+							routing: loadOptions.routing,
+						} as INodeProperties,
+					],
+				},
+			},
+		};
+
+		const inputData: ITaskDataConnections = {
+			main: [[{ json: {} }]],
+		};
+
+		const optionsData = await routingNode.runNode(
+			inputData,
+			runIndex,
+			tempNode,
+			{ node, source: null, data: {} },
+			NodeExecuteFunctions,
+		);
+
+		if (optionsData?.length === 0) {
+			return [];
+		}
+
+		if (!Array.isArray(optionsData)) {
+			throw new ApplicationError('The returned data is not an array');
+		}
+
+		return optionsData[0].map((item) => item.json) as unknown as INodePropertyOptions[];
+	}
+
+	async getResourceLocatorResults(
+		methodName: string,
+		path: string,
+		additionalData: IWorkflowExecuteAdditionalData,
+		nodeTypeAndVersion: INodeTypeNameVersion,
+		currentNodeParameters: INodeParameters,
+		credentials?: INodeCredentials,
+		filter?: string,
+		paginationToken?: string,
+	): Promise<INodeListSearchResult> {
+		const nodeType = this.getNodeType(nodeTypeAndVersion);
+		const method = this.getMethod('listSearch', methodName, nodeType);
+		const workflow = this.getWorkflow(nodeTypeAndVersion, currentNodeParameters, credentials);
+		const thisArgs = this.getThisArg(path, additionalData, workflow);
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-return
+		return method.call(thisArgs, filter, paginationToken);
+	}
+
+	/** Returns the available mapping fields for the ResourceMapper component */
+	async getResourceMappingFields(
+		methodName: string,
+		path: string,
+		additionalData: IWorkflowExecuteAdditionalData,
+		nodeTypeAndVersion: INodeTypeNameVersion,
+		currentNodeParameters: INodeParameters,
+		credentials?: INodeCredentials,
+	): Promise<ResourceMapperFields> {
+		const nodeType = this.getNodeType(nodeTypeAndVersion);
+		const method = this.getMethod('resourceMapping', methodName, nodeType);
+		const workflow = this.getWorkflow(nodeTypeAndVersion, currentNodeParameters, credentials);
+		const thisArgs = this.getThisArg(path, additionalData, workflow);
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-return
+		return method.call(thisArgs);
+	}
+
+	private getMethod(
+		type: 'resourceMapping',
+		methodName: string,
+		nodeType: INodeType,
+	): (this: ILoadOptionsFunctions) => Promise<ResourceMapperFields>;
+	private getMethod(
+		type: 'listSearch',
+		methodName: string,
+		nodeType: INodeType,
+	): (
+		this: ILoadOptionsFunctions,
+		filter?: string | undefined,
+		paginationToken?: string | undefined,
+	) => Promise<INodeListSearchResult>;
+	private getMethod(
+		type: 'loadOptions',
+		methodName: string,
+		nodeType: INodeType,
+	): (this: ILoadOptionsFunctions) => Promise<INodePropertyOptions[]>;
+
+	private getMethod(
+		type: 'resourceMapping' | 'listSearch' | 'loadOptions',
+		methodName: string,
+		nodeType: INodeType,
+	) {
+		const method = nodeType.methods?.[type]?.[methodName];
+		if (typeof method !== 'function') {
+			throw new ApplicationError('Node type does not have method defined', {
+				tags: { nodeType: nodeType.description.name },
+				extra: { methodName },
+			});
+		}
+		return method;
+	}
+
+	private getNodeType({ name, version }: INodeTypeNameVersion) {
+		return this.nodeTypes.getByNameAndVersion(name, version);
+	}
+
+	private getWorkflow(
+		nodeTypeAndVersion: INodeTypeNameVersion,
+		currentNodeParameters: INodeParameters,
+		credentials?: INodeCredentials,
+	) {
+		const node: INode = {
+			parameters: currentNodeParameters,
+			id: 'uuid-1234',
+			name: 'Temp-Node',
+			type: nodeTypeAndVersion.name,
+			typeVersion: nodeTypeAndVersion.version,
+			position: [0, 0],
+		};
+
+		if (credentials) {
+			node.credentials = credentials;
+		}
+
+		return new Workflow({
+			nodes: [node],
+			connections: {},
+			active: false,
+			nodeTypes: this.nodeTypes,
+		});
+	}
+
+	private getThisArg(
+		path: string,
+		additionalData: IWorkflowExecuteAdditionalData,
+		workflow: Workflow,
+	) {
+		const node = workflow.nodes['Temp-Node'];
+		return NodeExecuteFunctions.getLoadOptionsFunctions(workflow, node, path, additionalData);
+	}
+}
diff --git a/packages/cli/src/services/events.service.ts b/packages/cli/src/services/events.service.ts
new file mode 100644
index 0000000000000..10a0e7dc6c6dd
--- /dev/null
+++ b/packages/cli/src/services/events.service.ts
@@ -0,0 +1,131 @@
+import { EventEmitter } from 'events';
+import { Container, Service } from 'typedi';
+import type { INode, IRun, IWorkflowBase } from 'n8n-workflow';
+import { StatisticsNames } from '@db/entities/WorkflowStatistics';
+import { WorkflowStatisticsRepository } from '@db/repositories/workflowStatistics.repository';
+import { UserService } from '@/services/user.service';
+import { Logger } from '@/Logger';
+import { OwnershipService } from './ownership.service';
+
+@Service()
+export class EventsService extends EventEmitter {
+	constructor(
+		private readonly logger: Logger,
+		private readonly repository: WorkflowStatisticsRepository,
+		private readonly ownershipService: OwnershipService,
+	) {
+		super({ captureRejections: true });
+		if ('SKIP_STATISTICS_EVENTS' in process.env) return;
+
+		this.on(
+			'nodeFetchedData',
+			async (workflowId, node) => await this.nodeFetchedData(workflowId, node),
+		);
+		this.on(
+			'workflowExecutionCompleted',
+			async (workflowData, runData) => await this.workflowExecutionCompleted(workflowData, runData),
+		);
+	}
+
+	async workflowExecutionCompleted(workflowData: IWorkflowBase, runData: IRun): Promise<void> {
+		// Determine the name of the statistic
+		const finished = runData.finished ? runData.finished : false;
+		const manual = runData.mode === 'manual';
+		let name: StatisticsNames;
+
+		if (finished) {
+			if (manual) name = StatisticsNames.manualSuccess;
+			else name = StatisticsNames.productionSuccess;
+		} else {
+			if (manual) name = StatisticsNames.manualError;
+			else name = StatisticsNames.productionError;
+		}
+
+		// Get the workflow id
+		const workflowId = workflowData.id;
+		if (!workflowId) return;
+
+		try {
+			const upsertResult = await this.repository.upsertWorkflowStatistics(name, workflowId);
+
+			if (name === StatisticsNames.productionSuccess && upsertResult === 'insert') {
+				const owner = await Container.get(OwnershipService).getWorkflowOwnerCached(workflowId);
+				const metrics = {
+					user_id: owner.id,
+					workflow_id: workflowId,
+				};
+
+				if (!owner.settings?.userActivated) {
+					await Container.get(UserService).updateSettings(owner.id, {
+						firstSuccessfulWorkflowId: workflowId,
+						userActivated: true,
+					});
+				}
+
+				// Send the metrics
+				this.emit('telemetry.onFirstProductionWorkflowSuccess', metrics);
+			}
+		} catch (error) {
+			this.logger.verbose('Unable to fire first workflow success telemetry event');
+		}
+	}
+
+	async nodeFetchedData(workflowId: string | undefined | null, node: INode): Promise<void> {
+		if (!workflowId) return;
+
+		const insertResult = await this.repository.insertWorkflowStatistics(
+			StatisticsNames.dataLoaded,
+			workflowId,
+		);
+		if (insertResult === 'failed' || insertResult === 'alreadyExists') return;
+
+		// Compile the metrics since this was a new data loaded event
+		const owner = await this.ownershipService.getWorkflowOwnerCached(workflowId);
+
+		let metrics = {
+			user_id: owner.id,
+			workflow_id: workflowId,
+			node_type: node.type,
+			node_id: node.id,
+		};
+
+		// This is probably naive but I can't see a way for a node to have multiple credentials attached so..
+		if (node.credentials) {
+			Object.entries(node.credentials).forEach(([credName, credDetails]) => {
+				metrics = Object.assign(metrics, {
+					credential_type: credName,
+					credential_id: credDetails.id,
+				});
+			});
+		}
+
+		// Send metrics to posthog
+		this.emit('telemetry.onFirstWorkflowDataLoad', metrics);
+	}
+}
+
+export declare interface EventsService {
+	on(
+		event: 'nodeFetchedData',
+		listener: (workflowId: string | undefined | null, node: INode) => void,
+	): this;
+	on(
+		event: 'workflowExecutionCompleted',
+		listener: (workflowData: IWorkflowBase, runData: IRun) => void,
+	): this;
+	on(
+		event: 'telemetry.onFirstProductionWorkflowSuccess',
+		listener: (metrics: { user_id: string; workflow_id: string }) => void,
+	): this;
+	on(
+		event: 'telemetry.onFirstWorkflowDataLoad',
+		listener: (metrics: {
+			user_id: string;
+			workflow_id: string;
+			node_type: string;
+			node_id: string;
+			credential_type?: string;
+			credential_id?: string;
+		}) => void,
+	): this;
+}
diff --git a/packages/cli/src/services/executionMetadata.service.ts b/packages/cli/src/services/executionMetadata.service.ts
new file mode 100644
index 0000000000000..26db3dcb4c391
--- /dev/null
+++ b/packages/cli/src/services/executionMetadata.service.ts
@@ -0,0 +1,24 @@
+import { Service } from 'typedi';
+import { ExecutionMetadataRepository } from '@db/repositories/executionMetadata.repository';
+import type { ExecutionMetadata } from '@db/entities/ExecutionMetadata';
+
+@Service()
+export class ExecutionMetadataService {
+	constructor(private readonly executionMetadataRepository: ExecutionMetadataRepository) {}
+
+	async save(
+		executionId: string,
+		executionMetadata: Record<string, string>,
+	): Promise<ExecutionMetadata[]> {
+		const metadataRows = [];
+		for (const [key, value] of Object.entries(executionMetadata)) {
+			metadataRows.push({
+				execution: { id: executionId },
+				key,
+				value,
+			});
+		}
+
+		return await this.executionMetadataRepository.save(metadataRows);
+	}
+}
diff --git a/packages/cli/src/services/frontend.service.ts b/packages/cli/src/services/frontend.service.ts
new file mode 100644
index 0000000000000..95670b823463f
--- /dev/null
+++ b/packages/cli/src/services/frontend.service.ts
@@ -0,0 +1,364 @@
+import { Container, Service } from 'typedi';
+import uniq from 'lodash/uniq';
+import { createWriteStream } from 'fs';
+import { mkdir } from 'fs/promises';
+import path from 'path';
+
+import type {
+	ICredentialType,
+	IN8nUISettings,
+	INodeTypeBaseDescription,
+	ITelemetrySettings,
+} from 'n8n-workflow';
+import { InstanceSettings } from 'n8n-core';
+
+import config from '@/config';
+import { LICENSE_FEATURES } from '@/constants';
+import { CredentialsOverwrites } from '@/CredentialsOverwrites';
+import { CredentialTypes } from '@/CredentialTypes';
+import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
+import { License } from '@/License';
+import { getCurrentAuthenticationMethod } from '@/sso/ssoHelpers';
+import { getLdapLoginLabel } from '@/Ldap/helpers';
+import { getSamlLoginLabel } from '@/sso/saml/samlHelpers';
+import { getVariablesLimit } from '@/environments/variables/environmentHelpers';
+import {
+	getWorkflowHistoryLicensePruneTime,
+	getWorkflowHistoryPruneTime,
+} from '@/workflows/workflowHistory/workflowHistoryHelper.ee';
+import { UserManagementMailer } from '@/UserManagement/email';
+import type { CommunityPackagesService } from '@/services/communityPackages.service';
+import { Logger } from '@/Logger';
+import { UrlService } from './url.service';
+import { InternalHooks } from '@/InternalHooks';
+
+@Service()
+export class FrontendService {
+	settings: IN8nUISettings;
+
+	private communityPackagesService?: CommunityPackagesService;
+
+	constructor(
+		private readonly logger: Logger,
+		private readonly loadNodesAndCredentials: LoadNodesAndCredentials,
+		private readonly credentialTypes: CredentialTypes,
+		private readonly credentialsOverwrites: CredentialsOverwrites,
+		private readonly license: License,
+		private readonly mailer: UserManagementMailer,
+		private readonly instanceSettings: InstanceSettings,
+		private readonly urlService: UrlService,
+		private readonly internalHooks: InternalHooks,
+	) {
+		loadNodesAndCredentials.addPostProcessor(async () => await this.generateTypes());
+		void this.generateTypes();
+
+		this.initSettings();
+
+		if (config.getEnv('nodes.communityPackages.enabled')) {
+			// eslint-disable-next-line @typescript-eslint/naming-convention
+			void import('@/services/communityPackages.service').then(({ CommunityPackagesService }) => {
+				this.communityPackagesService = Container.get(CommunityPackagesService);
+			});
+		}
+	}
+
+	private initSettings() {
+		const instanceBaseUrl = this.urlService.getInstanceBaseUrl();
+		const restEndpoint = config.getEnv('endpoints.rest');
+
+		const telemetrySettings: ITelemetrySettings = {
+			enabled: config.getEnv('diagnostics.enabled'),
+		};
+
+		if (telemetrySettings.enabled) {
+			const conf = config.getEnv('diagnostics.config.frontend');
+			const [key, url] = conf.split(';');
+
+			if (!key || !url) {
+				this.logger.warn('Diagnostics frontend config is invalid');
+				telemetrySettings.enabled = false;
+			}
+
+			telemetrySettings.config = { key, url };
+		}
+
+		this.settings = {
+			previewMode: process.env.N8N_PREVIEW_MODE === 'true',
+			endpointForm: config.getEnv('endpoints.form'),
+			endpointFormTest: config.getEnv('endpoints.formTest'),
+			endpointFormWaiting: config.getEnv('endpoints.formWaiting'),
+			endpointWebhook: config.getEnv('endpoints.webhook'),
+			endpointWebhookTest: config.getEnv('endpoints.webhookTest'),
+			saveDataErrorExecution: config.getEnv('executions.saveDataOnError'),
+			saveDataSuccessExecution: config.getEnv('executions.saveDataOnSuccess'),
+			saveManualExecutions: config.getEnv('executions.saveDataManualExecutions'),
+			executionTimeout: config.getEnv('executions.timeout'),
+			maxExecutionTimeout: config.getEnv('executions.maxTimeout'),
+			workflowCallerPolicyDefaultOption: config.getEnv('workflows.callerPolicyDefaultOption'),
+			timezone: config.getEnv('generic.timezone'),
+			urlBaseWebhook: this.urlService.getWebhookBaseUrl(),
+			urlBaseEditor: instanceBaseUrl,
+			binaryDataMode: config.getEnv('binaryDataManager.mode'),
+			versionCli: '',
+			authCookie: {
+				secure: config.getEnv('secure_cookie'),
+			},
+			releaseChannel: config.getEnv('generic.releaseChannel'),
+			oauthCallbackUrls: {
+				oauth1: `${instanceBaseUrl}/${restEndpoint}/oauth1-credential/callback`,
+				oauth2: `${instanceBaseUrl}/${restEndpoint}/oauth2-credential/callback`,
+			},
+			versionNotifications: {
+				enabled: config.getEnv('versionNotifications.enabled'),
+				endpoint: config.getEnv('versionNotifications.endpoint'),
+				infoUrl: config.getEnv('versionNotifications.infoUrl'),
+			},
+			instanceId: this.instanceSettings.instanceId,
+			telemetry: telemetrySettings,
+			posthog: {
+				enabled: config.getEnv('diagnostics.enabled'),
+				apiHost: config.getEnv('diagnostics.config.posthog.apiHost'),
+				apiKey: config.getEnv('diagnostics.config.posthog.apiKey'),
+				autocapture: false,
+				disableSessionRecording: config.getEnv('deployment.type') !== 'cloud',
+				debug: config.getEnv('logs.level') === 'debug',
+			},
+			personalizationSurveyEnabled:
+				config.getEnv('personalization.enabled') && config.getEnv('diagnostics.enabled'),
+			defaultLocale: config.getEnv('defaultLocale'),
+			userManagement: {
+				quota: this.license.getUsersLimit(),
+				showSetupOnFirstLoad: !config.getEnv('userManagement.isInstanceOwnerSetUp'),
+				smtpSetup: this.mailer.isEmailSetUp,
+				authenticationMethod: getCurrentAuthenticationMethod(),
+			},
+			sso: {
+				saml: {
+					loginEnabled: false,
+					loginLabel: '',
+				},
+				ldap: {
+					loginEnabled: false,
+					loginLabel: '',
+				},
+			},
+			publicApi: {
+				enabled: !config.get('publicApi.disabled') && !this.license.isAPIDisabled(),
+				latestVersion: 1,
+				path: config.getEnv('publicApi.path'),
+				swaggerUi: {
+					enabled: !config.getEnv('publicApi.swaggerUi.disabled'),
+				},
+			},
+			workflowTagsDisabled: config.getEnv('workflowTagsDisabled'),
+			logLevel: config.getEnv('logs.level'),
+			hiringBannerEnabled: config.getEnv('hiringBanner.enabled'),
+			templates: {
+				enabled: config.getEnv('templates.enabled'),
+				host: config.getEnv('templates.host'),
+			},
+			onboardingCallPromptEnabled: config.getEnv('onboardingCallPrompt.enabled'),
+			executionMode: config.getEnv('executions.mode'),
+			pushBackend: config.getEnv('push.backend'),
+			communityNodesEnabled: config.getEnv('nodes.communityPackages.enabled'),
+			deployment: {
+				type: config.getEnv('deployment.type'),
+			},
+			isNpmAvailable: false,
+			allowedModules: {
+				builtIn: process.env.NODE_FUNCTION_ALLOW_BUILTIN?.split(',') ?? undefined,
+				external: process.env.NODE_FUNCTION_ALLOW_EXTERNAL?.split(',') ?? undefined,
+			},
+			enterprise: {
+				sharing: false,
+				ldap: false,
+				saml: false,
+				logStreaming: false,
+				advancedExecutionFilters: false,
+				variables: false,
+				sourceControl: false,
+				auditLogs: false,
+				externalSecrets: false,
+				showNonProdBanner: false,
+				debugInEditor: false,
+				binaryDataS3: false,
+				workflowHistory: false,
+				workerView: false,
+				advancedPermissions: false,
+			},
+			mfa: {
+				enabled: false,
+			},
+			hideUsagePage: config.getEnv('hideUsagePage'),
+			license: {
+				environment: config.getEnv('license.tenantId') === 1 ? 'production' : 'staging',
+			},
+			variables: {
+				limit: 0,
+			},
+			expressions: {
+				evaluator: config.getEnv('expression.evaluator'),
+			},
+			banners: {
+				dismissed: [],
+			},
+			ai: {
+				enabled: config.getEnv('ai.enabled'),
+				provider: config.getEnv('ai.provider'),
+				features: {
+					generateCurl: !!config.getEnv('ai.openAI.apiKey'),
+				},
+			},
+			workflowHistory: {
+				pruneTime: -1,
+				licensePruneTime: -1,
+			},
+		};
+	}
+
+	async generateTypes() {
+		this.overwriteCredentialsProperties();
+
+		const { staticCacheDir } = this.instanceSettings;
+		// pre-render all the node and credential types as static json files
+		await mkdir(path.join(staticCacheDir, 'types'), { recursive: true });
+		const { credentials, nodes } = this.loadNodesAndCredentials.types;
+		this.writeStaticJSON('nodes', nodes);
+		this.writeStaticJSON('credentials', credentials);
+	}
+
+	getSettings(pushRef?: string): IN8nUISettings {
+		void this.internalHooks.onFrontendSettingsAPI(pushRef);
+
+		const restEndpoint = config.getEnv('endpoints.rest');
+
+		// Update all urls, in case `WEBHOOK_URL` was updated by `--tunnel`
+		const instanceBaseUrl = this.urlService.getInstanceBaseUrl();
+		this.settings.urlBaseWebhook = this.urlService.getWebhookBaseUrl();
+		this.settings.urlBaseEditor = instanceBaseUrl;
+		this.settings.oauthCallbackUrls = {
+			oauth1: `${instanceBaseUrl}/${restEndpoint}/oauth1-credential/callback`,
+			oauth2: `${instanceBaseUrl}/${restEndpoint}/oauth2-credential/callback`,
+		};
+
+		// refresh user management status
+		Object.assign(this.settings.userManagement, {
+			quota: this.license.getUsersLimit(),
+			authenticationMethod: getCurrentAuthenticationMethod(),
+			showSetupOnFirstLoad:
+				!config.getEnv('userManagement.isInstanceOwnerSetUp') &&
+				!config.getEnv('deployment.type').startsWith('desktop_'),
+		});
+
+		let dismissedBanners: string[] = [];
+
+		try {
+			dismissedBanners = config.getEnv('ui.banners.dismissed') ?? [];
+		} catch {
+			// not yet in DB
+		}
+
+		this.settings.banners.dismissed = dismissedBanners;
+
+		const isS3Selected = config.getEnv('binaryDataManager.mode') === 's3';
+		const isS3Available = config.getEnv('binaryDataManager.availableModes').includes('s3');
+		const isS3Licensed = this.license.isBinaryDataS3Licensed();
+
+		// refresh enterprise status
+		Object.assign(this.settings.enterprise, {
+			sharing: this.license.isSharingEnabled(),
+			logStreaming: this.license.isLogStreamingEnabled(),
+			ldap: this.license.isLdapEnabled(),
+			saml: this.license.isSamlEnabled(),
+			advancedExecutionFilters: this.license.isAdvancedExecutionFiltersEnabled(),
+			variables: this.license.isVariablesEnabled(),
+			sourceControl: this.license.isSourceControlLicensed(),
+			externalSecrets: this.license.isExternalSecretsEnabled(),
+			showNonProdBanner: this.license.isFeatureEnabled(LICENSE_FEATURES.SHOW_NON_PROD_BANNER),
+			debugInEditor: this.license.isDebugInEditorLicensed(),
+			binaryDataS3: isS3Available && isS3Selected && isS3Licensed,
+			workflowHistory:
+				this.license.isWorkflowHistoryLicensed() && config.getEnv('workflowHistory.enabled'),
+			workerView: this.license.isWorkerViewLicensed(),
+			advancedPermissions: this.license.isAdvancedPermissionsLicensed(),
+		});
+
+		if (this.license.isLdapEnabled()) {
+			Object.assign(this.settings.sso.ldap, {
+				loginLabel: getLdapLoginLabel(),
+				loginEnabled: config.getEnv('sso.ldap.loginEnabled'),
+			});
+		}
+
+		if (this.license.isSamlEnabled()) {
+			Object.assign(this.settings.sso.saml, {
+				loginLabel: getSamlLoginLabel(),
+				loginEnabled: config.getEnv('sso.saml.loginEnabled'),
+			});
+		}
+
+		if (this.license.isVariablesEnabled()) {
+			this.settings.variables.limit = getVariablesLimit();
+		}
+
+		if (this.license.isWorkflowHistoryLicensed() && config.getEnv('workflowHistory.enabled')) {
+			Object.assign(this.settings.workflowHistory, {
+				pruneTime: getWorkflowHistoryPruneTime(),
+				licensePruneTime: getWorkflowHistoryLicensePruneTime(),
+			});
+		}
+
+		if (this.communityPackagesService) {
+			this.settings.missingPackages = this.communityPackagesService.hasMissingPackages;
+		}
+
+		this.settings.mfa.enabled = config.get('mfa.enabled');
+
+		this.settings.executionMode = config.getEnv('executions.mode');
+
+		this.settings.binaryDataMode = config.getEnv('binaryDataManager.mode');
+
+		return this.settings;
+	}
+
+	addToSettings(newSettings: Record<string, unknown>) {
+		this.settings = { ...this.settings, ...newSettings };
+	}
+
+	private writeStaticJSON(name: string, data: INodeTypeBaseDescription[] | ICredentialType[]) {
+		const { staticCacheDir } = this.instanceSettings;
+		const filePath = path.join(staticCacheDir, `types/${name}.json`);
+		const stream = createWriteStream(filePath, 'utf-8');
+		stream.write('[\n');
+		data.forEach((entry, index) => {
+			stream.write(JSON.stringify(entry));
+			if (index !== data.length - 1) stream.write(',');
+			stream.write('\n');
+		});
+		stream.write(']\n');
+		stream.end();
+	}
+
+	private overwriteCredentialsProperties() {
+		const { credentials } = this.loadNodesAndCredentials.types;
+		const credentialsOverwrites = this.credentialsOverwrites.getAll();
+		for (const credential of credentials) {
+			const overwrittenProperties = [];
+			this.credentialTypes
+				.getParentTypes(credential.name)
+				.reverse()
+				.map((name) => credentialsOverwrites[name])
+				.forEach((overwrite) => {
+					if (overwrite) overwrittenProperties.push(...Object.keys(overwrite));
+				});
+
+			if (credential.name in credentialsOverwrites) {
+				overwrittenProperties.push(...Object.keys(credentialsOverwrites[credential.name]));
+			}
+
+			if (overwrittenProperties.length) {
+				credential.__overwrittenProperties = uniq(overwrittenProperties);
+			}
+		}
+	}
+}
diff --git a/packages/cli/src/services/import.service.ts b/packages/cli/src/services/import.service.ts
new file mode 100644
index 0000000000000..11b726225663f
--- /dev/null
+++ b/packages/cli/src/services/import.service.ts
@@ -0,0 +1,111 @@
+import { Service } from 'typedi';
+import { v4 as uuid } from 'uuid';
+import { type INode, type INodeCredentialsDetails } from 'n8n-workflow';
+
+import { Logger } from '@/Logger';
+import * as Db from '@/Db';
+import { CredentialsRepository } from '@db/repositories/credentials.repository';
+import { TagRepository } from '@db/repositories/tag.repository';
+import { SharedWorkflow } from '@db/entities/SharedWorkflow';
+import { replaceInvalidCredentials } from '@/WorkflowHelpers';
+import { WorkflowEntity } from '@db/entities/WorkflowEntity';
+import { WorkflowTagMapping } from '@db/entities/WorkflowTagMapping';
+import type { TagEntity } from '@db/entities/TagEntity';
+import type { ICredentialsDb } from '@/Interfaces';
+
+@Service()
+export class ImportService {
+	private dbCredentials: ICredentialsDb[] = [];
+
+	private dbTags: TagEntity[] = [];
+
+	constructor(
+		private readonly logger: Logger,
+		private readonly credentialsRepository: CredentialsRepository,
+		private readonly tagRepository: TagRepository,
+	) {}
+
+	async initRecords() {
+		this.dbCredentials = await this.credentialsRepository.find();
+		this.dbTags = await this.tagRepository.find();
+	}
+
+	async importWorkflows(workflows: WorkflowEntity[], userId: string) {
+		await this.initRecords();
+
+		for (const workflow of workflows) {
+			workflow.nodes.forEach((node) => {
+				this.toNewCredentialFormat(node);
+
+				if (!node.id) node.id = uuid();
+			});
+
+			const hasInvalidCreds = workflow.nodes.some((node) => !node.credentials?.id);
+
+			if (hasInvalidCreds) await this.replaceInvalidCreds(workflow);
+		}
+
+		await Db.transaction(async (tx) => {
+			for (const workflow of workflows) {
+				if (workflow.active) {
+					workflow.active = false;
+
+					this.logger.info(`Deactivating workflow "${workflow.name}". Remember to activate later.`);
+				}
+
+				const exists = workflow.id ? await tx.existsBy(WorkflowEntity, { id: workflow.id }) : false;
+
+				const upsertResult = await tx.upsert(WorkflowEntity, workflow, ['id']);
+				const workflowId = upsertResult.identifiers.at(0)?.id as string;
+
+				// Create relationship if the workflow was inserted instead of updated.
+				if (!exists) {
+					await tx.upsert(SharedWorkflow, { workflowId, userId, role: 'workflow:owner' }, [
+						'workflowId',
+						'userId',
+					]);
+				}
+
+				if (!workflow.tags?.length) continue;
+
+				await this.tagRepository.setTags(tx, this.dbTags, workflow);
+
+				for (const tag of workflow.tags) {
+					await tx.upsert(WorkflowTagMapping, { tagId: tag.id, workflowId }, [
+						'tagId',
+						'workflowId',
+					]);
+				}
+			}
+		});
+	}
+
+	async replaceInvalidCreds(workflow: WorkflowEntity) {
+		try {
+			await replaceInvalidCredentials(workflow);
+		} catch (e) {
+			const error = e instanceof Error ? e : new Error(`${e}`);
+			this.logger.error('Failed to replace invalid credential', error);
+		}
+	}
+
+	/**
+	 * Convert a node's credentials from old format `{ <nodeType>: <credentialName> }`
+	 * to new format: `{ <nodeType>: { id: string | null, name: <credentialName> } }`
+	 */
+	private toNewCredentialFormat(node: INode) {
+		if (!node.credentials) return;
+
+		for (const [type, name] of Object.entries(node.credentials)) {
+			if (typeof name !== 'string') continue;
+
+			const nodeCredential: INodeCredentialsDetails = { id: null, name };
+
+			const match = this.dbCredentials.find((c) => c.name === name && c.type === type);
+
+			if (match) nodeCredential.id = match.id;
+
+			node.credentials[type] = nodeCredential;
+		}
+	}
+}
diff --git a/packages/cli/src/services/jwt.service.ts b/packages/cli/src/services/jwt.service.ts
new file mode 100644
index 0000000000000..7f9f4fdd84c0a
--- /dev/null
+++ b/packages/cli/src/services/jwt.service.ts
@@ -0,0 +1,35 @@
+import { Service } from 'typedi';
+import { createHash } from 'crypto';
+import jwt from 'jsonwebtoken';
+import { InstanceSettings } from 'n8n-core';
+import config from '@/config';
+
+@Service()
+export class JwtService {
+	readonly jwtSecret = config.getEnv('userManagement.jwtSecret');
+
+	constructor({ encryptionKey }: InstanceSettings) {
+		this.jwtSecret = config.getEnv('userManagement.jwtSecret');
+		if (!this.jwtSecret) {
+			// If we don't have a JWT secret set, generate one based on encryption key.
+			// For a key off every other letter from encryption key
+			// CAREFUL: do not change this or it breaks all existing tokens.
+			let baseKey = '';
+			for (let i = 0; i < encryptionKey.length; i += 2) {
+				baseKey += encryptionKey[i];
+			}
+			this.jwtSecret = createHash('sha256').update(baseKey).digest('hex');
+			config.set('userManagement.jwtSecret', this.jwtSecret);
+		}
+	}
+
+	public sign(payload: object, options: jwt.SignOptions = {}): string {
+		return jwt.sign(payload, this.jwtSecret, options);
+	}
+
+	public verify<T = JwtPayload>(token: string, options: jwt.VerifyOptions = {}) {
+		return jwt.verify(token, this.jwtSecret, options) as T;
+	}
+}
+
+export type JwtPayload = jwt.JwtPayload;
diff --git a/packages/cli/src/services/metrics.service.ts b/packages/cli/src/services/metrics.service.ts
new file mode 100644
index 0000000000000..36fb6520f57fb
--- /dev/null
+++ b/packages/cli/src/services/metrics.service.ts
@@ -0,0 +1,157 @@
+import config from '@/config';
+import { N8N_VERSION } from '@/constants';
+import type express from 'express';
+import promBundle from 'express-prom-bundle';
+import promClient, { type Counter } from 'prom-client';
+import semverParse from 'semver/functions/parse';
+import { Service } from 'typedi';
+import EventEmitter from 'events';
+
+import { CacheService } from '@/services/cache/cache.service';
+import { METRICS_EVENT_NAME, getLabelsForEvent, type EventMessageTypes } from '@/eventbus';
+import { MessageEventBus } from '@/eventbus/MessageEventBus/MessageEventBus';
+import { Logger } from '@/Logger';
+
+@Service()
+export class MetricsService extends EventEmitter {
+	constructor(
+		private readonly logger: Logger,
+		private readonly cacheService: CacheService,
+		private readonly eventBus: MessageEventBus,
+	) {
+		super();
+	}
+
+	counters: Record<string, Counter<string> | null> = {};
+
+	async configureMetrics(app: express.Application) {
+		promClient.register.clear(); // clear all metrics in case we call this a second time
+		this.setupDefaultMetrics();
+		this.setupN8nVersionMetric();
+		this.setupCacheMetrics();
+		this.setupMessageEventBusMetrics();
+		this.setupApiMetrics(app);
+		this.mountMetricsEndpoint(app);
+	}
+
+	private setupN8nVersionMetric() {
+		const n8nVersion = semverParse(N8N_VERSION || '0.0.0');
+
+		if (n8nVersion) {
+			const versionGauge = new promClient.Gauge({
+				name: config.getEnv('endpoints.metrics.prefix') + 'version_info',
+				help: 'n8n version info.',
+				labelNames: ['version', 'major', 'minor', 'patch'],
+			});
+
+			versionGauge.set(
+				{
+					version: 'v' + n8nVersion.version,
+					major: n8nVersion.major,
+					minor: n8nVersion.minor,
+					patch: n8nVersion.patch,
+				},
+				1,
+			);
+		}
+	}
+
+	private setupDefaultMetrics() {
+		if (config.getEnv('endpoints.metrics.includeDefaultMetrics')) {
+			promClient.collectDefaultMetrics();
+		}
+	}
+
+	private setupApiMetrics(app: express.Application) {
+		if (config.getEnv('endpoints.metrics.includeApiEndpoints')) {
+			const metricsMiddleware = promBundle({
+				autoregister: false,
+				includeUp: false,
+				includePath: config.getEnv('endpoints.metrics.includeApiPathLabel'),
+				includeMethod: config.getEnv('endpoints.metrics.includeApiMethodLabel'),
+				includeStatusCode: config.getEnv('endpoints.metrics.includeApiStatusCodeLabel'),
+			});
+
+			app.use(['/rest/', '/webhook/', 'webhook-test/', '/api/'], metricsMiddleware);
+		}
+	}
+
+	mountMetricsEndpoint(app: express.Application) {
+		app.get('/metrics', async (req: express.Request, res: express.Response) => {
+			const metrics = await promClient.register.metrics();
+			res.setHeader('Content-Type', promClient.register.contentType);
+			res.send(metrics).end();
+		});
+	}
+
+	private setupCacheMetrics() {
+		if (!config.getEnv('endpoints.metrics.includeCacheMetrics')) {
+			return;
+		}
+		this.counters.cacheHitsTotal = new promClient.Counter({
+			name: config.getEnv('endpoints.metrics.prefix') + 'cache_hits_total',
+			help: 'Total number of cache hits.',
+			labelNames: ['cache'],
+		});
+		this.counters.cacheHitsTotal.inc(0);
+		this.cacheService.on('metrics.cache.hit', (amount: number = 1) => {
+			this.counters.cacheHitsTotal?.inc(amount);
+		});
+
+		this.counters.cacheMissesTotal = new promClient.Counter({
+			name: config.getEnv('endpoints.metrics.prefix') + 'cache_misses_total',
+			help: 'Total number of cache misses.',
+			labelNames: ['cache'],
+		});
+		this.counters.cacheMissesTotal.inc(0);
+		this.cacheService.on('metrics.cache.miss', (amount: number = 1) => {
+			this.counters.cacheMissesTotal?.inc(amount);
+		});
+
+		this.counters.cacheUpdatesTotal = new promClient.Counter({
+			name: config.getEnv('endpoints.metrics.prefix') + 'cache_updates_total',
+			help: 'Total number of cache updates.',
+			labelNames: ['cache'],
+		});
+		this.counters.cacheUpdatesTotal.inc(0);
+		this.cacheService.on('metrics.cache.update', (amount: number = 1) => {
+			this.counters.cacheUpdatesTotal?.inc(amount);
+		});
+	}
+
+	private getCounterForEvent(event: EventMessageTypes): Counter<string> | null {
+		if (!promClient) return null;
+		if (!this.counters[event.eventName]) {
+			const prefix = config.getEnv('endpoints.metrics.prefix');
+			const metricName =
+				prefix + event.eventName.replace('n8n.', '').replace(/\./g, '_') + '_total';
+
+			if (!promClient.validateMetricName(metricName)) {
+				this.logger.debug(`Invalid metric name: ${metricName}. Ignoring it!`);
+				this.counters[event.eventName] = null;
+				return null;
+			}
+
+			const counter = new promClient.Counter({
+				name: metricName,
+				help: `Total number of ${event.eventName} events.`,
+				labelNames: Object.keys(getLabelsForEvent(event)),
+			});
+			counter.inc(0);
+			this.counters[event.eventName] = counter;
+		}
+
+		return this.counters[event.eventName];
+	}
+
+	private setupMessageEventBusMetrics() {
+		if (!config.getEnv('endpoints.metrics.includeMessageEventBusMetrics')) {
+			return;
+		}
+		this.eventBus.on(METRICS_EVENT_NAME, (event: EventMessageTypes) => {
+			const counter = this.getCounterForEvent(event);
+			if (!counter) return;
+			counter.inc(1);
+		});
+	}
+}
diff --git a/packages/cli/src/services/naming.service.ts b/packages/cli/src/services/naming.service.ts
new file mode 100644
index 0000000000000..4244f114ded55
--- /dev/null
+++ b/packages/cli/src/services/naming.service.ts
@@ -0,0 +1,43 @@
+import { Service } from 'typedi';
+import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
+import { CredentialsRepository } from '@/databases/repositories/credentials.repository';
+
+@Service()
+export class NamingService {
+	constructor(
+		private readonly workflowRepository: WorkflowRepository,
+		private readonly credentialsRepository: CredentialsRepository,
+	) {}
+
+	async getUniqueWorkflowName(requestedName: string) {
+		return await this.getUniqueName(requestedName, 'workflow');
+	}
+
+	async getUniqueCredentialName(requestedName: string) {
+		return await this.getUniqueName(requestedName, 'credential');
+	}
+
+	private async getUniqueName(requestedName: string, entity: 'workflow' | 'credential') {
+		const repository = entity === 'workflow' ? this.workflowRepository : this.credentialsRepository;
+
+		const found = await repository.findStartingWith(requestedName);
+
+		if (found.length === 0) return requestedName;
+
+		if (found.length === 1) return [requestedName, 2].join(' ');
+
+		const maxSuffix = found.reduce((max, { name }) => {
+			const [_, strSuffix] = name.split(`${requestedName} `);
+
+			const numSuffix = parseInt(strSuffix);
+
+			if (isNaN(numSuffix)) return max;
+
+			if (numSuffix > max) max = numSuffix;
+
+			return max;
+		}, 2);
+
+		return [requestedName, maxSuffix + 1].join(' ');
+	}
+}
diff --git a/packages/cli/src/services/orchestration.handler.base.service.ts b/packages/cli/src/services/orchestration.handler.base.service.ts
new file mode 100644
index 0000000000000..6a706434e43bb
--- /dev/null
+++ b/packages/cli/src/services/orchestration.handler.base.service.ts
@@ -0,0 +1,33 @@
+import Container from 'typedi';
+import { RedisService } from './redis.service';
+import type { RedisServicePubSubSubscriber } from './redis/RedisServicePubSubSubscriber';
+import type { WorkerCommandReceivedHandlerOptions } from './orchestration/worker/types';
+
+export abstract class OrchestrationHandlerService {
+	protected initialized = false;
+
+	redisSubscriber: RedisServicePubSubSubscriber;
+
+	readonly redisService: RedisService;
+
+	constructor() {
+		this.redisService = Container.get(RedisService);
+	}
+
+	async init() {
+		await this.initSubscriber();
+		this.initialized = true;
+	}
+
+	async initWithOptions(options: WorkerCommandReceivedHandlerOptions) {
+		await this.initSubscriber(options);
+		this.initialized = true;
+	}
+
+	async shutdown() {
+		await this.redisSubscriber?.destroy();
+		this.initialized = false;
+	}
+
+	protected abstract initSubscriber(options?: WorkerCommandReceivedHandlerOptions): Promise<void>;
+}
diff --git a/packages/cli/src/services/orchestration.service.ts b/packages/cli/src/services/orchestration.service.ts
new file mode 100644
index 0000000000000..3d74f187acced
--- /dev/null
+++ b/packages/cli/src/services/orchestration.service.ts
@@ -0,0 +1,158 @@
+import { Service } from 'typedi';
+import { Logger } from '@/Logger';
+import config from '@/config';
+import type { RedisServicePubSubPublisher } from './redis/RedisServicePubSubPublisher';
+import type { RedisServiceBaseCommand, RedisServiceCommand } from './redis/RedisServiceCommands';
+
+import { RedisService } from './redis.service';
+import { MultiMainSetup } from './orchestration/main/MultiMainSetup.ee';
+import type { WorkflowActivateMode } from 'n8n-workflow';
+
+@Service()
+export class OrchestrationService {
+	constructor(
+		private readonly logger: Logger,
+		private readonly redisService: RedisService,
+		readonly multiMainSetup: MultiMainSetup,
+	) {}
+
+	protected isInitialized = false;
+
+	private isMultiMainSetupLicensed = false;
+
+	setMultiMainSetupLicensed(newState: boolean) {
+		this.isMultiMainSetupLicensed = newState;
+	}
+
+	get isMultiMainSetupEnabled() {
+		return (
+			config.getEnv('executions.mode') === 'queue' &&
+			config.getEnv('multiMainSetup.enabled') &&
+			config.getEnv('generic.instanceType') === 'main' &&
+			this.isMultiMainSetupLicensed
+		);
+	}
+
+	get isSingleMainSetup() {
+		return !this.isMultiMainSetupEnabled;
+	}
+
+	redisPublisher: RedisServicePubSubPublisher;
+
+	get instanceId() {
+		return config.getEnv('redis.queueModeId');
+	}
+
+	/**
+	 * Whether this instance is the leader in a multi-main setup. Always `false` in single-main setup.
+	 */
+	get isLeader() {
+		return config.getEnv('multiMainSetup.instanceType') === 'leader';
+	}
+
+	get isFollower() {
+		return config.getEnv('multiMainSetup.instanceType') !== 'leader';
+	}
+
+	sanityCheck() {
+		return this.isInitialized && config.get('executions.mode') === 'queue';
+	}
+
+	async init() {
+		if (this.isInitialized) return;
+
+		if (config.get('executions.mode') === 'queue') await this.initPublisher();
+
+		if (this.isMultiMainSetupEnabled) {
+			await this.multiMainSetup.init();
+		} else {
+			config.set('multiMainSetup.instanceType', 'leader');
+		}
+
+		this.isInitialized = true;
+	}
+
+	async shutdown() {
+		if (!this.isInitialized) return;
+
+		if (this.isMultiMainSetupEnabled) await this.multiMainSetup.shutdown();
+
+		await this.redisPublisher.destroy();
+
+		this.isInitialized = false;
+	}
+
+	// ----------------------------------
+	//            pubsub
+	// ----------------------------------
+
+	protected async initPublisher() {
+		this.redisPublisher = await this.redisService.getPubSubPublisher();
+	}
+
+	async publish(command: RedisServiceCommand, data?: unknown) {
+		if (!this.sanityCheck()) return;
+
+		const payload = data as RedisServiceBaseCommand['payload'];
+
+		this.logger.debug(`[Instance ID ${this.instanceId}] Publishing command "${command}"`, payload);
+
+		await this.redisPublisher.publishToCommandChannel({ command, payload });
+	}
+
+	// ----------------------------------
+	//         workers status
+	// ----------------------------------
+
+	async getWorkerStatus(id?: string) {
+		if (!this.sanityCheck()) return;
+
+		const command = 'getStatus';
+
+		this.logger.debug(`Sending "${command}" to command channel`);
+
+		await this.redisPublisher.publishToCommandChannel({
+			command,
+			targets: id ? [id] : undefined,
+		});
+	}
+
+	async getWorkerIds() {
+		if (!this.sanityCheck()) return;
+
+		const command = 'getId';
+
+		this.logger.debug(`Sending "${command}" to command channel`);
+
+		await this.redisPublisher.publishToCommandChannel({ command });
+	}
+
+	// ----------------------------------
+	//           activations
+	// ----------------------------------
+
+	/**
+	 * Whether this instance may add webhooks to the `webhook_entity` table.
+	 */
+	shouldAddWebhooks(activationMode: WorkflowActivateMode) {
+		// Always try to populate the webhook entity table as well as register the webhooks
+		// to prevent issues with users upgrading from a version < 1.15, where the webhook entity
+		// was cleared on shutdown to anything past 1.28.0, where we stopped populating it on init,
+		// causing all webhooks to break
+		if (activationMode === 'init') return true;
+
+		if (activationMode === 'leadershipChange') return false;
+
+		return this.isLeader; // 'update' or 'activate'
+	}
+
+	/**
+	 * Whether this instance may add triggers and pollers to memory.
+	 *
+	 * In both single- and multi-main setup, only the leader is allowed to manage
+	 * triggers and pollers in memory, to ensure they are not duplicated.
+	 */
+	shouldAddTriggersAndPollers() {
+		return this.isLeader;
+	}
+}
diff --git a/packages/cli/src/services/orchestration/helpers.ts b/packages/cli/src/services/orchestration/helpers.ts
new file mode 100644
index 0000000000000..20fed52871b7f
--- /dev/null
+++ b/packages/cli/src/services/orchestration/helpers.ts
@@ -0,0 +1,42 @@
+import { Container } from 'typedi';
+import { jsonParse } from 'n8n-workflow';
+import { Logger } from '@/Logger';
+import type { RedisServiceCommandObject } from '../redis/RedisServiceCommands';
+import { COMMAND_REDIS_CHANNEL } from '../redis/RedisServiceHelper';
+import * as os from 'os';
+
+export interface RedisServiceCommandLastReceived {
+	[date: string]: Date;
+}
+
+export function messageToRedisServiceCommandObject(messageString: string) {
+	if (!messageString) return;
+	let message: RedisServiceCommandObject;
+	try {
+		message = jsonParse<RedisServiceCommandObject>(messageString);
+	} catch {
+		Container.get(Logger).debug(
+			`Received invalid message via channel ${COMMAND_REDIS_CHANNEL}: "${messageString}"`,
+		);
+		return;
+	}
+	return message;
+}
+
+const lastReceived: RedisServiceCommandLastReceived = {};
+
+export function debounceMessageReceiver(message: RedisServiceCommandObject, timeout: number = 100) {
+	const now = new Date();
+	const lastReceivedDate = lastReceived[message.command];
+	if (lastReceivedDate && now.getTime() - lastReceivedDate.getTime() < timeout) {
+		return false;
+	}
+	lastReceived[message.command] = now;
+	return true;
+}
+
+export function getOsCpuString(): string {
+	const cpus = os.cpus();
+	if (cpus.length === 0) return 'no CPU info';
+	return `${cpus.length}x ${cpus[0].model} - speed: ${cpus[0].speed}`;
+}
diff --git a/packages/cli/src/services/orchestration/main/MultiMainSetup.ee.ts b/packages/cli/src/services/orchestration/main/MultiMainSetup.ee.ts
new file mode 100644
index 0000000000000..5f74f1931bd73
--- /dev/null
+++ b/packages/cli/src/services/orchestration/main/MultiMainSetup.ee.ts
@@ -0,0 +1,115 @@
+import { EventEmitter } from 'node:events';
+import config from '@/config';
+import { Service } from 'typedi';
+import { TIME } from '@/constants';
+import { getRedisPrefix } from '@/services/redis/RedisServiceHelper';
+import { ErrorReporterProxy as EventReporter } from 'n8n-workflow';
+import { Logger } from '@/Logger';
+import { RedisServicePubSubPublisher } from '@/services/redis/RedisServicePubSubPublisher';
+
+@Service()
+export class MultiMainSetup extends EventEmitter {
+	constructor(
+		private readonly logger: Logger,
+		private readonly redisPublisher: RedisServicePubSubPublisher,
+	) {
+		super();
+	}
+
+	get instanceId() {
+		return config.getEnv('redis.queueModeId');
+	}
+
+	private readonly leaderKey = getRedisPrefix() + ':main_instance_leader';
+
+	private readonly leaderKeyTtl = config.getEnv('multiMainSetup.ttl');
+
+	private leaderCheckInterval: NodeJS.Timer | undefined;
+
+	async init() {
+		await this.tryBecomeLeader(); // prevent initial wait
+
+		this.leaderCheckInterval = setInterval(
+			async () => {
+				await this.checkLeader();
+			},
+			config.getEnv('multiMainSetup.interval') * TIME.SECOND,
+		);
+	}
+
+	async shutdown() {
+		clearInterval(this.leaderCheckInterval);
+
+		const isLeader = config.getEnv('multiMainSetup.instanceType') === 'leader';
+
+		if (isLeader) await this.redisPublisher.clear(this.leaderKey);
+	}
+
+	private async checkLeader() {
+		const leaderId = await this.redisPublisher.get(this.leaderKey);
+
+		if (leaderId === this.instanceId) {
+			this.logger.debug(`[Instance ID ${this.instanceId}] Leader is this instance`);
+
+			await this.redisPublisher.setExpiration(this.leaderKey, this.leaderKeyTtl);
+
+			return;
+		}
+
+		if (leaderId && leaderId !== this.instanceId) {
+			this.logger.debug(`[Instance ID ${this.instanceId}] Leader is other instance "${leaderId}"`);
+
+			if (config.getEnv('multiMainSetup.instanceType') === 'leader') {
+				config.set('multiMainSetup.instanceType', 'follower');
+
+				this.emit('leader-stepdown'); // lost leadership - stop triggers, pollers, pruning, wait-tracking
+
+				EventReporter.info('[Multi-main setup] Leader failed to renew leader key');
+			}
+
+			return;
+		}
+
+		if (!leaderId) {
+			this.logger.debug(
+				`[Instance ID ${this.instanceId}] Leadership vacant, attempting to become leader...`,
+			);
+
+			config.set('multiMainSetup.instanceType', 'follower');
+
+			/**
+			 * Lost leadership - stop triggers, pollers, pruning, wait tracking, license renewal
+			 */
+			this.emit('leader-stepdown');
+
+			await this.tryBecomeLeader();
+		}
+	}
+
+	private async tryBecomeLeader() {
+		// this can only succeed if leadership is currently vacant
+		const keySetSuccessfully = await this.redisPublisher.setIfNotExists(
+			this.leaderKey,
+			this.instanceId,
+		);
+
+		if (keySetSuccessfully) {
+			this.logger.debug(`[Instance ID ${this.instanceId}] Leader is now this instance`);
+
+			config.set('multiMainSetup.instanceType', 'leader');
+
+			await this.redisPublisher.setExpiration(this.leaderKey, this.leaderKeyTtl);
+
+			/**
+			 * Gained leadership - start triggers, pollers, pruning, wait-tracking, license renewal
+			 */
+			this.emit('leader-takeover');
+		} else {
+			config.set('multiMainSetup.instanceType', 'follower');
+		}
+	}
+
+	async fetchLeaderKey() {
+		return await this.redisPublisher.get(this.leaderKey);
+	}
+}
diff --git a/packages/cli/src/services/orchestration/main/handleCommandMessageMain.ts b/packages/cli/src/services/orchestration/main/handleCommandMessageMain.ts
new file mode 100644
index 0000000000000..8abcbe78b2c47
--- /dev/null
+++ b/packages/cli/src/services/orchestration/main/handleCommandMessageMain.ts
@@ -0,0 +1,237 @@
+import { Container } from 'typedi';
+import { debounceMessageReceiver, messageToRedisServiceCommandObject } from '../helpers';
+import config from '@/config';
+import { MessageEventBus } from '@/eventbus/MessageEventBus/MessageEventBus';
+import { ExternalSecretsManager } from '@/ExternalSecrets/ExternalSecretsManager.ee';
+import { License } from '@/License';
+import { Logger } from '@/Logger';
+import { ActiveWorkflowManager } from '@/ActiveWorkflowManager';
+import { Push } from '@/push';
+import { TestWebhooks } from '@/TestWebhooks';
+import { OrchestrationService } from '@/services/orchestration.service';
+import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
+
+// eslint-disable-next-line complexity
+export async function handleCommandMessageMain(messageString: string) {
+	const queueModeId = config.getEnv('redis.queueModeId');
+	const isMainInstance = config.getEnv('generic.instanceType') === 'main';
+	const message = messageToRedisServiceCommandObject(messageString);
+	const logger = Container.get(Logger);
+
+	if (message) {
+		logger.debug(
+			`RedisCommandHandler(main): Received command message ${message.command} from ${message.senderId}`,
+		);
+
+		const selfSendingAllowed = [
+			'add-webhooks-triggers-and-pollers',
+			'remove-triggers-and-pollers',
+		].includes(message.command);
+
+		if (
+			!selfSendingAllowed &&
+			(message.senderId === queueModeId ||
+				(message.targets && !message.targets.includes(queueModeId)))
+		) {
+			// Skipping command message because it's not for this instance
+			logger.debug(
+				`Skipping command message ${message.command} because it's not for this instance.`,
+			);
+			return message;
+		}
+
+		const push = Container.get(Push);
+
+		switch (message.command) {
+			case 'reloadLicense':
+				if (!debounceMessageReceiver(message, 500)) {
+					message.payload = {
+						result: 'debounced',
+					};
+					return message;
+				}
+
+				if (isMainInstance && !config.getEnv('multiMainSetup.enabled')) {
+					// at this point in time, only a single main instance is supported, thus this command _should_ never be caught currently
+					logger.error(
+						'Received command to reload license via Redis, but this should not have happened and is not supported on the main instance yet.',
+					);
+					return message;
+				}
+				await Container.get(License).reload();
+				break;
+			case 'restartEventBus':
+				if (!debounceMessageReceiver(message, 200)) {
+					message.payload = {
+						result: 'debounced',
+					};
+					return message;
+				}
+				await Container.get(MessageEventBus).restart();
+			case 'reloadExternalSecretsProviders':
+				if (!debounceMessageReceiver(message, 200)) {
+					message.payload = {
+						result: 'debounced',
+					};
+					return message;
+				}
+				await Container.get(ExternalSecretsManager).reloadAllProviders();
+				break;
+
+			case 'add-webhooks-triggers-and-pollers': {
+				if (!debounceMessageReceiver(message, 100)) {
+					message.payload = { result: 'debounced' };
+					return message;
+				}
+
+				const orchestrationService = Container.get(OrchestrationService);
+
+				if (orchestrationService.isFollower) break;
+
+				if (typeof message.payload?.workflowId !== 'string') break;
+
+				const { workflowId } = message.payload;
+
+				try {
+					await Container.get(ActiveWorkflowManager).add(workflowId, 'activate', undefined, {
+						shouldPublish: false, // prevent leader re-publishing message
+					});
+
+					push.broadcast('workflowActivated', { workflowId });
+
+					// instruct followers to show activation in UI
+					await orchestrationService.publish('display-workflow-activation', { workflowId });
+				} catch (error) {
+					if (error instanceof Error) {
+						await Container.get(WorkflowRepository).update(workflowId, { active: false });
+
+						Container.get(Push).broadcast('workflowFailedToActivate', {
+							workflowId,
+							errorMessage: error.message,
+						});
+
+						await Container.get(OrchestrationService).publish('workflow-failed-to-activate', {
+							workflowId,
+							errorMessage: error.message,
+						});
+					}
+				}
+
+				break;
+			}
+
+			case 'remove-triggers-and-pollers': {
+				if (!debounceMessageReceiver(message, 100)) {
+					message.payload = { result: 'debounced' };
+					return message;
+				}
+
+				const orchestrationService = Container.get(OrchestrationService);
+
+				if (orchestrationService.isFollower) break;
+
+				if (typeof message.payload?.workflowId !== 'string') break;
+
+				const { workflowId } = message.payload;
+
+				const activeWorkflowManager = Container.get(ActiveWorkflowManager);
+
+				await activeWorkflowManager.removeActivationError(workflowId);
+				await activeWorkflowManager.removeWorkflowTriggersAndPollers(workflowId);
+
+				push.broadcast('workflowDeactivated', { workflowId });
+
+				// instruct followers to show workflow deactivation in UI
+				await orchestrationService.publish('display-workflow-deactivation', { workflowId });
+
+				break;
+			}
+
+			case 'display-workflow-activation': {
+				if (!debounceMessageReceiver(message, 100)) {
+					message.payload = { result: 'debounced' };
+					return message;
+				}
+
+				const { workflowId } = message.payload ?? {};
+
+				if (typeof workflowId !== 'string') break;
+
+				push.broadcast('workflowActivated', { workflowId });
+
+				break;
+			}
+
+			case 'display-workflow-deactivation': {
+				if (!debounceMessageReceiver(message, 100)) {
+					message.payload = { result: 'debounced' };
+					return message;
+				}
+
+				const { workflowId } = message.payload ?? {};
+
+				if (typeof workflowId !== 'string') break;
+
+				push.broadcast('workflowDeactivated', { workflowId });
+
+				break;
+			}
+
+			case 'workflow-failed-to-activate': {
+				if (!debounceMessageReceiver(message, 100)) {
+					message.payload = { result: 'debounced' };
+					return message;
+				}
+
+				const { workflowId, errorMessage } = message.payload ?? {};
+
+				if (typeof workflowId !== 'string' || typeof errorMessage !== 'string') break;
+
+				Container.get(Push).broadcast('workflowFailedToActivate', { workflowId, errorMessage });
+
+				break;
+			}
+
+			case 'relay-execution-lifecycle-event': {
+				/**
+				 * Do not debounce this - all events share the same message name.
+				 */
+
+				const { type, args, pushRef } = message.payload;
+
+				if (!push.getBackend().hasPushRef(pushRef)) break;
+
+				push.send(type, args, pushRef);
+
+				break;
+			}
+
+			case 'clear-test-webhooks': {
+				if (!debounceMessageReceiver(message, 100)) {
+					// @ts-expect-error Legacy typing
+					message.payload = { result: 'debounced' };
+					return message;
+				}
+
+				const { webhookKey, workflowEntity, pushRef } = message.payload;
+
+				if (!push.getBackend().hasPushRef(pushRef)) break;
+
+				const testWebhooks = Container.get(TestWebhooks);
+
+				testWebhooks.clearTimeout(webhookKey);
+
+				const workflow = testWebhooks.toWorkflow(workflowEntity);
+
+				await testWebhooks.deactivateWebhooks(workflow);
+
+				break;
+			}
+
+			default:
+				break;
+		}
+		return message;
+	}
+	return;
+}
diff --git a/packages/cli/src/services/orchestration/main/handleWorkerResponseMessageMain.ts b/packages/cli/src/services/orchestration/main/handleWorkerResponseMessageMain.ts
new file mode 100644
index 0000000000000..47a1a080192f6
--- /dev/null
+++ b/packages/cli/src/services/orchestration/main/handleWorkerResponseMessageMain.ts
@@ -0,0 +1,27 @@
+import { jsonParse } from 'n8n-workflow';
+import Container from 'typedi';
+import { Logger } from '@/Logger';
+import { Push } from '../../../push';
+import type { RedisServiceWorkerResponseObject } from '../../redis/RedisServiceCommands';
+
+export async function handleWorkerResponseMessageMain(messageString: string) {
+	const workerResponse = jsonParse<RedisServiceWorkerResponseObject>(messageString);
+	if (workerResponse) {
+		switch (workerResponse.command) {
+			case 'getStatus':
+				const push = Container.get(Push);
+				push.broadcast('sendWorkerStatusMessage', {
+					workerId: workerResponse.workerId,
+					status: workerResponse.payload,
+				});
+				break;
+			case 'getId':
+				break;
+			default:
+				Container.get(Logger).debug(
+					`Received worker response ${workerResponse.command} from ${workerResponse.workerId}`,
+				);
+		}
+	}
+	return workerResponse;
+}
diff --git a/packages/cli/src/services/orchestration/main/orchestration.handler.main.service.ts b/packages/cli/src/services/orchestration/main/orchestration.handler.main.service.ts
new file mode 100644
index 0000000000000..4a57d140d72b6
--- /dev/null
+++ b/packages/cli/src/services/orchestration/main/orchestration.handler.main.service.ts
@@ -0,0 +1,34 @@
+import Container, { Service } from 'typedi';
+import {
+	COMMAND_REDIS_CHANNEL,
+	EVENT_BUS_REDIS_CHANNEL,
+	WORKER_RESPONSE_REDIS_CHANNEL,
+} from '../../redis/RedisServiceHelper';
+import { handleWorkerResponseMessageMain } from './handleWorkerResponseMessageMain';
+import { handleCommandMessageMain } from './handleCommandMessageMain';
+import { MessageEventBus } from '@/eventbus/MessageEventBus/MessageEventBus';
+import { OrchestrationHandlerService } from '../../orchestration.handler.base.service';
+
+@Service()
+export class OrchestrationHandlerMainService extends OrchestrationHandlerService {
+	async initSubscriber() {
+		this.redisSubscriber = await this.redisService.getPubSubSubscriber();
+
+		await this.redisSubscriber.subscribeToCommandChannel();
+		await this.redisSubscriber.subscribeToWorkerResponseChannel();
+		await this.redisSubscriber.subscribeToEventLog();
+
+		this.redisSubscriber.addMessageHandler(
+			'OrchestrationMessageReceiver',
+			async (channel: string, messageString: string) => {
+				if (channel === WORKER_RESPONSE_REDIS_CHANNEL) {
+					await handleWorkerResponseMessageMain(messageString);
+				} else if (channel === COMMAND_REDIS_CHANNEL) {
+					await handleCommandMessageMain(messageString);
+				} else if (channel === EVENT_BUS_REDIS_CHANNEL) {
+					await Container.get(MessageEventBus).handleRedisEventBusMessage(messageString);
+				}
+			},
+		);
+	}
+}
diff --git a/packages/cli/src/services/orchestration/webhook/handleCommandMessageWebhook.ts b/packages/cli/src/services/orchestration/webhook/handleCommandMessageWebhook.ts
new file mode 100644
index 0000000000000..9dc326978d803
--- /dev/null
+++ b/packages/cli/src/services/orchestration/webhook/handleCommandMessageWebhook.ts
@@ -0,0 +1,75 @@
+import { ExternalSecretsManager } from '@/ExternalSecrets/ExternalSecretsManager.ee';
+import { License } from '@/License';
+import { MessageEventBus } from '@/eventbus/MessageEventBus/MessageEventBus';
+import Container from 'typedi';
+import { Logger } from 'winston';
+import { messageToRedisServiceCommandObject, debounceMessageReceiver } from '../helpers';
+import config from '@/config';
+
+export async function handleCommandMessageWebhook(messageString: string) {
+	const queueModeId = config.getEnv('redis.queueModeId');
+	const isMainInstance = config.getEnv('generic.instanceType') === 'main';
+	const message = messageToRedisServiceCommandObject(messageString);
+	const logger = Container.get(Logger);
+
+	if (message) {
+		logger.debug(
+			`RedisCommandHandler(main): Received command message ${message.command} from ${message.senderId}`,
+		);
+
+		if (
+			message.senderId === queueModeId ||
+			(message.targets && !message.targets.includes(queueModeId))
+		) {
+			// Skipping command message because it's not for this instance
+			logger.debug(
+				`Skipping command message ${message.command} because it's not for this instance.`,
+			);
+			return message;
+		}
+
+		switch (message.command) {
+			case 'reloadLicense':
+				if (!debounceMessageReceiver(message, 500)) {
+					message.payload = {
+						result: 'debounced',
+					};
+					return message;
+				}
+
+				if (isMainInstance && !config.getEnv('multiMainSetup.enabled')) {
+					// at this point in time, only a single main instance is supported, thus this command _should_ never be caught currently
+					logger.error(
+						'Received command to reload license via Redis, but this should not have happened and is not supported on the main instance yet.',
+					);
+					return message;
+				}
+				await Container.get(License).reload();
+				break;
+			case 'restartEventBus':
+				if (!debounceMessageReceiver(message, 200)) {
+					message.payload = {
+						result: 'debounced',
+					};
+					return message;
+				}
+				await Container.get(MessageEventBus).restart();
+			case 'reloadExternalSecretsProviders':
+				if (!debounceMessageReceiver(message, 200)) {
+					message.payload = {
+						result: 'debounced',
+					};
+					return message;
+				}
+				await Container.get(ExternalSecretsManager).reloadAllProviders();
+				break;
+
+			default:
+				break;
+		}
+
+		return message;
+	}
+
+	return;
+}
diff --git a/packages/cli/src/services/orchestration/webhook/orchestration.handler.webhook.service.ts b/packages/cli/src/services/orchestration/webhook/orchestration.handler.webhook.service.ts
new file mode 100644
index 0000000000000..548086c040c63
--- /dev/null
+++ b/packages/cli/src/services/orchestration/webhook/orchestration.handler.webhook.service.ts
@@ -0,0 +1,22 @@
+import { Service } from 'typedi';
+import { COMMAND_REDIS_CHANNEL } from '../../redis/RedisServiceHelper';
+import { OrchestrationHandlerService } from '../../orchestration.handler.base.service';
+import { handleCommandMessageWebhook } from './handleCommandMessageWebhook';
+
+@Service()
+export class OrchestrationHandlerWebhookService extends OrchestrationHandlerService {
+	async initSubscriber() {
+		this.redisSubscriber = await this.redisService.getPubSubSubscriber();
+
+		await this.redisSubscriber.subscribeToCommandChannel();
+
+		this.redisSubscriber.addMessageHandler(
+			'OrchestrationMessageReceiver',
+			async (channel: string, messageString: string) => {
+				if (channel === COMMAND_REDIS_CHANNEL) {
+					await handleCommandMessageWebhook(messageString);
+				}
+			},
+		);
+	}
+}
diff --git a/packages/cli/src/services/orchestration/webhook/orchestration.webhook.service.ts b/packages/cli/src/services/orchestration/webhook/orchestration.webhook.service.ts
new file mode 100644
index 0000000000000..9e97078348eeb
--- /dev/null
+++ b/packages/cli/src/services/orchestration/webhook/orchestration.webhook.service.ts
@@ -0,0 +1,14 @@
+import { Service } from 'typedi';
+import { OrchestrationService } from '../../orchestration.service';
+import config from '@/config';
+
+@Service()
+export class OrchestrationWebhookService extends OrchestrationService {
+	sanityCheck(): boolean {
+		return (
+			this.isInitialized &&
+			config.get('executions.mode') === 'queue' &&
+			config.get('generic.instanceType') === 'webhook'
+		);
+	}
+}
diff --git a/packages/cli/src/services/orchestration/worker/handleCommandMessageWorker.ts b/packages/cli/src/services/orchestration/worker/handleCommandMessageWorker.ts
new file mode 100644
index 0000000000000..d825428f9e02c
--- /dev/null
+++ b/packages/cli/src/services/orchestration/worker/handleCommandMessageWorker.ts
@@ -0,0 +1,141 @@
+import { jsonParse } from 'n8n-workflow';
+import Container from 'typedi';
+import type { RedisServiceCommandObject } from '@/services/redis/RedisServiceCommands';
+import { COMMAND_REDIS_CHANNEL } from '@/services/redis/RedisServiceHelper';
+import * as os from 'os';
+import { License } from '@/License';
+import { MessageEventBus } from '@/eventbus/MessageEventBus/MessageEventBus';
+import { ExternalSecretsManager } from '@/ExternalSecrets/ExternalSecretsManager.ee';
+import { debounceMessageReceiver, getOsCpuString } from '../helpers';
+import type { WorkerCommandReceivedHandlerOptions } from './types';
+import { Logger } from '@/Logger';
+import { N8N_VERSION } from '@/constants';
+
+export function getWorkerCommandReceivedHandler(options: WorkerCommandReceivedHandlerOptions) {
+	// eslint-disable-next-line complexity
+	return async (channel: string, messageString: string) => {
+		if (channel === COMMAND_REDIS_CHANNEL) {
+			if (!messageString) return;
+			const logger = Container.get(Logger);
+			let message: RedisServiceCommandObject;
+			try {
+				message = jsonParse<RedisServiceCommandObject>(messageString);
+			} catch {
+				logger.debug(
+					`Received invalid message via channel ${COMMAND_REDIS_CHANNEL}: "${messageString}"`,
+				);
+				return;
+			}
+			if (message) {
+				logger.debug(
+					`RedisCommandHandler(worker): Received command message ${message.command} from ${message.senderId}`,
+				);
+				if (message.targets && !message.targets.includes(options.queueModeId)) {
+					return; // early return if the message is not for this worker
+				}
+				switch (message.command) {
+					case 'getStatus':
+						if (!debounceMessageReceiver(message, 500)) return;
+						await options.redisPublisher.publishToWorkerChannel({
+							workerId: options.queueModeId,
+							command: 'getStatus',
+							payload: {
+								workerId: options.queueModeId,
+								runningJobsSummary: options.getRunningJobsSummary(),
+								freeMem: os.freemem(),
+								totalMem: os.totalmem(),
+								uptime: process.uptime(),
+								loadAvg: os.loadavg(),
+								cpus: getOsCpuString(),
+								arch: os.arch(),
+								platform: os.platform(),
+								hostname: os.hostname(),
+								interfaces: Object.values(os.networkInterfaces()).flatMap((interfaces) =>
+									(interfaces ?? [])?.map((net) => ({
+										family: net.family,
+										address: net.address,
+										internal: net.internal,
+									})),
+								),
+								version: N8N_VERSION,
+							},
+						});
+						break;
+					case 'getId':
+						if (!debounceMessageReceiver(message, 500)) return;
+						await options.redisPublisher.publishToWorkerChannel({
+							workerId: options.queueModeId,
+							command: 'getId',
+						});
+						break;
+					case 'restartEventBus':
+						if (!debounceMessageReceiver(message, 500)) return;
+						try {
+							await Container.get(MessageEventBus).restart();
+							await options.redisPublisher.publishToWorkerChannel({
+								workerId: options.queueModeId,
+								command: 'restartEventBus',
+								payload: {
+									result: 'success',
+								},
+							});
+						} catch (error) {
+							await options.redisPublisher.publishToWorkerChannel({
+								workerId: options.queueModeId,
+								command: 'restartEventBus',
+								payload: {
+									result: 'error',
+									error: (error as Error).message,
+								},
+							});
+						}
+						break;
+					case 'reloadExternalSecretsProviders':
+						if (!debounceMessageReceiver(message, 500)) return;
+						try {
+							await Container.get(ExternalSecretsManager).reloadAllProviders();
+							await options.redisPublisher.publishToWorkerChannel({
+								workerId: options.queueModeId,
+								command: 'reloadExternalSecretsProviders',
+								payload: {
+									result: 'success',
+								},
+							});
+						} catch (error) {
+							await options.redisPublisher.publishToWorkerChannel({
+								workerId: options.queueModeId,
+								command: 'reloadExternalSecretsProviders',
+								payload: {
+									result: 'error',
+									error: (error as Error).message,
+								},
+							});
+						}
+						break;
+					case 'reloadLicense':
+						if (!debounceMessageReceiver(message, 500)) return;
+						await Container.get(License).reload();
+						break;
+					case 'stopWorker':
+						if (!debounceMessageReceiver(message, 500)) return;
+						// TODO: implement proper shutdown
+						// await this.stopProcess();
+						break;
+					default:
+						if (
+							message.command === 'relay-execution-lifecycle-event' ||
+							message.command === 'clear-test-webhooks'
+						) {
+							break; // meant only for main
+						}
+
+						logger.debug(
+							// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+							`Received unknown command via channel ${COMMAND_REDIS_CHANNEL}: "${message.command}"`,
+						);
+						break;
+				}
+			}
+		}
+	};
+}
diff --git a/packages/cli/src/services/orchestration/worker/orchestration.handler.worker.service.ts b/packages/cli/src/services/orchestration/worker/orchestration.handler.worker.service.ts
new file mode 100644
index 0000000000000..cf866e06ecc14
--- /dev/null
+++ b/packages/cli/src/services/orchestration/worker/orchestration.handler.worker.service.ts
@@ -0,0 +1,17 @@
+import { Service } from 'typedi';
+import { OrchestrationHandlerService } from '../../orchestration.handler.base.service';
+import { getWorkerCommandReceivedHandler } from './handleCommandMessageWorker';
+import type { WorkerCommandReceivedHandlerOptions } from './types';
+
+@Service()
+export class OrchestrationHandlerWorkerService extends OrchestrationHandlerService {
+	async initSubscriber(options: WorkerCommandReceivedHandlerOptions) {
+		this.redisSubscriber = await this.redisService.getPubSubSubscriber();
+
+		await this.redisSubscriber.subscribeToCommandChannel();
+		this.redisSubscriber.addMessageHandler(
+			'WorkerCommandReceivedHandler',
+			getWorkerCommandReceivedHandler(options),
+		);
+	}
+}
diff --git a/packages/cli/src/services/orchestration/worker/orchestration.worker.service.ts b/packages/cli/src/services/orchestration/worker/orchestration.worker.service.ts
new file mode 100644
index 0000000000000..9a00d312b21f2
--- /dev/null
+++ b/packages/cli/src/services/orchestration/worker/orchestration.worker.service.ts
@@ -0,0 +1,20 @@
+import { Service } from 'typedi';
+import type { AbstractEventMessage } from '@/eventbus/EventMessageClasses/AbstractEventMessage';
+import { OrchestrationService } from '../../orchestration.service';
+import config from '@/config';
+
+@Service()
+export class OrchestrationWorkerService extends OrchestrationService {
+	sanityCheck(): boolean {
+		return (
+			this.isInitialized &&
+			config.get('executions.mode') === 'queue' &&
+			config.get('generic.instanceType') === 'worker'
+		);
+	}
+
+	async publishToEventLog(message: AbstractEventMessage) {
+		if (!this.sanityCheck()) return;
+		await this.redisPublisher.publishToEventLog(message);
+	}
+}
diff --git a/packages/cli/src/services/orchestration/worker/types.ts b/packages/cli/src/services/orchestration/worker/types.ts
new file mode 100644
index 0000000000000..351c56394a31c
--- /dev/null
+++ b/packages/cli/src/services/orchestration/worker/types.ts
@@ -0,0 +1,20 @@
+import type { ExecutionStatus, WorkflowExecuteMode } from 'n8n-workflow';
+import type { RedisServicePubSubPublisher } from '../../redis/RedisServicePubSubPublisher';
+
+export interface WorkerCommandReceivedHandlerOptions {
+	queueModeId: string;
+	redisPublisher: RedisServicePubSubPublisher;
+	getRunningJobIds: () => string[];
+	getRunningJobsSummary: () => WorkerJobStatusSummary[];
+}
+
+export interface WorkerJobStatusSummary {
+	jobId: string;
+	executionId: string;
+	retryOf?: string;
+	startedAt: Date;
+	mode: WorkflowExecuteMode;
+	workflowName: string;
+	workflowId: string;
+	status: ExecutionStatus;
+}
diff --git a/packages/cli/src/services/ownership.service.ts b/packages/cli/src/services/ownership.service.ts
new file mode 100644
index 0000000000000..10c8da6334802
--- /dev/null
+++ b/packages/cli/src/services/ownership.service.ts
@@ -0,0 +1,72 @@
+import { Service } from 'typedi';
+import { CacheService } from '@/services/cache/cache.service';
+import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
+import type { User } from '@db/entities/User';
+import { UserRepository } from '@db/repositories/user.repository';
+import type { ListQuery } from '@/requests';
+
+@Service()
+export class OwnershipService {
+	constructor(
+		private cacheService: CacheService,
+		private userRepository: UserRepository,
+		private sharedWorkflowRepository: SharedWorkflowRepository,
+	) {}
+
+	/**
+	 * Retrieve the user who owns the workflow. Note that workflow ownership is **immutable**.
+	 */
+	async getWorkflowOwnerCached(workflowId: string) {
+		const cachedValue = await this.cacheService.getHashValue<User>(
+			'workflow-ownership',
+			workflowId,
+		);
+
+		if (cachedValue) return this.userRepository.create(cachedValue);
+
+		const sharedWorkflow = await this.sharedWorkflowRepository.findOneOrFail({
+			where: { workflowId, role: 'workflow:owner' },
+			relations: ['user'],
+		});
+
+		void this.cacheService.setHash('workflow-ownership', { [workflowId]: sharedWorkflow.user });
+
+		return sharedWorkflow.user;
+	}
+
+	addOwnedByAndSharedWith(
+		rawWorkflow: ListQuery.Workflow.WithSharing,
+	): ListQuery.Workflow.WithOwnedByAndSharedWith;
+	addOwnedByAndSharedWith(
+		rawCredential: ListQuery.Credentials.WithSharing,
+	): ListQuery.Credentials.WithOwnedByAndSharedWith;
+	addOwnedByAndSharedWith(
+		rawEntity: ListQuery.Workflow.WithSharing | ListQuery.Credentials.WithSharing,
+	): ListQuery.Workflow.WithOwnedByAndSharedWith | ListQuery.Credentials.WithOwnedByAndSharedWith {
+		const { shared, ...rest } = rawEntity;
+
+		const entity = rest as
+			| ListQuery.Workflow.WithOwnedByAndSharedWith
+			| ListQuery.Credentials.WithOwnedByAndSharedWith;
+
+		Object.assign(entity, { ownedBy: null, sharedWith: [] });
+
+		shared?.forEach(({ user, role }) => {
+			const { id, email, firstName, lastName } = user;
+
+			if (role === 'credential:owner' || role === 'workflow:owner') {
+				entity.ownedBy = { id, email, firstName, lastName };
+			} else {
+				entity.sharedWith.push({ id, email, firstName, lastName });
+			}
+		});
+
+		return entity;
+	}
+
+	async getInstanceOwner() {
+		return await this.userRepository.findOneOrFail({
+			where: { role: 'global:owner' },
+		});
+	}
+}
diff --git a/packages/cli/src/services/password.utility.ts b/packages/cli/src/services/password.utility.ts
new file mode 100644
index 0000000000000..8c8c3aaf1964c
--- /dev/null
+++ b/packages/cli/src/services/password.utility.ts
@@ -0,0 +1,44 @@
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
+import { Service as Utility } from 'typedi';
+import { compare, hash } from 'bcryptjs';
+import {
+	MAX_PASSWORD_CHAR_LENGTH as maxLength,
+	MIN_PASSWORD_CHAR_LENGTH as minLength,
+} from '@/constants';
+
+const SALT_ROUNDS = 10;
+
+@Utility()
+export class PasswordUtility {
+	async hash(plaintext: string) {
+		return await hash(plaintext, SALT_ROUNDS);
+	}
+
+	async compare(plaintext: string, hashed: string) {
+		return await compare(plaintext, hashed);
+	}
+
+	validate(plaintext?: string) {
+		if (!plaintext) throw new BadRequestError('Password is mandatory');
+
+		const errorMessages: string[] = [];
+
+		if (plaintext.length < minLength || plaintext.length > maxLength) {
+			errorMessages.push(`Password must be ${minLength} to ${maxLength} characters long.`);
+		}
+
+		if (!/\d/.test(plaintext)) {
+			errorMessages.push('Password must contain at least 1 number.');
+		}
+
+		if (!/[A-Z]/.test(plaintext)) {
+			errorMessages.push('Password must contain at least 1 uppercase letter.');
+		}
+
+		if (errorMessages.length > 0) {
+			throw new BadRequestError(errorMessages.join(' '));
+		}
+
+		return plaintext;
+	}
+}
diff --git a/packages/cli/src/services/pruning.service.ts b/packages/cli/src/services/pruning.service.ts
new file mode 100644
index 0000000000000..3f78c220cbf66
--- /dev/null
+++ b/packages/cli/src/services/pruning.service.ts
@@ -0,0 +1,169 @@
+import { Service } from 'typedi';
+import { BinaryDataService } from 'n8n-core';
+import { inTest, TIME } from '@/constants';
+import config from '@/config';
+import { ExecutionRepository } from '@db/repositories/execution.repository';
+import { Logger } from '@/Logger';
+import { jsonStringify } from 'n8n-workflow';
+import { OnShutdown } from '@/decorators/OnShutdown';
+
+@Service()
+export class PruningService {
+	private hardDeletionBatchSize = 100;
+
+	private rates: Record<string, number> = {
+		softDeletion: config.getEnv('executions.pruneDataIntervals.softDelete') * TIME.MINUTE,
+		hardDeletion: config.getEnv('executions.pruneDataIntervals.hardDelete') * TIME.MINUTE,
+	};
+
+	public softDeletionInterval: NodeJS.Timer | undefined;
+
+	public hardDeletionTimeout: NodeJS.Timeout | undefined;
+
+	private isShuttingDown = false;
+
+	constructor(
+		private readonly logger: Logger,
+		private readonly executionRepository: ExecutionRepository,
+		private readonly binaryDataService: BinaryDataService,
+	) {}
+
+	private isPruningEnabled() {
+		if (
+			!config.getEnv('executions.pruneData') ||
+			inTest ||
+			config.get('generic.instanceType') !== 'main'
+		) {
+			return false;
+		}
+
+		if (
+			config.getEnv('multiMainSetup.enabled') &&
+			config.getEnv('generic.instanceType') === 'main' &&
+			config.getEnv('multiMainSetup.instanceType') === 'follower'
+		) {
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * @important Call this method only after DB migrations have completed.
+	 */
+	startPruning() {
+		if (!this.isPruningEnabled()) return;
+
+		if (this.isShuttingDown) {
+			this.logger.warn('[Pruning] Cannot start pruning while shutting down');
+			return;
+		}
+
+		this.logger.debug('[Pruning] Starting soft-deletion and hard-deletion timers');
+
+		this.setSoftDeletionInterval();
+		this.scheduleHardDeletion();
+	}
+
+	stopPruning() {
+		if (!this.isPruningEnabled()) return;
+
+		this.logger.debug('[Pruning] Removing soft-deletion and hard-deletion timers');
+
+		clearInterval(this.softDeletionInterval);
+		clearTimeout(this.hardDeletionTimeout);
+	}
+
+	private setSoftDeletionInterval(rateMs = this.rates.softDeletion) {
+		const when = [rateMs / TIME.MINUTE, 'min'].join(' ');
+
+		this.softDeletionInterval = setInterval(
+			async () => await this.softDeleteOnPruningCycle(),
+			this.rates.softDeletion,
+		);
+
+		this.logger.debug(`[Pruning] Soft-deletion scheduled every ${when}`);
+	}
+
+	private scheduleHardDeletion(rateMs = this.rates.hardDeletion) {
+		const when = [rateMs / TIME.MINUTE, 'min'].join(' ');
+
+		this.hardDeletionTimeout = setTimeout(() => {
+			this.hardDeleteOnPruningCycle()
+				.then((rate) => this.scheduleHardDeletion(rate))
+				.catch((error) => {
+					this.scheduleHardDeletion(1 * TIME.SECOND);
+
+					const errorMessage =
+						error instanceof Error
+							? error.message
+							: jsonStringify(error, { replaceCircularRefs: true });
+
+					this.logger.error('[Pruning] Failed to hard-delete executions', { errorMessage });
+				});
+		}, rateMs);
+
+		this.logger.debug(`[Pruning] Hard-deletion scheduled for next ${when}`);
+	}
+
+	/**
+	 * Mark executions as deleted based on age and count, in a pruning cycle.
+	 */
+	async softDeleteOnPruningCycle() {
+		this.logger.debug('[Pruning] Starting soft-deletion of executions');
+
+		const result = await this.executionRepository.softDeletePrunableExecutions();
+
+		if (result.affected === 0) {
+			this.logger.debug('[Pruning] Found no executions to soft-delete');
+			return;
+		}
+
+		this.logger.debug('[Pruning] Soft-deleted executions', { count: result.affected });
+	}
+
+	@OnShutdown()
+	shutdown(): void {
+		this.isShuttingDown = true;
+		this.stopPruning();
+	}
+
+	/**
+	 * Permanently remove all soft-deleted executions and their binary data, in a pruning cycle.
+	 * @return Delay in ms after which the next cycle should be started
+	 */
+	private async hardDeleteOnPruningCycle() {
+		const ids = await this.executionRepository.hardDeleteSoftDeletedExecutions();
+
+		const executionIds = ids.map((o) => o.executionId);
+
+		if (executionIds.length === 0) {
+			this.logger.debug('[Pruning] Found no executions to hard-delete');
+
+			return this.rates.hardDeletion;
+		}
+
+		try {
+			this.logger.debug('[Pruning] Starting hard-deletion of executions', { executionIds });
+
+			await this.binaryDataService.deleteMany(ids);
+
+			await this.executionRepository.deleteByIds(executionIds);
+
+			this.logger.debug('[Pruning] Hard-deleted executions', { executionIds });
+		} catch (error) {
+			this.logger.error('[Pruning] Failed to hard-delete executions', {
+				executionIds,
+				error: error instanceof Error ? error.message : `${error}`,
+			});
+		}
+
+		/**
+		 * For next batch, speed up hard-deletion cycle in high-volume case
+		 * to prevent high concurrency from causing duplicate deletions.
+		 */
+		const isHighVolume = executionIds.length >= this.hardDeletionBatchSize;
+
+		return isHighVolume ? 1 * TIME.SECOND : this.rates.hardDeletion;
+	}
+}
diff --git a/packages/cli/src/services/redis.service.ts b/packages/cli/src/services/redis.service.ts
new file mode 100644
index 0000000000000..d6cb11b294758
--- /dev/null
+++ b/packages/cli/src/services/redis.service.ts
@@ -0,0 +1,24 @@
+import { Service } from 'typedi';
+import { RedisServicePubSubSubscriber } from './redis/RedisServicePubSubSubscriber';
+import { RedisServicePubSubPublisher } from './redis/RedisServicePubSubPublisher';
+
+/*
+ * This is a convenience service that provides access to all the Redis clients.
+ */
+@Service()
+export class RedisService {
+	constructor(
+		private redisServicePubSubSubscriber: RedisServicePubSubSubscriber,
+		private redisServicePubSubPublisher: RedisServicePubSubPublisher,
+	) {}
+
+	async getPubSubSubscriber() {
+		await this.redisServicePubSubSubscriber.init();
+		return this.redisServicePubSubSubscriber;
+	}
+
+	async getPubSubPublisher() {
+		await this.redisServicePubSubPublisher.init();
+		return this.redisServicePubSubPublisher;
+	}
+}
diff --git a/packages/cli/src/services/redis/RedisServiceBaseClasses.ts b/packages/cli/src/services/redis/RedisServiceBaseClasses.ts
new file mode 100644
index 0000000000000..b185a1228f045
--- /dev/null
+++ b/packages/cli/src/services/redis/RedisServiceBaseClasses.ts
@@ -0,0 +1,81 @@
+import type Redis from 'ioredis';
+import type { Cluster } from 'ioredis';
+import { Service } from 'typedi';
+import config from '@/config';
+import { Logger } from '@/Logger';
+import { getDefaultRedisClient } from './RedisServiceHelper';
+
+export type RedisClientType =
+	| 'subscriber'
+	| 'client'
+	| 'bclient'
+	| 'subscriber(bull)'
+	| 'client(bull)'
+	| 'bclient(bull)'
+	| 'client(cache)'
+	| 'publisher'
+	| 'consumer'
+	| 'producer'
+	| 'list-sender'
+	| 'list-receiver';
+
+export type RedisServiceMessageHandler =
+	| ((channel: string, message: string) => void)
+	| ((stream: string, id: string, message: string[]) => void);
+
+@Service()
+class RedisServiceBase {
+	redisClient: Redis | Cluster | undefined;
+
+	isInitialized = false;
+
+	constructor(protected readonly logger: Logger) {}
+
+	async init(type: RedisClientType = 'client'): Promise<void> {
+		if (this.redisClient && this.isInitialized) {
+			return;
+		}
+		this.redisClient = await getDefaultRedisClient(undefined, type);
+
+		this.redisClient.on('close', () => {
+			this.logger.warn('Redis unavailable - trying to reconnect...');
+		});
+
+		this.redisClient.on('error', (error) => {
+			if (!String(error).includes('ECONNREFUSED')) {
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+				this.logger.warn('Error with Redis: ', error);
+			}
+		});
+	}
+
+	async destroy(): Promise<void> {
+		if (!this.redisClient) {
+			return;
+		}
+		await this.redisClient.quit();
+		this.isInitialized = false;
+		this.redisClient = undefined;
+	}
+}
+
+export abstract class RedisServiceBaseSender extends RedisServiceBase {
+	senderId: string;
+
+	async init(type: RedisClientType = 'client'): Promise<void> {
+		await super.init(type);
+		this.senderId = config.get('redis.queueModeId');
+	}
+}
+
+export abstract class RedisServiceBaseReceiver extends RedisServiceBase {
+	messageHandlers: Map<string, RedisServiceMessageHandler> = new Map();
+
+	addMessageHandler(handlerName: string, handler: RedisServiceMessageHandler): void {
+		this.messageHandlers.set(handlerName, handler);
+	}
+
+	removeMessageHandler(handlerName: string): void {
+		this.messageHandlers.delete(handlerName);
+	}
+}
diff --git a/packages/cli/src/services/redis/RedisServiceCommands.ts b/packages/cli/src/services/redis/RedisServiceCommands.ts
new file mode 100644
index 0000000000000..009f39ef650eb
--- /dev/null
+++ b/packages/cli/src/services/redis/RedisServiceCommands.ts
@@ -0,0 +1,86 @@
+import type { IPushDataType, IPushDataWorkerStatusPayload, IWorkflowDb } from '@/Interfaces';
+
+export type RedisServiceCommand =
+	| 'getStatus'
+	| 'getId'
+	| 'restartEventBus'
+	| 'stopWorker'
+	| 'reloadLicense'
+	| 'reloadExternalSecretsProviders'
+	| 'display-workflow-activation' // multi-main only
+	| 'display-workflow-deactivation' // multi-main only
+	| 'add-webhooks-triggers-and-pollers' // multi-main only
+	| 'remove-triggers-and-pollers' // multi-main only
+	| 'workflow-failed-to-activate' // multi-main only
+	| 'relay-execution-lifecycle-event' // multi-main only
+	| 'clear-test-webhooks'; // multi-main only
+
+/**
+ * An object to be sent via Redis pub/sub from the main process to the workers.
+ * @field command: The command to be executed.
+ * @field targets: The targets to execute the command on. Leave empty to execute on all workers or specify worker ids.
+ * @field payload: Optional arguments to be sent with the command.
+ */
+export type RedisServiceBaseCommand =
+	| {
+			senderId: string;
+			command: Exclude<
+				RedisServiceCommand,
+				'relay-execution-lifecycle-event' | 'clear-test-webhooks'
+			>;
+			payload?: {
+				[key: string]: string | number | boolean | string[] | number[] | boolean[];
+			};
+	  }
+	| {
+			senderId: string;
+			command: 'relay-execution-lifecycle-event';
+			payload: { type: IPushDataType; args: Record<string, unknown>; pushRef: string };
+	  }
+	| {
+			senderId: string;
+			command: 'clear-test-webhooks';
+			payload: { webhookKey: string; workflowEntity: IWorkflowDb; pushRef: string };
+	  };
+
+export type RedisServiceWorkerResponseObject = {
+	workerId: string;
+} & (
+	| RedisServiceBaseCommand
+	| {
+			command: 'getStatus';
+			payload: IPushDataWorkerStatusPayload;
+	  }
+	| {
+			command: 'getId';
+	  }
+	| {
+			command: 'restartEventBus';
+			payload: {
+				result: 'success' | 'error';
+				error?: string;
+			};
+	  }
+	| {
+			command: 'reloadExternalSecretsProviders';
+			payload: {
+				result: 'success' | 'error';
+				error?: string;
+			};
+	  }
+	| {
+			command: 'stopWorker';
+	  }
+	| {
+			command: 'workflowActiveStateChanged';
+			payload: {
+				oldState: boolean;
+				newState: boolean;
+				workflowId: string;
+			};
+	  }
+);
+
+export type RedisServiceCommandObject = {
+	targets?: string[];
+} & RedisServiceBaseCommand;
diff --git a/packages/cli/src/services/redis/RedisServiceHelper.ts b/packages/cli/src/services/redis/RedisServiceHelper.ts
new file mode 100644
index 0000000000000..257a826b76729
--- /dev/null
+++ b/packages/cli/src/services/redis/RedisServiceHelper.ts
@@ -0,0 +1,152 @@
+import type Redis from 'ioredis';
+import type { Cluster, RedisOptions } from 'ioredis';
+import config from '@/config';
+import type { RedisClientType } from './RedisServiceBaseClasses';
+import Container from 'typedi';
+import { Logger } from '@/Logger';
+
+export const EVENT_BUS_REDIS_STREAM = 'n8n:eventstream';
+export const COMMAND_REDIS_STREAM = 'n8n:commandstream';
+export const WORKER_RESPONSE_REDIS_STREAM = 'n8n:workerstream';
+export const EVENT_BUS_REDIS_CHANNEL = 'n8n.events';
+export const COMMAND_REDIS_CHANNEL = 'n8n.commands';
+export const WORKER_RESPONSE_REDIS_CHANNEL = 'n8n.worker-response';
+export const WORKER_RESPONSE_REDIS_LIST = 'n8n:list:worker-response';
+
+export function getRedisClusterNodes(): Array<{ host: string; port: number }> {
+	const clusterNodePairs = config
+		.getEnv('queue.bull.redis.clusterNodes')
+		.split(',')
+		.filter((e) => e);
+	return clusterNodePairs.map((pair) => {
+		const [host, port] = pair.split(':');
+		return { host, port: parseInt(port) };
+	});
+}
+
+export function getRedisPrefix(customPrefix?: string): string {
+	let prefix = customPrefix ?? config.getEnv('redis.prefix');
+	if (prefix && getRedisClusterNodes().length > 0) {
+		if (!prefix.startsWith('{')) {
+			prefix = '{' + prefix;
+		}
+		if (!prefix.endsWith('}')) {
+			prefix += '}';
+		}
+	}
+	return prefix;
+}
+
+export function getRedisStandardClient(
+	redis: typeof Redis,
+	redisOptions?: RedisOptions,
+	redisType?: RedisClientType,
+): Redis | Cluster {
+	let lastTimer = 0;
+	let cumulativeTimeout = 0;
+	const { host, port, username, password, db }: RedisOptions = config.getEnv('queue.bull.redis');
+	const redisConnectionTimeoutLimit = config.getEnv('queue.bull.redis.timeoutThreshold');
+	const sharedRedisOptions: RedisOptions = {
+		...redisOptions,
+		host,
+		port,
+		username,
+		password,
+		db,
+		enableReadyCheck: false,
+		maxRetriesPerRequest: null,
+	};
+	if (config.getEnv('queue.bull.redis.tls')) sharedRedisOptions.tls = {};
+
+	const logger = Container.get(Logger);
+	logger.debug(
+		`Initialising Redis client${redisType ? ` of type ${redisType}` : ''} connection with host: ${
+			host ?? 'localhost'
+		} and port: ${port ?? '6379'}`,
+	);
+	return new redis({
+		...sharedRedisOptions,
+		retryStrategy: (): number | null => {
+			const now = Date.now();
+			if (now - lastTimer > 30000) {
+				// Means we had no timeout at all or last timeout was temporary and we recovered
+				lastTimer = now;
+				cumulativeTimeout = 0;
+			} else {
+				cumulativeTimeout += now - lastTimer;
+				lastTimer = now;
+				if (cumulativeTimeout > redisConnectionTimeoutLimit) {
+					logger.error(
+						`Unable to connect to Redis after ${redisConnectionTimeoutLimit}. Exiting process.`,
+					);
+					process.exit(1);
+				}
+			}
+			return 500;
+		},
+	});
+}
+
+export function getRedisClusterClient(
+	redis: typeof Redis,
+	redisOptions?: RedisOptions,
+	redisType?: RedisClientType,
+): Cluster {
+	let lastTimer = 0;
+	let cumulativeTimeout = 0;
+	const clusterNodes = getRedisClusterNodes();
+	const { username, password, db }: RedisOptions = config.getEnv('queue.bull.redis');
+	const redisConnectionTimeoutLimit = config.getEnv('queue.bull.redis.timeoutThreshold');
+	const sharedRedisOptions: RedisOptions = {
+		...redisOptions,
+		username,
+		password,
+		db,
+		enableReadyCheck: false,
+		maxRetriesPerRequest: null,
+	};
+	if (config.getEnv('queue.bull.redis.tls')) sharedRedisOptions.tls = {};
+
+	const logger = Container.get(Logger);
+	logger.debug(
+		`Initialising Redis cluster${
+			redisType ? ` of type ${redisType}` : ''
+		} connection with nodes: ${clusterNodes.map((e) => `${e.host}:${e.port}`).join(',')}`,
+	);
+	return new redis.Cluster(
+		clusterNodes.map((node) => ({ host: node.host, port: node.port })),
+		{
+			redisOptions: sharedRedisOptions,
+			clusterRetryStrategy: (): number | null => {
+				const now = Date.now();
+				if (now - lastTimer > 30000) {
+					// Means we had no timeout at all or last timeout was temporary and we recovered
+					lastTimer = now;
+					cumulativeTimeout = 0;
+				} else {
+					cumulativeTimeout += now - lastTimer;
+					lastTimer = now;
+					if (cumulativeTimeout > redisConnectionTimeoutLimit) {
+						logger.error(
+							`Unable to connect to Redis after ${redisConnectionTimeoutLimit}. Exiting process.`,
+						);
+						process.exit(1);
+					}
+				}
+				return 500;
+			},
+		},
+	);
+}
+
+export async function getDefaultRedisClient(
+	additionalRedisOptions?: RedisOptions,
+	redisType?: RedisClientType,
+): Promise<Redis | Cluster> {
+	const { default: Redis } = await import('ioredis');
+	const clusterNodes = getRedisClusterNodes();
+	const usesRedisCluster = clusterNodes.length > 0;
+	return usesRedisCluster
+		? getRedisClusterClient(Redis, additionalRedisOptions, redisType)
+		: getRedisStandardClient(Redis, additionalRedisOptions, redisType);
+}
diff --git a/packages/cli/src/services/redis/RedisServicePubSubPublisher.ts b/packages/cli/src/services/redis/RedisServicePubSubPublisher.ts
new file mode 100644
index 0000000000000..fe080d8e0f674
--- /dev/null
+++ b/packages/cli/src/services/redis/RedisServicePubSubPublisher.ts
@@ -0,0 +1,68 @@
+import { Service } from 'typedi';
+import type { AbstractEventMessage } from '@/eventbus/EventMessageClasses/AbstractEventMessage';
+import {
+	COMMAND_REDIS_CHANNEL,
+	EVENT_BUS_REDIS_CHANNEL,
+	WORKER_RESPONSE_REDIS_CHANNEL,
+} from './RedisServiceHelper';
+import type {
+	RedisServiceCommandObject,
+	RedisServiceWorkerResponseObject,
+} from './RedisServiceCommands';
+import { RedisServiceBaseSender } from './RedisServiceBaseClasses';
+
+@Service()
+export class RedisServicePubSubPublisher extends RedisServiceBaseSender {
+	async init(): Promise<void> {
+		await super.init('publisher');
+	}
+
+	async publish(channel: string, message: string): Promise<void> {
+		if (!this.redisClient) {
+			await this.init();
+		}
+		await this.redisClient?.publish(channel, message);
+	}
+
+	async publishToEventLog(message: AbstractEventMessage): Promise<void> {
+		await this.publish(EVENT_BUS_REDIS_CHANNEL, message.toString());
+	}
+
+	async publishToCommandChannel(
+		message: Omit<RedisServiceCommandObject, 'senderId'>,
+	): Promise<void> {
+		const messageWithSenderId = message as RedisServiceCommandObject;
+		messageWithSenderId.senderId = this.senderId;
+		await this.publish(COMMAND_REDIS_CHANNEL, JSON.stringify(messageWithSenderId));
+	}
+
+	async publishToWorkerChannel(message: RedisServiceWorkerResponseObject): Promise<void> {
+		await this.publish(WORKER_RESPONSE_REDIS_CHANNEL, JSON.stringify(message));
+	}
+
+	async setIfNotExists(key: string, value: string) {
+		if (!this.redisClient) await this.init();
+
+		const success = await this.redisClient?.setnx(key, value);
+
+		return !!success;
+	}
+
+	async setExpiration(key: string, ttl: number) {
+		if (!this.redisClient) await this.init();
+
+		await this.redisClient?.expire(key, ttl);
+	}
+
+	async get(key: string) {
+		if (!this.redisClient) await this.init();
+
+		return await this.redisClient?.get(key);
+	}
+
+	async clear(key: string) {
+		if (!this.redisClient) await this.init();
+
+		await this.redisClient?.del(key);
+	}
+}
diff --git a/packages/cli/src/services/redis/RedisServicePubSubSubscriber.ts b/packages/cli/src/services/redis/RedisServicePubSubSubscriber.ts
new file mode 100644
index 0000000000000..79371b6c12be3
--- /dev/null
+++ b/packages/cli/src/services/redis/RedisServicePubSubSubscriber.ts
@@ -0,0 +1,70 @@
+import { Service } from 'typedi';
+import {
+	COMMAND_REDIS_CHANNEL,
+	EVENT_BUS_REDIS_CHANNEL,
+	WORKER_RESPONSE_REDIS_CHANNEL,
+} from './RedisServiceHelper';
+import { RedisServiceBaseReceiver } from './RedisServiceBaseClasses';
+
+@Service()
+export class RedisServicePubSubSubscriber extends RedisServiceBaseReceiver {
+	async init(): Promise<void> {
+		await super.init('subscriber');
+
+		this.redisClient?.on('message', (channel: string, message: string) => {
+			this.messageHandlers.forEach((handler: (channel: string, message: string) => void) =>
+				handler(channel, message),
+			);
+		});
+	}
+
+	async subscribe(channel: string): Promise<void> {
+		if (!this.redisClient) {
+			await this.init();
+		}
+		await this.redisClient?.subscribe(channel, (error, _count: number) => {
+			if (error) {
+				this.logger.error(`Error subscribing to channel ${channel}`);
+			} else {
+				this.logger.debug(`Subscribed Redis PubSub client to channel: ${channel}`);
+			}
+		});
+	}
+
+	async unsubscribe(channel: string): Promise<void> {
+		if (!this.redisClient) {
+			return;
+		}
+		await this.redisClient?.unsubscribe(channel, (error, _count: number) => {
+			if (error) {
+				this.logger.error(`Error unsubscribing from channel ${channel}`);
+			} else {
+				this.logger.debug(`Unsubscribed Redis PubSub client from channel: ${channel}`);
+			}
+		});
+	}
+
+	async subscribeToEventLog(): Promise<void> {
+		await this.subscribe(EVENT_BUS_REDIS_CHANNEL);
+	}
+
+	async subscribeToCommandChannel(): Promise<void> {
+		await this.subscribe(COMMAND_REDIS_CHANNEL);
+	}
+
+	async subscribeToWorkerResponseChannel(): Promise<void> {
+		await this.subscribe(WORKER_RESPONSE_REDIS_CHANNEL);
+	}
+
+	async unSubscribeFromEventLog(): Promise<void> {
+		await this.unsubscribe(EVENT_BUS_REDIS_CHANNEL);
+	}
+
+	async unSubscribeFromCommandChannel(): Promise<void> {
+		await this.unsubscribe(COMMAND_REDIS_CHANNEL);
+	}
+
+	async unSubscribeFromWorkerResponseChannel(): Promise<void> {
+		await this.unsubscribe(WORKER_RESPONSE_REDIS_CHANNEL);
+	}
+}
diff --git a/packages/cli/src/services/tag.service.ts b/packages/cli/src/services/tag.service.ts
new file mode 100644
index 0000000000000..27f4ebd0f2e2a
--- /dev/null
+++ b/packages/cli/src/services/tag.service.ts
@@ -0,0 +1,84 @@
+import { TagRepository } from '@db/repositories/tag.repository';
+import { Service } from 'typedi';
+import { validateEntity } from '@/GenericHelpers';
+import type { ITagWithCountDb } from '@/Interfaces';
+import type { TagEntity } from '@db/entities/TagEntity';
+import { ExternalHooks } from '@/ExternalHooks';
+
+type GetAllResult<T> = T extends { withUsageCount: true } ? ITagWithCountDb[] : TagEntity[];
+
+@Service()
+export class TagService {
+	constructor(
+		private externalHooks: ExternalHooks,
+		private tagRepository: TagRepository,
+	) {}
+
+	toEntity(attrs: { name: string; id?: string }) {
+		attrs.name = attrs.name.trim();
+
+		return this.tagRepository.create(attrs);
+	}
+
+	async save(tag: TagEntity, actionKind: 'create' | 'update') {
+		await validateEntity(tag);
+
+		const action = actionKind[0].toUpperCase() + actionKind.slice(1);
+
+		await this.externalHooks.run(`tag.before${action}`, [tag]);
+
+		const savedTag = this.tagRepository.save(tag, { transaction: false });
+
+		await this.externalHooks.run(`tag.after${action}`, [tag]);
+
+		return await savedTag;
+	}
+
+	async delete(id: string) {
+		await this.externalHooks.run('tag.beforeDelete', [id]);
+
+		const deleteResult = this.tagRepository.delete(id);
+
+		await this.externalHooks.run('tag.afterDelete', [id]);
+
+		return await deleteResult;
+	}
+
+	async getAll<T extends { withUsageCount: boolean }>(options?: T): Promise<GetAllResult<T>> {
+		if (options?.withUsageCount) {
+			const allTags = await this.tagRepository.find({
+				select: ['id', 'name', 'createdAt', 'updatedAt'],
+				relations: ['workflowMappings'],
+			});
+
+			return allTags.map(({ workflowMappings, ...rest }) => {
+				return {
+					...rest,
+					usageCount: workflowMappings.length,
+				} as ITagWithCountDb;
+			}) as GetAllResult<T>;
+		}
+
+		return await (this.tagRepository.find({
+			select: ['id', 'name', 'createdAt', 'updatedAt'],
+		}) as Promise<GetAllResult<T>>);
+	}
+
+	async getById(id: string) {
+		return await this.tagRepository.findOneOrFail({
+			where: { id },
+		});
+	}
+
+	/**
+	 * Sort tags based on the order of the tag IDs in the request.
+	 */
+	sortByRequestOrder(tags: TagEntity[], { requestOrder }: { requestOrder: string[] }) {
+		const tagMap = tags.reduce<Record<string, TagEntity>>((acc, tag) => {
+			acc[tag.id] = tag;
+			return acc;
+		}, {});
+
+		return requestOrder.map((tagId) => tagMap[tagId]);
+	}
+}
diff --git a/packages/cli/src/services/test-webhook-registrations.service.ts b/packages/cli/src/services/test-webhook-registrations.service.ts
new file mode 100644
index 0000000000000..e2abae5605f98
--- /dev/null
+++ b/packages/cli/src/services/test-webhook-registrations.service.ts
@@ -0,0 +1,93 @@
+import { Service } from 'typedi';
+import { CacheService } from '@/services/cache/cache.service';
+import type { IWebhookData } from 'n8n-workflow';
+import type { IWorkflowDb } from '@/Interfaces';
+import { TEST_WEBHOOK_TIMEOUT, TEST_WEBHOOK_TIMEOUT_BUFFER } from '@/constants';
+import { OrchestrationService } from './orchestration.service';
+
+export type TestWebhookRegistration = {
+	pushRef?: string;
+	workflowEntity: IWorkflowDb;
+	destinationNode?: string;
+	webhook: IWebhookData;
+};
+
+@Service()
+export class TestWebhookRegistrationsService {
+	constructor(
+		private readonly cacheService: CacheService,
+		private readonly orchestrationService: OrchestrationService,
+	) {}
+
+	private readonly cacheKey = 'test-webhooks';
+
+	async register(registration: TestWebhookRegistration) {
+		const hashKey = this.toKey(registration.webhook);
+
+		await this.cacheService.setHash(this.cacheKey, { [hashKey]: registration });
+
+		if (!this.orchestrationService.isMultiMainSetupEnabled) return;
+
+		/**
+		 * 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, after the test webhook has been successfully executed,
+		 * the handler process commands the creator process to clear its test webhooks.
+		 * We set a TTL on the key so that it is cleared even on creator process crash,
+		 * with an additional buffer to ensure this safeguard expiration will not delete
+		 * the key before the regular test webhook timeout fetches the key to delete it.
+		 */
+		const ttl = TEST_WEBHOOK_TIMEOUT + TEST_WEBHOOK_TIMEOUT_BUFFER;
+
+		await this.cacheService.expire(this.cacheKey, ttl);
+	}
+
+	async deregister(arg: IWebhookData | string) {
+		if (typeof arg === 'string') {
+			await this.cacheService.deleteFromHash(this.cacheKey, arg);
+		} else {
+			const hashKey = this.toKey(arg);
+			await this.cacheService.deleteFromHash(this.cacheKey, hashKey);
+		}
+	}
+
+	async get(key: string) {
+		return await this.cacheService.getHashValue<TestWebhookRegistration>(this.cacheKey, key);
+	}
+
+	async getAllKeys() {
+		const hash = await this.cacheService.getHash<TestWebhookRegistration>(this.cacheKey);
+
+		if (!hash) return [];
+
+		return Object.keys(hash);
+	}
+
+	async getAllRegistrations() {
+		const hash = await this.cacheService.getHash<TestWebhookRegistration>(this.cacheKey);
+
+		if (!hash) return [];
+
+		return Object.values(hash);
+	}
+
+	async deregisterAll() {
+		await this.cacheService.delete(this.cacheKey);
+	}
+
+	toKey(webhook: Pick<IWebhookData, 'webhookId' | 'httpMethod' | 'path'>) {
+		const { webhookId, httpMethod, path: webhookPath } = webhook;
+
+		if (!webhookId) return [httpMethod, webhookPath].join('|');
+
+		let path = webhookPath;
+
+		if (path.startsWith(webhookId)) {
+			const cutFromIndex = path.indexOf('/') + 1;
+
+			path = path.slice(cutFromIndex);
+		}
+
+		return [httpMethod, webhookId, path.split('/').length].join('|');
+	}
+}
diff --git a/packages/cli/src/services/url.service.ts b/packages/cli/src/services/url.service.ts
new file mode 100644
index 0000000000000..b1ef737c2f43e
--- /dev/null
+++ b/packages/cli/src/services/url.service.ts
@@ -0,0 +1,40 @@
+import { Service } from 'typedi';
+import config from '@/config';
+
+@Service()
+export class UrlService {
+	/** Returns the base URL n8n is reachable from */
+	readonly baseUrl: string;
+
+	constructor() {
+		this.baseUrl = this.generateBaseUrl();
+	}
+
+	/** Returns the base URL of the webhooks */
+	getWebhookBaseUrl() {
+		let urlBaseWebhook = process.env.WEBHOOK_URL ?? this.baseUrl;
+		if (!urlBaseWebhook.endsWith('/')) {
+			urlBaseWebhook += '/';
+		}
+		return urlBaseWebhook;
+	}
+
+	/** Return the n8n instance base URL without trailing slash */
+	getInstanceBaseUrl(): string {
+		const n8nBaseUrl = config.getEnv('editorBaseUrl') || this.getWebhookBaseUrl();
+
+		return n8nBaseUrl.endsWith('/') ? n8nBaseUrl.slice(0, n8nBaseUrl.length - 1) : n8nBaseUrl;
+	}
+
+	private generateBaseUrl(): string {
+		const protocol = config.getEnv('protocol');
+		const host = config.getEnv('host');
+		const port = config.getEnv('port');
+		const path = config.getEnv('path');
+
+		if ((protocol === 'http' && port === 80) || (protocol === 'https' && port === 443)) {
+			return `${protocol}://${host}${path}`;
+		}
+		return `${protocol}://${host}:${port}${path}`;
+	}
+}
diff --git a/packages/cli/src/services/usageMetrics.service.ts b/packages/cli/src/services/usageMetrics.service.ts
new file mode 100644
index 0000000000000..bf60072f6bf77
--- /dev/null
+++ b/packages/cli/src/services/usageMetrics.service.ts
@@ -0,0 +1,29 @@
+import { UsageMetricsRepository } from '@/databases/repositories/usageMetrics.repository';
+import { Service } from 'typedi';
+
+@Service()
+export class UsageMetricsService {
+	constructor(private readonly usageMetricsRepository: UsageMetricsRepository) {}
+
+	async collectUsageMetrics() {
+		const {
+			activeWorkflows,
+			totalWorkflows,
+			enabledUsers,
+			totalUsers,
+			totalCredentials,
+			productionExecutions,
+			manualExecutions,
+		} = await this.usageMetricsRepository.getLicenseRenewalMetrics();
+
+		return [
+			{ name: 'activeWorkflows', value: activeWorkflows },
+			{ name: 'totalWorkflows', value: totalWorkflows },
+			{ name: 'enabledUsers', value: enabledUsers },
+			{ name: 'totalUsers', value: totalUsers },
+			{ name: 'totalCredentials', value: totalCredentials },
+			{ name: 'productionExecutions', value: productionExecutions },
+			{ name: 'manualExecutions', value: manualExecutions },
+		];
+	}
+}
diff --git a/packages/cli/src/services/user.service.ts b/packages/cli/src/services/user.service.ts
new file mode 100644
index 0000000000000..0ce290da8bd7d
--- /dev/null
+++ b/packages/cli/src/services/user.service.ts
@@ -0,0 +1,218 @@
+import { Container, Service } from 'typedi';
+import type { IUserSettings } from 'n8n-workflow';
+import { ApplicationError, ErrorReporterProxy as ErrorReporter } from 'n8n-workflow';
+
+import { type AssignableRole, User } from '@db/entities/User';
+import { UserRepository } from '@db/repositories/user.repository';
+import type { PublicUser } from '@/Interfaces';
+import type { PostHogClient } from '@/posthog';
+import { Logger } from '@/Logger';
+import { UserManagementMailer } from '@/UserManagement/email';
+import { InternalHooks } from '@/InternalHooks';
+import { UrlService } from '@/services/url.service';
+import type { UserRequest } from '@/requests';
+import { InternalServerError } from '@/errors/response-errors/internal-server.error';
+
+@Service()
+export class UserService {
+	constructor(
+		private readonly logger: Logger,
+		private readonly userRepository: UserRepository,
+		private readonly mailer: UserManagementMailer,
+		private readonly urlService: UrlService,
+	) {}
+
+	async update(userId: string, data: Partial<User>) {
+		return await this.userRepository.update(userId, data);
+	}
+
+	getManager() {
+		return this.userRepository.manager;
+	}
+
+	async updateSettings(userId: string, newSettings: Partial<IUserSettings>) {
+		const { settings } = await this.userRepository.findOneOrFail({ where: { id: userId } });
+
+		return await this.userRepository.update(userId, { settings: { ...settings, ...newSettings } });
+	}
+
+	async toPublic(
+		user: User,
+		options?: {
+			withInviteUrl?: boolean;
+			inviterId?: string;
+			posthog?: PostHogClient;
+			withScopes?: boolean;
+		},
+	) {
+		const { password, updatedAt, apiKey, authIdentities, mfaRecoveryCodes, mfaSecret, ...rest } =
+			user;
+
+		const ldapIdentity = authIdentities?.find((i) => i.providerType === 'ldap');
+
+		let publicUser: PublicUser = {
+			...rest,
+			signInType: ldapIdentity ? 'ldap' : 'email',
+			hasRecoveryCodesLeft: !!user.mfaRecoveryCodes?.length,
+		};
+
+		if (options?.withInviteUrl && !options?.inviterId) {
+			throw new ApplicationError('Inviter ID is required to generate invite URL');
+		}
+
+		if (options?.withInviteUrl && options?.inviterId && publicUser.isPending) {
+			publicUser = this.addInviteUrl(options.inviterId, publicUser);
+		}
+
+		if (options?.posthog) {
+			publicUser = await this.addFeatureFlags(publicUser, options.posthog);
+		}
+
+		if (options?.withScopes) {
+			publicUser.globalScopes = user.globalScopes;
+		}
+
+		return publicUser;
+	}
+
+	private addInviteUrl(inviterId: string, invitee: PublicUser) {
+		const url = new URL(this.urlService.getInstanceBaseUrl());
+		url.pathname = '/signup';
+		url.searchParams.set('inviterId', inviterId);
+		url.searchParams.set('inviteeId', invitee.id);
+
+		invitee.inviteAcceptUrl = url.toString();
+
+		return invitee;
+	}
+
+	private async addFeatureFlags(publicUser: PublicUser, posthog: PostHogClient) {
+		// native PostHog implementation has default 10s timeout and 3 retries.. which cannot be updated without affecting other functionality
+		// https://github.com/PostHog/posthog-js-lite/blob/a182de80a433fb0ffa6859c10fb28084d0f825c2/posthog-core/src/index.ts#L67
+		const timeoutPromise = new Promise<PublicUser>((resolve) => {
+			setTimeout(() => {
+				resolve(publicUser);
+			}, 1500);
+		});
+
+		const fetchPromise = new Promise<PublicUser>(async (resolve) => {
+			publicUser.featureFlags = await posthog.getFeatureFlags(publicUser);
+			resolve(publicUser);
+		});
+
+		return await Promise.race([fetchPromise, timeoutPromise]);
+	}
+
+	private async sendEmails(
+		owner: User,
+		toInviteUsers: { [key: string]: string },
+		role: AssignableRole,
+	) {
+		const domain = this.urlService.getInstanceBaseUrl();
+
+		return await Promise.all(
+			Object.entries(toInviteUsers).map(async ([email, id]) => {
+				const inviteAcceptUrl = `${domain}/signup?inviterId=${owner.id}&inviteeId=${id}`;
+				const invitedUser: UserRequest.InviteResponse = {
+					user: {
+						id,
+						email,
+						inviteAcceptUrl,
+						emailSent: false,
+					},
+					error: '',
+				};
+
+				try {
+					const result = await this.mailer.invite({
+						email,
+						inviteAcceptUrl,
+						domain,
+					});
+					if (result.emailSent) {
+						invitedUser.user.emailSent = true;
+						delete invitedUser.user?.inviteAcceptUrl;
+						void Container.get(InternalHooks).onUserTransactionalEmail({
+							user_id: id,
+							message_type: 'New user invite',
+							public_api: false,
+						});
+					}
+
+					void Container.get(InternalHooks).onUserInvite({
+						user: owner,
+						target_user_id: Object.values(toInviteUsers),
+						public_api: false,
+						email_sent: result.emailSent,
+						invitee_role: role, // same role for all invited users
+					});
+				} catch (e) {
+					if (e instanceof Error) {
+						void Container.get(InternalHooks).onEmailFailed({
+							user: owner,
+							message_type: 'New user invite',
+							public_api: false,
+						});
+						this.logger.error('Failed to send email', {
+							userId: owner.id,
+							inviteAcceptUrl,
+							domain,
+							email,
+						});
+						invitedUser.error = e.message;
+					}
+				}
+
+				return invitedUser;
+			}),
+		);
+	}
+
+	async inviteUsers(owner: User, attributes: Array<{ email: string; role: AssignableRole }>) {
+		const emails = attributes.map(({ email }) => email);
+
+		const existingUsers = await this.userRepository.findManyByEmail(emails);
+
+		const existUsersEmails = existingUsers.map((user) => user.email);
+
+		const toCreateUsers = attributes.filter(({ email }) => !existUsersEmails.includes(email));
+
+		const pendingUsersToInvite = existingUsers.filter((email) => email.isPending);
+
+		const createdUsers = new Map<string, string>();
+
+		this.logger.debug(
+			toCreateUsers.length > 1
+				? `Creating ${toCreateUsers.length} user shells...`
+				: 'Creating 1 user shell...',
+		);
+
+		try {
+			await this.getManager().transaction(
+				async (transactionManager) =>
+					await Promise.all(
+						toCreateUsers.map(async ({ email, role }) => {
+							const newUser = transactionManager.create(User, { email, role });
+							const savedUser = await transactionManager.save<User>(newUser);
+							createdUsers.set(email, savedUser.id);
+							return savedUser;
+						}),
+					),
+			);
+		} catch (error) {
+			ErrorReporter.error(error);
+			this.logger.error('Failed to create user shells', { userShells: createdUsers });
+			throw new InternalServerError('An error occurred during user creation');
+		}
+
+		pendingUsersToInvite.forEach(({ email, id }) => createdUsers.set(email, id));
+
+		const usersInvited = await this.sendEmails(
+			owner,
+			Object.fromEntries(createdUsers),
+			attributes[0].role, // same role for all invited users
+		);
+
+		return { usersInvited, usersCreated: toCreateUsers.map(({ email }) => email) };
+	}
+}
diff --git a/packages/cli/src/services/userOnboarding.service.ts b/packages/cli/src/services/userOnboarding.service.ts
new file mode 100644
index 0000000000000..3f61a4aac03f4
--- /dev/null
+++ b/packages/cli/src/services/userOnboarding.service.ts
@@ -0,0 +1,66 @@
+import { Service } from 'typedi';
+import { In } from '@n8n/typeorm';
+
+import type { User } from '@db/entities/User';
+import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
+import { WorkflowRepository } from '@db/repositories/workflow.repository';
+import { UserService } from '@/services/user.service';
+
+@Service()
+export class UserOnboardingService {
+	constructor(
+		private readonly sharedWorkflowRepository: SharedWorkflowRepository,
+		private readonly workflowRepository: WorkflowRepository,
+		private readonly userService: UserService,
+	) {}
+
+	/**
+	 * Check if user owns more than 15 workflows or more than 2 workflows with at least 2 nodes.
+	 * If user does, set flag in its settings.
+	 */
+	async isBelowThreshold(user: User): Promise<boolean> {
+		let belowThreshold = true;
+		const skippedTypes = ['n8n-nodes-base.start', 'n8n-nodes-base.stickyNote'];
+
+		const ownedWorkflowsIds = await this.sharedWorkflowRepository
+			.find({
+				where: {
+					userId: user.id,
+					role: 'workflow:owner',
+				},
+				select: ['workflowId'],
+			})
+			.then((ownedWorkflows) => ownedWorkflows.map(({ workflowId }) => workflowId));
+
+		if (ownedWorkflowsIds.length > 15) {
+			belowThreshold = false;
+		} else {
+			// just fetch workflows' nodes to keep memory footprint low
+			const workflows = await this.workflowRepository.find({
+				where: { id: In(ownedWorkflowsIds) },
+				select: ['nodes'],
+			});
+
+			// valid workflow: 2+ nodes without start node
+			const validWorkflowCount = workflows.reduce((counter, workflow) => {
+				if (counter <= 2 && workflow.nodes.length > 2) {
+					const nodes = workflow.nodes.filter((node) => !skippedTypes.includes(node.type));
+					if (nodes.length >= 2) {
+						return counter + 1;
+					}
+				}
+				return counter;
+			}, 0);
+
+			// more than 2 valid workflows required
+			belowThreshold = validWorkflowCount <= 2;
+		}
+
+		// user is above threshold --> set flag in settings
+		if (!belowThreshold) {
+			void this.userService.updateSettings(user.id, { isOnboarded: true });
+		}
+
+		return belowThreshold;
+	}
+}
diff --git a/packages/cli/src/services/webhook.service.ts b/packages/cli/src/services/webhook.service.ts
new file mode 100644
index 0000000000000..9840d90dec3a8
--- /dev/null
+++ b/packages/cli/src/services/webhook.service.ts
@@ -0,0 +1,120 @@
+import { WebhookRepository } from '@db/repositories/webhook.repository';
+import { Service } from 'typedi';
+import { CacheService } from '@/services/cache/cache.service';
+import type { WebhookEntity } from '@db/entities/WebhookEntity';
+import type { IHttpRequestMethods } from 'n8n-workflow';
+
+type Method = NonNullable<IHttpRequestMethods>;
+
+@Service()
+export class WebhookService {
+	constructor(
+		private webhookRepository: WebhookRepository,
+		private cacheService: CacheService,
+	) {}
+
+	async populateCache() {
+		const allWebhooks = await this.webhookRepository.find();
+
+		if (!allWebhooks) return;
+
+		void this.cacheService.setMany(allWebhooks.map((w) => [w.cacheKey, w]));
+	}
+
+	private async findCached(method: Method, path: string) {
+		const cacheKey = `webhook:${method}-${path}`;
+
+		const cachedWebhook = await this.cacheService.get(cacheKey);
+
+		if (cachedWebhook) return this.webhookRepository.create(cachedWebhook);
+
+		let dbWebhook = await this.findStaticWebhook(method, path);
+
+		if (dbWebhook === null) {
+			dbWebhook = await this.findDynamicWebhook(method, path);
+		}
+
+		void this.cacheService.set(cacheKey, dbWebhook);
+
+		return dbWebhook;
+	}
+
+	/**
+	 * Find a matching webhook with zero dynamic path segments, e.g. `<uuid>` or `user/profile`.
+	 */
+	private async findStaticWebhook(method: Method, path: string) {
+		return await this.webhookRepository.findOneBy({ webhookPath: path, method });
+	}
+
+	/**
+	 * Find a matching webhook with one or more dynamic path segments, e.g. `<uuid>/user/:id/posts`.
+	 * It is mandatory for dynamic webhooks to have `<uuid>/` at the base.
+	 */
+	private async findDynamicWebhook(method: Method, path: string) {
+		const [uuidSegment, ...otherSegments] = path.split('/');
+
+		const dynamicWebhooks = await this.webhookRepository.findBy({
+			webhookId: uuidSegment,
+			method,
+			pathLength: otherSegments.length,
+		});
+
+		if (dynamicWebhooks.length === 0) return null;
+
+		const requestSegments = new Set(otherSegments);
+
+		const { webhook } = dynamicWebhooks.reduce<{
+			webhook: WebhookEntity | null;
+			maxMatches: number;
+		}>(
+			(acc, dw) => {
+				const allStaticSegmentsMatch = dw.staticSegments.every((s) => requestSegments.has(s));
+
+				if (allStaticSegmentsMatch && dw.staticSegments.length > acc.maxMatches) {
+					acc.maxMatches = dw.staticSegments.length;
+					acc.webhook = dw;
+					return acc;
+				} else if (dw.staticSegments.length === 0 && !acc.webhook) {
+					acc.webhook = dw; // edge case: if path is `:var`, match on anything
+				}
+
+				return acc;
+			},
+			{ webhook: null, maxMatches: 0 },
+		);
+
+		return webhook;
+	}
+
+	async findWebhook(method: Method, path: string) {
+		return await this.findCached(method, path);
+	}
+
+	async storeWebhook(webhook: WebhookEntity) {
+		void this.cacheService.set(webhook.cacheKey, webhook);
+
+		return await this.webhookRepository.insert(webhook);
+	}
+
+	createWebhook(data: Partial<WebhookEntity>) {
+		return this.webhookRepository.create(data);
+	}
+
+	async deleteWorkflowWebhooks(workflowId: string) {
+		const webhooks = await this.webhookRepository.findBy({ workflowId });
+
+		return await this.deleteWebhooks(webhooks);
+	}
+
+	private async deleteWebhooks(webhooks: WebhookEntity[]) {
+		void this.cacheService.deleteMany(webhooks.map((w) => w.cacheKey));
+
+		return await this.webhookRepository.remove(webhooks);
+	}
+
+	async getWebhookMethods(path: string) {
+		return await this.webhookRepository
+			.find({ select: ['method'], where: { webhookPath: path } })
+			.then((rows) => rows.map((r) => r.method));
+	}
+}
diff --git a/packages/cli/src/shutdown/Shutdown.service.ts b/packages/cli/src/shutdown/Shutdown.service.ts
new file mode 100644
index 0000000000000..1dd858f271563
--- /dev/null
+++ b/packages/cli/src/shutdown/Shutdown.service.ts
@@ -0,0 +1,105 @@
+import { Container, Service } from 'typedi';
+import { ApplicationError, ErrorReporterProxy, assert } from 'n8n-workflow';
+import type { Class } from 'n8n-core';
+import { Logger } from '@/Logger';
+
+type HandlerFn = () => Promise<void> | void;
+export type ServiceClass = Class<Record<string, HandlerFn>>;
+
+export interface ShutdownHandler {
+	serviceClass: ServiceClass;
+	methodName: string;
+}
+
+/** Error reported when a listener fails to shutdown gracefully */
+export class ComponentShutdownError extends ApplicationError {
+	constructor(componentName: string, cause: Error) {
+		super('Failed to shutdown gracefully', {
+			level: 'error',
+			cause,
+			extra: { component: componentName },
+		});
+	}
+}
+
+/** Service responsible for orchestrating a graceful shutdown of the application */
+@Service()
+export class ShutdownService {
+	private readonly handlersByPriority: ShutdownHandler[][] = [];
+
+	private shutdownPromise: Promise<void> | undefined;
+
+	constructor(private readonly logger: Logger) {}
+
+	/** Registers given listener to be notified when the application is shutting down */
+	register(priority: number, handler: ShutdownHandler) {
+		if (!this.handlersByPriority[priority]) {
+			this.handlersByPriority[priority] = [];
+		}
+		this.handlersByPriority[priority].push(handler);
+	}
+
+	/** Validates that all the registered shutdown handlers are properly configured */
+	validate() {
+		const handlers = this.handlersByPriority.flat();
+
+		for (const { serviceClass, methodName } of handlers) {
+			if (!Container.has(serviceClass)) {
+				throw new ApplicationError(
+					`Component "${serviceClass.name}" is not registered with the DI container. Any component using @OnShutdown() must be decorated with @Service()`,
+				);
+			}
+
+			const service = Container.get(serviceClass);
+			if (!service[methodName]) {
+				throw new ApplicationError(
+					`Component "${serviceClass.name}" does not have a "${methodName}" method`,
+				);
+			}
+		}
+	}
+
+	/** Signals all registered listeners that the application is shutting down */
+	shutdown() {
+		if (this.shutdownPromise) {
+			throw new ApplicationError('App is already shutting down');
+		}
+
+		this.shutdownPromise = this.startShutdown();
+	}
+
+	/** Returns a promise that resolves when all the registered listeners have shut down */
+	async waitForShutdown(): Promise<void> {
+		if (!this.shutdownPromise) {
+			throw new ApplicationError('App is not shutting down');
+		}
+
+		await this.shutdownPromise;
+	}
+
+	isShuttingDown() {
+		return !!this.shutdownPromise;
+	}
+
+	private async startShutdown() {
+		const handlers = Object.values(this.handlersByPriority).reverse();
+		for (const handlerGroup of handlers) {
+			await Promise.allSettled(
+				handlerGroup.map(async (handler) => await this.shutdownComponent(handler)),
+			);
+		}
+	}
+
+	private async shutdownComponent({ serviceClass, methodName }: ShutdownHandler) {
+		const name = `${serviceClass.name}.${methodName}()`;
+		try {
+			this.logger.debug(`Shutting down component "${name}"`);
+			const service = Container.get(serviceClass);
+			const method = service[methodName];
+			await method.call(service);
+		} catch (error) {
+			assert(error instanceof Error);
+			ErrorReporterProxy.error(new ComponentShutdownError(name, error));
+		}
+	}
+}
diff --git a/packages/cli/src/sso/saml/constants.ts b/packages/cli/src/sso/saml/constants.ts
index b2dd3f2a9b444..4fbf8536dceb0 100644
--- a/packages/cli/src/sso/saml/constants.ts
+++ b/packages/cli/src/sso/saml/constants.ts
@@ -1,31 +1,3 @@
-export class SamlUrls {
-	static readonly samlRESTRoot = '/rest/sso/saml';
-
-	static readonly initSSO = '/initsso';
-
-	static readonly acs = '/acs';
-
-	static readonly restAcs = this.samlRESTRoot + this.acs;
-
-	static readonly metadata = '/metadata';
-
-	static readonly restMetadata = this.samlRESTRoot + this.metadata;
-
-	static readonly config = '/config';
-
-	static readonly configTest = '/config/test';
-
-	static readonly configTestReturn = '/config/test/return';
-
-	static readonly configToggleEnabled = '/config/toggle';
-
-	static readonly defaultRedirect = '/';
-
-	static readonly samlOnboarding = '/saml/onboarding';
-}
-
 export const SAML_PREFERENCES_DB_KEY = 'features.saml';
-
 export const SAML_LOGIN_LABEL = 'sso.saml.loginLabel';
-
 export const SAML_LOGIN_ENABLED = 'sso.saml.loginEnabled';
diff --git a/packages/cli/src/sso/saml/middleware/samlEnabledMiddleware.ts b/packages/cli/src/sso/saml/middleware/samlEnabledMiddleware.ts
index 69015838d7f69..e386541de02b8 100644
--- a/packages/cli/src/sso/saml/middleware/samlEnabledMiddleware.ts
+++ b/packages/cli/src/sso/saml/middleware/samlEnabledMiddleware.ts
@@ -1,7 +1,7 @@
 import type { RequestHandler } from 'express';
 import { isSamlLicensed, isSamlLicensedAndEnabled } from '../samlHelpers';
 
-export const samlLicensedAndEnabledMiddleware: RequestHandler = (req, res, next) => {
+export const samlLicensedAndEnabledMiddleware: RequestHandler = (_, res, next) => {
 	if (isSamlLicensedAndEnabled()) {
 		next();
 	} else {
@@ -9,7 +9,7 @@ export const samlLicensedAndEnabledMiddleware: RequestHandler = (req, res, next)
 	}
 };
 
-export const samlLicensedMiddleware: RequestHandler = (req, res, next) => {
+export const samlLicensedMiddleware: RequestHandler = (_, res, next) => {
 	if (isSamlLicensed()) {
 		next();
 	} else {
diff --git a/packages/cli/src/sso/saml/routes/saml.controller.ee.ts b/packages/cli/src/sso/saml/routes/saml.controller.ee.ts
index c6b04cae460ef..38de44c230b70 100644
--- a/packages/cli/src/sso/saml/routes/saml.controller.ee.ts
+++ b/packages/cli/src/sso/saml/routes/saml.controller.ee.ts
@@ -1,21 +1,17 @@
 import express from 'express';
-import { getInstanceBaseUrl } from '@/UserManagement/UserManagementHelper';
-import { Authorized, Get, Post, RestController } from '@/decorators';
-import { SamlUrls } from '../constants';
-import {
-	samlLicensedAndEnabledMiddleware,
-	samlLicensedMiddleware,
-} from '../middleware/samlEnabledMiddleware';
-import { SamlService } from '../saml.service.ee';
-import { SamlConfiguration } from '../types/requests';
-import { AuthError, BadRequestError } from '@/ResponseHelper';
-import { getInitSSOFormView } from '../views/initSsoPost';
-import { issueCookie } from '@/auth/jwt';
 import { validate } from 'class-validator';
 import type { PostBindingContext } from 'samlify/types/src/entity';
-import { isConnectionTestRequest, isSamlLicensedAndEnabled } from '../samlHelpers';
-import type { SamlLoginBinding } from '../types';
+import url from 'url';
+
+import { Get, Post, RestController, GlobalScope } from '@/decorators';
+import { AuthService } from '@/auth/auth.service';
 import { AuthenticatedRequest } from '@/requests';
+import { InternalHooks } from '@/InternalHooks';
+import querystring from 'querystring';
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
+import { AuthError } from '@/errors/response-errors/auth.error';
+import { UrlService } from '@/services/url.service';
+
 import {
 	getServiceProviderConfigTestReturnUrl,
 	getServiceProviderEntityId,
@@ -23,24 +19,36 @@ import {
 } from '../serviceProvider.ee';
 import { getSamlConnectionTestSuccessView } from '../views/samlConnectionTestSuccess';
 import { getSamlConnectionTestFailedView } from '../views/samlConnectionTestFailed';
+import { isConnectionTestRequest, isSamlLicensedAndEnabled } from '../samlHelpers';
+import type { SamlLoginBinding } from '../types';
+import {
+	samlLicensedAndEnabledMiddleware,
+	samlLicensedMiddleware,
+} from '../middleware/samlEnabledMiddleware';
+import { SamlService } from '../saml.service.ee';
+import { SamlConfiguration } from '../types/requests';
+import { getInitSSOFormView } from '../views/initSsoPost';
 
 @RestController('/sso/saml')
 export class SamlController {
-	constructor(private samlService: SamlService) {}
+	constructor(
+		private readonly authService: AuthService,
+		private readonly samlService: SamlService,
+		private readonly urlService: UrlService,
+		private readonly internalHooks: InternalHooks,
+	) {}
 
-	@Get(SamlUrls.metadata)
-	async getServiceProviderMetadata(req: express.Request, res: express.Response) {
+	@Get('/metadata', { skipAuth: true })
+	async getServiceProviderMetadata(_: express.Request, res: express.Response) {
 		return res
 			.header('Content-Type', 'text/xml')
 			.send(this.samlService.getServiceProviderInstance().getMetadata());
 	}
 
 	/**
-	 * GET /sso/saml/config
 	 * Return SAML config
 	 */
-	@Authorized(['global', 'owner'])
-	@Get(SamlUrls.config, { middlewares: [samlLicensedMiddleware] })
+	@Get('/config', { middlewares: [samlLicensedMiddleware] })
 	async configGet() {
 		const prefs = this.samlService.samlPreferences;
 		return {
@@ -51,11 +59,10 @@ export class SamlController {
 	}
 
 	/**
-	 * POST /sso/saml/config
 	 * Set SAML config
 	 */
-	@Authorized(['global', 'owner'])
-	@Post(SamlUrls.config, { middlewares: [samlLicensedMiddleware] })
+	@Post('/config', { middlewares: [samlLicensedMiddleware] })
+	@GlobalScope('saml:manage')
 	async configPost(req: SamlConfiguration.Update) {
 		const validationResult = await validate(req.body);
 		if (validationResult.length === 0) {
@@ -70,11 +77,10 @@ export class SamlController {
 	}
 
 	/**
-	 * POST /sso/saml/config/toggle
-	 * Set SAML config
+	 * Toggle SAML status
 	 */
-	@Authorized(['global', 'owner'])
-	@Post(SamlUrls.configToggleEnabled, { middlewares: [samlLicensedMiddleware] })
+	@Post('/config/toggle', { middlewares: [samlLicensedMiddleware] })
+	@GlobalScope('saml:manage')
 	async toggleEnabledPost(req: SamlConfiguration.Toggle, res: express.Response) {
 		if (req.body.loginEnabled === undefined) {
 			throw new BadRequestError('Body should contain a boolean "loginEnabled" property');
@@ -84,21 +90,19 @@ export class SamlController {
 	}
 
 	/**
-	 * GET /sso/saml/acs
 	 * Assertion Consumer Service endpoint
 	 */
-	@Get(SamlUrls.acs, { middlewares: [samlLicensedMiddleware] })
+	@Get('/acs', { middlewares: [samlLicensedMiddleware], skipAuth: true })
 	async acsGet(req: SamlConfiguration.AcsRequest, res: express.Response) {
-		return this.acsHandler(req, res, 'redirect');
+		return await this.acsHandler(req, res, 'redirect');
 	}
 
 	/**
-	 * POST /sso/saml/acs
 	 * Assertion Consumer Service endpoint
 	 */
-	@Post(SamlUrls.acs, { middlewares: [samlLicensedMiddleware] })
+	@Post('/acs', { middlewares: [samlLicensedMiddleware], skipAuth: true })
 	async acsPost(req: SamlConfiguration.AcsRequest, res: express.Response) {
-		return this.acsHandler(req, res, 'post');
+		return await this.acsHandler(req, res, 'post');
 	}
 
 	/**
@@ -122,50 +126,76 @@ export class SamlController {
 				}
 			}
 			if (loginResult.authenticatedUser) {
+				void this.internalHooks.onUserLoginSuccess({
+					user: loginResult.authenticatedUser,
+					authenticationMethod: 'saml',
+				});
 				// Only sign in user if SAML is enabled, otherwise treat as test connection
 				if (isSamlLicensedAndEnabled()) {
-					await issueCookie(res, loginResult.authenticatedUser);
+					this.authService.issueCookie(res, loginResult.authenticatedUser, req.browserId);
 					if (loginResult.onboardingRequired) {
-						return res.redirect(getInstanceBaseUrl() + SamlUrls.samlOnboarding);
+						return res.redirect(this.urlService.getInstanceBaseUrl() + '/saml/onboarding');
 					} else {
-						return res.redirect(getInstanceBaseUrl() + SamlUrls.defaultRedirect);
+						const redirectUrl = req.body?.RelayState ?? '/';
+						return res.redirect(this.urlService.getInstanceBaseUrl() + redirectUrl);
 					}
 				} else {
 					return res.status(202).send(loginResult.attributes);
 				}
 			}
+			void this.internalHooks.onUserLoginFailed({
+				user: loginResult.attributes.email ?? 'unknown',
+				authenticationMethod: 'saml',
+			});
 			throw new AuthError('SAML Authentication failed');
 		} catch (error) {
 			if (isConnectionTestRequest(req)) {
 				return res.send(getSamlConnectionTestFailedView((error as Error).message));
 			}
+			void this.internalHooks.onUserLoginFailed({
+				user: 'unknown',
+				authenticationMethod: 'saml',
+			});
 			throw new AuthError('SAML Authentication failed: ' + (error as Error).message);
 		}
 	}
 
 	/**
-	 * GET /sso/saml/initsso
 	 * Access URL for implementing SP-init SSO
 	 * This endpoint is available if SAML is licensed and enabled
 	 */
-	@Get(SamlUrls.initSSO, { middlewares: [samlLicensedAndEnabledMiddleware] })
+	@Get('/initsso', { middlewares: [samlLicensedAndEnabledMiddleware], skipAuth: true })
 	async initSsoGet(req: express.Request, res: express.Response) {
-		return this.handleInitSSO(res);
+		let redirectUrl = '';
+		try {
+			const refererUrl = req.headers.referer;
+			if (refererUrl) {
+				const parsedUrl = url.parse(refererUrl);
+				if (parsedUrl?.query) {
+					const parsedQueryParams = querystring.parse(parsedUrl.query);
+					if (parsedQueryParams.redirect && typeof parsedQueryParams.redirect === 'string') {
+						redirectUrl = querystring.unescape(parsedQueryParams.redirect);
+					}
+				}
+			}
+		} catch {
+			// ignore
+		}
+		return await this.handleInitSSO(res, redirectUrl);
 	}
 
 	/**
-	 * GET /sso/saml/config/test
 	 * Test SAML config
 	 * This endpoint is available if SAML is licensed and the requestor is an instance owner
 	 */
-	@Authorized(['global', 'owner'])
-	@Get(SamlUrls.configTest, { middlewares: [samlLicensedMiddleware] })
-	async configTestGet(req: AuthenticatedRequest, res: express.Response) {
-		return this.handleInitSSO(res, getServiceProviderConfigTestReturnUrl());
+	@Get('/config/test', { middlewares: [samlLicensedMiddleware] })
+	@GlobalScope('saml:manage')
+	async configTestGet(_: AuthenticatedRequest, res: express.Response) {
+		return await this.handleInitSSO(res, getServiceProviderConfigTestReturnUrl());
 	}
 
 	private async handleInitSSO(res: express.Response, relayState?: string) {
-		const result = this.samlService.getLoginRequestUrl(relayState);
+		const result = await this.samlService.getLoginRequestUrl(relayState);
 		if (result?.binding === 'redirect') {
 			return result.context.context;
 		} else if (result?.binding === 'post') {
diff --git a/packages/cli/src/sso/saml/saml.service.ee.ts b/packages/cli/src/sso/saml/saml.service.ee.ts
index b16d14600e1d8..92318cb146354 100644
--- a/packages/cli/src/sso/saml/saml.service.ee.ts
+++ b/packages/cli/src/sso/saml/saml.service.ee.ts
@@ -1,20 +1,19 @@
 import type express from 'express';
-import { Service } from 'typedi';
-import * as Db from '@/Db';
+import Container, { Service } from 'typedi';
 import type { User } from '@db/entities/User';
-import { jsonParse, LoggerProxy } from 'n8n-workflow';
-import { AuthError, BadRequestError } from '@/ResponseHelper';
+import { ApplicationError, jsonParse } from 'n8n-workflow';
 import { getServiceProviderInstance } from './serviceProvider.ee';
 import type { SamlUserAttributes } from './types/samlUserAttributes';
 import { isSsoJustInTimeProvisioningEnabled } from '../ssoHelpers';
 import type { SamlPreferences } from './types/samlPreferences';
 import { SAML_PREFERENCES_DB_KEY } from './constants';
 import type { IdentityProviderInstance, ServiceProviderInstance } from 'samlify';
-import { IdentityProvider, setSchemaValidator } from 'samlify';
+import type { BindingContext, PostBindingContext } from 'samlify/types/src/entity';
 import {
 	createUserFromSamlAttributes,
 	getMappedSamlAttributesFromFlowResult,
 	getSamlLoginLabel,
+	isSamlLicensedAndEnabled,
 	isSamlLoginEnabled,
 	setSamlLoginEnabled,
 	setSamlLoginLabel,
@@ -24,14 +23,21 @@ import type { Settings } from '@db/entities/Settings';
 import axios from 'axios';
 import https from 'https';
 import type { SamlLoginBinding } from './types';
-import type { BindingContext, PostBindingContext } from 'samlify/types/src/entity';
 import { validateMetadata, validateResponse } from './samlValidator';
-import { getInstanceBaseUrl } from '@/UserManagement/UserManagementHelper';
+import { Logger } from '@/Logger';
+import { UserRepository } from '@db/repositories/user.repository';
+import { SettingsRepository } from '@db/repositories/settings.repository';
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
+import { AuthError } from '@/errors/response-errors/auth.error';
+import { UrlService } from '@/services/url.service';
 
 @Service()
 export class SamlService {
 	private identityProviderInstance: IdentityProviderInstance | undefined;
 
+	// eslint-disable-next-line @typescript-eslint/consistent-type-imports
+	private samlify: typeof import('samlify') | undefined;
+
 	private _samlPreferences: SamlPreferences = {
 		mapping: {
 			email: 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress',
@@ -49,7 +55,7 @@ export class SamlService {
 		loginLabel: 'SAML',
 		wantAssertionsSigned: true,
 		wantMessageSigned: true,
-		relayState: getInstanceBaseUrl(),
+		relayState: this.urlService.getInstanceBaseUrl(),
 		signatureConfig: {
 			prefix: 'ds',
 			location: {
@@ -67,21 +73,41 @@ export class SamlService {
 		};
 	}
 
+	constructor(
+		private readonly logger: Logger,
+		private readonly urlService: UrlService,
+	) {}
+
 	async init(): Promise<void> {
-		await this.loadFromDbAndApplySamlPreferences();
-		setSchemaValidator({
+		// load preferences first but do not apply so as to not load samlify unnecessarily
+		await this.loadFromDbAndApplySamlPreferences(false);
+		if (isSamlLicensedAndEnabled()) {
+			await this.loadSamlify();
+			await this.loadFromDbAndApplySamlPreferences(true);
+		}
+	}
+
+	async loadSamlify() {
+		if (this.samlify === undefined) {
+			this.logger.debug('Loading samlify library into memory');
+			this.samlify = await import('samlify');
+		}
+		this.samlify.setSchemaValidator({
 			validate: async (response: string) => {
 				const valid = await validateResponse(response);
 				if (!valid) {
-					throw new Error('Invalid SAML response');
+					throw new ApplicationError('Invalid SAML response');
 				}
 			},
 		});
 	}
 
 	getIdentityProviderInstance(forceRecreate = false): IdentityProviderInstance {
+		if (this.samlify === undefined) {
+			throw new ApplicationError('Samlify is not initialized');
+		}
 		if (this.identityProviderInstance === undefined || forceRecreate) {
-			this.identityProviderInstance = IdentityProvider({
+			this.identityProviderInstance = this.samlify.IdentityProvider({
 				metadata: this._samlPreferences.metadata,
 			});
 		}
@@ -90,16 +116,20 @@ export class SamlService {
 	}
 
 	getServiceProviderInstance(): ServiceProviderInstance {
-		return getServiceProviderInstance(this._samlPreferences);
+		if (this.samlify === undefined) {
+			throw new ApplicationError('Samlify is not initialized');
+		}
+		return getServiceProviderInstance(this._samlPreferences, this.samlify);
 	}
 
-	getLoginRequestUrl(
+	async getLoginRequestUrl(
 		relayState?: string,
 		binding?: SamlLoginBinding,
-	): {
+	): Promise<{
 		binding: SamlLoginBinding;
 		context: BindingContext | PostBindingContext;
-	} {
+	}> {
+		await this.loadSamlify();
 		if (binding === undefined) binding = this._samlPreferences.loginBinding ?? 'redirect';
 		if (binding === 'post') {
 			return {
@@ -116,22 +146,18 @@ export class SamlService {
 
 	private getRedirectLoginRequestUrl(relayState?: string): BindingContext {
 		const sp = this.getServiceProviderInstance();
-		sp.entitySetting.relayState = relayState ?? getInstanceBaseUrl();
+		sp.entitySetting.relayState = relayState ?? this.urlService.getInstanceBaseUrl();
 		const loginRequest = sp.createLoginRequest(this.getIdentityProviderInstance(), 'redirect');
-		//TODO:SAML: debug logging
-		LoggerProxy.debug(loginRequest.context);
 		return loginRequest;
 	}
 
 	private getPostLoginRequestUrl(relayState?: string): PostBindingContext {
 		const sp = this.getServiceProviderInstance();
-		sp.entitySetting.relayState = relayState ?? getInstanceBaseUrl();
+		sp.entitySetting.relayState = relayState ?? this.urlService.getInstanceBaseUrl();
 		const loginRequest = sp.createLoginRequest(
 			this.getIdentityProviderInstance(),
 			'post',
 		) as PostBindingContext;
-		//TODO:SAML: debug logging
-		LoggerProxy.debug(loginRequest.context);
 		return loginRequest;
 	}
 
@@ -145,9 +171,10 @@ export class SamlService {
 	}> {
 		const attributes = await this.getAttributesFromLoginResponse(req, binding);
 		if (attributes.email) {
-			const user = await Db.collections.User.findOne({
-				where: { email: attributes.email },
-				relations: ['globalRole', 'authIdentities'],
+			const lowerCasedEmail = attributes.email.toLowerCase();
+			const user = await Container.get(UserRepository).findOne({
+				where: { email: lowerCasedEmail },
+				relations: ['authIdentities'],
 			});
 			if (user) {
 				// Login path for existing users that are fully set up and that have a SAML authIdentity set up
@@ -191,6 +218,25 @@ export class SamlService {
 	}
 
 	async setSamlPreferences(prefs: SamlPreferences): Promise<SamlPreferences | undefined> {
+		await this.loadSamlify();
+		await this.loadPreferencesWithoutValidation(prefs);
+		if (prefs.metadataUrl) {
+			const fetchedMetadata = await this.fetchMetadataFromUrl();
+			if (fetchedMetadata) {
+				this._samlPreferences.metadata = fetchedMetadata;
+			}
+		} else if (prefs.metadata) {
+			const validationResult = await validateMetadata(prefs.metadata);
+			if (!validationResult) {
+				throw new ApplicationError('Invalid SAML metadata');
+			}
+		}
+		this.getIdentityProviderInstance(true);
+		const result = await this.saveSamlPreferencesToDb();
+		return result;
+	}
+
+	async loadPreferencesWithoutValidation(prefs: SamlPreferences) {
 		this._samlPreferences.loginBinding = prefs.loginBinding ?? this._samlPreferences.loginBinding;
 		this._samlPreferences.metadata = prefs.metadata ?? this._samlPreferences.metadata;
 		this._samlPreferences.mapping = prefs.mapping ?? this._samlPreferences.mapping;
@@ -206,32 +252,27 @@ export class SamlService {
 			prefs.wantMessageSigned ?? this._samlPreferences.wantMessageSigned;
 		if (prefs.metadataUrl) {
 			this._samlPreferences.metadataUrl = prefs.metadataUrl;
-			const fetchedMetadata = await this.fetchMetadataFromUrl();
-			if (fetchedMetadata) {
-				this._samlPreferences.metadata = fetchedMetadata;
-			}
 		} else if (prefs.metadata) {
-			const validationResult = await validateMetadata(prefs.metadata);
-			if (!validationResult) {
-				throw new Error('Invalid SAML metadata');
-			}
+			// remove metadataUrl if metadata is set directly
+			this._samlPreferences.metadataUrl = undefined;
 			this._samlPreferences.metadata = prefs.metadata;
 		}
 		await setSamlLoginEnabled(prefs.loginEnabled ?? isSamlLoginEnabled());
 		setSamlLoginLabel(prefs.loginLabel ?? getSamlLoginLabel());
-		this.getIdentityProviderInstance(true);
-		const result = await this.saveSamlPreferencesToDb();
-		return result;
 	}
 
-	async loadFromDbAndApplySamlPreferences(): Promise<SamlPreferences | undefined> {
-		const samlPreferences = await Db.collections.Settings.findOne({
+	async loadFromDbAndApplySamlPreferences(apply = true): Promise<SamlPreferences | undefined> {
+		const samlPreferences = await Container.get(SettingsRepository).findOne({
 			where: { key: SAML_PREFERENCES_DB_KEY },
 		});
 		if (samlPreferences) {
 			const prefs = jsonParse<SamlPreferences>(samlPreferences.value);
 			if (prefs) {
-				await this.setSamlPreferences(prefs);
+				if (apply) {
+					await this.setSamlPreferences(prefs);
+				} else {
+					await this.loadPreferencesWithoutValidation(prefs);
+				}
 				return prefs;
 			}
 		}
@@ -239,26 +280,32 @@ export class SamlService {
 	}
 
 	async saveSamlPreferencesToDb(): Promise<SamlPreferences | undefined> {
-		const samlPreferences = await Db.collections.Settings.findOne({
+		const samlPreferences = await Container.get(SettingsRepository).findOne({
 			where: { key: SAML_PREFERENCES_DB_KEY },
 		});
 		const settingsValue = JSON.stringify(this.samlPreferences);
 		let result: Settings;
 		if (samlPreferences) {
 			samlPreferences.value = settingsValue;
-			result = await Db.collections.Settings.save(samlPreferences);
-		} else {
-			result = await Db.collections.Settings.save({
-				key: SAML_PREFERENCES_DB_KEY,
-				value: settingsValue,
-				loadOnStartup: true,
+			result = await Container.get(SettingsRepository).save(samlPreferences, {
+				transaction: false,
 			});
+		} else {
+			result = await Container.get(SettingsRepository).save(
+				{
+					key: SAML_PREFERENCES_DB_KEY,
+					value: settingsValue,
+					loadOnStartup: true,
+				},
+				{ transaction: false },
+			);
 		}
 		if (result) return jsonParse<SamlPreferences>(result.value);
 		return;
 	}
 
 	async fetchMetadataFromUrl(): Promise<string | undefined> {
+		await this.loadSamlify();
 		if (!this._samlPreferences.metadataUrl)
 			throw new BadRequestError('Error fetching SAML Metadata, no Metadata URL set');
 		try {
@@ -279,7 +326,6 @@ export class SamlService {
 			}
 		} catch (error) {
 			throw new BadRequestError(
-				// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
 				`Error fetching SAML Metadata from ${this._samlPreferences.metadataUrl}: ${error}`,
 			);
 		}
@@ -294,6 +340,7 @@ export class SamlService {
 		if (!this._samlPreferences.mapping)
 			throw new BadRequestError('Error fetching SAML Attributes, no Attribute mapping set');
 		try {
+			await this.loadSamlify();
 			parsedSamlResponse = await this.getServiceProviderInstance().parseLoginResponse(
 				this.getIdentityProviderInstance(),
 				binding,
@@ -312,7 +359,7 @@ export class SamlService {
 		if (!attributes) {
 			throw new AuthError('SAML Authentication failed. Invalid SAML response.');
 		}
-		if (!attributes.email && missingAttributes.length > 0) {
+		if (missingAttributes.length > 0) {
 			throw new AuthError(
 				`SAML Authentication failed. Invalid SAML response (missing attributes: ${missingAttributes.join(
 					', ',
@@ -321,46 +368,4 @@ export class SamlService {
 		}
 		return attributes;
 	}
-
-	async testSamlConnection(): Promise<boolean> {
-		try {
-			// TODO:SAML: this will not work once axios is upgraded to > 1.2.0 (see checkServerIdentity)
-			const agent = new https.Agent({
-				rejectUnauthorized: !this._samlPreferences.ignoreSSL,
-			});
-			const requestContext = this.getLoginRequestUrl();
-			if (!requestContext) return false;
-			if (requestContext.binding === 'redirect') {
-				const fetchResult = await axios.get(requestContext.context.context, { httpsAgent: agent });
-				if (fetchResult.status !== 200) {
-					LoggerProxy.debug('SAML: Error while testing SAML connection.');
-					return false;
-				}
-			} else if (requestContext.binding === 'post') {
-				const context = requestContext.context as PostBindingContext;
-				const endpoint = context.entityEndpoint;
-				const params = new URLSearchParams();
-				params.append(context.type, context.context);
-				if (context.relayState) {
-					params.append('RelayState', context.relayState);
-				}
-				const fetchResult = await axios.post(endpoint, params, {
-					headers: {
-						// eslint-disable-next-line @typescript-eslint/naming-convention
-						'Content-type': 'application/x-www-form-urlencoded',
-					},
-					httpsAgent: agent,
-				});
-				if (fetchResult.status !== 200) {
-					LoggerProxy.debug('SAML: Error while testing SAML connection.');
-					return false;
-				}
-			}
-			return true;
-		} catch (error) {
-			// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-			LoggerProxy.debug('SAML: Error while testing SAML connection: ', error);
-		}
-		return false;
-	}
 }
diff --git a/packages/cli/src/sso/saml/samlHelpers.ts b/packages/cli/src/sso/saml/samlHelpers.ts
index 0672965deb8b0..e87d73ba708b3 100644
--- a/packages/cli/src/sso/saml/samlHelpers.ts
+++ b/packages/cli/src/sso/saml/samlHelpers.ts
@@ -1,12 +1,9 @@
 import { Container } from 'typedi';
 import config from '@/config';
-import * as Db from '@/Db';
 import { AuthIdentity } from '@db/entities/AuthIdentity';
 import { User } from '@db/entities/User';
-import { RoleRepository } from '@db/repositories';
 import { License } from '@/License';
-import { AuthError, InternalServerError } from '@/ResponseHelper';
-import { hashPassword, isUserManagementEnabled } from '@/UserManagement/UserManagementHelper';
+import { PasswordUtility } from '@/services/password.utility';
 import type { SamlPreferences } from './types/samlPreferences';
 import type { SamlUserAttributes } from './types/samlUserAttributes';
 import type { FlowResult } from 'samlify/types/src/flow';
@@ -20,6 +17,11 @@ import {
 } from '../ssoHelpers';
 import { getServiceProviderConfigTestReturnUrl } from './serviceProvider.ee';
 import type { SamlConfiguration } from './types/requests';
+import { UserRepository } from '@db/repositories/user.repository';
+import { AuthIdentityRepository } from '@db/repositories/authIdentity.repository';
+import { InternalServerError } from '@/errors/response-errors/internal-server.error';
+import { AuthError } from '@/errors/response-errors/auth.error';
+
 /**
  *  Check whether the SAML feature is licensed and enabled in the instance
  */
@@ -53,8 +55,7 @@ export function setSamlLoginLabel(label: string): void {
 }
 
 export function isSamlLicensed(): boolean {
-	const license = Container.get(License);
-	return isUserManagementEnabled() && license.isSamlEnabled();
+	return Container.get(License).isSamlEnabled();
 }
 
 export function isSamlLicensedAndEnabled(): boolean {
@@ -98,19 +99,22 @@ export function generatePassword(): string {
 export async function createUserFromSamlAttributes(attributes: SamlUserAttributes): Promise<User> {
 	const user = new User();
 	const authIdentity = new AuthIdentity();
-	user.email = attributes.email;
+	const lowerCasedEmail = attributes.email?.toLowerCase() ?? '';
+	user.email = lowerCasedEmail;
 	user.firstName = attributes.firstName;
 	user.lastName = attributes.lastName;
-	user.globalRole = await Container.get(RoleRepository).findGlobalMemberRoleOrFail();
+	user.role = 'global:member';
 	// generates a password that is not used or known to the user
-	user.password = await hashPassword(generatePassword());
+	user.password = await Container.get(PasswordUtility).hash(generatePassword());
 	authIdentity.providerId = attributes.userPrincipalName;
 	authIdentity.providerType = 'saml';
 	authIdentity.user = user;
-	const resultAuthIdentity = await Db.collections.AuthIdentity.save(authIdentity);
+	const resultAuthIdentity = await Container.get(AuthIdentityRepository).save(authIdentity, {
+		transaction: false,
+	});
 	if (!resultAuthIdentity) throw new AuthError('Could not create AuthIdentity');
 	user.authIdentities = [authIdentity];
-	const resultUser = await Db.collections.User.save(user);
+	const resultUser = await Container.get(UserRepository).save(user, { transaction: false });
 	if (!resultUser) throw new AuthError('Could not create User');
 	return resultUser;
 }
@@ -131,10 +135,10 @@ export async function updateUserFromSamlAttributes(
 	} else {
 		samlAuthIdentity.providerId = attributes.userPrincipalName;
 	}
-	await Db.collections.AuthIdentity.save(samlAuthIdentity);
+	await Container.get(AuthIdentityRepository).save(samlAuthIdentity, { transaction: false });
 	user.firstName = attributes.firstName;
 	user.lastName = attributes.lastName;
-	const resultUser = await Db.collections.User.save(user);
+	const resultUser = await Container.get(UserRepository).save(user, { transaction: false });
 	if (!resultUser) throw new AuthError('Could not create User');
 	return resultUser;
 }
diff --git a/packages/cli/src/sso/saml/samlValidator.ts b/packages/cli/src/sso/saml/samlValidator.ts
index 2eaa3505ae851..66be4c98e0bbb 100644
--- a/packages/cli/src/sso/saml/samlValidator.ts
+++ b/packages/cli/src/sso/saml/samlValidator.ts
@@ -1,46 +1,78 @@
-import { LoggerProxy } from 'n8n-workflow';
+import { Container } from 'typedi';
 import type { XMLFileInfo } from 'xmllint-wasm';
-import { validateXML } from 'xmllint-wasm';
-import { xsdSamlSchemaAssertion20 } from './schema/saml-schema-assertion-2.0.xsd';
-import { xsdSamlSchemaMetadata20 } from './schema/saml-schema-metadata-2.0.xsd';
-import { xsdSamlSchemaProtocol20 } from './schema/saml-schema-protocol-2.0.xsd';
-import { xsdXenc } from './schema/xenc-schema.xsd';
-import { xsdXml } from './schema/xml.xsd';
-import { xsdXmldsigCore } from './schema/xmldsig-core-schema.xsd';
+import { Logger } from '@/Logger';
 
-const xml: XMLFileInfo = {
-	fileName: 'xml.xsd',
-	contents: xsdXml,
-};
+let xml: XMLFileInfo;
+let xmldsigCore: XMLFileInfo;
+let xmlXenc: XMLFileInfo;
+let xmlMetadata: XMLFileInfo;
+let xmlAssertion: XMLFileInfo;
+let xmlProtocol: XMLFileInfo;
 
-const xmldsigCore: XMLFileInfo = {
-	fileName: 'xmldsig-core-schema.xsd',
-	contents: xsdXmldsigCore,
-};
+// eslint-disable-next-line @typescript-eslint/consistent-type-imports
+let xmllintWasm: typeof import('xmllint-wasm') | undefined;
 
-const xmlXenc: XMLFileInfo = {
-	fileName: 'xenc-schema.xsd',
-	contents: xsdXenc,
-};
-
-const xmlMetadata: XMLFileInfo = {
-	fileName: 'saml-schema-metadata-2.0.xsd',
-	contents: xsdSamlSchemaMetadata20,
-};
-
-const xmlAssertion: XMLFileInfo = {
-	fileName: 'saml-schema-assertion-2.0.xsd',
-	contents: xsdSamlSchemaAssertion20,
-};
+// dynamically load schema files
+async function loadSchemas(): Promise<void> {
+	if (!xml || xml.contents === '') {
+		Container.get(Logger).debug('Loading XML schema files for SAML validation into memory');
+		const f = await import('./schema/xml.xsd');
+		xml = {
+			fileName: 'xml.xsd',
+			contents: f.xsdXml,
+		};
+	}
+	if (!xmldsigCore || xmldsigCore.contents === '') {
+		const f = await import('./schema/xmldsig-core-schema.xsd');
+		xmldsigCore = {
+			fileName: 'xmldsig-core-schema.xsd',
+			contents: f.xsdXmldsigCore,
+		};
+	}
+	if (!xmlXenc || xmlXenc.contents === '') {
+		const f = await import('./schema/xenc-schema.xsd');
+		xmlXenc = {
+			fileName: 'xenc-schema.xsd',
+			contents: f.xsdXenc,
+		};
+	}
+	if (!xmlMetadata || xmlMetadata.contents === '') {
+		const f = await import('./schema/saml-schema-metadata-2.0.xsd');
+		xmlMetadata = {
+			fileName: 'saml-schema-metadata-2.0.xsd',
+			contents: f.xsdSamlSchemaMetadata20,
+		};
+	}
+	if (!xmlAssertion || xmlAssertion.contents === '') {
+		const f = await import('./schema/saml-schema-assertion-2.0.xsd');
+		xmlAssertion = {
+			fileName: 'saml-schema-assertion-2.0.xsd',
+			contents: f.xsdSamlSchemaAssertion20,
+		};
+	}
+	if (!xmlProtocol || xmlProtocol.contents === '') {
+		const f = await import('./schema/saml-schema-protocol-2.0.xsd');
+		xmlProtocol = {
+			fileName: 'saml-schema-protocol-2.0.xsd',
+			contents: f.xsdSamlSchemaProtocol20,
+		};
+	}
+}
 
-const xmlProtocol: XMLFileInfo = {
-	fileName: 'saml-schema-protocol-2.0.xsd',
-	contents: xsdSamlSchemaProtocol20,
-};
+// dynamically load xmllint-wasm
+async function loadXmllintWasm(): Promise<void> {
+	if (xmllintWasm === undefined) {
+		Container.get(Logger).debug('Loading xmllint-wasm library into memory');
+		xmllintWasm = await import('xmllint-wasm');
+	}
+}
 
 export async function validateMetadata(metadata: string): Promise<boolean> {
+	const logger = Container.get(Logger);
 	try {
-		const validationResult = await validateXML({
+		await loadXmllintWasm();
+		await loadSchemas();
+		const validationResult = await xmllintWasm?.validateXML({
 			xml: [
 				{
 					fileName: 'metadata.xml',
@@ -51,23 +83,32 @@ export async function validateMetadata(metadata: string): Promise<boolean> {
 			schema: [xmlMetadata],
 			preload: [xmlProtocol, xmlAssertion, xmldsigCore, xmlXenc, xml],
 		});
-		if (validationResult.valid) {
-			LoggerProxy.debug('SAML Metadata is valid');
+		if (validationResult?.valid) {
+			logger.debug('SAML Metadata is valid');
 			return true;
 		} else {
-			LoggerProxy.warn('SAML Validate Metadata: Invalid metadata');
-			LoggerProxy.warn(validationResult.errors.join('\n'));
+			logger.warn('SAML Validate Metadata: Invalid metadata');
+			logger.warn(
+				validationResult
+					? validationResult.errors
+							.map((error) => `${error.message} - ${error.rawMessage}`)
+							.join('\n')
+					: '',
+			);
 		}
 	} catch (error) {
 		// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-		LoggerProxy.warn(error);
+		logger.warn(error);
 	}
 	return false;
 }
 
 export async function validateResponse(response: string): Promise<boolean> {
+	const logger = Container.get(Logger);
 	try {
-		const validationResult = await validateXML({
+		await loadXmllintWasm();
+		await loadSchemas();
+		const validationResult = await xmllintWasm?.validateXML({
 			xml: [
 				{
 					fileName: 'response.xml',
@@ -78,16 +119,22 @@ export async function validateResponse(response: string): Promise<boolean> {
 			schema: [xmlProtocol],
 			preload: [xmlMetadata, xmlAssertion, xmldsigCore, xmlXenc, xml],
 		});
-		if (validationResult.valid) {
-			LoggerProxy.debug('SAML Response is valid');
+		if (validationResult?.valid) {
+			logger.debug('SAML Response is valid');
 			return true;
 		} else {
-			LoggerProxy.warn('SAML Validate Response: Failed');
-			LoggerProxy.warn(validationResult.errors.join('\n'));
+			logger.warn('SAML Validate Response: Failed');
+			logger.warn(
+				validationResult
+					? validationResult.errors
+							.map((error) => `${error.message} - ${error.rawMessage}`)
+							.join('\n')
+					: '',
+			);
 		}
 	} catch (error) {
 		// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-		LoggerProxy.warn(error);
+		logger.warn(error);
 	}
 	return false;
 }
diff --git a/packages/cli/src/sso/saml/schema/saml-schema-assertion-2.0.xsd.ts b/packages/cli/src/sso/saml/schema/saml-schema-assertion-2.0.xsd.ts
index ff8d93c98988f..5000484753794 100644
--- a/packages/cli/src/sso/saml/schema/saml-schema-assertion-2.0.xsd.ts
+++ b/packages/cli/src/sso/saml/schema/saml-schema-assertion-2.0.xsd.ts
@@ -1,283 +1,283 @@
-export const xsdSamlSchemaAssertion20 = `<?xml version="1.0" encoding="US-ASCII"?>
-<schema
-    targetNamespace="urn:oasis:names:tc:SAML:2.0:assertion"
-    xmlns="http://www.w3.org/2001/XMLSchema"
-    xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
-    xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-    xmlns:xenc="http://www.w3.org/2001/04/xmlenc#"
-    elementFormDefault="unqualified"
-    attributeFormDefault="unqualified"
-    blockDefault="substitution"
-    version="2.0">
-    <import namespace="http://www.w3.org/2000/09/xmldsig#"
-        schemaLocation="xmldsig-core-schema.xsd"/>
-    <import namespace="http://www.w3.org/2001/04/xmlenc#"
-        schemaLocation="xenc-schema.xsd"/>
-    <annotation>
-        <documentation>
-            Document identifier: saml-schema-assertion-2.0
-            Location: http://docs.oasis-open.org/security/saml/v2.0/
-            Revision history:
-            V1.0 (November, 2002):
-              Initial Standard Schema.
-            V1.1 (September, 2003):
-              Updates within the same V1.0 namespace.
-            V2.0 (March, 2005):
-              New assertion schema for SAML V2.0 namespace.
-        </documentation>
-    </annotation>
-    <attributeGroup name="IDNameQualifiers">
-        <attribute name="NameQualifier" type="string" use="optional"/>
-        <attribute name="SPNameQualifier" type="string" use="optional"/>
-    </attributeGroup>
-    <element name="BaseID" type="saml:BaseIDAbstractType"/>
-    <complexType name="BaseIDAbstractType" abstract="true">
-        <attributeGroup ref="saml:IDNameQualifiers"/>
-    </complexType>
-    <element name="NameID" type="saml:NameIDType"/>
-    <complexType name="NameIDType">
-        <simpleContent>
-            <extension base="string">
-                <attributeGroup ref="saml:IDNameQualifiers"/>
-                <attribute name="Format" type="anyURI" use="optional"/>
-                <attribute name="SPProvidedID" type="string" use="optional"/>
-            </extension>
-        </simpleContent>
-    </complexType>
-    <complexType name="EncryptedElementType">
-        <sequence>
-            <element ref="xenc:EncryptedData"/>
-            <element ref="xenc:EncryptedKey" minOccurs="0" maxOccurs="unbounded"/>
-        </sequence>
-    </complexType>
-    <element name="EncryptedID" type="saml:EncryptedElementType"/>
-    <element name="Issuer" type="saml:NameIDType"/>
-    <element name="AssertionIDRef" type="NCName"/>
-    <element name="AssertionURIRef" type="anyURI"/>
-    <element name="Assertion" type="saml:AssertionType"/>
-    <complexType name="AssertionType">
-        <sequence>
-            <element ref="saml:Issuer"/>
-            <element ref="ds:Signature" minOccurs="0"/>
-            <element ref="saml:Subject" minOccurs="0"/>
-            <element ref="saml:Conditions" minOccurs="0"/>
-            <element ref="saml:Advice" minOccurs="0"/>
-            <choice minOccurs="0" maxOccurs="unbounded">
-                <element ref="saml:Statement"/>
-                <element ref="saml:AuthnStatement"/>
-                <element ref="saml:AuthzDecisionStatement"/>
-                <element ref="saml:AttributeStatement"/>
-            </choice>
-        </sequence>
-        <attribute name="Version" type="string" use="required"/>
-        <attribute name="ID" type="ID" use="required"/>
-        <attribute name="IssueInstant" type="dateTime" use="required"/>
-    </complexType>
-    <element name="Subject" type="saml:SubjectType"/>
-    <complexType name="SubjectType">
-        <choice>
-            <sequence>
-                <choice>
-                    <element ref="saml:BaseID"/>
-                    <element ref="saml:NameID"/>
-                    <element ref="saml:EncryptedID"/>
-                </choice>
-                <element ref="saml:SubjectConfirmation" minOccurs="0" maxOccurs="unbounded"/>
-            </sequence>
-            <element ref="saml:SubjectConfirmation" maxOccurs="unbounded"/>
-        </choice>
-    </complexType>
-    <element name="SubjectConfirmation" type="saml:SubjectConfirmationType"/>
-    <complexType name="SubjectConfirmationType">
-        <sequence>
-            <choice minOccurs="0">
-                <element ref="saml:BaseID"/>
-                <element ref="saml:NameID"/>
-                <element ref="saml:EncryptedID"/>
-            </choice>
-            <element ref="saml:SubjectConfirmationData" minOccurs="0"/>
-        </sequence>
-        <attribute name="Method" type="anyURI" use="required"/>
-    </complexType>
-    <element name="SubjectConfirmationData" type="saml:SubjectConfirmationDataType"/>
-    <complexType name="SubjectConfirmationDataType" mixed="true">
-        <complexContent>
-            <restriction base="anyType">
-                <sequence>
-                    <any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="NotBefore" type="dateTime" use="optional"/>
-                <attribute name="NotOnOrAfter" type="dateTime" use="optional"/>
-                <attribute name="Recipient" type="anyURI" use="optional"/>
-                <attribute name="InResponseTo" type="NCName" use="optional"/>
-                <attribute name="Address" type="string" use="optional"/>
-                <anyAttribute namespace="##other" processContents="lax"/>
-            </restriction>
-        </complexContent>
-    </complexType>
-    <complexType name="KeyInfoConfirmationDataType" mixed="false">
-        <complexContent>
-            <restriction base="saml:SubjectConfirmationDataType">
-                <sequence>
-                    <element ref="ds:KeyInfo" maxOccurs="unbounded"/>
-                </sequence>
-            </restriction>
-        </complexContent>
-    </complexType>
-    <element name="Conditions" type="saml:ConditionsType"/>
-    <complexType name="ConditionsType">
-        <choice minOccurs="0" maxOccurs="unbounded">
-            <element ref="saml:Condition"/>
-            <element ref="saml:AudienceRestriction"/>
-            <element ref="saml:OneTimeUse"/>
-            <element ref="saml:ProxyRestriction"/>
-        </choice>
-        <attribute name="NotBefore" type="dateTime" use="optional"/>
-        <attribute name="NotOnOrAfter" type="dateTime" use="optional"/>
-    </complexType>
-    <element name="Condition" type="saml:ConditionAbstractType"/>
-    <complexType name="ConditionAbstractType" abstract="true"/>
-    <element name="AudienceRestriction" type="saml:AudienceRestrictionType"/>
-    <complexType name="AudienceRestrictionType">
-        <complexContent>
-            <extension base="saml:ConditionAbstractType">
-                <sequence>
-                    <element ref="saml:Audience" maxOccurs="unbounded"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-    <element name="Audience" type="anyURI"/>
-    <element name="OneTimeUse" type="saml:OneTimeUseType" />
-    <complexType name="OneTimeUseType">
-        <complexContent>
-            <extension base="saml:ConditionAbstractType"/>
-        </complexContent>
-    </complexType>
-    <element name="ProxyRestriction" type="saml:ProxyRestrictionType"/>
-    <complexType name="ProxyRestrictionType">
-    <complexContent>
-        <extension base="saml:ConditionAbstractType">
-            <sequence>
-                <element ref="saml:Audience" minOccurs="0" maxOccurs="unbounded"/>
-            </sequence>
-            <attribute name="Count" type="nonNegativeInteger" use="optional"/>
-        </extension>
-	</complexContent>
-    </complexType>
-    <element name="Advice" type="saml:AdviceType"/>
-    <complexType name="AdviceType">
-        <choice minOccurs="0" maxOccurs="unbounded">
-            <element ref="saml:AssertionIDRef"/>
-            <element ref="saml:AssertionURIRef"/>
-            <element ref="saml:Assertion"/>
-            <element ref="saml:EncryptedAssertion"/>
-            <any namespace="##other" processContents="lax"/>
-        </choice>
-    </complexType>
-    <element name="EncryptedAssertion" type="saml:EncryptedElementType"/>
-    <element name="Statement" type="saml:StatementAbstractType"/>
-    <complexType name="StatementAbstractType" abstract="true"/>
-    <element name="AuthnStatement" type="saml:AuthnStatementType"/>
-    <complexType name="AuthnStatementType">
-        <complexContent>
-            <extension base="saml:StatementAbstractType">
-                <sequence>
-                    <element ref="saml:SubjectLocality" minOccurs="0"/>
-                    <element ref="saml:AuthnContext"/>
-                </sequence>
-                <attribute name="AuthnInstant" type="dateTime" use="required"/>
-                <attribute name="SessionIndex" type="string" use="optional"/>
-                <attribute name="SessionNotOnOrAfter" type="dateTime" use="optional"/>
-            </extension>
-        </complexContent>
-    </complexType>
-    <element name="SubjectLocality" type="saml:SubjectLocalityType"/>
-    <complexType name="SubjectLocalityType">
-        <attribute name="Address" type="string" use="optional"/>
-        <attribute name="DNSName" type="string" use="optional"/>
-    </complexType>
-    <element name="AuthnContext" type="saml:AuthnContextType"/>
-    <complexType name="AuthnContextType">
-        <sequence>
-            <choice>
-                <sequence>
-                    <element ref="saml:AuthnContextClassRef"/>
-                    <choice minOccurs="0">
-                        <element ref="saml:AuthnContextDecl"/>
-                        <element ref="saml:AuthnContextDeclRef"/>
-                    </choice>
-                </sequence>
-                <choice>
-                    <element ref="saml:AuthnContextDecl"/>
-                    <element ref="saml:AuthnContextDeclRef"/>
-                </choice>
-            </choice>
-            <element ref="saml:AuthenticatingAuthority" minOccurs="0" maxOccurs="unbounded"/>
-        </sequence>
-    </complexType>
-    <element name="AuthnContextClassRef" type="anyURI"/>
-    <element name="AuthnContextDeclRef" type="anyURI"/>
-    <element name="AuthnContextDecl" type="anyType"/>
-    <element name="AuthenticatingAuthority" type="anyURI"/>
-    <element name="AuthzDecisionStatement" type="saml:AuthzDecisionStatementType"/>
-    <complexType name="AuthzDecisionStatementType">
-        <complexContent>
-            <extension base="saml:StatementAbstractType">
-                <sequence>
-                    <element ref="saml:Action" maxOccurs="unbounded"/>
-                    <element ref="saml:Evidence" minOccurs="0"/>
-                </sequence>
-                <attribute name="Resource" type="anyURI" use="required"/>
-                <attribute name="Decision" type="saml:DecisionType" use="required"/>
-            </extension>
-        </complexContent>
-    </complexType>
-    <simpleType name="DecisionType">
-        <restriction base="string">
-            <enumeration value="Permit"/>
-            <enumeration value="Deny"/>
-            <enumeration value="Indeterminate"/>
-        </restriction>
-    </simpleType>
-    <element name="Action" type="saml:ActionType"/>
-    <complexType name="ActionType">
-        <simpleContent>
-            <extension base="string">
-                <attribute name="Namespace" type="anyURI" use="required"/>
-            </extension>
-        </simpleContent>
-    </complexType>
-    <element name="Evidence" type="saml:EvidenceType"/>
-    <complexType name="EvidenceType">
-        <choice maxOccurs="unbounded">
-            <element ref="saml:AssertionIDRef"/>
-            <element ref="saml:AssertionURIRef"/>
-            <element ref="saml:Assertion"/>
-            <element ref="saml:EncryptedAssertion"/>
-        </choice>
-    </complexType>
-    <element name="AttributeStatement" type="saml:AttributeStatementType"/>
-    <complexType name="AttributeStatementType">
-        <complexContent>
-            <extension base="saml:StatementAbstractType">
-                <choice maxOccurs="unbounded">
-                    <element ref="saml:Attribute"/>
-                    <element ref="saml:EncryptedAttribute"/>
-                </choice>
-            </extension>
-        </complexContent>
-    </complexType>
-    <element name="Attribute" type="saml:AttributeType"/>
-    <complexType name="AttributeType">
-        <sequence>
-            <element ref="saml:AttributeValue" minOccurs="0" maxOccurs="unbounded"/>
-        </sequence>
-        <attribute name="Name" type="string" use="required"/>
-        <attribute name="NameFormat" type="anyURI" use="optional"/>
-        <attribute name="FriendlyName" type="string" use="optional"/>
-        <anyAttribute namespace="##other" processContents="lax"/>
-    </complexType>
-    <element name="AttributeValue" type="anyType" nillable="true"/>
-    <element name="EncryptedAttribute" type="saml:EncryptedElementType"/>
-</schema>`;
+export const xsdSamlSchemaAssertion20 = `<?xml version="1.0" encoding="US-ASCII"?>
+<schema
+    targetNamespace="urn:oasis:names:tc:SAML:2.0:assertion"
+    xmlns="http://www.w3.org/2001/XMLSchema"
+    xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
+    xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
+    xmlns:xenc="http://www.w3.org/2001/04/xmlenc#"
+    elementFormDefault="unqualified"
+    attributeFormDefault="unqualified"
+    blockDefault="substitution"
+    version="2.0">
+    <import namespace="http://www.w3.org/2000/09/xmldsig#"
+        schemaLocation="xmldsig-core-schema.xsd"/>
+    <import namespace="http://www.w3.org/2001/04/xmlenc#"
+        schemaLocation="xenc-schema.xsd"/>
+    <annotation>
+        <documentation>
+            Document identifier: saml-schema-assertion-2.0
+            Location: http://docs.oasis-open.org/security/saml/v2.0/
+            Revision history:
+            V1.0 (November, 2002):
+              Initial Standard Schema.
+            V1.1 (September, 2003):
+              Updates within the same V1.0 namespace.
+            V2.0 (March, 2005):
+              New assertion schema for SAML V2.0 namespace.
+        </documentation>
+    </annotation>
+    <attributeGroup name="IDNameQualifiers">
+        <attribute name="NameQualifier" type="string" use="optional"/>
+        <attribute name="SPNameQualifier" type="string" use="optional"/>
+    </attributeGroup>
+    <element name="BaseID" type="saml:BaseIDAbstractType"/>
+    <complexType name="BaseIDAbstractType" abstract="true">
+        <attributeGroup ref="saml:IDNameQualifiers"/>
+    </complexType>
+    <element name="NameID" type="saml:NameIDType"/>
+    <complexType name="NameIDType">
+        <simpleContent>
+            <extension base="string">
+                <attributeGroup ref="saml:IDNameQualifiers"/>
+                <attribute name="Format" type="anyURI" use="optional"/>
+                <attribute name="SPProvidedID" type="string" use="optional"/>
+            </extension>
+        </simpleContent>
+    </complexType>
+    <complexType name="EncryptedElementType">
+        <sequence>
+            <element ref="xenc:EncryptedData"/>
+            <element ref="xenc:EncryptedKey" minOccurs="0" maxOccurs="unbounded"/>
+        </sequence>
+    </complexType>
+    <element name="EncryptedID" type="saml:EncryptedElementType"/>
+    <element name="Issuer" type="saml:NameIDType"/>
+    <element name="AssertionIDRef" type="NCName"/>
+    <element name="AssertionURIRef" type="anyURI"/>
+    <element name="Assertion" type="saml:AssertionType"/>
+    <complexType name="AssertionType">
+        <sequence>
+            <element ref="saml:Issuer"/>
+            <element ref="ds:Signature" minOccurs="0"/>
+            <element ref="saml:Subject" minOccurs="0"/>
+            <element ref="saml:Conditions" minOccurs="0"/>
+            <element ref="saml:Advice" minOccurs="0"/>
+            <choice minOccurs="0" maxOccurs="unbounded">
+                <element ref="saml:Statement"/>
+                <element ref="saml:AuthnStatement"/>
+                <element ref="saml:AuthzDecisionStatement"/>
+                <element ref="saml:AttributeStatement"/>
+            </choice>
+        </sequence>
+        <attribute name="Version" type="string" use="required"/>
+        <attribute name="ID" type="ID" use="required"/>
+        <attribute name="IssueInstant" type="dateTime" use="required"/>
+    </complexType>
+    <element name="Subject" type="saml:SubjectType"/>
+    <complexType name="SubjectType">
+        <choice>
+            <sequence>
+                <choice>
+                    <element ref="saml:BaseID"/>
+                    <element ref="saml:NameID"/>
+                    <element ref="saml:EncryptedID"/>
+                </choice>
+                <element ref="saml:SubjectConfirmation" minOccurs="0" maxOccurs="unbounded"/>
+            </sequence>
+            <element ref="saml:SubjectConfirmation" maxOccurs="unbounded"/>
+        </choice>
+    </complexType>
+    <element name="SubjectConfirmation" type="saml:SubjectConfirmationType"/>
+    <complexType name="SubjectConfirmationType">
+        <sequence>
+            <choice minOccurs="0">
+                <element ref="saml:BaseID"/>
+                <element ref="saml:NameID"/>
+                <element ref="saml:EncryptedID"/>
+            </choice>
+            <element ref="saml:SubjectConfirmationData" minOccurs="0"/>
+        </sequence>
+        <attribute name="Method" type="anyURI" use="required"/>
+    </complexType>
+    <element name="SubjectConfirmationData" type="saml:SubjectConfirmationDataType"/>
+    <complexType name="SubjectConfirmationDataType" mixed="true">
+        <complexContent>
+            <restriction base="anyType">
+                <sequence>
+                    <any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+                </sequence>
+                <attribute name="NotBefore" type="dateTime" use="optional"/>
+                <attribute name="NotOnOrAfter" type="dateTime" use="optional"/>
+                <attribute name="Recipient" type="anyURI" use="optional"/>
+                <attribute name="InResponseTo" type="NCName" use="optional"/>
+                <attribute name="Address" type="string" use="optional"/>
+                <anyAttribute namespace="##other" processContents="lax"/>
+            </restriction>
+        </complexContent>
+    </complexType>
+    <complexType name="KeyInfoConfirmationDataType" mixed="false">
+        <complexContent>
+            <restriction base="saml:SubjectConfirmationDataType">
+                <sequence>
+                    <element ref="ds:KeyInfo" maxOccurs="unbounded"/>
+                </sequence>
+            </restriction>
+        </complexContent>
+    </complexType>
+    <element name="Conditions" type="saml:ConditionsType"/>
+    <complexType name="ConditionsType">
+        <choice minOccurs="0" maxOccurs="unbounded">
+            <element ref="saml:Condition"/>
+            <element ref="saml:AudienceRestriction"/>
+            <element ref="saml:OneTimeUse"/>
+            <element ref="saml:ProxyRestriction"/>
+        </choice>
+        <attribute name="NotBefore" type="dateTime" use="optional"/>
+        <attribute name="NotOnOrAfter" type="dateTime" use="optional"/>
+    </complexType>
+    <element name="Condition" type="saml:ConditionAbstractType"/>
+    <complexType name="ConditionAbstractType" abstract="true"/>
+    <element name="AudienceRestriction" type="saml:AudienceRestrictionType"/>
+    <complexType name="AudienceRestrictionType">
+        <complexContent>
+            <extension base="saml:ConditionAbstractType">
+                <sequence>
+                    <element ref="saml:Audience" maxOccurs="unbounded"/>
+                </sequence>
+            </extension>
+        </complexContent>
+    </complexType>
+    <element name="Audience" type="anyURI"/>
+    <element name="OneTimeUse" type="saml:OneTimeUseType" />
+    <complexType name="OneTimeUseType">
+        <complexContent>
+            <extension base="saml:ConditionAbstractType"/>
+        </complexContent>
+    </complexType>
+    <element name="ProxyRestriction" type="saml:ProxyRestrictionType"/>
+    <complexType name="ProxyRestrictionType">
+    <complexContent>
+        <extension base="saml:ConditionAbstractType">
+            <sequence>
+                <element ref="saml:Audience" minOccurs="0" maxOccurs="unbounded"/>
+            </sequence>
+            <attribute name="Count" type="nonNegativeInteger" use="optional"/>
+        </extension>
+	</complexContent>
+    </complexType>
+    <element name="Advice" type="saml:AdviceType"/>
+    <complexType name="AdviceType">
+        <choice minOccurs="0" maxOccurs="unbounded">
+            <element ref="saml:AssertionIDRef"/>
+            <element ref="saml:AssertionURIRef"/>
+            <element ref="saml:Assertion"/>
+            <element ref="saml:EncryptedAssertion"/>
+            <any namespace="##other" processContents="lax"/>
+        </choice>
+    </complexType>
+    <element name="EncryptedAssertion" type="saml:EncryptedElementType"/>
+    <element name="Statement" type="saml:StatementAbstractType"/>
+    <complexType name="StatementAbstractType" abstract="true"/>
+    <element name="AuthnStatement" type="saml:AuthnStatementType"/>
+    <complexType name="AuthnStatementType">
+        <complexContent>
+            <extension base="saml:StatementAbstractType">
+                <sequence>
+                    <element ref="saml:SubjectLocality" minOccurs="0"/>
+                    <element ref="saml:AuthnContext"/>
+                </sequence>
+                <attribute name="AuthnInstant" type="dateTime" use="required"/>
+                <attribute name="SessionIndex" type="string" use="optional"/>
+                <attribute name="SessionNotOnOrAfter" type="dateTime" use="optional"/>
+            </extension>
+        </complexContent>
+    </complexType>
+    <element name="SubjectLocality" type="saml:SubjectLocalityType"/>
+    <complexType name="SubjectLocalityType">
+        <attribute name="Address" type="string" use="optional"/>
+        <attribute name="DNSName" type="string" use="optional"/>
+    </complexType>
+    <element name="AuthnContext" type="saml:AuthnContextType"/>
+    <complexType name="AuthnContextType">
+        <sequence>
+            <choice>
+                <sequence>
+                    <element ref="saml:AuthnContextClassRef"/>
+                    <choice minOccurs="0">
+                        <element ref="saml:AuthnContextDecl"/>
+                        <element ref="saml:AuthnContextDeclRef"/>
+                    </choice>
+                </sequence>
+                <choice>
+                    <element ref="saml:AuthnContextDecl"/>
+                    <element ref="saml:AuthnContextDeclRef"/>
+                </choice>
+            </choice>
+            <element ref="saml:AuthenticatingAuthority" minOccurs="0" maxOccurs="unbounded"/>
+        </sequence>
+    </complexType>
+    <element name="AuthnContextClassRef" type="anyURI"/>
+    <element name="AuthnContextDeclRef" type="anyURI"/>
+    <element name="AuthnContextDecl" type="anyType"/>
+    <element name="AuthenticatingAuthority" type="anyURI"/>
+    <element name="AuthzDecisionStatement" type="saml:AuthzDecisionStatementType"/>
+    <complexType name="AuthzDecisionStatementType">
+        <complexContent>
+            <extension base="saml:StatementAbstractType">
+                <sequence>
+                    <element ref="saml:Action" maxOccurs="unbounded"/>
+                    <element ref="saml:Evidence" minOccurs="0"/>
+                </sequence>
+                <attribute name="Resource" type="anyURI" use="required"/>
+                <attribute name="Decision" type="saml:DecisionType" use="required"/>
+            </extension>
+        </complexContent>
+    </complexType>
+    <simpleType name="DecisionType">
+        <restriction base="string">
+            <enumeration value="Permit"/>
+            <enumeration value="Deny"/>
+            <enumeration value="Indeterminate"/>
+        </restriction>
+    </simpleType>
+    <element name="Action" type="saml:ActionType"/>
+    <complexType name="ActionType">
+        <simpleContent>
+            <extension base="string">
+                <attribute name="Namespace" type="anyURI" use="required"/>
+            </extension>
+        </simpleContent>
+    </complexType>
+    <element name="Evidence" type="saml:EvidenceType"/>
+    <complexType name="EvidenceType">
+        <choice maxOccurs="unbounded">
+            <element ref="saml:AssertionIDRef"/>
+            <element ref="saml:AssertionURIRef"/>
+            <element ref="saml:Assertion"/>
+            <element ref="saml:EncryptedAssertion"/>
+        </choice>
+    </complexType>
+    <element name="AttributeStatement" type="saml:AttributeStatementType"/>
+    <complexType name="AttributeStatementType">
+        <complexContent>
+            <extension base="saml:StatementAbstractType">
+                <choice maxOccurs="unbounded">
+                    <element ref="saml:Attribute"/>
+                    <element ref="saml:EncryptedAttribute"/>
+                </choice>
+            </extension>
+        </complexContent>
+    </complexType>
+    <element name="Attribute" type="saml:AttributeType"/>
+    <complexType name="AttributeType">
+        <sequence>
+            <element ref="saml:AttributeValue" minOccurs="0" maxOccurs="unbounded"/>
+        </sequence>
+        <attribute name="Name" type="string" use="required"/>
+        <attribute name="NameFormat" type="anyURI" use="optional"/>
+        <attribute name="FriendlyName" type="string" use="optional"/>
+        <anyAttribute namespace="##other" processContents="lax"/>
+    </complexType>
+    <element name="AttributeValue" type="anyType" nillable="true"/>
+    <element name="EncryptedAttribute" type="saml:EncryptedElementType"/>
+</schema>`;
diff --git a/packages/cli/src/sso/saml/schema/saml-schema-metadata-2.0.xsd.ts b/packages/cli/src/sso/saml/schema/saml-schema-metadata-2.0.xsd.ts
index 664168ef9398c..6ed44930af90c 100644
--- a/packages/cli/src/sso/saml/schema/saml-schema-metadata-2.0.xsd.ts
+++ b/packages/cli/src/sso/saml/schema/saml-schema-metadata-2.0.xsd.ts
@@ -1,336 +1,336 @@
-export const xsdSamlSchemaMetadata20 = `<?xml version="1.0" encoding="UTF-8"?>
-<schema
-    targetNamespace="urn:oasis:names:tc:SAML:2.0:metadata"
-    xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
-    xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-    xmlns:xenc="http://www.w3.org/2001/04/xmlenc#"
-    xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
-    xmlns="http://www.w3.org/2001/XMLSchema"
-    elementFormDefault="unqualified"
-    attributeFormDefault="unqualified"
-    blockDefault="substitution"
-    version="2.0">
-    <import namespace="http://www.w3.org/2000/09/xmldsig#"
-        schemaLocation="xmldsig-core-schema.xsd"/>
-    <import namespace="http://www.w3.org/2001/04/xmlenc#"
-        schemaLocation="xenc-schema.xsd"/>
-    <import namespace="urn:oasis:names:tc:SAML:2.0:assertion"
-        schemaLocation="saml-schema-assertion-2.0.xsd"/>
-    <import namespace="http://www.w3.org/XML/1998/namespace"
-        schemaLocation="xml.xsd"/>
-    <annotation>
-        <documentation>
-            Document identifier: saml-schema-metadata-2.0
-            Location: http://docs.oasis-open.org/security/saml/v2.0/
-            Revision history:
-              V2.0 (March, 2005):
-                Schema for SAML metadata, first published in SAML 2.0.
-        </documentation>
-    </annotation>
-
-    <simpleType name="entityIDType">
-        <restriction base="anyURI">
-            <maxLength value="1024"/>
-        </restriction>
-    </simpleType>
-    <complexType name="localizedNameType">
-        <simpleContent>
-            <extension base="string">
-                <attribute ref="xml:lang" use="required"/>
-            </extension>
-        </simpleContent>
-    </complexType>
-    <complexType name="localizedURIType">
-        <simpleContent>
-            <extension base="anyURI">
-                <attribute ref="xml:lang" use="required"/>
-            </extension>
-        </simpleContent>
-    </complexType>
-    
-    <element name="Extensions" type="md:ExtensionsType"/>
-    <complexType final="#all" name="ExtensionsType">
-        <sequence>
-            <any namespace="##other" processContents="lax" maxOccurs="unbounded"/>
-        </sequence>
-    </complexType>
-    
-    <complexType name="EndpointType">
-        <sequence>
-            <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-        </sequence>
-        <attribute name="Binding" type="anyURI" use="required"/>
-        <attribute name="Location" type="anyURI" use="required"/>
-        <attribute name="ResponseLocation" type="anyURI" use="optional"/>
-        <anyAttribute namespace="##other" processContents="lax"/>
-    </complexType>
-    
-    <complexType name="IndexedEndpointType">
-        <complexContent>
-            <extension base="md:EndpointType">
-                <attribute name="index" type="unsignedShort" use="required"/>
-                <attribute name="isDefault" type="boolean" use="optional"/>
-            </extension>
-        </complexContent>
-    </complexType>
-    
-    <element name="EntitiesDescriptor" type="md:EntitiesDescriptorType"/>
-    <complexType name="EntitiesDescriptorType">
-        <sequence>
-            <element ref="ds:Signature" minOccurs="0"/>
-            <element ref="md:Extensions" minOccurs="0"/>
-            <choice minOccurs="1" maxOccurs="unbounded">
-                <element ref="md:EntityDescriptor"/>
-                <element ref="md:EntitiesDescriptor"/>
-            </choice>
-        </sequence>
-        <attribute name="validUntil" type="dateTime" use="optional"/>
-        <attribute name="cacheDuration" type="duration" use="optional"/>
-        <attribute name="ID" type="ID" use="optional"/>
-        <attribute name="Name" type="string" use="optional"/>
-    </complexType>
-
-    <element name="EntityDescriptor" type="md:EntityDescriptorType"/>
-    <complexType name="EntityDescriptorType">
-        <sequence>
-            <element ref="ds:Signature" minOccurs="0"/>
-            <element ref="md:Extensions" minOccurs="0"/>
-            <choice>
-                <choice maxOccurs="unbounded">
-                    <element ref="md:RoleDescriptor"/>
-                    <element ref="md:IDPSSODescriptor"/>
-                    <element ref="md:SPSSODescriptor"/>
-                    <element ref="md:AuthnAuthorityDescriptor"/>
-                    <element ref="md:AttributeAuthorityDescriptor"/>
-                    <element ref="md:PDPDescriptor"/>
-                </choice>
-                <element ref="md:AffiliationDescriptor"/>
-            </choice>
-            <element ref="md:Organization" minOccurs="0"/>
-            <element ref="md:ContactPerson" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="md:AdditionalMetadataLocation" minOccurs="0" maxOccurs="unbounded"/>
-        </sequence>
-        <attribute name="entityID" type="md:entityIDType" use="required"/>
-        <attribute name="validUntil" type="dateTime" use="optional"/>
-        <attribute name="cacheDuration" type="duration" use="optional"/>
-        <attribute name="ID" type="ID" use="optional"/>
-        <anyAttribute namespace="##other" processContents="lax"/>
-    </complexType>
-    
-    <element name="Organization" type="md:OrganizationType"/>
-    <complexType name="OrganizationType">
-        <sequence>
-            <element ref="md:Extensions" minOccurs="0"/>
-            <element ref="md:OrganizationName" maxOccurs="unbounded"/>
-            <element ref="md:OrganizationDisplayName" maxOccurs="unbounded"/>
-            <element ref="md:OrganizationURL" maxOccurs="unbounded"/>
-        </sequence>
-        <anyAttribute namespace="##other" processContents="lax"/>
-    </complexType>
-    <element name="OrganizationName" type="md:localizedNameType"/>
-    <element name="OrganizationDisplayName" type="md:localizedNameType"/>
-    <element name="OrganizationURL" type="md:localizedURIType"/>
-    <element name="ContactPerson" type="md:ContactType"/>
-    <complexType name="ContactType">
-        <sequence>
-            <element ref="md:Extensions" minOccurs="0"/>
-            <element ref="md:Company" minOccurs="0"/>
-            <element ref="md:GivenName" minOccurs="0"/>
-            <element ref="md:SurName" minOccurs="0"/>
-            <element ref="md:EmailAddress" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="md:TelephoneNumber" minOccurs="0" maxOccurs="unbounded"/>
-        </sequence>
-        <attribute name="contactType" type="md:ContactTypeType" use="required"/>
-        <anyAttribute namespace="##other" processContents="lax"/>
-    </complexType>
-    <element name="Company" type="string"/>
-    <element name="GivenName" type="string"/>
-    <element name="SurName" type="string"/>
-    <element name="EmailAddress" type="anyURI"/>
-    <element name="TelephoneNumber" type="string"/>
-    <simpleType name="ContactTypeType">
-        <restriction base="string">
-            <enumeration value="technical"/>
-            <enumeration value="support"/>
-            <enumeration value="administrative"/>
-            <enumeration value="billing"/>
-            <enumeration value="other"/>
-        </restriction>
-    </simpleType>
-
-    <element name="AdditionalMetadataLocation" type="md:AdditionalMetadataLocationType"/>
-    <complexType name="AdditionalMetadataLocationType">
-        <simpleContent>
-            <extension base="anyURI">
-                <attribute name="namespace" type="anyURI" use="required"/>
-            </extension>
-        </simpleContent>
-    </complexType>
-
-    <element name="RoleDescriptor" type="md:RoleDescriptorType"/>
-    <complexType name="RoleDescriptorType" abstract="true">
-        <sequence>
-            <element ref="ds:Signature" minOccurs="0"/>
-            <element ref="md:Extensions" minOccurs="0"/>
-            <element ref="md:KeyDescriptor" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="md:Organization" minOccurs="0"/>
-            <element ref="md:ContactPerson" minOccurs="0" maxOccurs="unbounded"/>
-        </sequence>
-        <attribute name="ID" type="ID" use="optional"/>
-        <attribute name="validUntil" type="dateTime" use="optional"/>
-        <attribute name="cacheDuration" type="duration" use="optional"/>
-        <attribute name="protocolSupportEnumeration" type="md:anyURIListType" use="required"/>
-        <attribute name="errorURL" type="anyURI" use="optional"/>
-        <anyAttribute namespace="##other" processContents="lax"/>
-    </complexType>
-    <simpleType name="anyURIListType">
-        <list itemType="anyURI"/>
-    </simpleType>
-
-    <element name="KeyDescriptor" type="md:KeyDescriptorType"/>
-    <complexType name="KeyDescriptorType">
-        <sequence>
-            <element ref="ds:KeyInfo"/>
-            <element ref="md:EncryptionMethod" minOccurs="0" maxOccurs="unbounded"/>
-        </sequence>
-        <attribute name="use" type="md:KeyTypes" use="optional"/>
-    </complexType>
-    <simpleType name="KeyTypes">
-        <restriction base="string">
-            <enumeration value="encryption"/>
-            <enumeration value="signing"/>
-        </restriction>
-    </simpleType>
-    <element name="EncryptionMethod" type="xenc:EncryptionMethodType"/>
-    
-    <complexType name="SSODescriptorType" abstract="true">
-        <complexContent>
-            <extension base="md:RoleDescriptorType">
-                <sequence>
-                    <element ref="md:ArtifactResolutionService" minOccurs="0" maxOccurs="unbounded"/>
-                    <element ref="md:SingleLogoutService" minOccurs="0" maxOccurs="unbounded"/>
-                    <element ref="md:ManageNameIDService" minOccurs="0" maxOccurs="unbounded"/>
-                    <element ref="md:NameIDFormat" minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-    <element name="ArtifactResolutionService" type="md:IndexedEndpointType"/>
-    <element name="SingleLogoutService" type="md:EndpointType"/>
-    <element name="ManageNameIDService" type="md:EndpointType"/>
-    <element name="NameIDFormat" type="anyURI"/>
-
-    <element name="IDPSSODescriptor" type="md:IDPSSODescriptorType"/>
-    <complexType name="IDPSSODescriptorType">
-        <complexContent>
-            <extension base="md:SSODescriptorType">
-                <sequence>
-                    <element ref="md:SingleSignOnService" maxOccurs="unbounded"/>
-                    <element ref="md:NameIDMappingService" minOccurs="0" maxOccurs="unbounded"/>
-                    <element ref="md:AssertionIDRequestService" minOccurs="0" maxOccurs="unbounded"/>
-                    <element ref="md:AttributeProfile" minOccurs="0" maxOccurs="unbounded"/>
-                    <element ref="saml:Attribute" minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="WantAuthnRequestsSigned" type="boolean" use="optional"/>
-            </extension>
-        </complexContent>
-    </complexType>
-    <element name="SingleSignOnService" type="md:EndpointType"/>
-    <element name="NameIDMappingService" type="md:EndpointType"/>
-    <element name="AssertionIDRequestService" type="md:EndpointType"/>
-    <element name="AttributeProfile" type="anyURI"/>
-    
-    <element name="SPSSODescriptor" type="md:SPSSODescriptorType"/>
-    <complexType name="SPSSODescriptorType">
-        <complexContent>
-            <extension base="md:SSODescriptorType">
-                <sequence>
-                    <element ref="md:AssertionConsumerService" maxOccurs="unbounded"/>
-                    <element ref="md:AttributeConsumingService" minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="AuthnRequestsSigned" type="boolean" use="optional"/>
-                <attribute name="WantAssertionsSigned" type="boolean" use="optional"/>
-            </extension>
-        </complexContent>
-    </complexType>
-    <element name="AssertionConsumerService" type="md:IndexedEndpointType"/>
-    <element name="AttributeConsumingService" type="md:AttributeConsumingServiceType"/>
-    <complexType name="AttributeConsumingServiceType">
-        <sequence>
-            <element ref="md:ServiceName" maxOccurs="unbounded"/>
-            <element ref="md:ServiceDescription" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="md:RequestedAttribute" maxOccurs="unbounded"/>
-        </sequence>
-        <attribute name="index" type="unsignedShort" use="required"/>
-        <attribute name="isDefault" type="boolean" use="optional"/>
-    </complexType>
-    <element name="ServiceName" type="md:localizedNameType"/>
-    <element name="ServiceDescription" type="md:localizedNameType"/>
-    <element name="RequestedAttribute" type="md:RequestedAttributeType"/>
-    <complexType name="RequestedAttributeType">
-        <complexContent>
-            <extension base="saml:AttributeType">
-                <attribute name="isRequired" type="boolean" use="optional"/>
-            </extension>
-        </complexContent>
-    </complexType>
-  
-    <element name="AuthnAuthorityDescriptor" type="md:AuthnAuthorityDescriptorType"/>
-    <complexType name="AuthnAuthorityDescriptorType">
-        <complexContent>
-            <extension base="md:RoleDescriptorType">
-                <sequence>
-                    <element ref="md:AuthnQueryService" maxOccurs="unbounded"/>
-                    <element ref="md:AssertionIDRequestService" minOccurs="0" maxOccurs="unbounded"/>
-                    <element ref="md:NameIDFormat" minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-    <element name="AuthnQueryService" type="md:EndpointType"/>
-
-    <element name="PDPDescriptor" type="md:PDPDescriptorType"/>
-    <complexType name="PDPDescriptorType">
-        <complexContent>
-            <extension base="md:RoleDescriptorType">
-                <sequence>
-                    <element ref="md:AuthzService" maxOccurs="unbounded"/>
-                    <element ref="md:AssertionIDRequestService" minOccurs="0" maxOccurs="unbounded"/>
-                    <element ref="md:NameIDFormat" minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-    <element name="AuthzService" type="md:EndpointType"/>
-
-    <element name="AttributeAuthorityDescriptor" type="md:AttributeAuthorityDescriptorType"/>
-    <complexType name="AttributeAuthorityDescriptorType">
-        <complexContent>
-            <extension base="md:RoleDescriptorType">
-                <sequence>
-                    <element ref="md:AttributeService" maxOccurs="unbounded"/>
-                    <element ref="md:AssertionIDRequestService" minOccurs="0" maxOccurs="unbounded"/>
-                    <element ref="md:NameIDFormat" minOccurs="0" maxOccurs="unbounded"/>
-                    <element ref="md:AttributeProfile" minOccurs="0" maxOccurs="unbounded"/>
-                    <element ref="saml:Attribute" minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-    <element name="AttributeService" type="md:EndpointType"/>
-   
-    <element name="AffiliationDescriptor" type="md:AffiliationDescriptorType"/>
-    <complexType name="AffiliationDescriptorType">
-        <sequence>
-            <element ref="ds:Signature" minOccurs="0"/>
-            <element ref="md:Extensions" minOccurs="0"/>
-            <element ref="md:AffiliateMember" maxOccurs="unbounded"/>
-        </sequence>
-        <attribute name="affiliationOwnerID" type="md:entityIDType" use="required"/>
-        <attribute name="validUntil" type="dateTime" use="optional"/>
-        <attribute name="cacheDuration" type="duration" use="optional"/>
-        <attribute name="ID" type="ID" use="optional"/>
-        <anyAttribute namespace="##other" processContents="lax"/>
-    </complexType>
-    <element name="AffiliateMember" type="md:entityIDType"/>
-</schema>`;
+export const xsdSamlSchemaMetadata20 = `<?xml version="1.0" encoding="UTF-8"?>
+<schema
+    targetNamespace="urn:oasis:names:tc:SAML:2.0:metadata"
+    xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
+    xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
+    xmlns:xenc="http://www.w3.org/2001/04/xmlenc#"
+    xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
+    xmlns="http://www.w3.org/2001/XMLSchema"
+    elementFormDefault="unqualified"
+    attributeFormDefault="unqualified"
+    blockDefault="substitution"
+    version="2.0">
+    <import namespace="http://www.w3.org/2000/09/xmldsig#"
+        schemaLocation="xmldsig-core-schema.xsd"/>
+    <import namespace="http://www.w3.org/2001/04/xmlenc#"
+        schemaLocation="xenc-schema.xsd"/>
+    <import namespace="urn:oasis:names:tc:SAML:2.0:assertion"
+        schemaLocation="saml-schema-assertion-2.0.xsd"/>
+    <import namespace="http://www.w3.org/XML/1998/namespace"
+        schemaLocation="xml.xsd"/>
+    <annotation>
+        <documentation>
+            Document identifier: saml-schema-metadata-2.0
+            Location: http://docs.oasis-open.org/security/saml/v2.0/
+            Revision history:
+              V2.0 (March, 2005):
+                Schema for SAML metadata, first published in SAML 2.0.
+        </documentation>
+    </annotation>
+
+    <simpleType name="entityIDType">
+        <restriction base="anyURI">
+            <maxLength value="1024"/>
+        </restriction>
+    </simpleType>
+    <complexType name="localizedNameType">
+        <simpleContent>
+            <extension base="string">
+                <attribute ref="xml:lang" use="required"/>
+            </extension>
+        </simpleContent>
+    </complexType>
+    <complexType name="localizedURIType">
+        <simpleContent>
+            <extension base="anyURI">
+                <attribute ref="xml:lang" use="required"/>
+            </extension>
+        </simpleContent>
+    </complexType>
+    
+    <element name="Extensions" type="md:ExtensionsType"/>
+    <complexType final="#all" name="ExtensionsType">
+        <sequence>
+            <any namespace="##other" processContents="lax" maxOccurs="unbounded"/>
+        </sequence>
+    </complexType>
+    
+    <complexType name="EndpointType">
+        <sequence>
+            <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+        </sequence>
+        <attribute name="Binding" type="anyURI" use="required"/>
+        <attribute name="Location" type="anyURI" use="required"/>
+        <attribute name="ResponseLocation" type="anyURI" use="optional"/>
+        <anyAttribute namespace="##other" processContents="lax"/>
+    </complexType>
+    
+    <complexType name="IndexedEndpointType">
+        <complexContent>
+            <extension base="md:EndpointType">
+                <attribute name="index" type="unsignedShort" use="required"/>
+                <attribute name="isDefault" type="boolean" use="optional"/>
+            </extension>
+        </complexContent>
+    </complexType>
+    
+    <element name="EntitiesDescriptor" type="md:EntitiesDescriptorType"/>
+    <complexType name="EntitiesDescriptorType">
+        <sequence>
+            <element ref="ds:Signature" minOccurs="0"/>
+            <element ref="md:Extensions" minOccurs="0"/>
+            <choice minOccurs="1" maxOccurs="unbounded">
+                <element ref="md:EntityDescriptor"/>
+                <element ref="md:EntitiesDescriptor"/>
+            </choice>
+        </sequence>
+        <attribute name="validUntil" type="dateTime" use="optional"/>
+        <attribute name="cacheDuration" type="duration" use="optional"/>
+        <attribute name="ID" type="ID" use="optional"/>
+        <attribute name="Name" type="string" use="optional"/>
+    </complexType>
+
+    <element name="EntityDescriptor" type="md:EntityDescriptorType"/>
+    <complexType name="EntityDescriptorType">
+        <sequence>
+            <element ref="ds:Signature" minOccurs="0"/>
+            <element ref="md:Extensions" minOccurs="0"/>
+            <choice>
+                <choice maxOccurs="unbounded">
+                    <element ref="md:RoleDescriptor"/>
+                    <element ref="md:IDPSSODescriptor"/>
+                    <element ref="md:SPSSODescriptor"/>
+                    <element ref="md:AuthnAuthorityDescriptor"/>
+                    <element ref="md:AttributeAuthorityDescriptor"/>
+                    <element ref="md:PDPDescriptor"/>
+                </choice>
+                <element ref="md:AffiliationDescriptor"/>
+            </choice>
+            <element ref="md:Organization" minOccurs="0"/>
+            <element ref="md:ContactPerson" minOccurs="0" maxOccurs="unbounded"/>
+            <element ref="md:AdditionalMetadataLocation" minOccurs="0" maxOccurs="unbounded"/>
+        </sequence>
+        <attribute name="entityID" type="md:entityIDType" use="required"/>
+        <attribute name="validUntil" type="dateTime" use="optional"/>
+        <attribute name="cacheDuration" type="duration" use="optional"/>
+        <attribute name="ID" type="ID" use="optional"/>
+        <anyAttribute namespace="##other" processContents="lax"/>
+    </complexType>
+    
+    <element name="Organization" type="md:OrganizationType"/>
+    <complexType name="OrganizationType">
+        <sequence>
+            <element ref="md:Extensions" minOccurs="0"/>
+            <element ref="md:OrganizationName" maxOccurs="unbounded"/>
+            <element ref="md:OrganizationDisplayName" maxOccurs="unbounded"/>
+            <element ref="md:OrganizationURL" maxOccurs="unbounded"/>
+        </sequence>
+        <anyAttribute namespace="##other" processContents="lax"/>
+    </complexType>
+    <element name="OrganizationName" type="md:localizedNameType"/>
+    <element name="OrganizationDisplayName" type="md:localizedNameType"/>
+    <element name="OrganizationURL" type="md:localizedURIType"/>
+    <element name="ContactPerson" type="md:ContactType"/>
+    <complexType name="ContactType">
+        <sequence>
+            <element ref="md:Extensions" minOccurs="0"/>
+            <element ref="md:Company" minOccurs="0"/>
+            <element ref="md:GivenName" minOccurs="0"/>
+            <element ref="md:SurName" minOccurs="0"/>
+            <element ref="md:EmailAddress" minOccurs="0" maxOccurs="unbounded"/>
+            <element ref="md:TelephoneNumber" minOccurs="0" maxOccurs="unbounded"/>
+        </sequence>
+        <attribute name="contactType" type="md:ContactTypeType" use="required"/>
+        <anyAttribute namespace="##other" processContents="lax"/>
+    </complexType>
+    <element name="Company" type="string"/>
+    <element name="GivenName" type="string"/>
+    <element name="SurName" type="string"/>
+    <element name="EmailAddress" type="anyURI"/>
+    <element name="TelephoneNumber" type="string"/>
+    <simpleType name="ContactTypeType">
+        <restriction base="string">
+            <enumeration value="technical"/>
+            <enumeration value="support"/>
+            <enumeration value="administrative"/>
+            <enumeration value="billing"/>
+            <enumeration value="other"/>
+        </restriction>
+    </simpleType>
+
+    <element name="AdditionalMetadataLocation" type="md:AdditionalMetadataLocationType"/>
+    <complexType name="AdditionalMetadataLocationType">
+        <simpleContent>
+            <extension base="anyURI">
+                <attribute name="namespace" type="anyURI" use="required"/>
+            </extension>
+        </simpleContent>
+    </complexType>
+
+    <element name="RoleDescriptor" type="md:RoleDescriptorType"/>
+    <complexType name="RoleDescriptorType" abstract="true">
+        <sequence>
+            <element ref="ds:Signature" minOccurs="0"/>
+            <element ref="md:Extensions" minOccurs="0"/>
+            <element ref="md:KeyDescriptor" minOccurs="0" maxOccurs="unbounded"/>
+            <element ref="md:Organization" minOccurs="0"/>
+            <element ref="md:ContactPerson" minOccurs="0" maxOccurs="unbounded"/>
+        </sequence>
+        <attribute name="ID" type="ID" use="optional"/>
+        <attribute name="validUntil" type="dateTime" use="optional"/>
+        <attribute name="cacheDuration" type="duration" use="optional"/>
+        <attribute name="protocolSupportEnumeration" type="md:anyURIListType" use="required"/>
+        <attribute name="errorURL" type="anyURI" use="optional"/>
+        <anyAttribute namespace="##other" processContents="lax"/>
+    </complexType>
+    <simpleType name="anyURIListType">
+        <list itemType="anyURI"/>
+    </simpleType>
+
+    <element name="KeyDescriptor" type="md:KeyDescriptorType"/>
+    <complexType name="KeyDescriptorType">
+        <sequence>
+            <element ref="ds:KeyInfo"/>
+            <element ref="md:EncryptionMethod" minOccurs="0" maxOccurs="unbounded"/>
+        </sequence>
+        <attribute name="use" type="md:KeyTypes" use="optional"/>
+    </complexType>
+    <simpleType name="KeyTypes">
+        <restriction base="string">
+            <enumeration value="encryption"/>
+            <enumeration value="signing"/>
+        </restriction>
+    </simpleType>
+    <element name="EncryptionMethod" type="xenc:EncryptionMethodType"/>
+    
+    <complexType name="SSODescriptorType" abstract="true">
+        <complexContent>
+            <extension base="md:RoleDescriptorType">
+                <sequence>
+                    <element ref="md:ArtifactResolutionService" minOccurs="0" maxOccurs="unbounded"/>
+                    <element ref="md:SingleLogoutService" minOccurs="0" maxOccurs="unbounded"/>
+                    <element ref="md:ManageNameIDService" minOccurs="0" maxOccurs="unbounded"/>
+                    <element ref="md:NameIDFormat" minOccurs="0" maxOccurs="unbounded"/>
+                </sequence>
+            </extension>
+        </complexContent>
+    </complexType>
+    <element name="ArtifactResolutionService" type="md:IndexedEndpointType"/>
+    <element name="SingleLogoutService" type="md:EndpointType"/>
+    <element name="ManageNameIDService" type="md:EndpointType"/>
+    <element name="NameIDFormat" type="anyURI"/>
+
+    <element name="IDPSSODescriptor" type="md:IDPSSODescriptorType"/>
+    <complexType name="IDPSSODescriptorType">
+        <complexContent>
+            <extension base="md:SSODescriptorType">
+                <sequence>
+                    <element ref="md:SingleSignOnService" maxOccurs="unbounded"/>
+                    <element ref="md:NameIDMappingService" minOccurs="0" maxOccurs="unbounded"/>
+                    <element ref="md:AssertionIDRequestService" minOccurs="0" maxOccurs="unbounded"/>
+                    <element ref="md:AttributeProfile" minOccurs="0" maxOccurs="unbounded"/>
+                    <element ref="saml:Attribute" minOccurs="0" maxOccurs="unbounded"/>
+                </sequence>
+                <attribute name="WantAuthnRequestsSigned" type="boolean" use="optional"/>
+            </extension>
+        </complexContent>
+    </complexType>
+    <element name="SingleSignOnService" type="md:EndpointType"/>
+    <element name="NameIDMappingService" type="md:EndpointType"/>
+    <element name="AssertionIDRequestService" type="md:EndpointType"/>
+    <element name="AttributeProfile" type="anyURI"/>
+    
+    <element name="SPSSODescriptor" type="md:SPSSODescriptorType"/>
+    <complexType name="SPSSODescriptorType">
+        <complexContent>
+            <extension base="md:SSODescriptorType">
+                <sequence>
+                    <element ref="md:AssertionConsumerService" maxOccurs="unbounded"/>
+                    <element ref="md:AttributeConsumingService" minOccurs="0" maxOccurs="unbounded"/>
+                </sequence>
+                <attribute name="AuthnRequestsSigned" type="boolean" use="optional"/>
+                <attribute name="WantAssertionsSigned" type="boolean" use="optional"/>
+            </extension>
+        </complexContent>
+    </complexType>
+    <element name="AssertionConsumerService" type="md:IndexedEndpointType"/>
+    <element name="AttributeConsumingService" type="md:AttributeConsumingServiceType"/>
+    <complexType name="AttributeConsumingServiceType">
+        <sequence>
+            <element ref="md:ServiceName" maxOccurs="unbounded"/>
+            <element ref="md:ServiceDescription" minOccurs="0" maxOccurs="unbounded"/>
+            <element ref="md:RequestedAttribute" maxOccurs="unbounded"/>
+        </sequence>
+        <attribute name="index" type="unsignedShort" use="required"/>
+        <attribute name="isDefault" type="boolean" use="optional"/>
+    </complexType>
+    <element name="ServiceName" type="md:localizedNameType"/>
+    <element name="ServiceDescription" type="md:localizedNameType"/>
+    <element name="RequestedAttribute" type="md:RequestedAttributeType"/>
+    <complexType name="RequestedAttributeType">
+        <complexContent>
+            <extension base="saml:AttributeType">
+                <attribute name="isRequired" type="boolean" use="optional"/>
+            </extension>
+        </complexContent>
+    </complexType>
+  
+    <element name="AuthnAuthorityDescriptor" type="md:AuthnAuthorityDescriptorType"/>
+    <complexType name="AuthnAuthorityDescriptorType">
+        <complexContent>
+            <extension base="md:RoleDescriptorType">
+                <sequence>
+                    <element ref="md:AuthnQueryService" maxOccurs="unbounded"/>
+                    <element ref="md:AssertionIDRequestService" minOccurs="0" maxOccurs="unbounded"/>
+                    <element ref="md:NameIDFormat" minOccurs="0" maxOccurs="unbounded"/>
+                </sequence>
+            </extension>
+        </complexContent>
+    </complexType>
+    <element name="AuthnQueryService" type="md:EndpointType"/>
+
+    <element name="PDPDescriptor" type="md:PDPDescriptorType"/>
+    <complexType name="PDPDescriptorType">
+        <complexContent>
+            <extension base="md:RoleDescriptorType">
+                <sequence>
+                    <element ref="md:AuthzService" maxOccurs="unbounded"/>
+                    <element ref="md:AssertionIDRequestService" minOccurs="0" maxOccurs="unbounded"/>
+                    <element ref="md:NameIDFormat" minOccurs="0" maxOccurs="unbounded"/>
+                </sequence>
+            </extension>
+        </complexContent>
+    </complexType>
+    <element name="AuthzService" type="md:EndpointType"/>
+
+    <element name="AttributeAuthorityDescriptor" type="md:AttributeAuthorityDescriptorType"/>
+    <complexType name="AttributeAuthorityDescriptorType">
+        <complexContent>
+            <extension base="md:RoleDescriptorType">
+                <sequence>
+                    <element ref="md:AttributeService" maxOccurs="unbounded"/>
+                    <element ref="md:AssertionIDRequestService" minOccurs="0" maxOccurs="unbounded"/>
+                    <element ref="md:NameIDFormat" minOccurs="0" maxOccurs="unbounded"/>
+                    <element ref="md:AttributeProfile" minOccurs="0" maxOccurs="unbounded"/>
+                    <element ref="saml:Attribute" minOccurs="0" maxOccurs="unbounded"/>
+                </sequence>
+            </extension>
+        </complexContent>
+    </complexType>
+    <element name="AttributeService" type="md:EndpointType"/>
+   
+    <element name="AffiliationDescriptor" type="md:AffiliationDescriptorType"/>
+    <complexType name="AffiliationDescriptorType">
+        <sequence>
+            <element ref="ds:Signature" minOccurs="0"/>
+            <element ref="md:Extensions" minOccurs="0"/>
+            <element ref="md:AffiliateMember" maxOccurs="unbounded"/>
+        </sequence>
+        <attribute name="affiliationOwnerID" type="md:entityIDType" use="required"/>
+        <attribute name="validUntil" type="dateTime" use="optional"/>
+        <attribute name="cacheDuration" type="duration" use="optional"/>
+        <attribute name="ID" type="ID" use="optional"/>
+        <anyAttribute namespace="##other" processContents="lax"/>
+    </complexType>
+    <element name="AffiliateMember" type="md:entityIDType"/>
+</schema>`;
diff --git a/packages/cli/src/sso/saml/schema/saml-schema-protocol-2.0.xsd.ts b/packages/cli/src/sso/saml/schema/saml-schema-protocol-2.0.xsd.ts
index 18e27b006b18b..e8bb9d0aaecb9 100644
--- a/packages/cli/src/sso/saml/schema/saml-schema-protocol-2.0.xsd.ts
+++ b/packages/cli/src/sso/saml/schema/saml-schema-protocol-2.0.xsd.ts
@@ -1,302 +1,302 @@
-export const xsdSamlSchemaProtocol20 = `<?xml version="1.0" encoding="UTF-8"?>
-<schema
-    targetNamespace="urn:oasis:names:tc:SAML:2.0:protocol"
-    xmlns="http://www.w3.org/2001/XMLSchema"
-    xmlns:samlp="urn:oasis:names:tc:SAML:2.0:protocol"
-    xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
-    xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-    elementFormDefault="unqualified"
-    attributeFormDefault="unqualified"
-    blockDefault="substitution"
-    version="2.0">
-    <import namespace="urn:oasis:names:tc:SAML:2.0:assertion"
-        schemaLocation="saml-schema-assertion-2.0.xsd"/>
-    <import namespace="http://www.w3.org/2000/09/xmldsig#"
-        schemaLocation="xmldsig-core-schema.xsd"/>
-    <annotation>
-        <documentation>
-            Document identifier: saml-schema-protocol-2.0
-            Location: http://docs.oasis-open.org/security/saml/v2.0/
-            Revision history:
-            V1.0 (November, 2002):
-              Initial Standard Schema.
-            V1.1 (September, 2003):
-              Updates within the same V1.0 namespace.
-            V2.0 (March, 2005):
-              New protocol schema based in a SAML V2.0 namespace.
-     </documentation>
-    </annotation>
-    <complexType name="RequestAbstractType" abstract="true">
-        <sequence>
-            <element ref="saml:Issuer" minOccurs="0"/>
-            <element ref="ds:Signature" minOccurs="0"/>
-            <element ref="samlp:Extensions" minOccurs="0"/>
-        </sequence>
-        <attribute name="ID" type="ID" use="required"/>
-        <attribute name="Version" type="string" use="required"/>
-        <attribute name="IssueInstant" type="dateTime" use="required"/>
-        <attribute name="Destination" type="anyURI" use="optional"/>
-    	<attribute name="Consent" type="anyURI" use="optional"/>
-    </complexType>
-    <element name="Extensions" type="samlp:ExtensionsType"/>
-    <complexType name="ExtensionsType">
-        <sequence>
-            <any namespace="##other" processContents="lax" maxOccurs="unbounded"/>
-        </sequence>
-    </complexType>
-    <complexType name="StatusResponseType">
-    	<sequence>
-            <element ref="saml:Issuer" minOccurs="0"/>
-            <element ref="ds:Signature" minOccurs="0"/>
-            <element ref="samlp:Extensions" minOccurs="0"/>
-            <element ref="samlp:Status"/>
-    	</sequence>
-    	<attribute name="ID" type="ID" use="required"/>
-    	<attribute name="InResponseTo" type="NCName" use="optional"/>
-    	<attribute name="Version" type="string" use="required"/>
-    	<attribute name="IssueInstant" type="dateTime" use="required"/>
-    	<attribute name="Destination" type="anyURI" use="optional"/>
-    	<attribute name="Consent" type="anyURI" use="optional"/>
-    </complexType>
-    <element name="Status" type="samlp:StatusType"/>
-    <complexType name="StatusType">
-        <sequence>
-            <element ref="samlp:StatusCode"/>
-            <element ref="samlp:StatusMessage" minOccurs="0"/>
-            <element ref="samlp:StatusDetail" minOccurs="0"/>
-        </sequence>
-    </complexType>
-    <element name="StatusCode" type="samlp:StatusCodeType"/>
-    <complexType name="StatusCodeType">
-        <sequence>
-            <element ref="samlp:StatusCode" minOccurs="0"/>
-        </sequence>
-        <attribute name="Value" type="anyURI" use="required"/>
-    </complexType>
-    <element name="StatusMessage" type="string"/>
-    <element name="StatusDetail" type="samlp:StatusDetailType"/>
-    <complexType name="StatusDetailType">
-        <sequence>
-            <any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-        </sequence>
-    </complexType>
-    <element name="AssertionIDRequest" type="samlp:AssertionIDRequestType"/>
-    <complexType name="AssertionIDRequestType">
-    	<complexContent>
-            <extension base="samlp:RequestAbstractType">
-                <sequence>
-                    <element ref="saml:AssertionIDRef" maxOccurs="unbounded"/>
-                </sequence>
-            </extension>
-    	</complexContent>
-    </complexType>
-    <element name="SubjectQuery" type="samlp:SubjectQueryAbstractType"/>
-    <complexType name="SubjectQueryAbstractType" abstract="true">
-    	<complexContent>
-            <extension base="samlp:RequestAbstractType">
-                <sequence>
-                    <element ref="saml:Subject"/>
-                </sequence>
-            </extension>
-    	</complexContent>
-    </complexType>
-    <element name="AuthnQuery" type="samlp:AuthnQueryType"/>
-    <complexType name="AuthnQueryType">
-        <complexContent>
-            <extension base="samlp:SubjectQueryAbstractType">
-                <sequence>
-                    <element ref="samlp:RequestedAuthnContext" minOccurs="0"/>
-                </sequence>
-                <attribute name="SessionIndex" type="string" use="optional"/>
-            </extension>
-        </complexContent>
-    </complexType>
-    <element name="RequestedAuthnContext" type="samlp:RequestedAuthnContextType"/>
-    <complexType name="RequestedAuthnContextType">
-        <choice>
-            <element ref="saml:AuthnContextClassRef" maxOccurs="unbounded"/>
-            <element ref="saml:AuthnContextDeclRef" maxOccurs="unbounded"/>
-        </choice>
-        <attribute name="Comparison" type="samlp:AuthnContextComparisonType" use="optional"/>
-    </complexType>
-    <simpleType name="AuthnContextComparisonType">
-        <restriction base="string">
-            <enumeration value="exact"/>
-            <enumeration value="minimum"/>
-            <enumeration value="maximum"/>
-            <enumeration value="better"/>
-        </restriction>
-    </simpleType>
-    <element name="AttributeQuery" type="samlp:AttributeQueryType"/>
-    <complexType name="AttributeQueryType">
-        <complexContent>
-            <extension base="samlp:SubjectQueryAbstractType">
-                <sequence>
-                    <element ref="saml:Attribute" minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-    <element name="AuthzDecisionQuery" type="samlp:AuthzDecisionQueryType"/>
-    <complexType name="AuthzDecisionQueryType">
-        <complexContent>
-            <extension base="samlp:SubjectQueryAbstractType">
-                <sequence>
-                    <element ref="saml:Action" maxOccurs="unbounded"/>
-                    <element ref="saml:Evidence" minOccurs="0"/>
-                </sequence>
-                <attribute name="Resource" type="anyURI" use="required"/>
-            </extension>
-        </complexContent>
-    </complexType>
-    <element name="AuthnRequest" type="samlp:AuthnRequestType"/>
-    <complexType name="AuthnRequestType">
-        <complexContent>
-            <extension base="samlp:RequestAbstractType">
-                <sequence>
-                    <element ref="saml:Subject" minOccurs="0"/>
-                    <element ref="samlp:NameIDPolicy" minOccurs="0"/>
-                    <element ref="saml:Conditions" minOccurs="0"/>
-                    <element ref="samlp:RequestedAuthnContext" minOccurs="0"/>
-                    <element ref="samlp:Scoping" minOccurs="0"/>
-                </sequence>
-                <attribute name="ForceAuthn" type="boolean" use="optional"/>
-                <attribute name="IsPassive" type="boolean" use="optional"/>
-                <attribute name="ProtocolBinding" type="anyURI" use="optional"/>
-                <attribute name="AssertionConsumerServiceIndex" type="unsignedShort" use="optional"/>
-                <attribute name="AssertionConsumerServiceURL" type="anyURI" use="optional"/>
-                <attribute name="AttributeConsumingServiceIndex" type="unsignedShort" use="optional"/>
-                <attribute name="ProviderName" type="string" use="optional"/>
-            </extension>
-        </complexContent>
-    </complexType>
-    <element name="NameIDPolicy" type="samlp:NameIDPolicyType"/>
-    <complexType name="NameIDPolicyType">
-        <attribute name="Format" type="anyURI" use="optional"/>
-        <attribute name="SPNameQualifier" type="string" use="optional"/>
-        <attribute name="AllowCreate" type="boolean" use="optional"/>
-    </complexType>
-    <element name="Scoping" type="samlp:ScopingType"/>
-    <complexType name="ScopingType">
-        <sequence>
-            <element ref="samlp:IDPList" minOccurs="0"/>
-            <element ref="samlp:RequesterID" minOccurs="0" maxOccurs="unbounded"/>
-        </sequence>
-        <attribute name="ProxyCount" type="nonNegativeInteger" use="optional"/>
-    </complexType>
-    <element name="RequesterID" type="anyURI"/>
-    <element name="IDPList" type="samlp:IDPListType"/>
-    <complexType name="IDPListType">
-        <sequence>
-            <element ref="samlp:IDPEntry" maxOccurs="unbounded"/>
-            <element ref="samlp:GetComplete" minOccurs="0"/>
-        </sequence>
-    </complexType>
-    <element name="IDPEntry" type="samlp:IDPEntryType"/>
-    <complexType name="IDPEntryType">
-        <attribute name="ProviderID" type="anyURI" use="required"/>
-        <attribute name="Name" type="string" use="optional"/>
-        <attribute name="Loc" type="anyURI" use="optional"/>
-    </complexType>
-    <element name="GetComplete" type="anyURI"/>
-    <element name="Response" type="samlp:ResponseType"/>
-    <complexType name="ResponseType">
-    	<complexContent>
-            <extension base="samlp:StatusResponseType">
-                <choice minOccurs="0" maxOccurs="unbounded">
-                    <element ref="saml:Assertion"/>
-                    <element ref="saml:EncryptedAssertion"/>
-                </choice>
-            </extension>
-    	</complexContent>
-    </complexType>
-    <element name="ArtifactResolve" type="samlp:ArtifactResolveType"/>
-    <complexType name="ArtifactResolveType">
-    	<complexContent>
-            <extension base="samlp:RequestAbstractType">
-                <sequence>
-                    <element ref="samlp:Artifact"/>
-                </sequence>
-            </extension>
-    	</complexContent>
-    </complexType>
-    <element name="Artifact" type="string"/>
-    <element name="ArtifactResponse" type="samlp:ArtifactResponseType"/>
-    <complexType name="ArtifactResponseType">
-    	<complexContent>
-            <extension base="samlp:StatusResponseType">
-                <sequence>
-                    <any namespace="##any" processContents="lax" minOccurs="0"/>
-                </sequence>
-            </extension>
-    	</complexContent>
-    </complexType>
-    <element name="ManageNameIDRequest" type="samlp:ManageNameIDRequestType"/>
-    <complexType name="ManageNameIDRequestType">
-    	<complexContent>
-            <extension base="samlp:RequestAbstractType">
-                <sequence>
-                    <choice>
-                        <element ref="saml:NameID"/>
-                        <element ref="saml:EncryptedID"/>
-                    </choice>
-                    <choice>
-                        <element ref="samlp:NewID"/>
-                        <element ref="samlp:NewEncryptedID"/>
-                        <element ref="samlp:Terminate"/>
-                    </choice>
-                </sequence>
-            </extension>
-    	</complexContent>
-    </complexType>
-    <element name="NewID" type="string"/>
-    <element name="NewEncryptedID" type="saml:EncryptedElementType"/>
-    <element name="Terminate" type="samlp:TerminateType"/>
-    <complexType name="TerminateType"/>
-    <element name="ManageNameIDResponse" type="samlp:StatusResponseType"/>
-    <element name="LogoutRequest" type="samlp:LogoutRequestType"/>
-    <complexType name="LogoutRequestType">
-        <complexContent>
-            <extension base="samlp:RequestAbstractType">
-                <sequence>
-                    <choice>
-                        <element ref="saml:BaseID"/>
-                        <element ref="saml:NameID"/>
-                        <element ref="saml:EncryptedID"/>
-                    </choice>
-                    <element ref="samlp:SessionIndex" minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="Reason" type="string" use="optional"/>
-                <attribute name="NotOnOrAfter" type="dateTime" use="optional"/>
-            </extension>
-        </complexContent>
-    </complexType>
-    <element name="SessionIndex" type="string"/>
-    <element name="LogoutResponse" type="samlp:StatusResponseType"/>
-    <element name="NameIDMappingRequest" type="samlp:NameIDMappingRequestType"/>
-    <complexType name="NameIDMappingRequestType">
-        <complexContent>
-            <extension base="samlp:RequestAbstractType">
-                <sequence>
-                    <choice>
-                        <element ref="saml:BaseID"/>
-                        <element ref="saml:NameID"/>
-                        <element ref="saml:EncryptedID"/>
-                    </choice>
-                    <element ref="samlp:NameIDPolicy"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-    <element name="NameIDMappingResponse" type="samlp:NameIDMappingResponseType"/>
-    <complexType name="NameIDMappingResponseType">
-        <complexContent>
-            <extension base="samlp:StatusResponseType">
-                <choice>
-                    <element ref="saml:NameID"/>
-                    <element ref="saml:EncryptedID"/>
-                </choice>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>`;
+export const xsdSamlSchemaProtocol20 = `<?xml version="1.0" encoding="UTF-8"?>
+<schema
+    targetNamespace="urn:oasis:names:tc:SAML:2.0:protocol"
+    xmlns="http://www.w3.org/2001/XMLSchema"
+    xmlns:samlp="urn:oasis:names:tc:SAML:2.0:protocol"
+    xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
+    xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
+    elementFormDefault="unqualified"
+    attributeFormDefault="unqualified"
+    blockDefault="substitution"
+    version="2.0">
+    <import namespace="urn:oasis:names:tc:SAML:2.0:assertion"
+        schemaLocation="saml-schema-assertion-2.0.xsd"/>
+    <import namespace="http://www.w3.org/2000/09/xmldsig#"
+        schemaLocation="xmldsig-core-schema.xsd"/>
+    <annotation>
+        <documentation>
+            Document identifier: saml-schema-protocol-2.0
+            Location: http://docs.oasis-open.org/security/saml/v2.0/
+            Revision history:
+            V1.0 (November, 2002):
+              Initial Standard Schema.
+            V1.1 (September, 2003):
+              Updates within the same V1.0 namespace.
+            V2.0 (March, 2005):
+              New protocol schema based in a SAML V2.0 namespace.
+     </documentation>
+    </annotation>
+    <complexType name="RequestAbstractType" abstract="true">
+        <sequence>
+            <element ref="saml:Issuer" minOccurs="0"/>
+            <element ref="ds:Signature" minOccurs="0"/>
+            <element ref="samlp:Extensions" minOccurs="0"/>
+        </sequence>
+        <attribute name="ID" type="ID" use="required"/>
+        <attribute name="Version" type="string" use="required"/>
+        <attribute name="IssueInstant" type="dateTime" use="required"/>
+        <attribute name="Destination" type="anyURI" use="optional"/>
+    	<attribute name="Consent" type="anyURI" use="optional"/>
+    </complexType>
+    <element name="Extensions" type="samlp:ExtensionsType"/>
+    <complexType name="ExtensionsType">
+        <sequence>
+            <any namespace="##other" processContents="lax" maxOccurs="unbounded"/>
+        </sequence>
+    </complexType>
+    <complexType name="StatusResponseType">
+    	<sequence>
+            <element ref="saml:Issuer" minOccurs="0"/>
+            <element ref="ds:Signature" minOccurs="0"/>
+            <element ref="samlp:Extensions" minOccurs="0"/>
+            <element ref="samlp:Status"/>
+    	</sequence>
+    	<attribute name="ID" type="ID" use="required"/>
+    	<attribute name="InResponseTo" type="NCName" use="optional"/>
+    	<attribute name="Version" type="string" use="required"/>
+    	<attribute name="IssueInstant" type="dateTime" use="required"/>
+    	<attribute name="Destination" type="anyURI" use="optional"/>
+    	<attribute name="Consent" type="anyURI" use="optional"/>
+    </complexType>
+    <element name="Status" type="samlp:StatusType"/>
+    <complexType name="StatusType">
+        <sequence>
+            <element ref="samlp:StatusCode"/>
+            <element ref="samlp:StatusMessage" minOccurs="0"/>
+            <element ref="samlp:StatusDetail" minOccurs="0"/>
+        </sequence>
+    </complexType>
+    <element name="StatusCode" type="samlp:StatusCodeType"/>
+    <complexType name="StatusCodeType">
+        <sequence>
+            <element ref="samlp:StatusCode" minOccurs="0"/>
+        </sequence>
+        <attribute name="Value" type="anyURI" use="required"/>
+    </complexType>
+    <element name="StatusMessage" type="string"/>
+    <element name="StatusDetail" type="samlp:StatusDetailType"/>
+    <complexType name="StatusDetailType">
+        <sequence>
+            <any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+        </sequence>
+    </complexType>
+    <element name="AssertionIDRequest" type="samlp:AssertionIDRequestType"/>
+    <complexType name="AssertionIDRequestType">
+    	<complexContent>
+            <extension base="samlp:RequestAbstractType">
+                <sequence>
+                    <element ref="saml:AssertionIDRef" maxOccurs="unbounded"/>
+                </sequence>
+            </extension>
+    	</complexContent>
+    </complexType>
+    <element name="SubjectQuery" type="samlp:SubjectQueryAbstractType"/>
+    <complexType name="SubjectQueryAbstractType" abstract="true">
+    	<complexContent>
+            <extension base="samlp:RequestAbstractType">
+                <sequence>
+                    <element ref="saml:Subject"/>
+                </sequence>
+            </extension>
+    	</complexContent>
+    </complexType>
+    <element name="AuthnQuery" type="samlp:AuthnQueryType"/>
+    <complexType name="AuthnQueryType">
+        <complexContent>
+            <extension base="samlp:SubjectQueryAbstractType">
+                <sequence>
+                    <element ref="samlp:RequestedAuthnContext" minOccurs="0"/>
+                </sequence>
+                <attribute name="SessionIndex" type="string" use="optional"/>
+            </extension>
+        </complexContent>
+    </complexType>
+    <element name="RequestedAuthnContext" type="samlp:RequestedAuthnContextType"/>
+    <complexType name="RequestedAuthnContextType">
+        <choice>
+            <element ref="saml:AuthnContextClassRef" maxOccurs="unbounded"/>
+            <element ref="saml:AuthnContextDeclRef" maxOccurs="unbounded"/>
+        </choice>
+        <attribute name="Comparison" type="samlp:AuthnContextComparisonType" use="optional"/>
+    </complexType>
+    <simpleType name="AuthnContextComparisonType">
+        <restriction base="string">
+            <enumeration value="exact"/>
+            <enumeration value="minimum"/>
+            <enumeration value="maximum"/>
+            <enumeration value="better"/>
+        </restriction>
+    </simpleType>
+    <element name="AttributeQuery" type="samlp:AttributeQueryType"/>
+    <complexType name="AttributeQueryType">
+        <complexContent>
+            <extension base="samlp:SubjectQueryAbstractType">
+                <sequence>
+                    <element ref="saml:Attribute" minOccurs="0" maxOccurs="unbounded"/>
+                </sequence>
+            </extension>
+        </complexContent>
+    </complexType>
+    <element name="AuthzDecisionQuery" type="samlp:AuthzDecisionQueryType"/>
+    <complexType name="AuthzDecisionQueryType">
+        <complexContent>
+            <extension base="samlp:SubjectQueryAbstractType">
+                <sequence>
+                    <element ref="saml:Action" maxOccurs="unbounded"/>
+                    <element ref="saml:Evidence" minOccurs="0"/>
+                </sequence>
+                <attribute name="Resource" type="anyURI" use="required"/>
+            </extension>
+        </complexContent>
+    </complexType>
+    <element name="AuthnRequest" type="samlp:AuthnRequestType"/>
+    <complexType name="AuthnRequestType">
+        <complexContent>
+            <extension base="samlp:RequestAbstractType">
+                <sequence>
+                    <element ref="saml:Subject" minOccurs="0"/>
+                    <element ref="samlp:NameIDPolicy" minOccurs="0"/>
+                    <element ref="saml:Conditions" minOccurs="0"/>
+                    <element ref="samlp:RequestedAuthnContext" minOccurs="0"/>
+                    <element ref="samlp:Scoping" minOccurs="0"/>
+                </sequence>
+                <attribute name="ForceAuthn" type="boolean" use="optional"/>
+                <attribute name="IsPassive" type="boolean" use="optional"/>
+                <attribute name="ProtocolBinding" type="anyURI" use="optional"/>
+                <attribute name="AssertionConsumerServiceIndex" type="unsignedShort" use="optional"/>
+                <attribute name="AssertionConsumerServiceURL" type="anyURI" use="optional"/>
+                <attribute name="AttributeConsumingServiceIndex" type="unsignedShort" use="optional"/>
+                <attribute name="ProviderName" type="string" use="optional"/>
+            </extension>
+        </complexContent>
+    </complexType>
+    <element name="NameIDPolicy" type="samlp:NameIDPolicyType"/>
+    <complexType name="NameIDPolicyType">
+        <attribute name="Format" type="anyURI" use="optional"/>
+        <attribute name="SPNameQualifier" type="string" use="optional"/>
+        <attribute name="AllowCreate" type="boolean" use="optional"/>
+    </complexType>
+    <element name="Scoping" type="samlp:ScopingType"/>
+    <complexType name="ScopingType">
+        <sequence>
+            <element ref="samlp:IDPList" minOccurs="0"/>
+            <element ref="samlp:RequesterID" minOccurs="0" maxOccurs="unbounded"/>
+        </sequence>
+        <attribute name="ProxyCount" type="nonNegativeInteger" use="optional"/>
+    </complexType>
+    <element name="RequesterID" type="anyURI"/>
+    <element name="IDPList" type="samlp:IDPListType"/>
+    <complexType name="IDPListType">
+        <sequence>
+            <element ref="samlp:IDPEntry" maxOccurs="unbounded"/>
+            <element ref="samlp:GetComplete" minOccurs="0"/>
+        </sequence>
+    </complexType>
+    <element name="IDPEntry" type="samlp:IDPEntryType"/>
+    <complexType name="IDPEntryType">
+        <attribute name="ProviderID" type="anyURI" use="required"/>
+        <attribute name="Name" type="string" use="optional"/>
+        <attribute name="Loc" type="anyURI" use="optional"/>
+    </complexType>
+    <element name="GetComplete" type="anyURI"/>
+    <element name="Response" type="samlp:ResponseType"/>
+    <complexType name="ResponseType">
+    	<complexContent>
+            <extension base="samlp:StatusResponseType">
+                <choice minOccurs="0" maxOccurs="unbounded">
+                    <element ref="saml:Assertion"/>
+                    <element ref="saml:EncryptedAssertion"/>
+                </choice>
+            </extension>
+    	</complexContent>
+    </complexType>
+    <element name="ArtifactResolve" type="samlp:ArtifactResolveType"/>
+    <complexType name="ArtifactResolveType">
+    	<complexContent>
+            <extension base="samlp:RequestAbstractType">
+                <sequence>
+                    <element ref="samlp:Artifact"/>
+                </sequence>
+            </extension>
+    	</complexContent>
+    </complexType>
+    <element name="Artifact" type="string"/>
+    <element name="ArtifactResponse" type="samlp:ArtifactResponseType"/>
+    <complexType name="ArtifactResponseType">
+    	<complexContent>
+            <extension base="samlp:StatusResponseType">
+                <sequence>
+                    <any namespace="##any" processContents="lax" minOccurs="0"/>
+                </sequence>
+            </extension>
+    	</complexContent>
+    </complexType>
+    <element name="ManageNameIDRequest" type="samlp:ManageNameIDRequestType"/>
+    <complexType name="ManageNameIDRequestType">
+    	<complexContent>
+            <extension base="samlp:RequestAbstractType">
+                <sequence>
+                    <choice>
+                        <element ref="saml:NameID"/>
+                        <element ref="saml:EncryptedID"/>
+                    </choice>
+                    <choice>
+                        <element ref="samlp:NewID"/>
+                        <element ref="samlp:NewEncryptedID"/>
+                        <element ref="samlp:Terminate"/>
+                    </choice>
+                </sequence>
+            </extension>
+    	</complexContent>
+    </complexType>
+    <element name="NewID" type="string"/>
+    <element name="NewEncryptedID" type="saml:EncryptedElementType"/>
+    <element name="Terminate" type="samlp:TerminateType"/>
+    <complexType name="TerminateType"/>
+    <element name="ManageNameIDResponse" type="samlp:StatusResponseType"/>
+    <element name="LogoutRequest" type="samlp:LogoutRequestType"/>
+    <complexType name="LogoutRequestType">
+        <complexContent>
+            <extension base="samlp:RequestAbstractType">
+                <sequence>
+                    <choice>
+                        <element ref="saml:BaseID"/>
+                        <element ref="saml:NameID"/>
+                        <element ref="saml:EncryptedID"/>
+                    </choice>
+                    <element ref="samlp:SessionIndex" minOccurs="0" maxOccurs="unbounded"/>
+                </sequence>
+                <attribute name="Reason" type="string" use="optional"/>
+                <attribute name="NotOnOrAfter" type="dateTime" use="optional"/>
+            </extension>
+        </complexContent>
+    </complexType>
+    <element name="SessionIndex" type="string"/>
+    <element name="LogoutResponse" type="samlp:StatusResponseType"/>
+    <element name="NameIDMappingRequest" type="samlp:NameIDMappingRequestType"/>
+    <complexType name="NameIDMappingRequestType">
+        <complexContent>
+            <extension base="samlp:RequestAbstractType">
+                <sequence>
+                    <choice>
+                        <element ref="saml:BaseID"/>
+                        <element ref="saml:NameID"/>
+                        <element ref="saml:EncryptedID"/>
+                    </choice>
+                    <element ref="samlp:NameIDPolicy"/>
+                </sequence>
+            </extension>
+        </complexContent>
+    </complexType>
+    <element name="NameIDMappingResponse" type="samlp:NameIDMappingResponseType"/>
+    <complexType name="NameIDMappingResponseType">
+        <complexContent>
+            <extension base="samlp:StatusResponseType">
+                <choice>
+                    <element ref="saml:NameID"/>
+                    <element ref="saml:EncryptedID"/>
+                </choice>
+            </extension>
+        </complexContent>
+    </complexType>
+</schema>`;
diff --git a/packages/cli/src/sso/saml/serviceProvider.ee.ts b/packages/cli/src/sso/saml/serviceProvider.ee.ts
index f6d707eaf86be..3f4b3aec62d80 100644
--- a/packages/cli/src/sso/saml/serviceProvider.ee.ts
+++ b/packages/cli/src/sso/saml/serviceProvider.ee.ts
@@ -1,28 +1,32 @@
 /* eslint-disable @typescript-eslint/naming-convention */
-import { getInstanceBaseUrl } from '@/UserManagement/UserManagementHelper';
+import { Container } from 'typedi';
 import type { ServiceProviderInstance } from 'samlify';
-import { ServiceProvider } from 'samlify';
-import { SamlUrls } from './constants';
+import { UrlService } from '@/services/url.service';
 import type { SamlPreferences } from './types/samlPreferences';
 
 let serviceProviderInstance: ServiceProviderInstance | undefined;
 
 export function getServiceProviderEntityId(): string {
-	return getInstanceBaseUrl() + SamlUrls.restMetadata;
+	return Container.get(UrlService).getInstanceBaseUrl() + '/rest/sso/saml/metadata';
 }
 
 export function getServiceProviderReturnUrl(): string {
-	return getInstanceBaseUrl() + SamlUrls.restAcs;
+	return Container.get(UrlService).getInstanceBaseUrl() + '/rest/sso/saml/acs';
 }
 
 export function getServiceProviderConfigTestReturnUrl(): string {
-	return getInstanceBaseUrl() + SamlUrls.configTestReturn;
+	// TODO: what is this URL?
+	return Container.get(UrlService).getInstanceBaseUrl() + '/config/test/return';
 }
 
 // TODO:SAML: make these configurable for the end user
-export function getServiceProviderInstance(prefs: SamlPreferences): ServiceProviderInstance {
+export function getServiceProviderInstance(
+	prefs: SamlPreferences,
+	// eslint-disable-next-line @typescript-eslint/consistent-type-imports
+	samlify: typeof import('samlify'),
+): ServiceProviderInstance {
 	if (serviceProviderInstance === undefined) {
-		serviceProviderInstance = ServiceProvider({
+		serviceProviderInstance = samlify.ServiceProvider({
 			entityID: getServiceProviderEntityId(),
 			authnRequestsSigned: prefs.authnRequestsSigned,
 			wantAssertionsSigned: prefs.wantAssertionsSigned,
diff --git a/packages/cli/src/sso/ssoHelpers.ts b/packages/cli/src/sso/ssoHelpers.ts
index 30636c533d6c9..7a0b2b140eaee 100644
--- a/packages/cli/src/sso/ssoHelpers.ts
+++ b/packages/cli/src/sso/ssoHelpers.ts
@@ -1,6 +1,7 @@
 import config from '@/config';
-import * as Db from '@/Db';
+import { SettingsRepository } from '@db/repositories/settings.repository';
 import type { AuthProviderType } from '@db/entities/AuthIdentity';
+import Container from 'typedi';
 
 /**
  * Only one authentication method can be active at a time. This function sets the current authentication method
@@ -12,11 +13,14 @@ export async function setCurrentAuthenticationMethod(
 	authenticationMethod: AuthProviderType,
 ): Promise<void> {
 	config.set('userManagement.authenticationMethod', authenticationMethod);
-	await Db.collections.Settings.save({
-		key: 'userManagement.authenticationMethod',
-		value: authenticationMethod,
-		loadOnStartup: true,
-	});
+	await Container.get(SettingsRepository).save(
+		{
+			key: 'userManagement.authenticationMethod',
+			value: authenticationMethod,
+			loadOnStartup: true,
+		},
+		{ transaction: false },
+	);
 }
 
 export function getCurrentAuthenticationMethod(): AuthProviderType {
diff --git a/packages/cli/src/telemetry/index.ts b/packages/cli/src/telemetry/index.ts
index 7edb6f6172f41..697cd1f03ba5f 100644
--- a/packages/cli/src/telemetry/index.ts
+++ b/packages/cli/src/telemetry/index.ts
@@ -1,16 +1,18 @@
-/* eslint-disable @typescript-eslint/no-unsafe-call */
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+import axios from 'axios';
 import type RudderStack from '@rudderstack/rudder-sdk-node';
 import { PostHogClient } from '@/posthog';
+import { Container, Service } from 'typedi';
 import type { ITelemetryTrackProperties } from 'n8n-workflow';
-import { LoggerProxy } from 'n8n-workflow';
+import { InstanceSettings } from 'n8n-core';
+
 import config from '@/config';
 import type { IExecutionTrackProperties } from '@/Interfaces';
-import { getLogger } from '@/Logger';
+import { Logger } from '@/Logger';
 import { License } from '@/License';
-import { LicenseService } from '@/license/License.service';
 import { N8N_VERSION } from '@/constants';
-import { Service } from 'typedi';
+import { WorkflowRepository } from '@db/repositories/workflow.repository';
+import { SourceControlPreferencesService } from '../environments/sourceControl/sourceControlPreferences.service.ee';
+import { UserRepository } from '@db/repositories/user.repository';
 
 type ExecutionTrackDataKey = 'manual_error' | 'manual_success' | 'prod_error' | 'prod_success';
 
@@ -31,47 +33,57 @@ interface IExecutionsBuffer {
 
 @Service()
 export class Telemetry {
-	private instanceId: string;
-
 	private rudderStack?: RudderStack;
 
 	private pulseIntervalReference: NodeJS.Timeout;
 
 	private executionCountsBuffer: IExecutionsBuffer = {};
 
-	constructor(private postHog: PostHogClient, private license: License) {}
-
-	setInstanceId(instanceId: string) {
-		this.instanceId = instanceId;
-	}
+	constructor(
+		private readonly logger: Logger,
+		private readonly postHog: PostHogClient,
+		private readonly license: License,
+		private readonly instanceSettings: InstanceSettings,
+		private readonly workflowRepository: WorkflowRepository,
+	) {}
 
 	async init() {
 		const enabled = config.getEnv('diagnostics.enabled');
 		if (enabled) {
 			const conf = config.getEnv('diagnostics.config.backend');
-			const [key, url] = conf.split(';');
+			const [key, dataPlaneUrl] = conf.split(';');
 
-			if (!key || !url) {
-				const logger = getLogger();
-				LoggerProxy.init(logger);
-				logger.warn('Diagnostics backend config is invalid');
+			if (!key || !dataPlaneUrl) {
+				this.logger.warn('Diagnostics backend config is invalid');
 				return;
 			}
 
 			const logLevel = config.getEnv('logs.level');
 
-			// eslint-disable-next-line @typescript-eslint/naming-convention
 			const { default: RudderStack } = await import('@rudderstack/rudder-sdk-node');
-			this.rudderStack = new RudderStack(key, url, { logLevel });
+			const axiosInstance = axios.create();
+			axiosInstance.interceptors.request.use((cfg) => {
+				cfg.headers.setContentType('application/json', false);
+				return cfg;
+			});
+			this.rudderStack = new RudderStack(key, {
+				axiosInstance,
+				logLevel,
+				dataPlaneUrl,
+				gzip: false,
+			});
 
 			this.startPulse();
 		}
 	}
 
 	private startPulse() {
-		this.pulseIntervalReference = setInterval(async () => {
-			void this.pulse();
-		}, 6 * 60 * 60 * 1000); // every 6 hours
+		this.pulseIntervalReference = setInterval(
+			async () => {
+				void this.pulse();
+			},
+			6 * 60 * 60 * 1000,
+		); // every 6 hours
 	}
 
 	private async pulse(): Promise<unknown> {
@@ -79,30 +91,44 @@ export class Telemetry {
 			return;
 		}
 
-		const allPromises = Object.keys(this.executionCountsBuffer).map(async (workflowId) => {
-			const promise = this.track(
-				'Workflow execution count',
-				{
+		const allPromises = Object.keys(this.executionCountsBuffer)
+			.filter((workflowId) => {
+				const data = this.executionCountsBuffer[workflowId];
+				const sum =
+					(data.manual_error?.count ?? 0) +
+					(data.manual_success?.count ?? 0) +
+					(data.prod_error?.count ?? 0) +
+					(data.prod_success?.count ?? 0);
+				return sum > 0;
+			})
+			.map(async (workflowId) => {
+				const promise = this.track('Workflow execution count', {
 					event_version: '2',
 					workflow_id: workflowId,
 					...this.executionCountsBuffer[workflowId],
-				},
-				{ withPostHog: true },
-			);
+				});
 
-			return promise;
-		});
+				return await promise;
+			});
 
 		this.executionCountsBuffer = {};
 
+		const sourceControlPreferences = Container.get(
+			SourceControlPreferencesService,
+		).getPreferences();
+
 		// License info
 		const pulsePacket = {
 			plan_name_current: this.license.getPlanName(),
 			quota: this.license.getTriggerLimit(),
-			usage: await LicenseService.getActiveTriggerCount(),
+			usage: await this.workflowRepository.getActiveTriggerCount(),
+			role_count: await Container.get(UserRepository).countUsersByRole(),
+			source_control_set_up: Container.get(SourceControlPreferencesService).isSourceControlSetup(),
+			branchName: sourceControlPreferences.branchName,
+			read_only_instance: sourceControlPreferences.branchReadOnly,
 		};
 		allPromises.push(this.track('pulse', pulsePacket));
-		return Promise.all(allPromises);
+		return await Promise.all(allPromises);
 	}
 
 	async trackWorkflowExecution(properties: IExecutionTrackProperties): Promise<void> {
@@ -124,11 +150,14 @@ export class Telemetry {
 					first: execTime,
 				};
 			} else {
-				// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 				this.executionCountsBuffer[workflowId][key]!.count++;
 			}
 
-			if (!properties.success && properties.error_node_type?.startsWith('n8n-nodes-base')) {
+			if (
+				!properties.success &&
+				properties.is_manual &&
+				properties.error_node_type?.startsWith('n8n-nodes-base')
+			) {
 				void this.track('Workflow execution errored', properties);
 			}
 		}
@@ -136,30 +165,20 @@ export class Telemetry {
 
 	async trackN8nStop(): Promise<void> {
 		clearInterval(this.pulseIntervalReference);
-		void this.track('User instance stopped');
-		return new Promise<void>(async (resolve) => {
-			await this.postHog.stop();
-
-			if (this.rudderStack) {
-				this.rudderStack.flush(resolve);
-			} else {
-				resolve();
-			}
-		});
+		await this.track('User instance stopped');
+		void Promise.all([this.postHog.stop(), this.rudderStack?.flush()]);
 	}
 
 	async identify(traits?: {
 		[key: string]: string | number | boolean | object | undefined | null;
 	}): Promise<void> {
-		return new Promise<void>((resolve) => {
+		const { instanceId } = this.instanceSettings;
+		return await new Promise<void>((resolve) => {
 			if (this.rudderStack) {
 				this.rudderStack.identify(
 					{
-						userId: this.instanceId,
-						traits: {
-							...traits,
-							instanceId: this.instanceId,
-						},
+						userId: instanceId,
+						traits: { ...traits, instanceId },
 					},
 					resolve,
 				);
@@ -174,17 +193,18 @@ export class Telemetry {
 		properties: ITelemetryTrackProperties = {},
 		{ withPostHog } = { withPostHog: false }, // whether to additionally track with PostHog
 	): Promise<void> {
-		return new Promise<void>((resolve) => {
+		const { instanceId } = this.instanceSettings;
+		return await new Promise<void>((resolve) => {
 			if (this.rudderStack) {
 				const { user_id } = properties;
-				const updatedProperties: ITelemetryTrackProperties = {
+				const updatedProperties = {
 					...properties,
-					instance_id: this.instanceId,
+					instance_id: instanceId,
 					version_cli: N8N_VERSION,
 				};
 
 				const payload = {
-					userId: `${this.instanceId}${user_id ? `#${user_id}` : ''}`,
+					userId: `${instanceId}${user_id ? `#${user_id}` : ''}`,
 					event: eventName,
 					properties: updatedProperties,
 				};
diff --git a/packages/cli/src/types/ai.types.ts b/packages/cli/src/types/ai.types.ts
new file mode 100644
index 0000000000000..be072d198bbc4
--- /dev/null
+++ b/packages/cli/src/types/ai.types.ts
@@ -0,0 +1,7 @@
+import type { BaseMessageChunk, BaseMessageLike } from '@langchain/core/messages';
+import type { BaseChatModelCallOptions } from '@langchain/core/language_models/chat_models';
+
+export interface N8nAIProvider {
+	invoke(message: BaseMessageLike[], options?: BaseChatModelCallOptions): Promise<string>;
+	mapResponse(data: BaseMessageChunk): string;
+}
diff --git a/packages/cli/src/types/commands.types.ts b/packages/cli/src/types/commands.types.ts
new file mode 100644
index 0000000000000..80e556ee622d9
--- /dev/null
+++ b/packages/cli/src/types/commands.types.ts
@@ -0,0 +1,50 @@
+import type { ExecutionStatus } from 'n8n-workflow';
+
+export interface IResult {
+	totalWorkflows: number;
+	slackMessage: string;
+	summary: {
+		failedExecutions: number;
+		successfulExecutions: number;
+		warningExecutions: number;
+		errors: IExecutionError[];
+		warnings: IExecutionError[];
+	};
+	coveredNodes: {
+		[nodeType: string]: number;
+	};
+	executions: IExecutionResult[];
+}
+
+export interface IExecutionResult {
+	workflowId: string;
+	workflowName: string;
+	executionTime: number; // Given in seconds with decimals for milliseconds
+	finished: boolean;
+	executionStatus: ExecutionStatus;
+	error?: string;
+	changes?: object;
+	coveredNodes: {
+		[nodeType: string]: number;
+	};
+}
+
+interface IExecutionError {
+	workflowId: string;
+	error: string;
+}
+
+export interface IWorkflowExecutionProgress {
+	workflowId: string;
+	status: ExecutionStatus;
+}
+
+export interface INodeSpecialCases {
+	[nodeName: string]: INodeSpecialCase;
+}
+
+export interface INodeSpecialCase {
+	ignoredProperties?: string[];
+	capResults?: number;
+	keepOnlyProperties?: string[];
+}
diff --git a/packages/cli/src/user/user.service.ts b/packages/cli/src/user/user.service.ts
deleted file mode 100644
index a7f8bff52d0c8..0000000000000
--- a/packages/cli/src/user/user.service.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import type { EntityManager, FindOptionsWhere } from 'typeorm';
-import { In } from 'typeorm';
-import * as Db from '@/Db';
-import { User } from '@db/entities/User';
-import type { IUserSettings } from '@/Interfaces';
-
-export class UserService {
-	static async get(where: FindOptionsWhere<User>): Promise<User | null> {
-		return Db.collections.User.findOne({
-			relations: ['globalRole'],
-			where,
-		});
-	}
-
-	static async getByIds(transaction: EntityManager, ids: string[]) {
-		return transaction.find(User, { where: { id: In(ids) } });
-	}
-
-	static async updateUserSettings(id: string, userSettings: Partial<IUserSettings>) {
-		const { settings: currentSettings } = await Db.collections.User.findOneOrFail({
-			where: { id },
-		});
-		return Db.collections.User.update(id, { settings: { ...currentSettings, ...userSettings } });
-	}
-}
diff --git a/packages/cli/src/utils.ts b/packages/cli/src/utils.ts
index c99ef97f500fa..6926c825bf371 100644
--- a/packages/cli/src/utils.ts
+++ b/packages/cli/src/utils.ts
@@ -1,13 +1,14 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import { CliWorkflowOperationError, SubworkflowOperationError } from 'n8n-workflow';
 import type { INode } from 'n8n-workflow';
-import { START_NODES } from './constants';
+import { STARTING_NODES } from './constants';
 
 /**
  * Returns if the given id is a valid workflow id
  */
 export function isWorkflowIdValid(id: string | null | undefined): boolean {
-	return !(typeof id === 'string' && isNaN(parseInt(id, 10)));
+	// TODO: could also check if id only contains nanoId characters
+	return typeof id === 'string' && id?.length <= 16;
 }
 
 function findWorkflowStart(executionMode: 'integrated' | 'cli') {
@@ -18,7 +19,7 @@ function findWorkflowStart(executionMode: 'integrated' | 'cli') {
 
 		if (executeWorkflowTriggerNode) return executeWorkflowTriggerNode;
 
-		const startNode = nodes.find((node) => START_NODES.includes(node.type));
+		const startNode = nodes.find((node) => STARTING_NODES.includes(node.type));
 
 		if (startNode) return startNode;
 
@@ -38,18 +39,6 @@ export const findSubworkflowStart = findWorkflowStart('integrated');
 
 export const findCliWorkflowStart = findWorkflowStart('cli');
 
-export const alphabetizeKeys = (obj: INode) =>
-	Object.keys(obj)
-		.sort()
-		.reduce<Partial<INode>>(
-			(acc, key) => ({
-				...acc,
-				// @ts-expect-error @TECH_DEBT Adding index signature to INode causes type issues downstream
-				[key]: obj[key],
-			}),
-			{},
-		);
-
 export const separate = <T>(array: T[], test: (element: T) => boolean) => {
 	const pass: T[] = [];
 	const fail: T[] = [];
@@ -58,3 +47,41 @@ export const separate = <T>(array: T[], test: (element: T) => boolean) => {
 
 	return [pass, fail];
 };
+
+export const toError = (maybeError: unknown) =>
+	// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+	maybeError instanceof Error ? maybeError : new Error(`${maybeError}`);
+
+export function isStringArray(value: unknown): value is string[] {
+	return Array.isArray(value) && value.every((item) => typeof item === 'string');
+}
+
+export const isIntegerString = (value: string) => /^\d+$/.test(value);
+
+export function isObjectLiteral(item: unknown): item is { [key: string]: string } {
+	return typeof item === 'object' && item !== null && !Array.isArray(item);
+}
+
+export function removeTrailingSlash(path: string) {
+	return path.endsWith('/') ? path.slice(0, -1) : path;
+}
+
+// return the difference between two arrays
+export function rightDiff<T1, T2>(
+	[arr1, keyExtractor1]: [T1[], (item: T1) => string],
+	[arr2, keyExtractor2]: [T2[], (item: T2) => string],
+): T2[] {
+	// create map { itemKey => true } for fast lookup for diff
+	const keyMap = arr1.reduce<{ [key: string]: true }>((map, item) => {
+		map[keyExtractor1(item)] = true;
+		return map;
+	}, {});
+
+	// diff against map
+	return arr2.reduce<T2[]>((acc, item) => {
+		if (!keyMap[keyExtractor2(item)]) {
+			acc.push(item);
+		}
+		return acc;
+	}, []);
+}
diff --git a/packages/cli/src/workflowTests/workflowTest.request.ts b/packages/cli/src/workflowTests/workflowTest.request.ts
new file mode 100644
index 0000000000000..404312dc0c7e5
--- /dev/null
+++ b/packages/cli/src/workflowTests/workflowTest.request.ts
@@ -0,0 +1,37 @@
+import type { AuthenticatedRequest } from '@/requests';
+
+export declare namespace WorkflowTestRequest {
+	type CreateUpdatePayload = Partial<{
+		workflowId: string;
+		description: string;
+	}>;
+
+	type CreateNodePayload = Partial<{
+		workflowTestId: string;
+		outputType: string;
+		errorMessage?: string;
+		nodeId: string;
+		data?: object[];
+	}>;
+
+	type UpdateNodePayload = {
+		id: string;
+		workflowTestId: string;
+		outputType: string;
+		errorMessage?: string;
+		nodeId: string;
+		data?: object;
+	};
+
+	type Create = AuthenticatedRequest<{}, {}, CreateUpdatePayload>;
+
+	type Get = AuthenticatedRequest<{ workflowId: string }>;
+
+	type GetNodesOutput = AuthenticatedRequest<{ workflowTestId: string }>;
+
+	type CreatNodesOutput = AuthenticatedRequest<{ workflowTestId: string }, {}, CreateNodePayload>;
+
+	type UpdateNodesOutput = AuthenticatedRequest<{ workflowTestId: string }, {}, UpdateNodePayload>;
+
+	type GetAll = AuthenticatedRequest<{}, {}, {}, { filter: string }>;
+}
diff --git a/packages/cli/src/workflowTests/workflowTest.service.ts b/packages/cli/src/workflowTests/workflowTest.service.ts
new file mode 100644
index 0000000000000..2fec5cda069d9
--- /dev/null
+++ b/packages/cli/src/workflowTests/workflowTest.service.ts
@@ -0,0 +1,29 @@
+import { Service, Container } from 'typedi';
+import { WorkflowTestRepository } from '@db/repositories/workflowTest.repository';
+import type { FindOptionsWhere } from '@n8n/typeorm';
+import type { WorkflowTest } from '@/databases/entities/WorkflowTest';
+import type { NodeOutput } from '@/databases/entities/NodeOutput';
+import { NodeOutputRepository } from '@/databases/repositories/nodeOutput.repository';
+
+@Service()
+export class WorkflowTestService {
+	constructor(
+		private readonly workflowTestRepository: WorkflowTestRepository,
+	) {}
+
+    async get(workflow: FindOptionsWhere<WorkflowTest>, options?: { relations: string[] }) {
+		return Container.get(WorkflowTestRepository).findOne({ where: workflow, relations: options?.relations });
+	}
+
+	async getMany(): Promise<WorkflowTest[]> {
+        return Container.get(WorkflowTestRepository).find();
+	}
+
+	async getManyByWorkflowId(workflowId: string): Promise<WorkflowTest[]> {
+        return Container.get(WorkflowTestRepository).find({ where: { workflowId } });
+	}
+
+	async getNodesOutput(workflowTestId: string): Promise<NodeOutput[]> {
+        return Container.get(NodeOutputRepository).find({ where: { workflowTestId } });
+	}
+}
diff --git a/packages/cli/src/workflowTests/workflowTests.controller.ts b/packages/cli/src/workflowTests/workflowTests.controller.ts
new file mode 100644
index 0000000000000..184cb38e8749c
--- /dev/null
+++ b/packages/cli/src/workflowTests/workflowTests.controller.ts
@@ -0,0 +1,166 @@
+import { Container } from 'typedi';
+
+import { Get, Patch, Post, RestController } from '@/decorators';
+import { WorkflowTest } from './../databases/entities/WorkflowTest';
+import { NodeOutput } from './../databases/entities/NodeOutput';
+import { WorkflowTestRepository } from '@db/repositories/workflowTest.repository';
+import { WorkflowRepository } from '@db/repositories/workflow.repository';
+import { NodeOutputRepository } from '@db/repositories/nodeOutput.repository';
+import { validateEntity } from '@/GenericHelpers';
+import { listQueryMiddleware } from '@/middlewares';
+import { Logger } from '@/Logger';
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
+import { InternalServerError } from '@/errors/response-errors/internal-server.error';
+import { WorkflowTestRequest } from './workflowTest.request';
+import { WorkflowTestService } from './workflowTest.service';
+
+@RestController('/workflow-tests')
+export class WorkflowTestsController {
+	constructor(
+		private readonly logger: Logger,
+	) {}
+
+	@Post('/')
+	async create(req: WorkflowTestRequest.Create) {
+        const workflow = await Container.get(WorkflowRepository).findOne({
+			where: { id: req.body.workflowId },
+		});
+		if (!workflow) {
+			throw new BadRequestError('Workflow not found');
+		}
+
+		const newWorkflowTest = new WorkflowTest();
+
+		Object.assign(newWorkflowTest, req.body);
+
+		newWorkflowTest.createdAt = new Date();
+		newWorkflowTest.updatedAt = new Date();
+
+		await validateEntity(newWorkflowTest);
+
+		const savedWorkflowTest = await Container.get(WorkflowTestRepository).save(newWorkflowTest);
+
+		if (!savedWorkflowTest) {
+			this.logger.error('Failed to create workflow test', { userId: req.user.id });
+			throw new InternalServerError('Failed to save workflow test');
+		}
+
+		const workflowTest = Container.get(WorkflowTestService).getManyByWorkflowId(
+			savedWorkflowTest.workflowId,
+		);
+
+		return workflowTest;
+	}
+
+	@Get('/', { middlewares: listQueryMiddleware })
+	async getAll() {
+		return Container.get(WorkflowTestService).getMany();
+	}
+
+	@Get('/:workflowId')
+	async getWorkflowTest(req: WorkflowTestRequest.Get) {
+		const workflow = await Container.get(WorkflowRepository).findOne({
+			where: { id: req.params.workflowId },
+		});
+		if (!workflow) {
+			throw new BadRequestError('Workflow not found');
+		}
+
+		return Container.get(WorkflowTestService).getManyByWorkflowId(req.params.workflowId);
+	}
+
+    @Get('/nodes-output/:workflowTestId')
+	async getNodesOutput(req: WorkflowTestRequest.GetNodesOutput) {
+        const workflowTest = await await Container.get(WorkflowTestRepository).findOne({
+			where: { id: req.params.workflowTestId },
+		});
+		if (!workflowTest) {
+			throw new BadRequestError('Workflow Test not found');
+		}
+
+		const result = await Container.get(WorkflowTestService).getNodesOutput(req.params.workflowTestId);
+		const nodesOuput = result?.map((output) => {
+			try {output.data = JSON.parse(output.data)} catch(e){};
+			return output
+		})
+		return nodesOuput;
+	}
+
+	@Post('/nodes-output/:workflowTestId')
+	async createNodesOutput(req: WorkflowTestRequest.CreatNodesOutput) {
+		const workflowTest = await Container.get(WorkflowTestRepository).findOne({
+			where: { id: req.params.workflowTestId },
+		});
+		if (!workflowTest) {
+			throw new BadRequestError('Workflow Test not found');
+		}
+
+		const nodeOuput = new NodeOutput();
+		const nodeData = {
+			workflowTestId: req.body.workflowTestId,
+			nodeId: req.body.nodeId,
+			data: req.body.outputType === 'data' ? JSON.stringify(req.body.data) : '[]',
+			errorMessage: req.body.outputType === 'error' ? req.body.errorMessage : '',
+		};
+
+		Object.assign(nodeOuput, nodeData);
+		nodeOuput.createdAt = new Date();
+		nodeOuput.updatedAt = new Date();
+
+		const savedNodeOutput = await Container.get(NodeOutputRepository).save(nodeOuput);
+
+		if (!savedNodeOutput) {
+			this.logger.error('Failed to create node output', { userId: req.user.id });
+			throw new InternalServerError('Failed to save node output');
+		}
+
+		return await Container.get(WorkflowTestService).getNodesOutput(req.params.workflowTestId);
+	}
+
+	@Patch('/nodes-output/:workflowTestId')
+	async updateNodesOutput(req: WorkflowTestRequest.UpdateNodesOutput) {
+		const workflowTest = await Container.get(WorkflowTestRepository).findOne({
+			where: { id: req.params.workflowTestId },
+		});
+		if (!workflowTest) {
+			throw new BadRequestError('Workflow Test not found');
+		}
+
+		const nodeOutput = await Container.get(NodeOutputRepository).findOne({
+			where: { id: req.body.id },
+		});
+
+		if (!nodeOutput || !req.body.id || req.body.id !== nodeOutput.id) {
+			throw new BadRequestError('Node output not found');
+		}
+
+		if (nodeOutput.workflowTestId !== req.params.workflowTestId) {
+			throw new BadRequestError('Node output does not belong to the workflow test');
+		}
+
+		const nodeOutputId = nodeOutput.id;
+		const nodeData = {
+			id: nodeOutputId,
+			workflowTestId: req.body.workflowTestId,
+			nodeId: req.body.nodeId,
+			data: req.body.outputType === 'data' ? JSON.stringify(req.body.data) : '[]',
+			errorMessage: req.body.outputType === 'error' ? req.body.errorMessage : '',
+		};
+		const nodeKey = {
+			id: nodeOutputId,
+			workflowTestId: req.body.workflowTestId,
+			nodeId: req.body.nodeId,
+		};
+
+		const nodeOuput = new NodeOutput();
+		Object.assign(nodeOuput, nodeData);
+		const updatedNodeOutput = await Container.get(NodeOutputRepository).update(nodeKey, nodeOuput);
+
+		if (!updatedNodeOutput) {
+			this.logger.error('Failed to update node output', { userId: req.user.id });
+			throw new InternalServerError('Failed to update node output');
+		}
+
+		return Container.get(WorkflowTestService).getNodesOutput(req.params.workflowTestId);
+	}
+}
diff --git a/packages/cli/src/workflows/workflow.request.ts b/packages/cli/src/workflows/workflow.request.ts
new file mode 100644
index 0000000000000..77d653a2a052c
--- /dev/null
+++ b/packages/cli/src/workflows/workflow.request.ts
@@ -0,0 +1,53 @@
+import type { IWorkflowDb } from '@/Interfaces';
+import type { AuthenticatedRequest } from '@/requests';
+import type {
+	INode,
+	IConnections,
+	IWorkflowSettings,
+	IRunData,
+	IPinData,
+	StartNodeData,
+} from 'n8n-workflow';
+
+export declare namespace WorkflowRequest {
+	type CreateUpdatePayload = Partial<{
+		id: string; // delete if sent
+		name: string;
+		nodes: INode[];
+		connections: IConnections;
+		settings: IWorkflowSettings;
+		active: boolean;
+		tags: string[];
+		hash: string;
+		meta: Record<string, unknown>;
+	}>;
+
+	type ManualRunPayload = {
+		workflowData: IWorkflowDb;
+		runData: IRunData;
+		pinData: IPinData;
+		startNodes?: StartNodeData[];
+		destinationNode?: string;
+	};
+
+	type Create = AuthenticatedRequest<{}, {}, CreateUpdatePayload>;
+
+	type Get = AuthenticatedRequest<{ id: string }>;
+
+	type Delete = Get;
+
+	type Update = AuthenticatedRequest<
+		{ id: string },
+		{},
+		CreateUpdatePayload,
+		{ forceSave?: string }
+	>;
+
+	type NewName = AuthenticatedRequest<{}, {}, {}, { name?: string }>;
+
+	type ManualRun = AuthenticatedRequest<{}, {}, ManualRunPayload>;
+
+	type Share = AuthenticatedRequest<{ workflowId: string }, {}, { shareWithIds: string[] }>;
+
+	type FromUrl = AuthenticatedRequest<{}, {}, {}, { url?: string }>;
+}
diff --git a/packages/cli/src/workflows/workflow.service.ee.ts b/packages/cli/src/workflows/workflow.service.ee.ts
new file mode 100644
index 0000000000000..a95536d80f86b
--- /dev/null
+++ b/packages/cli/src/workflows/workflow.service.ee.ts
@@ -0,0 +1,242 @@
+import { Service } from 'typedi';
+import omit from 'lodash/omit';
+import { ApplicationError, NodeOperationError } from 'n8n-workflow';
+
+import type { CredentialsEntity } from '@db/entities/CredentialsEntity';
+import type { User } from '@db/entities/User';
+import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
+import { CredentialsRepository } from '@db/repositories/credentials.repository';
+import { WorkflowRepository } from '@db/repositories/workflow.repository';
+import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
+import { CredentialsService } from '@/credentials/credentials.service';
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
+import { NotFoundError } from '@/errors/response-errors/not-found.error';
+import { Logger } from '@/Logger';
+import type {
+	CredentialUsedByWorkflow,
+	WorkflowWithSharingsAndCredentials,
+} from './workflows.types';
+
+@Service()
+export class EnterpriseWorkflowService {
+	constructor(
+		private readonly logger: Logger,
+		private readonly sharedWorkflowRepository: SharedWorkflowRepository,
+		private readonly workflowRepository: WorkflowRepository,
+		private readonly credentialsRepository: CredentialsRepository,
+		private readonly credentialsService: CredentialsService,
+	) {}
+
+	async isOwned(
+		user: User,
+		workflowId: string,
+	): Promise<{ ownsWorkflow: boolean; workflow?: WorkflowEntity }> {
+		const sharing = await this.sharedWorkflowRepository.getSharing(
+			user,
+			workflowId,
+			{ allowGlobalScope: false },
+			['workflow'],
+		);
+
+		if (!sharing || sharing.role !== 'workflow:owner') return { ownsWorkflow: false };
+
+		const { workflow } = sharing;
+
+		return { ownsWorkflow: true, workflow };
+	}
+
+	addOwnerAndSharings(workflow: WorkflowWithSharingsAndCredentials): void {
+		workflow.ownedBy = null;
+		workflow.sharedWith = [];
+		if (!workflow.usedCredentials) {
+			workflow.usedCredentials = [];
+		}
+
+		workflow.shared?.forEach(({ user, role }) => {
+			const { id, email, firstName, lastName } = user;
+
+			if (role === 'workflow:owner') {
+				workflow.ownedBy = { id, email, firstName, lastName };
+				return;
+			}
+
+			workflow.sharedWith?.push({ id, email, firstName, lastName });
+		});
+
+		delete workflow.shared;
+	}
+
+	async addCredentialsToWorkflow(
+		workflow: WorkflowWithSharingsAndCredentials,
+		currentUser: User,
+	): Promise<void> {
+		workflow.usedCredentials = [];
+		const userCredentials = await this.credentialsService.getMany(currentUser, { onlyOwn: true });
+		const credentialIdsUsedByWorkflow = new Set<string>();
+		workflow.nodes.forEach((node) => {
+			if (!node.credentials) {
+				return;
+			}
+			Object.keys(node.credentials).forEach((credentialType) => {
+				const credential = node.credentials?.[credentialType];
+				if (!credential?.id) {
+					return;
+				}
+				credentialIdsUsedByWorkflow.add(credential.id);
+			});
+		});
+		const workflowCredentials = await this.credentialsRepository.getManyByIds(
+			Array.from(credentialIdsUsedByWorkflow),
+			{ withSharings: true },
+		);
+		const userCredentialIds = userCredentials.map((credential) => credential.id);
+		workflowCredentials.forEach((credential) => {
+			const credentialId = credential.id;
+			const workflowCredential: CredentialUsedByWorkflow = {
+				id: credentialId,
+				name: credential.name,
+				type: credential.type,
+				currentUserHasAccess: userCredentialIds.includes(credentialId),
+				sharedWith: [],
+				ownedBy: null,
+			};
+			credential.shared?.forEach(({ user, role }) => {
+				const { id, email, firstName, lastName } = user;
+				if (role === 'credential:owner') {
+					workflowCredential.ownedBy = { id, email, firstName, lastName };
+				} else {
+					workflowCredential.sharedWith?.push({ id, email, firstName, lastName });
+				}
+			});
+			workflow.usedCredentials?.push(workflowCredential);
+		});
+	}
+
+	validateCredentialPermissionsToUser(
+		workflow: WorkflowEntity,
+		allowedCredentials: CredentialsEntity[],
+	) {
+		workflow.nodes.forEach((node) => {
+			if (!node.credentials) {
+				return;
+			}
+			Object.keys(node.credentials).forEach((credentialType) => {
+				const credentialId = node.credentials?.[credentialType].id;
+				if (credentialId === undefined) return;
+				const matchedCredential = allowedCredentials.find(({ id }) => id === credentialId);
+				if (!matchedCredential) {
+					throw new ApplicationError(
+						'The workflow contains credentials that you do not have access to',
+					);
+				}
+			});
+		});
+	}
+
+	async preventTampering(workflow: WorkflowEntity, workflowId: string, user: User) {
+		const previousVersion = await this.workflowRepository.get({ id: workflowId });
+
+		if (!previousVersion) {
+			throw new NotFoundError('Workflow not found');
+		}
+
+		const allCredentials = await this.credentialsService.getMany(user);
+
+		try {
+			return this.validateWorkflowCredentialUsage(workflow, previousVersion, allCredentials);
+		} catch (error) {
+			if (error instanceof NodeOperationError) {
+				throw new BadRequestError(error.message);
+			}
+			throw new BadRequestError(
+				'Invalid workflow credentials - make sure you have access to all credentials and try again.',
+			);
+		}
+	}
+
+	validateWorkflowCredentialUsage(
+		newWorkflowVersion: WorkflowEntity,
+		previousWorkflowVersion: WorkflowEntity,
+		credentialsUserHasAccessTo: CredentialsEntity[],
+	) {
+		/**
+		 * We only need to check nodes that use credentials the current user cannot access,
+		 * since these can be 2 possibilities:
+		 * - Same ID already exist: it's a read only node and therefore cannot be changed
+		 * - It's a new node which indicates tampering and therefore must fail saving
+		 */
+
+		const allowedCredentialIds = credentialsUserHasAccessTo.map((cred) => cred.id);
+
+		const nodesWithCredentialsUserDoesNotHaveAccessTo = this.getNodesWithInaccessibleCreds(
+			newWorkflowVersion,
+			allowedCredentialIds,
+		);
+
+		// If there are no nodes with credentials the user does not have access to we can skip the rest
+		if (nodesWithCredentialsUserDoesNotHaveAccessTo.length === 0) {
+			return newWorkflowVersion;
+		}
+
+		const previouslyExistingNodeIds = previousWorkflowVersion.nodes.map((node) => node.id);
+
+		// If it's a new node we can't allow it to be saved
+		// since it uses creds the node doesn't have access
+		const isTamperingAttempt = (inaccessibleCredNodeId: string) =>
+			!previouslyExistingNodeIds.includes(inaccessibleCredNodeId);
+
+		nodesWithCredentialsUserDoesNotHaveAccessTo.forEach((node) => {
+			if (isTamperingAttempt(node.id)) {
+				this.logger.verbose('Blocked workflow update due to tampering attempt', {
+					nodeType: node.type,
+					nodeName: node.name,
+					nodeId: node.id,
+					nodeCredentials: node.credentials,
+				});
+				// Node is new, so this is probably a tampering attempt. Throw an error
+				throw new NodeOperationError(
+					node,
+					`You don't have access to the credentials in the '${node.name}' node. Ask the owner to share them with you.`,
+				);
+			}
+			// Replace the node with the previous version of the node
+			// Since it cannot be modified (read only node)
+			const nodeIdx = newWorkflowVersion.nodes.findIndex(
+				(newWorkflowNode) => newWorkflowNode.id === node.id,
+			);
+
+			this.logger.debug('Replacing node with previous version when saving updated workflow', {
+				nodeType: node.type,
+				nodeName: node.name,
+				nodeId: node.id,
+			});
+			const previousNodeVersion = previousWorkflowVersion.nodes.find(
+				(previousNode) => previousNode.id === node.id,
+			);
+			// Allow changing only name, position and disabled status for read-only nodes
+			Object.assign(
+				newWorkflowVersion.nodes[nodeIdx],
+				omit(previousNodeVersion, ['name', 'position', 'disabled']),
+			);
+		});
+
+		return newWorkflowVersion;
+	}
+
+	/** Get all nodes in a workflow where the node credential is not accessible to the user. */
+	getNodesWithInaccessibleCreds(workflow: WorkflowEntity, userCredIds: string[]) {
+		if (!workflow.nodes) {
+			return [];
+		}
+		return workflow.nodes.filter((node) => {
+			if (!node.credentials) return false;
+
+			const allUsedCredentials = Object.values(node.credentials);
+
+			const allUsedCredentialIds = allUsedCredentials.map((nodeCred) => nodeCred.id?.toString());
+			return allUsedCredentialIds.some(
+				(nodeCredId) => nodeCredId && !userCredIds.includes(nodeCredId),
+			);
+		});
+	}
+}
diff --git a/packages/cli/src/workflows/workflow.service.ts b/packages/cli/src/workflows/workflow.service.ts
new file mode 100644
index 0000000000000..a752e3e5c40ca
--- /dev/null
+++ b/packages/cli/src/workflows/workflow.service.ts
@@ -0,0 +1,266 @@
+import Container, { Service } from 'typedi';
+import { NodeApiError } from 'n8n-workflow';
+import pick from 'lodash/pick';
+import omit from 'lodash/omit';
+import { v4 as uuid } from 'uuid';
+import { BinaryDataService } from 'n8n-core';
+
+import config from '@/config';
+import type { User } from '@db/entities/User';
+import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
+import type { WorkflowSharingRole } from '@db/entities/SharedWorkflow';
+import { ExecutionRepository } from '@db/repositories/execution.repository';
+import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
+import { WorkflowTagMappingRepository } from '@db/repositories/workflowTagMapping.repository';
+import { WorkflowRepository } from '@db/repositories/workflow.repository';
+import { ActiveWorkflowManager } from '@/ActiveWorkflowManager';
+import * as WorkflowHelpers from '@/WorkflowHelpers';
+import { validateEntity } from '@/GenericHelpers';
+import { ExternalHooks } from '@/ExternalHooks';
+import { hasSharing, type ListQuery } from '@/requests';
+import { TagService } from '@/services/tag.service';
+import { InternalHooks } from '@/InternalHooks';
+import { OwnershipService } from '@/services/ownership.service';
+import { WorkflowHistoryService } from './workflowHistory/workflowHistory.service.ee';
+import { Logger } from '@/Logger';
+import { OrchestrationService } from '@/services/orchestration.service';
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
+import { NotFoundError } from '@/errors/response-errors/not-found.error';
+
+@Service()
+export class WorkflowService {
+	constructor(
+		private readonly logger: Logger,
+		private readonly executionRepository: ExecutionRepository,
+		private readonly sharedWorkflowRepository: SharedWorkflowRepository,
+		private readonly workflowRepository: WorkflowRepository,
+		private readonly workflowTagMappingRepository: WorkflowTagMappingRepository,
+		private readonly binaryDataService: BinaryDataService,
+		private readonly ownershipService: OwnershipService,
+		private readonly tagService: TagService,
+		private readonly workflowHistoryService: WorkflowHistoryService,
+		private readonly orchestrationService: OrchestrationService,
+		private readonly externalHooks: ExternalHooks,
+		private readonly activeWorkflowManager: ActiveWorkflowManager,
+	) {}
+
+	async getMany(sharedWorkflowIds: string[], options?: ListQuery.Options) {
+		const { workflows, count } = await this.workflowRepository.getMany(sharedWorkflowIds, options);
+
+		return hasSharing(workflows)
+			? {
+					workflows: workflows.map((w) => this.ownershipService.addOwnedByAndSharedWith(w)),
+					count,
+				}
+			: { workflows, count };
+	}
+
+	// eslint-disable-next-line complexity
+	async update(
+		user: User,
+		workflow: WorkflowEntity,
+		workflowId: string,
+		tagIds?: string[],
+		forceSave?: boolean,
+		roles?: WorkflowSharingRole[],
+	): Promise<WorkflowEntity> {
+		const shared = await this.sharedWorkflowRepository.findSharing(
+			workflowId,
+			user,
+			'workflow:update',
+			{ roles },
+		);
+
+		if (!shared) {
+			this.logger.verbose('User attempted to update a workflow without permissions', {
+				workflowId,
+				userId: user.id,
+			});
+			throw new NotFoundError(
+				'You do not have permission to update this workflow. Ask the owner to share it with you.',
+			);
+		}
+
+		if (
+			!forceSave &&
+			workflow.versionId !== '' &&
+			workflow.versionId !== shared.workflow.versionId
+		) {
+			throw new BadRequestError(
+				'Your most recent changes may be lost, because someone else just updated this workflow. Open this workflow in a new tab to see those new updates.',
+				100,
+			);
+		}
+
+		if (Object.keys(omit(workflow, ['id', 'versionId', 'active'])).length > 0) {
+			// Update the workflow's version when changing properties such as
+			// `name`, `pinData`, `nodes`, `connections`, `settings` or `tags`
+			workflow.versionId = uuid();
+			this.logger.verbose(
+				`Updating versionId for workflow ${workflowId} for user ${user.id} after saving`,
+				{
+					previousVersionId: shared.workflow.versionId,
+					newVersionId: workflow.versionId,
+				},
+			);
+		}
+
+		// check credentials for old format
+		await WorkflowHelpers.replaceInvalidCredentials(workflow);
+
+		WorkflowHelpers.addNodeIds(workflow);
+
+		await this.externalHooks.run('workflow.update', [workflow]);
+
+		/**
+		 * If the workflow being updated is stored as `active`, remove it from
+		 * active workflows in memory, and re-add it after the update.
+		 *
+		 * If a trigger or poller in the workflow was updated, the new value
+		 * will take effect only on removing and re-adding.
+		 */
+		if (shared.workflow.active) {
+			await this.activeWorkflowManager.remove(workflowId);
+		}
+
+		const workflowSettings = workflow.settings ?? {};
+
+		const keysAllowingDefault = [
+			'timezone',
+			'saveDataErrorExecution',
+			'saveDataSuccessExecution',
+			'saveManualExecutions',
+			'saveExecutionProgress',
+		] as const;
+		for (const key of keysAllowingDefault) {
+			// Do not save the default value
+			if (workflowSettings[key] === 'DEFAULT') {
+				delete workflowSettings[key];
+			}
+		}
+
+		if (workflowSettings.executionTimeout === config.get('executions.timeout')) {
+			// Do not save when default got set
+			delete workflowSettings.executionTimeout;
+		}
+
+		if (workflow.name) {
+			workflow.updatedAt = new Date(); // required due to atomic update
+			await validateEntity(workflow);
+		}
+
+		await this.workflowRepository.update(
+			workflowId,
+			pick(workflow, [
+				'name',
+				'active',
+				'nodes',
+				'connections',
+				'meta',
+				'settings',
+				'staticData',
+				'pinData',
+				'versionId',
+			]),
+		);
+
+		if (tagIds && !config.getEnv('workflowTagsDisabled')) {
+			await this.workflowTagMappingRepository.overwriteTaggings(workflowId, tagIds);
+		}
+
+		if (workflow.versionId !== shared.workflow.versionId) {
+			await this.workflowHistoryService.saveVersion(user, workflow, workflowId);
+		}
+
+		const relations = config.getEnv('workflowTagsDisabled') ? [] : ['tags'];
+
+		// We sadly get nothing back from "update". Neither if it updated a record
+		// nor the new value. So query now the hopefully updated entry.
+		const updatedWorkflow = await this.workflowRepository.findOne({
+			where: { id: workflowId },
+			relations,
+		});
+
+		if (updatedWorkflow === null) {
+			throw new BadRequestError(
+				`Workflow with ID "${workflowId}" could not be found to be updated.`,
+			);
+		}
+
+		if (updatedWorkflow.tags?.length && tagIds?.length) {
+			updatedWorkflow.tags = this.tagService.sortByRequestOrder(updatedWorkflow.tags, {
+				requestOrder: tagIds,
+			});
+		}
+
+		await this.externalHooks.run('workflow.afterUpdate', [updatedWorkflow]);
+		void Container.get(InternalHooks).onWorkflowSaved(user, updatedWorkflow, false);
+
+		if (updatedWorkflow.active) {
+			// When the workflow is supposed to be active add it again
+			try {
+				await this.externalHooks.run('workflow.activate', [updatedWorkflow]);
+				await this.activeWorkflowManager.add(
+					workflowId,
+					shared.workflow.active ? 'update' : 'activate',
+				);
+			} catch (error) {
+				// If workflow could not be activated set it again to inactive
+				// and revert the versionId change so UI remains consistent
+				await this.workflowRepository.update(workflowId, {
+					active: false,
+					versionId: shared.workflow.versionId,
+				});
+
+				// Also set it in the returned data
+				updatedWorkflow.active = false;
+
+				let message;
+				if (error instanceof NodeApiError) message = error.description;
+				message = message ?? (error as Error).message;
+
+				// Now return the original error for UI to display
+				throw new BadRequestError(message);
+			}
+		}
+
+		await this.orchestrationService.init();
+
+		return updatedWorkflow;
+	}
+
+	async delete(user: User, workflowId: string): Promise<WorkflowEntity | undefined> {
+		await this.externalHooks.run('workflow.delete', [workflowId]);
+
+		const sharedWorkflow = await this.sharedWorkflowRepository.findSharing(
+			workflowId,
+			user,
+			'workflow:delete',
+			{ roles: ['workflow:owner'] },
+		);
+
+		if (!sharedWorkflow) {
+			return;
+		}
+
+		if (sharedWorkflow.workflow.active) {
+			// deactivate before deleting
+			await this.activeWorkflowManager.remove(workflowId);
+		}
+
+		const idsForDeletion = await this.executionRepository
+			.find({
+				select: ['id'],
+				where: { workflowId },
+			})
+			.then((rows) => rows.map(({ id: executionId }) => ({ workflowId, executionId })));
+
+		await this.workflowRepository.delete(workflowId);
+		await this.binaryDataService.deleteMany(idsForDeletion);
+
+		void Container.get(InternalHooks).onWorkflowDeleted(user, workflowId, false);
+		await this.externalHooks.run('workflow.afterDelete', [workflowId]);
+
+		return sharedWorkflow.workflow;
+	}
+}
diff --git a/packages/cli/src/workflows/workflowExecution.service.ts b/packages/cli/src/workflows/workflowExecution.service.ts
new file mode 100644
index 0000000000000..c77b10244917d
--- /dev/null
+++ b/packages/cli/src/workflows/workflowExecution.service.ts
@@ -0,0 +1,362 @@
+import { Service } from 'typedi';
+import type {
+	IDeferredPromise,
+	IExecuteData,
+	IExecuteResponsePromiseData,
+	INode,
+	INodeExecutionData,
+	IPinData,
+	IRunExecutionData,
+	IWorkflowExecuteAdditionalData,
+	WorkflowExecuteMode,
+} from 'n8n-workflow';
+import {
+	SubworkflowOperationError,
+	Workflow,
+	ErrorReporterProxy as ErrorReporter,
+} from 'n8n-workflow';
+
+import config from '@/config';
+import type { User } from '@db/entities/User';
+import { ExecutionRepository } from '@db/repositories/execution.repository';
+import { WorkflowRepository } from '@db/repositories/workflow.repository';
+import * as WorkflowHelpers from '@/WorkflowHelpers';
+import type { WorkflowRequest } from '@/workflows/workflow.request';
+import type {
+	ExecutionPayload,
+	IWorkflowDb,
+	IWorkflowErrorData,
+	IWorkflowExecutionDataProcess,
+} from '@/Interfaces';
+import { NodeTypes } from '@/NodeTypes';
+import { WorkflowRunner } from '@/WorkflowRunner';
+import * as WorkflowExecuteAdditionalData from '@/WorkflowExecuteAdditionalData';
+import { TestWebhooks } from '@/TestWebhooks';
+import { Logger } from '@/Logger';
+import { PermissionChecker } from '@/UserManagement/PermissionChecker';
+
+@Service()
+export class WorkflowExecutionService {
+	constructor(
+		private readonly logger: Logger,
+		private readonly executionRepository: ExecutionRepository,
+		private readonly workflowRepository: WorkflowRepository,
+		private readonly nodeTypes: NodeTypes,
+		private readonly testWebhooks: TestWebhooks,
+		private readonly permissionChecker: PermissionChecker,
+		private readonly workflowRunner: WorkflowRunner,
+	) {}
+
+	async runWorkflow(
+		workflowData: IWorkflowDb,
+		node: INode,
+		data: INodeExecutionData[][],
+		additionalData: IWorkflowExecuteAdditionalData,
+		mode: WorkflowExecuteMode,
+		responsePromise?: IDeferredPromise<IExecuteResponsePromiseData>,
+	) {
+		const nodeExecutionStack: IExecuteData[] = [
+			{
+				node,
+				data: {
+					main: data,
+				},
+				source: null,
+			},
+		];
+
+		const executionData: IRunExecutionData = {
+			startData: {},
+			resultData: {
+				runData: {},
+			},
+			executionData: {
+				contextData: {},
+				metadata: {},
+				nodeExecutionStack,
+				waitingExecution: {},
+				waitingExecutionSource: {},
+			},
+		};
+
+		// Start the workflow
+		const runData: IWorkflowExecutionDataProcess = {
+			userId: additionalData.userId,
+			executionMode: mode,
+			executionData,
+			workflowData,
+		};
+
+		return await this.workflowRunner.run(runData, true, undefined, undefined, responsePromise);
+	}
+
+	async executeManually(
+		{
+			workflowData,
+			runData,
+			pinData,
+			startNodes,
+			destinationNode,
+		}: WorkflowRequest.ManualRunPayload,
+		user: User,
+		pushRef?: string,
+	) {
+		const pinnedTrigger = this.selectPinnedActivatorStarter(
+			workflowData,
+			startNodes?.map((nodeData) => nodeData.name),
+			pinData,
+		);
+
+		// If webhooks nodes exist and are active we have to wait for till we receive a call
+		if (
+			pinnedTrigger === null &&
+			(runData === undefined ||
+				startNodes === undefined ||
+				startNodes.length === 0 ||
+				destinationNode === undefined)
+		) {
+			const additionalData = await WorkflowExecuteAdditionalData.getBase(user.id);
+
+			const needsWebhook = await this.testWebhooks.needsWebhook(
+				user.id,
+				workflowData,
+				additionalData,
+				runData,
+				pushRef,
+				destinationNode,
+			);
+
+			if (needsWebhook) return { waitingForWebhook: true };
+		}
+
+		// For manual testing always set to not active
+		workflowData.active = false;
+
+		// Start the workflow
+		const data: IWorkflowExecutionDataProcess = {
+			destinationNode,
+			executionMode: 'manual',
+			runData,
+			pinData,
+			pushRef,
+			startNodes,
+			workflowData,
+			userId: user.id,
+		};
+
+		const hasRunData = (node: INode) => runData !== undefined && !!runData[node.name];
+
+		if (pinnedTrigger && !hasRunData(pinnedTrigger)) {
+			data.startNodes = [{ name: pinnedTrigger.name, sourceData: null }];
+		}
+
+		const executionId = await this.workflowRunner.run(data);
+
+		return {
+			executionId,
+		};
+	}
+
+	/** Executes an error workflow */
+	async executeErrorWorkflow(
+		workflowId: string,
+		workflowErrorData: IWorkflowErrorData,
+		runningUser: User,
+	): Promise<void> {
+		// Wrap everything in try/catch to make sure that no errors bubble up and all get caught here
+		try {
+			const workflowData = await this.workflowRepository.findOneBy({ id: workflowId });
+			if (workflowData === null) {
+				// The error workflow could not be found
+				this.logger.error(
+					`Calling Error Workflow for "${workflowErrorData.workflow.id}". Could not find error workflow "${workflowId}"`,
+					{ workflowId },
+				);
+				return;
+			}
+
+			const executionMode = 'error';
+			const workflowInstance = new Workflow({
+				id: workflowId,
+				name: workflowData.name,
+				nodeTypes: this.nodeTypes,
+				nodes: workflowData.nodes,
+				connections: workflowData.connections,
+				active: workflowData.active,
+				staticData: workflowData.staticData,
+				settings: workflowData.settings,
+			});
+
+			try {
+				const failedNode = workflowErrorData.execution?.lastNodeExecuted
+					? workflowInstance.getNode(workflowErrorData.execution?.lastNodeExecuted)
+					: undefined;
+				await this.permissionChecker.checkSubworkflowExecutePolicy(
+					workflowInstance,
+					workflowErrorData.workflow.id!,
+					failedNode ?? undefined,
+				);
+			} catch (error) {
+				const initialNode = workflowInstance.getStartNode();
+				if (initialNode) {
+					const errorWorkflowPermissionError = new SubworkflowOperationError(
+						`Another workflow: (ID ${workflowErrorData.workflow.id}) tried to invoke this workflow to handle errors.`,
+						"Unfortunately current permissions do not allow this. Please check that this workflow's settings allow it to be called by others",
+					);
+
+					// Create a fake execution and save it to DB.
+					const fakeExecution = WorkflowHelpers.generateFailedExecutionFromError(
+						'error',
+						errorWorkflowPermissionError,
+						initialNode,
+					);
+
+					const fullExecutionData: ExecutionPayload = {
+						data: fakeExecution.data,
+						mode: fakeExecution.mode,
+						finished: false,
+						startedAt: new Date(),
+						stoppedAt: new Date(),
+						workflowData,
+						waitTill: null,
+						status: fakeExecution.status,
+						workflowId: workflowData.id,
+					};
+
+					await this.executionRepository.createNewExecution(fullExecutionData);
+				}
+				this.logger.info('Error workflow execution blocked due to subworkflow settings', {
+					erroredWorkflowId: workflowErrorData.workflow.id,
+					errorWorkflowId: workflowId,
+				});
+				return;
+			}
+
+			let node: INode;
+			let workflowStartNode: INode | undefined;
+			const ERROR_TRIGGER_TYPE = config.getEnv('nodes.errorTriggerType');
+			for (const nodeName of Object.keys(workflowInstance.nodes)) {
+				node = workflowInstance.nodes[nodeName];
+				if (node.type === ERROR_TRIGGER_TYPE) {
+					workflowStartNode = node;
+				}
+			}
+
+			if (workflowStartNode === undefined) {
+				this.logger.error(
+					`Calling Error Workflow for "${workflowErrorData.workflow.id}". Could not find "${ERROR_TRIGGER_TYPE}" in workflow "${workflowId}"`,
+				);
+				return;
+			}
+
+			// Can execute without webhook so go on
+			// Initialize the data of the webhook node
+			const nodeExecutionStack: IExecuteData[] = [];
+			nodeExecutionStack.push({
+				node: workflowStartNode,
+				data: {
+					main: [
+						[
+							{
+								json: workflowErrorData,
+							},
+						],
+					],
+				},
+				source: null,
+			});
+
+			const runExecutionData: IRunExecutionData = {
+				startData: {},
+				resultData: {
+					runData: {},
+				},
+				executionData: {
+					contextData: {},
+					metadata: {},
+					nodeExecutionStack,
+					waitingExecution: {},
+					waitingExecutionSource: {},
+				},
+			};
+
+			const runData: IWorkflowExecutionDataProcess = {
+				executionMode,
+				executionData: runExecutionData,
+				workflowData,
+				userId: runningUser.id,
+			};
+
+			await this.workflowRunner.run(runData);
+		} catch (error) {
+			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}"`,
+				{ workflowId: workflowErrorData.workflow.id },
+			);
+		}
+	}
+
+	/**
+	 * Select the pinned activator node to use as starter for a manual execution.
+	 *
+	 * In a full manual execution, select the pinned activator that was first added
+	 * to the workflow, prioritizing `n8n-nodes-base.webhook` over other activators.
+	 *
+	 * In a partial manual execution, if the executed node has parent nodes among the
+	 * pinned activators, select the pinned activator that was first added to the workflow,
+	 * prioritizing `n8n-nodes-base.webhook` over other activators. If the executed node
+	 * has no upstream nodes and is itself is a pinned activator, select it.
+	 */
+	selectPinnedActivatorStarter(workflow: IWorkflowDb, startNodes?: string[], pinData?: IPinData) {
+		if (!pinData || !startNodes) return null;
+
+		const allPinnedActivators = this.findAllPinnedActivators(workflow, pinData);
+
+		if (allPinnedActivators.length === 0) return null;
+
+		const [firstPinnedActivator] = allPinnedActivators;
+
+		// full manual execution
+
+		if (startNodes?.length === 0) return firstPinnedActivator ?? null;
+
+		// partial manual execution
+
+		/**
+		 * If the partial manual execution has 2+ start nodes, we search only the zeroth
+		 * start node's parents for a pinned activator. If we had 2+ start nodes without
+		 * a common ancestor and so if we end up finding multiple pinned activators, we
+		 * would still need to return one to comply with existing usage.
+		 */
+		const [firstStartNodeName] = startNodes;
+
+		const parentNodeNames = new Workflow({
+			nodes: workflow.nodes,
+			connections: workflow.connections,
+			active: workflow.active,
+			nodeTypes: this.nodeTypes,
+		}).getParentNodes(firstStartNodeName);
+
+		if (parentNodeNames.length > 0) {
+			const parentNodeName = parentNodeNames.find((p) => p === firstPinnedActivator.name);
+
+			return allPinnedActivators.find((pa) => pa.name === parentNodeName) ?? null;
+		}
+
+		return allPinnedActivators.find((pa) => pa.name === firstStartNodeName) ?? null;
+	}
+
+	private findAllPinnedActivators(workflow: IWorkflowDb, pinData?: IPinData) {
+		return workflow.nodes
+			.filter(
+				(node) =>
+					!node.disabled &&
+					pinData?.[node.name] &&
+					['trigger', 'webhook'].some((suffix) => node.type.toLowerCase().endsWith(suffix)) &&
+					node.type !== 'n8n-nodes-base.respondToWebhook',
+			)
+			.sort((a) => (a.type.endsWith('webhook') ? -1 : 1));
+	}
+}
diff --git a/packages/cli/src/workflows/workflowHistory/constants.ts b/packages/cli/src/workflows/workflowHistory/constants.ts
new file mode 100644
index 0000000000000..dc4f7c78678b3
--- /dev/null
+++ b/packages/cli/src/workflows/workflowHistory/constants.ts
@@ -0,0 +1,3 @@
+import { TIME } from '@/constants';
+
+export const WORKFLOW_HISTORY_PRUNE_INTERVAL = 1 * TIME.HOUR;
diff --git a/packages/cli/src/workflows/workflowHistory/workflowHistory.controller.ee.ts b/packages/cli/src/workflows/workflowHistory/workflowHistory.controller.ee.ts
new file mode 100644
index 0000000000000..c57e3cb0b584a
--- /dev/null
+++ b/packages/cli/src/workflows/workflowHistory/workflowHistory.controller.ee.ts
@@ -0,0 +1,72 @@
+import { RestController, Get, Middleware } from '@/decorators';
+import { WorkflowHistoryRequest } from '@/requests';
+import { WorkflowHistoryService } from './workflowHistory.service.ee';
+import { Request, Response, NextFunction } from 'express';
+import { isWorkflowHistoryEnabled, isWorkflowHistoryLicensed } from './workflowHistoryHelper.ee';
+
+import { paginationListQueryMiddleware } from '@/middlewares/listQuery/pagination';
+import { NotFoundError } from '@/errors/response-errors/not-found.error';
+import { SharedWorkflowNotFoundError } from '@/errors/shared-workflow-not-found.error';
+import { WorkflowHistoryVersionNotFoundError } from '@/errors/workflow-history-version-not-found.error';
+
+const DEFAULT_TAKE = 20;
+
+@RestController('/workflow-history')
+export class WorkflowHistoryController {
+	constructor(private readonly historyService: WorkflowHistoryService) {}
+
+	@Middleware()
+	workflowHistoryLicense(_req: Request, res: Response, next: NextFunction) {
+		if (!isWorkflowHistoryLicensed()) {
+			res.status(403);
+			res.send('Workflow History license data not found');
+			return;
+		}
+		next();
+	}
+
+	@Middleware()
+	workflowHistoryEnabled(_req: Request, res: Response, next: NextFunction) {
+		if (!isWorkflowHistoryEnabled()) {
+			res.status(403);
+			res.send('Workflow History is disabled');
+			return;
+		}
+		next();
+	}
+
+	@Get('/workflow/:workflowId', { middlewares: [paginationListQueryMiddleware] })
+	async getList(req: WorkflowHistoryRequest.GetList) {
+		try {
+			return await this.historyService.getList(
+				req.user,
+				req.params.workflowId,
+				req.query.take ?? DEFAULT_TAKE,
+				req.query.skip ?? 0,
+			);
+		} catch (e) {
+			if (e instanceof SharedWorkflowNotFoundError) {
+				throw new NotFoundError('Could not find workflow');
+			}
+			throw e;
+		}
+	}
+
+	@Get('/workflow/:workflowId/version/:versionId')
+	async getVersion(req: WorkflowHistoryRequest.GetVersion) {
+		try {
+			return await this.historyService.getVersion(
+				req.user,
+				req.params.workflowId,
+				req.params.versionId,
+			);
+		} catch (e) {
+			if (e instanceof SharedWorkflowNotFoundError) {
+				throw new NotFoundError('Could not find workflow');
+			} else if (e instanceof WorkflowHistoryVersionNotFoundError) {
+				throw new NotFoundError('Could not find version');
+			}
+			throw e;
+		}
+	}
+}
diff --git a/packages/cli/src/workflows/workflowHistory/workflowHistory.service.ee.ts b/packages/cli/src/workflows/workflowHistory/workflowHistory.service.ee.ts
new file mode 100644
index 0000000000000..4bdc337bc35c6
--- /dev/null
+++ b/packages/cli/src/workflows/workflowHistory/workflowHistory.service.ee.ts
@@ -0,0 +1,89 @@
+import type { SharedWorkflow } from '@db/entities/SharedWorkflow';
+import type { User } from '@db/entities/User';
+import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
+import type { WorkflowHistory } from '@db/entities/WorkflowHistory';
+import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
+import { WorkflowHistoryRepository } from '@db/repositories/workflowHistory.repository';
+import { Service } from 'typedi';
+import { isWorkflowHistoryEnabled } from './workflowHistoryHelper.ee';
+import { Logger } from '@/Logger';
+import { SharedWorkflowNotFoundError } from '@/errors/shared-workflow-not-found.error';
+import { WorkflowHistoryVersionNotFoundError } from '@/errors/workflow-history-version-not-found.error';
+
+@Service()
+export class WorkflowHistoryService {
+	constructor(
+		private readonly logger: Logger,
+		private readonly workflowHistoryRepository: WorkflowHistoryRepository,
+		private readonly sharedWorkflowRepository: SharedWorkflowRepository,
+	) {}
+
+	private async getSharedWorkflow(user: User, workflowId: string): Promise<SharedWorkflow | null> {
+		return await this.sharedWorkflowRepository.findOne({
+			where: {
+				...(!user.hasGlobalScope('workflow:read') && { userId: user.id }),
+				workflowId,
+			},
+		});
+	}
+
+	async getList(
+		user: User,
+		workflowId: string,
+		take: number,
+		skip: number,
+	): Promise<Array<Omit<WorkflowHistory, 'nodes' | 'connections'>>> {
+		const sharedWorkflow = await this.getSharedWorkflow(user, workflowId);
+		if (!sharedWorkflow) {
+			throw new SharedWorkflowNotFoundError('');
+		}
+		return await this.workflowHistoryRepository.find({
+			where: {
+				workflowId: sharedWorkflow.workflowId,
+			},
+			take,
+			skip,
+			select: ['workflowId', 'versionId', 'authors', 'createdAt', 'updatedAt'],
+			order: { createdAt: 'DESC' },
+		});
+	}
+
+	async getVersion(user: User, workflowId: string, versionId: string): Promise<WorkflowHistory> {
+		const sharedWorkflow = await this.getSharedWorkflow(user, workflowId);
+		if (!sharedWorkflow) {
+			throw new SharedWorkflowNotFoundError('');
+		}
+		const hist = await this.workflowHistoryRepository.findOne({
+			where: {
+				workflowId: sharedWorkflow.workflowId,
+				versionId,
+			},
+		});
+		if (!hist) {
+			throw new WorkflowHistoryVersionNotFoundError('');
+		}
+		return hist;
+	}
+
+	async saveVersion(user: User, workflow: WorkflowEntity, workflowId: string) {
+		// On some update scenarios, `nodes` and `connections` are missing, such as when
+		// changing workflow settings or renaming. In these cases, we don't want to save
+		// a new version
+		if (isWorkflowHistoryEnabled() && workflow.nodes && workflow.connections) {
+			try {
+				await this.workflowHistoryRepository.insert({
+					authors: user.firstName + ' ' + user.lastName,
+					connections: workflow.connections,
+					nodes: workflow.nodes,
+					versionId: workflow.versionId,
+					workflowId,
+				});
+			} catch (e) {
+				this.logger.error(
+					`Failed to save workflow history version for workflow ${workflowId}`,
+					e as Error,
+				);
+			}
+		}
+	}
+}
diff --git a/packages/cli/src/workflows/workflowHistory/workflowHistoryHelper.ee.ts b/packages/cli/src/workflows/workflowHistory/workflowHistoryHelper.ee.ts
new file mode 100644
index 0000000000000..bf784c5aba97d
--- /dev/null
+++ b/packages/cli/src/workflows/workflowHistory/workflowHistoryHelper.ee.ts
@@ -0,0 +1,35 @@
+import { License } from '@/License';
+import config from '@/config';
+import Container from 'typedi';
+
+export function isWorkflowHistoryLicensed() {
+	const license = Container.get(License);
+	return license.isWorkflowHistoryLicensed();
+}
+
+export function isWorkflowHistoryEnabled() {
+	return isWorkflowHistoryLicensed() && config.getEnv('workflowHistory.enabled');
+}
+
+export function getWorkflowHistoryLicensePruneTime() {
+	return Container.get(License).getWorkflowHistoryPruneLimit();
+}
+
+// Time in hours
+export function getWorkflowHistoryPruneTime(): number {
+	const licenseTime = Container.get(License).getWorkflowHistoryPruneLimit();
+	const configTime = config.getEnv('workflowHistory.pruneTime');
+
+	// License is infinite and config time is infinite
+	if (licenseTime === -1) {
+		return configTime;
+	}
+
+	// License is not infinite but config is, use license time
+	if (configTime === -1) {
+		return licenseTime;
+	}
+
+	// Return the smallest of the license or config if not infinite
+	return Math.min(configTime, licenseTime);
+}
diff --git a/packages/cli/src/workflows/workflowHistory/workflowHistoryManager.ee.ts b/packages/cli/src/workflows/workflowHistory/workflowHistoryManager.ee.ts
new file mode 100644
index 0000000000000..4898666c88caa
--- /dev/null
+++ b/packages/cli/src/workflows/workflowHistory/workflowHistoryManager.ee.ts
@@ -0,0 +1,42 @@
+import { Service } from 'typedi';
+import { DateTime } from 'luxon';
+import { WorkflowHistoryRepository } from '@db/repositories/workflowHistory.repository';
+import { WORKFLOW_HISTORY_PRUNE_INTERVAL } from './constants';
+import { getWorkflowHistoryPruneTime, isWorkflowHistoryEnabled } from './workflowHistoryHelper.ee';
+
+@Service()
+export class WorkflowHistoryManager {
+	pruneTimer?: NodeJS.Timeout;
+
+	constructor(private workflowHistoryRepo: WorkflowHistoryRepository) {}
+
+	init() {
+		if (this.pruneTimer !== undefined) {
+			clearInterval(this.pruneTimer);
+		}
+
+		this.pruneTimer = setInterval(async () => await this.prune(), WORKFLOW_HISTORY_PRUNE_INTERVAL);
+	}
+
+	shutdown() {
+		if (this.pruneTimer !== undefined) {
+			clearInterval(this.pruneTimer);
+			this.pruneTimer = undefined;
+		}
+	}
+
+	async prune() {
+		if (!isWorkflowHistoryEnabled()) {
+			return;
+		}
+
+		const pruneHours = getWorkflowHistoryPruneTime();
+		// No prune time set
+		if (pruneHours === -1) {
+			return;
+		}
+		const pruneDateTime = DateTime.now().minus({ hours: pruneHours }).toJSDate();
+
+		await this.workflowHistoryRepo.deleteEarlierThan(pruneDateTime);
+	}
+}
diff --git a/packages/cli/src/workflows/workflowSharing.service.ts b/packages/cli/src/workflows/workflowSharing.service.ts
new file mode 100644
index 0000000000000..93df8e0acaf2e
--- /dev/null
+++ b/packages/cli/src/workflows/workflowSharing.service.ts
@@ -0,0 +1,30 @@
+import { Service } from 'typedi';
+import { In, type FindOptionsWhere } from '@n8n/typeorm';
+
+import type { SharedWorkflow, WorkflowSharingRole } from '@db/entities/SharedWorkflow';
+import type { User } from '@db/entities/User';
+import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
+
+@Service()
+export class WorkflowSharingService {
+	constructor(private readonly sharedWorkflowRepository: SharedWorkflowRepository) {}
+
+	/**
+	 * Get the IDs of the workflows that have been shared with the user.
+	 * Returns all IDs if user has the 'workflow:read' scope.
+	 */
+	async getSharedWorkflowIds(user: User, roles?: WorkflowSharingRole[]): Promise<string[]> {
+		const where: FindOptionsWhere<SharedWorkflow> = {};
+		if (!user.hasGlobalScope('workflow:read')) {
+			where.userId = user.id;
+		}
+		if (roles?.length) {
+			where.role = In(roles);
+		}
+		const sharedWorkflows = await this.sharedWorkflowRepository.find({
+			where,
+			select: ['workflowId'],
+		});
+		return sharedWorkflows.map(({ workflowId }) => workflowId);
+	}
+}
diff --git a/packages/cli/src/workflows/workflowStaticData.service.ts b/packages/cli/src/workflows/workflowStaticData.service.ts
new file mode 100644
index 0000000000000..b77d1b716c3d8
--- /dev/null
+++ b/packages/cli/src/workflows/workflowStaticData.service.ts
@@ -0,0 +1,50 @@
+import { Service } from 'typedi';
+import { type IDataObject, type Workflow, ErrorReporterProxy as ErrorReporter } from 'n8n-workflow';
+import { Logger } from '@/Logger';
+import { WorkflowRepository } from '@db/repositories/workflow.repository';
+import { isWorkflowIdValid } from '@/utils';
+
+@Service()
+export class WorkflowStaticDataService {
+	constructor(
+		private readonly logger: Logger,
+		private readonly workflowRepository: WorkflowRepository,
+	) {}
+
+	/** Returns the static data of workflow */
+	async getStaticDataById(workflowId: string) {
+		const workflowData = await this.workflowRepository.findOne({
+			select: ['staticData'],
+			where: { id: workflowId },
+		});
+		return workflowData?.staticData ?? {};
+	}
+
+	/** Saves the static data if it changed */
+	async saveStaticData(workflow: Workflow): Promise<void> {
+		if (workflow.staticData.__dataChanged === true) {
+			// Static data of workflow changed and so has to be saved
+			if (isWorkflowIdValid(workflow.id)) {
+				// Workflow is saved so update in database
+				try {
+					await this.saveStaticDataById(workflow.id, workflow.staticData);
+					workflow.staticData.__dataChanged = false;
+				} catch (error) {
+					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}"`,
+						{ workflowId: workflow.id },
+					);
+				}
+			}
+		}
+	}
+
+	/** Saves the given static data on workflow */
+	async saveStaticDataById(workflowId: string, newStaticData: IDataObject): Promise<void> {
+		await this.workflowRepository.update(workflowId, {
+			staticData: newStaticData,
+		});
+	}
+}
diff --git a/packages/cli/src/workflows/workflows.controller.ee.ts b/packages/cli/src/workflows/workflows.controller.ee.ts
deleted file mode 100644
index 399886cae2ee2..0000000000000
--- a/packages/cli/src/workflows/workflows.controller.ee.ts
+++ /dev/null
@@ -1,257 +0,0 @@
-import express from 'express';
-import { v4 as uuid } from 'uuid';
-import * as Db from '@/Db';
-import * as ResponseHelper from '@/ResponseHelper';
-import * as WorkflowHelpers from '@/WorkflowHelpers';
-import config from '@/config';
-import { WorkflowEntity } from '@db/entities/WorkflowEntity';
-import { validateEntity } from '@/GenericHelpers';
-import type { WorkflowRequest } from '@/requests';
-import { isSharingEnabled, rightDiff } from '@/UserManagement/UserManagementHelper';
-import { EEWorkflowsService as EEWorkflows } from './workflows.services.ee';
-import { ExternalHooks } from '@/ExternalHooks';
-import { SharedWorkflow } from '@db/entities/SharedWorkflow';
-import { RoleRepository } from '@db/repositories';
-import { LoggerProxy } from 'n8n-workflow';
-import * as TagHelpers from '@/TagHelpers';
-import { EECredentialsService as EECredentials } from '../credentials/credentials.service.ee';
-import type { IExecutionPushResponse } from '@/Interfaces';
-import * as GenericHelpers from '@/GenericHelpers';
-import { In } from 'typeorm';
-import { Container } from 'typedi';
-import { InternalHooks } from '@/InternalHooks';
-
-// eslint-disable-next-line @typescript-eslint/naming-convention
-export const EEWorkflowController = express.Router();
-
-EEWorkflowController.use((req, res, next) => {
-	if (!isSharingEnabled()) {
-		// skip ee router and use free one
-		next('router');
-		return;
-	}
-	// use ee router
-	next();
-});
-
-/**
- * (EE) PUT /workflows/:id/share
- *
- * Grant or remove users' access to a workflow.
- */
-
-EEWorkflowController.put(
-	'/:workflowId/share',
-	ResponseHelper.send(async (req: WorkflowRequest.Share) => {
-		const { workflowId } = req.params;
-		const { shareWithIds } = req.body;
-
-		if (
-			!Array.isArray(shareWithIds) ||
-			!shareWithIds.every((userId) => typeof userId === 'string')
-		) {
-			throw new ResponseHelper.BadRequestError('Bad request');
-		}
-
-		const { ownsWorkflow, workflow } = await EEWorkflows.isOwned(req.user, workflowId);
-
-		if (!ownsWorkflow || !workflow) {
-			throw new ResponseHelper.UnauthorizedError('Forbidden');
-		}
-
-		let newShareeIds: string[] = [];
-		await Db.transaction(async (trx) => {
-			// remove all sharings that are not supposed to exist anymore
-			await EEWorkflows.pruneSharings(trx, workflowId, [req.user.id, ...shareWithIds]);
-
-			const sharings = await EEWorkflows.getSharings(trx, workflowId);
-
-			// extract the new sharings that need to be added
-			newShareeIds = rightDiff(
-				[sharings, (sharing) => sharing.userId],
-				[shareWithIds, (shareeId) => shareeId],
-			);
-
-			if (newShareeIds.length) {
-				await EEWorkflows.share(trx, workflow, newShareeIds);
-			}
-		});
-
-		void Container.get(InternalHooks).onWorkflowSharingUpdate(
-			workflowId,
-			req.user.id,
-			shareWithIds,
-		);
-	}),
-);
-
-EEWorkflowController.get(
-	'/:id(\\d+)',
-	ResponseHelper.send(async (req: WorkflowRequest.Get) => {
-		const { id: workflowId } = req.params;
-
-		const relations = ['shared', 'shared.user', 'shared.role'];
-		if (!config.getEnv('workflowTagsDisabled')) {
-			relations.push('tags');
-		}
-
-		const workflow = await EEWorkflows.get({ id: workflowId }, { relations });
-
-		if (!workflow) {
-			throw new ResponseHelper.NotFoundError(`Workflow with ID "${workflowId}" does not exist`);
-		}
-
-		const userSharing = workflow.shared?.find((shared) => shared.user.id === req.user.id);
-
-		if (!userSharing && req.user.globalRole.name !== 'owner') {
-			throw new ResponseHelper.UnauthorizedError(
-				'You do not have permission to access this workflow. Ask the owner to share it with you',
-			);
-		}
-
-		EEWorkflows.addOwnerAndSharings(workflow);
-		await EEWorkflows.addCredentialsToWorkflow(workflow, req.user);
-		return workflow;
-	}),
-);
-
-EEWorkflowController.post(
-	'/',
-	ResponseHelper.send(async (req: WorkflowRequest.Create) => {
-		delete req.body.id; // delete if sent
-
-		const newWorkflow = new WorkflowEntity();
-
-		Object.assign(newWorkflow, req.body);
-
-		newWorkflow.versionId = uuid();
-
-		await validateEntity(newWorkflow);
-
-		await Container.get(ExternalHooks).run('workflow.create', [newWorkflow]);
-
-		const { tags: tagIds } = req.body;
-
-		if (tagIds?.length && !config.getEnv('workflowTagsDisabled')) {
-			newWorkflow.tags = await Db.collections.Tag.find({
-				select: ['id', 'name'],
-				where: {
-					id: In(tagIds),
-				},
-			});
-		}
-
-		await WorkflowHelpers.replaceInvalidCredentials(newWorkflow);
-
-		WorkflowHelpers.addNodeIds(newWorkflow);
-
-		// This is a new workflow, so we simply check if the user has access to
-		// all used workflows
-
-		const allCredentials = await EECredentials.getAll(req.user);
-
-		try {
-			EEWorkflows.validateCredentialPermissionsToUser(newWorkflow, allCredentials);
-		} catch (error) {
-			throw new ResponseHelper.BadRequestError(
-				'The workflow you are trying to save contains credentials that are not shared with you',
-			);
-		}
-
-		let savedWorkflow: undefined | WorkflowEntity;
-
-		await Db.transaction(async (transactionManager) => {
-			savedWorkflow = await transactionManager.save<WorkflowEntity>(newWorkflow);
-
-			const role = await Container.get(RoleRepository).findWorkflowOwnerRoleOrFail();
-
-			const newSharedWorkflow = new SharedWorkflow();
-
-			Object.assign(newSharedWorkflow, {
-				role,
-				user: req.user,
-				workflow: savedWorkflow,
-			});
-
-			await transactionManager.save<SharedWorkflow>(newSharedWorkflow);
-		});
-
-		if (!savedWorkflow) {
-			LoggerProxy.error('Failed to create workflow', { userId: req.user.id });
-			throw new ResponseHelper.InternalServerError(
-				'An error occurred while saving your workflow. Please try again.',
-			);
-		}
-
-		if (tagIds && !config.getEnv('workflowTagsDisabled') && savedWorkflow.tags) {
-			savedWorkflow.tags = TagHelpers.sortByRequestOrder(savedWorkflow.tags, {
-				requestOrder: tagIds,
-			});
-		}
-
-		await Container.get(ExternalHooks).run('workflow.afterCreate', [savedWorkflow]);
-		void Container.get(InternalHooks).onWorkflowCreated(req.user, newWorkflow, false);
-
-		return savedWorkflow;
-	}),
-);
-
-/**
- * (EE) GET /workflows
- */
-EEWorkflowController.get(
-	'/',
-	ResponseHelper.send(async (req: WorkflowRequest.GetAll) => {
-		const [workflows, workflowOwnerRole] = await Promise.all([
-			EEWorkflows.getMany(req.user, req.query.filter),
-			Container.get(RoleRepository).findWorkflowOwnerRoleOrFail(),
-		]);
-
-		return workflows.map((workflow) => {
-			EEWorkflows.addOwnerId(workflow, workflowOwnerRole);
-			return workflow;
-		});
-	}),
-);
-
-EEWorkflowController.patch(
-	'/:id(\\d+)',
-	ResponseHelper.send(async (req: WorkflowRequest.Update) => {
-		const { id: workflowId } = req.params;
-		const forceSave = req.query.forceSave === 'true';
-
-		const updateData = new WorkflowEntity();
-		const { tags, ...rest } = req.body;
-		Object.assign(updateData, rest);
-
-		const safeWorkflow = await EEWorkflows.preventTampering(updateData, workflowId, req.user);
-
-		const updatedWorkflow = await EEWorkflows.update(
-			req.user,
-			safeWorkflow,
-			workflowId,
-			tags,
-			forceSave,
-		);
-
-		return updatedWorkflow;
-	}),
-);
-
-/**
- * (EE) POST /workflows/run
- */
-EEWorkflowController.post(
-	'/run',
-	ResponseHelper.send(async (req: WorkflowRequest.ManualRun): Promise<IExecutionPushResponse> => {
-		const workflow = new WorkflowEntity();
-		Object.assign(workflow, req.body.workflowData);
-
-		if (workflow.id !== undefined) {
-			const safeWorkflow = await EEWorkflows.preventTampering(workflow, workflow.id, req.user);
-			req.body.workflowData.nodes = safeWorkflow.nodes;
-		}
-
-		return EEWorkflows.runManually(req.body, req.user, GenericHelpers.getSessionId(req));
-	}),
-);
diff --git a/packages/cli/src/workflows/workflows.controller.ts b/packages/cli/src/workflows/workflows.controller.ts
index 1c9b545762517..3a775dcee7132 100644
--- a/packages/cli/src/workflows/workflows.controller.ts
+++ b/packages/cli/src/workflows/workflows.controller.ts
@@ -1,54 +1,68 @@
-/* eslint-disable no-param-reassign */
-
 import express from 'express';
 import { v4 as uuid } from 'uuid';
-import { LoggerProxy } from 'n8n-workflow';
-
 import axios from 'axios';
+
 import * as Db from '@/Db';
-import * as GenericHelpers from '@/GenericHelpers';
 import * as ResponseHelper from '@/ResponseHelper';
 import * as WorkflowHelpers from '@/WorkflowHelpers';
-import type { IWorkflowResponse, IExecutionPushResponse } from '@/Interfaces';
+import type { IWorkflowResponse } from '@/Interfaces';
 import config from '@/config';
-import * as TagHelpers from '@/TagHelpers';
-import { SharedWorkflow } from '@db/entities/SharedWorkflow';
+import { Delete, Get, Patch, Post, Put, RestController } from '@/decorators';
+import { SharedWorkflow, type WorkflowSharingRole } from '@db/entities/SharedWorkflow';
 import { WorkflowEntity } from '@db/entities/WorkflowEntity';
-import { RoleRepository } from '@db/repositories';
+import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
+import { TagRepository } from '@db/repositories/tag.repository';
+import { WorkflowRepository } from '@db/repositories/workflow.repository';
+import { UserRepository } from '@db/repositories/user.repository';
 import { validateEntity } from '@/GenericHelpers';
 import { ExternalHooks } from '@/ExternalHooks';
-import { getLogger } from '@/Logger';
-import type { WorkflowRequest } from '@/requests';
-import { isBelowOnboardingThreshold } from '@/WorkflowHelpers';
-import { EEWorkflowController } from './workflows.controller.ee';
-import { WorkflowsService } from './workflows.services';
-import { whereClause } from '@/UserManagement/UserManagementHelper';
-import { In } from 'typeorm';
-import { Container } from 'typedi';
+import { ListQuery } from '@/requests';
+import { WorkflowService } from './workflow.service';
+import { License } from '@/License';
 import { InternalHooks } from '@/InternalHooks';
-
-export const workflowsController = express.Router();
-
-/**
- * Initialize Logger if needed
- */
-workflowsController.use((req, res, next) => {
-	try {
-		LoggerProxy.getInstance();
-	} catch (error) {
-		LoggerProxy.init(getLogger());
-	}
-	next();
-});
-
-workflowsController.use('/', EEWorkflowController);
-
-/**
- * POST /workflows
- */
-workflowsController.post(
-	'/',
-	ResponseHelper.send(async (req: WorkflowRequest.Create) => {
+import * as utils from '@/utils';
+import { listQueryMiddleware } from '@/middlewares';
+import { TagService } from '@/services/tag.service';
+import { WorkflowHistoryService } from './workflowHistory/workflowHistory.service.ee';
+import { Logger } from '@/Logger';
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
+import { NotFoundError } from '@/errors/response-errors/not-found.error';
+import { InternalServerError } from '@/errors/response-errors/internal-server.error';
+import { UnauthorizedError } from '@/errors/response-errors/unauthorized.error';
+import { NamingService } from '@/services/naming.service';
+import { UserOnboardingService } from '@/services/userOnboarding.service';
+import { CredentialsService } from '../credentials/credentials.service';
+import { WorkflowRequest } from './workflow.request';
+import { EnterpriseWorkflowService } from './workflow.service.ee';
+import { WorkflowExecutionService } from './workflowExecution.service';
+import { WorkflowSharingService } from './workflowSharing.service';
+import { UserManagementMailer } from '@/UserManagement/email';
+
+@RestController('/workflows')
+export class WorkflowsController {
+	constructor(
+		private readonly logger: Logger,
+		private readonly internalHooks: InternalHooks,
+		private readonly externalHooks: ExternalHooks,
+		private readonly tagRepository: TagRepository,
+		private readonly enterpriseWorkflowService: EnterpriseWorkflowService,
+		private readonly workflowHistoryService: WorkflowHistoryService,
+		private readonly tagService: TagService,
+		private readonly namingService: NamingService,
+		private readonly userOnboardingService: UserOnboardingService,
+		private readonly workflowRepository: WorkflowRepository,
+		private readonly workflowService: WorkflowService,
+		private readonly workflowExecutionService: WorkflowExecutionService,
+		private readonly workflowSharingService: WorkflowSharingService,
+		private readonly sharedWorkflowRepository: SharedWorkflowRepository,
+		private readonly userRepository: UserRepository,
+		private readonly license: License,
+		private readonly mailer: UserManagementMailer,
+		private readonly credentialsService: CredentialsService,
+	) {}
+
+	@Post('/')
+	async create(req: WorkflowRequest.Create) {
 		delete req.body.id; // delete if sent
 
 		const newWorkflow = new WorkflowEntity();
@@ -59,34 +73,45 @@ workflowsController.post(
 
 		await validateEntity(newWorkflow);
 
-		await Container.get(ExternalHooks).run('workflow.create', [newWorkflow]);
+		await this.externalHooks.run('workflow.create', [newWorkflow]);
 
 		const { tags: tagIds } = req.body;
 
 		if (tagIds?.length && !config.getEnv('workflowTagsDisabled')) {
-			newWorkflow.tags = await Db.collections.Tag.find({
-				select: ['id', 'name'],
-				where: {
-					id: In(tagIds),
-				},
-			});
+			newWorkflow.tags = await this.tagRepository.findMany(tagIds);
 		}
 
 		await WorkflowHelpers.replaceInvalidCredentials(newWorkflow);
 
 		WorkflowHelpers.addNodeIds(newWorkflow);
 
+		if (this.license.isSharingEnabled()) {
+			// This is a new workflow, so we simply check if the user has access to
+			// all used workflows
+
+			const allCredentials = await this.credentialsService.getMany(req.user);
+
+			try {
+				this.enterpriseWorkflowService.validateCredentialPermissionsToUser(
+					newWorkflow,
+					allCredentials,
+				);
+			} catch (error) {
+				throw new BadRequestError(
+					'The workflow you are trying to save contains credentials that are not shared with you',
+				);
+			}
+		}
+
 		let savedWorkflow: undefined | WorkflowEntity;
 
 		await Db.transaction(async (transactionManager) => {
 			savedWorkflow = await transactionManager.save<WorkflowEntity>(newWorkflow);
 
-			const role = await Container.get(RoleRepository).findWorkflowOwnerRoleOrFail();
-
 			const newSharedWorkflow = new SharedWorkflow();
 
 			Object.assign(newSharedWorkflow, {
-				role,
+				role: 'workflow:owner',
 				user: req.user,
 				workflow: savedWorkflow,
 			});
@@ -95,197 +120,288 @@ workflowsController.post(
 		});
 
 		if (!savedWorkflow) {
-			LoggerProxy.error('Failed to create workflow', { userId: req.user.id });
-			throw new ResponseHelper.InternalServerError('Failed to save workflow');
+			this.logger.error('Failed to create workflow', { userId: req.user.id });
+			throw new InternalServerError('Failed to save workflow');
 		}
 
+		await this.workflowHistoryService.saveVersion(req.user, savedWorkflow, savedWorkflow.id);
+
 		if (tagIds && !config.getEnv('workflowTagsDisabled') && savedWorkflow.tags) {
-			savedWorkflow.tags = TagHelpers.sortByRequestOrder(savedWorkflow.tags, {
+			savedWorkflow.tags = this.tagService.sortByRequestOrder(savedWorkflow.tags, {
 				requestOrder: tagIds,
 			});
 		}
 
-		await Container.get(ExternalHooks).run('workflow.afterCreate', [savedWorkflow]);
-		void Container.get(InternalHooks).onWorkflowCreated(req.user, newWorkflow, false);
+		await this.externalHooks.run('workflow.afterCreate', [savedWorkflow]);
+		void this.internalHooks.onWorkflowCreated(req.user, newWorkflow, false);
 
 		return savedWorkflow;
-	}),
-);
-
-/**
- * GET /workflows
- */
-workflowsController.get(
-	'/',
-	ResponseHelper.send(async (req: WorkflowRequest.GetAll) => {
-		return WorkflowsService.getMany(req.user, req.query.filter);
-	}),
-);
-
-/**
- * GET /workflows/new
- */
-workflowsController.get(
-	'/new',
-	ResponseHelper.send(async (req: WorkflowRequest.NewName) => {
-		const requestedName =
-			req.query.name && req.query.name !== ''
-				? req.query.name
-				: config.getEnv('workflows.defaultName');
-
-		const name = await GenericHelpers.generateUniqueName(requestedName, 'workflow');
+	}
+
+	@Get('/', { middlewares: listQueryMiddleware })
+	async getAll(req: ListQuery.Request, res: express.Response) {
+		try {
+			const roles: WorkflowSharingRole[] = this.license.isSharingEnabled()
+				? []
+				: ['workflow:owner'];
+			const sharedWorkflowIds = await this.workflowSharingService.getSharedWorkflowIds(
+				req.user,
+				roles,
+			);
+
+			const { workflows: data, count } = await this.workflowService.getMany(
+				sharedWorkflowIds,
+				req.listQueryOptions,
+			);
+
+			res.json({ count, data });
+		} catch (maybeError) {
+			const error = utils.toError(maybeError);
+			ResponseHelper.reportError(error);
+			ResponseHelper.sendErrorResponse(res, error);
+		}
+	}
+
+	@Get('/new')
+	async getNewName(req: WorkflowRequest.NewName) {
+		const requestedName = req.query.name ?? config.getEnv('workflows.defaultName');
+
+		const name = await this.namingService.getUniqueWorkflowName(requestedName);
 
 		const onboardingFlowEnabled =
 			!config.getEnv('workflows.onboardingFlowDisabled') &&
 			!req.user.settings?.isOnboarded &&
-			(await isBelowOnboardingThreshold(req.user));
+			(await this.userOnboardingService.isBelowThreshold(req.user));
 
 		return { name, onboardingFlowEnabled };
-	}),
-);
-
-// Reads and returns workflow data from an URL
-/**
- * GET /workflows/from-url
- */
-workflowsController.get(
-	'/from-url',
-	ResponseHelper.send(async (req: express.Request): Promise<IWorkflowResponse> => {
+	}
+
+	@Get('/from-url')
+	async getFromUrl(req: WorkflowRequest.FromUrl) {
 		if (req.query.url === undefined) {
-			throw new ResponseHelper.BadRequestError('The parameter "url" is missing!');
+			throw new BadRequestError('The parameter "url" is missing!');
 		}
-		if (!/^http[s]?:\/\/.*\.json$/i.exec(req.query.url as string)) {
-			throw new ResponseHelper.BadRequestError(
+		if (!/^http[s]?:\/\/.*\.json$/i.exec(req.query.url)) {
+			throw new BadRequestError(
 				'The parameter "url" is not valid! It does not seem to be a URL pointing to a n8n workflow JSON file.',
 			);
 		}
 		let workflowData: IWorkflowResponse | undefined;
 		try {
-			const { data } = await axios.get<IWorkflowResponse>(req.query.url as string);
+			const { data } = await axios.get<IWorkflowResponse>(req.query.url);
 			workflowData = data;
 		} catch (error) {
-			throw new ResponseHelper.BadRequestError('The URL does not point to valid JSON file!');
+			throw new BadRequestError('The URL does not point to valid JSON file!');
 		}
 
 		// Do a very basic check if it is really a n8n-workflow-json
 		if (
-			workflowData === undefined ||
-			workflowData.nodes === undefined ||
+			workflowData?.nodes === undefined ||
 			!Array.isArray(workflowData.nodes) ||
 			workflowData.connections === undefined ||
 			typeof workflowData.connections !== 'object' ||
 			Array.isArray(workflowData.connections)
 		) {
-			throw new ResponseHelper.BadRequestError(
+			throw new BadRequestError(
 				'The data in the file does not seem to be a n8n workflow JSON file!',
 			);
 		}
 
 		return workflowData;
-	}),
-);
-
-/**
- * GET /workflows/:id
- */
-workflowsController.get(
-	'/:id(\\d+)',
-	ResponseHelper.send(async (req: WorkflowRequest.Get) => {
+	}
+
+	@Get('/:id')
+	async getWorkflow(req: WorkflowRequest.Get) {
 		const { id: workflowId } = req.params;
 
-		let relations = ['workflow', 'workflow.tags', 'role'];
+		if (this.license.isSharingEnabled()) {
+			const relations = ['shared', 'shared.user'];
+			if (!config.getEnv('workflowTagsDisabled')) {
+				relations.push('tags');
+			}
+
+			const workflow = await this.workflowRepository.get({ id: workflowId }, { relations });
+
+			if (!workflow) {
+				throw new NotFoundError(`Workflow with ID "${workflowId}" does not exist`);
+			}
+
+			const userSharing = workflow.shared?.find((shared) => shared.user.id === req.user.id);
+			if (!userSharing && !req.user.hasGlobalScope('workflow:read')) {
+				throw new UnauthorizedError(
+					'You do not have permission to access this workflow. Ask the owner to share it with you',
+				);
+			}
 
-		if (config.getEnv('workflowTagsDisabled')) {
-			relations = relations.filter((relation) => relation !== 'workflow.tags');
+			const enterpriseWorkflowService = this.enterpriseWorkflowService;
+
+			enterpriseWorkflowService.addOwnerAndSharings(workflow);
+			await enterpriseWorkflowService.addCredentialsToWorkflow(workflow, req.user);
+			return workflow;
 		}
 
-		const shared =
-			process.env.ONLY_OWNER_OR_ADMIN_CAN_ACCESS_WORKFLOW === 'true'
-				? await Db.collections.SharedWorkflow.findOne({
-						relations,
-						where: whereClause({
-							user: req.user,
-							entityType: 'workflow',
-							entityId: workflowId,
-							roles: ['owner'],
-						}),
-				  })
-				: await Db.collections.SharedWorkflow.findOne({
-						relations,
-						where: { ['workflow']: { id: workflowId } },
-				  });
+		// sharing disabled
+
+		const extraRelations = config.getEnv('workflowTagsDisabled') ? [] : ['workflow.tags'];
+
+		const shared = await this.sharedWorkflowRepository.findSharing(
+			workflowId,
+			req.user,
+			'workflow:read',
+			{ extraRelations },
+		);
 
 		if (!shared) {
-			// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
-			LoggerProxy.verbose('User attempted to access a workflow without permissions', {
+			this.logger.verbose('User attempted to access a workflow without permissions', {
 				workflowId,
 				userId: req.user.id,
 			});
-			throw new ResponseHelper.NotFoundError(
+			throw new NotFoundError(
 				'Could not load the workflow - you can only access workflows owned by you',
 			);
 		}
 
 		return shared.workflow;
-	}),
-);
-
-// Updates an existing workflow
-/**
- * PATCH /workflows/:id
- */
-workflowsController.patch(
-	'/:id',
-	ResponseHelper.send(async (req: WorkflowRequest.Update) => {
+	}
+
+	@Patch('/:id')
+	async update(req: WorkflowRequest.Update) {
 		const { id: workflowId } = req.params;
+		const forceSave = req.query.forceSave === 'true';
 
-		const updateData = new WorkflowEntity();
+		let updateData = new WorkflowEntity();
 		const { tags, ...rest } = req.body;
 		Object.assign(updateData, rest);
 
-		const updatedWorkflow = await WorkflowsService.update(
+		const isSharingEnabled = this.license.isSharingEnabled();
+		if (isSharingEnabled) {
+			updateData = await this.enterpriseWorkflowService.preventTampering(
+				updateData,
+				workflowId,
+				req.user,
+			);
+		}
+
+		const updatedWorkflow = await this.workflowService.update(
 			req.user,
 			updateData,
 			workflowId,
 			tags,
-			true,
-			['owner'],
+			isSharingEnabled ? forceSave : true,
+			isSharingEnabled ? undefined : ['workflow:owner'],
 		);
 
 		return updatedWorkflow;
-	}),
-);
-
-// Deletes a specific workflow
-/**
- * DELETE /workflows/:id
- */
-workflowsController.delete(
-	'/:id',
-	ResponseHelper.send(async (req: WorkflowRequest.Delete) => {
+	}
+
+	@Delete('/:id')
+	async delete(req: WorkflowRequest.Delete) {
 		const { id: workflowId } = req.params;
 
-		const workflow = await WorkflowsService.delete(req.user, workflowId);
+		const workflow = await this.workflowService.delete(req.user, workflowId);
 		if (!workflow) {
-			LoggerProxy.verbose('User attempted to delete a workflow without permissions', {
+			this.logger.verbose('User attempted to delete a workflow without permissions', {
 				workflowId,
 				userId: req.user.id,
 			});
-			throw new ResponseHelper.BadRequestError(
+			throw new BadRequestError(
 				'Could not delete the workflow - you can only remove workflows owned by you',
 			);
 		}
 
 		return true;
-	}),
-);
-
-/**
- * POST /workflows/run
- */
-workflowsController.post(
-	'/run',
-	ResponseHelper.send(async (req: WorkflowRequest.ManualRun): Promise<IExecutionPushResponse> => {
-		return WorkflowsService.runManually(req.body, req.user, GenericHelpers.getSessionId(req));
-	}),
-);
+	}
+
+	@Post('/run')
+	async runManually(req: WorkflowRequest.ManualRun) {
+		if (this.license.isSharingEnabled()) {
+			const workflow = this.workflowRepository.create(req.body.workflowData);
+
+			if (req.body.workflowData.id !== undefined) {
+				const safeWorkflow = await this.enterpriseWorkflowService.preventTampering(
+					workflow,
+					workflow.id,
+					req.user,
+				);
+				req.body.workflowData.nodes = safeWorkflow.nodes;
+			}
+		}
+
+		return await this.workflowExecutionService.executeManually(
+			req.body,
+			req.user,
+			req.headers['push-ref'] as string,
+		);
+	}
+
+	@Put('/:workflowId/share')
+	async share(req: WorkflowRequest.Share) {
+		if (!this.license.isSharingEnabled()) throw new NotFoundError('Route not found');
+
+		const { workflowId } = req.params;
+		const { shareWithIds } = req.body;
+
+		if (
+			!Array.isArray(shareWithIds) ||
+			!shareWithIds.every((userId) => typeof userId === 'string')
+		) {
+			throw new BadRequestError('Bad request');
+		}
+
+		const isOwnedRes = await this.enterpriseWorkflowService.isOwned(req.user, workflowId);
+		const { ownsWorkflow } = isOwnedRes;
+		let { workflow } = isOwnedRes;
+
+		if (!ownsWorkflow || !workflow) {
+			workflow = undefined;
+			// Allow owners/admins to share
+			if (req.user.hasGlobalScope('workflow:share')) {
+				const sharedRes = await this.sharedWorkflowRepository.getSharing(req.user, workflowId, {
+					allowGlobalScope: true,
+					globalScope: 'workflow:share',
+				});
+				workflow = sharedRes?.workflow;
+			}
+			if (!workflow) {
+				throw new UnauthorizedError('Forbidden');
+			}
+		}
+
+		const ownerIds = (
+			await this.workflowRepository.getSharings(
+				Db.getConnection().createEntityManager(),
+				workflowId,
+				['shared'],
+			)
+		)
+			.filter((e) => e.role === 'workflow:owner')
+			.map((e) => e.userId);
+
+		let newShareeIds: string[] = [];
+		await Db.transaction(async (trx) => {
+			// remove all sharings that are not supposed to exist anymore
+			await this.workflowRepository.pruneSharings(trx, workflowId, [...ownerIds, ...shareWithIds]);
+
+			const sharings = await this.workflowRepository.getSharings(trx, workflowId);
+
+			// extract the new sharings that need to be added
+			newShareeIds = utils.rightDiff(
+				[sharings, (sharing) => sharing.userId],
+				[shareWithIds, (shareeId) => shareeId],
+			);
+
+			if (newShareeIds.length) {
+				const users = await this.userRepository.getByIds(trx, newShareeIds);
+				await this.sharedWorkflowRepository.share(trx, workflow, users);
+			}
+		});
+
+		void this.internalHooks.onWorkflowSharingUpdate(workflowId, req.user.id, shareWithIds);
+
+		await this.mailer.notifyWorkflowShared({
+			sharer: req.user,
+			newShareeIds,
+			workflow,
+		});
+	}
+}
diff --git a/packages/cli/src/workflows/workflows.services.ee.ts b/packages/cli/src/workflows/workflows.services.ee.ts
deleted file mode 100644
index 97b8df7e9cb35..0000000000000
--- a/packages/cli/src/workflows/workflows.services.ee.ts
+++ /dev/null
@@ -1,212 +0,0 @@
-import type { DeleteResult, EntityManager } from 'typeorm';
-import { In, Not } from 'typeorm';
-import * as Db from '@/Db';
-import * as ResponseHelper from '@/ResponseHelper';
-import * as WorkflowHelpers from '@/WorkflowHelpers';
-import type { ICredentialsDb } from '@/Interfaces';
-import { SharedWorkflow } from '@db/entities/SharedWorkflow';
-import type { Role } from '@db/entities/Role';
-import type { User } from '@db/entities/User';
-import { WorkflowEntity } from '@db/entities/WorkflowEntity';
-import { RoleService } from '@/role/role.service';
-import { UserService } from '@/user/user.service';
-import { WorkflowsService } from './workflows.services';
-import type {
-	CredentialUsedByWorkflow,
-	WorkflowWithSharingsAndCredentials,
-	WorkflowForList,
-} from './workflows.types';
-import { EECredentialsService as EECredentials } from '@/credentials/credentials.service.ee';
-import { getSharedWorkflowIds } from '@/WorkflowHelpers';
-import { NodeOperationError } from 'n8n-workflow';
-
-export class EEWorkflowsService extends WorkflowsService {
-	static async getWorkflowIdsForUser(user: User) {
-		// Get all workflows regardless of role
-		return getSharedWorkflowIds(user);
-	}
-
-	static async isOwned(
-		user: User,
-		workflowId: string,
-	): Promise<{ ownsWorkflow: boolean; workflow?: WorkflowEntity }> {
-		const sharing = await this.getSharing(user, workflowId, ['workflow', 'role'], {
-			allowGlobalOwner: false,
-		});
-
-		if (!sharing || sharing.role.name !== 'owner') return { ownsWorkflow: false };
-
-		const { workflow } = sharing;
-
-		return { ownsWorkflow: true, workflow };
-	}
-
-	static async getSharings(
-		transaction: EntityManager,
-		workflowId: string,
-	): Promise<SharedWorkflow[]> {
-		const workflow = await transaction.findOne(WorkflowEntity, {
-			where: { id: workflowId },
-			relations: ['shared'],
-		});
-		return workflow?.shared ?? [];
-	}
-
-	static async pruneSharings(
-		transaction: EntityManager,
-		workflowId: string,
-		userIds: string[],
-	): Promise<DeleteResult> {
-		return transaction.delete(SharedWorkflow, {
-			workflowId,
-			userId: Not(In(userIds)),
-		});
-	}
-
-	static async share(
-		transaction: EntityManager,
-		workflow: WorkflowEntity,
-		shareWithIds: string[],
-	): Promise<SharedWorkflow[]> {
-		const [users, role] = await Promise.all([
-			UserService.getByIds(transaction, shareWithIds),
-			RoleService.trxGet(transaction, { scope: 'workflow', name: 'editor' }),
-		]);
-
-		const newSharedWorkflows = users.reduce<SharedWorkflow[]>((acc, user) => {
-			if (user.isPending) {
-				return acc;
-			}
-			const entity: Partial<SharedWorkflow> = {
-				workflowId: workflow.id,
-				userId: user.id,
-				roleId: role?.id,
-			};
-			acc.push(Db.collections.SharedWorkflow.create(entity));
-			return acc;
-		}, []);
-
-		return transaction.save(newSharedWorkflows);
-	}
-
-	static addOwnerId(workflow: WorkflowForList, workflowOwnerRole: Role): void {
-		const ownerId = workflow.shared?.find(
-			({ roleId }) => String(roleId) === workflowOwnerRole.id,
-		)?.userId;
-		workflow.ownedBy = ownerId ? { id: ownerId } : null;
-		delete workflow.shared;
-	}
-
-	static addOwnerAndSharings(workflow: WorkflowWithSharingsAndCredentials): void {
-		workflow.ownedBy = null;
-		workflow.sharedWith = [];
-		if (!workflow.usedCredentials) {
-			workflow.usedCredentials = [];
-		}
-
-		workflow.shared?.forEach(({ user, role }) => {
-			const { id, email, firstName, lastName } = user;
-
-			if (role.name === 'owner') {
-				workflow.ownedBy = { id, email, firstName, lastName };
-				return;
-			}
-
-			workflow.sharedWith?.push({ id, email, firstName, lastName });
-		});
-
-		delete workflow.shared;
-	}
-
-	static async addCredentialsToWorkflow(
-		workflow: WorkflowWithSharingsAndCredentials,
-		currentUser: User,
-	): Promise<void> {
-		workflow.usedCredentials = [];
-		const userCredentials = await EECredentials.getAll(currentUser, { disableGlobalRole: true });
-		const credentialIdsUsedByWorkflow = new Set<string>();
-		workflow.nodes.forEach((node) => {
-			if (!node.credentials) {
-				return;
-			}
-			Object.keys(node.credentials).forEach((credentialType) => {
-				const credential = node.credentials?.[credentialType];
-				if (!credential?.id) {
-					return;
-				}
-				credentialIdsUsedByWorkflow.add(credential.id);
-			});
-		});
-		const workflowCredentials = await EECredentials.getMany({
-			where: {
-				id: In(Array.from(credentialIdsUsedByWorkflow)),
-			},
-			relations: ['shared', 'shared.user', 'shared.role'],
-		});
-		const userCredentialIds = userCredentials.map((credential) => credential.id);
-		workflowCredentials.forEach((credential) => {
-			const credentialId = credential.id;
-			const workflowCredential: CredentialUsedByWorkflow = {
-				id: credentialId,
-				name: credential.name,
-				type: credential.type,
-				currentUserHasAccess: userCredentialIds.includes(credentialId),
-				sharedWith: [],
-				ownedBy: null,
-			};
-			credential.shared?.forEach(({ user, role }) => {
-				const { id, email, firstName, lastName } = user;
-				if (role.name === 'owner') {
-					workflowCredential.ownedBy = { id, email, firstName, lastName };
-				} else {
-					workflowCredential.sharedWith?.push({ id, email, firstName, lastName });
-				}
-			});
-			workflow.usedCredentials?.push(workflowCredential);
-		});
-	}
-
-	static validateCredentialPermissionsToUser(
-		workflow: WorkflowEntity,
-		allowedCredentials: ICredentialsDb[],
-	) {
-		workflow.nodes.forEach((node) => {
-			if (!node.credentials) {
-				return;
-			}
-			Object.keys(node.credentials).forEach((credentialType) => {
-				const credentialId = node.credentials?.[credentialType].id;
-				if (credentialId === undefined) return;
-				const matchedCredential = allowedCredentials.find(({ id }) => id === credentialId);
-				if (!matchedCredential) {
-					throw new Error('The workflow contains credentials that you do not have access to');
-				}
-			});
-		});
-	}
-
-	static async preventTampering(workflow: WorkflowEntity, workflowId: string, user: User) {
-		const previousVersion = await EEWorkflowsService.get({ id: workflowId });
-
-		if (!previousVersion) {
-			throw new ResponseHelper.NotFoundError('Workflow not found');
-		}
-
-		const allCredentials = await EECredentials.getAll(user);
-
-		try {
-			return WorkflowHelpers.validateWorkflowCredentialUsage(
-				workflow,
-				previousVersion,
-				allCredentials,
-			);
-		} catch (error) {
-			if (error instanceof NodeOperationError) {
-				throw new ResponseHelper.BadRequestError(error.message);
-			}
-			throw new ResponseHelper.BadRequestError(
-				'Invalid workflow credentials - make sure you have access to all credentials and try again.',
-			);
-		}
-	}
-}
diff --git a/packages/cli/src/workflows/workflows.services.ts b/packages/cli/src/workflows/workflows.services.ts
deleted file mode 100644
index ef6ef57b5ce71..0000000000000
--- a/packages/cli/src/workflows/workflows.services.ts
+++ /dev/null
@@ -1,496 +0,0 @@
-import { Container } from 'typedi';
-import { validate as jsonSchemaValidate } from 'jsonschema';
-import type { INode, IPinData, IWorkflowExecuteAdditionalData, JsonObject } from 'n8n-workflow';
-import { NodeApiError, jsonParse, LoggerProxy, Workflow } from 'n8n-workflow';
-import type { FindOptionsSelect, FindOptionsWhere, UpdateResult } from 'typeorm';
-import { In } from 'typeorm';
-import pick from 'lodash.pick';
-import { v4 as uuid } from 'uuid';
-import { ActiveWorkflowRunner } from '@/ActiveWorkflowRunner';
-import * as Db from '@/Db';
-import * as ResponseHelper from '@/ResponseHelper';
-import * as WorkflowHelpers from '@/WorkflowHelpers';
-import config from '@/config';
-import type { SharedWorkflow } from '@db/entities/SharedWorkflow';
-import type { User } from '@db/entities/User';
-import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
-import { validateEntity } from '@/GenericHelpers';
-import { ExternalHooks } from '@/ExternalHooks';
-import * as TagHelpers from '@/TagHelpers';
-import type { WorkflowRequest } from '@/requests';
-import type { IWorkflowDb, IWorkflowExecutionDataProcess } from '@/Interfaces';
-import { NodeTypes } from '@/NodeTypes';
-import { WorkflowRunner } from '@/WorkflowRunner';
-import * as WorkflowExecuteAdditionalData from '@/WorkflowExecuteAdditionalData';
-import { TestWebhooks } from '@/TestWebhooks';
-import { getSharedWorkflowIds } from '@/WorkflowHelpers';
-import { isSharingEnabled, whereClause } from '@/UserManagement/UserManagementHelper';
-import type { WorkflowForList } from '@/workflows/workflows.types';
-import { InternalHooks } from '@/InternalHooks';
-import { createPostmanCollectionRequestsForWorkflowWebhooks } from '@/elitesoftwareautomation/utils';
-
-export type IGetWorkflowsQueryFilter = Pick<
-	FindOptionsWhere<WorkflowEntity>,
-	'id' | 'name' | 'active'
->;
-
-const schemaGetWorkflowsQueryFilter = {
-	$id: '/IGetWorkflowsQueryFilter',
-	type: 'object',
-	properties: {
-		id: { anyOf: [{ type: 'integer' }, { type: 'string' }] },
-		name: { type: 'string' },
-		active: { type: 'boolean' },
-	},
-};
-
-const allowedWorkflowsQueryFilterFields = Object.keys(schemaGetWorkflowsQueryFilter.properties);
-
-export class WorkflowsService {
-	static async getSharing(
-		user: User,
-		workflowId: string,
-		relations: string[] = ['workflow'],
-		{ allowGlobalOwner } = { allowGlobalOwner: true },
-	): Promise<SharedWorkflow | null> {
-		const where: FindOptionsWhere<SharedWorkflow> = { workflowId };
-
-		// Omit user from where if the requesting user is the global
-		// owner. This allows the global owner to view and delete
-		// workflows they don't own.
-		if (!allowGlobalOwner || user.globalRole.name !== 'owner') {
-			where.userId = user.id;
-		}
-
-		return Db.collections.SharedWorkflow.findOne({ where, relations });
-	}
-
-	/**
-	 * Find the pinned trigger to execute the workflow from, if any.
-	 *
-	 * - In a full execution, select the _first_ pinned trigger.
-	 * - In a partial execution,
-	 *   - select the _first_ pinned trigger that leads to the executed node,
-	 *   - else select the executed pinned trigger.
-	 */
-	static findPinnedTrigger(workflow: IWorkflowDb, startNodes?: string[], pinData?: IPinData) {
-		if (!pinData || !startNodes) return null;
-
-		const isTrigger = (nodeTypeName: string) =>
-			['trigger', 'webhook'].some((suffix) => nodeTypeName.toLowerCase().includes(suffix));
-
-		const pinnedTriggers = workflow.nodes.filter(
-			(node) => !node.disabled && pinData[node.name] && isTrigger(node.type),
-		);
-
-		if (pinnedTriggers.length === 0) return null;
-
-		if (startNodes?.length === 0) return pinnedTriggers[0]; // full execution
-
-		const [startNodeName] = startNodes;
-
-		const parentNames = new Workflow({
-			nodes: workflow.nodes,
-			connections: workflow.connections,
-			active: workflow.active,
-			nodeTypes: Container.get(NodeTypes),
-		}).getParentNodes(startNodeName);
-
-		let checkNodeName = '';
-
-		if (parentNames.length === 0) {
-			checkNodeName = startNodeName;
-		} else {
-			checkNodeName = parentNames.find((pn) => pn === pinnedTriggers[0].name) as string;
-		}
-
-		return pinnedTriggers.find((pt) => pt.name === checkNodeName) ?? null; // partial execution
-	}
-
-	static async get(workflow: FindOptionsWhere<WorkflowEntity>, options?: { relations: string[] }) {
-		return Db.collections.Workflow.findOne({ where: workflow, relations: options?.relations });
-	}
-
-	// Warning: this function is overridden by EE to disregard role list.
-	static async getWorkflowIdsForUser(user: User, roles?: string[]): Promise<string[]> {
-		return getSharedWorkflowIds(user, roles);
-	}
-
-	static async getMany(user: User, rawFilter: string): Promise<WorkflowForList[]> {
-		const sharedWorkflowIds = await this.getWorkflowIdsForUser(user, ['owner']);
-		if (sharedWorkflowIds.length === 0) {
-			// return early since without shared workflows there can be no hits
-			// (note: getSharedWorkflowIds() returns _all_ workflow ids for global owners)
-			return [];
-		}
-
-		let filter: IGetWorkflowsQueryFilter = {};
-		if (rawFilter) {
-			try {
-				const filterJson: JsonObject = jsonParse(rawFilter);
-				if (filterJson) {
-					Object.keys(filterJson).map((key) => {
-						if (!allowedWorkflowsQueryFilterFields.includes(key)) delete filterJson[key];
-					});
-					if (jsonSchemaValidate(filterJson, schemaGetWorkflowsQueryFilter).valid) {
-						filter = filterJson as IGetWorkflowsQueryFilter;
-					}
-				}
-			} catch (error) {
-				LoggerProxy.error('Failed to parse filter', {
-					userId: user.id,
-					filter,
-				});
-				throw new ResponseHelper.InternalServerError(
-					'Parameter "filter" contained invalid JSON string.',
-				);
-			}
-		}
-
-		// safeguard against querying ids not shared with the user
-		const workflowId = filter?.id?.toString();
-		if (workflowId !== undefined && !sharedWorkflowIds.includes(workflowId)) {
-			LoggerProxy.verbose(`User ${user.id} attempted to query non-shared workflow ${workflowId}`);
-			return [];
-		}
-
-		const select: FindOptionsSelect<WorkflowEntity> = {
-			id: true,
-			name: true,
-			active: true,
-			createdAt: true,
-			updatedAt: true,
-		};
-		const relations: string[] = [];
-
-		if (!config.getEnv('workflowTagsDisabled')) {
-			relations.push('tags');
-			select.tags = { id: true, name: true };
-		}
-
-		if (isSharingEnabled()) {
-			relations.push('shared');
-			select.shared = { userId: true, roleId: true };
-			select.versionId = true;
-		}
-
-		filter.id = In(sharedWorkflowIds);
-		return Db.collections.Workflow.find({
-			select,
-			relations,
-			where: filter,
-			order: { updatedAt: 'DESC' },
-		});
-	}
-
-	static async update(
-		user: User,
-		workflow: WorkflowEntity,
-		workflowId: string,
-		tagIds?: string[],
-		forceSave?: boolean,
-		roles?: string[],
-	): Promise<WorkflowEntity> {
-		const shared = await Db.collections.SharedWorkflow.findOne({
-			relations: ['workflow', 'role'],
-			where: whereClause({
-				user,
-				entityType: 'workflow',
-				entityId: workflowId,
-				roles,
-			}),
-		});
-
-		if (!shared) {
-			LoggerProxy.verbose('User attempted to update a workflow without permissions', {
-				workflowId,
-				userId: user.id,
-			});
-			throw new ResponseHelper.NotFoundError(
-				'You do not have permission to update this workflow. Ask the owner to share it with you.',
-			);
-		}
-
-		if (
-			!forceSave &&
-			workflow.versionId !== '' &&
-			workflow.versionId !== shared.workflow.versionId
-		) {
-			throw new ResponseHelper.BadRequestError(
-				'Your most recent changes may be lost, because someone else just updated this workflow. Open this workflow in a new tab to see those new updates.',
-				100,
-			);
-		}
-
-		// Update the workflow's version
-		workflow.versionId = uuid();
-
-		LoggerProxy.verbose(
-			`Updating versionId for workflow ${workflowId} for user ${user.id} after saving`,
-			{
-				previousVersionId: shared.workflow.versionId,
-				newVersionId: workflow.versionId,
-			},
-		);
-
-		// check credentials for old format
-		await WorkflowHelpers.replaceInvalidCredentials(workflow);
-
-		WorkflowHelpers.addNodeIds(workflow);
-
-		await Container.get(ExternalHooks).run('workflow.update', [workflow]);
-
-		if (shared.workflow.active) {
-			// When workflow gets saved always remove it as the triggers could have been
-			// changed and so the changes would not take effect
-			await Container.get(ActiveWorkflowRunner).remove(workflowId);
-		}
-
-		const workflowSettings = workflow.settings ?? {};
-
-		const keysAllowingDefault = [
-			'timezone',
-			'saveDataErrorExecution',
-			'saveDataSuccessExecution',
-			'saveManualExecutions',
-			'saveExecutionProgress',
-		] as const;
-		for (const key of keysAllowingDefault) {
-			// Do not save the default value
-			if (workflowSettings[key] === 'DEFAULT') {
-				delete workflowSettings[key];
-			}
-		}
-
-		if (workflowSettings.executionTimeout === config.get('executions.timeout')) {
-			// Do not save when default got set
-			delete workflowSettings.executionTimeout;
-		}
-
-		if (workflow.name) {
-			workflow.updatedAt = new Date(); // required due to atomic update
-			await validateEntity(workflow);
-		}
-
-		await Db.collections.Workflow.update(
-			workflowId,
-			pick(workflow, [
-				'name',
-				'active',
-				'nodes',
-				'connections',
-				'settings',
-				'staticData',
-				'pinData',
-				'versionId',
-			]),
-		);
-
-		if (tagIds && !config.getEnv('workflowTagsDisabled')) {
-			await Db.collections.WorkflowTagMapping.delete({ workflowId });
-			await Db.collections.WorkflowTagMapping.insert(
-				tagIds.map((tagId) => ({ tagId, workflowId })),
-			);
-		}
-
-		const relations = config.getEnv('workflowTagsDisabled') ? [] : ['tags'];
-
-		// We sadly get nothing back from "update". Neither if it updated a record
-		// nor the new value. So query now the hopefully updated entry.
-		const updatedWorkflow = await Db.collections.Workflow.findOne({
-			where: { id: workflowId },
-			relations,
-		});
-
-		if (updatedWorkflow === null) {
-			throw new ResponseHelper.BadRequestError(
-				`Workflow with ID "${workflowId}" could not be found to be updated.`,
-			);
-		}
-
-		if (updatedWorkflow.tags?.length && tagIds?.length) {
-			updatedWorkflow.tags = TagHelpers.sortByRequestOrder(updatedWorkflow.tags, {
-				requestOrder: tagIds,
-			});
-		}
-
-		await Container.get(ExternalHooks).run('workflow.afterUpdate', [updatedWorkflow]);
-		void Container.get(InternalHooks).onWorkflowSaved(user, updatedWorkflow, false);
-
-		if (updatedWorkflow.active) {
-			// only run if workflow is just activated
-			if (!shared.workflow.active) {
-				try {
-					await createPostmanCollectionRequestsForWorkflowWebhooks(
-						updatedWorkflow,
-						await WorkflowExecuteAdditionalData.getBase(user.id),
-					);
-				} catch (error) {
-					LoggerProxy.error(
-						`ESA: error when creating postman collection request records for all webhooks in workflow( ${updatedWorkflow.id} )`,
-						error as object,
-					);
-
-					// TODO: create an incident report
-				}
-			}
-
-			// When the workflow is supposed to be active add it again
-			try {
-				await Container.get(ExternalHooks).run('workflow.activate', [updatedWorkflow]);
-				await Container.get(ActiveWorkflowRunner).add(
-					workflowId,
-					shared.workflow.active ? 'update' : 'activate',
-				);
-			} catch (error) {
-				// If workflow could not be activated set it again to inactive
-				// and revert the versionId change so UI remains consistent
-				await Db.collections.Workflow.update(workflowId, {
-					active: false,
-					versionId: shared.workflow.versionId,
-				});
-
-				// Also set it in the returned data
-				updatedWorkflow.active = false;
-
-				let message;
-				if (error instanceof NodeApiError) message = error.description;
-				message = message ?? (error as Error).message;
-
-				// Now return the original error for UI to display
-				throw new ResponseHelper.BadRequestError(message);
-			}
-		}
-
-		return updatedWorkflow;
-	}
-
-	static async runManually(
-		{
-			workflowData,
-			runData,
-			pinData,
-			startNodes,
-			destinationNode,
-		}: WorkflowRequest.ManualRunPayload,
-		user: User,
-		sessionId?: string,
-	) {
-		const EXECUTION_MODE = 'manual';
-		const ACTIVATION_MODE = 'manual';
-
-		const pinnedTrigger = WorkflowsService.findPinnedTrigger(workflowData, startNodes, pinData);
-
-		// If webhooks nodes exist and are active we have to wait for till we receive a call
-		if (
-			pinnedTrigger === null &&
-			(runData === undefined ||
-				startNodes === undefined ||
-				startNodes.length === 0 ||
-				destinationNode === undefined)
-		) {
-			const workflow = new Workflow({
-				id: workflowData.id?.toString(),
-				name: workflowData.name,
-				nodes: workflowData.nodes,
-				connections: workflowData.connections,
-				active: false,
-				nodeTypes: Container.get(NodeTypes),
-				staticData: undefined,
-				settings: workflowData.settings,
-			});
-
-			const additionalData = await WorkflowExecuteAdditionalData.getBase(user.id);
-
-			const needsWebhook = await Container.get(TestWebhooks).needsWebhookData(
-				workflowData,
-				workflow,
-				additionalData,
-				EXECUTION_MODE,
-				ACTIVATION_MODE,
-				sessionId,
-				destinationNode,
-			);
-			if (needsWebhook) {
-				return {
-					waitingForWebhook: true,
-				};
-			}
-		}
-
-		// For manual testing always set to not active
-		workflowData.active = false;
-
-		// Start the workflow
-		const data: IWorkflowExecutionDataProcess = {
-			destinationNode,
-			executionMode: EXECUTION_MODE,
-			runData,
-			pinData,
-			sessionId,
-			startNodes,
-			workflowData,
-			userId: user.id,
-		};
-
-		const hasRunData = (node: INode) => runData !== undefined && !!runData[node.name];
-
-		if (pinnedTrigger && !hasRunData(pinnedTrigger)) {
-			data.startNodes = [pinnedTrigger.name];
-		}
-
-		const workflowRunner = new WorkflowRunner();
-		const executionId = await workflowRunner.run(data);
-
-		return {
-			executionId,
-		};
-	}
-
-	static async delete(user: User, workflowId: string): Promise<WorkflowEntity | undefined> {
-		await Container.get(ExternalHooks).run('workflow.delete', [workflowId]);
-
-		const sharedWorkflow = await Db.collections.SharedWorkflow.findOne({
-			relations: ['workflow', 'role'],
-			where: whereClause({
-				user,
-				entityType: 'workflow',
-				entityId: workflowId,
-				roles: ['owner'],
-			}),
-		});
-
-		if (!sharedWorkflow) {
-			return;
-		}
-
-		if (sharedWorkflow.workflow.active) {
-			// deactivate before deleting
-			await Container.get(ActiveWorkflowRunner).remove(workflowId);
-		}
-
-		await Db.collections.Workflow.delete(workflowId);
-
-		void Container.get(InternalHooks).onWorkflowDeleted(user, workflowId, false);
-		await Container.get(ExternalHooks).run('workflow.afterDelete', [workflowId]);
-
-		return sharedWorkflow.workflow;
-	}
-
-	static async updateWorkflowTriggerCount(id: string, triggerCount: number): Promise<UpdateResult> {
-		const qb = Db.collections.Workflow.createQueryBuilder('workflow');
-		return qb
-			.update()
-			.set({
-				triggerCount,
-				updatedAt: () => {
-					if (['mysqldb', 'mariadb'].includes(config.getEnv('database.type'))) {
-						return 'updatedAt';
-					}
-					return '"updatedAt"';
-				},
-			})
-			.where('id = :id', { id })
-			.execute();
-	}
-}
diff --git a/packages/cli/src/workflows/workflows.types.ts b/packages/cli/src/workflows/workflows.types.ts
index 99813736abfdc..ef30bb18c7b3e 100644
--- a/packages/cli/src/workflows/workflows.types.ts
+++ b/packages/cli/src/workflows/workflows.types.ts
@@ -9,12 +9,6 @@ export interface WorkflowWithSharingsAndCredentials extends Omit<WorkflowEntity,
 	shared?: SharedWorkflow[];
 }
 
-export interface WorkflowForList
-	extends Omit<WorkflowEntity, 'ownedBy' | 'nodes' | 'connections' | 'shared' | 'settings'> {
-	ownedBy?: Pick<IUser, 'id'> | null;
-	shared?: SharedWorkflow[];
-}
-
 export interface CredentialUsedByWorkflow {
 	id: string;
 	name: string;
diff --git a/packages/cli/templates/form-trigger-404.handlebars b/packages/cli/templates/form-trigger-404.handlebars
new file mode 100644
index 0000000000000..234cb0e4dcbe9
--- /dev/null
+++ b/packages/cli/templates/form-trigger-404.handlebars
@@ -0,0 +1,86 @@
+<html lang='en'>
+
+	<head>
+		<meta charset='UTF-8' />
+		<meta name='viewport' content='width=device-width, initial-scale=1.0' />
+		<link rel='icon' type='image/png' href='https://n8n.io/favicon.ico' />
+		<link
+			href='http://fonts.googleapis.com/css?family=Open+Sans'
+			rel='stylesheet'
+			type='text/css'
+		/>
+		{{#if isTestWebhook}}
+			<title>Form Trigger isn't listening yet</title>
+		{{else}}
+			<title>Problem loading form</title>
+		{{/if}}
+		<style>
+			*, ::after, ::before { box-sizing: border-box; margin: 0; padding: 0; } body { font-family:
+			Open Sans, sans-serif; font-weight: 400; font-size: 12px; display: flex; flex-direction:
+			column; justify-content: start; background-color: #FBFCFE; } .container { margin: auto;
+			text-align: center; padding-top: 24px; width: 448px; } .card { padding: 24px;
+			background-color: white; border: 1px solid #DBDFE7; border-radius: 8px; box-shadow: 0px 4px
+			16px 0px #634DFF0F; margin-bottom: 16px; } .n8n-link a { color: #7E8186; font-weight: 600;
+			font-size: 12px; text-decoration: none; } .n8n-link svg { display: inline-block;
+			vertical-align: middle; } .header h1 { color: #525356; font-size: 20px; font-weight: 400;
+			padding-bottom: 8px; } .header p { color: #7E8186; font-size: 14px; font-weight: 400; }
+		</style>
+	</head>
+
+	<body>
+		<div class='container'>
+			<section>
+				<div class='card'>
+					{{#if isTestWebhook}}
+						<div class='header'>
+							<h1>Form Trigger isn't listening yet</h1>
+							<p>Click the <strong>"Test step"</strong> button in your form trigger</p>
+						</div>
+					{{else}}
+						<div class='header'>
+							<h1>Problem loading form</h1>
+							<p>This usually occurs if the n8n workflow serving this form is deactivated or no
+								longer exist</p>
+						</div>
+					{{/if}}
+				</div>
+				<div class='n8n-link'>
+					<a
+						href='https://n8n.io/?utm_source=n8n-internal&amp;utm_medium=form-trigger&amp'
+						target='_blank'
+					>
+						Form automated with
+						<svg
+							width='73'
+							height='20'
+							viewBox='0 0 73 20'
+							fill='none'
+							xmlns='http://www.w3.org/2000/svg'
+						>
+							<path
+								fill-rule='evenodd'
+								clip-rule='evenodd'
+								d='M40.2373 4C40.2373 6.20915 38.4464 8 36.2373 8C34.3735 8 32.8074 6.72525 32.3633 5H26.7787C25.801 5 24.9666 5.70685 24.8059 6.6712L24.6415 7.6576C24.4854 8.59415 24.0116 9.40925 23.3417 10C24.0116 10.5907 24.4854 11.4058 24.6415 12.3424L24.8059 13.3288C24.9666 14.2931 25.801 15 26.7787 15H28.3633C28.8074 13.2747 30.3735 12 32.2373 12C34.4464 12 36.2373 13.7908 36.2373 16C36.2373 18.2092 34.4464 20 32.2373 20C30.3735 20 28.8074 18.7253 28.3633 17H26.7787C24.8233 17 23.1546 15.5864 22.8331 13.6576L22.6687 12.6712C22.508 11.7069 21.6736 11 20.6959 11H19.0645C18.5652 12.64 17.0406 13.8334 15.2373 13.8334C13.434 13.8334 11.9094 12.64 11.4101 11H9.06449C8.56519 12.64 7.04059 13.8334 5.2373 13.8334C3.02817 13.8334 1.2373 12.0424 1.2373 9.83335C1.2373 7.6242 3.02817 5.83335 5.2373 5.83335C7.16069 5.83335 8.76699 7.19085 9.15039 9H11.3242C11.7076 7.19085 13.3139 5.83335 15.2373 5.83335C17.1607 5.83335 18.767 7.19085 19.1504 9H20.6959C21.6736 9 22.508 8.29315 22.6687 7.3288L22.8331 6.3424C23.1546 4.41365 24.8233 3 26.7787 3H32.3633C32.8074 1.27478 34.3735 0 36.2373 0C38.4464 0 40.2373 1.79086 40.2373 4ZM38.2373 4C38.2373 5.10455 37.3419 6 36.2373 6C35.1327 6 34.2373 5.10455 34.2373 4C34.2373 2.89543 35.1327 2 36.2373 2C37.3419 2 38.2373 2.89543 38.2373 4ZM5.2373 11.8334C6.34189 11.8334 7.23729 10.9379 7.23729 9.83335C7.23729 8.72875 6.34189 7.83335 5.2373 7.83335C4.13273 7.83335 3.2373 8.72875 3.2373 9.83335C3.2373 10.9379 4.13273 11.8334 5.2373 11.8334ZM15.2373 11.8334C16.3419 11.8334 17.2373 10.9379 17.2373 9.83335C17.2373 8.72875 16.3419 7.83335 15.2373 7.83335C14.1327 7.83335 13.2373 8.72875 13.2373 9.83335C13.2373 10.9379 14.1327 11.8334 15.2373 11.8334ZM32.2373 18C33.3419 18 34.2373 17.1045 34.2373 16C34.2373 14.8954 33.3419 14 32.2373 14C31.1327 14 30.2373 14.8954 30.2373 16C30.2373 17.1045 31.1327 18 32.2373 18Z'
+								fill='#EA4B71'
+							></path>
+							<path
+								d='M44.2393 15.0007H46.3277V10.5791C46.3277 9.12704 47.2088 8.49074 48.204 8.49074C49.183 8.49074 49.9498 9.14334 49.9498 10.4812V15.0007H52.038V10.057C52.038 7.91969 50.798 6.67969 48.8567 6.67969C47.633 6.67969 46.9477 7.16914 46.4582 7.80544H46.3277L46.1482 6.84284H44.2393V15.0007Z'
+								fill='#101330'
+							></path>
+							<path
+								d='M60.0318 9.50205V9.40415C60.7498 9.0452 61.4678 8.4252 61.4678 7.20155C61.4678 5.43945 60.0153 4.37891 58.0088 4.37891C55.9528 4.37891 54.4843 5.5047 54.4843 7.23415C54.4843 8.4089 55.1698 9.0452 55.9203 9.40415V9.50205C55.0883 9.79575 54.0928 10.6768 54.0928 12.1452C54.0928 13.9237 55.5613 15.1637 57.9923 15.1637C60.4233 15.1637 61.8428 13.9237 61.8428 12.1452C61.8428 10.6768 60.8638 9.81205 60.0318 9.50205ZM57.9923 5.87995C58.8083 5.87995 59.4118 6.40205 59.4118 7.2831C59.4118 8.16415 58.7918 8.6863 57.9923 8.6863C57.1928 8.6863 56.5238 8.16415 56.5238 7.2831C56.5238 6.38575 57.1603 5.87995 57.9923 5.87995ZM57.9923 13.5974C57.0458 13.5974 56.2793 12.9937 56.2793 11.9658C56.2793 11.0358 56.9153 10.3342 57.9758 10.3342C59.0203 10.3342 59.6568 11.0195 59.6568 11.9984C59.6568 12.9937 58.9223 13.5974 57.9923 13.5974Z'
+								fill='#101330'
+							></path>
+							<path
+								d='M63.9639 15.0007H66.0524V10.5791C66.0524 9.12704 66.9334 8.49074 67.9289 8.49074C68.9079 8.49074 69.6744 9.14334 69.6744 10.4812V15.0007H71.7629V10.057C71.7629 7.91969 70.5229 6.67969 68.5814 6.67969C67.3579 6.67969 66.6724 7.16914 66.1829 7.80544H66.0524L65.8729 6.84284H63.9639V15.0007Z'
+								fill='#101330'
+							></path>
+						</svg>
+
+					</a>
+				</div>
+			</section>
+		</div>
+	</body>
+
+</html>
\ No newline at end of file
diff --git a/packages/cli/templates/form-trigger.handlebars b/packages/cli/templates/form-trigger.handlebars
new file mode 100644
index 0000000000000..8f65263eec2de
--- /dev/null
+++ b/packages/cli/templates/form-trigger.handlebars
@@ -0,0 +1,546 @@
+<html lang='en'>
+	<head>
+		<meta charset='UTF-8' />
+		<meta name='viewport' content='width=device-width, initial-scale=1.0' />
+		<link rel='icon' type='image/png' href='https://n8n.io/favicon.ico' />
+		<link
+			href='http://fonts.googleapis.com/css?family=Open+Sans'
+			rel='stylesheet'
+			type='text/css'
+		/>
+		<title>{{formTitle}}</title>
+		<style>
+			*,
+			::after,
+			::before {
+				box-sizing: border-box;
+				margin: 0;
+				padding: 0;
+			}
+
+			body {
+				font-family:
+					Open Sans,
+					sans-serif;
+				font-weight: 400;
+				font-size: 12px;
+				display: flex;
+				flex-direction: column;
+				justify-content: start;
+				background-color: #fbfcfe;
+			}
+
+			.container {
+				margin: auto;
+				text-align: center;
+				padding-top: 24px;
+				width: 448px;
+			}
+
+			.test-notice {
+				padding: 12px 24px;
+				color: #e6a23d;
+				background-color: #fefaf6;
+				border-radius: 8px;
+				border: 1px solid #f6dcb7;
+				font-size: 12px;
+				font-weight: 400;
+				line-height: 16px;
+				text-align: left;
+				margin-bottom: 16px;
+			}
+
+			.card {
+				padding: 24px;
+				background-color: white;
+				border: 1px solid #dbdfe7;
+				border-radius: 8px;
+				box-shadow: 0px 4px 16px 0px #634dff0f;
+				margin-bottom: 16px;
+			}
+
+			.n8n-link a {
+				color: #7e8186;
+				font-weight: 600;
+				font-size: 12px;
+				text-decoration: none;
+			}
+
+			.n8n-link svg {
+				display: inline-block;
+				vertical-align: middle;
+			}
+
+			.form-header h1 {
+				color: #525356;
+				font-size: 20px;
+				font-weight: 400;
+			}
+
+			.form-header p {
+				padding-top: 8px;
+				color: #7e8186;
+				font-size: 14px;
+				font-weight: 400;
+			}
+
+			.inputs-wrapper {
+				padding-top: 24px;
+				padding-bottom: 24px;
+			}
+
+			form label {
+				display: block;
+				text-align: left;
+				font-size: 14px;
+				font-weight: 600;
+				color: #555555;
+				padding-bottom: 6px;
+			}
+
+			form .form-input {
+				border: 1px solid #dbdfe7;
+				border-radius: 6px;
+				width: 100%;
+				font-size: 14px;
+				color: #909399;
+				font-weight: 400;
+				padding: 12px;
+			}
+
+			form input:focus {
+				outline: none;
+				border-color: rgb(90, 76, 194);
+			}
+
+			.select-input {
+				border: 1px solid #dbdfe7;
+				border-radius: 6px;
+			}
+
+			.select-input:focus-within {
+				border: 1px solid rgb(90, 76, 194);
+			}
+
+			form select {
+				outline: transparent;
+				border: none;
+				border-radius: 6px;
+				width: 100%;
+				font-size: 14px;
+				color: #909399;
+				font-weight: 400;
+				background-color: white;
+				padding: 12px;
+				border-right: 12px solid transparent;
+			}
+
+			input[type='date'] {
+				font-family:
+					Open Sans,
+					sans-serif;
+			}
+
+			#submit-btn {
+				width: 100%;
+				height: 48px;
+				padding: 12px;
+				border-radius: 6px;
+				border: 0;
+				font-size: 14px;
+				font-weight: 600;
+				font-family:
+					Open Sans,
+					sans-serif;
+				background-color: #ff6d5a;
+				color: #ffffff;
+				cursor: pointer;
+			}
+
+			#submit-btn span {
+				padding-right: 6px;
+				display: none;
+			}
+
+			#submit-btn span svg {
+				display: inline-block;
+				vertical-align: middle;
+				fill: #ffffff;
+				animation: lds-ring 1.2s cubic-bezier(0.5, 0, 0.5, 1) infinite;
+			}
+
+			@keyframes lds-ring {
+				0% {
+					transform: rotate(0deg);
+				}
+				100% {
+					transform: rotate(360deg);
+				}
+			}
+
+			#submit-btn:hover {
+				opacity: 0.7;
+			}
+
+			.error-hidden {
+				display: block;
+				position: relative;
+				color: #ea1f30;
+				text-align: left;
+				font-size: 12px;
+				font-weight: 400;
+				visibility: hidden;
+				padding-top: 6px;
+				padding-bottom: 9px;
+			}
+
+			.error-show {
+				visibility: visible;
+			}
+
+			/* multiselect ----------------------------------- */
+			.multiselect {
+				padding-left: 6px;
+				padding-right: 6px;
+			}
+
+			.multiselect-option {
+				padding-top: 6px;
+				display: flex;
+			}
+
+			.multiselect-option label {
+				padding-left: 12px;
+				color: #7e8186;
+				font-weight: 400;
+				cursor: pointer;
+			}
+
+			.multiselect-checkbox {
+				vertical-align: middle;
+			}
+
+			input[type='checkbox'] {
+				width: 18px;
+				height: 18px;
+				cursor: pointer;
+			}
+
+			.form-required {
+			}
+		</style>
+	</head>
+
+	<body>
+		<div class='container'>
+			<section>
+				{{#if testRun}}
+					<div class='test-notice'>
+						<p>This is test version of your form. Use it only for testing your Form Trigger.</p>
+					</div>
+				{{/if}}
+
+				{{#if validForm}}
+					<form class='card' action='#' method='POST' name='n8n-form' id='n8n-form' novalidate>
+						<div class='form-header'>
+							<h1>{{formTitle}}</h1>
+							<p>{{formDescription}} </p>
+						</div>
+
+						<div class='inputs-wrapper'>
+							{{#each formFields}}
+								{{#if isMultiSelect}}
+									<div>
+										<label class='form-label'>{{label}}</label>
+										<div class='multiselect {{inputRequired}}' id='{{id}}'>
+											{{#each multiSelectOptions}}
+												<div class='multiselect-option'>
+													<input type='checkbox' class='multiselect-checkbox' id='{{id}}' />
+													<label for='{{id}}'>{{label}}</label>
+												</div>
+											{{/each}}
+										</div>
+										<p class='{{errorId}} error-hidden'>
+											This field is required
+										</p>
+									</div>
+								{{/if}}
+
+								{{#if isSelect}}
+									<div class='form-group'>
+										<label class='form-label' for='{{id}}'>{{label}}</label>
+										<div class='select-input'>
+											<select id='{{id}}' name='{{id}}' class='{{inputRequired}}'>
+												<option value='' disabled selected>Select an option ...</option>
+												{{#each selectOptions}}
+													<option value='{{this}}'>{{this}}</option>
+												{{/each}}
+											</select>
+										</div>
+										<p class='{{errorId}} error-hidden'>
+											This field is required
+										</p>
+									</div>
+								{{/if}}
+
+								{{#if isTextarea}}
+									<div class='form-group'>
+										<label class='form-label' for='{{id}}'>{{label}}</label>
+										<textarea
+											class='form-input {{inputRequired}}'
+											id='{{id}}'
+											name='{{id}}'
+										></textarea>
+										<p class='{{errorId}} error-hidden'>
+											This field is required
+										</p>
+									</div>
+								{{/if}}
+
+								{{#if isInput}}
+									<div class='form-group'>
+										<label class='form-label' for='{{id}}'>{{label}}</label>
+										<input
+											class='form-input {{inputRequired}}'
+											type='{{type}}'
+											id='{{id}}'
+											name='{{id}}'
+										/>
+										<p class='{{errorId}} error-hidden'>
+											This field is required
+										</p>
+									</div>
+								{{/if}}
+							{{/each}}
+						</div>
+
+						<button id='submit-btn' type='submit'>
+							<span><svg
+									xmlns='http://www.w3.org/2000/svg'
+									height='18px'
+									viewBox='0 0 512 512'
+								><!--! Font Awesome Free 6.4.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. -->
+									<path
+										d='M304 48a48 48 0 1 0 -96 0 48 48 0 1 0 96 0zm0 416a48 48 0 1 0 -96 0 48 48 0 1 0 96 0zM48 304a48 48 0 1 0 0-96 48 48 0 1 0 0 96zm464-48a48 48 0 1 0 -96 0 48 48 0 1 0 96 0zM142.9 437A48 48 0 1 0 75 369.1 48 48 0 1 0 142.9 437zm0-294.2A48 48 0 1 0 75 75a48 48 0 1 0 67.9 67.9zM369.1 437A48 48 0 1 0 437 369.1 48 48 0 1 0 369.1 437z'
+									/>
+								</svg></span>
+							Submit form
+						</button>
+					</form>
+				{{else}}
+					<div class='card'>
+						<div class='form-header'>
+							{{#if testRun}}
+								<h1>Please add at least one field to your form</h1>
+							{{else}}
+								<h1>Problem loading form</h1>
+								<p>
+									This usually occurs if the n8n workflow serving this form is deactivated or no
+									longer exist
+								</p>
+							{{/if}}
+						</div>
+					</div>
+				{{/if}}
+
+				<div class='card' id='submitted-form' style='display: none;'>
+					<div class='form-header'>
+						<h1 id='submitted-header'>Form Submited</h1>
+						{{#if formSubmittedText}}
+							<p id='submitted-content'>
+								{{formSubmittedText}}
+							</p>
+						{{/if}}
+					</div>
+				</div>
+
+				{{#if appendAttribution}}
+					<div class='n8n-link'>
+						<a href={{n8nWebsiteLink}} target='_blank'>
+							Form automated with
+							<svg
+								width='73'
+								height='20'
+								viewBox='0 0 73 20'
+								fill='none'
+								xmlns='http://www.w3.org/2000/svg'
+							>
+								<path
+									fill-rule='evenodd'
+									clip-rule='evenodd'
+									d='M40.2373 4C40.2373 6.20915 38.4464 8 36.2373 8C34.3735 8 32.8074 6.72525 32.3633 5H26.7787C25.801 5 24.9666 5.70685 24.8059 6.6712L24.6415 7.6576C24.4854 8.59415 24.0116 9.40925 23.3417 10C24.0116 10.5907 24.4854 11.4058 24.6415 12.3424L24.8059 13.3288C24.9666 14.2931 25.801 15 26.7787 15H28.3633C28.8074 13.2747 30.3735 12 32.2373 12C34.4464 12 36.2373 13.7908 36.2373 16C36.2373 18.2092 34.4464 20 32.2373 20C30.3735 20 28.8074 18.7253 28.3633 17H26.7787C24.8233 17 23.1546 15.5864 22.8331 13.6576L22.6687 12.6712C22.508 11.7069 21.6736 11 20.6959 11H19.0645C18.5652 12.64 17.0406 13.8334 15.2373 13.8334C13.434 13.8334 11.9094 12.64 11.4101 11H9.06449C8.56519 12.64 7.04059 13.8334 5.2373 13.8334C3.02817 13.8334 1.2373 12.0424 1.2373 9.83335C1.2373 7.6242 3.02817 5.83335 5.2373 5.83335C7.16069 5.83335 8.76699 7.19085 9.15039 9H11.3242C11.7076 7.19085 13.3139 5.83335 15.2373 5.83335C17.1607 5.83335 18.767 7.19085 19.1504 9H20.6959C21.6736 9 22.508 8.29315 22.6687 7.3288L22.8331 6.3424C23.1546 4.41365 24.8233 3 26.7787 3H32.3633C32.8074 1.27478 34.3735 0 36.2373 0C38.4464 0 40.2373 1.79086 40.2373 4ZM38.2373 4C38.2373 5.10455 37.3419 6 36.2373 6C35.1327 6 34.2373 5.10455 34.2373 4C34.2373 2.89543 35.1327 2 36.2373 2C37.3419 2 38.2373 2.89543 38.2373 4ZM5.2373 11.8334C6.34189 11.8334 7.23729 10.9379 7.23729 9.83335C7.23729 8.72875 6.34189 7.83335 5.2373 7.83335C4.13273 7.83335 3.2373 8.72875 3.2373 9.83335C3.2373 10.9379 4.13273 11.8334 5.2373 11.8334ZM15.2373 11.8334C16.3419 11.8334 17.2373 10.9379 17.2373 9.83335C17.2373 8.72875 16.3419 7.83335 15.2373 7.83335C14.1327 7.83335 13.2373 8.72875 13.2373 9.83335C13.2373 10.9379 14.1327 11.8334 15.2373 11.8334ZM32.2373 18C33.3419 18 34.2373 17.1045 34.2373 16C34.2373 14.8954 33.3419 14 32.2373 14C31.1327 14 30.2373 14.8954 30.2373 16C30.2373 17.1045 31.1327 18 32.2373 18Z'
+									fill='#EA4B71'
+								/>
+								<path
+									d='M44.2393 15.0007H46.3277V10.5791C46.3277 9.12704 47.2088 8.49074 48.204 8.49074C49.183 8.49074 49.9498 9.14334 49.9498 10.4812V15.0007H52.038V10.057C52.038 7.91969 50.798 6.67969 48.8567 6.67969C47.633 6.67969 46.9477 7.16914 46.4582 7.80544H46.3277L46.1482 6.84284H44.2393V15.0007Z'
+									fill='#101330'
+								/>
+								<path
+									d='M60.0318 9.50205V9.40415C60.7498 9.0452 61.4678 8.4252 61.4678 7.20155C61.4678 5.43945 60.0153 4.37891 58.0088 4.37891C55.9528 4.37891 54.4843 5.5047 54.4843 7.23415C54.4843 8.4089 55.1698 9.0452 55.9203 9.40415V9.50205C55.0883 9.79575 54.0928 10.6768 54.0928 12.1452C54.0928 13.9237 55.5613 15.1637 57.9923 15.1637C60.4233 15.1637 61.8428 13.9237 61.8428 12.1452C61.8428 10.6768 60.8638 9.81205 60.0318 9.50205ZM57.9923 5.87995C58.8083 5.87995 59.4118 6.40205 59.4118 7.2831C59.4118 8.16415 58.7918 8.6863 57.9923 8.6863C57.1928 8.6863 56.5238 8.16415 56.5238 7.2831C56.5238 6.38575 57.1603 5.87995 57.9923 5.87995ZM57.9923 13.5974C57.0458 13.5974 56.2793 12.9937 56.2793 11.9658C56.2793 11.0358 56.9153 10.3342 57.9758 10.3342C59.0203 10.3342 59.6568 11.0195 59.6568 11.9984C59.6568 12.9937 58.9223 13.5974 57.9923 13.5974Z'
+									fill='#101330'
+								/>
+								<path
+									d='M63.9639 15.0007H66.0524V10.5791C66.0524 9.12704 66.9334 8.49074 67.9289 8.49074C68.9079 8.49074 69.6744 9.14334 69.6744 10.4812V15.0007H71.7629V10.057C71.7629 7.91969 70.5229 6.67969 68.5814 6.67969C67.3579 6.67969 66.6724 7.16914 66.1829 7.80544H66.0524L65.8729 6.84284H63.9639V15.0007Z'
+									fill='#101330'
+								/>
+							</svg>
+						</a>
+					</div>
+				{{/if}}
+
+				{{#if redirectUrl}}
+					<a id='redirectUrl' href='{{redirectUrl}}' style='display: none;'></a>
+				{{/if}}
+				<input id="useResponseData" style="display: none;" value={{useResponseData}} />
+			</section>
+		</div>
+		<script>
+			function validateInput(input, errorElement) {
+				if (input.type === 'number' && input.value !== '') {
+					const value = input.value.trim();
+
+					if (value === '' || isNaN(value)) {
+						errorElement.textContent = 'Enter only numbers in this field';
+						errorElement.classList.add('error-show');
+						return false;
+					} else {
+						errorElement.classList.remove('error-show');
+						return true;
+					}
+				} else if (input.value === '') {
+					errorElement.classList.add('error-show');
+					return false;
+				} else {
+					errorElement.classList.remove('error-show');
+					return true;
+				}
+			}
+
+			function getSelectedValues(input) {
+				const selectedValues = [];
+				const checkboxes = input.querySelectorAll('.multiselect-checkbox');
+
+				checkboxes.forEach((checkbox, index) => {
+					if (checkbox.checked) {
+						const label = input.querySelectorAll('label')[index];
+						selectedValues.push(label.textContent.trim());
+					}
+				});
+
+				return selectedValues;
+			}
+
+			function validateMultiselect(input, errorElement) {
+				const selectedValues = getSelectedValues(input);
+
+				if (!selectedValues.length) {
+					errorElement.classList.add('error-show');
+					return false;
+				} else {
+					errorElement.classList.remove('error-show');
+					return true;
+				}
+			}
+
+			const form = document.querySelector('#n8n-form');
+
+			const requiredInputs = document.querySelectorAll('.form-required');
+
+			requiredInputs.forEach((input) => {
+				const errorSelector = `.error-${input.id}`;
+				const error = document.querySelector(errorSelector);
+
+				if (input.classList.contains('multiselect')) {
+					input.addEventListener('click', () => {
+						validateMultiselect(input, error);
+					});
+				} else {
+					input.addEventListener('blur', () => {
+						validateInput(input, error);
+					});
+					input.addEventListener('input', () => {
+						error.classList.remove('error-show');
+					});
+				}
+			});
+
+			form.addEventListener('submit', (e) => {
+				const valid = [];
+				e.preventDefault();
+
+				requiredInputs.forEach((input) => {
+					const errorSelector = `.error-${input.id}`;
+					const error = document.querySelector(errorSelector);
+
+					if (input.classList.contains('multiselect')) {
+						valid.push(validateMultiselect(input, error));
+					} else {
+						valid.push(validateInput(input, error));
+					}
+				});
+
+				if (valid.every((v) => v)) {
+					var formData = new FormData(form);
+
+					document.querySelectorAll('.multiselect').forEach((multiselect) => {
+						const selectedValues = getSelectedValues(multiselect);
+						formData.append(multiselect.id, JSON.stringify(selectedValues));
+					});
+
+					document.querySelector('#submit-btn').disabled = true;
+					document.querySelector('#submit-btn').style.cursor = 'not-allowed';
+					document.querySelector('#submit-btn span').style.display = 'inline-block';
+					fetch('', {
+						method: 'POST',
+						body: formData,
+					})
+						.then(async function (response) {
+							const useResponseData = document.getElementById("useResponseData").value;
+
+							if (useResponseData === "true") {
+								const text = await response.text();
+								let json;
+
+								try{
+									json = JSON.parse(text);
+								} catch (e) {}
+
+								if (json?.redirectURL) {
+									const url = json.redirectURL.includes("://") ? json.redirectURL : "https://" + json.redirectURL;
+									window.location.replace(url);
+								} else if (json?.formSubmittedText) {
+									form.style.display = 'none';
+									document.querySelector('#submitted-form').style.display = 'block';
+									document.querySelector('#submitted-content').textContent = json.formSubmittedText;
+								} else {
+									document.body.innerHTML = text;
+								}
+								return;
+							}
+
+							if (response.status === 200) {
+								const redirectUrl = document.getElementById("redirectUrl");
+								if (redirectUrl) {
+									window.location.replace(redirectUrl.href);
+								} else {
+									form.style.display = 'none';
+									document.querySelector('#submitted-form').style.display = 'block';
+								}
+							} else {
+								form.style.display = 'none';
+								document.querySelector('#submitted-form').style.display = 'block';
+								document.querySelector('#submitted-header').textContent = 'Problem submitting response';
+								document.querySelector('#submitted-content').textContent =
+									'An error occurred in the workflow handling this form';
+							}
+
+							return;
+						})
+						.catch(function (error) {
+							console.error('Error:', error);
+						});
+				}
+			});
+		</script>
+	</body>
+</html>
diff --git a/packages/cli/templates/oauth-callback.html b/packages/cli/templates/oauth-callback.handlebars
similarity index 100%
rename from packages/cli/templates/oauth-callback.html
rename to packages/cli/templates/oauth-callback.handlebars
diff --git a/packages/cli/templates/oauth-error-callback.handlebars b/packages/cli/templates/oauth-error-callback.handlebars
index 38af48fd825a9..5c718ff39858e 100644
--- a/packages/cli/templates/oauth-error-callback.handlebars
+++ b/packages/cli/templates/oauth-error-callback.handlebars
@@ -2,18 +2,22 @@
 	<head>
 		<title>n8n - OAuth Callback</title>
 		<style>
-			body { font-family: 'Open Sans', sans-serif; padding: 10px;}
-			pre.error { background: #f7f7f7; border: 1px solid #ddd; border-radius: 3px; padding: 10px; overflow: auto; overflow-wrap: break-word; white-space: pre-wrap; }
+			body { font-family: 'Open Sans', sans-serif; padding: 10px;} details.error { margin-bottom:
+			20px; } pre.reason { background: #f7f7f7; border: 1px solid #ddd; border-radius: 3px; padding:
+			10px; overflow: auto; overflow-wrap: break-word; white-space: pre-wrap;}
 		</style>
 	</head>
 	<body>
 		{{#if error}}
-			<h4>Error:</h4>
-			<pre class='error'>{{error.message}}</pre>
+			<h4>Error: {{error.message}}</h4>
+			<details class='error'>
+				<summary>More details</summary>
+				{{#if error.reason}}<pre class='reason'>{{error.reason}}</pre>{{/if}}
+			</details>
 		{{/if}}
-					Failed to connect. The window can be closed now.
+		Failed to connect. The window can be closed now.
 		<script>
-			(function messageParent() { window.opener.postMessage('error', '*'); })();
+			(function messageParent() { window.opener?.postMessage('error', '*'); })();
 		</script>
 	</body>
-</html>
+</html>
\ No newline at end of file
diff --git a/packages/cli/test/integration/ExternalSecrets/externalSecrets.api.test.ts b/packages/cli/test/integration/ExternalSecrets/externalSecrets.api.test.ts
new file mode 100644
index 0000000000000..868c695f4a38a
--- /dev/null
+++ b/packages/cli/test/integration/ExternalSecrets/externalSecrets.api.test.ts
@@ -0,0 +1,363 @@
+import type { SuperAgentTest } from 'supertest';
+import { License } from '@/License';
+import type { ExternalSecretsSettings, SecretsProviderState } from '@/Interfaces';
+import { Cipher } from 'n8n-core';
+import { SettingsRepository } from '@db/repositories/settings.repository';
+import { Container } from 'typedi';
+import { ExternalSecretsProviders } from '@/ExternalSecrets/ExternalSecretsProviders.ee';
+import config from '@/config';
+import { ExternalSecretsManager } from '@/ExternalSecrets/ExternalSecretsManager.ee';
+import { CREDENTIAL_BLANKING_VALUE } from '@/constants';
+import { jsonParse, type IDataObject } from 'n8n-workflow';
+import { mock } from 'jest-mock-extended';
+
+import { mockInstance } from '../../shared/mocking';
+import { setupTestServer } from '../shared/utils';
+import { createOwner, createUser } from '../shared/db/users';
+import {
+	DummyProvider,
+	FailedProvider,
+	MockProviders,
+	TestFailProvider,
+} from '../../shared/ExternalSecrets/utils';
+
+let authOwnerAgent: SuperAgentTest;
+let authMemberAgent: SuperAgentTest;
+
+const mockProvidersInstance = new MockProviders();
+mockInstance(ExternalSecretsProviders, mockProvidersInstance);
+
+const testServer = setupTestServer({
+	endpointGroups: ['externalSecrets'],
+	enabledFeatures: ['feat:externalSecrets'],
+});
+
+const connectedDate = '2023-08-01T12:32:29.000Z';
+
+async function setExternalSecretsSettings(settings: ExternalSecretsSettings) {
+	return await Container.get(SettingsRepository).saveEncryptedSecretsProviderSettings(
+		Container.get(Cipher).encrypt(settings),
+	);
+}
+
+async function getExternalSecretsSettings(): Promise<ExternalSecretsSettings | null> {
+	const encSettings = await Container.get(SettingsRepository).getEncryptedSecretsProviderSettings();
+	if (encSettings === null) {
+		return null;
+	}
+	return await jsonParse(Container.get(Cipher).decrypt(encSettings));
+}
+
+const resetManager = async () => {
+	Container.get(ExternalSecretsManager).shutdown();
+	Container.set(
+		ExternalSecretsManager,
+		new ExternalSecretsManager(
+			mock(),
+			Container.get(SettingsRepository),
+			Container.get(License),
+			mockProvidersInstance,
+			Container.get(Cipher),
+		),
+	);
+
+	await Container.get(ExternalSecretsManager).init();
+};
+
+const getDummyProviderData = ({
+	data,
+	includeProperties,
+	connected,
+	state,
+	connectedAt,
+	displayName,
+}: {
+	data?: IDataObject;
+	includeProperties?: boolean;
+	connected?: boolean;
+	state?: SecretsProviderState;
+	connectedAt?: string | null;
+	displayName?: string;
+} = {}) => {
+	const dummy: IDataObject = {
+		connected: connected ?? true,
+		connectedAt: connectedAt === undefined ? connectedDate : connectedAt,
+		data: data ?? {},
+		name: 'dummy',
+		displayName: displayName ?? 'Dummy Provider',
+		icon: 'dummy',
+		state: state ?? 'connected',
+	};
+
+	if (includeProperties) {
+		dummy.properties = new DummyProvider().properties;
+	}
+
+	return dummy;
+};
+
+beforeAll(async () => {
+	const owner = await createOwner();
+	authOwnerAgent = testServer.authAgentFor(owner);
+	const member = await createUser();
+	authMemberAgent = testServer.authAgentFor(member);
+	config.set('userManagement.isInstanceOwnerSetUp', true);
+});
+
+beforeEach(async () => {
+	mockProvidersInstance.setProviders({
+		dummy: DummyProvider,
+	});
+
+	await setExternalSecretsSettings({
+		dummy: {
+			connected: true,
+			connectedAt: new Date(connectedDate),
+			settings: {},
+		},
+	});
+
+	await resetManager();
+});
+
+afterEach(async () => {
+	Container.get(ExternalSecretsManager).shutdown();
+});
+
+describe('GET /external-secrets/providers', () => {
+	test('can retrieve providers as owner', async () => {
+		const resp = await authOwnerAgent.get('/external-secrets/providers');
+		expect(resp.body).toEqual({
+			data: [getDummyProviderData()],
+		});
+	});
+
+	test('can not retrieve providers as non-owner', async () => {
+		const resp = await authMemberAgent.get('/external-secrets/providers');
+		expect(resp.status).toBe(403);
+	});
+
+	test('does obscure passwords', async () => {
+		await setExternalSecretsSettings({
+			dummy: {
+				connected: true,
+				connectedAt: new Date(connectedDate),
+				settings: {
+					username: 'testuser',
+					password: 'testpass',
+				},
+			},
+		});
+
+		await resetManager();
+
+		const resp = await authOwnerAgent.get('/external-secrets/providers');
+		expect(resp.body).toEqual({
+			data: [
+				getDummyProviderData({
+					data: {
+						username: 'testuser',
+						password: CREDENTIAL_BLANKING_VALUE,
+					},
+				}),
+			],
+		});
+	});
+});
+
+describe('GET /external-secrets/providers/:provider', () => {
+	test('can retrieve provider as owner', async () => {
+		const resp = await authOwnerAgent.get('/external-secrets/providers/dummy');
+		expect(resp.body.data).toEqual(getDummyProviderData({ includeProperties: true }));
+	});
+
+	test('can not retrieve provider as non-owner', async () => {
+		const resp = await authMemberAgent.get('/external-secrets/providers/dummy');
+		expect(resp.status).toBe(403);
+	});
+
+	test('does obscure passwords', async () => {
+		await setExternalSecretsSettings({
+			dummy: {
+				connected: true,
+				connectedAt: new Date(connectedDate),
+				settings: {
+					username: 'testuser',
+					password: 'testpass',
+				},
+			},
+		});
+
+		await resetManager();
+
+		const resp = await authOwnerAgent.get('/external-secrets/providers/dummy');
+		expect(resp.body.data).toEqual(
+			getDummyProviderData({
+				data: {
+					username: 'testuser',
+					password: CREDENTIAL_BLANKING_VALUE,
+				},
+				includeProperties: true,
+			}),
+		);
+	});
+});
+
+describe('POST /external-secrets/providers/:provider', () => {
+	test('can update provider settings', async () => {
+		const testData = {
+			username: 'testuser',
+			other: 'testother',
+		};
+		const resp = await authOwnerAgent.post('/external-secrets/providers/dummy').send(testData);
+		expect(resp.status).toBe(200);
+
+		const confirmResp = await authOwnerAgent.get('/external-secrets/providers/dummy');
+		expect(confirmResp.body.data).toEqual(
+			getDummyProviderData({ data: testData, includeProperties: true }),
+		);
+	});
+
+	test('can update provider settings with blanking value', async () => {
+		await setExternalSecretsSettings({
+			dummy: {
+				connected: true,
+				connectedAt: new Date(connectedDate),
+				settings: {
+					username: 'testuser',
+					password: 'testpass',
+				},
+			},
+		});
+
+		await resetManager();
+
+		const testData = {
+			username: 'newuser',
+			password: CREDENTIAL_BLANKING_VALUE,
+		};
+		const resp = await authOwnerAgent.post('/external-secrets/providers/dummy').send(testData);
+		expect(resp.status).toBe(200);
+
+		const confirmResp = await authOwnerAgent.get('/external-secrets/providers/dummy');
+		expect((await getExternalSecretsSettings())?.dummy.settings).toEqual({
+			username: 'newuser',
+			password: 'testpass',
+		});
+	});
+});
+
+describe('POST /external-secrets/providers/:provider/connect', () => {
+	test('can change provider connected state', async () => {
+		const testData = {
+			connected: false,
+		};
+		const resp = await authOwnerAgent
+			.post('/external-secrets/providers/dummy/connect')
+			.send(testData);
+		expect(resp.status).toBe(200);
+
+		const confirmResp = await authOwnerAgent.get('/external-secrets/providers/dummy');
+		expect(confirmResp.body.data).toEqual(
+			getDummyProviderData({
+				includeProperties: true,
+				connected: false,
+				state: 'initializing',
+			}),
+		);
+	});
+});
+
+describe('POST /external-secrets/providers/:provider/test', () => {
+	test('can test provider', async () => {
+		const testData = {
+			username: 'testuser',
+			other: 'testother',
+		};
+		const resp = await authOwnerAgent.post('/external-secrets/providers/dummy/test').send(testData);
+		expect(resp.status).toBe(200);
+		expect(resp.body.data.success).toBe(true);
+		expect(resp.body.data.testState).toBe('connected');
+	});
+
+	test('can test provider fail', async () => {
+		mockProvidersInstance.setProviders({
+			dummy: TestFailProvider,
+		});
+
+		await resetManager();
+
+		const testData = {
+			username: 'testuser',
+			other: 'testother',
+		};
+		const resp = await authOwnerAgent.post('/external-secrets/providers/dummy/test').send(testData);
+		expect(resp.status).toBe(400);
+		expect(resp.body.data.success).toBe(false);
+		expect(resp.body.data.testState).toBe('error');
+	});
+});
+
+describe('POST /external-secrets/providers/:provider/update', () => {
+	test('can update provider', async () => {
+		const updateSpy = jest.spyOn(
+			Container.get(ExternalSecretsManager).getProvider('dummy')!,
+			'update',
+		);
+
+		const resp = await authOwnerAgent.post('/external-secrets/providers/dummy/update');
+		expect(resp.status).toBe(200);
+		expect(resp.body.data).toEqual({ updated: true });
+		expect(updateSpy).toBeCalled();
+	});
+
+	test('can not update errored provider', async () => {
+		mockProvidersInstance.setProviders({
+			dummy: FailedProvider,
+		});
+
+		await resetManager();
+
+		const updateSpy = jest.spyOn(
+			Container.get(ExternalSecretsManager).getProvider('dummy')!,
+			'update',
+		);
+
+		const resp = await authOwnerAgent.post('/external-secrets/providers/dummy/update');
+		expect(resp.status).toBe(400);
+		expect(resp.body.data).toEqual({ updated: false });
+		expect(updateSpy).not.toBeCalled();
+	});
+
+	test('can not update provider without a valid license', async () => {
+		const updateSpy = jest.spyOn(
+			Container.get(ExternalSecretsManager).getProvider('dummy')!,
+			'update',
+		);
+
+		testServer.license.disable('feat:externalSecrets');
+
+		const resp = await authOwnerAgent.post('/external-secrets/providers/dummy/update');
+		expect(resp.status).toBe(400);
+		expect(resp.body.data).toEqual({ updated: false });
+		expect(updateSpy).not.toBeCalled();
+	});
+});
+
+describe('GET /external-secrets/secrets', () => {
+	test('can get secret names as owner', async () => {
+		const resp = await authOwnerAgent.get('/external-secrets/secrets');
+		expect(resp.status).toBe(200);
+		expect(resp.body.data).toEqual({
+			dummy: ['test1', 'test2'],
+		});
+	});
+
+	test('can not get secret names as non-owner', async () => {
+		const resp = await authMemberAgent.get('/external-secrets/secrets');
+		expect(resp.status).toBe(403);
+		expect(resp.body.data).not.toEqual({
+			dummy: ['test1', 'test2'],
+		});
+	});
+});
diff --git a/packages/cli/test/integration/PermissionChecker.test.ts b/packages/cli/test/integration/PermissionChecker.test.ts
new file mode 100644
index 0000000000000..f80fbc02ddfd1
--- /dev/null
+++ b/packages/cli/test/integration/PermissionChecker.test.ts
@@ -0,0 +1,498 @@
+import { v4 as uuid } from 'uuid';
+import { Container } from 'typedi';
+import type { INode, WorkflowSettings } from 'n8n-workflow';
+import { SubworkflowOperationError, Workflow } from 'n8n-workflow';
+
+import config from '@/config';
+import { User } from '@db/entities/User';
+import { WorkflowRepository } from '@db/repositories/workflow.repository';
+import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
+import { UserRepository } from '@/databases/repositories/user.repository';
+import { generateNanoId } from '@/databases/utils/generators';
+import { License } from '@/License';
+import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
+import { NodeTypes } from '@/NodeTypes';
+import { OwnershipService } from '@/services/ownership.service';
+import { PermissionChecker } from '@/UserManagement/PermissionChecker';
+
+import { mockInstance } from '../shared/mocking';
+import {
+	randomCredentialPayload as randomCred,
+	randomName,
+	randomPositiveDigit,
+} from '../integration/shared/random';
+import { LicenseMocker } from '../integration/shared/license';
+import * as testDb from '../integration/shared/testDb';
+import type { SaveCredentialFunction } from '../integration/shared/types';
+import { mockNodeTypesData } from '../unit/Helpers';
+import { affixRoleToSaveCredential } from '../integration/shared/db/credentials';
+import { createOwner, createUser } from '../integration/shared/db/users';
+import { SharedCredentialsRepository } from '@/databases/repositories/sharedCredentials.repository';
+import type { WorkflowEntity } from '@/databases/entities/WorkflowEntity';
+
+export const toTargetCallErrorMsg = (subworkflowId: string) =>
+	`Target workflow ID ${subworkflowId} may not be called`;
+
+export function createParentWorkflow() {
+	return Container.get(WorkflowRepository).create({
+		id: generateNanoId(),
+		name: randomName(),
+		active: false,
+		connections: {},
+		nodes: [
+			{
+				name: '',
+				typeVersion: 1,
+				type: 'n8n-nodes-base.executeWorkflow',
+				position: [0, 0],
+				parameters: {},
+			},
+		],
+	});
+}
+
+export function createSubworkflow({
+	policy,
+	callerIds,
+}: {
+	policy?: WorkflowSettings.CallerPolicy;
+	callerIds?: string;
+} = {}) {
+	return new Workflow({
+		id: uuid(),
+		nodes: [],
+		connections: {},
+		active: false,
+		nodeTypes: mockNodeTypes,
+		settings: {
+			...(policy ? { callerPolicy: policy } : {}),
+			...(callerIds ? { callerIds } : {}),
+		},
+	});
+}
+
+const createWorkflow = async (nodes: INode[], workflowOwner?: User): Promise<WorkflowEntity> => {
+	const workflowDetails = {
+		id: uuid(),
+		name: 'test',
+		active: false,
+		connections: {},
+		nodeTypes: mockNodeTypes,
+		nodes,
+	};
+
+	const workflowEntity = await Container.get(WorkflowRepository).save(workflowDetails);
+
+	if (workflowOwner) {
+		await Container.get(SharedWorkflowRepository).save({
+			workflow: workflowEntity,
+			user: workflowOwner,
+			role: 'workflow:owner',
+		});
+	}
+
+	return workflowEntity;
+};
+
+let saveCredential: SaveCredentialFunction;
+
+let owner: User;
+let member: User;
+
+const mockNodeTypes = mockInstance(NodeTypes);
+mockInstance(LoadNodesAndCredentials, {
+	loadedNodes: mockNodeTypesData(['start', 'actionNetwork']),
+});
+
+let permissionChecker: PermissionChecker;
+
+let license: LicenseMocker;
+
+beforeAll(async () => {
+	await testDb.init();
+
+	saveCredential = affixRoleToSaveCredential('credential:owner');
+
+	permissionChecker = Container.get(PermissionChecker);
+
+	[owner, member] = await Promise.all([createOwner(), createUser()]);
+
+	license = new LicenseMocker();
+	license.mock(Container.get(License));
+	license.setDefaults({
+		features: ['feat:sharing'],
+	});
+});
+
+beforeEach(() => {
+	license.reset();
+});
+
+describe('check()', () => {
+	beforeEach(async () => {
+		await testDb.truncate(['Workflow', 'Credentials']);
+	});
+
+	afterAll(async () => {
+		await testDb.terminate();
+	});
+
+	test('should allow if workflow has no creds', async () => {
+		const nodes: INode[] = [
+			{
+				id: uuid(),
+				name: 'Start',
+				type: 'n8n-nodes-base.start',
+				typeVersion: 1,
+				parameters: {},
+				position: [0, 0],
+			},
+		];
+
+		const workflow = await createWorkflow(nodes, member);
+
+		await expect(
+			permissionChecker.check(workflow.id, member.id, workflow.nodes),
+		).resolves.not.toThrow();
+	});
+
+	test('should allow if requesting user is instance owner', async () => {
+		const owner = await createOwner();
+		const nodes: INode[] = [
+			{
+				id: uuid(),
+				name: 'Action Network',
+				type: 'n8n-nodes-base.actionNetwork',
+				parameters: {},
+				typeVersion: 1,
+				position: [0, 0],
+				credentials: {
+					actionNetworkApi: {
+						id: randomPositiveDigit().toString(),
+						name: 'Action Network Account',
+					},
+				},
+			},
+		];
+
+		const workflow = await createWorkflow(nodes);
+
+		await expect(
+			permissionChecker.check(workflow.id, owner.id, workflow.nodes),
+		).resolves.not.toThrow();
+	});
+
+	test('should allow if workflow creds are valid subset (shared credential)', async () => {
+		const ownerCred = await saveCredential(randomCred(), { user: owner });
+		const memberCred = await saveCredential(randomCred(), { user: member });
+
+		await Container.get(SharedCredentialsRepository).save(
+			Container.get(SharedCredentialsRepository).create({
+				credentialsId: ownerCred.id,
+				userId: member.id,
+				role: 'credential:user',
+			}),
+		);
+
+		const nodes: INode[] = [
+			{
+				id: uuid(),
+				name: 'Action Network',
+				type: 'n8n-nodes-base.actionNetwork',
+				parameters: {},
+				typeVersion: 1,
+				position: [0, 0],
+				credentials: {
+					actionNetworkApi: {
+						id: ownerCred.id,
+						name: ownerCred.name,
+					},
+				},
+			},
+			{
+				id: uuid(),
+				name: 'Action Network 2',
+				type: 'n8n-nodes-base.actionNetwork',
+				parameters: {},
+				typeVersion: 1,
+				position: [0, 0],
+				credentials: {
+					actionNetworkApi: {
+						id: memberCred.id,
+						name: memberCred.name,
+					},
+				},
+			},
+		];
+
+		const workflow = await createWorkflow(nodes, member);
+
+		await expect(
+			permissionChecker.check(workflow.id, member.id, workflow.nodes),
+		).resolves.not.toThrow();
+	});
+
+	test('should allow if workflow creds are valid subset (shared workflow)', async () => {
+		const ownerCred = await saveCredential(randomCred(), { user: owner });
+		const memberCred = await saveCredential(randomCred(), { user: member });
+
+		const nodes: INode[] = [
+			{
+				id: uuid(),
+				name: 'Action Network',
+				type: 'n8n-nodes-base.actionNetwork',
+				parameters: {},
+				typeVersion: 1,
+				position: [0, 0],
+				credentials: {
+					actionNetworkApi: {
+						id: ownerCred.id,
+						name: ownerCred.name,
+					},
+				},
+			},
+			{
+				id: uuid(),
+				name: 'Action Network 2',
+				type: 'n8n-nodes-base.actionNetwork',
+				parameters: {},
+				typeVersion: 1,
+				position: [0, 0],
+				credentials: {
+					actionNetworkApi: {
+						id: memberCred.id,
+						name: memberCred.name,
+					},
+				},
+			},
+		];
+
+		const workflow = await createWorkflow(nodes, member);
+		await Container.get(SharedWorkflowRepository).save(
+			Container.get(SharedWorkflowRepository).create({
+				workflowId: workflow.id,
+				userId: owner.id,
+				role: 'workflow:editor',
+			}),
+		);
+
+		await expect(
+			permissionChecker.check(workflow.id, member.id, workflow.nodes),
+		).resolves.not.toThrow();
+	});
+
+	test('should deny if workflow creds are valid subset but sharing is disabled', async () => {
+		const [owner, member] = await Promise.all([createOwner(), createUser()]);
+
+		const ownerCred = await saveCredential(randomCred(), { user: owner });
+		const memberCred = await saveCredential(randomCred(), { user: member });
+
+		await Container.get(SharedCredentialsRepository).save(
+			Container.get(SharedCredentialsRepository).create({
+				credentialsId: ownerCred.id,
+				userId: member.id,
+				role: 'credential:user',
+			}),
+		);
+
+		const nodes: INode[] = [
+			{
+				id: uuid(),
+				name: 'Action Network',
+				type: 'n8n-nodes-base.actionNetwork',
+				parameters: {},
+				typeVersion: 1,
+				position: [0, 0],
+				credentials: {
+					actionNetworkApi: {
+						id: ownerCred.id,
+						name: ownerCred.name,
+					},
+				},
+			},
+			{
+				id: uuid(),
+				name: 'Action Network 2',
+				type: 'n8n-nodes-base.actionNetwork',
+				parameters: {},
+				typeVersion: 1,
+				position: [0, 0],
+				credentials: {
+					actionNetworkApi: {
+						id: memberCred.id,
+						name: memberCred.name,
+					},
+				},
+			},
+		];
+
+		const workflow = await createWorkflow(nodes, member);
+
+		license.disable('feat:sharing');
+		await expect(permissionChecker.check(workflow.id, member.id, nodes)).rejects.toThrow();
+	});
+
+	test('should deny if workflow creds are not valid subset', async () => {
+		const member = await createUser();
+
+		const memberCred = await saveCredential(randomCred(), { user: member });
+
+		const nodes: INode[] = [
+			{
+				id: uuid(),
+				name: 'Action Network',
+				type: 'n8n-nodes-base.actionNetwork',
+				parameters: {},
+				typeVersion: 1,
+				position: [0, 0] as [number, number],
+				credentials: {
+					actionNetworkApi: {
+						id: memberCred.id,
+						name: memberCred.name,
+					},
+				},
+			},
+			{
+				id: uuid(),
+				name: 'Action Network 2',
+				type: 'n8n-nodes-base.actionNetwork',
+				parameters: {},
+				typeVersion: 1,
+				position: [0, 0] as [number, number],
+				credentials: {
+					actionNetworkApi: {
+						id: 'non-existing-credential-id',
+						name: 'Non-existing credential name',
+					},
+				},
+			},
+		];
+
+		const workflow = await createWorkflow(nodes, member);
+
+		await expect(permissionChecker.check(workflow.id, member.id, workflow.nodes)).rejects.toThrow();
+	});
+});
+
+describe('checkSubworkflowExecutePolicy()', () => {
+	const ownershipService = mockInstance(OwnershipService);
+
+	describe('no caller policy', () => {
+		test('should fall back to N8N_WORKFLOW_CALLER_POLICY_DEFAULT_OPTION', async () => {
+			config.set('workflows.callerPolicyDefaultOption', 'none');
+
+			const parentWorkflow = createParentWorkflow();
+			const subworkflow = createSubworkflow(); // no caller policy
+
+			ownershipService.getWorkflowOwnerCached.mockResolvedValue(new User());
+
+			const check = permissionChecker.checkSubworkflowExecutePolicy(subworkflow, parentWorkflow.id);
+
+			await expect(check).rejects.toThrow(toTargetCallErrorMsg(subworkflow.id));
+
+			config.load(config.default);
+		});
+	});
+
+	describe('overridden caller policy', () => {
+		test('if no sharing, should override policy to workflows-from-same-owner', async () => {
+			license.disable('feat:sharing');
+
+			const parentWorkflow = createParentWorkflow();
+			const subworkflow = createSubworkflow({ policy: 'any' }); // should be overridden
+
+			const firstUser = Container.get(UserRepository).create({ id: uuid() });
+			const secondUser = Container.get(UserRepository).create({ id: uuid() });
+
+			ownershipService.getWorkflowOwnerCached.mockResolvedValueOnce(firstUser); // parent workflow
+			ownershipService.getWorkflowOwnerCached.mockResolvedValueOnce(secondUser); // subworkflow
+
+			const check = permissionChecker.checkSubworkflowExecutePolicy(subworkflow, parentWorkflow.id);
+
+			await expect(check).rejects.toThrow(toTargetCallErrorMsg(subworkflow.id));
+
+			try {
+				await permissionChecker.checkSubworkflowExecutePolicy(subworkflow, uuid());
+			} catch (error) {
+				if (error instanceof SubworkflowOperationError) {
+					expect(error.description).toBe(
+						`${firstUser.firstName} (${firstUser.email}) can make this change. You may need to tell them the ID of this workflow, which is ${subworkflow.id}`,
+					);
+				}
+			}
+
+			license.enable('feat:sharing');
+		});
+	});
+
+	describe('workflows-from-list caller policy', () => {
+		test('should allow if caller list contains parent workflow ID', async () => {
+			const parentWorkflow = createParentWorkflow();
+
+			const subworkflow = createSubworkflow({
+				policy: 'workflowsFromAList',
+				callerIds: `123,456,bcdef,  ${parentWorkflow.id}`,
+			});
+
+			const check = permissionChecker.checkSubworkflowExecutePolicy(subworkflow, parentWorkflow.id);
+
+			await expect(check).resolves.not.toThrow();
+		});
+
+		test('should deny if caller list does not contain parent workflow ID', async () => {
+			const parentWorkflow = createParentWorkflow();
+
+			const subworkflow = createSubworkflow({
+				policy: 'workflowsFromAList',
+				callerIds: 'xyz',
+			});
+
+			const check = permissionChecker.checkSubworkflowExecutePolicy(subworkflow, parentWorkflow.id);
+
+			await expect(check).rejects.toThrow();
+		});
+	});
+
+	describe('any caller policy', () => {
+		test('should not throw', async () => {
+			const parentWorkflow = createParentWorkflow();
+			const subworkflow = createSubworkflow({ policy: 'any' });
+			ownershipService.getWorkflowOwnerCached.mockResolvedValue(new User());
+
+			const check = permissionChecker.checkSubworkflowExecutePolicy(subworkflow, parentWorkflow.id);
+
+			await expect(check).resolves.not.toThrow();
+		});
+	});
+
+	describe('workflows-from-same-owner caller policy', () => {
+		test('should deny if the two workflows are owned by different users', async () => {
+			const parentWorkflowOwner = Container.get(UserRepository).create({ id: uuid() });
+			const subworkflowOwner = Container.get(UserRepository).create({ id: uuid() });
+
+			ownershipService.getWorkflowOwnerCached.mockResolvedValueOnce(parentWorkflowOwner); // parent workflow
+			ownershipService.getWorkflowOwnerCached.mockResolvedValueOnce(subworkflowOwner); // subworkflow
+
+			const subworkflow = createSubworkflow({ policy: 'workflowsFromSameOwner' });
+
+			const check = permissionChecker.checkSubworkflowExecutePolicy(subworkflow, uuid());
+
+			await expect(check).rejects.toThrow(toTargetCallErrorMsg(subworkflow.id));
+		});
+
+		test('should allow if both workflows are owned by the same user', async () => {
+			const parentWorkflow = createParentWorkflow();
+
+			const bothWorkflowsOwner = Container.get(UserRepository).create({ id: uuid() });
+
+			ownershipService.getWorkflowOwnerCached.mockResolvedValueOnce(bothWorkflowsOwner); // parent workflow
+			ownershipService.getWorkflowOwnerCached.mockResolvedValueOnce(bothWorkflowsOwner); // subworkflow
+
+			const subworkflow = createSubworkflow({ policy: 'workflowsFromSameOwner' });
+
+			const check = permissionChecker.checkSubworkflowExecutePolicy(subworkflow, parentWorkflow.id);
+
+			await expect(check).resolves.not.toThrow();
+		});
+	});
+});
diff --git a/packages/cli/test/integration/activation-errors.service.test.ts b/packages/cli/test/integration/activation-errors.service.test.ts
new file mode 100644
index 0000000000000..7635660db3aca
--- /dev/null
+++ b/packages/cli/test/integration/activation-errors.service.test.ts
@@ -0,0 +1,87 @@
+import { ActivationErrorsService } from '@/ActivationErrors.service';
+import { CacheService } from '@/services/cache/cache.service';
+
+describe('ActivationErrorsService', () => {
+	const cacheService = new CacheService();
+	const activationErrorsService = new ActivationErrorsService(cacheService);
+
+	const firstWorkflowId = 'GSG0etbfTA2CNPDX';
+	const secondWorkflowId = 'k2ORscMPO66K0Jk3';
+
+	const firstErrorMsg = 'Failed to activate';
+	const secondErrorMsg = 'Also failed to activate';
+
+	afterEach(async () => {
+		await activationErrorsService.clearAll();
+	});
+
+	describe('register', () => {
+		test('should register an activation error for a workflow', async () => {
+			await activationErrorsService.register(firstWorkflowId, firstErrorMsg);
+
+			const activationError = await activationErrorsService.get(firstWorkflowId);
+
+			expect(activationError).toBe(firstErrorMsg);
+		});
+	});
+
+	describe('deregister', () => {
+		test('should deregister an activation error for a workflow', async () => {
+			await activationErrorsService.register(firstWorkflowId, firstErrorMsg);
+
+			await activationErrorsService.deregister(firstWorkflowId);
+
+			const activationError = await activationErrorsService.get(firstWorkflowId);
+
+			expect(activationError).toBeNull();
+		});
+	});
+
+	describe('get', () => {
+		test('should retrieve an activation error for a workflow', async () => {
+			await activationErrorsService.register(firstWorkflowId, firstErrorMsg);
+
+			const activationError = await activationErrorsService.get(firstWorkflowId);
+
+			expect(activationError).toBe(firstErrorMsg);
+		});
+
+		test('should return `null` if no activation error found for a workflow', async () => {
+			const activationError = await activationErrorsService.get(firstWorkflowId);
+
+			expect(activationError).toBeNull();
+		});
+	});
+
+	describe('getAll', () => {
+		test('should retrieve all activation errors', async () => {
+			await activationErrorsService.register(firstWorkflowId, firstErrorMsg);
+			await activationErrorsService.register(secondWorkflowId, secondErrorMsg);
+
+			const allActivationErrors = await activationErrorsService.getAll();
+
+			expect(allActivationErrors).toEqual({
+				[firstWorkflowId]: firstErrorMsg,
+				[secondWorkflowId]: secondErrorMsg,
+			});
+		});
+
+		test('should return an empty object if no activation errors', async () => {
+			const allActivationErrors = await activationErrorsService.getAll();
+
+			expect(allActivationErrors).toEqual({});
+		});
+	});
+
+	describe('clearAll()', () => {
+		test('should clear activation errors', async () => {
+			await activationErrorsService.register(firstWorkflowId, firstErrorMsg);
+			await activationErrorsService.register(secondWorkflowId, secondErrorMsg);
+
+			await activationErrorsService.clearAll();
+
+			const allActivationErrors = await activationErrorsService.getAll();
+			expect(allActivationErrors).toEqual({});
+		});
+	});
+});
diff --git a/packages/cli/test/integration/active-workflow-manager.test.ts b/packages/cli/test/integration/active-workflow-manager.test.ts
new file mode 100644
index 0000000000000..03ce58e7ef6bc
--- /dev/null
+++ b/packages/cli/test/integration/active-workflow-manager.test.ts
@@ -0,0 +1,280 @@
+import { Container } from 'typedi';
+import { mock } from 'jest-mock-extended';
+import { NodeApiError, NodeOperationError, Workflow } from 'n8n-workflow';
+import type { IWebhookData, WorkflowActivateMode } from 'n8n-workflow';
+
+import { ActiveExecutions } from '@/ActiveExecutions';
+import { ActiveWorkflowManager } from '@/ActiveWorkflowManager';
+import { ExternalHooks } from '@/ExternalHooks';
+import { Push } from '@/push';
+import { SecretsHelper } from '@/SecretsHelpers';
+import { WebhookService } from '@/services/webhook.service';
+import * as WebhookHelpers from '@/WebhookHelpers';
+import * as AdditionalData from '@/WorkflowExecuteAdditionalData';
+import type { WebhookEntity } from '@db/entities/WebhookEntity';
+import { NodeTypes } from '@/NodeTypes';
+import { ExecutionService } from '@/executions/execution.service';
+import { WorkflowService } from '@/workflows/workflow.service';
+
+import { mockInstance } from '../shared/mocking';
+import * as testDb from './shared/testDb';
+import { createOwner } from './shared/db/users';
+import { createWorkflow } from './shared/db/workflows';
+import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
+import type { WorkflowEntity } from '@/databases/entities/WorkflowEntity';
+
+mockInstance(ActiveExecutions);
+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);
+
+let activeWorkflowManager: ActiveWorkflowManager;
+
+let createActiveWorkflow: () => Promise<WorkflowEntity>;
+let createInactiveWorkflow: () => Promise<WorkflowEntity>;
+
+beforeAll(async () => {
+	await testDb.init();
+
+	activeWorkflowManager = Container.get(ActiveWorkflowManager);
+
+	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();
+});
+
+afterAll(async () => {
+	await testDb.terminate();
+});
+
+describe('init()', () => {
+	it('should load workflows into memory', async () => {
+		await activeWorkflowManager.init();
+
+		expect(activeWorkflowManager.allActiveInMemory()).toHaveLength(0);
+
+		await createActiveWorkflow();
+		await activeWorkflowManager.init();
+
+		expect(activeWorkflowManager.allActiveInMemory()).toHaveLength(1);
+	});
+
+	it('should call external hook', async () => {
+		await activeWorkflowManager.init();
+
+		const [hook, arg] = externalHooks.run.mock.calls[0];
+
+		expect(hook).toBe('activeWorkflows.initialized');
+		expect(arg).toBeEmptyArray();
+	});
+
+	it('should check that workflow can be activated', async () => {
+		await Promise.all([createActiveWorkflow(), createActiveWorkflow()]);
+
+		const checkSpy = jest
+			.spyOn(Workflow.prototype, 'checkIfWorkflowCanBeActivated')
+			.mockReturnValue(true);
+
+		await activeWorkflowManager.init();
+
+		expect(checkSpy).toHaveBeenCalledTimes(2);
+	});
+});
+
+describe('isActive()', () => {
+	it('should return `true` for active workflow in storage', async () => {
+		const dbWorkflow = await createActiveWorkflow();
+
+		await activeWorkflowManager.init();
+
+		await expect(activeWorkflowManager.isActive(dbWorkflow.id)).resolves.toBe(true);
+	});
+
+	it('should return `false` for inactive workflow in storage', async () => {
+		const dbWorkflow = await createInactiveWorkflow();
+
+		await activeWorkflowManager.init();
+
+		await expect(activeWorkflowManager.isActive(dbWorkflow.id)).resolves.toBe(false);
+	});
+});
+
+describe('add()', () => {
+	describe('in single-main mode', () => {
+		test.each(['activate', 'update'])(
+			"should add webhooks, triggers and pollers for workflow in '%s' activation mode",
+			async (mode: WorkflowActivateMode) => {
+				await activeWorkflowManager.init();
+
+				const dbWorkflow = await createActiveWorkflow();
+				const addWebhooksSpy = jest.spyOn(activeWorkflowManager, 'addWebhooks');
+				const addTriggersAndPollersSpy = jest.spyOn(activeWorkflowManager, 'addTriggersAndPollers');
+
+				await activeWorkflowManager.add(dbWorkflow.id, mode);
+
+				const [argWorkflow] = addWebhooksSpy.mock.calls[0];
+				const [_, _argWorkflow] = addTriggersAndPollersSpy.mock.calls[0];
+
+				expect(addWebhooksSpy).toHaveBeenCalledTimes(1);
+				expect(addTriggersAndPollersSpy).toHaveBeenCalledTimes(1);
+
+				if (!(argWorkflow instanceof Workflow)) fail();
+				if (!(_argWorkflow instanceof Workflow)) fail();
+
+				expect(argWorkflow.id).toBe(dbWorkflow.id);
+				expect(_argWorkflow.id).toBe(dbWorkflow.id);
+			},
+		);
+	});
+});
+
+describe('removeAll()', () => {
+	it('should remove all active workflows from memory', async () => {
+		await createActiveWorkflow();
+		await createActiveWorkflow();
+
+		await activeWorkflowManager.init();
+		await activeWorkflowManager.removeAll();
+
+		expect(activeWorkflowManager.allActiveInMemory()).toHaveLength(0);
+	});
+});
+
+describe('remove()', () => {
+	describe('in single-main mode', () => {
+		it('should remove all webhooks of a workflow from database', async () => {
+			const dbWorkflow = await createActiveWorkflow();
+
+			await activeWorkflowManager.init();
+			await activeWorkflowManager.remove(dbWorkflow.id);
+
+			expect(webhookService.deleteWorkflowWebhooks).toHaveBeenCalledTimes(1);
+		});
+
+		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' })]);
+
+			await activeWorkflowManager.init();
+			await activeWorkflowManager.remove(dbWorkflow.id);
+
+			expect(deleteWebhookSpy).toHaveBeenCalledTimes(1);
+		});
+
+		it('should stop running triggers and pollers', async () => {
+			const dbWorkflow = await createActiveWorkflow();
+			const removeTriggersAndPollersSpy = jest.spyOn(
+				activeWorkflowManager,
+				'removeWorkflowTriggersAndPollers',
+			);
+
+			await activeWorkflowManager.init();
+			await activeWorkflowManager.remove(dbWorkflow.id);
+
+			expect(removeTriggersAndPollersSpy).toHaveBeenCalledTimes(1);
+		});
+	});
+});
+
+describe('executeErrorWorkflow()', () => {
+	it('should delegate to `WorkflowExecuteAdditionalData`', async () => {
+		const dbWorkflow = await createActiveWorkflow();
+		const [node] = dbWorkflow.nodes;
+
+		const executeSpy = jest.spyOn(AdditionalData, 'executeErrorWorkflow');
+
+		await activeWorkflowManager.init();
+
+		activeWorkflowManager.executeErrorWorkflow(
+			new NodeOperationError(node, 'Something went wrong'),
+			dbWorkflow,
+			'trigger',
+		);
+
+		expect(executeSpy).toHaveBeenCalledTimes(1);
+	});
+
+	it('should be called on failure to activate due to 401', async () => {
+		const dbWorkflow = await createActiveWorkflow();
+		const [node] = dbWorkflow.nodes;
+		const executeSpy = jest.spyOn(activeWorkflowManager, 'executeErrorWorkflow');
+
+		jest.spyOn(activeWorkflowManager, 'add').mockImplementation(() => {
+			throw new NodeApiError(node, {
+				httpCode: '401',
+				message: 'Authorization failed - please check your credentials',
+			});
+		});
+
+		await activeWorkflowManager.init();
+
+		expect(executeSpy).toHaveBeenCalledTimes(1);
+		const [error, _dbWorkflow] = executeSpy.mock.calls[0];
+		expect(error.message).toContain('Authorization');
+		expect(_dbWorkflow.id).toBe(dbWorkflow.id);
+	});
+});
+
+describe('addWebhooks()', () => {
+	it('should call `WebhookService.storeWebhook()`', async () => {
+		const webhook = mock<IWebhookData>({ path: 'some-path' });
+		const webhookEntity = mock<WebhookEntity>({ webhookPath: 'some-path' });
+
+		jest.spyOn(WebhookHelpers, 'getWorkflowWebhooks').mockReturnValue([webhook]);
+
+		webhookService.createWebhook.mockReturnValue(webhookEntity);
+
+		const additionalData = await AdditionalData.getBase('some-user-id');
+
+		const dbWorkflow = await createActiveWorkflow();
+
+		const workflow = new Workflow({
+			id: dbWorkflow.id,
+			name: dbWorkflow.name,
+			nodes: dbWorkflow.nodes,
+			connections: dbWorkflow.connections,
+			active: dbWorkflow.active,
+			nodeTypes: Container.get(NodeTypes),
+			staticData: dbWorkflow.staticData,
+			settings: dbWorkflow.settings,
+		});
+
+		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);
+
+		await activeWorkflowManager.addWebhooks(workflow, additionalData, 'trigger', 'init');
+
+		expect(webhookService.storeWebhook).toHaveBeenCalledTimes(1);
+	});
+});
diff --git a/packages/cli/test/integration/audit/credentials.risk.test.ts b/packages/cli/test/integration/audit/credentials.risk.test.ts
deleted file mode 100644
index 47e0cf1eee2bb..0000000000000
--- a/packages/cli/test/integration/audit/credentials.risk.test.ts
+++ /dev/null
@@ -1,222 +0,0 @@
-import { v4 as uuid } from 'uuid';
-import * as Db from '@/Db';
-import config from '@/config';
-import { audit } from '@/audit';
-import { CREDENTIALS_REPORT } from '@/audit/constants';
-import { getRiskSection } from './utils';
-import * as testDb from '../shared/testDb';
-
-beforeAll(async () => {
-	await testDb.init();
-});
-
-beforeEach(async () => {
-	await testDb.truncate(['Workflow', 'Credentials', 'Execution']);
-});
-
-afterAll(async () => {
-	await testDb.terminate();
-});
-
-test('should report credentials not in any use', async () => {
-	const credentialDetails = {
-		name: 'My Slack Credential',
-		data: 'U2FsdGVkX18WjITBG4IDqrGB1xE/uzVNjtwDAG3lP7E=',
-		type: 'slackApi',
-		nodesAccess: [{ nodeType: 'n8n-nodes-base.slack', date: '2022-12-21T11:23:00.561Z' }],
-	};
-
-	const workflowDetails = {
-		name: 'My Test Workflow',
-		active: false,
-		connections: {},
-		nodeTypes: {},
-		nodes: [
-			{
-				id: uuid(),
-				name: 'My Node',
-				type: 'n8n-nodes-base.slack',
-				typeVersion: 1,
-				position: [0, 0] as [number, number],
-			},
-		],
-	};
-
-	await Promise.all([
-		Db.collections.Credentials.save(credentialDetails),
-		Db.collections.Workflow.save(workflowDetails),
-	]);
-
-	const testAudit = await audit(['credentials']);
-
-	const section = getRiskSection(
-		testAudit,
-		CREDENTIALS_REPORT.RISK,
-		CREDENTIALS_REPORT.SECTIONS.CREDS_NOT_IN_ANY_USE,
-	);
-
-	expect(section.location).toHaveLength(1);
-	expect(section.location[0]).toMatchObject({
-		id: '1',
-		name: 'My Slack Credential',
-	});
-});
-
-test('should report credentials not in active use', async () => {
-	const credentialDetails = {
-		name: 'My Slack Credential',
-		data: 'U2FsdGVkX18WjITBG4IDqrGB1xE/uzVNjtwDAG3lP7E=',
-		type: 'slackApi',
-		nodesAccess: [{ nodeType: 'n8n-nodes-base.slack', date: '2022-12-21T11:23:00.561Z' }],
-	};
-
-	const credential = await Db.collections.Credentials.save(credentialDetails);
-
-	const workflowDetails = {
-		name: 'My Test Workflow',
-		active: false,
-		connections: {},
-		nodeTypes: {},
-		nodes: [
-			{
-				id: uuid(),
-				name: 'My Node',
-				type: 'n8n-nodes-base.slack',
-				typeVersion: 1,
-				position: [0, 0] as [number, number],
-			},
-		],
-	};
-
-	await Db.collections.Workflow.save(workflowDetails);
-
-	const testAudit = await audit(['credentials']);
-
-	const section = getRiskSection(
-		testAudit,
-		CREDENTIALS_REPORT.RISK,
-		CREDENTIALS_REPORT.SECTIONS.CREDS_NOT_IN_ACTIVE_USE,
-	);
-
-	expect(section.location).toHaveLength(1);
-	expect(section.location[0]).toMatchObject({
-		id: credential.id,
-		name: 'My Slack Credential',
-	});
-});
-
-test('should report credential in not recently executed workflow', async () => {
-	const credentialDetails = {
-		name: 'My Slack Credential',
-		data: 'U2FsdGVkX18WjITBG4IDqrGB1xE/uzVNjtwDAG3lP7E=',
-		type: 'slackApi',
-		nodesAccess: [{ nodeType: 'n8n-nodes-base.slack', date: '2022-12-21T11:23:00.561Z' }],
-	};
-
-	const credential = await Db.collections.Credentials.save(credentialDetails);
-
-	const workflowDetails = {
-		name: 'My Test Workflow',
-		active: false,
-		connections: {},
-		nodeTypes: {},
-		nodes: [
-			{
-				id: uuid(),
-				name: 'My Node',
-				type: 'n8n-nodes-base.slack',
-				typeVersion: 1,
-				position: [0, 0] as [number, number],
-				credentials: {
-					slackApi: {
-						id: credential.id,
-						name: credential.name,
-					},
-				},
-			},
-		],
-	};
-
-	const workflow = await Db.collections.Workflow.save(workflowDetails);
-
-	const date = new Date();
-	date.setDate(date.getDate() - config.getEnv('security.audit.daysAbandonedWorkflow') - 1);
-
-	await Db.collections.Execution.save({
-		data: '[]',
-		finished: true,
-		mode: 'manual',
-		startedAt: date,
-		stoppedAt: date,
-		workflowData: workflow,
-		workflowId: workflow.id,
-		waitTill: null,
-	});
-
-	const testAudit = await audit(['credentials']);
-
-	const section = getRiskSection(
-		testAudit,
-		CREDENTIALS_REPORT.RISK,
-		CREDENTIALS_REPORT.SECTIONS.CREDS_NOT_RECENTLY_EXECUTED,
-	);
-
-	expect(section.location).toHaveLength(1);
-	expect(section.location[0]).toMatchObject({
-		id: credential.id,
-		name: credential.name,
-	});
-});
-
-test('should not report credentials in recently executed workflow', async () => {
-	const credentialDetails = {
-		name: 'My Slack Credential',
-		data: 'U2FsdGVkX18WjITBG4IDqrGB1xE/uzVNjtwDAG3lP7E=',
-		type: 'slackApi',
-		nodesAccess: [{ nodeType: 'n8n-nodes-base.slack', date: '2022-12-21T11:23:00.561Z' }],
-	};
-
-	const credential = await Db.collections.Credentials.save(credentialDetails);
-
-	const workflowDetails = {
-		name: 'My Test Workflow',
-		active: true,
-		connections: {},
-		nodeTypes: {},
-		nodes: [
-			{
-				id: uuid(),
-				name: 'My Node',
-				type: 'n8n-nodes-base.slack',
-				typeVersion: 1,
-				position: [0, 0] as [number, number],
-				credentials: {
-					slackApi: {
-						id: credential.id,
-						name: credential.name,
-					},
-				},
-			},
-		],
-	};
-
-	const workflow = await Db.collections.Workflow.save(workflowDetails);
-
-	const date = new Date();
-	date.setDate(date.getDate() - config.getEnv('security.audit.daysAbandonedWorkflow') + 1);
-
-	await Db.collections.Execution.save({
-		data: '[]',
-		finished: true,
-		mode: 'manual',
-		startedAt: date,
-		stoppedAt: date,
-		workflowData: workflow,
-		workflowId: workflow.id,
-		waitTill: null,
-	});
-
-	const testAudit = await audit(['credentials']);
-
-	expect(testAudit).toBeEmptyArray();
-});
diff --git a/packages/cli/test/integration/audit/database.risk.test.ts b/packages/cli/test/integration/audit/database.risk.test.ts
deleted file mode 100644
index 7a9dae75a23ec..0000000000000
--- a/packages/cli/test/integration/audit/database.risk.test.ts
+++ /dev/null
@@ -1,184 +0,0 @@
-import { v4 as uuid } from 'uuid';
-import * as Db from '@/Db';
-import { audit } from '@/audit';
-import {
-	DATABASE_REPORT,
-	SQL_NODE_TYPES,
-	SQL_NODE_TYPES_WITH_QUERY_PARAMS,
-} from '@/audit/constants';
-import { getRiskSection, saveManualTriggerWorkflow } from './utils';
-import * as testDb from '../shared/testDb';
-
-beforeAll(async () => {
-	await testDb.init();
-});
-
-beforeEach(async () => {
-	await testDb.truncate(['Workflow']);
-});
-
-afterAll(async () => {
-	await testDb.terminate();
-});
-
-test('should report expressions in queries', async () => {
-	const map = [...SQL_NODE_TYPES].reduce<{ [nodeType: string]: string }>((acc, cur) => {
-		return (acc[cur] = uuid()), acc;
-	}, {});
-
-	const promises = Object.entries(map).map(async ([nodeType, nodeId]) => {
-		const details = {
-			name: 'My Test Workflow',
-			active: false,
-			connections: {},
-			nodeTypes: {},
-			nodes: [
-				{
-					id: nodeId,
-					name: 'My Node',
-					type: nodeType,
-					parameters: {
-						operation: 'executeQuery',
-						query: '=SELECT * FROM {{ $json.table }}',
-						additionalFields: {},
-					},
-					typeVersion: 1,
-					position: [0, 0] as [number, number],
-				},
-			],
-		};
-
-		return Db.collections.Workflow.save(details);
-	});
-
-	await Promise.all(promises);
-
-	const testAudit = await audit(['database']);
-
-	const section = getRiskSection(
-		testAudit,
-		DATABASE_REPORT.RISK,
-		DATABASE_REPORT.SECTIONS.EXPRESSIONS_IN_QUERIES,
-	);
-
-	expect(section.location).toHaveLength(SQL_NODE_TYPES.size);
-
-	for (const loc of section.location) {
-		if (loc.kind === 'node') {
-			expect(loc.nodeId).toBe(map[loc.nodeType]);
-		}
-	}
-});
-
-test('should report expressions in query params', async () => {
-	const map = [...SQL_NODE_TYPES_WITH_QUERY_PARAMS].reduce<{ [nodeType: string]: string }>(
-		(acc, cur) => {
-			return (acc[cur] = uuid()), acc;
-		},
-		{},
-	);
-
-	const promises = Object.entries(map).map(async ([nodeType, nodeId]) => {
-		const details = {
-			name: 'My Test Workflow',
-			active: false,
-			connections: {},
-			nodeTypes: {},
-			nodes: [
-				{
-					id: nodeId,
-					name: 'My Node',
-					type: nodeType,
-					parameters: {
-						operation: 'executeQuery',
-						query: 'SELECT * FROM users WHERE id = $1;',
-						additionalFields: {
-							queryParams: '={{ $json.userId }}',
-						},
-					},
-					typeVersion: 1,
-					position: [0, 0] as [number, number],
-				},
-			],
-		};
-
-		return Db.collections.Workflow.save(details);
-	});
-
-	await Promise.all(promises);
-
-	const testAudit = await audit(['database']);
-
-	const section = getRiskSection(
-		testAudit,
-		DATABASE_REPORT.RISK,
-		DATABASE_REPORT.SECTIONS.EXPRESSIONS_IN_QUERY_PARAMS,
-	);
-
-	expect(section.location).toHaveLength(SQL_NODE_TYPES_WITH_QUERY_PARAMS.size);
-
-	for (const loc of section.location) {
-		if (loc.kind === 'node') {
-			expect(loc.nodeId).toBe(map[loc.nodeType]);
-		}
-	}
-});
-
-test('should report unused query params', async () => {
-	const map = [...SQL_NODE_TYPES_WITH_QUERY_PARAMS].reduce<{ [nodeType: string]: string }>(
-		(acc, cur) => {
-			return (acc[cur] = uuid()), acc;
-		},
-		{},
-	);
-
-	const promises = Object.entries(map).map(async ([nodeType, nodeId]) => {
-		const details = {
-			name: 'My Test Workflow',
-			active: false,
-			connections: {},
-			nodeTypes: {},
-			nodes: [
-				{
-					id: nodeId,
-					name: 'My Node',
-					type: nodeType,
-					parameters: {
-						operation: 'executeQuery',
-						query: 'SELECT * FROM users WHERE id = 123;',
-					},
-					typeVersion: 1,
-					position: [0, 0] as [number, number],
-				},
-			],
-		};
-
-		return Db.collections.Workflow.save(details);
-	});
-
-	await Promise.all(promises);
-
-	const testAudit = await audit(['database']);
-
-	const section = getRiskSection(
-		testAudit,
-		DATABASE_REPORT.RISK,
-		DATABASE_REPORT.SECTIONS.UNUSED_QUERY_PARAMS,
-	);
-
-	expect(section.location).toHaveLength(SQL_NODE_TYPES_WITH_QUERY_PARAMS.size);
-
-	for (const loc of section.location) {
-		if (loc.kind === 'node') {
-			expect(loc.nodeId).toBe(map[loc.nodeType]);
-		}
-	}
-});
-
-test('should not report non-database node', async () => {
-	await saveManualTriggerWorkflow();
-
-	const testAudit = await audit(['database']);
-
-	expect(testAudit).toBeEmptyArray();
-});
diff --git a/packages/cli/test/integration/audit/filesystem.risk.test.ts b/packages/cli/test/integration/audit/filesystem.risk.test.ts
deleted file mode 100644
index 57ebf38ad5f60..0000000000000
--- a/packages/cli/test/integration/audit/filesystem.risk.test.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-import { v4 as uuid } from 'uuid';
-import * as Db from '@/Db';
-import { audit } from '@/audit';
-import { FILESYSTEM_INTERACTION_NODE_TYPES, FILESYSTEM_REPORT } from '@/audit/constants';
-import { getRiskSection, saveManualTriggerWorkflow } from './utils';
-import * as testDb from '../shared/testDb';
-
-beforeAll(async () => {
-	await testDb.init();
-});
-
-beforeEach(async () => {
-	await testDb.truncate(['Workflow']);
-});
-
-afterAll(async () => {
-	await testDb.terminate();
-});
-
-test('should report filesystem interaction nodes', async () => {
-	const map = [...FILESYSTEM_INTERACTION_NODE_TYPES].reduce<{ [nodeType: string]: string }>(
-		(acc, cur) => {
-			return (acc[cur] = uuid()), acc;
-		},
-		{},
-	);
-
-	const promises = Object.entries(map).map(async ([nodeType, nodeId]) => {
-		const details = {
-			name: 'My Test Workflow',
-			active: false,
-			connections: {},
-			nodeTypes: {},
-			nodes: [
-				{
-					id: nodeId,
-					name: 'My Node',
-					type: nodeType,
-					typeVersion: 1,
-					position: [0, 0] as [number, number],
-				},
-			],
-		};
-
-		return Db.collections.Workflow.save(details);
-	});
-
-	await Promise.all(promises);
-
-	const testAudit = await audit(['filesystem']);
-
-	const section = getRiskSection(
-		testAudit,
-		FILESYSTEM_REPORT.RISK,
-		FILESYSTEM_REPORT.SECTIONS.FILESYSTEM_INTERACTION_NODES,
-	);
-
-	expect(section.location).toHaveLength(FILESYSTEM_INTERACTION_NODE_TYPES.size);
-
-	for (const loc of section.location) {
-		if (loc.kind === 'node') {
-			expect(loc.nodeId).toBe(map[loc.nodeType]);
-		}
-	}
-});
-
-test('should not report non-filesystem-interaction node', async () => {
-	await saveManualTriggerWorkflow();
-
-	const testAudit = await audit(['filesystem']);
-
-	expect(testAudit).toBeEmptyArray();
-});
diff --git a/packages/cli/test/integration/audit/instance.risk.test.ts b/packages/cli/test/integration/audit/instance.risk.test.ts
deleted file mode 100644
index f05ab3a067953..0000000000000
--- a/packages/cli/test/integration/audit/instance.risk.test.ts
+++ /dev/null
@@ -1,253 +0,0 @@
-import { v4 as uuid } from 'uuid';
-import * as Db from '@/Db';
-import { audit } from '@/audit';
-import { INSTANCE_REPORT, WEBHOOK_VALIDATOR_NODE_TYPES } from '@/audit/constants';
-import {
-	getRiskSection,
-	saveManualTriggerWorkflow,
-	MOCK_09990_N8N_VERSION,
-	simulateOutdatedInstanceOnce,
-	simulateUpToDateInstance,
-} from './utils';
-import * as testDb from '../shared/testDb';
-import { toReportTitle } from '@/audit/utils';
-import config from '@/config';
-
-beforeAll(async () => {
-	await testDb.init();
-
-	simulateUpToDateInstance();
-});
-
-beforeEach(async () => {
-	await testDb.truncate(['Workflow']);
-});
-
-afterAll(async () => {
-	await testDb.terminate();
-});
-
-test('should report webhook lacking authentication', async () => {
-	const targetNodeId = uuid();
-
-	const details = {
-		name: 'My Test Workflow',
-		active: true,
-		nodeTypes: {},
-		connections: {},
-		nodes: [
-			{
-				parameters: {
-					path: uuid(),
-					options: {},
-				},
-				id: targetNodeId,
-				name: 'Webhook',
-				type: 'n8n-nodes-base.webhook',
-				typeVersion: 1,
-				position: [0, 0] as [number, number],
-				webhookId: uuid(),
-			},
-		],
-	};
-
-	await Db.collections.Workflow.save(details);
-
-	const testAudit = await audit(['instance']);
-
-	const section = getRiskSection(
-		testAudit,
-		INSTANCE_REPORT.RISK,
-		INSTANCE_REPORT.SECTIONS.UNPROTECTED_WEBHOOKS,
-	);
-
-	if (!section.location) {
-		fail('Expected section to have locations');
-	}
-
-	expect(section.location).toHaveLength(1);
-
-	expect(section.location[0].nodeId).toBe(targetNodeId);
-});
-
-test('should not report webhooks having basic or header auth', async () => {
-	const promises = ['basicAuth', 'headerAuth'].map(async (authType) => {
-		const details = {
-			name: 'My Test Workflow',
-			active: true,
-			nodeTypes: {},
-			connections: {},
-			nodes: [
-				{
-					parameters: {
-						path: uuid(),
-						authentication: authType,
-						options: {},
-					},
-					id: uuid(),
-					name: 'Webhook',
-					type: 'n8n-nodes-base.webhook',
-					typeVersion: 1,
-					position: [0, 0] as [number, number],
-					webhookId: uuid(),
-				},
-			],
-		};
-
-		return Db.collections.Workflow.save(details);
-	});
-
-	await Promise.all(promises);
-
-	const testAudit = await audit(['instance']);
-	if (Array.isArray(testAudit)) fail('audit is empty');
-
-	const report = testAudit[toReportTitle('instance')];
-	if (!report) {
-		fail('Expected test audit to have instance risk report');
-	}
-
-	for (const section of report.sections) {
-		expect(section.title).not.toBe(INSTANCE_REPORT.SECTIONS.UNPROTECTED_WEBHOOKS);
-	}
-});
-
-test('should not report webhooks validated by direct children', async () => {
-	const promises = [...WEBHOOK_VALIDATOR_NODE_TYPES].map(async (nodeType) => {
-		const details = {
-			name: 'My Test Workflow',
-			active: true,
-			nodeTypes: {},
-			nodes: [
-				{
-					parameters: {
-						path: uuid(),
-						options: {},
-					},
-					id: uuid(),
-					name: 'Webhook',
-					type: 'n8n-nodes-base.webhook',
-					typeVersion: 1,
-					position: [0, 0] as [number, number],
-					webhookId: uuid(),
-				},
-				{
-					id: uuid(),
-					name: 'My Node',
-					type: nodeType,
-					typeVersion: 1,
-					position: [0, 0] as [number, number],
-				},
-			],
-			connections: {
-				Webhook: {
-					main: [
-						[
-							{
-								node: 'My Node',
-								type: 'main',
-								index: 0,
-							},
-						],
-					],
-				},
-			},
-		};
-
-		return Db.collections.Workflow.save(details);
-	});
-
-	await Promise.all(promises);
-
-	const testAudit = await audit(['instance']);
-	if (Array.isArray(testAudit)) fail('audit is empty');
-
-	const report = testAudit[toReportTitle('instance')];
-	if (!report) {
-		fail('Expected test audit to have instance risk report');
-	}
-
-	for (const section of report.sections) {
-		expect(section.title).not.toBe(INSTANCE_REPORT.SECTIONS.UNPROTECTED_WEBHOOKS);
-	}
-});
-
-test('should not report non-webhook node', async () => {
-	await saveManualTriggerWorkflow();
-
-	const testAudit = await audit(['instance']);
-	if (Array.isArray(testAudit)) fail('audit is empty');
-
-	const report = testAudit[toReportTitle('instance')];
-
-	if (!report) {
-		fail('Expected test audit to have instance risk report');
-	}
-
-	for (const section of report.sections) {
-		expect(section.title).not.toBe(INSTANCE_REPORT.SECTIONS.UNPROTECTED_WEBHOOKS);
-	}
-});
-
-test('should report outdated instance when outdated', async () => {
-	simulateOutdatedInstanceOnce();
-
-	const testAudit = await audit(['instance']);
-
-	const section = getRiskSection(
-		testAudit,
-		INSTANCE_REPORT.RISK,
-		INSTANCE_REPORT.SECTIONS.OUTDATED_INSTANCE,
-	);
-
-	if (!section.nextVersions) {
-		fail('Expected section to have next versions');
-	}
-
-	expect(section.nextVersions).toHaveLength(1);
-
-	expect(section.nextVersions[0].name).toBe(MOCK_09990_N8N_VERSION.name);
-});
-
-test('should not report outdated instance when up to date', async () => {
-	const testAudit = await audit(['instance']);
-	if (Array.isArray(testAudit)) fail('audit is empty');
-
-	const report = testAudit[toReportTitle('instance')];
-	if (!report) {
-		fail('Expected test audit to have instance risk report');
-	}
-
-	for (const section of report.sections) {
-		expect(section.title).not.toBe(INSTANCE_REPORT.SECTIONS.OUTDATED_INSTANCE);
-	}
-});
-
-test('should report security settings', async () => {
-	config.set('diagnostics.enabled', true);
-
-	const testAudit = await audit(['instance']);
-
-	const section = getRiskSection(
-		testAudit,
-		INSTANCE_REPORT.RISK,
-		INSTANCE_REPORT.SECTIONS.SECURITY_SETTINGS,
-	);
-
-	expect(section.settings).toMatchObject({
-		features: {
-			communityPackagesEnabled: true,
-			versionNotificationsEnabled: true,
-			templatesEnabled: true,
-			publicApiEnabled: false,
-			userManagementEnabled: true,
-		},
-		auth: {
-			authExcludeEndpoints: 'none',
-			basicAuthActive: false,
-			jwtAuthActive: false,
-		},
-		nodes: { nodesExclude: 'none', nodesInclude: 'none' },
-		telemetry: { diagnosticsEnabled: true },
-	});
-});
diff --git a/packages/cli/test/integration/audit/nodes.risk.test.ts b/packages/cli/test/integration/audit/nodes.risk.test.ts
deleted file mode 100644
index 384850c5594c8..0000000000000
--- a/packages/cli/test/integration/audit/nodes.risk.test.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-import { v4 as uuid } from 'uuid';
-import * as Db from '@/Db';
-import { audit } from '@/audit';
-import * as packageModel from '@/CommunityNodes/packageModel';
-import { OFFICIAL_RISKY_NODE_TYPES, NODES_REPORT } from '@/audit/constants';
-import { getRiskSection, MOCK_PACKAGE, saveManualTriggerWorkflow } from './utils';
-import * as testDb from '../shared/testDb';
-import { toReportTitle } from '@/audit/utils';
-import { mockInstance } from '../shared/utils';
-import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
-import { NodeTypes } from '@/NodeTypes';
-
-const nodesAndCredentials = mockInstance(LoadNodesAndCredentials);
-nodesAndCredentials.getCustomDirectories.mockReturnValue([]);
-mockInstance(NodeTypes);
-
-beforeAll(async () => {
-	await testDb.init();
-});
-
-beforeEach(async () => {
-	await testDb.truncate(['Workflow']);
-});
-
-afterAll(async () => {
-	await testDb.terminate();
-});
-
-test('should report risky official nodes', async () => {
-	const map = [...OFFICIAL_RISKY_NODE_TYPES].reduce<{ [nodeType: string]: string }>((acc, cur) => {
-		return (acc[cur] = uuid()), acc;
-	}, {});
-
-	const promises = Object.entries(map).map(async ([nodeType, nodeId]) => {
-		const details = {
-			name: 'My Test Workflow',
-			active: false,
-			connections: {},
-			nodeTypes: {},
-			nodes: [
-				{
-					id: nodeId,
-					name: 'My Node',
-					type: nodeType,
-					typeVersion: 1,
-					position: [0, 0] as [number, number],
-				},
-			],
-		};
-
-		return Db.collections.Workflow.save(details);
-	});
-
-	await Promise.all(promises);
-
-	const testAudit = await audit(['nodes']);
-
-	const section = getRiskSection(
-		testAudit,
-		NODES_REPORT.RISK,
-		NODES_REPORT.SECTIONS.OFFICIAL_RISKY_NODES,
-	);
-
-	expect(section.location).toHaveLength(OFFICIAL_RISKY_NODE_TYPES.size);
-
-	for (const loc of section.location) {
-		if (loc.kind === 'node') {
-			expect(loc.nodeId).toBe(map[loc.nodeType]);
-		}
-	}
-});
-
-test('should not report non-risky official nodes', async () => {
-	await saveManualTriggerWorkflow();
-
-	const testAudit = await audit(['nodes']);
-	if (Array.isArray(testAudit)) return;
-
-	const report = testAudit[toReportTitle('nodes')];
-	if (!report) return;
-
-	for (const section of report.sections) {
-		expect(section.title).not.toBe(NODES_REPORT.SECTIONS.OFFICIAL_RISKY_NODES);
-	}
-});
-
-test('should report community nodes', async () => {
-	jest.spyOn(packageModel, 'getAllInstalledPackages').mockResolvedValueOnce(MOCK_PACKAGE);
-
-	const testAudit = await audit(['nodes']);
-
-	const section = getRiskSection(
-		testAudit,
-		NODES_REPORT.RISK,
-		NODES_REPORT.SECTIONS.COMMUNITY_NODES,
-	);
-
-	expect(section.location).toHaveLength(1);
-
-	if (section.location[0].kind === 'community') {
-		expect(section.location[0].nodeType).toBe(MOCK_PACKAGE[0].installedNodes[0].type);
-	}
-});
diff --git a/packages/cli/test/integration/audit/utils.ts b/packages/cli/test/integration/audit/utils.ts
deleted file mode 100644
index 9a023fa5ddd25..0000000000000
--- a/packages/cli/test/integration/audit/utils.ts
+++ /dev/null
@@ -1,130 +0,0 @@
-import nock from 'nock';
-import config from '@/config';
-import { v4 as uuid } from 'uuid';
-import * as Db from '@/Db';
-import { toReportTitle } from '@/audit/utils';
-import * as constants from '@/constants';
-import type { Risk } from '@/audit/types';
-import type { InstalledNodes } from '@db/entities/InstalledNodes';
-import type { InstalledPackages } from '@db/entities/InstalledPackages';
-
-type GetSectionKind<C extends Risk.Category> = C extends 'instance'
-	? Risk.InstanceSection
-	: Risk.StandardSection;
-
-export function getRiskSection<C extends Risk.Category>(
-	testAudit: Risk.Audit | never[],
-	riskCategory: C,
-	sectionTitle: string,
-): GetSectionKind<C> {
-	if (Array.isArray(testAudit)) {
-		throw new Error('Expected test audit not to be an array');
-	}
-
-	const report = testAudit[toReportTitle(riskCategory)];
-
-	if (!report) throw new Error(`Expected risk "${riskCategory}"`);
-
-	for (const section of report.sections) {
-		if (section.title === sectionTitle) {
-			return section as GetSectionKind<C>;
-		}
-	}
-
-	throw new Error(`Expected section "${sectionTitle}" for risk "${riskCategory}"`);
-}
-
-export async function saveManualTriggerWorkflow() {
-	const details = {
-		id: '1',
-		name: 'My Test Workflow',
-		active: false,
-		connections: {},
-		nodeTypes: {},
-		nodes: [
-			{
-				id: uuid(),
-				name: 'My Node',
-				type: 'n8n-nodes-base.manualTrigger',
-				typeVersion: 1,
-				position: [0, 0] as [number, number],
-			},
-		],
-	};
-
-	return Db.collections.Workflow.save(details);
-}
-
-export const MOCK_09990_N8N_VERSION = {
-	name: '0.999.0',
-	nodes: [
-		{
-			name: 'n8n-nodes-base.testNode',
-			displayName: 'Test Node',
-			icon: 'file:testNode.svg',
-			defaults: {
-				name: 'Test Node',
-			},
-		},
-	],
-	createdAt: '2022-11-11T11:11:11.111Z',
-	description:
-		'Includes <strong>new nodes</strong>, <strong>node enhancements</strong>, <strong>core functionality</strong> and <strong>bug fixes</strong>',
-	documentationUrl: 'https://docs.n8n.io/reference/release-notes/#n8n09990',
-	hasBreakingChange: false,
-	hasSecurityFix: false,
-	hasSecurityIssue: false,
-	securityIssueFixVersion: null,
-};
-
-export const MOCK_01110_N8N_VERSION = {
-	name: '0.111.0',
-	nodes: [],
-	createdAt: '2022-01-01T00:00:00.000Z',
-	description:
-		'Includes <strong>new nodes</strong>, <strong>node enhancements</strong>, <strong>core functionality</strong> and <strong>bug fixes</strong>',
-	documentationUrl: 'https://docs.n8n.io/reference/release-notes/#n8n01110',
-	hasBreakingChange: false,
-	hasSecurityFix: false,
-	hasSecurityIssue: false,
-	securityIssueFixVersion: null,
-};
-
-export const MOCK_PACKAGE: InstalledPackages[] = [
-	{
-		createdAt: new Date(),
-		updatedAt: new Date(),
-		packageName: 'n8n-nodes-test',
-		installedVersion: '1.1.2',
-		authorName: 'test',
-		authorEmail: 'test@test.com',
-		setUpdateDate: () => {},
-		installedNodes: [
-			{
-				name: 'My Test Node',
-				type: 'myTestNode',
-				latestVersion: '1',
-			} as InstalledNodes,
-		],
-	},
-];
-
-export function simulateOutdatedInstanceOnce(versionName = MOCK_01110_N8N_VERSION.name) {
-	const baseUrl = config.getEnv('versionNotifications.endpoint') + '/';
-
-	jest
-		.spyOn(constants, 'getN8nPackageJson')
-		.mockReturnValueOnce({ name: 'n8n', version: versionName });
-
-	nock(baseUrl).get(versionName).reply(200, [MOCK_01110_N8N_VERSION, MOCK_09990_N8N_VERSION]);
-}
-
-export function simulateUpToDateInstance(versionName = MOCK_09990_N8N_VERSION.name) {
-	const baseUrl = config.getEnv('versionNotifications.endpoint') + '/';
-
-	jest
-		.spyOn(constants, 'getN8nPackageJson')
-		.mockReturnValueOnce({ name: 'n8n', version: versionName });
-
-	nock(baseUrl).persist().get(versionName).reply(200, [MOCK_09990_N8N_VERSION]);
-}
diff --git a/packages/cli/test/integration/auth.api.test.ts b/packages/cli/test/integration/auth.api.test.ts
index e81cf06aa3d9d..9435fa7a7dfcf 100644
--- a/packages/cli/test/integration/auth.api.test.ts
+++ b/packages/cli/test/integration/auth.api.test.ts
@@ -1,55 +1,46 @@
-import type { Application } from 'express';
 import type { SuperAgentTest } from 'supertest';
+import { Container } from 'typedi';
 import validator from 'validator';
 import config from '@/config';
-import * as Db from '@/Db';
 import { AUTH_COOKIE_NAME } from '@/constants';
-import type { Role } from '@db/entities/Role';
 import type { User } from '@db/entities/User';
 import { LOGGED_OUT_RESPONSE_BODY } from './shared/constants';
 import { randomValidPassword } from './shared/random';
 import * as testDb from './shared/testDb';
-import type { AuthAgent } from './shared/types';
-import * as utils from './shared/utils';
+import * as utils from './shared/utils/';
+import { createUser, createUserShell } from './shared/db/users';
+import { UserRepository } from '@db/repositories/user.repository';
+import { MfaService } from '@/Mfa/mfa.service';
 
-let app: Application;
-let globalOwnerRole: Role;
-let globalMemberRole: Role;
 let owner: User;
-let authAgent: AuthAgent;
-let authlessAgent: SuperAgentTest;
 let authOwnerAgent: SuperAgentTest;
 const ownerPassword = randomValidPassword();
 
-beforeAll(async () => {
-	app = await utils.initTestServer({ endpointGroups: ['auth'] });
-	authAgent = utils.createAuthAgent(app);
+const testServer = utils.setupTestServer({ endpointGroups: ['auth'] });
+const license = testServer.license;
+
+let mfaService: MfaService;
 
-	globalOwnerRole = await testDb.getGlobalOwnerRole();
-	globalMemberRole = await testDb.getGlobalMemberRole();
+beforeAll(async () => {
+	mfaService = Container.get(MfaService);
 });
 
 beforeEach(async () => {
 	await testDb.truncate(['User']);
-	authlessAgent = utils.createAgent(app);
 	config.set('ldap.disabled', true);
 	await utils.setInstanceOwnerSetUp(true);
 });
 
-afterAll(async () => {
-	await testDb.terminate();
-});
-
 describe('POST /login', () => {
 	beforeEach(async () => {
-		owner = await testDb.createUser({
+		owner = await createUser({
 			password: ownerPassword,
-			globalRole: globalOwnerRole,
+			role: 'global:owner',
 		});
 	});
 
 	test('should log user in', async () => {
-		const response = await authlessAgent.post('/login').send({
+		const response = await testServer.authlessAgent.post('/login').send({
 			email: owner.email,
 			password: ownerPassword,
 		});
@@ -63,9 +54,11 @@ describe('POST /login', () => {
 			lastName,
 			password,
 			personalizationAnswers,
-			globalRole,
-			resetPasswordToken,
+			role,
 			apiKey,
+			globalScopes,
+			mfaSecret,
+			mfaRecoveryCodes,
 		} = response.body.data;
 
 		expect(validator.isUUID(id)).toBe(true);
@@ -75,43 +68,99 @@ describe('POST /login', () => {
 		expect(password).toBeUndefined();
 		expect(personalizationAnswers).toBeNull();
 		expect(password).toBeUndefined();
-		expect(resetPasswordToken).toBeUndefined();
-		expect(globalRole).toBeDefined();
-		expect(globalRole.name).toBe('owner');
-		expect(globalRole.scope).toBe('global');
+		expect(role).toBe('global:owner');
 		expect(apiKey).toBeUndefined();
+		expect(globalScopes).toBeDefined();
+		expect(mfaRecoveryCodes).toBeUndefined();
+		expect(mfaSecret).toBeUndefined();
 
 		const authToken = utils.getAuthToken(response);
 		expect(authToken).toBeDefined();
 	});
-});
 
-describe('GET /login', () => {
-	test('should return 401 Unauthorized if no cookie', async () => {
-		const response = await authlessAgent.get('/login');
+	test('should log user with MFA enabled', async () => {
+		const secret = 'test';
+		const recoveryCodes = ['1'];
+		await mfaService.saveSecretAndRecoveryCodes(owner.id, secret, recoveryCodes);
+		await mfaService.enableMfa(owner.id);
 
-		expect(response.statusCode).toBe(401);
+		const response = await testServer.authlessAgent.post('/login').send({
+			email: owner.email,
+			password: ownerPassword,
+			mfaToken: mfaService.totp.generateTOTP(secret),
+		});
+
+		expect(response.statusCode).toBe(200);
+
+		const {
+			id,
+			email,
+			firstName,
+			lastName,
+			password,
+			personalizationAnswers,
+			role,
+			apiKey,
+			mfaRecoveryCodes,
+			mfaSecret,
+		} = response.body.data;
+
+		expect(validator.isUUID(id)).toBe(true);
+		expect(email).toBe(owner.email);
+		expect(firstName).toBe(owner.firstName);
+		expect(lastName).toBe(owner.lastName);
+		expect(password).toBeUndefined();
+		expect(personalizationAnswers).toBeNull();
+		expect(password).toBeUndefined();
+		expect(role).toBe('global:owner');
+		expect(apiKey).toBeUndefined();
+		expect(mfaRecoveryCodes).toBeUndefined();
+		expect(mfaSecret).toBeUndefined();
 
 		const authToken = utils.getAuthToken(response);
-		expect(authToken).toBeUndefined();
+		expect(authToken).toBeDefined();
 	});
 
-	test('should return cookie if UM is disabled and no cookie is already set', async () => {
-		await testDb.createUserShell(globalOwnerRole);
-		await utils.setInstanceOwnerSetUp(false);
+	test('should throw AuthError for non-owner if not within users limit quota', async () => {
+		license.setQuota('quota:users', 0);
+		const password = 'testpassword';
+		const member = await createUser({
+			password,
+		});
 
-		const response = await authlessAgent.get('/login');
+		const response = await testServer.authlessAgent.post('/login').send({
+			email: member.email,
+			password,
+		});
+		expect(response.statusCode).toBe(403);
+	});
+
+	test('should not throw AuthError for owner if not within users limit quota', async () => {
+		license.setQuota('quota:users', 0);
+		const ownerUser = await createUser({
+			password: randomValidPassword(),
+			role: 'global:owner',
+		});
 
+		const response = await testServer.authAgentFor(ownerUser).get('/login');
 		expect(response.statusCode).toBe(200);
+	});
+});
+
+describe('GET /login', () => {
+	test('should return 401 Unauthorized if no cookie', async () => {
+		const response = await testServer.authlessAgent.get('/login');
+
+		expect(response.statusCode).toBe(401);
 
 		const authToken = utils.getAuthToken(response);
-		expect(authToken).toBeDefined();
+		expect(authToken).toBeUndefined();
 	});
 
 	test('should return 401 Unauthorized if invalid cookie', async () => {
-		authlessAgent.jar.setCookie(`${AUTH_COOKIE_NAME}=invalid`);
+		testServer.authlessAgent.jar.setCookie(`${AUTH_COOKIE_NAME}=invalid`);
 
-		const response = await authlessAgent.get('/login');
+		const response = await testServer.authlessAgent.get('/login');
 
 		expect(response.statusCode).toBe(401);
 
@@ -120,9 +169,9 @@ describe('GET /login', () => {
 	});
 
 	test('should return logged-in owner shell', async () => {
-		const ownerShell = await testDb.createUserShell(globalOwnerRole);
+		const ownerShell = await createUserShell('global:owner');
 
-		const response = await authAgent(ownerShell).get('/login');
+		const response = await testServer.authAgentFor(ownerShell).get('/login');
 
 		expect(response.statusCode).toBe(200);
 
@@ -133,9 +182,9 @@ describe('GET /login', () => {
 			lastName,
 			password,
 			personalizationAnswers,
-			globalRole,
-			resetPasswordToken,
+			role,
 			apiKey,
+			globalScopes,
 		} = response.body.data;
 
 		expect(validator.isUUID(id)).toBe(true);
@@ -145,20 +194,19 @@ describe('GET /login', () => {
 		expect(password).toBeUndefined();
 		expect(personalizationAnswers).toBeNull();
 		expect(password).toBeUndefined();
-		expect(resetPasswordToken).toBeUndefined();
-		expect(globalRole).toBeDefined();
-		expect(globalRole.name).toBe('owner');
-		expect(globalRole.scope).toBe('global');
+		expect(role).toBe('global:owner');
 		expect(apiKey).toBeUndefined();
+		expect(globalScopes).toBeDefined();
+		expect(globalScopes).toContain('workflow:read');
 
 		const authToken = utils.getAuthToken(response);
 		expect(authToken).toBeUndefined();
 	});
 
 	test('should return logged-in member shell', async () => {
-		const memberShell = await testDb.createUserShell(globalMemberRole);
+		const memberShell = await createUserShell('global:member');
 
-		const response = await authAgent(memberShell).get('/login');
+		const response = await testServer.authAgentFor(memberShell).get('/login');
 
 		expect(response.statusCode).toBe(200);
 
@@ -169,9 +217,9 @@ describe('GET /login', () => {
 			lastName,
 			password,
 			personalizationAnswers,
-			globalRole,
-			resetPasswordToken,
+			role,
 			apiKey,
+			globalScopes,
 		} = response.body.data;
 
 		expect(validator.isUUID(id)).toBe(true);
@@ -181,20 +229,19 @@ describe('GET /login', () => {
 		expect(password).toBeUndefined();
 		expect(personalizationAnswers).toBeNull();
 		expect(password).toBeUndefined();
-		expect(resetPasswordToken).toBeUndefined();
-		expect(globalRole).toBeDefined();
-		expect(globalRole.name).toBe('member');
-		expect(globalRole.scope).toBe('global');
+		expect(role).toBe('global:member');
 		expect(apiKey).toBeUndefined();
+		expect(globalScopes).toBeDefined();
+		expect(globalScopes).not.toContain('workflow:read');
 
 		const authToken = utils.getAuthToken(response);
 		expect(authToken).toBeUndefined();
 	});
 
 	test('should return logged-in owner', async () => {
-		const owner = await testDb.createUser({ globalRole: globalOwnerRole });
+		const owner = await createUser({ role: 'global:owner' });
 
-		const response = await authAgent(owner).get('/login');
+		const response = await testServer.authAgentFor(owner).get('/login');
 
 		expect(response.statusCode).toBe(200);
 
@@ -205,9 +252,9 @@ describe('GET /login', () => {
 			lastName,
 			password,
 			personalizationAnswers,
-			globalRole,
-			resetPasswordToken,
+			role,
 			apiKey,
+			globalScopes,
 		} = response.body.data;
 
 		expect(validator.isUUID(id)).toBe(true);
@@ -217,20 +264,19 @@ describe('GET /login', () => {
 		expect(password).toBeUndefined();
 		expect(personalizationAnswers).toBeNull();
 		expect(password).toBeUndefined();
-		expect(resetPasswordToken).toBeUndefined();
-		expect(globalRole).toBeDefined();
-		expect(globalRole.name).toBe('owner');
-		expect(globalRole.scope).toBe('global');
+		expect(role).toBe('global:owner');
 		expect(apiKey).toBeUndefined();
+		expect(globalScopes).toBeDefined();
+		expect(globalScopes).toContain('workflow:read');
 
 		const authToken = utils.getAuthToken(response);
 		expect(authToken).toBeUndefined();
 	});
 
 	test('should return logged-in member', async () => {
-		const member = await testDb.createUser({ globalRole: globalMemberRole });
+		const member = await createUser({ role: 'global:member' });
 
-		const response = await authAgent(member).get('/login');
+		const response = await testServer.authAgentFor(member).get('/login');
 
 		expect(response.statusCode).toBe(200);
 
@@ -241,9 +287,9 @@ describe('GET /login', () => {
 			lastName,
 			password,
 			personalizationAnswers,
-			globalRole,
-			resetPasswordToken,
+			role,
 			apiKey,
+			globalScopes,
 		} = response.body.data;
 
 		expect(validator.isUUID(id)).toBe(true);
@@ -253,11 +299,10 @@ describe('GET /login', () => {
 		expect(password).toBeUndefined();
 		expect(personalizationAnswers).toBeNull();
 		expect(password).toBeUndefined();
-		expect(resetPasswordToken).toBeUndefined();
-		expect(globalRole).toBeDefined();
-		expect(globalRole.name).toBe('member');
-		expect(globalRole.scope).toBe('global');
+		expect(role).toBe('global:member');
 		expect(apiKey).toBeUndefined();
+		expect(globalScopes).toBeDefined();
+		expect(globalScopes).not.toContain('workflow:read');
 
 		const authToken = utils.getAuthToken(response);
 		expect(authToken).toBeUndefined();
@@ -266,15 +311,15 @@ describe('GET /login', () => {
 
 describe('GET /resolve-signup-token', () => {
 	beforeEach(async () => {
-		owner = await testDb.createUser({
+		owner = await createUser({
 			password: ownerPassword,
-			globalRole: globalOwnerRole,
+			role: 'global:owner',
 		});
-		authOwnerAgent = authAgent(owner);
+		authOwnerAgent = testServer.authAgentFor(owner);
 	});
 
 	test('should validate invite token', async () => {
-		const memberShell = await testDb.createUserShell(globalMemberRole);
+		const memberShell = await createUserShell('global:member');
 
 		const response = await authOwnerAgent
 			.get('/resolve-signup-token')
@@ -292,8 +337,20 @@ describe('GET /resolve-signup-token', () => {
 		});
 	});
 
+	test('should return 403 if user quota reached', async () => {
+		license.setQuota('quota:users', 0);
+		const memberShell = await createUserShell('global:member');
+
+		const response = await authOwnerAgent
+			.get('/resolve-signup-token')
+			.query({ inviterId: owner.id })
+			.query({ inviteeId: memberShell.id });
+
+		expect(response.statusCode).toBe(403);
+	});
+
 	test('should fail with invalid inputs', async () => {
-		const { id: inviteeId } = await testDb.createUser({ globalRole: globalMemberRole });
+		const { id: inviteeId } = await createUser({ role: 'global:member' });
 
 		const first = await authOwnerAgent.get('/resolve-signup-token').query({ inviterId: owner.id });
 
@@ -311,7 +368,7 @@ describe('GET /resolve-signup-token', () => {
 			.query({ inviteeId });
 
 		// cause inconsistent DB state
-		await Db.collections.User.update(owner.id, { email: '' });
+		await Container.get(UserRepository).update(owner.id, { email: '' });
 		const fifth = await authOwnerAgent
 			.get('/resolve-signup-token')
 			.query({ inviterId: owner.id })
@@ -325,9 +382,9 @@ describe('GET /resolve-signup-token', () => {
 
 describe('POST /logout', () => {
 	test('should log user out', async () => {
-		const owner = await testDb.createUser({ globalRole: globalOwnerRole });
+		const owner = await createUser({ role: 'global:owner' });
 
-		const response = await authAgent(owner).post('/logout');
+		const response = await testServer.authAgentFor(owner).post('/logout');
 
 		expect(response.statusCode).toBe(200);
 		expect(response.body).toEqual(LOGGED_OUT_RESPONSE_BODY);
diff --git a/packages/cli/test/integration/auth.mw.test.ts b/packages/cli/test/integration/auth.mw.test.ts
index 1c4c5b72a64d3..c29fda47b711b 100644
--- a/packages/cli/test/integration/auth.mw.test.ts
+++ b/packages/cli/test/integration/auth.mw.test.ts
@@ -1,47 +1,53 @@
-import type { SuperAgentTest } from 'supertest';
-import {
-	ROUTES_REQUIRING_AUTHENTICATION,
-	ROUTES_REQUIRING_AUTHORIZATION,
-} from './shared/constants';
-import * as testDb from './shared/testDb';
-import * as utils from './shared/utils';
-
-let authlessAgent: SuperAgentTest;
-let authMemberAgent: SuperAgentTest;
-
-beforeAll(async () => {
-	const app = await utils.initTestServer({ endpointGroups: ['me', 'auth', 'owner', 'users'] });
-	const globalMemberRole = await testDb.getGlobalMemberRole();
-	const member = await testDb.createUser({ globalRole: globalMemberRole });
-
-	authlessAgent = utils.createAgent(app);
-	authMemberAgent = utils.createAuthAgent(app)(member);
-});
+import { ActiveWorkflowManager } from '@/ActiveWorkflowManager';
 
-afterAll(async () => {
-	await testDb.terminate();
-});
+import type { SuperAgentTest } from 'supertest';
+import * as utils from './shared/utils/';
+import { createUser } from './shared/db/users';
+import { mockInstance } from '../shared/mocking';
 
-ROUTES_REQUIRING_AUTHENTICATION.concat(ROUTES_REQUIRING_AUTHORIZATION).forEach((route) => {
-	const [method, endpoint] = getMethodAndEndpoint(route);
+describe('Auth Middleware', () => {
+	mockInstance(ActiveWorkflowManager);
 
-	test(`${route} should return 401 Unauthorized if no cookie`, async () => {
-		const { statusCode } = await authlessAgent[method](endpoint);
-		expect(statusCode).toBe(401);
+	const testServer = utils.setupTestServer({
+		endpointGroups: ['me', 'auth', 'owner', 'users', 'invitations'],
 	});
-});
-
-ROUTES_REQUIRING_AUTHORIZATION.forEach(async (route) => {
-	const [method, endpoint] = getMethodAndEndpoint(route);
 
-	test(`${route} should return 403 Forbidden for member`, async () => {
-		const { statusCode } = await authMemberAgent[method](endpoint);
-		expect(statusCode).toBe(403);
+	/** Routes requiring a valid `n8n-auth` cookie for a user, either owner or member. */
+	const ROUTES_REQUIRING_AUTHENTICATION: Readonly<Array<[string, string]>> = [
+		['PATCH', '/me'],
+		['PATCH', '/me/password'],
+		['POST', '/me/survey'],
+	];
+
+	/** Routes requiring a valid `n8n-auth` cookie for an owner. */
+	const ROUTES_REQUIRING_AUTHORIZATION: Readonly<Array<[string, string]>> = [
+		['POST', '/invitations'],
+		['DELETE', '/users/123'],
+	];
+
+	describe('Routes requiring Authentication', () => {
+		ROUTES_REQUIRING_AUTHENTICATION.concat(ROUTES_REQUIRING_AUTHORIZATION).forEach(
+			([method, endpoint]) => {
+				test(`${method} ${endpoint} should return 401 Unauthorized if no cookie`, async () => {
+					const { statusCode } = await testServer.authlessAgent[method.toLowerCase()](endpoint);
+					expect(statusCode).toBe(401);
+				});
+			},
+		);
 	});
-});
 
-function getMethodAndEndpoint(route: string) {
-	return route.split(' ').map((segment, index) => {
-		return index % 2 === 0 ? segment.toLowerCase() : segment;
+	describe('Routes requiring Authorization', () => {
+		let authMemberAgent: SuperAgentTest;
+		beforeAll(async () => {
+			const member = await createUser({ role: 'global:member' });
+			authMemberAgent = testServer.authAgentFor(member);
+		});
+
+		ROUTES_REQUIRING_AUTHORIZATION.forEach(async ([method, endpoint]) => {
+			test(`${method} ${endpoint} should return 403 Forbidden for member`, async () => {
+				const { statusCode } = await authMemberAgent[method.toLowerCase()](endpoint);
+				expect(statusCode).toBe(403);
+			});
+		});
 	});
-}
+});
diff --git a/packages/cli/test/integration/binaryData.api.test.ts b/packages/cli/test/integration/binaryData.api.test.ts
new file mode 100644
index 0000000000000..6a3a314c737fa
--- /dev/null
+++ b/packages/cli/test/integration/binaryData.api.test.ts
@@ -0,0 +1,165 @@
+import fsp from 'node:fs/promises';
+import { Readable } from 'node:stream';
+import { BinaryDataService, FileNotFoundError } from 'n8n-core';
+import type { SuperAgentTest } from 'supertest';
+
+import { mockInstance } from '../shared/mocking';
+import { setupTestServer } from './shared/utils';
+import { createOwner } from './shared/db/users';
+
+jest.mock('fs/promises');
+
+const throwFileNotFound = () => {
+	throw new FileNotFoundError('non/existing/path');
+};
+
+const binaryDataService = mockInstance(BinaryDataService);
+let testServer = setupTestServer({ endpointGroups: ['binaryData'] });
+let authOwnerAgent: SuperAgentTest;
+
+beforeAll(async () => {
+	const owner = await createOwner();
+	authOwnerAgent = testServer.authAgentFor(owner);
+});
+
+afterEach(() => {
+	jest.restoreAllMocks();
+});
+
+describe('GET /binary-data', () => {
+	const fileId = '599c5f84007-7d14-4b63-8f1e-d726098d0cc0';
+	const fsBinaryDataId = `filesystem:${fileId}`;
+	const s3BinaryDataId = `s3:${fileId}`;
+	const binaryFilePath = `/Users/john/.n8n/binaryData/${fileId}`;
+	const mimeType = 'text/plain';
+	const fileName = 'test.txt';
+	const buffer = Buffer.from('content');
+	const mockStream = new Readable();
+	mockStream.push(buffer);
+	mockStream.push(null);
+
+	describe('should reject on missing or invalid binary data ID', () => {
+		test.each([['view'], ['download']])('on request to %s', async (action) => {
+			binaryDataService.getPath.mockReturnValue(binaryFilePath);
+			fsp.readFile = jest.fn().mockResolvedValue(buffer);
+
+			await authOwnerAgent
+				.get('/binary-data')
+				.query({
+					fileName,
+					mimeType,
+					action,
+				})
+				.expect(400);
+
+			await authOwnerAgent
+				.get('/binary-data')
+				.query({
+					id: 'invalid',
+					fileName,
+					mimeType,
+					action,
+				})
+				.expect(400);
+		});
+	});
+
+	describe('should return binary data [filesystem]', () => {
+		test.each([['view'], ['download']])('on request to %s', async (action) => {
+			binaryDataService.getAsStream.mockResolvedValue(mockStream);
+
+			const res = await authOwnerAgent
+				.get('/binary-data')
+				.query({
+					id: fsBinaryDataId,
+					fileName,
+					mimeType,
+					action,
+				})
+				.expect(200);
+
+			const contentDisposition =
+				action === 'download' ? `attachment; filename="${fileName}"` : undefined;
+
+			expect(binaryDataService.getAsStream).toHaveBeenCalledWith(fsBinaryDataId);
+			expect(res.headers['content-type']).toBe(mimeType);
+			expect(res.headers['content-disposition']).toBe(contentDisposition);
+		});
+	});
+
+	describe('should handle non-ASCII filename [filesystem]', () => {
+		test('on request to download', async () => {
+			const nonAsciiFileName = 'äöüß.png';
+
+			const res = await authOwnerAgent
+				.get('/binary-data')
+				.query({
+					id: fsBinaryDataId,
+					fileName: nonAsciiFileName,
+					mimeType,
+					action: 'download',
+				})
+				.expect(200);
+
+			expect(res.headers['content-disposition']).toBe(
+				`attachment; filename="${encodeURIComponent(nonAsciiFileName)}"`,
+			);
+		});
+	});
+
+	describe('should return 404 on file not found [filesystem]', () => {
+		test.each(['view', 'download'])('on request to %s', async (action) => {
+			binaryDataService.getAsStream.mockImplementation(throwFileNotFound);
+
+			await authOwnerAgent
+				.get('/binary-data')
+				.query({
+					id: fsBinaryDataId,
+					fileName,
+					mimeType,
+					action,
+				})
+				.expect(404);
+		});
+	});
+
+	describe('should return binary data [s3]', () => {
+		test.each([['view'], ['download']])('on request to %s', async (action) => {
+			binaryDataService.getAsStream.mockResolvedValue(mockStream);
+
+			const res = await authOwnerAgent
+				.get('/binary-data')
+				.query({
+					id: s3BinaryDataId,
+					fileName,
+					mimeType,
+					action,
+				})
+				.expect(200);
+
+			expect(binaryDataService.getAsStream).toHaveBeenCalledWith(s3BinaryDataId);
+
+			const contentDisposition =
+				action === 'download' ? `attachment; filename="${fileName}"` : undefined;
+
+			expect(res.headers['content-type']).toBe(mimeType);
+			expect(res.headers['content-disposition']).toBe(contentDisposition);
+		});
+	});
+
+	describe('should return 404 on file not found [s3]', () => {
+		test.each(['view', 'download'])('on request to %s', async (action) => {
+			binaryDataService.getAsStream.mockImplementation(throwFileNotFound);
+
+			await authOwnerAgent
+				.get('/binary-data')
+				.query({
+					id: s3BinaryDataId,
+					fileName,
+					mimeType,
+					action,
+				})
+				.expect(404);
+		});
+	});
+});
diff --git a/packages/cli/test/integration/commands/credentials.cmd.test.ts b/packages/cli/test/integration/commands/credentials.cmd.test.ts
new file mode 100644
index 0000000000000..730a0cd5dd1da
--- /dev/null
+++ b/packages/cli/test/integration/commands/credentials.cmd.test.ts
@@ -0,0 +1,233 @@
+import { Config } from '@oclif/core';
+
+import { InternalHooks } from '@/InternalHooks';
+import { ImportCredentialsCommand } from '@/commands/import/credentials';
+import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
+
+import { mockInstance } from '../../shared/mocking';
+import * as testDb from '../shared/testDb';
+import { getAllCredentials, getAllSharedCredentials } from '../shared/db/credentials';
+import { createMember, createOwner } from '../shared/db/users';
+
+const oclifConfig = new Config({ root: __dirname });
+
+async function importCredential(argv: string[]) {
+	const importer = new ImportCredentialsCommand(argv, oclifConfig);
+	await importer.init();
+	await importer.run();
+}
+
+beforeAll(async () => {
+	mockInstance(InternalHooks);
+	mockInstance(LoadNodesAndCredentials);
+	await testDb.init();
+});
+
+beforeEach(async () => {
+	await testDb.truncate(['Credentials', 'SharedCredentials', 'User']);
+});
+
+afterAll(async () => {
+	await testDb.terminate();
+});
+
+test('import:credentials should import a credential', async () => {
+	//
+	// ARRANGE
+	//
+	const owner = await createOwner();
+
+	//
+	// ACT
+	//
+	await importCredential([
+		'--input=./test/integration/commands/importCredentials/credentials.json',
+	]);
+
+	//
+	// ASSERT
+	//
+	const after = {
+		credentials: await getAllCredentials(),
+		sharings: await getAllSharedCredentials(),
+	};
+	expect(after).toMatchObject({
+		credentials: [expect.objectContaining({ id: '123', name: 'cred-aws-test' })],
+		sharings: [
+			expect.objectContaining({ credentialsId: '123', userId: owner.id, role: 'credential:owner' }),
+		],
+	});
+});
+
+test('import:credentials should import a credential from separated files', async () => {
+	//
+	// ARRANGE
+	//
+	const owner = await createOwner();
+
+	//
+	// ACT
+	//
+	// import credential the first time, assigning it to the owner
+	await importCredential([
+		'--separate',
+		'--input=./test/integration/commands/importCredentials/separate',
+	]);
+
+	//
+	// ASSERT
+	//
+	const after = {
+		credentials: await getAllCredentials(),
+		sharings: await getAllSharedCredentials(),
+	};
+
+	expect(after).toMatchObject({
+		credentials: [
+			expect.objectContaining({
+				id: '123',
+				name: 'cred-aws-test',
+			}),
+		],
+		sharings: [
+			expect.objectContaining({
+				credentialsId: '123',
+				userId: owner.id,
+				role: 'credential:owner',
+			}),
+		],
+	});
+});
+
+test('`import:credentials --userId ...` should fail if the credential exists already and is owned by somebody else', async () => {
+	//
+	// ARRANGE
+	//
+	const owner = await createOwner();
+	const member = await createMember();
+
+	// import credential the first time, assigning it to the owner
+	await importCredential([
+		'--input=./test/integration/commands/importCredentials/credentials.json',
+		`--userId=${owner.id}`,
+	]);
+
+	// making sure the import worked
+	const before = {
+		credentials: await getAllCredentials(),
+		sharings: await getAllSharedCredentials(),
+	};
+	expect(before).toMatchObject({
+		credentials: [expect.objectContaining({ id: '123', name: 'cred-aws-test' })],
+		sharings: [
+			expect.objectContaining({
+				credentialsId: '123',
+				userId: owner.id,
+				role: 'credential:owner',
+			}),
+		],
+	});
+
+	//
+	// ACT
+	//
+
+	// Import again while updating the name we try to assign the
+	// credential to another user.
+	await expect(
+		importCredential([
+			'--input=./test/integration/commands/importCredentials/credentials-updated.json',
+			`--userId=${member.id}`,
+		]),
+	).rejects.toThrowError(
+		`The credential with id "123" is already owned by the user with the id "${owner.id}". It can't be re-owned by the user with the id "${member.id}"`,
+	);
+
+	//
+	// ASSERT
+	//
+	const after = {
+		credentials: await getAllCredentials(),
+		sharings: await getAllSharedCredentials(),
+	};
+
+	expect(after).toMatchObject({
+		credentials: [
+			expect.objectContaining({
+				id: '123',
+				// only the name was updated
+				name: 'cred-aws-test',
+			}),
+		],
+		sharings: [
+			expect.objectContaining({
+				credentialsId: '123',
+				userId: owner.id,
+				role: 'credential:owner',
+			}),
+		],
+	});
+});
+
+test("only update credential, don't create or update owner if `--userId` is not passed", async () => {
+	//
+	// ARRANGE
+	//
+	await createOwner();
+	const member = await createMember();
+
+	// import credential the first time, assigning it to a member
+	await importCredential([
+		'--input=./test/integration/commands/importCredentials/credentials.json',
+		`--userId=${member.id}`,
+	]);
+
+	// making sure the import worked
+	const before = {
+		credentials: await getAllCredentials(),
+		sharings: await getAllSharedCredentials(),
+	};
+	expect(before).toMatchObject({
+		credentials: [expect.objectContaining({ id: '123', name: 'cred-aws-test' })],
+		sharings: [
+			expect.objectContaining({
+				credentialsId: '123',
+				userId: member.id,
+				role: 'credential:owner',
+			}),
+		],
+	});
+
+	//
+	// ACT
+	//
+	// Import again only updating the name and omitting `--userId`
+	await importCredential([
+		'--input=./test/integration/commands/importCredentials/credentials-updated.json',
+	]);
+
+	//
+	// ASSERT
+	//
+	const after = {
+		credentials: await getAllCredentials(),
+		sharings: await getAllSharedCredentials(),
+	};
+
+	expect(after).toMatchObject({
+		credentials: [
+			expect.objectContaining({
+				id: '123',
+				// only the name was updated
+				name: 'cred-aws-prod',
+			}),
+		],
+		sharings: [
+			expect.objectContaining({
+				credentialsId: '123',
+				userId: member.id,
+				role: 'credential:owner',
+			}),
+		],
+	});
+});
diff --git a/packages/cli/test/integration/commands/import.cmd.test.ts b/packages/cli/test/integration/commands/import.cmd.test.ts
index bc00a5e53d481..e65325c47153c 100644
--- a/packages/cli/test/integration/commands/import.cmd.test.ts
+++ b/packages/cli/test/integration/commands/import.cmd.test.ts
@@ -1,16 +1,30 @@
-import * as testDb from '../shared/testDb';
-import { mockInstance } from '../shared/utils';
+import { Config } from '@oclif/core';
+
 import { InternalHooks } from '@/InternalHooks';
-import { ImportWorkflowsCommand } from '../../../src/commands/import/workflow';
-import * as Config from '@oclif/config';
+import { ImportWorkflowsCommand } from '@/commands/import/workflow';
+import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
+
+import { mockInstance } from '../../shared/mocking';
+import * as testDb from '../shared/testDb';
+import { getAllSharedWorkflows, getAllWorkflows } from '../shared/db/workflows';
+import { createMember, createOwner } from '../shared/db/users';
+
+const oclifConfig = new Config({ root: __dirname });
+
+async function importWorkflow(argv: string[]) {
+	const importer = new ImportWorkflowsCommand(argv, oclifConfig);
+	await importer.init();
+	await importer.run();
+}
 
 beforeAll(async () => {
 	mockInstance(InternalHooks);
+	mockInstance(LoadNodesAndCredentials);
 	await testDb.init();
 });
 
 beforeEach(async () => {
-	await testDb.truncate(['Workflow']);
+	await testDb.truncate(['Workflow', 'SharedWorkflow', 'User']);
 });
 
 afterAll(async () => {
@@ -18,55 +32,186 @@ afterAll(async () => {
 });
 
 test('import:workflow should import active workflow and deactivate it', async () => {
-	const config: Config.IConfig = new Config.Config({ root: __dirname });
-	const before = await testDb.getAllWorkflows();
-	expect(before.length).toBe(0);
-	const importer = new ImportWorkflowsCommand(
-		['--separate', '--input=./test/integration/commands/importWorkflows/separate'],
-		config,
-	);
-	const mockExit = jest.spyOn(process, 'exit').mockImplementation((number) => {
-		throw new Error('process.exit');
-	});
+	//
+	// ARRANGE
+	//
+	const owner = await createOwner();
 
-	await importer.init();
-	try {
-		await importer.run();
-	} catch (error) {
-		expect(error.message).toBe('process.exit');
-	}
-	const after = await testDb.getAllWorkflows();
-	expect(after.length).toBe(2);
-	expect(after[0].name).toBe('active-workflow');
-	expect(after[0].active).toBe(false);
-	expect(after[1].name).toBe('inactive-workflow');
-	expect(after[1].active).toBe(false);
-	mockExit.mockRestore();
+	//
+	// ACT
+	//
+	await importWorkflow([
+		'--separate',
+		'--input=./test/integration/commands/importWorkflows/separate',
+	]);
+
+	//
+	// ASSERT
+	//
+	const after = {
+		workflows: await getAllWorkflows(),
+		sharings: await getAllSharedWorkflows(),
+	};
+	expect(after).toMatchObject({
+		workflows: [
+			expect.objectContaining({ name: 'active-workflow', active: false }),
+			expect.objectContaining({ name: 'inactive-workflow', active: false }),
+		],
+		sharings: [
+			expect.objectContaining({ workflowId: '998', userId: owner.id, role: 'workflow:owner' }),
+			expect.objectContaining({ workflowId: '999', userId: owner.id, role: 'workflow:owner' }),
+		],
+	});
 });
 
 test('import:workflow should import active workflow from combined file and deactivate it', async () => {
-	const config: Config.IConfig = new Config.Config({ root: __dirname });
-	const before = await testDb.getAllWorkflows();
-	expect(before.length).toBe(0);
-	const importer = new ImportWorkflowsCommand(
-		['--input=./test/integration/commands/importWorkflows/combined/combined.json'],
-		config,
+	//
+	// ARRANGE
+	//
+	const owner = await createOwner();
+
+	//
+	// ACT
+	//
+	await importWorkflow([
+		'--input=./test/integration/commands/importWorkflows/combined/combined.json',
+	]);
+
+	//
+	// ASSERT
+	//
+	const after = {
+		workflows: await getAllWorkflows(),
+		sharings: await getAllSharedWorkflows(),
+	};
+	expect(after).toMatchObject({
+		workflows: [
+			expect.objectContaining({ name: 'active-workflow', active: false }),
+			expect.objectContaining({ name: 'inactive-workflow', active: false }),
+		],
+		sharings: [
+			expect.objectContaining({ workflowId: '998', userId: owner.id, role: 'workflow:owner' }),
+			expect.objectContaining({ workflowId: '999', userId: owner.id, role: 'workflow:owner' }),
+		],
+	});
+});
+
+test('`import:workflow --userId ...` should fail if the workflow exists already and is owned by somebody else', async () => {
+	//
+	// ARRANGE
+	//
+	const owner = await createOwner();
+	const member = await createMember();
+
+	// Import workflow the first time, assigning it to a member.
+	await importWorkflow([
+		'--input=./test/integration/commands/importWorkflows/combined-with-update/original.json',
+		`--userId=${owner.id}`,
+	]);
+
+	const before = {
+		workflows: await getAllWorkflows(),
+		sharings: await getAllSharedWorkflows(),
+	};
+	// Make sure the workflow and sharing have been created.
+	expect(before).toMatchObject({
+		workflows: [expect.objectContaining({ id: '998', name: 'active-workflow' })],
+		sharings: [
+			expect.objectContaining({
+				workflowId: '998',
+				userId: owner.id,
+				role: 'workflow:owner',
+			}),
+		],
+	});
+
+	//
+	// ACT
+	//
+	// Import the same workflow again, with another name but the same ID, and try
+	// to assign it to the member.
+	await expect(
+		importWorkflow([
+			'--input=./test/integration/commands/importWorkflows/combined-with-update/updated.json',
+			`--userId=${member.id}`,
+		]),
+	).rejects.toThrowError(
+		`The credential with id "998" is already owned by the user with the id "${owner.id}". It can't be re-owned by the user with the id "${member.id}"`,
 	);
-	const mockExit = jest.spyOn(process, 'exit').mockImplementation((number) => {
-		throw new Error('process.exit');
+
+	//
+	// ASSERT
+	//
+	const after = {
+		workflows: await getAllWorkflows(),
+		sharings: await getAllSharedWorkflows(),
+	};
+	// Make sure there is no new sharing and that the name DID NOT change.
+	expect(after).toMatchObject({
+		workflows: [expect.objectContaining({ id: '998', name: 'active-workflow' })],
+		sharings: [
+			expect.objectContaining({
+				workflowId: '998',
+				userId: owner.id,
+				role: 'workflow:owner',
+			}),
+		],
 	});
+});
 
-	await importer.init();
-	try {
-		await importer.run();
-	} catch (error) {
-		expect(error.message).toBe('process.exit');
-	}
-	const after = await testDb.getAllWorkflows();
-	expect(after.length).toBe(2);
-	expect(after[0].name).toBe('active-workflow');
-	expect(after[0].active).toBe(false);
-	expect(after[1].name).toBe('inactive-workflow');
-	expect(after[1].active).toBe(false);
-	mockExit.mockRestore();
+test("only update the workflow, don't create or update the owner if `--userId` is not passed", async () => {
+	//
+	// ARRANGE
+	//
+	await createOwner();
+	const member = await createMember();
+
+	// Import workflow the first time, assigning it to a member.
+	await importWorkflow([
+		'--input=./test/integration/commands/importWorkflows/combined-with-update/original.json',
+		`--userId=${member.id}`,
+	]);
+
+	const before = {
+		workflows: await getAllWorkflows(),
+		sharings: await getAllSharedWorkflows(),
+	};
+	// Make sure the workflow and sharing have been created.
+	expect(before).toMatchObject({
+		workflows: [expect.objectContaining({ id: '998', name: 'active-workflow' })],
+		sharings: [
+			expect.objectContaining({
+				workflowId: '998',
+				userId: member.id,
+				role: 'workflow:owner',
+			}),
+		],
+	});
+
+	//
+	// ACT
+	//
+	// Import the same workflow again, with another name but the same ID.
+	await importWorkflow([
+		'--input=./test/integration/commands/importWorkflows/combined-with-update/updated.json',
+	]);
+
+	//
+	// ASSERT
+	//
+	const after = {
+		workflows: await getAllWorkflows(),
+		sharings: await getAllSharedWorkflows(),
+	};
+	// Make sure there is no new sharing and that the name changed.
+	expect(after).toMatchObject({
+		workflows: [expect.objectContaining({ id: '998', name: 'active-workflow updated' })],
+		sharings: [
+			expect.objectContaining({
+				workflowId: '998',
+				userId: member.id,
+				role: 'workflow:owner',
+			}),
+		],
+	});
 });
diff --git a/packages/cli/test/integration/commands/importCredentials/credentials-updated.json b/packages/cli/test/integration/commands/importCredentials/credentials-updated.json
new file mode 100644
index 0000000000000..67fad38ef79de
--- /dev/null
+++ b/packages/cli/test/integration/commands/importCredentials/credentials-updated.json
@@ -0,0 +1,14 @@
+[
+	{
+		"createdAt": "2023-07-10T14:50:49.193Z",
+		"updatedAt": "2023-10-27T13:34:42.917Z",
+		"id": "123",
+		"name": "cred-aws-prod",
+		"data": {
+			"region": "eu-west-1",
+			"accessKeyId": "999999999999",
+			"secretAccessKey": "aaaaaaaaaaaaa"
+		},
+		"type": "aws"
+	}
+]
diff --git a/packages/cli/test/integration/commands/importCredentials/credentials.json b/packages/cli/test/integration/commands/importCredentials/credentials.json
new file mode 100644
index 0000000000000..0e6269d2670f1
--- /dev/null
+++ b/packages/cli/test/integration/commands/importCredentials/credentials.json
@@ -0,0 +1,14 @@
+[
+	{
+		"createdAt": "2023-07-10T14:50:49.193Z",
+		"updatedAt": "2023-10-27T13:34:42.917Z",
+		"id": "123",
+		"name": "cred-aws-test",
+		"data": {
+			"region": "eu-west-1",
+			"accessKeyId": "999999999999",
+			"secretAccessKey": "aaaaaaaaaaaaa"
+		},
+		"type": "aws"
+	}
+]
diff --git a/packages/cli/test/integration/commands/importCredentials/separate/separate-credential.json b/packages/cli/test/integration/commands/importCredentials/separate/separate-credential.json
new file mode 100644
index 0000000000000..24ce8467ed757
--- /dev/null
+++ b/packages/cli/test/integration/commands/importCredentials/separate/separate-credential.json
@@ -0,0 +1,12 @@
+{
+	"createdAt": "2023-07-10T14:50:49.193Z",
+	"updatedAt": "2023-10-27T13:34:42.917Z",
+	"id": "123",
+	"name": "cred-aws-test",
+	"data": {
+		"region": "eu-west-1",
+		"accessKeyId": "999999999999",
+		"secretAccessKey": "aaaaaaaaaaaaa"
+	},
+	"type": "aws"
+}
diff --git a/packages/cli/test/integration/commands/importWorkflows/combined-with-update/original.json b/packages/cli/test/integration/commands/importWorkflows/combined-with-update/original.json
new file mode 100644
index 0000000000000..bbef96a0a9e07
--- /dev/null
+++ b/packages/cli/test/integration/commands/importWorkflows/combined-with-update/original.json
@@ -0,0 +1,81 @@
+[
+	{
+		"name": "active-workflow",
+		"nodes": [
+			{
+				"parameters": {
+					"path": "e20b4873-fcf7-4bce-88fc-a1a56d66b138",
+					"responseMode": "responseNode",
+					"options": {}
+				},
+				"id": "c26d8782-bd57-43d0-86dc-0c618a7e4024",
+				"name": "Webhook",
+				"type": "n8n-nodes-base.webhook",
+				"typeVersion": 1,
+				"position": [800, 580],
+				"webhookId": "e20b4873-fcf7-4bce-88fc-a1a56d66b138"
+			},
+			{
+				"parameters": {
+					"values": {
+						"boolean": [
+							{
+								"name": "hooked",
+								"value": true
+							}
+						]
+					},
+					"options": {}
+				},
+				"id": "9701b1ef-9ab0-432a-b086-cf76981b097d",
+				"name": "Set",
+				"type": "n8n-nodes-base.set",
+				"typeVersion": 1,
+				"position": [1020, 580]
+			},
+			{
+				"parameters": {
+					"options": {}
+				},
+				"id": "d0f086b8-c2b2-4404-b347-95d3f91e555a",
+				"name": "Respond to Webhook",
+				"type": "n8n-nodes-base.respondToWebhook",
+				"typeVersion": 1,
+				"position": [1240, 580]
+			}
+		],
+		"pinData": {},
+		"connections": {
+			"Webhook": {
+				"main": [
+					[
+						{
+							"node": "Set",
+							"type": "main",
+							"index": 0
+						}
+					]
+				]
+			},
+			"Set": {
+				"main": [
+					[
+						{
+							"node": "Respond to Webhook",
+							"type": "main",
+							"index": 0
+						}
+					]
+				]
+			}
+		},
+		"active": true,
+		"settings": {},
+		"versionId": "40a70df1-740f-47e7-8e16-50a0bcd5b70f",
+		"id": "998",
+		"meta": {
+			"instanceId": "95977dc4769098fc608439605527ee75d23f10d551aed6b87a3eea1a252c0ba9"
+		},
+		"tags": []
+	}
+]
diff --git a/packages/cli/test/integration/commands/importWorkflows/combined-with-update/updated.json b/packages/cli/test/integration/commands/importWorkflows/combined-with-update/updated.json
new file mode 100644
index 0000000000000..fc1ddbf3ead48
--- /dev/null
+++ b/packages/cli/test/integration/commands/importWorkflows/combined-with-update/updated.json
@@ -0,0 +1,81 @@
+[
+	{
+		"name": "active-workflow updated",
+		"nodes": [
+			{
+				"parameters": {
+					"path": "e20b4873-fcf7-4bce-88fc-a1a56d66b138",
+					"responseMode": "responseNode",
+					"options": {}
+				},
+				"id": "c26d8782-bd57-43d0-86dc-0c618a7e4024",
+				"name": "Webhook",
+				"type": "n8n-nodes-base.webhook",
+				"typeVersion": 1,
+				"position": [800, 580],
+				"webhookId": "e20b4873-fcf7-4bce-88fc-a1a56d66b138"
+			},
+			{
+				"parameters": {
+					"values": {
+						"boolean": [
+							{
+								"name": "hooked",
+								"value": true
+							}
+						]
+					},
+					"options": {}
+				},
+				"id": "9701b1ef-9ab0-432a-b086-cf76981b097d",
+				"name": "Set",
+				"type": "n8n-nodes-base.set",
+				"typeVersion": 1,
+				"position": [1020, 580]
+			},
+			{
+				"parameters": {
+					"options": {}
+				},
+				"id": "d0f086b8-c2b2-4404-b347-95d3f91e555a",
+				"name": "Respond to Webhook",
+				"type": "n8n-nodes-base.respondToWebhook",
+				"typeVersion": 1,
+				"position": [1240, 580]
+			}
+		],
+		"pinData": {},
+		"connections": {
+			"Webhook": {
+				"main": [
+					[
+						{
+							"node": "Set",
+							"type": "main",
+							"index": 0
+						}
+					]
+				]
+			},
+			"Set": {
+				"main": [
+					[
+						{
+							"node": "Respond to Webhook",
+							"type": "main",
+							"index": 0
+						}
+					]
+				]
+			}
+		},
+		"active": true,
+		"settings": {},
+		"versionId": "40a70df1-740f-47e7-8e16-50a0bcd5b70f",
+		"id": "998",
+		"meta": {
+			"instanceId": "95977dc4769098fc608439605527ee75d23f10d551aed6b87a3eea1a252c0ba9"
+		},
+		"tags": []
+	}
+]
diff --git a/packages/cli/test/integration/commands/reset.cmd.test.ts b/packages/cli/test/integration/commands/reset.cmd.test.ts
index 49cc20a733de4..fd32fee1fcc0d 100644
--- a/packages/cli/test/integration/commands/reset.cmd.test.ts
+++ b/packages/cli/test/integration/commands/reset.cmd.test.ts
@@ -1,21 +1,19 @@
-import * as Db from '@/Db';
 import { Reset } from '@/commands/user-management/reset';
-import type { Role } from '@db/entities/Role';
-import * as testDb from '../shared/testDb';
-import { mockInstance } from '../shared/utils';
 import { InternalHooks } from '@/InternalHooks';
 import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
 import { NodeTypes } from '@/NodeTypes';
+import Container from 'typedi';
+import { UserRepository } from '@db/repositories/user.repository';
 
-let globalOwnerRole: Role;
+import { mockInstance } from '../../shared/mocking';
+import * as testDb from '../shared/testDb';
+import { createUser } from '../shared/db/users';
 
 beforeAll(async () => {
 	mockInstance(InternalHooks);
 	mockInstance(LoadNodesAndCredentials);
 	mockInstance(NodeTypes);
 	await testDb.init();
-
-	globalOwnerRole = await testDb.getGlobalOwnerRole();
 });
 
 beforeEach(async () => {
@@ -26,12 +24,13 @@ afterAll(async () => {
 	await testDb.terminate();
 });
 
+// eslint-disable-next-line n8n-local-rules/no-skipped-tests
 test.skip('user-management:reset should reset DB to default user state', async () => {
-	await testDb.createUser({ globalRole: globalOwnerRole });
+	await createUser({ role: 'global:owner' });
 
 	await Reset.run();
 
-	const user = await Db.collections.User.findOneBy({ globalRoleId: globalOwnerRole.id });
+	const user = await Container.get(UserRepository).findOneBy({ role: 'global:owner' });
 
 	if (!user) {
 		fail('No owner found after DB reset to default user state');
@@ -41,7 +40,5 @@ test.skip('user-management:reset should reset DB to default user state', async (
 	expect(user.firstName).toBeNull();
 	expect(user.lastName).toBeNull();
 	expect(user.password).toBeNull();
-	expect(user.resetPasswordToken).toBeNull();
-	expect(user.resetPasswordTokenExpiration).toBeNull();
 	expect(user.personalizationAnswers).toBeNull();
 });
diff --git a/packages/cli/test/integration/commands/update/workflow.test.ts b/packages/cli/test/integration/commands/update/workflow.test.ts
new file mode 100644
index 0000000000000..922eaccb386ed
--- /dev/null
+++ b/packages/cli/test/integration/commands/update/workflow.test.ts
@@ -0,0 +1,126 @@
+import { Config } from '@oclif/core';
+import { InternalHooks } from '@/InternalHooks';
+import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
+import { UpdateWorkflowCommand } from '@/commands/update/workflow';
+
+import * as testDb from '../../shared/testDb';
+import { createWorkflowWithTrigger, getAllWorkflows } from '../../shared/db/workflows';
+import { mockInstance } from '../../../shared/mocking';
+
+beforeAll(async () => {
+	mockInstance(InternalHooks);
+	mockInstance(LoadNodesAndCredentials);
+	await testDb.init();
+});
+
+beforeEach(async () => {
+	await testDb.truncate(['Workflow']);
+});
+
+afterAll(async () => {
+	await testDb.terminate();
+});
+
+test('update:workflow can activate all workflows', async () => {
+	//
+	// ARRANGE
+	//
+	const workflows = await Promise.all([
+		createWorkflowWithTrigger({}),
+		createWorkflowWithTrigger({}),
+	]);
+	expect(workflows).toMatchObject([{ active: false }, { active: false }]);
+
+	//
+	// ACT
+	//
+	const config = new Config({ root: __dirname });
+	const updater = new UpdateWorkflowCommand(['--all', '--active=true'], config);
+	await updater.init();
+	await updater.run();
+
+	//
+	// ASSERT
+	//
+	const after = await getAllWorkflows();
+	expect(after).toMatchObject([{ active: true }, { active: true }]);
+});
+
+test('update:workflow can deactivate all workflows', async () => {
+	//
+	// ARRANGE
+	//
+	const workflows = await Promise.all([
+		createWorkflowWithTrigger({ active: true }),
+		createWorkflowWithTrigger({ active: true }),
+	]);
+	expect(workflows).toMatchObject([{ active: true }, { active: true }]);
+
+	//
+	// ACT
+	//
+	const config = new Config({ root: __dirname });
+	const updater = new UpdateWorkflowCommand(['--all', '--active=false'], config);
+	await updater.init();
+	await updater.run();
+
+	//
+	// ASSERT
+	//
+	const after = await getAllWorkflows();
+	expect(after).toMatchObject([{ active: false }, { active: false }]);
+});
+
+test('update:workflow can activate a specific workflow', async () => {
+	//
+	// ARRANGE
+	//
+	const workflows = (
+		await Promise.all([
+			createWorkflowWithTrigger({ active: false }),
+			createWorkflowWithTrigger({ active: false }),
+		])
+	).sort((wf1, wf2) => wf1.id.localeCompare(wf2.id));
+	expect(workflows).toMatchObject([{ active: false }, { active: false }]);
+
+	//
+	// ACT
+	//
+	const config = new Config({ root: __dirname });
+	const updater = new UpdateWorkflowCommand([`--id=${workflows[0].id}`, '--active=true'], config);
+	await updater.init();
+	await updater.run();
+
+	//
+	// ASSERT
+	//
+	const after = (await getAllWorkflows()).sort((wf1, wf2) => wf1.id.localeCompare(wf2.id));
+	expect(after).toMatchObject([{ active: true }, { active: false }]);
+});
+
+test('update:workflow can deactivate a specific workflow', async () => {
+	//
+	// ARRANGE
+	//
+	const workflows = (
+		await Promise.all([
+			createWorkflowWithTrigger({ active: true }),
+			createWorkflowWithTrigger({ active: true }),
+		])
+	).sort((wf1, wf2) => wf1.id.localeCompare(wf2.id));
+	expect(workflows).toMatchObject([{ active: true }, { active: true }]);
+
+	//
+	// ACT
+	//
+	const config = new Config({ root: __dirname });
+	const updater = new UpdateWorkflowCommand([`--id=${workflows[0].id}`, '--active=false'], config);
+	await updater.init();
+	await updater.run();
+
+	//
+	// ASSERT
+	//
+	const after = (await getAllWorkflows()).sort((wf1, wf2) => wf1.id.localeCompare(wf2.id));
+	expect(after).toMatchObject([{ active: false }, { active: true }]);
+});
diff --git a/packages/cli/test/integration/commands/worker.cmd.test.ts b/packages/cli/test/integration/commands/worker.cmd.test.ts
new file mode 100644
index 0000000000000..4bbb5c5ecbdcb
--- /dev/null
+++ b/packages/cli/test/integration/commands/worker.cmd.test.ts
@@ -0,0 +1,85 @@
+import { Config } from '@oclif/core';
+import { Worker } from '@/commands/worker';
+import config from '@/config';
+import { Telemetry } from '@/telemetry';
+import { ExternalSecretsManager } from '@/ExternalSecrets/ExternalSecretsManager.ee';
+import { BinaryDataService } from 'n8n-core';
+import { CacheService } from '@/services/cache/cache.service';
+import { RedisServicePubSubPublisher } from '@/services/redis/RedisServicePubSubPublisher';
+import { RedisServicePubSubSubscriber } from '@/services/redis/RedisServicePubSubSubscriber';
+import { MessageEventBus } from '@/eventbus/MessageEventBus/MessageEventBus';
+import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
+import { CredentialTypes } from '@/CredentialTypes';
+import { NodeTypes } from '@/NodeTypes';
+import { InternalHooks } from '@/InternalHooks';
+import { PostHogClient } from '@/posthog';
+import { RedisService } from '@/services/redis.service';
+import { OrchestrationHandlerWorkerService } from '@/services/orchestration/worker/orchestration.handler.worker.service';
+import { OrchestrationWorkerService } from '@/services/orchestration/worker/orchestration.worker.service';
+import { OrchestrationService } from '@/services/orchestration.service';
+
+import * as testDb from '../shared/testDb';
+import { mockInstance } from '../../shared/mocking';
+
+const oclifConfig = new Config({ root: __dirname });
+
+beforeAll(async () => {
+	config.set('executions.mode', 'queue');
+	config.set('binaryDataManager.availableModes', 'filesystem');
+	mockInstance(Telemetry);
+	mockInstance(PostHogClient);
+	mockInstance(InternalHooks);
+	mockInstance(CacheService);
+	mockInstance(ExternalSecretsManager);
+	mockInstance(BinaryDataService);
+	mockInstance(MessageEventBus);
+	mockInstance(LoadNodesAndCredentials);
+	mockInstance(CredentialTypes);
+	mockInstance(NodeTypes);
+	mockInstance(RedisService);
+	mockInstance(RedisServicePubSubPublisher);
+	mockInstance(RedisServicePubSubSubscriber);
+	mockInstance(OrchestrationService);
+	await testDb.init();
+});
+
+afterAll(async () => {
+	await testDb.terminate();
+});
+
+test('worker initializes all its components', async () => {
+	const worker = new Worker([], oclifConfig);
+
+	jest.spyOn(worker, 'init');
+	jest.spyOn(worker, 'initLicense').mockImplementation(async () => {});
+	jest.spyOn(worker, 'initBinaryDataService').mockImplementation(async () => {});
+	jest.spyOn(worker, 'initExternalHooks').mockImplementation(async () => {});
+	jest.spyOn(worker, 'initExternalSecrets').mockImplementation(async () => {});
+	jest.spyOn(worker, 'initEventBus').mockImplementation(async () => {});
+	jest.spyOn(worker, 'initOrchestration');
+	jest
+		.spyOn(OrchestrationWorkerService.prototype, 'publishToEventLog')
+		.mockImplementation(async () => {});
+	jest
+		.spyOn(OrchestrationHandlerWorkerService.prototype, 'initSubscriber')
+		.mockImplementation(async () => {});
+	jest.spyOn(RedisServicePubSubPublisher.prototype, 'init').mockImplementation(async () => {});
+	jest.spyOn(worker, 'initQueue').mockImplementation(async () => {});
+
+	await worker.init();
+
+	expect(worker.queueModeId).toBeDefined();
+	expect(worker.queueModeId).toContain('worker');
+	expect(worker.queueModeId.length).toBeGreaterThan(15);
+	expect(worker.initLicense).toHaveBeenCalledTimes(1);
+	expect(worker.initBinaryDataService).toHaveBeenCalledTimes(1);
+	expect(worker.initExternalHooks).toHaveBeenCalledTimes(1);
+	expect(worker.initExternalSecrets).toHaveBeenCalledTimes(1);
+	expect(worker.initEventBus).toHaveBeenCalledTimes(1);
+	expect(worker.initOrchestration).toHaveBeenCalledTimes(1);
+	expect(OrchestrationHandlerWorkerService.prototype.initSubscriber).toHaveBeenCalledTimes(1);
+	expect(OrchestrationWorkerService.prototype.publishToEventLog).toHaveBeenCalledTimes(1);
+	expect(worker.initQueue).toHaveBeenCalledTimes(1);
+
+	jest.restoreAllMocks();
+});
diff --git a/packages/cli/test/integration/community-packages.api.test.ts b/packages/cli/test/integration/community-packages.api.test.ts
new file mode 100644
index 0000000000000..03fd43f456824
--- /dev/null
+++ b/packages/cli/test/integration/community-packages.api.test.ts
@@ -0,0 +1,247 @@
+import path from 'path';
+import type { SuperAgentTest } from 'supertest';
+
+import type { InstalledPackages } from '@db/entities/InstalledPackages';
+import type { InstalledNodes } from '@db/entities/InstalledNodes';
+import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
+import { CommunityPackagesService } from '@/services/communityPackages.service';
+
+import { mockInstance } from '../shared/mocking';
+import { COMMUNITY_PACKAGE_VERSION } from './shared/constants';
+import { setupTestServer, mockPackage, mockNode, mockPackageName } from './shared/utils';
+import { createOwner } from './shared/db/users';
+
+const communityPackagesService = mockInstance(CommunityPackagesService, {
+	hasMissingPackages: false,
+});
+mockInstance(LoadNodesAndCredentials);
+
+const testServer = setupTestServer({ endpointGroups: ['community-packages'] });
+
+const commonUpdatesProps = {
+	createdAt: new Date(),
+	updatedAt: new Date(),
+	installedVersion: COMMUNITY_PACKAGE_VERSION.CURRENT,
+	updateAvailable: COMMUNITY_PACKAGE_VERSION.UPDATED,
+};
+
+const parsedNpmPackageName = {
+	packageName: 'test',
+	rawString: 'test',
+};
+
+let authAgent: SuperAgentTest;
+
+beforeAll(async () => {
+	const ownerShell = await createOwner();
+	authAgent = testServer.authAgentFor(ownerShell);
+});
+
+beforeEach(() => {
+	jest.resetAllMocks();
+});
+
+describe('GET /community-packages', () => {
+	test('should respond 200 if no nodes are installed', async () => {
+		communityPackagesService.getAllInstalledPackages.mockResolvedValue([]);
+		const {
+			body: { data },
+		} = await authAgent.get('/community-packages').expect(200);
+
+		expect(data).toHaveLength(0);
+	});
+
+	test('should return list of one installed package and node', async () => {
+		const pkg = mockPackage();
+		const node = mockNode(pkg.packageName);
+		pkg.installedNodes = [node];
+		communityPackagesService.getAllInstalledPackages.mockResolvedValue([pkg]);
+		communityPackagesService.matchPackagesWithUpdates.mockReturnValue([pkg]);
+
+		const {
+			body: { data },
+		} = await authAgent.get('/community-packages').expect(200);
+
+		expect(data).toHaveLength(1);
+		expect(data[0].installedNodes).toHaveLength(1);
+	});
+
+	test('should return list of multiple installed packages and nodes', async () => {
+		const pkgA = mockPackage();
+		const nodeA = mockNode(pkgA.packageName);
+
+		const pkgB = mockPackage();
+		const nodeB = mockNode(pkgB.packageName);
+		const nodeC = mockNode(pkgB.packageName);
+
+		communityPackagesService.getAllInstalledPackages.mockResolvedValue([pkgA, pkgB]);
+
+		communityPackagesService.matchPackagesWithUpdates.mockReturnValue([
+			{
+				...commonUpdatesProps,
+				packageName: pkgA.packageName,
+				installedNodes: [nodeA],
+			},
+			{
+				...commonUpdatesProps,
+				packageName: pkgB.packageName,
+				installedNodes: [nodeB, nodeC],
+			},
+		]);
+
+		const {
+			body: { data },
+		} = await authAgent.get('/community-packages').expect(200);
+
+		expect(data).toHaveLength(2);
+
+		const allNodes = data.reduce(
+			(acc: InstalledNodes[], cur: InstalledPackages) => acc.concat(cur.installedNodes),
+			[],
+		);
+
+		expect(allNodes).toHaveLength(3);
+	});
+
+	test('should not check for updates if no packages installed', async () => {
+		await authAgent.get('/community-packages');
+
+		expect(communityPackagesService.executeNpmCommand).not.toHaveBeenCalled();
+	});
+
+	test('should check for updates if packages installed', async () => {
+		communityPackagesService.getAllInstalledPackages.mockResolvedValue([mockPackage()]);
+
+		await authAgent.get('/community-packages').expect(200);
+
+		const args = ['npm outdated --json', { doNotHandleError: true }];
+
+		expect(communityPackagesService.executeNpmCommand).toHaveBeenCalledWith(...args);
+	});
+
+	test('should report package updates if available', async () => {
+		const pkg = mockPackage();
+		communityPackagesService.getAllInstalledPackages.mockResolvedValue([pkg]);
+
+		communityPackagesService.executeNpmCommand.mockImplementation(() => {
+			throw {
+				code: 1,
+				stdout: JSON.stringify({
+					[pkg.packageName]: {
+						current: COMMUNITY_PACKAGE_VERSION.CURRENT,
+						wanted: COMMUNITY_PACKAGE_VERSION.CURRENT,
+						latest: COMMUNITY_PACKAGE_VERSION.UPDATED,
+						location: path.join('node_modules', pkg.packageName),
+					},
+				}),
+			};
+		});
+
+		communityPackagesService.matchPackagesWithUpdates.mockReturnValue([
+			{
+				packageName: 'test',
+				installedNodes: [],
+				...commonUpdatesProps,
+			},
+		]);
+
+		const {
+			body: { data },
+		} = await authAgent.get('/community-packages').expect(200);
+
+		const [returnedPkg] = data;
+
+		expect(returnedPkg.installedVersion).toBe(COMMUNITY_PACKAGE_VERSION.CURRENT);
+		expect(returnedPkg.updateAvailable).toBe(COMMUNITY_PACKAGE_VERSION.UPDATED);
+	});
+});
+
+describe('POST /community-packages', () => {
+	test('should reject if package name is missing', async () => {
+		await authAgent.post('/community-packages').expect(400);
+	});
+
+	test('should reject if package is duplicate', async () => {
+		communityPackagesService.findInstalledPackage.mockResolvedValue(mockPackage());
+		communityPackagesService.isPackageInstalled.mockResolvedValue(true);
+		communityPackagesService.hasPackageLoaded.mockReturnValue(true);
+		communityPackagesService.parseNpmPackageName.mockReturnValue(parsedNpmPackageName);
+
+		const {
+			body: { message },
+		} = await authAgent.post('/community-packages').send({ name: mockPackageName() }).expect(400);
+
+		expect(message).toContain('already installed');
+	});
+
+	test('should allow installing packages that could not be loaded', async () => {
+		communityPackagesService.findInstalledPackage.mockResolvedValue(mockPackage());
+		communityPackagesService.hasPackageLoaded.mockReturnValue(false);
+		communityPackagesService.checkNpmPackageStatus.mockResolvedValue({ status: 'OK' });
+		communityPackagesService.parseNpmPackageName.mockReturnValue(parsedNpmPackageName);
+		communityPackagesService.installNpmModule.mockResolvedValue(mockPackage());
+
+		await authAgent.post('/community-packages').send({ name: mockPackageName() }).expect(200);
+
+		expect(communityPackagesService.removePackageFromMissingList).toHaveBeenCalled();
+	});
+
+	test('should not install a banned package', async () => {
+		communityPackagesService.checkNpmPackageStatus.mockResolvedValue({ status: 'Banned' });
+		communityPackagesService.parseNpmPackageName.mockReturnValue(parsedNpmPackageName);
+
+		const {
+			body: { message },
+		} = await authAgent.post('/community-packages').send({ name: mockPackageName() }).expect(400);
+
+		expect(message).toContain('banned');
+	});
+});
+
+describe('DELETE /community-packages', () => {
+	test('should not delete if package name is empty', async () => {
+		await authAgent.delete('/community-packages').expect(400);
+	});
+
+	test('should reject if package is not installed', async () => {
+		const {
+			body: { message },
+		} = await authAgent
+			.delete('/community-packages')
+			.query({ name: mockPackageName() })
+			.expect(400);
+
+		expect(message).toContain('not installed');
+	});
+
+	test('should uninstall package', async () => {
+		communityPackagesService.findInstalledPackage.mockResolvedValue(mockPackage());
+
+		await authAgent.delete('/community-packages').query({ name: mockPackageName() }).expect(200);
+
+		expect(communityPackagesService.removeNpmModule).toHaveBeenCalledTimes(1);
+	});
+});
+
+describe('PATCH /community-packages', () => {
+	test('should reject if package name is empty', async () => {
+		await authAgent.patch('/community-packages').expect(400);
+	});
+
+	test('should reject if package is not installed', async () => {
+		const {
+			body: { message },
+		} = await authAgent.patch('/community-packages').send({ name: mockPackageName() }).expect(400);
+
+		expect(message).toContain('not installed');
+	});
+
+	test('should update a package', async () => {
+		communityPackagesService.findInstalledPackage.mockResolvedValue(mockPackage());
+		communityPackagesService.parseNpmPackageName.mockReturnValue(parsedNpmPackageName);
+
+		await authAgent.patch('/community-packages').send({ name: mockPackageName() });
+
+		expect(communityPackagesService.updateNpmModule).toHaveBeenCalledTimes(1);
+	});
+});
diff --git a/packages/cli/test/integration/controllers/invitation/assertions.ts b/packages/cli/test/integration/controllers/invitation/assertions.ts
new file mode 100644
index 0000000000000..349eac4e8ee64
--- /dev/null
+++ b/packages/cli/test/integration/controllers/invitation/assertions.ts
@@ -0,0 +1,29 @@
+import validator from 'validator';
+import type { User } from '@/databases/entities/User';
+import type { UserInvitationResult } from '../../shared/utils/users';
+
+export function assertReturnedUserProps(user: User) {
+	expect(validator.isUUID(user.id)).toBe(true);
+	expect(user.email).toBeDefined();
+	expect(user.personalizationAnswers).toBeNull();
+	expect(user.password).toBeUndefined();
+	expect(user.isPending).toBe(false);
+	expect(user.apiKey).not.toBeDefined();
+	expect(user.globalScopes).toBeDefined();
+	expect(user.globalScopes).not.toHaveLength(0);
+}
+
+export const assertStoredUserProps = (user: User) => {
+	expect(user.firstName).toBeNull();
+	expect(user.lastName).toBeNull();
+	expect(user.personalizationAnswers).toBeNull();
+	expect(user.password).toBeNull();
+	expect(user.isPending).toBe(true);
+};
+
+export const assertUserInviteResult = (data: UserInvitationResult) => {
+	expect(validator.isUUID(data.user.id)).toBe(true);
+	expect(data.user.inviteAcceptUrl).toBeUndefined();
+	expect(data.user.email).toBeDefined();
+	expect(data.user.emailSent).toBe(true);
+};
diff --git a/packages/cli/test/integration/controllers/invitation/invitation.controller.integration.test.ts b/packages/cli/test/integration/controllers/invitation/invitation.controller.integration.test.ts
new file mode 100644
index 0000000000000..b6371fdf9e361
--- /dev/null
+++ b/packages/cli/test/integration/controllers/invitation/invitation.controller.integration.test.ts
@@ -0,0 +1,412 @@
+import { mocked } from 'jest-mock';
+import Container from 'typedi';
+import { Not } from '@n8n/typeorm';
+
+import { InternalHooks } from '@/InternalHooks';
+import { ExternalHooks } from '@/ExternalHooks';
+import { UserManagementMailer } from '@/UserManagement/email';
+import { UserRepository } from '@/databases/repositories/user.repository';
+import { PasswordUtility } from '@/services/password.utility';
+
+import {
+	randomEmail,
+	randomInvalidPassword,
+	randomName,
+	randomValidPassword,
+} from '../../shared/random';
+import { createMember, createOwner, createUserShell } from '../../shared/db/users';
+import { mockInstance } from '../../../shared/mocking';
+import * as utils from '../../shared/utils';
+
+import {
+	assertReturnedUserProps,
+	assertStoredUserProps,
+	assertUserInviteResult,
+} from './assertions';
+
+import type { User } from '@/databases/entities/User';
+import type { UserInvitationResult } from '../../shared/utils/users';
+
+describe('InvitationController', () => {
+	const mailer = mockInstance(UserManagementMailer);
+	const externalHooks = mockInstance(ExternalHooks);
+	const internalHooks = mockInstance(InternalHooks);
+
+	const testServer = utils.setupTestServer({ endpointGroups: ['invitations'] });
+
+	let instanceOwner: User;
+	let userRepository: UserRepository;
+
+	beforeAll(async () => {
+		userRepository = Container.get(UserRepository);
+		instanceOwner = await createOwner();
+	});
+
+	beforeEach(async () => {
+		jest.clearAllMocks();
+		await userRepository.delete({ role: Not('global:owner') });
+	});
+
+	afterEach(() => {
+		jest.restoreAllMocks();
+	});
+
+	describe('POST /invitations/:id/accept', () => {
+		test('should fill out a member shell', async () => {
+			const memberShell = await createUserShell('global:member');
+
+			const memberProps = {
+				inviterId: instanceOwner.id,
+				firstName: randomName(),
+				lastName: randomName(),
+				password: randomValidPassword(),
+			};
+
+			const response = await testServer.authlessAgent
+				.post(`/invitations/${memberShell.id}/accept`)
+				.send(memberProps)
+				.expect(200);
+
+			const { data: returnedMember } = response.body;
+
+			assertReturnedUserProps(returnedMember);
+
+			expect(returnedMember.firstName).toBe(memberProps.firstName);
+			expect(returnedMember.lastName).toBe(memberProps.lastName);
+			expect(returnedMember.role).toBe('global:member');
+			expect(utils.getAuthToken(response)).toBeDefined();
+
+			const storedMember = await userRepository.findOneByOrFail({ id: returnedMember.id });
+
+			expect(storedMember.firstName).toBe(memberProps.firstName);
+			expect(storedMember.lastName).toBe(memberProps.lastName);
+			expect(storedMember.password).not.toBe(memberProps.password);
+		});
+
+		test('should fill out an admin shell', async () => {
+			const adminShell = await createUserShell('global:admin');
+
+			const memberProps = {
+				inviterId: instanceOwner.id,
+				firstName: randomName(),
+				lastName: randomName(),
+				password: randomValidPassword(),
+			};
+
+			const response = await testServer.authlessAgent
+				.post(`/invitations/${adminShell.id}/accept`)
+				.send(memberProps)
+				.expect(200);
+
+			const { data: returnedAdmin } = response.body;
+
+			assertReturnedUserProps(returnedAdmin);
+
+			expect(returnedAdmin.firstName).toBe(memberProps.firstName);
+			expect(returnedAdmin.lastName).toBe(memberProps.lastName);
+			expect(returnedAdmin.role).toBe('global:admin');
+			expect(utils.getAuthToken(response)).toBeDefined();
+
+			const storedAdmin = await userRepository.findOneByOrFail({ id: returnedAdmin.id });
+
+			expect(storedAdmin.firstName).toBe(memberProps.firstName);
+			expect(storedAdmin.lastName).toBe(memberProps.lastName);
+			expect(storedAdmin.password).not.toBe(memberProps.password);
+		});
+
+		test('should fail with invalid payloads', async () => {
+			const memberShell = await userRepository.save({
+				email: randomEmail(),
+				role: 'global:member',
+			});
+
+			const invalidPaylods = [
+				{
+					firstName: randomName(),
+					lastName: randomName(),
+					password: randomValidPassword(),
+				},
+				{
+					inviterId: instanceOwner.id,
+					firstName: randomName(),
+					password: randomValidPassword(),
+				},
+				{
+					inviterId: instanceOwner.id,
+					firstName: randomName(),
+					password: randomValidPassword(),
+				},
+				{
+					inviterId: instanceOwner.id,
+					firstName: randomName(),
+					lastName: randomName(),
+				},
+				{
+					inviterId: instanceOwner.id,
+					firstName: randomName(),
+					lastName: randomName(),
+					password: randomInvalidPassword(),
+				},
+			];
+
+			for (const payload of invalidPaylods) {
+				await testServer.authlessAgent
+					.post(`/invitations/${memberShell.id}/accept`)
+					.send(payload)
+					.expect(400);
+
+				const storedMemberShell = await userRepository.findOneByOrFail({
+					email: memberShell.email,
+				});
+
+				expect(storedMemberShell.firstName).toBeNull();
+				expect(storedMemberShell.lastName).toBeNull();
+				expect(storedMemberShell.password).toBeNull();
+			}
+		});
+
+		test('should fail with already accepted invite', async () => {
+			const member = await createMember();
+
+			const memberProps = {
+				inviterId: instanceOwner.id,
+				firstName: randomName(),
+				lastName: randomName(),
+				password: randomValidPassword(),
+			};
+
+			await testServer.authlessAgent
+				.post(`/invitations/${member.id}/accept`)
+				.send(memberProps)
+				.expect(400);
+
+			const storedMember = await userRepository.findOneByOrFail({
+				email: member.email,
+			});
+
+			expect(storedMember.firstName).not.toBe(memberProps.firstName);
+			expect(storedMember.lastName).not.toBe(memberProps.lastName);
+			expect(storedMember.password).not.toBe(memberProps.password);
+
+			const comparisonResult = await Container.get(PasswordUtility).compare(
+				member.password,
+				storedMember.password,
+			);
+
+			expect(comparisonResult).toBe(false);
+		});
+	});
+
+	describe('POST /invitations', () => {
+		type InvitationResponse = { body: { data: UserInvitationResult[] } };
+
+		test('should fail with invalid payloads', async () => {
+			const invalidPayloads = [
+				randomEmail(),
+				[randomEmail()],
+				{},
+				[{ name: randomName() }],
+				[{ email: randomName() }],
+			];
+
+			for (const invalidPayload of invalidPayloads) {
+				await testServer
+					.authAgentFor(instanceOwner)
+					.post('/invitations')
+					.send(invalidPayload)
+					.expect(400);
+
+				await expect(userRepository.count()).resolves.toBe(2); // DB unaffected
+			}
+		});
+
+		test('should return 200 on empty payload', async () => {
+			const response = await testServer
+				.authAgentFor(instanceOwner)
+				.post('/invitations')
+				.send([])
+				.expect(200);
+
+			expect(response.body.data).toStrictEqual([]);
+
+			await expect(userRepository.count()).resolves.toBe(2); // DB unaffected
+		});
+
+		test('should return 200 if emailing is not set up', async () => {
+			mailer.invite.mockResolvedValue({ emailSent: false });
+
+			const response = await testServer
+				.authAgentFor(instanceOwner)
+				.post('/invitations')
+				.send([{ email: randomEmail() }]);
+
+			expect(response.body.data).toBeInstanceOf(Array);
+			expect(response.body.data.length).toBe(1);
+
+			const { user } = response.body.data[0];
+
+			expect(user.inviteAcceptUrl).toBeDefined();
+
+			const inviteUrl = new URL(user.inviteAcceptUrl);
+
+			expect(inviteUrl.searchParams.get('inviterId')).toBe(instanceOwner.id);
+			expect(inviteUrl.searchParams.get('inviteeId')).toBe(user.id);
+		});
+
+		test('should create member shell', async () => {
+			mailer.invite.mockResolvedValue({ emailSent: false });
+
+			const response: InvitationResponse = await testServer
+				.authAgentFor(instanceOwner)
+				.post('/invitations')
+				.send([{ email: randomEmail() }])
+				.expect(200);
+
+			const [result] = response.body.data;
+
+			const storedUser = await userRepository.findOneByOrFail({
+				id: result.user.id,
+			});
+
+			assertStoredUserProps(storedUser);
+		});
+
+		test('should create admin shell when advanced permissions is licensed', async () => {
+			testServer.license.enable('feat:advancedPermissions');
+
+			mailer.invite.mockResolvedValue({ emailSent: false });
+
+			const response: InvitationResponse = await testServer
+				.authAgentFor(instanceOwner)
+				.post('/invitations')
+				.send([{ email: randomEmail(), role: 'global:admin' }])
+				.expect(200);
+
+			const [result] = response.body.data;
+
+			const storedUser = await userRepository.findOneByOrFail({
+				id: result.user.id,
+			});
+
+			assertStoredUserProps(storedUser);
+		});
+
+		test('should reinvite member when sharing is licensed', async () => {
+			testServer.license.enable('feat:sharing');
+
+			mailer.invite.mockResolvedValue({ emailSent: false });
+
+			await testServer
+				.authAgentFor(instanceOwner)
+				.post('/invitations')
+				.send([{ email: randomEmail(), role: 'global:member' }]);
+
+			await testServer
+				.authAgentFor(instanceOwner)
+				.post('/invitations')
+				.send([{ email: randomEmail(), role: 'global:member' }])
+				.expect(200);
+		});
+
+		test('should reinvite admin when advanced permissions is licensed', async () => {
+			testServer.license.enable('feat:advancedPermissions');
+
+			mailer.invite.mockResolvedValue({ emailSent: false });
+
+			await testServer
+				.authAgentFor(instanceOwner)
+				.post('/invitations')
+				.send([{ email: randomEmail(), role: 'global:admin' }]);
+
+			await testServer
+				.authAgentFor(instanceOwner)
+				.post('/invitations')
+				.send([{ email: randomEmail(), role: 'global:admin' }])
+				.expect(200);
+		});
+
+		test('should return 403 on creating admin shell when advanced permissions is unlicensed', async () => {
+			testServer.license.disable('feat:advancedPermissions');
+
+			mailer.invite.mockResolvedValue({ emailSent: false });
+
+			await testServer
+				.authAgentFor(instanceOwner)
+				.post('/invitations')
+				.send([{ email: randomEmail(), role: 'global:admin' }])
+				.expect(403);
+		});
+
+		test('should email invites and create user shells, without inviting existing users', async () => {
+			mailer.invite.mockResolvedValue({ emailSent: true });
+
+			const member = await createMember();
+			const memberShell = await createUserShell('global:member');
+			const newUserEmail = randomEmail();
+
+			const existingUserEmails = [member.email];
+			const inviteeUserEmails = [memberShell.email, newUserEmail];
+			const payload = inviteeUserEmails.concat(existingUserEmails).map((email) => ({ email }));
+
+			const response: InvitationResponse = await testServer
+				.authAgentFor(instanceOwner)
+				.post('/invitations')
+				.send(payload)
+				.expect(200);
+
+			// invite results
+
+			const { data: results } = response.body;
+
+			for (const result of results) {
+				assertUserInviteResult(result);
+
+				const storedUser = await Container.get(UserRepository).findOneByOrFail({
+					id: result.user.id,
+				});
+
+				assertStoredUserProps(storedUser);
+			}
+
+			// external hooks
+
+			expect(externalHooks.run).toHaveBeenCalledTimes(1);
+
+			const [externalHookName, externalHookArg] = externalHooks.run.mock.calls[0];
+
+			expect(externalHookName).toBe('user.invited');
+			expect(externalHookArg?.[0]).toStrictEqual([newUserEmail]);
+
+			// internal hooks
+
+			const calls = mocked(internalHooks).onUserTransactionalEmail.mock.calls;
+
+			for (const [onUserTransactionalEmailArg] of calls) {
+				expect(onUserTransactionalEmailArg.user_id).toBeDefined();
+				expect(onUserTransactionalEmailArg.message_type).toBe('New user invite');
+				expect(onUserTransactionalEmailArg.public_api).toBe(false);
+			}
+		});
+
+		test('should return 200 and surface error when invite method throws error', async () => {
+			const errorMsg = 'Failed to send email';
+
+			mailer.invite.mockImplementation(async () => {
+				throw new Error(errorMsg);
+			});
+
+			const response: InvitationResponse = await testServer
+				.authAgentFor(instanceOwner)
+				.post('/invitations')
+				.send([{ email: randomEmail() }])
+				.expect(200);
+
+			expect(response.body.data).toBeInstanceOf(Array);
+			expect(response.body.data.length).toBe(1);
+
+			const [result] = response.body.data;
+
+			expect(result.error).toBe(errorMsg);
+		});
+	});
+});
diff --git a/packages/cli/test/integration/credentials.controller.test.ts b/packages/cli/test/integration/credentials.controller.test.ts
new file mode 100644
index 0000000000000..df88c2b12c1c8
--- /dev/null
+++ b/packages/cli/test/integration/credentials.controller.test.ts
@@ -0,0 +1,283 @@
+import type { ListQuery } from '@/requests';
+import type { User } from '@db/entities/User';
+import * as testDb from './shared/testDb';
+import { setupTestServer } from './shared/utils/';
+import { randomCredentialPayload as payload } from './shared/random';
+import { saveCredential } from './shared/db/credentials';
+import { createMember, createOwner } from './shared/db/users';
+
+const { any } = expect;
+
+const testServer = setupTestServer({ endpointGroups: ['credentials'] });
+
+let owner: User;
+let member: User;
+
+beforeEach(async () => {
+	await testDb.truncate(['SharedCredentials', 'Credentials']);
+
+	owner = await createOwner();
+	member = await createMember();
+});
+
+type GetAllResponse = { body: { data: ListQuery.Credentials.WithOwnedByAndSharedWith[] } };
+
+describe('GET /credentials', () => {
+	describe('should return', () => {
+		test('all credentials for owner', async () => {
+			const { id: id1 } = await saveCredential(payload(), {
+				user: owner,
+				role: 'credential:owner',
+			});
+			const { id: id2 } = await saveCredential(payload(), {
+				user: member,
+				role: 'credential:owner',
+			});
+
+			const response: GetAllResponse = await testServer
+				.authAgentFor(owner)
+				.get('/credentials')
+				.expect(200);
+
+			expect(response.body.data).toHaveLength(2);
+
+			response.body.data.forEach(validateCredential);
+
+			const savedIds = [id1, id2].sort();
+			const returnedIds = response.body.data.map((c) => c.id).sort();
+
+			expect(savedIds).toEqual(returnedIds);
+		});
+
+		test('only own credentials for member', async () => {
+			const firstMember = member;
+			const secondMember = await createMember();
+
+			const c1 = await saveCredential(payload(), { user: firstMember, role: 'credential:owner' });
+			const c2 = await saveCredential(payload(), { user: secondMember, role: 'credential:owner' });
+
+			const response: GetAllResponse = await testServer
+				.authAgentFor(firstMember)
+				.get('/credentials')
+				.expect(200);
+
+			expect(response.body.data).toHaveLength(1);
+
+			const [firstMemberCred] = response.body.data;
+
+			validateCredential(firstMemberCred);
+			expect(firstMemberCred.id).toBe(c1.id);
+			expect(firstMemberCred.id).not.toBe(c2.id);
+		});
+	});
+
+	describe('filter', () => {
+		test('should filter credentials by field: name - full match', async () => {
+			const savedCred = await saveCredential(payload(), { user: owner, role: 'credential:owner' });
+
+			const response: GetAllResponse = await testServer
+				.authAgentFor(owner)
+				.get('/credentials')
+				.query(`filter={ "name": "${savedCred.name}" }`)
+				.expect(200);
+
+			expect(response.body.data).toHaveLength(1);
+
+			const [returnedCred] = response.body.data;
+
+			expect(returnedCred.name).toBe(savedCred.name);
+
+			const _response = await testServer
+				.authAgentFor(owner)
+				.get('/credentials')
+				.query('filter={ "name": "Non-Existing Credential" }')
+				.expect(200);
+
+			expect(_response.body.data).toHaveLength(0);
+		});
+
+		test('should filter credentials by field: name - partial match', async () => {
+			const savedCred = await saveCredential(payload(), { user: owner, role: 'credential:owner' });
+
+			const partialName = savedCred.name.slice(3);
+
+			const response: GetAllResponse = await testServer
+				.authAgentFor(owner)
+				.get('/credentials')
+				.query(`filter={ "name": "${partialName}" }`)
+				.expect(200);
+
+			expect(response.body.data).toHaveLength(1);
+
+			const [returnedCred] = response.body.data;
+
+			expect(returnedCred.name).toBe(savedCred.name);
+
+			const _response = await testServer
+				.authAgentFor(owner)
+				.get('/credentials')
+				.query('filter={ "name": "Non-Existing Credential" }')
+				.expect(200);
+
+			expect(_response.body.data).toHaveLength(0);
+		});
+
+		test('should filter credentials by field: type - full match', async () => {
+			const savedCred = await saveCredential(payload(), { user: owner, role: 'credential:owner' });
+
+			const response: GetAllResponse = await testServer
+				.authAgentFor(owner)
+				.get('/credentials')
+				.query(`filter={ "type": "${savedCred.type}" }`)
+				.expect(200);
+
+			expect(response.body.data).toHaveLength(1);
+
+			const [returnedCred] = response.body.data;
+
+			expect(returnedCred.type).toBe(savedCred.type);
+
+			const _response = await testServer
+				.authAgentFor(owner)
+				.get('/credentials')
+				.query('filter={ "type": "Non-Existing Credential" }')
+				.expect(200);
+
+			expect(_response.body.data).toHaveLength(0);
+		});
+
+		test('should filter credentials by field: type - partial match', async () => {
+			const savedCred = await saveCredential(payload(), { user: owner, role: 'credential:owner' });
+
+			const partialType = savedCred.type.slice(3);
+
+			const response: GetAllResponse = await testServer
+				.authAgentFor(owner)
+				.get('/credentials')
+				.query(`filter={ "type": "${partialType}" }`)
+				.expect(200);
+
+			expect(response.body.data).toHaveLength(1);
+
+			const [returnedCred] = response.body.data;
+
+			expect(returnedCred.type).toBe(savedCred.type);
+
+			const _response = await testServer
+				.authAgentFor(owner)
+				.get('/credentials')
+				.query('filter={ "type": "Non-Existing Credential" }')
+				.expect(200);
+
+			expect(_response.body.data).toHaveLength(0);
+		});
+	});
+
+	describe('select', () => {
+		test('should select credential field: id', async () => {
+			await saveCredential(payload(), { user: owner, role: 'credential:owner' });
+			await saveCredential(payload(), { user: owner, role: 'credential:owner' });
+
+			const response: GetAllResponse = await testServer
+				.authAgentFor(owner)
+				.get('/credentials')
+				.query('select=["id"]')
+				.expect(200);
+
+			expect(response.body).toEqual({
+				data: [{ id: any(String) }, { id: any(String) }],
+			});
+		});
+
+		test('should select credential field: name', async () => {
+			await saveCredential(payload(), { user: owner, role: 'credential:owner' });
+			await saveCredential(payload(), { user: owner, role: 'credential:owner' });
+
+			const response: GetAllResponse = await testServer
+				.authAgentFor(owner)
+				.get('/credentials')
+				.query('select=["name"]')
+				.expect(200);
+
+			expect(response.body).toEqual({
+				data: [{ name: any(String) }, { name: any(String) }],
+			});
+		});
+
+		test('should select credential field: type', async () => {
+			await saveCredential(payload(), { user: owner, role: 'credential:owner' });
+			await saveCredential(payload(), { user: owner, role: 'credential:owner' });
+
+			const response: GetAllResponse = await testServer
+				.authAgentFor(owner)
+				.get('/credentials')
+				.query('select=["type"]')
+				.expect(200);
+
+			expect(response.body).toEqual({
+				data: [{ type: any(String) }, { type: any(String) }],
+			});
+		});
+	});
+
+	describe('take', () => {
+		test('should return n credentials or less, without skip', async () => {
+			await saveCredential(payload(), { user: owner, role: 'credential:owner' });
+			await saveCredential(payload(), { user: owner, role: 'credential:owner' });
+
+			const response = await testServer
+				.authAgentFor(owner)
+				.get('/credentials')
+				.query('take=2')
+				.expect(200);
+
+			expect(response.body.data).toHaveLength(2);
+
+			response.body.data.forEach(validateCredential);
+
+			const _response = await testServer
+				.authAgentFor(owner)
+				.get('/credentials')
+				.query('take=1')
+				.expect(200);
+
+			expect(_response.body.data).toHaveLength(1);
+
+			_response.body.data.forEach(validateCredential);
+		});
+
+		test('should return n credentials or less, with skip', async () => {
+			await saveCredential(payload(), { user: owner, role: 'credential:owner' });
+			await saveCredential(payload(), { user: owner, role: 'credential:owner' });
+
+			const response = await testServer
+				.authAgentFor(owner)
+				.get('/credentials')
+				.query('take=1&skip=1')
+				.expect(200);
+
+			expect(response.body.data).toHaveLength(1);
+
+			response.body.data.forEach(validateCredential);
+		});
+	});
+});
+
+function validateCredential(credential: ListQuery.Credentials.WithOwnedByAndSharedWith) {
+	const { name, type, sharedWith, ownedBy } = credential;
+
+	expect(typeof name).toBe('string');
+	expect(typeof type).toBe('string');
+	expect('data' in credential).toBe(false);
+
+	if (sharedWith) expect(Array.isArray(sharedWith)).toBe(true);
+
+	if (ownedBy) {
+		const { id, email, firstName, lastName } = ownedBy;
+
+		expect(typeof id).toBe('string');
+		expect(typeof email).toBe('string');
+		expect(typeof firstName).toBe('string');
+		expect(typeof lastName).toBe('string');
+	}
+}
diff --git a/packages/cli/test/integration/credentials.ee.test.ts b/packages/cli/test/integration/credentials.ee.test.ts
index 139975eb5bb42..279f33c019dde 100644
--- a/packages/cli/test/integration/credentials.ee.test.ts
+++ b/packages/cli/test/integration/credentials.ee.test.ts
@@ -1,84 +1,53 @@
+import { Container } from 'typedi';
 import type { SuperAgentTest } from 'supertest';
-import { In } from 'typeorm';
-import { UserSettings } from 'n8n-core';
+import { In } from '@n8n/typeorm';
 import type { IUser } from 'n8n-workflow';
 
-import * as Db from '@/Db';
-import { RESPONSE_ERROR_MESSAGES } from '@/constants';
-import type { CredentialWithSharings } from '@/credentials/credentials.types';
-import * as UserManagementHelpers from '@/UserManagement/UserManagementHelper';
-import type { Role } from '@db/entities/Role';
+import type { ListQuery } from '@/requests';
 import type { User } from '@db/entities/User';
+import { SharedCredentialsRepository } from '@db/repositories/sharedCredentials.repository';
+
 import { randomCredentialPayload } from './shared/random';
 import * as testDb from './shared/testDb';
-import type { AuthAgent, SaveCredentialFunction } from './shared/types';
-import * as utils from './shared/utils';
+import type { SaveCredentialFunction } from './shared/types';
+import * as utils from './shared/utils/';
+import { affixRoleToSaveCredential, shareCredentialWithUsers } from './shared/db/credentials';
+import { createManyUsers, createUser, createUserShell } from './shared/db/users';
+import { UserManagementMailer } from '@/UserManagement/email';
+
+import { mockInstance } from '../shared/mocking';
+import config from '@/config';
+
+const testServer = utils.setupTestServer({
+	endpointGroups: ['credentials'],
+	enabledFeatures: ['feat:sharing'],
+});
 
-let globalMemberRole: Role;
 let owner: User;
 let member: User;
+let anotherMember: User;
 let authOwnerAgent: SuperAgentTest;
-let authAgent: AuthAgent;
+let authAnotherMemberAgent: SuperAgentTest;
 let saveCredential: SaveCredentialFunction;
-let sharingSpy: jest.SpyInstance<boolean>;
+const mailer = mockInstance(UserManagementMailer);
 
 beforeAll(async () => {
-	const app = await utils.initTestServer({ endpointGroups: ['credentials'] });
-
-	utils.initConfigFile();
+	owner = await createUser({ role: 'global:owner' });
+	member = await createUser({ role: 'global:member' });
+	anotherMember = await createUser({ role: 'global:member' });
 
-	const globalOwnerRole = await testDb.getGlobalOwnerRole();
-	globalMemberRole = await testDb.getGlobalMemberRole();
-	const credentialOwnerRole = await testDb.getCredentialOwnerRole();
+	authOwnerAgent = testServer.authAgentFor(owner);
+	authAnotherMemberAgent = testServer.authAgentFor(anotherMember);
 
-	owner = await testDb.createUser({ globalRole: globalOwnerRole });
-	member = await testDb.createUser({ globalRole: globalMemberRole });
-
-	authAgent = utils.createAuthAgent(app);
-	authOwnerAgent = authAgent(owner);
-
-	saveCredential = testDb.affixRoleToSaveCredential(credentialOwnerRole);
-	sharingSpy = jest.spyOn(UserManagementHelpers, 'isSharingEnabled').mockReturnValue(true);
+	saveCredential = affixRoleToSaveCredential('credential:owner');
 });
 
 beforeEach(async () => {
 	await testDb.truncate(['SharedCredentials', 'Credentials']);
 });
 
-afterAll(async () => {
-	await testDb.terminate();
-});
-
-// ----------------------------------------
-// dynamic router switching
-// ----------------------------------------
-describe('router should switch based on flag', () => {
-	let savedCredentialId: string;
-
-	beforeEach(async () => {
-		const savedCredential = await saveCredential(randomCredentialPayload(), { user: owner });
-		savedCredentialId = savedCredential.id;
-	});
-
-	test('when sharing is disabled', async () => {
-		sharingSpy.mockReturnValueOnce(false);
-
-		await authOwnerAgent
-			.put(`/credentials/${savedCredentialId}/share`)
-			.send({ shareWithIds: [member.id] })
-			.expect(404);
-
-		await authOwnerAgent.get(`/credentials/${savedCredentialId}`).send().expect(200);
-	});
-
-	test('when sharing is enabled', async () => {
-		await authOwnerAgent
-			.put(`/credentials/${savedCredentialId}/share`)
-			.send({ shareWithIds: [member.id] })
-			.expect(200);
-
-		await authOwnerAgent.get(`/credentials/${savedCredentialId}`).send().expect(200);
-	});
+afterEach(() => {
+	jest.clearAllMocks();
 });
 
 // ----------------------------------------
@@ -86,22 +55,26 @@ describe('router should switch based on flag', () => {
 // ----------------------------------------
 describe('GET /credentials', () => {
 	test('should return all creds for owner', async () => {
-		const [member1, member2, member3] = await testDb.createManyUsers(3, {
-			globalRole: globalMemberRole,
+		const [member1, member2, member3] = await createManyUsers(3, {
+			role: 'global:member',
 		});
 
 		const savedCredential = await saveCredential(randomCredentialPayload(), { user: owner });
 		await saveCredential(randomCredentialPayload(), { user: member1 });
 
 		const sharedWith = [member1, member2, member3];
-		await testDb.shareCredentialWithUsers(savedCredential, sharedWith);
+		await shareCredentialWithUsers(savedCredential, sharedWith);
 
 		const response = await authOwnerAgent.get('/credentials');
 
 		expect(response.statusCode).toBe(200);
 		expect(response.body.data).toHaveLength(2); // owner retrieved owner cred and member cred
-
-		const [ownerCredential, memberCredential] = response.body.data as CredentialWithSharings[];
+		const ownerCredential = response.body.data.find(
+			(e: ListQuery.Credentials.WithOwnedByAndSharedWith) => e.ownedBy?.id === owner.id,
+		);
+		const memberCredential = response.body.data.find(
+			(e: ListQuery.Credentials.WithOwnedByAndSharedWith) => e.ownedBy?.id === member1.id,
+		);
 
 		validateMainCredentialData(ownerCredential);
 		expect(ownerCredential.data).toBeUndefined();
@@ -146,8 +119,8 @@ describe('GET /credentials', () => {
 	});
 
 	test('should return only relevant creds for member', async () => {
-		const [member1, member2] = await testDb.createManyUsers(2, {
-			globalRole: globalMemberRole,
+		const [member1, member2] = await createManyUsers(2, {
+			role: 'global:member',
 		});
 
 		await saveCredential(randomCredentialPayload(), { user: member2 });
@@ -155,9 +128,9 @@ describe('GET /credentials', () => {
 			user: member1,
 		});
 
-		await testDb.shareCredentialWithUsers(savedMemberCredential, [member2]);
+		await shareCredentialWithUsers(savedMemberCredential, [member2]);
 
-		const response = await authAgent(member1).get('/credentials');
+		const response = await testServer.authAgentFor(member1).get('/credentials');
 
 		expect(response.statusCode).toBe(200);
 		expect(response.body.data).toHaveLength(1); // member retrieved only member cred
@@ -222,12 +195,12 @@ describe('GET /credentials/:id', () => {
 	});
 
 	test('should retrieve non-owned cred for owner', async () => {
-		const [member1, member2] = await testDb.createManyUsers(2, {
-			globalRole: globalMemberRole,
+		const [member1, member2] = await createManyUsers(2, {
+			role: 'global:member',
 		});
 
 		const savedCredential = await saveCredential(randomCredentialPayload(), { user: member1 });
-		await testDb.shareCredentialWithUsers(savedCredential, [member2]);
+		await shareCredentialWithUsers(savedCredential, [member2]);
 
 		const response1 = await authOwnerAgent.get(`/credentials/${savedCredential.id}`);
 
@@ -256,17 +229,17 @@ describe('GET /credentials/:id', () => {
 		expect(response2.statusCode).toBe(200);
 
 		validateMainCredentialData(response2.body.data);
-		expect(response2.body.data.data).toBeUndefined();
+		expect(response2.body.data.data).toBeDefined(); // Instance owners should be capable of editing all credentials
 		expect(response2.body.data.sharedWith).toHaveLength(1);
 	});
 
 	test('should retrieve owned cred for member', async () => {
-		const [member1, member2, member3] = await testDb.createManyUsers(3, {
-			globalRole: globalMemberRole,
+		const [member1, member2, member3] = await createManyUsers(3, {
+			role: 'global:member',
 		});
-		const authMemberAgent = authAgent(member1);
+		const authMemberAgent = testServer.authAgentFor(member1);
 		const savedCredential = await saveCredential(randomCredentialPayload(), { user: member1 });
-		await testDb.shareCredentialWithUsers(savedCredential, [member2, member3]);
+		await shareCredentialWithUsers(savedCredential, [member2, member3]);
 
 		const firstResponse = await authMemberAgent.get(`/credentials/${savedCredential.id}`);
 
@@ -301,27 +274,14 @@ describe('GET /credentials/:id', () => {
 	test('should not retrieve non-owned cred for member', async () => {
 		const savedCredential = await saveCredential(randomCredentialPayload(), { user: owner });
 
-		const response = await authAgent(member).get(`/credentials/${savedCredential.id}`);
+		const response = await testServer
+			.authAgentFor(member)
+			.get(`/credentials/${savedCredential.id}`);
 
 		expect(response.statusCode).toBe(403);
 		expect(response.body.data).toBeUndefined(); // owner's cred not returned
 	});
 
-	test('should fail with missing encryption key', async () => {
-		const savedCredential = await saveCredential(randomCredentialPayload(), { user: owner });
-
-		const mock = jest.spyOn(UserSettings, 'getEncryptionKey');
-		mock.mockRejectedValue(new Error(RESPONSE_ERROR_MESSAGES.NO_ENCRYPTION_KEY));
-
-		const response = await authOwnerAgent
-			.get(`/credentials/${savedCredential.id}`)
-			.query({ includeData: true });
-
-		expect(response.statusCode).toBe(500);
-
-		mock.mockRestore();
-	});
-
 	test('should return 404 if cred not found', async () => {
 		const response = await authOwnerAgent.get('/credentials/789');
 		expect(response.statusCode).toBe(404);
@@ -342,12 +302,12 @@ describe('PUT /credentials/:id/share', () => {
 	test('should share the credential with the provided userIds and unshare it for missing ones', async () => {
 		const savedCredential = await saveCredential(randomCredentialPayload(), { user: owner });
 
-		const [member1, member2, member3, member4, member5] = await testDb.createManyUsers(5, {
-			globalRole: globalMemberRole,
+		const [member1, member2, member3, member4, member5] = await createManyUsers(5, {
+			role: 'global:member',
 		});
 		const shareWithIds = [member1.id, member2.id, member3.id];
 
-		await testDb.shareCredentialWithUsers(savedCredential, [member4, member5]);
+		await shareCredentialWithUsers(savedCredential, [member4, member5]);
 
 		const response = await authOwnerAgent
 			.put(`/credentials/${savedCredential.id}/share`)
@@ -356,8 +316,7 @@ describe('PUT /credentials/:id/share', () => {
 		expect(response.statusCode).toBe(200);
 		expect(response.body.data).toBeUndefined();
 
-		const sharedCredentials = await Db.collections.SharedCredentials.find({
-			relations: ['role'],
+		const sharedCredentials = await Container.get(SharedCredentialsRepository).find({
 			where: { credentialsId: savedCredential.id },
 		});
 
@@ -366,19 +325,19 @@ describe('PUT /credentials/:id/share', () => {
 
 		sharedCredentials.forEach((sharedCredential) => {
 			if (sharedCredential.userId === owner.id) {
-				expect(sharedCredential.role.name).toBe('owner');
-				expect(sharedCredential.role.scope).toBe('credential');
+				expect(sharedCredential.role).toBe('credential:owner');
 				return;
 			}
 			expect(shareWithIds).toContain(sharedCredential.userId);
-			expect(sharedCredential.role.name).toBe('user');
-			expect(sharedCredential.role.scope).toBe('credential');
+			expect(sharedCredential.role).toBe('credential:user');
 		});
+
+		expect(mailer.notifyCredentialsShared).toHaveBeenCalledTimes(1);
 	});
 
 	test('should share the credential with the provided userIds', async () => {
-		const [member1, member2, member3] = await testDb.createManyUsers(3, {
-			globalRole: globalMemberRole,
+		const [member1, member2, member3] = await createManyUsers(3, {
+			role: 'global:member',
 		});
 		const memberIds = [member1.id, member2.id, member3.id];
 		const savedCredential = await saveCredential(randomCredentialPayload(), { user: owner });
@@ -391,48 +350,101 @@ describe('PUT /credentials/:id/share', () => {
 		expect(response.body.data).toBeUndefined();
 
 		// check that sharings got correctly set in DB
-		const sharedCredentials = await Db.collections.SharedCredentials.find({
-			relations: ['role'],
+		const sharedCredentials = await Container.get(SharedCredentialsRepository).find({
 			where: { credentialsId: savedCredential.id, userId: In([...memberIds]) },
 		});
 
 		expect(sharedCredentials.length).toBe(memberIds.length);
 
 		sharedCredentials.forEach((sharedCredential) => {
-			expect(sharedCredential.role.name).toBe('user');
-			expect(sharedCredential.role.scope).toBe('credential');
+			expect(sharedCredential.role).toBe('credential:user');
 		});
 
 		// check that owner still exists
-		const ownerSharedCredential = await Db.collections.SharedCredentials.findOneOrFail({
-			relations: ['role'],
+		const ownerSharedCredential = await Container.get(SharedCredentialsRepository).findOneOrFail({
 			where: { credentialsId: savedCredential.id, userId: owner.id },
 		});
 
-		expect(ownerSharedCredential.role.name).toBe('owner');
-		expect(ownerSharedCredential.role.scope).toBe('credential');
+		expect(ownerSharedCredential.role).toBe('credential:owner');
+		expect(mailer.notifyCredentialsShared).toHaveBeenCalledTimes(1);
 	});
 
 	test('should respond 403 for non-existing credentials', async () => {
 		const response = await authOwnerAgent
-			.put(`/credentials/1234567/share`)
+			.put('/credentials/1234567/share')
 			.send({ shareWithIds: [member.id] });
 
 		expect(response.statusCode).toBe(403);
+		expect(mailer.notifyCredentialsShared).toHaveBeenCalledTimes(0);
 	});
 
-	test('should respond 403 for non-owned credentials', async () => {
+	test('should respond 403 for non-owned credentials for shared members', async () => {
 		const savedCredential = await saveCredential(randomCredentialPayload(), { user: member });
 
-		const response = await authOwnerAgent
+		await shareCredentialWithUsers(savedCredential, [anotherMember]);
+
+		const response = await authAnotherMemberAgent
 			.put(`/credentials/${savedCredential.id}/share`)
-			.send({ shareWithIds: [member.id] });
+			.send({ shareWithIds: [owner.id] });
 
 		expect(response.statusCode).toBe(403);
+		const sharedCredentials = await Container.get(SharedCredentialsRepository).find({
+			where: { credentialsId: savedCredential.id },
+		});
+		expect(sharedCredentials).toHaveLength(2);
+		expect(mailer.notifyCredentialsShared).toHaveBeenCalledTimes(0);
+	});
+
+	test('should respond 403 for non-owned credentials for non-shared members sharing with self', async () => {
+		const savedCredential = await saveCredential(randomCredentialPayload(), { user: member });
+
+		const response = await authAnotherMemberAgent
+			.put(`/credentials/${savedCredential.id}/share`)
+			.send({ shareWithIds: [anotherMember.id] });
+
+		expect(response.statusCode).toBe(403);
+
+		const sharedCredentials = await Container.get(SharedCredentialsRepository).find({
+			where: { credentialsId: savedCredential.id },
+		});
+		expect(sharedCredentials).toHaveLength(1);
+		expect(mailer.notifyCredentialsShared).toHaveBeenCalledTimes(0);
+	});
+
+	test('should respond 403 for non-owned credentials for non-shared members sharing', async () => {
+		const savedCredential = await saveCredential(randomCredentialPayload(), { user: member });
+		const tempUser = await createUser({ role: 'global:member' });
+
+		const response = await authAnotherMemberAgent
+			.put(`/credentials/${savedCredential.id}/share`)
+			.send({ shareWithIds: [tempUser.id] });
+
+		expect(response.statusCode).toBe(403);
+
+		const sharedCredentials = await Container.get(SharedCredentialsRepository).find({
+			where: { credentialsId: savedCredential.id },
+		});
+		expect(sharedCredentials).toHaveLength(1);
+		expect(mailer.notifyCredentialsShared).toHaveBeenCalledTimes(0);
+	});
+
+	test('should respond 200 for non-owned credentials for owners', async () => {
+		const savedCredential = await saveCredential(randomCredentialPayload(), { user: member });
+
+		const response = await authOwnerAgent
+			.put(`/credentials/${savedCredential.id}/share`)
+			.send({ shareWithIds: [anotherMember.id] });
+
+		expect(response.statusCode).toBe(200);
+		const sharedCredentials = await Container.get(SharedCredentialsRepository).find({
+			where: { credentialsId: savedCredential.id },
+		});
+		expect(sharedCredentials).toHaveLength(2);
+		expect(mailer.notifyCredentialsShared).toHaveBeenCalledTimes(1);
 	});
 
 	test('should ignore pending sharee', async () => {
-		const memberShell = await testDb.createUserShell(globalMemberRole);
+		const memberShell = await createUserShell('global:member');
 		const savedCredential = await saveCredential(randomCredentialPayload(), { user: owner });
 
 		const response = await authOwnerAgent
@@ -441,7 +453,7 @@ describe('PUT /credentials/:id/share', () => {
 
 		expect(response.statusCode).toBe(200);
 
-		const sharedCredentials = await Db.collections.SharedCredentials.find({
+		const sharedCredentials = await Container.get(SharedCredentialsRepository).find({
 			where: { credentialsId: savedCredential.id },
 		});
 
@@ -458,12 +470,13 @@ describe('PUT /credentials/:id/share', () => {
 
 		expect(response.statusCode).toBe(200);
 
-		const sharedCredentials = await Db.collections.SharedCredentials.find({
+		const sharedCredentials = await Container.get(SharedCredentialsRepository).find({
 			where: { credentialsId: savedCredential.id },
 		});
 
 		expect(sharedCredentials).toHaveLength(1);
 		expect(sharedCredentials[0].userId).toBe(owner.id);
+		expect(mailer.notifyCredentialsShared).toHaveBeenCalledTimes(1);
 	});
 
 	test('should respond 400 if invalid payload is provided', async () => {
@@ -475,15 +488,17 @@ describe('PUT /credentials/:id/share', () => {
 		]);
 
 		responses.forEach((response) => expect(response.statusCode).toBe(400));
+		expect(mailer.notifyCredentialsShared).toHaveBeenCalledTimes(0);
 	});
+
 	test('should unshare the credential', async () => {
 		const savedCredential = await saveCredential(randomCredentialPayload(), { user: owner });
 
-		const [member1, member2] = await testDb.createManyUsers(2, {
-			globalRole: globalMemberRole,
+		const [member1, member2] = await createManyUsers(2, {
+			role: 'global:member',
 		});
 
-		await testDb.shareCredentialWithUsers(savedCredential, [member1, member2]);
+		await shareCredentialWithUsers(savedCredential, [member1, member2]);
 
 		const response = await authOwnerAgent
 			.put(`/credentials/${savedCredential.id}/share`)
@@ -491,19 +506,39 @@ describe('PUT /credentials/:id/share', () => {
 
 		expect(response.statusCode).toBe(200);
 
-		const sharedCredentials = await Db.collections.SharedCredentials.find({
+		const sharedCredentials = await Container.get(SharedCredentialsRepository).find({
 			where: { credentialsId: savedCredential.id },
 		});
 
 		expect(sharedCredentials).toHaveLength(1);
 		expect(sharedCredentials[0].userId).toBe(owner.id);
+		expect(mailer.notifyCredentialsShared).toHaveBeenCalledTimes(1);
+	});
+
+	test('should not call internal hooks listener for email sent if emailing is disabled', async () => {
+		config.set('userManagement.emails.mode', '');
+
+		const savedCredential = await saveCredential(randomCredentialPayload(), { user: owner });
+
+		const [member1, member2] = await createManyUsers(2, {
+			role: 'global:member',
+		});
+
+		await shareCredentialWithUsers(savedCredential, [member1, member2]);
+
+		const response = await authOwnerAgent
+			.put(`/credentials/${savedCredential.id}/share`)
+			.send({ shareWithIds: [] });
+
+		expect(response.statusCode).toBe(200);
+
+		config.set('userManagement.emails.mode', 'smtp');
 	});
 });
 
-function validateMainCredentialData(credential: CredentialWithSharings) {
+function validateMainCredentialData(credential: ListQuery.Credentials.WithOwnedByAndSharedWith) {
 	expect(typeof credential.name).toBe('string');
 	expect(typeof credential.type).toBe('string');
-	expect(typeof credential.nodesAccess[0].nodeType).toBe('string');
 	expect(credential.ownedBy).toBeDefined();
 	expect(Array.isArray(credential.sharedWith)).toBe(true);
 }
diff --git a/packages/cli/test/integration/credentials.test.ts b/packages/cli/test/integration/credentials.test.ts
index 3a2f5f8415218..a25f0108cf3e7 100644
--- a/packages/cli/test/integration/credentials.test.ts
+++ b/packages/cli/test/integration/credentials.test.ts
@@ -1,61 +1,47 @@
-import type { Application } from 'express';
+import { Container } from 'typedi';
 import type { SuperAgentTest } from 'supertest';
-import { UserSettings } from 'n8n-core';
 
-import * as Db from '@/Db';
 import config from '@/config';
-import { RESPONSE_ERROR_MESSAGES } from '@/constants';
-import * as UserManagementHelpers from '@/UserManagement/UserManagementHelper';
-import type { CredentialsEntity } from '@db/entities/CredentialsEntity';
-import type { Role } from '@db/entities/Role';
+import type { ListQuery } from '@/requests';
 import type { User } from '@db/entities/User';
+import { CredentialsRepository } from '@db/repositories/credentials.repository';
+import { SharedCredentialsRepository } from '@db/repositories/sharedCredentials.repository';
+import { License } from '@/License';
+
 import { randomCredentialPayload, randomName, randomString } from './shared/random';
 import * as testDb from './shared/testDb';
 import type { SaveCredentialFunction } from './shared/types';
-import * as utils from './shared/utils';
-import type { AuthAgent } from './shared/types';
+import * as utils from './shared/utils/';
+import { affixRoleToSaveCredential, shareCredentialWithUsers } from './shared/db/credentials';
+import { createManyUsers, createUser } from './shared/db/users';
+import { Credentials } from 'n8n-core';
 
 // mock that credentialsSharing is not enabled
-const mockIsCredentialsSharingEnabled = jest.spyOn(UserManagementHelpers, 'isSharingEnabled');
-mockIsCredentialsSharingEnabled.mockReturnValue(false);
+jest.spyOn(License.prototype, 'isSharingEnabled').mockReturnValue(false);
+const testServer = utils.setupTestServer({ endpointGroups: ['credentials'] });
 
-let app: Application;
-let globalOwnerRole: Role;
-let globalMemberRole: Role;
 let owner: User;
 let member: User;
+let secondMember: User;
 let authOwnerAgent: SuperAgentTest;
 let authMemberAgent: SuperAgentTest;
 let saveCredential: SaveCredentialFunction;
-let authAgent: AuthAgent;
 
 beforeAll(async () => {
-	app = await utils.initTestServer({ endpointGroups: ['credentials'] });
-
-	utils.initConfigFile();
-
-	globalOwnerRole = await testDb.getGlobalOwnerRole();
-	globalMemberRole = await testDb.getGlobalMemberRole();
-	const credentialOwnerRole = await testDb.getCredentialOwnerRole();
-
-	owner = await testDb.createUser({ globalRole: globalOwnerRole });
-	member = await testDb.createUser({ globalRole: globalMemberRole });
+	owner = await createUser({ role: 'global:owner' });
+	member = await createUser({ role: 'global:member' });
+	secondMember = await createUser({ role: 'global:member' });
 
-	saveCredential = testDb.affixRoleToSaveCredential(credentialOwnerRole);
+	saveCredential = affixRoleToSaveCredential('credential:owner');
 
-	authAgent = utils.createAuthAgent(app);
-	authOwnerAgent = authAgent(owner);
-	authMemberAgent = authAgent(member);
+	authOwnerAgent = testServer.authAgentFor(owner);
+	authMemberAgent = testServer.authAgentFor(member);
 });
 
 beforeEach(async () => {
 	await testDb.truncate(['SharedCredentials', 'Credentials']);
 });
 
-afterAll(async () => {
-	await testDb.terminate();
-});
-
 // ----------------------------------------
 // GET /credentials - fetch all credentials
 // ----------------------------------------
@@ -72,16 +58,16 @@ describe('GET /credentials', () => {
 		expect(response.body.data.length).toBe(2); // owner retrieved owner cred and member cred
 
 		const savedCredentialsIds = [savedOwnerCredentialId, savedMemberCredentialId];
-		response.body.data.forEach((credential: CredentialsEntity) => {
+		response.body.data.forEach((credential: ListQuery.Credentials.WithOwnedByAndSharedWith) => {
 			validateMainCredentialData(credential);
-			expect(credential.data).toBeUndefined();
+			expect('data' in credential).toBe(false);
 			expect(savedCredentialsIds).toContain(credential.id);
 		});
 	});
 
 	test('should return only own creds for member', async () => {
-		const [member1, member2] = await testDb.createManyUsers(2, {
-			globalRole: globalMemberRole,
+		const [member1, member2] = await createManyUsers(2, {
+			role: 'global:member',
 		});
 
 		const [savedCredential1] = await Promise.all([
@@ -89,7 +75,7 @@ describe('GET /credentials', () => {
 			saveCredential(randomCredentialPayload(), { user: member2 }),
 		]);
 
-		const response = await authAgent(member1).get('/credentials');
+		const response = await testServer.authAgentFor(member1).get('/credentials');
 
 		expect(response.statusCode).toBe(200);
 		expect(response.body.data.length).toBe(1); // member retrieved only own cred
@@ -110,24 +96,19 @@ describe('POST /credentials', () => {
 
 		expect(response.statusCode).toBe(200);
 
-		const { id, name, type, nodesAccess, data: encryptedData } = response.body.data;
+		const { id, name, type, data: encryptedData } = response.body.data;
 
 		expect(name).toBe(payload.name);
 		expect(type).toBe(payload.type);
-		if (!payload.nodesAccess) {
-			fail('Payload did not contain a nodesAccess array');
-		}
-		expect(nodesAccess[0].nodeType).toBe(payload.nodesAccess[0].nodeType);
 		expect(encryptedData).not.toBe(payload.data);
 
-		const credential = await Db.collections.Credentials.findOneByOrFail({ id });
+		const credential = await Container.get(CredentialsRepository).findOneByOrFail({ id });
 
 		expect(credential.name).toBe(payload.name);
 		expect(credential.type).toBe(payload.type);
-		expect(credential.nodesAccess[0].nodeType).toBe(payload.nodesAccess![0].nodeType);
 		expect(credential.data).not.toBe(payload.data);
 
-		const sharedCredential = await Db.collections.SharedCredentials.findOneOrFail({
+		const sharedCredential = await Container.get(SharedCredentialsRepository).findOneOrFail({
 			relations: ['user', 'credentials'],
 			where: { credentialsId: credential.id },
 		});
@@ -137,23 +118,10 @@ describe('POST /credentials', () => {
 	});
 
 	test('should fail with invalid inputs', async () => {
-		await Promise.all(
-			INVALID_PAYLOADS.map(async (invalidPayload) => {
-				const response = await authOwnerAgent.post('/credentials').send(invalidPayload);
-				expect(response.statusCode).toBe(400);
-			}),
-		);
-	});
-
-	test('should fail with missing encryption key', async () => {
-		const mock = jest.spyOn(UserSettings, 'getEncryptionKey');
-		mock.mockRejectedValue(new Error(RESPONSE_ERROR_MESSAGES.NO_ENCRYPTION_KEY));
-
-		const response = await authOwnerAgent.post('/credentials').send(randomCredentialPayload());
-
-		expect(response.statusCode).toBe(500);
-
-		mock.mockRestore();
+		for (const invalidPayload of INVALID_PAYLOADS) {
+			const response = await authOwnerAgent.post('/credentials').send(invalidPayload);
+			expect(response.statusCode).toBe(400);
+		}
 	});
 
 	test('should ignore ID in payload', async () => {
@@ -180,13 +148,13 @@ describe('DELETE /credentials/:id', () => {
 		expect(response.statusCode).toBe(200);
 		expect(response.body).toEqual({ data: true });
 
-		const deletedCredential = await Db.collections.Credentials.findOneBy({
+		const deletedCredential = await Container.get(CredentialsRepository).findOneBy({
 			id: savedCredential.id,
 		});
 
 		expect(deletedCredential).toBeNull(); // deleted
 
-		const deletedSharedCredential = await Db.collections.SharedCredentials.findOneBy({});
+		const deletedSharedCredential = await Container.get(SharedCredentialsRepository).findOneBy({});
 
 		expect(deletedSharedCredential).toBeNull(); // deleted
 	});
@@ -199,13 +167,13 @@ describe('DELETE /credentials/:id', () => {
 		expect(response.statusCode).toBe(200);
 		expect(response.body).toEqual({ data: true });
 
-		const deletedCredential = await Db.collections.Credentials.findOneBy({
+		const deletedCredential = await Container.get(CredentialsRepository).findOneBy({
 			id: savedCredential.id,
 		});
 
 		expect(deletedCredential).toBeNull(); // deleted
 
-		const deletedSharedCredential = await Db.collections.SharedCredentials.findOneBy({});
+		const deletedSharedCredential = await Container.get(SharedCredentialsRepository).findOneBy({});
 
 		expect(deletedSharedCredential).toBeNull(); // deleted
 	});
@@ -218,13 +186,13 @@ describe('DELETE /credentials/:id', () => {
 		expect(response.statusCode).toBe(200);
 		expect(response.body).toEqual({ data: true });
 
-		const deletedCredential = await Db.collections.Credentials.findOneBy({
+		const deletedCredential = await Container.get(CredentialsRepository).findOneBy({
 			id: savedCredential.id,
 		});
 
 		expect(deletedCredential).toBeNull(); // deleted
 
-		const deletedSharedCredential = await Db.collections.SharedCredentials.findOneBy({});
+		const deletedSharedCredential = await Container.get(SharedCredentialsRepository).findOneBy({});
 
 		expect(deletedSharedCredential).toBeNull(); // deleted
 	});
@@ -236,11 +204,33 @@ describe('DELETE /credentials/:id', () => {
 
 		expect(response.statusCode).toBe(404);
 
-		const shellCredential = await Db.collections.Credentials.findOneBy({ id: savedCredential.id });
+		const shellCredential = await Container.get(CredentialsRepository).findOneBy({
+			id: savedCredential.id,
+		});
 
 		expect(shellCredential).toBeDefined(); // not deleted
 
-		const deletedSharedCredential = await Db.collections.SharedCredentials.findOneBy({});
+		const deletedSharedCredential = await Container.get(SharedCredentialsRepository).findOneBy({});
+
+		expect(deletedSharedCredential).toBeDefined(); // not deleted
+	});
+
+	test('should not delete non-owned but shared cred for member', async () => {
+		const savedCredential = await saveCredential(randomCredentialPayload(), { user: secondMember });
+
+		await shareCredentialWithUsers(savedCredential, [member]);
+
+		const response = await authMemberAgent.delete(`/credentials/${savedCredential.id}`);
+
+		expect(response.statusCode).toBe(404);
+
+		const shellCredential = await Container.get(CredentialsRepository).findOneBy({
+			id: savedCredential.id,
+		});
+
+		expect(shellCredential).toBeDefined(); // not deleted
+
+		const deletedSharedCredential = await Container.get(SharedCredentialsRepository).findOneBy({});
 
 		expect(deletedSharedCredential).toBeDefined(); // not deleted
 	});
@@ -263,25 +253,20 @@ describe('PATCH /credentials/:id', () => {
 
 		expect(response.statusCode).toBe(200);
 
-		const { id, name, type, nodesAccess, data: encryptedData } = response.body.data;
+		const { id, name, type, data: encryptedData } = response.body.data;
 
 		expect(name).toBe(patchPayload.name);
 		expect(type).toBe(patchPayload.type);
-		if (!patchPayload.nodesAccess) {
-			fail('Payload did not contain a nodesAccess array');
-		}
-		expect(nodesAccess[0].nodeType).toBe(patchPayload.nodesAccess[0].nodeType);
 
 		expect(encryptedData).not.toBe(patchPayload.data);
 
-		const credential = await Db.collections.Credentials.findOneByOrFail({ id });
+		const credential = await Container.get(CredentialsRepository).findOneByOrFail({ id });
 
 		expect(credential.name).toBe(patchPayload.name);
 		expect(credential.type).toBe(patchPayload.type);
-		expect(credential.nodesAccess[0].nodeType).toBe(patchPayload.nodesAccess![0].nodeType);
 		expect(credential.data).not.toBe(patchPayload.data);
 
-		const sharedCredential = await Db.collections.SharedCredentials.findOneOrFail({
+		const sharedCredential = await Container.get(SharedCredentialsRepository).findOneOrFail({
 			relations: ['credentials'],
 			where: { credentialsId: credential.id },
 		});
@@ -299,26 +284,21 @@ describe('PATCH /credentials/:id', () => {
 
 		expect(response.statusCode).toBe(200);
 
-		const { id, name, type, nodesAccess, data: encryptedData } = response.body.data;
-
-		expect(name).toBe(patchPayload.name);
-		expect(type).toBe(patchPayload.type);
-
-		if (!patchPayload.nodesAccess) {
-			fail('Payload did not contain a nodesAccess array');
-		}
-		expect(nodesAccess[0].nodeType).toBe(patchPayload.nodesAccess[0].nodeType);
-
-		expect(encryptedData).not.toBe(patchPayload.data);
-
-		const credential = await Db.collections.Credentials.findOneByOrFail({ id });
+		const credential = await Container.get(CredentialsRepository).findOneByOrFail({
+			id: savedCredential.id,
+		});
 
 		expect(credential.name).toBe(patchPayload.name);
 		expect(credential.type).toBe(patchPayload.type);
-		expect(credential.nodesAccess[0].nodeType).toBe(patchPayload.nodesAccess![0].nodeType);
-		expect(credential.data).not.toBe(patchPayload.data);
 
-		const sharedCredential = await Db.collections.SharedCredentials.findOneOrFail({
+		const credentialObject = new Credentials(
+			{ id: credential.id, name: credential.name },
+			credential.type,
+			credential.data,
+		);
+		expect(credentialObject.getData()).toStrictEqual(patchPayload.data);
+
+		const sharedCredential = await Container.get(SharedCredentialsRepository).findOneOrFail({
 			relations: ['credentials'],
 			where: { credentialsId: credential.id },
 		});
@@ -336,26 +316,20 @@ describe('PATCH /credentials/:id', () => {
 
 		expect(response.statusCode).toBe(200);
 
-		const { id, name, type, nodesAccess, data: encryptedData } = response.body.data;
+		const { id, name, type, data: encryptedData } = response.body.data;
 
 		expect(name).toBe(patchPayload.name);
 		expect(type).toBe(patchPayload.type);
 
-		if (!patchPayload.nodesAccess) {
-			fail('Payload did not contain a nodesAccess array');
-		}
-		expect(nodesAccess[0].nodeType).toBe(patchPayload.nodesAccess[0].nodeType);
-
 		expect(encryptedData).not.toBe(patchPayload.data);
 
-		const credential = await Db.collections.Credentials.findOneByOrFail({ id });
+		const credential = await Container.get(CredentialsRepository).findOneByOrFail({ id });
 
 		expect(credential.name).toBe(patchPayload.name);
 		expect(credential.type).toBe(patchPayload.type);
-		expect(credential.nodesAccess[0].nodeType).toBe(patchPayload.nodesAccess![0].nodeType);
 		expect(credential.data).not.toBe(patchPayload.data);
 
-		const sharedCredential = await Db.collections.SharedCredentials.findOneOrFail({
+		const sharedCredential = await Container.get(SharedCredentialsRepository).findOneOrFail({
 			relations: ['credentials'],
 			where: { credentialsId: credential.id },
 		});
@@ -373,45 +347,65 @@ describe('PATCH /credentials/:id', () => {
 
 		expect(response.statusCode).toBe(404);
 
-		const shellCredential = await Db.collections.Credentials.findOneByOrFail({
+		const shellCredential = await Container.get(CredentialsRepository).findOneByOrFail({
 			id: savedCredential.id,
 		});
 
 		expect(shellCredential.name).not.toBe(patchPayload.name); // not updated
 	});
 
-	test('should fail with invalid inputs', async () => {
-		const savedCredential = await saveCredential(randomCredentialPayload(), { user: owner });
+	test('should not update non-owned but shared cred for member', async () => {
+		const savedCredential = await saveCredential(randomCredentialPayload(), { user: secondMember });
+		await shareCredentialWithUsers(savedCredential, [member]);
+		const patchPayload = randomCredentialPayload();
 
-		await Promise.all(
-			INVALID_PAYLOADS.map(async (invalidPayload) => {
-				const response = await authOwnerAgent
-					.patch(`/credentials/${savedCredential.id}`)
-					.send(invalidPayload);
-
-				if (response.statusCode === 500) {
-					console.log(response.statusCode, response.body);
-				}
-				expect(response.statusCode).toBe(400);
-			}),
-		);
+		const response = await authMemberAgent
+			.patch(`/credentials/${savedCredential.id}`)
+			.send(patchPayload);
+
+		expect(response.statusCode).toBe(404);
+
+		const shellCredential = await Container.get(CredentialsRepository).findOneByOrFail({
+			id: savedCredential.id,
+		});
+
+		expect(shellCredential.name).not.toBe(patchPayload.name); // not updated
 	});
 
-	test('should fail if cred not found', async () => {
-		const response = await authOwnerAgent.patch('/credentials/123').send(randomCredentialPayload());
+	test('should update non-owned but shared cred for instance owner', async () => {
+		const savedCredential = await saveCredential(randomCredentialPayload(), { user: secondMember });
+		await shareCredentialWithUsers(savedCredential, [owner]);
+		const patchPayload = randomCredentialPayload();
 
-		expect(response.statusCode).toBe(404);
+		const response = await authOwnerAgent
+			.patch(`/credentials/${savedCredential.id}`)
+			.send(patchPayload);
+
+		expect(response.statusCode).toBe(200);
+
+		const shellCredential = await Container.get(CredentialsRepository).findOneByOrFail({
+			id: savedCredential.id,
+		});
+
+		expect(shellCredential.name).toBe(patchPayload.name); // updated
 	});
 
-	test('should fail with missing encryption key', async () => {
-		const mock = jest.spyOn(UserSettings, 'getEncryptionKey');
-		mock.mockRejectedValue(new Error(RESPONSE_ERROR_MESSAGES.NO_ENCRYPTION_KEY));
+	test('should fail with invalid inputs', async () => {
+		const savedCredential = await saveCredential(randomCredentialPayload(), { user: owner });
+
+		for (const invalidPayload of INVALID_PAYLOADS) {
+			const response = await authOwnerAgent
+				.patch(`/credentials/${savedCredential.id}`)
+				.send(invalidPayload);
 
-		const response = await authOwnerAgent.post('/credentials').send(randomCredentialPayload());
+			expect(response.statusCode).toBe(400);
+		}
+	});
 
-		expect(response.statusCode).toBe(500);
+	test('should fail if cred not found', async () => {
+		const response = await authOwnerAgent.patch('/credentials/123').send(randomCredentialPayload());
 
-		mock.mockRestore();
+		expect(response.statusCode).toBe(404);
 	});
 });
 
@@ -521,21 +515,6 @@ describe('GET /credentials/:id', () => {
 		expect(response.body.data).toBeUndefined(); // owner's cred not returned
 	});
 
-	test('should fail with missing encryption key', async () => {
-		const savedCredential = await saveCredential(randomCredentialPayload(), { user: owner });
-
-		const mock = jest.spyOn(UserSettings, 'getEncryptionKey');
-		mock.mockRejectedValue(new Error(RESPONSE_ERROR_MESSAGES.NO_ENCRYPTION_KEY));
-
-		const response = await authOwnerAgent
-			.get(`/credentials/${savedCredential.id}`)
-			.query({ includeData: true });
-
-		expect(response.statusCode).toBe(500);
-
-		mock.mockRestore();
-	});
-
 	test('should return 404 if cred not found', async () => {
 		const response = await authOwnerAgent.get('/credentials/789');
 		expect(response.statusCode).toBe(404);
@@ -545,36 +524,38 @@ describe('GET /credentials/:id', () => {
 	});
 });
 
-function validateMainCredentialData(credential: CredentialsEntity) {
-	expect(typeof credential.name).toBe('string');
-	expect(typeof credential.type).toBe('string');
-	expect(typeof credential.nodesAccess[0].nodeType).toBe('string');
-	// @ts-ignore
-	expect(credential.ownedBy).toBeUndefined();
-	// @ts-ignore
-	expect(credential.sharedWith).toBeUndefined();
+function validateMainCredentialData(credential: ListQuery.Credentials.WithOwnedByAndSharedWith) {
+	const { name, type, sharedWith, ownedBy } = credential;
+
+	expect(typeof name).toBe('string');
+	expect(typeof type).toBe('string');
+
+	if (sharedWith) {
+		expect(Array.isArray(sharedWith)).toBe(true);
+	}
+
+	if (ownedBy) {
+		const { id, email, firstName, lastName } = ownedBy;
+
+		expect(typeof id).toBe('string');
+		expect(typeof email).toBe('string');
+		expect(typeof firstName).toBe('string');
+		expect(typeof lastName).toBe('string');
+	}
 }
 
 const INVALID_PAYLOADS = [
 	{
 		type: randomName(),
-		nodesAccess: [{ nodeType: randomName() }],
-		data: { accessToken: randomString(6, 16) },
-	},
-	{
-		name: randomName(),
-		nodesAccess: [{ nodeType: randomName() }],
 		data: { accessToken: randomString(6, 16) },
 	},
 	{
 		name: randomName(),
-		type: randomName(),
 		data: { accessToken: randomString(6, 16) },
 	},
 	{
 		name: randomName(),
 		type: randomName(),
-		nodesAccess: [{ nodeType: randomName() }],
 	},
 	{},
 	undefined,
diff --git a/packages/cli/test/integration/cta.service.test.ts b/packages/cli/test/integration/cta.service.test.ts
new file mode 100644
index 0000000000000..27cdc7b60492d
--- /dev/null
+++ b/packages/cli/test/integration/cta.service.test.ts
@@ -0,0 +1,54 @@
+import Container from 'typedi';
+import * as testDb from './shared/testDb';
+import { CtaService } from '@/services/cta.service';
+import { createUser } from './shared/db/users';
+import { createManyWorkflows } from './shared/db/workflows';
+import type { User } from '@/databases/entities/User';
+import { createWorkflowStatisticsItem } from './shared/db/workflowStatistics';
+import { StatisticsNames } from '@/databases/entities/WorkflowStatistics';
+
+describe('CtaService', () => {
+	let ctaService: CtaService;
+	let user: User;
+
+	beforeAll(async () => {
+		await testDb.init();
+
+		ctaService = Container.get(CtaService);
+		user = await createUser();
+	});
+
+	afterAll(async () => {
+		await testDb.terminate();
+	});
+
+	describe('getBecomeCreatorCta()', () => {
+		afterEach(async () => {
+			await testDb.truncate(['Workflow', 'SharedWorkflow']);
+		});
+
+		test.each([
+			[false, 0, 0],
+			[false, 2, 5],
+			[false, 3, 4],
+			[true, 3, 5],
+		])(
+			'should return %p if user has %d active workflows with %d successful production executions',
+			async (expected, numWorkflows, numExecutions) => {
+				const workflows = await createManyWorkflows(numWorkflows, { active: true }, user);
+
+				await Promise.all(
+					workflows.map(
+						async (workflow) =>
+							await createWorkflowStatisticsItem(workflow.id, {
+								count: numExecutions,
+								name: StatisticsNames.productionSuccess,
+							}),
+					),
+				);
+
+				expect(await ctaService.getBecomeCreatorCta(user.id)).toBe(expected);
+			},
+		);
+	});
+});
diff --git a/packages/cli/test/integration/database/repositories/execution.repository.test.ts b/packages/cli/test/integration/database/repositories/execution.repository.test.ts
new file mode 100644
index 0000000000000..cfb897d627a56
--- /dev/null
+++ b/packages/cli/test/integration/database/repositories/execution.repository.test.ts
@@ -0,0 +1,56 @@
+import Container from 'typedi';
+import { ExecutionRepository } from '@db/repositories/execution.repository';
+import { ExecutionDataRepository } from '@db/repositories/executionData.repository';
+import * as testDb from '../../shared/testDb';
+import { createWorkflow } from '../../shared/db/workflows';
+
+describe('ExecutionRepository', () => {
+	beforeAll(async () => {
+		await testDb.init();
+	});
+
+	beforeEach(async () => {
+		await testDb.truncate(['Workflow', 'Execution']);
+	});
+
+	afterAll(async () => {
+		await testDb.terminate();
+	});
+
+	describe('createNewExecution', () => {
+		it('should save execution data', async () => {
+			const executionRepo = Container.get(ExecutionRepository);
+			const workflow = await createWorkflow({ settings: { executionOrder: 'v1' } });
+			const executionId = await executionRepo.createNewExecution({
+				workflowId: workflow.id,
+				data: {
+					//@ts-expect-error This is not needed for tests
+					resultData: {},
+				},
+				workflowData: workflow,
+				mode: 'manual',
+				startedAt: new Date(),
+				status: 'new',
+				finished: false,
+			});
+
+			expect(executionId).toBeDefined();
+
+			const executionEntity = await executionRepo.findOneBy({ id: executionId });
+			expect(executionEntity?.id).toEqual(executionId);
+			expect(executionEntity?.workflowId).toEqual(workflow.id);
+			expect(executionEntity?.status).toEqual('new');
+
+			const executionDataRepo = Container.get(ExecutionDataRepository);
+			const executionData = await executionDataRepo.findOneBy({ executionId });
+			expect(executionData?.workflowData).toEqual({
+				id: workflow.id,
+				connections: workflow.connections,
+				nodes: workflow.nodes,
+				name: workflow.name,
+				settings: workflow.settings,
+			});
+			expect(executionData?.data).toEqual('[{"resultData":"1"},{}]');
+		});
+	});
+});
diff --git a/packages/cli/test/integration/database/repositories/workflow.repository.test.ts b/packages/cli/test/integration/database/repositories/workflow.repository.test.ts
new file mode 100644
index 0000000000000..d9e1ea22fd7f7
--- /dev/null
+++ b/packages/cli/test/integration/database/repositories/workflow.repository.test.ts
@@ -0,0 +1,70 @@
+import Container from 'typedi';
+
+import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
+
+import * as testDb from '../../shared/testDb';
+import { createWorkflowWithTrigger, getAllWorkflows } from '../../shared/db/workflows';
+
+describe('WorkflowRepository', () => {
+	beforeAll(async () => {
+		await testDb.init();
+	});
+
+	beforeEach(async () => {
+		await testDb.truncate(['Workflow']);
+	});
+
+	afterAll(async () => {
+		await testDb.terminate();
+	});
+
+	describe('activateAll', () => {
+		it('should activate all workflows', async () => {
+			//
+			// ARRANGE
+			//
+			const workflowRepository = Container.get(WorkflowRepository);
+			const workflows = await Promise.all([
+				createWorkflowWithTrigger(),
+				createWorkflowWithTrigger(),
+			]);
+			expect(workflows).toMatchObject([{ active: false }, { active: false }]);
+
+			//
+			// ACT
+			//
+			await workflowRepository.activateAll();
+
+			//
+			// ASSERT
+			//
+			const after = await getAllWorkflows();
+			expect(after).toMatchObject([{ active: true }, { active: true }]);
+		});
+	});
+
+	describe('deactivateAll', () => {
+		it('should deactivate all workflows', async () => {
+			//
+			// ARRANGE
+			//
+			const workflowRepository = Container.get(WorkflowRepository);
+			const workflows = await Promise.all([
+				createWorkflowWithTrigger({ active: true }),
+				createWorkflowWithTrigger({ active: true }),
+			]);
+			expect(workflows).toMatchObject([{ active: true }, { active: true }]);
+
+			//
+			// ACT
+			//
+			await workflowRepository.deactivateAll();
+
+			//
+			// ASSERT
+			//
+			const after = await getAllWorkflows();
+			expect(after).toMatchObject([{ active: false }, { active: false }]);
+		});
+	});
+});
diff --git a/packages/cli/test/integration/debug.controller.test.ts b/packages/cli/test/integration/debug.controller.test.ts
new file mode 100644
index 0000000000000..903d30977cb99
--- /dev/null
+++ b/packages/cli/test/integration/debug.controller.test.ts
@@ -0,0 +1,58 @@
+import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
+import { ActiveWorkflowManager } from '@/ActiveWorkflowManager';
+import { mockInstance } from '../shared/mocking';
+import { randomName } from './shared/random';
+import { generateNanoId } from '@/databases/utils/generators';
+import type { WorkflowEntity } from '@/databases/entities/WorkflowEntity';
+import { setupTestServer } from './shared/utils';
+import type { SuperAgentTest } from 'supertest';
+import { createOwner } from './shared/db/users';
+import { OrchestrationService } from '@/services/orchestration.service';
+import { MultiMainSetup } from '@/services/orchestration/main/MultiMainSetup.ee';
+
+describe('DebugController', () => {
+	const workflowRepository = mockInstance(WorkflowRepository);
+	const activeWorkflowManager = mockInstance(ActiveWorkflowManager);
+
+	let testServer = setupTestServer({ endpointGroups: ['debug'] });
+	let ownerAgent: SuperAgentTest;
+
+	beforeAll(async () => {
+		const owner = await createOwner();
+		ownerAgent = testServer.authAgentFor(owner);
+		testServer.license.enable('feat:multipleMainInstances');
+	});
+
+	describe('GET /debug/multi-main-setup', () => {
+		test('should return multi-main setup details', async () => {
+			const workflowId = generateNanoId();
+			const webhooks = [{ id: workflowId, name: randomName() }] as WorkflowEntity[];
+			const triggersAndPollers = [{ id: workflowId, name: randomName() }] as WorkflowEntity[];
+			const activationErrors = { [workflowId]: 'Failed to activate' };
+			const instanceId = 'main-71JdWtq306epIFki';
+			const leaderKey = 'some-leader-key';
+
+			workflowRepository.findIn.mockResolvedValue(triggersAndPollers);
+			workflowRepository.findWebhookBasedActiveWorkflows.mockResolvedValue(webhooks);
+			activeWorkflowManager.allActiveInMemory.mockReturnValue([workflowId]);
+			activeWorkflowManager.getAllWorkflowActivationErrors.mockResolvedValue(activationErrors);
+
+			jest.spyOn(OrchestrationService.prototype, 'instanceId', 'get').mockReturnValue(instanceId);
+			jest.spyOn(MultiMainSetup.prototype, 'fetchLeaderKey').mockResolvedValue(leaderKey);
+			jest.spyOn(OrchestrationService.prototype, 'isLeader', 'get').mockReturnValue(true);
+
+			const response = await ownerAgent.get('/debug/multi-main-setup').expect(200);
+
+			expect(response.body.data).toMatchObject({
+				instanceId,
+				leaderKey,
+				isLeader: true,
+				activeWorkflows: {
+					webhooks,
+					triggersAndPollers,
+				},
+				activationErrors,
+			});
+		});
+	});
+});
diff --git a/packages/cli/test/integration/environments/SourceControl.test.ts b/packages/cli/test/integration/environments/SourceControl.test.ts
new file mode 100644
index 0000000000000..f1da8d0672f25
--- /dev/null
+++ b/packages/cli/test/integration/environments/SourceControl.test.ts
@@ -0,0 +1,80 @@
+import { Container } from 'typedi';
+import type { SuperAgentTest } from 'supertest';
+
+import type { User } from '@db/entities/User';
+import config from '@/config';
+import { SourceControlPreferencesService } from '@/environments/sourceControl/sourceControlPreferences.service.ee';
+import { SourceControlService } from '@/environments/sourceControl/sourceControl.service.ee';
+import type { SourceControlledFile } from '@/environments/sourceControl/types/sourceControlledFile';
+
+import * as utils from '../shared/utils/';
+import { createUser } from '../shared/db/users';
+
+let authOwnerAgent: SuperAgentTest;
+let owner: User;
+
+const testServer = utils.setupTestServer({
+	endpointGroups: ['sourceControl', 'license', 'auth'],
+	enabledFeatures: ['feat:sourceControl', 'feat:sharing'],
+});
+
+beforeAll(async () => {
+	owner = await createUser({ role: 'global:owner' });
+	authOwnerAgent = testServer.authAgentFor(owner);
+
+	Container.get(SourceControlPreferencesService).isSourceControlConnected = () => true;
+});
+
+describe('GET /sourceControl/preferences', () => {
+	test('should return Source Control preferences', async () => {
+		await authOwnerAgent
+			.get('/source-control/preferences')
+			.expect(200)
+			.expect((res) => {
+				return 'repositoryUrl' in res.body && 'branchName' in res.body;
+			});
+	});
+
+	test('should return repo sync status', async () => {
+		Container.get(SourceControlService).getStatus = async () => {
+			return [
+				{
+					id: 'haQetoXq9GxHSkft',
+					name: 'My workflow 6 edit',
+					type: 'workflow',
+					status: 'modified',
+					location: 'local',
+					conflict: true,
+					file: '/Users/michael/.n8n/git/workflows/haQetoXq9GxHSkft.json',
+					updatedAt: '2023-07-14T11:24:41.000Z',
+				},
+			] as SourceControlledFile[];
+		};
+		await authOwnerAgent
+			.get('/source-control/get-status')
+			.query({ direction: 'push', preferLocalVersion: 'true', verbose: 'false' })
+			.expect(200)
+			.expect((res) => {
+				const data: SourceControlledFile[] = res.body.data;
+				expect(data.length).toBe(1);
+				expect(data[0].id).toBe('haQetoXq9GxHSkft');
+			});
+	});
+
+	test('refreshing key pairsshould return new rsa key', async () => {
+		config.set('sourceControl.defaultKeyPairType', 'rsa');
+		await authOwnerAgent
+			.post('/source-control/generate-key-pair')
+			.send()
+			.expect(200)
+			.expect((res) => {
+				expect(
+					Container.get(SourceControlPreferencesService).getPreferences().keyGeneratorType,
+				).toBe('rsa');
+				expect(res.body.data).toHaveProperty('publicKey');
+				expect(res.body.data).toHaveProperty('keyGeneratorType');
+				expect(res.body.data.keyGeneratorType).toBe('rsa');
+				expect(res.body.data.publicKey).toContain('ssh-rsa');
+			});
+	});
+});
diff --git a/packages/cli/test/integration/environments/VersionControl.test.ts b/packages/cli/test/integration/environments/VersionControl.test.ts
deleted file mode 100644
index d438bf906b3d8..0000000000000
--- a/packages/cli/test/integration/environments/VersionControl.test.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { Container } from 'typedi';
-import type { SuperAgentTest } from 'supertest';
-import type { User } from '@db/entities/User';
-import { License } from '@/License';
-import * as testDb from '../shared/testDb';
-import * as utils from '../shared/utils';
-import { VersionControlService } from '../../../src/environments/versionControl/versionControl.service.ee';
-
-let owner: User;
-let authOwnerAgent: SuperAgentTest;
-
-beforeAll(async () => {
-	Container.get(License).isVersionControlLicensed = () => true;
-	const app = await utils.initTestServer({ endpointGroups: ['versionControl'] });
-	owner = await testDb.createOwner();
-	authOwnerAgent = utils.createAuthAgent(app)(owner);
-});
-
-afterAll(async () => {
-	await testDb.terminate();
-});
-
-describe('GET /versionControl/preferences', () => {
-	test('should return Version Control preferences', async () => {
-		await Container.get(VersionControlService).generateAndSaveKeyPair();
-		await authOwnerAgent
-			.get('/versionControl/preferences')
-			.expect(200)
-			.expect((res) => {
-				return (
-					'privateKey' in res.body &&
-					'publicKey' in res.body &&
-					res.body.publicKey.includes('ssh-ed25519') &&
-					res.body.privateKey.includes('BEGIN OPENSSH PRIVATE KEY')
-				);
-			});
-	});
-});
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
new file mode 100644
index 0000000000000..fd3327cedd5a9
--- /dev/null
+++ b/packages/cli/test/integration/environments/source-control-import.service.test.ts
@@ -0,0 +1,149 @@
+import fsp from 'node:fs/promises';
+import Container from 'typedi';
+import { mock } from 'jest-mock-extended';
+import * as utils from 'n8n-workflow';
+import { Cipher } from 'n8n-core';
+import { nanoid } from 'nanoid';
+import type { InstanceSettings } from 'n8n-core';
+
+import * as testDb from '../shared/testDb';
+import { SourceControlImportService } from '@/environments/sourceControl/sourceControlImport.service.ee';
+import { createMember, getGlobalOwner } from '../shared/db/users';
+import { SharedCredentialsRepository } from '@/databases/repositories/sharedCredentials.repository';
+import { mockInstance } from '../../shared/mocking';
+import type { SourceControlledFile } from '@/environments/sourceControl/types/sourceControlledFile';
+import type { ExportableCredential } from '@/environments/sourceControl/types/exportableCredential';
+
+describe('SourceControlImportService', () => {
+	let service: SourceControlImportService;
+	const cipher = mockInstance(Cipher);
+
+	beforeAll(async () => {
+		service = new SourceControlImportService(
+			mock(),
+			mock(),
+			mock(),
+			mock(),
+			mock<InstanceSettings>({ n8nFolder: '/some-path' }),
+		);
+
+		await testDb.init();
+	});
+
+	afterEach(async () => {
+		await testDb.truncate(['Credentials', 'SharedCredentials']);
+
+		jest.restoreAllMocks();
+	});
+
+	afterAll(async () => {
+		await testDb.terminate();
+	});
+
+	describe('importCredentialsFromWorkFolder()', () => {
+		describe('if user email specified by `ownedBy` exists at target instance', () => {
+			it('should assign credential ownership to original user', async () => {
+				const [importingUser, member] = await Promise.all([getGlobalOwner(), createMember()]);
+
+				fsp.readFile = jest.fn().mockResolvedValue(Buffer.from('some-content'));
+
+				const CREDENTIAL_ID = nanoid();
+
+				const stub: ExportableCredential = {
+					id: CREDENTIAL_ID,
+					name: 'My Credential',
+					type: 'someCredentialType',
+					data: {},
+					ownedBy: member.email, // user at source instance owns credential
+				};
+
+				jest.spyOn(utils, 'jsonParse').mockReturnValue(stub);
+
+				cipher.encrypt.mockReturnValue('some-encrypted-data');
+
+				await service.importCredentialsFromWorkFolder(
+					[mock<SourceControlledFile>({ id: CREDENTIAL_ID })],
+					importingUser.id,
+				);
+
+				const sharing = await Container.get(SharedCredentialsRepository).findOneBy({
+					credentialsId: CREDENTIAL_ID,
+					userId: member.id,
+					role: 'credential:owner',
+				});
+
+				expect(sharing).toBeTruthy(); // same user at target instance owns credential
+			});
+		});
+
+		describe('if user email specified by `ownedBy` is `null`', () => {
+			it('should assign credential ownership to importing user', async () => {
+				const importingUser = await getGlobalOwner();
+
+				fsp.readFile = jest.fn().mockResolvedValue(Buffer.from('some-content'));
+
+				const CREDENTIAL_ID = nanoid();
+
+				const stub: ExportableCredential = {
+					id: CREDENTIAL_ID,
+					name: 'My Credential',
+					type: 'someCredentialType',
+					data: {},
+					ownedBy: null,
+				};
+
+				jest.spyOn(utils, 'jsonParse').mockReturnValue(stub);
+
+				cipher.encrypt.mockReturnValue('some-encrypted-data');
+
+				await service.importCredentialsFromWorkFolder(
+					[mock<SourceControlledFile>({ id: CREDENTIAL_ID })],
+					importingUser.id,
+				);
+
+				const sharing = await Container.get(SharedCredentialsRepository).findOneBy({
+					credentialsId: CREDENTIAL_ID,
+					userId: importingUser.id,
+					role: 'credential:owner',
+				});
+
+				expect(sharing).toBeTruthy(); // original user has no email, so importing user owns credential
+			});
+		});
+
+		describe('if user email specified by `ownedBy` does not exist at target instance', () => {
+			it('should assign credential ownership to importing user', async () => {
+				const importingUser = await getGlobalOwner();
+
+				fsp.readFile = jest.fn().mockResolvedValue(Buffer.from('some-content'));
+
+				const CREDENTIAL_ID = nanoid();
+
+				const stub: ExportableCredential = {
+					id: CREDENTIAL_ID,
+					name: 'My Credential',
+					type: 'someCredentialType',
+					data: {},
+					ownedBy: 'user@test.com', // user at source instance owns credential
+				};
+
+				jest.spyOn(utils, 'jsonParse').mockReturnValue(stub);
+
+				cipher.encrypt.mockReturnValue('some-encrypted-data');
+
+				await service.importCredentialsFromWorkFolder(
+					[mock<SourceControlledFile>({ id: CREDENTIAL_ID })],
+					importingUser.id,
+				);
+
+				const sharing = await Container.get(SharedCredentialsRepository).findOneBy({
+					credentialsId: CREDENTIAL_ID,
+					userId: importingUser.id,
+					role: 'credential:owner',
+				});
+
+				expect(sharing).toBeTruthy(); // original user missing, so importing user owns credential
+			});
+		});
+	});
+});
diff --git a/packages/cli/test/integration/eventbus.ee.test.ts b/packages/cli/test/integration/eventbus.ee.test.ts
new file mode 100644
index 0000000000000..f486f39abe12b
--- /dev/null
+++ b/packages/cli/test/integration/eventbus.ee.test.ts
@@ -0,0 +1,451 @@
+import { Container } from 'typedi';
+import config from '@/config';
+import axios from 'axios';
+import syslog from 'syslog-client';
+import { v4 as uuid } from 'uuid';
+import type { SuperAgentTest } from 'supertest';
+import type {
+	MessageEventBusDestinationSentryOptions,
+	MessageEventBusDestinationSyslogOptions,
+	MessageEventBusDestinationWebhookOptions,
+} from 'n8n-workflow';
+import {
+	defaultMessageEventBusDestinationSentryOptions,
+	defaultMessageEventBusDestinationSyslogOptions,
+	defaultMessageEventBusDestinationWebhookOptions,
+} from 'n8n-workflow';
+
+import type { User } from '@db/entities/User';
+import { MessageEventBus } from '@/eventbus/MessageEventBus/MessageEventBus';
+import { EventMessageGeneric } from '@/eventbus/EventMessageClasses/EventMessageGeneric';
+import type { MessageEventBusDestinationSyslog } from '@/eventbus/MessageEventBusDestination/MessageEventBusDestinationSyslog.ee';
+import type { MessageEventBusDestinationWebhook } from '@/eventbus/MessageEventBusDestination/MessageEventBusDestinationWebhook.ee';
+import type { MessageEventBusDestinationSentry } from '@/eventbus/MessageEventBusDestination/MessageEventBusDestinationSentry.ee';
+import { EventMessageAudit } from '@/eventbus/EventMessageClasses/EventMessageAudit';
+import type { EventNamesTypes } from '@/eventbus/EventMessageClasses';
+import { EventMessageWorkflow } from '@/eventbus/EventMessageClasses/EventMessageWorkflow';
+import { EventMessageNode } from '@/eventbus/EventMessageClasses/EventMessageNode';
+import { ExecutionDataRecoveryService } from '@/eventbus/executionDataRecovery.service';
+
+import * as utils from './shared/utils';
+import { createUser } from './shared/db/users';
+import { mockInstance } from '../shared/mocking';
+
+jest.unmock('@/eventbus/MessageEventBus/MessageEventBus');
+jest.mock('axios');
+const mockedAxios = axios as jest.Mocked<typeof axios>;
+jest.mock('syslog-client');
+const mockedSyslog = syslog as jest.Mocked<typeof syslog>;
+
+let owner: User;
+let authOwnerAgent: SuperAgentTest;
+
+const testSyslogDestination: MessageEventBusDestinationSyslogOptions = {
+	...defaultMessageEventBusDestinationSyslogOptions,
+	id: 'b88038f4-0a89-4e94-89a9-658dfdb74539',
+	protocol: 'udp',
+	label: 'Test Syslog',
+	enabled: false,
+	subscribedEvents: ['n8n.test.message', 'n8n.audit.user.updated'],
+};
+
+const testWebhookDestination: MessageEventBusDestinationWebhookOptions = {
+	...defaultMessageEventBusDestinationWebhookOptions,
+	id: '88be6560-bfb4-455c-8aa1-06971e9e5522',
+	url: 'http://localhost:3456',
+	method: 'POST',
+	label: 'Test Webhook',
+	enabled: false,
+	subscribedEvents: ['n8n.test.message', 'n8n.audit.user.updated'],
+};
+
+const testSentryDestination: MessageEventBusDestinationSentryOptions = {
+	...defaultMessageEventBusDestinationSentryOptions,
+	id: '450ca04b-87dd-4837-a052-ab3a347a00e9',
+	dsn: 'http://localhost:3000',
+	label: 'Test Sentry',
+	enabled: false,
+	subscribedEvents: ['n8n.test.message', 'n8n.audit.user.updated'],
+};
+
+let eventBus: MessageEventBus;
+
+async function confirmIdInAll(id: string) {
+	const sent = await eventBus.getEventsAll();
+	expect(sent.length).toBeGreaterThan(0);
+	expect(sent.find((msg) => msg.id === id)).toBeTruthy();
+}
+
+async function confirmIdSent(id: string) {
+	const sent = await eventBus.getEventsSent();
+	expect(sent.length).toBeGreaterThan(0);
+	expect(sent.find((msg) => msg.id === id)).toBeTruthy();
+}
+
+mockInstance(ExecutionDataRecoveryService);
+const testServer = utils.setupTestServer({
+	endpointGroups: ['eventBus'],
+	enabledFeatures: ['feat:logStreaming'],
+});
+
+beforeAll(async () => {
+	owner = await createUser({ role: 'global:owner' });
+	authOwnerAgent = testServer.authAgentFor(owner);
+
+	mockedSyslog.createClient.mockImplementation(() => new syslog.Client());
+
+	config.set('eventBus.logWriter.logBaseName', 'n8n-test-logwriter');
+	config.set('eventBus.logWriter.keepLogCount', 1);
+
+	eventBus = Container.get(MessageEventBus);
+	await eventBus.initialize();
+});
+
+afterAll(async () => {
+	jest.mock('@/eventbus/MessageEventBus/MessageEventBus');
+	await eventBus?.close();
+});
+
+test('should have a running logwriter process', () => {
+	const thread = eventBus.logWriter.worker;
+	expect(thread).toBeDefined();
+});
+
+test('should have logwriter log messages', async () => {
+	const testMessage = new EventMessageGeneric({
+		eventName: 'n8n.test.message' as EventNamesTypes,
+		id: uuid(),
+	});
+	await eventBus.send(testMessage);
+	await new Promise((resolve) => {
+		eventBus.logWriter.worker?.once('message', async (msg: { command: string; data: any }) => {
+			expect(msg.command).toBe('appendMessageToLog');
+			expect(msg.data).toBe(true);
+			await confirmIdInAll(testMessage.id);
+			resolve(true);
+		});
+	});
+});
+
+describe('GET /eventbus/destination', () => {
+	test('should fail due to missing authentication', async () => {
+		const response = await testServer.authlessAgent.get('/eventbus/destination');
+		expect(response.statusCode).toBe(401);
+	});
+
+	test('all returned destinations should exist in eventbus', async () => {
+		const response = await authOwnerAgent.get('/eventbus/destination');
+		expect(response.statusCode).toBe(200);
+
+		const data = response.body.data;
+		expect(data).toBeTruthy();
+		expect(Array.isArray(data)).toBeTruthy();
+
+		for (let index = 0; index < data.length; index++) {
+			const destination = data[index];
+			const foundDestinations = await eventBus.findDestination(destination.id);
+			expect(Array.isArray(foundDestinations)).toBeTruthy();
+			expect(foundDestinations.length).toBe(1);
+			expect(foundDestinations[0].label).toBe(destination.label);
+		}
+	});
+});
+
+describe('POST /eventbus/destination', () => {
+	test('create syslog destination', async () => {
+		const response = await authOwnerAgent.post('/eventbus/destination').send(testSyslogDestination);
+		expect(response.statusCode).toBe(200);
+	});
+
+	test('create sentry destination', async () => {
+		const response = await authOwnerAgent.post('/eventbus/destination').send(testSentryDestination);
+		expect(response.statusCode).toBe(200);
+	});
+
+	test('create webhook destination', async () => {
+		const response = await authOwnerAgent
+			.post('/eventbus/destination')
+			.send(testWebhookDestination);
+		expect(response.statusCode).toBe(200);
+	});
+});
+
+// this test (presumably the mocking) is causing the test suite to randomly fail
+// eslint-disable-next-line n8n-local-rules/no-skipped-tests
+test.skip('should send message to syslog', async () => {
+	const testMessage = new EventMessageGeneric({
+		eventName: 'n8n.test.message' as EventNamesTypes,
+		id: uuid(),
+	});
+
+	const syslogDestination = eventBus.destinations[
+		testSyslogDestination.id!
+	] as MessageEventBusDestinationSyslog;
+
+	syslogDestination.enable();
+
+	const mockedSyslogClientLog = jest.spyOn(syslogDestination.client, 'log');
+	mockedSyslogClientLog.mockImplementation((_m, _options, _cb) => {
+		eventBus.confirmSent(testMessage, {
+			id: syslogDestination.id,
+			name: syslogDestination.label,
+		});
+		return syslogDestination.client;
+	});
+
+	await eventBus.send(testMessage);
+	await new Promise((resolve) => {
+		eventBus.logWriter.worker?.on(
+			'message',
+			async function handler001(msg: { command: string; data: any }) {
+				if (msg.command === 'appendMessageToLog') {
+					await confirmIdInAll(testMessage.id);
+				} else if (msg.command === 'confirmMessageSent') {
+					await confirmIdSent(testMessage.id);
+					expect(mockedSyslogClientLog).toHaveBeenCalled();
+					syslogDestination.disable();
+					eventBus.logWriter.worker?.removeListener('message', handler001);
+					resolve(true);
+				}
+			},
+		);
+	});
+});
+
+// eslint-disable-next-line n8n-local-rules/no-skipped-tests
+test.skip('should confirm send message if there are no subscribers', async () => {
+	const testMessageUnsubscribed = new EventMessageGeneric({
+		eventName: 'n8n.test.unsub' as EventNamesTypes,
+		id: uuid(),
+	});
+
+	const syslogDestination = eventBus.destinations[
+		testSyslogDestination.id!
+	] as MessageEventBusDestinationSyslog;
+
+	syslogDestination.enable();
+
+	await eventBus.send(testMessageUnsubscribed);
+
+	await new Promise((resolve) => {
+		eventBus.logWriter.worker?.on(
+			'message',
+			async function handler002(msg: { command: string; data: any }) {
+				if (msg.command === 'appendMessageToLog') {
+					await confirmIdInAll(testMessageUnsubscribed.id);
+				} else if (msg.command === 'confirmMessageSent') {
+					await confirmIdSent(testMessageUnsubscribed.id);
+					syslogDestination.disable();
+					eventBus.logWriter.worker?.removeListener('message', handler002);
+					resolve(true);
+				}
+			},
+		);
+	});
+});
+
+test('should anonymize audit message to syslog ', async () => {
+	const testAuditMessage = new EventMessageAudit({
+		eventName: 'n8n.audit.user.updated',
+		payload: {
+			_secret: 'secret',
+			public: 'public',
+		},
+		id: uuid(),
+	});
+
+	const syslogDestination = eventBus.destinations[
+		testSyslogDestination.id!
+	] as MessageEventBusDestinationSyslog;
+
+	syslogDestination.enable();
+
+	const mockedSyslogClientLog = jest.spyOn(syslogDestination.client, 'log');
+	mockedSyslogClientLog.mockImplementation((m, _options, _cb) => {
+		const o = JSON.parse(m);
+		expect(o).toHaveProperty('payload');
+		expect(o.payload).toHaveProperty('_secret');
+		syslogDestination.anonymizeAuditMessages
+			? expect(o.payload._secret).toBe('*')
+			: expect(o.payload._secret).toBe('secret');
+		expect(o.payload).toHaveProperty('public');
+		expect(o.payload.public).toBe('public');
+		return syslogDestination.client;
+	});
+
+	syslogDestination.anonymizeAuditMessages = true;
+	await eventBus.send(testAuditMessage);
+	await new Promise((resolve) => {
+		eventBus.logWriter.worker?.on(
+			'message',
+			async function handler005(msg: { command: string; data: any }) {
+				if (msg.command === 'appendMessageToLog') {
+					const sent = await eventBus.getEventsAll();
+					await confirmIdInAll(testAuditMessage.id);
+					expect(mockedSyslogClientLog).toHaveBeenCalled();
+					eventBus.logWriter.worker?.removeListener('message', handler005);
+					resolve(true);
+				}
+			},
+		);
+	});
+
+	syslogDestination.anonymizeAuditMessages = false;
+	await eventBus.send(testAuditMessage);
+	await new Promise((resolve) => {
+		eventBus.logWriter.worker?.on(
+			'message',
+			async function handler006(msg: { command: string; data: any }) {
+				if (msg.command === 'appendMessageToLog') {
+					const sent = await eventBus.getEventsAll();
+					await confirmIdInAll(testAuditMessage.id);
+					expect(mockedSyslogClientLog).toHaveBeenCalled();
+					syslogDestination.disable();
+					eventBus.logWriter.worker?.removeListener('message', handler006);
+					resolve(true);
+				}
+			},
+		);
+	});
+});
+
+test('should send message to webhook ', async () => {
+	const testMessage = new EventMessageGeneric({
+		eventName: 'n8n.test.message' as EventNamesTypes,
+		id: uuid(),
+	});
+
+	const webhookDestination = eventBus.destinations[
+		testWebhookDestination.id!
+	] as MessageEventBusDestinationWebhook;
+
+	webhookDestination.enable();
+
+	mockedAxios.post.mockResolvedValue({ status: 200, data: { msg: 'OK' } });
+	mockedAxios.request.mockResolvedValue({ status: 200, data: { msg: 'OK' } });
+
+	await eventBus.send(testMessage);
+	await new Promise((resolve) => {
+		eventBus.logWriter.worker?.on(
+			'message',
+			async function handler003(msg: { command: string; data: any }) {
+				if (msg.command === 'appendMessageToLog') {
+					await confirmIdInAll(testMessage.id);
+				} else if (msg.command === 'confirmMessageSent') {
+					await confirmIdSent(testMessage.id);
+					expect(mockedAxios.request).toHaveBeenCalled();
+					webhookDestination.disable();
+					eventBus.logWriter.worker?.removeListener('message', handler003);
+					resolve(true);
+				}
+			},
+		);
+	});
+});
+
+test('should send message to sentry ', async () => {
+	const testMessage = new EventMessageGeneric({
+		eventName: 'n8n.test.message' as EventNamesTypes,
+		id: uuid(),
+	});
+
+	const sentryDestination = eventBus.destinations[
+		testSentryDestination.id!
+	] as MessageEventBusDestinationSentry;
+
+	sentryDestination.enable();
+
+	const mockedSentryCaptureMessage = jest.spyOn(sentryDestination.sentryClient!, 'captureMessage');
+	mockedSentryCaptureMessage.mockImplementation((_m, _level, _hint, _scope) => {
+		eventBus.confirmSent(testMessage, {
+			id: sentryDestination.id,
+			name: sentryDestination.label,
+		});
+		return testMessage.id;
+	});
+
+	await eventBus.send(testMessage);
+	await new Promise((resolve) => {
+		eventBus.logWriter.worker?.on(
+			'message',
+			async function handler004(msg: { command: string; data: any }) {
+				if (msg.command === 'appendMessageToLog') {
+					await confirmIdInAll(testMessage.id);
+				} else if (msg.command === 'confirmMessageSent') {
+					await confirmIdSent(testMessage.id);
+					expect(mockedSentryCaptureMessage).toHaveBeenCalled();
+					sentryDestination.disable();
+					eventBus.logWriter.worker?.removeListener('message', handler004);
+					resolve(true);
+				}
+			},
+		);
+	});
+});
+
+test('DELETE /eventbus/destination delete all destinations by id', async () => {
+	const existingDestinationIds = [...Object.keys(eventBus.destinations)];
+
+	await Promise.all(
+		existingDestinationIds.map(async (id) => {
+			const response = await authOwnerAgent.del('/eventbus/destination').query({ id });
+			expect(response.statusCode).toBe(200);
+		}),
+	);
+
+	expect(Object.keys(eventBus.destinations).length).toBe(0);
+});
+
+// These two tests are running very flaky on CI due to the logwriter working in a worker
+// Mocking everything on the other would defeat the purpose of even testing them... so, skipping in CI for now.
+// eslint-disable-next-line n8n-local-rules/no-skipped-tests
+test.skip('should not find unfinished executions in recovery process', async () => {
+	eventBus.logWriter?.putMessage(
+		new EventMessageWorkflow({
+			eventName: 'n8n.workflow.started',
+			payload: { executionId: '509', isManual: false },
+		}),
+	);
+	eventBus.logWriter?.putMessage(
+		new EventMessageNode({
+			eventName: 'n8n.node.started',
+			payload: { executionId: '509', nodeName: 'Set', workflowName: 'test' },
+		}),
+	);
+	eventBus.logWriter?.putMessage(
+		new EventMessageNode({
+			eventName: 'n8n.node.finished',
+			payload: { executionId: '509', nodeName: 'Set', workflowName: 'test' },
+		}),
+	);
+	eventBus.logWriter?.putMessage(
+		new EventMessageWorkflow({
+			eventName: 'n8n.workflow.success',
+			payload: { executionId: '509', success: true },
+		}),
+	);
+	const unfinishedExecutions = await eventBus.getUnfinishedExecutions();
+
+	expect(Object.keys(unfinishedExecutions)).toHaveLength(0);
+});
+
+// eslint-disable-next-line n8n-local-rules/no-skipped-tests
+test.skip('should not find unfinished executions in recovery process', async () => {
+	eventBus.logWriter?.putMessage(
+		new EventMessageWorkflow({
+			eventName: 'n8n.workflow.started',
+			payload: { executionId: '510', isManual: false },
+		}),
+	);
+	eventBus.logWriter?.putMessage(
+		new EventMessageNode({
+			eventName: 'n8n.node.started',
+			payload: { executionId: '510', nodeName: 'Set', workflowName: 'test' },
+		}),
+	);
+
+	const unfinishedExecutions = await eventBus.getUnfinishedExecutions();
+
+	expect(Object.keys(unfinishedExecutions)).toHaveLength(1);
+	expect(Object.keys(unfinishedExecutions)).toContain('510');
+});
diff --git a/packages/cli/test/integration/eventbus.test.ts b/packages/cli/test/integration/eventbus.test.ts
index a5b712321747d..9e3e27dacb916 100644
--- a/packages/cli/test/integration/eventbus.test.ts
+++ b/packages/cli/test/integration/eventbus.test.ts
@@ -1,399 +1,66 @@
-import express from 'express';
-import config from '@/config';
-import axios from 'axios';
-import syslog from 'syslog-client';
-import { v4 as uuid } from 'uuid';
-import { Container } from 'typedi';
 import type { SuperAgentTest } from 'supertest';
-import * as utils from './shared/utils';
-import * as testDb from './shared/testDb';
-import { Role } from '@db/entities/Role';
-import { User } from '@db/entities/User';
-import {
-	defaultMessageEventBusDestinationSentryOptions,
-	defaultMessageEventBusDestinationSyslogOptions,
-	defaultMessageEventBusDestinationWebhookOptions,
-	MessageEventBusDestinationSentryOptions,
-	MessageEventBusDestinationSyslogOptions,
-	MessageEventBusDestinationWebhookOptions,
-} from 'n8n-workflow';
-import { eventBus } from '@/eventbus';
-import { EventMessageGeneric } from '@/eventbus/EventMessageClasses/EventMessageGeneric';
-import { MessageEventBusDestinationSyslog } from '@/eventbus/MessageEventBusDestination/MessageEventBusDestinationSyslog.ee';
-import { MessageEventBusDestinationWebhook } from '@/eventbus/MessageEventBusDestination/MessageEventBusDestinationWebhook.ee';
-import { MessageEventBusDestinationSentry } from '@/eventbus/MessageEventBusDestination/MessageEventBusDestinationSentry.ee';
-import { EventMessageAudit } from '@/eventbus/EventMessageClasses/EventMessageAudit';
-import { EventNamesTypes } from '@/eventbus/EventMessageClasses';
-import { License } from '@/License';
 
-jest.unmock('@/eventbus/MessageEventBus/MessageEventBus');
-jest.mock('axios');
-const mockedAxios = axios as jest.Mocked<typeof axios>;
-jest.mock('syslog-client');
-const mockedSyslog = syslog as jest.Mocked<typeof syslog>;
+import type { User } from '@db/entities/User';
+import { MessageEventBus } from '@/eventbus/MessageEventBus/MessageEventBus';
+import { ExecutionDataRecoveryService } from '@/eventbus/executionDataRecovery.service';
 
-let app: express.Application;
-let globalOwnerRole: Role;
-let owner: User;
-let unAuthOwnerAgent: SuperAgentTest;
-let authOwnerAgent: SuperAgentTest;
-
-const testSyslogDestination: MessageEventBusDestinationSyslogOptions = {
-	...defaultMessageEventBusDestinationSyslogOptions,
-	id: 'b88038f4-0a89-4e94-89a9-658dfdb74539',
-	protocol: 'udp',
-	label: 'Test Syslog',
-	enabled: false,
-	subscribedEvents: ['n8n.test.message', 'n8n.audit.user.updated'],
-};
-
-const testWebhookDestination: MessageEventBusDestinationWebhookOptions = {
-	...defaultMessageEventBusDestinationWebhookOptions,
-	id: '88be6560-bfb4-455c-8aa1-06971e9e5522',
-	url: 'http://localhost:3456',
-	method: `POST`,
-	label: 'Test Webhook',
-	enabled: false,
-	subscribedEvents: ['n8n.test.message', 'n8n.audit.user.updated'],
-};
-
-const testSentryDestination: MessageEventBusDestinationSentryOptions = {
-	...defaultMessageEventBusDestinationSentryOptions,
-	id: '450ca04b-87dd-4837-a052-ab3a347a00e9',
-	dsn: 'http://localhost:3000',
-	label: 'Test Sentry',
-	enabled: false,
-	subscribedEvents: ['n8n.test.message', 'n8n.audit.user.updated'],
-};
-
-async function confirmIdInAll(id: string) {
-	const sent = await eventBus.getEventsAll();
-	expect(sent.length).toBeGreaterThan(0);
-	expect(sent.find((msg) => msg.id === id)).toBeTruthy();
-}
-
-async function confirmIdSent(id: string) {
-	const sent = await eventBus.getEventsSent();
-	expect(sent.length).toBeGreaterThan(0);
-	expect(sent.find((msg) => msg.id === id)).toBeTruthy();
-}
-
-beforeAll(async () => {
-	Container.get(License).isLogStreamingEnabled = () => true;
-	app = await utils.initTestServer({ endpointGroups: ['eventBus'] });
-
-	globalOwnerRole = await testDb.getGlobalOwnerRole();
-	owner = await testDb.createUser({ globalRole: globalOwnerRole });
-
-	unAuthOwnerAgent = utils.createAgent(app, {
-		apiPath: 'internal',
-		auth: false,
-		user: owner,
-		version: 1,
-	});
-
-	authOwnerAgent = utils.createAgent(app, {
-		apiPath: 'internal',
-		auth: true,
-		user: owner,
-		version: 1,
-	});
-
-	mockedSyslog.createClient.mockImplementation(() => new syslog.Client());
-
-	utils.initConfigFile();
-	config.set('eventBus.logWriter.logBaseName', 'n8n-test-logwriter');
-	config.set('eventBus.logWriter.keepLogCount', 1);
-	config.set('userManagement.disabled', false);
-	config.set('userManagement.isInstanceOwnerSetUp', true);
-
-	await eventBus.initialize();
-});
-
-afterAll(async () => {
-	jest.mock('@/eventbus/MessageEventBus/MessageEventBus');
-	await testDb.terminate();
-	await eventBus.close();
-});
-
-test('should have a running logwriter process', () => {
-	const thread = eventBus.logWriter.worker;
-	expect(thread).toBeDefined();
-});
-
-test('should have logwriter log messages', async () => {
-	const testMessage = new EventMessageGeneric({
-		eventName: 'n8n.test.message' as EventNamesTypes,
-		id: uuid(),
-	});
-	await eventBus.send(testMessage);
-	await new Promise((resolve) => {
-		eventBus.logWriter.worker?.once('message', async (msg: { command: string; data: any }) => {
-			expect(msg.command).toBe('appendMessageToLog');
-			expect(msg.data).toBe(true);
-			await confirmIdInAll(testMessage.id);
-			resolve(true);
-		});
-	});
-});
-
-test('GET /eventbus/destination should fail due to missing authentication', async () => {
-	const response = await unAuthOwnerAgent.get('/eventbus/destination');
-	expect(response.statusCode).toBe(401);
-});
-
-test('POST /eventbus/destination create syslog destination', async () => {
-	const response = await authOwnerAgent.post('/eventbus/destination').send(testSyslogDestination);
-	expect(response.statusCode).toBe(200);
-});
-
-test('POST /eventbus/destination create sentry destination', async () => {
-	const response = await authOwnerAgent.post('/eventbus/destination').send(testSentryDestination);
-	expect(response.statusCode).toBe(200);
-});
-
-test('POST /eventbus/destination create webhook destination', async () => {
-	const response = await authOwnerAgent.post('/eventbus/destination').send(testWebhookDestination);
-	expect(response.statusCode).toBe(200);
-});
-
-test('GET /eventbus/destination all returned destinations should exist in eventbus', async () => {
-	const response = await authOwnerAgent.get('/eventbus/destination');
-	expect(response.statusCode).toBe(200);
+import * as utils from './shared/utils/';
+import { createUser } from './shared/db/users';
+import { mockInstance } from '../shared/mocking';
 
-	const data = response.body.data;
-	expect(data).toBeTruthy();
-	expect(Array.isArray(data)).toBeTruthy();
+/**
+ * NOTE: due to issues with mocking the MessageEventBus in multiple tests running in parallel,
+ * the event bus tests are run in the eventbus.ee.test.ts file
+ * The tests in this file are only checking endpoint permissions.
+ */
 
-	for (let index = 0; index < data.length; index++) {
-		const destination = data[index];
-		const foundDestinations = await eventBus.findDestination(destination.id);
-		expect(Array.isArray(foundDestinations)).toBeTruthy();
-		expect(foundDestinations.length).toBe(1);
-		expect(foundDestinations[0].label).toBe(destination.label);
-	}
-});
-
-// this test (presumably the mocking) is causing the test suite to randomly fail
-test.skip('should send message to syslog', async () => {
-	const testMessage = new EventMessageGeneric({
-		eventName: 'n8n.test.message' as EventNamesTypes,
-		id: uuid(),
-	});
-
-	const syslogDestination = eventBus.destinations[
-		testSyslogDestination.id!
-	] as MessageEventBusDestinationSyslog;
-
-	syslogDestination.enable();
-
-	const mockedSyslogClientLog = jest.spyOn(syslogDestination.client, 'log');
-	mockedSyslogClientLog.mockImplementation((_m, _options, _cb) => {
-		eventBus.confirmSent(testMessage, {
-			id: syslogDestination.id,
-			name: syslogDestination.label,
-		});
-		return syslogDestination.client;
-	});
+let owner: User;
+let authOwnerAgent: SuperAgentTest;
 
-	await eventBus.send(testMessage);
-	await new Promise((resolve) => {
-		eventBus.logWriter.worker?.on(
-			'message',
-			async function handler001(msg: { command: string; data: any }) {
-				if (msg.command === 'appendMessageToLog') {
-					await confirmIdInAll(testMessage.id);
-				} else if (msg.command === 'confirmMessageSent') {
-					await confirmIdSent(testMessage.id);
-					expect(mockedSyslogClientLog).toHaveBeenCalled();
-					syslogDestination.disable();
-					eventBus.logWriter.worker?.removeListener('message', handler001);
-					resolve(true);
-				}
-			},
-		);
-	});
+mockInstance(MessageEventBus);
+mockInstance(ExecutionDataRecoveryService);
+const testServer = utils.setupTestServer({
+	endpointGroups: ['eventBus'],
+	enabledFeatures: [], // do not enable logstreaming
 });
 
-test.skip('should confirm send message if there are no subscribers', async () => {
-	const testMessageUnsubscribed = new EventMessageGeneric({
-		eventName: 'n8n.test.unsub' as EventNamesTypes,
-		id: uuid(),
-	});
-
-	const syslogDestination = eventBus.destinations[
-		testSyslogDestination.id!
-	] as MessageEventBusDestinationSyslog;
-
-	syslogDestination.enable();
-
-	await eventBus.send(testMessageUnsubscribed);
-
-	await new Promise((resolve) => {
-		eventBus.logWriter.worker?.on(
-			'message',
-			async function handler002(msg: { command: string; data: any }) {
-				if (msg.command === 'appendMessageToLog') {
-					await confirmIdInAll(testMessageUnsubscribed.id);
-				} else if (msg.command === 'confirmMessageSent') {
-					await confirmIdSent(testMessageUnsubscribed.id);
-					syslogDestination.disable();
-					eventBus.logWriter.worker?.removeListener('message', handler002);
-					resolve(true);
-				}
-			},
-		);
-	});
+beforeAll(async () => {
+	owner = await createUser({ role: 'global:owner' });
+	authOwnerAgent = testServer.authAgentFor(owner);
 });
 
-test('should anonymize audit message to syslog ', async () => {
-	const testAuditMessage = new EventMessageAudit({
-		eventName: 'n8n.audit.user.updated',
-		payload: {
-			_secret: 'secret',
-			public: 'public',
-		},
-		id: uuid(),
+describe('GET /eventbus/destination', () => {
+	test('should fail due to missing authentication', async () => {
+		const response = await testServer.authlessAgent.get('/eventbus/destination');
+		expect(response.statusCode).toBe(401);
 	});
 
-	const syslogDestination = eventBus.destinations[
-		testSyslogDestination.id!
-	] as MessageEventBusDestinationSyslog;
-
-	syslogDestination.enable();
-
-	const mockedSyslogClientLog = jest.spyOn(syslogDestination.client, 'log');
-	mockedSyslogClientLog.mockImplementation((m, _options, _cb) => {
-		const o = JSON.parse(m);
-		expect(o).toHaveProperty('payload');
-		expect(o.payload).toHaveProperty('_secret');
-		syslogDestination.anonymizeAuditMessages
-			? expect(o.payload._secret).toBe('*')
-			: expect(o.payload._secret).toBe('secret');
-		expect(o.payload).toHaveProperty('public');
-		expect(o.payload.public).toBe('public');
-		return syslogDestination.client;
-	});
-
-	syslogDestination.anonymizeAuditMessages = true;
-	await eventBus.send(testAuditMessage);
-	await new Promise((resolve) => {
-		eventBus.logWriter.worker?.on(
-			'message',
-			async function handler005(msg: { command: string; data: any }) {
-				if (msg.command === 'appendMessageToLog') {
-					const sent = await eventBus.getEventsAll();
-					await confirmIdInAll(testAuditMessage.id);
-					expect(mockedSyslogClientLog).toHaveBeenCalled();
-					eventBus.logWriter.worker?.removeListener('message', handler005);
-					resolve(true);
-				}
-			},
-		);
-	});
-
-	syslogDestination.anonymizeAuditMessages = false;
-	await eventBus.send(testAuditMessage);
-	await new Promise((resolve) => {
-		eventBus.logWriter.worker?.on(
-			'message',
-			async function handler006(msg: { command: string; data: any }) {
-				if (msg.command === 'appendMessageToLog') {
-					const sent = await eventBus.getEventsAll();
-					await confirmIdInAll(testAuditMessage.id);
-					expect(mockedSyslogClientLog).toHaveBeenCalled();
-					syslogDestination.disable();
-					eventBus.logWriter.worker?.removeListener('message', handler006);
-					resolve(true);
-				}
-			},
-		);
+	test('should fail due to missing license when authenticated', async () => {
+		const response = await authOwnerAgent.get('/eventbus/destination');
+		expect(response.statusCode).toBe(403);
 	});
 });
 
-test('should send message to webhook ', async () => {
-	const testMessage = new EventMessageGeneric({
-		eventName: 'n8n.test.message' as EventNamesTypes,
-		id: uuid(),
+describe('POST /eventbus/destination', () => {
+	test('should fail due to missing authentication', async () => {
+		const response = await testServer.authlessAgent.post('/eventbus/destination');
+		expect(response.statusCode).toBe(401);
 	});
 
-	const webhookDestination = eventBus.destinations[
-		testWebhookDestination.id!
-	] as MessageEventBusDestinationWebhook;
-
-	webhookDestination.enable();
-
-	mockedAxios.post.mockResolvedValue({ status: 200, data: { msg: 'OK' } });
-	mockedAxios.request.mockResolvedValue({ status: 200, data: { msg: 'OK' } });
-
-	await eventBus.send(testMessage);
-	await new Promise((resolve) => {
-		eventBus.logWriter.worker?.on(
-			'message',
-			async function handler003(msg: { command: string; data: any }) {
-				if (msg.command === 'appendMessageToLog') {
-					await confirmIdInAll(testMessage.id);
-				} else if (msg.command === 'confirmMessageSent') {
-					await confirmIdSent(testMessage.id);
-					expect(mockedAxios.request).toHaveBeenCalled();
-					webhookDestination.disable();
-					eventBus.logWriter.worker?.removeListener('message', handler003);
-					resolve(true);
-				}
-			},
-		);
+	test('should fail due to missing license when authenticated', async () => {
+		const response = await authOwnerAgent.post('/eventbus/destination');
+		expect(response.statusCode).toBe(403);
 	});
 });
 
-test('should send message to sentry ', async () => {
-	const testMessage = new EventMessageGeneric({
-		eventName: 'n8n.test.message' as EventNamesTypes,
-		id: uuid(),
+describe('DELETE /eventbus/destination', () => {
+	test('should fail due to missing authentication', async () => {
+		const response = await testServer.authlessAgent.del('/eventbus/destination');
+		expect(response.statusCode).toBe(401);
 	});
 
-	const sentryDestination = eventBus.destinations[
-		testSentryDestination.id!
-	] as MessageEventBusDestinationSentry;
-
-	sentryDestination.enable();
-
-	const mockedSentryCaptureMessage = jest.spyOn(sentryDestination.sentryClient!, 'captureMessage');
-	mockedSentryCaptureMessage.mockImplementation((_m, _level, _hint, _scope) => {
-		eventBus.confirmSent(testMessage, {
-			id: sentryDestination.id,
-			name: sentryDestination.label,
-		});
-		return testMessage.id;
-	});
-
-	await eventBus.send(testMessage);
-	await new Promise((resolve) => {
-		eventBus.logWriter.worker?.on(
-			'message',
-			async function handler004(msg: { command: string; data: any }) {
-				if (msg.command === 'appendMessageToLog') {
-					await confirmIdInAll(testMessage.id);
-				} else if (msg.command === 'confirmMessageSent') {
-					await confirmIdSent(testMessage.id);
-					expect(mockedSentryCaptureMessage).toHaveBeenCalled();
-					sentryDestination.disable();
-					eventBus.logWriter.worker?.removeListener('message', handler004);
-					resolve(true);
-				}
-			},
-		);
+	test('should fail due to missing license when authenticated', async () => {
+		const response = await authOwnerAgent.del('/eventbus/destination');
+		expect(response.statusCode).toBe(403);
 	});
 });
-
-test('DEL /eventbus/destination delete all destinations by id', async () => {
-	const existingDestinationIds = [...Object.keys(eventBus.destinations)];
-
-	await Promise.all(
-		existingDestinationIds.map(async (id) => {
-			const response = await authOwnerAgent.del('/eventbus/destination').query({ id });
-			expect(response.statusCode).toBe(200);
-		}),
-	);
-
-	expect(Object.keys(eventBus.destinations).length).toBe(0);
-});
diff --git a/packages/cli/test/integration/execution.service.integration.test.ts b/packages/cli/test/integration/execution.service.integration.test.ts
new file mode 100644
index 0000000000000..834720696d582
--- /dev/null
+++ b/packages/cli/test/integration/execution.service.integration.test.ts
@@ -0,0 +1,411 @@
+import { ExecutionRepository } from '@/databases/repositories/execution.repository';
+import { ExecutionService } from '@/executions/execution.service';
+import { mock } from 'jest-mock-extended';
+import Container from 'typedi';
+import { createWorkflow } from './shared/db/workflows';
+import { createExecution } from './shared/db/executions';
+import * as testDb from './shared/testDb';
+import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
+import type { ExecutionSummaries } from '@/executions/execution.types';
+import { ExecutionMetadataRepository } from '@/databases/repositories/executionMetadata.repository';
+
+describe('ExecutionService', () => {
+	let executionService: ExecutionService;
+	let executionRepository: ExecutionRepository;
+
+	beforeAll(async () => {
+		await testDb.init();
+
+		executionRepository = Container.get(ExecutionRepository);
+
+		executionService = new ExecutionService(
+			mock(),
+			mock(),
+			mock(),
+			executionRepository,
+			Container.get(WorkflowRepository),
+			mock(),
+			mock(),
+			mock(),
+		);
+	});
+
+	afterEach(async () => {
+		await testDb.truncate(['Execution']);
+	});
+
+	afterAll(async () => {
+		await testDb.terminate();
+	});
+
+	describe('findRangeWithCount', () => {
+		test('should return execution summaries', async () => {
+			const workflow = await createWorkflow();
+
+			await Promise.all([
+				createExecution({ status: 'success' }, workflow),
+				createExecution({ status: 'success' }, workflow),
+			]);
+
+			const query: ExecutionSummaries.RangeQuery = {
+				kind: 'range',
+				status: ['success'],
+				range: { limit: 20 },
+				accessibleWorkflowIds: [workflow.id],
+			};
+
+			const output = await executionService.findRangeWithCount(query);
+
+			const summaryShape = {
+				id: expect.any(String),
+				workflowId: expect.any(String),
+				mode: expect.any(String),
+				retryOf: null,
+				status: expect.any(String),
+				startedAt: expect.any(String),
+				stoppedAt: expect.any(String),
+				waitTill: null,
+				retrySuccessId: null,
+				workflowName: expect.any(String),
+			};
+
+			expect(output.count).toBe(2);
+			expect(output.estimated).toBe(false);
+			expect(output.results).toEqual([summaryShape, summaryShape]);
+		});
+
+		test('should limit executions', async () => {
+			const workflow = await createWorkflow();
+
+			await Promise.all([
+				createExecution({ status: 'success' }, workflow),
+				createExecution({ status: 'success' }, workflow),
+				createExecution({ status: 'success' }, workflow),
+			]);
+
+			const query: ExecutionSummaries.RangeQuery = {
+				kind: 'range',
+				status: ['success'],
+				range: { limit: 2 },
+				accessibleWorkflowIds: [workflow.id],
+			};
+
+			const output = await executionService.findRangeWithCount(query);
+
+			expect(output.count).toBe(3);
+			expect(output.estimated).toBe(false);
+			expect(output.results).toHaveLength(2);
+		});
+
+		test('should retrieve executions before `lastId`, excluding it', async () => {
+			const workflow = await createWorkflow();
+
+			await Promise.all([
+				createExecution({ status: 'success' }, workflow),
+				createExecution({ status: 'success' }, workflow),
+				createExecution({ status: 'success' }, workflow),
+				createExecution({ status: 'success' }, workflow),
+			]);
+
+			const [firstId, secondId] = await executionRepository.getAllIds();
+
+			const query: ExecutionSummaries.RangeQuery = {
+				kind: 'range',
+				range: { limit: 20, lastId: secondId },
+				accessibleWorkflowIds: [workflow.id],
+			};
+
+			const output = await executionService.findRangeWithCount(query);
+
+			expect(output.count).toBe(4);
+			expect(output.estimated).toBe(false);
+			expect(output.results).toEqual(
+				expect.arrayContaining([expect.objectContaining({ id: firstId })]),
+			);
+		});
+
+		test('should retrieve executions after `firstId`, excluding it', async () => {
+			const workflow = await createWorkflow();
+
+			await Promise.all([
+				createExecution({ status: 'success' }, workflow),
+				createExecution({ status: 'success' }, workflow),
+				createExecution({ status: 'success' }, workflow),
+				createExecution({ status: 'success' }, workflow),
+			]);
+
+			const [firstId, secondId, thirdId, fourthId] = await executionRepository.getAllIds();
+
+			const query: ExecutionSummaries.RangeQuery = {
+				kind: 'range',
+				range: { limit: 20, firstId },
+				accessibleWorkflowIds: [workflow.id],
+			};
+
+			const output = await executionService.findRangeWithCount(query);
+
+			expect(output.count).toBe(4);
+			expect(output.estimated).toBe(false);
+			expect(output.results).toEqual(
+				expect.arrayContaining([
+					expect.objectContaining({ id: fourthId }),
+					expect.objectContaining({ id: thirdId }),
+					expect.objectContaining({ id: secondId }),
+				]),
+			);
+		});
+
+		test('should filter executions by `status`', async () => {
+			const workflow = await createWorkflow();
+
+			await Promise.all([
+				createExecution({ status: 'success' }, workflow),
+				createExecution({ status: 'success' }, workflow),
+				createExecution({ status: 'waiting' }, workflow),
+				createExecution({ status: 'waiting' }, workflow),
+			]);
+
+			const query: ExecutionSummaries.RangeQuery = {
+				kind: 'range',
+				status: ['success'],
+				range: { limit: 20 },
+				accessibleWorkflowIds: [workflow.id],
+			};
+
+			const output = await executionService.findRangeWithCount(query);
+
+			expect(output.count).toBe(2);
+			expect(output.estimated).toBe(false);
+			expect(output.results).toEqual([
+				expect.objectContaining({ status: 'success' }),
+				expect.objectContaining({ status: 'success' }),
+			]);
+		});
+
+		test('should filter executions by `workflowId`', async () => {
+			const firstWorkflow = await createWorkflow();
+			const secondWorkflow = await createWorkflow();
+
+			await Promise.all([
+				createExecution({ status: 'success' }, firstWorkflow),
+				createExecution({ status: 'success' }, secondWorkflow),
+				createExecution({ status: 'success' }, secondWorkflow),
+				createExecution({ status: 'success' }, secondWorkflow),
+			]);
+
+			const query: ExecutionSummaries.RangeQuery = {
+				kind: 'range',
+				range: { limit: 20 },
+				workflowId: firstWorkflow.id,
+				accessibleWorkflowIds: [firstWorkflow.id, secondWorkflow.id],
+			};
+
+			const output = await executionService.findRangeWithCount(query);
+
+			expect(output.count).toBe(1);
+			expect(output.estimated).toBe(false);
+			expect(output.results).toEqual(
+				expect.arrayContaining([expect.objectContaining({ workflowId: firstWorkflow.id })]),
+			);
+		});
+
+		test('should filter executions by `startedBefore`', async () => {
+			const workflow = await createWorkflow();
+
+			await Promise.all([
+				createExecution({ startedAt: new Date('2020-06-01') }, workflow),
+				createExecution({ startedAt: new Date('2020-12-31') }, workflow),
+			]);
+
+			const query: ExecutionSummaries.RangeQuery = {
+				kind: 'range',
+				range: { limit: 20 },
+				startedBefore: '2020-07-01',
+				accessibleWorkflowIds: [workflow.id],
+			};
+
+			const output = await executionService.findRangeWithCount(query);
+
+			expect(output.count).toBe(1);
+			expect(output.estimated).toBe(false);
+			expect(output.results).toEqual([
+				expect.objectContaining({ startedAt: '2020-06-01T00:00:00.000Z' }),
+			]);
+		});
+
+		test('should filter executions by `startedAfter`', async () => {
+			const workflow = await createWorkflow();
+
+			await Promise.all([
+				createExecution({ startedAt: new Date('2020-06-01') }, workflow),
+				createExecution({ startedAt: new Date('2020-12-31') }, workflow),
+			]);
+
+			const query: ExecutionSummaries.RangeQuery = {
+				kind: 'range',
+				range: { limit: 20 },
+				startedAfter: '2020-07-01',
+				accessibleWorkflowIds: [workflow.id],
+			};
+
+			const output = await executionService.findRangeWithCount(query);
+
+			expect(output.count).toBe(1);
+			expect(output.estimated).toBe(false);
+			expect(output.results).toEqual([
+				expect.objectContaining({ startedAt: '2020-12-31T00:00:00.000Z' }),
+			]);
+		});
+
+		test('should exclude executions by inaccessible `workflowId`', async () => {
+			const accessibleWorkflow = await createWorkflow();
+			const inaccessibleWorkflow = await createWorkflow();
+
+			await Promise.all([
+				createExecution({ status: 'success' }, accessibleWorkflow),
+				createExecution({ status: 'success' }, inaccessibleWorkflow),
+				createExecution({ status: 'success' }, inaccessibleWorkflow),
+				createExecution({ status: 'success' }, inaccessibleWorkflow),
+			]);
+
+			const query: ExecutionSummaries.RangeQuery = {
+				kind: 'range',
+				range: { limit: 20 },
+				workflowId: inaccessibleWorkflow.id,
+				accessibleWorkflowIds: [accessibleWorkflow.id],
+			};
+
+			const output = await executionService.findRangeWithCount(query);
+
+			expect(output.count).toBe(0);
+			expect(output.estimated).toBe(false);
+			expect(output.results).toEqual([]);
+		});
+
+		test('should support advanced filters', async () => {
+			const workflow = await createWorkflow();
+
+			await Promise.all([createExecution({}, workflow), createExecution({}, workflow)]);
+
+			const [firstId, secondId] = await executionRepository.getAllIds();
+
+			const executionMetadataRepository = Container.get(ExecutionMetadataRepository);
+
+			await executionMetadataRepository.save({
+				key: 'key1',
+				value: 'value1',
+				execution: { id: firstId },
+			});
+
+			await executionMetadataRepository.save({
+				key: 'key2',
+				value: 'value2',
+				execution: { id: secondId },
+			});
+
+			const query: ExecutionSummaries.RangeQuery = {
+				kind: 'range',
+				range: { limit: 20 },
+				metadata: [{ key: 'key1', value: 'value1' }],
+				accessibleWorkflowIds: [workflow.id],
+			};
+
+			const output = await executionService.findRangeWithCount(query);
+
+			expect(output.count).toBe(1);
+			expect(output.estimated).toBe(false);
+			expect(output.results).toEqual([expect.objectContaining({ id: firstId })]);
+		});
+	});
+
+	describe('findAllActiveAndLatestFinished', () => {
+		test('should return all active and latest 20 finished executions', async () => {
+			const workflow = await createWorkflow();
+
+			const totalFinished = 21;
+
+			await Promise.all([
+				createExecution({ status: 'running' }, workflow),
+				createExecution({ status: 'running' }, workflow),
+				createExecution({ status: 'running' }, workflow),
+				...new Array(totalFinished)
+					.fill(null)
+					.map(async () => await createExecution({ status: 'success' }, workflow)),
+			]);
+
+			const query: ExecutionSummaries.RangeQuery = {
+				kind: 'range',
+				range: { limit: 20 },
+				accessibleWorkflowIds: [workflow.id],
+			};
+
+			const output = await executionService.findAllRunningAndLatest(query);
+
+			expect(output.results).toHaveLength(23); // 3 active + 20 finished (excludes 21st)
+			expect(output.count).toBe(totalFinished); // 21 finished, excludes active
+			expect(output.estimated).toBe(false);
+		});
+
+		test('should handle zero active executions', async () => {
+			const workflow = await createWorkflow();
+
+			const totalFinished = 5;
+
+			await Promise.all(
+				new Array(totalFinished)
+					.fill(null)
+					.map(async () => await createExecution({ status: 'success' }, workflow)),
+			);
+
+			const query: ExecutionSummaries.RangeQuery = {
+				kind: 'range',
+				range: { limit: 20 },
+				accessibleWorkflowIds: [workflow.id],
+			};
+
+			const output = await executionService.findAllRunningAndLatest(query);
+
+			expect(output.results).toHaveLength(totalFinished); // 5 finished
+			expect(output.count).toBe(totalFinished); // 5 finished, excludes active
+			expect(output.estimated).toBe(false);
+		});
+
+		test('should handle zero finished executions', async () => {
+			const workflow = await createWorkflow();
+
+			await Promise.all([
+				createExecution({ status: 'running' }, workflow),
+				createExecution({ status: 'running' }, workflow),
+				createExecution({ status: 'running' }, workflow),
+			]);
+
+			const query: ExecutionSummaries.RangeQuery = {
+				kind: 'range',
+				range: { limit: 20 },
+				accessibleWorkflowIds: [workflow.id],
+			};
+
+			const output = await executionService.findAllRunningAndLatest(query);
+
+			expect(output.results).toHaveLength(3); // 3 finished
+			expect(output.count).toBe(0); // 0 finished, excludes active
+			expect(output.estimated).toBe(false);
+		});
+
+		test('should handle zero executions', async () => {
+			const workflow = await createWorkflow();
+
+			const query: ExecutionSummaries.RangeQuery = {
+				kind: 'range',
+				range: { limit: 20 },
+				accessibleWorkflowIds: [workflow.id],
+			};
+
+			const output = await executionService.findAllRunningAndLatest(query);
+
+			expect(output.results).toHaveLength(0);
+			expect(output.count).toBe(0);
+			expect(output.estimated).toBe(false);
+		});
+	});
+});
diff --git a/packages/cli/test/integration/executions.controller.test.ts b/packages/cli/test/integration/executions.controller.test.ts
new file mode 100644
index 0000000000000..02f8c3f25f2d8
--- /dev/null
+++ b/packages/cli/test/integration/executions.controller.test.ts
@@ -0,0 +1,49 @@
+import type { User } from '@db/entities/User';
+import { EnterpriseExecutionsService } from '@/executions/execution.service.ee';
+import { WaitTracker } from '@/WaitTracker';
+
+import { createSuccessfulExecution, getAllExecutions } from './shared/db/executions';
+import { createOwner } from './shared/db/users';
+import { createWorkflow } from './shared/db/workflows';
+import * as testDb from './shared/testDb';
+import { setupTestServer } from './shared/utils';
+import { mockInstance } from '../shared/mocking';
+
+mockInstance(EnterpriseExecutionsService);
+mockInstance(WaitTracker);
+
+let testServer = setupTestServer({ endpointGroups: ['executions'] });
+
+let owner: User;
+
+const saveExecution = async ({ belongingTo }: { belongingTo: User }) => {
+	const workflow = await createWorkflow({}, belongingTo);
+	return await createSuccessfulExecution(workflow);
+};
+
+beforeEach(async () => {
+	await testDb.truncate(['Execution', 'Workflow', 'SharedWorkflow']);
+	owner = await createOwner();
+});
+
+describe('POST /executions/delete', () => {
+	test('should hard-delete an execution', async () => {
+		await saveExecution({ belongingTo: owner });
+
+		const response = await testServer.authAgentFor(owner).get('/executions').expect(200);
+
+		expect(response.body.data.count).toBe(1);
+
+		const [execution] = response.body.data.results;
+
+		await testServer
+			.authAgentFor(owner)
+			.post('/executions/delete')
+			.send({ ids: [execution.id] })
+			.expect(200);
+
+		const executions = await getAllExecutions();
+
+		expect(executions).toHaveLength(0);
+	});
+});
diff --git a/packages/cli/test/integration/import.service.test.ts b/packages/cli/test/integration/import.service.test.ts
new file mode 100644
index 0000000000000..2cfdbe4080411
--- /dev/null
+++ b/packages/cli/test/integration/import.service.test.ts
@@ -0,0 +1,199 @@
+import Container from 'typedi';
+import { mock } from 'jest-mock-extended';
+import { v4 as uuid } from 'uuid';
+import type { INode } from 'n8n-workflow';
+
+import { CredentialsRepository } from '@/databases/repositories/credentials.repository';
+import { TagRepository } from '@/databases/repositories/tag.repository';
+import { ImportService } from '@/services/import.service';
+import { TagEntity } from '@/databases/entities/TagEntity';
+import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
+import { SharedWorkflowRepository } from '@/databases/repositories/sharedWorkflow.repository';
+
+import * as testDb from './shared/testDb';
+import { mockInstance } from '../shared/mocking';
+import { createMember, createOwner } from './shared/db/users';
+import {
+	createWorkflow,
+	getAllSharedWorkflows,
+	getWorkflowById,
+	newWorkflow,
+} from './shared/db/workflows';
+
+import type { User } from '@db/entities/User';
+
+describe('ImportService', () => {
+	let importService: ImportService;
+	let tagRepository: TagRepository;
+	let owner: User;
+
+	beforeAll(async () => {
+		await testDb.init();
+
+		owner = await createOwner();
+
+		tagRepository = Container.get(TagRepository);
+
+		const credentialsRepository = mockInstance(CredentialsRepository);
+
+		credentialsRepository.find.mockResolvedValue([]);
+
+		importService = new ImportService(mock(), credentialsRepository, tagRepository);
+	});
+
+	afterEach(async () => {
+		await testDb.truncate(['Workflow', 'SharedWorkflow', 'Tag', 'WorkflowTagMapping']);
+	});
+
+	afterAll(async () => {
+		await testDb.terminate();
+	});
+
+	test('should import credless and tagless workflow', async () => {
+		const workflowToImport = await createWorkflow();
+
+		await importService.importWorkflows([workflowToImport], owner.id);
+
+		const dbWorkflow = await getWorkflowById(workflowToImport.id);
+
+		if (!dbWorkflow) fail('Expected to find workflow');
+
+		expect(dbWorkflow.id).toBe(workflowToImport.id);
+	});
+
+	test('should make user owner of imported workflow', async () => {
+		const workflowToImport = newWorkflow();
+
+		await importService.importWorkflows([workflowToImport], owner.id);
+
+		const dbSharing = await Container.get(SharedWorkflowRepository).findOneOrFail({
+			where: { workflowId: workflowToImport.id, userId: owner.id, role: 'workflow:owner' },
+		});
+
+		expect(dbSharing.userId).toBe(owner.id);
+	});
+
+	test('should not change the owner if it already exists', async () => {
+		const member = await createMember();
+		const workflowToImport = await createWorkflow(undefined, owner);
+
+		await importService.importWorkflows([workflowToImport], member.id);
+
+		const sharings = await getAllSharedWorkflows();
+
+		expect(sharings).toMatchObject([
+			expect.objectContaining({
+				workflowId: workflowToImport.id,
+				userId: owner.id,
+				role: 'workflow:owner',
+			}),
+		]);
+	});
+
+	test('should deactivate imported workflow if active', async () => {
+		const workflowToImport = await createWorkflow({ active: true });
+
+		await importService.importWorkflows([workflowToImport], owner.id);
+
+		const dbWorkflow = await getWorkflowById(workflowToImport.id);
+
+		if (!dbWorkflow) fail('Expected to find workflow');
+
+		expect(dbWorkflow.active).toBe(false);
+	});
+
+	test('should leave intact new-format credentials', async () => {
+		const credential = {
+			n8nApi: { id: '123', name: 'n8n API' },
+		};
+
+		const nodes: INode[] = [
+			{
+				id: uuid(),
+				name: 'n8n',
+				parameters: {},
+				position: [0, 0],
+				type: 'n8n-nodes-base.n8n',
+				typeVersion: 1,
+				credentials: credential,
+			},
+		];
+
+		const workflowToImport = await createWorkflow({ nodes });
+
+		await importService.importWorkflows([workflowToImport], owner.id);
+
+		const dbWorkflow = await getWorkflowById(workflowToImport.id);
+
+		if (!dbWorkflow) fail('Expected to find workflow');
+
+		expect(dbWorkflow.nodes.at(0)?.credentials).toMatchObject(credential);
+	});
+
+	test('should set tag by identical match', async () => {
+		const tag = Object.assign(new TagEntity(), {
+			id: '123',
+			createdAt: new Date(),
+			name: 'Test',
+		});
+
+		await tagRepository.save(tag); // tag stored
+
+		const workflowToImport = await createWorkflow({ tags: [tag] });
+
+		await importService.importWorkflows([workflowToImport], owner.id);
+
+		const dbWorkflow = await Container.get(WorkflowRepository).findOneOrFail({
+			where: { id: workflowToImport.id },
+			relations: ['tags'],
+		});
+
+		expect(dbWorkflow.tags).toStrictEqual([tag]); // workflow tagged
+
+		const dbTags = await tagRepository.find();
+
+		expect(dbTags).toStrictEqual([tag]); // tag matched
+	});
+
+	test('should set tag by name match', async () => {
+		const tag = Object.assign(new TagEntity(), { name: 'Test' });
+
+		await tagRepository.save(tag); // tag stored
+
+		const workflowToImport = await createWorkflow({ tags: [tag] });
+
+		await importService.importWorkflows([workflowToImport], owner.id);
+
+		const dbWorkflow = await Container.get(WorkflowRepository).findOneOrFail({
+			where: { id: workflowToImport.id },
+			relations: ['tags'],
+		});
+
+		expect(dbWorkflow.tags).toStrictEqual([tag]); // workflow tagged
+
+		const dbTags = await tagRepository.find();
+
+		expect(dbTags).toStrictEqual([tag]); // tag matched
+	});
+
+	test('should set tag by creating if no match', async () => {
+		const tag = Object.assign(new TagEntity(), { name: 'Test' }); // tag not stored
+
+		const workflowToImport = await createWorkflow({ tags: [tag] });
+
+		await importService.importWorkflows([workflowToImport], owner.id);
+
+		const dbWorkflow = await Container.get(WorkflowRepository).findOneOrFail({
+			where: { id: workflowToImport.id },
+			relations: ['tags'],
+		});
+
+		if (!dbWorkflow.tags) fail('No tags found on workflow');
+
+		expect(dbWorkflow.tags.at(0)?.name).toBe(tag.name); // workflow tagged
+
+		const dbTag = await tagRepository.findOneOrFail({ where: { name: tag.name } });
+
+		expect(dbTag.name).toBe(tag.name); // tag created
+	});
+});
diff --git a/packages/cli/test/integration/ldap/ldap.api.test.ts b/packages/cli/test/integration/ldap/ldap.api.test.ts
index eaffa15494f23..17cb3e7b543b2 100644
--- a/packages/cli/test/integration/ldap/ldap.api.test.ts
+++ b/packages/cli/test/integration/ldap/ldap.api.test.ts
@@ -1,32 +1,31 @@
-import express from 'express';
+import Container from 'typedi';
+import type { SuperAgentTest } from 'supertest';
 import type { Entry as LdapUser } from 'ldapts';
-import { Not } from 'typeorm';
-import { Container } from 'typedi';
+import { Not } from '@n8n/typeorm';
 import { jsonParse } from 'n8n-workflow';
+import { Cipher } from 'n8n-core';
+
 import config from '@/config';
-import * as Db from '@/Db';
-import type { Role } from '@db/entities/Role';
 import type { User } from '@db/entities/User';
 import { LDAP_DEFAULT_CONFIGURATION, LDAP_FEATURE_NAME } from '@/Ldap/constants';
-import { LdapManager } from '@/Ldap/LdapManager.ee';
-import { LdapService } from '@/Ldap/LdapService.ee';
-import { encryptPassword, saveLdapSynchronization } from '@/Ldap/helpers';
+import { LdapService } from '@/Ldap/ldap.service';
+import { saveLdapSynchronization } from '@/Ldap/helpers';
 import type { LdapConfig } from '@/Ldap/types';
-import { sanitizeUser } from '@/UserManagement/UserManagementHelper';
 import { getCurrentAuthenticationMethod, setCurrentAuthenticationMethod } from '@/sso/ssoHelpers';
-import { License } from '@/License';
+
 import { randomEmail, randomName, uniqueId } from './../shared/random';
 import * as testDb from './../shared/testDb';
-import type { AuthAgent } from '../shared/types';
-import * as utils from '../shared/utils';
+import * as utils from '../shared/utils/';
+
+import { createLdapUser, createUser, getAllUsers, getLdapIdentities } from '../shared/db/users';
+import { UserRepository } from '@db/repositories/user.repository';
+import { SettingsRepository } from '@db/repositories/settings.repository';
+import { AuthProviderSyncHistoryRepository } from '@db/repositories/authProviderSyncHistory.repository';
 
 jest.mock('@/telemetry');
-jest.mock('@/UserManagement/email/NodeMailer');
 
-let app: express.Application;
-let globalMemberRole: Role;
 let owner: User;
-let authAgent: AuthAgent;
+let authOwnerAgent: SuperAgentTest;
 
 const defaultLdapConfig = {
 	...LDAP_DEFAULT_CONFIGURATION,
@@ -42,25 +41,18 @@ const defaultLdapConfig = {
 	bindingAdminPassword: 'adminPassword',
 };
 
-beforeAll(async () => {
-	Container.get(License).isLdapEnabled = () => true;
-	app = await utils.initTestServer({ endpointGroups: ['auth', 'ldap'] });
-
-	const [globalOwnerRole, fetchedGlobalMemberRole] = await testDb.getAllRoles();
-
-	globalMemberRole = fetchedGlobalMemberRole;
-
-	owner = await testDb.createUser({ globalRole: globalOwnerRole });
+const testServer = utils.setupTestServer({
+	endpointGroups: ['auth', 'ldap'],
+	enabledFeatures: ['feat:ldap'],
+});
 
-	authAgent = utils.createAuthAgent(app);
+beforeAll(async () => {
+	owner = await createUser({ role: 'global:owner' });
+	authOwnerAgent = testServer.authAgentFor(owner);
 
-	defaultLdapConfig.bindingAdminPassword = await encryptPassword(
+	defaultLdapConfig.bindingAdminPassword = Container.get(Cipher).encrypt(
 		defaultLdapConfig.bindingAdminPassword,
 	);
-
-	utils.initConfigFile();
-
-	await setCurrentAuthenticationMethod('email');
 });
 
 beforeEach(async () => {
@@ -73,21 +65,17 @@ beforeEach(async () => {
 		'Workflow',
 	]);
 
-	await Db.collections.User.delete({ id: Not(owner.id) });
+	await Container.get(UserRepository).delete({ id: Not(owner.id) });
 
 	jest.mock('@/telemetry');
 
-	config.set('userManagement.disabled', false);
 	config.set('userManagement.isInstanceOwnerSetUp', true);
-	config.set('userManagement.emails.mode', '');
-});
 
-afterAll(async () => {
-	await testDb.terminate();
+	await setCurrentAuthenticationMethod('email');
 });
 
 const createLdapConfig = async (attributes: Partial<LdapConfig> = {}): Promise<LdapConfig> => {
-	const { value: ldapConfig } = await Db.collections.Settings.save({
+	const { value: ldapConfig } = await Container.get(SettingsRepository).save({
 		key: LDAP_FEATURE_NAME,
 		value: JSON.stringify({
 			...defaultLdapConfig,
@@ -95,26 +83,17 @@ const createLdapConfig = async (attributes: Partial<LdapConfig> = {}): Promise<L
 		}),
 		loadOnStartup: true,
 	});
-	return jsonParse(ldapConfig);
+	return await jsonParse(ldapConfig);
 };
 
 test('Member role should not be able to access ldap routes', async () => {
-	const member = await testDb.createUser({ globalRole: globalMemberRole });
-
-	let response = await authAgent(member).get('/ldap/config');
-	expect(response.statusCode).toBe(403);
-
-	response = await authAgent(member).put('/ldap/config');
-	expect(response.statusCode).toBe(403);
-
-	response = await authAgent(member).post('/ldap/test-connection');
-	expect(response.statusCode).toBe(403);
-
-	response = await authAgent(member).post('/ldap/sync');
-	expect(response.statusCode).toBe(403);
-
-	response = await authAgent(member).get('/ldap/sync');
-	expect(response.statusCode).toBe(403);
+	const member = await createUser({ role: 'global:member' });
+	const authAgent = testServer.authAgentFor(member);
+	await authAgent.get('/ldap/config').expect(403);
+	await authAgent.put('/ldap/config').expect(403);
+	await authAgent.post('/ldap/test-connection').expect(403);
+	await authAgent.post('/ldap/sync').expect(403);
+	await authAgent.get('/ldap/sync').expect(403);
 });
 
 describe('PUT /ldap/config', () => {
@@ -143,7 +122,7 @@ describe('PUT /ldap/config', () => {
 		];
 
 		for (const invalidPayload of invalidPayloads) {
-			const response = await authAgent(owner).put('/ldap/config').send(invalidPayload);
+			const response = await authOwnerAgent.put('/ldap/config').send(invalidPayload);
 			expect(response.statusCode).toBe(400);
 			expect(response.body).toHaveProperty('message');
 		}
@@ -156,28 +135,39 @@ describe('PUT /ldap/config', () => {
 			loginLabel: '',
 		};
 
-		const response = await authAgent(owner).put('/ldap/config').send(validPayload);
+		const response = await authOwnerAgent.put('/ldap/config').send(validPayload);
 
 		expect(response.statusCode).toBe(200);
 		expect(response.body.data.loginEnabled).toBe(true);
 		expect(response.body.data.loginLabel).toBe('');
 	});
 
+	test('route should fail due to trying to enable LDAP login with SSO as current authentication method', async () => {
+		const validPayload = {
+			...LDAP_DEFAULT_CONFIGURATION,
+			loginEnabled: true,
+		};
+
+		config.set('userManagement.authenticationMethod', 'saml');
+
+		const response = await authOwnerAgent.put('/ldap/config').send(validPayload);
+
+		expect(response.statusCode).toBe(400);
+	});
+
 	test('should apply "Convert all LDAP users to email users" strategy when LDAP login disabled', async () => {
 		const ldapConfig = await createLdapConfig();
-		LdapManager.updateConfig(ldapConfig);
+		Container.get(LdapService).setConfig(ldapConfig);
 
-		const member = await testDb.createLdapUser({ globalRole: globalMemberRole }, uniqueId());
+		const member = await createLdapUser({ role: 'global:member' }, uniqueId());
 
 		const configuration = ldapConfig;
 
 		// disable the login, so the strategy is applied
-		await authAgent(owner)
-			.put('/ldap/config')
-			.send({ ...configuration, loginEnabled: false });
+		await authOwnerAgent.put('/ldap/config').send({ ...configuration, loginEnabled: false });
 
-		const emailUser = await Db.collections.User.findOneByOrFail({ id: member.id });
-		const localLdapIdentities = await testDb.getLdapIdentities();
+		const emailUser = await Container.get(UserRepository).findOneByOrFail({ id: member.id });
+		const localLdapIdentities = await getLdapIdentities();
 
 		expect(getCurrentAuthenticationMethod()).toBe('email');
 		expect(emailUser.email).toBe(member.email);
@@ -194,11 +184,11 @@ test('GET /ldap/config route should retrieve current configuration', async () =>
 		loginLabel: '',
 	};
 
-	let response = await authAgent(owner).put('/ldap/config').send(validPayload);
+	let response = await authOwnerAgent.put('/ldap/config').send(validPayload);
 	expect(response.statusCode).toBe(200);
 	expect(getCurrentAuthenticationMethod()).toBe('ldap');
 
-	response = await authAgent(owner).get('/ldap/config');
+	response = await authOwnerAgent.get('/ldap/config');
 
 	expect(response.body.data).toMatchObject(validPayload);
 });
@@ -207,8 +197,7 @@ describe('POST /ldap/test-connection', () => {
 	test('route should success', async () => {
 		jest.spyOn(LdapService.prototype, 'testConnection').mockResolvedValue();
 
-		const response = await authAgent(owner).post('/ldap/test-connection');
-		expect(response.statusCode).toBe(200);
+		await authOwnerAgent.post('/ldap/test-connection').expect(200);
 	});
 
 	test('route should fail', async () => {
@@ -216,7 +205,7 @@ describe('POST /ldap/test-connection', () => {
 
 		jest.spyOn(LdapService.prototype, 'testConnection').mockRejectedValue(new Error(errorMessage));
 
-		const response = await authAgent(owner).post('/ldap/test-connection');
+		const response = await authOwnerAgent.post('/ldap/test-connection');
 		expect(response.statusCode).toBe(400);
 		expect(response.body).toHaveProperty('message');
 		expect(response.body.message).toStrictEqual(errorMessage);
@@ -231,18 +220,18 @@ describe('POST /ldap/sync', () => {
 			lastNameAttribute: 'sn',
 			emailAttribute: 'mail',
 		});
-		LdapManager.updateConfig(ldapConfig);
+		Container.get(LdapService).setConfig(ldapConfig);
 	});
 
 	describe('dry mode', () => {
 		const runTest = async (ldapUsers: LdapUser[]) => {
 			jest.spyOn(LdapService.prototype, 'searchWithAdminBinding').mockResolvedValue(ldapUsers);
 
-			const response = await authAgent(owner).post('/ldap/sync').send({ type: 'dry' });
-
-			expect(response.statusCode).toBe(200);
+			await authOwnerAgent.post('/ldap/sync').send({ type: 'dry' }).expect(200);
 
-			const synchronization = await Db.collections.AuthProviderSyncHistory.findOneByOrFail({});
+			const synchronization = await Container.get(
+				AuthProviderSyncHistoryRepository,
+			).findOneByOrFail({});
 
 			expect(synchronization.id).toBeDefined();
 			expect(synchronization.startedAt).toBeDefined();
@@ -273,7 +262,7 @@ describe('POST /ldap/sync', () => {
 			expect(synchronization.created).toBe(1);
 
 			// Make sure only the instance owner is on the DB
-			const localDbUsers = await Db.collections.User.find();
+			const localDbUsers = await Container.get(UserRepository).find();
 			expect(localDbUsers.length).toBe(1);
 			expect(localDbUsers[0].id).toBe(owner.id);
 		});
@@ -282,8 +271,8 @@ describe('POST /ldap/sync', () => {
 			const ldapUserEmail = randomEmail();
 			const ldapUserId = uniqueId();
 
-			const member = await testDb.createLdapUser(
-				{ globalRole: globalMemberRole, email: ldapUserEmail },
+			const member = await createLdapUser(
+				{ role: 'global:member', email: ldapUserEmail },
 				ldapUserId,
 			);
 
@@ -300,7 +289,7 @@ describe('POST /ldap/sync', () => {
 			expect(synchronization.updated).toBe(1);
 
 			// Make sure the changes in the "LDAP server" were not persisted in the database
-			const localLdapIdentities = await testDb.getLdapIdentities();
+			const localLdapIdentities = await getLdapIdentities();
 			const localLdapUsers = localLdapIdentities.map(({ user }) => user);
 			expect(localLdapUsers.length).toBe(1);
 			expect(localLdapUsers[0].id).toBe(member.id);
@@ -311,8 +300,8 @@ describe('POST /ldap/sync', () => {
 			const ldapUserEmail = randomEmail();
 			const ldapUserId = uniqueId();
 
-			const member = await testDb.createLdapUser(
-				{ globalRole: globalMemberRole, email: ldapUserEmail },
+			const member = await createLdapUser(
+				{ role: 'global:member', email: ldapUserEmail },
 				ldapUserId,
 			);
 
@@ -321,7 +310,7 @@ describe('POST /ldap/sync', () => {
 			expect(synchronization.disabled).toBe(1);
 
 			// Make sure the changes in the "LDAP server" were not persisted in the database
-			const localLdapIdentities = await testDb.getLdapIdentities();
+			const localLdapIdentities = await getLdapIdentities();
 			const localLdapUsers = localLdapIdentities.map(({ user }) => user);
 			expect(localLdapUsers.length).toBe(1);
 			expect(localLdapUsers[0].id).toBe(member.id);
@@ -333,11 +322,11 @@ describe('POST /ldap/sync', () => {
 		const runTest = async (ldapUsers: LdapUser[]) => {
 			jest.spyOn(LdapService.prototype, 'searchWithAdminBinding').mockResolvedValue(ldapUsers);
 
-			const response = await authAgent(owner).post('/ldap/sync').send({ type: 'live' });
-
-			expect(response.statusCode).toBe(200);
+			await authOwnerAgent.post('/ldap/sync').send({ type: 'live' }).expect(200);
 
-			const synchronization = await Db.collections.AuthProviderSyncHistory.findOneByOrFail({});
+			const synchronization = await Container.get(
+				AuthProviderSyncHistoryRepository,
+			).findOneByOrFail({});
 
 			expect(synchronization.id).toBeDefined();
 			expect(synchronization.startedAt).toBeDefined();
@@ -367,7 +356,7 @@ describe('POST /ldap/sync', () => {
 			expect(synchronization.created).toBe(1);
 
 			// Make sure the changes in the "LDAP server" were persisted in the database
-			const allUsers = await testDb.getAllUsers();
+			const allUsers = await getAllUsers();
 			expect(allUsers.length).toBe(2);
 
 			const ownerUser = allUsers.find((u) => u.email === owner.email)!;
@@ -378,7 +367,7 @@ describe('POST /ldap/sync', () => {
 			expect(memberUser.lastName).toBe(ldapUser.sn);
 			expect(memberUser.firstName).toBe(ldapUser.givenName);
 
-			const authIdentities = await testDb.getLdapIdentities();
+			const authIdentities = await getLdapIdentities();
 			expect(authIdentities.length).toBe(1);
 			expect(authIdentities[0].providerId).toBe(ldapUser.uid);
 			expect(authIdentities[0].providerType).toBe('ldap');
@@ -393,9 +382,9 @@ describe('POST /ldap/sync', () => {
 				uid: uniqueId(),
 			};
 
-			await testDb.createLdapUser(
+			await createLdapUser(
 				{
-					globalRole: globalMemberRole,
+					role: 'global:member',
 					email: ldapUser.mail,
 					firstName: ldapUser.givenName,
 					lastName: randomName(),
@@ -407,7 +396,7 @@ describe('POST /ldap/sync', () => {
 			expect(synchronization.updated).toBe(1);
 
 			// Make sure the changes in the "LDAP server" were persisted in the database
-			const localLdapIdentities = await testDb.getLdapIdentities();
+			const localLdapIdentities = await getLdapIdentities();
 			const localLdapUsers = localLdapIdentities.map(({ user }) => user);
 
 			expect(localLdapUsers.length).toBe(1);
@@ -426,9 +415,9 @@ describe('POST /ldap/sync', () => {
 				uid: uniqueId(),
 			};
 
-			await testDb.createLdapUser(
+			await createLdapUser(
 				{
-					globalRole: globalMemberRole,
+					role: 'global:member',
 					email: ldapUser.mail,
 					firstName: ldapUser.givenName,
 					lastName: ldapUser.sn,
@@ -440,7 +429,7 @@ describe('POST /ldap/sync', () => {
 			expect(synchronization.disabled).toBe(1);
 
 			// Make sure the changes in the "LDAP server" were persisted in the database
-			const allUsers = await testDb.getAllUsers();
+			const allUsers = await getAllUsers();
 			expect(allUsers.length).toBe(2);
 
 			const ownerUser = allUsers.find((u) => u.email === owner.email)!;
@@ -452,19 +441,19 @@ describe('POST /ldap/sync', () => {
 			expect(memberUser.firstName).toBe(ldapUser.givenName);
 			expect(memberUser.disabled).toBe(true);
 
-			const authIdentities = await testDb.getLdapIdentities();
+			const authIdentities = await getLdapIdentities();
 			expect(authIdentities.length).toBe(0);
 		});
 
 		test('should remove user instance access once the user is disabled during synchronization', async () => {
-			const member = await testDb.createLdapUser({ globalRole: globalMemberRole }, uniqueId());
+			const member = await createLdapUser({ role: 'global:member' }, uniqueId());
 
 			jest.spyOn(LdapService.prototype, 'searchWithAdminBinding').mockResolvedValue([]);
 
-			await authAgent(owner).post('/ldap/sync').send({ type: 'live' });
+			await authOwnerAgent.post('/ldap/sync').send({ type: 'live' });
 
-			const response = await authAgent(member).get('/login');
-			expect(response.body.code).toBe(401);
+			const response = await testServer.authAgentFor(member).get('/login');
+			expect(response.status).toBe(401);
 		});
 	});
 });
@@ -484,34 +473,34 @@ test('GET /ldap/sync should return paginated synchronizations', async () => {
 		});
 	}
 
-	let response = await authAgent(owner).get('/ldap/sync?perPage=1&page=0');
+	let response = await authOwnerAgent.get('/ldap/sync?perPage=1&page=0');
 	expect(response.body.data.length).toBe(1);
 
-	response = await authAgent(owner).get('/ldap/sync?perPage=1&page=1');
+	response = await authOwnerAgent.get('/ldap/sync?perPage=1&page=1');
 	expect(response.body.data.length).toBe(1);
 });
 
 describe('POST /login', () => {
 	const runTest = async (ldapUser: LdapUser) => {
 		const ldapConfig = await createLdapConfig();
-		LdapManager.updateConfig(ldapConfig);
+		Container.get(LdapService).setConfig(ldapConfig);
 
-		const authlessAgent = utils.createAgent(app);
+		await setCurrentAuthenticationMethod('ldap');
 
 		jest.spyOn(LdapService.prototype, 'searchWithAdminBinding').mockResolvedValue([ldapUser]);
 
 		jest.spyOn(LdapService.prototype, 'validUser').mockResolvedValue();
 
-		const response = await authlessAgent
+		const response = await testServer.authlessAgent
 			.post('/login')
 			.send({ email: ldapUser.mail, password: 'password' });
 
 		expect(response.statusCode).toBe(200);
 		expect(response.headers['set-cookie']).toBeDefined();
-		expect(response.headers['set-cookie'][0] as string).toContain('n8n-auth=');
+		expect(response.headers['set-cookie'][0]).toContain('n8n-auth=');
 
 		// Make sure the changes in the "LDAP server" were persisted in the database
-		const localLdapIdentities = await testDb.getLdapIdentities();
+		const localLdapIdentities = await getLdapIdentities();
 		const localLdapUsers = localLdapIdentities.map(({ user }) => user);
 
 		expect(localLdapUsers.length).toBe(1);
@@ -542,9 +531,9 @@ describe('POST /login', () => {
 			uid: uniqueId(),
 		};
 
-		await testDb.createLdapUser(
+		await createLdapUser(
 			{
-				globalRole: globalMemberRole,
+				role: 'global:member',
 				email: ldapUser.mail,
 				firstName: 'firstname',
 				lastName: 'lastname',
@@ -555,6 +544,19 @@ describe('POST /login', () => {
 		await runTest(ldapUser);
 	});
 
+	test('should allow instance owner to sign in with email/password when LDAP is enabled', async () => {
+		const ldapConfig = await createLdapConfig();
+		Container.get(LdapService).setConfig(ldapConfig);
+
+		const response = await testServer.authlessAgent
+			.post('/login')
+			.send({ email: owner.email, password: 'password' });
+
+		expect(response.status).toBe(200);
+		expect(response.body.data?.signInType).toBeDefined();
+		expect(response.body.data?.signInType).toBe('email');
+	});
+
 	test('should transform email user into LDAP user when match found', async () => {
 		const ldapUser = {
 			mail: randomEmail(),
@@ -564,8 +566,8 @@ describe('POST /login', () => {
 			uid: uniqueId(),
 		};
 
-		await testDb.createUser({
-			globalRole: globalMemberRole,
+		await createUser({
+			role: 'global:member',
 			email: ldapUser.mail,
 			firstName: ldapUser.givenName,
 			lastName: 'lastname',
@@ -578,41 +580,20 @@ describe('POST /login', () => {
 describe('Instance owner should able to delete LDAP users', () => {
 	test("don't transfer workflows", async () => {
 		const ldapConfig = await createLdapConfig();
-		LdapManager.updateConfig(ldapConfig);
+		Container.get(LdapService).setConfig(ldapConfig);
 
-		const member = await testDb.createLdapUser({ globalRole: globalMemberRole }, uniqueId());
+		const member = await createLdapUser({ role: 'global:member' }, uniqueId());
 
-		await authAgent(owner).post(`/users/${member.id}`);
+		await authOwnerAgent.post(`/users/${member.id}`);
 	});
 
 	test('transfer workflows and credentials', async () => {
 		const ldapConfig = await createLdapConfig();
-		LdapManager.updateConfig(ldapConfig);
+		Container.get(LdapService).setConfig(ldapConfig);
 
-		const member = await testDb.createLdapUser({ globalRole: globalMemberRole }, uniqueId());
+		const member = await createLdapUser({ role: 'global:member' }, uniqueId());
 
 		// delete the LDAP member and transfer its workflows/credentials to instance owner
-		await authAgent(owner).post(`/users/${member.id}?transferId=${owner.id}`);
+		await authOwnerAgent.post(`/users/${member.id}?transferId=${owner.id}`);
 	});
 });
-
-test('Sign-type should be returned when listing users', async () => {
-	const ldapConfig = await createLdapConfig();
-	LdapManager.updateConfig(ldapConfig);
-
-	await testDb.createLdapUser(
-		{
-			globalRole: globalMemberRole,
-		},
-		uniqueId(),
-	);
-
-	const allUsers = await testDb.getAllUsers();
-	expect(allUsers.length).toBe(2);
-
-	const ownerUser = allUsers.find((u) => u.email === owner.email)!;
-	expect(sanitizeUser(ownerUser).signInType).toStrictEqual('email');
-
-	const memberUser = allUsers.find((u) => u.email !== owner.email)!;
-	expect(sanitizeUser(memberUser).signInType).toStrictEqual('ldap');
-});
diff --git a/packages/cli/test/integration/license.api.test.ts b/packages/cli/test/integration/license.api.test.ts
index 44d84e11502a7..3d1fc4cda84a7 100644
--- a/packages/cli/test/integration/license.api.test.ts
+++ b/packages/cli/test/integration/license.api.test.ts
@@ -1,10 +1,11 @@
 import type { SuperAgentTest } from 'supertest';
 import config from '@/config';
 import type { User } from '@db/entities/User';
-import { ILicensePostResponse, ILicenseReadResponse } from '@/Interfaces';
+import type { ILicensePostResponse, ILicenseReadResponse } from '@/Interfaces';
 import { License } from '@/License';
 import * as testDb from './shared/testDb';
-import * as utils from './shared/utils';
+import * as utils from './shared/utils/';
+import { createUserShell } from './shared/db/users';
 
 const MOCK_SERVER_URL = 'https://server.com/v1';
 const MOCK_RENEW_OFFSET = 259200;
@@ -14,17 +15,14 @@ let member: User;
 let authOwnerAgent: SuperAgentTest;
 let authMemberAgent: SuperAgentTest;
 
-beforeAll(async () => {
-	const app = await utils.initTestServer({ endpointGroups: ['license'] });
+const testServer = utils.setupTestServer({ endpointGroups: ['license'] });
 
-	const globalOwnerRole = await testDb.getGlobalOwnerRole();
-	const globalMemberRole = await testDb.getGlobalMemberRole();
-	owner = await testDb.createUserShell(globalOwnerRole);
-	member = await testDb.createUserShell(globalMemberRole);
+beforeAll(async () => {
+	owner = await createUserShell('global:owner');
+	member = await createUserShell('global:member');
 
-	const authAgent = utils.createAuthAgent(app);
-	authOwnerAgent = authAgent(owner);
-	authMemberAgent = authAgent(member);
+	authOwnerAgent = testServer.authAgentFor(owner);
+	authMemberAgent = testServer.authAgentFor(member);
 
 	config.set('license.serverUrl', MOCK_SERVER_URL);
 	config.set('license.autoRenewEnabled', true);
@@ -35,10 +33,6 @@ afterEach(async () => {
 	await testDb.truncate(['Settings']);
 });
 
-afterAll(async () => {
-	await testDb.terminate();
-});
-
 describe('GET /license', () => {
 	test('should return license information to the instance owner', async () => {
 		// No license defined so we just expect the result to be the defaults
@@ -63,18 +57,18 @@ describe('POST /license/activate', () => {
 		await authMemberAgent
 			.post('/license/activate')
 			.send({ activationKey: 'abcde' })
-			.expect(403, { code: 403, message: NON_OWNER_ACTIVATE_RENEW_MESSAGE });
+			.expect(403, UNAUTHORIZED_RESPONSE);
 	});
 
 	test('errors out properly', async () => {
 		License.prototype.activate = jest.fn().mockImplementation(() => {
-			throw new Error(INVALID_ACIVATION_KEY_MESSAGE);
+			throw new Error('some fake error');
 		});
 
 		await authOwnerAgent
 			.post('/license/activate')
 			.send({ activationKey: 'abcde' })
-			.expect(400, { code: 400, message: INVALID_ACIVATION_KEY_MESSAGE });
+			.expect(400, { code: 400, message: `${ACTIVATION_FAILED_MESSAGE}: some fake error` });
 	});
 });
 
@@ -85,19 +79,17 @@ describe('POST /license/renew', () => {
 	});
 
 	test('does not work for regular users', async () => {
-		await authMemberAgent
-			.post('/license/renew')
-			.expect(403, { code: 403, message: NON_OWNER_ACTIVATE_RENEW_MESSAGE });
+		await authMemberAgent.post('/license/renew').expect(403, UNAUTHORIZED_RESPONSE);
 	});
 
 	test('errors out properly', async () => {
 		License.prototype.renew = jest.fn().mockImplementation(() => {
-			throw new Error(RENEW_ERROR_MESSAGE);
+			throw new Error(GENERIC_ERROR_MESSAGE);
 		});
 
 		await authOwnerAgent
 			.post('/license/renew')
-			.expect(400, { code: 400, message: RENEW_ERROR_MESSAGE });
+			.expect(400, { code: 400, message: `Failed to renew license: ${GENERIC_ERROR_MESSAGE}` });
 	});
 });
 
@@ -134,6 +126,6 @@ const DEFAULT_POST_RESPONSE: { data: ILicensePostResponse } = {
 	},
 };
 
-const NON_OWNER_ACTIVATE_RENEW_MESSAGE = 'Only an instance owner may activate or renew a license';
-const INVALID_ACIVATION_KEY_MESSAGE = 'Invalid activation key';
-const RENEW_ERROR_MESSAGE = 'Something went wrong when trying to renew license';
+const UNAUTHORIZED_RESPONSE = { status: 'error', message: 'Unauthorized' };
+const ACTIVATION_FAILED_MESSAGE = 'Failed to activate license';
+const GENERIC_ERROR_MESSAGE = 'Something went wrong';
diff --git a/packages/cli/test/integration/me.api.test.ts b/packages/cli/test/integration/me.api.test.ts
index 7c5004a36ef88..2f4be391cfb4c 100644
--- a/packages/cli/test/integration/me.api.test.ts
+++ b/packages/cli/test/integration/me.api.test.ts
@@ -1,9 +1,6 @@
-import type { Application } from 'express';
 import type { SuperAgentTest } from 'supertest';
-import { IsNull } from 'typeorm';
+import { IsNull } from '@n8n/typeorm';
 import validator from 'validator';
-import * as Db from '@/Db';
-import type { Role } from '@db/entities/Role';
 import type { User } from '@db/entities/User';
 import { SUCCESS_RESPONSE_BODY } from './shared/constants';
 import {
@@ -14,39 +11,25 @@ import {
 	randomValidPassword,
 } from './shared/random';
 import * as testDb from './shared/testDb';
-import type { AuthAgent } from './shared/types';
-import * as utils from './shared/utils';
+import * as utils from './shared/utils/';
+import { addApiKey, createUser, createUserShell } from './shared/db/users';
+import Container from 'typedi';
+import { UserRepository } from '@db/repositories/user.repository';
 
-let app: Application;
-let globalOwnerRole: Role;
-let globalMemberRole: Role;
-let authAgent: AuthAgent;
-
-beforeAll(async () => {
-	app = await utils.initTestServer({ endpointGroups: ['me'] });
-
-	globalOwnerRole = await testDb.getGlobalOwnerRole();
-	globalMemberRole = await testDb.getGlobalMemberRole();
-
-	authAgent = utils.createAuthAgent(app);
-});
+const testServer = utils.setupTestServer({ endpointGroups: ['me'] });
 
 beforeEach(async () => {
 	await testDb.truncate(['User']);
 });
 
-afterAll(async () => {
-	await testDb.terminate();
-});
-
 describe('Owner shell', () => {
 	let ownerShell: User;
 	let authOwnerShellAgent: SuperAgentTest;
 
 	beforeEach(async () => {
-		ownerShell = await testDb.createUserShell(globalOwnerRole);
-		await testDb.addApiKey(ownerShell);
-		authOwnerShellAgent = authAgent(ownerShell);
+		ownerShell = await createUserShell('global:owner');
+		await addApiKey(ownerShell);
+		authOwnerShellAgent = testServer.authAgentFor(ownerShell);
 	});
 
 	test('PATCH /me should succeed with valid inputs', async () => {
@@ -61,9 +44,8 @@ describe('Owner shell', () => {
 				firstName,
 				lastName,
 				personalizationAnswers,
-				globalRole,
+				role,
 				password,
-				resetPasswordToken,
 				isPending,
 				apiKey,
 			} = response.body.data;
@@ -74,13 +56,11 @@ describe('Owner shell', () => {
 			expect(lastName).toBe(validPayload.lastName);
 			expect(personalizationAnswers).toBeNull();
 			expect(password).toBeUndefined();
-			expect(resetPasswordToken).toBeUndefined();
 			expect(isPending).toBe(false);
-			expect(globalRole.name).toBe('owner');
-			expect(globalRole.scope).toBe('global');
+			expect(role).toBe('global:owner');
 			expect(apiKey).toBeUndefined();
 
-			const storedOwnerShell = await Db.collections.User.findOneByOrFail({ id });
+			const storedOwnerShell = await Container.get(UserRepository).findOneByOrFail({ id });
 
 			expect(storedOwnerShell.email).toBe(validPayload.email.toLowerCase());
 			expect(storedOwnerShell.firstName).toBe(validPayload.firstName);
@@ -93,7 +73,7 @@ describe('Owner shell', () => {
 			const response = await authOwnerShellAgent.patch('/me').send(invalidPayload);
 			expect(response.statusCode).toBe(400);
 
-			const storedOwnerShell = await Db.collections.User.findOneByOrFail({});
+			const storedOwnerShell = await Container.get(UserRepository).findOneByOrFail({});
 			expect(storedOwnerShell.email).toBeNull();
 			expect(storedOwnerShell.firstName).toBeNull();
 			expect(storedOwnerShell.lastName).toBeNull();
@@ -108,24 +88,22 @@ describe('Owner shell', () => {
 
 		const validPayloads = [validPasswordPayload, ...INVALID_PASSWORD_PAYLOADS];
 
-		await Promise.all(
-			validPayloads.map(async (payload) => {
-				const response = await authOwnerShellAgent.patch('/me/password').send(payload);
-				expect([400, 500].includes(response.statusCode)).toBe(true);
+		for (const payload of validPayloads) {
+			const response = await authOwnerShellAgent.patch('/me/password').send(payload);
+			expect([400, 500].includes(response.statusCode)).toBe(true);
 
-				const storedMember = await Db.collections.User.findOneByOrFail({});
+			const storedMember = await Container.get(UserRepository).findOneByOrFail({});
 
-				if (payload.newPassword) {
-					expect(storedMember.password).not.toBe(payload.newPassword);
-				}
+			if (payload.newPassword) {
+				expect(storedMember.password).not.toBe(payload.newPassword);
+			}
 
-				if (payload.currentPassword) {
-					expect(storedMember.password).not.toBe(payload.currentPassword);
-				}
-			}),
-		);
+			if (payload.currentPassword) {
+				expect(storedMember.password).not.toBe(payload.currentPassword);
+			}
+		}
 
-		const storedOwnerShell = await Db.collections.User.findOneByOrFail({});
+		const storedOwnerShell = await Container.get(UserRepository).findOneByOrFail({});
 		expect(storedOwnerShell.password).toBeNull();
 	});
 
@@ -138,7 +116,7 @@ describe('Owner shell', () => {
 			expect(response.statusCode).toBe(200);
 			expect(response.body).toEqual(SUCCESS_RESPONSE_BODY);
 
-			const storedShellOwner = await Db.collections.User.findOneOrFail({
+			const storedShellOwner = await Container.get(UserRepository).findOneOrFail({
 				where: { email: IsNull() },
 			});
 
@@ -153,7 +131,7 @@ describe('Owner shell', () => {
 		expect(response.body.data.apiKey).toBeDefined();
 		expect(response.body.data.apiKey).not.toBeNull();
 
-		const storedShellOwner = await Db.collections.User.findOneOrFail({
+		const storedShellOwner = await Container.get(UserRepository).findOneOrFail({
 			where: { email: IsNull() },
 		});
 
@@ -172,7 +150,7 @@ describe('Owner shell', () => {
 
 		expect(response.statusCode).toBe(200);
 
-		const storedShellOwner = await Db.collections.User.findOneOrFail({
+		const storedShellOwner = await Container.get(UserRepository).findOneOrFail({
 			where: { email: IsNull() },
 		});
 
@@ -186,12 +164,12 @@ describe('Member', () => {
 	let authMemberAgent: SuperAgentTest;
 
 	beforeEach(async () => {
-		member = await testDb.createUser({
+		member = await createUser({
 			password: memberPassword,
-			globalRole: globalMemberRole,
+			role: 'global:member',
 			apiKey: randomApiKey(),
 		});
-		authMemberAgent = authAgent(member);
+		authMemberAgent = testServer.authAgentFor(member);
 
 		await utils.setInstanceOwnerSetUp(true);
 	});
@@ -208,9 +186,8 @@ describe('Member', () => {
 				firstName,
 				lastName,
 				personalizationAnswers,
-				globalRole,
+				role,
 				password,
-				resetPasswordToken,
 				isPending,
 				apiKey,
 			} = response.body.data;
@@ -221,13 +198,11 @@ describe('Member', () => {
 			expect(lastName).toBe(validPayload.lastName);
 			expect(personalizationAnswers).toBeNull();
 			expect(password).toBeUndefined();
-			expect(resetPasswordToken).toBeUndefined();
 			expect(isPending).toBe(false);
-			expect(globalRole.name).toBe('member');
-			expect(globalRole.scope).toBe('global');
+			expect(role).toBe('global:member');
 			expect(apiKey).toBeUndefined();
 
-			const storedMember = await Db.collections.User.findOneByOrFail({ id });
+			const storedMember = await Container.get(UserRepository).findOneByOrFail({ id });
 
 			expect(storedMember.email).toBe(validPayload.email.toLowerCase());
 			expect(storedMember.firstName).toBe(validPayload.firstName);
@@ -240,7 +215,7 @@ describe('Member', () => {
 			const response = await authMemberAgent.patch('/me').send(invalidPayload);
 			expect(response.statusCode).toBe(400);
 
-			const storedMember = await Db.collections.User.findOneByOrFail({});
+			const storedMember = await Container.get(UserRepository).findOneByOrFail({});
 			expect(storedMember.email).toBe(member.email);
 			expect(storedMember.firstName).toBe(member.firstName);
 			expect(storedMember.lastName).toBe(member.lastName);
@@ -257,7 +232,7 @@ describe('Member', () => {
 		expect(response.statusCode).toBe(200);
 		expect(response.body).toEqual(SUCCESS_RESPONSE_BODY);
 
-		const storedMember = await Db.collections.User.findOneByOrFail({});
+		const storedMember = await Container.get(UserRepository).findOneByOrFail({});
 		expect(storedMember.password).not.toBe(member.password);
 		expect(storedMember.password).not.toBe(validPayload.newPassword);
 	});
@@ -267,7 +242,7 @@ describe('Member', () => {
 			const response = await authMemberAgent.patch('/me/password').send(payload);
 			expect([400, 500].includes(response.statusCode)).toBe(true);
 
-			const storedMember = await Db.collections.User.findOneByOrFail({});
+			const storedMember = await Container.get(UserRepository).findOneByOrFail({});
 
 			if (payload.newPassword) {
 				expect(storedMember.password).not.toBe(payload.newPassword);
@@ -286,52 +261,48 @@ describe('Member', () => {
 			expect(response.statusCode).toBe(200);
 			expect(response.body).toEqual(SUCCESS_RESPONSE_BODY);
 
-			const { personalizationAnswers: storedAnswers } = await Db.collections.User.findOneByOrFail(
-				{},
-			);
+			const { personalizationAnswers: storedAnswers } = await Container.get(
+				UserRepository,
+			).findOneByOrFail({});
 
 			expect(storedAnswers).toEqual(validPayload);
 		}
 	});
 
 	test('POST /me/api-key should create an api key', async () => {
-		const response = await authAgent(member).post('/me/api-key');
+		const response = await testServer.authAgentFor(member).post('/me/api-key');
 
 		expect(response.statusCode).toBe(200);
 		expect(response.body.data.apiKey).toBeDefined();
 		expect(response.body.data.apiKey).not.toBeNull();
 
-		const storedMember = await Db.collections.User.findOneByOrFail({ id: member.id });
+		const storedMember = await Container.get(UserRepository).findOneByOrFail({ id: member.id });
 
 		expect(storedMember.apiKey).toEqual(response.body.data.apiKey);
 	});
 
 	test('GET /me/api-key should fetch the api key', async () => {
-		const response = await authAgent(member).get('/me/api-key');
+		const response = await testServer.authAgentFor(member).get('/me/api-key');
 
 		expect(response.statusCode).toBe(200);
 		expect(response.body.data.apiKey).toEqual(member.apiKey);
 	});
 
 	test('DELETE /me/api-key should fetch the api key', async () => {
-		const response = await authAgent(member).delete('/me/api-key');
+		const response = await testServer.authAgentFor(member).delete('/me/api-key');
 
 		expect(response.statusCode).toBe(200);
 
-		const storedMember = await Db.collections.User.findOneByOrFail({ id: member.id });
+		const storedMember = await Container.get(UserRepository).findOneByOrFail({ id: member.id });
 
 		expect(storedMember.apiKey).toBeNull();
 	});
 });
 
 describe('Owner', () => {
-	beforeEach(async () => {
-		await utils.setInstanceOwnerSetUp(true);
-	});
-
 	test('PATCH /me should succeed with valid inputs', async () => {
-		const owner = await testDb.createUser({ globalRole: globalOwnerRole });
-		const authOwnerAgent = authAgent(owner);
+		const owner = await createUser({ role: 'global:owner' });
+		const authOwnerAgent = testServer.authAgentFor(owner);
 
 		for (const validPayload of VALID_PATCH_ME_PAYLOADS) {
 			const response = await authOwnerAgent.patch('/me').send(validPayload);
@@ -344,9 +315,8 @@ describe('Owner', () => {
 				firstName,
 				lastName,
 				personalizationAnswers,
-				globalRole,
+				role,
 				password,
-				resetPasswordToken,
 				isPending,
 				apiKey,
 			} = response.body.data;
@@ -357,13 +327,11 @@ describe('Owner', () => {
 			expect(lastName).toBe(validPayload.lastName);
 			expect(personalizationAnswers).toBeNull();
 			expect(password).toBeUndefined();
-			expect(resetPasswordToken).toBeUndefined();
 			expect(isPending).toBe(false);
-			expect(globalRole.name).toBe('owner');
-			expect(globalRole.scope).toBe('global');
+			expect(role).toBe('global:owner');
 			expect(apiKey).toBeUndefined();
 
-			const storedOwner = await Db.collections.User.findOneByOrFail({ id });
+			const storedOwner = await Container.get(UserRepository).findOneByOrFail({ id });
 
 			expect(storedOwner.email).toBe(validPayload.email.toLowerCase());
 			expect(storedOwner.firstName).toBe(validPayload.firstName);
@@ -388,13 +356,11 @@ const VALID_PATCH_ME_PAYLOADS = [
 		email: randomEmail(),
 		firstName: randomName(),
 		lastName: randomName(),
-		password: randomValidPassword(),
 	},
 	{
 		email: randomEmail().toUpperCase(),
 		firstName: randomName(),
 		lastName: randomName(),
-		password: randomValidPassword(),
 	},
 ];
 
diff --git a/packages/cli/test/integration/metrics.test.ts b/packages/cli/test/integration/metrics.test.ts
new file mode 100644
index 0000000000000..394ec026c4dd5
--- /dev/null
+++ b/packages/cli/test/integration/metrics.test.ts
@@ -0,0 +1,83 @@
+import { Container } from 'typedi';
+import { parse as semverParse } from 'semver';
+import request from 'supertest';
+
+import config from '@/config';
+import { N8N_VERSION } from '@/constants';
+import { MetricsService } from '@/services/metrics.service';
+import { ExecutionDataRecoveryService } from '@/eventbus/executionDataRecovery.service';
+
+import { setupTestServer } from './shared/utils';
+import { mockInstance } from '../shared/mocking';
+
+mockInstance(ExecutionDataRecoveryService);
+jest.unmock('@/eventbus/MessageEventBus/MessageEventBus');
+config.set('endpoints.metrics.enable', true);
+config.set('endpoints.metrics.includeDefaultMetrics', false);
+config.set('endpoints.metrics.prefix', 'n8n_test_');
+const testServer = setupTestServer({ endpointGroups: ['metrics'] });
+
+let testAgent = request.agent(testServer.app);
+
+async function getMetricsResponseAsLines() {
+	const response = await testAgent.get('/metrics');
+	expect(response.status).toEqual(200);
+	expect(response.type).toEqual('text/plain');
+
+	const lines = response.text.trim().split('\n');
+	return lines;
+}
+
+describe('Metrics', () => {
+	it('should return n8n version', async () => {
+		const n8nVersion = semverParse(N8N_VERSION || '0.0.0');
+		expect(n8nVersion).toBeTruthy();
+		const lines = await getMetricsResponseAsLines();
+		expect(lines).toContain(
+			`n8n_test_version_info{version="v${n8nVersion!.version}",major="${
+				n8nVersion!.major
+			}",minor="${n8nVersion!.minor}",patch="${n8nVersion!.patch}"} 1`,
+		);
+	});
+
+	it('should return cache metrics when enabled', async () => {
+		config.set('endpoints.metrics.includeCacheMetrics', true);
+		await Container.get(MetricsService).configureMetrics(testServer.app);
+		const lines = await getMetricsResponseAsLines();
+		expect(lines).toContain('n8n_test_cache_hits_total 0');
+		expect(lines).toContain('n8n_test_cache_misses_total 0');
+		expect(lines).toContain('n8n_test_cache_updates_total 0');
+	});
+
+	// TODO: Commented out due to flakiness in CI
+	// it('should return event metrics when enabled', async () => {
+	// 	config.set('endpoints.metrics.includeMessageEventBusMetrics', true);
+	// 	await Container.get(MetricsService).configureMetrics(testServer.app);
+	// 	await eventBus.initialize();
+	// 	await eventBus.send(
+	// 		new EventMessageGeneric({
+	// 			eventName: 'n8n.destination.test',
+	// 		}),
+	// 	);
+	// 	const lines = await getMetricsResponseAsLines();
+	// 	expect(lines).toContain('n8n_test_destination_test_total 1');
+	// 	await eventBus.close();
+	// 	jest.mock('@/eventbus/MessageEventBus/MessageEventBus');
+	// });
+
+	it('should return default metrics', async () => {
+		config.set('endpoints.metrics.includeDefaultMetrics', true);
+		await Container.get(MetricsService).configureMetrics(testServer.app);
+		const lines = await getMetricsResponseAsLines();
+		expect(lines).toContain('nodejs_heap_space_size_total_bytes{space="read_only"} 0');
+		config.set('endpoints.metrics.includeDefaultMetrics', false);
+	});
+
+	it('should not return default metrics only when disabled', async () => {
+		config.set('endpoints.metrics.includeDefaultMetrics', false);
+		await Container.get(MetricsService).configureMetrics(testServer.app);
+		const lines = await getMetricsResponseAsLines();
+		expect(lines).not.toContain('nodejs_heap_space_size_total_bytes{space="read_only"} 0');
+		config.set('endpoints.metrics.includeDefaultMetrics', true);
+	});
+});
diff --git a/packages/cli/test/integration/mfa/mfa.api.test.ts b/packages/cli/test/integration/mfa/mfa.api.test.ts
new file mode 100644
index 0000000000000..d66261f60e39f
--- /dev/null
+++ b/packages/cli/test/integration/mfa/mfa.api.test.ts
@@ -0,0 +1,404 @@
+import Container from 'typedi';
+
+import { AuthService } from '@/auth/auth.service';
+import config from '@/config';
+import type { User } from '@db/entities/User';
+import { UserRepository } from '@db/repositories/user.repository';
+import { randomPassword } from '@/Ldap/helpers';
+import { TOTPService } from '@/Mfa/totp.service';
+
+import * as testDb from '../shared/testDb';
+import * as utils from '../shared/utils';
+import { randomDigit, randomString, randomValidPassword, uniqueId } from '../shared/random';
+import { createUser, createUserWithMfaEnabled } from '../shared/db/users';
+
+jest.mock('@/telemetry');
+
+let owner: User;
+
+const testServer = utils.setupTestServer({
+	endpointGroups: ['mfa', 'auth', 'me', 'passwordReset'],
+});
+
+beforeEach(async () => {
+	await testDb.truncate(['User']);
+
+	owner = await createUser({ role: 'global:owner' });
+
+	config.set('userManagement.disabled', false);
+});
+
+afterAll(async () => {
+	await testDb.terminate();
+});
+
+describe('Enable MFA setup', () => {
+	describe('Step one', () => {
+		test('GET /qr should fail due to unauthenticated user', async () => {
+			const response = await testServer.authlessAgent.get('/mfa/qr');
+
+			expect(response.statusCode).toBe(401);
+		});
+
+		test('GET /qr should reuse secret and recovery codes until setup is complete', async () => {
+			const firstCall = await testServer.authAgentFor(owner).get('/mfa/qr');
+
+			const secondCall = await testServer.authAgentFor(owner).get('/mfa/qr');
+
+			expect(firstCall.body.data.secret).toBe(secondCall.body.data.secret);
+			expect(firstCall.body.data.recoveryCodes.join('')).toBe(
+				secondCall.body.data.recoveryCodes.join(''),
+			);
+
+			await testServer.authAgentFor(owner).delete('/mfa/disable');
+
+			const thirdCall = await testServer.authAgentFor(owner).get('/mfa/qr');
+
+			expect(firstCall.body.data.secret).not.toBe(thirdCall.body.data.secret);
+			expect(firstCall.body.data.recoveryCodes.join('')).not.toBe(
+				thirdCall.body.data.recoveryCodes.join(''),
+			);
+		});
+
+		test('GET /qr should return qr, secret and recovery codes', async () => {
+			const response = await testServer.authAgentFor(owner).get('/mfa/qr');
+
+			expect(response.statusCode).toBe(200);
+
+			const { data } = response.body;
+
+			expect(data.secret).toBeDefined();
+			expect(data.qrCode).toBeDefined();
+			expect(data.recoveryCodes).toBeDefined();
+			expect(data.recoveryCodes).not.toBeEmptyArray();
+			expect(data.recoveryCodes.length).toBe(10);
+		});
+	});
+
+	describe('Step two', () => {
+		test('POST /verify should fail due to unauthenticated user', async () => {
+			const response = await testServer.authlessAgent.post('/mfa/verify');
+
+			expect(response.statusCode).toBe(401);
+		});
+
+		test('POST /verify should fail due to invalid MFA token', async () => {
+			const response = await testServer
+				.authAgentFor(owner)
+				.post('/mfa/verify')
+				.send({ token: '123' });
+
+			expect(response.statusCode).toBe(400);
+		});
+
+		test('POST /verify should fail due to missing token parameter', async () => {
+			await testServer.authAgentFor(owner).get('/mfa/qr');
+
+			const response = await testServer.authAgentFor(owner).post('/mfa/verify').send({ token: '' });
+
+			expect(response.statusCode).toBe(400);
+		});
+
+		test('POST /verify should validate MFA token', async () => {
+			const response = await testServer.authAgentFor(owner).get('/mfa/qr');
+
+			const { secret } = response.body.data;
+
+			const token = new TOTPService().generateTOTP(secret);
+
+			const { statusCode } = await testServer
+				.authAgentFor(owner)
+				.post('/mfa/verify')
+				.send({ token });
+
+			expect(statusCode).toBe(200);
+		});
+	});
+
+	describe('Step three', () => {
+		test('POST /enable should fail due to unauthenticated user', async () => {
+			const response = await testServer.authlessAgent.post('/mfa/enable');
+
+			expect(response.statusCode).toBe(401);
+		});
+
+		test('POST /verify should fail due to missing token parameter', async () => {
+			const response = await testServer.authAgentFor(owner).post('/mfa/verify').send({ token: '' });
+
+			expect(response.statusCode).toBe(400);
+		});
+
+		test('POST /enable should fail due to invalid MFA token', async () => {
+			await testServer.authAgentFor(owner).get('/mfa/qr');
+
+			const response = await testServer
+				.authAgentFor(owner)
+				.post('/mfa/enable')
+				.send({ token: '123' });
+
+			expect(response.statusCode).toBe(400);
+		});
+
+		test('POST /enable should fail due to empty secret and recovery codes', async () => {
+			const response = await testServer.authAgentFor(owner).post('/mfa/enable');
+
+			expect(response.statusCode).toBe(400);
+		});
+
+		test('POST /enable should enable MFA in account', async () => {
+			const response = await testServer.authAgentFor(owner).get('/mfa/qr');
+
+			const { secret } = response.body.data;
+
+			const token = new TOTPService().generateTOTP(secret);
+
+			await testServer.authAgentFor(owner).post('/mfa/verify').send({ token });
+
+			const { statusCode } = await testServer
+				.authAgentFor(owner)
+				.post('/mfa/enable')
+				.send({ token });
+
+			expect(statusCode).toBe(200);
+
+			const user = await Container.get(UserRepository).findOneOrFail({
+				where: {},
+				select: ['mfaEnabled', 'mfaRecoveryCodes', 'mfaSecret'],
+			});
+
+			expect(user.mfaEnabled).toBe(true);
+			expect(user.mfaRecoveryCodes).toBeDefined();
+			expect(user.mfaSecret).toBeDefined();
+		});
+	});
+});
+
+describe('Disable MFA setup', () => {
+	test('POST /disable should disable login with MFA', async () => {
+		const { user } = await createUserWithMfaEnabled();
+
+		const response = await testServer.authAgentFor(user).delete('/mfa/disable');
+
+		expect(response.statusCode).toBe(200);
+
+		const dbUser = await Container.get(UserRepository).findOneOrFail({
+			where: { id: user.id },
+			select: ['mfaEnabled', 'mfaRecoveryCodes', 'mfaSecret'],
+		});
+
+		expect(dbUser.mfaEnabled).toBe(false);
+		expect(dbUser.mfaSecret).toBe(null);
+		expect(dbUser.mfaRecoveryCodes.length).toBe(0);
+	});
+});
+
+describe('Change password with MFA enabled', () => {
+	test('PATCH /me/password should fail due to missing MFA token', async () => {
+		const { user, rawPassword } = await createUserWithMfaEnabled();
+
+		const newPassword = randomPassword();
+
+		const response = await testServer
+			.authAgentFor(user)
+			.patch('/me/password')
+			.send({ currentPassword: rawPassword, newPassword });
+
+		expect(response.statusCode).toBe(400);
+	});
+
+	test('POST /change-password should fail due to missing MFA token', async () => {
+		await createUserWithMfaEnabled();
+
+		const newPassword = randomValidPassword();
+
+		const resetPasswordToken = uniqueId();
+
+		const response = await testServer.authlessAgent
+			.post('/change-password')
+			.send({ password: newPassword, token: resetPasswordToken });
+
+		expect(response.statusCode).toBe(404);
+	});
+
+	test('POST /change-password should fail due to invalid MFA token', async () => {
+		await createUserWithMfaEnabled();
+
+		const newPassword = randomValidPassword();
+
+		const resetPasswordToken = uniqueId();
+
+		const response = await testServer.authlessAgent.post('/change-password').send({
+			password: newPassword,
+			token: resetPasswordToken,
+			mfaToken: randomDigit(),
+		});
+
+		expect(response.statusCode).toBe(404);
+	});
+
+	test('POST /change-password should update password', async () => {
+		const { user, rawSecret } = await createUserWithMfaEnabled();
+
+		const newPassword = randomValidPassword();
+
+		config.set('userManagement.jwtSecret', randomString(5, 10));
+
+		const resetPasswordToken = Container.get(AuthService).generatePasswordResetToken(user);
+
+		const mfaToken = new TOTPService().generateTOTP(rawSecret);
+
+		const response = await testServer.authlessAgent.post('/change-password').send({
+			password: newPassword,
+			token: resetPasswordToken,
+			mfaToken,
+		});
+
+		expect(response.statusCode).toBe(200);
+
+		const loginResponse = await testServer
+			.authAgentFor(user)
+			.post('/login')
+			.send({
+				email: user.email,
+				password: newPassword,
+				mfaToken: new TOTPService().generateTOTP(rawSecret),
+			});
+
+		expect(loginResponse.statusCode).toBe(200);
+		expect(loginResponse.body).toHaveProperty('data');
+	});
+});
+
+describe('Login', () => {
+	test('POST /login with email/password should succeed when mfa is disabled', async () => {
+		const password = randomPassword();
+
+		const user = await createUser({ password });
+
+		const response = await testServer.authlessAgent
+			.post('/login')
+			.send({ email: user.email, password });
+
+		expect(response.statusCode).toBe(200);
+	});
+
+	test('GET /login should include hasRecoveryCodesLeft property in response', async () => {
+		const response = await testServer.authAgentFor(owner).get('/login');
+
+		const { data } = response.body;
+
+		expect(response.statusCode).toBe(200);
+
+		expect(data.hasRecoveryCodesLeft).toBeDefined();
+	});
+
+	test('GET /login should not include mfaSecret and mfaRecoveryCodes property in response', async () => {
+		const response = await testServer.authAgentFor(owner).get('/login');
+
+		const { data } = response.body;
+
+		expect(response.statusCode).toBe(200);
+
+		expect(data.recoveryCodes).not.toBeDefined();
+		expect(data.mfaSecret).not.toBeDefined();
+	});
+
+	test('POST /login with email/password should fail when mfa is enabled', async () => {
+		const { user, rawPassword } = await createUserWithMfaEnabled();
+
+		const response = await testServer.authlessAgent
+			.post('/login')
+			.send({ email: user.email, password: rawPassword });
+
+		expect(response.statusCode).toBe(401);
+	});
+
+	describe('Login with MFA token', () => {
+		test('POST /login should fail due to invalid MFA token', async () => {
+			const { user, rawPassword } = await createUserWithMfaEnabled();
+
+			const response = await testServer.authlessAgent
+				.post('/login')
+				.send({ email: user.email, password: rawPassword, mfaToken: 'wrongvalue' });
+
+			expect(response.statusCode).toBe(401);
+		});
+
+		test('POST /login should fail due two MFA step needed', async () => {
+			const { user, rawPassword } = await createUserWithMfaEnabled();
+
+			const response = await testServer.authlessAgent
+				.post('/login')
+				.send({ email: user.email, password: rawPassword });
+
+			expect(response.statusCode).toBe(401);
+			expect(response.body.code).toBe(998);
+		});
+
+		test('POST /login should succeed with MFA token', async () => {
+			const { user, rawSecret, rawPassword } = await createUserWithMfaEnabled();
+
+			const token = new TOTPService().generateTOTP(rawSecret);
+
+			const response = await testServer.authlessAgent
+				.post('/login')
+				.send({ email: user.email, password: rawPassword, mfaToken: token });
+
+			const data = response.body.data;
+
+			expect(response.statusCode).toBe(200);
+			expect(data.mfaEnabled).toBe(true);
+		});
+	});
+
+	describe('Login with recovery code', () => {
+		test('POST /login should fail due to invalid MFA recovery code', async () => {
+			const { user, rawPassword } = await createUserWithMfaEnabled();
+
+			const response = await testServer.authlessAgent
+				.post('/login')
+				.send({ email: user.email, password: rawPassword, mfaRecoveryCode: 'wrongvalue' });
+
+			expect(response.statusCode).toBe(401);
+		});
+
+		test('POST /login should succeed with MFA recovery code', async () => {
+			const { user, rawPassword, rawRecoveryCodes } = await createUserWithMfaEnabled();
+
+			const response = await testServer.authlessAgent
+				.post('/login')
+				.send({ email: user.email, password: rawPassword, mfaRecoveryCode: rawRecoveryCodes[0] });
+
+			const data = response.body.data;
+
+			expect(response.statusCode).toBe(200);
+			expect(data.mfaEnabled).toBe(true);
+			expect(data.hasRecoveryCodesLeft).toBe(true);
+
+			const dbUser = await Container.get(UserRepository).findOneOrFail({
+				where: { id: user.id },
+				select: ['mfaEnabled', 'mfaRecoveryCodes', 'mfaSecret'],
+			});
+
+			// Make sure the recovery code used was removed
+			expect(dbUser.mfaRecoveryCodes.length).toBe(rawRecoveryCodes.length - 1);
+			expect(dbUser.mfaRecoveryCodes.includes(rawRecoveryCodes[0])).toBe(false);
+		});
+
+		test('POST /login with MFA recovery code should update hasRecoveryCodesLeft property', async () => {
+			const { user, rawPassword, rawRecoveryCodes } = await createUserWithMfaEnabled({
+				numberOfRecoveryCodes: 1,
+			});
+
+			const response = await testServer.authlessAgent
+				.post('/login')
+				.send({ email: user.email, password: rawPassword, mfaRecoveryCode: rawRecoveryCodes[0] });
+
+			const data = response.body.data;
+
+			expect(response.statusCode).toBe(200);
+			expect(data.mfaEnabled).toBe(true);
+			expect(data.hasRecoveryCodesLeft).toBe(false);
+		});
+	});
+});
diff --git a/packages/cli/test/integration/middlewares/bodyParser.test.ts b/packages/cli/test/integration/middlewares/bodyParser.test.ts
new file mode 100644
index 0000000000000..d17c3fcb11fb1
--- /dev/null
+++ b/packages/cli/test/integration/middlewares/bodyParser.test.ts
@@ -0,0 +1,40 @@
+import { createServer } from 'http';
+import { gzipSync, deflateSync } from 'zlib';
+import type { Request, Response } from 'express';
+import request from 'supertest';
+import { rawBodyReader, bodyParser } from '@/middlewares/bodyParser';
+
+describe('bodyParser', () => {
+	const server = createServer((req: Request, res: Response) => {
+		rawBodyReader(req, res, async () => {
+			bodyParser(req, res, () => res.end(JSON.stringify(req.body)));
+		});
+	});
+
+	it('should handle uncompressed data', async () => {
+		const response = await request(server).post('/').send({ hello: 'world' }).expect(200);
+		expect(response.text).toEqual('{"hello":"world"}');
+	});
+
+	it('should handle gzip data', async () => {
+		const response = await request(server)
+			.post('/')
+			.set('content-encoding', 'gzip')
+			// @ts-ignore
+			.serialize((d) => gzipSync(JSON.stringify(d)))
+			.send({ hello: 'world' })
+			.expect(200);
+		expect(response.text).toEqual('{"hello":"world"}');
+	});
+
+	it('should handle deflate data', async () => {
+		const response = await request(server)
+			.post('/')
+			.set('content-encoding', 'deflate')
+			// @ts-ignore
+			.serialize((d) => deflateSync(JSON.stringify(d)))
+			.send({ hello: 'world' })
+			.expect(200);
+		expect(response.text).toEqual('{"hello":"world"}');
+	});
+});
diff --git a/packages/cli/test/integration/nodes.api.test.ts b/packages/cli/test/integration/nodes.api.test.ts
deleted file mode 100644
index fb6166bd9fb1b..0000000000000
--- a/packages/cli/test/integration/nodes.api.test.ts
+++ /dev/null
@@ -1,283 +0,0 @@
-import path from 'path';
-import { mocked } from 'jest-mock';
-import type { SuperAgentTest } from 'supertest';
-import {
-	executeCommand,
-	checkNpmPackageStatus,
-	hasPackageLoaded,
-	removePackageFromMissingList,
-	isNpmError,
-} from '@/CommunityNodes/helpers';
-import { findInstalledPackage, isPackageInstalled } from '@/CommunityNodes/packageModel';
-import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
-import { InstalledPackages } from '@db/entities/InstalledPackages';
-import type { User } from '@db/entities/User';
-import type { InstalledNodes } from '@db/entities/InstalledNodes';
-import { NodeTypes } from '@/NodeTypes';
-import { Push } from '@/push';
-import { COMMUNITY_PACKAGE_VERSION } from './shared/constants';
-import * as utils from './shared/utils';
-import * as testDb from './shared/testDb';
-
-const mockLoadNodesAndCredentials = utils.mockInstance(LoadNodesAndCredentials);
-utils.mockInstance(NodeTypes);
-utils.mockInstance(Push);
-
-jest.mock('@/CommunityNodes/helpers', () => {
-	return {
-		...jest.requireActual('@/CommunityNodes/helpers'),
-		checkNpmPackageStatus: jest.fn(),
-		executeCommand: jest.fn(),
-		hasPackageLoaded: jest.fn(),
-		isNpmError: jest.fn(),
-		removePackageFromMissingList: jest.fn(),
-	};
-});
-
-jest.mock('@/CommunityNodes/packageModel', () => {
-	return {
-		...jest.requireActual('@/CommunityNodes/packageModel'),
-		isPackageInstalled: jest.fn(),
-		findInstalledPackage: jest.fn(),
-	};
-});
-
-const mockedEmptyPackage = mocked(utils.emptyPackage);
-
-let ownerShell: User;
-let authOwnerShellAgent: SuperAgentTest;
-
-beforeAll(async () => {
-	const app = await utils.initTestServer({ endpointGroups: ['nodes'] });
-
-	const globalOwnerRole = await testDb.getGlobalOwnerRole();
-	ownerShell = await testDb.createUserShell(globalOwnerRole);
-	authOwnerShellAgent = utils.createAuthAgent(app)(ownerShell);
-
-	utils.initConfigFile();
-});
-
-beforeEach(async () => {
-	await testDb.truncate(['InstalledNodes', 'InstalledPackages']);
-
-	mocked(executeCommand).mockReset();
-	mocked(findInstalledPackage).mockReset();
-});
-
-afterAll(async () => {
-	await testDb.terminate();
-});
-
-describe('GET /nodes', () => {
-	test('should respond 200 if no nodes are installed', async () => {
-		const {
-			statusCode,
-			body: { data },
-		} = await authOwnerShellAgent.get('/nodes');
-
-		expect(statusCode).toBe(200);
-		expect(data).toHaveLength(0);
-	});
-
-	test('should return list of one installed package and node', async () => {
-		const { packageName } = await testDb.saveInstalledPackage(utils.installedPackagePayload());
-		await testDb.saveInstalledNode(utils.installedNodePayload(packageName));
-
-		const {
-			statusCode,
-			body: { data },
-		} = await authOwnerShellAgent.get('/nodes');
-
-		expect(statusCode).toBe(200);
-		expect(data).toHaveLength(1);
-		expect(data[0].installedNodes).toHaveLength(1);
-	});
-
-	test('should return list of multiple installed packages and nodes', async () => {
-		const first = await testDb.saveInstalledPackage(utils.installedPackagePayload());
-		await testDb.saveInstalledNode(utils.installedNodePayload(first.packageName));
-
-		const second = await testDb.saveInstalledPackage(utils.installedPackagePayload());
-		await testDb.saveInstalledNode(utils.installedNodePayload(second.packageName));
-		await testDb.saveInstalledNode(utils.installedNodePayload(second.packageName));
-
-		const {
-			statusCode,
-			body: { data },
-		} = await authOwnerShellAgent.get('/nodes');
-
-		expect(statusCode).toBe(200);
-		expect(data).toHaveLength(2);
-
-		const allNodes = data.reduce(
-			(acc: InstalledNodes[], cur: InstalledPackages) => acc.concat(cur.installedNodes),
-			[],
-		);
-
-		expect(allNodes).toHaveLength(3);
-	});
-
-	test('should not check for updates if no packages installed', async () => {
-		await authOwnerShellAgent.get('/nodes');
-
-		expect(mocked(executeCommand)).toHaveBeenCalledTimes(0);
-	});
-
-	test('should check for updates if packages installed', async () => {
-		const { packageName } = await testDb.saveInstalledPackage(utils.installedPackagePayload());
-		await testDb.saveInstalledNode(utils.installedNodePayload(packageName));
-
-		await authOwnerShellAgent.get('/nodes');
-
-		expect(mocked(executeCommand)).toHaveBeenCalledWith('npm outdated --json', {
-			doNotHandleError: true,
-		});
-	});
-
-	test('should report package updates if available', async () => {
-		const { packageName } = await testDb.saveInstalledPackage(utils.installedPackagePayload());
-		await testDb.saveInstalledNode(utils.installedNodePayload(packageName));
-
-		mocked(executeCommand).mockImplementationOnce(() => {
-			throw {
-				code: 1,
-				stdout: JSON.stringify({
-					[packageName]: {
-						current: COMMUNITY_PACKAGE_VERSION.CURRENT,
-						wanted: COMMUNITY_PACKAGE_VERSION.CURRENT,
-						latest: COMMUNITY_PACKAGE_VERSION.UPDATED,
-						location: path.join('node_modules', packageName),
-					},
-				}),
-			};
-		});
-
-		mocked(isNpmError).mockReturnValueOnce(true);
-
-		const {
-			body: { data },
-		} = await authOwnerShellAgent.get('/nodes');
-
-		expect(data[0].installedVersion).toBe(COMMUNITY_PACKAGE_VERSION.CURRENT);
-		expect(data[0].updateAvailable).toBe(COMMUNITY_PACKAGE_VERSION.UPDATED);
-	});
-});
-
-describe('POST /nodes', () => {
-	test('should reject if package name is missing', async () => {
-		const { statusCode } = await authOwnerShellAgent.post('/nodes');
-
-		expect(statusCode).toBe(400);
-	});
-
-	test('should reject if package is duplicate', async () => {
-		mocked(findInstalledPackage).mockResolvedValueOnce(new InstalledPackages());
-		mocked(isPackageInstalled).mockResolvedValueOnce(true);
-		mocked(hasPackageLoaded).mockReturnValueOnce(true);
-
-		const {
-			statusCode,
-			body: { message },
-		} = await authOwnerShellAgent.post('/nodes').send({
-			name: utils.installedPackagePayload().packageName,
-		});
-
-		expect(statusCode).toBe(400);
-		expect(message).toContain('already installed');
-	});
-
-	test('should allow installing packages that could not be loaded', async () => {
-		mocked(findInstalledPackage).mockResolvedValueOnce(new InstalledPackages());
-		mocked(hasPackageLoaded).mockReturnValueOnce(false);
-		mocked(checkNpmPackageStatus).mockResolvedValueOnce({ status: 'OK' });
-
-		mockLoadNodesAndCredentials.installNpmModule.mockImplementationOnce(mockedEmptyPackage);
-
-		const { statusCode } = await authOwnerShellAgent.post('/nodes').send({
-			name: utils.installedPackagePayload().packageName,
-		});
-
-		expect(statusCode).toBe(200);
-		expect(mocked(removePackageFromMissingList)).toHaveBeenCalled();
-	});
-
-	test('should not install a banned package', async () => {
-		mocked(checkNpmPackageStatus).mockResolvedValueOnce({ status: 'Banned' });
-
-		const {
-			statusCode,
-			body: { message },
-		} = await authOwnerShellAgent.post('/nodes').send({
-			name: utils.installedPackagePayload().packageName,
-		});
-
-		expect(statusCode).toBe(400);
-		expect(message).toContain('banned');
-	});
-});
-
-describe('DELETE /nodes', () => {
-	test('should not delete if package name is empty', async () => {
-		const response = await authOwnerShellAgent.delete('/nodes');
-
-		expect(response.statusCode).toBe(400);
-	});
-
-	test('should reject if package is not installed', async () => {
-		const {
-			statusCode,
-			body: { message },
-		} = await authOwnerShellAgent.delete('/nodes').query({
-			name: utils.installedPackagePayload().packageName,
-		});
-
-		expect(statusCode).toBe(400);
-		expect(message).toContain('not installed');
-	});
-
-	test('should uninstall package', async () => {
-		const removeSpy = mockLoadNodesAndCredentials.removeNpmModule.mockImplementationOnce(jest.fn());
-
-		mocked(findInstalledPackage).mockImplementationOnce(mockedEmptyPackage);
-
-		const { statusCode } = await authOwnerShellAgent.delete('/nodes').query({
-			name: utils.installedPackagePayload().packageName,
-		});
-
-		expect(statusCode).toBe(200);
-		expect(removeSpy).toHaveBeenCalledTimes(1);
-	});
-});
-
-describe('PATCH /nodes', () => {
-	test('should reject if package name is empty', async () => {
-		const response = await authOwnerShellAgent.patch('/nodes');
-
-		expect(response.statusCode).toBe(400);
-	});
-
-	test('reject if package is not installed', async () => {
-		const {
-			statusCode,
-			body: { message },
-		} = await authOwnerShellAgent.patch('/nodes').send({
-			name: utils.installedPackagePayload().packageName,
-		});
-
-		expect(statusCode).toBe(400);
-		expect(message).toContain('not installed');
-	});
-
-	test('should update a package', async () => {
-		const updateSpy =
-			mockLoadNodesAndCredentials.updateNpmModule.mockImplementationOnce(mockedEmptyPackage);
-
-		mocked(findInstalledPackage).mockImplementationOnce(mockedEmptyPackage);
-
-		await authOwnerShellAgent.patch('/nodes').send({
-			name: utils.installedPackagePayload().packageName,
-		});
-
-		expect(updateSpy).toHaveBeenCalledTimes(1);
-	});
-});
diff --git a/packages/cli/test/integration/owner.api.test.ts b/packages/cli/test/integration/owner.api.test.ts
index 8b59df68d7c2e..ff5dffe854757 100644
--- a/packages/cli/test/integration/owner.api.test.ts
+++ b/packages/cli/test/integration/owner.api.test.ts
@@ -1,10 +1,6 @@
-import type { Application } from 'express';
 import validator from 'validator';
-import type { SuperAgentTest } from 'supertest';
 
 import config from '@/config';
-import * as Db from '@/Db';
-import type { Role } from '@db/entities/Role';
 import type { User } from '@db/entities/User';
 import {
 	randomEmail,
@@ -13,32 +9,24 @@ import {
 	randomValidPassword,
 } from './shared/random';
 import * as testDb from './shared/testDb';
-import * as utils from './shared/utils';
+import * as utils from './shared/utils/';
+import { createUserShell } from './shared/db/users';
+import { UserRepository } from '@db/repositories/user.repository';
+import Container from 'typedi';
 
-let app: Application;
-let globalOwnerRole: Role;
-let ownerShell: User;
-let authOwnerShellAgent: SuperAgentTest;
+const testServer = utils.setupTestServer({ endpointGroups: ['owner'] });
 
-beforeAll(async () => {
-	app = await utils.initTestServer({ endpointGroups: ['owner'] });
-	globalOwnerRole = await testDb.getGlobalOwnerRole();
-});
+let ownerShell: User;
 
 beforeEach(async () => {
+	ownerShell = await createUserShell('global:owner');
 	config.set('userManagement.isInstanceOwnerSetUp', false);
-	ownerShell = await testDb.createUserShell(globalOwnerRole);
-	authOwnerShellAgent = utils.createAuthAgent(app)(ownerShell);
 });
 
 afterEach(async () => {
 	await testDb.truncate(['User']);
 });
 
-afterAll(async () => {
-	await testDb.terminate();
-});
-
 describe('POST /owner/setup', () => {
 	test('should create owner and enable isInstanceOwnerSetUp', async () => {
 		const newOwnerData = {
@@ -48,7 +36,7 @@ describe('POST /owner/setup', () => {
 			password: randomValidPassword(),
 		};
 
-		const response = await authOwnerShellAgent.post('/owner/setup').send(newOwnerData);
+		const response = await testServer.authlessAgent.post('/owner/setup').send(newOwnerData);
 
 		expect(response.statusCode).toBe(200);
 
@@ -58,11 +46,11 @@ describe('POST /owner/setup', () => {
 			firstName,
 			lastName,
 			personalizationAnswers,
-			globalRole,
+			role,
 			password,
-			resetPasswordToken,
 			isPending,
 			apiKey,
+			globalScopes,
 		} = response.body.data;
 
 		expect(validator.isUUID(id)).toBe(true);
@@ -72,12 +60,11 @@ describe('POST /owner/setup', () => {
 		expect(personalizationAnswers).toBeNull();
 		expect(password).toBeUndefined();
 		expect(isPending).toBe(false);
-		expect(resetPasswordToken).toBeUndefined();
-		expect(globalRole.name).toBe('owner');
-		expect(globalRole.scope).toBe('global');
+		expect(role).toBe('global:owner');
 		expect(apiKey).toBeUndefined();
+		expect(globalScopes).not.toHaveLength(0);
 
-		const storedOwner = await Db.collections.User.findOneByOrFail({ id });
+		const storedOwner = await Container.get(UserRepository).findOneByOrFail({ id });
 		expect(storedOwner.password).not.toBe(newOwnerData.password);
 		expect(storedOwner.email).toBe(newOwnerData.email);
 		expect(storedOwner.firstName).toBe(newOwnerData.firstName);
@@ -98,7 +85,7 @@ describe('POST /owner/setup', () => {
 			password: randomValidPassword(),
 		};
 
-		const response = await authOwnerShellAgent.post('/owner/setup').send(newOwnerData);
+		const response = await testServer.authlessAgent.post('/owner/setup').send(newOwnerData);
 
 		expect(response.statusCode).toBe(200);
 
@@ -107,7 +94,7 @@ describe('POST /owner/setup', () => {
 		expect(id).toBe(ownerShell.id);
 		expect(email).toBe(newOwnerData.email.toLowerCase());
 
-		const storedOwner = await Db.collections.User.findOneByOrFail({ id });
+		const storedOwner = await Container.get(UserRepository).findOneByOrFail({ id });
 		expect(storedOwner.email).toBe(newOwnerData.email.toLowerCase());
 	});
 
@@ -159,29 +146,9 @@ describe('POST /owner/setup', () => {
 	];
 
 	test('should fail with invalid inputs', async () => {
-		const authOwnerAgent = authOwnerShellAgent;
-
-		await Promise.all(
-			INVALID_POST_OWNER_PAYLOADS.map(async (invalidPayload) => {
-				const response = await authOwnerAgent.post('/owner/setup').send(invalidPayload);
-				expect(response.statusCode).toBe(400);
-			}),
-		);
-	});
-});
-
-describe('POST /owner/skip-setup', () => {
-	test('should persist skipping setup to the DB', async () => {
-		const response = await authOwnerShellAgent.post('/owner/skip-setup').send();
-
-		expect(response.statusCode).toBe(200);
-
-		const skipConfig = config.getEnv('userManagement.skipInstanceOwnerSetup');
-		expect(skipConfig).toBe(true);
-
-		const { value } = await Db.collections.Settings.findOneByOrFail({
-			key: 'userManagement.skipInstanceOwnerSetup',
-		});
-		expect(value).toBe('true');
+		for (const invalidPayload of INVALID_POST_OWNER_PAYLOADS) {
+			const response = await testServer.authlessAgent.post('/owner/setup').send(invalidPayload);
+			expect(response.statusCode).toBe(400);
+		}
 	});
 });
diff --git a/packages/cli/test/integration/passwordReset.api.test.ts b/packages/cli/test/integration/passwordReset.api.test.ts
index 60ccfa0ce5b46..6aca848e84d71 100644
--- a/packages/cli/test/integration/passwordReset.api.test.ts
+++ b/packages/cli/test/integration/passwordReset.api.test.ts
@@ -1,115 +1,106 @@
-import type { SuperAgentTest } from 'supertest';
 import { v4 as uuid } from 'uuid';
 import { compare } from 'bcryptjs';
+import { Container } from 'typedi';
+import { mock } from 'jest-mock-extended';
 
-import * as Db from '@/Db';
+import { AuthService } from '@/auth/auth.service';
+import { License } from '@/License';
 import config from '@/config';
-import type { Role } from '@db/entities/Role';
 import type { User } from '@db/entities/User';
-import * as utils from './shared/utils';
+import { setCurrentAuthenticationMethod } from '@/sso/ssoHelpers';
+import { ExternalHooks } from '@/ExternalHooks';
+import { JwtService } from '@/services/jwt.service';
+import { UserManagementMailer } from '@/UserManagement/email';
+import { UserRepository } from '@db/repositories/user.repository';
+
+import { mockInstance } from '../shared/mocking';
+import { getAuthToken, setupTestServer } from './shared/utils/';
 import {
 	randomEmail,
 	randomInvalidPassword,
 	randomName,
+	randomString,
 	randomValidPassword,
 } from './shared/random';
 import * as testDb from './shared/testDb';
-import { setCurrentAuthenticationMethod } from '@/sso/ssoHelpers';
-import { ExternalHooks } from '@/ExternalHooks';
+import { createUser } from './shared/db/users';
+import { PasswordUtility } from '@/services/password.utility';
 
-jest.mock('@/UserManagement/email/NodeMailer');
+config.set('userManagement.jwtSecret', randomString(5, 10));
 
-let globalOwnerRole: Role;
-let globalMemberRole: Role;
 let owner: User;
-let authlessAgent: SuperAgentTest;
-let externalHooks = utils.mockInstance(ExternalHooks);
-
-beforeAll(async () => {
-	const app = await utils.initTestServer({ endpointGroups: ['passwordReset'] });
+let member: User;
 
-	globalOwnerRole = await testDb.getGlobalOwnerRole();
-	globalMemberRole = await testDb.getGlobalMemberRole();
-
-	authlessAgent = utils.createAgent(app);
-});
+const externalHooks = mockInstance(ExternalHooks);
+const mailer = mockInstance(UserManagementMailer, { isEmailSetUp: true });
+const testServer = setupTestServer({ endpointGroups: ['passwordReset'] });
+const jwtService = Container.get(JwtService);
+let authService: AuthService;
 
 beforeEach(async () => {
 	await testDb.truncate(['User']);
-	owner = await testDb.createUser({ globalRole: globalOwnerRole });
-
-	config.set('userManagement.isInstanceOwnerSetUp', true);
+	owner = await createUser({ role: 'global:owner' });
+	member = await createUser({ role: 'global:member' });
 	externalHooks.run.mockReset();
-});
-
-afterAll(async () => {
-	await testDb.terminate();
+	jest.replaceProperty(mailer, 'isEmailSetUp', true);
+	authService = Container.get(AuthService);
 });
 
 describe('POST /forgot-password', () => {
 	test('should send password reset email', async () => {
-		const member = await testDb.createUser({
+		const member = await createUser({
 			email: 'test@test.com',
-			globalRole: globalMemberRole,
+			role: 'global:member',
 		});
 
-		config.set('userManagement.emails.mode', 'smtp');
-
 		await Promise.all(
 			[{ email: owner.email }, { email: member.email.toUpperCase() }].map(async (payload) => {
-				const response = await authlessAgent.post('/forgot-password').send(payload);
+				const response = await testServer.authlessAgent.post('/forgot-password').send(payload);
 
 				expect(response.statusCode).toBe(200);
 				expect(response.body).toEqual({});
-
-				const user = await Db.collections.User.findOneByOrFail({ email: payload.email });
-				expect(user.resetPasswordToken).toBeDefined();
-				expect(user.resetPasswordTokenExpiration).toBeGreaterThan(Math.ceil(Date.now() / 1000));
 			}),
 		);
 	});
 
 	test('should fail if emailing is not set up', async () => {
-		config.set('userManagement.emails.mode', '');
-
-		await authlessAgent.post('/forgot-password').send({ email: owner.email }).expect(500);
+		jest.replaceProperty(mailer, 'isEmailSetUp', false);
 
-		const storedOwner = await Db.collections.User.findOneByOrFail({ email: owner.email });
-		expect(storedOwner.resetPasswordToken).toBeNull();
+		await testServer.authlessAgent
+			.post('/forgot-password')
+			.send({ email: owner.email })
+			.expect(500);
 	});
 
 	test('should fail if SAML is authentication method', async () => {
 		await setCurrentAuthenticationMethod('saml');
-		config.set('userManagement.emails.mode', 'smtp');
-		const member = await testDb.createUser({
+		const member = await createUser({
 			email: 'test@test.com',
-			globalRole: globalMemberRole,
+			role: 'global:member',
 		});
 
-		await authlessAgent.post('/forgot-password').send({ email: member.email }).expect(403);
+		await testServer.authlessAgent
+			.post('/forgot-password')
+			.send({ email: member.email })
+			.expect(403);
 
-		const storedOwner = await Db.collections.User.findOneByOrFail({ email: member.email });
-		expect(storedOwner.resetPasswordToken).toBeNull();
 		await setCurrentAuthenticationMethod('email');
 	});
 
 	test('should succeed if SAML is authentication method and requestor is owner', async () => {
 		await setCurrentAuthenticationMethod('saml');
-		config.set('userManagement.emails.mode', 'smtp');
 
-		const response = await authlessAgent.post('/forgot-password').send({ email: owner.email });
+		const response = await testServer.authlessAgent
+			.post('/forgot-password')
+			.send({ email: owner.email });
 
 		expect(response.statusCode).toBe(200);
 		expect(response.body).toEqual({});
 
-		const storedOwner = await Db.collections.User.findOneByOrFail({ email: owner.email });
-		expect(storedOwner.resetPasswordToken).not.toBeNull();
 		await setCurrentAuthenticationMethod('email');
 	});
 
 	test('should fail with invalid inputs', async () => {
-		config.set('userManagement.emails.mode', 'smtp');
-
 		const invalidPayloads = [
 			randomEmail(),
 			[randomEmail()],
@@ -118,41 +109,26 @@ describe('POST /forgot-password', () => {
 			[{ email: randomName() }],
 		];
 
-		await Promise.all(
-			invalidPayloads.map(async (invalidPayload) => {
-				const response = await authlessAgent.post('/forgot-password').send(invalidPayload);
-				expect(response.statusCode).toBe(400);
-
-				const storedOwner = await Db.collections.User.findOneByOrFail({ email: owner.email });
-				expect(storedOwner.resetPasswordToken).toBeNull();
-			}),
-		);
+		for (const invalidPayload of invalidPayloads) {
+			const response = await testServer.authlessAgent.post('/forgot-password').send(invalidPayload);
+			expect(response.statusCode).toBe(400);
+		}
 	});
 
 	test('should fail if user is not found', async () => {
-		config.set('userManagement.emails.mode', 'smtp');
-
-		const response = await authlessAgent.post('/forgot-password').send({ email: randomEmail() });
+		const response = await testServer.authlessAgent
+			.post('/forgot-password')
+			.send({ email: randomEmail() });
 
 		expect(response.statusCode).toBe(200); // expect 200 to remain vague
 	});
 });
 
 describe('GET /resolve-password-token', () => {
-	beforeEach(() => {
-		config.set('userManagement.emails.mode', 'smtp');
-	});
-
 	test('should succeed with valid inputs', async () => {
-		const resetPasswordToken = uuid();
-		const resetPasswordTokenExpiration = Math.floor(Date.now() / 1000) + 100;
-
-		await Db.collections.User.update(owner.id, {
-			resetPasswordToken,
-			resetPasswordTokenExpiration,
-		});
+		const resetPasswordToken = authService.generatePasswordResetToken(owner);
 
-		const response = await authlessAgent
+		const response = await testServer.authlessAgent
 			.get('/resolve-password-token')
 			.query({ userId: owner.id, token: resetPasswordToken });
 
@@ -160,33 +136,42 @@ describe('GET /resolve-password-token', () => {
 	});
 
 	test('should fail with invalid inputs', async () => {
-		const first = await authlessAgent.get('/resolve-password-token').query({ token: uuid() });
-
-		const second = await authlessAgent.get('/resolve-password-token').query({ userId: owner.id });
+		await testServer.authlessAgent
+			.get('/resolve-password-token')
+			.query({ token: uuid() })
+			.expect(404);
 
-		for (const response of [first, second]) {
-			expect(response.statusCode).toBe(400);
-		}
+		await testServer.authlessAgent
+			.get('/resolve-password-token')
+			.query({ userId: owner.id })
+			.expect(400);
 	});
 
 	test('should fail if user is not found', async () => {
-		const response = await authlessAgent
+		const token = jwtService.sign({ sub: uuid() });
+
+		const response = await testServer.authlessAgent
 			.get('/resolve-password-token')
-			.query({ userId: owner.id, token: uuid() });
+			.query({ userId: owner.id, token });
 
 		expect(response.statusCode).toBe(404);
 	});
 
 	test('should fail if token is expired', async () => {
-		const resetPasswordToken = uuid();
-		const resetPasswordTokenExpiration = Math.floor(Date.now() / 1000) - 1;
+		const resetPasswordToken = authService.generatePasswordResetToken(owner, '-1h');
 
-		await Db.collections.User.update(owner.id, {
-			resetPasswordToken,
-			resetPasswordTokenExpiration,
-		});
+		const response = await testServer.authlessAgent
+			.get('/resolve-password-token')
+			.query({ userId: owner.id, token: resetPasswordToken });
+
+		expect(response.statusCode).toBe(404);
+	});
 
-		const response = await authlessAgent
+	test('should fail after password has changed', async () => {
+		const updatedUser = mock<User>({ ...owner, password: 'another-password' });
+		const resetPasswordToken = authService.generatePasswordResetToken(updatedUser);
+
+		const response = await testServer.authlessAgent
 			.get('/resolve-password-token')
 			.query({ userId: owner.id, token: resetPasswordToken });
 
@@ -195,18 +180,11 @@ describe('GET /resolve-password-token', () => {
 });
 
 describe('POST /change-password', () => {
-	const resetPasswordToken = uuid();
 	const passwordToStore = randomValidPassword();
 
 	test('should succeed with valid inputs', async () => {
-		const resetPasswordTokenExpiration = Math.floor(Date.now() / 1000) + 100;
-
-		await Db.collections.User.update(owner.id, {
-			resetPasswordToken,
-			resetPasswordTokenExpiration,
-		});
-
-		const response = await authlessAgent.post('/change-password').send({
+		const resetPasswordToken = authService.generatePasswordResetToken(owner);
+		const response = await testServer.authlessAgent.post('/change-password').send({
 			token: resetPasswordToken,
 			userId: owner.id,
 			password: passwordToStore,
@@ -214,14 +192,17 @@ describe('POST /change-password', () => {
 
 		expect(response.statusCode).toBe(200);
 
-		const authToken = utils.getAuthToken(response);
+		const authToken = getAuthToken(response);
 		expect(authToken).toBeDefined();
 
-		const { password: storedPassword } = await Db.collections.User.findOneByOrFail({
+		const { password: storedPassword } = await Container.get(UserRepository).findOneByOrFail({
 			id: owner.id,
 		});
 
-		const comparisonResult = await compare(passwordToStore, storedPassword);
+		const comparisonResult = await Container.get(PasswordUtility).compare(
+			passwordToStore,
+			storedPassword,
+		);
 		expect(comparisonResult).toBe(true);
 		expect(storedPassword).not.toBe(passwordToStore);
 
@@ -232,12 +213,7 @@ describe('POST /change-password', () => {
 	});
 
 	test('should fail with invalid inputs', async () => {
-		const resetPasswordTokenExpiration = Math.floor(Date.now() / 1000) + 100;
-
-		await Db.collections.User.update(owner.id, {
-			resetPasswordToken,
-			resetPasswordTokenExpiration,
-		});
+		const resetPasswordToken = authService.generatePasswordResetToken(owner);
 
 		const invalidPayloads = [
 			{ token: uuid() },
@@ -258,26 +234,22 @@ describe('POST /change-password', () => {
 			},
 		];
 
-		await Promise.all(
-			invalidPayloads.map(async (invalidPayload) => {
-				const response = await authlessAgent.post('/change-password').query(invalidPayload);
-				expect(response.statusCode).toBe(400);
-
-				const { password: storedPassword } = await Db.collections.User.findOneByOrFail({});
-				expect(owner.password).toBe(storedPassword);
-			}),
-		);
+		for (const invalidPayload of invalidPayloads) {
+			const response = await testServer.authlessAgent
+				.post('/change-password')
+				.query(invalidPayload);
+			expect(response.statusCode).toBe(400);
+			const { password: storedPassword } = await Container.get(UserRepository).findOneByOrFail({
+				id: owner.id,
+			});
+			expect(owner.password).toBe(storedPassword);
+		}
 	});
 
 	test('should fail when token has expired', async () => {
-		const resetPasswordTokenExpiration = Math.floor(Date.now() / 1000) - 1;
+		const resetPasswordToken = authService.generatePasswordResetToken(owner, '-1h');
 
-		await Db.collections.User.update(owner.id, {
-			resetPasswordToken,
-			resetPasswordTokenExpiration,
-		});
-
-		const response = await authlessAgent.post('/change-password').send({
+		const response = await testServer.authlessAgent.post('/change-password').send({
 			token: resetPasswordToken,
 			userId: owner.id,
 			password: passwordToStore,
@@ -287,4 +259,46 @@ describe('POST /change-password', () => {
 
 		expect(externalHooks.run).not.toHaveBeenCalled();
 	});
+
+	test('owner should be able to reset its password when quota:users = 1', async () => {
+		jest.spyOn(Container.get(License), 'getUsersLimit').mockReturnValueOnce(1);
+
+		const resetPasswordToken = authService.generatePasswordResetToken(owner);
+		const response = await testServer.authlessAgent.post('/change-password').send({
+			token: resetPasswordToken,
+			userId: owner.id,
+			password: passwordToStore,
+		});
+
+		expect(response.statusCode).toBe(200);
+
+		const authToken = getAuthToken(response);
+		expect(authToken).toBeDefined();
+
+		const { password: storedPassword } = await Container.get(UserRepository).findOneByOrFail({
+			id: owner.id,
+		});
+
+		const comparisonResult = await compare(passwordToStore, storedPassword);
+		expect(comparisonResult).toBe(true);
+		expect(storedPassword).not.toBe(passwordToStore);
+
+		expect(externalHooks.run).toHaveBeenCalledWith('user.password.update', [
+			owner.email,
+			storedPassword,
+		]);
+	});
+
+	test('member should not be able to reset its password when quota:users = 1', async () => {
+		jest.spyOn(Container.get(License), 'getUsersLimit').mockReturnValueOnce(1);
+
+		const resetPasswordToken = authService.generatePasswordResetToken(member);
+		const response = await testServer.authlessAgent.post('/change-password').send({
+			token: resetPasswordToken,
+			userId: member.id,
+			password: passwordToStore,
+		});
+
+		expect(response.statusCode).toBe(403);
+	});
 });
diff --git a/packages/cli/test/integration/pruning.service.test.ts b/packages/cli/test/integration/pruning.service.test.ts
new file mode 100644
index 0000000000000..b8eb07dba1fc1
--- /dev/null
+++ b/packages/cli/test/integration/pruning.service.test.ts
@@ -0,0 +1,227 @@
+import config from '@/config';
+import { BinaryDataService } from 'n8n-core';
+import type { ExecutionStatus } from 'n8n-workflow';
+import Container from 'typedi';
+
+import * as testDb from './shared/testDb';
+import type { ExecutionEntity } from '@db/entities/ExecutionEntity';
+import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
+import { ExecutionRepository } from '@db/repositories/execution.repository';
+import { TIME } from '@/constants';
+import { PruningService } from '@/services/pruning.service';
+import { Logger } from '@/Logger';
+
+import { mockInstance } from '../shared/mocking';
+import { createWorkflow } from './shared/db/workflows';
+import { createExecution, createSuccessfulExecution } from './shared/db/executions';
+
+describe('softDeleteOnPruningCycle()', () => {
+	let pruningService: PruningService;
+
+	const now = new Date();
+	const yesterday = new Date(Date.now() - TIME.DAY);
+	let workflow: WorkflowEntity;
+
+	beforeAll(async () => {
+		await testDb.init();
+
+		pruningService = new PruningService(
+			mockInstance(Logger),
+			Container.get(ExecutionRepository),
+			mockInstance(BinaryDataService),
+		);
+
+		workflow = await createWorkflow();
+	});
+
+	beforeEach(async () => {
+		await testDb.truncate(['Execution']);
+	});
+
+	afterAll(async () => {
+		await testDb.terminate();
+	});
+
+	afterEach(() => {
+		config.load(config.default);
+	});
+
+	async function findAllExecutions() {
+		return await Container.get(ExecutionRepository).find({
+			order: { id: 'asc' },
+			withDeleted: true,
+		});
+	}
+
+	describe('when EXECUTIONS_DATA_PRUNE_MAX_COUNT is set', () => {
+		beforeEach(() => {
+			config.set('executions.pruneDataMaxCount', 1);
+			config.set('executions.pruneDataMaxAge', 336);
+		});
+
+		test('should mark as deleted based on EXECUTIONS_DATA_PRUNE_MAX_COUNT', async () => {
+			const executions = [
+				await createSuccessfulExecution(workflow),
+				await createSuccessfulExecution(workflow),
+				await createSuccessfulExecution(workflow),
+			];
+
+			await pruningService.softDeleteOnPruningCycle();
+
+			const result = await findAllExecutions();
+			expect(result).toEqual([
+				expect.objectContaining({ id: executions[0].id, deletedAt: expect.any(Date) }),
+				expect.objectContaining({ id: executions[1].id, deletedAt: expect.any(Date) }),
+				expect.objectContaining({ id: executions[2].id, deletedAt: null }),
+			]);
+		});
+
+		test('should not re-mark already marked executions', async () => {
+			const executions = [
+				await createExecution(
+					{ status: 'success', finished: true, startedAt: now, stoppedAt: now, deletedAt: now },
+					workflow,
+				),
+				await createSuccessfulExecution(workflow),
+			];
+
+			await pruningService.softDeleteOnPruningCycle();
+
+			const result = await findAllExecutions();
+			expect(result).toEqual([
+				expect.objectContaining({ id: executions[0].id, deletedAt: now }),
+				expect.objectContaining({ id: executions[1].id, deletedAt: null }),
+			]);
+		});
+
+		test.each<[ExecutionStatus, Partial<ExecutionEntity>]>([
+			['warning', { startedAt: now, stoppedAt: now }],
+			['unknown', { startedAt: now, stoppedAt: now }],
+			['canceled', { startedAt: now, stoppedAt: now }],
+			['crashed', { startedAt: now, stoppedAt: now }],
+			['error', { startedAt: now, stoppedAt: now }],
+			['success', { finished: true, startedAt: now, stoppedAt: now }],
+		])('should prune %s executions', async (status, attributes) => {
+			const executions = [
+				await createExecution({ status, ...attributes }, workflow),
+				await createSuccessfulExecution(workflow),
+			];
+
+			await pruningService.softDeleteOnPruningCycle();
+
+			const result = await findAllExecutions();
+			expect(result).toEqual([
+				expect.objectContaining({ id: executions[0].id, deletedAt: expect.any(Date) }),
+				expect.objectContaining({ id: executions[1].id, deletedAt: null }),
+			]);
+		});
+
+		test.each<[ExecutionStatus, Partial<ExecutionEntity>]>([
+			['new', {}],
+			['running', { startedAt: now }],
+			['waiting', { startedAt: now, stoppedAt: now, waitTill: now }],
+		])('should not prune %s executions', async (status, attributes) => {
+			const executions = [
+				await createExecution({ status, ...attributes }, workflow),
+				await createSuccessfulExecution(workflow),
+			];
+
+			await pruningService.softDeleteOnPruningCycle();
+
+			const result = await findAllExecutions();
+			expect(result).toEqual([
+				expect.objectContaining({ id: executions[0].id, deletedAt: null }),
+				expect.objectContaining({ id: executions[1].id, deletedAt: null }),
+			]);
+		});
+	});
+
+	describe('when EXECUTIONS_DATA_MAX_AGE is set', () => {
+		beforeEach(() => {
+			config.set('executions.pruneDataMaxAge', 1); // 1h
+			config.set('executions.pruneDataMaxCount', 0);
+		});
+
+		test('should mark as deleted based on EXECUTIONS_DATA_MAX_AGE', async () => {
+			const executions = [
+				await createExecution(
+					{ finished: true, startedAt: yesterday, stoppedAt: yesterday, status: 'success' },
+					workflow,
+				),
+				await createExecution(
+					{ finished: true, startedAt: now, stoppedAt: now, status: 'success' },
+					workflow,
+				),
+			];
+
+			await pruningService.softDeleteOnPruningCycle();
+
+			const result = await findAllExecutions();
+			expect(result).toEqual([
+				expect.objectContaining({ id: executions[0].id, deletedAt: expect.any(Date) }),
+				expect.objectContaining({ id: executions[1].id, deletedAt: null }),
+			]);
+		});
+
+		test('should not re-mark already marked executions', async () => {
+			const executions = [
+				await createExecution(
+					{
+						status: 'success',
+						finished: true,
+						startedAt: yesterday,
+						stoppedAt: yesterday,
+						deletedAt: yesterday,
+					},
+					workflow,
+				),
+				await createSuccessfulExecution(workflow),
+			];
+
+			await pruningService.softDeleteOnPruningCycle();
+
+			const result = await findAllExecutions();
+			expect(result).toEqual([
+				expect.objectContaining({ id: executions[0].id, deletedAt: yesterday }),
+				expect.objectContaining({ id: executions[1].id, deletedAt: null }),
+			]);
+		});
+
+		test.each<[ExecutionStatus, Partial<ExecutionEntity>]>([
+			['warning', { startedAt: yesterday, stoppedAt: yesterday }],
+			['unknown', { startedAt: yesterday, stoppedAt: yesterday }],
+			['canceled', { startedAt: yesterday, stoppedAt: yesterday }],
+			['crashed', { startedAt: yesterday, stoppedAt: yesterday }],
+			['error', { startedAt: yesterday, stoppedAt: yesterday }],
+			['success', { finished: true, startedAt: yesterday, stoppedAt: yesterday }],
+		])('should prune %s executions', async (status, attributes) => {
+			const execution = await createExecution({ status, ...attributes }, workflow);
+
+			await pruningService.softDeleteOnPruningCycle();
+
+			const result = await findAllExecutions();
+			expect(result).toEqual([
+				expect.objectContaining({ id: execution.id, deletedAt: expect.any(Date) }),
+			]);
+		});
+
+		test.each<[ExecutionStatus, Partial<ExecutionEntity>]>([
+			['new', {}],
+			['running', { startedAt: yesterday }],
+			['waiting', { startedAt: yesterday, stoppedAt: yesterday, waitTill: yesterday }],
+		])('should not prune %s executions', async (status, attributes) => {
+			const executions = [
+				await createExecution({ status, ...attributes }, workflow),
+				await createSuccessfulExecution(workflow),
+			];
+
+			await pruningService.softDeleteOnPruningCycle();
+
+			const result = await findAllExecutions();
+			expect(result).toEqual([
+				expect.objectContaining({ id: executions[0].id, deletedAt: null }),
+				expect.objectContaining({ id: executions[1].id, deletedAt: null }),
+			]);
+		});
+	});
+});
diff --git a/packages/cli/test/integration/publicApi/credentials.test.ts b/packages/cli/test/integration/publicApi/credentials.test.ts
index a9754ceb31b85..d028834638ca0 100644
--- a/packages/cli/test/integration/publicApi/credentials.test.ts
+++ b/packages/cli/test/integration/publicApi/credentials.test.ts
@@ -1,16 +1,16 @@
 import type { SuperAgentTest } from 'supertest';
-import { UserSettings } from 'n8n-core';
-import * as Db from '@/Db';
-import type { Role } from '@db/entities/Role';
 import type { User } from '@db/entities/User';
-import { RESPONSE_ERROR_MESSAGES } from '@/constants';
+
 import { randomApiKey, randomName, randomString } from '../shared/random';
-import * as utils from '../shared/utils';
+import * as utils from '../shared/utils/';
 import type { CredentialPayload, SaveCredentialFunction } from '../shared/types';
 import * as testDb from '../shared/testDb';
+import { affixRoleToSaveCredential } from '../shared/db/credentials';
+import { addApiKey, createUser, createUserShell } from '../shared/db/users';
+import { CredentialsRepository } from '@db/repositories/credentials.repository';
+import Container from 'typedi';
+import { SharedCredentialsRepository } from '@db/repositories/sharedCredentials.repository';
 
-let globalMemberRole: Role;
-let credentialOwnerRole: Role;
 let owner: User;
 let member: User;
 let authOwnerAgent: SuperAgentTest;
@@ -18,50 +18,24 @@ let authMemberAgent: SuperAgentTest;
 
 let saveCredential: SaveCredentialFunction;
 
-beforeAll(async () => {
-	const app = await utils.initTestServer({
-		endpointGroups: ['publicApi'],
-		applyAuth: false,
-		enablePublicAPI: true,
-	});
-
-	utils.initConfigFile();
-
-	const [globalOwnerRole, fetchedGlobalMemberRole, _, fetchedCredentialOwnerRole] =
-		await testDb.getAllRoles();
-
-	globalMemberRole = fetchedGlobalMemberRole;
-	credentialOwnerRole = fetchedCredentialOwnerRole;
+const testServer = utils.setupTestServer({ endpointGroups: ['publicApi'] });
 
-	owner = await testDb.addApiKey(await testDb.createUserShell(globalOwnerRole));
-	member = await testDb.createUser({ globalRole: globalMemberRole, apiKey: randomApiKey() });
+beforeAll(async () => {
+	owner = await addApiKey(await createUserShell('global:owner'));
+	member = await createUser({ role: 'global:member', apiKey: randomApiKey() });
 
-	authOwnerAgent = utils.createAgent(app, {
-		apiPath: 'public',
-		version: 1,
-		auth: true,
-		user: owner,
-	});
-	authMemberAgent = utils.createAgent(app, {
-		apiPath: 'public',
-		version: 1,
-		auth: true,
-		user: member,
-	});
+	authOwnerAgent = testServer.publicApiAgentFor(owner);
+	authMemberAgent = testServer.publicApiAgentFor(member);
 
-	saveCredential = testDb.affixRoleToSaveCredential(credentialOwnerRole);
+	saveCredential = affixRoleToSaveCredential('credential:owner');
 
-	utils.initCredentialsTypes();
+	await utils.initCredentialsTypes();
 });
 
 beforeEach(async () => {
 	await testDb.truncate(['SharedCredentials', 'Credentials']);
 });
 
-afterAll(async () => {
-	await testDb.terminate();
-});
-
 describe('POST /credentials', () => {
 	test('should create credentials', async () => {
 		const payload = {
@@ -77,45 +51,31 @@ describe('POST /credentials', () => {
 		const response = await authOwnerAgent.post('/credentials').send(payload);
 
 		expect(response.statusCode).toBe(200);
-
 		const { id, name, type } = response.body;
 
 		expect(name).toBe(payload.name);
 		expect(type).toBe(payload.type);
 
-		const credential = await Db.collections.Credentials.findOneByOrFail({ id });
+		const credential = await Container.get(CredentialsRepository).findOneByOrFail({ id });
 
 		expect(credential.name).toBe(payload.name);
 		expect(credential.type).toBe(payload.type);
 		expect(credential.data).not.toBe(payload.data);
 
-		const sharedCredential = await Db.collections.SharedCredentials.findOneOrFail({
-			relations: ['user', 'credentials', 'role'],
+		const sharedCredential = await Container.get(SharedCredentialsRepository).findOneOrFail({
+			relations: ['user', 'credentials'],
 			where: { credentialsId: credential.id, userId: owner.id },
 		});
 
-		expect(sharedCredential.role).toEqual(credentialOwnerRole);
+		expect(sharedCredential.role).toEqual('credential:owner');
 		expect(sharedCredential.credentials.name).toBe(payload.name);
 	});
 
 	test('should fail with invalid inputs', async () => {
-		await Promise.all(
-			INVALID_PAYLOADS.map(async (invalidPayload) => {
-				const response = await authOwnerAgent.post('/credentials').send(invalidPayload);
-				expect(response.statusCode === 400 || response.statusCode === 415).toBe(true);
-			}),
-		);
-	});
-
-	test('should fail with missing encryption key', async () => {
-		const mock = jest.spyOn(UserSettings, 'getEncryptionKey');
-		mock.mockRejectedValue(new Error(RESPONSE_ERROR_MESSAGES.NO_ENCRYPTION_KEY));
-
-		const response = await authOwnerAgent.post('/credentials').send(credentialPayload());
-
-		expect(response.statusCode).toBe(500);
-
-		mock.mockRestore();
+		for (const invalidPayload of INVALID_PAYLOADS) {
+			const response = await authOwnerAgent.post('/credentials').send(invalidPayload);
+			expect(response.statusCode === 400 || response.statusCode === 415).toBe(true);
+		}
 	});
 });
 
@@ -132,13 +92,13 @@ describe('DELETE /credentials/:id', () => {
 		expect(name).toBe(savedCredential.name);
 		expect(type).toBe(savedCredential.type);
 
-		const deletedCredential = await Db.collections.Credentials.findOneBy({
+		const deletedCredential = await Container.get(CredentialsRepository).findOneBy({
 			id: savedCredential.id,
 		});
 
 		expect(deletedCredential).toBeNull(); // deleted
 
-		const deletedSharedCredential = await Db.collections.SharedCredentials.findOneBy({});
+		const deletedSharedCredential = await Container.get(SharedCredentialsRepository).findOneBy({});
 
 		expect(deletedSharedCredential).toBeNull(); // deleted
 	});
@@ -150,13 +110,13 @@ describe('DELETE /credentials/:id', () => {
 
 		expect(response.statusCode).toBe(200);
 
-		const deletedCredential = await Db.collections.Credentials.findOneBy({
+		const deletedCredential = await Container.get(CredentialsRepository).findOneBy({
 			id: savedCredential.id,
 		});
 
 		expect(deletedCredential).toBeNull(); // deleted
 
-		const deletedSharedCredential = await Db.collections.SharedCredentials.findOneBy({});
+		const deletedSharedCredential = await Container.get(SharedCredentialsRepository).findOneBy({});
 
 		expect(deletedSharedCredential).toBeNull(); // deleted
 	});
@@ -173,20 +133,20 @@ describe('DELETE /credentials/:id', () => {
 		expect(name).toBe(savedCredential.name);
 		expect(type).toBe(savedCredential.type);
 
-		const deletedCredential = await Db.collections.Credentials.findOneBy({
+		const deletedCredential = await Container.get(CredentialsRepository).findOneBy({
 			id: savedCredential.id,
 		});
 
 		expect(deletedCredential).toBeNull(); // deleted
 
-		const deletedSharedCredential = await Db.collections.SharedCredentials.findOneBy({});
+		const deletedSharedCredential = await Container.get(SharedCredentialsRepository).findOneBy({});
 
 		expect(deletedSharedCredential).toBeNull(); // deleted
 	});
 
 	test('should delete owned cred for member but leave others untouched', async () => {
-		const anotherMember = await testDb.createUser({
-			globalRole: globalMemberRole,
+		const anotherMember = await createUser({
+			role: 'global:member',
 			apiKey: randomApiKey(),
 		});
 
@@ -205,13 +165,13 @@ describe('DELETE /credentials/:id', () => {
 		expect(name).toBe(savedCredential.name);
 		expect(type).toBe(savedCredential.type);
 
-		const deletedCredential = await Db.collections.Credentials.findOneBy({
+		const deletedCredential = await Container.get(CredentialsRepository).findOneBy({
 			id: savedCredential.id,
 		});
 
 		expect(deletedCredential).toBeNull(); // deleted
 
-		const deletedSharedCredential = await Db.collections.SharedCredentials.findOne({
+		const deletedSharedCredential = await Container.get(SharedCredentialsRepository).findOne({
 			where: {
 				credentialsId: savedCredential.id,
 			},
@@ -221,13 +181,13 @@ describe('DELETE /credentials/:id', () => {
 
 		await Promise.all(
 			[notToBeChangedCredential, notToBeChangedCredential2].map(async (credential) => {
-				const untouchedCredential = await Db.collections.Credentials.findOneBy({
+				const untouchedCredential = await Container.get(CredentialsRepository).findOneBy({
 					id: credential.id,
 				});
 
 				expect(untouchedCredential).toEqual(credential); // not deleted
 
-				const untouchedSharedCredential = await Db.collections.SharedCredentials.findOne({
+				const untouchedSharedCredential = await Container.get(SharedCredentialsRepository).findOne({
 					where: {
 						credentialsId: credential.id,
 					},
@@ -245,13 +205,13 @@ describe('DELETE /credentials/:id', () => {
 
 		expect(response.statusCode).toBe(404);
 
-		const shellCredential = await Db.collections.Credentials.findOneBy({
+		const shellCredential = await Container.get(CredentialsRepository).findOneBy({
 			id: savedCredential.id,
 		});
 
 		expect(shellCredential).toBeDefined(); // not deleted
 
-		const deletedSharedCredential = await Db.collections.SharedCredentials.findOneBy({});
+		const deletedSharedCredential = await Container.get(SharedCredentialsRepository).findOneBy({});
 
 		expect(deletedSharedCredential).toBeDefined(); // not deleted
 	});
@@ -271,19 +231,17 @@ describe('GET /credentials/schema/:credentialType', () => {
 	});
 
 	test('should retrieve credential type', async () => {
-		const response = await authOwnerAgent.get('/credentials/schema/githubApi');
+		const response = await authOwnerAgent.get('/credentials/schema/ftp');
 
 		const { additionalProperties, type, properties, required } = response.body;
 
 		expect(additionalProperties).toBe(false);
 		expect(type).toBe('object');
-		expect(properties.server).toBeDefined();
-		expect(properties.server.type).toBe('string');
-		expect(properties.user.type).toBeDefined();
-		expect(properties.user.type).toBe('string');
-		expect(properties.accessToken.type).toBeDefined();
-		expect(properties.accessToken.type).toBe('string');
-		expect(required).toEqual(expect.arrayContaining(['server', 'user', 'accessToken']));
+		expect(properties.host.type).toBe('string');
+		expect(properties.port.type).toBe('number');
+		expect(properties.username.type).toBe('string');
+		expect(properties.password.type).toBe('string');
+		expect(required).toEqual(expect.arrayContaining(['host', 'port']));
 		expect(response.statusCode).toBe(200);
 	});
 });
@@ -300,7 +258,6 @@ const credentialPayload = (): CredentialPayload => ({
 
 const dbCredential = () => {
 	const credential = credentialPayload();
-	credential.nodesAccess = [{ nodeType: credential.type }];
 
 	return credential;
 };
@@ -318,13 +275,6 @@ const INVALID_PAYLOADS = [
 		name: randomName(),
 		type: randomName(),
 	},
-	{
-		name: randomName(),
-		type: 'githubApi',
-		data: {
-			server: randomName(),
-		},
-	},
 	{},
 	[],
 	undefined,
diff --git a/packages/cli/test/integration/publicApi/executions.test.ts b/packages/cli/test/integration/publicApi/executions.test.ts
index 1d5debdbfb1e3..3cc6bd4302754 100644
--- a/packages/cli/test/integration/publicApi/executions.test.ts
+++ b/packages/cli/test/integration/publicApi/executions.test.ts
@@ -1,39 +1,43 @@
-import type { Application } from 'express';
 import type { SuperAgentTest } from 'supertest';
-import config from '@/config';
 import type { User } from '@db/entities/User';
-import type { ActiveWorkflowRunner } from '@/ActiveWorkflowRunner';
+import type { ActiveWorkflowManager } from '@/ActiveWorkflowManager';
 
 import { randomApiKey } from '../shared/random';
-import * as utils from '../shared/utils';
+import * as utils from '../shared/utils/';
 import * as testDb from '../shared/testDb';
+import { createUser } from '../shared/db/users';
+import {
+	createManyWorkflows,
+	createWorkflow,
+	shareWorkflowWithUsers,
+} from '../shared/db/workflows';
+import {
+	createErrorExecution,
+	createManyExecutions,
+	createSuccessfulExecution,
+	createWaitingExecution,
+} from '../shared/db/executions';
 
-let app: Application;
 let owner: User;
 let user1: User;
 let user2: User;
 let authOwnerAgent: SuperAgentTest;
 let authUser1Agent: SuperAgentTest;
 let authUser2Agent: SuperAgentTest;
-let workflowRunner: ActiveWorkflowRunner;
+let workflowRunner: ActiveWorkflowManager;
 
-beforeAll(async () => {
-	app = await utils.initTestServer({
-		endpointGroups: ['publicApi'],
-		applyAuth: false,
-		enablePublicAPI: true,
-	});
+const testServer = utils.setupTestServer({ endpointGroups: ['publicApi'] });
 
-	const globalOwnerRole = await testDb.getGlobalOwnerRole();
-	const globalUserRole = await testDb.getGlobalMemberRole();
-	owner = await testDb.createUser({ globalRole: globalOwnerRole, apiKey: randomApiKey() });
-	user1 = await testDb.createUser({ globalRole: globalUserRole, apiKey: randomApiKey() });
-	user2 = await testDb.createUser({ globalRole: globalUserRole, apiKey: randomApiKey() });
+beforeAll(async () => {
+	owner = await createUser({ role: 'global:owner', apiKey: randomApiKey() });
+	user1 = await createUser({ role: 'global:member', apiKey: randomApiKey() });
+	user2 = await createUser({ role: 'global:member', apiKey: randomApiKey() });
 
-	await utils.initBinaryManager();
+	// TODO: mock BinaryDataService instead
+	await utils.initBinaryDataService();
 	await utils.initNodeTypes();
 
-	workflowRunner = await utils.initActiveWorkflowRunner();
+	workflowRunner = await utils.initActiveWorkflowManager();
 });
 
 beforeEach(async () => {
@@ -46,42 +50,18 @@ beforeEach(async () => {
 		'Settings',
 	]);
 
-	authOwnerAgent = utils.createAgent(app, {
-		apiPath: 'public',
-		auth: true,
-		user: owner,
-		version: 1,
-	});
-
-	authUser1Agent = utils.createAgent(app, {
-		apiPath: 'public',
-		auth: true,
-		user: user1,
-		version: 1,
-	});
-
-	authUser2Agent = utils.createAgent(app, {
-		apiPath: 'public',
-		auth: true,
-		user: user2,
-		version: 1,
-	});
-
-	config.set('userManagement.disabled', false);
-	config.set('userManagement.isInstanceOwnerSetUp', true);
+	authOwnerAgent = testServer.publicApiAgentFor(owner);
+	authUser1Agent = testServer.publicApiAgentFor(user1);
+	authUser2Agent = testServer.publicApiAgentFor(user2);
 });
 
 afterEach(async () => {
 	await workflowRunner?.removeAll();
 });
 
-afterAll(async () => {
-	await testDb.terminate();
-});
-
 const testWithAPIKey =
 	(method: 'get' | 'post' | 'put' | 'delete', url: string, apiKey: string | null) => async () => {
-		authOwnerAgent.set({ 'X-N8N-API-KEY': apiKey });
+		void authOwnerAgent.set({ 'X-N8N-API-KEY': apiKey });
 		const response = await authOwnerAgent[method](url);
 		expect(response.statusCode).toBe(401);
 	};
@@ -92,9 +72,9 @@ describe('GET /executions/:id', () => {
 	test('should fail due to invalid API Key', testWithAPIKey('get', '/executions/1', 'abcXYZ'));
 
 	test('owner should be able to get an execution owned by him', async () => {
-		const workflow = await testDb.createWorkflow({}, owner);
+		const workflow = await createWorkflow({}, owner);
 
-		const execution = await testDb.createSuccessfulExecution(workflow);
+		const execution = await createSuccessfulExecution(workflow);
 
 		const response = await authOwnerAgent.get(`/executions/${execution.id}`);
 
@@ -124,8 +104,8 @@ describe('GET /executions/:id', () => {
 	});
 
 	test('owner should be able to read executions of other users', async () => {
-		const workflow = await testDb.createWorkflow({}, user1);
-		const execution = await testDb.createSuccessfulExecution(workflow);
+		const workflow = await createWorkflow({}, user1);
+		const execution = await createSuccessfulExecution(workflow);
 
 		const response = await authOwnerAgent.get(`/executions/${execution.id}`);
 
@@ -133,8 +113,8 @@ describe('GET /executions/:id', () => {
 	});
 
 	test('member should be able to fetch his own executions', async () => {
-		const workflow = await testDb.createWorkflow({}, user1);
-		const execution = await testDb.createSuccessfulExecution(workflow);
+		const workflow = await createWorkflow({}, user1);
+		const execution = await createSuccessfulExecution(workflow);
 
 		const response = await authUser1Agent.get(`/executions/${execution.id}`);
 
@@ -142,9 +122,9 @@ describe('GET /executions/:id', () => {
 	});
 
 	test('member should not get an execution of another user without the workflow being shared', async () => {
-		const workflow = await testDb.createWorkflow({}, owner);
+		const workflow = await createWorkflow({}, owner);
 
-		const execution = await testDb.createSuccessfulExecution(workflow);
+		const execution = await createSuccessfulExecution(workflow);
 
 		const response = await authUser1Agent.get(`/executions/${execution.id}`);
 
@@ -152,11 +132,11 @@ describe('GET /executions/:id', () => {
 	});
 
 	test('member should be able to fetch executions of workflows shared with him', async () => {
-		const workflow = await testDb.createWorkflow({}, user1);
+		const workflow = await createWorkflow({}, user1);
 
-		const execution = await testDb.createSuccessfulExecution(workflow);
+		const execution = await createSuccessfulExecution(workflow);
 
-		await testDb.shareWorkflowWithUsers(workflow, [user2]);
+		await shareWorkflowWithUsers(workflow, [user2]);
 
 		const response = await authUser2Agent.get(`/executions/${execution.id}`);
 
@@ -170,8 +150,8 @@ describe('DELETE /executions/:id', () => {
 	test('should fail due to invalid API Key', testWithAPIKey('delete', '/executions/1', 'abcXYZ'));
 
 	test('should delete an execution', async () => {
-		const workflow = await testDb.createWorkflow({}, owner);
-		const execution = await testDb.createSuccessfulExecution(workflow);
+		const workflow = await createWorkflow({}, owner);
+		const execution = await createSuccessfulExecution(workflow);
 
 		const response = await authOwnerAgent.delete(`/executions/${execution.id}`);
 
@@ -198,6 +178,8 @@ describe('DELETE /executions/:id', () => {
 		expect(stoppedAt).not.toBeNull();
 		expect(workflowId).toBe(execution.workflowId);
 		expect(waitTill).toBeNull();
+
+		await authOwnerAgent.get(`/executions/${execution.id}`).expect(404);
 	});
 });
 
@@ -207,13 +189,13 @@ describe('GET /executions', () => {
 	test('should fail due to invalid API Key', testWithAPIKey('get', '/executions', 'abcXYZ'));
 
 	test('should retrieve all successful executions', async () => {
-		const workflow = await testDb.createWorkflow({}, owner);
+		const workflow = await createWorkflow({}, owner);
 
-		const successfulExecution = await testDb.createSuccessfulExecution(workflow);
+		const successfulExecution = await createSuccessfulExecution(workflow);
 
-		await testDb.createErrorExecution(workflow);
+		await createErrorExecution(workflow);
 
-		const response = await authOwnerAgent.get(`/executions`).query({
+		const response = await authOwnerAgent.get('/executions').query({
 			status: 'success',
 		});
 
@@ -245,16 +227,17 @@ describe('GET /executions', () => {
 	});
 
 	// failing on Postgres and MySQL - ref: https://github.com/n8n-io/n8n/pull/3834
+	// eslint-disable-next-line n8n-local-rules/no-skipped-tests
 	test.skip('should paginate two executions', async () => {
-		const workflow = await testDb.createWorkflow({}, owner);
+		const workflow = await createWorkflow({}, owner);
 
-		const firstSuccessfulExecution = await testDb.createSuccessfulExecution(workflow);
+		const firstSuccessfulExecution = await createSuccessfulExecution(workflow);
 
-		const secondSuccessfulExecution = await testDb.createSuccessfulExecution(workflow);
+		const secondSuccessfulExecution = await createSuccessfulExecution(workflow);
 
-		await testDb.createErrorExecution(workflow);
+		await createErrorExecution(workflow);
 
-		const firstExecutionResponse = await authOwnerAgent.get(`/executions`).query({
+		const firstExecutionResponse = await authOwnerAgent.get('/executions').query({
 			status: 'success',
 			limit: 1,
 		});
@@ -263,7 +246,7 @@ describe('GET /executions', () => {
 		expect(firstExecutionResponse.body.data.length).toBe(1);
 		expect(firstExecutionResponse.body.nextCursor).toBeDefined();
 
-		const secondExecutionResponse = await authOwnerAgent.get(`/executions`).query({
+		const secondExecutionResponse = await authOwnerAgent.get('/executions').query({
 			status: 'success',
 			limit: 1,
 			cursor: firstExecutionResponse.body.nextCursor,
@@ -302,13 +285,13 @@ describe('GET /executions', () => {
 	});
 
 	test('should retrieve all error executions', async () => {
-		const workflow = await testDb.createWorkflow({}, owner);
+		const workflow = await createWorkflow({}, owner);
 
-		await testDb.createSuccessfulExecution(workflow);
+		await createSuccessfulExecution(workflow);
 
-		const errorExecution = await testDb.createErrorExecution(workflow);
+		const errorExecution = await createErrorExecution(workflow);
 
-		const response = await authOwnerAgent.get(`/executions`).query({
+		const response = await authOwnerAgent.get('/executions').query({
 			status: 'error',
 		});
 
@@ -340,15 +323,15 @@ describe('GET /executions', () => {
 	});
 
 	test('should return all waiting executions', async () => {
-		const workflow = await testDb.createWorkflow({}, owner);
+		const workflow = await createWorkflow({}, owner);
 
-		await testDb.createSuccessfulExecution(workflow);
+		await createSuccessfulExecution(workflow);
 
-		await testDb.createErrorExecution(workflow);
+		await createErrorExecution(workflow);
 
-		const waitingExecution = await testDb.createWaitingExecution(workflow);
+		const waitingExecution = await createWaitingExecution(workflow);
 
-		const response = await authOwnerAgent.get(`/executions`).query({
+		const response = await authOwnerAgent.get('/executions').query({
 			status: 'waiting',
 		});
 
@@ -380,16 +363,12 @@ describe('GET /executions', () => {
 	});
 
 	test('should retrieve all executions of specific workflow', async () => {
-		const [workflow, workflow2] = await testDb.createManyWorkflows(2, {}, owner);
+		const [workflow, workflow2] = await createManyWorkflows(2, {}, owner);
 
-		const savedExecutions = await testDb.createManyExecutions(
-			2,
-			workflow,
-			testDb.createSuccessfulExecution,
-		);
-		await testDb.createManyExecutions(2, workflow2, testDb.createSuccessfulExecution);
+		const savedExecutions = await createManyExecutions(2, workflow, createSuccessfulExecution);
+		await createManyExecutions(2, workflow2, createSuccessfulExecution);
 
-		const response = await authOwnerAgent.get(`/executions`).query({
+		const response = await authOwnerAgent.get('/executions').query({
 			workflowId: workflow.id,
 		});
 
@@ -423,23 +402,15 @@ describe('GET /executions', () => {
 	});
 
 	test('owner should retrieve all executions regardless of ownership', async () => {
-		const [firstWorkflowForUser1, secondWorkflowForUser1] = await testDb.createManyWorkflows(
-			2,
-			{},
-			user1,
-		);
-		await testDb.createManyExecutions(2, firstWorkflowForUser1, testDb.createSuccessfulExecution);
-		await testDb.createManyExecutions(2, secondWorkflowForUser1, testDb.createSuccessfulExecution);
-
-		const [firstWorkflowForUser2, secondWorkflowForUser2] = await testDb.createManyWorkflows(
-			2,
-			{},
-			user2,
-		);
-		await testDb.createManyExecutions(2, firstWorkflowForUser2, testDb.createSuccessfulExecution);
-		await testDb.createManyExecutions(2, secondWorkflowForUser2, testDb.createSuccessfulExecution);
-
-		const response = await authOwnerAgent.get(`/executions`);
+		const [firstWorkflowForUser1, secondWorkflowForUser1] = await createManyWorkflows(2, {}, user1);
+		await createManyExecutions(2, firstWorkflowForUser1, createSuccessfulExecution);
+		await createManyExecutions(2, secondWorkflowForUser1, createSuccessfulExecution);
+
+		const [firstWorkflowForUser2, secondWorkflowForUser2] = await createManyWorkflows(2, {}, user2);
+		await createManyExecutions(2, firstWorkflowForUser2, createSuccessfulExecution);
+		await createManyExecutions(2, secondWorkflowForUser2, createSuccessfulExecution);
+
+		const response = await authOwnerAgent.get('/executions');
 
 		expect(response.statusCode).toBe(200);
 		expect(response.body.data.length).toBe(8);
@@ -447,23 +418,15 @@ describe('GET /executions', () => {
 	});
 
 	test('member should not see executions of workflows not shared with him', async () => {
-		const [firstWorkflowForUser1, secondWorkflowForUser1] = await testDb.createManyWorkflows(
-			2,
-			{},
-			user1,
-		);
-		await testDb.createManyExecutions(2, firstWorkflowForUser1, testDb.createSuccessfulExecution);
-		await testDb.createManyExecutions(2, secondWorkflowForUser1, testDb.createSuccessfulExecution);
-
-		const [firstWorkflowForUser2, secondWorkflowForUser2] = await testDb.createManyWorkflows(
-			2,
-			{},
-			user2,
-		);
-		await testDb.createManyExecutions(2, firstWorkflowForUser2, testDb.createSuccessfulExecution);
-		await testDb.createManyExecutions(2, secondWorkflowForUser2, testDb.createSuccessfulExecution);
-
-		const response = await authUser1Agent.get(`/executions`);
+		const [firstWorkflowForUser1, secondWorkflowForUser1] = await createManyWorkflows(2, {}, user1);
+		await createManyExecutions(2, firstWorkflowForUser1, createSuccessfulExecution);
+		await createManyExecutions(2, secondWorkflowForUser1, createSuccessfulExecution);
+
+		const [firstWorkflowForUser2, secondWorkflowForUser2] = await createManyWorkflows(2, {}, user2);
+		await createManyExecutions(2, firstWorkflowForUser2, createSuccessfulExecution);
+		await createManyExecutions(2, secondWorkflowForUser2, createSuccessfulExecution);
+
+		const response = await authUser1Agent.get('/executions');
 
 		expect(response.statusCode).toBe(200);
 		expect(response.body.data.length).toBe(4);
@@ -471,25 +434,17 @@ describe('GET /executions', () => {
 	});
 
 	test('member should also see executions of workflows shared with him', async () => {
-		const [firstWorkflowForUser1, secondWorkflowForUser1] = await testDb.createManyWorkflows(
-			2,
-			{},
-			user1,
-		);
-		await testDb.createManyExecutions(2, firstWorkflowForUser1, testDb.createSuccessfulExecution);
-		await testDb.createManyExecutions(2, secondWorkflowForUser1, testDb.createSuccessfulExecution);
-
-		const [firstWorkflowForUser2, secondWorkflowForUser2] = await testDb.createManyWorkflows(
-			2,
-			{},
-			user2,
-		);
-		await testDb.createManyExecutions(2, firstWorkflowForUser2, testDb.createSuccessfulExecution);
-		await testDb.createManyExecutions(2, secondWorkflowForUser2, testDb.createSuccessfulExecution);
-
-		await testDb.shareWorkflowWithUsers(firstWorkflowForUser2, [user1]);
-
-		const response = await authUser1Agent.get(`/executions`);
+		const [firstWorkflowForUser1, secondWorkflowForUser1] = await createManyWorkflows(2, {}, user1);
+		await createManyExecutions(2, firstWorkflowForUser1, createSuccessfulExecution);
+		await createManyExecutions(2, secondWorkflowForUser1, createSuccessfulExecution);
+
+		const [firstWorkflowForUser2, secondWorkflowForUser2] = await createManyWorkflows(2, {}, user2);
+		await createManyExecutions(2, firstWorkflowForUser2, createSuccessfulExecution);
+		await createManyExecutions(2, secondWorkflowForUser2, createSuccessfulExecution);
+
+		await shareWorkflowWithUsers(firstWorkflowForUser2, [user1]);
+
+		const response = await authUser1Agent.get('/executions');
 
 		expect(response.statusCode).toBe(200);
 		expect(response.body.data.length).toBe(6);
diff --git a/packages/cli/test/integration/publicApi/tags.test.ts b/packages/cli/test/integration/publicApi/tags.test.ts
new file mode 100644
index 0000000000000..7e8fcacdead0f
--- /dev/null
+++ b/packages/cli/test/integration/publicApi/tags.test.ts
@@ -0,0 +1,337 @@
+import type { SuperAgentTest } from 'supertest';
+import Container from 'typedi';
+import type { User } from '@db/entities/User';
+import { TagRepository } from '@db/repositories/tag.repository';
+
+import { randomApiKey } from '../shared/random';
+import * as utils from '../shared/utils/';
+import * as testDb from '../shared/testDb';
+import { createUser } from '../shared/db/users';
+import { createTag } from '../shared/db/tags';
+
+let owner: User;
+let member: User;
+let authOwnerAgent: SuperAgentTest;
+let authMemberAgent: SuperAgentTest;
+
+const testServer = utils.setupTestServer({ endpointGroups: ['publicApi'] });
+
+beforeAll(async () => {
+	owner = await createUser({
+		role: 'global:owner',
+		apiKey: randomApiKey(),
+	});
+
+	member = await createUser({
+		role: 'global:member',
+		apiKey: randomApiKey(),
+	});
+});
+
+beforeEach(async () => {
+	await testDb.truncate(['Tag']);
+
+	authOwnerAgent = testServer.publicApiAgentFor(owner);
+	authMemberAgent = testServer.publicApiAgentFor(member);
+});
+
+const testWithAPIKey =
+	(method: 'get' | 'post' | 'put' | 'delete', url: string, apiKey: string | null) => async () => {
+		void authOwnerAgent.set({ 'X-N8N-API-KEY': apiKey });
+		const response = await authOwnerAgent[method](url);
+		expect(response.statusCode).toBe(401);
+	};
+
+describe('GET /tags', () => {
+	test('should fail due to missing API Key', testWithAPIKey('get', '/tags', null));
+
+	test('should fail due to invalid API Key', testWithAPIKey('get', '/tags', 'abcXYZ'));
+
+	test('should return all tags', async () => {
+		await Promise.all([createTag({}), createTag({}), createTag({})]);
+
+		const response = await authMemberAgent.get('/tags');
+
+		expect(response.statusCode).toBe(200);
+		expect(response.body.data.length).toBe(3);
+		expect(response.body.nextCursor).toBeNull();
+
+		for (const tag of response.body.data) {
+			const { id, name, createdAt, updatedAt } = tag;
+
+			expect(id).toBeDefined();
+			expect(name).toBeDefined();
+			expect(createdAt).toBeDefined();
+			expect(updatedAt).toBeDefined();
+		}
+	});
+
+	test('should return all tags with pagination', async () => {
+		await Promise.all([createTag({}), createTag({}), createTag({})]);
+
+		const response = await authMemberAgent.get('/tags?limit=1');
+
+		expect(response.statusCode).toBe(200);
+		expect(response.body.data.length).toBe(1);
+		expect(response.body.nextCursor).not.toBeNull();
+
+		const response2 = await authMemberAgent.get(`/tags?limit=1&cursor=${response.body.nextCursor}`);
+
+		expect(response2.statusCode).toBe(200);
+		expect(response2.body.data.length).toBe(1);
+		expect(response2.body.nextCursor).not.toBeNull();
+		expect(response2.body.nextCursor).not.toBe(response.body.nextCursor);
+
+		const responses = [...response.body.data, ...response2.body.data];
+
+		for (const tag of responses) {
+			const { id, name, createdAt, updatedAt } = tag;
+
+			expect(id).toBeDefined();
+			expect(name).toBeDefined();
+			expect(createdAt).toBeDefined();
+			expect(updatedAt).toBeDefined();
+		}
+
+		// check that we really received a different result
+		expect(response.body.data[0].id).not.toBe(response2.body.data[0].id);
+	});
+});
+
+describe('GET /tags/:id', () => {
+	test('should fail due to missing API Key', testWithAPIKey('get', '/tags/gZqmqiGAuo1dHT7q', null));
+
+	test(
+		'should fail due to invalid API Key',
+		testWithAPIKey('get', '/tags/gZqmqiGAuo1dHT7q', 'abcXYZ'),
+	);
+
+	test('should fail due to non-existing tag', async () => {
+		const response = await authOwnerAgent.get('/tags/gZqmqiGAuo1dHT7q');
+
+		expect(response.statusCode).toBe(404);
+	});
+
+	test('should retrieve tag', async () => {
+		// create tag
+		const tag = await createTag({});
+
+		const response = await authMemberAgent.get(`/tags/${tag.id}`);
+
+		expect(response.statusCode).toBe(200);
+
+		const { id, name, createdAt, updatedAt } = response.body;
+
+		expect(id).toEqual(tag.id);
+		expect(name).toEqual(tag.name);
+		expect(createdAt).toEqual(tag.createdAt.toISOString());
+		expect(updatedAt).toEqual(tag.updatedAt.toISOString());
+	});
+});
+
+describe('DELETE /tags/:id', () => {
+	test(
+		'should fail due to missing API Key',
+		testWithAPIKey('delete', '/tags/gZqmqiGAuo1dHT7q', null),
+	);
+
+	test(
+		'should fail due to invalid API Key',
+		testWithAPIKey('delete', '/tags/gZqmqiGAuo1dHT7q', 'abcXYZ'),
+	);
+
+	test('should fail due to non-existing tag', async () => {
+		const response = await authOwnerAgent.delete('/tags/gZqmqiGAuo1dHT7q');
+
+		expect(response.statusCode).toBe(404);
+	});
+
+	test('owner should delete the tag', async () => {
+		// create tag
+		const tag = await createTag({});
+
+		const response = await authOwnerAgent.delete(`/tags/${tag.id}`);
+
+		expect(response.statusCode).toBe(200);
+
+		const { id, name, createdAt, updatedAt } = response.body;
+
+		expect(id).toEqual(tag.id);
+		expect(name).toEqual(tag.name);
+		expect(createdAt).toEqual(tag.createdAt.toISOString());
+		expect(updatedAt).toEqual(tag.updatedAt.toISOString());
+
+		// make sure the tag actually deleted from the db
+		const deletedTag = await Container.get(TagRepository).findOneBy({
+			id: tag.id,
+		});
+
+		expect(deletedTag).toBeNull();
+	});
+
+	test('non-owner should not delete tag', async () => {
+		// create tag
+		const tag = await createTag({});
+
+		const response = await authMemberAgent.delete(`/tags/${tag.id}`);
+
+		expect(response.statusCode).toBe(403);
+
+		const { message } = response.body;
+
+		expect(message).toEqual('Forbidden');
+
+		// make sure the tag was not deleted from the db
+		const notDeletedTag = await Container.get(TagRepository).findOneBy({
+			id: tag.id,
+		});
+
+		expect(notDeletedTag).not.toBeNull();
+	});
+});
+
+describe('POST /tags', () => {
+	test('should fail due to missing API Key', testWithAPIKey('post', '/tags', null));
+
+	test('should fail due to invalid API Key', testWithAPIKey('post', '/tags', 'abcXYZ'));
+
+	test('should fail due to invalid body', async () => {
+		const response = await authOwnerAgent.post('/tags').send({});
+
+		expect(response.statusCode).toBe(400);
+	});
+
+	test('should create tag', async () => {
+		const payload = {
+			name: 'Tag 1',
+		};
+
+		const response = await authMemberAgent.post('/tags').send(payload);
+
+		expect(response.statusCode).toBe(201);
+
+		const { id, name, createdAt, updatedAt } = response.body;
+
+		expect(id).toBeDefined();
+		expect(name).toBe(payload.name);
+		expect(createdAt).toBeDefined();
+		expect(updatedAt).toEqual(createdAt);
+
+		// check if created tag in DB
+		const tag = await Container.get(TagRepository).findOne({
+			where: {
+				id,
+			},
+		});
+
+		expect(tag?.name).toBe(name);
+		expect(tag?.createdAt.toISOString()).toEqual(createdAt);
+		expect(tag?.updatedAt.toISOString()).toEqual(updatedAt);
+	});
+
+	test('should not create tag if tag with same name exists', async () => {
+		const tag = {
+			name: 'Tag 1',
+		};
+
+		// create tag
+		await createTag(tag);
+
+		const response = await authMemberAgent.post('/tags').send(tag);
+
+		expect(response.statusCode).toBe(409);
+
+		const { message } = response.body;
+
+		expect(message).toBe('Tag already exists');
+	});
+});
+
+describe('PUT /tags/:id', () => {
+	test('should fail due to missing API Key', testWithAPIKey('put', '/tags/gZqmqiGAuo1dHT7q', null));
+
+	test(
+		'should fail due to invalid API Key',
+		testWithAPIKey('put', '/tags/gZqmqiGAuo1dHT7q', 'abcXYZ'),
+	);
+
+	test('should fail due to non-existing tag', async () => {
+		const response = await authOwnerAgent.put('/tags/gZqmqiGAuo1dHT7q').send({
+			name: 'testing',
+		});
+
+		expect(response.statusCode).toBe(404);
+	});
+
+	test('should fail due to invalid body', async () => {
+		const response = await authOwnerAgent.put('/tags/gZqmqiGAuo1dHT7q').send({});
+
+		expect(response.statusCode).toBe(400);
+	});
+
+	test('should update tag', async () => {
+		const tag = await createTag({});
+
+		const payload = {
+			name: 'New name',
+		};
+
+		const response = await authOwnerAgent.put(`/tags/${tag.id}`).send(payload);
+
+		const { id, name, updatedAt } = response.body;
+
+		expect(response.statusCode).toBe(200);
+
+		expect(id).toBe(tag.id);
+		expect(name).toBe(payload.name);
+		expect(updatedAt).not.toBe(tag.updatedAt.toISOString());
+
+		// check updated tag in DB
+		const dbTag = await Container.get(TagRepository).findOne({
+			where: {
+				id,
+			},
+		});
+
+		expect(dbTag?.name).toBe(payload.name);
+		expect(dbTag?.updatedAt.getTime()).toBeGreaterThan(tag.updatedAt.getTime());
+	});
+
+	test('should fail if there is already a tag with a the new name', async () => {
+		const toUpdateTag = await createTag({});
+		const otherTag = await createTag({ name: 'Some name' });
+
+		const payload = {
+			name: otherTag.name,
+		};
+
+		const response = await authOwnerAgent.put(`/tags/${toUpdateTag.id}`).send(payload);
+
+		expect(response.statusCode).toBe(409);
+
+		const { message } = response.body;
+
+		expect(message).toBe('Tag already exists');
+
+		// check tags haven't be updated in DB
+		const toUpdateTagFromDb = await Container.get(TagRepository).findOne({
+			where: {
+				id: toUpdateTag.id,
+			},
+		});
+
+		expect(toUpdateTagFromDb?.name).toEqual(toUpdateTag.name);
+		expect(toUpdateTagFromDb?.createdAt.toISOString()).toEqual(toUpdateTag.createdAt.toISOString());
+		expect(toUpdateTagFromDb?.updatedAt.toISOString()).toEqual(toUpdateTag.updatedAt.toISOString());
+
+		const otherTagFromDb = await Container.get(TagRepository).findOne({
+			where: {
+				id: otherTag.id,
+			},
+		});
+
+		expect(otherTagFromDb?.name).toEqual(otherTag.name);
+		expect(otherTagFromDb?.createdAt.toISOString()).toEqual(otherTag.createdAt.toISOString());
+		expect(otherTagFromDb?.updatedAt.toISOString()).toEqual(otherTag.updatedAt.toISOString());
+	});
+});
diff --git a/packages/cli/test/integration/publicApi/users.ee.test.ts b/packages/cli/test/integration/publicApi/users.ee.test.ts
new file mode 100644
index 0000000000000..8dfae84625e87
--- /dev/null
+++ b/packages/cli/test/integration/publicApi/users.ee.test.ts
@@ -0,0 +1,224 @@
+import type { SuperAgentTest } from 'supertest';
+import validator from 'validator';
+import { v4 as uuid } from 'uuid';
+
+import { License } from '@/License';
+
+import { mockInstance } from '../../shared/mocking';
+import { randomApiKey } from '../shared/random';
+import * as utils from '../shared/utils/';
+import * as testDb from '../shared/testDb';
+import { createUser, createUserShell } from '../shared/db/users';
+
+mockInstance(License, {
+	getUsersLimit: jest.fn().mockReturnValue(-1),
+});
+
+const testServer = utils.setupTestServer({ endpointGroups: ['publicApi'] });
+
+beforeEach(async () => {
+	await testDb.truncate(['SharedCredentials', 'SharedWorkflow', 'Workflow', 'Credentials', 'User']);
+});
+
+describe('With license unlimited quota:users', () => {
+	describe('GET /users', () => {
+		test('should fail due to missing API Key', async () => {
+			const owner = await createUser({ role: 'global:owner' });
+			const authOwnerAgent = testServer.publicApiAgentFor(owner);
+			await authOwnerAgent.get('/users').expect(401);
+		});
+
+		test('should fail due to invalid API Key', async () => {
+			const owner = await createUser({
+				role: 'global:owner',
+				apiKey: randomApiKey(),
+			});
+			owner.apiKey = 'invalid-key';
+			const authOwnerAgent = testServer.publicApiAgentFor(owner);
+			await authOwnerAgent.get('/users').expect(401);
+		});
+
+		test('should fail due to member trying to access owner only endpoint', async () => {
+			const member = await createUser({ apiKey: randomApiKey() });
+			const authMemberAgent = testServer.publicApiAgentFor(member);
+			await authMemberAgent.get('/users').expect(403);
+		});
+
+		test('should return all users', async () => {
+			const owner = await createUser({
+				role: 'global:owner',
+				apiKey: randomApiKey(),
+			});
+
+			const authOwnerAgent = testServer.publicApiAgentFor(owner);
+
+			await createUser();
+
+			const response = await authOwnerAgent.get('/users').expect(200);
+			expect(response.body.data.length).toBe(2);
+			expect(response.body.nextCursor).toBeNull();
+
+			for (const user of response.body.data) {
+				const {
+					id,
+					email,
+					firstName,
+					lastName,
+					personalizationAnswers,
+					role,
+					password,
+					isPending,
+					createdAt,
+					updatedAt,
+				} = user;
+
+				expect(validator.isUUID(id)).toBe(true);
+				expect(email).toBeDefined();
+				expect(firstName).toBeDefined();
+				expect(lastName).toBeDefined();
+				expect(personalizationAnswers).toBeUndefined();
+				expect(password).toBeUndefined();
+				expect(isPending).toBe(false);
+				expect(role).toBeUndefined();
+				expect(createdAt).toBeDefined();
+				expect(updatedAt).toBeDefined();
+			}
+		});
+	});
+
+	describe('GET /users/:id', () => {
+		test('should fail due to missing API Key', async () => {
+			const owner = await createUser({ role: 'global:owner' });
+			const authOwnerAgent = testServer.publicApiAgentFor(owner);
+			await authOwnerAgent.get(`/users/${owner.id}`).expect(401);
+		});
+
+		test('should fail due to invalid API Key', async () => {
+			const owner = await createUser({
+				role: 'global:owner',
+				apiKey: randomApiKey(),
+			});
+			owner.apiKey = 'invalid-key';
+			const authOwnerAgent = testServer.publicApiAgentFor(owner);
+			await authOwnerAgent.get(`/users/${owner.id}`).expect(401);
+		});
+
+		test('should fail due to member trying to access owner only endpoint', async () => {
+			const member = await createUser({ apiKey: randomApiKey() });
+			const authMemberAgent = testServer.publicApiAgentFor(member);
+			await authMemberAgent.get(`/users/${member.id}`).expect(403);
+		});
+		test('should return 404 for non-existing id ', async () => {
+			const owner = await createUser({
+				role: 'global:owner',
+				apiKey: randomApiKey(),
+			});
+			const authOwnerAgent = testServer.publicApiAgentFor(owner);
+			await authOwnerAgent.get(`/users/${uuid()}`).expect(404);
+		});
+
+		test('should return a pending user', async () => {
+			const owner = await createUser({
+				role: 'global:owner',
+				apiKey: randomApiKey(),
+			});
+
+			const { id: memberId } = await createUserShell('global:member');
+
+			const authOwnerAgent = testServer.publicApiAgentFor(owner);
+			const response = await authOwnerAgent.get(`/users/${memberId}`).expect(200);
+
+			const {
+				id,
+				email,
+				firstName,
+				lastName,
+				personalizationAnswers,
+				role,
+				password,
+				isPending,
+				createdAt,
+				updatedAt,
+			} = response.body;
+
+			expect(validator.isUUID(id)).toBe(true);
+			expect(email).toBeDefined();
+			expect(firstName).toBeDefined();
+			expect(lastName).toBeDefined();
+			expect(personalizationAnswers).toBeUndefined();
+			expect(password).toBeUndefined();
+			expect(role).toBeUndefined();
+			expect(createdAt).toBeDefined();
+			expect(isPending).toBeDefined();
+			expect(isPending).toBeTruthy();
+			expect(updatedAt).toBeDefined();
+		});
+	});
+
+	describe('GET /users/:email', () => {
+		test('with non-existing email should return 404', async () => {
+			const owner = await createUser({
+				role: 'global:owner',
+				apiKey: randomApiKey(),
+			});
+			const authOwnerAgent = testServer.publicApiAgentFor(owner);
+			await authOwnerAgent.get('/users/jhondoe@gmail.com').expect(404);
+		});
+
+		test('should return a user', async () => {
+			const owner = await createUser({
+				role: 'global:owner',
+				apiKey: randomApiKey(),
+			});
+
+			const authOwnerAgent = testServer.publicApiAgentFor(owner);
+			const response = await authOwnerAgent.get(`/users/${owner.email}`).expect(200);
+
+			const {
+				id,
+				email,
+				firstName,
+				lastName,
+				personalizationAnswers,
+				role,
+				password,
+				isPending,
+				createdAt,
+				updatedAt,
+			} = response.body;
+
+			expect(validator.isUUID(id)).toBe(true);
+			expect(email).toBeDefined();
+			expect(firstName).toBeDefined();
+			expect(lastName).toBeDefined();
+			expect(personalizationAnswers).toBeUndefined();
+			expect(password).toBeUndefined();
+			expect(isPending).toBe(false);
+			expect(role).toBeUndefined();
+			expect(createdAt).toBeDefined();
+			expect(updatedAt).toBeDefined();
+		});
+	});
+});
+
+describe('With license without quota:users', () => {
+	let authOwnerAgent: SuperAgentTest;
+
+	beforeEach(async () => {
+		mockInstance(License, { getUsersLimit: jest.fn().mockReturnValue(null) });
+
+		const owner = await createUser({
+			role: 'global:owner',
+			apiKey: randomApiKey(),
+		});
+		authOwnerAgent = testServer.publicApiAgentFor(owner);
+	});
+
+	test('GET /users should fail due to invalid license', async () => {
+		await authOwnerAgent.get('/users').expect(403);
+	});
+
+	test('GET /users/:id should fail due to invalid license', async () => {
+		await authOwnerAgent.get(`/users/${uuid()}`).expect(403);
+	});
+});
diff --git a/packages/cli/test/integration/publicApi/workflows.test.ts b/packages/cli/test/integration/publicApi/workflows.test.ts
index 02c76b616c765..9ef71e8aff320 100644
--- a/packages/cli/test/integration/publicApi/workflows.test.ts
+++ b/packages/cli/test/integration/publicApi/workflows.test.ts
@@ -1,82 +1,73 @@
-import type { Application } from 'express';
 import type { SuperAgentTest } from 'supertest';
-import * as Db from '@/Db';
 import config from '@/config';
-import type { Role } from '@db/entities/Role';
+import Container from 'typedi';
+import type { INode } from 'n8n-workflow';
+import { STARTING_NODES } from '@/constants';
 import type { TagEntity } from '@db/entities/TagEntity';
 import type { User } from '@db/entities/User';
-import type { ActiveWorkflowRunner } from '@/ActiveWorkflowRunner';
+import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
+import { WorkflowHistoryRepository } from '@db/repositories/workflowHistory.repository';
+import { ActiveWorkflowManager } from '@/ActiveWorkflowManager';
+import { ExecutionService } from '@/executions/execution.service';
 
 import { randomApiKey } from '../shared/random';
-import * as utils from '../shared/utils';
+import * as utils from '../shared/utils/';
 import * as testDb from '../shared/testDb';
+import { createUser } from '../shared/db/users';
+import { createWorkflow, createWorkflowWithTrigger } from '../shared/db/workflows';
+import { createTag } from '../shared/db/tags';
+import { mockInstance } from '../../shared/mocking';
 
-let app: Application;
-let workflowOwnerRole: Role;
 let owner: User;
 let member: User;
 let authOwnerAgent: SuperAgentTest;
 let authMemberAgent: SuperAgentTest;
-let workflowRunner: ActiveWorkflowRunner;
+let activeWorkflowManager: ActiveWorkflowManager;
 
-beforeAll(async () => {
-	app = await utils.initTestServer({
-		endpointGroups: ['publicApi'],
-		applyAuth: false,
-		enablePublicAPI: true,
-	});
-
-	const [globalOwnerRole, globalMemberRole, fetchedWorkflowOwnerRole] = await testDb.getAllRoles();
+const testServer = utils.setupTestServer({ endpointGroups: ['publicApi'] });
+const license = testServer.license;
 
-	workflowOwnerRole = fetchedWorkflowOwnerRole;
+mockInstance(ExecutionService);
 
-	owner = await testDb.createUser({
-		globalRole: globalOwnerRole,
+beforeAll(async () => {
+	owner = await createUser({
+		role: 'global:owner',
 		apiKey: randomApiKey(),
 	});
 
-	member = await testDb.createUser({
-		globalRole: globalMemberRole,
+	member = await createUser({
+		role: 'global:member',
 		apiKey: randomApiKey(),
 	});
 
-	utils.initConfigFile();
 	await utils.initNodeTypes();
-	workflowRunner = await utils.initActiveWorkflowRunner();
-});
-
-beforeEach(async () => {
-	await testDb.truncate(['SharedCredentials', 'SharedWorkflow', 'Tag', 'Workflow', 'Credentials']);
-
-	authOwnerAgent = utils.createAgent(app, {
-		apiPath: 'public',
-		auth: true,
-		user: owner,
-		version: 1,
-	});
 
-	authMemberAgent = utils.createAgent(app, {
-		apiPath: 'public',
-		auth: true,
-		user: member,
-		version: 1,
-	});
+	activeWorkflowManager = Container.get(ActiveWorkflowManager);
 
-	config.set('userManagement.disabled', false);
-	config.set('userManagement.isInstanceOwnerSetUp', true);
+	await activeWorkflowManager.init();
 });
 
-afterEach(async () => {
-	await workflowRunner?.removeAll();
+beforeEach(async () => {
+	await testDb.truncate([
+		'SharedCredentials',
+		'SharedWorkflow',
+		'Tag',
+		'Workflow',
+		'Credentials',
+		'WorkflowHistory',
+	]);
+
+	authOwnerAgent = testServer.publicApiAgentFor(owner);
+	authMemberAgent = testServer.publicApiAgentFor(member);
 });
 
-afterAll(async () => {
-	await testDb.terminate();
+afterEach(async () => {
+	await activeWorkflowManager?.removeAll();
 });
 
 const testWithAPIKey =
 	(method: 'get' | 'post' | 'put' | 'delete', url: string, apiKey: string | null) => async () => {
-		authOwnerAgent.set({ 'X-N8N-API-KEY': apiKey });
+		void authOwnerAgent.set({ 'X-N8N-API-KEY': apiKey });
 		const response = await authOwnerAgent[method](url);
 		expect(response.statusCode).toBe(401);
 	};
@@ -88,9 +79,9 @@ describe('GET /workflows', () => {
 
 	test('should return all owned workflows', async () => {
 		await Promise.all([
-			testDb.createWorkflow({}, member),
-			testDb.createWorkflow({}, member),
-			testDb.createWorkflow({}, member),
+			createWorkflow({}, member),
+			createWorkflow({}, member),
+			createWorkflow({}, member),
 		]);
 
 		const response = await authMemberAgent.get('/workflows');
@@ -128,9 +119,9 @@ describe('GET /workflows', () => {
 
 	test('should return all owned workflows with pagination', async () => {
 		await Promise.all([
-			testDb.createWorkflow({}, member),
-			testDb.createWorkflow({}, member),
-			testDb.createWorkflow({}, member),
+			createWorkflow({}, member),
+			createWorkflow({}, member),
+			createWorkflow({}, member),
 		]);
 
 		const response = await authMemberAgent.get('/workflows?limit=1');
@@ -177,15 +168,15 @@ describe('GET /workflows', () => {
 		}
 
 		// check that we really received a different result
-		expect(Number(response.body.data[0].id)).toBeLessThan(Number(response2.body.data[0].id));
+		expect(response.body.data[0].id).not.toEqual(response2.body.data[0].id);
 	});
 
 	test('should return all owned workflows filtered by tag', async () => {
-		const tag = await testDb.createTag({});
+		const tag = await createTag({});
 
 		const [workflow] = await Promise.all([
-			testDb.createWorkflow({ tags: [tag] }, member),
-			testDb.createWorkflow({}, member),
+			createWorkflow({ tags: [tag] }, member),
+			createWorkflow({}, member),
 		]);
 
 		const response = await authMemberAgent.get(`/workflows?tags=${tag.name}`);
@@ -221,15 +212,15 @@ describe('GET /workflows', () => {
 	});
 
 	test('should return all owned workflows filtered by tags', async () => {
-		const tags = await Promise.all([await testDb.createTag({}), await testDb.createTag({})]);
+		const tags = await Promise.all([await createTag({}), await createTag({})]);
 		const tagNames = tags.map((tag) => tag.name).join(',');
 
 		const [workflow1, workflow2] = await Promise.all([
-			testDb.createWorkflow({ tags }, member),
-			testDb.createWorkflow({ tags }, member),
-			testDb.createWorkflow({}, member),
-			testDb.createWorkflow({ tags: [tags[0]] }, member),
-			testDb.createWorkflow({ tags: [tags[1]] }, member),
+			createWorkflow({ tags }, member),
+			createWorkflow({ tags }, member),
+			createWorkflow({}, member),
+			createWorkflow({ tags: [tags[0]] }, member),
+			createWorkflow({ tags: [tags[1]] }, member),
 		]);
 
 		const response = await authMemberAgent.get(`/workflows?tags=${tagNames}`);
@@ -260,13 +251,50 @@ describe('GET /workflows', () => {
 		}
 	});
 
+	test('should return all owned workflows filtered by name', async () => {
+		const workflowName = 'Workflow 1';
+
+		const [workflow] = await Promise.all([
+			createWorkflow({ name: workflowName }, member),
+			createWorkflow({}, member),
+		]);
+
+		const response = await authMemberAgent.get(`/workflows?name=${workflowName}`);
+
+		expect(response.statusCode).toBe(200);
+		expect(response.body.data.length).toBe(1);
+
+		const {
+			id,
+			connections,
+			active,
+			staticData,
+			nodes,
+			settings,
+			name,
+			createdAt,
+			updatedAt,
+			tags: wfTags,
+		} = response.body.data[0];
+
+		expect(id).toBeDefined();
+		expect(name).toBe(workflowName);
+		expect(connections).toBeDefined();
+		expect(active).toBe(false);
+		expect(staticData).toBeDefined();
+		expect(nodes).toBeDefined();
+		expect(settings).toBeDefined();
+		expect(createdAt).toBeDefined();
+		expect(updatedAt).toBeDefined();
+	});
+
 	test('should return all workflows for owner', async () => {
 		await Promise.all([
-			testDb.createWorkflow({}, owner),
-			testDb.createWorkflow({}, member),
-			testDb.createWorkflow({}, owner),
-			testDb.createWorkflow({}, member),
-			testDb.createWorkflow({}, owner),
+			createWorkflow({}, owner),
+			createWorkflow({}, member),
+			createWorkflow({}, owner),
+			createWorkflow({}, member),
+			createWorkflow({}, owner),
 		]);
 
 		const response = await authOwnerAgent.get('/workflows');
@@ -309,13 +337,13 @@ describe('GET /workflows/:id', () => {
 	test('should fail due to invalid API Key', testWithAPIKey('get', '/workflows/2', 'abcXYZ'));
 
 	test('should fail due to non-existing workflow', async () => {
-		const response = await authOwnerAgent.get(`/workflows/2`);
+		const response = await authOwnerAgent.get('/workflows/2');
 		expect(response.statusCode).toBe(404);
 	});
 
 	test('should retrieve workflow', async () => {
 		// create and assign workflow to owner
-		const workflow = await testDb.createWorkflow({}, member);
+		const workflow = await createWorkflow({}, member);
 
 		const response = await authMemberAgent.get(`/workflows/${workflow.id}`);
 
@@ -348,7 +376,7 @@ describe('GET /workflows/:id', () => {
 
 	test('should retrieve non-owned workflow for owner', async () => {
 		// create and assign workflow to owner
-		const workflow = await testDb.createWorkflow({}, member);
+		const workflow = await createWorkflow({}, member);
 
 		const response = await authOwnerAgent.get(`/workflows/${workflow.id}`);
 
@@ -375,13 +403,13 @@ describe('DELETE /workflows/:id', () => {
 	test('should fail due to invalid API Key', testWithAPIKey('delete', '/workflows/2', 'abcXYZ'));
 
 	test('should fail due to non-existing workflow', async () => {
-		const response = await authOwnerAgent.delete(`/workflows/2`);
+		const response = await authOwnerAgent.delete('/workflows/2');
 		expect(response.statusCode).toBe(404);
 	});
 
 	test('should delete the workflow', async () => {
 		// create and assign workflow to owner
-		const workflow = await testDb.createWorkflow({}, member);
+		const workflow = await createWorkflow({}, member);
 
 		const response = await authMemberAgent.delete(`/workflows/${workflow.id}`);
 
@@ -401,7 +429,7 @@ describe('DELETE /workflows/:id', () => {
 		expect(updatedAt).toEqual(workflow.updatedAt.toISOString());
 
 		// make sure the workflow actually deleted from the db
-		const sharedWorkflow = await Db.collections.SharedWorkflow.findOneBy({
+		const sharedWorkflow = await Container.get(SharedWorkflowRepository).findOneBy({
 			workflowId: workflow.id,
 		});
 
@@ -410,7 +438,7 @@ describe('DELETE /workflows/:id', () => {
 
 	test('should delete non-owned workflow when owner', async () => {
 		// create and assign workflow to owner
-		const workflow = await testDb.createWorkflow({}, member);
+		const workflow = await createWorkflow({}, member);
 
 		const response = await authMemberAgent.delete(`/workflows/${workflow.id}`);
 
@@ -430,7 +458,7 @@ describe('DELETE /workflows/:id', () => {
 		expect(updatedAt).toEqual(workflow.updatedAt.toISOString());
 
 		// make sure the workflow actually deleted from the db
-		const sharedWorkflow = await Db.collections.SharedWorkflow.findOneBy({
+		const sharedWorkflow = await Container.get(SharedWorkflowRepository).findOneBy({
 			workflowId: workflow.id,
 		});
 
@@ -447,18 +475,18 @@ describe('POST /workflows/:id/activate', () => {
 	);
 
 	test('should fail due to non-existing workflow', async () => {
-		const response = await authOwnerAgent.post(`/workflows/2/activate`);
+		const response = await authOwnerAgent.post('/workflows/2/activate');
 		expect(response.statusCode).toBe(404);
 	});
 
 	test('should fail due to trying to activate a workflow without a trigger', async () => {
-		const workflow = await testDb.createWorkflow({}, owner);
+		const workflow = await createWorkflow({}, owner);
 		const response = await authOwnerAgent.post(`/workflows/${workflow.id}/activate`);
 		expect(response.statusCode).toBe(400);
 	});
 
 	test('should set workflow as active', async () => {
-		const workflow = await testDb.createWorkflowWithTrigger({}, member);
+		const workflow = await createWorkflowWithTrigger({}, member);
 
 		const response = await authMemberAgent.post(`/workflows/${workflow.id}/activate`);
 
@@ -478,7 +506,7 @@ describe('POST /workflows/:id/activate', () => {
 		expect(updatedAt).toEqual(workflow.updatedAt.toISOString());
 
 		// check whether the workflow is on the database
-		const sharedWorkflow = await Db.collections.SharedWorkflow.findOne({
+		const sharedWorkflow = await Container.get(SharedWorkflowRepository).findOne({
 			where: {
 				userId: member.id,
 				workflowId: workflow.id,
@@ -489,11 +517,11 @@ describe('POST /workflows/:id/activate', () => {
 		expect(sharedWorkflow?.workflow.active).toBe(true);
 
 		// check whether the workflow is on the active workflow runner
-		expect(await workflowRunner.isActive(workflow.id)).toBe(true);
+		expect(await activeWorkflowManager.isActive(workflow.id)).toBe(true);
 	});
 
 	test('should set non-owned workflow as active when owner', async () => {
-		const workflow = await testDb.createWorkflowWithTrigger({}, member);
+		const workflow = await createWorkflowWithTrigger({}, member);
 
 		const response = await authMemberAgent.post(`/workflows/${workflow.id}/activate`);
 
@@ -513,7 +541,7 @@ describe('POST /workflows/:id/activate', () => {
 		expect(updatedAt).toEqual(workflow.updatedAt.toISOString());
 
 		// check whether the workflow is on the database
-		const sharedOwnerWorkflow = await Db.collections.SharedWorkflow.findOne({
+		const sharedOwnerWorkflow = await Container.get(SharedWorkflowRepository).findOne({
 			where: {
 				userId: owner.id,
 				workflowId: workflow.id,
@@ -522,7 +550,7 @@ describe('POST /workflows/:id/activate', () => {
 
 		expect(sharedOwnerWorkflow).toBeNull();
 
-		const sharedWorkflow = await Db.collections.SharedWorkflow.findOne({
+		const sharedWorkflow = await Container.get(SharedWorkflowRepository).findOne({
 			where: {
 				userId: member.id,
 				workflowId: workflow.id,
@@ -533,7 +561,7 @@ describe('POST /workflows/:id/activate', () => {
 		expect(sharedWorkflow?.workflow.active).toBe(true);
 
 		// check whether the workflow is on the active workflow runner
-		expect(await workflowRunner.isActive(workflow.id)).toBe(true);
+		expect(await activeWorkflowManager.isActive(workflow.id)).toBe(true);
 	});
 });
 
@@ -549,12 +577,12 @@ describe('POST /workflows/:id/deactivate', () => {
 	);
 
 	test('should fail due to non-existing workflow', async () => {
-		const response = await authOwnerAgent.post(`/workflows/2/deactivate`);
+		const response = await authOwnerAgent.post('/workflows/2/deactivate');
 		expect(response.statusCode).toBe(404);
 	});
 
 	test('should deactivate workflow', async () => {
-		const workflow = await testDb.createWorkflowWithTrigger({}, member);
+		const workflow = await createWorkflowWithTrigger({}, member);
 
 		await authMemberAgent.post(`/workflows/${workflow.id}/activate`);
 
@@ -576,7 +604,7 @@ describe('POST /workflows/:id/deactivate', () => {
 		expect(updatedAt).toBeDefined();
 
 		// get the workflow after it was deactivated
-		const sharedWorkflow = await Db.collections.SharedWorkflow.findOne({
+		const sharedWorkflow = await Container.get(SharedWorkflowRepository).findOne({
 			where: {
 				userId: member.id,
 				workflowId: workflow.id,
@@ -587,11 +615,11 @@ describe('POST /workflows/:id/deactivate', () => {
 		// check whether the workflow is deactivated in the database
 		expect(sharedWorkflow?.workflow.active).toBe(false);
 
-		expect(await workflowRunner.isActive(workflow.id)).toBe(false);
+		expect(await activeWorkflowManager.isActive(workflow.id)).toBe(false);
 	});
 
 	test('should deactivate non-owned workflow when owner', async () => {
-		const workflow = await testDb.createWorkflowWithTrigger({}, member);
+		const workflow = await createWorkflowWithTrigger({}, member);
 
 		await authMemberAgent.post(`/workflows/${workflow.id}/activate`);
 
@@ -613,7 +641,7 @@ describe('POST /workflows/:id/deactivate', () => {
 		expect(updatedAt).toBeDefined();
 
 		// check whether the workflow is deactivated in the database
-		const sharedOwnerWorkflow = await Db.collections.SharedWorkflow.findOne({
+		const sharedOwnerWorkflow = await Container.get(SharedWorkflowRepository).findOne({
 			where: {
 				userId: owner.id,
 				workflowId: workflow.id,
@@ -622,7 +650,7 @@ describe('POST /workflows/:id/deactivate', () => {
 
 		expect(sharedOwnerWorkflow).toBeNull();
 
-		const sharedWorkflow = await Db.collections.SharedWorkflow.findOne({
+		const sharedWorkflow = await Container.get(SharedWorkflowRepository).findOne({
 			where: {
 				userId: member.id,
 				workflowId: workflow.id,
@@ -632,7 +660,7 @@ describe('POST /workflows/:id/deactivate', () => {
 
 		expect(sharedWorkflow?.workflow.active).toBe(false);
 
-		expect(await workflowRunner.isActive(workflow.id)).toBe(false);
+		expect(await activeWorkflowManager.isActive(workflow.id)).toBe(false);
 	});
 });
 
@@ -668,6 +696,7 @@ describe('POST /workflows', () => {
 				saveDataSuccessExecution: 'all',
 				executionTimeout: 3600,
 				timezone: 'America/New_York',
+				executionOrder: 'v1',
 			},
 		};
 
@@ -689,17 +718,130 @@ describe('POST /workflows', () => {
 		expect(updatedAt).toEqual(createdAt);
 
 		// check if created workflow in DB
-		const sharedWorkflow = await Db.collections.SharedWorkflow.findOne({
+		const sharedWorkflow = await Container.get(SharedWorkflowRepository).findOne({
 			where: {
 				userId: member.id,
 				workflowId: response.body.id,
 			},
-			relations: ['workflow', 'role'],
+			relations: ['workflow'],
 		});
 
 		expect(sharedWorkflow?.workflow.name).toBe(name);
 		expect(sharedWorkflow?.workflow.createdAt.toISOString()).toBe(createdAt);
-		expect(sharedWorkflow?.role).toEqual(workflowOwnerRole);
+		expect(sharedWorkflow?.role).toEqual('workflow:owner');
+	});
+
+	test('should create workflow history version when licensed', async () => {
+		license.enable('feat:workflowHistory');
+		const payload = {
+			name: 'testing',
+			nodes: [
+				{
+					id: 'uuid-1234',
+					parameters: {},
+					name: 'Start',
+					type: 'n8n-nodes-base.start',
+					typeVersion: 1,
+					position: [240, 300],
+				},
+			],
+			connections: {},
+			staticData: null,
+			settings: {
+				saveExecutionProgress: true,
+				saveManualExecutions: true,
+				saveDataErrorExecution: 'all',
+				saveDataSuccessExecution: 'all',
+				executionTimeout: 3600,
+				timezone: 'America/New_York',
+			},
+		};
+
+		const response = await authMemberAgent.post('/workflows').send(payload);
+
+		expect(response.statusCode).toBe(200);
+
+		const { id } = response.body;
+
+		expect(id).toBeDefined();
+		expect(
+			await Container.get(WorkflowHistoryRepository).count({ where: { workflowId: id } }),
+		).toBe(1);
+		const historyVersion = await Container.get(WorkflowHistoryRepository).findOne({
+			where: {
+				workflowId: id,
+			},
+		});
+		expect(historyVersion).not.toBeNull();
+		expect(historyVersion!.connections).toEqual(payload.connections);
+		expect(historyVersion!.nodes).toEqual(payload.nodes);
+	});
+
+	test('should not create workflow history version when not licensed', async () => {
+		license.disable('feat:workflowHistory');
+		const payload = {
+			name: 'testing',
+			nodes: [
+				{
+					id: 'uuid-1234',
+					parameters: {},
+					name: 'Start',
+					type: 'n8n-nodes-base.start',
+					typeVersion: 1,
+					position: [240, 300],
+				},
+			],
+			connections: {},
+			staticData: null,
+			settings: {
+				saveExecutionProgress: true,
+				saveManualExecutions: true,
+				saveDataErrorExecution: 'all',
+				saveDataSuccessExecution: 'all',
+				executionTimeout: 3600,
+				timezone: 'America/New_York',
+			},
+		};
+
+		const response = await authMemberAgent.post('/workflows').send(payload);
+
+		expect(response.statusCode).toBe(200);
+
+		const { id } = response.body;
+
+		expect(id).toBeDefined();
+		expect(
+			await Container.get(WorkflowHistoryRepository).count({ where: { workflowId: id } }),
+		).toBe(0);
+	});
+
+	test('should not add a starting node if the payload has no starting nodes', async () => {
+		const response = await authMemberAgent.post('/workflows').send({
+			name: 'testing',
+			nodes: [
+				{
+					id: 'uuid-1234',
+					parameters: {},
+					name: 'Hacker News',
+					type: 'n8n-nodes-base.hackerNews',
+					typeVersion: 1,
+					position: [240, 300],
+				},
+			],
+			connections: {},
+			settings: {
+				saveExecutionProgress: true,
+				saveManualExecutions: true,
+				saveDataErrorExecution: 'all',
+				saveDataSuccessExecution: 'all',
+				executionTimeout: 3600,
+				timezone: 'America/New_York',
+			},
+		});
+
+		const found = response.body.nodes.find((node: INode) => STARTING_NODES.includes(node.type));
+
+		expect(found).toBeUndefined();
 	});
 });
 
@@ -709,7 +851,7 @@ describe('PUT /workflows/:id', () => {
 	test('should fail due to invalid API Key', testWithAPIKey('put', '/workflows/1', 'abcXYZ'));
 
 	test('should fail due to non-existing workflow', async () => {
-		const response = await authOwnerAgent.put(`/workflows/1`).send({
+		const response = await authOwnerAgent.put('/workflows/1').send({
 			name: 'testing',
 			nodes: [
 				{
@@ -737,7 +879,7 @@ describe('PUT /workflows/:id', () => {
 	});
 
 	test('should fail due to invalid body', async () => {
-		const response = await authOwnerAgent.put(`/workflows/1`).send({
+		const response = await authOwnerAgent.put('/workflows/1').send({
 			nodes: [
 				{
 					id: 'uuid-1234',
@@ -764,7 +906,7 @@ describe('PUT /workflows/:id', () => {
 	});
 
 	test('should update workflow', async () => {
-		const workflow = await testDb.createWorkflow({}, member);
+		const workflow = await createWorkflow({}, member);
 		const payload = {
 			name: 'name updated',
 			nodes: [
@@ -815,7 +957,7 @@ describe('PUT /workflows/:id', () => {
 		expect(updatedAt).not.toBe(workflow.updatedAt.toISOString());
 
 		// check updated workflow in DB
-		const sharedWorkflow = await Db.collections.SharedWorkflow.findOne({
+		const sharedWorkflow = await Container.get(SharedWorkflowRepository).findOne({
 			where: {
 				userId: member.id,
 				workflowId: response.body.id,
@@ -829,8 +971,110 @@ describe('PUT /workflows/:id', () => {
 		);
 	});
 
+	test('should create workflow history version when licensed', async () => {
+		license.enable('feat:workflowHistory');
+		const workflow = await createWorkflow({}, member);
+		const payload = {
+			name: 'name updated',
+			nodes: [
+				{
+					id: 'uuid-1234',
+					parameters: {},
+					name: 'Start',
+					type: 'n8n-nodes-base.start',
+					typeVersion: 1,
+					position: [240, 300],
+				},
+				{
+					id: 'uuid-1234',
+					parameters: {},
+					name: 'Cron',
+					type: 'n8n-nodes-base.cron',
+					typeVersion: 1,
+					position: [400, 300],
+				},
+			],
+			connections: {},
+			staticData: '{"id":1}',
+			settings: {
+				saveExecutionProgress: false,
+				saveManualExecutions: false,
+				saveDataErrorExecution: 'all',
+				saveDataSuccessExecution: 'all',
+				executionTimeout: 3600,
+				timezone: 'America/New_York',
+			},
+		};
+
+		const response = await authMemberAgent.put(`/workflows/${workflow.id}`).send(payload);
+
+		const { id } = response.body;
+
+		expect(response.statusCode).toBe(200);
+
+		expect(id).toBe(workflow.id);
+		expect(
+			await Container.get(WorkflowHistoryRepository).count({ where: { workflowId: id } }),
+		).toBe(1);
+		const historyVersion = await Container.get(WorkflowHistoryRepository).findOne({
+			where: {
+				workflowId: id,
+			},
+		});
+		expect(historyVersion).not.toBeNull();
+		expect(historyVersion!.connections).toEqual(payload.connections);
+		expect(historyVersion!.nodes).toEqual(payload.nodes);
+	});
+
+	test('should not create workflow history when not licensed', async () => {
+		license.disable('feat:workflowHistory');
+		const workflow = await createWorkflow({}, member);
+		const payload = {
+			name: 'name updated',
+			nodes: [
+				{
+					id: 'uuid-1234',
+					parameters: {},
+					name: 'Start',
+					type: 'n8n-nodes-base.start',
+					typeVersion: 1,
+					position: [240, 300],
+				},
+				{
+					id: 'uuid-1234',
+					parameters: {},
+					name: 'Cron',
+					type: 'n8n-nodes-base.cron',
+					typeVersion: 1,
+					position: [400, 300],
+				},
+			],
+			connections: {},
+			staticData: '{"id":1}',
+			settings: {
+				saveExecutionProgress: false,
+				saveManualExecutions: false,
+				saveDataErrorExecution: 'all',
+				saveDataSuccessExecution: 'all',
+				executionTimeout: 3600,
+				timezone: 'America/New_York',
+			},
+		};
+
+		const response = await authMemberAgent.put(`/workflows/${workflow.id}`).send(payload);
+
+		const { id } = response.body;
+
+		expect(response.statusCode).toBe(200);
+
+		expect(id).toBe(workflow.id);
+		expect(
+			await Container.get(WorkflowHistoryRepository).count({ where: { workflowId: id } }),
+		).toBe(0);
+	});
+
 	test('should update non-owned workflow if owner', async () => {
-		const workflow = await testDb.createWorkflow({}, member);
+		const workflow = await createWorkflow({}, member);
 
 		const payload = {
 			name: 'name owner updated',
@@ -882,7 +1126,7 @@ describe('PUT /workflows/:id', () => {
 		expect(updatedAt).not.toBe(workflow.updatedAt.toISOString());
 
 		// check updated workflow in DB
-		const sharedOwnerWorkflow = await Db.collections.SharedWorkflow.findOne({
+		const sharedOwnerWorkflow = await Container.get(SharedWorkflowRepository).findOne({
 			where: {
 				userId: owner.id,
 				workflowId: response.body.id,
@@ -891,18 +1135,323 @@ describe('PUT /workflows/:id', () => {
 
 		expect(sharedOwnerWorkflow).toBeNull();
 
-		const sharedWorkflow = await Db.collections.SharedWorkflow.findOne({
+		const sharedWorkflow = await Container.get(SharedWorkflowRepository).findOne({
 			where: {
 				userId: member.id,
 				workflowId: response.body.id,
 			},
-			relations: ['workflow', 'role'],
+			relations: ['workflow'],
 		});
 
 		expect(sharedWorkflow?.workflow.name).toBe(payload.name);
 		expect(sharedWorkflow?.workflow.updatedAt.getTime()).toBeGreaterThan(
 			workflow.updatedAt.getTime(),
 		);
-		expect(sharedWorkflow?.role).toEqual(workflowOwnerRole);
+		expect(sharedWorkflow?.role).toEqual('workflow:owner');
+	});
+});
+
+describe('GET /workflows/:id/tags', () => {
+	test('should fail due to missing API Key', testWithAPIKey('get', '/workflows/2/tags', null));
+
+	test('should fail due to invalid API Key', testWithAPIKey('get', '/workflows/2/tags', 'abcXYZ'));
+
+	test('should fail if workflowTagsDisabled', async () => {
+		config.set('workflowTagsDisabled', true);
+
+		const response = await authOwnerAgent.get('/workflows/2/tags');
+
+		expect(response.statusCode).toBe(400);
+		expect(response.body.message).toBe('Workflow Tags Disabled');
+	});
+
+	test('should fail due to non-existing workflow', async () => {
+		config.set('workflowTagsDisabled', false);
+
+		const response = await authOwnerAgent.get('/workflows/2/tags');
+
+		expect(response.statusCode).toBe(404);
+	});
+
+	test('should return all tags of owned workflow', async () => {
+		config.set('workflowTagsDisabled', false);
+
+		const tags = await Promise.all([await createTag({}), await createTag({})]);
+
+		const workflow = await createWorkflow({ tags }, member);
+
+		const response = await authMemberAgent.get(`/workflows/${workflow.id}/tags`);
+
+		expect(response.statusCode).toBe(200);
+		expect(response.body.length).toBe(2);
+
+		for (const tag of response.body) {
+			const { id, name, createdAt, updatedAt } = tag;
+
+			expect(id).toBeDefined();
+			expect(name).toBeDefined();
+			expect(createdAt).toBeDefined();
+			expect(updatedAt).toBeDefined();
+
+			tags.forEach((tag: TagEntity) => {
+				expect(tags.some((savedTag) => savedTag.id === tag.id)).toBe(true);
+			});
+		}
+	});
+
+	test('should return empty array if workflow does not have tags', async () => {
+		config.set('workflowTagsDisabled', false);
+
+		const workflow = await createWorkflow({}, member);
+
+		const response = await authMemberAgent.get(`/workflows/${workflow.id}/tags`);
+
+		expect(response.statusCode).toBe(200);
+		expect(response.body.length).toBe(0);
+	});
+});
+
+describe('PUT /workflows/:id/tags', () => {
+	test('should fail due to missing API Key', testWithAPIKey('put', '/workflows/2/tags', null));
+
+	test('should fail due to invalid API Key', testWithAPIKey('put', '/workflows/2/tags', 'abcXYZ'));
+
+	test('should fail if workflowTagsDisabled', async () => {
+		config.set('workflowTagsDisabled', true);
+
+		const response = await authOwnerAgent.put('/workflows/2/tags').send([]);
+
+		expect(response.statusCode).toBe(400);
+		expect(response.body.message).toBe('Workflow Tags Disabled');
+	});
+
+	test('should fail due to non-existing workflow', async () => {
+		config.set('workflowTagsDisabled', false);
+
+		const response = await authOwnerAgent.put('/workflows/2/tags').send([]);
+
+		expect(response.statusCode).toBe(404);
+	});
+
+	test('should add the tags, workflow have not got tags previously', async () => {
+		config.set('workflowTagsDisabled', false);
+
+		const workflow = await createWorkflow({}, member);
+		const tags = await Promise.all([await createTag({}), await createTag({})]);
+
+		const payload = [
+			{
+				id: tags[0].id,
+			},
+			{
+				id: tags[1].id,
+			},
+		];
+
+		const response = await authMemberAgent.put(`/workflows/${workflow.id}/tags`).send(payload);
+
+		expect(response.statusCode).toBe(200);
+		expect(response.body.length).toBe(2);
+
+		for (const tag of response.body) {
+			const { id, name, createdAt, updatedAt } = tag;
+
+			expect(id).toBeDefined();
+			expect(name).toBeDefined();
+			expect(createdAt).toBeDefined();
+			expect(updatedAt).toBeDefined();
+
+			tags.forEach((tag: TagEntity) => {
+				expect(tags.some((savedTag) => savedTag.id === tag.id)).toBe(true);
+			});
+		}
+
+		// Check the association in DB
+		const sharedWorkflow = await Container.get(SharedWorkflowRepository).findOne({
+			where: {
+				userId: member.id,
+				workflowId: workflow.id,
+			},
+			relations: ['workflow.tags'],
+		});
+
+		expect(sharedWorkflow?.workflow.tags).toBeDefined();
+		expect(sharedWorkflow?.workflow.tags?.length).toBe(2);
+		if (sharedWorkflow?.workflow.tags !== undefined) {
+			for (const tag of sharedWorkflow?.workflow.tags) {
+				const { id, name, createdAt, updatedAt } = tag;
+
+				expect(id).toBeDefined();
+				expect(name).toBeDefined();
+				expect(createdAt).toBeDefined();
+				expect(updatedAt).toBeDefined();
+
+				tags.forEach((tag: TagEntity) => {
+					expect(tags.some((savedTag) => savedTag.id === tag.id)).toBe(true);
+				});
+			}
+		}
+	});
+
+	test('should add the tags, workflow have some tags previously', async () => {
+		config.set('workflowTagsDisabled', false);
+
+		const tags = await Promise.all([await createTag({}), await createTag({}), await createTag({})]);
+		const oldTags = [tags[0], tags[1]];
+		const newTags = [tags[0], tags[2]];
+		const workflow = await createWorkflow({ tags: oldTags }, member);
+
+		// Check the association in DB
+		const oldSharedWorkflow = await Container.get(SharedWorkflowRepository).findOne({
+			where: {
+				userId: member.id,
+				workflowId: workflow.id,
+			},
+			relations: ['workflow.tags'],
+		});
+
+		expect(oldSharedWorkflow?.workflow.tags).toBeDefined();
+		expect(oldSharedWorkflow?.workflow.tags?.length).toBe(2);
+		if (oldSharedWorkflow?.workflow.tags !== undefined) {
+			for (const tag of oldSharedWorkflow?.workflow.tags) {
+				const { id, name, createdAt, updatedAt } = tag;
+
+				expect(id).toBeDefined();
+				expect(name).toBeDefined();
+				expect(createdAt).toBeDefined();
+				expect(updatedAt).toBeDefined();
+
+				oldTags.forEach((tag: TagEntity) => {
+					expect(oldTags.some((savedTag) => savedTag.id === tag.id)).toBe(true);
+				});
+			}
+		}
+
+		const payload = [
+			{
+				id: newTags[0].id,
+			},
+			{
+				id: newTags[1].id,
+			},
+		];
+
+		const response = await authMemberAgent.put(`/workflows/${workflow.id}/tags`).send(payload);
+
+		expect(response.statusCode).toBe(200);
+		expect(response.body.length).toBe(2);
+
+		for (const tag of response.body) {
+			const { id, name, createdAt, updatedAt } = tag;
+
+			expect(id).toBeDefined();
+			expect(name).toBeDefined();
+			expect(createdAt).toBeDefined();
+			expect(updatedAt).toBeDefined();
+
+			newTags.forEach((tag: TagEntity) => {
+				expect(newTags.some((savedTag) => savedTag.id === tag.id)).toBe(true);
+			});
+		}
+
+		// Check the association in DB
+		const sharedWorkflow = await Container.get(SharedWorkflowRepository).findOne({
+			where: {
+				userId: member.id,
+				workflowId: workflow.id,
+			},
+			relations: ['workflow.tags'],
+		});
+
+		expect(sharedWorkflow?.workflow.tags).toBeDefined();
+		expect(sharedWorkflow?.workflow.tags?.length).toBe(2);
+		if (sharedWorkflow?.workflow.tags !== undefined) {
+			for (const tag of sharedWorkflow?.workflow.tags) {
+				const { id, name, createdAt, updatedAt } = tag;
+
+				expect(id).toBeDefined();
+				expect(name).toBeDefined();
+				expect(createdAt).toBeDefined();
+				expect(updatedAt).toBeDefined();
+
+				newTags.forEach((tag: TagEntity) => {
+					expect(newTags.some((savedTag) => savedTag.id === tag.id)).toBe(true);
+				});
+			}
+		}
+	});
+
+	test('should fail to add the tags as one does not exist, workflow should maintain previous tags', async () => {
+		config.set('workflowTagsDisabled', false);
+
+		const tags = await Promise.all([await createTag({}), await createTag({})]);
+		const oldTags = [tags[0], tags[1]];
+		const workflow = await createWorkflow({ tags: oldTags }, member);
+
+		// Check the association in DB
+		const oldSharedWorkflow = await Container.get(SharedWorkflowRepository).findOne({
+			where: {
+				userId: member.id,
+				workflowId: workflow.id,
+			},
+			relations: ['workflow.tags'],
+		});
+
+		expect(oldSharedWorkflow?.workflow.tags).toBeDefined();
+		expect(oldSharedWorkflow?.workflow.tags?.length).toBe(2);
+		if (oldSharedWorkflow?.workflow.tags !== undefined) {
+			for (const tag of oldSharedWorkflow?.workflow.tags) {
+				const { id, name, createdAt, updatedAt } = tag;
+
+				expect(id).toBeDefined();
+				expect(name).toBeDefined();
+				expect(createdAt).toBeDefined();
+				expect(updatedAt).toBeDefined();
+
+				oldTags.forEach((tag: TagEntity) => {
+					expect(oldTags.some((savedTag) => savedTag.id === tag.id)).toBe(true);
+				});
+			}
+		}
+
+		const payload = [
+			{
+				id: oldTags[0].id,
+			},
+			{
+				id: 'TagDoesNotExist',
+			},
+		];
+
+		const response = await authMemberAgent.put(`/workflows/${workflow.id}/tags`).send(payload);
+
+		expect(response.statusCode).toBe(404);
+		expect(response.body.message).toBe('Some tags not found');
+
+		// Check the association in DB
+		const sharedWorkflow = await Container.get(SharedWorkflowRepository).findOne({
+			where: {
+				userId: member.id,
+				workflowId: workflow.id,
+			},
+			relations: ['workflow.tags'],
+		});
+
+		expect(sharedWorkflow?.workflow.tags).toBeDefined();
+		expect(sharedWorkflow?.workflow.tags?.length).toBe(2);
+		if (sharedWorkflow?.workflow.tags !== undefined) {
+			for (const tag of sharedWorkflow?.workflow.tags) {
+				const { id, name, createdAt, updatedAt } = tag;
+
+				expect(id).toBeDefined();
+				expect(name).toBeDefined();
+				expect(createdAt).toBeDefined();
+				expect(updatedAt).toBeDefined();
+
+				oldTags.forEach((tag: TagEntity) => {
+					expect(oldTags.some((savedTag) => savedTag.id === tag.id)).toBe(true);
+				});
+			}
+		}
 	});
 });
diff --git a/packages/cli/test/integration/saml/saml.api.test.ts b/packages/cli/test/integration/saml/saml.api.test.ts
index fa52693b1b325..c12f8da1752fc 100644
--- a/packages/cli/test/integration/saml/saml.api.test.ts
+++ b/packages/cli/test/integration/saml/saml.api.test.ts
@@ -1,30 +1,37 @@
 import { Container } from 'typedi';
 import type { SuperAgentTest } from 'supertest';
+import type { AuthenticationMethod } from 'n8n-workflow';
 import type { User } from '@db/entities/User';
 import { setSamlLoginEnabled } from '@/sso/saml/samlHelpers';
 import { getCurrentAuthenticationMethod, setCurrentAuthenticationMethod } from '@/sso/ssoHelpers';
-import { License } from '@/License';
+import { InternalHooks } from '@/InternalHooks';
+import { SamlService } from '@/sso/saml/saml.service.ee';
+import type { SamlUserAttributes } from '@/sso/saml/types/samlUserAttributes';
+
 import { randomEmail, randomName, randomValidPassword } from '../shared/random';
-import * as testDb from '../shared/testDb';
-import * as utils from '../shared/utils';
+import * as utils from '../shared/utils/';
 import { sampleConfig } from './sampleMetadata';
+import { createOwner, createUser } from '../shared/db/users';
 
+let someUser: User;
 let owner: User;
+let authMemberAgent: SuperAgentTest;
 let authOwnerAgent: SuperAgentTest;
 
 async function enableSaml(enable: boolean) {
 	await setSamlLoginEnabled(enable);
 }
 
-beforeAll(async () => {
-	Container.get(License).isSamlEnabled = () => true;
-	const app = await utils.initTestServer({ endpointGroups: ['me', 'saml'] });
-	owner = await testDb.createOwner();
-	authOwnerAgent = utils.createAuthAgent(app)(owner);
+const testServer = utils.setupTestServer({
+	endpointGroups: ['me', 'saml'],
+	enabledFeatures: ['feat:saml'],
 });
 
-afterAll(async () => {
-	await testDb.terminate();
+beforeAll(async () => {
+	owner = await createOwner();
+	someUser = await createUser();
+	authOwnerAgent = testServer.authAgentFor(owner);
+	authMemberAgent = testServer.authAgentFor(someUser);
 });
 
 describe('Instance owner', () => {
@@ -129,6 +136,218 @@ describe('Instance owner', () => {
 				.expect(500);
 
 			expect(getCurrentAuthenticationMethod()).toBe('ldap');
+			await setCurrentAuthenticationMethod('saml');
+		});
+	});
+});
+
+describe('Check endpoint permissions', () => {
+	beforeEach(async () => {
+		await enableSaml(true);
+	});
+
+	describe('Owner', () => {
+		test('should be able to access GET /sso/saml/metadata', async () => {
+			await authOwnerAgent.get('/sso/saml/metadata').expect(200);
+		});
+
+		test('should be able to access GET /sso/saml/config', async () => {
+			await authOwnerAgent.get('/sso/saml/config').expect(200);
+		});
+
+		test('should be able to access POST /sso/saml/config', async () => {
+			await authOwnerAgent.post('/sso/saml/config').expect(200);
+		});
+
+		test('should be able to access POST /sso/saml/config/toggle', async () => {
+			await authOwnerAgent.post('/sso/saml/config/toggle').expect(400);
+		});
+
+		test('should be able to access GET /sso/saml/acs', async () => {
+			// Note that 401 here is coming from the missing SAML object,
+			// not from not being able to access the endpoint, so this is expected!
+			const response = await authOwnerAgent.get('/sso/saml/acs').expect(401);
+			expect(response.text).toContain('SAML Authentication failed');
+		});
+
+		test('should be able to access POST /sso/saml/acs', async () => {
+			// Note that 401 here is coming from the missing SAML object,
+			// not from not being able to access the endpoint, so this is expected!
+			const response = await authOwnerAgent.post('/sso/saml/acs').expect(401);
+			expect(response.text).toContain('SAML Authentication failed');
+		});
+
+		test('should be able to access GET /sso/saml/initsso', async () => {
+			await authOwnerAgent.get('/sso/saml/initsso').expect(200);
+		});
+
+		test('should be able to access GET /sso/saml/config/test', async () => {
+			await authOwnerAgent.get('/sso/saml/config/test').expect(200);
+		});
+	});
+
+	describe('Authenticated Member', () => {
+		test('should be able to access GET /sso/saml/metadata', async () => {
+			await authMemberAgent.get('/sso/saml/metadata').expect(200);
+		});
+
+		test('should be able to access GET /sso/saml/config', async () => {
+			await authMemberAgent.get('/sso/saml/config').expect(200);
+		});
+
+		test('should NOT be able to access POST /sso/saml/config', async () => {
+			await authMemberAgent.post('/sso/saml/config').expect(403);
+		});
+
+		test('should NOT be able to access POST /sso/saml/config/toggle', async () => {
+			await authMemberAgent.post('/sso/saml/config/toggle').expect(403);
+		});
+
+		test('should be able to access GET /sso/saml/acs', async () => {
+			// Note that 401 here is coming from the missing SAML object,
+			// not from not being able to access the endpoint, so this is expected!
+			const response = await authMemberAgent.get('/sso/saml/acs').expect(401);
+			expect(response.text).toContain('SAML Authentication failed');
 		});
+
+		test('should be able to access POST /sso/saml/acs', async () => {
+			// Note that 401 here is coming from the missing SAML object,
+			// not from not being able to access the endpoint, so this is expected!
+			const response = await authMemberAgent.post('/sso/saml/acs').expect(401);
+			expect(response.text).toContain('SAML Authentication failed');
+		});
+
+		test('should be able to access GET /sso/saml/initsso', async () => {
+			await authMemberAgent.get('/sso/saml/initsso').expect(200);
+		});
+
+		test('should NOT be able to access GET /sso/saml/config/test', async () => {
+			await authMemberAgent.get('/sso/saml/config/test').expect(403);
+		});
+	});
+	describe('Non-Authenticated User', () => {
+		test('should be able to access /sso/saml/metadata', async () => {
+			await testServer.authlessAgent.get('/sso/saml/metadata').expect(200);
+		});
+
+		test('should NOT be able to access GET /sso/saml/config', async () => {
+			await testServer.authlessAgent.get('/sso/saml/config').expect(401);
+		});
+
+		test('should NOT be able to access POST /sso/saml/config', async () => {
+			await testServer.authlessAgent.post('/sso/saml/config').expect(401);
+		});
+
+		test('should NOT be able to access POST /sso/saml/config/toggle', async () => {
+			await testServer.authlessAgent.post('/sso/saml/config/toggle').expect(401);
+		});
+
+		test('should be able to access GET /sso/saml/acs', async () => {
+			// Note that 401 here is coming from the missing SAML object,
+			// not from not being able to access the endpoint, so this is expected!
+			const response = await testServer.authlessAgent.get('/sso/saml/acs').expect(401);
+			expect(response.text).toContain('SAML Authentication failed');
+		});
+
+		test('should be able to access POST /sso/saml/acs', async () => {
+			// Note that 401 here is coming from the missing SAML object,
+			// not from not being able to access the endpoint, so this is expected!
+			const response = await testServer.authlessAgent.post('/sso/saml/acs').expect(401);
+			expect(response.text).toContain('SAML Authentication failed');
+		});
+
+		test('should be able to access GET /sso/saml/initsso', async () => {
+			await testServer.authlessAgent.get('/sso/saml/initsso').expect(200);
+		});
+
+		test('should NOT be able to access GET /sso/saml/config/test', async () => {
+			await testServer.authlessAgent.get('/sso/saml/config/test').expect(401);
+		});
+	});
+});
+
+describe('SAML login flow', () => {
+	beforeEach(async () => {
+		await enableSaml(true);
+	});
+
+	test('should trigger onUserLoginSuccess hook', async () => {
+		const mockedHandleSamlLogin = jest.spyOn(Container.get(SamlService), 'handleSamlLogin');
+
+		mockedHandleSamlLogin.mockImplementation(
+			async (): Promise<{
+				authenticatedUser: User;
+				attributes: SamlUserAttributes;
+				onboardingRequired: false;
+			}> => {
+				return {
+					authenticatedUser: someUser,
+					attributes: {
+						email: someUser.email,
+						firstName: someUser.firstName,
+						lastName: someUser.lastName,
+						userPrincipalName: someUser.email,
+					},
+					onboardingRequired: false,
+				};
+			},
+		);
+
+		const mockedHookOnUserLoginSuccess = jest.spyOn(
+			Container.get(InternalHooks),
+			'onUserLoginSuccess',
+		);
+		mockedHookOnUserLoginSuccess.mockImplementation(
+			async (userLoginData: { user: User; authenticationMethod: AuthenticationMethod }) => {
+				expect(userLoginData.authenticationMethod).toEqual('saml');
+				return;
+			},
+		);
+		await authOwnerAgent.post('/sso/saml/acs').expect(302);
+		expect(mockedHookOnUserLoginSuccess).toBeCalled();
+		mockedHookOnUserLoginSuccess.mockRestore();
+		mockedHandleSamlLogin.mockRestore();
+	});
+
+	test('should trigger onUserLoginFailed hook', async () => {
+		const mockedHandleSamlLogin = jest.spyOn(Container.get(SamlService), 'handleSamlLogin');
+
+		mockedHandleSamlLogin.mockImplementation(
+			async (): Promise<{
+				authenticatedUser: User | undefined;
+				attributes: SamlUserAttributes;
+				onboardingRequired: false;
+			}> => {
+				return {
+					authenticatedUser: undefined,
+					attributes: {
+						email: someUser.email,
+						firstName: someUser.firstName,
+						lastName: someUser.lastName,
+						userPrincipalName: someUser.email,
+					},
+					onboardingRequired: false,
+				};
+			},
+		);
+
+		const mockedHookOnUserLoginFailed = jest.spyOn(
+			Container.get(InternalHooks),
+			'onUserLoginFailed',
+		);
+		mockedHookOnUserLoginFailed.mockImplementation(
+			async (userLoginData: {
+				user: string;
+				authenticationMethod: AuthenticationMethod;
+				reason?: string;
+			}) => {
+				expect(userLoginData.authenticationMethod).toEqual('saml');
+				return;
+			},
+		);
+		await authOwnerAgent.post('/sso/saml/acs').expect(401);
+		expect(mockedHookOnUserLoginFailed).toBeCalled();
+		mockedHookOnUserLoginFailed.mockRestore();
+		mockedHandleSamlLogin.mockRestore();
 	});
 });
diff --git a/packages/cli/test/integration/security-audit/CredentialsRiskReporter.test.ts b/packages/cli/test/integration/security-audit/CredentialsRiskReporter.test.ts
new file mode 100644
index 0000000000000..c395147e1d5a6
--- /dev/null
+++ b/packages/cli/test/integration/security-audit/CredentialsRiskReporter.test.ts
@@ -0,0 +1,242 @@
+import { v4 as uuid } from 'uuid';
+import config from '@/config';
+import { SecurityAuditService } from '@/security-audit/SecurityAudit.service';
+import { CREDENTIALS_REPORT } from '@/security-audit/constants';
+import { getRiskSection } from './utils';
+import * as testDb from '../shared/testDb';
+import { generateNanoId } from '@db/utils/generators';
+import { WorkflowRepository } from '@db/repositories/workflow.repository';
+import Container from 'typedi';
+import { CredentialsRepository } from '@db/repositories/credentials.repository';
+import { ExecutionRepository } from '@db/repositories/execution.repository';
+import { ExecutionDataRepository } from '@db/repositories/executionData.repository';
+
+let securityAuditService: SecurityAuditService;
+
+beforeAll(async () => {
+	await testDb.init();
+
+	securityAuditService = new SecurityAuditService(Container.get(WorkflowRepository));
+});
+
+beforeEach(async () => {
+	await testDb.truncate(['Workflow', 'Credentials', 'Execution']);
+});
+
+afterAll(async () => {
+	await testDb.terminate();
+});
+
+test('should report credentials not in any use', async () => {
+	const credentialDetails = {
+		id: generateNanoId(),
+		name: 'My Slack Credential',
+		data: 'U2FsdGVkX18WjITBG4IDqrGB1xE/uzVNjtwDAG3lP7E=',
+		type: 'slackApi',
+	};
+
+	const workflowDetails = {
+		id: generateNanoId(),
+		name: 'My Test Workflow',
+		active: false,
+		connections: {},
+		nodeTypes: {},
+		nodes: [
+			{
+				id: uuid(),
+				name: 'My Node',
+				type: 'n8n-nodes-base.slack',
+				typeVersion: 1,
+				position: [0, 0] as [number, number],
+			},
+		],
+	};
+
+	await Promise.all([
+		Container.get(CredentialsRepository).save(credentialDetails),
+		Container.get(WorkflowRepository).save(workflowDetails),
+	]);
+
+	const testAudit = await securityAuditService.run(['credentials']);
+
+	const section = getRiskSection(
+		testAudit,
+		CREDENTIALS_REPORT.RISK,
+		CREDENTIALS_REPORT.SECTIONS.CREDS_NOT_IN_ANY_USE,
+	);
+
+	expect(section.location).toHaveLength(1);
+	expect(section.location[0]).toMatchObject({
+		id: credentialDetails.id,
+		name: 'My Slack Credential',
+	});
+});
+
+test('should report credentials not in active use', async () => {
+	const credentialDetails = {
+		id: generateNanoId(),
+		name: 'My Slack Credential',
+		data: 'U2FsdGVkX18WjITBG4IDqrGB1xE/uzVNjtwDAG3lP7E=',
+		type: 'slackApi',
+	};
+
+	const credential = await Container.get(CredentialsRepository).save(credentialDetails);
+
+	const workflowDetails = {
+		id: generateNanoId(),
+		name: 'My Test Workflow',
+		active: false,
+		connections: {},
+		nodeTypes: {},
+		nodes: [
+			{
+				id: uuid(),
+				name: 'My Node',
+				type: 'n8n-nodes-base.slack',
+				typeVersion: 1,
+				position: [0, 0] as [number, number],
+			},
+		],
+	};
+
+	await Container.get(WorkflowRepository).save(workflowDetails);
+
+	const testAudit = await securityAuditService.run(['credentials']);
+
+	const section = getRiskSection(
+		testAudit,
+		CREDENTIALS_REPORT.RISK,
+		CREDENTIALS_REPORT.SECTIONS.CREDS_NOT_IN_ACTIVE_USE,
+	);
+
+	expect(section.location).toHaveLength(1);
+	expect(section.location[0]).toMatchObject({
+		id: credential.id,
+		name: 'My Slack Credential',
+	});
+});
+
+test('should report credential in not recently executed workflow', async () => {
+	const credentialDetails = {
+		id: generateNanoId(),
+		name: 'My Slack Credential',
+		data: 'U2FsdGVkX18WjITBG4IDqrGB1xE/uzVNjtwDAG3lP7E=',
+		type: 'slackApi',
+	};
+
+	const credential = await Container.get(CredentialsRepository).save(credentialDetails);
+
+	const workflowDetails = {
+		id: generateNanoId(),
+		name: 'My Test Workflow',
+		active: false,
+		connections: {},
+		nodeTypes: {},
+		nodes: [
+			{
+				id: uuid(),
+				name: 'My Node',
+				type: 'n8n-nodes-base.slack',
+				typeVersion: 1,
+				position: [0, 0] as [number, number],
+				credentials: {
+					slackApi: {
+						id: credential.id,
+						name: credential.name,
+					},
+				},
+			},
+		],
+	};
+
+	const workflow = await Container.get(WorkflowRepository).save(workflowDetails);
+
+	const date = new Date();
+	date.setDate(date.getDate() - config.getEnv('security.audit.daysAbandonedWorkflow') - 1);
+
+	const savedExecution = await Container.get(ExecutionRepository).save({
+		finished: true,
+		mode: 'manual',
+		startedAt: date,
+		stoppedAt: date,
+		workflowId: workflow.id,
+		waitTill: null,
+	});
+	await Container.get(ExecutionDataRepository).save({
+		execution: savedExecution,
+		data: '[]',
+		workflowData: workflow,
+	});
+
+	const testAudit = await securityAuditService.run(['credentials']);
+
+	const section = getRiskSection(
+		testAudit,
+		CREDENTIALS_REPORT.RISK,
+		CREDENTIALS_REPORT.SECTIONS.CREDS_NOT_RECENTLY_EXECUTED,
+	);
+
+	expect(section.location).toHaveLength(1);
+	expect(section.location[0]).toMatchObject({
+		id: credential.id,
+		name: credential.name,
+	});
+});
+
+test('should not report credentials in recently executed workflow', async () => {
+	const credentialDetails = {
+		id: generateNanoId(),
+		name: 'My Slack Credential',
+		data: 'U2FsdGVkX18WjITBG4IDqrGB1xE/uzVNjtwDAG3lP7E=',
+		type: 'slackApi',
+	};
+
+	const credential = await Container.get(CredentialsRepository).save(credentialDetails);
+
+	const workflowDetails = {
+		id: generateNanoId(),
+		name: 'My Test Workflow',
+		active: true,
+		connections: {},
+		nodeTypes: {},
+		nodes: [
+			{
+				id: uuid(),
+				name: 'My Node',
+				type: 'n8n-nodes-base.slack',
+				typeVersion: 1,
+				position: [0, 0] as [number, number],
+				credentials: {
+					slackApi: {
+						id: credential.id,
+						name: credential.name,
+					},
+				},
+			},
+		],
+	};
+
+	const workflow = await Container.get(WorkflowRepository).save(workflowDetails);
+
+	const date = new Date();
+	date.setDate(date.getDate() - config.getEnv('security.audit.daysAbandonedWorkflow') + 1);
+
+	const savedExecution = await Container.get(ExecutionRepository).save({
+		finished: true,
+		mode: 'manual',
+		startedAt: date,
+		stoppedAt: date,
+		workflowId: workflow.id,
+		waitTill: null,
+	});
+
+	await Container.get(ExecutionDataRepository).save({
+		execution: savedExecution,
+		data: '[]',
+		workflowData: workflow,
+	});
+
+	const testAudit = await securityAuditService.run(['credentials']);
+
+	expect(testAudit).toBeEmptyArray();
+});
diff --git a/packages/cli/test/integration/security-audit/DatabaseRiskReporter.test.ts b/packages/cli/test/integration/security-audit/DatabaseRiskReporter.test.ts
new file mode 100644
index 0000000000000..e7ae638d97ecd
--- /dev/null
+++ b/packages/cli/test/integration/security-audit/DatabaseRiskReporter.test.ts
@@ -0,0 +1,193 @@
+import { v4 as uuid } from 'uuid';
+import { SecurityAuditService } from '@/security-audit/SecurityAudit.service';
+import {
+	DATABASE_REPORT,
+	SQL_NODE_TYPES,
+	SQL_NODE_TYPES_WITH_QUERY_PARAMS,
+} from '@/security-audit/constants';
+import { getRiskSection, saveManualTriggerWorkflow } from './utils';
+import * as testDb from '../shared/testDb';
+import { generateNanoId } from '@db/utils/generators';
+import { WorkflowRepository } from '@db/repositories/workflow.repository';
+import Container from 'typedi';
+
+let securityAuditService: SecurityAuditService;
+
+beforeAll(async () => {
+	await testDb.init();
+
+	securityAuditService = new SecurityAuditService(Container.get(WorkflowRepository));
+});
+
+beforeEach(async () => {
+	await testDb.truncate(['Workflow']);
+});
+
+afterAll(async () => {
+	await testDb.terminate();
+});
+
+test('should report expressions in queries', async () => {
+	const map = [...SQL_NODE_TYPES].reduce<{ [nodeType: string]: string }>((acc, cur) => {
+		return (acc[cur] = uuid()), acc;
+	}, {});
+
+	const promises = Object.entries(map).map(async ([nodeType, nodeId]) => {
+		const details = {
+			id: generateNanoId(),
+			name: 'My Test Workflow',
+			active: false,
+			connections: {},
+			nodeTypes: {},
+			nodes: [
+				{
+					id: nodeId,
+					name: 'My Node',
+					type: nodeType,
+					parameters: {
+						operation: 'executeQuery',
+						query: '=SELECT * FROM {{ $json.table }}',
+						additionalFields: {},
+					},
+					typeVersion: 1,
+					position: [0, 0] as [number, number],
+				},
+			],
+		};
+
+		return await Container.get(WorkflowRepository).save(details);
+	});
+
+	await Promise.all(promises);
+
+	const testAudit = await securityAuditService.run(['database']);
+
+	const section = getRiskSection(
+		testAudit,
+		DATABASE_REPORT.RISK,
+		DATABASE_REPORT.SECTIONS.EXPRESSIONS_IN_QUERIES,
+	);
+
+	expect(section.location).toHaveLength(SQL_NODE_TYPES.size);
+
+	for (const loc of section.location) {
+		if (loc.kind === 'node') {
+			expect(loc.nodeId).toBe(map[loc.nodeType]);
+		}
+	}
+});
+
+test('should report expressions in query params', async () => {
+	const map = [...SQL_NODE_TYPES_WITH_QUERY_PARAMS].reduce<{ [nodeType: string]: string }>(
+		(acc, cur) => {
+			return (acc[cur] = uuid()), acc;
+		},
+		{},
+	);
+
+	const promises = Object.entries(map).map(async ([nodeType, nodeId]) => {
+		const details = {
+			id: generateNanoId(),
+			name: 'My Test Workflow',
+			active: false,
+			connections: {},
+			nodeTypes: {},
+			nodes: [
+				{
+					id: nodeId,
+					name: 'My Node',
+					type: nodeType,
+					parameters: {
+						operation: 'executeQuery',
+						query: 'SELECT * FROM users WHERE id = $1;',
+						additionalFields: {
+							queryParams: '={{ $json.userId }}',
+						},
+					},
+					typeVersion: 1,
+					position: [0, 0] as [number, number],
+				},
+			],
+		};
+
+		return await Container.get(WorkflowRepository).save(details);
+	});
+
+	await Promise.all(promises);
+
+	const testAudit = await securityAuditService.run(['database']);
+
+	const section = getRiskSection(
+		testAudit,
+		DATABASE_REPORT.RISK,
+		DATABASE_REPORT.SECTIONS.EXPRESSIONS_IN_QUERY_PARAMS,
+	);
+
+	expect(section.location).toHaveLength(SQL_NODE_TYPES_WITH_QUERY_PARAMS.size);
+
+	for (const loc of section.location) {
+		if (loc.kind === 'node') {
+			expect(loc.nodeId).toBe(map[loc.nodeType]);
+		}
+	}
+});
+
+test('should report unused query params', async () => {
+	const map = [...SQL_NODE_TYPES_WITH_QUERY_PARAMS].reduce<{ [nodeType: string]: string }>(
+		(acc, cur) => {
+			return (acc[cur] = uuid()), acc;
+		},
+		{},
+	);
+
+	const promises = Object.entries(map).map(async ([nodeType, nodeId]) => {
+		const details = {
+			id: generateNanoId(),
+			name: 'My Test Workflow',
+			active: false,
+			connections: {},
+			nodeTypes: {},
+			nodes: [
+				{
+					id: nodeId,
+					name: 'My Node',
+					type: nodeType,
+					parameters: {
+						operation: 'executeQuery',
+						query: 'SELECT * FROM users WHERE id = 123;',
+					},
+					typeVersion: 1,
+					position: [0, 0] as [number, number],
+				},
+			],
+		};
+
+		return await Container.get(WorkflowRepository).save(details);
+	});
+
+	await Promise.all(promises);
+
+	const testAudit = await securityAuditService.run(['database']);
+
+	const section = getRiskSection(
+		testAudit,
+		DATABASE_REPORT.RISK,
+		DATABASE_REPORT.SECTIONS.UNUSED_QUERY_PARAMS,
+	);
+
+	expect(section.location).toHaveLength(SQL_NODE_TYPES_WITH_QUERY_PARAMS.size);
+
+	for (const loc of section.location) {
+		if (loc.kind === 'node') {
+			expect(loc.nodeId).toBe(map[loc.nodeType]);
+		}
+	}
+});
+
+test('should not report non-database node', async () => {
+	await saveManualTriggerWorkflow();
+
+	const testAudit = await securityAuditService.run(['database']);
+
+	expect(testAudit).toBeEmptyArray();
+});
diff --git a/packages/cli/test/integration/security-audit/FilesystemRiskReporter.test.ts b/packages/cli/test/integration/security-audit/FilesystemRiskReporter.test.ts
new file mode 100644
index 0000000000000..f6d8537c0d48c
--- /dev/null
+++ b/packages/cli/test/integration/security-audit/FilesystemRiskReporter.test.ts
@@ -0,0 +1,78 @@
+import { v4 as uuid } from 'uuid';
+import { SecurityAuditService } from '@/security-audit/SecurityAudit.service';
+import { FILESYSTEM_INTERACTION_NODE_TYPES, FILESYSTEM_REPORT } from '@/security-audit/constants';
+import { getRiskSection, saveManualTriggerWorkflow } from './utils';
+import * as testDb from '../shared/testDb';
+import { WorkflowRepository } from '@db/repositories/workflow.repository';
+import Container from 'typedi';
+
+let securityAuditService: SecurityAuditService;
+
+beforeAll(async () => {
+	await testDb.init();
+
+	securityAuditService = new SecurityAuditService(Container.get(WorkflowRepository));
+});
+
+beforeEach(async () => {
+	await testDb.truncate(['Workflow']);
+});
+
+afterAll(async () => {
+	await testDb.terminate();
+});
+
+test('should report filesystem interaction nodes', async () => {
+	const map = [...FILESYSTEM_INTERACTION_NODE_TYPES].reduce<{ [nodeType: string]: string }>(
+		(acc, cur) => {
+			return (acc[cur] = uuid()), acc;
+		},
+		{},
+	);
+
+	const promises = Object.entries(map).map(async ([nodeType, nodeId]) => {
+		const details = Container.get(WorkflowRepository).create({
+			name: 'My Test Workflow',
+			active: false,
+			connections: {},
+			nodes: [
+				{
+					id: nodeId,
+					name: 'My Node',
+					type: nodeType,
+					typeVersion: 1,
+					position: [0, 0] as [number, number],
+					parameters: {},
+				},
+			],
+		});
+
+		return await Container.get(WorkflowRepository).save(details);
+	});
+
+	await Promise.all(promises);
+
+	const testAudit = await securityAuditService.run(['filesystem']);
+
+	const section = getRiskSection(
+		testAudit,
+		FILESYSTEM_REPORT.RISK,
+		FILESYSTEM_REPORT.SECTIONS.FILESYSTEM_INTERACTION_NODES,
+	);
+
+	expect(section.location).toHaveLength(FILESYSTEM_INTERACTION_NODE_TYPES.size);
+
+	for (const loc of section.location) {
+		if (loc.kind === 'node') {
+			expect(loc.nodeId).toBe(map[loc.nodeType]);
+		}
+	}
+});
+
+test('should not report non-filesystem-interaction node', async () => {
+	await saveManualTriggerWorkflow();
+
+	const testAudit = await securityAuditService.run(['filesystem']);
+
+	expect(testAudit).toBeEmptyArray();
+});
diff --git a/packages/cli/test/integration/security-audit/InstanceRiskReporter.test.ts b/packages/cli/test/integration/security-audit/InstanceRiskReporter.test.ts
new file mode 100644
index 0000000000000..5d359e0dba52b
--- /dev/null
+++ b/packages/cli/test/integration/security-audit/InstanceRiskReporter.test.ts
@@ -0,0 +1,258 @@
+import { v4 as uuid } from 'uuid';
+import { SecurityAuditService } from '@/security-audit/SecurityAudit.service';
+import { INSTANCE_REPORT, WEBHOOK_VALIDATOR_NODE_TYPES } from '@/security-audit/constants';
+import {
+	getRiskSection,
+	saveManualTriggerWorkflow,
+	MOCK_09990_N8N_VERSION,
+	simulateOutdatedInstanceOnce,
+	simulateUpToDateInstance,
+} from './utils';
+import * as testDb from '../shared/testDb';
+import { toReportTitle } from '@/security-audit/utils';
+import config from '@/config';
+import { generateNanoId } from '@db/utils/generators';
+import { WorkflowRepository } from '@db/repositories/workflow.repository';
+import Container from 'typedi';
+
+let securityAuditService: SecurityAuditService;
+
+beforeAll(async () => {
+	await testDb.init();
+
+	securityAuditService = new SecurityAuditService(Container.get(WorkflowRepository));
+
+	simulateUpToDateInstance();
+});
+
+beforeEach(async () => {
+	await testDb.truncate(['Workflow']);
+});
+
+afterAll(async () => {
+	await testDb.terminate();
+});
+
+test('should report webhook lacking authentication', async () => {
+	const targetNodeId = uuid();
+
+	const details = {
+		id: generateNanoId(),
+		name: 'My Test Workflow',
+		active: true,
+		nodeTypes: {},
+		connections: {},
+		nodes: [
+			{
+				parameters: {
+					path: uuid(),
+					options: {},
+				},
+				id: targetNodeId,
+				name: 'Webhook',
+				type: 'n8n-nodes-base.webhook',
+				typeVersion: 1,
+				position: [0, 0] as [number, number],
+				webhookId: uuid(),
+			},
+		],
+	};
+
+	await Container.get(WorkflowRepository).save(details);
+
+	const testAudit = await securityAuditService.run(['instance']);
+
+	const section = getRiskSection(
+		testAudit,
+		INSTANCE_REPORT.RISK,
+		INSTANCE_REPORT.SECTIONS.UNPROTECTED_WEBHOOKS,
+	);
+
+	if (!section.location) {
+		fail('Expected section to have locations');
+	}
+
+	expect(section.location).toHaveLength(1);
+
+	expect(section.location[0].nodeId).toBe(targetNodeId);
+});
+
+test('should not report webhooks having basic or header auth', async () => {
+	const promises = ['basicAuth', 'headerAuth'].map(async (authType) => {
+		const details = {
+			id: generateNanoId(),
+			name: 'My Test Workflow',
+			active: true,
+			nodeTypes: {},
+			connections: {},
+			nodes: [
+				{
+					parameters: {
+						path: uuid(),
+						authentication: authType,
+						options: {},
+					},
+					id: uuid(),
+					name: 'Webhook',
+					type: 'n8n-nodes-base.webhook',
+					typeVersion: 1,
+					position: [0, 0] as [number, number],
+					webhookId: uuid(),
+				},
+			],
+		};
+
+		return await Container.get(WorkflowRepository).save(details);
+	});
+
+	await Promise.all(promises);
+
+	const testAudit = await securityAuditService.run(['instance']);
+
+	if (Array.isArray(testAudit)) fail('Audit is empty');
+
+	const report = testAudit[toReportTitle('instance')];
+
+	if (!report) {
+		fail('Expected test audit to have instance risk report');
+	}
+
+	for (const section of report.sections) {
+		expect(section.title).not.toBe(INSTANCE_REPORT.SECTIONS.UNPROTECTED_WEBHOOKS);
+	}
+});
+
+test('should not report webhooks validated by direct children', async () => {
+	const promises = [...WEBHOOK_VALIDATOR_NODE_TYPES].map(async (nodeType) => {
+		const details = {
+			id: generateNanoId(),
+			name: 'My Test Workflow',
+			active: true,
+			nodeTypes: {},
+			nodes: [
+				{
+					parameters: {
+						path: uuid(),
+						options: {},
+					},
+					id: uuid(),
+					name: 'Webhook',
+					type: 'n8n-nodes-base.webhook',
+					typeVersion: 1,
+					position: [0, 0] as [number, number],
+					webhookId: uuid(),
+				},
+				{
+					id: uuid(),
+					name: 'My Node',
+					type: nodeType,
+					typeVersion: 1,
+					position: [0, 0] as [number, number],
+				},
+			],
+			connections: {
+				Webhook: {
+					main: [
+						[
+							{
+								node: 'My Node',
+								type: 'main',
+								index: 0,
+							},
+						],
+					],
+				},
+			},
+		};
+
+		return await Container.get(WorkflowRepository).save(details);
+	});
+
+	await Promise.all(promises);
+
+	const testAudit = await securityAuditService.run(['instance']);
+	if (Array.isArray(testAudit)) fail('audit is empty');
+
+	const report = testAudit[toReportTitle('instance')];
+	if (!report) {
+		fail('Expected test audit to have instance risk report');
+	}
+
+	for (const section of report.sections) {
+		expect(section.title).not.toBe(INSTANCE_REPORT.SECTIONS.UNPROTECTED_WEBHOOKS);
+	}
+});
+
+test('should not report non-webhook node', async () => {
+	await saveManualTriggerWorkflow();
+
+	const testAudit = await securityAuditService.run(['instance']);
+	if (Array.isArray(testAudit)) fail('audit is empty');
+
+	const report = testAudit[toReportTitle('instance')];
+
+	if (!report) {
+		fail('Expected test audit to have instance risk report');
+	}
+
+	for (const section of report.sections) {
+		expect(section.title).not.toBe(INSTANCE_REPORT.SECTIONS.UNPROTECTED_WEBHOOKS);
+	}
+});
+
+test('should report outdated instance when outdated', async () => {
+	simulateOutdatedInstanceOnce();
+
+	const testAudit = await securityAuditService.run(['instance']);
+
+	const section = getRiskSection(
+		testAudit,
+		INSTANCE_REPORT.RISK,
+		INSTANCE_REPORT.SECTIONS.OUTDATED_INSTANCE,
+	);
+
+	if (!section.nextVersions) {
+		fail('Expected section to have next versions');
+	}
+
+	expect(section.nextVersions).toHaveLength(1);
+
+	expect(section.nextVersions[0].name).toBe(MOCK_09990_N8N_VERSION.name);
+});
+
+test('should not report outdated instance when up to date', async () => {
+	const testAudit = await securityAuditService.run(['instance']);
+	if (Array.isArray(testAudit)) fail('audit is empty');
+
+	const report = testAudit[toReportTitle('instance')];
+	if (!report) {
+		fail('Expected test audit to have instance risk report');
+	}
+
+	for (const section of report.sections) {
+		expect(section.title).not.toBe(INSTANCE_REPORT.SECTIONS.OUTDATED_INSTANCE);
+	}
+});
+
+test('should report security settings', async () => {
+	config.set('diagnostics.enabled', true);
+
+	const testAudit = await securityAuditService.run(['instance']);
+
+	const section = getRiskSection(
+		testAudit,
+		INSTANCE_REPORT.RISK,
+		INSTANCE_REPORT.SECTIONS.SECURITY_SETTINGS,
+	);
+
+	expect(section.settings).toMatchObject({
+		features: {
+			communityPackagesEnabled: true,
+			versionNotificationsEnabled: true,
+			templatesEnabled: true,
+			publicApiEnabled: false,
+		},
+		nodes: { nodesExclude: 'none', nodesInclude: 'none' },
+		telemetry: { diagnosticsEnabled: true },
+	});
+});
diff --git a/packages/cli/test/integration/security-audit/NodesRiskReporter.test.ts b/packages/cli/test/integration/security-audit/NodesRiskReporter.test.ts
new file mode 100644
index 0000000000000..03386bef0088e
--- /dev/null
+++ b/packages/cli/test/integration/security-audit/NodesRiskReporter.test.ts
@@ -0,0 +1,116 @@
+import { v4 as uuid } from 'uuid';
+import { Container } from 'typedi';
+import { SecurityAuditService } from '@/security-audit/SecurityAudit.service';
+import { OFFICIAL_RISKY_NODE_TYPES, NODES_REPORT } from '@/security-audit/constants';
+import { toReportTitle } from '@/security-audit/utils';
+import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
+import { NodeTypes } from '@/NodeTypes';
+import { CommunityPackagesService } from '@/services/communityPackages.service';
+import { WorkflowRepository } from '@db/repositories/workflow.repository';
+
+import { mockInstance } from '../../shared/mocking';
+import { getRiskSection, MOCK_PACKAGE, saveManualTriggerWorkflow } from './utils';
+import * as testDb from '../shared/testDb';
+
+const nodesAndCredentials = mockInstance(LoadNodesAndCredentials);
+nodesAndCredentials.getCustomDirectories.mockReturnValue([]);
+mockInstance(NodeTypes);
+const communityPackagesService = mockInstance(CommunityPackagesService);
+Container.set(CommunityPackagesService, communityPackagesService);
+
+let securityAuditService: SecurityAuditService;
+
+beforeAll(async () => {
+	await testDb.init();
+
+	securityAuditService = new SecurityAuditService(Container.get(WorkflowRepository));
+});
+
+beforeEach(async () => {
+	await testDb.truncate(['Workflow']);
+});
+
+afterAll(async () => {
+	await testDb.terminate();
+	jest.resetAllMocks();
+});
+
+test('should report risky official nodes', async () => {
+	communityPackagesService.getAllInstalledPackages.mockResolvedValue(MOCK_PACKAGE);
+	const map = [...OFFICIAL_RISKY_NODE_TYPES].reduce<{ [nodeType: string]: string }>((acc, cur) => {
+		return (acc[cur] = uuid()), acc;
+	}, {});
+
+	const promises = Object.entries(map).map(async ([nodeType, nodeId]) => {
+		const details = Container.get(WorkflowRepository).create({
+			name: 'My Test Workflow',
+			active: false,
+			connections: {},
+			nodes: [
+				{
+					id: nodeId,
+					name: 'My Node',
+					type: nodeType,
+					typeVersion: 1,
+					position: [0, 0] as [number, number],
+					parameters: {},
+				},
+			],
+		});
+
+		return await Container.get(WorkflowRepository).save(details);
+	});
+
+	await Promise.all(promises);
+
+	const testAudit = await securityAuditService.run(['nodes']);
+
+	const section = getRiskSection(
+		testAudit,
+		NODES_REPORT.RISK,
+		NODES_REPORT.SECTIONS.OFFICIAL_RISKY_NODES,
+	);
+
+	expect(section.location).toHaveLength(OFFICIAL_RISKY_NODE_TYPES.size);
+
+	for (const loc of section.location) {
+		if (loc.kind === 'node') {
+			expect(loc.nodeId).toBe(map[loc.nodeType]);
+		}
+	}
+});
+
+test('should not report non-risky official nodes', async () => {
+	communityPackagesService.getAllInstalledPackages.mockResolvedValue(MOCK_PACKAGE);
+	await saveManualTriggerWorkflow();
+
+	const testAudit = await securityAuditService.run(['nodes']);
+
+	if (Array.isArray(testAudit)) return;
+
+	const report = testAudit[toReportTitle('nodes')];
+
+	if (!report) return;
+
+	for (const section of report.sections) {
+		expect(section.title).not.toBe(NODES_REPORT.SECTIONS.OFFICIAL_RISKY_NODES);
+	}
+});
+
+test('should report community nodes', async () => {
+	communityPackagesService.getAllInstalledPackages.mockResolvedValue(MOCK_PACKAGE);
+
+	const testAudit = await securityAuditService.run(['nodes']);
+
+	const section = getRiskSection(
+		testAudit,
+		NODES_REPORT.RISK,
+		NODES_REPORT.SECTIONS.COMMUNITY_NODES,
+	);
+
+	expect(section.location).toHaveLength(1);
+
+	if (section.location[0].kind === 'community') {
+		expect(section.location[0].nodeType).toBe(MOCK_PACKAGE[0].installedNodes[0].type);
+	}
+});
diff --git a/packages/cli/test/integration/security-audit/utils.ts b/packages/cli/test/integration/security-audit/utils.ts
new file mode 100644
index 0000000000000..bd0d5a6ead044
--- /dev/null
+++ b/packages/cli/test/integration/security-audit/utils.ts
@@ -0,0 +1,131 @@
+import nock from 'nock';
+import config from '@/config';
+import { v4 as uuid } from 'uuid';
+import { toReportTitle } from '@/security-audit/utils';
+import * as constants from '@/constants';
+import type { Risk } from '@/security-audit/types';
+import type { InstalledNodes } from '@db/entities/InstalledNodes';
+import type { InstalledPackages } from '@db/entities/InstalledPackages';
+import { WorkflowRepository } from '@db/repositories/workflow.repository';
+import Container from 'typedi';
+
+type GetSectionKind<C extends Risk.Category> = C extends 'instance'
+	? Risk.InstanceSection
+	: Risk.StandardSection;
+
+export function getRiskSection<C extends Risk.Category>(
+	testAudit: Risk.Audit | never[],
+	riskCategory: C,
+	sectionTitle: string,
+): GetSectionKind<C> {
+	if (Array.isArray(testAudit)) {
+		throw new Error('Expected test audit not to be an array');
+	}
+
+	const report = testAudit[toReportTitle(riskCategory)];
+
+	if (!report) throw new Error(`Expected risk "${riskCategory}"`);
+
+	for (const section of report.sections) {
+		if (section.title === sectionTitle) {
+			return section as GetSectionKind<C>;
+		}
+	}
+
+	throw new Error(`Expected section "${sectionTitle}" for risk "${riskCategory}"`);
+}
+
+export async function saveManualTriggerWorkflow() {
+	const details = {
+		id: '1',
+		name: 'My Test Workflow',
+		active: false,
+		connections: {},
+		nodeTypes: {},
+		nodes: [
+			{
+				id: uuid(),
+				name: 'My Node',
+				type: 'n8n-nodes-base.manualTrigger',
+				typeVersion: 1,
+				position: [0, 0] as [number, number],
+			},
+		],
+	};
+
+	return await Container.get(WorkflowRepository).save(details);
+}
+
+export const MOCK_09990_N8N_VERSION = {
+	name: '0.999.0',
+	nodes: [
+		{
+			name: 'n8n-nodes-base.testNode',
+			displayName: 'Test Node',
+			icon: 'file:testNode.svg',
+			defaults: {
+				name: 'Test Node',
+			},
+		},
+	],
+	createdAt: '2022-11-11T11:11:11.111Z',
+	description:
+		'Includes <strong>new nodes</strong>, <strong>node enhancements</strong>, <strong>core functionality</strong> and <strong>bug fixes</strong>',
+	documentationUrl: 'https://docs.n8n.io/reference/release-notes/#n8n09990',
+	hasBreakingChange: false,
+	hasSecurityFix: false,
+	hasSecurityIssue: false,
+	securityIssueFixVersion: null,
+};
+
+export const MOCK_01110_N8N_VERSION = {
+	name: '0.111.0',
+	nodes: [],
+	createdAt: '2022-01-01T00:00:00.000Z',
+	description:
+		'Includes <strong>new nodes</strong>, <strong>node enhancements</strong>, <strong>core functionality</strong> and <strong>bug fixes</strong>',
+	documentationUrl: 'https://docs.n8n.io/reference/release-notes/#n8n01110',
+	hasBreakingChange: false,
+	hasSecurityFix: false,
+	hasSecurityIssue: false,
+	securityIssueFixVersion: null,
+};
+
+export const MOCK_PACKAGE: InstalledPackages[] = [
+	{
+		createdAt: new Date(),
+		updatedAt: new Date(),
+		packageName: 'n8n-nodes-test',
+		installedVersion: '1.1.2',
+		authorName: 'test',
+		authorEmail: 'test@test.com',
+		setUpdateDate: () => {},
+		installedNodes: [
+			{
+				name: 'My Test Node',
+				type: 'myTestNode',
+				latestVersion: '1',
+			} as InstalledNodes,
+		],
+	},
+];
+
+export function simulateOutdatedInstanceOnce(versionName = MOCK_01110_N8N_VERSION.name) {
+	const baseUrl = config.getEnv('versionNotifications.endpoint') + '/';
+
+	jest
+		.spyOn(constants, 'getN8nPackageJson')
+		.mockReturnValueOnce({ name: 'n8n', version: versionName });
+
+	nock(baseUrl).get(versionName).reply(200, [MOCK_01110_N8N_VERSION, MOCK_09990_N8N_VERSION]);
+}
+
+export function simulateUpToDateInstance(versionName = MOCK_09990_N8N_VERSION.name) {
+	const baseUrl = config.getEnv('versionNotifications.endpoint') + '/';
+
+	jest
+		.spyOn(constants, 'getN8nPackageJson')
+		.mockReturnValueOnce({ name: 'n8n', version: versionName });
+
+	nock(baseUrl).persist().get(versionName).reply(200, [MOCK_09990_N8N_VERSION]);
+}
diff --git a/packages/cli/test/integration/shared/constants.ts b/packages/cli/test/integration/shared/constants.ts
index 37798aa4d0f83..7b32134cabde5 100644
--- a/packages/cli/test/integration/shared/constants.ts
+++ b/packages/cli/test/integration/shared/constants.ts
@@ -1,16 +1,8 @@
 import config from '@/config';
 
-export const REST_PATH_SEGMENT = config.getEnv('endpoints.rest') as Readonly<string>;
+export const REST_PATH_SEGMENT = config.getEnv('endpoints.rest');
 
-export const PUBLIC_API_REST_PATH_SEGMENT = config.getEnv('publicApi.path') as Readonly<string>;
-
-export const AUTHLESS_ENDPOINTS: Readonly<string[]> = [
-	'healthz',
-	'metrics',
-	config.getEnv('endpoints.webhook'),
-	config.getEnv('endpoints.webhookWaiting'),
-	config.getEnv('endpoints.webhookTest'),
-];
+export const PUBLIC_API_REST_PATH_SEGMENT = config.getEnv('publicApi.path');
 
 export const SUCCESS_RESPONSE_BODY = {
 	data: {
@@ -24,29 +16,6 @@ export const LOGGED_OUT_RESPONSE_BODY = {
 	},
 };
 
-/**
- * Routes requiring a valid `n8n-auth` cookie for a user, either owner or member.
- */
-export const ROUTES_REQUIRING_AUTHENTICATION: Readonly<string[]> = [
-	'PATCH /me',
-	'PATCH /me/password',
-	'POST /me/survey',
-	'POST /owner/setup',
-	'GET /non-existent',
-];
-
-/**
- * Routes requiring a valid `n8n-auth` cookie for an owner.
- */
-export const ROUTES_REQUIRING_AUTHORIZATION: Readonly<string[]> = [
-	'POST /users',
-	'DELETE /users/123',
-	'POST /users/123/reinvite',
-	'GET /owner/pre-setup',
-	'POST /owner/setup',
-	'POST /owner/skip-setup',
-];
-
 export const COMMUNITY_PACKAGE_VERSION = {
 	CURRENT: '0.1.0',
 	UPDATED: '0.2.0',
@@ -56,8 +25,3 @@ export const COMMUNITY_NODE_VERSION = {
 	CURRENT: 1,
 	UPDATED: 2,
 };
-
-/**
- * Timeout (in milliseconds) to account for DB being slow to initialize.
- */
-export const DB_INITIALIZATION_TIMEOUT = 30_000;
diff --git a/packages/cli/test/integration/shared/db/credentials.ts b/packages/cli/test/integration/shared/db/credentials.ts
new file mode 100644
index 0000000000000..85b46d26a3e6d
--- /dev/null
+++ b/packages/cli/test/integration/shared/db/credentials.ts
@@ -0,0 +1,97 @@
+import { Container } from 'typedi';
+import { CredentialsEntity } from '@db/entities/CredentialsEntity';
+import type { User } from '@db/entities/User';
+import { CredentialsRepository } from '@db/repositories/credentials.repository';
+import { SharedCredentialsRepository } from '@db/repositories/sharedCredentials.repository';
+import type { CredentialSharingRole } from '@db/entities/SharedCredentials';
+import type { ICredentialsDb } from '@/Interfaces';
+import type { CredentialPayload } from '../types';
+
+async function encryptCredentialData(credential: CredentialsEntity) {
+	const { createCredentialsFromCredentialsEntity } = await import('@/CredentialsHelper');
+	const coreCredential = createCredentialsFromCredentialsEntity(credential, true);
+
+	// @ts-ignore
+	coreCredential.setData(credential.data);
+
+	return coreCredential.getDataToSave() as ICredentialsDb;
+}
+
+const emptyAttributes = {
+	name: 'test',
+	type: 'test',
+	data: '',
+};
+
+export async function createManyCredentials(
+	amount: number,
+	attributes: Partial<CredentialsEntity> = emptyAttributes,
+) {
+	return await Promise.all(
+		Array(amount)
+			.fill(0)
+			.map(async () => await createCredentials(attributes)),
+	);
+}
+
+export async function createCredentials(attributes: Partial<CredentialsEntity> = emptyAttributes) {
+	const credentialsRepository = Container.get(CredentialsRepository);
+	const entity = credentialsRepository.create(attributes);
+
+	return await credentialsRepository.save(entity);
+}
+
+/**
+ * Save a credential to the test DB, sharing it with a user.
+ */
+export async function saveCredential(
+	credentialPayload: CredentialPayload,
+	{ user, role }: { user: User; role: CredentialSharingRole },
+) {
+	const newCredential = new CredentialsEntity();
+
+	Object.assign(newCredential, credentialPayload);
+
+	const encryptedData = await encryptCredentialData(newCredential);
+
+	Object.assign(newCredential, encryptedData);
+
+	const savedCredential = await Container.get(CredentialsRepository).save(newCredential);
+
+	savedCredential.data = newCredential.data;
+
+	await Container.get(SharedCredentialsRepository).save({
+		user,
+		credentials: savedCredential,
+		role,
+	});
+
+	return savedCredential;
+}
+
+export async function shareCredentialWithUsers(credential: CredentialsEntity, users: User[]) {
+	const newSharedCredentials = users.map((user) =>
+		Container.get(SharedCredentialsRepository).create({
+			userId: user.id,
+			credentialsId: credential.id,
+			role: 'credential:user',
+		}),
+	);
+	return await Container.get(SharedCredentialsRepository).save(newSharedCredentials);
+}
+
+export function affixRoleToSaveCredential(role: CredentialSharingRole) {
+	return async (credentialPayload: CredentialPayload, { user }: { user: User }) =>
+		await saveCredential(credentialPayload, { user, role });
+}
+
+export async function getAllCredentials() {
+	return await Container.get(CredentialsRepository).find();
+}
+
+export const getCredentialById = async (id: string) =>
+	await Container.get(CredentialsRepository).findOneBy({ id });
+
+export async function getAllSharedCredentials() {
+	return await Container.get(SharedCredentialsRepository).find();
+}
diff --git a/packages/cli/test/integration/shared/db/executions.ts b/packages/cli/test/integration/shared/db/executions.ts
new file mode 100644
index 0000000000000..7e791a08fe4d1
--- /dev/null
+++ b/packages/cli/test/integration/shared/db/executions.ts
@@ -0,0 +1,75 @@
+import Container from 'typedi';
+import type { ExecutionData } from '@db/entities/ExecutionData';
+import type { ExecutionEntity } from '@db/entities/ExecutionEntity';
+import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
+import { ExecutionRepository } from '@db/repositories/execution.repository';
+import { ExecutionDataRepository } from '@db/repositories/executionData.repository';
+
+export async function createManyExecutions(
+	amount: number,
+	workflow: WorkflowEntity,
+	callback: (workflow: WorkflowEntity) => Promise<ExecutionEntity>,
+) {
+	const executionsRequests = [...Array(amount)].map(async (_) => await callback(workflow));
+	return await Promise.all(executionsRequests);
+}
+
+/**
+ * Store a execution in the DB and assign it to a workflow.
+ */
+export async function createExecution(
+	attributes: Partial<ExecutionEntity & ExecutionData>,
+	workflow: WorkflowEntity,
+) {
+	const { data, finished, mode, startedAt, stoppedAt, waitTill, status, deletedAt } = attributes;
+
+	const execution = await Container.get(ExecutionRepository).save({
+		finished: finished ?? true,
+		mode: mode ?? 'manual',
+		startedAt: startedAt ?? new Date(),
+		...(workflow !== undefined && { workflowId: workflow.id }),
+		stoppedAt: stoppedAt ?? new Date(),
+		waitTill: waitTill ?? null,
+		status,
+		deletedAt,
+	});
+
+	await Container.get(ExecutionDataRepository).save({
+		data: data ?? '[]',
+		workflowData: workflow ?? {},
+		executionId: execution.id,
+	});
+
+	return execution;
+}
+
+/**
+ * Store a successful execution in the DB and assign it to a workflow.
+ */
+export async function createSuccessfulExecution(workflow: WorkflowEntity) {
+	return await createExecution({ finished: true, status: 'success' }, workflow);
+}
+
+/**
+ * Store an error execution in the DB and assign it to a workflow.
+ */
+export async function createErrorExecution(workflow: WorkflowEntity) {
+	return await createExecution(
+		{ finished: false, stoppedAt: new Date(), status: 'error' },
+		workflow,
+	);
+}
+
+/**
+ * Store a waiting execution in the DB and assign it to a workflow.
+ */
+export async function createWaitingExecution(workflow: WorkflowEntity) {
+	return await createExecution(
+		{ finished: false, waitTill: new Date(), status: 'waiting' },
+		workflow,
+	);
+}
+
+export async function getAllExecutions() {
+	return await Container.get(ExecutionRepository).find();
+}
diff --git a/packages/cli/test/integration/shared/db/tags.ts b/packages/cli/test/integration/shared/db/tags.ts
new file mode 100644
index 0000000000000..53bfb2ef5c124
--- /dev/null
+++ b/packages/cli/test/integration/shared/db/tags.ts
@@ -0,0 +1,26 @@
+import Container from 'typedi';
+import type { TagEntity } from '@db/entities/TagEntity';
+import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
+import { TagRepository } from '@db/repositories/tag.repository';
+import { WorkflowTagMappingRepository } from '@db/repositories/workflowTagMapping.repository';
+import { generateNanoId } from '@db/utils/generators';
+
+import { randomName } from '../random';
+
+export async function createTag(attributes: Partial<TagEntity> = {}, workflow?: WorkflowEntity) {
+	const { name } = attributes;
+
+	const tag = await Container.get(TagRepository).save({
+		id: generateNanoId(),
+		name: name ?? randomName(),
+		...attributes,
+	});
+
+	if (workflow) {
+		const mappingRepository = Container.get(WorkflowTagMappingRepository);
+		const mapping = mappingRepository.create({ tagId: tag.id, workflowId: workflow.id });
+		await mappingRepository.save(mapping);
+	}
+
+	return tag;
+}
diff --git a/packages/cli/test/integration/shared/db/users.ts b/packages/cli/test/integration/shared/db/users.ts
new file mode 100644
index 0000000000000..4f4ed8af184b9
--- /dev/null
+++ b/packages/cli/test/integration/shared/db/users.ts
@@ -0,0 +1,135 @@
+import Container from 'typedi';
+import { hash } from 'bcryptjs';
+import { AuthIdentity } from '@db/entities/AuthIdentity';
+import type { GlobalRole, User } from '@db/entities/User';
+import { AuthIdentityRepository } from '@db/repositories/authIdentity.repository';
+import { UserRepository } from '@db/repositories/user.repository';
+import { TOTPService } from '@/Mfa/totp.service';
+import { MfaService } from '@/Mfa/mfa.service';
+
+import { randomApiKey, randomEmail, randomName, randomValidPassword } from '../random';
+
+// pre-computed bcrypt hash for the string 'password', using `await hash('password', 10)`
+const passwordHash = '$2a$10$njedH7S6V5898mj6p0Jr..IGY9Ms.qNwR7RbSzzX9yubJocKfvGGK';
+
+/** Store a new user object, defaulting to a `member` */
+export async function newUser(attributes: Partial<User> = {}): Promise<User> {
+	const { email, password, firstName, lastName, role, ...rest } = attributes;
+	return Container.get(UserRepository).create({
+		email: email ?? randomEmail(),
+		password: password ? await hash(password, 1) : passwordHash,
+		firstName: firstName ?? randomName(),
+		lastName: lastName ?? randomName(),
+		role: role ?? 'global:member',
+		...rest,
+	});
+}
+
+/** Store a user object in the DB */
+export async function createUser(attributes: Partial<User> = {}): Promise<User> {
+	const user = await newUser(attributes);
+	user.computeIsOwner();
+	return await Container.get(UserRepository).save(user);
+}
+
+export async function createLdapUser(attributes: Partial<User>, ldapId: string): Promise<User> {
+	const user = await createUser(attributes);
+	await Container.get(AuthIdentityRepository).save(AuthIdentity.create(user, ldapId, 'ldap'));
+	return user;
+}
+
+export async function createUserWithMfaEnabled(
+	data: { numberOfRecoveryCodes: number } = { numberOfRecoveryCodes: 10 },
+) {
+	const email = randomEmail();
+	const password = randomValidPassword();
+
+	const toptService = new TOTPService();
+
+	const secret = toptService.generateSecret();
+
+	const mfaService = Container.get(MfaService);
+
+	const recoveryCodes = mfaService.generateRecoveryCodes(data.numberOfRecoveryCodes);
+
+	const { encryptedSecret, encryptedRecoveryCodes } = mfaService.encryptSecretAndRecoveryCodes(
+		secret,
+		recoveryCodes,
+	);
+
+	return {
+		user: await createUser({
+			mfaEnabled: true,
+			password,
+			email,
+			mfaSecret: encryptedSecret,
+			mfaRecoveryCodes: encryptedRecoveryCodes,
+		}),
+		rawPassword: password,
+		rawSecret: secret,
+		rawRecoveryCodes: recoveryCodes,
+	};
+}
+
+export async function createOwner() {
+	return await createUser({ role: 'global:owner' });
+}
+
+export async function createMember() {
+	return await createUser({ role: 'global:member' });
+}
+
+export async function createAdmin() {
+	return await createUser({ role: 'global:admin' });
+}
+
+export async function createUserShell(role: GlobalRole): Promise<User> {
+	const shell: Partial<User> = { role };
+
+	if (role !== 'global:owner') {
+		shell.email = randomEmail();
+	}
+
+	return await Container.get(UserRepository).save(shell);
+}
+
+/**
+ * Create many users in the DB, defaulting to a `member`.
+ */
+export async function createManyUsers(
+	amount: number,
+	attributes: Partial<User> = {},
+): Promise<User[]> {
+	const users = await Promise.all(
+		Array(amount)
+			.fill(0)
+			.map(async () => await newUser(attributes)),
+	);
+	return await Container.get(UserRepository).save(users);
+}
+
+export async function addApiKey(user: User): Promise<User> {
+	user.apiKey = randomApiKey();
+	return await Container.get(UserRepository).save(user);
+}
+
+export const getAllUsers = async () =>
+	await Container.get(UserRepository).find({
+		relations: ['authIdentities'],
+	});
+
+export const getUserById = async (id: string) =>
+	await Container.get(UserRepository).findOneOrFail({
+		where: { id },
+		relations: ['authIdentities'],
+	});
+
+export const getLdapIdentities = async () =>
+	await Container.get(AuthIdentityRepository).find({
+		where: { providerType: 'ldap' },
+		relations: ['user'],
+	});
+
+export async function getGlobalOwner() {
+	return await Container.get(UserRepository).findOneByOrFail({ role: 'global:owner' });
+}
diff --git a/packages/cli/test/integration/shared/db/workflowHistory.ts b/packages/cli/test/integration/shared/db/workflowHistory.ts
new file mode 100644
index 0000000000000..ab4109cef77b7
--- /dev/null
+++ b/packages/cli/test/integration/shared/db/workflowHistory.ts
@@ -0,0 +1,44 @@
+import Container from 'typedi';
+import { v4 as uuid } from 'uuid';
+import type { WorkflowHistory } from '@db/entities/WorkflowHistory';
+import { WorkflowHistoryRepository } from '@db/repositories/workflowHistory.repository';
+
+export async function createWorkflowHistoryItem(
+	workflowId: string,
+	data?: Partial<WorkflowHistory>,
+) {
+	return await Container.get(WorkflowHistoryRepository).save({
+		authors: 'John Smith',
+		connections: {},
+		nodes: [
+			{
+				id: 'uuid-1234',
+				name: 'Start',
+				parameters: {},
+				position: [-20, 260],
+				type: 'n8n-nodes-base.start',
+				typeVersion: 1,
+			},
+		],
+		versionId: uuid(),
+		...(data ?? {}),
+		workflowId,
+	});
+}
+
+export async function createManyWorkflowHistoryItems(
+	workflowId: string,
+	count: number,
+	time?: Date,
+) {
+	const baseTime = (time ?? new Date()).valueOf();
+	return await Promise.all(
+		[...Array(count)].map(
+			async (_, i) =>
+				await createWorkflowHistoryItem(workflowId, {
+					createdAt: new Date(baseTime + i),
+					updatedAt: new Date(baseTime + i),
+				}),
+		),
+	);
+}
diff --git a/packages/cli/test/integration/shared/db/workflowStatistics.ts b/packages/cli/test/integration/shared/db/workflowStatistics.ts
new file mode 100644
index 0000000000000..e690cb726afae
--- /dev/null
+++ b/packages/cli/test/integration/shared/db/workflowStatistics.ts
@@ -0,0 +1,21 @@
+import Container from 'typedi';
+import { StatisticsNames, type WorkflowStatistics } from '@/databases/entities/WorkflowStatistics';
+import type { Workflow } from 'n8n-workflow';
+import { WorkflowStatisticsRepository } from '@/databases/repositories/workflowStatistics.repository';
+
+export async function createWorkflowStatisticsItem(
+	workflowId: Workflow['id'],
+	data?: Partial<WorkflowStatistics>,
+) {
+	const entity = Container.get(WorkflowStatisticsRepository).create({
+		count: 0,
+		latestEvent: new Date().toISOString(),
+		name: StatisticsNames.manualSuccess,
+		...(data ?? {}),
+		workflowId,
+	});
+
+	await Container.get(WorkflowStatisticsRepository).insert(entity);
+
+	return entity;
+}
diff --git a/packages/cli/test/integration/shared/db/workflows.ts b/packages/cli/test/integration/shared/db/workflows.ts
new file mode 100644
index 0000000000000..18a97a693b6ba
--- /dev/null
+++ b/packages/cli/test/integration/shared/db/workflows.ts
@@ -0,0 +1,133 @@
+import Container from 'typedi';
+import type { DeepPartial } from '@n8n/typeorm';
+import { v4 as uuid } from 'uuid';
+
+import type { User } from '@db/entities/User';
+import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
+import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
+import { WorkflowRepository } from '@db/repositories/workflow.repository';
+import type { SharedWorkflow } from '@db/entities/SharedWorkflow';
+
+export async function createManyWorkflows(
+	amount: number,
+	attributes: Partial<WorkflowEntity> = {},
+	user?: User,
+) {
+	const workflowRequests = [...Array(amount)].map(
+		async (_) => await createWorkflow(attributes, user),
+	);
+	return await Promise.all(workflowRequests);
+}
+
+export function newWorkflow(attributes: Partial<WorkflowEntity> = {}): WorkflowEntity {
+	const { active, name, nodes, connections, versionId } = attributes;
+
+	const workflowEntity = Container.get(WorkflowRepository).create({
+		active: active ?? false,
+		name: name ?? 'test workflow',
+		nodes: nodes ?? [
+			{
+				id: 'uuid-1234',
+				name: 'Schedule Trigger',
+				parameters: {},
+				position: [-20, 260],
+				type: 'n8n-nodes-base.scheduleTrigger',
+				typeVersion: 1,
+			},
+		],
+		connections: connections ?? {},
+		versionId: versionId ?? uuid(),
+		...attributes,
+	});
+
+	return workflowEntity;
+}
+
+/**
+ * Store a workflow in the DB (without a trigger) and optionally assign it to a user.
+ * @param attributes workflow attributes
+ * @param user user to assign the workflow to
+ */
+export async function createWorkflow(attributes: Partial<WorkflowEntity> = {}, user?: User) {
+	const workflow = await Container.get(WorkflowRepository).save(newWorkflow(attributes));
+
+	if (user) {
+		await Container.get(SharedWorkflowRepository).save({
+			user,
+			workflow,
+			role: 'workflow:owner',
+		});
+	}
+	return workflow;
+}
+
+export async function shareWorkflowWithUsers(workflow: WorkflowEntity, users: User[]) {
+	const sharedWorkflows: Array<DeepPartial<SharedWorkflow>> = users.map((user) => ({
+		userId: user.id,
+		workflowId: workflow.id,
+		role: 'workflow:editor',
+	}));
+	return await Container.get(SharedWorkflowRepository).save(sharedWorkflows);
+}
+
+export async function getWorkflowSharing(workflow: WorkflowEntity) {
+	return await Container.get(SharedWorkflowRepository).findBy({
+		workflowId: workflow.id,
+	});
+}
+
+/**
+ * Store a workflow in the DB (with a trigger) and optionally assign it to a user.
+ * @param user user to assign the workflow to
+ */
+export async function createWorkflowWithTrigger(
+	attributes: Partial<WorkflowEntity> = {},
+	user?: User,
+) {
+	const workflow = await createWorkflow(
+		{
+			nodes: [
+				{
+					id: 'uuid-1',
+					parameters: {},
+					name: 'Start',
+					type: 'n8n-nodes-base.start',
+					typeVersion: 1,
+					position: [240, 300],
+				},
+				{
+					id: 'uuid-2',
+					parameters: { triggerTimes: { item: [{ mode: 'everyMinute' }] } },
+					name: 'Cron',
+					type: 'n8n-nodes-base.cron',
+					typeVersion: 1,
+					position: [500, 300],
+				},
+				{
+					id: 'uuid-3',
+					parameters: { options: {} },
+					name: 'Set',
+					type: 'n8n-nodes-base.set',
+					typeVersion: 1,
+					position: [780, 300],
+				},
+			],
+			connections: { Cron: { main: [[{ node: 'Set', type: 'main', index: 0 }]] } },
+			...attributes,
+		},
+		user,
+	);
+
+	return workflow;
+}
+
+export async function getAllWorkflows() {
+	return await Container.get(WorkflowRepository).find();
+}
+
+export async function getAllSharedWorkflows() {
+	return await Container.get(SharedWorkflowRepository).find();
+}
+
+export const getWorkflowById = async (id: string) =>
+	await Container.get(WorkflowRepository).findOneBy({ id });
diff --git a/packages/cli/test/integration/shared/license.ts b/packages/cli/test/integration/shared/license.ts
new file mode 100644
index 0000000000000..3f9e736153294
--- /dev/null
+++ b/packages/cli/test/integration/shared/license.ts
@@ -0,0 +1,59 @@
+import type { BooleanLicenseFeature, NumericLicenseFeature } from '@/Interfaces';
+import type { License } from '@/License';
+
+export interface LicenseMockDefaults {
+	features?: BooleanLicenseFeature[];
+	quotas?: Partial<{ [K in NumericLicenseFeature]: number }>;
+}
+
+export class LicenseMocker {
+	private _enabledFeatures: Set<BooleanLicenseFeature> = new Set();
+
+	private _defaultFeatures: Set<BooleanLicenseFeature> = new Set();
+
+	private _featureQuotas: Map<NumericLicenseFeature, number> = new Map();
+
+	private _defaultQuotas: Map<NumericLicenseFeature, number> = new Map();
+
+	mock(license: License) {
+		license.isFeatureEnabled = this.isFeatureEnabled.bind(this);
+		license.getFeatureValue = this.getFeatureValue.bind(this);
+	}
+
+	reset() {
+		this._enabledFeatures = new Set(this._defaultFeatures);
+		this._featureQuotas = new Map(this._defaultQuotas);
+	}
+
+	setDefaults(defaults: LicenseMockDefaults) {
+		this._defaultFeatures = new Set(defaults.features ?? []);
+		this._defaultQuotas = new Map(
+			Object.entries(defaults.quotas ?? {}) as Array<[NumericLicenseFeature, number]>,
+		);
+	}
+
+	isFeatureEnabled(feature: BooleanLicenseFeature): boolean {
+		return this._enabledFeatures.has(feature);
+	}
+
+	getFeatureValue(feature: string): boolean | number | undefined {
+		if (this._featureQuotas.has(feature as NumericLicenseFeature)) {
+			return this._featureQuotas.get(feature as NumericLicenseFeature);
+		} else if (this._enabledFeatures.has(feature as BooleanLicenseFeature)) {
+			return true;
+		}
+		return undefined;
+	}
+
+	enable(feature: BooleanLicenseFeature) {
+		this._enabledFeatures.add(feature);
+	}
+
+	disable(feature: BooleanLicenseFeature) {
+		this._enabledFeatures.delete(feature);
+	}
+
+	setQuota(feature: NumericLicenseFeature, quota: number) {
+		this._featureQuotas.set(feature, quota);
+	}
+}
diff --git a/packages/cli/test/integration/shared/random.ts b/packages/cli/test/integration/shared/random.ts
index 876670720d47f..62b5c73ee0a9c 100644
--- a/packages/cli/test/integration/shared/random.ts
+++ b/packages/cli/test/integration/shared/random.ts
@@ -1,5 +1,5 @@
 import { randomBytes } from 'crypto';
-import { MAX_PASSWORD_LENGTH, MIN_PASSWORD_LENGTH } from '@db/entities/User';
+import { MIN_PASSWORD_CHAR_LENGTH, MAX_PASSWORD_CHAR_LENGTH } from '@/constants';
 import type { CredentialPayload } from './types';
 import { v4 as uuid } from 'uuid';
 
@@ -16,7 +16,7 @@ export function randomApiKey() {
 	return `n8n_api_${randomBytes(20).toString('hex')}`;
 }
 
-const chooseRandomly = <T>(array: T[]) => array[Math.floor(Math.random() * array.length)];
+export const chooseRandomly = <T>(array: T[]) => array[Math.floor(Math.random() * array.length)];
 
 export const randomInteger = (max = 1000) => Math.floor(Math.random() * max);
 
@@ -31,14 +31,14 @@ export const randomPositiveDigit = (): number => {
 const randomUppercaseLetter = () => chooseRandomly('ABCDEFGHIJKLMNOPQRSTUVWXYZ'.split(''));
 
 export const randomValidPassword = () =>
-	randomString(MIN_PASSWORD_LENGTH, MAX_PASSWORD_LENGTH - 2) +
+	randomString(MIN_PASSWORD_CHAR_LENGTH, MAX_PASSWORD_CHAR_LENGTH - 2) +
 	randomUppercaseLetter() +
 	randomDigit();
 
 export const randomInvalidPassword = () =>
 	chooseRandomly([
-		randomString(1, MIN_PASSWORD_LENGTH - 1),
-		randomString(MAX_PASSWORD_LENGTH + 2, MAX_PASSWORD_LENGTH + 100),
+		randomString(1, MIN_PASSWORD_CHAR_LENGTH - 1),
+		randomString(MAX_PASSWORD_CHAR_LENGTH + 2, MAX_PASSWORD_CHAR_LENGTH + 100),
 		'abcdefgh', // valid length, no number, no uppercase
 		'abcdefg1', // valid length, has number, no uppercase
 		'abcdefgA', // valid length, no number, has uppercase
@@ -59,7 +59,6 @@ export const randomName = () => randomString(4, 8);
 export const randomCredentialPayload = (): CredentialPayload => ({
 	name: randomName(),
 	type: randomName(),
-	nodesAccess: [{ nodeType: randomName() }],
 	data: { accessToken: randomString(6, 16) },
 });
 
diff --git a/packages/cli/test/integration/shared/testDb.ts b/packages/cli/test/integration/shared/testDb.ts
index 95e7303010622..c5b25f109d21e 100644
--- a/packages/cli/test/integration/shared/testDb.ts
+++ b/packages/cli/test/integration/shared/testDb.ts
@@ -1,587 +1,97 @@
-import { UserSettings } from 'n8n-core';
-import {
-	DataSource as Connection,
-	DataSourceOptions as ConnectionOptions,
-	Repository,
-} from 'typeorm';
+import type { DataSourceOptions, Repository } from '@n8n/typeorm';
+import { DataSource as Connection } from '@n8n/typeorm';
 import { Container } from 'typedi';
+import type { Class } from 'n8n-core';
 
 import config from '@/config';
 import * as Db from '@/Db';
-import { createCredentialsFromCredentialsEntity } from '@/CredentialsHelper';
-import { entities } from '@db/entities';
-import { CredentialsEntity } from '@db/entities/CredentialsEntity';
-import { mysqlMigrations } from '@db/migrations/mysqldb';
-import { postgresMigrations } from '@db/migrations/postgresdb';
-import { sqliteMigrations } from '@db/migrations/sqlite';
-import { hashPassword } from '@/UserManagement/UserManagementHelper';
-import { AuthIdentity } from '@db/entities/AuthIdentity';
-import type { ExecutionEntity } from '@db/entities/ExecutionEntity';
-import { InstalledNodes } from '@db/entities/InstalledNodes';
-import { InstalledPackages } from '@db/entities/InstalledPackages';
-import type { Role } from '@db/entities/Role';
-import type { TagEntity } from '@db/entities/TagEntity';
-import type { User } from '@db/entities/User';
-import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
-import { RoleRepository } from '@db/repositories';
-import { ICredentialsDb } from '@/Interfaces';
+import { getOptionOverrides } from '@db/config';
 
-import { DB_INITIALIZATION_TIMEOUT } from './constants';
-import { randomApiKey, randomEmail, randomName, randomString, randomValidPassword } from './random';
-import { getPostgresSchemaSection } from './utils';
-import type {
-	CollectionName,
-	CredentialPayload,
-	InstalledNodePayload,
-	InstalledPackagePayload,
-} from './types';
+import { randomString } from './random';
 
-export type TestDBType = 'postgres' | 'mysql';
+export const testDbPrefix = 'n8n_test_';
 
 /**
  * Initialize one test DB per suite run, with bootstrap connection if needed.
  */
 export async function init() {
-	jest.setTimeout(DB_INITIALIZATION_TIMEOUT);
 	const dbType = config.getEnv('database.type');
-	const testDbName = `n8n_test_${randomString(6, 10)}_${Date.now()}`;
-
-	if (dbType === 'sqlite') {
-		// no bootstrap connection required
-		return Db.init(getSqliteOptions({ name: testDbName }));
-	}
+	const testDbName = `${testDbPrefix}${randomString(6, 10)}_${Date.now()}`;
 
 	if (dbType === 'postgresdb') {
-		let bootstrapPostgres;
-		const pgOptions = getBootstrapDBOptions('postgres');
-
-		try {
-			bootstrapPostgres = await new Connection(pgOptions).initialize();
-		} catch (error) {
-			const pgConfig = getPostgresSchemaSection();
-
-			if (!pgConfig) throw new Error("Failed to find config schema section for 'postgresdb'");
-
-			const message = [
-				"ERROR: Failed to connect to Postgres default DB 'postgres'",
-				'Please review your Postgres connection options:',
-				`host: ${pgOptions.host} | port: ${pgOptions.port} | schema: ${pgOptions.schema} | username: ${pgOptions.username} | password: ${pgOptions.password}`,
-				'Fix by setting correct values via environment variables:',
-				`${pgConfig.host.env} | ${pgConfig.port.env} | ${pgConfig.schema.env} | ${pgConfig.user.env} | ${pgConfig.password.env}`,
-				'Otherwise, make sure your Postgres server is running.',
-			].join('\n');
-
-			console.error(message);
-
-			process.exit(1);
-		}
-
+		const bootstrapPostgres = await new Connection(
+			getBootstrapDBOptions('postgresdb'),
+		).initialize();
 		await bootstrapPostgres.query(`CREATE DATABASE ${testDbName}`);
 		await bootstrapPostgres.destroy();
 
-		return Db.init(getDBOptions('postgres', testDbName));
-	}
-
-	if (dbType === 'mysqldb') {
-		const bootstrapMysql = await new Connection(getBootstrapDBOptions('mysql')).initialize();
-		await bootstrapMysql.query(`CREATE DATABASE ${testDbName}`);
+		config.set('database.postgresdb.database', testDbName);
+	} else if (dbType === 'mysqldb' || dbType === 'mariadb') {
+		const bootstrapMysql = await new Connection(getBootstrapDBOptions('mysqldb')).initialize();
+		await bootstrapMysql.query(`CREATE DATABASE ${testDbName} DEFAULT CHARACTER SET utf8mb4`);
 		await bootstrapMysql.destroy();
 
-		return Db.init(getDBOptions('mysql', testDbName));
+		config.set('database.mysqldb.database', testDbName);
 	}
 
-	throw new Error(`Unrecognized DB type: ${dbType}`);
+	await Db.init();
+	await Db.migrate();
 }
 
 /**
  * Drop test DB, closing bootstrap connection if existing.
  */
 export async function terminate() {
-	const connection = Db.getConnection();
-	if (connection.isInitialized) await connection.destroy();
-}
+	await Db.close();
+}
+
+// Can't use `Object.keys(entities)` here because some entities have a `Entity` suffix, while the repositories don't
+const repositories = [
+	'AuthIdentity',
+	'AuthProviderSyncHistory',
+	'Credentials',
+	'EventDestinations',
+	'ExecutionData',
+	'ExecutionMetadata',
+	'Execution',
+	'InstalledNodes',
+	'InstalledPackages',
+	'Role',
+	'Settings',
+	'SharedCredentials',
+	'SharedWorkflow',
+	'Tag',
+	'User',
+	'Variables',
+	'Webhook',
+	'Workflow',
+	'WorkflowHistory',
+	'WorkflowStatistics',
+	'WorkflowTagMapping',
+] as const;
 
 /**
  * Truncate specific DB tables in a test DB.
  */
-export async function truncate(collections: CollectionName[]) {
-	for (const collection of collections) {
-		await (Db.collections[collection] as Repository<any>).delete({});
-	}
-}
-
-// ----------------------------------
-//        credential creation
-// ----------------------------------
-
-/**
- * Save a credential to the test DB, sharing it with a user.
- */
-export async function saveCredential(
-	credentialPayload: CredentialPayload,
-	{ user, role }: { user: User; role: Role },
-) {
-	const newCredential = new CredentialsEntity();
-
-	Object.assign(newCredential, credentialPayload);
-
-	const encryptedData = await encryptCredentialData(newCredential);
-
-	Object.assign(newCredential, encryptedData);
-
-	const savedCredential = await Db.collections.Credentials.save(newCredential);
-
-	savedCredential.data = newCredential.data;
-
-	await Db.collections.SharedCredentials.save({
-		user,
-		credentials: savedCredential,
-		role,
-	});
-
-	return savedCredential;
-}
-
-export async function shareCredentialWithUsers(credential: CredentialsEntity, users: User[]) {
-	const role = await Container.get(RoleRepository).findCredentialUserRole();
-	const newSharedCredentials = users.map((user) =>
-		Db.collections.SharedCredentials.create({
-			userId: user.id,
-			credentialsId: credential.id,
-			roleId: role?.id,
-		}),
-	);
-	return Db.collections.SharedCredentials.save(newSharedCredentials);
-}
-
-export function affixRoleToSaveCredential(role: Role) {
-	return async (credentialPayload: CredentialPayload, { user }: { user: User }) =>
-		saveCredential(credentialPayload, { user, role });
-}
-
-// ----------------------------------
-//           user creation
-// ----------------------------------
-
-/**
- * Store a user in the DB, defaulting to a `member`.
- */
-export async function createUser(attributes: Partial<User> = {}): Promise<User> {
-	const { email, password, firstName, lastName, globalRole, ...rest } = attributes;
-	const user: Partial<User> = {
-		email: email ?? randomEmail(),
-		password: await hashPassword(password ?? randomValidPassword()),
-		firstName: firstName ?? randomName(),
-		lastName: lastName ?? randomName(),
-		globalRoleId: (globalRole ?? (await getGlobalMemberRole())).id,
-		...rest,
-	};
-
-	return Db.collections.User.save(user);
-}
-
-export async function createLdapUser(attributes: Partial<User>, ldapId: string): Promise<User> {
-	const user = await createUser(attributes);
-	await Db.collections.AuthIdentity.save(AuthIdentity.create(user, ldapId, 'ldap'));
-	return user;
-}
-
-export async function createOwner() {
-	return createUser({ globalRole: await getGlobalOwnerRole() });
-}
-
-export async function createUserShell(globalRole: Role): Promise<User> {
-	if (globalRole.scope !== 'global') {
-		throw new Error(`Invalid role received: ${JSON.stringify(globalRole)}`);
-	}
-
-	const shell: Partial<User> = { globalRoleId: globalRole.id };
-
-	if (globalRole.name !== 'owner') {
-		shell.email = randomEmail();
-	}
-
-	return Db.collections.User.save(shell);
-}
-
-/**
- * Create many users in the DB, defaulting to a `member`.
- */
-export async function createManyUsers(
-	amount: number,
-	attributes: Partial<User> = {},
-): Promise<User[]> {
-	let { email, password, firstName, lastName, globalRole, ...rest } = attributes;
-	if (!globalRole) {
-		globalRole = await getGlobalMemberRole();
-	}
-
-	const users = await Promise.all(
-		[...Array(amount)].map(async () =>
-			Db.collections.User.create({
-				email: email ?? randomEmail(),
-				password: await hashPassword(password ?? randomValidPassword()),
-				firstName: firstName ?? randomName(),
-				lastName: lastName ?? randomName(),
-				globalRole,
-				...rest,
-			}),
-		),
-	);
-
-	return Db.collections.User.save(users);
-}
-
-// --------------------------------------
-// Installed nodes and packages creation
-// --------------------------------------
-
-export async function saveInstalledPackage(
-	installedPackagePayload: InstalledPackagePayload,
-): Promise<InstalledPackages> {
-	const newInstalledPackage = new InstalledPackages();
-
-	Object.assign(newInstalledPackage, installedPackagePayload);
-
-	const savedInstalledPackage = await Db.collections.InstalledPackages.save(newInstalledPackage);
-	return savedInstalledPackage;
-}
-
-export async function saveInstalledNode(
-	installedNodePayload: InstalledNodePayload,
-): Promise<InstalledNodes> {
-	const newInstalledNode = new InstalledNodes();
-
-	Object.assign(newInstalledNode, installedNodePayload);
-
-	return Db.collections.InstalledNodes.save(newInstalledNode);
-}
-
-export async function addApiKey(user: User): Promise<User> {
-	user.apiKey = randomApiKey();
-	return Db.collections.User.save(user);
-}
-
-// ----------------------------------
-//          role fetchers
-// ----------------------------------
-
-export async function getGlobalOwnerRole() {
-	return Container.get(RoleRepository).findGlobalOwnerRoleOrFail();
-}
-
-export async function getGlobalMemberRole() {
-	return Container.get(RoleRepository).findGlobalMemberRoleOrFail();
-}
-
-export async function getWorkflowOwnerRole() {
-	return Container.get(RoleRepository).findWorkflowOwnerRoleOrFail();
-}
-
-export async function getWorkflowEditorRole() {
-	return Container.get(RoleRepository).findWorkflowEditorRoleOrFail();
-}
-
-export async function getCredentialOwnerRole() {
-	return Container.get(RoleRepository).findCredentialOwnerRoleOrFail();
-}
-
-export async function getAllRoles() {
-	return Promise.all([
-		getGlobalOwnerRole(),
-		getGlobalMemberRole(),
-		getWorkflowOwnerRole(),
-		getCredentialOwnerRole(),
-	]);
-}
-
-export const getAllUsers = async () =>
-	Db.collections.User.find({
-		relations: ['globalRole', 'authIdentities'],
-	});
-
-export const getLdapIdentities = async () =>
-	Db.collections.AuthIdentity.find({
-		where: { providerType: 'ldap' },
-		relations: ['user'],
-	});
-
-// ----------------------------------
-//          Execution helpers
-// ----------------------------------
-
-export async function createManyExecutions(
-	amount: number,
-	workflow: WorkflowEntity,
-	callback: (workflow: WorkflowEntity) => Promise<ExecutionEntity>,
-) {
-	const executionsRequests = [...Array(amount)].map(async (_) => callback(workflow));
-	return Promise.all(executionsRequests);
-}
-
-/**
- * Store a execution in the DB and assign it to a workflow.
- */
-async function createExecution(attributes: Partial<ExecutionEntity>, workflow: WorkflowEntity) {
-	const { data, finished, mode, startedAt, stoppedAt, waitTill } = attributes;
-
-	const execution = await Db.collections.Execution.save({
-		data: data ?? '[]',
-		finished: finished ?? true,
-		mode: mode ?? 'manual',
-		startedAt: startedAt ?? new Date(),
-		...(workflow !== undefined && { workflowData: workflow, workflowId: workflow.id }),
-		stoppedAt: stoppedAt ?? new Date(),
-		waitTill: waitTill ?? null,
-	});
-
-	return execution;
-}
-
-/**
- * Store a successful execution in the DB and assign it to a workflow.
- */
-export async function createSuccessfulExecution(workflow: WorkflowEntity) {
-	return createExecution({ finished: true }, workflow);
-}
-
-/**
- * Store an error execution in the DB and assign it to a workflow.
- */
-export async function createErrorExecution(workflow: WorkflowEntity) {
-	return createExecution({ finished: false, stoppedAt: new Date() }, workflow);
-}
-
-/**
- * Store a waiting execution in the DB and assign it to a workflow.
- */
-export async function createWaitingExecution(workflow: WorkflowEntity) {
-	return createExecution({ finished: false, waitTill: new Date() }, workflow);
-}
-
-// ----------------------------------
-//          Tags
-// ----------------------------------
-
-export async function createTag(attributes: Partial<TagEntity> = {}) {
-	const { name } = attributes;
-
-	return Db.collections.Tag.save({
-		name: name ?? randomName(),
-		...attributes,
-	});
-}
-
-// ----------------------------------
-//          Workflow helpers
-// ----------------------------------
-
-export async function createManyWorkflows(
-	amount: number,
-	attributes: Partial<WorkflowEntity> = {},
-	user?: User,
-) {
-	const workflowRequests = [...Array(amount)].map(async (_) => createWorkflow(attributes, user));
-	return Promise.all(workflowRequests);
-}
-
-/**
- * Store a workflow in the DB (without a trigger) and optionally assign it to a user.
- * @param attributes workflow attributes
- * @param user user to assign the workflow to
- */
-export async function createWorkflow(attributes: Partial<WorkflowEntity> = {}, user?: User) {
-	const { active, name, nodes, connections } = attributes;
-
-	const workflow = await Db.collections.Workflow.save({
-		active: active ?? false,
-		name: name ?? 'test workflow',
-		nodes: nodes ?? [
-			{
-				id: 'uuid-1234',
-				name: 'Start',
-				parameters: {},
-				position: [-20, 260],
-				type: 'n8n-nodes-base.start',
-				typeVersion: 1,
-			},
-		],
-		connections: connections ?? {},
-		...attributes,
-	});
-
-	if (user) {
-		await Db.collections.SharedWorkflow.save({
-			user,
-			workflow,
-			role: await getWorkflowOwnerRole(),
-		});
+export async function truncate(names: Array<(typeof repositories)[number]>) {
+	for (const name of names) {
+		const RepositoryClass: Class<Repository<object>> = (
+			await import(`@db/repositories/${name.charAt(0).toLowerCase() + name.slice(1)}.repository`)
+		)[`${name}Repository`];
+		await Container.get(RepositoryClass).delete({});
 	}
-	return workflow;
-}
-
-export async function shareWorkflowWithUsers(workflow: WorkflowEntity, users: User[]) {
-	const role = await getWorkflowEditorRole();
-	const sharedWorkflows = users.map((user) => ({
-		user,
-		workflow,
-		role,
-	}));
-	return Db.collections.SharedWorkflow.save(sharedWorkflows);
 }
 
 /**
- * Store a workflow in the DB (with a trigger) and optionally assign it to a user.
- * @param user user to assign the workflow to
- */
-export async function createWorkflowWithTrigger(
-	attributes: Partial<WorkflowEntity> = {},
-	user?: User,
-) {
-	const workflow = await createWorkflow(
-		{
-			nodes: [
-				{
-					id: 'uuid-1',
-					parameters: {},
-					name: 'Start',
-					type: 'n8n-nodes-base.start',
-					typeVersion: 1,
-					position: [240, 300],
-				},
-				{
-					id: 'uuid-2',
-					parameters: { triggerTimes: { item: [{ mode: 'everyMinute' }] } },
-					name: 'Cron',
-					type: 'n8n-nodes-base.cron',
-					typeVersion: 1,
-					position: [500, 300],
-				},
-				{
-					id: 'uuid-3',
-					parameters: { options: {} },
-					name: 'Set',
-					type: 'n8n-nodes-base.set',
-					typeVersion: 1,
-					position: [780, 300],
-				},
-			],
-			connections: { Cron: { main: [[{ node: 'Set', type: 'main', index: 0 }]] } },
-			...attributes,
-		},
-		user,
-	);
-
-	return workflow;
-}
-
-export async function getAllWorkflows() {
-	return Db.collections.Workflow.find();
-}
-
-// ----------------------------------
-//        workflow sharing
-// ----------------------------------
-
-export async function getWorkflowSharing(workflow: WorkflowEntity) {
-	return Db.collections.SharedWorkflow.findBy({
-		workflowId: workflow.id,
-	});
-}
-
-// ----------------------------------
-//             variables
-// ----------------------------------
-
-export async function createVariable(key: string, value: string) {
-	return Db.collections.Variables.save({
-		key,
-		value,
-	});
-}
-
-export async function getVariableByKey(key: string) {
-	return Db.collections.Variables.findOne({
-		where: {
-			key,
-		},
-	});
-}
-
-export async function getVariableById(id: number) {
-	return Db.collections.Variables.findOne({
-		where: {
-			id,
-		},
-	});
-}
-
-// ----------------------------------
-//        connection options
-// ----------------------------------
-
-/**
- * Generate options for an in-memory sqlite database connection,
- * one per test suite run.
+ * Generate options for a bootstrap DB connection, to create and drop test databases.
  */
-export const getSqliteOptions = ({ name }: { name: string }): ConnectionOptions => {
+export const getBootstrapDBOptions = (dbType: 'postgresdb' | 'mysqldb'): DataSourceOptions => {
+	const type = dbType === 'postgresdb' ? 'postgres' : 'mysql';
 	return {
-		name,
-		type: 'sqlite',
-		database: ':memory:',
+		type,
+		...getOptionOverrides(dbType),
+		database: type,
 		entityPrefix: config.getEnv('database.tablePrefix'),
-		dropSchema: true,
-		migrations: sqliteMigrations,
-		migrationsTableName: 'migrations',
-		migrationsRun: false,
+		schema: dbType === 'postgresdb' ? config.getEnv('database.postgresdb.schema') : undefined,
 	};
 };
-
-const baseOptions = (type: TestDBType) => ({
-	host: config.getEnv(`database.${type}db.host`),
-	port: config.getEnv(`database.${type}db.port`),
-	username: config.getEnv(`database.${type}db.user`),
-	password: config.getEnv(`database.${type}db.password`),
-	entityPrefix: config.getEnv('database.tablePrefix'),
-	schema: type === 'postgres' ? config.getEnv('database.postgresdb.schema') : undefined,
-});
-
-/**
- * Generate options for a bootstrap DB connection, to create and drop test databases.
- */
-export const getBootstrapDBOptions = (type: TestDBType) =>
-	({
-		type,
-		name: type,
-		database: type,
-		...baseOptions(type),
-	} as const);
-
-const getDBOptions = (type: TestDBType, name: string) => ({
-	type,
-	name,
-	database: name,
-	...baseOptions(type),
-	dropSchema: true,
-	migrations: type === 'postgres' ? postgresMigrations : mysqlMigrations,
-	migrationsRun: false,
-	migrationsTableName: 'migrations',
-	entities: Object.values(entities),
-	synchronize: false,
-	logging: false,
-});
-
-// ----------------------------------
-//            encryption
-// ----------------------------------
-
-async function encryptCredentialData(credential: CredentialsEntity) {
-	const encryptionKey = await UserSettings.getEncryptionKey();
-
-	const coreCredential = createCredentialsFromCredentialsEntity(credential, true);
-
-	// @ts-ignore
-	coreCredential.setData(credential.data, encryptionKey);
-
-	return coreCredential.getDataToSave() as ICredentialsDb;
-}
diff --git a/packages/cli/test/integration/shared/types.d.ts b/packages/cli/test/integration/shared/types.d.ts
deleted file mode 100644
index 62dfcd3a874f3..0000000000000
--- a/packages/cli/test/integration/shared/types.d.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import type { ICredentialDataDecryptedObject, ICredentialNodeAccess } from 'n8n-workflow';
-import type { SuperAgentTest } from 'supertest';
-
-import type { CredentialsEntity } from '@db/entities/CredentialsEntity';
-import type { User } from '@db/entities/User';
-import type { ICredentialsDb, IDatabaseCollections } from '@/Interfaces';
-
-export type CollectionName = keyof IDatabaseCollections;
-
-export type ApiPath = 'internal' | 'public';
-
-export type AuthAgent = (user: User) => SuperAgentTest;
-
-type EndpointGroup =
-	| 'me'
-	| 'users'
-	| 'auth'
-	| 'owner'
-	| 'passwordReset'
-	| 'credentials'
-	| 'workflows'
-	| 'publicApi'
-	| 'nodes'
-	| 'ldap'
-	| 'saml'
-	| 'versionControl'
-	| 'eventBus'
-	| 'license'
-	| 'variables';
-
-export type CredentialPayload = {
-	name: string;
-	type: string;
-	nodesAccess?: ICredentialNodeAccess[];
-	data: ICredentialDataDecryptedObject;
-};
-
-export type SaveCredentialFunction = (
-	credentialPayload: CredentialPayload,
-	{ user }: { user: User },
-) => Promise<CredentialsEntity & ICredentialsDb>;
-
-export type PostgresSchemaSection = {
-	[K in 'host' | 'port' | 'schema' | 'user' | 'password']: { env: string };
-};
-
-export type InstalledPackagePayload = {
-	packageName: string;
-	installedVersion: string;
-};
-
-export type InstalledNodePayload = {
-	name: string;
-	type: string;
-	latestVersion: number;
-	package: string;
-};
diff --git a/packages/cli/test/integration/shared/types.ts b/packages/cli/test/integration/shared/types.ts
new file mode 100644
index 0000000000000..8355d6f39c3f0
--- /dev/null
+++ b/packages/cli/test/integration/shared/types.ts
@@ -0,0 +1,61 @@
+import type { Application } from 'express';
+import type { ICredentialDataDecryptedObject } from 'n8n-workflow';
+import type { SuperAgentTest } from 'supertest';
+import type { Server } from 'http';
+
+import type { CredentialsEntity } from '@db/entities/CredentialsEntity';
+import type { User } from '@db/entities/User';
+import type { BooleanLicenseFeature, ICredentialsDb, NumericLicenseFeature } from '@/Interfaces';
+import type { LicenseMocker } from './license';
+
+type EndpointGroup =
+	| 'me'
+	| 'users'
+	| 'auth'
+	| 'owner'
+	| 'passwordReset'
+	| 'credentials'
+	| 'workflows'
+	| 'publicApi'
+	| 'community-packages'
+	| 'ldap'
+	| 'saml'
+	| 'sourceControl'
+	| 'eventBus'
+	| 'license'
+	| 'variables'
+	| 'tags'
+	| 'externalSecrets'
+	| 'mfa'
+	| 'metrics'
+	| 'executions'
+	| 'workflowHistory'
+	| 'binaryData'
+	| 'invitations'
+	| 'debug';
+
+export interface SetupProps {
+	endpointGroups?: EndpointGroup[];
+	enabledFeatures?: BooleanLicenseFeature[];
+	quotas?: Partial<{ [K in NumericLicenseFeature]: number }>;
+}
+
+export interface TestServer {
+	app: Application;
+	httpServer: Server;
+	authAgentFor: (user: User) => SuperAgentTest;
+	publicApiAgentFor: (user: User) => SuperAgentTest;
+	authlessAgent: SuperAgentTest;
+	license: LicenseMocker;
+}
+
+export type CredentialPayload = {
+	name: string;
+	type: string;
+	data: ICredentialDataDecryptedObject;
+};
+
+export type SaveCredentialFunction = (
+	credentialPayload: CredentialPayload,
+	{ user }: { user: User },
+) => Promise<CredentialsEntity & ICredentialsDb>;
diff --git a/packages/cli/test/integration/shared/utils.ts b/packages/cli/test/integration/shared/utils.ts
deleted file mode 100644
index 9e8e4aa2b1ab8..0000000000000
--- a/packages/cli/test/integration/shared/utils.ts
+++ /dev/null
@@ -1,846 +0,0 @@
-import { Container } from 'typedi';
-import { randomBytes } from 'crypto';
-import { existsSync } from 'fs';
-
-import bodyParser from 'body-parser';
-import { CronJob } from 'cron';
-import express from 'express';
-import set from 'lodash.set';
-import { BinaryDataManager, UserSettings } from 'n8n-core';
-import {
-	ICredentialType,
-	IDataObject,
-	IExecuteFunctions,
-	INode,
-	INodeExecutionData,
-	INodeParameters,
-	ITriggerFunctions,
-	ITriggerResponse,
-	LoggerProxy,
-	NodeHelpers,
-	toCronExpression,
-	TriggerTime,
-} from 'n8n-workflow';
-import superagent from 'superagent';
-import request from 'supertest';
-import { URL } from 'url';
-import { mock } from 'jest-mock-extended';
-import { DeepPartial } from 'ts-essentials';
-import config from '@/config';
-import * as Db from '@/Db';
-import { WorkflowEntity } from '@db/entities/WorkflowEntity';
-import { ExternalHooks } from '@/ExternalHooks';
-import { ActiveWorkflowRunner } from '@/ActiveWorkflowRunner';
-import { workflowsController } from '@/workflows/workflows.controller';
-import { AUTH_COOKIE_NAME, NODE_PACKAGE_PREFIX } from '@/constants';
-import { credentialsController } from '@/credentials/credentials.controller';
-import { InstalledPackages } from '@db/entities/InstalledPackages';
-import type { User } from '@db/entities/User';
-import { getLogger } from '@/Logger';
-import { loadPublicApiVersions } from '@/PublicApi/';
-import { issueJWT } from '@/auth/jwt';
-import { UserManagementMailer } from '@/UserManagement/email/UserManagementMailer';
-import {
-	AUTHLESS_ENDPOINTS,
-	COMMUNITY_NODE_VERSION,
-	COMMUNITY_PACKAGE_VERSION,
-	PUBLIC_API_REST_PATH_SEGMENT,
-	REST_PATH_SEGMENT,
-} from './constants';
-import { randomName } from './random';
-import type {
-	ApiPath,
-	EndpointGroup,
-	InstalledNodePayload,
-	InstalledPackagePayload,
-	PostgresSchemaSection,
-} from './types';
-import { licenseController } from '@/license/license.controller';
-import { registerController } from '@/decorators';
-import {
-	AuthController,
-	LdapController,
-	MeController,
-	NodesController,
-	OwnerController,
-	PasswordResetController,
-	UsersController,
-} from '@/controllers';
-import { setupAuthMiddlewares } from '@/middlewares';
-import * as testDb from '../shared/testDb';
-
-import { v4 as uuid } from 'uuid';
-import { InternalHooks } from '@/InternalHooks';
-import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
-import { PostHogClient } from '@/posthog';
-import { variablesController } from '@/environments/variables/variables.controller';
-import { LdapManager } from '@/Ldap/LdapManager.ee';
-import { handleLdapInit } from '@/Ldap/helpers';
-import { Push } from '@/push';
-import { setSamlLoginEnabled } from '@/sso/saml/samlHelpers';
-import { SamlService } from '@/sso/saml/saml.service.ee';
-import { SamlController } from '@/sso/saml/routes/saml.controller.ee';
-import { EventBusController } from '@/eventbus/eventBus.controller';
-import { License } from '@/License';
-import { VersionControlService } from '@/environments/versionControl/versionControl.service.ee';
-import { VersionControlController } from '@/environments/versionControl/versionControl.controller.ee';
-
-export const mockInstance = <T>(
-	ctor: new (...args: any[]) => T,
-	data: DeepPartial<T> | undefined = undefined,
-) => {
-	const instance = mock<T>(data);
-	Container.set(ctor, instance);
-	return instance;
-};
-
-/**
- * Initialize a test server.
- */
-export async function initTestServer({
-	applyAuth = true,
-	endpointGroups,
-	enablePublicAPI = false,
-}: {
-	applyAuth?: boolean;
-	endpointGroups?: EndpointGroup[];
-	enablePublicAPI?: boolean;
-}) {
-	await testDb.init();
-	const testServer = {
-		app: express(),
-		restEndpoint: REST_PATH_SEGMENT,
-		publicApiEndpoint: PUBLIC_API_REST_PATH_SEGMENT,
-		externalHooks: {},
-	};
-
-	const logger = getLogger();
-	LoggerProxy.init(logger);
-
-	// Mock all telemetry.
-	mockInstance(InternalHooks);
-	mockInstance(PostHogClient);
-
-	testServer.app.use(bodyParser.json());
-	testServer.app.use(bodyParser.urlencoded({ extended: true }));
-
-	config.set('userManagement.jwtSecret', 'My JWT secret');
-	config.set('userManagement.isInstanceOwnerSetUp', false);
-
-	if (applyAuth) {
-		setupAuthMiddlewares(
-			testServer.app,
-			AUTHLESS_ENDPOINTS,
-			REST_PATH_SEGMENT,
-			Db.collections.User,
-		);
-	}
-
-	if (!endpointGroups) return testServer.app;
-
-	if (
-		endpointGroups.includes('credentials') ||
-		endpointGroups.includes('me') ||
-		endpointGroups.includes('users') ||
-		endpointGroups.includes('passwordReset')
-	) {
-		testServer.externalHooks = Container.get(ExternalHooks);
-	}
-
-	const [routerEndpoints, functionEndpoints] = classifyEndpointGroups(endpointGroups);
-
-	if (routerEndpoints.length) {
-		const map: Record<string, express.Router | express.Router[] | any> = {
-			credentials: { controller: credentialsController, path: 'credentials' },
-			workflows: { controller: workflowsController, path: 'workflows' },
-			license: { controller: licenseController, path: 'license' },
-			variables: { controller: variablesController, path: 'variables' },
-		};
-
-		if (enablePublicAPI) {
-			const { apiRouters } = await loadPublicApiVersions(testServer.publicApiEndpoint);
-			map.publicApi = apiRouters;
-		}
-
-		for (const group of routerEndpoints) {
-			if (group === 'publicApi') {
-				testServer.app.use(...(map[group] as express.Router[]));
-			} else {
-				testServer.app.use(`/${testServer.restEndpoint}/${map[group].path}`, map[group].controller);
-			}
-		}
-	}
-
-	if (functionEndpoints.length) {
-		const externalHooks = Container.get(ExternalHooks);
-		const internalHooks = Container.get(InternalHooks);
-		const mailer = Container.get(UserManagementMailer);
-		const repositories = Db.collections;
-
-		for (const group of functionEndpoints) {
-			switch (group) {
-				case 'eventBus':
-					registerController(testServer.app, config, new EventBusController());
-					break;
-				case 'auth':
-					registerController(
-						testServer.app,
-						config,
-						new AuthController({ config, logger, internalHooks, repositories }),
-					);
-					break;
-				case 'ldap':
-					Container.get(License).isLdapEnabled = () => true;
-					await handleLdapInit();
-					const { service, sync } = LdapManager.getInstance();
-					registerController(
-						testServer.app,
-						config,
-						new LdapController(service, sync, internalHooks),
-					);
-					break;
-				case 'saml':
-					await setSamlLoginEnabled(true);
-					const samlService = Container.get(SamlService);
-					registerController(testServer.app, config, new SamlController(samlService));
-					break;
-				case 'versionControl':
-					const versionControlService = Container.get(VersionControlService);
-					registerController(
-						testServer.app,
-						config,
-						new VersionControlController(versionControlService),
-					);
-					break;
-				case 'nodes':
-					registerController(
-						testServer.app,
-						config,
-						new NodesController(
-							config,
-							Container.get(LoadNodesAndCredentials),
-							Container.get(Push),
-							internalHooks,
-						),
-					);
-				case 'me':
-					registerController(
-						testServer.app,
-						config,
-						new MeController({ logger, externalHooks, internalHooks, repositories }),
-					);
-					break;
-				case 'passwordReset':
-					registerController(
-						testServer.app,
-						config,
-						new PasswordResetController({
-							config,
-							logger,
-							externalHooks,
-							internalHooks,
-							mailer,
-							repositories,
-						}),
-					);
-					break;
-				case 'owner':
-					registerController(
-						testServer.app,
-						config,
-						new OwnerController({ config, logger, internalHooks, repositories }),
-					);
-					break;
-				case 'users':
-					registerController(
-						testServer.app,
-						config,
-						new UsersController({
-							config,
-							mailer,
-							externalHooks,
-							internalHooks,
-							repositories,
-							activeWorkflowRunner: Container.get(ActiveWorkflowRunner),
-							logger,
-						}),
-					);
-			}
-		}
-	}
-
-	return testServer.app;
-}
-
-/**
- * Classify endpoint groups into `routerEndpoints` (newest, using `express.Router`),
- * and `functionEndpoints` (legacy, namespaced inside a function).
- */
-const classifyEndpointGroups = (endpointGroups: EndpointGroup[]) => {
-	const routerEndpoints: EndpointGroup[] = [];
-	const functionEndpoints: EndpointGroup[] = [];
-
-	const ROUTER_GROUP = ['credentials', 'workflows', 'publicApi', 'license', 'variables'];
-
-	endpointGroups.forEach((group) =>
-		(ROUTER_GROUP.includes(group) ? routerEndpoints : functionEndpoints).push(group),
-	);
-
-	return [routerEndpoints, functionEndpoints];
-};
-
-// ----------------------------------
-//          initializers
-// ----------------------------------
-
-/**
- * Initialize node types.
- */
-export async function initActiveWorkflowRunner(): Promise<ActiveWorkflowRunner> {
-	const workflowRunner = Container.get(ActiveWorkflowRunner);
-	workflowRunner.init();
-	return workflowRunner;
-}
-
-export function gitHubCredentialType(): ICredentialType {
-	return {
-		name: 'githubApi',
-		displayName: 'Github API',
-		documentationUrl: 'github',
-		properties: [
-			{
-				displayName: 'Github Server',
-				name: 'server',
-				type: 'string',
-				default: 'https://api.github.com',
-				required: true,
-				description: 'The server to connect to. Only has to be set if Github Enterprise is used.',
-			},
-			{
-				displayName: 'User',
-				name: 'user',
-				type: 'string',
-				required: true,
-				default: '',
-			},
-			{
-				displayName: 'Access Token',
-				name: 'accessToken',
-				type: 'string',
-				required: true,
-				default: '',
-			},
-		],
-	};
-}
-
-/**
- * Initialize node types.
- */
-export async function initCredentialsTypes(): Promise<void> {
-	Container.get(LoadNodesAndCredentials).loaded.credentials = {
-		githubApi: {
-			type: gitHubCredentialType(),
-			sourcePath: '',
-		},
-	};
-}
-
-/**
- * Initialize node types.
- */
-export async function initNodeTypes() {
-	Container.get(LoadNodesAndCredentials).loaded.nodes = {
-		'n8n-nodes-base.start': {
-			sourcePath: '',
-			type: {
-				description: {
-					displayName: 'Start',
-					name: 'start',
-					group: ['input'],
-					version: 1,
-					description: 'Starts the workflow execution from this node',
-					defaults: {
-						name: 'Start',
-						color: '#553399',
-					},
-					inputs: [],
-					outputs: ['main'],
-					properties: [],
-				},
-				execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
-					const items = this.getInputData();
-
-					return this.prepareOutputData(items);
-				},
-			},
-		},
-		'n8n-nodes-base.cron': {
-			sourcePath: '',
-			type: {
-				description: {
-					displayName: 'Cron',
-					name: 'cron',
-					icon: 'fa:calendar',
-					group: ['trigger', 'schedule'],
-					version: 1,
-					description: 'Triggers the workflow at a specific time',
-					eventTriggerDescription: '',
-					activationMessage:
-						'Your cron trigger will now trigger executions on the schedule you have defined.',
-					defaults: {
-						name: 'Cron',
-						color: '#00FF00',
-					},
-					inputs: [],
-					outputs: ['main'],
-					properties: [
-						{
-							displayName: 'Trigger Times',
-							name: 'triggerTimes',
-							type: 'fixedCollection',
-							typeOptions: {
-								multipleValues: true,
-								multipleValueButtonText: 'Add Time',
-							},
-							default: {},
-							description: 'Triggers for the workflow',
-							placeholder: 'Add Cron Time',
-							options: NodeHelpers.cronNodeOptions,
-						},
-					],
-				},
-				async trigger(this: ITriggerFunctions): Promise<ITriggerResponse> {
-					const triggerTimes = this.getNodeParameter('triggerTimes') as unknown as {
-						item: TriggerTime[];
-					};
-
-					// Get all the trigger times
-					const cronTimes = (triggerTimes.item || []).map(toCronExpression);
-
-					// The trigger function to execute when the cron-time got reached
-					// or when manually triggered
-					const executeTrigger = () => {
-						this.emit([this.helpers.returnJsonArray([{}])]);
-					};
-
-					const timezone = this.getTimezone();
-
-					// Start the cron-jobs
-					const cronJobs = cronTimes.map(
-						(cronTime) => new CronJob(cronTime, executeTrigger, undefined, true, timezone),
-					);
-
-					// Stop the cron-jobs
-					async function closeFunction() {
-						for (const cronJob of cronJobs) {
-							cronJob.stop();
-						}
-					}
-
-					async function manualTriggerFunction() {
-						executeTrigger();
-					}
-
-					return {
-						closeFunction,
-						manualTriggerFunction,
-					};
-				},
-			},
-		},
-		'n8n-nodes-base.set': {
-			sourcePath: '',
-			type: {
-				description: {
-					displayName: 'Set',
-					name: 'set',
-					icon: 'fa:pen',
-					group: ['input'],
-					version: 1,
-					description: 'Sets values on items and optionally remove other values',
-					defaults: {
-						name: 'Set',
-						color: '#0000FF',
-					},
-					inputs: ['main'],
-					outputs: ['main'],
-					properties: [
-						{
-							displayName: 'Keep Only Set',
-							name: 'keepOnlySet',
-							type: 'boolean',
-							default: false,
-							description:
-								'If only the values set on this node should be kept and all others removed.',
-						},
-						{
-							displayName: 'Values to Set',
-							name: 'values',
-							placeholder: 'Add Value',
-							type: 'fixedCollection',
-							typeOptions: {
-								multipleValues: true,
-								sortable: true,
-							},
-							description: 'The value to set.',
-							default: {},
-							options: [
-								{
-									name: 'boolean',
-									displayName: 'Boolean',
-									values: [
-										{
-											displayName: 'Name',
-											name: 'name',
-											type: 'string',
-											default: 'propertyName',
-											description:
-												'Name of the property to write data to. Supports dot-notation. Example: "data.person[0].name"',
-										},
-										{
-											displayName: 'Value',
-											name: 'value',
-											type: 'boolean',
-											default: false,
-											description: 'The boolean value to write in the property.',
-										},
-									],
-								},
-								{
-									name: 'number',
-									displayName: 'Number',
-									values: [
-										{
-											displayName: 'Name',
-											name: 'name',
-											type: 'string',
-											default: 'propertyName',
-											description:
-												'Name of the property to write data to. Supports dot-notation. Example: "data.person[0].name"',
-										},
-										{
-											displayName: 'Value',
-											name: 'value',
-											type: 'number',
-											default: 0,
-											description: 'The number value to write in the property.',
-										},
-									],
-								},
-								{
-									name: 'string',
-									displayName: 'String',
-									values: [
-										{
-											displayName: 'Name',
-											name: 'name',
-											type: 'string',
-											default: 'propertyName',
-											description:
-												'Name of the property to write data to. Supports dot-notation. Example: "data.person[0].name"',
-										},
-										{
-											displayName: 'Value',
-											name: 'value',
-											type: 'string',
-											default: '',
-											description: 'The string value to write in the property.',
-										},
-									],
-								},
-							],
-						},
-
-						{
-							displayName: 'Options',
-							name: 'options',
-							type: 'collection',
-							placeholder: 'Add Option',
-							default: {},
-							options: [
-								{
-									displayName: 'Dot Notation',
-									name: 'dotNotation',
-									type: 'boolean',
-									default: true,
-									description: `<p>By default, dot-notation is used in property names. This means that "a.b" will set the property "b" underneath "a" so { "a": { "b": value} }.<p></p>If that is not intended this can be deactivated, it will then set { "a.b": value } instead.</p>
-									`,
-								},
-							],
-						},
-					],
-				},
-				execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
-					const items = this.getInputData();
-
-					if (items.length === 0) {
-						items.push({ json: {} });
-					}
-
-					const returnData: INodeExecutionData[] = [];
-
-					let item: INodeExecutionData;
-					let keepOnlySet: boolean;
-					for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
-						keepOnlySet = this.getNodeParameter('keepOnlySet', itemIndex, false) as boolean;
-						item = items[itemIndex];
-						const options = this.getNodeParameter('options', itemIndex, {}) as IDataObject;
-
-						const newItem: INodeExecutionData = {
-							json: {},
-						};
-
-						if (keepOnlySet !== true) {
-							if (item.binary !== undefined) {
-								// Create a shallow copy of the binary data so that the old
-								// data references which do not get changed still stay behind
-								// but the incoming data does not get changed.
-								newItem.binary = {};
-								Object.assign(newItem.binary, item.binary);
-							}
-
-							newItem.json = JSON.parse(JSON.stringify(item.json));
-						}
-
-						// Add boolean values
-						(this.getNodeParameter('values.boolean', itemIndex, []) as INodeParameters[]).forEach(
-							(setItem) => {
-								if (options.dotNotation === false) {
-									newItem.json[setItem.name as string] = !!setItem.value;
-								} else {
-									set(newItem.json, setItem.name as string, !!setItem.value);
-								}
-							},
-						);
-
-						// Add number values
-						(this.getNodeParameter('values.number', itemIndex, []) as INodeParameters[]).forEach(
-							(setItem) => {
-								if (options.dotNotation === false) {
-									newItem.json[setItem.name as string] = setItem.value;
-								} else {
-									set(newItem.json, setItem.name as string, setItem.value);
-								}
-							},
-						);
-
-						// Add string values
-						(this.getNodeParameter('values.string', itemIndex, []) as INodeParameters[]).forEach(
-							(setItem) => {
-								if (options.dotNotation === false) {
-									newItem.json[setItem.name as string] = setItem.value;
-								} else {
-									set(newItem.json, setItem.name as string, setItem.value);
-								}
-							},
-						);
-
-						returnData.push(newItem);
-					}
-
-					return this.prepareOutputData(returnData);
-				},
-			},
-		},
-	};
-}
-
-/**
- * Initialize a BinaryManager for test runs.
- */
-export async function initBinaryManager() {
-	const binaryDataConfig = config.getEnv('binaryDataManager');
-	await BinaryDataManager.init(binaryDataConfig);
-}
-
-/**
- * Initialize a user settings config file if non-existent.
- */
-export function initConfigFile() {
-	const settingsPath = UserSettings.getUserSettingsPath();
-
-	if (!existsSync(settingsPath)) {
-		const userSettings = { encryptionKey: randomBytes(24).toString('base64') };
-		UserSettings.writeUserSettings(userSettings, settingsPath);
-	}
-}
-
-// ----------------------------------
-//           request agent
-// ----------------------------------
-
-/**
- * Create a request agent, optionally with an auth cookie.
- */
-export function createAgent(
-	app: express.Application,
-	options?: { auth: boolean; user: User; apiPath?: ApiPath; version?: string | number },
-) {
-	const agent = request.agent(app);
-
-	if (options?.apiPath === undefined || options?.apiPath === 'internal') {
-		agent.use(prefix(REST_PATH_SEGMENT));
-		if (options?.auth && options?.user) {
-			const { token } = issueJWT(options.user);
-			agent.jar.setCookie(`${AUTH_COOKIE_NAME}=${token}`);
-		}
-	}
-
-	if (options?.apiPath === 'public') {
-		agent.use(prefix(`${PUBLIC_API_REST_PATH_SEGMENT}/v${options?.version}`));
-
-		if (options?.auth && options?.user.apiKey) {
-			agent.set({ 'X-N8N-API-KEY': options.user.apiKey });
-		}
-	}
-
-	return agent;
-}
-
-export function createAuthAgent(app: express.Application) {
-	return (user: User) => createAgent(app, { auth: true, user });
-}
-
-/**
- * Plugin to prefix a path segment into a request URL pathname.
- *
- * Example: http://127.0.0.1:62100/me/password → http://127.0.0.1:62100/rest/me/password
- */
-export function prefix(pathSegment: string) {
-	return function (request: superagent.SuperAgentRequest) {
-		const url = new URL(request.url);
-
-		// enforce consistency at call sites
-		if (url.pathname[0] !== '/') {
-			throw new Error('Pathname must start with a forward slash');
-		}
-
-		url.pathname = pathSegment + url.pathname;
-		request.url = url.toString();
-		return request;
-	};
-}
-
-/**
- * Extract the value (token) of the auth cookie in a response.
- */
-export function getAuthToken(response: request.Response, authCookieName = AUTH_COOKIE_NAME) {
-	const cookies: string[] = response.headers['set-cookie'];
-
-	if (!cookies) return undefined;
-
-	const authCookie = cookies.find((c) => c.startsWith(`${authCookieName}=`));
-
-	if (!authCookie) return undefined;
-
-	const match = authCookie.match(new RegExp(`(^| )${authCookieName}=(?<token>[^;]+)`));
-
-	if (!match || !match.groups) return undefined;
-
-	return match.groups.token;
-}
-
-// ----------------------------------
-//            settings
-// ----------------------------------
-
-export async function isInstanceOwnerSetUp() {
-	const { value } = await Db.collections.Settings.findOneByOrFail({
-		key: 'userManagement.isInstanceOwnerSetUp',
-	});
-
-	return Boolean(value);
-}
-
-export const setInstanceOwnerSetUp = async (value: boolean) => {
-	config.set('userManagement.isInstanceOwnerSetUp', value);
-
-	await Db.collections.Settings.update(
-		{ key: 'userManagement.isInstanceOwnerSetUp' },
-		{ value: JSON.stringify(value) },
-	);
-};
-
-// ----------------------------------
-//              misc
-// ----------------------------------
-
-export function getPostgresSchemaSection(
-	schema = config.getSchema(),
-): PostgresSchemaSection | null {
-	for (const [key, value] of Object.entries(schema)) {
-		if (key === 'postgresdb') {
-			return value._cvtProperties;
-		}
-	}
-
-	return null;
-}
-
-// ----------------------------------
-//           community nodes
-// ----------------------------------
-
-export function installedPackagePayload(): InstalledPackagePayload {
-	return {
-		packageName: NODE_PACKAGE_PREFIX + randomName(),
-		installedVersion: COMMUNITY_PACKAGE_VERSION.CURRENT,
-	};
-}
-
-export function installedNodePayload(packageName: string): InstalledNodePayload {
-	const nodeName = randomName();
-	return {
-		name: nodeName,
-		type: nodeName,
-		latestVersion: COMMUNITY_NODE_VERSION.CURRENT,
-		package: packageName,
-	};
-}
-
-export const emptyPackage = async () => {
-	const installedPackage = new InstalledPackages();
-	installedPackage.installedNodes = [];
-
-	return installedPackage;
-};
-
-// ----------------------------------
-//           workflow
-// ----------------------------------
-
-export function makeWorkflow(options?: {
-	withPinData: boolean;
-	withCredential?: { id: string; name: string };
-}) {
-	const workflow = new WorkflowEntity();
-
-	const node: INode = {
-		id: uuid(),
-		name: 'Cron',
-		type: 'n8n-nodes-base.cron',
-		parameters: {},
-		typeVersion: 1,
-		position: [740, 240],
-	};
-
-	if (options?.withCredential) {
-		node.credentials = {
-			spotifyApi: options.withCredential,
-		};
-	}
-
-	workflow.name = 'My Workflow';
-	workflow.active = false;
-	workflow.connections = {};
-	workflow.nodes = [node];
-
-	if (options?.withPinData) {
-		workflow.pinData = MOCK_PINDATA;
-	}
-
-	return workflow;
-}
-
-export const MOCK_PINDATA = { Spotify: [{ json: { myKey: 'myValue' } }] };
diff --git a/packages/cli/test/integration/shared/utils/communityNodes.ts b/packages/cli/test/integration/shared/utils/communityNodes.ts
new file mode 100644
index 0000000000000..1587313c512a0
--- /dev/null
+++ b/packages/cli/test/integration/shared/utils/communityNodes.ts
@@ -0,0 +1,47 @@
+import { NODE_PACKAGE_PREFIX } from '@/constants';
+import { InstalledPackages } from '@db/entities/InstalledPackages';
+
+import { randomName } from '../random';
+import { COMMUNITY_NODE_VERSION, COMMUNITY_PACKAGE_VERSION } from '../constants';
+import { InstalledNodesRepository } from '@db/repositories/installedNodes.repository';
+import { InstalledPackagesRepository } from '@db/repositories/installedPackages.repository';
+import Container from 'typedi';
+
+export const mockPackageName = () => NODE_PACKAGE_PREFIX + randomName();
+
+export const mockPackage = () =>
+	Container.get(InstalledPackagesRepository).create({
+		packageName: mockPackageName(),
+		installedVersion: COMMUNITY_PACKAGE_VERSION.CURRENT,
+		installedNodes: [],
+	});
+
+export const mockNode = (packageName: string) => {
+	const nodeName = randomName();
+
+	return Container.get(InstalledNodesRepository).create({
+		name: nodeName,
+		type: nodeName,
+		latestVersion: COMMUNITY_NODE_VERSION.CURRENT.toString(),
+		package: { packageName },
+	});
+};
+
+export const emptyPackage = async () => {
+	const installedPackage = new InstalledPackages();
+	installedPackage.installedNodes = [];
+	return installedPackage;
+};
+
+export function mockPackagePair(): InstalledPackages[] {
+	const pkgA = mockPackage();
+	const nodeA = mockNode(pkgA.packageName);
+	pkgA.installedNodes = [nodeA];
+
+	const pkgB = mockPackage();
+	const nodeB1 = mockNode(pkgB.packageName);
+	const nodeB2 = mockNode(pkgB.packageName);
+	pkgB.installedNodes = [nodeB1, nodeB2];
+
+	return [pkgA, pkgB];
+}
diff --git a/packages/cli/test/integration/shared/utils/index.ts b/packages/cli/test/integration/shared/utils/index.ts
new file mode 100644
index 0000000000000..96efb06039681
--- /dev/null
+++ b/packages/cli/test/integration/shared/utils/index.ts
@@ -0,0 +1,178 @@
+import { Container } from 'typedi';
+import { BinaryDataService } from 'n8n-core';
+import { type INode } from 'n8n-workflow';
+import { GithubApi } from 'n8n-nodes-base/credentials/GithubApi.credentials';
+import { Ftp } from 'n8n-nodes-base/credentials/Ftp.credentials';
+import { Cron } from 'n8n-nodes-base/nodes/Cron/Cron.node';
+import { Set } from 'n8n-nodes-base/nodes/Set/Set.node';
+import { Start } from 'n8n-nodes-base/nodes/Start/Start.node';
+import type request from 'supertest';
+import { v4 as uuid } from 'uuid';
+
+import config from '@/config';
+import { WorkflowEntity } from '@db/entities/WorkflowEntity';
+import { SettingsRepository } from '@db/repositories/settings.repository';
+import { AUTH_COOKIE_NAME } from '@/constants';
+import { ExecutionService } from '@/executions/execution.service';
+import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
+import { Push } from '@/push';
+import { OrchestrationService } from '@/services/orchestration.service';
+
+import { mockInstance } from '../../../shared/mocking';
+
+export { setupTestServer } from './testServer';
+
+// ----------------------------------
+//          initializers
+// ----------------------------------
+
+/**
+ * Initialize node types.
+ */
+export async function initActiveWorkflowManager() {
+	mockInstance(OrchestrationService, {
+		isMultiMainSetupEnabled: false,
+		shouldAddWebhooks: jest.fn().mockReturnValue(true),
+	});
+
+	mockInstance(Push);
+	mockInstance(ExecutionService);
+	const { ActiveWorkflowManager } = await import('@/ActiveWorkflowManager');
+	const activeWorkflowManager = Container.get(ActiveWorkflowManager);
+	await activeWorkflowManager.init();
+	return activeWorkflowManager;
+}
+
+/**
+ * Initialize node types.
+ */
+export async function initCredentialsTypes(): Promise<void> {
+	Container.get(LoadNodesAndCredentials).loaded.credentials = {
+		githubApi: {
+			type: new GithubApi(),
+			sourcePath: '',
+		},
+		ftp: {
+			type: new Ftp(),
+			sourcePath: '',
+		},
+	};
+}
+
+/**
+ * Initialize node types.
+ */
+export async function initNodeTypes() {
+	Container.get(LoadNodesAndCredentials).loaded.nodes = {
+		'n8n-nodes-base.start': {
+			type: new Start(),
+			sourcePath: '',
+		},
+		'n8n-nodes-base.cron': {
+			type: new Cron(),
+			sourcePath: '',
+		},
+		'n8n-nodes-base.set': {
+			type: new Set(),
+			sourcePath: '',
+		},
+	};
+}
+
+/**
+ * Initialize a BinaryDataService for test runs.
+ */
+export async function initBinaryDataService(mode: 'default' | 'filesystem' = 'default') {
+	const binaryDataService = new BinaryDataService();
+	await binaryDataService.init({
+		mode,
+		availableModes: [mode],
+		localStoragePath: '',
+	});
+	Container.set(BinaryDataService, binaryDataService);
+}
+
+/**
+ * Extract the value (token) of the auth cookie in a response.
+ */
+export function getAuthToken(response: request.Response, authCookieName = AUTH_COOKIE_NAME) {
+	const cookies: string[] = response.headers['set-cookie'];
+
+	if (!cookies) return undefined;
+
+	const authCookie = cookies.find((c) => c.startsWith(`${authCookieName}=`));
+
+	if (!authCookie) return undefined;
+
+	const match = authCookie.match(new RegExp(`(^| )${authCookieName}=(?<token>[^;]+)`));
+
+	if (!match || !match.groups) return undefined;
+
+	return match.groups.token;
+}
+
+// ----------------------------------
+//            settings
+// ----------------------------------
+
+export async function isInstanceOwnerSetUp() {
+	const { value } = await Container.get(SettingsRepository).findOneByOrFail({
+		key: 'userManagement.isInstanceOwnerSetUp',
+	});
+
+	return Boolean(value);
+}
+
+export const setInstanceOwnerSetUp = async (value: boolean) => {
+	config.set('userManagement.isInstanceOwnerSetUp', value);
+
+	await Container.get(SettingsRepository).update(
+		{ key: 'userManagement.isInstanceOwnerSetUp' },
+		{ value: JSON.stringify(value) },
+	);
+};
+
+// ----------------------------------
+//           community nodes
+// ----------------------------------
+
+export * from './communityNodes';
+
+// ----------------------------------
+//           workflow
+// ----------------------------------
+
+export function makeWorkflow(options?: {
+	withPinData: boolean;
+	withCredential?: { id: string; name: string };
+}) {
+	const workflow = new WorkflowEntity();
+
+	const node: INode = {
+		id: uuid(),
+		name: 'Cron',
+		type: 'n8n-nodes-base.cron',
+		parameters: {},
+		typeVersion: 1,
+		position: [740, 240],
+	};
+
+	if (options?.withCredential) {
+		node.credentials = {
+			spotifyApi: options.withCredential,
+		};
+	}
+
+	workflow.name = 'My Workflow';
+	workflow.active = false;
+	workflow.connections = {};
+	workflow.nodes = [node];
+
+	if (options?.withPinData) {
+		workflow.pinData = MOCK_PINDATA;
+	}
+
+	return workflow;
+}
+
+export const MOCK_PINDATA = { Spotify: [{ json: { myKey: 'myValue' } }] };
diff --git a/packages/cli/test/integration/shared/utils/testServer.ts b/packages/cli/test/integration/shared/utils/testServer.ts
new file mode 100644
index 0000000000000..d6b9aa40efd04
--- /dev/null
+++ b/packages/cli/test/integration/shared/utils/testServer.ts
@@ -0,0 +1,275 @@
+import { Container } from 'typedi';
+import cookieParser from 'cookie-parser';
+import express from 'express';
+import type superagent from 'superagent';
+import request from 'supertest';
+import { URL } from 'url';
+
+import config from '@/config';
+import { AUTH_COOKIE_NAME } from '@/constants';
+import type { User } from '@db/entities/User';
+import { registerController } from '@/decorators';
+import { rawBodyReader, bodyParser } from '@/middlewares';
+import { PostHogClient } from '@/posthog';
+import { Push } from '@/push';
+import { License } from '@/License';
+import { Logger } from '@/Logger';
+import { InternalHooks } from '@/InternalHooks';
+
+import { mockInstance } from '../../../shared/mocking';
+import * as testDb from '../../shared/testDb';
+import { PUBLIC_API_REST_PATH_SEGMENT, REST_PATH_SEGMENT } from '../constants';
+import type { SetupProps, TestServer } from '../types';
+import { LicenseMocker } from '../license';
+import { AuthService } from '@/auth/auth.service';
+import type { APIRequest } from '@/requests';
+
+/**
+ * Plugin to prefix a path segment into a request URL pathname.
+ *
+ * Example: http://127.0.0.1:62100/me/password → http://127.0.0.1:62100/rest/me/password
+ */
+function prefix(pathSegment: string) {
+	return async function (request: superagent.SuperAgentRequest) {
+		const url = new URL(request.url);
+
+		// enforce consistency at call sites
+		if (url.pathname[0] !== '/') {
+			throw new Error('Pathname must start with a forward slash');
+		}
+
+		url.pathname = pathSegment + url.pathname;
+		request.url = url.toString();
+		return await request;
+	};
+}
+
+const browserId = 'test-browser-id';
+function createAgent(app: express.Application, options?: { auth: boolean; user: User }) {
+	const agent = request.agent(app);
+	void agent.use(prefix(REST_PATH_SEGMENT));
+	if (options?.auth && options?.user) {
+		const token = Container.get(AuthService).issueJWT(options.user, browserId);
+		agent.jar.setCookie(`${AUTH_COOKIE_NAME}=${token}`);
+	}
+	return agent;
+}
+
+function publicApiAgent(
+	app: express.Application,
+	{ user, version = 1 }: { user: User; version?: number },
+) {
+	const agent = request.agent(app);
+	void agent.use(prefix(`${PUBLIC_API_REST_PATH_SEGMENT}/v${version}`));
+	if (user.apiKey) {
+		void agent.set({ 'X-N8N-API-KEY': user.apiKey });
+	}
+	return agent;
+}
+
+export const setupTestServer = ({
+	endpointGroups,
+	enabledFeatures,
+	quotas,
+}: SetupProps): TestServer => {
+	const app = express();
+	app.use(rawBodyReader);
+	app.use(cookieParser());
+	app.use((req: APIRequest, _, next) => {
+		req.browserId = browserId;
+		next();
+	});
+
+	// Mock all telemetry and logging
+	mockInstance(Logger);
+	mockInstance(InternalHooks);
+	mockInstance(PostHogClient);
+	mockInstance(Push);
+
+	const testServer: TestServer = {
+		app,
+		httpServer: app.listen(0),
+		authAgentFor: (user: User) => createAgent(app, { auth: true, user }),
+		authlessAgent: createAgent(app),
+		publicApiAgentFor: (user) => publicApiAgent(app, { user }),
+		license: new LicenseMocker(),
+	};
+
+	// eslint-disable-next-line complexity
+	beforeAll(async () => {
+		await testDb.init();
+
+		config.set('userManagement.jwtSecret', 'My JWT secret');
+		config.set('userManagement.isInstanceOwnerSetUp', true);
+
+		testServer.license.mock(Container.get(License));
+		if (enabledFeatures) {
+			testServer.license.setDefaults({
+				features: enabledFeatures,
+				quotas,
+			});
+		}
+
+		if (!endpointGroups) return;
+
+		app.use(bodyParser);
+
+		const enablePublicAPI = endpointGroups?.includes('publicApi');
+		if (enablePublicAPI) {
+			const { loadPublicApiVersions } = await import('@/PublicApi');
+			const { apiRouters } = await loadPublicApiVersions(PUBLIC_API_REST_PATH_SEGMENT);
+			app.use(...apiRouters);
+		}
+
+		if (endpointGroups.length) {
+			for (const group of endpointGroups) {
+				switch (group) {
+					case 'credentials':
+						const { CredentialsController } = await import('@/credentials/credentials.controller');
+						registerController(app, CredentialsController);
+						break;
+
+					case 'workflows':
+						const { WorkflowsController } = await import('@/workflows/workflows.controller');
+						registerController(app, WorkflowsController);
+						break;
+
+					case 'executions':
+						const { ExecutionsController } = await import('@/executions/executions.controller');
+						registerController(app, ExecutionsController);
+						break;
+
+					case 'variables':
+						const { VariablesController } = await import(
+							'@/environments/variables/variables.controller.ee'
+						);
+						registerController(app, VariablesController);
+						break;
+
+					case 'license':
+						const { LicenseController } = await import('@/license/license.controller');
+						registerController(app, LicenseController);
+						break;
+
+					case 'metrics':
+						const { MetricsService } = await import('@/services/metrics.service');
+						await Container.get(MetricsService).configureMetrics(app);
+						break;
+
+					case 'eventBus':
+						const { EventBusController } = await import('@/eventbus/eventBus.controller');
+						const { EventBusControllerEE } = await import('@/eventbus/eventBus.controller.ee');
+						registerController(app, EventBusController);
+						registerController(app, EventBusControllerEE);
+						break;
+
+					case 'auth':
+						const { AuthController } = await import('@/controllers/auth.controller');
+						registerController(app, AuthController);
+						break;
+
+					case 'mfa':
+						const { MFAController } = await import('@/controllers/mfa.controller');
+						registerController(app, MFAController);
+						break;
+
+					case 'ldap':
+						const { LdapService } = await import('@/Ldap/ldap.service');
+						const { LdapController } = await import('@/Ldap/ldap.controller');
+						testServer.license.enable('feat:ldap');
+						await Container.get(LdapService).init();
+						registerController(app, LdapController);
+						break;
+
+					case 'saml':
+						const { setSamlLoginEnabled } = await import('@/sso/saml/samlHelpers');
+						const { SamlController } = await import('@/sso/saml/routes/saml.controller.ee');
+						await setSamlLoginEnabled(true);
+						registerController(app, SamlController);
+						break;
+
+					case 'sourceControl':
+						const { SourceControlController } = await import(
+							'@/environments/sourceControl/sourceControl.controller.ee'
+						);
+						registerController(app, SourceControlController);
+						break;
+
+					case 'community-packages':
+						const { CommunityPackagesController } = await import(
+							'@/controllers/communityPackages.controller'
+						);
+						registerController(app, CommunityPackagesController);
+						break;
+
+					case 'me':
+						const { MeController } = await import('@/controllers/me.controller');
+						registerController(app, MeController);
+						break;
+
+					case 'passwordReset':
+						const { PasswordResetController } = await import(
+							'@/controllers/passwordReset.controller'
+						);
+						registerController(app, PasswordResetController);
+						break;
+
+					case 'owner':
+						const { OwnerController } = await import('@/controllers/owner.controller');
+						registerController(app, OwnerController);
+						break;
+
+					case 'users':
+						const { UsersController } = await import('@/controllers/users.controller');
+						registerController(app, UsersController);
+						break;
+
+					case 'invitations':
+						const { InvitationController } = await import('@/controllers/invitation.controller');
+						registerController(app, InvitationController);
+						break;
+
+					case 'tags':
+						const { TagsController } = await import('@/controllers/tags.controller');
+						registerController(app, TagsController);
+						break;
+
+					case 'externalSecrets':
+						const { ExternalSecretsController } = await import(
+							'@/ExternalSecrets/ExternalSecrets.controller.ee'
+						);
+						registerController(app, ExternalSecretsController);
+						break;
+
+					case 'workflowHistory':
+						const { WorkflowHistoryController } = await import(
+							'@/workflows/workflowHistory/workflowHistory.controller.ee'
+						);
+						registerController(app, WorkflowHistoryController);
+						break;
+
+					case 'binaryData':
+						const { BinaryDataController } = await import('@/controllers/binaryData.controller');
+						registerController(app, BinaryDataController);
+						break;
+
+					case 'debug':
+						const { DebugController } = await import('@/controllers/debug.controller');
+						registerController(app, DebugController);
+						break;
+				}
+			}
+		}
+	});
+
+	afterAll(async () => {
+		await testDb.terminate();
+		testServer.httpServer.close();
+	});
+
+	beforeEach(() => {
+		testServer.license.reset();
+	});
+
+	return testServer;
+};
diff --git a/packages/cli/test/integration/shared/utils/users.ts b/packages/cli/test/integration/shared/utils/users.ts
new file mode 100644
index 0000000000000..e812558674f7f
--- /dev/null
+++ b/packages/cli/test/integration/shared/utils/users.ts
@@ -0,0 +1,21 @@
+import type { PublicUser } from '@/Interfaces';
+import type { User } from '@/databases/entities/User';
+
+export const validateUser = (user: PublicUser) => {
+	expect(typeof user.id).toBe('string');
+	expect(user.email).toBeDefined();
+	expect(user.firstName).toBeDefined();
+	expect(user.lastName).toBeDefined();
+	expect(typeof user.isOwner).toBe('boolean');
+	expect(user.isPending).toBe(false);
+	expect(user.signInType).toBe('email');
+	expect(user.settings).toBe(null);
+	expect(user.personalizationAnswers).toBeNull();
+	expect(user.password).toBeUndefined();
+	expect(user.role).toBeDefined();
+};
+
+export type UserInvitationResult = {
+	user: Pick<User, 'id' | 'email'> & { inviteAcceptUrl: string; emailSent: boolean };
+	error?: string;
+};
diff --git a/packages/cli/test/integration/shared/workflow.ts b/packages/cli/test/integration/shared/workflow.ts
new file mode 100644
index 0000000000000..0b2b12f53ac0a
--- /dev/null
+++ b/packages/cli/test/integration/shared/workflow.ts
@@ -0,0 +1,78 @@
+import type { INode } from 'n8n-workflow';
+import { WorkflowEntity } from '@db/entities/WorkflowEntity';
+
+export const FIRST_CREDENTIAL_ID = '1';
+export const SECOND_CREDENTIAL_ID = '2';
+export const THIRD_CREDENTIAL_ID = '3';
+
+const NODE_WITH_NO_CRED = '0133467b-df4a-473d-9295-fdd9d01fa45a';
+const NODE_WITH_ONE_CRED = '4673f869-f2dc-4a33-b053-ca3193bc5226';
+const NODE_WITH_TWO_CRED = '9b4208bd-8f10-4a6a-ad3b-da47a326f7da';
+
+const nodeWithNoCredentials: INode = {
+	id: NODE_WITH_NO_CRED,
+	name: 'Node with no Credential',
+	typeVersion: 1,
+	type: 'n8n-nodes-base.fakeNode',
+	position: [0, 0],
+	credentials: {},
+	parameters: {},
+};
+
+const nodeWithOneCredential: INode = {
+	id: NODE_WITH_ONE_CRED,
+	name: 'Node with a single credential',
+	typeVersion: 1,
+	type: '',
+	position: [0, 0],
+	credentials: {
+		test: {
+			id: FIRST_CREDENTIAL_ID,
+			name: 'First fake credential',
+		},
+	},
+	parameters: {},
+};
+
+const nodeWithTwoCredentials: INode = {
+	id: NODE_WITH_TWO_CRED,
+	name: 'Node with two credentials',
+	typeVersion: 1,
+	type: '',
+	position: [0, 0],
+	credentials: {
+		mcTest: {
+			id: SECOND_CREDENTIAL_ID,
+			name: 'Second fake credential',
+		},
+		mcTest2: {
+			id: THIRD_CREDENTIAL_ID,
+			name: 'Third fake credential',
+		},
+	},
+	parameters: {},
+};
+
+export function getWorkflow(options?: {
+	addNodeWithoutCreds?: boolean;
+	addNodeWithOneCred?: boolean;
+	addNodeWithTwoCreds?: boolean;
+}) {
+	const workflow = new WorkflowEntity();
+
+	workflow.nodes = [];
+
+	if (options?.addNodeWithoutCreds) {
+		workflow.nodes.push(nodeWithNoCredentials);
+	}
+
+	if (options?.addNodeWithOneCred) {
+		workflow.nodes.push(nodeWithOneCredential);
+	}
+
+	if (options?.addNodeWithTwoCreds) {
+		workflow.nodes.push(nodeWithTwoCredentials);
+	}
+
+	return workflow;
+}
diff --git a/packages/cli/test/integration/tags.api.test.ts b/packages/cli/test/integration/tags.api.test.ts
new file mode 100644
index 0000000000000..73be97a1c269f
--- /dev/null
+++ b/packages/cli/test/integration/tags.api.test.ts
@@ -0,0 +1,39 @@
+import * as utils from './shared/utils/';
+import * as testDb from './shared/testDb';
+import type { SuperAgentTest } from 'supertest';
+import { TagRepository } from '@db/repositories/tag.repository';
+import Container from 'typedi';
+import { createUserShell } from './shared/db/users';
+
+let authOwnerAgent: SuperAgentTest;
+const testServer = utils.setupTestServer({ endpointGroups: ['tags'] });
+
+beforeAll(async () => {
+	const ownerShell = await createUserShell('global:owner');
+	authOwnerAgent = testServer.authAgentFor(ownerShell);
+});
+
+beforeEach(async () => {
+	await testDb.truncate(['Tag']);
+});
+
+describe('POST /tags', () => {
+	test('should create tag', async () => {
+		const resp = await authOwnerAgent.post('/tags').send({ name: 'test' });
+		expect(resp.statusCode).toBe(200);
+
+		const dbTag = await Container.get(TagRepository).findBy({ name: 'test' });
+		expect(dbTag.length === 1);
+	});
+
+	test('should not create duplicate tag', async () => {
+		const newTag = Container.get(TagRepository).create({ name: 'test' });
+		await Container.get(TagRepository).save(newTag);
+
+		const resp = await authOwnerAgent.post('/tags').send({ name: 'test' });
+		expect(resp.status).toBe(500);
+
+		const dbTag = await Container.get(TagRepository).findBy({ name: 'test' });
+		expect(dbTag.length).toBe(1);
+	});
+});
diff --git a/packages/cli/test/integration/usageMetrics.repository.test.ts b/packages/cli/test/integration/usageMetrics.repository.test.ts
new file mode 100644
index 0000000000000..780eaecf26bd2
--- /dev/null
+++ b/packages/cli/test/integration/usageMetrics.repository.test.ts
@@ -0,0 +1,92 @@
+import { UsageMetricsRepository } from '@/databases/repositories/usageMetrics.repository';
+import { createAdmin, createMember, createOwner, createUser } from './shared/db/users';
+import * as testDb from './shared/testDb';
+import Container from 'typedi';
+import { createManyWorkflows } from './shared/db/workflows';
+import { createManyCredentials } from './shared/db/credentials';
+import { WorkflowStatisticsRepository } from '@/databases/repositories/workflowStatistics.repository';
+import { StatisticsNames } from '@/databases/entities/WorkflowStatistics';
+
+describe('UsageMetricsRepository', () => {
+	let usageMetricsRepository: UsageMetricsRepository;
+	let workflowStatisticsRepository: WorkflowStatisticsRepository;
+
+	beforeAll(async () => {
+		await testDb.init();
+
+		usageMetricsRepository = Container.get(UsageMetricsRepository);
+
+		workflowStatisticsRepository = Container.get(WorkflowStatisticsRepository);
+	});
+
+	beforeEach(async () => {
+		await testDb.truncate(['User', 'Credentials', 'Workflow', 'Execution', 'WorkflowStatistics']);
+	});
+
+	afterAll(async () => {
+		await testDb.terminate();
+	});
+
+	describe('getLicenseRenewalMetrics()', () => {
+		test('should return license renewal metrics', async () => {
+			const [firstWorkflow, secondWorkflow] = await createManyWorkflows(2, { active: false });
+
+			await Promise.all([
+				createOwner(),
+				createAdmin(),
+				createMember(),
+				createMember(),
+				createUser({ disabled: true }),
+				createManyCredentials(2),
+				createManyWorkflows(3, { active: true }),
+			]);
+
+			await Promise.all([
+				workflowStatisticsRepository.insertWorkflowStatistics(
+					StatisticsNames.productionSuccess,
+					firstWorkflow.id,
+				),
+				workflowStatisticsRepository.insertWorkflowStatistics(
+					StatisticsNames.productionError,
+					firstWorkflow.id,
+				),
+				workflowStatisticsRepository.insertWorkflowStatistics(
+					StatisticsNames.manualSuccess,
+					secondWorkflow.id,
+				),
+				workflowStatisticsRepository.insertWorkflowStatistics(
+					StatisticsNames.manualError,
+					secondWorkflow.id,
+				),
+			]);
+
+			const metrics = await usageMetricsRepository.getLicenseRenewalMetrics();
+
+			expect(metrics).toStrictEqual({
+				enabledUsers: 4,
+				totalUsers: 5,
+				totalCredentials: 2,
+				totalWorkflows: 5,
+				activeWorkflows: 3,
+				productionExecutions: 2,
+				manualExecutions: 2,
+			});
+		});
+
+		test('should handle zero execution statistics correctly', async () => {
+			await Promise.all([createOwner(), createManyWorkflows(3, { active: true })]);
+
+			const metrics = await usageMetricsRepository.getLicenseRenewalMetrics();
+
+			expect(metrics).toStrictEqual({
+				enabledUsers: 1,
+				totalUsers: 1,
+				totalCredentials: 0,
+				totalWorkflows: 3,
+				activeWorkflows: 3,
+				productionExecutions: 0, // not NaN
+				manualExecutions: 0, // not NaN
+			});
+		});
+	});
+});
diff --git a/packages/cli/test/integration/user.repository.test.ts b/packages/cli/test/integration/user.repository.test.ts
new file mode 100644
index 0000000000000..6929326b95fd9
--- /dev/null
+++ b/packages/cli/test/integration/user.repository.test.ts
@@ -0,0 +1,41 @@
+import Container from 'typedi';
+import { UserRepository } from '@db/repositories/user.repository';
+import { createAdmin, createMember, createOwner } from './shared/db/users';
+import * as testDb from './shared/testDb';
+
+describe('UserRepository', () => {
+	let userRepository: UserRepository;
+
+	beforeAll(async () => {
+		await testDb.init();
+
+		userRepository = Container.get(UserRepository);
+
+		await testDb.truncate(['User']);
+	});
+
+	afterAll(async () => {
+		await testDb.terminate();
+	});
+
+	describe('countUsersByRole()', () => {
+		test('should return the number of users in each role', async () => {
+			await Promise.all([
+				createOwner(),
+				createAdmin(),
+				createAdmin(),
+				createMember(),
+				createMember(),
+				createMember(),
+			]);
+
+			const usersByRole = await userRepository.countUsersByRole();
+
+			expect(usersByRole).toStrictEqual({
+				'global:admin': 2,
+				'global:member': 3,
+				'global:owner': 1,
+			});
+		});
+	});
+});
diff --git a/packages/cli/test/integration/users.api.test.ts b/packages/cli/test/integration/users.api.test.ts
index 966bb6d1694a7..5c9bdc2600a8e 100644
--- a/packages/cli/test/integration/users.api.test.ts
+++ b/packages/cli/test/integration/users.api.test.ts
@@ -1,531 +1,628 @@
-import validator from 'validator';
-import { Not } from 'typeorm';
+import Container from 'typedi';
 import type { SuperAgentTest } from 'supertest';
 
-import config from '@/config';
-import * as Db from '@/Db';
-import { CredentialsEntity } from '@db/entities/CredentialsEntity';
-import type { Role } from '@db/entities/Role';
+import { UsersController } from '@/controllers/users.controller';
 import type { User } from '@db/entities/User';
-import { WorkflowEntity } from '@db/entities/WorkflowEntity';
-import { compareHash } from '@/UserManagement/UserManagementHelper';
-import { UserManagementMailer } from '@/UserManagement/email/UserManagementMailer';
-import { NodeMailer } from '@/UserManagement/email/NodeMailer';
-
+import { UserRepository } from '@db/repositories/user.repository';
+import { SharedCredentialsRepository } from '@db/repositories/sharedCredentials.repository';
+import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
+import { ExecutionService } from '@/executions/execution.service';
+
+import { getCredentialById, saveCredential } from './shared/db/credentials';
+import { createAdmin, createMember, createOwner, getUserById } from './shared/db/users';
+import { createWorkflow, getWorkflowById } from './shared/db/workflows';
 import { SUCCESS_RESPONSE_BODY } from './shared/constants';
-import {
-	randomCredentialPayload,
-	randomEmail,
-	randomInvalidPassword,
-	randomName,
-	randomValidPassword,
-} from './shared/random';
+import { validateUser } from './shared/utils/users';
+import { randomName } from './shared/random';
+import * as utils from './shared/utils/';
 import * as testDb from './shared/testDb';
-import * as utils from './shared/utils';
+import { mockInstance } from '../shared/mocking';
 
-jest.mock('@/UserManagement/email/NodeMailer');
+mockInstance(ExecutionService);
 
-let globalMemberRole: Role;
-let workflowOwnerRole: Role;
-let credentialOwnerRole: Role;
-let owner: User;
-let authlessAgent: SuperAgentTest;
-let authOwnerAgent: SuperAgentTest;
-let authAgentFor: (user: User) => SuperAgentTest;
+const testServer = utils.setupTestServer({
+	endpointGroups: ['users'],
+	enabledFeatures: ['feat:advancedPermissions'],
+});
 
-beforeAll(async () => {
-	const app = await utils.initTestServer({ endpointGroups: ['users'] });
+describe('GET /users', () => {
+	let owner: User;
+	let member: User;
+	let ownerAgent: SuperAgentTest;
 
-	const [
-		globalOwnerRole,
-		fetchedGlobalMemberRole,
-		fetchedWorkflowOwnerRole,
-		fetchedCredentialOwnerRole,
-	] = await testDb.getAllRoles();
+	beforeAll(async () => {
+		await testDb.truncate(['User']);
 
-	globalMemberRole = fetchedGlobalMemberRole;
-	workflowOwnerRole = fetchedWorkflowOwnerRole;
-	credentialOwnerRole = fetchedCredentialOwnerRole;
+		owner = await createOwner();
+		member = await createMember();
+		await createMember();
 
-	owner = await testDb.createUser({ globalRole: globalOwnerRole });
+		ownerAgent = testServer.authAgentFor(owner);
+	});
 
-	authlessAgent = utils.createAgent(app);
-	authAgentFor = utils.createAuthAgent(app);
-	authOwnerAgent = authAgentFor(owner);
-});
+	test('should return all users', async () => {
+		const response = await ownerAgent.get('/users').expect(200);
 
-beforeEach(async () => {
-	await testDb.truncate(['SharedCredentials', 'SharedWorkflow', 'Workflow', 'Credentials']);
-	await Db.collections.User.delete({ id: Not(owner.id) });
+		expect(response.body.data).toHaveLength(3);
 
-	jest.mock('@/config');
+		response.body.data.forEach(validateUser);
+	});
 
-	config.set('userManagement.disabled', false);
-	config.set('userManagement.isInstanceOwnerSetUp', true);
-	config.set('userManagement.emails.mode', 'smtp');
-	config.set('userManagement.emails.smtp.host', '');
-});
+	describe('list query options', () => {
+		describe('filter', () => {
+			test('should filter users by field: email', async () => {
+				const response = await ownerAgent
+					.get('/users')
+					.query(`filter={ "email": "${member.email}" }`)
+					.expect(200);
 
-afterAll(async () => {
-	await testDb.terminate();
-});
+				expect(response.body.data).toHaveLength(1);
 
-describe('GET /users', () => {
-	test('should return all users (for owner)', async () => {
-		await testDb.createUser({ globalRole: globalMemberRole });
+				const [user] = response.body.data;
 
-		const response = await authOwnerAgent.get('/users');
+				expect(user.email).toBe(member.email);
 
-		expect(response.statusCode).toBe(200);
-		expect(response.body.data.length).toBe(2);
-
-		response.body.data.map((user: User) => {
-			const {
-				id,
-				email,
-				firstName,
-				lastName,
-				personalizationAnswers,
-				globalRole,
-				password,
-				resetPasswordToken,
-				isPending,
-				apiKey,
-			} = user;
-
-			expect(validator.isUUID(id)).toBe(true);
-			expect(email).toBeDefined();
-			expect(firstName).toBeDefined();
-			expect(lastName).toBeDefined();
-			expect(personalizationAnswers).toBeUndefined();
-			expect(password).toBeUndefined();
-			expect(resetPasswordToken).toBeUndefined();
-			expect(isPending).toBe(false);
-			expect(globalRole).toBeDefined();
-			expect(apiKey).not.toBeDefined();
-		});
-	});
+				const _response = await ownerAgent
+					.get('/users')
+					.query('filter={ "email": "non@existing.com" }')
+					.expect(200);
 
-	test('should return all users (for member)', async () => {
-		const member = await testDb.createUser({ globalRole: globalMemberRole });
-		const response = await authAgentFor(member).get('/users');
+				expect(_response.body.data).toHaveLength(0);
+			});
 
-		expect(response.statusCode).toBe(200);
-		expect(response.body.data.length).toBe(2);
-	});
-});
+			test('should filter users by field: firstName', async () => {
+				const response = await ownerAgent
+					.get('/users')
+					.query(`filter={ "firstName": "${member.firstName}" }`)
+					.expect(200);
 
-describe('DELETE /users/:id', () => {
-	test('should delete the user', async () => {
-		const userToDelete = await testDb.createUser({ globalRole: globalMemberRole });
+				expect(response.body.data).toHaveLength(1);
 
-		const newWorkflow = new WorkflowEntity();
+				const [user] = response.body.data;
 
-		Object.assign(newWorkflow, {
-			name: randomName(),
-			active: false,
-			connections: {},
-			nodes: [],
-		});
+				expect(user.email).toBe(member.email);
+
+				const _response = await ownerAgent
+					.get('/users')
+					.query('filter={ "firstName": "Non-Existing" }')
+					.expect(200);
 
-		const savedWorkflow = await Db.collections.Workflow.save(newWorkflow);
+				expect(_response.body.data).toHaveLength(0);
+			});
 
-		await Db.collections.SharedWorkflow.save({
-			role: workflowOwnerRole,
-			user: userToDelete,
-			workflow: savedWorkflow,
+			test('should filter users by field: lastName', async () => {
+				const response = await ownerAgent
+					.get('/users')
+					.query(`filter={ "lastName": "${member.lastName}" }`)
+					.expect(200);
+
+				expect(response.body.data).toHaveLength(1);
+
+				const [user] = response.body.data;
+
+				expect(user.email).toBe(member.email);
+
+				const _response = await ownerAgent
+					.get('/users')
+					.query('filter={ "lastName": "Non-Existing" }')
+					.expect(200);
+
+				expect(_response.body.data).toHaveLength(0);
+			});
+
+			test('should filter users by computed field: isOwner', async () => {
+				const response = await ownerAgent
+					.get('/users')
+					.query('filter={ "isOwner": true }')
+					.expect(200);
+
+				expect(response.body.data).toHaveLength(1);
+
+				const [user] = response.body.data;
+
+				expect(user.isOwner).toBe(true);
+
+				const _response = await ownerAgent
+					.get('/users')
+					.query('filter={ "isOwner": false }')
+					.expect(200);
+
+				expect(_response.body.data).toHaveLength(2);
+
+				const [_user] = _response.body.data;
+
+				expect(_user.isOwner).toBe(false);
+			});
 		});
 
-		const newCredential = new CredentialsEntity();
+		describe('select', () => {
+			test('should select user field: id', async () => {
+				const response = await ownerAgent.get('/users').query('select=["id"]').expect(200);
+
+				expect(response.body).toEqual({
+					data: [
+						{ id: expect.any(String) },
+						{ id: expect.any(String) },
+						{ id: expect.any(String) },
+					],
+				});
+			});
+
+			test('should select user field: email', async () => {
+				const response = await ownerAgent.get('/users').query('select=["email"]').expect(200);
+
+				expect(response.body).toEqual({
+					data: [
+						{ email: expect.any(String) },
+						{ email: expect.any(String) },
+						{ email: expect.any(String) },
+					],
+				});
+			});
 
-		Object.assign(newCredential, {
-			name: randomName(),
-			data: '',
-			type: '',
-			nodesAccess: [],
+			test('should select user field: firstName', async () => {
+				const response = await ownerAgent.get('/users').query('select=["firstName"]').expect(200);
+
+				expect(response.body).toEqual({
+					data: [
+						{ firstName: expect.any(String) },
+						{ firstName: expect.any(String) },
+						{ firstName: expect.any(String) },
+					],
+				});
+			});
+
+			test('should select user field: lastName', async () => {
+				const response = await ownerAgent.get('/users').query('select=["lastName"]').expect(200);
+
+				expect(response.body).toEqual({
+					data: [
+						{ lastName: expect.any(String) },
+						{ lastName: expect.any(String) },
+						{ lastName: expect.any(String) },
+					],
+				});
+			});
 		});
 
-		const savedCredential = await Db.collections.Credentials.save(newCredential);
+		describe('take', () => {
+			test('should return n users or less, without skip', async () => {
+				const response = await ownerAgent.get('/users').query('take=2').expect(200);
+
+				expect(response.body.data).toHaveLength(2);
+
+				response.body.data.forEach(validateUser);
+
+				const _response = await ownerAgent.get('/users').query('take=1').expect(200);
+
+				expect(_response.body.data).toHaveLength(1);
 
-		await Db.collections.SharedCredentials.save({
-			role: credentialOwnerRole,
-			user: userToDelete,
-			credentials: savedCredential,
+				_response.body.data.forEach(validateUser);
+			});
+
+			test('should return n users or less, with skip', async () => {
+				const response = await ownerAgent.get('/users').query('take=1&skip=1').expect(200);
+
+				expect(response.body.data).toHaveLength(1);
+
+				response.body.data.forEach(validateUser);
+			});
+		});
+
+		describe('auxiliary fields', () => {
+			/**
+			 * Some list query options require auxiliary fields:
+			 *
+			 * - `select` with `take` requires `id` (for pagination)
+			 */
+			test('should support options that require auxiliary fields', async () => {
+				const response = await ownerAgent
+					.get('/users')
+					.query('filter={ "isOwner": true }&select=["firstName"]&take=1')
+					.expect(200);
+
+				expect(response.body).toEqual({ data: [{ firstName: expect.any(String) }] });
+			});
 		});
+	});
+});
+
+describe('DELETE /users/:id', () => {
+	let owner: User;
+	let member: User;
+	let ownerAgent: SuperAgentTest;
 
-		const response = await authOwnerAgent.delete(`/users/${userToDelete.id}`);
+	beforeAll(async () => {
+		await testDb.truncate(['User']);
+
+		owner = await createOwner();
+		member = await createMember();
+		ownerAgent = testServer.authAgentFor(owner);
+	});
+
+	test('should delete user and their resources', async () => {
+		const savedWorkflow = await createWorkflow({ name: randomName() }, member);
+
+		const savedCredential = await saveCredential(
+			{ name: randomName(), type: '', data: {} },
+			{ user: member, role: 'credential:owner' },
+		);
+
+		const response = await ownerAgent.delete(`/users/${member.id}`);
 
 		expect(response.statusCode).toBe(200);
 		expect(response.body).toEqual(SUCCESS_RESPONSE_BODY);
 
-		const user = await Db.collections.User.findOneBy({ id: userToDelete.id });
-		expect(user).toBeNull(); // deleted
+		const user = await Container.get(UserRepository).findOneBy({ id: member.id });
 
-		const sharedWorkflow = await Db.collections.SharedWorkflow.findOne({
+		const sharedWorkflow = await Container.get(SharedWorkflowRepository).findOne({
 			relations: ['user'],
-			where: { userId: userToDelete.id, roleId: workflowOwnerRole.id },
+			where: { userId: member.id, role: 'workflow:owner' },
 		});
-		expect(sharedWorkflow).toBeNull(); // deleted
 
-		const sharedCredential = await Db.collections.SharedCredentials.findOne({
+		const sharedCredential = await Container.get(SharedCredentialsRepository).findOne({
 			relations: ['user'],
-			where: { userId: userToDelete.id, roleId: credentialOwnerRole.id },
+			where: { userId: member.id, role: 'credential:owner' },
 		});
-		expect(sharedCredential).toBeNull(); // deleted
 
-		const workflow = await Db.collections.Workflow.findOneBy({ id: savedWorkflow.id });
-		expect(workflow).toBeNull(); // deleted
+		const workflow = await getWorkflowById(savedWorkflow.id);
+
+		const credential = await getCredentialById(savedCredential.id);
+
+		// @TODO: Include active workflow and check whether webhook has been removed
+
+		expect(user).toBeNull();
+		expect(sharedWorkflow).toBeNull();
+		expect(sharedCredential).toBeNull();
+		expect(workflow).toBeNull();
+		expect(credential).toBeNull();
 
-		// TODO: Include active workflow and check whether webhook has been removed
+		// restore
 
-		const credential = await Db.collections.Credentials.findOneBy({ id: savedCredential.id });
-		expect(credential).toBeNull(); // deleted
+		member = await createMember();
+	});
+
+	test('should delete user and transfer their resources', async () => {
+		const [savedWorkflow, savedCredential] = await Promise.all([
+			await createWorkflow({ name: randomName() }, member),
+			await saveCredential(
+				{ name: randomName(), type: '', data: {} },
+				{
+					user: member,
+					role: 'credential:owner',
+				},
+			),
+		]);
+
+		const response = await ownerAgent.delete(`/users/${member.id}`).query({
+			transferId: owner.id,
+		});
+
+		expect(response.statusCode).toBe(200);
+
+		const [user, sharedWorkflow, sharedCredential] = await Promise.all([
+			await Container.get(UserRepository).findOneBy({ id: member.id }),
+			await Container.get(SharedWorkflowRepository).findOneOrFail({
+				relations: ['workflow'],
+				where: { userId: owner.id },
+			}),
+			await Container.get(SharedCredentialsRepository).findOneOrFail({
+				relations: ['credentials'],
+				where: { userId: owner.id },
+			}),
+		]);
+
+		expect(user).toBeNull();
+		expect(sharedWorkflow.workflow.id).toBe(savedWorkflow.id);
+		expect(sharedCredential.credentials.id).toBe(savedCredential.id);
 	});
 
 	test('should fail to delete self', async () => {
-		const response = await authOwnerAgent.delete(`/users/${owner.id}`);
+		const response = await ownerAgent.delete(`/users/${owner.id}`);
 
 		expect(response.statusCode).toBe(400);
 
-		const user = await Db.collections.User.findOneBy({ id: owner.id });
+		const user = await getUserById(owner.id);
+
 		expect(user).toBeDefined();
 	});
 
-	test('should fail if user to delete is transferee', async () => {
-		const { id: idToDelete } = await testDb.createUser({ globalRole: globalMemberRole });
-
-		const response = await authOwnerAgent.delete(`/users/${idToDelete}`).query({
-			transferId: idToDelete,
+	test('should fail to delete if user to delete is transferee', async () => {
+		const response = await ownerAgent.delete(`/users/${member.id}`).query({
+			transferId: member.id,
 		});
 
 		expect(response.statusCode).toBe(400);
 
-		const user = await Db.collections.User.findOneBy({ id: idToDelete });
+		const user = await Container.get(UserRepository).findOneBy({ id: member.id });
+
 		expect(user).toBeDefined();
 	});
+});
 
-	test('with transferId should perform transfer', async () => {
-		const userToDelete = await testDb.createUser({ globalRole: globalMemberRole });
+describe('PATCH /users/:id/role', () => {
+	let owner: User;
+	let admin: User;
+	let otherAdmin: User;
+	let member: User;
+	let otherMember: User;
+
+	let ownerAgent: SuperAgentTest;
+	let adminAgent: SuperAgentTest;
+	let memberAgent: SuperAgentTest;
+	let authlessAgent: SuperAgentTest;
+
+	const { NO_ADMIN_ON_OWNER, NO_USER, NO_OWNER_ON_OWNER } =
+		UsersController.ERROR_MESSAGES.CHANGE_ROLE;
+
+	const UNAUTHORIZED = 'Unauthorized';
+
+	beforeAll(async () => {
+		await testDb.truncate(['User']);
+
+		[owner, admin, otherAdmin, member, otherMember] = await Promise.all([
+			await createOwner(),
+			await createAdmin(),
+			await createAdmin(),
+			await createMember(),
+			await createMember(),
+		]);
+
+		ownerAgent = testServer.authAgentFor(owner);
+		adminAgent = testServer.authAgentFor(admin);
+		memberAgent = testServer.authAgentFor(member);
+		authlessAgent = testServer.authlessAgent;
+	});
 
-		const savedWorkflow = await testDb.createWorkflow(undefined, userToDelete);
+	describe('unauthenticated user', () => {
+		test('should receive 401', async () => {
+			const response = await authlessAgent.patch(`/users/${member.id}/role`).send({
+				newRoleName: 'global:admin',
+			});
 
-		const savedCredential = await testDb.saveCredential(randomCredentialPayload(), {
-			user: userToDelete,
-			role: credentialOwnerRole,
+			expect(response.statusCode).toBe(401);
 		});
+	});
 
-		const response = await authOwnerAgent.delete(`/users/${userToDelete.id}`).query({
-			transferId: owner.id,
+	describe('Invalid payload should return 400 when newRoleName', () => {
+		test.each([
+			['is missing', {}],
+			['is `owner`', { newRoleName: 'global:owner' }],
+			['is an array', { newRoleName: ['global:owner'] }],
+		])('%s', async (_, payload) => {
+			const response = await adminAgent.patch(`/users/${member.id}/role`).send(payload);
+			expect(response.statusCode).toBe(400);
+			expect(response.body.message).toBe(
+				'newRoleName must be one of the following values: global:admin, global:member',
+			);
 		});
+	});
 
-		expect(response.statusCode).toBe(200);
+	describe('member', () => {
+		test('should fail to demote owner to member', async () => {
+			const response = await memberAgent.patch(`/users/${owner.id}/role`).send({
+				newRoleName: 'global:member',
+			});
 
-		const sharedWorkflow = await Db.collections.SharedWorkflow.findOneOrFail({
-			relations: ['workflow'],
-			where: { userId: owner.id },
+			expect(response.statusCode).toBe(403);
+			expect(response.body.message).toBe(UNAUTHORIZED);
 		});
 
-		expect(sharedWorkflow.workflow).toBeDefined();
-		expect(sharedWorkflow.workflow.id).toBe(savedWorkflow.id);
+		test('should fail to demote owner to admin', async () => {
+			const response = await memberAgent.patch(`/users/${owner.id}/role`).send({
+				newRoleName: 'global:admin',
+			});
 
-		const sharedCredential = await Db.collections.SharedCredentials.findOneOrFail({
-			relations: ['credentials'],
-			where: { userId: owner.id },
+			expect(response.statusCode).toBe(403);
+			expect(response.body.message).toBe(UNAUTHORIZED);
 		});
 
-		expect(sharedCredential.credentials).toBeDefined();
-		expect(sharedCredential.credentials.id).toBe(savedCredential.id);
+		test('should fail to demote admin to member', async () => {
+			const response = await memberAgent.patch(`/users/${admin.id}/role`).send({
+				newRoleName: 'global:member',
+			});
 
-		const deletedUser = await Db.collections.User.findOneBy({ id: userToDelete.id });
+			expect(response.statusCode).toBe(403);
+			expect(response.body.message).toBe(UNAUTHORIZED);
+		});
 
-		expect(deletedUser).toBeNull();
-	});
-});
+		test('should fail to promote other member to owner', async () => {
+			const response = await memberAgent.patch(`/users/${otherMember.id}/role`).send({
+				newRoleName: 'global:owner',
+			});
 
-describe('POST /users/:id', () => {
-	test('should fill out a user shell', async () => {
-		const memberShell = await testDb.createUserShell(globalMemberRole);
-
-		const memberData = {
-			inviterId: owner.id,
-			firstName: randomName(),
-			lastName: randomName(),
-			password: randomValidPassword(),
-		};
-
-		const response = await authlessAgent.post(`/users/${memberShell.id}`).send(memberData);
-
-		const {
-			id,
-			email,
-			firstName,
-			lastName,
-			personalizationAnswers,
-			password,
-			resetPasswordToken,
-			globalRole,
-			isPending,
-			apiKey,
-		} = response.body.data;
-
-		expect(validator.isUUID(id)).toBe(true);
-		expect(email).toBeDefined();
-		expect(firstName).toBe(memberData.firstName);
-		expect(lastName).toBe(memberData.lastName);
-		expect(personalizationAnswers).toBeNull();
-		expect(password).toBeUndefined();
-		expect(resetPasswordToken).toBeUndefined();
-		expect(isPending).toBe(false);
-		expect(globalRole).toBeDefined();
-		expect(apiKey).not.toBeDefined();
-
-		const authToken = utils.getAuthToken(response);
-		expect(authToken).toBeDefined();
-
-		const member = await Db.collections.User.findOneByOrFail({ id: memberShell.id });
-		expect(member.firstName).toBe(memberData.firstName);
-		expect(member.lastName).toBe(memberData.lastName);
-		expect(member.password).not.toBe(memberData.password);
-	});
+			expect(response.statusCode).toBe(403);
+			expect(response.body.message).toBe(UNAUTHORIZED);
+		});
 
-	test('should fail with invalid inputs', async () => {
-		const memberShellEmail = randomEmail();
+		test('should fail to promote other member to admin', async () => {
+			const response = await memberAgent.patch(`/users/${otherMember.id}/role`).send({
+				newRoleName: 'global:admin',
+			});
 
-		const memberShell = await Db.collections.User.save({
-			email: memberShellEmail,
-			globalRole: globalMemberRole,
+			expect(response.statusCode).toBe(403);
+			expect(response.body.message).toBe(UNAUTHORIZED);
 		});
 
-		const invalidPayloads = [
-			{
-				firstName: randomName(),
-				lastName: randomName(),
-				password: randomValidPassword(),
-			},
-			{
-				inviterId: owner.id,
-				firstName: randomName(),
-				password: randomValidPassword(),
-			},
-			{
-				inviterId: owner.id,
-				firstName: randomName(),
-				password: randomValidPassword(),
-			},
-			{
-				inviterId: owner.id,
-				firstName: randomName(),
-				lastName: randomName(),
-			},
-			{
-				inviterId: owner.id,
-				firstName: randomName(),
-				lastName: randomName(),
-				password: randomInvalidPassword(),
-			},
-		];
-
-		await Promise.all(
-			invalidPayloads.map(async (invalidPayload) => {
-				const response = await authlessAgent.post(`/users/${memberShell.id}`).send(invalidPayload);
-				expect(response.statusCode).toBe(400);
-
-				const storedUser = await Db.collections.User.findOneOrFail({
-					where: { email: memberShellEmail },
-				});
+		test('should fail to promote self to admin', async () => {
+			const response = await memberAgent.patch(`/users/${member.id}/role`).send({
+				newRoleName: 'global:admin',
+			});
 
-				expect(storedUser.firstName).toBeNull();
-				expect(storedUser.lastName).toBeNull();
-				expect(storedUser.password).toBeNull();
-			}),
-		);
+			expect(response.statusCode).toBe(403);
+			expect(response.body.message).toBe(UNAUTHORIZED);
+		});
+
+		test('should fail to promote self to owner', async () => {
+			const response = await memberAgent.patch(`/users/${member.id}/role`).send({
+				newRoleName: 'global:owner',
+			});
+
+			expect(response.statusCode).toBe(403);
+			expect(response.body.message).toBe(UNAUTHORIZED);
+		});
 	});
 
-	test('should fail with already accepted invite', async () => {
-		const member = await testDb.createUser({ globalRole: globalMemberRole });
+	describe('admin', () => {
+		test('should receive 404 on unknown target user', async () => {
+			const response = await adminAgent
+				.patch('/users/c2317ff3-7a9f-4fd4-ad2b-7331f6359260/role')
+				.send({
+					newRoleName: 'global:member',
+				});
 
-		const newMemberData = {
-			inviterId: owner.id,
-			firstName: randomName(),
-			lastName: randomName(),
-			password: randomValidPassword(),
-		};
+			expect(response.statusCode).toBe(404);
+			expect(response.body.message).toBe(NO_USER);
+		});
 
-		const response = await authlessAgent.post(`/users/${member.id}`).send(newMemberData);
+		test('should fail to demote owner to admin', async () => {
+			const response = await adminAgent.patch(`/users/${owner.id}/role`).send({
+				newRoleName: 'global:admin',
+			});
 
-		expect(response.statusCode).toBe(400);
+			expect(response.statusCode).toBe(403);
+			expect(response.body.message).toBe(NO_ADMIN_ON_OWNER);
+		});
 
-		const storedMember = await Db.collections.User.findOneOrFail({
-			where: { email: member.email },
+		test('should fail to demote owner to member', async () => {
+			const response = await adminAgent.patch(`/users/${owner.id}/role`).send({
+				newRoleName: 'global:member',
+			});
+
+			expect(response.statusCode).toBe(403);
+			expect(response.body.message).toBe(NO_ADMIN_ON_OWNER);
 		});
-		expect(storedMember.firstName).not.toBe(newMemberData.firstName);
-		expect(storedMember.lastName).not.toBe(newMemberData.lastName);
 
-		const comparisonResult = await compareHash(member.password, storedMember.password);
-		expect(comparisonResult).toBe(false);
-		expect(storedMember.password).not.toBe(newMemberData.password);
-	});
-});
+		test('should fail to promote member to admin if not licensed', async () => {
+			testServer.license.disable('feat:advancedPermissions');
 
-describe('POST /users', () => {
-	beforeEach(() => {
-		config.set('userManagement.emails.mode', 'smtp');
-	});
+			const response = await adminAgent.patch(`/users/${member.id}/role`).send({
+				newRoleName: 'global:admin',
+			});
 
-	test('should succeed if emailing is not set up', async () => {
-		const response = await authOwnerAgent.post('/users').send([{ email: randomEmail() }]);
+			expect(response.statusCode).toBe(403);
+			expect(response.body.message).toBe('Plan lacks license for this feature');
+		});
 
-		expect(response.statusCode).toBe(200);
-		expect(response.body.data[0].user.inviteAcceptUrl).toBeDefined();
-	});
+		test('should be able to demote admin to member', async () => {
+			const response = await adminAgent.patch(`/users/${otherAdmin.id}/role`).send({
+				newRoleName: 'global:member',
+			});
 
-	test('should fail if user management is disabled', async () => {
-		config.set('userManagement.disabled', true);
-		config.set('userManagement.isInstanceOwnerSetUp', false);
+			expect(response.statusCode).toBe(200);
+			expect(response.body.data).toStrictEqual({ success: true });
 
-		const response = await authOwnerAgent.post('/users').send([{ email: randomEmail() }]);
+			const user = await getUserById(otherAdmin.id);
 
-		expect(response.statusCode).toBe(400);
-	});
+			expect(user.role).toBe('global:member');
 
-	test('should email invites and create user shells but ignore existing', async () => {
-		const member = await testDb.createUser({ globalRole: globalMemberRole });
-		const memberShell = await testDb.createUserShell(globalMemberRole);
+			// restore other admin
 
-		const testEmails = [
-			randomEmail(),
-			randomEmail().toUpperCase(),
-			memberShell.email,
-			member.email,
-		];
+			otherAdmin = await createAdmin();
+			adminAgent = testServer.authAgentFor(otherAdmin);
+		});
 
-		const payload = testEmails.map((e) => ({ email: e }));
+		test('should be able to demote self to member', async () => {
+			const response = await adminAgent.patch(`/users/${admin.id}/role`).send({
+				newRoleName: 'global:member',
+			});
 
-		const response = await authOwnerAgent.post('/users').send(payload);
+			expect(response.statusCode).toBe(200);
+			expect(response.body.data).toStrictEqual({ success: true });
 
-		expect(response.statusCode).toBe(200);
+			const user = await getUserById(admin.id);
 
-		for (const {
-			user: { id, email: receivedEmail },
-			error,
-		} of response.body.data) {
-			expect(validator.isUUID(id)).toBe(true);
-			expect(id).not.toBe(member.id);
-
-			const lowerCasedEmail = receivedEmail.toLowerCase();
-			expect(receivedEmail).toBe(lowerCasedEmail);
-			expect(payload.some(({ email }) => email.toLowerCase() === lowerCasedEmail)).toBe(true);
-
-			if (error) {
-				expect(error).toBe('Email could not be sent');
-			}
-
-			const storedUser = await Db.collections.User.findOneByOrFail({ id });
-			const { firstName, lastName, personalizationAnswers, password, resetPasswordToken } =
-				storedUser;
-
-			expect(firstName).toBeNull();
-			expect(lastName).toBeNull();
-			expect(personalizationAnswers).toBeNull();
-			expect(password).toBeNull();
-			expect(resetPasswordToken).toBeNull();
-		}
-	});
+			expect(user.role).toBe('global:member');
 
-	test('should fail with invalid inputs', async () => {
-		const invalidPayloads = [
-			randomEmail(),
-			[randomEmail()],
-			{},
-			[{ name: randomName() }],
-			[{ email: randomName() }],
-		];
-
-		await Promise.all(
-			invalidPayloads.map(async (invalidPayload) => {
-				const response = await authOwnerAgent.post('/users').send(invalidPayload);
-				expect(response.statusCode).toBe(400);
-
-				const users = await Db.collections.User.find();
-				expect(users.length).toBe(1); // DB unaffected
-			}),
-		);
-	});
+			// restore admin
 
-	test('should ignore an empty payload', async () => {
-		const response = await authOwnerAgent.post('/users').send([]);
+			admin = await createAdmin();
+			adminAgent = testServer.authAgentFor(admin);
+		});
 
-		const { data } = response.body;
+		test('should be able to promote member to admin if licensed', async () => {
+			const response = await adminAgent.patch(`/users/${member.id}/role`).send({
+				newRoleName: 'global:admin',
+			});
 
-		expect(response.statusCode).toBe(200);
-		expect(Array.isArray(data)).toBe(true);
-		expect(data.length).toBe(0);
+			expect(response.statusCode).toBe(200);
+			expect(response.body.data).toStrictEqual({ success: true });
 
-		const users = await Db.collections.User.find();
-		expect(users.length).toBe(1);
-	});
-});
+			const user = await getUserById(admin.id);
+
+			expect(user.role).toBe('global:admin');
 
-describe('POST /users/:id/reinvite', () => {
-	beforeEach(() => {
-		config.set('userManagement.emails.mode', 'smtp');
-		// those configs are needed to make sure the reinvite email is sent,because of this check isEmailSetUp()
-		config.set('userManagement.emails.smtp.host', 'host');
-		config.set('userManagement.emails.smtp.auth.user', 'user');
-		config.set('userManagement.emails.smtp.auth.pass', 'pass');
+			// restore member
+
+			member = await createMember();
+			memberAgent = testServer.authAgentFor(member);
+		});
 	});
 
-	test('should send reinvite, but fail if user already accepted invite', async () => {
-		const email = randomEmail();
-		const payload = [{ email }];
-		const response = await authOwnerAgent.post('/users').send(payload);
+	describe('owner', () => {
+		test('should fail to demote self to admin', async () => {
+			const response = await ownerAgent.patch(`/users/${owner.id}/role`).send({
+				newRoleName: 'global:admin',
+			});
 
-		expect(response.statusCode).toBe(200);
+			expect(response.statusCode).toBe(403);
+			expect(response.body.message).toBe(NO_OWNER_ON_OWNER);
+		});
 
-		const { data } = response.body;
-		const invitedUserId = data[0].user.id;
-		const reinviteResponse = await authOwnerAgent.post(`/users/${invitedUserId}/reinvite`);
+		test('should fail to demote self to member', async () => {
+			const response = await ownerAgent.patch(`/users/${owner.id}/role`).send({
+				newRoleName: 'global:member',
+			});
 
-		expect(reinviteResponse.statusCode).toBe(200);
+			expect(response.statusCode).toBe(403);
+			expect(response.body.message).toBe(NO_OWNER_ON_OWNER);
+		});
 
-		const member = await testDb.createUser({ globalRole: globalMemberRole });
-		const reinviteMemberResponse = await authOwnerAgent.post(`/users/${member.id}/reinvite`);
+		test('should fail to promote member to admin if not licensed', async () => {
+			testServer.license.disable('feat:advancedPermissions');
 
-		expect(reinviteMemberResponse.statusCode).toBe(400);
-	});
-});
+			const response = await ownerAgent.patch(`/users/${member.id}/role`).send({
+				newRoleName: 'global:admin',
+			});
 
-describe('UserManagementMailer expect NodeMailer.verifyConnection', () => {
-	let mockInit: jest.SpyInstance<Promise<void>, []>;
-	let mockVerifyConnection: jest.SpyInstance<Promise<void>, []>;
+			expect(response.statusCode).toBe(403);
+			expect(response.body.message).toBe('Plan lacks license for this feature');
+		});
 
-	beforeAll(() => {
-		mockVerifyConnection = jest
-			.spyOn(NodeMailer.prototype, 'verifyConnection')
-			.mockImplementation(async () => {});
-		mockInit = jest.spyOn(NodeMailer.prototype, 'init').mockImplementation(async () => {});
-	});
+		test('should be able to promote member to admin if licensed', async () => {
+			const response = await ownerAgent.patch(`/users/${member.id}/role`).send({
+				newRoleName: 'global:admin',
+			});
 
-	afterAll(() => {
-		mockVerifyConnection.mockRestore();
-		mockInit.mockRestore();
-	});
+			expect(response.statusCode).toBe(200);
+			expect(response.body.data).toStrictEqual({ success: true });
 
-	test('not be called when SMTP not set up', async () => {
-		const userManagementMailer = new UserManagementMailer();
-		// NodeMailer.verifyConnection gets called only explicitly
-		expect(async () => await userManagementMailer.verifyConnection()).rejects.toThrow();
+			const user = await getUserById(admin.id);
 
-		expect(NodeMailer.prototype.verifyConnection).toHaveBeenCalledTimes(0);
-	});
+			expect(user.role).toBe('global:admin');
 
-	test('to be called when SMTP set up', async () => {
-		// host needs to be set, otherwise smtp is skipped
-		config.set('userManagement.emails.smtp.host', 'host');
-		config.set('userManagement.emails.mode', 'smtp');
+			// restore member
 
-		const userManagementMailer = new UserManagementMailer();
-		// NodeMailer.verifyConnection gets called only explicitly
-		expect(async () => await userManagementMailer.verifyConnection()).not.toThrow();
+			member = await createMember();
+			memberAgent = testServer.authAgentFor(member);
+		});
+
+		test('should be able to demote admin to member', async () => {
+			const response = await ownerAgent.patch(`/users/${admin.id}/role`).send({
+				newRoleName: 'global:member',
+			});
+
+			expect(response.statusCode).toBe(200);
+			expect(response.body.data).toStrictEqual({ success: true });
+
+			const user = await getUserById(admin.id);
+
+			expect(user.role).toBe('global:member');
+
+			// restore admin
+
+			admin = await createAdmin();
+			adminAgent = testServer.authAgentFor(admin);
+		});
 	});
 });
diff --git a/packages/cli/test/integration/variables.test.ts b/packages/cli/test/integration/variables.test.ts
index 46e0814622555..8b84f67dcfd18 100644
--- a/packages/cli/test/integration/variables.test.ts
+++ b/packages/cli/test/integration/variables.test.ts
@@ -1,379 +1,361 @@
-import type { Application } from 'express';
+import Container from 'typedi';
+import type { SuperAgentTest } from 'supertest';
+import type { Variables } from '@db/entities/Variables';
+import { VariablesRepository } from '@db/repositories/variables.repository';
+import { generateNanoId } from '@db/utils/generators';
+import { VariablesService } from '@/environments/variables/variables.service.ee';
 
-import type { User } from '@/databases/entities/User';
 import * as testDb from './shared/testDb';
-import * as utils from './shared/utils';
-
-import type { AuthAgent } from './shared/types';
-import type { ClassLike, MockedClass } from 'jest-mock';
-import { License } from '@/License';
-
-// mock that credentialsSharing is not enabled
-let app: Application;
-let ownerUser: User;
-let memberUser: User;
-let authAgent: AuthAgent;
-let variablesSpy: jest.SpyInstance<boolean>;
-let licenseLike = {
-	isVariablesEnabled: jest.fn().mockReturnValue(true),
-	getVariablesLimit: jest.fn().mockReturnValue(-1),
-};
+import * as utils from './shared/utils/';
+import { createOwner, createUser } from './shared/db/users';
+
+let authOwnerAgent: SuperAgentTest;
+let authMemberAgent: SuperAgentTest;
+
+const testServer = utils.setupTestServer({ endpointGroups: ['variables'] });
+const license = testServer.license;
+
+async function createVariable(key: string, value: string) {
+	const result = await Container.get(VariablesRepository).save({
+		id: generateNanoId(),
+		key,
+		value,
+	});
+	await Container.get(VariablesService).updateCache();
+	return result;
+}
+
+async function getVariableByKey(key: string) {
+	return await Container.get(VariablesRepository).findOne({
+		where: {
+			key,
+		},
+	});
+}
+
+async function getVariableById(id: string) {
+	return await Container.get(VariablesRepository).findOne({
+		where: {
+			id,
+		},
+	});
+}
 
 beforeAll(async () => {
-	app = await utils.initTestServer({ endpointGroups: ['variables'] });
-
-	utils.initConfigFile();
-	utils.mockInstance(License, licenseLike);
-
-	ownerUser = await testDb.createOwner();
-	memberUser = await testDb.createUser();
-
-	authAgent = utils.createAuthAgent(app);
+	const owner = await createOwner();
+	authOwnerAgent = testServer.authAgentFor(owner);
+	const member = await createUser();
+	authMemberAgent = testServer.authAgentFor(member);
+
+	license.setDefaults({
+		features: ['feat:variables'],
+		// quota: {
+		// 	'quota:maxVariables': -1,
+		// },
+	});
 });
 
 beforeEach(async () => {
 	await testDb.truncate(['Variables']);
-	licenseLike.isVariablesEnabled.mockReturnValue(true);
-	licenseLike.getVariablesLimit.mockReturnValue(-1);
-});
-
-afterAll(async () => {
-	await testDb.terminate();
 });
 
 // ----------------------------------------
 // GET /variables - fetch all variables
 // ----------------------------------------
-
-test('GET /variables should return all variables for an owner', async () => {
-	await Promise.all([
-		testDb.createVariable('test1', 'value1'),
-		testDb.createVariable('test2', 'value2'),
-	]);
-
-	const response = await authAgent(ownerUser).get('/variables');
-	expect(response.statusCode).toBe(200);
-	expect(response.body.data.length).toBe(2);
-});
-
-test('GET /variables should return all variables for a member', async () => {
-	await Promise.all([
-		testDb.createVariable('test1', 'value1'),
-		testDb.createVariable('test2', 'value2'),
-	]);
-
-	const response = await authAgent(memberUser).get('/variables');
-	expect(response.statusCode).toBe(200);
-	expect(response.body.data.length).toBe(2);
+describe('GET /variables', () => {
+	beforeEach(async () => {
+		await Promise.all([createVariable('test1', 'value1'), createVariable('test2', 'value2')]);
+	});
+
+	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);
+	});
+
+	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);
+	});
 });
 
 // ----------------------------------------
 // GET /variables/:id - get a single variable
 // ----------------------------------------
-
-test('GET /variables/:id should return a single variable for an owner', async () => {
-	const [var1, var2] = await Promise.all([
-		testDb.createVariable('test1', 'value1'),
-		testDb.createVariable('test2', 'value2'),
-	]);
-
-	const response1 = await authAgent(ownerUser).get(`/variables/${var1.id}`);
-	expect(response1.statusCode).toBe(200);
-	expect(response1.body.data.key).toBe('test1');
-
-	const response2 = await authAgent(ownerUser).get(`/variables/${var2.id}`);
-	expect(response2.statusCode).toBe(200);
-	expect(response2.body.data.key).toBe('test2');
-});
-
-test('GET /variables/:id should return a single variable for a member', async () => {
-	const [var1, var2] = await Promise.all([
-		testDb.createVariable('test1', 'value1'),
-		testDb.createVariable('test2', 'value2'),
-	]);
-
-	const response1 = await authAgent(memberUser).get(`/variables/${var1.id}`);
-	expect(response1.statusCode).toBe(200);
-	expect(response1.body.data.key).toBe('test1');
-
-	const response2 = await authAgent(memberUser).get(`/variables/${var2.id}`);
-	expect(response2.statusCode).toBe(200);
-	expect(response2.body.data.key).toBe('test2');
+describe('GET /variables/:id', () => {
+	let var1: Variables, var2: Variables;
+	beforeEach(async () => {
+		[var1, var2] = await Promise.all([
+			createVariable('test1', 'value1'),
+			createVariable('test2', 'value2'),
+		]);
+	});
+
+	test('should return a single variable for an owner', async () => {
+		const response1 = await authOwnerAgent.get(`/variables/${var1.id}`);
+		expect(response1.statusCode).toBe(200);
+		expect(response1.body.data.key).toBe('test1');
+
+		const response2 = await authOwnerAgent.get(`/variables/${var2.id}`);
+		expect(response2.statusCode).toBe(200);
+		expect(response2.body.data.key).toBe('test2');
+	});
+
+	test('should return a single variable for a member', async () => {
+		const response1 = await authMemberAgent.get(`/variables/${var1.id}`);
+		expect(response1.statusCode).toBe(200);
+		expect(response1.body.data.key).toBe('test1');
+
+		const response2 = await authMemberAgent.get(`/variables/${var2.id}`);
+		expect(response2.statusCode).toBe(200);
+		expect(response2.body.data.key).toBe('test2');
+	});
 });
 
 // ----------------------------------------
 // POST /variables - create a new variable
 // ----------------------------------------
-
-test('POST /variables should create a new credential and return it for an owner', async () => {
-	const toCreate = {
-		key: 'create1',
-		value: 'createvalue1',
-	};
-	const response = await authAgent(ownerUser).post('/variables').send(toCreate);
-	expect(response.statusCode).toBe(200);
-	expect(response.body.data.key).toBe(toCreate.key);
-	expect(response.body.data.value).toBe(toCreate.value);
-
-	const [byId, byKey] = await Promise.all([
-		testDb.getVariableById(response.body.data.id),
-		testDb.getVariableByKey(toCreate.key),
-	]);
-
-	expect(byId).not.toBeNull();
-	expect(byId!.key).toBe(toCreate.key);
-	expect(byId!.value).toBe(toCreate.value);
-
-	expect(byKey).not.toBeNull();
-	expect(byKey!.id).toBe(response.body.data.id);
-	expect(byKey!.value).toBe(toCreate.value);
-});
-
-test('POST /variables should not create a new credential and return it for a member', async () => {
-	const toCreate = {
-		key: 'create1',
-		value: 'createvalue1',
-	};
-	const response = await authAgent(memberUser).post('/variables').send(toCreate);
-	expect(response.statusCode).toBe(401);
-	expect(response.body.data?.key).not.toBe(toCreate.key);
-	expect(response.body.data?.value).not.toBe(toCreate.value);
-
-	const byKey = await testDb.getVariableByKey(toCreate.key);
-	expect(byKey).toBeNull();
-});
-
-test("POST /variables should not create a new credential and return it if the instance doesn't have a license", async () => {
-	licenseLike.isVariablesEnabled.mockReturnValue(false);
-	const toCreate = {
-		key: 'create1',
-		value: 'createvalue1',
-	};
-	const response = await authAgent(ownerUser).post('/variables').send(toCreate);
-	expect(response.statusCode).toBe(400);
-	expect(response.body.data?.key).not.toBe(toCreate.key);
-	expect(response.body.data?.value).not.toBe(toCreate.value);
-
-	const byKey = await testDb.getVariableByKey(toCreate.key);
-	expect(byKey).toBeNull();
-});
-
-test('POST /variables should fail to create a new credential and if one with the same key exists', async () => {
-	const toCreate = {
-		key: 'create1',
-		value: 'createvalue1',
-	};
-	await testDb.createVariable(toCreate.key, toCreate.value);
-	const response = await authAgent(ownerUser).post('/variables').send(toCreate);
-	expect(response.statusCode).toBe(500);
-	expect(response.body.data?.key).not.toBe(toCreate.key);
-	expect(response.body.data?.value).not.toBe(toCreate.value);
-});
-
-test('POST /variables should not fail if variable limit not reached', async () => {
-	licenseLike.getVariablesLimit.mockReturnValue(5);
-	let i = 1;
-	let toCreate = {
+describe('POST /variables', () => {
+	const generatePayload = (i = 1) => ({
 		key: `create${i}`,
 		value: `createvalue${i}`,
-	};
-	while (i < 3) {
-		await testDb.createVariable(toCreate.key, toCreate.value);
-		i++;
-		toCreate = {
-			key: `create${i}`,
-			value: `createvalue${i}`,
+	});
+	const toCreate = generatePayload();
+
+	test('should create a new variable and return it for an owner', async () => {
+		const response = await authOwnerAgent.post('/variables').send(toCreate);
+		expect(response.statusCode).toBe(200);
+		expect(response.body.data.key).toBe(toCreate.key);
+		expect(response.body.data.value).toBe(toCreate.value);
+
+		const [byId, byKey] = await Promise.all([
+			getVariableById(response.body.data.id),
+			getVariableByKey(toCreate.key),
+		]);
+
+		expect(byId).not.toBeNull();
+		expect(byId!.key).toBe(toCreate.key);
+		expect(byId!.value).toBe(toCreate.value);
+
+		expect(byKey).not.toBeNull();
+		expect(byKey!.id).toBe(response.body.data.id);
+		expect(byKey!.value).toBe(toCreate.value);
+	});
+
+	test('should not create a new variable and return it for a member', async () => {
+		const response = await authMemberAgent.post('/variables').send(toCreate);
+		expect(response.statusCode).toBe(403);
+		expect(response.body.data?.key).not.toBe(toCreate.key);
+		expect(response.body.data?.value).not.toBe(toCreate.value);
+
+		const byKey = await getVariableByKey(toCreate.key);
+		expect(byKey).toBeNull();
+	});
+
+	test("POST /variables should not create a new variable and return it if the instance doesn't have a license", async () => {
+		license.disable('feat:variables');
+		const response = await authOwnerAgent.post('/variables').send(toCreate);
+		expect(response.statusCode).toBe(403);
+		expect(response.body.data?.key).not.toBe(toCreate.key);
+		expect(response.body.data?.value).not.toBe(toCreate.value);
+
+		const byKey = await getVariableByKey(toCreate.key);
+		expect(byKey).toBeNull();
+	});
+
+	test('should fail to create a new variable and if one with the same key exists', async () => {
+		await createVariable(toCreate.key, toCreate.value);
+		const response = await authOwnerAgent.post('/variables').send(toCreate);
+		expect(response.statusCode).toBe(500);
+		expect(response.body.data?.key).not.toBe(toCreate.key);
+		expect(response.body.data?.value).not.toBe(toCreate.value);
+	});
+
+	test('should not fail if variable limit not reached', async () => {
+		license.setQuota('quota:maxVariables', 5);
+		let i = 1;
+		let toCreate = generatePayload(i);
+		while (i < 3) {
+			await createVariable(toCreate.key, toCreate.value);
+			i++;
+			toCreate = generatePayload(i);
+		}
+		const response = await authOwnerAgent.post('/variables').send(toCreate);
+		expect(response.statusCode).toBe(200);
+		expect(response.body.data?.key).toBe(toCreate.key);
+		expect(response.body.data?.value).toBe(toCreate.value);
+	});
+
+	test('should fail if variable limit reached', async () => {
+		license.setQuota('quota:maxVariables', 5);
+		let i = 1;
+		let toCreate = generatePayload(i);
+		while (i < 6) {
+			await createVariable(toCreate.key, toCreate.value);
+			i++;
+			toCreate = generatePayload(i);
+		}
+		const response = await authOwnerAgent.post('/variables').send(toCreate);
+		expect(response.statusCode).toBe(400);
+		expect(response.body.data?.key).not.toBe(toCreate.key);
+		expect(response.body.data?.value).not.toBe(toCreate.value);
+	});
+
+	test('should fail if key too long', async () => {
+		const toCreate = {
+			// 51 'a's
+			key: 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
+			value: 'value',
 		};
-	}
-	const response = await authAgent(ownerUser).post('/variables').send(toCreate);
-	expect(response.statusCode).toBe(200);
-	expect(response.body.data?.key).toBe(toCreate.key);
-	expect(response.body.data?.value).toBe(toCreate.value);
-});
-
-test('POST /variables should fail if variable limit reached', async () => {
-	licenseLike.getVariablesLimit.mockReturnValue(5);
-	let i = 1;
-	let toCreate = {
-		key: `create${i}`,
-		value: `createvalue${i}`,
-	};
-	while (i < 6) {
-		await testDb.createVariable(toCreate.key, toCreate.value);
-		i++;
-		toCreate = {
-			key: `create${i}`,
-			value: `createvalue${i}`,
+		const response = await authOwnerAgent.post('/variables').send(toCreate);
+		expect(response.statusCode).toBe(400);
+		expect(response.body.data?.key).not.toBe(toCreate.key);
+		expect(response.body.data?.value).not.toBe(toCreate.value);
+	});
+
+	test('should fail if value too long', async () => {
+		const toCreate = {
+			key: 'key',
+			// 256 'a's
+			value:
+				'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
 		};
-	}
-	const response = await authAgent(ownerUser).post('/variables').send(toCreate);
-	expect(response.statusCode).toBe(400);
-	expect(response.body.data?.key).not.toBe(toCreate.key);
-	expect(response.body.data?.value).not.toBe(toCreate.value);
-});
-
-test('POST /variables should fail if key too long', async () => {
-	const toCreate = {
-		// 51 'a's
-		key: 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
-		value: 'value',
-	};
-	const response = await authAgent(ownerUser).post('/variables').send(toCreate);
-	expect(response.statusCode).toBe(400);
-	expect(response.body.data?.key).not.toBe(toCreate.key);
-	expect(response.body.data?.value).not.toBe(toCreate.value);
-});
-
-test('POST /variables should fail if value too long', async () => {
-	const toCreate = {
-		key: 'key',
-		// 256 'a's
-		value:
-			'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
-	};
-	const response = await authAgent(ownerUser).post('/variables').send(toCreate);
-	expect(response.statusCode).toBe(400);
-	expect(response.body.data?.key).not.toBe(toCreate.key);
-	expect(response.body.data?.value).not.toBe(toCreate.value);
-});
-
-test("POST /variables should fail if key contain's prohibited characters", async () => {
-	const toCreate = {
-		// 51 'a's
-		key: 'te$t',
-		value: 'value',
-	};
-	const response = await authAgent(ownerUser).post('/variables').send(toCreate);
-	expect(response.statusCode).toBe(400);
-	expect(response.body.data?.key).not.toBe(toCreate.key);
-	expect(response.body.data?.value).not.toBe(toCreate.value);
+		const response = await authOwnerAgent.post('/variables').send(toCreate);
+		expect(response.statusCode).toBe(400);
+		expect(response.body.data?.key).not.toBe(toCreate.key);
+		expect(response.body.data?.value).not.toBe(toCreate.value);
+	});
+
+	test("should fail if key contain's prohibited characters", async () => {
+		const toCreate = {
+			// 51 'a's
+			key: 'te$t',
+			value: 'value',
+		};
+		const response = await authOwnerAgent.post('/variables').send(toCreate);
+		expect(response.statusCode).toBe(400);
+		expect(response.body.data?.key).not.toBe(toCreate.key);
+		expect(response.body.data?.value).not.toBe(toCreate.value);
+	});
 });
 
 // ----------------------------------------
 // PATCH /variables/:id - change a variable
 // ----------------------------------------
-
-test('PATCH /variables/:id should modify existing credential if use is an owner', async () => {
-	const variable = await testDb.createVariable('test1', 'value1');
+describe('PATCH /variables/:id', () => {
 	const toModify = {
 		key: 'create1',
 		value: 'createvalue1',
 	};
-	const response = await authAgent(ownerUser).patch(`/variables/${variable.id}`).send(toModify);
-	expect(response.statusCode).toBe(200);
-	expect(response.body.data.key).toBe(toModify.key);
-	expect(response.body.data.value).toBe(toModify.value);
-
-	const [byId, byKey] = await Promise.all([
-		testDb.getVariableById(response.body.data.id),
-		testDb.getVariableByKey(toModify.key),
-	]);
-
-	expect(byId).not.toBeNull();
-	expect(byId!.key).toBe(toModify.key);
-	expect(byId!.value).toBe(toModify.value);
-
-	expect(byKey).not.toBeNull();
-	expect(byKey!.id).toBe(response.body.data.id);
-	expect(byKey!.value).toBe(toModify.value);
-});
 
-test('PATCH /variables/:id should modify existing credential if use is an owner', async () => {
-	const variable = await testDb.createVariable('test1', 'value1');
-	const toModify = {
-		key: 'create1',
-		value: 'createvalue1',
-	};
-	const response = await authAgent(ownerUser).patch(`/variables/${variable.id}`).send(toModify);
-	expect(response.statusCode).toBe(200);
-	expect(response.body.data.key).toBe(toModify.key);
-	expect(response.body.data.value).toBe(toModify.value);
-
-	const [byId, byKey] = await Promise.all([
-		testDb.getVariableById(response.body.data.id),
-		testDb.getVariableByKey(toModify.key),
-	]);
-
-	expect(byId).not.toBeNull();
-	expect(byId!.key).toBe(toModify.key);
-	expect(byId!.value).toBe(toModify.value);
-
-	expect(byKey).not.toBeNull();
-	expect(byKey!.id).toBe(response.body.data.id);
-	expect(byKey!.value).toBe(toModify.value);
-});
-
-test('PATCH /variables/:id should not modify existing credential if use is a member', async () => {
-	const variable = await testDb.createVariable('test1', 'value1');
-	const toModify = {
-		key: 'create1',
-		value: 'createvalue1',
-	};
-	const response = await authAgent(memberUser).patch(`/variables/${variable.id}`).send(toModify);
-	expect(response.statusCode).toBe(401);
-	expect(response.body.data?.key).not.toBe(toModify.key);
-	expect(response.body.data?.value).not.toBe(toModify.value);
-
-	const byId = await testDb.getVariableById(variable.id);
-	expect(byId).not.toBeNull();
-	expect(byId!.key).not.toBe(toModify.key);
-	expect(byId!.value).not.toBe(toModify.value);
-});
-
-test('PATCH /variables/:id should not modify existing credential if one with the same key exists', async () => {
-	const toModify = {
-		key: 'create1',
-		value: 'createvalue1',
-	};
-	const [var1, var2] = await Promise.all([
-		testDb.createVariable('test1', 'value1'),
-		testDb.createVariable(toModify.key, toModify.value),
-	]);
-	const response = await authAgent(ownerUser).patch(`/variables/${var1.id}`).send(toModify);
-	expect(response.statusCode).toBe(500);
-	expect(response.body.data?.key).not.toBe(toModify.key);
-	expect(response.body.data?.value).not.toBe(toModify.value);
-
-	const byId = await testDb.getVariableById(var1.id);
-	expect(byId).not.toBeNull();
-	expect(byId!.key).toBe(var1.key);
-	expect(byId!.value).toBe(var1.value);
+	test('should modify existing variable if use is an owner', async () => {
+		const variable = await createVariable('test1', 'value1');
+		const response = await authOwnerAgent.patch(`/variables/${variable.id}`).send(toModify);
+		expect(response.statusCode).toBe(200);
+		expect(response.body.data.key).toBe(toModify.key);
+		expect(response.body.data.value).toBe(toModify.value);
+
+		const [byId, byKey] = await Promise.all([
+			getVariableById(response.body.data.id),
+			getVariableByKey(toModify.key),
+		]);
+
+		expect(byId).not.toBeNull();
+		expect(byId!.key).toBe(toModify.key);
+		expect(byId!.value).toBe(toModify.value);
+
+		expect(byKey).not.toBeNull();
+		expect(byKey!.id).toBe(response.body.data.id);
+		expect(byKey!.value).toBe(toModify.value);
+	});
+
+	test('should modify existing variable if use is an owner', async () => {
+		const variable = await createVariable('test1', 'value1');
+		const response = await authOwnerAgent.patch(`/variables/${variable.id}`).send(toModify);
+		expect(response.statusCode).toBe(200);
+		expect(response.body.data.key).toBe(toModify.key);
+		expect(response.body.data.value).toBe(toModify.value);
+
+		const [byId, byKey] = await Promise.all([
+			getVariableById(response.body.data.id),
+			getVariableByKey(toModify.key),
+		]);
+
+		expect(byId).not.toBeNull();
+		expect(byId!.key).toBe(toModify.key);
+		expect(byId!.value).toBe(toModify.value);
+
+		expect(byKey).not.toBeNull();
+		expect(byKey!.id).toBe(response.body.data.id);
+		expect(byKey!.value).toBe(toModify.value);
+	});
+
+	test('should not modify existing variable if use is a member', async () => {
+		const variable = await createVariable('test1', 'value1');
+		const response = await authMemberAgent.patch(`/variables/${variable.id}`).send(toModify);
+		expect(response.statusCode).toBe(403);
+		expect(response.body.data?.key).not.toBe(toModify.key);
+		expect(response.body.data?.value).not.toBe(toModify.value);
+
+		const byId = await getVariableById(variable.id);
+		expect(byId).not.toBeNull();
+		expect(byId!.key).not.toBe(toModify.key);
+		expect(byId!.value).not.toBe(toModify.value);
+	});
+
+	test('should not modify existing variable if one with the same key exists', async () => {
+		const [var1, var2] = await Promise.all([
+			createVariable('test1', 'value1'),
+			createVariable(toModify.key, toModify.value),
+		]);
+		const response = await authOwnerAgent.patch(`/variables/${var1.id}`).send(toModify);
+		expect(response.statusCode).toBe(500);
+		expect(response.body.data?.key).not.toBe(toModify.key);
+		expect(response.body.data?.value).not.toBe(toModify.value);
+
+		const byId = await getVariableById(var1.id);
+		expect(byId).not.toBeNull();
+		expect(byId!.key).toBe(var1.key);
+		expect(byId!.value).toBe(var1.value);
+	});
 });
 
 // ----------------------------------------
 // DELETE /variables/:id - change a variable
 // ----------------------------------------
-
-test('DELETE /variables/:id should delete a single credential for an owner', async () => {
-	const [var1, var2, var3] = await Promise.all([
-		testDb.createVariable('test1', 'value1'),
-		testDb.createVariable('test2', 'value2'),
-		testDb.createVariable('test3', 'value3'),
-	]);
-
-	const delResponse = await authAgent(ownerUser).delete(`/variables/${var1.id}`);
-	expect(delResponse.statusCode).toBe(200);
-
-	const byId = await testDb.getVariableById(var1.id);
-	expect(byId).toBeNull();
-
-	const getResponse = await authAgent(ownerUser).get('/variables');
-	expect(getResponse.body.data.length).toBe(2);
-});
-
-test('DELETE /variables/:id should not delete a single credential for a member', async () => {
-	const [var1, var2, var3] = await Promise.all([
-		testDb.createVariable('test1', 'value1'),
-		testDb.createVariable('test2', 'value2'),
-		testDb.createVariable('test3', 'value3'),
-	]);
-
-	const delResponse = await authAgent(memberUser).delete(`/variables/${var1.id}`);
-	expect(delResponse.statusCode).toBe(401);
-
-	const byId = await testDb.getVariableById(var1.id);
-	expect(byId).not.toBeNull();
-
-	const getResponse = await authAgent(memberUser).get('/variables');
-	expect(getResponse.body.data.length).toBe(3);
+describe('DELETE /variables/:id', () => {
+	test('should delete a single variable for an owner', async () => {
+		const [var1, var2, var3] = await Promise.all([
+			createVariable('test1', 'value1'),
+			createVariable('test2', 'value2'),
+			createVariable('test3', 'value3'),
+		]);
+
+		const delResponse = await authOwnerAgent.delete(`/variables/${var1.id}`);
+		expect(delResponse.statusCode).toBe(200);
+
+		const byId = await getVariableById(var1.id);
+		expect(byId).toBeNull();
+
+		const getResponse = await authOwnerAgent.get('/variables');
+		expect(getResponse.body.data.length).toBe(2);
+	});
+
+	test('should not delete a single variable for a member', async () => {
+		const [var1, var2, var3] = await Promise.all([
+			createVariable('test1', 'value1'),
+			createVariable('test2', 'value2'),
+			createVariable('test3', 'value3'),
+		]);
+
+		const delResponse = await authMemberAgent.delete(`/variables/${var1.id}`);
+		expect(delResponse.statusCode).toBe(403);
+
+		const byId = await getVariableById(var1.id);
+		expect(byId).not.toBeNull();
+
+		const getResponse = await authMemberAgent.get('/variables');
+		expect(getResponse.body.data.length).toBe(3);
+	});
 });
diff --git a/packages/cli/test/integration/webhooks.api.test.ts b/packages/cli/test/integration/webhooks.api.test.ts
new file mode 100644
index 0000000000000..9ec198693c2c9
--- /dev/null
+++ b/packages/cli/test/integration/webhooks.api.test.ts
@@ -0,0 +1,239 @@
+import { readFileSync } from 'fs';
+import type { SuperAgentTest } from 'supertest';
+import { agent as testAgent } from 'supertest';
+import type { INodeType, INodeTypeDescription, IWebhookFunctions } from 'n8n-workflow';
+
+import { AbstractServer } from '@/AbstractServer';
+import { ExternalHooks } from '@/ExternalHooks';
+import { InternalHooks } from '@/InternalHooks';
+import { NodeTypes } from '@/NodeTypes';
+import { Push } from '@/push';
+import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
+
+import { mockInstance } from '../shared/mocking';
+import { initActiveWorkflowManager } from './shared/utils';
+import * as testDb from './shared/testDb';
+import { createUser } from './shared/db/users';
+import { createWorkflow } from './shared/db/workflows';
+
+describe('Webhook API', () => {
+	mockInstance(ExternalHooks);
+	mockInstance(InternalHooks);
+	mockInstance(Push);
+
+	let agent: SuperAgentTest;
+
+	beforeAll(async () => {
+		await testDb.init();
+	});
+
+	afterAll(async () => {
+		await testDb.terminate();
+	});
+
+	describe('Content-Type support', () => {
+		beforeAll(async () => {
+			const node = new WebhookTestingNode();
+			const user = await createUser();
+			await createWorkflow(createWebhookWorkflow(node), user);
+
+			const nodeTypes = mockInstance(NodeTypes);
+			nodeTypes.getByName.mockReturnValue(node);
+			nodeTypes.getByNameAndVersion.mockReturnValue(node);
+
+			await initActiveWorkflowManager();
+
+			const server = new (class extends AbstractServer {})();
+			await server.start();
+			agent = testAgent(server.app);
+		});
+
+		afterAll(async () => {
+			await testDb.truncate(['Workflow']);
+		});
+
+		test('should handle JSON', async () => {
+			const response = await agent.post('/webhook/abcd').send({ test: true });
+			expect(response.statusCode).toEqual(200);
+			expect(response.body).toEqual({
+				type: 'application/json',
+				body: { test: true },
+				params: {},
+			});
+		});
+
+		test('should handle XML', async () => {
+			const response = await agent
+				.post('/webhook/abcd')
+				.set('content-type', 'application/xml')
+				.send(
+					'<?xml version="1.0" encoding="UTF-8"?><Outer attr="test"><Inner>value</Inner></Outer>',
+				);
+			expect(response.statusCode).toEqual(200);
+			expect(response.body).toEqual({
+				type: 'application/xml',
+				body: {
+					outer: {
+						$: {
+							attr: 'test',
+						},
+						inner: 'value',
+					},
+				},
+				params: {},
+			});
+		});
+
+		test('should handle form-urlencoded', async () => {
+			const response = await agent
+				.post('/webhook/abcd')
+				.set('content-type', 'application/x-www-form-urlencoded')
+				.send('x=5&y=str&z=false');
+			expect(response.statusCode).toEqual(200);
+			expect(response.body).toEqual({
+				type: 'application/x-www-form-urlencoded',
+				body: { x: '5', y: 'str', z: 'false' },
+				params: {},
+			});
+		});
+
+		test('should handle plain text', async () => {
+			const response = await agent
+				.post('/webhook/abcd')
+				.set('content-type', 'text/plain')
+				.send('{"key": "value"}');
+			expect(response.statusCode).toEqual(200);
+			expect(response.body).toEqual({
+				type: 'text/plain',
+				body: '{"key": "value"}',
+				params: {},
+			});
+		});
+
+		test('should handle multipart/form-data', async () => {
+			const response = await agent
+				.post('/webhook/abcd')
+				.field('field1', 'value1')
+				.field('field2', 'value2')
+				.field('field2', 'value3')
+				.attach('file1', Buffer.from('random-text'))
+				.attach('file2', Buffer.from('random-text'))
+				.attach('file2', Buffer.from('random-text'))
+				.set('content-type', 'multipart/form-data');
+
+			expect(response.statusCode).toEqual(200);
+			expect(response.body.type).toEqual('multipart/form-data');
+			const { data, files } = response.body.body;
+			expect(data).toEqual({ field1: 'value1', field2: ['value2', 'value3'] });
+
+			expect(files.file1).not.toBeInstanceOf(Array);
+			expect(files.file1.mimetype).toEqual('application/octet-stream');
+			expect(readFileSync(files.file1.filepath, 'utf-8')).toEqual('random-text');
+			expect(files.file2).toBeInstanceOf(Array);
+			expect(files.file2.length).toEqual(2);
+		});
+	});
+
+	describe('Params support', () => {
+		beforeAll(async () => {
+			const node = new WebhookTestingNode();
+			const user = await createUser();
+			await createWorkflow(createWebhookWorkflow(node, ':variable', 'PATCH'), user);
+
+			const nodeTypes = mockInstance(NodeTypes);
+			nodeTypes.getByName.mockReturnValue(node);
+			nodeTypes.getByNameAndVersion.mockReturnValue(node);
+
+			await initActiveWorkflowManager();
+
+			const server = new (class extends AbstractServer {})();
+			await server.start();
+			agent = testAgent(server.app);
+		});
+
+		afterAll(async () => {
+			await testDb.truncate(['Workflow']);
+		});
+
+		test('should handle params', async () => {
+			const response = await agent
+				.patch('/webhook/5ccef736-be16-4d10-b7fb-feed7a61ff22/test')
+				.send({ test: true });
+			expect(response.statusCode).toEqual(200);
+			expect(response.body).toEqual({
+				type: 'application/json',
+				body: { test: true },
+				params: {
+					variable: 'test',
+				},
+			});
+
+			await agent.post('/webhook/abcd').send({ test: true }).expect(404);
+		});
+	});
+
+	class WebhookTestingNode implements INodeType {
+		description: INodeTypeDescription = {
+			displayName: 'Webhook Testing Node',
+			name: 'webhook-testing-node',
+			group: ['trigger'],
+			version: 1,
+			description: '',
+			defaults: {},
+			inputs: [],
+			outputs: ['main'],
+			webhooks: [
+				{
+					name: 'default',
+					isFullPath: true,
+					httpMethod: '={{$parameter["httpMethod"]}}',
+					path: '={{$parameter["path"]}}',
+				},
+			],
+			properties: [
+				{
+					name: 'httpMethod',
+					type: 'string',
+					displayName: 'Method',
+					default: 'GET',
+				},
+				{
+					displayName: 'Path',
+					name: 'path',
+					type: 'string',
+					default: 'xyz',
+				},
+			],
+		};
+
+		async webhook(this: IWebhookFunctions) {
+			const req = this.getRequestObject();
+			return {
+				webhookResponse: {
+					type: req.contentType,
+					body: req.body,
+					params: req.params,
+				},
+			};
+		}
+	}
+
+	const createWebhookWorkflow = (
+		node: WebhookTestingNode,
+		path = 'abcd',
+		httpMethod = 'POST',
+	): Partial<WorkflowEntity> => ({
+		active: true,
+		nodes: [
+			{
+				name: 'Webhook',
+				type: node.description.name,
+				typeVersion: 1,
+				parameters: { httpMethod, path },
+				id: '74786112-fb73-4d80-bd9a-43982939b801',
+				webhookId: '5ccef736-be16-4d10-b7fb-feed7a61ff22',
+				position: [740, 420],
+			},
+		],
+	});
+});
diff --git a/packages/cli/test/integration/workflow-tag-mapping.repository.integration.test.ts b/packages/cli/test/integration/workflow-tag-mapping.repository.integration.test.ts
new file mode 100644
index 0000000000000..7cf1dcdaedbc2
--- /dev/null
+++ b/packages/cli/test/integration/workflow-tag-mapping.repository.integration.test.ts
@@ -0,0 +1,90 @@
+import Container from 'typedi';
+
+import * as testDb from './shared/testDb';
+import { WorkflowTagMappingRepository } from '@/databases/repositories/workflowTagMapping.repository';
+import { createWorkflow } from './shared/db/workflows';
+import { TagRepository } from '@/databases/repositories/tag.repository';
+
+describe('WorkflowTagMappingRepository', () => {
+	let taggingRepository: WorkflowTagMappingRepository;
+	let tagRepository: TagRepository;
+
+	beforeAll(async () => {
+		await testDb.init();
+
+		taggingRepository = Container.get(WorkflowTagMappingRepository);
+		tagRepository = Container.get(TagRepository);
+	});
+
+	afterEach(async () => {
+		await testDb.truncate(['WorkflowTagMapping', 'Workflow', 'Tag']);
+	});
+
+	afterAll(async () => {
+		await testDb.terminate();
+	});
+
+	describe('overwriteTaggings', () => {
+		test('should overwrite taggings in a workflow', async () => {
+			const workflow = await createWorkflow();
+
+			const oldTags = await tagRepository.save(
+				['tag1', 'tag2'].map((name) => tagRepository.create({ name })),
+			);
+
+			const oldTaggings = oldTags.map((tag) =>
+				taggingRepository.create({
+					tagId: tag.id,
+					workflowId: workflow.id,
+				}),
+			);
+
+			await taggingRepository.save(oldTaggings);
+
+			const newTags = await tagRepository.save(
+				['tag3', 'tag4'].map((name) => tagRepository.create({ name })),
+			);
+
+			await taggingRepository.overwriteTaggings(
+				workflow.id,
+				newTags.map((t) => t.id),
+			);
+
+			const taggings = await taggingRepository.findBy({ workflowId: workflow.id });
+
+			expect(taggings).toHaveLength(2);
+
+			const [firstNewTag, secondNewTag] = newTags;
+
+			expect(taggings).toEqual(
+				expect.arrayContaining([
+					expect.objectContaining({ tagId: firstNewTag.id, workflowId: workflow.id }),
+					expect.objectContaining({ tagId: secondNewTag.id, workflowId: workflow.id }),
+				]),
+			);
+		});
+
+		test('should delete taggings if no tags are provided', async () => {
+			const workflow = await createWorkflow();
+
+			const oldTags = await tagRepository.save(
+				['tag1', 'tag2'].map((name) => tagRepository.create({ name })),
+			);
+
+			const oldTaggings = oldTags.map((tag) =>
+				taggingRepository.create({
+					tagId: tag.id,
+					workflowId: workflow.id,
+				}),
+			);
+
+			await taggingRepository.save(oldTaggings);
+
+			await taggingRepository.overwriteTaggings(workflow.id, []);
+
+			const taggings = await taggingRepository.findBy({ workflowId: workflow.id });
+
+			expect(taggings).toHaveLength(0);
+		});
+	});
+});
diff --git a/packages/cli/test/integration/workflowHistory.api.test.ts b/packages/cli/test/integration/workflowHistory.api.test.ts
new file mode 100644
index 0000000000000..b9ccd33b2c143
--- /dev/null
+++ b/packages/cli/test/integration/workflowHistory.api.test.ts
@@ -0,0 +1,220 @@
+import type { SuperAgentTest } from 'supertest';
+import type { User } from '@db/entities/User';
+
+import * as testDb from './shared/testDb';
+import * as utils from './shared/utils/';
+import { createOwner, createUser } from './shared/db/users';
+import { createWorkflow } from './shared/db/workflows';
+import { createWorkflowHistoryItem } from './shared/db/workflowHistory';
+
+let owner: User;
+let authOwnerAgent: SuperAgentTest;
+let member: User;
+let authMemberAgent: SuperAgentTest;
+
+const testServer = utils.setupTestServer({
+	endpointGroups: ['workflowHistory'],
+	enabledFeatures: ['feat:workflowHistory'],
+});
+
+beforeAll(async () => {
+	owner = await createOwner();
+	authOwnerAgent = testServer.authAgentFor(owner);
+	member = await createUser();
+	authMemberAgent = testServer.authAgentFor(member);
+});
+
+afterEach(async () => {
+	await testDb.truncate(['Workflow', 'SharedWorkflow', 'WorkflowHistory']);
+});
+
+describe('GET /workflow-history/:workflowId', () => {
+	test('should not work when license is not available', async () => {
+		testServer.license.disable('feat:workflowHistory');
+		const resp = await authOwnerAgent.get('/workflow-history/workflow/badid');
+		expect(resp.status).toBe(403);
+		expect(resp.text).toBe('Workflow History license data not found');
+	});
+
+	test('should not return anything on an invalid workflow ID', async () => {
+		await createWorkflow(undefined, owner);
+		const resp = await authOwnerAgent.get('/workflow-history/workflow/badid');
+		expect(resp.status).toBe(404);
+	});
+
+	test('should not return anything if not shared with user', async () => {
+		const workflow = await createWorkflow(undefined, owner);
+		const resp = await authMemberAgent.get('/workflow-history/workflow/' + workflow.id);
+		expect(resp.status).toBe(404);
+	});
+
+	test('should return any empty list if no versions', async () => {
+		const workflow = await createWorkflow(undefined, owner);
+		const resp = await authOwnerAgent.get('/workflow-history/workflow/' + workflow.id);
+		expect(resp.status).toBe(200);
+		expect(resp.body).toEqual({ data: [] });
+	});
+
+	test('should return versions for workflow', async () => {
+		const workflow = await createWorkflow(undefined, owner);
+		const versions = await Promise.all(
+			new Array(10)
+				.fill(undefined)
+				.map(
+					async (_, i) =>
+						await createWorkflowHistoryItem(workflow.id, { createdAt: new Date(Date.now() + i) }),
+				),
+		);
+
+		const last = versions.sort((a, b) => b.createdAt.valueOf() - a.createdAt.valueOf())[0] as any;
+		delete last.nodes;
+		delete last.connections;
+
+		last.createdAt = last.createdAt.toISOString();
+		last.updatedAt = last.updatedAt.toISOString();
+
+		const resp = await authOwnerAgent.get('/workflow-history/workflow/' + workflow.id);
+		expect(resp.status).toBe(200);
+		expect(resp.body.data).toHaveLength(10);
+		expect(resp.body.data[0]).toEqual(last);
+	});
+
+	test('should return versions only for workflow id provided', async () => {
+		const workflow = await createWorkflow(undefined, owner);
+		const workflow2 = await createWorkflow(undefined, owner);
+		const versions = await Promise.all(
+			new Array(10)
+				.fill(undefined)
+				.map(
+					async (_, i) =>
+						await createWorkflowHistoryItem(workflow.id, { createdAt: new Date(Date.now() + i) }),
+				),
+		);
+
+		const versions2 = await Promise.all(
+			new Array(10).fill(undefined).map(async (_) => await createWorkflowHistoryItem(workflow2.id)),
+		);
+
+		const last = versions.sort((a, b) => b.createdAt.valueOf() - a.createdAt.valueOf())[0] as any;
+		delete last.nodes;
+		delete last.connections;
+
+		last.createdAt = last.createdAt.toISOString();
+		last.updatedAt = last.updatedAt.toISOString();
+
+		const resp = await authOwnerAgent.get('/workflow-history/workflow/' + workflow.id);
+		expect(resp.status).toBe(200);
+		expect(resp.body.data).toHaveLength(10);
+		expect(resp.body.data[0]).toEqual(last);
+	});
+
+	test('should work with take parameter', async () => {
+		const workflow = await createWorkflow(undefined, owner);
+		const versions = await Promise.all(
+			new Array(10)
+				.fill(undefined)
+				.map(
+					async (_, i) =>
+						await createWorkflowHistoryItem(workflow.id, { createdAt: new Date(Date.now() + i) }),
+				),
+		);
+
+		const last = versions.sort((a, b) => b.createdAt.valueOf() - a.createdAt.valueOf())[0] as any;
+		delete last.nodes;
+		delete last.connections;
+
+		last.createdAt = last.createdAt.toISOString();
+		last.updatedAt = last.updatedAt.toISOString();
+
+		const resp = await authOwnerAgent.get(`/workflow-history/workflow/${workflow.id}?take=5`);
+		expect(resp.status).toBe(200);
+		expect(resp.body.data).toHaveLength(5);
+		expect(resp.body.data[0]).toEqual(last);
+	});
+
+	test('should work with skip parameter', async () => {
+		const workflow = await createWorkflow(undefined, owner);
+		const versions = await Promise.all(
+			new Array(10)
+				.fill(undefined)
+				.map(
+					async (_, i) =>
+						await createWorkflowHistoryItem(workflow.id, { createdAt: new Date(Date.now() + i) }),
+				),
+		);
+
+		const last = versions.sort((a, b) => b.createdAt.valueOf() - a.createdAt.valueOf())[5] as any;
+		delete last.nodes;
+		delete last.connections;
+
+		last.createdAt = last.createdAt.toISOString();
+		last.updatedAt = last.updatedAt.toISOString();
+
+		const resp = await authOwnerAgent.get(
+			`/workflow-history/workflow/${workflow.id}?skip=5&take=20`,
+		);
+		expect(resp.status).toBe(200);
+		expect(resp.body.data).toHaveLength(5);
+		expect(resp.body.data[0]).toEqual(last);
+	});
+});
+
+describe('GET /workflow-history/workflow/:workflowId/version/:versionId', () => {
+	test('should not work when license is not available', async () => {
+		testServer.license.disable('feat:workflowHistory');
+		const resp = await authOwnerAgent.get('/workflow-history/workflow/badid/version/badid');
+		expect(resp.status).toBe(403);
+		expect(resp.text).toBe('Workflow History license data not found');
+	});
+
+	test('should not return anything on an invalid workflow ID', async () => {
+		const workflow = await createWorkflow(undefined, owner);
+		const version = await createWorkflowHistoryItem(workflow.id);
+		const resp = await authOwnerAgent.get(
+			`/workflow-history/workflow/badid/version/${version.versionId}`,
+		);
+		expect(resp.status).toBe(404);
+	});
+
+	test('should not return anything on an invalid version ID', async () => {
+		const workflow = await createWorkflow(undefined, owner);
+		await createWorkflowHistoryItem(workflow.id);
+		const resp = await authOwnerAgent.get(
+			`/workflow-history/workflow/${workflow.id}/version/badid`,
+		);
+		expect(resp.status).toBe(404);
+	});
+
+	test('should return version', async () => {
+		const workflow = await createWorkflow(undefined, owner);
+		const version = await createWorkflowHistoryItem(workflow.id);
+		const resp = await authOwnerAgent.get(
+			`/workflow-history/workflow/${workflow.id}/version/${version.versionId}`,
+		);
+		expect(resp.status).toBe(200);
+		expect(resp.body.data).toEqual({
+			...version,
+			createdAt: version.createdAt.toISOString(),
+			updatedAt: version.updatedAt.toISOString(),
+		});
+	});
+
+	test('should not return anything if not shared with user', async () => {
+		const workflow = await createWorkflow(undefined, owner);
+		const version = await createWorkflowHistoryItem(workflow.id);
+		const resp = await authMemberAgent.get(
+			`/workflow-history/workflow/${workflow.id}/version/${version.versionId}`,
+		);
+		expect(resp.status).toBe(404);
+	});
+
+	test('should not return anything if not shared with user and using workflow owned by unshared user', async () => {
+		const workflow = await createWorkflow(undefined, owner);
+		const workflowMember = await createWorkflow(undefined, member);
+		const version = await createWorkflowHistoryItem(workflow.id);
+		const resp = await authMemberAgent.get(
+			`/workflow-history/workflow/${workflowMember.id}/version/${version.versionId}`,
+		);
+		expect(resp.status).toBe(404);
+	});
+});
diff --git a/packages/cli/test/integration/workflowHistoryManager.test.ts b/packages/cli/test/integration/workflowHistoryManager.test.ts
new file mode 100644
index 0000000000000..0b20f77c4b2d0
--- /dev/null
+++ b/packages/cli/test/integration/workflowHistoryManager.test.ts
@@ -0,0 +1,123 @@
+import Container from 'typedi';
+import { In } from '@n8n/typeorm';
+import { DateTime } from 'luxon';
+
+import config from '@/config';
+import { WorkflowHistoryRepository } from '@db/repositories/workflowHistory.repository';
+import { License } from '@/License';
+import { WorkflowHistoryManager } from '@/workflows/workflowHistory/workflowHistoryManager.ee';
+
+import { mockInstance } from '../shared/mocking';
+import * as testDb from './shared/testDb';
+import { createWorkflow } from './shared/db/workflows';
+import { createManyWorkflowHistoryItems } from './shared/db/workflowHistory';
+
+describe('Workflow History Manager', () => {
+	const license = mockInstance(License);
+	let repo: WorkflowHistoryRepository;
+	let manager: WorkflowHistoryManager;
+
+	beforeAll(async () => {
+		await testDb.init();
+		repo = Container.get(WorkflowHistoryRepository);
+		manager = Container.get(WorkflowHistoryManager);
+	});
+
+	beforeEach(async () => {
+		await testDb.truncate(['Workflow']);
+		jest.clearAllMocks();
+
+		config.set('workflowHistory.enabled', true);
+		config.set('workflowHistory.pruneTime', -1);
+
+		license.isWorkflowHistoryLicensed.mockReturnValue(true);
+		license.getWorkflowHistoryPruneLimit.mockReturnValue(-1);
+	});
+
+	test('should prune on interval', () => {
+		const pruneSpy = jest.spyOn(manager, 'prune');
+		const currentCount = pruneSpy.mock.calls.length;
+
+		jest.useFakeTimers();
+		manager.init();
+
+		jest.runOnlyPendingTimers();
+		expect(pruneSpy).toBeCalledTimes(currentCount + 1);
+
+		jest.runOnlyPendingTimers();
+		expect(pruneSpy).toBeCalledTimes(currentCount + 2);
+
+		manager.shutdown();
+		jest.clearAllTimers();
+		jest.useRealTimers();
+		pruneSpy.mockRestore();
+	});
+
+	test('should not prune when not licensed', async () => {
+		license.isWorkflowHistoryLicensed.mockReturnValue(false);
+		await createWorkflowHistory();
+		await pruneAndAssertCount();
+	});
+
+	test('should not prune when licensed but disabled', async () => {
+		config.set('workflowHistory.enabled', false);
+		await createWorkflowHistory();
+		await pruneAndAssertCount();
+	});
+
+	test('should not prune when both prune times are -1 (infinite)', async () => {
+		await createWorkflowHistory();
+		await pruneAndAssertCount();
+	});
+
+	test('should prune when config prune time is not -1 (infinite)', async () => {
+		config.set('workflowHistory.pruneTime', 24);
+		await createWorkflowHistory();
+		await pruneAndAssertCount(0);
+	});
+
+	test('should prune when license prune time is not -1 (infinite)', async () => {
+		license.getWorkflowHistoryPruneLimit.mockReturnValue(24);
+
+		await createWorkflowHistory();
+		await pruneAndAssertCount(0);
+	});
+
+	test('should only prune versions older than prune time', async () => {
+		config.set('workflowHistory.pruneTime', 24);
+
+		const recentVersions = await createWorkflowHistory(0);
+		const oldVersions = await createWorkflowHistory();
+
+		await pruneAndAssertCount(10, 20);
+
+		expect(
+			await repo.count({ where: { versionId: In(recentVersions.map((i) => i.versionId)) } }),
+		).toBe(10);
+		expect(
+			await repo.count({ where: { versionId: In(oldVersions.map((i) => i.versionId)) } }),
+		).toBe(0);
+	});
+
+	const createWorkflowHistory = async (ageInDays = 2) => {
+		const workflow = await createWorkflow();
+		const time = DateTime.now().minus({ days: ageInDays }).toJSDate();
+		return await createManyWorkflowHistoryItems(workflow.id, 10, time);
+	};
+
+	const pruneAndAssertCount = async (finalCount = 10, initialCount = 10) => {
+		expect(await repo.count()).toBe(initialCount);
+
+		const deleteSpy = jest.spyOn(repo, 'delete');
+		await manager.prune();
+
+		if (initialCount === finalCount) {
+			expect(deleteSpy).not.toBeCalled();
+		} else {
+			expect(deleteSpy).toBeCalled();
+		}
+		deleteSpy.mockRestore();
+
+		expect(await repo.count()).toBe(finalCount);
+	};
+});
diff --git a/packages/cli/test/integration/workflows.controller.ee.test.ts b/packages/cli/test/integration/workflows.controller.ee.test.ts
deleted file mode 100644
index bf8ff9948f2a3..0000000000000
--- a/packages/cli/test/integration/workflows.controller.ee.test.ts
+++ /dev/null
@@ -1,852 +0,0 @@
-import { Container } from 'typedi';
-import type { SuperAgentTest } from 'supertest';
-import { v4 as uuid } from 'uuid';
-import type { INode } from 'n8n-workflow';
-
-import * as UserManagementHelpers from '@/UserManagement/UserManagementHelper';
-import type { User } from '@db/entities/User';
-
-import * as utils from './shared/utils';
-import * as testDb from './shared/testDb';
-import { createWorkflow } from './shared/testDb';
-import type { SaveCredentialFunction } from './shared/types';
-import { makeWorkflow } from './shared/utils';
-import { randomCredentialPayload } from './shared/random';
-import { License } from '@/License';
-
-let owner: User;
-let member: User;
-let anotherMember: User;
-let authOwnerAgent: SuperAgentTest;
-let authMemberAgent: SuperAgentTest;
-let authAnotherMemberAgent: SuperAgentTest;
-let saveCredential: SaveCredentialFunction;
-let sharingSpy: jest.SpyInstance<boolean>;
-
-beforeAll(async () => {
-	Container.get(License).isSharingEnabled = () => true;
-	const app = await utils.initTestServer({ endpointGroups: ['workflows'] });
-
-	const globalOwnerRole = await testDb.getGlobalOwnerRole();
-	const globalMemberRole = await testDb.getGlobalMemberRole();
-	const credentialOwnerRole = await testDb.getCredentialOwnerRole();
-
-	owner = await testDb.createUser({ globalRole: globalOwnerRole });
-	member = await testDb.createUser({ globalRole: globalMemberRole });
-	anotherMember = await testDb.createUser({ globalRole: globalMemberRole });
-
-	const authAgent = utils.createAuthAgent(app);
-	authOwnerAgent = authAgent(owner);
-	authMemberAgent = authAgent(member);
-	authAnotherMemberAgent = authAgent(anotherMember);
-
-	saveCredential = testDb.affixRoleToSaveCredential(credentialOwnerRole);
-	sharingSpy = jest.spyOn(UserManagementHelpers, 'isSharingEnabled').mockReturnValue(true);
-
-	await utils.initNodeTypes();
-});
-
-beforeEach(async () => {
-	await testDb.truncate(['Workflow', 'SharedWorkflow']);
-});
-
-afterAll(async () => {
-	await testDb.terminate();
-});
-
-describe('router should switch based on flag', () => {
-	let savedWorkflowId: string;
-
-	beforeEach(async () => {
-		const createWorkflowResponse = await authOwnerAgent.post('/workflows').send(makeWorkflow());
-		savedWorkflowId = createWorkflowResponse.body.data.id;
-	});
-
-	test('when sharing is disabled', async () => {
-		sharingSpy.mockReturnValueOnce(false);
-
-		await authOwnerAgent
-			.put(`/workflows/${savedWorkflowId}/share`)
-			.send({ shareWithIds: [member.id] })
-			.expect(404);
-	});
-
-	test('when sharing is enabled', async () => {
-		await authOwnerAgent
-			.put(`/workflows/${savedWorkflowId}/share`)
-			.send({ shareWithIds: [member.id] })
-			.expect(200);
-	});
-});
-
-describe('PUT /workflows/:id', () => {
-	test('PUT /workflows/:id/share should save sharing with new users', async () => {
-		const workflow = await createWorkflow({}, owner);
-
-		const response = await authOwnerAgent
-			.put(`/workflows/${workflow.id}/share`)
-			.send({ shareWithIds: [member.id] });
-
-		expect(response.statusCode).toBe(200);
-
-		const sharedWorkflows = await testDb.getWorkflowSharing(workflow);
-		expect(sharedWorkflows).toHaveLength(2);
-	});
-
-	test('PUT /workflows/:id/share should succeed when sharing with invalid user-id', async () => {
-		const workflow = await createWorkflow({}, owner);
-
-		const response = await authOwnerAgent
-			.put(`/workflows/${workflow.id}/share`)
-			.send({ shareWithIds: [uuid()] });
-
-		expect(response.statusCode).toBe(200);
-
-		const sharedWorkflows = await testDb.getWorkflowSharing(workflow);
-		expect(sharedWorkflows).toHaveLength(1);
-	});
-
-	test('PUT /workflows/:id/share should allow sharing with multiple users', async () => {
-		const workflow = await createWorkflow({}, owner);
-
-		const response = await authOwnerAgent
-			.put(`/workflows/${workflow.id}/share`)
-			.send({ shareWithIds: [member.id, anotherMember.id] });
-
-		expect(response.statusCode).toBe(200);
-
-		const sharedWorkflows = await testDb.getWorkflowSharing(workflow);
-		expect(sharedWorkflows).toHaveLength(3);
-	});
-
-	test('PUT /workflows/:id/share should override sharing', async () => {
-		const workflow = await createWorkflow({}, owner);
-
-		const response = await authOwnerAgent
-			.put(`/workflows/${workflow.id}/share`)
-			.send({ shareWithIds: [member.id, anotherMember.id] });
-
-		expect(response.statusCode).toBe(200);
-
-		const sharedWorkflows = await testDb.getWorkflowSharing(workflow);
-		expect(sharedWorkflows).toHaveLength(3);
-
-		const secondResponse = await authOwnerAgent
-			.put(`/workflows/${workflow.id}/share`)
-			.send({ shareWithIds: [member.id] });
-		expect(secondResponse.statusCode).toBe(200);
-
-		const secondSharedWorkflows = await testDb.getWorkflowSharing(workflow);
-		expect(secondSharedWorkflows).toHaveLength(2);
-	});
-});
-
-describe('GET /workflows', () => {
-	test('should return workflows without nodes, sharing and credential usage details', async () => {
-		const tag = await testDb.createTag({ name: 'test' });
-
-		const savedCredential = await saveCredential(randomCredentialPayload(), { user: owner });
-
-		const workflow = await createWorkflow(
-			{
-				nodes: [
-					{
-						id: uuid(),
-						name: 'Action Network',
-						type: 'n8n-nodes-base.actionNetwork',
-						parameters: {},
-						typeVersion: 1,
-						position: [0, 0],
-						credentials: {
-							actionNetworkApi: {
-								id: savedCredential.id,
-								name: savedCredential.name,
-							},
-						},
-					},
-				],
-				tags: [tag],
-			},
-			owner,
-		);
-
-		await testDb.shareWorkflowWithUsers(workflow, [member]);
-
-		const response = await authOwnerAgent.get('/workflows');
-
-		const [fetchedWorkflow] = response.body.data;
-
-		expect(response.statusCode).toBe(200);
-		expect(fetchedWorkflow.ownedBy).toMatchObject({
-			id: owner.id,
-		});
-
-		expect(fetchedWorkflow.sharedWith).not.toBeDefined();
-		expect(fetchedWorkflow.usedCredentials).not.toBeDefined();
-		expect(fetchedWorkflow.nodes).not.toBeDefined();
-		expect(fetchedWorkflow.tags).toEqual(
-			expect.arrayContaining([
-				expect.objectContaining({
-					id: expect.any(String),
-					name: expect.any(String),
-				}),
-			]),
-		);
-	});
-});
-
-describe('GET /workflows/:id', () => {
-	test('GET should fail with invalid id due to route rule', async () => {
-		const response = await authOwnerAgent.get('/workflows/potatoes');
-
-		expect(response.statusCode).toBe(404);
-	});
-
-	test('GET should return 404 for non existing workflow', async () => {
-		const response = await authOwnerAgent.get('/workflows/9001');
-
-		expect(response.statusCode).toBe(404);
-	});
-
-	test('GET should return a workflow with owner', async () => {
-		const workflow = await createWorkflow({}, owner);
-
-		const response = await authOwnerAgent.get(`/workflows/${workflow.id}`);
-
-		expect(response.statusCode).toBe(200);
-		expect(response.body.data.ownedBy).toMatchObject({
-			id: owner.id,
-			email: owner.email,
-			firstName: owner.firstName,
-			lastName: owner.lastName,
-		});
-
-		expect(response.body.data.sharedWith).toHaveLength(0);
-	});
-
-	test('GET should return shared workflow with user data', async () => {
-		const workflow = await createWorkflow({}, owner);
-		await testDb.shareWorkflowWithUsers(workflow, [member]);
-
-		const response = await authOwnerAgent.get(`/workflows/${workflow.id}`);
-
-		expect(response.statusCode).toBe(200);
-		expect(response.body.data.ownedBy).toMatchObject({
-			id: owner.id,
-			email: owner.email,
-			firstName: owner.firstName,
-			lastName: owner.lastName,
-		});
-
-		expect(response.body.data.sharedWith).toHaveLength(1);
-		expect(response.body.data.sharedWith[0]).toMatchObject({
-			id: member.id,
-			email: member.email,
-			firstName: member.firstName,
-			lastName: member.lastName,
-		});
-	});
-
-	test('GET should return all sharees', async () => {
-		const workflow = await createWorkflow({}, owner);
-		await testDb.shareWorkflowWithUsers(workflow, [member, anotherMember]);
-
-		const response = await authOwnerAgent.get(`/workflows/${workflow.id}`);
-
-		expect(response.statusCode).toBe(200);
-		expect(response.body.data.ownedBy).toMatchObject({
-			id: owner.id,
-			email: owner.email,
-			firstName: owner.firstName,
-			lastName: owner.lastName,
-		});
-
-		expect(response.body.data.sharedWith).toHaveLength(2);
-	});
-
-	test('GET should return workflow with credentials owned by user', async () => {
-		const savedCredential = await saveCredential(randomCredentialPayload(), { user: owner });
-
-		const workflowPayload = makeWorkflow({
-			withPinData: false,
-			withCredential: { id: savedCredential.id, name: savedCredential.name },
-		});
-		const workflow = await createWorkflow(workflowPayload, owner);
-
-		const response = await authOwnerAgent.get(`/workflows/${workflow.id}`);
-
-		expect(response.statusCode).toBe(200);
-		expect(response.body.data.usedCredentials).toMatchObject([
-			{
-				id: savedCredential.id,
-				name: savedCredential.name,
-				currentUserHasAccess: true,
-			},
-		]);
-
-		expect(response.body.data.sharedWith).toHaveLength(0);
-	});
-
-	test('GET should return workflow with credentials saying owner does not have access when not shared', async () => {
-		const savedCredential = await saveCredential(randomCredentialPayload(), { user: member });
-
-		const workflowPayload = makeWorkflow({
-			withPinData: false,
-			withCredential: { id: savedCredential.id, name: savedCredential.name },
-		});
-		const workflow = await createWorkflow(workflowPayload, owner);
-
-		const response = await authOwnerAgent.get(`/workflows/${workflow.id}`);
-
-		expect(response.statusCode).toBe(200);
-		expect(response.body.data.usedCredentials).toMatchObject([
-			{
-				id: savedCredential.id,
-				name: savedCredential.name,
-				currentUserHasAccess: false, // although owner can see, they do not have access
-			},
-		]);
-
-		expect(response.body.data.sharedWith).toHaveLength(0);
-	});
-
-	test('GET should return workflow with credentials for all users with or without access', async () => {
-		const savedCredential = await saveCredential(randomCredentialPayload(), { user: member });
-
-		const workflowPayload = makeWorkflow({
-			withPinData: false,
-			withCredential: { id: savedCredential.id, name: savedCredential.name },
-		});
-		const workflow = await createWorkflow(workflowPayload, member);
-		await testDb.shareWorkflowWithUsers(workflow, [anotherMember]);
-
-		const responseMember1 = await authMemberAgent.get(`/workflows/${workflow.id}`);
-		expect(responseMember1.statusCode).toBe(200);
-		expect(responseMember1.body.data.usedCredentials).toMatchObject([
-			{
-				id: savedCredential.id,
-				name: savedCredential.name,
-				currentUserHasAccess: true, // one user has access
-			},
-		]);
-		expect(responseMember1.body.data.sharedWith).toHaveLength(1);
-
-		const responseMember2 = await authAnotherMemberAgent.get(`/workflows/${workflow.id}`);
-		expect(responseMember2.statusCode).toBe(200);
-		expect(responseMember2.body.data.usedCredentials).toMatchObject([
-			{
-				id: savedCredential.id,
-				name: savedCredential.name,
-				currentUserHasAccess: false, // the other one doesn't
-			},
-		]);
-		expect(responseMember2.body.data.sharedWith).toHaveLength(1);
-	});
-
-	test('GET should return workflow with credentials for all users with access', async () => {
-		const savedCredential = await saveCredential(randomCredentialPayload(), { user: member });
-		// Both users have access to the credential (none is owner)
-		await testDb.shareCredentialWithUsers(savedCredential, [anotherMember]);
-
-		const workflowPayload = makeWorkflow({
-			withPinData: false,
-			withCredential: { id: savedCredential.id, name: savedCredential.name },
-		});
-		const workflow = await createWorkflow(workflowPayload, member);
-		await testDb.shareWorkflowWithUsers(workflow, [anotherMember]);
-
-		const responseMember1 = await authMemberAgent.get(`/workflows/${workflow.id}`);
-		expect(responseMember1.statusCode).toBe(200);
-		expect(responseMember1.body.data.usedCredentials).toMatchObject([
-			{
-				id: savedCredential.id,
-				name: savedCredential.name,
-				currentUserHasAccess: true,
-			},
-		]);
-		expect(responseMember1.body.data.sharedWith).toHaveLength(1);
-
-		const responseMember2 = await authAnotherMemberAgent.get(`/workflows/${workflow.id}`);
-		expect(responseMember2.statusCode).toBe(200);
-		expect(responseMember2.body.data.usedCredentials).toMatchObject([
-			{
-				id: savedCredential.id,
-				name: savedCredential.name,
-				currentUserHasAccess: true,
-			},
-		]);
-		expect(responseMember2.body.data.sharedWith).toHaveLength(1);
-	});
-});
-
-describe('POST /workflows', () => {
-	it('Should create a workflow that uses no credential', async () => {
-		const workflow = makeWorkflow({ withPinData: false });
-
-		const response = await authOwnerAgent.post('/workflows').send(workflow);
-
-		expect(response.statusCode).toBe(200);
-	});
-
-	it('Should save a new workflow with credentials', async () => {
-		const savedCredential = await saveCredential(randomCredentialPayload(), { user: owner });
-		const workflow = makeWorkflow({
-			withPinData: false,
-			withCredential: { id: savedCredential.id, name: savedCredential.name },
-		});
-
-		const response = await authOwnerAgent.post('/workflows').send(workflow);
-
-		expect(response.statusCode).toBe(200);
-	});
-
-	it('Should not allow saving a workflow using credential you have no access', async () => {
-		// Credential belongs to owner, member cannot use it.
-		const savedCredential = await saveCredential(randomCredentialPayload(), { user: owner });
-		const workflow = makeWorkflow({
-			withPinData: false,
-			withCredential: { id: savedCredential.id, name: savedCredential.name },
-		});
-
-		const response = await authMemberAgent.post('/workflows').send(workflow);
-
-		expect(response.statusCode).toBe(400);
-		expect(response.body.message).toBe(
-			'The workflow you are trying to save contains credentials that are not shared with you',
-		);
-	});
-
-	it('Should allow owner to save a workflow using credential owned by others', async () => {
-		// Credential belongs to owner, member cannot use it.
-		const savedCredential = await saveCredential(randomCredentialPayload(), { user: member });
-		const workflow = makeWorkflow({
-			withPinData: false,
-			withCredential: { id: savedCredential.id, name: savedCredential.name },
-		});
-
-		const response = await authOwnerAgent.post('/workflows').send(workflow);
-
-		expect(response.statusCode).toBe(200);
-	});
-
-	it('Should allow saving a workflow using a credential owned by others and shared with you', async () => {
-		const savedCredential = await saveCredential(randomCredentialPayload(), { user: member });
-		await testDb.shareCredentialWithUsers(savedCredential, [anotherMember]);
-
-		const workflow = makeWorkflow({
-			withPinData: false,
-			withCredential: { id: savedCredential.id, name: savedCredential.name },
-		});
-
-		const response = await authAnotherMemberAgent.post('/workflows').send(workflow);
-		expect(response.statusCode).toBe(200);
-	});
-});
-
-describe('PATCH /workflows/:id - validate credential permissions to user', () => {
-	it('Should succeed when saving unchanged workflow nodes', async () => {
-		const savedCredential = await saveCredential(randomCredentialPayload(), { user: owner });
-		const workflow = {
-			name: 'test',
-			active: false,
-			connections: {},
-			nodes: [
-				{
-					id: 'uuid-1234',
-					name: 'Start',
-					parameters: {},
-					position: [-20, 260],
-					type: 'n8n-nodes-base.start',
-					typeVersion: 1,
-					credentials: {
-						default: {
-							id: savedCredential.id,
-							name: savedCredential.name,
-						},
-					},
-				},
-			],
-		};
-
-		const createResponse = await authOwnerAgent.post('/workflows').send(workflow);
-		const { id, versionId } = createResponse.body.data;
-
-		const response = await authOwnerAgent.patch(`/workflows/${id}`).send({
-			name: 'new name',
-			versionId,
-		});
-
-		expect(response.statusCode).toBe(200);
-	});
-
-	it('Should allow owner to add node containing credential not shared with the owner', async () => {
-		const savedCredential = await saveCredential(randomCredentialPayload(), { user: member });
-		const workflow = {
-			name: 'test',
-			active: false,
-			connections: {},
-			nodes: [
-				{
-					id: 'uuid-1234',
-					name: 'Start',
-					parameters: {},
-					position: [-20, 260],
-					type: 'n8n-nodes-base.start',
-					typeVersion: 1,
-					credentials: {
-						default: {
-							id: savedCredential.id,
-							name: savedCredential.name,
-						},
-					},
-				},
-			],
-		};
-
-		const createResponse = await authOwnerAgent.post('/workflows').send(workflow);
-		const { id, versionId } = createResponse.body.data;
-
-		const response = await authOwnerAgent.patch(`/workflows/${id}`).send({
-			versionId,
-			nodes: [
-				{
-					id: 'uuid-1234',
-					name: 'Start',
-					parameters: {},
-					position: [-20, 260],
-					type: 'n8n-nodes-base.start',
-					typeVersion: 1,
-					credentials: {
-						default: {
-							id: savedCredential.id,
-							name: savedCredential.name,
-						},
-					},
-				},
-			],
-		});
-
-		expect(response.statusCode).toBe(200);
-	});
-
-	it('Should prevent member from adding node containing credential inaccessible to member', async () => {
-		const savedCredential = await saveCredential(randomCredentialPayload(), { user: owner });
-
-		const workflow = {
-			name: 'test',
-			active: false,
-			connections: {},
-			nodes: [
-				{
-					id: 'uuid-1234',
-					name: 'Start',
-					parameters: {},
-					position: [-20, 260],
-					type: 'n8n-nodes-base.start',
-					typeVersion: 1,
-					credentials: {
-						default: {
-							id: savedCredential.id,
-							name: savedCredential.name,
-						},
-					},
-				},
-			],
-		};
-
-		const createResponse = await authOwnerAgent.post('/workflows').send(workflow);
-		const { id, versionId } = createResponse.body.data;
-
-		const response = await authMemberAgent.patch(`/workflows/${id}`).send({
-			versionId,
-			nodes: [
-				{
-					id: 'uuid-1234',
-					name: 'Start',
-					parameters: {},
-					position: [-20, 260],
-					type: 'n8n-nodes-base.start',
-					typeVersion: 1,
-					credentials: {},
-				},
-				{
-					id: 'uuid-12345',
-					name: 'Start',
-					parameters: {},
-					position: [-20, 260],
-					type: 'n8n-nodes-base.start',
-					typeVersion: 1,
-					credentials: {
-						default: {
-							id: savedCredential.id,
-							name: savedCredential.name,
-						},
-					},
-				},
-			],
-		});
-
-		expect(response.statusCode).toBe(400);
-	});
-
-	it('Should succeed but prevent modifying node attributes other than position, name and disabled', async () => {
-		const savedCredential = await saveCredential(randomCredentialPayload(), { user: member });
-
-		const originalNodes: INode[] = [
-			{
-				id: 'uuid-1234',
-				name: 'Start',
-				parameters: {
-					firstParam: 123,
-				},
-				position: [-20, 260],
-				type: 'n8n-nodes-base.start',
-				typeVersion: 1,
-				credentials: {
-					default: {
-						id: savedCredential.id,
-						name: savedCredential.name,
-					},
-				},
-			},
-		];
-
-		const changedNodes: INode[] = [
-			{
-				id: 'uuid-1234',
-				name: 'End',
-				parameters: {
-					firstParam: 456,
-				},
-				position: [-20, 555],
-				type: 'n8n-nodes-base.no-op',
-				typeVersion: 1,
-				credentials: {
-					default: {
-						id: '200',
-						name: 'fake credential',
-					},
-				},
-				disabled: true,
-			},
-		];
-
-		const expectedNodes: INode[] = [
-			{
-				id: 'uuid-1234',
-				name: 'End',
-				parameters: {
-					firstParam: 123,
-				},
-				position: [-20, 555],
-				type: 'n8n-nodes-base.start',
-				typeVersion: 1,
-				credentials: {
-					default: {
-						id: savedCredential.id,
-						name: savedCredential.name,
-					},
-				},
-				disabled: true,
-			},
-		];
-
-		const workflow = {
-			name: 'test',
-			active: false,
-			connections: {},
-			nodes: originalNodes,
-		};
-
-		const createResponse = await authMemberAgent.post('/workflows').send(workflow);
-		const { id, versionId } = createResponse.body.data;
-
-		await authMemberAgent.put(`/workflows/${id}/share`).send({ shareWithIds: [anotherMember.id] });
-
-		const response = await authAnotherMemberAgent.patch(`/workflows/${id}`).send({
-			versionId,
-			nodes: changedNodes,
-		});
-
-		expect(response.statusCode).toBe(200);
-		expect(response.body.data.nodes).toMatchObject(expectedNodes);
-	});
-});
-
-describe('PATCH /workflows/:id - validate interim updates', () => {
-	it('should block owner updating workflow nodes on interim update by member', async () => {
-		// owner creates and shares workflow
-
-		const createResponse = await authOwnerAgent.post('/workflows').send(makeWorkflow());
-		const { id, versionId: ownerVersionId } = createResponse.body.data;
-		await authOwnerAgent.put(`/workflows/${id}/share`).send({ shareWithIds: [member.id] });
-
-		// member accesses and updates workflow name
-
-		const memberGetResponse = await authMemberAgent.get(`/workflows/${id}`);
-		const { versionId: memberVersionId } = memberGetResponse.body.data;
-
-		await authMemberAgent
-			.patch(`/workflows/${id}`)
-			.send({ name: 'Update by member', versionId: memberVersionId });
-
-		// owner blocked from updating workflow nodes
-
-		const updateAttemptResponse = await authOwnerAgent
-			.patch(`/workflows/${id}`)
-			.send({ nodes: [], versionId: ownerVersionId });
-
-		expect(updateAttemptResponse.status).toBe(400);
-		expect(updateAttemptResponse.body.code).toBe(100);
-	});
-
-	it('should block member updating workflow nodes on interim update by owner', async () => {
-		// owner creates, updates and shares workflow
-
-		const createResponse = await authOwnerAgent.post('/workflows').send(makeWorkflow());
-		const { id, versionId: ownerFirstVersionId } = createResponse.body.data;
-
-		const updateResponse = await authOwnerAgent
-			.patch(`/workflows/${id}`)
-			.send({ name: 'Update by owner', versionId: ownerFirstVersionId });
-
-		const { versionId: ownerSecondVersionId } = updateResponse.body.data;
-
-		await authOwnerAgent.put(`/workflows/${id}/share`).send({ shareWithIds: [member.id] });
-
-		// member accesses workflow
-
-		const memberGetResponse = await authMemberAgent.get(`/workflows/${id}`);
-		const { versionId: memberVersionId } = memberGetResponse.body.data;
-
-		// owner re-updates workflow
-
-		await authOwnerAgent
-			.patch(`/workflows/${id}`)
-			.send({ name: 'Owner update again', versionId: ownerSecondVersionId });
-
-		// member blocked from updating workflow
-
-		const updateAttemptResponse = await authMemberAgent
-			.patch(`/workflows/${id}`)
-			.send({ nodes: [], versionId: memberVersionId });
-
-		expect(updateAttemptResponse.status).toBe(400);
-		expect(updateAttemptResponse.body.code).toBe(100);
-	});
-
-	it('should block owner activation on interim activation by member', async () => {
-		// owner creates and shares workflow
-
-		const createResponse = await authOwnerAgent.post('/workflows').send(makeWorkflow());
-		const { id, versionId: ownerVersionId } = createResponse.body.data;
-		await authOwnerAgent.put(`/workflows/${id}/share`).send({ shareWithIds: [member.id] });
-
-		// member accesses and activates workflow
-
-		const memberGetResponse = await authMemberAgent.get(`/workflows/${id}`);
-		const { versionId: memberVersionId } = memberGetResponse.body.data;
-		await authMemberAgent
-			.patch(`/workflows/${id}`)
-			.send({ active: true, versionId: memberVersionId });
-
-		// owner blocked from activating workflow
-
-		const activationAttemptResponse = await authOwnerAgent
-			.patch(`/workflows/${id}`)
-			.send({ active: true, versionId: ownerVersionId });
-
-		expect(activationAttemptResponse.status).toBe(400);
-		expect(activationAttemptResponse.body.code).toBe(100);
-	});
-
-	it('should block member activation on interim activation by owner', async () => {
-		// owner creates, updates and shares workflow
-
-		const createResponse = await authOwnerAgent.post('/workflows').send(makeWorkflow());
-		const { id, versionId: ownerFirstVersionId } = createResponse.body.data;
-
-		const updateResponse = await authOwnerAgent
-			.patch(`/workflows/${id}`)
-			.send({ name: 'Update by owner', versionId: ownerFirstVersionId });
-		const { versionId: ownerSecondVersionId } = updateResponse.body.data;
-
-		await authOwnerAgent.put(`/workflows/${id}/share`).send({ shareWithIds: [member.id] });
-
-		// member accesses workflow
-
-		const memberGetResponse = await authMemberAgent.get(`/workflows/${id}`);
-		const { versionId: memberVersionId } = memberGetResponse.body.data;
-
-		// owner activates workflow
-
-		await authOwnerAgent
-			.patch(`/workflows/${id}`)
-			.send({ active: true, versionId: ownerSecondVersionId });
-
-		// member blocked from activating workflow
-
-		const updateAttemptResponse = await authMemberAgent
-			.patch(`/workflows/${id}`)
-			.send({ active: true, versionId: memberVersionId });
-
-		expect(updateAttemptResponse.status).toBe(400);
-		expect(updateAttemptResponse.body.code).toBe(100);
-	});
-
-	it('should block member updating workflow settings on interim update by owner', async () => {
-		// owner creates and shares workflow
-
-		const createResponse = await authOwnerAgent.post('/workflows').send(makeWorkflow());
-		const { id, versionId: ownerVersionId } = createResponse.body.data;
-		await authOwnerAgent.put(`/workflows/${id}/share`).send({ shareWithIds: [member.id] });
-
-		// member accesses workflow
-
-		const memberGetResponse = await authMemberAgent.get(`/workflows/${id}`);
-		const { versionId: memberVersionId } = memberGetResponse.body.data;
-
-		// owner updates workflow name
-
-		await authOwnerAgent
-			.patch(`/workflows/${id}`)
-			.send({ name: 'Another name', versionId: ownerVersionId });
-
-		// member blocked from updating workflow settings
-
-		const updateAttemptResponse = await authMemberAgent
-			.patch(`/workflows/${id}`)
-			.send({ settings: { saveManualExecutions: true }, versionId: memberVersionId });
-
-		expect(updateAttemptResponse.status).toBe(400);
-		expect(updateAttemptResponse.body.code).toBe(100);
-	});
-
-	it('should block member updating workflow name on interim update by owner', async () => {
-		// owner creates and shares workflow
-
-		const createResponse = await authOwnerAgent.post('/workflows').send(makeWorkflow());
-		const { id, versionId: ownerVersionId } = createResponse.body.data;
-		await authOwnerAgent.put(`/workflows/${id}/share`).send({ shareWithIds: [member.id] });
-
-		// member accesses workflow
-
-		const memberGetResponse = await authMemberAgent.get(`/workflows/${id}`);
-		const { versionId: memberVersionId } = memberGetResponse.body.data;
-
-		// owner updates workflow settings
-
-		await authOwnerAgent
-			.patch(`/workflows/${id}`)
-			.send({ settings: { saveManualExecutions: true }, versionId: ownerVersionId });
-
-		// member blocked from updating workflow name
-
-		const updateAttemptResponse = await authMemberAgent
-			.patch(`/workflows/${id}`)
-			.send({ settings: { saveManualExecutions: true }, versionId: memberVersionId });
-
-		expect(updateAttemptResponse.status).toBe(400);
-		expect(updateAttemptResponse.body.code).toBe(100);
-	});
-});
diff --git a/packages/cli/test/integration/workflows.controller.test.ts b/packages/cli/test/integration/workflows.controller.test.ts
deleted file mode 100644
index dd0d236ceb533..0000000000000
--- a/packages/cli/test/integration/workflows.controller.test.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-import { SuperAgentTest } from 'supertest';
-import type { IPinData } from 'n8n-workflow';
-
-import type { User } from '@db/entities/User';
-import * as UserManagementHelpers from '@/UserManagement/UserManagementHelper';
-
-import * as utils from './shared/utils';
-import * as testDb from './shared/testDb';
-import { makeWorkflow, MOCK_PINDATA } from './shared/utils';
-
-let ownerShell: User;
-let authOwnerAgent: SuperAgentTest;
-
-beforeAll(async () => {
-	const app = await utils.initTestServer({ endpointGroups: ['workflows'] });
-	const globalOwnerRole = await testDb.getGlobalOwnerRole();
-	ownerShell = await testDb.createUserShell(globalOwnerRole);
-	authOwnerAgent = utils.createAgent(app, { auth: true, user: ownerShell });
-
-	// mock whether sharing is enabled or not
-	jest.spyOn(UserManagementHelpers, 'isSharingEnabled').mockReturnValue(false);
-});
-
-beforeEach(async () => {
-	await testDb.truncate(['Workflow', 'SharedWorkflow']);
-});
-
-afterAll(async () => {
-	await testDb.terminate();
-});
-
-describe('POST /workflows', () => {
-	test('should store pin data for node in workflow', async () => {
-		const workflow = makeWorkflow({ withPinData: true });
-
-		const response = await authOwnerAgent.post('/workflows').send(workflow);
-
-		expect(response.statusCode).toBe(200);
-
-		const { pinData } = response.body.data as { pinData: IPinData };
-
-		expect(pinData).toMatchObject(MOCK_PINDATA);
-	});
-
-	test('should set pin data to null if no pin data', async () => {
-		const workflow = makeWorkflow({ withPinData: false });
-
-		const response = await authOwnerAgent.post('/workflows').send(workflow);
-
-		expect(response.statusCode).toBe(200);
-
-		const { pinData } = response.body.data as { pinData: IPinData };
-
-		expect(pinData).toBeNull();
-	});
-});
-
-describe('GET /workflows/:id', () => {
-	test('should return pin data', async () => {
-		const workflow = makeWorkflow({ withPinData: true });
-
-		const workflowCreationResponse = await authOwnerAgent.post('/workflows').send(workflow);
-
-		const { id } = workflowCreationResponse.body.data as { id: string };
-
-		const workflowRetrievalResponse = await authOwnerAgent.get(`/workflows/${id}`);
-
-		expect(workflowRetrievalResponse.statusCode).toBe(200);
-
-		const { pinData } = workflowRetrievalResponse.body.data as { pinData: IPinData };
-
-		expect(pinData).toMatchObject(MOCK_PINDATA);
-	});
-});
diff --git a/packages/cli/test/integration/workflows/workflow.service.ee.test.ts b/packages/cli/test/integration/workflows/workflow.service.ee.test.ts
new file mode 100644
index 0000000000000..4504775f2e58b
--- /dev/null
+++ b/packages/cli/test/integration/workflows/workflow.service.ee.test.ts
@@ -0,0 +1,181 @@
+import Container from 'typedi';
+import { mock } from 'jest-mock-extended';
+import { CredentialsEntity } from '@db/entities/CredentialsEntity';
+import { CredentialsRepository } from '@db/repositories/credentials.repository';
+import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
+import { WorkflowRepository } from '@db/repositories/workflow.repository';
+import { Telemetry } from '@/telemetry';
+import { EnterpriseWorkflowService } from '@/workflows/workflow.service.ee';
+
+import * as testDb from '../shared/testDb';
+import { mockInstance } from '../../shared/mocking';
+import {
+	FIRST_CREDENTIAL_ID,
+	SECOND_CREDENTIAL_ID,
+	THIRD_CREDENTIAL_ID,
+	getWorkflow,
+} from '../shared/workflow';
+
+describe('EnterpriseWorkflowService', () => {
+	let service: EnterpriseWorkflowService;
+
+	beforeAll(async () => {
+		await testDb.init();
+		mockInstance(Telemetry);
+
+		service = new EnterpriseWorkflowService(
+			mock(),
+			Container.get(SharedWorkflowRepository),
+			Container.get(WorkflowRepository),
+			Container.get(CredentialsRepository),
+			mock(),
+		);
+	});
+
+	afterEach(async () => {
+		await testDb.truncate(['Workflow']);
+		jest.restoreAllMocks();
+	});
+
+	afterAll(async () => {
+		await testDb.terminate();
+	});
+
+	describe('validateWorkflowCredentialUsage', () => {
+		function generateCredentialEntity(credentialId: string) {
+			const credentialEntity = new CredentialsEntity();
+			credentialEntity.id = credentialId;
+			return credentialEntity;
+		}
+
+		it('Should throw error saving a workflow using credential without access', () => {
+			const newWorkflowVersion = getWorkflow({ addNodeWithOneCred: true });
+			const previousWorkflowVersion = getWorkflow();
+			expect(() => {
+				service.validateWorkflowCredentialUsage(newWorkflowVersion, previousWorkflowVersion, []);
+			}).toThrow();
+		});
+
+		it('Should not throw error when saving a workflow using credential with access', () => {
+			const newWorkflowVersion = getWorkflow({ addNodeWithOneCred: true });
+			const previousWorkflowVersion = getWorkflow();
+			expect(() => {
+				service.validateWorkflowCredentialUsage(newWorkflowVersion, previousWorkflowVersion, [
+					generateCredentialEntity('1'),
+				]);
+			}).not.toThrow();
+		});
+
+		it('Should not throw error when saving a workflow removing node without credential access', () => {
+			const newWorkflowVersion = getWorkflow();
+			const previousWorkflowVersion = getWorkflow({ addNodeWithOneCred: true });
+			expect(() => {
+				service.validateWorkflowCredentialUsage(newWorkflowVersion, previousWorkflowVersion, [
+					generateCredentialEntity('1'),
+				]);
+			}).not.toThrow();
+		});
+
+		it('Should save fine when not making changes to workflow without access', () => {
+			const workflowWithOneCredential = getWorkflow({ addNodeWithOneCred: true });
+			expect(() => {
+				service.validateWorkflowCredentialUsage(
+					workflowWithOneCredential,
+					workflowWithOneCredential,
+					[],
+				);
+			}).not.toThrow();
+		});
+
+		it('Should throw error saving a workflow adding node without credential access', () => {
+			const newWorkflowVersion = getWorkflow({
+				addNodeWithOneCred: true,
+				addNodeWithTwoCreds: true,
+			});
+			const previousWorkflowVersion = getWorkflow({ addNodeWithOneCred: true });
+			expect(() => {
+				service.validateWorkflowCredentialUsage(newWorkflowVersion, previousWorkflowVersion, []);
+			}).toThrow();
+		});
+	});
+
+	describe('getNodesWithInaccessibleCreds', () => {
+		test('Should return an empty list for a workflow without nodes', () => {
+			const workflow = getWorkflow();
+			const nodesWithInaccessibleCreds = service.getNodesWithInaccessibleCreds(workflow, []);
+			expect(nodesWithInaccessibleCreds).toHaveLength(0);
+		});
+
+		test('Should return an empty list for a workflow with nodes without credentials', () => {
+			const workflow = getWorkflow({ addNodeWithoutCreds: true });
+			const nodesWithInaccessibleCreds = service.getNodesWithInaccessibleCreds(workflow, []);
+			expect(nodesWithInaccessibleCreds).toHaveLength(0);
+		});
+
+		test('Should return an element for a node with a credential without access', () => {
+			const workflow = getWorkflow({ addNodeWithOneCred: true });
+			const nodesWithInaccessibleCreds = service.getNodesWithInaccessibleCreds(workflow, []);
+			expect(nodesWithInaccessibleCreds).toHaveLength(1);
+		});
+
+		test('Should return an empty list for a node with a credential with access', () => {
+			const workflow = getWorkflow({ addNodeWithOneCred: true });
+			const nodesWithInaccessibleCreds = service.getNodesWithInaccessibleCreds(workflow, [
+				FIRST_CREDENTIAL_ID,
+			]);
+			expect(nodesWithInaccessibleCreds).toHaveLength(0);
+		});
+
+		test('Should return an element for a node with two credentials and mixed access', () => {
+			const workflow = getWorkflow({ addNodeWithTwoCreds: true });
+			const nodesWithInaccessibleCreds = service.getNodesWithInaccessibleCreds(workflow, [
+				SECOND_CREDENTIAL_ID,
+			]);
+			expect(nodesWithInaccessibleCreds).toHaveLength(1);
+		});
+
+		test('Should return one node for a workflow with two nodes and two credentials', () => {
+			const workflow = getWorkflow({ addNodeWithOneCred: true, addNodeWithTwoCreds: true });
+			const nodesWithInaccessibleCreds = service.getNodesWithInaccessibleCreds(workflow, [
+				SECOND_CREDENTIAL_ID,
+				THIRD_CREDENTIAL_ID,
+			]);
+			expect(nodesWithInaccessibleCreds).toHaveLength(1);
+		});
+
+		test('Should return one element for a workflows with two nodes and one credential', () => {
+			const workflow = getWorkflow({
+				addNodeWithoutCreds: true,
+				addNodeWithOneCred: true,
+				addNodeWithTwoCreds: true,
+			});
+			const nodesWithInaccessibleCreds = service.getNodesWithInaccessibleCreds(workflow, [
+				FIRST_CREDENTIAL_ID,
+			]);
+			expect(nodesWithInaccessibleCreds).toHaveLength(1);
+		});
+
+		test('Should return one element for a workflows with two nodes and partial credential access', () => {
+			const workflow = getWorkflow({ addNodeWithOneCred: true, addNodeWithTwoCreds: true });
+			const nodesWithInaccessibleCreds = service.getNodesWithInaccessibleCreds(workflow, [
+				FIRST_CREDENTIAL_ID,
+				SECOND_CREDENTIAL_ID,
+			]);
+			expect(nodesWithInaccessibleCreds).toHaveLength(1);
+		});
+
+		test('Should return two elements for a workflows with two nodes and partial credential access', () => {
+			const workflow = getWorkflow({ addNodeWithOneCred: true, addNodeWithTwoCreds: true });
+			const nodesWithInaccessibleCreds = service.getNodesWithInaccessibleCreds(workflow, [
+				SECOND_CREDENTIAL_ID,
+			]);
+			expect(nodesWithInaccessibleCreds).toHaveLength(2);
+		});
+
+		test('Should return two elements for a workflows with two nodes and no credential access', () => {
+			const workflow = getWorkflow({ addNodeWithOneCred: true, addNodeWithTwoCreds: true });
+			const nodesWithInaccessibleCreds = service.getNodesWithInaccessibleCreds(workflow, []);
+			expect(nodesWithInaccessibleCreds).toHaveLength(2);
+		});
+	});
+});
diff --git a/packages/cli/test/integration/workflows/workflow.service.test.ts b/packages/cli/test/integration/workflows/workflow.service.test.ts
new file mode 100644
index 0000000000000..7927c094df66c
--- /dev/null
+++ b/packages/cli/test/integration/workflows/workflow.service.test.ts
@@ -0,0 +1,86 @@
+import Container from 'typedi';
+import { mock } from 'jest-mock-extended';
+import { ActiveWorkflowManager } from '@/ActiveWorkflowManager';
+import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
+import { WorkflowRepository } from '@db/repositories/workflow.repository';
+import { MessageEventBus } from '@/eventbus/MessageEventBus/MessageEventBus';
+import { Telemetry } from '@/telemetry';
+import { OrchestrationService } from '@/services/orchestration.service';
+import { WorkflowService } from '@/workflows/workflow.service';
+
+import * as testDb from '../shared/testDb';
+import { mockInstance } from '../../shared/mocking';
+import { createOwner } from '../shared/db/users';
+import { createWorkflow } from '../shared/db/workflows';
+
+let workflowService: WorkflowService;
+const activeWorkflowManager = mockInstance(ActiveWorkflowManager);
+const orchestrationService = mockInstance(OrchestrationService);
+mockInstance(MessageEventBus);
+mockInstance(Telemetry);
+
+beforeAll(async () => {
+	await testDb.init();
+
+	workflowService = new WorkflowService(
+		mock(),
+		mock(),
+		Container.get(SharedWorkflowRepository),
+		Container.get(WorkflowRepository),
+		mock(),
+		mock(),
+		mock(),
+		mock(),
+		mock(),
+		orchestrationService,
+		mock(),
+		activeWorkflowManager,
+	);
+});
+
+afterEach(async () => {
+	await testDb.truncate(['Workflow']);
+	jest.restoreAllMocks();
+});
+
+afterAll(async () => {
+	await testDb.terminate();
+});
+
+describe('update()', () => {
+	test('should remove and re-add to active workflows on `active: true` payload', async () => {
+		const owner = await createOwner();
+		const workflow = await createWorkflow({ active: true }, owner);
+
+		const removeSpy = jest.spyOn(activeWorkflowManager, 'remove');
+		const addSpy = jest.spyOn(activeWorkflowManager, 'add');
+
+		await workflowService.update(owner, workflow, workflow.id);
+
+		expect(removeSpy).toHaveBeenCalledTimes(1);
+		const [removedWorkflowId] = removeSpy.mock.calls[0];
+		expect(removedWorkflowId).toBe(workflow.id);
+
+		expect(addSpy).toHaveBeenCalledTimes(1);
+		const [addedWorkflowId, activationMode] = addSpy.mock.calls[0];
+		expect(addedWorkflowId).toBe(workflow.id);
+		expect(activationMode).toBe('update');
+	});
+
+	test('should remove from active workflows on `active: false` payload', async () => {
+		const owner = await createOwner();
+		const workflow = await createWorkflow({ active: true }, owner);
+
+		const removeSpy = jest.spyOn(activeWorkflowManager, 'remove');
+		const addSpy = jest.spyOn(activeWorkflowManager, 'add');
+
+		workflow.active = false;
+		await workflowService.update(owner, workflow, workflow.id);
+
+		expect(removeSpy).toHaveBeenCalledTimes(1);
+		const [removedWorkflowId] = removeSpy.mock.calls[0];
+		expect(removedWorkflowId).toBe(workflow.id);
+
+		expect(addSpy).not.toHaveBeenCalled();
+	});
+});
diff --git a/packages/cli/test/integration/workflows/workflows.controller.ee.test.ts b/packages/cli/test/integration/workflows/workflows.controller.ee.test.ts
new file mode 100644
index 0000000000000..3963fedb35b7c
--- /dev/null
+++ b/packages/cli/test/integration/workflows/workflows.controller.ee.test.ts
@@ -0,0 +1,1188 @@
+import Container from 'typedi';
+import type { SuperAgentTest } from 'supertest';
+import { v4 as uuid } from 'uuid';
+import type { INode } from 'n8n-workflow';
+
+import type { User } from '@db/entities/User';
+import { WorkflowHistoryRepository } from '@db/repositories/workflowHistory.repository';
+import { ActiveWorkflowManager } from '@/ActiveWorkflowManager';
+import { WorkflowSharingService } from '@/workflows/workflowSharing.service';
+
+import { mockInstance } from '../../shared/mocking';
+import * as utils from '../shared/utils/';
+import * as testDb from '../shared/testDb';
+import type { SaveCredentialFunction } from '../shared/types';
+import { makeWorkflow } from '../shared/utils/';
+import { randomCredentialPayload } from '../shared/random';
+import { affixRoleToSaveCredential, shareCredentialWithUsers } from '../shared/db/credentials';
+import { createUser } from '../shared/db/users';
+import { createWorkflow, getWorkflowSharing, shareWorkflowWithUsers } from '../shared/db/workflows';
+import { License } from '@/License';
+import { UserManagementMailer } from '@/UserManagement/email';
+import config from '@/config';
+
+let owner: User;
+let member: User;
+let anotherMember: User;
+let authOwnerAgent: SuperAgentTest;
+let authMemberAgent: SuperAgentTest;
+let authAnotherMemberAgent: SuperAgentTest;
+let saveCredential: SaveCredentialFunction;
+
+const activeWorkflowManager = mockInstance(ActiveWorkflowManager);
+
+const sharingSpy = jest.spyOn(License.prototype, 'isSharingEnabled').mockReturnValue(true);
+const testServer = utils.setupTestServer({
+	endpointGroups: ['workflows'],
+	enabledFeatures: ['feat:sharing'],
+});
+const license = testServer.license;
+const mailer = mockInstance(UserManagementMailer);
+
+beforeAll(async () => {
+	owner = await createUser({ role: 'global:owner' });
+	member = await createUser({ role: 'global:member' });
+	anotherMember = await createUser({ role: 'global:member' });
+
+	authOwnerAgent = testServer.authAgentFor(owner);
+	authMemberAgent = testServer.authAgentFor(member);
+	authAnotherMemberAgent = testServer.authAgentFor(anotherMember);
+
+	saveCredential = affixRoleToSaveCredential('credential:owner');
+
+	await utils.initNodeTypes();
+});
+
+beforeEach(async () => {
+	activeWorkflowManager.add.mockReset();
+	activeWorkflowManager.remove.mockReset();
+
+	await testDb.truncate(['Workflow', 'SharedWorkflow', 'WorkflowHistory']);
+});
+
+afterEach(() => {
+	jest.clearAllMocks();
+});
+
+describe('router should switch based on flag', () => {
+	let savedWorkflowId: string;
+
+	beforeEach(async () => {
+		const createWorkflowResponse = await authOwnerAgent.post('/workflows').send(makeWorkflow());
+		savedWorkflowId = createWorkflowResponse.body.data.id;
+	});
+
+	test('when sharing is disabled', async () => {
+		sharingSpy.mockReturnValueOnce(false);
+
+		await authOwnerAgent
+			.put(`/workflows/${savedWorkflowId}/share`)
+			.send({ shareWithIds: [member.id] })
+			.expect(404);
+	});
+
+	test('when sharing is enabled', async () => {
+		await authOwnerAgent
+			.put(`/workflows/${savedWorkflowId}/share`)
+			.send({ shareWithIds: [member.id] })
+			.expect(200);
+	});
+});
+
+describe('PUT /workflows/:id', () => {
+	test('PUT /workflows/:id/share should save sharing with new users', async () => {
+		const workflow = await createWorkflow({}, owner);
+
+		const response = await authOwnerAgent
+			.put(`/workflows/${workflow.id}/share`)
+			.send({ shareWithIds: [member.id] });
+
+		expect(response.statusCode).toBe(200);
+
+		const sharedWorkflows = await getWorkflowSharing(workflow);
+		expect(sharedWorkflows).toHaveLength(2);
+		expect(mailer.notifyWorkflowShared).toHaveBeenCalledTimes(1);
+	});
+
+	test('PUT /workflows/:id/share should succeed when sharing with invalid user-id', async () => {
+		const workflow = await createWorkflow({}, owner);
+
+		const response = await authOwnerAgent
+			.put(`/workflows/${workflow.id}/share`)
+			.send({ shareWithIds: [uuid()] });
+
+		expect(response.statusCode).toBe(200);
+
+		const sharedWorkflows = await getWorkflowSharing(workflow);
+		expect(sharedWorkflows).toHaveLength(1);
+	});
+
+	test('PUT /workflows/:id/share should allow sharing with multiple users', async () => {
+		const workflow = await createWorkflow({}, owner);
+
+		const response = await authOwnerAgent
+			.put(`/workflows/${workflow.id}/share`)
+			.send({ shareWithIds: [member.id, anotherMember.id] });
+
+		expect(response.statusCode).toBe(200);
+
+		const sharedWorkflows = await getWorkflowSharing(workflow);
+		expect(sharedWorkflows).toHaveLength(3);
+		expect(mailer.notifyWorkflowShared).toHaveBeenCalledTimes(1);
+	});
+
+	test('PUT /workflows/:id/share should override sharing', async () => {
+		const workflow = await createWorkflow({}, owner);
+
+		const response = await authOwnerAgent
+			.put(`/workflows/${workflow.id}/share`)
+			.send({ shareWithIds: [member.id, anotherMember.id] });
+
+		expect(response.statusCode).toBe(200);
+
+		const sharedWorkflows = await getWorkflowSharing(workflow);
+		expect(sharedWorkflows).toHaveLength(3);
+
+		const secondResponse = await authOwnerAgent
+			.put(`/workflows/${workflow.id}/share`)
+			.send({ shareWithIds: [member.id] });
+		expect(secondResponse.statusCode).toBe(200);
+
+		const secondSharedWorkflows = await getWorkflowSharing(workflow);
+		expect(secondSharedWorkflows).toHaveLength(2);
+		expect(mailer.notifyWorkflowShared).toHaveBeenCalledTimes(2);
+	});
+
+	test('PUT /workflows/:id/share should allow sharing by the owner of the workflow', async () => {
+		const workflow = await createWorkflow({}, member);
+
+		const response = await authMemberAgent
+			.put(`/workflows/${workflow.id}/share`)
+			.send({ shareWithIds: [anotherMember.id] });
+
+		expect(response.statusCode).toBe(200);
+
+		const sharedWorkflows = await getWorkflowSharing(workflow);
+		expect(sharedWorkflows).toHaveLength(2);
+		expect(mailer.notifyWorkflowShared).toHaveBeenCalledTimes(1);
+	});
+
+	test('PUT /workflows/:id/share should allow sharing by the instance owner', async () => {
+		const workflow = await createWorkflow({}, member);
+
+		const response = await authOwnerAgent
+			.put(`/workflows/${workflow.id}/share`)
+			.send({ shareWithIds: [anotherMember.id] });
+
+		expect(response.statusCode).toBe(200);
+
+		const sharedWorkflows = await getWorkflowSharing(workflow);
+		expect(sharedWorkflows).toHaveLength(2);
+		expect(mailer.notifyWorkflowShared).toHaveBeenCalledTimes(1);
+	});
+
+	test('PUT /workflows/:id/share should not allow sharing by another shared member', async () => {
+		const workflow = await createWorkflow({}, member);
+
+		await shareWorkflowWithUsers(workflow, [anotherMember]);
+
+		const response = await authAnotherMemberAgent
+			.put(`/workflows/${workflow.id}/share`)
+			.send({ shareWithIds: [anotherMember.id, owner.id] });
+
+		expect(response.statusCode).toBe(403);
+
+		const sharedWorkflows = await getWorkflowSharing(workflow);
+		expect(sharedWorkflows).toHaveLength(2);
+		expect(mailer.notifyWorkflowShared).toHaveBeenCalledTimes(0);
+	});
+
+	test('PUT /workflows/:id/share should not allow sharing with self by another non-shared member', async () => {
+		const workflow = await createWorkflow({}, member);
+
+		const response = await authAnotherMemberAgent
+			.put(`/workflows/${workflow.id}/share`)
+			.send({ shareWithIds: [anotherMember.id] });
+
+		expect(response.statusCode).toBe(403);
+
+		const sharedWorkflows = await getWorkflowSharing(workflow);
+		expect(sharedWorkflows).toHaveLength(1);
+		expect(mailer.notifyWorkflowShared).toHaveBeenCalledTimes(0);
+	});
+
+	test('PUT /workflows/:id/share should not allow sharing by another non-shared member', async () => {
+		const workflow = await createWorkflow({}, member);
+
+		const tempUser = await createUser({ role: 'global:member' });
+
+		const response = await authAnotherMemberAgent
+			.put(`/workflows/${workflow.id}/share`)
+			.send({ shareWithIds: [tempUser.id] });
+
+		expect(response.statusCode).toBe(403);
+
+		const sharedWorkflows = await getWorkflowSharing(workflow);
+		expect(sharedWorkflows).toHaveLength(1);
+		expect(mailer.notifyWorkflowShared).toHaveBeenCalledTimes(0);
+	});
+
+	test('should not call internal hooks listener for email sent if emailing is disabled', async () => {
+		config.set('userManagement.emails.mode', '');
+
+		const workflow = await createWorkflow({}, owner);
+
+		const response = await authOwnerAgent
+			.put(`/workflows/${workflow.id}/share`)
+			.send({ shareWithIds: [member.id] });
+
+		expect(response.statusCode).toBe(200);
+
+		config.set('userManagement.emails.mode', 'smtp');
+	});
+});
+
+describe('GET /workflows/new', () => {
+	[true, false].forEach((sharingEnabled) => {
+		test(`should return an auto-incremented name, even when sharing is ${
+			sharingEnabled ? 'enabled' : 'disabled'
+		}`, async () => {
+			sharingSpy.mockReturnValueOnce(sharingEnabled);
+
+			await createWorkflow({ name: 'My workflow' }, owner);
+			await createWorkflow({ name: 'My workflow 7' }, owner);
+
+			const response = await authOwnerAgent.get('/workflows/new');
+			expect(response.statusCode).toBe(200);
+			expect(response.body.data.name).toEqual('My workflow 8');
+		});
+	});
+});
+
+describe('GET /workflows/:id', () => {
+	test('GET should fail with invalid id due to route rule', async () => {
+		const response = await authOwnerAgent.get('/workflows/potatoes');
+
+		expect(response.statusCode).toBe(404);
+	});
+
+	test('GET should return 404 for non existing workflow', async () => {
+		const response = await authOwnerAgent.get('/workflows/9001');
+
+		expect(response.statusCode).toBe(404);
+	});
+
+	test('GET should return a workflow with owner', async () => {
+		const workflow = await createWorkflow({}, owner);
+
+		const response = await authOwnerAgent.get(`/workflows/${workflow.id}`);
+
+		expect(response.statusCode).toBe(200);
+		expect(response.body.data.ownedBy).toMatchObject({
+			id: owner.id,
+			email: owner.email,
+			firstName: owner.firstName,
+			lastName: owner.lastName,
+		});
+
+		expect(response.body.data.sharedWith).toHaveLength(0);
+	});
+
+	test('GET should return shared workflow with user data', async () => {
+		const workflow = await createWorkflow({}, owner);
+		await shareWorkflowWithUsers(workflow, [member]);
+
+		const response = await authOwnerAgent.get(`/workflows/${workflow.id}`);
+
+		expect(response.statusCode).toBe(200);
+		expect(response.body.data.ownedBy).toMatchObject({
+			id: owner.id,
+			email: owner.email,
+			firstName: owner.firstName,
+			lastName: owner.lastName,
+		});
+
+		expect(response.body.data.sharedWith).toHaveLength(1);
+		expect(response.body.data.sharedWith[0]).toMatchObject({
+			id: member.id,
+			email: member.email,
+			firstName: member.firstName,
+			lastName: member.lastName,
+		});
+	});
+
+	test('GET should return all sharees', async () => {
+		const workflow = await createWorkflow({}, owner);
+		await shareWorkflowWithUsers(workflow, [member, anotherMember]);
+
+		const response = await authOwnerAgent.get(`/workflows/${workflow.id}`);
+
+		expect(response.statusCode).toBe(200);
+		expect(response.body.data.ownedBy).toMatchObject({
+			id: owner.id,
+			email: owner.email,
+			firstName: owner.firstName,
+			lastName: owner.lastName,
+		});
+
+		expect(response.body.data.sharedWith).toHaveLength(2);
+	});
+
+	test('GET should return workflow with credentials owned by user', async () => {
+		const savedCredential = await saveCredential(randomCredentialPayload(), { user: owner });
+
+		const workflowPayload = makeWorkflow({
+			withPinData: false,
+			withCredential: { id: savedCredential.id, name: savedCredential.name },
+		});
+		const workflow = await createWorkflow(workflowPayload, owner);
+
+		const response = await authOwnerAgent.get(`/workflows/${workflow.id}`);
+
+		expect(response.statusCode).toBe(200);
+		expect(response.body.data.usedCredentials).toMatchObject([
+			{
+				id: savedCredential.id,
+				name: savedCredential.name,
+				currentUserHasAccess: true,
+			},
+		]);
+
+		expect(response.body.data.sharedWith).toHaveLength(0);
+	});
+
+	test('GET should return workflow with credentials saying owner does not have access when not shared', async () => {
+		const savedCredential = await saveCredential(randomCredentialPayload(), { user: member });
+
+		const workflowPayload = makeWorkflow({
+			withPinData: false,
+			withCredential: { id: savedCredential.id, name: savedCredential.name },
+		});
+		const workflow = await createWorkflow(workflowPayload, owner);
+
+		const response = await authOwnerAgent.get(`/workflows/${workflow.id}`);
+
+		expect(response.statusCode).toBe(200);
+		expect(response.body.data.usedCredentials).toMatchObject([
+			{
+				id: savedCredential.id,
+				name: savedCredential.name,
+				currentUserHasAccess: false, // although owner can see, they do not have access
+			},
+		]);
+
+		expect(response.body.data.sharedWith).toHaveLength(0);
+	});
+
+	test('GET should return workflow with credentials for all users with or without access', async () => {
+		const savedCredential = await saveCredential(randomCredentialPayload(), { user: member });
+
+		const workflowPayload = makeWorkflow({
+			withPinData: false,
+			withCredential: { id: savedCredential.id, name: savedCredential.name },
+		});
+		const workflow = await createWorkflow(workflowPayload, member);
+		await shareWorkflowWithUsers(workflow, [anotherMember]);
+
+		const responseMember1 = await authMemberAgent.get(`/workflows/${workflow.id}`);
+		expect(responseMember1.statusCode).toBe(200);
+		expect(responseMember1.body.data.usedCredentials).toMatchObject([
+			{
+				id: savedCredential.id,
+				name: savedCredential.name,
+				currentUserHasAccess: true, // one user has access
+			},
+		]);
+		expect(responseMember1.body.data.sharedWith).toHaveLength(1);
+
+		const responseMember2 = await authAnotherMemberAgent.get(`/workflows/${workflow.id}`);
+		expect(responseMember2.statusCode).toBe(200);
+		expect(responseMember2.body.data.usedCredentials).toMatchObject([
+			{
+				id: savedCredential.id,
+				name: savedCredential.name,
+				currentUserHasAccess: false, // the other one doesn't
+			},
+		]);
+		expect(responseMember2.body.data.sharedWith).toHaveLength(1);
+	});
+
+	test('GET should return workflow with credentials for all users with access', async () => {
+		const savedCredential = await saveCredential(randomCredentialPayload(), { user: member });
+		// Both users have access to the credential (none is owner)
+		await shareCredentialWithUsers(savedCredential, [anotherMember]);
+
+		const workflowPayload = makeWorkflow({
+			withPinData: false,
+			withCredential: { id: savedCredential.id, name: savedCredential.name },
+		});
+		const workflow = await createWorkflow(workflowPayload, member);
+		await shareWorkflowWithUsers(workflow, [anotherMember]);
+
+		const responseMember1 = await authMemberAgent.get(`/workflows/${workflow.id}`);
+		expect(responseMember1.statusCode).toBe(200);
+		expect(responseMember1.body.data.usedCredentials).toMatchObject([
+			{
+				id: savedCredential.id,
+				name: savedCredential.name,
+				currentUserHasAccess: true,
+			},
+		]);
+		expect(responseMember1.body.data.sharedWith).toHaveLength(1);
+
+		const responseMember2 = await authAnotherMemberAgent.get(`/workflows/${workflow.id}`);
+		expect(responseMember2.statusCode).toBe(200);
+		expect(responseMember2.body.data.usedCredentials).toMatchObject([
+			{
+				id: savedCredential.id,
+				name: savedCredential.name,
+				currentUserHasAccess: true,
+			},
+		]);
+		expect(responseMember2.body.data.sharedWith).toHaveLength(1);
+	});
+});
+
+describe('POST /workflows', () => {
+	it('Should create a workflow that uses no credential', async () => {
+		const workflow = makeWorkflow({ withPinData: false });
+
+		const response = await authOwnerAgent.post('/workflows').send(workflow);
+
+		expect(response.statusCode).toBe(200);
+	});
+
+	it('Should save a new workflow with credentials', async () => {
+		const savedCredential = await saveCredential(randomCredentialPayload(), { user: owner });
+		const workflow = makeWorkflow({
+			withPinData: false,
+			withCredential: { id: savedCredential.id, name: savedCredential.name },
+		});
+
+		const response = await authOwnerAgent.post('/workflows').send(workflow);
+
+		expect(response.statusCode).toBe(200);
+	});
+
+	it('Should not allow saving a workflow using credential you have no access', async () => {
+		// Credential belongs to owner, member cannot use it.
+		const savedCredential = await saveCredential(randomCredentialPayload(), { user: owner });
+		const workflow = makeWorkflow({
+			withPinData: false,
+			withCredential: { id: savedCredential.id, name: savedCredential.name },
+		});
+
+		const response = await authMemberAgent.post('/workflows').send(workflow);
+
+		expect(response.statusCode).toBe(400);
+		expect(response.body.message).toBe(
+			'The workflow you are trying to save contains credentials that are not shared with you',
+		);
+	});
+
+	it('Should allow owner to save a workflow using credential owned by others', async () => {
+		// Credential belongs to owner, member cannot use it.
+		const savedCredential = await saveCredential(randomCredentialPayload(), { user: member });
+		const workflow = makeWorkflow({
+			withPinData: false,
+			withCredential: { id: savedCredential.id, name: savedCredential.name },
+		});
+
+		const response = await authOwnerAgent.post('/workflows').send(workflow);
+
+		expect(response.statusCode).toBe(200);
+	});
+
+	it('Should allow saving a workflow using a credential owned by others and shared with you', async () => {
+		const savedCredential = await saveCredential(randomCredentialPayload(), { user: member });
+		await shareCredentialWithUsers(savedCredential, [anotherMember]);
+
+		const workflow = makeWorkflow({
+			withPinData: false,
+			withCredential: { id: savedCredential.id, name: savedCredential.name },
+		});
+
+		const response = await authAnotherMemberAgent.post('/workflows').send(workflow);
+		expect(response.statusCode).toBe(200);
+	});
+
+	test('Should create workflow history version when licensed', async () => {
+		license.enable('feat:workflowHistory');
+		const payload = {
+			name: 'testing',
+			nodes: [
+				{
+					id: 'uuid-1234',
+					parameters: {},
+					name: 'Start',
+					type: 'n8n-nodes-base.start',
+					typeVersion: 1,
+					position: [240, 300],
+				},
+			],
+			connections: {},
+			staticData: null,
+			settings: {
+				saveExecutionProgress: true,
+				saveManualExecutions: true,
+				saveDataErrorExecution: 'all',
+				saveDataSuccessExecution: 'all',
+				executionTimeout: 3600,
+				timezone: 'America/New_York',
+			},
+			active: false,
+		};
+
+		const response = await authOwnerAgent.post('/workflows').send(payload);
+
+		expect(response.statusCode).toBe(200);
+
+		const {
+			data: { id },
+		} = response.body;
+
+		expect(id).toBeDefined();
+		expect(
+			await Container.get(WorkflowHistoryRepository).count({ where: { workflowId: id } }),
+		).toBe(1);
+		const historyVersion = await Container.get(WorkflowHistoryRepository).findOne({
+			where: {
+				workflowId: id,
+			},
+		});
+		expect(historyVersion).not.toBeNull();
+		expect(historyVersion!.connections).toEqual(payload.connections);
+		expect(historyVersion!.nodes).toEqual(payload.nodes);
+	});
+
+	test('Should not create workflow history version when not licensed', async () => {
+		license.disable('feat:workflowHistory');
+		const payload = {
+			name: 'testing',
+			nodes: [
+				{
+					id: 'uuid-1234',
+					parameters: {},
+					name: 'Start',
+					type: 'n8n-nodes-base.start',
+					typeVersion: 1,
+					position: [240, 300],
+				},
+			],
+			connections: {},
+			staticData: null,
+			settings: {
+				saveExecutionProgress: true,
+				saveManualExecutions: true,
+				saveDataErrorExecution: 'all',
+				saveDataSuccessExecution: 'all',
+				executionTimeout: 3600,
+				timezone: 'America/New_York',
+			},
+			active: false,
+		};
+
+		const response = await authOwnerAgent.post('/workflows').send(payload);
+
+		expect(response.statusCode).toBe(200);
+
+		const {
+			data: { id },
+		} = response.body;
+
+		expect(id).toBeDefined();
+		expect(
+			await Container.get(WorkflowHistoryRepository).count({ where: { workflowId: id } }),
+		).toBe(0);
+	});
+});
+
+describe('PATCH /workflows/:id - validate credential permissions to user', () => {
+	it('Should succeed when saving unchanged workflow nodes', async () => {
+		const savedCredential = await saveCredential(randomCredentialPayload(), { user: owner });
+		const workflow = {
+			name: 'test',
+			active: false,
+			connections: {},
+			nodes: [
+				{
+					id: 'uuid-1234',
+					name: 'Start',
+					parameters: {},
+					position: [-20, 260],
+					type: 'n8n-nodes-base.start',
+					typeVersion: 1,
+					credentials: {
+						default: {
+							id: savedCredential.id,
+							name: savedCredential.name,
+						},
+					},
+				},
+			],
+		};
+
+		const createResponse = await authOwnerAgent.post('/workflows').send(workflow);
+		const { id, versionId } = createResponse.body.data;
+
+		const response = await authOwnerAgent.patch(`/workflows/${id}`).send({
+			name: 'new name',
+			versionId,
+		});
+
+		expect(response.statusCode).toBe(200);
+	});
+
+	it('Should allow owner to add node containing credential not shared with the owner', async () => {
+		const savedCredential = await saveCredential(randomCredentialPayload(), { user: member });
+		const workflow = {
+			name: 'test',
+			active: false,
+			connections: {},
+			nodes: [
+				{
+					id: 'uuid-1234',
+					name: 'Start',
+					parameters: {},
+					position: [-20, 260],
+					type: 'n8n-nodes-base.start',
+					typeVersion: 1,
+					credentials: {
+						default: {
+							id: savedCredential.id,
+							name: savedCredential.name,
+						},
+					},
+				},
+			],
+		};
+
+		const createResponse = await authOwnerAgent.post('/workflows').send(workflow);
+		const { id, versionId } = createResponse.body.data;
+
+		const response = await authOwnerAgent.patch(`/workflows/${id}`).send({
+			versionId,
+			nodes: [
+				{
+					id: 'uuid-1234',
+					name: 'Start',
+					parameters: {},
+					position: [-20, 260],
+					type: 'n8n-nodes-base.start',
+					typeVersion: 1,
+					credentials: {
+						default: {
+							id: savedCredential.id,
+							name: savedCredential.name,
+						},
+					},
+				},
+			],
+		});
+
+		expect(response.statusCode).toBe(200);
+	});
+
+	it('Should prevent member from adding node containing credential inaccessible to member', async () => {
+		const savedCredential = await saveCredential(randomCredentialPayload(), { user: owner });
+
+		const workflow = {
+			name: 'test',
+			active: false,
+			connections: {},
+			nodes: [
+				{
+					id: 'uuid-1234',
+					name: 'Start',
+					parameters: {},
+					position: [-20, 260],
+					type: 'n8n-nodes-base.start',
+					typeVersion: 1,
+					credentials: {
+						default: {
+							id: savedCredential.id,
+							name: savedCredential.name,
+						},
+					},
+				},
+			],
+		};
+
+		const createResponse = await authOwnerAgent.post('/workflows').send(workflow);
+		const { id, versionId } = createResponse.body.data;
+
+		const response = await authMemberAgent.patch(`/workflows/${id}`).send({
+			versionId,
+			nodes: [
+				{
+					id: 'uuid-1234',
+					name: 'Start',
+					parameters: {},
+					position: [-20, 260],
+					type: 'n8n-nodes-base.start',
+					typeVersion: 1,
+					credentials: {},
+				},
+				{
+					id: 'uuid-12345',
+					name: 'Start',
+					parameters: {},
+					position: [-20, 260],
+					type: 'n8n-nodes-base.start',
+					typeVersion: 1,
+					credentials: {
+						default: {
+							id: savedCredential.id,
+							name: savedCredential.name,
+						},
+					},
+				},
+			],
+		});
+		expect(response.statusCode).toBe(400);
+	});
+
+	it('Should succeed but prevent modifying node attributes other than position, name and disabled', async () => {
+		const savedCredential = await saveCredential(randomCredentialPayload(), { user: member });
+
+		const originalNodes: INode[] = [
+			{
+				id: 'uuid-1234',
+				name: 'Start',
+				parameters: {
+					firstParam: 123,
+				},
+				position: [-20, 260],
+				type: 'n8n-nodes-base.start',
+				typeVersion: 1,
+				credentials: {
+					default: {
+						id: savedCredential.id,
+						name: savedCredential.name,
+					},
+				},
+			},
+		];
+
+		const changedNodes: INode[] = [
+			{
+				id: 'uuid-1234',
+				name: 'End',
+				parameters: {
+					firstParam: 456,
+				},
+				position: [-20, 555],
+				type: 'n8n-nodes-base.no-op',
+				typeVersion: 1,
+				credentials: {
+					default: {
+						id: '200',
+						name: 'fake credential',
+					},
+				},
+				disabled: true,
+			},
+		];
+
+		const expectedNodes: INode[] = [
+			{
+				id: 'uuid-1234',
+				name: 'End',
+				parameters: {
+					firstParam: 123,
+				},
+				position: [-20, 555],
+				type: 'n8n-nodes-base.start',
+				typeVersion: 1,
+				credentials: {
+					default: {
+						id: savedCredential.id,
+						name: savedCredential.name,
+					},
+				},
+				disabled: true,
+			},
+		];
+
+		const workflow = {
+			name: 'test',
+			active: false,
+			connections: {},
+			nodes: originalNodes,
+		};
+
+		const createResponse = await authMemberAgent.post('/workflows').send(workflow);
+		const { id, versionId } = createResponse.body.data;
+
+		await authMemberAgent.put(`/workflows/${id}/share`).send({ shareWithIds: [anotherMember.id] });
+
+		const response = await authAnotherMemberAgent.patch(`/workflows/${id}`).send({
+			versionId,
+			nodes: changedNodes,
+		});
+
+		expect(response.statusCode).toBe(200);
+		expect(response.body.data.nodes).toMatchObject(expectedNodes);
+	});
+});
+
+describe('PATCH /workflows/:id - validate interim updates', () => {
+	it('should block owner updating workflow nodes on interim update by member', async () => {
+		// owner creates and shares workflow
+
+		const createResponse = await authOwnerAgent.post('/workflows').send(makeWorkflow());
+		const { id, versionId: ownerVersionId } = createResponse.body.data;
+		await authOwnerAgent.put(`/workflows/${id}/share`).send({ shareWithIds: [member.id] });
+
+		// member accesses and updates workflow name
+
+		const memberGetResponse = await authMemberAgent.get(`/workflows/${id}`);
+		const { versionId: memberVersionId } = memberGetResponse.body.data;
+
+		await authMemberAgent
+			.patch(`/workflows/${id}`)
+			.send({ name: 'Update by member', versionId: memberVersionId });
+
+		// owner blocked from updating workflow nodes
+
+		const updateAttemptResponse = await authOwnerAgent
+			.patch(`/workflows/${id}`)
+			.send({ nodes: [], versionId: ownerVersionId });
+
+		expect(updateAttemptResponse.status).toBe(400);
+		expect(updateAttemptResponse.body.code).toBe(100);
+	});
+
+	it('should block member updating workflow nodes on interim update by owner', async () => {
+		// owner creates, updates and shares workflow
+
+		const createResponse = await authOwnerAgent.post('/workflows').send(makeWorkflow());
+		const { id, versionId: ownerFirstVersionId } = createResponse.body.data;
+
+		const updateResponse = await authOwnerAgent
+			.patch(`/workflows/${id}`)
+			.send({ name: 'Update by owner', versionId: ownerFirstVersionId });
+
+		const { versionId: ownerSecondVersionId } = updateResponse.body.data;
+
+		await authOwnerAgent.put(`/workflows/${id}/share`).send({ shareWithIds: [member.id] });
+
+		// member accesses workflow
+
+		const memberGetResponse = await authMemberAgent.get(`/workflows/${id}`);
+		const { versionId: memberVersionId } = memberGetResponse.body.data;
+
+		// owner re-updates workflow
+
+		await authOwnerAgent
+			.patch(`/workflows/${id}`)
+			.send({ name: 'Owner update again', versionId: ownerSecondVersionId });
+
+		// member blocked from updating workflow
+
+		const updateAttemptResponse = await authMemberAgent
+			.patch(`/workflows/${id}`)
+			.send({ nodes: [], versionId: memberVersionId });
+
+		expect(updateAttemptResponse.status).toBe(400);
+		expect(updateAttemptResponse.body.code).toBe(100);
+	});
+
+	it('should block owner activation on interim activation by member', async () => {
+		// owner creates and shares workflow
+
+		const createResponse = await authOwnerAgent.post('/workflows').send(makeWorkflow());
+		const { id, versionId: ownerVersionId } = createResponse.body.data;
+		await authOwnerAgent.put(`/workflows/${id}/share`).send({ shareWithIds: [member.id] });
+
+		// member accesses and activates workflow
+
+		const memberGetResponse = await authMemberAgent.get(`/workflows/${id}`);
+		const { versionId: memberVersionId } = memberGetResponse.body.data;
+		await authMemberAgent
+			.patch(`/workflows/${id}`)
+			.send({ active: true, versionId: memberVersionId, name: 'Update by member' });
+		// owner blocked from activating workflow
+
+		const activationAttemptResponse = await authOwnerAgent
+			.patch(`/workflows/${id}`)
+			.send({ active: true, versionId: ownerVersionId, name: 'Update by owner' });
+
+		expect(activationAttemptResponse.status).toBe(400);
+		expect(activationAttemptResponse.body.code).toBe(100);
+	});
+
+	it('should block member activation on interim activation by owner', async () => {
+		// owner creates, updates and shares workflow
+
+		const createResponse = await authOwnerAgent.post('/workflows').send(makeWorkflow());
+		const { id, versionId: ownerFirstVersionId } = createResponse.body.data;
+
+		const updateResponse = await authOwnerAgent
+			.patch(`/workflows/${id}`)
+			.send({ name: 'Update by owner', versionId: ownerFirstVersionId });
+		const { versionId: ownerSecondVersionId } = updateResponse.body.data;
+
+		await authOwnerAgent.put(`/workflows/${id}/share`).send({ shareWithIds: [member.id] });
+
+		// member accesses workflow
+
+		const memberGetResponse = await authMemberAgent.get(`/workflows/${id}`);
+		const { versionId: memberVersionId } = memberGetResponse.body.data;
+
+		// owner activates workflow
+
+		await authOwnerAgent
+			.patch(`/workflows/${id}`)
+			.send({ active: true, versionId: ownerSecondVersionId, name: 'Owner update again' });
+
+		// member blocked from activating workflow
+
+		const updateAttemptResponse = await authMemberAgent
+			.patch(`/workflows/${id}`)
+			.send({ active: true, versionId: memberVersionId, name: 'Update by member' });
+
+		expect(updateAttemptResponse.status).toBe(400);
+		expect(updateAttemptResponse.body.code).toBe(100);
+	});
+
+	it('should block member updating workflow settings on interim update by owner', async () => {
+		// owner creates and shares workflow
+
+		const createResponse = await authOwnerAgent.post('/workflows').send(makeWorkflow());
+		const { id, versionId: ownerVersionId } = createResponse.body.data;
+		await authOwnerAgent.put(`/workflows/${id}/share`).send({ shareWithIds: [member.id] });
+
+		// member accesses workflow
+
+		const memberGetResponse = await authMemberAgent.get(`/workflows/${id}`);
+		const { versionId: memberVersionId } = memberGetResponse.body.data;
+
+		// owner updates workflow name
+
+		await authOwnerAgent
+			.patch(`/workflows/${id}`)
+			.send({ name: 'Another name', versionId: ownerVersionId });
+
+		// member blocked from updating workflow settings
+
+		const updateAttemptResponse = await authMemberAgent
+			.patch(`/workflows/${id}`)
+			.send({ settings: { saveManualExecutions: true }, versionId: memberVersionId });
+
+		expect(updateAttemptResponse.status).toBe(400);
+		expect(updateAttemptResponse.body.code).toBe(100);
+	});
+
+	it('should block member updating workflow name on interim update by owner', async () => {
+		// owner creates and shares workflow
+
+		const createResponse = await authOwnerAgent.post('/workflows').send(makeWorkflow());
+		const { id, versionId: ownerVersionId } = createResponse.body.data;
+		await authOwnerAgent.put(`/workflows/${id}/share`).send({ shareWithIds: [member.id] });
+
+		// member accesses workflow
+
+		const memberGetResponse = await authMemberAgent.get(`/workflows/${id}`);
+		const { versionId: memberVersionId } = memberGetResponse.body.data;
+
+		// owner updates workflow settings
+
+		await authOwnerAgent
+			.patch(`/workflows/${id}`)
+			.send({ settings: { saveManualExecutions: true }, versionId: ownerVersionId });
+
+		// member blocked from updating workflow name
+
+		const updateAttemptResponse = await authMemberAgent
+			.patch(`/workflows/${id}`)
+			.send({ settings: { saveManualExecutions: true }, versionId: memberVersionId });
+
+		expect(updateAttemptResponse.status).toBe(400);
+		expect(updateAttemptResponse.body.code).toBe(100);
+	});
+});
+
+describe('getSharedWorkflowIds', () => {
+	it('should show all workflows to owners', async () => {
+		owner.role = 'global:owner';
+		const workflow1 = await createWorkflow({}, member);
+		const workflow2 = await createWorkflow({}, anotherMember);
+		const sharedWorkflowIds =
+			await Container.get(WorkflowSharingService).getSharedWorkflowIds(owner);
+		expect(sharedWorkflowIds).toHaveLength(2);
+		expect(sharedWorkflowIds).toContain(workflow1.id);
+		expect(sharedWorkflowIds).toContain(workflow2.id);
+	});
+
+	it('should show shared workflows to users', async () => {
+		member.role = 'global:member';
+		const workflow1 = await createWorkflow({}, anotherMember);
+		const workflow2 = await createWorkflow({}, anotherMember);
+		const workflow3 = await createWorkflow({}, anotherMember);
+		await shareWorkflowWithUsers(workflow1, [member]);
+		await shareWorkflowWithUsers(workflow3, [member]);
+		const sharedWorkflowIds =
+			await Container.get(WorkflowSharingService).getSharedWorkflowIds(member);
+		expect(sharedWorkflowIds).toHaveLength(2);
+		expect(sharedWorkflowIds).toContain(workflow1.id);
+		expect(sharedWorkflowIds).toContain(workflow3.id);
+	});
+});
+
+describe('PATCH /workflows/:id - workflow history', () => {
+	test('Should create workflow history version when licensed', async () => {
+		license.enable('feat:workflowHistory');
+		const workflow = await createWorkflow({}, owner);
+		const payload = {
+			name: 'name updated',
+			versionId: workflow.versionId,
+			nodes: [
+				{
+					id: 'uuid-1234',
+					parameters: {},
+					name: 'Start',
+					type: 'n8n-nodes-base.start',
+					typeVersion: 1,
+					position: [240, 300],
+				},
+				{
+					id: 'uuid-1234',
+					parameters: {},
+					name: 'Cron',
+					type: 'n8n-nodes-base.cron',
+					typeVersion: 1,
+					position: [400, 300],
+				},
+			],
+			connections: {},
+			staticData: '{"id":1}',
+			settings: {
+				saveExecutionProgress: false,
+				saveManualExecutions: false,
+				saveDataErrorExecution: 'all',
+				saveDataSuccessExecution: 'all',
+				executionTimeout: 3600,
+				timezone: 'America/New_York',
+			},
+		};
+
+		const response = await authOwnerAgent.patch(`/workflows/${workflow.id}`).send(payload);
+
+		const {
+			data: { id },
+		} = response.body;
+
+		expect(response.statusCode).toBe(200);
+
+		expect(id).toBe(workflow.id);
+		expect(
+			await Container.get(WorkflowHistoryRepository).count({ where: { workflowId: id } }),
+		).toBe(1);
+		const historyVersion = await Container.get(WorkflowHistoryRepository).findOne({
+			where: {
+				workflowId: id,
+			},
+		});
+		expect(historyVersion).not.toBeNull();
+		expect(historyVersion!.connections).toEqual(payload.connections);
+		expect(historyVersion!.nodes).toEqual(payload.nodes);
+	});
+
+	test('Should not create workflow history version when not licensed', async () => {
+		license.disable('feat:workflowHistory');
+		const workflow = await createWorkflow({}, owner);
+		const payload = {
+			name: 'name updated',
+			versionId: workflow.versionId,
+			nodes: [
+				{
+					id: 'uuid-1234',
+					parameters: {},
+					name: 'Start',
+					type: 'n8n-nodes-base.start',
+					typeVersion: 1,
+					position: [240, 300],
+				},
+				{
+					id: 'uuid-1234',
+					parameters: {},
+					name: 'Cron',
+					type: 'n8n-nodes-base.cron',
+					typeVersion: 1,
+					position: [400, 300],
+				},
+			],
+			connections: {},
+			staticData: '{"id":1}',
+			settings: {
+				saveExecutionProgress: false,
+				saveManualExecutions: false,
+				saveDataErrorExecution: 'all',
+				saveDataSuccessExecution: 'all',
+				executionTimeout: 3600,
+				timezone: 'America/New_York',
+			},
+		};
+
+		const response = await authOwnerAgent.patch(`/workflows/${workflow.id}`).send(payload);
+
+		const {
+			data: { id },
+		} = response.body;
+
+		expect(response.statusCode).toBe(200);
+
+		expect(id).toBe(workflow.id);
+		expect(
+			await Container.get(WorkflowHistoryRepository).count({ where: { workflowId: id } }),
+		).toBe(0);
+	});
+});
+
+describe('PATCH /workflows/:id - activate workflow', () => {
+	test('should activate workflow without changing version ID', async () => {
+		license.disable('feat:workflowHistory');
+		const workflow = await createWorkflow({}, owner);
+		const payload = {
+			versionId: workflow.versionId,
+			active: true,
+		};
+
+		const response = await authOwnerAgent.patch(`/workflows/${workflow.id}`).send(payload);
+
+		expect(response.statusCode).toBe(200);
+		expect(activeWorkflowManager.add).toBeCalled();
+
+		const {
+			data: { id, versionId, active },
+		} = response.body;
+
+		expect(id).toBe(workflow.id);
+		expect(versionId).toBe(workflow.versionId);
+		expect(active).toBe(true);
+	});
+
+	test('should deactivate workflow without changing version ID', async () => {
+		license.disable('feat:workflowHistory');
+		const workflow = await createWorkflow({ active: true }, owner);
+		const payload = {
+			versionId: workflow.versionId,
+			active: false,
+		};
+
+		const response = await authOwnerAgent.patch(`/workflows/${workflow.id}`).send(payload);
+
+		expect(response.statusCode).toBe(200);
+		expect(activeWorkflowManager.add).not.toBeCalled();
+		expect(activeWorkflowManager.remove).toBeCalled();
+
+		const {
+			data: { id, versionId, active },
+		} = response.body;
+
+		expect(id).toBe(workflow.id);
+		expect(versionId).toBe(workflow.versionId);
+		expect(active).toBe(false);
+	});
+});
diff --git a/packages/cli/test/integration/workflows/workflows.controller.test.ts b/packages/cli/test/integration/workflows/workflows.controller.test.ts
new file mode 100644
index 0000000000000..fa1e3cba799b9
--- /dev/null
+++ b/packages/cli/test/integration/workflows/workflows.controller.test.ts
@@ -0,0 +1,660 @@
+import Container from 'typedi';
+import type { SuperAgentTest } from 'supertest';
+import { v4 as uuid } from 'uuid';
+import type { INode, IPinData } from 'n8n-workflow';
+
+import type { User } from '@db/entities/User';
+import { WorkflowRepository } from '@db/repositories/workflow.repository';
+import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
+import type { ListQuery } from '@/requests';
+import { WorkflowHistoryRepository } from '@db/repositories/workflowHistory.repository';
+import { ActiveWorkflowManager } from '@/ActiveWorkflowManager';
+import { EnterpriseWorkflowService } from '@/workflows/workflow.service.ee';
+
+import { mockInstance } from '../../shared/mocking';
+import * as utils from '../shared/utils/';
+import * as testDb from '../shared/testDb';
+import { makeWorkflow, MOCK_PINDATA } from '../shared/utils/';
+import { randomCredentialPayload } from '../shared/random';
+import { saveCredential } from '../shared/db/credentials';
+import { createOwner } from '../shared/db/users';
+import { createWorkflow } from '../shared/db/workflows';
+import { createTag } from '../shared/db/tags';
+import { License } from '@/License';
+
+let owner: User;
+let authOwnerAgent: SuperAgentTest;
+
+jest.spyOn(License.prototype, 'isSharingEnabled').mockReturnValue(false);
+
+const testServer = utils.setupTestServer({ endpointGroups: ['workflows'] });
+const license = testServer.license;
+
+const { objectContaining, arrayContaining, any } = expect;
+
+const activeWorkflowManagerLike = mockInstance(ActiveWorkflowManager);
+
+beforeAll(async () => {
+	owner = await createOwner();
+	authOwnerAgent = testServer.authAgentFor(owner);
+});
+
+beforeEach(async () => {
+	jest.resetAllMocks();
+	await testDb.truncate(['Workflow', 'SharedWorkflow', 'Tag', 'WorkflowHistory']);
+});
+
+describe('POST /workflows', () => {
+	const testWithPinData = async (withPinData: boolean) => {
+		const workflow = makeWorkflow({ withPinData });
+		const response = await authOwnerAgent.post('/workflows').send(workflow);
+		expect(response.statusCode).toBe(200);
+		return (response.body.data as { pinData: IPinData }).pinData;
+	};
+
+	test('should store pin data for node in workflow', async () => {
+		const pinData = await testWithPinData(true);
+		expect(pinData).toMatchObject(MOCK_PINDATA);
+	});
+
+	test('should set pin data to null if no pin data', async () => {
+		const pinData = await testWithPinData(false);
+		expect(pinData).toBeNull();
+	});
+
+	test('should create workflow history version when licensed', async () => {
+		license.enable('feat:workflowHistory');
+		const payload = {
+			name: 'testing',
+			nodes: [
+				{
+					id: 'uuid-1234',
+					parameters: {},
+					name: 'Start',
+					type: 'n8n-nodes-base.start',
+					typeVersion: 1,
+					position: [240, 300],
+				},
+			],
+			connections: {},
+			staticData: null,
+			settings: {
+				saveExecutionProgress: true,
+				saveManualExecutions: true,
+				saveDataErrorExecution: 'all',
+				saveDataSuccessExecution: 'all',
+				executionTimeout: 3600,
+				timezone: 'America/New_York',
+			},
+			active: false,
+		};
+
+		const response = await authOwnerAgent.post('/workflows').send(payload);
+
+		expect(response.statusCode).toBe(200);
+
+		const {
+			data: { id },
+		} = response.body;
+
+		expect(id).toBeDefined();
+		expect(
+			await Container.get(WorkflowHistoryRepository).count({ where: { workflowId: id } }),
+		).toBe(1);
+		const historyVersion = await Container.get(WorkflowHistoryRepository).findOne({
+			where: {
+				workflowId: id,
+			},
+		});
+		expect(historyVersion).not.toBeNull();
+		expect(historyVersion!.connections).toEqual(payload.connections);
+		expect(historyVersion!.nodes).toEqual(payload.nodes);
+	});
+
+	test('should not create workflow history version when not licensed', async () => {
+		license.disable('feat:workflowHistory');
+		const payload = {
+			name: 'testing',
+			nodes: [
+				{
+					id: 'uuid-1234',
+					parameters: {},
+					name: 'Start',
+					type: 'n8n-nodes-base.start',
+					typeVersion: 1,
+					position: [240, 300],
+				},
+			],
+			connections: {},
+			staticData: null,
+			settings: {
+				saveExecutionProgress: true,
+				saveManualExecutions: true,
+				saveDataErrorExecution: 'all',
+				saveDataSuccessExecution: 'all',
+				executionTimeout: 3600,
+				timezone: 'America/New_York',
+			},
+			active: false,
+		};
+
+		const response = await authOwnerAgent.post('/workflows').send(payload);
+
+		expect(response.statusCode).toBe(200);
+
+		const {
+			data: { id },
+		} = response.body;
+
+		expect(id).toBeDefined();
+		expect(
+			await Container.get(WorkflowHistoryRepository).count({ where: { workflowId: id } }),
+		).toBe(0);
+	});
+});
+
+describe('GET /workflows/:id', () => {
+	test('should return pin data', async () => {
+		const workflow = makeWorkflow({ withPinData: true });
+		const workflowCreationResponse = await authOwnerAgent.post('/workflows').send(workflow);
+
+		const { id } = workflowCreationResponse.body.data as { id: string };
+		const workflowRetrievalResponse = await authOwnerAgent.get(`/workflows/${id}`);
+
+		expect(workflowRetrievalResponse.statusCode).toBe(200);
+		const { pinData } = workflowRetrievalResponse.body.data as { pinData: IPinData };
+		expect(pinData).toMatchObject(MOCK_PINDATA);
+	});
+});
+
+describe('GET /workflows', () => {
+	test('should return zero workflows if none exist', async () => {
+		const response = await authOwnerAgent.get('/workflows').expect(200);
+
+		expect(response.body).toEqual({ count: 0, data: [] });
+	});
+
+	test('should return workflows', async () => {
+		const credential = await saveCredential(randomCredentialPayload(), {
+			user: owner,
+			role: 'credential:owner',
+		});
+
+		const nodes: INode[] = [
+			{
+				id: uuid(),
+				name: 'Action Network',
+				type: 'n8n-nodes-base.actionNetwork',
+				parameters: {},
+				typeVersion: 1,
+				position: [0, 0],
+				credentials: {
+					actionNetworkApi: {
+						id: credential.id,
+						name: credential.name,
+					},
+				},
+			},
+		];
+
+		const tag = await createTag({ name: 'A' });
+
+		await createWorkflow({ name: 'First', nodes, tags: [tag] }, owner);
+		await createWorkflow({ name: 'Second' }, owner);
+
+		const response = await authOwnerAgent.get('/workflows').expect(200);
+
+		expect(response.body).toEqual({
+			count: 2,
+			data: arrayContaining([
+				objectContaining({
+					id: any(String),
+					name: 'First',
+					active: any(Boolean),
+					createdAt: any(String),
+					updatedAt: any(String),
+					tags: [{ id: any(String), name: 'A' }],
+					versionId: any(String),
+					ownedBy: {
+						id: owner.id,
+						email: any(String),
+						firstName: any(String),
+						lastName: any(String),
+					},
+					sharedWith: [],
+				}),
+				objectContaining({
+					id: any(String),
+					name: 'Second',
+					active: any(Boolean),
+					createdAt: any(String),
+					updatedAt: any(String),
+					tags: [],
+					versionId: any(String),
+					ownedBy: {
+						id: owner.id,
+						email: any(String),
+						firstName: any(String),
+						lastName: any(String),
+					},
+					sharedWith: [],
+				}),
+			]),
+		});
+
+		const found = response.body.data.find(
+			(w: ListQuery.Workflow.WithOwnership) => w.name === 'First',
+		);
+
+		expect(found.nodes).toBeUndefined();
+		expect(found.sharedWith).toHaveLength(0);
+		expect(found.usedCredentials).toBeUndefined();
+	});
+
+	describe('filter', () => {
+		test('should filter workflows by field: name', async () => {
+			await createWorkflow({ name: 'First' }, owner);
+			await createWorkflow({ name: 'Second' }, owner);
+
+			const response = await authOwnerAgent
+				.get('/workflows')
+				.query('filter={"name":"First"}')
+				.expect(200);
+
+			expect(response.body).toEqual({
+				count: 1,
+				data: [objectContaining({ name: 'First' })],
+			});
+		});
+
+		test('should filter workflows by field: active', async () => {
+			await createWorkflow({ active: true }, owner);
+			await createWorkflow({ active: false }, owner);
+
+			const response = await authOwnerAgent
+				.get('/workflows')
+				.query('filter={ "active": true }')
+				.expect(200);
+
+			expect(response.body).toEqual({
+				count: 1,
+				data: [objectContaining({ active: true })],
+			});
+		});
+
+		test('should filter workflows by field: tags', async () => {
+			const workflow = await createWorkflow({ name: 'First' }, owner);
+
+			await createTag({ name: 'A' }, workflow);
+			await createTag({ name: 'B' }, workflow);
+
+			const response = await authOwnerAgent
+				.get('/workflows')
+				.query('filter={ "tags": ["A"] }')
+				.expect(200);
+
+			expect(response.body).toEqual({
+				count: 1,
+				data: [objectContaining({ name: 'First', tags: [{ id: any(String), name: 'A' }] })],
+			});
+		});
+	});
+
+	describe('select', () => {
+		test('should select workflow field: name', async () => {
+			await createWorkflow({ name: 'First' }, owner);
+			await createWorkflow({ name: 'Second' }, owner);
+
+			const response = await authOwnerAgent.get('/workflows').query('select=["name"]').expect(200);
+
+			expect(response.body).toEqual({
+				count: 2,
+				data: arrayContaining([
+					{ id: any(String), name: 'First' },
+					{ id: any(String), name: 'Second' },
+				]),
+			});
+		});
+
+		test('should select workflow field: active', async () => {
+			await createWorkflow({ active: true }, owner);
+			await createWorkflow({ active: false }, owner);
+
+			const response = await authOwnerAgent
+				.get('/workflows')
+				.query('select=["active"]')
+				.expect(200);
+
+			expect(response.body).toEqual({
+				count: 2,
+				data: arrayContaining([
+					{ id: any(String), active: true },
+					{ id: any(String), active: false },
+				]),
+			});
+		});
+
+		test('should select workflow field: tags', async () => {
+			const firstWorkflow = await createWorkflow({ name: 'First' }, owner);
+			const secondWorkflow = await createWorkflow({ name: 'Second' }, owner);
+
+			await createTag({ name: 'A' }, firstWorkflow);
+			await createTag({ name: 'B' }, secondWorkflow);
+
+			const response = await authOwnerAgent.get('/workflows').query('select=["tags"]').expect(200);
+
+			expect(response.body).toEqual({
+				count: 2,
+				data: arrayContaining([
+					objectContaining({ id: any(String), tags: [{ id: any(String), name: 'A' }] }),
+					objectContaining({ id: any(String), tags: [{ id: any(String), name: 'B' }] }),
+				]),
+			});
+		});
+
+		test('should select workflow fields: createdAt and updatedAt', async () => {
+			const firstWorkflowCreatedAt = '2023-08-08T09:31:25.000Z';
+			const firstWorkflowUpdatedAt = '2023-08-08T09:31:40.000Z';
+			const secondWorkflowCreatedAt = '2023-07-07T09:31:25.000Z';
+			const secondWorkflowUpdatedAt = '2023-07-07T09:31:40.000Z';
+
+			await createWorkflow(
+				{
+					createdAt: new Date(firstWorkflowCreatedAt),
+					updatedAt: new Date(firstWorkflowUpdatedAt),
+				},
+				owner,
+			);
+			await createWorkflow(
+				{
+					createdAt: new Date(secondWorkflowCreatedAt),
+					updatedAt: new Date(secondWorkflowUpdatedAt),
+				},
+				owner,
+			);
+
+			const response = await authOwnerAgent
+				.get('/workflows')
+				.query('select=["createdAt", "updatedAt"]')
+				.expect(200);
+
+			expect(response.body).toEqual({
+				count: 2,
+				data: arrayContaining([
+					objectContaining({
+						id: any(String),
+						createdAt: firstWorkflowCreatedAt,
+						updatedAt: firstWorkflowUpdatedAt,
+					}),
+					objectContaining({
+						id: any(String),
+						createdAt: secondWorkflowCreatedAt,
+						updatedAt: secondWorkflowUpdatedAt,
+					}),
+				]),
+			});
+		});
+
+		test('should select workflow field: versionId', async () => {
+			const firstWorkflowVersionId = 'e95ccdde-2b4e-4fd0-8834-220a2b5b4353';
+			const secondWorkflowVersionId = 'd099b8dc-b1d8-4b2d-9b02-26f32c0ee785';
+
+			await createWorkflow({ versionId: firstWorkflowVersionId }, owner);
+			await createWorkflow({ versionId: secondWorkflowVersionId }, owner);
+
+			const response = await authOwnerAgent
+				.get('/workflows')
+				.query('select=["versionId"]')
+				.expect(200);
+
+			expect(response.body).toEqual({
+				count: 2,
+				data: arrayContaining([
+					{ id: any(String), versionId: firstWorkflowVersionId },
+					{ id: any(String), versionId: secondWorkflowVersionId },
+				]),
+			});
+		});
+
+		test('should select workflow field: ownedBy', async () => {
+			await createWorkflow({}, owner);
+			await createWorkflow({}, owner);
+
+			const response = await authOwnerAgent
+				.get('/workflows')
+				.query('select=["ownedBy"]')
+				.expect(200);
+
+			expect(response.body).toEqual({
+				count: 2,
+				data: arrayContaining([
+					{
+						id: any(String),
+						ownedBy: {
+							id: owner.id,
+							email: any(String),
+							firstName: any(String),
+							lastName: any(String),
+						},
+						sharedWith: [],
+					},
+					{
+						id: any(String),
+						ownedBy: {
+							id: owner.id,
+							email: any(String),
+							firstName: any(String),
+							lastName: any(String),
+						},
+						sharedWith: [],
+					},
+				]),
+			});
+		});
+	});
+});
+
+describe('PATCH /workflows/:id', () => {
+	test('should create workflow history version when licensed', async () => {
+		license.enable('feat:workflowHistory');
+		const workflow = await createWorkflow({}, owner);
+		const payload = {
+			name: 'name updated',
+			versionId: workflow.versionId,
+			nodes: [
+				{
+					id: 'uuid-1234',
+					parameters: {},
+					name: 'Start',
+					type: 'n8n-nodes-base.start',
+					typeVersion: 1,
+					position: [240, 300],
+				},
+				{
+					id: 'uuid-1234',
+					parameters: {},
+					name: 'Cron',
+					type: 'n8n-nodes-base.cron',
+					typeVersion: 1,
+					position: [400, 300],
+				},
+			],
+			connections: {},
+			staticData: '{"id":1}',
+			settings: {
+				saveExecutionProgress: false,
+				saveManualExecutions: false,
+				saveDataErrorExecution: 'all',
+				saveDataSuccessExecution: 'all',
+				executionTimeout: 3600,
+				timezone: 'America/New_York',
+			},
+		};
+
+		const response = await authOwnerAgent.patch(`/workflows/${workflow.id}`).send(payload);
+
+		const {
+			data: { id },
+		} = response.body;
+
+		expect(response.statusCode).toBe(200);
+
+		expect(id).toBe(workflow.id);
+		expect(
+			await Container.get(WorkflowHistoryRepository).count({ where: { workflowId: id } }),
+		).toBe(1);
+		const historyVersion = await Container.get(WorkflowHistoryRepository).findOne({
+			where: {
+				workflowId: id,
+			},
+		});
+		expect(historyVersion).not.toBeNull();
+		expect(historyVersion!.connections).toEqual(payload.connections);
+		expect(historyVersion!.nodes).toEqual(payload.nodes);
+	});
+
+	test('should not create workflow history version when not licensed', async () => {
+		license.disable('feat:workflowHistory');
+		const workflow = await createWorkflow({}, owner);
+		const payload = {
+			name: 'name updated',
+			versionId: workflow.versionId,
+			nodes: [
+				{
+					id: 'uuid-1234',
+					parameters: {},
+					name: 'Start',
+					type: 'n8n-nodes-base.start',
+					typeVersion: 1,
+					position: [240, 300],
+				},
+				{
+					id: 'uuid-1234',
+					parameters: {},
+					name: 'Cron',
+					type: 'n8n-nodes-base.cron',
+					typeVersion: 1,
+					position: [400, 300],
+				},
+			],
+			connections: {},
+			staticData: '{"id":1}',
+			settings: {
+				saveExecutionProgress: false,
+				saveManualExecutions: false,
+				saveDataErrorExecution: 'all',
+				saveDataSuccessExecution: 'all',
+				executionTimeout: 3600,
+				timezone: 'America/New_York',
+			},
+		};
+
+		const response = await authOwnerAgent.patch(`/workflows/${workflow.id}`).send(payload);
+
+		const {
+			data: { id },
+		} = response.body;
+
+		expect(response.statusCode).toBe(200);
+
+		expect(id).toBe(workflow.id);
+		expect(
+			await Container.get(WorkflowHistoryRepository).count({ where: { workflowId: id } }),
+		).toBe(0);
+	});
+
+	test('should activate workflow without changing version ID', async () => {
+		license.disable('feat:workflowHistory');
+		const workflow = await createWorkflow({}, owner);
+		const payload = {
+			versionId: workflow.versionId,
+			active: true,
+		};
+
+		const response = await authOwnerAgent.patch(`/workflows/${workflow.id}`).send(payload);
+
+		expect(response.statusCode).toBe(200);
+		expect(activeWorkflowManagerLike.add).toBeCalled();
+
+		const {
+			data: { id, versionId, active },
+		} = response.body;
+
+		expect(id).toBe(workflow.id);
+		expect(versionId).toBe(workflow.versionId);
+		expect(active).toBe(true);
+	});
+
+	test('should deactivate workflow without changing version ID', async () => {
+		license.disable('feat:workflowHistory');
+		const workflow = await createWorkflow({ active: true }, owner);
+		const payload = {
+			versionId: workflow.versionId,
+			active: false,
+		};
+
+		const response = await authOwnerAgent.patch(`/workflows/${workflow.id}`).send(payload);
+
+		expect(response.statusCode).toBe(200);
+		expect(activeWorkflowManagerLike.add).not.toBeCalled();
+		expect(activeWorkflowManagerLike.remove).toBeCalled();
+
+		const {
+			data: { id, versionId, active },
+		} = response.body;
+
+		expect(id).toBe(workflow.id);
+		expect(versionId).toBe(workflow.versionId);
+		expect(active).toBe(false);
+	});
+
+	test('should update workflow meta', async () => {
+		const workflow = await createWorkflow({}, owner);
+		const payload = {
+			...workflow,
+			meta: {
+				templateCredsSetupCompleted: true,
+			},
+		};
+
+		const response = await authOwnerAgent.patch(`/workflows/${workflow.id}`).send(payload);
+
+		const { data: updatedWorkflow } = response.body;
+
+		expect(response.statusCode).toBe(200);
+
+		expect(updatedWorkflow.id).toBe(workflow.id);
+		expect(updatedWorkflow.meta).toEqual(payload.meta);
+	});
+});
+
+describe('POST /workflows/run', () => {
+	let sharingSpy: jest.SpyInstance;
+	let tamperingSpy: jest.SpyInstance;
+	let workflow: WorkflowEntity;
+
+	beforeAll(() => {
+		const enterpriseWorkflowService = Container.get(EnterpriseWorkflowService);
+		const workflowRepository = Container.get(WorkflowRepository);
+
+		sharingSpy = jest.spyOn(License.prototype, 'isSharingEnabled');
+		tamperingSpy = jest.spyOn(enterpriseWorkflowService, 'preventTampering');
+		workflow = workflowRepository.create({ id: uuid() });
+	});
+
+	test('should prevent tampering if sharing is enabled', async () => {
+		sharingSpy.mockReturnValue(true);
+
+		await authOwnerAgent.post('/workflows/run').send({ workflowData: workflow });
+
+		expect(tamperingSpy).toHaveBeenCalledTimes(1);
+	});
+
+	test('should skip tampering prevention if sharing is disabled', async () => {
+		sharingSpy.mockReturnValue(false);
+
+		await authOwnerAgent.post('/workflows/run').send({ workflowData: workflow });
+
+		expect(tamperingSpy).not.toHaveBeenCalled();
+	});
+});
diff --git a/packages/cli/test/setup-test-folder.ts b/packages/cli/test/setup-test-folder.ts
new file mode 100644
index 0000000000000..4435df5ece441
--- /dev/null
+++ b/packages/cli/test/setup-test-folder.ts
@@ -0,0 +1,18 @@
+import { tmpdir } from 'os';
+import { join } from 'path';
+import { mkdirSync, mkdtempSync, writeFileSync } from 'fs';
+
+process.env.N8N_ENCRYPTION_KEY = 'test_key';
+
+const baseDir = join(tmpdir(), 'n8n-tests/');
+mkdirSync(baseDir, { recursive: true });
+
+const testDir = mkdtempSync(baseDir);
+mkdirSync(join(testDir, '.n8n'));
+process.env.N8N_USER_FOLDER = testDir;
+
+writeFileSync(
+	join(testDir, '.n8n/config'),
+	JSON.stringify({ encryptionKey: 'test_key', instanceId: '123' }),
+	'utf-8',
+);
diff --git a/packages/cli/test/shared/ExternalSecrets/utils.ts b/packages/cli/test/shared/ExternalSecrets/utils.ts
new file mode 100644
index 0000000000000..068e22576e454
--- /dev/null
+++ b/packages/cli/test/shared/ExternalSecrets/utils.ts
@@ -0,0 +1,215 @@
+import { SecretsProvider } from '@/Interfaces';
+import type { SecretsProviderSettings, SecretsProviderState } from '@/Interfaces';
+import type { IDataObject, INodeProperties } from 'n8n-workflow';
+
+export class MockProviders {
+	providers: Record<string, { new (): SecretsProvider }> = {
+		dummy: DummyProvider,
+	};
+
+	setProviders(providers: Record<string, { new (): SecretsProvider }>) {
+		this.providers = providers;
+	}
+
+	getProvider(name: string): { new (): SecretsProvider } | null {
+		return this.providers[name] ?? null;
+	}
+
+	hasProvider(name: string) {
+		return name in this.providers;
+	}
+
+	getAllProviders() {
+		return this.providers;
+	}
+}
+
+export class DummyProvider extends SecretsProvider {
+	properties: INodeProperties[] = [
+		{
+			name: 'username',
+			displayName: 'Username',
+			type: 'string',
+			default: '',
+			required: true,
+		},
+		{
+			name: 'other',
+			displayName: 'Other',
+			type: 'string',
+			default: '',
+		},
+		{
+			name: 'password',
+			displayName: 'Password',
+			type: 'string',
+			default: '',
+			typeOptions: {
+				password: true,
+			},
+		},
+	];
+
+	secrets: Record<string, string> = {};
+
+	displayName = 'Dummy Provider';
+
+	name = 'dummy';
+
+	state: SecretsProviderState = 'initializing';
+
+	_updateSecrets: Record<string, string> = {
+		test1: 'value1',
+		test2: 'value2',
+	};
+
+	async init(settings: SecretsProviderSettings<IDataObject>): Promise<void> {}
+
+	async connect(): Promise<void> {
+		this.state = 'connected';
+	}
+
+	async disconnect(): Promise<void> {}
+
+	async update(): Promise<void> {
+		this.secrets = this._updateSecrets;
+	}
+
+	async test(): Promise<[boolean] | [boolean, string]> {
+		return [true];
+	}
+
+	getSecret(name: string): IDataObject | undefined {
+		return this.secrets[name] as unknown as IDataObject | undefined;
+	}
+
+	hasSecret(name: string): boolean {
+		return name in this.secrets;
+	}
+
+	getSecretNames(): string[] {
+		return Object.keys(this.secrets);
+	}
+}
+
+export class ErrorProvider extends SecretsProvider {
+	secrets: Record<string, string> = {};
+
+	displayName = 'Error Provider';
+
+	name = 'dummy';
+
+	state: SecretsProviderState = 'initializing';
+
+	async init(settings: SecretsProviderSettings<IDataObject>): Promise<void> {
+		throw new Error();
+	}
+
+	async connect(): Promise<void> {
+		this.state = 'error';
+		throw new Error();
+	}
+
+	async disconnect(): Promise<void> {
+		throw new Error();
+	}
+
+	async update(): Promise<void> {
+		throw new Error();
+	}
+
+	async test(): Promise<[boolean] | [boolean, string]> {
+		throw new Error();
+	}
+
+	getSecret(name: string): IDataObject | undefined {
+		throw new Error();
+	}
+
+	hasSecret(name: string): boolean {
+		throw new Error();
+	}
+
+	getSecretNames(): string[] {
+		throw new Error();
+	}
+}
+
+export class FailedProvider extends SecretsProvider {
+	secrets: Record<string, string> = {};
+
+	displayName = 'Failed Provider';
+
+	name = 'dummy';
+
+	state: SecretsProviderState = 'initializing';
+
+	async init(settings: SecretsProviderSettings<IDataObject>): Promise<void> {}
+
+	async connect(): Promise<void> {
+		this.state = 'error';
+	}
+
+	async disconnect(): Promise<void> {}
+
+	async update(): Promise<void> {}
+
+	async test(): Promise<[boolean] | [boolean, string]> {
+		return [true];
+	}
+
+	getSecret(name: string): IDataObject | undefined {
+		return this.secrets[name] as unknown as IDataObject | undefined;
+	}
+
+	hasSecret(name: string): boolean {
+		return name in this.secrets;
+	}
+
+	getSecretNames(): string[] {
+		return Object.keys(this.secrets);
+	}
+}
+
+export class TestFailProvider extends SecretsProvider {
+	secrets: Record<string, string> = {};
+
+	displayName = 'Test Failed Provider';
+
+	name = 'dummy';
+
+	state: SecretsProviderState = 'initializing';
+
+	_updateSecrets: Record<string, string> = {
+		test1: 'value1',
+		test2: 'value2',
+	};
+
+	async init(settings: SecretsProviderSettings<IDataObject>): Promise<void> {}
+
+	async connect(): Promise<void> {
+		this.state = 'connected';
+	}
+
+	async disconnect(): Promise<void> {}
+
+	async update(): Promise<void> {
+		this.secrets = this._updateSecrets;
+	}
+
+	async test(): Promise<[boolean] | [boolean, string]> {
+		return [false];
+	}
+
+	getSecret(name: string): IDataObject | undefined {
+		return this.secrets[name] as unknown as IDataObject | undefined;
+	}
+
+	hasSecret(name: string): boolean {
+		return name in this.secrets;
+	}
+
+	getSecretNames(): string[] {
+		return Object.keys(this.secrets);
+	}
+}
diff --git a/packages/cli/test/shared/mocking.ts b/packages/cli/test/shared/mocking.ts
new file mode 100644
index 0000000000000..5a6183c0e8cbc
--- /dev/null
+++ b/packages/cli/test/shared/mocking.ts
@@ -0,0 +1,24 @@
+import { Container } from 'typedi';
+import { mock } from 'jest-mock-extended';
+import type { DeepPartial } from 'ts-essentials';
+import { DataSource, EntityManager, type EntityMetadata } from '@n8n/typeorm';
+import type { Class } from 'n8n-core';
+
+export const mockInstance = <T>(
+	serviceClass: Class<T>,
+	data: DeepPartial<T> | undefined = undefined,
+) => {
+	const instance = mock<T>(data);
+	Container.set(serviceClass, instance);
+	return instance;
+};
+
+export const mockEntityManager = (entityClass: Class) => {
+	const entityManager = mockInstance(EntityManager);
+	const dataSource = mockInstance(DataSource, {
+		manager: entityManager,
+		getMetadata: () => mock<EntityMetadata>({ target: entityClass }),
+	});
+	Object.assign(entityManager, { connection: dataSource });
+	return entityManager;
+};
diff --git a/packages/cli/test/teardown.ts b/packages/cli/test/teardown.ts
index bfc2748b1c303..b1fb6b12949ce 100644
--- a/packages/cli/test/teardown.ts
+++ b/packages/cli/test/teardown.ts
@@ -1,25 +1,25 @@
 import 'tsconfig-paths/register';
-import { DataSource as Connection } from 'typeorm';
+import { DataSource as Connection } from '@n8n/typeorm';
 import config from '@/config';
-import { getBootstrapDBOptions } from './integration/shared/testDb';
+import { getBootstrapDBOptions, testDbPrefix } from './integration/shared/testDb';
 
 export default async () => {
-	const dbType = config.getEnv('database.type').replace(/db$/, '');
-	if (dbType !== 'postgres' && dbType !== 'mysql') return;
+	const dbType = config.getEnv('database.type');
+	if (dbType !== 'postgresdb' && dbType !== 'mysqldb') return;
 
 	const connection = new Connection(getBootstrapDBOptions(dbType));
 	await connection.initialize();
 
 	const query =
-		dbType === 'postgres' ? 'SELECT datname as "Database" FROM pg_database' : 'SHOW DATABASES';
-	const results: { Database: string }[] = await connection.query(query);
+		dbType === 'postgresdb' ? 'SELECT datname as "Database" FROM pg_database' : 'SHOW DATABASES';
+	const results: Array<{ Database: string }> = await connection.query(query);
 	const databases = results
-		.filter(
-			({ Database: dbName }) => dbName.startsWith(`${dbType}_`) && dbName.endsWith('_n8n_test'),
-		)
+		.filter(({ Database: dbName }) => dbName.startsWith(testDbPrefix))
 		.map(({ Database: dbName }) => dbName);
 
-	const promises = databases.map((dbName) => connection.query(`DROP DATABASE ${dbName};`));
+	const promises = databases.map(
+		async (dbName) => await connection.query(`DROP DATABASE ${dbName};`),
+	);
 	await Promise.all(promises);
 	await connection.destroy();
 };
diff --git a/packages/cli/test/unit/ActiveExecutions.test.ts b/packages/cli/test/unit/ActiveExecutions.test.ts
index 3f27677052db8..892d976b4bd3c 100644
--- a/packages/cli/test/unit/ActiveExecutions.test.ts
+++ b/packages/cli/test/unit/ActiveExecutions.test.ts
@@ -1,35 +1,28 @@
-import * as Db from '@/Db';
 import { ActiveExecutions } from '@/ActiveExecutions';
-import { mocked } from 'jest-mock';
 import PCancelable from 'p-cancelable';
 import { v4 as uuid } from 'uuid';
-import {
-	createDeferredPromise,
-	IDeferredPromise,
-	IExecuteResponsePromiseData,
-	IRun,
-} from 'n8n-workflow';
-import { IWorkflowExecutionDataProcess } from '@/Interfaces';
+import type { IExecuteResponsePromiseData, IRun } from 'n8n-workflow';
+import { createDeferredPromise } from 'n8n-workflow';
+import type { IWorkflowExecutionDataProcess } from '@/Interfaces';
+import type { ExecutionRepository } from '@db/repositories/execution.repository';
+import { mock } from 'jest-mock-extended';
 
 const FAKE_EXECUTION_ID = '15';
 const FAKE_SECOND_EXECUTION_ID = '20';
 
-jest.mock('@/Db', () => {
-	return {
-		collections: {
-			Execution: {
-				save: jest.fn(async () => ({ id: FAKE_EXECUTION_ID })),
-				update: jest.fn(),
-			},
-		},
-	};
+const updateExistingExecution = jest.fn();
+const createNewExecution = jest.fn(async () => FAKE_EXECUTION_ID);
+
+const executionRepository = mock<ExecutionRepository>({
+	updateExistingExecution,
+	createNewExecution,
 });
 
 describe('ActiveExecutions', () => {
 	let activeExecutions: ActiveExecutions;
 
 	beforeEach(() => {
-		activeExecutions = new ActiveExecutions();
+		activeExecutions = new ActiveExecutions(mock(), executionRepository);
 	});
 
 	afterEach(() => {
@@ -46,22 +39,18 @@ describe('ActiveExecutions', () => {
 
 		expect(executionId).toBe(FAKE_EXECUTION_ID);
 		expect(activeExecutions.getActiveExecutions().length).toBe(1);
-		expect(mocked(Db.collections.Execution.save)).toHaveBeenCalledTimes(1);
-		expect(mocked(Db.collections.Execution.update)).toHaveBeenCalledTimes(0);
+		expect(createNewExecution).toHaveBeenCalledTimes(1);
+		expect(updateExistingExecution).toHaveBeenCalledTimes(0);
 	});
 
 	test('Should update execution if add is called with execution ID', async () => {
 		const newExecution = mockExecutionData();
-		const executionId = await activeExecutions.add(
-			newExecution,
-			undefined,
-			FAKE_SECOND_EXECUTION_ID,
-		);
+		const executionId = await activeExecutions.add(newExecution, FAKE_SECOND_EXECUTION_ID);
 
 		expect(executionId).toBe(FAKE_SECOND_EXECUTION_ID);
 		expect(activeExecutions.getActiveExecutions().length).toBe(1);
-		expect(mocked(Db.collections.Execution.save)).toHaveBeenCalledTimes(0);
-		expect(mocked(Db.collections.Execution.update)).toHaveBeenCalledTimes(1);
+		expect(createNewExecution).toHaveBeenCalledTimes(0);
+		expect(updateExistingExecution).toHaveBeenCalledTimes(1);
 	});
 
 	test('Should fail attaching execution to invalid executionId', async () => {
@@ -74,7 +63,7 @@ describe('ActiveExecutions', () => {
 
 	test('Should successfully attach execution to valid executionId', async () => {
 		const newExecution = mockExecutionData();
-		await activeExecutions.add(newExecution, undefined, FAKE_EXECUTION_ID);
+		await activeExecutions.add(newExecution, FAKE_EXECUTION_ID);
 		const deferredPromise = mockCancelablePromise();
 
 		expect(() =>
@@ -84,13 +73,13 @@ describe('ActiveExecutions', () => {
 
 	test('Should attach and resolve response promise to existing execution', async () => {
 		const newExecution = mockExecutionData();
-		await activeExecutions.add(newExecution, undefined, FAKE_EXECUTION_ID);
+		await activeExecutions.add(newExecution, FAKE_EXECUTION_ID);
 		const deferredPromise = await mockDeferredPromise();
 		activeExecutions.attachResponsePromise(FAKE_EXECUTION_ID, deferredPromise);
 		const fakeResponse = { data: { resultData: { runData: {} } } };
 		activeExecutions.resolveResponsePromise(FAKE_EXECUTION_ID, fakeResponse);
 
-		expect(deferredPromise.promise()).resolves.toEqual(fakeResponse);
+		await expect(deferredPromise.promise()).resolves.toEqual(fakeResponse);
 	});
 
 	test('Should remove an existing execution', async () => {
@@ -112,11 +101,11 @@ describe('ActiveExecutions', () => {
 		const fakeOutput = mockFullRunData();
 		activeExecutions.remove(executionId, fakeOutput);
 
-		expect(postExecutePromise).resolves.toEqual(fakeOutput);
+		await expect(postExecutePromise).resolves.toEqual(fakeOutput);
 	});
 
 	test('Should throw error when trying to create a promise with invalid execution', async () => {
-		expect(activeExecutions.getPostExecutePromise(FAKE_EXECUTION_ID)).rejects.toThrow();
+		await expect(activeExecutions.getPostExecutePromise(FAKE_EXECUTION_ID)).rejects.toThrow();
 	});
 
 	test('Should call function to cancel execution when asked to stop', async () => {
@@ -126,7 +115,7 @@ describe('ActiveExecutions', () => {
 		const cancellablePromise = mockCancelablePromise();
 		cancellablePromise.cancel = cancelExecution;
 		activeExecutions.attachWorkflowExecution(executionId, cancellablePromise);
-		activeExecutions.stopExecution(executionId);
+		void activeExecutions.stopExecution(executionId);
 
 		expect(cancelExecution).toHaveBeenCalledTimes(1);
 	});
@@ -136,6 +125,7 @@ function mockExecutionData(): IWorkflowExecutionDataProcess {
 	return {
 		executionMode: 'manual',
 		workflowData: {
+			id: '123',
 			name: 'Test workflow 1',
 			active: false,
 			createdAt: new Date(),
@@ -160,12 +150,7 @@ function mockFullRunData(): IRun {
 	};
 }
 
-function mockCancelablePromise(): PCancelable<IRun> {
-	return new PCancelable(async (resolve) => {
-		resolve();
-	});
-}
-
-function mockDeferredPromise(): Promise<IDeferredPromise<IExecuteResponsePromiseData>> {
-	return createDeferredPromise<IExecuteResponsePromiseData>();
-}
+// eslint-disable-next-line @typescript-eslint/promise-function-async
+const mockCancelablePromise = () => new PCancelable<IRun>((resolve) => resolve());
+// eslint-disable-next-line @typescript-eslint/promise-function-async
+const mockDeferredPromise = () => createDeferredPromise<IExecuteResponsePromiseData>();
diff --git a/packages/cli/test/unit/ActiveWorkflowRunner.test.ts b/packages/cli/test/unit/ActiveWorkflowRunner.test.ts
deleted file mode 100644
index ab1232cde6e62..0000000000000
--- a/packages/cli/test/unit/ActiveWorkflowRunner.test.ts
+++ /dev/null
@@ -1,268 +0,0 @@
-import { v4 as uuid } from 'uuid';
-import { mocked } from 'jest-mock';
-
-import {
-	ICredentialTypes,
-	INodesAndCredentials,
-	LoggerProxy,
-	NodeOperationError,
-	Workflow,
-} from 'n8n-workflow';
-
-import { ActiveWorkflowRunner } from '@/ActiveWorkflowRunner';
-import * as Db from '@/Db';
-import { WorkflowEntity } from '@db/entities/WorkflowEntity';
-import { SharedWorkflow } from '@db/entities/SharedWorkflow';
-import { Role } from '@db/entities/Role';
-import { User } from '@db/entities/User';
-import { getLogger } from '@/Logger';
-import { randomEmail, randomName } from '../integration/shared/random';
-import * as Helpers from './Helpers';
-import * as WorkflowExecuteAdditionalData from '@/WorkflowExecuteAdditionalData';
-
-import { WorkflowRunner } from '@/WorkflowRunner';
-import { mock } from 'jest-mock-extended';
-import { ExternalHooks } from '@/ExternalHooks';
-import { Container } from 'typedi';
-import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
-import { mockInstance } from '../integration/shared/utils';
-import { Push } from '@/push';
-import { ActiveExecutions } from '@/ActiveExecutions';
-import { NodeTypes } from '@/NodeTypes';
-
-/**
- * TODO:
- * - test workflow webhooks activation (that trigger `executeWebhook`and other webhook methods)
- * - test activation error catching and getters such as `getActivationError` (requires building a workflow that fails to activate)
- * - test queued workflow activation functions (might need to create a non-working workflow to test this)
- */
-
-let databaseActiveWorkflowsCount = 0;
-let databaseActiveWorkflowsList: WorkflowEntity[] = [];
-
-const generateWorkflows = (count: number): WorkflowEntity[] => {
-	const workflows: WorkflowEntity[] = [];
-	const ownerRole = new Role();
-	ownerRole.scope = 'workflow';
-	ownerRole.name = 'owner';
-	ownerRole.id = '1';
-
-	const owner = new User();
-	owner.id = uuid();
-	owner.firstName = randomName();
-	owner.lastName = randomName();
-	owner.email = randomEmail();
-
-	for (let i = 0; i < count; i++) {
-		const workflow = new WorkflowEntity();
-		Object.assign(workflow, {
-			id: i + 1,
-			name: randomName(),
-			active: true,
-			createdAt: new Date(),
-			updatedAt: new Date(),
-			nodes: [
-				{
-					parameters: {
-						rule: {
-							interval: [{}],
-						},
-					},
-					id: uuid(),
-					name: 'Schedule Trigger',
-					type: 'n8n-nodes-base.scheduleTrigger',
-					typeVersion: 1,
-					position: [900, 460],
-				},
-			],
-			connections: {},
-			tags: [],
-		});
-		const sharedWorkflow = new SharedWorkflow();
-		sharedWorkflow.workflowId = workflow.id;
-		sharedWorkflow.role = ownerRole;
-		sharedWorkflow.user = owner;
-
-		workflow.shared = [sharedWorkflow];
-
-		workflows.push(workflow);
-	}
-	databaseActiveWorkflowsList = workflows;
-	return workflows;
-};
-
-const MOCK_NODE_TYPES_DATA = Helpers.mockNodeTypesData(['scheduleTrigger'], {
-	addTrigger: true,
-});
-
-jest.mock('@/Db', () => {
-	return {
-		collections: {
-			Workflow: {
-				find: jest.fn(async () => generateWorkflows(databaseActiveWorkflowsCount)),
-				findOne: jest.fn(async (searchParams) => {
-					return databaseActiveWorkflowsList.find(
-						(workflow) => workflow.id.toString() === searchParams.where.id.toString(),
-					);
-				}),
-				update: jest.fn(),
-				createQueryBuilder: jest.fn(() => {
-					const fakeQueryBuilder = {
-						update: () => fakeQueryBuilder,
-						set: () => fakeQueryBuilder,
-						where: () => fakeQueryBuilder,
-						execute: async () => {},
-					};
-					return fakeQueryBuilder;
-				}),
-			},
-			Webhook: {
-				clear: jest.fn(),
-				delete: jest.fn(),
-			},
-			Variables: {
-				find: jest.fn(() => []),
-			},
-		},
-	};
-});
-
-const workflowCheckIfCanBeActivated = jest.fn(() => true);
-
-jest
-	.spyOn(Workflow.prototype, 'checkIfWorkflowCanBeActivated')
-	.mockImplementation(workflowCheckIfCanBeActivated);
-
-const removeFunction = jest.spyOn(ActiveWorkflowRunner.prototype, 'remove');
-const removeWebhooksFunction = jest.spyOn(ActiveWorkflowRunner.prototype, 'removeWorkflowWebhooks');
-const workflowRunnerRun = jest.spyOn(WorkflowRunner.prototype, 'run');
-const workflowExecuteAdditionalDataExecuteErrorWorkflowSpy = jest.spyOn(
-	WorkflowExecuteAdditionalData,
-	'executeErrorWorkflow',
-);
-
-describe('ActiveWorkflowRunner', () => {
-	let externalHooks: ExternalHooks;
-	let activeWorkflowRunner: ActiveWorkflowRunner;
-
-	beforeAll(async () => {
-		LoggerProxy.init(getLogger());
-		const nodesAndCredentials: INodesAndCredentials = {
-			loaded: {
-				nodes: MOCK_NODE_TYPES_DATA,
-				credentials: {},
-			},
-			known: { nodes: {}, credentials: {} },
-			credentialTypes: {} as ICredentialTypes,
-		};
-		Container.set(LoadNodesAndCredentials, nodesAndCredentials);
-		mockInstance(Push);
-	});
-
-	beforeEach(() => {
-		externalHooks = mock();
-		activeWorkflowRunner = new ActiveWorkflowRunner(
-			new ActiveExecutions(),
-			externalHooks,
-			Container.get(NodeTypes),
-		);
-	});
-
-	afterEach(async () => {
-		await activeWorkflowRunner.removeAll();
-		databaseActiveWorkflowsCount = 0;
-		databaseActiveWorkflowsList = [];
-		jest.clearAllMocks();
-	});
-
-	test('Should initialize activeWorkflowRunner with empty list of active workflows and call External Hooks', async () => {
-		await activeWorkflowRunner.init();
-		expect(await activeWorkflowRunner.getActiveWorkflows()).toHaveLength(0);
-		expect(mocked(Db.collections.Workflow.find)).toHaveBeenCalled();
-		expect(mocked(Db.collections.Webhook.clear)).toHaveBeenCalled();
-		expect(externalHooks.run).toHaveBeenCalledTimes(1);
-	});
-
-	test('Should initialize activeWorkflowRunner with one active workflow', async () => {
-		databaseActiveWorkflowsCount = 1;
-		await activeWorkflowRunner.init();
-		expect(await activeWorkflowRunner.getActiveWorkflows()).toHaveLength(
-			databaseActiveWorkflowsCount,
-		);
-		expect(mocked(Db.collections.Workflow.find)).toHaveBeenCalled();
-		expect(mocked(Db.collections.Webhook.clear)).toHaveBeenCalled();
-		expect(externalHooks.run).toHaveBeenCalled();
-	});
-
-	test('Should make sure function checkIfWorkflowCanBeActivated was called for every workflow', async () => {
-		databaseActiveWorkflowsCount = 2;
-		await activeWorkflowRunner.init();
-		expect(workflowCheckIfCanBeActivated).toHaveBeenCalledTimes(databaseActiveWorkflowsCount);
-	});
-
-	test('Call to removeAll should remove every workflow', async () => {
-		databaseActiveWorkflowsCount = 2;
-		await activeWorkflowRunner.init();
-		expect(await activeWorkflowRunner.getActiveWorkflows()).toHaveLength(
-			databaseActiveWorkflowsCount,
-		);
-		await activeWorkflowRunner.removeAll();
-		expect(removeFunction).toHaveBeenCalledTimes(databaseActiveWorkflowsCount);
-	});
-
-	test('Call to remove should also call removeWorkflowWebhooks', async () => {
-		databaseActiveWorkflowsCount = 1;
-		await activeWorkflowRunner.init();
-		expect(await activeWorkflowRunner.getActiveWorkflows()).toHaveLength(
-			databaseActiveWorkflowsCount,
-		);
-		await activeWorkflowRunner.remove('1');
-		expect(removeWebhooksFunction).toHaveBeenCalledTimes(1);
-	});
-
-	test('Call to isActive should return true for valid workflow', async () => {
-		databaseActiveWorkflowsCount = 1;
-		await activeWorkflowRunner.init();
-		expect(await activeWorkflowRunner.isActive('1')).toBe(true);
-	});
-
-	test('Call to isActive should return false for invalid workflow', async () => {
-		databaseActiveWorkflowsCount = 1;
-		await activeWorkflowRunner.init();
-		expect(await activeWorkflowRunner.isActive('2')).toBe(false);
-	});
-
-	test('Calling add should call checkIfWorkflowCanBeActivated', async () => {
-		// Initialize with default (0) workflows
-		await activeWorkflowRunner.init();
-		generateWorkflows(1);
-		await activeWorkflowRunner.add('1', 'activate');
-		expect(workflowCheckIfCanBeActivated).toHaveBeenCalledTimes(1);
-	});
-
-	test('runWorkflow should call run method in WorkflowRunner', async () => {
-		await activeWorkflowRunner.init();
-		const workflow = generateWorkflows(1);
-		const additionalData = await WorkflowExecuteAdditionalData.getBase('fake-user-id');
-
-		workflowRunnerRun.mockResolvedValueOnce('invalid-execution-id');
-
-		await activeWorkflowRunner.runWorkflow(
-			workflow[0],
-			workflow[0].nodes[0],
-			[[]],
-			additionalData,
-			'trigger',
-		);
-
-		expect(workflowRunnerRun).toHaveBeenCalledTimes(1);
-	});
-
-	test('executeErrorWorkflow should call function with same name in WorkflowExecuteAdditionalData', async () => {
-		const workflowData = generateWorkflows(1)[0];
-		const error = new NodeOperationError(workflowData.nodes[0], 'Fake error message');
-		await activeWorkflowRunner.init();
-		activeWorkflowRunner.executeErrorWorkflow(error, workflowData, 'trigger');
-		expect(workflowExecuteAdditionalDataExecuteErrorWorkflowSpy).toHaveBeenCalledTimes(1);
-	});
-});
diff --git a/packages/cli/test/unit/CommunityNodeHelpers.test.ts b/packages/cli/test/unit/CommunityNodeHelpers.test.ts
deleted file mode 100644
index 6cb69d0085e2d..0000000000000
--- a/packages/cli/test/unit/CommunityNodeHelpers.test.ts
+++ /dev/null
@@ -1,344 +0,0 @@
-import { exec } from 'child_process';
-import { access as fsAccess, mkdir as fsMkdir } from 'fs/promises';
-
-import axios from 'axios';
-
-import {
-	checkNpmPackageStatus,
-	matchPackagesWithUpdates,
-	executeCommand,
-	parseNpmPackageName,
-	matchMissingPackages,
-	hasPackageLoaded,
-	removePackageFromMissingList,
-} from '@/CommunityNodes/helpers';
-import {
-	NODE_PACKAGE_PREFIX,
-	NPM_COMMAND_TOKENS,
-	NPM_PACKAGE_STATUS_GOOD,
-	RESPONSE_ERROR_MESSAGES,
-} from '@/constants';
-import { InstalledPackages } from '@db/entities/InstalledPackages';
-import { InstalledNodes } from '@db/entities/InstalledNodes';
-import { randomName } from '../integration/shared/random';
-import config from '@/config';
-import { installedPackagePayload, installedNodePayload } from '../integration/shared/utils';
-
-import type { CommunityPackages } from '@/Interfaces';
-
-jest.mock('fs/promises');
-jest.mock('child_process');
-jest.mock('axios');
-
-describe('parsePackageName', () => {
-	test('Should fail with empty package name', () => {
-		expect(() => parseNpmPackageName('')).toThrowError();
-	});
-
-	test('Should fail with invalid package prefix name', () => {
-		expect(() => parseNpmPackageName('INVALID_PREFIX@123')).toThrowError();
-	});
-
-	test('Should parse valid package name', () => {
-		const validPackageName = NODE_PACKAGE_PREFIX + 'cool-package-name';
-		const parsed = parseNpmPackageName(validPackageName);
-
-		expect(parsed.rawString).toBe(validPackageName);
-		expect(parsed.packageName).toBe(validPackageName);
-		expect(parsed.scope).toBeUndefined();
-		expect(parsed.version).toBeUndefined();
-	});
-
-	test('Should parse valid package name and version', () => {
-		const validPackageName = NODE_PACKAGE_PREFIX + 'cool-package-name';
-		const validPackageVersion = '0.1.1';
-		const fullPackageName = `${validPackageName}@${validPackageVersion}`;
-		const parsed = parseNpmPackageName(fullPackageName);
-
-		expect(parsed.rawString).toBe(fullPackageName);
-		expect(parsed.packageName).toBe(validPackageName);
-		expect(parsed.scope).toBeUndefined();
-		expect(parsed.version).toBe(validPackageVersion);
-	});
-
-	test('Should parse valid package name, scope and version', () => {
-		const validPackageScope = '@n8n';
-		const validPackageName = NODE_PACKAGE_PREFIX + 'cool-package-name';
-		const validPackageVersion = '0.1.1';
-		const fullPackageName = `${validPackageScope}/${validPackageName}@${validPackageVersion}`;
-		const parsed = parseNpmPackageName(fullPackageName);
-
-		expect(parsed.rawString).toBe(fullPackageName);
-		expect(parsed.packageName).toBe(`${validPackageScope}/${validPackageName}`);
-		expect(parsed.scope).toBe(validPackageScope);
-		expect(parsed.version).toBe(validPackageVersion);
-	});
-});
-
-describe('executeCommand', () => {
-	beforeEach(() => {
-		// @ts-ignore
-		fsAccess.mockReset();
-		// @ts-ignore
-		fsMkdir.mockReset();
-		// @ts-ignore
-		exec.mockReset();
-	});
-
-	test('Should call command with valid options', async () => {
-		// @ts-ignore
-		exec.mockImplementation((...args) => {
-			expect(args[1].cwd).toBeDefined();
-			expect(args[1].env).toBeDefined();
-			// PATH or NODE_PATH may be undefined depending on environment so we don't check for these keys.
-			const callbackFunction = args[args.length - 1];
-			callbackFunction(null, { stdout: 'Done' });
-		});
-
-		await executeCommand('ls');
-		expect(fsAccess).toHaveBeenCalled();
-		expect(exec).toHaveBeenCalled();
-		expect(fsMkdir).toBeCalledTimes(0);
-	});
-
-	test('Should make sure folder exists', async () => {
-		// @ts-ignore
-		exec.mockImplementation((...args) => {
-			const callbackFunction = args[args.length - 1];
-			callbackFunction(null, { stdout: 'Done' });
-		});
-
-		await executeCommand('ls');
-		expect(fsAccess).toHaveBeenCalled();
-		expect(exec).toHaveBeenCalled();
-		expect(fsMkdir).toBeCalledTimes(0);
-	});
-
-	test('Should try to create folder if it does not exist', async () => {
-		// @ts-ignore
-		exec.mockImplementation((...args) => {
-			const callbackFunction = args[args.length - 1];
-			callbackFunction(null, { stdout: 'Done' });
-		});
-
-		// @ts-ignore
-		fsAccess.mockImplementation(() => {
-			throw new Error('Folder does not exist.');
-		});
-
-		await executeCommand('ls');
-		expect(fsAccess).toHaveBeenCalled();
-		expect(exec).toHaveBeenCalled();
-		expect(fsMkdir).toHaveBeenCalled();
-	});
-
-	test('Should throw especial error when package is not found', async () => {
-		// @ts-ignore
-		exec.mockImplementation((...args) => {
-			const callbackFunction = args[args.length - 1];
-			callbackFunction(
-				new Error(
-					'Something went wrong - ' +
-						NPM_COMMAND_TOKENS.NPM_PACKAGE_NOT_FOUND_ERROR +
-						'. Aborting.',
-				),
-			);
-		});
-
-		await expect(async () => await executeCommand('ls')).rejects.toThrow(
-			RESPONSE_ERROR_MESSAGES.PACKAGE_NOT_FOUND,
-		);
-
-		expect(fsAccess).toHaveBeenCalled();
-		expect(exec).toHaveBeenCalled();
-		expect(fsMkdir).toHaveBeenCalledTimes(0);
-	});
-});
-
-describe('crossInformationPackage', () => {
-	test('Should return same list if availableUpdates is undefined', () => {
-		const fakePackages = generateListOfFakeInstalledPackages();
-		const crossedData = matchPackagesWithUpdates(fakePackages);
-		expect(crossedData).toEqual(fakePackages);
-	});
-
-	test('Should correctly match update versions for packages', () => {
-		const fakePackages = generateListOfFakeInstalledPackages();
-
-		const updates: CommunityPackages.AvailableUpdates = {
-			[fakePackages[0].packageName]: {
-				current: fakePackages[0].installedVersion,
-				wanted: fakePackages[0].installedVersion,
-				latest: '0.2.0',
-				location: fakePackages[0].packageName,
-			},
-			[fakePackages[1].packageName]: {
-				current: fakePackages[0].installedVersion,
-				wanted: fakePackages[0].installedVersion,
-				latest: '0.3.0',
-				location: fakePackages[0].packageName,
-			},
-		};
-
-		const crossedData = matchPackagesWithUpdates(fakePackages, updates);
-
-		// @ts-ignore
-		expect(crossedData[0].updateAvailable).toBe('0.2.0');
-		// @ts-ignore
-		expect(crossedData[1].updateAvailable).toBe('0.3.0');
-	});
-
-	test('Should correctly match update versions for single package', () => {
-		const fakePackages = generateListOfFakeInstalledPackages();
-
-		const updates: CommunityPackages.AvailableUpdates = {
-			[fakePackages[1].packageName]: {
-				current: fakePackages[0].installedVersion,
-				wanted: fakePackages[0].installedVersion,
-				latest: '0.3.0',
-				location: fakePackages[0].packageName,
-			},
-		};
-
-		const crossedData = matchPackagesWithUpdates(fakePackages, updates);
-
-		// @ts-ignore
-		expect(crossedData[0].updateAvailable).toBeUndefined();
-		// @ts-ignore
-		expect(crossedData[1].updateAvailable).toBe('0.3.0');
-	});
-});
-
-describe('matchMissingPackages', () => {
-	test('Should not match failed packages that do not exist', () => {
-		const fakePackages = generateListOfFakeInstalledPackages();
-		const notFoundPackageList = `${NODE_PACKAGE_PREFIX}very-long-name-that-should-never-be-generated@1.0.0 ${NODE_PACKAGE_PREFIX}another-very-long-name-that-never-is-seen`;
-		const matchedPackages = matchMissingPackages(fakePackages, notFoundPackageList);
-
-		expect(matchedPackages).toEqual(fakePackages);
-		expect(matchedPackages[0].failedLoading).toBeUndefined();
-		expect(matchedPackages[1].failedLoading).toBeUndefined();
-	});
-
-	test('Should match failed packages that should be present', () => {
-		const fakePackages = generateListOfFakeInstalledPackages();
-		const notFoundPackageList = `${NODE_PACKAGE_PREFIX}very-long-name-that-should-never-be-generated@1.0.0 ${fakePackages[0].packageName}@${fakePackages[0].installedVersion}`;
-		const matchedPackages = matchMissingPackages(fakePackages, notFoundPackageList);
-
-		expect(matchedPackages[0].failedLoading).toBe(true);
-		expect(matchedPackages[1].failedLoading).toBeUndefined();
-	});
-
-	test('Should match failed packages even if version is wrong', () => {
-		const fakePackages = generateListOfFakeInstalledPackages();
-		const notFoundPackageList = `${NODE_PACKAGE_PREFIX}very-long-name-that-should-never-be-generated@1.0.0 ${fakePackages[0].packageName}@123.456.789`;
-		const matchedPackages = matchMissingPackages(fakePackages, notFoundPackageList);
-
-		expect(matchedPackages[0].failedLoading).toBe(true);
-		expect(matchedPackages[1].failedLoading).toBeUndefined();
-	});
-});
-
-describe('checkNpmPackageStatus', () => {
-	test('Should call axios.post', async () => {
-		const packageName = NODE_PACKAGE_PREFIX + randomName();
-		await checkNpmPackageStatus(packageName);
-		expect(axios.post).toHaveBeenCalled();
-	});
-
-	test('Should not fail if request fails', async () => {
-		const packageName = NODE_PACKAGE_PREFIX + randomName();
-		axios.post = jest.fn(() => {
-			throw new Error('Something went wrong');
-		});
-		const result = await checkNpmPackageStatus(packageName);
-		expect(result.status).toBe(NPM_PACKAGE_STATUS_GOOD);
-	});
-
-	test('Should warn if package is banned', async () => {
-		const packageName = NODE_PACKAGE_PREFIX + randomName();
-		// @ts-ignore
-		axios.post = jest.fn(() => {
-			return { data: { status: 'Banned', reason: 'Not good' } };
-		});
-		const result = await checkNpmPackageStatus(packageName);
-		expect(result.status).toBe('Banned');
-		expect(result.reason).toBe('Not good');
-	});
-});
-
-describe('hasPackageLoadedSuccessfully', () => {
-	test('Should return true when failed package list does not exist', () => {
-		config.set('nodes.packagesMissing', undefined);
-		const result = hasPackageLoaded('package');
-		expect(result).toBe(true);
-	});
-
-	test('Should return true when package is not in the list of missing packages', () => {
-		config.set('nodes.packagesMissing', 'packageA@0.1.0 packgeB@0.1.0');
-		const result = hasPackageLoaded('packageC');
-		expect(result).toBe(true);
-	});
-
-	test('Should return false when package is in the list of missing packages', () => {
-		config.set('nodes.packagesMissing', 'packageA@0.1.0 packgeB@0.1.0');
-		const result = hasPackageLoaded('packageA');
-		expect(result).toBe(false);
-	});
-});
-
-describe('removePackageFromMissingList', () => {
-	test('Should do nothing if key does not exist', () => {
-		config.set('nodes.packagesMissing', undefined);
-
-		removePackageFromMissingList('packageA');
-
-		const packageList = config.get('nodes.packagesMissing');
-		expect(packageList).toBeUndefined();
-	});
-
-	test('Should remove only correct package from list', () => {
-		config.set('nodes.packagesMissing', 'packageA@0.1.0 packageB@0.2.0 packageBB@0.2.0');
-
-		removePackageFromMissingList('packageB');
-
-		const packageList = config.get('nodes.packagesMissing');
-		expect(packageList).toBe('packageA@0.1.0 packageBB@0.2.0');
-	});
-
-	test('Should not remove if package is not in the list', () => {
-		const failedToLoadList = 'packageA@0.1.0 packageB@0.2.0 packageBB@0.2.0';
-		config.set('nodes.packagesMissing', failedToLoadList);
-
-		removePackageFromMissingList('packageC');
-
-		const packageList = config.get('nodes.packagesMissing');
-		expect(packageList).toBe(failedToLoadList);
-	});
-});
-
-/**
- * Generate a list with 2 packages, one with a single node and another with 2 nodes
- */
-function generateListOfFakeInstalledPackages(): InstalledPackages[] {
-	const fakeInstalledPackage1 = new InstalledPackages();
-	Object.assign(fakeInstalledPackage1, installedPackagePayload());
-
-	const fakeInstalledNode1 = new InstalledNodes();
-	Object.assign(fakeInstalledNode1, installedNodePayload(fakeInstalledPackage1.packageName));
-
-	fakeInstalledPackage1.installedNodes = [fakeInstalledNode1];
-
-	const fakeInstalledPackage2 = new InstalledPackages();
-	Object.assign(fakeInstalledPackage2, installedPackagePayload());
-
-	const fakeInstalledNode2 = new InstalledNodes();
-	Object.assign(fakeInstalledNode2, installedNodePayload(fakeInstalledPackage2.packageName));
-
-	const fakeInstalledNode3 = new InstalledNodes();
-	Object.assign(fakeInstalledNode3, installedNodePayload(fakeInstalledPackage2.packageName));
-
-	fakeInstalledPackage2.installedNodes = [fakeInstalledNode2, fakeInstalledNode3];
-
-	return [fakeInstalledPackage1, fakeInstalledPackage2];
-}
diff --git a/packages/cli/test/unit/CredentialTypes.test.ts b/packages/cli/test/unit/CredentialTypes.test.ts
index bf188989ca095..0ee99c9f8ae6e 100644
--- a/packages/cli/test/unit/CredentialTypes.test.ts
+++ b/packages/cli/test/unit/CredentialTypes.test.ts
@@ -1,36 +1,29 @@
-import type { ICredentialTypes, INodesAndCredentials } from 'n8n-workflow';
 import { CredentialTypes } from '@/CredentialTypes';
 import { Container } from 'typedi';
 import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
+import { mockInstance } from '../shared/mocking';
 
 describe('CredentialTypes', () => {
-	const mockNodesAndCredentials: INodesAndCredentials = {
-		loaded: {
-			nodes: {},
-			credentials: {
-				fakeFirstCredential: {
-					type: {
-						name: 'fakeFirstCredential',
-						displayName: 'Fake First Credential',
-						properties: [],
-					},
-					sourcePath: '',
+	const mockNodesAndCredentials = mockInstance(LoadNodesAndCredentials, {
+		loadedCredentials: {
+			fakeFirstCredential: {
+				type: {
+					name: 'fakeFirstCredential',
+					displayName: 'Fake First Credential',
+					properties: [],
 				},
-				fakeSecondCredential: {
-					type: {
-						name: 'fakeSecondCredential',
-						displayName: 'Fake Second Credential',
-						properties: [],
-					},
-					sourcePath: '',
+				sourcePath: '',
+			},
+			fakeSecondCredential: {
+				type: {
+					name: 'fakeSecondCredential',
+					displayName: 'Fake Second Credential',
+					properties: [],
 				},
+				sourcePath: '',
 			},
 		},
-		known: { nodes: {}, credentials: {} },
-		credentialTypes: {} as ICredentialTypes,
-	};
-
-	Container.set(LoadNodesAndCredentials, mockNodesAndCredentials);
+	});
 
 	const credentialTypes = Container.get(CredentialTypes);
 
@@ -39,7 +32,7 @@ describe('CredentialTypes', () => {
 	});
 
 	test('Should return correct credential type for valid name', () => {
-		const mockedCredentialTypes = mockNodesAndCredentials.loaded.credentials;
+		const mockedCredentialTypes = mockNodesAndCredentials.loadedCredentials;
 		expect(credentialTypes.getByName('fakeFirstCredential')).toStrictEqual(
 			mockedCredentialTypes.fakeFirstCredential.type,
 		);
diff --git a/packages/cli/test/unit/CredentialsHelper.test.ts b/packages/cli/test/unit/CredentialsHelper.test.ts
index 8ede15e4fdcad..19be100b02b84 100644
--- a/packages/cli/test/unit/CredentialsHelper.test.ts
+++ b/packages/cli/test/unit/CredentialsHelper.test.ts
@@ -1,68 +1,62 @@
-import {
+import Container from 'typedi';
+import type {
 	IAuthenticateGeneric,
 	ICredentialDataDecryptedObject,
 	ICredentialType,
-	ICredentialTypes,
 	IHttpRequestOptions,
 	INode,
 	INodeProperties,
-	INodesAndCredentials,
-	Workflow,
 } from 'n8n-workflow';
+import { deepCopy } from 'n8n-workflow';
+import { Workflow } from 'n8n-workflow';
 import { CredentialsHelper } from '@/CredentialsHelper';
-import { CredentialTypes } from '@/CredentialTypes';
-import { Container } from 'typedi';
 import { NodeTypes } from '@/NodeTypes';
 import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
+import { CredentialsRepository } from '@db/repositories/credentials.repository';
+import { SharedCredentialsRepository } from '@db/repositories/sharedCredentials.repository';
+import { mockInstance } from '../shared/mocking';
 
 describe('CredentialsHelper', () => {
-	const TEST_ENCRYPTION_KEY = 'test';
-
-	const mockNodesAndCredentials: INodesAndCredentials = {
-		loaded: {
-			nodes: {
-				'test.set': {
-					sourcePath: '',
-					type: {
-						description: {
-							displayName: 'Set',
-							name: 'set',
-							group: ['input'],
-							version: 1,
-							description: 'Sets a value',
-							defaults: {
-								name: 'Set',
-								color: '#0000FF',
-							},
-							inputs: ['main'],
-							outputs: ['main'],
-							properties: [
-								{
-									displayName: 'Value1',
-									name: 'value1',
-									type: 'string',
-									default: 'default-value1',
-								},
-								{
-									displayName: 'Value2',
-									name: 'value2',
-									type: 'string',
-									default: 'default-value2',
-								},
-							],
+	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: ['main'],
+						outputs: ['main'],
+						properties: [
+							{
+								displayName: 'Value1',
+								name: 'value1',
+								type: 'string',
+								default: 'default-value1',
+							},
+							{
+								displayName: 'Value2',
+								name: 'value2',
+								type: 'string',
+								default: 'default-value2',
+							},
+						],
 					},
 				},
 			},
-			credentials: {},
 		},
-		known: { nodes: {}, credentials: {} },
-		credentialTypes: {} as ICredentialTypes,
-	};
-
-	Container.set(LoadNodesAndCredentials, mockNodesAndCredentials);
+	});
 
-	const nodeTypes = Container.get(NodeTypes);
+	const nodeTypes = mockInstance(NodeTypes);
 
 	describe('authenticate', () => {
 		const tests: Array<{
@@ -82,7 +76,9 @@ describe('CredentialsHelper', () => {
 					},
 					credentialType: new (class TestApi implements ICredentialType {
 						name = 'testApi';
+
 						displayName = 'Test API';
+
 						properties: INodeProperties[] = [
 							{
 								displayName: 'User',
@@ -124,7 +120,9 @@ describe('CredentialsHelper', () => {
 					},
 					credentialType: new (class TestApi implements ICredentialType {
 						name = 'testApi';
+
 						displayName = 'Test API';
+
 						properties: INodeProperties[] = [
 							{
 								displayName: 'Access Token',
@@ -154,7 +152,9 @@ describe('CredentialsHelper', () => {
 					},
 					credentialType: new (class TestApi implements ICredentialType {
 						name = 'testApi';
+
 						displayName = 'Test API';
+
 						properties: INodeProperties[] = [
 							{
 								displayName: 'Access Token',
@@ -184,7 +184,9 @@ describe('CredentialsHelper', () => {
 					},
 					credentialType: new (class TestApi implements ICredentialType {
 						name = 'testApi';
+
 						displayName = 'Test API';
+
 						properties: INodeProperties[] = [
 							{
 								displayName: 'Access Token',
@@ -215,7 +217,9 @@ describe('CredentialsHelper', () => {
 					},
 					credentialType: new (class TestApi implements ICredentialType {
 						name = 'testApi';
+
 						displayName = 'Test API';
+
 						properties: INodeProperties[] = [
 							{
 								displayName: 'My Token',
@@ -229,8 +233,8 @@ describe('CredentialsHelper', () => {
 							credentials: ICredentialDataDecryptedObject,
 							requestOptions: IHttpRequestOptions,
 						): Promise<IHttpRequestOptions> {
-							requestOptions.headers!['Authorization'] = `Bearer ${credentials.accessToken}`;
-							requestOptions.qs!['user'] = credentials.user;
+							requestOptions.headers!.Authorization = `Bearer ${credentials.accessToken}`;
+							requestOptions.qs!.user = credentials.user;
 							return requestOptions;
 						}
 					})(),
@@ -265,32 +269,24 @@ describe('CredentialsHelper', () => {
 			nodeTypes,
 		});
 
-		const timezone = 'America/New_York';
-
 		for (const testData of tests) {
 			test(testData.description, async () => {
-				mockNodesAndCredentials.loaded.credentials = {
+				//@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 credentialTypes = Container.get(CredentialTypes);
-
-				const credentialsHelper = new CredentialsHelper(
-					TEST_ENCRYPTION_KEY,
-					credentialTypes,
-					nodeTypes,
-				);
+				const credentialsHelper = Container.get(CredentialsHelper);
 
 				const result = await credentialsHelper.authenticate(
 					testData.input.credentials,
 					testData.input.credentialType.name,
-					JSON.parse(JSON.stringify(incomingRequestOptions)),
+					deepCopy(incomingRequestOptions),
 					workflow,
 					node,
-					timezone,
 				);
 
 				expect(result).toEqual(testData.output);
diff --git a/packages/cli/test/unit/CurlConverterHelper.test.ts b/packages/cli/test/unit/CurlConverterHelper.test.ts
index dd492bfdca167..0f4ec60795624 100644
--- a/packages/cli/test/unit/CurlConverterHelper.test.ts
+++ b/packages/cli/test/unit/CurlConverterHelper.test.ts
@@ -17,7 +17,8 @@ describe('CurlConverterHelper', () => {
 	});
 
 	test('Should parse JSON content type correctly', () => {
-		const curl = `curl -X POST https://reqbin.com/echo/post/json -H 'Content-Type: application/json' -d '{"login":"my_login","password":"my_password"}'`;
+		const curl =
+			'curl -X POST https://reqbin.com/echo/post/json -H \'Content-Type: application/json\' -d \'{"login":"my_login","password":"my_password"}\'';
 		const parameters = toHttpNodeParameters(curl);
 		expect(parameters.url).toBe('https://reqbin.com/echo/post/json');
 		expect(parameters.sendBody).toBe(true);
@@ -31,7 +32,8 @@ describe('CurlConverterHelper', () => {
 	});
 
 	test('Should parse multipart-form-data content type correctly', () => {
-		const curl = `curl -X POST https://reqbin.com/echo/post/json -v -F key1=value1 -F upload=@localfilename`;
+		const curl =
+			'curl -X POST https://reqbin.com/echo/post/json -v -F key1=value1 -F upload=@localfilename';
 		const parameters = toHttpNodeParameters(curl);
 		expect(parameters.url).toBe('https://reqbin.com/echo/post/json');
 		expect(parameters.sendBody).toBe(true);
@@ -46,7 +48,8 @@ describe('CurlConverterHelper', () => {
 	});
 
 	test('Should parse binary request correctly', () => {
-		const curl = `curl --location --request POST 'https://www.website.com' --header 'Content-Type: image/png' --data-binary '@/Users/image.png`;
+		const curl =
+			"curl --location --request POST 'https://www.website.com' --header 'Content-Type: image/png' --data-binary '@/Users/image.png";
 		const parameters = toHttpNodeParameters(curl);
 		expect(parameters.url).toBe('https://www.website.com');
 		expect(parameters.method).toBe('POST');
@@ -74,7 +77,8 @@ describe('CurlConverterHelper', () => {
 	});
 
 	test('Should parse header properties and keep the original case', () => {
-		const curl = `curl -X POST https://reqbin.com/echo/post/json -v -F key1=value1 -F upload=@localfilename -H "ACCEPT: text/javascript" -H "content-type: multipart/form-data"`;
+		const curl =
+			'curl -X POST https://reqbin.com/echo/post/json -v -F key1=value1 -F upload=@localfilename -H "ACCEPT: text/javascript" -H "content-type: multipart/form-data"';
 		const parameters = toHttpNodeParameters(curl);
 		expect(parameters.url).toBe('https://reqbin.com/echo/post/json');
 		expect(parameters.sendBody).toBe(true);
@@ -91,7 +95,7 @@ describe('CurlConverterHelper', () => {
 	});
 
 	test('Should parse querystring properties', () => {
-		const curl = `curl -G -d 'q=kitties' -d 'count=20' https://google.com/search`;
+		const curl = "curl -G -d 'q=kitties' -d 'count=20' https://google.com/search";
 		const parameters = toHttpNodeParameters(curl);
 		expect(parameters.url).toBe('https://google.com/search');
 		expect(parameters.sendBody).toBe(false);
@@ -105,7 +109,7 @@ describe('CurlConverterHelper', () => {
 	});
 
 	test('Should parse basic authentication property and keep the original case', () => {
-		const curl = `curl https://reqbin.com/echo -u "login:password"`;
+		const curl = 'curl https://reqbin.com/echo -u "login:password"';
 		const parameters = toHttpNodeParameters(curl);
 		expect(parameters.url).toBe('https://reqbin.com/echo');
 		expect(parameters.sendBody).toBe(false);
@@ -119,7 +123,7 @@ describe('CurlConverterHelper', () => {
 	});
 
 	test('Should parse location flag with --location', () => {
-		const curl = `curl https://reqbin.com/echo -u "login:password" --location`;
+		const curl = 'curl https://reqbin.com/echo -u "login:password" --location';
 		const parameters = toHttpNodeParameters(curl);
 		expect(parameters.url).toBe('https://reqbin.com/echo');
 		expect(parameters.sendBody).toBe(false);
@@ -134,7 +138,7 @@ describe('CurlConverterHelper', () => {
 	});
 
 	test('Should parse location flag with --L', () => {
-		const curl = `curl https://reqbin.com/echo -u "login:password" -L`;
+		const curl = 'curl https://reqbin.com/echo -u "login:password" -L';
 		const parameters = toHttpNodeParameters(curl);
 		expect(parameters.url).toBe('https://reqbin.com/echo');
 		expect(parameters.sendBody).toBe(false);
@@ -149,7 +153,7 @@ describe('CurlConverterHelper', () => {
 	});
 
 	test('Should parse location and max redirects flags with --location and --max-redirs 10', () => {
-		const curl = `curl https://reqbin.com/echo -u "login:password" --location --max-redirs 10`;
+		const curl = 'curl https://reqbin.com/echo -u "login:password" --location --max-redirs 10';
 		const parameters = toHttpNodeParameters(curl);
 		expect(parameters.url).toBe('https://reqbin.com/echo');
 		expect(parameters.sendBody).toBe(false);
@@ -165,7 +169,7 @@ describe('CurlConverterHelper', () => {
 	});
 
 	test('Should parse proxy flag -x', () => {
-		const curl = `curl https://reqbin.com/echo -u "login:password" -x https://google.com`;
+		const curl = 'curl https://reqbin.com/echo -u "login:password" -x https://google.com';
 		const parameters = toHttpNodeParameters(curl);
 		expect(parameters.url).toBe('https://reqbin.com/echo');
 		expect(parameters.sendBody).toBe(false);
@@ -180,7 +184,7 @@ describe('CurlConverterHelper', () => {
 	});
 
 	test('Should parse proxy flag --proxy', () => {
-		const curl = `curl https://reqbin.com/echo -u "login:password" -x https://google.com`;
+		const curl = 'curl https://reqbin.com/echo -u "login:password" -x https://google.com';
 		const parameters = toHttpNodeParameters(curl);
 		expect(parameters.url).toBe('https://reqbin.com/echo');
 		expect(parameters.sendBody).toBe(false);
@@ -195,7 +199,7 @@ describe('CurlConverterHelper', () => {
 	});
 
 	test('Should parse include headers on output flag --include', () => {
-		const curl = `curl https://reqbin.com/echo -u "login:password" --include -x https://google.com`;
+		const curl = 'curl https://reqbin.com/echo -u "login:password" --include -x https://google.com';
 		const parameters = toHttpNodeParameters(curl);
 		expect(parameters.url).toBe('https://reqbin.com/echo');
 		expect(parameters.sendBody).toBe(false);
@@ -210,7 +214,7 @@ describe('CurlConverterHelper', () => {
 	});
 
 	test('Should parse include headers on output flag -i', () => {
-		const curl = `curl https://reqbin.com/echo -u "login:password" -x https://google.com -i`;
+		const curl = 'curl https://reqbin.com/echo -u "login:password" -x https://google.com -i';
 		const parameters = toHttpNodeParameters(curl);
 		expect(parameters.url).toBe('https://reqbin.com/echo');
 		expect(parameters.sendBody).toBe(false);
@@ -225,7 +229,7 @@ describe('CurlConverterHelper', () => {
 	});
 
 	test('Should parse include request flag -X', () => {
-		const curl = `curl -X POST https://reqbin.com/echo -u "login:password" -x https://google.com`;
+		const curl = 'curl -X POST https://reqbin.com/echo -u "login:password" -x https://google.com';
 		const parameters = toHttpNodeParameters(curl);
 		expect(parameters.url).toBe('https://reqbin.com/echo');
 		expect(parameters.method).toBe('POST');
@@ -233,7 +237,8 @@ describe('CurlConverterHelper', () => {
 	});
 
 	test('Should parse include request flag --request', () => {
-		const curl = `curl --request POST https://reqbin.com/echo -u "login:password" -x https://google.com`;
+		const curl =
+			'curl --request POST https://reqbin.com/echo -u "login:password" -x https://google.com';
 		const parameters = toHttpNodeParameters(curl);
 		expect(parameters.url).toBe('https://reqbin.com/echo');
 		expect(parameters.method).toBe('POST');
@@ -241,7 +246,8 @@ describe('CurlConverterHelper', () => {
 	});
 
 	test('Should parse include timeout flag --connect-timeout', () => {
-		const curl = `curl --request POST https://reqbin.com/echo -u "login:password" --connect-timeout 20`;
+		const curl =
+			'curl --request POST https://reqbin.com/echo -u "login:password" --connect-timeout 20';
 		const parameters = toHttpNodeParameters(curl);
 		expect(parameters.url).toBe('https://reqbin.com/echo');
 		expect(parameters.method).toBe('POST');
@@ -250,7 +256,7 @@ describe('CurlConverterHelper', () => {
 	});
 
 	test('Should parse download file flag -O', () => {
-		const curl = `curl --request POST https://reqbin.com/echo -u "login:password" -O`;
+		const curl = 'curl --request POST https://reqbin.com/echo -u "login:password" -O';
 		const parameters = toHttpNodeParameters(curl);
 		expect(parameters.url).toBe('https://reqbin.com/echo');
 		expect(parameters.method).toBe('POST');
@@ -260,7 +266,7 @@ describe('CurlConverterHelper', () => {
 	});
 
 	test('Should parse download file flag -o', () => {
-		const curl = `curl --request POST https://reqbin.com/echo -u "login:password" -o`;
+		const curl = 'curl --request POST https://reqbin.com/echo -u "login:password" -o';
 		const parameters = toHttpNodeParameters(curl);
 		expect(parameters.url).toBe('https://reqbin.com/echo');
 		expect(parameters.method).toBe('POST');
@@ -270,7 +276,7 @@ describe('CurlConverterHelper', () => {
 	});
 
 	test('Should parse ignore SSL flag -k', () => {
-		const curl = `curl --request POST https://reqbin.com/echo -u "login:password" -k`;
+		const curl = 'curl --request POST https://reqbin.com/echo -u "login:password" -k';
 		const parameters = toHttpNodeParameters(curl);
 		expect(parameters.url).toBe('https://reqbin.com/echo');
 		expect(parameters.method).toBe('POST');
@@ -279,7 +285,7 @@ describe('CurlConverterHelper', () => {
 	});
 
 	test('Should parse ignore SSL flag --insecure', () => {
-		const curl = `curl --request POST https://reqbin.com/echo -u "login:password" --insecure`;
+		const curl = 'curl --request POST https://reqbin.com/echo -u "login:password" --insecure';
 		const parameters = toHttpNodeParameters(curl);
 		expect(parameters.url).toBe('https://reqbin.com/echo');
 		expect(parameters.method).toBe('POST');
diff --git a/packages/cli/test/unit/Events.test.ts b/packages/cli/test/unit/Events.test.ts
deleted file mode 100644
index d68aa19216389..0000000000000
--- a/packages/cli/test/unit/Events.test.ts
+++ /dev/null
@@ -1,220 +0,0 @@
-import { IRun, LoggerProxy, WorkflowExecuteMode } from 'n8n-workflow';
-import { QueryFailedError } from 'typeorm';
-import { mock } from 'jest-mock-extended';
-
-import config from '@/config';
-import * as Db from '@/Db';
-import { User } from '@db/entities/User';
-import { WorkflowStatistics } from '@db/entities/WorkflowStatistics';
-import { WorkflowStatisticsRepository } from '@db/repositories';
-import { nodeFetchedData, workflowExecutionCompleted } from '@/events/WorkflowStatistics';
-import * as UserManagementHelper from '@/UserManagement/UserManagementHelper';
-import { getLogger } from '@/Logger';
-import { InternalHooks } from '@/InternalHooks';
-
-import { mockInstance } from '../integration/shared/utils';
-import { UserService } from '@/user/user.service';
-
-jest.mock('@/Db', () => {
-	return {
-		collections: {
-			WorkflowStatistics: mock<WorkflowStatisticsRepository>({
-				metadata: { tableName: 'workflow_statistics' },
-			}),
-		},
-	};
-});
-
-jest.spyOn(UserService, 'updateUserSettings').mockImplementation();
-
-describe('Events', () => {
-	const dbType = config.getEnv('database.type');
-	const fakeUser = Object.assign(new User(), { id: 'abcde-fghij' });
-	const internalHooks = mockInstance(InternalHooks);
-
-	jest.spyOn(UserManagementHelper, 'getWorkflowOwner').mockResolvedValue(fakeUser);
-
-	const workflowStatisticsRepository = Db.collections.WorkflowStatistics as ReturnType<
-		typeof mock<WorkflowStatisticsRepository>
-	>;
-
-	beforeAll(() => {
-		config.set('diagnostics.enabled', true);
-		config.set('deployment.type', 'n8n-testing');
-		LoggerProxy.init(getLogger());
-	});
-
-	afterAll(() => {
-		jest.clearAllTimers();
-		jest.useRealTimers();
-	});
-
-	beforeEach(() => {
-		if (dbType === 'sqlite') {
-			workflowStatisticsRepository.findOne.mockClear();
-		} else {
-			workflowStatisticsRepository.query.mockClear();
-		}
-
-		internalHooks.onFirstProductionWorkflowSuccess.mockClear();
-		internalHooks.onFirstWorkflowDataLoad.mockClear();
-	});
-
-	const mockDBCall = (count = 1) => {
-		if (dbType === 'sqlite') {
-			workflowStatisticsRepository.findOne.mockResolvedValueOnce(
-				mock<WorkflowStatistics>({ count }),
-			);
-		} else {
-			const result = dbType === 'postgresdb' ? [{ count }] : { affectedRows: count };
-			workflowStatisticsRepository.query.mockImplementationOnce(async (query) =>
-				query.startsWith('INSERT INTO') ? result : null,
-			);
-		}
-	};
-
-	describe('workflowExecutionCompleted', () => {
-		test('should create metrics for production successes', async () => {
-			// Call the function with a production success result, ensure metrics hook gets called
-			const workflow = {
-				id: '1',
-				name: '',
-				active: false,
-				createdAt: new Date(),
-				updatedAt: new Date(),
-				nodes: [],
-				connections: {},
-			};
-			const runData: IRun = {
-				finished: true,
-				status: 'success',
-				data: { resultData: { runData: {} } },
-				mode: 'internal' as WorkflowExecuteMode,
-				startedAt: new Date(),
-			};
-			mockDBCall();
-
-			await workflowExecutionCompleted(workflow, runData);
-			expect(internalHooks.onFirstProductionWorkflowSuccess).toBeCalledTimes(1);
-			expect(internalHooks.onFirstProductionWorkflowSuccess).toHaveBeenNthCalledWith(1, {
-				user_id: fakeUser.id,
-				workflow_id: workflow.id,
-			});
-		});
-
-		test('should only create metrics for production successes', async () => {
-			// Call the function with a non production success result, ensure metrics hook is never called
-			const workflow = {
-				id: '1',
-				name: '',
-				active: false,
-				createdAt: new Date(),
-				updatedAt: new Date(),
-				nodes: [],
-				connections: {},
-			};
-			const runData: IRun = {
-				finished: false,
-				status: 'failed',
-				data: { resultData: { runData: {} } },
-				mode: 'internal' as WorkflowExecuteMode,
-				startedAt: new Date(),
-			};
-			await workflowExecutionCompleted(workflow, runData);
-			expect(internalHooks.onFirstProductionWorkflowSuccess).toBeCalledTimes(0);
-		});
-
-		test('should not send metrics for updated entries', async () => {
-			// Call the function with a fail insert, ensure update is called *and* metrics aren't sent
-			const workflow = {
-				id: '1',
-				name: '',
-				active: false,
-				createdAt: new Date(),
-				updatedAt: new Date(),
-				nodes: [],
-				connections: {},
-			};
-			const runData: IRun = {
-				finished: true,
-				status: 'success',
-				data: { resultData: { runData: {} } },
-				mode: 'internal' as WorkflowExecuteMode,
-				startedAt: new Date(),
-			};
-			mockDBCall(2);
-			await workflowExecutionCompleted(workflow, runData);
-			expect(internalHooks.onFirstProductionWorkflowSuccess).toBeCalledTimes(0);
-		});
-	});
-
-	describe('nodeFetchedData', () => {
-		test('should create metrics when the db is updated', async () => {
-			// Call the function with a production success result, ensure metrics hook gets called
-			const workflowId = '1';
-			const node = {
-				id: 'abcde',
-				name: 'test node',
-				typeVersion: 1,
-				type: '',
-				position: [0, 0] as [number, number],
-				parameters: {},
-			};
-			await nodeFetchedData(workflowId, node);
-			expect(internalHooks.onFirstWorkflowDataLoad).toBeCalledTimes(1);
-			expect(internalHooks.onFirstWorkflowDataLoad).toHaveBeenNthCalledWith(1, {
-				user_id: fakeUser.id,
-				workflow_id: workflowId,
-				node_type: node.type,
-				node_id: node.id,
-			});
-		});
-
-		test('should create metrics with credentials when the db is updated', async () => {
-			// Call the function with a production success result, ensure metrics hook gets called
-			const workflowId = '1';
-			const node = {
-				id: 'abcde',
-				name: 'test node',
-				typeVersion: 1,
-				type: '',
-				position: [0, 0] as [number, number],
-				parameters: {},
-				credentials: {
-					testCredentials: {
-						id: '1',
-						name: 'Test Credentials',
-					},
-				},
-			};
-			await nodeFetchedData(workflowId, node);
-			expect(internalHooks.onFirstWorkflowDataLoad).toBeCalledTimes(1);
-			expect(internalHooks.onFirstWorkflowDataLoad).toHaveBeenNthCalledWith(1, {
-				user_id: fakeUser.id,
-				workflow_id: workflowId,
-				node_type: node.type,
-				node_id: node.id,
-				credential_type: 'testCredentials',
-				credential_id: node.credentials.testCredentials.id,
-			});
-		});
-
-		test('should not send metrics for entries that already have the flag set', async () => {
-			// Fetch data for workflow 2 which is set up to not be altered in the mocks
-			workflowStatisticsRepository.insert.mockImplementationOnce(() => {
-				throw new QueryFailedError('invalid insert', [], '');
-			});
-			const workflowId = '1';
-			const node = {
-				id: 'abcde',
-				name: 'test node',
-				typeVersion: 1,
-				type: '',
-				position: [0, 0] as [number, number],
-				parameters: {},
-			};
-			await nodeFetchedData(workflowId, node);
-			expect(internalHooks.onFirstWorkflowDataLoad).toBeCalledTimes(0);
-		});
-	});
-});
diff --git a/packages/cli/test/unit/ExecutionMetadataService.test.ts b/packages/cli/test/unit/ExecutionMetadataService.test.ts
new file mode 100644
index 0000000000000..48b754f0ff78a
--- /dev/null
+++ b/packages/cli/test/unit/ExecutionMetadataService.test.ts
@@ -0,0 +1,34 @@
+import { Container } from 'typedi';
+import { ExecutionMetadataRepository } from '@db/repositories/executionMetadata.repository';
+import { ExecutionMetadataService } from '@/services/executionMetadata.service';
+import { mockInstance } from '../shared/mocking';
+
+describe('ExecutionMetadataService', () => {
+	const repository = mockInstance(ExecutionMetadataRepository);
+
+	test('Execution metadata is saved in a batch', async () => {
+		const toSave = {
+			test1: 'value1',
+			test2: 'value2',
+		};
+		const executionId = '1234';
+
+		await Container.get(ExecutionMetadataService).save(executionId, toSave);
+
+		expect(repository.save).toHaveBeenCalledTimes(1);
+		expect(repository.save.mock.calls[0]).toEqual([
+			[
+				{
+					execution: { id: executionId },
+					key: 'test1',
+					value: 'value1',
+				},
+				{
+					execution: { id: executionId },
+					key: 'test2',
+					value: 'value2',
+				},
+			],
+		]);
+	});
+});
diff --git a/packages/cli/test/unit/ExternalSecrets/ExternalSecretsManager.test.ts b/packages/cli/test/unit/ExternalSecrets/ExternalSecretsManager.test.ts
new file mode 100644
index 0000000000000..b77b33bd024b1
--- /dev/null
+++ b/packages/cli/test/unit/ExternalSecrets/ExternalSecretsManager.test.ts
@@ -0,0 +1,160 @@
+import { Container } from 'typedi';
+import { Cipher } from 'n8n-core';
+import { SettingsRepository } from '@db/repositories/settings.repository';
+import type { ExternalSecretsSettings } from '@/Interfaces';
+import { License } from '@/License';
+import { ExternalSecretsManager } from '@/ExternalSecrets/ExternalSecretsManager.ee';
+import { ExternalSecretsProviders } from '@/ExternalSecrets/ExternalSecretsProviders.ee';
+import { InternalHooks } from '@/InternalHooks';
+import { mockInstance } from '../../shared/mocking';
+import {
+	DummyProvider,
+	ErrorProvider,
+	FailedProvider,
+	MockProviders,
+} from '../../shared/ExternalSecrets/utils';
+import { mock } from 'jest-mock-extended';
+
+describe('External Secrets Manager', () => {
+	const connectedDate = '2023-08-01T12:32:29.000Z';
+	let settings: string | null = null;
+
+	const mockProvidersInstance = new MockProviders();
+	const license = mockInstance(License);
+	const settingsRepo = mockInstance(SettingsRepository);
+	mockInstance(InternalHooks);
+	const cipher = Container.get(Cipher);
+
+	let providersMock: ExternalSecretsProviders;
+	let manager: ExternalSecretsManager;
+
+	const createMockSettings = (settings: ExternalSecretsSettings): string => {
+		return cipher.encrypt(settings);
+	};
+
+	const decryptSettings = (settings: string) => {
+		return JSON.parse(cipher.decrypt(settings));
+	};
+
+	beforeAll(() => {
+		providersMock = mockInstance(ExternalSecretsProviders, mockProvidersInstance);
+		settings = createMockSettings({
+			dummy: { connected: true, connectedAt: new Date(connectedDate), settings: {} },
+		});
+	});
+
+	beforeEach(() => {
+		mockProvidersInstance.setProviders({
+			dummy: DummyProvider,
+		});
+		license.isExternalSecretsEnabled.mockReturnValue(true);
+		settingsRepo.getEncryptedSecretsProviderSettings.mockResolvedValue(settings);
+		manager = new ExternalSecretsManager(mock(), settingsRepo, license, providersMock, cipher);
+	});
+
+	afterEach(() => {
+		manager?.shutdown();
+		jest.useRealTimers();
+	});
+
+	test('should get secret', async () => {
+		await manager.init();
+
+		expect(manager.getSecret('dummy', 'test1')).toBe('value1');
+	});
+
+	test('should not throw errors during init', async () => {
+		mockProvidersInstance.setProviders({
+			dummy: ErrorProvider,
+		});
+		expect(async () => await manager!.init()).not.toThrow();
+	});
+
+	test('should not throw errors during shutdown', async () => {
+		mockProvidersInstance.setProviders({
+			dummy: ErrorProvider,
+		});
+
+		await manager.init();
+		expect(() => manager!.shutdown()).not.toThrow();
+	});
+
+	test('should save provider settings', async () => {
+		const settingsSpy = jest.spyOn(settingsRepo, 'saveEncryptedSecretsProviderSettings');
+
+		await manager.init();
+
+		await manager.setProviderSettings('dummy', {
+			test: 'value',
+		});
+
+		expect(decryptSettings(settingsSpy.mock.calls[0][0])).toEqual({
+			dummy: {
+				connected: true,
+				connectedAt: connectedDate,
+				settings: {
+					test: 'value',
+				},
+			},
+		});
+	});
+
+	test('should call provider update functions on a timer', async () => {
+		jest.useFakeTimers();
+		await manager.init();
+
+		const updateSpy = jest.spyOn(manager.getProvider('dummy')!, 'update');
+
+		expect(updateSpy).toBeCalledTimes(0);
+
+		jest.runOnlyPendingTimers();
+
+		expect(updateSpy).toBeCalledTimes(1);
+	});
+
+	test('should not call provider update functions if the not licensed', async () => {
+		jest.useFakeTimers();
+
+		license.isExternalSecretsEnabled.mockReturnValue(false);
+
+		await manager.init();
+
+		const updateSpy = jest.spyOn(manager.getProvider('dummy')!, 'update');
+
+		expect(updateSpy).toBeCalledTimes(0);
+
+		jest.runOnlyPendingTimers();
+
+		expect(updateSpy).toBeCalledTimes(0);
+	});
+
+	test('should not call provider update functions if the provider has an error', async () => {
+		jest.useFakeTimers();
+
+		mockProvidersInstance.setProviders({
+			dummy: FailedProvider,
+		});
+
+		await manager.init();
+
+		const updateSpy = jest.spyOn(manager.getProvider('dummy')!, 'update');
+
+		expect(updateSpy).toBeCalledTimes(0);
+
+		jest.runOnlyPendingTimers();
+
+		expect(updateSpy).toBeCalledTimes(0);
+	});
+
+	test('should reinitialize a provider when save provider settings', async () => {
+		await manager.init();
+
+		const dummyInitSpy = jest.spyOn(DummyProvider.prototype, 'init');
+
+		await manager.setProviderSettings('dummy', {
+			test: 'value',
+		});
+
+		expect(dummyInitSpy).toBeCalledTimes(1);
+	});
+});
diff --git a/packages/cli/test/unit/Helpers.ts b/packages/cli/test/unit/Helpers.ts
index 2d9f43ebf598a..50b9f43489076 100644
--- a/packages/cli/test/unit/Helpers.ts
+++ b/packages/cli/test/unit/Helpers.ts
@@ -1,11 +1,11 @@
-import { INodeTypeData } from 'n8n-workflow';
+import type { INodeTypeData } from 'n8n-workflow';
 
 /**
  * Ensure all pending promises settle. The promise's `resolve` is placed in
  * the macrotask queue and so called at the next iteration of the event loop
  * after all promises in the microtask queue have settled first.
  */
-export const flushPromises = async () => new Promise(setImmediate);
+export const flushPromises = async () => await new Promise(setImmediate);
 
 export function mockNodeTypesData(
 	nodeNames: string[],
@@ -29,7 +29,7 @@ export function mockNodeTypesData(
 						outputs: [],
 						properties: [],
 					},
-					trigger: options?.addTrigger ? () => Promise.resolve(undefined) : undefined,
+					trigger: options?.addTrigger ? async () => undefined : undefined,
 				},
 			}),
 			acc
diff --git a/packages/cli/test/unit/InternalHooks.test.ts b/packages/cli/test/unit/InternalHooks.test.ts
new file mode 100644
index 0000000000000..46ea31623914a
--- /dev/null
+++ b/packages/cli/test/unit/InternalHooks.test.ts
@@ -0,0 +1,80 @@
+import { mock } from 'jest-mock-extended';
+import config from '@/config';
+import { N8N_VERSION } from '@/constants';
+import { InternalHooks } from '@/InternalHooks';
+import type { License } from '@/License';
+import type { Telemetry } from '@/telemetry';
+
+jest.mock('node:os', () => ({
+	tmpdir: () => '',
+	cpus: () => [{ model: 'MIPS R3000', speed: 40_000_000 }],
+	type: () => 'TempleOS',
+	version: () => '5.03',
+	totalmem: () => 1024 * 1024,
+}));
+
+describe('InternalHooks', () => {
+	const telemetry = mock<Telemetry>();
+	const license = mock<License>();
+	const internalHooks = new InternalHooks(
+		telemetry,
+		mock(),
+		mock(),
+		mock(),
+		mock(),
+		mock(),
+		mock(),
+		license,
+	);
+
+	beforeEach(() => jest.clearAllMocks());
+
+	it('Should be defined', () => {
+		expect(internalHooks).toBeDefined();
+	});
+
+	it('Should forward license plan name and tenant id to identify when provided', async () => {
+		license.getPlanName.mockReturnValue('Best Plan');
+
+		await internalHooks.onServerStarted();
+
+		expect(telemetry.identify).toHaveBeenCalledWith({
+			version_cli: N8N_VERSION,
+			db_type: config.get('database.type'),
+			n8n_version_notifications_enabled: true,
+			n8n_disable_production_main_process: false,
+			system_info: {
+				memory: 1024,
+				os: {
+					type: 'TempleOS',
+					version: '5.03',
+				},
+				cpus: {
+					count: 1,
+					model: 'MIPS R3000',
+					speed: 40000000,
+				},
+			},
+			execution_variables: {
+				executions_data_max_age: 336,
+				executions_data_prune: true,
+				executions_data_save_manual_executions: true,
+				executions_data_save_on_error: 'all',
+				executions_data_save_on_progress: false,
+				executions_data_save_on_success: 'all',
+				executions_mode: 'regular',
+				executions_timeout: -1,
+				executions_timeout_max: 3600,
+			},
+			n8n_deployment_type: 'default',
+			n8n_binary_data_mode: 'default',
+			smtp_set_up: true,
+			ldap_allowed: false,
+			saml_enabled: false,
+			license_plan_name: 'Best Plan',
+			license_tenant_id: 1,
+			binary_data_s3: false,
+			multi_main_setup_enabled: false,
+		});
+	});
+});
diff --git a/packages/cli/test/unit/License.test.ts b/packages/cli/test/unit/License.test.ts
index 2c6c72d26ee14..182656f39a8f1 100644
--- a/packages/cli/test/unit/License.test.ts
+++ b/packages/cli/test/unit/License.test.ts
@@ -1,7 +1,12 @@
 import { LicenseManager } from '@n8n_io/license-sdk';
+import { InstanceSettings } from 'n8n-core';
+import { mock } from 'jest-mock-extended';
 import config from '@/config';
 import { License } from '@/License';
+import { Logger } from '@/Logger';
 import { N8N_VERSION } from '@/constants';
+import { mockInstance } from '../shared/mocking';
+import { OrchestrationService } from '@/services/orchestration.service';
 
 jest.mock('@n8n_io/license-sdk');
 
@@ -9,32 +14,60 @@ const MOCK_SERVER_URL = 'https://server.com/v1';
 const MOCK_RENEW_OFFSET = 259200;
 const MOCK_INSTANCE_ID = 'instance-id';
 const MOCK_ACTIVATION_KEY = 'activation-key';
-const MOCK_FEATURE_FLAG = 'feat:mock';
-const MOCK_MAIN_PLAN_ID = 1234;
+const MOCK_FEATURE_FLAG = 'feat:sharing';
+const MOCK_MAIN_PLAN_ID = '1b765dc4-d39d-4ffe-9885-c56dd67c4b26';
 
 describe('License', () => {
 	beforeAll(() => {
 		config.set('license.serverUrl', MOCK_SERVER_URL);
 		config.set('license.autoRenewEnabled', true);
 		config.set('license.autoRenewOffset', MOCK_RENEW_OFFSET);
+		config.set('license.tenantId', 1);
 	});
 
 	let license: License;
+	const logger = mockInstance(Logger);
+	const instanceSettings = mockInstance(InstanceSettings, { instanceId: MOCK_INSTANCE_ID });
+	mockInstance(OrchestrationService);
 
 	beforeEach(async () => {
-		license = new License();
-		await license.init(MOCK_INSTANCE_ID);
+		license = new License(logger, instanceSettings, mock(), mock(), mock());
+		await license.init();
 	});
 
 	test('initializes license manager', async () => {
 		expect(LicenseManager).toHaveBeenCalledWith({
 			autoRenewEnabled: true,
 			autoRenewOffset: MOCK_RENEW_OFFSET,
+			offlineMode: false,
+			renewOnInit: true,
 			deviceFingerprint: expect.any(Function),
 			productIdentifier: `n8n-${N8N_VERSION}`,
-			logger: expect.anything(),
+			logger,
 			loadCertStr: expect.any(Function),
 			saveCertStr: expect.any(Function),
+			onFeatureChange: expect.any(Function),
+			collectUsageMetrics: expect.any(Function),
+			server: MOCK_SERVER_URL,
+			tenantId: 1,
+		});
+	});
+
+	test('initializes license manager for worker', async () => {
+		license = new License(logger, instanceSettings, mock(), mock(), mock());
+		await license.init('worker');
+		expect(LicenseManager).toHaveBeenCalledWith({
+			autoRenewEnabled: false,
+			autoRenewOffset: MOCK_RENEW_OFFSET,
+			offlineMode: true,
+			renewOnInit: false,
+			deviceFingerprint: expect.any(Function),
+			productIdentifier: `n8n-${N8N_VERSION}`,
+			logger,
+			loadCertStr: expect.any(Function),
+			saveCertStr: expect.any(Function),
+			onFeatureChange: expect.any(Function),
+			collectUsageMetrics: expect.any(Function),
 			server: MOCK_SERVER_URL,
 			tenantId: 1,
 		});
@@ -52,42 +85,51 @@ describe('License', () => {
 		expect(LicenseManager.prototype.renew).toHaveBeenCalled();
 	});
 
-	test('check if feature is enabled', async () => {
-		await license.isFeatureEnabled(MOCK_FEATURE_FLAG);
+	test('check if feature is enabled', () => {
+		license.isFeatureEnabled(MOCK_FEATURE_FLAG);
 
 		expect(LicenseManager.prototype.hasFeatureEnabled).toHaveBeenCalledWith(MOCK_FEATURE_FLAG);
 	});
 
-	test('check if sharing feature is enabled', async () => {
-		await license.isFeatureEnabled(MOCK_FEATURE_FLAG);
+	test('check if sharing feature is enabled', () => {
+		license.isFeatureEnabled(MOCK_FEATURE_FLAG);
 
 		expect(LicenseManager.prototype.hasFeatureEnabled).toHaveBeenCalledWith(MOCK_FEATURE_FLAG);
 	});
 
-	test('check fetching entitlements', async () => {
-		await license.getCurrentEntitlements();
+	test('check fetching entitlements', () => {
+		license.getCurrentEntitlements();
 
 		expect(LicenseManager.prototype.getCurrentEntitlements).toHaveBeenCalled();
 	});
 
 	test('check fetching feature values', async () => {
-		await license.getFeatureValue(MOCK_FEATURE_FLAG, false);
+		license.getFeatureValue(MOCK_FEATURE_FLAG);
 
-		expect(LicenseManager.prototype.getFeatureValue).toHaveBeenCalledWith(MOCK_FEATURE_FLAG, false);
+		expect(LicenseManager.prototype.getFeatureValue).toHaveBeenCalledWith(MOCK_FEATURE_FLAG);
 	});
 
 	test('check management jwt', async () => {
-		await license.getManagementJwt();
+		license.getManagementJwt();
 
 		expect(LicenseManager.prototype.getManagementJwt).toHaveBeenCalled();
 	});
 
-	test('check main plan', async () => {
+	test('getMainPlan() returns the right entitlement', async () => {
 		// mock entitlements response
 		License.prototype.getCurrentEntitlements = jest.fn().mockReturnValue([
+			{
+				id: '84a9c852-1349-478d-9ad1-b3f55510e477',
+				productId: '670650f2-72d8-4397-898c-c249906e2cc2',
+				productMetadata: {},
+				features: {},
+				featureOverrides: {},
+				validFrom: new Date(),
+				validTo: new Date(),
+			},
 			{
 				id: MOCK_MAIN_PLAN_ID,
-				productId: '',
+				productId: '670650f2-72d8-4397-898c-c249906e2cc2',
 				productMetadata: {
 					terms: {
 						isMainPlan: true,
@@ -104,4 +146,110 @@ describe('License', () => {
 		const mainPlan = license.getMainPlan();
 		expect(mainPlan?.id).toBe(MOCK_MAIN_PLAN_ID);
 	});
+
+	test('getMainPlan() returns undefined if there is no main plan', async () => {
+		// mock entitlements response
+		License.prototype.getCurrentEntitlements = jest.fn().mockReturnValue([
+			{
+				id: '84a9c852-1349-478d-9ad1-b3f55510e477',
+				productId: '670650f2-72d8-4397-898c-c249906e2cc2',
+				productMetadata: {}, // has no `productMetadata.terms.isMainPlan`!
+				features: {},
+				featureOverrides: {},
+				validFrom: new Date(),
+				validTo: new Date(),
+			},
+			{
+				id: 'c1aae471-c24e-4874-ad88-b97107de486c',
+				productId: '670650f2-72d8-4397-898c-c249906e2cc2',
+				productMetadata: {}, // has no `productMetadata.terms.isMainPlan`!
+				features: {},
+				featureOverrides: {},
+				validFrom: new Date(),
+				validTo: new Date(),
+			},
+		]);
+		jest.fn(license.getMainPlan).mockReset();
+
+		const mainPlan = license.getMainPlan();
+		expect(mainPlan).toBeUndefined();
+	});
+});
+
+describe('License', () => {
+	beforeEach(() => {
+		config.load(config.default);
+	});
+
+	describe('init', () => {
+		describe('in single-main setup', () => {
+			describe('with `license.autoRenewEnabled` enabled', () => {
+				it('should enable renewal', async () => {
+					config.set('multiMainSetup.enabled', false);
+
+					await new License(mock(), mock(), mock(), mock(), mock()).init();
+
+					expect(LicenseManager).toHaveBeenCalledWith(
+						expect.objectContaining({ autoRenewEnabled: true, renewOnInit: true }),
+					);
+				});
+			});
+
+			describe('with `license.autoRenewEnabled` disabled', () => {
+				it('should disable renewal', async () => {
+					config.set('license.autoRenewEnabled', false);
+
+					await new License(mock(), mock(), mock(), mock(), mock()).init();
+
+					expect(LicenseManager).toHaveBeenCalledWith(
+						expect.objectContaining({ autoRenewEnabled: false, renewOnInit: false }),
+					);
+				});
+			});
+		});
+
+		describe('in multi-main setup', () => {
+			describe('with `license.autoRenewEnabled` disabled', () => {
+				test.each(['unset', 'leader', 'follower'])(
+					'if %s status, should disable removal',
+					async (status) => {
+						config.set('multiMainSetup.enabled', true);
+						config.set('multiMainSetup.instanceType', status);
+						config.set('license.autoRenewEnabled', false);
+
+						await new License(mock(), mock(), mock(), mock(), mock()).init();
+
+						expect(LicenseManager).toHaveBeenCalledWith(
+							expect.objectContaining({ autoRenewEnabled: false, renewOnInit: false }),
+						);
+					},
+				);
+			});
+
+			describe('with `license.autoRenewEnabled` enabled', () => {
+				test.each(['unset', 'follower'])('if %s status, should disable removal', async (status) => {
+					config.set('multiMainSetup.enabled', true);
+					config.set('multiMainSetup.instanceType', status);
+					config.set('license.autoRenewEnabled', false);
+
+					await new License(mock(), mock(), mock(), mock(), mock()).init();
+
+					expect(LicenseManager).toHaveBeenCalledWith(
+						expect.objectContaining({ autoRenewEnabled: false, renewOnInit: false }),
+					);
+				});
+
+				it('if leader status, should enable renewal', async () => {
+					config.set('multiMainSetup.enabled', true);
+					config.set('multiMainSetup.instanceType', 'leader');
+
+					await new License(mock(), mock(), mock(), mock(), mock()).init();
+
+					expect(LicenseManager).toHaveBeenCalledWith(
+						expect.objectContaining({ autoRenewEnabled: true, renewOnInit: true }),
+					);
+				});
+			});
+		});
+	});
 });
diff --git a/packages/cli/test/unit/PermissionChecker.test.ts b/packages/cli/test/unit/PermissionChecker.test.ts
index 71b550c50fea5..8ddb0754ba872 100644
--- a/packages/cli/test/unit/PermissionChecker.test.ts
+++ b/packages/cli/test/unit/PermissionChecker.test.ts
@@ -1,390 +1,131 @@
-import { v4 as uuid } from 'uuid';
-import { Container } from 'typedi';
-import { ICredentialTypes, INodeTypes, SubworkflowOperationError, Workflow } from 'n8n-workflow';
-
-import config from '@/config';
-import * as Db from '@/Db';
-import { Role } from '@db/entities/Role';
-import { User } from '@db/entities/User';
-import { SharedWorkflow } from '@db/entities/SharedWorkflow';
-import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
-import { NodeTypes } from '@/NodeTypes';
-import { UserService } from '@/user/user.service';
+import type { INode } from 'n8n-workflow';
+import { mock } from 'jest-mock-extended';
+import type { User } from '@db/entities/User';
+import type { UserRepository } from '@db/repositories/user.repository';
+import type { SharedCredentialsRepository } from '@db/repositories/sharedCredentials.repository';
+import type { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
+import type { License } from '@/License';
 import { PermissionChecker } from '@/UserManagement/PermissionChecker';
-import * as UserManagementHelper from '@/UserManagement/UserManagementHelper';
-import { WorkflowsService } from '@/workflows/workflows.services';
-
-import {
-	randomCredentialPayload as randomCred,
-	randomPositiveDigit,
-} from '../integration/shared/random';
-import * as testDb from '../integration/shared/testDb';
-import { mockNodeTypesData } from './Helpers';
-import type { SaveCredentialFunction } from '../integration/shared/types';
-import { mockInstance } from '../integration/shared/utils';
-
-let mockNodeTypes: INodeTypes;
-let credentialOwnerRole: Role;
-let workflowOwnerRole: Role;
-let saveCredential: SaveCredentialFunction;
-
-const MOCK_NODE_TYPES_DATA = mockNodeTypesData(['start', 'actionNetwork']);
-mockInstance(LoadNodesAndCredentials, {
-	loaded: {
-		nodes: MOCK_NODE_TYPES_DATA,
-		credentials: {},
-	},
-	known: { nodes: {}, credentials: {} },
-	credentialTypes: {} as ICredentialTypes,
-});
-
-beforeAll(async () => {
-	await testDb.init();
-
-	mockNodeTypes = Container.get(NodeTypes);
-
-	credentialOwnerRole = await testDb.getCredentialOwnerRole();
-	workflowOwnerRole = await testDb.getWorkflowOwnerRole();
 
-	saveCredential = testDb.affixRoleToSaveCredential(credentialOwnerRole);
-});
-
-beforeEach(async () => {
-	await testDb.truncate(['SharedWorkflow', 'SharedCredentials', 'Workflow', 'Credentials', 'User']);
-});
-
-afterAll(async () => {
-	await testDb.terminate();
-});
-
-describe('PermissionChecker.check()', () => {
-	test('should allow if workflow has no creds', async () => {
-		const userId = uuid();
-
-		const workflow = new Workflow({
-			id: randomPositiveDigit().toString(),
-			name: 'test',
-			active: false,
-			connections: {},
-			nodeTypes: mockNodeTypes,
-			nodes: [
-				{
-					id: uuid(),
-					name: 'Start',
-					type: 'n8n-nodes-base.start',
-					typeVersion: 1,
-					parameters: {},
-					position: [0, 0],
+describe('PermissionChecker', () => {
+	const user = mock<User>();
+	const userRepo = mock<UserRepository>();
+	const sharedCredentialsRepo = mock<SharedCredentialsRepository>();
+	const sharedWorkflowRepo = mock<SharedWorkflowRepository>();
+	const license = mock<License>();
+	const permissionChecker = new PermissionChecker(
+		userRepo,
+		sharedCredentialsRepo,
+		sharedWorkflowRepo,
+		mock(),
+		license,
+	);
+
+	const workflowId = '1';
+	const nodes: INode[] = [
+		{
+			id: 'node-id',
+			name: 'HTTP Request',
+			type: 'n8n-nodes-base.httpRequest',
+			parameters: {},
+			typeVersion: 1,
+			position: [0, 0],
+			credentials: {
+				oAuth2Api: {
+					id: 'cred-id',
+					name: 'Custom oAuth2',
 				},
-			],
-		});
-
-		expect(() => PermissionChecker.check(workflow, userId)).not.toThrow();
-	});
+			},
+		},
+	];
 
-	test('should allow if requesting user is instance owner', async () => {
-		const owner = await testDb.createOwner();
+	beforeEach(() => jest.clearAllMocks());
 
-		const workflow = new Workflow({
-			id: randomPositiveDigit().toString(),
-			name: 'test',
-			active: false,
-			connections: {},
-			nodeTypes: mockNodeTypes,
-			nodes: [
-				{
-					id: uuid(),
-					name: 'Action Network',
-					type: 'n8n-nodes-base.actionNetwork',
-					parameters: {},
-					typeVersion: 1,
-					position: [0, 0],
-					credentials: {
-						actionNetworkApi: {
-							id: randomPositiveDigit().toString(),
-							name: 'Action Network Account',
-						},
-					},
-				},
-			],
+	describe('check', () => {
+		it('should throw if no user is found', async () => {
+			userRepo.findOneOrFail.mockRejectedValue(new Error('Fail'));
+			await expect(permissionChecker.check(workflowId, '123', nodes)).rejects.toThrow();
+			expect(license.isSharingEnabled).not.toHaveBeenCalled();
+			expect(sharedWorkflowRepo.getSharedUserIds).not.toBeCalled();
+			expect(sharedCredentialsRepo.getOwnedCredentialIds).not.toHaveBeenCalled();
+			expect(sharedCredentialsRepo.getAccessibleCredentialIds).not.toHaveBeenCalled();
 		});
 
-		expect(async () => await PermissionChecker.check(workflow, owner.id)).not.toThrow();
-	});
-
-	test('should allow if workflow creds are valid subset', async () => {
-		const [owner, member] = await Promise.all([testDb.createOwner(), testDb.createUser()]);
-
-		const ownerCred = await saveCredential(randomCred(), { user: owner });
-		const memberCred = await saveCredential(randomCred(), { user: member });
-
-		const workflow = new Workflow({
-			id: randomPositiveDigit().toString(),
-			name: 'test',
-			active: false,
-			connections: {},
-			nodeTypes: mockNodeTypes,
-			nodes: [
-				{
-					id: uuid(),
-					name: 'Action Network',
-					type: 'n8n-nodes-base.actionNetwork',
-					parameters: {},
-					typeVersion: 1,
-					position: [0, 0],
-					credentials: {
-						actionNetworkApi: {
-							id: ownerCred.id,
-							name: ownerCred.name,
-						},
-					},
-				},
-				{
-					id: uuid(),
-					name: 'Action Network 2',
-					type: 'n8n-nodes-base.actionNetwork',
-					parameters: {},
-					typeVersion: 1,
-					position: [0, 0],
-					credentials: {
-						actionNetworkApi: {
-							id: memberCred.id,
-							name: memberCred.name,
-						},
-					},
-				},
-			],
+		it('should allow a user if they have a global `workflow:execute` scope', async () => {
+			userRepo.findOneOrFail.mockResolvedValue(user);
+			user.hasGlobalScope.calledWith('workflow:execute').mockReturnValue(true);
+			await expect(permissionChecker.check(workflowId, user.id, nodes)).resolves.not.toThrow();
+			expect(license.isSharingEnabled).not.toHaveBeenCalled();
+			expect(sharedWorkflowRepo.getSharedUserIds).not.toBeCalled();
+			expect(sharedCredentialsRepo.getOwnedCredentialIds).not.toHaveBeenCalled();
+			expect(sharedCredentialsRepo.getAccessibleCredentialIds).not.toHaveBeenCalled();
 		});
 
-		expect(async () => await PermissionChecker.check(workflow, owner.id)).not.toThrow();
-	});
+		describe('When sharing is disabled', () => {
+			beforeEach(() => {
+				userRepo.findOneOrFail.mockResolvedValue(user);
+				user.hasGlobalScope.calledWith('workflow:execute').mockReturnValue(false);
+				license.isSharingEnabled.mockReturnValue(false);
+			});
 
-	test('should deny if workflow creds are not valid subset', async () => {
-		const member = await testDb.createUser();
+			it('should validate credential access using only owned credentials', async () => {
+				sharedCredentialsRepo.getOwnedCredentialIds.mockResolvedValue(['cred-id']);
 
-		const memberCred = await saveCredential(randomCred(), { user: member });
+				await expect(permissionChecker.check(workflowId, user.id, nodes)).resolves.not.toThrow();
 
-		const workflowDetails = {
-			id: randomPositiveDigit().toString(),
-			name: 'test',
-			active: false,
-			connections: {},
-			nodeTypes: mockNodeTypes,
-			nodes: [
-				{
-					id: uuid(),
-					name: 'Action Network',
-					type: 'n8n-nodes-base.actionNetwork',
-					parameters: {},
-					typeVersion: 1,
-					position: [0, 0] as [number, number],
-					credentials: {
-						actionNetworkApi: {
-							id: memberCred.id,
-							name: memberCred.name,
-						},
-					},
-				},
-				{
-					id: uuid(),
-					name: 'Action Network 2',
-					type: 'n8n-nodes-base.actionNetwork',
-					parameters: {},
-					typeVersion: 1,
-					position: [0, 0] as [number, number],
-					credentials: {
-						actionNetworkApi: {
-							id: 'non-existing-credential-id',
-							name: 'Non-existing credential name',
-						},
-					},
-				},
-			],
-		};
-
-		const workflowEntity = await Db.collections.Workflow.save(workflowDetails);
+				expect(sharedWorkflowRepo.getSharedUserIds).not.toBeCalled();
+				expect(sharedCredentialsRepo.getOwnedCredentialIds).toBeCalledWith([user.id]);
+				expect(sharedCredentialsRepo.getAccessibleCredentialIds).not.toHaveBeenCalled();
+			});
 
-		await Db.collections.SharedWorkflow.save({
-			workflow: workflowEntity,
-			user: member,
-			role: workflowOwnerRole,
-		});
+			it('should throw when the user does not have access to the credential', async () => {
+				sharedCredentialsRepo.getOwnedCredentialIds.mockResolvedValue(['cred-id2']);
 
-		const workflow = new Workflow(workflowDetails);
-
-		expect(PermissionChecker.check(workflow, member.id)).rejects.toThrow();
-	});
-});
-
-describe('PermissionChecker.checkSubworkflowExecutePolicy', () => {
-	const userId = uuid();
-	const fakeUser = new User();
-	fakeUser.id = userId;
-
-	const ownerMockRole = new Role();
-	ownerMockRole.name = 'owner';
-	const sharedWorkflowOwner = new SharedWorkflow();
-	sharedWorkflowOwner.role = ownerMockRole;
-
-	const nonOwnerMockRole = new Role();
-	nonOwnerMockRole.name = 'editor';
-	const sharedWorkflowNotOwner = new SharedWorkflow();
-	sharedWorkflowNotOwner.role = nonOwnerMockRole;
-
-	test('sets default policy from environment when subworkflow has none', async () => {
-		config.set('workflows.callerPolicyDefaultOption', 'none');
-		jest.spyOn(UserManagementHelper, 'getWorkflowOwner').mockImplementation(async (workflowId) => {
-			return fakeUser;
-		});
-		jest.spyOn(UserManagementHelper, 'isSharingEnabled').mockReturnValue(true);
-
-		const subworkflow = new Workflow({
-			nodes: [],
-			connections: {},
-			active: false,
-			nodeTypes: mockNodeTypes,
-			id: '2',
-		});
-		await expect(
-			PermissionChecker.checkSubworkflowExecutePolicy(subworkflow, userId),
-		).rejects.toThrow(`Target workflow ID ${subworkflow.id} may not be called`);
-	});
-
-	test('if sharing is disabled, ensures that workflows are owner by same user', async () => {
-		jest
-			.spyOn(UserManagementHelper, 'getWorkflowOwner')
-			.mockImplementation(async (workflowId) => fakeUser);
-		jest.spyOn(UserManagementHelper, 'isSharingEnabled').mockReturnValue(false);
-		jest.spyOn(UserService, 'get').mockImplementation(async () => fakeUser);
-		jest.spyOn(WorkflowsService, 'getSharing').mockImplementation(async () => {
-			return sharedWorkflowNotOwner;
-		});
-
-		const subworkflow = new Workflow({
-			nodes: [],
-			connections: {},
-			active: false,
-			nodeTypes: mockNodeTypes,
-			id: '2',
-		});
-		await expect(
-			PermissionChecker.checkSubworkflowExecutePolicy(subworkflow, userId),
-		).rejects.toThrow(`Target workflow ID ${subworkflow.id} may not be called`);
-
-		// Check description
-		try {
-			await PermissionChecker.checkSubworkflowExecutePolicy(
-				subworkflow,
-				subworkflow.settings.userId as string,
-				'abcde',
-			);
-		} catch (error) {
-			if (error instanceof SubworkflowOperationError) {
-				expect(error.description).toBe(
-					`${fakeUser.firstName} (${fakeUser.email}) can make this change. You may need to tell them the ID of this workflow, which is ${subworkflow.id}`,
+				await expect(permissionChecker.check(workflowId, user.id, nodes)).rejects.toThrow(
+					'Node has no access to credential',
 				);
-			}
-		}
-	});
 
-	test('list of ids must include the parent workflow id', async () => {
-		const invalidParentWorkflowId = uuid();
-		jest
-			.spyOn(UserManagementHelper, 'getWorkflowOwner')
-			.mockImplementation(async (workflowId) => fakeUser);
-		jest.spyOn(UserManagementHelper, 'isSharingEnabled').mockReturnValue(true);
-		jest.spyOn(UserService, 'get').mockImplementation(async () => fakeUser);
-		jest.spyOn(WorkflowsService, 'getSharing').mockImplementation(async () => {
-			return sharedWorkflowNotOwner;
+				expect(sharedWorkflowRepo.getSharedUserIds).not.toBeCalled();
+				expect(sharedCredentialsRepo.getOwnedCredentialIds).toBeCalledWith([user.id]);
+				expect(sharedCredentialsRepo.getAccessibleCredentialIds).not.toHaveBeenCalled();
+			});
 		});
 
-		const subworkflow = new Workflow({
-			nodes: [],
-			connections: {},
-			active: false,
-			nodeTypes: mockNodeTypes,
-			id: '2',
-			settings: {
-				callerPolicy: 'workflowsFromAList',
-				callerIds: '123,456,bcdef  ',
-			},
-		});
-		await expect(
-			PermissionChecker.checkSubworkflowExecutePolicy(subworkflow, userId, invalidParentWorkflowId),
-		).rejects.toThrow(`Target workflow ID ${subworkflow.id} may not be called`);
-	});
+		describe('When sharing is enabled', () => {
+			beforeEach(() => {
+				userRepo.findOneOrFail.mockResolvedValue(user);
+				user.hasGlobalScope.calledWith('workflow:execute').mockReturnValue(false);
+				license.isSharingEnabled.mockReturnValue(true);
+				sharedWorkflowRepo.getSharedUserIds.mockResolvedValue([user.id, 'another-user']);
+			});
 
-	test('sameOwner passes when both workflows are owned by the same user', async () => {
-		jest
-			.spyOn(UserManagementHelper, 'getWorkflowOwner')
-			.mockImplementation(async (workflowId) => fakeUser);
-		jest.spyOn(UserManagementHelper, 'isSharingEnabled').mockReturnValue(false);
-		jest.spyOn(UserService, 'get').mockImplementation(async () => fakeUser);
-		jest.spyOn(WorkflowsService, 'getSharing').mockImplementation(async () => {
-			return sharedWorkflowOwner;
-		});
+			it('should validate credential access using only owned credentials', async () => {
+				sharedCredentialsRepo.getAccessibleCredentialIds.mockResolvedValue(['cred-id']);
 
-		const subworkflow = new Workflow({
-			nodes: [],
-			connections: {},
-			active: false,
-			nodeTypes: mockNodeTypes,
-			id: '2',
-		});
-		await expect(
-			PermissionChecker.checkSubworkflowExecutePolicy(subworkflow, userId, userId),
-		).resolves.not.toThrow();
-	});
+				await expect(permissionChecker.check(workflowId, user.id, nodes)).resolves.not.toThrow();
 
-	test('workflowsFromAList works when the list contains the parent id', async () => {
-		const workflowId = uuid();
-		jest
-			.spyOn(UserManagementHelper, 'getWorkflowOwner')
-			.mockImplementation(async (workflowId) => fakeUser);
-		jest.spyOn(UserManagementHelper, 'isSharingEnabled').mockReturnValue(true);
-		jest.spyOn(UserService, 'get').mockImplementation(async () => fakeUser);
-		jest.spyOn(WorkflowsService, 'getSharing').mockImplementation(async () => {
-			return sharedWorkflowNotOwner;
-		});
+				expect(sharedWorkflowRepo.getSharedUserIds).toBeCalledWith(workflowId);
+				expect(sharedCredentialsRepo.getAccessibleCredentialIds).toBeCalledWith([
+					user.id,
+					'another-user',
+				]);
+				expect(sharedCredentialsRepo.getOwnedCredentialIds).not.toHaveBeenCalled();
+			});
 
-		const subworkflow = new Workflow({
-			nodes: [],
-			connections: {},
-			active: false,
-			nodeTypes: mockNodeTypes,
-			id: '2',
-			settings: {
-				callerPolicy: 'workflowsFromAList',
-				callerIds: `123,456,bcdef,  ${workflowId}`,
-			},
-		});
-		await expect(
-			PermissionChecker.checkSubworkflowExecutePolicy(subworkflow, userId, workflowId),
-		).resolves.not.toThrow();
-	});
+			it('should throw when the user does not have access to the credential', async () => {
+				sharedCredentialsRepo.getAccessibleCredentialIds.mockResolvedValue(['cred-id2']);
 
-	test('should not throw when workflow policy is set to any', async () => {
-		jest
-			.spyOn(UserManagementHelper, 'getWorkflowOwner')
-			.mockImplementation(async (workflowId) => fakeUser);
-		jest.spyOn(UserManagementHelper, 'isSharingEnabled').mockReturnValue(true);
-		jest.spyOn(UserService, 'get').mockImplementation(async () => fakeUser);
-		jest.spyOn(WorkflowsService, 'getSharing').mockImplementation(async () => {
-			return sharedWorkflowNotOwner;
-		});
+				await expect(permissionChecker.check(workflowId, user.id, nodes)).rejects.toThrow(
+					'Node has no access to credential',
+				);
 
-		const subworkflow = new Workflow({
-			nodes: [],
-			connections: {},
-			active: false,
-			nodeTypes: mockNodeTypes,
-			id: '2',
-			settings: {
-				callerPolicy: 'any',
-			},
+				expect(sharedWorkflowRepo.find).not.toBeCalled();
+				expect(sharedCredentialsRepo.getAccessibleCredentialIds).toBeCalledWith([
+					user.id,
+					'another-user',
+				]);
+				expect(sharedCredentialsRepo.getOwnedCredentialIds).not.toHaveBeenCalled();
+			});
 		});
-		await expect(
-			PermissionChecker.checkSubworkflowExecutePolicy(subworkflow, userId),
-		).resolves.not.toThrow();
 	});
 });
diff --git a/packages/cli/test/unit/PostHog.test.ts b/packages/cli/test/unit/PostHog.test.ts
index 47e736014e6d9..5798c0cce2217 100644
--- a/packages/cli/test/unit/PostHog.test.ts
+++ b/packages/cli/test/unit/PostHog.test.ts
@@ -1,6 +1,8 @@
 import { PostHog } from 'posthog-node';
+import { InstanceSettings } from 'n8n-core';
 import { PostHogClient } from '@/posthog';
 import config from '@/config';
+import { mockInstance } from '../shared/mocking';
 
 jest.mock('posthog-node');
 
@@ -10,6 +12,8 @@ describe('PostHog', () => {
 	const apiKey = 'api-key';
 	const apiHost = 'api-host';
 
+	const instanceSettings = mockInstance(InstanceSettings, { instanceId });
+
 	beforeAll(() => {
 		config.set('diagnostics.config.posthog.apiKey', apiKey);
 		config.set('diagnostics.config.posthog.apiHost', apiHost);
@@ -21,17 +25,17 @@ describe('PostHog', () => {
 	});
 
 	it('inits PostHog correctly', async () => {
-		const ph = new PostHogClient();
-		await ph.init(instanceId);
+		const ph = new PostHogClient(instanceSettings);
+		await ph.init();
 
-		expect(PostHog.prototype.constructor).toHaveBeenCalledWith(apiKey, {host: apiHost});
+		expect(PostHog.prototype.constructor).toHaveBeenCalledWith(apiKey, { host: apiHost });
 	});
 
 	it('does not initialize or track if diagnostics are not enabled', async () => {
 		config.set('diagnostics.enabled', false);
 
-		const ph = new PostHogClient();
-		await ph.init(instanceId);
+		const ph = new PostHogClient(instanceSettings);
+		await ph.init();
 
 		ph.track({
 			userId: 'test',
@@ -50,8 +54,8 @@ describe('PostHog', () => {
 			test: true,
 		};
 
-		const ph = new PostHogClient();
-		await ph.init(instanceId);
+		const ph = new PostHogClient(instanceSettings);
+		await ph.init();
 
 		ph.track({
 			userId,
@@ -70,21 +74,18 @@ describe('PostHog', () => {
 
 	it('gets feature flags', async () => {
 		const createdAt = new Date();
-		const ph = new PostHogClient();
-		await ph.init(instanceId);
+		const ph = new PostHogClient(instanceSettings);
+		await ph.init();
 
-		ph.getFeatureFlags({
+		await ph.getFeatureFlags({
 			id: userId,
 			createdAt,
 		});
 
-		expect(PostHog.prototype.getAllFlags).toHaveBeenCalledWith(
-			`${instanceId}#${userId}`,
-			{
-				personProperties: {
-					created_at_timestamp: createdAt.getTime().toString(),
-				},
-			}
-		);
+		expect(PostHog.prototype.getAllFlags).toHaveBeenCalledWith(`${instanceId}#${userId}`, {
+			personProperties: {
+				created_at_timestamp: createdAt.getTime().toString(),
+			},
+		});
 	});
-});
\ No newline at end of file
+});
diff --git a/packages/cli/test/unit/SourceControl.test.ts b/packages/cli/test/unit/SourceControl.test.ts
new file mode 100644
index 0000000000000..4d0d78653294f
--- /dev/null
+++ b/packages/cli/test/unit/SourceControl.test.ts
@@ -0,0 +1,260 @@
+import Container from 'typedi';
+import {
+	generateSshKeyPair,
+	getRepoType,
+	getTrackingInformationFromPostPushResult,
+	getTrackingInformationFromPrePushResult,
+	getTrackingInformationFromPullResult,
+	sourceControlFoldersExistCheck,
+} from '@/environments/sourceControl/sourceControlHelper.ee';
+import { License } from '@/License';
+import { SourceControlPreferencesService } from '@/environments/sourceControl/sourceControlPreferences.service.ee';
+import { InstanceSettings } from 'n8n-core';
+import path from 'path';
+import {
+	SOURCE_CONTROL_SSH_FOLDER,
+	SOURCE_CONTROL_GIT_FOLDER,
+} from '@/environments/sourceControl/constants';
+import { constants as fsConstants, accessSync } from 'fs';
+import type { SourceControlledFile } from '@/environments/sourceControl/types/sourceControlledFile';
+import type { SourceControlPreferences } from '@/environments/sourceControl/types/sourceControlPreferences';
+import { mockInstance } from '../shared/mocking';
+
+const pushResult: SourceControlledFile[] = [
+	{
+		file: 'credential_stubs/kkookWGIeey9K4Kt.json',
+		id: 'kkookWGIeey9K4Kt',
+		name: '(deleted)',
+		type: 'credential',
+		status: 'deleted',
+		location: 'local',
+		conflict: false,
+		updatedAt: '',
+		pushed: true,
+	},
+	{
+		file: 'variable_stubs.json',
+		id: 'variables',
+		name: 'variables',
+		type: 'variables',
+		status: 'modified',
+		location: 'local',
+		conflict: false,
+		updatedAt: '',
+		pushed: true,
+	},
+	{
+		file: 'workflows/BpFS26gViuGqrIVP.json',
+		id: 'BpFS26gViuGqrIVP',
+		name: 'My workflow 5',
+		type: 'workflow',
+		status: 'modified',
+		location: 'remote',
+		conflict: true,
+		pushed: true,
+		updatedAt: '2023-07-10T10:10:59.000Z',
+	},
+	{
+		file: 'workflows/BpFS26gViuGqrIVP.json',
+		id: 'BpFS26gViuGqrIVP',
+		name: 'My workflow 5',
+		type: 'workflow',
+		status: 'modified',
+		location: 'local',
+		conflict: true,
+		updatedAt: '2023-07-10T10:10:59.000Z',
+	},
+	{
+		file: 'workflows/dAU6dNthm4TR3gXx.json',
+		id: 'dAU6dNthm4TR3gXx',
+		name: 'My workflow 7',
+		type: 'workflow',
+		status: 'created',
+		location: 'local',
+		conflict: false,
+		pushed: true,
+		updatedAt: '2023-07-10T10:02:45.186Z',
+	},
+	{
+		file: 'workflows/haQetoXq9GxHSkft.json',
+		id: 'haQetoXq9GxHSkft',
+		name: 'My workflow 6',
+		type: 'workflow',
+		status: 'created',
+		location: 'local',
+		conflict: false,
+		updatedAt: '2023-07-10T10:02:39.276Z',
+	},
+];
+
+const pullResult: SourceControlledFile[] = [
+	{
+		file: 'credential_stubs/kkookWGIeey9K4Kt.json',
+		id: 'kkookWGIeey9K4Kt',
+		name: '(deleted)',
+		type: 'credential',
+		status: 'deleted',
+		location: 'local',
+		conflict: false,
+		updatedAt: '',
+	},
+	{
+		file: 'credential_stubs/abcdeWGIeey9K4aa.json',
+		id: 'abcdeWGIeey9K4aa',
+		name: 'modfied credential',
+		type: 'credential',
+		status: 'modified',
+		location: 'local',
+		conflict: false,
+		updatedAt: '',
+	},
+	{
+		file: 'workflows/BpFS26gViuGqrIVP.json',
+		id: 'BpFS26gViuGqrIVP',
+		name: '(deleted)',
+		type: 'workflow',
+		status: 'deleted',
+		location: 'local',
+		conflict: false,
+		updatedAt: '',
+	},
+	{
+		file: 'variable_stubs.json',
+		id: 'variables',
+		name: 'variables',
+		type: 'variables',
+		status: 'modified',
+		location: 'local',
+		conflict: false,
+		updatedAt: '',
+	},
+	{
+		file: 'workflows/dAU6dNthm4TR3gXx.json',
+		id: 'dAU6dNthm4TR3gXx',
+		name: 'My workflow 7',
+		type: 'workflow',
+		status: 'created',
+		location: 'local',
+		conflict: false,
+		updatedAt: '2023-07-10T10:02:45.186Z',
+	},
+	{
+		file: 'workflows/haQetoXq9GxHSkft.json',
+		id: 'haQetoXq9GxHSkft',
+		name: 'My workflow 6',
+		type: 'workflow',
+		status: 'modified',
+		location: 'local',
+		conflict: false,
+		updatedAt: '2023-07-10T10:02:39.276Z',
+	},
+];
+
+const license = mockInstance(License);
+
+beforeAll(async () => {
+	jest.resetAllMocks();
+	license.isSourceControlLicensed.mockReturnValue(true);
+	Container.get(SourceControlPreferencesService).getPreferences = () => ({
+		branchName: 'main',
+		connected: true,
+		repositoryUrl: 'git@example.com:n8ntest/n8n_testrepo.git',
+		branchReadOnly: false,
+		branchColor: '#5296D6',
+		publicKey:
+			'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDBSz2nMZAiUBWe6n89aWd5x9QMcIOaznVW3fpuCYC4L n8n deploy key',
+	});
+});
+
+describe('Source Control', () => {
+	it('should generate an SSH key pair', async () => {
+		const keyPair = await generateSshKeyPair('ed25519');
+		expect(keyPair.privateKey).toBeTruthy();
+		expect(keyPair.privateKey).toContain('BEGIN OPENSSH PRIVATE KEY');
+		expect(keyPair.publicKey).toBeTruthy();
+		expect(keyPair.publicKey).toContain('ssh-ed25519');
+	});
+
+	it('should generate an RSA key pair', async () => {
+		const keyPair = await generateSshKeyPair('rsa');
+		expect(keyPair.privateKey).toBeTruthy();
+		expect(keyPair.privateKey).toContain('BEGIN OPENSSH PRIVATE KEY');
+		expect(keyPair.publicKey).toBeTruthy();
+		expect(keyPair.publicKey).toContain('ssh-rsa');
+	});
+
+	it('should check for git and ssh folders and create them if required', async () => {
+		const { n8nFolder } = Container.get(InstanceSettings);
+		const sshFolder = path.join(n8nFolder, SOURCE_CONTROL_SSH_FOLDER);
+		const gitFolder = path.join(n8nFolder, SOURCE_CONTROL_GIT_FOLDER);
+		let hasThrown = false;
+		try {
+			accessSync(sshFolder, fsConstants.F_OK);
+		} catch (error) {
+			hasThrown = true;
+		}
+		expect(hasThrown).toBeTruthy();
+		hasThrown = false;
+		try {
+			accessSync(gitFolder, fsConstants.F_OK);
+		} catch (error) {
+			hasThrown = true;
+		}
+		expect(hasThrown).toBeTruthy();
+		// create missing folders
+		expect(sourceControlFoldersExistCheck([gitFolder, sshFolder], true)).toBe(false);
+		// find folders this time
+		expect(sourceControlFoldersExistCheck([gitFolder, sshFolder], true)).toBe(true);
+		expect(accessSync(sshFolder, fsConstants.F_OK)).toBeUndefined();
+		expect(accessSync(gitFolder, fsConstants.F_OK)).toBeUndefined();
+	});
+
+	it('should get repo type from url', async () => {
+		expect(getRepoType('git@github.com:n8ntest/n8n_testrepo.git')).toBe('github');
+		expect(getRepoType('git@gitlab.com:n8ntest/n8n_testrepo.git')).toBe('gitlab');
+		expect(getRepoType('git@mygitea.io:n8ntest/n8n_testrepo.git')).toBe('other');
+	});
+
+	it('should get tracking information from pre-push results', () => {
+		const trackingResult = getTrackingInformationFromPrePushResult(pushResult);
+		expect(trackingResult).toEqual({
+			workflows_eligible: 3,
+			workflows_eligible_with_conflicts: 1,
+			creds_eligible: 1,
+			creds_eligible_with_conflicts: 0,
+			variables_eligible: 1,
+		});
+	});
+
+	it('should get tracking information from post-push results', () => {
+		const trackingResult = getTrackingInformationFromPostPushResult(pushResult);
+		expect(trackingResult).toEqual({
+			workflows_pushed: 2,
+			workflows_eligible: 3,
+			creds_pushed: 1,
+			variables_pushed: 1,
+		});
+	});
+
+	it('should get tracking information from pull results', () => {
+		const trackingResult = getTrackingInformationFromPullResult(pullResult);
+		expect(trackingResult).toEqual({
+			cred_conflicts: 1,
+			workflow_conflicts: 1,
+			workflow_updates: 3,
+		});
+	});
+
+	it('should class validate correct preferences', async () => {
+		const validPreferences: Partial<SourceControlPreferences> = {
+			branchName: 'main',
+			repositoryUrl: 'git@example.com:n8ntest/n8n_testrepo.git',
+			branchReadOnly: false,
+			branchColor: '#5296D6',
+		};
+		const validationResult = await Container.get(
+			SourceControlPreferencesService,
+		).validateSourceControlPreferences(validPreferences);
+		expect(validationResult).toBeTruthy();
+	});
+});
diff --git a/packages/cli/test/unit/Telemetry.test.ts b/packages/cli/test/unit/Telemetry.test.ts
index 4b58caf99471a..25f4a808675b0 100644
--- a/packages/cli/test/unit/Telemetry.test.ts
+++ b/packages/cli/test/unit/Telemetry.test.ts
@@ -1,27 +1,29 @@
+import type RudderStack from '@rudderstack/rudder-sdk-node';
 import { Telemetry } from '@/telemetry';
 import config from '@/config';
 import { flushPromises } from './Helpers';
 import { PostHogClient } from '@/posthog';
 import { mock } from 'jest-mock-extended';
+import { InstanceSettings } from 'n8n-core';
+import { mockInstance } from '../shared/mocking';
 
 jest.unmock('@/telemetry');
-jest.mock('@/license/License.service', () => {
-	return {
-		LicenseService: {
-			getActiveTriggerCount: async () => 0,
-		},
-	};
-});
 jest.mock('@/posthog');
 
 describe('Telemetry', () => {
 	let startPulseSpy: jest.SpyInstance;
 	const spyTrack = jest.spyOn(Telemetry.prototype, 'track').mockName('track');
 
+	const mockRudderStack: Pick<RudderStack, 'flush' | 'identify' | 'track'> = {
+		flush: (resolve) => resolve?.(),
+		identify: (data, resolve) => resolve?.(),
+		track: (data, resolve) => resolve?.(),
+	};
+
 	let telemetry: Telemetry;
-	const n8nVersion = '0.0.0';
 	const instanceId = 'Telemetry unit test';
 	const testDateTime = new Date('2022-01-01 00:00:00');
+	const instanceSettings = mockInstance(InstanceSettings, { instanceId });
 
 	beforeAll(() => {
 		startPulseSpy = jest
@@ -33,35 +35,30 @@ describe('Telemetry', () => {
 		config.set('deployment.type', 'n8n-testing');
 	});
 
-	afterAll(() => {
+	afterAll(async () => {
 		jest.clearAllTimers();
 		jest.useRealTimers();
 		startPulseSpy.mockRestore();
-		telemetry.trackN8nStop();
+		await telemetry.trackN8nStop();
 	});
 
-	beforeEach(() => {
+	beforeEach(async () => {
 		spyTrack.mockClear();
 
-		const postHog = new PostHogClient();
-		postHog.init(instanceId);
+		const postHog = new PostHogClient(instanceSettings);
+		await postHog.init();
 
-		telemetry = new Telemetry(postHog, mock());
-		telemetry.setInstanceId(instanceId);
-		(telemetry as any).rudderStack = {
-			flush: () => {},
-			identify: () => {},
-			track: () => {},
-		};
+		telemetry = new Telemetry(mock(), postHog, mock(), instanceSettings, mock());
+		(telemetry as any).rudderStack = mockRudderStack;
 	});
 
-	afterEach(() => {
-		telemetry.trackN8nStop();
+	afterEach(async () => {
+		await telemetry.trackN8nStop();
 	});
 
 	describe('trackN8nStop', () => {
-		test('should call track method', () => {
-			telemetry.trackN8nStop();
+		test('should call track method', async () => {
+			await telemetry.trackN8nStop();
 			expect(spyTrack).toHaveBeenCalledTimes(1);
 		});
 	});
@@ -209,7 +206,6 @@ describe('Telemetry', () => {
 			await telemetry.trackWorkflowExecution(payload);
 
 			expect(spyTrack).toHaveBeenCalledTimes(0);
-
 			execBuffer = telemetry.getCountsBuffer();
 
 			expect(execBuffer['1'].manual_error).toBeUndefined();
@@ -252,19 +248,20 @@ describe('Telemetry', () => {
 			// failed execution n8n node
 			payload.success = false;
 			payload.error_node_type = 'n8n-nodes-base.merge';
+			payload.is_manual = true;
 			await telemetry.trackWorkflowExecution(payload);
 
 			expect(spyTrack).toHaveBeenCalledTimes(1);
 
 			execBuffer = telemetry.getCountsBuffer();
 
-			expect(execBuffer['1'].manual_error).toBeUndefined();
+			expect(execBuffer['1'].manual_error?.count).toBe(1);
 			expect(execBuffer['1'].manual_success).toBeUndefined();
 			expect(execBuffer['2'].manual_error).toBeUndefined();
 			expect(execBuffer['2'].manual_success).toBeUndefined();
 			expect(execBuffer['2'].prod_error).toBeUndefined();
 			expect(execBuffer['1'].prod_success?.count).toBe(2);
-			expect(execBuffer['1'].prod_error?.count).toBe(2);
+			expect(execBuffer['1'].prod_error?.count).toBe(1);
 			expect(execBuffer['2'].prod_success?.count).toBe(2);
 
 			expect(execBuffer['1'].prod_error?.first).toEqual(execTime2);
diff --git a/packages/cli/test/unit/TestWebhooks.test.ts b/packages/cli/test/unit/TestWebhooks.test.ts
new file mode 100644
index 0000000000000..6c7ae555b3b52
--- /dev/null
+++ b/packages/cli/test/unit/TestWebhooks.test.ts
@@ -0,0 +1,134 @@
+import { mock } from 'jest-mock-extended';
+import { TestWebhooks } from '@/TestWebhooks';
+import { WebhookNotFoundError } from '@/errors/response-errors/webhook-not-found.error';
+import { v4 as uuid } from 'uuid';
+import { generateNanoId } from '@/databases/utils/generators';
+import { NotFoundError } from '@/errors/response-errors/not-found.error';
+import * as WebhookHelpers from '@/WebhookHelpers';
+import type * as express from 'express';
+
+import type { IWorkflowDb, WebhookRequest } from '@/Interfaces';
+import type { IWebhookData, IWorkflowExecuteAdditionalData, Workflow } from 'n8n-workflow';
+import type {
+	TestWebhookRegistrationsService,
+	TestWebhookRegistration,
+} from '@/services/test-webhook-registrations.service';
+
+import * as AdditionalData from '@/WorkflowExecuteAdditionalData';
+
+jest.mock('@/WorkflowExecuteAdditionalData');
+
+const mockedAdditionalData = AdditionalData as jest.Mocked<typeof AdditionalData>;
+
+const workflowEntity = mock<IWorkflowDb>({ id: generateNanoId(), nodes: [] });
+
+const httpMethod = 'GET';
+const path = uuid();
+const userId = '04ab4baf-85df-478f-917b-d303934a97de';
+
+const webhook = mock<IWebhookData>({
+	httpMethod,
+	path,
+	workflowId: workflowEntity.id,
+	userId,
+});
+
+const registrations = mock<TestWebhookRegistrationsService>();
+
+let testWebhooks: TestWebhooks;
+
+describe('TestWebhooks', () => {
+	beforeAll(() => {
+		testWebhooks = new TestWebhooks(mock(), mock(), registrations, mock());
+		jest.useFakeTimers();
+	});
+
+	describe('needsWebhook()', () => {
+		const args: Parameters<typeof testWebhooks.needsWebhook> = [
+			userId,
+			workflowEntity,
+			mock<IWorkflowExecuteAdditionalData>(),
+		];
+
+		test('if webhook is needed, should register then create webhook and return true', async () => {
+			const workflow = mock<Workflow>();
+
+			jest.spyOn(testWebhooks, 'toWorkflow').mockReturnValueOnce(workflow);
+			jest.spyOn(WebhookHelpers, 'getWorkflowWebhooks').mockReturnValue([webhook]);
+
+			const needsWebhook = await testWebhooks.needsWebhook(...args);
+
+			const [registerOrder] = registrations.register.mock.invocationCallOrder;
+			const [createOrder] = workflow.createWebhookIfNotExists.mock.invocationCallOrder;
+
+			expect(registerOrder).toBeLessThan(createOrder);
+			expect(needsWebhook).toBe(true);
+		});
+
+		test('if webhook activation fails, should deactivate workflow webhooks', async () => {
+			const msg = 'Failed to add webhook to active webhooks';
+
+			jest.spyOn(WebhookHelpers, 'getWorkflowWebhooks').mockReturnValue([webhook]);
+			jest.spyOn(registrations, 'register').mockRejectedValueOnce(new Error(msg));
+			registrations.getAllRegistrations.mockResolvedValue([]);
+
+			const needsWebhook = testWebhooks.needsWebhook(...args);
+
+			await expect(needsWebhook).rejects.toThrowError(msg);
+		});
+
+		test('if no webhook is found to start workflow, should return false', async () => {
+			webhook.webhookDescription.restartWebhook = true;
+			jest.spyOn(WebhookHelpers, 'getWorkflowWebhooks').mockReturnValue([webhook]);
+
+			const result = await testWebhooks.needsWebhook(...args);
+
+			expect(result).toBe(false);
+		});
+	});
+
+	describe('executeWebhook()', () => {
+		test('if webhook is not registered, should throw', async () => {
+			jest.spyOn(testWebhooks, 'getActiveWebhook').mockResolvedValue(webhook);
+			jest.spyOn(testWebhooks, 'getWebhookMethods').mockResolvedValue([]);
+
+			const promise = testWebhooks.executeWebhook(
+				mock<WebhookRequest>({ params: { path } }),
+				mock(),
+			);
+
+			await expect(promise).rejects.toThrowError(WebhookNotFoundError);
+		});
+
+		test('if webhook is registered but missing from workflow, should throw', async () => {
+			jest.spyOn(testWebhooks, 'getActiveWebhook').mockResolvedValue(webhook);
+			jest.spyOn(testWebhooks, 'getWebhookMethods').mockResolvedValue([]);
+
+			const registration = mock<TestWebhookRegistration>({
+				pushRef: 'some-session-id',
+				workflowEntity,
+			});
+
+			await registrations.register(registration);
+
+			const promise = testWebhooks.executeWebhook(
+				mock<WebhookRequest>({ params: { path } }),
+				mock<express.Response>(),
+			);
+
+			await expect(promise).rejects.toThrowError(NotFoundError);
+		});
+	});
+
+	describe('deactivateWebhooks()', () => {
+		test('should add additional data to workflow', async () => {
+			registrations.getAllRegistrations.mockResolvedValue([{ workflowEntity, webhook }]);
+
+			const workflow = testWebhooks.toWorkflow(workflowEntity);
+
+			await testWebhooks.deactivateWebhooks(workflow);
+
+			expect(mockedAdditionalData.getBase).toHaveBeenCalledWith(userId);
+		});
+	});
+});
diff --git a/packages/cli/test/unit/UserManagementMailer.test.ts b/packages/cli/test/unit/UserManagementMailer.test.ts
new file mode 100644
index 0000000000000..10daf984c9a2c
--- /dev/null
+++ b/packages/cli/test/unit/UserManagementMailer.test.ts
@@ -0,0 +1,41 @@
+import config from '@/config';
+import { NodeMailer } from '@/UserManagement/email/NodeMailer';
+import { UserManagementMailer } from '@/UserManagement/email/UserManagementMailer';
+import { mock } from 'jest-mock-extended';
+
+describe('UserManagementMailer', () => {
+	describe('expect NodeMailer.verifyConnection', () => {
+		let mockInit: jest.SpyInstance<Promise<void>, []>;
+		let mockVerifyConnection: jest.SpyInstance<Promise<void>, []>;
+
+		beforeAll(() => {
+			mockVerifyConnection = jest
+				.spyOn(NodeMailer.prototype, 'verifyConnection')
+				.mockImplementation(async () => {});
+			mockInit = jest.spyOn(NodeMailer.prototype, 'init').mockImplementation(async () => {});
+		});
+
+		afterAll(() => {
+			mockVerifyConnection.mockRestore();
+			mockInit.mockRestore();
+		});
+
+		test('not be called when SMTP not set up', async () => {
+			const userManagementMailer = new UserManagementMailer(mock(), mock(), mock());
+			// NodeMailer.verifyConnection gets called only explicitly
+			await expect(async () => await userManagementMailer.verifyConnection()).rejects.toThrow();
+
+			expect(NodeMailer.prototype.verifyConnection).toHaveBeenCalledTimes(0);
+		});
+
+		test('to be called when SMTP set up', async () => {
+			// host needs to be set, otherwise smtp is skipped
+			config.set('userManagement.emails.smtp.host', 'host');
+			config.set('userManagement.emails.mode', 'smtp');
+
+			const userManagementMailer = new UserManagementMailer(mock(), mock(), mock());
+			// NodeMailer.verifyConnection gets called only explicitly
+			expect(async () => await userManagementMailer.verifyConnection()).not.toThrow();
+		});
+	});
+});
diff --git a/packages/cli/test/unit/VersionControl.test.ts b/packages/cli/test/unit/VersionControl.test.ts
deleted file mode 100644
index 6e880859ff298..0000000000000
--- a/packages/cli/test/unit/VersionControl.test.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { generateSshKeyPair } from '../../src/environments/versionControl/versionControlHelper';
-
-describe('Version Control', () => {
-	it('should generate an SSH key pair', () => {
-		const keyPair = generateSshKeyPair();
-		expect(keyPair.privateKey).toBeTruthy();
-		expect(keyPair.privateKey).toContain('BEGIN OPENSSH PRIVATE KEY');
-		expect(keyPair.publicKey).toBeTruthy();
-		expect(keyPair.publicKey).toContain('ssh-ed25519');
-	});
-});
diff --git a/packages/cli/test/unit/WaitTracker.test.ts b/packages/cli/test/unit/WaitTracker.test.ts
new file mode 100644
index 0000000000000..b355adb679a4d
--- /dev/null
+++ b/packages/cli/test/unit/WaitTracker.test.ts
@@ -0,0 +1,146 @@
+import { WaitTracker } from '@/WaitTracker';
+import { mock } from 'jest-mock-extended';
+import type { ExecutionRepository } from '@/databases/repositories/execution.repository';
+import type { IExecutionResponse } from '@/Interfaces';
+import type { OrchestrationService } from '@/services/orchestration.service';
+import type { MultiMainSetup } from '@/services/orchestration/main/MultiMainSetup.ee';
+
+jest.useFakeTimers();
+
+describe('WaitTracker', () => {
+	const executionRepository = mock<ExecutionRepository>();
+	const orchestrationService = mock<OrchestrationService>({
+		isSingleMainSetup: true,
+	});
+
+	const execution = mock<IExecutionResponse>({
+		id: '123',
+		waitTill: new Date(Date.now() + 1000),
+	});
+
+	afterEach(() => {
+		jest.clearAllMocks();
+	});
+
+	describe('constructor()', () => {
+		it('should query DB for waiting executions', async () => {
+			executionRepository.getWaitingExecutions.mockResolvedValue([execution]);
+
+			new WaitTracker(mock(), executionRepository, mock(), mock(), orchestrationService);
+
+			expect(executionRepository.getWaitingExecutions).toHaveBeenCalledTimes(1);
+		});
+
+		it('if no executions to start, should do nothing', () => {
+			executionRepository.getWaitingExecutions.mockResolvedValue([]);
+
+			new WaitTracker(mock(), executionRepository, mock(), mock(), orchestrationService);
+
+			expect(executionRepository.findSingleExecution).not.toHaveBeenCalled();
+		});
+
+		describe('if execution to start', () => {
+			it('if not enough time passed, should not start execution', async () => {
+				executionRepository.getWaitingExecutions.mockResolvedValue([execution]);
+				const waitTracker = new WaitTracker(
+					mock(),
+					executionRepository,
+					mock(),
+					mock(),
+					orchestrationService,
+				);
+
+				executionRepository.getWaitingExecutions.mockResolvedValue([execution]);
+				await waitTracker.getWaitingExecutions();
+
+				const startExecutionSpy = jest.spyOn(waitTracker, 'startExecution');
+
+				jest.advanceTimersByTime(100);
+
+				expect(startExecutionSpy).not.toHaveBeenCalled();
+			});
+
+			it('if enough time passed, should start execution', async () => {
+				executionRepository.getWaitingExecutions.mockResolvedValue([]);
+				const waitTracker = new WaitTracker(
+					mock(),
+					executionRepository,
+					mock(),
+					mock(),
+					orchestrationService,
+				);
+
+				executionRepository.getWaitingExecutions.mockResolvedValue([execution]);
+				await waitTracker.getWaitingExecutions();
+
+				const startExecutionSpy = jest.spyOn(waitTracker, 'startExecution');
+
+				jest.advanceTimersByTime(2_000);
+
+				expect(startExecutionSpy).toHaveBeenCalledWith(execution.id);
+			});
+		});
+	});
+
+	describe('startExecution()', () => {
+		it('should query for execution to start', async () => {
+			executionRepository.getWaitingExecutions.mockResolvedValue([]);
+			const waitTracker = new WaitTracker(
+				mock(),
+				executionRepository,
+				mock(),
+				mock(),
+				orchestrationService,
+			);
+
+			executionRepository.findSingleExecution.mockResolvedValue(execution);
+			waitTracker.startExecution(execution.id);
+			jest.advanceTimersByTime(5);
+
+			expect(executionRepository.findSingleExecution).toHaveBeenCalledWith(execution.id, {
+				includeData: true,
+				unflattenData: true,
+			});
+		});
+	});
+
+	describe('single-main setup', () => {
+		it('should start tracking', () => {
+			executionRepository.getWaitingExecutions.mockResolvedValue([]);
+
+			new WaitTracker(mock(), executionRepository, mock(), mock(), orchestrationService);
+
+			expect(executionRepository.getWaitingExecutions).toHaveBeenCalledTimes(1);
+		});
+	});
+
+	describe('multi-main setup', () => {
+		it('should start tracking if leader', () => {
+			const orchestrationService = mock<OrchestrationService>({
+				isLeader: true,
+				isSingleMainSetup: false,
+				multiMainSetup: mock<MultiMainSetup>({ on: jest.fn().mockReturnThis() }),
+			});
+
+			executionRepository.getWaitingExecutions.mockResolvedValue([]);
+
+			new WaitTracker(mock(), executionRepository, mock(), mock(), orchestrationService);
+
+			expect(executionRepository.getWaitingExecutions).toHaveBeenCalledTimes(1);
+		});
+
+		it('should not start tracking if follower', () => {
+			const orchestrationService = mock<OrchestrationService>({
+				isLeader: false,
+				isSingleMainSetup: false,
+				multiMainSetup: mock<MultiMainSetup>({ on: jest.fn().mockReturnThis() }),
+			});
+
+			executionRepository.getWaitingExecutions.mockResolvedValue([]);
+
+			new WaitTracker(mock(), executionRepository, mock(), mock(), orchestrationService);
+
+			expect(executionRepository.getWaitingExecutions).not.toHaveBeenCalled();
+		});
+	});
+});
diff --git a/packages/cli/test/unit/WebhookHelpers.test.ts b/packages/cli/test/unit/WebhookHelpers.test.ts
new file mode 100644
index 0000000000000..fb455b098a726
--- /dev/null
+++ b/packages/cli/test/unit/WebhookHelpers.test.ts
@@ -0,0 +1,140 @@
+import { type Response } from 'express';
+import { mock } from 'jest-mock-extended';
+import type { IHttpRequestMethods } from 'n8n-workflow';
+import type { IWebhookManager, WebhookCORSRequest, WebhookRequest } from '@/Interfaces';
+import { webhookRequestHandler } from '@/WebhookHelpers';
+
+describe('WebhookHelpers', () => {
+	describe('webhookRequestHandler', () => {
+		const webhookManager = mock<Required<IWebhookManager>>();
+		const handler = webhookRequestHandler(webhookManager);
+
+		beforeEach(() => {
+			jest.resetAllMocks();
+		});
+
+		it('should throw for unsupported methods', async () => {
+			const req = mock<WebhookRequest | WebhookCORSRequest>({
+				method: 'CONNECT' as IHttpRequestMethods,
+			});
+			const res = mock<Response>();
+			res.status.mockReturnValue(res);
+
+			await handler(req, res);
+
+			expect(res.status).toHaveBeenCalledWith(500);
+			expect(res.json).toHaveBeenCalledWith({
+				code: 0,
+				message: 'The method CONNECT is not supported.',
+			});
+		});
+
+		describe('preflight requests', () => {
+			it('should handle missing header for requested method', async () => {
+				const req = mock<WebhookRequest | WebhookCORSRequest>({
+					method: 'OPTIONS',
+					headers: {
+						origin: 'https://example.com',
+						'access-control-request-method': undefined,
+					},
+					params: { path: 'test' },
+				});
+				const res = mock<Response>();
+				res.status.mockReturnValue(res);
+
+				webhookManager.getWebhookMethods.mockResolvedValue(['GET', 'PATCH']);
+
+				await handler(req, res);
+
+				expect(res.status).toHaveBeenCalledWith(204);
+				expect(res.header).toHaveBeenCalledWith(
+					'Access-Control-Allow-Methods',
+					'OPTIONS, GET, PATCH',
+				);
+			});
+
+			it('should handle default origin and max-age', async () => {
+				const req = mock<WebhookRequest | WebhookCORSRequest>({
+					method: 'OPTIONS',
+					headers: {
+						origin: 'https://example.com',
+						'access-control-request-method': 'GET',
+					},
+					params: { path: 'test' },
+				});
+				const res = mock<Response>();
+				res.status.mockReturnValue(res);
+
+				webhookManager.getWebhookMethods.mockResolvedValue(['GET', 'PATCH']);
+
+				await handler(req, res);
+
+				expect(res.status).toHaveBeenCalledWith(204);
+				expect(res.header).toHaveBeenCalledWith(
+					'Access-Control-Allow-Methods',
+					'OPTIONS, GET, PATCH',
+				);
+				expect(res.header).toHaveBeenCalledWith(
+					'Access-Control-Allow-Origin',
+					'https://example.com',
+				);
+				expect(res.header).toHaveBeenCalledWith('Access-Control-Max-Age', '300');
+			});
+
+			it('should handle wildcard origin', async () => {
+				const randomOrigin = (Math.random() * 10e6).toString(16);
+				const req = mock<WebhookRequest | WebhookCORSRequest>({
+					method: 'OPTIONS',
+					headers: {
+						origin: randomOrigin,
+						'access-control-request-method': 'GET',
+					},
+					params: { path: 'test' },
+				});
+				const res = mock<Response>();
+				res.status.mockReturnValue(res);
+
+				webhookManager.getWebhookMethods.mockResolvedValue(['GET', 'PATCH']);
+				webhookManager.findAccessControlOptions.mockResolvedValue({
+					allowedOrigins: '*',
+				});
+
+				await handler(req, res);
+
+				expect(res.status).toHaveBeenCalledWith(204);
+				expect(res.header).toHaveBeenCalledWith(
+					'Access-Control-Allow-Methods',
+					'OPTIONS, GET, PATCH',
+				);
+				expect(res.header).toHaveBeenCalledWith('Access-Control-Allow-Origin', randomOrigin);
+			});
+
+			it('should handle custom origin', async () => {
+				const req = mock<WebhookRequest | WebhookCORSRequest>({
+					method: 'OPTIONS',
+					headers: {
+						origin: 'https://example.com',
+						'access-control-request-method': 'GET',
+					},
+					params: { path: 'test' },
+				});
+				const res = mock<Response>();
+				res.status.mockReturnValue(res);
+
+				webhookManager.getWebhookMethods.mockResolvedValue(['GET', 'PATCH']);
+				webhookManager.findAccessControlOptions.mockResolvedValue({
+					allowedOrigins: 'https://test.com',
+				});
+
+				await handler(req, res);
+
+				expect(res.status).toHaveBeenCalledWith(204);
+				expect(res.header).toHaveBeenCalledWith(
+					'Access-Control-Allow-Methods',
+					'OPTIONS, GET, PATCH',
+				);
+				expect(res.header).toHaveBeenCalledWith('Access-Control-Allow-Origin', 'https://test.com');
+			});
+		});
+	});
+});
diff --git a/packages/cli/test/unit/WorkflowCredentials.test.ts b/packages/cli/test/unit/WorkflowCredentials.test.ts
deleted file mode 100644
index ece7dd66351b9..0000000000000
--- a/packages/cli/test/unit/WorkflowCredentials.test.ts
+++ /dev/null
@@ -1,157 +0,0 @@
-import { mocked } from 'jest-mock';
-import type { INode, IWorkflowCredentials } from 'n8n-workflow';
-import * as Db from '@/Db';
-import { WorkflowCredentials } from '@/WorkflowCredentials';
-
-// Define a function used to mock the findOneBy function
-async function mockFind({
-	id,
-	type,
-}: {
-	id: string;
-	type: string;
-}): Promise<IWorkflowCredentials | null> {
-	// Simple statement that maps a return value based on the `id` parameter
-	if (id === notFoundNode.credentials!!.test.id) {
-		return null;
-	}
-	// Otherwise just build some kind of credential object and return it
-	return {
-		[type]: {
-			[id]: {
-				id: id,
-				name: type,
-				type: type,
-				nodesAccess: [],
-				data: '',
-			},
-		},
-	};
-}
-
-jest.mock('@/Db', () => {
-	return {
-		collections: {
-			Credentials: {
-				findOneBy: jest.fn(mockFind),
-			},
-		},
-	};
-});
-
-// Create an array of Nodes with info that pass or fail the checks as required.
-// DB returns an object of type { [id: string]: ICredentialsEncrypted } but as it isn't checked
-// All the mock will need to return is some form of Object when successful
-
-describe('WorkflowCredentials', () => {
-	afterEach(() => {
-		jest.clearAllMocks();
-	});
-
-	test('Should return an error if any node has no credential ID', () => {
-		const credentials = noIdNode.credentials!!.test;
-		const expectedError = new Error(
-			`Credentials with name "${credentials.name}" for type "test" miss an ID.`,
-		);
-		expect(WorkflowCredentials([noIdNode])).rejects.toEqual(expectedError);
-		expect(mocked(Db.collections.Credentials.findOneBy)).toHaveBeenCalledTimes(0);
-	});
-
-	test('Should return an error if credentials cannot be found in the DB', () => {
-		const credentials = notFoundNode.credentials!!.test;
-		const expectedError = new Error(
-			`Could not find credentials for type "test" with ID "${credentials.id}".`,
-		);
-		expect(WorkflowCredentials([notFoundNode])).rejects.toEqual(expectedError);
-		expect(mocked(Db.collections.Credentials.findOneBy)).toHaveBeenCalledTimes(1);
-	});
-
-	test('Should ignore duplicates', async () => {
-		const response = await WorkflowCredentials([validNode, validNode, validNode]);
-		expect(Object.keys(response)).toEqual(['test']);
-	});
-
-	test('Should ignore Nodes with no credentials set', async () => {
-		const response = await WorkflowCredentials([validNode, noCredentialsNode]);
-		expect(Object.keys(response)).toEqual(['test']);
-	});
-
-	test('Should work for Nodes with multiple credentials', async () => {
-		const response = await WorkflowCredentials([multiCredNode]);
-		expect(Object.keys(response)).toEqual(['mcTest', 'mcTest2']);
-	});
-});
-
-const validNode: INode = {
-	id: '1',
-	name: 'Node with Valid Credentials',
-	typeVersion: 1,
-	type: '',
-	position: [0, 0],
-	credentials: {
-		test: {
-			id: 'cred#1',
-			name: 'Test Credentials',
-		},
-	},
-	parameters: {},
-};
-
-const noIdNode: INode = {
-	id: '2',
-	name: 'Node with no Credential ID',
-	typeVersion: 1,
-	type: '',
-	position: [0, 0],
-	credentials: {
-		test: {
-			id: null,
-			name: 'NOFIND',
-		},
-	},
-	parameters: {},
-};
-
-const notFoundNode: INode = {
-	id: '3',
-	name: 'Node that will not be found in the DB',
-	typeVersion: 1,
-	type: '',
-	position: [0, 0],
-	credentials: {
-		test: {
-			id: 'noDB',
-			name: 'Not in Database',
-		},
-	},
-	parameters: {},
-};
-
-const noCredentialsNode: INode = {
-	id: '4',
-	name: 'Node that has no credentials',
-	typeVersion: 1,
-	type: '',
-	position: [0, 0],
-	parameters: {},
-};
-
-// Reference this as a DataObject so I can provide a null credential for testing
-const multiCredNode: INode = {
-	id: '5',
-	name: 'Node that has mutliple credential elements',
-	typeVersion: 1,
-	type: '',
-	position: [0, 0],
-	credentials: {
-		mcTest: {
-			id: 'multicred#1',
-			name: 'First of Multiple Credentials',
-		},
-		mcTest2: {
-			id: 'multicred#2',
-			name: 'Second of Multiple Credentials',
-		},
-	},
-	parameters: {},
-};
diff --git a/packages/cli/test/unit/WorkflowExecuteAdditionalData.test.ts b/packages/cli/test/unit/WorkflowExecuteAdditionalData.test.ts
index 6007c0dd74b81..2984220637aae 100644
--- a/packages/cli/test/unit/WorkflowExecuteAdditionalData.test.ts
+++ b/packages/cli/test/unit/WorkflowExecuteAdditionalData.test.ts
@@ -1,41 +1,41 @@
-import { saveExecutionMetadata } from '@/WorkflowExecuteAdditionalData';
-import * as Db from '@/Db';
-import { mocked } from 'jest-mock';
-
-jest.mock('@/Db', () => {
-	return {
-		collections: {
-			ExecutionMetadata: {
-				save: jest.fn(async () => []),
-			},
-		},
-	};
-});
+import { VariablesService } from '@/environments/variables/variables.service.ee';
+import { mockInstance } from '../shared/mocking';
+import { MessageEventBus } from '@/eventbus/MessageEventBus/MessageEventBus';
+import { getBase } from '@/WorkflowExecuteAdditionalData';
+import Container from 'typedi';
+import { CredentialsHelper } from '@/CredentialsHelper';
+import { SecretsHelper } from '@/SecretsHelpers';
 
 describe('WorkflowExecuteAdditionalData', () => {
-	test('Execution metadata is saved in a batch', async () => {
-		const toSave = {
-			test1: 'value1',
-			test2: 'value2',
+	const messageEventBus = mockInstance(MessageEventBus);
+	const variablesService = mockInstance(VariablesService);
+	variablesService.getAllCached.mockResolvedValue([]);
+	const credentialsHelper = mockInstance(CredentialsHelper);
+	const secretsHelper = mockInstance(SecretsHelper);
+	Container.set(MessageEventBus, messageEventBus);
+	Container.set(VariablesService, variablesService);
+	Container.set(CredentialsHelper, credentialsHelper);
+	Container.set(SecretsHelper, secretsHelper);
+
+	test('logAiEvent should call MessageEventBus', async () => {
+		const additionalData = await getBase('user-id');
+
+		const eventName = 'n8n.ai.memory.get.messages';
+		const payload = {
+			msg: 'test message',
+			executionId: '123',
+			nodeName: 'n8n-memory',
+			workflowId: 'workflow-id',
+			workflowName: 'workflow-name',
+			nodeType: 'n8n-memory',
 		};
-		const executionId = '1234';
 
-		await saveExecutionMetadata(executionId, toSave);
+		await additionalData.logAiEvent(eventName, payload);
 
-		expect(mocked(Db.collections.ExecutionMetadata.save)).toHaveBeenCalledTimes(1);
-		expect(mocked(Db.collections.ExecutionMetadata.save).mock.calls[0]).toEqual([
-			[
-				{
-					execution: { id: executionId },
-					key: 'test1',
-					value: 'value1',
-				},
-				{
-					execution: { id: executionId },
-					key: 'test2',
-					value: 'value2',
-				},
-			],
-		]);
+		expect(messageEventBus.sendAiNodeEvent).toHaveBeenCalledTimes(1);
+		expect(messageEventBus.sendAiNodeEvent).toHaveBeenCalledWith({
+			eventName,
+			payload,
+		});
 	});
 });
diff --git a/packages/cli/test/unit/WorkflowHelpers.test.ts b/packages/cli/test/unit/WorkflowHelpers.test.ts
index 1f00375b63d3f..1b5da0a4de1bc 100644
--- a/packages/cli/test/unit/WorkflowHelpers.test.ts
+++ b/packages/cli/test/unit/WorkflowHelpers.test.ts
@@ -1,221 +1,46 @@
-import { INode, LoggerProxy } from 'n8n-workflow';
-import { WorkflowEntity } from '@db/entities/WorkflowEntity';
-import { CredentialsEntity } from '@db/entities/CredentialsEntity';
-import { getNodesWithInaccessibleCreds, validateWorkflowCredentialUsage } from '@/WorkflowHelpers';
-import { getLogger } from '@/Logger';
-
-const FIRST_CREDENTIAL_ID = '1';
-const SECOND_CREDENTIAL_ID = '2';
-const THIRD_CREDENTIAL_ID = '3';
-
-const NODE_WITH_NO_CRED = '0133467b-df4a-473d-9295-fdd9d01fa45a';
-const NODE_WITH_ONE_CRED = '4673f869-f2dc-4a33-b053-ca3193bc5226';
-const NODE_WITH_TWO_CRED = '9b4208bd-8f10-4a6a-ad3b-da47a326f7da';
-
-beforeAll(() => {
-	LoggerProxy.init(getLogger());
-});
+import { type Workflow } from 'n8n-workflow';
+import { getExecutionStartNode } from '@/WorkflowHelpers';
+import type { IWorkflowExecutionDataProcess } from '@/Interfaces';
 
 describe('WorkflowHelpers', () => {
-	describe('getNodesWithInaccessibleCreds', () => {
-		test('Should return an empty list for a workflow without nodes', () => {
-			const workflow = getWorkflow();
-			const nodesWithInaccessibleCreds = getNodesWithInaccessibleCreds(workflow, []);
-			expect(nodesWithInaccessibleCreds).toHaveLength(0);
-		});
-
-		test('Should return an empty list for a workflow with nodes without credentials', () => {
-			const workflow = getWorkflow({ addNodeWithoutCreds: true });
-			const nodesWithInaccessibleCreds = getNodesWithInaccessibleCreds(workflow, []);
-			expect(nodesWithInaccessibleCreds).toHaveLength(0);
-		});
-
-		test('Should return an element for a node with a credential without access', () => {
-			const workflow = getWorkflow({ addNodeWithOneCred: true });
-			const nodesWithInaccessibleCreds = getNodesWithInaccessibleCreds(workflow, []);
-			expect(nodesWithInaccessibleCreds).toHaveLength(1);
-		});
-
-		test('Should return an empty list for a node with a credential with access', () => {
-			const workflow = getWorkflow({ addNodeWithOneCred: true });
-			const nodesWithInaccessibleCreds = getNodesWithInaccessibleCreds(workflow, [
-				FIRST_CREDENTIAL_ID,
-			]);
-			expect(nodesWithInaccessibleCreds).toHaveLength(0);
-		});
-
-		test('Should return an element for a node with two credentials and mixed access', () => {
-			const workflow = getWorkflow({ addNodeWithTwoCreds: true });
-			const nodesWithInaccessibleCreds = getNodesWithInaccessibleCreds(workflow, [
-				SECOND_CREDENTIAL_ID,
-			]);
-			expect(nodesWithInaccessibleCreds).toHaveLength(1);
-		});
-
-		test('Should return one node for a workflow with two nodes and two credentials', () => {
-			const workflow = getWorkflow({ addNodeWithOneCred: true, addNodeWithTwoCreds: true });
-			const nodesWithInaccessibleCreds = getNodesWithInaccessibleCreds(workflow, [
-				SECOND_CREDENTIAL_ID,
-				THIRD_CREDENTIAL_ID,
-			]);
-			expect(nodesWithInaccessibleCreds).toHaveLength(1);
-		});
-
-		test('Should return one element for a workflows with two nodes and one credential', () => {
-			const workflow = getWorkflow({
-				addNodeWithoutCreds: true,
-				addNodeWithOneCred: true,
-				addNodeWithTwoCreds: true,
-			});
-			const nodesWithInaccessibleCreds = getNodesWithInaccessibleCreds(workflow, [
-				FIRST_CREDENTIAL_ID,
-			]);
-			expect(nodesWithInaccessibleCreds).toHaveLength(1);
-		});
-
-		test('Should return one element for a workflows with two nodes and partial credential access', () => {
-			const workflow = getWorkflow({ addNodeWithOneCred: true, addNodeWithTwoCreds: true });
-			const nodesWithInaccessibleCreds = getNodesWithInaccessibleCreds(workflow, [
-				FIRST_CREDENTIAL_ID,
-				SECOND_CREDENTIAL_ID,
-			]);
-			expect(nodesWithInaccessibleCreds).toHaveLength(1);
-		});
-
-		test('Should return two elements for a workflows with two nodes and partial credential access', () => {
-			const workflow = getWorkflow({ addNodeWithOneCred: true, addNodeWithTwoCreds: true });
-			const nodesWithInaccessibleCreds = getNodesWithInaccessibleCreds(workflow, [
-				SECOND_CREDENTIAL_ID,
-			]);
-			expect(nodesWithInaccessibleCreds).toHaveLength(2);
-		});
-
-		test('Should return two elements for a workflows with two nodes and no credential access', () => {
-			const workflow = getWorkflow({ addNodeWithOneCred: true, addNodeWithTwoCreds: true });
-			const nodesWithInaccessibleCreds = getNodesWithInaccessibleCreds(workflow, []);
-			expect(nodesWithInaccessibleCreds).toHaveLength(2);
-		});
-	});
-
-	describe('validateWorkflowCredentialUsage', () => {
-		it('Should throw error saving a workflow using credential without access', () => {
-			const newWorkflowVersion = getWorkflow({ addNodeWithOneCred: true });
-			const previousWorkflowVersion = getWorkflow();
-			expect(() => {
-				validateWorkflowCredentialUsage(newWorkflowVersion, previousWorkflowVersion, []);
-			}).toThrow();
-		});
-
-		it('Should not throw error when saving a workflow using credential with access', () => {
-			const newWorkflowVersion = getWorkflow({ addNodeWithOneCred: true });
-			const previousWorkflowVersion = getWorkflow();
-			expect(() => {
-				validateWorkflowCredentialUsage(newWorkflowVersion, previousWorkflowVersion, [
-					generateCredentialEntity(FIRST_CREDENTIAL_ID),
-				]);
-			}).not.toThrow();
-		});
-
-		it('Should not throw error when saving a workflow removing node without credential access', () => {
-			const newWorkflowVersion = getWorkflow();
-			const previousWorkflowVersion = getWorkflow({ addNodeWithOneCred: true });
-			expect(() => {
-				validateWorkflowCredentialUsage(newWorkflowVersion, previousWorkflowVersion, [
-					generateCredentialEntity(FIRST_CREDENTIAL_ID),
-				]);
-			}).not.toThrow();
-		});
-
-		it('Should save fine when not making changes to workflow without access', () => {
-			const workflowWithOneCredential = getWorkflow({ addNodeWithOneCred: true });
-			expect(() => {
-				validateWorkflowCredentialUsage(workflowWithOneCredential, workflowWithOneCredential, []);
-			}).not.toThrow();
-		});
-
-		it('Should throw error saving a workflow adding node without credential access', () => {
-			const newWorkflowVersion = getWorkflow({
-				addNodeWithOneCred: true,
-				addNodeWithTwoCreds: true,
+	describe('getExecutionStartNode', () => {
+		it('Should return undefined', () => {
+			const data = {
+				pinData: {},
+				startNodes: [],
+			} as unknown as IWorkflowExecutionDataProcess;
+			const workflow = {
+				getNode(nodeName: string) {
+					return {
+						name: nodeName,
+					};
+				},
+			} as unknown as Workflow;
+			const executionStartNode = getExecutionStartNode(data, workflow);
+			expect(executionStartNode).toBeUndefined();
+		});
+		it('Should return startNode', () => {
+			const data = {
+				pinData: {
+					node1: {},
+					node2: {},
+				},
+				startNodes: [{ name: 'node2' }],
+			} as unknown as IWorkflowExecutionDataProcess;
+			const workflow = {
+				getNode(nodeName: string) {
+					if (nodeName === 'node2') {
+						return {
+							name: 'node2',
+						};
+					}
+					return undefined;
+				},
+			} as unknown as Workflow;
+			const executionStartNode = getExecutionStartNode(data, workflow);
+			expect(executionStartNode).toEqual({
+				name: 'node2',
 			});
-			const previousWorkflowVersion = getWorkflow({ addNodeWithOneCred: true });
-			expect(() => {
-				validateWorkflowCredentialUsage(newWorkflowVersion, previousWorkflowVersion, []);
-			}).toThrow();
 		});
 	});
 });
-
-function generateCredentialEntity(credentialId: string) {
-	const credentialEntity = new CredentialsEntity();
-	credentialEntity.id = credentialId;
-	return credentialEntity;
-}
-
-function getWorkflow(options?: {
-	addNodeWithoutCreds?: boolean;
-	addNodeWithOneCred?: boolean;
-	addNodeWithTwoCreds?: boolean;
-}) {
-	const workflow = new WorkflowEntity();
-
-	workflow.nodes = [];
-
-	if (options?.addNodeWithoutCreds) {
-		workflow.nodes.push(nodeWithNoCredentials);
-	}
-
-	if (options?.addNodeWithOneCred) {
-		workflow.nodes.push(nodeWithOneCredential);
-	}
-
-	if (options?.addNodeWithTwoCreds) {
-		workflow.nodes.push(nodeWithTwoCredentials);
-	}
-
-	return workflow;
-}
-
-const nodeWithNoCredentials: INode = {
-	id: NODE_WITH_NO_CRED,
-	name: 'Node with no Credential',
-	typeVersion: 1,
-	type: 'n8n-nodes-base.fakeNode',
-	position: [0, 0],
-	credentials: {},
-	parameters: {},
-};
-
-const nodeWithOneCredential: INode = {
-	id: NODE_WITH_ONE_CRED,
-	name: 'Node with a single credential',
-	typeVersion: 1,
-	type: '',
-	position: [0, 0],
-	credentials: {
-		test: {
-			id: FIRST_CREDENTIAL_ID,
-			name: 'First fake credential',
-		},
-	},
-	parameters: {},
-};
-
-const nodeWithTwoCredentials: INode = {
-	id: NODE_WITH_TWO_CRED,
-	name: 'Node with two credentials',
-	typeVersion: 1,
-	type: '',
-	position: [0, 0],
-	credentials: {
-		mcTest: {
-			id: SECOND_CREDENTIAL_ID,
-			name: 'Second fake credential',
-		},
-		mcTest2: {
-			id: THIRD_CREDENTIAL_ID,
-			name: 'Third fake credential',
-		},
-	},
-	parameters: {},
-};
diff --git a/packages/cli/test/unit/WorkflowRunner.test.ts b/packages/cli/test/unit/WorkflowRunner.test.ts
new file mode 100644
index 0000000000000..72f3da9fd2d98
--- /dev/null
+++ b/packages/cli/test/unit/WorkflowRunner.test.ts
@@ -0,0 +1,80 @@
+import Container from 'typedi';
+import { WorkflowHooks, type ExecutionError, type IWorkflowExecuteHooks } from 'n8n-workflow';
+import type { User } from '@db/entities/User';
+import { WorkflowRunner } from '@/WorkflowRunner';
+import config from '@/config';
+
+import * as testDb from '../integration/shared/testDb';
+import { setupTestServer } from '../integration/shared/utils';
+import { createUser } from '../integration/shared/db/users';
+import { createWorkflow } from '../integration/shared/db/workflows';
+import { createExecution } from '../integration/shared/db/executions';
+
+let owner: User;
+let runner: WorkflowRunner;
+let hookFunctions: IWorkflowExecuteHooks;
+setupTestServer({ endpointGroups: [] });
+
+class Watchers {
+	workflowExecuteAfter = jest.fn();
+}
+const watchers = new Watchers();
+const watchedWorkflowExecuteAfter = jest.spyOn(watchers, 'workflowExecuteAfter');
+
+beforeAll(async () => {
+	owner = await createUser({ role: 'global:owner' });
+
+	runner = Container.get(WorkflowRunner);
+
+	hookFunctions = {
+		workflowExecuteAfter: [watchers.workflowExecuteAfter],
+	};
+});
+
+afterAll(() => {
+	jest.restoreAllMocks();
+});
+
+beforeEach(async () => {
+	await testDb.truncate(['Workflow', 'SharedWorkflow']);
+});
+
+test('processError should return early in Bull stalled edge case', async () => {
+	const workflow = await createWorkflow({}, owner);
+	const execution = await createExecution(
+		{
+			status: 'success',
+			finished: true,
+		},
+		workflow,
+	);
+	config.set('executions.mode', 'queue');
+	await runner.processError(
+		new Error('test') as ExecutionError,
+		new Date(),
+		'webhook',
+		execution.id,
+		new WorkflowHooks(hookFunctions, 'webhook', execution.id, workflow),
+	);
+	expect(watchedWorkflowExecuteAfter).toHaveBeenCalledTimes(0);
+});
+
+test('processError should process error', async () => {
+	const workflow = await createWorkflow({}, owner);
+	const execution = await createExecution(
+		{
+			status: 'success',
+			finished: true,
+		},
+		workflow,
+	);
+	config.set('executions.mode', 'regular');
+	await runner.processError(
+		new Error('test') as ExecutionError,
+		new Date(),
+		'webhook',
+		execution.id,
+		new WorkflowHooks(hookFunctions, 'webhook', execution.id, workflow),
+	);
+	expect(watchedWorkflowExecuteAfter).toHaveBeenCalledTimes(1);
+});
diff --git a/packages/cli/test/unit/auth/auth.service.test.ts b/packages/cli/test/unit/auth/auth.service.test.ts
new file mode 100644
index 0000000000000..60fdd121266db
--- /dev/null
+++ b/packages/cli/test/unit/auth/auth.service.test.ts
@@ -0,0 +1,305 @@
+import jwt from 'jsonwebtoken';
+import { mock } from 'jest-mock-extended';
+import type { NextFunction, Response } from 'express';
+
+import { AuthService } from '@/auth/auth.service';
+import config from '@/config';
+import { AUTH_COOKIE_NAME, Time } from '@/constants';
+import type { User } from '@db/entities/User';
+import type { UserRepository } from '@db/repositories/user.repository';
+import { JwtService } from '@/services/jwt.service';
+import type { UrlService } from '@/services/url.service';
+import type { AuthenticatedRequest } from '@/requests';
+
+describe('AuthService', () => {
+	config.set('userManagement.jwtSecret', 'random-secret');
+
+	const browserId = 'test-browser-id';
+	const userData = {
+		id: '123',
+		email: 'test@example.com',
+		password: 'passwordHash',
+		disabled: false,
+		mfaEnabled: false,
+	};
+	const user = mock<User>(userData);
+	const jwtService = new JwtService(mock());
+	const urlService = mock<UrlService>();
+	const userRepository = mock<UserRepository>();
+	const authService = new AuthService(mock(), mock(), jwtService, urlService, userRepository);
+
+	const now = new Date('2024-02-01T01:23:45.678Z');
+	jest.useFakeTimers({ now });
+
+	const validToken =
+		'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IjEyMyIsImhhc2giOiJtSkFZeDRXYjdrIiwiYnJvd3NlcklkIjoiOFpDVXE1YU1uSFhnMFZvcURLcm9hMHNaZ0NwdWlPQ1AzLzB2UmZKUXU0MD0iLCJpYXQiOjE3MDY3NTA2MjUsImV4cCI6MTcwNzM1NTQyNX0.YE-ZGGIQRNQ4DzUe9rjXvOOFFN9ufU34WibsCxAsc4o'; // Generated using `authService.issueJWT(user, browserId)`
+
+	beforeEach(() => {
+		jest.clearAllMocks();
+		jest.setSystemTime(now);
+		config.set('userManagement.jwtSessionDurationHours', 168);
+		config.set('userManagement.jwtRefreshTimeoutHours', 0);
+	});
+
+	describe('createJWTHash', () => {
+		it('should generate unique hashes', () => {
+			expect(authService.createJWTHash(user)).toEqual('mJAYx4Wb7k');
+			expect(
+				authService.createJWTHash(mock<User>({ email: user.email, password: 'newPasswordHash' })),
+			).toEqual('FVALtU7AE0');
+			expect(
+				authService.createJWTHash(
+					mock<User>({ email: 'test1@example.com', password: user.password }),
+				),
+			).toEqual('y8ha6X01jd');
+		});
+	});
+
+	describe('authMiddleware', () => {
+		const req = mock<AuthenticatedRequest>({
+			cookies: {},
+			user: undefined,
+			browserId,
+		});
+		const res = mock<Response>();
+		const next = jest.fn() as NextFunction;
+
+		beforeEach(() => {
+			res.status.mockReturnThis();
+		});
+
+		it('should 401 if no cookie is set', async () => {
+			req.cookies[AUTH_COOKIE_NAME] = undefined;
+			await authService.authMiddleware(req, res, next);
+			expect(next).not.toHaveBeenCalled();
+			expect(res.status).toHaveBeenCalledWith(401);
+		});
+
+		it('should 401 and clear the cookie if the JWT is expired', async () => {
+			req.cookies[AUTH_COOKIE_NAME] = validToken;
+			jest.advanceTimersByTime(365 * Time.days.toMilliseconds);
+
+			await authService.authMiddleware(req, res, next);
+			expect(next).not.toHaveBeenCalled();
+			expect(res.status).toHaveBeenCalledWith(401);
+			expect(res.clearCookie).toHaveBeenCalledWith(AUTH_COOKIE_NAME);
+		});
+
+		it('should refresh the cookie before it expires', async () => {
+			req.cookies[AUTH_COOKIE_NAME] = validToken;
+			jest.advanceTimersByTime(6 * Time.days.toMilliseconds);
+			userRepository.findOne.mockResolvedValue(user);
+
+			await authService.authMiddleware(req, res, next);
+			expect(next).toHaveBeenCalled();
+			expect(res.cookie).toHaveBeenCalledWith('n8n-auth', expect.any(String), {
+				httpOnly: true,
+				maxAge: 604800000,
+				sameSite: 'lax',
+				secure: false,
+			});
+		});
+	});
+
+	describe('issueJWT', () => {
+		describe('when not setting userManagement.jwtSessionDuration', () => {
+			it('should default to expire in 7 days', () => {
+				const defaultInSeconds = 7 * Time.days.toSeconds;
+				const token = authService.issueJWT(user, browserId);
+
+				expect(authService.jwtExpiration).toBe(defaultInSeconds);
+				const decodedToken = jwtService.verify(token);
+				if (decodedToken.exp === undefined || decodedToken.iat === undefined) {
+					fail('Expected exp and iat to be defined');
+				}
+
+				expect(decodedToken.exp - decodedToken.iat).toBe(defaultInSeconds);
+			});
+		});
+
+		describe('when setting userManagement.jwtSessionDuration', () => {
+			const testDurationHours = 1;
+			const testDurationSeconds = testDurationHours * Time.hours.toSeconds;
+
+			it('should apply it to tokens', () => {
+				config.set('userManagement.jwtSessionDurationHours', testDurationHours);
+				const token = authService.issueJWT(user, browserId);
+
+				const decodedToken = jwtService.verify(token);
+				if (decodedToken.exp === undefined || decodedToken.iat === undefined) {
+					fail('Expected exp and iat to be defined on decodedToken');
+				}
+				expect(decodedToken.exp - decodedToken.iat).toBe(testDurationSeconds);
+			});
+		});
+	});
+
+	describe('resolveJwt', () => {
+		const req = mock<AuthenticatedRequest>({
+			cookies: {},
+			user: undefined,
+			browserId,
+		});
+		const res = mock<Response>();
+
+		it('should throw on invalid tokens', async () => {
+			await expect(authService.resolveJwt('random-string', req, res)).rejects.toThrow(
+				'jwt malformed',
+			);
+			expect(res.cookie).not.toHaveBeenCalled();
+		});
+
+		it('should throw on expired tokens', async () => {
+			jest.advanceTimersByTime(365 * Time.days.toMilliseconds);
+
+			await expect(authService.resolveJwt(validToken, req, res)).rejects.toThrow('jwt expired');
+			expect(res.cookie).not.toHaveBeenCalled();
+		});
+
+		it('should throw on tampered tokens', async () => {
+			const [header, payload, signature] = validToken.split('.');
+			const tamperedToken = [header, payload, signature + '123'].join('.');
+			await expect(authService.resolveJwt(tamperedToken, req, res)).rejects.toThrow(
+				'invalid signature',
+			);
+			expect(res.cookie).not.toHaveBeenCalled();
+		});
+
+		it('should throw on hijacked tokens', async () => {
+			userRepository.findOne.mockResolvedValue(user);
+			const req = mock<AuthenticatedRequest>({ browserId: 'another-browser' });
+			await expect(authService.resolveJwt(validToken, req, res)).rejects.toThrow('Unauthorized');
+			expect(res.cookie).not.toHaveBeenCalled();
+		});
+
+		test.each([
+			['no user is found', null],
+			['the user is disabled', { ...userData, disabled: true }],
+			[
+				'user password does not match the one on the token',
+				{ ...userData, password: 'something else' },
+			],
+			[
+				'user email does not match the one on the token',
+				{ ...userData, email: 'someone@example.com' },
+			],
+		])('should throw if %s', async (_, data) => {
+			userRepository.findOne.mockResolvedValueOnce(data && mock<User>(data));
+			await expect(authService.resolveJwt(validToken, req, res)).rejects.toThrow('Unauthorized');
+			expect(res.cookie).not.toHaveBeenCalled();
+		});
+
+		it('should refresh the cookie before it expires', async () => {
+			userRepository.findOne.mockResolvedValue(user);
+			expect(await authService.resolveJwt(validToken, req, res)).toEqual(user);
+			expect(res.cookie).not.toHaveBeenCalled();
+
+			jest.advanceTimersByTime(6 * Time.days.toMilliseconds); // 6 Days
+			expect(await authService.resolveJwt(validToken, req, res)).toEqual(user);
+			expect(res.cookie).toHaveBeenCalledWith('n8n-auth', expect.any(String), {
+				httpOnly: true,
+				maxAge: 604800000,
+				sameSite: 'lax',
+				secure: false,
+			});
+
+			const newToken = res.cookie.mock.calls[0].at(1);
+			expect(newToken).not.toBe(validToken);
+			expect(await authService.resolveJwt(newToken, req, res)).toEqual(user);
+			expect((jwt.decode(newToken) as jwt.JwtPayload).browserId).toEqual(
+				(jwt.decode(validToken) as jwt.JwtPayload).browserId,
+			);
+		});
+
+		it('should refresh the cookie only if less than 1/4th of time is left', async () => {
+			userRepository.findOne.mockResolvedValue(user);
+			expect(await authService.resolveJwt(validToken, req, res)).toEqual(user);
+			expect(res.cookie).not.toHaveBeenCalled();
+
+			jest.advanceTimersByTime(5 * Time.days.toMilliseconds);
+			expect(await authService.resolveJwt(validToken, req, res)).toEqual(user);
+			expect(res.cookie).not.toHaveBeenCalled();
+
+			jest.advanceTimersByTime(1 * Time.days.toMilliseconds);
+			expect(await authService.resolveJwt(validToken, req, res)).toEqual(user);
+			expect(res.cookie).toHaveBeenCalled();
+		});
+
+		it('should not refresh the cookie if jwtRefreshTimeoutHours is set to -1', async () => {
+			config.set('userManagement.jwtRefreshTimeoutHours', -1);
+
+			userRepository.findOne.mockResolvedValue(user);
+			expect(await authService.resolveJwt(validToken, req, res)).toEqual(user);
+			expect(res.cookie).not.toHaveBeenCalled();
+
+			jest.advanceTimersByTime(6 * Time.days.toMilliseconds); // 6 Days
+			expect(await authService.resolveJwt(validToken, req, res)).toEqual(user);
+			expect(res.cookie).not.toHaveBeenCalled();
+		});
+	});
+
+	describe('generatePasswordResetUrl', () => {
+		it('should generate a valid url', () => {
+			urlService.getInstanceBaseUrl.mockReturnValue('https://n8n.instance');
+			const url = authService.generatePasswordResetUrl(user);
+			expect(url).toEqual(
+				'https://n8n.instance/change-password?token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjMiLCJoYXNoIjoibUpBWXg0V2I3ayIsImlhdCI6MTcwNjc1MDYyNSwiZXhwIjoxNzA2NzUxODI1fQ.rg90I7MKjc_KC77mov59XYAeRc-CoW9ka4mt1dCfrnk&mfaEnabled=false',
+			);
+		});
+	});
+
+	describe('generatePasswordResetToken', () => {
+		it('should generate valid password-reset tokens', () => {
+			const token = authService.generatePasswordResetToken(user);
+
+			const decoded = jwt.decode(token) as jwt.JwtPayload;
+
+			if (!decoded.exp) fail('Token does not contain expiry');
+			if (!decoded.iat) fail('Token does not contain issued-at');
+
+			expect(decoded.sub).toEqual(user.id);
+			expect(decoded.exp - decoded.iat).toEqual(1200); // Expires in 20 minutes
+			expect(decoded.hash).toEqual('mJAYx4Wb7k');
+		});
+	});
+
+	describe('resolvePasswordResetToken', () => {
+		it('should not return a user if the token in invalid', async () => {
+			const resolvedUser = await authService.resolvePasswordResetToken('invalid-token');
+			expect(resolvedUser).toBeUndefined();
+		});
+
+		it('should not return a user if the token in expired', async () => {
+			const token = authService.generatePasswordResetToken(user, '-1h');
+
+			const resolvedUser = await authService.resolvePasswordResetToken(token);
+			expect(resolvedUser).toBeUndefined();
+		});
+
+		it('should not return a user if the user does not exist in the DB', async () => {
+			userRepository.findOne.mockResolvedValueOnce(null);
+			const token = authService.generatePasswordResetToken(user);
+
+			const resolvedUser = await authService.resolvePasswordResetToken(token);
+			expect(resolvedUser).toBeUndefined();
+		});
+
+		it('should not return a user if the password sha does not match', async () => {
+			const token = authService.generatePasswordResetToken(user);
+			const updatedUser = Object.create(user);
+			updatedUser.password = 'something-else';
+			userRepository.findOne.mockResolvedValueOnce(updatedUser);
+
+			const resolvedUser = await authService.resolvePasswordResetToken(token);
+			expect(resolvedUser).toBeUndefined();
+		});
+
+		it('should not return the user if all checks pass', async () => {
+			const token = authService.generatePasswordResetToken(user);
+			userRepository.findOne.mockResolvedValueOnce(user);
+
+			const resolvedUser = await authService.resolvePasswordResetToken(token);
+			expect(resolvedUser).toEqual(user);
+		});
+	});
+});
diff --git a/packages/cli/test/unit/collaboration/collaboration.service.test.ts b/packages/cli/test/unit/collaboration/collaboration.service.test.ts
new file mode 100644
index 0000000000000..bb9041b3b629d
--- /dev/null
+++ b/packages/cli/test/unit/collaboration/collaboration.service.test.ts
@@ -0,0 +1,151 @@
+import { CollaborationService } from '@/collaboration/collaboration.service';
+import type { Logger } from '@/Logger';
+import type { User } from '@db/entities/User';
+import type { UserService } from '@/services/user.service';
+import { CollaborationState } from '@/collaboration/collaboration.state';
+import type { Push } from '@/push';
+import type {
+	WorkflowClosedMessage,
+	WorkflowOpenedMessage,
+} from '@/collaboration/collaboration.message';
+import type { UserRepository } from '@/databases/repositories/user.repository';
+import { mock } from 'jest-mock-extended';
+
+describe('CollaborationService', () => {
+	let collaborationService: CollaborationService;
+	let mockLogger: Logger;
+	let mockUserService: jest.Mocked<UserService>;
+	let mockUserRepository: jest.Mocked<UserRepository>;
+	let state: CollaborationState;
+	let push: Push;
+
+	beforeEach(() => {
+		mockLogger = mock<Logger>();
+		mockUserService = mock<UserService>();
+		mockUserRepository = mock<UserRepository>();
+		push = mock<Push>();
+		state = new CollaborationState();
+
+		collaborationService = new CollaborationService(
+			mockLogger,
+			push,
+			state,
+			mockUserService,
+			mockUserRepository,
+		);
+	});
+
+	describe('workflow opened message', () => {
+		const userId = 'test-user';
+		const workflowId = 'test-workflow';
+
+		const message: WorkflowOpenedMessage = {
+			type: 'workflowOpened',
+			workflowId,
+		};
+
+		const expectActiveUsersChangedMessage = (userIds: string[]) => {
+			expect(push.sendToUsers).toHaveBeenCalledWith(
+				'activeWorkflowUsersChanged',
+				{
+					workflowId,
+					activeUsers: [
+						{
+							user: { id: userId },
+							lastSeen: expect.any(Date),
+						},
+					],
+				},
+				[userId],
+			);
+		};
+
+		describe('user is not yet active', () => {
+			it('updates state correctly', async () => {
+				mockUserRepository.getByIds.mockResolvedValueOnce([{ id: userId } as User]);
+				await collaborationService.handleUserMessage(userId, message);
+
+				expect(state.getActiveWorkflowUsers(workflowId)).toEqual([
+					{
+						lastSeen: expect.any(Date),
+						userId,
+					},
+				]);
+			});
+
+			it('sends active workflow users changed message', async () => {
+				mockUserRepository.getByIds.mockResolvedValueOnce([{ id: userId } as User]);
+				await collaborationService.handleUserMessage(userId, message);
+
+				expectActiveUsersChangedMessage([userId]);
+			});
+		});
+
+		describe('user is already active', () => {
+			beforeEach(() => {
+				state.addActiveWorkflowUser(workflowId, userId);
+			});
+
+			it('updates state correctly', async () => {
+				mockUserRepository.getByIds.mockResolvedValueOnce([{ id: userId } as User]);
+				await collaborationService.handleUserMessage(userId, message);
+
+				expect(state.getActiveWorkflowUsers(workflowId)).toEqual([
+					{
+						lastSeen: expect.any(Date),
+						userId,
+					},
+				]);
+			});
+
+			it('sends active workflow users changed message', async () => {
+				mockUserRepository.getByIds.mockResolvedValueOnce([{ id: userId } as User]);
+				await collaborationService.handleUserMessage(userId, message);
+
+				expectActiveUsersChangedMessage([userId]);
+			});
+		});
+	});
+
+	describe('workflow closed message', () => {
+		const userId = 'test-user';
+		const workflowId = 'test-workflow';
+
+		const message: WorkflowClosedMessage = {
+			type: 'workflowClosed',
+			workflowId,
+		};
+
+		describe('user is active', () => {
+			beforeEach(() => {
+				state.addActiveWorkflowUser(workflowId, userId);
+			});
+
+			it('updates state correctly', async () => {
+				await collaborationService.handleUserMessage(userId, message);
+
+				expect(state.getActiveWorkflowUsers(workflowId)).toEqual([]);
+			});
+
+			it('does not send active workflow users changed message', async () => {
+				await collaborationService.handleUserMessage(userId, message);
+
+				expect(push.sendToUsers).not.toHaveBeenCalled();
+			});
+		});
+
+		describe('user is not active', () => {
+			it('updates state correctly', async () => {
+				await collaborationService.handleUserMessage(userId, message);
+
+				expect(state.getActiveWorkflowUsers(workflowId)).toEqual([]);
+			});
+
+			it('does not send active workflow users changed message', async () => {
+				await collaborationService.handleUserMessage(userId, message);
+
+				expect(push.sendToUsers).not.toHaveBeenCalled();
+			});
+		});
+	});
+});
diff --git a/packages/cli/test/unit/collaboration/collaboration.state.test.ts b/packages/cli/test/unit/collaboration/collaboration.state.test.ts
new file mode 100644
index 0000000000000..b390bf9ad98b8
--- /dev/null
+++ b/packages/cli/test/unit/collaboration/collaboration.state.test.ts
@@ -0,0 +1,61 @@
+import { TIME } from '@/constants';
+import { CollaborationState } from '@/collaboration/collaboration.state';
+
+const origDate = global.Date;
+
+const mockDateFactory = (currentDate: string) => {
+	return class CustomDate extends origDate {
+		constructor() {
+			super(currentDate);
+		}
+	} as DateConstructor;
+};
+
+describe('CollaborationState', () => {
+	let collaborationState: CollaborationState;
+
+	beforeEach(() => {
+		collaborationState = new CollaborationState();
+	});
+
+	describe('cleanInactiveUsers', () => {
+		const workflowId = 'workflow';
+
+		it('should remove inactive users', () => {
+			// Setup
+			global.Date = mockDateFactory('2023-01-01T00:00:00.000Z');
+			collaborationState.addActiveWorkflowUser(workflowId, 'inactiveUser');
+
+			global.Date = mockDateFactory('2023-01-01T00:30:00.000Z');
+			collaborationState.addActiveWorkflowUser(workflowId, 'activeUser');
+
+			// Act: Clean inactive users
+			jest
+				.spyOn(global.Date, 'now')
+				.mockReturnValue(new origDate('2023-01-01T00:35:00.000Z').getTime());
+			collaborationState.cleanInactiveUsers(workflowId, 10 * TIME.MINUTE);
+
+			// Assert: The inactive user should be removed
+			expect(collaborationState.getActiveWorkflowUsers(workflowId)).toEqual([
+				{ userId: 'activeUser', lastSeen: new origDate('2023-01-01T00:30:00.000Z') },
+			]);
+		});
+
+		it('should not remove active users', () => {
+			// Setup: Add an active user to the state
+			global.Date = mockDateFactory('2023-01-01T00:30:00.000Z');
+			collaborationState.addActiveWorkflowUser(workflowId, 'activeUser');
+
+			// Act: Clean inactive users
+			jest
+				.spyOn(global.Date, 'now')
+				.mockReturnValue(new origDate('2023-01-01T00:35:00.000Z').getTime());
+			collaborationState.cleanInactiveUsers(workflowId, 10 * TIME.MINUTE);
+
+			// Assert: The active user should still be present
+			expect(collaborationState.getActiveWorkflowUsers(workflowId)).toEqual([
+				{ userId: 'activeUser', lastSeen: new origDate('2023-01-01T00:30:00.000Z') },
+			]);
+		});
+	});
+});
diff --git a/packages/cli/test/unit/commands/db/revert.test.ts b/packages/cli/test/unit/commands/db/revert.test.ts
new file mode 100644
index 0000000000000..d58e132607e5e
--- /dev/null
+++ b/packages/cli/test/unit/commands/db/revert.test.ts
@@ -0,0 +1,134 @@
+import { main } from '@/commands/db/revert';
+import { mockInstance } from '../../../shared/mocking';
+import { Logger } from '@/Logger';
+import * as DbConfig from '@db/config';
+import type { IrreversibleMigration, ReversibleMigration } from '@/databases/types';
+import type { DataSource } from '@n8n/typeorm';
+import { mock } from 'jest-mock-extended';
+
+const logger = mockInstance(Logger);
+
+afterEach(() => {
+	jest.resetAllMocks();
+});
+
+test("don't revert migrations if there is no migration", async () => {
+	//
+	// ARRANGE
+	//
+	const connectionOptions = DbConfig.getConnectionOptions();
+	// @ts-expect-error property is readonly
+	connectionOptions.migrations = [];
+	const dataSource = mock<DataSource>({ migrations: [] });
+
+	//
+	// ACT
+	//
+	await main(connectionOptions, logger, function () {
+		return dataSource;
+	} as never);
+
+	//
+	// ASSERT
+	//
+	expect(logger.error).toHaveBeenCalledTimes(1);
+	expect(logger.error).toHaveBeenCalledWith('There is no migration to reverse.');
+	expect(dataSource.undoLastMigration).not.toHaveBeenCalled();
+	expect(dataSource.destroy).not.toHaveBeenCalled();
+});
+
+test("don't revert the last migration if it had no down migration", async () => {
+	//
+	// ARRANGE
+	//
+	class TestMigration implements IrreversibleMigration {
+		async up() {}
+	}
+
+	const connectionOptions = DbConfig.getConnectionOptions();
+	const migrations = [TestMigration];
+	// @ts-expect-error property is readonly
+	connectionOptions.migrations = migrations;
+	const dataSource = mock<DataSource>();
+	// @ts-expect-error property is readonly, and I can't pass them the `mock`
+	// because `mock` will mock the down method and thus defeat the purpose
+	// of this test, because the tested code will assume that the migration has a
+	// down method.
+	dataSource.migrations = migrations.map((M) => new M());
+
+	//
+	// ACT
+	//
+	await main(connectionOptions, logger, function () {
+		return dataSource;
+	} as never);
+
+	//
+	// ASSERT
+	//
+	expect(logger.error).toHaveBeenCalledTimes(1);
+	expect(logger.error).toHaveBeenCalledWith(
+		'The last migration was irreversible and cannot be reverted.',
+	);
+	expect(dataSource.undoLastMigration).not.toHaveBeenCalled();
+	expect(dataSource.destroy).not.toHaveBeenCalled();
+});
+
+test('revert the last migration if it has a down migration', async () => {
+	//
+	// ARRANGE
+	//
+	class TestMigration implements ReversibleMigration {
+		async up() {}
+
+		async down() {}
+	}
+
+	const connectionOptions = DbConfig.getConnectionOptions();
+	// @ts-expect-error property is readonly
+	connectionOptions.migrations = [TestMigration];
+	const dataSource = mock<DataSource>({ migrations: [new TestMigration()] });
+
+	//
+	// ACT
+	//
+	await main(connectionOptions, logger, function () {
+		return dataSource;
+	} as never);
+
+	//
+	// ASSERT
+	//
+	expect(logger.error).not.toHaveBeenCalled();
+	expect(dataSource.undoLastMigration).toHaveBeenCalled();
+	expect(dataSource.destroy).toHaveBeenCalled();
+});
+
+test('throw if a migration is invalid, e.g. has no `up` method', async () => {
+	//
+	// ARRANGE
+	//
+	class TestMigration {}
+
+	const connectionOptions = DbConfig.getConnectionOptions();
+	// @ts-expect-error property is readonly
+	connectionOptions.migrations = [TestMigration];
+	const dataSource = mock<DataSource>({ migrations: [new TestMigration()] });
+
+	//
+	// ACT
+	//
+	await expect(
+		main(connectionOptions, logger, function () {
+			return dataSource;
+		} as never),
+	).rejects.toThrowError(
+		'At least on migration is missing the method `up`. Make sure all migrations are valid.',
+	);
+
+	//
+	// ASSERT
+	//
+	expect(dataSource.undoLastMigration).not.toHaveBeenCalled();
+	expect(dataSource.destroy).not.toHaveBeenCalled();
+});
diff --git a/packages/cli/test/unit/config/index.test.ts b/packages/cli/test/unit/config/index.test.ts
new file mode 100644
index 0000000000000..d49a4e0a3c3ef
--- /dev/null
+++ b/packages/cli/test/unit/config/index.test.ts
@@ -0,0 +1,9 @@
+describe('userManagement.jwtRefreshTimeoutHours', () => {
+	it("resets jwtRefreshTimeoutHours to 0 if it's greater than or equal to jwtSessionDurationHours", async () => {
+		process.env.N8N_USER_MANAGEMENT_JWT_DURATION_HOURS = '1';
+		process.env.N8N_USER_MANAGEMENT_JWT_REFRESH_TIMEOUT_HOURS = '1';
+		const { default: config } = await import('@/config');
+
+		expect(config.getEnv('userManagement.jwtRefreshTimeoutHours')).toBe(0);
+	});
+});
diff --git a/packages/cli/test/unit/controllers/executions.controller.test.ts b/packages/cli/test/unit/controllers/executions.controller.test.ts
new file mode 100644
index 0000000000000..06c64e1c18893
--- /dev/null
+++ b/packages/cli/test/unit/controllers/executions.controller.test.ts
@@ -0,0 +1,145 @@
+import { mock } from 'jest-mock-extended';
+import { NotFoundError } from '@/errors/response-errors/not-found.error';
+import { ExecutionsController } from '@/executions/executions.controller';
+import type { ExecutionRequest, ExecutionSummaries } from '@/executions/execution.types';
+import type { ExecutionService } from '@/executions/execution.service';
+import type { WorkflowSharingService } from '@/workflows/workflowSharing.service';
+
+describe('ExecutionsController', () => {
+	const executionService = mock<ExecutionService>();
+	const workflowSharingService = mock<WorkflowSharingService>();
+
+	const executionsController = new ExecutionsController(
+		executionService,
+		mock(),
+		workflowSharingService,
+		mock(),
+	);
+
+	beforeEach(() => {
+		jest.clearAllMocks();
+	});
+
+	describe('getMany', () => {
+		const NO_EXECUTIONS = { count: 0, estimated: false, results: [] };
+
+		const QUERIES_WITH_EITHER_STATUS_OR_RANGE: ExecutionSummaries.RangeQuery[] = [
+			{
+				kind: 'range',
+				workflowId: undefined,
+				status: undefined,
+				range: { lastId: '999', firstId: '111', limit: 20 },
+			},
+			{
+				kind: 'range',
+				workflowId: undefined,
+				status: [],
+				range: { lastId: '999', firstId: '111', limit: 20 },
+			},
+			{
+				kind: 'range',
+				workflowId: undefined,
+				status: ['waiting'],
+				range: { lastId: undefined, firstId: undefined, limit: 20 },
+			},
+			{
+				kind: 'range',
+				workflowId: undefined,
+				status: [],
+				range: { lastId: '999', firstId: '111', limit: 20 },
+			},
+		];
+
+		const QUERIES_NEITHER_STATUS_NOR_RANGE_PROVIDED: ExecutionSummaries.RangeQuery[] = [
+			{
+				kind: 'range',
+				workflowId: undefined,
+				status: undefined,
+				range: { lastId: undefined, firstId: undefined, limit: 20 },
+			},
+			{
+				kind: 'range',
+				workflowId: undefined,
+				status: [],
+				range: { lastId: undefined, firstId: undefined, limit: 20 },
+			},
+		];
+
+		describe('if either status or range provided', () => {
+			test.each(QUERIES_WITH_EITHER_STATUS_OR_RANGE)(
+				'should fetch executions per query',
+				async (rangeQuery) => {
+					workflowSharingService.getSharedWorkflowIds.mockResolvedValue(['123']);
+					executionService.findAllRunningAndLatest.mockResolvedValue(NO_EXECUTIONS);
+
+					const req = mock<ExecutionRequest.GetMany>({ rangeQuery });
+
+					await executionsController.getMany(req);
+
+					expect(executionService.findAllRunningAndLatest).not.toHaveBeenCalled();
+					expect(executionService.findRangeWithCount).toHaveBeenCalledWith(rangeQuery);
+				},
+			);
+		});
+
+		describe('if neither status nor range provided', () => {
+			test.each(QUERIES_NEITHER_STATUS_NOR_RANGE_PROVIDED)(
+				'should fetch executions per query',
+				async (rangeQuery) => {
+					workflowSharingService.getSharedWorkflowIds.mockResolvedValue(['123']);
+					executionService.findAllRunningAndLatest.mockResolvedValue(NO_EXECUTIONS);
+
+					const req = mock<ExecutionRequest.GetMany>({ rangeQuery });
+
+					await executionsController.getMany(req);
+
+					expect(executionService.findAllRunningAndLatest).toHaveBeenCalled();
+					expect(executionService.findRangeWithCount).not.toHaveBeenCalled();
+				},
+			);
+		});
+
+		describe('if both status and range provided', () => {
+			it('should fetch executions per query', async () => {
+				workflowSharingService.getSharedWorkflowIds.mockResolvedValue(['123']);
+				executionService.findAllRunningAndLatest.mockResolvedValue(NO_EXECUTIONS);
+
+				const rangeQuery: ExecutionSummaries.RangeQuery = {
+					kind: 'range',
+					workflowId: undefined,
+					status: ['success'],
+					range: { lastId: '999', firstId: '111', limit: 5 },
+				};
+
+				const req = mock<ExecutionRequest.GetMany>({ rangeQuery });
+
+				await executionsController.getMany(req);
+
+				expect(executionService.findAllRunningAndLatest).not.toHaveBeenCalled();
+				expect(executionService.findRangeWithCount).toHaveBeenCalledWith(rangeQuery);
+			});
+		});
+	});
+
+	describe('stop', () => {
+		const executionId = '999';
+		const req = mock<ExecutionRequest.Stop>({ params: { id: executionId } });
+
+		it('should 404 when execution is inaccessible for user', async () => {
+			workflowSharingService.getSharedWorkflowIds.mockResolvedValue([]);
+
+			const promise = executionsController.stop(req);
+
+			await expect(promise).rejects.toThrow(NotFoundError);
+			expect(executionService.stop).not.toHaveBeenCalled();
+		});
+
+		it('should call ask for an execution to be stopped', async () => {
+			workflowSharingService.getSharedWorkflowIds.mockResolvedValue(['123']);
+
+			await executionsController.stop(req);
+
+			expect(executionService.stop).toHaveBeenCalledWith(executionId);
+		});
+	});
+});
diff --git a/packages/cli/test/unit/controllers/me.controller.test.ts b/packages/cli/test/unit/controllers/me.controller.test.ts
index 20b8fdfb92d5e..6a9bff1251739 100644
--- a/packages/cli/test/unit/controllers/me.controller.test.ts
+++ b/packages/cli/test/unit/controllers/me.controller.test.ts
@@ -1,40 +1,42 @@
-import { CookieOptions, Response } from 'express';
-import type { Repository } from 'typeorm';
+import type { Response } from 'express';
+import { Container } from 'typedi';
 import jwt from 'jsonwebtoken';
-import { mock, anyObject, captor } from 'jest-mock-extended';
-import type { ILogger } from 'n8n-workflow';
-import type { IExternalHooksClass, IInternalHooksClass } from '@/Interfaces';
+import { mock, anyObject } from 'jest-mock-extended';
+import type { PublicUser } from '@/Interfaces';
 import type { User } from '@db/entities/User';
-import { UserRepository } from '@db/repositories';
-import { MeController } from '@/controllers';
+import { MeController } from '@/controllers/me.controller';
 import { AUTH_COOKIE_NAME } from '@/constants';
-import { BadRequestError } from '@/ResponseHelper';
 import type { AuthenticatedRequest, MeRequest } from '@/requests';
+import { UserService } from '@/services/user.service';
+import { ExternalHooks } from '@/ExternalHooks';
+import { InternalHooks } from '@/InternalHooks';
+import { License } from '@/License';
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
+import { UserRepository } from '@/databases/repositories/user.repository';
 import { badPasswords } from '../shared/testData';
+import { mockInstance } from '../../shared/mocking';
+
+const browserId = 'test-browser-id';
 
 describe('MeController', () => {
-	const logger = mock<ILogger>();
-	const externalHooks = mock<IExternalHooksClass>();
-	const internalHooks = mock<IInternalHooksClass>();
-	const userRepository = mock<UserRepository>();
-	const controller = new MeController({
-		logger,
-		externalHooks,
-		internalHooks,
-		repositories: { User: userRepository },
-	});
+	const externalHooks = mockInstance(ExternalHooks);
+	const internalHooks = mockInstance(InternalHooks);
+	const userService = mockInstance(UserService);
+	const userRepository = mockInstance(UserRepository);
+	mockInstance(License).isWithinUsersLimit.mockReturnValue(true);
+	const controller = Container.get(MeController);
 
 	describe('updateCurrentUser', () => {
 		it('should throw BadRequestError if email is missing in the payload', async () => {
 			const req = mock<MeRequest.UserUpdate>({});
-			expect(controller.updateCurrentUser(req, mock())).rejects.toThrowError(
+			await expect(controller.updateCurrentUser(req, mock())).rejects.toThrowError(
 				new BadRequestError('Email is mandatory'),
 			);
 		});
 
 		it('should throw BadRequestError if email is invalid', async () => {
 			const req = mock<MeRequest.UserUpdate>({ body: { email: 'invalid-email' } });
-			expect(controller.updateCurrentUser(req, mock())).rejects.toThrowError(
+			await expect(controller.updateCurrentUser(req, mock())).rejects.toThrowError(
 				new BadRequestError('Invalid email address'),
 			);
 		});
@@ -44,22 +46,35 @@ describe('MeController', () => {
 				id: '123',
 				password: 'password',
 				authIdentities: [],
-				globalRoleId: '1',
+				role: 'global:owner',
 			});
 			const reqBody = { email: 'valid@email.com', firstName: 'John', lastName: 'Potato' };
-			const req = mock<MeRequest.UserUpdate>({ user, body: reqBody });
+			const req = mock<MeRequest.UserUpdate>({ user, body: reqBody, browserId });
 			const res = mock<Response>();
 			userRepository.findOneOrFail.mockResolvedValue(user);
 			jest.spyOn(jwt, 'sign').mockImplementation(() => 'signed-token');
+			userService.toPublic.mockResolvedValue({} as unknown as PublicUser);
 
 			await controller.updateCurrentUser(req, res);
 
-			expect(userRepository.update).toHaveBeenCalled();
+			expect(externalHooks.run).toHaveBeenCalledWith('user.profile.beforeUpdate', [
+				user.id,
+				user.email,
+				reqBody,
+			]);
 
-			const cookieOptions = captor<CookieOptions>();
-			expect(res.cookie).toHaveBeenCalledWith(AUTH_COOKIE_NAME, 'signed-token', cookieOptions);
-			expect(cookieOptions.value.httpOnly).toBe(true);
-			expect(cookieOptions.value.sameSite).toBe('lax');
+			expect(userService.update).toHaveBeenCalled();
+
+			expect(res.cookie).toHaveBeenCalledWith(
+				AUTH_COOKIE_NAME,
+				'signed-token',
+				expect.objectContaining({
+					maxAge: expect.any(Number),
+					httpOnly: true,
+					sameSite: 'lax',
+					secure: false,
+				}),
+			);
 
 			expect(externalHooks.run).toHaveBeenCalledWith('user.profile.update', [
 				user.email,
@@ -72,27 +87,50 @@ describe('MeController', () => {
 				id: '123',
 				password: 'password',
 				authIdentities: [],
-				globalRoleId: '1',
+				role: 'global:member',
 			});
 			const reqBody = { email: 'valid@email.com', firstName: 'John', lastName: 'Potato' };
-			const req = mock<MeRequest.UserUpdate>({ user, body: reqBody });
+			const req = mock<MeRequest.UserUpdate>({ user, browserId });
+			req.body = reqBody;
 			const res = mock<Response>();
 			userRepository.findOneOrFail.mockResolvedValue(user);
 			jest.spyOn(jwt, 'sign').mockImplementation(() => 'signed-token');
 
 			// Add invalid data to the request payload
-			Object.assign(reqBody, { id: '0', globalRoleId: '42' });
+			Object.assign(reqBody, { id: '0', role: 'global:owner' });
 
 			await controller.updateCurrentUser(req, res);
 
-			expect(userRepository.update).toHaveBeenCalled();
+			expect(userService.update).toHaveBeenCalled();
 
-			const updatedUser = userRepository.update.mock.calls[0][1];
-			expect(updatedUser.email).toBe(reqBody.email);
-			expect(updatedUser.firstName).toBe(reqBody.firstName);
-			expect(updatedUser.lastName).toBe(reqBody.lastName);
-			expect(updatedUser.id).not.toBe('0');
-			expect(updatedUser.globalRoleId).not.toBe('42');
+			const updatePayload = userService.update.mock.calls[0][1];
+			expect(updatePayload.email).toBe(reqBody.email);
+			expect(updatePayload.firstName).toBe(reqBody.firstName);
+			expect(updatePayload.lastName).toBe(reqBody.lastName);
+			expect(updatePayload.id).toBeUndefined();
+			expect(updatePayload.role).toBeUndefined();
+		});
+
+		it('should throw BadRequestError if beforeUpdate hook throws BadRequestError', async () => {
+			const user = mock<User>({
+				id: '123',
+				password: 'password',
+				authIdentities: [],
+				role: 'global:owner',
+			});
+			const reqBody = { email: 'valid@email.com', firstName: 'John', lastName: 'Potato' };
+			const req = mock<MeRequest.UserUpdate>({ user, body: reqBody });
+			// userService.findOneOrFail.mockResolvedValue(user);
+
+			externalHooks.run.mockImplementationOnce(async (hookName) => {
+				if (hookName === 'user.profile.beforeUpdate') {
+					throw new BadRequestError('Invalid email address');
+				}
+			});
+
+			await expect(controller.updateCurrentUser(req, mock())).rejects.toThrowError(
+				new BadRequestError('Invalid email address'),
+			);
 		});
 	});
 
@@ -104,7 +142,7 @@ describe('MeController', () => {
 				user: mock({ password: undefined }),
 				body: { currentPassword: '', newPassword: '' },
 			});
-			expect(controller.updatePassword(req, mock())).rejects.toThrowError(
+			await expect(controller.updatePassword(req, mock())).rejects.toThrowError(
 				new BadRequestError('Requesting user not set up.'),
 			);
 		});
@@ -114,7 +152,7 @@ describe('MeController', () => {
 				user: mock({ password: passwordHash }),
 				body: { currentPassword: 'not_old_password', newPassword: '' },
 			});
-			expect(controller.updatePassword(req, mock())).rejects.toThrowError(
+			await expect(controller.updatePassword(req, mock())).rejects.toThrowError(
 				new BadRequestError('Provided current password is incorrect.'),
 			);
 		});
@@ -125,8 +163,9 @@ describe('MeController', () => {
 					const req = mock<MeRequest.Password>({
 						user: mock({ password: passwordHash }),
 						body: { currentPassword: 'old_password', newPassword },
+						browserId,
 					});
-					expect(controller.updatePassword(req, mock())).rejects.toThrowError(
+					await expect(controller.updatePassword(req, mock())).rejects.toThrowError(
 						new BadRequestError(errorMessage),
 					);
 				});
@@ -137,6 +176,7 @@ describe('MeController', () => {
 			const req = mock<MeRequest.Password>({
 				user: mock({ password: passwordHash }),
 				body: { currentPassword: 'old_password', newPassword: 'NewPassword123' },
+				browserId,
 			});
 			const res = mock<Response>();
 			userRepository.save.calledWith(req.user).mockResolvedValue(req.user);
@@ -146,10 +186,16 @@ describe('MeController', () => {
 
 			expect(req.user.password).not.toBe(passwordHash);
 
-			const cookieOptions = captor<CookieOptions>();
-			expect(res.cookie).toHaveBeenCalledWith(AUTH_COOKIE_NAME, 'new-signed-token', cookieOptions);
-			expect(cookieOptions.value.httpOnly).toBe(true);
-			expect(cookieOptions.value.sameSite).toBe('lax');
+			expect(res.cookie).toHaveBeenCalledWith(
+				AUTH_COOKIE_NAME,
+				'new-signed-token',
+				expect.objectContaining({
+					maxAge: expect.any(Number),
+					httpOnly: true,
+					sameSite: 'lax',
+					secure: false,
+				}),
+			);
 
 			expect(externalHooks.run).toHaveBeenCalledWith('user.password.update', [
 				req.user.email,
@@ -163,6 +209,17 @@ describe('MeController', () => {
 		});
 	});
 
+	describe('storeSurveyAnswers', () => {
+		it('should throw BadRequestError if answers are missing in the payload', async () => {
+			const req = mock<MeRequest.SurveyAnswers>({
+				body: undefined,
+			});
+			await expect(controller.storeSurveyAnswers(req)).rejects.toThrowError(
+				new BadRequestError('Personalization answers are mandatory'),
+			);
+		});
+	});
+
 	describe('API Key methods', () => {
 		let req: AuthenticatedRequest;
 		beforeAll(() => {
@@ -172,7 +229,7 @@ describe('MeController', () => {
 		describe('createAPIKey', () => {
 			it('should create and save an API key', async () => {
 				const { apiKey } = await controller.createAPIKey(req);
-				expect(userRepository.update).toHaveBeenCalledWith(req.user.id, { apiKey });
+				expect(userService.update).toHaveBeenCalledWith(req.user.id, { apiKey });
 			});
 		});
 
@@ -186,7 +243,7 @@ describe('MeController', () => {
 		describe('deleteAPIKey', () => {
 			it('should delete the API key', async () => {
 				await controller.deleteAPIKey(req);
-				expect(userRepository.update).toHaveBeenCalledWith(req.user.id, { apiKey: null });
+				expect(userService.update).toHaveBeenCalledWith(req.user.id, { apiKey: null });
 			});
 		});
 	});
diff --git a/packages/cli/test/unit/controllers/oAuth1Credential.controller.test.ts b/packages/cli/test/unit/controllers/oAuth1Credential.controller.test.ts
new file mode 100644
index 0000000000000..6b4b55788a259
--- /dev/null
+++ b/packages/cli/test/unit/controllers/oAuth1Credential.controller.test.ts
@@ -0,0 +1,97 @@
+import nock from 'nock';
+import Container from 'typedi';
+import { Cipher } from 'n8n-core';
+import { mock } from 'jest-mock-extended';
+
+import { OAuth1CredentialController } from '@/controllers/oauth/oAuth1Credential.controller';
+import type { CredentialsEntity } from '@db/entities/CredentialsEntity';
+import type { User } from '@db/entities/User';
+import type { OAuthRequest } from '@/requests';
+import { CredentialsRepository } from '@db/repositories/credentials.repository';
+import { SharedCredentialsRepository } from '@db/repositories/sharedCredentials.repository';
+import { ExternalHooks } from '@/ExternalHooks';
+import { Logger } from '@/Logger';
+import { VariablesService } from '@/environments/variables/variables.service.ee';
+import { SecretsHelper } from '@/SecretsHelpers';
+import { CredentialsHelper } from '@/CredentialsHelper';
+
+import { mockInstance } from '../../shared/mocking';
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
+import { NotFoundError } from '@/errors/response-errors/not-found.error';
+
+describe('OAuth1CredentialController', () => {
+	mockInstance(Logger);
+	mockInstance(ExternalHooks);
+	mockInstance(SecretsHelper);
+	mockInstance(VariablesService, {
+		getAllCached: async () => [],
+	});
+	const cipher = mockInstance(Cipher);
+	const credentialsHelper = mockInstance(CredentialsHelper);
+	const credentialsRepository = mockInstance(CredentialsRepository);
+	const sharedCredentialsRepository = mockInstance(SharedCredentialsRepository);
+	const user = mock<User>({
+		id: '123',
+		password: 'password',
+		authIdentities: [],
+		role: 'global:owner',
+	});
+	const credential = mock<CredentialsEntity>({
+		id: '1',
+		name: 'Test Credential',
+		type: 'oAuth1Api',
+	});
+
+	const controller = Container.get(OAuth1CredentialController);
+
+	beforeEach(() => {
+		jest.resetAllMocks();
+	});
+
+	describe('getAuthUri', () => {
+		it('should throw a BadRequestError when credentialId is missing in the query', async () => {
+			const req = mock<OAuthRequest.OAuth1Credential.Auth>({ query: { id: '' } });
+			await expect(controller.getAuthUri(req)).rejects.toThrowError(
+				new BadRequestError('Required credential ID is missing'),
+			);
+		});
+
+		it('should throw a NotFoundError when no matching credential is found for the user', async () => {
+			sharedCredentialsRepository.findCredentialForUser.mockResolvedValueOnce(null);
+
+			const req = mock<OAuthRequest.OAuth1Credential.Auth>({ user, query: { id: '1' } });
+			await expect(controller.getAuthUri(req)).rejects.toThrowError(
+				new NotFoundError('Credential not found'),
+			);
+		});
+
+		it('should return a valid auth URI', async () => {
+			sharedCredentialsRepository.findCredentialForUser.mockResolvedValueOnce(credential);
+			credentialsHelper.getDecrypted.mockResolvedValueOnce({});
+			credentialsHelper.applyDefaultsAndOverwrites.mockReturnValueOnce({
+				requestTokenUrl: 'https://example.domain/oauth/request_token',
+				authUrl: 'https://example.domain/oauth/authorize',
+				signatureMethod: 'HMAC-SHA1',
+			});
+			nock('https://example.domain')
+				.post('/oauth/request_token', {
+					oauth_callback: 'http://localhost:5678/rest/oauth1-credential/callback?cid=1',
+				})
+				.reply(200, { oauth_token: 'random-token' });
+			cipher.encrypt.mockReturnValue('encrypted');
+
+			const req = mock<OAuthRequest.OAuth1Credential.Auth>({ user, query: { id: '1' } });
+			const authUri = await controller.getAuthUri(req);
+			expect(authUri).toEqual('https://example.domain/oauth/authorize?oauth_token=random-token');
+			expect(credentialsRepository.update).toHaveBeenCalledWith(
+				'1',
+				expect.objectContaining({
+					data: 'encrypted',
+					id: '1',
+					name: 'Test Credential',
+					type: 'oAuth1Api',
+				}),
+			);
+		});
+	});
+});
diff --git a/packages/cli/test/unit/controllers/oAuth2Credential.controller.test.ts b/packages/cli/test/unit/controllers/oAuth2Credential.controller.test.ts
new file mode 100644
index 0000000000000..16e3e93345796
--- /dev/null
+++ b/packages/cli/test/unit/controllers/oAuth2Credential.controller.test.ts
@@ -0,0 +1,220 @@
+import nock from 'nock';
+import Container from 'typedi';
+import Csrf from 'csrf';
+import { type Response } from 'express';
+import { Cipher } from 'n8n-core';
+import { mock } from 'jest-mock-extended';
+
+import { OAuth2CredentialController } from '@/controllers/oauth/oAuth2Credential.controller';
+import type { CredentialsEntity } from '@db/entities/CredentialsEntity';
+import type { User } from '@db/entities/User';
+import type { OAuthRequest } from '@/requests';
+import { CredentialsRepository } from '@db/repositories/credentials.repository';
+import { SharedCredentialsRepository } from '@db/repositories/sharedCredentials.repository';
+import { ExternalHooks } from '@/ExternalHooks';
+import { Logger } from '@/Logger';
+import { VariablesService } from '@/environments/variables/variables.service.ee';
+import { SecretsHelper } from '@/SecretsHelpers';
+import { CredentialsHelper } from '@/CredentialsHelper';
+
+import { mockInstance } from '../../shared/mocking';
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
+import { NotFoundError } from '@/errors/response-errors/not-found.error';
+
+describe('OAuth2CredentialController', () => {
+	mockInstance(Logger);
+	mockInstance(SecretsHelper);
+	mockInstance(VariablesService, {
+		getAllCached: async () => [],
+	});
+	const cipher = mockInstance(Cipher);
+	const externalHooks = mockInstance(ExternalHooks);
+	const credentialsHelper = mockInstance(CredentialsHelper);
+	const credentialsRepository = mockInstance(CredentialsRepository);
+	const sharedCredentialsRepository = mockInstance(SharedCredentialsRepository);
+
+	const csrfSecret = 'csrf-secret';
+	const user = mock<User>({
+		id: '123',
+		password: 'password',
+		authIdentities: [],
+		role: 'global:owner',
+	});
+	const credential = mock<CredentialsEntity>({
+		id: '1',
+		name: 'Test Credential',
+		type: 'oAuth2Api',
+	});
+
+	const controller = Container.get(OAuth2CredentialController);
+
+	beforeEach(() => {
+		jest.resetAllMocks();
+	});
+
+	describe('getAuthUri', () => {
+		it('should throw a BadRequestError when credentialId is missing in the query', async () => {
+			const req = mock<OAuthRequest.OAuth2Credential.Auth>({ query: { id: '' } });
+			await expect(controller.getAuthUri(req)).rejects.toThrowError(
+				new BadRequestError('Required credential ID is missing'),
+			);
+		});
+
+		it('should throw a NotFoundError when no matching credential is found for the user', async () => {
+			sharedCredentialsRepository.findCredentialForUser.mockResolvedValueOnce(null);
+
+			const req = mock<OAuthRequest.OAuth2Credential.Auth>({ user, query: { id: '1' } });
+			await expect(controller.getAuthUri(req)).rejects.toThrowError(
+				new NotFoundError('Credential not found'),
+			);
+		});
+
+		it('should return a valid auth URI', async () => {
+			jest.spyOn(Csrf.prototype, 'secretSync').mockReturnValueOnce(csrfSecret);
+			jest.spyOn(Csrf.prototype, 'create').mockReturnValueOnce('token');
+			sharedCredentialsRepository.findCredentialForUser.mockResolvedValueOnce(credential);
+			credentialsHelper.getDecrypted.mockResolvedValueOnce({});
+			credentialsHelper.applyDefaultsAndOverwrites.mockReturnValue({
+				clientId: 'test-client-id',
+				authUrl: 'https://example.domain/o/oauth2/v2/auth',
+			});
+			cipher.encrypt.mockReturnValue('encrypted');
+
+			const req = mock<OAuthRequest.OAuth2Credential.Auth>({ user, query: { id: '1' } });
+			const authUri = await controller.getAuthUri(req);
+			expect(authUri).toEqual(
+				'https://example.domain/o/oauth2/v2/auth?client_id=test-client-id&redirect_uri=http%3A%2F%2Flocalhost%3A5678%2Frest%2Foauth2-credential%2Fcallback&response_type=code&state=eyJ0b2tlbiI6InRva2VuIiwiY2lkIjoiMSJ9&scope=openid',
+			);
+			expect(credentialsRepository.update).toHaveBeenCalledWith(
+				'1',
+				expect.objectContaining({
+					data: 'encrypted',
+					id: '1',
+					name: 'Test Credential',
+					type: 'oAuth2Api',
+				}),
+			);
+		});
+	});
+
+	describe('handleCallback', () => {
+		const validState = Buffer.from(
+			JSON.stringify({
+				token: 'token',
+				cid: '1',
+			}),
+		).toString('base64');
+
+		it('should render the error page when required query params are missing', async () => {
+			const req = mock<OAuthRequest.OAuth2Credential.Callback>({
+				query: { code: undefined, state: undefined },
+			});
+			const res = mock<Response>();
+			await controller.handleCallback(req, res);
+
+			expect(res.render).toHaveBeenCalledWith('oauth-error-callback', {
+				error: {
+					message: 'Insufficient parameters for OAuth2 callback.',
+					reason: 'Received following query parameters: undefined',
+				},
+			});
+			expect(credentialsRepository.findOneBy).not.toHaveBeenCalled();
+		});
+
+		it('should render the error page when `state` query param is invalid', async () => {
+			const req = mock<OAuthRequest.OAuth2Credential.Callback>({
+				query: { code: 'code', state: 'invalid-state' },
+			});
+			const res = mock<Response>();
+			await controller.handleCallback(req, res);
+
+			expect(res.render).toHaveBeenCalledWith('oauth-error-callback', {
+				error: {
+					message: 'Invalid state format',
+				},
+			});
+			expect(credentialsRepository.findOneBy).not.toHaveBeenCalled();
+		});
+
+		it('should render the error page when credential is not found in DB', async () => {
+			credentialsRepository.findOneBy.mockResolvedValueOnce(null);
+
+			const req = mock<OAuthRequest.OAuth2Credential.Callback>({
+				query: { code: 'code', state: validState },
+			});
+			const res = mock<Response>();
+			await controller.handleCallback(req, res);
+
+			expect(res.render).toHaveBeenCalledWith('oauth-error-callback', {
+				error: {
+					message: 'OAuth2 callback failed because of insufficient permissions',
+				},
+			});
+			expect(credentialsRepository.findOneBy).toHaveBeenCalledTimes(1);
+			expect(credentialsRepository.findOneBy).toHaveBeenCalledWith({ id: '1' });
+		});
+
+		it('should render the error page when csrfSecret on the saved credential does not match the state', async () => {
+			credentialsRepository.findOneBy.mockResolvedValueOnce(credential);
+			credentialsHelper.getDecrypted.mockResolvedValueOnce({ csrfSecret });
+			jest.spyOn(Csrf.prototype, 'verify').mockReturnValueOnce(false);
+
+			const req = mock<OAuthRequest.OAuth2Credential.Callback>({
+				query: { code: 'code', state: validState },
+			});
+			const res = mock<Response>();
+			await controller.handleCallback(req, res);
+			expect(res.render).toHaveBeenCalledWith('oauth-error-callback', {
+				error: {
+					message: 'The OAuth2 callback state is invalid!',
+				},
+			});
+			expect(externalHooks.run).not.toHaveBeenCalled();
+		});
+
+		it('should exchange the code for a valid token, and save it to DB', async () => {
+			credentialsRepository.findOneBy.mockResolvedValueOnce(credential);
+			credentialsHelper.getDecrypted.mockResolvedValueOnce({ csrfSecret });
+			credentialsHelper.applyDefaultsAndOverwrites.mockReturnValue({
+				clientId: 'test-client-id',
+				clientSecret: 'oauth-secret',
+				accessTokenUrl: 'https://example.domain/token',
+			});
+			jest.spyOn(Csrf.prototype, 'verify').mockReturnValueOnce(true);
+			nock('https://example.domain')
+				.post(
+					'/token',
+					'code=code&grant_type=authorization_code&redirect_uri=http%3A%2F%2Flocalhost%3A5678%2Frest%2Foauth2-credential%2Fcallback',
+				)
+				.reply(200, { access_token: 'access-token', refresh_token: 'refresh-token' });
+			cipher.encrypt.mockReturnValue('encrypted');
+
+			const req = mock<OAuthRequest.OAuth2Credential.Callback>({
+				query: { code: 'code', state: validState },
+				originalUrl: '?code=code',
+			});
+			const res = mock<Response>();
+			await controller.handleCallback(req, res);
+
+			expect(externalHooks.run).toHaveBeenCalledWith('oauth2.callback', [
+				expect.objectContaining({
+					clientId: 'test-client-id',
+					redirectUri: 'http://localhost:5678/rest/oauth2-credential/callback',
+				}),
+			]);
+			expect(cipher.encrypt).toHaveBeenCalledWith({
+				oauthTokenData: { access_token: 'access-token', refresh_token: 'refresh-token' },
+			});
+			expect(credentialsRepository.update).toHaveBeenCalledWith(
+				'1',
+				expect.objectContaining({
+					data: 'encrypted',
+					id: '1',
+					name: 'Test Credential',
+					type: 'oAuth2Api',
+				}),
+			);
+			expect(res.render).toHaveBeenCalledWith('oauth-callback');
+		});
+	});
+});
diff --git a/packages/cli/test/unit/controllers/owner.controller.test.ts b/packages/cli/test/unit/controllers/owner.controller.test.ts
index 0ef8036e07b8e..0057c2370896b 100644
--- a/packages/cli/test/unit/controllers/owner.controller.test.ts
+++ b/packages/cli/test/unit/controllers/owner.controller.test.ts
@@ -1,72 +1,55 @@
-import type { CookieOptions, Response } from 'express';
-import { anyObject, captor, mock } from 'jest-mock-extended';
-import type { ILogger } from 'n8n-workflow';
+import Container from 'typedi';
+import type { Response } from 'express';
+import { anyObject, mock } from 'jest-mock-extended';
 import jwt from 'jsonwebtoken';
-import type { IInternalHooksClass } from '@/Interfaces';
+
+import type { AuthService } from '@/auth/auth.service';
+import config from '@/config';
+import { OwnerController } from '@/controllers/owner.controller';
 import type { User } from '@db/entities/User';
-import type {
-	CredentialsRepository,
-	SettingsRepository,
-	UserRepository,
-	WorkflowRepository,
-} from '@db/repositories';
-import type { Config } from '@/config';
-import { BadRequestError } from '@/ResponseHelper';
+import type { SettingsRepository } from '@db/repositories/settings.repository';
+import type { UserRepository } from '@db/repositories/user.repository';
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
+import type { InternalHooks } from '@/InternalHooks';
+import { License } from '@/License';
 import type { OwnerRequest } from '@/requests';
-import { OwnerController } from '@/controllers';
+import type { UserService } from '@/services/user.service';
+import { PasswordUtility } from '@/services/password.utility';
+
+import { mockInstance } from '../../shared/mocking';
 import { badPasswords } from '../shared/testData';
-import { AUTH_COOKIE_NAME } from '@/constants';
 
 describe('OwnerController', () => {
-	const config = mock<Config>();
-	const logger = mock<ILogger>();
-	const internalHooks = mock<IInternalHooksClass>();
+	const configGetSpy = jest.spyOn(config, 'getEnv');
+	const internalHooks = mock<InternalHooks>();
+	const authService = mock<AuthService>();
+	const userService = mock<UserService>();
 	const userRepository = mock<UserRepository>();
 	const settingsRepository = mock<SettingsRepository>();
-	const credentialsRepository = mock<CredentialsRepository>();
-	const workflowsRepository = mock<WorkflowRepository>();
-	const controller = new OwnerController({
-		config,
-		logger,
+	mockInstance(License).isWithinUsersLimit.mockReturnValue(true);
+	const controller = new OwnerController(
+		mock(),
 		internalHooks,
-		repositories: {
-			User: userRepository,
-			Settings: settingsRepository,
-			Credentials: credentialsRepository,
-			Workflow: workflowsRepository,
-		},
-	});
-
-	describe('preSetup', () => {
-		it('should throw a BadRequestError if the instance owner is already setup', async () => {
-			config.getEnv.calledWith('userManagement.isInstanceOwnerSetUp').mockReturnValue(true);
-			expect(controller.preSetup()).rejects.toThrowError(
-				new BadRequestError('Instance owner already setup'),
-			);
-		});
-
-		it('should a return credential and workflow count', async () => {
-			config.getEnv.calledWith('userManagement.isInstanceOwnerSetUp').mockReturnValue(false);
-			credentialsRepository.countBy.mockResolvedValue(7);
-			workflowsRepository.countBy.mockResolvedValue(31);
-			const { credentials, workflows } = await controller.preSetup();
-			expect(credentials).toBe(7);
-			expect(workflows).toBe(31);
-		});
-	});
+		settingsRepository,
+		authService,
+		userService,
+		Container.get(PasswordUtility),
+		mock(),
+		userRepository,
+	);
 
 	describe('setupOwner', () => {
 		it('should throw a BadRequestError if the instance owner is already setup', async () => {
-			config.getEnv.calledWith('userManagement.isInstanceOwnerSetUp').mockReturnValue(true);
-			expect(controller.setupOwner(mock(), mock())).rejects.toThrowError(
+			configGetSpy.mockReturnValue(true);
+			await expect(controller.setupOwner(mock(), mock())).rejects.toThrowError(
 				new BadRequestError('Instance owner already setup'),
 			);
 		});
 
 		it('should throw a BadRequestError if the email is invalid', async () => {
-			config.getEnv.calledWith('userManagement.isInstanceOwnerSetUp').mockReturnValue(false);
+			configGetSpy.mockReturnValue(false);
 			const req = mock<OwnerRequest.Post>({ body: { email: 'invalid email' } });
-			expect(controller.setupOwner(req, mock())).rejects.toThrowError(
+			await expect(controller.setupOwner(req, mock())).rejects.toThrowError(
 				new BadRequestError('Invalid email address'),
 			);
 		});
@@ -74,9 +57,9 @@ describe('OwnerController', () => {
 		describe('should throw if the password is invalid', () => {
 			Object.entries(badPasswords).forEach(([password, errorMessage]) => {
 				it(password, async () => {
-					config.getEnv.calledWith('userManagement.isInstanceOwnerSetUp').mockReturnValue(false);
+					configGetSpy.mockReturnValue(false);
 					const req = mock<OwnerRequest.Post>({ body: { email: 'valid@email.com', password } });
-					expect(controller.setupOwner(req, mock())).rejects.toThrowError(
+					await expect(controller.setupOwner(req, mock())).rejects.toThrowError(
 						new BadRequestError(errorMessage),
 					);
 				});
@@ -84,11 +67,11 @@ describe('OwnerController', () => {
 		});
 
 		it('should throw a BadRequestError if firstName & lastName are missing ', async () => {
-			config.getEnv.calledWith('userManagement.isInstanceOwnerSetUp').mockReturnValue(false);
+			configGetSpy.mockReturnValue(false);
 			const req = mock<OwnerRequest.Post>({
 				body: { email: 'valid@email.com', password: 'NewPassword123', firstName: '', lastName: '' },
 			});
-			expect(controller.setupOwner(req, mock())).rejects.toThrowError(
+			await expect(controller.setupOwner(req, mock())).rejects.toThrowError(
 				new BadRequestError('First and last names are mandatory'),
 			);
 		});
@@ -96,9 +79,10 @@ describe('OwnerController', () => {
 		it('should setup the instance owner successfully', async () => {
 			const user = mock<User>({
 				id: 'userId',
-				globalRole: { scope: 'global', name: 'owner' },
+				role: 'global:owner',
 				authIdentities: [],
 			});
+			const browserId = 'test-browser-id';
 			const req = mock<OwnerRequest.Post>({
 				body: {
 					email: 'valid@email.com',
@@ -107,31 +91,21 @@ describe('OwnerController', () => {
 					lastName: 'Doe',
 				},
 				user,
+				browserId,
 			});
 			const res = mock<Response>();
-			config.getEnv.calledWith('userManagement.isInstanceOwnerSetUp').mockReturnValue(false);
+			configGetSpy.mockReturnValue(false);
+			userRepository.findOneOrFail.calledWith(anyObject()).mockResolvedValue(user);
 			userRepository.save.calledWith(anyObject()).mockResolvedValue(user);
 			jest.spyOn(jwt, 'sign').mockImplementation(() => 'signed-token');
 
 			await controller.setupOwner(req, res);
 
-			expect(userRepository.save).toHaveBeenCalledWith(user);
-
-			const cookieOptions = captor<CookieOptions>();
-			expect(res.cookie).toHaveBeenCalledWith(AUTH_COOKIE_NAME, 'signed-token', cookieOptions);
-			expect(cookieOptions.value.httpOnly).toBe(true);
-			expect(cookieOptions.value.sameSite).toBe('lax');
-		});
-	});
-
-	describe('skipSetup', () => {
-		it('should skip setting up the instance owner', async () => {
-			await controller.skipSetup();
-			expect(settingsRepository.update).toHaveBeenCalledWith(
-				{ key: 'userManagement.skipInstanceOwnerSetup' },
-				{ value: JSON.stringify(true) },
-			);
-			expect(config.set).toHaveBeenCalledWith('userManagement.skipInstanceOwnerSetup', true);
+			expect(userRepository.findOneOrFail).toHaveBeenCalledWith({
+				where: { role: 'global:owner' },
+			});
+			expect(userRepository.save).toHaveBeenCalledWith(user, { transaction: false });
+			expect(authService.issueCookie).toHaveBeenCalledWith(res, user, browserId);
 		});
 	});
 });
diff --git a/packages/cli/test/unit/controllers/translation.controller.test.ts b/packages/cli/test/unit/controllers/translation.controller.test.ts
index a24d462f81818..e34237cd69623 100644
--- a/packages/cli/test/unit/controllers/translation.controller.test.ts
+++ b/packages/cli/test/unit/controllers/translation.controller.test.ts
@@ -1,17 +1,17 @@
 import { mock } from 'jest-mock-extended';
-import type { ICredentialTypes } from 'n8n-workflow';
-import type { Config } from '@/config';
+import config from '@/config';
+import type { TranslationRequest } from '@/controllers/translation.controller';
 import {
 	TranslationController,
-	TranslationRequest,
 	CREDENTIAL_TRANSLATIONS_DIR,
 } from '@/controllers/translation.controller';
-import { BadRequestError } from '@/ResponseHelper';
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
+import type { CredentialTypes } from '@/CredentialTypes';
 
 describe('TranslationController', () => {
-	const config = mock<Config>();
-	const credentialTypes = mock<ICredentialTypes>();
-	const controller = new TranslationController(config, credentialTypes);
+	const configGetSpy = jest.spyOn(config, 'getEnv');
+	const credentialTypes = mock<CredentialTypes>();
+	const controller = new TranslationController(credentialTypes);
 
 	describe('getCredentialTranslation', () => {
 		it('should throw 400 on invalid credential types', async () => {
@@ -19,7 +19,7 @@ describe('TranslationController', () => {
 			const req = mock<TranslationRequest.Credential>({ query: { credentialType } });
 			credentialTypes.recognizes.calledWith(credentialType).mockReturnValue(false);
 
-			expect(controller.getCredentialTranslation(req)).rejects.toThrowError(
+			await expect(controller.getCredentialTranslation(req)).rejects.toThrowError(
 				new BadRequestError(`Invalid Credential type: "${credentialType}"`),
 			);
 		});
@@ -27,7 +27,7 @@ describe('TranslationController', () => {
 		it('should return translation json on valid credential types', async () => {
 			const credentialType = 'credential-type';
 			const req = mock<TranslationRequest.Credential>({ query: { credentialType } });
-			config.getEnv.calledWith('defaultLocale').mockReturnValue('de');
+			configGetSpy.mockReturnValue('de');
 			credentialTypes.recognizes.calledWith(credentialType).mockReturnValue(true);
 			const response = { translation: 'string' };
 			jest.mock(`${CREDENTIAL_TRANSLATIONS_DIR}/de/credential-type.json`, () => response, {
diff --git a/packages/cli/test/unit/credentials-tester.unit.test.ts b/packages/cli/test/unit/credentials-tester.unit.test.ts
new file mode 100644
index 0000000000000..e2987f5c84293
--- /dev/null
+++ b/packages/cli/test/unit/credentials-tester.unit.test.ts
@@ -0,0 +1,32 @@
+import { CredentialsTester } from '@/services/credentials-tester.service';
+import mock from 'jest-mock-extended/lib/Mock';
+import type { CredentialTypes } from '@/CredentialTypes';
+import type { ICredentialType, INodeType } from 'n8n-workflow';
+import type { NodeTypes } from '@/NodeTypes';
+
+describe('CredentialsTester', () => {
+	const credentialTypes = mock<CredentialTypes>();
+	const nodeTypes = mock<NodeTypes>();
+	const credentialsTester = new CredentialsTester(mock(), credentialTypes, nodeTypes, mock());
+
+	beforeEach(() => {
+		jest.clearAllMocks();
+	});
+
+	it('should find the OAuth2 credential test for a generic OAuth2 API credential', () => {
+		credentialTypes.getByName.mockReturnValue(mock<ICredentialType>({ test: undefined }));
+		credentialTypes.getSupportedNodes.mockReturnValue(['oAuth2Api']);
+		credentialTypes.getParentTypes.mockReturnValue([]);
+		nodeTypes.getByName.mockReturnValue(
+			mock<INodeType>({
+				description: { credentials: [{ name: 'oAuth2Api' }] },
+			}),
+		);
+
+		const testFn = credentialsTester.getCredentialTestFunction('oAuth2Api');
+
+		if (typeof testFn !== 'function') fail();
+
+		expect(testFn.name).toBe('oauth2CredTest');
+	});
+});
diff --git a/packages/cli/test/unit/databases/entities/user.entity.test.ts b/packages/cli/test/unit/databases/entities/user.entity.test.ts
new file mode 100644
index 0000000000000..005e45df2c957
--- /dev/null
+++ b/packages/cli/test/unit/databases/entities/user.entity.test.ts
@@ -0,0 +1,20 @@
+import { User } from '@db/entities/User';
+
+describe('User Entity', () => {
+	describe('JSON.stringify', () => {
+		it('should not serialize sensitive data', () => {
+			const user = Object.assign(new User(), {
+				email: 'test@example.com',
+				firstName: 'Don',
+				lastName: 'Joe',
+				password: '123456789',
+				apiKey: '123',
+				mfaSecret: '123',
+				mfaRecoveryCodes: ['123'],
+			});
+			expect(JSON.stringify(user)).toEqual(
+				'{"email":"test@example.com","firstName":"Don","lastName":"Joe"}',
+			);
+		});
+	});
+});
diff --git a/packages/cli/test/unit/databases/utils/customValidators.test.ts b/packages/cli/test/unit/databases/utils/customValidators.test.ts
new file mode 100644
index 0000000000000..df906b36d6a52
--- /dev/null
+++ b/packages/cli/test/unit/databases/utils/customValidators.test.ts
@@ -0,0 +1,43 @@
+import { NoXss } from '@db/utils/customValidators';
+import { validate } from 'class-validator';
+
+describe('customValidators', () => {
+	describe('NoXss', () => {
+		class Person {
+			@NoXss()
+			name: string;
+		}
+		const person = new Person();
+
+		const invalidNames = ['http://google.com', '<script src/>', 'www.domain.tld'];
+
+		const validNames = [
+			'Johann Strauß',
+			'Вагиф Сәмәдоғлу',
+			'René Magritte',
+			'সুকুমার রায়',
+			'མགོན་པོ་རྡོ་རྗེ།',
+			'عبدالحليم حافظ',
+		];
+
+		describe('Block XSS', () => {
+			for (const name of invalidNames) {
+				test(name, async () => {
+					person.name = name;
+					const validationErrors = await validate(person);
+					expect(validationErrors[0].property).toEqual('name');
+					expect(validationErrors[0].constraints).toEqual({ NoXss: 'Malicious name' });
+				});
+			}
+		});
+
+		describe('Allow Valid names', () => {
+			for (const name of validNames) {
+				test(name, async () => {
+					person.name = name;
+					expect(await validate(person)).toBeEmptyArray();
+				});
+			}
+		});
+	});
+});
diff --git a/packages/cli/test/unit/decorators/OnShutdown.test.ts b/packages/cli/test/unit/decorators/OnShutdown.test.ts
new file mode 100644
index 0000000000000..1870d95122fd6
--- /dev/null
+++ b/packages/cli/test/unit/decorators/OnShutdown.test.ts
@@ -0,0 +1,76 @@
+import Container, { Service } from 'typedi';
+import { OnShutdown } from '@/decorators/OnShutdown';
+import { ShutdownService } from '@/shutdown/Shutdown.service';
+import { mock } from 'jest-mock-extended';
+
+describe('OnShutdown', () => {
+	let shutdownService: ShutdownService;
+	let registerSpy: jest.SpyInstance;
+
+	beforeEach(() => {
+		shutdownService = new ShutdownService(mock());
+		Container.set(ShutdownService, shutdownService);
+		registerSpy = jest.spyOn(shutdownService, 'register');
+	});
+
+	it('should register a methods that is decorated with OnShutdown', () => {
+		@Service()
+		class TestClass {
+			@OnShutdown()
+			async onShutdown() {}
+		}
+
+		expect(shutdownService.register).toHaveBeenCalledTimes(1);
+		expect(shutdownService.register).toHaveBeenCalledWith(100, {
+			methodName: 'onShutdown',
+			serviceClass: TestClass,
+		});
+	});
+
+	it('should register multiple methods in the same class', () => {
+		@Service()
+		class TestClass {
+			@OnShutdown()
+			async one() {}
+
+			@OnShutdown()
+			async two() {}
+		}
+
+		expect(shutdownService.register).toHaveBeenCalledTimes(2);
+		expect(shutdownService.register).toHaveBeenCalledWith(100, {
+			methodName: 'one',
+			serviceClass: TestClass,
+		});
+		expect(shutdownService.register).toHaveBeenCalledWith(100, {
+			methodName: 'two',
+			serviceClass: TestClass,
+		});
+	});
+
+	it('should use the given priority', () => {
+		class TestClass {
+			@OnShutdown(10)
+			async onShutdown() {
+				// Will be called when the app is shutting down
+			}
+		}
+
+		expect(shutdownService.register).toHaveBeenCalledTimes(1);
+		// @ts-expect-error We are checking internal parts of the shutdown service
+		expect(shutdownService.handlersByPriority[10].length).toEqual(1);
+	});
+
+	it('should throw an error if the decorated member is not a function', () => {
+		expect(() => {
+			@Service()
+			class TestClass {
+				// @ts-expect-error Testing invalid code
+				@OnShutdown()
+				onShutdown = 'not a function';
+			}
+
+			new TestClass();
+		}).toThrow('TestClass.onShutdown() must be a method on TestClass to use "OnShutdown"');
+	});
+});
diff --git a/packages/cli/test/unit/decorators/registerController.test.ts b/packages/cli/test/unit/decorators/registerController.test.ts
new file mode 100644
index 0000000000000..1b547f4f62766
--- /dev/null
+++ b/packages/cli/test/unit/decorators/registerController.test.ts
@@ -0,0 +1,40 @@
+jest.mock('@/constants', () => ({
+	inE2ETests: false,
+	inTest: false,
+}));
+
+import express from 'express';
+import { agent as testAgent } from 'supertest';
+
+import { Get, RestController, registerController } from '@/decorators';
+import { AuthService } from '@/auth/auth.service';
+import { mockInstance } from '../../shared/mocking';
+
+describe('registerController', () => {
+	@RestController('/test')
+	class TestController {
+		@Get('/unlimited', { skipAuth: true })
+		@Get('/rate-limited', { skipAuth: true, rateLimit: true })
+		endpoint() {
+			return { ok: true };
+		}
+	}
+
+	mockInstance(AuthService);
+	const app = express();
+	registerController(app, TestController);
+	const agent = testAgent(app);
+
+	it('should not rate-limit by default', async () => {
+		for (let i = 0; i < 6; i++) {
+			await agent.get('/rest/test/unlimited').expect(200);
+		}
+	});
+
+	it('should rate-limit when configured', async () => {
+		for (let i = 0; i < 5; i++) {
+			await agent.get('/rest/test/rate-limited').expect(200);
+		}
+		await agent.get('/rest/test/rate-limited').expect(429);
+	});
+});
diff --git a/packages/cli/test/unit/execution-lifecyle/restoreBinaryDataId.test.ts b/packages/cli/test/unit/execution-lifecyle/restoreBinaryDataId.test.ts
new file mode 100644
index 0000000000000..3fcdb79c72c7e
--- /dev/null
+++ b/packages/cli/test/unit/execution-lifecyle/restoreBinaryDataId.test.ts
@@ -0,0 +1,192 @@
+import { restoreBinaryDataId } from '@/executionLifecycleHooks/restoreBinaryDataId';
+import { BinaryDataService } from 'n8n-core';
+import { mockInstance } from '../../shared/mocking';
+
+import type { IRun } from 'n8n-workflow';
+import config from '@/config';
+
+function toIRun(item?: object) {
+	return {
+		data: {
+			resultData: {
+				runData: {
+					myNode: [
+						{
+							data: {
+								main: [[item]],
+							},
+						},
+					],
+				},
+			},
+		},
+	} as unknown as IRun;
+}
+
+function getDataId(run: IRun, kind: 'binary' | 'json') {
+	// @ts-ignore
+	return run.data.resultData.runData.myNode[0].data.main[0][0][kind].data.id;
+}
+
+const binaryDataService = mockInstance(BinaryDataService);
+
+for (const mode of ['filesystem-v2', 's3'] as const) {
+	describe(`on ${mode} mode`, () => {
+		beforeAll(() => {
+			config.set('binaryDataManager.mode', mode);
+		});
+
+		afterEach(() => {
+			jest.clearAllMocks();
+		});
+
+		it('should restore if binary data ID is missing execution ID', async () => {
+			const workflowId = '6HYhhKmJch2cYxGj';
+			const executionId = 'temp';
+			const binaryDataFileUuid = 'a5c3f1ed-9d59-4155-bc68-9a370b3c51f6';
+
+			const incorrectFileId = `workflows/${workflowId}/executions/temp/binary_data/${binaryDataFileUuid}`;
+
+			const run = toIRun({
+				binary: {
+					data: { id: `s3:${incorrectFileId}` },
+				},
+			});
+
+			await restoreBinaryDataId(run, executionId, 'webhook');
+
+			const correctFileId = incorrectFileId.replace('temp', executionId);
+			const correctBinaryDataId = `s3:${correctFileId}`;
+
+			expect(binaryDataService.rename).toHaveBeenCalledWith(incorrectFileId, correctFileId);
+			expect(getDataId(run, 'binary')).toBe(correctBinaryDataId);
+		});
+
+		it('should do nothing if binary data ID is not missing execution ID', async () => {
+			const workflowId = '6HYhhKmJch2cYxGj';
+			const executionId = '999';
+			const binaryDataFileUuid = 'a5c3f1ed-9d59-4155-bc68-9a370b3c51f6';
+
+			const fileId = `workflows/${workflowId}/executions/${executionId}/binary_data/${binaryDataFileUuid}`;
+
+			const binaryDataId = `s3:${fileId}`;
+
+			const run = toIRun({
+				binary: {
+					data: {
+						id: binaryDataId,
+					},
+				},
+			});
+
+			await restoreBinaryDataId(run, executionId, 'webhook');
+
+			expect(binaryDataService.rename).not.toHaveBeenCalled();
+			expect(getDataId(run, 'binary')).toBe(binaryDataId);
+		});
+
+		it('should do nothing if no binary data ID', async () => {
+			const executionId = '999';
+			const dataId = '123';
+
+			const run = toIRun({
+				json: {
+					data: { id: dataId },
+				},
+			});
+
+			await restoreBinaryDataId(run, executionId, 'webhook');
+
+			expect(binaryDataService.rename).not.toHaveBeenCalled();
+			expect(getDataId(run, 'json')).toBe(dataId);
+		});
+
+		it('should do nothing on itemless case', async () => {
+			const executionId = '999';
+
+			const promise = restoreBinaryDataId(toIRun(), executionId, 'webhook');
+
+			await expect(promise).resolves.not.toThrow();
+
+			expect(binaryDataService.rename).not.toHaveBeenCalled();
+		});
+
+		it('should do nothing if data is undefined', async () => {
+			const executionId = '999';
+
+			const run = toIRun({
+				json: {
+					data: undefined,
+				},
+			});
+
+			const promise = restoreBinaryDataId(run, executionId, 'webhook');
+
+			await expect(promise).resolves.not.toThrow();
+
+			expect(binaryDataService.rename).not.toHaveBeenCalled();
+		});
+
+		it('should do nothing if workflow execution mode is not `webhook`', async () => {
+			const executionId = '999';
+
+			const run = toIRun({
+				json: {
+					data: undefined,
+				},
+			});
+
+			const promise = restoreBinaryDataId(run, executionId, 'internal');
+
+			await expect(promise).resolves.not.toThrow();
+
+			expect(binaryDataService.rename).not.toHaveBeenCalled();
+		});
+
+		it('should ignore error thrown on renaming', async () => {
+			const workflowId = '6HYhhKmJch2cYxGj';
+			const executionId = 'temp';
+			const binaryDataFileUuid = 'a5c3f1ed-9d59-4155-bc68-9a370b3c51f6';
+
+			const incorrectFileId = `workflows/${workflowId}/executions/temp/binary_data/${binaryDataFileUuid}`;
+
+			const run = toIRun({
+				binary: {
+					data: { id: `s3:${incorrectFileId}` },
+				},
+			});
+
+			binaryDataService.rename.mockRejectedValueOnce(new Error('ENOENT'));
+
+			const promise = restoreBinaryDataId(run, executionId, 'webhook');
+
+			await expect(promise).resolves.not.toThrow();
+
+			expect(binaryDataService.rename).toHaveBeenCalled();
+		});
+	});
+}
+
+describe('on default mode', () => {
+	afterEach(() => {
+		config.load(config.default);
+	});
+
+	it('should do nothing', async () => {
+		config.set('binaryDataManager.mode', 'default');
+
+		const executionId = '999';
+
+		const run = toIRun({
+			json: {
+				data: undefined,
+			},
+		});
+
+		const promise = restoreBinaryDataId(run, executionId, 'internal');
+
+		await expect(promise).resolves.not.toThrow();
+
+		expect(binaryDataService.rename).not.toHaveBeenCalled();
+	});
+});
diff --git a/packages/cli/test/unit/execution-lifecyle/saveExecutionProgress.test.ts b/packages/cli/test/unit/execution-lifecyle/saveExecutionProgress.test.ts
new file mode 100644
index 0000000000000..4235e56ecbad3
--- /dev/null
+++ b/packages/cli/test/unit/execution-lifecyle/saveExecutionProgress.test.ts
@@ -0,0 +1,106 @@
+import { ExecutionRepository } from '@/databases/repositories/execution.repository';
+import { mockInstance } from '../../shared/mocking';
+import { Logger } from '@/Logger';
+import { saveExecutionProgress } from '@/executionLifecycleHooks/saveExecutionProgress';
+import * as fnModule from '@/executionLifecycleHooks/toSaveSettings';
+import {
+	ErrorReporterProxy,
+	type IRunExecutionData,
+	type ITaskData,
+	type IWorkflowBase,
+} from 'n8n-workflow';
+import type { IExecutionResponse } from '@/Interfaces';
+
+mockInstance(Logger);
+
+const executionRepository = mockInstance(ExecutionRepository);
+
+afterEach(() => {
+	jest.clearAllMocks();
+});
+
+const commonArgs: [IWorkflowBase, string, string, ITaskData, IRunExecutionData, string] = [
+	{} as IWorkflowBase,
+	'some-execution-id',
+	'My Node',
+	{} as ITaskData,
+	{} as IRunExecutionData,
+	'some-session-id',
+];
+
+const commonSettings = { error: true, success: true, manual: true };
+
+test('should ignore if save settings say so', async () => {
+	jest.spyOn(fnModule, 'toSaveSettings').mockReturnValue({
+		...commonSettings,
+		progress: false,
+	});
+
+	await saveExecutionProgress(...commonArgs);
+
+	expect(executionRepository.updateExistingExecution).not.toHaveBeenCalled();
+});
+
+test('should ignore on leftover async call', async () => {
+	jest.spyOn(fnModule, 'toSaveSettings').mockReturnValue({
+		...commonSettings,
+		progress: true,
+	});
+
+	executionRepository.findSingleExecution.mockResolvedValue({
+		finished: true,
+	} as IExecutionResponse);
+
+	await saveExecutionProgress(...commonArgs);
+
+	expect(executionRepository.updateExistingExecution).not.toHaveBeenCalled();
+});
+
+test('should update execution', async () => {
+	jest.spyOn(fnModule, 'toSaveSettings').mockReturnValue({
+		...commonSettings,
+		progress: true,
+	});
+
+	const reporterSpy = jest.spyOn(ErrorReporterProxy, 'error');
+
+	executionRepository.findSingleExecution.mockResolvedValue({} as IExecutionResponse);
+
+	await saveExecutionProgress(...commonArgs);
+
+	expect(executionRepository.updateExistingExecution).toHaveBeenCalledWith('some-execution-id', {
+		data: {
+			executionData: undefined,
+			resultData: {
+				lastNodeExecuted: 'My Node',
+				runData: {
+					'My Node': [{}],
+				},
+			},
+			startData: {},
+		},
+		status: 'running',
+	});
+
+	expect(reporterSpy).not.toHaveBeenCalled();
+});
+
+test('should report error on failure', async () => {
+	jest.spyOn(fnModule, 'toSaveSettings').mockReturnValue({
+		...commonSettings,
+		progress: true,
+	});
+
+	const reporterSpy = jest.spyOn(ErrorReporterProxy, 'error');
+
+	const error = new Error('Something went wrong');
+
+	executionRepository.findSingleExecution.mockImplementation(() => {
+		throw error;
+	});
+
+	await saveExecutionProgress(...commonArgs);
+
+	expect(executionRepository.updateExistingExecution).not.toHaveBeenCalled();
+	expect(reporterSpy).toHaveBeenCalledWith(error);
+});
diff --git a/packages/cli/test/unit/execution-lifecyle/toSaveSettings.test.ts b/packages/cli/test/unit/execution-lifecyle/toSaveSettings.test.ts
new file mode 100644
index 0000000000000..6fc516a0ea214
--- /dev/null
+++ b/packages/cli/test/unit/execution-lifecyle/toSaveSettings.test.ts
@@ -0,0 +1,154 @@
+import config from '@/config';
+import { toSaveSettings } from '@/executionLifecycleHooks/toSaveSettings';
+
+afterEach(() => {
+	config.load(config.default);
+});
+
+describe('failed production executions', () => {
+	it('should favor workflow settings over defaults', () => {
+		config.set('executions.saveDataOnError', 'none');
+
+		const saveSettings = toSaveSettings({ saveDataErrorExecution: 'all' });
+
+		expect(saveSettings.error).toBe(true);
+
+		config.set('executions.saveDataOnError', 'all');
+
+		const _saveSettings = toSaveSettings({ saveDataErrorExecution: 'none' });
+
+		expect(_saveSettings.error).toBe(false);
+	});
+
+	it('should fall back to default if no workflow setting', () => {
+		config.set('executions.saveDataOnError', 'all');
+
+		const saveSettings = toSaveSettings();
+
+		expect(saveSettings.error).toBe(true);
+
+		config.set('executions.saveDataOnError', 'none');
+
+		const _saveSettings = toSaveSettings();
+
+		expect(_saveSettings.error).toBe(false);
+	});
+});
+
+describe('sucessful production executions', () => {
+	it('should favor workflow settings over defaults', () => {
+		config.set('executions.saveDataOnSuccess', 'none');
+
+		const saveSettings = toSaveSettings({ saveDataSuccessExecution: 'all' });
+
+		expect(saveSettings.success).toBe(true);
+
+		config.set('executions.saveDataOnSuccess', 'all');
+
+		const _saveSettings = toSaveSettings({ saveDataSuccessExecution: 'none' });
+
+		expect(_saveSettings.success).toBe(false);
+	});
+
+	it('should fall back to default if no workflow setting', () => {
+		config.set('executions.saveDataOnSuccess', 'all');
+
+		const saveSettings = toSaveSettings();
+
+		expect(saveSettings.success).toBe(true);
+
+		config.set('executions.saveDataOnSuccess', 'none');
+
+		const _saveSettings = toSaveSettings();
+
+		expect(_saveSettings.success).toBe(false);
+	});
+});
+
+describe('manual executions', () => {
+	it('should favor workflow setting over default', () => {
+		config.set('executions.saveDataManualExecutions', false);
+
+		const saveSettings = toSaveSettings({ saveManualExecutions: true });
+
+		expect(saveSettings.manual).toBe(true);
+
+		config.set('executions.saveDataManualExecutions', true);
+
+		const _saveSettings = toSaveSettings({ saveManualExecutions: false });
+
+		expect(_saveSettings.manual).toBe(false);
+	});
+
+	it('should favor fall back to default if workflow setting is explicit default', () => {
+		config.set('executions.saveDataManualExecutions', true);
+
+		const saveSettings = toSaveSettings({ saveManualExecutions: 'DEFAULT' });
+
+		expect(saveSettings.manual).toBe(true);
+
+		config.set('executions.saveDataManualExecutions', false);
+
+		const _saveSettings = toSaveSettings({ saveManualExecutions: 'DEFAULT' });
+
+		expect(_saveSettings.manual).toBe(false);
+	});
+
+	it('should fall back to default if no workflow setting', () => {
+		config.set('executions.saveDataManualExecutions', true);
+
+		const saveSettings = toSaveSettings();
+
+		expect(saveSettings.manual).toBe(true);
+
+		config.set('executions.saveDataManualExecutions', false);
+
+		const _saveSettings = toSaveSettings();
+
+		expect(_saveSettings.manual).toBe(false);
+	});
+});
+
+describe('execution progress', () => {
+	it('should favor workflow setting over default', () => {
+		config.set('executions.saveExecutionProgress', false);
+
+		const saveSettings = toSaveSettings({ saveExecutionProgress: true });
+
+		expect(saveSettings.progress).toBe(true);
+
+		config.set('executions.saveExecutionProgress', true);
+
+		const _saveSettings = toSaveSettings({ saveExecutionProgress: false });
+
+		expect(_saveSettings.progress).toBe(false);
+	});
+
+	it('should favor fall back to default if workflow setting is explicit default', () => {
+		config.set('executions.saveExecutionProgress', true);
+
+		const saveSettings = toSaveSettings({ saveExecutionProgress: 'DEFAULT' });
+
+		expect(saveSettings.progress).toBe(true);
+
+		config.set('executions.saveExecutionProgress', false);
+
+		const _saveSettings = toSaveSettings({ saveExecutionProgress: 'DEFAULT' });
+
+		expect(_saveSettings.progress).toBe(false);
+	});
+
+	it('should fall back to default if no workflow setting', () => {
+		config.set('executions.saveExecutionProgress', true);
+
+		const saveSettings = toSaveSettings();
+
+		expect(saveSettings.progress).toBe(true);
+
+		config.set('executions.saveExecutionProgress', false);
+
+		const _saveSettings = toSaveSettings();
+
+		expect(_saveSettings.progress).toBe(false);
+	});
+});
diff --git a/packages/cli/test/unit/license/license.service.test.ts b/packages/cli/test/unit/license/license.service.test.ts
new file mode 100644
index 0000000000000..7ac75ba5b3623
--- /dev/null
+++ b/packages/cli/test/unit/license/license.service.test.ts
@@ -0,0 +1,76 @@
+import { LicenseErrors, LicenseService } from '@/license/license.service';
+import type { License } from '@/License';
+import type { InternalHooks } from '@/InternalHooks';
+import type { WorkflowRepository } from '@db/repositories/workflow.repository';
+import type { TEntitlement } from '@n8n_io/license-sdk';
+import { mock } from 'jest-mock-extended';
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
+
+describe('LicenseService', () => {
+	const license = mock<License>();
+	const internalHooks = mock<InternalHooks>();
+	const workflowRepository = mock<WorkflowRepository>();
+	const entitlement = mock<TEntitlement>({ productId: '123' });
+	const licenseService = new LicenseService(mock(), license, internalHooks, workflowRepository);
+
+	license.getMainPlan.mockReturnValue(entitlement);
+	license.getTriggerLimit.mockReturnValue(400);
+	license.getPlanName.mockReturnValue('Test Plan');
+	workflowRepository.getActiveTriggerCount.mockResolvedValue(7);
+
+	beforeEach(() => jest.clearAllMocks());
+
+	class LicenseError extends Error {
+		constructor(readonly errorId: string) {
+			super(`License error: ${errorId}`);
+		}
+	}
+
+	describe('getLicenseData', () => {
+		it('should return usage and license data', async () => {
+			const data = await licenseService.getLicenseData();
+			expect(data).toEqual({
+				usage: {
+					executions: {
+						limit: 400,
+						value: 7,
+						warningThreshold: 0.8,
+					},
+				},
+				license: {
+					planId: '123',
+					planName: 'Test Plan',
+				},
+			});
+		});
+	});
+
+	describe('activateLicense', () => {
+		Object.entries(LicenseErrors).forEach(([errorId, message]) =>
+			it(`should handle ${errorId} error`, async () => {
+				license.activate.mockRejectedValueOnce(new LicenseError(errorId));
+				await expect(licenseService.activateLicense('')).rejects.toThrowError(
+					new BadRequestError(message),
+				);
+			}),
+		);
+	});
+
+	describe('renewLicense', () => {
+		test('on success', async () => {
+			license.renew.mockResolvedValueOnce();
+			await licenseService.renewLicense();
+
+			expect(internalHooks.onLicenseRenewAttempt).toHaveBeenCalledWith({ success: true });
+		});
+
+		test('on failure', async () => {
+			license.renew.mockRejectedValueOnce(new LicenseError('RESERVATION_EXPIRED'));
+			await expect(licenseService.renewLicense()).rejects.toThrowError(
+				new BadRequestError('Activation key has expired'),
+			);
+
+			expect(internalHooks.onLicenseRenewAttempt).toHaveBeenCalledWith({ success: false });
+		});
+	});
+});
diff --git a/packages/cli/test/unit/middleware/executions/parse-range-query.middleware.test.ts b/packages/cli/test/unit/middleware/executions/parse-range-query.middleware.test.ts
new file mode 100644
index 0000000000000..d52d09b80cef8
--- /dev/null
+++ b/packages/cli/test/unit/middleware/executions/parse-range-query.middleware.test.ts
@@ -0,0 +1,178 @@
+import { parseRangeQuery } from '@/executions/parse-range-query.middleware';
+import { mock } from 'jest-mock-extended';
+import type { NextFunction } from 'express';
+import type * as express from 'express';
+import type { ExecutionRequest } from '@/executions/execution.types';
+
+describe('`parseRangeQuery` middleware', () => {
+	const res = mock<express.Response>({
+		status: () => mock<express.Response>({ json: jest.fn() }),
+	});
+
+	const nextFn: NextFunction = jest.fn();
+
+	beforeEach(() => {
+		jest.restoreAllMocks();
+	});
+
+	describe('errors', () => {
+		test('should fail on invalid JSON', () => {
+			const statusSpy = jest.spyOn(res, 'status');
+
+			const req = mock<ExecutionRequest.GetMany>({
+				query: {
+					filter: '{ "status": ["waiting }',
+					limit: undefined,
+					firstId: undefined,
+					lastId: undefined,
+				},
+			});
+
+			parseRangeQuery(req, res, nextFn);
+
+			expect(nextFn).toBeCalledTimes(0);
+			expect(statusSpy).toBeCalledWith(400);
+		});
+
+		test('should fail on invalid schema', () => {
+			const statusSpy = jest.spyOn(res, 'status');
+
+			const req = mock<ExecutionRequest.GetMany>({
+				query: {
+					filter: '{ "status": 123 }',
+					limit: undefined,
+					firstId: undefined,
+					lastId: undefined,
+				},
+			});
+
+			parseRangeQuery(req, res, nextFn);
+
+			expect(nextFn).toBeCalledTimes(0);
+			expect(statusSpy).toBeCalledWith(400);
+		});
+	});
+
+	describe('filter', () => {
+		test('should parse status and mode fields', () => {
+			const req = mock<ExecutionRequest.GetMany>({
+				query: {
+					filter: '{ "status": ["waiting"], "mode": "manual" }',
+					limit: undefined,
+					firstId: undefined,
+					lastId: undefined,
+				},
+			});
+
+			parseRangeQuery(req, res, nextFn);
+
+			expect(req.rangeQuery.status).toEqual(['waiting']);
+			expect(req.rangeQuery.mode).toEqual('manual');
+			expect(nextFn).toBeCalledTimes(1);
+		});
+
+		test('should parse date-related fields', () => {
+			const req = mock<ExecutionRequest.GetMany>({
+				query: {
+					filter:
+						'{ "startedBefore": "2021-01-01", "startedAfter": "2020-01-01", "waitTill": "true" }',
+					limit: undefined,
+					firstId: undefined,
+					lastId: undefined,
+				},
+			});
+
+			parseRangeQuery(req, res, nextFn);
+
+			expect(req.rangeQuery.startedBefore).toBe('2021-01-01');
+			expect(req.rangeQuery.startedAfter).toBe('2020-01-01');
+			expect(req.rangeQuery.waitTill).toBe(true);
+			expect(nextFn).toBeCalledTimes(1);
+		});
+
+		test('should parse ID-related fields', () => {
+			const req = mock<ExecutionRequest.GetMany>({
+				query: {
+					filter: '{ "id": "123", "workflowId": "456" }',
+					limit: undefined,
+					firstId: undefined,
+					lastId: undefined,
+				},
+			});
+
+			parseRangeQuery(req, res, nextFn);
+
+			expect(req.rangeQuery.id).toBe('123');
+			expect(req.rangeQuery.workflowId).toBe('456');
+			expect(nextFn).toBeCalledTimes(1);
+		});
+
+		test('should delete invalid fields', () => {
+			const req = mock<ExecutionRequest.GetMany>({
+				query: {
+					filter: '{ "id": "123", "test": "789" }',
+					limit: undefined,
+					firstId: undefined,
+					lastId: undefined,
+				},
+			});
+
+			parseRangeQuery(req, res, nextFn);
+
+			expect(req.rangeQuery.id).toBe('123');
+			expect('test' in req.rangeQuery).toBe(false);
+			expect(nextFn).toBeCalledTimes(1);
+		});
+	});
+
+	describe('range', () => {
+		test('should parse first and last IDs', () => {
+			const req = mock<ExecutionRequest.GetMany>({
+				query: {
+					filter: undefined,
+					limit: undefined,
+					firstId: '111',
+					lastId: '999',
+				},
+			});
+
+			parseRangeQuery(req, res, nextFn);
+
+			expect(req.rangeQuery.range.firstId).toBe('111');
+			expect(req.rangeQuery.range.lastId).toBe('999');
+			expect(nextFn).toBeCalledTimes(1);
+		});
+
+		test('should parse limit', () => {
+			const req = mock<ExecutionRequest.GetMany>({
+				query: {
+					filter: undefined,
+					limit: '50',
+					firstId: undefined,
+					lastId: undefined,
+				},
+			});
+
+			parseRangeQuery(req, res, nextFn);
+
+			expect(req.rangeQuery.range.limit).toEqual(50);
+			expect(nextFn).toBeCalledTimes(1);
+		});
+
+		test('should default limit to 20 if absent', () => {
+			const req = mock<ExecutionRequest.GetMany>({
+				query: {
+					filter: undefined,
+					limit: undefined,
+					firstId: undefined,
+					lastId: undefined,
+				},
+			});
+
+			parseRangeQuery(req, res, nextFn);
+
+			expect(req.rangeQuery.range.limit).toEqual(20);
+			expect(nextFn).toBeCalledTimes(1);
+		});
+	});
+});
diff --git a/packages/cli/test/unit/middleware/listQuery.test.ts b/packages/cli/test/unit/middleware/listQuery.test.ts
new file mode 100644
index 0000000000000..6da542de3863f
--- /dev/null
+++ b/packages/cli/test/unit/middleware/listQuery.test.ts
@@ -0,0 +1,221 @@
+import { filterListQueryMiddleware } from '@/middlewares/listQuery/filter';
+import { selectListQueryMiddleware } from '@/middlewares/listQuery/select';
+import { paginationListQueryMiddleware } from '@/middlewares/listQuery/pagination';
+import * as ResponseHelper from '@/ResponseHelper';
+import type { ListQuery } from '@/requests';
+import type { Response, NextFunction } from 'express';
+
+describe('List query middleware', () => {
+	let mockReq: ListQuery.Request;
+	let mockRes: Response;
+	let nextFn: NextFunction = jest.fn();
+	let args: [ListQuery.Request, Response, NextFunction];
+
+	let sendErrorResponse: jest.SpyInstance;
+
+	beforeEach(() => {
+		jest.restoreAllMocks();
+
+		mockReq = { baseUrl: '/rest/workflows' } as ListQuery.Request;
+		mockRes = { status: () => ({ json: jest.fn() }) } as unknown as Response;
+		args = [mockReq, mockRes, nextFn];
+
+		sendErrorResponse = jest.spyOn(ResponseHelper, 'sendErrorResponse');
+	});
+
+	describe('Query filter', () => {
+		test('should not set filter on request if none sent', async () => {
+			mockReq.query = {};
+
+			await filterListQueryMiddleware(...args);
+
+			expect(mockReq.listQueryOptions).toBeUndefined();
+			expect(nextFn).toBeCalledTimes(1);
+		});
+
+		test('should parse valid filter', async () => {
+			mockReq.query = { filter: '{ "name": "My Workflow" }' };
+
+			await filterListQueryMiddleware(...args);
+
+			expect(mockReq.listQueryOptions).toEqual({ filter: { name: 'My Workflow' } });
+			expect(nextFn).toBeCalledTimes(1);
+		});
+
+		test('should ignore invalid filter', async () => {
+			mockReq.query = { filter: '{ "name": "My Workflow", "foo": "bar" }' };
+
+			await filterListQueryMiddleware(...args);
+
+			expect(mockReq.listQueryOptions).toEqual({ filter: { name: 'My Workflow' } });
+			expect(nextFn).toBeCalledTimes(1);
+		});
+
+		test('should throw on invalid JSON', async () => {
+			mockReq.query = { filter: '{ "name" : "My Workflow"' };
+
+			await filterListQueryMiddleware(...args);
+
+			expect(sendErrorResponse).toHaveBeenCalledTimes(1);
+		});
+
+		test('should throw on valid filter with invalid type', async () => {
+			mockReq.query = { filter: '{ "name" : 123 }' };
+
+			await filterListQueryMiddleware(...args);
+
+			expect(sendErrorResponse).toHaveBeenCalledTimes(1);
+		});
+	});
+
+	describe('Query select', () => {
+		test('should not set select on request if none sent', async () => {
+			mockReq.query = {};
+
+			await filterListQueryMiddleware(...args);
+
+			expect(mockReq.listQueryOptions).toBeUndefined();
+			expect(nextFn).toBeCalledTimes(1);
+		});
+
+		test('should parse valid select', () => {
+			mockReq.query = { select: '["name", "id"]' };
+
+			selectListQueryMiddleware(...args);
+
+			expect(mockReq.listQueryOptions).toEqual({ select: { name: true, id: true } });
+			expect(nextFn).toBeCalledTimes(1);
+		});
+
+		test('ignore invalid select', () => {
+			mockReq.query = { select: '["name", "foo"]' };
+
+			selectListQueryMiddleware(...args);
+
+			expect(mockReq.listQueryOptions).toEqual({ select: { name: true } });
+			expect(nextFn).toBeCalledTimes(1);
+		});
+
+		test('throw on invalid JSON', () => {
+			mockReq.query = { select: '["name"' };
+
+			selectListQueryMiddleware(...args);
+
+			expect(sendErrorResponse).toHaveBeenCalledTimes(1);
+		});
+
+		test('throw on non-string-array JSON for select', () => {
+			mockReq.query = { select: '"name"' };
+
+			selectListQueryMiddleware(...args);
+
+			expect(sendErrorResponse).toHaveBeenCalledTimes(1);
+		});
+	});
+
+	describe('Query pagination', () => {
+		test('should not set pagination options on request if none sent', async () => {
+			mockReq.query = {};
+
+			await filterListQueryMiddleware(...args);
+
+			expect(mockReq.listQueryOptions).toBeUndefined();
+			expect(nextFn).toBeCalledTimes(1);
+		});
+
+		test('should parse valid pagination', () => {
+			mockReq.query = { skip: '1', take: '2' };
+			paginationListQueryMiddleware(...args);
+
+			expect(mockReq.listQueryOptions).toEqual({ skip: 1, take: 2 });
+			expect(nextFn).toBeCalledTimes(1);
+		});
+
+		test('should throw on skip without take', () => {
+			mockReq.query = { skip: '1' };
+			paginationListQueryMiddleware(...args);
+
+			expect(mockReq.listQueryOptions).toBeUndefined();
+			expect(sendErrorResponse).toHaveBeenCalledTimes(1);
+		});
+
+		test('should default skip to 0', () => {
+			mockReq.query = { take: '2' };
+			paginationListQueryMiddleware(...args);
+
+			expect(mockReq.listQueryOptions).toEqual({ skip: 0, take: 2 });
+			expect(nextFn).toBeCalledTimes(1);
+		});
+
+		test('should cap take at 50', () => {
+			mockReq.query = { take: '51' };
+
+			paginationListQueryMiddleware(...args);
+
+			expect(mockReq.listQueryOptions).toEqual({ skip: 0, take: 50 });
+			expect(nextFn).toBeCalledTimes(1);
+		});
+
+		test('should throw on non-numeric-integer take', () => {
+			mockReq.query = { take: '3.2' };
+
+			paginationListQueryMiddleware(...args);
+
+			expect(sendErrorResponse).toHaveBeenCalledTimes(1);
+		});
+
+		test('should throw on non-numeric-integer skip', () => {
+			mockReq.query = { take: '3', skip: '3.2' };
+
+			paginationListQueryMiddleware(...args);
+
+			expect(sendErrorResponse).toHaveBeenCalledTimes(1);
+		});
+	});
+
+	describe('Combinations', () => {
+		test('should combine filter with select', async () => {
+			mockReq.query = { filter: '{ "name": "My Workflow" }', select: '["name", "id"]' };
+
+			await filterListQueryMiddleware(...args);
+			selectListQueryMiddleware(...args);
+
+			expect(mockReq.listQueryOptions).toEqual({
+				select: { name: true, id: true },
+				filter: { name: 'My Workflow' },
+			});
+
+			expect(nextFn).toBeCalledTimes(2);
+		});
+
+		test('should combine filter with pagination options', async () => {
+			mockReq.query = { filter: '{ "name": "My Workflow" }', skip: '1', take: '2' };
+
+			await filterListQueryMiddleware(...args);
+			paginationListQueryMiddleware(...args);
+
+			expect(mockReq.listQueryOptions).toEqual({
+				filter: { name: 'My Workflow' },
+				skip: 1,
+				take: 2,
+			});
+
+			expect(nextFn).toBeCalledTimes(2);
+		});
+
+		test('should combine select with pagination options', async () => {
+			mockReq.query = { select: '["name", "id"]', skip: '1', take: '2' };
+
+			selectListQueryMiddleware(...args);
+			paginationListQueryMiddleware(...args);
+
+			expect(mockReq.listQueryOptions).toEqual({
+				select: { name: true, id: true },
+				skip: 1,
+				take: 2,
+			});
+
+			expect(nextFn).toBeCalledTimes(2);
+		});
+	});
+});
diff --git a/packages/cli/test/unit/middlewares/basicAuth.test.ts b/packages/cli/test/unit/middlewares/basicAuth.test.ts
deleted file mode 100644
index d4d952c7cdd88..0000000000000
--- a/packages/cli/test/unit/middlewares/basicAuth.test.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import express from 'express';
-import request from 'supertest';
-import config from '@/config';
-import { setupBasicAuth } from '@/middlewares/basicAuth';
-
-describe('Basic Auth Middleware', () => {
-	let app: express.Application;
-
-	beforeAll(() => {
-		app = express();
-		config.set('security.basicAuth', { user: 'jim', password: 'n8n', hash: false });
-		setupBasicAuth(app, config, new RegExp('^/skip-auth'));
-		app.get('/test', (req, res) => res.send({ auth: true }));
-		app.get('/skip-auth', (req, res) => res.send({ auth: false }));
-	});
-
-	it('should not block calls to /skip-auth', async () => {
-		const response = await request(app).get('/skip-auth');
-		expect(response.statusCode).toEqual(200);
-		expect(response.headers).not.toHaveProperty('www-authenticate');
-		expect(response.body).toEqual({ auth: false });
-	});
-
-	it('should block calls to /test if auth is absent', async () => {
-		const response = await request(app).get('/test');
-		expect(response.statusCode).toEqual(401);
-		expect(response.headers).toHaveProperty('www-authenticate');
-	});
-
-	it('should block calls to /test if auth is invalid', async () => {
-		const response = await request(app).get('/test').auth('user', 'invalid');
-		expect(response.statusCode).toEqual(401);
-		expect(response.headers).toHaveProperty('www-authenticate');
-	});
-
-	it('should allow access to /test if basic auth header is valid', async () => {
-		const response = await request(app).get('/test').auth('jim', 'n8n');
-		expect(response.statusCode).toEqual(200);
-		expect(response.headers).not.toHaveProperty('www-authenticate');
-		expect(response.body).toEqual({ auth: true });
-	});
-});
diff --git a/packages/cli/test/unit/middlewares/externalJWTAuth.test.ts b/packages/cli/test/unit/middlewares/externalJWTAuth.test.ts
deleted file mode 100644
index 42b2b19af488f..0000000000000
--- a/packages/cli/test/unit/middlewares/externalJWTAuth.test.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import express from 'express';
-import request from 'supertest';
-import createJWKSMock from 'mock-jwks';
-import config from '@/config';
-import { setupExternalJWTAuth } from '@/middlewares/externalJWTAuth';
-
-const testJWKUri = 'https://n8n.test/';
-const jwksMock = createJWKSMock(testJWKUri);
-
-describe('External JWT Auth Middleware', () => {
-	let app: express.Application;
-
-	beforeAll(() => {
-		app = express();
-		config.set('security.jwtAuth.jwtHeader', 'Authorization');
-		config.set('security.jwtAuth.jwtHeaderValuePrefix', 'Bearer');
-		config.set('security.jwtAuth.jwtIssuer', 'n8n');
-		config.set('security.jwtAuth.jwksUri', `${testJWKUri}.well-known/jwks.json`);
-		setupExternalJWTAuth(app, config, new RegExp('^/skip-auth'));
-		app.get('/test', (req, res) => res.send({ auth: true }));
-		app.get('/skip-auth', (req, res) => res.send({ auth: false }));
-
-		jwksMock.start();
-	});
-
-	it('should not block calls to /skip-auth', async () => {
-		const response = await request(app).get('/skip-auth');
-		expect(response.statusCode).toEqual(200);
-		expect(response.body).toEqual({ auth: false });
-	});
-
-	it('should block calls to /test if auth is absent', async () =>
-		request(app).get('/test').expect(403));
-
-	it('should block calls to /test if auth is invalid', async () => {
-		const token = jwksMock.token({ iss: 'invalid' });
-		const response = await request(app).get('/test').set('Authorization', `Bearer ${token}`);
-		expect(response.statusCode).toEqual(403);
-	});
-
-	it('should allow access to /test if JWT auth header is valid', async () => {
-		const token = jwksMock.token({ iss: 'n8n' });
-		const response = await request(app).get('/test').set('Authorization', `Bearer ${token}`);
-		expect(response.statusCode).toEqual(200);
-		expect(response.body).toEqual({ auth: true });
-	});
-});
diff --git a/packages/cli/test/unit/push/index.test.ts b/packages/cli/test/unit/push/index.test.ts
new file mode 100644
index 0000000000000..390ee100e7a0c
--- /dev/null
+++ b/packages/cli/test/unit/push/index.test.ts
@@ -0,0 +1,42 @@
+import type { WebSocket } from 'ws';
+import config from '@/config';
+import type { User } from '@db/entities/User';
+import { Push } from '@/push';
+import { SSEPush } from '@/push/sse.push';
+import { WebSocketPush } from '@/push/websocket.push';
+import type { WebSocketPushRequest, SSEPushRequest } from '@/push/types';
+import { mockInstance } from '../../shared/mocking';
+import { mock } from 'jest-mock-extended';
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
+
+jest.unmock('@/push');
+
+describe('Push', () => {
+	const user = mock<User>();
+
+	const sseBackend = mockInstance(SSEPush);
+	const wsBackend = mockInstance(WebSocketPush);
+
+	test('should validate pushRef on requests for websocket backend', () => {
+		config.set('push.backend', 'websocket');
+		const push = new Push();
+		const ws = mock<WebSocket>();
+		const request = mock<WebSocketPushRequest>({ user, ws });
+		request.query = { pushRef: '' };
+		push.handleRequest(request, mock());
+
+		expect(ws.send).toHaveBeenCalled();
+		expect(ws.close).toHaveBeenCalledWith(1008);
+		expect(wsBackend.add).not.toHaveBeenCalled();
+	});
+
+	test('should validate pushRef on requests for SSE backend', () => {
+		config.set('push.backend', 'sse');
+		const push = new Push();
+		const request = mock<SSEPushRequest>({ user, ws: undefined });
+		request.query = { pushRef: '' };
+		expect(() => push.handleRequest(request, mock())).toThrow(BadRequestError);
+
+		expect(sseBackend.add).not.toHaveBeenCalled();
+	});
+});
diff --git a/packages/cli/test/unit/push/websocket.push.test.ts b/packages/cli/test/unit/push/websocket.push.test.ts
new file mode 100644
index 0000000000000..47f67a68478fd
--- /dev/null
+++ b/packages/cli/test/unit/push/websocket.push.test.ts
@@ -0,0 +1,161 @@
+import Container from 'typedi';
+import { EventEmitter } from 'events';
+import type WebSocket from 'ws';
+import { WebSocketPush } from '@/push/websocket.push';
+import { Logger } from '@/Logger';
+import type { User } from '@db/entities/User';
+import type { PushDataExecutionRecovered } from '@/Interfaces';
+import { mockInstance } from '../../shared/mocking';
+
+jest.useFakeTimers();
+
+class MockWebSocket extends EventEmitter {
+	public isAlive = true;
+
+	public ping = jest.fn();
+
+	public send = jest.fn();
+
+	public terminate = jest.fn();
+
+	public close = jest.fn();
+}
+
+const createMockWebSocket = () => new MockWebSocket() as unknown as jest.Mocked<WebSocket>;
+
+describe('WebSocketPush', () => {
+	const pushRef1 = 'test-session1';
+	const pushRef2 = 'test-session2';
+	const userId: User['id'] = 'test-user';
+
+	mockInstance(Logger);
+	const webSocketPush = Container.get(WebSocketPush);
+	const mockWebSocket1 = createMockWebSocket();
+	const mockWebSocket2 = createMockWebSocket();
+
+	beforeEach(() => {
+		jest.resetAllMocks();
+	});
+
+	it('can add a connection', () => {
+		webSocketPush.add(pushRef1, userId, mockWebSocket1);
+
+		expect(mockWebSocket1.listenerCount('close')).toBe(1);
+		expect(mockWebSocket1.listenerCount('pong')).toBe(1);
+		expect(mockWebSocket1.listenerCount('message')).toBe(1);
+	});
+
+	it('closes a connection', () => {
+		webSocketPush.add(pushRef1, userId, mockWebSocket1);
+
+		mockWebSocket1.emit('close');
+
+		expect(mockWebSocket1.listenerCount('close')).toBe(0);
+		expect(mockWebSocket1.listenerCount('pong')).toBe(0);
+		expect(mockWebSocket1.listenerCount('message')).toBe(0);
+	});
+
+	it('sends data to one connection', () => {
+		webSocketPush.add(pushRef1, userId, mockWebSocket1);
+		webSocketPush.add(pushRef2, userId, mockWebSocket2);
+		const data: PushDataExecutionRecovered = {
+			type: 'executionRecovered',
+			data: {
+				executionId: 'test-execution-id',
+			},
+		};
+
+		webSocketPush.sendToOneSession('executionRecovered', data, pushRef1);
+
+		expect(mockWebSocket1.send).toHaveBeenCalledWith(
+			JSON.stringify({
+				type: 'executionRecovered',
+				data: {
+					type: 'executionRecovered',
+					data: {
+						executionId: 'test-execution-id',
+					},
+				},
+			}),
+		);
+		expect(mockWebSocket2.send).not.toHaveBeenCalled();
+	});
+
+	it('sends data to all connections', () => {
+		webSocketPush.add(pushRef1, userId, mockWebSocket1);
+		webSocketPush.add(pushRef2, userId, mockWebSocket2);
+		const data: PushDataExecutionRecovered = {
+			type: 'executionRecovered',
+			data: {
+				executionId: 'test-execution-id',
+			},
+		};
+
+		webSocketPush.sendToAll('executionRecovered', data);
+
+		const expectedMsg = JSON.stringify({
+			type: 'executionRecovered',
+			data: {
+				type: 'executionRecovered',
+				data: {
+					executionId: 'test-execution-id',
+				},
+			},
+		});
+		expect(mockWebSocket1.send).toHaveBeenCalledWith(expectedMsg);
+		expect(mockWebSocket2.send).toHaveBeenCalledWith(expectedMsg);
+	});
+
+	it('sends data to all users connections', () => {
+		webSocketPush.add(pushRef1, userId, mockWebSocket1);
+		webSocketPush.add(pushRef2, userId, mockWebSocket2);
+		const data: PushDataExecutionRecovered = {
+			type: 'executionRecovered',
+			data: {
+				executionId: 'test-execution-id',
+			},
+		};
+
+		webSocketPush.sendToUsers('executionRecovered', data, [userId]);
+
+		const expectedMsg = JSON.stringify({
+			type: 'executionRecovered',
+			data: {
+				type: 'executionRecovered',
+				data: {
+					executionId: 'test-execution-id',
+				},
+			},
+		});
+		expect(mockWebSocket1.send).toHaveBeenCalledWith(expectedMsg);
+		expect(mockWebSocket2.send).toHaveBeenCalledWith(expectedMsg);
+	});
+
+	it('pings all connections', () => {
+		webSocketPush.add(pushRef1, userId, mockWebSocket1);
+		webSocketPush.add(pushRef2, userId, mockWebSocket2);
+
+		jest.runOnlyPendingTimers();
+
+		expect(mockWebSocket1.ping).toHaveBeenCalled();
+		expect(mockWebSocket2.ping).toHaveBeenCalled();
+	});
+
+	it('emits message event when connection receives data', () => {
+		const mockOnMessageReceived = jest.fn();
+		webSocketPush.on('message', mockOnMessageReceived);
+		webSocketPush.add(pushRef1, userId, mockWebSocket1);
+		webSocketPush.add(pushRef2, userId, mockWebSocket2);
+
+		const data = { test: 'data' };
+		const buffer = Buffer.from(JSON.stringify(data));
+
+		mockWebSocket1.emit('message', buffer);
+
+		expect(mockOnMessageReceived).toHaveBeenCalledWith({
+			msg: data,
+			pushRef: pushRef1,
+			userId,
+		});
+	});
+});
diff --git a/packages/cli/test/unit/repositories/execution.repository.test.ts b/packages/cli/test/unit/repositories/execution.repository.test.ts
new file mode 100644
index 0000000000000..f09d22fe72a1b
--- /dev/null
+++ b/packages/cli/test/unit/repositories/execution.repository.test.ts
@@ -0,0 +1,70 @@
+import Container from 'typedi';
+
+import type { SelectQueryBuilder } from '@n8n/typeorm';
+import { Not, LessThanOrEqual } from '@n8n/typeorm';
+
+import config from '@/config';
+import { ExecutionEntity } from '@db/entities/ExecutionEntity';
+import { ExecutionRepository } from '@db/repositories/execution.repository';
+import { mockEntityManager } from '../../shared/mocking';
+import { mockInstance } from '../../shared/mocking';
+import { BinaryDataService } from 'n8n-core';
+import { nanoid } from 'nanoid';
+import { mock } from 'jest-mock-extended';
+
+describe('ExecutionRepository', () => {
+	const entityManager = mockEntityManager(ExecutionEntity);
+	const binaryDataService = mockInstance(BinaryDataService);
+	const executionRepository = Container.get(ExecutionRepository);
+	const mockDate = new Date('2023-12-28 12:34:56.789Z');
+
+	beforeAll(() => {
+		jest.clearAllMocks();
+		jest.useFakeTimers().setSystemTime(mockDate);
+	});
+
+	afterAll(() => jest.useRealTimers());
+
+	describe('getWaitingExecutions()', () => {
+		test.each(['sqlite', 'postgres'])(
+			'on %s, should be called with expected args',
+			async (dbType) => {
+				jest.spyOn(config, 'getEnv').mockReturnValueOnce(dbType);
+				entityManager.find.mockResolvedValueOnce([]);
+
+				await executionRepository.getWaitingExecutions();
+
+				expect(entityManager.find).toHaveBeenCalledWith(ExecutionEntity, {
+					order: { waitTill: 'ASC' },
+					select: ['id', 'waitTill'],
+					where: {
+						status: Not('crashed'),
+						waitTill: LessThanOrEqual(
+							dbType === 'sqlite'
+								? '2023-12-28 12:36:06.789'
+								: new Date('2023-12-28T12:36:06.789Z'),
+						),
+					},
+				});
+			},
+		);
+	});
+
+	describe('deleteExecutionsByFilter', () => {
+		test('should delete binary data', async () => {
+			const workflowId = nanoid();
+
+			jest.spyOn(executionRepository, 'createQueryBuilder').mockReturnValue(
+				mock<SelectQueryBuilder<ExecutionEntity>>({
+					select: jest.fn().mockReturnThis(),
+					andWhere: jest.fn().mockReturnThis(),
+					getMany: jest.fn().mockResolvedValue([{ id: '1', workflowId }]),
+				}),
+			);
+
+			await executionRepository.deleteExecutionsByFilter({ id: '1' }, ['1'], { ids: ['1'] });
+
+			expect(binaryDataService.deleteMany).toHaveBeenCalledWith([{ executionId: '1', workflowId }]);
+		});
+	});
+});
diff --git a/packages/cli/test/unit/repositories/role.repository.test.ts b/packages/cli/test/unit/repositories/role.repository.test.ts
deleted file mode 100644
index ad37f797fc0c7..0000000000000
--- a/packages/cli/test/unit/repositories/role.repository.test.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import { Container } from 'typedi';
-import { DataSource, EntityManager } from 'typeorm';
-import { mock } from 'jest-mock-extended';
-import { Role, RoleNames, RoleScopes } from '@db/entities/Role';
-import { RoleRepository } from '@db/repositories/role.repository';
-import { mockInstance } from '../../integration/shared/utils';
-import { randomInteger } from '../../integration/shared/random';
-
-describe('RoleRepository', () => {
-	const entityManager = mockInstance(EntityManager);
-	const dataSource = mockInstance(DataSource, { manager: entityManager });
-	dataSource.getMetadata.mockReturnValue(mock());
-	Object.assign(entityManager, { connection: dataSource });
-	const roleRepository = Container.get(RoleRepository);
-
-	describe('findRole', () => {
-		test('should return the role when present', async () => {
-			entityManager.findOne.mockResolvedValueOnce(createRole('global', 'owner'));
-			const role = await roleRepository.findRole('global', 'owner');
-			expect(role?.name).toEqual('owner');
-			expect(role?.scope).toEqual('global');
-		});
-
-		test('should return null otherwise', async () => {
-			entityManager.findOne.mockResolvedValueOnce(null);
-			const role = await roleRepository.findRole('global', 'owner');
-			expect(role).toEqual(null);
-		});
-	});
-
-	describe('findRoleOrFail', () => {
-		test('should return the role when present', async () => {
-			entityManager.findOneOrFail.mockResolvedValueOnce(createRole('global', 'owner'));
-			const role = await roleRepository.findRoleOrFail('global', 'owner');
-			expect(role?.name).toEqual('owner');
-			expect(role?.scope).toEqual('global');
-		});
-
-		test('should throw otherwise', async () => {
-			entityManager.findOneOrFail.mockRejectedValueOnce(new Error());
-			expect(() => roleRepository.findRoleOrFail('global', 'owner')).rejects.toThrow();
-		});
-	});
-
-	const createRole = (scope: RoleScopes, name: RoleNames) =>
-		Object.assign(new Role(), { name, scope, id: `${randomInteger()}` });
-});
diff --git a/packages/cli/test/unit/repositories/sharedCredentials.repository.test.ts b/packages/cli/test/unit/repositories/sharedCredentials.repository.test.ts
new file mode 100644
index 0000000000000..1624cf5e655b9
--- /dev/null
+++ b/packages/cli/test/unit/repositories/sharedCredentials.repository.test.ts
@@ -0,0 +1,70 @@
+import { Container } from 'typedi';
+import { mock } from 'jest-mock-extended';
+import { hasScope } from '@n8n/permissions';
+
+import type { User } from '@db/entities/User';
+import type { CredentialsEntity } from '@db/entities/CredentialsEntity';
+import { SharedCredentials } from '@db/entities/SharedCredentials';
+import { SharedCredentialsRepository } from '@db/repositories/sharedCredentials.repository';
+import { memberPermissions, ownerPermissions } from '@/permissions/roles';
+import { mockEntityManager } from '../../shared/mocking';
+
+describe('SharedCredentialsRepository', () => {
+	const entityManager = mockEntityManager(SharedCredentials);
+	const repository = Container.get(SharedCredentialsRepository);
+
+	describe('findCredentialForUser', () => {
+		const credentialsId = 'cred_123';
+		const sharedCredential = mock<SharedCredentials>();
+		sharedCredential.credentials = mock<CredentialsEntity>({ id: credentialsId });
+		const owner = mock<User>({
+			isOwner: true,
+			hasGlobalScope: (scope) =>
+				hasScope(scope, {
+					global: ownerPermissions,
+				}),
+		});
+		const member = mock<User>({
+			isOwner: false,
+			id: 'test',
+			hasGlobalScope: (scope) =>
+				hasScope(scope, {
+					global: memberPermissions,
+				}),
+		});
+
+		beforeEach(() => {
+			jest.resetAllMocks();
+		});
+
+		test('should allow instance owner access to all credentials', async () => {
+			entityManager.findOne.mockResolvedValueOnce(sharedCredential);
+			const credential = await repository.findCredentialForUser(credentialsId, owner);
+			expect(entityManager.findOne).toHaveBeenCalledWith(SharedCredentials, {
+				relations: ['credentials'],
+				where: { credentialsId },
+			});
+			expect(credential).toEqual(sharedCredential.credentials);
+		});
+
+		test('should allow members', async () => {
+			entityManager.findOne.mockResolvedValueOnce(sharedCredential);
+			const credential = await repository.findCredentialForUser(credentialsId, member);
+			expect(entityManager.findOne).toHaveBeenCalledWith(SharedCredentials, {
+				relations: ['credentials'],
+				where: { credentialsId, userId: member.id },
+			});
+			expect(credential).toEqual(sharedCredential.credentials);
+		});
+
+		test('should return null when no shared credential is found', async () => {
+			entityManager.findOne.mockResolvedValueOnce(null);
+			const credential = await repository.findCredentialForUser(credentialsId, member);
+			expect(entityManager.findOne).toHaveBeenCalledWith(SharedCredentials, {
+				relations: ['credentials'],
+				where: { credentialsId, userId: member.id },
+			});
+			expect(credential).toEqual(null);
+		});
+	});
+});
diff --git a/packages/cli/test/unit/repositories/workflowStatistics.test.ts b/packages/cli/test/unit/repositories/workflowStatistics.test.ts
new file mode 100644
index 0000000000000..86e0ee1c92bd1
--- /dev/null
+++ b/packages/cli/test/unit/repositories/workflowStatistics.test.ts
@@ -0,0 +1,54 @@
+import { Container } from 'typedi';
+import { type InsertResult, QueryFailedError } from '@n8n/typeorm';
+import { mock, mockClear } from 'jest-mock-extended';
+
+import { StatisticsNames, WorkflowStatistics } from '@db/entities/WorkflowStatistics';
+import { WorkflowStatisticsRepository } from '@db/repositories/workflowStatistics.repository';
+
+import { mockEntityManager } from '../../shared/mocking';
+
+describe('insertWorkflowStatistics', () => {
+	const entityManager = mockEntityManager(WorkflowStatistics);
+	const workflowStatisticsRepository = Container.get(WorkflowStatisticsRepository);
+
+	beforeEach(() => {
+		mockClear(entityManager.insert);
+	});
+
+	it('Successfully inserts data when it is not yet present', async () => {
+		entityManager.findOne.mockResolvedValueOnce(null);
+		entityManager.insert.mockResolvedValueOnce(mock<InsertResult>());
+
+		const insertionResult = await workflowStatisticsRepository.insertWorkflowStatistics(
+			StatisticsNames.dataLoaded,
+			'workflowId',
+		);
+
+		expect(insertionResult).toBe('insert');
+	});
+
+	it('Does not insert when data is present', async () => {
+		entityManager.findOne.mockResolvedValueOnce(mock<WorkflowStatistics>());
+		const insertionResult = await workflowStatisticsRepository.insertWorkflowStatistics(
+			StatisticsNames.dataLoaded,
+			'workflowId',
+		);
+
+		expect(insertionResult).toBe('alreadyExists');
+		expect(entityManager.insert).not.toHaveBeenCalled();
+	});
+
+	it('throws an error when insertion fails', async () => {
+		entityManager.findOne.mockResolvedValueOnce(null);
+		entityManager.insert.mockImplementation(async () => {
+			throw new QueryFailedError('Query', [], new Error('driver error'));
+		});
+
+		const insertionResult = await workflowStatisticsRepository.insertWorkflowStatistics(
+			StatisticsNames.dataLoaded,
+			'workflowId',
+		);
+
+		expect(insertionResult).toBe('failed');
+	});
+});
diff --git a/packages/cli/test/unit/services/activeWorkflows.service.test.ts b/packages/cli/test/unit/services/activeWorkflows.service.test.ts
new file mode 100644
index 0000000000000..7432d22491a34
--- /dev/null
+++ b/packages/cli/test/unit/services/activeWorkflows.service.test.ts
@@ -0,0 +1,81 @@
+import type { ActivationErrorsService } from '@/ActivationErrors.service';
+import type { User } from '@db/entities/User';
+import type { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
+import type { WorkflowRepository } from '@db/repositories/workflow.repository';
+import { ActiveWorkflowsService } from '@/services/activeWorkflows.service';
+import { mock } from 'jest-mock-extended';
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
+
+describe('ActiveWorkflowsService', () => {
+	const user = mock<User>();
+	const workflowRepository = mock<WorkflowRepository>();
+	const sharedWorkflowRepository = mock<SharedWorkflowRepository>();
+	const activationErrorsService = mock<ActivationErrorsService>();
+	const service = new ActiveWorkflowsService(
+		mock(),
+		workflowRepository,
+		sharedWorkflowRepository,
+		activationErrorsService,
+	);
+	const activeIds = ['1', '2', '3', '4'];
+
+	beforeEach(() => jest.clearAllMocks());
+
+	describe('getAllActiveIdsInStorage', () => {
+		it('should filter out any workflow ids that have activation errors', async () => {
+			activationErrorsService.getAll.mockResolvedValue({ 1: 'some error' });
+			workflowRepository.getActiveIds.mockResolvedValue(activeIds);
+
+			const ids = await service.getAllActiveIdsInStorage();
+			expect(ids).toEqual(['2', '3', '4']);
+		});
+	});
+
+	describe('getAllActiveIdsFor', () => {
+		beforeEach(() => {
+			activationErrorsService.getAll.mockResolvedValue({ 1: 'some error' });
+			workflowRepository.getActiveIds.mockResolvedValue(activeIds);
+		});
+
+		it('should return all workflow ids when user has full access', async () => {
+			user.hasGlobalScope.mockReturnValue(true);
+			const ids = await service.getAllActiveIdsFor(user);
+
+			expect(ids).toEqual(['2', '3', '4']);
+			expect(user.hasGlobalScope).toHaveBeenCalledWith('workflow:list');
+			expect(sharedWorkflowRepository.getSharedWorkflowIds).not.toHaveBeenCalled();
+		});
+
+		it('should filter out workflow ids that the user does not have access to', async () => {
+			user.hasGlobalScope.mockReturnValue(false);
+			sharedWorkflowRepository.getSharedWorkflowIds.mockResolvedValue(['3']);
+			const ids = await service.getAllActiveIdsFor(user);
+
+			expect(ids).toEqual(['3']);
+			expect(user.hasGlobalScope).toHaveBeenCalledWith('workflow:list');
+			expect(sharedWorkflowRepository.getSharedWorkflowIds).toHaveBeenCalledWith(activeIds);
+		});
+	});
+
+	describe('getActivationError', () => {
+		const workflowId = 'workflowId';
+
+		it('should throw a BadRequestError a user does not have access to the workflow id', async () => {
+			sharedWorkflowRepository.hasAccess.mockResolvedValue(false);
+			await expect(service.getActivationError(workflowId, user)).rejects.toThrow(BadRequestError);
+
+			expect(sharedWorkflowRepository.hasAccess).toHaveBeenCalledWith(workflowId, user);
+			expect(activationErrorsService.get).not.toHaveBeenCalled();
+		});
+
+		it('should return the error when the user has access', async () => {
+			sharedWorkflowRepository.hasAccess.mockResolvedValue(true);
+			activationErrorsService.get.mockResolvedValue('some-error');
+			const error = await service.getActivationError(workflowId, user);
+
+			expect(error).toEqual('some-error');
+			expect(sharedWorkflowRepository.hasAccess).toHaveBeenCalledWith(workflowId, user);
+			expect(activationErrorsService.get).toHaveBeenCalledWith(workflowId);
+		});
+	});
+});
diff --git a/packages/cli/test/unit/services/ai.service.test.ts b/packages/cli/test/unit/services/ai.service.test.ts
new file mode 100644
index 0000000000000..2f93faa13a493
--- /dev/null
+++ b/packages/cli/test/unit/services/ai.service.test.ts
@@ -0,0 +1,225 @@
+import { ApplicationError, jsonParse } from 'n8n-workflow';
+import { AIService } from '@/services/ai.service';
+import config from '@/config';
+import {
+	generateCurlCommandFallbackPromptTemplate,
+	generateCurlCommandPromptTemplate,
+} from '@/services/ai/prompts/generateCurl';
+import { PineconeStore } from '@langchain/pinecone';
+
+jest.mock('@/config', () => {
+	return {
+		getEnv: jest.fn().mockReturnValue('openai'),
+	};
+});
+
+jest.mock('langchain/output_parsers', () => {
+	return {
+		JsonOutputFunctionsParser: jest.fn().mockImplementation(() => {
+			return {
+				parse: jest.fn(),
+			};
+		}),
+	};
+});
+
+jest.mock('@langchain/pinecone', () => {
+	const similaritySearch = jest.fn().mockImplementation(async () => []);
+
+	return {
+		PineconeStore: {
+			similaritySearch,
+			fromExistingIndex: jest.fn().mockImplementation(async () => ({
+				similaritySearch,
+			})),
+		},
+	};
+});
+
+jest.mock('@pinecone-database/pinecone', () => ({
+	Pinecone: jest.fn().mockImplementation(() => ({
+		Index: jest.fn().mockImplementation(() => ({})),
+	})),
+}));
+
+jest.mock('@/services/ai/providers/openai', () => {
+	const modelInvoke = jest.fn().mockImplementation(() => ({ curl: 'curl -X GET https://n8n.io' }));
+
+	return {
+		AIProviderOpenAI: jest.fn().mockImplementation(() => {
+			return {
+				mapResponse: jest.fn((v) => v),
+				invoke: modelInvoke,
+				model: {
+					invoke: modelInvoke,
+				},
+				modelWithOutputParser: () => ({
+					invoke: modelInvoke,
+				}),
+			};
+		}),
+	};
+});
+
+afterEach(() => {
+	jest.clearAllMocks();
+});
+
+describe('AIService', () => {
+	describe('constructor', () => {
+		test('should not assign provider with unknown provider type', async () => {
+			jest.mocked(config).getEnv.mockReturnValue('unknown');
+			const aiService = new AIService();
+
+			expect(aiService.provider).not.toBeDefined();
+		});
+	});
+
+	describe('prompt', () => {
+		test('should throw if prompting with unknown provider type', async () => {
+			jest.mocked(config).getEnv.mockReturnValue('unknown');
+
+			const aiService = new AIService();
+
+			await expect(async () => await aiService.prompt([])).rejects.toThrow(ApplicationError);
+		});
+
+		test('should call provider.invoke', async () => {
+			jest.mocked(config).getEnv.mockReturnValue('openai');
+
+			const service = new AIService();
+			await service.prompt(['message']);
+
+			expect(service.provider.invoke).toHaveBeenCalled();
+		});
+	});
+
+	describe('generateCurl', () => {
+		test('should call generateCurl fallback if pinecone key is not defined', async () => {
+			jest.mocked(config).getEnv.mockImplementation((key: string) => {
+				if (key === 'ai.pinecone.apiKey') {
+					return undefined;
+				}
+
+				return 'openai';
+			});
+
+			const service = new AIService();
+			const generateCurlGenericSpy = jest.spyOn(service, 'generateCurlGeneric');
+			service.validateCurl = (v) => v;
+
+			const serviceName = 'Service Name';
+			const serviceRequest = 'Please make a request';
+
+			await service.generateCurl(serviceName, serviceRequest);
+
+			expect(generateCurlGenericSpy).toHaveBeenCalled();
+		});
+
+		test('should call generateCurl fallback if no matched service', async () => {
+			jest.mocked(config).getEnv.mockReturnValue('openai');
+
+			const service = new AIService();
+			const generateCurlGenericSpy = jest.spyOn(service, 'generateCurlGeneric');
+			service.validateCurl = (v) => v;
+
+			const serviceName = 'NoMatchedServiceName';
+			const serviceRequest = 'Please make a request';
+
+			await service.generateCurl(serviceName, serviceRequest);
+
+			expect(generateCurlGenericSpy).toHaveBeenCalled();
+		});
+
+		test('should call generateCurl fallback command if no matched vector store documents', async () => {
+			jest.mocked(config).getEnv.mockReturnValue('openai');
+
+			const service = new AIService();
+			const generateCurlGenericSpy = jest.spyOn(service, 'generateCurlGeneric');
+			service.validateCurl = (v) => v;
+
+			const serviceName = 'OpenAI';
+			const serviceRequest = 'Please make a request';
+
+			await service.generateCurl(serviceName, serviceRequest);
+
+			expect(generateCurlGenericSpy).toHaveBeenCalled();
+		});
+
+		test('should call generateCurl command with documents from vectorStore', async () => {
+			const endpoints = [
+				{
+					id: '1',
+					title: 'OpenAI',
+					pageContent: '{ "example": "value" }',
+				},
+			];
+			const serviceName = 'OpenAI';
+			const serviceRequest = 'Please make a request';
+
+			jest.mocked(config).getEnv.mockReturnValue('openai');
+			jest
+				.mocked((PineconeStore as unknown as { similaritySearch: () => {} }).similaritySearch)
+				.mockImplementation(async () => endpoints);
+
+			const service = new AIService();
+			service.validateCurl = (v) => v;
+
+			await service.generateCurl(serviceName, serviceRequest);
+
+			const messages = await generateCurlCommandPromptTemplate.formatMessages({
+				serviceName,
+				serviceRequest,
+				endpoints: JSON.stringify(endpoints.map((document) => jsonParse(document.pageContent))),
+			});
+
+			expect(service.provider.model.invoke).toHaveBeenCalled();
+			expect(service.provider.model.invoke.mock.calls[0][0].messages).toEqual(messages);
+		});
+	});
+
+	describe('generateCurlGeneric', () => {
+		test('should call prompt with serviceName and serviceRequest', async () => {
+			const serviceName = 'Service Name';
+			const serviceRequest = 'Please make a request';
+
+			const service = new AIService();
+			service.validateCurl = (v) => v;
+
+			await service.generateCurlGeneric(serviceName, serviceRequest);
+
+			const messages = await generateCurlCommandFallbackPromptTemplate.formatMessages({
+				serviceName,
+				serviceRequest,
+			});
+
+			expect(service.provider.model.invoke).toHaveBeenCalled();
+			expect(jest.mocked(service.provider.model.invoke).mock.calls[0][0].messages).toEqual(
+				messages,
+			);
+		});
+	});
+
+	describe('validateCurl', () => {
+		it('should return the result if curl command starts with "curl"', () => {
+			const aiService = new AIService();
+			const result = { curl: 'curl -X GET https://n8n.io' };
+			const validatedResult = aiService.validateCurl(result);
+			expect(validatedResult).toEqual(result);
+		});
+
+		it('should replace boolean and number placeholders in the curl command', () => {
+			const aiService = new AIService();
+			const result = { curl: 'curl -X GET https://n8n.io -d "{ "key": {{value}} }"' };
+			const expected = { curl: 'curl -X GET https://n8n.io -d "{ "key": "{{value}}" }"' };
+			const validatedResult = aiService.validateCurl(result);
+			expect(validatedResult).toEqual(expected);
+		});
+
+		it('should throw an error if curl command does not start with "curl"', () => {
+			const aiService = new AIService();
+			const result = { curl: 'wget -O - https://n8n.io' };
+			expect(() => aiService.validateCurl(result)).toThrow(ApplicationError);
+		});
+	});
+});
diff --git a/packages/cli/test/unit/services/ai/utils/summarizeNodeTypeProperties.test.ts b/packages/cli/test/unit/services/ai/utils/summarizeNodeTypeProperties.test.ts
new file mode 100644
index 0000000000000..0485c81f303f9
--- /dev/null
+++ b/packages/cli/test/unit/services/ai/utils/summarizeNodeTypeProperties.test.ts
@@ -0,0 +1,193 @@
+import type { INodeProperties, INodePropertyCollection, INodePropertyOptions } from 'n8n-workflow';
+import {
+	summarizeNodeTypeProperties,
+	summarizeOption,
+	summarizeProperty,
+} from '@/services/ai/utils/summarizeNodeTypeProperties';
+
+describe('summarizeOption', () => {
+	it('should return summarized option with value', () => {
+		const option: INodePropertyOptions = {
+			name: 'testOption',
+			value: 'testValue',
+		};
+
+		const result = summarizeOption(option);
+
+		expect(result).toEqual({
+			name: 'testOption',
+			value: 'testValue',
+		});
+	});
+
+	it('should return summarized option with values', () => {
+		const option: INodePropertyCollection = {
+			name: 'testOption',
+			displayName: 'testDisplayName',
+			values: [
+				{
+					name: 'testName',
+					default: '',
+					displayName: 'testDisplayName',
+					type: 'string',
+				},
+			],
+		};
+
+		const result = summarizeOption(option);
+
+		expect(result).toEqual({
+			name: 'testOption',
+			values: [
+				{
+					name: 'testDisplayName',
+					type: 'string',
+				},
+			],
+		});
+	});
+
+	it('should return summarized property', () => {
+		const option: INodeProperties = {
+			name: 'testName',
+			default: '',
+			displayName: 'testDisplayName',
+			type: 'string',
+		};
+
+		const result = summarizeOption(option);
+
+		expect(result).toEqual({
+			name: 'testDisplayName',
+			type: 'string',
+		});
+	});
+});
+
+describe('summarizeProperty', () => {
+	it('should return summarized property with displayOptions', () => {
+		const property: INodeProperties = {
+			default: '',
+			name: 'testName',
+			displayName: 'testDisplayName',
+			type: 'string',
+			displayOptions: {
+				show: {
+					testOption: ['testValue'],
+				},
+			},
+		};
+
+		const result = summarizeProperty(property);
+
+		expect(result).toEqual({
+			name: 'testDisplayName',
+			type: 'string',
+			displayOptions: {
+				show: {
+					testOption: ['testValue'],
+				},
+			},
+		});
+	});
+
+	it('should return summarized property with options', () => {
+		const property: INodeProperties = {
+			name: 'testName',
+			displayName: 'testDisplayName',
+			default: '',
+			type: 'string',
+			options: [
+				{
+					name: 'testOption',
+					value: 'testValue',
+				},
+			],
+		};
+
+		const result = summarizeProperty(property);
+
+		expect(result).toEqual({
+			name: 'testDisplayName',
+			type: 'string',
+			options: [
+				{
+					name: 'testOption',
+					value: 'testValue',
+				},
+			],
+		});
+	});
+
+	it('should return summarized property without displayOptions and options', () => {
+		const property: INodeProperties = {
+			name: 'testName',
+			default: '',
+			displayName: 'testDisplayName',
+			type: 'string',
+		};
+
+		const result = summarizeProperty(property);
+
+		expect(result).toEqual({
+			name: 'testDisplayName',
+			type: 'string',
+		});
+	});
+});
+
+describe('summarizeNodeTypeProperties', () => {
+	it('should return summarized properties', () => {
+		const properties: INodeProperties[] = [
+			{
+				name: 'testName1',
+				default: '',
+				displayName: 'testDisplayName1',
+				type: 'string',
+				options: [
+					{
+						name: 'testOption1',
+						value: 'testValue1',
+					},
+				],
+			},
+			{
+				name: 'testName2',
+				default: '',
+				displayName: 'testDisplayName2',
+				type: 'number',
+				options: [
+					{
+						name: 'testOption2',
+						value: 'testValue2',
+					},
+				],
+			},
+		];
+
+		const result = summarizeNodeTypeProperties(properties);
+
+		expect(result).toEqual([
+			{
+				name: 'testDisplayName1',
+				type: 'string',
+				options: [
+					{
+						name: 'testOption1',
+						value: 'testValue1',
+					},
+				],
+			},
+			{
+				name: 'testDisplayName2',
+				type: 'number',
+				options: [
+					{
+						name: 'testOption2',
+						value: 'testValue2',
+					},
+				],
+			},
+		]);
+	});
+});
diff --git a/packages/cli/test/unit/services/cache-mock.service.test.ts b/packages/cli/test/unit/services/cache-mock.service.test.ts
new file mode 100644
index 0000000000000..b094f3e0d0f08
--- /dev/null
+++ b/packages/cli/test/unit/services/cache-mock.service.test.ts
@@ -0,0 +1,67 @@
+import Container from 'typedi';
+import { mock } from 'jest-mock-extended';
+import { CacheService } from '@/services/cache/cache.service';
+
+const cacheService = Container.get(CacheService);
+const store = mock<NonNullable<CacheService['cache']>['store']>({ isCacheable: () => true });
+Object.assign(cacheService, { cache: { store } });
+
+describe('CacheService (Mock)', () => {
+	beforeEach(() => jest.clearAllMocks());
+
+	describe('should prevent use of empty keys', () => {
+		test('get', async () => {
+			await cacheService.get('');
+			expect(store.get).not.toHaveBeenCalled();
+
+			await cacheService.get('key');
+			expect(store.get).toHaveBeenCalledWith('key');
+		});
+
+		test('getMany', async () => {
+			await cacheService.getMany([]);
+			expect(store.mget).not.toHaveBeenCalled();
+
+			await cacheService.getMany(['key1', 'key2']);
+			expect(store.mget).toHaveBeenCalledWith('key1', 'key2');
+		});
+
+		test('set', async () => {
+			await cacheService.set('', '');
+			expect(store.set).not.toHaveBeenCalled();
+
+			await cacheService.set('key', 'value');
+			expect(store.set).toHaveBeenCalledWith('key', 'value', undefined);
+
+			await cacheService.set('key', 'value', 123);
+			expect(store.set).toHaveBeenCalledWith('key', 'value', 123);
+		});
+
+		test('setMany', async () => {
+			await cacheService.setMany([]);
+			expect(store.mset).not.toHaveBeenCalled();
+
+			await cacheService.setMany([['key', 'value']]);
+			expect(store.mset).toHaveBeenCalledWith([['key', 'value']], undefined);
+
+			await cacheService.setMany([['key', 'value']], 123);
+			expect(store.mset).toHaveBeenCalledWith([['key', 'value']], 123);
+		});
+
+		test('delete', async () => {
+			await cacheService.delete('');
+			expect(store.del).not.toHaveBeenCalled();
+
+			await cacheService.delete('key');
+			expect(store.del).toHaveBeenCalledWith('key');
+		});
+
+		test('deleteMany', async () => {
+			await cacheService.deleteMany([]);
+			expect(store.mdel).not.toHaveBeenCalled();
+
+			await cacheService.deleteMany(['key1', 'key2']);
+			expect(store.mdel).toHaveBeenCalledWith('key1', 'key2');
+		});
+	});
+});
diff --git a/packages/cli/test/unit/services/cache.service.test.ts b/packages/cli/test/unit/services/cache.service.test.ts
new file mode 100644
index 0000000000000..a742b20698d46
--- /dev/null
+++ b/packages/cli/test/unit/services/cache.service.test.ts
@@ -0,0 +1,240 @@
+import { CacheService } from '@/services/cache/cache.service';
+import config from '@/config';
+import { sleep } from 'n8n-workflow';
+
+jest.mock('ioredis', () => {
+	const Redis = require('ioredis-mock');
+
+	return function (...args: unknown[]) {
+		return new Redis(args);
+	};
+});
+
+for (const backend of ['memory', 'redis'] as const) {
+	describe(backend, () => {
+		let cacheService: CacheService;
+
+		beforeAll(async () => {
+			config.set('cache.backend', backend);
+			cacheService = new CacheService();
+			await cacheService.init();
+		});
+
+		afterEach(async () => {
+			await cacheService.reset();
+			config.load(config.default);
+		});
+
+		describe('init', () => {
+			test('should select backend based on config', () => {
+				expect(cacheService.isMemory()).toBe(backend === 'memory');
+				expect(cacheService.isRedis()).toBe(backend === 'redis');
+			});
+
+			if (backend === 'redis') {
+				test('with auto backend and queue mode, should select redis', async () => {
+					config.set('executions.mode', 'queue');
+
+					await cacheService.init();
+
+					expect(cacheService.isRedis()).toBe(true);
+				});
+			}
+
+			if (backend === 'memory') {
+				test('should honor max size when enough', async () => {
+					config.set('cache.memory.maxSize', 16); // enough bytes for "withoutUnicode"
+
+					await cacheService.init();
+					await cacheService.set('key', 'withoutUnicode');
+
+					await expect(cacheService.get('key')).resolves.toBe('withoutUnicode');
+
+					// restore
+					config.set('cache.memory.maxSize', 3 * 1024 * 1024);
+					await cacheService.init();
+				});
+
+				test('should honor max size when not enough', async () => {
+					config.set('cache.memory.maxSize', 16); // not enough bytes for "withUnicodeԱԲԳ"
+
+					await cacheService.init();
+					await cacheService.set('key', 'withUnicodeԱԲԳ');
+
+					await expect(cacheService.get('key')).resolves.toBeUndefined();
+
+					// restore
+					config.set('cache.memory.maxSize', 3 * 1024 * 1024);
+					await cacheService.init();
+				});
+			}
+		});
+
+		describe('set', () => {
+			test('should set a string value', async () => {
+				await cacheService.set('key', 'value');
+
+				await expect(cacheService.get('key')).resolves.toBe('value');
+			});
+
+			test('should set a number value', async () => {
+				await cacheService.set('key', 123);
+
+				await expect(cacheService.get('key')).resolves.toBe(123);
+			});
+
+			test('should set an object value', async () => {
+				const object = { a: { b: { c: { d: 1 } } } };
+
+				await cacheService.set('key', object);
+
+				await expect(cacheService.get('key')).resolves.toMatchObject(object);
+			});
+
+			test('should not cache `null` or `undefined` values', async () => {
+				await cacheService.set('key1', null);
+				await cacheService.set('key2', undefined);
+				await cacheService.set('key3', 'value');
+
+				await expect(cacheService.get('key1')).resolves.toBeUndefined();
+				await expect(cacheService.get('key2')).resolves.toBeUndefined();
+				await expect(cacheService.get('key3')).resolves.toBe('value');
+			});
+
+			test('should disregard zero-length keys', async () => {
+				await cacheService.set('', 'value');
+
+				await expect(cacheService.get('')).resolves.toBeUndefined();
+			});
+
+			test('should honor ttl', async () => {
+				await cacheService.set('key', 'value', 100);
+
+				await expect(cacheService.get('key')).resolves.toBe('value');
+
+				await sleep(200);
+
+				await expect(cacheService.get('key')).resolves.toBeUndefined();
+			});
+		});
+
+		describe('get', () => {
+			test('should fall back to fallback value', async () => {
+				const promise = cacheService.get('key', { fallbackValue: 'fallback' });
+				await expect(promise).resolves.toBe('fallback');
+			});
+
+			test('should refresh value', async () => {
+				const promise = cacheService.get('testString', {
+					refreshFn: async () => 'refreshValue',
+				});
+
+				await expect(promise).resolves.toBe('refreshValue');
+			});
+
+			test('should handle non-ASCII key', async () => {
+				const nonAsciiKey = 'ԱԲԳ';
+				await cacheService.set(nonAsciiKey, 'value');
+
+				await expect(cacheService.get(nonAsciiKey)).resolves.toBe('value');
+			});
+		});
+
+		describe('delete', () => {
+			test('should delete a key', async () => {
+				await cacheService.set('key', 'value');
+
+				await cacheService.delete('key');
+
+				await expect(cacheService.get('key')).resolves.toBeUndefined();
+			});
+		});
+
+		describe('setMany', () => {
+			test('should set multiple string values', async () => {
+				await cacheService.setMany([
+					['key1', 'value1'],
+					['key2', 'value2'],
+				]);
+
+				const promise = cacheService.getMany(['key1', 'key2']);
+				await expect(promise).resolves.toStrictEqual(['value1', 'value2']);
+			});
+
+			test('should set multiple number values', async () => {
+				await cacheService.setMany([
+					['key1', 123],
+					['key2', 456],
+				]);
+
+				const promise = cacheService.getMany(['key1', 'key2']);
+				await expect(promise).resolves.toStrictEqual([123, 456]);
+			});
+
+			test('should disregard zero-length keys', async () => {
+				await cacheService.setMany([['', 'value1']]);
+
+				await expect(cacheService.get('')).resolves.toBeUndefined();
+			});
+		});
+
+		describe('getMany', () => {
+			test('should return undefined on missing result', async () => {
+				await cacheService.setMany([
+					['key1', 123],
+					['key2', 456],
+				]);
+
+				const promise = cacheService.getMany(['key2', 'key3']);
+				await expect(promise).resolves.toStrictEqual([456, undefined]);
+			});
+		});
+
+		describe('delete', () => {
+			test('should handle non-ASCII key', async () => {
+				const nonAsciiKey = 'ԱԲԳ';
+				await cacheService.set(nonAsciiKey, 'value');
+				await expect(cacheService.get(nonAsciiKey)).resolves.toBe('value');
+
+				await cacheService.delete(nonAsciiKey);
+
+				await expect(cacheService.get(nonAsciiKey)).resolves.toBeUndefined();
+			});
+		});
+
+		describe('setHash', () => {
+			test('should set a hash if non-existing', async () => {
+				await cacheService.setHash('keyW', { field: 'value' });
+
+				await expect(cacheService.getHash('keyW')).resolves.toStrictEqual({ field: 'value' });
+			});
+
+			test('should add to a hash value if existing', async () => {
+				await cacheService.setHash('key', { field1: 'value1' });
+				await cacheService.setHash('key', { field2: 'value2' });
+
+				await expect(cacheService.getHash('key')).resolves.toStrictEqual({
+					field1: 'value1',
+					field2: 'value2',
+				});
+			});
+		});
+
+		describe('deleteFromHash', () => {
+			test('should delete a hash field', async () => {
+				await cacheService.setHash('key', { field1: 'value1', field2: 'value2' });
+				await cacheService.deleteFromHash('key', 'field1');
+
+				await expect(cacheService.getHash('key')).resolves.toStrictEqual({ field2: 'value2' });
+			});
+		});
+
+		describe('getHashValue', () => {
+			test('should return a hash field value', async () => {
+				await cacheService.setHash('key', { field1: 'value1', field2: 'value2' });
+
+				await expect(cacheService.getHashValue('key', 'field1')).resolves.toBe('value1');
+			});
+		});
+	});
+}
diff --git a/packages/cli/test/unit/services/communityPackages.service.test.ts b/packages/cli/test/unit/services/communityPackages.service.test.ts
new file mode 100644
index 0000000000000..2b0d8bf0d452a
--- /dev/null
+++ b/packages/cli/test/unit/services/communityPackages.service.test.ts
@@ -0,0 +1,429 @@
+import { exec } from 'child_process';
+import { access as fsAccess, mkdir as fsMkdir } from 'fs/promises';
+import axios from 'axios';
+import { mocked } from 'jest-mock';
+import Container from 'typedi';
+import type { PublicInstalledPackage } from 'n8n-workflow';
+
+import {
+	NODE_PACKAGE_PREFIX,
+	NPM_COMMAND_TOKENS,
+	NPM_PACKAGE_STATUS_GOOD,
+	RESPONSE_ERROR_MESSAGES,
+} from '@/constants';
+import config from '@/config';
+import { InstalledPackages } from '@db/entities/InstalledPackages';
+import type { CommunityPackages } from '@/Interfaces';
+import { CommunityPackagesService } from '@/services/communityPackages.service';
+import { InstalledNodesRepository } from '@db/repositories/installedNodes.repository';
+import { InstalledPackagesRepository } from '@db/repositories/installedPackages.repository';
+import { InstalledNodes } from '@db/entities/InstalledNodes';
+import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
+
+import { mockInstance } from '../../shared/mocking';
+import {
+	COMMUNITY_NODE_VERSION,
+	COMMUNITY_PACKAGE_VERSION,
+} from '../../integration/shared/constants';
+import { randomName } from '../../integration/shared/random';
+import { mockPackageName, mockPackagePair } from '../../integration/shared/utils';
+import { InstanceSettings, PackageDirectoryLoader } from 'n8n-core';
+import { Logger } from '@/Logger';
+
+jest.mock('fs/promises');
+jest.mock('child_process');
+jest.mock('axios');
+
+type ExecOptions = NonNullable<Parameters<typeof exec>[1]>;
+type ExecCallback = NonNullable<Parameters<typeof exec>[2]>;
+
+const execMock = ((...args) => {
+	const cb = args[args.length - 1] as ExecCallback;
+	cb(null, 'Done', '');
+}) as typeof exec;
+
+describe('CommunityPackagesService', () => {
+	const installedNodesRepository = mockInstance(InstalledNodesRepository);
+	installedNodesRepository.create.mockImplementation(() => {
+		const nodeName = randomName();
+
+		return Object.assign(new InstalledNodes(), {
+			name: nodeName,
+			type: nodeName,
+			latestVersion: COMMUNITY_NODE_VERSION.CURRENT.toString(),
+			packageName: 'test',
+		});
+	});
+
+	const installedPackageRepository = mockInstance(InstalledPackagesRepository);
+	installedPackageRepository.create.mockImplementation(() => {
+		return Object.assign(new InstalledPackages(), {
+			packageName: mockPackageName(),
+			installedVersion: COMMUNITY_PACKAGE_VERSION.CURRENT,
+		});
+	});
+
+	mockInstance(LoadNodesAndCredentials);
+
+	const communityPackagesService = Container.get(CommunityPackagesService);
+
+	beforeEach(() => {
+		config.load(config.default);
+	});
+
+	describe('parseNpmPackageName()', () => {
+		test('should fail with empty package name', () => {
+			expect(() => communityPackagesService.parseNpmPackageName('')).toThrowError();
+		});
+
+		test('should fail with invalid package prefix name', () => {
+			expect(() =>
+				communityPackagesService.parseNpmPackageName('INVALID_PREFIX@123'),
+			).toThrowError();
+		});
+
+		test('should parse valid package name', () => {
+			const name = mockPackageName();
+			const parsed = communityPackagesService.parseNpmPackageName(name);
+
+			expect(parsed.rawString).toBe(name);
+			expect(parsed.packageName).toBe(name);
+			expect(parsed.scope).toBeUndefined();
+			expect(parsed.version).toBeUndefined();
+		});
+
+		test('should parse valid package name and version', () => {
+			const name = mockPackageName();
+			const version = '0.1.1';
+			const fullPackageName = `${name}@${version}`;
+			const parsed = communityPackagesService.parseNpmPackageName(fullPackageName);
+
+			expect(parsed.rawString).toBe(fullPackageName);
+			expect(parsed.packageName).toBe(name);
+			expect(parsed.scope).toBeUndefined();
+			expect(parsed.version).toBe(version);
+		});
+
+		test('should parse valid package name, scope and version', () => {
+			const scope = '@n8n';
+			const name = mockPackageName();
+			const version = '0.1.1';
+			const fullPackageName = `${scope}/${name}@${version}`;
+			const parsed = communityPackagesService.parseNpmPackageName(fullPackageName);
+
+			expect(parsed.rawString).toBe(fullPackageName);
+			expect(parsed.packageName).toBe(`${scope}/${name}`);
+			expect(parsed.scope).toBe(scope);
+			expect(parsed.version).toBe(version);
+		});
+	});
+
+	describe('executeCommand()', () => {
+		beforeEach(() => {
+			mocked(fsAccess).mockReset();
+			mocked(fsMkdir).mockReset();
+			mocked(exec).mockReset();
+		});
+
+		test('should call command with valid options', async () => {
+			const execMock = ((...args) => {
+				const arg = args[1] as ExecOptions;
+				expect(arg.cwd).toBeDefined();
+				expect(arg.env).toBeDefined();
+				// PATH or NODE_PATH may be undefined depending on environment so we don't check for these keys.
+				const cb = args[args.length - 1] as ExecCallback;
+				cb(null, 'Done', '');
+			}) as typeof exec;
+
+			mocked(exec).mockImplementation(execMock);
+
+			await communityPackagesService.executeNpmCommand('ls');
+
+			expect(fsAccess).toHaveBeenCalled();
+			expect(exec).toHaveBeenCalled();
+			expect(fsMkdir).toBeCalledTimes(0);
+		});
+
+		test('should make sure folder exists', async () => {
+			mocked(exec).mockImplementation(execMock);
+
+			await communityPackagesService.executeNpmCommand('ls');
+			expect(fsAccess).toHaveBeenCalled();
+			expect(exec).toHaveBeenCalled();
+			expect(fsMkdir).toBeCalledTimes(0);
+		});
+
+		test('should try to create folder if it does not exist', async () => {
+			mocked(exec).mockImplementation(execMock);
+			mocked(fsAccess).mockImplementation(() => {
+				throw new Error('Folder does not exist.');
+			});
+
+			await communityPackagesService.executeNpmCommand('ls');
+
+			expect(fsAccess).toHaveBeenCalled();
+			expect(exec).toHaveBeenCalled();
+			expect(fsMkdir).toHaveBeenCalled();
+		});
+
+		test('should throw especial error when package is not found', async () => {
+			const erroringExecMock = ((...args) => {
+				const cb = args[args.length - 1] as ExecCallback;
+				const msg = `Something went wrong - ${NPM_COMMAND_TOKENS.NPM_PACKAGE_NOT_FOUND_ERROR}. Aborting.`;
+				cb(new Error(msg), '', '');
+			}) as typeof exec;
+
+			mocked(exec).mockImplementation(erroringExecMock);
+
+			const call = async () => await communityPackagesService.executeNpmCommand('ls');
+
+			await expect(call).rejects.toThrowError(RESPONSE_ERROR_MESSAGES.PACKAGE_NOT_FOUND);
+
+			expect(fsAccess).toHaveBeenCalled();
+			expect(exec).toHaveBeenCalled();
+			expect(fsMkdir).toHaveBeenCalledTimes(0);
+		});
+	});
+
+	describe('crossInformationPackage()', () => {
+		test('should return same list if availableUpdates is undefined', () => {
+			const fakePkgs = mockPackagePair();
+
+			const crossedPkgs = communityPackagesService.matchPackagesWithUpdates(fakePkgs);
+
+			expect(crossedPkgs).toEqual(fakePkgs);
+		});
+
+		test('should correctly match update versions for packages', () => {
+			const [pkgA, pkgB] = mockPackagePair();
+
+			const updates: CommunityPackages.AvailableUpdates = {
+				[pkgA.packageName]: {
+					current: pkgA.installedVersion,
+					wanted: pkgA.installedVersion,
+					latest: '0.2.0',
+					location: pkgA.packageName,
+				},
+				[pkgB.packageName]: {
+					current: pkgA.installedVersion,
+					wanted: pkgA.installedVersion,
+					latest: '0.3.0',
+					location: pkgA.packageName,
+				},
+			};
+
+			const [crossedPkgA, crossedPkgB]: PublicInstalledPackage[] =
+				communityPackagesService.matchPackagesWithUpdates([pkgA, pkgB], updates);
+
+			expect(crossedPkgA.updateAvailable).toBe('0.2.0');
+			expect(crossedPkgB.updateAvailable).toBe('0.3.0');
+		});
+
+		test('should correctly match update versions for single package', () => {
+			const [pkgA, pkgB] = mockPackagePair();
+
+			const updates: CommunityPackages.AvailableUpdates = {
+				[pkgB.packageName]: {
+					current: pkgA.installedVersion,
+					wanted: pkgA.installedVersion,
+					latest: '0.3.0',
+					location: pkgA.packageName,
+				},
+			};
+
+			const [crossedPkgA, crossedPkgB]: PublicInstalledPackage[] =
+				communityPackagesService.matchPackagesWithUpdates([pkgA, pkgB], updates);
+
+			expect(crossedPkgA.updateAvailable).toBeUndefined();
+			expect(crossedPkgB.updateAvailable).toBe('0.3.0');
+		});
+	});
+
+	describe('matchMissingPackages()', () => {
+		test('should not match failed packages that do not exist', () => {
+			const fakePkgs = mockPackagePair();
+			setMissingPackages([
+				`${NODE_PACKAGE_PREFIX}very-long-name-that-should-never-be-generated@1.0.0`,
+				`${NODE_PACKAGE_PREFIX}another-very-long-name-that-never-is-seen`,
+			]);
+
+			const matchedPackages = communityPackagesService.matchMissingPackages(fakePkgs);
+
+			expect(matchedPackages).toEqual(fakePkgs);
+
+			const [first, second] = matchedPackages;
+
+			expect(first.failedLoading).toBeUndefined();
+			expect(second.failedLoading).toBeUndefined();
+		});
+
+		test('should match failed packages that should be present', () => {
+			const [pkgA, pkgB] = mockPackagePair();
+			setMissingPackages([
+				`${NODE_PACKAGE_PREFIX}very-long-name-that-should-never-be-generated@1.0.0`,
+				`${pkgA.packageName}@${pkgA.installedVersion}`,
+			]);
+
+			const [matchedPkgA, matchedPkgB] = communityPackagesService.matchMissingPackages([
+				pkgA,
+				pkgB,
+			]);
+
+			expect(matchedPkgA.failedLoading).toBe(true);
+			expect(matchedPkgB.failedLoading).toBeUndefined();
+		});
+
+		test('should match failed packages even if version is wrong', () => {
+			const [pkgA, pkgB] = mockPackagePair();
+			setMissingPackages([
+				`${NODE_PACKAGE_PREFIX}very-long-name-that-should-never-be-generated@1.0.0`,
+				`${pkgA.packageName}@123.456.789`,
+			]);
+			const [matchedPkgA, matchedPkgB] = communityPackagesService.matchMissingPackages([
+				pkgA,
+				pkgB,
+			]);
+
+			expect(matchedPkgA.failedLoading).toBe(true);
+			expect(matchedPkgB.failedLoading).toBeUndefined();
+		});
+	});
+
+	describe('checkNpmPackageStatus()', () => {
+		test('should call axios.post', async () => {
+			await communityPackagesService.checkNpmPackageStatus(mockPackageName());
+
+			expect(axios.post).toHaveBeenCalled();
+		});
+
+		test('should not fail if request fails', async () => {
+			mocked(axios.post).mockImplementation(() => {
+				throw new Error('Something went wrong');
+			});
+
+			const result = await communityPackagesService.checkNpmPackageStatus(mockPackageName());
+
+			expect(result.status).toBe(NPM_PACKAGE_STATUS_GOOD);
+		});
+
+		test('should warn if package is banned', async () => {
+			mocked(axios.post).mockResolvedValue({ data: { status: 'Banned', reason: 'Not good' } });
+
+			const result = (await communityPackagesService.checkNpmPackageStatus(
+				mockPackageName(),
+			)) as CommunityPackages.PackageStatusCheck;
+
+			expect(result.status).toBe('Banned');
+			expect(result.reason).toBe('Not good');
+		});
+	});
+
+	describe('hasPackageLoadedSuccessfully()', () => {
+		test('should return true when failed package list does not exist', () => {
+			setMissingPackages([]);
+			expect(communityPackagesService.hasPackageLoaded('package')).toBe(true);
+		});
+
+		test('should return true when package is not in the list of missing packages', () => {
+			setMissingPackages(['packageA@0.1.0', 'packageB@0.1.0']);
+			expect(communityPackagesService.hasPackageLoaded('packageC')).toBe(true);
+		});
+
+		test('should return false when package is in the list of missing packages', () => {
+			setMissingPackages(['packageA@0.1.0', 'packageB@0.1.0']);
+			expect(communityPackagesService.hasPackageLoaded('packageA')).toBe(false);
+		});
+	});
+
+	describe('removePackageFromMissingList()', () => {
+		test('should do nothing if key does not exist', () => {
+			setMissingPackages([]);
+			communityPackagesService.removePackageFromMissingList('packageA');
+
+			expect(communityPackagesService.missingPackages).toBeEmptyArray();
+		});
+
+		test('should remove only correct package from list', () => {
+			setMissingPackages(['packageA@0.1.0', 'packageB@0.2.0', 'packageC@0.2.0']);
+
+			communityPackagesService.removePackageFromMissingList('packageB');
+
+			expect(communityPackagesService.missingPackages).toEqual([
+				'packageA@0.1.0',
+				'packageC@0.2.0',
+			]);
+		});
+
+		test('should not remove if package is not in the list', () => {
+			const failedToLoadList = ['packageA@0.1.0', 'packageB@0.2.0', 'packageB@0.2.0'];
+			setMissingPackages(failedToLoadList);
+			communityPackagesService.removePackageFromMissingList('packageC');
+
+			expect(communityPackagesService.missingPackages).toEqual(failedToLoadList);
+		});
+	});
+
+	const setMissingPackages = (missingPackages: string[]) => {
+		Object.assign(communityPackagesService, { missingPackages });
+	};
+
+	describe('updateNpmModule', () => {
+		let packageDirectoryLoader: PackageDirectoryLoader;
+		let communityPackagesService: CommunityPackagesService;
+
+		beforeEach(async () => {
+			jest.restoreAllMocks();
+
+			packageDirectoryLoader = mockInstance(PackageDirectoryLoader);
+			const loadNodesAndCredentials = mockInstance(LoadNodesAndCredentials);
+			loadNodesAndCredentials.loadPackage.mockResolvedValue(packageDirectoryLoader);
+			const instanceSettings = mockInstance(InstanceSettings);
+			const logger = mockInstance(Logger);
+			const installedPackagesRepository = mockInstance(InstalledPackagesRepository);
+
+			communityPackagesService = new CommunityPackagesService(
+				instanceSettings,
+				logger,
+				installedPackagesRepository,
+				loadNodesAndCredentials,
+			);
+		});
+
+		afterEach(async () => {
+			jest.restoreAllMocks();
+		});
+
+		test('should call `exec` with the correct command ', async () => {
+			//
+			// ARRANGE
+			//
+			const nodeName = randomName();
+			packageDirectoryLoader.loadedNodes = [{ name: nodeName, version: 1 }];
+
+			const installedPackage = new InstalledPackages();
+			installedPackage.packageName = mockPackageName();
+
+			mocked(exec).mockImplementation(execMock);
+
+			//
+			// ACT
+			//
+			await communityPackagesService.updateNpmModule(
+				installedPackage.packageName,
+				installedPackage,
+			);
+
+			//
+			// ASSERT
+			//
+
+			expect(exec).toHaveBeenCalledTimes(1);
+			expect(exec).toHaveBeenNthCalledWith(
+				1,
+				`npm install ${installedPackage.packageName}@latest`,
+				expect.any(Object),
+				expect.any(Function),
+			);
+		});
+	});
+});
diff --git a/packages/cli/test/unit/services/events.service.test.ts b/packages/cli/test/unit/services/events.service.test.ts
new file mode 100644
index 0000000000000..afdd4091d3186
--- /dev/null
+++ b/packages/cli/test/unit/services/events.service.test.ts
@@ -0,0 +1,210 @@
+import type { IRun, WorkflowExecuteMode } from 'n8n-workflow';
+import {
+	QueryFailedError,
+	type DataSource,
+	type EntityManager,
+	type EntityMetadata,
+} from '@n8n/typeorm';
+import { mocked } from 'jest-mock';
+import { mock } from 'jest-mock-extended';
+
+import config from '@/config';
+import type { User } from '@db/entities/User';
+import type { WorkflowStatistics } from '@db/entities/WorkflowStatistics';
+import { WorkflowStatisticsRepository } from '@db/repositories/workflowStatistics.repository';
+import { EventsService } from '@/services/events.service';
+import { UserService } from '@/services/user.service';
+import { OwnershipService } from '@/services/ownership.service';
+import { mockInstance } from '../../shared/mocking';
+
+describe('EventsService', () => {
+	const dbType = config.getEnv('database.type');
+	const fakeUser = mock<User>({ id: 'abcde-fghij' });
+	const ownershipService = mockInstance(OwnershipService);
+	const userService = mockInstance(UserService);
+
+	const entityManager = mock<EntityManager>();
+	const dataSource = mock<DataSource>({
+		manager: entityManager,
+		getMetadata: () =>
+			mock<EntityMetadata>({
+				tableName: 'workflow_statistics',
+			}),
+	});
+	Object.assign(entityManager, { connection: dataSource });
+
+	config.set('diagnostics.enabled', true);
+	config.set('deployment.type', 'n8n-testing');
+	mocked(ownershipService.getWorkflowOwnerCached).mockResolvedValue(fakeUser);
+	const updateSettingsMock = jest.spyOn(userService, 'updateSettings').mockImplementation();
+
+	const eventsService = new EventsService(
+		mock(),
+		new WorkflowStatisticsRepository(dataSource),
+		ownershipService,
+	);
+
+	const onFirstProductionWorkflowSuccess = jest.fn();
+	const onFirstWorkflowDataLoad = jest.fn();
+	eventsService.on('telemetry.onFirstProductionWorkflowSuccess', onFirstProductionWorkflowSuccess);
+	eventsService.on('telemetry.onFirstWorkflowDataLoad', onFirstWorkflowDataLoad);
+
+	beforeEach(() => {
+		jest.clearAllMocks();
+	});
+
+	const mockDBCall = (count = 1) => {
+		if (dbType === 'sqlite') {
+			entityManager.findOne.mockResolvedValueOnce(mock<WorkflowStatistics>({ count }));
+		} else {
+			const result = dbType === 'postgresdb' ? [{ count }] : { affectedRows: count };
+			entityManager.query.mockImplementationOnce(async (query) =>
+				query.startsWith('INSERT INTO') ? result : null,
+			);
+		}
+	};
+
+	describe('workflowExecutionCompleted', () => {
+		test('should create metrics for production successes', async () => {
+			// Call the function with a production success result, ensure metrics hook gets called
+			const workflow = {
+				id: '1',
+				name: '',
+				active: false,
+				createdAt: new Date(),
+				updatedAt: new Date(),
+				nodes: [],
+				connections: {},
+			};
+			const runData: IRun = {
+				finished: true,
+				status: 'success',
+				data: { resultData: { runData: {} } },
+				mode: 'internal' as WorkflowExecuteMode,
+				startedAt: new Date(),
+			};
+			mockDBCall();
+
+			await eventsService.workflowExecutionCompleted(workflow, runData);
+			expect(updateSettingsMock).toHaveBeenCalledTimes(1);
+			expect(onFirstProductionWorkflowSuccess).toBeCalledTimes(1);
+			expect(onFirstProductionWorkflowSuccess).toHaveBeenNthCalledWith(1, {
+				user_id: fakeUser.id,
+				workflow_id: workflow.id,
+			});
+		});
+
+		test('should only create metrics for production successes', async () => {
+			// Call the function with a non production success result, ensure metrics hook is never called
+			const workflow = {
+				id: '1',
+				name: '',
+				active: false,
+				createdAt: new Date(),
+				updatedAt: new Date(),
+				nodes: [],
+				connections: {},
+			};
+			const runData: IRun = {
+				finished: false,
+				status: 'failed',
+				data: { resultData: { runData: {} } },
+				mode: 'internal' as WorkflowExecuteMode,
+				startedAt: new Date(),
+			};
+			await eventsService.workflowExecutionCompleted(workflow, runData);
+			expect(onFirstProductionWorkflowSuccess).toBeCalledTimes(0);
+		});
+
+		test('should not send metrics for updated entries', async () => {
+			// Call the function with a fail insert, ensure update is called *and* metrics aren't sent
+			const workflow = {
+				id: '1',
+				name: '',
+				active: false,
+				createdAt: new Date(),
+				updatedAt: new Date(),
+				nodes: [],
+				connections: {},
+			};
+			const runData: IRun = {
+				finished: true,
+				status: 'success',
+				data: { resultData: { runData: {} } },
+				mode: 'internal' as WorkflowExecuteMode,
+				startedAt: new Date(),
+			};
+			mockDBCall(2);
+			await eventsService.workflowExecutionCompleted(workflow, runData);
+			expect(onFirstProductionWorkflowSuccess).toBeCalledTimes(0);
+		});
+	});
+
+	describe('nodeFetchedData', () => {
+		test('should create metrics when the db is updated', async () => {
+			// Call the function with a production success result, ensure metrics hook gets called
+			const workflowId = '1';
+			const node = {
+				id: 'abcde',
+				name: 'test node',
+				typeVersion: 1,
+				type: '',
+				position: [0, 0] as [number, number],
+				parameters: {},
+			};
+			await eventsService.nodeFetchedData(workflowId, node);
+			expect(onFirstWorkflowDataLoad).toBeCalledTimes(1);
+			expect(onFirstWorkflowDataLoad).toHaveBeenNthCalledWith(1, {
+				user_id: fakeUser.id,
+				workflow_id: workflowId,
+				node_type: node.type,
+				node_id: node.id,
+			});
+		});
+
+		test('should create metrics with credentials when the db is updated', async () => {
+			// Call the function with a production success result, ensure metrics hook gets called
+			const workflowId = '1';
+			const node = {
+				id: 'abcde',
+				name: 'test node',
+				typeVersion: 1,
+				type: '',
+				position: [0, 0] as [number, number],
+				parameters: {},
+				credentials: {
+					testCredentials: {
+						id: '1',
+						name: 'Test Credentials',
+					},
+				},
+			};
+			await eventsService.nodeFetchedData(workflowId, node);
+			expect(onFirstWorkflowDataLoad).toBeCalledTimes(1);
+			expect(onFirstWorkflowDataLoad).toHaveBeenNthCalledWith(1, {
+				user_id: fakeUser.id,
+				workflow_id: workflowId,
+				node_type: node.type,
+				node_id: node.id,
+				credential_type: 'testCredentials',
+				credential_id: node.credentials.testCredentials.id,
+			});
+		});
+
+		test('should not send metrics for entries that already have the flag set', async () => {
+			// Fetch data for workflow 2 which is set up to not be altered in the mocks
+			entityManager.insert.mockRejectedValueOnce(new QueryFailedError('', undefined, ''));
+			const workflowId = '1';
+			const node = {
+				id: 'abcde',
+				name: 'test node',
+				typeVersion: 1,
+				type: '',
+				position: [0, 0] as [number, number],
+				parameters: {},
+			};
+			await eventsService.nodeFetchedData(workflowId, node);
+			expect(onFirstWorkflowDataLoad).toBeCalledTimes(0);
+		});
+	});
+});
diff --git a/packages/cli/test/unit/services/jwt.service.test.ts b/packages/cli/test/unit/services/jwt.service.test.ts
new file mode 100644
index 0000000000000..74dd5cd51b45b
--- /dev/null
+++ b/packages/cli/test/unit/services/jwt.service.test.ts
@@ -0,0 +1,62 @@
+import jwt from 'jsonwebtoken';
+import type { InstanceSettings } from 'n8n-core';
+import { mock } from 'jest-mock-extended';
+import config from '@/config';
+import { JwtService } from '@/services/jwt.service';
+
+describe('JwtService', () => {
+	const iat = 1699984313;
+	const jwtSecret = 'random-string';
+	const payload = { sub: 1 };
+	const signedToken =
+		'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOjEsImlhdCI6MTY5OTk4NDMxM30.xNZOAmcidW5ovEF_mwIOzCWkJ70FEO6MFNLK2QRDOeQ';
+
+	const instanceSettings = mock<InstanceSettings>({ encryptionKey: 'test-key' });
+
+	beforeEach(() => {
+		jest.clearAllMocks();
+	});
+
+	describe('secret initialization', () => {
+		it('should read the secret from config, when set', () => {
+			config.set('userManagement.jwtSecret', jwtSecret);
+			const jwtService = new JwtService(instanceSettings);
+			expect(jwtService.jwtSecret).toEqual(jwtSecret);
+		});
+
+		it('should derive the secret from encryption key when not set in config', () => {
+			config.set('userManagement.jwtSecret', '');
+			const jwtService = new JwtService(instanceSettings);
+			expect(jwtService.jwtSecret).toEqual(
+				'e9e2975005eddefbd31b2c04a0b0f2d9c37d9d718cf3676cddf76d65dec555cb',
+			);
+		});
+	});
+
+	describe('with a secret set', () => {
+		config.set('userManagement.jwtSecret', jwtSecret);
+		const jwtService = new JwtService(instanceSettings);
+
+		beforeAll(() => {
+			jest.useFakeTimers().setSystemTime(new Date(iat * 1000));
+		});
+
+		afterAll(() => jest.useRealTimers());
+
+		it('should sign', () => {
+			const token = jwtService.sign(payload);
+			expect(token).toEqual(signedToken);
+		});
+
+		it('should decode and verify payload', () => {
+			const decodedToken = jwtService.verify(signedToken);
+			expect(decodedToken.sub).toEqual(1);
+			expect(decodedToken.iat).toEqual(iat);
+		});
+
+		it('should throw an error on verify if the token is expired', () => {
+			const expiredToken = jwt.sign(payload, jwtSecret, { expiresIn: -10 });
+			expect(() => jwtService.verify(expiredToken)).toThrow(jwt.TokenExpiredError);
+		});
+	});
+});
diff --git a/packages/cli/test/unit/services/naming.service.test.ts b/packages/cli/test/unit/services/naming.service.test.ts
new file mode 100644
index 0000000000000..ea2c34fb8c1ee
--- /dev/null
+++ b/packages/cli/test/unit/services/naming.service.test.ts
@@ -0,0 +1,87 @@
+import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
+import { CredentialsRepository } from '@/databases/repositories/credentials.repository';
+import { mockInstance } from '../../shared/mocking';
+import { NamingService } from '@/services/naming.service';
+import type { WorkflowEntity } from '@/databases/entities/WorkflowEntity';
+import type { CredentialsEntity } from '@/databases/entities/CredentialsEntity';
+
+describe('NamingService', () => {
+	const workflowRepository = mockInstance(WorkflowRepository);
+	const credentialsRepository = mockInstance(CredentialsRepository);
+
+	const namingService = new NamingService(workflowRepository, credentialsRepository);
+
+	beforeEach(() => {
+		jest.restoreAllMocks();
+	});
+
+	describe('getUniqueWorkflowName()', () => {
+		test('should return requested name if already unique', async () => {
+			workflowRepository.findStartingWith.mockResolvedValue([]);
+
+			const name = await namingService.getUniqueWorkflowName('foo');
+
+			expect(name).toEqual('foo');
+		});
+
+		test('should return requested name suffixed if already existing once', async () => {
+			workflowRepository.findStartingWith.mockResolvedValue([{ name: 'foo' }] as WorkflowEntity[]);
+
+			const name = await namingService.getUniqueWorkflowName('foo');
+
+			expect(name).toEqual('foo 2');
+		});
+
+		test('should return requested name with incremented suffix if already suffixed', async () => {
+			const existingNames = [{ name: 'foo' }, { name: 'foo 2' }] as WorkflowEntity[];
+
+			workflowRepository.findStartingWith.mockResolvedValue(existingNames);
+
+			const name = await namingService.getUniqueWorkflowName('foo');
+
+			expect(name).toEqual('foo 3');
+
+			existingNames.push({ name: 'foo 3' } as WorkflowEntity);
+
+			const _name = await namingService.getUniqueWorkflowName('foo');
+
+			expect(_name).toEqual('foo 4');
+		});
+	});
+
+	describe('getUniqueCredentialName()', () => {
+		test('should return requested name if already unique', async () => {
+			credentialsRepository.findStartingWith.mockResolvedValue([]);
+
+			const name = await namingService.getUniqueCredentialName('foo');
+
+			expect(name).toEqual('foo');
+		});
+
+		test('should return requested name suffixed if already existing once', async () => {
+			credentialsRepository.findStartingWith.mockResolvedValue([
+				{ name: 'foo' },
+			] as CredentialsEntity[]);
+
+			const name = await namingService.getUniqueCredentialName('foo');
+
+			expect(name).toEqual('foo 2');
+		});
+
+		test('should return requested name with incremented suffix if already suffixed', async () => {
+			const existingNames = [{ name: 'foo' }, { name: 'foo 2' }] as CredentialsEntity[];
+
+			credentialsRepository.findStartingWith.mockResolvedValue(existingNames);
+
+			const name = await namingService.getUniqueCredentialName('foo');
+
+			expect(name).toEqual('foo 3');
+
+			existingNames.push({ name: 'foo 3' } as CredentialsEntity);
+
+			const _name = await namingService.getUniqueCredentialName('foo');
+
+			expect(_name).toEqual('foo 4');
+		});
+	});
+});
diff --git a/packages/cli/test/unit/services/orchestration.service.test.ts b/packages/cli/test/unit/services/orchestration.service.test.ts
new file mode 100644
index 0000000000000..b7824d9b3f003
--- /dev/null
+++ b/packages/cli/test/unit/services/orchestration.service.test.ts
@@ -0,0 +1,187 @@
+import Container from 'typedi';
+import config from '@/config';
+import { OrchestrationService } from '@/services/orchestration.service';
+import type { RedisServiceWorkerResponseObject } from '@/services/redis/RedisServiceCommands';
+import { MessageEventBus } from '@/eventbus/MessageEventBus/MessageEventBus';
+import { RedisService } from '@/services/redis.service';
+import { handleWorkerResponseMessageMain } from '@/services/orchestration/main/handleWorkerResponseMessageMain';
+import { handleCommandMessageMain } from '@/services/orchestration/main/handleCommandMessageMain';
+import { OrchestrationHandlerMainService } from '@/services/orchestration/main/orchestration.handler.main.service';
+import * as helpers from '@/services/orchestration/helpers';
+import { ExternalSecretsManager } from '@/ExternalSecrets/ExternalSecretsManager.ee';
+import { Logger } from '@/Logger';
+import { Push } from '@/push';
+import { ActiveWorkflowManager } from '@/ActiveWorkflowManager';
+import { mockInstance } from '../../shared/mocking';
+import type { WorkflowActivateMode } from 'n8n-workflow';
+
+const os = Container.get(OrchestrationService);
+const handler = Container.get(OrchestrationHandlerMainService);
+mockInstance(ActiveWorkflowManager);
+
+let queueModeId: string;
+
+function setDefaultConfig() {
+	config.set('executions.mode', 'queue');
+	config.set('generic.instanceType', 'main');
+}
+
+const workerRestartEventbusResponse: RedisServiceWorkerResponseObject = {
+	senderId: 'test',
+	workerId: 'test',
+	command: 'restartEventBus',
+	payload: {
+		result: 'success',
+	},
+};
+
+describe('Orchestration Service', () => {
+	const logger = mockInstance(Logger);
+	mockInstance(Push);
+	mockInstance(RedisService);
+	mockInstance(ExternalSecretsManager);
+	const eventBus = mockInstance(MessageEventBus);
+
+	beforeAll(async () => {
+		jest.mock('ioredis', () => {
+			const Redis = require('ioredis-mock');
+			if (typeof Redis === 'object') {
+				// the first mock is an ioredis shim because ioredis-mock depends on it
+				// https://github.com/stipsan/ioredis-mock/blob/master/src/index.js#L101-L111
+				return {
+					Command: { _transformer: { argument: {}, reply: {} } },
+				};
+			}
+			// second mock for our code
+			return function (...args: any) {
+				return new Redis(args);
+			};
+		});
+		jest.mock('@/services/redis/RedisServicePubSubPublisher', () => {
+			return jest.fn().mockImplementation(() => {
+				return {
+					init: jest.fn(),
+					publishToEventLog: jest.fn(),
+					publishToWorkerChannel: jest.fn(),
+					destroy: jest.fn(),
+				};
+			});
+		});
+		jest.mock('@/services/redis/RedisServicePubSubSubscriber', () => {
+			return jest.fn().mockImplementation(() => {
+				return {
+					subscribeToCommandChannel: jest.fn(),
+					destroy: jest.fn(),
+				};
+			});
+		});
+		setDefaultConfig();
+		queueModeId = config.get('redis.queueModeId');
+	});
+
+	afterAll(async () => {
+		jest.mock('@/services/redis/RedisServicePubSubPublisher').restoreAllMocks();
+		jest.mock('@/services/redis/RedisServicePubSubSubscriber').restoreAllMocks();
+		await os.shutdown();
+	});
+
+	test('should initialize', async () => {
+		await os.init();
+		await handler.init();
+		expect(os.redisPublisher).toBeDefined();
+		expect(handler.redisSubscriber).toBeDefined();
+		expect(queueModeId).toBeDefined();
+	});
+
+	test('should handle worker responses', async () => {
+		const response = await handleWorkerResponseMessageMain(
+			JSON.stringify(workerRestartEventbusResponse),
+		);
+		expect(response.command).toEqual('restartEventBus');
+	});
+
+	test('should handle command messages from others', async () => {
+		const responseFalseId = await handleCommandMessageMain(
+			JSON.stringify({
+				senderId: 'test',
+				command: 'reloadLicense',
+			}),
+		);
+		expect(responseFalseId).toBeDefined();
+		expect(responseFalseId!.command).toEqual('reloadLicense');
+		expect(responseFalseId!.senderId).toEqual('test');
+		expect(logger.error).toHaveBeenCalled();
+	});
+
+	test('should reject command messages from itself', async () => {
+		const response = await handleCommandMessageMain(
+			JSON.stringify({ ...workerRestartEventbusResponse, senderId: queueModeId }),
+		);
+		expect(response).toBeDefined();
+		expect(response!.command).toEqual('restartEventBus');
+		expect(response!.senderId).toEqual(queueModeId);
+		expect(eventBus.restart).not.toHaveBeenCalled();
+	});
+
+	test('should send command messages', async () => {
+		setDefaultConfig();
+		jest.spyOn(os.redisPublisher, 'publishToCommandChannel').mockImplementation(async () => {});
+		await os.getWorkerIds();
+		expect(os.redisPublisher.publishToCommandChannel).toHaveBeenCalled();
+		jest.spyOn(os.redisPublisher, 'publishToCommandChannel').mockRestore();
+	});
+
+	test('should prevent receiving commands too often', async () => {
+		setDefaultConfig();
+		jest.spyOn(helpers, 'debounceMessageReceiver');
+		const res1 = await handleCommandMessageMain(
+			JSON.stringify({
+				senderId: 'test',
+				command: 'reloadExternalSecretsProviders',
+			}),
+		);
+		const res2 = await handleCommandMessageMain(
+			JSON.stringify({
+				senderId: 'test',
+				command: 'reloadExternalSecretsProviders',
+			}),
+		);
+		expect(helpers.debounceMessageReceiver).toHaveBeenCalledTimes(2);
+		expect(res1!.payload).toBeUndefined();
+		expect(res2!.payload!.result).toEqual('debounced');
+	});
+
+	describe('shouldAddWebhooks', () => {
+		beforeEach(() => {
+			config.set('multiMainSetup.instanceType', 'leader');
+		});
+		test('should return true for init', () => {
+			// We want to ensure that webhooks are populated on init
+			// more https://github.com/n8n-io/n8n/pull/8830
+			const result = os.shouldAddWebhooks('init');
+			expect(result).toBe(true);
+		});
+
+		test('should return false for leadershipChange', () => {
+			const result = os.shouldAddWebhooks('leadershipChange');
+			expect(result).toBe(false);
+		});
+
+		test('should return true for update or activate when is leader', () => {
+			const modes = ['update', 'activate'] as WorkflowActivateMode[];
+			for (const mode of modes) {
+				const result = os.shouldAddWebhooks(mode);
+				expect(result).toBe(true);
+			}
+		});
+
+		test('should return false for update or activate when not leader', () => {
+			config.set('multiMainSetup.instanceType', 'follower');
+			const modes = ['update', 'activate'] as WorkflowActivateMode[];
+			for (const mode of modes) {
+				const result = os.shouldAddWebhooks(mode);
+				expect(result).toBe(false);
+			}
+		});
+	});
+});
diff --git a/packages/cli/test/unit/services/ownership.service.test.ts b/packages/cli/test/unit/services/ownership.service.test.ts
new file mode 100644
index 0000000000000..3fed4b8ce7a6d
--- /dev/null
+++ b/packages/cli/test/unit/services/ownership.service.test.ts
@@ -0,0 +1,136 @@
+import { OwnershipService } from '@/services/ownership.service';
+import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
+import { SharedWorkflow } from '@db/entities/SharedWorkflow';
+import { User } from '@db/entities/User';
+import type { SharedCredentials } from '@db/entities/SharedCredentials';
+import { mockInstance } from '../../shared/mocking';
+import { WorkflowEntity } from '@/databases/entities/WorkflowEntity';
+import { UserRepository } from '@/databases/repositories/user.repository';
+import { mock } from 'jest-mock-extended';
+import { mockCredential, mockUser } from '../shared/mockObjects';
+
+describe('OwnershipService', () => {
+	const userRepository = mockInstance(UserRepository);
+	const sharedWorkflowRepository = mockInstance(SharedWorkflowRepository);
+	const ownershipService = new OwnershipService(mock(), userRepository, sharedWorkflowRepository);
+
+	beforeEach(() => {
+		jest.clearAllMocks();
+	});
+
+	describe('getWorkflowOwner()', () => {
+		test('should retrieve a workflow owner', async () => {
+			const mockOwner = new User();
+			const mockNonOwner = new User();
+
+			const sharedWorkflow = Object.assign(new SharedWorkflow(), {
+				role: 'workflow:owner',
+				user: mockOwner,
+			});
+
+			sharedWorkflowRepository.findOneOrFail.mockResolvedValueOnce(sharedWorkflow);
+
+			const returnedOwner = await ownershipService.getWorkflowOwnerCached('some-workflow-id');
+
+			expect(returnedOwner).toBe(mockOwner);
+			expect(returnedOwner).not.toBe(mockNonOwner);
+		});
+
+		test('should throw if no workflow owner found', async () => {
+			sharedWorkflowRepository.findOneOrFail.mockRejectedValue(new Error());
+
+			await expect(ownershipService.getWorkflowOwnerCached('some-workflow-id')).rejects.toThrow();
+		});
+	});
+
+	describe('addOwnedByAndSharedWith()', () => {
+		test('should add `ownedBy` and `sharedWith` to credential', async () => {
+			const owner = mockUser();
+			const editor = mockUser();
+
+			const credential = mockCredential();
+
+			credential.shared = [
+				{ role: 'credential:owner', user: owner },
+				{ role: 'credential:editor', user: editor },
+			] as SharedCredentials[];
+
+			const { ownedBy, sharedWith } = ownershipService.addOwnedByAndSharedWith(credential);
+
+			expect(ownedBy).toStrictEqual({
+				id: owner.id,
+				email: owner.email,
+				firstName: owner.firstName,
+				lastName: owner.lastName,
+			});
+
+			expect(sharedWith).toStrictEqual([
+				{
+					id: editor.id,
+					email: editor.email,
+					firstName: editor.firstName,
+					lastName: editor.lastName,
+				},
+			]);
+		});
+
+		test('should add `ownedBy` and `sharedWith` to workflow', async () => {
+			const owner = mockUser();
+			const editor = mockUser();
+
+			const workflow = new WorkflowEntity();
+
+			workflow.shared = [
+				{ role: 'workflow:owner', user: owner },
+				{ role: 'workflow:editor', user: editor },
+			] as SharedWorkflow[];
+
+			const { ownedBy, sharedWith } = ownershipService.addOwnedByAndSharedWith(workflow);
+
+			expect(ownedBy).toStrictEqual({
+				id: owner.id,
+				email: owner.email,
+				firstName: owner.firstName,
+				lastName: owner.lastName,
+			});
+
+			expect(sharedWith).toStrictEqual([
+				{
+					id: editor.id,
+					email: editor.email,
+					firstName: editor.firstName,
+					lastName: editor.lastName,
+				},
+			]);
+		});
+
+		test('should produce an empty sharedWith if no sharee', async () => {
+			const owner = mockUser();
+
+			const credential = mockCredential();
+
+			credential.shared = [{ role: 'credential:owner', user: owner }] as SharedCredentials[];
+
+			const { ownedBy, sharedWith } = ownershipService.addOwnedByAndSharedWith(credential);
+
+			expect(ownedBy).toStrictEqual({
+				id: owner.id,
+				email: owner.email,
+				firstName: owner.firstName,
+				lastName: owner.lastName,
+			});
+
+			expect(sharedWith).toHaveLength(0);
+		});
+	});
+
+	describe('getInstanceOwner()', () => {
+		test('should find owner using global owner role ID', async () => {
+			await ownershipService.getInstanceOwner();
+
+			expect(userRepository.findOneOrFail).toHaveBeenCalledWith({
+				where: { role: 'global:owner' },
+			});
+		});
+	});
+});
diff --git a/packages/cli/test/unit/services/redis.service.test.ts b/packages/cli/test/unit/services/redis.service.test.ts
new file mode 100644
index 0000000000000..a3e4b1b162dd5
--- /dev/null
+++ b/packages/cli/test/unit/services/redis.service.test.ts
@@ -0,0 +1,99 @@
+import Container from 'typedi';
+import { Logger } from '@/Logger';
+import config from '@/config';
+import { RedisService } from '@/services/redis.service';
+import { mockInstance } from '../../shared/mocking';
+
+mockInstance(Logger);
+const redisService = Container.get(RedisService);
+
+function setDefaultConfig() {
+	config.set('executions.mode', 'queue');
+}
+
+const PUBSUB_CHANNEL = 'testchannel';
+const LIST_CHANNEL = 'testlist';
+const STREAM_CHANNEL = 'teststream';
+
+describe('RedisService', () => {
+	beforeAll(async () => {
+		jest.mock('ioredis', () => {
+			const Redis = require('ioredis-mock');
+			if (typeof Redis === 'object') {
+				// the first mock is an ioredis shim because ioredis-mock depends on it
+				// https://github.com/stipsan/ioredis-mock/blob/master/src/index.js#L101-L111
+				return {
+					Command: { _transformer: { argument: {}, reply: {} } },
+				};
+			}
+			// second mock for our code
+			return function (...args: any) {
+				return new Redis(args);
+			};
+		});
+		setDefaultConfig();
+	});
+
+	test('should create pubsub publisher and subscriber with handler', async () => {
+		const pub = await redisService.getPubSubPublisher();
+		const sub = await redisService.getPubSubSubscriber();
+		expect(pub).toBeDefined();
+		expect(sub).toBeDefined();
+
+		const mockHandler = jest.fn();
+		mockHandler.mockImplementation((channel: string, message: string) => {});
+		sub.addMessageHandler(PUBSUB_CHANNEL, mockHandler);
+		await sub.subscribe(PUBSUB_CHANNEL);
+		await pub.publish(PUBSUB_CHANNEL, 'test');
+		await new Promise((resolve) =>
+			setTimeout(async () => {
+				resolve(0);
+			}, 50),
+		);
+		expect(mockHandler).toHaveBeenCalled();
+		await sub.destroy();
+		await pub.destroy();
+	});
+
+	// NOTE: This test is failing because the mock Redis client does not support streams apparently
+	// eslint-disable-next-line n8n-local-rules/no-skipped-tests
+	test.skip('should create stream producer and consumer', async () => {
+		const consumer = await redisService.getStreamConsumer();
+		const producer = await redisService.getStreamProducer();
+
+		expect(consumer).toBeDefined();
+		expect(producer).toBeDefined();
+
+		const mockHandler = jest.fn();
+		mockHandler.mockImplementation((stream: string, id: string, message: string[]) => {
+			Container.get(Logger).info('Received message', { stream, id, message });
+		});
+		consumer.addMessageHandler('some handler', mockHandler);
+
+		await consumer.setPollingInterval(STREAM_CHANNEL, 50);
+		await consumer.listenToStream(STREAM_CHANNEL);
+
+		let timeout;
+		await new Promise((resolve) => {
+			timeout = setTimeout(async () => {
+				await producer.add(STREAM_CHANNEL, ['message', 'testMessage', 'event', 'testEveny']);
+				resolve(0);
+			}, 50);
+		});
+
+		await new Promise((resolve) =>
+			setTimeout(async () => {
+				resolve(0);
+			}, 100),
+		);
+
+		clearInterval(timeout);
+
+		consumer.stopListeningToStream(STREAM_CHANNEL);
+
+		expect(mockHandler).toHaveBeenCalled();
+
+		await consumer.destroy();
+		await producer.destroy();
+	});
+});
diff --git a/packages/cli/test/unit/services/role.service.test.ts b/packages/cli/test/unit/services/role.service.test.ts
deleted file mode 100644
index 483be386ae0a6..0000000000000
--- a/packages/cli/test/unit/services/role.service.test.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
-import { Role } from '@db/entities/Role';
-import { SharedWorkflow } from '@db/entities/SharedWorkflow';
-import { RoleService } from '@/role/role.service';
-import { mockInstance } from '../../integration/shared/utils';
-
-describe('RoleService', () => {
-	const sharedWorkflowRepository = mockInstance(SharedWorkflowRepository);
-	const roleService = new RoleService(sharedWorkflowRepository);
-
-	const userId = '1';
-	const workflowId = '42';
-
-	describe('getUserRoleForWorkflow', () => {
-		test('should return the role if a shared workflow is found', async () => {
-			const sharedWorkflow = Object.assign(new SharedWorkflow(), { role: new Role() });
-			sharedWorkflowRepository.findOne.mockResolvedValueOnce(sharedWorkflow);
-			const role = await roleService.getUserRoleForWorkflow(userId, workflowId);
-			expect(role).toBe(sharedWorkflow.role);
-		});
-
-		test('should return undefined if no shared workflow is found', async () => {
-			sharedWorkflowRepository.findOne.mockResolvedValueOnce(null);
-			const role = await roleService.getUserRoleForWorkflow(userId, workflowId);
-			expect(role).toBeUndefined();
-		});
-	});
-});
diff --git a/packages/cli/test/unit/services/test-webhook-registrations.service.test.ts b/packages/cli/test/unit/services/test-webhook-registrations.service.test.ts
new file mode 100644
index 0000000000000..c93540938c1bd
--- /dev/null
+++ b/packages/cli/test/unit/services/test-webhook-registrations.service.test.ts
@@ -0,0 +1,98 @@
+import type { CacheService } from '@/services/cache/cache.service';
+import type { OrchestrationService } from '@/services/orchestration.service';
+import type { TestWebhookRegistration } from '@/services/test-webhook-registrations.service';
+import { TestWebhookRegistrationsService } from '@/services/test-webhook-registrations.service';
+import { mock } from 'jest-mock-extended';
+
+describe('TestWebhookRegistrationsService', () => {
+	const cacheService = mock<CacheService>();
+	const registrations = new TestWebhookRegistrationsService(
+		cacheService,
+		mock<OrchestrationService>({ isMultiMainSetupEnabled: false }),
+	);
+
+	const registration = mock<TestWebhookRegistration>({
+		webhook: { httpMethod: 'GET', path: 'hello', webhookId: undefined },
+	});
+
+	const webhookKey = 'GET|hello';
+	const cacheKey = 'test-webhooks';
+
+	describe('register()', () => {
+		test('should register a test webhook registration', async () => {
+			await registrations.register(registration);
+
+			expect(cacheService.setHash).toHaveBeenCalledWith(cacheKey, { [webhookKey]: registration });
+		});
+
+		test('should skip setting TTL in single-main setup', async () => {
+			await registrations.register(registration);
+
+			expect(cacheService.expire).not.toHaveBeenCalled();
+		});
+	});
+
+	describe('deregister()', () => {
+		test('should deregister a test webhook registration', async () => {
+			await registrations.register(registration);
+
+			await registrations.deregister(webhookKey);
+
+			expect(cacheService.deleteFromHash).toHaveBeenCalledWith(cacheKey, webhookKey);
+		});
+	});
+
+	describe('get()', () => {
+		test('should retrieve a test webhook registration', async () => {
+			cacheService.getHashValue.mockResolvedValueOnce(registration);
+
+			const promise = registrations.get(webhookKey);
+
+			await expect(promise).resolves.toBe(registration);
+		});
+
+		test('should return undefined if no such test webhook registration was found', async () => {
+			cacheService.getHashValue.mockResolvedValueOnce(undefined);
+
+			const promise = registrations.get(webhookKey);
+
+			await expect(promise).resolves.toBeUndefined();
+		});
+	});
+
+	describe('getAllKeys()', () => {
+		test('should retrieve all test webhook registration keys', async () => {
+			cacheService.getHash.mockResolvedValueOnce({ [webhookKey]: registration });
+
+			const result = await registrations.getAllKeys();
+
+			expect(result).toEqual([webhookKey]);
+		});
+	});
+
+	describe('getAllRegistrations()', () => {
+		test('should retrieve all test webhook registrations', async () => {
+			cacheService.getHash.mockResolvedValueOnce({ [webhookKey]: registration });
+
+			const result = await registrations.getAllRegistrations();
+
+			expect(result).toEqual([registration]);
+		});
+	});
+
+	describe('deregisterAll()', () => {
+		test('should deregister all test webhook registrations', async () => {
+			await registrations.deregisterAll();
+
+			expect(cacheService.delete).toHaveBeenCalledWith(cacheKey);
+		});
+	});
+
+	describe('toKey()', () => {
+		test('should convert a test webhook registration to a key', () => {
+			const result = registrations.toKey(registration.webhook);
+
+			expect(result).toBe(webhookKey);
+		});
+	});
+});
diff --git a/packages/cli/test/unit/services/user.service.test.ts b/packages/cli/test/unit/services/user.service.test.ts
new file mode 100644
index 0000000000000..fe5a7c2a80ca3
--- /dev/null
+++ b/packages/cli/test/unit/services/user.service.test.ts
@@ -0,0 +1,69 @@
+import { mock } from 'jest-mock-extended';
+import { v4 as uuid } from 'uuid';
+
+import { User } from '@db/entities/User';
+import { UserService } from '@/services/user.service';
+import { UrlService } from '@/services/url.service';
+
+describe('UserService', () => {
+	const urlService = new UrlService();
+	const userService = new UserService(mock(), mock(), mock(), urlService);
+
+	const commonMockUser = Object.assign(new User(), {
+		id: uuid(),
+		password: 'passwordHash',
+	});
+
+	describe('toPublic', () => {
+		it('should remove sensitive properties', async () => {
+			const mockUser = Object.assign(new User(), {
+				id: uuid(),
+				password: 'passwordHash',
+				mfaEnabled: false,
+				mfaSecret: 'test',
+				mfaRecoveryCodes: ['test'],
+				updatedAt: new Date(),
+				authIdentities: [],
+			});
+
+			type MaybeSensitiveProperties = Partial<
+				Pick<User, 'password' | 'mfaSecret' | 'mfaRecoveryCodes' | 'updatedAt' | 'authIdentities'>
+			>;
+
+			// to prevent typechecking from blocking assertions
+			const publicUser: MaybeSensitiveProperties = await userService.toPublic(mockUser);
+
+			expect(publicUser.password).toBeUndefined();
+			expect(publicUser.mfaSecret).toBeUndefined();
+			expect(publicUser.mfaRecoveryCodes).toBeUndefined();
+			expect(publicUser.updatedAt).toBeUndefined();
+			expect(publicUser.authIdentities).toBeUndefined();
+		});
+
+		it('should add scopes if requested', async () => {
+			const scoped = await userService.toPublic(commonMockUser, { withScopes: true });
+			const unscoped = await userService.toPublic(commonMockUser);
+
+			expect(scoped.globalScopes).toEqual([]);
+			expect(unscoped.globalScopes).toBeUndefined();
+		});
+
+		it('should add invite URL if requested', async () => {
+			const firstUser = Object.assign(new User(), { id: uuid() });
+			const secondUser = Object.assign(new User(), { id: uuid(), isPending: true });
+
+			const withoutUrl = await userService.toPublic(secondUser);
+			const withUrl = await userService.toPublic(secondUser, {
+				withInviteUrl: true,
+				inviterId: firstUser.id,
+			});
+
+			expect(withoutUrl.inviteAcceptUrl).toBeUndefined();
+
+			const url = new URL(withUrl.inviteAcceptUrl ?? '');
+
+			expect(url.searchParams.get('inviterId')).toBe(firstUser.id);
+			expect(url.searchParams.get('inviteeId')).toBe(secondUser.id);
+		});
+	});
+});
diff --git a/packages/cli/test/unit/services/webhook.service.test.ts b/packages/cli/test/unit/services/webhook.service.test.ts
new file mode 100644
index 0000000000000..adb18de4b309b
--- /dev/null
+++ b/packages/cli/test/unit/services/webhook.service.test.ts
@@ -0,0 +1,190 @@
+import { v4 as uuid } from 'uuid';
+import config from '@/config';
+import { WebhookRepository } from '@db/repositories/webhook.repository';
+import { CacheService } from '@/services/cache/cache.service';
+import { WebhookService } from '@/services/webhook.service';
+import { WebhookEntity } from '@db/entities/WebhookEntity';
+import { mockInstance } from '../../shared/mocking';
+
+const createWebhook = (method: string, path: string, webhookId?: string, pathSegments?: number) =>
+	Object.assign(new WebhookEntity(), {
+		method,
+		webhookPath: path,
+		webhookId,
+		pathSegments,
+	}) as WebhookEntity;
+
+describe('WebhookService', () => {
+	const webhookRepository = mockInstance(WebhookRepository);
+	const cacheService = mockInstance(CacheService);
+	const webhookService = new WebhookService(webhookRepository, cacheService);
+
+	beforeEach(() => {
+		config.load(config.default);
+		jest.clearAllMocks();
+	});
+
+	[true, false].forEach((isCacheEnabled) => {
+		const tag = '[' + ['cache', isCacheEnabled ? 'enabled' : 'disabled'].join(' ') + ']';
+
+		describe(`findWebhook() - static case ${tag}`, () => {
+			test('should return the webhook if found', async () => {
+				const method = 'GET';
+				const path = 'user/profile';
+				const mockWebhook = createWebhook(method, path);
+
+				webhookRepository.findOneBy.mockResolvedValue(mockWebhook);
+
+				const returnedWebhook = await webhookService.findWebhook(method, path);
+
+				expect(returnedWebhook).toBe(mockWebhook);
+			});
+
+			test('should return null if not found', async () => {
+				webhookRepository.findOneBy.mockResolvedValue(null); // static
+				webhookRepository.findBy.mockResolvedValue([]);
+
+				const returnValue = await webhookService.findWebhook('GET', 'user/profile');
+
+				expect(returnValue).toBeNull();
+			});
+		});
+
+		describe(`findWebhook() - dynamic case ${tag}`, () => {
+			test('should return the webhook if found', async () => {
+				const method = 'GET';
+				const webhookId = uuid();
+				const path = 'user/:id/posts';
+				const mockWebhook = createWebhook(method, path, webhookId, 3);
+
+				webhookRepository.findOneBy.mockResolvedValue(null); // static
+				webhookRepository.findBy.mockResolvedValue([mockWebhook]); // dynamic
+
+				const returnedWebhook = await webhookService.findWebhook(
+					method,
+					[webhookId, 'user/123/posts'].join('/'),
+				);
+
+				expect(returnedWebhook).toBe(mockWebhook);
+			});
+
+			test('should handle subset dynamic path case', async () => {
+				const method1 = 'GET';
+				const webhookId1 = uuid();
+				const path1 = 'user/:id/posts';
+				const mockWebhook1 = createWebhook(method1, path1, webhookId1, 3);
+
+				const method2 = 'GET';
+				const webhookId2 = uuid();
+				const path2 = 'user/:id/posts/:postId/comments';
+				const mockWebhook2 = createWebhook(method2, path2, webhookId2, 3);
+
+				webhookRepository.findOneBy.mockResolvedValue(null); // static
+				webhookRepository.findBy.mockResolvedValue([mockWebhook1, mockWebhook2]); // dynamic
+
+				const fullPath1 = [webhookId1, 'user/123/posts'].join('/');
+				const returnedWebhook1 = await webhookService.findWebhook(method1, fullPath1);
+
+				const fullPath2 = [webhookId1, 'user/123/posts/456/comments'].join('/');
+				const returnedWebhook2 = await webhookService.findWebhook(method2, fullPath2);
+
+				expect(returnedWebhook1).toBe(mockWebhook1);
+				expect(returnedWebhook2).toBe(mockWebhook2);
+			});
+
+			test('should handle single-segment dynamic path case', async () => {
+				const method1 = 'GET';
+				const webhookId1 = uuid();
+				const path1 = ':var';
+				const mockWebhook1 = createWebhook(method1, path1, webhookId1, 3);
+
+				const method2 = 'GET';
+				const webhookId2 = uuid();
+				const path2 = 'user/:id/posts/:postId/comments';
+				const mockWebhook2 = createWebhook(method2, path2, webhookId2, 3);
+
+				webhookRepository.findOneBy.mockResolvedValue(null); // static
+				webhookRepository.findBy.mockResolvedValue([mockWebhook1, mockWebhook2]); // dynamic
+
+				const fullPath = [webhookId1, 'user/123/posts/456'].join('/');
+				const returnedWebhook = await webhookService.findWebhook(method1, fullPath);
+
+				expect(returnedWebhook).toBe(mockWebhook1);
+			});
+
+			test('should return null if not found', async () => {
+				const fullPath = [uuid(), 'user/:id/posts'].join('/');
+
+				webhookRepository.findOneBy.mockResolvedValue(null); // static
+				webhookRepository.findBy.mockResolvedValue([]); // dynamic
+
+				const returnValue = await webhookService.findWebhook('GET', fullPath);
+
+				expect(returnValue).toBeNull();
+			});
+		});
+	});
+
+	describe('getWebhookMethods()', () => {
+		test('should return all methods for webhook', async () => {
+			const path = 'user/profile';
+
+			webhookRepository.find.mockResolvedValue([
+				createWebhook('GET', path),
+				createWebhook('POST', path),
+				createWebhook('PUT', path),
+				createWebhook('PATCH', path),
+			]);
+
+			const returnedMethods = await webhookService.getWebhookMethods(path);
+
+			expect(returnedMethods).toEqual(['GET', 'POST', 'PUT', 'PATCH']);
+		});
+
+		test('should return empty array if no webhooks found', async () => {
+			webhookRepository.find.mockResolvedValue([]);
+
+			const returnedMethods = await webhookService.getWebhookMethods('user/profile');
+
+			expect(returnedMethods).toEqual([]);
+		});
+	});
+
+	describe('deleteWorkflowWebhooks()', () => {
+		test('should delete all webhooks of the workflow', async () => {
+			const mockWorkflowWebhooks = [
+				createWebhook('PUT', 'users'),
+				createWebhook('GET', 'user/:id'),
+				createWebhook('POST', ':var'),
+			];
+
+			webhookRepository.findBy.mockResolvedValue(mockWorkflowWebhooks);
+
+			const workflowId = uuid();
+
+			await webhookService.deleteWorkflowWebhooks(workflowId);
+
+			expect(webhookRepository.remove).toHaveBeenCalledWith(mockWorkflowWebhooks);
+		});
+
+		test('should not delete any webhooks if none found', async () => {
+			webhookRepository.findBy.mockResolvedValue([]);
+
+			const workflowId = uuid();
+
+			await webhookService.deleteWorkflowWebhooks(workflowId);
+
+			expect(webhookRepository.remove).toHaveBeenCalledWith([]);
+		});
+	});
+
+	describe('createWebhook()', () => {
+		test('should create the webhook', async () => {
+			const mockWebhook = createWebhook('GET', 'user/:id');
+
+			await webhookService.storeWebhook(mockWebhook);
+
+			expect(webhookRepository.insert).toHaveBeenCalledWith(mockWebhook);
+		});
+	});
+});
diff --git a/packages/cli/test/unit/services/workflowHistory.service.ee.test.ts b/packages/cli/test/unit/services/workflowHistory.service.ee.test.ts
new file mode 100644
index 0000000000000..05ccae70051a2
--- /dev/null
+++ b/packages/cli/test/unit/services/workflowHistory.service.ee.test.ts
@@ -0,0 +1,114 @@
+import { mockClear } from 'jest-mock-extended';
+import { User } from '@db/entities/User';
+import { WorkflowHistoryRepository } from '@db/repositories/workflowHistory.repository';
+import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
+import { WorkflowHistoryService } from '@/workflows/workflowHistory/workflowHistory.service.ee';
+import { Logger } from '@/Logger';
+import { mockInstance } from '../../shared/mocking';
+import { getWorkflow } from '../../integration/shared/workflow';
+
+const workflowHistoryRepository = mockInstance(WorkflowHistoryRepository);
+const logger = mockInstance(Logger);
+const sharedWorkflowRepository = mockInstance(SharedWorkflowRepository);
+const workflowHistoryService = new WorkflowHistoryService(
+	logger,
+	workflowHistoryRepository,
+	sharedWorkflowRepository,
+);
+const testUser = Object.assign(new User(), {
+	id: '1234',
+	password: 'passwordHash',
+	mfaEnabled: false,
+	firstName: 'John',
+	lastName: 'Doe',
+});
+let isWorkflowHistoryEnabled = true;
+
+jest.mock('@/workflows/workflowHistory/workflowHistoryHelper.ee', () => {
+	return {
+		isWorkflowHistoryEnabled: jest.fn(() => isWorkflowHistoryEnabled),
+	};
+});
+
+describe('WorkflowHistoryService', () => {
+	beforeEach(() => {
+		mockClear(workflowHistoryRepository.insert);
+	});
+
+	describe('saveVersion', () => {
+		it('should save a new version when workflow history is enabled and nodes and connections are present', async () => {
+			// Arrange
+			isWorkflowHistoryEnabled = true;
+			const workflow = getWorkflow({ addNodeWithoutCreds: true });
+			const workflowId = '123';
+			workflow.connections = {};
+			workflow.id = workflowId;
+			workflow.versionId = '456';
+
+			// Act
+			await workflowHistoryService.saveVersion(testUser, workflow, workflowId);
+
+			// Assert
+			expect(workflowHistoryRepository.insert).toHaveBeenCalledWith({
+				authors: 'John Doe',
+				connections: {},
+				nodes: workflow.nodes,
+				versionId: workflow.versionId,
+				workflowId,
+			});
+		});
+
+		it('should not save a new version when workflow history is disabled', async () => {
+			// Arrange
+			isWorkflowHistoryEnabled = false;
+			const workflow = getWorkflow({ addNodeWithoutCreds: true });
+			const workflowId = '123';
+			workflow.connections = {};
+			workflow.id = workflowId;
+			workflow.versionId = '456';
+
+			// Act
+			await workflowHistoryService.saveVersion(testUser, workflow, workflowId);
+
+			// Assert
+			expect(workflowHistoryRepository.insert).not.toHaveBeenCalled();
+		});
+
+		it('should not save a new version when nodes or connections are missing', async () => {
+			// Arrange
+			isWorkflowHistoryEnabled = true;
+			const workflow = getWorkflow({ addNodeWithoutCreds: true });
+			const workflowId = '123';
+			workflow.id = workflowId;
+			workflow.versionId = '456';
+			// Nodes are set but connections is empty
+
+			// Act
+			await workflowHistoryService.saveVersion(testUser, workflow, workflowId);
+
+			// Assert
+			expect(workflowHistoryRepository.insert).not.toHaveBeenCalled();
+		});
+
+		it('should log an error when failed to save workflow history version', async () => {
+			// Arrange
+			isWorkflowHistoryEnabled = true;
+			const workflow = getWorkflow({ addNodeWithoutCreds: true });
+			const workflowId = '123';
+			workflow.connections = {};
+			workflow.id = workflowId;
+			workflow.versionId = '456';
+			workflowHistoryRepository.insert.mockRejectedValueOnce(new Error('Test error'));
+
+			// Act
+			await workflowHistoryService.saveVersion(testUser, workflow, workflowId);
+
+			// Assert
+			expect(workflowHistoryRepository.insert).toHaveBeenCalled();
+			expect(logger.error).toHaveBeenCalledWith(
+				'Failed to save workflow history version for workflow 123',
+				expect.any(Error),
+			);
+		});
+	});
+});
diff --git a/packages/cli/test/unit/shared/mockObjects.ts b/packages/cli/test/unit/shared/mockObjects.ts
new file mode 100644
index 0000000000000..baa6cf47403b9
--- /dev/null
+++ b/packages/cli/test/unit/shared/mockObjects.ts
@@ -0,0 +1,20 @@
+import { User } from '@db/entities/User';
+import { CredentialsEntity } from '@db/entities/CredentialsEntity';
+
+import {
+	randomCredentialPayload,
+	randomEmail,
+	randomInteger,
+	randomName,
+} from '../../integration/shared/random';
+
+export const mockCredential = (): CredentialsEntity =>
+	Object.assign(new CredentialsEntity(), randomCredentialPayload());
+
+export const mockUser = (): User =>
+	Object.assign(new User(), {
+		id: randomInteger(),
+		email: randomEmail(),
+		firstName: randomName(),
+		lastName: randomName(),
+	});
diff --git a/packages/cli/test/unit/shutdown/Shutdown.service.test.ts b/packages/cli/test/unit/shutdown/Shutdown.service.test.ts
new file mode 100644
index 0000000000000..ca85f785641b3
--- /dev/null
+++ b/packages/cli/test/unit/shutdown/Shutdown.service.test.ts
@@ -0,0 +1,159 @@
+import { ApplicationError, ErrorReporterProxy } from 'n8n-workflow';
+import { mock } from 'jest-mock-extended';
+import type { ServiceClass } from '@/shutdown/Shutdown.service';
+import { ShutdownService } from '@/shutdown/Shutdown.service';
+import Container from 'typedi';
+
+class MockComponent {
+	onShutdown() {}
+}
+
+describe('ShutdownService', () => {
+	let shutdownService: ShutdownService;
+	let mockComponent: MockComponent;
+	let onShutdownSpy: jest.SpyInstance;
+	let mockErrorReporterProxy: jest.SpyInstance;
+
+	beforeEach(() => {
+		shutdownService = new ShutdownService(mock());
+		mockComponent = new MockComponent();
+		Container.set(MockComponent, mockComponent);
+		onShutdownSpy = jest.spyOn(mockComponent, 'onShutdown');
+		mockErrorReporterProxy = jest.spyOn(ErrorReporterProxy, 'error').mockImplementation(() => {});
+	});
+
+	describe('shutdown', () => {
+		it('should signal shutdown', () => {
+			shutdownService.register(10, {
+				serviceClass: MockComponent as unknown as ServiceClass,
+				methodName: 'onShutdown',
+			});
+			shutdownService.shutdown();
+			expect(onShutdownSpy).toBeCalledTimes(1);
+		});
+
+		it('should signal shutdown in the priority order', async () => {
+			class MockService {
+				onShutdownHighPrio() {}
+
+				onShutdownLowPrio() {}
+			}
+
+			const order: string[] = [];
+			const mockService = new MockService();
+			Container.set(MockService, mockService);
+
+			jest.spyOn(mockService, 'onShutdownHighPrio').mockImplementation(() => order.push('high'));
+			jest.spyOn(mockService, 'onShutdownLowPrio').mockImplementation(() => order.push('low'));
+
+			shutdownService.register(100, {
+				serviceClass: MockService as unknown as ServiceClass,
+				methodName: 'onShutdownHighPrio',
+			});
+
+			shutdownService.register(10, {
+				serviceClass: MockService as unknown as ServiceClass,
+				methodName: 'onShutdownLowPrio',
+			});
+
+			shutdownService.shutdown();
+			await shutdownService.waitForShutdown();
+			expect(order).toEqual(['high', 'low']);
+		});
+
+		it('should throw error if shutdown is already in progress', () => {
+			shutdownService.register(10, {
+				methodName: 'onShutdown',
+				serviceClass: MockComponent as unknown as ServiceClass,
+			});
+			shutdownService.shutdown();
+			expect(() => shutdownService.shutdown()).toThrow('App is already shutting down');
+		});
+
+		it('should report error if component shutdown fails', async () => {
+			const componentError = new Error('Something went wrong');
+			onShutdownSpy.mockImplementation(() => {
+				throw componentError;
+			});
+			shutdownService.register(10, {
+				serviceClass: MockComponent as unknown as ServiceClass,
+				methodName: 'onShutdown',
+			});
+			shutdownService.shutdown();
+			await shutdownService.waitForShutdown();
+
+			expect(mockErrorReporterProxy).toHaveBeenCalledTimes(1);
+			const error = mockErrorReporterProxy.mock.calls[0][0];
+			expect(error).toBeInstanceOf(ApplicationError);
+			expect(error.message).toBe('Failed to shutdown gracefully');
+			expect(error.extra).toEqual({
+				component: 'MockComponent.onShutdown()',
+			});
+			expect(error.cause).toBe(componentError);
+		});
+	});
+
+	describe('waitForShutdown', () => {
+		it('should wait for shutdown', async () => {
+			shutdownService.register(10, {
+				serviceClass: MockComponent as unknown as ServiceClass,
+				methodName: 'onShutdown',
+			});
+			shutdownService.shutdown();
+			await expect(shutdownService.waitForShutdown()).resolves.toBeUndefined();
+		});
+
+		it('should throw error if app is not shutting down', async () => {
+			await expect(async () => await shutdownService.waitForShutdown()).rejects.toThrow(
+				'App is not shutting down',
+			);
+		});
+	});
+
+	describe('isShuttingDown', () => {
+		it('should return true if app is shutting down', () => {
+			shutdownService.register(10, {
+				serviceClass: MockComponent as unknown as ServiceClass,
+				methodName: 'onShutdown',
+			});
+			shutdownService.shutdown();
+			expect(shutdownService.isShuttingDown()).toBe(true);
+		});
+
+		it('should return false if app is not shutting down', () => {
+			expect(shutdownService.isShuttingDown()).toBe(false);
+		});
+	});
+
+	describe('validate', () => {
+		it('should throw error if component is not registered with the DI container', () => {
+			class UnregisteredComponent {
+				onShutdown() {}
+			}
+
+			shutdownService.register(10, {
+				serviceClass: UnregisteredComponent as unknown as ServiceClass,
+				methodName: 'onShutdown',
+			});
+
+			expect(() => shutdownService.validate()).toThrow(
+				'Component "UnregisteredComponent" is not registered with the DI container. Any component using @OnShutdown() must be decorated with @Service()',
+			);
+		});
+
+		it('should throw error if component is missing the shutdown method', () => {
+			class TestComponent {}
+
+			shutdownService.register(10, {
+				serviceClass: TestComponent as unknown as ServiceClass,
+				methodName: 'onShutdown',
+			});
+
+			Container.set(TestComponent, new TestComponent());
+
+			expect(() => shutdownService.validate()).toThrow(
+				'Component "TestComponent" does not have a "onShutdown" method',
+			);
+		});
+	});
+});
diff --git a/packages/cli/test/unit/sso/saml/saml.service.ee.test.ts b/packages/cli/test/unit/sso/saml/saml.service.ee.test.ts
new file mode 100644
index 0000000000000..9ba6ddaf2a6bd
--- /dev/null
+++ b/packages/cli/test/unit/sso/saml/saml.service.ee.test.ts
@@ -0,0 +1,53 @@
+import { mock } from 'jest-mock-extended';
+import type express from 'express';
+import { SamlService } from '@/sso/saml/saml.service.ee';
+import { mockInstance } from '../../../shared/mocking';
+import { UrlService } from '@/services/url.service';
+import { Logger } from '@/Logger';
+import type { IdentityProviderInstance, ServiceProviderInstance } from 'samlify';
+import * as samlHelpers from '@/sso/saml/samlHelpers';
+
+describe('SamlService', () => {
+	const logger = mockInstance(Logger);
+	const urlService = mockInstance(UrlService);
+	const samlService = new SamlService(logger, urlService);
+
+	describe('getAttributesFromLoginResponse', () => {
+		test('throws when any attribute is missing', async () => {
+			//
+			// ARRANGE
+			//
+			jest
+				.spyOn(samlService, 'getIdentityProviderInstance')
+				.mockReturnValue(mock<IdentityProviderInstance>());
+
+			const serviceProviderInstance = mock<ServiceProviderInstance>();
+			serviceProviderInstance.parseLoginResponse.mockResolvedValue({
+				samlContent: '',
+				extract: {},
+			});
+			jest
+				.spyOn(samlService, 'getServiceProviderInstance')
+				.mockReturnValue(serviceProviderInstance);
+
+			jest.spyOn(samlHelpers, 'getMappedSamlAttributesFromFlowResult').mockReturnValue({
+				attributes: {} as never,
+				missingAttributes: [
+					'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress',
+					'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/firstname',
+					'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/lastname',
+					'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn',
+				],
+			});
+
+			//
+			// ACT & ASSERT
+			//
+			await expect(
+				samlService.getAttributesFromLoginResponse(mock<express.Request>(), 'post'),
+			).rejects.toThrowError(
+				'SAML Authentication failed. Invalid SAML response (missing attributes: http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress, http://schemas.xmlsoap.org/ws/2005/05/identity/claims/firstname, http://schemas.xmlsoap.org/ws/2005/05/identity/claims/lastname, http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn).',
+			);
+		});
+	});
+});
diff --git a/packages/cli/test/unit/utilities/password.utility.test.ts b/packages/cli/test/unit/utilities/password.utility.test.ts
new file mode 100644
index 0000000000000..3cab55ae48f57
--- /dev/null
+++ b/packages/cli/test/unit/utilities/password.utility.test.ts
@@ -0,0 +1,104 @@
+import { PasswordUtility } from '@/services/password.utility';
+import Container from 'typedi';
+
+function toComponents(hash: string) {
+	const BCRYPT_HASH_REGEX =
+		/^\$(?<version>.{2})\$(?<costFactor>\d{2})\$(?<salt>.{22})(?<hashedPassword>.{31})$/;
+
+	const match = hash.match(BCRYPT_HASH_REGEX);
+
+	if (!match?.groups) throw new Error('Invalid bcrypt hash format');
+
+	return match.groups;
+}
+
+describe('PasswordUtility', () => {
+	const passwordUtility = Container.get(PasswordUtility);
+
+	describe('hash()', () => {
+		test('should hash a plaintext password', async () => {
+			const plaintext = 'abcd1234X';
+			const hashed = await passwordUtility.hash(plaintext);
+
+			const { version, costFactor, salt, hashedPassword } = toComponents(hashed);
+
+			expect(version).toBe('2a');
+			expect(costFactor).toBe('10');
+			expect(salt).toHaveLength(22);
+			expect(hashedPassword).toHaveLength(31);
+		});
+	});
+
+	describe('compare()', () => {
+		test('should return true on match', async () => {
+			const plaintext = 'abcd1234X';
+			const hashed = await passwordUtility.hash(plaintext);
+
+			const isMatch = await passwordUtility.compare(plaintext, hashed);
+
+			expect(isMatch).toBe(true);
+		});
+
+		test('should return false on mismatch', async () => {
+			const secondPlaintext = 'abcd1234Y';
+			const hashed = await passwordUtility.hash('abcd1234X');
+
+			const isMatch = await passwordUtility.compare(secondPlaintext, hashed);
+
+			expect(isMatch).toBe(false);
+		});
+	});
+
+	describe('validate()', () => {
+		test('should throw on empty password', () => {
+			const check = () => passwordUtility.validate();
+
+			expect(check).toThrowError('Password is mandatory');
+		});
+
+		test('should return same password if valid', () => {
+			const validPassword = 'abcd1234X';
+
+			const validated = passwordUtility.validate(validPassword);
+
+			expect(validated).toBe(validPassword);
+		});
+
+		test('should require at least one uppercase letter', () => {
+			const invalidPassword = 'abcd1234';
+
+			const failingCheck = () => passwordUtility.validate(invalidPassword);
+
+			expect(failingCheck).toThrowError('Password must contain at least 1 uppercase letter.');
+		});
+
+		test('should require at least one number', () => {
+			const validPassword = 'abcd1234X';
+			const invalidPassword = 'abcdEFGH';
+
+			const validated = passwordUtility.validate(validPassword);
+
+			expect(validated).toBe(validPassword);
+
+			const check = () => passwordUtility.validate(invalidPassword);
+
+			expect(check).toThrowError('Password must contain at least 1 number.');
+		});
+
+		test('should require a minimum length of 8 characters', () => {
+			const invalidPassword = 'a'.repeat(7);
+
+			const check = () => passwordUtility.validate(invalidPassword);
+
+			expect(check).toThrowError('Password must be 8 to 64 characters long.');
+		});
+
+		test('should require a maximum length of 64 characters', () => {
+			const invalidPassword = 'a'.repeat(65);
+
+			const check = () => passwordUtility.validate(invalidPassword);
+
+			expect(check).toThrowError('Password must be 8 to 64 characters long.');
+		});
+	});
+});
diff --git a/packages/cli/test/unit/utils.test.ts b/packages/cli/test/unit/utils.test.ts
new file mode 100644
index 0000000000000..92a89003d667e
--- /dev/null
+++ b/packages/cli/test/unit/utils.test.ts
@@ -0,0 +1,47 @@
+import { webhookNotFoundErrorMessage } from '@/errors/response-errors/webhook-not-found.error';
+
+describe('utils test webhookNotFoundErrorMessage ', () => {
+	it('should return a message with path and method', () => {
+		const message = webhookNotFoundErrorMessage({ path: 'webhook12345', httpMethod: 'GET' });
+
+		expect(message).toEqual('The requested webhook "GET webhook12345" is not registered.');
+	});
+	it('should return a message with path', () => {
+		const message = webhookNotFoundErrorMessage({ path: 'webhook12345' });
+
+		expect(message).toEqual('The requested webhook "webhook12345" is not registered.');
+	});
+	it('should return a message with method with tip', () => {
+		const message = webhookNotFoundErrorMessage({
+			path: 'webhook12345',
+			httpMethod: 'POST',
+			webhookMethods: ['GET', 'PUT'],
+		});
+
+		expect(message).toEqual(
+			'This webhook is not registered for POST requests. Did you mean to make a GET or PUT request?',
+		);
+	});
+	it('should return a message with method with tip', () => {
+		const message = webhookNotFoundErrorMessage({
+			path: 'webhook12345',
+			httpMethod: 'POST',
+			webhookMethods: ['PUT'],
+		});
+
+		expect(message).toEqual(
+			'This webhook is not registered for POST requests. Did you mean to make a PUT request?',
+		);
+	});
+	it('should return a message with method with tip', () => {
+		const message = webhookNotFoundErrorMessage({
+			path: 'webhook12345',
+			httpMethod: 'POST',
+			webhookMethods: ['GET', 'PUT', 'DELETE'],
+		});
+
+		expect(message).toEqual(
+			'This webhook is not registered for POST requests. Did you mean to make a GET, PUT or DELETE request?',
+		);
+	});
+});
diff --git a/packages/cli/test/unit/webhooks.test.ts b/packages/cli/test/unit/webhooks.test.ts
new file mode 100644
index 0000000000000..3070a5d4781a1
--- /dev/null
+++ b/packages/cli/test/unit/webhooks.test.ts
@@ -0,0 +1,89 @@
+import type { SuperAgentTest } from 'supertest';
+import { agent as testAgent } from 'supertest';
+import { mock } from 'jest-mock-extended';
+
+import config from '@/config';
+import { AbstractServer } from '@/AbstractServer';
+import { ActiveWebhooks } from '@/ActiveWebhooks';
+import { ExternalHooks } from '@/ExternalHooks';
+import { InternalHooks } from '@/InternalHooks';
+import { TestWebhooks } from '@/TestWebhooks';
+import { WaitingWebhooks } from '@/WaitingWebhooks';
+import { WaitingForms } from '@/WaitingForms';
+import type { IResponseCallbackData } from '@/Interfaces';
+
+import { mockInstance } from '../shared/mocking';
+
+let agent: SuperAgentTest;
+
+describe('WebhookServer', () => {
+	mockInstance(ExternalHooks);
+	mockInstance(InternalHooks);
+
+	describe('CORS', () => {
+		const corsOrigin = 'https://example.com';
+		const activeWebhooks = mockInstance(ActiveWebhooks);
+		const testWebhooks = mockInstance(TestWebhooks);
+		mockInstance(WaitingWebhooks);
+		mockInstance(WaitingForms);
+
+		beforeAll(async () => {
+			const server = new (class extends AbstractServer {
+				testWebhooksEnabled = true;
+			})();
+			await server.start();
+			agent = testAgent(server.app);
+		});
+
+		const tests = [
+			['webhook', activeWebhooks],
+			['webhookTest', testWebhooks],
+			// TODO: enable webhookWaiting & waitingForms after CORS support is added
+			// ['webhookWaiting', waitingWebhooks],
+			// ['formWaiting', waitingForms],
+		] as const;
+
+		for (const [key, manager] of tests) {
+			describe(`for ${key}`, () => {
+				it('should handle preflight requests', async () => {
+					const pathPrefix = config.getEnv(`endpoints.${key}`);
+					manager.getWebhookMethods.mockResolvedValueOnce(['GET']);
+
+					const response = await agent
+						.options(`/${pathPrefix}/abcd`)
+						.set('origin', corsOrigin)
+						.set('access-control-request-method', 'GET');
+					expect(response.statusCode).toEqual(204);
+					expect(response.body).toEqual({});
+					expect(response.headers['access-control-allow-origin']).toEqual(corsOrigin);
+					expect(response.headers['access-control-allow-methods']).toEqual('OPTIONS, GET');
+				});
+
+				it('should handle regular requests', async () => {
+					const pathPrefix = config.getEnv(`endpoints.${key}`);
+					manager.getWebhookMethods.mockResolvedValueOnce(['GET']);
+					manager.executeWebhook.mockResolvedValueOnce(
+						mockResponse({ test: true }, { key: 'value ' }),
+					);
+
+					const response = await agent
+						.get(`/${pathPrefix}/abcd`)
+						.set('origin', corsOrigin)
+						.set('access-control-request-method', 'GET');
+					expect(response.statusCode).toEqual(200);
+					expect(response.body).toEqual({ test: true });
+					expect(response.headers['access-control-allow-origin']).toEqual(corsOrigin);
+					expect(response.headers.key).toEqual('value');
+				});
+			});
+		}
+
+		const mockResponse = (data = {}, headers = {}, status = 200) => {
+			const response = mock<IResponseCallbackData>();
+			response.responseCode = status;
+			response.data = data;
+			response.headers = headers;
+			return response;
+		};
+	});
+});
diff --git a/packages/cli/test/unit/workflow-execution.service.test.ts b/packages/cli/test/unit/workflow-execution.service.test.ts
new file mode 100644
index 0000000000000..567f6bf6e7f23
--- /dev/null
+++ b/packages/cli/test/unit/workflow-execution.service.test.ts
@@ -0,0 +1,151 @@
+import type { INode } from 'n8n-workflow';
+import { mock } from 'jest-mock-extended';
+
+import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
+import type { IWorkflowDb } from '@/Interfaces';
+import { WorkflowExecutionService } from '@/workflows/workflowExecution.service';
+import type { WorkflowRunner } from '@/WorkflowRunner';
+
+const webhookNode: INode = {
+	name: 'Webhook',
+	type: 'n8n-nodes-base.webhook',
+	id: '111f1db0-e7be-44c5-9ce9-3e35362490f0',
+	parameters: {},
+	typeVersion: 1,
+	position: [0, 0],
+	webhookId: 'de0f8dcb-7b64-4f22-b66d-d8f74d6aefb7',
+};
+
+const secondWebhookNode = {
+	...webhookNode,
+	name: 'Webhook 2',
+	id: '222f1db0-e7be-44c5-9ce9-3e35362490f1',
+};
+
+const executeWorkflowTriggerNode: INode = {
+	name: 'Execute Workflow Trigger',
+	type: 'n8n-nodes-base.executeWorkflowTrigger',
+	id: '78d63bca-bb6c-4568-948f-8ed9aacb1fe9',
+	parameters: {},
+	typeVersion: 1,
+	position: [0, 0],
+};
+
+const respondToWebhookNode: INode = {
+	name: 'Respond to Webhook',
+	type: 'n8n-nodes-base.respondToWebhook',
+	id: '66d63bca-bb6c-4568-948f-8ed9aacb1fe9',
+	parameters: {},
+	typeVersion: 1,
+	position: [0, 0],
+};
+
+const hackerNewsNode: INode = {
+	name: 'Hacker News',
+	type: 'n8n-nodes-base.hackerNews',
+	id: '55d63bca-bb6c-4568-948f-8ed9aacb1fe9',
+	parameters: {},
+	typeVersion: 1,
+	position: [0, 0],
+};
+
+describe('WorkflowExecutionService', () => {
+	const workflowRunner = mock<WorkflowRunner>();
+	const workflowExecutionService = new WorkflowExecutionService(
+		mock(),
+		mock(),
+		mock(),
+		mock(),
+		mock(),
+		mock(),
+		workflowRunner,
+	);
+
+	describe('runWorkflow()', () => {
+		test('should call `WorkflowRunner.run()`', async () => {
+			const node = mock<INode>();
+			const workflow = mock<WorkflowEntity>({ active: true, nodes: [node] });
+
+			workflowRunner.run.mockResolvedValue('fake-execution-id');
+
+			await workflowExecutionService.runWorkflow(workflow, node, [[]], mock(), 'trigger');
+
+			expect(workflowRunner.run).toHaveBeenCalledTimes(1);
+		});
+	});
+
+	describe('selectPinnedActivatorStarter()', () => {
+		const workflow = mock<IWorkflowDb>({
+			nodes: [],
+		});
+
+		const pinData = {
+			[webhookNode.name]: [{ json: { key: 'value' } }],
+			[executeWorkflowTriggerNode.name]: [{ json: { key: 'value' } }],
+		};
+
+		afterEach(() => {
+			workflow.nodes = [];
+		});
+
+		it('should return `null` if no pindata', () => {
+			const node = workflowExecutionService.selectPinnedActivatorStarter(workflow, []);
+
+			expect(node).toBeNull();
+		});
+
+		it('should return `null` if no starter nodes', () => {
+			const node = workflowExecutionService.selectPinnedActivatorStarter(workflow);
+
+			expect(node).toBeNull();
+		});
+
+		it('should select webhook node if only choice', () => {
+			workflow.nodes.push(webhookNode);
+
+			const node = workflowExecutionService.selectPinnedActivatorStarter(workflow, [], pinData);
+
+			expect(node).toEqual(webhookNode);
+		});
+
+		it('should return `null` if no choice', () => {
+			workflow.nodes.push(hackerNewsNode);
+
+			const node = workflowExecutionService.selectPinnedActivatorStarter(workflow, [], pinData);
+
+			expect(node).toBeNull();
+		});
+
+		it('should return ignore Respond to Webhook', () => {
+			workflow.nodes.push(respondToWebhookNode);
+
+			const node = workflowExecutionService.selectPinnedActivatorStarter(workflow, [], pinData);
+
+			expect(node).toBeNull();
+		});
+
+		it('should select execute workflow trigger if only choice', () => {
+			workflow.nodes.push(executeWorkflowTriggerNode);
+
+			const node = workflowExecutionService.selectPinnedActivatorStarter(workflow, [], pinData);
+
+			expect(node).toEqual(executeWorkflowTriggerNode);
+		});
+
+		it('should favor webhook node over execute workflow trigger', () => {
+			workflow.nodes.push(webhookNode, executeWorkflowTriggerNode);
+
+			const node = workflowExecutionService.selectPinnedActivatorStarter(workflow, [], pinData);
+
+			expect(node).toEqual(webhookNode);
+		});
+
+		it('should favor first webhook node over second webhook node', () => {
+			workflow.nodes.push(webhookNode, secondWebhookNode);
+
+			const node = workflowExecutionService.selectPinnedActivatorStarter(workflow, [], pinData);
+
+			expect(node).toEqual(webhookNode);
+		});
+	});
+});
diff --git a/packages/cli/test/unit/workflowHistoryHelper.test.ts b/packages/cli/test/unit/workflowHistoryHelper.test.ts
new file mode 100644
index 0000000000000..09849b1437690
--- /dev/null
+++ b/packages/cli/test/unit/workflowHistoryHelper.test.ts
@@ -0,0 +1,55 @@
+import { License } from '@/License';
+import config from '@/config';
+import { getWorkflowHistoryPruneTime } from '@/workflows/workflowHistory/workflowHistoryHelper.ee';
+import { mockInstance } from '../shared/mocking';
+
+let licenseMock: License;
+let licensePruneTime = -1;
+
+beforeAll(async () => {
+	licenseMock = mockInstance(License, {
+		getWorkflowHistoryPruneLimit() {
+			return licensePruneTime;
+		},
+	});
+});
+
+beforeEach(() => {
+	licensePruneTime = -1;
+	config.set('workflowHistory.pruneTime', -1);
+});
+
+describe('getWorkflowHistoryPruneTime', () => {
+	test('should return -1 (infinite) if config and license are -1', () => {
+		licensePruneTime = -1;
+		config.set('workflowHistory.pruneTime', -1);
+
+		expect(getWorkflowHistoryPruneTime()).toBe(-1);
+	});
+
+	test('should return config time if license is infinite and config is not', () => {
+		licensePruneTime = -1;
+		config.set('workflowHistory.pruneTime', 24);
+
+		expect(getWorkflowHistoryPruneTime()).toBe(24);
+	});
+
+	test('should return license time if config is infinite and license is not', () => {
+		licensePruneTime = 25;
+		config.set('workflowHistory.pruneTime', -1);
+
+		expect(getWorkflowHistoryPruneTime()).toBe(25);
+	});
+
+	test('should return lowest of config and license time if both are not -1', () => {
+		licensePruneTime = 26;
+		config.set('workflowHistory.pruneTime', 100);
+
+		expect(getWorkflowHistoryPruneTime()).toBe(26);
+
+		licensePruneTime = 100;
+		config.set('workflowHistory.pruneTime', 27);
+
+		expect(getWorkflowHistoryPruneTime()).toBe(27);
+	});
+});
diff --git a/packages/cli/tsconfig.build.json b/packages/cli/tsconfig.build.json
index 7ad0351c61429..1e8a2ff7fa476 100644
--- a/packages/cli/tsconfig.build.json
+++ b/packages/cli/tsconfig.build.json
@@ -1,19 +1,10 @@
 {
-	"extends": "./tsconfig.json",
+	"extends": ["./tsconfig.json", "../../tsconfig.build.json"],
 	"compilerOptions": {
 		"rootDir": "src",
 		"outDir": "dist",
-		"types": ["node"],
-		"noEmit": false,
 		"tsBuildInfoFile": "dist/build.tsbuildinfo"
 	},
 	"include": ["src/**/*.ts"],
-	"exclude": ["test/**"],
-	"tsc-alias": {
-		"replacers": {
-			"base-url": {
-				"enabled": false
-			}
-		}
-	}
+	"exclude": ["test/**"]
 }
diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json
index 5326caf458dca..86b8d550e813a 100644
--- a/packages/cli/tsconfig.json
+++ b/packages/cli/tsconfig.json
@@ -1,9 +1,7 @@
 {
-	"extends": "../../tsconfig.json",
+	"extends": ["../../tsconfig.json", "../../tsconfig.backend.json"],
 	"compilerOptions": {
 		"rootDir": ".",
-		"types": ["node", "jest"],
-		"noEmit": true,
 		"preserveSymlinks": true,
 		"emitDecoratorMetadata": true,
 		"experimentalDecorators": true,
@@ -15,12 +13,13 @@
 		"tsBuildInfoFile": "dist/typecheck.tsbuildinfo",
 		// TODO: remove all options below this line
 		"strict": false,
-		"noUnusedLocals": false,
 		"useUnknownInCatchVariables": false
 	},
 	"include": ["src/**/*.ts", "test/**/*.ts", "src/sso/saml/saml-schema-metadata-2.0.xsd"],
 	"references": [
 		{ "path": "../workflow/tsconfig.build.json" },
-		{ "path": "../core/tsconfig.build.json" }
+		{ "path": "../core/tsconfig.build.json" },
+		{ "path": "../@n8n/client-oauth2/tsconfig.build.json" },
+		{ "path": "../@n8n/permissions/tsconfig.build.json" }
 	]
 }
diff --git a/packages/core/.eslintrc.js b/packages/core/.eslintrc.js
index 4d68086144d56..cd962bad5cb33 100644
--- a/packages/core/.eslintrc.js
+++ b/packages/core/.eslintrc.js
@@ -1,4 +1,4 @@
-const { sharedOptions } = require('@n8n_io/eslint-config/shared');
+const sharedOptions = require('@n8n_io/eslint-config/shared');
 
 /**
  * @type {import('@types/eslint').ESLint.ConfigData}
@@ -8,9 +8,15 @@ module.exports = {
 
 	...sharedOptions(__dirname),
 
+	parserOptions: {
+		project: './tsconfig.json',
+	},
+
 	ignorePatterns: ['bin/*.js'],
 
 	rules: {
+		complexity: 'error',
+
 		// TODO: Remove this
 		'import/order': 'off',
 		'@typescript-eslint/ban-ts-comment': ['error', { 'ts-ignore': true }],
diff --git a/packages/core/LICENSE.md b/packages/core/LICENSE.md
index c1d74239754fd..aab68b6d9301b 100644
--- a/packages/core/LICENSE.md
+++ b/packages/core/LICENSE.md
@@ -3,8 +3,9 @@
 Portions of this software are licensed as follows:
 
 - Content of branches other than the main branch (i.e. "master") are not licensed.
-- All source code files that contain ".ee." in their filename are licensed under the
-  "n8n Enterprise License" defined in "LICENSE_EE.md".
+- Source code files that contain ".ee." in their filename are NOT licensed under the Sustainable Use License.
+  To use source code files that contain ".ee." in their filename you must hold a valid n8n Enterprise License
+  specifically allowing you access to such source code files and as defined in "LICENSE_EE.md".
 - All third party components incorporated into the n8n Software are licensed under the original license
   provided by the owner of the applicable component.
 - Content outside of the above mentioned files or restrictions is available under the "Sustainable Use
diff --git a/packages/core/README.md b/packages/core/README.md
index 1eeb8579e4856..0518567fc9bce 100644
--- a/packages/core/README.md
+++ b/packages/core/README.md
@@ -10,7 +10,7 @@ npm install n8n-core
 
 ## License
 
-n8n is [fair-code](http://faircode.io) distributed under the [**Sustainable Use License**](https://github.com/n8n-io/n8n/blob/master/packages/cli/LICENSE.md).
+n8n is [fair-code](https://faircode.io) distributed under the [**Sustainable Use License**](https://github.com/n8n-io/n8n/blob/master/packages/cli/LICENSE.md).
 
 Proprietary licenses are available for enterprise customers. [Get in touch](mailto:license@n8n.io)
 
diff --git a/packages/core/bin/copy-icons b/packages/core/bin/copy-icons
new file mode 100755
index 0000000000000..bdcb011c25c4c
--- /dev/null
+++ b/packages/core/bin/copy-icons
@@ -0,0 +1,19 @@
+#!/usr/bin/env node
+
+const glob = require('fast-glob');
+const pLimit = require('p-limit');
+const { cp } = require('fs/promises');
+const { packageDir } = require('./common');
+
+const limiter = pLimit(20);
+const icons = glob.sync('{nodes,credentials}/**/*.{png,svg}', { cwd: packageDir });
+
+(async () => {
+	await Promise.all(
+		icons.map((icon) =>
+			limiter(() => {
+				return cp(icon, `dist/${icon}`, { recursive: true });
+			}),
+		),
+	);
+})();
diff --git a/packages/core/bin/generate-known b/packages/core/bin/generate-known
index b6dde71d4fbb3..3784f15fb1f8f 100755
--- a/packages/core/bin/generate-known
+++ b/packages/core/bin/generate-known
@@ -2,14 +2,12 @@
 
 const path = require('path');
 const glob = require('fast-glob');
-const { LoggerProxy } = require('n8n-workflow');
+const uniq = require('lodash/uniq');
+const { LoggerProxy, getCredentialsForNode } = require('n8n-workflow');
 const { packageDir, writeJSON } = require('./common');
 const { loadClassInIsolation } = require('../dist/ClassLoader');
 
-LoggerProxy.init({
-	log: console.log.bind(console),
-	warn: console.warn.bind(console),
-});
+LoggerProxy.init(console);
 
 const loadClass = (sourcePath) => {
 	try {
@@ -22,43 +20,80 @@ const loadClass = (sourcePath) => {
 	}
 };
 
-const nodesToTestWith = {};
+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 generate = async (kind) => {
-	const data = glob
-		.sync(`dist/${kind}/**/*.${kind === 'nodes' ? 'node' : kind}.js`, {
-			cwd: packageDir,
-		})
+const generateKnownCredentials = async (nodesByCredential) => {
+	const credentialClasses = glob
+		.sync(`dist/credentials/**/*.credentials.js`, { cwd: packageDir })
 		.map(loadClass)
-		.filter((data) => !!data)
-		.reduce((obj, { className, sourcePath, instance }) => {
-			const name = kind === 'nodes' ? instance.description.name : instance.name;
-			if (!/[vV]\d.node\.js$/.test(sourcePath)) {
-				if (name in obj) console.error('already loaded', kind, name, sourcePath);
-				else obj[name] = { className, sourcePath };
+		.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 (kind === 'nodes') {
-				const { credentials } = instance.description;
-				if (credentials && credentials.length) {
-					for (const credential of credentials) {
-						nodesToTestWith[credential.name] = nodesToTestWith[credential.name] || [];
-						nodesToTestWith[credential.name].push(name);
-					}
-				}
-			} else {
-				if (name in nodesToTestWith) {
-					obj[name].nodesToTestWith = nodesToTestWith[name];
-				}
+			if (nodesByCredential[credentialName]) {
+				credential.supportedNodes = Array.from(new Set(nodesByCredential[credentialName]));
 			}
-			return obj;
-		}, {});
-	LoggerProxy.info(`Detected ${Object.keys(data).length} ${kind}`);
-	await writeJSON(`known/${kind}.json`, data);
-	return data;
+
+			credentials[credentialName] = credential;
+
+			return credentials;
+		},
+		{},
+	);
+
+	LoggerProxy.info(`Detected ${Object.keys(credentials).length} credentials`);
+	await writeJSON('known/credentials.json', credentials);
+	return credentials;
 };
 
 (async () => {
-	await generate('nodes');
-	await generate('credentials');
+	const { nodesByCredential } = await generateKnownNodes();
+	await generateKnownCredentials(nodesByCredential);
 })();
diff --git a/packages/core/bin/generate-translations b/packages/core/bin/generate-translations
new file mode 100755
index 0000000000000..bc5747fe7e56e
--- /dev/null
+++ b/packages/core/bin/generate-translations
@@ -0,0 +1,99 @@
+#!/usr/bin/env node
+
+const {
+	existsSync,
+	promises: { writeFile },
+} = require('fs');
+const path = require('path');
+const { packageDir } = require('./common');
+
+const ALLOWED_HEADER_KEYS = ['displayName', 'description'];
+const PURPLE_ANSI_COLOR_CODE = 35;
+
+function getNodeTranslationPaths() {
+	const nodeDistPaths = require(`${packageDir}/package.json`).n8n.nodes;
+	const { N8N_DEFAULT_LOCALE: locale } = process.env;
+
+	return nodeDistPaths.reduce((acc, cur) => {
+		const nodeTranslationPath = path.join(
+			packageDir,
+			cur.split('/').slice(1, -1).join('/'),
+			'translations',
+			locale,
+			toTranslationFile(cur),
+		);
+
+		if (existsSync(nodeTranslationPath)) {
+			acc.push(nodeTranslationPath);
+		}
+
+		return acc;
+	}, []);
+}
+
+function getHeaders(nodeTranslationPaths) {
+	return nodeTranslationPaths.reduce((acc, cur) => {
+		const { header } = require(cur);
+		const nodeType = cur.split('/').pop().replace('.json', '');
+
+		if (isValidHeader(header, ALLOWED_HEADER_KEYS)) {
+			acc[nodeType] = header;
+		}
+
+		return acc;
+	}, {});
+}
+
+// ----------------------------------
+//             helpers
+// ----------------------------------
+
+function toTranslationFile(distPath) {
+	const raw = distPath.split('/').pop().replace('.node', '') + 'on';
+	return raw.charAt(0).toLowerCase() + raw.slice(1);
+}
+
+function isValidHeader(header, allowedHeaderKeys) {
+	if (!header) return false;
+
+	const headerKeys = Object.keys(header);
+
+	return headerKeys.length > 0 && headerKeys.every((key) => allowedHeaderKeys.includes(key));
+}
+
+function writeDistFile(data, distPath) {
+	writeFile(distPath, `module.exports = ${JSON.stringify(data, null, 2)}`);
+}
+
+const log = (string, { bulletPoint } = { bulletPoint: false }) => {
+	if (bulletPoint) {
+		process.stdout.write(colorize(PURPLE_ANSI_COLOR_CODE, `- ${string}\n`));
+		return;
+	}
+
+	process.stdout.write(`${string}\n`);
+};
+
+const colorize = (ansiColorCode, string) =>
+	['\033[', ansiColorCode, 'm', string, '\033[0m'].join('');
+
+/**
+ * Write node translation headers to single file at `/dist/nodes/headers.js`.
+ */
+const { N8N_DEFAULT_LOCALE: locale } = process.env;
+
+log(`Default locale set to: ${colorize(PURPLE_ANSI_COLOR_CODE, locale || 'en')}`);
+
+if (!locale || locale === 'en') {
+	log('No translation required - Skipping translations build...');
+	return;
+}
+
+const nodeTranslationPaths = getNodeTranslationPaths();
+const headers = getHeaders(nodeTranslationPaths);
+const headersDistPath = path.join(packageDir, 'dist', 'nodes', 'headers.js');
+
+writeDistFile(headers, headersDistPath);
+
+log('Headers file written to:');
+log(headersDistPath, { bulletPoint: true });
diff --git a/packages/core/bin/generate-ui-types b/packages/core/bin/generate-ui-types
index 76ceae31fc16d..988462d604e08 100755
--- a/packages/core/bin/generate-ui-types
+++ b/packages/core/bin/generate-ui-types
@@ -4,10 +4,7 @@ const { LoggerProxy, NodeHelpers } = require('n8n-workflow');
 const { PackageDirectoryLoader } = require('../dist/DirectoryLoader');
 const { packageDir, writeJSON } = require('./common');
 
-LoggerProxy.init({
-	log: console.log.bind(console),
-	warn: console.warn.bind(console),
-});
+LoggerProxy.init(console);
 
 function findReferencedMethods(obj, refs = {}, latestName = '') {
 	for (const key in obj) {
@@ -33,7 +30,14 @@ function findReferencedMethods(obj, refs = {}, latestName = '') {
 	const loader = new PackageDirectoryLoader(packageDir);
 	await loader.loadAll();
 
-	const credentialTypes = Object.values(loader.credentialTypes).map((data) => data.type);
+	const knownCredentials = loader.known.credentials;
+	const credentialTypes = Object.values(loader.credentialTypes).map((data) => {
+		const credentialType = data.type;
+		if (knownCredentials[credentialType.name].supportedNodes?.length > 0) {
+			delete credentialType.httpRequestNode;
+		}
+		return credentialType;
+	});
 
 	const loaderNodeTypes = Object.values(loader.nodeTypes);
 
@@ -62,13 +66,12 @@ function findReferencedMethods(obj, refs = {}, latestName = '') {
 			NodeHelpers.applySpecialNodeParameters(nodeType);
 			return data.type;
 		})
-		.flatMap((nodeData) => {
-			return NodeHelpers.getVersionedNodeTypeAll(nodeData).map((item) => {
+		.flatMap((nodeType) =>
+			NodeHelpers.getVersionedNodeTypeAll(nodeType).map((item) => {
 				const { __loadOptionsMethods, ...rest } = item.description;
-
 				return rest;
-			});
-		});
+			}),
+		);
 
 	const referencedMethods = findReferencedMethods(nodeTypes);
 
diff --git a/packages/core/jest.config.js b/packages/core/jest.config.js
index a066fe093cf0f..b23dc2442639a 100644
--- a/packages/core/jest.config.js
+++ b/packages/core/jest.config.js
@@ -2,4 +2,5 @@
 module.exports = {
 	...require('../../jest.config'),
 	globalSetup: '<rootDir>/test/setup.ts',
+	setupFilesAfterEnv: ['<rootDir>/test/setup-mocks.ts'],
 };
diff --git a/packages/core/package.json b/packages/core/package.json
index c1d1a9f30f0b5..1ee490d1a93e3 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-core",
-  "version": "0.164.0",
+  "version": "1.41.0",
   "description": "Core functionality of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",
@@ -15,7 +15,9 @@
   "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"
   },
   "scripts": {
@@ -24,7 +26,7 @@
     "build": "tsc -p tsconfig.build.json",
     "dev": "pnpm watch",
     "format": "prettier --write . --ignore-path ../../.prettierignore",
-    "lint": "eslint --quiet .",
+    "lint": "eslint . --quiet",
     "lintfix": "eslint . --fix",
     "watch": "tsc -p tsconfig.build.json --watch",
     "test": "jest"
@@ -34,36 +36,37 @@
     "bin"
   ],
   "devDependencies": {
+    "@types/aws4": "^1.5.1",
     "@types/concat-stream": "^2.0.0",
     "@types/cron": "~1.7.1",
-    "@types/crypto-js": "^4.0.1",
-    "@types/express": "^4.17.6",
-    "@types/lodash.get": "^4.4.6",
-    "@types/lodash.pick": "^4.4.7",
+    "@types/express": "^4.17.21",
+    "@types/lodash": "^4.14.195",
     "@types/mime-types": "^2.1.0",
-    "@types/request-promise-native": "~1.0.15",
-    "@types/uuid": "^8.3.2"
+    "@types/uuid": "^8.3.2",
+    "@types/xml2js": "^0.4.14"
+  },
+  "peerDependencies": {
+    "n8n-nodes-base": "workspace:*"
   },
   "dependencies": {
-    "axios": "^0.21.1",
-    "client-oauth2": "^4.2.5",
-    "concat-stream": "^2.0.0",
-    "cron": "~1.7.2",
-    "crypto-js": "~4.1.1",
-    "fast-glob": "^3.2.5",
-    "file-type": "^16.5.4",
-    "flatted": "^3.2.4",
-    "form-data": "^4.0.0",
-    "lodash.get": "^4.4.2",
-    "lodash.pick": "^4.4.0",
-    "mime-types": "^2.1.27",
+    "@n8n/client-oauth2": "workspace:*",
+    "aws4": "1.11.0",
+    "axios": "1.6.7",
+    "concat-stream": "2.0.0",
+    "cron": "1.7.2",
+    "fast-glob": "3.2.12",
+    "file-type": "16.5.4",
+    "form-data": "4.0.0",
+    "lodash": "4.17.21",
+    "luxon": "^3.4.4",
+    "mime-types": "2.1.35",
     "n8n-workflow": "workspace:*",
-    "oauth-1.0a": "^2.2.6",
-    "p-cancelable": "^2.0.0",
-    "pretty-bytes": "^5.6.0",
-    "qs": "^6.10.1",
-    "request": "^2.88.2",
-    "request-promise-native": "^1.0.7",
-    "uuid": "^8.3.2"
+    "oauth-1.0a": "2.2.6",
+    "p-cancelable": "2.1.1",
+    "pretty-bytes": "5.6.0",
+    "qs": "6.11.0",
+    "typedi": "0.10.0",
+    "uuid": "8.3.2",
+    "xml2js": "0.6.2"
   }
 }
diff --git a/packages/core/src/ActiveWorkflows.ts b/packages/core/src/ActiveWorkflows.ts
index 31715c9e58f70..fb64f0fef7047 100644
--- a/packages/core/src/ActiveWorkflows.ts
+++ b/packages/core/src/ActiveWorkflows.ts
@@ -1,7 +1,4 @@
-/* eslint-disable @typescript-eslint/no-unsafe-argument */
-/* eslint-disable no-continue */
-/* eslint-disable no-await-in-loop */
-/* eslint-disable no-restricted-syntax */
+import { Service } from 'typedi';
 import { CronJob } from 'cron';
 
 import type {
@@ -16,63 +13,66 @@ import type {
 	WorkflowActivateMode,
 	WorkflowExecuteMode,
 } from 'n8n-workflow';
-import { LoggerProxy as Logger, toCronExpression, WorkflowActivationError } from 'n8n-workflow';
+import {
+	ApplicationError,
+	ErrorReporterProxy as ErrorReporter,
+	LoggerProxy as Logger,
+	toCronExpression,
+	TriggerCloseError,
+	WorkflowActivationError,
+	WorkflowDeactivationError,
+} from 'n8n-workflow';
 
 import type { IWorkflowData } from './Interfaces';
 
+@Service()
 export class ActiveWorkflows {
-	private workflowData: {
-		[key: string]: IWorkflowData;
-	} = {};
+	private activeWorkflows: { [workflowId: string]: IWorkflowData } = {};
 
 	/**
-	 * Returns if the workflow is active
-	 *
-	 * @param {string} id The id of the workflow to check
+	 * Returns if the workflow is active in memory.
 	 */
-	isActive(id: string): boolean {
-		// eslint-disable-next-line no-prototype-builtins
-		return this.workflowData.hasOwnProperty(id);
+	isActive(workflowId: string) {
+		return this.activeWorkflows.hasOwnProperty(workflowId);
 	}
 
 	/**
-	 * Returns the ids of the currently active workflows
-	 *
+	 * Returns the IDs of the currently active workflows in memory.
 	 */
-	allActiveWorkflows(): string[] {
-		return Object.keys(this.workflowData);
+	allActiveWorkflows() {
+		return Object.keys(this.activeWorkflows);
 	}
 
 	/**
-	 * Returns the Workflow data for the workflow with
-	 * the given id if it is currently active
-	 *
+	 * Returns the workflow data for the given ID if currently active in memory.
 	 */
-	get(id: string): IWorkflowData | undefined {
-		return this.workflowData[id];
+	get(workflowId: string) {
+		return this.activeWorkflows[workflowId];
 	}
 
 	/**
 	 * Makes a workflow active
 	 *
-	 * @param {string} id The id of the workflow to activate
+	 * @param {string} workflowId The id of the workflow to activate
 	 * @param {Workflow} workflow The workflow to activate
 	 * @param {IWorkflowExecuteAdditionalData} additionalData The additional data which is needed to run workflows
 	 */
 	async add(
-		id: string,
+		workflowId: string,
 		workflow: Workflow,
 		additionalData: IWorkflowExecuteAdditionalData,
 		mode: WorkflowExecuteMode,
 		activation: WorkflowActivateMode,
 		getTriggerFunctions: IGetExecuteTriggerFunctions,
 		getPollFunctions: IGetExecutePollFunctions,
-	): Promise<void> {
-		this.workflowData[id] = {};
+	) {
+		this.activeWorkflows[workflowId] = {};
 		const triggerNodes = workflow.getTriggerNodes();
 
 		let triggerResponse: ITriggerResponse | undefined;
-		this.workflowData[id].triggerResponses = [];
+
+		this.activeWorkflows[workflowId].triggerResponses = [];
+
 		for (const triggerNode of triggerNodes) {
 			try {
 				triggerResponse = await workflow.runTrigger(
@@ -84,50 +84,50 @@ export class ActiveWorkflows {
 				);
 				if (triggerResponse !== undefined) {
 					// If a response was given save it
-					// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-					this.workflowData[id].triggerResponses!.push(triggerResponse);
+
+					this.activeWorkflows[workflowId].triggerResponses!.push(triggerResponse);
 				}
-			} catch (error) {
-				// eslint-disable-next-line @typescript-eslint/no-unsafe-call
+			} catch (e) {
+				const error = e instanceof Error ? e : new Error(`${e}`);
+
 				throw new WorkflowActivationError(
-					// eslint-disable-next-line @typescript-eslint/restrict-template-expressions, @typescript-eslint/no-unsafe-member-access
 					`There was a problem activating the workflow: "${error.message}"`,
-					{ cause: error as Error, node: triggerNode },
+					{ cause: error, node: triggerNode },
 				);
 			}
 		}
 
-		const pollNodes = workflow.getPollNodes();
-		if (pollNodes.length) {
-			this.workflowData[id].pollResponses = [];
-			for (const pollNode of pollNodes) {
-				try {
-					// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-					this.workflowData[id].pollResponses!.push(
-						await this.activatePolling(
-							pollNode,
-							workflow,
-							additionalData,
-							getPollFunctions,
-							mode,
-							activation,
-						),
-					);
-				} catch (error) {
-					// eslint-disable-next-line @typescript-eslint/no-unsafe-call
-					throw new WorkflowActivationError(
-						// eslint-disable-next-line @typescript-eslint/restrict-template-expressions, @typescript-eslint/no-unsafe-member-access
-						`There was a problem activating the workflow: "${error.message}"`,
-						{ cause: error as Error, node: pollNode },
-					);
-				}
+		const pollingNodes = workflow.getPollNodes();
+
+		if (pollingNodes.length === 0) return;
+
+		this.activeWorkflows[workflowId].pollResponses = [];
+
+		for (const pollNode of pollingNodes) {
+			try {
+				this.activeWorkflows[workflowId].pollResponses!.push(
+					await this.activatePolling(
+						pollNode,
+						workflow,
+						additionalData,
+						getPollFunctions,
+						mode,
+						activation,
+					),
+				);
+			} catch (e) {
+				const error = e instanceof Error ? e : new Error(`${e}`);
+
+				throw new WorkflowActivationError(
+					`There was a problem activating the workflow: "${error.message}"`,
+					{ cause: error, node: pollNode },
+				);
 			}
 		}
 	}
 
 	/**
 	 * Activates polling for the given node
-	 *
 	 */
 	async activatePolling(
 		node: INode,
@@ -147,7 +147,6 @@ export class ActiveWorkflows {
 		const cronTimes = (pollTimes.item || []).map(toCronExpression);
 		// The trigger function to execute when the cron-time got reached
 		const executeTrigger = async (testingTrigger = false) => {
-			// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
 			Logger.debug(`Polling trigger initiated for workflow "${workflow.name}"`, {
 				workflowName: workflow.name,
 				workflowId: workflow.id,
@@ -166,7 +165,7 @@ export class ActiveWorkflows {
 				if (testingTrigger) {
 					throw error;
 				}
-				pollFunctions.__emitError(error);
+				pollFunctions.__emitError(error as Error);
 			}
 		};
 
@@ -177,11 +176,13 @@ export class ActiveWorkflows {
 
 		// Start the cron-jobs
 		const cronJobs: CronJob[] = [];
-		// eslint-disable-next-line @typescript-eslint/no-shadow
+
 		for (const cronTime of cronTimes) {
 			const cronTimeParts = cronTime.split(' ');
 			if (cronTimeParts.length > 0 && cronTimeParts[0].includes('*')) {
-				throw new Error('The polling interval is too short. It has to be at least a minute!');
+				throw new ApplicationError(
+					'The polling interval is too short. It has to be at least a minute!',
+				);
 			}
 
 			cronJobs.push(new CronJob(cronTime, executeTrigger, undefined, true, timezone));
@@ -200,56 +201,59 @@ export class ActiveWorkflows {
 	}
 
 	/**
-	 * Makes a workflow inactive
-	 *
-	 * @param {string} id The id of the workflow to deactivate
+	 * Makes a workflow inactive in memory.
 	 */
-	async remove(id: string): Promise<void> {
-		if (!this.isActive(id)) {
-			// Workflow is currently not registered
-			throw new Error(
-				`The workflow with the id "${id}" is currently not active and can so not be removed`,
-			);
+	async remove(workflowId: string) {
+		if (!this.isActive(workflowId)) {
+			Logger.warn(`Cannot deactivate already inactive workflow ID "${workflowId}"`);
+			return false;
 		}
 
-		const workflowData = this.workflowData[id];
-
-		if (workflowData.triggerResponses) {
-			for (const triggerResponse of workflowData.triggerResponses) {
-				if (triggerResponse.closeFunction) {
-					try {
-						await triggerResponse.closeFunction();
-					} catch (error) {
-						Logger.error(
-							// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/restrict-template-expressions
-							`There was a problem deactivating trigger of workflow "${id}": "${error.message}"`,
-							{
-								workflowId: id,
-							},
-						);
-					}
-				}
-			}
+		const w = this.activeWorkflows[workflowId];
+
+		for (const r of w.triggerResponses ?? []) {
+			await this.close(r, workflowId, 'trigger');
 		}
 
-		if (workflowData.pollResponses) {
-			for (const pollResponse of workflowData.pollResponses) {
-				if (pollResponse.closeFunction) {
-					try {
-						await pollResponse.closeFunction();
-					} catch (error) {
-						Logger.error(
-							// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/restrict-template-expressions
-							`There was a problem deactivating polling trigger of workflow "${id}": "${error.message}"`,
-							{
-								workflowId: id,
-							},
-						);
-					}
-				}
-			}
+		for (const r of w.pollResponses ?? []) {
+			await this.close(r, workflowId, 'poller');
 		}
 
-		delete this.workflowData[id];
+		delete this.activeWorkflows[workflowId];
+
+		return true;
+	}
+
+	async removeAllTriggerAndPollerBasedWorkflows() {
+		for (const workflowId of Object.keys(this.activeWorkflows)) {
+			await this.remove(workflowId);
+		}
+	}
+
+	private async close(
+		response: ITriggerResponse | IPollResponse,
+		workflowId: string,
+		target: 'trigger' | 'poller',
+	) {
+		if (!response.closeFunction) return;
+
+		try {
+			await response.closeFunction();
+		} catch (e) {
+			if (e instanceof TriggerCloseError) {
+				Logger.error(
+					`There was a problem calling "closeFunction" on "${e.node.name}" in workflow "${workflowId}"`,
+				);
+				ErrorReporter.error(e, { extra: { target, workflowId } });
+				return;
+			}
+
+			const error = e instanceof Error ? e : new Error(`${e}`);
+
+			throw new WorkflowDeactivationError(
+				`Failed to deactivate ${target} of workflow ID "${workflowId}": "${error.message}"`,
+				{ cause: error, workflowId },
+			);
+		}
 	}
 }
diff --git a/packages/core/src/BinaryData/BinaryData.service.ts b/packages/core/src/BinaryData/BinaryData.service.ts
new file mode 100644
index 0000000000000..8aadee3454687
--- /dev/null
+++ b/packages/core/src/BinaryData/BinaryData.service.ts
@@ -0,0 +1,251 @@
+import { readFile, stat } from 'node:fs/promises';
+import prettyBytes from 'pretty-bytes';
+import Container, { Service } from 'typedi';
+import { BINARY_ENCODING } from 'n8n-workflow';
+import { InvalidModeError } from '../errors/invalid-mode.error';
+import { areConfigModes, toBuffer } from './utils';
+
+import type { Readable } from 'stream';
+import type { BinaryData } from './types';
+import type { INodeExecutionData, IBinaryData } from 'n8n-workflow';
+import { InvalidManagerError } from '../errors/invalid-manager.error';
+
+@Service()
+export class BinaryDataService {
+	private mode: BinaryData.ServiceMode = 'default';
+
+	private managers: Record<string, BinaryData.Manager> = {};
+
+	async init(config: BinaryData.Config) {
+		if (!areConfigModes(config.availableModes)) throw new InvalidModeError();
+
+		this.mode = config.mode === 'filesystem' ? 'filesystem-v2' : config.mode;
+
+		if (config.availableModes.includes('filesystem')) {
+			const { FileSystemManager } = await import('./FileSystem.manager');
+
+			this.managers.filesystem = new FileSystemManager(config.localStoragePath);
+			this.managers['filesystem-v2'] = this.managers.filesystem;
+
+			await this.managers.filesystem.init();
+		}
+
+		if (config.availableModes.includes('s3')) {
+			const { ObjectStoreManager } = await import('./ObjectStore.manager');
+			const { ObjectStoreService } = await import('../ObjectStore/ObjectStore.service.ee');
+
+			this.managers.s3 = new ObjectStoreManager(Container.get(ObjectStoreService));
+
+			await this.managers.s3.init();
+		}
+	}
+
+	async copyBinaryFile(
+		workflowId: string,
+		executionId: string,
+		binaryData: IBinaryData,
+		filePath: string,
+	) {
+		const manager = this.managers[this.mode];
+
+		if (!manager) {
+			const { size } = await stat(filePath);
+			binaryData.fileSize = prettyBytes(size);
+			binaryData.data = await readFile(filePath, { encoding: BINARY_ENCODING });
+
+			return binaryData;
+		}
+
+		const metadata = {
+			fileName: binaryData.fileName,
+			mimeType: binaryData.mimeType,
+		};
+
+		const { fileId, fileSize } = await manager.copyByFilePath(
+			workflowId,
+			executionId,
+			filePath,
+			metadata,
+		);
+
+		binaryData.id = this.createBinaryDataId(fileId);
+		binaryData.fileSize = prettyBytes(fileSize);
+		binaryData.data = this.mode; // clear binary data from memory
+
+		return binaryData;
+	}
+
+	async store(
+		workflowId: string,
+		executionId: string,
+		bufferOrStream: Buffer | Readable,
+		binaryData: IBinaryData,
+	) {
+		const manager = this.managers[this.mode];
+
+		if (!manager) {
+			const buffer = await this.toBuffer(bufferOrStream);
+			binaryData.data = buffer.toString(BINARY_ENCODING);
+			binaryData.fileSize = prettyBytes(buffer.length);
+
+			return binaryData;
+		}
+
+		const metadata = {
+			fileName: binaryData.fileName,
+			mimeType: binaryData.mimeType,
+		};
+
+		const { fileId, fileSize } = await manager.store(
+			workflowId,
+			executionId,
+			bufferOrStream,
+			metadata,
+		);
+
+		binaryData.id = this.createBinaryDataId(fileId);
+		binaryData.fileSize = prettyBytes(fileSize);
+		binaryData.data = this.mode; // clear binary data from memory
+
+		return binaryData;
+	}
+
+	async toBuffer(bufferOrStream: Buffer | Readable) {
+		return await toBuffer(bufferOrStream);
+	}
+
+	async getAsStream(binaryDataId: string, chunkSize?: number) {
+		const [mode, fileId] = binaryDataId.split(':');
+
+		return await this.getManager(mode).getAsStream(fileId, chunkSize);
+	}
+
+	async getAsBuffer(binaryData: IBinaryData) {
+		if (binaryData.id) {
+			const [mode, fileId] = binaryData.id.split(':');
+
+			return await this.getManager(mode).getAsBuffer(fileId);
+		}
+
+		return Buffer.from(binaryData.data, BINARY_ENCODING);
+	}
+
+	getPath(binaryDataId: string) {
+		const [mode, fileId] = binaryDataId.split(':');
+
+		return this.getManager(mode).getPath(fileId);
+	}
+
+	async getMetadata(binaryDataId: string) {
+		const [mode, fileId] = binaryDataId.split(':');
+
+		return await this.getManager(mode).getMetadata(fileId);
+	}
+
+	async deleteMany(ids: BinaryData.IdsForDeletion) {
+		const manager = this.managers[this.mode];
+
+		if (!manager) return;
+
+		if (manager.deleteMany) await manager.deleteMany(ids);
+	}
+
+	async duplicateBinaryData(
+		workflowId: string,
+		executionId: string,
+		inputData: Array<INodeExecutionData[] | null>,
+	) {
+		if (inputData && this.managers[this.mode]) {
+			const returnInputData = (inputData as INodeExecutionData[][]).map(
+				async (executionDataArray) => {
+					if (executionDataArray) {
+						return await Promise.all(
+							executionDataArray.map(async (executionData) => {
+								if (executionData.binary) {
+									return await this.duplicateBinaryDataInExecData(
+										workflowId,
+										executionId,
+										executionData,
+									);
+								}
+
+								return executionData;
+							}),
+						);
+					}
+
+					return executionDataArray;
+				},
+			);
+
+			return await Promise.all(returnInputData);
+		}
+
+		return inputData as INodeExecutionData[][];
+	}
+
+	async rename(oldFileId: string, newFileId: string) {
+		const manager = this.getManager(this.mode);
+
+		if (!manager) return;
+
+		await manager.rename(oldFileId, newFileId);
+	}
+
+	// ----------------------------------
+	//         private methods
+	// ----------------------------------
+
+	private createBinaryDataId(fileId: string) {
+		return `${this.mode}:${fileId}`;
+	}
+
+	private async duplicateBinaryDataInExecData(
+		workflowId: string,
+		executionId: string,
+		executionData: INodeExecutionData,
+	) {
+		const manager = this.managers[this.mode];
+
+		if (executionData.binary) {
+			const binaryDataKeys = Object.keys(executionData.binary);
+			const bdPromises = binaryDataKeys.map(async (key: string) => {
+				if (!executionData.binary) {
+					return { key, newId: undefined };
+				}
+
+				const binaryDataId = executionData.binary[key].id;
+				if (!binaryDataId) {
+					return { key, newId: undefined };
+				}
+
+				const [_mode, fileId] = binaryDataId.split(':');
+
+				return await manager?.copyByFileId(workflowId, executionId, fileId).then((newFileId) => ({
+					newId: this.createBinaryDataId(newFileId),
+					key,
+				}));
+			});
+
+			return await Promise.all(bdPromises).then((b) => {
+				return b.reduce((acc, curr) => {
+					if (acc.binary && curr) {
+						acc.binary[curr.key].id = curr.newId;
+					}
+
+					return acc;
+				}, executionData);
+			});
+		}
+
+		return executionData;
+	}
+
+	private getManager(mode: string) {
+		const manager = this.managers[mode];
+
+		if (manager) return manager;
+
+		throw new InvalidManagerError(mode);
+	}
+}
diff --git a/packages/core/src/BinaryData/FileSystem.manager.ts b/packages/core/src/BinaryData/FileSystem.manager.ts
new file mode 100644
index 0000000000000..5b7250d9eb2d7
--- /dev/null
+++ b/packages/core/src/BinaryData/FileSystem.manager.ts
@@ -0,0 +1,197 @@
+import { createReadStream } from 'node:fs';
+import fs from 'node:fs/promises';
+import path from 'node:path';
+import { v4 as uuid } from 'uuid';
+import { jsonParse } from 'n8n-workflow';
+import { assertDir, doesNotExist } from './utils';
+import { DisallowedFilepathError } from '../errors/disallowed-filepath.error';
+
+import type { Readable } from 'stream';
+import type { BinaryData } from './types';
+import { FileNotFoundError } from '../errors/file-not-found.error';
+
+const EXECUTION_ID_EXTRACTOR =
+	/^(\w+)(?:[0-9a-fA-F]{8}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{12})$/;
+
+export class FileSystemManager implements BinaryData.Manager {
+	constructor(private storagePath: string) {}
+
+	async init() {
+		await assertDir(this.storagePath);
+	}
+
+	async store(
+		workflowId: string,
+		executionId: string,
+		bufferOrStream: Buffer | Readable,
+		{ mimeType, fileName }: BinaryData.PreWriteMetadata,
+	) {
+		const fileId = this.toFileId(workflowId, executionId);
+		const filePath = this.resolvePath(fileId);
+
+		await assertDir(path.dirname(filePath));
+
+		await fs.writeFile(filePath, bufferOrStream);
+
+		const fileSize = await this.getSize(fileId);
+
+		await this.storeMetadata(fileId, { mimeType, fileName, fileSize });
+
+		return { fileId, fileSize };
+	}
+
+	getPath(fileId: string) {
+		return this.resolvePath(fileId);
+	}
+
+	async getAsStream(fileId: string, chunkSize?: number) {
+		const filePath = this.resolvePath(fileId);
+
+		if (await doesNotExist(filePath)) {
+			throw new FileNotFoundError(filePath);
+		}
+
+		return createReadStream(filePath, { highWaterMark: chunkSize });
+	}
+
+	async getAsBuffer(fileId: string) {
+		const filePath = this.resolvePath(fileId);
+
+		if (await doesNotExist(filePath)) {
+			throw new FileNotFoundError(filePath);
+		}
+
+		return await fs.readFile(filePath);
+	}
+
+	async getMetadata(fileId: string): Promise<BinaryData.Metadata> {
+		const filePath = this.resolvePath(`${fileId}.metadata`);
+
+		return await jsonParse(await fs.readFile(filePath, { encoding: 'utf-8' }));
+	}
+
+	async deleteMany(ids: BinaryData.IdsForDeletion) {
+		if (ids.length === 0) return;
+
+		// binary files stored in single dir - `filesystem`
+
+		const executionIds = ids.map((o) => o.executionId);
+
+		const set = new Set(executionIds);
+		const fileNames = await fs.readdir(this.storagePath);
+
+		for (const fileName of fileNames) {
+			const executionId = fileName.match(EXECUTION_ID_EXTRACTOR)?.[1];
+
+			if (executionId && set.has(executionId)) {
+				const filePath = this.resolvePath(fileName);
+
+				await Promise.all([fs.rm(filePath), fs.rm(`${filePath}.metadata`)]);
+			}
+		}
+
+		// binary files stored in nested dirs - `filesystem-v2`
+
+		const binaryDataDirs = ids.map(({ workflowId, executionId }) =>
+			this.resolvePath(`workflows/${workflowId}/executions/${executionId}/binary_data/`),
+		);
+
+		await Promise.all(
+			binaryDataDirs.map(async (dir) => {
+				await fs.rm(dir, { recursive: true, force: true });
+			}),
+		);
+	}
+
+	async copyByFilePath(
+		workflowId: string,
+		executionId: string,
+		sourcePath: string,
+		{ mimeType, fileName }: BinaryData.PreWriteMetadata,
+	) {
+		const targetFileId = this.toFileId(workflowId, executionId);
+		const targetPath = this.resolvePath(targetFileId);
+
+		await assertDir(path.dirname(targetPath));
+
+		await fs.cp(sourcePath, targetPath);
+
+		const fileSize = await this.getSize(targetFileId);
+
+		await this.storeMetadata(targetFileId, { mimeType, fileName, fileSize });
+
+		return { fileId: targetFileId, fileSize };
+	}
+
+	async copyByFileId(workflowId: string, executionId: string, sourceFileId: string) {
+		const targetFileId = this.toFileId(workflowId, executionId);
+		const sourcePath = this.resolvePath(sourceFileId);
+		const targetPath = this.resolvePath(targetFileId);
+
+		await assertDir(path.dirname(targetPath));
+
+		await fs.copyFile(sourcePath, targetPath);
+
+		return targetFileId;
+	}
+
+	async rename(oldFileId: string, newFileId: string) {
+		const oldPath = this.resolvePath(oldFileId);
+		const newPath = this.resolvePath(newFileId);
+
+		await assertDir(path.dirname(newPath));
+
+		await Promise.all([
+			fs.rename(oldPath, newPath),
+			fs.rename(`${oldPath}.metadata`, `${newPath}.metadata`),
+		]);
+
+		const [tempDirParent] = oldPath.split('/temp/');
+		const tempDir = path.join(tempDirParent, 'temp');
+
+		await fs.rm(tempDir, { recursive: true });
+	}
+
+	// ----------------------------------
+	//         private methods
+	// ----------------------------------
+
+	/**
+	 * Generate an ID for a binary data file.
+	 *
+	 * The legacy ID format `{executionId}{uuid}` for `filesystem` mode is
+	 * no longer used on write, only when reading old stored execution data.
+	 */
+	private toFileId(workflowId: string, executionId: string) {
+		if (!executionId) executionId = 'temp'; // missing only in edge case, see PR #7244
+
+		return `workflows/${workflowId}/executions/${executionId}/binary_data/${uuid()}`;
+	}
+
+	private resolvePath(...args: string[]) {
+		const returnPath = path.join(this.storagePath, ...args);
+
+		if (path.relative(this.storagePath, returnPath).startsWith('..')) {
+			throw new DisallowedFilepathError(returnPath);
+		}
+
+		return returnPath;
+	}
+
+	private async storeMetadata(fileId: string, metadata: BinaryData.Metadata) {
+		const filePath = this.resolvePath(`${fileId}.metadata`);
+
+		await fs.writeFile(filePath, JSON.stringify(metadata), { encoding: 'utf-8' });
+	}
+
+	private async getSize(fileId: string) {
+		const filePath = this.resolvePath(fileId);
+
+		try {
+			const stats = await fs.stat(filePath);
+			return stats.size;
+		} catch (error) {
+			throw new FileNotFoundError(filePath);
+		}
+	}
+}
diff --git a/packages/core/src/BinaryData/ObjectStore.manager.ts b/packages/core/src/BinaryData/ObjectStore.manager.ts
new file mode 100644
index 0000000000000..f42eba7f29ba6
--- /dev/null
+++ b/packages/core/src/BinaryData/ObjectStore.manager.ts
@@ -0,0 +1,107 @@
+import fs from 'node:fs/promises';
+import { Service } from 'typedi';
+import { v4 as uuid } from 'uuid';
+import { toBuffer } from './utils';
+import { ObjectStoreService } from '../ObjectStore/ObjectStore.service.ee';
+
+import type { Readable } from 'node:stream';
+import type { BinaryData } from './types';
+
+@Service()
+export class ObjectStoreManager implements BinaryData.Manager {
+	constructor(private readonly objectStoreService: ObjectStoreService) {}
+
+	async init() {
+		await this.objectStoreService.checkConnection();
+	}
+
+	async store(
+		workflowId: string,
+		executionId: string,
+		bufferOrStream: Buffer | Readable,
+		metadata: BinaryData.PreWriteMetadata,
+	) {
+		const fileId = this.toFileId(workflowId, executionId);
+		const buffer = await this.toBuffer(bufferOrStream);
+
+		await this.objectStoreService.put(fileId, buffer, metadata);
+
+		return { fileId, fileSize: buffer.length };
+	}
+
+	getPath(fileId: string) {
+		return fileId; // already full path, no transform needed
+	}
+
+	async getAsBuffer(fileId: string) {
+		return await this.objectStoreService.get(fileId, { mode: 'buffer' });
+	}
+
+	async getAsStream(fileId: string) {
+		return await this.objectStoreService.get(fileId, { mode: 'stream' });
+	}
+
+	async getMetadata(fileId: string): Promise<BinaryData.Metadata> {
+		const {
+			'content-length': contentLength,
+			'content-type': contentType,
+			'x-amz-meta-filename': fileName,
+		} = await this.objectStoreService.getMetadata(fileId);
+
+		const metadata: BinaryData.Metadata = { fileSize: Number(contentLength) };
+
+		if (contentType) metadata.mimeType = contentType;
+		if (fileName) metadata.fileName = fileName;
+
+		return metadata;
+	}
+
+	async copyByFileId(workflowId: string, executionId: string, sourceFileId: string) {
+		const targetFileId = this.toFileId(workflowId, executionId);
+
+		const sourceFile = await this.objectStoreService.get(sourceFileId, { mode: 'buffer' });
+
+		await this.objectStoreService.put(targetFileId, sourceFile);
+
+		return targetFileId;
+	}
+
+	/**
+	 * Copy to object store the temp file written by nodes like Webhook, FTP, and SSH.
+	 */
+	async copyByFilePath(
+		workflowId: string,
+		executionId: string,
+		sourcePath: string,
+		metadata: BinaryData.PreWriteMetadata,
+	) {
+		const targetFileId = this.toFileId(workflowId, executionId);
+		const sourceFile = await fs.readFile(sourcePath);
+
+		await this.objectStoreService.put(targetFileId, sourceFile, metadata);
+
+		return { fileId: targetFileId, fileSize: sourceFile.length };
+	}
+
+	async rename(oldFileId: string, newFileId: string) {
+		const oldFile = await this.objectStoreService.get(oldFileId, { mode: 'buffer' });
+		const oldFileMetadata = await this.objectStoreService.getMetadata(oldFileId);
+
+		await this.objectStoreService.put(newFileId, oldFile, oldFileMetadata);
+		await this.objectStoreService.deleteOne(oldFileId);
+	}
+
+	// ----------------------------------
+	//         private methods
+	// ----------------------------------
+
+	private toFileId(workflowId: string, executionId: string) {
+		if (!executionId) executionId = 'temp'; // missing only in edge case, see PR #7244
+
+		return `workflows/${workflowId}/executions/${executionId}/binary_data/${uuid()}`;
+	}
+
+	private async toBuffer(bufferOrStream: Buffer | Readable) {
+		return await toBuffer(bufferOrStream);
+	}
+}
diff --git a/packages/core/src/BinaryData/types.ts b/packages/core/src/BinaryData/types.ts
new file mode 100644
index 0000000000000..ef39197b3e200
--- /dev/null
+++ b/packages/core/src/BinaryData/types.ts
@@ -0,0 +1,73 @@
+import type { Readable } from 'stream';
+
+export namespace BinaryData {
+	type LegacyMode = 'filesystem';
+
+	type UpgradedMode = 'filesystem-v2';
+
+	/**
+	 * Binary data mode selectable by user via env var config.
+	 */
+	export type ConfigMode = 'default' | 'filesystem' | 's3';
+
+	/**
+	 * Binary data mode used internally by binary data service. User-selected
+	 * legacy modes are replaced with upgraded modes.
+	 */
+	export type ServiceMode = Exclude<ConfigMode, LegacyMode> | UpgradedMode;
+
+	/**
+	 * Binary data mode in binary data ID in stored execution data. Both legacy
+	 * and upgraded modes may be present, except default in-memory mode.
+	 */
+	export type StoredMode = Exclude<ConfigMode | UpgradedMode, 'default'>;
+
+	export type Config = {
+		mode: ConfigMode;
+		availableModes: ConfigMode[];
+		localStoragePath: string;
+	};
+
+	export type Metadata = {
+		fileName?: string;
+		mimeType?: string;
+		fileSize: number;
+	};
+
+	export type WriteResult = { fileId: string; fileSize: number };
+
+	export type PreWriteMetadata = Omit<Metadata, 'fileSize'>;
+
+	export type IdsForDeletion = Array<{ workflowId: string; executionId: string }>;
+
+	export interface Manager {
+		init(): Promise<void>;
+
+		store(
+			workflowId: string,
+			executionId: string,
+			bufferOrStream: Buffer | Readable,
+			metadata: PreWriteMetadata,
+		): Promise<WriteResult>;
+
+		getPath(fileId: string): string;
+		getAsBuffer(fileId: string): Promise<Buffer>;
+		getAsStream(fileId: string, chunkSize?: number): Promise<Readable>;
+		getMetadata(fileId: string): Promise<Metadata>;
+
+		/**
+		 * Present for `FileSystem`, absent for `ObjectStore` (delegated to S3 lifecycle config)
+		 */
+		deleteMany?(ids: IdsForDeletion): Promise<void>;
+
+		copyByFileId(workflowId: string, executionId: string, sourceFileId: string): Promise<string>;
+		copyByFilePath(
+			workflowId: string,
+			executionId: string,
+			sourcePath: string,
+			metadata: PreWriteMetadata,
+		): Promise<WriteResult>;
+
+		rename(oldFileId: string, newFileId: string): Promise<void>;
+	}
+}
diff --git a/packages/core/src/BinaryData/utils.ts b/packages/core/src/BinaryData/utils.ts
new file mode 100644
index 0000000000000..3bf99ceaeb7aa
--- /dev/null
+++ b/packages/core/src/BinaryData/utils.ts
@@ -0,0 +1,46 @@
+import fs from 'node:fs/promises';
+import type { Readable } from 'node:stream';
+import type { BinaryData } from './types';
+import concatStream from 'concat-stream';
+
+export const CONFIG_MODES = ['default', 'filesystem', 's3'] as const;
+
+const STORED_MODES = ['filesystem', 'filesystem-v2', 's3'] as const;
+
+export function areConfigModes(modes: string[]): modes is BinaryData.ConfigMode[] {
+	return modes.every((m) => CONFIG_MODES.includes(m as BinaryData.ConfigMode));
+}
+
+export function isStoredMode(mode: string): mode is BinaryData.StoredMode {
+	return STORED_MODES.includes(mode as BinaryData.StoredMode);
+}
+
+export async function assertDir(dir: string) {
+	try {
+		await fs.access(dir);
+	} catch {
+		await fs.mkdir(dir, { recursive: true });
+	}
+}
+
+export async function doesNotExist(dir: string) {
+	try {
+		await fs.access(dir);
+		return false;
+	} catch {
+		return true;
+	}
+}
+
+export async function toBuffer(body: Buffer | Readable) {
+	if (Buffer.isBuffer(body)) return body;
+	return await new Promise<Buffer>((resolve, reject) => {
+		body
+			.once('error', (cause) => {
+				if ('code' in cause && cause.code === 'Z_DATA_ERROR')
+					reject(new Error('Failed to decompress response', { cause }));
+				else reject(cause);
+			})
+			.pipe(concatStream(resolve));
+	});
+}
diff --git a/packages/core/src/BinaryDataManager/FileSystem.ts b/packages/core/src/BinaryDataManager/FileSystem.ts
deleted file mode 100644
index 011a5cd5eedae..0000000000000
--- a/packages/core/src/BinaryDataManager/FileSystem.ts
+++ /dev/null
@@ -1,253 +0,0 @@
-import { createReadStream } from 'fs';
-import fs from 'fs/promises';
-import path from 'path';
-import { v4 as uuid } from 'uuid';
-import type { Readable } from 'stream';
-import type { BinaryMetadata } from 'n8n-workflow';
-import { jsonParse } from 'n8n-workflow';
-
-import type { IBinaryDataConfig, IBinaryDataManager } from '../Interfaces';
-import { FileNotFoundError } from '../errors';
-
-const PREFIX_METAFILE = 'binarymeta';
-const PREFIX_PERSISTED_METAFILE = 'persistedmeta';
-
-export class BinaryDataFileSystem implements IBinaryDataManager {
-	private storagePath: string;
-
-	private binaryDataTTL: number;
-
-	private persistedBinaryDataTTL: number;
-
-	constructor(config: IBinaryDataConfig) {
-		this.storagePath = config.localStoragePath;
-		this.binaryDataTTL = config.binaryDataTTL;
-		this.persistedBinaryDataTTL = config.persistedBinaryDataTTL;
-	}
-
-	async init(startPurger = false): Promise<void> {
-		if (startPurger) {
-			setInterval(async () => {
-				await this.deleteMarkedFiles();
-			}, this.binaryDataTTL * 30000);
-
-			setInterval(async () => {
-				await this.deleteMarkedPersistedFiles();
-			}, this.persistedBinaryDataTTL * 30000);
-		}
-
-		return fs
-			.readdir(this.storagePath)
-			.catch(async () => fs.mkdir(this.storagePath, { recursive: true }))
-			.then(async () => fs.readdir(this.getBinaryDataMetaPath()))
-			.catch(async () => fs.mkdir(this.getBinaryDataMetaPath(), { recursive: true }))
-			.then(async () => fs.readdir(this.getBinaryDataPersistMetaPath()))
-			.catch(async () => fs.mkdir(this.getBinaryDataPersistMetaPath(), { recursive: true }))
-			.then(async () => this.deleteMarkedFiles())
-			.then(async () => this.deleteMarkedPersistedFiles())
-			.then(() => {});
-	}
-
-	async getFileSize(identifier: string): Promise<number> {
-		const stats = await fs.stat(this.getBinaryPath(identifier));
-		return stats.size;
-	}
-
-	async copyBinaryFile(filePath: string, executionId: string): Promise<string> {
-		const binaryDataId = this.generateFileName(executionId);
-		await this.addBinaryIdToPersistMeta(executionId, binaryDataId);
-		await this.copyFileToLocalStorage(filePath, binaryDataId);
-		return binaryDataId;
-	}
-
-	async storeBinaryMetadata(identifier: string, metadata: BinaryMetadata) {
-		await fs.writeFile(this.getMetadataPath(identifier), JSON.stringify(metadata), {
-			encoding: 'utf-8',
-		});
-	}
-
-	async getBinaryMetadata(identifier: string): Promise<BinaryMetadata> {
-		return jsonParse(await fs.readFile(this.getMetadataPath(identifier), { encoding: 'utf-8' }));
-	}
-
-	async storeBinaryData(binaryData: Buffer | Readable, executionId: string): Promise<string> {
-		const binaryDataId = this.generateFileName(executionId);
-		await this.addBinaryIdToPersistMeta(executionId, binaryDataId);
-		await this.saveToLocalStorage(binaryData, binaryDataId);
-		return binaryDataId;
-	}
-
-	getBinaryStream(identifier: string, chunkSize?: number): Readable {
-		return createReadStream(this.getBinaryPath(identifier), { highWaterMark: chunkSize });
-	}
-
-	async retrieveBinaryDataByIdentifier(identifier: string): Promise<Buffer> {
-		return this.retrieveFromLocalStorage(identifier);
-	}
-
-	getBinaryPath(identifier: string): string {
-		return this.resolveStoragePath(identifier);
-	}
-
-	getMetadataPath(identifier: string): string {
-		return this.resolveStoragePath(`${identifier}.metadata`);
-	}
-
-	async markDataForDeletionByExecutionId(executionId: string): Promise<void> {
-		const tt = new Date(new Date().getTime() + this.binaryDataTTL * 60000);
-		return fs.writeFile(
-			this.resolveStoragePath('meta', `${PREFIX_METAFILE}_${executionId}_${tt.valueOf()}`),
-			'',
-		);
-	}
-
-	async deleteMarkedFiles(): Promise<void> {
-		return this.deleteMarkedFilesByMeta(this.getBinaryDataMetaPath(), PREFIX_METAFILE);
-	}
-
-	async deleteMarkedPersistedFiles(): Promise<void> {
-		return this.deleteMarkedFilesByMeta(
-			this.getBinaryDataPersistMetaPath(),
-			PREFIX_PERSISTED_METAFILE,
-		);
-	}
-
-	private async addBinaryIdToPersistMeta(executionId: string, identifier: string): Promise<void> {
-		const currentTime = new Date().getTime();
-		const timeAtNextHour = currentTime + 3600000 - (currentTime % 3600000);
-		const timeoutTime = timeAtNextHour + this.persistedBinaryDataTTL * 60000;
-
-		const filePath = this.resolveStoragePath(
-			'persistMeta',
-			`${PREFIX_PERSISTED_METAFILE}_${executionId}_${timeoutTime}`,
-		);
-
-		return fs
-			.readFile(filePath)
-			.catch(async () => fs.writeFile(filePath, identifier))
-			.then(() => {});
-	}
-
-	private async deleteMarkedFilesByMeta(metaPath: string, filePrefix: string): Promise<void> {
-		const currentTimeValue = new Date().valueOf();
-		const metaFileNames = await fs.readdir(metaPath);
-
-		const execsAdded: { [key: string]: number } = {};
-
-		const promises = metaFileNames.reduce<Array<Promise<void>>>((prev, curr) => {
-			const [prefix, executionId, ts] = curr.split('_');
-
-			if (prefix !== filePrefix) {
-				return prev;
-			}
-
-			const execTimestamp = parseInt(ts, 10);
-
-			if (execTimestamp < currentTimeValue) {
-				if (execsAdded[executionId]) {
-					// do not delete data, only meta file
-					prev.push(this.deleteMetaFileByPath(path.join(metaPath, curr)));
-					return prev;
-				}
-
-				execsAdded[executionId] = 1;
-				prev.push(
-					this.deleteBinaryDataByExecutionId(executionId).then(async () =>
-						this.deleteMetaFileByPath(path.join(metaPath, curr)),
-					),
-				);
-			}
-
-			return prev;
-		}, []);
-
-		await Promise.all(promises);
-	}
-
-	async duplicateBinaryDataByIdentifier(binaryDataId: string, prefix: string): Promise<string> {
-		const newBinaryDataId = this.generateFileName(prefix);
-
-		await fs.copyFile(
-			this.resolveStoragePath(binaryDataId),
-			this.resolveStoragePath(newBinaryDataId),
-		);
-		return newBinaryDataId;
-	}
-
-	async deleteBinaryDataByExecutionId(executionId: string): Promise<void> {
-		const regex = new RegExp(`${executionId}_*`);
-		const filenames = await fs.readdir(this.storagePath);
-
-		const promises = filenames.reduce<Array<Promise<void>>>((allProms, filename) => {
-			if (regex.test(filename)) {
-				allProms.push(fs.rm(this.resolveStoragePath(filename)));
-			}
-			return allProms;
-		}, []);
-
-		await Promise.all(promises);
-	}
-
-	async deleteBinaryDataByIdentifier(identifier: string): Promise<void> {
-		return this.deleteFromLocalStorage(identifier);
-	}
-
-	async persistBinaryDataForExecutionId(executionId: string): Promise<void> {
-		return fs.readdir(this.getBinaryDataPersistMetaPath()).then(async (metaFiles) => {
-			const promises = metaFiles.reduce<Array<Promise<void>>>((prev, curr) => {
-				if (curr.startsWith(`${PREFIX_PERSISTED_METAFILE}_${executionId}_`)) {
-					prev.push(fs.rm(path.join(this.getBinaryDataPersistMetaPath(), curr)));
-					return prev;
-				}
-
-				return prev;
-			}, []);
-
-			await Promise.all(promises);
-		});
-	}
-
-	private generateFileName(prefix: string): string {
-		return [prefix, uuid()].join('');
-	}
-
-	private getBinaryDataMetaPath() {
-		return path.join(this.storagePath, 'meta');
-	}
-
-	private getBinaryDataPersistMetaPath() {
-		return path.join(this.storagePath, 'persistMeta');
-	}
-
-	private async deleteMetaFileByPath(metaFilePath: string): Promise<void> {
-		return fs.rm(metaFilePath);
-	}
-
-	private async deleteFromLocalStorage(identifier: string) {
-		return fs.rm(this.getBinaryPath(identifier));
-	}
-
-	private async copyFileToLocalStorage(source: string, identifier: string): Promise<void> {
-		await fs.cp(source, this.getBinaryPath(identifier));
-	}
-
-	private async saveToLocalStorage(binaryData: Buffer | Readable, identifier: string) {
-		await fs.writeFile(this.getBinaryPath(identifier), binaryData);
-	}
-
-	private async retrieveFromLocalStorage(identifier: string): Promise<Buffer> {
-		const filePath = this.getBinaryPath(identifier);
-		try {
-			return await fs.readFile(filePath);
-		} catch (e) {
-			throw new Error(`Error finding file: ${filePath}`);
-		}
-	}
-
-	private resolveStoragePath(...args: string[]) {
-		const returnPath = path.join(this.storagePath, ...args);
-		if (path.relative(this.storagePath, returnPath).startsWith('..'))
-			throw new FileNotFoundError('Invalid path detected');
-		return returnPath;
-	}
-}
diff --git a/packages/core/src/BinaryDataManager/index.ts b/packages/core/src/BinaryDataManager/index.ts
deleted file mode 100644
index bed5a08b101d0..0000000000000
--- a/packages/core/src/BinaryDataManager/index.ts
+++ /dev/null
@@ -1,267 +0,0 @@
-import { readFile, stat } from 'fs/promises';
-import type { BinaryMetadata, IBinaryData, INodeExecutionData } from 'n8n-workflow';
-import prettyBytes from 'pretty-bytes';
-import type { Readable } from 'stream';
-import { BINARY_ENCODING } from 'n8n-workflow';
-import type { IBinaryDataConfig, IBinaryDataManager } from '../Interfaces';
-import { BinaryDataFileSystem } from './FileSystem';
-import { binaryToBuffer } from './utils';
-
-export class BinaryDataManager {
-	static instance: BinaryDataManager | undefined;
-
-	private managers: {
-		[key: string]: IBinaryDataManager;
-	};
-
-	private binaryDataMode: string;
-
-	private availableModes: string[];
-
-	constructor(config: IBinaryDataConfig) {
-		this.binaryDataMode = config.mode;
-		this.availableModes = config.availableModes.split(',');
-		this.managers = {};
-	}
-
-	static async init(config: IBinaryDataConfig, mainManager = false): Promise<void> {
-		if (BinaryDataManager.instance) {
-			throw new Error('Binary Data Manager already initialized');
-		}
-
-		BinaryDataManager.instance = new BinaryDataManager(config);
-
-		if (BinaryDataManager.instance.availableModes.includes('filesystem')) {
-			BinaryDataManager.instance.managers.filesystem = new BinaryDataFileSystem(config);
-			await BinaryDataManager.instance.managers.filesystem.init(mainManager);
-		}
-
-		return undefined;
-	}
-
-	static getInstance(): BinaryDataManager {
-		if (!BinaryDataManager.instance) {
-			throw new Error('Binary Data Manager not initialized');
-		}
-
-		return BinaryDataManager.instance;
-	}
-
-	async copyBinaryFile(
-		binaryData: IBinaryData,
-		filePath: string,
-		executionId: string,
-	): Promise<IBinaryData> {
-		// If a manager handles this binary, copy over the binary file and return its reference id.
-		const manager = this.managers[this.binaryDataMode];
-		if (manager) {
-			const identifier = await manager.copyBinaryFile(filePath, executionId);
-			// Add data manager reference id.
-			binaryData.id = this.generateBinaryId(identifier);
-
-			// Prevent preserving data in memory if handled by a data manager.
-			binaryData.data = this.binaryDataMode;
-
-			const fileSize = await manager.getFileSize(identifier);
-			binaryData.fileSize = prettyBytes(fileSize);
-
-			await manager.storeBinaryMetadata(identifier, {
-				fileName: binaryData.fileName,
-				mimeType: binaryData.mimeType,
-				fileSize,
-			});
-		} else {
-			const { size } = await stat(filePath);
-			binaryData.fileSize = prettyBytes(size);
-			binaryData.data = await readFile(filePath, { encoding: BINARY_ENCODING });
-		}
-
-		return binaryData;
-	}
-
-	async storeBinaryData(
-		binaryData: IBinaryData,
-		input: Buffer | Readable,
-		executionId: string,
-	): Promise<IBinaryData> {
-		// If a manager handles this binary, return the binary data with its reference id.
-		const manager = this.managers[this.binaryDataMode];
-		if (manager) {
-			const identifier = await manager.storeBinaryData(input, executionId);
-
-			// Add data manager reference id.
-			binaryData.id = this.generateBinaryId(identifier);
-
-			// Prevent preserving data in memory if handled by a data manager.
-			binaryData.data = this.binaryDataMode;
-
-			const fileSize = await manager.getFileSize(identifier);
-			binaryData.fileSize = prettyBytes(fileSize);
-
-			await manager.storeBinaryMetadata(identifier, {
-				fileName: binaryData.fileName,
-				mimeType: binaryData.mimeType,
-				fileSize,
-			});
-		} else {
-			const buffer = await binaryToBuffer(input);
-			binaryData.data = buffer.toString(BINARY_ENCODING);
-			binaryData.fileSize = prettyBytes(buffer.length);
-		}
-
-		return binaryData;
-	}
-
-	getBinaryStream(identifier: string, chunkSize?: number): Readable {
-		const { mode, id } = this.splitBinaryModeFileId(identifier);
-		if (this.managers[mode]) {
-			return this.managers[mode].getBinaryStream(id, chunkSize);
-		}
-
-		throw new Error('Storage mode used to store binary data not available');
-	}
-
-	async retrieveBinaryData(binaryData: IBinaryData): Promise<Buffer> {
-		if (binaryData.id) {
-			return this.retrieveBinaryDataByIdentifier(binaryData.id);
-		}
-
-		return Buffer.from(binaryData.data, BINARY_ENCODING);
-	}
-
-	async retrieveBinaryDataByIdentifier(identifier: string): Promise<Buffer> {
-		const { mode, id } = this.splitBinaryModeFileId(identifier);
-		if (this.managers[mode]) {
-			return this.managers[mode].retrieveBinaryDataByIdentifier(id);
-		}
-
-		throw new Error('Storage mode used to store binary data not available');
-	}
-
-	getBinaryPath(identifier: string): string {
-		const { mode, id } = this.splitBinaryModeFileId(identifier);
-		if (this.managers[mode]) {
-			return this.managers[mode].getBinaryPath(id);
-		}
-
-		throw new Error('Storage mode used to store binary data not available');
-	}
-
-	async getBinaryMetadata(identifier: string): Promise<BinaryMetadata> {
-		const { mode, id } = this.splitBinaryModeFileId(identifier);
-		if (this.managers[mode]) {
-			return this.managers[mode].getBinaryMetadata(id);
-		}
-
-		throw new Error('Storage mode used to store binary data not available');
-	}
-
-	async markDataForDeletionByExecutionId(executionId: string): Promise<void> {
-		if (this.managers[this.binaryDataMode]) {
-			await this.managers[this.binaryDataMode].markDataForDeletionByExecutionId(executionId);
-		}
-	}
-
-	async markDataForDeletionByExecutionIds(executionIds: string[]): Promise<void> {
-		if (this.managers[this.binaryDataMode]) {
-			await Promise.all(
-				executionIds.map(async (id) =>
-					this.managers[this.binaryDataMode].markDataForDeletionByExecutionId(id),
-				),
-			);
-		}
-	}
-
-	async persistBinaryDataForExecutionId(executionId: string): Promise<void> {
-		if (this.managers[this.binaryDataMode]) {
-			await this.managers[this.binaryDataMode].persistBinaryDataForExecutionId(executionId);
-		}
-	}
-
-	async deleteBinaryDataByExecutionId(executionId: string): Promise<void> {
-		if (this.managers[this.binaryDataMode]) {
-			await this.managers[this.binaryDataMode].deleteBinaryDataByExecutionId(executionId);
-		}
-	}
-
-	async duplicateBinaryData(
-		inputData: Array<INodeExecutionData[] | null> | unknown,
-		executionId: string,
-	): Promise<INodeExecutionData[][]> {
-		if (inputData && this.managers[this.binaryDataMode]) {
-			const returnInputData = (inputData as INodeExecutionData[][]).map(
-				async (executionDataArray) => {
-					if (executionDataArray) {
-						return Promise.all(
-							executionDataArray.map(async (executionData) => {
-								if (executionData.binary) {
-									return this.duplicateBinaryDataInExecData(executionData, executionId);
-								}
-
-								return executionData;
-							}),
-						);
-					}
-
-					return executionDataArray;
-				},
-			);
-
-			return Promise.all(returnInputData);
-		}
-
-		return inputData as INodeExecutionData[][];
-	}
-
-	private generateBinaryId(filename: string) {
-		return `${this.binaryDataMode}:${filename}`;
-	}
-
-	private splitBinaryModeFileId(fileId: string): { mode: string; id: string } {
-		const [mode, id] = fileId.split(':');
-		return { mode, id };
-	}
-
-	private async duplicateBinaryDataInExecData(
-		executionData: INodeExecutionData,
-		executionId: string,
-	): Promise<INodeExecutionData> {
-		const binaryManager = this.managers[this.binaryDataMode];
-
-		if (executionData.binary) {
-			const binaryDataKeys = Object.keys(executionData.binary);
-			const bdPromises = binaryDataKeys.map(async (key: string) => {
-				if (!executionData.binary) {
-					return { key, newId: undefined };
-				}
-
-				const binaryDataId = executionData.binary[key].id;
-				if (!binaryDataId) {
-					return { key, newId: undefined };
-				}
-
-				return binaryManager
-					?.duplicateBinaryDataByIdentifier(
-						this.splitBinaryModeFileId(binaryDataId).id,
-						executionId,
-					)
-					.then((filename) => ({
-						newId: this.generateBinaryId(filename),
-						key,
-					}));
-			});
-
-			return Promise.all(bdPromises).then((b) => {
-				return b.reduce((acc, curr) => {
-					if (acc.binary && curr) {
-						acc.binary[curr.key].id = curr.newId;
-					}
-
-					return acc;
-				}, executionData);
-			});
-		}
-
-		return executionData;
-	}
-}
diff --git a/packages/core/src/BinaryDataManager/utils.ts b/packages/core/src/BinaryDataManager/utils.ts
deleted file mode 100644
index 85fb05f6870bd..0000000000000
--- a/packages/core/src/BinaryDataManager/utils.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import concatStream from 'concat-stream';
-import type { Readable } from 'stream';
-
-export const binaryToBuffer = async (body: Buffer | Readable) =>
-	new Promise<Buffer>((resolve) => {
-		if (Buffer.isBuffer(body)) resolve(body);
-		else body.pipe(concatStream(resolve));
-	});
diff --git a/packages/core/src/Cipher.ts b/packages/core/src/Cipher.ts
new file mode 100644
index 0000000000000..4e1b649bed5c6
--- /dev/null
+++ b/packages/core/src/Cipher.ts
@@ -0,0 +1,43 @@
+import { Service } from 'typedi';
+import { createHash, createCipheriv, createDecipheriv, randomBytes } from 'crypto';
+import { InstanceSettings } from './InstanceSettings';
+
+// Data encrypted by CryptoJS always starts with these bytes
+const RANDOM_BYTES = Buffer.from('53616c7465645f5f', 'hex');
+
+@Service()
+export class Cipher {
+	constructor(private readonly instanceSettings: InstanceSettings) {}
+
+	encrypt(data: string | object) {
+		const salt = randomBytes(8);
+		const [key, iv] = this.getKeyAndIv(salt);
+		const cipher = createCipheriv('aes-256-cbc', key, iv);
+		const encrypted = cipher.update(typeof data === 'string' ? data : JSON.stringify(data));
+		return Buffer.concat([RANDOM_BYTES, salt, encrypted, cipher.final()]).toString('base64');
+	}
+
+	decrypt(data: string) {
+		const input = Buffer.from(data, 'base64');
+		if (input.length < 16) return '';
+		const salt = input.subarray(8, 16);
+		const [key, iv] = this.getKeyAndIv(salt);
+		const contents = input.subarray(16);
+		const decipher = createDecipheriv('aes-256-cbc', key, iv);
+		return Buffer.concat([decipher.update(contents), decipher.final()]).toString('utf-8');
+	}
+
+	private getKeyAndIv(salt: Buffer): [Buffer, Buffer] {
+		const { encryptionKey } = this.instanceSettings;
+		const password = Buffer.concat([Buffer.from(encryptionKey, 'binary'), salt]);
+		const hash1 = createHash('md5').update(password).digest();
+		const hash2 = createHash('md5')
+			.update(Buffer.concat([hash1, password]))
+			.digest();
+		const iv = createHash('md5')
+			.update(Buffer.concat([hash2, password]))
+			.digest();
+		const key = Buffer.concat([hash1, hash2]);
+		return [key, iv];
+	}
+}
diff --git a/packages/core/src/Constants.ts b/packages/core/src/Constants.ts
index 72894e6eaa5b3..dd6277b69bdd2 100644
--- a/packages/core/src/Constants.ts
+++ b/packages/core/src/Constants.ts
@@ -1,17 +1,13 @@
-/* eslint-disable @typescript-eslint/naming-convention */
 export const CUSTOM_EXTENSION_ENV = 'N8N_CUSTOM_EXTENSIONS';
-export const DOWNLOADED_NODES_SUBDIRECTORY = 'nodes';
-export const ENCRYPTION_KEY_ENV_OVERWRITE = 'N8N_ENCRYPTION_KEY';
-export const EXTENSIONS_SUBDIRECTORY = 'custom';
-export const USER_FOLDER_ENV_OVERWRITE = 'N8N_USER_FOLDER';
-export const USER_SETTINGS_FILE_NAME = 'config';
-export const USER_SETTINGS_SUBFOLDER = '.n8n';
 export const PLACEHOLDER_EMPTY_EXECUTION_ID = '__UNKNOWN__';
 export const PLACEHOLDER_EMPTY_WORKFLOW_ID = '__EMPTY__';
-export const TUNNEL_SUBDOMAIN_ENV = 'N8N_TUNNEL_SUBDOMAIN';
-
-export const RESPONSE_ERROR_MESSAGES = {
-	NO_ENCRYPTION_KEY: 'Encryption key is missing or was not set',
-};
+export const HTTP_REQUEST_NODE_TYPE = 'n8n-nodes-base.httpRequest';
 
 export const CUSTOM_NODES_CATEGORY = 'Custom Nodes';
+
+export const RESTRICT_FILE_ACCESS_TO = 'N8N_RESTRICT_FILE_ACCESS_TO';
+export const BLOCK_FILE_ACCESS_TO_N8N_FILES = 'N8N_BLOCK_FILE_ACCESS_TO_N8N_FILES';
+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';
diff --git a/packages/core/src/Credentials.ts b/packages/core/src/Credentials.ts
index 577f7fd700d06..1a54d96cd2760 100644
--- a/packages/core/src/Credentials.ts
+++ b/packages/core/src/Credentials.ts
@@ -1,100 +1,43 @@
-import type {
-	CredentialInformation,
-	ICredentialDataDecryptedObject,
-	ICredentialsEncrypted,
-} from 'n8n-workflow';
-import { ICredentials } from 'n8n-workflow';
-
-import { AES, enc } from 'crypto-js';
+import { Container } from 'typedi';
+import type { ICredentialDataDecryptedObject, ICredentialsEncrypted } from 'n8n-workflow';
+import { ApplicationError, ICredentials, jsonParse } from 'n8n-workflow';
+import { Cipher } from './Cipher';
 
 export class Credentials extends ICredentials {
-	/**
-	 * Returns if the given nodeType has access to data
-	 */
-	hasNodeAccess(nodeType: string): boolean {
-		// eslint-disable-next-line no-restricted-syntax
-		for (const accessData of this.nodesAccess) {
-			if (accessData.nodeType === nodeType) {
-				return true;
-			}
-		}
-
-		return false;
-	}
+	private readonly cipher = Container.get(Cipher);
 
 	/**
 	 * Sets new credential object
 	 */
-	setData(data: ICredentialDataDecryptedObject, encryptionKey: string): void {
-		this.data = AES.encrypt(JSON.stringify(data), encryptionKey).toString();
-	}
-
-	/**
-	 * Sets new credentials for given key
-	 */
-	setDataKey(key: string, data: CredentialInformation, encryptionKey: string): void {
-		let fullData;
-		try {
-			fullData = this.getData(encryptionKey);
-		} catch (e) {
-			fullData = {};
-		}
-
-		fullData[key] = data;
-
-		return this.setData(fullData, encryptionKey);
+	setData(data: ICredentialDataDecryptedObject): void {
+		this.data = this.cipher.encrypt(data);
 	}
 
 	/**
 	 * Returns the decrypted credential object
 	 */
-	getData(encryptionKey: string, nodeType?: string): ICredentialDataDecryptedObject {
-		if (nodeType && !this.hasNodeAccess(nodeType)) {
-			throw new Error(
-				`The node of type "${nodeType}" does not have access to credentials "${this.name}" of type "${this.type}".`,
-			);
-		}
-
+	getData(): ICredentialDataDecryptedObject {
 		if (this.data === undefined) {
-			throw new Error('No data is set so nothing can be returned.');
+			throw new ApplicationError('No data is set so nothing can be returned.');
 		}
 
-		const decryptedData = AES.decrypt(this.data, encryptionKey);
-
 		try {
-			// eslint-disable-next-line @typescript-eslint/no-unsafe-return
-			return JSON.parse(decryptedData.toString(enc.Utf8));
+			const decryptedData = this.cipher.decrypt(this.data);
+
+			return jsonParse(decryptedData);
 		} catch (e) {
-			throw new Error(
+			throw new ApplicationError(
 				'Credentials could not be decrypted. The likely reason is that a different "encryptionKey" was used to encrypt the data.',
 			);
 		}
 	}
 
-	/**
-	 * Returns the decrypted credentials for given key
-	 */
-	getDataKey(key: string, encryptionKey: string, nodeType?: string): CredentialInformation {
-		const fullData = this.getData(encryptionKey, nodeType);
-
-		if (fullData === null) {
-			throw new Error('No data was set.');
-		}
-
-		// eslint-disable-next-line no-prototype-builtins
-		if (!fullData.hasOwnProperty(key)) {
-			throw new Error(`No data for key "${key}" exists.`);
-		}
-
-		return fullData[key];
-	}
-
 	/**
 	 * Returns the encrypted credentials to be saved
 	 */
 	getDataToSave(): ICredentialsEncrypted {
 		if (this.data === undefined) {
-			throw new Error('No credentials were set to save.');
+			throw new ApplicationError('No credentials were set to save.');
 		}
 
 		return {
@@ -102,7 +45,6 @@ export class Credentials extends ICredentials {
 			name: this.name,
 			type: this.type,
 			data: this.data,
-			nodesAccess: this.nodesAccess,
 		};
 	}
 }
diff --git a/packages/core/src/DirectoryLoader.ts b/packages/core/src/DirectoryLoader.ts
index 0fba8399d33d9..cd4de72cba54a 100644
--- a/packages/core/src/DirectoryLoader.ts
+++ b/packages/core/src/DirectoryLoader.ts
@@ -1,7 +1,5 @@
-import * as path from 'path';
-import { readFile } from 'fs/promises';
 import glob from 'fast-glob';
-import { jsonParse, getVersionedNodeTypeAll, LoggerProxy as Logger } from 'n8n-workflow';
+import { readFile } from 'fs/promises';
 import type {
 	CodexData,
 	DocumentationLink,
@@ -9,15 +7,23 @@ import type {
 	ICredentialTypeData,
 	INodeType,
 	INodeTypeBaseDescription,
-	INodeTypeDescription,
 	INodeTypeData,
+	INodeTypeDescription,
 	INodeTypeNameVersion,
 	IVersionedNodeType,
 	KnownNodesAndCredentials,
 } from 'n8n-workflow';
+import {
+	ApplicationError,
+	LoggerProxy as Logger,
+	getCredentialsForNode,
+	getVersionedNodeTypeAll,
+	jsonParse,
+} from 'n8n-workflow';
+import * as path from 'path';
+import { loadClassInIsolation } from './ClassLoader';
 import { CUSTOM_NODES_CATEGORY } from './Constants';
 import type { n8n } from './Interfaces';
-import { loadClassInIsolation } from './ClassLoader';
 
 function toJSON(this: ICredentialType) {
 	return {
@@ -44,6 +50,8 @@ export abstract class DirectoryLoader {
 
 	types: Types = { nodes: [], credentials: [] };
 
+	protected nodesByCredential: Record<string, string[]> = {};
+
 	constructor(
 		readonly directory: string,
 		protected readonly excludeNodes: string[] = [],
@@ -109,9 +117,9 @@ export abstract class DirectoryLoader {
 			nodeVersion = tempNode.currentVersion;
 
 			if (currentVersionNode.hasOwnProperty('executeSingle')) {
-				Logger.warn(
-					`"executeSingle" will get deprecated soon. Please update the code of node "${this.packageName}.${nodeName}" to use "execute" instead!`,
-					{ filePath },
+				throw new ApplicationError(
+					'"executeSingle" has been removed. Please update the code of this node to use "execute" instead!',
+					{ extra: { nodeName: `${this.packageName}.${nodeName}` } },
 				);
 			}
 		} else {
@@ -141,12 +149,19 @@ export abstract class DirectoryLoader {
 		getVersionedNodeTypeAll(tempNode).forEach(({ description }) => {
 			this.types.nodes.push(description);
 		});
+
+		for (const credential of getCredentialsForNode(tempNode)) {
+			if (!this.nodesByCredential[credential.name]) {
+				this.nodesByCredential[credential.name] = [];
+			}
+			this.nodesByCredential[credential.name].push(fullNodeName);
+		}
 	}
 
-	protected loadCredentialFromFile(credentialName: string, filePath: string): void {
+	protected loadCredentialFromFile(credentialClassName: string, filePath: string): void {
 		let tempCredential: ICredentialType;
 		try {
-			tempCredential = loadClassInIsolation(filePath, credentialName);
+			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.
@@ -157,8 +172,9 @@ export abstract class DirectoryLoader {
 			this.fixIconPath(tempCredential, filePath);
 		} catch (e) {
 			if (e instanceof TypeError) {
-				throw new Error(
-					`Class with name "${credentialName}" could not be found. Please check if the class is named correctly!`,
+				throw new ApplicationError(
+					'Class could not be found. Please check if the class is named correctly.',
+					{ extra: { credentialClassName } },
 				);
 			} else {
 				throw e;
@@ -166,8 +182,10 @@ export abstract class DirectoryLoader {
 		}
 
 		this.known.credentials[tempCredential.name] = {
-			className: credentialName,
+			className: credentialClassName,
 			sourcePath: filePath,
+			extends: tempCredential.extends,
+			supportedNodes: this.nodesByCredential[tempCredential.name],
 		};
 
 		this.credentialTypes[tempCredential.name] = {
@@ -229,7 +247,15 @@ export abstract class DirectoryLoader {
 		isCustom: boolean;
 	}) {
 		try {
-			const codex = this.getCodex(filePath);
+			let codex;
+
+			if (!isCustom) {
+				codex = node.description.codex;
+			}
+
+			if (codex === undefined) {
+				codex = this.getCodex(filePath);
+			}
 
 			if (isCustom) {
 				codex.categories = codex.categories
@@ -276,19 +302,24 @@ export class CustomDirectoryLoader extends DirectoryLoader {
 	packageName = 'CUSTOM';
 
 	override async loadAll() {
-		const filePaths = await glob('**/*.@(node|credentials).js', {
+		const nodes = await glob('**/*.node.js', {
 			cwd: this.directory,
 			absolute: true,
 		});
 
-		for (const filePath of filePaths) {
-			const [fileName, type] = path.parse(filePath).name.split('.');
+		for (const nodePath of nodes) {
+			const [fileName] = path.parse(nodePath).name.split('.');
+			this.loadNodeFromFile(fileName, nodePath);
+		}
 
-			if (type === 'node') {
-				this.loadNodeFromFile(fileName, filePath);
-			} else if (type === 'credentials') {
-				this.loadCredentialFromFile(fileName, filePath);
-			}
+		const credentials = await glob('**/*.credentials.js', {
+			cwd: this.directory,
+			absolute: true,
+		});
+
+		for (const credentialPath of credentials) {
+			const [fileName] = path.parse(credentialPath).name.split('.');
+			this.loadCredentialFromFile(fileName, credentialPath);
 		}
 	}
 }
@@ -315,15 +346,6 @@ export class PackageDirectoryLoader extends DirectoryLoader {
 
 		const { nodes, credentials } = n8n;
 
-		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);
-			}
-		}
-
 		if (Array.isArray(nodes)) {
 			for (const node of nodes) {
 				const filePath = this.resolvePath(node);
@@ -333,6 +355,15 @@ export class PackageDirectoryLoader extends DirectoryLoader {
 			}
 		}
 
+		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);
+			}
+		}
+
 		Logger.debug(`Loaded all credentials and nodes from ${this.packageName}`, {
 			credentials: credentials?.length ?? 0,
 			nodes: nodes?.length ?? 0,
@@ -346,7 +377,7 @@ export class PackageDirectoryLoader extends DirectoryLoader {
 		try {
 			return jsonParse<T>(fileString);
 		} catch (error) {
-			throw new Error(`Failed to parse JSON from ${filePath}`);
+			throw new ApplicationError('Failed to parse JSON', { extra: { filePath } });
 		}
 	}
 }
@@ -371,7 +402,9 @@ export class LazyPackageDirectoryLoader extends PackageDirectoryLoader {
 			if (this.includeNodes.length) {
 				const allowedNodes: typeof this.known.nodes = {};
 				for (const nodeName of this.includeNodes) {
-					allowedNodes[nodeName] = this.known.nodes[nodeName];
+					if (nodeName in this.known.nodes) {
+						allowedNodes[nodeName] = this.known.nodes[nodeName];
+					}
 				}
 				this.known.nodes = allowedNodes;
 
diff --git a/packages/core/src/EventEmitter.ts b/packages/core/src/EventEmitter.ts
deleted file mode 100644
index a5e71633564bc..0000000000000
--- a/packages/core/src/EventEmitter.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import EventEmitter from 'events';
-
-interface EventTypes {
-	nodeFetchedData: string;
-	workflowExecutionCompleted: string;
-}
-
-class N8NEventEmitter extends EventEmitter {
-	types: EventTypes = {
-		nodeFetchedData: 'nodeFetchedData',
-		workflowExecutionCompleted: 'workflowExecutionCompleted',
-	};
-}
-
-export const eventEmitter = new N8NEventEmitter();
diff --git a/packages/core/src/ExecutionMetadata.ts b/packages/core/src/ExecutionMetadata.ts
new file mode 100644
index 0000000000000..cc2743a56f923
--- /dev/null
+++ b/packages/core/src/ExecutionMetadata.ts
@@ -0,0 +1,74 @@
+import type { IRunExecutionData } from 'n8n-workflow';
+import { LoggerProxy as Logger } from 'n8n-workflow';
+import { InvalidExecutionMetadataError } from './errors/invalid-execution-metadata.error';
+
+export const KV_LIMIT = 10;
+
+export function setWorkflowExecutionMetadata(
+	executionData: IRunExecutionData,
+	key: string,
+	value: unknown,
+) {
+	if (!executionData.resultData.metadata) {
+		executionData.resultData.metadata = {};
+	}
+	// Currently limited to 10 metadata KVs
+	if (
+		!(key in executionData.resultData.metadata) &&
+		Object.keys(executionData.resultData.metadata).length >= KV_LIMIT
+	) {
+		return;
+	}
+	if (typeof key !== 'string') {
+		throw new InvalidExecutionMetadataError('key', key);
+	}
+	if (key.replace(/[A-Za-z0-9_]/g, '').length !== 0) {
+		throw new InvalidExecutionMetadataError(
+			'key',
+			key,
+			`Custom date key can only contain characters "A-Za-z0-9_" (key "${key}")`,
+		);
+	}
+	if (typeof value !== 'string' && typeof value !== 'number' && typeof value !== 'bigint') {
+		throw new InvalidExecutionMetadataError('value', key);
+	}
+	const val = String(value);
+	if (key.length > 50) {
+		Logger.error('Custom data key over 50 characters long. Truncating to 50 characters.');
+	}
+	if (val.length > 255) {
+		Logger.error('Custom data value over 255 characters long. Truncating to 255 characters.');
+	}
+	executionData.resultData.metadata[key.slice(0, 50)] = val.slice(0, 255);
+}
+
+export function setAllWorkflowExecutionMetadata(
+	executionData: IRunExecutionData,
+	obj: Record<string, string>,
+) {
+	const errors: Error[] = [];
+	Object.entries(obj).forEach(([key, value]) => {
+		try {
+			setWorkflowExecutionMetadata(executionData, key, value);
+		} catch (e) {
+			errors.push(e as Error);
+		}
+	});
+	if (errors.length) {
+		throw errors[0];
+	}
+}
+
+export function getAllWorkflowExecutionMetadata(
+	executionData: IRunExecutionData,
+): Record<string, string> {
+	// Make a copy so it can't be modified directly
+	return executionData.resultData.metadata ? { ...executionData.resultData.metadata } : {};
+}
+
+export function getWorkflowExecutionMetadata(
+	executionData: IRunExecutionData,
+	key: string,
+): string {
+	return getAllWorkflowExecutionMetadata(executionData)[String(key).slice(0, 50)];
+}
diff --git a/packages/core/src/ExtractValue.ts b/packages/core/src/ExtractValue.ts
index dcfadf4e2f986..17959e37e3ea4 100644
--- a/packages/core/src/ExtractValue.ts
+++ b/packages/core/src/ExtractValue.ts
@@ -1,13 +1,20 @@
-import type {
-	INode,
-	INodeParameters,
-	INodeProperties,
-	INodePropertyCollection,
-	INodePropertyOptions,
-	INodeType,
-	NodeParameterValueType,
+import get from 'lodash/get';
+import {
+	ApplicationError,
+	LoggerProxy,
+	NodeHelpers,
+	NodeOperationError,
+	WorkflowOperationError,
+	executeFilter,
+	isFilterValue,
+	type INode,
+	type INodeParameters,
+	type INodeProperties,
+	type INodePropertyCollection,
+	type INodePropertyOptions,
+	type INodeType,
+	type NodeParameterValueType,
 } from 'n8n-workflow';
-import { NodeOperationError, NodeHelpers, LoggerProxy } from 'n8n-workflow';
 
 function findPropertyFromParameterName(
 	parameterName: string,
@@ -30,7 +37,6 @@ function findPropertyFromParameterName(
 		);
 	};
 
-	// eslint-disable-next-line no-restricted-syntax
 	for (const p of paramParts) {
 		const param = p.split('[')[0];
 		if (!property) {
@@ -42,14 +48,14 @@ function findPropertyFromParameterName(
 			property = findProp(param, property.values);
 			currentParamPath += `.${param}`;
 		} else {
-			throw new Error(`Couldn't not find property "${parameterName}"`);
+			throw new ApplicationError('Could not find property', { extra: { parameterName } });
 		}
 		if (!property) {
-			throw new Error(`Couldn't not find property "${parameterName}"`);
+			throw new ApplicationError('Could not find property', { extra: { parameterName } });
 		}
 	}
 	if (!property) {
-		throw new Error(`Couldn't not find property "${parameterName}"`);
+		throw new ApplicationError('Could not find property', { extra: { parameterName } });
 	}
 
 	return property;
@@ -63,12 +69,12 @@ function executeRegexExtractValue(
 ): NodeParameterValueType | object {
 	const extracted = regex.exec(value);
 	if (!extracted) {
-		throw new Error(
+		throw new WorkflowOperationError(
 			`ERROR: ${parameterDisplayName} parameter's value is invalid. This is likely because the URL entered is incorrect`,
 		);
 	}
 	if (extracted.length < 2 || extracted.length > 2) {
-		throw new Error(
+		throw new WorkflowOperationError(
 			`Property "${parameterName}" has an invalid extractValue regex "${regex.source}". extractValue expects exactly one group to be returned.`,
 		);
 	}
@@ -102,23 +108,42 @@ function extractValueRLC(
 		LoggerProxy.error(
 			`Only strings can be passed to extractValue. Parameter "${parameterName}" passed "${typeName}"`,
 		);
-		throw new Error(
-			`ERROR: ${property.displayName} parameter's value is invalid. Please enter a valid ${modeProp.displayName}.`,
+		throw new ApplicationError(
+			"ERROR: This parameter's value is invalid. Please enter a valid mode.",
+			{ extra: { parameter: property.displayName, modeProp: modeProp.displayName } },
 		);
 	}
 
 	if (modeProp.extractValue.type !== 'regex') {
-		throw new Error(
-			`Property "${parameterName}" has an unknown extractValue type "${
-				modeProp.extractValue.type as string
-			}"`,
-		);
+		throw new ApplicationError('Property with unknown `extractValue`', {
+			extra: { parameter: parameterName, extractValueType: modeProp.extractValue.type },
+		});
 	}
 
 	const regex = new RegExp(modeProp.extractValue.regex);
 	return executeRegexExtractValue(value.value, regex, parameterName, property.displayName);
 }
 
+function extractValueFilter(
+	value: NodeParameterValueType | object,
+	property: INodeProperties,
+	parameterName: string,
+	itemIndex: number,
+): NodeParameterValueType | object {
+	if (!isFilterValue(value)) {
+		return value;
+	}
+
+	if (property.extractValue?.type) {
+		throw new ApplicationError(
+			`Property "${parameterName}" has an invalid extractValue type. Filter parameters only support extractValue: true`,
+			{ extra: { parameter: parameterName } },
+		);
+	}
+
+	return executeFilter(value, { itemIndex });
+}
+
 function extractValueOther(
 	value: NodeParameterValueType | object,
 	property: INodeProperties | INodePropertyCollection,
@@ -138,17 +163,15 @@ function extractValueOther(
 		LoggerProxy.error(
 			`Only strings can be passed to extractValue. Parameter "${parameterName}" passed "${typeName}"`,
 		);
-		throw new Error(
-			`ERROR: ${property.displayName} parameter's value is invalid. Please enter a valid value.`,
-		);
+		throw new ApplicationError("This parameter's value is invalid", {
+			extra: { parameter: property.displayName },
+		});
 	}
 
 	if (property.extractValue.type !== 'regex') {
-		throw new Error(
-			`Property "${parameterName}" has an unknown extractValue type "${
-				property.extractValue.type as string
-			}"`,
-		);
+		throw new ApplicationError('Property with unknown `extractValue`', {
+			extra: { parameter: parameterName, extractValueType: property.extractValue.type },
+		});
 	}
 
 	const regex = new RegExp(property.extractValue.regex);
@@ -160,6 +183,7 @@ export function extractValue(
 	parameterName: string,
 	node: INode,
 	nodeType: INodeType,
+	itemIndex = 0,
 ): NodeParameterValueType | object {
 	let property: INodePropertyOptions | INodeProperties | INodePropertyCollection;
 	try {
@@ -172,10 +196,12 @@ export function extractValue(
 
 		if (property.type === 'resourceLocator') {
 			return extractValueRLC(value, property, parameterName);
+		} else if (property.type === 'filter') {
+			return extractValueFilter(value, property, parameterName, itemIndex);
 		}
 		return extractValueOther(value, property, parameterName);
 	} catch (error) {
-		// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-		throw new NodeOperationError(node, error);
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-assignment
+		throw new NodeOperationError(node, error, { description: get(error, 'description') });
 	}
 }
diff --git a/packages/core/src/InstanceSettings.ts b/packages/core/src/InstanceSettings.ts
new file mode 100644
index 0000000000000..e8ab9aa553223
--- /dev/null
+++ b/packages/core/src/InstanceSettings.ts
@@ -0,0 +1,113 @@
+import path from 'path';
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'fs';
+import { createHash, randomBytes } from 'crypto';
+import { Service } from 'typedi';
+import { ApplicationError, jsonParse } from 'n8n-workflow';
+
+interface ReadOnlySettings {
+	encryptionKey: string;
+}
+
+interface WritableSettings {
+	tunnelSubdomain?: string;
+}
+
+type Settings = ReadOnlySettings & WritableSettings;
+
+const inTest = process.env.NODE_ENV === 'test';
+
+@Service()
+export class InstanceSettings {
+	private readonly userHome = this.getUserHome();
+
+	/** The path to the n8n folder in which all n8n related data gets saved */
+	readonly n8nFolder = path.join(this.userHome, '.n8n');
+
+	/** The path to the folder where all generated static assets are copied to */
+	readonly staticCacheDir = path.join(this.userHome, '.cache/n8n/public');
+
+	/** The path to the folder containing custom nodes and credentials */
+	readonly customExtensionDir = path.join(this.n8nFolder, 'custom');
+
+	/** The path to the folder containing installed nodes (like community nodes) */
+	readonly nodesDownloadDir = path.join(this.n8nFolder, 'nodes');
+
+	private readonly settingsFile = path.join(this.n8nFolder, 'config');
+
+	private settings = this.loadOrCreate();
+
+	readonly instanceId = this.generateInstanceId();
+
+	get encryptionKey() {
+		return this.settings.encryptionKey;
+	}
+
+	get tunnelSubdomain() {
+		return this.settings.tunnelSubdomain;
+	}
+
+	update(newSettings: WritableSettings) {
+		this.save({ ...this.settings, ...newSettings });
+	}
+
+	/**
+	 * The home folder path of the user.
+	 * If none can be found it falls back to the current working directory
+	 */
+	private getUserHome() {
+		const homeVarName = process.platform === 'win32' ? 'USERPROFILE' : 'HOME';
+		return process.env.N8N_USER_FOLDER ?? process.env[homeVarName] ?? process.cwd();
+	}
+
+	/**
+	 * Load instance settings from the settings file. If missing, create a new
+	 * settings file with an auto-generated encryption key.
+	 */
+	private loadOrCreate(): Settings {
+		if (existsSync(this.settingsFile)) {
+			const content = readFileSync(this.settingsFile, 'utf8');
+
+			const settings = jsonParse<Settings>(content, {
+				errorMessage: `Error parsing n8n-config file "${this.settingsFile}". It does not seem to be valid JSON.`,
+			});
+
+			if (!inTest) console.info(`User settings loaded from: ${this.settingsFile}`);
+
+			const { encryptionKey, tunnelSubdomain } = settings;
+
+			if (process.env.N8N_ENCRYPTION_KEY && encryptionKey !== process.env.N8N_ENCRYPTION_KEY) {
+				throw new ApplicationError(
+					`Mismatching encryption keys. The encryption key in the settings file ${this.settingsFile} does not match the N8N_ENCRYPTION_KEY env var. Please make sure both keys match. More information: https://docs.n8n.io/hosting/environment-variables/configuration-methods/#encryption-key`,
+				);
+			}
+
+			return { encryptionKey, tunnelSubdomain };
+		}
+
+		mkdirSync(this.n8nFolder, { recursive: true });
+
+		const encryptionKey = process.env.N8N_ENCRYPTION_KEY ?? randomBytes(24).toString('base64');
+
+		const settings: Settings = { encryptionKey };
+
+		this.save(settings);
+
+		if (!inTest && !process.env.N8N_ENCRYPTION_KEY) {
+			console.info(`No encryption key found - Auto-generated and saved to: ${this.settingsFile}`);
+		}
+
+		return settings;
+	}
+
+	private generateInstanceId() {
+		const { encryptionKey } = this;
+		return createHash('sha256')
+			.update(encryptionKey.slice(Math.round(encryptionKey.length / 2)))
+			.digest('hex');
+	}
+
+	private save(settings: Settings) {
+		this.settings = settings;
+		writeFileSync(this.settingsFile, JSON.stringify(settings, null, '\t'), 'utf-8');
+	}
+}
diff --git a/packages/core/src/Interfaces.ts b/packages/core/src/Interfaces.ts
index f9e2aec74c625..000f2a8125b07 100644
--- a/packages/core/src/Interfaces.ts
+++ b/packages/core/src/Interfaces.ts
@@ -1,43 +1,16 @@
-import type { Readable } from 'stream';
 import type {
 	IPollResponse,
 	ITriggerResponse,
 	IWorkflowSettings as IWorkflowSettingsWorkflow,
-	IExecuteFunctions as IExecuteFunctionsBase,
-	IExecuteSingleFunctions as IExecuteSingleFunctionsBase,
-	IHookFunctions as IHookFunctionsBase,
-	ILoadOptionsFunctions as ILoadOptionsFunctionsBase,
-	IPollFunctions as IPollFunctionsBase,
-	ITriggerFunctions as ITriggerFunctionsBase,
-	IWebhookFunctions as IWebhookFunctionsBase,
-	BinaryMetadata,
+	ValidationResult,
 } from 'n8n-workflow';
 
-// TODO: remove these after removing `n8n-core` dependency from `nodes-bases`
-export type IExecuteFunctions = IExecuteFunctionsBase;
-export type IExecuteSingleFunctions = IExecuteSingleFunctionsBase;
-export type IHookFunctions = IHookFunctionsBase;
-export type ILoadOptionsFunctions = ILoadOptionsFunctionsBase;
-export type IPollFunctions = IPollFunctionsBase;
-export type ITriggerFunctions = ITriggerFunctionsBase;
-export type IWebhookFunctions = IWebhookFunctionsBase;
-
-export interface IProcessMessage {
-	// eslint-disable-next-line @typescript-eslint/no-explicit-any
-	data?: any;
-	type: string;
-}
+export type Class<T = object, A extends unknown[] = unknown[]> = new (...args: A) => T;
 
 export interface IResponseError extends Error {
 	statusCode?: number;
 }
 
-export interface IUserSettings {
-	encryptionKey?: string;
-	tunnelSubdomain?: string;
-	instanceId?: string;
-}
-
 export interface IWorkflowSettings extends IWorkflowSettingsWorkflow {
 	errorWorkflow?: string;
 	timezone?: string;
@@ -49,32 +22,6 @@ export interface IWorkflowData {
 	triggerResponses?: ITriggerResponse[];
 }
 
-export interface IBinaryDataConfig {
-	mode: 'default' | 'filesystem';
-	availableModes: string;
-	localStoragePath: string;
-	binaryDataTTL: number;
-	persistedBinaryDataTTL: number;
-}
-
-export interface IBinaryDataManager {
-	init(startPurger: boolean): Promise<void>;
-	getFileSize(filePath: string): Promise<number>;
-	copyBinaryFile(filePath: string, executionId: string): Promise<string>;
-	storeBinaryMetadata(identifier: string, metadata: BinaryMetadata): Promise<void>;
-	getBinaryMetadata(identifier: string): Promise<BinaryMetadata>;
-	storeBinaryData(binaryData: Buffer | Readable, executionId: string): Promise<string>;
-	retrieveBinaryDataByIdentifier(identifier: string): Promise<Buffer>;
-	getBinaryPath(identifier: string): string;
-	getBinaryStream(identifier: string, chunkSize?: number): Readable;
-	markDataForDeletionByExecutionId(executionId: string): Promise<void>;
-	deleteMarkedFiles(): Promise<unknown>;
-	deleteBinaryDataByIdentifier(identifier: string): Promise<void>;
-	duplicateBinaryDataByIdentifier(binaryDataId: string, prefix: string): Promise<string>;
-	deleteBinaryDataByExecutionId(executionId: string): Promise<void>;
-	persistBinaryDataForExecutionId(executionId: string): Promise<void>;
-}
-
 export namespace n8n {
 	export interface PackageJson {
 		name: string;
@@ -89,3 +36,5 @@ export namespace n8n {
 		};
 	}
 }
+
+export type ExtendedValidationResult = Partial<ValidationResult> & { fieldName?: string };
diff --git a/packages/core/src/LoadNodeDetails.ts b/packages/core/src/LoadNodeDetails.ts
deleted file mode 100644
index 582183b987e63..0000000000000
--- a/packages/core/src/LoadNodeDetails.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-import type {
-	INode,
-	INodeCredentials,
-	INodeParameters,
-	INodeTypeNameVersion,
-	INodeTypes,
-} from 'n8n-workflow';
-import { Workflow } from 'n8n-workflow';
-
-const TEMP_NODE_NAME = 'Temp-Node';
-const TEMP_WORKFLOW_NAME = 'Temp-Workflow';
-
-export abstract class LoadNodeDetails {
-	path: string;
-
-	workflow: Workflow;
-
-	constructor(
-		nodeTypeNameAndVersion: INodeTypeNameVersion,
-		nodeTypes: INodeTypes,
-		path: string,
-		currentNodeParameters: INodeParameters,
-		credentials?: INodeCredentials,
-	) {
-		const nodeType = nodeTypes.getByNameAndVersion(
-			nodeTypeNameAndVersion.name,
-			nodeTypeNameAndVersion.version,
-		);
-
-		this.path = path;
-
-		if (nodeType === undefined) {
-			throw new Error(
-				`The node-type "${nodeTypeNameAndVersion.name} v${nodeTypeNameAndVersion.version}"  is not known!`,
-			);
-		}
-
-		const nodeData: INode = {
-			parameters: currentNodeParameters,
-			id: 'uuid-1234',
-			name: TEMP_NODE_NAME,
-			type: nodeTypeNameAndVersion.name,
-			typeVersion: nodeTypeNameAndVersion.version,
-			position: [0, 0],
-		};
-
-		if (credentials) {
-			nodeData.credentials = credentials;
-		}
-
-		const workflowData = {
-			nodes: [nodeData],
-			connections: {},
-		};
-
-		this.workflow = new Workflow({
-			nodes: workflowData.nodes,
-			connections: workflowData.connections,
-			active: false,
-			nodeTypes,
-		});
-	}
-
-	/**
-	 * Returns data of a fake workflow
-	 */
-	getWorkflowData() {
-		return {
-			name: TEMP_WORKFLOW_NAME,
-			active: false,
-			connections: {},
-			nodes: Object.values(this.workflow.nodes),
-			createdAt: new Date(),
-			updatedAt: new Date(),
-		};
-	}
-
-	protected getTempNode() {
-		// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-		return this.workflow.getNode(TEMP_NODE_NAME)!;
-	}
-}
diff --git a/packages/core/src/LoadNodeListSearch.ts b/packages/core/src/LoadNodeListSearch.ts
deleted file mode 100644
index bac92c269b0ae..0000000000000
--- a/packages/core/src/LoadNodeListSearch.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import type { INodeListSearchResult, IWorkflowExecuteAdditionalData } from 'n8n-workflow';
-
-import * as NodeExecuteFunctions from './NodeExecuteFunctions';
-import { LoadNodeDetails } from './LoadNodeDetails';
-
-export class LoadNodeListSearch extends LoadNodeDetails {
-	/**
-	 * Returns the available options via a predefined method
-	 */
-	async getOptionsViaMethodName(
-		methodName: string,
-		additionalData: IWorkflowExecuteAdditionalData,
-		filter?: string,
-		paginationToken?: string,
-	): Promise<INodeListSearchResult> {
-		const node = this.getTempNode();
-
-		const nodeType = this.workflow.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
-		const method = nodeType?.methods?.listSearch?.[methodName];
-
-		if (typeof method !== 'function') {
-			throw new Error(
-				`The node-type "${node.type}" does not have the method "${methodName}" defined!`,
-			);
-		}
-
-		const thisArgs = NodeExecuteFunctions.getLoadOptionsFunctions(
-			this.workflow,
-			node,
-			this.path,
-			additionalData,
-		);
-
-		return method.call(thisArgs, filter, paginationToken);
-	}
-}
diff --git a/packages/core/src/LoadNodeParameterOptions.ts b/packages/core/src/LoadNodeParameterOptions.ts
deleted file mode 100644
index 7bf39e193963d..0000000000000
--- a/packages/core/src/LoadNodeParameterOptions.ts
+++ /dev/null
@@ -1,123 +0,0 @@
-import type {
-	ILoadOptions,
-	INodeExecutionData,
-	INodeProperties,
-	INodePropertyOptions,
-	INodeType,
-	IRunExecutionData,
-	ITaskDataConnections,
-	IWorkflowExecuteAdditionalData,
-} from 'n8n-workflow';
-import { RoutingNode } from 'n8n-workflow';
-
-import * as NodeExecuteFunctions from './NodeExecuteFunctions';
-import { LoadNodeDetails } from './LoadNodeDetails';
-
-export class LoadNodeParameterOptions extends LoadNodeDetails {
-	/**
-	 * Returns the available options via a predefined method
-	 */
-	async getOptionsViaMethodName(
-		methodName: string,
-		additionalData: IWorkflowExecuteAdditionalData,
-	): Promise<INodePropertyOptions[]> {
-		const node = this.getTempNode();
-
-		const nodeType = this.workflow.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
-		const method = nodeType?.methods?.loadOptions?.[methodName];
-
-		if (typeof method !== 'function') {
-			throw new Error(
-				`The node-type "${node.type}" does not have the method "${methodName}" defined!`,
-			);
-		}
-
-		const thisArgs = NodeExecuteFunctions.getLoadOptionsFunctions(
-			this.workflow,
-			node,
-			this.path,
-			additionalData,
-		);
-
-		return method.call(thisArgs);
-	}
-
-	/**
-	 * Returns the available options via a load request information
-	 */
-	async getOptionsViaRequestProperty(
-		loadOptions: ILoadOptions,
-		additionalData: IWorkflowExecuteAdditionalData,
-	): Promise<INodePropertyOptions[]> {
-		const node = this.getTempNode();
-
-		const nodeType = this.workflow.nodeTypes.getByNameAndVersion(node.type, node?.typeVersion);
-
-		if (!nodeType?.description?.requestDefaults?.baseURL) {
-			// This in in here for now for security reasons.
-			// Background: As the full data for the request to make does get send, and the auth data
-			// will then be applied, would it be possible to retrieve that data like that. By at least
-			// requiring a baseURL to be defined can at least not a random server be called.
-			// In the future this code has to get improved that it does not use the request information from
-			// the request rather resolves it via the parameter-path and nodeType data.
-			throw new Error(
-				`The node-type "${node.type}" does not exist or does not have "requestDefaults.baseURL" defined!`,
-			);
-		}
-
-		const mode = 'internal';
-		const runIndex = 0;
-		const connectionInputData: INodeExecutionData[] = [];
-		const runExecutionData: IRunExecutionData = { resultData: { runData: {} } };
-
-		const routingNode = new RoutingNode(
-			this.workflow,
-			node,
-			connectionInputData,
-			runExecutionData ?? null,
-			additionalData,
-			mode,
-		);
-
-		// Create copy of node-type with the single property we want to get the data off
-		const tempNode: INodeType = {
-			...nodeType,
-			...{
-				description: {
-					...nodeType.description,
-					properties: [
-						{
-							displayName: '',
-							type: 'string',
-							name: '',
-							default: '',
-							routing: loadOptions.routing,
-						} as INodeProperties,
-					],
-				},
-			},
-		};
-
-		const inputData: ITaskDataConnections = {
-			main: [[{ json: {} }]],
-		};
-
-		const optionsData = await routingNode.runNode(
-			inputData,
-			runIndex,
-			tempNode,
-			{ node, source: null, data: {} },
-			NodeExecuteFunctions,
-		);
-
-		if (optionsData?.length === 0) {
-			return [];
-		}
-
-		if (!Array.isArray(optionsData)) {
-			throw new Error('The returned data is not an array!');
-		}
-
-		return optionsData[0].map((item) => item.json) as unknown as INodePropertyOptions[];
-	}
-}
diff --git a/packages/core/src/NodeExecuteFunctions.ts b/packages/core/src/NodeExecuteFunctions.ts
index 32c8642c24fdd..5b374460fde64 100644
--- a/packages/core/src/NodeExecuteFunctions.ts
+++ b/packages/core/src/NodeExecuteFunctions.ts
@@ -1,124 +1,157 @@
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
 /* eslint-disable @typescript-eslint/no-explicit-any */
-/* eslint-disable @typescript-eslint/no-unused-vars */
 /* eslint-disable @typescript-eslint/prefer-nullish-coalescing */
 /* eslint-disable @typescript-eslint/naming-convention */
-/* eslint-disable new-cap */
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
 /* eslint-disable @typescript-eslint/no-shadow */
-/* eslint-disable no-param-reassign */
 import type {
+	ClientOAuth2Options,
+	ClientOAuth2RequestObject,
+	ClientOAuth2TokenData,
+	OAuth2CredentialData,
+} from '@n8n/client-oauth2';
+import { ClientOAuth2 } from '@n8n/client-oauth2';
+import type {
+	AxiosError,
+	AxiosHeaders,
+	AxiosPromise,
+	AxiosRequestConfig,
+	AxiosResponse,
+} from 'axios';
+import axios from 'axios';
+import crypto, { createHmac } from 'crypto';
+import type { Request, Response } from 'express';
+import FileType from 'file-type';
+import FormData from 'form-data';
+import { createReadStream } from 'fs';
+import { access as fsAccess, writeFile as fsWriteFile } from 'fs/promises';
+import { IncomingMessage, type IncomingHttpHeaders } from 'http';
+import { Agent, type AgentOptions } from 'https';
+import get from 'lodash/get';
+import isEmpty from 'lodash/isEmpty';
+import pick from 'lodash/pick';
+import { DateTime } from 'luxon';
+import { extension, lookup } from 'mime-types';
+import type {
+	BinaryHelperFunctions,
+	CloseFunction,
+	ConnectionTypes,
+	ContextType,
+	EventNamesAiNodesType,
+	FieldType,
+	FileSystemHelperFunctions,
+	FunctionsBase,
 	GenericValue,
 	IAdditionalCredentialOptions,
 	IAllExecuteFunctions,
 	IBinaryData,
 	IContextObject,
 	ICredentialDataDecryptedObject,
+	ICredentialTestFunctions,
 	ICredentialsExpressionResolveValues,
 	IDataObject,
+	IExecuteData,
+	IExecuteFunctions,
 	IExecuteResponsePromiseData,
+	IExecuteSingleFunctions,
 	IExecuteWorkflowInfo,
+	IGetNodeParameterOptions,
+	IHookFunctions,
 	IHttpRequestOptions,
+	ILoadOptionsFunctions,
 	IN8nHttpFullResponse,
 	IN8nHttpResponse,
 	INode,
 	INodeCredentialDescription,
 	INodeCredentialsDetails,
 	INodeExecutionData,
+	INodeInputConfiguration,
+	INodeOutputConfiguration,
+	INodeProperties,
+	INodePropertyCollection,
+	INodePropertyOptions,
+	INodeType,
 	IOAuth2Options,
+	IPairedItemData,
+	IPollFunctions,
+	IRequestOptions,
 	IRunExecutionData,
 	ISourceData,
+	ITaskData,
 	ITaskDataConnections,
+	ITriggerFunctions,
 	IWebhookData,
 	IWebhookDescription,
+	IWebhookFunctions,
 	IWorkflowDataProxyAdditionalKeys,
 	IWorkflowDataProxyData,
 	IWorkflowExecuteAdditionalData,
-	Workflow,
-	WorkflowActivateMode,
-	WorkflowExecuteMode,
-	IExecuteData,
-	IGetNodeParameterOptions,
-	NodeParameterValueType,
 	NodeExecutionWithMetadata,
-	IPairedItemData,
-	ICredentialTestFunctions,
-	BinaryHelperFunctions,
 	NodeHelperFunctions,
+	NodeParameterValueType,
+	NodeTypeAndVersion,
+	PaginationOptions,
 	RequestHelperFunctions,
-	FunctionsBase,
-	IExecuteFunctions,
-	IExecuteSingleFunctions,
-	IHookFunctions,
-	ILoadOptionsFunctions,
-	IPollFunctions,
-	ITriggerFunctions,
-	IWebhookFunctions,
-	BinaryMetadata,
-	FileSystemHelperFunctions,
+	Workflow,
+	WorkflowActivateMode,
+	WorkflowExecuteMode,
+	CallbackManager,
 } from 'n8n-workflow';
 import {
-	createDeferredPromise,
+	ExpressionError,
+	LoggerProxy as Logger,
 	NodeApiError,
 	NodeHelpers,
 	NodeOperationError,
+	NodeSslError,
 	WorkflowDataProxy,
-	LoggerProxy as Logger,
-	OAuth2GrantType,
+	createDeferredPromise,
 	deepCopy,
 	fileTypeFromMimeType,
-	ExpressionError,
+	getGlobalState,
+	isObjectEmpty,
+	isResourceMapperValue,
+	validateFieldType,
+	ExecutionBaseError,
+	jsonParse,
+	ApplicationError,
+	sleep,
 } from 'n8n-workflow';
-
-import pick from 'lodash.pick';
-import { Agent } from 'https';
-import { IncomingMessage } from 'http';
-import { stringify } from 'qs';
 import type { Token } from 'oauth-1.0a';
 import clientOAuth1 from 'oauth-1.0a';
-import clientOAuth2 from 'client-oauth2';
-import crypto, { createHmac } from 'crypto';
-import get from 'lodash.get';
-import type { Request, Response } from 'express';
-import FormData from 'form-data';
 import path from 'path';
-import type { OptionsWithUri, OptionsWithUrl, RequestCallback, RequiredUriUrl } from 'request';
-import type { RequestPromiseOptions } from 'request-promise-native';
-import requestPromise from 'request-promise-native';
-import FileType from 'file-type';
-import { lookup, extension } from 'mime-types';
-import type { IncomingHttpHeaders } from 'http';
-import type {
-	AxiosError,
-	AxiosPromise,
-	AxiosProxyConfig,
-	AxiosRequestConfig,
-	AxiosResponse,
-	Method,
-} from 'axios';
-import axios from 'axios';
-import url, { URL, URLSearchParams } from 'url';
+import { stringify } from 'qs';
 import { Readable } from 'stream';
-import { access as fsAccess } from 'fs/promises';
-import { createReadStream } from 'fs';
+import url, { URL, URLSearchParams } from 'url';
 
-import { BinaryDataManager } from './BinaryDataManager';
-import type { IResponseError, IWorkflowSettings } from './Interfaces';
+import { BinaryDataService } from './BinaryData/BinaryData.service';
+import {
+	BINARY_DATA_STORAGE_PATH,
+	BLOCK_FILE_ACCESS_TO_N8N_FILES,
+	CONFIG_FILES,
+	CUSTOM_EXTENSION_ENV,
+	HTTP_REQUEST_NODE_TYPE,
+	PLACEHOLDER_EMPTY_EXECUTION_ID,
+	RESTRICT_FILE_ACCESS_TO,
+	UM_EMAIL_TEMPLATES_INVITE,
+	UM_EMAIL_TEMPLATES_PWRESET,
+} from './Constants';
 import { extractValue } from './ExtractValue';
-import { getClientCredentialsToken } from './OAuth2Helper';
-import { PLACEHOLDER_EMPTY_EXECUTION_ID } from './Constants';
-import { binaryToBuffer } from './BinaryDataManager/utils';
+import type { ExtendedValidationResult, IResponseError } from './Interfaces';
 import {
 	getAllWorkflowExecutionMetadata,
 	getWorkflowExecutionMetadata,
 	setAllWorkflowExecutionMetadata,
 	setWorkflowExecutionMetadata,
-} from './WorkflowExecutionMetadata';
+} from './ExecutionMetadata';
+import { getSecretsProxy } from './Secrets';
+import Container from 'typedi';
+import type { BinaryData } from './BinaryData/types';
+import merge from 'lodash/merge';
+import { InstanceSettings } from './InstanceSettings';
 
 axios.defaults.timeout = 300000;
 // Prevent axios from adding x-form-www-urlencoded headers by default
@@ -131,9 +164,12 @@ axios.defaults.paramsSerializer = (params) => {
 	}
 	return stringify(params, { arrayFormat: 'indices' });
 };
-
-const requestPromiseWithDefaults = requestPromise.defaults({
-	timeout: 300000, // 5 minutes
+axios.interceptors.request.use((config) => {
+	// If no content-type is set by us, prevent axios from force-setting the content-type to `application/x-www-form-urlencoded`
+	if (config.data === undefined) {
+		config.headers.setContentType(false, false);
+	}
+	return config;
 });
 
 const pushFormDataValue = (form: FormData, key: string, value: any) => {
@@ -160,23 +196,35 @@ const createFormDataObject = (data: Record<string, unknown>) => {
 	});
 	return formData;
 };
-function searchForHeader(headers: IDataObject, headerName: string) {
-	if (headers === undefined) {
+
+const validateUrl = (url?: string): boolean => {
+	if (!url) return false;
+
+	try {
+		new URL(url);
+		return true;
+	} catch (error) {
+		return false;
+	}
+};
+
+function searchForHeader(config: AxiosRequestConfig, headerName: string) {
+	if (config.headers === undefined) {
 		return undefined;
 	}
 
-	const headerNames = Object.keys(headers);
+	const headerNames = Object.keys(config.headers);
 	headerName = headerName.toLowerCase();
 	return headerNames.find((thisHeader) => thisHeader.toLowerCase() === headerName);
 }
 
-async function generateContentLengthHeader(formData: FormData, headers: IDataObject) {
-	if (!formData?.getLength) {
+async function generateContentLengthHeader(config: AxiosRequestConfig) {
+	if (!(config.data instanceof FormData)) {
 		return;
 	}
 	try {
-		const length = await new Promise((res, rej) => {
-			formData.getLength((error: Error | null, length: number) => {
+		const length = await new Promise<number>((res, rej) => {
+			config.data.getLength((error: Error | null, length: number) => {
 				if (error) {
 					rej(error);
 					return;
@@ -184,15 +232,50 @@ async function generateContentLengthHeader(formData: FormData, headers: IDataObj
 				res(length);
 			});
 		});
-		headers = Object.assign(headers, {
+		config.headers = {
+			...config.headers,
 			'content-length': length,
-		});
+		};
 	} catch (error) {
 		Logger.error('Unable to calculate form data length', { error });
 	}
 }
 
-async function parseRequestObject(requestObject: IDataObject) {
+const getHostFromRequestObject = (
+	requestObject: Partial<{
+		url: string;
+		uri: string;
+		baseURL: string;
+	}>,
+): string | null => {
+	try {
+		const url = (requestObject.url ?? requestObject.uri) as string;
+		return new URL(url, requestObject.baseURL).hostname;
+	} catch (error) {
+		return null;
+	}
+};
+
+const getBeforeRedirectFn =
+	(agentOptions: AgentOptions, axiosConfig: AxiosRequestConfig) =>
+	(redirectedRequest: Record<string, any>) => {
+		const redirectAgent = new Agent({
+			...agentOptions,
+			servername: redirectedRequest.hostname,
+		});
+		redirectedRequest.agent = redirectAgent;
+		redirectedRequest.agents.https = redirectAgent;
+
+		if (axiosConfig.headers?.Authorization) {
+			redirectedRequest.headers.Authorization = axiosConfig.headers.Authorization;
+		}
+		if (axiosConfig.auth) {
+			redirectedRequest.auth = `${axiosConfig.auth.username}:${axiosConfig.auth.password}`;
+		}
+	};
+
+// eslint-disable-next-line complexity
+export async function parseRequestObject(requestObject: IRequestOptions) {
 	// This function is a temporary implementation
 	// That translates all http requests done via
 	// the request library to axios directly
@@ -202,7 +285,7 @@ async function parseRequestObject(requestObject: IDataObject) {
 	const axiosConfig: AxiosRequestConfig = {};
 
 	if (requestObject.headers !== undefined) {
-		axiosConfig.headers = requestObject.headers as string;
+		axiosConfig.headers = requestObject.headers as AxiosHeaders;
 	}
 
 	// Let's start parsing the hardest part, which is the request body.
@@ -220,7 +303,7 @@ async function parseRequestObject(requestObject: IDataObject) {
 		);
 	const contentType =
 		contentTypeHeaderKeyName &&
-		(axiosConfig.headers[contentTypeHeaderKeyName] as string | undefined);
+		(axiosConfig.headers?.[contentTypeHeaderKeyName] as string | undefined);
 	if (contentType === 'application/x-www-form-urlencoded' && requestObject.formData === undefined) {
 		// there are nodes incorrectly created, informing the content type header
 		// and also using formData. Request lib takes precedence for the formData.
@@ -239,7 +322,7 @@ async function parseRequestObject(requestObject: IDataObject) {
 				axiosConfig.data = stringify(allData);
 			}
 		}
-	} else if (contentType && contentType.includes('multipart/form-data') !== false) {
+	} else if (contentType?.includes('multipart/form-data')) {
 		if (requestObject.formData !== undefined && requestObject.formData instanceof FormData) {
 			axiosConfig.data = requestObject.formData;
 		} else {
@@ -252,10 +335,10 @@ async function parseRequestObject(requestObject: IDataObject) {
 		}
 		// replace the existing header with a new one that
 		// contains the boundary property.
-		delete axiosConfig.headers[contentTypeHeaderKeyName];
+		delete axiosConfig.headers?.[contentTypeHeaderKeyName!];
 		const headers = axiosConfig.data.getHeaders();
 		axiosConfig.headers = Object.assign(axiosConfig.headers || {}, headers);
-		await generateContentLengthHeader(axiosConfig.data, axiosConfig.headers);
+		await generateContentLengthHeader(axiosConfig);
 	} else {
 		// When using the `form` property it means the content should be x-www-form-urlencoded.
 		if (requestObject.form !== undefined && requestObject.body === undefined) {
@@ -265,7 +348,7 @@ async function parseRequestObject(requestObject: IDataObject) {
 					? stringify(requestObject.form, { format: 'RFC3986' })
 					: stringify(requestObject.form).toString();
 			if (axiosConfig.headers !== undefined) {
-				const headerName = searchForHeader(axiosConfig.headers, 'content-type');
+				const headerName = searchForHeader(axiosConfig, 'content-type');
 				if (headerName) {
 					delete axiosConfig.headers[headerName];
 				}
@@ -279,9 +362,11 @@ async function parseRequestObject(requestObject: IDataObject) {
 			// remove any "content-type" that might exist.
 			if (axiosConfig.headers !== undefined) {
 				const headers = Object.keys(axiosConfig.headers);
-				headers.forEach((header) =>
-					header.toLowerCase() === 'content-type' ? delete axiosConfig.headers[header] : null,
-				);
+				headers.forEach((header) => {
+					if (header.toLowerCase() === 'content-type') {
+						delete axiosConfig.headers?.[header];
+					}
+				});
 			}
 
 			if (requestObject.formData instanceof FormData) {
@@ -292,7 +377,7 @@ async function parseRequestObject(requestObject: IDataObject) {
 			// Mix in headers as FormData creates the boundary.
 			const headers = axiosConfig.data.getHeaders();
 			axiosConfig.headers = Object.assign(axiosConfig.headers || {}, headers);
-			await generateContentLengthHeader(axiosConfig.data, axiosConfig.headers);
+			await generateContentLengthHeader(axiosConfig);
 		} else if (requestObject.body !== undefined) {
 			// If we have body and possibly form
 			if (requestObject.form !== undefined && requestObject.body) {
@@ -304,28 +389,28 @@ async function parseRequestObject(requestObject: IDataObject) {
 	}
 
 	if (requestObject.uri !== undefined) {
-		axiosConfig.url = requestObject.uri?.toString() as string;
+		axiosConfig.url = requestObject.uri?.toString();
 	}
 
 	if (requestObject.url !== undefined) {
-		axiosConfig.url = requestObject.url?.toString() as string;
+		axiosConfig.url = requestObject.url?.toString();
 	}
 
 	if (requestObject.baseURL !== undefined) {
-		axiosConfig.baseURL = requestObject.baseURL?.toString() as string;
+		axiosConfig.baseURL = requestObject.baseURL?.toString();
 	}
 
 	if (requestObject.method !== undefined) {
-		axiosConfig.method = requestObject.method as Method;
+		axiosConfig.method = requestObject.method;
 	}
 
 	if (requestObject.qs !== undefined && Object.keys(requestObject.qs as object).length > 0) {
-		axiosConfig.params = requestObject.qs as IDataObject;
+		axiosConfig.params = requestObject.qs;
 	}
 
 	function hasArrayFormatOptions(
-		arg: IDataObject,
-	): arg is IDataObject & { qsStringifyOptions: { arrayFormat: 'repeat' | 'brackets' } } {
+		arg: IRequestOptions,
+	): arg is Required<Pick<IRequestOptions, 'qsStringifyOptions'>> {
 		if (
 			typeof arg.qsStringifyOptions === 'object' &&
 			arg.qsStringifyOptions !== null &&
@@ -363,13 +448,13 @@ async function parseRequestObject(requestObject: IDataObject) {
 
 	if (requestObject.auth !== undefined) {
 		// Check support for sendImmediately
-		if ((requestObject.auth as IDataObject).bearer !== undefined) {
+		if (requestObject.auth.bearer !== undefined) {
 			axiosConfig.headers = Object.assign(axiosConfig.headers || {}, {
 				// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-				Authorization: `Bearer ${(requestObject.auth as IDataObject).bearer}`,
+				Authorization: `Bearer ${requestObject.auth.bearer}`,
 			});
 		} else {
-			const authObj = requestObject.auth as IDataObject;
+			const authObj = requestObject.auth;
 			// Request accepts both user/username and pass/password
 			axiosConfig.auth = {
 				username: (authObj.user || authObj.username) as string,
@@ -400,27 +485,33 @@ async function parseRequestObject(requestObject: IDataObject) {
 	}
 
 	// Axios will follow redirects by default, so we simply tell it otherwise if needed.
+	const { method } = requestObject;
 	if (
-		requestObject.followRedirect === false &&
-		((requestObject.method as string | undefined) || 'get').toLowerCase() === 'get'
-	) {
-		axiosConfig.maxRedirects = 0;
-	}
-	if (
-		requestObject.followAllRedirects === false &&
-		((requestObject.method as string | undefined) || 'get').toLowerCase() !== 'get'
+		(requestObject.followRedirect !== false &&
+			(!method || method === 'GET' || method === 'HEAD')) ||
+		requestObject.followAllRedirects
 	) {
+		axiosConfig.maxRedirects = requestObject.maxRedirects;
+	} else {
 		axiosConfig.maxRedirects = 0;
 	}
 
+	const host = getHostFromRequestObject(requestObject);
+	const agentOptions: AgentOptions = { ...requestObject.agentOptions };
+	if (host) {
+		agentOptions.servername = host;
+	}
 	if (requestObject.rejectUnauthorized === false) {
-		axiosConfig.httpsAgent = new Agent({
-			rejectUnauthorized: false,
-		});
+		agentOptions.rejectUnauthorized = false;
+		agentOptions.secureOptions = crypto.constants.SSL_OP_LEGACY_SERVER_CONNECT;
 	}
 
+	axiosConfig.httpsAgent = new Agent(agentOptions);
+
+	axiosConfig.beforeRedirect = getBeforeRedirectFn(agentOptions, axiosConfig);
+
 	if (requestObject.timeout !== undefined) {
-		axiosConfig.timeout = requestObject.timeout as number;
+		axiosConfig.timeout = requestObject.timeout;
 	}
 
 	if (requestObject.proxy !== undefined) {
@@ -428,8 +519,9 @@ async function parseRequestObject(requestObject: IDataObject) {
 		if (typeof requestObject.proxy === 'string') {
 			try {
 				const url = new URL(requestObject.proxy);
+				const host = url.hostname.startsWith('[') ? url.hostname.slice(1, -1) : url.hostname;
 				axiosConfig.proxy = {
-					host: url.hostname,
+					host,
 					port: parseInt(url.port, 10),
 					protocol: url.protocol,
 				};
@@ -454,8 +546,9 @@ async function parseRequestObject(requestObject: IDataObject) {
 					const [userpass, hostport] = requestObject.proxy.split('@');
 					const [username, password] = userpass.split(':');
 					const [hostname, port] = hostport.split(':');
+					const host = hostname.startsWith('[') ? hostname.slice(1, -1) : hostname;
 					axiosConfig.proxy = {
-						host: hostname,
+						host,
 						port: parseInt(port, 10),
 						protocol: 'http',
 						auth: {
@@ -479,7 +572,7 @@ async function parseRequestObject(requestObject: IDataObject) {
 				}
 			}
 		} else {
-			axiosConfig.proxy = requestObject.proxy as AxiosProxyConfig;
+			axiosConfig.proxy = requestObject.proxy;
 		}
 	}
 
@@ -578,52 +671,114 @@ function digestAuthAxiosConfig(
 	return axiosConfig;
 }
 
-type ConfigObject = {
-	auth?: { sendImmediately: boolean };
-	resolveWithFullResponse?: boolean;
-	simple?: boolean;
-};
+interface IContentType {
+	type: string;
+	parameters: {
+		charset: string;
+		[key: string]: string;
+	};
+}
 
-export async function proxyRequestToAxios(
-	workflow: Workflow,
-	additionalData: IWorkflowExecuteAdditionalData,
-	node: INode,
-	uriOrObject: string | IDataObject,
-	options?: IDataObject,
-): Promise<any> {
-	// Check if there's a better way of getting this config here
-	if (process.env.N8N_USE_DEPRECATED_REQUEST_LIB) {
-		return requestPromiseWithDefaults.call(
-			null,
-			uriOrObject as unknown as RequiredUriUrl & RequestPromiseOptions,
-			options as unknown as RequestCallback,
-		);
+interface IContentDisposition {
+	type: string;
+	filename?: string;
+}
+
+function parseHeaderParameters(parameters: string[]): Record<string, string> {
+	return parameters.reduce(
+		(acc, param) => {
+			const [key, value] = param.split('=');
+			acc[key.toLowerCase().trim()] = decodeURIComponent(value);
+			return acc;
+		},
+		{} as Record<string, string>,
+	);
+}
+
+function parseContentType(contentType?: string): IContentType | null {
+	if (!contentType) {
+		return null;
+	}
+
+	const [type, ...parameters] = contentType.split(';');
+
+	return {
+		type: type.toLowerCase(),
+		parameters: { charset: 'utf-8', ...parseHeaderParameters(parameters) },
+	};
+}
+
+function parseFileName(filename?: string): string | undefined {
+	if (filename?.startsWith('"') && filename?.endsWith('"')) {
+		return filename.slice(1, -1);
+	}
+
+	return filename;
+}
+
+// https://datatracker.ietf.org/doc/html/rfc5987
+function parseFileNameStar(filename?: string): string | undefined {
+	const [_encoding, _locale, content] = parseFileName(filename)?.split("'") ?? [];
+
+	return content;
+}
+
+function parseContentDisposition(contentDisposition?: string): IContentDisposition | null {
+	if (!contentDisposition) {
+		return null;
+	}
+
+	// This is invalid syntax, but common
+	// Example 'filename="example.png"' (instead of 'attachment; filename="example.png"')
+	if (!contentDisposition.startsWith('attachment') && !contentDisposition.startsWith('inline')) {
+		contentDisposition = `attachment; ${contentDisposition}`;
+	}
+
+	const [type, ...parameters] = contentDisposition.split(';');
+
+	const parsedParameters = parseHeaderParameters(parameters);
+
+	return {
+		type,
+		filename:
+			parseFileNameStar(parsedParameters['filename*']) ?? parseFileName(parsedParameters.filename),
+	};
+}
+
+export function parseIncomingMessage(message: IncomingMessage) {
+	const contentType = parseContentType(message.headers['content-type']);
+	if (contentType) {
+		const { type, parameters } = contentType;
+		message.contentType = type;
+		message.encoding = parameters.charset.toLowerCase() as BufferEncoding;
+	}
+
+	const contentDisposition = parseContentDisposition(message.headers['content-disposition']);
+	if (contentDisposition) {
+		message.contentDisposition = contentDisposition;
 	}
+}
 
+export async function proxyRequestToAxios(
+	workflow: Workflow | undefined,
+	additionalData: IWorkflowExecuteAdditionalData | undefined,
+	node: INode | undefined,
+	uriOrObject: string | IRequestOptions,
+	options?: IRequestOptions,
+): Promise<any> {
 	let axiosConfig: AxiosRequestConfig = {
 		maxBodyLength: Infinity,
 		maxContentLength: Infinity,
 	};
-	let configObject: ConfigObject;
-	if (uriOrObject !== undefined && typeof uriOrObject === 'string') {
-		axiosConfig.url = uriOrObject;
-	}
-	if (uriOrObject !== undefined && typeof uriOrObject === 'object') {
-		configObject = uriOrObject;
+	let configObject: IRequestOptions;
+	if (typeof uriOrObject === 'string') {
+		configObject = { uri: uriOrObject, ...options };
 	} else {
-		configObject = options || {};
+		configObject = uriOrObject ?? {};
 	}
 
 	axiosConfig = Object.assign(axiosConfig, await parseRequestObject(configObject));
 
-	Logger.debug(
-		'Proxying request to axios',
-		// {
-		// 	originalConfig: configObject,
-		// 	parsedConfig: axiosConfig,
-		// }
-	);
-
 	let requestFn: () => AxiosPromise;
 	if (configObject.auth?.sendImmediately === false) {
 		// for digest-auth
@@ -642,40 +797,27 @@ export async function proxyRequestToAxios(
 			}
 		};
 	} else {
-		requestFn = async () => axios(axiosConfig);
+		requestFn = async () => await axios(axiosConfig);
 	}
 
 	try {
 		const response = await requestFn();
-		if (configObject.resolveWithFullResponse === true) {
-			let body = response.data;
-			if (response.data === '') {
-				if (axiosConfig.responseType === 'arraybuffer') {
-					body = Buffer.alloc(0);
-				} else {
-					body = undefined;
-				}
-			}
-			await additionalData.hooks?.executeHookFunctions('nodeFetchedData', [workflow.id, node]);
-			return {
-				body,
-				headers: response.headers,
-				statusCode: response.status,
-				statusMessage: response.statusText,
-				request: response.request,
-			};
-		} else {
-			let body = response.data;
-			if (response.data === '') {
-				if (axiosConfig.responseType === 'arraybuffer') {
-					body = Buffer.alloc(0);
-				} else {
-					body = undefined;
-				}
-			}
-			await additionalData.hooks?.executeHookFunctions('nodeFetchedData', [workflow.id, node]);
-			return body;
+		let body = response.data;
+		if (body instanceof IncomingMessage && axiosConfig.responseType === 'stream') {
+			parseIncomingMessage(body);
+		} else if (body === '') {
+			body = axiosConfig.responseType === 'arraybuffer' ? Buffer.alloc(0) : undefined;
 		}
+		await additionalData?.hooks?.executeHookFunctions('nodeFetchedData', [workflow?.id, node]);
+		return configObject.resolveWithFullResponse
+			? {
+					body,
+					headers: { ...response.headers },
+					statusCode: response.status,
+					statusMessage: response.statusText,
+					request: response.request,
+				}
+			: body;
 	} catch (error) {
 		const { config, response } = error;
 
@@ -683,14 +825,16 @@ export async function proxyRequestToAxios(
 		// https://github.com/axios/axios/blob/master/lib/core/enhanceError.js
 		// Note: `code` is ignored as it's an expected part of the errorData.
 		if (error.isAxiosError) {
+			error.config = error.request = undefined;
+			error.options = pick(config ?? {}, ['url', 'method', 'data', 'headers']);
 			if (response) {
 				Logger.debug('Request proxied to Axios failed', { status: response.status });
 				let responseData = response.data;
 
 				if (Buffer.isBuffer(responseData) || responseData instanceof Readable) {
-					responseData = await binaryToBuffer(responseData).then((buffer) =>
-						buffer.toString('utf-8'),
-					);
+					responseData = await Container.get(BinaryDataService)
+						.toBuffer(responseData)
+						.then((buffer) => buffer.toString('utf-8'));
 				}
 
 				if (configObject.simple === false) {
@@ -706,20 +850,19 @@ export async function proxyRequestToAxios(
 					}
 				}
 
-				const message = `${response.status as number} - ${JSON.stringify(responseData)}`;
+				error.message = `${response.status as number} - ${JSON.stringify(responseData)}`;
 				throw Object.assign(error, {
-					message,
 					statusCode: response.status,
-					options: pick(config ?? {}, ['url', 'method', 'data', 'headers']),
+					/**
+					 * Axios adds `status` when serializing, causing `status` to be available only to the client.
+					 * Hence we add it explicitly to allow the backend to use it when resolving expressions.
+					 */
+					status: response.status,
 					error: responseData,
-					config: undefined,
-					request: undefined,
 					response: pick(response, ['headers', 'status', 'statusText']),
 				});
-			} else {
-				throw Object.assign(error, {
-					options: pick(config ?? {}, ['url', 'method', 'data', 'headers']),
-				});
+			} else if ('rejectUnauthorized' in configObject && error.code?.includes('CERT')) {
+				throw new NodeSslError(error);
 			}
 		}
 
@@ -727,21 +870,20 @@ export async function proxyRequestToAxios(
 	}
 }
 
-function isIterator(obj: unknown): boolean {
-	return obj instanceof Object && Symbol.iterator in obj;
-}
-
+// eslint-disable-next-line complexity
 function convertN8nRequestToAxios(n8nRequest: IHttpRequestOptions): AxiosRequestConfig {
 	// Destructure properties with the same name first.
 	const { headers, method, timeout, auth, proxy, url } = n8nRequest;
 
-	const axiosRequest = {
+	const axiosRequest: AxiosRequestConfig = {
 		headers: headers ?? {},
 		method,
 		timeout,
 		auth,
 		proxy,
 		url,
+		maxBodyLength: Infinity,
+		maxContentLength: Infinity,
 	} as AxiosRequestConfig;
 
 	axiosRequest.params = n8nRequest.qs;
@@ -758,11 +900,17 @@ function convertN8nRequestToAxios(n8nRequest: IHttpRequestOptions): AxiosRequest
 		axiosRequest.responseType = n8nRequest.encoding;
 	}
 
+	const host = getHostFromRequestObject(n8nRequest);
+	const agentOptions: AgentOptions = {};
+	if (host) {
+		agentOptions.servername = host;
+	}
 	if (n8nRequest.skipSslCertificateValidation === true) {
-		axiosRequest.httpsAgent = new Agent({
-			rejectUnauthorized: false,
-		});
+		agentOptions.rejectUnauthorized = false;
 	}
+	axiosRequest.httpsAgent = new Agent(agentOptions);
+
+	axiosRequest.beforeRedirect = getBeforeRedirectFn(agentOptions, axiosRequest);
 
 	if (n8nRequest.arrayFormat !== undefined) {
 		axiosRequest.paramsSerializer = (params) => {
@@ -773,7 +921,7 @@ function convertN8nRequestToAxios(n8nRequest: IHttpRequestOptions): AxiosRequest
 	const { body } = n8nRequest;
 	if (body) {
 		// Let's add some useful header standards here.
-		const existingContentTypeHeaderKey = searchForHeader(axiosRequest.headers, 'content-type');
+		const existingContentTypeHeaderKey = searchForHeader(axiosRequest, 'content-type');
 		if (existingContentTypeHeaderKey === undefined) {
 			axiosRequest.headers = axiosRequest.headers || {};
 			// We are only setting content type headers if the user did
@@ -787,32 +935,38 @@ function convertN8nRequestToAxios(n8nRequest: IHttpRequestOptions): AxiosRequest
 				axiosRequest.headers['Content-Type'] = 'application/x-www-form-urlencoded';
 			}
 		} else if (
-			axiosRequest.headers[existingContentTypeHeaderKey] === 'application/x-www-form-urlencoded'
+			axiosRequest.headers?.[existingContentTypeHeaderKey] === 'application/x-www-form-urlencoded'
 		) {
 			axiosRequest.data = new URLSearchParams(n8nRequest.body as Record<string, string>);
 		}
 		// if there is a body and it's empty (does not have properties),
 		// make sure not to send anything in it as some services fail when
 		// sending GET request with empty body.
-		if (isIterator(body) || Object.keys(body).length > 0) {
+		if (typeof body === 'string' || (typeof body === 'object' && !isObjectEmpty(body))) {
 			axiosRequest.data = body;
 		}
 	}
 
 	if (n8nRequest.json) {
-		const key = searchForHeader(axiosRequest.headers, 'accept');
+		const key = searchForHeader(axiosRequest, 'accept');
 		// If key exists, then the user has set both accept
 		// header and the json flag. Header should take precedence.
 		if (!key) {
-			axiosRequest.headers.Accept = 'application/json';
+			axiosRequest.headers = {
+				...axiosRequest.headers,
+				Accept: 'application/json',
+			};
 		}
 	}
 
-	const userAgentHeader = searchForHeader(axiosRequest.headers, 'user-agent');
+	const userAgentHeader = searchForHeader(axiosRequest, 'user-agent');
 	// If key exists, then the user has set both accept
 	// header and the json flag. Header should take precedence.
 	if (!userAgentHeader) {
-		axiosRequest.headers['User-Agent'] = 'n8n';
+		axiosRequest.headers = {
+			...axiosRequest.headers,
+			'User-Agent': 'n8n',
+		};
 	}
 
 	if (n8nRequest.ignoreHttpStatusErrors) {
@@ -822,9 +976,21 @@ function convertN8nRequestToAxios(n8nRequest: IHttpRequestOptions): AxiosRequest
 	return axiosRequest;
 }
 
+const NoBodyHttpMethods = ['GET', 'HEAD', 'OPTIONS'];
+
+/** Remove empty request body on GET, HEAD, and OPTIONS requests */
+export const removeEmptyBody = (requestOptions: IHttpRequestOptions | IRequestOptions) => {
+	const method = requestOptions.method || 'GET';
+	if (NoBodyHttpMethods.includes(method) && isEmpty(requestOptions.body)) {
+		delete requestOptions.body;
+	}
+};
+
 async function httpRequest(
 	requestOptions: IHttpRequestOptions,
 ): Promise<IN8nHttpFullResponse | IN8nHttpResponse> {
+	removeEmptyBody(requestOptions);
+
 	let axiosRequest = convertN8nRequestToAxios(requestOptions);
 	if (
 		axiosRequest.data === undefined ||
@@ -832,6 +998,7 @@ async function httpRequest(
 	) {
 		delete axiosRequest.data;
 	}
+
 	let result: AxiosResponse<any>;
 	try {
 		result = await axios(axiosRequest);
@@ -862,18 +1029,22 @@ async function httpRequest(
 	return result.data;
 }
 
+export function getBinaryPath(binaryDataId: string): string {
+	return Container.get(BinaryDataService).getPath(binaryDataId);
+}
+
 /**
  * Returns binary file metadata
  */
-export async function getBinaryMetadata(binaryDataId: string): Promise<BinaryMetadata> {
-	return BinaryDataManager.getInstance().getBinaryMetadata(binaryDataId);
+export async function getBinaryMetadata(binaryDataId: string): Promise<BinaryData.Metadata> {
+	return await Container.get(BinaryDataService).getMetadata(binaryDataId);
 }
 
 /**
  * Returns binary file stream for piping
  */
-export function getBinaryStream(binaryDataId: string, chunkSize?: number): Readable {
-	return BinaryDataManager.getInstance().getBinaryStream(binaryDataId, chunkSize);
+export async function getBinaryStream(binaryDataId: string, chunkSize?: number): Promise<Readable> {
+	return await Container.get(BinaryDataService).getAsStream(binaryDataId, chunkSize);
 }
 
 export function assertBinaryData(
@@ -883,18 +1054,29 @@ export function assertBinaryData(
 	propertyName: string,
 	inputIndex: number,
 ): IBinaryData {
-	const binaryKeyData = inputData.main[inputIndex]![itemIndex]!.binary;
+	const binaryKeyData = inputData.main[inputIndex]![itemIndex].binary;
 	if (binaryKeyData === undefined) {
-		throw new NodeOperationError(node, 'No binary data exists on item!', {
-			itemIndex,
-		});
+		throw new NodeOperationError(
+			node,
+			`This operation expects the node's input data to contain a binary file '${propertyName}', but none was found [item ${itemIndex}]`,
+			{
+				itemIndex,
+				description: 'Make sure that the previous node outputs a binary file',
+			},
+		);
 	}
 
 	const binaryPropertyData = binaryKeyData[propertyName];
 	if (binaryPropertyData === undefined) {
-		throw new NodeOperationError(node, `Item has no binary property called "${propertyName}"`, {
-			itemIndex,
-		});
+		throw new NodeOperationError(
+			node,
+			`The item has no binary field '${propertyName}' [item ${itemIndex}]`,
+			{
+				itemIndex,
+				description:
+					'Check that the parameter where you specified the input binary field name is correct, and that it matches a field in the binary input',
+			},
+		);
 	}
 
 	return binaryPropertyData;
@@ -909,27 +1091,34 @@ export async function getBinaryDataBuffer(
 	propertyName: string,
 	inputIndex: number,
 ): Promise<Buffer> {
-	const binaryData = inputData.main[inputIndex]![itemIndex]!.binary![propertyName]!;
-	return BinaryDataManager.getInstance().retrieveBinaryData(binaryData);
+	const binaryData = inputData.main[inputIndex]![itemIndex].binary![propertyName];
+	return await Container.get(BinaryDataService).getAsBuffer(binaryData);
 }
 
 /**
  * Store an incoming IBinaryData & related buffer using the configured binary data manager.
  *
  * @export
- * @param {IBinaryData} data
- * @param {Buffer | Readable} binaryData
+ * @param {IBinaryData} binaryData
+ * @param {Buffer | Readable} bufferOrStream
  * @returns {Promise<IBinaryData>}
  */
 export async function setBinaryDataBuffer(
-	data: IBinaryData,
-	binaryData: Buffer | Readable,
+	binaryData: IBinaryData,
+	bufferOrStream: Buffer | Readable,
+	workflowId: string,
 	executionId: string,
 ): Promise<IBinaryData> {
-	return BinaryDataManager.getInstance().storeBinaryData(data, binaryData, executionId);
+	return await Container.get(BinaryDataService).store(
+		workflowId,
+		executionId,
+		bufferOrStream,
+		binaryData,
+	);
 }
 
 export async function copyBinaryFile(
+	workflowId: string,
 	executionId: string,
 	filePath: string,
 	fileName: string,
@@ -979,20 +1168,41 @@ export async function copyBinaryFile(
 		returnData.fileName = path.parse(filePath).base;
 	}
 
-	return BinaryDataManager.getInstance().copyBinaryFile(returnData, filePath, executionId);
+	return await Container.get(BinaryDataService).copyBinaryFile(
+		workflowId,
+		executionId,
+		returnData,
+		filePath,
+	);
 }
 
 /**
  * Takes a buffer and converts it into the format n8n uses. It encodes the binary data as
  * base64 and adds metadata.
  */
+// eslint-disable-next-line complexity
 async function prepareBinaryData(
 	binaryData: Buffer | Readable,
 	executionId: string,
+	workflowId: string,
 	filePath?: string,
 	mimeType?: string,
 ): Promise<IBinaryData> {
 	let fileExtension: string | undefined;
+	if (binaryData instanceof IncomingMessage) {
+		if (!filePath) {
+			try {
+				const { responseUrl } = binaryData;
+				filePath =
+					binaryData.contentDisposition?.filename ??
+					((responseUrl && new URL(responseUrl).pathname) ?? binaryData.req?.path)?.slice(1);
+			} catch {}
+		}
+		if (!mimeType) {
+			mimeType = binaryData.contentType;
+		}
+	}
+
 	if (!mimeType) {
 		// If no mime type is given figure it out
 
@@ -1056,91 +1266,121 @@ async function prepareBinaryData(
 		}
 	}
 
-	return setBinaryDataBuffer(returnData, binaryData, executionId);
+	return await setBinaryDataBuffer(returnData, binaryData, workflowId, executionId);
+}
+
+function applyPaginationRequestData(
+	requestData: IRequestOptions,
+	paginationRequestData: PaginationOptions['request'],
+): IRequestOptions {
+	const preparedPaginationData: Partial<IRequestOptions> = {
+		...paginationRequestData,
+		uri: paginationRequestData.url,
+	};
+
+	if ('formData' in requestData) {
+		preparedPaginationData.formData = paginationRequestData.body;
+		delete preparedPaginationData.body;
+	} else if ('form' in requestData) {
+		preparedPaginationData.form = paginationRequestData.body;
+		delete preparedPaginationData.body;
+	}
+
+	return merge({}, requestData, preparedPaginationData);
 }
 
 /**
  * Makes a request using OAuth data for authentication
  *
- * @param {(OptionsWithUri | requestPromise.RequestPromiseOptions)} requestOptions
+ * @param {(IHttpRequestOptions | IRequestOptions)} requestOptions
  *
  */
 export async function requestOAuth2(
 	this: IAllExecuteFunctions,
 	credentialsType: string,
-	requestOptions: OptionsWithUri | requestPromise.RequestPromiseOptions | IHttpRequestOptions,
+	requestOptions: IHttpRequestOptions | IRequestOptions,
 	node: INode,
 	additionalData: IWorkflowExecuteAdditionalData,
 	oAuth2Options?: IOAuth2Options,
 	isN8nRequest = false,
 ) {
-	const credentials = await this.getCredentials(credentialsType);
+	removeEmptyBody(requestOptions);
+
+	const credentials = (await this.getCredentials(
+		credentialsType,
+	)) as unknown as OAuth2CredentialData;
 
 	// Only the OAuth2 with authorization code grant needs connection
-	if (
-		credentials.grantType === OAuth2GrantType.authorizationCode &&
-		credentials.oauthTokenData === undefined
-	) {
-		throw new Error('OAuth credentials not connected!');
+	if (credentials.grantType === 'authorizationCode' && credentials.oauthTokenData === undefined) {
+		throw new ApplicationError('OAuth credentials not connected');
 	}
 
-	const oAuthClient = new clientOAuth2({
-		clientId: credentials.clientId as string,
-		clientSecret: credentials.clientSecret as string,
-		accessTokenUri: credentials.accessTokenUrl as string,
+	const oAuthClient = new ClientOAuth2({
+		clientId: credentials.clientId,
+		clientSecret: credentials.clientSecret,
+		accessTokenUri: credentials.accessTokenUrl,
 		scopes: (credentials.scope as string).split(' '),
+		ignoreSSLIssues: credentials.ignoreSSLIssues,
+		authentication: credentials.authentication ?? 'header',
 	});
 
-	let oauthTokenData = credentials.oauthTokenData as clientOAuth2.Data;
-
+	let oauthTokenData = credentials.oauthTokenData as ClientOAuth2TokenData;
 	// if it's the first time using the credentials, get the access token and save it into the DB.
 	if (
-		credentials.grantType === OAuth2GrantType.clientCredentials &&
+		credentials.grantType === 'clientCredentials' &&
 		(oauthTokenData === undefined || Object.keys(oauthTokenData).length === 0)
 	) {
-		const { data } = await getClientCredentialsToken(oAuthClient, credentials);
-
+		const { data } = await oAuthClient.credentials.getToken();
 		// Find the credentials
 		if (!node.credentials?.[credentialsType]) {
-			throw new Error(
-				`The node "${node.name}" does not have credentials of type "${credentialsType}"!`,
-			);
+			throw new ApplicationError('Node does not have credential type', {
+				extra: { nodeName: node.name },
+				tags: { credentialType: credentialsType },
+			});
 		}
 
 		const nodeCredentials = node.credentials[credentialsType];
+		credentials.oauthTokenData = data;
 
 		// Save the refreshed token
 		await additionalData.credentialsHelper.updateCredentials(
 			nodeCredentials,
 			credentialsType,
-			Object.assign(credentials, { oauthTokenData: data }),
+			credentials as unknown as ICredentialDataDecryptedObject,
 		);
 
 		oauthTokenData = data;
 	}
 
+	const accessToken =
+		get(oauthTokenData, oAuth2Options?.property as string) || oauthTokenData.accessToken;
+	const refreshToken = oauthTokenData.refreshToken;
 	const token = oAuthClient.createToken(
-		get(oauthTokenData, oAuth2Options?.property as string) || oauthTokenData.accessToken,
-		oauthTokenData.refreshToken,
+		{
+			...oauthTokenData,
+			...(accessToken ? { access_token: accessToken } : {}),
+			...(refreshToken ? { refresh_token: refreshToken } : {}),
+		},
 		oAuth2Options?.tokenType || oauthTokenData.tokenType,
-		oauthTokenData,
 	);
+
+	(requestOptions as IRequestOptions).rejectUnauthorized = !credentials.ignoreSSLIssues;
+
 	// Signs the request by adding authorization headers or query parameters depending
 	// on the token-type used.
-	const newRequestOptions = token.sign(requestOptions as clientOAuth2.RequestObject);
+	const newRequestOptions = token.sign(requestOptions as ClientOAuth2RequestObject);
 	const newRequestHeaders = (newRequestOptions.headers = newRequestOptions.headers ?? {});
 	// If keep bearer is false remove the it from the authorization header
 	if (oAuth2Options?.keepBearer === false && typeof newRequestHeaders.Authorization === 'string') {
 		newRequestHeaders.Authorization = newRequestHeaders.Authorization.split(' ')[1];
 	}
-
 	if (oAuth2Options?.keyToIncludeInAccessTokenHeader) {
 		Object.assign(newRequestHeaders, {
 			[oAuth2Options.keyToIncludeInAccessTokenHeader]: token.accessToken,
 		});
 	}
 	if (isN8nRequest) {
-		return this.helpers.httpRequest(newRequestOptions).catch(async (error: AxiosError) => {
+		return await this.helpers.httpRequest(newRequestOptions).catch(async (error: AxiosError) => {
 			if (error.response?.status === 401) {
 				Logger.debug(
 					`OAuth2 token for "${credentialsType}" used by node "${node.name}" expired. Should revalidate.`,
@@ -1148,8 +1388,10 @@ export async function requestOAuth2(
 				const tokenRefreshOptions: IDataObject = {};
 				if (oAuth2Options?.includeCredentialsOnRefreshOnBody) {
 					const body: IDataObject = {
-						client_id: credentials.clientId as string,
-						client_secret: credentials.clientSecret as string,
+						client_id: credentials.clientId,
+						...(credentials.grantType === 'authorizationCode' && {
+							client_secret: credentials.clientSecret as string,
+						}),
 					};
 					tokenRefreshOptions.body = body;
 					tokenRefreshOptions.headers = {
@@ -1164,10 +1406,10 @@ export async function requestOAuth2(
 				);
 				// if it's OAuth2 with client credentials grant type, get a new token
 				// instead of refreshing it.
-				if (OAuth2GrantType.clientCredentials === credentials.grantType) {
-					newToken = await getClientCredentialsToken(token.client, credentials);
+				if (credentials.grantType === 'clientCredentials') {
+					newToken = await token.client.credentials.getToken();
 				} else {
-					newToken = await token.refresh(tokenRefreshOptions);
+					newToken = await token.refresh(tokenRefreshOptions as unknown as ClientOAuth2Options);
 				}
 
 				Logger.debug(
@@ -1177,17 +1419,17 @@ export async function requestOAuth2(
 				credentials.oauthTokenData = newToken.data;
 				// Find the credentials
 				if (!node.credentials?.[credentialsType]) {
-					throw new Error(
-						`The node "${node.name}" does not have credentials of type "${credentialsType}"!`,
-					);
+					throw new ApplicationError('Node does not have credential type', {
+						extra: { nodeName: node.name, credentialType: credentialsType },
+					});
 				}
 				const nodeCredentials = node.credentials[credentialsType];
 				await additionalData.credentialsHelper.updateCredentials(
 					nodeCredentials,
 					credentialsType,
-					credentials,
+					credentials as unknown as ICredentialDataDecryptedObject,
 				);
-				const refreshedRequestOption = newToken.sign(requestOptions as clientOAuth2.RequestObject);
+				const refreshedRequestOption = newToken.sign(requestOptions as ClientOAuth2RequestObject);
 
 				if (oAuth2Options?.keyToIncludeInAccessTokenHeader) {
 					Object.assign(newRequestHeaders, {
@@ -1195,33 +1437,31 @@ export async function requestOAuth2(
 					});
 				}
 
-				return this.helpers.httpRequest(refreshedRequestOption);
+				return await this.helpers.httpRequest(refreshedRequestOption);
 			}
 			throw error;
 		});
 	}
-	return this.helpers
-		.request(newRequestOptions)
+	const tokenExpiredStatusCode =
+		oAuth2Options?.tokenExpiredStatusCode === undefined
+			? 401
+			: oAuth2Options?.tokenExpiredStatusCode;
+
+	return await this.helpers
+		.request(newRequestOptions as IRequestOptions)
 		.then((response) => {
 			const requestOptions = newRequestOptions as any;
 			if (
 				requestOptions.resolveWithFullResponse === true &&
 				requestOptions.simple === false &&
-				response.statusCode ===
-					(oAuth2Options?.tokenExpiredStatusCode === undefined
-						? 401
-						: oAuth2Options?.tokenExpiredStatusCode)
+				response.statusCode === tokenExpiredStatusCode
 			) {
 				throw response;
 			}
 			return response;
 		})
 		.catch(async (error: IResponseError) => {
-			const statusCodeReturned =
-				oAuth2Options?.tokenExpiredStatusCode === undefined
-					? 401
-					: oAuth2Options?.tokenExpiredStatusCode;
-			if (error.statusCode === statusCodeReturned) {
+			if (error.statusCode === tokenExpiredStatusCode) {
 				// Token is probably not valid anymore. So try refresh it.
 				const tokenRefreshOptions: IDataObject = {};
 				if (oAuth2Options?.includeCredentialsOnRefreshOnBody) {
@@ -1243,10 +1483,10 @@ export async function requestOAuth2(
 
 				// if it's OAuth2 with client credentials grant type, get a new token
 				// instead of refreshing it.
-				if (OAuth2GrantType.clientCredentials === credentials.grantType) {
-					newToken = await getClientCredentialsToken(token.client, credentials);
+				if (credentials.grantType === 'clientCredentials') {
+					newToken = await token.client.credentials.getToken();
 				} else {
-					newToken = await token.refresh(tokenRefreshOptions);
+					newToken = await token.refresh(tokenRefreshOptions as unknown as ClientOAuth2Options);
 				}
 				Logger.debug(
 					`OAuth2 token for "${credentialsType}" used by node "${node.name}" has been renewed.`,
@@ -1256,9 +1496,10 @@ export async function requestOAuth2(
 
 				// Find the credentials
 				if (!node.credentials?.[credentialsType]) {
-					throw new Error(
-						`The node "${node.name}" does not have credentials of type "${credentialsType}"!`,
-					);
+					throw new ApplicationError('Node does not have credential type', {
+						tags: { credentialType: credentialsType },
+						extra: { nodeName: node.name },
+					});
 				}
 				const nodeCredentials = node.credentials[credentialsType];
 
@@ -1274,7 +1515,7 @@ export async function requestOAuth2(
 				);
 
 				// Make the request again with the new token
-				const newRequestOptions = newToken.sign(requestOptions as clientOAuth2.RequestObject);
+				const newRequestOptions = newToken.sign(requestOptions as ClientOAuth2RequestObject);
 				newRequestOptions.headers = newRequestOptions.headers ?? {};
 
 				if (oAuth2Options?.keyToIncludeInAccessTokenHeader) {
@@ -1283,7 +1524,7 @@ export async function requestOAuth2(
 					});
 				}
 
-				return this.helpers.request(newRequestOptions);
+				return await this.helpers.request(newRequestOptions as IRequestOptions);
 			}
 
 			// Unknown error so simply throw it
@@ -1297,21 +1538,19 @@ export async function requestOAuth2(
 export async function requestOAuth1(
 	this: IAllExecuteFunctions,
 	credentialsType: string,
-	requestOptions:
-		| OptionsWithUrl
-		| OptionsWithUri
-		| requestPromise.RequestPromiseOptions
-		| IHttpRequestOptions,
+	requestOptions: IHttpRequestOptions | IRequestOptions,
 	isN8nRequest = false,
 ) {
+	removeEmptyBody(requestOptions);
+
 	const credentials = await this.getCredentials(credentialsType);
 
 	if (credentials === undefined) {
-		throw new Error('No credentials were returned!');
+		throw new ApplicationError('No credentials were returned!');
 	}
 
 	if (credentials.oauthTokenData === undefined) {
-		throw new Error('OAuth credentials not connected!');
+		throw new ApplicationError('OAuth credentials not connected!');
 	}
 
 	const oauth = new clientOAuth1({
@@ -1321,7 +1560,18 @@ export async function requestOAuth1(
 		},
 		signature_method: credentials.signatureMethod as string,
 		hash_function(base, key) {
-			const algorithm = credentials.signatureMethod === 'HMAC-SHA1' ? 'sha1' : 'sha256';
+			let algorithm: string;
+			switch (credentials.signatureMethod) {
+				case 'HMAC-SHA256':
+					algorithm = 'sha256';
+					break;
+				case 'HMAC-SHA512':
+					algorithm = 'sha512';
+					break;
+				default:
+					algorithm = 'sha1';
+					break;
+			}
 			return createHmac(algorithm, key).update(base).digest('base64');
 		},
 	});
@@ -1337,25 +1587,24 @@ export async function requestOAuth1(
 	requestOptions.data = { ...requestOptions.qs, ...requestOptions.form };
 
 	// Fixes issue that OAuth1 library only works with "url" property and not with "uri"
-	// @ts-expect-error @TECH_DEBT: Remove request library
-	if (requestOptions.uri && !requestOptions.url) {
-		// @ts-expect-error @TECH_DEBT: Remove request library
+	if ('uri' in requestOptions && !requestOptions.url) {
 		requestOptions.url = requestOptions.uri;
-		// @ts-expect-error @TECH_DEBT: Remove request library
 		delete requestOptions.uri;
 	}
 
 	requestOptions.headers = oauth.toHeader(
 		oauth.authorize(requestOptions as unknown as clientOAuth1.RequestOptions, token),
-	);
+	) as unknown as Record<string, string>;
 	if (isN8nRequest) {
-		return this.helpers.httpRequest(requestOptions as IHttpRequestOptions);
+		return await this.helpers.httpRequest(requestOptions as IHttpRequestOptions);
 	}
 
-	return this.helpers.request(requestOptions).catch(async (error: IResponseError) => {
-		// Unknown error so simply throw it
-		throw error;
-	});
+	return await this.helpers
+		.request(requestOptions as IRequestOptions)
+		.catch(async (error: IResponseError) => {
+			// Unknown error so simply throw it
+			throw error;
+		});
 }
 
 export async function httpRequestWithAuthentication(
@@ -1367,9 +1616,12 @@ export async function httpRequestWithAuthentication(
 	additionalData: IWorkflowExecuteAdditionalData,
 	additionalCredentialOptions?: IAdditionalCredentialOptions,
 ) {
+	removeEmptyBody(requestOptions);
+
 	let credentialsDecrypted: ICredentialDataDecryptedObject | undefined;
 	try {
 		const parentTypes = additionalData.credentialsHelper.getParentTypes(credentialsType);
+
 		if (parentTypes.includes('oAuth1Api')) {
 			return await requestOAuth1.call(this, credentialsType, requestOptions, true);
 		}
@@ -1395,6 +1647,7 @@ export async function httpRequestWithAuthentication(
 			throw new NodeOperationError(
 				node,
 				`Node "${node.name}" does not have any credentials of type "${credentialsType}" set!`,
+				{ level: 'warning' },
 			);
 		}
 
@@ -1418,7 +1671,6 @@ export async function httpRequestWithAuthentication(
 			requestOptions,
 			workflow,
 			node,
-			additionalData.timezone,
 		);
 		return await httpRequest(requestOptions);
 	} catch (error) {
@@ -1451,7 +1703,6 @@ export async function httpRequestWithAuthentication(
 						requestOptions,
 						workflow,
 						node,
-						additionalData.timezone,
 					);
 				}
 				// retry the request
@@ -1522,7 +1773,7 @@ export function normalizeItems(
 		return executionData;
 
 	if (executionData.some((item) => typeof item === 'object' && 'json' in item)) {
-		throw new Error('Inconsistent item format');
+		throw new ApplicationError('Inconsistent item format');
 	}
 
 	if (executionData.every((item) => typeof item === 'object' && 'binary' in item)) {
@@ -1542,7 +1793,7 @@ export function normalizeItems(
 	}
 
 	if (executionData.some((item) => typeof item === 'object' && 'binary' in item)) {
-		throw new Error('Inconsistent item format');
+		throw new ApplicationError('Inconsistent item format');
 	}
 
 	return executionData.map((item) => {
@@ -1554,21 +1805,24 @@ export function normalizeItems(
 export async function requestWithAuthentication(
 	this: IAllExecuteFunctions,
 	credentialsType: string,
-	requestOptions: OptionsWithUri | requestPromise.RequestPromiseOptions,
+	requestOptions: IRequestOptions,
 	workflow: Workflow,
 	node: INode,
 	additionalData: IWorkflowExecuteAdditionalData,
 	additionalCredentialOptions?: IAdditionalCredentialOptions,
+	itemIndex?: number,
 ) {
+	removeEmptyBody(requestOptions);
+
 	let credentialsDecrypted: ICredentialDataDecryptedObject | undefined;
 
 	try {
 		const parentTypes = additionalData.credentialsHelper.getParentTypes(credentialsType);
 
-		if (parentTypes.includes('oAuth1Api')) {
+		if (credentialsType === 'oAuth1Api' || parentTypes.includes('oAuth1Api')) {
 			return await requestOAuth1.call(this, credentialsType, requestOptions, false);
 		}
-		if (parentTypes.includes('oAuth2Api')) {
+		if (credentialsType === 'oAuth2Api' || parentTypes.includes('oAuth2Api')) {
 			return await requestOAuth2.call(
 				this,
 				credentialsType,
@@ -1583,13 +1837,14 @@ export async function requestWithAuthentication(
 		if (additionalCredentialOptions?.credentialsDecrypted) {
 			credentialsDecrypted = additionalCredentialOptions.credentialsDecrypted.data;
 		} else {
-			credentialsDecrypted = await this.getCredentials(credentialsType);
+			credentialsDecrypted = await this.getCredentials(credentialsType, itemIndex);
 		}
 
 		if (credentialsDecrypted === undefined) {
 			throw new NodeOperationError(
 				node,
 				`Node "${node.name}" does not have any credentials of type "${credentialsType}" set!`,
+				{ level: 'warning' },
 			);
 		}
 
@@ -1607,15 +1862,14 @@ export async function requestWithAuthentication(
 			Object.assign(credentialsDecrypted, data);
 		}
 
-		requestOptions = await additionalData.credentialsHelper.authenticate(
+		requestOptions = (await additionalData.credentialsHelper.authenticate(
 			credentialsDecrypted,
 			credentialsType,
 			requestOptions as IHttpRequestOptions,
 			workflow,
 			node,
-			additionalData.timezone,
-		);
-		return await proxyRequestToAxios(workflow, additionalData, node, requestOptions as IDataObject);
+		)) as IRequestOptions;
+		return await proxyRequestToAxios(workflow, additionalData, node, requestOptions);
 	} catch (error) {
 		try {
 			if (credentialsDecrypted !== undefined) {
@@ -1632,25 +1886,21 @@ export async function requestWithAuthentication(
 					// make the updated property in the credentials
 					// available to the authenticate method
 					Object.assign(credentialsDecrypted, data);
-					requestOptions = await additionalData.credentialsHelper.authenticate(
+					requestOptions = (await additionalData.credentialsHelper.authenticate(
 						credentialsDecrypted,
 						credentialsType,
 						requestOptions as IHttpRequestOptions,
 						workflow,
 						node,
-						additionalData.timezone,
-					);
+					)) as IRequestOptions;
 					// retry the request
-					return await proxyRequestToAxios(
-						workflow,
-						additionalData,
-						node,
-						requestOptions as IDataObject,
-					);
+					return await proxyRequestToAxios(workflow, additionalData, node, requestOptions);
 				}
 			}
 			throw error;
 		} catch (error) {
+			if (error instanceof ExecutionBaseError) throw error;
+
 			throw new NodeApiError(this.getNode(), error);
 		}
 	}
@@ -1664,14 +1914,17 @@ 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 {
@@ -1700,10 +1953,11 @@ export function getAdditionalKeys(
 						getAll(): Record<string, string> {
 							return getAllWorkflowExecutionMetadata(runExecutionData);
 						},
-				  }
+					}
 				: undefined,
 		},
 		$vars: additionalData.variables,
+		$secrets: options?.secretsEnabled ? getSecretsProxy(additionalData) : undefined,
 
 		// deprecated
 		$executionId: executionId,
@@ -1724,6 +1978,7 @@ export async function getCredentials(
 	type: string,
 	additionalData: IWorkflowExecuteAdditionalData,
 	mode: WorkflowExecuteMode,
+	executeData?: IExecuteData,
 	runExecutionData?: IRunExecutionData | null,
 	runIndex?: number,
 	connectionInputData?: INodeExecutionData[],
@@ -1740,7 +1995,7 @@ export async function getCredentials(
 
 	// Hardcode for now for security reasons that only a single node can access
 	// all credentials
-	const fullAccess = ['n8n-nodes-base.httpRequest'].includes(node.type);
+	const fullAccess = [HTTP_REQUEST_NODE_TYPE].includes(node.type);
 
 	let nodeCredentialDescription: INodeCredentialDescription | undefined;
 	if (!fullAccess) {
@@ -1748,6 +2003,7 @@ export async function getCredentials(
 			throw new NodeOperationError(
 				node,
 				`Node type "${node.type}" does not have any credentials defined!`,
+				{ level: 'warning' },
 			);
 		}
 
@@ -1758,6 +2014,7 @@ export async function getCredentials(
 			throw new NodeOperationError(
 				node,
 				`Node type "${node.type}" does not have any credentials of type "${type}" defined!`,
+				{ level: 'warning' },
 			);
 		}
 
@@ -1781,10 +2038,16 @@ export async function getCredentials(
 		if (nodeCredentialDescription?.required === true) {
 			// Credentials are required so error
 			if (!node.credentials) {
-				throw new NodeOperationError(node, 'Node does not have any credentials set!');
+				throw new NodeOperationError(node, 'Node does not have any credentials set!', {
+					level: 'warning',
+				});
 			}
 			if (!node.credentials[type]) {
-				throw new NodeOperationError(node, `Node does not have any credentials set for "${type}"!`);
+				throw new NodeOperationError(
+					node,
+					`Node does not have any credentials set for "${type}"!`,
+					{ level: 'warning' },
+				);
 			}
 		} else {
 			// Credentials are not required
@@ -1831,10 +2094,11 @@ export async function getCredentials(
 	// }
 
 	const decryptedDataObject = await additionalData.credentialsHelper.getDecrypted(
+		additionalData,
 		nodeCredentials,
 		type,
 		mode,
-		additionalData.timezone,
+		executeData,
 		false,
 		expressionResolveValues,
 	);
@@ -1846,31 +2110,225 @@ export async function getCredentials(
  * 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
  */
-function cleanupParameterData(inputData: NodeParameterValueType): void {
+export function cleanupParameterData(inputData: NodeParameterValueType): void {
 	if (typeof inputData !== 'object' || inputData === null) {
 		return;
 	}
 
 	if (Array.isArray(inputData)) {
-		inputData.forEach((value) => cleanupParameterData(value));
+		inputData.forEach((value) => cleanupParameterData(value as NodeParameterValueType));
 		return;
 	}
 
 	if (typeof inputData === 'object') {
-		Object.keys(inputData).forEach((key) => {
-			if (typeof inputData[key as keyof typeof inputData] === 'object') {
-				if (inputData[key as keyof typeof inputData]?.constructor.name === 'DateTime') {
+		type Key = keyof typeof inputData;
+		(Object.keys(inputData) as Key[]).forEach((key) => {
+			const value = inputData[key];
+			if (typeof value === 'object') {
+				if (DateTime.isDateTime(value)) {
 					// Is a special luxon date so convert to string
-					inputData[key as keyof typeof inputData] =
-						inputData[key as keyof typeof inputData]?.toString();
+					inputData[key] = value.toString();
 				} else {
-					cleanupParameterData(inputData[key as keyof typeof inputData]);
+					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];
+		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,
+			});
+			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;
+	}
+
+	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,
+					},
+				);
+			}
+			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,
+			},
+		);
+	}
+	return validationResult.newValue;
+};
+
 /**
  * Returns the requested resolved (all expressions replaced) node parameters.
  *
@@ -1885,7 +2343,6 @@ export function getNodeParameter(
 	parameterName: string,
 	itemIndex: number,
 	mode: WorkflowExecuteMode,
-	timezone: string,
 	additionalKeys: IWorkflowDataProxyAdditionalKeys,
 	executeData?: IExecuteData,
 	fallbackValue?: any,
@@ -1893,16 +2350,23 @@ export function getNodeParameter(
 ): NodeParameterValueType | object {
 	const nodeType = workflow.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
 	if (nodeType === undefined) {
-		throw new Error(`Node type "${node.type}" is not known so can not return parameter value!`);
+		throw new ApplicationError('Node type is unknown so cannot return parameter value', {
+			tags: { nodeType: node.type },
+		});
 	}
 
 	const value = get(node.parameters, parameterName, fallbackValue);
 
 	if (value === undefined) {
-		throw new Error(`Could not get parameter "${parameterName}"!`);
+		throw new ApplicationError('Could not get parameter', { extra: { parameterName } });
+	}
+
+	if (options?.rawExpressions) {
+		return value;
 	}
 
 	let returnData;
+
 	try {
 		returnData = workflow.expression.getParameterValue(
 			value,
@@ -1912,13 +2376,16 @@ export function getNodeParameter(
 			node.name,
 			connectionInputData,
 			mode,
-			timezone,
 			additionalKeys,
 			executeData,
+			false,
+			{},
+			options?.contextNode?.name,
 		);
 		cleanupParameterData(returnData);
 	} catch (e) {
-		if (e instanceof ExpressionError && node.continueOnFail && node.name === 'Set') {
+		if (e instanceof ExpressionError && node.continueOnFail && node.type === 'n8n-nodes-base.set') {
+			// https://linear.app/n8n/issue/PAY-684
 			returnData = [{ name: undefined, value: undefined }];
 		} else {
 			if (e.context) e.context.parameter = parameterName;
@@ -1929,9 +2396,19 @@ export function getNodeParameter(
 
 	// This is outside the try/catch because it throws errors with proper messages
 	if (options?.extractValue) {
-		returnData = extractValue(returnData, parameterName, node, nodeType);
+		returnData = extractValue(returnData, parameterName, node, nodeType, itemIndex);
 	}
 
+	// Validate parameter value if it has a schema defined(RMC) or validateType defined
+	returnData = validateValueAgainstSchema(
+		node,
+		nodeType,
+		returnData,
+		parameterName,
+		runIndex,
+		itemIndex,
+	);
+
 	return returnData;
 }
 
@@ -1940,7 +2417,13 @@ export function getNodeParameter(
  *
  */
 export function continueOnFail(node: INode): boolean {
-	return get(node, 'continueOnFail', false);
+	const onError = get(node, 'onError', undefined);
+
+	if (onError === undefined) {
+		return get(node, 'continueOnFail', false);
+	}
+
+	return ['continueRegularOutput', 'continueErrorOutput'].includes(onError);
 }
 
 /**
@@ -1953,7 +2436,6 @@ export function getNodeWebhookUrl(
 	node: INode,
 	additionalData: IWorkflowExecuteAdditionalData,
 	mode: WorkflowExecuteMode,
-	timezone: string,
 	additionalKeys: IWorkflowDataProxyAdditionalKeys,
 	isTest?: boolean,
 ): string | undefined {
@@ -1972,7 +2454,6 @@ export function getNodeWebhookUrl(
 		node,
 		webhookDescription.path,
 		mode,
-		timezone,
 		additionalKeys,
 	);
 	if (path === undefined) {
@@ -1983,27 +2464,18 @@ export function getNodeWebhookUrl(
 		node,
 		webhookDescription.isFullPath,
 		mode,
-		timezone,
 		additionalKeys,
 		undefined,
 		false,
 	) as boolean;
-	return NodeHelpers.getNodeWebhookUrl(baseUrl, workflow.id!, node, path.toString(), isFullPath, true);
+	return NodeHelpers.getNodeWebhookUrl(baseUrl, workflow.id, node, path.toString(), isFullPath);
 }
 
 /**
  * Returns the timezone for the workflow
- *
  */
-export function getTimezone(
-	workflow: Workflow,
-	additionalData: IWorkflowExecuteAdditionalData,
-): string {
-	// eslint-disable-next-line @typescript-eslint/prefer-optional-chain
-	if (workflow.settings !== undefined && workflow.settings.timezone !== undefined) {
-		return (workflow.settings as IWorkflowSettings).timezone as string;
-	}
-	return additionalData.timezone;
+export function getTimezone(workflow: Workflow): string {
+	return workflow.settings.timezone ?? getGlobalState().defaultTimezone;
 }
 
 /**
@@ -2022,7 +2494,6 @@ export function getWebhookDescription(
 		return undefined;
 	}
 
-	// eslint-disable-next-line no-restricted-syntax
 	for (const webhookDescription of nodeType.description.webhooks) {
 		if (webhookDescription.name === name) {
 			return webhookDescription;
@@ -2032,6 +2503,300 @@ export function getWebhookDescription(
 	return undefined;
 }
 
+// TODO: Change options to an object
+const addExecutionDataFunctions = async (
+	type: 'input' | 'output',
+	nodeName: string,
+	data: INodeExecutionData[][] | ExecutionBaseError,
+	runExecutionData: IRunExecutionData,
+	connectionType: ConnectionTypes,
+	additionalData: IWorkflowExecuteAdditionalData,
+	sourceNodeName: string,
+	sourceNodeRunIndex: number,
+	currentNodeRunIndex: number,
+): Promise<void> => {
+	if (connectionType === '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 = 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,
+		});
+	}
+};
+
+async function getInputConnectionData(
+	this: IAllExecuteFunctions,
+	workflow: Workflow,
+	runExecutionData: IRunExecutionData,
+	runIndex: number,
+	connectionInputData: INodeExecutionData[],
+	additionalData: IWorkflowExecuteAdditionalData,
+	executeData: IExecuteData | undefined,
+	mode: WorkflowExecuteMode,
+	closeFunctions: CloseFunction[],
+	inputName: ConnectionTypes,
+	itemIndex: number,
+): 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) {
+		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,
+			);
+
+			if (!nodeType.supplyData) {
+				throw new ApplicationError('Node does not have a `supplyData` method defined', {
+					extra: { nodeName: connectedNode.name },
+				});
+			}
+
+			const context = Object.assign({}, this);
+
+			context.getNodeParameter = (
+				parameterName: string,
+				itemIndex: number,
+				fallbackValue?: any,
+				options?: IGetNodeParameterOptions,
+			) => {
+				return getNodeParameter(
+					workflow,
+					runExecutionData,
+					runIndex,
+					connectionInputData,
+					connectedNode,
+					parameterName,
+					itemIndex,
+					mode,
+					getAdditionalKeys(additionalData, mode, runExecutionData),
+					executeData,
+					fallbackValue,
+					{ ...(options || {}), contextNode: node },
+				) as any;
+			};
+
+			// TODO: Check what else should be overwritten
+			context.getNode = () => {
+				return deepCopy(connectedNode);
+			};
+
+			context.getCredentials = async (key: string) => {
+				try {
+					return await getCredentials(
+						workflow,
+						connectedNode,
+						key,
+						additionalData,
+						mode,
+						executeData,
+						runExecutionData,
+						runIndex,
+						connectionInputData,
+						itemIndex,
+					);
+				} catch (error) {
+					// Display the error on the node which is causing it
+
+					let currentNodeRunIndex = 0;
+					if (runExecutionData.resultData.runData.hasOwnProperty(node.name)) {
+						currentNodeRunIndex = runExecutionData.resultData.runData[node.name].length;
+					}
+
+					await addExecutionDataFunctions(
+						'input',
+						connectedNode.name,
+						error,
+						runExecutionData,
+						inputName,
+						additionalData,
+						node.name,
+						runIndex,
+						currentNodeRunIndex,
+					);
+
+					throw error;
+				}
+			};
+
+			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 ${inputName} processor node must be connected!`);
+	}
+	if (
+		inputConfiguration.maxConnections !== undefined &&
+		nodes.length > inputConfiguration.maxConnections
+	) {
+		throw new NodeOperationError(
+			node,
+			`Only ${inputConfiguration.maxConnections} ${inputName} processor nodes are/is allowed to be connected!`,
+		);
+	}
+
+	return inputConfiguration.maxConnections === 1
+		? (nodes || [])[0]?.response
+		: nodes.map((node) => node.response);
+}
+
 const getCommonWorkflowFunctions = (
 	workflow: Workflow,
 	node: INode,
@@ -2046,79 +2811,431 @@ const getCommonWorkflowFunctions = (
 		active: workflow.active,
 	}),
 	getWorkflowStaticData: (type) => workflow.getStaticData(type, node),
-
+	getChildNodes: (nodeName: string) => {
+		const output: NodeTypeAndVersion[] = [];
+		const nodes = workflow.getChildNodes(nodeName);
+
+		for (const nodeName of nodes) {
+			const node = workflow.nodes[nodeName];
+			output.push({
+				name: node.name,
+				type: node.type,
+				typeVersion: node.typeVersion,
+			});
+		}
+		return output;
+	},
+	getParentNodes: (nodeName: string) => {
+		const output: NodeTypeAndVersion[] = [];
+		const nodes = workflow.getParentNodes(nodeName);
+
+		for (const nodeName of nodes) {
+			const node = workflow.nodes[nodeName];
+			output.push({
+				name: node.name,
+				type: node.type,
+				typeVersion: node.typeVersion,
+			});
+		}
+		return output;
+	},
+	getKnownNodeTypes: () => workflow.nodeTypes.getKnownTypes(),
 	getRestApiUrl: () => additionalData.restApiUrl,
-	getTimezone: () => getTimezone(workflow, additionalData),
+	getInstanceBaseUrl: () => additionalData.instanceBaseUrl,
+	getInstanceId: () => Container.get(InstanceSettings).instanceId,
+	getTimezone: () => getTimezone(workflow),
+
+	prepareOutputData: async (outputData) => [outputData],
+});
+
+const executionCancellationFunctions = (
+	abortSignal?: AbortSignal,
+): Pick<IExecuteFunctions, 'onExecutionCancellation' | 'getExecutionCancelSignal'> => ({
+	getExecutionCancelSignal: () => abortSignal,
+	onExecutionCancellation: (handler) => {
+		const fn = () => {
+			abortSignal?.removeEventListener('abort', fn);
+			handler();
+		};
+		abortSignal?.addEventListener('abort', fn);
+	},
 });
 
 const getRequestHelperFunctions = (
 	workflow: Workflow,
 	node: INode,
 	additionalData: IWorkflowExecuteAdditionalData,
-): RequestHelperFunctions => ({
-	httpRequest,
+): RequestHelperFunctions => {
+	const getResolvedValue = (
+		parameterValue: NodeParameterValueType,
+		itemIndex: number,
+		runIndex: number,
+		executeData: IExecuteData,
+		additionalKeys?: IWorkflowDataProxyAdditionalKeys,
+		returnObjectAsString = false,
+	): NodeParameterValueType => {
+		const runExecutionData: IRunExecutionData | null = null;
+		const connectionInputData: INodeExecutionData[] = [];
+		const mode: WorkflowExecuteMode = 'internal';
 
-	async httpRequestWithAuthentication(
-		this,
-		credentialsType,
-		requestOptions,
-		additionalCredentialOptions,
-	): Promise<any> {
-		return httpRequestWithAuthentication.call(
+		if (
+			typeof parameterValue === 'object' ||
+			(typeof parameterValue === 'string' && parameterValue.charAt(0) === '=')
+		) {
+			return workflow.expression.getParameterValue(
+				parameterValue,
+				runExecutionData,
+				runIndex,
+				itemIndex,
+				node.name,
+				connectionInputData,
+				mode,
+				additionalKeys ?? {},
+				executeData,
+				returnObjectAsString,
+			);
+		}
+
+		return parameterValue;
+	};
+
+	return {
+		httpRequest,
+		// eslint-disable-next-line complexity
+		async requestWithAuthenticationPaginated(
+			this: IExecuteFunctions,
+			requestOptions: IRequestOptions,
+			itemIndex: number,
+			paginationOptions: PaginationOptions,
+			credentialsType?: string,
+			additionalCredentialOptions?: IAdditionalCredentialOptions,
+		): Promise<any[]> {
+			const responseData = [];
+			if (!requestOptions.qs) {
+				requestOptions.qs = {};
+			}
+			requestOptions.resolveWithFullResponse = true;
+			requestOptions.simple = false;
+
+			let tempResponseData: IN8nHttpFullResponse;
+			let makeAdditionalRequest: boolean;
+			let paginateRequestData: PaginationOptions['request'];
+
+			const runIndex = 0;
+
+			const additionalKeys = {
+				$request: requestOptions,
+				$response: {} as IN8nHttpFullResponse,
+				$version: node.typeVersion,
+				$pageCount: 0,
+			};
+
+			const executeData: IExecuteData = {
+				data: {},
+				node,
+				source: null,
+			};
+
+			const hashData = {
+				identicalCount: 0,
+				previousLength: 0,
+				previousHash: '',
+			};
+			do {
+				paginateRequestData = getResolvedValue(
+					paginationOptions.request as unknown as NodeParameterValueType,
+					itemIndex,
+					runIndex,
+					executeData,
+					additionalKeys,
+					false,
+				) as object as PaginationOptions['request'];
+
+				const tempRequestOptions = applyPaginationRequestData(requestOptions, paginateRequestData);
+
+				if (!validateUrl(tempRequestOptions.uri as string)) {
+					throw new NodeOperationError(node, `'${paginateRequestData.url}' is not a valid URL.`, {
+						itemIndex,
+						runIndex,
+						type: 'invalid_url',
+					});
+				}
+
+				if (credentialsType) {
+					tempResponseData = await this.helpers.requestWithAuthentication.call(
+						this,
+						credentialsType,
+						tempRequestOptions,
+						additionalCredentialOptions,
+					);
+				} else {
+					tempResponseData = await this.helpers.request(tempRequestOptions);
+				}
+
+				const newResponse: IN8nHttpFullResponse = Object.assign(
+					{
+						body: {},
+						headers: {},
+						statusCode: 0,
+					},
+					pick(tempResponseData, ['body', 'headers', 'statusCode']),
+				);
+
+				let contentBody: Exclude<IN8nHttpResponse, Buffer>;
+
+				if (newResponse.body instanceof Readable && paginationOptions.binaryResult !== true) {
+					const data = await this.helpers
+						.binaryToBuffer(newResponse.body as Buffer | Readable)
+						.then((body) => body.toString());
+					// Keep the original string version that we can use it to hash if needed
+					contentBody = data;
+
+					const responseContentType = newResponse.headers['content-type']?.toString() ?? '';
+					if (responseContentType.includes('application/json')) {
+						newResponse.body = jsonParse(data, { fallbackValue: {} });
+					} else {
+						newResponse.body = data;
+					}
+					tempResponseData.__bodyResolved = true;
+					tempResponseData.body = newResponse.body;
+				} else {
+					contentBody = newResponse.body;
+				}
+
+				if (paginationOptions.binaryResult !== true || tempResponseData.headers.etag) {
+					// If the data is not binary (and so not a stream), or an etag is present,
+					// we check via etag or hash if identical data is received
+
+					let contentLength = 0;
+					if ('content-length' in tempResponseData.headers) {
+						contentLength = parseInt(tempResponseData.headers['content-length'] as string) || 0;
+					}
+
+					if (hashData.previousLength === contentLength) {
+						let hash: string;
+						if (tempResponseData.headers.etag) {
+							// If an etag is provided, we use it as "hash"
+							hash = tempResponseData.headers.etag as string;
+						} else {
+							// If there is no etag, we calculate a hash from the data in the body
+							if (typeof contentBody !== 'string') {
+								contentBody = JSON.stringify(contentBody);
+							}
+							hash = crypto.createHash('md5').update(contentBody).digest('base64');
+						}
+
+						if (hashData.previousHash === hash) {
+							hashData.identicalCount += 1;
+							if (hashData.identicalCount > 2) {
+								// Length was identical 5x and hash 3x
+								throw new NodeOperationError(
+									node,
+									'The returned response was identical 5x, so requests got stopped',
+									{
+										itemIndex,
+										description:
+											'Check if "Pagination Completed When" has been configured correctly.',
+									},
+								);
+							}
+						} else {
+							hashData.identicalCount = 0;
+						}
+						hashData.previousHash = hash;
+					} else {
+						hashData.identicalCount = 0;
+					}
+					hashData.previousLength = contentLength;
+				}
+
+				responseData.push(tempResponseData);
+
+				additionalKeys.$response = newResponse;
+				additionalKeys.$pageCount = additionalKeys.$pageCount + 1;
+
+				if (
+					paginationOptions.maxRequests &&
+					additionalKeys.$pageCount >= paginationOptions.maxRequests
+				) {
+					break;
+				}
+
+				makeAdditionalRequest = getResolvedValue(
+					paginationOptions.continue,
+					itemIndex,
+					runIndex,
+					executeData,
+					additionalKeys,
+					false,
+				) as boolean;
+
+				if (makeAdditionalRequest) {
+					if (paginationOptions.requestInterval) {
+						await sleep(paginationOptions.requestInterval);
+					}
+					if (tempResponseData.statusCode < 200 || tempResponseData.statusCode >= 300) {
+						// We have it configured to let all requests pass no matter the response code
+						// via "requestOptions.simple = false" to not by default fail if it is for example
+						// configured to stop on 404 response codes. For that reason we have to throw here
+						// now an error manually if the response code is not a success one.
+						let data = tempResponseData.body;
+						if (data instanceof Readable && paginationOptions.binaryResult !== true) {
+							data = await this.helpers
+								.binaryToBuffer(tempResponseData.body as Buffer | Readable)
+								.then((body) => body.toString());
+						} else if (typeof data === 'object') {
+							data = JSON.stringify(data);
+						}
+
+						throw Object.assign(
+							new Error(`${tempResponseData.statusCode} - "${data?.toString()}"`),
+							{
+								statusCode: tempResponseData.statusCode,
+								error: data,
+								isAxiosError: true,
+								response: {
+									headers: tempResponseData.headers,
+									status: tempResponseData.statusCode,
+									statusText: tempResponseData.statusMessage,
+								},
+							},
+						);
+					}
+				}
+			} while (makeAdditionalRequest);
+
+			return responseData;
+		},
+		async httpRequestWithAuthentication(
 			this,
 			credentialsType,
 			requestOptions,
-			workflow,
-			node,
-			additionalData,
 			additionalCredentialOptions,
-		);
-	},
+		): Promise<any> {
+			return await httpRequestWithAuthentication.call(
+				this,
+				credentialsType,
+				requestOptions,
+				workflow,
+				node,
+				additionalData,
+				additionalCredentialOptions,
+			);
+		},
 
-	request: async (uriOrObject, options) =>
-		proxyRequestToAxios(workflow, additionalData, node, uriOrObject, options),
+		request: async (uriOrObject, options) =>
+			await proxyRequestToAxios(workflow, additionalData, node, uriOrObject, options),
 
-	async requestWithAuthentication(
-		this,
-		credentialsType,
-		requestOptions,
-		additionalCredentialOptions,
-	): Promise<any> {
-		return requestWithAuthentication.call(
+		async requestWithAuthentication(
 			this,
 			credentialsType,
 			requestOptions,
-			workflow,
-			node,
-			additionalData,
 			additionalCredentialOptions,
-		);
-	},
+			itemIndex,
+		): Promise<any> {
+			return await requestWithAuthentication.call(
+				this,
+				credentialsType,
+				requestOptions,
+				workflow,
+				node,
+				additionalData,
+				additionalCredentialOptions,
+				itemIndex,
+			);
+		},
 
-	async requestOAuth1(
-		this: IAllExecuteFunctions,
-		credentialsType: string,
-		requestOptions: OptionsWithUrl | requestPromise.RequestPromiseOptions,
-	): Promise<any> {
-		return requestOAuth1.call(this, credentialsType, requestOptions);
-	},
+		async requestOAuth1(
+			this: IAllExecuteFunctions,
+			credentialsType: string,
+			requestOptions: IRequestOptions,
+		): Promise<any> {
+			return await requestOAuth1.call(this, credentialsType, requestOptions);
+		},
 
-	async requestOAuth2(
-		this: IAllExecuteFunctions,
-		credentialsType: string,
-		requestOptions: OptionsWithUri | requestPromise.RequestPromiseOptions,
-		oAuth2Options?: IOAuth2Options,
-	): Promise<any> {
-		return requestOAuth2.call(
-			this,
-			credentialsType,
-			requestOptions,
-			node,
-			additionalData,
-			oAuth2Options,
-		);
-	},
-});
+		async requestOAuth2(
+			this: IAllExecuteFunctions,
+			credentialsType: string,
+			requestOptions: IRequestOptions,
+			oAuth2Options?: IOAuth2Options,
+		): Promise<any> {
+			return await requestOAuth2.call(
+				this,
+				credentialsType,
+				requestOptions,
+				node,
+				additionalData,
+				oAuth2Options,
+			);
+		},
+	};
+};
+
+const getAllowedPaths = () => {
+	const restrictFileAccessTo = process.env[RESTRICT_FILE_ACCESS_TO];
+	if (!restrictFileAccessTo) {
+		return [];
+	}
+	const allowedPaths = restrictFileAccessTo
+		.split(';')
+		.map((path) => path.trim())
+		.filter((path) => path);
+	return allowedPaths;
+};
+
+function isFilePathBlocked(filePath: string): boolean {
+	const allowedPaths = getAllowedPaths();
+	const resolvedFilePath = path.resolve(filePath);
+	const blockFileAccessToN8nFiles = process.env[BLOCK_FILE_ACCESS_TO_N8N_FILES] !== 'false';
+
+	//if allowed paths are defined, allow access only to those paths
+	if (allowedPaths.length) {
+		for (const path of allowedPaths) {
+			if (resolvedFilePath.startsWith(path)) {
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	//restrict access to .n8n folder and other .env config related paths
+	if (blockFileAccessToN8nFiles) {
+		const { n8nFolder } = Container.get(InstanceSettings);
+		const restrictedPaths = [n8nFolder];
+
+		if (process.env[CONFIG_FILES]) {
+			restrictedPaths.push(...process.env[CONFIG_FILES].split(','));
+		}
+
+		if (process.env[CUSTOM_EXTENSION_ENV]) {
+			const customExtensionFolders = process.env[CUSTOM_EXTENSION_ENV].split(';');
+			restrictedPaths.push(...customExtensionFolders);
+		}
+
+		if (process.env[BINARY_DATA_STORAGE_PATH]) {
+			restrictedPaths.push(process.env[BINARY_DATA_STORAGE_PATH]);
+		}
+
+		if (process.env[UM_EMAIL_TEMPLATES_INVITE]) {
+			restrictedPaths.push(process.env[UM_EMAIL_TEMPLATES_INVITE]);
+		}
+
+		if (process.env[UM_EMAIL_TEMPLATES_PWRESET]) {
+			restrictedPaths.push(process.env[UM_EMAIL_TEMPLATES_PWRESET]);
+		}
+
+		//check if the file path is restricted
+		for (const path of restrictedPaths) {
+			if (resolvedFilePath.startsWith(path)) {
+				return true;
+			}
+		}
+	}
+
+	//path is not restricted
+	return false;
+}
 
 const getFileSystemHelperFunctions = (node: INode): FileSystemHelperFunctions => ({
 	async createReadStream(filePath) {
@@ -2128,39 +3245,82 @@ const getFileSystemHelperFunctions = (node: INode): FileSystemHelperFunctions =>
 			throw error.code === 'ENOENT'
 				? new NodeOperationError(node, error, {
 						message: `The file "${String(filePath)}" could not be accessed.`,
-				  })
+						level: 'warning',
+					})
 				: error;
 		}
+		if (isFilePathBlocked(filePath as string)) {
+			const allowedPaths = getAllowedPaths();
+			const message = allowedPaths.length ? ` Allowed paths: ${allowedPaths.join(', ')}` : '';
+			throw new NodeOperationError(node, `Access to the file is not allowed.${message}`, {
+				level: 'warning',
+			});
+		}
 		return createReadStream(filePath);
 	},
+
+	getStoragePath() {
+		return path.join(Container.get(InstanceSettings).n8nFolder, `storage/${node.type}`);
+	},
+
+	async writeContentToFile(filePath, content, flag) {
+		if (isFilePathBlocked(filePath as string)) {
+			throw new NodeOperationError(node, `The file "${String(filePath)}" is not writable.`, {
+				level: 'warning',
+			});
+		}
+		return await fsWriteFile(filePath, content, { encoding: 'binary', flag });
+	},
 });
 
-const getNodeHelperFunctions = ({
-	executionId,
-}: IWorkflowExecuteAdditionalData): NodeHelperFunctions => ({
+const getNodeHelperFunctions = (
+	{ executionId }: IWorkflowExecuteAdditionalData,
+	workflowId: string,
+): NodeHelperFunctions => ({
 	copyBinaryFile: async (filePath, fileName, mimeType) =>
-		copyBinaryFile(executionId!, filePath, fileName, mimeType),
+		await copyBinaryFile(workflowId, executionId!, filePath, fileName, mimeType),
 });
 
-const getBinaryHelperFunctions = ({
-	executionId,
-}: IWorkflowExecuteAdditionalData): BinaryHelperFunctions => ({
+const getBinaryHelperFunctions = (
+	{ executionId }: IWorkflowExecuteAdditionalData,
+	workflowId: string,
+): BinaryHelperFunctions => ({
+	getBinaryPath,
 	getBinaryStream,
 	getBinaryMetadata,
-	binaryToBuffer,
+	binaryToBuffer: async (body: Buffer | Readable) =>
+		await Container.get(BinaryDataService).toBuffer(body),
 	prepareBinaryData: async (binaryData, filePath, mimeType) =>
-		prepareBinaryData(binaryData, executionId!, filePath, mimeType),
+		await prepareBinaryData(binaryData, executionId!, workflowId, filePath, mimeType),
 	setBinaryDataBuffer: async (data, binaryData) =>
-		setBinaryDataBuffer(data, binaryData, executionId!),
+		await setBinaryDataBuffer(data, binaryData, workflowId, executionId!),
 	copyBinaryFile: async () => {
-		throw new Error('copyBinaryFile has been removed. Please upgrade this node');
+		throw new ApplicationError('`copyBinaryFile` has been removed. Please upgrade this node.');
 	},
 });
 
+/**
+ * Returns a copy of the items which only contains the json data and
+ * of that only the defined properties
+ */
+export function copyInputItems(items: INodeExecutionData[], properties: string[]): IDataObject[] {
+	return items.map((item) => {
+		const newItem: IDataObject = {};
+		for (const property of properties) {
+			if (item.json[property] === undefined) {
+				newItem[property] = null;
+			} else {
+				newItem[property] = deepCopy(item.json[property]);
+			}
+		}
+		return newItem;
+	});
+}
+
 /**
  * Returns the execute functions the poll nodes have access to.
  */
-// TODO: Check if I can get rid of: additionalData, and so then maybe also at ActiveWorkflowRunner.add
+// TODO: Check if I can get rid of: additionalData, and so then maybe also at ActiveWorkflowManager.add
 export function getExecutePollFunctions(
 	workflow: Workflow,
 	node: INode,
@@ -2171,17 +3331,20 @@ export function getExecutePollFunctions(
 	return ((workflow: Workflow, node: INode) => {
 		return {
 			...getCommonWorkflowFunctions(workflow, node, additionalData),
-			__emit: (data: INodeExecutionData[][]): void => {
-				throw new Error('Overwrite NodeExecuteFunctions.getExecutePollFunctions.__emit function!');
+			__emit: (): void => {
+				throw new ApplicationError(
+					'Overwrite NodeExecuteFunctions.getExecutePollFunctions.__emit function!',
+				);
 			},
-			__emitError(error: Error) {
-				throw new Error(
+			__emitError() {
+				throw new ApplicationError(
 					'Overwrite NodeExecuteFunctions.getExecutePollFunctions.__emitError function!',
 				);
 			},
 			getMode: () => mode,
 			getActivationMode: () => activation,
-			getCredentials: async (type) => getCredentials(workflow, node, type, additionalData, mode),
+			getCredentials: async (type) =>
+				await getCredentials(workflow, node, type, additionalData, mode),
 			getNodeParameter: (
 				parameterName: string,
 				fallbackValue?: any,
@@ -2201,7 +3364,6 @@ export function getExecutePollFunctions(
 					parameterName,
 					itemIndex,
 					mode,
-					additionalData.timezone,
 					getAdditionalKeys(additionalData, mode, runExecutionData),
 					undefined,
 					fallbackValue,
@@ -2211,7 +3373,7 @@ export function getExecutePollFunctions(
 			helpers: {
 				createDeferredPromise,
 				...getRequestHelperFunctions(workflow, node, additionalData),
-				...getBinaryHelperFunctions(additionalData),
+				...getBinaryHelperFunctions(additionalData, workflow.id),
 				returnJsonArray,
 			},
 		};
@@ -2221,7 +3383,7 @@ export function getExecutePollFunctions(
 /**
  * Returns the execute functions the trigger nodes have access to.
  */
-// TODO: Check if I can get rid of: additionalData, and so then maybe also at ActiveWorkflowRunner.add
+// TODO: Check if I can get rid of: additionalData, and so then maybe also at ActiveWorkflowManager.add
 export function getExecuteTriggerFunctions(
 	workflow: Workflow,
 	node: INode,
@@ -2232,15 +3394,20 @@ export function getExecuteTriggerFunctions(
 	return ((workflow: Workflow, node: INode) => {
 		return {
 			...getCommonWorkflowFunctions(workflow, node, additionalData),
-			emit: (data: INodeExecutionData[][]): void => {
-				throw new Error('Overwrite NodeExecuteFunctions.getExecuteTriggerFunctions.emit function!');
+			emit: (): void => {
+				throw new ApplicationError(
+					'Overwrite NodeExecuteFunctions.getExecuteTriggerFunctions.emit function!',
+				);
 			},
-			emitError: (error: Error): void => {
-				throw new Error('Overwrite NodeExecuteFunctions.getExecuteTriggerFunctions.emit function!');
+			emitError: (): void => {
+				throw new ApplicationError(
+					'Overwrite NodeExecuteFunctions.getExecuteTriggerFunctions.emit function!',
+				);
 			},
 			getMode: () => mode,
 			getActivationMode: () => activation,
-			getCredentials: async (type) => getCredentials(workflow, node, type, additionalData, mode),
+			getCredentials: async (type) =>
+				await getCredentials(workflow, node, type, additionalData, mode),
 			getNodeParameter: (
 				parameterName: string,
 				fallbackValue?: any,
@@ -2260,7 +3427,6 @@ export function getExecuteTriggerFunctions(
 					parameterName,
 					itemIndex,
 					mode,
-					additionalData.timezone,
 					getAdditionalKeys(additionalData, mode, runExecutionData),
 					undefined,
 					fallbackValue,
@@ -2270,7 +3436,7 @@ export function getExecuteTriggerFunctions(
 			helpers: {
 				createDeferredPromise,
 				...getRequestHelperFunctions(workflow, node, additionalData),
-				...getBinaryHelperFunctions(additionalData),
+				...getBinaryHelperFunctions(additionalData, workflow.id),
 				returnJsonArray,
 			},
 		};
@@ -2290,18 +3456,22 @@ export function getExecuteFunctions(
 	additionalData: IWorkflowExecuteAdditionalData,
 	executeData: IExecuteData,
 	mode: WorkflowExecuteMode,
+	closeFunctions: CloseFunction[],
+	abortSignal?: AbortSignal,
 ): IExecuteFunctions {
 	return ((workflow, runExecutionData, connectionInputData, inputData, node) => {
 		return {
 			...getCommonWorkflowFunctions(workflow, node, additionalData),
+			...executionCancellationFunctions(abortSignal),
 			getMode: () => mode,
 			getCredentials: async (type, itemIndex) =>
-				getCredentials(
+				await getCredentials(
 					workflow,
 					node,
 					type,
 					additionalData,
 					mode,
+					executeData,
 					runExecutionData,
 					runIndex,
 					connectionInputData,
@@ -2319,7 +3489,6 @@ export function getExecuteFunctions(
 					node.name,
 					connectionInputData,
 					mode,
-					additionalData.timezone,
 					getAdditionalKeys(additionalData, mode, runExecutionData),
 					executeData,
 				);
@@ -2327,23 +3496,59 @@ export function getExecuteFunctions(
 			async executeWorkflow(
 				workflowInfo: IExecuteWorkflowInfo,
 				inputData?: INodeExecutionData[],
+				parentCallbackManager?: CallbackManager,
 			): Promise<any> {
-				return additionalData
+				return await additionalData
 					.executeWorkflow(workflowInfo, additionalData, {
 						parentWorkflowId: workflow.id?.toString(),
 						inputData,
 						parentWorkflowSettings: workflow.settings,
+						node,
+						parentCallbackManager,
 					})
-					.then(async (result) =>
-						BinaryDataManager.getInstance().duplicateBinaryData(
-							result,
-							additionalData.executionId!,
-						),
+					.then(
+						async (result) =>
+							await Container.get(BinaryDataService).duplicateBinaryData(
+								workflow.id,
+								additionalData.executionId!,
+								result,
+							),
 					);
 			},
-			getContext(type: string): IContextObject {
+			getContext(type: ContextType): IContextObject {
 				return NodeHelpers.getContext(runExecutionData, type, node);
 			},
+
+			async getInputConnectionData(
+				inputName: ConnectionTypes,
+				itemIndex: number,
+			): Promise<unknown> {
+				return await getInputConnectionData.call(
+					this,
+					workflow,
+					runExecutionData,
+					runIndex,
+					connectionInputData,
+					additionalData,
+					executeData,
+					mode,
+					closeFunctions,
+					inputName,
+					itemIndex,
+				);
+			},
+
+			getNodeOutputs(): INodeOutputConfiguration[] {
+				const nodeType = workflow.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
+				return NodeHelpers.getNodeOutputs(workflow, node, nodeType.description).map((output) => {
+					if (typeof output === 'string') {
+						return {
+							type: output,
+						};
+					}
+					return output;
+				});
+			},
 			getInputData: (inputIndex = 0, inputName = 'main') => {
 				if (!inputData.hasOwnProperty(inputName)) {
 					// Return empty array because else it would throw error when nothing is connected to input
@@ -2352,12 +3557,15 @@ export function getExecuteFunctions(
 
 				// TODO: Check if nodeType has input with that index defined
 				if (inputData[inputName].length < inputIndex) {
-					throw new Error(`Could not get input index "${inputIndex}" of input "${inputName}"!`);
+					throw new ApplicationError('Could not get input with given index', {
+						extra: { inputIndex, inputName },
+					});
 				}
 
 				if (inputData[inputName][inputIndex] === null) {
-					// return [];
-					throw new Error(`Value "${inputIndex}" of input "${inputName}" did not get set!`);
+					throw new ApplicationError('Value of input was not set', {
+						extra: { inputIndex, inputName },
+					});
 				}
 
 				return inputData[inputName][inputIndex] as INodeExecutionData[];
@@ -2365,7 +3573,7 @@ export function getExecuteFunctions(
 			getInputSourceData: (inputIndex = 0, inputName = 'main') => {
 				if (executeData?.source === null) {
 					// Should never happen as n8n sets it automatically
-					throw new Error('Source data is missing!');
+					throw new ApplicationError('Source data is missing');
 				}
 				return executeData.source[inputName][inputIndex];
 			},
@@ -2384,7 +3592,6 @@ export function getExecuteFunctions(
 					parameterName,
 					itemIndex,
 					mode,
-					additionalData.timezone,
 					getAdditionalKeys(additionalData, mode, runExecutionData),
 					executeData,
 					fallbackValue,
@@ -2401,14 +3608,13 @@ export function getExecuteFunctions(
 					connectionInputData,
 					{},
 					mode,
-					additionalData.timezone,
 					getAdditionalKeys(additionalData, mode, runExecutionData),
 					executeData,
 				);
 				return dataProxy.getDataProxy();
 			},
-			prepareOutputData: NodeHelpers.prepareOutputData,
-			binaryToBuffer,
+			binaryToBuffer: async (body: Buffer | Readable) =>
+				await Container.get(BinaryDataService).toBuffer(body),
 			async putExecutionToWait(waitTill: Date): Promise<void> {
 				runExecutionData.waitTill = waitTill;
 				if (additionalData.setExecutionStatus) {
@@ -2420,7 +3626,7 @@ export function getExecuteFunctions(
 					return;
 				}
 				try {
-					if (additionalData.sendMessageToUI) {
+					if (additionalData.sendDataToUI) {
 						args = args.map((arg) => {
 							// prevent invalid dates from being logged as null
 							if (arg.isLuxonDateTime && arg.invalidReason) return { ...arg };
@@ -2432,31 +3638,99 @@ export function getExecuteFunctions(
 							return arg;
 						});
 
-						additionalData.sendMessageToUI(node.name, args);
+						additionalData.sendDataToUI('sendConsoleMessage', {
+							source: `[Node: "${node.name}"]`,
+							messages: args,
+						});
 					}
 				} catch (error) {
-					// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
 					Logger.warn(`There was a problem sending message to UI: ${error.message}`);
 				}
 			},
 			async sendResponse(response: IExecuteResponsePromiseData): Promise<void> {
 				await additionalData.hooks?.executeHookFunctions('sendResponse', [response]);
 			},
+
+			addInputData(
+				connectionType: ConnectionTypes,
+				data: INodeExecutionData[][] | ExecutionBaseError,
+			): { index: number } {
+				const nodeName = this.getNode().name;
+				let currentNodeRunIndex = 0;
+				if (runExecutionData.resultData.runData.hasOwnProperty(nodeName)) {
+					currentNodeRunIndex = runExecutionData.resultData.runData[nodeName].length;
+				}
+
+				addExecutionDataFunctions(
+					'input',
+					this.getNode().name,
+					data,
+					runExecutionData,
+					connectionType,
+					additionalData,
+					node.name,
+					runIndex,
+					currentNodeRunIndex,
+				).catch((error) => {
+					Logger.warn(
+						`There was a problem logging input data of node "${this.getNode().name}": ${
+							error.message
+						}`,
+					);
+				});
+
+				return { index: currentNodeRunIndex };
+			},
+			addOutputData(
+				connectionType: ConnectionTypes,
+				currentNodeRunIndex: number,
+				data: INodeExecutionData[][] | ExecutionBaseError,
+			): void {
+				addExecutionDataFunctions(
+					'output',
+					this.getNode().name,
+					data,
+					runExecutionData,
+					connectionType,
+					additionalData,
+					node.name,
+					runIndex,
+					currentNodeRunIndex,
+				).catch((error) => {
+					Logger.warn(
+						`There was a problem logging output data of node "${this.getNode().name}": ${
+							error.message
+						}`,
+					);
+				});
+			},
 			helpers: {
 				createDeferredPromise,
+				copyInputItems,
 				...getRequestHelperFunctions(workflow, node, additionalData),
 				...getFileSystemHelperFunctions(node),
-				...getBinaryHelperFunctions(additionalData),
+				...getBinaryHelperFunctions(additionalData, workflow.id),
 				assertBinaryData: (itemIndex, propertyName) =>
 					assertBinaryData(inputData, node, itemIndex, propertyName, 0),
 				getBinaryDataBuffer: async (itemIndex, propertyName) =>
-					getBinaryDataBuffer(inputData, itemIndex, propertyName, 0),
+					await getBinaryDataBuffer(inputData, itemIndex, propertyName, 0),
 
 				returnJsonArray,
 				normalizeItems,
 				constructExecutionMetaData,
 			},
-			nodeHelpers: getNodeHelperFunctions(additionalData),
+			nodeHelpers: getNodeHelperFunctions(additionalData, workflow.id),
+			logAiEvent: async (eventName: EventNamesAiNodesType, msg: string) => {
+				return await additionalData.logAiEvent(eventName, {
+					executionId: additionalData.executionId ?? 'unsaved-execution',
+					nodeName: node.name,
+					workflowName: workflow.name ?? 'Unnamed workflow',
+					nodeType: node.type,
+					workflowId: workflow.id ?? 'unsaved-workflow',
+					msg,
+				});
+			},
+			getParentCallbackManager: () => additionalData.parentCallbackManager,
 		};
 	})(workflow, runExecutionData, connectionInputData, inputData, node) as IExecuteFunctions;
 }
@@ -2475,10 +3749,12 @@ export function getExecuteSingleFunctions(
 	additionalData: IWorkflowExecuteAdditionalData,
 	executeData: IExecuteData,
 	mode: WorkflowExecuteMode,
+	abortSignal?: AbortSignal,
 ): IExecuteSingleFunctions {
 	return ((workflow, runExecutionData, connectionInputData, inputData, node, itemIndex) => {
 		return {
 			...getCommonWorkflowFunctions(workflow, node, additionalData),
+			...executionCancellationFunctions(abortSignal),
 			continueOnFail: () => continueOnFail(node),
 			evaluateExpression: (expression: string, evaluateItemIndex: number | undefined) => {
 				evaluateItemIndex = evaluateItemIndex === undefined ? itemIndex : evaluateItemIndex;
@@ -2491,21 +3767,21 @@ export function getExecuteSingleFunctions(
 					node.name,
 					connectionInputData,
 					mode,
-					additionalData.timezone,
 					getAdditionalKeys(additionalData, mode, runExecutionData),
 					executeData,
 				);
 			},
-			getContext(type: string): IContextObject {
+			getContext(type: ContextType): IContextObject {
 				return NodeHelpers.getContext(runExecutionData, type, node);
 			},
 			getCredentials: async (type) =>
-				getCredentials(
+				await getCredentials(
 					workflow,
 					node,
 					type,
 					additionalData,
 					mode,
+					executeData,
 					runExecutionData,
 					runIndex,
 					connectionInputData,
@@ -2519,21 +3795,23 @@ export function getExecuteSingleFunctions(
 
 				// TODO: Check if nodeType has input with that index defined
 				if (inputData[inputName].length < inputIndex) {
-					throw new Error(`Could not get input index "${inputIndex}" of input "${inputName}"!`);
+					throw new ApplicationError('Could not get input index', {
+						extra: { inputIndex, inputName },
+					});
 				}
 
 				const allItems = inputData[inputName][inputIndex];
 
 				if (allItems === null) {
-					// return [];
-					throw new Error(`Value "${inputIndex}" of input "${inputName}" did not get set!`);
+					throw new ApplicationError('Input index was not set', {
+						extra: { inputIndex, inputName },
+					});
 				}
 
 				if (allItems[itemIndex] === null) {
-					// return [];
-					throw new Error(
-						`Value "${inputIndex}" of input "${inputName}" with itemIndex "${itemIndex}" did not get set!`,
-					);
+					throw new ApplicationError('Value of input with given index was not set', {
+						extra: { inputIndex, inputName, itemIndex },
+					});
 				}
 
 				return allItems[itemIndex];
@@ -2541,7 +3819,7 @@ export function getExecuteSingleFunctions(
 			getInputSourceData: (inputIndex = 0, inputName = 'main') => {
 				if (executeData?.source === null) {
 					// Should never happen as n8n sets it automatically
-					throw new Error('Source data is missing!');
+					throw new ApplicationError('Source data is missing');
 				}
 				return executeData.source[inputName][inputIndex] as ISourceData;
 			},
@@ -2562,7 +3840,6 @@ export function getExecuteSingleFunctions(
 					parameterName,
 					itemIndex,
 					mode,
-					additionalData.timezone,
 					getAdditionalKeys(additionalData, mode, runExecutionData),
 					executeData,
 					fallbackValue,
@@ -2579,7 +3856,6 @@ export function getExecuteSingleFunctions(
 					connectionInputData,
 					{},
 					mode,
-					additionalData.timezone,
 					getAdditionalKeys(additionalData, mode, runExecutionData),
 					executeData,
 				);
@@ -2588,12 +3864,22 @@ export function getExecuteSingleFunctions(
 			helpers: {
 				createDeferredPromise,
 				...getRequestHelperFunctions(workflow, node, additionalData),
-				...getBinaryHelperFunctions(additionalData),
+				...getBinaryHelperFunctions(additionalData, workflow.id),
 
 				assertBinaryData: (propertyName, inputIndex = 0) =>
 					assertBinaryData(inputData, node, itemIndex, propertyName, inputIndex),
 				getBinaryDataBuffer: async (propertyName, inputIndex = 0) =>
-					getBinaryDataBuffer(inputData, itemIndex, propertyName, inputIndex),
+					await getBinaryDataBuffer(inputData, itemIndex, propertyName, inputIndex),
+			},
+			logAiEvent: async (eventName: EventNamesAiNodesType, msg: string) => {
+				return await additionalData.logAiEvent(eventName, {
+					executionId: additionalData.executionId ?? 'unsaved-execution',
+					nodeName: node.name,
+					workflowName: workflow.name ?? 'Unnamed workflow',
+					nodeType: node.type,
+					workflowId: workflow.id ?? 'unsaved-workflow',
+					msg,
+				});
 			},
 		};
 	})(workflow, runExecutionData, connectionInputData, inputData, node, itemIndex);
@@ -2602,7 +3888,9 @@ export function getExecuteSingleFunctions(
 export function getCredentialTestFunctions(): ICredentialTestFunctions {
 	return {
 		helpers: {
-			request: requestPromiseWithDefaults,
+			request: async (uriOrObject: string | object, options?: object) => {
+				return await proxyRequestToAxios(undefined, undefined, undefined, uriOrObject, options);
+			},
 		},
 	};
 }
@@ -2620,7 +3908,7 @@ export function getLoadOptionsFunctions(
 		return {
 			...getCommonWorkflowFunctions(workflow, node, additionalData),
 			getCredentials: async (type) =>
-				getCredentials(workflow, node, type, additionalData, 'internal'),
+				await getCredentials(workflow, node, type, additionalData, 'internal'),
 			getCurrentNodeParameter: (
 				parameterPath: string,
 				options?: IGetNodeParameterOptions,
@@ -2637,9 +3925,9 @@ export function getLoadOptionsFunctions(
 				if (options?.extractValue) {
 					const nodeType = workflow.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
 					if (nodeType === undefined) {
-						throw new Error(
-							`Node type "${node.type}" is not known so can not return parameter value!`,
-						);
+						throw new ApplicationError('Node type is not known so cannot return parameter value', {
+							tags: { nodeType: node.type },
+						});
 					}
 					returnData = extractValue(
 						returnData,
@@ -2672,7 +3960,6 @@ export function getLoadOptionsFunctions(
 					parameterName,
 					itemIndex,
 					mode,
-					additionalData.timezone,
 					getAdditionalKeys(additionalData, mode, runExecutionData),
 					undefined,
 					fallbackValue,
@@ -2693,13 +3980,13 @@ export function getExecuteHookFunctions(
 	additionalData: IWorkflowExecuteAdditionalData,
 	mode: WorkflowExecuteMode,
 	activation: WorkflowActivateMode,
-	isTest?: boolean,
 	webhookData?: IWebhookData,
 ): IHookFunctions {
 	return ((workflow: Workflow, node: INode) => {
 		return {
 			...getCommonWorkflowFunctions(workflow, node, additionalData),
-			getCredentials: async (type) => getCredentials(workflow, node, type, additionalData, mode),
+			getCredentials: async (type) =>
+				await getCredentials(workflow, node, type, additionalData, mode),
 			getMode: () => mode,
 			getActivationMode: () => activation,
 			getNodeParameter: (
@@ -2721,7 +4008,6 @@ export function getExecuteHookFunctions(
 					parameterName,
 					itemIndex,
 					mode,
-					additionalData.timezone,
 					getAdditionalKeys(additionalData, mode, runExecutionData),
 					undefined,
 					fallbackValue,
@@ -2735,14 +4021,13 @@ export function getExecuteHookFunctions(
 					node,
 					additionalData,
 					mode,
-					additionalData.timezone,
 					getAdditionalKeys(additionalData, mode, null),
-					isTest,
+					webhookData?.isTest,
 				);
 			},
 			getWebhookName(): string {
 				if (webhookData === undefined) {
-					throw new Error('Is only supported in webhook functions!');
+					throw new ApplicationError('Only supported in webhook functions');
 				}
 				return webhookData.webhookDescription.name;
 			},
@@ -2755,29 +4040,70 @@ export function getExecuteHookFunctions(
 /**
  * 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[],
 ): IWebhookFunctions {
 	return ((workflow: Workflow, node: INode) => {
 		return {
 			...getCommonWorkflowFunctions(workflow, node, additionalData),
 			getBodyData(): IDataObject {
 				if (additionalData.httpRequest === undefined) {
-					throw new Error('Request is missing!');
+					throw new ApplicationError('Request is missing');
 				}
 				return additionalData.httpRequest.body;
 			},
-			getCredentials: async (type) => getCredentials(workflow, node, type, additionalData, mode),
+			getCredentials: async (type) =>
+				await getCredentials(workflow, node, type, additionalData, mode),
 			getHeaderData(): IncomingHttpHeaders {
 				if (additionalData.httpRequest === undefined) {
-					throw new Error('Request is missing!');
+					throw new ApplicationError('Request is missing');
 				}
 				return additionalData.httpRequest.headers;
 			},
+			async getInputConnectionData(
+				inputName: ConnectionTypes,
+				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.
+				const connectionInputData: INodeExecutionData[] = [
+					{ json: additionalData.httpRequest?.body || {} },
+				];
+				const runExecutionData: IRunExecutionData = {
+					resultData: {
+						runData: {},
+					},
+				};
+				const executeData: IExecuteData = {
+					data: {
+						main: [connectionInputData],
+					},
+					node,
+					source: null,
+				};
+				const runIndex = 0;
+
+				return await getInputConnectionData.call(
+					this,
+					workflow,
+					runExecutionData,
+					runIndex,
+					connectionInputData,
+					additionalData,
+					executeData,
+					mode,
+					closeFunctions,
+					inputName,
+					itemIndex,
+				);
+			},
 			getMode: () => mode,
 			getNodeParameter: (
 				parameterName: string,
@@ -2798,7 +4124,6 @@ export function getExecuteWebhookFunctions(
 					parameterName,
 					itemIndex,
 					mode,
-					additionalData.timezone,
 					getAdditionalKeys(additionalData, mode, null),
 					undefined,
 					fallbackValue,
@@ -2807,25 +4132,25 @@ export function getExecuteWebhookFunctions(
 			},
 			getParamsData(): object {
 				if (additionalData.httpRequest === undefined) {
-					throw new Error('Request is missing!');
+					throw new ApplicationError('Request is missing');
 				}
 				return additionalData.httpRequest.params;
 			},
 			getQueryData(): object {
 				if (additionalData.httpRequest === undefined) {
-					throw new Error('Request is missing!');
+					throw new ApplicationError('Request is missing');
 				}
 				return additionalData.httpRequest.query;
 			},
 			getRequestObject(): Request {
 				if (additionalData.httpRequest === undefined) {
-					throw new Error('Request is missing!');
+					throw new ApplicationError('Request is missing');
 				}
 				return additionalData.httpRequest;
 			},
 			getResponseObject(): Response {
 				if (additionalData.httpResponse === undefined) {
-					throw new Error('Response is missing!');
+					throw new ApplicationError('Response is missing');
 				}
 				return additionalData.httpResponse;
 			},
@@ -2836,18 +4161,16 @@ export function getExecuteWebhookFunctions(
 					node,
 					additionalData,
 					mode,
-					additionalData.timezone,
 					getAdditionalKeys(additionalData, mode, null),
 				),
 			getWebhookName: () => webhookData.webhookDescription.name,
-			prepareOutputData: NodeHelpers.prepareOutputData,
 			helpers: {
 				createDeferredPromise,
 				...getRequestHelperFunctions(workflow, node, additionalData),
-				...getBinaryHelperFunctions(additionalData),
+				...getBinaryHelperFunctions(additionalData, workflow.id),
 				returnJsonArray,
 			},
-			nodeHelpers: getNodeHelperFunctions(additionalData),
+			nodeHelpers: getNodeHelperFunctions(additionalData, workflow.id),
 		};
 	})(workflow, node);
 }
diff --git a/packages/core/src/OAuth2Helper.ts b/packages/core/src/OAuth2Helper.ts
deleted file mode 100644
index a66763505c501..0000000000000
--- a/packages/core/src/OAuth2Helper.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-/* eslint-disable @typescript-eslint/naming-convention */
-import type { ICredentialDataDecryptedObject } from 'n8n-workflow';
-import type clientOAuth2 from 'client-oauth2';
-
-export const getClientCredentialsToken = async (
-	oAuth2Client: clientOAuth2,
-	credentials: ICredentialDataDecryptedObject,
-): Promise<clientOAuth2.Token> => {
-	const options = {};
-	if (credentials.authentication === 'body') {
-		Object.assign(options, {
-			headers: {
-				Authorization: '',
-			},
-			body: {
-				client_id: credentials.clientId as string,
-				client_secret: credentials.clientSecret as string,
-			},
-		});
-	}
-	return oAuth2Client.credentials.getToken(options);
-};
diff --git a/packages/core/src/ObjectStore/ObjectStore.service.ee.ts b/packages/core/src/ObjectStore/ObjectStore.service.ee.ts
new file mode 100644
index 0000000000000..bcfeb47264bb1
--- /dev/null
+++ b/packages/core/src/ObjectStore/ObjectStore.service.ee.ts
@@ -0,0 +1,288 @@
+/* eslint-disable @typescript-eslint/naming-convention */
+
+import { createHash } from 'node:crypto';
+import axios from 'axios';
+import { Service } from 'typedi';
+import { sign } from 'aws4';
+import { isStream, parseXml, writeBlockedMessage } from './utils';
+import { ApplicationError, LoggerProxy as Logger } from 'n8n-workflow';
+
+import type { AxiosRequestConfig, AxiosResponse, InternalAxiosRequestConfig, Method } from 'axios';
+import type { Request as Aws4Options, Credentials as Aws4Credentials } from 'aws4';
+import type {
+	Bucket,
+	ConfigSchemaCredentials,
+	ListPage,
+	MetadataResponseHeaders,
+	RawListPage,
+	RequestOptions,
+} from './types';
+import type { Readable } from 'stream';
+import type { BinaryData } from '../BinaryData/types';
+
+@Service()
+export class ObjectStoreService {
+	private host = '';
+
+	private bucket: Bucket = { region: '', name: '' };
+
+	private credentials: Aws4Credentials = { accessKeyId: '', secretAccessKey: '' };
+
+	private isReady = false;
+
+	private isReadOnly = false;
+
+	private logger = Logger;
+
+	async init(host: string, bucket: Bucket, credentials: ConfigSchemaCredentials) {
+		this.host = host;
+		this.bucket.name = bucket.name;
+		this.bucket.region = bucket.region;
+
+		this.credentials = {
+			accessKeyId: credentials.accessKey,
+			secretAccessKey: credentials.accessSecret,
+		};
+
+		await this.checkConnection();
+
+		this.setReady(true);
+	}
+
+	setReadonly(newState: boolean) {
+		this.isReadOnly = newState;
+	}
+
+	setReady(newState: boolean) {
+		this.isReady = newState;
+	}
+
+	/**
+	 * Confirm that the configured bucket exists and the caller has permission to access it.
+	 *
+	 * @doc https://docs.aws.amazon.com/AmazonS3/latest/API/API_HeadBucket.html
+	 */
+	async checkConnection() {
+		if (this.isReady) return;
+
+		return await this.request('HEAD', this.host, this.bucket.name);
+	}
+
+	/**
+	 * Upload an object to the configured bucket.
+	 *
+	 * @doc https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutObject.html
+	 */
+	async put(filename: string, buffer: Buffer, metadata: BinaryData.PreWriteMetadata = {}) {
+		if (this.isReadOnly) return await this.blockWrite(filename);
+
+		const headers: Record<string, string | number> = {
+			'Content-Length': buffer.length,
+			'Content-MD5': createHash('md5').update(buffer).digest('base64'),
+		};
+
+		if (metadata.fileName) headers['x-amz-meta-filename'] = metadata.fileName;
+		if (metadata.mimeType) headers['Content-Type'] = metadata.mimeType;
+
+		const path = `/${this.bucket.name}/${filename}`;
+
+		return await this.request('PUT', this.host, path, { headers, body: buffer });
+	}
+
+	/**
+	 * Download an object as a stream or buffer from the configured bucket.
+	 *
+	 * @doc https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetObject.html
+	 */
+	async get(fileId: string, { mode }: { mode: 'buffer' }): Promise<Buffer>;
+	async get(fileId: string, { mode }: { mode: 'stream' }): Promise<Readable>;
+	async get(fileId: string, { mode }: { mode: 'stream' | 'buffer' }) {
+		const path = `${this.bucket.name}/${fileId}`;
+
+		const { data } = await this.request('GET', this.host, path, {
+			responseType: mode === 'buffer' ? 'arraybuffer' : 'stream',
+		});
+
+		if (mode === 'stream' && isStream(data)) return data;
+
+		if (mode === 'buffer' && Buffer.isBuffer(data)) return data;
+
+		throw new TypeError(`Expected ${mode} but received ${typeof data}.`);
+	}
+
+	/**
+	 * Retrieve metadata for an object in the configured bucket.
+	 *
+	 * @doc https://docs.aws.amazon.com/AmazonS3/latest/userguide/UsingMetadata.html
+	 */
+	async getMetadata(fileId: string) {
+		const path = `${this.bucket.name}/${fileId}`;
+
+		const response = await this.request('HEAD', this.host, path);
+
+		return response.headers as MetadataResponseHeaders;
+	}
+
+	/**
+	 * Delete a single object in the configured bucket.
+	 *
+	 * @doc https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetObject.html
+	 */
+	async deleteOne(fileId: string) {
+		const path = `${this.bucket.name}/${fileId}`;
+
+		return await this.request('DELETE', this.host, path);
+	}
+
+	/**
+	 * Delete objects with a common prefix in the configured bucket.
+	 *
+	 * @doc https://docs.aws.amazon.com/AmazonS3/latest/API/API_DeleteObjects.html
+	 */
+	async deleteMany(prefix: string) {
+		const objects = await this.list(prefix);
+
+		if (objects.length === 0) return;
+
+		const innerXml = objects.map(({ key }) => `<Object><Key>${key}</Key></Object>`).join('\n');
+
+		const body = ['<Delete>', innerXml, '</Delete>'].join('\n');
+
+		const headers = {
+			'Content-Type': 'application/xml',
+			'Content-Length': body.length,
+			'Content-MD5': createHash('md5').update(body).digest('base64'),
+		};
+
+		const path = `${this.bucket.name}/?delete`;
+
+		return await this.request('POST', this.host, path, { headers, body });
+	}
+
+	/**
+	 * List objects with a common prefix in the configured bucket.
+	 */
+	async list(prefix: string) {
+		const items = [];
+
+		let isTruncated;
+		let nextPageToken;
+
+		do {
+			const listPage = await this.getListPage(prefix, nextPageToken);
+
+			if (listPage.contents?.length > 0) items.push(...listPage.contents);
+
+			isTruncated = listPage.isTruncated;
+			nextPageToken = listPage.nextContinuationToken;
+		} while (isTruncated && nextPageToken);
+
+		return items;
+	}
+
+	/**
+	 * Fetch a page of objects with a common prefix in the configured bucket.
+	 *
+	 * Max 1000 objects per page - set by AWS.
+	 *
+	 * @doc https://docs.aws.amazon.com/AmazonS3/latest/API/API_ListObjectsV2.html
+	 */
+	async getListPage(prefix: string, nextPageToken?: string) {
+		const qs: Record<string, string | number> = { 'list-type': 2, prefix };
+
+		if (nextPageToken) qs['continuation-token'] = nextPageToken;
+
+		const { data } = await this.request('GET', this.host, this.bucket.name, { qs });
+
+		if (typeof data !== 'string') {
+			throw new TypeError(`Expected XML string but received ${typeof data}`);
+		}
+
+		const { listBucketResult: page } = await parseXml<RawListPage>(data);
+
+		if (!page.contents) return { ...page, contents: [] };
+
+		// `explicitArray: false` removes array wrapper on single item array, so restore it
+
+		if (!Array.isArray(page.contents)) page.contents = [page.contents];
+
+		// remove null prototype - https://github.com/Leonidas-from-XIV/node-xml2js/issues/670
+
+		page.contents.forEach((item) => {
+			Object.setPrototypeOf(item, Object.prototype);
+		});
+
+		return page as ListPage;
+	}
+
+	private toPath(rawPath: string, qs?: Record<string, string | number>) {
+		const path = rawPath.startsWith('/') ? rawPath : `/${rawPath}`;
+
+		if (!qs) return path;
+
+		const qsParams = Object.entries(qs)
+			.map(([key, value]) => `${key}=${value}`)
+			.join('&');
+
+		return path.concat(`?${qsParams}`);
+	}
+
+	private async blockWrite(filename: string): Promise<AxiosResponse> {
+		const logMessage = writeBlockedMessage(filename);
+
+		this.logger.warn(logMessage);
+
+		return {
+			status: 403,
+			statusText: 'Forbidden',
+			data: logMessage,
+			headers: {},
+			config: {} as InternalAxiosRequestConfig,
+		};
+	}
+
+	private async request<T>(
+		method: Method,
+		host: string,
+		rawPath = '',
+		{ qs, headers, body, responseType }: RequestOptions = {},
+	) {
+		const path = this.toPath(rawPath, qs);
+
+		const optionsToSign: Aws4Options = {
+			method,
+			service: 's3',
+			region: this.bucket.region,
+			host,
+			path,
+		};
+
+		if (headers) optionsToSign.headers = headers;
+		if (body) optionsToSign.body = body;
+
+		const signedOptions = sign(optionsToSign, this.credentials);
+
+		const config: AxiosRequestConfig = {
+			method,
+			url: `https://${host}${path}`,
+			headers: signedOptions.headers,
+		};
+
+		if (body) config.data = body;
+		if (responseType) config.responseType = responseType;
+
+		try {
+			this.logger.debug('Sending request to S3', { config });
+
+			return await axios.request<T>(config);
+		} catch (e) {
+			const error = e instanceof Error ? e : new Error(`${e}`);
+
+			const message = `Request to S3 failed: ${error.message}`;
+
+			this.logger.error(message, { config });
+
+			throw new ApplicationError(message, { cause: error, extra: { config } });
+		}
+	}
+}
diff --git a/packages/core/src/ObjectStore/types.ts b/packages/core/src/ObjectStore/types.ts
new file mode 100644
index 0000000000000..639ae2e6a2f71
--- /dev/null
+++ b/packages/core/src/ObjectStore/types.ts
@@ -0,0 +1,41 @@
+import type { AxiosResponseHeaders, ResponseType } from 'axios';
+import type { BinaryData } from '../BinaryData/types';
+
+export type RawListPage = {
+	listBucketResult: {
+		name: string;
+		prefix: string;
+		keyCount: number;
+		maxKeys: number;
+		isTruncated: boolean;
+		nextContinuationToken?: string; // only if isTruncated is true
+		contents?: Item | Item[];
+	};
+};
+
+type Item = {
+	key: string;
+	lastModified: string;
+	eTag: string;
+	size: number; // bytes
+	storageClass: string;
+};
+
+export type ListPage = Omit<RawListPage['listBucketResult'], 'contents'> & { contents: Item[] };
+
+export type Bucket = { region: string; name: string };
+
+export type RequestOptions = {
+	qs?: Record<string, string | number>;
+	headers?: Record<string, string | number>;
+	body?: string | Buffer;
+	responseType?: ResponseType;
+};
+
+export type MetadataResponseHeaders = AxiosResponseHeaders & {
+	'content-length': string;
+	'content-type'?: string;
+	'x-amz-meta-filename'?: string;
+} & BinaryData.PreWriteMetadata;
+
+export type ConfigSchemaCredentials = { accessKey: string; accessSecret: string };
diff --git a/packages/core/src/ObjectStore/utils.ts b/packages/core/src/ObjectStore/utils.ts
new file mode 100644
index 0000000000000..6dc1e4df77bf8
--- /dev/null
+++ b/packages/core/src/ObjectStore/utils.ts
@@ -0,0 +1,20 @@
+import { Stream } from 'node:stream';
+import { parseStringPromise } from 'xml2js';
+import { firstCharLowerCase, parseBooleans, parseNumbers } from 'xml2js/lib/processors';
+
+export function isStream(maybeStream: unknown): maybeStream is Stream {
+	return maybeStream instanceof Stream;
+}
+
+export async function parseXml<T>(xml: string): Promise<T> {
+	return await (parseStringPromise(xml, {
+		explicitArray: false,
+		ignoreAttrs: true,
+		tagNameProcessors: [firstCharLowerCase],
+		valueProcessors: [parseNumbers, parseBooleans],
+	}) as Promise<T>);
+}
+
+export function writeBlockedMessage(filename: string) {
+	return `Request to write file "${filename}" to object storage was blocked because S3 storage is not available with your current license. Please upgrade to a license that supports this feature, or set N8N_DEFAULT_BINARY_DATA_MODE to an option other than "s3".`;
+}
diff --git a/packages/core/src/Secrets.ts b/packages/core/src/Secrets.ts
new file mode 100644
index 0000000000000..dbe8730dbe6e6
--- /dev/null
+++ b/packages/core/src/Secrets.ts
@@ -0,0 +1,76 @@
+import type { IDataObject, IWorkflowExecuteAdditionalData } from 'n8n-workflow';
+import { ExpressionError } from 'n8n-workflow';
+
+function buildSecretsValueProxy(value: IDataObject): unknown {
+	return new Proxy(value, {
+		get(target, valueName) {
+			if (typeof valueName !== 'string') {
+				return;
+			}
+			if (!(valueName in value)) {
+				throw new ExpressionError('Could not load secrets', {
+					description:
+						'The credential in use tries to use secret from an external store that could not be found',
+				});
+			}
+			const retValue = value[valueName];
+			if (typeof retValue === 'object' && retValue !== null) {
+				return buildSecretsValueProxy(retValue as IDataObject);
+			}
+			return retValue;
+		},
+	});
+}
+
+export function getSecretsProxy(additionalData: IWorkflowExecuteAdditionalData): IDataObject {
+	const secretsHelpers = additionalData.secretsHelpers;
+	return new Proxy(
+		{},
+		{
+			get(target, providerName) {
+				if (typeof providerName !== 'string') {
+					return {};
+				}
+				if (secretsHelpers.hasProvider(providerName)) {
+					return new Proxy(
+						{},
+						{
+							get(target2, secretName) {
+								if (typeof secretName !== 'string') {
+									return;
+								}
+								if (!secretsHelpers.hasSecret(providerName, secretName)) {
+									throw new ExpressionError('Could not load secrets', {
+										description:
+											'The credential in use tries to use secret from an external store that could not be found',
+									});
+								}
+								const retValue = secretsHelpers.getSecret(providerName, secretName);
+								if (typeof retValue === 'object' && retValue !== null) {
+									return buildSecretsValueProxy(retValue as IDataObject);
+								}
+								return retValue;
+							},
+							set() {
+								return false;
+							},
+							ownKeys() {
+								return secretsHelpers.listSecrets(providerName);
+							},
+						},
+					);
+				}
+				throw new ExpressionError('Could not load secrets', {
+					description:
+						'The credential in use pulls secrets from an external store that is not reachable',
+				});
+			},
+			set() {
+				return false;
+			},
+			ownKeys() {
+				return secretsHelpers.listProviders();
+			},
+		},
+	);
+}
diff --git a/packages/core/src/UserSettings.ts b/packages/core/src/UserSettings.ts
deleted file mode 100644
index cef8db649b18a..0000000000000
--- a/packages/core/src/UserSettings.ts
+++ /dev/null
@@ -1,275 +0,0 @@
-/* eslint-disable no-param-reassign */
-/* eslint-disable @typescript-eslint/no-use-before-define */
-/* eslint-disable @typescript-eslint/no-unsafe-call */
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
-import fs from 'fs';
-import path from 'path';
-import { createHash, randomBytes } from 'crypto';
-import { promisify } from 'util';
-import { deepCopy } from 'n8n-workflow';
-import {
-	ENCRYPTION_KEY_ENV_OVERWRITE,
-	EXTENSIONS_SUBDIRECTORY,
-	DOWNLOADED_NODES_SUBDIRECTORY,
-	RESPONSE_ERROR_MESSAGES,
-	USER_FOLDER_ENV_OVERWRITE,
-	USER_SETTINGS_FILE_NAME,
-	USER_SETTINGS_SUBFOLDER,
-} from './Constants';
-import type { IUserSettings } from './Interfaces';
-
-const fsAccess = promisify(fs.access);
-const fsReadFile = promisify(fs.readFile);
-const fsMkdir = promisify(fs.mkdir);
-const fsWriteFile = promisify(fs.writeFile);
-
-let settingsCache: IUserSettings | undefined;
-
-/**
- * Creates the user settings if they do not exist yet
- *
- */
-export async function prepareUserSettings(): Promise<IUserSettings> {
-	const settingsPath = getUserSettingsPath();
-
-	let userSettings = await getUserSettings(settingsPath);
-	if (userSettings !== undefined) {
-		// Settings already exist, check if they contain the encryptionKey
-		if (userSettings.encryptionKey !== undefined) {
-			// Key already exists
-			if (userSettings.instanceId === undefined) {
-				userSettings.instanceId = await generateInstanceId(userSettings.encryptionKey);
-				settingsCache = userSettings;
-			}
-
-			return userSettings;
-		}
-	} else {
-		userSettings = {};
-	}
-
-	if (process.env[ENCRYPTION_KEY_ENV_OVERWRITE] !== undefined) {
-		// Use the encryption key which got set via environment
-		userSettings.encryptionKey = process.env[ENCRYPTION_KEY_ENV_OVERWRITE];
-	} else {
-		// Generate a new encryption key
-		userSettings.encryptionKey = randomBytes(24).toString('base64');
-	}
-
-	userSettings.instanceId = await generateInstanceId(userSettings.encryptionKey);
-
-	// eslint-disable-next-line no-console
-	console.log(`UserSettings were generated and saved to: ${settingsPath}`);
-
-	return writeUserSettings(userSettings, settingsPath);
-}
-
-/**
- * Returns the encryption key which is used to encrypt
- * the credentials.
- *
- */
-
-export async function getEncryptionKey(): Promise<string> {
-	if (process.env[ENCRYPTION_KEY_ENV_OVERWRITE] !== undefined) {
-		return process.env[ENCRYPTION_KEY_ENV_OVERWRITE];
-	}
-
-	const userSettings = await getUserSettings();
-
-	if (userSettings === undefined || userSettings.encryptionKey === undefined) {
-		throw new Error(RESPONSE_ERROR_MESSAGES.NO_ENCRYPTION_KEY);
-	}
-
-	return userSettings.encryptionKey;
-}
-
-/**
- * Returns the instance ID
- *
- */
-export async function getInstanceId(): Promise<string> {
-	const userSettings = await getUserSettings();
-
-	if (userSettings === undefined) {
-		return '';
-	}
-
-	if (userSettings.instanceId === undefined) {
-		return '';
-	}
-
-	return userSettings.instanceId;
-}
-
-async function generateInstanceId(key?: string) {
-	const hash = key
-		? createHash('sha256')
-				.update(key.slice(Math.round(key.length / 2)))
-				.digest('hex')
-		: undefined;
-
-	return hash;
-}
-
-/**
- * Adds/Overwrite the given settings in the currently
- * saved user settings
- *
- * @param {IUserSettings} addSettings  The settings to add/overwrite
- * @param {string} [settingsPath] Optional settings file path
- */
-export async function addToUserSettings(
-	addSettings: IUserSettings,
-	settingsPath?: string,
-): Promise<IUserSettings> {
-	if (settingsPath === undefined) {
-		settingsPath = getUserSettingsPath();
-	}
-
-	let userSettings = await getUserSettings(settingsPath);
-
-	if (userSettings === undefined) {
-		userSettings = {};
-	}
-
-	// Add the settings
-	Object.assign(userSettings, addSettings);
-
-	return writeUserSettings(userSettings, settingsPath);
-}
-
-/**
- * Writes a user settings file
- *
- * @param {IUserSettings} userSettings The settings to write
- * @param {string} [settingsPath] Optional settings file path
- */
-export async function writeUserSettings(
-	userSettings: IUserSettings,
-	settingsPath?: string,
-): Promise<IUserSettings> {
-	if (settingsPath === undefined) {
-		settingsPath = getUserSettingsPath();
-	}
-
-	if (userSettings === undefined) {
-		userSettings = {};
-	}
-
-	// Check if parent folder exists if not create it.
-	try {
-		await fsAccess(path.dirname(settingsPath));
-	} catch (error) {
-		// Parent folder does not exist so create
-		await fsMkdir(path.dirname(settingsPath));
-	}
-
-	const settingsToWrite = { ...userSettings };
-	if (settingsToWrite.instanceId !== undefined) {
-		delete settingsToWrite.instanceId;
-	}
-
-	await fsWriteFile(settingsPath, JSON.stringify(settingsToWrite, null, '\t'));
-	settingsCache = deepCopy(userSettings);
-
-	return userSettings;
-}
-
-/**
- * Returns the content of the user settings
- *
- */
-export async function getUserSettings(
-	settingsPath?: string,
-	ignoreCache?: boolean,
-): Promise<IUserSettings | undefined> {
-	if (settingsCache !== undefined && ignoreCache !== true) {
-		return settingsCache;
-	}
-
-	if (settingsPath === undefined) {
-		settingsPath = getUserSettingsPath();
-	}
-
-	try {
-		await fsAccess(settingsPath);
-	} catch (error) {
-		// The file does not exist
-		return undefined;
-	}
-
-	const settingsFile = await fsReadFile(settingsPath, 'utf8');
-
-	try {
-		// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-		settingsCache = JSON.parse(settingsFile);
-	} catch (error) {
-		throw new Error(
-			`Error parsing n8n-config file "${settingsPath}". It does not seem to be valid JSON.`,
-		);
-	}
-
-	return settingsCache as IUserSettings;
-}
-
-/**
- * Returns the path to the user settings
- *
- */
-export function getUserSettingsPath(): string {
-	const n8nFolder = getUserN8nFolderPath();
-
-	return path.join(n8nFolder, USER_SETTINGS_FILE_NAME);
-}
-
-/**
- * Returns the path to the n8n folder in which all n8n
- * related data gets saved
- *
- */
-export function getUserN8nFolderPath(): string {
-	return path.join(getUserHome(), USER_SETTINGS_SUBFOLDER);
-}
-
-/**
- * Returns the path to the n8n user folder with the custom
- * extensions like nodes and credentials
- *
- */
-export function getUserN8nFolderCustomExtensionPath(): string {
-	return path.join(getUserN8nFolderPath(), EXTENSIONS_SUBDIRECTORY);
-}
-
-/**
- * Returns the path to the n8n user folder with the nodes that
- * have been downloaded
- *
- */
-export function getUserN8nFolderDownloadedNodesPath(): string {
-	return path.join(getUserN8nFolderPath(), DOWNLOADED_NODES_SUBDIRECTORY);
-}
-
-/**
- * Returns the home folder path of the user if
- * none can be found it falls back to the current
- * working directory
- *
- */
-export function getUserHome(): string {
-	if (process.env[USER_FOLDER_ENV_OVERWRITE] !== undefined) {
-		return process.env[USER_FOLDER_ENV_OVERWRITE];
-	} else {
-		let variableName = 'HOME';
-		if (process.platform === 'win32') {
-			variableName = 'USERPROFILE';
-		}
-
-		if (process.env[variableName] === undefined) {
-			// If for some reason the variable does not exist
-			// fall back to current folder
-			return process.cwd();
-		}
-		return process.env[variableName] as string;
-	}
-}
diff --git a/packages/core/src/Utils.ts b/packages/core/src/Utils.ts
new file mode 100644
index 0000000000000..f2fa154d23031
--- /dev/null
+++ b/packages/core/src/Utils.ts
@@ -0,0 +1,28 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable @typescript-eslint/restrict-template-expressions */
+/* eslint-disable @typescript-eslint/no-unsafe-return */
+/* eslint-disable @typescript-eslint/naming-convention */
+import axios from 'axios';
+import type { AxiosError } from 'axios';
+
+export const getProjectTables = async (projectId: string) => {
+	const baseUrl = process.env.DCS_NOCODB_BASE_URL;
+	const route = `/api/v1/db/meta/projects/${projectId}/tables`;
+	const url = `${baseUrl}${route}`;
+
+	try {
+		const response = await axios.get<{ list: any[] }>(url, {
+			headers: {
+				'xc-token': process.env.DCS_NOCODB_API_TOKEN,
+			},
+		});
+		const list = response.data.list;
+		if (list.length) {
+			return list;
+		}
+		return null;
+	} catch (e) {
+		const error = e as AxiosError;
+		throw new Error(`Failed to check opted out chats. ${error.message}. ${error.stack}`);
+	}
+};
diff --git a/packages/core/src/WorkflowExecute.ts b/packages/core/src/WorkflowExecute.ts
index 00e7a3f84f01c..bb0b7b8185146 100644
--- a/packages/core/src/WorkflowExecute.ts
+++ b/packages/core/src/WorkflowExecute.ts
@@ -1,63 +1,81 @@
 /* eslint-disable @typescript-eslint/prefer-optional-chain */
-/* eslint-disable no-await-in-loop */
-/* eslint-disable no-labels */
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
-/* eslint-disable no-continue */
-/* eslint-disable no-prototype-builtins */
-/* eslint-disable no-restricted-syntax */
-/* eslint-disable no-param-reassign */
 /* eslint-disable @typescript-eslint/prefer-nullish-coalescing */
+import { setMaxListeners } from 'events';
 import PCancelable from 'p-cancelable';
 
 import type {
-	ExecutionError,
+	ExecutionBaseError,
 	ExecutionStatus,
+	GenericValue,
 	IConnection,
 	IDataObject,
 	IExecuteData,
 	INode,
 	INodeConnections,
 	INodeExecutionData,
+	IPairedItemData,
 	IPinData,
 	IRun,
 	IRunData,
-	IRunExecutionData,
 	ISourceData,
 	ITaskData,
 	ITaskDataConnections,
 	ITaskDataConnectionsSource,
+	ITaskMetadata,
 	IWaitingForExecution,
 	IWaitingForExecutionSource,
-	IWorkflowExecuteAdditionalData,
 	NodeApiError,
-	NodeOperationError,
 	Workflow,
+	IRunExecutionData,
+	IWorkflowExecuteAdditionalData,
 	WorkflowExecuteMode,
+	CloseFunction,
+	StartNodeData,
+	IRunNodeResponse,
 } from 'n8n-workflow';
-import { LoggerProxy as Logger, WorkflowOperationError } from 'n8n-workflow';
-import get from 'lodash.get';
+import { NodeOperationError } from 'n8n-workflow';
+import {
+	LoggerProxy as Logger,
+	WorkflowOperationError,
+	NodeHelpers,
+	NodeConnectionType,
+	ApplicationError,
+} from 'n8n-workflow';
+import get from 'lodash/get';
 import * as NodeExecuteFunctions from './NodeExecuteFunctions';
+import { getProjectTables } from './Utils';
+
+function calculateNextTime(unit: string, value: number) {
+	const currentTime = new Date();
+
+	const unitToMilliseconds: { [key: string]: number } = {
+		seconds: 1000,
+		minutes: 60000,
+		hours: 3600000,
+		days: 86400000,
+	};
+
+	// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+	if (unitToMilliseconds.hasOwnProperty(unit)) {
+		const milliseconds = unitToMilliseconds[unit] * value;
+		const nextTime = new Date(currentTime.getTime() + milliseconds);
+		return nextTime;
+	} else {
+		return null;
+	}
+}
 
 export class WorkflowExecute {
-	runExecutionData: IRunExecutionData;
-
-	private additionalData: IWorkflowExecuteAdditionalData;
+	private status: ExecutionStatus = 'new';
 
-	private mode: WorkflowExecuteMode;
-
-	private status: ExecutionStatus;
+	private readonly abortController = new AbortController();
 
 	constructor(
-		additionalData: IWorkflowExecuteAdditionalData,
-		mode: WorkflowExecuteMode,
-		runExecutionData?: IRunExecutionData,
-	) {
-		this.additionalData = additionalData;
-		this.mode = mode;
-		this.status = 'new';
-		this.runExecutionData = runExecutionData || {
+		private readonly additionalData: IWorkflowExecuteAdditionalData,
+		private readonly mode: WorkflowExecuteMode,
+		private runExecutionData: IRunExecutionData = {
 			startData: {},
 			resultData: {
 				runData: {},
@@ -66,11 +84,12 @@ export class WorkflowExecute {
 			executionData: {
 				contextData: {},
 				nodeExecutionStack: [],
+				metadata: {},
 				waitingExecution: {},
 				waitingExecutionSource: {},
 			},
-		};
-	}
+		},
+	) {}
 
 	/**
 	 * Executes the given workflow.
@@ -95,7 +114,7 @@ export class WorkflowExecute {
 		startNode = startNode || workflow.getStartNode(destinationNode);
 
 		if (startNode === undefined) {
-			throw new Error('No node to start the workflow from could be found!');
+			throw new ApplicationError('No node to start the workflow from could be found');
 		}
 
 		// If a destination node is given we only run the direct parent nodes and no others
@@ -134,6 +153,7 @@ export class WorkflowExecute {
 			executionData: {
 				contextData: {},
 				nodeExecutionStack,
+				metadata: {},
 				waitingExecution: {},
 				waitingExecutionSource: {},
 			},
@@ -142,6 +162,10 @@ export class WorkflowExecute {
 		return this.processRunExecutionData(workflow);
 	}
 
+	forceInputNodeExecution(workflow: Workflow): boolean {
+		return workflow.settings.executionOrder !== 'v1';
+	}
+
 	/**
 	 * Executes the given workflow but only
 	 *
@@ -152,12 +176,12 @@ export class WorkflowExecute {
 	// IMPORTANT: Do not add "async" to this function, it will then convert the
 	//            PCancelable to a regular Promise and does so not allow canceling
 	//            active executions anymore
-	// eslint-disable-next-line @typescript-eslint/promise-function-async
+	// eslint-disable-next-line @typescript-eslint/promise-function-async, complexity
 	runPartialWorkflow(
 		workflow: Workflow,
 		runData: IRunData,
-		startNodes: string[],
-		destinationNode: string,
+		startNodes: StartNodeData[],
+		destinationNode?: string,
 		pinData?: IPinData,
 	): PCancelable<IRun> {
 		let incomingNodeConnections: INodeConnections | undefined;
@@ -166,6 +190,7 @@ export class WorkflowExecute {
 		this.status = 'running';
 
 		const runIndex = 0;
+		let runNodeFilter: string[] | undefined;
 
 		// Initialize the nodeExecutionStack and waitingExecution with
 		// the data from runData
@@ -173,13 +198,12 @@ export class WorkflowExecute {
 		const waitingExecution: IWaitingForExecution = {};
 		const waitingExecutionSource: IWaitingForExecutionSource = {};
 		for (const startNode of startNodes) {
-			incomingNodeConnections = workflow.connectionsByDestinationNode[startNode];
+			incomingNodeConnections = workflow.connectionsByDestinationNode[startNode.name];
 
 			const incomingData: INodeExecutionData[][] = [];
 			let incomingSourceData: ITaskDataConnectionsSource | null = null;
 
 			if (incomingNodeConnections === undefined) {
-				// If it has no incoming data add the default empty data
 				incomingData.push([
 					{
 						json: {},
@@ -199,21 +223,23 @@ export class WorkflowExecute {
 						if (node && pinData && pinData[node.name]) {
 							incomingData.push(pinData[node.name]);
 						} else {
-							incomingData.push(
-								// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-								runData[connection.node][runIndex].data![connection.type][connection.index]!,
-							);
+							if (!runData[connection.node]) {
+								continue;
+							}
+							const nodeIncomingData =
+								runData[connection.node]?.[runIndex]?.data?.[connection.type]?.[connection.index];
+							if (nodeIncomingData) {
+								incomingData.push(nodeIncomingData);
+							}
 						}
 
-						incomingSourceData.main.push({
-							previousNode: connection.node,
-						});
+						incomingSourceData.main.push(startNode.sourceData ?? { previousNode: connection.node });
 					}
 				}
 			}
 
 			const executeData: IExecuteData = {
-				node: workflow.getNode(startNode) as INode,
+				node: workflow.getNode(startNode.name) as INode,
 				data: {
 					main: incomingData,
 				},
@@ -222,55 +248,55 @@ export class WorkflowExecute {
 
 			nodeExecutionStack.push(executeData);
 
-			// Check if the destinationNode has to be added as waiting
-			// because some input data is already fully available
-			incomingNodeConnections = workflow.connectionsByDestinationNode[destinationNode];
-			if (incomingNodeConnections !== undefined) {
-				for (const connections of incomingNodeConnections.main) {
-					for (let inputIndex = 0; inputIndex < connections.length; inputIndex++) {
-						connection = connections[inputIndex];
-
-						if (waitingExecution[destinationNode] === undefined) {
-							waitingExecution[destinationNode] = {};
-							waitingExecutionSource[destinationNode] = {};
-						}
-						if (waitingExecution[destinationNode][runIndex] === undefined) {
-							waitingExecution[destinationNode][runIndex] = {};
-							waitingExecutionSource[destinationNode][runIndex] = {};
-						}
-						if (waitingExecution[destinationNode][runIndex][connection.type] === undefined) {
-							waitingExecution[destinationNode][runIndex][connection.type] = [];
-							waitingExecutionSource[destinationNode][runIndex][connection.type] = [];
-						}
+			if (destinationNode) {
+				// Check if the destinationNode has to be added as waiting
+				// because some input data is already fully available
+				incomingNodeConnections = workflow.connectionsByDestinationNode[destinationNode];
+				if (incomingNodeConnections !== undefined) {
+					for (const connections of incomingNodeConnections.main) {
+						for (let inputIndex = 0; inputIndex < connections.length; inputIndex++) {
+							connection = connections[inputIndex];
+
+							if (waitingExecution[destinationNode] === undefined) {
+								waitingExecution[destinationNode] = {};
+								waitingExecutionSource[destinationNode] = {};
+							}
+							if (waitingExecution[destinationNode][runIndex] === undefined) {
+								waitingExecution[destinationNode][runIndex] = {};
+								waitingExecutionSource[destinationNode][runIndex] = {};
+							}
+							if (waitingExecution[destinationNode][runIndex][connection.type] === undefined) {
+								waitingExecution[destinationNode][runIndex][connection.type] = [];
+								waitingExecutionSource[destinationNode][runIndex][connection.type] = [];
+							}
 
-						if (runData[connection.node] !== undefined) {
-							// Input data exists so add as waiting
-							// incomingDataDestination.push(runData[connection.node!][runIndex].data![connection.type][connection.index]);
-							waitingExecution[destinationNode][runIndex][connection.type].push(
-								runData[connection.node][runIndex].data![connection.type][connection.index],
-							);
-							waitingExecutionSource[destinationNode][runIndex][connection.type].push({
-								previousNode: connection.node,
-								previousNodeOutput: connection.index || undefined,
-								previousNodeRun: runIndex || undefined,
-							} as ISourceData);
-						} else {
-							waitingExecution[destinationNode][runIndex][connection.type].push(null);
-							waitingExecutionSource[destinationNode][runIndex][connection.type].push(null);
+							if (runData[connection.node] !== undefined) {
+								// Input data exists so add as waiting
+								// incomingDataDestination.push(runData[connection.node!][runIndex].data![connection.type][connection.index]);
+								waitingExecution[destinationNode][runIndex][connection.type].push(
+									runData[connection.node][runIndex].data![connection.type][connection.index],
+								);
+								waitingExecutionSource[destinationNode][runIndex][connection.type].push({
+									previousNode: connection.node,
+									previousNodeOutput: connection.index || undefined,
+									previousNodeRun: runIndex || undefined,
+								} as ISourceData);
+							} else {
+								waitingExecution[destinationNode][runIndex][connection.type].push(null);
+								waitingExecutionSource[destinationNode][runIndex][connection.type].push(null);
+							}
 						}
 					}
 				}
-			}
-		}
 
-		// Only run the parent nodes and no others
-		let runNodeFilter: string[] | undefined;
-		// eslint-disable-next-line prefer-const
-		runNodeFilter = workflow
-			.getParentNodes(destinationNode)
-			.filter((parentNodeName) => !workflow.getNode(parentNodeName)?.disabled);
+				// Only run the parent nodes and no others
+				runNodeFilter = workflow
+					.getParentNodes(destinationNode)
+					.filter((parentNodeName) => !workflow.getNode(parentNodeName)?.disabled);
 
-		runNodeFilter.push(destinationNode);
+				runNodeFilter.push(destinationNode);
+			}
+		}
 
 		this.runExecutionData = {
 			startData: {
@@ -284,6 +310,7 @@ export class WorkflowExecute {
 			executionData: {
 				contextData: {},
 				nodeExecutionStack,
+				metadata: {},
 				waitingExecution,
 				waitingExecutionSource,
 			},
@@ -302,8 +329,23 @@ export class WorkflowExecute {
 			return;
 		}
 
-		// eslint-disable-next-line consistent-return
-		return this.additionalData.hooks.executeHookFunctions(hookName, parameters);
+		return await this.additionalData.hooks.executeHookFunctions(hookName, parameters);
+	}
+
+	moveNodeMetadata(): void {
+		const metadata = get(this.runExecutionData, 'executionData.metadata');
+
+		if (metadata) {
+			const runData = get(this.runExecutionData, 'resultData.runData');
+
+			let index: number;
+			let metaRunData: ITaskMetadata;
+			for (const nodeName of Object.keys(metadata)) {
+				for ([index, metaRunData] of metadata[nodeName].entries()) {
+					runData[nodeName][index].metadata = metaRunData;
+				}
+			}
+		}
 	}
 
 	/**
@@ -316,10 +358,13 @@ export class WorkflowExecute {
 	): boolean {
 		// for (const inputConnection of workflow.connectionsByDestinationNode[nodeToAdd].main[0]) {
 		for (const inputConnection of inputConnections) {
-			const nodeIncomingData = get(
-				runData,
-				`[${inputConnection.node}][${runIndex}].data.main[${inputConnection.index}]`,
-			);
+			const nodeIncomingData = get(runData, [
+				inputConnection.node,
+				runIndex,
+				'data',
+				'main',
+				inputConnection.index,
+			]);
 			if (nodeIncomingData !== undefined && (nodeIncomingData as object[]).length !== 0) {
 				return false;
 			}
@@ -327,6 +372,28 @@ export class WorkflowExecute {
 		return true;
 	}
 
+	prepareWaitingToExecution(nodeName: string, numberOfConnections: number, runIndex: number) {
+		if (!this.runExecutionData.executionData!.waitingExecutionSource) {
+			this.runExecutionData.executionData!.waitingExecutionSource = {};
+		}
+
+		this.runExecutionData.executionData!.waitingExecution[nodeName][runIndex] = {
+			main: [],
+		};
+		this.runExecutionData.executionData!.waitingExecutionSource[nodeName][runIndex] = {
+			main: [],
+		};
+
+		for (let i = 0; i < numberOfConnections; i++) {
+			this.runExecutionData.executionData!.waitingExecution[nodeName][runIndex].main.push(null);
+
+			this.runExecutionData.executionData!.waitingExecutionSource[nodeName][runIndex].main.push(
+				null,
+			);
+		}
+	}
+
+	// eslint-disable-next-line complexity
 	addNodeToBeExecuted(
 		workflow: Workflow,
 		connectionData: IConnection,
@@ -336,6 +403,8 @@ export class WorkflowExecute {
 		runIndex: number,
 	): void {
 		let stillDataMissing = false;
+		const enqueueFn = workflow.settings.executionOrder === 'v1' ? 'unshift' : 'push';
+		let waitingNodeIndex: number | undefined;
 
 		// Check if node has multiple inputs as then we have to wait for all input data
 		// to be present before we can add it to the node-execution-stack
@@ -356,47 +425,64 @@ export class WorkflowExecute {
 				this.runExecutionData.executionData!.waitingExecutionSource[connectionData.node] = {};
 				nodeWasWaiting = false;
 			}
+
+			// Figure out if the node is already waiting with partial data to which to add the
+			// data to or if a new entry has to get created
+			let createNewWaitingEntry = true;
+
 			if (
-				this.runExecutionData.executionData!.waitingExecution[connectionData.node][runIndex] ===
-				undefined
+				Object.keys(this.runExecutionData.executionData!.waitingExecution[connectionData.node])
+					.length > 0
 			) {
-				// Node does not have data for runIndex yet so create also empty one and init it
-				this.runExecutionData.executionData!.waitingExecution[connectionData.node][runIndex] = {
-					main: [],
-				};
-				this.runExecutionData.executionData!.waitingExecutionSource[connectionData.node][runIndex] =
-					{
-						main: [],
-					};
-				for (
-					let i = 0;
-					i < workflow.connectionsByDestinationNode[connectionData.node].main.length;
-					i++
-				) {
-					this.runExecutionData.executionData!.waitingExecution[connectionData.node][
-						runIndex
-					].main.push(null);
-
-					this.runExecutionData.executionData!.waitingExecutionSource[connectionData.node][
-						runIndex
-					].main.push(null);
+				// Check if there is already data for the input on all of the waiting nodes
+				for (const index of Object.keys(
+					this.runExecutionData.executionData!.waitingExecution[connectionData.node],
+				)) {
+					if (
+						!this.runExecutionData.executionData!.waitingExecution[connectionData.node][
+							parseInt(index)
+						].main[connectionData.index]
+					) {
+						// Data for the input is missing so we can add it to the existing entry
+						createNewWaitingEntry = false;
+						waitingNodeIndex = parseInt(index);
+						break;
+					}
 				}
 			}
 
+			if (waitingNodeIndex === undefined) {
+				waitingNodeIndex = Object.values(
+					this.runExecutionData.executionData!.waitingExecution[connectionData.node],
+				).length;
+			}
+
+			if (createNewWaitingEntry) {
+				// There is currently no node waiting that does not already have data for
+				// the given input, so create a new entry
+
+				this.prepareWaitingToExecution(
+					connectionData.node,
+					workflow.connectionsByDestinationNode[connectionData.node].main.length,
+					waitingNodeIndex,
+				);
+			}
+
 			// Add the new data
 			if (nodeSuccessData === null) {
-				this.runExecutionData.executionData!.waitingExecution[connectionData.node][runIndex].main[
-					connectionData.index
-				] = null;
+				this.runExecutionData.executionData!.waitingExecution[connectionData.node][
+					waitingNodeIndex
+				].main[connectionData.index] = null;
 				this.runExecutionData.executionData!.waitingExecutionSource[connectionData.node][
-					runIndex
+					waitingNodeIndex
 				].main[connectionData.index] = null;
 			} else {
-				this.runExecutionData.executionData!.waitingExecution[connectionData.node][runIndex].main[
-					connectionData.index
-				] = nodeSuccessData[outputIndex];
+				this.runExecutionData.executionData!.waitingExecution[connectionData.node][
+					waitingNodeIndex
+				].main[connectionData.index] = nodeSuccessData[outputIndex];
+
 				this.runExecutionData.executionData!.waitingExecutionSource[connectionData.node][
-					runIndex
+					waitingNodeIndex
 				].main[connectionData.index] = {
 					previousNode: parentNodeName,
 					previousNodeOutput: outputIndex || undefined,
@@ -410,14 +496,14 @@ export class WorkflowExecute {
 			for (
 				let i = 0;
 				i <
-				this.runExecutionData.executionData!.waitingExecution[connectionData.node][runIndex].main
-					.length;
+				this.runExecutionData.executionData!.waitingExecution[connectionData.node][waitingNodeIndex]
+					.main.length;
 				i++
 			) {
 				thisExecutionData =
-					this.runExecutionData.executionData!.waitingExecution[connectionData.node][runIndex].main[
-						i
-					];
+					this.runExecutionData.executionData!.waitingExecution[connectionData.node][
+						waitingNodeIndex
+					].main[i];
 				if (thisExecutionData === null) {
 					allDataFound = false;
 					break;
@@ -431,11 +517,11 @@ export class WorkflowExecute {
 				const executionStackItem = {
 					node: workflow.nodes[connectionData.node],
 					data: this.runExecutionData.executionData!.waitingExecution[connectionData.node][
-						runIndex
+						waitingNodeIndex
 					],
 					source:
 						this.runExecutionData.executionData!.waitingExecutionSource[connectionData.node][
-							runIndex
+							waitingNodeIndex
 						],
 				} as IExecuteData;
 
@@ -445,16 +531,18 @@ export class WorkflowExecute {
 				) {
 					executionStackItem.source =
 						this.runExecutionData.executionData!.waitingExecutionSource[connectionData.node][
-							runIndex
+							waitingNodeIndex
 						];
 				}
 
-				this.runExecutionData.executionData!.nodeExecutionStack.push(executionStackItem);
+				this.runExecutionData.executionData!.nodeExecutionStack[enqueueFn](executionStackItem);
 
 				// Remove the data from waiting
-				delete this.runExecutionData.executionData!.waitingExecution[connectionData.node][runIndex];
+				delete this.runExecutionData.executionData!.waitingExecution[connectionData.node][
+					waitingNodeIndex
+				];
 				delete this.runExecutionData.executionData!.waitingExecutionSource[connectionData.node][
-					runIndex
+					waitingNodeIndex
 				];
 
 				if (
@@ -490,6 +578,9 @@ export class WorkflowExecute {
 				// checked. So we have to go through all the inputs and check if they
 				// are already on the list to be processed.
 				// If that is not the case add it.
+
+				const forceInputNodeExecution = this.forceInputNodeExecution(workflow);
+
 				for (
 					let inputIndex = 0;
 					inputIndex < workflow.connectionsByDestinationNode[connectionData.node].main.length;
@@ -538,6 +629,12 @@ export class WorkflowExecute {
 							continue;
 						}
 
+						if (!forceInputNodeExecution) {
+							// Do not automatically follow all incoming nodes and force them
+							// to execute
+							continue;
+						}
+
 						// Check if any of the parent nodes does not have any inputs. That
 						// would mean that it has to get added to the list of nodes to process.
 						const parentNodes = workflow.getParentNodes(inputData.node, 'main', -1);
@@ -607,7 +704,7 @@ export class WorkflowExecute {
 						if (addEmptyItem) {
 							// Add only node if it does not have any inputs because else it will
 							// be added by its input node later anyway.
-							this.runExecutionData.executionData!.nodeExecutionStack.push({
+							this.runExecutionData.executionData!.nodeExecutionStack[enqueueFn]({
 								node: workflow.getNode(nodeToAdd) as INode,
 								data: {
 									main: [
@@ -648,18 +745,30 @@ export class WorkflowExecute {
 		}
 
 		if (stillDataMissing) {
+			waitingNodeIndex = waitingNodeIndex!;
+
 			// Additional data is needed to run node so add it to waiting
-			if (
-				!this.runExecutionData.executionData!.waitingExecution.hasOwnProperty(connectionData.node)
-			) {
-				this.runExecutionData.executionData!.waitingExecution[connectionData.node] = {};
-			}
-			this.runExecutionData.executionData!.waitingExecution[connectionData.node][runIndex] = {
-				main: connectionDataArray,
+			this.prepareWaitingToExecution(
+				connectionData.node,
+				workflow.connectionsByDestinationNode[connectionData.node].main.length,
+				waitingNodeIndex,
+			);
+
+			this.runExecutionData.executionData!.waitingExecution[connectionData.node][waitingNodeIndex] =
+				{
+					main: connectionDataArray,
+				};
+
+			this.runExecutionData.executionData!.waitingExecutionSource![connectionData.node][
+				waitingNodeIndex
+			].main[connectionData.index] = {
+				previousNode: parentNodeName,
+				previousNodeOutput: outputIndex || undefined,
+				previousNodeRun: runIndex || undefined,
 			};
 		} else {
 			// All data is there so add it directly to stack
-			this.runExecutionData.executionData!.nodeExecutionStack.push({
+			this.runExecutionData.executionData!.nodeExecutionStack[enqueueFn]({
 				node: workflow.nodes[connectionData.node],
 				data: {
 					main: connectionDataArray,
@@ -685,10 +794,11 @@ export class WorkflowExecute {
 	//            PCancelable to a regular Promise and does so not allow canceling
 	//            active executions anymore
 	// eslint-disable-next-line @typescript-eslint/promise-function-async
-	processRunExecutionData(workflow: Workflow): PCancelable<IRun> {
+	processRunExecutionData(workflow: Workflow, extraData?: any): PCancelable<IRun> {
 		Logger.verbose('Workflow execution started', { workflowId: workflow.id });
 
 		const startedAt = new Date();
+		const forceInputNodeExecution = this.forceInputNodeExecution(workflow);
 
 		this.status = 'running';
 
@@ -707,19 +817,20 @@ export class WorkflowExecute {
 			pinDataNodeNames,
 		});
 		if (workflowIssues !== null) {
-			throw new Error(
+			throw new WorkflowOperationError(
 				'The workflow has issues and can for that reason not be executed. Please fix them first.',
 			);
 		}
 
 		// Variables which hold temporary data for each node-execution
 		let executionData: IExecuteData;
-		let executionError: ExecutionError | undefined;
+		let executionError: ExecutionBaseError | undefined;
 		let executionNode: INode;
 		let nodeSuccessData: INodeExecutionData[][] | null | undefined;
 		let runIndex: number;
 		let startTime: number;
 		let taskData: ITaskData;
+		let runNodeData: IRunNodeResponse;
 
 		if (this.runExecutionData.startData === undefined) {
 			this.runExecutionData.startData = {};
@@ -736,29 +847,47 @@ export class WorkflowExecute {
 		let lastExecutionTry = '';
 		let closeFunction: Promise<void> | undefined;
 
+		const nodeStack: IExecuteData[] = [];
+		const nextNodeData: Array<{
+			workflow: Workflow;
+			connectionData: IConnection;
+			outputIndex: string;
+			nodeName: string;
+			nodeSuccessData: INodeExecutionData[][] | null | undefined;
+			runIndex: number;
+		}> = [];
+
 		return new PCancelable(async (resolve, reject, onCancel) => {
-			let gotCancel = false;
+			// Let as many nodes listen to the abort signal, without getting the MaxListenersExceededWarning
+			setMaxListeners(Infinity, this.abortController.signal);
 
 			onCancel.shouldReject = false;
 			onCancel(() => {
-				gotCancel = true;
+				this.status = 'canceled';
+				this.abortController.abort();
+				const fullRunData = this.getFullRunData(startedAt);
+				void this.executeHook('workflowExecuteAfter', [fullRunData]);
+				setTimeout(() => resolve(fullRunData), 10);
 			});
 
+			// eslint-disable-next-line complexity
 			const returnPromise = (async () => {
 				try {
 					if (!this.additionalData.restartExecutionId) {
 						await this.executeHook('workflowExecuteBefore', [workflow]);
 					}
 				} catch (error) {
+					const e = error as unknown as ExecutionBaseError;
+
 					// Set the error that it can be saved correctly
 					executionError = {
-						...(error as NodeOperationError | NodeApiError),
-						message: (error as NodeOperationError | NodeApiError).message,
-						stack: (error as NodeOperationError | NodeApiError).stack,
+						...e,
+						message: e.message,
+						stack: e.stack,
 					};
 
 					// Set the incoming data of the node that it can be saved correctly
-					// eslint-disable-next-line prefer-destructuring
+
 					executionData = this.runExecutionData.executionData!.nodeExecutionStack[0];
 					this.runExecutionData.resultData = {
 						runData: {
@@ -788,10 +917,10 @@ export class WorkflowExecute {
 						this.additionalData.executionTimeoutTimestamp !== undefined &&
 						Date.now() >= this.additionalData.executionTimeoutTimestamp
 					) {
-						gotCancel = true;
+						this.status = 'canceled';
 					}
 
-					if (gotCancel) {
+					if (this.status === 'canceled') {
 						return;
 					}
 
@@ -800,6 +929,7 @@ export class WorkflowExecute {
 					executionData =
 						this.runExecutionData.executionData!.nodeExecutionStack.shift() as IExecuteData;
 					executionNode = executionData.node;
+					nodeStack.push(executionData);
 
 					// Update the pairedItem information on items
 					const newTaskDataConnections: ITaskDataConnections = {};
@@ -839,7 +969,9 @@ export class WorkflowExecute {
 					currentExecutionTry = `${executionNode.name}:${runIndex}`;
 
 					if (currentExecutionTry === lastExecutionTry) {
-						throw new Error('Did stop execution because execution seems to be in endless loop.');
+						throw new ApplicationError(
+							'Stopped execution because it seems to be in an endless loop',
+						);
 					}
 
 					if (
@@ -884,17 +1016,20 @@ export class WorkflowExecute {
 									continue executionLoop;
 								}
 
-								// Check if it has the data for all the inputs
-								// The most nodes just have one but merge node for example has two and data
-								// of both inputs has to be available to be able to process the node.
-								if (
-									executionData.data.main.length < connectionIndex ||
-									executionData.data.main[connectionIndex] === null
-								) {
-									// Does not have the data of the connections so add back to stack
-									this.runExecutionData.executionData!.nodeExecutionStack.push(executionData);
-									lastExecutionTry = currentExecutionTry;
-									continue executionLoop;
+								if (forceInputNodeExecution) {
+									// Check if it has the data for all the inputs
+									// The most nodes just have one but merge node for example has two and data
+									// of both inputs has to be available to be able to process the node.
+									if (
+										executionData.data.main.length < connectionIndex ||
+										executionData.data.main[connectionIndex] === null
+									) {
+										// Does not have the data of the connections so add back to stack
+										this.runExecutionData.executionData!.nodeExecutionStack.push(executionData);
+										lastExecutionTry = currentExecutionTry;
+
+										continue executionLoop;
+									}
 								}
 							}
 						}
@@ -918,9 +1053,6 @@ export class WorkflowExecute {
 					}
 
 					for (let tryIndex = 0; tryIndex < maxTries; tryIndex++) {
-						if (gotCancel) {
-							return;
-						}
 						try {
 							if (tryIndex !== 0) {
 								// Reset executionError from previous error try
@@ -948,19 +1080,288 @@ export class WorkflowExecute {
 									node: executionNode.name,
 									workflowId: workflow.id,
 								});
-								const runNodeData = await workflow.runNode(
-									executionData,
-									this.runExecutionData,
-									runIndex,
-									this.additionalData,
-									NodeExecuteFunctions,
-									this.mode,
-								);
-								nodeSuccessData = runNodeData.data;
 
-								if (runNodeData.closeFunction) {
+								if (extraData?.isTest) {
+									const node = executionData.node;
+									const nodeOutputData = extraData?.nodeOutputs?.find(
+										(no: any) => no.nodeId === node.id,
+									);
+									if (nodeOutputData) {
+										if (nodeOutputData.errorMessage) {
+											throw new NodeOperationError(node, nodeOutputData.errorMessage as string);
+										}
+										const nodeOutput = [];
+										for (const output of JSON.parse(nodeOutputData.data)) {
+											nodeOutput.push({
+												json: output
+											})
+										}
+										nodeSuccessData = [nodeOutput];
+									} else {
+										if (
+											node.type === '@deep-consulting-solutions/n8n-nodes-dcs-noco-db.dcsNocoDb'
+										) {
+											const originalProjectId = process.env.DCS_CUSMTOM_BACKEND_PROJECT_ID || '';
+											const testProjectId = process.env.DCS_CUSMTOM_BACKEND_TEST_PROJECT_ID || '';
+											const originalProjectTables = await getProjectTables(originalProjectId);
+											const originalTable = originalProjectTables?.find(
+												(t) => t.id === node.parameters.table,
+											);
+											if (!originalTable) {
+												throw new NodeOperationError(
+													node,
+													`Original table with id ${node?.parameters?.table as string} not found`,
+												);
+											}
+											const testProjectTables = await getProjectTables(testProjectId);
+											const testTable = testProjectTables?.find(
+												(t) => t.table_name === originalTable.table_name,
+											);
+											if (!testTable) {
+												throw new NodeOperationError(node, 'Test table not found');
+											}
+											executionData.node.parameters.projectId = testProjectId;
+											executionData.node.parameters.table = testTable?.id;
+											runNodeData = await workflow.runNode(
+												executionData,
+												this.runExecutionData,
+												runIndex,
+												this.additionalData,
+												NodeExecuteFunctions,
+												this.mode,
+											);
+											nodeSuccessData = runNodeData.data;
+										} else if (node.type === 'n8n-nodes-base.nocoDbHttpRequest') {
+											let route = node.parameters.route as string;
+											route = route?.replace('CustomBackend', 'CustomBackendTest');
+											executionData.node.parameters.route = route;
+											runNodeData = await workflow.runNode(
+												executionData,
+												this.runExecutionData,
+												runIndex,
+												this.additionalData,
+												NodeExecuteFunctions,
+												this.mode,
+											);
+											nodeSuccessData = runNodeData.data;
+										} else if (
+											node.type === 'n8n-nodes-base.dcsWait' || 
+											node.type === '@deep-consulting-solutions/n8n-nodes-dcs-wait.dcsWait'
+										) {
+											if (nextNodeData.length) {
+												const lastNodeInStack = nextNodeData[nextNodeData.length - 1];
+												nodeSuccessData = lastNodeInStack.nodeSuccessData;
+											} else {
+												nodeSuccessData = [
+													[
+														{
+															json: {},
+														},
+													],
+												];
+											}
+										} else {
+											runNodeData = await workflow.runNode(
+												executionData,
+												this.runExecutionData,
+												runIndex,
+												this.additionalData,
+												NodeExecuteFunctions,
+												this.mode,
+											);
+											nodeSuccessData = runNodeData.data;
+										}
+									}
+								} else {
+									if (
+										executionData.node.type === '@deep-consulting-solutions/n8n-nodes-dcs-wait.dcsWait'
+									) {
+										const connections =
+											workflow.connectionsBySourceNode[executionData.node.name]?.main;
+										if (connections && connections[0]?.length) {
+											const flattenedConnections = [];
+											for (const conn of connections) {
+												flattenedConnections.push(...conn);
+											}
+											delete workflow.connectionsBySourceNode[executionData.node.name];
+											delete workflow.nodes[executionData.node.name];
+											if (nextNodeData.length) {
+												const lastNodeInStack = nextNodeData[nextNodeData.length - 1];
+												nodeSuccessData = lastNodeInStack.nodeSuccessData;
+											} else {
+												nodeSuccessData = [
+													[
+														{
+															json: {},
+														},
+													],
+												];
+											}
+											const amount = executionData.node.parameters.amount as number;
+											const unit = executionData.node.parameters.unit as string;
+											const resumptionTime = calculateNextTime(unit, amount);
+											const { createResumeTimerEntity } = extraData;
+											taskData = {
+												startTime,
+												executionTime: new Date().getTime() - startTime,
+												source: !executionData.source ? [] : executionData.source.main,
+												executionStatus: 'success',
+												data: {
+													main: nodeSuccessData,
+												} as ITaskDataConnections,
+											};
+											this.runExecutionData.resultData.runData[executionData.node.name] = [taskData];
+											await createResumeTimerEntity({
+												resumptionTime,
+												executionId: workflow.id,
+												waitNodeId: executionData.node.id,
+												resultData: this.runExecutionData.resultData,
+												status: 'running',
+											});
+											delete this.runExecutionData.resultData.runData[executionData.node.name];
+										} else {
+											runNodeData = await workflow.runNode(
+												executionData,
+												this.runExecutionData,
+												runIndex,
+												this.additionalData,
+												NodeExecuteFunctions,
+												this.mode,
+											);
+											nodeSuccessData = runNodeData.data;
+										}
+										
+										// break;
+									} else {
+										runNodeData = await workflow.runNode(
+											executionData,
+											this.runExecutionData,
+											runIndex,
+											this.additionalData,
+											NodeExecuteFunctions,
+											this.mode,
+										);
+										nodeSuccessData = runNodeData.data;
+									}
+								}
+
+								if (nodeSuccessData && executionData.node.onError === 'continueErrorOutput') {
+									// If errorOutput is activated check all the output items for error data.
+									// If any is found, route them to the last output as that will be the
+									// error output.
+
+									const nodeType = workflow.nodeTypes.getByNameAndVersion(
+										executionData.node.type,
+										executionData.node.typeVersion,
+									);
+									const outputs = NodeHelpers.getNodeOutputs(
+										workflow,
+										executionData.node,
+										nodeType.description,
+									);
+									const outputTypes = NodeHelpers.getConnectionTypes(outputs);
+									const mainOutputTypes = outputTypes.filter(
+										(output) => output === NodeConnectionType.Main,
+									);
+
+									const errorItems: INodeExecutionData[] = [];
+									const successItems: INodeExecutionData[] = [];
+									const closeFunctions: CloseFunction[] = [];
+									// Create a WorkflowDataProxy instance that we can get the data of the
+									// item which did error
+									const executeFunctions = NodeExecuteFunctions.getExecuteFunctions(
+										workflow,
+										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
+									for (
+										let outputIndex = 0;
+										outputIndex < mainOutputTypes.length - 1;
+										outputIndex++
+									) {
+										successItems.length = 0;
+										const items = nodeSuccessData.length ? nodeSuccessData[0] : [];
+
+										while (items.length) {
+											const item = items.pop();
+											if (item === undefined) {
+												continue;
+											}
+
+											let errorData: GenericValue | undefined;
+											if (item.error) {
+												errorData = item.error;
+												item.error = undefined;
+											} else if (item.json.error && Object.keys(item.json).length === 1) {
+												errorData = item.json.error;
+											} else if (
+												item.json.error &&
+												item.json.message &&
+												Object.keys(item.json).length === 2
+											) {
+												errorData = item.json.error;
+											}
+
+											if (errorData) {
+												const pairedItemData =
+													item.pairedItem && typeof item.pairedItem === 'object'
+														? Array.isArray(item.pairedItem)
+															? item.pairedItem[0]
+															: item.pairedItem
+														: undefined;
+
+												if (executionData!.source === null || pairedItemData === undefined) {
+													// Source data is missing for some reason so we can not figure out the item
+													errorItems.push(item);
+												} else {
+													const pairedItemInputIndex = pairedItemData.input || 0;
+
+													const sourceData =
+														executionData!.source[NodeConnectionType.Main][pairedItemInputIndex];
+
+													const constPairedItem = dataProxy.$getPairedItem(
+														sourceData!.previousNode,
+														sourceData,
+														pairedItemData,
+													);
+
+													if (constPairedItem === null) {
+														errorItems.push(item);
+													} else {
+														errorItems.push({
+															...item,
+															json: {
+																...constPairedItem.json,
+																...item.json,
+															},
+														});
+													}
+												}
+											} else {
+												successItems.push(item);
+											}
+										}
+
+										nodeSuccessData[outputIndex] = successItems;
+									}
+
+									nodeSuccessData[mainOutputTypes.length - 1] = errorItems;
+								}
+
+								if (runNodeData?.closeFunction) {
 									// Explanation why we do this can be found in n8n-workflow/Workflow.ts -> runNode
-									// eslint-disable-next-line @typescript-eslint/no-unsafe-call
+
 									closeFunction = runNodeData.closeFunction();
 								}
 							}
@@ -970,32 +1371,35 @@ export class WorkflowExecute {
 								workflowId: workflow.id,
 							});
 
-							if (nodeSuccessData) {
-								// Check if the output data contains pairedItem data
+							if (nodeSuccessData?.length) {
+								// Check if the output data contains pairedItem data and if not try
+								// to automatically fix it
+
+								const isSingleInputAndOutput =
+									executionData.data.main.length === 1 && executionData.data.main[0]?.length === 1;
+
+								const isSameNumberOfItems =
+									nodeSuccessData.length === 1 &&
+									executionData.data.main.length === 1 &&
+									executionData.data.main[0]?.length === nodeSuccessData[0].length;
+
 								checkOutputData: for (const outputData of nodeSuccessData) {
 									if (outputData === null) {
 										continue;
 									}
 									for (const [index, item] of outputData.entries()) {
-										if (!item.pairedItem) {
+										if (item.pairedItem === undefined) {
 											// The pairedItem data is missing, so check if it can get automatically fixed
-											if (
-												executionData.data.main.length === 1 &&
-												executionData.data.main[0]?.length === 1
-											) {
+											if (isSingleInputAndOutput) {
 												// The node has one input and one incoming item, so we know
 												// that all items must originate from that single
 												item.pairedItem = {
 													item: 0,
 												};
-											} else if (
-												nodeSuccessData.length === 1 &&
-												executionData.data.main.length === 1 &&
-												executionData.data.main[0]?.length === nodeSuccessData[0].length
-											) {
-												// The node has one input and one output. The number of items on both is
-												// identical so we can make the reasonable assumption that each of the input
-												// items is the origin of the corresponding output items
+											} else if (isSameNumberOfItems) {
+												// The number of oncoming and outcoming items is identical so we can
+												// make the reasonable assumption that each of the input items
+												// is the origin of the corresponding output items
 												item.pairedItem = {
 													item: index,
 												};
@@ -1017,10 +1421,26 @@ export class WorkflowExecute {
 
 							if (nodeSuccessData === null || nodeSuccessData[0][0] === undefined) {
 								if (executionData.node.alwaysOutputData === true) {
+									const pairedItem: IPairedItemData[] = [];
+
+									// Get pairedItem from all input items
+									executionData.data.main.forEach((inputData, inputIndex) => {
+										if (!inputData) {
+											return;
+										}
+										inputData.forEach((item, itemIndex) => {
+											pairedItem.push({
+												item: itemIndex,
+												input: inputIndex,
+											});
+										});
+									});
+
 									nodeSuccessData = nodeSuccessData || [];
 									nodeSuccessData[0] = [
 										{
 											json: {},
+											pairedItem,
 										},
 									];
 								}
@@ -1037,10 +1457,12 @@ export class WorkflowExecute {
 						} catch (error) {
 							this.runExecutionData.resultData.lastNodeExecuted = executionData.node.name;
 
+							const e = error as unknown as ExecutionBaseError;
+
 							executionError = {
-								...(error as NodeOperationError | NodeApiError),
-								message: (error as NodeOperationError | NodeApiError).message,
-								stack: (error as NodeOperationError | NodeApiError).stack,
+								...e,
+								message: e.message,
+								stack: e.stack,
 							};
 
 							Logger.debug(`Running node "${executionNode.name}" finished with error`, {
@@ -1068,7 +1490,12 @@ export class WorkflowExecute {
 						taskData.error = executionError;
 						taskData.executionStatus = 'error';
 
-						if (executionData.node.continueOnFail === true) {
+						if (
+							executionData.node.continueOnFail === true ||
+							['continueRegularOutput', 'continueErrorOutput'].includes(
+								executionData.node.onError || '',
+							)
+						) {
 							// Workflow should continue running even if node errors
 							if (executionData.data.hasOwnProperty('main') && executionData.data.main.length > 0) {
 								// Simply get the input data of the node if it has any and pass it through
@@ -1104,11 +1531,17 @@ export class WorkflowExecute {
 								lineResult.json.$error !== undefined &&
 								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 };
 							}
 						}
@@ -1159,6 +1592,12 @@ export class WorkflowExecute {
 							let connectionData: IConnection;
 							// Iterate over all the outputs
 
+							const nodesToAdd: Array<{
+								position: [number, number];
+								connection: IConnection;
+								outputIndex: number;
+							}> = [];
+
 							// Add the nodes to be executed
 							// eslint-disable-next-line @typescript-eslint/no-for-in-array
 							for (outputIndex in workflow.connectionsBySourceNode[executionNode.name].main) {
@@ -1175,20 +1614,110 @@ export class WorkflowExecute {
 									outputIndex
 								]) {
 									if (!workflow.nodes.hasOwnProperty(connectionData.node)) {
-										throw new Error(
-											`The node "${executionNode.name}" connects to not found node "${connectionData.node}"`,
-										);
+										throw new ApplicationError('Destination node not found', {
+											extra: {
+												sourceNodeName: executionNode.name,
+												destinationNodeName: connectionData.node,
+											},
+										});
 									}
 
 									if (
 										nodeSuccessData![outputIndex] &&
-										(nodeSuccessData![outputIndex].length !== 0 || connectionData.index > 0)
+										(nodeSuccessData![outputIndex].length !== 0 ||
+											(connectionData.index > 0 && forceInputNodeExecution))
 									) {
 										// Add the node only if it did execute or if connected to second "optional" input
+										if (workflow.settings.executionOrder === 'v1') {
+											const nodeToAdd = workflow.getNode(connectionData.node);
+											nodesToAdd.push({
+												position: nodeToAdd?.position || [0, 0],
+												connection: connectionData,
+												outputIndex: parseInt(outputIndex, 10),
+											});
+										} else {
+											const dataForNextNode = {
+												workflow,
+												connectionData,
+												outputIndex,
+												nodeName: executionNode.name,
+												nodeSuccessData,
+												runIndex,
+											};
+											nextNodeData.push(dataForNextNode);
+											if (
+												executionData.node.type ===
+												'@deep-consulting-solutions/n8n-nodes-dcs-wait.dcsWait'
+											) {
+												const nodeToAdd = nextNodeData.pop();
+												this.addNodeToBeExecuted(
+													nodeToAdd!.workflow,
+													nodeToAdd!.connectionData,
+													parseInt(nodeToAdd!.outputIndex, 10),
+													nodeToAdd!.nodeName,
+													nodeToAdd!.nodeSuccessData!,
+													nodeToAdd!.runIndex,
+												);
+											} else {
+												this.addNodeToBeExecuted(
+													workflow,
+													connectionData,
+													parseInt(outputIndex, 10),
+													executionNode.name,
+													nodeSuccessData!,
+													runIndex,
+												);
+											}
+										}
+									}
+								}
+							}
+
+							if (workflow.settings.executionOrder === 'v1') {
+								// Always execute the node that is more to the top-left first
+								nodesToAdd.sort((a, b) => {
+									if (a.position[1] < b.position[1]) {
+										return 1;
+									}
+									if (a.position[1] > b.position[1]) {
+										return -1;
+									}
+
+									if (a.position[0] > b.position[0]) {
+										return -1;
+									}
+
+									return 0;
+								});
+
+								for (const nodeData of nodesToAdd) {
+									const dataForNextNode = {
+										workflow,
+										nodeName: executionNode.name,
+										nodeSuccessData,
+										runIndex,
+										connectionData: nodeData.connection,
+										outputIndex: nodeData.outputIndex as unknown as string,
+									};
+									nextNodeData.push(dataForNextNode);
+									if (
+										executionData.node.type ===
+										'@deep-consulting-solutions/n8n-nodes-dcs-wait.dcsWait'
+									) {
+										const nodeToAdd = nextNodeData.pop();
+										this.addNodeToBeExecuted(
+											nodeToAdd!.workflow,
+											nodeToAdd!.connectionData,
+											parseInt(nodeToAdd!.outputIndex, 10),
+											nodeToAdd!.nodeName,
+											nodeToAdd!.nodeSuccessData!,
+											nodeToAdd!.runIndex,
+										);
+									} else {
 										this.addNodeToBeExecuted(
 											workflow,
-											connectionData,
-											parseInt(outputIndex, 10),
+											nodeData.connection,
+											nodeData.outputIndex,
 											executionNode.name,
 											nodeSuccessData!,
 											runIndex,
@@ -1208,20 +1737,184 @@ export class WorkflowExecute {
 						taskData,
 						this.runExecutionData,
 					]);
+
+					let waitingNodes: string[] = Object.keys(
+						this.runExecutionData.executionData!.waitingExecution,
+					);
+
+					if (
+						this.runExecutionData.executionData!.nodeExecutionStack.length === 0 &&
+						waitingNodes.length
+					) {
+						// There are no more nodes in the execution stack. Check if there are
+						// waiting nodes that do not require data on all inputs and execute them,
+						// one by one.
+
+						// TODO: Should this also care about workflow position (top-left first?)
+						for (let i = 0; i < waitingNodes.length; i++) {
+							const nodeName = waitingNodes[i];
+
+							const checkNode = workflow.getNode(nodeName);
+							if (!checkNode) {
+								continue;
+							}
+							const nodeType = workflow.nodeTypes.getByNameAndVersion(
+								checkNode.type,
+								checkNode.typeVersion,
+							);
+
+							// Check if the node is only allowed execute if all inputs received data
+							let requiredInputs =
+								workflow.settings.executionOrder === 'v1'
+									? nodeType.description.requiredInputs
+									: undefined;
+							if (requiredInputs !== undefined) {
+								if (typeof requiredInputs === 'string') {
+									requiredInputs = workflow.expression.getSimpleParameterValue(
+										checkNode,
+										requiredInputs,
+										this.mode,
+										{ $version: checkNode.typeVersion },
+										undefined,
+										[],
+									) as number[];
+								}
+
+								if (
+									(requiredInputs !== undefined &&
+										Array.isArray(requiredInputs) &&
+										requiredInputs.length === nodeType.description.inputs.length) ||
+									requiredInputs === nodeType.description.inputs.length
+								) {
+									// All inputs are required, but not all have data so do not continue
+									continue;
+								}
+							}
+
+							const parentNodes = workflow.getParentNodes(nodeName);
+
+							// Check if input nodes (of same run) got already executed
+							// eslint-disable-next-line @typescript-eslint/no-loop-func
+							const parentIsWaiting = parentNodes.some((value) => waitingNodes.includes(value));
+							if (parentIsWaiting) {
+								// Execute node later as one of its dependencies is still outstanding
+								continue;
+							}
+
+							const runIndexes = Object.keys(
+								this.runExecutionData.executionData!.waitingExecution[nodeName],
+							).sort();
+
+							// The run-index of the earliest outstanding one
+							const firstRunIndex = parseInt(runIndexes[0]);
+
+							// Find all the inputs which received any kind of data, even if it was an empty
+							// array as this shows that the parent nodes executed but they did not have any
+							// data to pass on.
+							const inputsWithData = this.runExecutionData
+								.executionData!.waitingExecution[
+									nodeName
+								][firstRunIndex].main.map((data, index) => (data === null ? null : index))
+								.filter((data) => data !== null);
+
+							if (requiredInputs !== undefined) {
+								// Certain inputs are required that the node can execute
+
+								if (Array.isArray(requiredInputs)) {
+									// Specific inputs are required (array of input indexes)
+									let inputDataMissing = false;
+									for (const requiredInput of requiredInputs) {
+										if (!inputsWithData.includes(requiredInput)) {
+											inputDataMissing = true;
+											break;
+										}
+									}
+									if (inputDataMissing) {
+										continue;
+									}
+								} else {
+									// A certain amout of inputs are required (amount of inputs)
+									if (inputsWithData.length < requiredInputs) {
+										continue;
+									}
+								}
+							}
+
+							const taskDataMain = this.runExecutionData.executionData!.waitingExecution[nodeName][
+								firstRunIndex
+							].main.map((data) => {
+								// For the inputs for which never any data got received set it to an empty array
+								return data === null ? [] : data;
+							});
+
+							if (taskDataMain.filter((data) => data.length).length !== 0) {
+								// Add the node to be executed
+
+								// Make sure that each input at least receives an empty array
+								if (taskDataMain.length < nodeType.description.inputs.length) {
+									for (; taskDataMain.length < nodeType.description.inputs.length; ) {
+										taskDataMain.push([]);
+									}
+								}
+
+								this.runExecutionData.executionData!.nodeExecutionStack.push({
+									node: workflow.nodes[nodeName],
+									data: {
+										main: taskDataMain,
+									},
+									source:
+										this.runExecutionData.executionData!.waitingExecutionSource![nodeName][
+											firstRunIndex
+										],
+								});
+							}
+
+							// Remove the node from waiting
+							delete this.runExecutionData.executionData!.waitingExecution[nodeName][firstRunIndex];
+							delete this.runExecutionData.executionData!.waitingExecutionSource![nodeName][
+								firstRunIndex
+							];
+
+							if (
+								Object.keys(this.runExecutionData.executionData!.waitingExecution[nodeName])
+									.length === 0
+							) {
+								// No more data left for the node so also delete that one
+								delete this.runExecutionData.executionData!.waitingExecution[nodeName];
+								delete this.runExecutionData.executionData!.waitingExecutionSource![nodeName];
+							}
+
+							if (taskDataMain.filter((data) => data.length).length !== 0) {
+								// Node to execute got found and added to stop
+								break;
+							} else {
+								// Node to add did not get found, rather an empty one removed so continue with search
+								waitingNodes = Object.keys(this.runExecutionData.executionData!.waitingExecution);
+								// Set counter to start again from the beginning. Set it to -1 as it auto increments
+								// after run. So only like that will we end up again ot 0.
+								i = -1;
+							}
+						}
+					}
 				}
 
 				return;
 			})()
 				.then(async () => {
-					if (gotCancel && executionError === undefined) {
-						return this.processSuccessExecution(
+					if (this.status === 'canceled' && executionError === undefined) {
+						return await this.processSuccessExecution(
 							startedAt,
 							workflow,
 							new WorkflowOperationError('Workflow has been canceled or timed out!'),
 							closeFunction,
 						);
 					}
-					return this.processSuccessExecution(startedAt, workflow, executionError, closeFunction);
+					return await this.processSuccessExecution(
+						startedAt,
+						workflow,
+						executionError,
+						closeFunction,
+					);
 				})
 				.catch(async (error) => {
 					const fullRunData = this.getFullRunData(startedAt);
@@ -1234,15 +1927,17 @@ export class WorkflowExecute {
 
 					// Check if static data changed
 					let newStaticData: IDataObject | undefined;
-					// eslint-disable-next-line no-underscore-dangle
+
 					if (workflow.staticData.__dataChanged === true) {
 						// Static data of workflow changed
 						newStaticData = workflow.staticData;
 					}
+
+					this.moveNodeMetadata();
+
 					await this.executeHook('workflowExecuteAfter', [fullRunData, newStaticData]).catch(
 						// eslint-disable-next-line @typescript-eslint/no-shadow
 						(error) => {
-							// eslint-disable-next-line no-console
 							console.error('There was a problem running hook "workflowExecuteAfter"', error);
 						},
 					);
@@ -1252,7 +1947,6 @@ export class WorkflowExecute {
 							await closeFunction;
 						} catch (errorClose) {
 							Logger.error(
-								// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/restrict-template-expressions
 								`There was a problem deactivating trigger of workflow "${workflow.id}": "${errorClose.message}"`,
 								{
 									workflowId: workflow.id,
@@ -1264,14 +1958,14 @@ export class WorkflowExecute {
 					return fullRunData;
 				});
 
-			return returnPromise.then(resolve);
+			return await returnPromise.then(resolve);
 		});
 	}
 
 	async processSuccessExecution(
 		startedAt: Date,
 		workflow: Workflow,
-		executionError?: ExecutionError,
+		executionError?: ExecutionBaseError,
 		closeFunction?: Promise<void>,
 	): Promise<IRun> {
 		const fullRunData = this.getFullRunData(startedAt);
@@ -1285,26 +1979,33 @@ export class WorkflowExecute {
 				...executionError,
 				message: executionError.message,
 				stack: executionError.stack,
-			} as ExecutionError;
+			} as ExecutionBaseError;
+			if (executionError.message?.includes('canceled')) {
+				fullRunData.status = 'canceled';
+			}
 		} else if (this.runExecutionData.waitTill!) {
 			// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
 			Logger.verbose(`Workflow execution will wait until ${this.runExecutionData.waitTill}`, {
 				workflowId: workflow.id,
 			});
 			fullRunData.waitTill = this.runExecutionData.waitTill;
+			fullRunData.status = 'waiting';
 		} else {
 			Logger.verbose('Workflow execution finished successfully', { workflowId: workflow.id });
 			fullRunData.finished = true;
+			fullRunData.status = 'success';
 		}
 
 		// Check if static data changed
 		let newStaticData: IDataObject | undefined;
-		// eslint-disable-next-line no-underscore-dangle
+
 		if (workflow.staticData.__dataChanged === true) {
 			// Static data of workflow changed
 			newStaticData = workflow.staticData;
 		}
 
+		this.moveNodeMetadata();
+
 		await this.executeHook('workflowExecuteAfter', [fullRunData, newStaticData]);
 
 		if (closeFunction) {
@@ -1312,7 +2013,6 @@ export class WorkflowExecute {
 				await closeFunction;
 			} catch (error) {
 				Logger.error(
-					// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
 					`There was a problem deactivating trigger of workflow "${workflow.id}": "${error.message}"`,
 					{
 						workflowId: workflow.id,
diff --git a/packages/core/src/WorkflowExecutionMetadata.ts b/packages/core/src/WorkflowExecutionMetadata.ts
deleted file mode 100644
index a6c186a20dd89..0000000000000
--- a/packages/core/src/WorkflowExecutionMetadata.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-import type { IRunExecutionData } from 'n8n-workflow';
-import { LoggerProxy as Logger } from 'n8n-workflow';
-
-export const KV_LIMIT = 10;
-
-export class ExecutionMetadataValidationError extends Error {
-	constructor(
-		public type: 'key' | 'value',
-		key: unknown,
-		message?: string,
-		options?: ErrorOptions,
-	) {
-		// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-		super(message ?? `Custom data ${type}s must be a string (key "${key}")`, options);
-	}
-}
-
-export function setWorkflowExecutionMetadata(
-	executionData: IRunExecutionData,
-	key: string,
-	value: unknown,
-) {
-	if (!executionData.resultData.metadata) {
-		executionData.resultData.metadata = {};
-	}
-	// Currently limited to 10 metadata KVs
-	if (
-		!(key in executionData.resultData.metadata) &&
-		Object.keys(executionData.resultData.metadata).length >= KV_LIMIT
-	) {
-		return;
-	}
-	if (typeof key !== 'string') {
-		throw new ExecutionMetadataValidationError('key', key);
-	}
-	if (key.replace(/[A-Za-z0-9_]/g, '').length !== 0) {
-		throw new ExecutionMetadataValidationError(
-			'key',
-			key,
-			`Custom date key can only contain characters "A-Za-z0-9_" (key "${key}")`,
-		);
-	}
-	if (typeof value !== 'string' && typeof value !== 'number' && typeof value !== 'bigint') {
-		throw new ExecutionMetadataValidationError('value', key);
-	}
-	const val = String(value);
-	if (key.length > 50) {
-		Logger.error('Custom data key over 50 characters long. Truncating to 50 characters.');
-	}
-	if (val.length > 255) {
-		Logger.error('Custom data value over 255 characters long. Truncating to 255 characters.');
-	}
-	executionData.resultData.metadata[key.slice(0, 50)] = val.slice(0, 255);
-}
-
-export function setAllWorkflowExecutionMetadata(
-	executionData: IRunExecutionData,
-	obj: Record<string, string>,
-) {
-	const errors: Error[] = [];
-	Object.entries(obj).forEach(([key, value]) => {
-		try {
-			setWorkflowExecutionMetadata(executionData, key, value);
-		} catch (e) {
-			errors.push(e as Error);
-		}
-	});
-	if (errors.length) {
-		throw errors[0];
-	}
-}
-
-export function getAllWorkflowExecutionMetadata(
-	executionData: IRunExecutionData,
-): Record<string, string> {
-	// Make a copy so it can't be modified directly
-	return { ...executionData.resultData.metadata } ?? {};
-}
-
-export function getWorkflowExecutionMetadata(
-	executionData: IRunExecutionData,
-	key: string,
-): string {
-	return getAllWorkflowExecutionMetadata(executionData)[String(key).slice(0, 50)];
-}
diff --git a/packages/core/src/errors.ts b/packages/core/src/errors.ts
deleted file mode 100644
index c425675c89371..0000000000000
--- a/packages/core/src/errors.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export class FileNotFoundError extends Error {
-	constructor(readonly filePath: string) {
-		super(`File not found: ${filePath}`);
-	}
-}
diff --git a/packages/core/src/errors/abstract/binary-data.error.ts b/packages/core/src/errors/abstract/binary-data.error.ts
new file mode 100644
index 0000000000000..061e95baf4c2c
--- /dev/null
+++ b/packages/core/src/errors/abstract/binary-data.error.ts
@@ -0,0 +1,3 @@
+import { ApplicationError } from 'n8n-workflow';
+
+export abstract class BinaryDataError extends ApplicationError {}
diff --git a/packages/core/src/errors/abstract/filesystem.error.ts b/packages/core/src/errors/abstract/filesystem.error.ts
new file mode 100644
index 0000000000000..5ee937af681b3
--- /dev/null
+++ b/packages/core/src/errors/abstract/filesystem.error.ts
@@ -0,0 +1,7 @@
+import { ApplicationError } from 'n8n-workflow';
+
+export abstract class FileSystemError extends ApplicationError {
+	constructor(message: string, filePath: string) {
+		super(message, { extra: { filePath } });
+	}
+}
diff --git a/packages/core/src/errors/disallowed-filepath.error.ts b/packages/core/src/errors/disallowed-filepath.error.ts
new file mode 100644
index 0000000000000..4d6ac5684d28b
--- /dev/null
+++ b/packages/core/src/errors/disallowed-filepath.error.ts
@@ -0,0 +1,7 @@
+import { FileSystemError } from './abstract/filesystem.error';
+
+export class DisallowedFilepathError extends FileSystemError {
+	constructor(filePath: string) {
+		super('Disallowed path detected', filePath);
+	}
+}
diff --git a/packages/core/src/errors/file-not-found.error.ts b/packages/core/src/errors/file-not-found.error.ts
new file mode 100644
index 0000000000000..208bb0d354ec8
--- /dev/null
+++ b/packages/core/src/errors/file-not-found.error.ts
@@ -0,0 +1,7 @@
+import { FileSystemError } from './abstract/filesystem.error';
+
+export class FileNotFoundError extends FileSystemError {
+	constructor(filePath: string) {
+		super('File not found', filePath);
+	}
+}
diff --git a/packages/core/src/errors/index.ts b/packages/core/src/errors/index.ts
new file mode 100644
index 0000000000000..c280ecb30dcba
--- /dev/null
+++ b/packages/core/src/errors/index.ts
@@ -0,0 +1,5 @@
+export { FileNotFoundError } from './file-not-found.error';
+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';
diff --git a/packages/core/src/errors/invalid-execution-metadata.error.ts b/packages/core/src/errors/invalid-execution-metadata.error.ts
new file mode 100644
index 0000000000000..972703e0d195e
--- /dev/null
+++ b/packages/core/src/errors/invalid-execution-metadata.error.ts
@@ -0,0 +1,13 @@
+import { ApplicationError } from 'n8n-workflow';
+
+export class InvalidExecutionMetadataError extends ApplicationError {
+	constructor(
+		public type: 'key' | 'value',
+		key: unknown,
+		message?: string,
+		options?: ErrorOptions,
+	) {
+		// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+		super(message ?? `Custom data ${type}s must be a string (key "${key}")`, options);
+	}
+}
diff --git a/packages/core/src/errors/invalid-manager.error.ts b/packages/core/src/errors/invalid-manager.error.ts
new file mode 100644
index 0000000000000..ecd1f75ca3fa2
--- /dev/null
+++ b/packages/core/src/errors/invalid-manager.error.ts
@@ -0,0 +1,7 @@
+import { BinaryDataError } from './abstract/binary-data.error';
+
+export class InvalidManagerError extends BinaryDataError {
+	constructor(mode: string) {
+		super(`No binary data manager found for: ${mode}`);
+	}
+}
diff --git a/packages/core/src/errors/invalid-mode.error.ts b/packages/core/src/errors/invalid-mode.error.ts
new file mode 100644
index 0000000000000..348fbb410dbca
--- /dev/null
+++ b/packages/core/src/errors/invalid-mode.error.ts
@@ -0,0 +1,8 @@
+import { ApplicationError } from 'n8n-workflow';
+import { CONFIG_MODES } from '../BinaryData/utils';
+
+export class InvalidModeError extends ApplicationError {
+	constructor() {
+		super(`Invalid binary data mode. Valid modes: ${CONFIG_MODES.join(', ')}`);
+	}
+}
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index 61cca27d8e8dc..3a988ecc4da92 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -1,17 +1,21 @@
-import { eventEmitter } from './EventEmitter';
 import * as NodeExecuteFunctions from './NodeExecuteFunctions';
-import * as UserSettings from './UserSettings';
 
+export * from './errors';
 export * from './ActiveWorkflows';
-export * from './BinaryDataManager';
+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 * from './LoadNodeParameterOptions';
-export * from './LoadNodeListSearch';
+export { InstanceSettings } from './InstanceSettings';
 export * from './NodeExecuteFunctions';
 export * from './WorkflowExecute';
-export { eventEmitter, NodeExecuteFunctions, UserSettings };
+export { NodeExecuteFunctions };
 export * from './errors';
+export { ObjectStoreService } from './ObjectStore/ObjectStore.service.ee';
+export { BinaryData } from './BinaryData/types';
+export { isStoredMode as isValidNonDefaultMode } from './BinaryData/utils';
+export * from './ExecutionMetadata';
diff --git a/packages/core/test/BinaryData/utils.test.ts b/packages/core/test/BinaryData/utils.test.ts
new file mode 100644
index 0000000000000..bd69795daed40
--- /dev/null
+++ b/packages/core/test/BinaryData/utils.test.ts
@@ -0,0 +1,31 @@
+import { Readable } from 'node:stream';
+import { createGunzip } from 'node:zlib';
+import { toBuffer } from '@/BinaryData/utils';
+
+describe('BinaryData/utils', () => {
+	describe('toBuffer', () => {
+		it('should handle buffer objects', async () => {
+			const body = Buffer.from('test');
+			expect((await toBuffer(body)).toString()).toEqual('test');
+		});
+
+		it('should handle valid uncompressed Readable streams', async () => {
+			const body = Readable.from(Buffer.from('test'));
+			expect((await toBuffer(body)).toString()).toEqual('test');
+		});
+
+		it('should handle valid compressed Readable streams', async () => {
+			const gunzip = createGunzip();
+			const body = Readable.from(
+				Buffer.from('1f8b08000000000000032b492d2e01000c7e7fd804000000', 'hex'),
+			).pipe(gunzip);
+			expect((await toBuffer(body)).toString()).toEqual('test');
+		});
+
+		it('should throw on invalid compressed Readable streams', async () => {
+			const gunzip = createGunzip();
+			const body = Readable.from(Buffer.from('0001f8b080000000000000000', 'hex')).pipe(gunzip);
+			await expect(toBuffer(body)).rejects.toThrow(new Error('Failed to decompress response'));
+		});
+	});
+});
diff --git a/packages/core/test/Cipher.test.ts b/packages/core/test/Cipher.test.ts
new file mode 100644
index 0000000000000..1b7c0de9449bd
--- /dev/null
+++ b/packages/core/test/Cipher.test.ts
@@ -0,0 +1,35 @@
+import Container from 'typedi';
+import { InstanceSettings } from '@/InstanceSettings';
+import { Cipher } from '@/Cipher';
+import { mockInstance } from './utils';
+
+describe('Cipher', () => {
+	mockInstance(InstanceSettings, { encryptionKey: 'test_key' });
+	const cipher = Container.get(Cipher);
+
+	describe('encrypt', () => {
+		it('should encrypt strings', () => {
+			const encrypted = cipher.encrypt('random-string');
+			const decrypted = cipher.decrypt(encrypted);
+			expect(decrypted).toEqual('random-string');
+		});
+
+		it('should encrypt objects', () => {
+			const encrypted = cipher.encrypt({ key: 'value' });
+			const decrypted = cipher.decrypt(encrypted);
+			expect(decrypted).toEqual('{"key":"value"}');
+		});
+	});
+
+	describe('decrypt', () => {
+		it('should decrypt string', () => {
+			const decrypted = cipher.decrypt('U2FsdGVkX194VEoX27o3+y5jUd1JTTmVwkOKjVhB6Jg=');
+			expect(decrypted).toEqual('random-string');
+		});
+
+		it('should not try to decrypt if the input is shorter than 16 bytes', () => {
+			const decrypted = cipher.decrypt('U2FsdGVkX194VEo');
+			expect(decrypted).toEqual('');
+		});
+	});
+});
diff --git a/packages/core/test/Credentials.test.ts b/packages/core/test/Credentials.test.ts
index e2794b6c24caf..ada86a07b0a89 100644
--- a/packages/core/test/Credentials.test.ts
+++ b/packages/core/test/Credentials.test.ts
@@ -1,23 +1,39 @@
+import { Container } from 'typedi';
+import { mock } from 'jest-mock-extended';
+import type { CredentialInformation } from 'n8n-workflow';
+import { Cipher } from '@/Cipher';
 import { Credentials } from '@/Credentials';
+import type { InstanceSettings } from '@/InstanceSettings';
 
 describe('Credentials', () => {
+	const cipher = new Cipher(mock<InstanceSettings>({ encryptionKey: 'password' }));
+	Container.set(Cipher, cipher);
+
+	const setDataKey = (credentials: Credentials, key: string, data: CredentialInformation) => {
+		let fullData;
+		try {
+			fullData = credentials.getData();
+		} catch (e) {
+			fullData = {};
+		}
+		fullData[key] = data;
+		return credentials.setData(fullData);
+	};
+
 	describe('without nodeType set', () => {
 		test('should be able to set and read key data without initial data set', () => {
-			const credentials = new Credentials({ id: null, name: 'testName' }, 'testType', []);
+			const credentials = new Credentials({ id: null, name: 'testName' }, 'testType');
 
 			const key = 'key1';
-			const password = 'password';
-			// const nodeType = 'base.noOp';
 			const newData = 1234;
 
-			credentials.setDataKey(key, newData, password);
+			setDataKey(credentials, key, newData);
 
-			expect(credentials.getDataKey(key, password)).toEqual(newData);
+			expect(credentials.getData()[key]).toEqual(newData);
 		});
 
 		test('should be able to set and read key data with initial data set', () => {
 			const key = 'key2';
-			const password = 'password';
 
 			// Saved under "key1"
 			const initialData = 4321;
@@ -26,63 +42,17 @@ describe('Credentials', () => {
 			const credentials = new Credentials(
 				{ id: null, name: 'testName' },
 				'testType',
-				[],
 				initialDataEncoded,
 			);
 
 			const newData = 1234;
 
 			// Set and read new data
-			credentials.setDataKey(key, newData, password);
-			expect(credentials.getDataKey(key, password)).toEqual(newData);
+			setDataKey(credentials, key, newData);
+			expect(credentials.getData()[key]).toEqual(newData);
 
 			// Read the data which got provided encrypted on init
-			expect(credentials.getDataKey('key1', password)).toEqual(initialData);
-		});
-	});
-
-	describe('with nodeType set', () => {
-		test('should be able to set and read key data without initial data set', () => {
-			const nodeAccess = [
-				{
-					nodeType: 'base.noOp',
-					user: 'userName',
-					date: new Date(),
-				},
-			];
-
-			const credentials = new Credentials({ id: null, name: 'testName' }, 'testType', nodeAccess);
-
-			const key = 'key1';
-			const password = 'password';
-			const nodeType = 'base.noOp';
-			const newData = 1234;
-
-			credentials.setDataKey(key, newData, password);
-
-			// Should be able to read with nodeType which has access
-			expect(credentials.getDataKey(key, password, nodeType)).toEqual(newData);
-
-			// Should not be able to read with nodeType which does NOT have access
-			// expect(credentials.getDataKey(key, password, 'base.otherNode')).toThrowError(Error);
-			try {
-				credentials.getDataKey(key, password, 'base.otherNode');
-				expect(true).toBe(false);
-			} catch (e) {
-				expect(e.message).toBe(
-					'The node of type "base.otherNode" does not have access to credentials "testName" of type "testType".',
-				);
-			}
-
-			// Get the data which will be saved in database
-			const dbData = credentials.getDataToSave();
-			expect(dbData.name).toEqual('testName');
-			expect(dbData.type).toEqual('testType');
-			expect(dbData.nodesAccess).toEqual(nodeAccess);
-			// Compare only the first 6 characters as the rest seems to change with each execution
-			expect(dbData.data!.slice(0, 6)).toEqual(
-				'U2FsdGVkX1+wpQWkj+YTzaPSNTFATjnlmFKIsUTZdhk='.slice(0, 6),
-			);
+			expect(credentials.getData().key1).toEqual(initialData);
 		});
 	});
 });
diff --git a/packages/core/test/FileSystem.manager.test.ts b/packages/core/test/FileSystem.manager.test.ts
new file mode 100644
index 0000000000000..7087242726d61
--- /dev/null
+++ b/packages/core/test/FileSystem.manager.test.ts
@@ -0,0 +1,192 @@
+import path from 'node:path';
+import fs from 'node:fs';
+import fsp from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import { FileSystemManager } from '@/BinaryData/FileSystem.manager';
+import { isStream } from '@/ObjectStore/utils';
+import { toFileId, toStream } from './utils';
+
+jest.mock('fs');
+jest.mock('fs/promises');
+
+const storagePath = tmpdir();
+
+const fsManager = new FileSystemManager(storagePath);
+
+const toFullFilePath = (fileId: string) => path.join(storagePath, fileId);
+
+const workflowId = 'ObogjVbqpNOQpiyV';
+const executionId = '999';
+const fileUuid = '71f6209b-5d48-41a2-a224-80d529d8bb32';
+const fileId = toFileId(workflowId, executionId, fileUuid);
+
+const otherWorkflowId = 'FHio8ftV6SrCAfPJ';
+const otherExecutionId = '888';
+const otherFileUuid = '71f6209b-5d48-41a2-a224-80d529d8bb33';
+const otherFileId = toFileId(otherWorkflowId, otherExecutionId, otherFileUuid);
+
+const mockBuffer = Buffer.from('Test data');
+const mockStream = toStream(mockBuffer);
+
+afterAll(() => {
+	jest.restoreAllMocks();
+});
+
+describe('store()', () => {
+	it('should store a buffer', async () => {
+		const metadata = { mimeType: 'text/plain' };
+
+		const result = await fsManager.store(workflowId, executionId, mockBuffer, metadata);
+
+		expect(result.fileSize).toBe(mockBuffer.length);
+	});
+});
+
+describe('getPath()', () => {
+	it('should return a path', async () => {
+		const filePath = fsManager.getPath(fileId);
+
+		expect(filePath).toBe(toFullFilePath(fileId));
+	});
+});
+
+describe('getAsBuffer()', () => {
+	it('should return a buffer', async () => {
+		fsp.readFile = jest.fn().mockResolvedValue(mockBuffer);
+		fsp.access = jest.fn().mockImplementation(async () => {});
+
+		const result = await fsManager.getAsBuffer(fileId);
+
+		expect(Buffer.isBuffer(result)).toBe(true);
+		expect(fsp.readFile).toHaveBeenCalledWith(toFullFilePath(fileId));
+	});
+});
+
+describe('getAsStream()', () => {
+	it('should return a stream', async () => {
+		fs.createReadStream = jest.fn().mockReturnValue(mockStream);
+		fsp.access = jest.fn().mockImplementation(async () => {});
+
+		const stream = await fsManager.getAsStream(fileId);
+
+		expect(isStream(stream)).toBe(true);
+		expect(fs.createReadStream).toHaveBeenCalledWith(toFullFilePath(fileId), {
+			highWaterMark: undefined,
+		});
+	});
+});
+
+describe('getMetadata()', () => {
+	it('should return metadata', async () => {
+		const mimeType = 'text/plain';
+		const fileName = 'file.txt';
+
+		fsp.readFile = jest.fn().mockResolvedValue(
+			JSON.stringify({
+				fileSize: 1,
+				mimeType,
+				fileName,
+			}),
+		);
+
+		const metadata = await fsManager.getMetadata(fileId);
+
+		expect(metadata).toEqual(expect.objectContaining({ fileSize: 1, mimeType, fileName }));
+	});
+});
+
+describe('copyByFileId()', () => {
+	it('should copy by file ID and return the file ID', async () => {
+		fsp.copyFile = jest.fn().mockResolvedValue(undefined);
+
+		// @ts-expect-error - private method
+		jest.spyOn(fsManager, 'toFileId').mockReturnValue(otherFileId);
+
+		const targetFileId = await fsManager.copyByFileId(workflowId, executionId, fileId);
+
+		const sourcePath = toFullFilePath(fileId);
+		const targetPath = toFullFilePath(targetFileId);
+
+		expect(fsp.copyFile).toHaveBeenCalledWith(sourcePath, targetPath);
+	});
+});
+
+describe('copyByFilePath()', () => {
+	test('should copy by file path and return the file ID and size', async () => {
+		const sourceFilePath = tmpdir();
+		const metadata = { mimeType: 'text/plain' };
+
+		// @ts-expect-error - private method
+		jest.spyOn(fsManager, 'toFileId').mockReturnValue(otherFileId);
+
+		// @ts-expect-error - private method
+		jest.spyOn(fsManager, 'getSize').mockReturnValue(mockBuffer.length);
+
+		const targetPath = toFullFilePath(otherFileId);
+
+		fsp.cp = jest.fn().mockResolvedValue(undefined);
+		fsp.writeFile = jest.fn().mockResolvedValue(undefined);
+
+		const result = await fsManager.copyByFilePath(
+			workflowId,
+			executionId,
+			sourceFilePath,
+			metadata,
+		);
+
+		expect(fsp.cp).toHaveBeenCalledWith(sourceFilePath, targetPath);
+		expect(fsp.writeFile).toHaveBeenCalledWith(
+			`${toFullFilePath(otherFileId)}.metadata`,
+			JSON.stringify({ ...metadata, fileSize: mockBuffer.length }),
+			{ encoding: 'utf-8' },
+		);
+		expect(result.fileSize).toBe(mockBuffer.length);
+	});
+});
+
+describe('deleteMany()', () => {
+	it('should delete many files by workflow ID and execution ID', async () => {
+		const ids = [
+			{ workflowId, executionId },
+			{ workflowId: otherWorkflowId, executionId: otherExecutionId },
+		];
+
+		fsp.rm = jest.fn().mockResolvedValue(undefined);
+
+		const promise = fsManager.deleteMany(ids);
+
+		await expect(promise).resolves.not.toThrow();
+
+		expect(fsp.rm).toHaveBeenCalledTimes(2);
+	});
+
+	it('should suppress error on non-existing filepath', async () => {
+		const ids = [{ workflowId: 'does-not-exist', executionId: 'does-not-exist' }];
+
+		fsp.rm = jest.fn().mockResolvedValue(undefined);
+
+		const promise = fsManager.deleteMany(ids);
+
+		await expect(promise).resolves.not.toThrow();
+
+		expect(fsp.rm).toHaveBeenCalledTimes(1);
+	});
+});
+
+describe('rename()', () => {
+	it('should rename a file', async () => {
+		fsp.rename = jest.fn().mockResolvedValue(undefined);
+		fsp.rm = jest.fn().mockResolvedValue(undefined);
+
+		const promise = fsManager.rename(fileId, otherFileId);
+
+		const oldPath = toFullFilePath(fileId);
+		const newPath = toFullFilePath(otherFileId);
+
+		await expect(promise).resolves.not.toThrow();
+
+		expect(fsp.rename).toHaveBeenCalledTimes(2);
+		expect(fsp.rename).toHaveBeenCalledWith(oldPath, newPath);
+		expect(fsp.rename).toHaveBeenCalledWith(`${oldPath}.metadata`, `${newPath}.metadata`);
+	});
+});
diff --git a/packages/core/test/Helpers.ts b/packages/core/test/Helpers.ts
deleted file mode 100644
index c38362b8278a6..0000000000000
--- a/packages/core/test/Helpers.ts
+++ /dev/null
@@ -1,867 +0,0 @@
-import set from 'lodash.set';
-
-import {
-	ICredentialDataDecryptedObject,
-	ICredentialsHelper,
-	IDataObject,
-	IDeferredPromise,
-	IExecuteWorkflowInfo,
-	IHttpRequestHelper,
-	IHttpRequestOptions,
-	INode,
-	INodeCredentialsDetails,
-	INodeExecutionData,
-	INodeParameters,
-	INodeType,
-	INodeTypeData,
-	INodeTypes,
-	IRun,
-	ITaskData,
-	IVersionedNodeType,
-	IWorkflowBase,
-	IWorkflowExecuteAdditionalData,
-	NodeHelpers,
-	NodeParameterValue,
-	WorkflowHooks,
-} from 'n8n-workflow';
-import { Credentials } from '@/Credentials';
-import { IExecuteFunctions } from '@/Interfaces';
-
-export class CredentialsHelper extends ICredentialsHelper {
-	async authenticate(
-		credentials: ICredentialDataDecryptedObject,
-		typeName: string,
-		requestParams: IHttpRequestOptions,
-	): Promise<IHttpRequestOptions> {
-		return requestParams;
-	}
-
-	async preAuthentication(
-		helpers: IHttpRequestHelper,
-		credentials: ICredentialDataDecryptedObject,
-		typeName: string,
-		node: INode,
-		credentialsExpired: boolean,
-	): Promise<ICredentialDataDecryptedObject | undefined> {
-		return undefined;
-	}
-
-	getParentTypes(name: string): string[] {
-		return [];
-	}
-
-	async getDecrypted(
-		nodeCredentials: INodeCredentialsDetails,
-		type: string,
-	): Promise<ICredentialDataDecryptedObject> {
-		return {};
-	}
-
-	async getCredentials(
-		nodeCredentials: INodeCredentialsDetails,
-		type: string,
-	): Promise<Credentials> {
-		return new Credentials({ id: null, name: '' }, '', [], '');
-	}
-
-	async updateCredentials(
-		nodeCredentials: INodeCredentialsDetails,
-		type: string,
-		data: ICredentialDataDecryptedObject,
-	): Promise<void> {}
-}
-
-class NodeTypesClass implements INodeTypes {
-	nodeTypes: INodeTypeData = {
-		'n8n-nodes-base.if': {
-			sourcePath: '',
-			type: {
-				description: {
-					displayName: 'If',
-					name: 'if',
-					group: ['transform'],
-					version: 1,
-					description: 'Splits a stream depending on defined compare operations.',
-					defaults: {
-						name: 'IF',
-						color: '#408000',
-					},
-					inputs: ['main'],
-					outputs: ['main', 'main'],
-					properties: [
-						{
-							displayName: 'Conditions',
-							name: 'conditions',
-							placeholder: 'Add Condition',
-							type: 'fixedCollection',
-							typeOptions: {
-								multipleValues: true,
-							},
-							description: 'The type of values to compare.',
-							default: {},
-							options: [
-								{
-									name: 'boolean',
-									displayName: 'Boolean',
-									values: [
-										{
-											displayName: 'Value 1',
-											name: 'value1',
-											type: 'boolean',
-											default: false,
-											description: 'The value to compare with the second one.',
-										},
-										{
-											displayName: 'Operation',
-											name: 'operation',
-											type: 'options',
-											options: [
-												{
-													name: 'Equal',
-													value: 'equal',
-												},
-												{
-													name: 'Not Equal',
-													value: 'notEqual',
-												},
-											],
-											default: 'equal',
-											description: 'Operation to decide where the the data should be mapped to.',
-										},
-										{
-											displayName: 'Value 2',
-											name: 'value2',
-											type: 'boolean',
-											default: false,
-											description: 'The value to compare with the first one.',
-										},
-									],
-								},
-								{
-									name: 'number',
-									displayName: 'Number',
-									values: [
-										{
-											displayName: 'Value 1',
-											name: 'value1',
-											type: 'number',
-											default: 0,
-											description: 'The value to compare with the second one.',
-										},
-										{
-											displayName: 'Operation',
-											name: 'operation',
-											type: 'options',
-											options: [
-												{
-													name: 'Smaller',
-													value: 'smaller',
-												},
-												{
-													name: 'Smaller Equal',
-													value: 'smallerEqual',
-												},
-												{
-													name: 'Equal',
-													value: 'equal',
-												},
-												{
-													name: 'Not Equal',
-													value: 'notEqual',
-												},
-												{
-													name: 'Larger',
-													value: 'larger',
-												},
-												{
-													name: 'Larger Equal',
-													value: 'largerEqual',
-												},
-												{
-													name: 'Is Empty',
-													value: 'isEmpty',
-												},
-											],
-											default: 'smaller',
-											description: 'Operation to decide where the the data should be mapped to.',
-										},
-										{
-											displayName: 'Value 2',
-											name: 'value2',
-											type: 'number',
-											displayOptions: {
-												hide: {
-													operation: ['isEmpty'],
-												},
-											},
-											default: 0,
-											description: 'The value to compare with the first one.',
-										},
-									],
-								},
-								{
-									name: 'string',
-									displayName: 'String',
-									values: [
-										{
-											displayName: 'Value 1',
-											name: 'value1',
-											type: 'string',
-											default: '',
-											description: 'The value to compare with the second one.',
-										},
-										{
-											displayName: 'Operation',
-											name: 'operation',
-											type: 'options',
-											options: [
-												{
-													name: 'Contains',
-													value: 'contains',
-												},
-												{
-													name: 'Ends With',
-													value: 'endsWith',
-												},
-												{
-													name: 'Equal',
-													value: 'equal',
-												},
-												{
-													name: 'Not Contains',
-													value: 'notContains',
-												},
-												{
-													name: 'Not Equal',
-													value: 'notEqual',
-												},
-												{
-													name: 'Regex',
-													value: 'regex',
-												},
-												{
-													name: 'Starts With',
-													value: 'startsWith',
-												},
-												{
-													name: 'Is Empty',
-													value: 'isEmpty',
-												},
-											],
-											default: 'equal',
-											description: 'Operation to decide where the the data should be mapped to.',
-										},
-										{
-											displayName: 'Value 2',
-											name: 'value2',
-											type: 'string',
-											displayOptions: {
-												hide: {
-													operation: ['isEmpty', 'regex'],
-												},
-											},
-											default: '',
-											description: 'The value to compare with the first one.',
-										},
-										{
-											displayName: 'Regex',
-											name: 'value2',
-											type: 'string',
-											displayOptions: {
-												show: {
-													operation: ['regex'],
-												},
-											},
-											default: '',
-											placeholder: '/text/i',
-											description: 'The regex which has to match.',
-										},
-									],
-								},
-							],
-						},
-						{
-							displayName: 'Combine',
-							name: 'combineOperation',
-							type: 'options',
-							options: [
-								{
-									name: 'ALL',
-									description: 'Only if all conditions are met it goes into "true" branch.',
-									value: 'all',
-								},
-								{
-									name: 'ANY',
-									description: 'If any of the conditions is met it goes into "true" branch.',
-									value: 'any',
-								},
-							],
-							default: 'all',
-							description:
-								'If multiple rules got set this settings decides if it is true as soon as ANY condition matches or only if ALL get meet.',
-						},
-					],
-				},
-				async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
-					const returnDataTrue: INodeExecutionData[] = [];
-					const returnDataFalse: INodeExecutionData[] = [];
-
-					const items = this.getInputData();
-
-					let item: INodeExecutionData;
-					let combineOperation: string;
-
-					// The compare operations
-					const compareOperationFunctions: {
-						[key: string]: (value1: NodeParameterValue, value2: NodeParameterValue) => boolean;
-					} = {
-						contains: (value1: NodeParameterValue, value2: NodeParameterValue) =>
-							(value1 || '').toString().includes((value2 || '').toString()),
-						notContains: (value1: NodeParameterValue, value2: NodeParameterValue) =>
-							!(value1 || '').toString().includes((value2 || '').toString()),
-						endsWith: (value1: NodeParameterValue, value2: NodeParameterValue) =>
-							(value1 as string).endsWith(value2 as string),
-						equal: (value1: NodeParameterValue, value2: NodeParameterValue) => value1 === value2,
-						notEqual: (value1: NodeParameterValue, value2: NodeParameterValue) => value1 !== value2,
-						larger: (value1: NodeParameterValue, value2: NodeParameterValue) =>
-							(value1 || 0) > (value2 || 0),
-						largerEqual: (value1: NodeParameterValue, value2: NodeParameterValue) =>
-							(value1 || 0) >= (value2 || 0),
-						smaller: (value1: NodeParameterValue, value2: NodeParameterValue) =>
-							(value1 || 0) < (value2 || 0),
-						smallerEqual: (value1: NodeParameterValue, value2: NodeParameterValue) =>
-							(value1 || 0) <= (value2 || 0),
-						startsWith: (value1: NodeParameterValue, value2: NodeParameterValue) =>
-							(value1 as string).startsWith(value2 as string),
-						isEmpty: (value1: NodeParameterValue) =>
-							[undefined, null, ''].includes(value1 as string),
-						regex: (value1: NodeParameterValue, value2: NodeParameterValue) => {
-							const regexMatch = (value2 || '')
-								.toString()
-								.match(new RegExp('^/(.*?)/([gimusy]*)$'));
-
-							let regex: RegExp;
-							if (!regexMatch) {
-								regex = new RegExp((value2 || '').toString());
-							} else if (regexMatch.length === 1) {
-								regex = new RegExp(regexMatch[1]);
-							} else {
-								regex = new RegExp(regexMatch[1], regexMatch[2]);
-							}
-
-							return !!(value1 || '').toString().match(regex);
-						},
-					};
-
-					// The different dataTypes to check the values in
-					const dataTypes = ['boolean', 'number', 'string'];
-
-					// Iterate over all items to check which ones should be output as via output "true" and
-					// which ones via output "false"
-					let dataType: string;
-					let compareOperationResult: boolean;
-					itemLoop: for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
-						item = items[itemIndex];
-
-						let compareData: INodeParameters;
-
-						combineOperation = this.getNodeParameter('combineOperation', itemIndex) as string;
-
-						// Check all the values of the different dataTypes
-						for (dataType of dataTypes) {
-							// Check all the values of the current dataType
-							for (compareData of this.getNodeParameter(
-								`conditions.${dataType}`,
-								itemIndex,
-								[],
-							) as INodeParameters[]) {
-								// Check if the values passes
-								compareOperationResult = compareOperationFunctions[compareData.operation as string](
-									compareData.value1 as NodeParameterValue,
-									compareData.value2 as NodeParameterValue,
-								);
-
-								if (compareOperationResult === true && combineOperation === 'any') {
-									// If it passes and the operation is "any" we do not have to check any
-									// other ones as it should pass anyway. So go on with the next item.
-									returnDataTrue.push(item);
-									continue itemLoop;
-								} else if (compareOperationResult === false && combineOperation === 'all') {
-									// If it fails and the operation is "all" we do not have to check any
-									// other ones as it should be not pass anyway. So go on with the next item.
-									returnDataFalse.push(item);
-									continue itemLoop;
-								}
-							}
-						}
-
-						if (combineOperation === 'all') {
-							// If the operation is "all" it means the item did match all conditions
-							// so it passes.
-							returnDataTrue.push(item);
-						} else {
-							// If the operation is "any" it means the the item did not match any condition.
-							returnDataFalse.push(item);
-						}
-					}
-
-					return [returnDataTrue, returnDataFalse];
-				},
-			},
-		},
-		'n8n-nodes-base.merge': {
-			sourcePath: '',
-			type: {
-				description: {
-					displayName: 'Merge',
-					name: 'merge',
-					icon: 'fa:clone',
-					group: ['transform'],
-					version: 1,
-					description: 'Merges data of multiple streams once data of both is available',
-					defaults: {
-						name: 'Merge',
-						color: '#00cc22',
-					},
-					inputs: ['main', 'main'],
-					outputs: ['main'],
-					properties: [
-						{
-							displayName: 'Mode',
-							name: 'mode',
-							type: 'options',
-							options: [
-								{
-									name: 'Append',
-									value: 'append',
-									description:
-										'Combines data of both inputs. The output will contain items of input 1 and input 2.',
-								},
-								{
-									name: 'Pass-through',
-									value: 'passThrough',
-									description:
-										'Passes through data of one input. The output will contain only items of the defined input.',
-								},
-								{
-									name: 'Wait',
-									value: 'wait',
-									description:
-										'Waits till data of both inputs is available and will then output a single empty item.',
-								},
-							],
-							default: 'append',
-							description:
-								'How data should be merged. If it should simply<br />be appended or merged depending on a property.',
-						},
-						{
-							displayName: 'Output Data',
-							name: 'output',
-							type: 'options',
-							displayOptions: {
-								show: {
-									mode: ['passThrough'],
-								},
-							},
-							options: [
-								{
-									name: 'Input 1',
-									value: 'input1',
-								},
-								{
-									name: 'Input 2',
-									value: 'input2',
-								},
-							],
-							default: 'input1',
-							description: 'Defines of which input the data should be used as output of node.',
-						},
-					],
-				},
-				async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
-					// const itemsInput2 = this.getInputData(1);
-
-					const returnData: INodeExecutionData[] = [];
-
-					const mode = this.getNodeParameter('mode', 0) as string;
-
-					if (mode === 'append') {
-						// Simply appends the data
-						for (let i = 0; i < 2; i++) {
-							returnData.push.apply(returnData, this.getInputData(i));
-						}
-					} else if (mode === 'passThrough') {
-						const output = this.getNodeParameter('output', 0) as string;
-
-						if (output === 'input1') {
-							returnData.push.apply(returnData, this.getInputData(0));
-						} else {
-							returnData.push.apply(returnData, this.getInputData(1));
-						}
-					} else if (mode === 'wait') {
-						returnData.push({ json: {} });
-					}
-
-					return [returnData];
-				},
-			},
-		},
-		'n8n-nodes-base.noOp': {
-			sourcePath: '',
-			type: {
-				description: {
-					displayName: 'No Operation, do nothing',
-					name: 'noOp',
-					icon: 'fa:arrow-right',
-					group: ['organization'],
-					version: 1,
-					description: 'No Operation',
-					defaults: {
-						name: 'NoOp',
-						color: '#b0b0b0',
-					},
-					inputs: ['main'],
-					outputs: ['main'],
-					properties: [],
-				},
-				execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
-					const items = this.getInputData();
-					return this.prepareOutputData(items);
-				},
-			},
-		},
-		'n8n-nodes-base.versionTest': {
-			sourcePath: '',
-			type: {
-				description: {
-					displayName: 'Version Test',
-					name: 'versionTest',
-					group: ['input'],
-					version: 1,
-					description: 'Tests if versioning works',
-					defaults: {
-						name: 'Version Test',
-						color: '#0000FF',
-					},
-					inputs: ['main'],
-					outputs: ['main'],
-					properties: [
-						{
-							displayName: 'Display V1',
-							name: 'versionTest',
-							type: 'number',
-							displayOptions: {
-								show: {
-									'@version': [1],
-								},
-							},
-							default: 1,
-						},
-						{
-							displayName: 'Display V2',
-							name: 'versionTest',
-							type: 'number',
-							displayOptions: {
-								show: {
-									'@version': [2],
-								},
-							},
-							default: 2,
-						},
-					],
-				},
-				execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
-					const items = this.getInputData();
-					const returnData: INodeExecutionData[] = [];
-
-					for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
-						const newItem: INodeExecutionData = {
-							json: {
-								versionFromParameter: this.getNodeParameter('versionTest', itemIndex),
-								versionFromNode: this.getNode().typeVersion,
-							},
-						};
-
-						returnData.push(newItem);
-					}
-
-					return this.prepareOutputData(returnData);
-				},
-			},
-		},
-		'n8n-nodes-base.set': {
-			sourcePath: '',
-			type: {
-				description: {
-					displayName: 'Set',
-					name: 'set',
-					group: ['input'],
-					version: 1,
-					description: 'Sets a value',
-					defaults: {
-						name: 'Set',
-						color: '#0000FF',
-					},
-					inputs: ['main'],
-					outputs: ['main'],
-					properties: [
-						{
-							displayName: 'Keep Only Set',
-							name: 'keepOnlySet',
-							type: 'boolean',
-							default: false,
-							description:
-								'If only the values set on this node should be<br />kept and all others removed.',
-						},
-						{
-							displayName: 'Values to Set',
-							name: 'values',
-							placeholder: 'Add Value',
-							type: 'fixedCollection',
-							typeOptions: {
-								multipleValues: true,
-							},
-							description: 'The value to set.',
-							default: {},
-							options: [
-								{
-									name: 'boolean',
-									displayName: 'Boolean',
-									values: [
-										{
-											displayName: 'Name',
-											name: 'name',
-											type: 'string',
-											default: 'propertyName',
-											description:
-												'Name of the property to write data to.<br />Supports dot-notation.<br />Example: "data.person[0].name"',
-										},
-										{
-											displayName: 'Value',
-											name: 'value',
-											type: 'boolean',
-											default: false,
-											description: 'The boolean value to write in the property.',
-										},
-									],
-								},
-								{
-									name: 'number',
-									displayName: 'Number',
-									values: [
-										{
-											displayName: 'Name',
-											name: 'name',
-											type: 'string',
-											default: 'propertyName',
-											description:
-												'Name of the property to write data to.<br />Supports dot-notation.<br />Example: "data.person[0].name"',
-										},
-										{
-											displayName: 'Value',
-											name: 'value',
-											type: 'number',
-											default: 0,
-											description: 'The number value to write in the property.',
-										},
-									],
-								},
-								{
-									name: 'string',
-									displayName: 'String',
-									values: [
-										{
-											displayName: 'Name',
-											name: 'name',
-											type: 'string',
-											default: 'propertyName',
-											description:
-												'Name of the property to write data to.<br />Supports dot-notation.<br />Example: "data.person[0].name"',
-										},
-										{
-											displayName: 'Value',
-											name: 'value',
-											type: 'string',
-											default: '',
-											description: 'The string value to write in the property.',
-										},
-									],
-								},
-							],
-						},
-
-						{
-							displayName: 'Options',
-							name: 'options',
-							type: 'collection',
-							placeholder: 'Add Option',
-							default: {},
-							options: [
-								{
-									displayName: 'Dot Notation',
-									name: 'dotNotation',
-									type: 'boolean',
-									default: true,
-									description: `<p>By default, dot-notation is used in property names. This means that "a.b" will set the property "b" underneath "a" so { "a": { "b": value} }.</p><p>If that is not intended this can be deactivated, it will then set { "a.b": value } instead.</p>`,
-								},
-							],
-						},
-					],
-				},
-				execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
-					const items = this.getInputData();
-
-					if (items.length === 0) {
-						items.push({ json: {} });
-					}
-
-					const returnData: INodeExecutionData[] = [];
-
-					let item: INodeExecutionData;
-					let keepOnlySet: boolean;
-					for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
-						keepOnlySet = this.getNodeParameter('keepOnlySet', itemIndex, false) as boolean;
-						item = items[itemIndex];
-						const options = this.getNodeParameter('options', itemIndex, {}) as IDataObject;
-
-						const newItem: INodeExecutionData = {
-							json: {},
-						};
-
-						if (keepOnlySet !== true) {
-							if (item.binary !== undefined) {
-								// Create a shallow copy of the binary data so that the old
-								// data references which do not get changed still stay behind
-								// but the incoming data does not get changed.
-								newItem.binary = {};
-								Object.assign(newItem.binary, item.binary);
-							}
-
-							newItem.json = JSON.parse(JSON.stringify(item.json));
-						}
-
-						// Add boolean values
-						(this.getNodeParameter('values.boolean', itemIndex, []) as INodeParameters[]).forEach(
-							(setItem) => {
-								if (options.dotNotation === false) {
-									newItem.json[setItem.name as string] = !!setItem.value;
-								} else {
-									set(newItem.json, setItem.name as string, !!setItem.value);
-								}
-							},
-						);
-
-						// Add number values
-						(this.getNodeParameter('values.number', itemIndex, []) as INodeParameters[]).forEach(
-							(setItem) => {
-								if (options.dotNotation === false) {
-									newItem.json[setItem.name as string] = setItem.value;
-								} else {
-									set(newItem.json, setItem.name as string, setItem.value);
-								}
-							},
-						);
-
-						// Add string values
-						(this.getNodeParameter('values.string', itemIndex, []) as INodeParameters[]).forEach(
-							(setItem) => {
-								if (options.dotNotation === false) {
-									newItem.json[setItem.name as string] = setItem.value;
-								} else {
-									set(newItem.json, setItem.name as string, setItem.value);
-								}
-							},
-						);
-
-						returnData.push(newItem);
-					}
-
-					return this.prepareOutputData(returnData);
-				},
-			},
-		},
-		'n8n-nodes-base.start': {
-			sourcePath: '',
-			type: {
-				description: {
-					displayName: 'Start',
-					name: 'start',
-					group: ['input'],
-					version: 1,
-					description: 'Starts the workflow execution from this node',
-					defaults: {
-						name: 'Start',
-						color: '#553399',
-					},
-					inputs: [],
-					outputs: ['main'],
-					properties: [],
-				},
-				execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
-					const items = this.getInputData();
-
-					return this.prepareOutputData(items);
-				},
-			},
-		},
-	};
-
-	getByName(nodeType: string): INodeType | IVersionedNodeType {
-		return this.nodeTypes[nodeType].type;
-	}
-
-	getByNameAndVersion(nodeType: string, version?: number): INodeType {
-		return NodeHelpers.getVersionedNodeType(this.nodeTypes[nodeType].type, version);
-	}
-}
-
-let nodeTypesInstance: NodeTypesClass | undefined;
-
-export function NodeTypes(): NodeTypesClass {
-	if (nodeTypesInstance === undefined) {
-		nodeTypesInstance = new NodeTypesClass();
-	}
-
-	return nodeTypesInstance;
-}
-
-export function WorkflowExecuteAdditionalData(
-	waitPromise: IDeferredPromise<IRun>,
-	nodeExecutionOrder: string[],
-): IWorkflowExecuteAdditionalData {
-	const hookFunctions = {
-		nodeExecuteAfter: [
-			async (nodeName: string, data: ITaskData): Promise<void> => {
-				nodeExecutionOrder.push(nodeName);
-			},
-		],
-		workflowExecuteAfter: [
-			async (fullRunData: IRun): Promise<void> => {
-				waitPromise.resolve(fullRunData);
-			},
-		],
-	};
-
-	const workflowData: IWorkflowBase = {
-		name: '',
-		createdAt: new Date(),
-		updatedAt: new Date(),
-		active: true,
-		nodes: [],
-		connections: {},
-	};
-
-	return {
-		credentialsHelper: new CredentialsHelper(''),
-		hooks: new WorkflowHooks(hookFunctions, 'trigger', '1', workflowData),
-		executeWorkflow: async (workflowInfo: IExecuteWorkflowInfo): Promise<any> => {},
-		sendMessageToUI: (message: string) => {},
-		restApiUrl: '',
-		encryptionKey: 'test',
-		timezone: 'America/New_York',
-		webhookBaseUrl: 'webhook',
-		webhookWaitingBaseUrl: 'webhook-waiting',
-		webhookTestBaseUrl: 'webhook-test',
-		userId: '123',
-	};
-}
diff --git a/packages/core/test/InstanceSettings.test.ts b/packages/core/test/InstanceSettings.test.ts
new file mode 100644
index 0000000000000..414f8752742b6
--- /dev/null
+++ b/packages/core/test/InstanceSettings.test.ts
@@ -0,0 +1,71 @@
+import fs from 'fs';
+import { InstanceSettings } from '@/InstanceSettings';
+
+describe('InstanceSettings', () => {
+	process.env.N8N_USER_FOLDER = '/test';
+
+	const existSpy = jest.spyOn(fs, 'existsSync');
+	beforeEach(() => jest.resetAllMocks());
+
+	describe('If the settings file exists', () => {
+		const readSpy = jest.spyOn(fs, 'readFileSync');
+		beforeEach(() => existSpy.mockReturnValue(true));
+
+		it('should load settings from the file', () => {
+			readSpy.mockReturnValue(JSON.stringify({ encryptionKey: 'test_key' }));
+			const settings = new InstanceSettings();
+			expect(settings.encryptionKey).toEqual('test_key');
+			expect(settings.instanceId).toEqual(
+				'6ce26c63596f0cc4323563c529acfca0cccb0e57f6533d79a60a42c9ff862ae7',
+			);
+		});
+
+		it('should throw error if settings file is not valid JSON', () => {
+			readSpy.mockReturnValue('{"encryptionKey":"test_key"');
+			expect(() => new InstanceSettings()).toThrowError();
+		});
+
+		it('should throw if the env and file keys do not match', () => {
+			readSpy.mockReturnValue(JSON.stringify({ encryptionKey: 'key_1' }));
+			process.env.N8N_ENCRYPTION_KEY = 'key_2';
+			expect(() => new InstanceSettings()).toThrowError();
+		});
+	});
+
+	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();
+		});
+
+		it('should create a new settings file', () => {
+			const settings = new InstanceSettings();
+			expect(settings.encryptionKey).not.toEqual('test_key');
+			expect(mkdirSpy).toHaveBeenCalledWith('/test/.n8n', { recursive: true });
+			expect(writeFileSpy).toHaveBeenCalledWith(
+				'/test/.n8n/config',
+				expect.stringContaining('"encryptionKey":'),
+				'utf-8',
+			);
+		});
+
+		it('should pick up the encryption key from env var N8N_ENCRYPTION_KEY', () => {
+			process.env.N8N_ENCRYPTION_KEY = 'env_key';
+			const settings = new InstanceSettings();
+			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(
+				'/test/.n8n/config',
+				expect.stringContaining('"encryptionKey":'),
+				'utf-8',
+			);
+		});
+	});
+});
diff --git a/packages/core/test/NodeExecuteFunctions.test.ts b/packages/core/test/NodeExecuteFunctions.test.ts
index aff7ba036679b..9300a5d9db517 100644
--- a/packages/core/test/NodeExecuteFunctions.test.ts
+++ b/packages/core/test/NodeExecuteFunctions.test.ts
@@ -1,51 +1,61 @@
-import nock from 'nock';
-import { join } from 'path';
-import { tmpdir } from 'os';
-import { readFileSync, mkdtempSync } from 'fs';
+import type { SecureContextOptions } from 'tls';
+import {
+	cleanupParameterData,
+	copyInputItems,
+	getBinaryDataBuffer,
+	parseIncomingMessage,
+	parseRequestObject,
+	proxyRequestToAxios,
+	removeEmptyBody,
+	setBinaryDataBuffer,
+} from '@/NodeExecuteFunctions';
+import { DateTime } from 'luxon';
+import { mkdtempSync, readFileSync } from 'fs';
+import type { IncomingMessage } from 'http';
 import { mock } from 'jest-mock-extended';
 import type {
 	IBinaryData,
+	IHttpRequestMethods,
+	IHttpRequestOptions,
 	INode,
+	IRequestOptions,
 	ITaskDataConnections,
 	IWorkflowExecuteAdditionalData,
+	NodeParameterValue,
 	Workflow,
 	WorkflowHooks,
 } from 'n8n-workflow';
-import { BinaryDataManager } from '@/BinaryDataManager';
-import {
-	setBinaryDataBuffer,
-	getBinaryDataBuffer,
-	proxyRequestToAxios,
-} from '@/NodeExecuteFunctions';
-import { initLogger } from './utils';
+import { BinaryDataService } from '@/BinaryData/BinaryData.service';
+import nock from 'nock';
+import { tmpdir } from 'os';
+import { join } from 'path';
+import Container from 'typedi';
+import type { Agent } from 'https';
+import toPlainObject from 'lodash/toPlainObject';
 
 const temporaryDir = mkdtempSync(join(tmpdir(), 'n8n'));
 
 describe('NodeExecuteFunctions', () => {
 	describe('test binary data helper methods', () => {
-		// Reset BinaryDataManager for each run. This is a dirty operation, as individual managers are not cleaned.
-		beforeEach(() => {
-			BinaryDataManager.instance = undefined;
-		});
-
-		test(`test getBinaryDataBuffer(...) & setBinaryDataBuffer(...) methods in 'default' mode`, async () => {
+		test("test getBinaryDataBuffer(...) & setBinaryDataBuffer(...) methods in 'default' mode", async () => {
 			// Setup a 'default' binary data manager instance
-			await BinaryDataManager.init({
+			Container.set(BinaryDataService, new BinaryDataService());
+
+			await Container.get(BinaryDataService).init({
 				mode: 'default',
-				availableModes: 'default',
+				availableModes: ['default'],
 				localStoragePath: temporaryDir,
-				binaryDataTTL: 1,
-				persistedBinaryDataTTL: 1,
 			});
 
 			// Set our binary data buffer
-			let inputData: Buffer = Buffer.from('This is some binary data', 'utf8');
-			let setBinaryDataBufferResponse: IBinaryData = await setBinaryDataBuffer(
+			const inputData: Buffer = Buffer.from('This is some binary data', 'utf8');
+			const setBinaryDataBufferResponse: IBinaryData = await setBinaryDataBuffer(
 				{
 					mimeType: 'txt',
 					data: 'This should be overwritten by the actual payload in the response',
 				},
 				inputData,
+				'workflowId',
 				'executionId',
 			);
 
@@ -54,7 +64,7 @@ describe('NodeExecuteFunctions', () => {
 
 			// Now, re-fetch our data.
 			// An ITaskDataConnections object is used to share data between nodes. The top level property, 'main', represents the successful output object from a previous node.
-			let taskDataConnectionsInput: ITaskDataConnections = {
+			const taskDataConnectionsInput: ITaskDataConnections = {
 				main: [],
 			};
 
@@ -69,7 +79,7 @@ describe('NodeExecuteFunctions', () => {
 			]);
 
 			// Now, lets fetch our data! The item will be item index 0.
-			let getBinaryDataBufferResponse: Buffer = await getBinaryDataBuffer(
+			const getBinaryDataBufferResponse: Buffer = await getBinaryDataBuffer(
 				taskDataConnectionsInput,
 				0,
 				'data',
@@ -79,40 +89,41 @@ describe('NodeExecuteFunctions', () => {
 			expect(getBinaryDataBufferResponse).toEqual(inputData);
 		});
 
-		test(`test getBinaryDataBuffer(...) & setBinaryDataBuffer(...) methods in 'filesystem' mode`, async () => {
+		test("test getBinaryDataBuffer(...) & setBinaryDataBuffer(...) methods in 'filesystem' mode", async () => {
+			Container.set(BinaryDataService, new BinaryDataService());
+
 			// Setup a 'filesystem' binary data manager instance
-			await BinaryDataManager.init({
+			await Container.get(BinaryDataService).init({
 				mode: 'filesystem',
-				availableModes: 'filesystem',
+				availableModes: ['filesystem'],
 				localStoragePath: temporaryDir,
-				binaryDataTTL: 1,
-				persistedBinaryDataTTL: 1,
 			});
 
 			// Set our binary data buffer
-			let inputData: Buffer = Buffer.from('This is some binary data', 'utf8');
-			let setBinaryDataBufferResponse: IBinaryData = await setBinaryDataBuffer(
+			const inputData: Buffer = Buffer.from('This is some binary data', 'utf8');
+			const setBinaryDataBufferResponse: IBinaryData = await setBinaryDataBuffer(
 				{
 					mimeType: 'txt',
 					data: 'This should be overwritten with the name of the configured data manager',
 				},
 				inputData,
+				'workflowId',
 				'executionId',
 			);
 
 			// Expect our return object to contain the name of the configured data manager.
-			expect(setBinaryDataBufferResponse.data).toEqual('filesystem');
+			expect(setBinaryDataBufferResponse.data).toEqual('filesystem-v2');
 
 			// Ensure that the input data was successfully persisted to disk.
 			expect(
 				readFileSync(
-					`${temporaryDir}/${setBinaryDataBufferResponse.id?.replace('filesystem:', '')}`,
+					`${temporaryDir}/${setBinaryDataBufferResponse.id?.replace('filesystem-v2:', '')}`,
 				),
 			).toEqual(inputData);
 
 			// Now, re-fetch our data.
 			// An ITaskDataConnections object is used to share data between nodes. The top level property, 'main', represents the successful output object from a previous node.
-			let taskDataConnectionsInput: ITaskDataConnections = {
+			const taskDataConnectionsInput: ITaskDataConnections = {
 				main: [],
 			};
 
@@ -127,7 +138,7 @@ describe('NodeExecuteFunctions', () => {
 			]);
 
 			// Now, lets fetch our data! The item will be item index 0.
-			let getBinaryDataBufferResponse: Buffer = await getBinaryDataBuffer(
+			const getBinaryDataBufferResponse: Buffer = await getBinaryDataBuffer(
 				taskDataConnectionsInput,
 				0,
 				'data',
@@ -138,6 +149,90 @@ describe('NodeExecuteFunctions', () => {
 		});
 	});
 
+	describe('parseIncomingMessage', () => {
+		it('parses valid content-type header', () => {
+			const message = mock<IncomingMessage>({
+				headers: { 'content-type': 'application/json', 'content-disposition': undefined },
+			});
+			parseIncomingMessage(message);
+
+			expect(message.contentType).toEqual('application/json');
+		});
+
+		it('parses valid content-type header with parameters', () => {
+			const message = mock<IncomingMessage>({
+				headers: {
+					'content-type': 'application/json; charset=utf-8',
+					'content-disposition': undefined,
+				},
+			});
+			parseIncomingMessage(message);
+
+			expect(message.contentType).toEqual('application/json');
+		});
+
+		it('parses valid content-disposition header with filename*', () => {
+			const message = mock<IncomingMessage>({
+				headers: {
+					'content-type': undefined,
+					'content-disposition':
+						'attachment; filename="screenshot%20(1).png"; filename*=UTF-8\'\'screenshot%20(1).png',
+				},
+			});
+			parseIncomingMessage(message);
+
+			expect(message.contentDisposition).toEqual({
+				filename: 'screenshot (1).png',
+				type: 'attachment',
+			});
+		});
+
+		it('parses valid content-disposition header with filename* (quoted)', () => {
+			const message = mock<IncomingMessage>({
+				headers: {
+					'content-type': undefined,
+					'content-disposition': ' attachment;filename*="utf-8\' \'test-unsplash.jpg"',
+				},
+			});
+			parseIncomingMessage(message);
+
+			expect(message.contentDisposition).toEqual({
+				filename: 'test-unsplash.jpg',
+				type: 'attachment',
+			});
+		});
+
+		it('parses valid content-disposition header with filename and trailing ";"', () => {
+			const message = mock<IncomingMessage>({
+				headers: {
+					'content-type': undefined,
+					'content-disposition': 'inline; filename="screenshot%20(1).png";',
+				},
+			});
+			parseIncomingMessage(message);
+
+			expect(message.contentDisposition).toEqual({
+				filename: 'screenshot (1).png',
+				type: 'inline',
+			});
+		});
+
+		it('parses non standard content-disposition with missing type', () => {
+			const message = mock<IncomingMessage>({
+				headers: {
+					'content-type': undefined,
+					'content-disposition': 'filename="screenshot%20(1).png";',
+				},
+			});
+			parseIncomingMessage(message);
+
+			expect(message.contentDisposition).toEqual({
+				filename: 'screenshot (1).png',
+				type: 'attachment',
+			});
+		});
+	});
+
 	describe('proxyRequestToAxios', () => {
 		const baseUrl = 'http://example.de';
 		const workflow = mock<Workflow>();
@@ -146,10 +241,19 @@ describe('NodeExecuteFunctions', () => {
 		const node = mock<INode>();
 
 		beforeEach(() => {
-			initLogger();
 			hooks.executeHookFunctions.mockClear();
 		});
 
+		test('should rethrow an error with `status` property', async () => {
+			nock(baseUrl).get('/test').reply(400);
+
+			try {
+				await proxyRequestToAxios(workflow, additionalData, node, `${baseUrl}/test`);
+			} catch (error) {
+				expect(error.status).toEqual(400);
+			}
+		});
+
 		test('should not throw if the response status is 200', async () => {
 			nock(baseUrl).get('/test').reply(200);
 			await proxyRequestToAxios(workflow, additionalData, node, `${baseUrl}/test`);
@@ -212,5 +316,271 @@ describe('NodeExecuteFunctions', () => {
 				node,
 			]);
 		});
+
+		describe('redirects', () => {
+			test('should forward authorization header', async () => {
+				nock(baseUrl).get('/redirect').reply(301, '', { Location: 'https://otherdomain.com/test' });
+				nock('https://otherdomain.com')
+					.get('/test')
+					.reply(200, function () {
+						return this.req.headers;
+					});
+
+				const response = await proxyRequestToAxios(workflow, additionalData, node, {
+					url: `${baseUrl}/redirect`,
+					auth: {
+						username: 'testuser',
+						password: 'testpassword',
+					},
+					headers: {
+						'X-Other-Header': 'otherHeaderContent',
+					},
+					resolveWithFullResponse: true,
+				});
+
+				expect(response.statusCode).toBe(200);
+				const forwardedHeaders = JSON.parse(response.body);
+				expect(forwardedHeaders.authorization).toBe('Basic dGVzdHVzZXI6dGVzdHBhc3N3b3Jk');
+				expect(forwardedHeaders['x-other-header']).toBe('otherHeaderContent');
+			});
+
+			test('should follow redirects by default', async () => {
+				nock(baseUrl)
+					.get('/redirect')
+					.reply(301, '', { Location: `${baseUrl}/test` });
+				nock(baseUrl).get('/test').reply(200, 'Redirected');
+
+				const response = await proxyRequestToAxios(workflow, additionalData, node, {
+					url: `${baseUrl}/redirect`,
+					resolveWithFullResponse: true,
+				});
+
+				expect(response).toMatchObject({
+					body: 'Redirected',
+					headers: {},
+					statusCode: 200,
+				});
+			});
+
+			test('should not follow redirects when configured', async () => {
+				nock(baseUrl)
+					.get('/redirect')
+					.reply(301, '', { Location: `${baseUrl}/test` });
+				nock(baseUrl).get('/test').reply(200, 'Redirected');
+
+				await expect(
+					proxyRequestToAxios(workflow, additionalData, node, {
+						url: `${baseUrl}/redirect`,
+						resolveWithFullResponse: true,
+						followRedirect: false,
+					}),
+				).rejects.toThrowError(expect.objectContaining({ statusCode: 301 }));
+			});
+		});
+	});
+
+	describe('parseRequestObject', () => {
+		test('should not use Host header for SNI', async () => {
+			const axiosOptions = await parseRequestObject({
+				url: 'https://example.de/foo/bar',
+				headers: { Host: 'other.host.com' },
+			});
+			expect((axiosOptions.httpsAgent as Agent).options.servername).toEqual('example.de');
+		});
+
+		describe('should set SSL certificates', () => {
+			const agentOptions: SecureContextOptions = {
+				ca: '-----BEGIN CERTIFICATE-----\nTEST\n-----END CERTIFICATE-----',
+			};
+			const requestObject: IRequestOptions = {
+				method: 'GET',
+				uri: 'https://example.de',
+				agentOptions,
+			};
+
+			test('on regular requests', async () => {
+				const axiosOptions = await parseRequestObject(requestObject);
+				expect((axiosOptions.httpsAgent as Agent).options).toEqual({
+					servername: 'example.de',
+					...agentOptions,
+					noDelay: true,
+					path: null,
+				});
+			});
+
+			test('on redirected requests', async () => {
+				const axiosOptions = await parseRequestObject(requestObject);
+				expect(axiosOptions.beforeRedirect).toBeDefined;
+				// eslint-disable-next-line @typescript-eslint/no-explicit-any
+				const redirectOptions: Record<string, any> = { agents: {}, hostname: 'example.de' };
+				axiosOptions.beforeRedirect!(redirectOptions, mock());
+				expect(redirectOptions.agent).toEqual(redirectOptions.agents.https);
+				expect((redirectOptions.agent as Agent).options).toEqual({
+					servername: 'example.de',
+					...agentOptions,
+					noDelay: true,
+					path: null,
+				});
+			});
+		});
+
+		describe('when followRedirect is true', () => {
+			test.each(['GET', 'HEAD'] as IHttpRequestMethods[])(
+				'should set maxRedirects on %s ',
+				async (method) => {
+					const axiosOptions = await parseRequestObject({
+						method,
+						followRedirect: true,
+						maxRedirects: 1234,
+					});
+					expect(axiosOptions.maxRedirects).toEqual(1234);
+				},
+			);
+
+			test.each(['POST', 'PUT', 'PATCH', 'DELETE'] as IHttpRequestMethods[])(
+				'should not set maxRedirects on %s ',
+				async (method) => {
+					const axiosOptions = await parseRequestObject({
+						method,
+						followRedirect: true,
+						maxRedirects: 1234,
+					});
+					expect(axiosOptions.maxRedirects).toEqual(0);
+				},
+			);
+		});
+
+		describe('when followAllRedirects is true', () => {
+			test.each(['GET', 'HEAD', 'POST', 'PUT', 'PATCH', 'DELETE'] as IHttpRequestMethods[])(
+				'should set maxRedirects on %s ',
+				async (method) => {
+					const axiosOptions = await parseRequestObject({
+						method,
+						followAllRedirects: true,
+						maxRedirects: 1234,
+					});
+					expect(axiosOptions.maxRedirects).toEqual(1234);
+				},
+			);
+		});
+	});
+
+	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('copyInputItems', () => {
+		it('should pick only selected properties', () => {
+			const output = copyInputItems(
+				[
+					{
+						json: {
+							a: 1,
+							b: true,
+							c: {},
+						},
+					},
+				],
+				['a'],
+			);
+			expect(output).toEqual([{ a: 1 }]);
+		});
+
+		it('should convert undefined to null', () => {
+			const output = copyInputItems(
+				[
+					{
+						json: {
+							a: undefined,
+						},
+					},
+				],
+				['a'],
+			);
+			expect(output).toEqual([{ a: null }]);
+		});
+
+		it('should clone objects', () => {
+			const input = {
+				a: { b: 5 },
+			};
+			const output = copyInputItems(
+				[
+					{
+						json: input,
+					},
+				],
+				['a'],
+			);
+			expect(output[0].a).toEqual(input.a);
+			expect(output[0].a === input.a).toEqual(false);
+		});
+	});
+
+	describe('removeEmptyBody', () => {
+		test.each(['GET', 'HEAD', 'OPTIONS'] as IHttpRequestMethods[])(
+			'Should remove empty body for %s',
+			async (method) => {
+				const requestOptions = {
+					method,
+					body: {},
+				} as IHttpRequestOptions | IRequestOptions;
+				removeEmptyBody(requestOptions);
+				expect(requestOptions.body).toEqual(undefined);
+			},
+		);
+
+		test.each(['GET', 'HEAD', 'OPTIONS'] as IHttpRequestMethods[])(
+			'Should not remove non-empty body for %s',
+			async (method) => {
+				const requestOptions = {
+					method,
+					body: { test: true },
+				} as IHttpRequestOptions | IRequestOptions;
+				removeEmptyBody(requestOptions);
+				expect(requestOptions.body).toEqual({ test: true });
+			},
+		);
+
+		test.each(['POST', 'PUT', 'PATCH', 'DELETE'] as IHttpRequestMethods[])(
+			'Should not remove empty body for %s',
+			async (method) => {
+				const requestOptions = {
+					method,
+					body: {},
+				} as IHttpRequestOptions | IRequestOptions;
+				removeEmptyBody(requestOptions);
+				expect(requestOptions.body).toEqual({});
+			},
+		);
 	});
 });
diff --git a/packages/core/test/ObjectStore.manager.test.ts b/packages/core/test/ObjectStore.manager.test.ts
new file mode 100644
index 0000000000000..dc91e3322173b
--- /dev/null
+++ b/packages/core/test/ObjectStore.manager.test.ts
@@ -0,0 +1,129 @@
+import fs from 'node:fs/promises';
+import { ObjectStoreManager } from '@/BinaryData/ObjectStore.manager';
+import { ObjectStoreService } from '@/ObjectStore/ObjectStore.service.ee';
+import { isStream } from '@/ObjectStore/utils';
+import { mockInstance, toFileId, toStream } from './utils';
+
+jest.mock('fs/promises');
+
+const objectStoreService = mockInstance(ObjectStoreService);
+const objectStoreManager = new ObjectStoreManager(objectStoreService);
+
+const workflowId = 'ObogjVbqpNOQpiyV';
+const executionId = '999';
+const fileUuid = '71f6209b-5d48-41a2-a224-80d529d8bb32';
+const fileId = toFileId(workflowId, executionId, fileUuid);
+const prefix = `workflows/${workflowId}/executions/${executionId}/binary_data/`;
+
+const otherWorkflowId = 'FHio8ftV6SrCAfPJ';
+const otherExecutionId = '888';
+const otherFileUuid = '71f6209b-5d48-41a2-a224-80d529d8bb33';
+const otherFileId = toFileId(otherWorkflowId, otherExecutionId, otherFileUuid);
+
+const mockBuffer = Buffer.from('Test data');
+const mockStream = toStream(mockBuffer);
+
+beforeAll(() => {
+	jest.restoreAllMocks();
+});
+
+describe('store()', () => {
+	it('should store a buffer', async () => {
+		const metadata = { mimeType: 'text/plain' };
+
+		const result = await objectStoreManager.store(workflowId, executionId, mockBuffer, metadata);
+
+		expect(result.fileId.startsWith(prefix)).toBe(true);
+		expect(result.fileSize).toBe(mockBuffer.length);
+	});
+});
+
+describe('getPath()', () => {
+	it('should return a path', async () => {
+		const path = objectStoreManager.getPath(fileId);
+
+		expect(path).toBe(fileId);
+	});
+});
+
+describe('getAsBuffer()', () => {
+	it('should return a buffer', async () => {
+		// @ts-expect-error Overload signature seemingly causing the return type to be misinferred
+		objectStoreService.get.mockResolvedValue(mockBuffer);
+
+		const result = await objectStoreManager.getAsBuffer(fileId);
+
+		expect(Buffer.isBuffer(result)).toBe(true);
+		expect(objectStoreService.get).toHaveBeenCalledWith(fileId, { mode: 'buffer' });
+	});
+});
+
+describe('getAsStream()', () => {
+	it('should return a stream', async () => {
+		objectStoreService.get.mockResolvedValue(mockStream);
+
+		const stream = await objectStoreManager.getAsStream(fileId);
+
+		expect(isStream(stream)).toBe(true);
+		expect(objectStoreService.get).toHaveBeenCalledWith(fileId, { mode: 'stream' });
+	});
+});
+
+describe('getMetadata()', () => {
+	it('should return metadata', async () => {
+		const mimeType = 'text/plain';
+		const fileName = 'file.txt';
+
+		objectStoreService.getMetadata.mockResolvedValue({
+			'content-length': '1',
+			'content-type': mimeType,
+			'x-amz-meta-filename': fileName,
+		});
+
+		const metadata = await objectStoreManager.getMetadata(fileId);
+
+		expect(metadata).toEqual(expect.objectContaining({ fileSize: 1, mimeType, fileName }));
+		expect(objectStoreService.getMetadata).toHaveBeenCalledWith(fileId);
+	});
+});
+
+describe('copyByFileId()', () => {
+	it('should copy by file ID and return the file ID', async () => {
+		const targetFileId = await objectStoreManager.copyByFileId(workflowId, executionId, fileId);
+
+		expect(targetFileId.startsWith(prefix)).toBe(true);
+		expect(objectStoreService.get).toHaveBeenCalledWith(fileId, { mode: 'buffer' });
+	});
+});
+
+describe('copyByFilePath()', () => {
+	test('should copy by file path and return the file ID and size', async () => {
+		const sourceFilePath = 'path/to/file/in/filesystem';
+		const metadata = { mimeType: 'text/plain' };
+
+		fs.readFile = jest.fn().mockResolvedValue(mockBuffer);
+
+		const result = await objectStoreManager.copyByFilePath(
+			workflowId,
+			executionId,
+			sourceFilePath,
+			metadata,
+		);
+
+		expect(result.fileId.startsWith(prefix)).toBe(true);
+		expect(fs.readFile).toHaveBeenCalledWith(sourceFilePath);
+		expect(result.fileSize).toBe(mockBuffer.length);
+	});
+});
+
+describe('rename()', () => {
+	it('should rename a file', async () => {
+		const promise = objectStoreManager.rename(fileId, otherFileId);
+
+		await expect(promise).resolves.not.toThrow();
+
+		expect(objectStoreService.get).toHaveBeenCalledWith(fileId, { mode: 'buffer' });
+		expect(objectStoreService.getMetadata).toHaveBeenCalledWith(fileId);
+		expect(objectStoreService.deleteOne).toHaveBeenCalledWith(fileId);
+	});
+});
diff --git a/packages/core/test/ObjectStore.service.test.ts b/packages/core/test/ObjectStore.service.test.ts
new file mode 100644
index 0000000000000..d39f08e1e20b9
--- /dev/null
+++ b/packages/core/test/ObjectStore.service.test.ts
@@ -0,0 +1,316 @@
+import axios from 'axios';
+import { ObjectStoreService } from '@/ObjectStore/ObjectStore.service.ee';
+import { Readable } from 'stream';
+import { writeBlockedMessage } from '@/ObjectStore/utils';
+
+jest.mock('axios');
+
+const mockAxios = axios as jest.Mocked<typeof axios>;
+
+const mockBucket = { region: 'us-east-1', name: 'test-bucket' };
+const mockHost = `s3.${mockBucket.region}.amazonaws.com`;
+const mockCredentials = { accessKey: 'mock-access-key', accessSecret: 'mock-secret-key' };
+const mockUrl = `https://${mockHost}/${mockBucket.name}`;
+const FAILED_REQUEST_ERROR_MESSAGE = 'Request to S3 failed';
+const mockError = new Error('Something went wrong!');
+const fileId =
+	'workflows/ObogjVbqpNOQpiyV/executions/999/binary_data/71f6209b-5d48-41a2-a224-80d529d8bb32';
+const mockBuffer = Buffer.from('Test data');
+
+const toDeletionXml = (filename: string) => `<Delete>
+<Object><Key>${filename}</Key></Object>
+</Delete>`;
+
+let objectStoreService: ObjectStoreService;
+
+beforeEach(async () => {
+	objectStoreService = new ObjectStoreService();
+	mockAxios.request.mockResolvedValueOnce({ status: 200 }); // for checkConnection
+	await objectStoreService.init(mockHost, mockBucket, mockCredentials);
+	jest.restoreAllMocks();
+});
+
+describe('checkConnection()', () => {
+	it('should send a HEAD request to the correct host', async () => {
+		mockAxios.request.mockResolvedValue({ status: 200 });
+
+		objectStoreService.setReady(false);
+
+		await objectStoreService.checkConnection();
+
+		expect(mockAxios.request).toHaveBeenCalledWith(
+			expect.objectContaining({
+				method: 'HEAD',
+				url: `https://${mockHost}/${mockBucket.name}`,
+				headers: expect.objectContaining({
+					'X-Amz-Content-Sha256': expect.any(String),
+					'X-Amz-Date': expect.any(String),
+					Authorization: expect.any(String),
+				}),
+			}),
+		);
+	});
+
+	it('should throw an error on request failure', async () => {
+		objectStoreService.setReady(false);
+
+		mockAxios.request.mockRejectedValue(mockError);
+
+		const promise = objectStoreService.checkConnection();
+
+		await expect(promise).rejects.toThrowError(FAILED_REQUEST_ERROR_MESSAGE);
+	});
+});
+
+describe('getMetadata()', () => {
+	it('should send a HEAD request to the correct host and path', async () => {
+		mockAxios.request.mockResolvedValue({ status: 200 });
+
+		await objectStoreService.getMetadata(fileId);
+
+		expect(mockAxios.request).toHaveBeenCalledWith(
+			expect.objectContaining({
+				method: 'HEAD',
+				url: `${mockUrl}/${fileId}`,
+				headers: expect.objectContaining({
+					Host: mockHost,
+					'X-Amz-Content-Sha256': expect.any(String),
+					'X-Amz-Date': expect.any(String),
+					Authorization: expect.any(String),
+				}),
+			}),
+		);
+	});
+
+	it('should throw an error on request failure', async () => {
+		mockAxios.request.mockRejectedValue(mockError);
+
+		const promise = objectStoreService.getMetadata(fileId);
+
+		await expect(promise).rejects.toThrowError(FAILED_REQUEST_ERROR_MESSAGE);
+	});
+});
+
+describe('put()', () => {
+	it('should send a PUT request to upload an object', async () => {
+		const metadata = { fileName: 'file.txt', mimeType: 'text/plain' };
+
+		mockAxios.request.mockResolvedValue({ status: 200 });
+
+		await objectStoreService.put(fileId, mockBuffer, metadata);
+
+		expect(mockAxios.request).toHaveBeenCalledWith(
+			expect.objectContaining({
+				method: 'PUT',
+				url: `${mockUrl}/${fileId}`,
+				headers: expect.objectContaining({
+					'Content-Length': mockBuffer.length,
+					'Content-MD5': expect.any(String),
+					'x-amz-meta-filename': metadata.fileName,
+					'Content-Type': metadata.mimeType,
+				}),
+				data: mockBuffer,
+			}),
+		);
+	});
+
+	it('should block if read-only', async () => {
+		objectStoreService.setReadonly(true);
+
+		const metadata = { fileName: 'file.txt', mimeType: 'text/plain' };
+
+		const promise = objectStoreService.put(fileId, mockBuffer, metadata);
+
+		await expect(promise).resolves.not.toThrow();
+
+		const result = await promise;
+
+		expect(result.status).toBe(403);
+		expect(result.statusText).toBe('Forbidden');
+
+		expect(result.data).toBe(writeBlockedMessage(fileId));
+	});
+
+	it('should throw an error on request failure', async () => {
+		const metadata = { fileName: 'file.txt', mimeType: 'text/plain' };
+
+		mockAxios.request.mockRejectedValue(mockError);
+
+		const promise = objectStoreService.put(fileId, mockBuffer, metadata);
+
+		await expect(promise).rejects.toThrowError(FAILED_REQUEST_ERROR_MESSAGE);
+	});
+});
+
+describe('get()', () => {
+	it('should send a GET request to download an object as a buffer', async () => {
+		const fileId = 'file.txt';
+
+		mockAxios.request.mockResolvedValue({ status: 200, data: Buffer.from('Test content') });
+
+		const result = await objectStoreService.get(fileId, { mode: 'buffer' });
+
+		expect(mockAxios.request).toHaveBeenCalledWith(
+			expect.objectContaining({
+				method: 'GET',
+				url: `${mockUrl}/${fileId}`,
+				responseType: 'arraybuffer',
+			}),
+		);
+
+		expect(Buffer.isBuffer(result)).toBe(true);
+	});
+
+	it('should send a GET request to download an object as a stream', async () => {
+		mockAxios.request.mockResolvedValue({ status: 200, data: new Readable() });
+
+		const result = await objectStoreService.get(fileId, { mode: 'stream' });
+
+		expect(mockAxios.request).toHaveBeenCalledWith(
+			expect.objectContaining({
+				method: 'GET',
+				url: `${mockUrl}/${fileId}`,
+				responseType: 'stream',
+			}),
+		);
+
+		expect(result instanceof Readable).toBe(true);
+	});
+
+	it('should throw an error on request failure', async () => {
+		mockAxios.request.mockRejectedValue(mockError);
+
+		const promise = objectStoreService.get(fileId, { mode: 'buffer' });
+
+		await expect(promise).rejects.toThrowError(FAILED_REQUEST_ERROR_MESSAGE);
+	});
+});
+
+describe('deleteOne()', () => {
+	it('should send a DELETE request to delete a single object', async () => {
+		mockAxios.request.mockResolvedValue({ status: 204 });
+
+		await objectStoreService.deleteOne(fileId);
+
+		expect(mockAxios.request).toHaveBeenCalledWith(
+			expect.objectContaining({
+				method: 'DELETE',
+				url: `${mockUrl}/${fileId}`,
+			}),
+		);
+	});
+
+	it('should throw an error on request failure', async () => {
+		mockAxios.request.mockRejectedValue(mockError);
+
+		const promise = objectStoreService.deleteOne(fileId);
+
+		await expect(promise).rejects.toThrowError(FAILED_REQUEST_ERROR_MESSAGE);
+	});
+});
+
+describe('deleteMany()', () => {
+	it('should send a POST request to delete multiple objects', async () => {
+		const prefix = 'test-dir/';
+		const fileName = 'file.txt';
+
+		const mockList = [
+			{
+				key: fileName,
+				lastModified: '2023-09-24T12:34:56Z',
+				eTag: 'abc123def456',
+				size: 456789,
+				storageClass: 'STANDARD',
+			},
+		];
+
+		objectStoreService.list = jest.fn().mockResolvedValue(mockList);
+
+		mockAxios.request.mockResolvedValue({ status: 204 });
+
+		await objectStoreService.deleteMany(prefix);
+
+		expect(objectStoreService.list).toHaveBeenCalledWith(prefix);
+		expect(mockAxios.request).toHaveBeenCalledWith(
+			expect.objectContaining({
+				method: 'POST',
+				url: `${mockUrl}/?delete`,
+				headers: expect.objectContaining({
+					'Content-Type': 'application/xml',
+					'Content-Length': expect.any(Number),
+					'Content-MD5': expect.any(String),
+				}),
+				data: toDeletionXml(fileName),
+			}),
+		);
+	});
+
+	it('should not send a deletion request if no prefix match', async () => {
+		objectStoreService.list = jest.fn().mockResolvedValue([]);
+
+		const result = await objectStoreService.deleteMany('non-matching-prefix');
+
+		expect(result).toBeUndefined();
+	});
+
+	it('should throw an error on request failure', async () => {
+		mockAxios.request.mockRejectedValue(mockError);
+
+		const promise = objectStoreService.deleteMany('test-dir/');
+
+		await expect(promise).rejects.toThrowError(FAILED_REQUEST_ERROR_MESSAGE);
+	});
+});
+
+describe('list()', () => {
+	it('should list objects with a common prefix', async () => {
+		const prefix = 'test-dir/';
+
+		const mockListPage = {
+			contents: [{ key: `${prefix}file1.txt` }, { key: `${prefix}file2.txt` }],
+			isTruncated: false,
+		};
+
+		objectStoreService.getListPage = jest.fn().mockResolvedValue(mockListPage);
+
+		mockAxios.request.mockResolvedValue({ status: 200 });
+
+		const result = await objectStoreService.list(prefix);
+
+		expect(result).toEqual(mockListPage.contents);
+	});
+
+	it('should consolidate pages', async () => {
+		const prefix = 'test-dir/';
+
+		const mockFirstListPage = {
+			contents: [{ key: `${prefix}file1.txt` }],
+			isTruncated: true,
+			nextContinuationToken: 'token1',
+		};
+
+		const mockSecondListPage = {
+			contents: [{ key: `${prefix}file2.txt` }],
+			isTruncated: false,
+		};
+
+		objectStoreService.getListPage = jest
+			.fn()
+			.mockResolvedValueOnce(mockFirstListPage)
+			.mockResolvedValueOnce(mockSecondListPage);
+
+		mockAxios.request.mockResolvedValue({ status: 200 });
+
+		const result = await objectStoreService.list(prefix);
+
+		expect(result).toEqual([...mockFirstListPage.contents, ...mockSecondListPage.contents]);
+	});
+
+	it('should throw an error on request failure', async () => {
+		mockAxios.request.mockRejectedValue(mockError);
+
+		const promise = objectStoreService.list('test-dir/');
+
+		await expect(promise).rejects.toThrowError(FAILED_REQUEST_ERROR_MESSAGE);
+	});
+});
diff --git a/packages/core/test/Validation.test.ts b/packages/core/test/Validation.test.ts
new file mode 100644
index 0000000000000..a19422a090068
--- /dev/null
+++ b/packages/core/test/Validation.test.ts
@@ -0,0 +1,248 @@
+import type { IDataObject, INode, INodeType } from 'n8n-workflow';
+import { validateValueAgainstSchema } from '@/NodeExecuteFunctions';
+
+describe('Validation', () => {
+	test('should validate fixedCollection values parameter', () => {
+		const nodeType = {
+			description: {
+				properties: [
+					{
+						displayName: 'Fields to Set',
+						name: 'fields',
+						placeholder: 'Add Field',
+						type: 'fixedCollection',
+						description: 'Edit existing fields or add new ones to modify the output data',
+						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',
+										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',
+									},
+									{
+										displayName: 'Value',
+										name: 'numberValue',
+										type: 'number',
+										default: 0,
+										displayOptions: {
+											show: {
+												type: ['numberValue'],
+											},
+										},
+										validateType: 'number',
+									},
+									{
+										displayName: 'Value',
+										name: 'booleanValue',
+										type: 'options',
+										default: 'true',
+										options: [
+											{
+												name: 'True',
+												value: 'true',
+											},
+											{
+												name: 'False',
+												value: 'false',
+											},
+										],
+										displayOptions: {
+											show: {
+												type: ['booleanValue'],
+											},
+										},
+										validateType: 'boolean',
+									},
+									{
+										displayName: 'Value',
+										name: 'arrayValue',
+										type: 'string',
+										default: '',
+										placeholder: 'e.g. [ arrayItem1, arrayItem2, arrayItem3 ]',
+										displayOptions: {
+											show: {
+												type: ['arrayValue'],
+											},
+										},
+										validateType: 'array',
+									},
+									{
+										displayName: 'Value',
+										name: 'objectValue',
+										type: 'json',
+										default: '={}',
+										typeOptions: {
+											rows: 2,
+										},
+										displayOptions: {
+											show: {
+												type: ['objectValue'],
+											},
+										},
+										validateType: 'object',
+									},
+								],
+							},
+						],
+						displayOptions: {
+							show: {
+								mode: ['manual'],
+							},
+						},
+					},
+				],
+			},
+		} as unknown as INodeType;
+
+		const node = {
+			parameters: {
+				mode: 'manual',
+				duplicateItem: false,
+				fields: {
+					values: [
+						{
+							name: 'num1',
+							type: 'numberValue',
+							numberValue: '=str',
+						},
+					],
+				},
+				include: 'none',
+				options: {},
+			},
+			name: 'Edit Fields2',
+			type: 'n8n-nodes-base.set',
+			typeVersion: 3,
+		} as unknown as INode;
+
+		const values = [
+			{
+				name: 'num1',
+				type: 'numberValue',
+				numberValue: '55',
+			},
+			{
+				name: 'str1',
+				type: 'stringValue',
+				stringValue: 42, //validateFieldType does not change the type of string value
+			},
+			{
+				name: 'arr1',
+				type: 'arrayValue',
+				arrayValue: "['foo', 'bar']",
+			},
+			{
+				name: 'obj',
+				type: 'objectValue',
+				objectValue: '{ "key": "value" }',
+			},
+		];
+
+		const parameterName = 'fields.values';
+
+		const result = validateValueAgainstSchema(node, nodeType, values, parameterName, 0, 0);
+
+		// value should be type number
+		expect(typeof (result as IDataObject[])[0].numberValue).toEqual('number');
+		// string value should remain unchanged
+		expect(typeof (result as IDataObject[])[1].stringValue).toEqual('number');
+		// value should be type array
+		expect(typeof (result as IDataObject[])[2].arrayValue).toEqual('object');
+		expect(Array.isArray((result as IDataObject[])[2].arrayValue)).toEqual(true);
+		// value should be type object
+		expect(typeof (result as IDataObject[])[3].objectValue).toEqual('object');
+		expect(((result as IDataObject[])[3].objectValue as IDataObject).key).toEqual('value');
+	});
+
+	test('should validate single value parameter', () => {
+		const nodeType = {
+			description: {
+				properties: [
+					{
+						displayName: 'Value',
+						name: 'numberValue',
+						type: 'number',
+						default: 0,
+						validateType: 'number',
+					},
+				],
+			},
+		} as unknown as INodeType;
+
+		const node = {
+			parameters: {
+				mode: 'manual',
+				duplicateItem: false,
+				numberValue: '777',
+				include: 'none',
+				options: {},
+			},
+			name: 'Edit Fields2',
+			type: 'n8n-nodes-base.set',
+			typeVersion: 3,
+		} as unknown as INode;
+
+		const value = '777';
+
+		const parameterName = 'numberValue';
+
+		const result = validateValueAgainstSchema(node, nodeType, value, parameterName, 0, 0);
+
+		// value should be type number
+		expect(typeof result).toEqual('number');
+	});
+});
diff --git a/packages/core/test/WorkflowExecute.test.ts b/packages/core/test/WorkflowExecute.test.ts
index 5a79bac72339f..8ad953c6540c1 100644
--- a/packages/core/test/WorkflowExecute.test.ts
+++ b/packages/core/test/WorkflowExecute.test.ts
@@ -1,1353 +1,76 @@
-import { createDeferredPromise, IConnections, INode, IRun, Workflow } from 'n8n-workflow';
+import type { IRun, WorkflowTestData } from 'n8n-workflow';
+import { ApplicationError, createDeferredPromise, Workflow } from 'n8n-workflow';
 import { WorkflowExecute } from '@/WorkflowExecute';
 
-import * as Helpers from './Helpers';
-import { initLogger } from './utils';
+import * as Helpers from './helpers';
+import { legacyWorkflowExecuteTests, v1WorkflowExecuteTests } from './helpers/constants';
 
 describe('WorkflowExecute', () => {
-	beforeAll(() => {
-		initLogger();
-	});
+	describe('v0 execution order', () => {
+		const tests: WorkflowTestData[] = legacyWorkflowExecuteTests;
 
-	describe('run', () => {
-		const tests: Array<{
-			description: string;
-			input: {
-				workflowData: {
-					nodes: INode[];
-					connections: IConnections;
-				};
-			};
-			output: {
-				nodeExecutionOrder: string[];
-				nodeData: {
-					[key: string]: any[][];
-				};
-			};
-		}> = [
-			{
-				description: 'should run basic two node workflow',
-				input: {
-					// Leave the workflowData in regular JSON to be able to easily
-					// copy it from/in the UI
-					workflowData: {
-						nodes: [
-							{
-								id: 'uuid-1',
-								parameters: {},
-								name: 'Start',
-								type: 'n8n-nodes-base.start',
-								typeVersion: 1,
-								position: [100, 300],
-							},
-							{
-								id: 'uuid-2',
-								parameters: {
-									values: {
-										number: [
-											{
-												name: 'value1',
-												value: 1,
-											},
-										],
-									},
-								},
-								name: 'Set',
-								type: 'n8n-nodes-base.set',
-								typeVersion: 1,
-								position: [280, 300],
-							},
-						],
-						connections: {
-							Start: {
-								main: [
-									[
-										{
-											node: 'Set',
-											type: 'main',
-											index: 0,
-										},
-									],
-								],
-							},
-						},
-					},
-				},
-				output: {
-					nodeExecutionOrder: ['Start', 'Set'],
-					nodeData: {
-						Set: [
-							[
-								{
-									value1: 1,
-								},
-							],
-						],
-					},
-				},
-			},
-			{
-				description: 'should run node twice when it has two input connections',
-				input: {
-					// Leave the workflowData in regular JSON to be able to easily
-					// copy it from/in the UI
-					workflowData: {
-						nodes: [
-							{
-								id: 'uuid-1',
-								parameters: {},
-								name: 'Start',
-								type: 'n8n-nodes-base.start',
-								typeVersion: 1,
-								position: [100, 300],
-							},
-							{
-								id: 'uuid-2',
-								parameters: {
-									values: {
-										number: [
-											{
-												name: 'value1',
-												value: 1,
-											},
-										],
-									},
-								},
-								name: 'Set1',
-								type: 'n8n-nodes-base.set',
-								typeVersion: 1,
-								position: [300, 250],
-							},
-							{
-								id: 'uuid-3',
-								parameters: {
-									values: {
-										number: [
-											{
-												name: 'value2',
-												value: 2,
-											},
-										],
-									},
-								},
-								name: 'Set2',
-								type: 'n8n-nodes-base.set',
-								typeVersion: 1,
-								position: [500, 400],
-							},
-						],
-						connections: {
-							Start: {
-								main: [
-									[
-										{
-											node: 'Set1',
-											type: 'main',
-											index: 0,
-										},
-										{
-											node: 'Set2',
-											type: 'main',
-											index: 0,
-										},
-									],
-								],
-							},
-							Set1: {
-								main: [
-									[
-										{
-											node: 'Set2',
-											type: 'main',
-											index: 0,
-										},
-									],
-								],
-							},
-						},
-					},
-				},
-				output: {
-					nodeExecutionOrder: ['Start', 'Set1', 'Set2', 'Set2'],
-					nodeData: {
-						Set1: [
-							[
-								{
-									value1: 1,
-								},
-							],
-						],
-						Set2: [
-							[
-								{
-									value2: 2,
-								},
-							],
-							[
-								{
-									value1: 1,
-									value2: 2,
-								},
-							],
-						],
-					},
-				},
-			},
-			{
-				description: 'should run complicated multi node workflow',
-				input: {
-					// Leave the workflowData in regular JSON to be able to easily
-					// copy it from/in the UI
-					workflowData: {
-						nodes: [
-							{
-								id: 'uuid-1',
-								parameters: {
-									mode: 'passThrough',
-								},
-								name: 'Merge4',
-								type: 'n8n-nodes-base.merge',
-								typeVersion: 1,
-								position: [1150, 500],
-							},
-							{
-								id: 'uuid-2',
-								parameters: {
-									values: {
-										number: [
-											{
-												name: 'value2',
-												value: 2,
-											},
-										],
-									},
-								},
-								name: 'Set2',
-								type: 'n8n-nodes-base.set',
-								typeVersion: 1,
-								position: [290, 400],
-							},
-							{
-								id: 'uuid-3',
-								parameters: {
-									values: {
-										number: [
-											{
-												name: 'value4',
-												value: 4,
-											},
-										],
-									},
-								},
-								name: 'Set4',
-								type: 'n8n-nodes-base.set',
-								typeVersion: 1,
-								position: [850, 200],
-							},
-							{
-								id: 'uuid-4',
-								parameters: {
-									values: {
-										number: [
-											{
-												name: 'value3',
-												value: 3,
-											},
-										],
-									},
-								},
-								name: 'Set3',
-								type: 'n8n-nodes-base.set',
-								typeVersion: 1,
-								position: [650, 200],
-							},
-							{
-								id: 'uuid-5',
-								parameters: {
-									mode: 'passThrough',
-								},
-								name: 'Merge4',
-								type: 'n8n-nodes-base.merge',
-								typeVersion: 1,
-								position: [1150, 500],
-							},
-							{
-								id: 'uuid-6',
-								parameters: {},
-								name: 'Merge3',
-								type: 'n8n-nodes-base.merge',
-								typeVersion: 1,
-								position: [1000, 400],
-							},
-							{
-								id: 'uuid-7',
-								parameters: {
-									mode: 'passThrough',
-									output: 'input2',
-								},
-								name: 'Merge2',
-								type: 'n8n-nodes-base.merge',
-								typeVersion: 1,
-								position: [700, 400],
-							},
-							{
-								id: 'uuid-8',
-								parameters: {},
-								name: 'Merge1',
-								type: 'n8n-nodes-base.merge',
-								typeVersion: 1,
-								position: [500, 300],
-							},
-							{
-								id: 'uuid-9',
-								parameters: {
-									values: {
-										number: [
-											{
-												name: 'value1',
-												value: 1,
-											},
-										],
-									},
-								},
-								name: 'Set1',
-								type: 'n8n-nodes-base.set',
-								typeVersion: 1,
-								position: [300, 200],
-							},
-							{
-								id: 'uuid-10',
-								parameters: {},
-								name: 'Start',
-								type: 'n8n-nodes-base.start',
-								typeVersion: 1,
-								position: [100, 300],
-							},
-						],
-						connections: {
-							Set2: {
-								main: [
-									[
-										{
-											node: 'Merge1',
-											type: 'main',
-											index: 1,
-										},
-										{
-											node: 'Merge2',
-											type: 'main',
-											index: 1,
-										},
-									],
-								],
-							},
-							Set4: {
-								main: [
-									[
-										{
-											node: 'Merge3',
-											type: 'main',
-											index: 0,
-										},
-									],
-								],
-							},
-							Set3: {
-								main: [
-									[
-										{
-											node: 'Set4',
-											type: 'main',
-											index: 0,
-										},
-									],
-								],
-							},
-							Merge3: {
-								main: [
-									[
-										{
-											node: 'Merge4',
-											type: 'main',
-											index: 0,
-										},
-									],
-								],
-							},
-							Merge2: {
-								main: [
-									[
-										{
-											node: 'Merge3',
-											type: 'main',
-											index: 1,
-										},
-									],
-								],
-							},
-							Merge1: {
-								main: [
-									[
-										{
-											node: 'Merge2',
-											type: 'main',
-											index: 0,
-										},
-									],
-								],
-							},
-							Set1: {
-								main: [
-									[
-										{
-											node: 'Merge1',
-											type: 'main',
-											index: 0,
-										},
-										{
-											node: 'Set3',
-											type: 'main',
-											index: 0,
-										},
-									],
-								],
-							},
-							Start: {
-								main: [
-									[
-										{
-											node: 'Set1',
-											type: 'main',
-											index: 0,
-										},
-										{
-											node: 'Set2',
-											type: 'main',
-											index: 0,
-										},
-										{
-											node: 'Merge4',
-											type: 'main',
-											index: 1,
-										},
-									],
-								],
-							},
-						},
-					},
-				},
-				output: {
-					nodeExecutionOrder: [
-						'Start',
-						'Set1',
-						'Set2',
-						'Set3',
-						'Merge1',
-						'Set4',
-						'Merge2',
-						'Merge3',
-						'Merge4',
-					],
-					nodeData: {
-						Set1: [
-							[
-								{
-									value1: 1,
-								},
-							],
-						],
-						Set2: [
-							[
-								{
-									value2: 2,
-								},
-							],
-						],
-						Set3: [
-							[
-								{
-									value1: 1,
-									value3: 3,
-								},
-							],
-						],
-						Set4: [
-							[
-								{
-									value1: 1,
-									value3: 3,
-									value4: 4,
-								},
-							],
-						],
-						Merge1: [
-							[
-								{
-									value1: 1,
-								},
-								{
-									value2: 2,
-								},
-							],
-						],
-						Merge2: [
-							[
-								{
-									value2: 2,
-								},
-							],
-						],
-						Merge3: [
-							[
-								{
-									value1: 1,
-									value3: 3,
-									value4: 4,
-								},
-								{
-									value2: 2,
-								},
-							],
-						],
-						Merge4: [
-							[
-								{
-									value1: 1,
-									value3: 3,
-									value4: 4,
-								},
-								{
-									value2: 2,
-								},
-							],
-						],
-					},
-				},
-			},
-			{
-				description:
-					'should run workflow also if node has multiple input connections and one is empty',
-				input: {
-					// Leave the workflowData in regular JSON to be able to easily
-					// copy it from/in the UI
-					workflowData: {
-						nodes: [
-							{
-								parameters: {},
-								name: 'Start',
-								type: 'n8n-nodes-base.start',
-								typeVersion: 1,
-								id: 'uuid-1',
-								position: [250, 450],
-							},
-							{
-								parameters: {
-									conditions: {
-										boolean: [],
-										number: [
-											{
-												value1: '={{Object.keys($json).length}}',
-												operation: 'notEqual',
-											},
-										],
-									},
-								},
-								name: 'IF',
-								type: 'n8n-nodes-base.if',
-								typeVersion: 1,
-								id: 'uuid-2',
-								position: [650, 350],
-							},
-							{
-								parameters: {},
-								name: 'Merge1',
-								type: 'n8n-nodes-base.merge',
-								typeVersion: 1,
-								id: 'uuid-3',
-								position: [1150, 450],
-							},
-							{
-								parameters: {
-									values: {
-										string: [
-											{
-												name: 'test1',
-												value: 'a',
-											},
-										],
-									},
-									options: {},
-								},
-								name: 'Set1',
-								type: 'n8n-nodes-base.set',
-								typeVersion: 1,
-								id: 'uuid-4',
-								position: [450, 450],
-							},
-							{
-								parameters: {
-									values: {
-										string: [
-											{
-												name: 'test2',
-												value: 'b',
-											},
-										],
-									},
-									options: {},
-								},
-								name: 'Set2',
-								type: 'n8n-nodes-base.set',
-								typeVersion: 1,
-								id: 'uuid-1',
-								position: [800, 250],
-							},
-						],
-						connections: {
-							Start: {
-								main: [
-									[
-										{
-											node: 'Set1',
-											type: 'main',
-											index: 0,
-										},
-									],
-								],
-							},
-							IF: {
-								main: [
-									[
-										{
-											node: 'Set2',
-											type: 'main',
-											index: 0,
-										},
-									],
-									[
-										{
-											node: 'Merge1',
-											type: 'main',
-											index: 0,
-										},
-									],
-								],
-							},
-							Set1: {
-								main: [
-									[
-										{
-											node: 'IF',
-											type: 'main',
-											index: 0,
-										},
-										{
-											node: 'Merge1',
-											type: 'main',
-											index: 1,
-										},
-									],
-								],
-							},
-							Set2: {
-								main: [
-									[
-										{
-											node: 'Merge1',
-											type: 'main',
-											index: 0,
-										},
-									],
-								],
-							},
-						},
-					},
-				},
-				output: {
-					nodeExecutionOrder: ['Start', 'Set1', 'IF', 'Set2', 'Merge1'],
-					nodeData: {
-						Merge1: [
-							[
-								{
-									test1: 'a',
-									test2: 'b',
-								},
-								{
-									test1: 'a',
-								},
-							],
-						],
-					},
-				},
-			},
-			{
-				description: 'should use empty data if second input does not have any data',
-				input: {
-					// Leave the workflowData in regular JSON to be able to easily
-					// copy it from/in the UI
-					workflowData: {
-						nodes: [
-							{
-								id: 'uuid-1',
-								parameters: {},
-								name: 'Start',
-								type: 'n8n-nodes-base.start',
-								typeVersion: 1,
-								position: [250, 300],
-							},
-							{
-								id: 'uuid-2',
-								parameters: {},
-								name: 'Merge',
-								type: 'n8n-nodes-base.merge',
-								typeVersion: 1,
-								position: [800, 450],
-							},
-							{
-								id: 'uuid-3',
-								parameters: {},
-								name: 'Merge1',
-								type: 'n8n-nodes-base.merge',
-								typeVersion: 1,
-								position: [1000, 300],
-							},
-							{
-								id: 'uuid-4',
-								parameters: {
-									conditions: {
-										boolean: [
-											{
-												value2: true,
-											},
-										],
-										string: [
-											{
-												value1: '={{$json["key"]}}',
-												value2: 'a',
-											},
-										],
-									},
-									combineOperation: 'any',
-								},
-								name: 'IF',
-								type: 'n8n-nodes-base.if',
-								typeVersion: 1,
-								position: [600, 600],
-								alwaysOutputData: false,
-							},
-							{
-								id: 'uuid-5',
-								parameters: {
-									values: {
-										number: [
-											{
-												name: 'number0',
-											},
-										],
-										string: [
-											{
-												name: 'key',
-												value: 'a',
-											},
-										],
-									},
-									options: {},
-								},
-								name: 'Set0',
-								type: 'n8n-nodes-base.set',
-								typeVersion: 1,
-								position: [450, 300],
-							},
-							{
-								id: 'uuid-6',
-								parameters: {
-									values: {
-										number: [
-											{
-												name: 'number1',
-												value: 1,
-											},
-										],
-										string: [
-											{
-												name: 'key',
-												value: 'b',
-											},
-										],
-									},
-									options: {},
-								},
-								name: 'Set1',
-								type: 'n8n-nodes-base.set',
-								typeVersion: 1,
-								position: [450, 450],
-							},
-							{
-								id: 'uuid-7',
-								parameters: {
-									values: {
-										number: [
-											{
-												name: 'number2',
-												value: 2,
-											},
-										],
-										string: [
-											{
-												name: 'key',
-												value: 'c',
-											},
-										],
-									},
-									options: {},
-								},
-								name: 'Set2',
-								type: 'n8n-nodes-base.set',
-								typeVersion: 1,
-								position: [450, 600],
-							},
-						],
-						connections: {
-							Start: {
-								main: [
-									[
-										{
-											node: 'Set0',
-											type: 'main',
-											index: 0,
-										},
-									],
-								],
-							},
-							Merge: {
-								main: [
-									[
-										{
-											node: 'Merge1',
-											type: 'main',
-											index: 1,
-										},
-									],
-								],
-							},
-							IF: {
-								main: [
-									[
-										{
-											node: 'Merge',
-											type: 'main',
-											index: 1,
-										},
-									],
-								],
-							},
-							Set0: {
-								main: [
-									[
-										{
-											node: 'Merge1',
-											type: 'main',
-											index: 0,
-										},
-									],
-								],
-							},
-							Set1: {
-								main: [
-									[
-										{
-											node: 'Merge',
-											type: 'main',
-											index: 0,
-										},
-									],
-								],
-							},
-							Set2: {
-								main: [
-									[
-										{
-											node: 'IF',
-											type: 'main',
-											index: 0,
-										},
-									],
-								],
-							},
-						},
-					},
-				},
-				output: {
-					nodeExecutionOrder: ['Start', 'Set0', 'Set2', 'IF', 'Set1', 'Merge', 'Merge1'],
-					nodeData: {
-						Merge: [
-							[
-								{
-									number1: 1,
-									key: 'b',
-								},
-							],
-						],
-						Merge1: [
-							[
-								{
-									number0: 0,
-									key: 'a',
-								},
-								{
-									number1: 1,
-									key: 'b',
-								},
-							],
-						],
-					},
-				},
-			},
-			{
-				description:
-					'should use empty data if input of sibling does not receive any data from parent',
-				input: {
-					// Leave the workflowData in regular JSON to be able to easily
-					// copy it from/in the UI
-					workflowData: {
-						nodes: [
-							{
-								id: 'uuid-1',
-								parameters: {},
-								name: 'Start',
-								type: 'n8n-nodes-base.start',
-								typeVersion: 1,
-								position: [250, 300],
-							},
-							{
-								id: 'uuid-2',
-								parameters: {
-									conditions: {
-										number: [
-											{
-												value1: '={{$json["value1"]}}',
-												operation: 'equal',
-												value2: 1,
-											},
-										],
-									},
-								},
-								name: 'IF',
-								type: 'n8n-nodes-base.if',
-								typeVersion: 1,
-								position: [650, 300],
-							},
-							{
-								id: 'uuid-3',
-								parameters: {
-									values: {
-										string: [],
-										number: [
-											{
-												name: 'value2',
-												value: 2,
-											},
-										],
-									},
-									options: {},
-								},
-								name: 'Set2',
-								type: 'n8n-nodes-base.set',
-								typeVersion: 1,
-								position: [850, 450],
-							},
-							{
-								id: 'uuid-4',
-								parameters: {
-									values: {
-										number: [
-											{
-												name: 'value1',
-												value: 1,
-											},
-										],
-									},
-									options: {},
-								},
-								name: 'Set1',
-								type: 'n8n-nodes-base.set',
-								typeVersion: 1,
-								position: [450, 300],
-							},
-							{
-								id: 'uuid-5',
-								parameters: {},
-								name: 'Merge',
-								type: 'n8n-nodes-base.merge',
-								typeVersion: 1,
-								position: [1050, 300],
-							},
-						],
-						connections: {
-							Start: {
-								main: [
-									[
-										{
-											node: 'Set1',
-											type: 'main',
-											index: 0,
-										},
-									],
-								],
-							},
-							IF: {
-								main: [
-									[
-										{
-											node: 'Merge',
-											type: 'main',
-											index: 0,
-										},
-									],
-									[
-										{
-											node: 'Set2',
-											type: 'main',
-											index: 0,
-										},
-									],
-								],
-							},
-							Set2: {
-								main: [
-									[
-										{
-											node: 'Merge',
-											type: 'main',
-											index: 1,
-										},
-									],
-								],
-							},
-							Set1: {
-								main: [
-									[
-										{
-											node: 'IF',
-											type: 'main',
-											index: 0,
-										},
-									],
-								],
-							},
-						},
-					},
-				},
-				output: {
-					nodeExecutionOrder: ['Start', 'Set1', 'IF', 'Set2', 'Merge'],
-					nodeData: {
-						Merge: [
-							[
-								{
-									value1: 1,
-								},
-								{
-									value2: 2,
-								},
-							],
-						],
-					},
-				},
-			},
-			{
-				description: 'should not use empty data in sibling if parent did not send any data',
-				input: {
-					// Leave the workflowData in regular JSON to be able to easily
-					// copy it from/in the UI
-					workflowData: {
-						nodes: [
-							{
-								id: 'uuid-1',
-								parameters: {},
-								name: 'Start',
-								type: 'n8n-nodes-base.start',
-								typeVersion: 1,
-								position: [250, 300],
-							},
-							{
-								id: 'uuid-2',
-								parameters: {
-									values: {
-										number: [
-											{
-												name: 'value1',
-											},
-										],
-									},
-									options: {},
-								},
-								name: 'Set',
-								type: 'n8n-nodes-base.set',
-								typeVersion: 1,
-								position: [450, 300],
-							},
-							{
-								id: 'uuid-3',
-								parameters: {},
-								name: 'Merge',
-								type: 'n8n-nodes-base.merge',
-								typeVersion: 1,
-								position: [1050, 250],
-							},
-							{
-								id: 'uuid-4',
-								parameters: {
-									conditions: {
-										number: [
-											{
-												value1: '={{$json["value1"]}}',
-												operation: 'equal',
-												value2: 1,
-											},
-										],
-									},
-								},
-								name: 'IF',
-								type: 'n8n-nodes-base.if',
-								typeVersion: 1,
-								position: [650, 300],
-							},
-							{
-								id: 'uuid-5',
-								parameters: {},
-								name: 'NoOpTrue',
-								type: 'n8n-nodes-base.noOp',
-								typeVersion: 1,
-								position: [850, 150],
-							},
-							{
-								id: 'uuid-6',
-								parameters: {},
-								name: 'NoOpFalse',
-								type: 'n8n-nodes-base.noOp',
-								typeVersion: 1,
-								position: [850, 400],
-							},
-						],
-						connections: {
-							Start: {
-								main: [
-									[
-										{
-											node: 'Set',
-											type: 'main',
-											index: 0,
-										},
-									],
-								],
-							},
-							Set: {
-								main: [
-									[
-										{
-											node: 'IF',
-											type: 'main',
-											index: 0,
-										},
-									],
-								],
-							},
-							IF: {
-								main: [
-									[
-										{
-											node: 'NoOpTrue',
-											type: 'main',
-											index: 0,
-										},
-										{
-											node: 'Merge',
-											type: 'main',
-											index: 1,
-										},
-									],
-									[
-										{
-											node: 'NoOpFalse',
-											type: 'main',
-											index: 0,
-										},
-									],
-								],
-							},
-							NoOpTrue: {
-								main: [
-									[
-										{
-											node: 'Merge',
-											type: 'main',
-											index: 0,
-										},
-									],
-								],
-							},
-						},
-					},
-				},
-				output: {
-					nodeExecutionOrder: ['Start', 'Set', 'IF', 'NoOpFalse'],
-					nodeData: {
-						IF: [[]],
-						NoOpFalse: [
-							[
-								{
-									value1: 0,
-								},
-							],
-						],
-					},
-				},
-			},
+		const executionMode = 'manual';
+		const nodeTypes = Helpers.NodeTypes();
 
-			{
-				description:
-					'should display the correct parameters and so correct data when simplified node-versioning is used',
-				input: {
-					workflowData: {
-						nodes: [
-							{
-								id: 'uuid-1',
-								parameters: {},
-								name: 'Start',
-								type: 'n8n-nodes-base.start',
-								typeVersion: 1,
-								position: [240, 300],
-							},
-							{
-								id: 'uuid-2',
-								parameters: {},
-								name: 'VersionTest1a',
-								type: 'n8n-nodes-base.versionTest',
-								typeVersion: 1,
-								position: [460, 300],
-							},
-							{
-								id: 'uuid-3',
-								parameters: {
-									versionTest: 11,
-								},
-								name: 'VersionTest1b',
-								type: 'n8n-nodes-base.versionTest',
-								typeVersion: 1,
-								position: [680, 300],
-							},
-							{
-								id: 'uuid-4',
-								parameters: {},
-								name: 'VersionTest2a',
-								type: 'n8n-nodes-base.versionTest',
-								typeVersion: 2,
-								position: [880, 300],
-							},
-							{
-								id: 'uuid-5',
-								parameters: {
-									versionTest: 22,
-								},
-								name: 'VersionTest2b',
-								type: 'n8n-nodes-base.versionTest',
-								typeVersion: 2,
-								position: [1080, 300],
-							},
-						],
-						connections: {
-							Start: {
-								main: [
-									[
-										{
-											node: 'VersionTest1a',
-											type: 'main',
-											index: 0,
-										},
-									],
-								],
-							},
-							VersionTest1a: {
-								main: [
-									[
-										{
-											node: 'VersionTest1b',
-											type: 'main',
-											index: 0,
-										},
-									],
-								],
-							},
-							VersionTest1b: {
-								main: [
-									[
-										{
-											node: 'VersionTest2a',
-											type: 'main',
-											index: 0,
-										},
-									],
-								],
-							},
-							VersionTest2a: {
-								main: [
-									[
-										{
-											node: 'VersionTest2b',
-											type: 'main',
-											index: 0,
-										},
-									],
-								],
-							},
-						},
-					},
-				},
-				output: {
-					nodeExecutionOrder: [
-						'Start',
-						'VersionTest1a',
-						'VersionTest1b',
-						'VersionTest2a',
-						'VersionTest2b',
-					],
-					nodeData: {
-						VersionTest1a: [
-							[
-								{
-									versionFromNode: 1,
-									versionFromParameter: 1,
-								},
-							],
-						],
-						VersionTest1b: [
-							[
-								{
-									versionFromNode: 1,
-									versionFromParameter: 11,
-								},
-							],
-						],
-						VersionTest2a: [
-							[
-								{
-									versionFromNode: 2,
-									versionFromParameter: 2,
-								},
-							],
-						],
-						VersionTest2b: [
-							[
-								{
-									versionFromNode: 2,
-									versionFromParameter: 22,
-								},
-							],
-						],
+		for (const testData of tests) {
+			test(testData.description, async () => {
+				const workflowInstance = new Workflow({
+					id: 'test',
+					nodes: testData.input.workflowData.nodes,
+					connections: testData.input.workflowData.connections,
+					active: false,
+					nodeTypes,
+					settings: {
+						executionOrder: 'v0',
 					},
-				},
-			},
-		];
+				});
+
+				const waitPromise = await createDeferredPromise<IRun>();
+				const nodeExecutionOrder: string[] = [];
+				const additionalData = Helpers.WorkflowExecuteAdditionalData(
+					waitPromise,
+					nodeExecutionOrder,
+				);
+
+				const workflowExecute = new WorkflowExecute(additionalData, executionMode);
+
+				const executionData = await workflowExecute.run(workflowInstance);
+
+				const result = await waitPromise.promise();
+
+				// Check if the data from WorkflowExecute is identical to data received
+				// by the webhooks
+				expect(executionData).toEqual(result);
+
+				// Check if the output data of the nodes is correct
+				for (const nodeName of Object.keys(testData.output.nodeData)) {
+					if (result.data.resultData.runData[nodeName] === undefined) {
+						throw new ApplicationError('Data for node is missing', { extra: { nodeName } });
+					}
+
+					const resultData = result.data.resultData.runData[nodeName].map((nodeData) => {
+						if (nodeData.data === undefined) {
+							return null;
+						}
+						return nodeData.data.main[0]!.map((entry) => entry.json);
+					});
+
+					expect(resultData).toEqual(testData.output.nodeData[nodeName]);
+				}
+
+				// Check if the nodes did execute in the correct order
+				expect(nodeExecutionOrder).toEqual(testData.output.nodeExecutionOrder);
+
+				// Check if other data has correct value
+				expect(result.finished).toEqual(true);
+				expect(result.data.executionData!.contextData).toEqual({});
+				expect(result.data.executionData!.nodeExecutionStack).toEqual([]);
+			});
+		}
+	});
+
+	describe('v1 execution order', () => {
+		const tests: WorkflowTestData[] = v1WorkflowExecuteTests;
 
 		const executionMode = 'manual';
 		const nodeTypes = Helpers.NodeTypes();
@@ -1360,6 +83,9 @@ describe('WorkflowExecute', () => {
 					connections: testData.input.workflowData.connections,
 					active: false,
 					nodeTypes,
+					settings: {
+						executionOrder: 'v1',
+					},
 				});
 
 				const waitPromise = await createDeferredPromise<IRun>();
@@ -1382,7 +108,7 @@ describe('WorkflowExecute', () => {
 				// Check if the output data of the nodes is correct
 				for (const nodeName of Object.keys(testData.output.nodeData)) {
 					if (result.data.resultData.runData[nodeName] === undefined) {
-						throw new Error(`Data for node "${nodeName}" is missing!`);
+						throw new ApplicationError('Data for node is missing', { extra: { nodeName } });
 					}
 
 					const resultData = result.data.resultData.runData[nodeName].map((nodeData) => {
@@ -1406,4 +132,64 @@ describe('WorkflowExecute', () => {
 			});
 		}
 	});
+
+	//run tests on json files from specified directory, default 'workflows'
+	//workflows must have pinned data that would be used to test output after execution
+	describe('run test workflows', () => {
+		const tests: WorkflowTestData[] = Helpers.workflowToTests(__dirname);
+
+		const executionMode = 'manual';
+		const nodeTypes = Helpers.NodeTypes(Helpers.getNodeTypes(tests));
+
+		for (const testData of tests) {
+			test(testData.description, async () => {
+				const workflowInstance = new Workflow({
+					id: 'test',
+					nodes: testData.input.workflowData.nodes,
+					connections: testData.input.workflowData.connections,
+					active: false,
+					nodeTypes,
+					settings: testData.input.workflowData.settings,
+				});
+
+				const waitPromise = await createDeferredPromise<IRun>();
+				const nodeExecutionOrder: string[] = [];
+				const additionalData = Helpers.WorkflowExecuteAdditionalData(
+					waitPromise,
+					nodeExecutionOrder,
+				);
+
+				const workflowExecute = new WorkflowExecute(additionalData, executionMode);
+
+				const executionData = await workflowExecute.run(workflowInstance);
+
+				const result = await waitPromise.promise();
+
+				// Check if the data from WorkflowExecute is identical to data received
+				// by the webhooks
+				expect(executionData).toEqual(result);
+
+				// Check if the output data of the nodes is correct
+				for (const nodeName of Object.keys(testData.output.nodeData)) {
+					if (result.data.resultData.runData[nodeName] === undefined) {
+						throw new ApplicationError('Data for node is missing', { extra: { nodeName } });
+					}
+
+					const resultData = result.data.resultData.runData[nodeName].map((nodeData) => {
+						if (nodeData.data === undefined) {
+							return null;
+						}
+						return nodeData.data.main[0];
+					});
+
+					expect(resultData).toEqual(testData.output.nodeData[nodeName]);
+				}
+
+				// Check if other data has correct value
+				expect(result.finished).toEqual(true);
+				// expect(result.data.executionData!.contextData).toEqual({}); //Fails when test workflow Includes splitInbatches
+				expect(result.data.executionData!.nodeExecutionStack).toEqual([]);
+			});
+		}
+	});
 });
diff --git a/packages/core/test/WorkflowExecutionMetadata.test.ts b/packages/core/test/WorkflowExecutionMetadata.test.ts
index dc99effede13a..cdb50c9737230 100644
--- a/packages/core/test/WorkflowExecutionMetadata.test.ts
+++ b/packages/core/test/WorkflowExecutionMetadata.test.ts
@@ -1,25 +1,12 @@
 import {
-	getAllWorkflowExecutionMetadata,
-	getWorkflowExecutionMetadata,
-	KV_LIMIT,
-	setAllWorkflowExecutionMetadata,
 	setWorkflowExecutionMetadata,
-	ExecutionMetadataValidationError,
-} from '@/WorkflowExecutionMetadata';
-import { LoggerProxy } from 'n8n-workflow';
-import type { ILogger, IRunExecutionData } from 'n8n-workflow';
-
-beforeAll(() => {
-	const fakeLogger = {
-		log: () => {},
-		debug: () => {},
-		verbose: () => {},
-		info: () => {},
-		warn: () => {},
-		error: () => {},
-	} as ILogger;
-	LoggerProxy.init(fakeLogger);
-});
+	setAllWorkflowExecutionMetadata,
+	KV_LIMIT,
+	getWorkflowExecutionMetadata,
+	getAllWorkflowExecutionMetadata,
+} from '@/ExecutionMetadata';
+import { InvalidExecutionMetadataError } from '@/errors/invalid-execution-metadata.error';
+import type { IRunExecutionData } from 'n8n-workflow';
 
 describe('Execution Metadata functions', () => {
 	test('setWorkflowExecutionMetadata will set a value', () => {
@@ -65,7 +52,7 @@ describe('Execution Metadata functions', () => {
 		} as IRunExecutionData;
 
 		expect(() => setWorkflowExecutionMetadata(executionData, 'test1', 1234)).not.toThrow(
-			ExecutionMetadataValidationError,
+			InvalidExecutionMetadataError,
 		);
 
 		expect(metadata).toEqual({
@@ -73,7 +60,7 @@ describe('Execution Metadata functions', () => {
 		});
 
 		expect(() => setWorkflowExecutionMetadata(executionData, 'test2', {})).toThrow(
-			ExecutionMetadataValidationError,
+			InvalidExecutionMetadataError,
 		);
 
 		expect(metadata).not.toEqual({
@@ -97,7 +84,7 @@ describe('Execution Metadata functions', () => {
 				test3: 'value3',
 				test4: 'value4',
 			}),
-		).toThrow(ExecutionMetadataValidationError);
+		).toThrow(InvalidExecutionMetadataError);
 
 		expect(metadata).toEqual({
 			test3: 'value3',
@@ -114,7 +101,7 @@ describe('Execution Metadata functions', () => {
 		} as IRunExecutionData;
 
 		expect(() => setWorkflowExecutionMetadata(executionData, 'te$t1$', 1234)).toThrow(
-			ExecutionMetadataValidationError,
+			InvalidExecutionMetadataError,
 		);
 
 		expect(metadata).not.toEqual({
diff --git a/packages/core/test/helpers/constants.ts b/packages/core/test/helpers/constants.ts
new file mode 100644
index 0000000000000..a917fd00d2507
--- /dev/null
+++ b/packages/core/test/helpers/constants.ts
@@ -0,0 +1,4598 @@
+import type {
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeTypeData,
+	WorkflowTestData,
+} from 'n8n-workflow';
+import { If } from 'n8n-nodes-base/nodes/If/If.node';
+import { Merge } from 'n8n-nodes-base/dist/nodes/Merge/Merge.node';
+import { NoOp } from 'n8n-nodes-base/nodes/NoOp/NoOp.node';
+import { Set } from 'n8n-nodes-base/nodes/Set/Set.node';
+import { Start } from 'n8n-nodes-base/nodes/Start/Start.node';
+
+export const predefinedNodesTypes: INodeTypeData = {
+	'n8n-nodes-base.if': {
+		type: new If(),
+		sourcePath: '',
+	},
+	'n8n-nodes-base.merge': {
+		type: new Merge(),
+		sourcePath: '',
+	},
+	'n8n-nodes-base.noOp': {
+		type: new NoOp(),
+		sourcePath: '',
+	},
+	'n8n-nodes-base.set': {
+		type: new Set(),
+		sourcePath: '',
+	},
+	'n8n-nodes-base.start': {
+		type: new Start(),
+		sourcePath: '',
+	},
+	'n8n-nodes-base.versionTest': {
+		sourcePath: '',
+		type: {
+			description: {
+				displayName: 'Version Test',
+				name: 'versionTest',
+				group: ['input'],
+				version: 1,
+				description: 'Tests if versioning works',
+				defaults: {
+					name: 'Version Test',
+					color: '#0000FF',
+				},
+				inputs: ['main'],
+				outputs: ['main'],
+				properties: [
+					{
+						displayName: 'Display V1',
+						name: 'versionTest',
+						type: 'number',
+						displayOptions: {
+							show: {
+								'@version': [1],
+							},
+						},
+						default: 1,
+					},
+					{
+						displayName: 'Display V2',
+						name: 'versionTest',
+						type: 'number',
+						displayOptions: {
+							show: {
+								'@version': [2],
+							},
+						},
+						default: 2,
+					},
+				],
+			},
+			async execute(this: IExecuteFunctions) {
+				const items = this.getInputData();
+				const returnData: INodeExecutionData[] = [];
+
+				for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
+					const newItem: INodeExecutionData = {
+						json: {
+							versionFromParameter: this.getNodeParameter('versionTest', itemIndex),
+							versionFromNode: this.getNode().typeVersion,
+						},
+					};
+
+					returnData.push(newItem);
+				}
+
+				return [returnData];
+			},
+		},
+	},
+};
+
+export const legacyWorkflowExecuteTests: WorkflowTestData[] = [
+	{
+		description:
+			'should run complicated multi node workflow where multiple Merge-Node have missing data and complex dependency structure',
+		input: {
+			workflowData: {
+				nodes: [
+					{
+						parameters: {
+							conditions: {
+								string: [
+									{
+										value1: '={{ $json["test"] }}',
+										value2: 'b',
+									},
+								],
+							},
+						},
+						id: '21593a8c-07c1-435b-93a6-75317ee3bf67',
+						name: 'IF4',
+						type: 'n8n-nodes-base.if',
+						typeVersion: 1,
+						position: [880, 1240],
+					},
+					{
+						parameters: {},
+						id: 'a9af6b9f-011c-4b34-a367-0cfa5ad4c865',
+						name: 'NoOp2',
+						type: 'n8n-nodes-base.noOp',
+						typeVersion: 1,
+						position: [1320, 1060],
+					},
+					{
+						parameters: {},
+						id: '429d1a51-65f0-4701-af76-b73611774952',
+						name: 'Merge3',
+						type: 'n8n-nodes-base.merge',
+						typeVersion: 1,
+						position: [1100, 1060],
+					},
+					{
+						parameters: {
+							conditions: {
+								string: [
+									{
+										value1: '={{ $json["test"] }}',
+										value2: 'b',
+									},
+								],
+							},
+						},
+						id: 'ed08db0f-f747-4f87-af62-051fc53f955c',
+						name: 'IF3',
+						type: 'n8n-nodes-base.if',
+						typeVersion: 1,
+						position: [620, 1100],
+					},
+					{
+						parameters: {},
+						id: 'e80d2aac-cbd4-4e7c-9817-83db52a617d4',
+						name: 'Merge2',
+						type: 'n8n-nodes-base.merge',
+						typeVersion: 1,
+						position: [940, 900],
+					},
+					{
+						parameters: {
+							conditions: {
+								string: [
+									{
+										value1: '={{ $json["test"] }}',
+										value2: 'a',
+									},
+								],
+							},
+						},
+						id: '766dad6b-4326-41b5-a02a-0b3b7d879eb4',
+						name: 'IF2',
+						type: 'n8n-nodes-base.if',
+						typeVersion: 1,
+						position: [620, 900],
+					},
+					{
+						parameters: {},
+						id: '0c0cd5bb-eb44-48fe-b66a-54a3c541ea57',
+						name: 'Merge7',
+						type: 'n8n-nodes-base.merge',
+						typeVersion: 1,
+						position: [2180, 1180],
+					},
+					{
+						parameters: {},
+						id: '863a00e5-7be4-43f3-97da-07cf552d7c0e',
+						name: 'Merge6',
+						type: 'n8n-nodes-base.merge',
+						typeVersion: 1,
+						position: [1840, 1200],
+					},
+					{
+						parameters: {},
+						id: '8855d0ca-1deb-4ad8-958b-2379d3a87160',
+						name: 'Merge5',
+						type: 'n8n-nodes-base.merge',
+						typeVersion: 1,
+						position: [1600, 1040],
+					},
+					{
+						parameters: {},
+						id: 'ea37e388-c77a-4a2f-a527-4585f24371d5',
+						name: 'Merge4',
+						type: 'n8n-nodes-base.merge',
+						typeVersion: 1,
+						position: [1180, 880],
+					},
+					{
+						parameters: {},
+						id: 'e3c814e9-9a92-4e12-96d5-85634fe76dc9',
+						name: 'Merge1',
+						type: 'n8n-nodes-base.merge',
+						typeVersion: 1,
+						position: [940, 720],
+					},
+					{
+						parameters: {
+							conditions: {
+								string: [
+									{
+										value1: '={{ $json["test"] }}',
+										value2: 'b',
+									},
+								],
+							},
+						},
+						id: 'a21a3932-8a3f-464f-8393-309d3233433a',
+						name: 'IF1',
+						type: 'n8n-nodes-base.if',
+						typeVersion: 1,
+						position: [620, 720],
+					},
+					{
+						parameters: {
+							values: {
+								string: [
+									{
+										name: 'test',
+										value: 'a',
+									},
+								],
+							},
+							options: {},
+						},
+						id: '12d33a38-baeb-41de-aea0-d8a7477f5aa6',
+						name: 'Set1',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						position: [400, 720],
+					},
+					{
+						parameters: {},
+						id: '41589b0b-0521-41ae-b0c6-80a016af803e',
+						name: 'Start',
+						type: 'n8n-nodes-base.start',
+						typeVersion: 1,
+						position: [160, 240],
+					},
+				],
+				connections: {
+					IF4: {
+						main: [
+							[
+								{
+									node: 'Merge3',
+									type: 'main',
+									index: 1,
+								},
+							],
+							[
+								{
+									node: 'Merge6',
+									type: 'main',
+									index: 1,
+								},
+							],
+						],
+					},
+					NoOp2: {
+						main: [
+							[
+								{
+									node: 'Merge5',
+									type: 'main',
+									index: 1,
+								},
+							],
+						],
+					},
+					Merge3: {
+						main: [
+							[
+								{
+									node: 'NoOp2',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					IF3: {
+						main: [
+							[
+								{
+									node: 'Merge3',
+									type: 'main',
+									index: 0,
+								},
+							],
+							[
+								{
+									node: 'IF4',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					Merge2: {
+						main: [
+							[
+								{
+									node: 'Merge4',
+									type: 'main',
+									index: 1,
+								},
+							],
+						],
+					},
+					IF2: {
+						main: [
+							[
+								{
+									node: 'Merge2',
+									type: 'main',
+									index: 0,
+								},
+							],
+							[
+								{
+									node: 'Merge2',
+									type: 'main',
+									index: 1,
+								},
+							],
+						],
+					},
+					Merge6: {
+						main: [
+							[
+								{
+									node: 'Merge7',
+									type: 'main',
+									index: 1,
+								},
+							],
+						],
+					},
+					Merge5: {
+						main: [
+							[
+								{
+									node: 'Merge6',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					Merge4: {
+						main: [
+							[
+								{
+									node: 'Merge5',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					Merge1: {
+						main: [
+							[
+								{
+									node: 'Merge4',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					IF1: {
+						main: [
+							[
+								{
+									node: 'Merge1',
+									type: 'main',
+									index: 0,
+								},
+							],
+							[
+								{
+									node: 'Merge1',
+									type: 'main',
+									index: 1,
+								},
+							],
+						],
+					},
+					Set1: {
+						main: [
+							[
+								{
+									node: 'IF1',
+									type: 'main',
+									index: 0,
+								},
+								{
+									node: 'IF2',
+									type: 'main',
+									index: 0,
+								},
+								{
+									node: 'IF3',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					Start: {
+						main: [
+							[
+								{
+									node: 'Set1',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+				},
+			},
+		},
+		output: {
+			nodeExecutionOrder: [
+				'Start',
+				'Set1',
+				'IF1',
+				'IF2',
+				'IF3',
+				'Merge2',
+				'IF4',
+				'Merge1',
+				'Merge4',
+				'Merge3',
+				'NoOp2',
+				'Merge5',
+				'Merge6',
+			],
+			nodeData: {
+				Merge1: [[{}]],
+				Merge2: [
+					[
+						{
+							test: 'a',
+						},
+					],
+				],
+				Merge3: [[{}]],
+				Merge4: [
+					[
+						{},
+						{
+							test: 'a',
+						},
+					],
+				],
+				Merge5: [
+					[
+						{},
+						{
+							test: 'a',
+						},
+						{},
+					],
+				],
+				Merge6: [
+					[
+						{},
+						{
+							test: 'a',
+						},
+						{},
+						{
+							test: 'a',
+						},
+					],
+				],
+			},
+		},
+	},
+	{
+		description: 'should simply execute the next multi-input-node (totally ignoring the runIndex)',
+		input: {
+			workflowData: {
+				nodes: [
+					{
+						parameters: {
+							values: {
+								number: [
+									{
+										name: 'counter',
+										value: '={{ ($input.first().json.counter || 0) + 1 }}',
+									},
+								],
+							},
+							options: {},
+						},
+						id: '18191406-b56b-4388-9d4b-ff5b22fdc02c',
+						name: 'Set',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 2,
+						position: [640, 660],
+					},
+					{
+						parameters: {
+							conditions: {
+								number: [
+									{
+										value1: '={{ $json.counter }}',
+										value2: 3,
+									},
+								],
+							},
+						},
+						id: '0c6f239b-f9f5-4a20-b554-c69e7bc692b1',
+						name: 'IF',
+						type: 'n8n-nodes-base.if',
+						typeVersion: 1,
+						position: [900, 660],
+					},
+					{
+						parameters: {},
+						id: '463194c3-4fcb-4da4-bba0-bc58462ac59a',
+						name: 'Merge',
+						type: 'n8n-nodes-base.merge',
+						typeVersion: 2.1,
+						position: [1180, 760],
+					},
+					{
+						parameters: {
+							values: {
+								number: [
+									{
+										name: 'counter',
+										value: '={{ ($input.first().json.counter || 0) + 1 }}',
+									},
+								],
+							},
+							options: {},
+						},
+						id: '8b5177c1-34ab-468f-8cb1-ff1d253562dc',
+						name: 'Set1',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 2,
+						position: [640, 320],
+					},
+					{
+						parameters: {
+							conditions: {
+								number: [
+									{
+										value1: '={{ $json.counter }}',
+										value2: 3,
+									},
+								],
+							},
+						},
+						id: '455663ab-bc3b-4674-9769-7428c85918c3',
+						name: 'IF1',
+						type: 'n8n-nodes-base.if',
+						typeVersion: 1,
+						position: [860, 320],
+					},
+					{
+						parameters: {},
+						id: 'ffc0d327-5cbc-4cf3-8fb0-77c087b391c1',
+						name: 'Merge1',
+						type: 'n8n-nodes-base.merge',
+						typeVersion: 2.1,
+						position: [1180, 420],
+					},
+					{
+						parameters: {},
+						id: '9a5b13a4-eba1-4a18-a4c6-36bedb07d975',
+						name: 'Merge2',
+						type: 'n8n-nodes-base.merge',
+						typeVersion: 2.1,
+						position: [1500, 600],
+					},
+					{
+						parameters: {},
+						id: '89a78e50-2ec6-48bf-be5f-3838600cd08a',
+						name: 'Start',
+						type: 'n8n-nodes-base.start',
+						typeVersion: 1,
+						position: [-20, 700],
+					},
+				],
+				connections: {
+					Set: {
+						main: [
+							[
+								{
+									node: 'IF',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					IF: {
+						main: [
+							[
+								{
+									node: 'Set',
+									type: 'main',
+									index: 0,
+								},
+								{
+									node: 'Merge1',
+									type: 'main',
+									index: 1,
+								},
+							],
+							[
+								{
+									node: 'Merge',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					Merge: {
+						main: [
+							[
+								{
+									node: 'Merge2',
+									type: 'main',
+									index: 1,
+								},
+							],
+						],
+					},
+					Set1: {
+						main: [
+							[
+								{
+									node: 'IF1',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					IF1: {
+						main: [
+							[
+								{
+									node: 'Set1',
+									type: 'main',
+									index: 0,
+								},
+								{
+									node: 'Merge1',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					Merge1: {
+						main: [
+							[
+								{
+									node: 'Merge2',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					Start: {
+						main: [
+							[
+								{
+									node: 'Merge',
+									type: 'main',
+									index: 1,
+								},
+								{
+									node: 'Set1',
+									type: 'main',
+									index: 0,
+								},
+								{
+									node: 'Set',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+				},
+			},
+		},
+		output: {
+			nodeExecutionOrder: [
+				'Start',
+				'Set1',
+				'Set',
+				'IF1',
+				'IF',
+				'Set1',
+				'Set',
+				'Merge1',
+				'IF1',
+				'IF',
+				'Set1',
+				'Set',
+				'Merge1',
+				'IF1',
+				'IF',
+				'Merge',
+				'Merge2',
+				'Merge2',
+			],
+			nodeData: {
+				Start: [[{}]],
+				Set1: [
+					[
+						{
+							counter: 1,
+						},
+					],
+					[
+						{
+							counter: 2,
+						},
+					],
+					[
+						{
+							counter: 3,
+						},
+					],
+				],
+				Set: [
+					[
+						{
+							counter: 1,
+						},
+					],
+					[
+						{
+							counter: 2,
+						},
+					],
+					[
+						{
+							counter: 3,
+						},
+					],
+				],
+				IF1: [
+					[
+						{
+							counter: 1,
+						},
+					],
+					[
+						{
+							counter: 2,
+						},
+					],
+					[],
+				],
+				IF: [
+					[
+						{
+							counter: 1,
+						},
+					],
+					[
+						{
+							counter: 2,
+						},
+					],
+					[],
+				],
+				Merge1: [
+					[
+						{
+							counter: 1,
+						},
+						{
+							counter: 1,
+						},
+					],
+					[
+						{
+							counter: 2,
+						},
+						{
+							counter: 2,
+						},
+					],
+				],
+				Merge: [
+					[
+						{
+							counter: 3,
+						},
+						{},
+					],
+				],
+				Merge2: [
+					[
+						{
+							counter: 1,
+						},
+						{
+							counter: 1,
+						},
+						{
+							counter: 3,
+						},
+						{},
+					],
+					[
+						{
+							counter: 2,
+						},
+						{
+							counter: 2,
+						},
+					],
+				],
+			},
+		},
+	},
+	{
+		description: 'should run basic two node workflow',
+		input: {
+			// Leave the workflowData in regular JSON to be able to easily
+			// copy it from/in the UI
+			workflowData: {
+				nodes: [
+					{
+						id: 'uuid-1',
+						parameters: {},
+						name: 'Start',
+						type: 'n8n-nodes-base.start',
+						typeVersion: 1,
+						position: [100, 300],
+					},
+					{
+						id: 'uuid-2',
+						parameters: {
+							values: {
+								number: [
+									{
+										name: 'value1',
+										value: 1,
+									},
+								],
+							},
+						},
+						name: 'Set',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						position: [280, 300],
+					},
+				],
+				connections: {
+					Start: {
+						main: [
+							[
+								{
+									node: 'Set',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+				},
+			},
+		},
+		output: {
+			nodeExecutionOrder: ['Start', 'Set'],
+			nodeData: {
+				Set: [
+					[
+						{
+							value1: 1,
+						},
+					],
+				],
+			},
+		},
+	},
+	{
+		description: 'should run node twice when it has two input connections3',
+		input: {
+			// Leave the workflowData in regular JSON to be able to easily
+			// copy it from/in the UI
+			workflowData: {
+				nodes: [
+					{
+						id: 'uuid-1',
+						parameters: {},
+						name: 'Start',
+						type: 'n8n-nodes-base.start',
+						typeVersion: 1,
+						position: [100, 300],
+					},
+					{
+						id: 'uuid-2',
+						parameters: {
+							values: {
+								number: [
+									{
+										name: 'value1',
+										value: 1,
+									},
+								],
+							},
+						},
+						name: 'Set1',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						position: [300, 250],
+					},
+					{
+						id: 'uuid-3',
+						parameters: {
+							values: {
+								number: [
+									{
+										name: 'value2',
+										value: 2,
+									},
+								],
+							},
+						},
+						name: 'Set2',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						position: [500, 400],
+					},
+				],
+				connections: {
+					Start: {
+						main: [
+							[
+								{
+									node: 'Set1',
+									type: 'main',
+									index: 0,
+								},
+								{
+									node: 'Set2',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					Set1: {
+						main: [
+							[
+								{
+									node: 'Set2',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+				},
+			},
+		},
+		output: {
+			nodeExecutionOrder: ['Start', 'Set1', 'Set2', 'Set2'],
+			nodeData: {
+				Set1: [
+					[
+						{
+							value1: 1,
+						},
+					],
+				],
+				Set2: [
+					[
+						{
+							value2: 2,
+						},
+					],
+					[
+						{
+							value1: 1,
+							value2: 2,
+						},
+					],
+				],
+			},
+		},
+	},
+	{
+		description: 'should run complicated multi node workflow',
+		input: {
+			// Leave the workflowData in regular JSON to be able to easily
+			// copy it from/in the UI
+			workflowData: {
+				nodes: [
+					{
+						id: 'uuid-1',
+						parameters: {
+							mode: 'passThrough',
+						},
+						name: 'Merge4',
+						type: 'n8n-nodes-base.merge',
+						typeVersion: 1,
+						position: [1150, 500],
+					},
+					{
+						id: 'uuid-2',
+						parameters: {
+							values: {
+								number: [
+									{
+										name: 'value2',
+										value: 2,
+									},
+								],
+							},
+						},
+						name: 'Set2',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						position: [290, 400],
+					},
+					{
+						id: 'uuid-3',
+						parameters: {
+							values: {
+								number: [
+									{
+										name: 'value4',
+										value: 4,
+									},
+								],
+							},
+						},
+						name: 'Set4',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						position: [850, 200],
+					},
+					{
+						id: 'uuid-4',
+						parameters: {
+							values: {
+								number: [
+									{
+										name: 'value3',
+										value: 3,
+									},
+								],
+							},
+						},
+						name: 'Set3',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						position: [650, 200],
+					},
+					{
+						id: 'uuid-5',
+						parameters: {
+							mode: 'passThrough',
+						},
+						name: 'Merge4',
+						type: 'n8n-nodes-base.merge',
+						typeVersion: 1,
+						position: [1150, 500],
+					},
+					{
+						id: 'uuid-6',
+						parameters: {},
+						name: 'Merge3',
+						type: 'n8n-nodes-base.merge',
+						typeVersion: 1,
+						position: [1000, 400],
+					},
+					{
+						id: 'uuid-7',
+						parameters: {
+							mode: 'passThrough',
+							output: 'input2',
+						},
+						name: 'Merge2',
+						type: 'n8n-nodes-base.merge',
+						typeVersion: 1,
+						position: [700, 400],
+					},
+					{
+						id: 'uuid-8',
+						parameters: {},
+						name: 'Merge1',
+						type: 'n8n-nodes-base.merge',
+						typeVersion: 1,
+						position: [500, 300],
+					},
+					{
+						id: 'uuid-9',
+						parameters: {
+							values: {
+								number: [
+									{
+										name: 'value1',
+										value: 1,
+									},
+								],
+							},
+						},
+						name: 'Set1',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						position: [300, 200],
+					},
+					{
+						id: 'uuid-10',
+						parameters: {},
+						name: 'Start',
+						type: 'n8n-nodes-base.start',
+						typeVersion: 1,
+						position: [100, 300],
+					},
+				],
+				connections: {
+					Set2: {
+						main: [
+							[
+								{
+									node: 'Merge1',
+									type: 'main',
+									index: 1,
+								},
+								{
+									node: 'Merge2',
+									type: 'main',
+									index: 1,
+								},
+							],
+						],
+					},
+					Set4: {
+						main: [
+							[
+								{
+									node: 'Merge3',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					Set3: {
+						main: [
+							[
+								{
+									node: 'Set4',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					Merge3: {
+						main: [
+							[
+								{
+									node: 'Merge4',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					Merge2: {
+						main: [
+							[
+								{
+									node: 'Merge3',
+									type: 'main',
+									index: 1,
+								},
+							],
+						],
+					},
+					Merge1: {
+						main: [
+							[
+								{
+									node: 'Merge2',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					Set1: {
+						main: [
+							[
+								{
+									node: 'Merge1',
+									type: 'main',
+									index: 0,
+								},
+								{
+									node: 'Set3',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					Start: {
+						main: [
+							[
+								{
+									node: 'Set1',
+									type: 'main',
+									index: 0,
+								},
+								{
+									node: 'Set2',
+									type: 'main',
+									index: 0,
+								},
+								{
+									node: 'Merge4',
+									type: 'main',
+									index: 1,
+								},
+							],
+						],
+					},
+				},
+			},
+		},
+		output: {
+			nodeExecutionOrder: [
+				'Start',
+				'Set1',
+				'Set2',
+				'Set3',
+				'Merge1',
+				'Set4',
+				'Merge2',
+				'Merge3',
+				'Merge4',
+			],
+			nodeData: {
+				Set1: [
+					[
+						{
+							value1: 1,
+						},
+					],
+				],
+				Set2: [
+					[
+						{
+							value2: 2,
+						},
+					],
+				],
+				Set3: [
+					[
+						{
+							value1: 1,
+							value3: 3,
+						},
+					],
+				],
+				Set4: [
+					[
+						{
+							value1: 1,
+							value3: 3,
+							value4: 4,
+						},
+					],
+				],
+				Merge1: [
+					[
+						{
+							value1: 1,
+						},
+						{
+							value2: 2,
+						},
+					],
+				],
+				Merge2: [
+					[
+						{
+							value2: 2,
+						},
+					],
+				],
+				Merge3: [
+					[
+						{
+							value1: 1,
+							value3: 3,
+							value4: 4,
+						},
+						{
+							value2: 2,
+						},
+					],
+				],
+				Merge4: [
+					[
+						{
+							value1: 1,
+							value3: 3,
+							value4: 4,
+						},
+						{
+							value2: 2,
+						},
+					],
+				],
+			},
+		},
+	},
+	{
+		description: 'should run workflow also if node has multiple input connections and one is empty',
+		input: {
+			// Leave the workflowData in regular JSON to be able to easily
+			// copy it from/in the UI
+			workflowData: {
+				nodes: [
+					{
+						parameters: {},
+						name: 'Start',
+						type: 'n8n-nodes-base.start',
+						typeVersion: 1,
+						id: 'uuid-1',
+						position: [250, 450],
+					},
+					{
+						parameters: {
+							conditions: {
+								boolean: [],
+								number: [
+									{
+										value1: '={{Object.keys($json).length}}',
+										operation: 'notEqual',
+									},
+								],
+							},
+						},
+						name: 'IF',
+						type: 'n8n-nodes-base.if',
+						typeVersion: 1,
+						id: 'uuid-2',
+						position: [650, 350],
+					},
+					{
+						parameters: {},
+						name: 'Merge1',
+						type: 'n8n-nodes-base.merge',
+						typeVersion: 1,
+						id: 'uuid-3',
+						position: [1150, 450],
+					},
+					{
+						parameters: {
+							values: {
+								string: [
+									{
+										name: 'test1',
+										value: 'a',
+									},
+								],
+							},
+							options: {},
+						},
+						name: 'Set1',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						id: 'uuid-4',
+						position: [450, 450],
+					},
+					{
+						parameters: {
+							values: {
+								string: [
+									{
+										name: 'test2',
+										value: 'b',
+									},
+								],
+							},
+							options: {},
+						},
+						name: 'Set2',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						id: 'uuid-1',
+						position: [800, 250],
+					},
+				],
+				connections: {
+					Start: {
+						main: [
+							[
+								{
+									node: 'Set1',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					IF: {
+						main: [
+							[
+								{
+									node: 'Set2',
+									type: 'main',
+									index: 0,
+								},
+							],
+							[
+								{
+									node: 'Merge1',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					Set1: {
+						main: [
+							[
+								{
+									node: 'IF',
+									type: 'main',
+									index: 0,
+								},
+								{
+									node: 'Merge1',
+									type: 'main',
+									index: 1,
+								},
+							],
+						],
+					},
+					Set2: {
+						main: [
+							[
+								{
+									node: 'Merge1',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+				},
+			},
+		},
+		output: {
+			nodeExecutionOrder: ['Start', 'Set1', 'IF', 'Set2', 'Merge1'],
+			nodeData: {
+				Merge1: [
+					[
+						{
+							test1: 'a',
+							test2: 'b',
+						},
+						{
+							test1: 'a',
+						},
+					],
+				],
+			},
+		},
+	},
+	{
+		description: 'should use empty data if second input does not have any data',
+		input: {
+			// Leave the workflowData in regular JSON to be able to easily
+			// copy it from/in the UI
+			workflowData: {
+				nodes: [
+					{
+						id: 'uuid-1',
+						parameters: {},
+						name: 'Start',
+						type: 'n8n-nodes-base.start',
+						typeVersion: 1,
+						position: [250, 300],
+					},
+					{
+						id: 'uuid-2',
+						parameters: {},
+						name: 'Merge',
+						type: 'n8n-nodes-base.merge',
+						typeVersion: 1,
+						position: [800, 450],
+					},
+					{
+						id: 'uuid-3',
+						parameters: {},
+						name: 'Merge1',
+						type: 'n8n-nodes-base.merge',
+						typeVersion: 1,
+						position: [1000, 300],
+					},
+					{
+						id: 'uuid-4',
+						parameters: {
+							conditions: {
+								boolean: [
+									{
+										value2: true,
+									},
+								],
+								string: [
+									{
+										value1: '={{$json["key"]}}',
+										value2: 'a',
+									},
+								],
+							},
+							combineOperation: 'any',
+						},
+						name: 'IF',
+						type: 'n8n-nodes-base.if',
+						typeVersion: 1,
+						position: [600, 600],
+						alwaysOutputData: false,
+					},
+					{
+						id: 'uuid-5',
+						parameters: {
+							values: {
+								number: [
+									{
+										name: 'number0',
+									},
+								],
+								string: [
+									{
+										name: 'key',
+										value: 'a',
+									},
+								],
+							},
+							options: {},
+						},
+						name: 'Set0',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						position: [450, 300],
+					},
+					{
+						id: 'uuid-6',
+						parameters: {
+							values: {
+								number: [
+									{
+										name: 'number1',
+										value: 1,
+									},
+								],
+								string: [
+									{
+										name: 'key',
+										value: 'b',
+									},
+								],
+							},
+							options: {},
+						},
+						name: 'Set1',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						position: [450, 450],
+					},
+					{
+						id: 'uuid-7',
+						parameters: {
+							values: {
+								number: [
+									{
+										name: 'number2',
+										value: 2,
+									},
+								],
+								string: [
+									{
+										name: 'key',
+										value: 'c',
+									},
+								],
+							},
+							options: {},
+						},
+						name: 'Set2',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						position: [450, 600],
+					},
+				],
+				connections: {
+					Start: {
+						main: [
+							[
+								{
+									node: 'Set0',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					Merge: {
+						main: [
+							[
+								{
+									node: 'Merge1',
+									type: 'main',
+									index: 1,
+								},
+							],
+						],
+					},
+					IF: {
+						main: [
+							[
+								{
+									node: 'Merge',
+									type: 'main',
+									index: 1,
+								},
+							],
+						],
+					},
+					Set0: {
+						main: [
+							[
+								{
+									node: 'Merge1',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					Set1: {
+						main: [
+							[
+								{
+									node: 'Merge',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					Set2: {
+						main: [
+							[
+								{
+									node: 'IF',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+				},
+			},
+		},
+		output: {
+			nodeExecutionOrder: ['Start', 'Set0', 'Set2', 'IF', 'Set1', 'Merge', 'Merge1'],
+			nodeData: {
+				Merge: [
+					[
+						{
+							number1: 1,
+							key: 'b',
+						},
+					],
+				],
+				Merge1: [
+					[
+						{
+							number0: 0,
+							key: 'a',
+						},
+						{
+							number1: 1,
+							key: 'b',
+						},
+					],
+				],
+			},
+		},
+	},
+	{
+		description: 'should use empty data if input of sibling does not receive any data from parent',
+		input: {
+			// Leave the workflowData in regular JSON to be able to easily
+			// copy it from/in the UI
+			workflowData: {
+				nodes: [
+					{
+						id: 'uuid-1',
+						parameters: {},
+						name: 'Start',
+						type: 'n8n-nodes-base.start',
+						typeVersion: 1,
+						position: [250, 300],
+					},
+					{
+						id: 'uuid-2',
+						parameters: {
+							conditions: {
+								number: [
+									{
+										value1: '={{$json["value1"]}}',
+										operation: 'equal',
+										value2: 1,
+									},
+								],
+							},
+						},
+						name: 'IF',
+						type: 'n8n-nodes-base.if',
+						typeVersion: 1,
+						position: [650, 300],
+					},
+					{
+						id: 'uuid-3',
+						parameters: {
+							values: {
+								string: [],
+								number: [
+									{
+										name: 'value2',
+										value: 2,
+									},
+								],
+							},
+							options: {},
+						},
+						name: 'Set2',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						position: [850, 450],
+					},
+					{
+						id: 'uuid-4',
+						parameters: {
+							values: {
+								number: [
+									{
+										name: 'value1',
+										value: 1,
+									},
+								],
+							},
+							options: {},
+						},
+						name: 'Set1',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						position: [450, 300],
+					},
+					{
+						id: 'uuid-5',
+						parameters: {},
+						name: 'Merge',
+						type: 'n8n-nodes-base.merge',
+						typeVersion: 1,
+						position: [1050, 300],
+					},
+				],
+				connections: {
+					Start: {
+						main: [
+							[
+								{
+									node: 'Set1',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					IF: {
+						main: [
+							[
+								{
+									node: 'Merge',
+									type: 'main',
+									index: 0,
+								},
+							],
+							[
+								{
+									node: 'Set2',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					Set2: {
+						main: [
+							[
+								{
+									node: 'Merge',
+									type: 'main',
+									index: 1,
+								},
+							],
+						],
+					},
+					Set1: {
+						main: [
+							[
+								{
+									node: 'IF',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+				},
+			},
+		},
+		output: {
+			nodeExecutionOrder: ['Start', 'Set1', 'IF', 'Set2', 'Merge'],
+			nodeData: {
+				Merge: [
+					[
+						{
+							value1: 1,
+						},
+						{
+							value2: 2,
+						},
+					],
+				],
+			},
+		},
+	},
+	{
+		description: 'should not use empty data in sibling if parent did not send any data',
+		input: {
+			// Leave the workflowData in regular JSON to be able to easily
+			// copy it from/in the UI
+			workflowData: {
+				nodes: [
+					{
+						id: 'uuid-1',
+						parameters: {},
+						name: 'Start',
+						type: 'n8n-nodes-base.start',
+						typeVersion: 1,
+						position: [250, 300],
+					},
+					{
+						id: 'uuid-2',
+						parameters: {
+							values: {
+								number: [
+									{
+										name: 'value1',
+									},
+								],
+							},
+							options: {},
+						},
+						name: 'Set',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						position: [450, 300],
+					},
+					{
+						id: 'uuid-3',
+						parameters: {},
+						name: 'Merge',
+						type: 'n8n-nodes-base.merge',
+						typeVersion: 1,
+						position: [1050, 250],
+					},
+					{
+						id: 'uuid-4',
+						parameters: {
+							conditions: {
+								number: [
+									{
+										value1: '={{$json["value1"]}}',
+										operation: 'equal',
+										value2: 1,
+									},
+								],
+							},
+						},
+						name: 'IF',
+						type: 'n8n-nodes-base.if',
+						typeVersion: 1,
+						position: [650, 300],
+					},
+					{
+						id: 'uuid-5',
+						parameters: {},
+						name: 'NoOpTrue',
+						type: 'n8n-nodes-base.noOp',
+						typeVersion: 1,
+						position: [850, 150],
+					},
+					{
+						id: 'uuid-6',
+						parameters: {},
+						name: 'NoOpFalse',
+						type: 'n8n-nodes-base.noOp',
+						typeVersion: 1,
+						position: [850, 400],
+					},
+				],
+				connections: {
+					Start: {
+						main: [
+							[
+								{
+									node: 'Set',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					Set: {
+						main: [
+							[
+								{
+									node: 'IF',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					IF: {
+						main: [
+							[
+								{
+									node: 'NoOpTrue',
+									type: 'main',
+									index: 0,
+								},
+								{
+									node: 'Merge',
+									type: 'main',
+									index: 1,
+								},
+							],
+							[
+								{
+									node: 'NoOpFalse',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					NoOpTrue: {
+						main: [
+							[
+								{
+									node: 'Merge',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+				},
+			},
+		},
+		output: {
+			nodeExecutionOrder: ['Start', 'Set', 'IF', 'NoOpFalse'],
+			nodeData: {
+				IF: [[]],
+				NoOpFalse: [
+					[
+						{
+							value1: 0,
+						},
+					],
+				],
+			},
+		},
+	},
+	{
+		description:
+			'should display the correct parameters and so correct data when simplified node-versioning is used',
+		input: {
+			workflowData: {
+				nodes: [
+					{
+						id: 'uuid-1',
+						parameters: {},
+						name: 'Start',
+						type: 'n8n-nodes-base.start',
+						typeVersion: 1,
+						position: [240, 300],
+					},
+					{
+						id: 'uuid-2',
+						parameters: {},
+						name: 'VersionTest1a',
+						type: 'n8n-nodes-base.versionTest',
+						typeVersion: 1,
+						position: [460, 300],
+					},
+					{
+						id: 'uuid-3',
+						parameters: {
+							versionTest: 11,
+						},
+						name: 'VersionTest1b',
+						type: 'n8n-nodes-base.versionTest',
+						typeVersion: 1,
+						position: [680, 300],
+					},
+					{
+						id: 'uuid-4',
+						parameters: {},
+						name: 'VersionTest2a',
+						type: 'n8n-nodes-base.versionTest',
+						typeVersion: 2,
+						position: [880, 300],
+					},
+					{
+						id: 'uuid-5',
+						parameters: {
+							versionTest: 22,
+						},
+						name: 'VersionTest2b',
+						type: 'n8n-nodes-base.versionTest',
+						typeVersion: 2,
+						position: [1080, 300],
+					},
+				],
+				connections: {
+					Start: {
+						main: [
+							[
+								{
+									node: 'VersionTest1a',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					VersionTest1a: {
+						main: [
+							[
+								{
+									node: 'VersionTest1b',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					VersionTest1b: {
+						main: [
+							[
+								{
+									node: 'VersionTest2a',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					VersionTest2a: {
+						main: [
+							[
+								{
+									node: 'VersionTest2b',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+				},
+			},
+		},
+		output: {
+			nodeExecutionOrder: [
+				'Start',
+				'VersionTest1a',
+				'VersionTest1b',
+				'VersionTest2a',
+				'VersionTest2b',
+			],
+			nodeData: {
+				VersionTest1a: [
+					[
+						{
+							versionFromNode: 1,
+							versionFromParameter: 1,
+						},
+					],
+				],
+				VersionTest1b: [
+					[
+						{
+							versionFromNode: 1,
+							versionFromParameter: 11,
+						},
+					],
+				],
+				VersionTest2a: [
+					[
+						{
+							versionFromNode: 2,
+							versionFromParameter: 2,
+						},
+					],
+				],
+				VersionTest2b: [
+					[
+						{
+							versionFromNode: 2,
+							versionFromParameter: 22,
+						},
+					],
+				],
+			},
+		},
+	},
+	{
+		description: 'should execute nodes in the correct order, breath-first & order of connection',
+		input: {
+			workflowData: {
+				nodes: [
+					{
+						parameters: {},
+						id: '3e4ab8bb-2e22-45d9-9287-0265f2ee9c4b',
+						name: 'Start',
+						type: 'n8n-nodes-base.start',
+						typeVersion: 1,
+						position: [300, 620],
+					},
+					{
+						parameters: {
+							options: {},
+						},
+						id: '444650ce-464a-4630-9e24-109056105167',
+						name: 'Wait',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						position: [740, 420],
+						webhookId: '1f4118f8-591a-48fe-a68d-6fec3c99b7a8',
+					},
+					{
+						parameters: {
+							values: {
+								number: [
+									{
+										name: 'wait',
+									},
+								],
+							},
+							options: {},
+						},
+						id: '7a74a097-6563-4f1e-a327-97e5a43b8acb',
+						name: 'Set',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 2,
+						position: [480, 620],
+					},
+					{
+						parameters: {
+							options: {},
+						},
+						id: '9039eebf-6c11-4ce0-b8ad-0812774019d4',
+						name: 'Wait1',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						position: [740, 800],
+						webhookId: '35ceb27a-3fb1-47a9-8678-2df16dcecbcb',
+					},
+					{
+						parameters: {
+							options: {},
+						},
+						id: '7f130b16-8fac-4d93-a0ef-56dfe575f952',
+						name: 'Wait2',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						position: [940, 420],
+						webhookId: 'cc8e2fd2-afc8-4a17-afda-fda943f4bd83',
+					},
+					{
+						parameters: {
+							options: {},
+						},
+						id: '063e2097-b27a-4775-923c-5b839c434640',
+						name: 'Wait3',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						position: [1300, 420],
+						webhookId: '35400ecf-3e53-4b2d-9fd7-2663bbfd830f',
+					},
+					{
+						parameters: {
+							options: {},
+						},
+						id: 'ec908b56-8829-4566-a0b7-ced4bd16c550',
+						name: 'Wait4',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						position: [940, 800],
+						webhookId: 'cc8e2fd2-afc8-4a17-afda-fda943f4bd83',
+					},
+					{
+						parameters: {
+							options: {},
+						},
+						id: 'a7d279bd-7241-4744-8ef6-41468131dfa7',
+						name: 'Wait5',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						position: [1140, 800],
+						webhookId: '35400ecf-3e53-4b2d-9fd7-2663bbfd830f',
+					},
+					{
+						parameters: {
+							options: {},
+						},
+						id: 'f620aff1-7d9c-453f-a2c1-6e3b9a1664d3',
+						name: 'Wait6',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						position: [760, 200],
+						webhookId: '35400ecf-3e53-4b2d-9fd7-2663bbfd830f',
+					},
+					{
+						parameters: {
+							options: {},
+						},
+						id: '1d9bac9b-8197-4ad9-9189-f947068f1a46',
+						name: 'Wait7',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						position: [1060, 200],
+						webhookId: '35400ecf-3e53-4b2d-9fd7-2663bbfd830f',
+					},
+					{
+						parameters: {
+							options: {},
+						},
+						id: '9ad0cc8c-4922-440e-913c-39c8570ddcbc',
+						name: 'Wait8',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						position: [740, 600],
+						webhookId: '35400ecf-3e53-4b2d-9fd7-2663bbfd830f',
+					},
+					{
+						parameters: {
+							options: {},
+						},
+						id: 'af0ca700-b6ed-40c1-8c62-bbadb6fd81f7',
+						name: 'Wait9',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						position: [1040, 580],
+						webhookId: '35400ecf-3e53-4b2d-9fd7-2663bbfd830f',
+					},
+					{
+						parameters: {
+							options: {},
+						},
+						id: 'f2553f9f-670f-4b54-8b89-84dd5a27a244',
+						name: 'Wait10',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						position: [1660, 340],
+						webhookId: '35400ecf-3e53-4b2d-9fd7-2663bbfd830f',
+					},
+					{
+						parameters: {
+							options: {},
+						},
+						id: '0f4475cb-87db-4ed7-a7a0-8a67043c320b',
+						name: 'Wait11',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						position: [1660, 540],
+						webhookId: '35400ecf-3e53-4b2d-9fd7-2663bbfd830f',
+					},
+					{
+						parameters: {
+							options: {},
+						},
+						id: '815f7b2a-1789-48a3-be61-931e643e6d89',
+						name: 'Wait12',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						position: [1920, 340],
+						webhookId: '35400ecf-3e53-4b2d-9fd7-2663bbfd830f',
+					},
+					{
+						parameters: {
+							options: {},
+						},
+						id: 'be1e11af-b8e4-40cb-af36-03613e384b5e',
+						name: 'Wait13',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						position: [1240, 580],
+						webhookId: '35400ecf-3e53-4b2d-9fd7-2663bbfd830f',
+					},
+					{
+						parameters: {},
+						id: 'cf72f99c-612f-4b76-bc8e-d77612e4faa9',
+						name: 'Merge',
+						type: 'n8n-nodes-base.merge',
+						typeVersion: 2,
+						position: [1300, 220],
+					},
+					{
+						parameters: {
+							options: {},
+						},
+						id: 'bfe1dfca-a060-4c37-94d0-058739e7cfca',
+						name: 'Wait14',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						position: [1520, 220],
+						webhookId: '35400ecf-3e53-4b2d-9fd7-2663bbfd830f',
+					},
+					{
+						parameters: {
+							conditions: {
+								number: [
+									{
+										value1: '={{ $itemIndex }}',
+										operation: 'equal',
+										value2: 1,
+									},
+								],
+							},
+						},
+						id: 'bf7d7e54-db5f-4f20-bf3e-b07224096872',
+						name: 'IF',
+						type: 'n8n-nodes-base.if',
+						typeVersion: 1,
+						position: [1780, -220],
+					},
+					{
+						parameters: {
+							options: {},
+						},
+						id: 'd340f2ad-3a6a-4412-bd15-9a7dde1fcb8c',
+						name: 'Wait15',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						position: [2020, -300],
+						webhookId: '35400ecf-3e53-4b2d-9fd7-2663bbfd830f',
+					},
+					{
+						parameters: {
+							options: {},
+						},
+						id: '913a3c9c-1704-433d-9790-21ad0922e5e1',
+						name: 'Wait16',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						position: [2020, -140],
+						webhookId: '35400ecf-3e53-4b2d-9fd7-2663bbfd830f',
+					},
+					{
+						parameters: {
+							conditions: {
+								number: [
+									{
+										value1: '={{ $itemIndex }}',
+										operation: 'equal',
+										value2: 1,
+									},
+								],
+							},
+						},
+						id: 'df1fba53-92af-4351-b471-114dda12bef9',
+						name: 'IF1',
+						type: 'n8n-nodes-base.if',
+						typeVersion: 1,
+						position: [1780, 120],
+					},
+					{
+						parameters: {
+							options: {},
+						},
+						id: '8b3c7e63-8cd8-469d-b6d4-bf5c1953af11',
+						name: 'Wait17',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						position: [2020, 200],
+						webhookId: '35400ecf-3e53-4b2d-9fd7-2663bbfd830f',
+					},
+					{
+						parameters: {
+							options: {},
+						},
+						id: 'e74c4b7c-fc76-4e48-9a0e-3195b19ce1a0',
+						name: 'Wait18',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						position: [2020, 40],
+						webhookId: '35400ecf-3e53-4b2d-9fd7-2663bbfd830f',
+					},
+				],
+				connections: {
+					Start: {
+						main: [
+							[
+								{
+									node: 'Set',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					Wait: {
+						main: [
+							[
+								{
+									node: 'Wait2',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					Set: {
+						main: [
+							[
+								{
+									node: 'Wait',
+									type: 'main',
+									index: 0,
+								},
+								{
+									node: 'Wait1',
+									type: 'main',
+									index: 0,
+								},
+								{
+									node: 'Wait6',
+									type: 'main',
+									index: 0,
+								},
+								{
+									node: 'Wait7',
+									type: 'main',
+									index: 0,
+								},
+								{
+									node: 'Wait8',
+									type: 'main',
+									index: 0,
+								},
+								{
+									node: 'Wait9',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					Wait1: {
+						main: [
+							[
+								{
+									node: 'Wait4',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					Wait2: {
+						main: [
+							[
+								{
+									node: 'Wait3',
+									type: 'main',
+									index: 0,
+								},
+								{
+									node: 'Merge',
+									type: 'main',
+									index: 1,
+								},
+							],
+						],
+					},
+					Wait3: {
+						main: [
+							[
+								{
+									node: 'Wait10',
+									type: 'main',
+									index: 0,
+								},
+								{
+									node: 'Wait11',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					Wait4: {
+						main: [
+							[
+								{
+									node: 'Wait5',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					Wait7: {
+						main: [
+							[
+								{
+									node: 'Merge',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					Wait9: {
+						main: [
+							[
+								{
+									node: 'Wait13',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					Wait10: {
+						main: [
+							[
+								{
+									node: 'Wait12',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					Merge: {
+						main: [
+							[
+								{
+									node: 'Wait14',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					Wait14: {
+						main: [
+							[
+								{
+									node: 'IF',
+									type: 'main',
+									index: 0,
+								},
+								{
+									node: 'IF1',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					IF: {
+						main: [
+							[
+								{
+									node: 'Wait15',
+									type: 'main',
+									index: 0,
+								},
+							],
+							[
+								{
+									node: 'Wait16',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					IF1: {
+						main: [
+							[
+								{
+									node: 'Wait17',
+									type: 'main',
+									index: 0,
+								},
+							],
+							[
+								{
+									node: 'Wait18',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+				},
+			},
+		},
+		output: {
+			nodeExecutionOrder: [
+				'Start',
+				'Set',
+				'Wait',
+				'Wait1',
+				'Wait6',
+				'Wait7',
+				'Wait8',
+				'Wait9',
+				'Wait2',
+				'Wait4',
+				'Wait13',
+				'Wait3',
+				'Merge',
+				'Wait5',
+				'Wait10',
+				'Wait11',
+				'Wait14',
+				'Wait12',
+				'IF',
+				'IF1',
+				'Wait15',
+				'Wait16',
+				'Wait17',
+				'Wait18',
+			],
+			nodeData: {},
+		},
+	},
+];
+
+export const v1WorkflowExecuteTests: WorkflowTestData[] = [
+	{
+		description: 'should run node twice when it has two input connections',
+		input: {
+			// Leave the workflowData in regular JSON to be able to easily
+			// copy it from/in the UI
+			workflowData: {
+				nodes: [
+					{
+						id: 'uuid-1',
+						parameters: {},
+						name: 'Start',
+						type: 'n8n-nodes-base.start',
+						typeVersion: 1,
+						position: [100, 300],
+					},
+					{
+						id: 'uuid-2',
+						parameters: {
+							values: {
+								number: [
+									{
+										name: 'value1',
+										value: 1,
+									},
+								],
+							},
+						},
+						name: 'Set1',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						position: [300, 250],
+					},
+					{
+						id: 'uuid-3',
+						parameters: {
+							values: {
+								number: [
+									{
+										name: 'value2',
+										value: 2,
+									},
+								],
+							},
+						},
+						name: 'Set2',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						position: [500, 400],
+					},
+				],
+				connections: {
+					Start: {
+						main: [
+							[
+								{
+									node: 'Set1',
+									type: 'main',
+									index: 0,
+								},
+								{
+									node: 'Set2',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					Set1: {
+						main: [
+							[
+								{
+									node: 'Set2',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+				},
+			},
+		},
+		output: {
+			nodeExecutionOrder: ['Start', 'Set1', 'Set2', 'Set2'],
+			nodeData: {
+				Set1: [
+					[
+						{
+							value1: 1,
+						},
+					],
+				],
+				Set2: [
+					[
+						{
+							value1: 1,
+							value2: 2,
+						},
+					],
+					[
+						{
+							value2: 2,
+						},
+					],
+				],
+			},
+		},
+	},
+	{
+		description: 'should run complicated multi node workflow',
+		input: {
+			// Leave the workflowData in regular JSON to be able to easily
+			// copy it from/in the UI
+			workflowData: {
+				nodes: [
+					{
+						id: 'uuid-1',
+						parameters: {
+							mode: 'passThrough',
+						},
+						name: 'Merge4',
+						type: 'n8n-nodes-base.merge',
+						typeVersion: 1,
+						position: [1150, 500],
+					},
+					{
+						id: 'uuid-2',
+						parameters: {
+							values: {
+								number: [
+									{
+										name: 'value2',
+										value: 2,
+									},
+								],
+							},
+						},
+						name: 'Set2',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						position: [290, 400],
+					},
+					{
+						id: 'uuid-3',
+						parameters: {
+							values: {
+								number: [
+									{
+										name: 'value4',
+										value: 4,
+									},
+								],
+							},
+						},
+						name: 'Set4',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						position: [850, 200],
+					},
+					{
+						id: 'uuid-4',
+						parameters: {
+							values: {
+								number: [
+									{
+										name: 'value3',
+										value: 3,
+									},
+								],
+							},
+						},
+						name: 'Set3',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						position: [650, 200],
+					},
+					{
+						id: 'uuid-5',
+						parameters: {
+							mode: 'passThrough',
+						},
+						name: 'Merge4',
+						type: 'n8n-nodes-base.merge',
+						typeVersion: 1,
+						position: [1150, 500],
+					},
+					{
+						id: 'uuid-6',
+						parameters: {},
+						name: 'Merge3',
+						type: 'n8n-nodes-base.merge',
+						typeVersion: 1,
+						position: [1000, 400],
+					},
+					{
+						id: 'uuid-7',
+						parameters: {
+							mode: 'passThrough',
+							output: 'input2',
+						},
+						name: 'Merge2',
+						type: 'n8n-nodes-base.merge',
+						typeVersion: 1,
+						position: [700, 400],
+					},
+					{
+						id: 'uuid-8',
+						parameters: {},
+						name: 'Merge1',
+						type: 'n8n-nodes-base.merge',
+						typeVersion: 1,
+						position: [500, 300],
+					},
+					{
+						id: 'uuid-9',
+						parameters: {
+							values: {
+								number: [
+									{
+										name: 'value1',
+										value: 1,
+									},
+								],
+							},
+						},
+						name: 'Set1',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						position: [300, 200],
+					},
+					{
+						id: 'uuid-10',
+						parameters: {},
+						name: 'Start',
+						type: 'n8n-nodes-base.start',
+						typeVersion: 1,
+						position: [100, 300],
+					},
+				],
+				connections: {
+					Set2: {
+						main: [
+							[
+								{
+									node: 'Merge1',
+									type: 'main',
+									index: 1,
+								},
+								{
+									node: 'Merge2',
+									type: 'main',
+									index: 1,
+								},
+							],
+						],
+					},
+					Set4: {
+						main: [
+							[
+								{
+									node: 'Merge3',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					Set3: {
+						main: [
+							[
+								{
+									node: 'Set4',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					Merge3: {
+						main: [
+							[
+								{
+									node: 'Merge4',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					Merge2: {
+						main: [
+							[
+								{
+									node: 'Merge3',
+									type: 'main',
+									index: 1,
+								},
+							],
+						],
+					},
+					Merge1: {
+						main: [
+							[
+								{
+									node: 'Merge2',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					Set1: {
+						main: [
+							[
+								{
+									node: 'Merge1',
+									type: 'main',
+									index: 0,
+								},
+								{
+									node: 'Set3',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					Start: {
+						main: [
+							[
+								{
+									node: 'Set1',
+									type: 'main',
+									index: 0,
+								},
+								{
+									node: 'Set2',
+									type: 'main',
+									index: 0,
+								},
+								{
+									node: 'Merge4',
+									type: 'main',
+									index: 1,
+								},
+							],
+						],
+					},
+				},
+			},
+		},
+		output: {
+			nodeExecutionOrder: [
+				'Start',
+				'Set1',
+				'Set3',
+				'Set4',
+				'Set2',
+				'Merge1',
+				'Merge2',
+				'Merge3',
+				'Merge4',
+			],
+			nodeData: {
+				Set1: [
+					[
+						{
+							value1: 1,
+						},
+					],
+				],
+				Set2: [
+					[
+						{
+							value2: 2,
+						},
+					],
+				],
+				Set3: [
+					[
+						{
+							value1: 1,
+							value3: 3,
+						},
+					],
+				],
+				Set4: [
+					[
+						{
+							value1: 1,
+							value3: 3,
+							value4: 4,
+						},
+					],
+				],
+				Merge1: [
+					[
+						{
+							value1: 1,
+						},
+						{
+							value2: 2,
+						},
+					],
+				],
+				Merge2: [
+					[
+						{
+							value2: 2,
+						},
+					],
+				],
+				Merge3: [
+					[
+						{
+							value1: 1,
+							value3: 3,
+							value4: 4,
+						},
+						{
+							value2: 2,
+						},
+					],
+				],
+				Merge4: [
+					[
+						{
+							value1: 1,
+							value3: 3,
+							value4: 4,
+						},
+						{
+							value2: 2,
+						},
+					],
+				],
+			},
+		},
+	},
+	{
+		description:
+			'should execute nodes in the correct order, depth-first & the most top-left one first',
+		input: {
+			workflowData: {
+				nodes: [
+					{
+						parameters: {},
+						id: '3e4ab8bb-2e22-45d9-9287-0265f2ee9c4b',
+						name: 'Start',
+						type: 'n8n-nodes-base.start',
+						typeVersion: 1,
+						position: [300, 620],
+					},
+					{
+						parameters: {
+							options: {},
+						},
+						id: '444650ce-464a-4630-9e24-109056105167',
+						name: 'Wait',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						position: [740, 420],
+						webhookId: '1f4118f8-591a-48fe-a68d-6fec3c99b7a8',
+					},
+					{
+						parameters: {
+							values: {
+								number: [
+									{
+										name: 'wait',
+									},
+								],
+							},
+							options: {},
+						},
+						id: '7a74a097-6563-4f1e-a327-97e5a43b8acb',
+						name: 'Set',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 2,
+						position: [480, 620],
+					},
+					{
+						parameters: {
+							options: {},
+						},
+						id: '9039eebf-6c11-4ce0-b8ad-0812774019d4',
+						name: 'Wait1',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						position: [740, 800],
+						webhookId: '35ceb27a-3fb1-47a9-8678-2df16dcecbcb',
+					},
+					{
+						parameters: {
+							options: {},
+						},
+						id: '7f130b16-8fac-4d93-a0ef-56dfe575f952',
+						name: 'Wait2',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						position: [940, 420],
+						webhookId: 'cc8e2fd2-afc8-4a17-afda-fda943f4bd83',
+					},
+					{
+						parameters: {
+							options: {},
+						},
+						id: '063e2097-b27a-4775-923c-5b839c434640',
+						name: 'Wait3',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						position: [1300, 420],
+						webhookId: '35400ecf-3e53-4b2d-9fd7-2663bbfd830f',
+					},
+					{
+						parameters: {
+							options: {},
+						},
+						id: 'ec908b56-8829-4566-a0b7-ced4bd16c550',
+						name: 'Wait4',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						position: [940, 800],
+						webhookId: 'cc8e2fd2-afc8-4a17-afda-fda943f4bd83',
+					},
+					{
+						parameters: {
+							options: {},
+						},
+						id: 'a7d279bd-7241-4744-8ef6-41468131dfa7',
+						name: 'Wait5',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						position: [1140, 800],
+						webhookId: '35400ecf-3e53-4b2d-9fd7-2663bbfd830f',
+					},
+					{
+						parameters: {
+							options: {},
+						},
+						id: 'f620aff1-7d9c-453f-a2c1-6e3b9a1664d3',
+						name: 'Wait6',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						position: [760, 200],
+						webhookId: '35400ecf-3e53-4b2d-9fd7-2663bbfd830f',
+					},
+					{
+						parameters: {
+							options: {},
+						},
+						id: '1d9bac9b-8197-4ad9-9189-f947068f1a46',
+						name: 'Wait7',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						position: [1060, 200],
+						webhookId: '35400ecf-3e53-4b2d-9fd7-2663bbfd830f',
+					},
+					{
+						parameters: {
+							options: {},
+						},
+						id: '9ad0cc8c-4922-440e-913c-39c8570ddcbc',
+						name: 'Wait8',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						position: [740, 600],
+						webhookId: '35400ecf-3e53-4b2d-9fd7-2663bbfd830f',
+					},
+					{
+						parameters: {
+							options: {},
+						},
+						id: 'af0ca700-b6ed-40c1-8c62-bbadb6fd81f7',
+						name: 'Wait9',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						position: [1040, 580],
+						webhookId: '35400ecf-3e53-4b2d-9fd7-2663bbfd830f',
+					},
+					{
+						parameters: {
+							options: {},
+						},
+						id: 'f2553f9f-670f-4b54-8b89-84dd5a27a244',
+						name: 'Wait10',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						position: [1660, 340],
+						webhookId: '35400ecf-3e53-4b2d-9fd7-2663bbfd830f',
+					},
+					{
+						parameters: {
+							options: {},
+						},
+						id: '0f4475cb-87db-4ed7-a7a0-8a67043c320b',
+						name: 'Wait11',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						position: [1660, 540],
+						webhookId: '35400ecf-3e53-4b2d-9fd7-2663bbfd830f',
+					},
+					{
+						parameters: {
+							options: {},
+						},
+						id: '815f7b2a-1789-48a3-be61-931e643e6d89',
+						name: 'Wait12',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						position: [1920, 340],
+						webhookId: '35400ecf-3e53-4b2d-9fd7-2663bbfd830f',
+					},
+					{
+						parameters: {
+							options: {},
+						},
+						id: 'be1e11af-b8e4-40cb-af36-03613e384b5e',
+						name: 'Wait13',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						position: [1240, 580],
+						webhookId: '35400ecf-3e53-4b2d-9fd7-2663bbfd830f',
+					},
+					{
+						parameters: {},
+						id: 'cf72f99c-612f-4b76-bc8e-d77612e4faa9',
+						name: 'Merge',
+						type: 'n8n-nodes-base.merge',
+						typeVersion: 2,
+						position: [1300, 220],
+					},
+					{
+						parameters: {
+							options: {},
+						},
+						id: 'bfe1dfca-a060-4c37-94d0-058739e7cfca',
+						name: 'Wait14',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						position: [1520, 220],
+						webhookId: '35400ecf-3e53-4b2d-9fd7-2663bbfd830f',
+					},
+					{
+						parameters: {
+							conditions: {
+								number: [
+									{
+										value1: '={{ $itemIndex }}',
+										operation: 'equal',
+										value2: 1,
+									},
+								],
+							},
+						},
+						id: 'bf7d7e54-db5f-4f20-bf3e-b07224096872',
+						name: 'IF',
+						type: 'n8n-nodes-base.if',
+						typeVersion: 1,
+						position: [1780, -220],
+					},
+					{
+						parameters: {
+							options: {},
+						},
+						id: 'd340f2ad-3a6a-4412-bd15-9a7dde1fcb8c',
+						name: 'Wait15',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						position: [2020, -300],
+						webhookId: '35400ecf-3e53-4b2d-9fd7-2663bbfd830f',
+					},
+					{
+						parameters: {
+							options: {},
+						},
+						id: '913a3c9c-1704-433d-9790-21ad0922e5e1',
+						name: 'Wait16',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						position: [2020, -140],
+						webhookId: '35400ecf-3e53-4b2d-9fd7-2663bbfd830f',
+					},
+					{
+						parameters: {
+							conditions: {
+								number: [
+									{
+										value1: '={{ $itemIndex }}',
+										operation: 'equal',
+										value2: 1,
+									},
+								],
+							},
+						},
+						id: 'df1fba53-92af-4351-b471-114dda12bef9',
+						name: 'IF1',
+						type: 'n8n-nodes-base.if',
+						typeVersion: 1,
+						position: [1780, 120],
+					},
+					{
+						parameters: {
+							options: {},
+						},
+						id: '8b3c7e63-8cd8-469d-b6d4-bf5c1953af11',
+						name: 'Wait17',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						position: [2020, 200],
+						webhookId: '35400ecf-3e53-4b2d-9fd7-2663bbfd830f',
+					},
+					{
+						parameters: {
+							options: {},
+						},
+						id: 'e74c4b7c-fc76-4e48-9a0e-3195b19ce1a0',
+						name: 'Wait18',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						position: [2020, 40],
+						webhookId: '35400ecf-3e53-4b2d-9fd7-2663bbfd830f',
+					},
+				],
+				connections: {
+					Start: {
+						main: [
+							[
+								{
+									node: 'Set',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					Wait: {
+						main: [
+							[
+								{
+									node: 'Wait2',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					Set: {
+						main: [
+							[
+								{
+									node: 'Wait',
+									type: 'main',
+									index: 0,
+								},
+								{
+									node: 'Wait1',
+									type: 'main',
+									index: 0,
+								},
+								{
+									node: 'Wait6',
+									type: 'main',
+									index: 0,
+								},
+								{
+									node: 'Wait7',
+									type: 'main',
+									index: 0,
+								},
+								{
+									node: 'Wait8',
+									type: 'main',
+									index: 0,
+								},
+								{
+									node: 'Wait9',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					Wait1: {
+						main: [
+							[
+								{
+									node: 'Wait4',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					Wait2: {
+						main: [
+							[
+								{
+									node: 'Wait3',
+									type: 'main',
+									index: 0,
+								},
+								{
+									node: 'Merge',
+									type: 'main',
+									index: 1,
+								},
+							],
+						],
+					},
+					Wait3: {
+						main: [
+							[
+								{
+									node: 'Wait10',
+									type: 'main',
+									index: 0,
+								},
+								{
+									node: 'Wait11',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					Wait4: {
+						main: [
+							[
+								{
+									node: 'Wait5',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					Wait7: {
+						main: [
+							[
+								{
+									node: 'Merge',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					Wait9: {
+						main: [
+							[
+								{
+									node: 'Wait13',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					Wait10: {
+						main: [
+							[
+								{
+									node: 'Wait12',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					Merge: {
+						main: [
+							[
+								{
+									node: 'Wait14',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					Wait14: {
+						main: [
+							[
+								{
+									node: 'IF',
+									type: 'main',
+									index: 0,
+								},
+								{
+									node: 'IF1',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					IF: {
+						main: [
+							[
+								{
+									node: 'Wait15',
+									type: 'main',
+									index: 0,
+								},
+							],
+							[
+								{
+									node: 'Wait16',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					IF1: {
+						main: [
+							[
+								{
+									node: 'Wait17',
+									type: 'main',
+									index: 0,
+								},
+							],
+							[
+								{
+									node: 'Wait18',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+				},
+			},
+		},
+		output: {
+			nodeExecutionOrder: [
+				'Start',
+				'Set',
+				'Wait6',
+				'Wait7',
+				'Wait',
+				'Wait2',
+				'Merge',
+				'Wait14',
+				'IF',
+				'Wait15',
+				'Wait16',
+				'IF1',
+				'Wait18',
+				'Wait17',
+				'Wait3',
+				'Wait10',
+				'Wait12',
+				'Wait11',
+				'Wait9',
+				'Wait13',
+				'Wait8',
+				'Wait1',
+				'Wait4',
+				'Wait5',
+			],
+			nodeData: {},
+		},
+	},
+	{
+		description: 'should simply execute the next multi-input-node (totally ignoring the runIndex)',
+		input: {
+			workflowData: {
+				nodes: [
+					{
+						parameters: {
+							values: {
+								number: [
+									{
+										name: 'counter',
+										value: '={{ ($input.first().json.counter || 0) + 1 }}',
+									},
+								],
+							},
+							options: {},
+						},
+						id: '18191406-b56b-4388-9d4b-ff5b22fdc02c',
+						name: 'Set',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 2,
+						position: [640, 660],
+					},
+					{
+						parameters: {
+							conditions: {
+								number: [
+									{
+										value1: '={{ $json.counter }}',
+										value2: 3,
+									},
+								],
+							},
+						},
+						id: '0c6f239b-f9f5-4a20-b554-c69e7bc692b1',
+						name: 'IF',
+						type: 'n8n-nodes-base.if',
+						typeVersion: 1,
+						position: [900, 660],
+					},
+					{
+						parameters: {},
+						id: '463194c3-4fcb-4da4-bba0-bc58462ac59a',
+						name: 'Merge',
+						type: 'n8n-nodes-base.merge',
+						typeVersion: 2,
+						position: [1180, 760],
+					},
+					{
+						parameters: {
+							values: {
+								number: [
+									{
+										name: 'counter',
+										value: '={{ ($input.first().json.counter || 0) + 1 }}',
+									},
+								],
+							},
+							options: {},
+						},
+						id: '8b5177c1-34ab-468f-8cb1-ff1d253562dc',
+						name: 'Set1',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 2,
+						position: [640, 320],
+					},
+					{
+						parameters: {
+							conditions: {
+								number: [
+									{
+										value1: '={{ $json.counter }}',
+										value2: 3,
+									},
+								],
+							},
+						},
+						id: '455663ab-bc3b-4674-9769-7428c85918c3',
+						name: 'IF1',
+						type: 'n8n-nodes-base.if',
+						typeVersion: 1,
+						position: [860, 320],
+					},
+					{
+						parameters: {},
+						id: 'ffc0d327-5cbc-4cf3-8fb0-77c087b391c1',
+						name: 'Merge1',
+						type: 'n8n-nodes-base.merge',
+						typeVersion: 2,
+						position: [1180, 420],
+					},
+					{
+						parameters: {},
+						id: '9a5b13a4-eba1-4a18-a4c6-36bedb07d975',
+						name: 'Merge2',
+						type: 'n8n-nodes-base.merge',
+						typeVersion: 2,
+						position: [1500, 600],
+					},
+					{
+						parameters: {},
+						id: '89a78e50-2ec6-48bf-be5f-3838600cd08a',
+						name: 'Start',
+						type: 'n8n-nodes-base.start',
+						typeVersion: 1,
+						position: [-20, 700],
+					},
+				],
+				connections: {
+					Set: {
+						main: [
+							[
+								{
+									node: 'IF',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					IF: {
+						main: [
+							[
+								{
+									node: 'Set',
+									type: 'main',
+									index: 0,
+								},
+								{
+									node: 'Merge1',
+									type: 'main',
+									index: 1,
+								},
+							],
+							[
+								{
+									node: 'Merge',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					Merge: {
+						main: [
+							[
+								{
+									node: 'Merge2',
+									type: 'main',
+									index: 1,
+								},
+							],
+						],
+					},
+					Set1: {
+						main: [
+							[
+								{
+									node: 'IF1',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					IF1: {
+						main: [
+							[
+								{
+									node: 'Set1',
+									type: 'main',
+									index: 0,
+								},
+								{
+									node: 'Merge1',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					Merge1: {
+						main: [
+							[
+								{
+									node: 'Merge2',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					Start: {
+						main: [
+							[
+								{
+									node: 'Merge',
+									type: 'main',
+									index: 1,
+								},
+								{
+									node: 'Set1',
+									type: 'main',
+									index: 0,
+								},
+								{
+									node: 'Set',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+				},
+			},
+		},
+		output: {
+			nodeExecutionOrder: [
+				'Start',
+				'Set1',
+				'IF1',
+				'Set1',
+				'IF1',
+				'Set1',
+				'IF1',
+				'Set',
+				'IF',
+				'Merge1',
+				'Set',
+				'IF',
+				'Merge1',
+				'Set',
+				'IF',
+				'Merge',
+				'Merge2',
+				'Merge2',
+			],
+			nodeData: {
+				Start: [[{}]],
+				Set1: [
+					[
+						{
+							counter: 1,
+						},
+					],
+					[
+						{
+							counter: 2,
+						},
+					],
+					[
+						{
+							counter: 3,
+						},
+					],
+				],
+				Set: [
+					[
+						{
+							counter: 1,
+						},
+					],
+					[
+						{
+							counter: 2,
+						},
+					],
+					[
+						{
+							counter: 3,
+						},
+					],
+				],
+				IF1: [
+					[
+						{
+							counter: 1,
+						},
+					],
+					[
+						{
+							counter: 2,
+						},
+					],
+					[],
+				],
+				IF: [
+					[
+						{
+							counter: 1,
+						},
+					],
+					[
+						{
+							counter: 2,
+						},
+					],
+					[],
+				],
+				Merge1: [
+					[
+						{
+							counter: 1,
+						},
+						{
+							counter: 1,
+						},
+					],
+					[
+						{
+							counter: 2,
+						},
+						{
+							counter: 2,
+						},
+					],
+				],
+				Merge: [
+					[
+						{
+							counter: 3,
+						},
+						{},
+					],
+				],
+				Merge2: [
+					[
+						{
+							counter: 1,
+						},
+						{
+							counter: 1,
+						},
+						{
+							counter: 3,
+						},
+						{},
+					],
+					[
+						{
+							counter: 2,
+						},
+						{
+							counter: 2,
+						},
+					],
+				],
+			},
+		},
+	},
+	{
+		description: 'should run keep on executing even if data from input 1 is missing',
+		input: {
+			workflowData: {
+				nodes: [
+					{
+						parameters: {},
+						id: '9c0cb647-5d60-40dc-b791-4946ee260a5d',
+						name: 'Start',
+						type: 'n8n-nodes-base.start',
+						typeVersion: 1,
+						position: [180, 240],
+					},
+					{
+						parameters: {
+							values: {
+								string: [
+									{
+										name: 'test',
+										value: 'a',
+									},
+								],
+							},
+							options: {},
+						},
+						id: '2bed3b26-0907-465b-a416-9dc993c2e302',
+						name: 'Set',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						position: [400, 240],
+					},
+					{
+						parameters: {
+							conditions: {
+								string: [
+									{
+										value1: '={{ $json["test"] }}',
+										value2: 'b',
+									},
+								],
+							},
+						},
+						id: 'eca22a12-fb0c-4a4f-ab97-74544c178714',
+						name: 'IF',
+						type: 'n8n-nodes-base.if',
+						typeVersion: 1,
+						position: [620, 240],
+					},
+					{
+						parameters: {},
+						id: '8d63caea-8d89-450e-87ae-6097b9821a70',
+						name: 'NoOp',
+						type: 'n8n-nodes-base.noOp',
+						typeVersion: 1,
+						position: [860, 160],
+					},
+					{
+						parameters: {},
+						id: 'bd0e79e4-7b7a-4016-ace3-6f54f46b41c3',
+						name: 'NoOp1',
+						type: 'n8n-nodes-base.noOp',
+						typeVersion: 1,
+						position: [860, 300],
+					},
+					{
+						parameters: {},
+						id: '975966f6-8e59-41d8-a69e-7223476a7c50',
+						name: 'Merge',
+						type: 'n8n-nodes-base.merge',
+						typeVersion: 2,
+						position: [1140, 220],
+					},
+				],
+				connections: {
+					Start: {
+						main: [
+							[
+								{
+									node: 'Set',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					Set: {
+						main: [
+							[
+								{
+									node: 'IF',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					IF: {
+						main: [
+							[
+								{
+									node: 'NoOp',
+									type: 'main',
+									index: 0,
+								},
+							],
+							[
+								{
+									node: 'NoOp1',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					NoOp: {
+						main: [
+							[
+								{
+									node: 'Merge',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					NoOp1: {
+						main: [
+							[
+								{
+									node: 'Merge',
+									type: 'main',
+									index: 1,
+								},
+							],
+						],
+					},
+				},
+			},
+		},
+		output: {
+			nodeExecutionOrder: ['Start', 'Set', 'IF', 'NoOp1', 'Merge'],
+			nodeData: {
+				Merge: [
+					[
+						{
+							test: 'a',
+						},
+					],
+				],
+			},
+		},
+	},
+	{
+		description:
+			'should run complicated multi node workflow where multiple Merge-Node have missing data and complex dependency structure',
+		input: {
+			workflowData: {
+				nodes: [
+					{
+						parameters: {
+							conditions: {
+								string: [
+									{
+										value1: '={{ $json["test"] }}',
+										value2: 'b',
+									},
+								],
+							},
+						},
+						id: '21593a8c-07c1-435b-93a6-75317ee3bf67',
+						name: 'IF4',
+						type: 'n8n-nodes-base.if',
+						typeVersion: 1,
+						position: [880, 1240],
+					},
+					{
+						parameters: {},
+						id: 'a9af6b9f-011c-4b34-a367-0cfa5ad4c865',
+						name: 'NoOp2',
+						type: 'n8n-nodes-base.noOp',
+						typeVersion: 1,
+						position: [1320, 1060],
+					},
+					{
+						parameters: {},
+						id: '429d1a51-65f0-4701-af76-b73611774952',
+						name: 'Merge3',
+						type: 'n8n-nodes-base.merge',
+						typeVersion: 2,
+						position: [1100, 1060],
+					},
+					{
+						parameters: {
+							conditions: {
+								string: [
+									{
+										value1: '={{ $json["test"] }}',
+										value2: 'b',
+									},
+								],
+							},
+						},
+						id: 'ed08db0f-f747-4f87-af62-051fc53f955c',
+						name: 'IF3',
+						type: 'n8n-nodes-base.if',
+						typeVersion: 1,
+						position: [620, 1060],
+					},
+					{
+						parameters: {},
+						id: 'e80d2aac-cbd4-4e7c-9817-83db52a617d4',
+						name: 'Merge2',
+						type: 'n8n-nodes-base.merge',
+						typeVersion: 2,
+						position: [940, 900],
+					},
+					{
+						parameters: {
+							conditions: {
+								string: [
+									{
+										value1: '={{ $json["test"] }}',
+										value2: 'a',
+									},
+								],
+							},
+						},
+						id: '766dad6b-4326-41b5-a02a-0b3b7d879eb4',
+						name: 'IF2',
+						type: 'n8n-nodes-base.if',
+						typeVersion: 1,
+						position: [620, 900],
+					},
+					{
+						parameters: {},
+						id: '0c0cd5bb-eb44-48fe-b66a-54a3c541ea57',
+						name: 'Merge7',
+						type: 'n8n-nodes-base.merge',
+						typeVersion: 2,
+						position: [2180, 1180],
+					},
+					{
+						parameters: {},
+						id: '863a00e5-7be4-43f3-97da-07cf552d7c0e',
+						name: 'Merge6',
+						type: 'n8n-nodes-base.merge',
+						typeVersion: 2,
+						position: [1840, 1200],
+					},
+					{
+						parameters: {},
+						id: '8855d0ca-1deb-4ad8-958b-2379d3a87160',
+						name: 'Merge5',
+						type: 'n8n-nodes-base.merge',
+						typeVersion: 2,
+						position: [1600, 1040],
+					},
+					{
+						parameters: {},
+						id: 'ea37e388-c77a-4a2f-a527-4585f24371d5',
+						name: 'Merge4',
+						type: 'n8n-nodes-base.merge',
+						typeVersion: 2,
+						position: [1180, 880],
+					},
+					{
+						parameters: {},
+						id: 'e3c814e9-9a92-4e12-96d5-85634fe76dc9',
+						name: 'Merge1',
+						type: 'n8n-nodes-base.merge',
+						typeVersion: 2,
+						position: [940, 720],
+					},
+					{
+						parameters: {
+							conditions: {
+								string: [
+									{
+										value1: '={{ $json["test"] }}',
+										value2: 'b',
+									},
+								],
+							},
+						},
+						id: 'a21a3932-8a3f-464f-8393-309d3233433a',
+						name: 'IF1',
+						type: 'n8n-nodes-base.if',
+						typeVersion: 1,
+						position: [620, 720],
+					},
+					{
+						parameters: {
+							values: {
+								string: [
+									{
+										name: 'test',
+										value: 'a',
+									},
+								],
+							},
+							options: {},
+						},
+						id: '12d33a38-baeb-41de-aea0-d8a7477f5aa6',
+						name: 'Set1',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						position: [400, 720],
+					},
+					{
+						parameters: {},
+						id: '41589b0b-0521-41ae-b0c6-80a016af803e',
+						name: 'Start',
+						type: 'n8n-nodes-base.start',
+						typeVersion: 1,
+						position: [160, 240],
+					},
+				],
+				connections: {
+					IF4: {
+						main: [
+							[
+								{
+									node: 'Merge3',
+									type: 'main',
+									index: 1,
+								},
+							],
+							[
+								{
+									node: 'Merge6',
+									type: 'main',
+									index: 1,
+								},
+							],
+						],
+					},
+					NoOp2: {
+						main: [
+							[
+								{
+									node: 'Merge5',
+									type: 'main',
+									index: 1,
+								},
+							],
+						],
+					},
+					Merge3: {
+						main: [
+							[
+								{
+									node: 'NoOp2',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					IF3: {
+						main: [
+							[
+								{
+									node: 'Merge3',
+									type: 'main',
+									index: 0,
+								},
+							],
+							[
+								{
+									node: 'IF4',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					Merge2: {
+						main: [
+							[
+								{
+									node: 'Merge4',
+									type: 'main',
+									index: 1,
+								},
+							],
+						],
+					},
+					IF2: {
+						main: [
+							[
+								{
+									node: 'Merge2',
+									type: 'main',
+									index: 0,
+								},
+							],
+							[
+								{
+									node: 'Merge2',
+									type: 'main',
+									index: 1,
+								},
+							],
+						],
+					},
+					Merge6: {
+						main: [
+							[
+								{
+									node: 'Merge7',
+									type: 'main',
+									index: 1,
+								},
+							],
+						],
+					},
+					Merge5: {
+						main: [
+							[
+								{
+									node: 'Merge6',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					Merge4: {
+						main: [
+							[
+								{
+									node: 'Merge5',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					Merge1: {
+						main: [
+							[
+								{
+									node: 'Merge4',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					IF1: {
+						main: [
+							[
+								{
+									node: 'Merge1',
+									type: 'main',
+									index: 0,
+								},
+							],
+							[
+								{
+									node: 'Merge1',
+									type: 'main',
+									index: 1,
+								},
+							],
+						],
+					},
+					Set1: {
+						main: [
+							[
+								{
+									node: 'IF1',
+									type: 'main',
+									index: 0,
+								},
+								{
+									node: 'IF2',
+									type: 'main',
+									index: 0,
+								},
+								{
+									node: 'IF3',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+					Start: {
+						main: [
+							[
+								{
+									node: 'Set1',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+				},
+			},
+		},
+		output: {
+			nodeExecutionOrder: [
+				'Start',
+				'Set1',
+				'IF1',
+				'IF2',
+				'IF3',
+				'IF4',
+				'Merge1',
+				'Merge2',
+				'Merge4',
+				'Merge5',
+				'Merge6',
+				'Merge7',
+			],
+			nodeData: {
+				Merge1: [
+					[
+						{
+							test: 'a',
+						},
+					],
+				],
+				Merge2: [
+					[
+						{
+							test: 'a',
+						},
+					],
+				],
+				Merge4: [
+					[
+						{
+							test: 'a',
+						},
+						{
+							test: 'a',
+						},
+					],
+				],
+				Merge5: [
+					[
+						{
+							test: 'a',
+						},
+						{
+							test: 'a',
+						},
+					],
+				],
+				Merge6: [
+					[
+						{
+							test: 'a',
+						},
+						{
+							test: 'a',
+						},
+						{
+							test: 'a',
+						},
+					],
+				],
+				Merge7: [
+					[
+						{
+							test: 'a',
+						},
+						{
+							test: 'a',
+						},
+						{
+							test: 'a',
+						},
+					],
+				],
+			},
+		},
+	},
+];
diff --git a/packages/core/test/helpers/index.ts b/packages/core/test/helpers/index.ts
new file mode 100644
index 0000000000000..fc0717188b12e
--- /dev/null
+++ b/packages/core/test/helpers/index.ts
@@ -0,0 +1,234 @@
+import path from 'path';
+import { readdirSync, readFileSync } from 'fs';
+
+const BASE_DIR = path.resolve(__dirname, '../../..');
+
+import type {
+	ICredentialDataDecryptedObject,
+	IDataObject,
+	IDeferredPromise,
+	IExecuteWorkflowInfo,
+	IHttpRequestHelper,
+	IHttpRequestOptions,
+	INode,
+	INodeCredentialsDetails,
+	INodeType,
+	INodeTypes,
+	IRun,
+	ITaskData,
+	IVersionedNodeType,
+	IWorkflowBase,
+	IWorkflowExecuteAdditionalData,
+	NodeLoadingDetails,
+	WorkflowTestData,
+	INodeTypeData,
+} from 'n8n-workflow';
+
+import { ApplicationError, ICredentialsHelper, NodeHelpers, WorkflowHooks } from 'n8n-workflow';
+import { Credentials } from '@/Credentials';
+
+import { predefinedNodesTypes } from './constants';
+
+export class CredentialsHelper extends ICredentialsHelper {
+	async authenticate(
+		credentials: ICredentialDataDecryptedObject,
+		typeName: string,
+		requestParams: IHttpRequestOptions,
+	): Promise<IHttpRequestOptions> {
+		return requestParams;
+	}
+
+	async preAuthentication(
+		helpers: IHttpRequestHelper,
+		credentials: ICredentialDataDecryptedObject,
+		typeName: string,
+		node: INode,
+		credentialsExpired: boolean,
+	): Promise<ICredentialDataDecryptedObject | undefined> {
+		return undefined;
+	}
+
+	getParentTypes(name: string): string[] {
+		return [];
+	}
+
+	async getDecrypted(
+		additionalData: IWorkflowExecuteAdditionalData,
+		nodeCredentials: INodeCredentialsDetails,
+		type: string,
+	): Promise<ICredentialDataDecryptedObject> {
+		return {};
+	}
+
+	async getCredentials(
+		nodeCredentials: INodeCredentialsDetails,
+		type: string,
+	): Promise<Credentials> {
+		return new Credentials({ id: null, name: '' }, '', [], '');
+	}
+
+	async updateCredentials(
+		nodeCredentials: INodeCredentialsDetails,
+		type: string,
+		data: ICredentialDataDecryptedObject,
+	): Promise<void> {}
+}
+
+class NodeTypesClass implements INodeTypes {
+	nodeTypes: INodeTypeData;
+
+	constructor(nodeTypes?: INodeTypeData) {
+		if (nodeTypes) {
+			this.nodeTypes = nodeTypes;
+		} else {
+			this.nodeTypes = predefinedNodesTypes;
+		}
+	}
+
+	getByName(nodeType: string): INodeType | IVersionedNodeType {
+		return this.nodeTypes[nodeType].type;
+	}
+
+	getByNameAndVersion(nodeType: string, version?: number): INodeType {
+		return NodeHelpers.getVersionedNodeType(this.nodeTypes[nodeType].type, version);
+	}
+}
+
+let nodeTypesInstance: NodeTypesClass | undefined;
+
+export function NodeTypes(nodeTypes?: INodeTypeData): NodeTypesClass {
+	if (nodeTypesInstance === undefined || nodeTypes !== undefined) {
+		nodeTypesInstance = new NodeTypesClass(nodeTypes);
+	}
+
+	return nodeTypesInstance;
+}
+
+export function WorkflowExecuteAdditionalData(
+	waitPromise: IDeferredPromise<IRun>,
+	nodeExecutionOrder: string[],
+): IWorkflowExecuteAdditionalData {
+	const hookFunctions = {
+		nodeExecuteAfter: [
+			async (nodeName: string, data: ITaskData): Promise<void> => {
+				nodeExecutionOrder.push(nodeName);
+			},
+		],
+		workflowExecuteAfter: [
+			async (fullRunData: IRun): Promise<void> => {
+				waitPromise.resolve(fullRunData);
+			},
+		],
+	};
+
+	const workflowData: IWorkflowBase = {
+		name: '',
+		createdAt: new Date(),
+		updatedAt: new Date(),
+		active: true,
+		nodes: [],
+		connections: {},
+	};
+
+	return {
+		credentialsHelper: new CredentialsHelper(),
+		hooks: new WorkflowHooks(hookFunctions, 'trigger', '1', workflowData),
+		executeWorkflow: async (workflowInfo: IExecuteWorkflowInfo) => {},
+		sendDataToUI: (message: string) => {},
+		restApiUrl: '',
+		webhookBaseUrl: 'webhook',
+		webhookWaitingBaseUrl: 'webhook-waiting',
+		webhookTestBaseUrl: 'webhook-test',
+		userId: '123',
+	};
+}
+
+const preparePinData = (pinData: IDataObject) => {
+	const returnData = Object.keys(pinData).reduce(
+		(acc, key) => {
+			const data = pinData[key] as IDataObject[];
+			acc[key] = [data];
+			return acc;
+		},
+		{} as {
+			[key: string]: IDataObject[][];
+		},
+	);
+	return returnData;
+};
+
+const readJsonFileSync = <T>(filePath: string) =>
+	JSON.parse(readFileSync(path.join(BASE_DIR, filePath), 'utf-8')) as T;
+
+export function getNodeTypes(testData: WorkflowTestData[] | WorkflowTestData) {
+	if (!Array.isArray(testData)) {
+		testData = [testData];
+	}
+
+	const nodeTypes: INodeTypeData = {};
+
+	const nodes = [...new Set(testData.flatMap((data) => data.input.workflowData.nodes))];
+
+	const nodeNames = nodes.map((n) => n.type);
+
+	const knownNodes = readJsonFileSync<Record<string, NodeLoadingDetails>>(
+		'nodes-base/dist/known/nodes.json',
+	);
+
+	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 } });
+		}
+		const sourcePath = loadInfo.sourcePath.replace(/^dist\//, './').replace(/\.js$/, '.ts');
+		const nodeSourcePath = path.join(BASE_DIR, 'nodes-base', sourcePath);
+		const node = new (require(nodeSourcePath)[loadInfo.className])() as INodeType;
+		nodeTypes[nodeName] = {
+			sourcePath: '',
+			type: node,
+		};
+	}
+
+	return nodeTypes;
+}
+
+const getWorkflowFilenames = (dirname: string, testFolder = 'workflows') => {
+	const workflows: string[] = [];
+
+	const filenames: string[] = readdirSync(`${dirname}${path.sep}${testFolder}`);
+
+	filenames.forEach((file) => {
+		if (file.endsWith('.json')) {
+			workflows.push(path.join('core', 'test', testFolder, file));
+		}
+	});
+
+	return workflows;
+};
+
+export const workflowToTests = (dirname: string, testFolder = 'workflows') => {
+	const workflowFiles: string[] = getWorkflowFilenames(dirname, testFolder);
+
+	const testCases: WorkflowTestData[] = [];
+
+	for (const filePath of workflowFiles) {
+		const description = filePath.replace('.json', '');
+		const workflowData = readJsonFileSync<IWorkflowBase>(filePath);
+		if (workflowData.pinData === undefined) {
+			throw new ApplicationError('Workflow data does not contain pinData');
+		}
+
+		const nodeData = preparePinData(workflowData.pinData);
+
+		delete workflowData.pinData;
+
+		const input = { workflowData };
+		const output = { nodeData };
+
+		testCases.push({ description, input, output });
+	}
+	return testCases;
+};
diff --git a/packages/core/test/setup-mocks.ts b/packages/core/test/setup-mocks.ts
new file mode 100644
index 0000000000000..d2c9bc6e645e1
--- /dev/null
+++ b/packages/core/test/setup-mocks.ts
@@ -0,0 +1 @@
+import 'reflect-metadata';
diff --git a/packages/core/test/utils.ts b/packages/core/test/utils.ts
index 1d6abbf50efaa..889587524080a 100644
--- a/packages/core/test/utils.ts
+++ b/packages/core/test/utils.ts
@@ -1,14 +1,26 @@
-import { ILogger, LoggerProxy } from 'n8n-workflow';
-
-const fakeLogger = {
-	log: () => {},
-	debug: () => {},
-	verbose: () => {},
-	info: () => {},
-	warn: () => {},
-	error: () => {},
-} as ILogger;
-
-export const initLogger = () => {
-	LoggerProxy.init(fakeLogger);
+import { Container } from 'typedi';
+import { mock } from 'jest-mock-extended';
+import { Duplex } from 'stream';
+
+import type { DeepPartial } from 'ts-essentials';
+import type { Class } from '@/Interfaces';
+
+export const mockInstance = <T>(
+	constructor: Class<T>,
+	data: DeepPartial<T> | undefined = undefined,
+) => {
+	const instance = mock<T>(data);
+	Container.set(constructor, instance);
+	return instance;
 };
+
+export function toStream(buffer: Buffer) {
+	const duplexStream = new Duplex();
+	duplexStream.push(buffer);
+	duplexStream.push(null);
+
+	return duplexStream;
+}
+
+export const toFileId = (workflowId: string, executionId: string, fileUuid: string) =>
+	`workflows/${workflowId}/executions/${executionId}/binary_data/${fileUuid}`;
diff --git a/packages/core/test/workflows/error_outputs.json b/packages/core/test/workflows/error_outputs.json
new file mode 100644
index 0000000000000..f8e698bd52954
--- /dev/null
+++ b/packages/core/test/workflows/error_outputs.json
@@ -0,0 +1,734 @@
+{
+	"name": "Error Output - Test Workflow",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "c41b46f0-3e76-4655-b5ea-4d15af58c138",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [-680, 460]
+		},
+		{
+			"parameters": {
+				"fields": {
+					"values": [
+						{
+							"name": "originalName",
+							"stringValue": "={{ $('Mock Data').item.json.name }}"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "247f4118-d80f-49ab-8d9a-0cdbbb9271df",
+			"name": "Success",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.2,
+			"position": [200, 860]
+		},
+		{
+			"parameters": {
+				"fields": {
+					"values": [
+						{
+							"name": "originalName",
+							"stringValue": "={{ $('Mock Data').item.json.name }}"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "311e3650-d89c-405a-9c8d-c238f48a8a5a",
+			"name": "Error",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.2,
+			"position": [200, 1040]
+		},
+		{
+			"parameters": {
+				"jsCode": "return [\n  {\n    \"id\": \"23423532\",\n    \"name\": \"Jay Gatsby\",\n    \"email\": \"gatsby@west-egg.com\",\n    \"notes\": \"Keeps asking about a green light??\",\n    \"country\": \"US\",\n    \"created\": \"1925-04-10\"\n  },\n  {\n    \"id\": \"23423533\",\n    \"name\": \"José Arcadio Buendía\",\n    \"email\": \"jab@macondo.co\",\n    \"notes\": \"Lots of people named after him. Very confusing\",\n    \"country\": \"CO\",\n    \"created\": \"1967-05-05\"\n  },\n  {\n    \"id\": \"23423534\",\n    \"name\": \"Max Sendak\",\n    \"email\": \"info@in-and-out-of-weeks.org\",\n    \"notes\": \"Keeps rolling his terrible eyes\",\n    \"country\": \"US\",\n    \"created\": \"1963-04-09\"\n  },\n  {\n    \"id\": \"23423535\",\n    \"name\": \"Zaphod Beeblebrox\",\n    \"email\": \"captain@heartofgold.com\",\n    \"notes\": \"Felt like I was talking to more than one person\",\n    \"country\": null,\n    \"created\": \"1979-10-12\"\n  },\n  {\n    \"id\": \"23423536\",\n    \"name\": \"Edmund Pevensie\",\n    \"email\": \"edmund@narnia.gov\",\n    \"notes\": \"Passionate sailor\",\n    \"country\": \"UK\",\n    \"created\": \"1950-10-16\"\n  }\n]"
+			},
+			"id": "179d4fe7-1ae7-4957-a77d-12c3ca6d141b",
+			"name": "Mock Data",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 2,
+			"position": [-460, 460]
+		},
+		{
+			"parameters": {
+				"content": "## On Error: Continue (using error output)",
+				"height": 414,
+				"width": 564
+			},
+			"id": "1ec2a8b6-54e2-4319-90b3-30b387855b36",
+			"name": "Sticky Note",
+			"type": "n8n-nodes-base.stickyNote",
+			"typeVersion": 1,
+			"position": [-160, 780]
+		},
+		{
+			"parameters": {
+				"content": "## Continue On Fail (deprecated)",
+				"height": 279,
+				"width": 564
+			},
+			"id": "49a2b7d9-8bd1-4cdf-9649-2d93668b0f8f",
+			"name": "Sticky Note1",
+			"type": "n8n-nodes-base.stickyNote",
+			"typeVersion": 1,
+			"position": [-160, 140]
+		},
+		{
+			"parameters": {
+				"fields": {
+					"values": [
+						{
+							"name": "originalName",
+							"stringValue": "={{ $('Mock Data').item.json.name }}"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "9852f1d9-95b4-4ef7-bb18-8f0bab81a0bc",
+			"name": "Combined",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.2,
+			"position": [180, 240]
+		},
+		{
+			"parameters": {
+				"mode": "runOnceForEachItem",
+				"jsCode": "// Add a new field called 'myNewField' to the JSON of the item\n$input.item.json.myNewField = 1;\n\nif ($input.item.json.country === 'US') {\n  throw new Error('This is an error');\n}\n\nreturn $input.item;"
+			},
+			"id": "40d4dba3-3db7-4eb5-aa27-e76f955a5e09",
+			"name": "Throw Error",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 2,
+			"position": [-140, 960],
+			"errorOutput": true,
+			"onError": "continueErrorOutput"
+		},
+		{
+			"parameters": {
+				"content": "## On Error: Continue",
+				"height": 279,
+				"width": 564
+			},
+			"id": "8eb3dd54-c1dd-4167-abfa-c06d044c63f3",
+			"name": "Sticky Note2",
+			"type": "n8n-nodes-base.stickyNote",
+			"typeVersion": 1,
+			"position": [-160, 460]
+		},
+		{
+			"parameters": {
+				"mode": "runOnceForEachItem",
+				"jsCode": "// Add a new field called 'myNewField' to the JSON of the item\n$input.item.json.myNewField = 1;\n\nif ($input.item.json.country === 'US') {\n  throw new Error('This is an error');\n}\n\nreturn $input.item;"
+			},
+			"id": "19a3d6ac-e610-4296-9b7a-9ed19d242bdb",
+			"name": "Throw Error2",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 2,
+			"position": [-120, 560],
+			"onError": "continueRegularOutput"
+		},
+		{
+			"parameters": {
+				"fields": {
+					"values": [
+						{
+							"name": "originalName",
+							"stringValue": "={{ $('Mock Data').item.json.name }}"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "5f803fdc-7d88-4c12-8886-6092cfbc03c6",
+			"name": "Combined1",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.2,
+			"position": [180, 560]
+		},
+		{
+			"parameters": {
+				"mode": "runOnceForEachItem",
+				"jsCode": "// Add a new field called 'myNewField' to the JSON of the item\n$input.item.json.myNewField = 1;\n\nif ($input.item.json.country === 'US') {\n  throw new Error('This is an error');\n}\n\nreturn $input.item;"
+			},
+			"id": "c2696c1f-1abd-4549-9ad9-e62017dc14b8",
+			"name": "Throw Error1",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 2,
+			"position": [-120, 240],
+			"continueOnFail": true
+		},
+		{
+			"parameters": {
+				"fields": {
+					"values": [
+						{
+							"name": "originalName",
+							"stringValue": "={{ $('Mock Data').item.json.name }}"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "01740d7e-e572-408a-9fae-729068803113",
+			"name": "Success1",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.2,
+			"position": [200, 1320]
+		},
+		{
+			"parameters": {
+				"content": "## On Error: Continue (using error output) + Make sure error data gets removed",
+				"height": 509.71047006830065,
+				"width": 1183.725293692246
+			},
+			"id": "ed409181-4847-4d65-af45-f45078a6343e",
+			"name": "Sticky Note3",
+			"type": "n8n-nodes-base.stickyNote",
+			"typeVersion": 1,
+			"position": [-160, 1240]
+		},
+		{
+			"parameters": {
+				"mode": "runOnceForEachItem",
+				"jsCode": "// Add a new field called 'myNewField' to the JSON of the item\n$input.item.json.myNewField = 1;\n\nif ($input.item.json.country === 'US') {\n  throw new Error('This is an error');\n}\n\nreturn $input.item;"
+			},
+			"id": "93d03f38-b928-4b4b-832a-3f1a5deebb2d",
+			"name": "Throw Error3",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 2,
+			"position": [-140, 1420],
+			"errorOutput": true,
+			"onError": "continueErrorOutput"
+		},
+		{
+			"parameters": {
+				"options": {}
+			},
+			"id": "c92a6ce5-41ea-4fb9-a07b-c4e98f905b12",
+			"name": "Edit Fields",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.2,
+			"position": [420, 1500],
+			"onError": "continueErrorOutput"
+		},
+		{
+			"parameters": {
+				"fields": {
+					"values": [
+						{
+							"name": "originalName",
+							"stringValue": "={{ $('Mock Data').item.json.name }}"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "ab838cc1-0987-4b41-bdc5-fe17f38e0691",
+			"name": "Success2",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.2,
+			"position": [700, 1360]
+		},
+		{
+			"parameters": {
+				"fields": {
+					"values": [
+						{
+							"name": "originalName",
+							"stringValue": "={{ $('Mock Data').item.json.name }}"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "22e04172-19b9-4735-9dd0-a3e2fa3bf000",
+			"name": "Error2",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.2,
+			"position": [700, 1580]
+		},
+		{
+			"parameters": {
+				"fields": {
+					"values": [
+						{
+							"name": "originalName",
+							"stringValue": "={{ $('Mock Data').item.json.name }}"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "69e7257a-1ba8-46ba-9394-d38d65b2e567",
+			"name": "Error1",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.2,
+			"position": [200, 1500]
+		}
+	],
+	"pinData": {
+		"Error": [
+			{
+				"json": {
+					"id": "23423534",
+					"name": "Max Sendak",
+					"email": "info@in-and-out-of-weeks.org",
+					"notes": "Keeps rolling his terrible eyes",
+					"country": "US",
+					"created": "1963-04-09",
+					"error": "This is an error [line 5, for item 2]",
+					"originalName": "Max Sendak"
+				},
+				"pairedItem": {
+					"item": 0
+				}
+			},
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"error": "This is an error [line 5, for item 0]",
+					"originalName": "Jay Gatsby"
+				},
+				"pairedItem": {
+					"item": 1
+				}
+			}
+		],
+		"Success": [
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
+					"myNewField": 1,
+					"originalName": "Edmund Pevensie"
+				},
+				"pairedItem": {
+					"item": 0
+				}
+			},
+			{
+				"json": {
+					"id": "23423535",
+					"name": "Zaphod Beeblebrox",
+					"email": "captain@heartofgold.com",
+					"notes": "Felt like I was talking to more than one person",
+					"country": null,
+					"created": "1979-10-12",
+					"myNewField": 1,
+					"originalName": "Zaphod Beeblebrox"
+				},
+				"pairedItem": {
+					"item": 1
+				}
+			},
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
+					"myNewField": 1,
+					"originalName": "José Arcadio Buendía"
+				},
+				"pairedItem": {
+					"item": 2
+				}
+			}
+		],
+		"Combined": [
+			{
+				"json": {
+					"error": "This is an error [line 5, for item 0]",
+					"originalName": "Jay Gatsby"
+				},
+				"pairedItem": {
+					"item": 0
+				}
+			},
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
+					"myNewField": 1,
+					"originalName": "José Arcadio Buendía"
+				},
+				"pairedItem": {
+					"item": 1
+				}
+			},
+			{
+				"json": {
+					"error": "This is an error [line 5, for item 2]",
+					"originalName": "Max Sendak"
+				},
+				"pairedItem": {
+					"item": 2
+				}
+			},
+			{
+				"json": {
+					"id": "23423535",
+					"name": "Zaphod Beeblebrox",
+					"email": "captain@heartofgold.com",
+					"notes": "Felt like I was talking to more than one person",
+					"country": null,
+					"created": "1979-10-12",
+					"myNewField": 1,
+					"originalName": "Zaphod Beeblebrox"
+				},
+				"pairedItem": {
+					"item": 3
+				}
+			},
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
+					"myNewField": 1,
+					"originalName": "Edmund Pevensie"
+				},
+				"pairedItem": {
+					"item": 4
+				}
+			}
+		],
+		"Combined1": [
+			{
+				"json": {
+					"error": "This is an error [line 5, for item 0]",
+					"originalName": "Jay Gatsby"
+				},
+				"pairedItem": {
+					"item": 0
+				}
+			},
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
+					"myNewField": 1,
+					"originalName": "José Arcadio Buendía"
+				},
+				"pairedItem": {
+					"item": 1
+				}
+			},
+			{
+				"json": {
+					"error": "This is an error [line 5, for item 2]",
+					"originalName": "Max Sendak"
+				},
+				"pairedItem": {
+					"item": 2
+				}
+			},
+			{
+				"json": {
+					"id": "23423535",
+					"name": "Zaphod Beeblebrox",
+					"email": "captain@heartofgold.com",
+					"notes": "Felt like I was talking to more than one person",
+					"country": null,
+					"created": "1979-10-12",
+					"myNewField": 1,
+					"originalName": "Zaphod Beeblebrox"
+				},
+				"pairedItem": {
+					"item": 3
+				}
+			},
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
+					"myNewField": 1,
+					"originalName": "Edmund Pevensie"
+				},
+				"pairedItem": {
+					"item": 4
+				}
+			}
+		],
+		"Success1": [
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
+					"myNewField": 1,
+					"originalName": "Edmund Pevensie"
+				},
+				"pairedItem": {
+					"item": 0
+				}
+			},
+			{
+				"json": {
+					"id": "23423535",
+					"name": "Zaphod Beeblebrox",
+					"email": "captain@heartofgold.com",
+					"notes": "Felt like I was talking to more than one person",
+					"country": null,
+					"created": "1979-10-12",
+					"myNewField": 1,
+					"originalName": "Zaphod Beeblebrox"
+				},
+				"pairedItem": {
+					"item": 1
+				}
+			},
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
+					"myNewField": 1,
+					"originalName": "José Arcadio Buendía"
+				},
+				"pairedItem": {
+					"item": 2
+				}
+			}
+		],
+		"Error1": [
+			{
+				"json": {
+					"id": "23423534",
+					"name": "Max Sendak",
+					"email": "info@in-and-out-of-weeks.org",
+					"notes": "Keeps rolling his terrible eyes",
+					"country": "US",
+					"created": "1963-04-09",
+					"error": "This is an error [line 5, for item 2]",
+					"originalName": "Max Sendak"
+				},
+				"pairedItem": {
+					"item": 0
+				}
+			},
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"error": "This is an error [line 5, for item 0]",
+					"originalName": "Jay Gatsby"
+				},
+				"pairedItem": {
+					"item": 1
+				}
+			}
+		],
+		"Success2": [
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"error": "This is an error [line 5, for item 0]",
+					"originalName": "Jay Gatsby"
+				},
+				"pairedItem": {
+					"item": 0
+				}
+			},
+			{
+				"json": {
+					"id": "23423534",
+					"name": "Max Sendak",
+					"email": "info@in-and-out-of-weeks.org",
+					"notes": "Keeps rolling his terrible eyes",
+					"country": "US",
+					"created": "1963-04-09",
+					"error": "This is an error [line 5, for item 2]",
+					"originalName": "Max Sendak"
+				},
+				"pairedItem": {
+					"item": 1
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Mock Data",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Mock Data": {
+			"main": [
+				[
+					{
+						"node": "Throw Error",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Throw Error2",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Throw Error1",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Throw Error3",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Throw Error": {
+			"main": [
+				[
+					{
+						"node": "Success",
+						"type": "main",
+						"index": 0
+					}
+				],
+				[
+					{
+						"node": "Error",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Throw Error2": {
+			"main": [
+				[
+					{
+						"node": "Combined1",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Throw Error1": {
+			"main": [
+				[
+					{
+						"node": "Combined",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Throw Error3": {
+			"main": [
+				[
+					{
+						"node": "Success1",
+						"type": "main",
+						"index": 0
+					}
+				],
+				[
+					{
+						"node": "Error1",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Edit Fields": {
+			"main": [
+				[
+					{
+						"node": "Success2",
+						"type": "main",
+						"index": 0
+					}
+				],
+				[
+					{
+						"node": "Error2",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Error1": {
+			"main": [
+				[
+					{
+						"node": "Edit Fields",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "e73e1eda-293c-4ee2-87b9-923873241774",
+	"id": "UgoluWRMeg7fPLCB",
+	"meta": {
+		"instanceId": "021d3c82ba2d3bc090cbf4fc81c9312668bcc34297e022bb3438c5c88a43a5ff"
+	},
+	"tags": []
+}
diff --git a/packages/core/test/workflows/paired_items_fix.json b/packages/core/test/workflows/paired_items_fix.json
new file mode 100644
index 0000000000000..dbd036f70cd9b
--- /dev/null
+++ b/packages/core/test/workflows/paired_items_fix.json
@@ -0,0 +1,565 @@
+{
+	"name": "paired items fix",
+	"nodes": [
+		{
+			"parameters": {
+				"values": {
+					"string": [
+						{
+							"name": "setting",
+							"value": "hello"
+						}
+					]
+				},
+				"options": {}
+			},
+			"name": "Set",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 1,
+			"position": [500, 680],
+			"id": "18333790-db22-4235-92e6-b7dec8c20b77"
+		},
+		{
+			"parameters": {
+				"conditions": {
+					"boolean": [
+						{
+							"value1": true
+						}
+					]
+				}
+			},
+			"id": "4d4af5e5-860d-416f-b2d7-f0f87f380355",
+			"name": "IF",
+			"type": "n8n-nodes-base.if",
+			"typeVersion": 1,
+			"position": [1080, 500],
+			"alwaysOutputData": true
+		},
+		{
+			"parameters": {
+				"values": {
+					"string": [
+						{
+							"value": "={{ $('Set').item.json }}"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "26569caf-084d-4d5b-a575-c8e439358d10",
+			"name": "Set1",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 2,
+			"position": [1340, 480]
+		},
+		{
+			"parameters": {},
+			"id": "f4f91c8c-e695-422b-97ad-802b10c7d868",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [200, 980]
+		},
+		{
+			"parameters": {
+				"jsCode": "return [\n  {\n    'thing': 1,\n    'letter': 'a'\n  },\n  {\n    'thing': 2,\n    'letter': 'b'\n  },\n  {\n    'thing': 3,\n    'letter': 'c'\n  }\n]"
+			},
+			"id": "5eb81a1f-b845-408a-9fcc-e75e607212fa",
+			"name": "Code",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [840, 500]
+		},
+		{
+			"parameters": {
+				"functionCode": "return [\n  {\n    'number': 1,\n    'letter': 'a'\n  },\n  {\n    'number': 2,\n    'letter': 'b'\n  },\n  {\n    'number': 3,\n    'letter': 'c'\n  }\n]"
+			},
+			"name": "Generate new items",
+			"type": "n8n-nodes-base.function",
+			"typeVersion": 1,
+			"position": [840, 860],
+			"id": "dd5d92f2-5893-4591-9f22-051f50e1b348"
+		},
+		{
+			"parameters": {
+				"values": {
+					"number": [
+						{
+							"name": "numberOriginal",
+							"value": "={{ $('Generate new items').item.json.number }}"
+						}
+					],
+					"string": [
+						{
+							"name": "letterOriginal",
+							"value": "={{ $('Generate new items').item.json.letter }}"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "ebb23410-831b-4f8f-834a-0ca22eb7c050",
+			"name": "Set3",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 2,
+			"position": [1320, 860]
+		},
+		{
+			"parameters": {
+				"functionCode": "return [\n  {\n    'json': {\n      'originalItem': 'third'\n    },\n    'pairedItem': 2\n  },\n  {\n    'json': {\n      'originalItem': 'first'\n    },\n    'pairedItem': 0\n  },\n  {\n    'json': {\n      'originalItem': 'second'\n    },\n    'pairedItem': 1\n  }\n]"
+			},
+			"name": "Mix up pairing",
+			"type": "n8n-nodes-base.function",
+			"typeVersion": 1,
+			"position": [1080, 860],
+			"id": "33ee2a0e-edc9-4197-94a2-4f77735240ff"
+		},
+		{
+			"parameters": {
+				"content": "### Always output data & multiple possible output resolve which are identical",
+				"height": 258,
+				"width": 855
+			},
+			"id": "3dc9ccfa-ef78-4022-8bbc-45ef8eb3a207",
+			"name": "Sticky Note1",
+			"type": "n8n-nodes-base.stickyNote",
+			"typeVersion": 1,
+			"position": [780, 400]
+		},
+		{
+			"parameters": {
+				"operation": "getAllPeople"
+			},
+			"id": "5ba8d43b-9fa3-4ba0-9c08-3199a9d2d602",
+			"name": "cuctomers",
+			"type": "n8n-nodes-base.n8nTrainingCustomerDatastore",
+			"typeVersion": 1,
+			"position": [640, 1340]
+		},
+		{
+			"parameters": {
+				"options": {}
+			},
+			"id": "00114764-691d-40b4-ae11-c5206a9448e3",
+			"name": "result",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 2,
+			"position": [1380, 1180],
+			"alwaysOutputData": true
+		},
+		{
+			"parameters": {
+				"jsCode": "// Loop over input items and add a new field called 'myNewField' to the JSON of each one\nconst data = [];\nfor (const [index, entry] of $input.all().entries()) {\n  entry.json.myNewField = index;\n  entry.pairedItem = 0;\n  data.push(entry);\n}\n\nreturn data;"
+			},
+			"id": "d3aa3bc3-3e5a-42d2-a26d-ea0c273ea3e8",
+			"name": "changePairedindex",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [920, 1180]
+		},
+		{
+			"parameters": {
+				"keepOnlySet": true,
+				"values": {
+					"string": [
+						{
+							"name": "=nameOriginalItem",
+							"value": "={{ $('cuctomers').item.json.name }}"
+						},
+						{
+							"name": "name",
+							"value": "={{ $json.name }}"
+						}
+					],
+					"boolean": [
+						{
+							"name": "test",
+							"value": "={{ $('cuctomers').item.json.id === $json.id  }}"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "af18482d-4a88-4ffb-b6e3-67be45cdfad1",
+			"name": "checkWithOriginal",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 2,
+			"position": [1140, 1180]
+		},
+		{
+			"parameters": {
+				"options": {}
+			},
+			"id": "3bad8f81-2fac-4e6e-bb7c-3a4921674005",
+			"name": "loop",
+			"type": "n8n-nodes-base.splitInBatches",
+			"typeVersion": 2,
+			"position": [920, 1420]
+		},
+		{
+			"parameters": {
+				"keepOnlySet": true,
+				"values": {
+					"string": [
+						{
+							"name": "=nameOriginalItem",
+							"value": "={{ $('cuctomers').item.json.name }}"
+						},
+						{
+							"name": "name",
+							"value": "={{ $json.name }}"
+						}
+					],
+					"boolean": [
+						{
+							"name": "test",
+							"value": "={{ $('cuctomers').item.json.id === $json.id  }}"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "865691b7-e4b8-487e-a5ec-80387118ea61",
+			"name": "testAfterLoop",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 2,
+			"position": [1180, 1620]
+		},
+		{
+			"parameters": {
+				"options": {}
+			},
+			"id": "8c5d3a1c-e34b-4937-bc22-88b418391002",
+			"name": "result1",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 2,
+			"position": [1380, 1620],
+			"alwaysOutputData": true
+		},
+		{
+			"parameters": {
+				"jsCode": "// Loop over input items and add a new field called 'myNewField' to the JSON of each one\nconst data = [];\nfor (const [index, entry] of $input.all().entries()) {\n  entry.json.myNewField = index;\n  entry.pairedItem = 0;\n  data.push(entry);\n}\n\nreturn data;"
+			},
+			"id": "ad476a3a-d491-406f-903d-022cb0f0ef3c",
+			"name": "changePairedindex1",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [1380, 1400]
+		}
+	],
+	"pinData": {
+		"Set3": [
+			{
+				"json": {
+					"originalItem": "third",
+					"numberOriginal": 3,
+					"letterOriginal": "c"
+				},
+				"pairedItem": {
+					"item": 0
+				}
+			},
+			{
+				"json": {
+					"originalItem": "first",
+					"numberOriginal": 1,
+					"letterOriginal": "a"
+				},
+				"pairedItem": {
+					"item": 1
+				}
+			},
+			{
+				"json": {
+					"originalItem": "second",
+					"numberOriginal": 2,
+					"letterOriginal": "b"
+				},
+				"pairedItem": {
+					"item": 2
+				}
+			}
+		],
+		"Set1": [
+			{
+				"json": {
+					"propertyName": {
+						"setting": "hello"
+					}
+				},
+				"pairedItem": {
+					"item": 0
+				}
+			}
+		],
+		"result": [
+			{
+				"json": {
+					"test": true,
+					"nameOriginalItem": "Jay Gatsby",
+					"name": "Jay Gatsby"
+				},
+				"pairedItem": {
+					"item": 0
+				}
+			},
+			{
+				"json": {
+					"test": false,
+					"nameOriginalItem": "Jay Gatsby",
+					"name": "José Arcadio Buendía"
+				},
+				"pairedItem": {
+					"item": 1
+				}
+			},
+			{
+				"json": {
+					"test": false,
+					"nameOriginalItem": "Jay Gatsby",
+					"name": "Max Sendak"
+				},
+				"pairedItem": {
+					"item": 2
+				}
+			},
+			{
+				"json": {
+					"test": false,
+					"nameOriginalItem": "Jay Gatsby",
+					"name": "Zaphod Beeblebrox"
+				},
+				"pairedItem": {
+					"item": 3
+				}
+			},
+			{
+				"json": {
+					"test": false,
+					"nameOriginalItem": "Jay Gatsby",
+					"name": "Edmund Pevensie"
+				},
+				"pairedItem": {
+					"item": 4
+				}
+			}
+		],
+		"result1": [
+			{
+				"json": {
+					"test": true,
+					"nameOriginalItem": "Jay Gatsby",
+					"name": "Jay Gatsby"
+				},
+				"pairedItem": {
+					"item": 0
+				}
+			},
+			{
+				"json": {
+					"test": false,
+					"nameOriginalItem": "Jay Gatsby",
+					"name": "José Arcadio Buendía"
+				},
+				"pairedItem": {
+					"item": 1
+				}
+			},
+			{
+				"json": {
+					"test": false,
+					"nameOriginalItem": "Jay Gatsby",
+					"name": "Max Sendak"
+				},
+				"pairedItem": {
+					"item": 2
+				}
+			},
+			{
+				"json": {
+					"test": false,
+					"nameOriginalItem": "Jay Gatsby",
+					"name": "Zaphod Beeblebrox"
+				},
+				"pairedItem": {
+					"item": 3
+				}
+			},
+			{
+				"json": {
+					"test": false,
+					"nameOriginalItem": "Jay Gatsby",
+					"name": "Edmund Pevensie"
+				},
+				"pairedItem": {
+					"item": 4
+				}
+			}
+		]
+	},
+	"connections": {
+		"Set": {
+			"main": [
+				[
+					{
+						"node": "Code",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Generate new items",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"IF": {
+			"main": [
+				[
+					{
+						"node": "Set1",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Set",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "cuctomers",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code": {
+			"main": [
+				[
+					{
+						"node": "IF",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Generate new items": {
+			"main": [
+				[
+					{
+						"node": "Mix up pairing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Mix up pairing": {
+			"main": [
+				[
+					{
+						"node": "Set3",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"cuctomers": {
+			"main": [
+				[
+					{
+						"node": "changePairedindex",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "loop",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"changePairedindex": {
+			"main": [
+				[
+					{
+						"node": "checkWithOriginal",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"checkWithOriginal": {
+			"main": [
+				[
+					{
+						"node": "result",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"loop": {
+			"main": [
+				[
+					{
+						"node": "changePairedindex1",
+						"type": "main",
+						"index": 0
+					}
+				],
+				[
+					{
+						"node": "testAfterLoop",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"testAfterLoop": {
+			"main": [
+				[
+					{
+						"node": "result1",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"changePairedindex1": {
+			"main": [
+				[
+					{
+						"node": "loop",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {},
+	"versionId": "6f6ee01c-8c99-493f-a30c-6a5ed2b71750",
+	"id": "169",
+	"meta": {
+		"instanceId": "36203ea1ce3cef713fa25999bd9874ae26b9e4c2c3a90a365f2882a154d031d0"
+	},
+	"tags": []
+}
diff --git a/packages/core/tsconfig.build.json b/packages/core/tsconfig.build.json
index c8f44354c7ac4..1e8a2ff7fa476 100644
--- a/packages/core/tsconfig.build.json
+++ b/packages/core/tsconfig.build.json
@@ -1,10 +1,8 @@
 {
-	"extends": "./tsconfig.json",
+	"extends": ["./tsconfig.json", "../../tsconfig.build.json"],
 	"compilerOptions": {
 		"rootDir": "src",
 		"outDir": "dist",
-		"types": ["node"],
-		"noEmit": false,
 		"tsBuildInfoFile": "dist/build.tsbuildinfo"
 	},
 	"include": ["src/**/*.ts"],
diff --git a/packages/core/tsconfig.json b/packages/core/tsconfig.json
index 69536da44842a..cf60622e2be38 100644
--- a/packages/core/tsconfig.json
+++ b/packages/core/tsconfig.json
@@ -1,18 +1,21 @@
 {
-	"extends": "../../tsconfig.json",
+	"extends": ["../../tsconfig.json", "../../tsconfig.backend.json"],
 	"compilerOptions": {
 		"rootDir": ".",
-		"types": ["node", "jest"],
 		"composite": true,
-		"noEmit": true,
 		"baseUrl": "src",
 		"paths": {
 			"@/*": ["./*"]
 		},
 		"tsBuildInfoFile": "dist/typecheck.tsbuildinfo",
+		"emitDecoratorMetadata": true,
+		"experimentalDecorators": true,
 		// TODO: remove all options below this line
 		"useUnknownInCatchVariables": false
 	},
 	"include": ["src/**/*.ts", "test/**/*.ts"],
-	"references": [{ "path": "../workflow/tsconfig.build.json" }]
+	"references": [
+		{ "path": "../workflow/tsconfig.build.json" },
+		{ "path": "../@n8n/client-oauth2/tsconfig.build.json" }
+	]
 }
diff --git a/packages/design-system/.eslintrc.js b/packages/design-system/.eslintrc.js
index 4b59d8f40c799..58705ee8c6c35 100644
--- a/packages/design-system/.eslintrc.js
+++ b/packages/design-system/.eslintrc.js
@@ -1,4 +1,4 @@
-const { sharedOptions } = require('@n8n_io/eslint-config/shared');
+const sharedOptions = require('@n8n_io/eslint-config/shared');
 
 /**
  * @type {import('@types/eslint').ESLint.ConfigData}
@@ -10,22 +10,16 @@ module.exports = {
 
 	rules: {
 		// TODO: Remove these
-		'import/no-default-export': 'off',
+		'import/no-default-export': 'warn',
 		'import/order': 'off',
 		'@typescript-eslint/no-unsafe-argument': 'warn',
 		'@typescript-eslint/no-unsafe-return': 'warn',
 		'@typescript-eslint/no-unsafe-member-access': 'warn',
-		'@typescript-eslint/prefer-optional-chain': 'off',
-		'@typescript-eslint/prefer-nullish-coalescing': 'off',
+		'@typescript-eslint/prefer-optional-chain': 'warn',
+		'@typescript-eslint/prefer-nullish-coalescing': 'warn',
 	},
 
 	overrides: [
-		{
-			files: ['src/**/*.stories.ts'],
-			rules: {
-				'import/no-extraneous-dependencies': ['error', { devDependencies: true }],
-			},
-		},
 		{
 			files: ['src/**/*.stories.ts', 'src/**/*.vue', 'src/**/*.spec.ts'],
 			rules: {
diff --git a/packages/design-system/.npmignore b/packages/design-system/.npmignore
index ed7f9d2480d4b..6058e08e6e6d7 100644
--- a/packages/design-system/.npmignore
+++ b/packages/design-system/.npmignore
@@ -6,10 +6,8 @@ storybook-static
 .storybook
 
 .browserslistrc
-gulpfile.js
 jest.config.js
 vite.config.ts
 
 *.md
 *.stories.js
-*.mdx
diff --git a/packages/design-system/.storybook/font-awesome-icons.js b/packages/design-system/.storybook/font-awesome-icons.js
deleted file mode 100644
index 8713b3b6613f6..0000000000000
--- a/packages/design-system/.storybook/font-awesome-icons.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * These icons are only defined for storybook build
- * Editor icons are defined seperately
- */
-import { library } from '@fortawesome/fontawesome-svg-core';
-import { fas } from '@fortawesome/free-solid-svg-icons';
-
-library.add(fas);
diff --git a/packages/design-system/.storybook/main.js b/packages/design-system/.storybook/main.js
deleted file mode 100644
index 2a72dca1e6e55..0000000000000
--- a/packages/design-system/.storybook/main.js
+++ /dev/null
@@ -1,60 +0,0 @@
-const path = require('path');
-
-/**
- * @type {import('@storybook/types').StorybookConfig}
- */
-module.exports = {
-	framework: {
-		name: '@storybook/vue-webpack5',
-		options: {},
-	},
-	stories: ['../src/**/*.stories.mdx', '../src/**/*.stories.{ts,js}'],
-	addons: [
-		'@storybook/addon-links',
-		'@storybook/addon-essentials',
-		{
-			name: '@storybook/addon-postcss',
-			options: {
-				postcssLoaderOptions: {
-					implementation: require('postcss'),
-				},
-			},
-		},
-		'storybook-addon-designs',
-		'storybook-addon-themes',
-	],
-	webpackFinal: async (config) => {
-		config.module.rules.push({
-			test: /\.scss$/,
-			oneOf: [
-				{
-					resourceQuery: /module/,
-					use: [
-						'vue-style-loader',
-						{
-							loader: 'css-loader',
-							options: {
-								modules: {
-									localIdentName: '[path][name]__[local]--[hash:base64:5]',
-								},
-							},
-						},
-						'sass-loader',
-					],
-					include: path.resolve(__dirname, '../'),
-				},
-				{
-					use: ['vue-style-loader', 'css-loader', 'sass-loader'],
-					include: path.resolve(__dirname, '../'),
-				},
-			],
-		});
-
-		config.resolve.alias = {
-			...config.resolve.alias,
-			'@/': path.resolve(__dirname, '../src/'),
-		};
-
-		return config;
-	},
-};
diff --git a/packages/design-system/.storybook/main.ts b/packages/design-system/.storybook/main.ts
new file mode 100644
index 0000000000000..050580e248393
--- /dev/null
+++ b/packages/design-system/.storybook/main.ts
@@ -0,0 +1,4 @@
+import { sharedConfig } from '@n8n/storybook/main';
+
+const config = { ...sharedConfig, staticDirs: ['../public'] };
+export default config;
diff --git a/packages/design-system/.storybook/preview.js b/packages/design-system/.storybook/preview.js
index be5e60d537fef..2e057df316608 100644
--- a/packages/design-system/.storybook/preview.js
+++ b/packages/design-system/.storybook/preview.js
@@ -1,28 +1,26 @@
-import './font-awesome-icons';
+import { setup } from '@storybook/vue3';
+
 import './storybook.scss';
 
-import ElementUI from 'element-ui';
-import lang from 'element-ui/lib/locale/lang/en';
-import locale from 'element-ui/lib/locale';
+import { library } from '@fortawesome/fontawesome-svg-core';
+import { fas } from '@fortawesome/free-solid-svg-icons';
 
-import designSystemComponents from '../src/plugins/n8nComponents';
+import ElementPlus from 'element-plus';
+import lang from 'element-plus/lib/locale/lang/en';
 
-import Vue from 'vue';
+import { N8nPlugin } from '../src/plugin';
 
-Vue.use(ElementUI);
-Vue.use(designSystemComponents);
+setup((app) => {
+	library.add(fas);
 
-locale.use(lang);
+	app.use(ElementPlus, {
+		locale: lang,
+	});
 
-// https://github.com/storybookjs/storybook/issues/6153
-Vue.prototype.toJSON = function () {
-	return this;
-};
+	app.use(N8nPlugin);
+});
 
 export const parameters = {
-	actions: {
-		argTypesRegex: '^on[A-Z].*',
-	},
 	controls: {
 		matchers: {
 			color: /(background|color)$/i,
@@ -44,10 +42,6 @@ export const parameters = {
 				name: '--color-background-light',
 				value: 'var(--color-background-light)',
 			},
-			{
-				name: '--color-background-lighter',
-				value: 'var(--color-background-lighter)',
-			},
 			{
 				name: '--color-background-xlight',
 				value: 'var(--color-background-xlight)',
@@ -58,14 +52,14 @@ export const parameters = {
 		list: [
 			{
 				name: 'dark',
-				class: 'theme-dark',
+				class: 'theme-dark-beta',
 				color: '#000',
 			},
 		],
 	},
 	options: {
 		storySort: {
-			order: ['Docs', 'Styleguide', 'Atoms', 'Modules'],
+			order: ['Docs', 'Styleguide', ['Colors Primitives', 'Colors Tokens', 'Font', 'Spacing', 'Border'], 'Atoms', 'Modules'],
 		},
 	},
 };
diff --git a/packages/design-system/.storybook/storybook.scss b/packages/design-system/.storybook/storybook.scss
index 125f7d57a871b..86a675f90cff2 100644
--- a/packages/design-system/.storybook/storybook.scss
+++ b/packages/design-system/.storybook/storybook.scss
@@ -1,12 +1,17 @@
 @use './fonts.scss';
 
-@use '~/src/css/base.scss' with (
-	$font-path: '~element-ui/lib/theme-chalk/fonts'
-);
+@use '../src/css/base.scss'; // @TODO CHECK IF NEEDED with (
+//	$font-path: 'element-ui/lib/theme-chalk/fonts'
+//);
 
-@use '~/src/css/reset.scss';
-@use '~/src/css/index.scss';
+@use '../src/css/reset.scss';
+@use '../src/css/index.scss';
 
 .multi-container > * {
 	margin-bottom: 10px;
 }
+
+#storybook-root > div:not([class]) > *,
+#storybook-root > * {
+	margin: var(--spacing-5xs);
+}
diff --git a/packages/design-system/LICENSE.md b/packages/design-system/LICENSE.md
index c1d74239754fd..aab68b6d9301b 100644
--- a/packages/design-system/LICENSE.md
+++ b/packages/design-system/LICENSE.md
@@ -3,8 +3,9 @@
 Portions of this software are licensed as follows:
 
 - Content of branches other than the main branch (i.e. "master") are not licensed.
-- All source code files that contain ".ee." in their filename are licensed under the
-  "n8n Enterprise License" defined in "LICENSE_EE.md".
+- Source code files that contain ".ee." in their filename are NOT licensed under the Sustainable Use License.
+  To use source code files that contain ".ee." in their filename you must hold a valid n8n Enterprise License
+  specifically allowing you access to such source code files and as defined in "LICENSE_EE.md".
 - All third party components incorporated into the n8n Software are licensed under the original license
   provided by the owner of the applicable component.
 - Content outside of the above mentioned files or restrictions is available under the "Sustainable Use
diff --git a/packages/design-system/README.md b/packages/design-system/README.md
index 7bc578ba6819c..ea69f24524a5b 100644
--- a/packages/design-system/README.md
+++ b/packages/design-system/README.md
@@ -48,7 +48,7 @@ pnpm watch:theme
 
 ## License
 
-n8n is [fair-code](http://faircode.io) distributed under the [**Sustainable Use License**](https://github.com/n8n-io/n8n/blob/master/packages/cli/LICENSE.md).
+n8n is [fair-code](https://faircode.io) distributed under the [**Sustainable Use License**](https://github.com/n8n-io/n8n/blob/master/packages/cli/LICENSE.md).
 
 Proprietary licenses are available for enterprise customers. [Get in touch](mailto:license@n8n.io)
 
diff --git a/packages/design-system/chromatic.config.json b/packages/design-system/chromatic.config.json
new file mode 100644
index 0000000000000..ce95f3e2fb10b
--- /dev/null
+++ b/packages/design-system/chromatic.config.json
@@ -0,0 +1,4 @@
+{
+  "projectId": "Project:65f085d72c13e4e1154414db",
+  "buildScriptName": "build:storybook"
+}
diff --git a/packages/design-system/package.json b/packages/design-system/package.json
index f0e29389e26cd..a2ddb8ab00e97 100644
--- a/packages/design-system/package.json
+++ b/packages/design-system/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-design-system",
-  "version": "0.62.0",
+  "version": "1.31.0",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",
   "author": {
@@ -14,77 +14,53 @@
     "url": "git+https://github.com/n8n-io/n8n.git"
   },
   "scripts": {
+    "dev": "pnpm run storybook",
     "clean": "rimraf dist .turbo",
     "build": "vite build",
-    "typecheck": "vue-tsc --declaration --emitDeclarationOnly",
-    "test": "vitest run --coverage",
+    "typecheck": "vue-tsc --noEmit",
+    "test": "vitest run",
     "test:dev": "vitest",
     "build:storybook": "storybook build",
     "storybook": "storybook dev -p 6006",
+    "chromatic": "chromatic",
     "format": "prettier --write . --ignore-path ../../.prettierignore",
-    "lint": "eslint --quiet --ext .js,.ts,.vue src",
-    "lintfix": "eslint --ext .js,.ts,.vue src --fix"
-  },
-  "peerDependencies": {
-    "@fortawesome/fontawesome-svg-core": "1.x",
-    "@fortawesome/free-solid-svg-icons": "5.x",
-    "@fortawesome/vue-fontawesome": "2.x",
-    "core-js": "3.x",
-    "markdown-it": "^12.3.2",
-    "markdown-it-emoji": "^2.0.0",
-    "markdown-it-link-attributes": "^4.0.0",
-    "markdown-it-task-lists": "^2.1.1",
-    "vue": "^2.7.14",
-    "vue-typed-mixins": "^0.2.0",
-    "xss": "^1.0.10"
+    "lint": "eslint src --ext .js,.ts,.vue --quiet",
+    "lintfix": "eslint src --ext .js,.ts,.vue --fix"
   },
   "devDependencies": {
-    "@fortawesome/fontawesome-svg-core": "^1.2.36",
-    "@fortawesome/free-solid-svg-icons": "^5.15.4",
-    "@fortawesome/vue-fontawesome": "^2.0.9",
-    "@storybook/addon-actions": "^7.0.0-beta.46",
-    "@storybook/addon-essentials": "^7.0.0-beta.46",
-    "@storybook/addon-links": "^7.0.0-beta.46",
-    "@storybook/addon-postcss": "^3.0.0-alpha.1",
-    "@storybook/vue": "^7.0.0-beta.46",
-    "@storybook/vue-webpack5": "^7.0.0-beta.46",
-    "@testing-library/jest-dom": "^5.16.5",
-    "@testing-library/vue": "^5.8.3",
+    "@n8n/storybook": "workspace:*",
+    "@testing-library/jest-dom": "^6.1.5",
+    "@testing-library/user-event": "^14.5.1",
+    "@testing-library/vue": "^8.0.1",
+    "@tsconfig/node18": "^18.2.2",
+    "@types/jsdom": "^21.1.6",
     "@types/markdown-it": "^12.2.3",
     "@types/markdown-it-emoji": "^2.0.2",
     "@types/markdown-it-link-attributes": "^3.0.1",
-    "@types/sanitize-html": "^2.8.0",
-    "@vitest/coverage-c8": "^0.28.5",
-    "@vitejs/plugin-vue2": "^2.2.0",
-    "autoprefixer": "^10.4.13",
-    "c8": "7.12.0",
-    "core-js": "^3.27.2",
-    "jsdom": "21.1.0",
-    "node-notifier": "^10.0.1",
-    "sass": "^1.58.0",
-    "sass-loader": "^13.2.0",
-    "storybook": "^7.0.0-beta.46",
-    "storybook-addon-designs": "^6.3.1",
-    "storybook-addon-themes": "^6.1.0",
-    "trim": "^1.0.1",
-    "vite": "^4.0.4",
-    "vitest": "^0.28.5",
-    "vue-class-component": "^7.2.6",
-    "vue-loader": "^15.10.1",
-    "vue-property-decorator": "^9.1.2",
-    "vue-template-compiler": "^2.7.14",
-    "vue-tsc": "^1.0.24"
+    "@types/sanitize-html": "^2.11.0",
+    "@vitejs/plugin-vue": "^5.0.4",
+    "@vue/test-utils": "^2.4.3",
+    "@vue/tsconfig": "^0.5.1",
+    "autoprefixer": "^10.4.14",
+    "core-js": "^3.31.0",
+    "jsdom": "^23.0.1",
+    "sass": "^1.64.1",
+    "sass-loader": "^13.3.2"
   },
   "dependencies": {
-    "element-ui": "~2.15.12",
+    "@fortawesome/fontawesome-svg-core": "^1.2.36",
+    "@fortawesome/free-regular-svg-icons": "^6.1.1",
+    "@fortawesome/free-solid-svg-icons": "^5.15.4",
+    "@fortawesome/vue-fontawesome": "^3.0.3",
+    "element-plus": "^2.3.6",
     "markdown-it": "^13.0.1",
     "markdown-it-emoji": "^2.0.2",
     "markdown-it-link-attributes": "^4.0.1",
     "markdown-it-task-lists": "^2.1.1",
-    "sanitize-html": "2.10.0",
-    "vue": "^2.7.14",
-    "vue-typed-mixins": "^0.2.0",
-    "vue2-boring-avatars": "^0.3.8",
+    "sanitize-html": "2.12.1",
+    "vue": "^3.4.21",
+    "vue-boring-avatars": "^1.3.0",
+    "vue-router": "^4.2.2",
     "xss": "^1.0.14"
   }
 }
diff --git a/packages/design-system/public/.nojekyll b/packages/design-system/public/.nojekyll
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/packages/design-system/public/assets/images/storybook-logo-dark.png b/packages/design-system/public/assets/images/storybook-logo-dark.png
new file mode 100644
index 0000000000000..fa5e878f0b6ed
Binary files /dev/null and b/packages/design-system/public/assets/images/storybook-logo-dark.png differ
diff --git a/packages/design-system/public/assets/images/storybook-logo-light.png b/packages/design-system/public/assets/images/storybook-logo-light.png
new file mode 100644
index 0000000000000..3a99ee7e71fdd
Binary files /dev/null and b/packages/design-system/public/assets/images/storybook-logo-light.png differ
diff --git a/packages/design-system/src/__tests__/setup.ts b/packages/design-system/src/__tests__/setup.ts
index 7b0828bfa80fb..1734bac34f9f6 100644
--- a/packages/design-system/src/__tests__/setup.ts
+++ b/packages/design-system/src/__tests__/setup.ts
@@ -1 +1,5 @@
 import '@testing-library/jest-dom';
+import { config } from '@vue/test-utils';
+import { N8nPlugin } from '@/plugin';
+
+config.global.plugins = [N8nPlugin];
diff --git a/packages/design-system/src/components/ConditionalRouterLink/CondtionalRouterLink.vue b/packages/design-system/src/components/ConditionalRouterLink/CondtionalRouterLink.vue
new file mode 100644
index 0000000000000..d479bd539616e
--- /dev/null
+++ b/packages/design-system/src/components/ConditionalRouterLink/CondtionalRouterLink.vue
@@ -0,0 +1,39 @@
+<script setup lang="ts">
+/**
+ * Component that renders either a RouterLink or a normal anchor tag or
+ * just the slot content based on whether the `to` or `href` prop is
+ * passed or not.
+ */
+import { useAttrs } from 'vue';
+import type { RouterLinkProps } from 'vue-router';
+import { RouterLink } from 'vue-router';
+
+defineOptions({
+	name: 'ConditionalRouterLink',
+	inheritAttrs: false,
+});
+
+const props = defineProps({
+	// @ts-expect-error TS doesn't understand this but it works
+	...RouterLink.props,
+	// Make to optional
+	to: {
+		type: [String, Object] as unknown as () => string | RouterLinkProps['to'] | undefined,
+		default: undefined,
+	},
+	// <a> element "props" are passed as attributes
+}) as Partial<RouterLinkProps>;
+const attrs = useAttrs();
+</script>
+
+<template>
+	<div>
+		<RouterLink v-if="props.to" v-bind="props" :to="props.to">
+			<slot />
+		</RouterLink>
+		<a v-else-if="attrs.href" v-bind="attrs">
+			<slot />
+		</a>
+		<slot v-else />
+	</div>
+</template>
diff --git a/packages/design-system/src/components/ConditionalRouterLink/__tests__/ConditionalRouterLink.spec.ts b/packages/design-system/src/components/ConditionalRouterLink/__tests__/ConditionalRouterLink.spec.ts
new file mode 100644
index 0000000000000..853e06f8a97eb
--- /dev/null
+++ b/packages/design-system/src/components/ConditionalRouterLink/__tests__/ConditionalRouterLink.spec.ts
@@ -0,0 +1,67 @@
+import { render } from '@testing-library/vue';
+import { beforeAll, describe } from 'vitest';
+import { createRouter, createWebHistory } from 'vue-router';
+import CondtionalRouterLink from '../CondtionalRouterLink.vue';
+
+const slots = {
+	default: 'Button',
+};
+
+const router = createRouter({
+	history: createWebHistory(),
+	routes: [
+		{
+			path: '/',
+			name: 'home',
+			redirect: '/home',
+		},
+	],
+});
+
+describe('CondtionalRouterLink', () => {
+	beforeAll(async () => {
+		await router.push('/');
+
+		await router.isReady();
+	});
+
+	it("renders router-link when 'to' prop is passed", () => {
+		const wrapper = render(CondtionalRouterLink, {
+			props: {
+				to: { name: 'home' },
+			},
+			slots,
+			global: {
+				plugins: [router],
+			},
+		});
+
+		expect(wrapper.html()).toMatchSnapshot();
+	});
+
+	it("renders <a> when 'href' attr is passed", () => {
+		const wrapper = render(CondtionalRouterLink, {
+			attrs: {
+				href: 'https://n8n.io',
+				target: '_blank',
+			},
+			slots,
+			global: {
+				plugins: [router],
+			},
+		});
+
+		expect(wrapper.html()).toMatchSnapshot();
+	});
+
+	it('renders only the slot when neither to nor href is given', () => {
+		const wrapper = render(CondtionalRouterLink, {
+			slots,
+			global: {
+				plugins: [router],
+			},
+		});
+
+		expect(wrapper.html()).toMatchSnapshot();
+	});
+});
diff --git a/packages/design-system/src/components/ConditionalRouterLink/__tests__/__snapshots__/ConditionalRouterLink.spec.ts.snap b/packages/design-system/src/components/ConditionalRouterLink/__tests__/__snapshots__/ConditionalRouterLink.spec.ts.snap
new file mode 100644
index 0000000000000..c316667540a6c
--- /dev/null
+++ b/packages/design-system/src/components/ConditionalRouterLink/__tests__/__snapshots__/ConditionalRouterLink.spec.ts.snap
@@ -0,0 +1,7 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`CondtionalRouterLink > renders <a> when 'href' attr is passed 1`] = `"<div><a href="https://n8n.io" target="_blank">Button</a></div>"`;
+
+exports[`CondtionalRouterLink > renders only the slot when neither to nor href is given 1`] = `"<div>Button</div>"`;
+
+exports[`CondtionalRouterLink > renders router-link when 'to' prop is passed 1`] = `"<div><a href="/" class="">Button</a></div>"`;
diff --git a/packages/design-system/src/components/ConditionalRouterLink/index.ts b/packages/design-system/src/components/ConditionalRouterLink/index.ts
new file mode 100644
index 0000000000000..4b8b5b65adb8e
--- /dev/null
+++ b/packages/design-system/src/components/ConditionalRouterLink/index.ts
@@ -0,0 +1,3 @@
+import CondtionalRouterLink from './CondtionalRouterLink.vue';
+
+export default CondtionalRouterLink;
diff --git a/packages/design-system/src/components/N8nActionBox/ActionBox.stories.ts b/packages/design-system/src/components/N8nActionBox/ActionBox.stories.ts
index dfc6d27cf74fe..b8d90ca151297 100644
--- a/packages/design-system/src/components/N8nActionBox/ActionBox.stories.ts
+++ b/packages/design-system/src/components/N8nActionBox/ActionBox.stories.ts
@@ -1,6 +1,6 @@
 import N8nActionBox from './ActionBox.vue';
 import { action } from '@storybook/addon-actions';
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 
 export default {
 	title: 'Atoms/ActionBox',
@@ -9,8 +9,8 @@ export default {
 		calloutTheme: {
 			control: {
 				type: 'select',
-				options: ['info', 'success', 'warning', 'danger', 'custom'],
 			},
+			options: ['info', 'success', 'warning', 'danger', 'custom'],
 		},
 	},
 	parameters: {
@@ -23,11 +23,12 @@ const methods = {
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nActionBox,
 	},
-	template: '<n8n-action-box v-bind="$props" @click="onClick" />',
+	template: '<n8n-action-box v-bind="args" @click="onClick" />',
 	methods,
 });
 
diff --git a/packages/design-system/src/components/N8nActionBox/ActionBox.vue b/packages/design-system/src/components/N8nActionBox/ActionBox.vue
index a21f6e00d5f75..575e35ffe429f 100644
--- a/packages/design-system/src/components/N8nActionBox/ActionBox.vue
+++ b/packages/design-system/src/components/N8nActionBox/ActionBox.vue
@@ -1,84 +1,61 @@
 <template>
 	<div :class="['n8n-action-box', $style.container]" data-test-id="action-box">
-		<div :class="$style.emoji" v-if="emoji">
+		<div v-if="emoji" :class="$style.emoji">
 			{{ emoji }}
 		</div>
-		<div :class="$style.heading" v-if="heading || $slots.heading">
-			<n8n-heading size="xlarge" align="center">
+		<div v-if="heading || $slots.heading" :class="$style.heading">
+			<N8nHeading size="xlarge" align="center">
 				<slot name="heading">{{ heading }}</slot>
-			</n8n-heading>
+			</N8nHeading>
 		</div>
 		<div :class="$style.description" @click="$emit('descriptionClick', $event)">
-			<n8n-text color="text-base">
+			<N8nText color="text-base">
 				<slot name="description">
 					<span v-html="description"></span>
 				</slot>
-			</n8n-text>
+			</N8nText>
 		</div>
-		<n8n-button
+		<N8nButton
 			v-if="buttonText"
 			:label="buttonText"
 			:type="buttonType"
 			size="large"
-			@click="$emit('click', $event)"
+			@click="$emit('click:button', $event)"
 		/>
-		<n8n-callout
+		<N8nCallout
 			v-if="calloutText"
 			:theme="calloutTheme"
 			:icon="calloutIcon"
 			:class="$style.callout"
 		>
-			<template>
-				<n8n-text color="text-base">
-					<span size="small" v-html="calloutText"></span>
-				</n8n-text>
-			</template>
-		</n8n-callout>
+			<N8nText color="text-base">
+				<span size="small" v-html="calloutText"></span>
+			</N8nText>
+		</N8nCallout>
 	</div>
 </template>
 
-<script lang="ts">
+<script lang="ts" setup>
 import N8nButton from '../N8nButton';
 import N8nHeading from '../N8nHeading';
 import N8nText from '../N8nText';
-import N8nCallout from '../N8nCallout';
-import { defineComponent } from 'vue';
+import N8nCallout, { type CalloutTheme } from '../N8nCallout';
+import type { ButtonType } from '@/types/button';
 
-export default defineComponent({
-	name: 'n8n-action-box',
-	components: {
-		N8nButton,
-		N8nHeading,
-		N8nText,
-		N8nCallout,
-	},
-	props: {
-		emoji: {
-			type: String,
-		},
-		heading: {
-			type: String,
-		},
-		buttonText: {
-			type: String,
-		},
-		buttonType: {
-			type: String,
-		},
-		description: {
-			type: String,
-		},
-		calloutText: {
-			type: String,
-		},
-		calloutTheme: {
-			type: String,
-			default: 'info',
-		},
-		calloutIcon: {
-			type: String,
-		},
-	},
+interface ActionBoxProps {
+	emoji: string;
+	heading: string;
+	buttonText: string;
+	buttonType: ButtonType;
+	description: string;
+	calloutText: string;
+	calloutTheme: CalloutTheme;
+	calloutIcon: string;
+}
+
+defineOptions({ name: 'N8nActionBox' });
+withDefaults(defineProps<ActionBoxProps>(), {
+	calloutTheme: 'info',
 });
 </script>
 
diff --git a/packages/design-system/src/components/N8nActionBox/__tests__/ActionBox.spec.ts b/packages/design-system/src/components/N8nActionBox/__tests__/ActionBox.spec.ts
index 635836bd1d064..72a59953ccb57 100644
--- a/packages/design-system/src/components/N8nActionBox/__tests__/ActionBox.spec.ts
+++ b/packages/design-system/src/components/N8nActionBox/__tests__/ActionBox.spec.ts
@@ -11,7 +11,9 @@ describe('N8NActionBox', () => {
 					'Long description that you should know something is the way it is because of how it is. ',
 				buttonText: 'Do something',
 			},
-			stubs: ['n8n-heading', 'n8n-text', 'n8n-button', 'n8n-callout'],
+			global: {
+				stubs: ['n8n-heading', 'n8n-text', 'n8n-button', 'n8n-callout'],
+			},
 		});
 		expect(wrapper.html()).toMatchSnapshot();
 	});
diff --git a/packages/design-system/src/components/N8nActionBox/__tests__/__snapshots__/ActionBox.spec.ts.snap b/packages/design-system/src/components/N8nActionBox/__tests__/__snapshots__/ActionBox.spec.ts.snap
index 40c7e9f605076..32b699e7d580a 100644
--- a/packages/design-system/src/components/N8nActionBox/__tests__/__snapshots__/ActionBox.spec.ts.snap
+++ b/packages/design-system/src/components/N8nActionBox/__tests__/__snapshots__/ActionBox.spec.ts.snap
@@ -1,15 +1,15 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`N8NActionBox > should render correctly 1`] = `
-"<div data-test-id=\\"action-box\\" class=\\"n8n-action-box container\\">
-  <div class=\\"emoji\\"> 😿 </div>
-  <div class=\\"heading\\">
-    <n8n-heading-stub tag=\\"span\\" size=\\"xlarge\\" align=\\"center\\">Headline you need to know</n8n-heading-stub>
+"<div class="n8n-action-box container" data-test-id="action-box">
+  <div class="emoji">😿</div>
+  <div class="heading">
+    <n8n-heading-stub align="center" tag="span" bold="false" size="xlarge"></n8n-heading-stub>
   </div>
-  <div class=\\"description\\">
-    <n8n-text-stub size=\\"medium\\" color=\\"text-base\\" tag=\\"span\\"><span>Long description that you should know something is the way it is because of how it is. </span></n8n-text-stub>
+  <div class="description">
+    <n8n-text-stub color="text-base" bold="false" size="medium" compact="false" tag="span"></n8n-text-stub>
   </div>
-  <n8n-button-stub label=\\"Do something\\" type=\\"primary\\" size=\\"large\\"></n8n-button-stub>
-  <!---->
+  <n8n-button-stub block="false" element="button" label="Do something" square="false" active="false" disabled="false" loading="false" outline="false" size="large" text="false" type="primary"></n8n-button-stub>
+  <!--v-if-->
 </div>"
 `;
diff --git a/packages/design-system/src/components/N8nActionDropdown/ActionDropdown.stories.ts b/packages/design-system/src/components/N8nActionDropdown/ActionDropdown.stories.ts
index feb43c23bf2ee..30148d3e13106 100644
--- a/packages/design-system/src/components/N8nActionDropdown/ActionDropdown.stories.ts
+++ b/packages/design-system/src/components/N8nActionDropdown/ActionDropdown.stories.ts
@@ -1,5 +1,5 @@
 import N8nActionDropdown from './ActionDropdown.vue';
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 
 export default {
 	title: 'Atoms/ActionDropdown',
@@ -8,8 +8,8 @@ export default {
 		placement: {
 			control: {
 				type: 'select',
-				options: ['top', 'top-end', 'top-start', 'bottom', 'bottom-end', 'bottom-start'],
 			},
+			options: ['top', 'top-end', 'top-start', 'bottom', 'bottom-end', 'bottom-start'],
 		},
 		activatorIcon: {
 			control: {
@@ -19,18 +19,19 @@ export default {
 		trigger: {
 			control: {
 				type: 'select',
-				options: ['click', 'hover'],
 			},
+			options: ['click', 'hover'],
 		},
 	},
 };
 
 const template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nActionDropdown,
 	},
-	template: '<n8n-action-dropdown v-bind="$props" />',
+	template: '<n8n-action-dropdown v-bind="args" />',
 });
 
 export const defaultActionDropdown = template.bind({});
@@ -70,3 +71,62 @@ customStyling.args = {
 		},
 	],
 };
+
+export const keyboardShortcuts = template.bind({});
+keyboardShortcuts.args = {
+	items: [
+		{
+			id: 'open',
+			label: 'Open node...',
+			shortcut: { keys: ['↵'] },
+		},
+		{
+			id: 'execute',
+			label: 'Execute node',
+		},
+		{
+			id: 'rename',
+			label: 'Rename node',
+			shortcut: { keys: ['F2'] },
+		},
+		{
+			id: 'toggle_activation',
+			label: 'Deactivate node',
+			shortcut: { keys: ['D'] },
+		},
+		{
+			id: 'toggle_pin',
+			label: 'Pin node',
+			shortcut: { keys: ['p'] },
+			disabled: true,
+		},
+		{
+			id: 'copy',
+			label: 'Copy node',
+			shortcut: { metaKey: true, keys: ['C'] },
+		},
+		{
+			id: 'duplicate',
+			label: 'Duplicate node',
+			shortcut: { metaKey: true, keys: ['D'] },
+		},
+		{
+			id: 'select_all',
+			divided: true,
+			// always plural
+			label: 'Select all nodes',
+			shortcut: { metaKey: true, keys: ['A'] },
+		},
+		{
+			id: 'deselect_all',
+			label: 'Clear selection',
+			disabled: true,
+		},
+		{
+			id: 'delete',
+			divided: true,
+			label: 'Delete node',
+			shortcut: { keys: ['Del'] },
+		},
+	],
+};
diff --git a/packages/design-system/src/components/N8nActionDropdown/ActionDropdown.vue b/packages/design-system/src/components/N8nActionDropdown/ActionDropdown.vue
index 75a785a590289..2ec50e72bc066 100644
--- a/packages/design-system/src/components/N8nActionDropdown/ActionDropdown.vue
+++ b/packages/design-system/src/components/N8nActionDropdown/ActionDropdown.vue
@@ -1,141 +1,167 @@
 <template>
 	<div :class="['action-dropdown-container', $style.actionDropdownContainer]">
-		<el-dropdown
+		<ElDropdown
+			ref="elementDropdown"
 			:placement="placement"
 			:trigger="trigger"
+			:popper-class="popperClass"
 			@command="onSelect"
-			ref="elementDropdown"
+			@visible-change="onVisibleChange"
 		>
-			<div :class="$style.activator" @click.prevent @blur="onButtonBlur">
-				<n8n-icon :icon="activatorIcon" />
-			</div>
+			<slot v-if="$slots.activator" name="activator" />
+			<n8n-icon-button
+				v-else
+				type="tertiary"
+				text
+				:class="$style.activator"
+				:size="activatorSize"
+				:icon="activatorIcon"
+				@blur="onButtonBlur"
+			/>
+
 			<template #dropdown>
-				<el-dropdown-menu :class="$style.userActionsMenu">
-					<el-dropdown-item
+				<ElDropdownMenu :class="$style.userActionsMenu">
+					<ElDropdownItem
 						v-for="item in items"
 						:key="item.id"
 						:command="item.id"
 						:disabled="item.disabled"
 						:divided="item.divided"
+						:class="$style.elementItem"
 					>
-						<div :class="getItemClasses(item)" :data-test-id="`workflow-menu-item-${item.id}`">
+						<div :class="getItemClasses(item)" :data-test-id="`${testIdPrefix}-item-${item.id}`">
 							<span v-if="item.icon" :class="$style.icon">
-								<n8n-icon :icon="item.icon" :size="iconSize" />
+								<N8nIcon :icon="item.icon" :size="iconSize" />
 							</span>
 							<span :class="$style.label">
 								{{ item.label }}
 							</span>
+							<N8nKeyboardShortcut
+								v-if="item.shortcut"
+								v-bind="item.shortcut"
+								:class="$style.shortcut"
+							>
+							</N8nKeyboardShortcut>
 						</div>
-					</el-dropdown-item>
-				</el-dropdown-menu>
+					</ElDropdownItem>
+				</ElDropdownMenu>
 			</template>
-		</el-dropdown>
+		</ElDropdown>
 	</div>
 </template>
 
-<script lang="ts">
-import type { PropType } from 'vue';
-import { defineComponent } from 'vue';
-import {
-	Dropdown as ElDropdown,
-	DropdownMenu as ElDropdownMenu,
-	DropdownItem as ElDropdownItem,
-} from 'element-ui';
-import N8nIcon from '../N8nIcon';
-
-export interface IActionDropdownItem {
-	id: string;
-	label: string;
-	icon?: string;
-	divided?: boolean;
-	disabled?: boolean;
-	customClass?: string;
-}
-
+<script lang="ts" setup>
 // This component is visually similar to the ActionToggle component
 // but it offers more options when it comes to dropdown items styling
 // (supports icons, separators, custom styling and all options provided
 // by Element UI dropdown component).
 // It can be used in different parts of editor UI while ActionToggle
 // is designed to be used in card components.
-export default defineComponent({
-	name: 'n8n-action-dropdown',
-	components: {
-		ElDropdown,
-		ElDropdownMenu,
-		ElDropdownItem,
-		N8nIcon,
-	},
-	props: {
-		items: {
-			type: Array as PropType<IActionDropdownItem[]>,
-			required: true,
-		},
-		placement: {
-			type: String,
-			default: 'bottom',
-			validator: (value: string): boolean =>
-				['top', 'top-end', 'top-start', 'bottom', 'bottom-end', 'bottom-start'].includes(value),
-		},
-		activatorIcon: {
-			type: String,
-			default: 'ellipsis-v',
-		},
-		iconSize: {
-			type: String,
-			default: 'medium',
-			validator: (value: string): boolean => ['small', 'medium', 'large'].includes(value),
-		},
-		trigger: {
-			type: String,
-			default: 'click',
-			validator: (value: string): boolean => ['click', 'hover'].includes(value),
-		},
-	},
-	methods: {
-		getItemClasses(item: IActionDropdownItem): Record<string, boolean> {
-			return {
-				[this.$style.itemContainer]: true,
-				[this.$style.hasCustomStyling]: item.customClass !== undefined,
-				...(item.customClass !== undefined ? { [item.customClass]: true } : {}),
-			};
-		},
-		onSelect(action: string): void {
-			this.$emit('select', action);
-		},
-		onButtonBlur(event: FocusEvent): void {
-			const elementDropdown = this.$refs.elementDropdown as
-				| (Vue & { hide: () => void })
-				| undefined;
-			// Hide dropdown when clicking outside of current document
-			if (elementDropdown && event.relatedTarget === null) {
-				elementDropdown.hide();
-			}
-		},
-	},
+import { ref, useCssModule, useAttrs, computed } from 'vue';
+import { ElDropdown, ElDropdownMenu, ElDropdownItem, type Placement } from 'element-plus';
+import N8nIcon from '../N8nIcon';
+import { N8nKeyboardShortcut } from '../N8nKeyboardShortcut';
+import type { ActionDropdownItem } from '../../types';
+import type { IconSize } from '@/types/icon';
+
+const TRIGGER = ['click', 'hover'] as const;
+
+interface ActionDropdownProps {
+	items: ActionDropdownItem[];
+	placement?: Placement;
+	activatorIcon?: string;
+	activatorSize?: IconSize;
+	iconSize?: IconSize;
+	trigger?: (typeof TRIGGER)[number];
+	hideArrow?: boolean;
+}
+
+const props = withDefaults(defineProps<ActionDropdownProps>(), {
+	placement: 'bottom',
+	activatorIcon: 'ellipsis-h',
+	activatorSize: 'medium',
+	iconSize: 'medium',
+	trigger: 'click',
+	hideArrow: false,
 });
+
+const $attrs = useAttrs();
+const testIdPrefix = $attrs['data-test-id'];
+
+const $style = useCssModule();
+const getItemClasses = (item: ActionDropdownItem): Record<string, boolean> => {
+	return {
+		[$style.itemContainer]: true,
+		[$style.disabled]: !!item.disabled,
+		[$style.hasCustomStyling]: item.customClass !== undefined,
+		...(item.customClass !== undefined ? { [item.customClass]: true } : {}),
+	};
+};
+
+const $emit = defineEmits(['select', 'visibleChange']);
+const elementDropdown = ref<InstanceType<typeof ElDropdown>>();
+
+const popperClass = computed(
+	() => `${$style.shadow}${props.hideArrow ? ` ${$style.hideArrow}` : ''}`,
+);
+
+const onSelect = (action: string) => $emit('select', action);
+const onVisibleChange = (open: boolean) => $emit('visibleChange', open);
+
+const onButtonBlur = (event: FocusEvent) => {
+	// Hide dropdown when clicking outside of current document
+	if (elementDropdown.value?.handleClose && event.relatedTarget === null) {
+		elementDropdown.value.handleClose();
+	}
+};
+
+const open = () => elementDropdown.value?.handleOpen();
+const close = () => elementDropdown.value?.handleClose();
+defineExpose({ open, close });
 </script>
 
 <style lang="scss" module>
-.activator {
-	cursor: pointer;
-	padding: var(--spacing-2xs);
-	margin: 0;
-	border-radius: var(--border-radius-base);
-	line-height: normal !important;
+:global(.el-dropdown__list) {
+	.userActionsMenu {
+		min-width: 160px;
+		padding: var(--spacing-4xs) 0;
+	}
 
-	svg {
-		position: static !important;
+	.elementItem {
+		padding: 0;
 	}
+}
+
+:global(.el-popper).hideArrow {
+	:global(.el-popper__arrow) {
+		display: none;
+	}
+}
 
+.shadow {
+	box-shadow: var(--box-shadow-light);
+}
+
+.activator {
 	&:hover {
 		background-color: var(--color-background-base);
-		color: initial !important;
 	}
 }
 
 .itemContainer {
 	display: flex;
+	align-items: center;
+	gap: var(--spacing-s);
+	justify-content: space-between;
+	font-size: var(--font-size-2xs);
+	line-height: 18px;
+	padding: var(--spacing-3xs) var(--spacing-2xs);
+
+	&.disabled {
+		.shortcut {
+			opacity: 0.3;
+		}
+	}
 }
 
 .icon {
@@ -147,6 +173,10 @@ export default defineComponent({
 	}
 }
 
+.shortcut {
+	display: flex;
+}
+
 :global(li.is-disabled) {
 	.hasCustomStyling {
 		color: inherit !important;
diff --git a/packages/design-system/src/components/N8nActionDropdown/__tests__/ActionDropdown.spec.ts b/packages/design-system/src/components/N8nActionDropdown/__tests__/ActionDropdown.spec.ts
index 8af723b476b47..bcbc2f1486a56 100644
--- a/packages/design-system/src/components/N8nActionDropdown/__tests__/ActionDropdown.spec.ts
+++ b/packages/design-system/src/components/N8nActionDropdown/__tests__/ActionDropdown.spec.ts
@@ -6,6 +6,7 @@ describe('components', () => {
 		it('should render default styling correctly', () => {
 			const wrapper = render(N8nActionDropdown, {
 				props: {
+					teleported: false,
 					items: [
 						{
 							id: 'item1',
@@ -17,10 +18,13 @@ describe('components', () => {
 						},
 					],
 				},
-				stubs: ['n8n-icon', 'el-dropdown', 'el-dropdown-menu', 'el-dropdown-item'],
+				global: {
+					stubs: ['n8n-icon', 'el-tooltip', 'el-dropdown', 'el-dropdown-menu', 'el-dropdown-item'],
+				},
 			});
 			expect(wrapper.html()).toMatchSnapshot();
 		});
+
 		it('should render custom styling correctly', () => {
 			const wrapper = render(N8nActionDropdown, {
 				props: {
@@ -44,7 +48,9 @@ describe('components', () => {
 						},
 					],
 				},
-				stubs: ['n8n-icon', 'el-dropdown', 'el-dropdown-menu', 'el-dropdown-item'],
+				global: {
+					stubs: ['n8n-icon', 'el-dropdown', 'el-dropdown-menu', 'el-dropdown-item'],
+				},
 			});
 			expect(wrapper.html()).toMatchSnapshot();
 		});
diff --git a/packages/design-system/src/components/N8nActionDropdown/__tests__/__snapshots__/ActionDropdown.spec.ts.snap b/packages/design-system/src/components/N8nActionDropdown/__tests__/__snapshots__/ActionDropdown.spec.ts.snap
index 5b1bee501d77b..162c172de4eee 100644
--- a/packages/design-system/src/components/N8nActionDropdown/__tests__/__snapshots__/ActionDropdown.spec.ts.snap
+++ b/packages/design-system/src/components/N8nActionDropdown/__tests__/__snapshots__/ActionDropdown.spec.ts.snap
@@ -1,21 +1,13 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`components > N8nActionDropdown > should render custom styling correctly 1`] = `
-"<div class=\\"action-dropdown-container actionDropdownContainer\\">
-  <el-dropdown-stub trigger=\\"click\\" size=\\"\\" hideonclick=\\"true\\" placement=\\"bottom\\" visiblearrow=\\"true\\" showtimeout=\\"250\\" hidetimeout=\\"150\\" tabindex=\\"0\\">
-    <div class=\\"activator\\">
-      <n8n-icon-stub icon=\\"ellipsis-v\\" size=\\"medium\\"></n8n-icon-stub>
-    </div>
-  </el-dropdown-stub>
+"<div class="action-dropdown-container actionDropdownContainer">
+  <el-dropdown-stub trigger="click" effect="light" placement="bottom" popperoptions="[object Object]" size="" splitbutton="false" hideonclick="true" loop="true" showtimeout="150" hidetimeout="150" tabindex="0" maxheight="" popperclass="shadow" disabled="false" role="menu" teleported="true"></el-dropdown-stub>
 </div>"
 `;
 
 exports[`components > N8nActionDropdown > should render default styling correctly 1`] = `
-"<div class=\\"action-dropdown-container actionDropdownContainer\\">
-  <el-dropdown-stub trigger=\\"click\\" size=\\"\\" hideonclick=\\"true\\" placement=\\"bottom\\" visiblearrow=\\"true\\" showtimeout=\\"250\\" hidetimeout=\\"150\\" tabindex=\\"0\\">
-    <div class=\\"activator\\">
-      <n8n-icon-stub icon=\\"ellipsis-v\\" size=\\"medium\\"></n8n-icon-stub>
-    </div>
-  </el-dropdown-stub>
+"<div class="action-dropdown-container actionDropdownContainer" teleported="false">
+  <el-dropdown-stub trigger="click" effect="light" placement="bottom" popperoptions="[object Object]" size="" splitbutton="false" hideonclick="true" loop="true" showtimeout="150" hidetimeout="150" tabindex="0" maxheight="" popperclass="shadow" disabled="false" role="menu" teleported="true"></el-dropdown-stub>
 </div>"
 `;
diff --git a/packages/design-system/src/components/N8nActionToggle/ActionToggle.stories.ts b/packages/design-system/src/components/N8nActionToggle/ActionToggle.stories.ts
index f3f3c03a516e3..bf52cfe3e5d02 100644
--- a/packages/design-system/src/components/N8nActionToggle/ActionToggle.stories.ts
+++ b/packages/design-system/src/components/N8nActionToggle/ActionToggle.stories.ts
@@ -1,6 +1,6 @@
 import N8nActionToggle from './ActionToggle.vue';
 import { action } from '@storybook/addon-actions';
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 
 export default {
 	title: 'Atoms/ActionToggle',
@@ -8,7 +8,7 @@ export default {
 	argTypes: {
 		placement: {
 			type: 'select',
-			options: ['top', 'top-start', 'top-end', 'bottom', 'bottom-end'],
+			options: ['top', 'top-end', 'top-start', 'bottom', 'bottom-end', 'bottom-start'],
 		},
 		size: {
 			type: 'select',
@@ -25,12 +25,14 @@ const methods = {
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nActionToggle,
 	},
-	template:
-		'<div style="height:300px;width:300px;display:flex;align-items:center;justify-content:center"><n8n-action-toggle v-bind="$props" @action="onAction" /></div>',
+	template: `<div style="height:300px; width:300px; display:flex; align-items:center; justify-content:center">
+			<n8n-action-toggle v-bind="args" @action="onAction" />
+		</div>`,
 	methods,
 });
 
diff --git a/packages/design-system/src/components/N8nActionToggle/ActionToggle.vue b/packages/design-system/src/components/N8nActionToggle/ActionToggle.vue
index c617ace7626d3..b1e5fb215b6f1 100644
--- a/packages/design-system/src/components/N8nActionToggle/ActionToggle.vue
+++ b/packages/design-system/src/components/N8nActionToggle/ActionToggle.vue
@@ -1,94 +1,76 @@
 <template>
-	<span :class="$style.container" data-test-id="action-toggle">
-		<el-dropdown
+	<span :class="$style.container" data-test-id="action-toggle" @click.stop.prevent>
+		<ElDropdown
 			:placement="placement"
 			:size="size"
 			trigger="click"
-			@click.native.stop
 			@command="onCommand"
 			@visible-change="onVisibleChange"
 		>
-			<span :class="{ [$style.button]: true, [$style[theme]]: !!theme }">
-				<n8n-icon icon="ellipsis-v" :size="iconSize" />
-			</span>
+			<slot>
+				<span :class="{ [$style.button]: true, [$style[theme]]: !!theme }">
+					<N8nIcon
+						:icon="iconOrientation === 'horizontal' ? 'ellipsis-h' : 'ellipsis-v'"
+						:size="iconSize"
+					/>
+				</span>
+			</slot>
 
 			<template #dropdown>
-				<el-dropdown-menu data-test-id="action-toggle-dropdown">
-					<el-dropdown-item
+				<ElDropdownMenu data-test-id="action-toggle-dropdown">
+					<ElDropdownItem
 						v-for="action in actions"
 						:key="action.value"
 						:command="action.value"
 						:disabled="action.disabled"
+						:data-test-id="`action-${action.value}`"
 					>
 						{{ action.label }}
 						<div :class="$style.iconContainer">
-							<n8n-icon
+							<N8nIcon
 								v-if="action.type === 'external-link'"
 								icon="external-link-alt"
 								size="xsmall"
 								color="text-base"
 							/>
 						</div>
-					</el-dropdown-item>
-				</el-dropdown-menu>
+					</ElDropdownItem>
+				</ElDropdownMenu>
 			</template>
-		</el-dropdown>
+		</ElDropdown>
 	</span>
 </template>
 
-<script lang="ts">
-import type { PropType } from 'vue';
-import { defineComponent } from 'vue';
-import {
-	Dropdown as ElDropdown,
-	DropdownMenu as ElDropdownMenu,
-	DropdownItem as ElDropdownItem,
-} from 'element-ui';
-import N8nIcon from '../N8nIcon';
+<script lang="ts" setup>
+import { ElDropdown, ElDropdownMenu, ElDropdownItem, type Placement } from 'element-plus';
 import type { UserAction } from '@/types';
+import N8nIcon from '../N8nIcon';
+import type { IconOrientation, IconSize } from '@/types/icon';
+
+const SIZE = ['mini', 'small', 'medium'] as const;
+const THEME = ['default', 'dark'] as const;
 
-export default defineComponent({
-	name: 'n8n-action-toggle',
-	components: {
-		ElDropdown,
-		ElDropdownMenu,
-		ElDropdownItem,
-		N8nIcon,
-	},
-	props: {
-		actions: {
-			type: Array as PropType<UserAction[]>,
-			default: () => [],
-		},
-		placement: {
-			type: String,
-			default: 'bottom',
-			validator: (value: string): boolean =>
-				['top', 'top-end', 'top-start', 'bottom', 'bottom-end', 'bottom-start'].includes(value),
-		},
-		size: {
-			type: String,
-			default: 'medium',
-			validator: (value: string): boolean => ['mini', 'small', 'medium'].includes(value),
-		},
-		iconSize: {
-			type: String,
-		},
-		theme: {
-			type: String,
-			default: 'default',
-			validator: (value: string): boolean => ['default', 'dark'].includes(value),
-		},
-	},
-	methods: {
-		onCommand(value: string) {
-			this.$emit('action', value);
-		},
-		onVisibleChange(value: boolean) {
-			this.$emit('visible-change', value);
-		},
-	},
+interface ActionToggleProps {
+	actions?: UserAction[];
+	placement?: Placement;
+	size?: (typeof SIZE)[number];
+	iconSize?: IconSize;
+	theme?: (typeof THEME)[number];
+	iconOrientation?: IconOrientation;
+}
+
+defineOptions({ name: 'N8nActionToggle' });
+withDefaults(defineProps<ActionToggleProps>(), {
+	actions: () => [],
+	placement: 'bottom',
+	size: 'medium',
+	theme: 'default',
+	iconOrientation: 'vertical',
 });
+
+const $emit = defineEmits(['action', 'visible-change']);
+const onCommand = (value: string) => $emit('action', value);
+const onVisibleChange = (value: boolean) => $emit('visible-change', value);
 </script>
 
 <style lang="scss" module>
diff --git a/packages/design-system/src/components/N8nAlert/Alert.stories.ts b/packages/design-system/src/components/N8nAlert/Alert.stories.ts
index 8a4eb35da4976..97ef9c8a0b434 100644
--- a/packages/design-system/src/components/N8nAlert/Alert.stories.ts
+++ b/packages/design-system/src/components/N8nAlert/Alert.stories.ts
@@ -1,4 +1,4 @@
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 import N8nAlert from './Alert.vue';
 import N8nIcon from '../N8nIcon';
 
@@ -18,12 +18,13 @@ export default {
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nAlert,
 	},
 	template:
-		'<div style="position: relative; width: 100%; height: 300px;"><n8n-alert v-bind="$props"><template #aside>custom content slot</template></n8n-alert></div>',
+		'<div style="position: relative; width: 100%; height: 300px;"><n8n-alert v-bind="args"><template #aside>custom content slot</template></n8n-alert></div>',
 });
 
 export const ContentAsProps = Template.bind({});
@@ -38,15 +39,16 @@ ContentAsProps.args = {
 };
 
 const TemplateForSlots: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nAlert,
 		N8nIcon,
 	},
 	template: `<div style="position: relative; width: 100%; height: 300px;">
-			  <n8n-alert v-bind="$props">
+			  <n8n-alert v-bind="args">
 					<template #title>Title</template>
-					<template>Description</template>
+					Description
 					<template #aside><button>Button</button></template>
 					<template #icon>
 						<n8n-icon icon="grin-stars" size="xlarge" />
diff --git a/packages/design-system/src/components/N8nAlert/Alert.vue b/packages/design-system/src/components/N8nAlert/Alert.vue
index b48be588927df..6c9bc5cee08c7 100644
--- a/packages/design-system/src/components/N8nAlert/Alert.vue
+++ b/packages/design-system/src/components/N8nAlert/Alert.vue
@@ -2,7 +2,7 @@
 	<div :class="alertBoxClassNames" role="alert">
 		<div :class="$style.content">
 			<span v-if="showIcon || $slots.icon" :class="$style.icon">
-				<n8n-icon v-if="showIcon" :icon="icon" />
+				<N8nIcon v-if="showIcon" :icon="icon" />
 				<slot v-else-if="$slots.icon" name="icon" />
 			</span>
 			<div :class="$style.text">
@@ -57,20 +57,20 @@ const icon = computed(() => {
 	}
 });
 
-const style = useCssModule();
+const $style = useCssModule();
 const alertBoxClassNames = computed(() => {
-	const classNames = ['n8n-alert', style.alert];
+	const classNames = ['n8n-alert', $style.alert];
 	if (props.type) {
-		classNames.push(style[props.type]);
+		classNames.push($style[props.type]);
 	}
 	if (props.effect) {
-		classNames.push(style[props.effect]);
+		classNames.push($style[props.effect]);
 	}
 	if (props.center) {
-		classNames.push(style.center);
+		classNames.push($style.center);
 	}
 	if (props.background) {
-		classNames.push(style.background);
+		classNames.push($style.background);
 	}
 	return classNames;
 });
diff --git a/packages/design-system/src/components/N8nAlert/__tests__/Alert.spec.ts b/packages/design-system/src/components/N8nAlert/__tests__/Alert.spec.ts
index ea97015d889bc..6be8dc2f103d1 100644
--- a/packages/design-system/src/components/N8nAlert/__tests__/Alert.spec.ts
+++ b/packages/design-system/src/components/N8nAlert/__tests__/Alert.spec.ts
@@ -14,21 +14,20 @@ describe('components', () => {
 		});
 
 		it('should render slots instead of props', () => {
-			const { container } = render(
-				N8nAlert,
-				{
-					props: { showIcon: false },
-					slots: {
-						title: 'Title',
-						default: 'Message',
-						aside: '<button>Click me</button>',
-						icon: '<n8n-icon icon="plus-circle" />',
-					},
+			const { container } = render(N8nAlert, {
+				props: { showIcon: false },
+				slots: {
+					title: 'Title',
+					default: 'Message',
+					aside: '<button>Click me</button>',
+					icon: '<n8n-icon icon="plus-circle" />',
 				},
-				(localVue) => {
-					localVue.component('n8n-icon', N8nIcon);
+				global: {
+					components: {
+						'n8n-icon': N8nIcon,
+					},
 				},
-			);
+			});
 			expect(screen.getByRole('alert')).toBeVisible();
 			expect(screen.getByText('Title')).toBeVisible();
 			expect(screen.getByText('Message')).toBeVisible();
diff --git a/packages/design-system/src/components/N8nAvatar/Avatar.stories.ts b/packages/design-system/src/components/N8nAvatar/Avatar.stories.ts
index b690009016421..fe58696d18cbf 100644
--- a/packages/design-system/src/components/N8nAvatar/Avatar.stories.ts
+++ b/packages/design-system/src/components/N8nAvatar/Avatar.stories.ts
@@ -1,4 +1,4 @@
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 import N8nAvatar from './Avatar.vue';
 
 export default {
@@ -13,14 +13,16 @@ export default {
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nAvatar,
 	},
-	template: '<n8n-avatar v-bind="$props" />',
+	template: '<n8n-avatar v-bind="args" />',
 });
 
 export const Avatar = Template.bind({});
 Avatar.args = {
-	name: 'Sunny Side',
+	firstName: 'Sunny',
+	lastName: 'Side',
 };
diff --git a/packages/design-system/src/components/N8nAvatar/Avatar.vue b/packages/design-system/src/components/N8nAvatar/Avatar.vue
index 7f2d8c201aca4..933b55343e81c 100644
--- a/packages/design-system/src/components/N8nAvatar/Avatar.vue
+++ b/packages/design-system/src/components/N8nAvatar/Avatar.vue
@@ -1,6 +1,6 @@
 <template>
-	<span :class="['n8n-avatar', $style.container]" v-on="$listeners">
-		<avatar
+	<span :class="['n8n-avatar', $style.container]" v-bind="$attrs">
+		<Avatar
 			v-if="firstName"
 			:size="getSize(size)"
 			:name="firstName + ' ' + lastName"
@@ -12,61 +12,48 @@
 	</span>
 </template>
 
-<script lang="ts">
-import Avatar from 'vue2-boring-avatars';
+<script lang="ts" setup>
+import { computed } from 'vue';
+import Avatar from 'vue-boring-avatars';
+
+interface AvatarProps {
+	firstName: string;
+	lastName: string;
+	size?: string;
+	colors?: string[];
+}
+
+defineOptions({ name: 'N8nAvatar' });
+const props = withDefaults(defineProps<AvatarProps>(), {
+	firstName: '',
+	lastName: '',
+	size: 'medium',
+	colors: () => [
+		'--color-primary',
+		'--color-secondary',
+		'--color-avatar-accent-1',
+		'--color-avatar-accent-2',
+		'--color-primary-tint-1',
+	],
+});
+
+const initials = computed(
+	() =>
+		(props.firstName ? props.firstName.charAt(0) : '') +
+		(props.lastName ? props.lastName.charAt(0) : ''),
+);
+
+const getColors = (colors: string[]): string[] => {
+	const style = getComputedStyle(document.body);
+	return colors.map((color: string) => style.getPropertyValue(color));
+};
 
 const sizes: { [size: string]: number } = {
 	small: 28,
 	large: 48,
 	medium: 40,
 };
-
-import { defineComponent } from 'vue';
-
-export default defineComponent({
-	name: 'n8n-avatar',
-	props: {
-		firstName: {
-			type: String,
-		},
-		lastName: {
-			type: String,
-		},
-		size: {
-			type: String,
-			default: 'medium',
-		},
-		colors: {
-			default: () => [
-				'--color-primary',
-				'--color-secondary',
-				'--color-avatar-accent-1',
-				'--color-avatar-accent-2',
-				'--color-primary-tint-1',
-			],
-		},
-	},
-	components: {
-		Avatar, // eslint-disable-line @typescript-eslint/no-unsafe-assignment
-	},
-	computed: {
-		initials() {
-			return (
-				(this.firstName ? this.firstName.charAt(0) : '') +
-				(this.lastName ? this.lastName.charAt(0) : '')
-			);
-		},
-	},
-	methods: {
-		getColors(colors: string[]): string[] {
-			const style = getComputedStyle(document.body);
-			return colors.map((color: string) => style.getPropertyValue(color));
-		},
-		getSize(size: string): number {
-			return sizes[size];
-		},
-	},
-});
+const getSize = (size: string): number => sizes[size];
 </script>
 
 <style lang="scss" module>
@@ -87,7 +74,7 @@ export default defineComponent({
 	position: absolute;
 	font-size: var(--font-size-2xs);
 	font-weight: var(--font-weight-bold);
-	color: var(--color-text-xlight);
+	color: var(--color-avatar-font);
 	text-shadow: 0px 1px 6px rgba(25, 11, 9, 0.3);
 }
 
diff --git a/packages/design-system/src/components/N8nBadge/Badge.stories.ts b/packages/design-system/src/components/N8nBadge/Badge.stories.ts
index ac4d178eda5da..e8442fd6a0f7f 100644
--- a/packages/design-system/src/components/N8nBadge/Badge.stories.ts
+++ b/packages/design-system/src/components/N8nBadge/Badge.stories.ts
@@ -1,4 +1,4 @@
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 import N8nBadge from './Badge.vue';
 
 export default {
@@ -17,11 +17,12 @@ export default {
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nBadge,
 	},
-	template: '<n8n-badge v-bind="$props">Badge</n8n-badge>',
+	template: '<n8n-badge v-bind="args">Badge</n8n-badge>',
 });
 
 export const Badge = Template.bind({});
diff --git a/packages/design-system/src/components/N8nBadge/Badge.vue b/packages/design-system/src/components/N8nBadge/Badge.vue
index 605c78243c196..c2d2c68c48f63 100644
--- a/packages/design-system/src/components/N8nBadge/Badge.vue
+++ b/packages/design-system/src/components/N8nBadge/Badge.vue
@@ -1,35 +1,36 @@
 <template>
 	<span :class="['n8n-badge', $style[theme]]">
-		<n8n-text :size="size" :bold="bold" :compact="true">
+		<N8nText :size="size" :bold="bold" :compact="true">
 			<slot></slot>
-		</n8n-text>
+		</N8nText>
 	</span>
 </template>
 
-<script lang="ts">
+<script lang="ts" setup>
+import type { TextSize } from '@/types/text';
 import N8nText from '../N8nText';
 
-import { defineComponent } from 'vue';
+const THEME = [
+	'default',
+	'success',
+	'warning',
+	'danger',
+	'primary',
+	'secondary',
+	'tertiary',
+] as const;
 
-export default defineComponent({
-	props: {
-		theme: {
-			type: String,
-			default: 'default',
-			validator: (value: string) => ['default', 'primary', 'secondary', 'tertiary'].includes(value),
-		},
-		size: {
-			type: String,
-			default: 'small',
-		},
-		bold: {
-			type: Boolean,
-			default: false,
-		},
-	},
-	components: {
-		N8nText,
-	},
+interface BadgeProps {
+	theme?: (typeof THEME)[number];
+	size?: TextSize;
+	bold?: boolean;
+}
+
+defineOptions({ name: 'N8nBadge' });
+withDefaults(defineProps<BadgeProps>(), {
+	theme: 'default',
+	size: 'small',
+	bold: false,
 });
 </script>
 
@@ -49,6 +50,27 @@ export default defineComponent({
 	border-color: var(--color-text-light);
 }
 
+.success {
+	composes: badge;
+	border-radius: var(--border-radius-base);
+	color: var(--color-success);
+	border-color: var(--color-success);
+}
+
+.warning {
+	composes: badge;
+	border-radius: var(--border-radius-base);
+	color: var(--color-warning);
+	border-color: var(--color-warning);
+}
+
+.danger {
+	composes: badge;
+	border-radius: var(--border-radius-base);
+	color: var(--color-danger);
+	border-color: var(--color-danger);
+}
+
 .primary {
 	composes: badge;
 	padding: var(--spacing-5xs) var(--spacing-3xs);
diff --git a/packages/design-system/src/components/N8nBadge/__tests__/Badge.spec.ts b/packages/design-system/src/components/N8nBadge/__tests__/Badge.spec.ts
index 7a5ed3653522b..250f329da9b1f 100644
--- a/packages/design-system/src/components/N8nBadge/__tests__/Badge.spec.ts
+++ b/packages/design-system/src/components/N8nBadge/__tests__/Badge.spec.ts
@@ -14,7 +14,9 @@ describe('components', () => {
 					slots: {
 						default: '<n8n-text>Default badge</n8n-text>',
 					},
-					stubs: ['n8n-text'],
+					global: {
+						stubs: ['n8n-text'],
+					},
 				});
 				expect(wrapper.html()).toMatchSnapshot();
 			});
@@ -28,7 +30,9 @@ describe('components', () => {
 					slots: {
 						default: '<n8n-text>Secondary badge</n8n-text>',
 					},
-					stubs: ['n8n-text'],
+					global: {
+						stubs: ['n8n-text'],
+					},
 				});
 				expect(wrapper.html()).toMatchSnapshot();
 			});
@@ -37,7 +41,9 @@ describe('components', () => {
 					slots: {
 						default: '<n8n-text>A Badge</n8n-text>',
 					},
-					stubs: ['n8n-text'],
+					global: {
+						stubs: ['n8n-text'],
+					},
 				});
 				expect(wrapper.html()).toMatchSnapshot();
 			});
diff --git a/packages/design-system/src/components/N8nBadge/__tests__/__snapshots__/Badge.spec.ts.snap b/packages/design-system/src/components/N8nBadge/__tests__/__snapshots__/Badge.spec.ts.snap
index e4fa2710fedab..5bae5965234f9 100644
--- a/packages/design-system/src/components/N8nBadge/__tests__/__snapshots__/Badge.spec.ts.snap
+++ b/packages/design-system/src/components/N8nBadge/__tests__/__snapshots__/Badge.spec.ts.snap
@@ -1,7 +1,7 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`components > N8nBadge > props > should render default theme correctly 1`] = `"<span class=\\"n8n-badge default\\"><n8n-text-stub bold=\\"true\\" size=\\"large\\" compact=\\"true\\" tag=\\"span\\"><n8n-text-stub size=\\"medium\\" tag=\\"span\\">Default badge</n8n-text-stub></n8n-text-stub></span>"`;
+exports[`components > N8nBadge > props > should render default theme correctly 1`] = `"<span class="n8n-badge default"><n8n-text-stub bold="true" size="large" compact="true" tag="span"></n8n-text-stub></span>"`;
 
-exports[`components > N8nBadge > props > should render secondary theme correctly 1`] = `"<span class=\\"n8n-badge secondary\\"><n8n-text-stub size=\\"medium\\" compact=\\"true\\" tag=\\"span\\"><n8n-text-stub size=\\"medium\\" tag=\\"span\\">Secondary badge</n8n-text-stub></n8n-text-stub></span>"`;
+exports[`components > N8nBadge > props > should render secondary theme correctly 1`] = `"<span class="n8n-badge secondary"><n8n-text-stub bold="false" size="medium" compact="true" tag="span"></n8n-text-stub></span>"`;
 
-exports[`components > N8nBadge > props > should render with default values correctly 1`] = `"<span class=\\"n8n-badge default\\"><n8n-text-stub size=\\"small\\" compact=\\"true\\" tag=\\"span\\"><n8n-text-stub size=\\"medium\\" tag=\\"span\\">A Badge</n8n-text-stub></n8n-text-stub></span>"`;
+exports[`components > N8nBadge > props > should render with default values correctly 1`] = `"<span class="n8n-badge default"><n8n-text-stub bold="false" size="small" compact="true" tag="span"></n8n-text-stub></span>"`;
diff --git a/packages/design-system/src/components/N8nBlockUi/BlockUi.stories.ts b/packages/design-system/src/components/N8nBlockUi/BlockUi.stories.ts
index bbcc750712199..09b1c73ef0efe 100644
--- a/packages/design-system/src/components/N8nBlockUi/BlockUi.stories.ts
+++ b/packages/design-system/src/components/N8nBlockUi/BlockUi.stories.ts
@@ -1,4 +1,4 @@
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 import N8nBlockUi from './BlockUi.vue';
 
 export default {
@@ -7,12 +7,13 @@ export default {
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nBlockUi,
 	},
 	template:
-		'<div style="position: relative; width: 100%; height: 300px;"><n8n-block-ui v-bind="$props" /></div>',
+		'<div style="position: relative; width: 100%; height: 300px;"><n8n-block-ui v-bind="args" /></div>',
 });
 
 export const BlockUi = Template.bind({});
diff --git a/packages/design-system/src/components/N8nBlockUi/BlockUi.vue b/packages/design-system/src/components/N8nBlockUi/BlockUi.vue
index 7344608460c3e..a4213c9d7d66a 100644
--- a/packages/design-system/src/components/N8nBlockUi/BlockUi.vue
+++ b/packages/design-system/src/components/N8nBlockUi/BlockUi.vue
@@ -26,7 +26,7 @@ withDefaults(defineProps<BlockUiProps>(), {
 	left: 0;
 	width: 100%;
 	height: 100%;
-	background-color: var(--color-background-dark);
+	background-color: var(--color-block-ui-overlay);
 	z-index: 10;
 	opacity: 0.6;
 	border-radius: var(--border-radius-large);
@@ -38,7 +38,7 @@ withDefaults(defineProps<BlockUiProps>(), {
 .fade-leave-active {
 	transition: opacity 200ms;
 }
-.fade-enter,
+.fade-enter-from,
 .fade-leave-to {
 	opacity: 0;
 }
diff --git a/packages/design-system/src/components/N8nButton/Button.scss b/packages/design-system/src/components/N8nButton/Button.scss
new file mode 100644
index 0000000000000..7458dc6377e25
--- /dev/null
+++ b/packages/design-system/src/components/N8nButton/Button.scss
@@ -0,0 +1,222 @@
+@import '../../css/mixins/utils';
+@import '../../css/common/var';
+
+@mixin n8n-button($override: false) {
+	$important: if($override, !important, '');
+
+	display: inline-block;
+	line-height: 1;
+	white-space: nowrap;
+	cursor: pointer;
+
+	border: var(--border-width-base) $button-border-color var(--border-style-base) unquote($important);
+	color: $button-font-color unquote($important);
+	background-color: $button-background-color unquote($important);
+	font-weight: var(--font-weight-bold) unquote($important);
+	border-radius: $button-border-radius unquote($important);
+	padding: $button-padding-vertical $button-padding-horizontal unquote($important);
+	font-size: $button-font-size unquote($important);
+
+	-webkit-appearance: none;
+	text-align: center;
+	box-sizing: border-box;
+	outline: none;
+	margin: 0;
+	transition: 0.3s;
+
+	@include utils-user-select(none);
+
+	// Solution for a inside button
+	& a {
+		color: $button-font-color unquote($important);
+	}
+
+	&:hover {
+		color: $button-hover-font-color unquote($important);
+		border-color: $button-hover-border-color unquote($important);
+		background-color: $button-hover-background-color unquote($important);
+
+		& a {
+			color: $button-hover-font-color unquote($important);
+		}
+	}
+
+	&:active,
+	&.active {
+		color: $button-active-font-color unquote($important);
+		border-color: $button-active-border-color unquote($important);
+		background-color: $button-active-background-color unquote($important);
+		outline: none;
+
+		& a {
+			color: $button-active-font-color unquote($important);
+		}
+	}
+
+	&:focus {
+		color: $button-focus-font-color unquote($important);
+		border-color: $button-focus-border-color unquote($important);
+		background-color: $button-focus-background-color unquote($important);
+		outline: $focus-outline-width solid $button-focus-outline-color unquote($important);
+
+		& a {
+			color: $button-focus-font-color unquote($important);
+		}
+	}
+
+	&.disabled {
+		&,
+		&:hover,
+		&:active,
+		&:focus {
+			color: $button-disabled-font-color;
+			border-color: $button-disabled-border-color;
+			background-color: $button-disabled-background-color;
+
+			& a {
+				color: $button-disabled-font-color;
+			}
+		}
+	}
+
+	.loading {
+		&,
+		&:hover,
+		&:active,
+		&:focus {
+			color: $button-loading-font-color;
+			border-color: $button-loading-border-color;
+			background-color: $button-loading-background-color;
+
+			& a {
+				color: $button-loading-font-color;
+			}
+		}
+	}
+
+	&::-moz-focus-inner {
+		border: 0;
+	}
+
+	> i {
+		display: none;
+	}
+
+	> span {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+
+	span + span {
+		margin-left: var(--spacing-3xs);
+	}
+}
+
+@mixin n8n-button-secondary {
+	--button-font-color: var(--color-button-secondary-font);
+	--button-border-color: var(--color-button-secondary-border);
+	--button-background-color: var(--color-button-secondary-background);
+
+	--button-hover-font-color: var(--color-button-secondary-hover-active-focus-font);
+	--button-hover-border-color: var(--color-button-secondary-hover-active-border);
+	--button-hover-background-color: var(--color-button-secondary-hover-background);
+
+	--button-active-font-color: var(--color-button-secondary-hover-active-focus-font);
+	--button-active-border-color: var(--color-button-secondary-hover-active-border);
+	--button-active-background-color: var(--color-button-secondary-active-background);
+
+	--button-focus-font-color: var(--color-button-secondary-hover-active-focus-font);
+	--button-focus-border-color: var(--color-button-secondary-border);
+	--button-focus-background-color: var(--color-button-secondary-background);
+	--button-focus-outline-color: var(--color-button-secondary-focus-outline);
+
+	--button-disabled-font-color: var(--color-button-secondary-disabled-font);
+	--button-disabled-border-color: var(--color-button-secondary-disabled-border);
+	--button-disabled-background-color: var(--color-button-secondary-background);
+
+	--button-loading-font-color: var(--color-button-secondary-loading-font);
+	--button-loading-border-color: var(--color-button-secondary-loading-border);
+	--button-loading-background-color: var(--color-button-secondary-loading-background);
+}
+
+@mixin n8n-button-success {
+	--button-font-color: var(--color-button-success-font);
+	--button-border-color: var(--color-success);
+	--button-background-color: var(--color-success);
+
+	--button-hover-font-color: var(--color-button-success-font);
+	--button-hover-border-color: var(--color-success-shade-1);
+	--button-hover-background-color: var(--color-success-shade-1);
+
+	--button-active-font-color: var(--color-button-success-font);
+	--button-active-border-color: var(--color-success-shade-1);
+	--button-active-background-color: var(--color-success-shade-1);
+
+	--button-focus-font-color: var(--color-button-success-font);
+	--button-focus-border-color: var(--color-success);
+	--button-focus-background-color: var(--color-success);
+	--button-focus-outline-color: var(--color-success-light);
+
+	--button-disabled-font-color: var(--color-button-success-disabled-font);
+	--button-disabled-border-color: var(--color-success-tint-1);
+	--button-disabled-background-color: var(--color-success-tint-1);
+
+	--button-loading-font-color: var(--color-button-success-font);
+	--button-loading-border-color: var(--color-success);
+	--button-loading-background-color: var(--color-success);
+}
+
+@mixin n8n-button-warning {
+	--button-font-color: var(--color-button-warning-font);
+	--button-border-color: var(--color-warning);
+	--button-background-color: var(--color-warning);
+
+	--button-hover-font-color: var(--color-button-warning-font);
+	--button-hover-border-color: var(--color-warning-shade-1);
+	--button-hover-background-color: var(--color-warning-shade-1);
+
+	--button-active-font-color: var(--color-button-warning-font);
+	--button-active-border-color: var(--color-warning-shade-1);
+	--button-active-background-color: var(--color-warning-shade-1);
+
+	--button-focus-font-color: var(--color-button-warning-font);
+	--button-focus-border-color: var(--color-warning);
+	--button-focus-background-color: var(--color-warning);
+	--button-focus-outline-color: var(--color-warning-tint-1);
+
+	--button-disabled-font-color: var(--color-button-warning-disabled-font);
+	--button-disabled-border-color: var(--color-warning-tint-1);
+	--button-disabled-background-color: var(--color-warning-tint-1);
+
+	--button-loading-font-color: var(--color-button-warning-font);
+	--button-loading-border-color: var(--color-warning);
+	--button-loading-background-color: var(--color-warning);
+}
+
+@mixin n8n-button-danger {
+	--button-font-color: var(--color-button-danger-font);
+	--button-border-color: var(--color-danger);
+	--button-background-color: var(--color-danger);
+
+	--button-hover-font-color: var(--color-button-danger-font);
+	--button-hover-border-color: var(--color-danger-shade-1);
+	--button-hover-background-color: var(--color-danger-shade-1);
+
+	--button-active-font-color: var(--color-button-danger-font);
+	--button-active-border-color: var(--color-danger-shade-1);
+	--button-active-background-color: var(--color-danger-shade-1);
+
+	--button-focus-font-color: var(--color-button-danger-font);
+	--button-focus-border-color: var(--color-danger);
+	--button-focus-background-color: var(--color-danger);
+	--button-focus-outline-color: var(--color-danger-tint-1);
+
+	--button-disabled-font-color: var(--color-button-danger-disabled-font);
+	--button-disabled-border-color: var(--color-danger-tint-1);
+	--button-disabled-background-color: var(--color-danger-tint-1);
+
+	--button-loading-font-color: var(--color-button-danger-font);
+	--button-loading-border-color: var(--color-danger);
+	--button-loading-background-color: var(--color-danger);
+}
diff --git a/packages/design-system/src/components/N8nButton/Button.stories.ts b/packages/design-system/src/components/N8nButton/Button.stories.ts
index 7a46ae1c647d6..8234849097230 100644
--- a/packages/design-system/src/components/N8nButton/Button.stories.ts
+++ b/packages/design-system/src/components/N8nButton/Button.stories.ts
@@ -1,6 +1,6 @@
 import N8nButton from './Button.vue';
 import { action } from '@storybook/addon-actions';
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 
 export default {
 	title: 'Atoms/Button',
@@ -13,8 +13,8 @@ export default {
 		size: {
 			control: {
 				type: 'select',
-				options: ['mini', 'small', 'medium', 'large', 'xlarge'],
 			},
+			options: ['mini', 'small', 'medium', 'large', 'xlarge'],
 		},
 		float: {
 			type: 'select',
@@ -34,11 +34,12 @@ const methods = {
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nButton,
 	},
-	template: '<n8n-button v-bind="$props" @click="onClick" />',
+	template: '<n8n-button v-bind="args" @click="onClick" />',
 	methods,
 });
 
@@ -48,48 +49,50 @@ Button.args = {
 };
 
 const AllSizesTemplate: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nButton,
 	},
 	template: `<div>
-		<n8n-button v-bind="$props" size="large" @click="onClick" />
-		<n8n-button v-bind="$props" size="medium" @click="onClick" />
-		<n8n-button v-bind="$props" size="small" @click="onClick" />
-		<n8n-button v-bind="$props" :loading="true" @click="onClick" />
-		<n8n-button v-bind="$props" :disabled="true" @click="onClick" />
+		<n8n-button v-bind="args" size="large" @click="onClick" />
+		<n8n-button v-bind="args" size="medium" @click="onClick" />
+		<n8n-button v-bind="args" size="small" @click="onClick" />
+		<n8n-button v-bind="args" :loading="true" @click="onClick" />
+		<n8n-button v-bind="args" :disabled="true" @click="onClick" />
 	</div>`,
 	methods,
 });
 
 const AllColorsAndSizesTemplate: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nButton,
 	},
 	template: `<div>
-		<n8n-button v-bind="$props" size="large" type="primary" @click="onClick" />
-		<n8n-button v-bind="$props" size="large" type="secondary" @click="onClick" />
-		<n8n-button v-bind="$props" size="large" type="tertiary" @click="onClick" />
-		<n8n-button v-bind="$props" size="large" type="success" @click="onClick" />
-		<n8n-button v-bind="$props" size="large" type="warning" @click="onClick" />
-		<n8n-button v-bind="$props" size="large" type="danger" @click="onClick" />
+		<n8n-button v-bind="args" size="large" type="primary" @click="onClick" />
+		<n8n-button v-bind="args" size="large" type="secondary" @click="onClick" />
+		<n8n-button v-bind="args" size="large" type="tertiary" @click="onClick" />
+		<n8n-button v-bind="args" size="large" type="success" @click="onClick" />
+		<n8n-button v-bind="args" size="large" type="warning" @click="onClick" />
+		<n8n-button v-bind="args" size="large" type="danger" @click="onClick" />
 		<br/>
 		<br/>
-		<n8n-button v-bind="$props" size="medium" type="primary" @click="onClick" />
-		<n8n-button v-bind="$props" size="medium" type="secondary" @click="onClick" />
-		<n8n-button v-bind="$props" size="medium" type="tertiary" @click="onClick" />
-		<n8n-button v-bind="$props" size="medium" type="success" @click="onClick" />
-		<n8n-button v-bind="$props" size="medium" type="warning" @click="onClick" />
-		<n8n-button v-bind="$props" size="medium" type="danger" @click="onClick" />
+		<n8n-button v-bind="args" size="medium" type="primary" @click="onClick" />
+		<n8n-button v-bind="args" size="medium" type="secondary" @click="onClick" />
+		<n8n-button v-bind="args" size="medium" type="tertiary" @click="onClick" />
+		<n8n-button v-bind="args" size="medium" type="success" @click="onClick" />
+		<n8n-button v-bind="args" size="medium" type="warning" @click="onClick" />
+		<n8n-button v-bind="args" size="medium" type="danger" @click="onClick" />
 		<br/>
 		<br/>
-		<n8n-button v-bind="$props" size="small" type="primary" @click="onClick" />
-		<n8n-button v-bind="$props" size="small" type="secondary" @click="onClick" />
-		<n8n-button v-bind="$props" size="small" type="tertiary" @click="onClick" />
-		<n8n-button v-bind="$props" size="small" type="success" @click="onClick" />
-		<n8n-button v-bind="$props" size="small" type="warning" @click="onClick" />
-		<n8n-button v-bind="$props" size="small" type="danger" @click="onClick" />
+		<n8n-button v-bind="args" size="small" type="primary" @click="onClick" />
+		<n8n-button v-bind="args" size="small" type="secondary" @click="onClick" />
+		<n8n-button v-bind="args" size="small" type="tertiary" @click="onClick" />
+		<n8n-button v-bind="args" size="small" type="success" @click="onClick" />
+		<n8n-button v-bind="args" size="small" type="warning" @click="onClick" />
+		<n8n-button v-bind="args" size="small" type="danger" @click="onClick" />
 	</div>`,
 	methods,
 });
diff --git a/packages/design-system/src/components/N8nButton/Button.vue b/packages/design-system/src/components/N8nButton/Button.vue
index 127a1abd5ff3e..c293deab5dc63 100644
--- a/packages/design-system/src/components/N8nButton/Button.vue
+++ b/packages/design-system/src/components/N8nButton/Button.vue
@@ -1,174 +1,103 @@
 <template>
-	<button
+	<component
+		:is="element"
 		:class="classes"
-		:disabled="disabled || loading"
+		:disabled="isDisabled"
 		:aria-disabled="ariaDisabled"
 		:aria-busy="ariaBusy"
+		:href="href"
 		aria-live="polite"
-		v-on="$listeners"
+		v-bind="$attrs"
 	>
-		<span :class="$style.icon" v-if="loading || icon">
-			<n8n-spinner v-if="loading" :size="size" />
-			<n8n-icon v-else-if="icon" :icon="icon" :size="size" />
+		<span v-if="loading || icon" :class="$style.icon">
+			<N8nSpinner v-if="loading" :size="size" />
+			<N8nIcon v-else-if="icon" :icon="icon" :size="size" />
 		</span>
 		<span v-if="label || $slots.default">
 			<slot>{{ label }}</slot>
 		</span>
-	</button>
+	</component>
 </template>
 
-<script lang="ts">
-import { defineComponent } from 'vue';
+<script setup lang="ts">
+import { useCssModule, computed, useAttrs, watchEffect } from 'vue';
 import N8nIcon from '../N8nIcon';
 import N8nSpinner from '../N8nSpinner';
-
-export default defineComponent({
-	name: 'n8n-button',
-	props: {
-		label: {
-			type: String,
-		},
-		type: {
-			type: String,
-			default: 'primary',
-			validator: (value: string): boolean =>
-				['primary', 'secondary', 'tertiary', 'success', 'warning', 'danger'].includes(value),
-		},
-		size: {
-			type: String,
-			default: 'medium',
-			validator: (value: string): boolean =>
-				['mini', 'small', 'medium', 'large', 'xlarge'].includes(value),
-		},
-		loading: {
-			type: Boolean,
-			default: false,
-		},
-		disabled: {
-			type: Boolean,
-			default: false,
-		},
-		outline: {
-			type: Boolean,
-			default: false,
-		},
-		text: {
-			type: Boolean,
-			default: false,
-		},
-		icon: {
-			type: [String, Array],
-		},
-		block: {
-			type: Boolean,
-			default: false,
-		},
-		active: {
-			type: Boolean,
-			default: false,
-		},
-		float: {
-			type: String,
-			validator: (value: string): boolean => ['left', 'right'].includes(value),
-		},
-		square: {
-			type: Boolean,
-			default: false,
-		},
-	},
-	components: {
-		N8nSpinner,
-		N8nIcon,
-	},
-	computed: {
-		ariaBusy(): 'true' | undefined {
-			return this.loading ? 'true' : undefined;
-		},
-		ariaDisabled(): 'true' | undefined {
-			return this.disabled ? 'true' : undefined;
-		},
-		classes(): string {
-			return (
-				`button ${this.$style.button} ${this.$style[this.type]}` +
-				`${this.size ? ` ${this.$style[this.size]}` : ''}` +
-				`${this.outline ? ` ${this.$style.outline}` : ''}` +
-				`${this.loading ? ` ${this.$style.loading}` : ''}` +
-				`${this.float ? ` ${this.$style[`float-${this.float}`]}` : ''}` +
-				`${this.text ? ` ${this.$style.text}` : ''}` +
-				`${this.disabled ? ` ${this.$style.disabled}` : ''}` +
-				`${this.block ? ` ${this.$style.block}` : ''}` +
-				`${this.active ? ` ${this.$style.active}` : ''}` +
-				`${this.icon || this.loading ? ` ${this.$style.icon}` : ''}` +
-				`${this.square ? ` ${this.$style.square}` : ''}`
-			);
-		},
-	},
+import type { ButtonProps } from '@/types/button';
+
+const $style = useCssModule();
+const $attrs = useAttrs();
+
+defineOptions({ name: 'N8nButton' });
+const props = withDefaults(defineProps<ButtonProps>(), {
+	label: '',
+	type: 'primary',
+	size: 'medium',
+	loading: false,
+	disabled: false,
+	outline: false,
+	text: false,
+	block: false,
+	active: false,
+	square: false,
+	element: 'button',
 });
-</script>
 
-<style lang="scss" module>
-@import '../../css/mixins/utils';
-@import '../../css/common/var';
+watchEffect(() => {
+	if (props.element === 'a' && !props.href) {
+		console.error('n8n-button:href is required for link buttons');
+	}
+});
 
-.button {
-	display: inline-block;
-	line-height: 1;
-	white-space: nowrap;
-	cursor: pointer;
-
-	border: var(--border-width-base) $button-border-color var(--border-style-base);
-	color: $button-font-color;
-	background-color: $button-background-color;
-	font-weight: var(--font-weight-bold);
-	border-radius: $button-border-radius;
-	padding: $button-padding-vertical $button-padding-horizontal;
-	font-size: $button-font-size;
-
-	-webkit-appearance: none;
-	text-align: center;
-	box-sizing: border-box;
-	outline: none;
-	margin: 0;
-	transition: 0.3s;
-
-	@include utils-user-select(none);
+const ariaBusy = computed(() => (props.loading ? 'true' : undefined));
+const ariaDisabled = computed(() => (props.disabled ? 'true' : undefined));
+const isDisabled = computed(() => props.disabled || props.loading);
+
+const classes = computed(() => {
+	return (
+		`button ${$style.button} ${$style[props.type]}` +
+		`${props.size ? ` ${$style[props.size]}` : ''}` +
+		`${props.outline ? ` ${$style.outline}` : ''}` +
+		`${props.loading ? ` ${$style.loading}` : ''}` +
+		`${props.float ? ` ${$style[`float-${props.float}`]}` : ''}` +
+		`${props.text ? ` ${$style.text}` : ''}` +
+		`${props.disabled ? ` ${$style.disabled}` : ''}` +
+		`${props.block ? ` ${$style.block}` : ''}` +
+		`${props.active ? ` ${$style.active}` : ''}` +
+		`${props.icon || props.loading ? ` ${$style.withIcon}` : ''}` +
+		`${props.square ? ` ${$style.square}` : ''}`
+	);
+});
+</script>
 
-	&:hover {
-		color: $button-hover-color;
-		border-color: $button-hover-border-color;
-		background-color: $button-hover-background-color;
-	}
+<style lang="scss">
+@import './Button';
 
-	&:focus {
-		border-color: $button-focus-outline-color;
-		outline: $focus-outline-width solid $button-focus-outline-color;
-	}
+.el-button {
+	@include n8n-button(true);
 
-	&:active,
-	&.active {
-		color: $button-active-color;
-		border-color: $button-active-border-color;
-		background-color: $button-active-background-color;
-		outline: none;
-	}
+	--button-padding-vertical: var(--spacing-2xs);
+	--button-padding-horizontal: var(--spacing-xs);
+	--button-font-size: var(--font-size-2xs);
 
-	&::-moz-focus-inner {
-		border: 0;
+	+ .el-button {
+		margin-left: var(--spacing-2xs);
 	}
 
-	> i {
-		display: none;
+	&.btn--cancel,
+	&.el-color-dropdown__link-btn {
+		@include n8n-button-secondary;
 	}
+}
+</style>
 
-	> span {
-		display: flex;
-		justify-content: center;
-		align-items: center;
-	}
+<style lang="scss" module>
+@import './Button';
+@import '../../css/mixins/utils';
+@import '../../css/common/var';
 
-	span + span {
-		margin-left: var(--spacing-3xs);
-	}
+.button {
+	@include n8n-button;
 }
 
 $loading-overlay-background-color: rgba(255, 255, 255, 0);
@@ -178,106 +107,40 @@ $loading-overlay-background-color: rgba(255, 255, 255, 0);
  */
 
 .secondary {
-	--button-color: var(--color-primary);
-	--button-border-color: var(--color-primary);
-	--button-background-color: var(--color-background-xlight);
-
-	--button-active-background-color: var(--color-primary-tint-2);
-	--button-active-color: var(--color-primary);
-	--button-active-border-color: var(--color-primary);
-
-	--button-hover-background-color: var(--color-primary-tint-3);
-	--button-hover-color: var(--color-primary);
-	--button-hover-border-color: var(--color-primary);
-
-	--button-focus-outline-color: var(--color-primary-tint-1);
+	@include n8n-button-secondary;
 }
 
 .tertiary {
-	font-weight: var(--font-weight-bold) !important;
-
-	--button-background-color: var(--color-background-xlight);
-	--button-color: var(--color-text-dark);
-	--button-border-color: var(--color-neutral-850);
-
-	--button-active-background-color: var(--color-primary-tint-2);
-	--button-active-color: var(--color-primary);
-	--button-active-border-color: var(--color-primary);
-
-	--button-hover-background-color: var(--color-neutral-950);
-	--button-hover-color: var(--color-text-dark);
-	--button-hover-border-color: var(--color-neutral-800);
-
-	--button-focus-outline-color: hsla(
-		var(--color-neutral-h),
-		var(--color-neutral-s),
-		var(--color-neutral-l),
-		0.2
-	);
+	@include n8n-button-secondary;
 }
 
 .success {
-	--button-background-color: var(--color-success);
-	--button-color: var(--color-text-xlight);
-	--button-border-color: var(--color-success);
-
-	--button-active-background-color: var(--color-success-350);
-	--button-active-border-color: var(--color-success-350);
-
-	--button-hover-background-color: var(--color-success-450);
-	--button-hover-border-color: var(--color-success-450);
-
-	--button-focus-outline-color: hsla(
-		var(--color-success-h),
-		var(--color-success-s),
-		var(--color-success-l),
-		0.33
-	);
+	@include n8n-button-success;
 }
 
 .warning {
-	--button-background-color: var(--color-warning);
-	--button-color: var(--color-text-xlight);
-	--button-border-color: var(--color-warning);
-
-	--button-active-background-color: var(--color-warning-500);
-	--button-active-border-color: var(--color-warning-500);
-
-	--button-hover-background-color: var(--color-warning-650);
-	--button-hover-border-color: var(--color-warning-650);
-
-	--button-focus-outline-color: hsla(
-		var(--color-warning-h),
-		var(--color-warning-s),
-		var(--color-warning-l),
-		0.33
-	);
+	@include n8n-button-warning;
 }
 
 .danger {
-	--button-background-color: var(--color-danger);
-	--button-color: var(--color-text-xlight);
-	--button-border-color: var(--color-danger);
-	--button-active-color: var(--color-text-xlight);
-
-	--button-active-background-color: var(--color-danger-600);
-	--button-active-border-color: var(--color-danger-600);
-
-	--button-hover-background-color: var(--color-danger-700);
-	--button-hover-border-color: var(--color-danger-700);
-
-	--button-focus-outline-color: hsla(
-		var(--color-danger-h),
-		var(--color-danger-s),
-		var(--color-danger-l),
-		0.33
-	);
+	@include n8n-button-danger;
 }
 
 /**
  * Sizes
  */
 
+.xmini {
+	--button-padding-vertical: var(--spacing-4xs);
+	--button-padding-horizontal: var(--spacing-3xs);
+	--button-font-size: var(--font-size-3xs);
+
+	&.square {
+		height: 22px;
+		width: 22px;
+	}
+}
+
 .mini {
 	--button-padding-vertical: var(--spacing-4xs);
 	--button-padding-horizontal: var(--spacing-2xs);
@@ -332,85 +195,98 @@ $loading-overlay-background-color: rgba(255, 255, 255, 0);
 /**
  * Modifiers
  */
-
 .outline {
-	--button-color: var(--color-primary);
 	--button-background-color: transparent;
 	--button-disabled-background-color: transparent;
-	--button-active-background-color: transparent;
 
 	&.primary {
-		--button-color: var(--color-primary);
-		--button-border-color: var(--color-primary);
-		--button-active-background-color: var(--color-primary);
-	}
-
-	&.tertiary {
-		--button-color: var(--color-text-dark);
+		--button-font-color: var(--color-primary);
+		--button-disabled-font-color: var(--color-primary-tint-1);
+		--button-disabled-border-color: var(--color-primary-tint-1);
+		--button-disabled-background-color: transparent;
 	}
 
 	&.success {
-		--button-color: var(--color-success);
+		--button-font-color: var(--color-success);
 		--button-border-color: var(--color-success);
+		--button-hover-border-color: var(--color-success);
+		--button-hover-background-color: var(--color-success);
 		--button-active-background-color: var(--color-success);
+		--button-disabled-font-color: var(--color-success-light);
+		--button-disabled-border-color: var(--color-success-light);
+		--button-disabled-background-color: transparent;
 	}
 
 	&.warning {
-		--button-color: var(--color-warning);
+		--button-font-color: var(--color-warning);
 		--button-border-color: var(--color-warning);
+		--button-hover-border-color: var(--color-warning);
+		--button-hover-background-color: var(--color-warning);
 		--button-active-background-color: var(--color-warning);
+		--button-disabled-font-color: var(--color-warning-tint-1);
+		--button-disabled-border-color: var(--color-warning-tint-1);
+		--button-disabled-background-color: transparent;
 	}
 
 	&.danger {
-		--button-color: var(--color-danger);
+		--button-font-color: var(--color-danger);
 		--button-border-color: var(--color-danger);
+		--button-hover-border-color: var(--color-danger);
+		--button-hover-background-color: var(--color-danger);
 		--button-active-background-color: var(--color-danger);
+		--button-disabled-font-color: var(--color-danger-tint-1);
+		--button-disabled-border-color: var(--color-danger-tint-1);
+		--button-disabled-background-color: transparent;
 	}
 }
 
 .text {
-	--button-color: var(--color-text-light);
+	--button-font-color: var(--color-text-button-secondary-font);
 	--button-border-color: transparent;
 	--button-background-color: transparent;
-	--button-active-color: var(--color-text-light);
-	--button-active-background-color: transparent;
-	--button-active-border-color: transparent;
-	--button-hover-color: var(--color-text-light);
-	--button-hover-background-color: transparent;
 	--button-hover-border-color: transparent;
+	--button-hover-background-color: transparent;
+	--button-active-border-color: transparent;
+	--button-active-background-color: transparent;
+	--button-focus-border-color: transparent;
+	--button-focus-background-color: transparent;
+	--button-disabled-border-color: transparent;
+	--button-disabled-background-color: transparent;
 
-	&.primary {
-		--button-color: var(--color-primary);
-		--button-active-color: var(--color-primary);
-		--button-hover-color: var(--color-primary);
+	&:focus {
+		outline: 0;
 	}
 
-	&.secondary {
-		--button-color: var(--color-primary-tint-1);
-		--button-active-color: var(--color-primary-tint-1);
-		--button-hover-color: var(--color-primary-tint-1);
+	&.primary {
+		--button-font-color: var(--color-primary);
+		--button-hover-font-color: var(--color-primary-shade-1);
+		--button-active-font-color: var(--color-primary-shade-1);
+		--button-focus-font-color: var(--color-primary);
+		--button-disabled-font-color: var(--color-primary-tint-1);
 	}
 
 	&.success {
-		--button-color: var(--color-success);
-		--button-active-color: var(--color-success);
-		--button-hover-color: var(--color-success);
-	}
-
-	&.tertiary {
-		--button-hover-color: var(--color-primary);
+		--button-font-color: var(--color-success);
+		--button-hover-font-color: var(--color-success-shade-1);
+		--button-active-font-color: var(--color-success-shade-1);
+		--button-focus-font-color: var(--color-success);
+		--button-disabled-font-color: var(--color-success-light);
 	}
 
 	&.warning {
-		--button-color: var(--color-warning);
-		--button-active-color: var(--color-warning);
-		--button-hover-color: var(--color-warning);
+		--button-font-color: var(--color-warning);
+		--button-hover-font-color: var(--color-warning-shade-1);
+		--button-active-font-color: var(--color-warning-shade-1);
+		--button-focus-font-color: var(--color-warning);
+		--button-disabled-font-color: var(--color-warning-tint-1);
 	}
 
 	&.danger {
-		--button-color: var(--color-danger);
-		--button-active-color: var(--color-danger);
-		--button-hover-color: var(--color-danger);
+		--button-font-color: var(--color-danger);
+		--button-hover-font-color: var(--color-danger-shade-1);
+		--button-active-font-color: var(--color-danger-shade-1);
+		--button-focus-font-color: var(--color-danger);
+		--button-disabled-font-color: var(--color-danger-tint-1);
 	}
 
 	&:hover {
@@ -431,7 +307,6 @@ $loading-overlay-background-color: rgba(255, 255, 255, 0);
 		right: -1px;
 		bottom: -1px;
 		border-radius: inherit;
-		background-color: $loading-overlay-background-color;
 	}
 }
 
@@ -442,9 +317,6 @@ $loading-overlay-background-color: rgba(255, 255, 255, 0);
 	&:focus {
 		cursor: not-allowed;
 		background-image: none;
-		color: $button-disabled-font-color;
-		background-color: $button-disabled-background-color;
-		border-color: $button-disabled-border-color;
 	}
 }
 
@@ -453,9 +325,16 @@ $loading-overlay-background-color: rgba(255, 255, 255, 0);
 	--button-active-background-color: transparent;
 }
 
+.withIcon {
+	display: inline-flex;
+	justify-content: center;
+	align-items: center;
+}
+
 .icon {
 	display: inline-flex;
 	justify-content: center;
+	align-items: center;
 
 	svg {
 		display: block;
diff --git a/packages/design-system/src/components/N8nButton/__tests__/Button.spec.ts b/packages/design-system/src/components/N8nButton/__tests__/Button.spec.ts
index 184307c24e5b2..9ead6c73449b0 100644
--- a/packages/design-system/src/components/N8nButton/__tests__/Button.spec.ts
+++ b/packages/design-system/src/components/N8nButton/__tests__/Button.spec.ts
@@ -1,6 +1,5 @@
 import { render } from '@testing-library/vue';
 import N8nButton from '../Button.vue';
-import ElButton from '../overrides/ElButton.vue';
 
 const slots = {
 	default: 'Button',
@@ -12,7 +11,9 @@ describe('components', () => {
 		it('should render correctly', () => {
 			const wrapper = render(N8nButton, {
 				slots,
-				stubs,
+				global: {
+					stubs,
+				},
 			});
 			expect(wrapper.html()).toMatchSnapshot();
 		});
@@ -25,7 +26,9 @@ describe('components', () => {
 							loading: true,
 						},
 						slots,
-						stubs,
+						global: {
+							stubs,
+						},
 					});
 					expect(wrapper.html()).toMatchSnapshot();
 				});
@@ -38,7 +41,9 @@ describe('components', () => {
 							icon: 'plus-circle',
 						},
 						slots,
-						stubs,
+						global: {
+							stubs,
+						},
 					});
 					expect(wrapper.html()).toMatchSnapshot();
 				});
@@ -51,64 +56,13 @@ describe('components', () => {
 							square: true,
 							label: '48',
 						},
-						stubs,
+						global: {
+							stubs,
+						},
 					});
 					expect(wrapper.html()).toMatchSnapshot();
 				});
 			});
 		});
-
-		describe('overrides', () => {
-			it('should use default (`primary`) type when no type is given', () => {
-				const wrapper = render(ElButton, {
-					props: {
-						icon: 'plus-circle',
-					},
-					slots,
-					stubs,
-				});
-
-				expect(wrapper.html()).toMatchSnapshot();
-			});
-
-			it('should use given (`secondary`) type', () => {
-				const wrapper = render(ElButton, {
-					props: {
-						icon: 'plus-circle',
-						type: 'secondary',
-					},
-					slots,
-					stubs,
-				});
-
-				expect(wrapper.html()).toMatchSnapshot();
-			});
-
-			it('should render as `secondary` when `text` is given as type', () => {
-				const wrapper = render(ElButton, {
-					props: {
-						icon: 'plus-circle',
-						type: 'text',
-					},
-					slots,
-					stubs,
-				});
-
-				expect(wrapper.html()).toMatchSnapshot();
-			});
-
-			it('should render as `tertiary` when `info` is given as type', () => {
-				const wrapper = render(ElButton, {
-					props: {
-						icon: 'plus-circle',
-						type: 'info',
-					},
-					slots,
-					stubs,
-				});
-
-				expect(wrapper.html()).toMatchSnapshot();
-			});
-		});
 	});
 });
diff --git a/packages/design-system/src/components/N8nButton/__tests__/__snapshots__/Button.spec.ts.snap b/packages/design-system/src/components/N8nButton/__tests__/__snapshots__/Button.spec.ts.snap
index fa45534fe48fc..7b23d39ad89f0 100644
--- a/packages/design-system/src/components/N8nButton/__tests__/__snapshots__/Button.spec.ts.snap
+++ b/packages/design-system/src/components/N8nButton/__tests__/__snapshots__/Button.spec.ts.snap
@@ -1,23 +1,17 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`components > N8nButton > overrides > should render as \`secondary\` when \`text\` is given as type 1`] = `"<button aria-live=\\"polite\\" class=\\"button button secondary medium icon\\" icon=\\"plus-circle\\"><span class=\\"icon\\"><n8n-icon-stub icon=\\"plus-circle\\" size=\\"medium\\"></n8n-icon-stub></span><span>Button</span></button>"`;
+exports[`components > N8nButton > props > icon > should render icon button 1`] = `"<button class="button button primary medium withIcon" aria-live="polite"><span class="icon"><n8n-icon-stub icon="plus-circle" size="medium" spin="false"></n8n-icon-stub></span><span>Button</span></button>"`;
 
-exports[`components > N8nButton > overrides > should render as \`tertiary\` when \`info\` is given as type 1`] = `"<button aria-live=\\"polite\\" class=\\"button button tertiary medium icon\\" icon=\\"plus-circle\\"><span class=\\"icon\\"><n8n-icon-stub icon=\\"plus-circle\\" size=\\"medium\\"></n8n-icon-stub></span><span>Button</span></button>"`;
-
-exports[`components > N8nButton > overrides > should use default (\`primary\`) type when no type is given 1`] = `"<button aria-live=\\"polite\\" class=\\"button button primary medium icon\\" icon=\\"plus-circle\\"><span class=\\"icon\\"><n8n-icon-stub icon=\\"plus-circle\\" size=\\"medium\\"></n8n-icon-stub></span><span>Button</span></button>"`;
-
-exports[`components > N8nButton > overrides > should use given (\`secondary\`) type 1`] = `"<button aria-live=\\"polite\\" class=\\"button button secondary medium icon\\" icon=\\"plus-circle\\"><span class=\\"icon\\"><n8n-icon-stub icon=\\"plus-circle\\" size=\\"medium\\"></n8n-icon-stub></span><span>Button</span></button>"`;
-
-exports[`components > N8nButton > props > icon > should render icon button 1`] = `"<button aria-live=\\"polite\\" class=\\"button button primary medium icon\\"><span class=\\"icon\\"><n8n-icon-stub icon=\\"plus-circle\\" size=\\"medium\\"></n8n-icon-stub></span><span>Button</span></button>"`;
-
-exports[`components > N8nButton > props > loading > should render loading spinner 1`] = `"<button disabled=\\"disabled\\" aria-busy=\\"true\\" aria-live=\\"polite\\" class=\\"button button primary medium loading icon\\"><span class=\\"icon\\"><n8n-spinner-stub size=\\"medium\\" type=\\"dots\\"></n8n-spinner-stub></span><span>Button</span></button>"`;
+exports[`components > N8nButton > props > loading > should render loading spinner 1`] = `"<button class="button button primary medium loading withIcon" disabled="" aria-busy="true" aria-live="polite"><span class="icon"><n8n-spinner-stub size="medium" type="dots"></n8n-spinner-stub></span><span>Button</span></button>"`;
 
 exports[`components > N8nButton > props > square > should render square button 1`] = `
-"<button aria-live=\\"polite\\" class=\\"button button primary medium square\\">
-  <!----><span>48</span></button>"
+"<button class="button button primary medium square" aria-live="polite">
+  <!--v-if--><span>48</span>
+</button>"
 `;
 
 exports[`components > N8nButton > should render correctly 1`] = `
-"<button aria-live=\\"polite\\" class=\\"button button primary medium\\">
-  <!----><span>Button</span></button>"
+"<button class="button button primary medium" aria-live="polite">
+  <!--v-if--><span>Button</span>
+</button>"
 `;
diff --git a/packages/design-system/src/components/N8nButton/overrides/ElButton.ts b/packages/design-system/src/components/N8nButton/overrides/ElButton.ts
deleted file mode 100644
index 88c583bba16f0..0000000000000
--- a/packages/design-system/src/components/N8nButton/overrides/ElButton.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import ElButton from './ElButton.vue';
-
-export default ElButton;
diff --git a/packages/design-system/src/components/N8nButton/overrides/ElButton.vue b/packages/design-system/src/components/N8nButton/overrides/ElButton.vue
deleted file mode 100644
index 1cbb31b8200f3..0000000000000
--- a/packages/design-system/src/components/N8nButton/overrides/ElButton.vue
+++ /dev/null
@@ -1,51 +0,0 @@
-<template>
-	<n8n-button ref="button" v-bind="attrs" v-on="$listeners">
-		<slot />
-	</n8n-button>
-</template>
-
-<script lang="ts">
-import { defineComponent } from 'vue';
-import N8nButton from '../Button.vue';
-
-const classToTypeMap = {
-	'btn--cancel': 'secondary',
-	'el-picker-panel__link-btn': 'secondary',
-};
-
-type ButtonRef = InstanceType<typeof N8nButton>;
-
-export default defineComponent({
-	components: {
-		N8nButton,
-	},
-	computed: {
-		attrs() {
-			let type = this.$attrs.type || 'primary';
-
-			/* Element UI Button can have 'text' or 'info' type which is not supported by n8n-button
-			 so render it as 'secondary' or 'tertiary' */
-			if (type === 'text') {
-				type = 'secondary';
-			}
-
-			if (type === 'info') {
-				type = 'tertiary';
-			}
-
-			Object.entries(classToTypeMap).forEach(([className, mappedType]) => {
-				if ((this.$refs.button as ButtonRef)?.$el.classList.contains(className)) {
-					type = mappedType;
-				}
-			});
-
-			delete this.$attrs.type;
-
-			return {
-				...this.$attrs,
-				type,
-			};
-		},
-	},
-});
-</script>
diff --git a/packages/design-system/src/components/N8nButton/overrides/index.ts b/packages/design-system/src/components/N8nButton/overrides/index.ts
deleted file mode 100644
index c62be6ec636fb..0000000000000
--- a/packages/design-system/src/components/N8nButton/overrides/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default as N8nElButton } from './ElButton.vue';
diff --git a/packages/design-system/src/components/N8nCallout/Callout.stories.ts b/packages/design-system/src/components/N8nCallout/Callout.stories.ts
index 48ccdafa77739..fe2f3988999ea 100644
--- a/packages/design-system/src/components/N8nCallout/Callout.stories.ts
+++ b/packages/design-system/src/components/N8nCallout/Callout.stories.ts
@@ -1,7 +1,7 @@
 import N8nCallout from './Callout.vue';
 import N8nLink from '../N8nLink';
 import N8nText from '../N8nText';
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 
 export default {
 	title: 'Atoms/Callout',
@@ -10,8 +10,8 @@ export default {
 		theme: {
 			control: {
 				type: 'select',
-				options: ['info', 'secondary', 'success', 'warning', 'danger', 'custom'],
 			},
+			options: ['info', 'secondary', 'success', 'warning', 'danger', 'custom'],
 		},
 		message: {
 			control: {
@@ -41,6 +41,7 @@ interface Args {
 }
 
 const template: StoryFn<Args> = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nLink,
@@ -48,12 +49,12 @@ const template: StoryFn<Args> = (args, { argTypes }) => ({
 		N8nCallout,
 	},
 	template: `
-		<n8n-callout v-bind="$props">
+		<n8n-callout v-bind="args">
 			${args.default}
-			<template #actions v-if="actions">
+			<template #actions v-if="args.actions">
 				${args.actions}
 			</template>
-			<template #trailingContent v-if="trailingContent">
+			<template #trailingContent v-if="args.trailingContent">
 				${args.trailingContent}
 			</template>
 		</n8n-callout>
diff --git a/packages/design-system/src/components/N8nCallout/Callout.vue b/packages/design-system/src/components/N8nCallout/Callout.vue
index 97c15296e0558..453555cf99ae9 100644
--- a/packages/design-system/src/components/N8nCallout/Callout.vue
+++ b/packages/design-system/src/components/N8nCallout/Callout.vue
@@ -1,12 +1,12 @@
 <template>
 	<div :class="classes" role="alert">
-		<div :class="$style['message-section']">
-			<div :class="$style.icon">
-				<n8n-icon :icon="getIcon" :size="theme === 'secondary' ? 'medium' : 'large'" />
+		<div :class="$style.messageSection">
+			<div v-if="!iconless" :class="$style.icon">
+				<N8nIcon :icon="getIcon" :size="getIconSize" />
 			</div>
-			<n8n-text size="small">
+			<N8nText size="small">
 				<slot />
-			</n8n-text>
+			</N8nText>
 			&nbsp;
 			<slot name="actions" />
 		</div>
@@ -15,48 +15,58 @@
 	</div>
 </template>
 
-<script lang="ts">
-import { defineComponent } from 'vue';
+<script lang="ts" setup>
+import { computed, useCssModule } from 'vue';
 import N8nText from '../N8nText';
 import N8nIcon from '../N8nIcon';
+import type { IconSize } from '@/types/icon';
 
-const CALLOUT_DEFAULT_ICONS: { [key: string]: string } = {
+const THEMES = ['info', 'success', 'secondary', 'warning', 'danger', 'custom'] as const;
+export type CalloutTheme = (typeof THEMES)[number];
+
+const CALLOUT_DEFAULT_ICONS = {
 	info: 'info-circle',
 	success: 'check-circle',
 	warning: 'exclamation-triangle',
-	danger: 'times-circle',
+	danger: 'exclamation-triangle',
 };
 
-export default defineComponent({
-	name: 'n8n-callout',
-	components: {
-		N8nText,
-		N8nIcon,
-	},
-	props: {
-		theme: {
-			type: String,
-			required: true,
-			validator: (value: string): boolean =>
-				['info', 'success', 'secondary', 'warning', 'danger', 'custom'].includes(value),
-		},
-		icon: {
-			type: String,
-			default: 'info-circle',
-		},
-	},
-	computed: {
-		classes(): string[] {
-			return ['n8n-callout', this.$style.callout, this.$style[this.theme]];
-		},
-		getIcon(): string {
-			if (Object.keys(CALLOUT_DEFAULT_ICONS).includes(this.theme)) {
-				return CALLOUT_DEFAULT_ICONS[this.theme];
-			}
-
-			return this.icon;
-		},
-	},
+interface CalloutProps {
+	theme: CalloutTheme;
+	icon?: string;
+	iconSize?: IconSize;
+	iconless?: boolean;
+	slim?: boolean;
+	roundCorners?: boolean;
+}
+
+defineOptions({ name: 'N8nCallout' });
+const props = withDefaults(defineProps<CalloutProps>(), {
+	iconSize: 'medium',
+	roundCorners: true,
+});
+
+const $style = useCssModule();
+const classes = computed(() => [
+	'n8n-callout',
+	$style.callout,
+	$style[props.theme],
+	props.slim ? $style.slim : '',
+	props.roundCorners ? $style.round : '',
+]);
+
+const getIcon = computed(
+	() => props.icon ?? CALLOUT_DEFAULT_ICONS?.[props.theme] ?? CALLOUT_DEFAULT_ICONS.info,
+);
+
+const getIconSize = computed<IconSize>(() => {
+	if (props.iconSize) {
+		return props.iconSize;
+	}
+	if (props.theme === 'secondary') {
+		return 'medium';
+	}
+	return 'large';
 });
 </script>
 
@@ -67,50 +77,82 @@ export default defineComponent({
 	font-size: var(--font-size-2xs);
 	padding: var(--spacing-xs);
 	border: var(--border-width-base) var(--border-style-base);
-	border-radius: var(--border-radius-base);
 	align-items: center;
 	line-height: var(--font-line-height-loose);
+	border-color: var(--color-callout-info-border);
+	background-color: var(--color-callout-info-background);
+	color: var(--color-callout-info-font);
+
+	&.slim {
+		line-height: var(--font-line-height-loose);
+		padding: var(--spacing-3xs) var(--spacing-2xs);
+	}
 }
 
-.message-section {
+.round {
+	border-radius: var(--border-radius-base);
+}
+
+.messageSection {
 	display: flex;
 	align-items: center;
 }
 
 .info,
 .custom {
-	border-color: var(--color-foreground-base);
-	background-color: var(--color-background-light);
-	color: var(--color-info);
-}
+	border-color: var(--color-callout-info-border);
+	background-color: var(--color-callout-info-background);
+	color: var(--color-callout-info-font);
 
-.warning {
-	border-color: var(--color-warning-tint-1);
-	background-color: var(--color-warning-tint-2);
-	color: var(--color-warning);
+	.icon {
+		color: var(--color-callout-info-icon);
+	}
 }
 
 .success {
-	border-color: var(--color-success-tint-1);
-	background-color: var(--color-success-tint-2);
-	color: var(--color-success);
+	border-color: var(--color-callout-success-border);
+	background-color: var(--color-callout-success-background);
+	color: var(--color-callout-success-font);
+
+	.icon {
+		color: var(--color-callout-success-icon);
+	}
+}
+
+.warning {
+	border-color: var(--color-callout-warning-border);
+	background-color: var(--color-callout-warning-background);
+	color: var(--color-callout-warning-font);
+
+	.icon {
+		color: var(--color-callout-warning-icon);
+	}
 }
 
 .danger {
-	border-color: var(--color-danger-tint-1);
-	background-color: var(--color-danger-tint-2);
-	color: var(--color-danger);
+	border-color: var(--color-callout-danger-border);
+	background-color: var(--color-callout-danger-background);
+	color: var(--color-callout-danger-font);
+
+	.icon {
+		color: var(--color-callout-danger-icon);
+	}
 }
 
 .icon {
-	margin-right: var(--spacing-xs);
+	line-height: 1;
+	margin-right: var(--spacing-2xs);
 }
 
 .secondary {
 	font-size: var(--font-size-2xs);
 	font-weight: var(--font-weight-bold);
-	color: var(--color-secondary);
-	background-color: var(--color-secondary-tint-3);
-	border-color: var(--color-secondary-tint-1);
+	border-color: var(--color-callout-secondary-border);
+	background-color: var(--color-callout-secondary-background);
+	color: var(--color-callout-secondary-font);
+
+	.icon {
+		color: var(--color-callout-secondary-icon);
+	}
 }
 </style>
diff --git a/packages/design-system/src/components/N8nCallout/__tests__/Callout.spec.ts b/packages/design-system/src/components/N8nCallout/__tests__/Callout.spec.ts
index d25b105407b10..a55c32bf9f268 100644
--- a/packages/design-system/src/components/N8nCallout/__tests__/Callout.spec.ts
+++ b/packages/design-system/src/components/N8nCallout/__tests__/Callout.spec.ts
@@ -8,7 +8,9 @@ describe('components', () => {
 				props: {
 					theme: 'info',
 				},
-				stubs: ['n8n-icon', 'n8n-text'],
+				global: {
+					stubs: ['n8n-icon', 'n8n-text'],
+				},
 				slots: {
 					default: '<n8n-text size="small">This is an info callout.</n8n-text>',
 				},
@@ -20,7 +22,9 @@ describe('components', () => {
 				props: {
 					theme: 'success',
 				},
-				stubs: ['n8n-icon', 'n8n-text'],
+				global: {
+					stubs: ['n8n-icon', 'n8n-text'],
+				},
 				slots: {
 					default: '<n8n-text size="small">This is a success callout.</n8n-text>',
 				},
@@ -32,7 +36,9 @@ describe('components', () => {
 				props: {
 					theme: 'warning',
 				},
-				stubs: ['n8n-icon', 'n8n-text'],
+				global: {
+					stubs: ['n8n-icon', 'n8n-text'],
+				},
 				slots: {
 					default: '<n8n-text size="small">This is a warning callout.</n8n-text>',
 				},
@@ -44,7 +50,9 @@ describe('components', () => {
 				props: {
 					theme: 'danger',
 				},
-				stubs: ['n8n-icon', 'n8n-text'],
+				global: {
+					stubs: ['n8n-icon', 'n8n-text'],
+				},
 				slots: {
 					default: '<n8n-text size="small">This is a danger callout.</n8n-text>',
 				},
@@ -56,7 +64,9 @@ describe('components', () => {
 				props: {
 					theme: 'secondary',
 				},
-				stubs: ['n8n-icon', 'n8n-text'],
+				global: {
+					stubs: ['n8n-icon', 'n8n-text'],
+				},
 				slots: {
 					default: '<n8n-text size="small">This is a secondary callout.</n8n-text>',
 				},
@@ -69,7 +79,9 @@ describe('components', () => {
 					theme: 'custom',
 					icon: 'code-branch',
 				},
-				stubs: ['n8n-icon', 'n8n-text'],
+				global: {
+					stubs: ['n8n-icon', 'n8n-text'],
+				},
 				slots: {
 					default: '<n8n-text size="small">This is a secondary callout.</n8n-text>',
 				},
@@ -82,7 +94,9 @@ describe('components', () => {
 					theme: 'custom',
 					icon: 'code-branch',
 				},
-				stubs: ['n8n-icon', 'n8n-text', 'n8n-link'],
+				global: {
+					stubs: ['n8n-icon', 'n8n-text', 'n8n-link'],
+				},
 				slots: {
 					default: '<n8n-text size="small">This is a secondary callout.</n8n-text>',
 					actions: '<n8n-link size="small">Do something!</n8n-link>',
diff --git a/packages/design-system/src/components/N8nCallout/__tests__/__snapshots__/Callout.spec.ts.snap b/packages/design-system/src/components/N8nCallout/__tests__/__snapshots__/Callout.spec.ts.snap
index 17f61ac2e7ae0..0ba2bec2174f8 100644
--- a/packages/design-system/src/components/N8nCallout/__tests__/__snapshots__/Callout.spec.ts.snap
+++ b/packages/design-system/src/components/N8nCallout/__tests__/__snapshots__/Callout.spec.ts.snap
@@ -1,93 +1,79 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`components > N8nCallout > should render additional slots correctly 1`] = `
-"<div role=\\"alert\\" class=\\"n8n-callout callout custom\\">
-  <div class=\\"message-section\\">
-    <div class=\\"icon\\">
-      <n8n-icon-stub icon=\\"code-branch\\" size=\\"large\\"></n8n-icon-stub>
+"<div class="n8n-callout callout custom round" role="alert">
+  <div class="messageSection">
+    <div class="icon">
+      <n8n-icon-stub icon="code-branch" size="medium" spin="false"></n8n-icon-stub>
     </div>
-    <n8n-text-stub size=\\"small\\" tag=\\"span\\">
-      <n8n-text-stub size=\\"small\\" tag=\\"span\\">This is a secondary callout.</n8n-text-stub>
-    </n8n-text-stub> &nbsp; <n8n-link-stub size=\\"small\\">Do something!</n8n-link-stub>
+    <n8n-text-stub bold="false" size="small" compact="false" tag="span"></n8n-text-stub> &nbsp; <n8n-link-stub size="small"></n8n-link-stub>
   </div>
-  <n8n-link-stub theme=\\"secondary\\" size=\\"small\\" bold=\\"true\\" underline=\\"true\\" to=\\"https://n8n.io\\">Learn more</n8n-link-stub>
+  <n8n-link-stub theme="secondary" size="small" bold="true" underline="true" to="https://n8n.io"></n8n-link-stub>
 </div>"
 `;
 
 exports[`components > N8nCallout > should render custom theme correctly 1`] = `
-"<div role=\\"alert\\" class=\\"n8n-callout callout custom\\">
-  <div class=\\"message-section\\">
-    <div class=\\"icon\\">
-      <n8n-icon-stub icon=\\"code-branch\\" size=\\"large\\"></n8n-icon-stub>
+"<div class="n8n-callout callout custom round" role="alert">
+  <div class="messageSection">
+    <div class="icon">
+      <n8n-icon-stub icon="code-branch" size="medium" spin="false"></n8n-icon-stub>
     </div>
-    <n8n-text-stub size=\\"small\\" tag=\\"span\\">
-      <n8n-text-stub size=\\"small\\" tag=\\"span\\">This is a secondary callout.</n8n-text-stub>
-    </n8n-text-stub> &nbsp;
+    <n8n-text-stub bold="false" size="small" compact="false" tag="span"></n8n-text-stub> &nbsp;
   </div>
 </div>"
 `;
 
 exports[`components > N8nCallout > should render danger theme correctly 1`] = `
-"<div role=\\"alert\\" class=\\"n8n-callout callout danger\\">
-  <div class=\\"message-section\\">
-    <div class=\\"icon\\">
-      <n8n-icon-stub icon=\\"times-circle\\" size=\\"large\\"></n8n-icon-stub>
+"<div class="n8n-callout callout danger round" role="alert">
+  <div class="messageSection">
+    <div class="icon">
+      <n8n-icon-stub icon="exclamation-triangle" size="medium" spin="false"></n8n-icon-stub>
     </div>
-    <n8n-text-stub size=\\"small\\" tag=\\"span\\">
-      <n8n-text-stub size=\\"small\\" tag=\\"span\\">This is a danger callout.</n8n-text-stub>
-    </n8n-text-stub> &nbsp;
+    <n8n-text-stub bold="false" size="small" compact="false" tag="span"></n8n-text-stub> &nbsp;
   </div>
 </div>"
 `;
 
 exports[`components > N8nCallout > should render info theme correctly 1`] = `
-"<div role=\\"alert\\" class=\\"n8n-callout callout info\\">
-  <div class=\\"message-section\\">
-    <div class=\\"icon\\">
-      <n8n-icon-stub icon=\\"info-circle\\" size=\\"large\\"></n8n-icon-stub>
+"<div class="n8n-callout callout info round" role="alert">
+  <div class="messageSection">
+    <div class="icon">
+      <n8n-icon-stub icon="info-circle" size="medium" spin="false"></n8n-icon-stub>
     </div>
-    <n8n-text-stub size=\\"small\\" tag=\\"span\\">
-      <n8n-text-stub size=\\"small\\" tag=\\"span\\">This is an info callout.</n8n-text-stub>
-    </n8n-text-stub> &nbsp;
+    <n8n-text-stub bold="false" size="small" compact="false" tag="span"></n8n-text-stub> &nbsp;
   </div>
 </div>"
 `;
 
 exports[`components > N8nCallout > should render secondary theme correctly 1`] = `
-"<div role=\\"alert\\" class=\\"n8n-callout callout secondary\\">
-  <div class=\\"message-section\\">
-    <div class=\\"icon\\">
-      <n8n-icon-stub icon=\\"info-circle\\" size=\\"medium\\"></n8n-icon-stub>
+"<div class="n8n-callout callout secondary round" role="alert">
+  <div class="messageSection">
+    <div class="icon">
+      <n8n-icon-stub icon="info-circle" size="medium" spin="false"></n8n-icon-stub>
     </div>
-    <n8n-text-stub size=\\"small\\" tag=\\"span\\">
-      <n8n-text-stub size=\\"small\\" tag=\\"span\\">This is a secondary callout.</n8n-text-stub>
-    </n8n-text-stub> &nbsp;
+    <n8n-text-stub bold="false" size="small" compact="false" tag="span"></n8n-text-stub> &nbsp;
   </div>
 </div>"
 `;
 
 exports[`components > N8nCallout > should render success theme correctly 1`] = `
-"<div role=\\"alert\\" class=\\"n8n-callout callout success\\">
-  <div class=\\"message-section\\">
-    <div class=\\"icon\\">
-      <n8n-icon-stub icon=\\"check-circle\\" size=\\"large\\"></n8n-icon-stub>
+"<div class="n8n-callout callout success round" role="alert">
+  <div class="messageSection">
+    <div class="icon">
+      <n8n-icon-stub icon="check-circle" size="medium" spin="false"></n8n-icon-stub>
     </div>
-    <n8n-text-stub size=\\"small\\" tag=\\"span\\">
-      <n8n-text-stub size=\\"small\\" tag=\\"span\\">This is a success callout.</n8n-text-stub>
-    </n8n-text-stub> &nbsp;
+    <n8n-text-stub bold="false" size="small" compact="false" tag="span"></n8n-text-stub> &nbsp;
   </div>
 </div>"
 `;
 
 exports[`components > N8nCallout > should render warning theme correctly 1`] = `
-"<div role=\\"alert\\" class=\\"n8n-callout callout warning\\">
-  <div class=\\"message-section\\">
-    <div class=\\"icon\\">
-      <n8n-icon-stub icon=\\"exclamation-triangle\\" size=\\"large\\"></n8n-icon-stub>
+"<div class="n8n-callout callout warning round" role="alert">
+  <div class="messageSection">
+    <div class="icon">
+      <n8n-icon-stub icon="exclamation-triangle" size="medium" spin="false"></n8n-icon-stub>
     </div>
-    <n8n-text-stub size=\\"small\\" tag=\\"span\\">
-      <n8n-text-stub size=\\"small\\" tag=\\"span\\">This is a warning callout.</n8n-text-stub>
-    </n8n-text-stub> &nbsp;
+    <n8n-text-stub bold="false" size="small" compact="false" tag="span"></n8n-text-stub> &nbsp;
   </div>
 </div>"
 `;
diff --git a/packages/design-system/src/components/N8nCallout/index.ts b/packages/design-system/src/components/N8nCallout/index.ts
index fea22c69f70c6..a9ae0b25a937e 100644
--- a/packages/design-system/src/components/N8nCallout/index.ts
+++ b/packages/design-system/src/components/N8nCallout/index.ts
@@ -1,3 +1,3 @@
 import N8nCallout from './Callout.vue';
-
+export type { CalloutTheme } from './Callout.vue';
 export default N8nCallout;
diff --git a/packages/design-system/src/components/N8nCard/Card.stories.ts b/packages/design-system/src/components/N8nCard/Card.stories.ts
index e5274139fb6de..6b54c2a30f4d0 100644
--- a/packages/design-system/src/components/N8nCard/Card.stories.ts
+++ b/packages/design-system/src/components/N8nCard/Card.stories.ts
@@ -1,5 +1,5 @@
 import N8nCard from './Card.vue';
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 import N8nButton from '../N8nButton/Button.vue';
 import N8nIcon from '../N8nIcon/Icon.vue';
 import N8nText from '../N8nText/Text.vue';
@@ -10,14 +10,16 @@ export default {
 };
 
 export const Default: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nCard,
 	},
-	template: '<n8n-card v-bind="$props">This is a card.</n8n-card>',
+	template: '<n8n-card v-bind="args">This is a card.</n8n-card>',
 });
 
 export const Hoverable: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nCard,
@@ -25,7 +27,7 @@ export const Hoverable: StoryFn = (args, { argTypes }) => ({
 		N8nText,
 	},
 	template: `<div style="width: 140px; text-align: center;">
-		<n8n-card v-bind="$props">
+		<n8n-card v-bind="args">
 			<n8n-icon icon="plus" size="xlarge" />
 			<n8n-text size="large" class="mt-2xs">Add</n8n-text>
 		</n8n-card>
@@ -37,6 +39,7 @@ Hoverable.args = {
 };
 
 export const WithSlots: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nCard,
@@ -44,22 +47,22 @@ export const WithSlots: StoryFn = (args, { argTypes }) => ({
 		N8nIcon,
 		N8nText,
 	},
-	template: `<n8n-card v-bind="$props">
-		<template slot="prepend">
+	template: `<n8n-card v-bind="args">
+		<template #prepend>
 			<n8n-icon icon="check" size="large" />
 		</template>
-		<template slot="header">
+		<template #header>
 			<strong>Card header</strong>
 		</template>
 		<n8n-text color="text-light" size="medium" class="mt-2xs mb-2xs">
 			This is the card body.
 		</n8n-text>
-		<template slot="footer">
+		<template #footer>
 			<n8n-text size="medium">
 				Card footer
 			</n8n-text>
 		</template>
-		<template slot="append">
+		<template #append>
 			<n8n-button>Click me</n8n-button>
 		</template>
 	</n8n-card>`,
diff --git a/packages/design-system/src/components/N8nCard/Card.vue b/packages/design-system/src/components/N8nCard/Card.vue
index 6b2c260509d11..611fc275abf38 100644
--- a/packages/design-system/src/components/N8nCard/Card.vue
+++ b/packages/design-system/src/components/N8nCard/Card.vue
@@ -1,47 +1,43 @@
 <template>
-	<div :class="classes" v-on="$listeners">
-		<div :class="$style.icon" v-if="$slots.prepend">
+	<div :class="classes" v-bind="$attrs">
+		<div v-if="$slots.prepend" :class="$style.icon">
 			<slot name="prepend" />
 		</div>
 		<div :class="$style.content">
-			<div :class="$style.header" v-if="$slots.header">
+			<div v-if="$slots.header" :class="$style.header">
 				<slot name="header" />
 			</div>
-			<div :class="$style.body" v-if="$slots.default">
+			<div v-if="$slots.default" :class="$style.body">
 				<slot />
 			</div>
-			<div :class="$style.footer" v-if="$slots.footer">
+			<div v-if="$slots.footer" :class="$style.footer">
 				<slot name="footer" />
 			</div>
 		</div>
-		<div :class="$style.actions" v-if="$slots.append">
+		<div v-if="$slots.append" :class="$style.append">
 			<slot name="append" />
 		</div>
 	</div>
 </template>
 
-<script lang="ts">
-import { defineComponent } from 'vue';
+<script lang="ts" setup>
+import { computed, useCssModule } from 'vue';
 
-export default defineComponent({
-	name: 'n8n-card',
-	inheritAttrs: true,
-	props: {
-		hoverable: {
-			type: Boolean,
-			default: false,
-		},
-	},
-	computed: {
-		classes(): Record<string, boolean> {
-			return {
-				card: true,
-				[this.$style.card]: true,
-				[this.$style.hoverable]: this.hoverable,
-			};
-		},
-	},
+interface CardProps {
+	hoverable?: boolean;
+}
+
+defineOptions({ name: 'N8nCard' });
+const props = withDefaults(defineProps<CardProps>(), {
+	hoverable: false,
 });
+
+const $style = useCssModule();
+const classes = computed(() => ({
+	card: true,
+	[$style.card]: true,
+	[$style.hoverable]: props.hoverable,
+}));
 </script>
 
 <style lang="scss" module>
@@ -82,7 +78,6 @@ export default defineComponent({
 
 .icon {
 	width: 24px;
-	height: 24px;
 	display: inline-flex;
 	justify-content: center;
 	align-items: center;
@@ -101,4 +96,10 @@ export default defineComponent({
 		border-color: var(--color-primary);
 	}
 }
+
+.append {
+	display: flex;
+	align-items: center;
+	cursor: default;
+}
 </style>
diff --git a/packages/design-system/src/components/N8nCard/__tests__/__snapshots__/Card.spec.ts.snap b/packages/design-system/src/components/N8nCard/__tests__/__snapshots__/Card.spec.ts.snap
index f79e0d3348d65..c093867f14b75 100644
--- a/packages/design-system/src/components/N8nCard/__tests__/__snapshots__/Card.spec.ts.snap
+++ b/packages/design-system/src/components/N8nCard/__tests__/__snapshots__/Card.spec.ts.snap
@@ -1,25 +1,25 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`components > N8nCard > should render correctly 1`] = `
-"<div class=\\"card\\">
-  <!---->
-  <div class=\\"content\\">
-    <!---->
-    <div class=\\"body\\">This is a card.</div>
-    <!---->
+"<div class="card">
+  <!--v-if-->
+  <div class="content">
+    <!--v-if-->
+    <div class="body">This is a card.</div>
+    <!--v-if-->
   </div>
-  <!---->
+  <!--v-if-->
 </div>"
 `;
 
 exports[`components > N8nCard > should render correctly with header and footer 1`] = `
-"<div class=\\"card\\">
-  <!---->
-  <div class=\\"content\\">
-    <div class=\\"header\\">Header</div>
-    <div class=\\"body\\">This is a card.</div>
-    <div class=\\"footer\\">Footer</div>
+"<div class="card">
+  <!--v-if-->
+  <div class="content">
+    <div class="header">Header</div>
+    <div class="body">This is a card.</div>
+    <div class="footer">Footer</div>
   </div>
-  <!---->
+  <!--v-if-->
 </div>"
 `;
diff --git a/packages/design-system/src/components/N8nCheckbox/Checkbox.stories.ts b/packages/design-system/src/components/N8nCheckbox/Checkbox.stories.ts
index 1ec3178ae085d..c5c065ee5e6e9 100644
--- a/packages/design-system/src/components/N8nCheckbox/Checkbox.stories.ts
+++ b/packages/design-system/src/components/N8nCheckbox/Checkbox.stories.ts
@@ -1,5 +1,5 @@
 import N8nCheckbox from './Checkbox.vue';
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 import { action } from '@storybook/addon-actions';
 
 export default {
@@ -8,12 +8,13 @@ export default {
 };
 
 const methods = {
-	onInput: action('input'),
+	onUpdateModelValue: action('update:modelValue'),
 	onFocus: action('focus'),
 	onChange: action('change'),
 };
 
 const DefaultTemplate: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nCheckbox,
@@ -21,7 +22,8 @@ const DefaultTemplate: StoryFn = (args, { argTypes }) => ({
 	data: () => ({
 		isChecked: false,
 	}),
-	template: '<n8n-checkbox v-model="isChecked" v-bind="$props" @input="onInput"></n8n-checkbox>',
+	template:
+		'<n8n-checkbox v-model="isChecked" v-bind="args" @update:modelValue="onUpdateModelValue"></n8n-checkbox>',
 	methods,
 });
 
diff --git a/packages/design-system/src/components/N8nCheckbox/Checkbox.vue b/packages/design-system/src/components/N8nCheckbox/Checkbox.vue
index 28b704ecceeab..ce9c3b8e69aad 100644
--- a/packages/design-system/src/components/N8nCheckbox/Checkbox.vue
+++ b/packages/design-system/src/components/N8nCheckbox/Checkbox.vue
@@ -1,75 +1,57 @@
 <template>
-	<el-checkbox
+	<ElCheckbox
 		v-bind="$props"
 		ref="checkbox"
 		:class="['n8n-checkbox', $style.n8nCheckbox]"
 		:disabled="disabled"
 		:indeterminate="indeterminate"
-		:value="value"
-		@change="onChange"
+		:model-value="modelValue"
+		@update:model-value="onUpdateModelValue"
 	>
-		<n8n-input-label
+		<slot></slot>
+		<N8nInputLabel
+			v-if="label"
 			:label="label"
-			:tooltipText="tooltipText"
+			:tooltip-text="tooltipText"
 			:bold="false"
 			:size="labelSize"
 			@click.prevent="onLabelClick"
 		/>
-	</el-checkbox>
+	</ElCheckbox>
 </template>
 
-<script lang="ts">
-import { defineComponent } from 'vue';
-import { Checkbox as ElCheckbox } from 'element-ui';
+<script lang="ts" setup>
+import { ref } from 'vue';
+import { ElCheckbox } from 'element-plus';
 import N8nInputLabel from '../N8nInputLabel';
 
-export default defineComponent({
-	name: 'n8n-checkbox',
-	components: {
-		ElCheckbox,
-		N8nInputLabel,
-	},
-	props: {
-		label: {
-			type: String,
-			required: true,
-		},
-		disabled: {
-			type: Boolean,
-			default: false,
-		},
-		tooltipText: {
-			type: String,
-			required: false,
-		},
-		indeterminate: {
-			type: Boolean,
-			default: false,
-		},
-		value: {
-			type: Boolean,
-			default: false,
-		},
-		labelSize: {
-			type: String,
-			default: 'medium',
-			validator: (value: string): boolean => ['small', 'medium'].includes(value),
-		},
-	},
-	methods: {
-		onChange(event: Event) {
-			this.$emit('input', event);
-		},
-		onLabelClick() {
-			const checkboxComponent = this.$refs.checkbox as ElCheckbox;
-			if (!checkboxComponent) {
-				return;
-			}
+const LABEL_SIZE = ['small', 'medium'] as const;
 
-			(checkboxComponent.$el as HTMLElement).click();
-		},
-	},
+interface CheckboxProps {
+	label?: string;
+	disabled?: boolean;
+	tooltipText?: string;
+	indeterminate?: boolean;
+	modelValue?: boolean;
+	labelSize?: (typeof LABEL_SIZE)[number];
+}
+
+defineOptions({ name: 'N8nCheckbox' });
+withDefaults(defineProps<CheckboxProps>(), {
+	disabled: false,
+	indeterminate: false,
+	modelValue: false,
+	labelSize: 'medium',
 });
+
+const $emit = defineEmits(['update:modelValue']);
+const onUpdateModelValue = (value: boolean) => $emit('update:modelValue', value);
+
+const checkbox = ref<InstanceType<typeof ElCheckbox>>();
+const onLabelClick = () => {
+	if (!checkbox?.value) return;
+	(checkbox.value.$el as HTMLElement).click();
+};
 </script>
 
 <style lang="scss" module>
diff --git a/packages/design-system/src/components/N8nCheckbox/__tests__/Checkbox.spec.ts b/packages/design-system/src/components/N8nCheckbox/__tests__/Checkbox.spec.ts
new file mode 100644
index 0000000000000..0ec4f9166002c
--- /dev/null
+++ b/packages/design-system/src/components/N8nCheckbox/__tests__/Checkbox.spec.ts
@@ -0,0 +1,31 @@
+import { render } from '@testing-library/vue';
+import N8nCheckbox from '../Checkbox.vue';
+
+describe('components', () => {
+	describe('N8nCheckbox', () => {
+		it('should render without label and child content', () => {
+			const { container } = render(N8nCheckbox);
+			expect(container).toMatchSnapshot();
+		});
+
+		it('should render with label', () => {
+			const { container } = render(N8nCheckbox, { props: { label: 'Checkbox' } });
+			expect(container).toMatchSnapshot();
+		});
+
+		it('should render with child', () => {
+			const { container } = render(N8nCheckbox, {
+				slots: { default: '<strong>Bold text</strong>' },
+			});
+			expect(container).toMatchSnapshot();
+		});
+
+		it('should render with both child and label', () => {
+			const { container } = render(N8nCheckbox, {
+				props: { label: 'Checkbox' },
+				slots: { default: '<strong>Bold text</strong>' },
+			});
+			expect(container).toMatchSnapshot();
+		});
+	});
+});
diff --git a/packages/design-system/src/components/N8nCheckbox/__tests__/__snapshots__/Checkbox.spec.ts.snap b/packages/design-system/src/components/N8nCheckbox/__tests__/__snapshots__/Checkbox.spec.ts.snap
new file mode 100644
index 0000000000000..9008ca6000680
--- /dev/null
+++ b/packages/design-system/src/components/N8nCheckbox/__tests__/__snapshots__/Checkbox.spec.ts.snap
@@ -0,0 +1,184 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`components > N8nCheckbox > should render with both child and label 1`] = `
+<div>
+  <label
+    class="el-checkbox n8n-checkbox n8nCheckbox"
+    labelsize="medium"
+  >
+    <span
+      class="el-checkbox__input"
+    >
+      <input
+        aria-hidden="false"
+        class="el-checkbox__original"
+        type="checkbox"
+        value="Checkbox"
+      />
+      <span
+        class="el-checkbox__inner"
+      />
+    </span>
+    <span
+      class="el-checkbox__label"
+    >
+      
+      
+      <strong>
+        Bold text
+      </strong>
+      
+      <div
+        class="container"
+        data-test-id="input-label"
+      >
+        <label
+          class="n8n-input-label inputLabel heading medium"
+        >
+          <div
+            class="title"
+          >
+            <span
+              class="n8n-text size-medium regular"
+            >
+              
+              Checkbox 
+              <!--v-if-->
+              
+            </span>
+          </div>
+          <!--v-if-->
+          <!--v-if-->
+          <!--v-if-->
+        </label>
+        
+        
+      </div>
+      
+      <!--v-if-->
+    </span>
+  </label>
+</div>
+`;
+
+exports[`components > N8nCheckbox > should render with child 1`] = `
+<div>
+  <label
+    class="el-checkbox n8n-checkbox n8nCheckbox"
+    labelsize="medium"
+  >
+    <span
+      class="el-checkbox__input"
+    >
+      <input
+        aria-hidden="false"
+        class="el-checkbox__original"
+        type="checkbox"
+      />
+      <span
+        class="el-checkbox__inner"
+      />
+    </span>
+    <span
+      class="el-checkbox__label"
+    >
+      
+      
+      <strong>
+        Bold text
+      </strong>
+      
+      <!--v-if-->
+      
+      <!--v-if-->
+    </span>
+  </label>
+</div>
+`;
+
+exports[`components > N8nCheckbox > should render with label 1`] = `
+<div>
+  <label
+    class="el-checkbox n8n-checkbox n8nCheckbox"
+    labelsize="medium"
+  >
+    <span
+      class="el-checkbox__input"
+    >
+      <input
+        aria-hidden="false"
+        class="el-checkbox__original"
+        type="checkbox"
+        value="Checkbox"
+      />
+      <span
+        class="el-checkbox__inner"
+      />
+    </span>
+    <span
+      class="el-checkbox__label"
+    >
+      
+      
+      
+      <div
+        class="container"
+        data-test-id="input-label"
+      >
+        <label
+          class="n8n-input-label inputLabel heading medium"
+        >
+          <div
+            class="title"
+          >
+            <span
+              class="n8n-text size-medium regular"
+            >
+              
+              Checkbox 
+              <!--v-if-->
+              
+            </span>
+          </div>
+          <!--v-if-->
+          <!--v-if-->
+          <!--v-if-->
+        </label>
+        
+        
+      </div>
+      
+      <!--v-if-->
+    </span>
+  </label>
+</div>
+`;
+
+exports[`components > N8nCheckbox > should render without label and child content 1`] = `
+<div>
+  <label
+    class="el-checkbox n8n-checkbox n8nCheckbox"
+    labelsize="medium"
+  >
+    <span
+      class="el-checkbox__input"
+    >
+      <input
+        aria-hidden="false"
+        class="el-checkbox__original"
+        type="checkbox"
+      />
+      <span
+        class="el-checkbox__inner"
+      />
+    </span>
+    <span
+      class="el-checkbox__label"
+    >
+      
+      
+      <!--v-if-->
+    </span>
+  </label>
+</div>
+`;
diff --git a/packages/design-system/src/components/N8nCircleLoader/CircleLoader.stories.ts b/packages/design-system/src/components/N8nCircleLoader/CircleLoader.stories.ts
new file mode 100644
index 0000000000000..a9f11a3165579
--- /dev/null
+++ b/packages/design-system/src/components/N8nCircleLoader/CircleLoader.stories.ts
@@ -0,0 +1,50 @@
+import N8nCircleLoader from './CircleLoader.vue';
+import type { StoryFn } from '@storybook/vue3';
+
+export default {
+	title: 'Atoms/CircleLoader',
+	component: N8nCircleLoader,
+	argTypes: {
+		radius: {
+			control: {
+				type: 'number',
+			},
+		},
+		progress: {
+			control: {
+				type: 'number',
+			},
+		},
+		strokeWidth: {
+			control: {
+				type: 'number',
+			},
+		},
+	},
+};
+
+interface Args {
+	radius: number;
+	progress: number;
+	strokeWidth: number;
+}
+
+const template: StoryFn<Args> = (args, { argTypes }) => ({
+	setup: () => ({ args }),
+	props: Object.keys(argTypes),
+	components: {
+		N8nCircleLoader,
+	},
+	template: `
+		<div>
+			<n8n-circle-loader v-bind="args" />
+		</div>
+	`,
+});
+
+export const defaultCircleLoader = template.bind({});
+defaultCircleLoader.args = {
+	radius: 20,
+	progress: 42,
+	strokeWidth: 10,
+};
diff --git a/packages/design-system/src/components/N8nCircleLoader/CircleLoader.vue b/packages/design-system/src/components/N8nCircleLoader/CircleLoader.vue
new file mode 100644
index 0000000000000..a9231c2852b04
--- /dev/null
+++ b/packages/design-system/src/components/N8nCircleLoader/CircleLoader.vue
@@ -0,0 +1,63 @@
+<template>
+	<div class="progress-circle">
+		<svg class="progress-ring" :width="diameter" :height="diameter">
+			<circle
+				:class="$style.progressRingCircle"
+				:stroke-width="strokeWidth"
+				stroke="#DCDFE6"
+				fill="transparent"
+				:r="radius"
+				v-bind="{ cx, cy }"
+			/>
+			<circle
+				:class="$style.progressRingCircle"
+				stroke="#5C4EC2"
+				:stroke-width="strokeWidth"
+				fill="transparent"
+				:r="radius"
+				v-bind="{ cx, cy, style }"
+			/>
+		</svg>
+	</div>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue';
+const props = defineProps({
+	radius: {
+		type: Number,
+		required: true,
+	},
+	progress: {
+		type: Number,
+		required: true,
+	},
+	strokeWidth: {
+		type: Number,
+		default: 4,
+	},
+});
+
+// for SVG viewbox and stroke array
+const diameter = computed(() => 2 * (props.radius + props.strokeWidth));
+const circumference = computed(() => 2 * Math.PI * props.radius);
+
+const strokeDashoffset = computed(
+	() => circumference.value - (props.progress / 100) * circumference.value,
+);
+
+const cx = computed(() => props.radius + props.strokeWidth);
+const cy = computed(() => props.radius + props.strokeWidth);
+const style = computed(() => ({
+	strokeDasharray: `${circumference.value}`,
+	strokeDashoffset: `${strokeDashoffset.value}`,
+}));
+</script>
+
+<style module>
+.progressRingCircle {
+	transition: stroke-dashoffset 0.35s linear;
+	transform: rotate(-90deg);
+	transform-origin: 50% 50%;
+}
+</style>
diff --git a/packages/design-system/src/components/N8nCircleLoader/__tests__/CircleLoader.spec.ts b/packages/design-system/src/components/N8nCircleLoader/__tests__/CircleLoader.spec.ts
new file mode 100644
index 0000000000000..a05b4c219af86
--- /dev/null
+++ b/packages/design-system/src/components/N8nCircleLoader/__tests__/CircleLoader.spec.ts
@@ -0,0 +1,15 @@
+import { render } from '@testing-library/vue';
+import N8NCircleLoader from '../CircleLoader.vue';
+
+describe('N8NCircleLoader', () => {
+	it('should render correctly', () => {
+		const wrapper = render(N8NCircleLoader, {
+			props: {
+				radius: 20,
+				progress: 42,
+				strokeWidth: 10,
+			},
+		});
+		expect(wrapper.html()).toMatchSnapshot();
+	});
+});
diff --git a/packages/design-system/src/components/N8nCircleLoader/__tests__/__snapshots__/CircleLoader.spec.ts.snap b/packages/design-system/src/components/N8nCircleLoader/__tests__/__snapshots__/CircleLoader.spec.ts.snap
new file mode 100644
index 0000000000000..3cee7831f86ae
--- /dev/null
+++ b/packages/design-system/src/components/N8nCircleLoader/__tests__/__snapshots__/CircleLoader.spec.ts.snap
@@ -0,0 +1,8 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`N8NCircleLoader > should render correctly 1`] = `
+"<div class="progress-circle"><svg class="progress-ring" width="60" height="60">
+    <circle class="progressRingCircle" stroke-width="10" stroke="#DCDFE6" fill="transparent" r="20" cx="30" cy="30"></circle>
+    <circle class="progressRingCircle" stroke="#5C4EC2" stroke-width="10" fill="transparent" r="20" cx="30" cy="30" style="stroke-dasharray: 125.66370614359172; stroke-dashoffset: 72.8849495632832;"></circle>
+  </svg></div>"
+`;
diff --git a/packages/design-system/src/components/N8nCircleLoader/index.ts b/packages/design-system/src/components/N8nCircleLoader/index.ts
new file mode 100644
index 0000000000000..fcd1764c53831
--- /dev/null
+++ b/packages/design-system/src/components/N8nCircleLoader/index.ts
@@ -0,0 +1,3 @@
+import N8nCircleLoader from './CircleLoader.vue';
+
+export default N8nCircleLoader;
diff --git a/packages/design-system/src/components/N8nColorPicker/ColorPicker.stories.ts b/packages/design-system/src/components/N8nColorPicker/ColorPicker.stories.ts
new file mode 100644
index 0000000000000..c17cdd4731c21
--- /dev/null
+++ b/packages/design-system/src/components/N8nColorPicker/ColorPicker.stories.ts
@@ -0,0 +1,60 @@
+import { action } from '@storybook/addon-actions';
+import type { StoryFn } from '@storybook/vue3';
+import N8nColorPicker from './ColorPicker.vue';
+
+export default {
+	title: 'Atoms/ColorPicker',
+	component: N8nColorPicker,
+	argTypes: {
+		disabled: {
+			control: 'boolean',
+		},
+		size: {
+			control: 'select',
+			options: ['mini', 'small', 'medium', 'large'],
+		},
+		showAlpha: {
+			control: 'boolean',
+		},
+		colorFormat: {
+			control: 'select',
+			options: ['hsl', 'hsv', 'hex', 'rgb'],
+		},
+		popperClass: {
+			control: 'text',
+		},
+		predefine: {
+			control: 'array',
+		},
+	},
+};
+
+const methods = {
+	onChange: action('change'),
+	onActiveChange: action('active-change'),
+	onInput: action('update:modelValue'),
+};
+
+const DefaultTemplate: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
+	props: Object.keys(argTypes),
+	components: {
+		N8nColorPicker,
+	},
+	data: () => ({
+		color: null,
+	}),
+	template:
+		'<n8n-color-picker v-model="color" v-bind="args" @update:modelValue="onInput" @change="onChange" @active-change="onActiveChange" />',
+	methods,
+});
+
+export const Default = DefaultTemplate.bind({});
+Default.args = {
+	disabled: false,
+	size: 'medium',
+	showAlpha: false,
+	colorFormat: '',
+	popperClass: '',
+	showInput: true,
+};
diff --git a/packages/design-system/src/components/N8nColorPicker/ColorPicker.vue b/packages/design-system/src/components/N8nColorPicker/ColorPicker.vue
new file mode 100644
index 0000000000000..0754fcc87b93a
--- /dev/null
+++ b/packages/design-system/src/components/N8nColorPicker/ColorPicker.vue
@@ -0,0 +1,105 @@
+<script lang="ts" setup>
+import { computed, ref } from 'vue';
+import { uid } from '../../utils';
+import { ElColorPicker } from 'element-plus';
+import N8nInput from '../N8nInput';
+
+export type ColorPickerProps = {
+	disabled?: boolean;
+	size?: 'small' | 'medium' | 'mini';
+	showAlpha?: boolean;
+	colorFormat?: 'hex' | 'rgb' | 'hsl' | 'hsv';
+	popperClass?: string;
+	predefine?: string[];
+	modelValue?: string;
+	showInput?: boolean;
+	name?: string;
+};
+
+defineOptions({ name: 'N8nColorPicker' });
+const props = withDefaults(defineProps<ColorPickerProps>(), {
+	disabled: false,
+	size: 'medium',
+	showAlpha: false,
+	colorFormat: 'hex',
+	popperClass: '',
+	showInput: true,
+	name: uid('color-picker'),
+});
+
+const color = ref(props.modelValue);
+
+const colorPickerProps = computed(() => {
+	const { showInput, ...rest } = props;
+	return rest;
+});
+
+const emit = defineEmits<{
+	(event: 'update:modelValue', value: string): void;
+	(event: 'change', value: string): void;
+	(event: 'active-change', value: string): void;
+}>();
+
+const model = computed({
+	get() {
+		return color.value;
+	},
+	set(value: string) {
+		color.value = value;
+		emit('update:modelValue', value);
+	},
+});
+
+const onChange = (value: string) => {
+	emit('change', value);
+};
+
+const onInput = (value: string) => {
+	color.value = value;
+};
+
+const onActiveChange = (value: string) => {
+	emit('active-change', value);
+};
+</script>
+
+<template>
+	<span :class="['n8n-color-picker', $style.component]">
+		<ElColorPicker
+			v-model="model"
+			v-bind="colorPickerProps"
+			@change="onChange"
+			@active-change="onActiveChange"
+		/>
+		<N8nInput
+			v-if="showInput"
+			:class="$style.input"
+			:disabled="props.disabled"
+			:size="props.size"
+			:model-value="color"
+			:name="name"
+			type="text"
+			@update:model-value="onInput"
+		/>
+	</span>
+</template>
+
+<style lang="scss" module>
+.component {
+	display: inline-flex;
+	align-items: center;
+}
+
+.input {
+	margin-left: var(--spacing-3xs);
+}
+</style>
+
+<style lang="scss" scoped>
+:deep(.el-color-picker) {
+	.el-color-picker__empty,
+	.el-color-picker__icon {
+		display: none;
+	}
+}
+</style>
diff --git a/packages/design-system/src/components/N8nColorPicker/__tests__/ColorPicker.spec.ts b/packages/design-system/src/components/N8nColorPicker/__tests__/ColorPicker.spec.ts
new file mode 100644
index 0000000000000..702db17aa2ec1
--- /dev/null
+++ b/packages/design-system/src/components/N8nColorPicker/__tests__/ColorPicker.spec.ts
@@ -0,0 +1,25 @@
+import { render } from '@testing-library/vue';
+import N8nColorPicker from '../ColorPicker.vue';
+
+describe('components', () => {
+	describe('N8nColorPicker', () => {
+		it('should render with input', () => {
+			const { container } = render(N8nColorPicker, {
+				props: {
+					name: 'color-picker',
+				},
+			});
+			expect(container).toMatchSnapshot();
+		});
+
+		it('should render without input', () => {
+			const { container } = render(N8nColorPicker, {
+				props: {
+					name: 'color-picker',
+					showInput: false,
+				},
+			});
+			expect(container).toMatchSnapshot();
+		});
+	});
+});
diff --git a/packages/design-system/src/components/N8nColorPicker/__tests__/__snapshots__/ColorPicker.spec.ts.snap b/packages/design-system/src/components/N8nColorPicker/__tests__/__snapshots__/ColorPicker.spec.ts.snap
new file mode 100644
index 0000000000000..0e235831c7aa0
--- /dev/null
+++ b/packages/design-system/src/components/N8nColorPicker/__tests__/__snapshots__/ColorPicker.spec.ts.snap
@@ -0,0 +1,167 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`components > N8nColorPicker > should render with input 1`] = `
+<div>
+  <span
+    class="n8n-color-picker component"
+    data-v-dab78bb8=""
+  >
+    
+    <div
+      aria-description="current color is . press enter to select a new color."
+      aria-label="color picker"
+      class="el-color-picker el-color-picker--medium el-tooltip__trigger el-tooltip__trigger"
+      role="button"
+      tabindex="0"
+    >
+      <!--v-if-->
+      <div
+        class="el-color-picker__trigger"
+      >
+        <span
+          class="el-color-picker__color"
+        >
+          <span
+            class="el-color-picker__color-inner"
+            style="background-color: transparent;"
+          >
+            <i
+              class="el-icon el-color-picker__icon is-icon-arrow-down"
+              style="display: none;"
+            >
+              
+              <svg
+                viewBox="0 0 1024 1024"
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path
+                  d="M831.872 340.864 512 652.672 192.128 340.864a30.592 30.592 0 0 0-42.752 0 29.12 29.12 0 0 0 0 41.6L489.664 714.24a32 32 0 0 0 44.672 0l340.288-331.712a29.12 29.12 0 0 0 0-41.728 30.592 30.592 0 0 0-42.752 0z"
+                  fill="currentColor"
+                />
+              </svg>
+              
+            </i>
+            <i
+              class="el-icon el-color-picker__empty is-icon-close"
+            >
+              
+              <svg
+                viewBox="0 0 1024 1024"
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path
+                  d="M764.288 214.592 512 466.88 259.712 214.592a31.936 31.936 0 0 0-45.12 45.12L466.752 512 214.528 764.224a31.936 31.936 0 1 0 45.12 45.184L512 557.184l252.288 252.288a31.936 31.936 0 0 0 45.12-45.12L557.12 512.064l252.288-252.352a31.936 31.936 0 1 0-45.12-45.184z"
+                  fill="currentColor"
+                />
+              </svg>
+              
+            </i>
+          </span>
+        </span>
+      </div>
+    </div>
+    <!--teleport start-->
+    <!--teleport end-->
+    
+    <div
+      class="el-input el-input--medium n8n-input input input"
+      data-v-dab78bb8=""
+    >
+      <!-- input -->
+      
+      <!-- prepend slot -->
+      <!--v-if-->
+      <div
+        class="el-input__wrapper"
+      >
+        <!-- prefix slot -->
+        <!--v-if-->
+        <input
+          autocomplete="off"
+          class="el-input__inner"
+          maxlength="Infinity"
+          name="color-picker"
+          placeholder=""
+          rows="2"
+          tabindex="0"
+          title=""
+          type="text"
+        />
+        <!-- suffix slot -->
+        <!--v-if-->
+      </div>
+      <!-- append slot -->
+      <!--v-if-->
+      
+    </div>
+  </span>
+</div>
+`;
+
+exports[`components > N8nColorPicker > should render without input 1`] = `
+<div>
+  <span
+    class="n8n-color-picker component"
+    data-v-dab78bb8=""
+  >
+    
+    <div
+      aria-description="current color is . press enter to select a new color."
+      aria-label="color picker"
+      class="el-color-picker el-color-picker--medium el-tooltip__trigger el-tooltip__trigger"
+      role="button"
+      tabindex="0"
+    >
+      <!--v-if-->
+      <div
+        class="el-color-picker__trigger"
+      >
+        <span
+          class="el-color-picker__color"
+        >
+          <span
+            class="el-color-picker__color-inner"
+            style="background-color: transparent;"
+          >
+            <i
+              class="el-icon el-color-picker__icon is-icon-arrow-down"
+              style="display: none;"
+            >
+              
+              <svg
+                viewBox="0 0 1024 1024"
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path
+                  d="M831.872 340.864 512 652.672 192.128 340.864a30.592 30.592 0 0 0-42.752 0 29.12 29.12 0 0 0 0 41.6L489.664 714.24a32 32 0 0 0 44.672 0l340.288-331.712a29.12 29.12 0 0 0 0-41.728 30.592 30.592 0 0 0-42.752 0z"
+                  fill="currentColor"
+                />
+              </svg>
+              
+            </i>
+            <i
+              class="el-icon el-color-picker__empty is-icon-close"
+            >
+              
+              <svg
+                viewBox="0 0 1024 1024"
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path
+                  d="M764.288 214.592 512 466.88 259.712 214.592a31.936 31.936 0 0 0-45.12 45.12L466.752 512 214.528 764.224a31.936 31.936 0 1 0 45.12 45.184L512 557.184l252.288 252.288a31.936 31.936 0 0 0 45.12-45.12L557.12 512.064l252.288-252.352a31.936 31.936 0 1 0-45.12-45.184z"
+                  fill="currentColor"
+                />
+              </svg>
+              
+            </i>
+          </span>
+        </span>
+      </div>
+    </div>
+    <!--teleport start-->
+    <!--teleport end-->
+    
+    <!--v-if-->
+  </span>
+</div>
+`;
diff --git a/packages/design-system/src/components/N8nColorPicker/index.ts b/packages/design-system/src/components/N8nColorPicker/index.ts
new file mode 100644
index 0000000000000..f9bdd8901d05a
--- /dev/null
+++ b/packages/design-system/src/components/N8nColorPicker/index.ts
@@ -0,0 +1,3 @@
+import N8nColorPicker from './ColorPicker.vue';
+
+export default N8nColorPicker;
diff --git a/packages/design-system/src/components/N8nDatatable/Datatable.stories.ts b/packages/design-system/src/components/N8nDatatable/Datatable.stories.ts
index 3166530de182c..e32a808d5c0f2 100644
--- a/packages/design-system/src/components/N8nDatatable/Datatable.stories.ts
+++ b/packages/design-system/src/components/N8nDatatable/Datatable.stories.ts
@@ -1,5 +1,5 @@
 import N8nDatatable from './Datatable.vue';
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 import { rows, columns } from './__tests__/data';
 
 export default {
@@ -8,11 +8,12 @@ export default {
 };
 
 export const Default: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nDatatable,
 	},
-	template: '<n8n-datatable v-bind="$props"></n8n-datatable>',
+	template: '<n8n-datatable v-bind="args"></n8n-datatable>',
 });
 
 Default.args = {
diff --git a/packages/design-system/src/components/N8nDatatable/Datatable.vue b/packages/design-system/src/components/N8nDatatable/Datatable.vue
index 990ea94a1d3c5..90afe2a043d8e 100644
--- a/packages/design-system/src/components/N8nDatatable/Datatable.vue
+++ b/packages/design-system/src/components/N8nDatatable/Datatable.vue
@@ -1,120 +1,5 @@
-<script lang="ts">
-import type { PropType } from 'vue';
-import { computed, defineComponent, ref, useCssModule } from 'vue';
-import type { DatatableColumn, DatatableRow, DatatableRowDataType } from '../../types';
-import { getValueByPath } from '../../utils';
-import { useI18n } from '../../composables';
-import N8nSelect from '../N8nSelect';
-import N8nOption from '../N8nOption';
-import N8nPagination from '../N8nPagination';
-
-export default defineComponent({
-	name: 'n8n-datatable',
-	components: {
-		N8nSelect,
-		N8nOption,
-		N8nPagination,
-	},
-	emits: ['update:currentPage', 'update:rowsPerPage'],
-	props: {
-		columns: {
-			type: Array as PropType<DatatableColumn[]>,
-			required: true,
-		},
-		rows: {
-			type: Array as PropType<DatatableRow[]>,
-			required: true,
-		},
-		currentPage: {
-			type: Number,
-			default: 1,
-		},
-		pagination: {
-			type: Boolean,
-			default: true,
-		},
-		rowsPerPage: {
-			type: [Number, String] as PropType<number | '*'>,
-			default: 10,
-		},
-	},
-	setup(props, { emit }) {
-		const { t } = useI18n();
-		const rowsPerPageOptions = ref([10, 25, 50, 100]);
-
-		const style = useCssModule();
-
-		const totalPages = computed(() => {
-			if (props.rowsPerPage === '*') {
-				return 1;
-			}
-
-			return Math.ceil(props.rows.length / props.rowsPerPage);
-		});
-
-		const totalRows = computed(() => {
-			return props.rows.length;
-		});
-
-		const visibleRows = computed(() => {
-			if (props.rowsPerPage === '*') {
-				return props.rows;
-			}
-
-			const start = (props.currentPage - 1) * props.rowsPerPage;
-			const end = start + props.rowsPerPage;
-
-			return props.rows.slice(start, end);
-		});
-
-		const classes = computed(() => {
-			return {
-				datatable: true,
-				[style.datatableWrapper]: true,
-			};
-		});
-
-		function onUpdateCurrentPage(value: number) {
-			emit('update:currentPage', value);
-		}
-
-		function onRowsPerPageChange(value: number | '*') {
-			emit('update:rowsPerPage', value);
-
-			const maxPage = value === '*' ? 1 : Math.ceil(totalRows.value / value);
-			if (maxPage < props.currentPage) {
-				onUpdateCurrentPage(maxPage);
-			}
-		}
-
-		function getTdValue(row: DatatableRow, column: DatatableColumn) {
-			return getValueByPath<DatatableRowDataType>(row, column.path);
-		}
-
-		function getThStyle(column: DatatableColumn) {
-			return {
-				...(column.width ? { width: column.width } : {}),
-			};
-		}
-
-		return {
-			t,
-			classes,
-			totalPages,
-			totalRows,
-			visibleRows,
-			rowsPerPageOptions,
-			getTdValue,
-			getThStyle,
-			onUpdateCurrentPage,
-			onRowsPerPageChange,
-		};
-	},
-});
-</script>
-
 <template>
-	<div :class="classes" v-on="$listeners">
+	<div :class="classes" v-bind="$attrs">
 		<table :class="$style.datatable">
 			<thead :class="$style.datatableHeader">
 				<tr>
@@ -130,10 +15,10 @@ export default defineComponent({
 			</thead>
 			<tbody>
 				<template v-for="row in visibleRows">
-					<slot name="row" :columns="columns" :row="row" :getTdValue="getTdValue">
+					<slot name="row" :columns="columns" :row="row" :get-td-value="getTdValue">
 						<tr :key="row.id">
 							<td v-for="column in columns" :key="column.id" :class="column.classes">
-								<component v-if="column.render" :is="column.render" :row="row" :column="column" />
+								<component :is="column.render" v-if="column.render" :row="row" :column="column" />
 								<span v-else>{{ getTdValue(row, column) }}</span>
 							</td>
 						</tr>
@@ -143,38 +28,121 @@ export default defineComponent({
 		</table>
 
 		<div :class="$style.pagination">
-			<n8n-pagination
+			<N8nPagination
 				v-if="totalPages > 1"
 				background
 				:pager-count="5"
 				:page-size="rowsPerPage"
 				layout="prev, pager, next"
 				:total="totalRows"
-				:currentPage="currentPage"
-				@update:currentPage="onUpdateCurrentPage"
+				:current-page="currentPage"
+				@update:current-page="onUpdateCurrentPage"
 			/>
 
 			<div :class="$style.pageSizeSelector">
-				<n8n-select
+				<N8nSelect
 					size="mini"
-					:value="rowsPerPage"
-					@input="onRowsPerPageChange"
-					popper-append-to-body
+					:model-value="rowsPerPage"
+					teleported
+					@update:model-value="onRowsPerPageChange"
 				>
 					<template #prepend>{{ t('datatable.pageSize') }}</template>
-					<n8n-option
+					<N8nOption
 						v-for="size in rowsPerPageOptions"
 						:key="size"
 						:label="`${size}`"
 						:value="size"
 					/>
-					<n8n-option :label="`All`" value="*"> </n8n-option>
-				</n8n-select>
+					<N8nOption :label="`All`" value="*"> </N8nOption>
+				</N8nSelect>
 			</div>
 		</div>
 	</div>
 </template>
 
+<script lang="ts" setup>
+import { computed, ref, useCssModule } from 'vue';
+import N8nSelect from '../N8nSelect';
+import N8nOption from '../N8nOption';
+import N8nPagination from '../N8nPagination';
+import type { DatatableColumn, DatatableRow, DatatableRowDataType } from '../../types';
+import { useI18n } from '../../composables/useI18n';
+import { getValueByPath } from '../../utils';
+
+interface DatatableProps {
+	columns: DatatableColumn[];
+	rows: DatatableRow[];
+	currentPage?: number;
+	pagination?: boolean;
+	rowsPerPage?: number | '*';
+}
+
+defineOptions({ name: 'N8nDatatable' });
+const props = withDefaults(defineProps<DatatableProps>(), {
+	currentPage: 1,
+	pagination: true,
+	rowsPerPage: 10,
+});
+
+const $emit = defineEmits(['update:currentPage', 'update:rowsPerPage']);
+
+const { t } = useI18n();
+const rowsPerPageOptions = ref([10, 25, 50, 100]);
+
+const $style = useCssModule();
+
+const totalPages = computed(() => {
+	if (props.rowsPerPage === '*') {
+		return 1;
+	}
+
+	return Math.ceil(props.rows.length / props.rowsPerPage);
+});
+
+const totalRows = computed(() => {
+	return props.rows.length;
+});
+
+const visibleRows = computed(() => {
+	if (props.rowsPerPage === '*') {
+		return props.rows;
+	}
+
+	const start = (props.currentPage - 1) * props.rowsPerPage;
+	const end = start + props.rowsPerPage;
+
+	return props.rows.slice(start, end);
+});
+
+const classes = computed(() => ({
+	datatable: true,
+	[$style.datatableWrapper]: true,
+}));
+
+function onUpdateCurrentPage(value: number) {
+	$emit('update:currentPage', value);
+}
+
+function onRowsPerPageChange(value: number | '*') {
+	$emit('update:rowsPerPage', value);
+
+	const maxPage = value === '*' ? 1 : Math.ceil(totalRows.value / value);
+	if (maxPage < props.currentPage) {
+		onUpdateCurrentPage(maxPage);
+	}
+}
+
+function getTdValue(row: DatatableRow, column: DatatableColumn) {
+	return getValueByPath<DatatableRowDataType>(row, column.path);
+}
+
+function getThStyle(column: DatatableColumn) {
+	return {
+		...(column.width ? { width: column.width } : {}),
+	};
+}
+</script>
+
 <style lang="scss" module>
 .datatableWrapper {
 	display: block;
diff --git a/packages/design-system/src/components/N8nDatatable/__tests__/Datatable.spec.ts b/packages/design-system/src/components/N8nDatatable/__tests__/Datatable.spec.ts
index 7a1d74b27e1af..ccc2e544aeb24 100644
--- a/packages/design-system/src/components/N8nDatatable/__tests__/Datatable.spec.ts
+++ b/packages/design-system/src/components/N8nDatatable/__tests__/Datatable.spec.ts
@@ -10,12 +10,14 @@ describe('components', () => {
 
 		it('should render correctly', () => {
 			const wrapper = render(N8nDatatable, {
-				propsData: {
+				props: {
 					columns,
 					rows,
 					rowsPerPage,
 				},
-				stubs,
+				global: {
+					stubs,
+				},
 			});
 
 			expect(wrapper.container.querySelectorAll('thead tr').length).toEqual(1);
@@ -28,12 +30,14 @@ describe('components', () => {
 
 		it('should add column classes', () => {
 			const wrapper = render(N8nDatatable, {
-				propsData: {
+				props: {
 					columns: columns.map((column) => ({ ...column, classes: ['example'] })),
 					rows,
 					rowsPerPage,
 				},
-				stubs,
+				global: {
+					stubs,
+				},
 			});
 
 			expect(wrapper.container.querySelectorAll('.example').length).toEqual(
@@ -43,14 +47,16 @@ describe('components', () => {
 
 		it('should render row slot', () => {
 			const wrapper = render(N8nDatatable, {
-				propsData: {
+				props: {
 					columns,
 					rows,
 					rowsPerPage,
 				},
-				stubs,
-				scopedSlots: {
-					row: '<main><td v-for="column in props.columns" :key="column.id">Row slot</td></main>', // Wrapper is necessary for looping
+				global: {
+					stubs,
+				},
+				slots: {
+					row: '<template #row="props"><td v-for="column in props.columns" :key="column.id">Row slot</td></template>', // Wrapper is necessary for looping
 				},
 			});
 
diff --git a/packages/design-system/src/components/N8nDatatable/__tests__/__snapshots__/Datatable.spec.ts.snap b/packages/design-system/src/components/N8nDatatable/__tests__/__snapshots__/Datatable.spec.ts.snap
index c796db1a796f0..6fed9964f6ed8 100644
--- a/packages/design-system/src/components/N8nDatatable/__tests__/__snapshots__/Datatable.spec.ts.snap
+++ b/packages/design-system/src/components/N8nDatatable/__tests__/__snapshots__/Datatable.spec.ts.snap
@@ -1,99 +1,103 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`components > N8nDatatable > should render correctly 1`] = `
-"<div class=\\"datatable datatableWrapper\\">
-  <table class=\\"datatable\\">
-    <thead class=\\"datatableHeader\\">
+"<div class="datatable datatableWrapper">
+  <table class="datatable">
+    <thead class="datatableHeader">
       <tr>
-        <th> ID </th>
-        <th> Name </th>
-        <th> Age </th>
-        <th> Action </th>
+        <th class="">ID</th>
+        <th class="">Name</th>
+        <th class="">Age</th>
+        <th class="">Action</th>
       </tr>
     </thead>
     <tbody>
       <tr>
-        <td><span>1</span></td>
-        <td><span>Richard Hendricks</span></td>
-        <td><span>29</span></td>
-        <td><button aria-live=\\"polite\\" class=\\"button button primary medium\\" column=\\"[object Object]\\">
-            <!----><span>Button 1</span></button></td>
+        <td class=""><span>1</span></td>
+        <td class=""><span>Richard Hendricks</span></td>
+        <td class=""><span>29</span></td>
+        <td class="">
+          <n8n-button-stub block="false" element="button" label="" square="false" active="false" disabled="false" loading="false" outline="false" size="medium" text="false" type="primary" column="[object Object]"></n8n-button-stub>
+        </td>
       </tr>
       <tr>
-        <td><span>2</span></td>
-        <td><span>Bertram Gilfoyle</span></td>
-        <td><span>44</span></td>
-        <td><button aria-live=\\"polite\\" class=\\"button button primary medium\\" column=\\"[object Object]\\">
-            <!----><span>Button 2</span></button></td>
+        <td class=""><span>2</span></td>
+        <td class=""><span>Bertram Gilfoyle</span></td>
+        <td class=""><span>44</span></td>
+        <td class="">
+          <n8n-button-stub block="false" element="button" label="" square="false" active="false" disabled="false" loading="false" outline="false" size="medium" text="false" type="primary" column="[object Object]"></n8n-button-stub>
+        </td>
       </tr>
       <tr>
-        <td><span>3</span></td>
-        <td><span>Dinesh Chugtai</span></td>
-        <td><span>31</span></td>
-        <td><button aria-live=\\"polite\\" class=\\"button button primary medium\\" column=\\"[object Object]\\">
-            <!----><span>Button 3</span></button></td>
+        <td class=""><span>3</span></td>
+        <td class=""><span>Dinesh Chugtai</span></td>
+        <td class=""><span>31</span></td>
+        <td class="">
+          <n8n-button-stub block="false" element="button" label="" square="false" active="false" disabled="false" loading="false" outline="false" size="medium" text="false" type="primary" column="[object Object]"></n8n-button-stub>
+        </td>
       </tr>
       <tr>
-        <td><span>4</span></td>
-        <td><span>Jared Dunn </span></td>
-        <td><span>38</span></td>
-        <td><button aria-live=\\"polite\\" class=\\"button button primary medium\\" column=\\"[object Object]\\">
-            <!----><span>Button 4</span></button></td>
+        <td class=""><span>4</span></td>
+        <td class=""><span>Jared Dunn </span></td>
+        <td class=""><span>38</span></td>
+        <td class="">
+          <n8n-button-stub block="false" element="button" label="" square="false" active="false" disabled="false" loading="false" outline="false" size="medium" text="false" type="primary" column="[object Object]"></n8n-button-stub>
+        </td>
       </tr>
       <tr>
-        <td><span>5</span></td>
-        <td><span>Richard Hendricks</span></td>
-        <td><span>29</span></td>
-        <td><button aria-live=\\"polite\\" class=\\"button button primary medium\\" column=\\"[object Object]\\">
-            <!----><span>Button 5</span></button></td>
+        <td class=""><span>5</span></td>
+        <td class=""><span>Richard Hendricks</span></td>
+        <td class=""><span>29</span></td>
+        <td class="">
+          <n8n-button-stub block="false" element="button" label="" square="false" active="false" disabled="false" loading="false" outline="false" size="medium" text="false" type="primary" column="[object Object]"></n8n-button-stub>
+        </td>
       </tr>
       <tr>
-        <td><span>6</span></td>
-        <td><span>Bertram Gilfoyle</span></td>
-        <td><span>44</span></td>
-        <td><button aria-live=\\"polite\\" class=\\"button button primary medium\\" column=\\"[object Object]\\">
-            <!----><span>Button 6</span></button></td>
+        <td class=""><span>6</span></td>
+        <td class=""><span>Bertram Gilfoyle</span></td>
+        <td class=""><span>44</span></td>
+        <td class="">
+          <n8n-button-stub block="false" element="button" label="" square="false" active="false" disabled="false" loading="false" outline="false" size="medium" text="false" type="primary" column="[object Object]"></n8n-button-stub>
+        </td>
       </tr>
       <tr>
-        <td><span>7</span></td>
-        <td><span>Dinesh Chugtai</span></td>
-        <td><span>31</span></td>
-        <td><button aria-live=\\"polite\\" class=\\"button button primary medium\\" column=\\"[object Object]\\">
-            <!----><span>Button 7</span></button></td>
+        <td class=""><span>7</span></td>
+        <td class=""><span>Dinesh Chugtai</span></td>
+        <td class=""><span>31</span></td>
+        <td class="">
+          <n8n-button-stub block="false" element="button" label="" square="false" active="false" disabled="false" loading="false" outline="false" size="medium" text="false" type="primary" column="[object Object]"></n8n-button-stub>
+        </td>
       </tr>
       <tr>
-        <td><span>8</span></td>
-        <td><span>Jared Dunn </span></td>
-        <td><span>38</span></td>
-        <td><button aria-live=\\"polite\\" class=\\"button button primary medium\\" column=\\"[object Object]\\">
-            <!----><span>Button 8</span></button></td>
+        <td class=""><span>8</span></td>
+        <td class=""><span>Jared Dunn </span></td>
+        <td class=""><span>38</span></td>
+        <td class="">
+          <n8n-button-stub block="false" element="button" label="" square="false" active="false" disabled="false" loading="false" outline="false" size="medium" text="false" type="primary" column="[object Object]"></n8n-button-stub>
+        </td>
       </tr>
       <tr>
-        <td><span>9</span></td>
-        <td><span>Richard Hendricks</span></td>
-        <td><span>29</span></td>
-        <td><button aria-live=\\"polite\\" class=\\"button button primary medium\\" column=\\"[object Object]\\">
-            <!----><span>Button 9</span></button></td>
+        <td class=""><span>9</span></td>
+        <td class=""><span>Richard Hendricks</span></td>
+        <td class=""><span>29</span></td>
+        <td class="">
+          <n8n-button-stub block="false" element="button" label="" square="false" active="false" disabled="false" loading="false" outline="false" size="medium" text="false" type="primary" column="[object Object]"></n8n-button-stub>
+        </td>
       </tr>
       <tr>
-        <td><span>10</span></td>
-        <td><span>Bertram Gilfoyle</span></td>
-        <td><span>44</span></td>
-        <td><button aria-live=\\"polite\\" class=\\"button button primary medium\\" column=\\"[object Object]\\">
-            <!----><span>Button 10</span></button></td>
+        <td class=""><span>10</span></td>
+        <td class=""><span>Bertram Gilfoyle</span></td>
+        <td class=""><span>44</span></td>
+        <td class="">
+          <n8n-button-stub block="false" element="button" label="" square="false" active="false" disabled="false" loading="false" outline="false" size="medium" text="false" type="primary" column="[object Object]"></n8n-button-stub>
+        </td>
       </tr>
     </tbody>
   </table>
-  <div class=\\"pagination\\">
-    <n8n-pagination-stub pagesize=\\"10\\" total=\\"15\\" pagercount=\\"5\\" currentpage=\\"1\\" layout=\\"prev, pager, next\\" pagesizes=\\"10,20,30,40,50,100\\" background=\\"true\\"></n8n-pagination-stub>
-    <div class=\\"pageSizeSelector\\">
-      <n8n-select-stub value=\\"10\\" size=\\"mini\\" popperappendtobody=\\"true\\">
-        <n8n-option-stub value=\\"10\\" label=\\"10\\"></n8n-option-stub>
-        <n8n-option-stub value=\\"25\\" label=\\"25\\"></n8n-option-stub>
-        <n8n-option-stub value=\\"50\\" label=\\"50\\"></n8n-option-stub>
-        <n8n-option-stub value=\\"100\\" label=\\"100\\"></n8n-option-stub>
-        <n8n-option-stub value=\\"*\\" label=\\"All\\"></n8n-option-stub>
-      </n8n-select-stub>
+  <div class="pagination">
+    <n8n-pagination-stub pagesize="10" total="15" currentpage="1" pagercount="5" layout="prev, pager, next" pagesizes="10,20,30,40,50,100" popperclass="" prevtext="" previcon="[object Object]" nexttext="" nexticon="[object Object]" small="false" background="true" disabled="false" hideonsinglepage="false"></n8n-pagination-stub>
+    <div class="pageSizeSelector">
+      <n8n-select-stub modelvalue="10" autocomplete="off" automaticdropdown="false" size="mini" effect="light" disabled="false" clearable="false" filterable="false" allowcreate="false" loading="false" popperoptions="[object Object]" remote="false" multiple="false" multiplelimit="0" defaultfirstoption="false" reservekeyword="true" valuekey="value" collapsetags="false" collapsetagstooltip="false" maxcollapsetags="1" teleported="true" persistent="true" clearicon="[object Object]" fitinputwidth="false" suffixicon="[object Object]" tagtype="info" validateevent="true" remoteshowsuffix="false" suffixtransition="true" placement="bottom-start" popperappendtobody="false" limitpopperwidth="false"></n8n-select-stub>
     </div>
   </div>
 </div>"
diff --git a/packages/design-system/src/components/N8nDatatable/__tests__/data.ts b/packages/design-system/src/components/N8nDatatable/__tests__/data.ts
index a9b2c5aa7e9a6..508e225b0d7ea 100644
--- a/packages/design-system/src/components/N8nDatatable/__tests__/data.ts
+++ b/packages/design-system/src/components/N8nDatatable/__tests__/data.ts
@@ -3,7 +3,6 @@ import { defineComponent, h } from 'vue';
 import type { DatatableRow } from '../../../types';
 import N8nButton from '../../N8nButton';
 
-// eslint-disable-next-line @typescript-eslint/naming-convention
 export const ActionComponent = defineComponent({
 	props: {
 		row: {
diff --git a/packages/design-system/src/components/N8nFormBox/FormBox.stories.ts b/packages/design-system/src/components/N8nFormBox/FormBox.stories.ts
index 44a45077bdcd1..3db1bc1f01254 100644
--- a/packages/design-system/src/components/N8nFormBox/FormBox.stories.ts
+++ b/packages/design-system/src/components/N8nFormBox/FormBox.stories.ts
@@ -1,6 +1,6 @@
 import N8nFormBox from './FormBox.vue';
 import { action } from '@storybook/addon-actions';
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 
 export default {
 	title: 'Modules/FormBox',
@@ -13,15 +13,16 @@ export default {
 
 const methods = {
 	onSubmit: action('submit'),
-	onInput: action('input'),
+	onChange: action('update'),
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nFormBox,
 	},
-	template: '<n8n-form-box v-bind="$props" @submit="onSubmit" @input="onInput" />',
+	template: '<n8n-form-box v-bind="args" @submit="onSubmit" @update="onUpdate" />',
 	methods,
 });
 
diff --git a/packages/design-system/src/components/N8nFormBox/FormBox.vue b/packages/design-system/src/components/N8nFormBox/FormBox.vue
index ca04c107c5984..33ecb2d7a7203 100644
--- a/packages/design-system/src/components/N8nFormBox/FormBox.vue
+++ b/packages/design-system/src/components/N8nFormBox/FormBox.vue
@@ -1,107 +1,77 @@
 <template>
 	<div :class="['n8n-form-box', $style.container]">
 		<div v-if="title" :class="$style.heading">
-			<n8n-heading size="xlarge">
+			<N8nHeading size="xlarge">
 				{{ title }}
-			</n8n-heading>
+			</N8nHeading>
 		</div>
 		<div :class="$style.inputsContainer">
-			<n8n-form-inputs
+			<N8nFormInputs
 				:inputs="inputs"
-				:eventBus="formBus"
-				:columnView="true"
-				@input="onInput"
+				:event-bus="formBus"
+				:column-view="true"
+				@update="onUpdateModelValue"
 				@submit="onSubmit"
 			/>
 		</div>
-		<slot name="additional" />
-		<div :class="$style.buttonsContainer" v-if="secondaryButtonText || buttonText">
+		<div v-if="secondaryButtonText || buttonText" :class="$style.buttonsContainer">
 			<span v-if="secondaryButtonText" :class="$style.secondaryButtonContainer">
-				<n8n-link size="medium" theme="text" @click="onSecondaryButtonClick">
+				<N8nLink size="medium" theme="text" @click="onSecondaryButtonClick">
 					{{ secondaryButtonText }}
-				</n8n-link>
+				</N8nLink>
 			</span>
-			<n8n-button
+			<N8nButton
 				v-if="buttonText"
 				:label="buttonText"
 				:loading="buttonLoading"
+				data-test-id="form-submit-button"
 				size="large"
 				@click="onButtonClick"
 			/>
 		</div>
 		<div :class="$style.actionContainer">
-			<n8n-link v-if="redirectText && redirectLink" :to="redirectLink">
+			<N8nLink v-if="redirectText && redirectLink" :to="redirectLink">
 				{{ redirectText }}
-			</n8n-link>
+			</N8nLink>
 		</div>
 		<slot></slot>
 	</div>
 </template>
 
-<script lang="ts">
-import { defineComponent } from 'vue';
+<script lang="ts" setup>
 import N8nFormInputs from '../N8nFormInputs';
 import N8nHeading from '../N8nHeading';
 import N8nLink from '../N8nLink';
 import N8nButton from '../N8nButton';
+import type { IFormInput } from '@/types';
 import { createEventBus } from '../../utils';
 
-export default defineComponent({
-	name: 'n8n-form-box',
-	components: {
-		N8nHeading,
-		N8nFormInputs,
-		N8nLink,
-		N8nButton,
-	},
-	props: {
-		title: {
-			type: String,
-			default: '',
-		},
-		inputs: {
-			type: Array,
-			default: () => [],
-		},
-		buttonText: {
-			type: String,
-		},
-		buttonLoading: {
-			type: Boolean,
-			default: false,
-		},
-		secondaryButtonText: {
-			type: String,
-		},
-		redirectText: {
-			type: String,
-			default: '',
-		},
-		redirectLink: {
-			type: String,
-			default: '',
-		},
-	},
-	data() {
-		return {
-			formBus: createEventBus(),
-		};
-	},
-	methods: {
-		onInput(e: { name: string; value: string }) {
-			this.$emit('input', e);
-		},
-		onSubmit(e: { [key: string]: string }) {
-			this.$emit('submit', e);
-		},
-		onButtonClick() {
-			this.formBus.emit('submit');
-		},
-		onSecondaryButtonClick(event: Event) {
-			this.$emit('secondaryClick', event);
-		},
-	},
+interface FormBoxProps {
+	title?: string;
+	inputs?: IFormInput[];
+	buttonText?: string;
+	buttonLoading?: boolean;
+	secondaryButtonText?: string;
+	redirectText?: string;
+	redirectLink?: string;
+}
+
+defineOptions({ name: 'N8nFormBox' });
+withDefaults(defineProps<FormBoxProps>(), {
+	title: '',
+	inputs: () => [],
+	buttonLoading: false,
+	redirectText: '',
+	redirectLink: '',
 });
+
+const formBus = createEventBus();
+const $emit = defineEmits(['submit', 'update', 'secondaryClick']);
+
+const onUpdateModelValue = (e: { name: string; value: string }) => $emit('update', e);
+const onSubmit = (e: { [key: string]: string }) => $emit('submit', e);
+const onButtonClick = () => formBus.emit('submit');
+const onSecondaryButtonClick = (event: Event) => $emit('secondaryClick', event);
 </script>
 
 <style lang="scss" module>
diff --git a/packages/design-system/src/components/N8nFormInput/FormInput.stories.ts b/packages/design-system/src/components/N8nFormInput/FormInput.stories.ts
index 1542944794c1f..e69972ea0c7af 100644
--- a/packages/design-system/src/components/N8nFormInput/FormInput.stories.ts
+++ b/packages/design-system/src/components/N8nFormInput/FormInput.stories.ts
@@ -1,6 +1,6 @@
 import N8nFormInput from './FormInput.vue';
 import { action } from '@storybook/addon-actions';
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 
 export default {
 	title: 'Modules/FormInput',
@@ -9,18 +9,19 @@ export default {
 };
 
 const methods = {
-	onInput: action('input'),
+	onUpdateModelValue: action('update:modelValue'),
 	onFocus: action('focus'),
 	onChange: action('change'),
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nFormInput,
 	},
 	template: `
-		<n8n-form-input v-bind="$props" v-model="val" @input="onInput" @change="onChange" @focus="onFocus" />
+		<n8n-form-input v-bind="args" v-model="val" @update:modelValue="onUpdateModelValue" @change="onChange" @focus="onFocus" />
 	`,
 	methods,
 	data() {
diff --git a/packages/design-system/src/components/N8nFormInput/FormInput.vue b/packages/design-system/src/components/N8nFormInput/FormInput.vue
index 30622d9f6fdaf..87f0732b51282 100644
--- a/packages/design-system/src/components/N8nFormInput/FormInput.vue
+++ b/packages/design-system/src/components/N8nFormInput/FormInput.vue
@@ -1,87 +1,91 @@
 <template>
-	<n8n-checkbox
+	<N8nCheckbox
 		v-if="type === 'checkbox'"
 		v-bind="$props"
-		@input="onInput"
-		@focus="onFocus"
 		ref="inputRef"
+		@update:model-value="onUpdateModelValue"
+		@focus="onFocus"
 	/>
-	<n8n-input-label
+	<N8nInputLabel
 		v-else-if="type === 'toggle'"
-		:inputName="name"
+		:input-name="name"
 		:label="label"
-		:tooltipText="tooltipText"
+		:tooltip-text="tooltipText"
 		:required="required && showRequiredAsterisk"
 	>
 		<template #content>
 			{{ tooltipText }}
 		</template>
-		<el-switch
-			:value="value"
-			@change="onInput"
+		<ElSwitch
+			:model-value="modelValue"
 			:active-color="activeColor"
 			:inactive-color="inactiveColor"
-		></el-switch>
-	</n8n-input-label>
-	<n8n-input-label
+			@update:model-value="onUpdateModelValue"
+		></ElSwitch>
+	</N8nInputLabel>
+	<N8nInputLabel
 		v-else
-		:inputName="name"
+		:input-name="name"
 		:label="label"
-		:tooltipText="tooltipText"
+		:tooltip-text="tooltipText"
 		:required="required && showRequiredAsterisk"
 	>
 		<div :class="showErrors ? $style.errorInput : ''" @keydown.stop @keydown.enter="onEnter">
 			<slot v-if="hasDefaultSlot" />
-			<n8n-select
+			<N8nSelect
 				v-else-if="type === 'select' || type === 'multi-select'"
-				:value="value"
+				ref="inputRef"
+				:class="{ [$style.multiSelectSmallTags]: tagSize === 'small' }"
+				:model-value="modelValue"
 				:placeholder="placeholder"
 				:multiple="type === 'multi-select'"
 				:disabled="disabled"
-				@change="onInput"
+				:name="name"
+				:teleported="teleported"
+				@update:model-value="onUpdateModelValue"
 				@focus="onFocus"
 				@blur="onBlur"
-				:name="name"
-				ref="inputRef"
 			>
-				<n8n-option
+				<N8nOption
 					v-for="option in options || []"
 					:key="option.value"
 					:value="option.value"
 					:label="option.label"
+					:disabled="!!option.disabled"
+					size="small"
 				/>
-			</n8n-select>
-			<n8n-input
+			</N8nSelect>
+			<N8nInput
 				v-else
+				ref="inputRef"
 				:name="name"
 				:type="type"
 				:placeholder="placeholder"
-				:value="value"
+				:model-value="modelValue"
 				:maxlength="maxlength"
 				:autocomplete="autocomplete"
 				:disabled="disabled"
-				@input="onInput"
+				@update:model-value="onUpdateModelValue"
 				@blur="onBlur"
 				@focus="onFocus"
-				ref="inputRef"
 			/>
 		</div>
-		<div :class="$style.errors" v-if="showErrors">
+		<div v-if="showErrors" :class="$style.errors">
 			<span v-text="validationError" />
 			<n8n-link
 				v-if="documentationUrl && documentationText"
 				:to="documentationUrl"
-				:newWindow="true"
+				:new-window="true"
 				size="small"
 				theme="danger"
 			>
 				{{ documentationText }}
 			</n8n-link>
 		</div>
-		<div :class="$style.infoText" v-else-if="infoText">
+		<div v-else-if="infoText" :class="$style.infoText">
 			<span size="small" v-text="infoText" />
 		</div>
-	</n8n-input-label>
+	</N8nInputLabel>
 </template>
 
 <script lang="ts" setup>
@@ -92,7 +96,7 @@ import N8nSelect from '../N8nSelect';
 import N8nOption from '../N8nOption';
 import N8nInputLabel from '../N8nInputLabel';
 import N8nCheckbox from '../N8nCheckbox';
-import { Switch as ElSwitch } from 'element-ui';
+import { ElSwitch } from 'element-plus';
 
 import { getValidationError, VALIDATORS } from './validators';
 import type { Rule, RuleGroup, IValidator, Validatable, FormState } from '../../types';
@@ -100,7 +104,7 @@ import type { Rule, RuleGroup, IValidator, Validatable, FormState } from '../../
 import { t } from '../../locale';
 
 export interface Props {
-	value: Validatable;
+	modelValue: Validatable;
 	label: string;
 	infoText?: string;
 	required?: boolean;
@@ -115,7 +119,7 @@ export interface Props {
 	validationRules?: Array<Rule | RuleGroup>;
 	validators?: { [key: string]: IValidator | RuleGroup };
 	maxlength?: number;
-	options?: Array<{ value: string | number; label: string }>;
+	options?: Array<{ value: string | number; label: string; disabled?: boolean }>;
 	autocomplete?: string;
 	name?: string;
 	focusInitially?: boolean;
@@ -125,6 +129,8 @@ export interface Props {
 	activeColor?: string;
 	inactiveLabel?: string;
 	inactiveColor?: string;
+	teleported?: boolean;
+	tagSize?: 'small' | 'medium';
 }
 
 const props = withDefaults(defineProps<Props>(), {
@@ -133,11 +139,13 @@ const props = withDefaults(defineProps<Props>(), {
 	type: 'text',
 	showRequiredAsterisk: true,
 	validateOnBlur: true,
+	teleported: true,
+	tagSize: 'small',
 });
 
-const emit = defineEmits<{
+const $emit = defineEmits<{
 	(event: 'validate', shouldValidate: boolean): void;
-	(event: 'input', value: unknown): void;
+	(event: 'update:modelValue', value: unknown): void;
 	(event: 'focus'): void;
 	(event: 'blur'): void;
 	(event: 'enter'): void;
@@ -160,7 +168,11 @@ function getInputValidationError(): ReturnType<IValidator['validate']> {
 	} as { [key: string]: IValidator | RuleGroup };
 
 	if (props.required) {
-		const error = getValidationError(props.value, validators, validators.REQUIRED as IValidator);
+		const error = getValidationError(
+			props.modelValue,
+			validators,
+			validators.REQUIRED as IValidator,
+		);
 		if (error) return error;
 	}
 
@@ -169,7 +181,7 @@ function getInputValidationError(): ReturnType<IValidator['validate']> {
 			const rule = rules[i] as Rule;
 			if (validators[rule.name]) {
 				const error = getValidationError(
-					props.value,
+					props.modelValue,
 					validators,
 					validators[rule.name] as IValidator,
 					rule.config,
@@ -180,7 +192,7 @@ function getInputValidationError(): ReturnType<IValidator['validate']> {
 
 		if (rules[i].hasOwnProperty('rules')) {
 			const rule = rules[i] as RuleGroup;
-			const error = getValidationError(props.value, validators, rule);
+			const error = getValidationError(props.modelValue, validators, rule);
 			if (error) return error;
 		}
 	}
@@ -191,22 +203,22 @@ function getInputValidationError(): ReturnType<IValidator['validate']> {
 function onBlur() {
 	state.hasBlurred = true;
 	state.isTyping = false;
-	emit('blur');
+	$emit('blur');
 }
 
-function onInput(value: FormState) {
+function onUpdateModelValue(value: FormState) {
 	state.isTyping = true;
-	emit('input', value);
+	$emit('update:modelValue', value);
 }
 
 function onFocus() {
-	emit('focus');
+	$emit('focus');
 }
 
 function onEnter(event: Event) {
 	event.stopPropagation();
 	event.preventDefault();
-	emit('enter');
+	$emit('enter');
 }
 
 const validationError = computed<string | null>(() => {
@@ -232,14 +244,14 @@ const showErrors = computed(
 );
 
 onMounted(() => {
-	emit('validate', !validationError.value);
+	$emit('validate', !validationError.value);
 
 	if (props.focusInitially && inputRef.value) inputRef.value.focus();
 });
 
 watch(
 	() => validationError.value,
-	(error) => emit('validate', !error),
+	(error) => $emit('validate', !error),
 );
 
 defineExpose({ inputRef });
@@ -261,4 +273,12 @@ defineExpose({ inputRef });
 .errorInput {
 	--input-border-color: var(--color-danger);
 }
+
+.multiSelectSmallTags {
+	:global(.el-tag) {
+		height: 24px;
+		padding: 0 8px;
+		line-height: 22px;
+	}
+}
 </style>
diff --git a/packages/design-system/src/components/N8nFormInputs/FormInputs.stories.ts b/packages/design-system/src/components/N8nFormInputs/FormInputs.stories.ts
index 4f4e17dba3a4f..d01968b3c288e 100644
--- a/packages/design-system/src/components/N8nFormInputs/FormInputs.stories.ts
+++ b/packages/design-system/src/components/N8nFormInputs/FormInputs.stories.ts
@@ -1,6 +1,6 @@
 import N8nFormInputs from './FormInputs.vue';
 import { action } from '@storybook/addon-actions';
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 
 export default {
 	title: 'Modules/FormInputs',
@@ -12,16 +12,17 @@ export default {
 };
 
 const methods = {
-	onInput: action('input'),
+	onChange: action('change'),
 	onSubmit: action('submit'),
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nFormInputs,
 	},
-	template: '<n8n-form-inputs v-bind="$props" @submit="onSubmit" @input="onInput" />',
+	template: '<n8n-form-inputs v-bind="args" @submit="onSubmit" @change="onChange" />',
 	methods,
 });
 
diff --git a/packages/design-system/src/components/N8nFormInputs/FormInputs.vue b/packages/design-system/src/components/N8nFormInputs/FormInputs.vue
index e0809c1d39526..3060646dd56ea 100644
--- a/packages/design-system/src/components/N8nFormInputs/FormInputs.vue
+++ b/packages/design-system/src/components/N8nFormInputs/FormInputs.vue
@@ -8,8 +8,8 @@
 					:class="{ [`mt-${verticalSpacing}`]: verticalSpacing && index > 0 }"
 				>
 					<n8n-text
-						color="text-base"
 						v-if="input.properties.type === 'info'"
+						color="text-base"
 						tag="div"
 						:size="input.properties.labelSize"
 						:align="input.properties.labelAlignment"
@@ -17,17 +17,18 @@
 					>
 						{{ input.properties.label }}
 					</n8n-text>
-					<n8n-form-input
+					<N8nFormInput
 						v-else
 						v-bind="input.properties"
 						:name="input.name"
 						:label="input.properties.label || ''"
-						:value="values[input.name]"
+						:model-value="values[input.name]"
 						:data-test-id="input.name"
-						:showValidationWarnings="showValidationWarnings"
-						@input="(value) => onInput(input.name, value)"
+						:show-validation-warnings="showValidationWarnings"
+						:teleported="teleported"
+						:tag-size="tagSize"
+						@update:model-value="(value) => onUpdateModelValue(input.name, value)"
 						@validate="(value) => onValidate(input.name, value)"
-						@change="(value) => onInput(input.name, value)"
 						@enter="onSubmit"
 					/>
 				</div>
@@ -40,13 +41,13 @@
 import type { PropType } from 'vue';
 import { defineComponent } from 'vue';
 import N8nFormInput from '../N8nFormInput';
-import type { IFormInput } from '../../types';
+import type { IFormInput, Validatable } from '../../types';
 import ResizeObserver from '../ResizeObserver';
 import type { EventBus } from '../../utils';
 import { createEventBus } from '../../utils';
 
 export default defineComponent({
-	name: 'n8n-form-inputs',
+	name: 'N8nFormInputs',
 	components: {
 		N8nFormInput,
 		ResizeObserver,
@@ -69,25 +70,23 @@ export default defineComponent({
 			default: '',
 			validator: (value: string): boolean => ['', 'xs', 's', 'm', 'm', 'l', 'xl'].includes(value),
 		},
+		teleported: {
+			type: Boolean,
+			default: true,
+		},
+		tagSize: {
+			type: String,
+			default: 'small',
+			validator: (value: string): boolean => ['small', 'medium'].includes(value),
+		},
 	},
 	data() {
 		return {
 			showValidationWarnings: false,
-			values: {} as { [key: string]: unknown },
+			values: {} as { [key: string]: Validatable },
 			validity: {} as { [key: string]: boolean },
 		};
 	},
-	mounted() {
-		this.inputs.forEach((input) => {
-			if (input.hasOwnProperty('initialValue')) {
-				this.$set(this.values, input.name, input.initialValue);
-			}
-		});
-
-		if (this.eventBus) {
-			this.eventBus.on('submit', () => this.onSubmit());
-		}
-	},
 	computed: {
 		filteredInputs(): IFormInput[] {
 			return this.inputs.filter((input) =>
@@ -104,36 +103,57 @@ export default defineComponent({
 			return true;
 		},
 	},
+	watch: {
+		isReadyToSubmit(ready: boolean) {
+			this.$emit('ready', ready);
+		},
+	},
+	mounted() {
+		this.inputs.forEach((input) => {
+			if (input.hasOwnProperty('initialValue')) {
+				this.values = {
+					...this.values,
+					[input.name]: input.initialValue,
+				};
+			}
+		});
+
+		if (this.eventBus) {
+			this.eventBus.on('submit', () => this.onSubmit());
+		}
+	},
 	methods: {
-		onInput(name: string, value: unknown) {
+		onUpdateModelValue(name: string, value: unknown) {
 			this.values = {
 				...this.values,
 				[name]: value,
 			};
-			this.$emit('input', { name, value });
+			this.$emit('update', { name, value });
+			this.$emit('update:modelValue', this.values);
 		},
 		onValidate(name: string, valid: boolean) {
-			this.$set(this.validity, name, valid);
+			this.validity = {
+				...this.validity,
+				[name]: valid,
+			};
 		},
 		onSubmit() {
 			this.showValidationWarnings = true;
 
 			if (this.isReadyToSubmit) {
-				const toSubmit = this.filteredInputs.reduce<{ [key: string]: unknown }>((accu, input) => {
-					if (this.values[input.name]) {
-						accu[input.name] = this.values[input.name];
-					}
-					return accu;
-				}, {});
+				const toSubmit = this.filteredInputs.reduce(
+					(accu, input) => {
+						if (this.values[input.name]) {
+							accu[input.name] = this.values[input.name];
+						}
+						return accu;
+					},
+					{} as { [key: string]: Validatable },
+				);
 				this.$emit('submit', toSubmit);
 			}
 		},
 	},
-	watch: {
-		isReadyToSubmit(ready: boolean) {
-			this.$emit('ready', ready);
-		},
-	},
 });
 </script>
 
diff --git a/packages/design-system/src/components/N8nHeading/Heading.stories.ts b/packages/design-system/src/components/N8nHeading/Heading.stories.ts
index c581f3c7901b8..8110662bc1948 100644
--- a/packages/design-system/src/components/N8nHeading/Heading.stories.ts
+++ b/packages/design-system/src/components/N8nHeading/Heading.stories.ts
@@ -1,4 +1,4 @@
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 import N8nHeading from './Heading.vue';
 
 export default {
@@ -8,24 +8,25 @@ export default {
 		size: {
 			control: {
 				type: 'select',
-				options: ['2xlarge', 'xlarge', 'large', 'medium', 'small'],
 			},
+			options: ['2xlarge', 'xlarge', 'large', 'medium', 'small'],
 		},
 		color: {
 			control: {
 				type: 'select',
-				options: ['primary', 'text-dark', 'text-base', 'text-light', 'text-xlight'],
 			},
+			options: ['primary', 'text-dark', 'text-base', 'text-light', 'text-xlight'],
 		},
 	},
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nHeading,
 	},
-	template: '<n8n-heading v-bind="$props">hello world</n8n-heading>',
+	template: '<n8n-heading v-bind="args">hello world</n8n-heading>',
 });
 
 export const Heading = Template.bind({});
diff --git a/packages/design-system/src/components/N8nHeading/Heading.vue b/packages/design-system/src/components/N8nHeading/Heading.vue
index 43c24423a9761..d296c3557856e 100644
--- a/packages/design-system/src/components/N8nHeading/Heading.vue
+++ b/packages/design-system/src/components/N8nHeading/Heading.vue
@@ -1,60 +1,52 @@
 <template>
-	<component :is="tag" :class="['n8n-heading', ...classes]" v-on="$listeners">
+	<component :is="tag" :class="['n8n-heading', ...classes]" v-bind="$attrs">
 		<slot></slot>
 	</component>
 </template>
 
-<script lang="ts">
-import { defineComponent } from 'vue';
-
-export default defineComponent({
-	name: 'n8n-heading',
-	props: {
-		tag: {
-			type: String,
-			default: 'span',
-		},
-		bold: {
-			type: Boolean,
-			default: false,
-		},
-		size: {
-			type: String,
-			default: 'medium',
-			validator: (value: string): boolean =>
-				['2xlarge', 'xlarge', 'large', 'medium', 'small'].includes(value),
-		},
-		color: {
-			type: String,
-			validator: (value: string): boolean =>
-				['primary', 'text-dark', 'text-base', 'text-light', 'text-xlight', 'danger'].includes(
-					value,
-				),
-		},
-		align: {
-			type: String,
-			validator: (value: string): boolean => ['right', 'left', 'center'].includes(value),
-		},
-	},
-	computed: {
-		classes() {
-			const applied = [];
-			if (this.align) {
-				// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-				applied.push(`align-${this.align}`);
-			}
-			if (this.color) {
-				applied.push(this.color);
-			}
-
-			// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-			applied.push(`size-${this.size}`);
-
-			applied.push(this.bold ? 'bold' : 'regular');
-
-			return applied.map((c) => this.$style[c]);
-		},
-	},
+<script lang="ts" setup>
+import { computed, useCssModule } from 'vue';
+
+const SIZES = ['2xlarge', 'xlarge', 'large', 'medium', 'small'] as const;
+const COLORS = [
+	'primary',
+	'text-dark',
+	'text-base',
+	'text-light',
+	'text-xlight',
+	'danger',
+] as const;
+const ALIGN = ['right', 'left', 'center'] as const;
+
+interface HeadingProps {
+	tag?: string;
+	bold?: boolean;
+	size?: (typeof SIZES)[number];
+	color?: (typeof COLORS)[number];
+	align?: (typeof ALIGN)[number];
+}
+
+defineOptions({ name: 'N8nHeading' });
+const props = withDefaults(defineProps<HeadingProps>(), {
+	tag: 'span',
+	bold: false,
+	size: 'medium',
+});
+
+const $style = useCssModule();
+const classes = computed(() => {
+	const applied: string[] = [];
+	if (props.align) {
+		applied.push(`align-${props.align}`);
+	}
+	if (props.color) {
+		applied.push(props.color);
+	}
+
+	applied.push(`size-${props.size}`);
+	applied.push(props.bold ? 'bold' : 'regular');
+
+	return applied.map((c) => $style[c]);
 });
 </script>
 
diff --git a/packages/design-system/src/components/N8nIcon/Icon.stories.ts b/packages/design-system/src/components/N8nIcon/Icon.stories.ts
index 6d71ea5a00c2d..1b5d3b115aa26 100644
--- a/packages/design-system/src/components/N8nIcon/Icon.stories.ts
+++ b/packages/design-system/src/components/N8nIcon/Icon.stories.ts
@@ -1,4 +1,4 @@
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 import N8nIcon from './Icon.vue';
 
 export default {
@@ -11,8 +11,8 @@ export default {
 		size: {
 			control: {
 				type: 'select',
-				options: ['xsmall', 'small', 'medium', 'large'],
 			},
+			options: ['xsmall', 'small', 'medium', 'large'],
 		},
 		spin: {
 			control: {
@@ -23,11 +23,12 @@ export default {
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nIcon,
 	},
-	template: '<n8n-icon v-bind="$props" />',
+	template: '<n8n-icon v-bind="args" />',
 });
 
 export const Clock = Template.bind({});
diff --git a/packages/design-system/src/components/N8nIcon/Icon.vue b/packages/design-system/src/components/N8nIcon/Icon.vue
index 4cce7dcdac707..0caa880ba9094 100644
--- a/packages/design-system/src/components/N8nIcon/Icon.vue
+++ b/packages/design-system/src/components/N8nIcon/Icon.vue
@@ -1,37 +1,26 @@
 <template>
-	<n8n-text :size="size" :color="color" :compact="true" class="n8n-icon" v-on="$listeners">
-		<font-awesome-icon :icon="icon" :spin="spin" :class="$style[size]" />
-	</n8n-text>
+	<N8nText :size="size" :color="color" :compact="true" class="n8n-icon" v-bind="$attrs">
+		<FontAwesomeIcon :icon="icon" :spin="spin" :class="$style[size]" />
+	</N8nText>
 </template>
 
-<script lang="ts">
+<script lang="ts" setup>
+import type { FontAwesomeIconProps } from '@fortawesome/vue-fontawesome';
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
+import type { IconSize, IconColor } from '@/types/icon';
 import N8nText from '../N8nText';
 
-import { defineComponent } from 'vue';
-
-export default defineComponent({
-	name: 'n8n-icon',
-	components: {
-		FontAwesomeIcon,
-		N8nText,
-	},
-	props: {
-		icon: {
-			required: true,
-		},
-		size: {
-			type: String,
-			default: 'medium',
-		},
-		spin: {
-			type: Boolean,
-			default: false,
-		},
-		color: {
-			type: String,
-		},
-	},
+interface IconProps {
+	icon: FontAwesomeIconProps['icon'];
+	size?: IconSize;
+	spin?: FontAwesomeIconProps['spin'];
+	color?: IconColor;
+}
+
+defineOptions({ name: 'N8nIcon' });
+withDefaults(defineProps<IconProps>(), {
+	size: 'medium',
+	spin: false,
 });
 </script>
 
diff --git a/packages/design-system/src/components/N8nIconButton/IconButton.stories.ts b/packages/design-system/src/components/N8nIconButton/IconButton.stories.ts
index 22917d2d95679..a5207fdb4d1c1 100644
--- a/packages/design-system/src/components/N8nIconButton/IconButton.stories.ts
+++ b/packages/design-system/src/components/N8nIconButton/IconButton.stories.ts
@@ -1,6 +1,6 @@
 import N8nIconButton from './IconButton.vue';
 import { action } from '@storybook/addon-actions';
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 
 export default {
 	title: 'Atoms/Icon Button',
@@ -13,8 +13,8 @@ export default {
 		size: {
 			control: {
 				type: 'select',
-				options: ['mini', 'small', 'medium', 'large', 'xlarge'],
 			},
+			options: ['mini', 'small', 'medium', 'large', 'xlarge'],
 		},
 	},
 	parameters: {
@@ -27,11 +27,12 @@ const methods = {
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nIconButton,
 	},
-	template: '<n8n-icon-button v-bind="$props" @click="onClick" />',
+	template: '<n8n-icon-button @click="onClick" v-bind="args" />',
 	methods,
 });
 
@@ -42,12 +43,13 @@ Button.args = {
 };
 
 const ManyTemplate: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nIconButton,
 	},
 	template:
-		'<div> <n8n-icon-button v-bind="$props" size="xlarge" @click="onClick" /> <n8n-icon-button v-bind="$props" size="large" @click="onClick" />  <n8n-icon-button v-bind="$props" size="medium" @click="onClick" />  <n8n-icon-button v-bind="$props" size="small" @click="onClick" />  <n8n-icon-button v-bind="$props" :loading="true" @click="onClick" />  <n8n-icon-button v-bind="$props" :disabled="true" @click="onClick" /></div>',
+		'<div> <n8n-icon-button v-bind="args" size="xlarge" @click="onClick" /> <n8n-icon-button v-bind="args" size="large" @click="onClick" />  <n8n-icon-button v-bind="args" size="medium" @click="onClick" />  <n8n-icon-button v-bind="args" size="small" @click="onClick" />  <n8n-icon-button v-bind="args" :loading="true" @click="onClick" />  <n8n-icon-button v-bind="args" :disabled="true" @click="onClick" /></div>',
 	methods,
 });
 
diff --git a/packages/design-system/src/components/N8nIconButton/IconButton.vue b/packages/design-system/src/components/N8nIconButton/IconButton.vue
index 3782436bc1034..151a111b0357e 100644
--- a/packages/design-system/src/components/N8nIconButton/IconButton.vue
+++ b/packages/design-system/src/components/N8nIconButton/IconButton.vue
@@ -1,54 +1,19 @@
 <template>
-	<n8n-button square v-bind="$props" v-on="$listeners" />
+	<N8nButton square v-bind="{ ...$attrs, ...$props }" />
 </template>
 
-<script lang="ts">
+<script lang="ts" setup>
+import type { IconButtonProps } from '@/types/button';
 import N8nButton from '../N8nButton';
 
-import { defineComponent } from 'vue';
-
-export default defineComponent({
-	name: 'n8n-icon-button',
-	components: {
-		N8nButton,
-	},
-	props: {
-		type: {
-			type: String,
-			default: 'primary',
-		},
-		size: {
-			type: String,
-			default: 'medium',
-		},
-		loading: {
-			type: Boolean,
-			default: false,
-		},
-		outline: {
-			type: Boolean,
-			default: false,
-		},
-		text: {
-			type: Boolean,
-			default: false,
-		},
-		disabled: {
-			type: Boolean,
-			default: false,
-		},
-		active: {
-			type: Boolean,
-			default: false,
-		},
-		icon: {
-			type: [String, Array],
-			required: true,
-		},
-		float: {
-			type: String,
-			validator: (value: string): boolean => ['left', 'right'].includes(value),
-		},
-	},
+defineOptions({ name: 'N8nIconButton' });
+withDefaults(defineProps<IconButtonProps>(), {
+	type: 'primary',
+	size: 'medium',
+	loading: false,
+	outline: false,
+	text: false,
+	disabled: false,
+	active: false,
 });
 </script>
diff --git a/packages/design-system/src/components/N8nInfoAccordion/InfoAccordion.stories.ts b/packages/design-system/src/components/N8nInfoAccordion/InfoAccordion.stories.ts
index ed00ec9eb8e38..75a28abf458c9 100644
--- a/packages/design-system/src/components/N8nInfoAccordion/InfoAccordion.stories.ts
+++ b/packages/design-system/src/components/N8nInfoAccordion/InfoAccordion.stories.ts
@@ -1,5 +1,5 @@
 import N8nInfoAccordion from './InfoAccordion.vue';
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 import { action } from '@storybook/addon-actions';
 
 export default {
@@ -16,11 +16,12 @@ const methods = {
 };
 
 export const Default: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nInfoAccordion,
 	},
-	template: '<n8n-info-accordion v-bind="$props" @click="onClick" />',
+	template: '<n8n-info-accordion v-bind="args" @click="onClick" />',
 	methods,
 });
 
diff --git a/packages/design-system/src/components/N8nInfoAccordion/InfoAccordion.vue b/packages/design-system/src/components/N8nInfoAccordion/InfoAccordion.vue
index 7cf5d10d9d233..42a437e73ae79 100644
--- a/packages/design-system/src/components/N8nInfoAccordion/InfoAccordion.vue
+++ b/packages/design-system/src/components/N8nInfoAccordion/InfoAccordion.vue
@@ -1,17 +1,17 @@
 <template>
 	<div :class="['accordion', $style.container]">
 		<div :class="{ [$style.header]: true, [$style.expanded]: expanded }" @click="toggle">
-			<n8n-icon
+			<N8nIcon
 				v-if="headerIcon"
 				:icon="headerIcon.icon"
 				:color="headerIcon.color"
 				size="small"
 				class="mr-2xs"
 			/>
-			<n8n-text :class="$style.headerText" color="text-base" size="small" align="left" bold>{{
+			<N8nText :class="$style.headerText" color="text-base" size="small" align="left" bold>{{
 				title
-			}}</n8n-text>
-			<n8n-icon :icon="expanded ? 'chevron-up' : 'chevron-down'" bold />
+			}}</N8nText>
+			<N8nIcon :icon="expanded ? 'chevron-up' : 'chevron-down'" bold />
 		</div>
 		<div
 			v-if="expanded"
@@ -23,84 +23,68 @@
 				<div v-for="item in items" :key="item.id" :class="$style.accordionItem">
 					<n8n-tooltip :disabled="!item.tooltip">
 						<template #content>
-							<div v-html="item.tooltip" @click="onTooltipClick(item.id, $event)"></div>
+							<div @click="onTooltipClick(item.id, $event)" v-html="item.tooltip"></div>
 						</template>
-						<n8n-icon :icon="item.icon" :color="item.iconColor" size="small" class="mr-2xs" />
+						<N8nIcon :icon="item.icon" :color="item.iconColor" size="small" class="mr-2xs" />
 					</n8n-tooltip>
-					<n8n-text size="small" color="text-base">{{ item.label }}</n8n-text>
+					<N8nText size="small" color="text-base">{{ item.label }}</N8nText>
 				</div>
 			</div>
-			<n8n-text color="text-base" size="small" align="left">
+			<N8nText color="text-base" size="small" align="left">
 				<span v-html="description"></span>
-			</n8n-text>
+			</N8nText>
 			<slot name="customContent"></slot>
 		</div>
 	</div>
 </template>
 
-<script lang="ts">
+<script lang="ts" setup>
+import { onMounted, ref } from 'vue';
 import N8nText from '../N8nText';
 import N8nIcon from '../N8nIcon';
-import type { PropType } from 'vue';
-import { defineComponent } from 'vue';
+import type { IconColor } from '@/types/icon';
+import { createEventBus, type EventBus } from '../../utils';
 
-export interface IAccordionItem {
+interface IAccordionItem {
 	id: string;
 	label: string;
 	icon: string;
-	iconColor?: string;
+	iconColor?: IconColor;
 	tooltip?: string;
 }
 
-export default defineComponent({
-	name: 'n8n-info-accordion',
-	components: {
-		N8nText,
-		N8nIcon,
-	},
-	props: {
-		title: {
-			type: String,
-		},
-		description: {
-			type: String,
-		},
-		items: {
-			type: Array as PropType<IAccordionItem[]>,
-			default: () => [],
-		},
-		initiallyExpanded: {
-			type: Boolean,
-			default: false,
-		},
-		headerIcon: {
-			type: Object as PropType<{ icon: string; color: string }>,
-			required: false,
-		},
-	},
-	mounted() {
-		this.$on('expand', () => {
-			this.expanded = true;
-		});
-		this.expanded = this.initiallyExpanded;
-	},
-	data() {
-		return {
-			expanded: false,
-		};
-	},
-	methods: {
-		toggle() {
-			this.expanded = !this.expanded;
-		},
-		onClick(e: MouseEvent) {
-			this.$emit('click', e);
-		},
-		onTooltipClick(item: string, event: MouseEvent) {
-			this.$emit('tooltipClick', item, event);
-		},
-	},
+interface InfoAccordionProps {
+	title?: string;
+	description?: string;
+	items?: IAccordionItem[];
+	initiallyExpanded?: boolean;
+	headerIcon?: { icon: string; color: IconColor };
+	eventBus?: EventBus;
+}
+
+defineOptions({ name: 'N8nInfoAccordion' });
+const props = withDefaults(defineProps<InfoAccordionProps>(), {
+	items: () => [],
+	initiallyExpanded: false,
+	eventBus: () => createEventBus(),
+});
+const $emit = defineEmits(['click:body', 'tooltipClick']);
+
+const expanded = ref(false);
+onMounted(() => {
+	props.eventBus.on('expand', () => {
+		expanded.value = true;
+	});
+	expanded.value = props.initiallyExpanded;
 });
+
+const toggle = () => {
+	expanded.value = !expanded.value;
+};
+
+const onClick = (e: MouseEvent) => $emit('click:body', e);
+
+const onTooltipClick = (item: string, event: MouseEvent) => $emit('tooltipClick', item, event);
 </script>
 
 <style lang="scss" module>
diff --git a/packages/design-system/src/components/N8nInfoTip/InfoTip.stories.ts b/packages/design-system/src/components/N8nInfoTip/InfoTip.stories.ts
index e25106eb09bca..cf27c72a7220b 100644
--- a/packages/design-system/src/components/N8nInfoTip/InfoTip.stories.ts
+++ b/packages/design-system/src/components/N8nInfoTip/InfoTip.stories.ts
@@ -1,4 +1,4 @@
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 import N8nInfoTip from './InfoTip.vue';
 
 export default {
@@ -7,12 +7,13 @@ export default {
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nInfoTip,
 	},
 	template:
-		'<n8n-info-tip v-bind="$props">Need help doing something? <a href="/docs" target="_blank">Open docs</a></n8n-info-tip>',
+		'<n8n-info-tip v-bind="args">Need help doing something? <a href="/docs" target="_blank">Open docs</a></n8n-info-tip>',
 });
 
 export const Note = Template.bind({});
diff --git a/packages/design-system/src/components/N8nInfoTip/InfoTip.vue b/packages/design-system/src/components/N8nInfoTip/InfoTip.vue
index 7a81cbb0fd003..a537a4ffc5ec6 100644
--- a/packages/design-system/src/components/N8nInfoTip/InfoTip.vue
+++ b/packages/design-system/src/components/N8nInfoTip/InfoTip.vue
@@ -2,28 +2,29 @@
 	<div
 		:class="{
 			'n8n-info-tip': true,
+			[$style.infoTip]: true,
 			[$style[theme]]: true,
 			[$style[type]]: true,
 			[$style.bold]: bold,
 		}"
 	>
-		<n8n-tooltip
+		<N8nTooltip
 			v-if="type === 'tooltip'"
 			:placement="tooltipPlacement"
 			:popper-class="$style.tooltipPopper"
 			:disabled="type !== 'tooltip'"
 		>
-			<span :class="$style.iconText">
-				<n8n-icon :icon="theme.startsWith('info') ? 'info-circle' : 'exclamation-triangle'" />
+			<span :class="$style.iconText" :style="{ color: iconData.color }">
+				<N8nIcon :icon="iconData.icon" />
 			</span>
 			<template #content>
 				<span>
 					<slot />
 				</span>
 			</template>
-		</n8n-tooltip>
-		<span :class="$style.iconText" v-else>
-			<n8n-icon :icon="theme.startsWith('info') ? 'info-circle' : 'exclamation-triangle'" />
+		</N8nTooltip>
+		<span v-else :class="$style.iconText">
+			<N8nIcon :icon="iconData.icon" />
 			<span>
 				<slot />
 			</span>
@@ -31,43 +32,71 @@
 	</div>
 </template>
 
-<script lang="ts">
+<script lang="ts" setup>
+import { computed } from 'vue';
+import type { Placement } from 'element-plus';
 import N8nIcon from '../N8nIcon';
 import N8nTooltip from '../N8nTooltip';
 
-import { defineComponent } from 'vue';
+const THEME = ['info', 'info-light', 'warning', 'danger', 'success'] as const;
+const TYPE = ['note', 'tooltip'] as const;
 
-export default defineComponent({
-	name: 'n8n-info-tip',
-	components: {
-		N8nIcon,
-		N8nTooltip,
-	},
-	props: {
-		theme: {
-			type: String,
-			default: 'info',
-			validator: (value: string): boolean =>
-				['info', 'info-light', 'warning', 'danger'].includes(value),
-		},
-		type: {
-			type: String,
-			default: 'note',
-			validator: (value: string): boolean => ['note', 'tooltip'].includes(value),
-		},
-		bold: {
-			type: Boolean,
-			default: true,
-		},
-		tooltipPlacement: {
-			type: String,
-			default: 'top',
-		},
-	},
+interface InfoTipProps {
+	theme?: (typeof THEME)[number];
+	type?: (typeof TYPE)[number];
+	bold?: boolean;
+	tooltipPlacement?: Placement;
+}
+
+defineOptions({ name: 'N8nInfoTip' });
+const props = withDefaults(defineProps<InfoTipProps>(), {
+	theme: 'info',
+	type: 'note',
+	bold: true,
+	tooltipPlacement: 'top',
+});
+
+const iconData = computed((): { icon: string; color: string } => {
+	switch (props.theme) {
+		case 'info':
+			return {
+				icon: 'info-circle',
+				color: '--color-text-light)',
+			};
+		case 'info-light':
+			return {
+				icon: 'info-circle',
+				color: 'var(--color-foreground-dark)',
+			};
+		case 'warning':
+			return {
+				icon: 'exclamation-triangle',
+				color: 'var(--color-warning)',
+			};
+		case 'danger':
+			return {
+				icon: 'exclamation-triangle',
+				color: 'var(--color-danger)',
+			};
+		case 'success':
+			return {
+				icon: 'check-circle',
+				color: 'var(--color-success)',
+			};
+		default:
+			return {
+				icon: 'info-circle',
+				color: '--color-text-light)',
+			};
+	}
 });
 </script>
 
 <style lang="scss" module>
+.infoTip {
+	display: flex;
+}
+
 .base {
 	font-size: var(--font-size-2xs);
 	line-height: var(--font-size-s);
@@ -92,7 +121,7 @@ export default defineComponent({
 	}
 }
 
-.tooltip {
+.tooltipPopper {
 	composes: base;
 	display: inline-flex;
 }
@@ -101,20 +130,4 @@ export default defineComponent({
 	display: inline-flex;
 	align-items: flex-start;
 }
-
-.info-light {
-	color: var(--color-foreground-dark);
-}
-
-.info {
-	color: var(--color-text-light);
-}
-
-.warning {
-	color: var(--color-warning);
-}
-
-.danger {
-	color: var(--color-danger);
-}
 </style>
diff --git a/packages/design-system/src/components/N8nInfoTip/__tests__/InfoTip.spec.ts b/packages/design-system/src/components/N8nInfoTip/__tests__/InfoTip.spec.ts
index 0df326f7a39aa..b25713001b563 100644
--- a/packages/design-system/src/components/N8nInfoTip/__tests__/InfoTip.spec.ts
+++ b/packages/design-system/src/components/N8nInfoTip/__tests__/InfoTip.spec.ts
@@ -10,7 +10,9 @@ describe('N8nInfoTip', () => {
 	it('should render correctly as note', () => {
 		const wrapper = render(N8nInfoTip, {
 			slots,
-			stubs,
+			global: {
+				stubs,
+			},
 		});
 		expect(wrapper.html()).toMatchSnapshot();
 	});
@@ -18,10 +20,12 @@ describe('N8nInfoTip', () => {
 	it('should render correctly as tooltip', () => {
 		const wrapper = render(N8nInfoTip, {
 			slots,
-			stubs,
 			props: {
 				type: 'tooltip',
 			},
+			global: {
+				stubs,
+			},
 		});
 		expect(wrapper.html()).toMatchSnapshot();
 	});
diff --git a/packages/design-system/src/components/N8nInfoTip/__tests__/__snapshots__/InfoTip.spec.ts.snap b/packages/design-system/src/components/N8nInfoTip/__tests__/__snapshots__/InfoTip.spec.ts.snap
index 075cbbb8476f7..3a49e215d5349 100644
--- a/packages/design-system/src/components/N8nInfoTip/__tests__/__snapshots__/InfoTip.spec.ts.snap
+++ b/packages/design-system/src/components/N8nInfoTip/__tests__/__snapshots__/InfoTip.spec.ts.snap
@@ -1,9 +1,9 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`N8nInfoTip > should render correctly as note 1`] = `"<div class=\\"n8n-info-tip info note bold\\"><span class=\\"iconText\\"><span class=\\"n8n-icon n8n-text compact size-medium regular\\"></span><span>Need help doing something?<a href=\\"/docs\\" target=\\"_blank\\">Open docs</a></span></span></div>"`;
+exports[`N8nInfoTip > should render correctly as note 1`] = `"<div class="n8n-info-tip infoTip info note bold"><span class="iconText"><span class="n8n-text compact size-medium regular n8n-icon n8n-icon"><!----></span><span>Need help doing something?<a href="/docs" target="_blank">Open docs</a></span></span></div>"`;
 
 exports[`N8nInfoTip > should render correctly as tooltip 1`] = `
-"<div class=\\"n8n-info-tip info tooltip bold\\">
-  <n8n-tooltip-stub justifybuttons=\\"flex-end\\" buttons=\\"\\" placement=\\"top\\" popper-class=\\"tooltipPopper\\"><span class=\\"iconText\\"><span class=\\"n8n-icon n8n-text compact size-medium regular\\"></span></span></n8n-tooltip-stub>
+"<div class="n8n-info-tip infoTip info tooltip bold">
+  <n8n-tooltip-stub popperclass="tooltipPopper" role="tooltip" showafter="0" hideafter="200" autoclose="0" boundariespadding="0" gpuacceleration="true" offset="12" placement="top" popperoptions="[object Object]" strategy="absolute" effect="dark" enterable="true" pure="false" focusonshow="false" trapping="false" stoppoppermouseevent="true" virtualtriggering="false" content="" rawcontent="false" persistent="false" teleported="true" disabled="false" open="false" trigger="hover" triggerkeys="Enter,Space" arrowoffset="5" showarrow="true" justifybuttons="flex-end" buttons="" class=""></n8n-tooltip-stub>
 </div>"
 `;
diff --git a/packages/design-system/src/components/N8nInput/Input.stories.ts b/packages/design-system/src/components/N8nInput/Input.stories.ts
index a753399e9c816..2ab4056259879 100644
--- a/packages/design-system/src/components/N8nInput/Input.stories.ts
+++ b/packages/design-system/src/components/N8nInput/Input.stories.ts
@@ -1,7 +1,7 @@
 import N8nInput from './Input.vue';
 import N8nIcon from '../N8nIcon';
 import { action } from '@storybook/addon-actions';
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 
 export default {
 	title: 'Atoms/Input',
@@ -30,18 +30,19 @@ export default {
 };
 
 const methods = {
-	onInput: action('input'),
+	onUpdateModelValue: action('update:modelValue'),
 	onFocus: action('focus'),
 	onChange: action('change'),
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nInput,
 	},
 	template:
-		'<n8n-input v-bind="$props" v-model="val" @input="onInput" @change="onChange" @focus="onFocus" />',
+		'<n8n-input v-bind="args" v-model="val" @update:modelValue="onUpdateModelValue" @change="onChange" @focus="onFocus" />',
 	data() {
 		return {
 			val: '',
@@ -56,12 +57,13 @@ Input.args = {
 };
 
 const ManyTemplate: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nInput,
 	},
 	template:
-		'<div class="multi-container"> <n8n-input size="xlarge" v-bind="$props" v-model="val" @input="onInput" @change="onChange" @focus="onFocus" /> <n8n-input v-bind="$props" v-model="val" @input="onInput" @change="onChange" @focus="onFocus" /> <n8n-input v-bind="$props" size="medium" v-model="val" @input="onInput" @change="onChange" @focus="onFocus" /> <n8n-input v-bind="$props" size="small" v-model="val" @input="onInput" @change="onChange" @focus="onFocus" /> <n8n-input v-bind="$props" v-model="val" size="mini" @input="onInput" @change="onChange" @focus="onFocus" /> </div> ',
+		'<div class="multi-container"> <n8n-input size="xlarge" v-bind="args" v-model="val" @update:modelValue="onUpdateModelValue" @change="onChange" @focus="onFocus" /> <n8n-input v-bind="args" v-model="val" @update:modelValue="onUpdateModelValue" @change="onChange" @focus="onFocus" /> <n8n-input v-bind="args" size="medium" v-model="val" @update:modelValue="onUpdateModelValue" @change="onChange" @focus="onFocus" /> <n8n-input v-bind="args" size="small" v-model="val" @update:modelValue="onUpdateModelValue" @change="onChange" @focus="onFocus" /> <n8n-input v-bind="args" v-model="val" size="mini" @update:modelValue="onUpdateModelValue" @change="onChange" @focus="onFocus" /> </div> ',
 	methods,
 	data() {
 		return {
@@ -83,13 +85,14 @@ TextArea.args = {
 };
 
 const WithPrefix: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nIcon,
 		N8nInput,
 	},
 	template:
-		'<n8n-input v-bind="$props" v-model="val" @input="onInput" @change="onChange" @focus="onFocus"><n8n-icon icon="clock" slot="prefix" /></n8n-input>',
+		'<n8n-input v-bind="args" v-model="val" @update:modelValue="onUpdateModelValue" @change="onChange" @focus="onFocus"><n8n-icon icon="clock" slot="prefix" /></n8n-input>',
 	data() {
 		return {
 			val: '',
@@ -104,13 +107,14 @@ WithPrefixIcon.args = {
 };
 
 const WithSuffix: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nIcon,
 		N8nInput,
 	},
 	template:
-		'<n8n-input v-bind="$props" v-model="val" @input="onInput" @change="onChange" @focus="onFocus"><n8n-icon icon="clock" slot="suffix" /></n8n-input>',
+		'<n8n-input v-bind="args" v-model="val" @update:modelValue="onUpdateModelValue" @change="onChange" @focus="onFocus"><n8n-icon icon="clock" slot="suffix" /></n8n-input>',
 	data() {
 		return {
 			val: '',
diff --git a/packages/design-system/src/components/N8nInput/Input.vue b/packages/design-system/src/components/N8nInput/Input.vue
index 68e617d590f16..d5419d23178c9 100644
--- a/packages/design-system/src/components/N8nInput/Input.vue
+++ b/packages/design-system/src/components/N8nInput/Input.vue
@@ -1,139 +1,87 @@
 <template>
-	<el-input
-		v-bind="$props"
+	<ElInput
+		ref="innerInput"
 		:size="computedSize"
 		:class="['n8n-input', ...classes]"
-		:autoComplete="autocomplete"
-		ref="innerInput"
-		v-on="$listeners"
+		:autocomplete="autocomplete"
 		:name="name"
+		v-bind="{ ...$props, ...$attrs }"
 	>
-		<template #prepend>
+		<template v-if="$slots.prepend" #prepend>
 			<slot name="prepend" />
 		</template>
-		<template #append>
+		<template v-if="$slots.append" #append>
 			<slot name="append" />
 		</template>
-		<template #prefix>
+		<template v-if="$slots.prefix" #prefix>
 			<slot name="prefix" />
 		</template>
-		<template #suffix>
+		<template v-if="$slots.suffix" #suffix>
 			<slot name="suffix" />
 		</template>
-	</el-input>
+	</ElInput>
 </template>
 
-<script lang="ts">
-import { Input as ElInput } from 'element-ui';
-import { defineComponent } from 'vue';
-
-type InputRef = InstanceType<typeof ElInput>;
-
-export default defineComponent({
-	name: 'n8n-input',
-	components: {
-		ElInput,
-	},
-	props: {
-		value: {},
-		type: {
-			type: String,
-			validator: (value: string): boolean =>
-				['text', 'textarea', 'number', 'password', 'email'].includes(value),
-		},
-		size: {
-			type: String,
-			default: 'large',
-			validator: (value: string): boolean =>
-				['mini', 'small', 'medium', 'large', 'xlarge'].includes(value),
-		},
-		placeholder: {
-			type: String,
-		},
-		disabled: {
-			type: Boolean,
-		},
-		readonly: {
-			type: Boolean,
-		},
-		clearable: {
-			type: Boolean,
-		},
-		rows: {
-			type: Number,
-		},
-		maxlength: {
-			type: Number,
-		},
-		title: {
-			type: String,
-		},
-		name: {
-			type: String,
-		},
-		autocomplete: {
-			type: String,
-			default: 'off',
-		},
-	},
-	computed: {
-		computedSize(): string | undefined {
-			if (this.size === 'xlarge') {
-				return undefined;
-			}
-
-			return this.size;
-		},
-		classes(): string[] {
-			if (this.size === 'xlarge') {
-				return ['xlarge'];
-			}
-
-			return [];
-		},
-	},
-	methods: {
-		focus() {
-			const innerInput = this.$refs.innerInput as InputRef | undefined;
-
-			if (!innerInput) return;
-
-			const inputElement = innerInput.$el.querySelector(
-				this.type === 'textarea' ? 'textarea' : 'input',
-			);
-
-			if (!inputElement) return;
-
-			inputElement.focus();
-		},
-		blur() {
-			const innerInput = this.$refs.innerInput as InputRef | undefined;
-
-			if (!innerInput) return;
-
-			const inputElement = innerInput.$el.querySelector(
-				this.type === 'textarea' ? 'textarea' : 'input',
-			);
-
-			if (!inputElement) return;
-
-			inputElement.blur();
-		},
-		select() {
-			const innerInput = this.$refs.innerInput as InputRef | undefined;
+<script lang="ts" setup>
+import { computed, ref } from 'vue';
+import { ElInput } from 'element-plus';
+import { uid } from '../../utils';
+import type { InputSize, InputType } from '@/types/input';
+
+interface InputProps {
+	modelValue?: string | number;
+	type?: InputType;
+	size?: InputSize;
+	placeholder?: string;
+	disabled?: boolean;
+	readonly?: boolean;
+	clearable?: boolean;
+	rows?: number;
+	maxlength?: number;
+	title?: string;
+	name?: string;
+	autocomplete?: 'off' | 'autocomplete';
+}
 
-			if (!innerInput) return;
+defineOptions({ name: 'N8nInput' });
+const props = withDefaults(defineProps<InputProps>(), {
+	modelValue: '',
+	size: 'large',
+	placeholder: '',
+	disabled: false,
+	readonly: false,
+	clearable: false,
+	rows: 2,
+	maxlength: Infinity,
+	title: '',
+	name: () => uid('input'),
+	autocomplete: 'off',
+});
 
-			const inputElement = innerInput.$el.querySelector(
-				this.type === 'textarea' ? 'textarea' : 'input',
-			);
+const computedSize = computed(() => (props.size === 'xlarge' ? undefined : props.size));
 
-			if (!inputElement) return;
+const classes = computed(() => {
+	const applied: string[] = [];
+	if (props.size === 'xlarge') {
+		applied.push('xlarge');
+	}
+	if (props.type === 'password') {
+		applied.push('ph-no-capture');
+	}
+	return applied;
+});
 
-			inputElement.select();
-		},
-	},
+const innerInput = ref<InstanceType<typeof ElInput>>();
+const inputElement = computed(() => {
+	if (!innerInput?.value) return;
+	const inputType = props.type === 'textarea' ? 'textarea' : 'input';
+	return (innerInput.value.$el as HTMLElement).querySelector(inputType);
 });
+
+const focus = () => inputElement.value?.focus();
+const blur = () => inputElement.value?.blur();
+const select = () => inputElement.value?.select();
+defineExpose({ focus, blur, select });
 </script>
 
 <style lang="scss" module>
diff --git a/packages/design-system/src/components/N8nInput/__tests__/Input.spec.ts b/packages/design-system/src/components/N8nInput/__tests__/Input.spec.ts
index 0bd6e2d35e74c..d4fb295d71efe 100644
--- a/packages/design-system/src/components/N8nInput/__tests__/Input.spec.ts
+++ b/packages/design-system/src/components/N8nInput/__tests__/Input.spec.ts
@@ -3,7 +3,29 @@ import N8nInput from '../Input.vue';
 
 describe('N8nInput', () => {
 	it('should render correctly', () => {
-		const wrapper = render(N8nInput);
+		const wrapper = render(N8nInput, {
+			props: {
+				name: 'input',
+			},
+		});
 		expect(wrapper.html()).toMatchSnapshot();
 	});
+
+	it('should add .ph-no-capture class on password input', () => {
+		const { container } = render(N8nInput, {
+			props: {
+				type: 'password',
+			},
+		});
+		expect(container.firstChild).toHaveClass('ph-no-capture');
+	});
+
+	it('should not add .ph-no-capture class on other input types', () => {
+		const { container } = render(N8nInput, {
+			props: {
+				type: 'number',
+			},
+		});
+		expect(container.firstChild).not.toHaveClass('ph-no-capture');
+	});
 });
diff --git a/packages/design-system/src/components/N8nInput/__tests__/__snapshots__/Input.spec.ts.snap b/packages/design-system/src/components/N8nInput/__tests__/__snapshots__/Input.spec.ts.snap
index 47f0921e95098..c31cd8185e3e7 100644
--- a/packages/design-system/src/components/N8nInput/__tests__/__snapshots__/Input.spec.ts.snap
+++ b/packages/design-system/src/components/N8nInput/__tests__/__snapshots__/Input.spec.ts.snap
@@ -1,11 +1,15 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`N8nInput > should render correctly 1`] = `
-"<div class=\\"el-input el-input--large n8n-input\\">
-  <!----><input type=\\"text\\" autocomplete=\\"off\\" class=\\"el-input__inner\\">
-  <!---->
-  <!---->
-  <!---->
-  <!---->
+"<div class="el-input el-input--large n8n-input">
+  <!-- input -->
+  <!-- prepend slot -->
+  <!--v-if-->
+  <div class="el-input__wrapper">
+    <!-- prefix slot -->
+    <!--v-if--><input class="el-input__inner" name="input" rows="2" maxlength="Infinity" title="" type="text" autocomplete="off" tabindex="0" placeholder=""><!-- suffix slot -->
+    <!--v-if-->
+  </div><!-- append slot -->
+  <!--v-if-->
 </div>"
 `;
diff --git a/packages/design-system/src/components/N8nInputLabel/InputLabel.stories.ts b/packages/design-system/src/components/N8nInputLabel/InputLabel.stories.ts
index 8eb6539865391..0feb1283a131d 100644
--- a/packages/design-system/src/components/N8nInputLabel/InputLabel.stories.ts
+++ b/packages/design-system/src/components/N8nInputLabel/InputLabel.stories.ts
@@ -1,6 +1,6 @@
 import N8nInputLabel from './InputLabel.vue';
 import N8nInput from '../N8nInput';
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 
 export default {
 	title: 'Atoms/Input Label',
@@ -12,13 +12,17 @@ export default {
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nInputLabel,
 		N8nInput,
 	},
-	template:
-		'<div style="margin-top:50px"><n8n-input-label v-bind="$props"><n8n-input /></n8n-input-label></div>',
+	template: `<div style="margin-top:50px">
+			<n8n-input-label v-bind="args">
+				<n8n-input />
+			</n8n-input-label>
+		</div>`,
 });
 
 export const InputLabel = Template.bind({});
diff --git a/packages/design-system/src/components/N8nInputLabel/InputLabel.vue b/packages/design-system/src/components/N8nInputLabel/InputLabel.vue
index 31e901a36ea4c..2223ebd6cf605 100644
--- a/packages/design-system/src/components/N8nInputLabel/InputLabel.vue
+++ b/packages/design-system/src/components/N8nInputLabel/InputLabel.vue
@@ -1,5 +1,5 @@
 <template>
-	<div :class="$style.container" v-on="$listeners">
+	<div :class="$style.container" v-bind="$attrs" data-test-id="input-label">
 		<label
 			v-if="label || $slots.options"
 			:for="inputName"
@@ -12,28 +12,32 @@
 				[$style.overflow]: !!$slots.options,
 			}"
 		>
-			<div :class="$style.title" v-if="label">
-				<n8n-text :bold="bold" :size="size" :compact="compact" :color="color">
+			<div v-if="label" :class="$style.title">
+				<N8nText :bold="bold" :size="size" :compact="compact" :color="color">
 					{{ label }}
-					<n8n-text color="primary" :bold="bold" :size="size" v-if="required">*</n8n-text>
-				</n8n-text>
+					<N8nText v-if="required" color="primary" :bold="bold" :size="size">*</N8nText>
+				</N8nText>
 			</div>
 			<span
-				:class="[$style.infoIcon, showTooltip ? $style.visible : $style.hidden]"
 				v-if="tooltipText && label"
+				:class="[$style.infoIcon, showTooltip ? $style.visible : $style.hidden]"
 			>
-				<n8n-tooltip placement="top" :popper-class="$style.tooltipPopper">
-					<n8n-icon icon="question-circle" size="small" />
+				<N8nTooltip placement="top" :popper-class="$style.tooltipPopper">
+					<N8nIcon icon="question-circle" size="small" />
 					<template #content>
 						<div v-html="addTargetBlank(tooltipText)" />
 					</template>
-				</n8n-tooltip>
+				</N8nTooltip>
 			</span>
 			<div
 				v-if="$slots.options && label"
 				:class="{ [$style.overlay]: true, [$style.visible]: showOptions }"
 			/>
-			<div v-if="$slots.options" :class="{ [$style.options]: true, [$style.visible]: showOptions }">
+			<div
+				v-if="$slots.options"
+				:class="{ [$style.options]: true, [$style.visible]: showOptions }"
+				:data-test-id="`${inputName}-parameter-input-options-container`"
+			>
 				<slot name="options" />
 			</div>
 		</label>
@@ -41,65 +45,37 @@
 	</div>
 </template>
 
-<script lang="ts">
+<script lang="ts" setup>
 import N8nText from '../N8nText';
-import N8nTooltip from '../N8nTooltip';
 import N8nIcon from '../N8nIcon';
+import N8nTooltip from '../N8nTooltip';
+import type { TextColor } from '@/types/text';
+
+const SIZE = ['small', 'medium'] as const;
+
+interface InputLabelProps {
+	compact?: boolean;
+	color?: TextColor;
+	label?: string;
+	tooltipText?: string;
+	inputName?: string;
+	required?: boolean;
+	bold?: boolean;
+	size?: (typeof SIZE)[number];
+	underline?: boolean;
+	showTooltip?: boolean;
+	showOptions?: boolean;
+}
 
-import { addTargetBlank } from '../utils/helpers';
-
-import { defineComponent } from 'vue';
-
-export default defineComponent({
-	name: 'n8n-input-label',
-	components: {
-		N8nText,
-		N8nIcon,
-		N8nTooltip,
-	},
-	props: {
-		compact: {
-			type: Boolean,
-			default: false,
-		},
-		color: {
-			type: String,
-		},
-		label: {
-			type: String,
-		},
-		tooltipText: {
-			type: String,
-		},
-		inputName: {
-			type: String,
-		},
-		required: {
-			type: Boolean,
-		},
-		bold: {
-			type: Boolean,
-			default: true,
-		},
-		size: {
-			type: String,
-			default: 'medium',
-			validator: (value: string): boolean => ['small', 'medium'].includes(value),
-		},
-		underline: {
-			type: Boolean,
-		},
-		showTooltip: {
-			type: Boolean,
-		},
-		showOptions: {
-			type: Boolean,
-		},
-	},
-	methods: {
-		addTargetBlank,
-	},
+defineOptions({ name: 'N8nInputLabel' });
+withDefaults(defineProps<InputLabelProps>(), {
+	compact: false,
+	bold: true,
+	size: 'medium',
 });
+
+const addTargetBlank = (html: string) =>
+	html && html.includes('href=') ? html.replace(/href=/g, 'target="_blank" href=') : html;
 </script>
 
 <style lang="scss" module>
@@ -142,13 +118,11 @@ export default defineComponent({
 	align-items: center;
 	color: var(--color-text-light);
 	padding-left: var(--spacing-4xs);
-	background-color: var(--color-background-xlight);
 	z-index: 1;
 }
 
 .options {
 	opacity: 0;
-	background-color: var(--color-background-xlight);
 	transition: opacity 250ms cubic-bezier(0.98, -0.06, 0.49, -0.2); // transition on hover out
 
 	> * {
@@ -186,21 +160,20 @@ export default defineComponent({
 	opacity: 1;
 }
 
-.heading {
-	display: flex;
-}
-
 .overflow {
 	overflow-x: hidden;
 	overflow-y: clip;
 }
 
-.small {
-	margin-bottom: var(--spacing-5xs);
-}
+.heading {
+	display: flex;
 
-.medium {
-	margin-bottom: var(--spacing-2xs);
+	&.small {
+		margin-bottom: var(--spacing-5xs);
+	}
+	&.medium {
+		margin-bottom: var(--spacing-2xs);
+	}
 }
 
 .underline {
diff --git a/packages/design-system/src/components/N8nInputNumber/InputNumber.stories.ts b/packages/design-system/src/components/N8nInputNumber/InputNumber.stories.ts
index 78ce48e77d9f5..d1496da540fb5 100644
--- a/packages/design-system/src/components/N8nInputNumber/InputNumber.stories.ts
+++ b/packages/design-system/src/components/N8nInputNumber/InputNumber.stories.ts
@@ -1,6 +1,6 @@
 import N8nInputNumber from './InputNumber.vue';
 import { action } from '@storybook/addon-actions';
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 
 export default {
 	title: 'Atoms/Input Number',
@@ -49,15 +49,17 @@ export default {
 };
 
 const methods = {
-	onInput: action('input'),
+	onUpdateModelValue: action('update:modelValue'),
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nInputNumber,
 	},
-	template: '<n8n-input-number v-bind="$props" v-model="val" @input="onInput" />',
+	template:
+		'<n8n-input-number v-bind="args" v-model="val" @update:modelValue="onUpdateModelValue" />',
 	data() {
 		return {
 			val: null,
@@ -73,12 +75,13 @@ Input.args = {
 };
 
 const ManyTemplate: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nInputNumber,
 	},
 	template:
-		'<div> <n8n-input-number style="margin-bottom:10px" v-bind="$props" v-model="val" @input="onInput" /> <n8n-input-number style="margin-bottom:10px" v-bind="$props" size="medium" v-model="val" @input="onInput" /> <n8n-input-number style="margin-bottom:10px" v-bind="$props" size="small" v-model="val" @input="onInput" /> <n8n-input-number style="margin-bottom:10px" v-bind="$props" v-model="val" size="mini" @input="onInput" /> </div>',
+		'<div> <n8n-input-number style="margin-bottom:10px" v-bind="args" v-model="val" @update:modelValue="onUpdateModelValue" /> <n8n-input-number style="margin-bottom:10px" v-bind="args" size="medium" v-model="val" @update:modelValue="onUpdateModelValue" /> <n8n-input-number style="margin-bottom:10px" v-bind="args" size="small" v-model="val" @update:modelValue="onUpdateModelValue" /> <n8n-input-number style="margin-bottom:10px" v-bind="args" v-model="val" size="mini" @update:modelValue="onUpdateModelValue" /> </div>',
 	methods,
 	data() {
 		return {
diff --git a/packages/design-system/src/components/N8nInputNumber/InputNumber.vue b/packages/design-system/src/components/N8nInputNumber/InputNumber.vue
index edc6211c174b3..fa659ab598792 100644
--- a/packages/design-system/src/components/N8nInputNumber/InputNumber.vue
+++ b/packages/design-system/src/components/N8nInputNumber/InputNumber.vue
@@ -1,4 +1,18 @@
 <script lang="ts">
-import { InputNumber } from 'element-ui';
-export default InputNumber;
+import { ElInputNumber } from 'element-plus';
+import { defineComponent } from 'vue';
+
+export default defineComponent({
+	name: 'N8nInputNumber',
+	components: {
+		ElInputNumber,
+	},
+	props: {
+		...ElInputNumber.props,
+	},
+});
 </script>
+
+<template>
+	<ElInputNumber v-bind="{ ...$props, ...$attrs }" />
+</template>
diff --git a/packages/design-system/src/components/N8nKeyboardShortcut/KeyboardShortcut.stories.ts b/packages/design-system/src/components/N8nKeyboardShortcut/KeyboardShortcut.stories.ts
new file mode 100644
index 0000000000000..d45f1a0a09ac9
--- /dev/null
+++ b/packages/design-system/src/components/N8nKeyboardShortcut/KeyboardShortcut.stories.ts
@@ -0,0 +1,24 @@
+import N8nKeyboardShorcut from './N8nKeyboardShortcut.vue';
+import type { StoryFn } from '@storybook/vue3';
+
+export default {
+	title: 'Atoms/KeyboardShortcut',
+	component: N8nKeyboardShorcut,
+};
+
+const template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
+	props: Object.keys(argTypes),
+	components: {
+		N8nKeyboardShorcut,
+	},
+	template: '<n8n-keyboard-shortcut v-bind="args" />',
+});
+
+export const defaultShortcut = template.bind({});
+defaultShortcut.args = {
+	keys: ['s'],
+	altKey: true,
+	metaKey: true,
+	shiftKey: true,
+};
diff --git a/packages/design-system/src/components/N8nKeyboardShortcut/N8nKeyboardShortcut.vue b/packages/design-system/src/components/N8nKeyboardShortcut/N8nKeyboardShortcut.vue
new file mode 100644
index 0000000000000..5ca8d64b8ad2d
--- /dev/null
+++ b/packages/design-system/src/components/N8nKeyboardShortcut/N8nKeyboardShortcut.vue
@@ -0,0 +1,62 @@
+<script setup lang="ts">
+import { computed } from 'vue';
+import { useDeviceSupport } from '../../composables/useDeviceSupport';
+import type { KeyboardShortcut } from '../../types/keyboardshortcut';
+
+const props = defineProps<KeyboardShortcut>();
+const { isMacOs } = useDeviceSupport();
+
+const keys = computed(() => {
+	const allKeys = props.keys.map((key) => key.charAt(0).toUpperCase() + key.slice(1));
+
+	if (props.metaKey && isMacOs) {
+		allKeys.unshift('⌘');
+	}
+
+	if (props.shiftKey) {
+		allKeys.unshift('⇧');
+	}
+
+	if (props.altKey) {
+		allKeys.unshift(isMacOs ? '⌥' : 'Alt');
+	}
+
+	if (props.metaKey && !isMacOs) {
+		allKeys.unshift('Ctrl');
+	}
+
+	return allKeys;
+});
+</script>
+
+<template>
+	<div :class="$style.shortcut">
+		<div v-for="key of keys" :key="key" :class="$style.keyWrapper">
+			<div :class="$style.key">{{ key }}</div>
+		</div>
+	</div>
+</template>
+
+<style lang="scss" module>
+.shortcut {
+	display: flex;
+	align-items: center;
+	gap: var(--spacing-4xs);
+}
+.keyWrapper {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	border-radius: var(--border-radius-small);
+	height: 18px;
+	min-width: 18px;
+	padding: 0 var(--spacing-4xs);
+	border: solid 1px var(--color-foreground-base);
+	background: var(--color-background-base);
+}
+
+.key {
+	color: var(--color-text-base);
+	font-size: var(--font-size-3xs);
+}
+</style>
diff --git a/packages/design-system/src/components/N8nKeyboardShortcut/index.ts b/packages/design-system/src/components/N8nKeyboardShortcut/index.ts
new file mode 100644
index 0000000000000..f8f4107231553
--- /dev/null
+++ b/packages/design-system/src/components/N8nKeyboardShortcut/index.ts
@@ -0,0 +1 @@
+export { default as N8nKeyboardShortcut } from './N8nKeyboardShortcut.vue';
diff --git a/packages/design-system/src/components/N8nLink/Link.stories.ts b/packages/design-system/src/components/N8nLink/Link.stories.ts
index 6daeb93d64ac4..b11a7f4afdcf3 100644
--- a/packages/design-system/src/components/N8nLink/Link.stories.ts
+++ b/packages/design-system/src/components/N8nLink/Link.stories.ts
@@ -1,6 +1,6 @@
 import N8nLink from './Link.vue';
 import { action } from '@storybook/addon-actions';
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 
 export default {
 	title: 'Atoms/Link',
@@ -9,8 +9,8 @@ export default {
 		size: {
 			control: {
 				type: 'select',
-				options: ['small', 'medium', 'large'],
 			},
+			options: ['small', 'medium', 'large'],
 		},
 	},
 };
@@ -20,11 +20,12 @@ const methods = {
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nLink,
 	},
-	template: '<n8n-link v-bind="$props" @click="onClick">hello world</n8n-link>',
+	template: '<n8n-link v-bind="args" @click="onClick">hello world</n8n-link>',
 	methods,
 });
 
diff --git a/packages/design-system/src/components/N8nLink/Link.vue b/packages/design-system/src/components/N8nLink/Link.vue
index a76fab71d91d8..3c06d2cf36720 100644
--- a/packages/design-system/src/components/N8nLink/Link.vue
+++ b/packages/design-system/src/components/N8nLink/Link.vue
@@ -1,61 +1,47 @@
 <template>
-	<n8n-route :to="to" :newWindow="newWindow" v-on="$listeners" class="n8n-link">
+	<N8nRoute :to="to" :new-window="newWindow" v-bind="$attrs" class="n8n-link">
 		<span :class="$style[`${underline ? `${theme}-underline` : theme}`]">
-			<n8n-text :size="size" :bold="bold">
+			<N8nText :size="size" :bold="bold">
 				<slot></slot>
-			</n8n-text>
+			</N8nText>
 		</span>
-	</n8n-route>
+	</N8nRoute>
 </template>
 
-<script lang="ts">
-import { defineComponent } from 'vue';
+<script lang="ts" setup>
+import type { RouteLocationRaw } from 'vue-router';
 import N8nText from '../N8nText';
 import N8nRoute from '../N8nRoute';
+import type { TextSize } from '@/types/text';
 
-export default defineComponent({
-	name: 'n8n-link',
-	props: {
-		size: {
-			type: String,
-		},
-		to: {
-			type: String || Object,
-		},
-		newWindow: {
-			type: Boolean || undefined,
-			default: undefined,
-		},
-		bold: {
-			type: Boolean,
-			default: false,
-		},
-		underline: {
-			type: Boolean,
-			default: false,
-		},
-		theme: {
-			type: String,
-			default: 'primary',
-			validator: (value: string): boolean =>
-				['primary', 'danger', 'text', 'secondary'].includes(value),
-		},
-	},
-	components: {
-		N8nText,
-		N8nRoute,
-	},
+const THEME = ['primary', 'danger', 'text', 'secondary'] as const;
+
+interface LinkProps {
+	to?: RouteLocationRaw;
+	size?: TextSize;
+	newWindow?: boolean;
+	bold?: boolean;
+	underline?: boolean;
+	theme?: (typeof THEME)[number];
+}
+
+defineOptions({ name: 'N8nLink' });
+withDefaults(defineProps<LinkProps>(), {
+	bold: false,
+	underline: false,
+	theme: 'primary',
 });
 </script>
 
 <style lang="scss" module>
 @import '../../utils';
+@import '../../css/common/var';
 
 .primary {
-	color: var(--color-primary);
+	color: $link-color;
 
 	&:active {
-		color: saturation(--color-primary-h, --color-primary-s, --color-primary-l, -(30%));
+		color: $link-color-active;
 	}
 }
 
@@ -63,11 +49,11 @@ export default defineComponent({
 	color: var(--color-text-base);
 
 	&:hover {
-		color: var(--color-primary);
+		color: $link-color;
 	}
 
 	&:active {
-		color: saturation(--color-primary-h, --color-primary-s, --color-primary-l, -(30%));
+		color: $link-color-active;
 	}
 }
 
@@ -75,22 +61,18 @@ export default defineComponent({
 	color: var(--color-danger);
 
 	&:active {
-		color: saturation(--color-danger-h, --color-danger-s, --color-danger-l, -(20%));
+		color: var(--color-danger-shade-1);
 	}
 }
 
 .secondary {
-	color: var(--color-secondary);
+	color: var(--color-secondary-link);
 
 	&:active {
-		color: saturation(--color-secondary-h, --color-secondary-s, --color-secondary-l, -(20%));
+		color: var(--color-secondary-link-hover);
 	}
 }
 
-.secondary {
-	color: var(--color-secondary);
-}
-
 .primary-underline {
 	composes: primary;
 	text-decoration: underline;
diff --git a/packages/design-system/src/components/N8nLoading/Loading.stories.ts b/packages/design-system/src/components/N8nLoading/Loading.stories.ts
index 86f0bd1461104..5d2ac6c435861 100644
--- a/packages/design-system/src/components/N8nLoading/Loading.stories.ts
+++ b/packages/design-system/src/components/N8nLoading/Loading.stories.ts
@@ -1,4 +1,4 @@
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 import N8nLoading from './Loading.vue';
 
 export default {
@@ -18,24 +18,25 @@ export default {
 		rows: {
 			control: {
 				type: 'select',
-				options: [1, 2, 3, 4, 5],
 			},
+			options: [1, 2, 3, 4, 5],
 		},
 		variant: {
 			control: {
 				type: 'select',
-				options: ['button', 'h1', 'image', 'p'],
 			},
+			options: ['button', 'h1', 'image', 'p'],
 		},
 	},
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nLoading,
 	},
-	template: '<n8n-loading v-bind="$props"></n8n-loading>',
+	template: '<n8n-loading v-bind="args"></n8n-loading>',
 });
 
 export const Loading = Template.bind({});
diff --git a/packages/design-system/src/components/N8nLoading/Loading.vue b/packages/design-system/src/components/N8nLoading/Loading.vue
index ecb760f3af09c..0f33b169cd0f5 100644
--- a/packages/design-system/src/components/N8nLoading/Loading.vue
+++ b/packages/design-system/src/components/N8nLoading/Loading.vue
@@ -1,5 +1,5 @@
 <template>
-	<el-skeleton
+	<ElSkeleton
 		:loading="loading"
 		:animated="animated"
 		:class="['n8n-loading', `n8n-loading-${variant}`]"
@@ -13,7 +13,7 @@
 						[$style.h1Last]: item === rows && rows > 1 && shrinkLast,
 					}"
 				>
-					<el-skeleton-item :variant="variant" />
+					<ElSkeletonItem :variant="variant" />
 				</div>
 			</div>
 			<div v-else-if="variant === 'p'">
@@ -24,64 +24,48 @@
 						[$style.pLast]: item === rows && rows > 1 && shrinkLast,
 					}"
 				>
-					<el-skeleton-item :variant="variant" />
+					<ElSkeletonItem :variant="variant" />
 				</div>
 			</div>
-			<div :class="$style.custom" v-else-if="variant === 'custom'">
-				<el-skeleton-item :variant="variant" />
+			<div v-else-if="variant === 'custom'" :class="$style.custom">
+				<ElSkeletonItem />
 			</div>
-			<el-skeleton-item v-else :variant="variant" />
+			<ElSkeletonItem v-else :variant="variant" />
 		</template>
-	</el-skeleton>
+	</ElSkeleton>
 </template>
 
-<script lang="ts">
-import { Skeleton as ElSkeleton, SkeletonItem as ElSkeletonItem } from 'element-ui';
+<script lang="ts" setup>
+import { ElSkeleton, ElSkeletonItem } from 'element-plus';
 
-import { defineComponent } from 'vue';
+const VARIANT = [
+	'custom',
+	'p',
+	'text',
+	'h1',
+	'h3',
+	'text',
+	'caption',
+	'button',
+	'image',
+	'circle',
+	'rect',
+] as const;
 
-export default defineComponent({
-	name: 'n8n-loading',
-	components: {
-		ElSkeleton,
-		ElSkeletonItem,
-	},
-	props: {
-		animated: {
-			type: Boolean,
-			default: true,
-		},
-		loading: {
-			type: Boolean,
-			default: true,
-		},
-		rows: {
-			type: Number,
-			default: 1,
-		},
-		shrinkLast: {
-			type: Boolean,
-			default: true,
-		},
-		variant: {
-			type: String,
-			default: 'p',
-			validator: (value: string): boolean =>
-				[
-					'custom',
-					'p',
-					'text',
-					'h1',
-					'h3',
-					'text',
-					'caption',
-					'button',
-					'image',
-					'circle',
-					'rect',
-				].includes(value),
-		},
-	},
+interface LoadingProps {
+	animated?: boolean;
+	loading?: boolean;
+	rows?: number;
+	shrinkLast?: boolean;
+	variant?: (typeof VARIANT)[number];
+}
+
+withDefaults(defineProps<LoadingProps>(), {
+	animated: true,
+	loading: true,
+	rows: 1,
+	shrinkLast: true,
+	variant: 'p',
 });
 </script>
 
@@ -99,7 +83,7 @@ export default defineComponent({
 </style>
 
 <style lang="scss">
-.n8n-loading-custom .el-skeleton {
+.n8n-loading-custom.el-skeleton {
 	&,
 	.el-skeleton__item {
 		width: 100%;
diff --git a/packages/design-system/src/components/N8nMarkdown/Markdown.stories.ts b/packages/design-system/src/components/N8nMarkdown/Markdown.stories.ts
index 70c039f1560b8..180bf23acd4f5 100644
--- a/packages/design-system/src/components/N8nMarkdown/Markdown.stories.ts
+++ b/packages/design-system/src/components/N8nMarkdown/Markdown.stories.ts
@@ -1,4 +1,4 @@
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 import N8nMarkdown from './Markdown.vue';
 
 export default {
@@ -18,24 +18,25 @@ export default {
 		loadingBlocks: {
 			control: {
 				type: 'select',
-				options: [1, 2, 3, 4, 5],
 			},
+			options: [1, 2, 3, 4, 5],
 		},
 		loadingRows: {
 			control: {
 				type: 'select',
-				options: [1, 2, 3, 4, 5],
 			},
+			options: [1, 2, 3, 4, 5],
 		},
 	},
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nMarkdown,
 	},
-	template: '<n8n-markdown v-bind="$props"></n8n-markdown>',
+	template: '<n8n-markdown v-bind="args"></n8n-markdown>',
 });
 
 export const Markdown = Template.bind({});
diff --git a/packages/design-system/src/components/N8nMarkdown/Markdown.vue b/packages/design-system/src/components/N8nMarkdown/Markdown.vue
index d35f1ee575784..41f64ff61ee3b 100644
--- a/packages/design-system/src/components/N8nMarkdown/Markdown.vue
+++ b/packages/design-system/src/components/N8nMarkdown/Markdown.vue
@@ -3,185 +3,154 @@
 		<div
 			v-if="!loading"
 			ref="editor"
-			class="ph-no-capture"
 			:class="$style[theme]"
-			v-html="htmlContent"
 			@click="onClick"
+			v-html="htmlContent"
 		/>
 		<div v-else :class="$style.markdown">
-			<div v-for="(block, index) in loadingBlocks" :key="index">
-				<n8n-loading :loading="loading" :rows="loadingRows" animated variant="p" />
+			<div v-for="(_, index) in loadingBlocks" :key="index">
+				<N8nLoading :loading="loading" :rows="loadingRows" animated variant="p" />
 				<div :class="$style.spacer" />
 			</div>
 		</div>
 	</div>
 </template>
 
-<script lang="ts">
-import N8nLoading from '../N8nLoading';
-import type { PluginSimple } from 'markdown-it';
+<script lang="ts" setup>
+import { computed } from 'vue';
+import type { Options as MarkdownOptions } from 'markdown-it';
 import Markdown from 'markdown-it';
-
 import markdownLink from 'markdown-it-link-attributes';
 import markdownEmoji from 'markdown-it-emoji';
-import markdownTasklists from 'markdown-it-task-lists';
-
-import type { PropType } from 'vue';
-import { defineComponent } from 'vue';
-
+import markdownTaskLists from 'markdown-it-task-lists';
 import xss, { friendlyAttrValue } from 'xss';
+
+import N8nLoading from '../N8nLoading';
 import { escapeMarkdown } from '../../utils/markdown';
 
-const DEFAULT_OPTIONS_MARKDOWN = {
-	html: true,
-	linkify: true,
-	typographer: true,
-	breaks: true,
-} as const;
-
-const DEFAULT_OPTIONS_LINK_ATTRIBUTES = {
-	attrs: {
-		target: '_blank',
-		rel: 'noopener',
-	},
-} as const;
-
-const DEFAULT_OPTIONS_TASKLISTS = {
-	label: true,
-	labelAfter: true,
-} as const;
-
-export interface IImage {
+interface IImage {
 	id: string;
 	url: string;
 }
 
-export interface Options {
-	markdown: typeof DEFAULT_OPTIONS_MARKDOWN;
-	linkAttributes: typeof DEFAULT_OPTIONS_LINK_ATTRIBUTES;
-	tasklists: typeof DEFAULT_OPTIONS_TASKLISTS;
+interface Options {
+	markdown: MarkdownOptions;
+	linkAttributes: markdownLink.Config;
+	tasklists: markdownTaskLists.Config;
 }
 
-export default defineComponent({
-	components: {
-		N8nLoading,
-	},
-	name: 'n8n-markdown',
-	props: {
-		content: {
-			type: String,
-			default: '',
-		},
-		withMultiBreaks: {
-			type: Boolean,
-			default: false,
-		},
-		images: {
-			type: Array as PropType<IImage[]>,
-			default: () => [],
-		},
-		loading: {
-			type: Boolean,
-			default: false,
-		},
-		loadingBlocks: {
-			type: Number,
-			default: 2,
-		},
-		loadingRows: {
-			type: Number,
-			default: 3,
+interface MarkdownProps {
+	content?: string;
+	withMultiBreaks?: boolean;
+	images?: IImage[];
+	loading?: boolean;
+	loadingBlocks?: number;
+	loadingRows?: number;
+	theme?: string;
+	options?: Options;
+}
+
+const props = withDefaults(defineProps<MarkdownProps>(), {
+	content: '',
+	withMultiBreaks: false,
+	images: () => [],
+	loading: false,
+	loadingBlocks: 2,
+	loadingRows: 3,
+	theme: 'markdown',
+	options: () => ({
+		markdown: {
+			html: true,
+			linkify: true,
+			typographer: true,
+			breaks: true,
 		},
-		theme: {
-			type: String,
-			default: 'markdown',
+		linkAttributes: {
+			attrs: {
+				target: '_blank',
+				rel: 'noopener',
+			},
 		},
-		options: {
-			type: Object as PropType<Options>,
-			default: (): Options => ({
-				markdown: DEFAULT_OPTIONS_MARKDOWN,
-				linkAttributes: DEFAULT_OPTIONS_LINK_ATTRIBUTES,
-				tasklists: DEFAULT_OPTIONS_TASKLISTS,
-			}),
+		tasklists: {
+			label: true,
+			labelAfter: true,
 		},
-	},
-	data(): { md: Markdown } {
-		return {
-			md: new Markdown(this.options.markdown)
-				.use(markdownLink, this.options.linkAttributes)
-				.use(markdownEmoji)
-				.use(markdownTasklists as PluginSimple, this.options.tasklists),
-		};
-	},
-	computed: {
-		htmlContent(): string {
-			if (!this.content) {
-				return '';
-			}
+	}),
+});
 
-			const imageUrls: { [key: string]: string } = {};
-			if (this.images) {
-				this.images.forEach((image: IImage) => {
-					if (!image) {
-						// Happens if an image got deleted but the workflow
-						// still has a reference to it
-						return;
-					}
-					imageUrls[image.id] = image.url;
-				});
-			}
+const { options } = props;
+const md = new Markdown(options.markdown)
+	.use(markdownLink, options.linkAttributes)
+	.use(markdownEmoji)
+	.use(markdownTaskLists, options.tasklists);
 
-			const fileIdRegex = new RegExp('fileId:([0-9]+)');
-			let contentToRender = this.content;
-			if (this.withMultiBreaks) {
-				contentToRender = contentToRender.replaceAll('\n\n', '\n&nbsp;\n');
-			}
-			const html = this.md.render(escapeMarkdown(contentToRender));
-			const safeHtml = xss(html, {
-				onTagAttr: (tag, name, value) => {
-					if (tag === 'img' && name === 'src') {
-						if (value.match(fileIdRegex)) {
-							const id = value.split('fileId:')[1];
-							return `src=${friendlyAttrValue(imageUrls[id])}` || '';
-						}
-						// Only allow http requests to supported image files from the `static` directory
-						const isImageFile = value.split('#')[0].match(/\.(jpeg|jpg|gif|png|webp)$/) !== null;
-						const isStaticImageFile = isImageFile && value.startsWith('/static/');
-						if (!value.startsWith('https://') && !isStaticImageFile) {
-							return '';
-						}
-					}
-					// Return nothing, means keep the default handling measure
-				},
-				onTag(tag, code) {
-					if (tag === 'img' && code.includes('alt="workflow-screenshot"')) {
-						return '';
-					}
-					// return nothing, keep tag
-				},
-			});
-
-			return safeHtml;
-		},
-	},
-	methods: {
-		onClick(event: MouseEvent) {
-			let clickedLink = null;
+const htmlContent = computed(() => {
+	if (!props.content) {
+		return '';
+	}
 
-			if (event.target instanceof HTMLAnchorElement) {
-				clickedLink = event.target;
+	const imageUrls: { [key: string]: string } = {};
+	if (props.images) {
+		props.images.forEach((image: IImage) => {
+			if (!image) {
+				// Happens if an image got deleted but the workflow
+				// still has a reference to it
+				return;
 			}
+			imageUrls[image.id] = image.url;
+		});
+	}
 
-			if (event.target instanceof HTMLElement && event.target.matches('a *')) {
-				const parentLink = event.target.closest('a');
-				if (parentLink) {
-					clickedLink = parentLink;
+	const fileIdRegex = new RegExp('fileId:([0-9]+)');
+	let contentToRender = props.content;
+	if (props.withMultiBreaks) {
+		contentToRender = contentToRender.replaceAll('\n\n', '\n&nbsp;\n');
+	}
+	const html = md.render(escapeMarkdown(contentToRender));
+	const safeHtml = xss(html, {
+		onTagAttr: (tag, name, value) => {
+			if (tag === 'img' && name === 'src') {
+				if (value.match(fileIdRegex)) {
+					const id = value.split('fileId:')[1];
+					const attributeValue = friendlyAttrValue(imageUrls[id]);
+					return attributeValue ? `src=${attributeValue}` : '';
+				}
+				// Only allow http requests to supported image files from the `static` directory
+				const isImageFile = value.split('#')[0].match(/\.(jpeg|jpg|gif|png|webp)$/) !== null;
+				const isStaticImageFile = isImageFile && value.startsWith('/static/');
+				if (!value.startsWith('https://') && !isStaticImageFile) {
+					return '';
 				}
 			}
-			this.$emit('markdown-click', clickedLink, event);
+			// Return nothing, means keep the default handling measure
+		},
+		onTag(tag, code) {
+			if (tag === 'img' && code.includes('alt="workflow-screenshot"')) {
+				return '';
+			}
+			// return nothing, keep tag
 		},
-	},
+	});
+
+	return safeHtml;
 });
+
+const $emit = defineEmits(['markdown-click']);
+const onClick = (event: MouseEvent) => {
+	let clickedLink: HTMLAnchorElement | null = null;
+
+	if (event.target instanceof HTMLAnchorElement) {
+		clickedLink = event.target;
+	}
+
+	if (event.target instanceof HTMLElement && event.target.matches('a *')) {
+		const parentLink = event.target.closest('a');
+		if (parentLink) {
+			clickedLink = parentLink;
+		}
+	}
+	$emit('markdown-click', clickedLink, event);
+};
 </script>
 
 <style lang="scss" module>
@@ -247,10 +216,7 @@ export default defineComponent({
 	}
 
 	img {
-		width: 100%;
-		max-height: 90vh;
-		object-fit: cover;
-		border: var(--border-width-base) var(--color-foreground-base) var(--border-style-base);
+		max-width: 100%;
 		border-radius: var(--border-radius-large);
 	}
 
@@ -262,7 +228,16 @@ export default defineComponent({
 }
 
 .sticky {
-	color: var(--color-text-dark);
+	color: var(--color-sticky-font);
+
+	h1,
+	h2,
+	h3,
+	h4,
+	h5,
+	h6 {
+		color: var(--color-sticky-font);
+	}
 
 	h1,
 	h2,
@@ -309,15 +284,15 @@ export default defineComponent({
 	}
 
 	code {
-		background-color: var(--color-background-base);
+		background-color: var(--color-sticky-code-background);
 		padding: 0 var(--spacing-4xs);
-		color: var(--color-secondary);
+		color: var(--color-sticky-code-font);
 	}
 
 	pre > code,
 	li > code,
 	p > code {
-		color: var(--color-secondary);
+		color: var(--color-sticky-code-font);
 	}
 
 	a {
@@ -328,6 +303,8 @@ export default defineComponent({
 
 	img {
 		object-fit: contain;
+		margin-top: var(--spacing-xs);
+		margin-bottom: var(--spacing-2xs);
 
 		&[src*='#full-width'] {
 			width: 100%;
diff --git a/packages/design-system/src/components/N8nMenu/Menu.stories.ts b/packages/design-system/src/components/N8nMenu/Menu.stories.ts
index e18a7840f50a3..bca1eff3bd88a 100644
--- a/packages/design-system/src/components/N8nMenu/Menu.stories.ts
+++ b/packages/design-system/src/components/N8nMenu/Menu.stories.ts
@@ -1,7 +1,7 @@
 import N8nMenu from './Menu.vue';
 import N8nIcon from '../N8nIcon';
 import N8nText from '../N8nText';
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 import { action } from '@storybook/addon-actions';
 
 export default {
@@ -15,19 +15,21 @@ const methods = {
 };
 
 const template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nMenu,
 	},
 	template: `
 		<div style="height: 90vh; width: 200px">
-			<n8n-menu v-bind="$props" @select="onSelect"></n8n-menu>
+			<n8n-menu v-bind="args" @select="onSelect"></n8n-menu>
 		</div>
 	`,
 	methods,
 });
 
 const templateWithHeaderAndFooter: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nMenu,
@@ -36,7 +38,7 @@ const templateWithHeaderAndFooter: StoryFn = (args, { argTypes }) => ({
 	},
 	template: `
 		<div style="height: 90vh; width: 200px">
-			<n8n-menu v-bind="$props" @select="onSelect">
+			<n8n-menu v-bind="args" @select="onSelect">
 				<template #header>
 					<a href="#" class="p-m hideme" style="display: block;">
 						<n8n-icon icon="long-arrow-alt-left"/>&nbsp;&nbsp;Back to home
@@ -55,6 +57,7 @@ const templateWithHeaderAndFooter: StoryFn = (args, { argTypes }) => ({
 });
 
 const templateWithAllSlots: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nMenu,
@@ -63,7 +66,7 @@ const templateWithAllSlots: StoryFn = (args, { argTypes }) => ({
 	},
 	template: `
 		<div style="height: 90vh; width: 200px">
-			<n8n-menu v-bind="$props" @select="onSelect">
+			<n8n-menu v-bind="args" @select="onSelect">
 				<template #header>
 					<a href="#" class="p-m hideme" style="display: block;">
 						<n8n-icon icon="long-arrow-alt-left"/>&nbsp;&nbsp;Back to home
@@ -111,10 +114,9 @@ const menuItems = [
 		id: 'website',
 		icon: 'globe',
 		label: 'Website',
-		type: 'link',
-		properties: {
+		link: {
 			href: 'https://www.n8n.io',
-			newWindow: true,
+			target: '_blank',
 		},
 		position: 'bottom',
 	},
@@ -137,10 +139,9 @@ const menuItems = [
 				id: 'quickstart',
 				icon: 'video',
 				label: 'Quickstart',
-				type: 'link',
-				properties: {
+				link: {
 					href: 'https://www.youtube.com/watch?v=RpjQTGKm-ok',
-					newWindow: true,
+					target: '_blank',
 				},
 			},
 		],
diff --git a/packages/design-system/src/components/N8nMenu/Menu.vue b/packages/design-system/src/components/N8nMenu/Menu.vue
index 66e9d61bb46bd..ebf0a9a0cf054 100644
--- a/packages/design-system/src/components/N8nMenu/Menu.vue
+++ b/packages/design-system/src/components/N8nMenu/Menu.vue
@@ -4,6 +4,7 @@
 			['menu-container']: true,
 			[$style.container]: true,
 			[$style.menuCollapsed]: collapsed,
+			[$style.transparentBackground]: transparentBackground,
 		}"
 	>
 		<div v-if="$slots.header" :class="$style.menuHeader">
@@ -14,32 +15,33 @@
 				<div v-if="$slots.menuPrefix" :class="$style.menuPrefix">
 					<slot name="menuPrefix"></slot>
 				</div>
-				<el-menu :defaultActive="defaultActive" :collapse="collapsed" v-on="$listeners">
-					<n8n-menu-item
+				<ElMenu :default-active="defaultActive" :collapse="collapsed">
+					<N8nMenuItem
 						v-for="item in upperMenuItems"
 						:key="item.id"
 						:item="item"
 						:compact="collapsed"
-						:tooltipDelay="tooltipDelay"
+						:tooltip-delay="tooltipDelay"
 						:mode="mode"
-						:activeTab="activeTab"
-						@click="onSelect"
+						:active-tab="activeTab"
+						:handle-select="onSelect"
 					/>
-				</el-menu>
+				</ElMenu>
 			</div>
 			<div :class="[$style.lowerContent, 'pb-2xs']">
-				<el-menu :defaultActive="defaultActive" :collapse="collapsed" v-on="$listeners">
-					<n8n-menu-item
+				<slot name="beforeLowerMenu"></slot>
+				<ElMenu :default-active="defaultActive" :collapse="collapsed">
+					<N8nMenuItem
 						v-for="item in lowerMenuItems"
 						:key="item.id"
 						:item="item"
 						:compact="collapsed"
-						:tooltipDelay="tooltipDelay"
+						:tooltip-delay="tooltipDelay"
 						:mode="mode"
-						:activeTab="activeTab"
-						@click="onSelect"
+						:active-tab="activeTab"
+						:handle-select="onSelect"
 					/>
-				</el-menu>
+				</ElMenu>
 				<div v-if="$slots.menuSuffix" :class="$style.menuSuffix">
 					<slot name="menuSuffix"></slot>
 				</div>
@@ -51,107 +53,76 @@
 	</div>
 </template>
 
-<script lang="ts">
-import { Menu as ElMenu } from 'element-ui';
+<script lang="ts" setup>
+import { computed, onMounted, ref } from 'vue';
+import { useRoute } from 'vue-router';
+import { ElMenu } from 'element-plus';
 import N8nMenuItem from '../N8nMenuItem';
-import type { PropType } from 'vue';
-import { defineComponent } from 'vue';
-import type { IMenuItem, RouteObject } from '../../types';
-
-export default defineComponent({
-	name: 'n8n-menu',
-	components: {
-		ElMenu,
-		N8nMenuItem,
-	},
-	data() {
-		return {
-			activeTab: this.value,
-		};
-	},
-	props: {
-		type: {
-			type: String,
-			default: 'primary',
-			validator: (value: string): boolean => ['primary', 'secondary'].includes(value),
-		},
-		defaultActive: {
-			type: String,
-		},
-		collapsed: {
-			type: Boolean,
-			default: false,
-		},
-		mode: {
-			type: String,
-			default: 'router',
-			validator: (value: string): boolean => ['router', 'tabs'].includes(value),
-		},
-		tooltipDelay: {
-			type: Number,
-			default: 300,
-		},
-		items: {
-			type: Array as PropType<IMenuItem[]>,
-			default: (): IMenuItem[] => [],
-		},
-		value: {
-			type: String,
-			default: '',
-		},
-	},
-	mounted() {
-		if (this.mode === 'router') {
-			const found = this.items.find((item) => {
-				return (
-					(Array.isArray(item.activateOnRouteNames) &&
-						item.activateOnRouteNames.includes(this.currentRoute.name || '')) ||
-					(Array.isArray(item.activateOnRoutePaths) &&
-						item.activateOnRoutePaths.includes(this.currentRoute.path))
-				);
-			});
-			this.activeTab = found ? found.id : '';
-		} else {
-			this.activeTab = this.items.length > 0 ? this.items[0].id : '';
-		}
-
-		this.$emit('input', this.activeTab);
-	},
-	computed: {
-		upperMenuItems(): IMenuItem[] {
-			return this.items.filter(
-				(item: IMenuItem) => item.position === 'top' && item.available !== false,
-			);
-		},
-		lowerMenuItems(): IMenuItem[] {
-			return this.items.filter(
-				(item: IMenuItem) => item.position === 'bottom' && item.available !== false,
-			);
-		},
-		currentRoute(): RouteObject {
-			return (
-				(this as typeof this & { $route: RouteObject }).$route || {
-					name: '',
-					path: '',
-				}
-			);
-		},
-	},
-	methods: {
-		onSelect(event: MouseEvent, option: string): void {
-			if (this.mode === 'tabs') {
-				this.activeTab = option;
-			}
-			this.$emit('select', option);
-			this.$emit('input', this.activeTab);
-		},
-	},
-	watch: {
-		value(value: string) {
-			this.activeTab = value;
-		},
-	},
+import type { IMenuItem } from '../../types';
+import { doesMenuItemMatchCurrentRoute } from '../N8nMenuItem/routerUtil';
+
+interface MenuProps {
+	type?: 'primary' | 'secondary';
+	defaultActive?: string;
+	collapsed?: boolean;
+	transparentBackground?: boolean;
+	mode?: 'router' | 'tabs';
+	tooltipDelay?: number;
+	items?: IMenuItem[];
+	modelValue?: string;
+}
+
+const props = withDefaults(defineProps<MenuProps>(), {
+	type: 'primary',
+	collapsed: false,
+	transparentBackground: false,
+	mode: 'router',
+	tooltipDelay: 300,
+	items: () => [],
+});
+const $route = useRoute();
+
+const $emit = defineEmits<{
+	(event: 'select', itemId: string);
+	(event: 'update:modelValue', itemId: string);
+}>();
+
+const activeTab = ref(props.modelValue);
+
+const upperMenuItems = computed(() =>
+	props.items.filter((item: IMenuItem) => item.position === 'top' && item.available !== false),
+);
+
+const lowerMenuItems = computed(() =>
+	props.items.filter((item: IMenuItem) => item.position === 'bottom' && item.available !== false),
+);
+
+const currentRoute = computed(() => {
+	return $route ?? { name: '', path: '' };
 });
+
+onMounted(() => {
+	if (props.mode === 'router') {
+		const found = props.items.find((item) =>
+			doesMenuItemMatchCurrentRoute(item, currentRoute.value),
+		);
+
+		activeTab.value = found ? found.id : '';
+	} else {
+		activeTab.value = props.items.length > 0 ? props.items[0].id : '';
+	}
+
+	$emit('update:modelValue', activeTab.value);
+});
+
+const onSelect = (item: IMenuItem): void => {
+	if (props.mode === 'tabs') {
+		activeTab.value = item.id;
+	}
+
+	$emit('select', item.id);
+	$emit('update:modelValue', item.id);
+};
 </script>
 
 <style lang="scss" module>
@@ -193,8 +164,7 @@ export default defineComponent({
 	}
 }
 
-.menuPrefix,
-.menuSuffix {
-	padding: var(--spacing-xs) var(--spacing-l);
+.transparentBackground {
+	background-color: transparent;
 }
 </style>
diff --git a/packages/design-system/src/components/N8nMenuItem/MenuItem.stories.ts b/packages/design-system/src/components/N8nMenuItem/MenuItem.stories.ts
index 5d035d0fcd88d..bb8df005a917f 100644
--- a/packages/design-system/src/components/N8nMenuItem/MenuItem.stories.ts
+++ b/packages/design-system/src/components/N8nMenuItem/MenuItem.stories.ts
@@ -1,6 +1,6 @@
 import N8nMenuItem from '.';
-import { Menu as ElMenu } from 'element-ui';
-import type { StoryFn } from '@storybook/vue';
+import { ElMenu } from 'element-plus';
+import type { StoryFn } from '@storybook/vue3';
 
 export default {
 	title: 'Atoms/MenuItem',
@@ -8,6 +8,7 @@ export default {
 };
 
 const template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		ElMenu,
@@ -16,7 +17,7 @@ const template: StoryFn = (args, { argTypes }) => ({
 	template: `
 		<div style="width: 200px">
 			<el-menu>
-				<n8n-menu-item v-bind="$props" />
+				<n8n-menu-item v-bind="args" />
 			</el-menu>
 		</div>
 	`,
@@ -31,6 +32,33 @@ defaultMenuItem.args = {
 	},
 };
 
+export const withSecondaryIcon = template.bind({});
+withSecondaryIcon.args = {
+	item: {
+		id: 'workflows',
+		icon: 'heart',
+		label: 'Workflows',
+		secondaryIcon: { name: 'lock', size: 'small' },
+	},
+};
+
+export const withSecondaryIconTooltip = template.bind({});
+withSecondaryIconTooltip.args = {
+	item: {
+		id: 'workflows',
+		icon: 'heart',
+		label: 'Workflows',
+		secondaryIcon: {
+			name: 'lock',
+			size: 'small',
+			tooltip: {
+				content: 'Locked secret',
+				bindTo: 'secondaryIcon',
+			},
+		},
+	},
+};
+
 export const compact = template.bind({});
 compact.args = {
 	item: {
@@ -47,10 +75,9 @@ link.args = {
 		id: 'website',
 		icon: 'globe',
 		label: 'Website',
-		type: 'link',
-		properties: {
+		link: {
 			href: 'https://www.n8n.io',
-			newWindow: true,
+			target: '_blank',
 		},
 	},
 };
@@ -68,10 +95,9 @@ withChildren.args = {
 				id: 'quickstart',
 				icon: 'video',
 				label: 'Quickstart',
-				type: 'link',
-				properties: {
+				link: {
 					href: 'https://www.youtube.com/watch?v=RpjQTGKm-ok',
-					newWindow: true,
+					target: '_blank',
 				},
 			},
 		],
diff --git a/packages/design-system/src/components/N8nMenuItem/MenuItem.vue b/packages/design-system/src/components/N8nMenuItem/MenuItem.vue
index 3dbb7b327e0af..31c2b9af8f059 100644
--- a/packages/design-system/src/components/N8nMenuItem/MenuItem.vue
+++ b/packages/design-system/src/components/N8nMenuItem/MenuItem.vue
@@ -1,7 +1,7 @@
 <template>
 	<div :class="['n8n-menu-item', $style.item]">
-		<el-submenu
-			v-if="item.children && item.children.length > 0"
+		<ElSubMenu
+			v-if="item.children?.length"
 			:id="item.id"
 			:class="{
 				[$style.submenu]: true,
@@ -9,11 +9,11 @@
 				[$style.active]: mode === 'router' && isItemActive(item),
 			}"
 			:index="item.id"
-			popper-append-to-body
-			:popper-class="`${$style.submenuPopper} ${popperClass}`"
+			teleported
+			:popper-class="submenuPopperClass"
 		>
 			<template #title>
-				<n8n-icon
+				<N8nIcon
 					v-if="item.icon"
 					:class="$style.icon"
 					:icon="item.icon"
@@ -21,179 +21,151 @@
 				/>
 				<span :class="$style.label">{{ item.label }}</span>
 			</template>
-			<el-menu-item
+			<n8n-menu-item
 				v-for="child in availableChildren"
 				:key="child.id"
-				:id="child.id"
-				:class="{
-					[$style.menuItem]: true,
-					[$style.disableActiveStyle]: !isItemActive(child),
-					[$style.active]: isItemActive(child),
-				}"
-				data-test-id="menu-item"
-				:index="child.id"
-				@click="onItemClick(child, $event)"
-			>
-				<n8n-icon v-if="child.icon" :class="$style.icon" :icon="child.icon" />
-				<span :class="$style.label">{{ child.label }}</span>
-			</el-menu-item>
-		</el-submenu>
-		<n8n-tooltip
+				:item="child"
+				:compact="false"
+				:tooltip-delay="tooltipDelay"
+				:popper-class="popperClass"
+				:mode="mode"
+				:active-tab="activeTab"
+				:handle-select="handleSelect"
+			/>
+		</ElSubMenu>
+		<N8nTooltip
 			v-else
 			placement="right"
 			:content="item.label"
 			:disabled="!compact"
-			:open-delay="tooltipDelay"
+			:show-after="tooltipDelay"
 		>
-			<el-menu-item
-				:id="item.id"
-				:class="{
-					[$style.menuItem]: true,
-					[$style.item]: true,
-					[$style.disableActiveStyle]: !isItemActive(item),
-					[$style.active]: isItemActive(item),
-					[$style.compact]: compact,
-				}"
-				data-test-id="menu-item"
-				:index="item.id"
-				@click="onItemClick(item, $event)"
-			>
-				<n8n-icon
-					v-if="item.icon"
-					:class="$style.icon"
-					:icon="item.icon"
-					:size="item.customIconSize || 'large'"
-				/>
-				<span :class="$style.label">{{ item.label }}</span>
-			</el-menu-item>
-		</n8n-tooltip>
+			<ConditionalRouterLink v-bind="item.route ?? item.link">
+				<ElMenuItem
+					:id="item.id"
+					:class="{
+						[$style.menuItem]: true,
+						[$style.item]: true,
+						[$style.disableActiveStyle]: !isItemActive(item),
+						[$style.active]: isItemActive(item),
+						[$style.compact]: compact,
+					}"
+					data-test-id="menu-item"
+					:index="item.id"
+					@click="handleSelect?.(item)"
+				>
+					<N8nIcon
+						v-if="item.icon"
+						:class="$style.icon"
+						:icon="item.icon"
+						:size="item.customIconSize || 'large'"
+					/>
+					<span :class="$style.label">{{ item.label }}</span>
+					<N8nTooltip
+						v-if="item.secondaryIcon"
+						:placement="item.secondaryIcon?.tooltip?.placement || 'right'"
+						:content="item.secondaryIcon?.tooltip?.content"
+						:disabled="compact || !item.secondaryIcon?.tooltip?.content"
+						:show-after="tooltipDelay"
+					>
+						<N8nIcon
+							:class="$style.secondaryIcon"
+							:icon="item.secondaryIcon.name"
+							:size="item.secondaryIcon.size || 'small'"
+						/>
+					</N8nTooltip>
+				</ElMenuItem>
+			</ConditionalRouterLink>
+		</N8nTooltip>
 	</div>
 </template>
 
-<script lang="ts">
-import { Submenu as ElSubmenu, MenuItem as ElMenuItem } from 'element-ui';
+<script lang="ts" setup>
+import { computed, useCssModule } from 'vue';
+import { useRoute } from 'vue-router';
+import { ElSubMenu, ElMenuItem } from 'element-plus';
 import N8nTooltip from '../N8nTooltip';
 import N8nIcon from '../N8nIcon';
-import type { PropType } from 'vue';
-import { defineComponent } from 'vue';
-import type { IMenuItem, RouteObject } from '../../types';
+import ConditionalRouterLink from '../ConditionalRouterLink';
+import type { IMenuItem } from '../../types';
+import { doesMenuItemMatchCurrentRoute } from './routerUtil';
 
-export default defineComponent({
-	name: 'n8n-menu-item',
-	components: {
-		ElSubmenu,
-		ElMenuItem,
-		N8nIcon,
-		N8nTooltip,
-	},
-	props: {
-		item: {
-			type: Object as PropType<IMenuItem>,
-			required: true,
-		},
-		compact: {
-			type: Boolean,
-			default: false,
-		},
-		tooltipDelay: {
-			type: Number,
-			default: 300,
-		},
-		popperClass: {
-			type: String,
-			default: '',
-		},
-		mode: {
-			type: String,
-			default: 'router',
-			validator: (value: string): boolean => ['router', 'tabs'].includes(value),
-		},
-		activeTab: {
-			type: String,
-		},
-	},
-	computed: {
-		availableChildren(): IMenuItem[] {
-			return Array.isArray(this.item.children)
-				? this.item.children.filter((child) => child.available !== false)
-				: [];
-		},
-		currentRoute(): RouteObject {
-			return (
-				(this as typeof this & { $route: RouteObject }).$route || {
-					name: '',
-					path: '',
-				}
-			);
-		},
-	},
-	methods: {
-		isItemActive(item: IMenuItem): boolean {
-			const isItemActive = this.isActive(item);
-			const hasActiveChild =
-				Array.isArray(item.children) && item.children.some((child) => this.isActive(child));
-			return isItemActive || hasActiveChild;
-		},
-		isActive(item: IMenuItem): boolean {
-			if (this.mode === 'router') {
-				if (item.activateOnRoutePaths) {
-					return (
-						Array.isArray(item.activateOnRoutePaths) &&
-						item.activateOnRoutePaths.includes(this.currentRoute.path)
-					);
-				} else if (item.activateOnRouteNames) {
-					return (
-						Array.isArray(item.activateOnRouteNames) &&
-						item.activateOnRouteNames.includes(this.currentRoute.name || '')
-					);
-				}
-				return false;
-			} else {
-				return item.id === this.activeTab;
-			}
-		},
-		onItemClick(item: IMenuItem, event: MouseEvent) {
-			if (item && item.type === 'link' && item.properties) {
-				const href: string = item.properties.href;
-				if (!href) {
-					return;
-				}
+interface MenuItemProps {
+	item: IMenuItem;
+	compact?: boolean;
+	tooltipDelay?: number;
+	popperClass?: string;
+	mode?: 'router' | 'tabs';
+	activeTab?: string;
+	handleSelect?: (item: IMenuItem) => void;
+}
 
-				if (item.properties.newWindow) {
-					window.open(href);
-				} else {
-					window.location.assign(item.properties.href);
-				}
-			}
-			this.$emit('click', event, item.id);
-		},
-	},
+const props = withDefaults(defineProps<MenuItemProps>(), {
+	compact: false,
+	tooltipDelay: 300,
+	popperClass: '',
+	mode: 'router',
 });
+
+const $style = useCssModule();
+const $route = useRoute();
+
+const availableChildren = computed((): IMenuItem[] =>
+	Array.isArray(props.item.children)
+		? props.item.children.filter((child) => child.available !== false)
+		: [],
+);
+
+const currentRoute = computed(() => {
+	return $route ?? { name: '', path: '' };
+});
+
+const submenuPopperClass = computed((): string => {
+	const popperClass = [$style.submenuPopper, props.popperClass];
+	if (props.compact) {
+		popperClass.push($style.compact);
+	}
+	return popperClass.join(' ');
+});
+
+const isActive = (item: IMenuItem): boolean => {
+	if (props.mode === 'router') {
+		return doesMenuItemMatchCurrentRoute(item, currentRoute.value);
+	} else {
+		return item.id === props.activeTab;
+	}
+};
+
+const isItemActive = (item: IMenuItem): boolean => {
+	const hasActiveChild =
+		Array.isArray(item.children) && item.children.some((child) => isActive(child));
+	return isActive(item) || hasActiveChild;
+};
 </script>
 
 <style module lang="scss">
 // Element menu-item overrides
 :global(.el-menu-item),
-:global(.el-submenu__title) {
+:global(.el-sub-menu__title) {
 	--menu-font-color: var(--color-text-base);
 	--menu-item-active-background-color: var(--color-foreground-base);
 	--menu-item-active-font-color: var(--color-text-dark);
 	--menu-item-hover-fill: var(--color-foreground-base);
 	--menu-item-hover-font-color: var(--color-text-dark);
 	--menu-item-height: 35px;
-	--submenu-item-height: 27px;
+	--sub-menu-item-height: 27px;
 }
 
 .submenu {
 	background: none !important;
 
-	&.compact :global(.el-submenu__title) {
+	&.compact :global(.el-sub-menu__title) {
 		i {
 			display: none;
 		}
 	}
 
-	:global(.el-submenu__title) {
+	:global(.el-sub-menu__title) {
 		display: flex;
 		align-items: center;
 		border-radius: var(--border-radius-base) !important;
@@ -215,7 +187,7 @@ export default defineComponent({
 	}
 
 	.menuItem {
-		height: var(--submenu-item-height) !important;
+		height: var(--sub-menu-item-height) !important;
 		min-width: auto !important;
 		margin: var(--spacing-2xs) 0 !important;
 		padding-left: var(--spacing-l) !important;
@@ -242,7 +214,7 @@ export default defineComponent({
 		svg {
 			color: var(--color-text-dark) !important;
 		}
-		&:global(.el-submenu) {
+		&:global(.el-sub-menu) {
 			background-color: unset !important;
 		}
 	}
@@ -250,7 +222,7 @@ export default defineComponent({
 
 .active {
 	&,
-	& :global(.el-submenu__title) {
+	& :global(.el-sub-menu__title) {
 		background-color: var(--color-foreground-base);
 		border-radius: var(--border-radius-base);
 		.icon {
@@ -264,6 +236,7 @@ export default defineComponent({
 	padding: var(--spacing-2xs) var(--spacing-xs) !important;
 	margin: 0 !important;
 	border-radius: var(--border-radius-base) !important;
+	overflow: hidden;
 }
 
 .icon {
@@ -272,6 +245,14 @@ export default defineComponent({
 	text-align: center;
 }
 
+.secondaryIcon {
+	display: flex;
+	align-items: center;
+	justify-content: flex-end;
+	flex: 1;
+	margin-left: 20px;
+}
+
 .label {
 	overflow: hidden;
 	text-overflow: ellipsis;
@@ -283,7 +264,6 @@ export default defineComponent({
 }
 
 .compact {
-	width: 40px;
 	.icon {
 		margin: 0;
 		overflow: visible !important;
@@ -294,6 +274,9 @@ export default defineComponent({
 	.label {
 		display: none;
 	}
+	.secondaryIcon {
+		display: none;
+	}
 }
 
 .submenuPopper {
@@ -312,8 +295,10 @@ export default defineComponent({
 		margin-right: var(--spacing-xs);
 	}
 
-	.label {
-		display: block;
+	&.compact {
+		.label {
+			display: inline-block;
+		}
 	}
 }
 </style>
diff --git a/packages/design-system/src/components/N8nMenuItem/routerUtil.ts b/packages/design-system/src/components/N8nMenuItem/routerUtil.ts
new file mode 100644
index 0000000000000..ec7482e089fae
--- /dev/null
+++ b/packages/design-system/src/components/N8nMenuItem/routerUtil.ts
@@ -0,0 +1,45 @@
+import type { IMenuItem } from '@/types';
+import type { RouteLocationNormalizedLoaded, RouteLocationRaw } from 'vue-router';
+
+/**
+ * Checks if the given menu item matches the current route.
+ */
+export function doesMenuItemMatchCurrentRoute(
+	item: IMenuItem,
+	currentRoute: RouteLocationNormalizedLoaded,
+) {
+	let activateOnRouteNames: string[] = [];
+	if (Array.isArray(item.activateOnRouteNames)) {
+		activateOnRouteNames = item.activateOnRouteNames;
+	} else if (item.route && isNamedRouteLocation(item.route.to)) {
+		activateOnRouteNames = [item.route.to.name];
+	}
+
+	let activateOnRoutePaths: string[] = [];
+	if (Array.isArray(item.activateOnRoutePaths)) {
+		activateOnRoutePaths = item.activateOnRoutePaths;
+	} else if (item.route && isPathRouteLocation(item.route.to)) {
+		activateOnRoutePaths = [item.route.to.path];
+	}
+
+	return (
+		activateOnRouteNames.includes((currentRoute.name as string) ?? '') ||
+		activateOnRoutePaths.includes(currentRoute.path)
+	);
+}
+
+function isPathRouteLocation(routeLocation?: RouteLocationRaw): routeLocation is { path: string } {
+	return (
+		typeof routeLocation === 'object' &&
+		'path' in routeLocation &&
+		typeof routeLocation.path === 'string'
+	);
+}
+
+function isNamedRouteLocation(routeLocation?: RouteLocationRaw): routeLocation is { name: string } {
+	return (
+		typeof routeLocation === 'object' &&
+		'name' in routeLocation &&
+		typeof routeLocation.name === 'string'
+	);
+}
diff --git a/packages/design-system/src/components/N8nNodeCreatorNode/NodeCreatorNode.stories.ts b/packages/design-system/src/components/N8nNodeCreatorNode/NodeCreatorNode.stories.ts
index bcd38ce4510ad..6e22518afadb9 100644
--- a/packages/design-system/src/components/N8nNodeCreatorNode/NodeCreatorNode.stories.ts
+++ b/packages/design-system/src/components/N8nNodeCreatorNode/NodeCreatorNode.stories.ts
@@ -1,5 +1,5 @@
 import N8nNodeCreatorNode from './NodeCreatorNode.vue';
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 
 export default {
 	title: 'Modules/Node Creator Node',
@@ -7,13 +7,14 @@ export default {
 };
 
 const DefaultTemplate: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nNodeCreatorNode,
 	},
 	template: `
-		<n8n-node-creator-node v-bind="$props">
-			<template v-slot:icon>
+		<n8n-node-creator-node v-bind="args">
+			<template #icon>
 				<img src="https://dev.w3.org/SVG/tools/svgweb/samples/svg-files/cartman.svg" />
 			</template>
 		</n8n-node-creator-node>
@@ -29,6 +30,7 @@ WithTitle.args = {
 };
 
 const PanelTemplate: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nNodeCreatorNode,
@@ -39,11 +41,11 @@ const PanelTemplate: StoryFn = (args, { argTypes }) => ({
 		};
 	},
 	template: `
-		<n8n-node-creator-node v-bind="$props" :isPanelActive="isPanelActive" @click.capture="isPanelActive = true">
-			<template v-slot:icon>
+		<n8n-node-creator-node v-bind="args" :isPanelActive="isPanelActive" @click.capture="isPanelActive = true">
+			<template #icon>
 				<img src="https://dev.w3.org/SVG/tools/svgweb/samples/svg-files/cartman.svg" />
 			</template>
-			<template v-slot:panel>
+			<template #panel>
 				<p style="width: 100%; height: 300px; background: white">Lorem ipsum dolor sit amet</p>
 				<button @click="isPanelActive = false">Close</button>
 			</template>
diff --git a/packages/design-system/src/components/N8nNodeCreatorNode/NodeCreatorNode.vue b/packages/design-system/src/components/N8nNodeCreatorNode/NodeCreatorNode.vue
index ebac11ac37641..a6cb79897be06 100644
--- a/packages/design-system/src/components/N8nNodeCreatorNode/NodeCreatorNode.vue
+++ b/packages/design-system/src/components/N8nNodeCreatorNode/NodeCreatorNode.vue
@@ -1,10 +1,34 @@
+<script setup lang="ts">
+import { useI18n } from '../../composables/useI18n';
+import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
+import N8nTooltip from '../N8nTooltip';
+import { ElTag } from 'element-plus';
+
+export interface Props {
+	active?: boolean;
+	isAi?: boolean;
+	isTrigger?: boolean;
+	description?: string;
+	tag?: string;
+	title: string;
+	showActionArrow?: boolean;
+}
+
+defineProps<Props>();
+
+defineEmits<{
+	(event: 'tooltipClick', $e: MouseEvent): void;
+}>();
+
+const { t } = useI18n();
+</script>
+
 <template>
 	<div
 		:class="{
 			[$style.creatorNode]: true,
 			[$style.hasAction]: !showActionArrow,
 		}"
-		v-on="$listeners"
 		v-bind="$attrs"
 	>
 		<div :class="$style.nodeIcon">
@@ -12,9 +36,18 @@
 		</div>
 		<div>
 			<div :class="$style.details">
-				<span :class="$style.name" v-text="title" data-test-id="node-creator-item-name" />
-				<font-awesome-icon icon="bolt" v-if="isTrigger" size="xs" :class="$style.triggerIcon" />
-				<n8n-tooltip
+				<span :class="$style.name" data-test-id="node-creator-item-name" v-text="title" />
+				<ElTag v-if="tag" :class="$style.tag" size="small" round type="success">
+					{{ tag }}
+				</ElTag>
+				<FontAwesomeIcon
+					v-if="isTrigger"
+					icon="bolt"
+					size="xs"
+					:title="t('nodeCreator.nodeItem.triggerIconTitle')"
+					:class="$style.triggerIcon"
+				/>
+				<N8nTooltip
 					v-if="!!$slots.tooltip"
 					placement="top"
 					data-test-id="node-creator-item-tooltip"
@@ -23,36 +56,22 @@
 						<slot name="tooltip" />
 					</template>
 					<n8n-icon :class="$style.tooltipIcon" icon="cube" />
-				</n8n-tooltip>
+				</N8nTooltip>
 			</div>
-			<p :class="$style.description" v-if="description" v-text="description" />
+			<p
+				v-if="description"
+				data-test-id="node-creator-item-description"
+				:class="$style.description"
+				v-text="description"
+			/>
 		</div>
 		<slot name="dragContent" />
-		<button :class="$style.panelIcon" v-if="showActionArrow">
-			<font-awesome-icon :class="$style.panelArrow" icon="arrow-right" />
+		<button v-if="showActionArrow" :class="$style.panelIcon">
+			<FontAwesomeIcon :class="$style.panelArrow" icon="arrow-right" />
 		</button>
 	</div>
 </template>
 
-<script setup lang="ts">
-import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
-import N8nTooltip from '../N8nTooltip';
-
-export interface Props {
-	active?: boolean;
-	isTrigger?: boolean;
-	description?: string;
-	title: string;
-	showActionArrow?: boolean;
-}
-
-defineProps<Props>();
-
-defineEmits<{
-	(event: 'tooltipClick', $e: MouseEvent): void;
-}>();
-</script>
-
 <style lang="scss" module>
 .creatorNode {
 	display: flex;
@@ -68,7 +87,9 @@ defineEmits<{
 .creatorNode:hover .panelIcon {
 	color: var(--action-arrow-color-hover, var(--color-text-light));
 }
-
+.tag {
+	margin-left: var(--spacing-2xs);
+}
 .panelIcon {
 	flex-grow: 1;
 	display: flex;
@@ -92,16 +113,11 @@ defineEmits<{
 }
 .nodeIcon {
 	display: flex;
-	margin-right: var(--spacing-s);
-
-	& > :global(*) {
-		min-width: 25px;
-		max-width: 25px;
-	}
+	margin-right: var(--node-icon-margin-right, var(--spacing-s));
 }
 .name {
-	font-weight: var(--font-weight-bold);
-	font-size: var(--font-size-s);
+	font-weight: var(--node-creator-name-weight, var(--font-weight-bold));
+	font-size: var(--node-creator-name-size, var(--font-size-s));
 	line-height: 1.115rem;
 }
 .description {
@@ -112,6 +128,11 @@ defineEmits<{
 	color: var(--node-creator-description-colos, var(--color-text-base));
 }
 
+.aiIcon {
+	margin-left: var(--spacing-3xs);
+	color: var(--color-secondary);
+}
+
 .triggerIcon {
 	margin-left: var(--spacing-3xs);
 	color: var(--color-primary);
diff --git a/packages/design-system/src/components/N8nNodeIcon/NodeIcon.stories.ts b/packages/design-system/src/components/N8nNodeIcon/NodeIcon.stories.ts
index 5c05fddf80311..2d5f085e95d4c 100644
--- a/packages/design-system/src/components/N8nNodeIcon/NodeIcon.stories.ts
+++ b/packages/design-system/src/components/N8nNodeIcon/NodeIcon.stories.ts
@@ -1,5 +1,5 @@
 import N8nNodeIcon from './NodeIcon.vue';
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 
 export default {
 	title: 'Atoms/NodeIcon',
@@ -7,11 +7,12 @@ export default {
 };
 
 const DefaultTemplate: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nNodeIcon,
 	},
-	template: '<n8n-node-icon v-bind="$props"></n8n-node-icon>',
+	template: '<n8n-node-icon v-bind="args"></n8n-node-icon>',
 });
 
 export const FileIcon = DefaultTemplate.bind({});
@@ -37,3 +38,11 @@ Hoverable.args = {
 	nodeTypeName: 'We ❤️ n8n',
 	showTooltip: true,
 };
+
+export const Unknown = DefaultTemplate.bind({});
+Unknown.args = {
+	type: 'unknown',
+	nodeTypeName: '',
+	size: 40,
+	color: 'red',
+};
diff --git a/packages/design-system/src/components/N8nNodeIcon/NodeIcon.vue b/packages/design-system/src/components/N8nNodeIcon/NodeIcon.vue
index dd17c437a562b..42cc805609525 100644
--- a/packages/design-system/src/components/N8nNodeIcon/NodeIcon.vue
+++ b/packages/design-system/src/components/N8nNodeIcon/NodeIcon.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="n8n-node-icon">
+	<div class="n8n-node-icon" v-bind="$attrs">
 		<div
 			:class="{
 				[$style.nodeIconWrapper]: true,
@@ -7,102 +7,103 @@
 				[$style.disabled]: disabled,
 			}"
 			:style="iconStyleData"
-			v-on="$listeners"
 		>
 			<!-- ElementUI tooltip is prone to memory-leaking so we only render it if we really need it -->
-			<n8n-tooltip placement="top" :disabled="!showTooltip" v-if="showTooltip">
+			<N8nTooltip v-if="showTooltip" :placement="tooltipPosition" :disabled="!showTooltip">
 				<template #content>{{ nodeTypeName }}</template>
 				<div v-if="type !== 'unknown'" :class="$style.icon">
 					<img v-if="type === 'file'" :src="src" :class="$style.nodeIconImage" />
-					<font-awesome-icon v-else :icon="name" :style="fontStyleData" />
+					<FontAwesomeIcon v-else :icon="name" :class="$style.iconFa" :style="fontStyleData" />
 				</div>
 				<div v-else :class="$style.nodeIconPlaceholder">
 					{{ nodeTypeName ? nodeTypeName.charAt(0) : '?' }}
-					?
 				</div>
-			</n8n-tooltip>
+			</N8nTooltip>
 			<template v-else>
 				<div v-if="type !== 'unknown'" :class="$style.icon">
 					<img v-if="type === 'file'" :src="src" :class="$style.nodeIconImage" />
-					<font-awesome-icon v-else :icon="name" :style="fontStyleData" />
+					<FontAwesomeIcon v-else :icon="name" :style="fontStyleData" />
+					<div v-if="badge" :class="$style.badge" :style="badgeStyleData">
+						<n8n-node-icon :type="badge.type" :src="badge.src" :size="badgeSize"></n8n-node-icon>
+					</div>
 				</div>
 				<div v-else :class="$style.nodeIconPlaceholder">
 					{{ nodeTypeName ? nodeTypeName.charAt(0) : '?' }}
-					?
 				</div>
 			</template>
 		</div>
 	</div>
 </template>
 
-<script lang="ts">
-import { defineComponent } from 'vue';
-import N8nTooltip from '../N8nTooltip';
+<script lang="ts" setup>
+import { computed } from 'vue';
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
+import type { Placement } from 'element-plus';
+import N8nTooltip from '../N8nTooltip';
+
+interface NodeIconProps {
+	type: 'file' | 'icon' | 'unknown';
+	src?: string;
+	name?: string;
+	nodeTypeName?: string;
+	size?: number;
+	disabled?: boolean;
+	circle?: boolean;
+	color?: string;
+	showTooltip?: boolean;
+	tooltipPosition?: Placement;
+	badge?: { src: string; type: string };
+}
+
+const props = withDefaults(defineProps<NodeIconProps>(), {
+	tooltipPosition: 'top',
+});
+
+const iconStyleData = computed((): Record<string, string> => {
+	if (!props.size) {
+		return {
+			color: props.color || '',
+		};
+	}
 
-export default defineComponent({
-	name: 'n8n-node-icon',
-	components: {
-		N8nTooltip,
-		FontAwesomeIcon,
-	},
-	props: {
-		type: {
-			type: String,
-			required: true,
-			validator: (value: string): boolean => ['file', 'icon', 'unknown'].includes(value),
-		},
-		src: {
-			type: String,
-		},
-		name: {
-			type: String,
-		},
-		nodeTypeName: {
-			type: String,
-		},
-		size: {
-			type: Number,
-		},
-		disabled: {
-			type: Boolean,
-		},
-		circle: {
-			type: Boolean,
-		},
-		color: {
-			type: String,
-		},
-		showTooltip: {
-			type: Boolean,
-		},
-	},
-	computed: {
-		iconStyleData(): Record<string, string> {
-			if (!this.size) {
-				return {
-					color: this.color || '',
-				};
-			}
-
-			return {
-				color: this.color || '',
-				width: `${this.size}px`,
-				height: `${this.size}px`,
-				'font-size': `${this.size}px`,
-				'line-height': `${this.size}px`,
-			};
-		},
-		fontStyleData(): Record<string, string> {
-			if (!this.size) {
-				return {};
-			}
-
-			return {
-				'max-width': `${this.size}px`,
-			};
-		},
-	},
+	return {
+		color: props.color || '',
+		width: `${props.size}px`,
+		height: `${props.size}px`,
+		'font-size': `${props.size}px`,
+		'line-height': `${props.size}px`,
+	};
+});
+
+const badgeSize = computed((): number => {
+	switch (props.size) {
+		case 40:
+			return 18;
+		case 24:
+			return 10;
+		case 18:
+		default:
+			return 8;
+	}
+});
+
+const fontStyleData = computed((): Record<string, string> => {
+	if (!props.size) {
+		return {};
+	}
+
+	return {
+		'max-width': `${props.size}px`,
+	};
+});
+
+const badgeStyleData = computed((): Record<string, string> => {
+	const size = badgeSize.value;
+	return {
+		padding: `${Math.floor(size / 4)}px`,
+		right: `-${Math.floor(size / 2)}px`,
+		bottom: `-${Math.floor(size / 2)}px`,
+	};
 });
 </script>
 
@@ -114,7 +115,6 @@ export default defineComponent({
 	color: var(--node-icon-color, #444);
 	line-height: var(--node-icon-size, 26px);
 	font-size: 1.1em;
-	overflow: hidden;
 	text-align: center;
 	font-weight: bold;
 	font-size: 20px;
@@ -126,7 +126,17 @@ export default defineComponent({
 	display: flex;
 	justify-content: center;
 	align-items: center;
-	pointer-events: none;
+	position: relative;
+
+	svg {
+		max-width: 100%;
+		max-height: 100%;
+	}
+
+	img,
+	svg {
+		pointer-events: none;
+	}
 }
 .nodeIconPlaceholder {
 	text-align: center;
@@ -137,6 +147,12 @@ export default defineComponent({
 	max-height: 100%;
 }
 
+.badge {
+	position: absolute;
+	background: var(--color-background-node-icon-badge, var(--color-background-base));
+	border-radius: 50%;
+}
+
 .circle {
 	border-radius: 50%;
 }
diff --git a/packages/design-system/src/components/N8nNotice/Notice.stories.ts b/packages/design-system/src/components/N8nNotice/Notice.stories.ts
index af840d2f83408..aa4db557a9f60 100644
--- a/packages/design-system/src/components/N8nNotice/Notice.stories.ts
+++ b/packages/design-system/src/components/N8nNotice/Notice.stories.ts
@@ -1,5 +1,5 @@
 import N8nNotice from './Notice.vue';
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 
 export default {
 	title: 'Atoms/Notice',
@@ -13,20 +13,22 @@ export default {
 };
 
 const SlotTemplate: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nNotice,
 	},
 	template:
-		'<n8n-notice v-bind="$props">This is a notice! Thread carefully from this point forward.</n8n-notice>',
+		'<n8n-notice v-bind="args">This is a notice! Thread carefully from this point forward.</n8n-notice>',
 });
 
 const PropTemplate: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nNotice,
 	},
-	template: '<n8n-notice v-bind="$props"/>',
+	template: '<n8n-notice v-bind="args"/>',
 });
 
 export const Warning = SlotTemplate.bind({});
@@ -56,18 +58,17 @@ Sanitized.args = {
 		'<script>alert(1)</script> This content contains a script tag and is <strong>sanitized</strong>.',
 };
 
-export const Truncated = PropTemplate.bind({});
-Truncated.args = {
+export const FullContent = PropTemplate.bind({});
+FullContent.args = {
 	theme: 'warning',
-	truncate: true,
-	content:
-		'This content is long and will be truncated at 150 characters. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+	content: 'This is just the summary. <a data-key="toggle-expand">Show more</a>',
+	fullContent:
+		'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod ut labore et dolore magna aliqua. <a data-key="show-less">Show less</a>',
 };
 
 export const HtmlEdgeCase = PropTemplate.bind({});
 HtmlEdgeCase.args = {
 	theme: 'warning',
-	truncate: true,
 	content:
 		'This content is long and will be truncated at 150 characters. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod <a href="">read the documentation</a> ut labore et dolore magna aliqua.',
 };
diff --git a/packages/design-system/src/components/N8nNotice/Notice.vue b/packages/design-system/src/components/N8nNotice/Notice.vue
index 25b574d329c07..7573777722810 100644
--- a/packages/design-system/src/components/N8nNotice/Notice.vue
+++ b/packages/design-system/src/components/N8nNotice/Notice.vue
@@ -1,101 +1,91 @@
 <template>
 	<div :id="id" :class="classes" role="alert" @click="onClick">
 		<div class="notice-content">
-			<n8n-text size="small" :compact="true">
+			<N8nText size="small" :compact="true">
 				<slot>
 					<span
-						:class="showFullContent ? $style['expanded'] : $style['truncated']"
 						:id="`${id}-content`"
+						:class="showFullContent ? $style['expanded'] : $style['truncated']"
 						role="region"
-						v-html="sanitizeHtml(showFullContent ? fullContent : content)"
+						v-html="displayContent"
 					/>
 				</slot>
-			</n8n-text>
+			</N8nText>
 		</div>
 	</div>
 </template>
 
-<script lang="ts">
-import { defineComponent } from 'vue';
-import sanitizeHtml from 'sanitize-html';
+<script lang="ts" setup>
+import { computed, ref, useCssModule } from 'vue';
+import sanitize from 'sanitize-html';
 import N8nText from '../../components/N8nText';
-import Locale from '../../mixins/locale';
 import { uid } from '../../utils';
 
-export default defineComponent({
-	name: 'n8n-notice',
-	directives: {},
-	mixins: [Locale],
-	props: {
-		id: {
-			type: String,
-			default: () => uid('notice'),
-		},
-		theme: {
-			type: String,
-			default: 'warning',
-		},
-		content: {
-			type: String,
-			default: '',
-		},
-		fullContent: {
-			type: String,
-			default: '',
-		},
-	},
-	components: {
-		N8nText,
-	},
-	data() {
-		return {
-			showFullContent: false,
-		};
-	},
-	computed: {
-		classes(): string[] {
-			return ['notice', this.$style.notice, this.$style[this.theme]];
-		},
-		canTruncate(): boolean {
-			return this.fullContent !== undefined;
-		},
-	},
-	methods: {
-		toggleExpanded() {
-			this.showFullContent = !this.showFullContent;
-		},
-		sanitizeHtml(text: string): string {
-			return sanitizeHtml(text, {
-				allowedAttributes: { a: ['data-key', 'href', 'target'] },
-			});
-		},
-		onClick(event: MouseEvent) {
-			if (!(event.target instanceof HTMLElement)) return;
-
-			if (event.target.localName !== 'a') return;
-
-			if (event.target.dataset && event.target.dataset.key) {
-				event.stopPropagation();
-				event.preventDefault();
-
-				if (event.target.dataset.key === 'show-less') {
-					this.showFullContent = false;
-				} else if (this.canTruncate && event.target.dataset.key === 'toggle-expand') {
-					this.showFullContent = !this.showFullContent;
-				} else {
-					this.$emit('action', event.target.dataset.key);
-				}
-			}
-		},
-	},
+interface NoticeProps {
+	id?: string;
+	theme?: 'success' | 'warning' | 'danger' | 'info';
+	content?: string;
+	fullContent?: string;
+}
+
+const props = withDefaults(defineProps<NoticeProps>(), {
+	id: () => uid('notice'),
+	theme: 'warning',
+	content: '',
+	fullContent: '',
 });
+
+const $emit = defineEmits<{
+	(event: 'action', key: string): void;
+}>();
+
+const $style = useCssModule();
+
+const classes = computed(() => ['notice', $style.notice, $style[props.theme]]);
+const canTruncate = computed(() => props.fullContent !== undefined);
+
+const showFullContent = ref(false);
+const displayContent = computed(() =>
+	sanitize(showFullContent.value ? props.fullContent : props.content, {
+		allowedAttributes: {
+			a: [
+				'data-key',
+				'href',
+				'target',
+				'data-action',
+				'data-action-parameter-connectiontype',
+				'data-action-parameter-creatorview',
+			],
+		},
+	}),
+);
+
+const onClick = (event: MouseEvent) => {
+	if (!(event.target instanceof HTMLElement)) return;
+
+	if (event.target.localName !== 'a') return;
+
+	const anchorKey = event.target.dataset?.key;
+	if (anchorKey) {
+		event.stopPropagation();
+		event.preventDefault();
+
+		if (anchorKey === 'show-less') {
+			showFullContent.value = false;
+		} else if (canTruncate.value && anchorKey === 'toggle-expand') {
+			showFullContent.value = !showFullContent.value;
+		} else {
+			$emit('action', anchorKey);
+		}
+	}
+};
 </script>
 
 <style lang="scss" module>
 .notice {
 	font-size: var(--font-size-2xs);
 	display: flex;
-	color: var(--custom-font-black);
+	color: var(--color-notice-font);
 	margin: var(--notice-margin, var(--spacing-s) 0);
 	padding: var(--spacing-2xs);
 	background-color: var(--background-color);
@@ -111,8 +101,8 @@ export default defineComponent({
 }
 
 .warning {
-	--border-color: var(--color-warning-tint-1);
-	--background-color: var(--color-warning-tint-2);
+	--border-color: var(--color-notice-warning-border);
+	--background-color: var(--color-notice-warning-background);
 }
 
 .danger {
diff --git a/packages/design-system/src/components/N8nNotice/__tests__/Notice.spec.ts b/packages/design-system/src/components/N8nNotice/__tests__/Notice.spec.ts
index c6e6f4123bbb9..caf53c5ca5e44 100644
--- a/packages/design-system/src/components/N8nNotice/__tests__/Notice.spec.ts
+++ b/packages/design-system/src/components/N8nNotice/__tests__/Notice.spec.ts
@@ -1,5 +1,6 @@
 import { render } from '@testing-library/vue';
 import N8nNotice from '../Notice.vue';
+import { N8nText } from '@/components';
 
 describe('components', () => {
 	describe('N8nNotice', () => {
@@ -11,7 +12,9 @@ describe('components', () => {
 				slots: {
 					default: 'This is a notice.',
 				},
-				stubs: ['n8n-text'],
+				global: {
+					stubs: ['n8n-text'],
+				},
 			});
 			expect(wrapper.html()).toMatchSnapshot();
 		});
@@ -24,7 +27,9 @@ describe('components', () => {
 							id: 'notice',
 							content: 'This is a notice.',
 						},
-						stubs: ['n8n-text'],
+						global: {
+							stubs: ['n8n-text'],
+						},
 					});
 					expect(wrapper.html()).toMatchSnapshot();
 				});
@@ -35,7 +40,11 @@ describe('components', () => {
 							id: 'notice',
 							content: '<strong>Hello world!</strong> This is a notice.',
 						},
-						stubs: ['n8n-text'],
+						global: {
+							components: {
+								'n8n-text': N8nText,
+							},
+						},
 					});
 
 					expect(wrapper.container.querySelectorAll('strong')).toHaveLength(1);
@@ -48,7 +57,9 @@ describe('components', () => {
 							id: 'notice',
 							content: '<script>alert(1);</script> This is a notice.',
 						},
-						stubs: ['n8n-text'],
+						global: {
+							stubs: ['n8n-text'],
+						},
 					});
 
 					expect(wrapper.container.querySelector('script')).not.toBeTruthy();
diff --git a/packages/design-system/src/components/N8nNotice/__tests__/__snapshots__/Notice.spec.ts.snap b/packages/design-system/src/components/N8nNotice/__tests__/__snapshots__/Notice.spec.ts.snap
index 8763d86f89a1f..4a15f3a4800d5 100644
--- a/packages/design-system/src/components/N8nNotice/__tests__/__snapshots__/Notice.spec.ts.snap
+++ b/packages/design-system/src/components/N8nNotice/__tests__/__snapshots__/Notice.spec.ts.snap
@@ -1,33 +1,31 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`components > N8nNotice > props > content > should render HTML 1`] = `
-"<div id=\\"notice\\" role=\\"alert\\" class=\\"notice notice warning\\">
-  <div class=\\"notice-content\\">
-    <n8n-text-stub size=\\"small\\" compact=\\"true\\" tag=\\"span\\"><span id=\\"notice-content\\" role=\\"region\\" class=\\"truncated\\"><strong>Hello world!</strong> This is a notice.</span></n8n-text-stub>
-  </div>
+"<div id="notice" class="notice notice warning" role="alert">
+  <div class="notice-content"><span class="n8n-text compact size-small regular"><span id="notice-content" class="truncated" role="region"><strong>Hello world!</strong> This is a notice.</span></span></div>
 </div>"
 `;
 
 exports[`components > N8nNotice > props > content > should render correctly with content prop 1`] = `
-"<div id=\\"notice\\" role=\\"alert\\" class=\\"notice notice warning\\">
-  <div class=\\"notice-content\\">
-    <n8n-text-stub size=\\"small\\" compact=\\"true\\" tag=\\"span\\"><span id=\\"notice-content\\" role=\\"region\\" class=\\"truncated\\">This is a notice.</span></n8n-text-stub>
+"<div id="notice" class="notice notice warning" role="alert">
+  <div class="notice-content">
+    <n8n-text-stub bold="false" size="small" compact="true" tag="span"></n8n-text-stub>
   </div>
 </div>"
 `;
 
 exports[`components > N8nNotice > props > content > should sanitize rendered HTML 1`] = `
-"<div id=\\"notice\\" role=\\"alert\\" class=\\"notice notice warning\\">
-  <div class=\\"notice-content\\">
-    <n8n-text-stub size=\\"small\\" compact=\\"true\\" tag=\\"span\\"><span id=\\"notice-content\\" role=\\"region\\" class=\\"truncated\\"> This is a notice.</span></n8n-text-stub>
+"<div id="notice" class="notice notice warning" role="alert">
+  <div class="notice-content">
+    <n8n-text-stub bold="false" size="small" compact="true" tag="span"></n8n-text-stub>
   </div>
 </div>"
 `;
 
 exports[`components > N8nNotice > should render correctly 1`] = `
-"<div id=\\"notice\\" role=\\"alert\\" class=\\"notice notice warning\\">
-  <div class=\\"notice-content\\">
-    <n8n-text-stub size=\\"small\\" compact=\\"true\\" tag=\\"span\\">This is a notice.</n8n-text-stub>
+"<div id="notice" class="notice notice warning" role="alert">
+  <div class="notice-content">
+    <n8n-text-stub bold="false" size="small" compact="true" tag="span"></n8n-text-stub>
   </div>
 </div>"
 `;
diff --git a/packages/design-system/src/components/N8nOption/Option.vue b/packages/design-system/src/components/N8nOption/Option.vue
index f17ed7602e6e4..6dd193b341580 100644
--- a/packages/design-system/src/components/N8nOption/Option.vue
+++ b/packages/design-system/src/components/N8nOption/Option.vue
@@ -1,4 +1,17 @@
 <script lang="ts">
-import { Option } from 'element-ui';
-export default Option;
+import { ElOption } from 'element-plus';
+import { defineComponent } from 'vue';
+
+export default defineComponent({
+	components: {
+		ElOption,
+	},
+	props: {
+		...ElOption.props,
+	},
+});
 </script>
+
+<template>
+	<ElOption v-bind="{ ...$props, ...$attrs }"><slot /></ElOption>
+</template>
diff --git a/packages/design-system/src/components/N8nPagination/Pagination.stories.ts b/packages/design-system/src/components/N8nPagination/Pagination.stories.ts
index 3fa4d573b7d7f..20381c31e3b2c 100644
--- a/packages/design-system/src/components/N8nPagination/Pagination.stories.ts
+++ b/packages/design-system/src/components/N8nPagination/Pagination.stories.ts
@@ -1,4 +1,4 @@
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 import N8nPagination from './Pagination.vue';
 
 export default {
@@ -7,11 +7,27 @@ export default {
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => {
+		const onUpdateCurrentPage = (currentPage: number) => {
+			args.currentPage = currentPage;
+		};
+
+		const onUpdatePageSize = (pageSize: number) => {
+			args.pageSize = pageSize;
+		};
+
+		return { onUpdateCurrentPage, onUpdatePageSize, args };
+	},
 	props: Object.keys(argTypes),
 	components: {
 		N8nPagination,
 	},
-	template: '<n8n-pagination v-bind="$props" />',
+	template: `
+		<n8n-pagination
+			v-bind="args"
+			v-model:current-page="args.currentPage"
+			v-model:page-size="args.pageSize"
+		/>`,
 });
 
 export const Pagination: StoryFn = Template.bind({});
diff --git a/packages/design-system/src/components/N8nPagination/Pagination.vue b/packages/design-system/src/components/N8nPagination/Pagination.vue
index 5b0f106370005..9f5dd69437682 100644
--- a/packages/design-system/src/components/N8nPagination/Pagination.vue
+++ b/packages/design-system/src/components/N8nPagination/Pagination.vue
@@ -1,21 +1,22 @@
 <script lang="ts">
-import type { DefineComponent } from 'vue';
 import { defineComponent } from 'vue';
-import { Pagination as ElPagination } from 'element-ui';
+import { ElPagination } from 'element-plus';
 
 export default defineComponent({
-	props: (ElPagination as unknown as DefineComponent).props,
+	name: 'N8nPagination',
 	components: {
 		ElPagination,
 	},
+	props: {
+		...ElPagination.props,
+	},
 });
 </script>
 
 <template>
-	<el-pagination
-		background
+	<ElPagination
+		class="is-background"
 		layout="prev, pager, next"
-		v-bind="[$props, $attrs]"
-		v-on="$listeners"
+		v-bind="{ ...$props, ...$attrs }"
 	/>
 </template>
diff --git a/packages/design-system/src/components/N8nPopover/Popover.stories.ts b/packages/design-system/src/components/N8nPopover/Popover.stories.ts
index 36bd7179c78f1..afe37f8b7f3f1 100644
--- a/packages/design-system/src/components/N8nPopover/Popover.stories.ts
+++ b/packages/design-system/src/components/N8nPopover/Popover.stories.ts
@@ -1,4 +1,4 @@
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 import N8nPopover from './Popover.vue';
 
 export default {
@@ -36,12 +36,19 @@ export default {
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nPopover,
 	},
-	template:
-		'<n8n-Popover v-bind="$props"><div style="margin:50px; display: inline-block;"><span>yo</span></div></n8n-Popover>',
+	template: `<n8n-popover v-bind="args">
+			<div style="margin:50px; display: inline-block;">
+				<span>yo</span>
+			</div>
+			<template #content>
+				Popover
+			</template>
+		</n8n-popover>`,
 });
 
 export const Popover = Template.bind({});
diff --git a/packages/design-system/src/components/N8nPopover/Popover.vue b/packages/design-system/src/components/N8nPopover/Popover.vue
index b85cad06e7e5f..533d42fbf4da8 100644
--- a/packages/design-system/src/components/N8nPopover/Popover.vue
+++ b/packages/design-system/src/components/N8nPopover/Popover.vue
@@ -1,4 +1,25 @@
 <script lang="ts">
-import { Popover } from 'element-ui';
-export default Popover;
+import { ElPopover } from 'element-plus';
+import { defineComponent } from 'vue';
+
+export default defineComponent({
+	name: 'N8nPopover',
+	components: {
+		ElPopover,
+	},
+	props: {
+		...ElPopover.props,
+	},
+});
 </script>
+
+<template>
+	<span>
+		<ElPopover v-bind="{ ...$props, ...$attrs }">
+			<template #reference>
+				<slot name="reference" />
+			</template>
+			<slot />
+		</ElPopover>
+	</span>
+</template>
diff --git a/packages/design-system/src/components/N8nPulse/Pulse.stories.ts b/packages/design-system/src/components/N8nPulse/Pulse.stories.ts
index a91328ba69aab..4d29b64379f94 100644
--- a/packages/design-system/src/components/N8nPulse/Pulse.stories.ts
+++ b/packages/design-system/src/components/N8nPulse/Pulse.stories.ts
@@ -1,5 +1,5 @@
 import N8nPulse from './Pulse.vue';
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 
 export default {
 	title: 'Atoms/Pulse',
diff --git a/packages/design-system/src/components/N8nPulse/Pulse.vue b/packages/design-system/src/components/N8nPulse/Pulse.vue
index 3e3f2daf2e304..125bfb1535c0a 100644
--- a/packages/design-system/src/components/N8nPulse/Pulse.vue
+++ b/packages/design-system/src/components/N8nPulse/Pulse.vue
@@ -8,12 +8,8 @@
 	</div>
 </template>
 
-<script>
-import { defineComponent } from 'vue';
-
-export default defineComponent({
-	name: 'n8n-pulse',
-});
+<script lang="ts" setup>
+defineOptions({ name: 'N8nPulse' });
 </script>
 
 <style lang="scss" module>
diff --git a/packages/design-system/src/components/N8nRadioButtons/RadioButton.vue b/packages/design-system/src/components/N8nRadioButtons/RadioButton.vue
index 221be4b48f3db..37137793b552d 100644
--- a/packages/design-system/src/components/N8nRadioButtons/RadioButton.vue
+++ b/packages/design-system/src/components/N8nRadioButtons/RadioButton.vue
@@ -7,9 +7,8 @@
 			[$style.container]: true,
 			[$style.hoverable]: !disabled,
 		}"
-		aria-checked="true"
+		:aria-checked="active"
 	>
-		<input type="radio" tabindex="-1" autocomplete="off" :class="$style.input" :value="value" />
 		<div
 			:class="{
 				[$style.button]: true,
@@ -18,40 +17,25 @@
 				[$style.disabled]: disabled,
 			}"
 			:data-test-id="`radio-button-${value}`"
-			@click="$emit('click')"
 		>
 			{{ label }}
 		</div>
 	</label>
 </template>
 
-<script lang="ts">
-import { defineComponent } from 'vue';
+<script lang="ts" setup>
+interface RadioButtonProps {
+	label: string;
+	value: string;
+	active?: boolean;
+	disabled?: boolean;
+	size?: 'small' | 'medium';
+}
 
-export default defineComponent({
-	name: 'n8n-radio-button',
-	props: {
-		label: {
-			type: String,
-			required: true,
-		},
-		value: {
-			type: String,
-			required: true,
-		},
-		active: {
-			type: Boolean,
-			default: false,
-		},
-		size: {
-			type: String,
-			default: 'medium',
-			validator: (value: string): boolean => ['small', 'medium'].includes(value),
-		},
-		disabled: {
-			type: Boolean,
-		},
-	},
+withDefaults(defineProps<RadioButtonProps>(), {
+	active: false,
+	disabled: false,
+	size: 'medium',
 });
 </script>
 
@@ -76,7 +60,6 @@ export default defineComponent({
 }
 
 .button {
-	border-radius: 0;
 	display: flex;
 	align-items: center;
 	border-radius: var(--border-radius-base);
diff --git a/packages/design-system/src/components/N8nRadioButtons/RadioButtons.stories.ts b/packages/design-system/src/components/N8nRadioButtons/RadioButtons.stories.ts
index c711b0ce85a2b..5551d34f2d930 100644
--- a/packages/design-system/src/components/N8nRadioButtons/RadioButtons.stories.ts
+++ b/packages/design-system/src/components/N8nRadioButtons/RadioButtons.stories.ts
@@ -1,7 +1,7 @@
 import N8nRadioButtons from './RadioButtons.vue';
 
 import { action } from '@storybook/addon-actions';
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 
 export default {
 	title: 'Atoms/RadioButtons',
@@ -18,15 +18,16 @@ export default {
 };
 
 const methods = {
-	onInput: action('input'),
+	onInput: action('update:modelValue'),
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nRadioButtons,
 	},
-	template: `<n8n-radio-buttons v-model="val" v-bind="$props" @input="onInput">
+	template: `<n8n-radio-buttons v-model="val" v-bind="args" @update:modelValue="onInput">
 		</n8n-radio-buttons>`,
 	methods,
 	data() {
@@ -53,3 +54,19 @@ Example.args = {
 		},
 	],
 };
+
+export const Disabled = Template.bind({});
+Disabled.args = {
+	modelValue: 'enabled',
+	options: [
+		{
+			label: 'Enabled',
+			value: 'enabled',
+		},
+		{
+			label: 'Disabled',
+			value: 'disabled',
+			disabled: true,
+		},
+	],
+};
diff --git a/packages/design-system/src/components/N8nRadioButtons/RadioButtons.vue b/packages/design-system/src/components/N8nRadioButtons/RadioButtons.vue
index 1972d4fd600ea..6b8cca2e0c015 100644
--- a/packages/design-system/src/components/N8nRadioButtons/RadioButtons.vue
+++ b/packages/design-system/src/components/N8nRadioButtons/RadioButtons.vue
@@ -7,55 +7,50 @@
 			v-for="option in options"
 			:key="option.value"
 			v-bind="option"
-			:active="value === option.value"
+			:active="modelValue === option.value"
 			:size="size"
 			:disabled="disabled || option.disabled"
-			@click="() => onClick(option)"
+			@click.prevent.stop="onClick(option, $event)"
 		/>
 	</div>
 </template>
 
-<script lang="ts">
+<script lang="ts" setup>
 import RadioButton from './RadioButton.vue';
 
-import type { PropType } from 'vue';
-import { defineComponent } from 'vue';
-
-export interface RadioOption {
+interface RadioOption {
 	label: string;
 	value: string;
 	disabled?: boolean;
 }
 
-export default defineComponent({
-	name: 'n8n-radio-buttons',
-	props: {
-		value: {
-			type: String,
-		},
-		options: {
-			type: Array as PropType<RadioOption[]>,
-			default: (): RadioOption[] => [],
-		},
-		size: {
-			type: String,
-		},
-		disabled: {
-			type: Boolean,
-		},
-	},
-	components: {
-		RadioButton,
-	},
-	methods: {
-		onClick(option: { label: string; value: string; disabled?: boolean }) {
-			if (this.disabled || option.disabled) {
-				return;
-			}
-			this.$emit('input', option.value);
-		},
-	},
+interface RadioButtonsProps {
+	modelValue?: string;
+	options?: RadioOption[];
+	/** @default medium */
+	size?: 'small' | 'medium';
+	disabled?: boolean;
+}
+
+const props = withDefaults(defineProps<RadioButtonsProps>(), {
+	active: false,
+	disabled: false,
+	size: 'medium',
 });
+
+const $emit = defineEmits<{
+	(event: 'update:modelValue', value: string, e: MouseEvent): void;
+}>();
+
+const onClick = (
+	option: { label: string; value: string; disabled?: boolean },
+	event: MouseEvent,
+) => {
+	if (props.disabled || option.disabled) {
+		return;
+	}
+	$emit('update:modelValue', option.value, event);
+};
 </script>
 
 <style lang="scss" module>
diff --git a/packages/design-system/src/components/N8nRecycleScroller/RecycleScroller.stories.ts b/packages/design-system/src/components/N8nRecycleScroller/RecycleScroller.stories.ts
index 7e75a5d51a60f..fb2a496c3ca1c 100644
--- a/packages/design-system/src/components/N8nRecycleScroller/RecycleScroller.stories.ts
+++ b/packages/design-system/src/components/N8nRecycleScroller/RecycleScroller.stories.ts
@@ -1,7 +1,6 @@
-/* eslint-disable @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-assignment */
-import type { StoryFn } from '@storybook/vue';
-import N8nRecycleScroller from './RecycleScroller.vue';
 import type { ComponentInstance } from 'vue';
+import type { StoryFn } from '@storybook/vue3';
+import N8nRecycleScroller from './RecycleScroller.vue';
 
 export default {
 	title: 'Atoms/RecycleScroller',
@@ -9,7 +8,8 @@ export default {
 	argTypes: {},
 };
 
-const Template: StoryFn = () => ({
+const Template: StoryFn = (args) => ({
+	setup: () => ({ args }),
 	components: {
 		N8nRecycleScroller,
 	},
@@ -23,7 +23,9 @@ const Template: StoryFn = () => ({
 	},
 	methods: {
 		resizeItem(item: { id: string; height: string }, fn: (item: { id: string }) => void) {
-			const itemRef = (this as ComponentInstance).$refs[`item-${item.id}`] as HTMLElement;
+			const itemRef = (this as ComponentInstance<typeof N8nRecycleScroller>).$refs[
+				`item-${item.id}`
+			] as HTMLElement;
 
 			item.height = '200px';
 			itemRef.style.height = '200px';
@@ -42,7 +44,7 @@ const Template: StoryFn = () => ({
 		},
 	},
 	template: `<div style="height: calc(100vh - 30px); width: 100%; overflow: auto">
-		<N8nRecycleScroller :items="items" :item-size="100" item-key="id" v-bind="$props">
+		<N8nRecycleScroller :items="items" :item-size="100" item-key="id" v-bind="args">
 			<template	#default="{ item, updateItemSize }">
 				<div
 					:ref="'item-' + item.id"
diff --git a/packages/design-system/src/components/N8nRecycleScroller/RecycleScroller.vue b/packages/design-system/src/components/N8nRecycleScroller/RecycleScroller.vue
index 4c4a1073aee44..810d5a7da9ca0 100644
--- a/packages/design-system/src/components/N8nRecycleScroller/RecycleScroller.vue
+++ b/packages/design-system/src/components/N8nRecycleScroller/RecycleScroller.vue
@@ -1,241 +1,201 @@
-<script lang="ts">
-/* eslint-disable @typescript-eslint/no-use-before-define */
-
-import type { PropType, ComponentPublicInstance } from 'vue';
-import { computed, defineComponent, onMounted, onBeforeMount, ref, nextTick, watch } from 'vue';
-
-export default defineComponent({
-	name: 'n8n-recycle-scroller',
-	props: {
-		itemSize: {
-			type: Number,
-			required: true,
-		},
-		items: {
-			type: Array as PropType<Array<Record<string, string>>>,
-			required: true,
-		},
-		itemKey: {
-			type: String,
-			required: true,
-		},
-		offset: {
-			type: Number,
-			default: 2,
-		},
-	},
-	setup(props) {
-		const wrapperRef = ref<HTMLElement | null>(null);
-		const scrollerRef = ref<HTMLElement | null>(null);
-		const itemsRef = ref<HTMLElement | null>(null);
-		const itemRefs = ref<Record<string, Element | ComponentPublicInstance | null>>({});
-
-		const scrollTop = ref(0);
-		const wrapperHeight = ref(0);
-		const windowHeight = ref(0);
-
-		const itemCount = computed(() => props.items.length);
-
-		/**
-		 * Cache
-		 */
-
-		const itemSizeCache = ref<Record<string, number>>({});
-		const itemPositionCache = computed(() => {
-			return props.items.reduce<Record<string, number>>((acc, item, index) => {
-				const key = item[props.itemKey];
-				const prevItem = props.items[index - 1];
-				const prevItemPosition = prevItem ? acc[prevItem[props.itemKey]] : 0;
-				const prevItemSize = prevItem ? itemSizeCache.value[prevItem[props.itemKey]] : 0;
-
-				acc[key] = prevItemPosition + prevItemSize;
-
-				return acc;
-			}, {});
-		});
+<script lang="ts" setup>
+import type { ComponentPublicInstance } from 'vue';
+import { computed, onMounted, onBeforeMount, ref, nextTick, watch } from 'vue';
+
+interface RecycleScrollerProps {
+	itemSize: number;
+	items: Array<Record<string, string>>;
+	itemKey: string;
+	offset?: number;
+}
 
-		/**
-		 * Indexes
-		 */
+const props = withDefaults(defineProps<RecycleScrollerProps>(), {
+	offset: 2,
+});
 
-		const startIndex = computed(() => {
-			const foundIndex =
-				props.items.findIndex((item) => {
-					const itemPosition = itemPositionCache.value[item[props.itemKey]];
+const wrapperRef = ref<HTMLElement | null>(null);
+const scrollerRef = ref<HTMLElement | null>(null);
+const itemsRef = ref<HTMLElement | null>(null);
+const itemRefs = ref<Record<string, Element | ComponentPublicInstance | null>>({});
 
-					return itemPosition >= scrollTop.value;
-				}) - 1;
-			const index = foundIndex - props.offset;
+const scrollTop = ref(0);
+const wrapperHeight = ref(0);
+const windowHeight = ref(0);
 
-			return index < 0 ? 0 : index;
-		});
+/** Cache */
 
-		const endIndex = computed(() => {
-			const foundIndex = props.items.findIndex((item) => {
-				const itemPosition = itemPositionCache.value[item[props.itemKey]];
-				const itemSize = itemSizeCache.value[item[props.itemKey]];
+const itemSizeCache = ref<Record<string, number>>({});
+const itemPositionCache = computed(() => {
+	return props.items.reduce<Record<string, number>>((acc, item, index) => {
+		const key = item[props.itemKey];
+		const prevItem = props.items[index - 1];
+		const prevItemPosition = prevItem ? acc[prevItem[props.itemKey]] : 0;
+		const prevItemSize = prevItem ? itemSizeCache.value[prevItem[props.itemKey]] : 0;
 
-				return itemPosition + itemSize >= scrollTop.value + wrapperHeight.value;
-			});
-			const index = foundIndex + props.offset;
+		acc[key] = prevItemPosition + prevItemSize;
 
-			return foundIndex === -1 ? props.items.length - 1 : index;
-		});
+		return acc;
+	}, {});
+});
 
-		const visibleItems = computed(() => {
-			return props.items.slice(startIndex.value, endIndex.value + 1);
-		});
+/** Indexes */
 
-		watch(
-			() => visibleItems.value,
-			(currentValue, previousValue) => {
-				const difference = currentValue.filter(
-					(currentItem) =>
-						!previousValue.find(
-							(previousItem) => previousItem[props.itemKey] === currentItem[props.itemKey],
-						),
-				);
-
-				if (difference.length > 0) {
-					updateItemSizeCache(difference);
-				}
-			},
-		);
+const startIndex = computed(() => {
+	const foundIndex =
+		props.items.findIndex((item) => {
+			const itemPosition = itemPositionCache.value[item[props.itemKey]];
 
-		/**
-		 * Computed sizes and styles
-		 */
+			return itemPosition >= scrollTop.value;
+		}) - 1;
+	const index = foundIndex - props.offset;
 
-		const scrollerHeight = computed(() => {
-			const lastItem = props.items[props.items.length - 1];
-			const lastItemPosition = lastItem ? itemPositionCache.value[lastItem[props.itemKey]] : 0;
-			const lastItemSize = lastItem ? itemSizeCache.value[lastItem[props.itemKey]] : props.itemSize;
+	return index < 0 ? 0 : index;
+});
 
-			return lastItemPosition + lastItemSize;
-		});
+const endIndex = computed(() => {
+	const foundIndex = props.items.findIndex((item) => {
+		const itemPosition = itemPositionCache.value[item[props.itemKey]];
+		const itemSize = itemSizeCache.value[item[props.itemKey]];
 
-		const scrollerStyles = computed(() => ({
-			height: `${scrollerHeight.value}px`,
-		}));
+		return itemPosition + itemSize >= scrollTop.value + wrapperHeight.value;
+	});
+	const index = foundIndex + props.offset;
 
-		const itemsStyles = computed(() => {
-			const offset = itemPositionCache.value[props.items[startIndex.value][props.itemKey]];
+	return foundIndex === -1 ? props.items.length - 1 : index;
+});
 
-			return {
-				transform: `translateY(${offset}px)`,
-			};
-		});
+const visibleItems = computed(() => {
+	return props.items.slice(startIndex.value, endIndex.value + 1);
+});
 
-		/**
-		 * Lifecycle hooks
-		 */
+watch(
+	() => visibleItems.value,
+	(currentValue, previousValue) => {
+		const difference = currentValue.filter(
+			(currentItem) =>
+				!previousValue.find(
+					(previousItem) => previousItem[props.itemKey] === currentItem[props.itemKey],
+				),
+		);
 
-		onBeforeMount(() => {
-			initializeItemSizeCache();
-		});
+		if (difference.length > 0) {
+			updateItemSizeCache(difference);
+		}
+	},
+);
 
-		onMounted(() => {
-			if (wrapperRef.value) {
-				wrapperRef.value.addEventListener('scroll', onScroll);
-				updateItemSizeCache(visibleItems.value);
-			}
+/** Computed sizes and styles */
 
-			window.addEventListener('resize', onWindowResize);
-			onWindowResize();
-		});
+const scrollerHeight = computed(() => {
+	const lastItem = props.items[props.items.length - 1];
+	const lastItemPosition = lastItem ? itemPositionCache.value[lastItem[props.itemKey]] : 0;
+	const lastItemSize = lastItem ? itemSizeCache.value[lastItem[props.itemKey]] : props.itemSize;
 
-		/**
-		 * Event handlers
-		 */
-
-		function initializeItemSizeCache() {
-			props.items.forEach((item) => {
-				itemSizeCache.value = {
-					...itemSizeCache.value,
-					[item[props.itemKey]]: props.itemSize,
-				};
-			});
-		}
+	return lastItemPosition + lastItemSize;
+});
 
-		function updateItemSizeCache(items: Array<Record<string, string>>) {
-			for (const item of items) {
-				onUpdateItemSize(item);
-			}
-		}
+const scrollerStyles = computed(() => ({
+	height: `${scrollerHeight.value}px`,
+}));
 
-		function onUpdateItemSize(item: { [key: string]: string }) {
-			nextTick(() => {
-				const itemId = item[props.itemKey];
-				const itemRef = itemRefs.value[itemId] as HTMLElement;
-				const previousSize = itemSizeCache.value[itemId];
-				const size = itemRef ? itemRef.offsetHeight : props.itemSize;
-				const difference = size - previousSize;
-
-				itemSizeCache.value = {
-					...itemSizeCache.value,
-					[item[props.itemKey]]: size,
-				};
-
-				if (wrapperRef.value && scrollTop.value) {
-					wrapperRef.value.scrollTop = wrapperRef.value.scrollTop + difference;
-					scrollTop.value = wrapperRef.value.scrollTop;
-				}
-			});
-		}
+const itemsStyles = computed(() => {
+	const offset = itemPositionCache.value[props.items[startIndex.value][props.itemKey]];
 
-		function onWindowResize() {
-			if (wrapperRef.value) {
-				wrapperHeight.value = wrapperRef.value.offsetHeight;
-				nextTick(() => {
-					updateItemSizeCache(visibleItems.value);
-				});
-			}
+	return {
+		transform: `translateY(${offset}px)`,
+	};
+});
 
-			windowHeight.value = window.innerHeight;
-		}
+/** Lifecycle hooks */
 
-		function onScroll() {
-			if (!wrapperRef.value) {
-				return;
-			}
+onBeforeMount(() => {
+	initializeItemSizeCache();
+});
 
+onMounted(() => {
+	if (wrapperRef.value) {
+		wrapperRef.value.addEventListener('scroll', onScroll);
+		updateItemSizeCache(visibleItems.value);
+	}
+
+	window.addEventListener('resize', onWindowResize);
+	onWindowResize();
+});
+
+/** Event handlers */
+
+function initializeItemSizeCache() {
+	props.items.forEach((item) => {
+		itemSizeCache.value = {
+			...itemSizeCache.value,
+			[item[props.itemKey]]: props.itemSize,
+		};
+	});
+}
+
+function updateItemSizeCache(items: Array<Record<string, string>>) {
+	for (const item of items) {
+		onUpdateItemSize(item);
+	}
+}
+
+function onUpdateItemSize(item: { [key: string]: string }) {
+	void nextTick(() => {
+		const itemId = item[props.itemKey];
+		const itemRef = itemRefs.value[itemId] as HTMLElement;
+		const previousSize = itemSizeCache.value[itemId];
+		const size = itemRef ? itemRef.offsetHeight : props.itemSize;
+		const difference = size - previousSize;
+
+		itemSizeCache.value = {
+			...itemSizeCache.value,
+			[item[props.itemKey]]: size,
+		};
+
+		if (wrapperRef.value && scrollTop.value) {
+			wrapperRef.value.scrollTop = wrapperRef.value.scrollTop + difference;
 			scrollTop.value = wrapperRef.value.scrollTop;
 		}
+	});
+}
 
-		return {
-			startIndex,
-			endIndex,
-			itemCount,
-			itemSizeCache,
-			itemPositionCache,
-			itemsVisible: visibleItems,
-			itemsStyles,
-			scrollerStyles,
-			scrollerScrollTop: scrollTop,
-			scrollerRef,
-			wrapperRef,
-			itemsRef,
-			itemRefs,
-			onUpdateItemSize,
-		};
-	},
-});
+function onWindowResize() {
+	if (wrapperRef.value) {
+		wrapperHeight.value = wrapperRef.value.offsetHeight;
+		void nextTick(() => {
+			updateItemSizeCache(visibleItems.value);
+		});
+	}
+
+	windowHeight.value = window.innerHeight;
+}
+
+function onScroll() {
+	if (!wrapperRef.value) {
+		return;
+	}
+
+	scrollTop.value = wrapperRef.value.scrollTop;
+}
 </script>
 
 <template>
-	<div class="recycle-scroller-wrapper" ref="wrapperRef">
-		<div class="recycle-scroller" :style="scrollerStyles" ref="scrollerRef">
-			<div class="recycle-scroller-items-wrapper" :style="itemsStyles" ref="itemsRef">
+	<div ref="wrapperRef" class="recycle-scroller-wrapper">
+		<div ref="scrollerRef" class="recycle-scroller" :style="scrollerStyles">
+			<div ref="itemsRef" class="recycle-scroller-items-wrapper" :style="itemsStyles">
 				<div
-					v-for="item in itemsVisible"
+					v-for="item in visibleItems"
 					:key="item[itemKey]"
-					class="recycle-scroller-item"
 					:ref="(element) => (itemRefs[item[itemKey]] = element)"
+					class="recycle-scroller-item"
 				>
-					<slot :item="item" :updateItemSize="onUpdateItemSize" />
+					<slot :item="item" :update-item-size="onUpdateItemSize" />
 				</div>
 			</div>
 		</div>
+		<div class="post-list-container">
+			<slot name="postListContent" />
+		</div>
 	</div>
 </template>
 
@@ -263,4 +223,7 @@ export default defineComponent({
 	position: relative;
 	width: 100%;
 }
+.post-list-container {
+	margin-top: var(--spacing-3xl);
+}
 </style>
diff --git a/packages/design-system/src/components/N8nRecycleScroller/__tests__/RecycleScroller.spec.ts b/packages/design-system/src/components/N8nRecycleScroller/__tests__/RecycleScroller.spec.ts
new file mode 100644
index 0000000000000..b15fbc481b7e3
--- /dev/null
+++ b/packages/design-system/src/components/N8nRecycleScroller/__tests__/RecycleScroller.spec.ts
@@ -0,0 +1,28 @@
+import { render } from '@testing-library/vue';
+import N8nRecycleScroller from '../RecycleScroller.vue';
+
+const itemSize = 100;
+const itemKey = 'id';
+const items = [...(new Array(100) as number[])].map((_, index) => ({
+	id: index,
+	name: `Item ${index}`,
+}));
+
+describe('components', () => {
+	describe('N8nRecycleScroller', () => {
+		it('should render correctly', () => {
+			const wrapper = render(N8nRecycleScroller, {
+				props: {
+					itemSize,
+					itemKey,
+					items,
+				},
+			});
+
+			expect(wrapper.container.querySelector('.recycle-scroller')).toHaveStyle(
+				`height: ${itemSize * items.length}px`,
+			);
+			expect(wrapper.html()).toMatchSnapshot();
+		});
+	});
+});
diff --git a/packages/design-system/src/components/N8nRecycleScroller/__tests__/__snapshots__/RecycleScroller.spec.ts.snap b/packages/design-system/src/components/N8nRecycleScroller/__tests__/__snapshots__/RecycleScroller.spec.ts.snap
new file mode 100644
index 0000000000000..661ee68ca6a4e
--- /dev/null
+++ b/packages/design-system/src/components/N8nRecycleScroller/__tests__/__snapshots__/RecycleScroller.spec.ts.snap
@@ -0,0 +1,14 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`components > N8nRecycleScroller > should render correctly 1`] = `
+"<div class="recycle-scroller-wrapper">
+  <div class="recycle-scroller" style="height: 10000px;">
+    <div class="recycle-scroller-items-wrapper" style="transform: translateY(0px);">
+      <div class="recycle-scroller-item"></div>
+      <div class="recycle-scroller-item"></div>
+      <div class="recycle-scroller-item"></div>
+    </div>
+  </div>
+  <div class="post-list-container"></div>
+</div>"
+`;
diff --git a/packages/design-system/src/components/N8nResizeWrapper/ResizeWrapper.stories.js b/packages/design-system/src/components/N8nResizeWrapper/ResizeWrapper.stories.js
deleted file mode 100644
index 5a5d355b1618d..0000000000000
--- a/packages/design-system/src/components/N8nResizeWrapper/ResizeWrapper.stories.js
+++ /dev/null
@@ -1,77 +0,0 @@
-import { action } from '@storybook/addon-actions';
-import N8nResizeWrapper from './ResizeWrapper.vue';
-
-export default {
-	title: 'Atoms/ResizeWrapper',
-	component: N8nResizeWrapper,
-};
-
-const methods = {
-	onInput: action('input'),
-	onResize(resizeData) {
-		action('resize', resizeData);
-		this.newHeight = resizeData.height;
-		this.newWidth = resizeData.width;
-	},
-	onResizeEnd: action('resizeend'),
-	onResizeStart: action('resizestart'),
-};
-
-const Template = (args, { argTypes }) => ({
-	props: Object.keys(argTypes),
-	components: {
-		N8nResizeWrapper,
-	},
-	data() {
-		return {
-			newWidth: this.width,
-			newHeight: this.height,
-			background:
-				'linear-gradient(90deg, rgba(255,0,0,1) 0%, rgba(255,154,0,1) 10%, rgba(208,222,33,1) 20%, rgba(79,220,74,1) 30%, rgba(63,218,216,1) 40%, rgba(47,201,226,1) 50%, rgba(28,127,238,1) 60%, rgba(95,21,242,1) 70%, rgba(186,12,248,1) 80%, rgba(251,7,217,1) 90%, rgba(255,0,0,1) 100%)',
-		};
-	},
-	computed: {
-		containerStyles() {
-			return {
-				width: `${this.newWidth}px`,
-				height: `${this.newHeight}px`,
-				background: this.background,
-			};
-		},
-	},
-	template: `<div style="width: fit-content; height: fit-content">
-			<n8n-resize-wrapper
-				v-bind="$props"
-				@resize="onResize"
-				@resizeend="onResizeEnd"
-				@resizestart="onResizeStart"
-				@input="onInput"
-				:width="newWidth"
-				:height="newHeight"
-			>
-				<div :style="containerStyles" />
-			</n8n-resize-wrapper>
-		</div>`,
-	methods,
-});
-
-export const Resize = Template.bind({});
-Resize.args = {
-	width: 200,
-	height: 200,
-	minWidth: 200,
-	minHeight: 200,
-	scale: 1,
-	gridSize: 20,
-	isResizingEnabled: true,
-	supportedDirections: [
-		'right',
-		'top',
-		'bottom',
-		'left',
-		'topLeft',
-		'topRight',
-		'bottomLeft',
-		'bottomRight',
-	],
-};
diff --git a/packages/design-system/src/components/N8nResizeWrapper/ResizeWrapper.stories.ts b/packages/design-system/src/components/N8nResizeWrapper/ResizeWrapper.stories.ts
new file mode 100644
index 0000000000000..6c7773a062fa7
--- /dev/null
+++ b/packages/design-system/src/components/N8nResizeWrapper/ResizeWrapper.stories.ts
@@ -0,0 +1,91 @@
+import { type StoryFn } from '@storybook/vue3';
+import { type ActionOptions, action } from '@storybook/addon-actions';
+import N8nResizeWrapper from './ResizeWrapper.vue';
+import { ref } from 'vue';
+
+// TODO: remove this after converting ResizeWrapper to composition API
+interface ResizeData extends ActionOptions {
+	height: number;
+	width: number;
+}
+
+export default {
+	title: 'Atoms/ResizeWrapper',
+	component: N8nResizeWrapper,
+};
+
+const methods = {
+	onInput: action('input'),
+	onResizeEnd: action('resizeend'),
+	onResizeStart: action('resizestart'),
+};
+
+const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => {
+		const newWidth = ref(args.width);
+		const newHeight = ref(args.height);
+
+		function onResize(resizeData: ResizeData) {
+			action('resize', resizeData);
+			newHeight.value = resizeData.height;
+			newWidth.value = resizeData.width;
+		}
+
+		return {
+			onResize,
+			newWidth,
+			newHeight,
+			background:
+				'linear-gradient(90deg, rgba(255,0,0,1) 0%, rgba(255,154,0,1) 10%, rgba(208,222,33,1) 20%, rgba(79,220,74,1) 30%, rgba(63,218,216,1) 40%, rgba(47,201,226,1) 50%, rgba(28,127,238,1) 60%, rgba(95,21,242,1) 70%, rgba(186,12,248,1) 80%, rgba(251,7,217,1) 90%, rgba(255,0,0,1) 100%)',
+			args,
+		};
+	},
+	props: Object.keys(argTypes),
+	components: {
+		N8nResizeWrapper,
+	},
+	computed: {
+		containerStyles() {
+			return {
+				width: `${this.newWidth}px`,
+				height: `${this.newHeight}px`,
+				background: this.background,
+			};
+		},
+	},
+	template: `<div style="width: fit-content; height: fit-content">
+			<n8n-resize-wrapper
+				v-bind="args"
+				@resize="onResize"
+				@resizeend="onResizeEnd"
+				@resizestart="onResizeStart"
+				@input="onInput"
+				:width="newWidth"
+				:height="newHeight"
+			>
+				<div :style="containerStyles" />
+			</n8n-resize-wrapper>
+		</div>`,
+	methods,
+});
+
+export const Resize = Template.bind({});
+Resize.args = {
+	width: 200,
+	height: 200,
+	minWidth: 200,
+	minHeight: 200,
+	scale: 1,
+	gridSize: 20,
+	isResizingEnabled: true,
+	supportedDirections: [
+		'right',
+		'top',
+		'bottom',
+		'left',
+		'topLeft',
+		'topRight',
+		'bottomLeft',
+		'bottomRight',
+	],
+};
diff --git a/packages/design-system/src/components/N8nResizeWrapper/ResizeWrapper.vue b/packages/design-system/src/components/N8nResizeWrapper/ResizeWrapper.vue
index 930e4eb608d2f..f4f74ec779283 100644
--- a/packages/design-system/src/components/N8nResizeWrapper/ResizeWrapper.vue
+++ b/packages/design-system/src/components/N8nResizeWrapper/ResizeWrapper.vue
@@ -11,10 +11,8 @@
 	</div>
 </template>
 
-<script lang="ts">
-/* eslint-disable @typescript-eslint/unbound-method */
-import type { PropType } from 'vue';
-import { defineComponent } from 'vue';
+<script lang="ts" setup>
+import { computed, ref } from 'vue';
 
 function closestNumber(value: number, divisor: number): number {
 	const q = value / divisor;
@@ -36,7 +34,7 @@ function getSize(min: number, virtual: number, gridSize: number): number {
 	return min;
 }
 
-const directionsCursorMaps: { [key: string]: string } = {
+const directionsCursorMaps = {
 	right: 'ew-resize',
 	top: 'ns-resize',
 	bottom: 'ns-resize',
@@ -45,141 +43,141 @@ const directionsCursorMaps: { [key: string]: string } = {
 	topRight: 'ne-resize',
 	bottomLeft: 'sw-resize',
 	bottomRight: 'se-resize',
-};
+} as const;
+
+type Direction = keyof typeof directionsCursorMaps;
 
-export default defineComponent({
-	name: 'n8n-resize',
-	props: {
-		isResizingEnabled: {
-			type: Boolean,
-			default: true,
-		},
-		height: {
-			type: Number,
-			default: 0,
-		},
-		width: {
-			type: Number,
-			default: 0,
-		},
-		minHeight: {
-			type: Number,
-			default: 0,
-		},
-		minWidth: {
-			type: Number,
-			default: 0,
-		},
-		scale: {
-			type: Number,
-			default: 1,
-		},
-		gridSize: {
-			type: Number,
-			default: 20,
-		},
-		supportedDirections: {
-			type: Array as PropType<string[]>,
-			default: (): string[] => [],
-		},
-	},
-	data() {
-		return {
-			directionsCursorMaps,
-			dir: '',
-			dHeight: 0,
-			dWidth: 0,
-			vHeight: 0,
-			vWidth: 0,
-			x: 0,
-			y: 0,
-		};
-	},
-	computed: {
-		enabledDirections(): string[] {
-			const availableDirections = Object.keys(directionsCursorMaps);
-
-			if (!this.isResizingEnabled) return [];
-			if (this.supportedDirections.length === 0) return availableDirections;
-
-			return this.supportedDirections;
-		},
-	},
-	methods: {
-		resizerMove(event: MouseEvent) {
-			event.preventDefault();
-			event.stopPropagation();
-
-			const targetResizer = event.target as { dataset: { dir: string } } | null;
-			if (targetResizer) {
-				this.dir = targetResizer.dataset.dir.toLocaleLowerCase();
-			}
-
-			document.body.style.cursor = directionsCursorMaps[this.dir];
-
-			this.x = event.pageX;
-			this.y = event.pageY;
-			this.dWidth = 0;
-			this.dHeight = 0;
-			this.vHeight = this.height;
-			this.vWidth = this.width;
-
-			window.addEventListener('mousemove', this.mouseMove);
-			window.addEventListener('mouseup', this.mouseUp);
-			this.$emit('resizestart');
-		},
-		mouseMove(event: MouseEvent) {
-			event.preventDefault();
-			event.stopPropagation();
-			let dWidth = 0;
-			let dHeight = 0;
-			let top = false;
-			let left = false;
-
-			if (this.dir.includes('right')) {
-				dWidth = event.pageX - this.x;
-			}
-			if (this.dir.includes('left')) {
-				dWidth = this.x - event.pageX;
-				left = true;
-			}
-			if (this.dir.includes('top')) {
-				dHeight = this.y - event.pageY;
-				top = true;
-			}
-			if (this.dir.includes('bottom')) {
-				dHeight = event.pageY - this.y;
-			}
-
-			const deltaWidth = (dWidth - this.dWidth) / this.scale;
-			const deltaHeight = (dHeight - this.dHeight) / this.scale;
-
-			this.vHeight = this.vHeight + deltaHeight;
-			this.vWidth = this.vWidth + deltaWidth;
-			const height = getSize(this.minHeight, this.vHeight, this.gridSize);
-			const width = getSize(this.minWidth, this.vWidth, this.gridSize);
-
-			const dX = left && width !== this.width ? -1 * (width - this.width) : 0;
-			const dY = top && height !== this.height ? -1 * (height - this.height) : 0;
-			const x = event.x;
-			const y = event.y;
-			const direction = this.dir;
-
-			this.$emit('resize', { height, width, dX, dY, x, y, direction });
-			this.dHeight = dHeight;
-			this.dWidth = dWidth;
-		},
-		mouseUp(event: MouseEvent) {
-			event.preventDefault();
-			event.stopPropagation();
-			this.$emit('resizeend');
-			window.removeEventListener('mousemove', this.mouseMove);
-			window.removeEventListener('mouseup', this.mouseUp);
-			document.body.style.cursor = 'unset';
-			this.dir = '';
-		},
-	},
+interface ResizeProps {
+	isResizingEnabled?: boolean;
+	height?: number;
+	width?: number;
+	minHeight?: number;
+	minWidth?: number;
+	scale?: number;
+	gridSize?: number;
+	supportedDirections?: Direction[];
+}
+
+const props = withDefaults(defineProps<ResizeProps>(), {
+	isResizingEnabled: true,
+	height: 0,
+	width: 0,
+	minHeight: 0,
+	minWidth: 0,
+	scale: 1,
+	gridSize: 20,
+	supportedDirections: () => [],
 });
+
+export interface ResizeData {
+	height: number;
+	width: number;
+	dX: number;
+	dY: number;
+	x: number;
+	y: number;
+	direction: Direction;
+}
+
+const $emit = defineEmits<{
+	(event: 'resizestart');
+	(event: 'resize', value: ResizeData): void;
+	(event: 'resizeend');
+}>();
+
+const enabledDirections = computed((): Direction[] => {
+	const availableDirections = Object.keys(directionsCursorMaps) as Direction[];
+
+	if (!props.isResizingEnabled) return [];
+	if (props.supportedDirections.length === 0) return availableDirections;
+
+	return props.supportedDirections;
+});
+
+const state = {
+	dir: ref<Direction | ''>(''),
+	dHeight: ref(0),
+	dWidth: ref(0),
+	vHeight: ref(0),
+	vWidth: ref(0),
+	x: ref(0),
+	y: ref(0),
+};
+
+const mouseMove = (event: MouseEvent) => {
+	event.preventDefault();
+	event.stopPropagation();
+	let dWidth = 0;
+	let dHeight = 0;
+	let top = false;
+	let left = false;
+
+	if (state.dir.value.includes('right')) {
+		dWidth = event.pageX - state.x.value;
+	}
+	if (state.dir.value.includes('left')) {
+		dWidth = state.x.value - event.pageX;
+		left = true;
+	}
+	if (state.dir.value.includes('top')) {
+		dHeight = state.y.value - event.pageY;
+		top = true;
+	}
+	if (state.dir.value.includes('bottom')) {
+		dHeight = event.pageY - state.y.value;
+	}
+
+	const deltaWidth = (dWidth - state.dWidth.value) / props.scale;
+	const deltaHeight = (dHeight - state.dHeight.value) / props.scale;
+
+	state.vHeight.value = state.vHeight.value + deltaHeight;
+	state.vWidth.value = state.vWidth.value + deltaWidth;
+	const height = getSize(props.minHeight, state.vHeight.value, props.gridSize);
+	const width = getSize(props.minWidth, state.vWidth.value, props.gridSize);
+
+	const dX = left && width !== props.width ? -1 * (width - props.width) : 0;
+	const dY = top && height !== props.height ? -1 * (height - props.height) : 0;
+	const x = event.x;
+	const y = event.y;
+	const direction = state.dir.value as Direction;
+
+	$emit('resize', { height, width, dX, dY, x, y, direction });
+	state.dHeight.value = dHeight;
+	state.dWidth.value = dWidth;
+};
+
+const mouseUp = (event: MouseEvent) => {
+	event.preventDefault();
+	event.stopPropagation();
+	$emit('resizeend');
+	window.removeEventListener('mousemove', mouseMove);
+	window.removeEventListener('mouseup', mouseUp);
+	document.body.style.cursor = 'unset';
+	state.dir.value = '';
+};
+
+const resizerMove = (event: MouseEvent) => {
+	event.preventDefault();
+	event.stopPropagation();
+
+	const targetResizer = event.target as { dataset: { dir: string } } | null;
+	if (targetResizer) {
+		state.dir.value = targetResizer.dataset.dir.toLocaleLowerCase() as Direction;
+	}
+
+	document.body.style.cursor = directionsCursorMaps[state.dir.value];
+
+	state.x.value = event.pageX;
+	state.y.value = event.pageY;
+	state.dWidth.value = 0;
+	state.dHeight.value = 0;
+	state.vHeight.value = props.height;
+	state.vWidth.value = props.width;
+
+	window.addEventListener('mousemove', mouseMove);
+	window.addEventListener('mouseup', mouseUp);
+	$emit('resizestart');
+};
 </script>
 
 <style lang="scss" module>
diff --git a/packages/design-system/src/components/N8nResizeWrapper/index.js b/packages/design-system/src/components/N8nResizeWrapper/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nResizeWrapper/index.js
rename to packages/design-system/src/components/N8nResizeWrapper/index.ts
diff --git a/packages/design-system/src/components/N8nRoute/Route.vue b/packages/design-system/src/components/N8nRoute/Route.vue
index b5c6d346a55dc..397cff9940d09 100644
--- a/packages/design-system/src/components/N8nRoute/Route.vue
+++ b/packages/design-system/src/components/N8nRoute/Route.vue
@@ -1,51 +1,36 @@
 <template>
-	<span>
-		<router-link v-if="useRouterLink" :to="to" v-on="$listeners">
-			<slot></slot>
-		</router-link>
-		<a v-else :href="to" :target="openNewWindow ? '_blank' : '_self'" v-on="$listeners">
-			<slot></slot>
-		</a>
-	</span>
+	<router-link v-if="useRouterLink" :to="to" v-bind="$attrs">
+		<slot></slot>
+	</router-link>
+	<a v-else :href="to" :target="openNewWindow ? '_blank' : '_self'" v-bind="$attrs">
+		<slot></slot>
+	</a>
 </template>
 
-<script lang="ts">
-import { defineComponent } from 'vue';
+<script lang="ts" setup>
+import { computed } from 'vue';
+import { type RouteLocationRaw } from 'vue-router';
 
-export default defineComponent({
-	name: 'n8n-route',
-	props: {
-		to: {
-			type: String || Object,
-		},
-		newWindow: {
-			type: Boolean || undefined,
-			default: undefined,
-		},
-	},
-	computed: {
-		useRouterLink() {
-			if (this.newWindow) {
-				// router-link does not support click events and opening in new window
-				return false;
-			}
+interface RouteProps {
+	to?: RouteLocationRaw;
+	newWindow?: boolean;
+}
 
-			if (typeof this.to === 'string') {
-				return this.to.startsWith('/');
-			}
+defineOptions({ name: 'N8nRoute' });
+const props = defineProps<RouteProps>();
 
-			return this.to !== undefined;
-		},
-		openNewWindow() {
-			if (this.newWindow !== undefined) {
-				return this.newWindow;
-			}
+const useRouterLink = computed(() => {
+	if (props.newWindow) {
+		// router-link does not support click events and opening in new window
+		return false;
+	}
 
-			if (typeof this.to === 'string') {
-				return !this.to.startsWith('/');
-			}
-			return true;
-		},
-	},
+	if (typeof props.to === 'string') {
+		return props.to.startsWith('/');
+	}
+
+	return props.to !== undefined;
 });
+
+const openNewWindow = computed(() => !useRouterLink.value);
 </script>
diff --git a/packages/design-system/src/components/N8nRoute/__tests__/Route.spec.ts b/packages/design-system/src/components/N8nRoute/__tests__/Route.spec.ts
new file mode 100644
index 0000000000000..fb5c16b1eef41
--- /dev/null
+++ b/packages/design-system/src/components/N8nRoute/__tests__/Route.spec.ts
@@ -0,0 +1,32 @@
+import { render } from '@testing-library/vue';
+import N8nRoute from '../Route.vue';
+
+describe('N8nRoute', () => {
+	it('should render internal router links', () => {
+		const wrapper = render(N8nRoute, {
+			props: {
+				to: '/test',
+			},
+		});
+		expect(wrapper.html()).toMatchSnapshot();
+	});
+
+	it('should render internal links with newWindow=true', () => {
+		const wrapper = render(N8nRoute, {
+			props: {
+				to: '/test',
+				newWindow: true,
+			},
+		});
+		expect(wrapper.html()).toMatchSnapshot();
+	});
+
+	it('should render external links', () => {
+		const wrapper = render(N8nRoute, {
+			props: {
+				to: 'https://example.com/',
+			},
+		});
+		expect(wrapper.html()).toMatchSnapshot();
+	});
+});
diff --git a/packages/design-system/src/components/N8nRoute/__tests__/__snapshots__/Route.spec.ts.snap b/packages/design-system/src/components/N8nRoute/__tests__/__snapshots__/Route.spec.ts.snap
new file mode 100644
index 0000000000000..c9e658ff2b7ae
--- /dev/null
+++ b/packages/design-system/src/components/N8nRoute/__tests__/__snapshots__/Route.spec.ts.snap
@@ -0,0 +1,7 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`N8nRoute > should render external links 1`] = `"<a href="https://example.com/" target="_blank"></a>"`;
+
+exports[`N8nRoute > should render internal links with newWindow=true 1`] = `"<a href="/test" target="_blank"></a>"`;
+
+exports[`N8nRoute > should render internal router links 1`] = `"<router-link to="/test"></router-link>"`;
diff --git a/packages/design-system/src/components/N8nRoute/index.ts b/packages/design-system/src/components/N8nRoute/index.ts
index 04a0ba3e1d05a..476eb391f4df2 100644
--- a/packages/design-system/src/components/N8nRoute/index.ts
+++ b/packages/design-system/src/components/N8nRoute/index.ts
@@ -1,3 +1,2 @@
 import N8nRoute from './Route.vue';
-
 export default N8nRoute;
diff --git a/packages/design-system/src/components/N8nSelect/Select.stories.ts b/packages/design-system/src/components/N8nSelect/Select.stories.ts
index ad0cc1e859a11..b95c5b9b1d86e 100644
--- a/packages/design-system/src/components/N8nSelect/Select.stories.ts
+++ b/packages/design-system/src/components/N8nSelect/Select.stories.ts
@@ -1,4 +1,4 @@
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 import N8nSelect from './Select.vue';
 import N8nOption from '../N8nOption';
 import N8nIcon from '../N8nIcon';
@@ -16,8 +16,8 @@ export default {
 		size: {
 			control: {
 				type: 'select',
-				options: ['large', 'medium', 'small', 'mini'],
 			},
+			options: ['large', 'medium', 'small', 'mini'],
 		},
 		loading: {
 			control: {
@@ -41,11 +41,12 @@ export default {
 };
 
 const methods = {
-	onInput: action('input'),
+	onUpdateModelValue: action('update:modelValue'),
 	onChange: action('change'),
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nSelect,
@@ -53,7 +54,7 @@ const Template: StoryFn = (args, { argTypes }) => ({
 		N8nIcon,
 	},
 	template:
-		'<n8n-select v-bind="$props" v-model="val" @input="onInput" @change="onChange"><n8n-option value="1">op1</n8n-option><n8n-option value="2">op2</n8n-option></n8n-select>',
+		'<n8n-select v-bind="args" v-model="val" @update:modelValue="onUpdateModelValue" @change="onChange"><n8n-option value="1">op1</n8n-option><n8n-option value="2">op2</n8n-option></n8n-select>',
 	data() {
 		return {
 			val: '',
@@ -73,11 +74,12 @@ Filterable.args = {
 const selects = ['large', 'medium', 'small', 'mini']
 	.map(
 		(size) =>
-			`<n8n-select v-bind="$props" v-model="val" @input="onInput" @change="onChange" size="${size}"><n8n-option value="1">op1</n8n-option><n8n-option value="2">op2</n8n-option></n8n-select>`,
+			`<n8n-select v-bind="args" v-model="val" @update:modelValue="onUpdateModelValue" @change="onChange" size="${size}"><n8n-option value="1">op1</n8n-option><n8n-option value="2">op2</n8n-option></n8n-select>`,
 	)
 	.join('');
 
 const ManyTemplate: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nSelect,
@@ -103,11 +105,12 @@ Sizes.args = {
 const selectsWithIcon = ['xlarge', 'large', 'medium', 'small', 'mini']
 	.map(
 		(size) =>
-			`<n8n-select v-bind="$props" v-model="val" @input="onInput" size="${size}"><n8n-icon icon="search" slot="prefix" /><n8n-option value="1">op1</n8n-option><n8n-option value="2">op2</n8n-option></n8n-select>`,
+			`<n8n-select v-bind="args" v-model="val" @update:modelValue="onUpdateModelValue" size="${size}"><n8n-icon icon="search" slot="prefix" /><n8n-option value="1">op1</n8n-option><n8n-option value="2">op2</n8n-option></n8n-select>`,
 	)
 	.join('');
 
 const ManyTemplateWithIcon: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nSelect,
@@ -131,6 +134,7 @@ WithIcon.args = {
 };
 
 const LimitedWidthTemplate: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nSelect,
@@ -138,7 +142,7 @@ const LimitedWidthTemplate: StoryFn = (args, { argTypes }) => ({
 		N8nIcon,
 	},
 	template:
-		'<div style="width:100px;"><n8n-select v-bind="$props" v-model="val" @input="onInput" @change="onChange"><n8n-option value="1" label="opt1 11 1111" /><n8n-option value="2" label="opt2 test very long ipsum"/></n8n-select></div>',
+		'<div style="width:100px;"><n8n-select v-bind="args" v-model="val" @update:modelValue="onUpdateModelValue" @change="onChange"><n8n-option value="1" label="opt1 11 1111" /><n8n-option value="2" label="opt2 test very long ipsum"/></n8n-select></div>',
 	data() {
 		return {
 			val: '',
diff --git a/packages/design-system/src/components/N8nSelect/Select.vue b/packages/design-system/src/components/N8nSelect/Select.vue
index 7ea6eeb799c71..adf37aee22826 100644
--- a/packages/design-system/src/components/N8nSelect/Select.vue
+++ b/packages/design-system/src/components/N8nSelect/Select.vue
@@ -9,52 +9,43 @@
 		<div v-if="$slots.prepend" :class="$style.prepend">
 			<slot name="prepend" />
 		</div>
-		<el-select
-			v-bind="$props"
-			:value="value"
+		<ElSelect
+			v-bind="{ ...$props, ...listeners }"
+			ref="innerSelect"
+			:model-value="modelValue"
 			:size="computedSize"
 			:class="$style[classes]"
 			:popper-class="popperClass"
-			v-on="$listeners"
-			ref="innerSelect"
 		>
-			<template #prefix>
+			<template v-if="$slots.prefix" #prefix>
 				<slot name="prefix" />
 			</template>
-			<template #suffix>
+			<template v-if="$slots.suffix" #suffix>
 				<slot name="suffix" />
 			</template>
-			<template #default>
-				<slot></slot>
-			</template>
-		</el-select>
+			<slot></slot>
+		</ElSelect>
 	</div>
 </template>
 
 <script lang="ts">
-import { Select as ElSelect } from 'element-ui';
-import { defineComponent } from 'vue';
+import { ElSelect } from 'element-plus';
+import { type PropType, defineComponent } from 'vue';
+import type { SelectSize } from '@/types';
 
 type InnerSelectRef = InstanceType<typeof ElSelect>;
 
-export interface IProps {
-	size?: string;
-	limitPopperWidth?: string;
-	popperClass?: string;
-}
-
 export default defineComponent({
-	name: 'n8n-select',
+	name: 'N8nSelect',
 	components: {
 		ElSelect,
 	},
 	props: {
-		value: {},
+		...ElSelect.props,
+		modelValue: {},
 		size: {
-			type: String,
+			type: String as PropType<SelectSize>,
 			default: 'large',
-			validator: (value: string): boolean =>
-				['mini', 'small', 'medium', 'large', 'xlarge'].includes(value),
 		},
 		placeholder: {
 			type: String,
@@ -94,7 +85,20 @@ export default defineComponent({
 		},
 	},
 	computed: {
-		computedSize(): string | undefined {
+		listeners() {
+			return Object.entries(this.$attrs).reduce<Record<string, () => {}>>((acc, [key, value]) => {
+				if (/^on[A-Z]/.test(key)) {
+					acc[key] = value;
+				}
+
+				return acc;
+			}, {});
+		},
+		computedSize(): InnerSelectRef['$props']['size'] {
+			if (this.size === 'medium') {
+				return 'default';
+			}
+
 			if (this.size === 'xlarge') {
 				return undefined;
 			}
diff --git a/packages/design-system/src/components/N8nSelect/__tests__/Select.spec.ts b/packages/design-system/src/components/N8nSelect/__tests__/Select.spec.ts
index 1c4084d869fb2..b17c51b700913 100644
--- a/packages/design-system/src/components/N8nSelect/__tests__/Select.spec.ts
+++ b/packages/design-system/src/components/N8nSelect/__tests__/Select.spec.ts
@@ -1,4 +1,6 @@
-import { render } from '@testing-library/vue';
+import { defineComponent, ref } from 'vue';
+import { render, waitFor, within } from '@testing-library/vue';
+import userEvent from '@testing-library/user-event';
 import N8nSelect from '../Select.vue';
 import N8nOption from '../../N8nOption/Option.vue';
 
@@ -6,8 +8,10 @@ describe('components', () => {
 	describe('N8nSelect', () => {
 		it('should render correctly', () => {
 			const wrapper = render(N8nSelect, {
-				components: {
-					N8nOption,
+				global: {
+					components: {
+						'n8n-option': N8nOption,
+					},
 				},
 				slots: {
 					default: [
@@ -19,5 +23,44 @@ describe('components', () => {
 			});
 			expect(wrapper.html()).toMatchSnapshot();
 		});
+
+		it('should select an option', async () => {
+			const n8nSelectTestComponent = defineComponent({
+				setup() {
+					const options = ref(['1', '2', '3']);
+					const selected = ref('');
+
+					return {
+						options,
+						selected,
+					};
+				},
+				template: `
+					<n8n-select v-model="selected">
+						<n8n-option v-for="o in options" :key="o" :value="o" :label="o" />
+					</n8n-select>
+				`,
+			});
+
+			const { container } = render(n8nSelectTestComponent, {
+				props: {
+					teleported: false,
+				},
+				global: {
+					components: {
+						'n8n-select': N8nSelect,
+						'n8n-option': N8nOption,
+					},
+				},
+			});
+			const getOption = (value: string) => within(container as HTMLElement).getByText(value);
+
+			const textbox = container.querySelector('input')!;
+			await userEvent.click(textbox);
+			await waitFor(() => expect(getOption('1')).toBeVisible());
+			await userEvent.click(getOption('1'));
+
+			expect(textbox).toHaveValue('1');
+		});
 	});
 });
diff --git a/packages/design-system/src/components/N8nSelect/__tests__/__snapshots__/Select.spec.ts.snap b/packages/design-system/src/components/N8nSelect/__tests__/__snapshots__/Select.spec.ts.snap
index 0d3bd043ba703..7277454cf3bf6 100644
--- a/packages/design-system/src/components/N8nSelect/__tests__/__snapshots__/Select.spec.ts.snap
+++ b/packages/design-system/src/components/N8nSelect/__tests__/__snapshots__/Select.spec.ts.snap
@@ -1,40 +1,26 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`components > N8nSelect > should render correctly 1`] = `
-"<div class=\\"n8n-select container\\">
-  <!---->
-  <div class=\\"el-select el-select--large\\">
-    <!---->
-    <div class=\\"el-input el-input--large el-input--suffix\\">
-      <!----><input type=\\"text\\" readonly=\\"readonly\\" autocomplete=\\"off\\" placeholder=\\"请选择\\" class=\\"el-input__inner\\">
-      <!----><span class=\\"el-input__suffix\\"><span class=\\"el-input__suffix-inner\\"><i class=\\"el-select__caret el-input__icon el-icon-arrow-up\\"></i><!----><!----><!----><!----><!----></span>
-      <!----></span>
-      <!---->
-      <!---->
-    </div>
-    <transition-stub name=\\"el-zoom-in-top\\">
-      <div class=\\"el-select-dropdown el-popper\\" style=\\"display: none;\\">
-        <div class=\\"el-scrollbar\\" style=\\"display: none;\\">
-          <div class=\\"el-select-dropdown__wrap el-scrollbar__wrap el-scrollbar__wrap--hidden-default\\">
-            <ul class=\\"el-scrollbar__view el-select-dropdown__list\\">
-              <!---->
-              <li class=\\"el-select-dropdown__item\\">1</li>
-              <li class=\\"el-select-dropdown__item\\">2</li>
-              <li class=\\"el-select-dropdown__item\\">3</li>
-            </ul>
-          </div>
-          <div class=\\"el-scrollbar__bar is-horizontal\\">
-            <div class=\\"el-scrollbar__thumb\\" style=\\"width: 0px; transform: translateX(0%); webkit-transform: translateX(0%);\\"></div>
-          </div>
-          <div class=\\"el-scrollbar__bar is-vertical\\">
-            <div class=\\"el-scrollbar__thumb\\" style=\\"height: 0px; transform: translateY(0%); webkit-transform: translateY(0%);\\"></div>
-          </div>
-        </div>
-        <p class=\\"el-select-dropdown__empty\\">
-          无数据
-        </p>
+"<div class="n8n-select container">
+  <!--v-if-->
+  <div class="el-select el-select--large" popperappendtobody="false" limitpopperwidth="false">
+    <div class="select-trigger el-tooltip__trigger el-tooltip__trigger">
+      <!--v-if-->
+      <!-- fix: https://github.com/element-plus/element-plus/issues/11415 -->
+      <!--v-if-->
+      <div class="el-input el-input--large el-input--suffix">
+        <!-- input -->
+        <!-- prepend slot -->
+        <!--v-if-->
+        <div class="el-input__wrapper">
+          <!-- prefix slot -->
+          <!--v-if--><input class="el-input__inner" type="text" readonly="" autocomplete="off" tabindex="0" placeholder="Select"><!-- suffix slot --><span class="el-input__suffix"><span class="el-input__suffix-inner"><i class="el-icon el-select__caret el-select__icon"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024"><path fill="currentColor" d="M831.872 340.864 512 652.672 192.128 340.864a30.592 30.592 0 0 0-42.752 0 29.12 29.12 0 0 0 0 41.6L489.664 714.24a32 32 0 0 0 44.672 0l340.288-331.712a29.12 29.12 0 0 0 0-41.728 30.592 30.592 0 0 0-42.752 0z"></path></svg></i><!--v-if--><!--v-if--><!--v-if--><!--v-if--><!--v-if--><!--v-if--></span></span>
+        </div><!-- append slot -->
+        <!--v-if-->
       </div>
-    </transition-stub>
+    </div>
+    <!--teleport start-->
+    <!--teleport end-->
   </div>
 </div>"
 `;
diff --git a/packages/design-system/src/components/N8nSpinner/Spinner.stories.ts b/packages/design-system/src/components/N8nSpinner/Spinner.stories.ts
index 0a51e8ec4ce14..7e1865b60473c 100644
--- a/packages/design-system/src/components/N8nSpinner/Spinner.stories.ts
+++ b/packages/design-system/src/components/N8nSpinner/Spinner.stories.ts
@@ -1,4 +1,4 @@
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 import N8nSpinner from './Spinner.vue';
 
 export default {
@@ -8,24 +8,25 @@ export default {
 		size: {
 			control: {
 				type: 'select',
-				options: ['small', 'medium', 'large'],
 			},
+			options: ['small', 'medium', 'large'],
 		},
 		type: {
 			control: {
 				type: 'select',
-				options: ['dots', 'ring'],
 			},
+			options: ['dots', 'ring'],
 		},
 	},
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nSpinner,
 	},
-	template: '<n8n-spinner v-bind="$props" />',
+	template: '<n8n-spinner v-bind="args" />',
 });
 
 export const Spinner = Template.bind({});
diff --git a/packages/design-system/src/components/N8nSpinner/Spinner.vue b/packages/design-system/src/components/N8nSpinner/Spinner.vue
index a3f4559cc252f..6050add9f3961 100644
--- a/packages/design-system/src/components/N8nSpinner/Spinner.vue
+++ b/packages/design-system/src/components/N8nSpinner/Spinner.vue
@@ -6,35 +6,24 @@
 			<div></div>
 			<div></div>
 		</div>
-		<n8n-icon v-else icon="spinner" :size="size" spin />
+		<N8nIcon v-else icon="spinner" :size="size" spin />
 	</span>
 </template>
 
-<script lang="ts">
+<script lang="ts" setup>
+import type { TextSize } from '@/types/text';
 import N8nIcon from '../N8nIcon';
 
-import { defineComponent } from 'vue';
+const TYPE = ['dots', 'ring'] as const;
 
-export default defineComponent({
-	name: 'n8n-spinner',
-	components: {
-		N8nIcon,
-	},
-	props: {
-		size: {
-			type: String,
-			validator(value: string): boolean {
-				return ['small', 'medium', 'large'].includes(value);
-			},
-		},
-		type: {
-			type: String,
-			validator(value: string): boolean {
-				return ['dots', 'ring'].includes(value);
-			},
-			default: 'dots',
-		},
-	},
+interface SpinnerProps {
+	size?: Exclude<TextSize, 'xsmall' | 'mini' | 'xlarge'>;
+	type?: (typeof TYPE)[number];
+}
+
+defineOptions({ name: 'N8nSpinner' });
+withDefaults(defineProps<SpinnerProps>(), {
+	type: 'dots',
 });
 </script>
 
diff --git a/packages/design-system/src/components/N8nSticky/Sticky.stories.ts b/packages/design-system/src/components/N8nSticky/Sticky.stories.ts
index 88f4bf28dc6ac..6a4e05d8300e8 100644
--- a/packages/design-system/src/components/N8nSticky/Sticky.stories.ts
+++ b/packages/design-system/src/components/N8nSticky/Sticky.stories.ts
@@ -1,5 +1,5 @@
 import { action } from '@storybook/addon-actions';
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 import N8nSticky from './Sticky.vue';
 
 export default {
@@ -40,19 +40,20 @@ export default {
 };
 
 const methods = {
-	onInput: action('input'),
+	onInput: action('update:modelValue'),
 	onResize: action('resize'),
 	onResizeEnd: action('resizeend'),
 	onResizeStart: action('resizestart'),
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nSticky,
 	},
 	template:
-		'<n8n-sticky v-bind="$props"  @resize="onResize" @resizeend="onResizeEnd" @resizeStart="onResizeStart" @input="onInput"></n8n-sticky>',
+		'<n8n-sticky v-bind="args"  @resize="onResize" @resizeend="onResizeEnd" @resizeStart="onResizeStart" @input="onInput"></n8n-sticky>',
 	methods,
 });
 
diff --git a/packages/design-system/src/components/N8nSticky/Sticky.vue b/packages/design-system/src/components/N8nSticky/Sticky.vue
index 1c18ce051ca6d..d7d59556d280f 100644
--- a/packages/design-system/src/components/N8nSticky/Sticky.vue
+++ b/packages/design-system/src/components/N8nSticky/Sticky.vue
@@ -1,205 +1,194 @@
 <template>
 	<div
-		:class="{ 'n8n-sticky': true, [$style.sticky]: true, [$style.clickable]: !isResizing }"
+		:class="{
+			'n8n-sticky': true,
+			[$style.sticky]: true,
+			[$style.clickable]: !isResizing,
+			[$style[`color-${backgroundColor}`]]: true,
+		}"
 		:style="styles"
 		@keydown.prevent
 	>
-		<n8n-resize-wrapper
-			:isResizingEnabled="!readOnly"
+		<N8nResizeWrapper
+			:is-resizing-enabled="!readOnly"
 			:height="height"
 			:width="width"
-			:minHeight="minHeight"
-			:minWidth="minWidth"
+			:min-height="minHeight"
+			:min-width="minWidth"
 			:scale="scale"
-			:gridSize="gridSize"
+			:grid-size="gridSize"
 			@resizeend="onResizeEnd"
 			@resize="onResize"
 			@resizestart="onResizeStart"
 		>
-			<template>
-				<div
-					v-show="!editMode"
-					class="ph-no-capture"
-					:class="$style.wrapper"
-					@dblclick.stop="onDoubleClick"
-				>
-					<n8n-markdown
-						theme="sticky"
-						:content="content"
-						:withMultiBreaks="true"
-						@markdown-click="onMarkdownClick"
-					/>
-				</div>
-				<div
-					v-show="editMode"
-					@click.stop
-					@mousedown.stop
-					@mouseup.stop
-					@keydown.esc="onInputBlur"
-					@keydown.stop
-					@wheel.stop
-					class="sticky-textarea ph-no-capture"
-					:class="{ 'full-height': !shouldShowFooter }"
-				>
-					<n8n-input
-						:value="content"
-						type="textarea"
-						:rows="5"
-						@blur="onInputBlur"
-						@input="onInput"
-						ref="input"
-					/>
-				</div>
-				<div v-if="editMode && shouldShowFooter" :class="$style.footer">
-					<n8n-text size="xsmall" aligh="right">
-						<span v-html="t('sticky.markdownHint')"></span>
-					</n8n-text>
-				</div>
-			</template>
-		</n8n-resize-wrapper>
+			<div v-show="!editMode" :class="$style.wrapper" @dblclick.stop="onDoubleClick">
+				<N8nMarkdown
+					theme="sticky"
+					:content="modelValue"
+					:with-multi-breaks="true"
+					@markdown-click="onMarkdownClick"
+				/>
+			</div>
+			<div
+				v-show="editMode"
+				:class="{ 'full-height': !shouldShowFooter, 'sticky-textarea': true }"
+				@click.stop
+				@mousedown.stop
+				@mouseup.stop
+				@keydown.esc="onInputBlur"
+				@keydown.stop
+			>
+				<N8nInput
+					ref="input"
+					:model-value="modelValue"
+					type="textarea"
+					:rows="5"
+					@blur="onInputBlur"
+					@update:model-value="onUpdateModelValue"
+					@wheel="onInputScroll"
+				/>
+			</div>
+			<div v-if="editMode && shouldShowFooter" :class="$style.footer">
+				<N8nText size="xsmall" align="right">
+					<span v-html="t('sticky.markdownHint')"></span>
+				</N8nText>
+			</div>
+		</N8nResizeWrapper>
 	</div>
 </template>
 
-<script lang="ts">
+<script lang="ts" setup>
+import { computed, ref, watch } from 'vue';
 import N8nInput from '../N8nInput';
 import N8nMarkdown from '../N8nMarkdown';
-import N8nResizeWrapper from '../N8nResizeWrapper';
+import N8nResizeWrapper, { type ResizeData } from '../N8nResizeWrapper/ResizeWrapper.vue';
 import N8nText from '../N8nText';
-import Locale from '../../mixins/locale';
-import { defineComponent } from 'vue';
-
-export default defineComponent({
-	name: 'n8n-sticky',
-	mixins: [Locale],
-	props: {
-		content: {
-			type: String,
-		},
-		height: {
-			type: Number,
-			default: 180,
-		},
-		width: {
-			type: Number,
-			default: 240,
-		},
-		minHeight: {
-			type: Number,
-			default: 80,
-		},
-		minWidth: {
-			type: Number,
-			default: 150,
-		},
-		scale: {
-			type: Number,
-			default: 1,
-		},
-		gridSize: {
-			type: Number,
-			default: 20,
-		},
-		id: {
-			type: String,
-			default: '0',
-		},
-		defaultText: {
-			type: String,
-		},
-		editMode: {
-			type: Boolean,
-			default: false,
-		},
-		readOnly: {
-			type: Boolean,
-			default: false,
-		},
-	},
-	components: {
-		N8nInput,
-		N8nMarkdown,
-		N8nResizeWrapper,
-		N8nText,
-	},
-	data() {
-		return {
-			isResizing: false,
-		};
-	},
-	computed: {
-		resHeight(): number {
-			if (this.height < this.minHeight) {
-				return this.minHeight;
-			}
-			return this.height;
-		},
-		resWidth(): number {
-			if (this.width < this.minWidth) {
-				return this.minWidth;
-			}
-			return this.width;
-		},
-		styles(): { height: string; width: string } {
-			return {
-				height: `${this.resHeight}px`,
-				width: `${this.resWidth}px`,
-			};
-		},
-		shouldShowFooter(): boolean {
-			return this.resHeight > 100 && this.resWidth > 155;
-		},
-	},
-	methods: {
-		onDoubleClick() {
-			if (!this.readOnly) {
-				this.$emit('edit', true);
-			}
-		},
-		onInputBlur() {
-			if (!this.isResizing) {
-				this.$emit('edit', false);
-			}
-		},
-		onInput(value: string) {
-			this.$emit('input', value);
-		},
-		onMarkdownClick(link: string, event: Event) {
-			this.$emit('markdown-click', link, event);
-		},
-		onResize(values: unknown[]) {
-			this.$emit('resize', values);
-		},
-		onResizeEnd(resizeEnd: unknown) {
-			this.isResizing = false;
-			this.$emit('resizeend', resizeEnd);
-		},
-		onResizeStart() {
-			this.isResizing = true;
-			this.$emit('resizestart');
-		},
-	},
-	watch: {
-		editMode(newMode, prevMode) {
-			setTimeout(() => {
-				if (newMode && !prevMode && this.$refs.input) {
-					const textarea = this.$refs.input as HTMLTextAreaElement;
-					if (this.defaultText === this.content) {
-						textarea.select();
-					}
-					textarea.focus();
+import { useI18n } from '../../composables/useI18n';
+
+interface StickyProps {
+	modelValue?: string;
+	height?: number;
+	width?: number;
+	minHeight?: number;
+	minWidth?: number;
+	scale?: number;
+	gridSize?: number;
+	id?: string;
+	defaultText?: string;
+	editMode?: boolean;
+	readOnly?: boolean;
+	backgroundColor?: number | string;
+}
+
+const props = withDefaults(defineProps<StickyProps>(), {
+	height: 180,
+	width: 240,
+	minHeight: 80,
+	minWidth: 150,
+	scale: 1,
+	gridSize: 20,
+	id: '0',
+	editMode: false,
+	readOnly: false,
+	backgroundColor: 1,
+});
+
+const $emit = defineEmits<{
+	(event: 'edit', editing: boolean);
+	(event: 'update:modelValue', value: string);
+	(event: 'markdown-click', link: string, e: Event);
+	(event: 'resize', values: ResizeData);
+	(event: 'resizestart');
+	(event: 'resizeend', value: unknown);
+}>();
+
+const { t } = useI18n();
+const isResizing = ref(false);
+const input = ref<HTMLTextAreaElement | undefined>(undefined);
+
+const resHeight = computed((): number => {
+	return props.height < props.minHeight ? props.minHeight : props.height;
+});
+
+const resWidth = computed((): number => {
+	return props.width < props.minWidth ? props.minWidth : props.width;
+});
+
+const styles = computed((): { height: string; width: string } => ({
+	height: `${resHeight.value}px`,
+	width: `${resWidth.value}px`,
+}));
+
+const shouldShowFooter = computed((): boolean => resHeight.value > 100 && resWidth.value > 155);
+
+watch(
+	() => props.editMode,
+	(newMode, prevMode) => {
+		setTimeout(() => {
+			if (newMode && !prevMode && input.value) {
+				if (props.defaultText === props.modelValue) {
+					input.value.select();
 				}
-			}, 100);
-		},
+				input.value.focus();
+			}
+		}, 100);
 	},
-});
+);
+
+const onDoubleClick = () => {
+	if (!props.readOnly) $emit('edit', true);
+};
+
+const onInputBlur = () => {
+	if (!isResizing.value) $emit('edit', false);
+};
+
+const onUpdateModelValue = (value: string) => {
+	$emit('update:modelValue', value);
+};
+
+const onMarkdownClick = (link: string, event: Event) => {
+	$emit('markdown-click', link, event);
+};
+
+const onResize = (values: ResizeData) => {
+	$emit('resize', values);
+};
+
+const onResizeStart = () => {
+	isResizing.value = true;
+	$emit('resizestart');
+};
+
+const onResizeEnd = (resizeEnd: unknown) => {
+	isResizing.value = false;
+	$emit('resizeend', resizeEnd);
+};
+
+const onInputScroll = (event: WheelEvent) => {
+	// Pass through zoom events but hold regular scrolling
+	if (!event.ctrlKey && !event.metaKey) {
+		event.stopPropagation();
+	}
+};
 </script>
 
 <style lang="scss" module>
 .sticky {
 	position: absolute;
-	background-color: var(--color-sticky-default-background);
-	border: 1px solid var(--color-sticky-default-border);
 	border-radius: var(--border-radius-base);
+
+	background-color: var(--color-sticky-background);
+	border: 1px solid var(--color-sticky-border);
+
+	.wrapper::after {
+		opacity: 0.15;
+		background: linear-gradient(
+			180deg,
+			var(--color-sticky-background) 0.01%,
+			var(--color-sticky-border)
+		);
+	}
 }
 
 .clickable {
@@ -220,12 +209,6 @@ export default defineComponent({
 		left: 0;
 		bottom: 0;
 		position: absolute;
-		background: linear-gradient(
-			180deg,
-			var(--color-sticky-default-background),
-			#fff5d600 0.01%,
-			var(--color-sticky-default-background)
-		);
 		border-radius: var(--border-radius-base);
 	}
 }
@@ -235,6 +218,36 @@ export default defineComponent({
 	display: flex;
 	justify-content: flex-end;
 }
+
+.color-2 {
+	--color-sticky-background: var(--color-sticky-background-2);
+	--color-sticky-border: var(--color-sticky-border-2);
+}
+
+.color-3 {
+	--color-sticky-background: var(--color-sticky-background-3);
+	--color-sticky-border: var(--color-sticky-border-3);
+}
+
+.color-4 {
+	--color-sticky-background: var(--color-sticky-background-4);
+	--color-sticky-border: var(--color-sticky-border-4);
+}
+
+.color-5 {
+	--color-sticky-background: var(--color-sticky-background-5);
+	--color-sticky-border: var(--color-sticky-border-5);
+}
+
+.color-6 {
+	--color-sticky-background: var(--color-sticky-background-6);
+	--color-sticky-border: var(--color-sticky-border-6);
+}
+
+.color-7 {
+	--color-sticky-background: var(--color-sticky-background-7);
+	--color-sticky-border: var(--color-sticky-border-7);
+}
 </style>
 
 <style lang="scss">
diff --git a/packages/design-system/src/components/N8nSticky/index.js b/packages/design-system/src/components/N8nSticky/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nSticky/index.js
rename to packages/design-system/src/components/N8nSticky/index.ts
diff --git a/packages/design-system/src/components/N8nTabs/Tabs.stories.ts b/packages/design-system/src/components/N8nTabs/Tabs.stories.ts
index 2cb7a55e4f128..6b383cc30cde2 100644
--- a/packages/design-system/src/components/N8nTabs/Tabs.stories.ts
+++ b/packages/design-system/src/components/N8nTabs/Tabs.stories.ts
@@ -1,7 +1,7 @@
 import N8nTabs from './Tabs.vue';
 
 import { action } from '@storybook/addon-actions';
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 
 export default {
 	title: 'Atoms/Tabs',
@@ -13,15 +13,16 @@ export default {
 };
 
 const methods = {
-	onInput: action('input'),
+	onUpdateModelValue: action('update:modelValue'),
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nTabs,
 	},
-	template: `<n8n-tabs v-model="val" v-bind="$props" @input="onInput">
+	template: `<n8n-tabs v-model="val" v-bind="args" @update:modelValue="onUpdateModelValue">
 		</n8n-tabs>`,
 	methods,
 	data() {
@@ -35,8 +36,12 @@ export const Example = Template.bind({});
 Example.args = {
 	options: [
 		{
-			label: 'Test',
-			value: 'test',
+			label: 'First',
+			value: 'first',
+		},
+		{
+			label: 'Second',
+			value: 'second',
 		},
 		{
 			label: 'Github',
diff --git a/packages/design-system/src/components/N8nTabs/Tabs.vue b/packages/design-system/src/components/N8nTabs/Tabs.vue
index 8ce5387be8da8..7c5ba0cfb5d5a 100644
--- a/packages/design-system/src/components/N8nTabs/Tabs.vue
+++ b/packages/design-system/src/components/N8nTabs/Tabs.vue
@@ -1,21 +1,21 @@
 <template>
 	<div :class="['n8n-tabs', $style.container]">
-		<div :class="$style.back" v-if="scrollPosition > 0" @click="scrollLeft">
-			<n8n-icon icon="chevron-left" size="small" />
+		<div v-if="scrollPosition > 0" :class="$style.back" @click="scrollLeft">
+			<N8nIcon icon="chevron-left" size="small" />
 		</div>
-		<div :class="$style.next" v-if="canScrollRight" @click="scrollRight">
-			<n8n-icon icon="chevron-right" size="small" />
+		<div v-if="canScrollRight" :class="$style.next" @click="scrollRight">
+			<N8nIcon icon="chevron-right" size="small" />
 		</div>
 		<div ref="tabs" :class="$style.tabs">
 			<div
 				v-for="option in options"
-				:key="option.value"
 				:id="option.value"
+				:key="option.value"
 				:class="{ [$style.alignRight]: option.align === 'right' }"
 			>
 				<n8n-tooltip :disabled="!option.tooltip" placement="bottom">
 					<template #content>
-						<div v-html="option.tooltip" @click="handleTooltipClick(option.value, $event)" />
+						<div @click="handleTooltipClick(option.value, $event)" v-html="option.tooltip" />
 					</template>
 					<a
 						v-if="option.href"
@@ -27,17 +27,18 @@
 						<div>
 							{{ option.label }}
 							<span :class="$style.external"
-								><n8n-icon icon="external-link-alt" size="small"
+								><N8nIcon icon="external-link-alt" size="small"
 							/></span>
 						</div>
 					</a>
 
 					<div
 						v-else
-						:class="{ [$style.tab]: true, [$style.activeTab]: value === option.value }"
+						:class="{ [$style.tab]: true, [$style.activeTab]: modelValue === option.value }"
+						:data-test-id="`tab-${option.value}`"
 						@click="() => handleTabClick(option.value)"
 					>
-						<n8n-icon v-if="option.icon" :icon="option.icon" size="medium" />
+						<N8nIcon v-if="option.icon" :icon="option.icon" size="medium" />
 						<span v-if="option.label">{{ option.label }}</span>
 					</div>
 				</n8n-tooltip>
@@ -46,12 +47,11 @@
 	</div>
 </template>
 
-<script lang="ts">
-import type { PropType } from 'vue';
-import { defineComponent } from 'vue';
+<script lang="ts" setup>
+import { onMounted, onUnmounted, ref } from 'vue';
 import N8nIcon from '../N8nIcon';
 
-export interface N8nTabOptions {
+interface TabOptions {
 	value: string;
 	label?: string;
 	icon?: string;
@@ -60,82 +60,63 @@ export interface N8nTabOptions {
 	align?: 'left' | 'right';
 }
 
-export default defineComponent({
-	name: 'N8nTabs',
-	components: {
-		N8nIcon,
-	},
-	mounted() {
-		const container = this.$refs.tabs as HTMLDivElement | undefined;
-		if (container) {
-			container.addEventListener('scroll', (event: Event) => {
-				const width = container.clientWidth;
-				const scrollWidth = container.scrollWidth;
-				this.scrollPosition = (event.target as Element).scrollLeft;
-
-				this.canScrollRight = scrollWidth - width > this.scrollPosition;
-			});
-
-			this.resizeObserver = new ResizeObserver(() => {
-				const width = container.clientWidth;
-				const scrollWidth = container.scrollWidth;
-				this.canScrollRight = scrollWidth - width > this.scrollPosition;
-			});
-			this.resizeObserver.observe(container);
+interface TabsProps {
+	modelValue?: string;
+	options?: TabOptions[];
+}
+
+withDefaults(defineProps<TabsProps>(), {
+	options: () => [],
+});
 
+const scrollPosition = ref(0);
+const canScrollRight = ref(false);
+const tabs = ref<Element | undefined>(undefined);
+let resizeObserver: ResizeObserver | null = null;
+
+onMounted(() => {
+	const container = tabs.value as Element;
+	if (container) {
+		container.addEventListener('scroll', (event: Event) => {
 			const width = container.clientWidth;
 			const scrollWidth = container.scrollWidth;
-			this.canScrollRight = scrollWidth - width > this.scrollPosition;
-		}
-	},
-	destroyed() {
-		if (this.resizeObserver) {
-			this.resizeObserver.disconnect();
-		}
-	},
-	data() {
-		return {
-			scrollPosition: 0,
-			canScrollRight: false,
-			resizeObserver: null as ResizeObserver | null,
-		};
-	},
-	props: {
-		value: {},
-		options: {
-			type: Array as PropType<N8nTabOptions[]>,
-			default: (): N8nTabOptions[] => [],
-		},
-	},
-	methods: {
-		handleTooltipClick(tab: string, event: MouseEvent) {
-			this.$emit('tooltipClick', tab, event);
-		},
-		handleTabClick(tab: string) {
-			this.$emit('input', tab);
-		},
-		scrollLeft() {
-			this.scroll(-50);
-		},
-		scrollRight() {
-			this.scroll(50);
-		},
-		scroll(left: number) {
-			const container = this.$refs.tabs as
-				| (HTMLDivElement & { scrollBy: ScrollByFunction })
-				| undefined;
-			if (container) {
-				container.scrollBy({ left, top: 0, behavior: 'smooth' });
-			}
-		},
-	},
+			scrollPosition.value = (event.target as Element).scrollLeft;
+			canScrollRight.value = scrollWidth - width > scrollPosition.value;
+		});
+
+		resizeObserver = new ResizeObserver(() => {
+			const width = container.clientWidth;
+			const scrollWidth = container.scrollWidth;
+			canScrollRight.value = scrollWidth - width > scrollPosition.value;
+		});
+		resizeObserver.observe(container);
+
+		const width = container.clientWidth;
+		const scrollWidth = container.scrollWidth;
+		canScrollRight.value = scrollWidth - width > scrollPosition.value;
+	}
 });
 
-type ScrollByFunction = (arg: {
-	left: number;
-	top: number;
-	behavior: 'smooth' | 'instant' | 'auto';
-}) => void;
+onUnmounted(() => {
+	resizeObserver?.disconnect();
+});
+
+const $emit = defineEmits<{
+	(event: 'tooltipClick', tab: string, e: MouseEvent): void;
+	(event: 'update:modelValue', tab: string);
+}>();
+
+const handleTooltipClick = (tab: string, event: MouseEvent) => $emit('tooltipClick', tab, event);
+const handleTabClick = (tab: string) => $emit('update:modelValue', tab);
+
+const scroll = (left: number) => {
+	const container = tabs.value;
+	if (container) {
+		container.scrollBy({ left, top: 0, behavior: 'smooth' });
+	}
+};
+const scrollLeft = () => scroll(-50);
+const scrollRight = () => scroll(50);
 </script>
 
 <style lang="scss" module>
diff --git a/packages/design-system/src/components/N8nTag/Tag.stories.ts b/packages/design-system/src/components/N8nTag/Tag.stories.ts
index 3ce2fe65a8596..c2f25a408985c 100644
--- a/packages/design-system/src/components/N8nTag/Tag.stories.ts
+++ b/packages/design-system/src/components/N8nTag/Tag.stories.ts
@@ -1,4 +1,4 @@
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 import N8nTag from './Tag.vue';
 
 export default {
@@ -14,11 +14,12 @@ export default {
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nTag,
 	},
-	template: '<n8n-tag v-bind="$props"></n8n-tag>',
+	template: '<n8n-tag v-bind="args"></n8n-tag>',
 });
 
 export const Tag = Template.bind({});
diff --git a/packages/design-system/src/components/N8nTag/Tag.vue b/packages/design-system/src/components/N8nTag/Tag.vue
index af18212c7c568..ba95e2095362c 100644
--- a/packages/design-system/src/components/N8nTag/Tag.vue
+++ b/packages/design-system/src/components/N8nTag/Tag.vue
@@ -1,20 +1,15 @@
 <template>
-	<span :class="['n8n-tag', $style.tag]" v-on="$listeners">
+	<span :class="['n8n-tag', $style.tag]" v-bind="$attrs">
 		{{ text }}
 	</span>
 </template>
 
-<script lang="ts">
-import { defineComponent } from 'vue';
-
-export default defineComponent({
-	name: 'n8n-tag',
-	props: {
-		text: {
-			type: String,
-		},
-	},
-});
+<script lang="ts" setup>
+interface TagProps {
+	text: string;
+}
+defineOptions({ name: 'N8nTag' });
+defineProps<TagProps>();
 </script>
 
 <style lang="scss" module>
@@ -29,11 +24,7 @@ export default defineComponent({
 	transition: background-color 0.3s ease;
 
 	&:hover {
-		background-color: hsl(
-			var(--color-background-base-h),
-			var(--color-background-base-s),
-			calc(var(--color-background-base-l) - 4%)
-		);
+		background-color: var(--color-background-medium);
 	}
 }
 </style>
diff --git a/packages/design-system/src/components/N8nTags/Tags.stories.ts b/packages/design-system/src/components/N8nTags/Tags.stories.ts
index a4d751cf45bd5..89590c75abaed 100644
--- a/packages/design-system/src/components/N8nTags/Tags.stories.ts
+++ b/packages/design-system/src/components/N8nTags/Tags.stories.ts
@@ -1,4 +1,4 @@
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 import N8nTags from './Tags.vue';
 
 export default {
@@ -8,11 +8,12 @@ export default {
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nTags,
 	},
-	template: '<n8n-tags v-bind="$props"></n8n-tags>',
+	template: '<n8n-tags v-bind="args"></n8n-tags>',
 });
 
 export const Tags = Template.bind({});
diff --git a/packages/design-system/src/components/N8nTags/Tags.vue b/packages/design-system/src/components/N8nTags/Tags.vue
index 40e668f3aebba..e6861ec1ce088 100644
--- a/packages/design-system/src/components/N8nTags/Tags.vue
+++ b/packages/design-system/src/components/N8nTags/Tags.vue
@@ -1,80 +1,67 @@
 <template>
 	<div :class="['n8n-tags', $style.tags]">
-		<n8n-tag
+		<N8nTag
 			v-for="tag in visibleTags"
 			:key="tag.id"
 			:text="tag.name"
-			@click="$emit('click', tag.id, $event)"
+			@click="$emit('click:tag', tag.id, $event)"
 		/>
-		<n8n-link
+		<N8nLink
 			v-if="truncate && !showAll && hiddenTagsLength > 0"
 			theme="text"
 			underline
 			size="small"
 			@click.stop.prevent="onExpand"
 		>
-			{{ t('tags.showMore', `${hiddenTagsLength}`) }}
-		</n8n-link>
+			{{ t('tags.showMore', [`${hiddenTagsLength}`]) }}
+		</N8nLink>
 	</div>
 </template>
 
-<script lang="ts">
+<script lang="ts" setup>
+import { computed, ref } from 'vue';
 import N8nTag from '../N8nTag';
 import N8nLink from '../N8nLink';
-import Locale from '../../mixins/locale';
-import type { PropType } from 'vue';
-import { defineComponent } from 'vue';
+import { useI18n } from '../../composables/useI18n';
 
 export interface ITag {
 	id: string;
 	name: string;
 }
 
-export default defineComponent({
-	name: 'n8n-tags',
-	mixins: [Locale],
-	components: {
-		N8nTag,
-		N8nLink,
-	},
-	data() {
-		return {
-			showAll: false,
-		};
-	},
-	props: {
-		tags: {
-			type: Array as PropType<ITag[]>,
-			default: () => [],
-		},
-		truncate: {
-			type: Boolean,
-			default: false,
-		},
-		truncateAt: {
-			type: Number,
-			default: 3,
-		},
-	},
-	computed: {
-		visibleTags(): ITag[] {
-			if (this.truncate && !this.showAll && this.tags.length > this.truncateAt) {
-				return this.tags.slice(0, this.truncateAt);
-			}
+interface TagsProp {
+	tags?: ITag[];
+	truncate?: boolean;
+	truncateAt?: number;
+}
 
-			return this.tags;
-		},
-		hiddenTagsLength(): number {
-			return this.tags.length - this.truncateAt;
-		},
-	},
-	methods: {
-		onExpand() {
-			this.showAll = true;
-			this.$emit('expand', true);
-		},
-	},
+defineOptions({ name: 'N8nTags' });
+const props = withDefaults(defineProps<TagsProp>(), {
+	tags: () => [],
+	truncate: false,
+	truncateAt: 3,
 });
+
+const $emit = defineEmits(['expand', 'click:tag']);
+
+const { t } = useI18n();
+
+const showAll = ref(false);
+
+const visibleTags = computed((): ITag[] => {
+	const { tags, truncate, truncateAt } = props;
+	if (truncate && !showAll.value && tags.length > truncateAt) {
+		return tags.slice(0, truncateAt);
+	}
+	return tags;
+});
+
+const hiddenTagsLength = computed((): number => props.tags.length - props.truncateAt);
+
+const onExpand = () => {
+	showAll.value = true;
+	$emit('expand', true);
+};
 </script>
 
 <style lang="scss" module>
diff --git a/packages/design-system/src/components/N8nText/Text.stories.ts b/packages/design-system/src/components/N8nText/Text.stories.ts
index dd0313f3b1bc8..50577dfba409a 100644
--- a/packages/design-system/src/components/N8nText/Text.stories.ts
+++ b/packages/design-system/src/components/N8nText/Text.stories.ts
@@ -1,4 +1,4 @@
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 import N8nText from './Text.vue';
 
 export default {
@@ -8,32 +8,33 @@ export default {
 		size: {
 			control: {
 				type: 'select',
-				options: ['xsmall', 'small', 'medium', 'large'],
 			},
+			options: ['xsmall', 'small', 'medium', 'large'],
 		},
 		color: {
 			control: {
 				type: 'select',
-				options: [
-					'primary',
-					'text-dark',
-					'text-base',
-					'text-light',
-					'text-xlight',
-					'danger',
-					'success',
-				],
 			},
+			options: [
+				'primary',
+				'text-dark',
+				'text-base',
+				'text-light',
+				'text-xlight',
+				'danger',
+				'success',
+			],
 		},
 	},
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nText,
 	},
-	template: '<n8n-text v-bind="$props">hello world</n8n-text>',
+	template: '<n8n-text v-bind="args">hello world</n8n-text>',
 });
 
 export const Text = Template.bind({});
diff --git a/packages/design-system/src/components/N8nText/Text.vue b/packages/design-system/src/components/N8nText/Text.vue
index 284c3e92b04cf..65fcdc95cf2b1 100644
--- a/packages/design-system/src/components/N8nText/Text.vue
+++ b/packages/design-system/src/components/N8nText/Text.vue
@@ -1,74 +1,48 @@
 <template>
-	<component :is="tag" :class="['n8n-text', ...classes]" v-on="$listeners">
+	<component :is="tag" :class="['n8n-text', ...classes]" v-bind="$attrs">
 		<slot></slot>
 	</component>
 </template>
 
-<script lang="ts">
-import { defineComponent } from 'vue';
-export default defineComponent({
-	name: 'n8n-text',
-	props: {
-		bold: {
-			type: Boolean,
-			default: false,
-		},
-		size: {
-			type: String,
-			default: 'medium',
-			validator: (value: string): boolean =>
-				['xsmall', 'small', 'mini', 'medium', 'large', 'xlarge'].includes(value),
-		},
-		color: {
-			type: String,
-			validator: (value: string): boolean =>
-				[
-					'primary',
-					'text-dark',
-					'text-base',
-					'text-light',
-					'text-xlight',
-					'danger',
-					'success',
-					'warning',
-				].includes(value),
-		},
-		align: {
-			type: String,
-			validator: (value: string): boolean => ['right', 'left', 'center'].includes(value),
-		},
-		compact: {
-			type: Boolean,
-			default: false,
-		},
-		tag: {
-			type: String,
-			default: 'span',
-		},
-	},
-	computed: {
-		classes() {
-			const applied = [];
-			if (this.align) {
-				// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-				applied.push(`align-${this.align}`);
-			}
-			if (this.color) {
-				applied.push(this.color);
-			}
-
-			if (this.compact) {
-				applied.push('compact');
-			}
-
-			// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-			applied.push(`size-${this.size}`);
-
-			applied.push(this.bold ? 'bold' : 'regular');
-
-			return applied.map((c) => this.$style[c]);
-		},
-	},
+<script lang="ts" setup>
+import { computed, useCssModule } from 'vue';
+import type { TextSize, TextColor, TextAlign } from '@/types/text';
+
+interface TextProps {
+	bold?: boolean;
+	size?: TextSize;
+	color?: TextColor;
+	align?: TextAlign;
+	compact?: boolean;
+	tag?: string;
+}
+
+defineOptions({ name: 'N8nText' });
+const props = withDefaults(defineProps<TextProps>(), {
+	bold: false,
+	size: 'medium',
+	compact: false,
+	tag: 'span',
+});
+
+const $style = useCssModule();
+const classes = computed(() => {
+	const applied: string[] = [];
+	if (props.align) {
+		applied.push(`align-${props.align}`);
+	}
+	if (props.color) {
+		applied.push(props.color);
+	}
+
+	if (props.compact) {
+		applied.push('compact');
+	}
+
+	applied.push(`size-${props.size}`);
+	applied.push(props.bold ? 'bold' : 'regular');
+
+	return applied.map((c) => $style[c]);
 });
 </script>
 
@@ -131,7 +105,7 @@ export default defineComponent({
 }
 
 .danger {
-	color: var(--color-danger);
+	color: var(--color-text-danger);
 }
 
 .success {
diff --git a/packages/design-system/src/components/N8nTooltip/Tooltip.stories.ts b/packages/design-system/src/components/N8nTooltip/Tooltip.stories.ts
index 337d50ebb1e36..191d9e4135d12 100644
--- a/packages/design-system/src/components/N8nTooltip/Tooltip.stories.ts
+++ b/packages/design-system/src/components/N8nTooltip/Tooltip.stories.ts
@@ -1,4 +1,4 @@
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 import N8nTooltip from './Tooltip.vue';
 
 export default {
@@ -36,15 +36,40 @@ export default {
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nTooltip,
 	},
-	template:
-		'<n8n-tooltip v-bind="$props"><div style="margin:50px; display: inline-block;"><span>yo</span></div></n8n-tooltip>',
+	template: '<n8n-tooltip v-bind="args"><button>Hover me</button></n8n-tooltip>',
 });
 
 export const Tooltip = Template.bind({});
 Tooltip.args = {
 	content: '...',
 };
+
+export const TooltipWithButtons = Template.bind({});
+TooltipWithButtons.args = {
+	content: 'Hello world!',
+	buttons: [
+		{
+			attrs: {
+				label: 'Button 1',
+				'data-test-id': 'tooltip-button',
+			},
+			listeners: {
+				onClick: () => alert('Clicked 1'),
+			},
+		},
+		{
+			attrs: {
+				label: 'Button 2',
+				'data-test-id': 'tooltip-button',
+			},
+			listeners: {
+				onClick: () => alert('Clicked 2'),
+			},
+		},
+	],
+};
diff --git a/packages/design-system/src/components/N8nTooltip/Tooltip.vue b/packages/design-system/src/components/N8nTooltip/Tooltip.vue
index f9bb068ebdc1c..fa280f4d9f2b6 100644
--- a/packages/design-system/src/components/N8nTooltip/Tooltip.vue
+++ b/packages/design-system/src/components/N8nTooltip/Tooltip.vue
@@ -1,39 +1,45 @@
 <template>
-	<el-tooltip v-bind="$attrs">
-		<template v-for="(_, slotName) in $slots" #[slotName]>
-			<slot :name="slotName" />
+	<ElTooltip v-bind="{ ...$props, ...$attrs }" :popper-class="$props.popperClass ?? 'n8n-tooltip'">
+		<slot />
+		<template #content>
+			<slot name="content">
+				<div v-html="content"></div>
+			</slot>
 			<div
-				:key="slotName"
-				v-if="slotName === 'content' && buttons.length"
+				v-if="buttons.length"
 				:class="$style.buttons"
 				:style="{ justifyContent: justifyButtons }"
 			>
-				<n8n-button
+				<N8nButton
 					v-for="button in buttons"
 					:key="button.attrs.label"
-					v-bind="button.attrs"
-					v-on="button.listeners"
+					v-bind="{ ...button.attrs, ...button.listeners }"
 				/>
 			</div>
 		</template>
-	</el-tooltip>
+	</ElTooltip>
 </template>
 
 <script lang="ts">
 import type { PropType } from 'vue';
 import { defineComponent } from 'vue';
-import { Tooltip as ElTooltip } from 'element-ui';
+import { ElTooltip } from 'element-plus';
 import type { IN8nButton } from '@/types';
 import N8nButton from '../N8nButton';
 
 export default defineComponent({
-	name: 'n8n-tooltip',
-	inheritAttrs: false,
+	name: 'N8nTooltip',
 	components: {
 		ElTooltip,
 		N8nButton,
 	},
+	inheritAttrs: false,
 	props: {
+		...ElTooltip.props,
+		content: {
+			type: String,
+			default: '',
+		},
 		justifyButtons: {
 			type: String,
 			default: 'flex-end',
@@ -64,5 +70,6 @@ export default defineComponent({
 	display: flex;
 	align-items: center;
 	margin-top: var(--spacing-s);
+	gap: var(--spacing-2xs);
 }
 </style>
diff --git a/packages/design-system/src/components/N8nTooltip/__tests__/Tooltip.spec.ts b/packages/design-system/src/components/N8nTooltip/__tests__/Tooltip.spec.ts
new file mode 100644
index 0000000000000..abcd416f36de1
--- /dev/null
+++ b/packages/design-system/src/components/N8nTooltip/__tests__/Tooltip.spec.ts
@@ -0,0 +1,39 @@
+import { render } from '@testing-library/vue';
+import userEvent from '@testing-library/user-event';
+import N8nTooltip from '../Tooltip.vue';
+
+describe('components', () => {
+	describe('N8nTooltip', () => {
+		it('should work correctly', async () => {
+			const buttonSpy = vi.fn();
+
+			const { getByText } = render(N8nTooltip, {
+				props: {
+					teleported: false,
+					buttons: [
+						{
+							attrs: {
+								label: 'Button 1',
+							},
+							listeners: {
+								onClick: buttonSpy,
+							},
+						},
+					],
+				},
+				slots: {
+					default: '<span>Wrapped content</span>',
+					content: '<span>Tooltip content</span>',
+				},
+			});
+			expect(getByText('Wrapped content')).toBeVisible();
+			expect(getByText('Tooltip content')).not.toBeVisible();
+
+			await userEvent.hover(getByText('Wrapped content'));
+			expect(getByText('Tooltip content')).toBeVisible();
+
+			await userEvent.click(getByText('Button 1'));
+			expect(buttonSpy).toHaveBeenCalled();
+		});
+	});
+});
diff --git a/packages/design-system/src/components/N8nTree/Tree.stories.ts b/packages/design-system/src/components/N8nTree/Tree.stories.ts
index c2eb7a1473b0d..d8f98dc903d42 100644
--- a/packages/design-system/src/components/N8nTree/Tree.stories.ts
+++ b/packages/design-system/src/components/N8nTree/Tree.stories.ts
@@ -1,5 +1,5 @@
 import N8nTree from './Tree.vue';
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 
 export default {
 	title: 'Atoms/Tree',
@@ -7,11 +7,12 @@ export default {
 };
 
 export const Default: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nTree,
 	},
-	template: `<n8n-tree v-bind="$props">
+	template: `<n8n-tree v-bind="args">
 		<template v-slot:label="{ label }">
 			<span>{{ label }}</span>
 		</template>
diff --git a/packages/design-system/src/components/N8nTree/Tree.vue b/packages/design-system/src/components/N8nTree/Tree.vue
index 80a11b6670865..8f524073c0b1e 100644
--- a/packages/design-system/src/components/N8nTree/Tree.vue
+++ b/packages/design-system/src/components/N8nTree/Tree.vue
@@ -1,33 +1,23 @@
 <template>
 	<div class="n8n-tree">
 		<div v-for="(label, i) in Object.keys(value)" :key="i" :class="classes">
-			<div :class="$style.simple" v-if="isSimple(value[label])">
-				<slot
-					v-if="$scopedSlots.label"
-					name="label"
-					v-bind:label="label"
-					v-bind:path="getPath(label)"
-				/>
+			<div v-if="isSimple(value[label])" :class="$style.simple">
+				<slot v-if="$slots.label" name="label" :label="label" :path="getPath(label)" />
 				<span v-else>{{ label }}</span>
 				<span>:</span>
-				<slot v-if="$scopedSlots.value" name="value" v-bind:value="value[label]" />
+				<slot v-if="$slots.value" name="value" :value="value[label]" />
 				<span v-else>{{ value[label] }}</span>
 			</div>
 			<div v-else>
-				<slot
-					v-if="$scopedSlots.label"
-					name="label"
-					v-bind:label="label"
-					v-bind:path="getPath(label)"
-				/>
+				<slot v-if="$slots.label" name="label" :label="label" :path="getPath(label)" />
 				<span v-else>{{ label }}</span>
 				<n8n-tree
 					:path="getPath(label)"
 					:depth="depth + 1"
 					:value="value[label]"
-					:nodeClass="nodeClass"
+					:node-class="nodeClass"
 				>
-					<template v-for="(index, name) in $scopedSlots" #[name]="data">
+					<template v-for="(_, name) in $slots" #[name]="data">
 						<slot :name="name" v-bind="data"></slot>
 					</template>
 				</n8n-tree>
@@ -36,60 +26,51 @@
 	</div>
 </template>
 
-<script lang="ts">
-import type { PropType } from 'vue';
-import { defineComponent } from 'vue';
+<script lang="ts" setup>
+import { computed, useCssModule } from 'vue';
 
-export default defineComponent({
-	name: 'n8n-tree',
-	components: {},
-	props: {
-		value: {
-			type: Object as PropType<Record<string, unknown>>,
-			default: () => ({}),
-		},
-		path: {
-			type: Array as PropType<string[]>,
-			default: () => [],
-		},
-		depth: {
-			type: Number,
-			default: 0,
-		},
-		nodeClass: {
-			type: String,
-			default: '',
-		},
-	},
-	computed: {
-		classes(): Record<string, boolean> {
-			return { [this.nodeClass]: !!this.nodeClass, [this.$style.indent]: this.depth > 0 };
-		},
-	},
-	methods: {
-		isSimple(data: unknown): boolean {
-			if (data === null || data === undefined) {
-				return true;
-			}
-
-			if (typeof data === 'object' && Object.keys(data).length === 0) {
-				return true;
-			}
+interface TreeProps {
+	value?: Record<string, unknown>;
+	path?: string[];
+	depth?: number;
+	nodeClass?: string;
+}
 
-			if (Array.isArray(data) && data.length === 0) {
-				return true;
-			}
+defineOptions({ name: 'N8nTree' });
+const props = withDefaults(defineProps<TreeProps>(), {
+	value: () => ({}),
+	path: () => [],
+	depth: 0,
+	nodeClass: '',
+});
 
-			return typeof data !== 'object';
-		},
-		getPath(key: string): unknown[] {
-			if (Array.isArray(this.value)) {
-				return [...this.path, parseInt(key, 10)];
-			}
-			return [...this.path, key];
-		},
-	},
+const $style = useCssModule();
+const classes = computed((): Record<string, boolean> => {
+	return { [props.nodeClass]: !!props.nodeClass, [$style.indent]: props.depth > 0 };
 });
+
+const isSimple = (data: unknown): boolean => {
+	if (data === null || data === undefined) {
+		return true;
+	}
+
+	if (typeof data === 'object' && Object.keys(data).length === 0) {
+		return true;
+	}
+
+	if (Array.isArray(data) && data.length === 0) {
+		return true;
+	}
+
+	return typeof data !== 'object';
+};
+
+const getPath = (key: string): unknown[] => {
+	if (Array.isArray(props.value)) {
+		return [...props.path, parseInt(key, 10)];
+	}
+	return [...props.path, key];
+};
 </script>
 
 <style lang="scss" module>
diff --git a/packages/design-system/src/components/N8nTree/__tests__/__snapshots__/Tree.spec.ts.snap b/packages/design-system/src/components/N8nTree/__tests__/__snapshots__/Tree.spec.ts.snap
index e74a67282d28c..96acff732738a 100644
--- a/packages/design-system/src/components/N8nTree/__tests__/__snapshots__/Tree.spec.ts.snap
+++ b/packages/design-system/src/components/N8nTree/__tests__/__snapshots__/Tree.spec.ts.snap
@@ -1,24 +1,24 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`components > N8nTree > should render each tree with node class 1`] = `
-"<div class=\\"n8n-tree\\">
-  <div class=\\"nodeClass\\">
+"<div class="n8n-tree">
+  <div class="nodeClass">
     <div><span>hello</span>
-      <div class=\\"n8n-tree\\">
-        <div class=\\"nodeClass indent\\">
-          <div class=\\"simple\\"><span>test</span><span>:</span><span>world</span></div>
+      <div class="n8n-tree">
+        <div class="nodeClass indent">
+          <div class="simple"><span>test</span><span>:</span><span>world</span></div>
         </div>
       </div>
     </div>
   </div>
-  <div class=\\"nodeClass\\">
+  <div class="nodeClass">
     <div><span>options</span>
-      <div class=\\"n8n-tree\\">
-        <div class=\\"nodeClass indent\\">
-          <div class=\\"simple\\"><span>0</span><span>:</span><span>yes</span></div>
+      <div class="n8n-tree">
+        <div class="nodeClass indent">
+          <div class="simple"><span>0</span><span>:</span><span>yes</span></div>
         </div>
-        <div class=\\"nodeClass indent\\">
-          <div class=\\"simple\\"><span>1</span><span>:</span><span>no</span></div>
+        <div class="nodeClass indent">
+          <div class="simple"><span>1</span><span>:</span><span>no</span></div>
         </div>
       </div>
     </div>
@@ -27,32 +27,32 @@ exports[`components > N8nTree > should render each tree with node class 1`] = `
 `;
 
 exports[`components > N8nTree > should render simple tree 1`] = `
-"<div class=\\"n8n-tree\\">
-  <div class=\\"\\">
-    <div class=\\"simple\\"><span>hello</span><span>:</span><span>world</span></div>
+"<div class="n8n-tree">
+  <div class="">
+    <div class="simple"><span>hello</span><span>:</span><span>world</span></div>
   </div>
 </div>"
 `;
 
 exports[`components > N8nTree > should render tree 1`] = `
-"<div class=\\"n8n-tree\\">
-  <div class=\\"\\">
+"<div class="n8n-tree">
+  <div class="">
     <div><span>hello</span>
-      <div class=\\"n8n-tree\\">
-        <div class=\\"indent\\">
-          <div class=\\"simple\\"><span>test</span><span>:</span><span>world</span></div>
+      <div class="n8n-tree">
+        <div class="indent">
+          <div class="simple"><span>test</span><span>:</span><span>world</span></div>
         </div>
       </div>
     </div>
   </div>
-  <div class=\\"\\">
+  <div class="">
     <div><span>options</span>
-      <div class=\\"n8n-tree\\">
-        <div class=\\"indent\\">
-          <div class=\\"simple\\"><span>0</span><span>:</span><span>yes</span></div>
+      <div class="n8n-tree">
+        <div class="indent">
+          <div class="simple"><span>0</span><span>:</span><span>yes</span></div>
         </div>
-        <div class=\\"indent\\">
-          <div class=\\"simple\\"><span>1</span><span>:</span><span>no</span></div>
+        <div class="indent">
+          <div class="simple"><span>1</span><span>:</span><span>no</span></div>
         </div>
       </div>
     </div>
@@ -61,24 +61,24 @@ exports[`components > N8nTree > should render tree 1`] = `
 `;
 
 exports[`components > N8nTree > should render tree with slots 1`] = `
-"<div class=\\"n8n-tree\\">
-  <div class=\\"\\">
+"<div class="n8n-tree">
+  <div class="">
     <div><span>label</span>
-      <div class=\\"n8n-tree\\">
-        <div class=\\"indent\\">
-          <div class=\\"simple\\"><span>label</span><span>:</span><span>value</span></div>
+      <div class="n8n-tree">
+        <div class="indent">
+          <div class="simple"><span>label</span><span>:</span><span>value</span></div>
         </div>
       </div>
     </div>
   </div>
-  <div class=\\"\\">
+  <div class="">
     <div><span>label</span>
-      <div class=\\"n8n-tree\\">
-        <div class=\\"indent\\">
-          <div class=\\"simple\\"><span>label</span><span>:</span><span>value</span></div>
+      <div class="n8n-tree">
+        <div class="indent">
+          <div class="simple"><span>label</span><span>:</span><span>value</span></div>
         </div>
-        <div class=\\"indent\\">
-          <div class=\\"simple\\"><span>label</span><span>:</span><span>value</span></div>
+        <div class="indent">
+          <div class="simple"><span>label</span><span>:</span><span>value</span></div>
         </div>
       </div>
     </div>
diff --git a/packages/design-system/src/components/N8nUserInfo/UserInfo.stories.ts b/packages/design-system/src/components/N8nUserInfo/UserInfo.stories.ts
index 29247db8f0a37..2a8c5d7a9442f 100644
--- a/packages/design-system/src/components/N8nUserInfo/UserInfo.stories.ts
+++ b/packages/design-system/src/components/N8nUserInfo/UserInfo.stories.ts
@@ -1,4 +1,4 @@
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 import N8nUserInfo from './UserInfo.vue';
 
 export default {
@@ -10,11 +10,12 @@ export default {
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nUserInfo,
 	},
-	template: '<n8n-user-info v-bind="$props" />',
+	template: '<n8n-user-info v-bind="args" />',
 });
 
 export const Member = Template.bind({});
diff --git a/packages/design-system/src/components/N8nUserInfo/UserInfo.vue b/packages/design-system/src/components/N8nUserInfo/UserInfo.vue
index 248507b052aec..44d9a62c029a3 100644
--- a/packages/design-system/src/components/N8nUserInfo/UserInfo.vue
+++ b/packages/design-system/src/components/N8nUserInfo/UserInfo.vue
@@ -1,86 +1,62 @@
 <template>
-	<div class="ph-no-capture" :class="classes">
+	<div :class="classes">
 		<div :class="$style.avatarContainer">
-			<n8n-avatar :firstName="firstName" :lastName="lastName" />
+			<N8nAvatar :first-name="firstName" :last-name="lastName" />
 		</div>
 
 		<div v-if="isPendingUser" :class="$style.pendingUser">
-			<n8n-text :bold="true">{{ email }}</n8n-text>
-			<span :class="$style.pendingBadge"><n8n-badge :bold="true">Pending</n8n-badge></span>
+			<N8nText :bold="true">{{ email }}</N8nText>
+			<span :class="$style.pendingBadge"><N8nBadge :bold="true">Pending</N8nBadge></span>
 		</div>
 		<div v-else :class="$style.infoContainer">
 			<div>
-				<n8n-text :bold="true" color="text-dark">
+				<N8nText :bold="true" color="text-dark">
 					{{ firstName }} {{ lastName }}
 					{{ isCurrentUser ? t('nds.userInfo.you') : '' }}
-				</n8n-text>
+				</N8nText>
 				<span v-if="disabled" :class="$style.pendingBadge">
-					<n8n-badge :bold="true">Disabled</n8n-badge>
+					<N8nBadge :bold="true">Disabled</N8nBadge>
 				</span>
 			</div>
 			<div>
-				<n8n-text size="small" color="text-light">{{ email }}</n8n-text>
-			</div>
-			<div v-if="!isOwner">
-				<n8n-text v-if="signInType" size="small" color="text-light">
-					Sign-in type: {{ signInType }}
-				</n8n-text>
+				<N8nText data-test-id="user-email" size="small" color="text-light">{{ email }}</N8nText>
 			</div>
 		</div>
 	</div>
 </template>
 
-<script lang="ts">
+<script lang="ts" setup>
+import { computed, useCssModule } from 'vue';
 import N8nText from '../N8nText';
 import N8nAvatar from '../N8nAvatar';
 import N8nBadge from '../N8nBadge';
-import Locale from '../../mixins/locale';
-import { defineComponent } from 'vue';
+import { useI18n } from '../../composables/useI18n';
+
+interface UsersInfoProps {
+	firstName?: string;
+	lastName?: string;
+	email?: string;
+	isOwner?: boolean;
+	isPendingUser?: boolean;
+	isCurrentUser?: boolean;
+	disabled?: boolean;
+	settings?: object;
+	isSamlLoginEnabled?: boolean;
+}
 
-export default defineComponent({
-	name: 'n8n-users-info',
-	mixins: [Locale],
-	components: {
-		N8nAvatar,
-		N8nText,
-		N8nBadge,
-	},
-	props: {
-		firstName: {
-			type: String,
-		},
-		lastName: {
-			type: String,
-		},
-		email: {
-			type: String,
-		},
-		isOwner: {
-			type: Boolean,
-		},
-		isPendingUser: {
-			type: Boolean,
-		},
-		isCurrentUser: {
-			type: Boolean,
-		},
-		disabled: {
-			type: Boolean,
-		},
-		signInType: {
-			type: String,
-			required: false,
-		},
-	},
-	computed: {
-		classes(): Record<string, boolean> {
-			return {
-				[this.$style.container]: true,
-				[this.$style.disabled]: this.disabled,
-			};
-		},
-	},
+const props = withDefaults(defineProps<UsersInfoProps>(), {
+	disabled: false,
 });
+
+const { t } = useI18n();
+
+const $style = useCssModule();
+const classes = computed(
+	(): Record<string, boolean> => ({
+		[$style.container]: true,
+		[$style.disabled]: props.disabled,
+	}),
+);
 </script>
 
 <style lang="scss" module>
diff --git a/packages/design-system/src/components/N8nUserSelect/UserSelect.stories.ts b/packages/design-system/src/components/N8nUserSelect/UserSelect.stories.ts
index 209af2648fb60..6bae7d537f769 100644
--- a/packages/design-system/src/components/N8nUserSelect/UserSelect.stories.ts
+++ b/packages/design-system/src/components/N8nUserSelect/UserSelect.stories.ts
@@ -1,6 +1,6 @@
 import N8nUserSelect from './UserSelect.vue';
 import { action } from '@storybook/addon-actions';
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 
 export default {
 	title: 'Modules/UserSelect',
@@ -18,12 +18,13 @@ const methods = {
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nUserSelect,
 	},
 	template:
-		'<n8n-user-select v-bind="$props" v-model="val" @change="onChange" @blur="onBlur" @focus="onFocus" />',
+		'<n8n-user-select v-bind="args" v-model="val" @change="onChange" @blur="onBlur" @focus="onFocus" />',
 	methods,
 	data() {
 		return {
diff --git a/packages/design-system/src/components/N8nUserSelect/UserSelect.vue b/packages/design-system/src/components/N8nUserSelect/UserSelect.vue
index d4c8eec96d34d..313d80283deef 100644
--- a/packages/design-system/src/components/N8nUserSelect/UserSelect.vue
+++ b/packages/design-system/src/components/N8nUserSelect/UserSelect.vue
@@ -1,22 +1,23 @@
 <template>
-	<n8n-select
-		:value="value"
+	<N8nSelect
+		data-test-id="user-select-trigger"
+		v-bind="$attrs"
+		:model-value="modelValue"
 		:filterable="true"
-		:filterMethod="setFilter"
-		:placeholder="placeholder"
+		:filter-method="setFilter"
+		:placeholder="placeholder || t('nds.userSelect.selectUser')"
 		:default-first-option="true"
-		:popper-append-to-body="true"
+		teleported
 		:popper-class="$style.limitPopperWidth"
-		:noDataText="t('nds.userSelect.noMatchingUsers')"
+		:no-data-text="t('nds.userSelect.noMatchingUsers')"
 		:size="size"
-		@change="onChange"
 		@blur="onBlur"
 		@focus="onFocus"
 	>
-		<template #prefix v-if="$slots.prefix">
+		<template v-if="$slots.prefix" #prefix>
 			<slot name="prefix" />
 		</template>
-		<n8n-option
+		<N8nOption
 			v-for="user in sortedUsers"
 			:key="user.id"
 			:value="user.id"
@@ -24,123 +25,88 @@
 			:label="getLabel(user)"
 			:disabled="user.disabled"
 		>
-			<n8n-user-info v-bind="user" :isCurrentUser="currentUserId === user.id" />
-		</n8n-option>
-	</n8n-select>
+			<N8nUserInfo v-bind="user" :is-current-user="currentUserId === user.id" />
+		</N8nOption>
+	</N8nSelect>
 </template>
 
-<script lang="ts">
+<script lang="ts" setup>
+import { computed, ref } from 'vue';
 import N8nUserInfo from '../N8nUserInfo';
 import N8nSelect from '../N8nSelect';
 import N8nOption from '../N8nOption';
-import type { IUser } from '../../types';
-import Locale from '../../mixins/locale';
-import { t } from '../../locale';
-import type { PropType } from 'vue';
-import { defineComponent } from 'vue';
-
-export default defineComponent({
-	name: 'n8n-user-select',
-	mixins: [Locale],
-	components: {
-		N8nUserInfo,
-		N8nSelect,
-		N8nOption,
-	},
-	props: {
-		users: {
-			type: Array as PropType<IUser[]>,
-			default: () => [],
-		},
-		value: {
-			type: String,
-			default: '',
-		},
-		ignoreIds: {
-			type: Array as PropType<string[]>,
-			default: () => [],
-			validator: (ids: string[]) => !ids.find((id) => typeof id !== 'string'),
-		},
-		currentUserId: {
-			type: String,
-			default: '',
-		},
-		placeholder: {
-			type: String,
-			default: () => t('nds.userSelect.selectUser'),
-		},
-		size: {
-			type: String,
-			default: '',
-			validator: (value: string): boolean => ['mini', 'small', 'medium', 'large'].includes(value),
-		},
-	},
-	data() {
-		return {
-			filter: '',
-		};
-	},
-	computed: {
-		filteredUsers(): IUser[] {
-			return this.users.filter((user) => {
-				if (user.isPendingUser || !user.email) {
-					return false;
-				}
-
-				if (this.ignoreIds.includes(user.id)) {
-					return false;
-				}
-
-				if (user.fullName) {
-					const match = user.fullName.toLowerCase().includes(this.filter.toLowerCase());
-					if (match) {
-						return true;
-					}
-				}
-
-				return user.email.includes(this.filter);
-			});
-		},
-		sortedUsers(): IUser[] {
-			return [...this.filteredUsers].sort((a: IUser, b: IUser) => {
-				if (a.lastName && b.lastName && a.lastName !== b.lastName) {
-					return a.lastName > b.lastName ? 1 : -1;
-				}
-				if (a.firstName && b.firstName && a.firstName !== b.firstName) {
-					return a.firstName > b.firstName ? 1 : -1;
-				}
-
-				if (!a.email || !b.email) {
-					throw new Error('Expected all users to have email');
-				}
-
-				return a.email > b.email ? 1 : -1;
-			});
-		},
-	},
-	methods: {
-		setFilter(value: string) {
-			this.filter = value;
-		},
-		onChange(value: string) {
-			this.$emit('input', value);
-		},
-		onBlur() {
-			this.$emit('blur');
-		},
-		onFocus() {
-			this.$emit('focus');
-		},
-		getLabel(user: IUser) {
-			if (!user.fullName) {
-				return user.email;
-			}
+import { useI18n } from '../../composables/useI18n';
+import type { IUser, SelectSize } from '../../types';
+
+interface UserSelectProps {
+	users?: IUser[];
+	modelValue?: string;
+	ignoreIds?: string[];
+	currentUserId?: string;
+	placeholder?: string;
+	size?: Exclude<SelectSize, 'xlarge'>;
+}
 
-			// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-			return `${user.fullName} (${user.email})`;
-		},
-	},
+const props = withDefaults(defineProps<UserSelectProps>(), {
+	users: () => [],
+	modelValue: '',
+	ignoreIds: () => [],
+	currentUserId: '',
 });
+
+const $emit = defineEmits(['blur', 'focus']);
+
+const { t } = useI18n();
+
+const filter = ref('');
+
+const filteredUsers = computed(() =>
+	props.users.filter((user) => {
+		if (user.isPendingUser || !user.email) {
+			return false;
+		}
+
+		if (props.ignoreIds.includes(user.id)) {
+			return false;
+		}
+
+		if (user.fullName) {
+			const match = user.fullName.toLowerCase().includes(filter.value.toLowerCase());
+			if (match) {
+				return true;
+			}
+		}
+
+		return user.email.includes(filter.value);
+	}),
+);
+
+const sortedUsers = computed(() =>
+	[...filteredUsers.value].sort((a: IUser, b: IUser) => {
+		if (a.lastName && b.lastName && a.lastName !== b.lastName) {
+			return a.lastName > b.lastName ? 1 : -1;
+		}
+		if (a.firstName && b.firstName && a.firstName !== b.firstName) {
+			return a.firstName > b.firstName ? 1 : -1;
+		}
+
+		if (!a.email || !b.email) {
+			throw new Error('Expected all users to have email');
+		}
+
+		return a.email > b.email ? 1 : -1;
+	}),
+);
+
+const setFilter = (value: string) => {
+	filter.value = value;
+};
+
+const onBlur = () => $emit('blur');
+const onFocus = () => $emit('focus');
+
+const getLabel = (user: IUser) =>
+	!user.fullName ? user.email : `${user.fullName} (${user.email})`;
 </script>
 
 <style lang="scss" module>
diff --git a/packages/design-system/src/components/N8nUserStack/UserStack.stories.ts b/packages/design-system/src/components/N8nUserStack/UserStack.stories.ts
new file mode 100644
index 0000000000000..b19bbe3e67638
--- /dev/null
+++ b/packages/design-system/src/components/N8nUserStack/UserStack.stories.ts
@@ -0,0 +1,191 @@
+/* eslint-disable @typescript-eslint/naming-convention */
+import type { StoryFn } from '@storybook/vue3';
+import UserStack from './UserStack.vue';
+
+export default {
+	title: 'Modules/UserStack',
+	component: UserStack,
+};
+
+const Template: StoryFn = (args) => ({
+	setup: () => ({ args }),
+	props: args,
+	components: {
+		UserStack,
+	},
+	template: '<n8n-user-stack v-bind="args" />',
+});
+
+export const WithGroups = Template.bind({});
+WithGroups.args = {
+	currentUserEmail: 'sunny@n8n.io',
+	users: {
+		Owners: [
+			{
+				id: '1',
+				firstName: 'Sunny',
+				lastName: 'Side',
+				fullName: 'Sunny Side',
+				email: 'sunny@n8n.io',
+				isDefaultUser: false,
+				isPendingUser: false,
+				isOwner: true,
+				signInType: 'email',
+				disabled: false,
+			},
+			{
+				id: '2',
+				firstName: 'Kobi',
+				lastName: 'Dog',
+				fullName: 'Kobi Dog',
+				email: 'kobi@n8n.io',
+				isDefaultUser: false,
+				isPendingUser: false,
+				isOwner: false,
+				signInType: 'ldap',
+				disabled: true,
+			},
+		],
+		'Other users': [
+			{
+				id: '3',
+				firstName: 'John',
+				lastName: 'Doe',
+				fullName: 'John Doe',
+				email: 'john@n8n.io',
+				isDefaultUser: false,
+				isPendingUser: false,
+				isOwner: false,
+				signInType: 'email',
+				disabled: false,
+			},
+			{
+				id: '4',
+				firstName: 'Jane',
+				lastName: 'Doe',
+				fullName: 'Jane Doe',
+				email: 'jane@n8n.io',
+				isDefaultUser: false,
+				isPendingUser: false,
+				isOwner: false,
+				signInType: 'ldap',
+				disabled: true,
+			},
+			{
+				id: '5',
+				firstName: 'Test',
+				lastName: 'User',
+				fullName: 'Test User',
+				email: 'test@n8n.io',
+				isDefaultUser: false,
+				isPendingUser: true,
+				isOwner: false,
+				signInType: 'email',
+				disabled: false,
+			},
+		],
+		'Empty Group': [],
+	},
+};
+
+export const SingleGroup = Template.bind({});
+SingleGroup.args = {
+	currentUserEmail: 'sunny@n8n.io',
+	users: {
+		Owners: [
+			{
+				id: '1',
+				firstName: 'Sunny',
+				lastName: 'Side',
+				fullName: 'Sunny Side',
+				email: 'sunny@n8n.io',
+				isDefaultUser: false,
+				isPendingUser: false,
+				isOwner: true,
+				signInType: 'email',
+				disabled: false,
+			},
+			{
+				id: '2',
+				firstName: 'Kobi',
+				lastName: 'Dog',
+				fullName: 'Kobi Dog',
+				email: 'kobi@n8n.io',
+				isDefaultUser: false,
+				isPendingUser: false,
+				isOwner: false,
+				signInType: 'ldap',
+				disabled: true,
+			},
+			{
+				id: '4',
+				firstName: 'Jane',
+				lastName: 'Doe',
+				fullName: 'Jane Doe',
+				email: 'jane@n8n.io',
+				isDefaultUser: false,
+				isPendingUser: false,
+				isOwner: false,
+				signInType: 'ldap',
+				disabled: true,
+			},
+			{
+				id: '5',
+				firstName: 'Test',
+				lastName: 'User',
+				fullName: 'Test User',
+				email: 'test@n8n.io',
+				isDefaultUser: false,
+				isPendingUser: true,
+				isOwner: false,
+				signInType: 'email',
+				disabled: false,
+			},
+		],
+	},
+};
+
+export const NoCutoff = Template.bind({});
+NoCutoff.args = {
+	currentUserEmail: 'sunny@n8n.io',
+	users: {
+		Owners: [
+			{
+				id: '1',
+				firstName: 'Sunny',
+				lastName: 'Side',
+				fullName: 'Sunny Side',
+				email: 'sunny@n8n.io',
+				isDefaultUser: false,
+				isPendingUser: false,
+				isOwner: true,
+				signInType: 'email',
+				disabled: false,
+			},
+			{
+				id: '2',
+				firstName: 'Kobi',
+				lastName: 'Dog',
+				fullName: 'Kobi Dog',
+				email: 'kobi@n8n.io',
+				isDefaultUser: false,
+				isPendingUser: false,
+				isOwner: false,
+				signInType: 'ldap',
+				disabled: true,
+			},
+			{
+				id: '3',
+				firstName: 'John',
+				lastName: 'Doe',
+				fullName: 'John Doe',
+				email: 'john@n8n.io',
+				isDefaultUser: false,
+				isPendingUser: false,
+				isOwner: false,
+				signInType: 'email',
+				disabled: false,
+			},
+		],
+	},
+};
diff --git a/packages/design-system/src/components/N8nUserStack/UserStack.vue b/packages/design-system/src/components/N8nUserStack/UserStack.vue
new file mode 100644
index 0000000000000..cffc64173068e
--- /dev/null
+++ b/packages/design-system/src/components/N8nUserStack/UserStack.vue
@@ -0,0 +1,194 @@
+<script lang="ts" setup>
+import type { IUser, UserStackGroups } from '@/types';
+import N8nAvatar from '../N8nAvatar';
+import N8nUserInfo from '../N8nUserInfo';
+import type { PropType } from 'vue';
+import { computed } from 'vue';
+
+const props = defineProps({
+	users: {
+		type: Object as PropType<UserStackGroups>,
+		required: true,
+	},
+	currentUserEmail: {
+		type: String,
+		required: false,
+		default: '',
+	},
+	maxAvatars: {
+		type: Number,
+		default: 2,
+		validator: (value: number) => value > 0,
+	},
+	dropdownTrigger: {
+		type: String,
+		default: 'hover',
+		validator: (value: string) => ['hover', 'click'].includes(value),
+	},
+});
+
+const nonEmptyGroups = computed(() => {
+	const users: UserStackGroups = {};
+
+	for (const groupName in props.users) {
+		if (props.users[groupName].length > 0) {
+			users[groupName] = props.users[groupName];
+		}
+	}
+
+	return users;
+});
+
+const groupCount = computed(() => {
+	return Object.keys(nonEmptyGroups.value).length;
+});
+
+const flatUserList = computed(() => {
+	const users: IUser[] = [];
+
+	for (const groupName in props.users) {
+		users.push(...props.users[groupName]);
+	}
+
+	return users;
+});
+
+const visibleAvatarCount = computed(() => {
+	return flatUserList.value.length >= props.maxAvatars
+		? props.maxAvatars
+		: flatUserList.value.length;
+});
+
+const hiddenUsersCount = computed(() => {
+	return flatUserList.value.length - visibleAvatarCount.value;
+});
+
+const menuHeight = computed(() => {
+	return groupCount.value > 1 ? 220 : 190;
+});
+</script>
+
+<template>
+	<div class="user-stack" data-test-id="user-stack-container">
+		<el-dropdown
+			:trigger="$props.dropdownTrigger"
+			:max-height="menuHeight"
+			popper-class="user-stack-popper"
+		>
+			<div :class="$style.avatars" data-test-id="user-stack-avatars">
+				<N8nAvatar
+					v-for="user in flatUserList.slice(0, visibleAvatarCount)"
+					:key="user.id"
+					:first-name="user.firstName"
+					:last-name="user.lastName"
+					:class="$style.avatar"
+					:data-test-id="`user-stack-avatar-${user.id}`"
+					size="small"
+				/>
+				<div v-if="hiddenUsersCount > 0" :class="$style.hiddenBadge">+{{ hiddenUsersCount }}</div>
+			</div>
+			<template #dropdown>
+				<el-dropdown-menu class="user-stack-list" data-test-id="user-stack-list">
+					<div v-for="(groupUsers, index) in nonEmptyGroups" :key="index">
+						<div :class="$style.groupContainer">
+							<el-dropdown-item>
+								<header v-if="groupCount > 1" :class="$style.groupName">{{ index }}</header>
+							</el-dropdown-item>
+							<div :class="$style.groupUsers">
+								<el-dropdown-item
+									v-for="user in groupUsers"
+									:key="user.id"
+									:data-test-id="`user-stack-info-${user.id}`"
+									:class="$style.userInfoContainer"
+								>
+									<N8nUserInfo
+										v-bind="user"
+										:is-current-user="user.email === props.currentUserEmail"
+									/>
+								</el-dropdown-item>
+							</div>
+						</div>
+					</div>
+				</el-dropdown-menu>
+			</template>
+		</el-dropdown>
+	</div>
+</template>
+
+<style lang="scss" module>
+.avatars {
+	display: flex;
+	cursor: pointer;
+}
+.avatar {
+	margin-right: calc(-1 * var(--spacing-3xs));
+	user-select: none;
+}
+.hiddenBadge {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	width: 28px;
+	height: 28px;
+	color: var(--color-text-base);
+	background-color: var(--color-background-xlight);
+	font-weight: var(--font-weight-bold);
+	font-size: var(--font-size-3xs);
+	z-index: 999;
+	border: var(--border-width-base) var(--border-style-base) var(--color-info-tint-1);
+	border-radius: 50%;
+}
+.groupContainer {
+	display: flex;
+	flex-direction: column;
+
+	& + & {
+		margin-top: var(--spacing-3xs);
+	}
+}
+
+.groupName {
+	font-size: var(--font-size-3xs);
+	color: var(--color-text-light);
+	text-transform: uppercase;
+	font-weight: var(--font-weight-bold);
+	margin-bottom: var(--spacing-4xs);
+}
+.groupUsers {
+	display: flex;
+	flex-direction: column;
+	gap: var(--spacing-2xs);
+}
+
+.userInfoContainer {
+	display: flex;
+	padding-top: var(--spacing-5xs);
+	padding-bottom: var(--spacing-5xs);
+}
+</style>
+
+<style lang="scss">
+ul.user-stack-list {
+	border: none;
+	display: flex;
+	flex-direction: column;
+	gap: var(--spacing-s);
+	padding-bottom: var(--spacing-2xs);
+
+	.el-dropdown-menu__item {
+		line-height: var(--font-line-height-regular);
+	}
+
+	li:hover {
+		color: currentColor !important;
+	}
+}
+
+.user-stack-popper {
+	border: 1px solid var(--border-color-light);
+	border-radius: var(--border-radius-base);
+	padding: var(--spacing-5xs) 0;
+	box-shadow: 0px 2px 8px 0px #441c171a;
+	background-color: var(--color-background-xlight);
+}
+</style>
diff --git a/packages/design-system/src/components/N8nUserStack/__tests__/UserStack.spec.ts b/packages/design-system/src/components/N8nUserStack/__tests__/UserStack.spec.ts
new file mode 100644
index 0000000000000..ff3ac1b8973e2
--- /dev/null
+++ b/packages/design-system/src/components/N8nUserStack/__tests__/UserStack.spec.ts
@@ -0,0 +1,118 @@
+import { render } from '@testing-library/vue';
+import UserStack from '../UserStack.vue';
+import { N8nAvatar, N8nUserInfo } from '@/main';
+
+describe('UserStack', () => {
+	it('should render flat user list', () => {
+		const { container } = render(UserStack, {
+			props: {
+				currentUserEmail: 'hello@n8n.io',
+				users: {
+					Owners: [
+						{
+							id: '1',
+							firstName: 'Sunny',
+							lastName: 'Side',
+							fullName: 'Sunny Side',
+							email: 'hello@n8n.io',
+							isDefaultUser: false,
+							isPendingUser: false,
+							isOwner: true,
+							signInType: 'email',
+							disabled: false,
+						},
+						{
+							id: '2',
+							firstName: 'Kobi',
+							lastName: 'Dog',
+							fullName: 'Kobi Dog',
+							email: 'kobi@n8n.io',
+							isDefaultUser: false,
+							isPendingUser: false,
+							isOwner: false,
+							signInType: 'ldap',
+							disabled: true,
+						},
+					],
+				},
+			},
+			global: {
+				components: {
+					'n8n-avatar': N8nAvatar,
+					'n8n-user-info': N8nUserInfo,
+				},
+			},
+		});
+		expect(container.querySelector('.user-stack')).toBeInTheDocument();
+		expect(container.querySelectorAll('svg')).toHaveLength(2);
+	});
+
+	it('should not show all avatars', async () => {
+		const { container } = render(UserStack, {
+			props: {
+				currentUserEmail: 'hello@n8n.io',
+				users: {
+					Owners: [
+						{
+							id: '1',
+							firstName: 'Sunny',
+							lastName: 'Side',
+							fullName: 'Sunny Side',
+							email: 'hello@n8n.io',
+							isDefaultUser: false,
+							isPendingUser: false,
+							isOwner: true,
+							signInType: 'email',
+							disabled: false,
+						},
+						{
+							id: '2',
+							firstName: 'Kobi',
+							lastName: 'Dog',
+							fullName: 'Kobi Dog',
+							email: 'kobi@n8n.io',
+							isDefaultUser: false,
+							isPendingUser: false,
+							isOwner: false,
+							signInType: 'ldap',
+							disabled: true,
+						},
+						{
+							id: '3',
+							firstName: 'John',
+							lastName: 'Doe',
+							fullName: 'John Doe',
+							email: 'john@n8n.io',
+							isDefaultUser: false,
+							isPendingUser: false,
+							isOwner: false,
+							signInType: 'email',
+							disabled: false,
+						},
+						{
+							id: '4',
+							firstName: 'Jane',
+							lastName: 'Doe',
+							fullName: 'Jane Doe',
+							email: 'jane@n8n.io',
+							isDefaultUser: false,
+							isPendingUser: false,
+							isOwner: false,
+							signInType: 'ldap',
+							disabled: true,
+						},
+					],
+				},
+			},
+			global: {
+				components: {
+					'n8n-avatar': N8nAvatar,
+					'n8n-user-info': N8nUserInfo,
+				},
+			},
+		});
+		expect(container.querySelector('.user-stack')).toBeInTheDocument();
+		expect(container.querySelectorAll('svg')).toHaveLength(2);
+		expect(container.querySelector('.hiddenBadge')).toHaveTextContent('+2');
+	});
+});
diff --git a/packages/design-system/src/components/N8nUserStack/index.ts b/packages/design-system/src/components/N8nUserStack/index.ts
new file mode 100644
index 0000000000000..8b8266be89afb
--- /dev/null
+++ b/packages/design-system/src/components/N8nUserStack/index.ts
@@ -0,0 +1,3 @@
+import N8nUserStack from './UserStack.vue';
+
+export default N8nUserStack;
diff --git a/packages/design-system/src/components/N8nUsersList/UsersList.stories.ts b/packages/design-system/src/components/N8nUsersList/UsersList.stories.ts
index fb3348e7288d6..69eccc85fe706 100644
--- a/packages/design-system/src/components/N8nUsersList/UsersList.stories.ts
+++ b/packages/design-system/src/components/N8nUsersList/UsersList.stories.ts
@@ -1,6 +1,6 @@
 import N8nUsersList from './UsersList.vue';
 import { action } from '@storybook/addon-actions';
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 import type { IUser } from '@/types';
 
 export default {
@@ -18,12 +18,13 @@ const methods = {
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nUsersList,
 	},
 	template:
-		'<n8n-users-list v-bind="$props" :actions="actions" @reinvite="onReinvite" @delete="onDelete" />',
+		'<n8n-users-list v-bind="args" :actions="actions" @reinvite="onReinvite" @delete="onDelete" />',
 	methods,
 });
 
diff --git a/packages/design-system/src/components/N8nUsersList/UsersList.vue b/packages/design-system/src/components/N8nUsersList/UsersList.vue
index 9ea1075c894fd..961c9ed57073b 100644
--- a/packages/design-system/src/components/N8nUsersList/UsersList.vue
+++ b/packages/design-system/src/components/N8nUsersList/UsersList.vue
@@ -3,17 +3,20 @@
 		<div
 			v-for="(user, i) in sortedUsers"
 			:key="user.id"
-			class="ph-no-capture"
 			:class="i === sortedUsers.length - 1 ? $style.itemContainer : $style.itemWithBorder"
 			:data-test-id="`user-list-item-${user.email}`"
 		>
-			<n8n-user-info v-bind="user" :isCurrentUser="currentUserId === user.id" />
+			<N8nUserInfo
+				v-bind="user"
+				:is-current-user="currentUserId === user.id"
+				:is-saml-login-enabled="isSamlLoginEnabled"
+			/>
 			<div :class="$style.badgeContainer">
-				<n8n-badge v-if="user.isOwner" theme="tertiary" bold>
+				<N8nBadge v-if="user.isOwner" theme="tertiary" bold>
 					{{ t('nds.auth.roles.owner') }}
-				</n8n-badge>
+				</N8nBadge>
 				<slot v-if="!user.isOwner && !readonly" name="actions" :user="user" />
-				<n8n-action-toggle
+				<N8nActionToggle
 					v-if="
 						!user.isOwner &&
 						user.signInType !== 'ldap' &&
@@ -31,97 +34,78 @@
 	</div>
 </template>
 
-<script lang="ts">
-import type { IUser, UserAction } from '../../types';
+<script lang="ts" setup>
+import { computed } from 'vue';
 import N8nActionToggle from '../N8nActionToggle';
 import N8nBadge from '../N8nBadge';
 import N8nUserInfo from '../N8nUserInfo';
-import Locale from '../../mixins/locale';
-import type { PropType } from 'vue';
-import { defineComponent } from 'vue';
-
-export default defineComponent({
-	name: 'n8n-users-list',
-	mixins: [Locale],
-	components: {
-		N8nActionToggle,
-		N8nBadge,
-		N8nUserInfo,
-	},
-	props: {
-		readonly: {
-			type: Boolean,
-			default: false,
-		},
-		users: {
-			type: Array,
-			required: true,
-			default(): IUser[] {
-				return [];
-			},
-		},
-		currentUserId: {
-			type: String,
-		},
-		actions: {
-			type: Array as PropType<UserAction[]>,
-			default: () => [],
-		},
-	},
-	computed: {
-		sortedUsers(): IUser[] {
-			return [...(this.users as IUser[])].sort((a: IUser, b: IUser) => {
-				if (!a.email || !b.email) {
-					throw new Error('Expected all users to have email');
-				}
-
-				// invited users sorted by email
-				if (a.isPendingUser && b.isPendingUser) {
-					return a.email > b.email ? 1 : -1;
-				}
-
-				if (a.isPendingUser) {
-					return -1;
-				}
-				if (b.isPendingUser) {
-					return 1;
-				}
-
-				if (a.isOwner) {
-					return -1;
-				}
-				if (b.isOwner) {
-					return 1;
-				}
-
-				if (a.lastName && b.lastName && a.firstName && b.firstName) {
-					if (a.lastName !== b.lastName) {
-						return a.lastName > b.lastName ? 1 : -1;
-					}
-					if (a.firstName !== b.firstName) {
-						return a.firstName > b.firstName ? 1 : -1;
-					}
-				}
-
-				return a.email > b.email ? 1 : -1;
-			});
-		},
-	},
-	methods: {
-		getActions(user: IUser): UserAction[] {
-			if (user.isOwner) {
-				return [];
-			}
+import type { IUser, UserAction } from '../../types';
+import { useI18n } from '../../composables/useI18n';
 
-			const defaultGuard = () => true;
+interface UsersListProps {
+	users: IUser[];
+	readonly?: boolean;
+	currentUserId?: string;
+	actions?: UserAction[];
+	isSamlLoginEnabled?: boolean;
+}
 
-			return this.actions.filter((action) => (action.guard || defaultGuard)(user));
-		},
-		onUserAction(user: IUser, action: string): void {
-			this.$emit(action, user.id);
-		},
-	},
+const props = withDefaults(defineProps<UsersListProps>(), {
+	readonly: false,
+	users: () => [],
+	actions: () => [],
+	isSamlLoginEnabled: false,
 });
+
+const { t } = useI18n();
+
+const sortedUsers = computed(() =>
+	[...props.users].sort((a: IUser, b: IUser) => {
+		if (!a.email || !b.email) {
+			throw new Error('Expected all users to have email');
+		}
+
+		// invited users sorted by email
+		if (a.isPendingUser && b.isPendingUser) {
+			return a.email > b.email ? 1 : -1;
+		}
+
+		if (a.isPendingUser) {
+			return -1;
+		}
+		if (b.isPendingUser) {
+			return 1;
+		}
+
+		if (a.isOwner) {
+			return -1;
+		}
+		if (b.isOwner) {
+			return 1;
+		}
+
+		if (a.lastName && b.lastName && a.firstName && b.firstName) {
+			if (a.lastName !== b.lastName) {
+				return a.lastName > b.lastName ? 1 : -1;
+			}
+			if (a.firstName !== b.firstName) {
+				return a.firstName > b.firstName ? 1 : -1;
+			}
+		}
+
+		return a.email > b.email ? 1 : -1;
+	}),
+);
+
+const defaultGuard = () => true;
+const getActions = (user: IUser): UserAction[] => {
+	if (user.isOwner) return [];
+
+	return props.actions.filter((action) => (action.guard || defaultGuard)(user));
+};
+
+const $emit = defineEmits(['*']);
+const onUserAction = (user: IUser, action: string) => $emit(action, user.id);
 </script>
 
 <style lang="scss" module>
diff --git a/packages/design-system/src/components/ResizeObserver/ResizeObserver.vue b/packages/design-system/src/components/ResizeObserver/ResizeObserver.vue
index 5de3a5f934984..9f07369f77cfc 100644
--- a/packages/design-system/src/components/ResizeObserver/ResizeObserver.vue
+++ b/packages/design-system/src/components/ResizeObserver/ResizeObserver.vue
@@ -38,40 +38,49 @@ export default defineComponent({
 			return;
 		}
 
-		const unsortedBreakpoints = [...(this.breakpoints || [])] as Array<{
-			width: number;
-			bp: string;
-		}>;
+		const root = this.$refs.root as HTMLDivElement;
 
-		const bps = unsortedBreakpoints.sort((a, b) => a.width - b.width);
+		if (!root) {
+			return;
+		}
+
+		this.bp = this.getBreakpointFromWidth(root.offsetWidth);
 
 		const observer = new ResizeObserver((entries) => {
 			entries.forEach((entry) => {
 				// We wrap it in requestAnimationFrame to avoid this error - ResizeObserver loop limit exceeded
 				requestAnimationFrame(() => {
-					const newWidth = entry.contentRect.width;
-					let newBP = 'default';
-					for (let i = 0; i < bps.length; i++) {
-						if (newWidth < bps[i].width) {
-							newBP = bps[i].bp;
-							break;
-						}
-					}
-					this.bp = newBP;
+					this.bp = this.getBreakpointFromWidth(entry.contentRect.width);
 				});
 			});
 		});
 
 		this.observer = observer;
-
-		if (this.$refs.root) {
-			observer.observe(this.$refs.root as HTMLDivElement);
-		}
+		observer.observe(root);
 	},
-	beforeDestroy() {
+	beforeUnmount() {
 		if (this.enabled) {
-			this.observer?.disconnect(); // eslint-disable-line
+			this.observer?.disconnect();
 		}
 	},
+	methods: {
+		getBreakpointFromWidth(width: number): string {
+			let newBP = 'default';
+			const unsortedBreakpoints = [...(this.breakpoints || [])] as Array<{
+				width: number;
+				bp: string;
+			}>;
+
+			const bps = unsortedBreakpoints.sort((a, b) => a.width - b.width);
+			for (let i = 0; i < bps.length; i++) {
+				if (width < bps[i].width) {
+					newBP = bps[i].bp;
+					break;
+				}
+			}
+
+			return newBP;
+		},
+	},
 });
 </script>
diff --git a/packages/design-system/src/components/index.ts b/packages/design-system/src/components/index.ts
index 22683c0296de4..d917339b5ef33 100644
--- a/packages/design-system/src/components/index.ts
+++ b/packages/design-system/src/components/index.ts
@@ -6,9 +6,11 @@ export { default as N8nAvatar } from './N8nAvatar';
 export { default as N8nBadge } from './N8nBadge';
 export { default as N8nBlockUi } from './N8nBlockUi';
 export { default as N8nButton } from './N8nButton';
-export { N8nElButton } from './N8nButton/overrides';
 export { default as N8nCallout } from './N8nCallout';
 export { default as N8nCard } from './N8nCard';
+export { default as N8nCheckbox } from './N8nCheckbox';
+export { default as N8nCircleLoader } from './N8nCircleLoader';
+export { default as N8nColorPicker } from './N8nColorPicker';
 export { default as N8nDatatable } from './N8nDatatable';
 export { default as N8nFormBox } from './N8nFormBox';
 export { default as N8nFormInputs } from './N8nFormInputs';
@@ -33,6 +35,8 @@ export { default as N8nOption } from './N8nOption';
 export { default as N8nPopover } from './N8nPopover';
 export { default as N8nPulse } from './N8nPulse';
 export { default as N8nRadioButtons } from './N8nRadioButtons';
+export { default as N8nRecycleScroller } from './N8nRecycleScroller';
+export { default as N8nResizeWrapper } from './N8nResizeWrapper';
 export { default as N8nSelect } from './N8nSelect';
 export { default as N8nSpinner } from './N8nSpinner';
 export { default as N8nSticky } from './N8nSticky';
@@ -42,8 +46,9 @@ export { default as N8nTags } from './N8nTags';
 export { default as N8nText } from './N8nText';
 export { default as N8nTooltip } from './N8nTooltip';
 export { default as N8nTree } from './N8nTree';
+export { default as N8nUserStack } from './N8nUserStack';
 export { default as N8nUserInfo } from './N8nUserInfo';
 export { default as N8nUserSelect } from './N8nUserSelect';
 export { default as N8nUsersList } from './N8nUsersList';
-export { default as N8nResizeWrapper } from './N8nResizeWrapper';
-export { default as N8nRecycleScroller } from './N8nRecycleScroller';
+export { default as N8nResizeObserver } from './ResizeObserver';
+export { N8nKeyboardShortcut } from './N8nKeyboardShortcut';
diff --git a/packages/design-system/src/components/utils/helpers.ts b/packages/design-system/src/components/utils/helpers.ts
deleted file mode 100644
index 9e9c064e413bb..0000000000000
--- a/packages/design-system/src/components/utils/helpers.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export function addTargetBlank(html: string) {
-	return html && html.includes('href=') ? html.replace(/href=/g, 'target="_blank" href=') : html;
-}
diff --git a/packages/design-system/src/composables/index.ts b/packages/design-system/src/composables/index.ts
deleted file mode 100644
index 19ab1d994e6cb..0000000000000
--- a/packages/design-system/src/composables/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './useI18n';
diff --git a/packages/design-system/src/composables/useDeviceSupport.test.ts b/packages/design-system/src/composables/useDeviceSupport.test.ts
new file mode 100644
index 0000000000000..d6974cb9ebb0a
--- /dev/null
+++ b/packages/design-system/src/composables/useDeviceSupport.test.ts
@@ -0,0 +1,73 @@
+import { useDeviceSupport } from '@/composables/useDeviceSupport';
+
+describe('useDeviceSupport()', () => {
+	beforeEach(() => {
+		global.window = Object.create(window);
+		global.navigator = { userAgent: 'test-agent', maxTouchPoints: 0 } as Navigator;
+	});
+
+	describe('isTouchDevice', () => {
+		it('should be true if ontouchstart is in window', () => {
+			Object.defineProperty(window, 'ontouchstart', {});
+			const { isTouchDevice } = useDeviceSupport();
+			expect(isTouchDevice).toEqual(true);
+		});
+
+		it('should be true if navigator.maxTouchPoints > 0', () => {
+			Object.defineProperty(navigator, 'maxTouchPoints', { value: 1 });
+			const { isTouchDevice } = useDeviceSupport();
+			expect(isTouchDevice).toEqual(true);
+		});
+
+		it('should be false if no touch support', () => {
+			delete window.ontouchstart;
+			Object.defineProperty(navigator, 'maxTouchPoints', { value: 0 });
+			const { isTouchDevice } = useDeviceSupport();
+			expect(isTouchDevice).toEqual(false);
+		});
+	});
+
+	describe('isMacOs', () => {
+		it('should be true for macOS user agent', () => {
+			Object.defineProperty(navigator, 'userAgent', { value: 'macintosh' });
+			const { isMacOs } = useDeviceSupport();
+			expect(isMacOs).toEqual(true);
+		});
+
+		it('should be false for non-macOS user agent', () => {
+			Object.defineProperty(navigator, 'userAgent', { value: 'windows' });
+			const { isMacOs } = useDeviceSupport();
+			expect(isMacOs).toEqual(false);
+		});
+	});
+
+	describe('controlKeyCode', () => {
+		it('should return Meta on macOS', () => {
+			Object.defineProperty(navigator, 'userAgent', { value: 'macintosh' });
+			const { controlKeyCode } = useDeviceSupport();
+			expect(controlKeyCode).toEqual('Meta');
+		});
+
+		it('should return Control on non-macOS', () => {
+			Object.defineProperty(navigator, 'userAgent', { value: 'windows' });
+			const { controlKeyCode } = useDeviceSupport();
+			expect(controlKeyCode).toEqual('Control');
+		});
+	});
+
+	describe('isCtrlKeyPressed()', () => {
+		it('should return true for metaKey press on macOS', () => {
+			Object.defineProperty(navigator, 'userAgent', { value: 'macintosh' });
+			const { isCtrlKeyPressed } = useDeviceSupport();
+			const event = new KeyboardEvent('keydown', { metaKey: true });
+			expect(isCtrlKeyPressed(event)).toEqual(true);
+		});
+
+		it('should return true for ctrlKey press on non-macOS', () => {
+			Object.defineProperty(navigator, 'userAgent', { value: 'windows' });
+			const { isCtrlKeyPressed } = useDeviceSupport();
+			const event = new KeyboardEvent('keydown', { ctrlKey: true });
+			expect(isCtrlKeyPressed(event)).toEqual(true);
+		});
+	});
+});
diff --git a/packages/design-system/src/composables/useDeviceSupport.ts b/packages/design-system/src/composables/useDeviceSupport.ts
new file mode 100644
index 0000000000000..8ead46c140a9b
--- /dev/null
+++ b/packages/design-system/src/composables/useDeviceSupport.ts
@@ -0,0 +1,27 @@
+import { ref } from 'vue';
+
+export function useDeviceSupport() {
+	const isTouchDevice = ref(window.hasOwnProperty('ontouchstart') || navigator.maxTouchPoints > 0);
+	const userAgent = ref(navigator.userAgent.toLowerCase());
+	const isMacOs = ref(
+		userAgent.value.includes('macintosh') ||
+			userAgent.value.includes('ipad') ||
+			userAgent.value.includes('iphone') ||
+			userAgent.value.includes('ipod'),
+	);
+	const controlKeyCode = ref(isMacOs.value ? 'Meta' : 'Control');
+
+	function isCtrlKeyPressed(e: MouseEvent | KeyboardEvent): boolean {
+		if (isMacOs.value) {
+			return (e as KeyboardEvent).metaKey;
+		}
+		return (e as KeyboardEvent).ctrlKey;
+	}
+
+	return {
+		isTouchDevice: isTouchDevice.value,
+		isMacOs: isMacOs.value,
+		controlKeyCode: controlKeyCode.value,
+		isCtrlKeyPressed,
+	};
+}
diff --git a/packages/design-system/src/css/_primitives.scss b/packages/design-system/src/css/_primitives.scss
new file mode 100644
index 0000000000000..77e3a4e30ca4f
--- /dev/null
+++ b/packages/design-system/src/css/_primitives.scss
@@ -0,0 +1,440 @@
+// Primitive Colors
+// Primitive colors shouldn't be used directly in components an other UI elements.
+// They can be only mapped to tokens.
+// Tokens should be used instead in components an other UI elements
+
+@mixin primitives {
+	// Gray
+	--prim-gray-h: 220;
+
+	--prim-gray-820: hsl(var(--prim-gray-h), 1%, 18%);
+	--prim-gray-800: hsl(var(--prim-gray-h), 1%, 20%);
+	--prim-gray-740: hsl(var(--prim-gray-h), 2%, 26%);
+	--prim-gray-670: hsl(var(--prim-gray-h), 2%, 33%);
+	--prim-gray-540: hsl(var(--prim-gray-h), 4%, 46%);
+	--prim-gray-490: hsl(var(--prim-gray-h), 3%, 51%);
+	--prim-gray-420: hsl(var(--prim-gray-h), 4%, 58%);
+	--prim-gray-320: hsl(var(--prim-gray-h), 10%, 68%);
+	--prim-gray-200: hsl(var(--prim-gray-h), 18%, 80%);
+	--prim-gray-120: hsl(var(--prim-gray-h), 25%, 88%);
+	--prim-gray-70: hsl(var(--prim-gray-h), 32%, 93%);
+	--prim-gray-70-alpha-01: hsla(var(--prim-gray-h), 32%, 93%, 0.1);
+	--prim-gray-40: hsl(var(--prim-gray-h), 40%, 96%);
+	--prim-gray-30: hsl(var(--prim-gray-h), 40%, 97%);
+	--prim-gray-10: hsl(var(--prim-gray-h), 47%, 99%);
+	--prim-gray-0-alpha-075: hsla(var(--prim-gray-h), 50%, 100%, 0.75);
+	--prim-gray-0-alpha-025: hsla(var(--prim-gray-h), 50%, 100%, 0.25);
+	--prim-gray-0: hsl(var(--prim-gray-h), 50%, 100%);
+
+	// Color Primary
+	--prim-color-primary-h: 7;
+	--prim-color-primary-s: 100%;
+	--prim-color-primary-l: 68%;
+
+	--prim-color-primary-shade-300: hsl(
+		var(--prim-color-primary-h),
+		calc(var(--prim-color-primary-s) - 60%),
+		calc(var(--prim-color-primary-l) - 30%)
+	);
+	--prim-color-primary-shade-100: hsl(
+		var(--prim-color-primary-h),
+		calc(var(--prim-color-primary-s) - 15%),
+		calc(var(--prim-color-primary-l) - 10%)
+	);
+	--prim-color-primary: hsl(
+		var(--prim-color-primary-h),
+		var(--prim-color-primary-s),
+		var(--prim-color-primary-l)
+	);
+	--prim-color-primary-alpha-010: hsla(
+		var(--prim-color-primary-h),
+		var(--prim-color-primary-s),
+		var(--prim-color-primary-l),
+		0.1
+	);
+	--prim-color-primary-tint-100: hsl(
+		var(--prim-color-primary-h),
+		var(--prim-color-primary-s),
+		calc(var(--prim-color-primary-l) + 10%)
+	);
+	--prim-color-primary-tint-200: hsl(
+		var(--prim-color-primary-h),
+		var(--prim-color-primary-s),
+		calc(var(--prim-color-primary-l) + 20%)
+	);
+	--prim-color-primary-tint-250: hsl(
+		var(--prim-color-primary-h),
+		var(--prim-color-primary-s),
+		calc(var(--prim-color-primary-l) + 25%)
+	);
+	--prim-color-primary-tint-300: hsl(
+		var(--prim-color-primary-h),
+		var(--prim-color-primary-s),
+		calc(var(--prim-color-primary-l) + 30%)
+	);
+
+	// Color Secondary
+	--prim-color-secondary-h: 247;
+	--prim-color-secondary-s: 49%;
+	--prim-color-secondary-l: 53%;
+
+	--prim-color-secondary-shade-250: hsl(
+		var(--prim-color-secondary-h),
+		calc(var(--prim-color-secondary-s) - 25%),
+		calc(var(--prim-color-secondary-l) - 25%)
+	);
+	--prim-color-secondary-shade-100: hsl(
+		var(--prim-color-secondary-h),
+		var(--prim-color-secondary-s),
+		calc(var(--prim-color-secondary-l) - 10%)
+	);
+	--prim-color-secondary: hsl(
+		var(--prim-color-secondary-h),
+		var(--prim-color-secondary-s),
+		var(--prim-color-secondary-l)
+	);
+	--prim-color-secondary-alpha-025: hsla(
+		var(--prim-color-secondary-h),
+		var(--prim-color-secondary-s),
+		var(--prim-color-secondary-l),
+		0.25
+	);
+	--prim-color-secondary-alpha-010: hsla(
+		var(--prim-color-secondary-h),
+		var(--prim-color-secondary-s),
+		var(--prim-color-secondary-l),
+		0.1
+	);
+	--prim-color-secondary-tint-100: hsl(
+		var(--prim-color-secondary-h),
+		var(--prim-color-secondary-s),
+		calc(var(--prim-color-secondary-l) + 10%)
+	);
+	--prim-color-secondary-tint-200: hsl(
+		var(--prim-color-secondary-h),
+		var(--prim-color-secondary-s),
+		calc(var(--prim-color-secondary-l) + 20%)
+	);
+	--prim-color-secondary-tint-300: hsl(
+		var(--prim-color-secondary-h),
+		var(--prim-color-secondary-s),
+		calc(var(--prim-color-secondary-l) + 30%)
+	);
+	--prim-color-secondary-tint-400: hsl(
+		var(--prim-color-secondary-h),
+		var(--prim-color-secondary-s),
+		calc(var(--prim-color-secondary-l) + 40%)
+	);
+
+	// Color Alternate A
+	--prim-color-alt-a-h: 150;
+	--prim-color-alt-a-s: 60%;
+	--prim-color-alt-a-l: 40%;
+
+	--prim-color-alt-a-shade-200: hsl(
+		var(--prim-color-alt-a-h),
+		calc(var(--prim-color-alt-a-s) - 15%),
+		calc(var(--prim-color-alt-a-l) - 20%)
+	);
+	--prim-color-alt-a-shade-100: hsl(
+		var(--prim-color-alt-a-h),
+		calc(var(--prim-color-alt-a-s) - 15%),
+		calc(var(--prim-color-alt-a-l) - 10%)
+	);
+	--prim-color-alt-a: hsl(
+		var(--prim-color-alt-a-h),
+		var(--prim-color-alt-a-s),
+		var(--prim-color-alt-a-l)
+	);
+	--prim-color-alt-a-alpha-025: hsl(
+		var(--prim-color-alt-a-h),
+		var(--prim-color-alt-a-s),
+		var(--prim-color-alt-a-l),
+		0.25
+	);
+	--prim-color-alt-a-alpha-015: hsl(
+		var(--prim-color-alt-a-h),
+		var(--prim-color-alt-a-s),
+		var(--prim-color-alt-a-l),
+		0.15
+	);
+	--prim-color-alt-a-tint-300: hsl(
+		var(--prim-color-alt-a-h),
+		var(--prim-color-alt-a-s),
+		calc(var(--prim-color-alt-a-l) + 30%)
+	);
+	--prim-color-alt-a-tint-400: hsl(
+		var(--prim-color-alt-a-h),
+		var(--prim-color-alt-a-s),
+		calc(var(--prim-color-alt-a-l) + 40%)
+	);
+	--prim-color-alt-a-tint-500: hsl(
+		var(--prim-color-alt-a-h),
+		var(--prim-color-alt-a-s),
+		calc(var(--prim-color-alt-a-l) + 50%)
+	);
+	--prim-color-alt-a-tint-550: hsl(
+		var(--prim-color-alt-a-h),
+		var(--prim-color-alt-a-s),
+		calc(var(--prim-color-alt-a-l) + 55%)
+	);
+
+	// Color Alternate B
+	--prim-color-alt-b-h: 36;
+	--prim-color-alt-b-s: 77%;
+	--prim-color-alt-b-l: 57%;
+
+	--prim-color-alt-b-shade-350: hsl(
+		var(--prim-color-alt-b-h),
+		calc(var(--prim-color-alt-b-s) - 35%),
+		calc(var(--prim-color-alt-b-l) - 35%)
+	);
+	--prim-color-alt-b-shade-250: hsl(
+		var(--prim-color-alt-b-h),
+		calc(var(--prim-color-alt-b-s) - 35%),
+		calc(var(--prim-color-alt-b-l) - 25%)
+	);
+	--prim-color-alt-b-shade-100: hsl(
+		var(--prim-color-alt-b-h),
+		var(--prim-color-alt-b-s),
+		calc(var(--prim-color-alt-b-l) - 10%)
+	);
+	--prim-color-alt-b: hsl(
+		var(--prim-color-alt-b-h),
+		var(--prim-color-alt-b-s),
+		var(--prim-color-alt-b-l)
+	);
+	--prim-color-alt-b-alpha-02: hsla(
+		var(--prim-color-alt-b-h),
+		var(--prim-color-alt-b-s),
+		var(--prim-color-alt-b-l),
+		0.2
+	);
+	--prim-color-alt-b-tint-150: hsl(
+		var(--prim-color-alt-b-h),
+		var(--prim-color-alt-b-s),
+		calc(var(--prim-color-alt-b-l) + 15%)
+	);
+	--prim-color-alt-b-tint-250: hsl(
+		var(--prim-color-alt-b-h),
+		var(--prim-color-alt-b-s),
+		calc(var(--prim-color-alt-b-l) + 25%)
+	);
+	--prim-color-alt-b-tint-300: hsl(
+		var(--prim-color-alt-b-h),
+		var(--prim-color-alt-b-s),
+		calc(var(--prim-color-alt-b-l) + 30%)
+	);
+	--prim-color-alt-b-tint-400: hsl(
+		var(--prim-color-alt-b-h),
+		var(--prim-color-alt-b-s),
+		calc(var(--prim-color-alt-b-l) + 40%)
+	);
+
+	// Color Alternate C
+	--prim-color-alt-c-h: 355;
+	--prim-color-alt-c-s: 83%;
+	--prim-color-alt-c-l: 52%;
+
+	--prim-color-alt-c-shade-250: hsl(
+		var(--prim-color-alt-c-h),
+		calc(var(--prim-color-alt-c-s) - 40%),
+		calc(var(--prim-color-alt-c-l) - 25%)
+	);
+	--prim-color-alt-c-shade-150: hsl(
+		var(--prim-color-alt-c-h),
+		calc(var(--prim-color-alt-c-s) - 40%),
+		calc(var(--prim-color-alt-c-l) - 15%)
+	);
+	--prim-color-alt-c-shade-100: hsl(
+		var(--prim-color-alt-c-h),
+		var(--prim-color-alt-c-s),
+		calc(var(--prim-color-alt-c-l) - 10%)
+	);
+	--prim-color-alt-c: hsl(
+		var(--prim-color-alt-c-h),
+		var(--prim-color-alt-c-s),
+		var(--prim-color-alt-c-l)
+	);
+	--prim-color-alt-c-alpha-02: hsl(
+		var(--prim-color-alt-c-h),
+		var(--prim-color-alt-c-s),
+		var(--prim-color-alt-c-l),
+		0.2
+	);
+	--prim-color-alt-c-tint-150: hsl(
+		var(--prim-color-alt-c-h),
+		var(--prim-color-alt-c-s),
+		calc(var(--prim-color-alt-c-l) + 15%)
+	);
+	--prim-color-alt-c-tint-250: hsl(
+		var(--prim-color-alt-c-h),
+		var(--prim-color-alt-c-s),
+		calc(var(--prim-color-alt-c-l) + 25%)
+	);
+	--prim-color-alt-c-tint-300: hsl(
+		var(--prim-color-alt-c-h),
+		var(--prim-color-alt-c-s),
+		calc(var(--prim-color-alt-c-l) + 30%)
+	);
+	--prim-color-alt-c-tint-400: hsl(
+		var(--prim-color-alt-c-h),
+		var(--prim-color-alt-c-s),
+		calc(var(--prim-color-alt-c-l) + 40%)
+	);
+	--prim-color-alt-c-tint-450: hsl(
+		var(--prim-color-alt-c-h),
+		var(--prim-color-alt-c-s),
+		calc(var(--prim-color-alt-c-l) + 45%)
+	);
+
+	// Color Alternate D
+	--prim-color-alt-d-h: 46;
+	--prim-color-alt-d-s: 100%;
+	--prim-color-alt-d-l: 92%;
+
+	--prim-color-alt-d-shade-700: hsl(
+		var(--prim-color-alt-d-h),
+		calc(var(--prim-color-alt-d-s) - 55%),
+		calc(var(--prim-color-alt-d-l) - 70%)
+	);
+	--prim-color-alt-d-shade-600: hsl(
+		var(--prim-color-alt-d-h),
+		calc(var(--prim-color-alt-d-s) - 55%),
+		calc(var(--prim-color-alt-d-l) - 60%)
+	);
+	--prim-color-alt-d-shade-150: hsl(
+		var(--prim-color-alt-d-h),
+		var(--prim-color-alt-d-s),
+		calc(var(--prim-color-alt-d-l) - 15%)
+	);
+	--prim-color-alt-d: hsl(
+		var(--prim-color-alt-d-h),
+		var(--prim-color-alt-d-s),
+		var(--prim-color-alt-d-l)
+	);
+
+	// Color Alternate E
+	--prim-color-alt-e-h: 210;
+	--prim-color-alt-e-s: 67%;
+	--prim-color-alt-e-l: 57%;
+
+	--prim-color-alt-e-shade-350: hsl(
+		var(--prim-color-alt-e-h),
+		calc(var(--prim-color-alt-e-s) - 20%),
+		calc(var(--prim-color-alt-e-l) - 35%)
+	);
+	--prim-color-alt-e-shade-250: hsl(
+		var(--prim-color-alt-e-h),
+		calc(var(--prim-color-alt-e-s) - 20%),
+		calc(var(--prim-color-alt-e-l) - 25%)
+	);
+	--prim-color-alt-e-shade-150: hsl(
+		var(--prim-color-alt-e-h),
+		var(--prim-color-alt-e-s),
+		calc(var(--prim-color-alt-e-l) - 15%)
+	);
+	--prim-color-alt-e-shade-100: hsl(
+		var(--prim-color-alt-e-h),
+		var(--prim-color-alt-e-s),
+		calc(var(--prim-color-alt-e-l) - 10%)
+	);
+	--prim-color-alt-e: hsl(
+		var(--prim-color-alt-e-h),
+		var(--prim-color-alt-e-s),
+		var(--prim-color-alt-e-l)
+	);
+	--prim-color-alt-e-alpha-04: hsla(
+		var(--prim-color-alt-e-h),
+		var(--prim-color-alt-e-s),
+		var(--prim-color-alt-e-l),
+		0.4
+	);
+	--prim-color-alt-e-tint-250: hsl(
+		var(--prim-color-alt-e-h),
+		var(--prim-color-alt-e-s),
+		calc(var(--prim-color-alt-e-l) + 25%)
+	);
+	--prim-color-alt-e-tint-350: hsl(
+		var(--prim-color-alt-e-h),
+		var(--prim-color-alt-e-s),
+		calc(var(--prim-color-alt-e-l) + 35%)
+	);
+
+	// Color Alternate F
+	--prim-color-alt-f-h: 72;
+	--prim-color-alt-f-s: 100%;
+	--prim-color-alt-f-l: 27%;
+
+	--prim-color-alt-f: hsl(
+		var(--prim-color-alt-f-h),
+		var(--prim-color-alt-f-s),
+		var(--prim-color-alt-f-l)
+	);
+
+	--prim-color-alt-f-tint-150: hsl(
+		var(--prim-color-alt-f-h),
+		var(--prim-color-alt-f-s),
+		calc(var(--prim-color-alt-f-l) + 15%)
+	);
+
+	// Color Alternate G
+	--prim-color-alt-g-h: 276;
+	--prim-color-alt-g-s: 31%;
+	--prim-color-alt-g-l: 50%;
+
+	--prim-color-alt-g: hsl(
+		var(--prim-color-alt-g-h),
+		var(--prim-color-alt-g-s),
+		var(--prim-color-alt-g-l)
+	);
+
+	--prim-color-alt-g-tint-150: hsl(
+		var(--prim-color-alt-g-h),
+		var(--prim-color-alt-g-s),
+		calc(var(--prim-color-alt-g-l) + 15%)
+	);
+
+	// Color Alternate H
+	--prim-color-alt-h-h: 184;
+	--prim-color-alt-h-s: 44%;
+	--prim-color-alt-h-l: 43%;
+
+	--prim-color-alt-h: hsl(
+		var(--prim-color-alt-h-h),
+		var(--prim-color-alt-h-s),
+		var(--prim-color-alt-h-l)
+	);
+
+	// Color Alternate I
+	--prim-color-alt-i-h: 147;
+	--prim-color-alt-i-s: 83%;
+	--prim-color-alt-i-l: 44%;
+
+	--prim-color-alt-i: hsl(
+		var(--prim-color-alt-i-h),
+		var(--prim-color-alt-i-s),
+		var(--prim-color-alt-i-l)
+	);
+
+	// Color Alternate J
+	--prim-color-alt-j-h: 247;
+	--prim-color-alt-j-s: 10%;
+	--prim-color-alt-j-l: 30%;
+
+	--prim-color-alt-j: hsl(
+		var(--prim-color-alt-j-h),
+		var(--prim-color-alt-j-s),
+		var(--prim-color-alt-j-l)
+	);
+	--prim-color-alt-j-alpha-075: hsla(
+		var(--prim-color-alt-j-h),
+		var(--prim-color-alt-j-s),
+		var(--prim-color-alt-j-l),
+		0.75
+	);
+}
+
+:root {
+	@include primitives;
+}
diff --git a/packages/design-system/src/css/_tokens.dark.scss b/packages/design-system/src/css/_tokens.dark.scss
index 8efd08810688e..0c9b00b8d3e1f 100644
--- a/packages/design-system/src/css/_tokens.dark.scss
+++ b/packages/design-system/src/css/_tokens.dark.scss
@@ -1,333 +1,228 @@
 @use 'sass:math';
 
 @mixin theme {
-	--color-primary-h: 7;
-	--color-primary-s: 90%;
-	--color-primary-l: 68%;
-	--color-primary: hsl(var(--color-primary-h), var(--color-primary-s), var(--color-primary-l));
-
-	--color-primary-tint-1-l: 18%;
-	--color-primary-tint-1: hsl(
-		var(--color-primary-h),
-		var(--color-primary-s),
-		var(--color-primary-tint-1-l)
-	);
-
-	--color-primary-tint-2-l: 9%;
-	--color-primary-tint-2: hsl(
-		var(--color-primary-h),
-		var(--color-primary-s),
-		var(--color-primary-tint-2-l)
-	);
-
-	--color-primary-tint-3-l: 3%;
-	--color-primary-tint-3: hsl(
-		var(--color-primary-h),
-		var(--color-primary-s),
-		var(--color-primary-tint-3-l)
-	);
-
-	--color-primary-shade-1-l: 89%;
-	--color-primary-shade-1: hsl(
-		var(--color-primary-h),
-		var(--color-primary-s),
-		var(--color-primary-shade-1-l)
-	);
-
-	--color-secondary-h: 247;
-	--color-secondary-s: 100%;
-	--color-secondary-l: 55%;
-	--color-secondary: hsl(
-		var(--color-secondary-h),
-		var(--color-secondary-s),
-		var(--color-secondary-l)
-	);
-
-	--color-success-h: 150;
-	--color-success-s: 74%;
-	--color-success-l: 60%;
-	--color-success: hsl(var(--color-success-h), var(--color-success-s), var(--color-success-l));
-
-	--color-success-tint-1-l: 12%;
-	--color-success-tint-1: hsl(
-		var(--color-success-h),
-		var(--color-success-s),
-		var(--color-success-tint-1-l)
-	);
-
-	--color-success-tint-2-l: 3%;
-	--color-success-tint-2: hsl(
-		var(--color-success-h),
-		var(--color-success-s),
-		var(--color-success-tint-2-l)
-	);
-
-	--color-warning-h: 36;
-	--color-warning-s: 77%;
-	--color-warning-l: 43%;
-	--color-warning: hsl(var(--color-warning-h), var(--color-warning-s), var(--color-warning-l));
-
-	--color-warning-tint-1-l: 12%;
-	--color-warning-tint-1: hsl(
-		var(--color-warning-h),
-		var(--color-warning-s),
-		var(--color-warning-tint-1-l)
-	);
-
-	--color-warning-tint-2-l: 4%;
-	--color-warning-tint-2: hsl(
-		var(--color-warning-h),
-		var(--color-warning-s),
-		var(--color-warning-tint-2-l)
-	);
-
-	--color-danger-h: 0;
-	--color-danger-s: 88%;
-	--color-danger-l: 35%;
-	--color-danger: hsl(var(--color-danger-h), var(--color-danger-s), var(--color-danger-l));
-
-	--color-danger-tint-1-l: 8%;
-	--color-danger-tint-1: hsl(
-		var(--color-danger-h),
-		var(--color-danger-s),
-		var(--color-danger-tint-1-l)
-	);
-
-	--color-danger-tint-2-l: 3%;
-	--color-danger-tint-2: hsl(
-		var(--color-danger-h),
-		var(--color-danger-s),
-		var(--color-danger-tint-2-l)
-	);
-
-	--color-info-h: 220;
-	--color-info-s: 4%;
-	--color-info-l: 82%;
-	--color-info: hsl(var(--color-info-h), var(--color-info-s), var(--color-info-l));
-
-	--color-info-tint-1-l: 12%;
-	--color-info-tint-1: hsl(var(--color-info-h), var(--color-info-s), var(--color-info-tint-1-l));
-
-	--color-info-tint-2-l: 4%;
-	--color-info-tint-2: hsl(var(--color-info-h), var(--color-info-s), var(--color-info-tint-2-l));
-
-	--color-text-dark-h: 0;
-	--color-text-dark-s: 0%;
-	--color-text-dark-l: 100%;
-	--color-text-dark: hsl(
-		var(--color-text-dark-h),
-		var(--color-text-dark-s),
-		var(--color-text-dark-l)
-	);
-
-	--color-text-base-h: 240;
-	--color-text-base-s: 4%;
-	--color-text-base-l: 70%;
-	--color-text-base: hsl(
-		var(--color-text-base-h),
-		var(--color-text-base-s),
-		var(--color-text-base-l)
-	);
-
-	--color-text-light-h: 220;
-	--color-text-light-s: 4%;
-	--color-text-light-l: 82%;
-	--color-text-light: hsl(
-		var(--color-text-light-h),
-		var(--color-text-light-s),
-		var(--color-text-light-l)
-	);
-
-	--color-text-lighter-h: 222;
-	--color-text-lighter-s: 17%;
-	--color-text-lighter-l: 92%;
-	--color-text-lighter: hsl(
-		var(--color-text-lighter-h),
-		var(--color-text-lighter-s),
-		var(--color-text-lighter-l)
-	);
-
-	--color-text-xlight-h: 0;
-	--color-text-xlight-s: 0%;
-	--color-text-xlight-l: 10%;
-	--color-text-xlight: hsl(
-		var(--color-text-xlight-h),
-		var(--color-text-xlight-s),
-		var(--color-text-xlight-l)
-	);
-
-	--color-foreground-base-h: 220;
-	--color-foreground-base-s: 20%;
-	--color-foreground-base-l: 30%;
-	--color-foreground-base: hsl(
-		var(--color-foreground-base-h),
-		var(--color-foreground-base-s),
-		var(--color-foreground-base-l)
-	);
-
-	--color-foreground-light-h: 0;
-	--color-foreground-light-s: 0%;
-	--color-foreground-light-l: 7%;
-	--color-foreground-light: hsl(
-		var(--color-foreground-light-h),
-		var(--color-foreground-light-s),
-		var(--color-foreground-light-l)
-	);
-
-	--color-foreground-xlight-h: 0;
-	--color-foreground-xlight-s: 0%;
-	--color-foreground-xlight-l: 10%;
-	--color-foreground-xlight: hsl(
-		var(--color-foreground-xlight-h),
-		var(--color-foreground-xlight-s),
-		var(--color-foreground-xlight-l)
-	);
-
-	--color-background-dark-h: 0;
-	--color-background-dark-s: 0%;
-	--color-background-dark-l: 100%;
-	--color-background-dark: hsl(
-		var(--color-background-dark-h),
-		var(--color-background-dark-s),
-		var(--color-background-dark-l)
-	);
-
-	--color-background-base-h: 0;
-	--color-background-base-s: 0%;
-	--color-background-base-l: 10%;
-	--color-background-base: hsl(
-		var(--color-background-base-h),
-		var(--color-background-base-s),
-		var(--color-background-base-l)
-	);
-
-	--color-background-light-h: 220;
-	--color-background-light-s: 10%;
-	--color-background-light-l: 15%;
-	--color-background-light: hsl(
-		var(--color-background-light-h),
-		var(--color-background-light-s),
-		var(--color-background-light-l)
-	);
-
-	--color-background-lighter-h: 0;
-	--color-background-lighter-s: 0%;
-	--color-background-lighter-l: 36%;
-	--color-background-lighter: hsl(
-		var(--color-background-lighter-h),
-		var(--color-background-lighter-s),
-		var(--color-background-lighter-l)
-	);
-
-	--color-background-xlight-h: 240;
-	--color-background-xlight-s: 4%;
-	--color-background-xlight-l: 19%;
-	--color-background-xlight: hsl(
-		var(--color-background-xlight-h),
-		var(--color-background-xlight-s),
-		var(--color-background-xlight-l)
-	);
-
-	--color-canvas-dot-h: 204;
-	--color-canvas-dot-s: 15.6%;
-	--color-canvas-dot-l: 87.5%;
-	--color-canvas-dot: hsl(
-		var(--color-canvas-dot-h),
-		var(--color-canvas-dot-s),
-		var(--color-canvas-dot-l)
-	);
-
-	--color-canvas-background-h: 200;
-	--color-canvas-background-s: 10%;
-	--color-canvas-background-l: 10%;
-	--color-canvas-background: hsl(
-		var(--color-canvas-background-h),
-		var(--color-canvas-background-s),
-		var(--color-canvas-background-l)
-	);
-
-	--color-sticky-default-background-h: 46;
-	--color-sticky-default-background-s: 100%;
-	--color-sticky-default-background-l: 12%;
-	--color-sticky-default-background: hsl(
-		var(--color-sticky-default-background-h),
-		var(--color-sticky-default-background-s),
-		var(--color-sticky-default-background-l)
-	);
-
-	--color-sticky-default-border-h: 43;
-	--color-sticky-default-border-s: 75%;
-	--color-sticky-default-border-l: 80%;
-	--color-sticky-default-border: hsl(
-		var(--color-sticky-default-border-h),
-		var(--color-sticky-default-border-s),
-		var(--color-sticky-default-border-l)
-	);
-
-	--color-json-default: #5045a1;
-	--color-json-null: var(--color-danger);
-	--color-json-boolean: #1d8ce0;
-	--color-json-number: #1d8ce0;
-	--color-json-string: #726b9f;
+	// Primary tokens
+
+	// Text
+	--color-text-dark: var(--prim-gray-40);
+	--color-text-base: var(--prim-gray-200);
+	--color-text-light: var(--prim-gray-320);
+	--color-text-lighter: var(--prim-gray-740);
+	--color-text-xlight: var(--prim-gray-820);
+	--color-text-danger: var(--prim-color-alt-c-tint-150);
+
+	// Foreground
+	--color-foreground-xdark: var(--prim-gray-200);
+	--color-foreground-dark: var(--prim-gray-420);
+	--color-foreground-base: var(--prim-gray-670);
+	--color-foreground-light: var(--prim-gray-740);
+	--color-foreground-xlight: var(--prim-gray-820);
+
+	// Background
+	--color-background-dark: var(--prim-gray-70);
+	--color-background-medium: var(--prim-gray-540);
+	--color-background-base: var(--prim-gray-670);
+	--color-background-light: var(--prim-gray-820);
+	--color-background-xlight: var(--prim-gray-740);
+
+	--box-shadow-base: 0 2px 4px rgba(0, 0, 0, 0.2), 0 0 6px rgba(0, 0, 0, 0.1);
+	--box-shadow-dark: 0 2px 4px rgba(0, 0, 0, 0.2), 0 0 6px rgba(0, 0, 0, 0.2);
+	--box-shadow-light: 0 2px 12px 0 rgba(0, 0, 0, 0.2);
+
+	// Secondary tokens
+
+	// LangChain
+	--color-lm-chat-messages-background: var(--prim-gray-820);
+	--color-lm-chat-bot-background: var(--prim-gray-540);
+	--color-lm-chat-bot-border: var(--prim-gray-490);
+	--color-lm-chat-user-background: var(--prim-color-alt-a-shade-100);
+	--color-lm-chat-user-border: var(--prim-color-alt-a);
+
+	// Canvas
+	--color-canvas-background: var(--prim-gray-820);
+	--color-canvas-background-h: var(--prim-gray-h); // Used for connectors labels background
+	--color-canvas-background-s: 1%;
+	--color-canvas-background-l: 18%;
+	--color-canvas-dot: var(--prim-gray-670);
+	--color-canvas-read-only-line: var(--prim-gray-800);
+	--color-canvas-node-background: var(--prim-gray-40);
+	--color-canvas-node-pinned-border: var(--prim-color-secondary-tint-100);
+	--color-canvas-selected: var(--prim-gray-0-alpha-025);
+	--node-type-main-color: var(--prim-gray-420);
+
+	// Sticky
+	--color-sticky-background: var(--prim-color-alt-d-shade-700);
+	--color-sticky-border: var(--prim-color-alt-d-shade-600);
+	--color-sticky-font: var(--prim-gray-40);
+	--color-sticky-code-font: var(--prim-color-secondary-tint-300);
+	--color-sticky-code-background: var(--prim-gray-70-alpha-01);
+
+	--color-sticky-background-1: var(--prim-color-alt-d-shade-700);
+	--color-sticky-border-1: var(--prim-color-alt-d-shade-600);
+	--color-sticky-background-2: var(--prim-color-alt-b-shade-350);
+	--color-sticky-border-2: var(--prim-color-alt-b-shade-250);
+	--color-sticky-background-3: var(--prim-color-alt-c-shade-250);
+	--color-sticky-border-3: var(--prim-color-alt-c-shade-150);
+	--color-sticky-background-4: var(--prim-color-alt-a-shade-200);
+	--color-sticky-border-4: var(--prim-color-alt-a-shade-100);
+	--color-sticky-background-5: var(--prim-color-alt-e-shade-350);
+	--color-sticky-border-5: var(--prim-color-alt-e-shade-250);
+	--color-sticky-background-6: var(--prim-color-secondary-shade-250);
+	--color-sticky-border-6: var(--prim-color-secondary-shade-100);
+	--color-sticky-background-7: var(--prim-gray-740);
+	--color-sticky-border-7: var(--prim-gray-670);
+
+	// Expressions and autocomplete
+	--color-valid-resolvable-foreground: var(--prim-color-alt-a-tint-300);
+	--color-valid-resolvable-background: var(--prim-color-alt-a-alpha-025);
+	--color-invalid-resolvable-foreground: var(--prim-color-alt-c-tint-250);
+	--color-invalid-resolvable-background: var(--prim-color-alt-c-alpha-02);
+	--color-pending-resolvable-foreground: var(--color-text-base);
+	--color-pending-resolvable-background: var(--prim-gray-70-alpha-01);
+	--color-expression-editor-background: var(--prim-gray-800);
+	--color-expression-syntax-example: var(--prim-gray-670);
+	--color-autocomplete-item-selected: var(--prim-color-secondary-tint-200);
+	--color-autocomplete-section-header-border: var(--prim-gray-540);
+
+	// Code
+	--color-code-tags-string: var(--prim-color-alt-f-tint-150);
+	--color-code-tags-primitive: var(--prim-color-alt-b-shade-100);
+	--color-code-tags-keyword: var(--prim-color-alt-g-tint-150);
+	--color-code-tags-operator: var(--prim-color-alt-h);
+	--color-code-tags-variable: var(--prim-color-primary-tint-100);
+	--color-code-tags-definition: var(--prim-color-alt-e);
+	--color-json-default: var(--prim-color-secondary-tint-200);
+	--color-json-null: var(--prim-color-alt-c-tint-150);
+	--color-json-boolean: var(--prim-color-alt-a);
+	--color-json-number: var(--prim-color-alt-a);
+	--color-json-string: var(--prim-color-secondary-tint-200);
 	--color-json-key: var(--color-text-dark);
-	--color-json-brackets: var(--color-text-dark);
-	--color-json-brackets-hover: #1890ff;
-	--color-json-line: #bfcbd9;
-	--color-json-highlight: #dcdfea;
-
-	--color-code-background: #222020;
-	--color-code-foreground: #f8f8f2;
-	--color-code-caret: #f8f8f0;
-	--color-code-selection: #312b25;
-	--color-code-gutterBackground: #2d2a26;
-	--color-code-gutterForeground: #818080;
-	--color-code-lineHighlight: #312b25;
-	--color-code-tags-comment: #6272a4;
-	--color-code-tags-string: #f1fa8c;
-	--color-code-tags-primitive: #bd93f9;
-	--color-code-tags-keyword: #ff79c6;
-	--color-code-tags-operator: #ff79c6;
-	--color-code-tags-variable: #ea6465;
-	--color-code-tags-definition: #368da5;
-
-	// Generated Color Shades from 50 to 950
-	// Not yet used in design system
-	@each $color in ('neutral', 'success', 'warning', 'danger') {
-		@each $shade
-			in (
-				50,
-				100,
-				150,
-				200,
-				250,
-				300,
-				350,
-				400,
-				450,
-				500,
-				550,
-				600,
-				650,
-				700,
-				750,
-				800,
-				850,
-				900,
-				950
-			)
-		{
-			--color-#{$color}-#{$shade}-l: #{math.div($shade, 10)}#{'%'};
-			--color-#{$color}-#{$shade}: hsl(
-				var(--color-#{$color}-h),
-				var(--color-#{$color}-s),
-				var(--color-#{$color}-#{$shade}-l)
-			);
-		}
-	}
+	--color-json-brackets: var(--prim-gray-670);
+	--color-json-brackets-hover: var(--prim-color-alt-e);
+	--color-json-line: var(--prim-gray-200);
+	--color-json-highlight: var(--color-background-base);
+	--color-code-background: var(--prim-gray-800);
+	--color-code-background-readonly: var(--prim-gray-740);
+	--color-code-lineHighlight: var(--prim-gray-740);
+	--color-code-foreground: var(--prim-gray-70);
+	--color-code-caret: var(--prim-gray-10);
+	--color-code-selection: var(--prim-color-alt-e-alpha-04);
+	--color-code-gutterBackground: var(--prim-gray-670);
+	--color-code-gutterForeground: var(--prim-gray-320);
+	--color-code-tags-comment: var(--prim-gray-200);
+
+	// Variables
+	--color-variables-usage-font: var(--prim-color-alt-a-tint-300);
+	--color-variables-usage-syntax-bg: var(--prim-color-alt-a-alpha-025);
+
+	// Button primary
+	--color-button-primary-disabled-font: var(--prim-gray-0-alpha-025);
+	--color-button-primary-disabled-border: transparent;
+	--color-button-primary-disabled-background: var(--prim-color-primary-shade-300);
+
+	// Button secondary
+	--color-button-secondary-border: var(--prim-gray-420);
+
+	// Text button
+	--color-text-button-secondary-font: var(--prim-gray-320);
+
+	// Table
+	--color-table-header-background: var(--prim-gray-740);
+	--color-table-row-background: var(--prim-gray-820);
+	--color-table-row-even-background: var(--prim-gray-800);
+	--color-table-row-hover-background: var(--prim-gray-740);
+	--color-table-row-highlight-background: var(--color-warning-tint-1);
+
+	// Notification
+	--color-notification-background: var(--prim-gray-740);
+
+	// Execution card
+	--execution-card-background-hover: var(--color-foreground-base);
+
+	// NDV
+	--color-run-data-background: var(--prim-gray-800);
+	--color-ndv-droppable-parameter: var(--prim-color-primary);
+	--color-ndv-droppable-parameter-background: var(--prim-color-primary-alpha-010);
+	--color-ndv-droppable-parameter-active-background: var(--prim-color-alt-a-alpha-015);
+	--color-ndv-back-font: var(--prim-gray-0);
+	--color-ndv-output-error-message: var(--prim-color-alt-c-tint-150);
+
+	// Notice
+	--color-notice-warning-border: var(--prim-color-alt-b-tint-250);
+	--color-notice-warning-background: var(--prim-color-alt-b-alpha-02);
+	--color-notice-font: var(--prim-gray-0);
+
+	// Callout
+	--color-callout-info-border: var(--prim-gray-420);
+	--color-callout-info-background: var(--prim-gray-740);
+	--color-callout-info-font: var(--prim-gray-0);
+	--color-callout-success-border: var(--color-success);
+	--color-callout-success-background: var(--prim-color-alt-a-alpha-025);
+	--color-callout-success-font: var(--prim-gray-0);
+	--color-callout-warning-border: var(--color-warning);
+	--color-callout-warning-background: var(--prim-color-alt-b-alpha-02);
+	--color-callout-warning-font: var(--prim-gray-0);
+	--color-callout-danger-border: var(--color-danger);
+	--color-callout-danger-background: var(--prim-color-alt-c-alpha-02);
+	--color-callout-danger-font: var(--prim-gray-0);
+	--color-callout-secondary-border: var(--color-secondary);
+	--color-callout-secondary-background: var(--prim-color-secondary-alpha-025);
+	--color-callout-secondary-font: var(--prim-gray-0);
+
+	// Dialogs and overlays
+	--color-dialog-background: var(--prim-gray-800);
+	--color-dialog-overlay-background: var(--prim-color-alt-j-alpha-075);
+	--color-dialog-overlay-background-dark: var(--prim-color-alt-j-alpha-075);
+
+	// Avatar
+	--color-avatar-font: var(--prim-gray-0);
+
+	// Value Survey
+	--color-value-survey-background: var(--prim-gray-740);
+	--color-value-survey-font: var(--prim-gray-0);
+
+	// Switch (Activation, boolean)
+	--color-switch-background: var(--prim-gray-820);
+	--color-switch-border-color: var(--prim-gray-670);
+	--color-switch-toggle: var(--prim-gray-40);
+
+	// Action Dropdown
+	--color-action-dropdown-item-active-background: var(--color-background-xlight);
+
+	// Input Triple
+	--color-background-input-triple: var(--prim-gray-800);
+
+	// Node error
+	--color-node-error-output-text-color: var(--prim-color-alt-c-tint-150);
+
+	// MFA Recovery codes
+	--color-mfa-recovery-code-background: var(--color-background-xlight);
+	--color-mfa-recovery-code-color: var(--color-text-dark);
+	--color-mfa-lose-access-text-color: var(--prim-color-alt-c-tint-150);
+
+	// Various
+	--color-info-tint-1: var(--prim-gray-420);
+	--color-info-tint-2: var(--prim-gray-740);
+	--border-color-base: var(--color-foreground-base);
+	--border-color-light: var(--color-foreground-light);
+	--border-base: var(--border-width-base) var(--border-style-base) var(--color-foreground-base);
+	--node-type-supplemental-label-color-l: 100%;
+	--node-type-supplemental-label-color: hsl(
+		var(--node-type-supplemental-label-color-h),
+		var(--node-type-supplemental-label-color-s),
+		var(--node-type-supplemental-label-color-l)
+	);
+	--color-configurable-node-name: var(--color-text-lighter);
+	--color-secondary-link: var(--prim-color-secondary-tint-200);
+	--color-secondary-link-hover: var(--prim-color-secondary-tint-100);
+}
+
+body[data-theme='dark'] {
+	@include theme;
 }
 
 @media (prefers-color-scheme: dark) {
-	body.theme-dark-beta {
+	body:not([data-theme]) {
 		@include theme;
 	}
 }
diff --git a/packages/design-system/src/css/_tokens.scss b/packages/design-system/src/css/_tokens.scss
index 944bb55f54da8..b6998894408b8 100644
--- a/packages/design-system/src/css/_tokens.scss
+++ b/packages/design-system/src/css/_tokens.scss
@@ -1,402 +1,293 @@
 @use 'sass:math';
 
 @mixin theme {
-	--color-primary-h: 6.9;
-	--color-primary-s: 100%;
-	--color-primary-l: 67.6%;
-	--color-primary: hsl(var(--color-primary-h), var(--color-primary-s), var(--color-primary-l));
-
-	--color-primary-tint-1-l: 88%;
-	--color-primary-tint-1: hsl(
-		var(--color-primary-h),
-		var(--color-primary-s),
-		var(--color-primary-tint-1-l)
-	);
-
-	--color-primary-tint-2-l: 94.5%;
-	--color-primary-tint-2: hsl(
-		var(--color-primary-h),
-		var(--color-primary-s),
-		var(--color-primary-tint-2-l)
-	);
-
-	--color-primary-tint-3-l: 96.9%;
-	--color-primary-tint-3: hsl(
-		var(--color-primary-h),
-		var(--color-primary-s),
-		var(--color-primary-tint-3-l)
-	);
-
-	--color-primary-shade-1-l: 57.6%;
-	--color-primary-shade-1: hsl(
-		var(--color-primary-h),
-		var(--color-primary-s),
-		var(--color-primary-shade-1-l)
-	);
-
-	--color-primary-shade-2-l: 23%;
-	--color-primary-shade-2: hsl(
-		var(--color-primary-h),
-		var(--color-primary-s),
-		var(--color-primary-shade-2-l)
-	);
-
-	--color-avatar-accent-1-h: 40;
-	--color-avatar-accent-1-s: 15.3%;
-	--color-avatar-accent-1-l: 88.4%;
-	--color-avatar-accent-1: hsl(
-		var(--color-avatar-accent-1-h),
-		var(--color-avatar-accent-1-s),
-		var(--color-avatar-accent-1-l)
-	);
-
-	--color-avatar-accent-2-h: 212;
-	--color-avatar-accent-2-s: 71%;
-	--color-avatar-accent-2-l: 48.6%;
-	--color-avatar-accent-2: hsl(
-		var(--color-avatar-accent-2-h),
-		var(--color-avatar-accent-2-s),
-		var(--color-avatar-accent-2-l)
-	);
-
-	--color-secondary-h: 247;
-	--color-secondary-s: 49%;
-	--color-secondary-l: 53%;
-	--color-secondary: hsl(
-		var(--color-secondary-h),
-		var(--color-secondary-s),
-		var(--color-secondary-l)
-	);
-
-	--color-secondary-tint-1-l: 85%;
-	--color-secondary-tint-1: hsl(
-		var(--color-secondary-h),
-		var(--color-secondary-s),
-		var(--color-secondary-tint-1-l)
-	);
-
-	--color-secondary-tint-2-l: 92%;
-	--color-secondary-tint-2: hsl(
-		var(--color-secondary-h),
-		var(--color-secondary-s),
-		var(--color-secondary-tint-2-l)
-	);
-
-	--color-secondary-tint-3-l: 95%;
-	--color-secondary-tint-3: hsl(
-		var(--color-secondary-h),
-		var(--color-secondary-s),
-		var(--color-secondary-tint-3-l)
-	);
-
-	--color-secondary-tint-4-l: 98%;
-	--color-secondary-tint-4: hsl(
-		var(--color-secondary-h),
-		var(--color-secondary-s),
-		var(--color-secondary-tint-4-l)
-	);
-
-	--color-success-h: 150.4;
-	--color-success-s: 60%;
-	--color-success-l: 40.4%;
-	--color-success: hsl(var(--color-success-h), var(--color-success-s), var(--color-success-l));
-
-	--color-success-tint-1-l: 90%;
-	--color-success-tint-1: hsl(
-		var(--color-success-h),
-		var(--color-success-s),
-		var(--color-success-tint-1-l)
-	);
-
-	--color-success-tint-2-l: 94.9%;
-	--color-success-tint-2: hsl(
-		var(--color-success-h),
-		var(--color-success-s),
-		var(--color-success-tint-2-l)
-	);
-
-	--color-success-light-h: 150;
-	--color-success-light-s: 54%;
-	--color-success-light-l: 70%;
-	--color-success-light: hsl(
-		var(--color-success-light-h),
-		var(--color-success-light-s),
-		var(--color-success-light-l)
-	);
-
-	--color-warning-h: 36;
-	--color-warning-s: 77%;
-	--color-warning-l: 57%;
-	--color-warning: hsl(var(--color-warning-h), var(--color-warning-s), var(--color-warning-l));
-
-	--color-warning-tint-1-h: 35;
-	--color-warning-tint-1-s: 77%;
-	--color-warning-tint-1-l: 84%;
-	--color-warning-tint-1: hsl(
-		var(--color-warning-h),
-		var(--color-warning-s),
-		var(--color-warning-tint-1-l)
-	);
-
-	--color-warning-tint-2-h: 34;
-	--color-warning-tint-2-s: 80%;
-	--color-warning-tint-2-l: 96%;
-	--color-warning-tint-2: hsl(
-		var(--color-warning-tint-2-h),
-		var(--color-warning-tint-2-s),
-		var(--color-warning-tint-2-l)
-	);
-
-	--color-danger-h: 355;
-	--color-danger-s: 83%;
-	--color-danger-l: 52%;
-	--color-danger: hsl(var(--color-danger-h), var(--color-danger-s), var(--color-danger-l));
-
-	--color-danger-tint-1-l: 93.9%;
-	--color-danger-tint-1: hsl(
-		var(--color-danger-h),
-		var(--color-danger-s),
-		var(--color-danger-tint-1-l)
-	);
-	--color-danger-tint-2-l: 96.9%;
-	--color-danger-tint-2: hsl(
-		var(--color-danger-h),
-		var(--color-danger-s),
-		var(--color-danger-tint-2-l)
-	);
-
-	--color-info-h: 220;
-	--color-info-s: 4%;
-	--color-info-l: 58%;
-	--color-info: hsl(var(--color-info-h), var(--color-info-s), var(--color-info-l));
-
-	--color-info-tint-1-l: 88%;
-	--color-info-tint-1: hsl(var(--color-info-h), var(--color-info-s), var(--color-info-tint-1-l));
-	--color-info-tint-2-l: 96%;
-	--color-info-tint-2: hsl(var(--color-info-h), var(--color-info-s), var(--color-info-tint-2-l));
-
-	--color-grey-h: 228;
-	--color-grey-s: 10%;
-	--color-grey-l: 80%;
-	--color-grey: hsl(var(--color-grey-h), var(--color-grey-s), var(--color-grey-l));
-
-	--color-light-grey-h: 220;
-	--color-light-grey-s: 20%;
-	--color-light-grey-l: 88%;
-	--color-light-grey: hsl(
-		var(--color-light-grey-h),
-		var(--color-light-grey-s),
-		var(--color-light-grey-l)
-	);
-
-	--color-neutral-h: 228;
-	--color-neutral-s: 10%;
-	--color-neutral-l: 50%;
-	--color-neutral: hsl(var(--color-neutral-h), var(--color-neutral-s), var(--color-neutral-l));
-
-	--color-text-dark-h: 0;
-	--color-text-dark-s: 0%;
-	--color-text-dark-l: 33.3%;
-	--color-text-dark: hsl(
-		var(--color-text-dark-h),
-		var(--color-text-dark-s),
-		var(--color-text-dark-l)
-	);
-
-	--color-text-base-h: 240;
-	--color-text-base-s: 4%;
-	--color-text-base-l: 51%;
-	--color-text-base: hsl(
-		var(--color-text-base-h),
-		var(--color-text-base-s),
-		var(--color-text-base-l)
-	);
-
-	--color-text-light-h: 220;
-	--color-text-light-s: 4.2%;
-	--color-text-light-l: 58.2%;
-	--color-text-light: hsl(
-		var(--color-text-light-h),
-		var(--color-text-light-s),
-		var(--color-text-light-l)
-	);
-
-	--color-text-lighter-h: 222;
-	--color-text-lighter-s: 16.7%;
-	--color-text-lighter-l: 88.2%;
-	--color-text-lighter: hsl(
-		var(--color-text-lighter-h),
-		var(--color-text-lighter-s),
-		var(--color-text-lighter-l)
-	);
-
-	--color-text-xlight-h: 0;
-	--color-text-xlight-s: 0%;
-	--color-text-xlight-l: 100%;
-	--color-text-xlight: hsl(
-		var(--color-text-xlight-h),
-		var(--color-text-xlight-s),
-		var(--color-text-xlight-l)
-	);
-
-	--color-foreground-xdark-h: 220;
-	--color-foreground-xdark-s: 7.4%;
-	--color-foreground-xdark-l: 52.5%;
-	--color-foreground-xdark: hsl(
-		var(--color-foreground-xdark-h),
-		var(--color-foreground-xdark-s),
-		var(--color-foreground-xdark-l)
-	);
-
-	--color-foreground-dark-h: 228;
-	--color-foreground-dark-s: 9.6%;
-	--color-foreground-dark-l: 79.6%;
-	--color-foreground-dark: hsl(
-		var(--color-foreground-dark-h),
-		var(--color-foreground-dark-s),
-		var(--color-foreground-dark-l)
-	);
-
-	--color-foreground-base-h: 220;
-	--color-foreground-base-s: 20%;
-	--color-foreground-base-l: 88.2%;
-	--color-foreground-base: hsl(
-		var(--color-foreground-base-h),
-		var(--color-foreground-base-s),
-		var(--color-foreground-base-l)
-	);
-
-	--color-foreground-light-h: 0;
-	--color-foreground-light-s: 0%;
-	--color-foreground-light-l: 93.3%;
-	--color-foreground-light: hsl(
-		var(--color-foreground-light-h),
-		var(--color-foreground-light-s),
-		var(--color-foreground-light-l)
-	);
-
-	--color-foreground-xlight-h: 0;
-	--color-foreground-xlight-s: 0%;
-	--color-foreground-xlight-l: 100%;
-	--color-foreground-xlight: hsl(
-		var(--color-foreground-xlight-h),
-		var(--color-foreground-xlight-s),
-		var(--color-foreground-xlight-l)
-	);
-
-	--color-background-dark-h: 240;
-	--color-background-dark-s: 4.2%;
-	--color-background-dark-l: 18.8%;
-	--color-background-dark: hsl(
-		var(--color-background-dark-h),
-		var(--color-background-dark-s),
-		var(--color-background-dark-l)
-	);
-
-	--color-background-base-h: 220;
-	--color-background-base-s: 30%;
-	--color-background-base-l: 96.1%;
-	--color-background-base: hsl(
-		var(--color-background-base-h),
-		var(--color-background-base-s),
-		var(--color-background-base-l)
-	);
-
-	--color-background-light-h: 220;
-	--color-background-light-s: 60%;
-	--color-background-light-l: 99%;
-	--color-background-light: hsl(
-		var(--color-background-light-h),
-		var(--color-background-light-s),
-		var(--color-background-light-l)
-	);
-
-	--color-background-lighter-h: 252;
-	--color-background-lighter-s: 71.4%;
-	--color-background-lighter-l: 98.6%;
-	--color-background-lighter: hsl(
-		var(--color-background-lighter-h),
-		var(--color-background-lighter-s),
-		var(--color-background-lighter-l)
-	);
-
-	--color-background-xlight-h: 0;
-	--color-background-xlight-s: 0%;
-	--color-background-xlight-l: 100%;
-	--color-background-xlight: hsl(
-		var(--color-background-xlight-h),
-		var(--color-background-xlight-s),
-		var(--color-background-xlight-l)
-	);
-
-	--color-canvas-dot-h: 204;
-	--color-canvas-dot-s: 15.6%;
-	--color-canvas-dot-l: 87.5%;
-	--color-canvas-dot: hsl(
-		var(--color-canvas-dot-h),
-		var(--color-canvas-dot-s),
-		var(--color-canvas-dot-l)
-	);
-
-	--color-canvas-background-h: 260;
-	--color-canvas-background-s: 100%;
-	--color-canvas-background-l: 99.4%;
-	--color-canvas-background: hsl(
-		var(--color-canvas-background-h),
-		var(--color-canvas-background-s),
-		var(--color-canvas-background-l)
-	);
-
-	--color-json-default: #5045a1;
-	--color-json-null: var(--color-danger);
-	--color-json-boolean: var(--color-success);
-	--color-json-number: var(--color-success);
-	--color-json-string: #5045a1;
-	--color-json-key: var(--color-text-dark);
-	--color-json-brackets: var(--color-text-dark);
-	--color-json-brackets-hover: #1890ff;
-	--color-json-line: #bfcbd9;
-	--color-json-highlight: #e2e5ee;
-
-	--color-sticky-default-background-h: 46;
-	--color-sticky-default-background-s: 100%;
-	--color-sticky-default-background-l: 92%;
-	--color-sticky-default-background: hsl(
-		var(--color-sticky-default-background-h),
-		var(--color-sticky-default-background-s),
-		var(--color-sticky-default-background-l)
-	);
-
-	--color-sticky-default-border-h: 43;
-	--color-sticky-default-border-s: 75%;
-	--color-sticky-default-border-l: 80%;
-	--color-sticky-default-border: hsl(
-		var(--color-sticky-default-border-h),
-		var(--color-sticky-default-border-s),
-		var(--color-sticky-default-border-l)
-	);
-
-	--color-code-background: #ffffff;
-	--color-code-foreground: #4d4d4c;
-	--color-code-caret: #aeafad;
-	--color-code-selection: #d6d6d6;
-	--color-code-gutterBackground: #ffffff;
-	--color-code-gutterForeground: #4d4d4c80;
-	--color-code-lineHighlight: #efefef;
-	--color-code-tags-comment: #8e908c;
-	--color-code-tags-string: #718c00;
-	--color-code-tags-primitive: #f5871f;
-	--color-code-tags-keyword: #8959a8;
-	--color-code-tags-operator: #3e999f;
-	--color-code-tags-variable: #c82829;
-	--color-code-tags-definition: #4271ae;
-
-	--color-expression-editor-background: #fff;
-	--color-valid-resolvable-foreground: #29a568;
-	--color-valid-resolvable-background: #e1f3d8;
-	--color-invalid-resolvable-foreground: #f45959;
-	--color-invalid-resolvable-background: #fef0f0;
-	--color-expression-syntax-example: #f0f0f0;
+	--color-primary-h: var(--prim-color-primary-h);
+	--color-primary-s: var(--prim-color-primary-s);
+	--color-primary-l: 68%;
+
+	// Primary tokens
+
+	// Primary
+	--color-primary-shade-1: var(--prim-color-primary-shade-100);
+	--color-primary: var(--prim-color-primary);
+	--color-primary-tint-1: var(--prim-color-primary-tint-200);
+	--color-primary-tint-2: var(--prim-color-primary-tint-250);
+	--color-primary-tint-3: var(--prim-color-primary-tint-300);
+
+	// Secondary
+	--color-secondary-shade-1: var(--prim-color-secondary-shade-100);
+	--color-secondary: var(--prim-color-secondary);
+	--color-secondary-tint-1: var(--prim-color-secondary-tint-300);
+	--color-secondary-tint-3: var(--prim-color-secondary-tint-400);
+
+	// Success
+	--color-success-shade-1: var(--prim-color-alt-a-shade-100);
+	--color-success: var(--prim-color-alt-a);
+	--color-success-light: var(--prim-color-alt-a-tint-300);
+	--color-success-light-2: var(--prim-color-alt-a-tint-400);
+	--color-success-tint-1: var(--prim-color-alt-a-tint-500);
+	--color-success-tint-2: var(--prim-color-alt-a-tint-550);
+
+	// Warning
+	--color-warning-shade-1: var(--prim-color-alt-b-shade-100);
+	--color-warning: var(--prim-color-alt-b);
+	--color-warning-tint-1: var(--prim-color-alt-b-tint-250);
+	--color-warning-tint-2: var(--prim-color-alt-b-tint-400);
+
+	// Danger
+	--color-danger-shade-1: var(--prim-color-alt-c-shade-100);
+	--color-danger: var(--prim-color-alt-c);
+	--color-danger-tint-1: var(--prim-color-alt-c-tint-400);
+	--color-danger-tint-2: var(--prim-color-alt-c-tint-450);
+
+	// Text
+	--color-text-dark: var(--prim-gray-740);
+	--color-text-base: var(--prim-gray-540);
+	--color-text-light: var(--prim-gray-420);
+	--color-text-lighter: var(--prim-gray-120);
+	--color-text-xlight: var(--prim-gray-0);
+	--color-text-danger: var(--prim-color-alt-c);
+
+	// Foreground
+	--color-foreground-xdark: var(--prim-gray-490);
+	--color-foreground-dark: var(--prim-gray-200);
+	--color-foreground-base: var(--prim-gray-120);
+	--color-foreground-light: var(--prim-gray-70);
+	--color-foreground-xlight: var(--prim-gray-0);
+
+	// Background
+	--color-background-dark: var(--prim-gray-820);
+	--color-background-medium: var(--prim-gray-120);
+	--color-background-base: var(--prim-gray-40);
+	--color-background-light: var(--prim-gray-10);
+	--color-background-xlight: var(--prim-gray-0);
+
+	// Secondary tokens
+
+	// LangChain
+	--color-lm-chat-messages-background: var(--color-background-base);
+	--color-lm-chat-bot-background: var(--prim-gray-0);
+	--color-lm-chat-bot-color: var(--color-text-dark);
+	--color-lm-chat-user-background: var(--prim-color-alt-a);
+	--color-lm-chat-user-color: var(--color-text-xlight);
+
+	// Canvas
+	--color-canvas-background: var(--prim-gray-10);
+	--color-canvas-background-h: var(--prim-gray-h); // Used for connectors labels background
+	--color-canvas-background-s: 47%;
+	--color-canvas-background-l: 99%;
+	--color-canvas-dot: var(--prim-gray-120);
+	--color-canvas-read-only-line: var(--prim-gray-30);
+	--color-canvas-node-background: var(--prim-gray-0);
+	--color-canvas-node-pinned-border: var(--color-secondary);
+	--color-canvas-selected: var(--prim-gray-70);
+	--node-type-main-color: var(--prim-gray-490);
+
+	// Sticky
+	--color-sticky-background: var(--prim-color-alt-d);
+	--color-sticky-border: var(--prim-color-alt-d-shade-150);
+	--color-sticky-font: var(--prim-gray-740);
+	--color-sticky-code-font: var(--color-secondary);
+	--color-sticky-code-background: var(--color-background-base);
+
+	--color-sticky-background-1: var(--color-sticky-background);
+	--color-sticky-border-1: var(--color-sticky-border);
+	--color-sticky-background-2: var(--prim-color-alt-b-tint-300);
+	--color-sticky-border-2: var(--prim-color-alt-b-tint-150);
+	--color-sticky-background-3: var(--prim-color-alt-c-tint-400);
+	--color-sticky-border-3: var(--prim-color-alt-c-tint-300);
+	--color-sticky-background-4: var(--prim-color-alt-a-tint-500);
+	--color-sticky-border-4: var(--prim-color-alt-a-tint-300);
+	--color-sticky-background-5: var(--prim-color-alt-e-tint-350);
+	--color-sticky-border-5: var(--prim-color-alt-e-tint-250);
+	--color-sticky-background-6: var(--prim-color-secondary-tint-400);
+	--color-sticky-border-6: var(--prim-color-secondary-tint-300);
+	--color-sticky-background-7: var(--prim-gray-10);
+	--color-sticky-border-7: var(--prim-gray-120);
+
+	// Expressions and autocomplete
+	--color-valid-resolvable-foreground: var(--prim-color-alt-a);
+	--color-valid-resolvable-background: var(--prim-color-alt-a-tint-500);
+	--color-invalid-resolvable-foreground: var(--prim-color-alt-c);
+	--color-invalid-resolvable-background: var(--prim-color-alt-c-tint-450);
+	--color-pending-resolvable-foreground: var(--color-text-base);
+	--color-pending-resolvable-background: var(--prim-gray-40);
+	--color-expression-editor-background: var(--prim-gray-0);
+	--color-expression-syntax-example: var(--prim-gray-40);
+	--color-autocomplete-item-selected: var(--color-secondary);
+	--color-autocomplete-section-header-border: var(--color-foreground-light);
+
+	// Code
+	--color-code-tags-string: var(--prim-color-alt-f);
+	--color-code-tags-primitive: var(--prim-color-alt-b-shade-100);
+	--color-code-tags-keyword: var(--prim-color-alt-g);
+	--color-code-tags-operator: var(--prim-color-alt-h);
+	--color-code-tags-variable: var(--prim-color-alt-c-shade-100);
+	--color-code-tags-definition: var(--prim-color-alt-e-shade-150);
+	--color-json-default: var(--prim-color-secondary-shade-100);
+	--color-json-null: var(--prim-color-alt-c);
+	--color-json-boolean: var(--prim-color-alt-a);
+	--color-json-number: var(--prim-color-alt-a);
+	--color-json-string: var(--prim-color-secondary-shade-100);
+	--color-json-key: var(--prim-gray-670);
+	--color-json-brackets: var(--prim-gray-670);
+	--color-json-brackets-hover: var(--prim-color-alt-e);
+	--color-json-line: var(--prim-gray-200);
+	--color-json-highlight: var(--prim-gray-70);
+	--color-code-background: var(--prim-gray-0);
+	--color-code-background-readonly: var(--prim-gray-40);
+	--color-code-lineHighlight: var(--prim-gray-40);
+	--color-code-foreground: var(--prim-gray-670);
+	--color-code-caret: var(--prim-gray-420);
+	--color-code-selection: var(--prim-gray-120);
+	--color-code-gutterBackground: var(--prim-gray-0);
+	--color-code-gutterForeground: var(--prim-gray-320);
+	--color-code-tags-comment: var(--prim-gray-420);
+
+	// Variables
+	--color-variables-usage-font: var(--color-success);
+	--color-variables-usage-syntax-bg: var(--color-success-tint-2);
+
+	// Button primary
+	--color-button-primary-font: var(--prim-gray-0);
+	--color-button-primary-border: var(--prim-color-primary);
+	--color-button-primary-background: var(--prim-color-primary);
+	--color-button-primary-hover-active-border: var(--prim-color-primary-shade-100);
+	--color-button-primary-hover-active-background: var(--prim-color-primary-shade-100);
+	--color-button-primary-focus-outline: var(--prim-color-primary-tint-200);
+	--color-button-primary-disabled-font: var(--prim-gray-0-alpha-075);
+	--color-button-primary-disabled-border: var(--prim-color-primary-tint-200);
+	--color-button-primary-disabled-background: var(--prim-color-primary-tint-200);
+
+	// Button secondary
+	--color-button-secondary-font: var(--prim-gray-670);
+	--color-button-secondary-border: var(--prim-gray-320);
+	--color-button-secondary-background: var(--prim-gray-0);
+	--color-button-secondary-hover-active-focus-font: var(--prim-color-primary);
+	--color-button-secondary-hover-active-border: var(--prim-color-primary);
+	--color-button-secondary-hover-background: var(--prim-color-primary-tint-300);
+	--color-button-secondary-active-background: var(--prim-color-primary-tint-250);
+	--color-button-secondary-focus-outline: var(--prim-gray-120);
+	--color-button-secondary-disabled-font: var(--prim-gray-200);
+	--color-button-secondary-disabled-border: var(--prim-gray-200);
+
+	// Button success, warning, danger
+	--color-button-success-font: var(--prim-gray-0);
+	--color-button-success-disabled-font: var(--prim-gray-0-alpha-075);
+	--color-button-warning-font: var(--color-text-xlight);
+	--color-button-warning-disabled-font: var(--prim-gray-0-alpha-075);
+	--color-button-danger-font: var(--color-text-xlight);
+	--color-button-danger-disabled-font: var(--prim-gray-0-alpha-075);
+
+	// Text button
+	--color-text-button-secondary-font: var(--prim-gray-670);
+
+	// Node Creator Button
+	--color-button-node-creator-border-font: var(--prim-gray-540);
+	--color-button-node-creator-hover-border-font: var(--prim-color-primary);
+	--color-button-node-creator-background: var(--prim-gray-0);
+
+	// Table
+	--color-table-header-background: var(--color-background-base);
+	--color-table-row-background: var(--color-background-xlight);
+	--color-table-row-even-background: var(--color-background-light);
+	--color-table-row-hover-background: var(--color-primary-tint-3);
+	--color-table-row-highlight-background: var(--color-warning-tint-1);
+
+	// Notification
+	--color-notification-background: var(--color-background-xlight);
+
+	// Execution card
+	--execution-card-border-success: var(--prim-color-alt-a-tint-300);
+	--execution-card-border-error: var(--prim-color-alt-c-tint-250);
+	--execution-card-border-waiting: var(--prim-color-secondary-tint-300);
+	--execution-card-border-running: var(--prim-color-alt-b-tint-250);
+	--execution-card-border-unknown: var(--prim-gray-120);
+	--execution-card-background-hover: var(--color-foreground-light);
+
+	// NDV
+	--color-run-data-background: var(--color-background-base);
+	--color-ndv-droppable-parameter: var(--color-secondary);
+	--color-ndv-droppable-parameter-background: var(--prim-color-secondary-alpha-010);
+	--color-ndv-droppable-parameter-active-background: var(--prim-color-alt-a-alpha-015);
+	--color-ndv-back-font: var(--prim-gray-0);
+	--color-ndv-output-error-message: var(--prim-color-alt-c);
+
+	// Notice
+	--color-notice-warning-border: var(--color-warning-tint-1);
+	--color-notice-warning-background: var(--color-warning-tint-2);
+	--color-notice-font: var(--color-text-base);
+
+	// Callout
+	--color-callout-info-border: var(--color-foreground-base);
+	--color-callout-info-background: var(--color-foreground-xlight);
+	--color-callout-info-font: var(--color-info);
+	--color-callout-info-icon: var(--color-info);
+	--color-callout-success-border: var(--color-success-light-2);
+	--color-callout-success-background: var(--color-success-tint-2);
+	--color-callout-success-font: var(--color-success);
+	--color-callout-success-icon: var(--color-success);
+	--color-callout-warning-border: var(--color-warning-tint-1);
+	--color-callout-warning-background: var(--color-warning-tint-2);
+	--color-callout-warning-font: var(--color-warning);
+	--color-callout-warning-icon: var(--color-warning);
+	--color-callout-danger-border: var(--color-danger-tint-1);
+	--color-callout-danger-background: var(--color-danger-tint-2);
+	--color-callout-danger-font: var(--color-danger);
+	--color-callout-danger-icon: var(--color-danger);
+	--color-callout-secondary-border: var(--color-secondary-tint-1);
+	--color-callout-secondary-background: var(--color-secondary-tint-3);
+	--color-callout-secondary-font: var(--color-secondary);
+	--color-callout-secondary-icon: var(--color-secondary);
+
+	// Dialogs and overlays
+	--color-dialog-background: var(--prim-gray-0);
+	--color-dialog-overlay-background: var(--prim-gray-0-alpha-075);
+	--color-dialog-overlay-background-dark: var(--prim-color-alt-j-alpha-075);
+	--color-block-ui-overlay: var(--prim-gray-820);
+
+	// Avatar
+	--color-avatar-font: var(--color-text-xlight);
+
+	// Value Survey
+	--color-value-survey-background: var(--prim-gray-740);
+	--color-value-survey-font: var(--prim-gray-0);
+
+	// Action Dropdown
+	--color-action-dropdown-item-active-background: var(--color-background-base);
+
+	// Switch (Activation, boolean)
+	--color-switch-background: var(--prim-gray-420);
+	--color-switch-active-background: var(--prim-color-alt-i);
+	--color-switch-border-color: transparent;
+	--color-switch-toggle: var(--prim-gray-0);
+
+	// Feature Request
+	--color-feature-request-font: var(--prim-gray-0);
+
+	// Input Triple
+	--color-background-input-triple: var(--color-background-light);
+
+	// Node error
+	--color-node-error-output-text-color: var(--color-danger);
+
+	// MFA Recovery codes
+	--color-mfa-recovery-code-background: var(--color-background-base);
+	--color-mfa-recovery-code-color: var(--prim-gray-490);
+	--color-mfa-lose-access-text-color: var(--color-danger);
+
+	// Various
+	--color-avatar-accent-1: var(--prim-gray-120);
+	--color-avatar-accent-2: var(--prim-color-alt-e-shade-100);
+	--color-info: var(--prim-gray-420);
+	--color-info-tint-1: var(--prim-gray-120);
+	--color-info-tint-2: var(--prim-gray-40);
+	--color-grey: var(--prim-gray-200);
+	--color-light-grey: var(--prim-gray-120);
+	--color-neutral: var(--prim-gray-490);
+	--color-configurable-node-name: var(--color-text-dark);
+	--color-secondary-link: var(--color-secondary);
+	--color-secondary-link-hover: var(--color-secondary-shade-1);
 
 	// Generated Color Shades from 50 to 950
 	// Not yet used in design system
@@ -433,6 +324,10 @@
 		}
 	}
 
+	--box-shadow-base: 0 2px 4px rgba(0, 0, 0, 0.12), 0 0 6px rgba(0, 0, 0, 0.04);
+	--box-shadow-dark: 0 2px 4px rgba(0, 0, 0, 0.12), 0 0 6px rgba(0, 0, 0, 0.12);
+	--box-shadow-light: 0 2px 12px 0 rgba(0, 0, 0, 0.07);
+
 	--border-radius-xlarge: 12px;
 	--border-radius-large: 8px;
 	--border-radius-base: 4px;
diff --git a/packages/design-system/src/css/alert.scss b/packages/design-system/src/css/alert.scss
index 449aecada80bd..9e7a7afb093a0 100644
--- a/packages/design-system/src/css/alert.scss
+++ b/packages/design-system/src/css/alert.scss
@@ -141,7 +141,7 @@
 	}
 }
 
-.el-alert-fade-enter,
+.el-alert-fade-enter-from,
 .el-alert-fade-leave-active {
 	opacity: 0;
 }
diff --git a/packages/design-system/src/css/carousel.scss b/packages/design-system/src/css/carousel.scss
index 44032e1c6dfce..45ed4defa9b61 100644
--- a/packages/design-system/src/css/carousel.scss
+++ b/packages/design-system/src/css/carousel.scss
@@ -148,13 +148,13 @@
 	}
 }
 
-.carousel-arrow-left-enter,
+.carousel-arrow-left-enter-from,
 .carousel-arrow-left-leave-active {
 	transform: translateY(-50%) translateX(-10px);
 	opacity: 0;
 }
 
-.carousel-arrow-right-enter,
+.carousel-arrow-right-enter-from,
 .carousel-arrow-right-leave-active {
 	transform: translateY(-50%) translateX(10px);
 	opacity: 0;
diff --git a/packages/design-system/src/css/checkbox.scss b/packages/design-system/src/css/checkbox.scss
index aa31707b70357..3c1a1ddb4e295 100644
--- a/packages/design-system/src/css/checkbox.scss
+++ b/packages/design-system/src/css/checkbox.scss
@@ -196,7 +196,8 @@
 		height: var.$checkbox-input-height;
 		background-color: var.$checkbox-background-color;
 		z-index: var.$index-normal;
-		transition: border-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46),
+		transition:
+			border-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46),
 			background-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46);
 
 		&:hover {
@@ -276,7 +277,7 @@
 			color: var(--color-primary);
 		}
 
-		& [class*='el-icon-'] {
+		& .el-icon {
 			line-height: 0.9;
 
 			& + span {
diff --git a/packages/design-system/src/css/color-picker.scss b/packages/design-system/src/css/color-picker.scss
index 7a8e82e24995d..2e5b61383d1dd 100644
--- a/packages/design-system/src/css/color-picker.scss
+++ b/packages/design-system/src/css/color-picker.scss
@@ -134,7 +134,9 @@
 			cursor: head;
 			width: 4px;
 			height: 4px;
-			box-shadow: 0 0 0 1.5px #fff, inset 0 0 1px 1px rgba(0, 0, 0, 0.3),
+			box-shadow:
+				0 0 0 1.5px #fff,
+				inset 0 0 1px 1px rgba(0, 0, 0, 0.3),
 				0 0 1px 2px rgba(0, 0, 0, 0.4);
 			border-radius: 50%;
 			transform: translate(-2px, -2px);
@@ -196,12 +198,9 @@
 
 	@include mixins.e(main-wrapper) {
 		margin-bottom: 6px;
-
-		&::after {
-			content: '';
-			display: table;
-			clear: both;
-		}
+		display: flex;
+		flex-direction: row-reverse;
+		justify-content: space-between;
 	}
 
 	@include mixins.e(btns) {
diff --git a/packages/design-system/src/css/common/popup.scss b/packages/design-system/src/css/common/popup.scss
index 34a2195b5d894..2db9bd304515b 100644
--- a/packages/design-system/src/css/common/popup.scss
+++ b/packages/design-system/src/css/common/popup.scss
@@ -1,11 +1,11 @@
 @use './var.scss';
 @use '../mixins/mixins';
 
-.v-modal-enter {
+.v-modal-enter-from {
 	animation: v-modal-in 0.2s ease;
 }
 
-.v-modal-leave {
+.v-modal-leave-to {
 	animation: v-modal-out 0.2s ease forwards;
 }
 
diff --git a/packages/design-system/src/css/common/transition.scss b/packages/design-system/src/css/common/transition.scss
index ce49d94895624..efdae0e9e5f7b 100644
--- a/packages/design-system/src/css/common/transition.scss
+++ b/packages/design-system/src/css/common/transition.scss
@@ -4,8 +4,8 @@
 .fade-in-linear-leave-active {
 	transition: var.$fade-linear-transition;
 }
-.fade-in-linear-enter,
-.fade-in-linear-leave,
+.fade-in-linear-enter-from,
+.fade-in-linear-leave-from,
 .fade-in-linear-leave-active {
 	opacity: 0;
 }
@@ -14,8 +14,8 @@
 .el-fade-in-linear-leave-active {
 	transition: var.$fade-linear-transition;
 }
-.el-fade-in-linear-enter,
-.el-fade-in-linear-leave,
+.el-fade-in-linear-enter-from,
+.el-fade-in-linear-leave-from,
 .el-fade-in-linear-leave-active {
 	opacity: 0;
 }
@@ -24,7 +24,7 @@
 .el-fade-in-leave-active {
 	transition: all 0.3s cubic-bezier(0.55, 0, 0.1, 1);
 }
-.el-fade-in-enter,
+.el-fade-in-enter-from,
 .el-fade-in-leave-active {
 	opacity: 0;
 }
@@ -33,7 +33,7 @@
 .el-zoom-in-center-leave-active {
 	transition: all 0.3s cubic-bezier(0.55, 0, 0.1, 1);
 }
-.el-zoom-in-center-enter,
+.el-zoom-in-center-enter-from,
 .el-zoom-in-center-leave-active {
 	opacity: 0;
 	transform: scaleX(0);
@@ -45,8 +45,12 @@
 	transform: scaleY(1);
 	transition: var.$md-fade-transition;
 	transform-origin: center top;
+
+	&[data-popper-placement^='top'] {
+		transform-origin: center bottom;
+	}
 }
-.el-zoom-in-top-enter,
+.el-zoom-in-top-enter-from,
 .el-zoom-in-top-leave-active {
 	opacity: 0;
 	transform: scaleY(0);
@@ -59,7 +63,7 @@
 	transition: var.$md-fade-transition;
 	transform-origin: center bottom;
 }
-.el-zoom-in-bottom-enter,
+.el-zoom-in-bottom-enter-from,
 .el-zoom-in-bottom-leave-active {
 	opacity: 0;
 	transform: scaleY(0);
@@ -72,24 +76,30 @@
 	transition: var.$md-fade-transition;
 	transform-origin: top left;
 }
-.el-zoom-in-left-enter,
+.el-zoom-in-left-enter-from,
 .el-zoom-in-left-leave-active {
 	opacity: 0;
 	transform: scale(0.45, 0.45);
 }
 
 .collapse-transition {
-	transition: 0.3s height ease-in-out, 0.3s padding-top ease-in-out, 0.3s padding-bottom ease-in-out;
+	transition:
+		0.3s height ease-in-out,
+		0.3s padding-top ease-in-out,
+		0.3s padding-bottom ease-in-out;
 }
 .horizontal-collapse-transition {
-	transition: 0.3s width ease-in-out, 0.3s padding-left ease-in-out, 0.3s padding-right ease-in-out;
+	transition:
+		0.3s width ease-in-out,
+		0.3s padding-left ease-in-out,
+		0.3s padding-right ease-in-out;
 }
 
 .el-list-enter-active,
 .el-list-leave-active {
 	transition: all 1s;
 }
-.el-list-enter,
+.el-list-enter-from,
 .el-list-leave-active {
 	opacity: 0;
 	transform: translateY(-30px);
diff --git a/packages/design-system/src/css/common/var.scss b/packages/design-system/src/css/common/var.scss
index b5555dea2e804..e2e6d4e46cad4 100644
--- a/packages/design-system/src/css/common/var.scss
+++ b/packages/design-system/src/css/common/var.scss
@@ -10,7 +10,8 @@
 $all-transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
 $fade-transition: opacity 300ms cubic-bezier(0.23, 1, 0.32, 1);
 $fade-linear-transition: opacity 200ms linear;
-$md-fade-transition: transform 300ms cubic-bezier(0.23, 1, 0.32, 1),
+$md-fade-transition:
+	transform 300ms cubic-bezier(0.23, 1, 0.32, 1),
 	opacity 300ms cubic-bezier(0.23, 1, 0.32, 1);
 $border-transition-base: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
 $color-transition-base: color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
@@ -20,162 +21,36 @@ $color-transition-base: color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
 $color-white: var(--color-foreground-xlight);
 $color-black: var(--color-foreground-dark);
 
-$color-primary-light-1: function.lightness(
-	--color-primary-h,
-	--color-primary-s,
-	--color-primary-l,
-	4%
-);
-$color-primary-light-2: function.lightness(
-	--color-primary-h,
-	--color-primary-s,
-	--color-primary-l,
-	8%
-);
-$color-primary-light-3: function.lightness(
-	--color-primary-h,
-	--color-primary-s,
-	--color-primary-l,
-	12%
-);
-$color-primary-light-4: function.lightness(
-	--color-primary-h,
-	--color-primary-s,
-	--color-primary-l,
-	16%
-);
-$color-primary-light-5: function.lightness(
-	--color-primary-h,
-	--color-primary-s,
-	--color-primary-l,
-	20%
-);
-$color-primary-light-6: function.lightness(
-	--color-primary-h,
-	--color-primary-s,
-	--color-primary-l,
-	24%
-);
-$color-primary-light-7: function.lightness(
-	--color-primary-h,
-	--color-primary-s,
-	--color-primary-l,
-	28%
-);
-$color-primary-light-8: function.lightness(
-	--color-primary-h,
-	--color-primary-s,
-	--color-primary-l,
-	32%
-);
-$color-primary-light-9: function.lightness(
-	--color-primary-h,
-	--color-primary-s,
-	--color-primary-l,
-	36%
-);
-$color-primary-light: function.lightness(
-	--color-primary-h,
-	--color-primary-s,
-	--color-primary-l,
-	30%
-);
-$color-primary-lighter: function.lightness(
-	--color-primary-h,
-	--color-primary-s,
-	--color-primary-l,
-	34%
-);
-
-$color-primary-shade-1: function.lightness(
-	--color-primary-h,
-	--color-primary-s,
-	--color-primary-l,
-	-(10)
-);
-
-$color-success-light-1: function.lightness(
-	--color-success-h,
-	--color-success-s,
-	--color-success-l,
-	4%
-);
-$color-success-light-3: function.lightness(
-	--color-success-h,
-	--color-success-s,
-	--color-success-l,
-	12%
-);
-$color-success-light-5: function.lightness(
-	--color-success-h,
-	--color-success-s,
-	--color-success-l,
-	20%
-);
-$color-success-light: function.lightness(
-	--color-success-h,
-	--color-success-s,
-	--color-success-l,
-	41%
-);
-$color-success-lighter: function.lightness(
-	--color-success-h,
-	--color-success-s,
-	--color-success-l,
-	48%
-);
-
-$color-warning-light-1: function.lightness(
-	--color-warning-h,
-	--color-warning-s,
-	--color-warning-l,
-	4%
-);
-$color-warning-light-3: function.lightness(
-	--color-warning-h,
-	--color-warning-s,
-	--color-warning-l,
-	12%
-);
-$color-warning-light-5: function.lightness(
-	--color-warning-h,
-	--color-warning-s,
-	--color-warning-l,
-	20%
-);
-$color-warning-light: function.lightness(
-	--color-warning-h,
-	--color-warning-s,
-	--color-warning-l,
-	34%
-);
-$color-warning-lighter: function.lightness(
-	--color-warning-h,
-	--color-warning-s,
-	--color-warning-l,
-	40%
-);
-
-$color-danger-light-1: function.lightness(--color-danger-h, --color-danger-s, --color-danger-l, 4%);
-$color-danger-light-3: function.lightness(
-	--color-danger-h,
-	--color-danger-s,
-	--color-danger-l,
-	12%
-);
-$color-danger-light-5: function.lightness(
-	--color-danger-h,
-	--color-danger-s,
-	--color-danger-l,
-	20%
-);
-$color-danger-light: function.lightness(--color-danger-h, --color-danger-s, --color-danger-l, 24%);
+$color-primary-light-1: var(--color-primary);
+$color-primary-light-2: var(--prim-color-primary-tint-100); // ! TODO Token should be used here
+$color-primary-light-3: var(--prim-color-primary-tint-100); // ! TODO Token should be used here
+$color-primary-light-4: var(--color-primary-tint-1);
+$color-primary-light-5: var(--color-primary-tint-1);
+$color-primary-light-6: var(--color-primary-tint-2);
+$color-primary-light-9: var(--color-primary-tint-3);
+$color-primary-light: var(--color-primary-tint-3);
+$color-primary-lighter: var(--color-primary-tint-3);
+
+$color-success-light-1: var(--color-success);
+$color-success-light: var(--color-success-light);
+$color-success-lighter: var(--color-success-tint-1);
+
+$color-warning-light-1: var(--color-warning);
+$color-warning-light-3: var(--color-warning-tint-1);
+$color-warning-light-5: var(--color-warning-tint-1);
+$color-warning-light: var(--color-warning-tint-2);
+$color-warning-lighter: var(--color-warning-tint-2);
+
+$color-danger-light-1: var(--color-danger);
+$color-danger-light-3: var(--prim-color-alt-c-tint-150); // ! TODO Token should be used here
+$color-danger-light-5: var(--prim-color-alt-c-tint-150); // ! TODO Token should be used here
+$color-danger-light: var(--color-danger-tint-1);
 $color-danger-lighter: var(--color-danger-tint-2);
 
-$color-info-light-1: function.lightness(--color-info-h, --color-info-s, --color-info-l, 4%);
-$color-info-light-3: function.lightness(--color-info-h, --color-info-s, --color-info-l, 12%);
-$color-info-light-5: function.lightness(--color-info-h, --color-info-s, --color-info-l, 20%);
-$color-info-lighter: function.lightness(--color-info-h, --color-info-s, --color-info-l, 39%);
+$color-info-light-1: var(-color-info);
+$color-info-light-3: var(--prim-gray-320); // ! TODO Token should be used here
+$color-info-light-5: var(--prim-gray-200); // ! TODO Token should be used here
+$color-info-lighter: var(--color-info-tint-2);
 
 // Background
 /// color|1|Background Color|4
@@ -183,8 +58,9 @@ $background-color-base: var(--color-background-base);
 
 /* Link
 -------------------------- */
-$link-color: $color-primary-light-2;
-$link-hover-color: var(--color-primary);
+$link-color: var(--color-primary);
+$link-color-hover: var(--color-primary-shade-1);
+$link-color-active: var(--color-primary-shade-1);
 
 /* Border
 -------------------------- */
@@ -199,11 +75,11 @@ $focus-outline-width: 2px;
 /* Box shadow
 -------------------------- */
 /// boxShadow|1|Shadow|1
-$box-shadow-base: 0 2px 4px rgba(0, 0, 0, 0.12), 0 0 6px rgba(0, 0, 0, 0.04);
+$box-shadow-base: var(--box-shadow-base);
 // boxShadow|1|Shadow|1
-$box-shadow-dark: 0 2px 4px rgba(0, 0, 0, 0.12), 0 0 6px rgba(0, 0, 0, 0.12);
+$box-shadow-dark: var(--box-shadow-dark);
 /// boxShadow|1|Shadow|1
-$box-shadow-light: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+$box-shadow-light: var(--box-shadow-light);
 
 /* Fill
 -------------------------- */
@@ -229,7 +105,7 @@ $font-size-extra-small: var(--font-size-2xs);
 $font-weight-primary: var(--font-weight-regular);
 /// fontLineHeight|1|Line Height|2
 $font-line-height-primary: 24px;
-$font-color-disabled-base: #bbb;
+$font-color-disabled-base: var(--color-text-light);
 
 /* z-index
 -------------------------- */
@@ -259,12 +135,12 @@ $checkbox-input-width: 14px;
 /// borderRadius||Border|2
 $checkbox-border-radius: var(--border-radius-small);
 /// color||Color|0
-$checkbox-background-color: $color-white;
+$checkbox-background-color: var(--color-background-xlight);
 $checkbox-input-border: var(--border-base);
 
 /// color||Color|0
 $checkbox-disabled-border-color: var(--border-color-base);
-$checkbox-disabled-input-fill: #edf2fc;
+$checkbox-disabled-input-fill: var(--color-background-base);
 $checkbox-disabled-icon-color: var(--color-text-lighter);
 
 $checkbox-disabled-checked-input-fill: var(--border-color-light);
@@ -305,7 +181,7 @@ $checkbox-bordered-mini-height: 28px;
 /// color||Color|0
 $checkbox-button-checked-background-color: var(--color-primary);
 /// color||Color|0
-$checkbox-button-checked-font-color: $color-white;
+$checkbox-button-checked-font-color: var(--color-text-xlight);
 /// color||Color|0
 $checkbox-button-checked-border-color: var(--color-primary);
 
@@ -322,12 +198,12 @@ $radio-input-width: 14px;
 /// borderRadius||Border|2
 $radio-input-border-radius: $border-radius-circle;
 /// color||Color|0
-$radio-input-background-color: $color-white;
+$radio-input-background-color: var(--color-background-xlight);
 $radio-input-border: var(--border-base);
 /// color||Color|0
 $radio-input-border-color: var(--border-color-base);
 /// color||Color|0
-$radio-icon-color: $color-white;
+$radio-icon-color: var(--color-text-xlight);
 
 $radio-disabled-input-border-color: $disabled-border-base;
 $radio-disabled-input-fill: $disabled-fill-base;
@@ -342,7 +218,7 @@ $radio-checked-font-color: var(--color-primary);
 /// color||Color|0
 $radio-checked-input-border-color: var(--color-primary);
 /// color||Color|0
-$radio-checked-input-background-color: $color-white;
+$radio-checked-input-background-color: var(--color-background-xlight);
 /// color||Color|0
 $radio-checked-icon-color: var(--color-primary);
 
@@ -368,7 +244,7 @@ $radio-button-font-size: $font-size-base;
 /// color||Color|0
 $radio-button-checked-background-color: var(--color-primary);
 /// color||Color|0
-$radio-button-checked-font-color: $color-white;
+$radio-button-checked-font-color: var(--color-background-xlight);
 /// color||Color|0
 $radio-button-checked-border-color: var(--color-primary);
 $radio-button-disabled-checked-fill: var(--border-color-light);
@@ -390,7 +266,7 @@ $select-input-font-size: 14px;
 
 $select-option-color: var(--color-text-dark);
 $select-option-disabled-color: var(--color-text-lighter);
-$select-option-disabled-background: $color-white;
+$select-option-disabled-background: var(--color-background-xlight);
 /// height||Other|4
 $select-option-height: 34px;
 $select-option-hover-background: $background-color-base;
@@ -463,7 +339,7 @@ $messagebox-danger-color: var(--color-danger);
 -------------------------- */
 $message-shadow: $box-shadow-base;
 $message-min-width: 380px;
-$message-background-color: #edf2fc;
+$message-background-color: var(--color-background-base);
 $message-padding: 16px 16px 16px 20px;
 /// color||Color|0
 $message-close-icon-color: var(--color-text-lighter);
@@ -523,8 +399,16 @@ $input-placeholder-color: var(--input-placeholder-color, var(--color-text-light)
 $input-focus-border: var(--input-focus-border-color, var(--color-secondary));
 $input-border-color: var(--input-border-color, var(--border-color-base));
 $input-border-style: var(--input-border-style, var(--border-style-base));
-$input-border-width: var(--border-width-base);
+$input-border-width: var(--input-border-width, var(--border-width-base));
 $input-border: $input-border-color $input-border-style $input-border-width;
+$input-border-right-color: var(
+	--input-border-right-color,
+	var(--input-border-color, var(--border-color-base))
+);
+$input-border-bottom-color: var(
+	--input-border-bottom-color,
+	var(--input-border-color, var(--border-color-base))
+);
 
 $input-font-size: var(--input-font-size, var(--font-size-s));
 /// color||Color|0
@@ -535,6 +419,23 @@ $input-width: 140px;
 $input-height: 40px;
 /// borderRadius||Border|2
 $input-border-radius: var(--input-border-radius, var(--border-radius-base));
+$input-border-top-left-radius: var(
+	--input-border-top-left-radius,
+	var(--input-border-radius, var(--border-radius-base))
+);
+$input-border-top-right-radius: var(
+	--input-border-top-right-radius,
+	var(--input-border-radius, var(--border-radius-base)),
+);
+$input-border-bottom-left-radius: var(
+	--input-border-bottom-left-radius,
+	var(--input-border-radius, var(--border-radius-base)),
+);
+$input-border-bottom-right-radius: var(
+	--input-border-bottom-right-radius,
+	var(--input-border-radius, var(--border-radius-base)),
+);
+$input-border-radius: var(--input-border-radius, var(--border-radius-base));
 $input-border-color-hover: $border-color-hover;
 /// color||Color|0
 $input-background-color: var(--input-background-color, var(--color-foreground-xlight));
@@ -580,7 +481,7 @@ $cascader-menu-shadow: $box-shadow-light;
 $cascader-node-background-hover: $background-color-base;
 $cascader-node-color-disabled: var(--color-text-lighter);
 $cascader-color-empty: var(--color-text-lighter);
-$cascader-tag-background: #f0f2f5;
+$cascader-tag-background: var(--color-background-base);
 
 /* Group
 -------------------------- */
@@ -594,7 +495,7 @@ $group-title-width: 66px;
 /* Tab
 -------------------------- */
 $tab-font-size: $font-size-base;
-$tab-border-line: 1px solid #e4e4e4;
+$tab-border-line: 1px solid var(--color-foreground-base);
 $tab-header-color-active: var(--color-text-light);
 $tab-header-color-hover: var(--color-text-dark);
 $tab-header-color: var(--color-text-dark);
@@ -607,14 +508,10 @@ $tab-vertical-header-count-fill: var(--color-text-light);
 /* Button
 -------------------------- */
 $button-font-size: var(--button-font-size, var(--font-size-s));
-
 $button-padding-vertical: var(--button-padding-vertical, var(--spacing-xs));
 $button-padding-horizontal: var(--button-padding-horizontal, var(--spacing-m));
-
 $button-border-radius: var(--button-border-radius, 4px);
 
-$button-border-color: var(--button-border-color, var(--color-primary));
-
 /// fontSize||Font|1
 $button-medium-font-size: $font-size-base;
 /// borderRadius||Border|2
@@ -639,42 +536,91 @@ $button-mini-padding-vertical: 7px;
 /// padding||Spacing|3
 $button-mini-padding-horizontal: 15px;
 
-$button-font-color: var(--button-color, var(--color-text-xlight));
-$button-background-color: var(--button-background-color, var(--color-primary));
+// All buttons colors (defaults to primary buttons style).
+// Default
+$button-font-color: var(--button-font-color, var(--color-button-primary-font));
+$button-border-color: var(--button-border-color, var(--color-button-primary-border));
+$button-background-color: var(--button-background-color, var(--color-button-primary-background));
+
+// Hover
+$button-hover-font-color: var(--button-hover-font-color, var(--color-button-primary-font));
+$button-hover-border-color: var(
+	--button-hover-border-color,
+	var(--color-button-primary-hover-active-border)
+);
+$button-hover-background-color: var(
+	--button-hover-background-color,
+	var(--color-button-primary-hover-active-background)
+);
 
-$button-active-color: var(--button-active-color, var(--color-text-xlight));
-$button-active-border-color: var(--button-active-border-color, var(--color-primary-shade-1));
+// Active
+$button-active-font-color: var(--button-active-font-color, var(--color-button-primary-font));
+$button-active-border-color: var(
+	--button-active-border-color,
+	var(--color-button-primary-hover-active-border)
+);
 $button-active-background-color: var(
 	--button-active-background-color,
-	var(--color-primary-shade-1)
+	var(--color-button-primary-hover-active-background)
+);
+
+// Focus
+$button-focus-font-color: var(--button-focus-font-color, var(--color-button-primary-font));
+$button-focus-border-color: var(--button-focus-border-color, var(--color-button-primary-border));
+$button-focus-background-color: var(
+	--button-focus-background-color,
+	var(--color-button-primary-background)
+);
+$button-focus-outline-color: var(
+	--button-focus-outline-color,
+	var(--color-button-primary-focus-outline)
 );
 
-$button-focus-outline-color: var(--button-focus-outline-color, var(--color-primary-tint-1));
+// Disabled
+$button-disabled-font-color: var(
+	--button-disabled-font-color,
+	var(--color-button-primary-disabled-font)
+);
+$button-disabled-border-color: var(
+	--button-disabled-border-color,
+	var(--color-button-primary-disabled-border)
+);
+$button-disabled-background-color: var(
+	--button-disabled-background-color,
+	var(--color-button-primary-disabled-background)
+);
 
-$button-hover-color: var(--button-hover-color, var(--color-text-xlight));
-$button-hover-border-color: var(--button-hover-border-color, var(--color-primary-shade-1));
-$button-hover-background-color: var(--button-hover-background-color, var(--color-primary-shade-1));
+// Loading
+$button-loading-font-color: var(--button-loading-font-color, var(--color-button-primary-font));
+$button-loading-border-color: var(
+	--button-loading-border-color,
+	var(--color-button-primary-border)
+);
+$button-loading-background-color: var(
+	--button-loading-background-color,
+	var(--color-button-primary-background)
+);
 
 /// color||Color|0
-$button-default-font-color: var(--color-text-dark);
+$button-default-font-color: var(--color-text-dark); // ! Actually used by checkbox
 /// color||Color|0
-$button-default-background-color: $color-white;
+$button-default-background-color: $color-white; // ! Actually used by checkbox
 /// color||Color|0
-$button-default-border-color: var(--border-color-base);
+// $button-default-border-color: var(--border-color-base); // ! Never used
 
 /// color||Color|0
-$button-disabled-font-color: var(--button-disabled-color, var(--color-text-dark));
+// $button-disabled-font-color: var(--button-disabled-color, var(--color-text-dark));
 /// color||Color|0
-$button-disabled-background-color: var(--button-disabled-background-color, var(--color-light-grey));
+// $button-disabled-background-color: var(--button-disabled-background-color, var(--color-light-grey));
 /// color||Color|0
-$button-disabled-border-color: var(--button-disabled-border-color, var(--color-light-grey));
+// $button-disabled-border-color: var(--button-disabled-border-color, var(--color-light-grey));
 
 /// color||Color|0
-$button-primary-border-color: var(--color-primary);
+$button-primary-border-color: $button-border-color; // var(--color-primary);
 /// color||Color|0
-$button-primary-font-color: $color-white;
+$button-primary-font-color: $button-font-color; // $color-white;
 /// color||Color|0
-$button-primary-background-color: var(--color-primary);
+$button-primary-background-color: $button-background-color; // var(--color-primary);
 /// color||Color|0
 $button-success-border-color: var(--color-success);
 /// color||Color|0
@@ -710,10 +656,11 @@ $cascader-height: 200px;
 
 /* Switch
 -------------------------- */
+$switch-toggle-color: var(--color-switch-toggle);
 /// color||Color|0
-$switch-on-color: #13ce66;
+$switch-on-color: var(--color-switch-active-background);
 /// color||Color|0
-$switch-off-color: var(--color-text-light);
+$switch-off-color: var(--color-switch-background);
 /// fontSize||Font|1
 $switch-font-size: $font-size-base;
 $switch-core-border-radius: 10px;
@@ -726,7 +673,7 @@ $switch-button-size: 16px;
 
 /* Dialog
 -------------------------- */
-$dialog-background-color: $color-white;
+$dialog-background-color: var(--color-dialog-background);
 $dialog-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3);
 /// fontSize||Font|1
 $dialog-content-font-size: 14px;
@@ -744,8 +691,9 @@ $table-font-color: var(--color-text-dark);
 /// color||Color|0
 $table-header-font-color: var(--color-text-light);
 /// color||Color|0
-$table-row-hover-background-color: $background-color-base;
+$table-row-hover-background-color: var(--color-table-row-hover-background);
 $table-current-row-background-color: $color-primary-light-9;
+$table-row-striped-background-color: var(--color-table-row-even-background);
 /// color||Color|0
 $table-header-background-color: $color-white;
 $table-fixed-box-shadow: 0 0 10px rgba(0, 0, 0, 0.12);
@@ -775,7 +723,7 @@ $pagination-hover-color: var(--color-primary);
 /* Popup
 -------------------------- */
 /// color||Color|0
-$popup-modal-background-color: hsla(247, 14%, 30%, 0.75);
+$popup-modal-background-color: var(--color-dialog-overlay-background);
 /// opacity||Other|1
 $popup-modal-opacity: 0.65;
 
@@ -799,13 +747,13 @@ $popover-title-font-color: var(--color-text-dark);
 /* Tooltip
 -------------------------- */
 /// color|1|Color|0
-$tooltip-fill: var(--color-text-dark);
+$tooltip-fill: var(--color-background-dark);
 /// color|1|Color|0
 $tooltip-color: $color-white;
 /// fontSize||Font|1
 $tooltip-font-size: 12px;
 /// color||Color|0
-$tooltip-border-color: var(--color-text-dark);
+$tooltip-border-color: var(--color-background-dark);
 $tooltip-arrow-size: 6px;
 /// padding||Spacing|3
 $tooltip-padding: 10px;
@@ -839,8 +787,8 @@ $tree-expand-icon-color: var(--color-text-lighter);
 /* Dropdown
 -------------------------- */
 $dropdown-menu-box-shadow: $box-shadow-light;
-$dropdown-menuItem-hover-fill: $color-primary-light-9;
-$dropdown-menuItem-hover-color: $link-color;
+$dropdown-menuItem-hover-fill: var(--color-action-dropdown-item-active-background);
+$dropdown-menuItem-hover-color: var(--color-text-dark);
 
 /* Badge
 -------------------------- */
@@ -929,7 +877,7 @@ $datepicker-off-font-color: var(--color-text-lighter);
 $datepicker-header-font-color: var(--color-text-dark);
 $datepicker-icon-color: var(--color-text-dark);
 $datepicker-border-color: $disabled-border-base;
-$datepicker-inner-border-color: #e4e4e4;
+$datepicker-inner-border-color: var(--color-foreground-base);
 /// color||Color|0
 $datepicker-inrange-background-color: var(--border-color-light);
 /// color||Color|0
@@ -943,7 +891,7 @@ $datepicker-cell-hover-color: var(--color-foreground-xlight);
 /* Loading
 --------------------------*/
 /// height||Other|4
-$loading-spinner-size: 42px;
+$loading-spinner-size: 24px;
 /// height||Other|4
 $loading-fullscreen-spinner-size: 50px;
 
@@ -1069,7 +1017,7 @@ $link-info-font-color: var(--color-info);
 /// border||Other|4
 $calendar-border: $table-border;
 /// color||Other|4
-$calendar-selected-background-color: #f2f8fe;
+$calendar-selected-background-color: var(--color-background-base);
 $calendar-cell-width: 85px;
 
 /* Form
@@ -1082,7 +1030,7 @@ $form-label-font-size: $font-size-base;
 /// color||Color|0
 $avatar-font-color: var(--color-text-xlight);
 /// color||Color|0
-$avatar-background-color: #c0c4cc;
+$avatar-background-color: var(--color-foreground-dark);
 /// fontSize||Font Size|1
 $avatar-text-font-size: 14px;
 /// fontSize||Font Size|1
diff --git a/packages/design-system/src/css/dialog.scss b/packages/design-system/src/css/dialog.scss
index 09eddb78eb987..2ddb2bfcdebc1 100644
--- a/packages/design-system/src/css/dialog.scss
+++ b/packages/design-system/src/css/dialog.scss
@@ -3,6 +3,35 @@
 @use './common/var';
 @use 'common/popup';
 
+@include mixins.b(overlay) {
+	width: 100%;
+	height: 100%;
+	display: block;
+	position: fixed;
+	top: 0;
+	left: 0;
+	background-color: hsla(247deg, 14%, 30%, 0.75);
+}
+
+@include mixins.b(overlay-dialog) {
+	width: 100%;
+	height: 100%;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	overflow-x: hidden;
+	overflow-y: auto;
+}
+
+@include mixins.b(overlay-message-box) {
+	width: 100%;
+	height: 100%;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
 @include mixins.b(dialog) {
 	position: relative;
 	margin: 0 auto 50px;
@@ -10,7 +39,7 @@
 	border-radius: var(--border-radius-small);
 	box-shadow: var.$dialog-box-shadow;
 	box-sizing: border-box;
-	width: 50%;
+	width: var(#{utils.getCssVarName('dialog-width')}, 50%);
 
 	@include mixins.when(fullscreen) {
 		width: 100%;
@@ -32,7 +61,6 @@
 
 	@include mixins.e(header) {
 		padding: var.$dialog-padding-primary;
-		padding-bottom: 0px;
 	}
 
 	@include mixins.e(headerbtn) {
@@ -67,6 +95,7 @@
 
 	@include mixins.e(body) {
 		padding: var.$dialog-padding-primary;
+		padding-top: 0;
 		color: var(--color-text-base);
 	}
 
@@ -75,19 +104,9 @@
 		padding-top: 10px;
 		text-align: right;
 		box-sizing: border-box;
-	}
-
-	// 内容居中布局
-	@include mixins.m(center) {
-		text-align: center;
-
-		@include mixins.e(body) {
-			text-align: initial;
-			padding: 25px (var.$dialog-padding-primary + 5px) 30px;
-		}
 
-		@include mixins.e(footer) {
-			text-align: inherit;
+		.button + .button {
+			margin-left: var(--spacing-2xs);
 		}
 	}
 }
diff --git a/packages/design-system/src/css/drawer.scss b/packages/design-system/src/css/drawer.scss
index 225126cc84333..8afdf316508cc 100644
--- a/packages/design-system/src/css/drawer.scss
+++ b/packages/design-system/src/css/drawer.scss
@@ -1,110 +1,6 @@
 @use 'mixins/mixins';
 @use './common/var';
 
-@keyframes el-drawer-fade-in {
-	0% {
-		opacity: 0;
-	}
-	100% {
-		opacity: 1;
-	}
-}
-
-@mixin drawer-animation($direction) {
-	@keyframes #{$direction}-drawer-in {
-		0% {
-			@if $direction == ltr {
-				transform: translate(-100%, 0px);
-			}
-
-			@if $direction == rtl {
-				transform: translate(100%, 0px);
-			}
-
-			@if $direction == ttb {
-				transform: translate(0px, -100%);
-			}
-
-			@if $direction == btt {
-				transform: translate(0px, 100%);
-			}
-		}
-
-		100% {
-			@if $direction == ltr {
-				transform: translate(0px, 0px);
-			}
-
-			@if $direction == rtl {
-				transform: translate(0px, 0px);
-			}
-
-			@if $direction == ttb {
-				transform: translate(0px, 0px);
-			}
-
-			@if $direction == btt {
-				transform: translate(0px, 0px);
-			}
-		}
-	}
-
-	@keyframes #{$direction}-drawer-out {
-		0% {
-			@if $direction == ltr {
-				transform: translate(0px, 0px);
-			}
-
-			@if $direction == rtl {
-				transform: translate(0px, 0px);
-			}
-
-			@if $direction == ttb {
-				transform: translate(0px, 0px);
-			}
-
-			@if $direction == btt {
-				transform: translate(0px, 0);
-			}
-		}
-
-		100% {
-			@if $direction == ltr {
-				transform: translate(-100%, 0px);
-			}
-
-			@if $direction == rtl {
-				transform: translate(100%, 0px);
-			}
-
-			@if $direction == ttb {
-				transform: translate(0px, -100%);
-			}
-
-			@if $direction == btt {
-				transform: translate(0px, 100%);
-			}
-		}
-	}
-}
-
-@mixin animation-in($direction) {
-	.el-drawer__open &.#{$direction} {
-		animation: #{$direction}-drawer-in 0.3s 1ms;
-	}
-}
-
-@mixin animation-out($direction) {
-	&.#{$direction} {
-		animation: #{$direction}-drawer-out 0.3s;
-	}
-}
-
-@include drawer-animation(rtl);
-@include drawer-animation(ltr);
-@include drawer-animation(ttb);
-@include drawer-animation(btt);
-
 $directions: rtl, ltr, ttb, btt;
 
 @include mixins.b(drawer) {
@@ -115,21 +11,17 @@ $directions: rtl, ltr, ttb, btt;
 	flex-direction: column;
 	box-shadow: 0px 6px 16px rgb(68 28 23 / 6%);
 	overflow: hidden;
-	outline: 0;
+
+	transition: all 0.3s;
 
 	@each $direction in $directions {
-		@include animation-out($direction);
-		@include animation-in($direction);
+		.#{$direction} {
+			transform: translate(0, 0);
+		}
 	}
 
-	&__wrapper {
-		position: fixed;
-		top: 0;
-		right: 0;
-		bottom: 0;
-		left: 0;
-		overflow: hidden;
-		margin: 0;
+	&__sr-focus:focus {
+		outline: none !important;
 	}
 
 	&__header {
@@ -151,16 +43,32 @@ $directions: rtl, ltr, ttb, btt;
 		font-size: 1rem;
 	}
 
+	@include mixins.e(footer) {
+		padding: var.$dialog-padding-primary;
+		padding-top: 10px;
+		text-align: right;
+	}
+
 	&__close-btn {
+		display: inline-flex;
 		border: none;
 		cursor: pointer;
-		font-size: var.$font-size-extra-large;
+		font-size: getCssVar('font-size-extra-large');
 		color: inherit;
 		background-color: transparent;
+		outline: none;
+		&:focus,
+		&:hover {
+			i {
+				color: getCssVar('color-primary');
+			}
+		}
 	}
 
 	&__body {
 		flex: 1;
+		padding: 0;
+		overflow: auto;
 		& > * {
 			box-sizing: border-box;
 		}
@@ -182,12 +90,10 @@ $directions: rtl, ltr, ttb, btt;
 
 	&.ltr {
 		left: 0;
-		border-right: var(--border-base);
 	}
 
 	&.rtl {
 		right: 0;
-		border-left: var(--border-base);
 	}
 
 	&.ttb {
@@ -199,20 +105,51 @@ $directions: rtl, ltr, ttb, btt;
 	}
 }
 
-.el-drawer__container {
-	position: relative;
-	left: 0;
-	right: 0;
-	top: 0;
-	bottom: 0;
-	height: 100%;
-	width: 100%;
-}
+.el-drawer-fade {
+	&-enter-active,
+	&-leave-active {
+		transition: all 0.3s;
+	}
 
-.el-drawer-fade-enter-active {
-	animation: el-drawer-fade-in 0.3s;
-}
+	&-enter-from,
+	&-enter-active,
+	&-enter-to,
+	&-leave-from,
+	&-leave-active,
+	&-leave-to {
+		overflow: hidden !important;
+	}
+
+	&-enter-from,
+	&-leave-to {
+		opacity: 0;
+	}
+
+	&-enter-to,
+	&-leave-from {
+		opacity: 1;
+	}
+
+	&-enter-from,
+	&-leave-to {
+		@each $direction in $directions {
+			.#{$direction} {
+				@if $direction == ltr {
+					transform: translateX(-100%);
+				}
 
-.el-drawer-fade-leave-active {
-	animation: el-drawer-fade-in 0.3s reverse;
+				@if $direction == rtl {
+					transform: translateX(100%);
+				}
+
+				@if $direction == ttb {
+					transform: translateY(-100%);
+				}
+
+				@if $direction == btt {
+					transform: translateY(100%);
+				}
+			}
+		}
+	}
 }
diff --git a/packages/design-system/src/css/dropdown.scss b/packages/design-system/src/css/dropdown.scss
index e5305a04acee0..a15d17f0268a4 100644
--- a/packages/design-system/src/css/dropdown.scss
+++ b/packages/design-system/src/css/dropdown.scss
@@ -2,11 +2,15 @@
 @use './common/var';
 @use './popper';
 
+@use 'element-plus/theme-chalk/src/dropdown-menu';
+
 @include mixins.b(dropdown) {
-	display: inline-block;
 	position: relative;
 	color: var(--color-text-dark);
 	font-size: var.$font-size-base;
+	display: inline-flex;
+	line-height: 1;
+	vertical-align: top;
 
 	.el-button-group {
 		display: block;
@@ -69,7 +73,6 @@
 }
 
 @include mixins.b(dropdown-menu) {
-	position: absolute;
 	top: 0;
 	left: 0;
 	z-index: 10;
@@ -78,7 +81,8 @@
 	background-color: var.$color-white;
 	border: 1px solid var(--border-color-light);
 	border-radius: var(--border-radius-base);
-	box-shadow: var.$dropdown-menu-box-shadow;
+	position: relative;
+	list-style: none;
 
 	@include mixins.e(item) {
 		list-style: none;
@@ -87,9 +91,10 @@
 		margin: 0;
 		font-size: var.$font-size-base;
 		font-weight: var(--font-weight-regular);
-		color: var(--color-text-dark);
+		color: var(--color-text-base);
 		cursor: pointer;
 		outline: none;
+		white-space: nowrap;
 		&:not(.is-disabled):hover,
 		&:focus {
 			background-color: var.$dropdown-menuItem-hover-fill;
@@ -111,14 +116,13 @@
 				content: '';
 				height: $divided-offset;
 				display: block;
-				margin: 0 -16px;
 				background-color: var.$color-white;
 			}
 		}
 
 		@include mixins.when(disabled) {
 			cursor: default;
-			color: var.$font-color-disabled-base;
+			color: var(--color-text-lighter);
 			pointer-events: none;
 		}
 	}
@@ -137,7 +141,6 @@
 
 				&:before {
 					height: $divided-offset;
-					margin: 0 -17px;
 				}
 			}
 		}
@@ -157,7 +160,6 @@
 
 				&:before {
 					height: $divided-offset;
-					margin: 0 -15px;
 				}
 			}
 		}
@@ -177,7 +179,6 @@
 
 				&:before {
 					height: $divided-offset;
-					margin: 0 -10px;
 				}
 			}
 		}
diff --git a/packages/design-system/src/css/icon.scss b/packages/design-system/src/css/icon.scss
index dfab446582d3e..6c56f8860d6a8 100644
--- a/packages/design-system/src/css/icon.scss
+++ b/packages/design-system/src/css/icon.scss
@@ -2,7 +2,8 @@
 
 @font-face {
 	font-family: 'element-icons';
-	src: url('#{var.$font-path}/element-icons.woff') format('woff'),
+	src:
+		url('#{var.$font-path}/element-icons.woff') format('woff'),
 		/* chrome, firefox */ url('#{var.$font-path}/element-icons.ttf') format('truetype'); /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
 	font-weight: normal;
 	font-display: var.$font-display;
@@ -27,6 +28,24 @@
 	-moz-osx-font-smoothing: grayscale;
 }
 
+.el-icon {
+	--color: inherit;
+	height: 1em;
+	width: 1em;
+	line-height: 1em;
+	display: inline-flex;
+	justify-content: center;
+	align-items: center;
+	position: relative;
+	fill: currentColor;
+	color: var(--color);
+	font-size: inherit;
+
+	svg {
+		height: 1em;
+		width: 1em;
+	}
+}
 .el-icon-ice-cream-round:before {
 	content: '\e6a0';
 }
diff --git a/packages/design-system/src/css/index.scss b/packages/design-system/src/css/index.scss
index 644991180e863..c37709df1b91c 100644
--- a/packages/design-system/src/css/index.scss
+++ b/packages/design-system/src/css/index.scss
@@ -1,3 +1,4 @@
+@use './primitives.scss';
 @use './tokens.scss';
 @use './tokens.dark.scss' as dark;
 @use './reset.scss';
@@ -30,7 +31,7 @@
 // @use "./time-select.scss";
 // @use "./time-picker.scss";
 @use './popover.scss';
-@use './tooltip.scss';
+//@use './tooltip.scss';
 @use './message-box.scss';
 // @use "./breadcrumb.scss";
 // @use "./breadcrumb-item.scss";
@@ -80,5 +81,6 @@
 // @use "./cascader-panel.scss";
 // @use "./avatar.scss";
 @use './drawer.scss';
+@use './popper.scss';
 // @use "./popconfirm.scss";
 @use './utilities/index.scss';
diff --git a/packages/design-system/src/css/input-number.scss b/packages/design-system/src/css/input-number.scss
index 5ffc77acffda5..e39c66c09081b 100644
--- a/packages/design-system/src/css/input-number.scss
+++ b/packages/design-system/src/css/input-number.scss
@@ -8,6 +8,18 @@
 	line-height: #{var.$input-height - 2};
 	width: 100%;
 
+	/* Chrome, Safari, Edge, Opera */
+	input::-webkit-outer-spin-button,
+	input::-webkit-inner-spin-button {
+		-webkit-appearance: none;
+		margin: 0;
+	}
+
+	/* Firefox */
+	input[type='number'] {
+		-moz-appearance: textfield !important;
+	}
+
 	.el-input {
 		display: block;
 
@@ -84,7 +96,7 @@
 	}
 
 	@include mixins.m(small) {
-		line-height: #{var.$input-small-height - 2};
+		line-height: #{var.$input-small-height - 4};
 
 		@include mixins.e((increase, decrease)) {
 			width: var.$input-small-height;
diff --git a/packages/design-system/src/css/input.scss b/packages/design-system/src/css/input.scss
index e610d5a66f9e8..d388969e414c1 100644
--- a/packages/design-system/src/css/input.scss
+++ b/packages/design-system/src/css/input.scss
@@ -20,6 +20,11 @@
 		background-color: var.$input-background-color;
 		background-image: none;
 		border-radius: var.$input-border-radius;
+		border-top-left-radius: var.$input-border-top-left-radius;
+		border-top-right-radius: var.$input-border-top-right-radius;
+		border-bottom-left-radius: var.$input-border-bottom-left-radius;
+		border-bottom-right-radius: var.$input-border-bottom-right-radius;
+
 		transition: var.$border-transition-base;
 
 		&,
@@ -108,12 +113,19 @@
 		background-color: var.$input-background-color;
 		background-image: none;
 		border-radius: var.$input-border-radius;
+		border-top-left-radius: var.$input-border-top-left-radius;
+		border-top-right-radius: var.$input-border-top-right-radius;
+		border-bottom-left-radius: var.$input-border-bottom-left-radius;
+		border-bottom-right-radius: var.$input-border-bottom-right-radius;
 		border: var.$input-border;
+		border-right-color: var.$input-border-right-color;
+		border-bottom-color: var.$input-border-bottom-color;
 		box-sizing: border-box;
 		color: var.$input-font-color;
 		display: inline-block;
 		font-size: inherit;
 		height: var.$input-height;
+		min-height: var.$input-height;
 		line-height: var.$input-height;
 		outline: none;
 		padding: 0 0 0 var(--spacing-2xs);
@@ -144,6 +156,7 @@
 	}
 
 	@include mixins.e(suffix-inner) {
+		display: inline-flex;
 		pointer-events: all;
 	}
 
@@ -231,6 +244,7 @@
 
 		@include mixins.e(inner) {
 			height: var.$input-medium-height;
+			min-height: var.$input-medium-height;
 			line-height: var.$input-medium-height;
 		}
 
@@ -243,6 +257,7 @@
 
 		@include mixins.e(inner) {
 			height: var.$input-small-height;
+			min-height: var.$input-small-height;
 			line-height: var.$input-small-height;
 		}
 
@@ -255,6 +270,7 @@
 
 		@include mixins.e(inner) {
 			height: var.$input-mini-height;
+			min-height: var.$input-mini-height;
 			line-height: var.$input-mini-height;
 		}
 
@@ -282,8 +298,14 @@
 		vertical-align: middle;
 		display: table-cell;
 		position: relative;
-		border: var(--border-base);
+		border: var.$input-border;
 		border-radius: var.$input-border-radius;
+		border-top-left-radius: var.$input-border-top-left-radius;
+		border-top-right-radius: var.$input-border-top-right-radius;
+		border-bottom-left-radius: var.$input-border-bottom-left-radius;
+		border-bottom-right-radius: var.$input-border-bottom-right-radius;
+		border-right-color: var.$input-border-right-color;
+		border-bottom-color: var.$input-border-bottom-color;
 		padding: 0 10px;
 		width: 1px;
 		white-space: nowrap;
diff --git a/packages/design-system/src/css/loading.scss b/packages/design-system/src/css/loading.scss
index 17137efaab4c7..93fa9df373d30 100644
--- a/packages/design-system/src/css/loading.scss
+++ b/packages/design-system/src/css/loading.scss
@@ -26,7 +26,8 @@
 		position: fixed;
 
 		.el-loading-spinner {
-			margin-top: #{- var.$loading-fullscreen-spinner-size * 0.5};
+			transform: translateY(-50%);
+			display: block;
 
 			.circular {
 				height: var.$loading-fullscreen-spinner-size;
@@ -38,10 +39,14 @@
 
 @include mixins.b(loading-spinner) {
 	top: 50%;
-	margin-top: #{- var.$loading-spinner-size * 0.5};
+	transform: translateY(-50%);
 	width: 100%;
 	text-align: center;
 	position: absolute;
+	max-height: 100%;
+	display: flex;
+	justify-content: center;
+	align-items: center;
 
 	.el-loading-text {
 		color: var(--color-primary);
@@ -50,6 +55,7 @@
 	}
 
 	.circular {
+		max-height: 100%;
 		height: var.$loading-spinner-size;
 		width: var.$loading-spinner-size;
 		animation: loading-rotate 2s linear infinite;
@@ -69,7 +75,7 @@
 	}
 }
 
-.el-loading-fade-enter,
+.el-loading-fade-enter-from,
 .el-loading-fade-leave-active {
 	opacity: 0;
 }
diff --git a/packages/design-system/src/css/menu.scss b/packages/design-system/src/css/menu.scss
index 2a737708e7c61..f98ffa356cd9e 100644
--- a/packages/design-system/src/css/menu.scss
+++ b/packages/design-system/src/css/menu.scss
@@ -13,7 +13,10 @@
 	list-style: none;
 	cursor: pointer;
 	position: relative;
-	transition: border-color 0.3s, background-color 0.3s, color 0.3s;
+	transition:
+		border-color 0.3s,
+		background-color 0.3s,
+		color 0.3s;
 	box-sizing: border-box;
 	white-space: nowrap;
 	border-radius: var.$menu-item-border-radius;
@@ -71,25 +74,25 @@
 				background-color: var(--color-foreground-xlight);
 			}
 		}
-		& > .el-submenu {
+		& > .el-sub-menu {
 			float: left;
 
 			&:focus,
 			&:hover {
 				outline: none;
-				.el-submenu__title {
+				.el-sub-menu__title {
 					color: var(--color-text-dark);
 				}
 			}
 
 			&.is-active {
-				.el-submenu__title {
+				.el-sub-menu__title {
 					border-bottom: 2px solid var(--color-primary);
 					color: var(--color-text-dark);
 				}
 			}
 
-			& .el-submenu__title {
+			& .el-sub-menu__title {
 				height: 60px;
 				line-height: 60px;
 				border-bottom: 2px solid transparent;
@@ -99,7 +102,7 @@
 					background-color: var(--color-foreground-xlight);
 				}
 			}
-			& .el-submenu__icon-arrow {
+			& .el-sub-menu__icon-arrow {
 				position: static;
 				vertical-align: middle;
 				margin-left: 8px;
@@ -108,7 +111,7 @@
 		}
 		& .el-menu {
 			& .el-menu-item,
-			& .el-submenu__title {
+			& .el-sub-menu__title {
 				background-color: var.$color-white;
 				float: none;
 				height: 36px;
@@ -117,7 +120,7 @@
 				color: var(--color-text-light);
 			}
 			& .el-menu-item.is-active,
-			& .el-submenu.is-active > .el-submenu__title {
+			& .el-sub-menu.is-active > .el-sub-menu__title {
 				color: var(--color-text-dark);
 			}
 		}
@@ -135,14 +138,14 @@
 		width: 64px;
 
 		> .el-menu-item,
-		> .el-submenu > .el-submenu__title {
+		> .el-sub-menu > .el-sub-menu__title {
 			[class^='el-icon-'] {
 				margin: 0;
 				vertical-align: middle;
 				width: 24px;
 				text-align: center;
 			}
-			.el-submenu__icon-arrow {
+			.el-sub-menu__icon-arrow {
 				display: none;
 			}
 			span {
@@ -158,11 +161,11 @@
 			color: inherit;
 		}
 
-		.el-menu .el-submenu {
+		.el-menu .el-sub-menu {
 			min-width: 200px;
 		}
 
-		.el-submenu {
+		.el-sub-menu {
 			position: relative;
 			& .el-menu {
 				position: absolute;
@@ -176,7 +179,7 @@
 			}
 
 			&.is-opened {
-				> .el-submenu__title .el-submenu__icon-arrow {
+				> .el-sub-menu__title .el-sub-menu__icon-arrow {
 					transform: none;
 				}
 			}
@@ -223,7 +226,7 @@
 	}
 }
 
-@include mixins.b(submenu) {
+@include mixins.b(sub-menu) {
 	list-style: none;
 	margin: 0;
 	padding-left: 0;
@@ -245,25 +248,36 @@
 		min-width: 200px;
 	}
 	@include mixins.e(icon-arrow) {
+		right: 20px;
 		position: absolute;
 		top: 50%;
-		right: 20px;
-		margin-top: -7px;
+		margin-top: -6px;
 		transition: transform 0.3s;
+		margin-right: 0;
 		font-size: 12px;
+		width: 12px;
+		height: 12px;
+
+		svg {
+			width: 12px;
+			height: 12px;
+			position: relative;
+			display: block;
+			margin-top: -2px;
+		}
 	}
 	@include mixins.when(active) {
-		.el-submenu__title {
+		.el-sub-menu__title {
 			border-bottom-color: var(--color-primary);
 		}
 	}
 	@include mixins.when(opened) {
-		> .el-submenu__title .el-submenu__icon-arrow {
+		> .el-sub-menu__title .el-sub-menu__icon-arrow {
 			transform: rotateZ(180deg);
 		}
 	}
 	@include mixins.when(disabled) {
-		.el-submenu__title,
+		.el-sub-menu__title,
 		.el-menu-item {
 			opacity: 0.25;
 			cursor: not-allowed;
@@ -291,7 +305,7 @@
 	}
 }
 
-.horizontal-collapse-transition .el-submenu__title .el-submenu__icon-arrow {
+.horizontal-collapse-transition .el-sub-menu__title .el-sub-menu__icon-arrow {
 	transition: 0.2s;
 	opacity: 0;
 }
diff --git a/packages/design-system/src/css/message-box.scss b/packages/design-system/src/css/message-box.scss
index 360130d5a6651..023c984a168f7 100644
--- a/packages/design-system/src/css/message-box.scss
+++ b/packages/design-system/src/css/message-box.scss
@@ -150,13 +150,23 @@
 			margin-left: 10px;
 		}
 
-		//& .btn--confirm {
-		//	@include button.button-just-primary();
-		//	@include button.button-medium();
-		//}
+		& .btn--confirm {
+			@include button.button-just-primary();
+			@include button.button-small();
+		}
 		//
-		//& .btn--cancel {
-		//}
+		& .btn--cancel {
+			@include button.button-small();
+			@include button.button-outline;
+
+			--button-active-background-color: var(--color-primary-tint-2);
+			--button-active-color: var(--color-primary);
+			--button-active-border-color: var(--color-primary);
+			--button-hover-background-color: var(--color-primary-tint-3);
+			--button-hover-color: var(--color-primary);
+			--button-hover-border-color: var(--color-primary);
+			--button-focus-outline-color: var(--color-primary-tint-1);
+		}
 	}
 
 	@include mixins.e(btns-reverse) {
diff --git a/packages/design-system/src/css/message.scss b/packages/design-system/src/css/message.scss
index 84ba403e1b439..2f340a7ca7ce6 100644
--- a/packages/design-system/src/css/message.scss
+++ b/packages/design-system/src/css/message.scss
@@ -13,7 +13,10 @@
 	top: 20px;
 	transform: translateX(-50%);
 	background-color: var.$message-background-color;
-	transition: opacity 0.3s, transform 0.4s, top 0.4s;
+	transition:
+		opacity 0.3s,
+		transform 0.4s,
+		top 0.4s;
 	overflow: hidden;
 	padding: var.$message-padding;
 	display: flex;
@@ -117,7 +120,7 @@
 	}
 }
 
-.el-message-fade-enter,
+.el-message-fade-enter-from,
 .el-message-fade-leave-active {
 	opacity: 0;
 	transform: translate(-50%, -100%);
diff --git a/packages/design-system/src/css/mixins/utils.scss b/packages/design-system/src/css/mixins/utils.scss
index e86ede1e4a617..54e6349732f55 100644
--- a/packages/design-system/src/css/mixins/utils.scss
+++ b/packages/design-system/src/css/mixins/utils.scss
@@ -37,3 +37,18 @@
 	text-overflow: ellipsis;
 	white-space: nowrap;
 }
+
+@function joinVarName($list) {
+	$name: '--' + 'el';
+	@each $item in $list {
+		@if $item != '' {
+			$name: $name + '-' + $item;
+		}
+	}
+	@return $name;
+}
+
+// getCssVarName('button', 'text-color') => '--el-button-text-color'
+@function getCssVarName($args...) {
+	@return joinVarName($args);
+}
diff --git a/packages/design-system/src/css/notification.scss b/packages/design-system/src/css/notification.scss
index fae03903d04b8..9ddd12ef9e777 100644
--- a/packages/design-system/src/css/notification.scss
+++ b/packages/design-system/src/css/notification.scss
@@ -9,9 +9,15 @@
 	box-sizing: border-box;
 	border: 1px solid var.$notification-border-color;
 	position: fixed;
-	background-color: var.$color-white;
+	background-color: var(--color-notification-background);
 	box-shadow: var.$notification-shadow;
-	transition: opacity 0.3s, transform 0.3s, left 0.3s, right 0.3s, top 0.4s, bottom 0.3s;
+	transition:
+		opacity 0.3s,
+		transform 0.3s,
+		left 0.3s,
+		right 0.3s,
+		top 0.4s,
+		bottom 0.3s;
 	overflow: hidden;
 
 	&.right {
@@ -67,24 +73,24 @@
 		}
 	}
 
-	.el-icon-success {
+	.el-icon.el-notification--success {
 		color: var.$notification-success-icon-color;
 	}
 
-	.el-icon-error {
+	.el-icon.el-notification--error {
 		color: var.$notification-danger-icon-color;
 	}
 
-	.el-icon-info {
+	.el-icon.el-notification--info {
 		color: var.$notification-info-icon-color;
 	}
 
-	.el-icon-warning {
+	.el-icon.el-notification--warning {
 		color: var.$notification-warning-icon-color;
 	}
 }
 
-.el-notification-fade-enter {
+.el-notification-fade-enter-from {
 	&.right {
 		right: 0;
 		transform: translateX(100%);
diff --git a/packages/design-system/src/css/pagination.scss b/packages/design-system/src/css/pagination.scss
index 04098a8993af9..8d40cdae351ee 100644
--- a/packages/design-system/src/css/pagination.scss
+++ b/packages/design-system/src/css/pagination.scss
@@ -65,17 +65,29 @@
 
 	.btn-prev,
 	.btn-next {
-		background: center center no-repeat;
+		background-position: center center;
+		background-repeat: no-repeat;
 		background-size: 16px;
 		background-color: var.$pagination-background-color;
 		cursor: pointer;
 		margin: 0;
 		color: var.$pagination-button-color;
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
 
 		.el-icon {
-			display: block;
 			font-size: 12px;
+			width: 12px;
+			height: 12px;
 			font-weight: bold;
+
+			svg {
+				width: 12px;
+				height: 12px;
+				display: block;
+				pointer-events: none;
+			}
 		}
 	}
 
@@ -220,7 +232,7 @@
 				border: 1px solid var(--color-foreground-base);
 			}
 
-			&.active {
+			&.is-active {
 				border: 1px solid var(--color-primary);
 				color: var(--color-primary);
 			}
@@ -240,11 +252,12 @@
 @include mixins.b(pager) {
 	user-select: none;
 	list-style: none;
-	display: inline-block;
 	vertical-align: top;
 	font-size: 0;
 	padding: 0;
 	margin: 0;
+	display: inline-flex;
+	align-items: center;
 
 	.more::before {
 		line-height: 30px;
@@ -284,7 +297,7 @@
 			cursor: pointer;
 		}
 
-		&.active + li {
+		&.is-active + li {
 			border-left: 0;
 		}
 
@@ -292,9 +305,230 @@
 			color: var.$pagination-hover-color;
 		}
 
-		&.active {
+		&.is-active {
 			color: var.$pagination-hover-color;
 			cursor: default;
 		}
 	}
 }
+
+//@mixin pagination-button {
+//	display: flex;
+//	justify-content: center;
+//	align-items: center;
+//	font-size: getCssVar('pagination-font-size');
+//	min-width: getCssVar('pagination-button-width');
+//	height: getCssVar('pagination-button-height');
+//	line-height: getCssVar('pagination-button-height');
+//	color: getCssVar('pagination-button-color');
+//	background: getCssVar('pagination-bg-color');
+//	padding: 0 4px;
+//	border: none;
+//	border-radius: getCssVar('pagination-border-radius');
+//	cursor: pointer;
+//	text-align: center;
+//	box-sizing: border-box;
+//
+//	* {
+//		pointer-events: none;
+//	}
+//
+//	&:focus {
+//		outline: none;
+//	}
+//
+//	&:hover {
+//		color: getCssVar('pagination-hover-color');
+//	}
+//
+//	&.is-active {
+//		color: getCssVar('pagination-hover-color');
+//		cursor: default;
+//		font-weight: bold;
+//
+//		&.is-disabled {
+//			font-weight: bold;
+//			color: getCssVar('text-color', 'secondary');
+//		}
+//	}
+//
+//	&:disabled,
+//	&.is-disabled {
+//		color: getCssVar('pagination-button-disabled-color');
+//		background-color: getCssVar('pagination-button-disabled-bg-color');
+//		cursor: not-allowed;
+//	}
+//
+//	&:focus-visible {
+//		outline: 1px solid getCssVar('pagination-hover-color');
+//		outline-offset: -1px;
+//	}
+//}
+//
+//@include b(pagination) {
+//	@include set-component-css-var('pagination', $pagination);
+//
+//	white-space: nowrap;
+//	color: getCssVar('pagination-text-color');
+//	font-size: getCssVar('pagination-font-size');
+//	font-weight: normal;
+//	display: flex;
+//	align-items: center;
+//
+//	.#{$namespace}-input__inner {
+//		text-align: center;
+//		-moz-appearance: textfield;
+//	}
+//
+//	.#{$namespace}-select .#{$namespace}-input {
+//		width: 128px;
+//	}
+//
+//	button {
+//		@include pagination-button;
+//	}
+//
+//	.btn-prev,
+//	.btn-next {
+//		.#{$namespace}-icon {
+//			display: block;
+//			font-size: 12px;
+//			font-weight: bold;
+//			width: inherit;
+//		}
+//	}
+//
+//	& > * {
+//		@include when(first) {
+//			margin-left: 0 !important;
+//		}
+//		@include when(last) {
+//			margin-right: 0 !important;
+//		}
+//	}
+//
+//	.btn-prev {
+//		margin-left: getCssVar('pagination-item-gap');
+//	}
+//
+//	@include e(sizes) {
+//		margin-left: getCssVar('pagination-item-gap');
+//		font-weight: normal;
+//		color: getCssVar('text-color', 'regular');
+//	}
+//
+//	@include e(total) {
+//		margin-left: getCssVar('pagination-item-gap');
+//		font-weight: normal;
+//		color: getCssVar('text-color', 'regular');
+//
+//		&[disabled='true'] {
+//			color: getCssVar('text-color', 'placeholder');
+//		}
+//	}
+//
+//	@include e(jump) {
+//		display: flex;
+//		align-items: center;
+//		margin-left: getCssVar('pagination-item-gap');
+//		font-weight: normal;
+//		color: getCssVar('text-color', 'regular');
+//
+//		&[disabled='true'] {
+//			color: getCssVar('text-color', 'placeholder');
+//		}
+//
+//		@include e(goto) {
+//			margin-right: 8px;
+//		}
+//
+//		@include e(editor) {
+//			text-align: center;
+//			box-sizing: border-box;
+//
+//			&.#{$namespace}-input {
+//				width: 56px;
+//			}
+//
+//			.#{$namespace}-input__inner::-webkit-inner-spin-button,
+//			.#{$namespace}-input__inner::-webkit-outer-spin-button {
+//				-webkit-appearance: none;
+//				margin: 0;
+//			}
+//		}
+//
+//		@include e(classifier) {
+//			margin-left: 8px;
+//		}
+//	}
+//
+//	@include e(rightwrapper) {
+//		flex: 1;
+//		display: flex;
+//		align-items: center;
+//		justify-content: flex-end;
+//	}
+//
+//	@include when(background) {
+//		.btn-prev,
+//		.btn-next,
+//		.#{$namespace}-pager li {
+//			margin: 0 4px;
+//			background-color: getCssVar('pagination-button-bg-color');
+//
+//			&.is-active {
+//				background-color: getCssVar('color-primary');
+//				color: getCssVar('color-white');
+//			}
+//
+//			&:disabled,
+//			&.is-disabled {
+//				color: getCssVar('text-color', 'placeholder');
+//				background-color: getCssVar('disabled-bg-color');
+//
+//				&.is-active {
+//					color: getCssVar('text-color', 'secondary');
+//					background-color: getCssVar('fill-color', 'dark');
+//				}
+//			}
+//		}
+//
+//		.btn-prev {
+//			margin-left: getCssVar('pagination-item-gap');
+//		}
+//	}
+//
+//	@include m(small) {
+//		.btn-prev,
+//		.btn-next,
+//		.#{$namespace}-pager li {
+//			height: getCssVar('pagination-button-height-small');
+//			line-height: getCssVar('pagination-button-height-small');
+//			font-size: getCssVar('pagination-font-size-small');
+//			min-width: getCssVar('pagination-button-width-small');
+//		}
+//
+//		span:not([class*='suffix']),
+//		button {
+//			font-size: getCssVar('pagination-font-size-small');
+//		}
+//
+//		.#{$namespace}-select .#{$namespace}-input {
+//			width: 100px;
+//		}
+//	}
+//}
+//
+//@include b(pager) {
+//	user-select: none;
+//	list-style: none;
+//	font-size: 0;
+//	padding: 0;
+//	margin: 0;
+//	display: flex;
+//	align-items: center;
+//
+//	li {
+//		@include pagination-button;
+//	}
+//}
diff --git a/packages/design-system/src/css/popper.scss b/packages/design-system/src/css/popper.scss
index c7d9a0424db78..bbc1d6d144184 100644
--- a/packages/design-system/src/css/popper.scss
+++ b/packages/design-system/src/css/popper.scss
@@ -2,34 +2,59 @@
 @use './common/var';
 
 @include mixins.b(popper) {
-	.popper__arrow,
-	.popper__arrow::after {
+	position: absolute;
+	z-index: 2000;
+	min-width: 10px;
+	word-wrap: break-word;
+	visibility: visible;
+
+	&:not(.el-popover) {
+		max-width: 420px;
+	}
+
+	img {
+		max-width: 100%;
+	}
+
+	.el-select-dropdown,
+	.el-dropdown-menu {
+		position: relative;
+		margin: 0;
+	}
+
+	&:not(.el-select__popper):not(.el-dropdown__popper):not(.el-picker__popper) {
+		padding: var.$tooltip-padding;
+		font-size: var.$tooltip-font-size;
+		border-radius: 4px;
+	}
+
+	.el-popper__arrow {
 		position: absolute;
 		display: block;
 		width: 0;
 		height: 0;
+		z-index: 1010;
 		border-color: transparent;
 		border-style: solid;
-	}
-
-	.popper__arrow {
 		border-width: var.$popover-arrow-size;
 		filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03));
 	}
 
-	.popper__arrow::after {
+	.el-popper__arrow::after {
+		display: block;
+		position: absolute;
+		width: 0;
+		height: 0;
+		border-color: transparent;
+		border-style: solid;
 		content: ' ';
 		border-width: var.$popover-arrow-size;
 	}
 
-	&[x-placement^='top'] {
-		margin-bottom: #{var.$popover-arrow-size + 6};
-	}
-
-	&[x-placement^='top'] .popper__arrow {
+	&[data-popper-placement^='top'] .el-popper__arrow {
 		bottom: -(var.$popover-arrow-size);
 		left: 50%;
-		margin-right: #{var.$tooltip-arrow-size * 0.5};
+		margin: 0 #{var.$tooltip-arrow-size * 0.5};
 		border-top-color: var.$popover-border-color;
 		border-bottom-width: 0;
 
@@ -41,14 +66,10 @@
 		}
 	}
 
-	&[x-placement^='bottom'] {
-		margin-top: #{var.$popover-arrow-size + 6};
-	}
-
-	&[x-placement^='bottom'] .popper__arrow {
+	&[data-popper-placement^='bottom'] .el-popper__arrow {
 		top: -(var.$popover-arrow-size);
 		left: 50%;
-		margin-right: #{var.$tooltip-arrow-size * 0.5};
+		margin: 0 #{var.$tooltip-arrow-size * 0.5};
 		border-top-width: 0;
 		border-bottom-color: var.$popover-border-color;
 
@@ -60,14 +81,10 @@
 		}
 	}
 
-	&[x-placement^='right'] {
-		margin-left: #{var.$popover-arrow-size + 6};
-	}
-
-	&[x-placement^='right'] .popper__arrow {
+	&[data-popper-placement^='right'] .el-popper__arrow {
 		top: 50%;
 		left: -(var.$popover-arrow-size);
-		margin-bottom: #{var.$tooltip-arrow-size * 0.5};
+		margin: #{var.$tooltip-arrow-size * 0.5} 0;
 		border-right-color: var.$popover-border-color;
 		border-left-width: 0;
 
@@ -79,14 +96,10 @@
 		}
 	}
 
-	&[x-placement^='left'] {
-		margin-right: #{var.$popover-arrow-size + 6};
-	}
-
-	&[x-placement^='left'] .popper__arrow {
+	&[data-popper-placement^='left'] .el-popper__arrow {
 		top: 50%;
 		right: -(var.$popover-arrow-size);
-		margin-bottom: #{var.$tooltip-arrow-size * 0.5};
+		margin: #{var.$tooltip-arrow-size * 0.5} 0;
 		border-right-width: 0;
 		border-left-color: var.$popover-border-color;
 
@@ -98,4 +111,46 @@
 			border-left-color: var.$popover-background-color;
 		}
 	}
+
+	@include mixins.when(dark) {
+		background: var.$tooltip-fill;
+		color: var.$tooltip-color;
+
+		&[data-popper-placement^='top'] .el-popper__arrow {
+			border-top-color: transparent;
+
+			&::after {
+				border-top-color: var.$tooltip-border-color;
+			}
+		}
+
+		&[data-popper-placement^='bottom'] .el-popper__arrow {
+			border-bottom-color: transparent;
+
+			&::after {
+				border-bottom-color: var.$tooltip-border-color;
+			}
+		}
+
+		&[data-popper-placement^='right'] .el-popper__arrow {
+			border-right-color: transparent;
+
+			&::after {
+				border-right-color: var.$tooltip-border-color;
+			}
+		}
+
+		&[data-popper-placement^='left'] .el-popper__arrow {
+			border-left-color: transparent;
+
+			&::after {
+				border-left-color: var.$tooltip-border-color;
+			}
+		}
+	}
+}
+
+.el-popper.n8n-tooltip {
+	max-width: 180px;
+	line-height: var(--font-line-height-regular) !important;
 }
diff --git a/packages/design-system/src/css/radio-button.scss b/packages/design-system/src/css/radio-button.scss
index 8cf3b3ae5f38c..c90cc7473ea37 100644
--- a/packages/design-system/src/css/radio-button.scss
+++ b/packages/design-system/src/css/radio-button.scss
@@ -12,11 +12,11 @@
 		line-height: 1;
 		white-space: nowrap;
 		vertical-align: middle;
-		background: var.$button-default-background-color;
+		background: var.$radio-input-background-color;
 		border: var(--border-base);
 		font-weight: var(--font-weight-bold);
 		border-left: 0;
-		color: var.$button-default-font-color;
+		color: var.$radio-font-color;
 		-webkit-appearance: none;
 		text-align: center;
 		box-sizing: border-box;
diff --git a/packages/design-system/src/css/reset.scss b/packages/design-system/src/css/reset.scss
index a0a442c027c9d..84efa3cfd1659 100644
--- a/packages/design-system/src/css/reset.scss
+++ b/packages/design-system/src/css/reset.scss
@@ -7,40 +7,6 @@
 	box-sizing: border-box;
 }
 
-html {
-	height: 100%;
-	width: 100%;
-}
-
-body {
-	height: 100%;
-	width: 100%;
-	overscroll-behavior: none;
-	line-height: 1;
-	font-size: var(--font-size-m);
-	font-weight: var(--font-weight-regular);
-	color: var(--color-text-dark);
-	background-color: var(--color-background-xlight);
-	-webkit-font-smoothing: antialiased;
-	-moz-osx-font-smoothing: grayscale;
-}
-
-body,
-button,
-input {
-	font-family: var(--font-family);
-	-webkit-font-smoothing: antialiased;
-	-moz-osx-font-smoothing: grayscale;
-}
-
-input {
-	font-weight: var(--font-weight-regular);
-}
-
-button {
-	font-weight: var(--font-weight-bold);
-}
-
 html,
 body,
 div,
@@ -117,6 +83,40 @@ video {
 	background: transparent;
 }
 
+html {
+	height: 100%;
+	width: 100%;
+}
+
+body {
+	height: 100%;
+	width: 100%;
+	overscroll-behavior: none;
+	line-height: 1;
+	font-size: var(--font-size-m);
+	font-weight: var(--font-weight-regular);
+	color: var(--color-text-dark);
+	background-color: var(--color-background-light);
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+}
+
+body,
+button,
+input {
+	font-family: var(--font-family);
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+}
+
+input {
+	font-weight: var(--font-weight-regular);
+}
+
+button {
+	font-weight: var(--font-weight-bold);
+}
+
 article,
 aside,
 details,
diff --git a/packages/design-system/src/css/select.scss b/packages/design-system/src/css/select.scss
index 6fed9ae001299..f5b6f17d31ba3 100644
--- a/packages/design-system/src/css/select.scss
+++ b/packages/design-system/src/css/select.scss
@@ -47,11 +47,10 @@
 		& .el-select__caret {
 			font-size: var.$select-input-font-size;
 			transition: transform 0.3s;
-			transform: rotateZ(180deg);
 			cursor: pointer;
 
 			@include mixins.when(reverse) {
-				transform: rotateZ(0deg);
+				transform: rotateZ(180deg);
 			}
 
 			@include mixins.when(show-close) {
@@ -81,6 +80,14 @@
 		&.is-focus .el-input__inner {
 			border-color: var.$select-input-focus-border-color;
 		}
+
+		&__prefix {
+			left: var(--spacing-2xs);
+		}
+
+		&--prefix .el-input__inner {
+			padding-left: 26px;
+		}
 	}
 
 	> .el-input {
@@ -165,4 +172,9 @@
 			height: 42px;
 		}
 	}
+	&--default {
+		.el-tag {
+			padding: var(--spacing-5xs) var(--spacing-xs);
+		}
+	}
 }
diff --git a/packages/design-system/src/css/skeleton.scss b/packages/design-system/src/css/skeleton.scss
index d0dda993f5c8f..3a0266e92c92b 100644
--- a/packages/design-system/src/css/skeleton.scss
+++ b/packages/design-system/src/css/skeleton.scss
@@ -40,6 +40,7 @@
 	-ms-flex-pack: center;
 	justify-content: center;
 	border-radius: 8px !important;
+	color: var(--color-foreground-dark);
 }
 
 .el-skeleton__image svg {
@@ -58,11 +59,16 @@
 		linear,
 		left top,
 		right top,
-		color-stop(25%, #f2f2f2),
-		color-stop(37%, #e6e6e6),
-		color-stop(63%, #f2f2f2)
+		color-stop(25%, var(--color-background-base)),
+		color-stop(37%, var(--color-background-medium)),
+		color-stop(63%, var(--color-background-base))
+	);
+	background: linear-gradient(
+		90deg,
+		var(--color-background-base) 25%,
+		var(--color-background-medium) 37%,
+		var(--color-background-base) 63%
 	);
-	background: linear-gradient(90deg, #f2f2f2 25%, #e6e6e6 37%, #f2f2f2 63%);
 	background-size: 400% 100%;
 	-webkit-animation: el-skeleton-loading 1.4s ease infinite;
 	animation: el-skeleton-loading 1.4s ease infinite;
diff --git a/packages/design-system/src/css/switch.scss b/packages/design-system/src/css/switch.scss
index 7105bfd317503..7c2a6adfb5888 100644
--- a/packages/design-system/src/css/switch.scss
+++ b/packages/design-system/src/css/switch.scss
@@ -9,6 +9,9 @@
 	line-height: var.$switch-height;
 	height: var.$switch-height;
 	vertical-align: middle;
+	& .el-loading-mask {
+		border-radius: 10px;
+	}
 	@include mixins.when(disabled) {
 		& .el-switch__core,
 		& .el-switch__label {
@@ -62,8 +65,11 @@
 		border-radius: var.$switch-core-border-radius;
 		box-sizing: border-box;
 		background: var.$switch-off-color;
+		border: 1px solid var(--color-switch-border-color);
 		cursor: pointer;
-		transition: border-color 0.1s, background-color 0.1s;
+		transition:
+			border-color 0.1s,
+			background-color 0.1s;
 		vertical-align: middle;
 
 		&:after {
@@ -75,7 +81,7 @@
 			transition: all 0.1s;
 			width: var.$switch-button-size;
 			height: var.$switch-button-size;
-			background-color: var.$color-white;
+			background-color: var.$switch-toggle-color;
 		}
 	}
 
@@ -109,7 +115,7 @@
 		}
 	}
 
-	& .label-fade-enter,
+	& .label-fade-enter-from,
 	& .label-fade-leave-active {
 		opacity: 0;
 	}
diff --git a/packages/design-system/src/css/table.scss b/packages/design-system/src/css/table.scss
index b3cde7744ced0..ba3efdaf9cdff 100644
--- a/packages/design-system/src/css/table.scss
+++ b/packages/design-system/src/css/table.scss
@@ -489,7 +489,7 @@
 		& .el-table__body {
 			& tr.el-table__row--striped {
 				td {
-					background: #fafafa;
+					background: var.$table-row-striped-background-color;
 				}
 
 				&.current-row td {
diff --git a/packages/design-system/src/css/tabs.scss b/packages/design-system/src/css/tabs.scss
index 29587790254c2..d9aa9c7dd3cf4 100644
--- a/packages/design-system/src/css/tabs.scss
+++ b/packages/design-system/src/css/tabs.scss
@@ -179,7 +179,8 @@
 		> .el-tabs__header .el-tabs__item {
 			border-bottom: 1px solid transparent;
 			border-left: 1px solid var(--border-color-base);
-			transition: color 0.3s cubic-bezier(0.645, 0.045, 0.355, 1),
+			transition:
+				color 0.3s cubic-bezier(0.645, 0.045, 0.355, 1),
 				padding 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
 			&:first-child {
 				border-left: none;
@@ -211,7 +212,9 @@
 	@include mixins.m(border-card) {
 		background: var.$color-white;
 		border: 1px solid var(--border-color-base);
-		box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.12), 0 0 6px 0 rgba(0, 0, 0, 0.04);
+		box-shadow:
+			0 2px 4px 0 rgba(0, 0, 0, 0.12),
+			0 0 6px 0 rgba(0, 0, 0, 0.04);
 
 		> .el-tabs__content {
 			padding: 15px;
@@ -517,19 +520,19 @@
 .slideInLeft-transition {
 	display: inline-block;
 }
-.slideInRight-enter {
+.slideInRight-enter-from {
 	animation: slideInRight-enter 0.3s;
 }
-.slideInRight-leave {
+.slideInRight-leave-to {
 	position: absolute;
 	left: 0;
 	right: 0;
 	animation: slideInRight-leave 0.3s;
 }
-.slideInLeft-enter {
+.slideInLeft-enter-from {
 	animation: slideInLeft-enter 0.3s;
 }
-.slideInLeft-leave {
+.slideInLeft-leave-to {
 	position: absolute;
 	left: 0;
 	right: 0;
diff --git a/packages/design-system/src/css/tag.scss b/packages/design-system/src/css/tag.scss
index d7e8f736e9b67..10b09cf32b212 100644
--- a/packages/design-system/src/css/tag.scss
+++ b/packages/design-system/src/css/tag.scss
@@ -2,9 +2,9 @@
 @use './common/var';
 
 @mixin genTheme() {
-	background-color: var.$color-primary-lighter;
-	border-color: var.$color-primary-light-5;
-	color: var.$color-primary-light-1;
+	border-color: var(--color-callout-info-border);
+	background-color: var(--color-callout-info-background);
+	color: var(--color-callout-info-font);
 	font-weight: var(--font-weight-regular);
 
 	@include mixins.when(hit) {
@@ -20,14 +20,20 @@
 	}
 
 	&.el-tag--info {
-		background-color: var.$color-info-lighter;
-		border-color: var.$color-info-light-5;
-		color: var.$color-info-light-3;
+		border-color: var(--color-callout-info-border);
+		background-color: var(--color-callout-info-background);
+		color: var(--color-callout-info-font);
+		border-width: 1px;
+		border-style: solid;
 
 		@include mixins.when(hit) {
 			border-color: var.$tag-info-color;
 		}
 
+		.svg-inline--fa {
+			color: var(--color-callout-info-icon);
+		}
+
 		.el-tag__close {
 			color: var.$color-info-light-1;
 			&:hover {
@@ -38,9 +44,15 @@
 	}
 
 	&.el-tag--success {
-		background-color: var(--color-success-tint-2);
-		border-color: var(--color-success-tint-1);
-		color: var(--color-success);
+		border-color: var(--color-callout-success-border);
+		background-color: var(--color-callout-success-background);
+		color: var(--color-callout-success-font);
+		border-width: 1px;
+		border-style: solid;
+
+		.svg-inline--fa {
+			color: var(--color-callout-success-icon);
+		}
 
 		@include mixins.when(hit) {
 			border-color: var.$tag-success-color;
@@ -56,14 +68,20 @@
 	}
 
 	&.el-tag--warning {
-		background-color: var.$color-warning-lighter;
-		border-color: var.$color-warning-light-5;
-		color: var.$color-warning-light-3;
+		border-color: var(--color-callout-warning-border);
+		background-color: var(--color-callout-warning-background);
+		color: var(--color-callout-warning-font);
+		border-width: 1px;
+		border-style: solid;
 
 		@include mixins.when(hit) {
 			border-color: var.$tag-warning-color;
 		}
 
+		.svg-inline--fa {
+			color: var(--color-callout-warning-icon);
+		}
+
 		.el-tag__close {
 			color: var.$color-warning-light-1;
 			&:hover {
@@ -74,14 +92,20 @@
 	}
 
 	&.el-tag--danger {
-		background-color: var.$color-danger-lighter;
-		border-color: var.$color-danger-light-5;
-		color: var.$color-danger-light-3;
+		border-color: var(--color-callout-danger-border);
+		background-color: var(--color-callout-danger-background);
+		color: var(--color-callout-danger-font);
+		border-width: 1px;
+		border-style: solid;
 
 		@include mixins.when(hit) {
 			border-color: var.$tag-danger-color;
 		}
 
+		.svg-inline--fa {
+			color: var(--color-callout-danger-icon);
+		}
+
 		.el-tag__close {
 			color: var.$color-danger-light-1;
 			&:hover {
@@ -103,8 +127,9 @@
 	border-radius: var.$tag-border-radius;
 	box-sizing: border-box;
 	white-space: nowrap;
+	line-height: 1;
 
-	.el-icon-close {
+	.el-icon.el-tag__close {
 		border-radius: 50%;
 		text-align: center;
 		position: relative;
@@ -113,9 +138,8 @@
 		height: 16px;
 		width: 16px;
 		line-height: 16px;
-		vertical-align: middle;
-		top: -1px;
-		right: -5px;
+		margin-top: 0;
+		margin-right: 0;
 
 		&::before {
 			display: block;
@@ -133,7 +157,7 @@
 	@include mixins.m(medium) {
 		padding: 12px;
 
-		.el-icon-close {
+		.el-icon.el-tag__close {
 			transform: scale(0.8);
 		}
 	}
@@ -143,7 +167,7 @@
 		padding: 0 8px;
 		line-height: 22px;
 
-		.el-icon-close {
+		.el-icon.el-tag__close {
 			transform: scale(0.8);
 		}
 	}
@@ -153,7 +177,7 @@
 		padding: 0 5px;
 		line-height: 18px;
 
-		.el-icon-close {
+		.el-icon.el-tag__close {
 			margin-left: -3px;
 			transform: scale(0.7);
 		}
diff --git a/packages/design-system/src/css/tooltip.scss b/packages/design-system/src/css/tooltip.scss
index 81be43e297a72..eef6d4d171220 100644
--- a/packages/design-system/src/css/tooltip.scss
+++ b/packages/design-system/src/css/tooltip.scss
@@ -2,6 +2,8 @@
 @use './common/var';
 
 @include mixins.b(tooltip) {
+	max-width: 200px;
+
 	&:focus:not(.focusing),
 	&:focus:hover {
 		outline-width: 0;
@@ -23,8 +25,8 @@
 			font-weight: var(--font-weight-bold);
 		}
 
-		.popper__arrow,
-		.popper__arrow::after {
+		.el-popper__arrow,
+		.el-popper__arrow::after {
 			position: absolute;
 			display: block;
 			width: 0;
@@ -33,20 +35,16 @@
 			border-style: solid;
 		}
 
-		.popper__arrow {
+		.el-popper__arrow {
 			border-width: var.$tooltip-arrow-size;
 		}
 
-		.popper__arrow::after {
+		.el-popper__arrow::after {
 			content: ' ';
 			border-width: 5px;
 		}
 
-		&[x-placement^='top'] {
-			margin-bottom: #{var.$tooltip-arrow-size + 6px};
-		}
-
-		&[x-placement^='top'] .popper__arrow {
+		&[data-popper-placement^='top'] .el-popper__arrow {
 			bottom: -(var.$tooltip-arrow-size);
 			border-top-color: var.$tooltip-border-color;
 			border-bottom-width: 0;
@@ -59,11 +57,7 @@
 			}
 		}
 
-		&[x-placement^='bottom'] {
-			margin-top: #{var.$tooltip-arrow-size + 6px};
-		}
-
-		&[x-placement^='bottom'] .popper__arrow {
+		&[data-popper-placement^='bottom'] .el-popper__arrow {
 			top: -(var.$tooltip-arrow-size);
 			border-top-width: 0;
 			border-bottom-color: var.$tooltip-border-color;
@@ -76,11 +70,7 @@
 			}
 		}
 
-		&[x-placement^='right'] {
-			margin-left: #{var.$tooltip-arrow-size + 6px};
-		}
-
-		&[x-placement^='right'] .popper__arrow {
+		&[data-popper-placement^='right'] .el-popper__arrow {
 			left: -(var.$tooltip-arrow-size);
 			border-right-color: var.$tooltip-border-color;
 			border-left-width: 0;
@@ -93,11 +83,7 @@
 			}
 		}
 
-		&[x-placement^='left'] {
-			margin-right: #{var.$tooltip-arrow-size + 6px};
-		}
-
-		&[x-placement^='left'] .popper__arrow {
+		&[data-popper-placement^='left'] .el-popper__arrow {
 			right: -(var.$tooltip-arrow-size);
 			border-right-width: 0;
 			border-left-color: var.$tooltip-border-color;
@@ -111,34 +97,34 @@
 			}
 		}
 
-		@include mixins.when(dark) {
+		@include mixins.when(is-dark) {
 			background: var.$tooltip-fill;
 			color: var.$tooltip-color;
 		}
 
-		@include mixins.when(light) {
+		@include mixins.when(is-light) {
 			background: var.$tooltip-color;
 			border: 1px solid var.$tooltip-fill;
 
-			&[x-placement^='top'] .popper__arrow {
+			&[data-popper-placement^='top'] .el-popper__arrow {
 				border-top-color: var.$tooltip-fill;
 				&::after {
 					border-top-color: var.$tooltip-color;
 				}
 			}
-			&[x-placement^='bottom'] .popper__arrow {
+			&[data-popper-placement^='bottom'] .el-popper__arrow {
 				border-bottom-color: var.$tooltip-fill;
 				&::after {
 					border-bottom-color: var.$tooltip-color;
 				}
 			}
-			&[x-placement^='left'] .popper__arrow {
+			&[data-popper-placement^='left'] .el-popper__arrow {
 				border-left-color: var.$tooltip-fill;
 				&::after {
 					border-left-color: var.$tooltip-color;
 				}
 			}
-			&[x-placement^='right'] .popper__arrow {
+			&[data-popper-placement^='right'] .el-popper__arrow {
 				border-right-color: var.$tooltip-fill;
 				&::after {
 					border-right-color: var.$tooltip-color;
diff --git a/packages/design-system/src/css/upload.scss b/packages/design-system/src/css/upload.scss
index 89bc1c997fa36..0479771400cfa 100644
--- a/packages/design-system/src/css/upload.scss
+++ b/packages/design-system/src/css/upload.scss
@@ -195,7 +195,7 @@
 
 			.el-upload-list__item-name:hover,
 			.el-upload-list__item-name:focus {
-				color: var.$link-hover-color;
+				color: var.$link-color-hover;
 				cursor: pointer;
 			}
 
diff --git a/packages/design-system/src/css/utilities/_link.scss b/packages/design-system/src/css/utilities/_link.scss
new file mode 100644
index 0000000000000..4a65d43ae81fb
--- /dev/null
+++ b/packages/design-system/src/css/utilities/_link.scss
@@ -0,0 +1,10 @@
+.overlay-link::after {
+	content: '';
+	position: absolute;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	left: 0;
+	z-index: 1;
+	pointer-events: auto;
+}
diff --git a/packages/design-system/src/css/utilities/index.scss b/packages/design-system/src/css/utilities/index.scss
index 73ac65908a51e..e79fb2651a395 100644
--- a/packages/design-system/src/css/utilities/index.scss
+++ b/packages/design-system/src/css/utilities/index.scss
@@ -1,4 +1,5 @@
 @import 'float';
+@import 'link';
 @import 'list';
 @import 'spacing';
 @import 'typography';
diff --git a/packages/design-system/src/docs/Introduction.stories.mdx b/packages/design-system/src/docs/Introduction.stories.mdx
deleted file mode 100644
index 961486cf9ed7c..0000000000000
--- a/packages/design-system/src/docs/Introduction.stories.mdx
+++ /dev/null
@@ -1,5 +0,0 @@
-<Meta title="Docs/Introduction" />
-
-# Welcome to n8n Storybook
-
-This project includes components that make up n8n editor.
diff --git a/packages/design-system/src/locale/format.js b/packages/design-system/src/locale/format.js
deleted file mode 100644
index 77777cec63c6b..0000000000000
--- a/packages/design-system/src/locale/format.js
+++ /dev/null
@@ -1,53 +0,0 @@
-const hasOwnProperty = Object.prototype.hasOwnProperty;
-
-export function hasOwn(obj, key) {
-	return hasOwnProperty.call(obj, key);
-}
-
-const RE_NARGS = /(%|)\{([0-9a-zA-Z_]+)\}/g;
-/**
- *  String format template
- *  - Inspired:
- *    https://github.com/ElemeFE/element/blob/dev/src/locale/format.js
- *    https://github.com/Matt-Esch/string-template/index.js
- */
-export default function () {
-	/**
-	 * template
-	 *
-	 * @param {String | Function} string
-	 * @param {Array} ...args
-	 * @return {String}
-	 */
-
-	function template(value, ...args) {
-		if (typeof value === 'function') {
-			return value(args);
-		}
-		const string = value;
-		if (args.length === 1 && typeof args[0] === 'object') {
-			args = args[0];
-		}
-
-		if (!args || !args.hasOwnProperty) {
-			args = {};
-		}
-
-		return string.replace(RE_NARGS, (match, prefix, i, index) => {
-			let result;
-
-			if (string[index - 1] === '{' && string[index + match.length] === '}') {
-				return i;
-			} else {
-				result = hasOwn(args, i) ? args[i] : null;
-				if (result === null || result === undefined) {
-					return '';
-				}
-
-				return result;
-			}
-		});
-	}
-
-	return template;
-}
diff --git a/packages/design-system/src/locale/format.ts b/packages/design-system/src/locale/format.ts
new file mode 100644
index 0000000000000..a400633f366fe
--- /dev/null
+++ b/packages/design-system/src/locale/format.ts
@@ -0,0 +1,43 @@
+const RE_NARGS = /(%|)\{([0-9a-zA-Z_]+)\}/g;
+/**
+ *  String format template
+ *  - Inspired:
+ *    https://github.com/ElemeFE/element/blob/dev/src/locale/format.js
+ *    https://github.com/Matt-Esch/string-template/index.js
+ */
+export default function () {
+	function template(
+		value: string | ((...args: unknown[]) => string),
+		...args: Array<string | object>
+	) {
+		if (typeof value === 'function') {
+			return value(args);
+		}
+
+		const str = value;
+		if (args.length === 1 && typeof args[0] === 'object') {
+			args = args[0] as unknown as Array<string | object>;
+		}
+
+		if (!args?.hasOwnProperty) {
+			args = {} as unknown as Array<string | object>;
+		}
+
+		return str.replace(RE_NARGS, (match, _, i, index: number) => {
+			let result: string | object | null;
+
+			if (str[index - 1] === '{' && str[index + match.length] === '}') {
+				return i;
+			} else {
+				result = Object.hasOwn(args, i) ? args[i] : null;
+				if (result === null || result === undefined) {
+					return '';
+				}
+
+				return result;
+			}
+		});
+	}
+
+	return template;
+}
diff --git a/packages/design-system/src/locale/index.js b/packages/design-system/src/locale/index.js
deleted file mode 100644
index 603690f157c54..0000000000000
--- a/packages/design-system/src/locale/index.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import defaultLang from '../locale/lang/en';
-import Format from './format';
-
-import ElementLocale from 'element-ui/lib/locale';
-import ElementLang from 'element-ui/lib/locale/lang/en';
-ElementLocale.use(ElementLang);
-
-const format = Format();
-let lang = defaultLang;
-
-let i18nHandler;
-
-export const t = function (path, options) {
-	if (typeof i18nHandler === 'function') {
-		const value = i18nHandler.apply(this, arguments);
-		if (value !== null && value !== undefined && value !== path) return String(value);
-	}
-
-	// only support flat keys
-	if (lang[path] !== undefined) {
-		return format(lang[path], options);
-	}
-
-	return '';
-};
-
-export const use = function (l) {
-	try {
-		const ndsLang = require(`./lang/${l}`);
-		lang = ndsLang.default;
-
-		// todo breaks select empty data
-		// const elLang = require(`element-ui/lib/locale/lang/${l}`);;
-		// ElementLocale.use(elLang);
-	} catch (e) {}
-};
-
-export const i18n = function (fn) {
-	i18nHandler = fn || i18nHandler;
-};
-
-export default { use, t, i18n };
diff --git a/packages/design-system/src/locale/index.ts b/packages/design-system/src/locale/index.ts
new file mode 100644
index 0000000000000..4688b6a5baa52
--- /dev/null
+++ b/packages/design-system/src/locale/index.ts
@@ -0,0 +1,51 @@
+import defaultLang from '../locale/lang/en';
+import createFormatTemplate from './format';
+import type { N8nLocale, N8nLocaleTranslateFn } from '@/types';
+
+// import { ElementLocale } from 'element-plus';
+// import ElementLang from 'element-plus/lib/locale/lang/en';
+//
+// ElementLocale.use(ElementLang);
+
+const format = createFormatTemplate();
+let lang = defaultLang;
+
+let i18nHandler: N8nLocaleTranslateFn;
+
+export const t = function (
+	path: Parameters<typeof i18nHandler>[0],
+	options: Parameters<typeof i18nHandler>[1],
+) {
+	if (typeof i18nHandler === 'function') {
+		const value = i18nHandler(path, options);
+
+		if (value !== null && value !== undefined && value !== path) {
+			return String(value);
+		}
+	}
+
+	// only support flat keys
+	if (lang[path] !== undefined) {
+		return format(lang[path], options);
+	}
+
+	return '';
+};
+
+export async function use(l: string) {
+	try {
+		const ndsLang = (await import(`./lang/${l}.ts`)) as { default: N8nLocale };
+
+		lang = ndsLang.default;
+
+		// todo breaks select empty data
+		// const elLang = require(`element-ui/lib/locale/lang/${l}`);;
+		// ElementLocale.use(elLang);
+	} catch (e) {}
+}
+
+export const i18n = function (fn: N8nLocaleTranslateFn) {
+	i18nHandler = fn || i18nHandler;
+};
+
+export default { use, t, i18n };
diff --git a/packages/design-system/src/locale/lang/en.js b/packages/design-system/src/locale/lang/en.js
deleted file mode 100644
index 3038b3b248716..0000000000000
--- a/packages/design-system/src/locale/lang/en.js
+++ /dev/null
@@ -1,22 +0,0 @@
-export default {
-	'nds.auth.roles.owner': 'Owner',
-	'nds.userInfo.you': '(you)',
-	'nds.userSelect.selectUser': 'Select User',
-	'nds.userSelect.noMatchingUsers': 'No matching users',
-	'notice.showMore': 'Show more',
-	'notice.showLess': 'Show less',
-	'formInput.validator.fieldRequired': 'This field is required',
-	'formInput.validator.minCharactersRequired': 'Must be at least {minimum} characters',
-	'formInput.validator.maxCharactersRequired': 'Must be at most {maximum} characters',
-	'formInput.validator.oneNumbersRequired': (config) => {
-		return `Must have at least ${config.minimum} number${config.minimum > 1 ? 's' : ''}`;
-	},
-	'formInput.validator.validEmailRequired': 'Must be a valid email',
-	'formInput.validator.uppercaseCharsRequired': (config) =>
-		`Must have at least ${config.minimum} uppercase character${config.minimum > 1 ? 's' : ''}`,
-	'formInput.validator.defaultPasswordRequirements':
-		'8+ characters, at least 1 number and 1 capital letter',
-	'sticky.markdownHint': `You can style with <a href="https://docs.n8n.io/workflows/sticky-notes/" target="_blank">Markdown</a>`,
-	'tags.showMore': (count) => `+${count} more`,
-	'datatable.pageSize': 'Page size',
-};
diff --git a/packages/design-system/src/locale/lang/en.ts b/packages/design-system/src/locale/lang/en.ts
new file mode 100644
index 0000000000000..78102ec5c23af
--- /dev/null
+++ b/packages/design-system/src/locale/lang/en.ts
@@ -0,0 +1,26 @@
+/* eslint-disable @typescript-eslint/naming-convention */
+import type { N8nLocale } from '@/types';
+
+export default {
+	'nds.auth.roles.owner': 'Owner',
+	'nds.userInfo.you': '(you)',
+	'nds.userSelect.selectUser': 'Select User',
+	'nds.userSelect.noMatchingUsers': 'No matching users',
+	'notice.showMore': 'Show more',
+	'notice.showLess': 'Show less',
+	'formInput.validator.fieldRequired': 'This field is required',
+	'formInput.validator.minCharactersRequired': 'Must be at least {minimum} characters',
+	'formInput.validator.maxCharactersRequired': 'Must be at most {maximum} characters',
+	'formInput.validator.oneNumbersRequired': (config: { minimum: number }) => {
+		return `Must have at least ${config.minimum} number${config.minimum > 1 ? 's' : ''}`;
+	},
+	'formInput.validator.validEmailRequired': 'Must be a valid email',
+	'formInput.validator.uppercaseCharsRequired': (config: { minimum: number }) =>
+		`Must have at least ${config.minimum} uppercase character${config.minimum > 1 ? 's' : ''}`,
+	'formInput.validator.defaultPasswordRequirements':
+		'8+ characters, at least 1 number and 1 capital letter',
+	'sticky.markdownHint':
+		'You can style with <a href="https://docs.n8n.io/workflows/sticky-notes/" target="_blank">Markdown</a>',
+	'tags.showMore': (count: number) => `+${count} more`,
+	'datatable.pageSize': 'Page size',
+} as N8nLocale;
diff --git a/packages/design-system/src/main.ts b/packages/design-system/src/main.ts
index cf75163855806..54934d6f1c4d6 100644
--- a/packages/design-system/src/main.ts
+++ b/packages/design-system/src/main.ts
@@ -1,5 +1,6 @@
 import * as locale from './locale';
 
+export { useDeviceSupport } from './composables/useDeviceSupport';
 export * from './components';
 export * from './plugin';
 export * from './types';
diff --git a/packages/design-system/src/mixins/locale.ts b/packages/design-system/src/mixins/locale.ts
index 2fd636e5124b1..a695c0ca555e3 100644
--- a/packages/design-system/src/mixins/locale.ts
+++ b/packages/design-system/src/mixins/locale.ts
@@ -2,8 +2,8 @@ import { t } from '../locale';
 
 export default {
 	methods: {
-		t(...args: string[]) {
-			return t.apply(this, args);
+		t(path: string, ...args: string[]) {
+			return t.call(this, path, ...args);
 		},
 	},
 };
diff --git a/packages/design-system/src/plugin.ts b/packages/design-system/src/plugin.ts
index 0a9a47021014b..493fde38ecc5a 100644
--- a/packages/design-system/src/plugin.ts
+++ b/packages/design-system/src/plugin.ts
@@ -1,107 +1,12 @@
-/* eslint-disable @typescript-eslint/naming-convention */
-import type { PluginObject } from 'vue';
-import {
-	N8nActionBox,
-	N8nActionDropdown,
-	N8nActionToggle,
-	N8nAlert,
-	N8nAvatar,
-	N8nBadge,
-	N8nBlockUi,
-	N8nButton,
-	N8nElButton,
-	N8nCallout,
-	N8nCard,
-	N8nDatatable,
-	N8nFormBox,
-	N8nFormInputs,
-	N8nFormInput,
-	N8nHeading,
-	N8nIcon,
-	N8nIconButton,
-	N8nInfoAccordion,
-	N8nInfoTip,
-	N8nInput,
-	N8nInputLabel,
-	N8nInputNumber,
-	N8nLink,
-	N8nLoading,
-	N8nMarkdown,
-	N8nMenu,
-	N8nMenuItem,
-	N8nNodeCreatorNode,
-	N8nNodeIcon,
-	N8nNotice,
-	N8nOption,
-	N8nPopover,
-	N8nPulse,
-	N8nRadioButtons,
-	N8nSelect,
-	N8nSpinner,
-	N8nSticky,
-	N8nTabs,
-	N8nTag,
-	N8nTags,
-	N8nText,
-	N8nTooltip,
-	N8nTree,
-	N8nUserInfo,
-	N8nUserSelect,
-	N8nUsersList,
-	N8nResizeWrapper,
-	N8nRecycleScroller,
-} from './components';
+import type { Component, Plugin } from 'vue';
+import * as components from './components';
 
-export const N8nPlugin: PluginObject<{}> = {
+export interface N8nPluginOptions {}
+
+export const N8nPlugin: Plugin<N8nPluginOptions> = {
 	install: (app) => {
-		app.component('n8n-info-accordion', N8nInfoAccordion);
-		app.component('n8n-action-box', N8nActionBox);
-		app.component('n8n-action-dropdown', N8nActionDropdown);
-		app.component('n8n-action-toggle', N8nActionToggle);
-		app.component('n8n-alert', N8nAlert);
-		app.component('n8n-avatar', N8nAvatar);
-		app.component('n8n-badge', N8nBadge);
-		app.component('n8n-block-ui', N8nBlockUi);
-		app.component('n8n-button', N8nButton);
-		app.component('el-button', N8nElButton);
-		app.component('n8n-callout', N8nCallout);
-		app.component('n8n-card', N8nCard);
-		app.component('n8n-datatable', N8nDatatable);
-		app.component('n8n-form-box', N8nFormBox);
-		app.component('n8n-form-inputs', N8nFormInputs);
-		app.component('n8n-form-input', N8nFormInput);
-		app.component('n8n-icon', N8nIcon);
-		app.component('n8n-icon-button', N8nIconButton);
-		app.component('n8n-info-tip', N8nInfoTip);
-		app.component('n8n-input', N8nInput);
-		app.component('n8n-input-label', N8nInputLabel);
-		app.component('n8n-input-number', N8nInputNumber);
-		app.component('n8n-loading', N8nLoading);
-		app.component('n8n-heading', N8nHeading);
-		app.component('n8n-link', N8nLink);
-		app.component('n8n-markdown', N8nMarkdown);
-		app.component('n8n-menu', N8nMenu);
-		app.component('n8n-menu-item', N8nMenuItem);
-		app.component('n8n-node-creator-node', N8nNodeCreatorNode);
-		app.component('n8n-node-icon', N8nNodeIcon);
-		app.component('n8n-notice', N8nNotice);
-		app.component('n8n-option', N8nOption);
-		app.component('n8n-popover', N8nPopover);
-		app.component('n8n-pulse', N8nPulse);
-		app.component('n8n-select', N8nSelect);
-		app.component('n8n-spinner', N8nSpinner);
-		app.component('n8n-sticky', N8nSticky);
-		app.component('n8n-radio-buttons', N8nRadioButtons);
-		app.component('n8n-tags', N8nTags);
-		app.component('n8n-tabs', N8nTabs);
-		app.component('n8n-tag', N8nTag);
-		app.component('n8n-text', N8nText);
-		app.component('n8n-tooltip', N8nTooltip);
-		app.component('n8n-user-info', N8nUserInfo);
-		app.component('n8n-tree', N8nTree);
-		app.component('n8n-users-list', N8nUsersList);
-		app.component('n8n-user-select', N8nUserSelect);
-		app.component('n8n-resize-wrapper', N8nResizeWrapper);
-		app.component('n8n-recycle-scroller', N8nRecycleScroller);
+		for (const [name, component] of Object.entries(components)) {
+			app.component(name, component as unknown as Component);
+		}
 	},
 };
diff --git a/packages/design-system/src/shims-markdown-it.d.ts b/packages/design-system/src/shims-markdown-it.d.ts
index 3a92cab657ac7..ecc98514670bc 100644
--- a/packages/design-system/src/shims-markdown-it.d.ts
+++ b/packages/design-system/src/shims-markdown-it.d.ts
@@ -1,4 +1,15 @@
 declare module 'markdown-it-task-lists' {
-	import type { PluginSimple } from 'markdown-it';
-	export default plugin as PluginSimple<{}>;
+	import type { PluginWithOptions } from 'markdown-it';
+
+	declare namespace markdownItTaskLists {
+		interface Config {
+			enabled?: boolean;
+			label?: boolean;
+			labelAfter?: boolean;
+		}
+	}
+
+	declare const markdownItTaskLists: PluginWithOptions<markdownItTaskLists.Config>;
+
+	export = markdownItTaskLists;
 }
diff --git a/packages/design-system/src/shims-vue2-boring-avatars.d.ts b/packages/design-system/src/shims-vue2-boring-avatars.d.ts
deleted file mode 100644
index 9098a107f12f9..0000000000000
--- a/packages/design-system/src/shims-vue2-boring-avatars.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-declare module 'vue2-boring-avatars';
diff --git a/packages/design-system/src/styleguide/ColorCircles.vue b/packages/design-system/src/styleguide/ColorCircles.vue
index 763bc24b1d763..0643883ac450b 100644
--- a/packages/design-system/src/styleguide/ColorCircles.vue
+++ b/packages/design-system/src/styleguide/ColorCircles.vue
@@ -3,7 +3,7 @@
 		<div v-for="color in colors" :key="color" :class="$style.container">
 			<div :class="$style.circle" :style="{ backgroundColor: `var(${color})` }"></div>
 			<span>{{ color }}</span>
-			<span :class="$style.hsl">{{ hsl[color] }}</span>
+			<span :class="$style.hsl">{{ getHSLValue(color) }}</span>
 			<span :class="$style.color">{{ getHexValue(color) }}</span>
 		</div>
 	</div>
@@ -26,7 +26,22 @@ function hslToHex(h: number, s: number, l: number): string {
 	return `#${f(0)}${f(8)}${f(4)}`;
 }
 
+function resolveHSLCalc(hslString: string): string {
+	const calcRegex = /calc\(([^)]+)\)/;
+	const matchCalc = hslString.match(calcRegex);
+	if (!matchCalc) {
+		return hslString;
+	}
+	const expression = matchCalc[1];
+	const noPercentageExpression = expression.replace(/%/g, '');
+	const evaluation: number = eval(noPercentageExpression);
+	const finalPercentage = evaluation.toString() + '%';
+	const resolvedHslString = hslString.replace(calcRegex, finalPercentage);
+	return resolvedHslString;
+}
+
 function getHex(hsl: string): string {
+	hsl = resolveHSLCalc(hsl);
 	const colors = hsl
 		.replace('hsl(', '')
 		.replace(')', '')
@@ -38,25 +53,28 @@ function getHex(hsl: string): string {
 }
 
 export default defineComponent({
-	name: 'color-circles',
-	data() {
-		return {
-			observer: null as null | MutationObserver,
-			hsl: {} as { [color: string]: string },
-		};
-	},
+	name: 'ColorCircles',
 	props: {
 		colors: {
 			type: Array as PropType<string[]>,
 			required: true,
 		},
 	},
+	data() {
+		return {
+			observer: null as null | MutationObserver,
+			hsl: {} as { [color: string]: string },
+		};
+	},
 	created() {
 		const setColors = () => {
 			this.colors.forEach((color) => {
 				const style = getComputedStyle(document.body);
 
-				this.$set(this.hsl, color, style.getPropertyValue(color));
+				this.hsl = {
+					...this.hsl,
+					[color]: style.getPropertyValue(color),
+				};
 			});
 		};
 
@@ -75,7 +93,7 @@ export default defineComponent({
 			this.observer.observe(body, { attributes: true });
 		}
 	},
-	destroyed() {
+	unmounted() {
 		if (this.observer) {
 			this.observer.disconnect();
 		}
@@ -84,6 +102,9 @@ export default defineComponent({
 		getHexValue(color: string) {
 			return getHex(this.hsl[color]);
 		},
+		getHSLValue(color: string) {
+			return resolveHSLCalc(this.hsl[color]);
+		},
 	},
 });
 </script>
diff --git a/packages/design-system/src/styleguide/Sizes.vue b/packages/design-system/src/styleguide/Sizes.vue
index dd5316c6799de..da638f1088e48 100644
--- a/packages/design-system/src/styleguide/Sizes.vue
+++ b/packages/design-system/src/styleguide/Sizes.vue
@@ -22,13 +22,7 @@ import type { PropType } from 'vue';
 import { defineComponent } from 'vue';
 
 export default defineComponent({
-	name: 'sizes',
-	data() {
-		return {
-			observer: null as null | MutationObserver,
-			sizes: {} as Record<string, { rem: string; px: number }>,
-		};
-	},
+	name: 'Sizes',
 	props: {
 		variables: {
 			type: Array as PropType<string[]>,
@@ -39,6 +33,12 @@ export default defineComponent({
 			default: '',
 		},
 	},
+	data() {
+		return {
+			observer: null as null | MutationObserver,
+			sizes: {} as Record<string, { rem: string; px: number }>,
+		};
+	},
 	created() {
 		const setSizes = () => {
 			this.variables.forEach((variable: string) => {
@@ -46,7 +46,10 @@ export default defineComponent({
 				const rem = style.getPropertyValue(variable);
 				const px = parseFloat(rem.replace('rem', '')) * 16;
 
-				this.$set(this.sizes, variable, { rem, px });
+				this.sizes = {
+					...this.sizes,
+					[variable]: { rem, px },
+				};
 			});
 		};
 
@@ -65,7 +68,7 @@ export default defineComponent({
 			this.observer.observe(body, { attributes: true });
 		}
 	},
-	destroyed() {
+	unmounted() {
 		if (this.observer) {
 			this.observer.disconnect();
 		}
diff --git a/packages/design-system/src/styleguide/VariableTable.vue b/packages/design-system/src/styleguide/VariableTable.vue
index 9d26337900f68..f0c8e1feadb9c 100644
--- a/packages/design-system/src/styleguide/VariableTable.vue
+++ b/packages/design-system/src/styleguide/VariableTable.vue
@@ -15,58 +15,52 @@
 	</table>
 </template>
 
-<script lang="ts">
-import type { PropType } from 'vue';
-import { defineComponent } from 'vue';
+<script lang="ts" setup>
+import { onMounted, onUnmounted } from 'vue';
 
-export default defineComponent({
-	name: 'variable-table',
-	data() {
-		return {
-			observer: null as null | MutationObserver,
-			values: {} as Record<string, string>,
-		};
-	},
-	props: {
-		variables: {
-			type: Array as PropType<string[]>,
-			required: true,
-		},
-		attr: {
-			type: String,
-			default: '',
-		},
-	},
-	created() {
-		const setValues = () => {
-			this.variables.forEach((variable) => {
-				const style = getComputedStyle(document.body);
-				const value = style.getPropertyValue(variable);
+interface VariableTableProps {
+	variables: string[];
+	attr?: string;
+}
 
-				this.$set(this.values, variable, value);
-			});
-		};
+const props = withDefaults(defineProps<VariableTableProps>(), {
+	attr: '',
+});
 
-		setValues();
+let observer: MutationObserver | null = null;
+let values: Record<string, string> = {};
 
-		// when theme class is added or removed, reset color values
-		this.observer = new MutationObserver((mutationsList) => {
-			for (const mutation of mutationsList) {
-				if (mutation.type === 'attributes') {
-					setValues();
-				}
-			}
+onMounted(() => {
+	const setValues = () => {
+		props.variables.forEach((variable) => {
+			const style = getComputedStyle(document.body);
+			const value = style.getPropertyValue(variable);
+
+			values = {
+				...values,
+				[variable]: value,
+			};
 		});
-		const body = document.querySelector('body');
-		if (body) {
-			this.observer.observe(body, { attributes: true });
-		}
-	},
-	destroyed() {
-		if (this.observer) {
-			this.observer.disconnect();
+	};
+
+	setValues();
+
+	// when theme class is added or removed, reset color values
+	observer = new MutationObserver((mutationsList) => {
+		for (const mutation of mutationsList) {
+			if (mutation.type === 'attributes') {
+				setValues();
+			}
 		}
-	},
+	});
+	const body = document.querySelector('body');
+	if (body) {
+		observer.observe(body, { attributes: true });
+	}
+});
+
+onUnmounted(() => {
+	observer?.disconnect();
 });
 </script>
 
diff --git a/packages/design-system/src/styleguide/border.stories.mdx b/packages/design-system/src/styleguide/border.stories.mdx
deleted file mode 100644
index b7f0785f33989..0000000000000
--- a/packages/design-system/src/styleguide/border.stories.mdx
+++ /dev/null
@@ -1,49 +0,0 @@
-import { Meta, Story, Canvas } from '@storybook/addon-docs';
-import VariableTable from './VariableTable.vue';
-
-<Meta
-	title="Styleguide/Border"
-	parameters={{
-		design: {
-			type: 'figma',
-			url: 'https://www.figma.com/file/DxLbnIyMK8X0uLkUguFV4n/n8n-design-system_v1?node-id=79%3A6898',
-		},
-	}}
-/>
-
-# Border Radius
-
-<Canvas>
-	<Story name="border-radius">
-		{{
-			template: `<variable-table :variables="['--border-radius-small','--border-radius-base', '--border-radius-large', '--border-radius-xlarge']" />`,
-			components: {
-				VariableTable,
-			},
-		}}
-	</Story>
-</Canvas>
-
-# Border Width
-
-<Canvas>
-	<Story name="border-width">
-		{{
-			template: `<variable-table :variables="['--border-width-base']" />`,
-			components: {
-				VariableTable,
-			},
-		}}
-	</Story>
-</Canvas>
-
-<Canvas>
-	<Story name="border-style">
-		{{
-			template: `<variable-table :variables="['--border-style-base']" />`,
-			components: {
-				VariableTable,
-			},
-		}}
-	</Story>
-</Canvas>
diff --git a/packages/design-system/src/styleguide/border.stories.ts b/packages/design-system/src/styleguide/border.stories.ts
new file mode 100644
index 0000000000000..9bfc2b497dc24
--- /dev/null
+++ b/packages/design-system/src/styleguide/border.stories.ts
@@ -0,0 +1,29 @@
+import { type StoryFn } from '@storybook/vue3';
+import VariableTable from './VariableTable.vue';
+
+export default {
+	title: 'Styleguide/Border',
+	parameters: {
+		design: {
+			type: 'figma',
+			url: 'https://www.figma.com/file/DxLbnIyMK8X0uLkUguFV4n/n8n-design-system_v1?node-id=79%3A6898',
+		},
+	},
+};
+
+const Template =
+	(template: string): StoryFn =>
+	() => ({
+		components: {
+			VariableTable,
+		},
+		template,
+	});
+
+export const BorderRadius = Template(
+	"<variable-table :variables=\"['--border-radius-small','--border-radius-base', '--border-radius-large', '--border-radius-xlarge']\" />",
+);
+
+export const BorderWidth = Template('<variable-table :variables="[\'--border-width-base\']" />');
+
+export const BorderStyle = Template('<variable-table :variables="[\'--border-style-base\']" />');
diff --git a/packages/design-system/src/styleguide/colors.stories.mdx b/packages/design-system/src/styleguide/colors.stories.mdx
deleted file mode 100644
index 131a6950c0400..0000000000000
--- a/packages/design-system/src/styleguide/colors.stories.mdx
+++ /dev/null
@@ -1,192 +0,0 @@
-import { Meta, Story, Canvas } from '@storybook/addon-docs';
-import ColorCircles from './ColorCircles.vue';
-
-<Meta
-	title="Styleguide/Colors"
-	parameters={{
-		design: {
-			type: 'figma',
-			url: 'https://www.figma.com/file/DxLbnIyMK8X0uLkUguFV4n/n8n-design-system_v1?node-id=2%3A23',
-		},
-	}}
-/>
-
-# Colors
-
-## Primary
-
-<Canvas>
-	<Story name="primary">
-		{{
-			template: `<color-circles :colors="['--color-primary-shade-1', '--color-primary', '--color-primary-tint-1', '--color-primary-tint-2', '--color-primary-tint-3']" />`,
-			components: {
-				ColorCircles,
-			},
-		}}
-	</Story>
-</Canvas>
-
-## Secondary
-
-<Canvas>
-	<Story name="secondary">
-		{{
-			template: `<color-circles :colors="['--color-secondary', '--color-secondary-tint-1', '--color-secondary-tint-2', '--color-secondary-tint-3', '--color-secondary-tint-4']" />`,
-			components: {
-				ColorCircles,
-			},
-		}}
-	</Story>
-</Canvas>
-
-## Success
-
-<Canvas>
-	<Story name="success">
-		{{
-			template: `<color-circles :colors="['--color-success', '--color-success-tint-1', '--color-success-tint-2', '--color-success-light']" />`,
-			components: {
-				ColorCircles,
-			},
-		}}
-	</Story>
-</Canvas>
-
-## Warning
-
-<Canvas>
-	<Story name="warning">
-		{{
-			template: `<color-circles :colors="['--color-warning', '--color-warning-tint-1', '--color-warning-tint-2']" />`,
-			components: {
-				ColorCircles,
-			},
-		}}
-	</Story>
-</Canvas>
-
-## Danger
-
-<Canvas>
-	<Story name="danger">
-		{{
-			template: `<color-circles :colors="['--color-danger', '--color-danger-tint-1', '--color-danger-tint-2']" />`,
-			components: {
-				ColorCircles,
-			},
-		}}
-	</Story>
-</Canvas>
-
-## Info
-
-<Canvas>
-	<Story name="info">
-		{{
-			template: `<color-circles :colors="['--color-info', '--color-info-tint-1', '--color-info-tint-2']" />`,
-			components: {
-				ColorCircles,
-			},
-		}}
-	</Story>
-</Canvas>
-
-## Neutral
-
-<Canvas>
-	<Story name="neutral">
-		{{
-			template: `<color-circles :colors="['--color-neutral']" />`,
-			components: {
-				ColorCircles,
-			},
-		}}
-	</Story>
-</Canvas>
-
-## Text
-
-<Canvas>
-	<Story name="text">
-		{{
-			template: `<color-circles :colors="['--color-text-dark', '--color-text-base', '--color-text-light', '--color-text-lighter', '--color-text-xlight']" />`,
-			components: {
-				ColorCircles,
-			},
-		}}
-	</Story>
-</Canvas>
-
-## Foreground
-
-<Canvas>
-	<Story name="foreground">
-		{{
-			template: `<color-circles :colors="['--color-foreground-xdark', '--color-foreground-dark', '--color-foreground-base', '--color-foreground-light', '--color-foreground-xlight']" />`,
-			components: {
-				ColorCircles,
-			},
-		}}
-	</Story>
-</Canvas>
-
-## Background
-
-<Canvas>
-	<Story name="background">
-		{{
-			template: `<color-circles :colors="['--color-background-dark', '--color-background-base', '--color-background-light', '--color-background-lighter', '--color-background-xlight']" />`,
-			components: {
-				ColorCircles,
-			},
-		}}
-	</Story>
-</Canvas>
-
-## Canvas
-
-<Canvas>
-	<Story name="canvas">
-		{{
-			template: `<color-circles :colors="['--color-canvas-background', '--color-canvas-dot']" />`,
-			components: {
-				ColorCircles,
-			},
-		}}
-	</Story>
-</Canvas>
-
-<Canvas>
-	<Story name="avatar">
-		{{
-			template: `<color-circles :colors="['--color-avatar-accent-1', '--color-avatar-accent-2']" />`,
-			components: {
-				ColorCircles,
-			},
-		}}
-	</Story>
-</Canvas>
-
-<Canvas>
-	<Story name="json">
-		{{
-			template: `<color-circles :colors="['--color-json-default', '--color-json-null', '--color-json-boolean', '--color-json-number', '--color-json-string', '--color-json-key', '--color-json-brackets', '--color-json-brackets-hover', '--color-json-line', '--color-json-highlight']" />`,
-			components: {
-				ColorCircles,
-			},
-		}}
-	</Story>
-</Canvas>
-
-## Sticky
-
-<Canvas>
-	<Story name="sticky">
-		{{
-			template: `<color-circles :colors="['--color-sticky-default-background', '--color-sticky-default-border']" />`,
-			components: {
-				ColorCircles,
-			},
-		}}
-	</Story>
-</Canvas>
diff --git a/packages/design-system/src/styleguide/colors.stories.ts b/packages/design-system/src/styleguide/colors.stories.ts
new file mode 100644
index 0000000000000..7eca60a850775
--- /dev/null
+++ b/packages/design-system/src/styleguide/colors.stories.ts
@@ -0,0 +1,53 @@
+import { type StoryFn } from '@storybook/vue3';
+import ColorCircles from './ColorCircles.vue';
+
+export default {
+	title: 'Styleguide/Colors Tokens',
+	parameters: {
+		design: {
+			type: 'figma',
+			url: 'https://www.figma.com/file/DxLbnIyMK8X0uLkUguFV4n/n8n-design-system_v1?node-id=2%3A23',
+		},
+	},
+};
+
+const Template =
+	(template: string): StoryFn =>
+	() => ({
+		components: {
+			ColorCircles,
+		},
+		template,
+	});
+
+export const Primary = Template(
+	"<color-circles :colors=\"['--color-primary-shade-1', '--color-primary', '--color-primary-tint-1', '--color-primary-tint-2', '--color-primary-tint-3']\" />",
+);
+
+export const Secondary = Template(
+	"<color-circles :colors=\"['--color-secondary-shade-1', '--color-secondary', '--color-secondary-tint-1', '--color-secondary-tint-3']\" />",
+);
+
+export const Success = Template(
+	"<color-circles :colors=\"['--color-success-shade-1', '--color-success', '--color-success-light',  '--color-success-light-2', '--color-success-tint-1', '--color-success-tint-2']\" />",
+);
+
+export const Warning = Template(
+	"<color-circles :colors=\"['--color-warning-shade-1', '--color-warning', '--color-warning-tint-1', '--color-warning-tint-2']\" />",
+);
+
+export const Danger = Template(
+	"<color-circles :colors=\"['--color-danger-shade-1', '--color-danger', '--color-danger-tint-1', '--color-danger-tint-2']\" />",
+);
+
+export const Text = Template(
+	"<color-circles :colors=\"['--color-text-dark', '--color-text-base', '--color-text-light', '--color-text-lighter', '--color-text-xlight', '--color-text-danger']\" />",
+);
+
+export const Foreground = Template(
+	"<color-circles :colors=\"['--color-foreground-xdark', '--color-foreground-dark', '--color-foreground-base', '--color-foreground-light', '--color-foreground-xlight']\" />",
+);
+
+export const Background = Template(
+	"<color-circles :colors=\"['--color-background-dark', '--color-background-medium', '--color-background-base', '--color-background-light', '--color-background-xlight']\" />",
+);
diff --git a/packages/design-system/src/styleguide/colorsprimitives.stories.ts b/packages/design-system/src/styleguide/colorsprimitives.stories.ts
new file mode 100644
index 0000000000000..430664a29e673
--- /dev/null
+++ b/packages/design-system/src/styleguide/colorsprimitives.stories.ts
@@ -0,0 +1,67 @@
+import { type StoryFn } from '@storybook/vue3';
+import ColorCircles from './ColorCircles.vue';
+
+export default {
+	title: 'Styleguide/Colors Primitives',
+	parameters: {
+		design: {
+			type: 'figma',
+			url: 'https://www.figma.com/file/DxLbnIyMK8X0uLkUguFV4n/n8n-design-system_v1?node-id=2%3A23',
+		},
+	},
+};
+
+const Template =
+	(template: string): StoryFn =>
+	() => ({
+		components: {
+			ColorCircles,
+		},
+		template,
+	});
+
+export const Gray = Template(
+	"<color-circles :colors=\"['--prim-gray-820', '--prim-gray-800', '--prim-gray-740', '--prim-gray-670', '--prim-gray-540', '--prim-gray-490', '--prim-gray-420', '--prim-gray-320', '--prim-gray-200', '--prim-gray-120', '--prim-gray-70', '--prim-gray-30', '--prim-gray-40', '--prim-gray-10', '--prim-gray-0']\" />",
+);
+
+export const Primary = Template(
+	"<color-circles :colors=\"['--prim-color-primary-shade-300', '--prim-color-primary-shade-100', '--prim-color-primary', '--prim-color-primary-tint-100', '--prim-color-primary-tint-200', '--prim-color-primary-tint-250', '--prim-color-primary-tint-300']\" />",
+);
+
+export const Secondary = Template(
+	"<color-circles :colors=\"['--prim-color-secondary-shade-250', '--prim-color-secondary-shade-100', '--prim-color-secondary', '--prim-color-secondary-tint-100', '--prim-color-secondary-tint-200', '--prim-color-secondary-tint-300', '--prim-color-secondary-tint-400']\" />",
+);
+
+export const AlternateA = Template(
+	"<color-circles :colors=\"['--prim-color-alt-a-shade-200', '--prim-color-alt-a-shade-100', '--prim-color-alt-a', '--prim-color-alt-a-tint-300', '--prim-color-alt-a-tint-400', '--prim-color-alt-a-tint-500', '--prim-color-alt-a-tint-550']\" />",
+);
+
+export const AlternateB = Template(
+	"<color-circles :colors=\"['--prim-color-alt-b-shade-350', '--prim-color-alt-b-shade-250', '--prim-color-alt-b-shade-100', '--prim-color-alt-b', '--prim-color-alt-b-tint-150', '--prim-color-alt-b-tint-250', '--prim-color-alt-b-tint-300', '--prim-color-alt-b-tint-400']\" />",
+);
+
+export const AlternateC = Template(
+	"<color-circles :colors=\"['--prim-color-alt-c-shade-250', '--prim-color-alt-c-shade-150', '--prim-color-alt-c-shade-100', '--prim-color-alt-c', '--prim-color-alt-c-tint-150', '--prim-color-alt-c-tint-250', '--prim-color-alt-c-tint-300', '--prim-color-alt-c-tint-400', '--prim-color-alt-c-tint-450']\" />",
+);
+
+export const AlternateD = Template(
+	"<color-circles :colors=\"['--prim-color-alt-d-shade-700', '--prim-color-alt-d-shade-600', '--prim-color-alt-d-shade-150', '--prim-color-alt-d']\" />",
+);
+
+export const AlternateE = Template(
+	"<color-circles :colors=\"['--prim-color-alt-e-shade-350', '--prim-color-alt-e-shade-250', '--prim-color-alt-e-shade-150', '--prim-color-alt-e-shade-100', '--prim-color-alt-e', '--prim-color-alt-e-tint-250', '--prim-color-alt-e-tint-350']\" />",
+);
+
+export const AlternateF = Template(
+	"<color-circles :colors=\"['--prim-color-alt-f', '--prim-color-alt-f-tint-150']\" />",
+);
+
+export const AlternateG = Template(
+	"<color-circles :colors=\"['--prim-color-alt-g', '--prim-color-alt-g-tint-150']\" />",
+);
+
+export const AlternateH = Template('<color-circles :colors="[\'--prim-color-alt-h\']" />');
+
+export const AlternateI = Template('<color-circles :colors="[\'--prim-color-alt-i\']" />');
+
+export const AlternateJ = Template('<color-circles :colors="[\'--prim-color-alt-j\']" />');
diff --git a/packages/design-system/src/styleguide/components/SpacingPreview.vue b/packages/design-system/src/styleguide/components/SpacingPreview.vue
index e9b9eb7626da8..b8dd68d317986 100644
--- a/packages/design-system/src/styleguide/components/SpacingPreview.vue
+++ b/packages/design-system/src/styleguide/components/SpacingPreview.vue
@@ -1,6 +1,6 @@
 <template>
 	<div>
-		<div v-for="size in sizes" class="spacing-group" :key="size">
+		<div v-for="size in sizes" :key="size" class="spacing-group">
 			<div class="spacing-example" :class="`${property[0]}${side ? side[0] : ''}-${size}`">
 				<div class="spacing-box" />
 				<div class="label">{{ property[0] }}{{ side ? side[0] : '' }}-{{ size }}</div>
@@ -9,42 +9,37 @@
 	</div>
 </template>
 
-<script lang="ts">
-import { defineComponent } from 'vue';
+<script lang="ts" setup>
+import { computed } from 'vue';
 
-export default defineComponent({
-	name: 'SpacingPreview',
-	props: {
-		property: {
-			type: String,
-			default: 'padding',
-		},
-		side: {
-			type: String,
-			default: '',
-		},
-	},
-	computed: {
-		sizes() {
-			return [
-				'0',
-				'5xs',
-				'4xs',
-				'3xs',
-				'2xs',
-				'xs',
-				's',
-				'm',
-				'l',
-				'xl',
-				'2xl',
-				'3xl',
-				'4xl',
-				'5xl',
-			].concat(this.property === 'margin' ? ['auto'] : []);
-		},
-	},
+interface SpacingPreviewProps {
+	property?: 'padding' | 'margin';
+	side?: string;
+}
+
+const SIZES = [
+	'0',
+	'5xs',
+	'4xs',
+	'3xs',
+	'2xs',
+	'xs',
+	's',
+	'm',
+	'l',
+	'xl',
+	'2xl',
+	'3xl',
+	'4xl',
+	'5xl',
+] as const;
+
+const props = withDefaults(defineProps<SpacingPreviewProps>(), {
+	property: 'padding',
+	side: '',
 });
+
+const sizes = computed(() => [...SIZES, ...(props.property === 'margin' ? ['auto'] : [])]);
 </script>
 
 <style lang="scss">
diff --git a/packages/design-system/src/styleguide/fonts.stories.mdx b/packages/design-system/src/styleguide/fonts.stories.mdx
deleted file mode 100644
index a66c0495a25ba..0000000000000
--- a/packages/design-system/src/styleguide/fonts.stories.mdx
+++ /dev/null
@@ -1,59 +0,0 @@
-import { Meta, Story, Canvas } from '@storybook/addon-docs';
-import Sizes from './Sizes.vue';
-import VariableTable from './VariableTable.vue';
-
-<Meta title="Styleguide/Font" />
-
-# Font
-
-## Font Sizes
-
-<Canvas>
-	<Story name="font-size">
-		{{
-			template: `<sizes :variables="['--font-size-3xs', '--font-size-2xs','--font-size-xs','--font-size-s','--font-size-m','--font-size-l','--font-size-xl','--font-size-2xl']" attr="font-size" />`,
-			components: {
-				Sizes,
-			},
-		}}
-	</Story>
-</Canvas>
-
-## Line Heights
-
-<Canvas>
-	<Story name="line-height">
-		{{
-			template: `<variable-table :variables="['--font-line-height-compact','--font-line-height-regular','--font-line-height-loose','--font-line-height-xloose']" />`,
-			components: {
-				VariableTable,
-			},
-		}}
-	</Story>
-</Canvas>
-
-## Font Weights
-
-<Canvas>
-	<Story name="font-weight">
-		{{
-			template: `<variable-table :variables="['--font-weight-regular','--font-weight-bold']" attr="font-weight" />`,
-			components: {
-				VariableTable,
-			},
-		}}
-	</Story>
-</Canvas>
-
-## Font Family
-
-<Canvas>
-	<Story name="font-family">
-		{{
-			template: `<variable-table :variables="['--font-family']" attr="font-family" />`,
-			components: {
-				VariableTable,
-			},
-		}}
-	</Story>
-</Canvas>
diff --git a/packages/design-system/src/styleguide/fonts.stories.ts b/packages/design-system/src/styleguide/fonts.stories.ts
new file mode 100644
index 0000000000000..6542603deda69
--- /dev/null
+++ b/packages/design-system/src/styleguide/fonts.stories.ts
@@ -0,0 +1,36 @@
+import { type StoryFn } from '@storybook/vue3';
+import Sizes from './Sizes.vue';
+import VariableTable from './VariableTable.vue';
+
+export default {
+	title: 'Styleguide/Font',
+};
+
+export const FontSize: StoryFn = () => ({
+	components: {
+		Sizes,
+	},
+	template:
+		"<sizes :variables=\"['--font-size-3xs', '--font-size-2xs','--font-size-xs','--font-size-s','--font-size-m','--font-size-l','--font-size-xl','--font-size-2xl']\" attr=\"font-size\" />",
+});
+
+const Template =
+	(template: string): StoryFn =>
+	() => ({
+		components: {
+			VariableTable,
+		},
+		template,
+	});
+
+export const LineHeight = Template(
+	"<variable-table :variables=\"['--font-line-height-compact','--font-line-height-regular','--font-line-height-loose','--font-line-height-xloose']\" />",
+);
+
+export const FontWeight = Template(
+	'<variable-table :variables="[\'--font-weight-regular\',\'--font-weight-bold\']" attr="font-weight" />',
+);
+
+export const FontFamily = Template(
+	'<variable-table :variables="[\'--font-family\']" attr="font-family" />',
+);
diff --git a/packages/design-system/src/styleguide/spacing.stories.mdx b/packages/design-system/src/styleguide/spacing.stories.mdx
deleted file mode 100644
index 3bff6432af261..0000000000000
--- a/packages/design-system/src/styleguide/spacing.stories.mdx
+++ /dev/null
@@ -1,25 +0,0 @@
-import { Meta, Story, Canvas } from '@storybook/addon-docs';
-import Sizes from './Sizes.vue';
-
-<Meta
-	title="Styleguide/Spacing"
-	parameters={{
-		design: {
-			type: 'figma',
-			url: 'https://www.figma.com/file/DxLbnIyMK8X0uLkUguFV4n/n8n-design-system_v1?node-id=79%3A6898',
-		},
-	}}
-/>
-
-# Spacing
-
-<Canvas>
-	<Story name="spacing">
-		{{
-			template: `<sizes :variables="['--spacing-5xs','--spacing-4xs','--spacing-3xs','--spacing-2xs','--spacing-xs','--spacing-s','--spacing-m','--spacing-l','--spacing-xl','--spacing-2xl','--spacing-3xl','--spacing-4xl','--spacing-5xl']" />`,
-			components: {
-				Sizes,
-			},
-		}}
-	</Story>
-</Canvas>
diff --git a/packages/design-system/src/styleguide/spacing.stories.ts b/packages/design-system/src/styleguide/spacing.stories.ts
new file mode 100644
index 0000000000000..cf4311a21f3ea
--- /dev/null
+++ b/packages/design-system/src/styleguide/spacing.stories.ts
@@ -0,0 +1,20 @@
+import { type StoryFn } from '@storybook/vue3';
+import Sizes from './Sizes.vue';
+
+export default {
+	title: 'Styleguide/Spacing',
+	parameters: {
+		design: {
+			type: 'figma',
+			url: 'https://www.figma.com/file/DxLbnIyMK8X0uLkUguFV4n/n8n-design-system_v1?node-id=79%3A6898',
+		},
+	},
+};
+
+export const Spacing: StoryFn = () => ({
+	components: {
+		Sizes,
+	},
+	template:
+		"<sizes :variables=\"['--spacing-5xs','--spacing-4xs','--spacing-3xs','--spacing-2xs','--spacing-xs','--spacing-s','--spacing-m','--spacing-l','--spacing-xl','--spacing-2xl','--spacing-3xl','--spacing-4xl','--spacing-5xl']\" />",
+});
diff --git a/packages/design-system/src/styleguide/utilities/float.stories.mdx b/packages/design-system/src/styleguide/utilities/float.stories.mdx
deleted file mode 100644
index 7f967c9af410e..0000000000000
--- a/packages/design-system/src/styleguide/utilities/float.stories.mdx
+++ /dev/null
@@ -1,27 +0,0 @@
-import { Meta, Story, Canvas } from '@storybook/addon-docs';
-
-<Meta title="Utilities/Float" />
-
-# `.float-left`
-
-<Canvas>
-	<Story name="float-left">
-		{{
-			template: `<div>
-	<span class="float-left">Float left</span>
-</div>`,
-		}}
-	</Story>
-</Canvas>
-
-# `.float-right`
-
-<Canvas>
-	<Story name="float-right">
-		{{
-			template: `<div>
-	<span class="float-right">Float right</span>
-</div>`,
-		}}
-	</Story>
-</Canvas>
diff --git a/packages/design-system/src/styleguide/utilities/float.stories.ts b/packages/design-system/src/styleguide/utilities/float.stories.ts
new file mode 100644
index 0000000000000..106a8cc835f7a
--- /dev/null
+++ b/packages/design-system/src/styleguide/utilities/float.stories.ts
@@ -0,0 +1,17 @@
+import { type StoryFn } from '@storybook/vue3';
+
+export default {
+	title: 'Utilities/Float',
+};
+
+const Template =
+	(template: string): StoryFn =>
+	() => ({ template });
+
+export const FloatLeft = Template(`<div>
+<span class="float-left">Float left</span>
+</div>`);
+
+export const FloatRight = Template(`<div>
+<span class="float-right">Float right</span>
+</div>`);
diff --git a/packages/design-system/src/styleguide/utilities/lists.stories.ts b/packages/design-system/src/styleguide/utilities/lists.stories.ts
index e3b562aef9333..c0198b344c0c8 100644
--- a/packages/design-system/src/styleguide/utilities/lists.stories.ts
+++ b/packages/design-system/src/styleguide/utilities/lists.stories.ts
@@ -1,10 +1,10 @@
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 
 export default {
 	title: 'Utilities/Lists',
 };
 
-const ListStyleNoneTemplate: StoryFn = (args, { argTypes }) => ({
+const ListStyleNoneTemplate: StoryFn = (_, { argTypes }) => ({
 	props: Object.keys(argTypes),
 	template: `<ul class="list-style-none">
 		<li>List item 1</li>
@@ -15,7 +15,7 @@ const ListStyleNoneTemplate: StoryFn = (args, { argTypes }) => ({
 
 export const StyleNone = ListStyleNoneTemplate.bind({});
 
-const ListInlineTemplate: StoryFn = (args, { argTypes }) => ({
+const ListInlineTemplate: StoryFn = (_, { argTypes }) => ({
 	props: Object.keys(argTypes),
 	template: `<ul class="list-inline">
 		<li>List item 1</li>
diff --git a/packages/design-system/src/styleguide/utilities/spacing.stories.ts b/packages/design-system/src/styleguide/utilities/spacing.stories.ts
index a2fb7addfd35b..065383a5d1d91 100644
--- a/packages/design-system/src/styleguide/utilities/spacing.stories.ts
+++ b/packages/design-system/src/styleguide/utilities/spacing.stories.ts
@@ -1,4 +1,4 @@
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 import SpacingPreview from '../components/SpacingPreview.vue';
 
 export default {
@@ -6,11 +6,12 @@ export default {
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		SpacingPreview,
 	},
-	template: '<spacing-preview v-bind="$props" />',
+	template: '<spacing-preview v-bind="args" />',
 });
 
 export const Padding = Template.bind({});
diff --git a/packages/design-system/src/types/action-dropdown.ts b/packages/design-system/src/types/action-dropdown.ts
new file mode 100644
index 0000000000000..8caf6560f8fc3
--- /dev/null
+++ b/packages/design-system/src/types/action-dropdown.ts
@@ -0,0 +1,11 @@
+import type { KeyboardShortcut } from '@/types/keyboardshortcut';
+
+export interface ActionDropdownItem {
+	id: string;
+	label: string;
+	icon?: string;
+	divided?: boolean;
+	disabled?: boolean;
+	shortcut?: KeyboardShortcut;
+	customClass?: string;
+}
diff --git a/packages/design-system/src/types/button.ts b/packages/design-system/src/types/button.ts
index 21f5fb532a37c..032009d5f2a53 100644
--- a/packages/design-system/src/types/button.ts
+++ b/packages/design-system/src/types/button.ts
@@ -1,17 +1,36 @@
+import type { TextFloat } from './text';
+
+const BUTTON_ELEMENT = ['button', 'a'] as const;
+export type ButtonElement = (typeof BUTTON_ELEMENT)[number];
+
+const BUTTON_TYPE = ['primary', 'secondary', 'tertiary', 'success', 'warning', 'danger'] as const;
+export type ButtonType = (typeof BUTTON_TYPE)[number];
+
+const BUTTON_SIZE = ['small', 'medium', 'large'] as const;
+export type ButtonSize = (typeof BUTTON_SIZE)[number];
+
+export interface IconButtonProps {
+	active?: boolean;
+	disabled?: boolean;
+	float?: TextFloat;
+	icon?: string | string[];
+	loading?: boolean;
+	outline?: boolean;
+	size?: ButtonSize;
+	text?: boolean;
+	type?: ButtonType;
+}
+
+export interface ButtonProps extends IconButtonProps {
+	block?: boolean;
+	element?: ButtonElement;
+	href?: string;
+	label?: string;
+	square?: boolean;
+}
+
 export type IN8nButton = {
-	attrs: {
-		label: string;
-		type?: 'primary' | 'secondary' | 'tertiary' | 'success' | 'warning' | 'danger';
-		size?: 'mini' | 'small' | 'medium' | 'large' | 'xlarge';
-		loading?: boolean;
-		disabled?: boolean;
-		outline?: boolean;
-		text?: boolean;
-		icon?: string;
-		block?: boolean;
-		active?: boolean;
-		float?: 'left' | 'right';
-		square?: boolean;
+	attrs: ButtonProps & {
 		// eslint-disable-next-line @typescript-eslint/naming-convention
 		'data-test-id'?: string;
 	};
diff --git a/packages/design-system/src/types/form.ts b/packages/design-system/src/types/form.ts
index 40012fecfa7fb..ab359bd6def81 100644
--- a/packages/design-system/src/types/form.ts
+++ b/packages/design-system/src/types/form.ts
@@ -44,7 +44,7 @@ export type IFormInput = {
 		validateOnBlur?: boolean;
 		infoText?: string;
 		placeholder?: string;
-		options?: Array<{ label: string; value: string }>;
+		options?: Array<{ label: string; value: string; disabled?: boolean }>;
 		autocomplete?:
 			| 'off'
 			| 'new-password'
@@ -57,6 +57,7 @@ export type IFormInput = {
 		disabled?: boolean;
 		labelSize?: 'small' | 'medium' | 'large';
 		labelAlignment?: 'left' | 'right' | 'center';
+		tooltipText?: string;
 	};
 	shouldDisplay?: (values: { [key: string]: unknown }) => boolean;
 };
diff --git a/packages/design-system/src/types/i18n.ts b/packages/design-system/src/types/i18n.ts
new file mode 100644
index 0000000000000..7e79f4037c04a
--- /dev/null
+++ b/packages/design-system/src/types/i18n.ts
@@ -0,0 +1,3 @@
+export type N8nLocaleTranslateFn = (path: string, options: object) => string;
+
+export type N8nLocale = Record<string, string | ((...args: unknown[]) => string)>;
diff --git a/packages/design-system/src/types/icon.ts b/packages/design-system/src/types/icon.ts
new file mode 100644
index 0000000000000..b16116e4c46d9
--- /dev/null
+++ b/packages/design-system/src/types/icon.ts
@@ -0,0 +1,8 @@
+const ICON_SIZE = ['xsmall', 'small', 'medium', 'large'] as const;
+export type IconSize = (typeof ICON_SIZE)[number];
+
+const ICON_COLOR = ['primary', 'danger', 'success', 'warning', 'text-base'] as const;
+export type IconColor = (typeof ICON_COLOR)[number];
+
+const ICON_ORIENTATION = ['horizontal', 'vertical'] as const;
+export type IconOrientation = (typeof ICON_ORIENTATION)[number];
diff --git a/packages/design-system/src/types/index.ts b/packages/design-system/src/types/index.ts
index 9fa2387dc47b7..1336f17b63149 100644
--- a/packages/design-system/src/types/index.ts
+++ b/packages/design-system/src/types/index.ts
@@ -1,6 +1,10 @@
+export * from './action-dropdown';
 export * from './button';
 export * from './datatable';
 export * from './form';
+export * from './i18n';
+export * from './input';
 export * from './menu';
-export * from './router';
+export * from './select';
 export * from './user';
+export * from './keyboardshortcut';
diff --git a/packages/design-system/src/types/input.ts b/packages/design-system/src/types/input.ts
new file mode 100644
index 0000000000000..5217b3217b110
--- /dev/null
+++ b/packages/design-system/src/types/input.ts
@@ -0,0 +1,5 @@
+const INPUT_TYPES = ['text', 'textarea', 'number', 'password', 'email'] as const;
+const INPUT_SIZES = ['mini', 'small', 'medium', 'large', 'xlarge'] as const;
+
+export type InputType = (typeof INPUT_TYPES)[number];
+export type InputSize = (typeof INPUT_SIZES)[number];
diff --git a/packages/design-system/src/types/keyboardshortcut.ts b/packages/design-system/src/types/keyboardshortcut.ts
new file mode 100644
index 0000000000000..c917c6c55c0f5
--- /dev/null
+++ b/packages/design-system/src/types/keyboardshortcut.ts
@@ -0,0 +1,6 @@
+export interface KeyboardShortcut {
+	metaKey?: boolean;
+	altKey?: boolean;
+	shiftKey?: boolean;
+	keys: string[];
+}
diff --git a/packages/design-system/src/types/menu.ts b/packages/design-system/src/types/menu.ts
index 17a7c400b63c1..93d2928947a58 100644
--- a/packages/design-system/src/types/menu.ts
+++ b/packages/design-system/src/types/menu.ts
@@ -1,21 +1,40 @@
+import type { ElTooltipProps } from 'element-plus';
+import type { AnchorHTMLAttributes } from 'vue';
+import type { RouteLocationRaw, RouterLinkProps } from 'vue-router';
+
 export type IMenuItem = {
 	id: string;
 	label: string;
 	icon?: string;
+	secondaryIcon?: {
+		name: string;
+		size?: 'xsmall' | 'small' | 'medium' | 'large';
+		tooltip?: Partial<ElTooltipProps>;
+	};
 	customIconSize?: 'medium' | 'small';
 	available?: boolean;
 	position?: 'top' | 'bottom';
-	type?: 'default' | 'link';
-	properties?: ILinkMenuItemProperties;
-	// For router menus populate only one of those arrays:
-	// If menu item can be activated on certain route names (easy mode)
+
+	/** Use this for external links */
+	link?: ILinkMenuItemProperties;
+	/** Use this for defining a vue-router target */
+	route?: RouterLinkProps;
+	/**
+	 * If given, item will be activated on these route names. Note that if
+	 * route is provided, it will be highlighted automatically
+	 */
 	activateOnRouteNames?: string[];
-	// For more specific matching, we can use paths
 	activateOnRoutePaths?: string[];
+
 	children?: IMenuItem[];
 };
 
+export type IRouteMenuItemProperties = {
+	route: RouteLocationRaw;
+};
+
 export type ILinkMenuItemProperties = {
 	href: string;
-	newWindow?: boolean;
+	target?: AnchorHTMLAttributes['target'];
+	rel?: AnchorHTMLAttributes['rel'];
 };
diff --git a/packages/design-system/src/types/router.ts b/packages/design-system/src/types/router.ts
deleted file mode 100644
index 336dbaf6ebdc0..0000000000000
--- a/packages/design-system/src/types/router.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export interface RouteObject {
-	name: string;
-	path: string;
-}
diff --git a/packages/design-system/src/types/select.ts b/packages/design-system/src/types/select.ts
new file mode 100644
index 0000000000000..25e27fc6cfbab
--- /dev/null
+++ b/packages/design-system/src/types/select.ts
@@ -0,0 +1,2 @@
+const SELECT_SIZES = ['mini', 'small', 'medium', 'large', 'xlarge'] as const;
+export type SelectSize = (typeof SELECT_SIZES)[number];
diff --git a/packages/design-system/src/types/text.ts b/packages/design-system/src/types/text.ts
new file mode 100644
index 0000000000000..054cc6bb3a40c
--- /dev/null
+++ b/packages/design-system/src/types/text.ts
@@ -0,0 +1,20 @@
+const TEXT_SIZE = ['xsmall', 'small', 'mini', 'medium', 'large', 'xlarge'] as const;
+export type TextSize = (typeof TEXT_SIZE)[number];
+
+const TEXT_COLOR = [
+	'primary',
+	'text-dark',
+	'text-base',
+	'text-light',
+	'text-xlight',
+	'danger',
+	'success',
+	'warning',
+] as const;
+export type TextColor = (typeof TEXT_COLOR)[number];
+
+const TEXT_ALIGN = ['right', 'left', 'center'] as const;
+export type TextAlign = (typeof TEXT_ALIGN)[number];
+
+const TEXT_FLOAT = ['left', 'right'] as const;
+export type TextFloat = (typeof TEXT_FLOAT)[number];
diff --git a/packages/design-system/src/types/user.ts b/packages/design-system/src/types/user.ts
index d67cdc21515fb..b5b7f512cfadb 100644
--- a/packages/design-system/src/types/user.ts
+++ b/packages/design-system/src/types/user.ts
@@ -18,3 +18,5 @@ export interface UserAction {
 	type?: 'external-link';
 	guard?: (user: IUser) => boolean;
 }
+
+export type UserStackGroups = { [groupName: string]: IUser[] };
diff --git a/packages/design-system/src/utils/valueByPath.ts b/packages/design-system/src/utils/valueByPath.ts
index a596df7098c51..437cc81342c20 100644
--- a/packages/design-system/src/utils/valueByPath.ts
+++ b/packages/design-system/src/utils/valueByPath.ts
@@ -1,4 +1,4 @@
-/* eslint-disable @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/no-explicit-any */
 
 /**
  * Get a deeply nested value based on a given path string
@@ -9,6 +9,6 @@
  */
 export function getValueByPath<T = any>(object: any, path: string): T {
 	return path.split('.').reduce((acc, part) => {
-		return acc && acc[part];
+		return acc?.[part];
 	}, object);
 }
diff --git a/packages/design-system/theme/preview/docs.min.css b/packages/design-system/theme/preview/docs.min.css
index 4754922bf46e8..7d08663d73f3d 100644
--- a/packages/design-system/theme/preview/docs.min.css
+++ b/packages/design-system/theme/preview/docs.min.css
@@ -20,7 +20,9 @@
 	transition: 0.2s;
 }
 .demo-block.hover {
-	box-shadow: 0 0 8px 0 rgba(232, 237, 250, 0.6), 0 2px 4px 0 rgba(232, 237, 250, 0.5);
+	box-shadow:
+		0 0 8px 0 rgba(232, 237, 250, 0.6),
+		0 2px 4px 0 rgba(232, 237, 250, 0.5);
 }
 .demo-block code {
 	font-family: Menlo, Monaco, Consolas, Courier, monospace;
@@ -305,7 +307,9 @@
 	right: 0;
 	height: 2px;
 	width: 0;
-	transition: width 0.2s, opacity 0.4s;
+	transition:
+		width 0.2s,
+		opacity 0.4s;
 	opacity: 1;
 	z-index: 999999;
 }
@@ -943,7 +947,9 @@
 	background: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' version='1.1' preserveAspectRatio='none' viewBox='0 0 100 100'><path d='M0 98 L100 0 L100 1 L1 98' fill='%23FCC3C3' /></svg>");
 	background-repeat: no-repeat;
 	background-position: 50%;
-	background-size: 100% 100%, auto;
+	background-size:
+		100% 100%,
+		auto;
 }
 .demo-color-box-lite {
 	color: #303133;
@@ -1189,7 +1195,13 @@ ul.language-list li {
 }
 .icon-list li span {
 	line-height: normal;
-	font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, SimSun,
+	font-family:
+		Helvetica Neue,
+		Helvetica,
+		PingFang SC,
+		Hiragino Sans GB,
+		Microsoft YaHei,
+		SimSun,
 		sans-serif;
 	color: #99a9bf;
 	transition: color 0.15s linear;
@@ -1811,7 +1823,13 @@ html {
 	margin: 0;
 	padding: 0;
 	height: 100%;
-	font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, SimSun,
+	font-family:
+		Helvetica Neue,
+		Helvetica,
+		PingFang SC,
+		Hiragino Sans GB,
+		Microsoft YaHei,
+		SimSun,
 		sans-serif;
 	font-weight: 400;
 	-webkit-font-smoothing: antialiased;
@@ -1972,7 +1990,8 @@ textarea {
 @font-face {
 	font-family: icomoon;
 	src: url(data:application/vnd.ms-fontobject;base64,SAgAAKQHAAABAAIAAAAAAAAAAAAAAAAAAAABAJABAAAAAExQAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAa7522AAAAAAAAAAAAAAAAAAAAAAAAA4AaQBjAG8AbQBvAG8AbgAAAA4AUgBlAGcAdQBsAGEAcgAAABYAVgBlAHIAcwBpAG8AbgAgADEALgAwAAAADgBpAGMAbwBtAG8AbwBuAAAAAAAAAQAAAAsAgAADADBPUy8yDxIFxwAAALwAAABgY21hcBdW0ooAAAEcAAAAVGdhc3AAAAAQAAABcAAAAAhnbHlmx3GYOgAAAXgAAAPUaGVhZArUIjUAAAVMAAAANmhoZWEHwgPJAAAFhAAAACRobXR4FgAAAAAABagAAAAgbG9jYQMUAf4AAAXIAAAAEm1heHAADgBvAAAF3AAAACBuYW1lmUoJ+wAABfwAAAGGcG9zdAADAAAAAAeEAAAAIAADA5oBkAAFAAACmQLMAAAAjwKZAswAAAHrADMBCQAAAAAAAAAAAAAAAAAAAAEQAAAAAAAAAAAAAAAAAAAAAEAAAOkDA8D/wABAA8AAQAAAAAEAAAAAAAAAAAAAACAAAAAAAAMAAAADAAAAHAABAAMAAAAcAAMAAQAAABwABAA4AAAACgAIAAIAAgABACDpA//9//8AAAAAACDpAP/9//8AAf/jFwQAAwABAAAAAAAAAAAAAAABAAH//wAPAAEAAAAAAAAAAAACAAA3OQEAAAAAAQAAAAAAAAAAAAIAADc5AQAAAAABAAAAAAAAAAAAAgAANzkBAAAAAAUAAP/ABAADwAATACcANQBDAFEAABM0PgIzMh4CFRQOAiMiLgIlNC4CIyIOAhUUHgIzMj4CJTQ2MzIWHQEUBiMiJjUlNDYzMhYdARQGIyImNQEiBhUUFjMhMjY1NCYjAFCLu2pqu4tQUIu7amq7i1ADs0R2n1pan3ZERHafWlqfdkT9cx4WFR4eFRYeAU0eFRYeHhYVHv72ERgYEQEuERgYEQHAaruLUFCLu2pqu4tQUIu7alqfdkREdp9aWp92RER2n+cVHh4VMxYeHhYzFR4eFTMWHh4W/wAZEREZGRERGQAAAAQAAP/ABAADwAATACEALwBPAAABIg4CFRQeAjMyPgI1NC4CATQ2MzIWHQEUBiMiJjUlNDYzMhYdARQGIyImNRMnLgEjIgYPAQ4BIyImNTQ2Nyc3PgEzMhYXHgEVFAYnAgBqu4tQUIu7amq7i1BQi7v+vB4WFR4eFRYeAU0eFRYeHhYVHkQEKlovMFsqBAEFAhAVBgYBCjJrNTZpMwkKHBMDwFCLu2pqu4tQUIu7amq7i1D+jRUeHhUzFh4eFjMVHh4VMxYeHhb+mwEVFRUVAQEBGBEIDwYDBRgaGRoFEwwTGgYAAAQAAP/ABAADwAATACEALwA9AAAFIi4CNTQ+AjMyHgIVFA4CARUUFjMyNj0BNCYjIgYFFRQWMzI2PQE0JiMiBgEiBhUUFjMhMjY1NCYjAgBqu4tQUIu7amq7i1BQi7v+vB4WFR4eFRYeAU0eFRYeHhYVHv72ERgYEQEuERgYEUBQi7tqaruLUFCLu2pqu4tQAo0zFh4eFjMVHh4VMxYeHhYzFR4e/rgZEREZGRERGQAABAAA/8AEAAPAABMAUABeAGwAAAEiDgIVFB4CMzI+AjU0LgITFAYVDgEVDgMjOAExOAExIi4CJzQmJzQmNS4BNTQ2Nz4BMzIWFzEeATMyNjcxPgEzMhYXHgEVFAYHAzQ2MzIWHQEUBiMiJjUlNDYzMhYdARQGIyImNQIAaruLUFCLu2pqu4tQUIu7xwEBARU/TVsyMltNPxUBAQEBAQICBRUMDBUFIHhLS3ggBRUMDBUFAgIBAb4eFRYeHhYVHv6zHhYVHh4VFh4DwFCLu2pqu4tQUIu7amq7i1D9cgICAQECASlCMBsbMEIpAQIBAQICAgYDBQkECwwMCz1MTD0LDAwLBAkFAwYCARsVHh4VMxYeHhYzFR4eFTMWHh4WAAAAAQAAAAAAANh2vmtfDzz1AAsEAAAAAADT2u7cAAAAANPa7twAAP/ABAADwAAAAAgAAgAAAAAAAAABAAADwP/AAAAEAAAAAAAEAAABAAAAAAAAAAAAAAAAAAAACAQAAAAAAAAAAAAAAAIAAAAEAAAABAAAAAQAAAAEAAAAAAAAAAAKABQAHgCQAQIBWgHqAAAAAQAAAAgAbQAFAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAA4ArgABAAAAAAABAAcAAAABAAAAAAACAAcAYAABAAAAAAADAAcANgABAAAAAAAEAAcAdQABAAAAAAAFAAsAFQABAAAAAAAGAAcASwABAAAAAAAKABoAigADAAEECQABAA4ABwADAAEECQACAA4AZwADAAEECQADAA4APQADAAEECQAEAA4AfAADAAEECQAFABYAIAADAAEECQAGAA4AUgADAAEECQAKADQApGljb21vb24AaQBjAG8AbQBvAG8AblZlcnNpb24gMS4wAFYAZQByAHMAaQBvAG4AIAAxAC4AMGljb21vb24AaQBjAG8AbQBvAG8Abmljb21vb24AaQBjAG8AbQBvAG8AblJlZ3VsYXIAUgBlAGcAdQBsAGEAcmljb21vb24AaQBjAG8AbQBvAG8AbkZvbnQgZ2VuZXJhdGVkIGJ5IEljb01vb24uAEYAbwBuAHQAIABnAGUAbgBlAHIAYQB0AGUAZAAgAGIAeQAgAEkAYwBvAE0AbwBvAG4ALgAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=);
-	src: url(data:application/vnd.ms-fontobject;base64,SAgAAKQHAAABAAIAAAAAAAAAAAAAAAAAAAABAJABAAAAAExQAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAa7522AAAAAAAAAAAAAAAAAAAAAAAAA4AaQBjAG8AbQBvAG8AbgAAAA4AUgBlAGcAdQBsAGEAcgAAABYAVgBlAHIAcwBpAG8AbgAgADEALgAwAAAADgBpAGMAbwBtAG8AbwBuAAAAAAAAAQAAAAsAgAADADBPUy8yDxIFxwAAALwAAABgY21hcBdW0ooAAAEcAAAAVGdhc3AAAAAQAAABcAAAAAhnbHlmx3GYOgAAAXgAAAPUaGVhZArUIjUAAAVMAAAANmhoZWEHwgPJAAAFhAAAACRobXR4FgAAAAAABagAAAAgbG9jYQMUAf4AAAXIAAAAEm1heHAADgBvAAAF3AAAACBuYW1lmUoJ+wAABfwAAAGGcG9zdAADAAAAAAeEAAAAIAADA5oBkAAFAAACmQLMAAAAjwKZAswAAAHrADMBCQAAAAAAAAAAAAAAAAAAAAEQAAAAAAAAAAAAAAAAAAAAAEAAAOkDA8D/wABAA8AAQAAAAAEAAAAAAAAAAAAAACAAAAAAAAMAAAADAAAAHAABAAMAAAAcAAMAAQAAABwABAA4AAAACgAIAAIAAgABACDpA//9//8AAAAAACDpAP/9//8AAf/jFwQAAwABAAAAAAAAAAAAAAABAAH//wAPAAEAAAAAAAAAAAACAAA3OQEAAAAAAQAAAAAAAAAAAAIAADc5AQAAAAABAAAAAAAAAAAAAgAANzkBAAAAAAUAAP/ABAADwAATACcANQBDAFEAABM0PgIzMh4CFRQOAiMiLgIlNC4CIyIOAhUUHgIzMj4CJTQ2MzIWHQEUBiMiJjUlNDYzMhYdARQGIyImNQEiBhUUFjMhMjY1NCYjAFCLu2pqu4tQUIu7amq7i1ADs0R2n1pan3ZERHafWlqfdkT9cx4WFR4eFRYeAU0eFRYeHhYVHv72ERgYEQEuERgYEQHAaruLUFCLu2pqu4tQUIu7alqfdkREdp9aWp92RER2n+cVHh4VMxYeHhYzFR4eFTMWHh4W/wAZEREZGRERGQAAAAQAAP/ABAADwAATACEALwBPAAABIg4CFRQeAjMyPgI1NC4CATQ2MzIWHQEUBiMiJjUlNDYzMhYdARQGIyImNRMnLgEjIgYPAQ4BIyImNTQ2Nyc3PgEzMhYXHgEVFAYnAgBqu4tQUIu7amq7i1BQi7v+vB4WFR4eFRYeAU0eFRYeHhYVHkQEKlovMFsqBAEFAhAVBgYBCjJrNTZpMwkKHBMDwFCLu2pqu4tQUIu7amq7i1D+jRUeHhUzFh4eFjMVHh4VMxYeHhb+mwEVFRUVAQEBGBEIDwYDBRgaGRoFEwwTGgYAAAQAAP/ABAADwAATACEALwA9AAAFIi4CNTQ+AjMyHgIVFA4CARUUFjMyNj0BNCYjIgYFFRQWMzI2PQE0JiMiBgEiBhUUFjMhMjY1NCYjAgBqu4tQUIu7amq7i1BQi7v+vB4WFR4eFRYeAU0eFRYeHhYVHv72ERgYEQEuERgYEUBQi7tqaruLUFCLu2pqu4tQAo0zFh4eFjMVHh4VMxYeHhYzFR4e/rgZEREZGRERGQAABAAA/8AEAAPAABMAUABeAGwAAAEiDgIVFB4CMzI+AjU0LgITFAYVDgEVDgMjOAExOAExIi4CJzQmJzQmNS4BNTQ2Nz4BMzIWFzEeATMyNjcxPgEzMhYXHgEVFAYHAzQ2MzIWHQEUBiMiJjUlNDYzMhYdARQGIyImNQIAaruLUFCLu2pqu4tQUIu7xwEBARU/TVsyMltNPxUBAQEBAQICBRUMDBUFIHhLS3ggBRUMDBUFAgIBAb4eFRYeHhYVHv6zHhYVHh4VFh4DwFCLu2pqu4tQUIu7amq7i1D9cgICAQECASlCMBsbMEIpAQIBAQICAgYDBQkECwwMCz1MTD0LDAwLBAkFAwYCARsVHh4VMxYeHhYzFR4eFTMWHh4WAAAAAQAAAAAAANh2vmtfDzz1AAsEAAAAAADT2u7cAAAAANPa7twAAP/ABAADwAAAAAgAAgAAAAAAAAABAAADwP/AAAAEAAAAAAAEAAABAAAAAAAAAAAAAAAAAAAACAQAAAAAAAAAAAAAAAIAAAAEAAAABAAAAAQAAAAEAAAAAAAAAAAKABQAHgCQAQIBWgHqAAAAAQAAAAgAbQAFAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAA4ArgABAAAAAAABAAcAAAABAAAAAAACAAcAYAABAAAAAAADAAcANgABAAAAAAAEAAcAdQABAAAAAAAFAAsAFQABAAAAAAAGAAcASwABAAAAAAAKABoAigADAAEECQABAA4ABwADAAEECQACAA4AZwADAAEECQADAA4APQADAAEECQAEAA4AfAADAAEECQAFABYAIAADAAEECQAGAA4AUgADAAEECQAKADQApGljb21vb24AaQBjAG8AbQBvAG8AblZlcnNpb24gMS4wAFYAZQByAHMAaQBvAG4AIAAxAC4AMGljb21vb24AaQBjAG8AbQBvAG8Abmljb21vb24AaQBjAG8AbQBvAG8AblJlZ3VsYXIAUgBlAGcAdQBsAGEAcmljb21vb24AaQBjAG8AbQBvAG8AbkZvbnQgZ2VuZXJhdGVkIGJ5IEljb01vb24uAEYAbwBuAHQAIABnAGUAbgBlAHIAYQB0AGUAZAAgAGIAeQAgAEkAYwBvAE0AbwBvAG4ALgAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=#iefix)
+	src:
+		url(data:application/vnd.ms-fontobject;base64,SAgAAKQHAAABAAIAAAAAAAAAAAAAAAAAAAABAJABAAAAAExQAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAa7522AAAAAAAAAAAAAAAAAAAAAAAAA4AaQBjAG8AbQBvAG8AbgAAAA4AUgBlAGcAdQBsAGEAcgAAABYAVgBlAHIAcwBpAG8AbgAgADEALgAwAAAADgBpAGMAbwBtAG8AbwBuAAAAAAAAAQAAAAsAgAADADBPUy8yDxIFxwAAALwAAABgY21hcBdW0ooAAAEcAAAAVGdhc3AAAAAQAAABcAAAAAhnbHlmx3GYOgAAAXgAAAPUaGVhZArUIjUAAAVMAAAANmhoZWEHwgPJAAAFhAAAACRobXR4FgAAAAAABagAAAAgbG9jYQMUAf4AAAXIAAAAEm1heHAADgBvAAAF3AAAACBuYW1lmUoJ+wAABfwAAAGGcG9zdAADAAAAAAeEAAAAIAADA5oBkAAFAAACmQLMAAAAjwKZAswAAAHrADMBCQAAAAAAAAAAAAAAAAAAAAEQAAAAAAAAAAAAAAAAAAAAAEAAAOkDA8D/wABAA8AAQAAAAAEAAAAAAAAAAAAAACAAAAAAAAMAAAADAAAAHAABAAMAAAAcAAMAAQAAABwABAA4AAAACgAIAAIAAgABACDpA//9//8AAAAAACDpAP/9//8AAf/jFwQAAwABAAAAAAAAAAAAAAABAAH//wAPAAEAAAAAAAAAAAACAAA3OQEAAAAAAQAAAAAAAAAAAAIAADc5AQAAAAABAAAAAAAAAAAAAgAANzkBAAAAAAUAAP/ABAADwAATACcANQBDAFEAABM0PgIzMh4CFRQOAiMiLgIlNC4CIyIOAhUUHgIzMj4CJTQ2MzIWHQEUBiMiJjUlNDYzMhYdARQGIyImNQEiBhUUFjMhMjY1NCYjAFCLu2pqu4tQUIu7amq7i1ADs0R2n1pan3ZERHafWlqfdkT9cx4WFR4eFRYeAU0eFRYeHhYVHv72ERgYEQEuERgYEQHAaruLUFCLu2pqu4tQUIu7alqfdkREdp9aWp92RER2n+cVHh4VMxYeHhYzFR4eFTMWHh4W/wAZEREZGRERGQAAAAQAAP/ABAADwAATACEALwBPAAABIg4CFRQeAjMyPgI1NC4CATQ2MzIWHQEUBiMiJjUlNDYzMhYdARQGIyImNRMnLgEjIgYPAQ4BIyImNTQ2Nyc3PgEzMhYXHgEVFAYnAgBqu4tQUIu7amq7i1BQi7v+vB4WFR4eFRYeAU0eFRYeHhYVHkQEKlovMFsqBAEFAhAVBgYBCjJrNTZpMwkKHBMDwFCLu2pqu4tQUIu7amq7i1D+jRUeHhUzFh4eFjMVHh4VMxYeHhb+mwEVFRUVAQEBGBEIDwYDBRgaGRoFEwwTGgYAAAQAAP/ABAADwAATACEALwA9AAAFIi4CNTQ+AjMyHgIVFA4CARUUFjMyNj0BNCYjIgYFFRQWMzI2PQE0JiMiBgEiBhUUFjMhMjY1NCYjAgBqu4tQUIu7amq7i1BQi7v+vB4WFR4eFRYeAU0eFRYeHhYVHv72ERgYEQEuERgYEUBQi7tqaruLUFCLu2pqu4tQAo0zFh4eFjMVHh4VMxYeHhYzFR4e/rgZEREZGRERGQAABAAA/8AEAAPAABMAUABeAGwAAAEiDgIVFB4CMzI+AjU0LgITFAYVDgEVDgMjOAExOAExIi4CJzQmJzQmNS4BNTQ2Nz4BMzIWFzEeATMyNjcxPgEzMhYXHgEVFAYHAzQ2MzIWHQEUBiMiJjUlNDYzMhYdARQGIyImNQIAaruLUFCLu2pqu4tQUIu7xwEBARU/TVsyMltNPxUBAQEBAQICBRUMDBUFIHhLS3ggBRUMDBUFAgIBAb4eFRYeHhYVHv6zHhYVHh4VFh4DwFCLu2pqu4tQUIu7amq7i1D9cgICAQECASlCMBsbMEIpAQIBAQICAgYDBQkECwwMCz1MTD0LDAwLBAkFAwYCARsVHh4VMxYeHhYzFR4eFTMWHh4WAAAAAQAAAAAAANh2vmtfDzz1AAsEAAAAAADT2u7cAAAAANPa7twAAP/ABAADwAAAAAgAAgAAAAAAAAABAAADwP/AAAAEAAAAAAAEAAABAAAAAAAAAAAAAAAAAAAACAQAAAAAAAAAAAAAAAIAAAAEAAAABAAAAAQAAAAEAAAAAAAAAAAKABQAHgCQAQIBWgHqAAAAAQAAAAgAbQAFAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAA4ArgABAAAAAAABAAcAAAABAAAAAAACAAcAYAABAAAAAAADAAcANgABAAAAAAAEAAcAdQABAAAAAAAFAAsAFQABAAAAAAAGAAcASwABAAAAAAAKABoAigADAAEECQABAA4ABwADAAEECQACAA4AZwADAAEECQADAA4APQADAAEECQAEAA4AfAADAAEECQAFABYAIAADAAEECQAGAA4AUgADAAEECQAKADQApGljb21vb24AaQBjAG8AbQBvAG8AblZlcnNpb24gMS4wAFYAZQByAHMAaQBvAG4AIAAxAC4AMGljb21vb24AaQBjAG8AbQBvAG8Abmljb21vb24AaQBjAG8AbQBvAG8AblJlZ3VsYXIAUgBlAGcAdQBsAGEAcmljb21vb24AaQBjAG8AbQBvAG8AbkZvbnQgZ2VuZXJhdGVkIGJ5IEljb01vb24uAEYAbwBuAHQAIABnAGUAbgBlAHIAYQB0AGUAZAAgAGIAeQAgAEkAYwBvAE0AbwBvAG4ALgAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=#iefix)
 			format('embedded-opentype'),
 		url(data:font/ttf;base64,AAEAAAALAIAAAwAwT1MvMg8SBccAAAC8AAAAYGNtYXAXVtKKAAABHAAAAFRnYXNwAAAAEAAAAXAAAAAIZ2x5ZsdxmDoAAAF4AAAD1GhlYWQK1CI1AAAFTAAAADZoaGVhB8IDyQAABYQAAAAkaG10eBYAAAAAAAWoAAAAIGxvY2EDFAH+AAAFyAAAABJtYXhwAA4AbwAABdwAAAAgbmFtZZlKCfsAAAX8AAABhnBvc3QAAwAAAAAHhAAAACAAAwOaAZAABQAAApkCzAAAAI8CmQLMAAAB6wAzAQkAAAAAAAAAAAAAAAAAAAABEAAAAAAAAAAAAAAAAAAAAABAAADpAwPA/8AAQAPAAEAAAAABAAAAAAAAAAAAAAAgAAAAAAADAAAAAwAAABwAAQADAAAAHAADAAEAAAAcAAQAOAAAAAoACAACAAIAAQAg6QP//f//AAAAAAAg6QD//f//AAH/4xcEAAMAAQAAAAAAAAAAAAAAAQAB//8ADwABAAAAAAAAAAAAAgAANzkBAAAAAAEAAAAAAAAAAAACAAA3OQEAAAAAAQAAAAAAAAAAAAIAADc5AQAAAAAFAAD/wAQAA8AAEwAnADUAQwBRAAATND4CMzIeAhUUDgIjIi4CJTQuAiMiDgIVFB4CMzI+AiU0NjMyFh0BFAYjIiY1JTQ2MzIWHQEUBiMiJjUBIgYVFBYzITI2NTQmIwBQi7tqaruLUFCLu2pqu4tQA7NEdp9aWp92RER2n1pan3ZE/XMeFhUeHhUWHgFNHhUWHh4WFR7+9hEYGBEBLhEYGBEBwGq7i1BQi7tqaruLUFCLu2pan3ZERHafWlqfdkREdp/nFR4eFTMWHh4WMxUeHhUzFh4eFv8AGRERGRkRERkAAAAEAAD/wAQAA8AAEwAhAC8ATwAAASIOAhUUHgIzMj4CNTQuAgE0NjMyFh0BFAYjIiY1JTQ2MzIWHQEUBiMiJjUTJy4BIyIGDwEOASMiJjU0NjcnNz4BMzIWFx4BFRQGJwIAaruLUFCLu2pqu4tQUIu7/rweFhUeHhUWHgFNHhUWHh4WFR5EBCpaLzBbKgQBBQIQFQYGAQoyazU2aTMJChwTA8BQi7tqaruLUFCLu2pqu4tQ/o0VHh4VMxYeHhYzFR4eFTMWHh4W/psBFRUVFQEBARgRCA8GAwUYGhkaBRMMExoGAAAEAAD/wAQAA8AAEwAhAC8APQAABSIuAjU0PgIzMh4CFRQOAgEVFBYzMjY9ATQmIyIGBRUUFjMyNj0BNCYjIgYBIgYVFBYzITI2NTQmIwIAaruLUFCLu2pqu4tQUIu7/rweFhUeHhUWHgFNHhUWHh4WFR7+9hEYGBEBLhEYGBFAUIu7amq7i1BQi7tqaruLUAKNMxYeHhYzFR4eFTMWHh4WMxUeHv64GRERGRkRERkAAAQAAP/ABAADwAATAFAAXgBsAAABIg4CFRQeAjMyPgI1NC4CExQGFQ4BFQ4DIzgBMTgBMSIuAic0Jic0JjUuATU0Njc+ATMyFhcxHgEzMjY3MT4BMzIWFx4BFRQGBwM0NjMyFh0BFAYjIiY1JTQ2MzIWHQEUBiMiJjUCAGq7i1BQi7tqaruLUFCLu8cBAQEVP01bMjJbTT8VAQEBAQECAgUVDAwVBSB4S0t4IAUVDAwVBQICAQG+HhUWHh4WFR7+sx4WFR4eFRYeA8BQi7tqaruLUFCLu2pqu4tQ/XICAgEBAgEpQjAbGzBCKQECAQECAgIGAwUJBAsMDAs9TEw9CwwMCwQJBQMGAgEbFR4eFTMWHh4WMxUeHhUzFh4eFgAAAAEAAAAAAADYdr5rXw889QALBAAAAAAA09ru3AAAAADT2u7cAAD/wAQAA8AAAAAIAAIAAAAAAAAAAQAAA8D/wAAABAAAAAAABAAAAQAAAAAAAAAAAAAAAAAAAAgEAAAAAAAAAAAAAAACAAAABAAAAAQAAAAEAAAABAAAAAAAAAAACgAUAB4AkAECAVoB6gAAAAEAAAAIAG0ABQAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAOAK4AAQAAAAAAAQAHAAAAAQAAAAAAAgAHAGAAAQAAAAAAAwAHADYAAQAAAAAABAAHAHUAAQAAAAAABQALABUAAQAAAAAABgAHAEsAAQAAAAAACgAaAIoAAwABBAkAAQAOAAcAAwABBAkAAgAOAGcAAwABBAkAAwAOAD0AAwABBAkABAAOAHwAAwABBAkABQAWACAAAwABBAkABgAOAFIAAwABBAkACgA0AKRpY29tb29uAGkAYwBvAG0AbwBvAG5WZXJzaW9uIDEuMABWAGUAcgBzAGkAbwBuACAAMQAuADBpY29tb29uAGkAYwBvAG0AbwBvAG5pY29tb29uAGkAYwBvAG0AbwBvAG5SZWd1bGFyAFIAZQBnAHUAbABhAHJpY29tb29uAGkAYwBvAG0AbwBvAG5Gb250IGdlbmVyYXRlZCBieSBJY29Nb29uLgBGAG8AbgB0ACAAZwBlAG4AZQByAGEAdABlAGQAIABiAHkAIABJAGMAbwBNAG8AbwBuAC4AAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA)
 			format('truetype'),
diff --git a/packages/design-system/theme/preview/index.html b/packages/design-system/theme/preview/index.html
index 2de021bca5804..39d0462ee7548 100644
--- a/packages/design-system/theme/preview/index.html
+++ b/packages/design-system/theme/preview/index.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html>
 	<head>
 		<meta charset="UTF-8" />
@@ -886,9 +886,9 @@ <h4>Tree</h4>
 	</body>
 	<!-- import Vue before Element -->
 	<!-- <script src="https://unpkg.com/vue/dist/vue.js"></script> -->
-	<script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.js"></script>
+	<script src="https://unpkg.com/vue@3/dist/vue.global.js"></script>
 	<!-- import JavaScript -->
-	<script src="https://unpkg.com/element-ui/lib/index.js"></script>
+	<script src="https://unpkg.com/element-plus/lib/index.js"></script>
 	<script>
 		const original = {
 			color_primary: '#409EFF',
@@ -919,8 +919,7 @@ <h4>Tree</h4>
 		};
 
 		Vue.config.devtools = true;
-		new Vue({
-			el: '#app',
+		Vue.createApp({
 			data() {
 				return {
 					global: {},
@@ -1330,6 +1329,6 @@ <h4>Tree</h4>
 					this.visible = true;
 				},
 			},
-		});
+		}).mount('#app');
 	</script>
 </html>
diff --git a/packages/design-system/tsconfig.json b/packages/design-system/tsconfig.json
index 9d40abae50b69..8758dcf817cf5 100644
--- a/packages/design-system/tsconfig.json
+++ b/packages/design-system/tsconfig.json
@@ -6,19 +6,19 @@
 		"target": "esnext",
 		"module": "esnext",
 		"importHelpers": true,
-		"skipLibCheck": true,
 		"allowJs": true,
 		"incremental": false,
 		"allowSyntheticDefaultImports": true,
 		"baseUrl": ".",
-		"types": ["webpack-env", "vitest/globals"],
-		"typeRoots": ["@testing-library", "@types"],
+		"types": ["vitest/globals"],
+		"typeRoots": ["@testing-library", "@types", "../../node_modules"],
 		"paths": {
 			"@/*": ["src/*"]
 		},
 		"lib": ["esnext", "dom", "dom.iterable", "scripthost"],
 		// TODO: remove all options below this line
-		"noUnusedLocals": false,
+		"strict": false,
+		"noImplicitAny": false,
 		"noImplicitReturns": false
 	},
 	"include": ["src/**/*.ts", "src/**/*.vue"]
diff --git a/packages/design-system/vite.config.mts b/packages/design-system/vite.config.mts
new file mode 100644
index 0000000000000..3b5e32a15c711
--- /dev/null
+++ b/packages/design-system/vite.config.mts
@@ -0,0 +1,69 @@
+import vue from '@vitejs/plugin-vue';
+import { resolve } from 'path';
+import { defineConfig, mergeConfig } from 'vite';
+import checker from 'vite-plugin-checker';
+import { type UserConfig } from 'vitest';
+import { defineConfig as defineVitestConfig } from 'vitest/config';
+
+export const vitestConfig = defineVitestConfig({
+	test: {
+		silent: true,
+		globals: true,
+		environment: 'jsdom',
+		setupFiles: ['./src/__tests__/setup.ts'],
+		...(process.env.COVERAGE_ENABLED === 'true'
+			? {
+					coverage: {
+						enabled: true,
+						provider: 'v8',
+						reporter: process.env.CI === 'true' ? 'cobertura' : 'text-summary',
+						all: true,
+					},
+			  }
+			: {}),
+		css: {
+			modules: {
+				classNameStrategy: 'non-scoped',
+			},
+		},
+	},
+}) as UserConfig;
+
+const plugins = [vue()];
+if (process.env.ENABLE_TYPE_CHECKING === 'true') {
+	plugins.push(checker({ vueTsc: true }));
+}
+
+export default mergeConfig(
+	defineConfig({
+		plugins,
+		resolve: {
+			alias: {
+				'@': resolve(__dirname, 'src'),
+				'n8n-design-system': resolve(__dirname, 'src'),
+				lodash: 'lodash-es',
+			},
+		},
+		build: {
+			lib: {
+				entry: resolve(__dirname, 'src', 'main.ts'),
+				name: 'N8nDesignSystem',
+				fileName: (format) => `n8n-design-system.${format}.js`,
+			},
+			rollupOptions: {
+				// make sure to externalize deps that shouldn't be bundled
+				// into your library
+				external: ['vue'],
+				output: {
+					exports: 'named',
+					// Provide global variables to use in the UMD build
+					// for externalized deps
+					globals: {
+						vue: 'Vue',
+					},
+				},
+			},
+		},
+	}),
+	vitestConfig,
+);
diff --git a/packages/design-system/vite.config.ts b/packages/design-system/vite.config.ts
deleted file mode 100644
index e742ba8aad162..0000000000000
--- a/packages/design-system/vite.config.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import vue from '@vitejs/plugin-vue2';
-import { resolve } from 'path';
-import { defineConfig, mergeConfig } from 'vite';
-import { defineConfig as defineVitestConfig } from 'vitest/config';
-
-const { coverageReporters } = require('../../jest.config.js');
-
-export default mergeConfig(
-	defineConfig({
-		plugins: [vue()],
-		resolve: {
-			alias: {
-				'@': resolve(__dirname, 'src'),
-				'vue2-boring-avatars': require.resolve('vue2-boring-avatars'),
-			},
-		},
-		build: {
-			lib: {
-				entry: resolve(__dirname, 'src', 'main.ts'),
-				name: 'N8nDesignSystem',
-				fileName: (format) => `n8n-design-system.${format}.js`,
-			},
-			rollupOptions: {
-				// make sure to externalize deps that shouldn't be bundled
-				// into your library
-				external: ['vue'],
-				output: {
-					exports: 'named',
-					// Provide global variables to use in the UMD build
-					// for externalized deps
-					globals: {
-						vue: 'Vue',
-					},
-				},
-			},
-		},
-	}),
-	defineVitestConfig({
-		test: {
-			globals: true,
-			environment: 'jsdom',
-			setupFiles: ['./src/__tests__/setup.ts'],
-			coverage: {
-				provider: 'c8',
-				reporter: coverageReporters,
-				include: ['src/**/*.ts'],
-				all: true,
-			},
-			css: {
-				modules: {
-					classNameStrategy: 'non-scoped',
-				},
-			},
-		},
-	}),
-);
diff --git a/packages/editor-ui/.eslintrc.js b/packages/editor-ui/.eslintrc.js
index f02707cc302b6..35ff091cefe56 100644
--- a/packages/editor-ui/.eslintrc.js
+++ b/packages/editor-ui/.eslintrc.js
@@ -1,4 +1,4 @@
-const { sharedOptions } = require('@n8n_io/eslint-config/shared');
+const sharedOptions = require('@n8n_io/eslint-config/shared');
 
 /**
  * @type {import('@types/eslint').ESLint.ConfigData}
@@ -8,48 +8,38 @@ module.exports = {
 
 	...sharedOptions(__dirname, 'frontend'),
 
-	ignorePatterns: ['*.d.cts'],
-
 	rules: {
+		'n8n-local-rules/dangerously-use-html-string-missing': 'error',
+
 		// TODO: Remove these
-		'id-denylist': 'off',
-		'import/extensions': 'off',
-		'import/no-default-export': 'off',
-		'import/no-extraneous-dependencies': 'off',
+		'id-denylist': 'warn',
+		'import/extensions': 'warn',
+		'import/no-default-export': 'warn',
 		'import/order': 'off',
 		'import/no-cycle': 'warn',
-		indent: 'off',
-		'@typescript-eslint/ban-types': 'off',
-		'@typescript-eslint/dot-notation': 'off',
-		'@typescript-eslint/lines-between-class-members': 'off',
-		'@typescript-eslint/member-delimiter-style': 'off',
-		'@typescript-eslint/naming-convention': 'off',
-		'@typescript-eslint/no-duplicate-imports': 'off',
-		'@typescript-eslint/no-empty-interface': 'off',
-		'@typescript-eslint/no-floating-promises': 'off',
-		'@typescript-eslint/no-for-in-array': 'off',
-		'@typescript-eslint/no-loop-func': 'off',
-		'@typescript-eslint/no-non-null-assertion': 'off',
-		'@typescript-eslint/no-shadow': 'off',
-		'@typescript-eslint/no-this-alias': 'off',
-		'@typescript-eslint/no-unnecessary-boolean-literal-compare': 'off',
-		'@typescript-eslint/no-unnecessary-type-assertion': 'off',
-		'@typescript-eslint/no-unsafe-argument': 'off',
-		'@typescript-eslint/no-unsafe-assignment': 'off',
-		'@typescript-eslint/no-unsafe-call': 'off',
-		'@typescript-eslint/no-unsafe-member-access': 'off',
-		'@typescript-eslint/no-unsafe-return': 'off',
-		'@typescript-eslint/no-unused-expressions': 'off',
-		'@typescript-eslint/no-unused-vars': 'off',
-		'@typescript-eslint/no-use-before-define': 'off',
-		'@typescript-eslint/no-var-requires': 'off',
-		'@typescript-eslint/prefer-nullish-coalescing': 'off',
-		'@typescript-eslint/prefer-optional-chain': 'off',
-		'@typescript-eslint/promise-function-async': 'off',
-		'@typescript-eslint/restrict-plus-operands': 'off',
-		'@typescript-eslint/restrict-template-expressions': 'off',
-		'@typescript-eslint/return-await': 'off',
-		'@typescript-eslint/unbound-method': 'off',
+		'import/no-duplicates': 'warn',
+		'@typescript-eslint/ban-types': 'warn',
+		'@typescript-eslint/dot-notation': 'warn',
+		'@typescript-eslint/lines-between-class-members': 'warn',
+		'@typescript-eslint/member-delimiter-style': 'warn',
+		'@typescript-eslint/naming-convention': 'warn',
+		'@typescript-eslint/no-empty-interface': 'warn',
+		'@typescript-eslint/no-for-in-array': 'warn',
+		'@typescript-eslint/no-loop-func': 'warn',
+		'@typescript-eslint/no-non-null-assertion': 'warn',
+		'@typescript-eslint/no-shadow': 'warn',
+		'@typescript-eslint/no-this-alias': 'warn',
+		'@typescript-eslint/no-unnecessary-boolean-literal-compare': 'warn',
+		'@typescript-eslint/no-unnecessary-type-assertion': 'warn',
+		'@typescript-eslint/no-unused-expressions': 'warn',
+		'@typescript-eslint/no-unused-vars': 'warn',
+		'@typescript-eslint/no-var-requires': 'warn',
+		'@typescript-eslint/prefer-nullish-coalescing': 'warn',
+		'@typescript-eslint/prefer-optional-chain': 'warn',
+		'@typescript-eslint/restrict-plus-operands': 'warn',
 		'@typescript-eslint/ban-ts-comment': ['warn', { 'ts-ignore': true }],
+		'@typescript-eslint/no-redundant-type-constituents': 'warn',
+		'@typescript-eslint/no-base-to-string': 'warn',
+		'@typescript-eslint/no-unsafe-enum-comparison': 'warn',
 	},
 };
diff --git a/packages/editor-ui/LICENSE.md b/packages/editor-ui/LICENSE.md
index c1d74239754fd..aab68b6d9301b 100644
--- a/packages/editor-ui/LICENSE.md
+++ b/packages/editor-ui/LICENSE.md
@@ -3,8 +3,9 @@
 Portions of this software are licensed as follows:
 
 - Content of branches other than the main branch (i.e. "master") are not licensed.
-- All source code files that contain ".ee." in their filename are licensed under the
-  "n8n Enterprise License" defined in "LICENSE_EE.md".
+- Source code files that contain ".ee." in their filename are NOT licensed under the Sustainable Use License.
+  To use source code files that contain ".ee." in their filename you must hold a valid n8n Enterprise License
+  specifically allowing you access to such source code files and as defined in "LICENSE_EE.md".
 - All third party components incorporated into the n8n Software are licensed under the original license
   provided by the owner of the applicable component.
 - Content outside of the above mentioned files or restrictions is available under the "Sustainable Use
diff --git a/packages/editor-ui/README.md b/packages/editor-ui/README.md
index c378326a7dfd5..c8583ffbbdd31 100644
--- a/packages/editor-ui/README.md
+++ b/packages/editor-ui/README.md
@@ -56,7 +56,7 @@ See [Configuration Reference](https://cli.vuejs.org/config/).
 
 ## License
 
-n8n is [fair-code](http://faircode.io) distributed under the [**Sustainable Use License**](https://github.com/n8n-io/n8n/blob/master/packages/cli/LICENSE.md).
+n8n is [fair-code](https://faircode.io) distributed under the [**Sustainable Use License**](https://github.com/n8n-io/n8n/blob/master/packages/cli/LICENSE.md).
 
 Proprietary licenses are available for enterprise customers. [Get in touch](mailto:license@n8n.io)
 
diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index e0575f00a59ad..27d1a494f5464 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-editor-ui",
-  "version": "0.191.0",
+  "version": "1.41.0",
   "description": "Workflow Editor UI for n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",
@@ -15,111 +15,91 @@
   },
   "scripts": {
     "clean": "rimraf dist .turbo",
-    "build": "cross-env VITE_DCS_ENV=\"production\" VUE_APP_PUBLIC_PATH=\"/{{BASE_PATH}}/\" NODE_OPTIONS=\"--max-old-space-size=8192\"  vite build",
-    "typecheck": "vue-tsc --emitDeclarationOnly",
+    "build": "cross-env VUE_APP_PUBLIC_PATH=\"/{{BASE_PATH}}/\" NODE_OPTIONS=\"--max-old-space-size=8192\" vite build",
+    "typecheck": "vue-tsc --noEmit",
     "dev": "pnpm serve",
-    "lint": "eslint --quiet --ext .js,.ts,.vue src",
-    "lintfix": "eslint --ext .js,.ts,.vue src --fix",
+    "lint": "eslint src --ext .js,.ts,.vue --quiet",
+    "lintfix": "eslint src --ext .js,.ts,.vue --fix",
     "format": "prettier --write . --ignore-path ../../.prettierignore",
     "serve": "cross-env VUE_APP_URL_BASE_API=http://localhost:5678/ vite --host 0.0.0.0 --port 8080 dev",
-    "test": "vitest run --coverage",
+    "test": "vitest run",
     "test:dev": "vitest"
   },
   "dependencies": {
-    "@codemirror/autocomplete": "^6.4.0",
-    "@codemirror/commands": "^6.1.0",
-    "@codemirror/lang-javascript": "^6.1.2",
-    "@codemirror/language": "^6.2.1",
-    "@codemirror/lint": "^6.0.0",
-    "@codemirror/state": "^6.1.4",
-    "@codemirror/view": "^6.5.1",
+    "@codemirror/autocomplete": "^6.11.1",
+    "@codemirror/commands": "^6.3.2",
+    "@codemirror/lang-javascript": "^6.2.1",
+    "@codemirror/lang-json": "^6.0.1",
+    "@codemirror/lang-python": "^6.1.3",
+    "@codemirror/language": "^6.9.3",
+    "@codemirror/lint": "^6.4.2",
+    "@codemirror/state": "^6.3.3",
+    "@codemirror/view": "^6.22.3",
     "@fontsource/open-sans": "^4.5.0",
-    "@fortawesome/fontawesome-svg-core": "^1.2.35",
-    "@fortawesome/free-regular-svg-icons": "^6.1.1",
-    "@fortawesome/free-solid-svg-icons": "^5.15.3",
-    "@fortawesome/vue-fontawesome": "^2.0.2",
     "@jsplumb/browser-ui": "^5.13.2",
     "@jsplumb/common": "^5.13.2",
     "@jsplumb/connector-bezier": "^5.13.2",
     "@jsplumb/core": "^5.13.2",
     "@jsplumb/util": "^5.13.2",
-    "axios": "^0.21.1",
-    "canvas-confetti": "^1.6.0",
+    "@lezer/common": "^1.0.4",
+    "@n8n/chat": "workspace:*",
+    "@n8n/codemirror-lang-sql": "^1.0.2",
+    "@n8n/permissions": "workspace:*",
+    "@vueuse/components": "^10.5.0",
+    "@vueuse/core": "^10.5.0",
+    "axios": "1.6.7",
+    "chart.js": "^4.4.0",
     "codemirror-lang-html-n8n": "^1.0.0",
-    "codemirror-lang-n8n-expression": "^0.2.0",
-    "copy-to-clipboard": "^3.3.3",
+    "codemirror-lang-n8n-expression": "^0.3.0",
     "dateformat": "^3.0.3",
+    "email-providers": "^2.0.1",
     "esprima-next": "5.8.4",
     "fast-json-stable-stringify": "^2.1.0",
     "file-saver": "^2.0.2",
     "flatted": "^3.2.4",
     "humanize-duration": "^3.27.2",
-    "jquery": "^3.4.1",
     "jsonpath": "^1.1.1",
     "lodash-es": "^4.17.21",
     "luxon": "^3.3.0",
-    "monaco-editor": "^0.33.0",
     "n8n-design-system": "workspace:*",
     "n8n-workflow": "workspace:*",
-    "normalize-wheel": "^1.0.1",
-    "pinia": "^2.0.22",
-    "prettier": "^2.8.3",
-    "prismjs": "^1.17.1",
-    "qrcode": "^1.5.3",
+    "pinia": "^2.1.6",
+    "prettier": "^3.1.0",
+    "qrcode.vue": "^3.3.4",
     "stream-browserify": "^3.0.0",
     "timeago.js": "^4.0.2",
     "uuid": "^8.3.2",
-    "v-click-outside": "^3.1.2",
-    "vue": "^2.7.14",
+    "v3-infinite-loading": "^1.2.2",
+    "vue": "^3.4.21",
     "vue-agile": "^2.0.0",
-    "vue-fragment": "1.5.1",
-    "vue-i18n": "^8.26.7",
-    "vue-infinite-loading": "^2.4.5",
-    "vue-json-pretty": "1.9.3",
-    "vue-prism-editor": "^0.3.0",
-    "vue-router": "^3.6.5",
-    "vue-template-compiler": "^2.7.14",
-    "vue-typed-mixins": "^0.2.0",
-    "vue2-boring-avatars": "0.3.4",
-    "vue2-teleport": "^1.0.1",
-    "vue2-touch-events": "^3.2.1",
-    "xss": "^1.0.10"
+    "vue-chartjs": "^5.2.0",
+    "vue-i18n": "^9.2.2",
+    "vue-json-pretty": "2.2.4",
+    "vue-markdown-render": "^2.0.1",
+    "vue-router": "^4.2.2",
+    "vue3-touch-events": "^4.1.3",
+    "xss": "^1.0.14"
   },
   "devDependencies": {
-    "@faker-js/faker": "^7.6.0",
-    "@modyfi/vite-plugin-yaml": "^1.0.4",
-    "@pinia/testing": "^0.0.14",
-    "@sentry/vite-plugin": "^0.4.0",
-    "@testing-library/jest-dom": "^5.16.5",
-    "@testing-library/user-event": "^14.4.3",
-    "@testing-library/vue": "^5.8.3",
-    "@types/canvas-confetti": "^1.6.0",
+    "@faker-js/faker": "^8.0.2",
+    "@pinia/testing": "^0.1.3",
+    "@sentry/vite-plugin": "^2.5.0",
     "@types/dateformat": "^3.0.0",
-    "@types/express": "^4.17.6",
     "@types/file-saver": "^2.0.1",
     "@types/humanize-duration": "^3.27.1",
     "@types/jsonpath": "^0.2.0",
     "@types/lodash-es": "^4.17.6",
-    "@types/lodash.camelcase": "^4.3.6",
-    "@types/lodash.get": "^4.4.6",
-    "@types/lodash.set": "^4.3.6",
     "@types/luxon": "^3.2.0",
     "@types/qrcode": "^1.5.0",
     "@types/swagger-ui": "^3.52.0",
     "@types/uuid": "^8.3.2",
-    "@vitejs/plugin-legacy": "^3.0.1",
-    "@vitejs/plugin-react": "^4.0.0",
-    "@vitejs/plugin-vue2": "^2.2.0",
-    "@vitest/coverage-c8": "^0.28.5",
-    "c8": "^7.12.0",
-    "jshint": "^2.9.7",
-    "miragejs": "^0.1.47",
-    "sass": "^1.55.0",
-    "sass-loader": "^10.1.1",
-    "string-template-parser": "^1.2.6",
-    "vite": "4.0.4",
-    "vite-plugin-monaco-editor": "^1.0.10",
-    "vitest": "^0.28.5",
-    "vue-tsc": "^1.0.24"
+    "miragejs": "^0.1.48",
+    "unplugin-icons": "^0.17.0"
+  },
+  "peerDependencies": {
+    "@fortawesome/fontawesome-svg-core": "*",
+    "@fortawesome/free-regular-svg-icons": "*",
+    "@fortawesome/free-solid-svg-icons": "*",
+    "@fortawesome/vue-fontawesome": "*"
   }
 }
diff --git a/packages/editor-ui/public/favicon-16x16.png b/packages/editor-ui/public/favicon-16x16.png
deleted file mode 100644
index a6e6de975cfb3..0000000000000
Binary files a/packages/editor-ui/public/favicon-16x16.png and /dev/null differ
diff --git a/packages/editor-ui/public/favicon-32x32.png b/packages/editor-ui/public/favicon-32x32.png
deleted file mode 100644
index 4e5162cdf0ea3..0000000000000
Binary files a/packages/editor-ui/public/favicon-32x32.png and /dev/null differ
diff --git a/packages/editor-ui/public/google-auth/disabled.dark.png b/packages/editor-ui/public/google-auth/disabled.dark.png
new file mode 100644
index 0000000000000..485757f3746ba
Binary files /dev/null and b/packages/editor-ui/public/google-auth/disabled.dark.png differ
diff --git a/packages/editor-ui/public/google-auth/focus.dark.png b/packages/editor-ui/public/google-auth/focus.dark.png
new file mode 100644
index 0000000000000..369a6ca24df29
Binary files /dev/null and b/packages/editor-ui/public/google-auth/focus.dark.png differ
diff --git a/packages/editor-ui/public/google-auth/normal.dark.png b/packages/editor-ui/public/google-auth/normal.dark.png
new file mode 100644
index 0000000000000..f27bb2433042a
Binary files /dev/null and b/packages/editor-ui/public/google-auth/normal.dark.png differ
diff --git a/packages/editor-ui/public/google-auth/pressed.dark.png b/packages/editor-ui/public/google-auth/pressed.dark.png
new file mode 100644
index 0000000000000..4cb85e9b554a7
Binary files /dev/null and b/packages/editor-ui/public/google-auth/pressed.dark.png differ
diff --git a/packages/editor-ui/public/google-signin-light.png b/packages/editor-ui/public/google-signin-light.png
deleted file mode 100644
index c1e2c5c7d2fd4..0000000000000
Binary files a/packages/editor-ui/public/google-signin-light.png and /dev/null differ
diff --git a/packages/editor-ui/public/n8n-icon-small.png b/packages/editor-ui/public/n8n-icon-small.png
deleted file mode 100644
index e709f773d1649..0000000000000
Binary files a/packages/editor-ui/public/n8n-icon-small.png and /dev/null differ
diff --git a/packages/editor-ui/public/n8n-logo-collapsed.svg b/packages/editor-ui/public/n8n-logo-collapsed.svg
deleted file mode 100644
index 62e0c21bb7486..0000000000000
--- a/packages/editor-ui/public/n8n-logo-collapsed.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="32" height="16" viewBox="0 0 32 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M28.0125 6.4C26.5214 6.4 25.2686 5.38018 24.9133 4H21.2456C20.4635 4 19.796 4.56546 19.6674 5.33696L19.5359 6.12608C19.411 6.87531 19.032 7.52738 18.496 8C19.032 8.47262 19.411 9.12469 19.5359 9.87392L19.6674 10.663C19.796 11.4345 20.4635 12 21.2456 12H21.7133C22.0686 10.6198 23.3214 9.6 24.8125 9.6C26.5798 9.6 28.0125 11.0327 28.0125 12.8C28.0125 14.5673 26.5798 16 24.8125 16C23.3214 16 22.0685 14.9802 21.7133 13.6H21.2456C19.6813 13.6 18.3463 12.4691 18.0891 10.9261L17.9576 10.137C17.829 9.36546 17.1615 8.8 16.3794 8.8H15.1117C14.7565 10.1802 13.5036 11.2 12.0125 11.2C10.5214 11.2 9.26855 10.1802 8.91331 8.8H7.11169C6.75645 10.1802 5.50357 11.2 4.0125 11.2C2.24519 11.2 0.8125 9.76731 0.8125 8C0.8125 6.23269 2.24519 4.8 4.0125 4.8C5.50357 4.8 6.75645 5.81982 7.11169 7.2H8.91331C9.26855 5.81982 10.5214 4.8 12.0125 4.8C13.5036 4.8 14.7565 5.81982 15.1117 7.2H16.3794C17.1615 7.2 17.829 6.63454 17.9576 5.86304L18.0891 5.07392C18.3463 3.53092 19.6813 2.4 21.2456 2.4L24.9133 2.4C25.2685 1.01982 26.5214 0 28.0125 0C29.7798 0 31.2125 1.43269 31.2125 3.2C31.2125 4.96731 29.7798 6.4 28.0125 6.4ZM28.0125 4.8C28.8962 4.8 29.6125 4.08366 29.6125 3.2C29.6125 2.31634 28.8962 1.6 28.0125 1.6C27.1288 1.6 26.4125 2.31634 26.4125 3.2C26.4125 4.08366 27.1288 4.8 28.0125 4.8ZM4.0125 9.6C4.89616 9.6 5.6125 8.88366 5.6125 8C5.6125 7.11634 4.89616 6.4 4.0125 6.4C3.12884 6.4 2.4125 7.11634 2.4125 8C2.4125 8.88366 3.12884 9.6 4.0125 9.6ZM13.6125 8C13.6125 8.88366 12.8962 9.6 12.0125 9.6C11.1288 9.6 10.4125 8.88366 10.4125 8C10.4125 7.11634 11.1288 6.4 12.0125 6.4C12.8962 6.4 13.6125 7.11634 13.6125 8ZM26.4125 12.8C26.4125 13.6837 25.6962 14.4 24.8125 14.4C23.9288 14.4 23.2125 13.6837 23.2125 12.8C23.2125 11.9163 23.9288 11.2 24.8125 11.2C25.6962 11.2 26.4125 11.9163 26.4125 12.8Z" fill="#EA4B71"/>
-</svg>
diff --git a/packages/editor-ui/public/n8n-logo-expanded.svg b/packages/editor-ui/public/n8n-logo-expanded.svg
deleted file mode 100644
index 29dbf38f910e8..0000000000000
--- a/packages/editor-ui/public/n8n-logo-expanded.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg width="58" height="16" viewBox="0 0 58 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M27.2 6.4C25.7089 6.4 24.4561 5.38018 24.1008 4H20.4331C19.651 4 18.9835 4.56546 18.8549 5.33696L18.7234 6.12608C18.5985 6.87531 18.2195 7.52738 17.6835 8C18.2195 8.47262 18.5985 9.12469 18.7234 9.87392L18.8549 10.663C18.9835 11.4345 19.651 12 20.4331 12H20.9008C21.2561 10.6198 22.5089 9.6 24 9.6C25.7673 9.6 27.2 11.0327 27.2 12.8C27.2 14.5673 25.7673 16 24 16C22.5089 16 21.256 14.9802 20.9008 13.6H20.4331C18.8688 13.6 17.5338 12.4691 17.2766 10.9261L17.1451 10.137C17.0165 9.36546 16.349 8.8 15.5669 8.8H14.2992C13.944 10.1802 12.6911 11.2 11.2 11.2C9.70893 11.2 8.45605 10.1802 8.10081 8.8H6.29919C5.94395 10.1802 4.69107 11.2 3.2 11.2C1.43269 11.2 0 9.76731 0 8C0 6.23269 1.43269 4.8 3.2 4.8C4.69107 4.8 5.94395 5.81982 6.29919 7.2H8.10081C8.45605 5.81982 9.70893 4.8 11.2 4.8C12.6911 4.8 13.944 5.81982 14.2992 7.2H15.5669C16.349 7.2 17.0165 6.63454 17.1451 5.86304L17.2766 5.07392C17.5338 3.53092 18.8688 2.4 20.4331 2.4L24.1008 2.4C24.456 1.01982 25.7089 0 27.2 0C28.9673 0 30.4 1.43269 30.4 3.2C30.4 4.96731 28.9673 6.4 27.2 6.4ZM27.2 4.8C28.0837 4.8 28.8 4.08366 28.8 3.2C28.8 2.31634 28.0837 1.6 27.2 1.6C26.3163 1.6 25.6 2.31634 25.6 3.2C25.6 4.08366 26.3163 4.8 27.2 4.8ZM3.2 9.6C4.08366 9.6 4.8 8.88366 4.8 8C4.8 7.11634 4.08366 6.4 3.2 6.4C2.31634 6.4 1.6 7.11634 1.6 8C1.6 8.88366 2.31634 9.6 3.2 9.6ZM12.8 8C12.8 8.88366 12.0837 9.6 11.2 9.6C10.3163 9.6 9.6 8.88366 9.6 8C9.6 7.11634 10.3163 6.4 11.2 6.4C12.0837 6.4 12.8 7.11634 12.8 8ZM25.6 12.8C25.6 13.6837 24.8837 14.4 24 14.4C23.1163 14.4 22.4 13.6837 22.4 12.8C22.4 11.9163 23.1163 11.2 24 11.2C24.8837 11.2 25.6 11.9163 25.6 12.8Z" fill="#EA4B71"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M48.0015 6.91832V6.84207C48.5598 6.5625 49.118 6.07959 49.118 5.12649C49.118 3.75402 47.9888 2.928 46.4282 2.928C44.8296 2.928 43.6877 3.80486 43.6877 5.15191C43.6877 6.06688 44.2206 6.5625 44.8042 6.84207V6.91832C44.1571 7.14707 43.3832 7.8333 43.3832 8.97702C43.3832 10.3622 44.5251 11.328 46.4155 11.328C48.306 11.328 49.4098 10.3622 49.4098 8.97702C49.4098 7.8333 48.6486 7.15977 48.0015 6.91832ZM46.4155 4.09714C47.0499 4.09714 47.5194 4.5038 47.5194 5.19003C47.5194 5.87626 47.0372 6.28292 46.4155 6.28292C45.7938 6.28292 45.2737 5.87626 45.2737 5.19003C45.2737 4.49109 45.7685 4.09714 46.4155 4.09714ZM46.4155 10.108C45.6797 10.108 45.0833 9.63784 45.0833 8.83723C45.0833 8.11287 45.5782 7.56643 46.4029 7.56643C47.2149 7.56643 47.7097 8.10017 47.7097 8.86265C47.7097 9.63784 47.1387 10.108 46.4155 10.108Z" fill="#101330"/>
-<path d="M51.3672 11.2009H52.9912V7.75705C52.9912 6.62604 53.6763 6.13042 54.4503 6.13042C55.2116 6.13042 55.8079 6.63874 55.8079 7.6808V11.2009H57.4319V7.35039C57.4319 5.68564 56.4676 4.71983 54.9578 4.71983C54.0062 4.71983 53.4733 5.10107 53.0927 5.59669H52.9912L52.8516 4.84691H51.3672V11.2009Z" fill="#101330"/>
-<path d="M36.9912 11.2009H35.3672V4.84691H36.8516L36.9912 5.59669H37.0927C37.4733 5.10107 38.0062 4.71983 38.9578 4.71983C40.4676 4.71983 41.4319 5.68564 41.4319 7.35039V11.2009H39.8079V7.6808C39.8079 6.63874 39.2116 6.13042 38.4503 6.13042C37.6763 6.13042 36.9912 6.62604 36.9912 7.75705V11.2009Z" fill="#101330"/>
-</svg>
diff --git a/packages/editor-ui/public/n8n-logo.svg b/packages/editor-ui/public/n8n-logo.svg
deleted file mode 100644
index b4db9b921b300..0000000000000
--- a/packages/editor-ui/public/n8n-logo.svg
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.2.1, 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 369 105" style="enable-background:new 0 0 369 105;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FF6D5A;}
-	.st1{fill:#384D5B;}
-</style>
-<g>
-	<path class="st0" d="M183.9,0.2c-9.8,0-18,6.7-20.3,15.8h-29.2c-11.5,0-20.8,9.3-20.8,20.8c0,5.7-4.7,10.4-10.4,10.4H99
-		c-2.3-9.1-10.5-15.8-20.3-15.8c-9.8,0-18,6.7-20.3,15.8H41.7c-2.3-9.1-10.5-15.8-20.3-15.8c-11.6,0-21,9.4-21,21
-		c0,11.6,9.4,21,21,21c9.8,0,18-6.7,20.3-15.8h16.7c2.3,9.1,10.5,15.8,20.3,15.8c9.7,0,17.9-6.6,20.3-15.6h4.2
-		c5.7,0,10.4,4.7,10.4,10.4c0,11.5,9.3,20.8,20.8,20.8h6.8c2.3,9.1,10.5,15.8,20.3,15.8c11.6,0,21-9.4,21-21c0-11.6-9.4-21-21-21
-		c-9.8,0-18,6.7-20.3,15.8h-6.8c-5.7,0-10.4-4.7-10.4-10.4c0-6.3-2.8-11.9-7.2-15.7c4.4-3.8,7.2-9.4,7.2-15.7
-		c0-5.7,4.7-10.4,10.4-10.4h29.2c2.3,9.1,10.5,15.8,20.3,15.8c11.6,0,21-9.4,21-21C204.9,9.6,195.5,0.2,183.9,0.2z M21.4,63
-		c-5.8,0-10.6-4.8-10.6-10.6s4.8-10.6,10.6-10.6S32,46.6,32,52.4S27.3,63,21.4,63z M78.7,63c-5.8,0-10.6-4.8-10.6-10.6
-		s4.8-10.6,10.6-10.6s10.6,4.8,10.6,10.6S84.6,63,78.7,63z M161.5,73.2c5.8,0,10.6,4.8,10.6,10.6s-4.8,10.6-10.6,10.6
-		s-10.6-4.8-10.6-10.6C150.9,77.9,155.7,73.2,161.5,73.2z M183.9,31.8c-5.8,0-10.6-4.8-10.6-10.6s4.8-10.6,10.6-10.6
-		s10.6,4.8,10.6,10.6C194.5,27,189.8,31.8,183.9,31.8z"/>
-	<g>
-		<path class="st1" d="M219.4,47.4c0-1.3-0.7-1.8-1.8-1.8h-3.5v-7h7.8c3.6,0,5.4,1.6,5.4,4.7v1.6c0,1.3-0.2,2.4-0.2,2.4h0.2
-			c1.7-3.7,6.7-9.8,16-9.8c10.1,0,14.6,5.5,14.6,16.3v18.4c0,1.3,0.7,1.8,1.8,1.8h3.5v7h-8.1c-3.8,0-5.4-1.6-5.4-5.4v-20
-			c0-6-1.2-10.7-8-10.7c-6.6,0-11.8,4.3-13.5,10.4c-0.6,1.7-0.8,3.6-0.8,5.7v19.9h-8.2L219.4,47.4L219.4,47.4z"/>
-		<path class="st1" d="M280.3,48.9v-0.2c0,0-7.3-3.9-7.3-12.1s6.6-15.9,18.5-15.9c11.4,0,18.6,6.8,18.6,16.1
-			c0,8.8-7.2,14.1-7.2,14.1v0.2c5.4,3.1,8.8,7.2,8.8,13.6c0,9.3-8.4,17.4-20.5,17.4c-11.2,0-20.7-7-20.7-18
-			C270.6,54.3,280.3,48.9,280.3,48.9z M291.3,74.5c6.2,0,12-4.1,12-10c0-5.2-4.5-7.5-10-9.8c-2.3-0.9-5.5-2.2-6.1-2.2
-			c-2.1,0-8.1,4.9-8.1,11.2C279.1,70.3,284.8,74.5,291.3,74.5z M295.6,47.5c2,0,6.3-5,6.3-10.3c0-5.5-4.4-8.9-10.4-8.9
-			c-6.5,0-10.3,3.7-10.3,8.4c0,5.2,4.5,7.2,9.8,9.3C292.2,46.6,294.6,47.5,295.6,47.5z"/>
-		<path class="st1" d="M324.7,47.4c0-1.3-0.7-1.8-1.8-1.8h-3.5v-7h7.8c3.6,0,5.4,1.6,5.4,4.7v1.6c0,1.3-0.2,2.4-0.2,2.4h0.2
-			c1.7-3.7,6.7-9.8,16-9.8c10.1,0,14.6,5.5,14.6,16.3v18.4c0,1.3,0.7,1.8,1.8,1.8h3.5v7h-8.1c-3.8,0-5.4-1.6-5.4-5.4v-20
-			c0-6-1.2-10.7-8-10.7c-6.6,0-11.8,4.3-13.5,10.4c-0.6,1.7-0.8,3.6-0.8,5.7v19.9h-8.2L324.7,47.4L324.7,47.4z"/>
-	</g>
-</g>
-</svg>
diff --git a/packages/editor-ui/public/static/form-grey.svg b/packages/editor-ui/public/static/form-grey.svg
new file mode 100644
index 0000000000000..ce5111a648c17
--- /dev/null
+++ b/packages/editor-ui/public/static/form-grey.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="50" height="50" fill="none"><path fill="#00B7BC" d="M47.267 22.554c-.002.31-.126.608-.344.829l-6.805 6.796a1.13 1.13 0 0 1-.828.344 1.15 1.15 0 0 1-.828-.344 1.18 1.18 0 0 1 0-1.656l5.977-5.969-1.313-1.312-1.383 1.414L28.595 35.78l-4.617.781.781-4.617.336-.336 2.563 2.555c.214.227.515.351.828.343.311.006.611-.119.828-.343a1.18 1.18 0 0 0 0-1.657l-2.563-2.562 8.25-8.273 4.29-4.29 3.757 3.711 1.617-1.617 2.258 2.258c.218.218.342.512.344.82m-17.282 15.15 3.032-3.032v8.297a1.56 1.56 0 0 1-1.563 1.563H4.298a1.56 1.56 0 0 1-1.563-1.563V14.843c0-.405.157-.794.438-1.086l6.304-6.531v5.344H6.251a1.172 1.172 0 1 0 0 2.344h4.43a1.17 1.17 0 0 0 1.171-1.172V5.468h19.602a1.56 1.56 0 0 1 1.563 1.563v13.281L22.86 30.468a1.24 1.24 0 0 0-.328.633l-1.102 6.61c-.06.373.062.753.329 1.023.22.22.517.343.828.343h.195l6.602-1.101a1.16 1.16 0 0 0 .601-.274m-21-16a1.18 1.18 0 0 0 1.172 1.172h15.266a1.172 1.172 0 1 0 0-2.344H10.157a1.17 1.17 0 0 0-1.172 1.172m10.711 14.766a1.17 1.17 0 0 0-1.172-1.172h-8.367a1.172 1.172 0 1 0 0 2.343h8.367a1.17 1.17 0 0 0 1.172-1.172m.86-7.391a1.17 1.17 0 0 0-1.172-1.172h-9.227a1.172 1.172 0 1 0 0 2.344h9.227a1.164 1.164 0 0 0 1.171-1.172M45.75 18.617a1.563 1.563 0 0 0 0-2.203l-1.64-1.64a1.563 1.563 0 0 0-2.204 0l-.93.929 3.852 3.828z" style="fill:#7d7d87;fill-opacity:1"/></svg>
\ No newline at end of file
diff --git a/packages/editor-ui/public/static/json-mapping-gif.gif b/packages/editor-ui/public/static/json-mapping-gif.gif
deleted file mode 100644
index 9d42a88bdc176..0000000000000
Binary files a/packages/editor-ui/public/static/json-mapping-gif.gif and /dev/null differ
diff --git a/packages/editor-ui/public/static/logo/channel/beta-dark.svg b/packages/editor-ui/public/static/logo/channel/beta-dark.svg
new file mode 100644
index 0000000000000..7253fbe02b75e
--- /dev/null
+++ b/packages/editor-ui/public/static/logo/channel/beta-dark.svg
@@ -0,0 +1 @@
+<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
new file mode 100644
index 0000000000000..d4fb970c620bc
--- /dev/null
+++ b/packages/editor-ui/public/static/logo/channel/beta.svg
@@ -0,0 +1 @@
+<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
new file mode 100644
index 0000000000000..23c8b0571199c
--- /dev/null
+++ b/packages/editor-ui/public/static/logo/channel/dev-dark.svg
@@ -0,0 +1 @@
+<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
new file mode 100644
index 0000000000000..f8f2b2d437885
--- /dev/null
+++ b/packages/editor-ui/public/static/logo/channel/dev.svg
@@ -0,0 +1 @@
+<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
new file mode 100644
index 0000000000000..a1b5661dcb3a7
--- /dev/null
+++ b/packages/editor-ui/public/static/logo/channel/nightly-dark.svg
@@ -0,0 +1 @@
+<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
new file mode 100644
index 0000000000000..bb4746df5640e
--- /dev/null
+++ b/packages/editor-ui/public/static/logo/channel/nightly.svg
@@ -0,0 +1 @@
+<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
new file mode 100644
index 0000000000000..f65407694a8d5
--- /dev/null
+++ b/packages/editor-ui/public/static/logo/collapsed.svg
@@ -0,0 +1 @@
+<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
new file mode 100644
index 0000000000000..d9a71faffe534
--- /dev/null
+++ b/packages/editor-ui/public/static/logo/expanded-dark.svg
@@ -0,0 +1 @@
+<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
new file mode 100644
index 0000000000000..337b52be1c119
--- /dev/null
+++ b/packages/editor-ui/public/static/logo/expanded.svg
@@ -0,0 +1 @@
+<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/public/static/open-ai.svg b/packages/editor-ui/public/static/open-ai.svg
new file mode 100644
index 0000000000000..4f8812da72e68
--- /dev/null
+++ b/packages/editor-ui/public/static/open-ai.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="260" preserveAspectRatio="xMidYMid"><path d="M239.184 106.203a64.72 64.72 0 0 0-5.576-53.103C219.452 28.459 191 15.784 163.213 21.74A65.586 65.586 0 0 0 52.096 45.22a64.72 64.72 0 0 0-43.23 31.36c-14.31 24.602-11.061 55.634 8.033 76.74a64.67 64.67 0 0 0 5.525 53.102c14.174 24.65 42.644 37.324 70.446 31.36a64.72 64.72 0 0 0 48.754 21.744c28.481.025 53.714-18.361 62.414-45.481a64.77 64.77 0 0 0 43.229-31.36c14.137-24.558 10.875-55.423-8.083-76.483m-97.56 136.338a48.4 48.4 0 0 1-31.105-11.255l1.535-.87 51.67-29.825a8.6 8.6 0 0 0 4.247-7.367v-72.85l21.845 12.636c.218.111.37.32.409.563v60.367c-.056 26.818-21.783 48.545-48.601 48.601M37.158 197.93a48.35 48.35 0 0 1-5.781-32.589l1.534.921 51.722 29.826a8.34 8.34 0 0 0 8.441 0l63.181-36.425v25.221a.87.87 0 0 1-.358.665l-52.335 30.184c-23.257 13.398-52.97 5.431-66.404-17.803M23.549 85.38a48.5 48.5 0 0 1 25.58-21.333v61.39a8.29 8.29 0 0 0 4.195 7.316l62.874 36.272-21.845 12.636a.82.82 0 0 1-.767 0L41.353 151.53c-23.211-13.454-31.171-43.144-17.804-66.405zm179.466 41.695-63.08-36.63L161.73 77.86a.82.82 0 0 1 .768 0l52.233 30.184a48.6 48.6 0 0 1-7.316 87.635v-61.391a8.54 8.54 0 0 0-4.4-7.213m21.742-32.69-1.535-.922-51.619-30.081a8.39 8.39 0 0 0-8.492 0L99.98 99.808V74.587a.72.72 0 0 1 .307-.665l52.233-30.133a48.652 48.652 0 0 1 72.236 50.391zM88.061 139.097l-21.845-12.585a.87.87 0 0 1-.41-.614V65.685a48.652 48.652 0 0 1 79.757-37.346l-1.535.87-51.67 29.825a8.6 8.6 0 0 0-4.246 7.367zm11.868-25.58L128.067 97.3l28.188 16.218v32.434l-28.086 16.218-28.188-16.218z"/></svg>
\ No newline at end of file
diff --git a/packages/editor-ui/public/static/schema-mapping-gif.gif b/packages/editor-ui/public/static/schema-mapping-gif.gif
deleted file mode 100644
index 6d3d79fd9e45a..0000000000000
Binary files a/packages/editor-ui/public/static/schema-mapping-gif.gif and /dev/null differ
diff --git a/packages/editor-ui/public/static/webhook-icon.svg b/packages/editor-ui/public/static/webhook-icon.svg
index 87c4107180e08..f2c5a0eaf1da6 100644
--- a/packages/editor-ui/public/static/webhook-icon.svg
+++ b/packages/editor-ui/public/static/webhook-icon.svg
@@ -1,9 +1 @@
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<rect y="0.5" width="20" height="18.675" fill="url(#pattern0)"/>
-<defs>
-<pattern id="pattern0" patternContentUnits="objectBoundingBox" width="1" height="1">
-<use xlink:href="#image0_676_368" transform="scale(0.000416667 0.000446229)"/>
-</pattern>
-<image id="image0_676_368" width="2400" height="2241" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAACWAAAAjBCAYAAAB4esWRAAAAAXNSR0IArs4c6QAAIABJREFUeF7s3QuYXWddL/7fu2ZyTyEtCkXuLSIUUEBApQgoCF5Aj0jOn4ugD0IOCsHGZl9Sb0uEzOw9E1MJ4iHHCop4hMBzQG6KeOOioAIqUNHalrtQLi20yUyT2ev9PxtbhVLaSTKXvdb6zPPMkzSs9b6/7+ddPO3MfLN3Ch8ECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgcEoC6ZTuchMBAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIhAKWh4AAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQKnKKCAdYpwbiNAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgIAClmeAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECpyiggHWKcG4jQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQICAApZngAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAqcooIB1inBuI0CAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAgAKWZ4AAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgsByBccsiL+dC1xAg0CYBBaw2nbasBAgQIECAAAECBAgQIECAAIFTENi9e/emjRs3nrFhw4bbRMRtR6PR9unp6TOqqtqeUtoREcX4z8dLj0ajHek/P26Tc55KKW2PiA055y0ppc03bL+5qqotNx3lhv/96/78q69LKY2qqvryzcUoiuJoRByPiCoivjS+Jud89Q2/fnl8b0QcLYrieM55MaW0kHO+bvwZEdcWRTFe90tFUVx7/Pjx6+bn58fr+SBAgAABAgQIECBAgAABAgQIECBwiwIKWB4QAgQIECBAgAABAgQIECBAgEALBPbs2bNlw4YNt6uq6qyiKG5XFMVZOedviojb3fB5VlVV4z8/MyLOyDmfcUO56oxxgaoFRDcXcfx3mq9JKX25qqrrUkrX5py/mFL6YkR8oaqqr/w+5/yFoii+8vvp6enPnzhx4ouDweArBTAfBAgQIECAAAECBAgQIECAAAECzRdQwGr+GUtIgAABAgQIECBAgAABAgQINFRgXKratGnTHXPOZ49GozsURXGniLh9RNwxIs4ef6aUxr+OS1a3+MpSDSVaz1hL47JWRFyVUvp0zvmzEfGZoij+o6qqq4qi+FRK6arFxcXPHDx4cHydDwIECBAgQIAAAQIECBAgQIAAgZoKKGDV9OCMTYAAAQIECBAgQIAAAQIECDRb4IILLtixadOmu1RVdbepqak755zvMv5MKd2tqqrb31C2Gr86lY/6C1yfc74qIj4ZEeNi1idzzh8riuITVVV9Ynp6+hP79+//zPgdFesfVQICBAgQIECAAAECBAgQIECAQPMEFLCad6YSESBAgAABAgQIECBAgAABAjUQuOiii+44Go3OrarqnIi4e0rpLhFx55TSXSNi/Lm9BjGMuHYCx3POn7yxnJVS+kREfHw0Gl2+efPmy8clrbIsl9ZuHDsRIECAAAECBAgQIECAAAECBAjcKKCA5VkgQIAAAQIECBAgQIAAAQIECKyCwK5duzacddZZd1laWjpnenr6nHHRKqX0lV+LorhXRHj1qlVwb/GSJ3LOn0gpXZFzvqIoiitGo9EVU1NTV1RV9W/D4fDaFtuIToAAAQIECBAgQIAAAQIECBBYVQEFrFXltTgBAgQIECBAgAABAgQIECDQdIG9e/fefnp6+ryc87dFxH0i4t4552+94ZWsppueX77aCHw6pXRZzvkj48+U0r+klP51dnb2Y97asDZnaFACBAgQqKPA+Cdx3kS4jidnZgIECBAgQIDASQkoYJ0Ul4sJECBAgAABAgQIECBAgACBtgp0u91vqarqvKmpqfvmnM8bv5pVRNwvIs5uq4ncjRA4HhH/HhEfHr9yVs750qmpqQ8vLS19ZH5+/mgjEgpBgAABAgQIECBAgAABAgQIEFhlAQWsVQa2PAECBAgQIECAAAECBAgQIFAvgU6nc3ZK6f4ppe+IiPtHxLdHxHkRsbFeSUxL4LQERhExLmT9U0T8c0R8sCiKf56dnb3S63iclqubCRAgQIAAAQIECBAgQIAAgQYKKGA18FBFIkCAAAECBAgQIECAAAECBG5dYNeuXRvOPPPMe1VV9Z0ppXHB6r4RMf79HW/9blcQaK3AtVVV/VtK6dKU0vtGo9GHN2zY8E8zMzOfa62I4AQIECBAgAABAgQIECBAgEDrBRSwWv8IACBAgAABAgQIECBAgAABAs0XKMty+8LCwgNyzg9OKX1nRDwoIu4VEdPNTy8hgTUR+GhEfCDn/L7xZ1VV/3DgwIHPr8nONiFAgAABAgQIECBAgAABAgQIrLOAAtY6H4DtCRAgQIAAAQIECBAgQIAAgZUVuLFsNX41q5zz+BWtxoWrb4uIqZXdyWoECNySQM75PyLifUVRfKWUNRqN3js/P38VNQIECBAgQIAAAQIECBAgQIBA0wQUsJp2ovIQIECAAAECBAgQIECAAIEWCYzfRnDHjh3fkXP+npTSQ5StWnT4otZV4KM5538Yv31hVVV/O/79/Pz80bqGMTcBAgQIECBAgAABAgQIECBAYCyggOU5IECAAAECBAgQIECAAAECBGojcNFFF91hNBo9dFy0yjmfHxEPi4ittQlgUAIEbiowioh/zTm/K+f87vGrZQ0Gg0sjIqMiQIAAAQIECBAgQIAAAQIECNRFQAGrLidlTgIECBAgQIAAAQIECBAg0DKBnTt3Tp1zzjn3TimdX1XVw294dav7+AtlLXsQxG2jwGfGr4w1LmMtLS29azQavfvgwYMLbYSQmQABAgQIECBAgAABAgQIEKiHgAJWPc7JlAQIEJg8gfG/Qfx95Mk7FxMRIECAAAECBGossGfPni3T09MPjYhHjj+Lovhur25V4wM1OoGVEzgREe/LOb8zpfTXEfGuwWDwpZVb3koECBAgQIAAAQIECBAgQIAAgdMTUMA6PT93EyBAgAABAgQIECBAgAABAqcoUJbl1oWFhQeNX+Eq5/yYiHh4RGw+xeXcRoBAewS++m0L315V1V8eOHDg8+2JLykBAgQIECBAgAABAgQIECAwaQIKWJN2IuYhQIAAAQIECBAgQIAAAQINFej1ere9oWT1iIgYfz44IqYbGlcsAgTWTmD8+swfyjn/dc75HRs2bHjH/v37P7t229uJAAECBAgQIECAAAECBAgQaLuAAlbbnwD5CRAgQIAAAQIECBAgQIDAKgmUZblxYWFh/DaCPxAR41e4ekhETK3SdpYlQIDAVwtcGhF/VlXV27dt2/ZXZVleh4cAAQIECBAgQIAAAQIECBAgsFoCClirJWtdAgQIECBAgAABAgQIECDQQoF+v3/OuGx1w1sKPjYixq965YMAAQLrKTCqquofU0rjtyt8+/bt299RluXx9RzI3gQIECBAgAABAgQIECBAgECzBBSwmnWe0hAgQIAAAQIECBAgQIAAgTUVuOiii+5w4sSJR6SUxq9w9UMppbus6QA2I0CAwEkK5JyPppT+dlzIioi3z87Ovj8ixm9j6IMAAQIECBAgQIAAAQIECBAgcEoCClinxOYmAgQIECBAgAABAgQIECDQToGyLKcXFxcfnnP+oXHhKiLu304JqQkQaJDAx3POf5JSestoNHr7/Pz80QZlE4UAAQIEJl5g/KM6PeCJPyYDEiBAgAABAgRuRUAByyNCgAABAgQIECBAgAABAgQI3KLAvn37vnlpaelRKaUnjD8jYgcyAgQINFRgKef83qIo3phSeuPMzMylDc0pFgECBAgQIECAAAECBAgQILCCAgpYK4hpKQIECBAgQIAAAQIECBAg0ASBnTt3Tp177rkPiIjHVFU1Ll09LCJ8D6EJhysDAQInJZBzvmL8NoUppTcdO3bsbYcOHbr+pBZwMQECBAgQIECAAAECBAgQINAKAd88bcUxC0mAAAECBAgQIECAAAECBG5ZoNvtnpFSGr+l4I9FxA9GxFnMCBAgQOC/BXLOR3POby+K4s1TU1N/vH///s/yIUCAAAECBAgQIECAAAECBAiMBRSwPAcECBAgQIAAAQIECBAgQKClAhdeeOE3FUXxwymlnSmlH4iITS2lEJsAAQInK1BVVfWBqampN6WU/mhmZuYjJ7uA609WYPyt7HyyN7meAAECBAgQIECAAAECBAisiYAC1pow24QAAQIECBAgQIAAAQIECEyGQL/fPyfn/ISIeHxEPCoipidjMlMQIECgvgI3vFXhuIx1ZDAYvFtTqL5naXICBAgQIECAAAECBAgQIHAqAgpYp6LmHgIECBAgQIAAAQIECBAgUB+BtG/fvocuLS39j6Ioxm8veJ/6jG5SAgQI1FLg4znn10fE66+88sp3HDlyZFTLFIYmQIAAAQIECBAgQIAAAQIEli2ggLVsKhcSIECAAAECBAgQIECAAIHaCKRut/td47cWjIgnRcRdazO5QQkQINAsgS9ExBsi4jVbtmz587Isl5oVTxoCBAgQIECAAAECBAgQIEBgLKCA5TkgQIAAAQIECBAgQIAAAQINEej1evcdl65yzk+LiHs2JJYYBAgQaIrA1Tnnr7xN4dVXX/0nhw8fPtGUYHIQIECAAAECBAgQIECAAIG2Cyhgtf0JkJ8AAQIECBAgQIAAAQIEai3wVaWrp0bEt9Y6jOEJECDQHoEv5pzfPC5jbdmy5a1eGas9By8pAQIECBAgQIAAAQIECDRTQAGrmecqFQECBAgQIECAAAECBAg0WKDf7z8w5/zknPPOlNI9GhxVNAIECLRB4DNVVb2uKIrx2xS+qyzLqg2hZSRAgAABAgQIECBAgAABAk0SUMBq0mnKQoAAAQIECBAgQIAAAQKNFbjwwgvvNj09PX5rwfHneY0NKhgBAgTaLfCpqqr+b875lfPz8//cbgrpCRAgQIAAAQIECBAgQIBAfQQUsOpzViYlQIAAAQIECBAgQIAAgZYJXHDBBTs2bNjwo0VRPD0iHh0Rvo5v2TMgLgECrRa4dPwWhdPT07/3whe+8MpWSwj/dQLj/yDIXAgQIECAAAECBAgQIEBgYgR843ZijsIgBAgQIECAAAECBAgQIEAgYvfu3Zu2bt362BveXvAnImIrFwIECBBotUCVc/7boih+/+jRo3906NChL7daQ3gCBAgQIECAAAECBAgQIDCBAgpYE3goRiJAgAABAgQIECBAgACB1gmkXq/3vTnnp6eUnhQRO1onIDABAgQILEdgIef8+qmpqT/YtGnT28qyXFrOTa4hQIAAAQIECBAgQIAAAQIEVldAAWt1fa1OgAABAgQIECBAgAABAgS+oUC3271zRPxUSumnI+KeqAgQIECAwHIFcs5XpZReFRGXDAaDDy/3PtcRIECAAAECBAgQIECAAAECKy+ggLXyplYkQIAAAQIECBAgQIAAAQLfUKAsy40LCwuPi4inR8SPR8Q0LgIECBAgcDoCVVW9ryiKVx4/fvyVBw8e/OLprOVeAgQIECBAgAABAgQIECBA4OQFFLBO3swdBAgQIECAAAECBAgQIEDgpAX27dt33mg0ekZK6ZkR8c0nvYAbCBAgQIDArQssRsQbR6PR4fn5+T+PiHzrt7iCAAECBAgQIECAAAECBAgQOF0BBazTFXQ/AQIECBAgQIAAAQLLFhh/AeKngMvmcmEDBC644IIdmzdv/p9VVY2LV+c3IJIIBAgQIFAfgctSSn944sSJlx84cOBj9RnbpAQIECBAgAABAgQIECBAoH4CClj1OzMTEyBAgAABAgQIECBAgMCEC3Q6nfOLonhORDwpIjZP+LjGI0CAAIFmCyxVVfXWoiguueKKK9505MiRUbPjSkeAAAECBAgQIECAAAECBNZeQAFr7c3tSIAAAQIECBAgQIAAAQINFNi9e/dttm3b9uSc889FxHc0MKJIBAgQIFBzgZzzf0TE76eUXjoYDD5e8zjGJ0CAAAECBAgQIECAAAECEyOggDUxR2EQAgQIECBAgAABAgQIEKijQL/f/86qqnallJ4aEdvrmMHMBAgQINA6gVHO+a1VVf3m/Pz8n3uX6Nadv8AECBAgQIAAAQIECBAgsMICClgrDGo5AgQIECBAgAABAgQIEGi+QFmWm48ePfqEoih2RcRjmp9YQgIECBBosMBlKaVLUkq/MzMz84UG5xSNAAECBAgQIECAAAECBAismoAC1qrRWpgAAQIECBAgQGAsMP4PzoyCAAECDRHodrvfllJ6bkQ8PSJ2NCSWGAQIECBAYCxwLCL+KOf828Ph8B+QECBAgAABAgQIECBAgAABAssXUMBavpUrCRAgQIAAAQIECBAgQKCdAqnT6TwupfTzKaXH3dAtbaeE1AQIECDQCoGqqv4+pXRo69atry7L8ngrQgtJgAABAgQIECBAgAABAgROQ0AB6zTw3EqAAAECBAgQIECAAAECzRUoy3L74uLiU6uqen5K6b7NTSoZAQIECBC4eYGc81UR8fITJ04cOnjw4Kc4ESBAgAABAgQIECBAgAABAjcvoIDlySBAgAABAgQIECBAgAABAl8l0O/3z6mqaldK6dkRcRYcAgQIECBAIMavgvWGnPNvDIfD9/AgQIAAAQIECBAgQIAAAQIEvlZAAcsTQYAAAQIECBAgQIAAAQIEIqLX6z08Ip4fEU+MiCkoBAgQIECAwNcLVFX1voh48bZt2/6wLMslRgQIECBAgAABAgQIECBAgECEApangAABAgQIECBAgAABAgRaK7B79+5NmzdvflpK6Re8zWBrHwPBCRAgQOAUBHLOV6aUXhIRlwwGgy+dwhJuIUCAAAECBAgQIECAAAECjRFQwGrMUQpCgAABAgQIECBAgAABAssVuOCCC3Zs2rTpOTnn56eU7rjc+1xHgAABAgQIfJ3AtRHxu0tLSwcPHDjwMT4ECBAgQIAAAQIECBAgQKCNAgpYbTx1mQkQIECAAAECBAgQINBSgU6nc/bU1NS4ePXzEbGjpQxiEyBAgACB1RCocs5vKYriBbOzs3+/GhtYkwABAgQIECBAgAABAgQITKqAAtaknoy5CBAgQIAAAQIECBAgQGDFBPbu3fvtRVHsTSk9OSI2rNjCFiJAgAABAgS+TiDn/O6U0mAwGLwpIjIiAgQIECBAgAABAgQIECDQdAEFrKafsHwECBAgQIAAAQIECBBosUCv13t4zrmXUvqRiPA1cIufBdEJECBAYF0E/rGqqoPbtm37w7Isl9ZlApsSIECAAAECBAgQIECAAIE1EPDN5zVAtgUBAgQIECBAgAABAgQIrJ1AWZbF4uLizpxzPyIesHY724kAAQIECBC4OYGc8xURcWDr1q2vKMvyGCUCBAgQIECAAAECBAgQINA0AQWspp2oPAQIECBAgAABAgQIEGipwK5duzbc9ra3fVpRFOPi1be1lEFsAgQIECAwyQKfi4gXX3/99S+5+OKLr5nkQc1GgAABAgQIECBAgAABAgRORkAB62S0XEuAAAECBAgQIECAAAECEydQluXGo0ePPrkoil+OiHtO3IAGIkCAAAECBG4qcG3O+eU555m5ubnP4CFAgAABAgQIECBAgAABAnUXUMCq+wmewvzjQ8+ncJ9bCBAgQIAAAQIECBAgMEkCe/fu3TY1NfWsiOhExJ0maTazECBAgAABArcukHM+GhGXRMRgOBx++tbvcAUBAgQIECBAgAABAgQIEJhMAQWsyTwXUxEgQIAAAQIECBAgQIDANxDodrtnpJSeGRHjtxo8GxQBAgQIECBQe4Hrc86/FxG/PhwOP1n7NAIQIECAAAECBAgQIECAQOsEFLBad+QCEyBAgAABAgQIECBAoJ4C+/btu11VVb8QEc+LiNvUM4WpCRAgQIAAgVsQuD4ifndpaWlw4MCBj5EiQIAAAQIECBAgQIAAAQJ1EVDAqstJmZMAAQIECBAgQIAAAQItFej3+2dWVbUnpXRBRJzRUgaxCRAgQIBAmwRORMQrU0ozs7Oz/96m4LISIECAAAECBAgQIECAQD0FFLDqeW6mJkCAAAECBAgQIECAQOMFyrLcvri4+Nyccy8izmx8YAEJECBAgACBmwpUEfG6qqr2zc3NXY6HAAECBAgQIECAAAECBAhMqoAC1qSejLkIECBAgAABAgQIECDQUoG9e/dum56efl7OuRsRZ7WUQWwCBAgQIEDgvwVO5JxffuLEiRccPHjwU2AIECBAgAABAgQIECBAgMCkCShgTdqJmGcdBcb/d8jruL+tCRAgQIAAAQIECLRboCzLrQsLC8+OiH5EnN1uDekJECBAgACBmxE4nnN+xfT0dLl///7/IESAAAECBAgQIECAAAECBCZFQAFrUk7CHAQIECBAgAABAgQIEGipQFmWGxcXF3+6qqoypXTHljKITYAAAQIECCxTIOd8NCIumZ6e3r9///7PLvM2lxEgQIAAAQIECBAgQIAAgVUTUMBaNVoLEyBAgAABAgQIECBAgMAtCZRlOb24uPjMnPOvRsS30CJAgAABAgQInKTAl1NKB3POBweDwZdO8l6XEyBAgAABAgQIECBAgACBFRNQwFoxSgsRIECAAAECBAgQIECAwDIFUrfb/YmU0osi4l7LvMdlBAgQIECAAIFvJPDFiJjbsmXLi8uyPIaJAAECBAgQIECAAAECBAistYAC1lqL248AAQIECBAgQIAAAQItFuh0OuenlAYppfNbzCA6AQIECBAgsDoCn04p/drmzZt/tyzLpdXZwqoECBAgQIAAAQIECBAgQODrBRSwPBUECBAgQIAAAQIECBAgsOoCe/fuvd/U1NSvRMTOVd/MBgQIECBAgECrBaqq+khE/Mrc3NxrIyK3GkN4AgQIECBAgAABAgQIEFgTAQWsNWG2CQECBAgQIECAAAECBNopcOGFF95tamrqopTSsyKiaKeC1AQIECBAgMA6Cbw3IrqDweAd67S/bQkQIECAAAECBAgQIECgJQIKWC05aDEJECBAgAABAgQIECCwlgKdTufsoijGr3g1Ll5tWMu97UWAAAECBAgQuInA64ui2DczMzN+ZSwfBAgQIECAAAECBAgQIEBgxQUUsFac1IIECBAgQIAAAQIECBBor0BZlhsXFhZ+NiJeEBG3aa+E5AQIECBAgMCECVQ551dFRH84HH56wmYzDgECBAgQIECAAAECBAjUXEABq+YHaHwCBAgQIECAAAECBAhMiEDq9XpPiYiZiLjrhMxkDAIECBAgQIDATQWORcRvbNmyZVCW5XV4CBAgQIAAAQIECBAgQIDASggoYK2EojUIECBAgAABAgQIECDQYoFut/vQ8Q8yU0rnt5hBdAIECBAgQKBGAjnn/yiKorz88ssvOXLkyKhGoxuVAAECBAgQIECAAAECBCZQQAFrAg/FSAQIECBAgAABAgQIEKiDwC/+4i/e5cSJEy9KKf1kRPj6sg6HZkYCBAgQIEDgpgLvr6rqF+bm5v4aDQECBAgQIECAAAECBAgQOFUB3yA/VTn3ESBAgAABAgQIECBAoKUCZVluX1xc3Jtz7kXE5pYyiE2AAAECBAg0SCDn/Kac8wVzc3OXNyiWKAQIECBAgAABAgQIECCwRgIKWGsEbRsCBAgQIECAAAECBAjUXaAsy+mFhYVnR8SvRcQ31z2P+QkQIECAAAECNxG4Pud88cLCwv5Dhw59mQ4BAgQIECBAgAABAgQIEFiugALWcqVcR4AAAQIECBAgQIAAgRYL9Hq9R6SUDuWcv73FDKITIECAwLoJZO92u272rdz4CxHx61dcccVLjhw5MmqlgNAECBAgQIAAAQIECBAgcFICClgnxeViAgQIECBAgAABAgQItEtgz549d9qwYcNcSunJfvLdrrOXlgABAgQIEIh/SildMDs7+1csCBAgQIAAAQIECBAgQIDALQkoYHk+CBAgQIAAAQIECBAgQODrBHbt2rXhzDPP/Lnxqz9ExBmICBDw6jueAQIECLRVIOf8ppTScweDwcfbaiA3AQIECBAgQIAAAQIECNyygAKWJ4QAAQIECBAgQIAAAQIEvkag2+0+OqX04og4Dw0BAgQIECBAgMBXBI6llOaOHj06c+jQoeuZECBAgAABAgQIECBAgACBrxZQwPI8ECBAgAABAgQIECBAgMBXBDqdzrlFUcxExE4kBAgQIECAAAECNyvwbxHx/MFg8Kd8CBAgQIAAAQIECBAgQIDAjQIKWJ4FAgQIECBAgAABAgQItFxg796926anp/flnC+MiM0t5xCfAAECBAgQIHCrAjnn10TEhcPh8JO3erELCBAgQIAAAQIECBAgQKDxAgpYjT9iAQkQIECAAAECBAgQIPCNBTqdzuOLojgUEXfnRIAAAQIECBAgcFIC3pbwpLhcTIAAAQIECBAgQIAAgeYKKGA192wlI0CAAAECBAgQIECAwDcU6Ha73xIRsymlp2MiQIAAAQIECBA4LYHLqqp6/tzc3J+c1ipuJkCAAAECBAgQIECAAIHaCihg1fboDE6AAAECBAgQIECAAIGTFyjLcvrYsWPPSym9ICLOOPkV3EGAAAECBAgQIHBzAjnnV+ecL5ibm/sMIQIECBAgQIAAAQIECBBol4ACVrvOW1oCBAgQIECAAAECBFos0O/3HzgajV5WFMVDWswgOgECBAgQIEBgNQW+FBG/umXLlkNlWVaruZG1CRAgQIAAAQIECBAgQGByBBSwJucsTEKAAAECBAgQIECAAIFVEej1erfNOb8gpfTciJhalU0sSoAAAQKV9DKvAAAgAElEQVQECBAg8F8COee/qarqf83Pz38ICwECBAgQIECAAAECBAg0X0ABq/lnLCEBAgQIECBAgAABAi0W6PV6T4iIl0bEnVvMIDoBAgQIECBAYD0ElnLOL62q6qL5+fmj6zGAPQkQIECAAAECBAgQIEBgbQQUsNbG2S4ECBAgQIAAAQIECBBYU4F+v3/3qqp+O6X0g2u6sc0IECBAgAABAgRuKnB5zvlnh8Phn6EhQIAAAQIECBAgQIAAgWYKKGA181ylIkCAAIGaCIz/RZxrMqsxCRAgQKA2Aqnf7z875zwfEWfUZmqDEiBAgAABAgSaL3BkNBo9b35+/qrmR5WQAAECBAgQIECAAAEC7RJQwGrXeUtLgAABAgQIECBAgECDBfbt23fv0Wj0Oyml8xscUzQCBAgQIECAQJ0FvlhVVWdubu7l/k5WnY/R7AQIECBAgAABAgQIEPhaAQUsTwQBAgQIECBAgAABAgRqLlCW5fTi4uKFOecyIjbXPI7xCRAgQIAAAQKNF8g5vzPn/DNzc3OXNT6sgAQIECBAgAABAgQIEGiBgAJWCw5ZRAIECBAgQIAAAQIEmiuwd+/eby+K4pKU0oObm1IyAgQIECBAgEAjBY6llF6wefPmubIsq0YmFIoAAQIECBAgQIAAAQItEVDAaslBi0mAAAECBAgQIECAQLMEyrLcvLi42M8574uIjc1KJw0BAgQIECBAoD0COee/mZqa+pmZmZmPtCe1pAQIECBAgAABAgQIEGiWgAJWs85TGgIECBAgQIAAAQIEWiDQ6/UeVlXVJUVR3LsFcUUkQIAAAQIECLRBYCGl9GuXX375/JEjR0ZtCCwjAQIECBAgQIAAAQIEmiSggNWk05SFAAECBAgQIECAAIFGC5RlufXYsWMzKaXnRUTR6LDCESBAgAABAgTaKfDeoiieOTMzc2k740tNgAABAgQIECBAgACBegooYNXz3ExNgAABAgQIECBAgEDLBPbt2/ddS0tLr/CqVy07eHEJECBAYFkCOSJ8o3NZVC6qh8CJnPNvbN269VfKsjxej5FNSYAAAQIECBAgQIAAgXYL+L5Eu89fegIECBAgQIAAAQIEJlygLMuNi4uLZc65GxFTEz6u8QgQIECAAAECBFZO4P0R8dODweCDK7eklQgQIECAAAECBAgQIEBgNQQUsFZD1ZoECBAgQIAAAQIECBBYAYG9e/feb2pq6vcj4oErsJwlCBAgQIAAAQIE6idwIqW0//LLL//1I0eOjOo3vokJECBAgAABAgQIECDQDgEFrHacs5QECBAgQIAAAQIECNRIoCzL6cXFxQtzzr8WEZtqNLpRCRAgQIAAAQIEVkEg5/y3Oeefmpubu2wVlrckAQIECBAgQIAAAQIECJymgALWaQK6nQABAgQIECBAgAABAisp0Ol0zi2K4hUR8fCVXNdaBAgQIECAAIG2C+SIqPk3xI9FxEWDweDFETGO44MAAQIECBAgQIAAAQIEJkSg5l9vToiiMQgQIECAAAECBAgQIHD6Aqnf7z+7qqrfSCltO/3lrECAAAECBAgQINBQgT89fvz4zxw8ePBTDc0nFgECBAgQIECAAAECBGonoIBVuyMzMAECBAgQIECAAAECTRPodDpnp5RenlL6waZlk4cAAQIECBAgQGBVBK6JiN2DweAPVmV1ixIgQIAAAQIECBAgQIDASQkoYJ0Ul4sJECBAgAABAgQIECCwsgLdbveJKaXDEXG7lV3ZagQIECBAgAABAi0QOHL8+PHnHDx48IstyCoiAQIECBAgQIAAAQIEJlZAAWtij8ZgBAgQIECAAAECBAg0WaAsy+0LCwu/GRHPbHJO2QgQIECAAAECBFZd4JMppZ+anZ39i1XfyQYECBAgQIAAAQIECBAgcLMCClgeDAIECBAgQIAAAQIECKyxQL/ff0jO+VUR8a1rvLXtCBAgQIAAAQIEmimQc86Htm7d2inL8ngzI0pFgAABAgQIECBAgACByRVQwJrcszEZAQIECBAgQIAAAQINEyjLslhYWNgdEcOI2NiweOIQIECAAAECBAiss0DO+R9yzk+dm5u7bJ1HsT0BAgQIECBAgAABAgRaJaCA1arjFpYAAQIECBAgQIAAgfUS6PV6d42IV0bEI9ZrBvsSIECAAAECBAi0QmAhIvYNBoPx2137IECAAAECBAgQIECAAIE1EFDAWgNkWxAgQIAAAQIECBAg0G6BTqezsyiKl0XEme2WkJ4AAQIECBAgQGANBV6XUnr27Ozs1Wu4p60IECBAgAABAgQIECDQSgEFrFYeu9AECBAgQIAAAQIECKyFQFmW2xcWFn4rIp6xFvvZgwABAgQIECBAgMBNBD5aVdVPzs3NvZsMAQIECBAgQIAAAQIECKyegALW6tlamQABAgQIECBAgACBFgt0u937RMRrUkr3qyVDjghfMdby6AxNgAABAgQIELiJwCjnPH/NNdf88uHDh0/QIUCAAAECBAgQIECAAIGVF/Dt9JU3tSIBAgQIECBAgAABAi0X6Pf7u3LOF0fElpZTiE+AAAECBAgQIDA5Au/KOT9lOBx+cnJGMgkBAgQIECBAgAABAgSaIaCA1YxzlIIAAQIECBAgQIAAgQkQ6Ha7Z6SU/ndEPHUCxjECAQIECBAgQIAAgZsKfL4oip+amZl5CxoCBAgQIECAAAECBAgQWDkBBayVs7QSAQIECBAgQIAAAQItFuj3+w/MOb86Ir61xQyiEyBAgAABAgQITL5Azjkfuuaaa/Z6S8LJPywTEiBAgAABAgQIECBQDwEFrHqckykJECBAgAABAgQIEJhggU6n84yiKMavfOUtByf4nIxGgAABAgQIECDw3wI553eeOHHiKQcPHvwUFwIECBAgQIAAAQIECBA4PQEFrNPzczcBAgQIECBAgAABAi0W2L179222bNlyOKX0/7WYQXQCBAgQIECAAIH6Cnw+Ip4xGAzeWt8IJidAgAABAgQIECBAgMD6Cyhgrf8ZmIAAAQIECBAgQIAAgRoK9Pv9h1RV9eqU0j1qOL6RCRAgQIAAAQIECNwoUKWUZi6//PJfPXLkyAgLAQIECBAgQIAAAQIECJy8gALWyZu5gwABAgQIECBAgACBlgt4y8GWPwDiEyBAgAABAgSaKfCOnPNThsPhp5sZTyoCBAgQIECAAAECBAisnoAC1urZWpkAAQIECBAgQIAAgYYJ7NmzZ8vGjRtfGhE/3bBo4hAgQIAAAQIECBCInPNVEfHU4XD45zgIECBAgAABAgQIECBAYPkCCljLt3IlAQIECBAgQIAAAQItFuj1enetquq1RVE8pMUMohMgQIAAAQIECDRfYJRSeuHmzZtfUJZl1fy4EhIgQIAAAQIECBAgQOD0BRSwTt/QCgQIECBAgAABAgQINFyg1+v9SES8MiLObHhU8QgQIECAAAECBAh8RaCqqjeeOHHiGRdffPE1SAgQIECAAAECBAgQIEDglgUUsDwhBAgQIECAAAECBAgQ+MYCqd/vd3PO+yOiAEWAAAECBAgQIECgZQKXjUajJ87Pz3+oZbnFJUCAAAECBAgQIECAwEkJKGCdFJeLCRAgQIAAAQIECBBoi8C+fftuV1XVqyLicW3JLCcBAgQIECBAgACBmxG4LiJ+ZjAYvIYOAQIECBAgQIAAAQIECNy8gAKWJ4MAAQIECBAgQIAAAQI3Eeh0Og9KKb02pXQPOAQIECBAgAABAgQIROScD19zzTXPO3z48AkeBAgQIECAAAECBAgQIPC1AgpYnggCBAgQIECAAAECBAh8lUCn03lmURQvjYhNYAgQIECAAAECBAgQ+BqBvxyNRk+en5+/igsBAgQIECBAgAABAgQI/LeAApangQABAgQIECBAgAABAhFRluX0sWPHXphS6gEhQIAAAQIECBAgQOAbCnwq5/yk4XD4HkYECBAgQIAAAQIECBAg8J8CClieBAIECBAgQIAAAQIEWi9w4YUXftP09PRrIuL7Wo8BgAABAgQIECBAgMCtC1yfc/7Z4XD48lu/1BUECBAgQIAAAQIECBBovoACVvPPWEICBAgQIECAAAECBG5BoNfr3T/n/IaU0j1AESBAgAABAgQIECCwfIGc8+FrrrnmeYcPHz6x/LtcSYAAAQIECBAgQIAAgeYJKGA170wlIkCAAAECBAgQIEBgmQKdTufxRVG8KiJus8xbXEaAAAECBAgQIECAwNcKvC2l9OTZ2dmrwRAgQIBAAwXGP03ODcwlEgECBAgQWGEBBawVBrUcAQIECBAgQIAAAQK1EEj9fr+bc94fEUUtJjYkAQIECBAgQIAAgckV+PeiKH5sZmbm0skd0WQECBAgQIAAAQIECBBYPQEFrNWztTIBAgQIECBAgAABAhMoUJbl9mPHjv1eSumJEziekQgQIECAAAECBAjUVeDaiHj6YDB4Q10DmJsAAQIECBAgQIAAAQKnKqCAdapy7iNAgAABAgQIECBAoHYCnU7n3JTS61NK96vd8AYmQIAAAQIECBAgMPkCOaX0gtnZ2V/zhlWTf1gmJECAAAECBAgQIEBg5QQUsFbO0koECBAgQIAAAQIECEywQKfTeWRRFK+LiNtN8JhGI0CAAAECBAgQIFB7gZTSqzZv3vyssiwXax9GAAIECBAgQIAAAQIECCxDQAFrGUguIUCAAAECBAgQIECg3gKdTueni6J4WURsrHcS0xMgQIAAAQIECBCojcDf5Zx/fDgcfro2ExuUAAECBAgQIECAAAECpyiggHWKcG4jQIAAAQIECBAgQKAWAqnf7/9qzvlXazGtIQkQIECAAAECBAg0S+DTVVU9YW5u7v3NiiUNAQIECBAgQIAAAQIEvlZAAcsTQYAAAQIECBAgQIBAIwXKstx87Nix300pPaWRAYUiQIAAAQIECBAgUA+B6yLiqYPB4I31GNeUBAgQIECAAAECBAgQOHkBBayTN3MHAQIECBAgQIAAAQITLnDRRRfd8cSJE28oiuIhEz6q8QgQIECAAAECBAi0QWCUc/6F4XD44jaElZEAAQIECBAgQIAAgfYJKGC178wlJkCAAAECBAgQINBogV6vd/+U0htzzndrdFDhCBAgQIAAAQIECNRMIOd8eOvWrc8ty3KpZqMblwABAgQIECBAgAABArcooIDlASFAgAABAgQIECBAoDECvV7vcRHxmoi4TWNCCUKAAAECBAgQIECgWQJ/euzYsf956NChLzcrljQECBAgQIAAAQIECLRZQAGrzacvOwECBAgQIECAAIEGCfT7/V0559+KiOkGxRKFAAECBAgQIECAQBMFPhgRjx8MBh9vYjiZCBAgQIAAAQIECBBon4ACVvvOXGICBAgQIECAAAECjRLYuXPn1N3vfvffLIriuY0KJgwBAgQIECBAgACBZgt8qqqqH52bm3t/s2NKR4AAAQIECBAgQIBAGwQUsNpwyjISIECAAAECBAgQaKjAnj17tmzcuPFVEfHjDY0oFgECBAgQIECAAIEmC1wXEU8eDAZvbnJI2QgQIECAAAECBAgQaL6AAlbzz1hCAgQIECBAgAABAo0U2LNnz1kbNmx4fUrpexsZUCgCBAgQIECAAAEC7RAYRcRzB4PBy9oRV0oCBAgQIECAAAECBJoooIDVxFOViQABAgQIECBAgEDDBfr9/t1Ho9Fbi6K4d8OjikeAAAECBAgQIECgFQI558FwOOy3IqyQBAgQIECAAAECBAg0TkABq3FHKhABAgQIECBAgACBZgvs3bv326empt4SEXdqdlLpCBAgQIAAAQIECLRO4BVXX331rsOHD59oXXKBCRAgQIAAAQIECBCotYACVq2Pz/AECBAgQIAAAQIE2iWwd+/ex0xNTb0uIm7TruTSEiBAgAABAgQIEGiNwNtyzk8aDofXtiaxoAQIECBAgAABAgQI1F5AAav2RygAAQIECBAgQIAAgXYIdLvdn0op/Z+I2NCOxFISIECAAAECBAgQaKdAVVV/n3N+/Pz8/FXtFJCaAAECBAgQIECAAIG6CShg1e3EzEuAAAECBAgQIECghQL9fr+Xc56JCF/DtPD8RSZAgAABAgQIEGifQM75ipzzD87NzV3WvvQSEyBAgAABAgQIECBQNwE/vKjbiZmXAAECBAgQIECAQIsEdu7cOXXOOef8dkQ8u0WxRSVAgAABAgQIECBA4D8FPlNV1Y/Mzc29HwgBAgQIECBAgAABAgQmWUABa5JPx2wECBAgQIAAAQIEWiywe/fuTVu3bn1VRPxEixlEJ0CAAAECBAgQINB2gWtHo9ET5+fn3952CPkJECBAgAABAgQIEJhcAQWsyT0bkxEgQIAAAQIECBBorcDevXu3TU1NvS4iHtdaBMEJECBAgAABAgQIELhR4HjO+WnD4fC1SAgQIECAAAECBAgQIDCJAgpYk3gqZiJAgAABAgQIECDQYoF+v39mVVVvTil9T4sZRCdAgAABAgQIECBA4GsFRiml58zOzv4OGAIECBAgQIAAAQIECEyagALWpJ2IeQgQIECAAAECBAi0WOCiiy6642g0+tOIuH+LGUQnQIAAAQIECBAgQODmBXLOuTccDucAESBAgAABAgQIECBAYJIEFLAm6TTMQoAAAQIECBAgQKDFAv1+/5yc89si4twWM4hOgAABAgQIECBAgMCtCOScB8PhsA+KAAECBAgQIECAAIFx7SdjmAABBawJOAQjECBAgAABAgQIEGi7QKfTeVBK6a0ppdu33UJ+AgQIECBAgAABAgRuXSDn/L+3bt363LIsq1u/2hUECBAgQIAAAQIECBBYXQEFrNX1tToBAgQIECBAgAABArci0Ov1HhERfxwRt4VFgAABAgQIECBAgACBkxD4o6uvvvoZhw8fPnES97iUAAECBAgQIECAAAECKy6ggLXipBYkQIAAAQIECBAgQGC5Ap1O5/FFUbwmIrYs9x7XESBAgAABAgQIECBA4EaBnPNbtm7durMsy2NUCBAgQIAAAQIECBAgsF4CCljrJW9fAgQIECBAgAABAi0X6HQ6TymK4vcjYrrlFOITIECAAAECBAgQIHAaAjnndy4sLDz+0KFDXz6NZdxKgAABAgQIECBAgACBUxZQwDplOjcSIECAAAECBAgQIHCqAt1u92kppVcoX52qoPsIECBAgAABAgQIEPhqgaqq3jc9Pf24mZmZL5AhQIAAAQIECBAgQIDAWgsoYK21uP0IECBAgAABAgQItFyg3+/vyjn/dkQULacQnwABAgQIECBAgACBlRX4x6IoHjszM/O5lV3WagQIECBAgAABAgQIELhlAQUsTwgBAgQIECBAgAABAmsm0O12fy6l9JKI8LXImqnbiAABAgQIECBAgECrBP4l5/yY4XD46ValFpYAAQIECBAgQIAAgXUV8EOPdeW3OQECBAgQIECAAIH2CPT7/V7OebY9iSUlQIAAAQIECBAgQGCdBP71hhLWJ9dpf9sSIECAAAECBAgQINAyAQWslh24uAQIECBAgAABAgTWQ0D5aj3U7UmAAAECBAgQIECg1QIfTSk9enZ29opWKwhPgAABAgQIECBAgMCaCChgrQmzTQgQIECAAAECBAi0V6DX6/16RPxSewUkJ0CAAAECBAgQIEBgnQQ+fkMJ69/XaX/bEiBAgAABAgQIECDQEgEFrJYctJgECBAgQIAAAQIE1kEg9Xq9gxHx8+uwty0JECBAgAABAgQIECAwFvhMRDxmMBh8GAcBAgQIECBAgAABAgRWS0ABa7VkrUuAAAECBAgQIECgxQJlWRbHjh17WUrpWS1mEJ0AAQIECBAgQIAAgckQ+GxEPFoJazIOwxQECBAgQIAAAQIEmiiggNXEU5WJAAECBAgQIECAwPoKpG63+9KU0nPWdwy7EyBAgAABAgQIECBA4L8EPjcajb5/fn7+Q0wIECBAgAABAgRWUWDcQsmruL6lCUyogALWhB6MsQgQIECAAAECBAjUVED5qqYHZ2wCBAgQIECAAAECTRfIOV+VUvp+r4TV9JOWjwABAgQIECBAgMDaCyhgrb25HQkQIECAAAECBAg0VSD1er3fioifbWpAuQgQIECAAAECBAgQqLfAuIQ1NTX1fTMzM5fWO4npCRAgQIAAAQIECBCYJAEFrEk6DbMQIECAAAECBAgQqK9A6vf7L8k5/1x9I5icAAECBAgQIECAAIGWCHy2KIrvV8JqyWmLSYAAAQIECBAgQGANBBSw1gDZFgQIECBAgAABAgQaLqB81fADFo8AAQIECBAgQIBAAwU+m3P+vuFw+C8NzCYSAQIECBAgQIAAAQJrLKCAtcbgtiNAgAABAgQIECDQMIHU6XQOFUXx3IblEocAAQIECBAgQIAAgeYLfKYoivHbEX6k+VElJECAAAECBAgQIEBgNQUUsFZT19oECBAgQIAAAQIEmi2gfNXs85WOAAECBAgQIECAQBsEPllV1aPm5uYub0NYGQkQIECAAAECBAgQWB0BBazVcbUqAQIECBAgQIAAgaYLpG63++KU0vOaHlQ+AgQIECBAgAABAgSaLZBz/sT47QiVsJp9ztIRIECAwAoLjJsGeYXXtBwBAgRqLKCAVePDMzoBAgQIECBAgACBdRLwylfrBG9bAgQIECBAgAABAgRWTeCj09PTj3jRi170iVXbwcIECBAgQIAAAQIECDRWQAGrsUcrGAECBAgQIECAAIHVEej1ehdHxM+vzupWJUCAAAECBAgQIECAwLoJ/NvU1NQj9u/f/9l1m8DGBAgQIECAAAECBAjUUkABq5bHZmgCBAgQIECAAAEC6yPQ7/dfmHP+xfXZ3a4ECBAgQIAAAQIECBBYdYEPFkXxfTMzM19Y9Z1sQIAAAQIECBAgQIBAYwQUsBpzlIIQIECAAAECBAgQWF2Bbrd7QUrp4OruYnUCBAgQIECAAAECBAisu8A/Xn/99d938cUXX7PukxiAAAECBAgQIECAAIFaCChg1eKYDEmAAAECBAgQIEBgfQV6vd5zI+Il6zuF3QkQIECAAAECBAgQILA2Ajnnv9m6devjyrK8bm12tAsBAgQIECBAgAABAnUWUMCq8+mZnQABAgQIECBAgMAaCHQ6nWcURfHyiCjWYDtbECBAgAABAgQIECBAYFIE3r5ly5YnlGW5OCkDmYMAAQIECBAgQIAAgckUUMCazHMxFQECBAgQIECAAIGJEOh2u09MKb06IqYnYiBDECBAgAABAgQIECBAYA0Fqqp6w7Zt255UluXSGm5rKwIECBAgQIAAAQIEaiaggFWzAzMuAQIECBAgQIAAgbUS6Pf7j805/3FEbFqrPe1DgAABAgQIECBAgACBSRPIOb/2yiuvfPKRI0dGkzabeQgQIECAAAECBAgQmAwBBazJOAdTECBAgAABAgQIEJgogX6///055zdHxOaJGswwBAgQIECAAAECBAgQWAeBnPPh4XD4nIjI67C9LQkQIECAAAECBAgQmHABBawJPyDjESBAgAABAgQIEFhrgW63+90ppT+LiO1rvbf9CBAgQIAAAQIECBAgMMEC+weDwS9O8HxGI0CAAAECBAgQIEBgnQQUsNYJ3rYECBAgQIAAAQIEJlGg3+8/MOf8FxGxYxLnMxMBAgQIECBAgAABAgTWWeCCwWDwm+s8g+0JECBAgAABAgQIEJgwAQWsCTsQ4xAgQIAAAQIECBBYL4FOp3NuURTvioiz12sG+xIgQIAAAQIECBAgQGDCBXJVVc+cm5t7xYTPaTwCBAgQIECAAAECBNZQQAFrDbFtRYAAAQIECBAgQGBSBfbu3Xv7qampcfnqWyd1RnMRIECAAAECBAgQIEBgQgRORMSPDQaDt07IPMYgQIAAAQIECBAgQGCdBRSw1vkAbE+AAAECBAgQIEBgvQV27959m61bt/5VRDxwvWexPwECBAgQIECAAAECBGoicKyqqsfOzc29uybzGpMAAQIECBAgQIAAgVUUUMBaRVxLEyBAgAABAgQIEJh0gT179mzZuHHjn0TEIyZ9VvMRIECAAAECBAgQIEBgwgSuGY1Gj5yfn//nCZvLOAQIECBAgAABAgQIrLGAAtYag9uOAAECBAgQIECAwKQI7Ny5c+qcc855dUT8xKTMZA4CBAgQIECAAAECBAjUTOBTS0tL5x84cOBjNZvbuAQIECBAgAABAgQIrKCAAtYKYlqKAAECBAgQIECAQI0EUrfbPZxSelaNZjYqAQIECBAgQIAAAQIEJlHgstFo9PD5+fmrJnE4MxEgQIAAAQIECBAgsPoCClirb2wHAgQIECBAgAABAhMn0O/39+ec903cYAYiQIAAAQIECBAgQIBAPQXes2XLlkeXZXmsnuObmgABAgQIECBAgACB0xFQwDodPfcSIECAAAECBAgQqKFAt9v9uZTSb9VwdCMTIECAAAECBAgQIEBgYgVyzm+68sor/8eRI0dGEzukwQgQIECAAAECBAgQWBUBBaxVYbUoAQIECBAgQIAAgckU6HQ6TymK4g8iopjMCU1FgAABAgQIECBAgACBWgu8bDAYPKfWCQxPgAABAgQIECBAgMBJCyhgnTSZGwgQIECAAAECBAjUU6Db7f5ASunNEbGhnglMTYAAAQIECBAgQIAAgckXSCntnZ2dPTD5k5qQAAECBAgQIECAAIGVElDAWilJ6xAgQIAAAQIECBCYYIFer3ffiHhXROyY4DGNRoAAAQIECBAgQIAAgSYI5Jzz04fD4auaEEYGAgQIECBAgACBUxAYt3HyKdznltoKKGDV9ugMToAAAQIECBAgQGB5At1u91si4j0ppbss7w5XESBAgAABAgQIECBAgMBpCixGxA8MBoPxX4TxQYAAAQIECBAgQIBAwwUUsBp+wOIRIECAAAECBAi0W6Db7Z6RUnpHRDyg3RLSE6hSuvAAACAASURBVCBAgAABAgQIECBAYM0FvphzfthwOPzXNd/ZhgQIECBAgAABAgQIrKmAAtaactuMAAECBAgQIECAwNoJ7Nq1a8OZZ575xoh43NrtaicCBAgQIECAAAECBAgQuFEg53zl9PT09+zfv/+zVAgQIECAAAECBAgQaK6AAlZzz1YyAgQIECBAgACBlgv0er2XRsTPtpxBfAIECBAgQIAAAQIECKyrQM75H6qqetT8/PzRdR3E5gQIECBAgAABAgQIrJqAAtaq0VqYAAECBAgQIECAwPoJdLvdX04pvWD9JrAzAQIECBAgQIAAAQIECHyVwOu3bNnyE2VZVlQIECBAgAABAgQIEGiegAJW885UIgIECBAgQIAAgZYL9Hq9J0fEH0aE/95v+bMgPgECBAgQIECAAAECEyUwHAwGvYmayDAECBAgQIAAAQIECKyIgB/IrAijRQgQIECAAAECBAhMhkCn03lkURR/GhGbJmMiUxAgQIAAAQIECBAgQIDAjQIppf81Ozt7mAgBAgQIECBAgAABAs0SUMBq1nlKQ4AAAQIECBAg0GKBffv2nVdV1bsi4swWM4hOgAABAgQIECBAgACBSRY4kXN+3HA4/MtJHtJsBAgQIECAAAECBAicnIAC1sl5uZoAAQIECBAgQIDARArs3bv39lNTU++NiLtP5ICGIkCAAAECBAgQIECAAIEbBb5QVdV3zc3NXY6EAAECBAgQIECAAIFmCChgNeMcpSBAgAABAgQIEGixQFmWGxcXF9+Wc35kixlEJ0CAAAECBAgQIECAQG0Eqqr6yNTU1MNmZ2evrs3QBiVAgAABAgQIECBA4BsKKGB5OAgQIECAAAECBAjUXKDb7f6flNKzah7D+AQIECBAgAABAgQIEGibwJ9t2bLlh8uyXGpbcHkJECBAgAABAgQINE1AAatpJyoPAQIECBAgQIBAqwS63e6+lNL+VoUWlgABAgQIECBAgAABAg0RyDlfMhwO/YWahpynGAQIECBAgAABAu0VUMBq79lLToAAAQIECBAgUHOBffv2/XBVVX8cEVM1j2J8AgQIECBAgAABAgQItFagqqrnz83NHWotgOAECBAgQIAAAQIEGiCggNWAQxSBAAECBAgQIECgfQKdTucBRVG8MyK2ty+9xAQIECBAgAABAgQIEGiUwCjn/EPD4fDPGpVKGAIECBAgQIAAAQItElDAatFhi0qAAAECBAgQINAMgYsuuugOo9Ho7yLirs1IJAUBAgQIECBAgAABAgRaL3B1Sumhs7Oz/956CQAECBAgQIAAAQIEaiiggFXDQzMyAQIECBBorMD4v0xyY9MJRmBFBMqy3Hzs2LG/SCl9z4osaBECBAgQIECAAAECBAgQmBSBfzl27Nh3Hzp06MuTMpA5CBCYRAHfRJ3EUzETAQIECBBQwPIMECBAgAABAgQIEKiPQOr1er8fET9Zn5FNSoAAAQIECBAgQIAAAQInIfD6wWDwRH9F7STEXEqAAAECBAgQIEBgAgQUsCbgEIxAgAABAgQIECBAYDkCvV7vlyLi15dzrWsIECBAgAABAgQIECBAoJ4COedfGQ6Hvvar5/GZmgABAgQIECBAoKUCClgtPXixCRAgQIAAAQIE6iXQ7XZ/NKX0/yKiqNfkpiVAgAABAgQIECBAgACBkxTIKaWds7OzrzvJ+1xOgAABAgQIECBAgMA6CShgrRO8bQkQIECAAAECBAgsV2Dfvn33qqrq7yLitsu9x3UECBAgQIAAAQIECBAgUGuBayPiewaDwYdrncLwBAgQIECAAAECBFoioIDVkoMWkwABAgQIECBAoJ4C3W73jJTSeyLivHomMDUBAgQIECBAoK0COSJ8+7Wtpy83gRUS+Lfrr7/+uy6++OJrVmg9yxAgQIAAAQIECBAgsEoCvgOwSrCWJUCAAAECBAgQILACAqnb7b4mpfSkFVjLEgQIECBAgAABAgQIECBQP4G3XXHFFT985MiRUf1GNzEBAgQIECBAgACB9ggoYLXnrCUlQIAAAQIECBComUC32/3llNILaja2cQkQIECAAAECBAgQIEBgZQVeOBgMfnlll7QaAQIECBAgQIAAAQIrKaCAtZKa1iJAgAABAgQIECCwQgKdTufxRVG8ISKKFVrSMgQIECBAYFIFvhwRt/SqHhsiYvukDm8uAgQIECCwBgJVVVU/Njc396Y12MsWBAgQIECAAAECBAicgoAC1imguYUAAQIECBAgQIDAagrs27fvXlVVvTcidqzmPtYmQIAAAQInKXAiIr6Qc/5CSukLN/4+Ir5UFMV1OefrUkrjMtWXUkrXVlU1/uejOefFlNJCznlp/OeLi4v54osvvuYk9/6vy/fs2bNl06ZNm8d/UFXVtqIoxr+/bc55y2g02lwUxY6U0uaU0taIOLOqqjPHv6aUxr/uyDnf+Puzxn9+qnO4jwABAgQIrLHA1SmlB8/Ozl6xxvvajgABAgQIECBAgACBZQgoYC0DySUECBAgQIAAAQIE1kqg2+2ekVJ6T0Sct1Z72ocAAQIEWi2QI+KzEfGZnPOnUkqfHf86/ueU0qdyzuN//tzi4uLnDh06NC5XNepj165dG7Zt23b76enpO0xPT5+9tLR0+6mpqTvknM+OiNtHxF1v+LxjRIxficsHAQIECBBYT4EPbNmy5WFlWS6u5xD2JkCAAAECBAgQIEDg6wUUsDwVBAgQIECAAAECBCZHIHW73demlJ44OSOZhAABAgRqLjB+a79xkepjEfHR8WfO+aMppY8VRfGxzZs3f7wsy+M1z7jq4+/cuXPqzne+89kbN268W0TcOaV0l5zz3XLO56aUzo2Ie0TExlUfxAYECBAgQCDidweDwc+AIECAAAECBAgQIEBgsgQUsCbrPExDgAABAgQIECDQYoFer3dRRLyoxQSiEyBAgMCpC3wyIi7LOV+WUrps/PuiKC677rrrLj906ND1p76sO5cjMC5onXvuuXdZWlq659TU1LlVVd2zKIp7RsT9bihnTS1nHdcQIECAAIHlCOScnzUcDi9ZzrWuIUCAAAECBAgQIEBgbQQUsNbG2S4ECBAgQIAAAQIEblGg2+3+QErpTyKiQEWAAAECBL6RQM75EymlS6uq+uD416IoPrS0tHTp/Pz8UWqTKVCW5ebFxcX75JzvW1XVfSPiviml8efd/Xt/Ms/MVAQIEKiBwGJVVefPzc29vwazGpEAAQIECBAgQIBAKwQUsFpxzEISIECAAAECBAhMssCePXvutHHjxg9ExDdP8pxmI0CAAIE1FRj/YHVcsvpASmn8w9UPRsSHB4PBl9Z0CputmkBZllvHxayqqu6XUjov5/yVXyNi/DaHvme3avIWJkCAQDMEcs5XFkXxnbOzs1c3I5EUBAgQIECAAAECBOot4Js59T4/0xMgQIAAAQIECNRcYNeuXRt27Njxlyml82sexfgECBAgcOoC10XEuGT1gZzzB6qq+sD27dsvLcty6dSXdGddBcqy3H7DK2Y9IOf84JTSQ254K8MNdc1kbgIECBBYHYGc85u3bt36o2VZVquzg1UJECBAgAABAgQIEFiugALWcqVcR4AAAQIECBAgQGAVBDqdzlxRFHtXYWlLEiBAgMBkCuSI+EhEvDci3jP+vOKKKz505MiR0WSOa6pJEBi/jeH111//HaPRaFzGevD4M6V074iYmoT5zECAAAEC6yeQc/6l4XD4ovWbwM4ECBAgQIAAAQIECIwFFLA8BwQIECBAgAABAgTWSaDX6/1YRPw//12+TgdgWwIECKyBQM75aErpb3PO7yqKYvzre72N4BrAt2CL8StlLSwsPGhcxvqqV8q6Zwuii0iAAAECXyswfsXMRw8Gg3eAIUCAAAECBAgQIEBg/QQUsNbP3s4ECBAgQIAAAQItFuj3++fknN8XETtazCA6AQIEmijwxZTSu3LO7yyK4p2bNm16n7cSbOIxT2amfr9/ZlVV41fIemhEnJ9SenhEnDGZ05qKAAECBFZQ4JNLS0sPPHDgwOdXcE1LESBAgAABAgQIECBwEgIKWCeB5VICBAgQIECAAAECKyEwfhuhhYWFd0fE+FUrfBAgQIBAvQW+nFL6q6qq/ryqqr/Yvn37pWVZVvWOZPqmCOzcuXPqHve4xwNTSo9IKT0y5zwuZJ3VlHxyECBAgMB/C+Sc3zIcDh8fEeO3O/ZBgAABAgQIECBAgMAaCyhgrTG47QgQIECAAAECBAh0u92XpZR2kSBAgACBWgosVVX1Tymlt1dV9fbt27e/oyzL47VMYuhWCoxfhTMiHlNV1biM9aiU0l1aCSE0AQIEminQGQwG882MJhUBAgQIECBAgACByRZQwJrs8zEdAQIECBAgQIBAwwS63e7TUkp/0LBY4hAgQKDRAjnnKyLiLSmlt4xGo3fMz88fbXRg4Vol0O1273PDK2R9b875URFxp1YBCEuAAIFmCZzIOT9iOBy+p1mxpCFAgAABAgQIECAw+QIKWJN/RiYkQIAAAQIECBBoiMC+ffvOG41Gf5dS2taQSGIQIECgqQLXR8Q7Ukpvrapq/HY+/9rUoHIRuKlAp9M5d2pq6tE558dGxKMjYgclAgQIEKiVwEdTSg+anZ29ulZTG5YAAQIECBAgQIBAzQUUsGp+gMYnQIAAAQIECBCoh8CePXu2bNiw4e9TSvf9/9m7F/g46nL/488zm6ZNqtAiIl5ALBUERVQUEeF4vCAiIApGoU1DuVgVrTZ2d2ZDUQelzc5sMGAFtFykTSlgBFQUlD8er6CACiqIKLYiCgpCodKkTbPz/F/LqQgHpbnsZS6fvF6+PB5mfs/3+/6NtW1+2UlGYlIigAACmRN4UESuFpFvVCqV6/mUq8ztP4X/jUBHR0fuxS9+8f6O41QPYx2qqvuLSA4sBBBAAIHYC1wVBMExImKxT0pABBBAAAEEEEAAAQRSIsABrJRsJDUQQAABBBBAAAEE4i3ged4XReSD8U5JOgQQQCBbAma2TlW/JiJfW7t27Q2Dg4OVbAnQFoHxCSxatGhGa2vr21T1cDN7p6ruNL4VuBoBBBBAoFECURR9rFwuL2/UPOYggAACCCCAAAIIIJB1AQ5gZf0JoD8CCCCAAAIIIIBA3QVc1z1aVa+o+yAGIIAAAgiMReDXZnaFmX29XC7fNpYbuAYBBJ4u4Pu+MzQ0VP10rCPM7HAReRVOCCCAAAKxEtgcRdGB5XL5F7FKRRgEEEAAAQQQQAABBFIqwAGslG4stRBAAAEEEEAAAQTiIeB53q4iUv0G/8x4JCIFAgggkD0BM7vDzL7S0tLyld7e3t9mT4DGCNRfYMmSJbtUKpXqJ2O9W0TeLCKt9Z/KBAQQQACBbQjcValU9uPVyjwnCCCAAAIIIIAAAgjUX4ADWPU3ZgICCCCAAAIIIIBARgWqnwwxPDx8/dZvQmZUgdoIIIBAcwSqrxcUkatVdTAIgh83JwVTEcimQD6fn57L5d5iZh2qWj2Q9exsStAaAQQQaL6Ama0Iw/CDzU9CAgQQQAABBBBAAAEE0i3AAax07y/tEEAAAQQQQAABBJooUCwWfTP7dBMjMBoBBBDImsB9URStcRxndRAEv8xaefoiEEeB7u7uttbW1reb2XtU9V18Kmgcd4lMCCCQdoFKpXJ0X1/fVWnvST8EEEAAAQQQQAABBJopwAGsZuozGwEEEEAAAQQQQCC1AoVC4WDHcb4nIrnUlqQYAgggEA+BYRH5pogMtLW1Xev7/mg8YpECAQT+r0BHR0fuxS9+8Zsdx+lS1aNEZDuUEEAAAQQaIrC+paVl36VLl97bkGkMQQABBBBAAAEEEEAggwIcwMrgplMZAQQQQAABBBBAoL4CxWJxZhRFv1TVXeo7idURQACBzApEIvJdMxuIoujKvr6+jZmVoDgCCRXwfX/a0NDQO0Xk/ap6hIi0J7QKsRFAAIGkCFzf1tZ2qO/71d9H8YUAAggggAACCCCAAAI1FuAAVo1BWQ4BBBBAAAEEEEAAAdd1r1DVo5FAAAEEEKitgKreE0XRl1X1y0EQ/Km2q7MaAgg0SyCfz0+vvp5QVTtV9e0i0tKsLMxFAAEE0iygqvlSqXRmmjvSDQEEEEAAAQQQQACBZglwAKtZ8sxFAAEEEEAAAQQQSKVAsVj8kJmdl8pylEIAAQSaI7BZRL5RfcXg2rVrrxkcHKw0JwZTEUCgEQLd3d07TJ069b1RFFVfU/jGRsxkBgIIIJAhgc1RFB1QLpdvy1BnqiKAAAIIIIAAAggg0BABDmA1hJkhCCCAAAIIIIAAAlkQ6Onp2TuKop+JSFsW+tIRAQQQqLPAnSLyJcdxVvf29j5U51ksjwACMRTwPO/lItIlInNE5EUxjEgkBBBAIIkCvxkZGXltf3//cBLDkxkBBBBAAAEEEEAAgbgKcAArrjtDLgQQQAABBBBAAIFECfi+37Jx48YbHcd5XaKCExYBBBCIl0DFzK6Noujsvr6+74qIxSseaRBAoBkCvu87jz322FtyudwCETlKRFqbkYOZCCCAQFoEVPXcUqn0kbT0oQcCCCCAAAIIIIAAAnEQ4ABWHHaBDAgggAACCCCAAAKJFygWi2eY2ZLEF6EAAggg0ByB+8xshYicH4bhfc2JwFQEEEiCQD6f36mlpWWemZ0kInslITMZEUAAgRgKVA+5HxkEwbdimI1ICCCAAAIIIIAAAggkUoADWIncNkIjgAACCCCAAAIIxEkgn8+/IZfL/UhEcnHKRRYEEEAgAQI/NLPl7e3tX/N9fzQBeYmIAAIxEigUCm9U1ZNU9f0i0h6jaERBAAEEYi9gZvfncrl9eNVz7LeKgAgggAACCCCAAAIJEeAAVkI2ipgIIIAAAggggAAC8RTI5/PTc7ncrSLy0ngmJBUCCCAQO4EREfm6mX0uDMOfxi4dgRBAIHECCxcu3G769OnHRlG0UFVfkbgCBEYAAQSaJ3BVEARHN288kxFAAAEEEEAAAQQQSI8AB7DSs5c0QQABBBBAAAEEEGiCgOu6X1LVBU0YzUgEEEAgaQIPmtlFIvKFMAz/nLTw5EUAgWQIeJ53kIh8TETeLSJTkpGalAgggEDzBFT12FKpdHnzEjAZgbQIVL/lWn27J18IIIAAAgggkFUBDmBldefpjQACCCCAAAIIIDBpAc/zDheRq0WE31dPWpMFEEAgxQK/qX7aVXt7+yW+729KcU+qIYBAjAS6u7tfOGXKlA9uPSj/vBhFIwoCCCAQN4GHqq8iXLZs2f1xC0YeBBBAAAEEEEAAAQSSJMA3ipK0W2RFAAEEEEAAAQQQiI3A4sWLd2xpafm1iOwcm1AEQQABBGIkEEXRz0Xk83/84x8vGRwcrMQoGlEQQCBDAr7vt27cuPEox3HyIrJ/hqpTFQEEEBiPwHVBELyDj+8ZDxnXIoAAAggggAACCCDwVAEOYPFEIIAAAggggAACCCAwAQHP874iIh0TuJVbEEAAgVQLmNkNqhoEQVD9hEC+EEAAgdgIPOn1hEeLSC42wQiCAAIIxEAgiqKTyuVy9XXRfCGAAAIIIIAAAggggMAEBDiANQE0bkEAAQQQQAABBBDItoDruser6sXZVqA9Aggg8BSBLWZ2WRRFYV9f3+3YIIAAAnEWKBQKL1XVj4nICao6Pc5ZyYYAAgg0UGDD6OjoK88888x7GjiTUQgggAACCCCAAAIIpEaAA1ip2UqKIIAAAggggAACCDRCYPHixS9uaWn5pYhs34h5zEAAAQRiLjAiIiunTJnSe8YZZ6yLeVbiIYAAAk8RqL5SesqUKR81s4+KyHPgQQABBLIuEEXR/5TL5bfxKsKsPwn0RwABBBBAAAEEEJiIAAewJqLGPQgggAACCCCAAAJZFVDP874tIm/PKgC9EUAAga0CI2Z2uZmdXi6X/4AKAgggkGSBfD4/PZfLnSwinxCRXZPchewIIIDAZAXM7ONhGH5+sutwPwIIIIAAAggggAACWRPgAFbWdpy+CCCAAAIIIIAAAhMWKBaLC8zsSxNegBsRQACB5AtUD15VX8H62TAM/5z8OjRAAAEE/iWwYMGCKdtvv/1xquqq6suxQQABBDIqMKSq+5ZKpbsz2p/aCCCAAAIIIIAAAghMSIADWBNi4yYEEEAAAQQQQACBrAksWbJkl9HR0dtFZLusdacvAgggICKbRWRFLpfrXbZs2f2IIIAAAikX0Hw+/+5cLvcpEXlVyrtSDwEEEPh3At8LguCtvIqQhwMBBBBAAAEEEEAAgbELcABr7FZciQACCCCAAAIIIJBhAdd1r1HVwzJMQHUEEMimQCQiV6hqsVQqrc0mAa0RQCDLAvl8/m2qusxxnNdl2YHuCCCQSYEPBUHAJ0BncuspjQACCCCAAAIIIDARAQ5gTUSNexBAAAEEEEAAAQQyJeC67gmqelGmSlMWAQSyLmAi8lUz+2QYhndlHYP+CCCAQPUgVi6XO0NEXo8GAgggkBGBDS0tLa9YunTpvRnpS00EEEAAAQQQQAABBCYlwAGsSfFxMwIIIIAAAggggEDaBVzXfYGqVl89ODPtXemHAAIIVAWiKLrazE7r6+v7FSIIIIAAAk8V8DzvsCiKPus4zn7YIIAAAmkXMLNrwjA8PO096YcAAggggAACCCCAQC0EOIBVC0XWQAABBBBAAAEEEEitgOd5V4nIu1NbkGIIIIDAVoEoim4RkUK5XP4BKAgggAACzyyw9ROx+kRkX6wQQACBNAuYWVcYhgNp7kg3BBBAAAEEEEAAAQRqIcABrFoosgYCCCCAAAIIIIBAKgU8z+sUEf6iOZW7SykEEPingKreU6lUPlUul6u/3lVfPcgXAggggMAYBHzfdzZu3HiM4zjLRGT2GG7hEgQQQCCJAg/ncrm9ly1b9rckhiczAggggAACCCCAAAKNEuAAVqOkmYMAAggggAACCCCQKIFCobCz4zjVVw8+J1HBCYsAAgiMXeDvURR9Zvr06V/yfX9k7LdxJQIIIIDAkwV8328dHh7+gJktUdXno4MAAgikTcDMvhqGYUfaetEHAQQQQAABBBBAAIFaCnAAq5aarIUAAggggAACCCCQGgHXda9Q1aNTU4giCCCAwL8ENkVRdNamTZt6ly9fvgEYBBBAAIHaCOTz+emquthxnIKIPKs2q7IKAgggEA8BMzsmDMMr45GGFAgggAACCCCAAAIIxE+AA1jx2xMSIYAAAggggAACCDRZwHXd96rqYJNjMB4BBBCoh8AVU6ZMKZxxxhnr6rE4ayKAAAIIiFQ/SVVVT1fVk0QkhwkCCCCQEoG/joyMvLy/v//hlPShBgIIIIAAAggggAACNRXgAFZNOVkMAQQQQAABBBBAIOkCCxcu3K69vf03IvLCpHchPwIIIPAkgTtFpDsIgu+gggACCCDQGIGenp6XVV/1KiK8tqsx5ExBAIH6C5wfBMGC+o9hAgIIIIAAAggggAACyRPgAFby9ozECCCAAAIIIIAAAnUU8DzvXBH5cB1HsDQCCCDQSIEHReSTa9euvWBwcLDSyMHMQgABBBD4X4FisfgWMztTRF6FSXwETET4y/H47AdJEiNQ/a/OfwVB8OPEJCYoAggggAACCCCAAAINEuDPmA2CZgwCCCCAAAIIIIBA/AXy+fwbcrlc9S+SnfinJSECCCDwjAKjZnbuyMjIp88666xHsEIAAQQQaK5AR0dHbtasWSeLyBkismNz0zAdAQQQmLiAmd3R3t7+Gt/3Rya+CncigAACCCCAAAIIIJA+AQ5gpW9PaYQAAggggAACCCAwAQHf91uGh4dv4ZMJJoDHLQggECsBM/uZ4zinlEql6q9pfCGAAAIIxEhg0aJFM1pbW4uq2i0irTGKRhQEEEBgPAJLgiBYNp4buBYBBBBAAAEEEEAAgbQLcAAr7TtMPwQQQAABBBBAAIExCbiu26Oq/AXymLS4CAEEYirwsIh8pq2tbbnv+1FMMxILAQQQQEBEXNfdU0T6VfUwQBBAAIEECmw2s33DMLwrgdmJjAACCCCAAAIIIIBAXQQ4gFUXVhZFAAEEEEAAAQQQSJJAoVDY3XGcX4tIW5JykxUBBBDYKlA9bPUlVV1SKpXWo4IAAgggkBwB13WPVtV+Edk1OalJigACCDwu8P+CIHg7FggggAACCCCAAAIIIPC/AhzA4klAAAEEEEAAAQQQyLyA53nXicghmYcAAAEEkihwq5ktCMPwZ0kMT2YEEEAAAZF8Pj9dVX3HcT4uIlMwQQABBBIkMDcIgjUJyktUBBBAAAEEEEAAAQTqJsABrLrRsjACCCCAAAIIIIBAEgQ8z+sUkYEkZCUjAggg8CSBYVUNp02btsz3/RFkEEAAAQSSL1B9LaGZnes4zluS34YGCCCQEYG/qepefAprRnabmggggAACCCCAAALPKMABLB4QBBBAAAEEEEAAgcwKdHd37zBlypQ7VXWnzCJQHAEEEiegqj9Q1QW9vb2/S1x4AiOAAAIIbEtAC4XCPMdx+kTkudu6mH+OAAIINFvAzFaEYfjBZudgPgIIIIAAAggggAACzRbgAFazd4D5CCCAAAIIIIAAAk0TcF33AlU9qWkBGIwAAgiMT+DvURQtLpfLq8Z3G1cjgAACCCRNYPHixTvmcrk+VT0+adnJiwACmROwKIoOLpfLN2SuOYURQAABBBBAAAEEEHiSAAeweBwQQAABBBBAAAEEMinged6BIvJjEeH3xJl8AiiNQOIE1jiOs6i3t/fBxCUnMAIIIIDAhAU8zztURL4oIrtNeBFuRAABBOovcNvatWtfOzg4WKn/KCYggAACCCCAAAIIIBBPAb7ZFM99IRUCCCCAAAIIIIBAHQV833c2btz4U8dxXlfHMSyNAAII1ELgb2Z2ShiGV9ZiMdZAAAEEEEiegO/77UNDQ59S1byI5JLXQcXyXQAAIABJREFUgMQIIJARgY8GQXBORrpSEwEEEEAAAQQQQACBpwlwAIuHAgEEEEAAAQQQQCBzAq7rnqKq/MVw5naewggkTmDQcZwP9/b2PpS45ARGAAEEEKi5QD6ff0Mul7tARPau+eIsiAACCExeYEMURXuWy+W/Tn4pVkAAAQQQQAABBBBAIHkCHMBK3p6RGAEEEEAAAQQQQGASAosXL96xpaXlLhHZYRLLcCsCCCBQNwEzu19VPxgEwdV1G8LCCCCAAAKJFFi4cOHU6dOnf9LMPBFpSWQJQiOAQJoFLgqC4KQ0F6QbAggggAACCCCAAAL/SYADWDwbCCCAAAIIIIAAApkS8DxvhYh8IFOlKYsAAokRMLMBx3E+XiqV1icmNEERQAABBBouUCwWX2dmK0Vkr4YPZyACCCDwnwXMzA4Mw/CnICGAAAIIIIAAAgggkDUBDmBlbcfpiwACCCCAAAIIZFigWCzuZ2Y3i4iTYQaqI4BAPAUeEZGPBEGwJp7xSIUAAgggEDcB3/enDQ0N+aqaF5Fc3PKRBwEEMivwi7Vr1+4/ODhYyawAxRFAAAEEEEAAAQQyKcABrExuO6URQAABBBBAAIHsCfi+7wwPD98oIq/PXnsaI4BAzAWuGxkZObG/v/8vMc9JPAQQQACBGAp4nnegiFQ/DWt2DOMRCQEEMiigqh8ulUpfzGB1KiOAAAIIIIAAAghkWIADWBnefKojgAACCCCAAAJZEvA8r/rawerrB/lCAAEE4iIwLCI9QRB8XkQsLqHIgQACCCCQPAHf99uHhoZ6VXWhiPB3vsnbQhIjkDaB9aOjo3uceeaZf09bMfoggAACCCCAAAIIIPCfBPjDOM8GAggggAACCCCAQOoFuru7d2htbb1LRHZMfVkKIoBAUgRudhxnXm9v7++SEpicCCCAAALxF/A870gRuVBEnhv/tCREAIGUC5wfBMGClHekHgIIIIAAAggggAACTwhwAIuHAQEEEEAAAQQQQCD1AsVi8RwzOyX1RSmIAAJJEIhUtXfatGm+7/ujSQhMRgQQQACBZAmceuqpz69UKtVXEh6SrOSkRQCBlAlEZvb6MAx/lrJe1EEAAQQQQAABBBBA4N8KcACLBwMBBBBAAAEEEEAg1QLFYvHVZnaLiORSXZRyCCCQBIG/mNm8MAy/l4SwZEQAAQQQSLSAep63WESWikhropsQHgEEEitgZjeEYXgwr9tO7BYSHAEEEEAAAQQQQGAcAhzAGgcWlyKAAAIIIIAAAggkT8DzvOtF5K3JS05iBBBImcB1URQdXy6X/5qyXtRBAAEEEIixQD6ff4XjOJeq6itiHJNoCCCQYgFVPbZUKl2e4opUQwABBBBAAAEEEEDgcQEOYPEgIIAAAggggAACCKRWIJ/PvyeXy12Z2oIUQwCBJAhsNjM3DMPl/OR/EraLjAgggED6BPL5/HTHcc5W1ZPS145GCCAQdwFVvWfz5s179ff3D8c9K/kQQAABBBBAAAEEEJiMAAewJqPHvQgggAACCCCAAAKxFfB9v3V4ePgOEZkd25AEQwCBtAvcFUXRseVy+ba0F6UfAggggED8BVzXnSci56nq9PinJSECCKRJwMxOC8Ow+kpUvhBAAAEEEEAAAQQQSK0AB7BSu7UUQwABBBBAAAEEsi3geV5eRMrZVqA9Agg0UeBrIjI/CIJHm5iB0QgggAACCDxFwHXdPVV1UET2gQYBBBBooMBjZrZnGIb3NXAmoxBAAAEEEEAAAQQQaKgAB7Aays0wBBBAAAEEEEAAgUYIdHd379Da2vp7EdmhEfOYgQACCDxJYFRVTyuVSgEqCCCAAAIIxFGgu7u7rbW19WwR+UAc85EJAQRSK3BxEAQnpLYdxRBAAAEEEEAAAQQyL8ABrMw/AgAggAACCCCAAALpEygWi+eY2Snpa0YjBBCIs4CZ3RtF0fv7+vp+EuecZEMAAQQQQKAqUCgUuhzHOU9E2hFBAAEEGiAQqeoBpVLplgbMYgQCCCCAAAIIIIAAAg0X4ABWw8lTMrD65FhKulADAQQQQAABBFIl0NPTs3cURb8UkZZUFaMMAgjEWsDMrsnlcl29vb0PxToo4RBAAAEEEHiSQD6ff2Uul7tSRHYHBgEEEKi3gJn9KAzDN/HdhXpLx3R9vq8U040hFgIIIIAAAgjUSoADWLWSZB0EEEAAAQQQQACBWAi4rnuNqh4WizCEQACBLAhEIvLpIAiW8o2kLGw3HRFAAIH0CRSLxZlRFF3C76HTt7c0QiCOAlEUva9cLg/GMRuZEEAAAQQQQAABBBCYjAAHsCajx70IIIAAAggggAACsRLwPO9QEfl2rEIRBgEE0iyw3nGczt7e3mvSXJJuCCCAAALpF/B939m0adNnzOxUEeHvjNO/5TREoJkCf2xra9vL9/1NzQzBbAQQQAABBBBAAAEEai3AH6ZrLcp6CCCAAAIIIIAAAk0R6OjoyL3kJS+5TVVf0ZQADEUAgUwJRFH025aWlvf09vb+NlPFKYsAAgggkGqBQqFwhOM4AyIyI9VFKYcAAk0VUNV8qVQ6s6khGI4AAggggAACCCCAQI0FOIBVY1CWQwABBBBAAAEEEGiOQLFY/JCZndec6UxFAIEsCZjZV9rb20/yff+xLPWmKwIIIIBANgRc191LVa8SkT2z0ZiWCCDQBIGHVXV2qVRa34TZjEQAAQQQQAABBBBAoC4CHMCqCyuLIoAAAggggAACCDRSIJ/PT8/lcneLyM6NnMssBBDInEBFRE4NgqAsIpa59hRGAAEEEMiMwMKFC7dra2u7TFUPy0xpiiKAQKMFwiAIvEYPZR4CCCCAAAIIIIAAAvUS4ABWvWRZFwEEEEAAAQQQQKBhAp7nnSYin23YQAYhgEAWBR5R1feXSqXrsliezggggAAC2ROovuJ71qxZ1UPH3dlrT2MEEGiAwKaWlpY9li5dem8DZjECAQQQQAABBBBAAIG6C3AAq+7EDEAAAQQQQAABBBCop8DixYt3bGlp+YOIbFfPOayNAAKZFviDmR0ZhuGdmVagPAIIIIBAJgVc1z1JVc8VkdZMAlAaAQTqKXBxEAQn1HMAayOAAAIIIIAAAggg0CgBDmA1Spo5CCCAAAIIIIAAAnUR8DyvX0QW1WVxFkUAAQREfuw4ztG9vb0PgoEAAggggEBWBQqFwhtV9UpV3SmrBvRGAIG6CERRFO1XLpdvq8vqLIoAAggggAACCCCAQAMFOIDVQGxGpVOg+l8iS2c1WiGAAAIIIBB7gcWLF7+4paXlLhGZGvuwBEQAgSQKnL9+/fqPrFixYksSw5MZAQQQQACBWgoUi8VZZna1iOxdy3VZCwEEsi1gZteEYXh4thVojwACCCCAAAIIIJAGAQ5gpWEX6YAAAggggAACCGRUwHXdi1X1+IzWpzYCCNRPYDSKok+Uy+Xl9RvByggggAACCCRPwPO87UXkChF5a/LSkxgBBOIqYGZvCcPwe3HNRy4EEEAAAQQQQAABBMYiwAGssShxDQIIIIAAAggggEDsBDzP20dEbhWRXOzCEQgBBJIs8I8oit5XLpe/neQSZEcAAQQQQKBeAr7vtw4PD58vIl31msG6CCCQLYEoim4pl8uv52UT2dp32iKAAAIIIIAAAmkT4ABW2naUPggggAACCCCAQEYEXNe9WlWPyEhdaiKAQGME/hJF0RHlcvm2xoxjCgIIIIAAAokVUNd1T1fVTya2AcERQCBWAqp6bKlUujxWoQiDAAIIIIAAAggggMA4BDiANQ4sLkUAAQQQQAABBBCIh4DneQeJyI/ikYYUCCCQBgEzu11VDw+C4E9p6EMHBBBAAAEEGiFQKBTmO46zQkSmNGIeMxBAINUCv29ra9vb9/3RVLekHAIIIIAAAggggEBqBTiAldqtpRgCCCCAAAIIIJBeAdd1f6yqb0xvQ5ohgECDBa4XkfcGQfBog+cyDgEEEEAAgcQL5PP5t+Vyua+KyPaJL0MBBBBoqoCZnRiG4ZebGoLhCCCAAAIIIIAAAghMUIADWBOE4zYEEEAAAQQQQACB5gi4rvsuVf16c6YzFQEE0iZgZhc+8sgjH16xYsWWtHWjDwIIIIAAAo0SKBQKr3Ic51oR2blRM5mDAALpE1DVe6ZNm7aH7/sj6WtHIwQQQAABBBBAAIG0C3AAK+07TD8EEEAAAQQQQCBdAup53i9E5FXpqkUbBBBohoCZ+WEYnt6M2cxEAAEEEEAgbQKFQmF3Vb1OVWelrRt9EECgoQIfDYLgnIZOZBgCCCCAAAIIIIAAAjUQ4ABWDRBZAgEEEEAAAQQQQKAxAsVi8Rgzq77ehC8EEEBgMgIVVf1oqVT64mQW4V4EEEAAAQQQeKpAoVDYeesnYfEDEzwcCCAwIQEzu7+9vX227/tDE1qAmxBAAAEEEEAAAQQQaJIAB7CaBM9YBBBAAAEEEEAAgXELVD/96lYR2Xfcd3IDAggg8C+B6utM5gVB8BVQEEAAAQQQQKD2AosWLZoxderUq0XkoNqvzooIIJAFATNzwzAsZ6ErHRFAAAEEEEAAAQTSI8ABrPTsJU0QQAABBBBAAIFUCxSLxfeb2WWpLkk5BBCot8BjqnpMqVS6rt6DWB8BBBBAAIEsCyxcuHBqW1vbGlU9OssOdEcAgQkLPDQ0NDRr+fLlGya8AjcigAACCCCAAAIIINBgAQ5gNRiccQgggAACCCCAAALjF/B93xkeHv61iOw9/ru5AwEEEHhc4G+qelipVKp+kh5fCCCAAAIIIFBngQULFkyZOXPmRSLSWedRLI8AAikUMDM/DMPTU1iNSggggAACCCCAAAIpFeAAVko3lloIIIAAAggggECaBDzPmyMil6SpE10QQKBxAma2znGct5dKpbsbN5VJCCCAAAIIIFD9QYqhoaHzVHUBGggggMA4BR4dGRmZ1d/f//A47+NyBBBAAAEEEEAAAQSaIsABrKawMxQBBBBAAAEEEEBgrAIdHR253Xbb7XbHcV421nu4DgEEEHiSwF1m9rYwDP+MCgIIIIAAAgg0RUA9zztTRLqbMp2hCCCQWIEoikrlcrknsQUIjgACCCCAAAIIIJApAQ5gZWq7KYsAAggggAACCCRPoFAodDmOszJ5yUmMAALNFjCzO1paWg5ZtmzZ/c3OwnwEEEAAAQSyLuB5XvVVYp/KugP9EUBg7AJmtjGKoll9fX0PjP0urkQAAQQQQAABBBBAoDkCHMBqjjtTEUAAAQQQQAABBMYgUP30q1mzZt0hInuO4XIuQQABBJ4QiKLolpaWlsN6e3sfggUBBBBAAAEE4iFQLBY9MyvFIw0pEEAgCQJ8ClYSdomMCCCAAAIIIIAAAlUBDmDxHCCAAAIIIIAAAgjEVqBQKJzoOM6FsQ1IMAQQiKVAFEXfV9V3hWH4j1gGJBQCCCCAAAIZFnBdt6CqYYYJqI4AAuMQqH4KVi6Xe0lvb++D47iNSxFAAAEEEEAAAQQQaLgAB7AaTs5ABBBAAAEEEEAAgbEILFiwYMqMGTN+q6qzxnI91yCAAAJVgSiKrp4+ffr7fN/fhAgCCCCAAAIIxFPAdd1Fqtofz3SkQgCBuAmo6tJSqXRa3HKRBwEEEEAAAQQQQACBJwtwAIvnAQEEEEAAAQQQQCCWAq7rHq+qF8cyHKEQQCCWAmb2reHh4WOWL1++OZYBCYUAAggggAACTwhwCIuHAQEExiGwQVV3K5VK68dxD5cigAACCCCAAAIIINBQAQ5gNZSbYQgggAACCCCAAAJjEfB93xkaGvqVqr58LNdzDQIIICAiV6xfv/64FStWbEEDAQQQQAABBJIh4HneJ0TkzGSkJSUCCDRTQFVPL5VKfjMzMBsBBBBAAAEEEEAAgWcS4AAWzwcCCCCAAAIIIIBA7ARc132vqg7GLhiBEEAglgJm9tVHHnlkDoevYrk9hEIAAQQQQOAZBYrF4mIz64MJAQQQ2IbAo5s3b97trLPOegQpBBBAAAEEEEAAAQTiKMABrDjuCpkQQAABBBBAAIGMC7iue4uqvjbjDNRHAIGxCQy2tbXN8X1/dGyXcxUCCCCAAAIIxE3A87y8iJTjlos8CCAQO4FPBkFwRuxSEQgBBBBAAAEEEEAAARHhABaPAQIIpEOg+quZpaMKLRBAAIGsCxQKhXc4jnNt1h2y2b/6P+b8ESWbez+x1mb2lfb29rkcvpqYH3chgAACCCAQJwHP81wRCeKUiSwIIBA7gYfNbLcwDP8Ru2QEQgABBBBAAAEEEMi8AN/dyPwjAAACCCCAAAIIIBAvAdd1f6iqB8crFWkQQCBuAmZ2+bp16+YODg5W4paNPAgggAACCCAwMYFisbjMzHomdjd3IYBAFgTM7NQwDHuz0JWOCCCAAAIIIIAAAskS4ABWsvaLtAgggAACCCCAQKoFCoXCwY7j/DDVJSmHAAK1ELhq/fr171+xYsWWWizGGggggAACCCAQH4FisXiOmZ0Sn0QkQQCBmAk82NbWtpvv+0Mxy0UcBBBAAAEEEEAAgYwLcAAr4w8A9RFAAAEEEEAAgTgJuK57raq+I06ZyIIAArETuG5oaOhdy5cv3xy7ZARCAAEEEEAAgVoIqOd5F4jIibVYjDUQQCB9Amb28TAMP5++ZjRCAAEEEEAAAQQQSLIAB7CSvHtkRwABBBBAAAEEUiRQKBRe5TjOL0SE36OmaF+pgkCNBb7b1tZ2hO/7m2q8LsshgAACCCCAQIwEOjo6crNmzbpURDpiFIsoCCAQEwEzu7e9vX227/sjMYlEDAQQQAABBBBAAAEE+OYWzwACCCCAAAIIIIBAPAQ8z/uqiBwTjzSkQACBuAmY2Y3t7e2H+r7/WNyykQcBBBBAAAEEai/g+37r0NDQ11T1sNqvzooIIJB0gSiKji+Xy6uS3oP8CCCAAAIIIIAAAukR4NMF0rOXNEEAAQQQQAABBBIr0NPT87Ioiu4QESexJQiOAAL1FPipmb09DMN/1HMIayOAAAIIIIBAvATy+fx0x3GuU9UD45WMNAgg0GwBM7sjDMN9RMSanYX5CCCAAAIIIIAAAghUBTiAxXOAAAIIIIAAAggg0HQBz/MuFJETmx6EAAggEDsBM7t9y5Ytb+rv7384duEIhAACCCCAAAJ1F/A8b3sR+YGI7Fv3YQxAAIFECZjZUWEYfiNRoQmLAAIIIIAAAgggkFoBDmCldmsphgACCCCAAAIIJEMgn8/vlMvl7hGRaclITEoEEGiUgJmtbWlpOWjZsmX3N2omcxBAAAEEEEAgfgLd3d0vbG1tvVFEdo1fOhIhgEATBW4KguCAJs5nNAIIIIAAAggggAACTwhwAIuHAQEEEEAAAQQQQKCpAsVi8QwzW9LUEAxHAIHYCZjZAyLyX2EY3hW7cARCAAEEEEAAgYYL9PT07B1F0Y9EZIeGD2cgAgjEWeBNQRD8MM4ByYYAAggggAACCCCQDQEOYGVjn2mJAAIIIIAAAgjEUsD3/fbh4eHqp1/tGMuAhKqJgPHu85o4ZmyRR1X1zaVS6daM9aYuAggggAACCDyDgOu6B6jqd0WkHSgEEECgKmBm14RheDgaCCCAAAIIIIAAAgg0W4ADWM3eAeYjgAACCCCAAAIZFvA87yMi8oUME1AdAQSeLjAcRdGh5XK5+gkXfCGAAAIIIIAAAk8R8DzvSBG5UkRaoEEAAQSqAqr6Gn54g2cBAQQQQAABBBBAoNkCHMBq9g4wHwEEEEAAAQQQyKiA7/vO8PBw9dViszNKQG0EEHi6wKjjOEf19vZeAw4CCCCAAAIIIPCfBIrF4ofM7DyEEEAAga0Ca4IgmIsGAggggAACCCCAAALNFOAAVjP1mY0AAggggAACCGRYIJ/PvyeXy1V/cp0vBBBAoCpgURSdXC6XL4IDAQQQQAABBBDYloDruiVV9bZ1Hf8cAQQyITAqIrsHQfCnTLSlJAIIIIAAAggggEAsBTiAFcttIRQCCCCAAAIIIJB+Add1b1DVA9PflIYIIDAWATP7VBiGnx3LtVyDAAIIIIAAAghU3zrmed4aETkWDQQQQCCKor5yuVxAAgEEEEAAAQQQQACBZglwAKtZ8sxFAAEEEEAAAQQyLFAsFl9nZjdnmIDqCCDwJAEzuyAMww+AggACCCCAAAIIjEegu7u7rbW19X9E5IDx3Me1CCCQSoENQ0NDuyxfvnxDKttRCgEEEEAAAQQQQCD2AhzAiv0WERABBBBAAAEEEEifgOd5XxWRY9LXjEYIIDBeATO7pr29/Sjf96uvDeELAQQQQAABBBAYl0ChUNjZcZybRGTXcd3IxQggkEaBRUEQnJ3GYnRCAAEEEEAAgacKVA+6GCgIxEyAA1gx2xDiIIAAAggggAACaRc47bTTXrJly5bfi0gu7V3phwACzyxgZj9rb29/s+/7j2GFAAIIIIAAAghMVKCnp2fvKIpuFJHtJ7oG9yGAQCoE/rh27drZg4ODlVS0oQQCCCCAAAIIIIBAogQ4gJWo7SIsAggggAACCCCQfAHP884SkY8nvwkNEEBgMgJmti6KogP6+voemMw63IsAAggggAACCFQFenp63hlF0Tf4QQ+eBwSyLWBmx4RheGW2FWiPAAIIIIAAAggg0AwBDmA1Q52ZCCCAAAIIIIBAhgSe/FHAvu8/a3h4+M/8ZHqGHgCqIvDvBTaIyEFBEPwaIAQQQAABBBBAoFYCrut+TFV5/VitQFkHgWQK/DgIgoOTGZ3UCCCAAAIIIIAAAkkW4ABWkneP7AgggAACCCCAQMIEPM/7iIh8IWGxiYsAArUVqL4O5KggCL5V22VZDQEEEEAAAQQQEHFdd7mqfhQLBBDIroDjOAf09vbelF0BmiOAAAIIIIAAAgg0Q4ADWM1QZyYCCCCAAAIIIJBRAdd1f62qr8hofWojgICImNlHwjA8FwwEEEi3wPz586eNjIw8z3GcGao6o1KpPP7vIjIzl8vNGB0dnVH9Z2ZW/f9Nr2qo6rNFpEVVHTPbfqvQNBFp+z9aj1R/Ofnn/09VR8xs49b/PCQi/xCRx0Sket2GKIoea2lp+Uf131V1veM4j46Ojt7f1tb2wIte9KIHfd+P0r0btEMgWwIdHR253Xbb7SrHcY7MVnPaIoDAPwXM7NIwDOcgggACCCCAAAIIIIBAIwU4gNVIbWYhgAACCCCAAAIZFnBd962qen2GCaiOAAIiZwdBsAgIBBBItsBxxx23Yy6X21VVX2hmL1DVF4jIi8xsZxHZRUSeLyI7JqRl9VP5HhCRB0XkviiKHnAc529mdl8ul7tndHR03ZYtW9YNDg4+mpA+xEQAARFZuHDhdm1tbTfwwx88DghkVmBLS0vL7kuXLr03swIURwABBBBAAAEEEGi4wDYPYFUveOJHChsej4EIIIAAAggggAACaRHwPO8qEXl3WvrQAwEExidgZt9at27dUYODg9XDDnwhgEDMBbq6up5jZrOjKHqpqu4hIrOr/1lVXyoi1U+tytrXQyKyrvovM1vnOM7j//eWLVvuuuyyy/6YNQz6IpAEgWKxWP116+bqJ+8lIS8ZEUCgtgJmFoRhWKztqqyGAAIIIIAAAgg8kwCna7L+fGzzAFbWgeiPAAIIIIAAAgggMHmBxYsXv7ilpeUPIpKb/GqsgAACSRMws9tF5MAwDKuvBeMLAQRiJDB37tztVHVfEdnXcZx9zeyVZlY9ZMWBhbHvU/XXtt84jvPr0dHR6r/f3traesdFF11039iX4EoEEKiHgOd5h4nIN0XEqcf6rIkAArEW+HtbW9suvu9vinVKwiGAAAIIIIAAAgikRoADWKnZSooggAACCCCAAALxFfA8LxARN74JSYYAAnUUeFhVX18qle6u4wyWRgCBMQjMmzfvJWa2bxRFjx+2qh66EpGXiAh/PzQGvwlcsl5EblfVX0VRdIuI3PLSl770t77vRxNYi1sQQGCCAq7r9qjqsgnezm0IIJBggSiKTiiXyxcnuALREUAAAQQQQAABBBIkwF+wJWiziIoAAggggAACCCRRoLu7u621tfVeEXlOEvOTGQEEJiVQfd3gkUEQXDupVbgZAQTGLbDffvtN2XPPPV/pOM5BIvJGEflvEXnuuBfihloLPCYiv1TVn5vZz3O53M9Xrlx5R62HsB4CCDxFQF3XvUxV34cLAghkTuDWIAhek7nWFEYAAQQQQAABBBBoigAHsJrCzlAEEEAAAQQQQCA7AoVC4UTHcS7MTmOaIoDAPwXMrDsMw7MQQQCB+guccMIJu1QqlQPN7MAoit6gqq8SkSn1n8yEGgj8VURujqLo+47j/GDz5s2/HBwcrB5g5QsBBGok4Pv+s4aHh28UkX1qtCTLIIBAQgQcxzmgt7f3poTEzUjM6rcmLSNdqYkAAggggAACWRLgAFaWdpuuCCCAAAIIIIBAEwQKhcLPHMfZrwmjGYkAAk0UMLOBMAy7mhiB0QikWqCjo+O506ZNe6uIHGJmbxORXVNdOFvlHhGRH0VR9L3qgazZs2ffxmsLs/UA0LY+AsVicTczq74OdMf6TGBVBBCIowB/LonjrpAJAQQQQAABBBBIpwAHsNK5r7RCAAEEEEAAAQRiIeB53oEickMswhACAQQaKXBzW1vbm3zf39TIocxCIM0C8+fPnxZF0UGVSuUQVa0euKp+wpWT5s50e0KgeiDrh2b2vSlTpnz74osv/i02CCAwMQHP8w4VkW+JSG5iK3AXAggkUGCz4zi79Pb2PpjA7ERGAAEEEEAAAQQQSJAAB7AStFlERQABBBBAAAEEkibged5KEeETcJK2ceRFYHICfxsZGdmvv7//L5NbhrsRQKCzs3NPETlSRN4uIgeJSBsqCIjIWlW9Noqib+20007f7+/vH0YFAQTGLuB5XlFEesd+B1cigEAKBJYEQbAsBT2ogAACCCCAAAIIIBAQsPfkAAAgAElEQVRjAQ5gxXhziIYAAggggAACCCRZYNGiRTOmTp1aPYDRnuQeZEcAgXEJVMzssDAM/9+47uJiBBB4QuD4449/uZl1RFF0hIjwCl+ejW0JDJvZDap6fUtLy9f5dKxtcfHPEXhcQF3XvVRV348HAghkQ8DM7m1vb5/l+/5oNhrTEgEEEEAAAQQQQKAZAhzAaoY6MxFAAAEEEEAAgQwIuK77MVU9OwNVqYgAAv8S8IIgCAFBAIGxC+y3335T9tprr/8WkXeLyFEi8sKx382VCDxN4DeqeqWqDq5atepX+CCAwL8XyOfz03O53C0ishdGCCCQDYFKpXJ0X1/fVdloS0sEEEAAAQQQQACBZghwAKsZ6sxEAAEEEEAAAQQyIOB5XvWbfvtkoCoVEUDgfwW+FgTB0SJigCCAwDMLVA9dvexlLztUVY8VkcNFZAZmCNRaQFXvEpFBDmPVWpb10iLgeV71zyo38XrXtOwoPRDYpsB3gyB42zav4gIEEEAAAQQQQAABBCYowAGsCcJxGwIIIIAAAggggMB/Fsjn82/I5XI3YoQAApkRuFtEXhsEwaOZaUxRBCYgMGfOnP1yuVyXmVVfe/W8CSzBLQhMVGCdql699TDWjye6CPchkDaBYrF4spmdn7Ze9EEAgX8rYI7jvKy3t/d3+CCAAAIIIIAAAgggUA8BDmDVQ5U1EUAAAQQQQACBjAu4rnuRqp6QcQbqI5AVgU2qemCpVLo1K4XpicB4BDo7O2dHUTTXcZxOEZk9nnu5FoF6CFQ/GcvMVlX/dckll/y5HjNYE4EkCXiet1JEupKUmawIIDBhgTAIAm/Cd3MjAggggAACCCCAAALPIMABLB4PBBBAAAEEEEAAgZoKeJ63vZn9RVWn13RhFkMAgVgKmNn8MAyr37jkCwEEtgp0dHTs0NraepyIzFXVNwCDQEwFIjO7XkRW7rTTTlf19/cPxzQnsRCoq0A+n5+ey+VuEZG96jqIxRFAoOkCZvZAe3v7Lr7vjzQ9DAEQQAABBBBAAAEEUifAAazUbSmFEEAAAQQQQACB5gq4rnuKqp7T3BRMRwCBBglcHAQBn3bXIGzGxF+g+opBx3EWiEj1067a45+YhAg8IbBBVb+uqqtWrVr1XRExbBDIkoDneS8XkZv5tTtLu07XrApEUfS+crk8mNX+9EYAAQQQQAABBBConwAHsOpny8oIIIAAAggggEAmBTzP+4WIvDqT5SmNQLYEfmdmrw3D8B/Zqk1bBJ4qMHfu3O2qB65U9YMi8kp8EEi6wNZXFH65UqlceOmll/496X3Ij8BYBQqFwomO41w41uu5DgEEEivw/4IgeHti0xMcAQQQQAABBBBAILYCHMCK7dYQDAEEEEAAAQQQSJ6A67r7q+pNyUtOYgQQGKfAJhE5IAiCX47zPi5HIDUCT/q0qzki8qzUFKMIAv8S2Cwi3zCzsy+55JIbgEEgCwKu616sqsdnoSsdEciwgKnqHqVS6e4MG1AdAQQQQAABBBBAoA4CHMCqAypLIoAAAggggAACWRVwXfd8VT05q/3pjUCGBBYEQXB+hvpSFYHHBTo6OlqnTp16rIgsFJHXwoJAVgRU9eZKpfKF9evXf+Xaa6+tHsziC4FUCuTz+em5XK76KsK9U1mQUggg8E+BZUEQLIEDAQQQQAABBBBAoE4C1ZNIVqe1Y7wsB7BivDlEQwABBBBAAAEEkiTg+/6zhoeH7+dTQJK0a2RFYEIClwVBcNyE7uQmBBIqcOKJJz57ZGTkRDNbrKq7JLQGsRGYtICqPmBmX46i6Lw1a9bcM+kFWQCBGAr09PTsHUXRLSLSHsN4REIAgRoImNn97e3tu/q+P1qD5VgCAQQQQAABBBBAAIHHBTiAxYOAAAIIIIAAAgggUBOBQqHQ5TjOyposxiIIIBBXgbuHhob2W758+Ya4BiQXArUU6Orq2jWKokUiUv10x2fXcm3WQiDhAhURuTKKomDNmjU/T3gX4iPwNAHXdU9R1XOgQQCB9ApUKpWj+/r6rkpvQ5ohgAACCCCAAAIINFqAA1iNFmceAggggAACCCCQUoFCofBdx3HektJ61EIAAZFRMzs4DMOfgoFA2gXmzJnzqlwu9wkzq75ucEra+9IPgUkK3KCqwcDAwDez+YKBSepxe1wFtFAofN1xnCPjGpBcCCAwOQEzuyYMw8Mntwp3I4AAAggggAACCCDwLwEOYPE0IIAAAggggAACCExawPO8XUVknYg4k16MBRBAIK4CnwyC4Iy4hiMXArUQOO64497S0tKyxMw4UFwLUNbImsDPqwexdt999yt834+yVp6+6RM49dRTnzc6OvorVd0pfe1ohAACIlL9NMdZQRD8CQ0EEEAAAQQQQAABBGohwAGsWiiyBgIIIIAAAgggkHEB13WXqCoHMzL+HFA/vQJmdsO6deveNDg4WP0mBV8IpE6gq6vroCiKfBF5a+rKUQiBxgusFZHPP/e5z13R398/3PjxTESgdgKFQuEdjuNcIyL8PXrtWFkJgdgImNlpYRgujU0ggiCAAAIIIIAAAggkWoA/OCZ6+wiPAAIIIIAAAgjEQ6BQKNzpOM7L4pGGFAggUGOBx1T11aVS6e4ar8tyCDRdoLOz879F5HQR+a+mhyEAAukTuN/Meh9++OEV11577eb01aNRVgRc1z1PVT+Ulb70RCBjAr8PgmBPXqGbsV2nLgII1EegeurA6rM0qyKAAAJJEeAAVlJ2ipwIIIAAAggggEBMBfL5/BtyudyNMY1HLAQQmLzAvCAIVk9+GVZAID4C1U+8qlQqn1bVt8UnFUkQSKeAmd2rqmc+9NBDX+QgVjr3OO2tfN9v37hx48/5gZO07zT9sioQRdFB5XL5hqz2pzcCCCCAAAIIIIBA7QQ4gFU7S1ZCAAEEEEAAAQQyKeB53hdF5IOZLE9pBNIvcEUQBO9Nf00aZkWgs7PzYBH5jIhUP/mKLwQQaKzAH6IoOn3Lli1reKVtY+GZNnmBQqHwGsdxfiIirZNfjRUQQCBmAucHQbAgZpmIgwACCCCAAAIIIJBAAQ5gJXDTiIwAAggggAACCMRFwPf9acPDw/eJyMy4ZCIHAgjUTOAvqrpPqVRaX7MVWQiBcQnU7v0FXV1de0RRdIaIdIwrAhcjgEA9BO4UkdLs2bNX+74f1WMAayJQDwHXdXtUdVk91mZNBBBoqsCjIyMjz+/v7x9uagqGI4AAAggggAACCCRegANYid9CCiCAAAIIIIAAAs0T8DzvfSJyefMSMBkBBOoo8M4gCK6t4/osjUDdBebNm7eTmX1aRKqfatBS94EMQACB8QjcJiI9q1ev/vZ4buJaBJol4Pu+s3Hjxu86jsOnKDZrE5iLQJ0EoiiaUy6XL63T8iyLAAIIIIAAAgggkBEBDmBlZKOpWVuB2v0cdm1zsRoCCCCAAAKNFnBd91uq+s5Gz2UeAgjUXYDXcNSdmAH1FOjo6GidOnXqh0XkdBHZvp6zWBsBBCYnYGbX53K5xatWrfrV5FbibgTqL1AsFnczs+qz+uz6T2MCAgg0UOC6IAgObeA8RiGAAAIIIIAAAgikUIADWCncVCohgAACCCCAAAKNEDj11FOfV6lU/swnijRCmxkINFTgj2b2yjAM/9HQqQxDoDYCOm/evPdGURSq6m61WZJVEECgAQKRql4yderUwgUXXPC3BsxjBAITFvA8r3rA99wJL8CNCCAQR4GopaVlt6VLl94bx3BkQgABBBBAAAEEEEiGAAewkrFPpEQAAQQQQAABBGInUCwWu83sc7ELRiAEEJiMgKnqO0ql0nWTWYR7EWiGQFdX10Fm9nkze3Uz5jMTAQRqIvCoiJyxefPmzw8ODo7UZEUWQaD2Aup53ndE5JDaL82KCCDQRIGeIAhKTZzPaAQQQAABBBBAAIGEC3AAK+EbSHwEEEAAAQQQQKBZAoVC4WbHcV7XrPnMRQCBuggsD4LgY3VZmUURqJNAR0fHDtOmTfu0mX1URJw6jWFZBBBorMCfROSTq1evHhARa+xopiGwbYGtryL8tYg8a9tXcwUCCCRE4HdBEOyZkKzERAABBBBAAAEEEIihAAewYrgpREIAAQQQQAABBOIuUCwWZ5nZ3SLC7yfjvlnkQ2DsAndXKpVX9fX1bRz7LVyJQPMEfN937r777g+KyFIRmdm8JExGAIE6CnxfVU8ZGBi4s44zWBqBCQl4nvdxETlrQjdzEwIIxFLAzF4fhuHNsQxHKAQQQAABBBBAAIHYC/ANs9hvEQERQAABBBBAAIH4Cbiuu0RVz4hfMhIhgMAEBaxSqby9r6/v+gnez20INFSgs7PzNY7jnBNF0QENHcwwBBBohsAWVT1PRE4dGBjgkHAzdoCZ/1agehB4aGioekjwYIgQQCA1AmcHQbAoNW0oggACCCCAAAIIINBQAQ5gNZSbYQgggAACCCCAQDoEXNf9taq+Ih1taIEAAmZ2QRiGH0ACgbgLzJ8/f0alUjndzD4iIrm45yUfAgjUVGCtiHxk9erV367pqiyGwCQEenp69oii6DYRaZvEMtyKAALxEfjr2rVrXzQ4OFiJTySSIIAAAggggAACCCRFgANYSdkpciKAAAIIIIAAAjER8DxvHxH5VUziEAMBBCYv8FdV3btUKq2f/FKsgED9BObOndupqp8TkefWbworI4BAAgQuE5FPrF69+v4EZCViBgRc1y2oapiBqlREIBMClUrlED4ZOBNbTUkEEEAAAQQQQKDmAhzAqjkpCyKAAAIIIIAAAukWKBaLy8ysJ90taYdAdgTM7JgwDK/MTmOaJk1g/vz5O4+Ojp4rIu9JWnbyIoBA3QQeFZFPb968+Qt8SkndjFl4jAJbX0X4I1U9cIy3cBkCCMRb4KIgCE6Kd0TSIYAAAggggAACCMRRgANYcdwVMiGAAAIIIIAAAjEW8Dzv9yIyO8YRiYYAAmMUMLNvhmF45Bgv5zIEGi4wd+7c41W1X0RmNnw4AxFAIAkCN6nqCQMDA3cmISwZ0yvQ09PzsiiKbhWRaeltSTMEMiOwoa2t7Xm+72/KTGOKIoAAAggggAACCNREgANYNWFkEQQQQAABBBBAIBsCruvur6o3ZaMtLRFIvcAjZvbyMAzvS31TCiZOoPqpV1u2bPmiqh6VuPAERgCBRgtUv0Hub968uY9Pw2o0PfOeLOC67qdV1UcFAQSSL1CpVI7u6+u7KvlNaIAAAggggAACCCDQSAEOYDVSm1kIIIAAAggggEDCBTzPq34KyaKE1yA+Agj8r8CHgiD4EhgIxE1g3rx5HSLyRTPbIW7ZyIMAAvEVMLOf5HK5+atWrfpdfFOSLM0Cvu9PGx4e/pWIvDTNPemGQEYEBoMgeF9GulITAQQQQAABBBBAoEYCHMCqESTLIIAAAggggAACaRfwfd8ZHh7+k4i8MO1d6YdA2gWiKLpl+vTpB/i+H6W9K/2SI9DV1fXCKIouEJF3JCc1SRFAIGYCG0WkuHr16nNExGKWjTgZEHBd9xBVvS4DVamIQNoFqp+uuHMQBI+mvSj9EEAAAQQQQAABBGonwAGs2lmyEgIIIIAAAgggkGoB13XfrKr/k+qSlEMgGwIVVX1dqVS6NRt1aZkEgTlz5hzlOM6FIvKcJOQlIwIIxF7gBhGZv3r16rtjn5SAqRPwPO9SETk2dcUohEDGBKIoOr5cLq/KWG3qIoAAAggggAACCExCgANYk8DjVgQQQAABBBBAIEsCnuedKyIfzlJnuiKQUoGzgiDoTmk3aiVMoLu7u+2BBx74nKp+KGHRiYsAAvEX+IeZLbrkkksuin9UEqZJoFAo7Ow4zp0iMiNNveiCQNYEzOzbYRgelrXe9EUAAQQQQAABBBCYuAAHsCZux50IIIAAAggggEBmBLa+fvBeEXlBZkpTFIF0Ctw3NDS01/Llyzeksx6tkiQwd+7cvVW1+ikhr0xSbrIigECyBMzsSjM7ec2aNeuTlZy0SRZwXfejqro8yR3IjgACMjo6Ovr8M8888+9YIIAAAggggAACCCAwFoHmHsCqTrexxOQaBBBAAAEEEEAAgWYKFAqFNzqO8+NmZmA2AghMXiCKoveVy+XBya/ECghMSkA7Ozs/ICL9ItI+qZW4GQEEEBibwD2O4xy3atWqn4ztcq5CYHICW3+A5UYRef3kVuJuBBBopoCqfqBUKl3QzAzMRgABBBBAAAEEEEiOQHMPYCXHiaQIIIAAAggggECmBQqFQtlxnHymESiPQPIFvhMEwTuSX4MGSRbo6Oh47rRp0y4ysyOS3IPsCCCQSIFRx3GWzpo16zO+70eJbEDoRAm4rvtaVf2piOQSFZywCCDwhACvIeRhQAABBBBAAAEEEBiPAAewxqPFtQgggAACCCCAQEYFXNf9g6rOymh9aiOQBoERM3tlGIZ3paEMHZIp0NnZebCIXC4iz09mA1IjgEBKBL5VqVTmX3rppbxSKiUbGucarusuV9WPxjkj2RBA4BkFtoyMjOzc39//ME4IIIAAAggggAACCGxLgANY2xLinyOAAAIIIIAAAhkXKBaLrzazX2ScgfoIJFrAzMphGLqJLkH4RAt0dnYuEJEviMiURBchPAIIpEXgb7lcrmvlypXXpaUQPeIpsHDhwu3a29vvFJEXxDMhqRBAYFsCZjY/DMOV27qOf44AAggggAACCCCAAAeweAYQQAABBBBAAAEEnlHA87zTReRTMCGAQGIF/jY0NLTH8uXLNyS2AcETKzBv3rzpZna+iByX2BIERwCBtApUVPWTAwMDJRGxtJakV/MFXNedp6qrmp+EBAggMBEBM/tmGIZHTuRe7kEAAQQQQAABBBDIlgAHsLK137RFAAEEEEAAAQTGLeC67u2q+vJx38gNCCAQC4Eoik4ol8sXxyIMITIlMGfOnJc6jnOFiOyTqeKURQCBpAlcvXnz5nmDg4OPJi04eRMjoJ7n/VRE9k9MYoIigMCTBTaLyPOCIOB/J3guEEAAAQQQQAABBJ5RgANYPCAIIIAAAggggAAC/1GgUChUv3n+O4gQQCCZAlEU/Xz69On7+74fJbMBqZMqMHfu3CNUdUBEZiS1A7kRQCA7Aqp6l4i8Z2BgoPqqOL4QqLmA67oHqOqNIsLfx9dclwURqL+AmXWGYXhJ/ScxAQEEEEAAAQQQQCDJAvyBL8m7R3YEEEAAAQQQQKDOAq7r9qjqsjqPYXkEEKiPQPV1Sv8VBMGP67M8qyLwbwW0s7PTFZHq/3Y4GCGAAAIJEqi+qvf41atXfy1BmYmaIAHP86qHN+YkKDJREUDgXwJXBUFwNCAIIIAAAggggAACCDyTAAeweD4QQAABBBBAAAEE/qOA53k38aoMHhAEkilgZgNhGHYlMz2pkyhwyimnPGvDhg3Vby6/K4n5yYwAAgiISPXwcjh79uxT+fRInodaCyxZsmSX0dHR34pIe63XZj0EEKi7wHBbW9tOvu8/VvdJDEAAAQQQQAABBBBIrAAHsBK7dQRHAAEEEEAAAQTqK7D1GwT38JqM+jqzOgJ1Ehg2sz3CMPxzndZnWQSeItDV1fXCKIq+ISKvgQYBBBBIuoCqfnPTpk2dg4ODjya9C/njJeB53uki8ql4pSINAgiMUeD9QRB8ZYzXchkCCCCAAAIIIIBABgU4gJXBTacyAggggAACCCAwFgHXdU9R1XPGci3XIIBA7ASWBUGwJHapCJRKgXnz5r3ezKqv7No5lQUphQACWRW4PYqiI9asWVP9gQS+EKiJQD6fn57L5aqfgvWimizIIggg0EiBy4IgOK6RA5mFAAIIIIAAAgggkCwBDmAla79IiwACCCCAAAIINEzAdd1rVPWwhg1kEAII1ErgwaGhodnLly/fUKsFWQeB/yTQ1dX13iiKVvI6JZ4RBBBIqcBfVfXIgYGBn6W0H7WaIOB5XqeIDDRhNCMRQGByAo9ufQ3hyOSW4W4EEEAAAQQQQACBtApwACutO0svBBBAAAEEEEBgEgJbfzL77yIybRLLcCsCCDRH4JQgCM5rzmimZkmgs7Pz4yLyORFxstSbrgggkDmBjap63MDAwNWZa07hegmo67o/UtU31msA6yKAQH0EKpXKIX19fdfXZ3VWRQABBBBAAAEEEEi6AAewkr6D5EcAAQQQQAABBOog4HneUSJSfZ0UXwggkCyBu9avX7/PihUrtiQrNmmTJHDYYYdNnTlz5grHcbqSlJusCCCAwCQEKiKyaPXq1V+YxBrcisATAq7rHqCqN4oIfz/Pc4FAggTM7PNhGFZ/CIEvBBBAAAEEEEAAAQSeJsAf8HgoEEAAAQQQQAABBJ4m4HneChH5ADQIIJA4gXcHQfD1xKUmcGIEOjo6tp86dWr1GXtTYkITFAEEEKiRgKqeufvuu7u+70c1WpJlMizguu7lqvq+DBNQHYEkCvwxCIKXJDE4mRFAAAEEEEAAAQTqL8ABrPobMwEBBBBAAAEEEEiagHqe92cReUHSgpMXgYwL/DAIAg7FZPwhqGf9k08++XmbN2++1sxeXc85rI0AAgjEXOCq9vb2zhUrVgzFPCfxYi7Q09OzRxRFd4hIS8yjEg8BBJ4kUKlU9u3r6/sVKAgggAACCCCAAAII/F8BDmDxTCCAAAIIIIAAAgg8RcB13deq6i2wIIBA4gTeFATBDxOXmsCJEJgzZ84sx3G+IyKzExGYkAgggEAdBczsJyMjI0cMDg4+XMcxLJ0BAT55OAObTMXUCZjZp8Iw/GzqilEIAQQQQAABBBBAYNICHMCaNCELIIAAAggggAAC6RIoFou+mX06Xa1og0C6Bczsm2EYHpnulrRrlsDxxx//8kqlUj189cJmZWAuAgggEEOB37S2th5y0UUX3RfDbERKiIDrui9Q1d+LSHtCIhMTgcwLRFF0S7lc3j/zEAAggAACCCCAAAIIPE2AA1g8FAgggAACCCCAAAJPEXBd9xZVfS0sCCCQGAFT1f1KpdKtiUlM0MQIzJs37/Vm9i0ReU5iQhMUAQQQaJzAui1bthxy+eWX/6FxI5mUNoFCoVB2HCeftl70QSDFAmZmu4Zh+OcUd6QaAggggAACCCCAwAQEOIA1ATRuQQABBBBAAAEE0ipw6qmnPr9SqfxFRPh9Ylo3mV5pFLgsCILj0liMTs0VmDt37hGqejmfytHcfWA6AgjEXuD+XC53yMqVK++IfVICxlKgWCzONLPqIb6ZsQxIKAQQ+HcCHwqC4EvQIIAAAggggAACCCDwZAG+scbzgAACCCCAAAIIIPCEQLFYPNnMzocEAQQSI1BxHOcVvb29v01MYoImQqCzs3OuiFwsIi2JCExIBBBAoIkCqvpApVI5dM2aNbc1MQajEyzguu4nVfUzCa5AdAQyJVD9hNgwDI/IVGnKIoAAAggggAACCGxTgANY2yTiAgQQQAABBBBAIDsCnuddJSLvzk5jmiKQbAEzuzAMw5OT3YL0cROYN2/esWY2wOGruO0MeRBAIOYCj4jI4atXr74x5jmJF0MB3/efNTw8fLeIPC+G8YiEAAJPFxgeGRl5Tn9//zA4CCCAAAIIIIAAAgj8U4ADWDwLCCCAAAIIIIAAAo8LLFiwYMrMmTMfEpFnQ4IAAokQ2CwiewRB8KdEpCVkIgTmzp07R1VXiUguEYEJiQACCMRLYGMulzt65cqV18UrFmmSIOC67sdU9ewkZCUjAgg8LvDOIAiuxQIBBBBAAAEEEEAAgX8KcACLZwEBBBBAAAEEEEDgcQHP8/5LRH4ABwIIJENAVc8tlUofSUZaUiZBYN68eSeZ2QoRcZKQl4wIIIBATAU2qeq7BwYGvhPTfMSKqYDv+61DQ0N3quqsmEYkFgIIPFXg7CAIFoGCAAIIIIAAAggggMA/BTiAxbOAAAIIIIAAAggg8LiA53mfFZHT4EAAgUQIjLS0tMxeunTpvYlIS8jYC3D4KvZbREAEEEiWwHClUjni0ksv/Z9kxSZtswUKhcKJjuNc2OwczEcAgTEJ/C4Igj3HdCUXIYAAAggggAACCGRCgANYmdhmSiKAAAIIIIAAAtsW8DzvJhHZf9tXcgUCCDRbwMy+GIbhh5udg/npEOjs7DxZRL7EJ1+lYz9pgQACsREYEpHDV69e/f3YJCJI7AWqr4WfMWPGXar6ktiHJSACCEgURbPL5fIfoEDg/7N353FyVPX+/z+nZrJMwEhANgUR3FjcAMGvXr0uqAiKgBjFmeoxouRKMF6QdJ2euDWKpk91MGgUFCLidPcgRhEVL+5G3JFFRQEFETWCeAUkYsYkM3V+j75X/XllySzVVXXqvPpfqj6f9/tZLTKZk24EEEAAAQQQQACBrgAHsHgfIIAAAggggAACCEitVltkrf1vEemDAwEECi+wTSn1hEajcVvhkxKw8AKVSuXk7oE+Dl8V/lEREAEE3BT4S5IkR4+NjV3pZnxS5yFQq9XeaK09L4/d7EQAgWkLvMkY86Fp38UNCCCAAAIIIIAAAqUU4ABWKR8rpRBAAAEEEEAAgekJaK1fJSKXTO8urkYAgTwErLXnx3H8H3nsZme5BP72tYMX8JezyvVcaYMAAoUT2BQEwYtGR0evKlwyAhVSYPny5fMWLFhwi4jsVciAhEIAgX8IWGsvj+P4GEgQQAABBBBAAAEEEOgKcACL9wECCCCAAAIIIICARFF0gVKq+xVUvBBAoNgC2+bMmfPEs84661fFjkm6oguEYXiciKwXkf6iZyUfAgggUAKBe5VSL2y1WleXoAsVMhCIoujNSqn3Z7CKFQggMAsBa+1fxsfHd1m7du2WWYzhVgQQQAABBBBAAIGSCHAAqyQPkhoIIIAAAggggMBsBGq12m3W2n1mM4N7EUCg9wLW2nVxHJ/c+01sKLPA0NDQEUqpL4jIvDL3pBsCCCBQMIE/icgR7Xb72oLlIsHr7fYAACAASURBVE4BBU4//fSBuXPn3ioiexQwHpEQQOCfBKy1L47j+CugIIAAAggggAACCCDAASzeAwgggAACCCCAgOcCURQ9USl1k+cM1EfABYHJJEkOaDabN7sQlozFFBgeHn5mkiTdXxDtUMyEpEIAAQRKLXCniDy73W53v16OFwIPKaC1XiEiTZgQQKDYAtbas+M47v7vlRcCCCCAAAIIIICA5wIcwPL8DUB9BBBAAAEEEECgWq0uD4LgA0gggECxBay1l8RxfGKxU5KuyAJDQ0NPDoJgg7V25yLnJBsCCCBQcoFb+/v7/+2iiy76fcl7Um+WAitWrNihr6+v+7XTu85yFLcjgEBvBW4wxhzU2xVMRwABBBBAAAEEEHBBgANYLjwlMiKAAAIIIIAAAj0UqFarnwuC4JgermA0AgikIKCUenqj0bgmhVGM8FDg1a9+9WPnzJnzLRHZ08P6VEYAAQSKJvCTLVu2/Pv69evvLVow8hRLQGu9UkTeU6xUpEEAgX8VsNbuHcfxRmQQQCAHge5vum0Oe1mJAAIIIIDAAwhwAIu3BQIIIIAAAggg4LHA0qVL5yxatOiPIrLQYwaqI+CCwJeNMUe6EJSMxRMYHh5+1OTk5LeVUo8pXjoSIYAAAn4KWGu/fNNNN73smmuu2eanAK2nIrB8+fKFCxYsuE1EFk3leq5BAIF8BJIkeW2z2RzNZztbEUAAAQQQQAABBIoiwAGsojwJciCAAAIIIIAAAjkIaK2fLSLdT0ThhQACBRaw1r4wjuOvFTgi0QoqcNJJJz1s69at3X/PP7WgEYmFAAII+Cxw8eMe97iwXq8nPiPQ/aEFtNZnisg7cEIAgUILjBpjXlvohIRDAAEEEEAAAQQQ6LkAB7B6TswCBBBAAAEEEECguAJa67eJyLuLm5BkCCCQJMkPm83m4UggMF2BxYsX982bN+8zIsLXzE4Xj+sRQACB7ARWt9vtanbr2OSawIoVK3br6+vrfgrWgGvZyYuARwK/M8bs5VFfqiKAAAIIIIAAAgg8gAAHsHhbIIAAAggggAACHgtorb8qIkd4TED1HglYEeGHjXRwrbUnxHF8aTrTmOKTQBiGHxKRZT51pisCCCDgokAQBGeMjo6+z8XsZM5GIIqiC5RSb8hmG1sQQGAmAkEQPHHVqlW/mMm93IMAAggggAACCCDgmkD3tx/d34L83xe/E3HtOZIXAQQQQAABBBBISaBer88dHx+/R0QWpDSSMQggkL7ALwcGBp7AVxOlD1v2iZVKJbLWmrL3pB8CCCBQEoFEKXViq9VaX5I+1EhZIIqiA5RSP+PvOKQMyzgE0hVYZow5L92RTEMAAQQQQAABBBBwSYADWC49LbIigAACCCCAAAIpClSr1ecEQXBliiMZhQACKQskSfLmZrO5NuWxjCu5wPDw8CuTJLlERIKSV6UeAgggUCaB8f7+/udedNFFPyxTKbqkJxBF0ReUUkenN5FJCCCQpoC19lNxHC9OcyazEEAAAQQQQAABBNwS4ACWW8+LtAgggAACCCCAQGoCURS9XSn1rtQGMggBBNIW2LR58+a9165duyntwcwrr8CSJUsOm5iY2MCnG5b3GdMMAQRKLXB7EASHj46O/q7ULSk3I4FarfYCa+3XZnQzNyGAQBYCdw0MDOzGpxdnQc0OBBBAAAEEEECgmAIcwCrmcyEVAggggAACCCDQc4Fqtfq1IAhe0PNFLEAAgRkJJEmyutlsVmd0Mzd5KVCpVPYVke9ba3fzEoDSCCCAQAkErLXfu/vuu59/xRVXbClBHSqkLKC1vlZEDk55LOMQQCAlAaXUIY1G47qUxjEGAQQQQAABBBBAwDEBDmA59sCIiwACCCCAAAIIpCFQr9fnjo+P38MnpKShyQwEeiIwOWfOnMefddZZv+rJdIaWTmDZsmU73nvvvd9XSh1UunIUQgABBDwTUEq1Wq3WsGe1qTsFAa11KCKtKVzKJQggkI9A1RizOp/VbEUAAQQQQAABBBDIW4ADWHk/AfYjgAACCCCAAAI5CGit/11EvpnDalYigMAUBKy1n4zj+NVTuJRLEOgKqDAMPykir4QDAQQQQKA0AtV2u80v8UvzONMpsnTp0jk77bTTL5VSe6czkSkIIJCmgLX2ijiOj05zJrMQQAABBBBAAAEE3BHgAJY7z4qkCCCAAAIIIIBAagJRFL1dKfWu1AYyCAEE0hb4N2PMd9MeyrxyCoRh+HYR4d/p5Xy8tEIAAX8FEqXUca1W6/P+EtD8gQS01pGIGHQQQKCQAvcNDAwsqtfrE4VMRygEEEAAAQQQQACBngpwAKunvAxHAAEEEEAAAQSKKVCtVr8WBMELipmOVAj4LZAkyQ+bzebhfivQfqoClUrlaGtt95fzwVTv4ToEEEAAAWcENllrn9npdG5wJjFBey5w2mmn7TRv3rzfisiOPV/GAgQQmLaAUurwRqPxw2nfyA0IIIAAAggggAACzgtwAMv5R0gBBBBAAAEEEEBgegL1en3u+Pj4PSKyYHp3cjUCCGQhYK1dEsfxx7PYxQ63BQYHBx8fBMFVIrKT201IjwACCCDwEAI3b9my5bD169ffixICfxeIougjSqmliCCAQPEElFJvaTQaa4qXjEQIIIAAAggggAACvRbI5gBWd4vtdRXmI4AAAggggAACCExFQGv9bBH51lSu5RoEEMhc4O6tW7futWbNmvHMN7PQKYFly5btuGnTpu+JyJOcCk5YBBBAAIFpC1hrP9vpdI7nT1inTVfaG6rV6tOCILiutAUphoDbApcZY7r/zuaFAAIIIIAAAggg4JlANgewPEOlLgIIIIAAAgggUGQBrXVNRFYVOSPZEPBVwFp7dhzHK3ztT+8pC6gwDD8hIq+a8h1ciAACCCDgtECSJG8ZGxvjE1Wcforpho+i6LtKqWemO5VpCCCQgsAfjTG7cWg2BUlGIIAAAggggAACjglwAMuxB0ZcBBBAAAEEEEBgtgLVavVzQRAcM9s53I8AAqkL2CAI9l+1atUvUp/MwFIJVCqVyFprSlWKMggggAAC2xPYZq19fqfT+c72LuSf+yEQRVFFKTXqR1taIuCWgLX2wDiOb3QrNWkRQAABBBBAAAEEZivAAazZCnI/AggggAACCCDgloDSWt8pIru6FZu0CHgh8CVjzEu8aErJGQsMDw8fniRJ92tk5854CDcigAACCLgq8HsROaTdbt/hagFypyewfPnyeQsWLPgtP9ulZ8okBNISUEr9R6PROD+tecxBAAEEEEAAAQQQcEOAA1huPCdSIoAAAggggAACqQhEUfREpdRNqQxjCAIIpC1wnDHms2kPZV55BJYsWbLTxMTEtSKyb3la0QQBBBBAYJoCGzZu3PiiDRs2TEzzPi4voUC1Wm0GQcDXV5fw2VLJeYG2MabifAsKIIAAAggggAACCExLgANY0+LiYgQQQAABBBBAwG2BarW6JAiCj7ndgvQIlFJg48DAwL71ep1fppby8aZTqlKpfMpae0I605iCAAIIIOCqgFLqrFar9XZX85M7PYFqtfrYIAi6X18dpDeVSQggkILAb4wx+6QwhxEIIIAAAggggAACDglwAMuhh0VUBBBAAAEEEEBgtgJRFF2glHrDbOdwPwIIPLiAFZEZ/KD1LmPMO3FF4MEEhoaGlimlPoQQAggggAACIpIEQXDk6OjoV9FAQGv9JRF5MRIIIFA4gX2MMb8pXCoCIYAAAggggAACCPRMYAa/F+hZFgYjgAACCCCAAAII9FhAa32DiBzQ4zWMRwCB6QnYJEke32w2fzm927jaF4FKpfIka+1VIjLgS2d6IoAAAghsV+DO+fPnP3XdunV3bvdKLii1QBRFxymlPlPqkpRDwEEBa20Yx3HHwehERgABBBBAAAEEEJihAAewZgjHbQgggAACCCCAgGsCtVptkbX2j3w9hWtPjrweCHzVGPMiD3pScQYClUplB2vtDzk8OwM8bkEAAQTKL3BFu91+qYh0P4CTl6cC9Xq9f3x8/FcispenBNRGoJAC1toPx3F8SiHDEQoBBBBAAAEEEECgJwIcwOoJK0MRQAABBBBAAIHiCWitu7+cubx4yUiEgPcCrzHGfMJ7BQAeUGBoaOhjSqkl8CCAAAIIIPBAAkmSvGVsbGwNOn4LaK3fLSJv81uB9ggUTuA6Y8whhUtFIAQQQAABBBBAAIGeCXAAq2e0DEYAAQQQQAABBIoloLV+j4isLFYq0iDgvcDdAwMDj6rX63/1XgKA+wkMDg4eGwTBZdAggAACCCDwEALblFLPabVaP0DJX4FarfY4a+0vRIQ/7/f3bUDz4glMDgwM7FSv1+8rXjQSIYAAAggggAACCPRCgB/IeqHKTAQQQAABBBBAoIAC1Wr1G0EQPK+A0YiEgM8Ca40xb/YZgO4PLFCpVHaz1v5URHbFCAEEEEAAge0I3LJw4cKDzz33XH7J7/FbRWv9LRF5tscEVEegiALPNcZcWcRgZEIAAQQQQAABBBBIX4ADWOmbMhEBBBBAAAEEECicQL1e79+8efOflFI7FC4cgRDwWCBJkoObzeaPPCag+oMIVCqVT1lrTwAIAQQQQACBqQgopS5otVpLp3It15RToFarvcFae0E529EKAWcFtDEmdjY9wRFAAAEEEEAAAQSmJcABrGlxcTECCCCAAAIIIOCmgNb6qSLCIQ83Hx+pyytwnTHmkPLWo9lMBQYHBytBEIzO9H7uQwABBBDwU0Ap9fJWq/V5P9vTevny5QsXLFhwh4gsQAMBBIohYK29NI5j/lJFMR4HKRBAAAEEEEAAgZ4LcACr58QsQAABBBAonUD3/z1t6VpRqOQCWuuTReT8ktekHgKuCZxhjHmfa6HJ21uBk0466ZHbtm273lq7c283MR0BBBBAoIQC/z1//vwnr1u37s4SdqPSFAS01h0RGZzCpVyCAAIZCFhr74jj+JEZrGIFAggggAACCCCAQAEEOIBVgIdABAQQQAABBBBAoNcCURR9RCnFV5L0Gpr5CExdINm6deuj16xZ87up38KVPgiEYfhfInKUD13piAACCCCQvoC19rOdTue49Ccz0QWBWq32Ymvtl1zISkYEfBHo7+9/9Hve857f+tKXnggggAACCCCAgM8CHMDy+enTHQEEEEAAAQS8EdBaXysiB3tTmKIIFF/gy8aYI4sfk4RZCoRh2D0o+5Esd7ILAQQQQKB8AtbaJZ1O5+Pla0aj7QnU6/Vg8+bNtyml9t7etfxzBBDIRiBJklc1m8312WxjCwIIIIAAAggggECeAhzAylOf3QgggAACCCCAQAYC9Xp9/vj4+CYRmZPBOlYggMAUBKy1w3Ect6ZwKZd4IjA4OLhPEATXi8jDPKlMTQQQQACB3glsSpLkKWNjY7/u3QomF1WgVqu911o7UtR85ELANwFr7dlxHK/wrTd9EUAAAQQQQAABHwU4gOXjU6czAggggAACCHglMDIy8owkSb7vVWnKIlBsgc0DAwO71+v1+4odk3RZCoRh+DkROSbLnexCAAEEECivgFLqG61W6wgRseVtSbMHEhgZGXlCkiQ3iQh/9s9bBIECCFhrvxPH8bMLEIUICCCAAAIIIIAAAj0W4IewHgMzHgEEEEAAAQQQyFtAa32qiHww7xzsRwCBfwiMGWOG8EDg7wKVSmWxtfaTiCCAAAIIIJCmgFJqaavVuiDNmcxyQ0Br3f0LOM9wIy0pESi9wPjAwMDCer0+UfqmFEQAAQQQQAABBDwX4ACW528A6iOAAAIIIIBA+QWiKLpIKfXa8jelIQLOCBxtjLnCmbQE7anA0NDQQqXUDSLyqJ4uYjgCCCCAgI8Cm+bMmfOkj33sY7/1sbzPnWu12unW2vf5bEB3BAom8BRjTPfrxnkhgAACCCCAAAIIlFiAA1glfrhUQwABBBBAAAEEugJa65+JyIFoIIBAIQTuGhgY2IO//VyIZ1GIEGEYfkhElhUiDCEQQAABBMoo8F/tdvulZSxGpwcXiKJoL6XUr0UkwAkBBPIXSJLkdc1m86L8k5AAAQQQQAABBBBAoJcCHMDqpS6zEUAAAQQQQACBnAXq9fqO4+PjfxKRvpyjsB4BBP5X4AJjzFIwEOgKLFmy5LCJiYnv8e9o3g8IIIAAAj0WCNvtdqfHOxhfMIEoir6tlPq3gsUiDgJeClhrPxDH8X96WZ7SCCCAAAIIIICARwIcwPLoYVMVAQQQQAABBPwTqFarzw2CYIN/zWmMQDEFrLUvjuP4K8VMR6osBZ73vOf177333ldZaw/Oci+7EEAAAQS8FLhr/vz5B61bt+5OL9t7Wlpr3T3scY6n9amNQNEEvm2MeU7RQpEHAQQQQAABBBBAIF0BDmCl68k0BBBAAAEEEECgUAK1Wu0Ma+3qQoUiDAL+CvxxYGBgT75+0N83wD83D8OwKiIxGggggAACCGQk8Ml2u/3qjHaxpgACK1eu3HNycnIjX0NYgIdBBARE7hsYGHh4vV5PwEAAAQQQQAABBBAorwAHsMr7bGmGAAIIIIAAAgiI1rr7VSODUCCAQCEE+PrBQjyG/EMMDg7uEwTBz0Rkh/zTkAABBBBAwCOBo9rt9hc96ut91SiKrlRK8ak73r8TACiCQBAEB6xateqmImQhAwIIIIAAAggggEBvBDiA1RtXpiKAAAIIIIAAAoUQ0FrfICIHFCIMIRDwXGBycvJFq1ev/qrnDNQXkTAMPykii8FAAAEEEEAgY4Ff7rrrrk9es2bNeMZ7WZeTQLVaXR4EwQdyWs9aBBD4JwFrbRjHcfcvyfFCAAEEEEAAAQQQKKkAB7BK+mCphQACCCCAAAIInH766QNz587dJCL9aCCAQO4CfP1g7o+gGAHCMHyWiHxbRPh5vBiPhBQIIICAbwLvbrfb7/CttK99q9XqHkEQdL+GsM9XA3ojUBQBa+3ZcRyvKEoeciCAAAIIIIAAAgikL8Af+KZvykQEEEAAAQQQQKAQArVa7VBr7dWFCEMIBBDg6wd5D0i9Xg9uvvnm7yulDoMDAQQQQACBnAS2KqWe1mq1bsxpP2szFqjVahustc/NeC3rEEDg/gLfMMa8ABgEEEAAAQQQQACB8gpwAKu8z5ZmCCCAAAIIIOC5QBRFr1dKrfOcgfoIFEXgaGPMFUUJQ458BMIwfJ2IXJjPdrYigAACCCDwD4Fvttvt54uIxaT8AlEULVNKfaj8TWmIQOEF7jXGLOLfvYV/TgREAAEEEEAAAQRmLMABrBnTcSMCCCCAAAIIIFBsgSiK3q+UenOxU5IOAS8E7hsYGNi1Xq//1Yu2lHxAgWXLlu24adOmX4jInhAhgAACCCBQAIGw3W53CpCDCD0WiKLokUqp7tcQ8ruAHlszHoHtCSilHttoNG7d3nX8cwQQQAABBBBAAAE3Bfihy83nRmoEEEAAAQQQQGC7Alrrb4rIv2/3Qi5AAIGeClhrPxXH8eKeLmF44QWGhobeq5QaKXxQAiKAAAII+CJwp7X2CZ1OZ5MvhX3uGUXRD5VST/fZgO4IFETgOGPMZwuShRgIIIAAAggggAACKQtwACtlUMYhgAACCCCAAAIFEVBa67tEpPvx9rwQQCBfgYoxpp1vBLbnKVCpVPa11t4gIvPzzMFuBBBAAAEE/llAKdVotVocDvbgbVGtVt8RBMGZHlSlIgJFF3i7MeasoockHwIIIIAAAggggMDMBDiANTM37kIAAQQQQAABBAotcMYZZ+zT399/W6FDEg4BPwQmgyDYfdWqVd0Dkbw8FQjD8JMiwqegefr8qY0AAggUWGDLtm3bDrrkkkt+WeCMREtBoFarHWytvTaFUYxAAIFZCFhrL4nj+MRZjOBWBBBAAAEEEEAAgQILcACrwA+HaAgggAACCCCAwEwFoih6uVKKj7WfKSD3IZCewDeMMS9IbxyTXBMYHBw8NAiCH4oIP3+79vDIiwACCHggkCTJZWNjY8d7UNX3it1PSP6NiOzlOwT9EchTwFr7sziOn5RnBnYjgAACCCCAAAII9E6APwDunS2TEUAAAQQQQACB3ASiKHq7UupduQVgMQII/F3gNGPM++HwV2BoaOhLSqkX+ytAcwQQQACBogv09fUd+fGPf/zLRc9JvtkJRFF0nlLqjbObwt0IIDBLgYnNmzfvuHbt2i2znMPtCCCAAAIIIIAAAgUU4ABWAR8KkRBAAAEEEEAAgdkKaK35uqvZInI/AikIJEnyuGazydf6pGDp4ogwDJ8jIle6mJ3MCCCAAAJeCdywcePGp27YsGHCq9aelR0ZGTk6SZIveFabuggUUeBpxpgfFzEYmRBAAAEEEEAAAQRmJ8ABrNn5cTcCCCCAAAIIIFBIAa31z0XkCYUMRygE/BH4hTHmif7Upem/CoRh+B0ReRYyCCCAAAIIFF3AWntqp9M5t+g5yTdzgXq9Pn/z5s1/VErtMPMp3IkAArMVsNaGcRx3ZjuH+xFAAAEEEEhHoHtcxKYziikIICAcwOJNgAACCCCAAAIIlEyg+wfr4+Pj94lIX8mqUQcB1wTOMcac7lpo8qYjMDQ09DKl1OfTmcYUBBBAAAEEei7w39bax3U6nU0938SC3AS01p8RkeNyC8BiBBCQJEkazWZzBAoEEEAAAQQQQACB8glwAKt8z5RGCCCAAAIIIOC5QLVafVoQBNd5zkB9BHIXUEod2Wg0vpx7EALkIaAqlco11tqD81jOTgQQQAABBGYiEATBmaOjo/WZ3Ms9bghUq9WTgiD4qBtpSYlAOQWstZfHcXxMOdvRCgEEEEAAAQQQ8FuAA1h+P3/aI4AAAggggEAJBarV6muCIBgrYTUqIeCMgLX2LwsWLHhEvV7/qzOhCZqaQKVSOdFae3FqAxmEAAIIIIBANgL39ff3P/6iiy76fTbr2JK1wMqVK3efnJy8Q4Rvxsjann0I/F1AKfXrRqPxGEQQQAABBBBAAAEEyifAAazyPVMaIYAAAggggIDnAlrrd4vI2zxnoD4CuQrwt5pz5c91+eLFi/vmz5//U2vt/rkGYTkCCCCAAAIzE/hgu91ePrNbucsFAa1199OSn+ZCVjIiUFIBu3nz5p3Wrl3LV76W9AFTCwEEEEAAAQT8FeAAlr/PnuYIIIAAAgggUFIBrfWnROSEktajFgKuCCwzxpznSlhypicQhuGwiHw8vYlMQgABBBBAIFOBrdu2bTvwkksu+WWmW1mWmUAURauVUmdktpBFCCBwPwGl1OGNRuOH0CCAAAIIIIAAAgiUS4ADWOV6nrRBAAEEEEAAAQREa32DiBwABQII5CeglHpso9G4Nb8EbM5JQA0NDV2vlDoop/2sRQABBBBAIA2BT7Tb7dekMYgZxROoVqsvCYLgiuIlIxECXglUjDFtrxpTFgEEEEAAAQQQ8ECAA1gePGQqIoAAAggggIA/AkuXLp2zaNGiv4jIHH9a0xSBwgncaIw5sHCpCNRzgeHh4eOTJLm054tYgAACCCCAQG8FbJIkh4yNjf2ot2uYnodAvV5fMD4+freIzMtjPzsRQOB/BM4yxrwdCwQQQAABBBBAAIFyCXAAq1zPkzYIIIAAAggg4LnAyMjIgUmS/CxVBisi/FdjqqQMK73A+40xp5W+JQXvJzA0NPRdpdQzoUEAAQQQQMB1gSRJLhsbGzve9R7kf2ABrfXXReT5+CCAQD4C1tpPxXG8OJ/tbEUAAQQQQAABBBDolQC/SuuVLHMRQAABBBBAAIEcBKIoeqVSan0Oq1mJAAJ/E0iS5Jhms3k5IH4JDA8PvzBJkq/41Zq2CCCAAAIlFrBKqcNbrdbVJe7obbUoit6qlDrLWwCKI5C/wPXGmKfkH4MECCCAAAIIIIAAAmkKcAArTU1mIYAAAggggAACOQtUq9V3BEFwZs4xWI+AzwITmzdv3mXt2rWbfEbwsXulUvmatfYFPnanMwIIIIBAOQWstZ/tdDrHlbOd361GRkaekSTJ9/1WoD0CuQr89dZbb91x/fr1k7mmYDkCCCCAAAIIIIBAqgIcwEqVk2EIIIAAAggggEC+Alrri0XkxHxTsB0BfwWstd+N4/jf/BXws/nw8PDhSZL8wM/2tEYAAQQQKLNAf3//4RdddNEPy9zRx26LFy/u22+//f4gIjv72J/OCBRBQCm1b6PRuK0IWciAAAIIIIAAAgggkI4AB7DScWQKAggggAACCCBQCIFarfZjay0fY1+Ip0EITwXeZYx5p6fdva09NDR0mVLqWG8BKI4AAgggUGaBz7Xbbf4/roRPOIqiTyulXlHCalRCwBWBlxhjvuRKWHIigAACCCCAAAIIbF+AA1jbN+IKBBBAAAEEEEDACYG//S3m+0RkvhOBCYlAOQWea4y5spzVaPVAAkNDQwcqpX4qIvx8zVsEAQQQQKCMAlYpdXir1bq6jOV87qS1PkVEzvXZgO4I5CxwmjHm/TlnYD0CCCCAAAIIIIBAigL8AXGKmIxCAAEEEEAAAQTyFKjVao+x1v4qzwzsRsBnAWvtXxYsWLBzvV7f6rODb93DMPywiPyHb73piwACCCDgj4C19tJOp3OCP439aDoyMvKEJEl+7kdbWiJQSIHzjDHLCpmMUAgggAACCCCAAAIzEuAA1ozYuAkBBBBAAAEEECiewIoVK17Y19f3leIlIxECfghYa78Yx/FRfrSlZVdgyZIlO01MTGwUkR0QQQABBBBAoMQCiVLqSa1W68YSd/Symtb6DhHZw8vylEYgf4GvGWNemH8MEiCAAAIIIIAAAgikJcABrLQkmYMAAggggAACCOQsUKvV3mitPS/nGKxHwGeBqjFmtc8AvnUPw7AqIrFvvemLAAIIIOCfQBAE60ZHR0/2r3m5G2utLxWR48vdknYIFFbgN8aYfQqbjmAIIIAAAggggAAC0xbgANa0ybgBAQQQQAABVYc7ygAAIABJREFUBBAopkAURauVUmcUMx2pECi/gLX2sDiOry5/Uxp2BRYvXtw3b968m0VkX0QQQAABBBDwQGDL3Llz97vwwgtv96CrNxVrtdoZ1lr+AoE3T5yiBRNINm/evGDt2rVbCpaLOAgggAACCCCAAAIzFOAA1gzhuA0BBBBAAAEEECiaQLVavSwIgmOLlos8CHgicN/AwMCier0+4Ulf72sODw8fnyRJ91MjeCGAAAIIIOCFgLU27nQ62ouynpQcGRl5RpIk3/ekLjURKJyAUurxjUbjlsIFIxACCCCAAAIIIIDAjAQ4gDUjNm5CAAEEEEAAAQSKJxBF0U+VUgcVLxmJECi/gLX2i3EcH1X+pjT8u0ClUvm6tfb5iCCAAAIIIOCRwKb+/v59Lrrooj951LnUVZcuXTpn0aJF3ee5oNRFKYdAQQWUUkc2Go0vFzQesRBAAAEEEEAAAQSmKcABrGmCcTkCCCCAAAIIIFBEgXq9HoyPj98nIgNFzEcmBMouYK1dGcfxqrL3pN//ClQqlSdZa6/HAwEEEEAAAd8ElFK61WrFvvUuc99qtfqNIAieV+aOdEOgqAJKqVMajcaHi5qPXAgggAACCCCAAALTE+AA1vS8uBoBBBBAAAEEECikgNb60SLy60KGIxQCHggkSfLsZrP5HQ+qUvF/D2Cdb609GQwEEEAAAQQ8FPjNxo0bH7thwwa+drkkD19r/W4ReVtJ6lADAdcEYmMMX+3q2lMjLwIIIIAAAggg8CACHMDirYEAAggggAACCJRAoFarvcBa+7USVKECAi4KjG/evHnR2rVrt7gYnszTE1i8ePHD582bdztf1TM9N65GAAEEECiVwCvb7fanS9XI4zLVavUlQRBc4TEB1RHIU2C9MeZVeQZgNwIIIIAAAggggEB6AhzASs+SSQgggAACCCCAQG4CtVptqbX2I7kFYDECfgt8wxjzAr8J/GlfqVTeaK09z5/GNEUAAQQQQOB+At9st9t8ZV1J3hjLly9fuGDBgrtFpK8klaiBgDMCSZJc02w2n+5MYIIigAACCCCAAAIIPKQAB7B4gyCAAAIIIIAAAiUQ0FobEYlKUIUKCDgnoJQ6s9Fo1J0LTuAZCVQqlR9Yaw+f0c3chAACCCCAQHkEntZut39cnjp+N9Fa/0hEnuq3Au0RyEXgbmPMLrlsZikCCCCAAAIIIIBA6gIcwEqdlIEIIIAAAggggED2AlEUfVop9YrsN7MRAQSstS+M45ivAPXgrfDa1772oMnJyZ96UJWKCCCAAAIIbE/go+12+w3bu4h/7oZAFEXnKaXe6EZaUiJQLoEtW7YsOuecc/5Urla0QQABBBBAAAEE/BTgAJafz53WCCCAAAIIIFAygVqt9mNr7VNKVos6CLggMGmtXRTH8Z9dCEvG2QkMDg6eHQTBW2Y3hbsRQAABBBAohcB4EAR7j46O3lWKNp6XqNVqb7DWXuA5A/URyEUgSZJDm83mtbksZykCCCCAAAIIIIBAqgIcwEqVk2EIIIAAAggggEA+Alrre0VkYT7b2YqA1wLXG2M4/OjBW2Dx4sVz58+f/1tr7W4e1KUiAggggAACUxGI2u12cyoXck2xBWq12sHWWg6AFPsxka6kAtbaE+I4vrSk9aiFAAIIIIAAAgh4JcABLK8eN2URQAABBBBAoIwCtVptkbX27jJ2oxMCRRew1p4fx/F/FD0n+WYvUKlUXmGt/fTsJzEBAQQQQACB0gj8ot1u7y8itjSNPC2ydOnSOYsWLdokIvM9JaA2ArkJWGv/M47jD+QWgMUIIIAAAggggAACqQlwACs1SgYhgAACCCCAAAL5CFSr1acFQXBdPtvZioDfAkmSvL7ZbF7ot4If7cMwvFxEXupHW1oigAACCCAwNYEkSZ47NjZ25dSu5qoiC1Sr1auCIDisyBnJhkAZBay1zTiOozJ2oxMCCCCAAAIIIOCbAAewfHvi9EUAAQQQQACB0glorY8VkctKV4xCCDggEATBQatWrbrBgahEnIXAkiVL9piYmPitiPTPYgy3IoAAAgggUDoBpVSr1WoNl66Yh4W01ueKyCkeVqcyArkKWGsvjuN4MNcQLEcAAQQQQAABBBBIRYADWKkwMgQBBBBAAAEEEMhPIIqiNyul3p9fAjYj4K3AvQMDAzvX6/XEWwFPiodhuEJEmp7UpSYCCCCAAALTERhPkuRRY2Nj90znJq4tnkAURa9XSq0rXjISIVBuAWvtt+I4/vdyt6QdAggggAACCCDghwAHsPx4zrREAAEEEEAAgRILaK3PFpG3lLgi1RAoqsCXjTFHFjUcudITCMPwahE5NL2JTEIAAQQQQKA8AtbaN3U6nQ+Vp5GfTfhqez+fO60LIXCbMWbfQiQhBAIIIIAAAggggMCsBDiANSs+bkYAAQQQQAABBPIX0Fp/SkROyD8JCRDwTuBdxph3etfas8KDg4P7BUFwi4jw87Nnz566CCCAAAJTFvhJu91+6pSv5sJCCixdunTOokWLNonI/EIGJBQC5RXYNjAwMJ9PVi7vA6YZAggggAACCPgjwB8g+/OsaYoAAggggAACJRWoVqtXBUFwWEnrUQuBwgokSXJMs9m8vLABCZaKQBiGK0XkPakMYwgCCCCAAAIlFZiYmDjkE5/4xHUlredNLa31D0TkcG8KUxSBgggkSbJns9n8fUHiEAOBfxHo/irZooIAAggggAACUxDgANYUkLgEAQQQQAABBBAosoDW+g8ismuRM5INgTIK9PX1PfK9733vHWXsRqf/XyAMw5+IyJMxQQABBBBA4CEFPP/dpFLq7FartYJ3idsCWutzReQUt1uQHgH3BKy1h8Vx3P3ac14IIIAAAggggAACDgtwAMvhh0d0BBBAAAEEEECgXq8vGB8fv4+vxuK9gEC2AtbaO+I4fmS2W9mWtcCSJUv2n5iYuDHrvexDAAEEEEDAQYHbt2zZ8uj169dPOpidyH8TqNVqS621HwEEAQSyFbDWHh/H8WXZbmUbAggggAACCCCAQNoCHMBKW5R5CCCAAAIIIIBAhgIjIyP7J0nC4YAMzVmFQFfAWnt5HMfHoFFugeHh4XqSJO8sd0vaIYAAAgggkI7A5OTkERdffPHX05nGlDwEtNbPFpFv5bGbnQj4LJAkyZubzeZanw3ojgACCCCAAAIIlEGAA1hleIp0QAABBBBAAAFvBbTWR4rIF70FoDgC+Qm8yxjDwZz8/DPZHIbhz0TkwEyWsQQBBBBAAAHHBZRSF7Zardc7XsPr+KeddtpO8+bNu8drBMojkIOAtdbEcVzLYTUrEUAAAQQQQAABBFIU4ABWipiMQgABBBBAAAEEshbQWp8sIudnvZd9CCAgxxljPotDeQXCMHyqiPyovA1phgACCCCAQOoCm3bdddc91qxZM576ZAZmJqC13igij8psIYsQQKD7Ccsfj+N4CRQIIIAAAggggAACbgtwAMvt50d6BBBAAAEEEPBcoFar1a21fAqP5+8D6mcvYK3dO47j7i+neJVUgK8fLOmDpRYCCCCAQK8FXtlutz/d6yXM752A1vpLIvLi3m1gMgII/KuAtfaKOI6PRgYBBBBAAAEEEEDAbQEOYLn9/EiPAAIIIIAAAp4LaK27n37V/RQsXgggkJGAtfYPcRzvntE61uQkEIbhNSJySE7rWYsAAggggICrAp9st9uvdjU8uUW01u8TkdOxQACBTAWuNcYcmulGliGAAAIIIIAAAgikLsABrNRJGYgAAggggAACCGQnEEXR55VSL8tuI5sQQMBa+8U4jo9CorwCJ5100iO3bt3a/YQzfmYu72OmGQIIIIBAbwTu23XXXXfjawh7g5vF1CiKXq+UWpfFLnYggMA/BDYaY/bGAwEEEEAAAQQQQMBtAf4w2e3nR3oEEEAAAQQQ8FxAa32tiBzsOQP1EchUwFpr4jiuZbo0q2XdnxBtVsuKuycMw6Ui8pHiJiQZAggggAAChRY4tt1uf67QCQn3oAJRFP0/pdT3IEIAgUwFthpj5vPTWKbmLEMAAQQQQAABBFIX4ABW6qQMRAABBBBAAAEEshPQWt8hIntkt5FNCCAgIhVjTBuJ8gqEYfhZEXl5eRvSDAEEEEAAgd4JWGsv6nQ6r+vdBib3UiCKoocppe7lk0B7qcxsBO4voJTaudFo3IMNAggggAACCCCAgLsCHMBy99mRHAEEEEAAAQQ8F6jX6/3j4+N/FZE+zymoj0CmAkmSHNxsNn+U6VKWZSawZMmS+RMTE38UkR0yW8oiBBBAAAEEyiVw18aNG/fYsGHDRLlq+dNGa/1rEXm0P41pikD+AkEQHLBq1aqb8k9CAgQQQAABBBBAAIGZCnAAa6Zy3IcAAggggAACCOQsEEXRXkqp3+Ycg/UI+CYwMTAw8LB6vd49/MirhAKVSuVoa+0XSliNSggggAACCGQmYK19YafT+VpmC1mUqkAURf+llDoq1aEMQwCB7Qk81xhz5fYu4p8jgAACCCCAAAIIFFeAA1jFfTYkQwABBBBAAAEEHlKgVqsdZq29CiYEEMhOIEmSm5rN5gHZbWRT1gJhGH5IRJZlvZd9CCCAAAIIlElAKfWhVqv1pjJ18qmL1vp9InK6T53pikDeAkmSvKrZbK7POwf7EUAAAQQQQAABBGYuwAGsmdtxJwIIIIAAAgggkKuA1vpYEbks1xAsR8A/gfXGmFf5V9ufxkNDQ79SSj3Gn8Y0RQABBBBAIH0Ba+1vO50OX2GXPm0mE7XWp4rIBzNZxhIEEPi7wJuMMd2/DMILAQQQQAABBBBAwFEBDmA5+uCIjQACCCCAAAII1Gq1N1prz0MCAQSyE7DW1uM4PjO7jWzKUmBoaOhApdTPstzJLgQQQAABBMoqYK09qNPp3FDWfmXupbU+UkS+WOaOdEOgaALW2nfHcfyOouUiDwIIIIAAAggggMDUBTiANXUrrkQAAQQQQAABBAolEEXRu5RSby9UKMIgUHIBa+0JcRxfWvKa3tYbGhparpT6gLcAFEcAAQQQQCBFgSAIzhgdHe1+lR0vxwRqtdrjrLU3OxabuAg4LaCUOrfRaHQ/fY4XAggggAACCCCAgKMCHMBy9MERGwEEEEAAAQQQiKLoAqXUG5BAAIHsBKy1+8dx/PPsNrIpS4EwDLuH647Pcie7EEAAAQQQKLHAV9rt9otL3K+01ZYuXTpn0aJFm0Wkv7QlKYZAwQSstRfHcTxYsFjEQQABBBBAAAEEEJiGAAewpoHFpQgggAACCCCAQJEEoij6glLq6CJlIgsCeQhYEcnoB5tt99xzzw7nn3/+tjx6srO3AvV6Pbjlllv+ICK79HYT0xFAAAEEEPBGYMvChQsfce65597nTeMSFY2i6JdKqf1KVIkqCBRd4EvGmJcUPST5EEAAAQQQQAABBB5cIKPfU/AIEEAAAQQQQAABBNIWqFarVwVBcFjac5mHAAIPKvBzY8z++JRTIAzDQ0TkmnK2oxUCCCCAAAL5CFhrj+l0Opfns52tsxHQWn9ZRF40mxnciwAC0xK4yhjzjGndwcUIIIAAAggggAAChRLgAFahHgdhEEAAAQQQQACBqQtEUXSrUmrfqd/BlQggMBsBpdTnGo3GsbOZwb3FFRgaGjpDKbW6uAlJhgACCCCAgJMC57bb7VOdTO556CiKzlNKvdFzBuojkKXAzcaYJ2S5kF0IIIAAAggggAAC6QpwACtdT6YhgAACCCCAAAKZCWitN4nIwzJbyCIEPBdIkmR1s9mses5Q2vphGH5BRPha19I+YYohgAACCOQhoJT6eavV4hNE88Cf5U6t9QoRac5yDLcjgMDUBe4yxjxi6pdzJQIIIIAAAggggEDRBDiAVbQnQh4EEEAAAQQQQGAKAvV6fe74+PhfRYT/npuCF5cgkIaAUurkRqOxLo1ZzCiWwPOe97z+vfba6y4RWVisZKRBAAEEEEDAfYG5c+c+6sILL7zd/SZ+NYii6Dil1Gf8ak1bBHIVmDTGzBERm2sKliOAAAIIIIAAAgjMWIBf2M2YjhsRQAABBBBAAIH8BFauXLnn5OQkv8TI7xGw2U+B5xpjrvSzerlbh2H4LBH5Trlb0g4BBBBAAIF8BIIgOHF0dPSSfLazdaYCWusni8hPZno/9yGAwPQFNm/e/PC1a9d2P+2cFwIIIIAAAggggICDAhzAcvChERkBBBBAAAEEEFixYsWT+vr6rkcCAQSyE0iSZM9ms/n77DayKSuBSqUyYq19b1b72IMAAggggIBPAtbaD3c6nVN86lyGrvV6fcfx8fE/l6ELHRBwRUAptW+j0bjNlbzkRAABBBBAAAEEEPi/AhzA4h2BAAIIIIAAAgg4KFCtVp8bBMEGB6MTGQFXBe41xuzkanhyP7RApVL5vLX2ZTghgAACCCCAQE8Ebmy32wf2ZDJDeyqgtf6TiDy8p0sYjgAC/xBQSh3SaDSugwQBBBBAAAEEEEDATQEOYLn53EiNAAIIIIAAAp4LRFH0SqXUes8ZqI9AlgLXGmMOzXIhu7ITCMOw+8lmu2e3kU0IIIAAAgh4JWDnz5+/57p16+70qnUJykZR9FOl1EElqEIFBJwQUEod0Wg0vu5EWEIigAACCCCAAAII3E+AA1i8KRBAAAEEEEAAAQcFarXaUmvtRxyMTmQEnBSw1l4ax/EJToYn9EMKnHjiiY/p7+//FUwIIIAAAggg0DsBpdSrWq0Wf4Gkd8Q9may1/pKIvLgnwxmKAAL3E7DWnhDH8aXQIIAAAggggAACCLgpwAEsN58bqRFAAAEEEEDAc4Eoit6qlDrLcwbqI5CZgLX27DiOV2S2kEWZCVQqlROttRdntpBFCCCAAAIIeCiglDqn1Wqd7mF1pytrrT8qIic5XYLwCDgkkCTJa5vN5qhDkYmKAAIIIIAAAggg8E8CHMDi7YAAAggggAACCDgooLV+n4jwCwwHnx2R3RRIkuTNzWZzrZvpp5G6+xOincb1Jbi0UqmssdaeVoIqVEAAAQQQQKCwAtba73U6nWcVNiDBHlBAa32miLwDHgQQyExgmTHmvMy2scgBAQ9/SHfgqRARAQQQQACBBxPgABbvDQQQQAABBBBAwEGBKIpGlVIVB6MTGQEnBZIkOabZbF7uZHhCP6TA0NDQd5VSz4QJAQQQQAABBHoq8NctW7Y8fP369Vt7uoXhqQrUarWl1tqPpDqUYQgg8KAC1toojuMmRAgggAACCCCAAAJuCnAAy83nRmoEEEAAAQQQ8FwgiqIvKKWO9pyB+ghkJjA5Ofnk1atX/zSzhSzKRODQQw+dc8ABB9wrIgOZLGQJAggggAACHgsopQ5rtVpXe0zgXHWt9UtFhL+E4NyTI7CrAkqpMxuNRt3V/ORGAAEEEEAAAQR8F+AAlu/vAPojgAACCCCAgJMCWusfiMjhToYnNAIOClhrF8Zx/GcHoxP5IQSWLFly2MTExFUgIYAAAggggEDvBay1p3Y6nXN7v4kNaQlorZ8qIj9Kax5zEEDgoQWstWfHcbwCJwQQQAABBBBAAAE3BTiA5eZzIzUCCCCAAAIIeC4QRdEvlVL7ec5AfQSyEvijMWbXrJaxJzuBoaGhU5VSH8xuI5sQQAABBBDwVyBJktGxsbHX+ivgXvORkZFdkiT5o3vJSYyAmwLW2g/HcXyKm+lJjQACCCCAAAIIIMABLN4DCCCAAAIIIICAgwJa63tEZCcHoxMZAecEkiS5ptlsPt254ATersDw8PAFSZK8YbsXcgECCCCAAAIIzFpAKXVTq9U6YNaDGJClgNJa/4Wva86SnF0+CyilOo1GI/TZgO4IIIAAAggggIDLAhzAcvnpkR0BBBBAAAEEvBSo1+v94+PjW0WE/5bz8h1A6awFlFKfazQax2a9l329F6hUKj+w1vJ1rr2nZgMCCCCAAAJdgWThwoUPP/fcc++Dwx0BPn3ZnWdF0lIIXGaMOb4UTSiBAAIIIIAAAgh4KMAv7Tx86FRGAAEEEEAAAbcFqtXqHkEQ3OF2C9Ij4I6AUurcRqNxqjuJSToVgXq9Htxyyy33isiOU7meaxBAAAEEEEBg9gJKqf/XarV+MPtJTMhKQGv9fRF5Rlb72IOA5wJfMca82HMD6iOAAAIIIIAAAs4KcADL2UdHcAQQQAABBBDwVSCKoid2v77D1/70RiAHgbcbY87KYS8reygwODi4XxAEv+zhCkYjgAACCCCAwP0FTm632+uAcUcgiqIvKKWOdicxSRFwWuD7xphnOt2A8AgggAACCCCAgMcCHMDy+OFTHQEEEEAAAQTcFKjVaodaa692Mz2pEXBPwFp7UhzHH3MvOYkfSmBwcPDYIAguQwkBBBBAAAEEshNQSn2g1Wr9Z3Yb2TRbAa31x0VkeLZzuB8BBKYkcL0x5ilTupKLEEAAAQQQQAABBAonwAGswj0SAiGAAAIIIIAAAg8tUK1WnxsEwQacEEAgGwGl1JGNRuPL2WxjS1YCg4ODbwuC4N1Z7WMPAggggAACCPyPwIZ2u/18LNwRiKJotVLqDHcSkxQBpwV+YYx5otMNCI8AAggggAACCHgswAEsjx8+1RFAAAEEEEDATQGt9UtF5HI305MaAScFnmSM+ZmTyQn9oAJhGF4iIq+CCAEEEEAAAQSyE1BK3d1qtXbJbiObZisQRdGIUuq9s53D/QggMCWB24wx+07pSi5CAAEEEEAAAQQQKJwAB7AK90gIhAACCCCAAAIIPLSA1rp7YKB7cIAXAghkILBly5ZF55xzzp8yWMWKDAXCMLxBRA7IcCWrEEAAAQQQQEBE5s6d+6gLL7zwdjDcENBanywi57uRlpQIOC9wuzHmUc63oAACCCCAAAIIIOCpAAewPH3w1EYAAQQQQAABdwWiKHqdUupCdxuQHAGnBMaNMQucSkzY7QocddRR83bZZZf7RKR/uxdzAQIIIIAAAgikKmCtfWGn0/laqkMZ1jOBKIqOU0p9pmcLGIwAAv8scJcx5hGQIIAAAggggAACCLgpwAEsN58bqRFAAAEEEEDAY4Fqtbo8CIIPeExAdQSyFOArILLUzmjX0NDQk5VSP8loHWsQQAABBBBA4J8ElFKntFqtD4PihkC1Wn1OEARXupGWlAg4L/BnY8xC51tQAAEEEEAAAQQQ8FSAA1iePnhqI4AAAggggIC7AlEUjSil3utuA5Ij4I6AtfbqOI4PcycxSaciMDw8fHySJJdO5VquQQABBBBAAIF0BZRSZ7darRXpTmVarwSiKDpAKdX96mZeCCDQe4Etxpj5vV/DBgQQQAABBBBAAIFeCHAAqxeqzEQAAQQQQAABBHooUKvVzrLWvrWHKxiNAAJ/E7DWfjGO46MAKZdAGIbdX/o2y9WKNggggAACCDgj8Ll2u32sM2k9D3rGGWc8or+//789Z6A+AlkJWGNMkNUy9iCAAAIIIIAAAgikK8ABrHQ9mYYAAggggAACCPRcQGu9RkRO6/kiFiCAgCilOo1GI4SiXAJhGJ4rIqeUqxVtEEAAAQQQcEbgxna7faAzaT0Punjx4r799ttvq4hwKMTz9wL1sxEYGBiYV6/Xu/+b44UAAggggAACCCDgmAAHsBx7YMRFAAEEEEAAAQSiKLpAKfUGJBBAIBOBc4wxp2eyiSWZCQwNDX1RKXVkZgtZhAACCCCAAAL/LLBly5YtO6xfv34SFjcEtNZ/FpEd3UhLSgTcFhgYGHhYvV6/z+0WpEcAAQQQQAABBPwU4ACWn8+d1ggggAACCCDgsIDW+mIROdHhCkRHwCWBtxtjznIpMFm3LxCG4c0i8rjtX8kVCCCAAAIIINALgYmJiX0/8YlP3NaL2cxMXyCKotuVUnumP5mJCCDwrwJbt27dZc2aNXcjgwACCCCAAAIIIOCeAAew3HtmJEYAAQQQQAABzwWiKPq8UuplnjNQH4FMBJRSpzQajQ9nsowlmQh0v0Zn3rx54yIyJ5OFLEEAAQQQQACB+wlMTk4ecfHFF38dGjcEtNY/F5EnuJGWlAi4LZAkyZ7NZvP3brcgPQIIIIAAAggg4KcAB7D8fO60RgABBBBAAAGHBbTW3V9UPN/hCkRHwBkBpdQrG43Gp50JTNDtClQqlX2ttbdu90IuQAABBBBAAIFeCry23W6P9nIBs9MTqFarVwdBcGh6E5mEAAIPJrB169a91qxZ8zuEEEAAAQQQQAABBNwT4ACWe8+MxAgggAACCCDguYDW+gcicrjnDNRHIBMBpdQRjUaDT2fIRDubJUNDQ0copb6azTa2IIAAAggggMADCSilVrZarVXouCFQrVa/EQTB89xIS0oE3Bbo7+9/9Hve857fut2C9AgggAACCCCAgJ8CHMDy87nTGgEEEEAAAQQcFtBa/0xEDnS4AtERcEbAWntYHMdXOxOYoNsVqFQqJ1trz9/uhVyAAAIIIIAAAr0UOLfdbp/aywXMTk8giqLPK6Velt5EJiGAwIMJWGv3juN4I0IIIIAAAggggAAC7glwAMu9Z0ZiBBBAAAEEEPBcQGv9axF5tOcM1EcgE4EgCJ64atWqX2SyjCWZCFQqlXdba9+WyTKWIIAAAggggMADClhrP9vpdI6Dxw2BKIrGlFKvcSMtKRFwW4BPwHL7+ZEeAQQQQAABBPwW4ACW38+f9ggggAACCCDgoIDW+i4R2dnB6ERGwDmBJEn2bDabv3cuOIEfVCAMw3Ui8nqIEEAAAQQQQCBXgWva7fbTc03A8ikLRFH0EaXU0infwIUIIDBjAQ5gzZiOGxFAAAEEEEAAgdwFOICV+yMgAAIIIIAAAgggMD0BrfVmERmY3l1cjQACMxEYGBjYoV6vd/83x6skAmEYfkFEji5JHWoggAACCCDgqsCd7XZ7D1fD+5a7Wq02gyBY4Vtv+iKQk8A+xpjf5LSbtQgggAACCCCAAAIA10q2AAAgAElEQVSzEOAA1izwuBUBBBBAAAEEEMhDQGu9TUT689jNTgQ8E5gwxszxrHPp64ZheLWIHFr6ohREAAEEEECg2ALJxo0b523YsGGi2DFJ1xWIouidSqk6GgggkIkAB7AyYWYJAggggAACCCCQvgAHsNI3ZSICCCCAAAIIINBTAa11IiL8d1xPlRmOwP8I3G2M2QWLcgmEYXi7iOxZrla0QQABBBBAwD0BpdTurVbrD+4l9y+x1votInK2f81pjED2AhMTE485++yzf539ZjYigAACCCCAAAIIzFaAX9zNVpD7EUAAAQQQQACBDAUWL17ct99++/G3xDM0Z5W/AtbaX8VxvJ+/AuVrXq/Xg1tuuWULnyJYvmdLIwQQQAAB9wSUUge2Wq0b3UvuX+IoipYppT407eaWvzo0bTNu8F6AA1jevwUAQAABBBBAAAGHBTiA5fDDIzoCCCCAAAII+CdQr9fnjo+Pdw8P8EIAgd4LXG+MeUrv17AhK4ElS5bsMTExcUdW+9iDAAIIIIAAAg8uEATBc0ZHR7+NUfEFoih6vVJqXfGTkhAB9wWUUvs2Go3b3G9CAwQQQAABBBBAwD8BDmD598xpjAACCCCAAAIOC9Tr9QXj4+N/cbgC0RFwSeAqY8wzXApM1ocWOPHEEw/u7++/FicEEEAAAQQQKITA8e12+7JCJCHEQwpUq9XhIAg+DhMCCPRegANYvTdmAwIIIIAAAggg0CsBDmD1Spa5CCCAAAIIIIBADwSWL1++cMGCBff2YDQjEUDg/gLfNsY8B5jyCAwNDR2llPqv8jSiCQIIIIAAAu4KKKXe0Gq1PupuA3+Sa61PFJGL/WlMUwTyE+AAVn72bEYAAQQQQAABBGYrwAGs2QpyPwIIIIAAAgggkKHA6aefvvPcuXPvynAlqxDwWeCrxpgX+QxQtu5hGL5ORC4sWy/6IIAAAggg4KKAUkq3Wq3Yxey+Za7VaidYaz/lW2/6IpCHwNatW/das2bN7/LYzU4EEEAAAQQQQACB2QlwAGt2ftyNAAIIIIAAAghkKrBixYrd+vr67sx0KcsQ8FTAWnt5HMfHeFq/lLUHBwdPD4LgfaUsRykEEEAAAQQcE7DWxp1ORzsW28u4WuvufxN/zsvylEYgY4HJycndV69e/YeM17IOAQQQQAABBBBAIAUBDmClgMgIBBBAAAEEEEAgK4GVK1fuOTk5eXtW+9iDgOcCnzbGvNJzg1LVHx4eridJ8s5SlaIMAggggAACjgoopT7UarXe5Gh8r2JrrY8UkS96VZqyCOQkoJTaudFo3JPTetYigAACCCCAAAIIzEKAA1izwONWBBBAAAEEEEAga4G3vvWte09MTPwm673sQ8BHAaVUp9FohD52L2vnSqWyxlp7Wln70QsBBBBAAAGXBJIk+djY2NhJLmX2NWutVnuBtfZrvvanNwJZCgwMDDysXq/fl+VOdiGAAAIIIIAAAgikI8ABrHQcmYIAAggggAACCGQi8La3vW3fbdu23ZrJMpYggMCFxpjXw1AegUql8lFrLb/oLc8jpQkCCCCAgMMC1tpLOp3OiQ5X8Ca61vrZIvItbwpTFIEcBTZv3jx/7dq1W3KMwGoEEEAAAQQQQACBGQpwAGuGcNyGAAIIIIAAAgjkIVCr1R5nrb05j93sRMBDgfOMMcs87F3aypVK5VPW2hNKW5BiCCCAAAIIuCXw+Xa7/XK3IvuZtlarHWatvcrP9rRGIFuBW2+9tX/9+vWT2W5lGwIIIIAAAggggEAaAhzASkORGQgggAACCCCAQEYCIyMj+ydJcmNG61iDgNcC1toPxnG83GuEkpUfGhr6ilLqhSWrRR0EEEAAAQScFFBKfb3Vah3hZHjPQler1acFQXCdZ7Wpi0AeAokxpi+PxexEAAEEEEAAAQQQmL0AB7Bmb8gEBBBAAAEEEEAgMwGt9UEi8tPMFrIIAb8F1hpj3uw3QbnaDw0NXaWUOqxcrWiDAAIIIICAmwJBEHx/dHT0mW6m9ys1P4f69bxpm6vAFmPM/FwTsBwBBBBAAAEEEEBgxgIcwJoxHTcigAACCCCAAALZC/A3j7M3Z6PXAu83xpzmtUDJylcqlZustU8sWS3qIIAAAggg4KrA9e12+ymuhvcp94oVK57U19d3vU+d6YpATgL3GWMeltNu1iKAAAIIIIAAAgjMUoADWLME5HYEEEAAAQQQQCBLgVqtdqi19uosd7ILAY8FzjHGnO5x/9JVD8PwDhHZo3TFKIQAAggggICbAje22+0D3YzuV2qt9ZNF5Cd+taYtArkI3GOM2TmXzSxFAAEEEEAAAQQQmLUAB7BmTcgABBBAAAEEEEAgO4Eoig5XSv0gu41sQsBrgTXGmLd4LVCy8mEY/llEdixZLeoggAACCCDgpIBS6uetVmt/J8N7FnrFihVP6evr+7FntamLQOYC1to/xHG8e+aLWYgAAggggAACCCCQigAHsFJhZAgCCCCAAAIIIJCNwIoVK57Z19f33Wy2sQUB7wXeZ4w5w3uFEgGEYbhFROaWqBJVEEAAAQQQcFngF+12m68GduAJaq2fKiI/ciAqERFwXeA3xph9XC9BfgQQQAABBBBAwFcBDmD5+uTpjQACCCCAAAJOCvAJWE4+NkI7KpAkyepms1l1ND6xH0AgDMNJEQnAQQABBBBAAIFCCNzSbrcfX4gkhHhIgWq1+rQgCK6DCQEEei5wozGGr2btOTMLEEAAAQQQQACB3ghwAKs3rkxFAAEEEEAAAQR6IlCr1Q621l7bk+EMRQCB/yNgrW3GcRzBUg6BxYsX982bN2+iHG1ogQACCCCAQCkEbm23248tRZOSl+Dn0JI/YOoVRsBae3Ucx4cVJhBBEEAAAQQQQAABBKYlwAGsaXFxMQIIIIAAAgggkK+A1vrJIvKTfFOwHQE/BKy1Z8dxvMKPtuVvedRRR83bZZdd/lr+pjREAAEEEEDADQFr7W2dTmdfN9L6nbJarR4SBME1fivQHoHeCyilvtloNJ7X+01sQAABBBBAAAEEEOiFAAeweqHKTAQQQAABBBBAoEcCIyMj+ydJcmOPxjMWAQT+ScBa+4E4jv8TlHIILFu2bMdNmzb9uRxtaIEAAggggEApBH7dbrcfU4omJS9Rq9UO7X4yT8lrUg+B3AWstVfEcXx07kEIgAACCCCAAAIIIDAjAQ5gzYiNmxBAAAEEEEAAgXwEarXa46y1N+ezna0I+CVgrf1wHMen+NW6vG0HBwcXBUFwd3kb0gwBBBBAAAHnBDiA5cgji6Lo6UqpHzoSl5gIOCtgrf1UHMeLnS1AcAQQQAABBBBAwHMBDmB5/gagPgIIzF6g+y9SO/sxTEAAAQSmJFCr1R5jrf3VlC7mIgQQmJWAtfajcRy/YVZDuLkwAosXL9513rx5fyhMIIIggAACCCDguYBS6uetVmt/zxmcqF+r1Q6z1l7lRFhCIuCwgLX243EcL3G4AtERQAABBBBAAAGvBTiA5fXjpzwCCCCAAAIIuCZw+umnP2ru3LkbXctNXgRcFLDWtuI4HnYxO5nvL3DSSSc9cuvWrb/DBgEEEEAAAQQKI3B9u91+SmHSEORBBaIoOlwp9QOIEECg5wLnGWOW9XwLCxBAAAEEEEAAAQR6IsABrJ6wMhQBBBBAAAEEEOiNwMqVK3efnJz8fW+mMxUBBP5F4BPGmNegUg6BwcHBfYIguK0cbWiBAAIzF+AzjGdux50IpC5wdbvdPiz1qQxMXUBr/WwR+VbqgxmIAAL/RyBJktXNZrMKCwIIIIAAAggggICbAhzAcvO5kRoBBBBAAAEEPBUYGRnZJUmSP3pan9oIZCpgrb00juMTMl3Ksp4JnHjiiY/p7+/nK1x7JsxgBBBAAAEEpi3wnXa73T3Yw6vgAlEUHaGU+mrBYxIPgTIIvMsY884yFKEDAggggAACCCDgowAHsHx86nRGAAEEEEAAAWcFli9fvnDBggX3OluA4Ag4JJAkyeebzebLHYpM1IcQGB4eflSSJHyFK+8SBBBAAAEECiKglPp6q9U6oiBxiPEQAlrrl4rI5SAhgEDPBbQxJu75FhYggAACCCCAAAII9ESAA1g9YWUoAggggAACCCDQG4F6vb5gfHz8L72ZzlQEEPgXga8aY16ESjkEKpXKbtbaO8vRhhYIIIAAAgiUQuCKdrt9dCmalLxEFEWvUEp9uuQ1qYdA7gLW2lPjOD439yAEQAABBBBAAAEEEJiRAAewZsTGTQgggAACCCCAQD4CS5cunbNo0aKt+WxnKwJ+CVhrvxfH8bP8al3etkuWLNlpYmLinvI2pBkCCCCAAALOCXym3W6/wrnUHgaOomhIKdX2sDqVEchUIEmSwWazeXGmS1mGwD8Eur8ytngggAACCCCAwCwEOIA1CzxuRQABBBBAAAEEchBQWuskh72sRMBHgeuNMU/xsXgZO1cqlR2stfeVsRudEEAAAQQQcFHAWntRp9N5nYvZfcscRdHrlVLrfOtNXwRyEDjaGHNFDntZiQACCCCAAAIIIJCCAAewUkBkBAIIIIAAAgggkKWA1npCRPqy3MkuBHwUsNb+Ko7j/XzsXsbOixcvnjtv3rwtZexGJwQQQAABBFwUSJLk/WNjY6e5mN23zFrrU0Xkg771pi8CWQtMTk4+a/Xq1d/Lei/7EEAAAQQQQAABBNIR4ABWOo5MQQABBBBAAAEEMhPQWv9VROZltpBFCPgr8N/GmN38rV+65ioMQz5BsHSPlUIIIIAAAq4KBEFw5ujoaN3V/D7lrtVqZ1hrV/vUma4I5CEQBMEBq1atuimP3exEAAEEEEAAAQQQmL0AB7Bmb8gEBBBAAAEEEEAgUwGt9Z9FZMdMl7IMAT8FNhtjdvCzejlbh2G4TUT6y9mOVggg4L5A94/prPs1aIDAFAWSJHnL2NjYmilezmU5CmitV4rIe3KMwGoEvBBIkmTPZrP5ey/KUhIBBBBAAAEEECihAAewSvhQqYQAAggggAAC5RbQWt8jIjuVuyXtECiEgL311lvnrF+/frIQaQgxa4EwDDeLyMCsBzEAAQQQQAABBGYtYK19fafTuXDWgxjQcwGt9Zki8o6eL2IBAp4LDAwMDNTr9e6nnvNCAAEEEEAAAQQQcFCAA1gOPjQiI4AAAggggIDfAlrr7t+G3N1vBdojkJnATsaYezPbxqKeCoRh+CcReXhPlzAcAQQQQAABBKYq8Mp2u/3pqV7MdfkJaK2NiET5JWAzAl4IbDHGzPeiKSURQAABBBBAAIGSCnAAq6QPlloIIIAAAgggUF4BrfUtIvLY8jakGQLFEbDW7h3H8cbiJCLJbATCMLxdRPaczQzuRQABBBBAAIHUBF7cbre/kto0BvVMQGv9ARFZ3rMFDEYAga7AncaYPaBAAAEEEEAAAQQQcFeAA1juPjuSI4AAAggggICnAlrrH4nIUz2tT20EshZ4mjHmx1kvZV9vBCqVyk3W2if2ZjpTEUAAAQQQQGA6AkmSHDw2Ntb92YZXwQWi6P9j797D5Kjq/I9/z5khyQQFERGUcBECiIjcBOUmiAmgiPe4MFM9RhZBwahAuk9PAK1VYPpUB6MgXoIiTNcMYlzvS7wvKoqroqIiXgBR4yKLUVxjJpnM1Pk97Y9VLoG5dXXXqXrP8/hXqr7n83mdVmemz3RVrlVKvS7jMYmHgO8Cd1hrn+V7CfIjgAACCCCAAAJFFuAAVpF3n+4IIIAAAggg4KVApVK5WSl1tJfhCY2AZwJKqRfVarWveRabuI8hEATBd0TkeQAhgAACCCCAQOcF5s2bt8uHP/zh+zqfhASTCRhjPikir5zsOv4dAQRmLuCcuyWKoqNmPoE7EUAAAQQQQAABBDotwAGsTu8A6yOAAAIIIIAAAtMUqFQqa5VSJ0/zNi5HAIEZCCRJ8tp6vb5mBrdySwYF+vr6vqiUOjGD0YiEAAIIIIBA0QQmNm/ePHfNmjUTRSvuY19jzFdE5EU+ZiczAr4IOOfWRlH0El/ykhMBBBBAAAEEEEDg0QIcwOJVgQACCCCAAAIIeCZQqVTWKKVe41ls4iLgpYBS6k21Wu2DXoYn9KMEgiD4uIgsgQYBBBBAAAEEOi5wbxzHT+94CgJMSaBSqXxPKfXcKV3MRQggMCMB59x1URQtndHN3IQAAggggAACCCCQCQEOYGViGwiBAAIIIIAAAghMXaBSqVyjlHr91O/gSgQQmKmAc+6iKIounen93JctgVKptNo594ZspSINAggggAACxRNQSv2w0WgcWrzmfjY2xvxCRPb1Mz2pEfBDwDlXj6Ko4kdaUiKAAAIIIIAAAghsTYADWLwuEEAAAQQQQAABzwSMMVeIyDLPYhMXAV8FVllrz/c1PLkfLhAEQV1EluOCAAIIdESg+Vs415GVWRSBLAqsjeOYR21lcWe2kskY8wcR2dmTuMREwEsB51wliqLmzyt8IYAAAggggAACCHgqwAEsTzeO2AgggAACCCBQXIFqtXqZc26guAI0R6CtAkPW2te1dUUWS02gt7f3Iq31u1JbgMEIIIAAAgggMCWBJEk+OjIycsaULuaijgsYYzaKSE/HgxAAgRwLOOeWRlF0XY4rUg0BBBBAAAEEEMi9AAewcr/FFEQAAQQQQACBvAlUKpUBpdRleetFHwSyKOCcuzGKolOymI1M0xfo6+tbppRqfoogXwgggAACCCDQQQHn3ODw8PCKDkZg6SkKnHXWWdvssMMOY1O8nMsQQGCGAlrrUwYHB2+c4e3chgACCCCAAAIIIJABAQ5gZWATiIAAAggggAACCExHoFKpvEUp9d7p3MO1CCAwY4EfWmsPnfHd3JgpgSAI+kWEvyrP1K4QBgEEEECgoAJnx3G8uqDdvao9MDCwY5Ikf/QqNGER8FBAKfXcWq12q4fRiYwAAggggAACCCDwoAAHsHgpIIAAAggggAACnglUKpXXK6Wu8Sw2cRHwVeA+a+0uvoYn98MFgiBofprZ53FBAAEEEEAAgc4KdHV1nXTdddd9qbMpWH0qAtVqdS/n3F1TuZZrEEBg5gLd3d27X3rppb+b+QTuRAABBBBAAAEEEOi0AAewOr0DrI8AAggggAACCExToFwuL9Faf3yat3E5AgjMTCDp6emZG4bh+Mxu564sCZx22mmHdHd3/yBLmciCAAIIIIBAEQWSJNl3ZGTkV0Xs7lvncrl8sNb6h77lJi8Cvgn09PT0hGG4ybfc5EUAAQQQQAABBBD4pwAHsHg1IIAAAggggAACngmUy+WTtdZrPYtNXAS8FRgbG1uwatWq33tbgOD/EFi6dOku4+Pj90KCAAIIIIAAAh0VSNavXz9/7dq1mzuagsWnJFCtVo93zv3nlC7mIgQQmKnA/1prt5/pzdyHAAIIIIAAAgggkA0BDmBlYx9IgQACCCCAAAIITFnAGHOMiHxzyjdwIQIIzErAOXd4FEXfn9UQbs6EQBiG+s4772y+2dudiUCEQAABBBBAoJgC6+I43q2Y1f1rbYx5rYjc4F9yEiPglcCvrLX7epWYsAgggAACCCCAAAKPEuAAFi8KBBBAAAEEEEDAMwFjzEEi8iPPYhMXAZ8FXmat/ZzPBcj+T4EgCNaJyK6YIIAAAggggEDHBG6O4/jYjq3OwtMSqFQq5yilrprWTVyMAALTEnDOfTuKoqOndRMXI4AAAggggAACCGROgANYmdsSAiGAAAIIIIAAAo8vUC6X99Za34kTAgi0R0ApdXatVlvdntVYJW2BIAi+JyLPTXsd5iOAAAIIIIDAYwrEcRyX8PFDoFKpvEMpFfqRlpQI+CngnPtEFEVL/ExPagQQQAABBBBAAIH/E+AAFq8FBBBAAAEEEEDAM4Hly5c/taur6z7PYhMXAZ8F3mmtfYfPBcj+T4EgCD4jIi/DBAEEEEAAAQQ6JvD2OI7f1bHVWXhaApVK5Uql1JundRMXI4DAdAXea61923Rv4noEEEAAAQQQQACBbAlwACtb+0EaBBBAAAEEEEBgUoGzzjprmx122GGziPC93KRaXIBASwSGrLWva8kkhnRcIAiCD4rI2R0PQgAEEEAAAQQKKqC1XjI0NPSJgtb3rnalUrlBKfVa74ITGAG/BMrW2pV+RSYtAggggAACCCCAwCMFeNOO1wQCCCCAAAIIIOChgDHmARHZ3sPoREbAR4FvWGuP8zE4mR8t0Nvb+w6tNY/R4cWBAAIIIIBAhwS6urqefd11193eoeVZdpoC5XL5q1rrE6Z5G5cjgMD0BE631n5serdwNQIIIIAAAggggEDWBDiAlbUdIQ8CCCCAAAIIIDAFAWPMr0Rk4RQu5RIEEJilgHPud1EU7T7LMdyeEYFSqfQG59zqjMQhBgIIIIAAAkUTGF+/fv0T1q5d2/xEX748EDDG/FhEDvQgKhER8FngWGvtzT4XIDsCCCCAAAIIIIAAj63hNYAAAggggAACCHgpUKlUvq2UOtLL8IRGwD+BpKenpycMwzH/opP4kQKlUukk59wXkEEAAQQQQACBjgj8Mo7j/TqyMovOSMAYc6+I7DKjm7kJAQSmJKCUekatVrtnShdzEQIIIIAAAggggEBmBfgErMxuDcEQQAABBBBAAIHHFiiXy5/VWp+KEQIItEcgSZKF9Xr9rvasxippCgRB0Pz0wOanCPKFAAIIIIAAAm0WcM59Znh4+BVtXpblZi6gjDHNTyvbZuYjuBMBBCYRcBs3buy58sor+WRAXioIIIAAAggggIDnAhzA8nwDiY8AAggggAACxRQwxnxERM4oZntaI9B+gYmJicUrV678SvtXZsVWCxx//PHdCxYs2Mgbia2WZR4CCCCAAAJTErBxHFendCUXdVygWq3u4Jz7U8eDEACBfAvcZ63lU+byvce0QwABBBBAAIGCCHAAqyAbTU0EEEAAAQQQyJeAMcaKSCVfrWiDQHYFlFJvqNVqH85uQpJNRyAIguYnYDU/CYsvBBBAAAEEEGivwOviOB5q75KsNlOBcrm8j9b6lzO9n/sQQGBKAj+w1h42pSu5CAEEEEAAAQQQQCDTAhzAyvT2EA4BBBBAAAEEENi6gDFmuYjU8UEAgfYIJElSq9frA+1ZjVXSFujr6/uCUuqktNdhPgIIIIAAAgg8XEApdWCj0fgpLn4IlMvlY7XW3/AjLSkR8FMgSZLP1ev1l/mZntQIIIAAAggggAACDxXgABavBwQQQAABBBBAwEOBcrm8VGv9UQ+jExkBLwWcc5+MoujVXoYn9KMESqXS+5xz50KDAAIIIIAAAm0V2HTHHXdsd+utt25p66osNmOBcrl8utZ6ZMYDuBEBBCYVUEq9v1ar8bPJpFJcgAACCCCAAAIIZF+AA1jZ3yMSIoAAAggggAACjxIwxpwiIp+HBgEE2ibwM2vtAW1bjYVSFejt7T1Pa/3uVBdhOAIIIIAAAgg8TMA5973h4eEjYPFHoFqtXuCcW+lPYpIi4J+Ac25FFEWD/iUnMQIIIIAAAggggMAjBTiAxWsCAQQQQAABBBDwUGBgYOB5SZJ8x8PoREbAV4Gxnp6ebcMwHPe1ALn/KVAqlU51zn0WEwQQQAABBBBoq8DqOI7PbuuKLDYrAWNM88D6ebMaws0IIPC4Akqp02q12g0wIYAAAggggAACCPgvwAEs//eQBggggAACCCBQQIFqtbqXc+6uAlanMgIdE0iSZGG9Xue/dx3bgdYtXCqV9nfO/ax1E5mEAAIIIIAAApMJKKXe1Gg0PjjZdfx7dgQqlcoNSqnXZicRSRDIn4Bz7nlRFH03f81ohAACCCCAAAIIFE+AA1jF23MaI4AAAggggEAOBCqVyhOVUv+bgypUQMAbAa31KYODgzd6E5igjynw4he/eO6OO+64UUQ0TAh4LdD8rY7zugHhEUCgQALOuSOHh4f5FF+P9twY800ROcajyERFwDuB8fHxnS6//PI/ehecwAgggAACCCCAAAKPEuAAFi8KBBBAAAEEEEDAUwFjzCYRmetpfGIj4J2AUur8Wq22yrvgBN6qQBAEvxKRhfAggAACCCCAQFsEJubPn7/d6tWrmweg+fJEoFKp3K2UeoYncYmJgI8Cf7XWbudjcDIjgAACCCCAAAIIPFqAA1i8KhBAAAEEEEAAAU8FjDHrRGRXT+MTGwEfBT5krX2jj8HJ/GiBUqn0Cefcq7FBAAEEEEAAgbYI3BbH8cFtWYlFWiWgjDHNA3PzWjWQOQgg8CiB26y1/G8jLwwEEEAAAQQQQCAnAhzAyslGUgMBBBBAAAEEiidgjPmhiPCLuuJtPY07J3CztfbYzi3Pyq0U6O3tfYfWOmzlTGYhgAACCCCAwGMKfCCO43Pw8UdgYGBgxyRJeCyaP1tGUj8FPm2tfaWf0UmNAAIIIIAAAggg8EgBDmDxmkAAAQQQQAABBDwVMMZ8SUQWexqf2Aj4KPC/1toniYjzMTyZHy4QBMErRORTuCCAAAIIIIBA+gJJkvSPjIw00l+JFVolYIw5SER+1Kp5zEEAga0KvNtaewE2CCCAAAIIIIAAAvkQ4ABWPvaRFggggAACCCBQQIFqtRo75/oKWJ3KCHRMQCn1jFqtdk/HArBwywR6e3v30lrf1bKBDEIAAQQQQACBxxTYsmXLwhtuuIH/3/XoNVIul0/WWq/1KDJREfBOwDm3LIqi93kXnMAIIIAAAggggAACWxXgABYvDAQQQAABBBBAwFOBcrk8qLWuehqf2Aj4KvAKa+1nfA1P7ocJqCAIHhCR7XBBAAEEEEAAgfQElFL/02g0dk5vBSanIVCpVP5VKfXhNGYzEwEE/iHwUmvtf+CBAAIIIIAAAgggkA8BDmDlYx9pgQACCCCAAAIFFDDGnCsi/KVkAfeeyp0TcM69PYqid3UuASu3UiAIgm+JyFGtnMksBBBAAAEEEHi4gO6woDEAACAASURBVHPuM8PDw81H//LlkYAxpvk970UeRSYqAt4JOOeeFUXRHd4FJzACCCCAAAIIIIDAVgU4gMULAwEEEEAAAQQQ8FSgUqm8TCnFJ/F4un/E9lbg3621r/E2PcEfJtDX1/cBpdQbYUEAAQQQQACBVAWqcRzbVFdgeMsFeOR9y0kZiMAjBZKxsbEnrFq1ahQaBBBAAAEEEEAAgXwIcAArH/tICwQQQAABBBAooEC1Wj3EOfeDAlanMgKdFPiVtXbfTgZg7dYJBEHwJhF5f+smMgkBBBBAAAEEtiLwgjiOv4mMXwKVSuVbSik+KdSvbSOtRwJKqd/UarU9PYpMVAQQQAABBBBAAIFJBDiAxUsEAQQQQAABBBDwVOCCCy54Snd39/2exic2Ar4KJBMTE9utXLnyb74WIPc/BYIgaL6p2HwMIV8IIIAAAgggkI7AxvXr1z957dq1m9MZz9S0BIwxvxeRp6c1n7kIICBfstaehAMCCCCAAAIIIIBAfgQ4gJWfvaQJAggggAACCBRQwBjTPAQyv4DVqYxAJwWOtdbe3MkArN0agfPOO6/n/vvvf0BE5rRmIlMQQAABBBBA4BECX47j+ERU/BIIw3De6OjoRhHh/QO/to60Hgk4566IouitHkUmKgIIIIAAAggggMAkAvwAxUsEAQQQQAABBBDwWMAY80sR2cfjCkRHwDsBpdT5tVptlXfBCbxVgSAIviciz4UHAQQQQAABBFovoJRa0Wg0Bls/mYlpCgwMDDwzSZI70lyD2QgUXcA5d24URTwOvegvBPojgAACCCCAQK4EOICVq+2kDAIIIIAAAggUTaBcLn9Va31C0XrTF4FOCjjnro+iqLeTGVi7dQKlUukK59yy1k1kEgIIIIAAAgj8n4BS6vmNRuO/EPFLwBjzYhG50a/UpEXALwHn3KIoir7qV2rSIoAAAggggAACCDyeAAeweH0ggAACCCCAAAIeCxhjrhORfo8rEB0BHwXustYu9DE4mR8t0NfX16uUGsYGAQQQQAABBFou8Nd169Y9+aabbhpv+WQGpipQqVTOUUpdleoiDEeg4AJjY2MLVq1a9fuCM1AfAQQQQAABBBDIlQAHsHK1nZRBAAEEEEAAgaIJVKvVS5xzFxatN30R6LCA01rvNDg4uL7DOVi+BQKlUukZzrm7WzCKEQgggAACCCDwEAGl1OcbjcapoPgnUC6X61rr5f4lJzECfgg45/4WRdETRcT5kZiUCCCAAAIIIIAAAlMR4ADWVJS4BgEEEEAAAQQQyKiAMeZsEflgRuMRC4E8C5xsrf1ingsWqVsQBPeKyC5F6kxXBBBAAAEE0hbQWl8wNDT07rTXYX7rBYwxnxCRV7d+MhMRQKApkCTJrfV6/bloIIAAAggggAACCORLgANY+dpP2iCAAAIIIIBAwQQGBgZekiTJfxSsNnUR6LiAc+7tURS9q+NBCNASgd7e3k9prV/RkmEMQQABBCYVaP46jg+8mJSJC7wX0FofNDQ09GPvixSwgDHmVhE5tIDVqYxAuwRGrLV97VqMdRBAAAEEEEhTgJ9w09Rltm8CHMDybcfIiwACCCCAAAIIPERg+fLlz+nq6roNFAQQaK9AkiSfq9frL2vvqqyWlkAQBEZEamnNZy4CCCCAAAIFFFgXx/HunDb0c+eNMX8SkR38TE9qBLIvkCTJO+r1+juzn5SECCCAAAIIIIAAAtMR4ADWdLS4FgEEEEAAAQQQyJhAtVrdwTnX/OU4Xwgg0F6B9dbanXhTsb3oaa3W29v7Aq3119Oaz1wEEEAAAQQKKLA6juPm49L58kzgggsueEp3d/f9nsUmLgJeCSilTqvVajd4FZqwCCCAAAIIIIAAApMKcABrUiIuQAABBBBAAAEEsi1gjPmriDwh2ylJh0D+BLTWBwwODv4sf82K1+iss86av3Hjxj+LyJzitacxAggggAACqQi8Mo7jT6cymaGpCpTL5aO11jenugjDEUDg2dba22FAAIEcCvAsthxuKpUQQACBqQtwAGvqVlyJAAIIIIAAAghkUqBcLt+htX5mJsMRCoF8C7zRWvuhfFcsTrsgCG4SkeOK05imCCCAAAIIpCYwNmfOnKdcc801zT8U4cszgXK5fIbW+iOexSYuAj4JbP7zn//8xNWrV2/xKTRZEUAAAQQQQAABBCYX4ADW5EZcgQACCCCAAAIIZFrAGPMFETkp0yEJh0AOBZRSw7VaLchhtUJWCoLgYhF5ZyHLUxoBBBBAAIEWCjjnvjI8PLy4hSMZ1UaBSqVSU0qZNi7JUggUTeA2a+3BRStNXwQQQAABBBBAoAgCHMAqwi7TEQEEEEAAAQRyLVCtVq9yzp2T65KUQyCbAuustbtlMxqppisQBMFRIvKt6d7H9QgggAACCCDwcIEkSc4fGRlZhYufAsaYT4nIK/xMT2oEsi/gnGtEUdSf/aQkRAABBBBAAAEEEJiuAAewpivG9QgggAACCCCAQMYEKpXK25RSvMGRsX0hTmEE9rDW/rYwbXNc9Pjjj+9esGDBehHZLsc1qYYAAggggEDqAt3d3ftfe+21P099IRZIRcAYc7uIPCuV4QxFAAFxzlWiKKpDgQACCCCAAAIIIJA/AQ5g5W9PaYQAAggggAACBRMwxpwiIp8vWG3qIpAJAedcEEXRcCbCEGLWAkEQfFZETp31IAYggAACCCBQXIFfxnG8X3Hr+918yZIlXXvttdcGEZnndxPSI5BpgZOttV/MdELCIYAAAggggAACCMxIgANYM2LjJgQQQAABBBBAIDsC5XJ5H631L7OTiCQIFEfAObc6iqKzi9M4302DIHiriLwn3y1phwACCCCAQKoCl8VxfGGqKzA8NYFqtbqXc+6u1BZgMAIIyNjY2IJVq1b9HgoEEEAAAQQQQACB/AlwACt/e0ojBBBAAAEEECiYQBiG3aOjoxtFZJuCVacuAlkQuNNau08WgpBh9gKve93rDpiYmPjp7CcxAQEEEEAAgWIKKKUObzQa3y9me/9bG2NeLCI3+t+EBghkVuBP1todM5uOYAgggAACCCCAAAKzEuAA1qz4uBkBBBBAAAEEEMiGgDGm+QlYHALJxnaQomAC22yzzV6XXHLJrwtWO691VRAEzb9Gf1peC9ILAQQQQACBFAXWxXG8u4i4FNdgdIoClUrlbUqpVSkuwWgEii7wn9baE4qOQH8EEEAAAQQQQCCvAhzAyuvO0gsBBBBAAAEEvBNofmM203cqKpXKfyilXuJdaQIjkA+Bs6y1V+ejCi2CIGiISIAEAggggAACCExPQCl1RaPRaD7Oly9PBYwx7xeRN3kav8Wxmz+d8/ZJi1EZJ/Jea+3bgEAAAQQQQAABBBDIpwA/QeRzX2mFAAIIIIAAAgUTMMY0/0qZX+IVbN+pmw0B59zHoyj6l2ykIcVsBYIgOF1ERmY7h/sRQAABBBAomkCSJMeNjIx8o2i989S3XC5/VWvNp/PkaVPpkikBpdQbarXahzMVijAIIIAAAggggAACLRPgAFbLKBmEAAIIIIAAAgh0TqBSqZyjlLqqcwlYGYFCC/yxp6dn5zAMk0Ir5KT8kiVLtp87d+7/iMicnFSiBgIIIIAAAqkLKKX+Z9OmTU9fs2bNROqLsUBqAsaYP4jIzqktwGAECi6glDqiVqt9r+AM1EcAAQQQQAABBHIrwAGs3G4txRBAAAEEEECgSALVavVE59wXi9SZrghkSSBJksPq9foPspSJLDMX6Ovr+7JSatHMJ3AnAggggAACxRJQSl3daDTOKlbrfLW94IILntLd3X1/vlrRBoFMCYxt3LhxuyuvvHJzplIRBgEEEEAAAQQQQKBlAhzAahklgxBAAAEEEEAAgc4JVKvVPZ1zv+5cAlZGoPACxlobFV4hJwB9fX3LlFJX5KQONRBAAAEEEEhdYGJi4kXXX3/911JfiAVSE6hWqyc4576a2gIMRqDgAkmS3Fqv159bcAbqI4AAAggggAACuRbgAFaut5dyCCCAAAIIIFAUgTAM9ejo6N9EZF5ROtMTgSwJJEnytXq9/qIsZSLLzAX6+/t3T5LkHhHhZ+aZM3InAggggEBxBO7dvHnzbjx+0O8Nr1Qqb1FKvdfvFqRHINMCV1tr+aTATG8R4RBAAAEEEEAAgdkJ8Mvk2flxNwIIIIAAAgggkBkBY8ztIvKszAQiCALFEtiyefPmp77nPe95oFi189s2CIIfichB+W1IMwQQQAABBFomsCqO4/NbNo1BHREwxqwWkTd0ZHEWRaAAAkqps2u1WvO/Z3whgAACCCCAAAII5FSAA1g53VhqIYAAAggggEDxBMrl8qe11i8vXnMaI5ANgSRJXluv19dkIw0pZitQKpX+zTn39tnO4X4EEEAAAQTyLtDd3X3Etdde+72898x7P2PMLSLy/Lz3pB8CnRJQSj23Vqvd2qn1WRcBBBBAAAEEEEAgfQEOYKVvzAoIIIAAAggggEBbBMrlcl1rvbwti7EIAgg8SsA5d10URUuhyYdAb2/vYVrr7+ejDS0QQAABBBBITeCuOI73ERGX2goMboeAMsY0P8l1u3YsxhoIFFBgbOPGjdtdeeWVmwvYncoIIIAAAggggEBhBDiAVZitpigCCCCAAAII5F2gWq2e5Zz7UN570g+BDAvc39PTs0sYhkmGMxJt6gIqCILfisiCqd/ClQgggAACCBRLQCn1zkaj8Y5itc5f22q1uqdz7tf5a0YjBLIh4Jz7fhRFh2cjDSkQQAABBBBAAAEE0hLgAFZassxFAAEEEEAAAQTaLFAul4/TWt/U5mVZDgEEHiLgnDsyiqLvgJIPgVKpdIVzblk+2tACAQQQQACB1gsopZ7VaDTuaP1kJrZToFwuv1Rr/bl2rslaCBRJwDm3Ooqis4vUma4IIIAAAm0QaJ704HNo2wDNEghMXYADWFO34koEEEAAAQQQQCDTAuedd96T58yZsz7TIQnnv0Dzh3p+ini8fbzEWnux/xtNg6ZAf3//kUmSfBsNBBBAAAEEEHi0gFLqh41G41Bs/BeoVCoDSqnL/G9CAwQyK3CWtfbqzKYjGAIIIIAAAggggEBLBHjrpCWMDEEAAQQQQAABBLIhYIxZJyK7ZiMNKRAopMCPrLWHFLJ5Pks3H0N4p4jslc96tEIAAQQQQGBWAuU4jlfOagI3Z0KgWq3Gzrm+TIQhBAI5FEiS5LB6vf6DHFajEgIIIIAAAggggMBDBDiAxcsBAQQQQAABBBDIkUClUlmrlDo5R5WogoB3Attss81el1xyya+9C07grQqUSqVLnHMXwoMAAggggAACDxMYF5Hd4zi+Fxf/BarV6m3Ouef434QGCGRSYFNPT8/2YRiOZTIdoRBAAAEEEEAAAQRaJsABrJZRMggBBBBAAAEEEOi8gDHGikil80lIgEBxBZRSy2u12uXFFchX81KptL9z7mf5akUbBBBAAAEEZi1wYxzHp8x6CgM6LrBs2bK58+fP/6uIbNPxMARAIJ8CN1trj81nNVohgAACCCCAAAIIPFSAA1i8HhBAAAEEEEAAgRwJGGMCEWnkqBJVEPBOwDl3SxRFR3kXnMCPKRAEwW0iwqdC8BpBAAEEEEDgnwL/EsfxxwHxX6BarR7unPuu/01ogEA2BZxz9SiK+EO5bG4PqRBAAAEEEEAAgZYKcACrpZwMQwABBBBAAAEEOitgjDlIRH7U2RSsjkDhBVx3d/cel1566e8KL5ETgL6+vqpSajAndaiBAAIIIIDAbAX+stNOOz1t1apVo7MdxP2dFzDGnC0iH+x8EhIgkE+BiYmJV61cufJT+WxHKwQQQAABBBBAAIGHCnAAi9cDAggggAACCCCQI4EwDOeMjo42Hx8xJ0e1qIKAdwLOuWVRFL3Pu+AE3qpAf3//7kmS3CMi/AzNawQBBBBAoPACzrkPDg8Pv6nwEDkBMMY0D181D2HxhQACKQgkSfK0er3+hxRGMxIBBBBAAAEEEEAgYwL88jhjG0IcBBBAAAEEEEBgtgKVSuUnSqlnz3YO9yOAwMwFkiS5qV6vv3DmE7gzawJBEHxTRI7JWi7yIIAAAggg0G4B59yRw8PD32n3uqyXjkC5XP6u1vrwdKYzFYFiCzjn7o6iaO9iK9AeAQQQQAABBBAojgAHsIqz1zRFAAEEEEAAgYIIGGOGRaS3IHWpiUBWBZIkSXblL52zuj3Tz1Uqld7onPvA9O/kDgQQQAABBHIl8Ms4jvfLVaMClwnDsPvBT1CeV2AGqiOQpkBsrS2luQCzEUAAAQQQQAABBLIjwAGs7OwFSRBAAAEEEEAAgZYIGGOqIjLYkmEMQQCB2Qi80Vr7odkM4N7sCCxZsmT7uXPn/l5Ets1OKpIggAACCCDQdoEL4zi+rO2rsmAqAsaYA0Xkx6kMZygCCDQF3mytvQoKBBBAAAEEEEAAgWIIcACrGPtMSwQQQAABBBAokIAx5hQR+XyBKlMVgawKfMNae1xWw5Fr+gK9vb3XaK1fP/07uQMBBBBAAIFcCExorfcaGhr6bS7aUELK5fJSrfVHoUAAgXQEkiQ5pF6v/yid6UxFAAEEEEAAAQQQyJoAB7CytiPkQQABBBBAAAEEZilw4YUX7jY+Ps6bIrN05HYEWiDglFJ71Wq1e1owixEZEOjv7z8ySZJvZyAKERBAAAEEEOiEwGfjOH55JxZmzXQEKpXKe5VSb0lnOlMRKLaAc+5v8+fPf1IYhuPFlqA9AggggAACCCBQHAEOYBVnr2mKAAIIIIAAAgUSMMasF5EnF6gyVRHIqsCAtbaW1XDkmr5AEATNv2A/aPp3cgcCCCCAAAJ+CzjnTh0eHuaTdv3exoelN8Z8U0SOyVElqiCQJYGvWmsXZSkQWRBAAAEEEEAAAQTSFeAAVrq+TEcAAQQQQAABBDoiYIz5uoi8oCOLsygCCPxDwDn30yiKDoQkPwJBELxVRN6Tn0Y0QQABBBBAYEoC6zZv3rznmjVrJqZ0NRdlXiAMQz06OvqAiDwx82EJ2EIBJyK8LdRC0McbdYm19uI2rcUyCCCAAAIIIIAAAhkQ4DvtDGwCERBAAAEEEEAAgVYLlMvl92mtz231XOYhgMCMBA621t42ozu5KXMCS5cufdL4+PjvRWR+5sIRCAEEEEAAgZQEtNb/NjQ0FKY0nrEdEHjw0fW/EJGeDizPkgjkXsA5d2IURV/OfVEKIoAAAggggAACCPxDgANYvBgQQAABBBBAAIEcChhjzhaRD+awGpUQ8FEgstYaH4OTeesCQRDEItKHDwIIIIAAAgURSJIk2WtkZOQ3BelbmJphGHaPjo4+3zn3UufcIq31ISKiCwNAUQTSE9gyMTGxw8qVK/+W3hJMRgABBBBAAAEEEMiaAAewsrYj5EEAAQQQQAABBFogMDAw8LwkSb7TglGMQACB2Qus6+np2SMMw2T2o5iQBYFSqXScc+6mLGQhAwIIIIAAAm0QuDGO41PasA5LdFhg+fLlT+3q6lokIotF5EQReXqHI7E8Al4KOOe+HUXR0V6GJzQCCCCAAAIIIIDAjAU4gDVjOm5EAAEEEEAAAQSyK7Bs2bK58+fP/4uIzM1uSpIhUByBiYmJxStXrvxKcRrnvqkKguB2Edk/900piAACCCCAgMgr4zj+NBDFE6hWq3uJyKLmp2OJyEkisl3xFGiMwIwELrPWXjijO7kJAQQQQAABBBBAwFsBDmB5u3UERwABBBBAAAEEHl+gXC5/V2t9OE4IIJAJgY9Za0/PRBJCtEQgCAIe9doSSYYggAACCGRc4A933HHH7rfeeuuWjOckXsoCzccVbtq06aCHHMg6XkS6U16W8Qh4KaCUOqlWq33Jy/CERgABBBBAAAEEEJixAAewZkzHjQgggAACCCCAQLYFyuXy+7TW52Y7JekQKIzA2Pj4+K6XX375HwvTOOdFzzvvvJ7777//tyLylJxXpR4CCCCAQIEFlFKXNhqNiwpMQPXHEBgYGNhxfHz8BKXUIqVU83GFe4KFAAJ/Fxh3zj05iqK/4oEAAggggAACCCBQLAEOYBVrv2mLAAIIIIAAAgUSqFQqr1NKXVugylRFINMCSZK8pV6vX5npkISblkCpVLrEOcejRaalxsUIIIAAAh4JuC1btuxzww033OVRZqJ2SOARjytcLCJP6lAUlkWgowLOuVuiKDqqoyFYHAEEEEAAAQQQQKAjAhzA6gg7iyKAAAIIIIAAAukLVCqV/ZVSP0t/JVZIQ8CJCN+spyHbuZlKqR/XarXmY1v4yonAmWeeufOmTZvuEZF5OalEDQQQQAABBP4h4Jz70vDw8EmQIDBdgSVLlnTtvffeBz/kcYXHicg2053D9Qj4KKCUGqzVait8zE5mBBBAAAEEEEAAgdkJ8J7O7Py4GwEEEEAAAQQQyLKAMsb8ib88zvIWka1oAkmSHFav139QtN557tvb23ud1ro/zx3phgACCCBQTAGt9ZKhoaFPFLM9rVspEIbhEzZs2PB8rXXzcYWnisizWjmfWQhkTOBka+0XM5aJOAgggAACCCCAAAJtEOAAVhuQWQIBBBBAAAEEEOiUgDHmKyLyok6tz7oIIPBwAaXU+2u12rm45Eegr6/vQKXUbXxoXX72lCYIIIAAAn8XuO+OO+7Y7dZbb92CBwKtFnjE4woXicgOrV6DeQh0SGDcOffkKIr+2qH1WRYBBBBAAAEEEECggwIcwOogPksjgAACCCCAAAJpC5TL5UGtdTXtdZiPAAJTFnigp6dn1zAMN075Di7MvECpVPqac+6FmQ9KQAQQQAABBKYuYOM45ueIqXtx5QwFmo8r3GOPPY5QSi3WWi8WkeeLSPcMx3EbAp0W+I619shOh2B9BBBAAAEEEEAAgc4IcACrM+6sigACCCCAAAIItEVg+fLlr+zq6vpkWxZjEQQQmJKAUuoNtVrtw1O6mIu8ECiVSqc65z7rRVhCIoAAAgggMLmAS5Jkv5GRkV9NfilXINBageXLl28rIkc2H1fonFuktT6stSswDYH0BJxz74qi6O3prcBkBBBAAAEEEEAAgSwLcAAry7tDNgQQQAABBBBAYJYCK1aseNrExMR/z3IMtyOAQGsFbrPWHtzakUzrpEAYhvrOO+/8qYjs38kcrI0AAggggEArBJRSX2s0GjzGvBWYzJi1QLlc3kVEjlVKnaqUeomI7DjroQxAICWBJEleUK/Xv5nSeMY+rkDz7U6HEQIIIIAAAggg0FEBDmB1lJ/FEUAAAQQQQACB9AWMMetEZNf0V2IFBBCYhsDR1tpvT+N6Ls24QBAEfSISZzwm8RBAAAEEEJhUQGt92tDQ0A2TXsgFCLRZoHnofdOmTYeIyN8/Hat5MEtE5rY5Bssh8FgCf/3zn/+84+rVq7dAhAACCCCAAAIIIFBMAQ5gFXPfaY0AAggggAACBRIwxjQfQfjKAlWmKgI+CIxYa5sHdvjKicCSJUu65s2bd7tzbr+cVKIGAggggEAxBe5fv379bmvXrt1czPq09kkgDMP5GzZsOOohjys8VER4z8OnTcxX1k9ba/ndS772lDYIIIAAAggggMC0BPhhZFpcXJwpAT5RNlPbQRgEEEAAgewKVCqVAaXUZdlNSDIECikw1tXVtftll112XyHb57R0b2/vUq31R3Naj1oIIIAAAgUQUEpd2mg0LipAVSrmUGDFihU7b9my5QVKqUVKqVP4JOgcbnKGKznnzo2i6P0Zjkg0BBBAAAEEEEAAgZQFOICVMjDjEUAAAQQQQACBTgtUKpUXKaW+0ukcrI8AAg8XcM5dFEXRpbjkR6D5KVhz5869Q0T2yU8rmiCAAAIIFEhgYnx8fOHHPvaxewrUmao5FqhWq3s1H1eYJMmpzUNZIjIvx3Wp1mGBJEkW1uv1uzocg+URQAABBBBAAAEEOijAAawO4rM0AggggAACCCDQDgFjzPYi8icR0e1YjzUQQGBqAs65382fP3+vMAzHp3YHV/kgEATBmSJytQ9ZyYgAAggggMAjBD4bx/HLUUEgjwLnnXdez5w5c17gnFustV7snDuQxxXmcac708k5d3cURXt3ZnVWRQABBBBAAAEEEMiKAAewsrIT5EAAAQQQQAABBFIUMMb8TET2T3EJRiOAwMwE/sVa+/GZ3cpdWRQ47LDDttl///1/ISLPyGI+MiGAAAIIIPA4Ai+O4/gLCCFQBIFyubyL1nqRc+7E5qdkKaWeVoTedExHwDn3wSiK3pTOdKYigAACCCCAAAII+CLAASxfdoqcCCCAAAIIIIDALAQqlcrVSqnmp7LwhQACGRJwzn0/iqLDMxSJKC0QKJVKb3TOfaAFoxiBAAIIIIBAuwTuXrhw4T5hGCbtWpB1EMiSwP89rtA513xU4Ukisl2W8pEl2wLOuVdGUfTpbKckHQIIIIAAAggggEDaAhzASluY+QgggAACCCCAQAYEKpVKSSk1lIEoREAAgUcLHGutvRmY/Ag8+ClYvxKRPfLTiiYIIIAAAjkXqMRxXM95R+ohMCWBMAy7N23adJCInDoxMfFSrfUhIqKndDMXFVGg+Uj5p1hr/1LE8nRGAAEEEEAAAQQQ+KcAB7B4NSCAAAIIIIAAAgUQMMbsLiK/KUBVKiLgo8CnrLWv8iN480dI50fUDqcMgqD5qYNXdzgGyyOAAAIIIDAVgc0TExMLrr/++j9O5WKuQaBoAgMDAzslSfKi5uMKlVKLRWRB0Qzo+9gCzrlvRVF0DEYIIIAAAggggAACCHAAi9cAAggggAACCCBQEAFjzK9FZM+C1KUmAj4JJEqp/Wq12p0+hSbr4wssWbKka86cObcppQ7ACgEEEEAAgSwLKKUajUajP8sZyYZAlgQe8bjCE0Vk+yzlI0t7BZxzK6IoGmzvqqyGAAIIIIAAAgggkEUBDmBlcVfIhAACCCCAz5gVHAAAIABJREFUAAIIpCBgjLlORHhjJQVbRiIwW4EkSa6q1+tvnu0c7s+WQBAELxORz2QrFWkQQAABBBB4uIDW+qihoaFbcEEAgekLNA/d77333geLyCLn3CIROU5Etpn+JO7wWOA51tqfeJyf6AgggAACCCCAAAItEuAAVosgGYMAAggggAACCGRdoFwun6G1/kjWc5IPgYIKbNRa7z44OLi+oP1zW7tUKn3NOffC3BakGAIIIICA7wK3xXHcPDzCFwIItEAgDMMnjI6OvtA591IRWayUekYLxjIiuwK/tdbukd14JEMAAQQQQAABBBBopwAHsNqpzVoIIIAAAggggEAHBarV6kLn3K86GIGlEUDg8QUuttZeAlK+BPr7+49IkuQ7IsLP3/naWtoggAACeRE4O47j1XkpQw8EsiZQLpf3UUo1D2ItFpETRGS7rGUkz8wF+CTjmdtxJwIIIIAAAgggkEcBfgGcx12lEwIIIIAAAggg8BgCxph1IrIrQAggkEmB9T09PXuGYbghk+kINWOBIAjWiMhrZjyAGxFAAAEEEEhH4K9z5szZ9ZprrvlrOuOZigACDxXYyuMKXyAic1DyWuBka+0XvW5AeAQQQAABBBBAAIGWCXAAq2WUDEIAAQQQQAABBLIvUKlURpRSp2c/KQkRKKzABdbadxe2fU6L9/b27qW1voM32HK6wdRCAAEE/BV4XxzHy/yNT3IE/BZYvnz5tiJypNZ6kXNukdb6ML8bFS79hp6enp3CMNxUuOYURgABBBBAAAEEENiqAAeweGEggAACCCCAAAIFEqhWq290zn2gQJWpioBvAn8YGxvba9WqVaO+BSfv4wuUSqX3OefOxQkBBBBAAIGsCCilDmw0Gj/NSh5yIFB0gRUrVjxty5Yti7XWLxWRF4nIk4tukuX+zrlPRlH06pZlbL5b51o2jUEIIIAAAggggAACHRDgAFYH0FkSAQQQQAABBBDolMDAwMCzkiS5vVPrsy4CCExJ4BxrLQclp0Tlz0WlUumpzrlfisj2/qQmKQIIIIBAjgW+EcfxcTnuRzUEvBbYyuMKjxWRuV6Xyll459wZURR9NGe1qIMAAggggAACCCAwCwEOYM0Cj1sRQAABBBBAAAEPBVSlUvmDUuqpHmYnMgJFEfhtT0/PPmEYjhWlcFF69vX1vU0ptaoofemJAAIIIJBdAa31aUNDQzdkNyHJEEDgoQJhGM7fsGHDUQ95XOGhIsL7O517mSRJkuxar9f/0LkIrIwAAggggAACCCCQNQG+Qc/ajpAHAQQQQAABBBBIWcAY8wkRad3H5Kecl/EIFFEgSZLX1+v1a4vYPc+djz/++O4FCxb8QEQOzHNPuiGAAAIIZF7gvs2bN+++Zs0aDntnfqsIiMDWBcrl8i4icqxSapFSqvnIwqdj1VaB71hrj2zriiyGAAIIIIAAAgggkHkBDmBlfosIiAACCCCAAAIItFagXC4v01pf0dqpTEMAgRYL/OLuu+8+YM2aNRMtnsu4Dgv09/cfkyTJN/jEgg5vBMsjgAACxRa4LI7jC4tNQHsE8iMQhqHetGnTIc65xUmSLNZaH83jClPf34uttZekvgoLIIAAAggggAACCHglwAEsr7aLsAgggAACCCCAwOwFjDEHiciPZj+JCQggkKZAkiSvq9frQ2muwezOCJRKpWHnXG9nVmdVBBBAAIGCCyRKqYWNRuPXBXegPgK5FWg+rnB0dPQ4EVncPJSllHp2bst2rthzrLU/6dzyrIwAAggggAACCCCQRQEOYGVxV8iEAAIIIIAAAgikKND869jR0dH7ReTJKS7DaAQQmL3APT09PfuFYcjjgWZvmakJS5cu3WV8fPznIrJ9poIRBgEEEECgCAI3xnF8ShGK0hEBBP6/wPLly5+qlDruwccVvkREFmAzK4FfWmv3m9UEbkYAAQQQQAABBBDIpQAHsHK5rZRCAAEEEEAAAQQeX8AY8ykReQVOCCCQeYGzrLVXZz4lAact0N/ff36SJJdP+0ZuQAABBBBAYBYCSqmXNRqNz81iBLcigIDfAsoY85zmp2M9+J9jRaTH70rtTa+UGqzVaivauyqrIYAAAlkXaB45cFkPST4EEEAgdQEOYKVOzAIIIIAAAggggED2BIwxbxKR92cvGYkQQOARAr/duHHjvldeeeVmZPIlcPzxx3cvWLDgVhFpvgHGFwIIIIAAAqkLOOd+NzY29ow1a9ZMpL4YCyCAgBcCYRjO27BhwzFa60XOuUVa60NERHsRvkMhkyQ5rF6v/6BDy7MsAggggAACCCCAQIYFOICV4c0hGgIIIIAAAgggkJZAtVrd0zn367TmMxcBBFoq8GZr7VUtnciwTAgEQXC8iHxNRPjZPBM7QggEEEAg9wJvj+P4XblvSUEEEJixwMDAwE7j4+PHP/i4wpNFZPcZD8vnjfdYa/fiY17yubm0QgABBBBAAAEEZivAL3lnK8j9CCCAAAIIIICApwLGmF+KyD6exic2AoURcM7dO3/+/IVhGG4sTOkCFQ2C4MMi8q8FqkxVBBBAAIHOCIxrrfccGhr6fWeWZ1UEEPBRoFqtNg8b/f3TsUTkJBHZzscercqcJMnKer1ebtU85iCAAAIIIIAAAgjkS4ADWPnaT9oggAACCCCAAAJTFjDGXCEiy6Z8AxcigEAnBS6w1r67kwFYOx2BJUuWbD937tyfisiCdFZgKgIIIIAAAiJKqX9vNBqvwQIBBBCYqUAYhnM2btx4tNZ6cZIki5VShxbtcYUTExNHrVy58paZGnIfAggggAACCCCAQL4FOICV7/2lHQIIIIAAAggg8JgC5XL5pVrrz0GEAAJeCPx5bGxs4apVq/7kRVpCTksgCIJTROTz07qJixFAAAEEEJiewIlxHH95erdwNQIIIPDYAgMDAzuOj4+f8ODjCk8UkT1z7vV7a+1uPH4w57tMPQQQQAABBBBAYBYCHMCaBR63IoAAAggggAACPgssX758266urvUiMtfnHmRHoCgCSZLU6vX6QFH6Fq1nEASxiPQVrTd9EUAAAQTaInDXwoUL9w3DMGnLaiyCAAKFFHjE4woXi8iTcgZxpbX2LTnrRB0EEEAAAQQQQACBFgpwAKuFmIxCAAEEEEAAAQR8EyiXy1/VWp/gW27yIlBQgU0isp+19rcF7Z/r2v39/TsmSXK7iOyc66KUQwABBBDohEAljuN6JxZmTQQQKKbAkiVLuvbee++DRWSRc26RiBwnItv4rJEkyfH1ev3rPncgOwIIIIAAAggggEC6AhzASteX6QgggAACCCCAQKYFjDEVEbGZDkk4BBB4qMC11trXQ5JPgVKptMQ59/F8tqMVAggggECHBMaUUrs1Go3/6dD6LIsAAghIGIZP2LBhw/O11ouUUqeKyLM8Y7nv7rvv3nXNmjUTnuUmLgIIIIAAAggggEAbBTiA1UZslkIAAQQQQAABBLImsHz58ud0dXXdlrVc5EEAgccUSCYmJg5ZuXLljzHKp0CpVPqEc+7V+WxHKwQQQACBDggMx3EcdGBdlkQAAQQeU6BcLu/d1dW12Dl3ooi80IPHFX7AWnsOW4oAAggggAACCCCAwOMJcACL1wcCCCCAAAIIIFBsAWWMWSciTy82A+0R8EfAOfeFKIpe7E9ikk5H4Mwzz9x506ZNzUcR7jid+7gWAQQQQACBxxB4QRzH30QHAQQQyKrAVh5X+AIRmZOxvMdaa2/OWCbiIIAAAggggAACCGRMgANYGdsQ4iCAAAIIIIAAAu0WqFQq1yqlXtfudVkPAQRmLtD8S/Eoir488wncmWWBUqn0Kufcv2c5I9kQQAABBLwQuCOO4wNExHmRlpAIIICAiCxfvnxbETmy+bhC59wirfVhnYRxzv0uiqI9+N/STu4CayOAAAIIIIAAAn4IcADLj30iJQIIIIAAAgggkJpAuVw+XWs9ktoCDEYAgZYLOOdunz9//sFhGI63fDgDMyEQBMGHReRfMxGGEAgggAACXgo4594yPDx8pZfhCY0AAgg8KFAul3cRkWOVUqcqpV7S7k+Kdc7ZKIqqbAgCCCCAAAIIIIAAApMJcABrMiH+HQEEEEAAAQQQyLnAwMDAjkmS/I+I6JxXpR4CeRM4x1r7gbyVos//FyiVSs2//P++c+6ZmCCAAAIIIDADgdEkSXYdGRn58wzu5RYEEEAgkwJhGOpNmzYdIiJ//3Ss5sEsEZmbctiDrbW3pbwG4xFAAAEEEEAAAQRyIMABrBxsIhUQQAABBBBAAIHZCpTL5e9qrQ+f7RzuRwCBtgr8SWu97+Dg4Pq2rspibRMIguBQEblFROa0bVEWQgABBBDIi8BH4jg+My9l6IEAAghsTSAMw/kbNmw46iGPK2x+/9yy972SJPl5vV7fH30EEEAAAQQQQAABBKYi0LJvRKeyGNcggAACCCCAAAIIZFPAGPMuEbkom+lIhQACjyXgnLsiiqK3IpRfgVKpVGk+9iS/DWmGAAIIIJCGQHd39xHXXnvt99KYzUwEEEAgqwIrVqzYecuWLS9QSi1SSp0iIrvOMuvF1tpLZjmD2xFAAAEEEEAAAQQKIsABrIJsNDURQAABBBBAAIHHEzDGHCUi30IJAQS8ExjXWh80ODj4M++SE3hKAs3HrNx5551fEpEXTekGLkIAAQQQQEDkN3Ec7wkEAgggUHABVa1WD3bOLRaR5n+OEZF50zBxSZLsU6/X75rGPVyKAAIIIIAAAgggUGABDmAVePOpjgACCCCAAAII/J9A8w3+0dHR34vILqgggIBfAkmSfK1er3M4x69tm1baM8444+ljY2O3ichTpnUjFyOAAAIIFFZAKXVyo9H4YmEBKI4AAgg8QuC8887r6erqOnoajyv8L2vt84FEAAEEEEAAAQQQQGCqAhzAmqoU1yGAAAIIIIAAAjkXqFQqVyulzsx5TeohkFeBV1hrP5PXcvQS6e3tfbnW+lMiws/xvCAQQAABBKYi8JPNmzcfsmbNmompXMw1CCAwiUDzOzCHUp4EBgYGdhofHz+++bhCEXmxUmq3R/R7m7X2vXnqTBcEEEAAAQQQQACBdAX4xW26vkxHAAEEEEAAAQS8ETDGnCIin/cmMEERQOAfAs65u7ds2fLsVatWjcKSX4EgCCIRKee3Ic0QQAABBFos8MY4jj/U4pmMQwABBPIooIwxz37wUYUnishRXV1d+1122WX35rEsnRBAAAEEEEAAAQTSEeAAVjquTEUAAQQQQAABBLwTCMNw3ujo6P0i8gTvwhMYAQSaApdYay+GIr8CS5Ys6ZozZ86NSqnmm0J8IYAAAgggMJnA/Zs3b95nzZo1f5nsQv4dAQQQQOCfAmEYdodhOI4JAggggAACCCCAAALTEeAA1nS0uBYBBBBAAAEEEMi5QKVSWaOUek3Oa1IPgbwKjGmtDxocHPx5XgvSS6RUKj3VOXeriCzAAwEEEEAAgckEnHPR8PCwmew6/h0BBBBAAAEEEEAAAQQQQAABBGYnwAGs2flxNwIIIIAAAgggkCsBY0wgIo1claIMAgUSUEp9vVarvVBEXIFqF65qqVR6nnPu6yIyt3DlKYwAAgggMF2BMRE5II7jO6d7I9cjgAACCCCAAAIIIIAAAggggMDUBTiANXUrrkQAAQQQQAABBHIv8La3ve1Jc+fOvU9E5uS+LAURyKlAkiS99Xr9+pzWo9aDAn19fecopa4CBAEEEEAAgSkIfCKO4yVTuI5LEEAAAQQQQAABBBBAAAEEEEBghgIcwJohHLchgAACCCCAAAJ5FTDGfEVEXpTXfvRCoAAC923evPmZ73nPex4oQNdCV+zt7b1Ga/36QiNQHgEEEEBgSgJJkhw3MjLyjSldzEUIIIAAAggggAACCCCAAAIIIDBtAQ5gTZuMGxBAAAEEEEAAgXwLlMvlZVrrK/LdknYI5FvAOfe+KIqW5bsl7ZYuXTpvfHz8ZhE5DA0EEEAAAQQeT0Ap9cO99977uWEYJkghgAACCCCAAAIIIIAAAggggEDrBTiA1XpTJiKAAAIIIIAAAl4LXHjhhbuNj4//RkT4XtHrnSR8wQUmnHNHRVH03YI75L5+qVR6hnPuv0Rkp9yXpSACCCCAwKwEnHNLh4eHr5vVEG5GAAEEEEAAAQQQQAABBBBAAIGtCvCmGi8MBBBAAAEEEEAAgUcJlMvl72ut+UQVXhsI+C1wx8aNGw+58sorN/tdg/STCfT19R2tlGo+PnbeZNfy7wgggAAChRb4b6XUvo1G42+FVqA8AggggAACCCCAAAIIIIAAAikIcAArBVRGIoAAAggggAACvgtUKpWLlVLv9L0H+REouoBzLoyi6N+K7lCE/qVSaYlz7gY+vbAIu01HBBBAYOYCze/xG43GO2Y+gTsRQAABBBBAAAEEEEAAAQQQQGBrAhzA4nWBAAIIIIAAAggg8CgBY8yBIvJjaBBAwHuBsYmJicNWrlz5U++bUGBSgd7e3ndorcNJL+QCBBBAAIEiC4xqrZ85NDT02yIj0B0BBBBAAAEEEEAAAQQQQACBVgtwAKvVosxDAAEEEEAAAQRyImCM+aWI7JOTOtRAoMgC37377ruPWrNmzUSREQrSXZVKpeucc6WC9KUmAggggMDMBOI4jvn/ipnZcRcCCCCAAAIIIIAAAggggAACWxXgABYvDAQQQAABBBBAAIGtChhjLheR8+FBAAH/BZRS59dqtVX+N6HBZAJLliyZM2/evC8451442bX8OwIIIIBAYQWciBwTx/G3CytAcQQQQAABBBBAAAEEEEAAAQRaLMABrBaDMg4BBBBAAAEEEMiLgDHmGBH5Zl760AOBIgs45/6mtX5OrVa7u8gORene39+/Y5Ikt/AphkXZcXoigAAC0xdwzt0yPDx8tIg0D2PxhQACCCCAAAIIIIAAAggggAACsxTgANYsAbkdAQQQQAABBBDIq0AYhnrjxo33KKV2y2tHeiFQJIEkSb5Wr9cX8UZrMXY9CIL9RORbIrJjMRrTEgEEEEBgugJa69OGhoZumO59XI8AAggggAACCCCAAAIIIIAAAo8W4AAWrwoEEEAAAQQQQACBxxSoVCorlVIXQIQAAvkQSJLkLfV6/cp8tKHFZAJLly49fHx8/Ksi8sTJruXfEUAAAQSKJ+Cc+9222277zNWrV28sXnsaI4AAAggggAACCCCAAAIIINBaAQ5gtdaTaQgggAACCCCAQK4EqtXqYc657+eqFGUQKLbARufcoVEU/aLYDMVp39vb+0Kt9Y0iMq84rWmKAAIIIDBVAaXUikajMTjV67kOAQQQQAABBBBAAAEEEEAAAQS2LsABLF4ZCCCAAAIIIIAAAo8rYIxpHtTYFyYEEMiHQJIkt/7lL385cvXq1Vvy0YgWkwkEQfAyEfl3Eeme7Fr+HQEEEECgcAIbmt/rx3F8b+GaUxgBBBBAAAEEEEAAAQQQQACBFgpwAKuFmIxCAAEEEEAAAQTyKFCpVN6plLo4j93ohECBBS601l5W4P6Fq97b21vSWl8nIvweoHC7T2EEEEDg8QW01h8eGhp6A04IIIAAAggggAACCCCAAAIIIDBzAX7xOnM77kQAAQQQQAABBAohMDAw8MwkSe4oRFlKIlAcgS1KqSNrtdqtxalM076+vmVKqSuQQAABBBBA4BECSZIkR4yMjPB9AS8NBBBAAAEEEEAAAQQmFWgesXCTXsUFCCBQPAEOYBVvz2mMAAIIIIAAAghMW6Bard7mnHvOtG/kBgQQyLLAz3p6eg4Lw3BTlkOSrbUCQRBcKiIrWjuVaQgggAACvgsopf6z0Wic4HsP8iOAAAIIIIAAAggggAACCCDQKQEOYHVKnnURQAABBBBAAAGPBIwxVREZ9CgyURFAYGoCkbXWTO1SrsqLQBAE7xeRN+WlDz0QQAABBFojkCTJK0ZGRj7TmmlMQQABBBBAAAEEEEAAAQQQQKBYAhzAKtZ+0xYBBBBAAAEEEJiRgDFmdxG5R0T4/nFGgtyEQGYFkomJiZNWrlz5lcwmJFgaAioIguajCN+cxnBmIoAAAgh4K3DX+vXrD1i7du1mbxsQHAEEEEAAAQQQQAABBBBAAIEOCfAGWofgWRYBBBBAAAEEEPBNwBhzi4g837fc5EUAgUkF/nt8fPygyy+//I+TXskFeRJQpVLpPc65t+SpFF0QQAABBGYnkCTJ+SMjI6tmN4W7EUAAAQQQQAABBBBAAAEEECieAAewirfnNEYAAQQQQAABBGYkUKlU3qKUeu+MbuYmBBDItIBz7sYoil4qIi7TQQnXagHV29u7Smv91lYPZh4CCCCAgLcCD0xMTOxz/fXXczDb2y0kOAIIIIAAAggggAACCCCAQCcEOIDVCXXWRAABBBBAAAEEPBQol8u7aK3XiUiXh/GJjAACkwucY639wOSXcUXeBPr6+i5TSg3krRd9EEAAAQRmLPC+OI6XzfhubkQAAQQeQ6D5hhR/8cHLAwEEEEAAAQQQQCCvAhzAyuvO0gsBBBBAAAEEEEhBoFwuf1VrfUIKoxmJAAKdF9g0MTHxvJUrV/6481FI0G6BIAguFZEV7V6X9RBAAAEEMikw3tXVdfB11113eybTEQoBBBBAAAEEEEAAAQQQQACBDApwACuDm0IkBBBAAAEEEEAgqwLGmDeIyOqs5iMXAgjMTsA5d/uWLVsOX7Vq1ejsJnG3jwKlUuldzrmLfMxOZgQQQACBlgvcGMfxKS2fykAEEEAAAQQQQAABBBBAAAEEcirAAaycbiy1EEAAAQQQQACBNATOO++8J8+ZM+deEZmTxnxmIoBA5wWSJLmqXq+/ufNJSNAJgSAI3ikiF3dibdZEAAEEEMiWgFLq5Eaj8cVspSINAggggAACCCCAAAIIIIAAAtkU4ABWNveFVAgggAACCCCAQGYFqtXqZ5xzL8tsQIIhgMCsBZIkeW29Xl8z60EM8FKgr6/vXKXUFSKivSxAaAQQQACBVgncsW7duufcdNNN460ayBwEEEAAAQQQQAABBBBAAAEE8irAAay87iy9EEAAAQQQQACBlASWL1/+yq6urk+mNJ6xCCCQDYENWuvDBwcHf56NOKRot0B/f/8rkyQZEZF57V6b9RBAAAEEMiVwThzHH8hUIsIggAACCCCAAAIIIIAAAgggkEEBDmBlcFOIhAACCCCAAAIIZFkgDMPu0dHR34nILlnOSTYEEJi1wE/Gxsaet2rVqtFZT2KAlwK9vb0v1Fp/SkS297IAoYsp0PxNlytmdVojkJLA/d3d3ftee+21D6Q0n7EIIIAAAggggAACCCCAAAII5EKAA1i52EZKIIAAAggggAAC7RUwxlwuIue3d1VWQwCBDgh8yFr7xg6sy5IZEejr6ztQKbVWRHbNSCRiIIAAAgi0X2BlHMfl9i/LiggggAACCCCAAAIIIIAAAgj4I8ABLH/2iqQIIICAxwL8GbrHm0d0BLYqYIw5QER+Cg8CCORfwDnXH0VRI/9NafhYAqVS6RnOuS+KyD4oIYAAAp0Q4CfKTqg/bM2xJEmePTIy8quOJyEAAggggAACCCCAAAIIIIAAAhkV4ABWRjeGWAgggAACCCCAQNYFyuXyd7XWh2c9J/kQQGB2As65v3V1dR0xODj4s9lN4m6fBc4888ydN23adKOIHOpzD7IjgAACCMxMwDn3yeHh4VfP7G7uQgABBBBAAAEEEEAAAQQQQCD/AhzAyv8e0xABBBBAAAEEEEhFwBjzJhF5fyrDGYoAApkScM7dPn/+/OeHYbghU8EI01aBUqm0rXOu+Wlor2zrwiyGAAIIIJAJAefcouHh4a9mIgwhEEAAAQQQQAABBBBAAAEEEMiYAAewMrYhxEEAAQQQQAABBHwRMMZsLyL/LSLzfclMTgQQmJXAp621rxIRN6sp3Oy7gOrv739HkiRvFxF+p+D7bpIfAQQQmJ7AjxYuXHhYGIbJ9G7jagQQQAABBBBAAAEEEEAAAQTyL8AvS/O/xzREAAEEEEAAAQRSE6hUKiNKqdNTW4DBCCCQNQFjrY2yFoo87Rfo7+//lyRJruEQbvvtWREBBBDosMAZcRx/tMMZWB4BBBBAAAEEEEAAAQQQQACBzAlwACtzW0IgBBBAAAEEEEDAH4FKpbJYKfUlfxKTFAEEZimQJElySr1e/8Is53B7DgROO+20Q7q6uj6jlNotB3WogAACCCAwNYH7nHP7Dg8P/+/ULucqBBBAAAEEEEAAAQQQQAABBIohwAGsYuwzLRFAAAEEEEAAgVQEwjDUmzZtuts5t0cqCzAUAQSyKPAnpdThtVrt7iyGI1N7Bc4444ynb968+dPN10R7V2Y1BBBAAIFOCSilLmk0Ghd3an3WRQABBBBAAAEEEEAAAQQQQCCLAhzAyuKukAkBBBBAAAEEEPBIoFKpvFMpxRswHu0ZURFogcBtPT09R4VhuLEFsxjhucDSpUvnjY+PXy0igedViI8AAgggMDWB0SRJ9h8ZGfnN1C7nKgQQQAABBBBAAAEEEEAAAQTyL8ABrPzvMQ0RQAABBBBAAIFUBS666KJnbNmy5U4R0akuxHAEEMiaQGytLWUtFHk6JqBKpVLZOXepiHR3LAULI4AAAgi0RUApNdJoNPrashiLIIAAAggggAACCCCAAAIIIOCBAAewPNgkIiKAAAIIIIAAAlkXKJfL/6m1Pj7rOcmHAAItF3ibtfa9LZ/KQG8F+vv7j5iYmLhBKbWntyUIjgACCCAwFQHnnDt2eHj4W1O5mGsQQAABBBBAAAEEEEAAAQQQyLsAB7DyvsP0QwABBBBAAAEE2iBQLpf7tdbXtWEplkAAgWwJTIjIy621/5GtWKTppMDpp5/+lK6uroaInNzJHKyNAAIIIJCugNb6O0NDQ0eJiEt3JaYjgAACCCCAAAIIIIAAAgggkH2ystAHAAAgAElEQVQBDmBlf49IiAACCCCAAAIIZF4gDMP5o6Oj94rIdpkPS0AEEGi1wANa6yMHBwd/3urBzPNaQAVBUBGR5iMJu7xuQngEEEAAgccT6I3j+HqIEEAAgWIKNN9i4wxqMfee1ggggAACCCCAwKMFOIDFqwIBBBBAAAEEEECgJQLVavUq59w5LRnGEAQQ8ErAOffriYmJIy6//PI/ehWcsKkLlEql45xzzTfmn5b6YiyAAAIIINAJgXXz58/fb/Xq1Rs7sThrIoAAAggggAACCCCAAAIIIJAVAQ5gZWUnyIEAAggggAACCHguUKlU9ldK3S4ifI/p+V4SH4EZCnyjp6dncRiGYzO8n9tyKlAqlZ7qnItFZHFOK1ILAQQQKLSAc+6i4eHh5ice8oUAAggggAACCCCAAAIIIIBAYQV4c6ywW09xBBBAAAEEEECg9QLVavUm59xxrZ/MRAQQ8EHAOfeRKIrO9CErGdsrEIahvvPOO5eJiBWRue1dndUQQAABBFIW2CAi+8Zx3HwkOV8IIIAAAggggAACCCCAAAIIFFKAA1iF3HZKI4AAAggggAAC6QgYY14rIjekM52pCCDgg4Bz7twoit7vQ1Yytl+gVCo9W0SGnHOHtH91VkQAAQQQSEtAKXVNo9H417TmMxcBBBBAAAEEEEAAAQQQQACBrAtwACvrO0Q+BBBAAAEEEEDAI4EwDLtHR0fvEZFdPYpNVAQQaK3AhHPuVVEUfba1Y5mWF4HDDjtsmwMOOODCJEkuEpGuvPSiBwIIIFBwgSRJkiNGRkZuLbgD9RFAAAEEEEAAAQQQQACB/8fen4dJeld14//5VM8eFnlA8YnbjyUkAVlHUARZFMGIgAoDZLp6Mo4hSDDgkOmqTlgsIGG6qyckOuISWZLu6gk4iCA8hAsQIjtiUBAShAQXgo8KAQJktnTfn+/Vzw8RgSQz01XVd933q6+Liz+4P+ec9+tTITPdp6sI1FTAAlZNL15sAgQIECBAgMCgBNrt9ksj4iWDqq8uAQIjIfCNoigeNTs7+/cjMa0hV0Vg27ZtDy+K4vKIOGlVBtCUAAECBPotcFWv13tsv4uqR4AAAQIECBAgQIAAAQIERkHAAtYo3JIZCRAgQIAAAQIjJNBqtU5MKS2/C9baERrbqAQI9F/g3yLi4TMzM//a/9IqVkXgrLPO2nTw4MHdOedzIsL3KKpysXIQIFBngV/r9XpvrjOA7AQIECBAgAABAgQIECBQTwHf3KznvUtNgAABAgQIEBioQLvdfmNEPHWgTRQnQKD0AjnnTx85cuSRl1xyyddKP6wBV1VgfHz8V1JKfxQRP7qqg2hOgAABAisVuO7w4cP3279//5GVFnKeAAECBAgQIECAAAECBAiMkoAFrFG6LbMSIECAAAECBEZEoNVq/UJK6d0jMq4xCRAYrMB7N27c+EudTscPYgfrPPLVl98N68CBA8sfYbsrIsZGPpAABAgQqKlAznnXwsLCRTWNLzYBAgQIECBAgAABAgQI1FTAAlZNL15sAgQIECBAgMCgBVqt1qdSSvcbdB/1CRAYCYHXzszM/OZITGrIVRfYunXrg8bGxv4k5/ywVR/GAAQIECBwPAJfW1paOumKK6748vEcdoYAAQIECBAgQIAAAQIECIyiQM0XsJbj51G8NzMTIECAAAECBEov0Gq1npdS+r3SD2pAAgSGIpBzflG3271wKM00GXmBTqfTuO66686MiD0RcceRDyQAAQIE6ifwh71e77n1iy0xAQIECBAgQIAAAQIECNRVoOYLWHW9drkJECBAgAABAoMXaLVad0wpfdEPzgdvrQOBERHIOedndbvd14zIvMYsgcCOHTtOPHLkyPIy79NKMI4RCBAgQODoBZZSSg+an5//1NEf8SQBAgQIECBAgAABAgQIEBhdAQtYo3t3JidAgAABAgQIlF6g1Wr9SUrprNIPakACBIYlsJRzfnq3233TsBrqUw2BiYmJXy+K4pKU0o9VI5EUBAgQqIXAO3q93mm1SCokAQIECBAgQIAAAQIECNRewAJW7V8CAAgQIECAAAECgxPYtWvXA8bGxj4xuA4qEyAwggIHi6J4wuzs7PtHcHYjr6LAzp07N37pS196XkScHxF3WsVRtCZAgACBoxc4rdfrvePoH/ckAQIECBAgQIAAAQIECBAYTQELWKN5b6YmQIAAAQIECIyMQKvV+kBK6REjM7BBCRAYhsBNEfHomZkZC5rD0K5Yj9NPP/1ua9aseXHO+bkRMVaxeOIQIECgagLXXnvttQ+8+uqrb6laMHkIECBAgAABAgQIECBAgMB3CljA8nogQIAAAQIECBAYqMDk5OTpjUZj30CbKE6AwCgK3BARj5iZmfnXURzezKsvMD4+ft+U0p6I8PFWq38dJiBAgMCtCuScf3thYeFViAgQIECAAAECBAgQIECAQJUFLGBV+XZlI0CAAAECBAiUQKDT6aw5ePDg9RHx4yUYxwgECJRL4LqlpaVH7Nmz5z/LNZZpRklg27Ztj1taWrokpXS/UZrbrAQIEKiLQErpK4cOHTpp//79X6lLZjkJECBAgAABAgQIECBAoH4CFrDqd+cSEyBAgAABAgSGLjA1NXVuznn5XUp8ESBA4LsF/ibn/Lhut/sNNASOV2Dz5s1rTz755Oc0Go3zI+Lux1vHOQIECBAYjEBRFK/ct2/fuYOprioBAgQIECBAgAABAgQIEFh9AQtYq38HJiBAgAABAgQIVF6g1WrdMaX0hYi4c+XDCkiAwDEL5Jw/WBTFE/bs2XPzMR92gMB3CJx11lmbDhw48KyImIqIH4ZDgAABAqURONJoNO4/Nzf32dJMZBACBAgQIECAAAECBAgQINBHAQtYfcRUigABAgQIECBA4NYF2u32RRHxAkYECBC4FYF3Hjhw4Ml79+49TIjASgUmJiZOyDmfGRHneUeslWo6T4AAgf4IFEXx5n379v1af6qpQoAAAQIECBAgQIAAAQIEyiVgAatc92EaAgQIECBAgEBlBVqt1o+mlD4fEWsrG1IwAgRWJJBzftOmTZue0el0FldUyGEC3xL4r0WslNL5OecfAkOAAAECqyvQaDR+cW5u7t2rO4XuBAgQIECAAAECBAgQIECg/wIWsPpvqiIBAgQIECBAgMCtCLRarX0ppdMBESBA4NYEcs6Xb9q0aUen0ykoEeiXwNlnn32Hr3/968+NiHZE3KVfddUhQIAAgWMW+MThw4c379+/f+mYTzpAgAABAgQIECBAgAABAgRKLGABq8SXYzQCBAgQIECAQNUEpqamNuec/7ZqueQhQKC/AjnnP+h2u+f0t6pqBCJ27NhxxyNHjuyIiJ0R8RNMCBAgQGD4AimlM+fn518z/M46EiBAgAABAgQIECBAgACBwQlYwBqcrcoECBAgQIAAAQLfR2BqauqqnPOj4RAgQOC2BHLOL+92uy+hRGAQAp1Op3H99dc/cfmjCYui+JlB9FCTAAECBL6/QErpP4uiOGlhYeHrjAgQIECAAAECBAgQIECAQFUELGBV5SblIECAAAECBAiMiEC73X5SRPzliIxrTAIEVlfgxTMzMxes7gi6V11g27ZtjyyK4nkR8esRMVb1vPIRIECgJAKv6PV6LyzJLMYgQIAAAQIECBAgQIAAAQIrFrCAtWJCBQgQIECAAAECBI5RILXb7U9HxKnHeM7jBAjUUCDn/KJut3thDaOLPGSBZzzjGfdat27d83LOZ0bEpiG3144AAQJ1Ezi0uLh46utf//p/rltweQkQIECAAAECBAgQIECgmgIWsKp5r1IRIECAAAECBEot0G63nx0Rf1zqIQ1HgEBpBHLO53e73d2lGcgglRY4/fTT79ZoNM5oNBrPyjmfXOmwwhEgQGB1BV7f6/VOX90RdCdAgAABAgQIECBAgAABAv0RsIDVH0dVCBAgQIAAAQIEjkGg0+lsOHjw4PJvu9/9GI55lACBGguklKamp6dnakwg+ioIbN26dXOj0TgrIpreFWsVLkBLAgSqLpAbjcaj5ubmPlD1oPIRIECAAAECBAgQIECAQPUFLGBV/44lJECAAAECBAiUUmBqaqqTc/7dUg5nKAIEyiiQi6J4/uzs7N4yDmemagts2bLlzuvXr39GRJwdEQ+sdlrpCBAgMFSBj/Z6vYdHRB5qV80IECBAgAABAgQIECBAgECfBSxg9RlUOQKDEVj+R9X3oQZjqyoBAgQIrJbAeeed94NFUfxLRGxcrRn0JUBg5ASW/1B8zszMzKtGbnIDV0ag2Wz+bM75WSmlp0XEHSoTTBACBAisnkCz1+strF57nQkQIECAAAECBAgQIECAwMoFLGCt3FAFAgQIECBAgACB4xRot9uXRsSzjvO4YwQI1FMgp5TOnp6e/uN6xpe6LALbt2/fsLS09IsRsSXn/OsRcUJZZjMHAQIERkzghpTSKfPz8zeP2NzGJUCAAAECBAgQIECAAAEC3xawgOXFQIAAAQIECBAgsGoCk5OT92o0Gp+JiDWrNoTGBAiMokDOOb+g2+1eMorDm7l6AmedddamgwcPPjEituWcHx8R66qXUiICBAgMVOAlvV7v5QPtoDgBAgQIECBAgAABAgQIEBiggAWsAeIqTYAAAQIECBAgcPsCU1NTvZzz+O0/6Ym+CSx/iJu/CfSNU6FVFXjxzMzMBas6geYEvktg69atd2k0Gk9KKS2/M9YvWTL2EiFAgMBRCRxYu3btKa973eu+cFRPe4gAAQIECBAgQIAAAQIECJRMwI9dSnYhxiFAgAABAgQI1E2g1WqdmlL6VEQ06pZdXgIEVi6Qc+50u92XrrySCgT6L3DmmWfe/VvvjPXElNLyxxXesf9dVCRAgEA1BHLOly0sLPxGNdJIQYAAAQIECBAgQIAAAQJ1E7CAVbcbl3dEBZb/UV1+qwpfBAgQIECgmgKtVmt/Sulp1UwnFQECgxbIOc90u92pQfdRn8BKBLZs2TK2cePGhxdF8SsR8biI2LySes4SIECgggJFSumn5+fn/7aC2UQiQIAAAQIECBAgQIAAgYoLWMCq+AWLR4AAAQIECBAYBYF2u/3AiPg7H4w3CrdlRgLlFCiKYs/s7OxkOaczFYHvFdi6des9G43G41JKT8o5L7871npOBAgQIBAf6vV6j/SbiF4JBAgQIECAAAECBAgQIDBqAhawRu3GzEuAAAECBAgQqKhAq9V6a0pp+V1BfBEgQOB4BX5vZmZmpx/aHi+fc6slcNZZZ206dOjQQ4qieETOeXkpa3n5YMNqzaMvAQIEVlMgpfTU+fn5N63mDHoTIECAAAECBAgQIECAAIFjFbCAdaxinidAgAABAgQIEBiIwHnnnffTRVF8ZCDFFSVAoE4Ccxs3bvzNTqezWKfQslZL4DGPecyaE0888YHfeoesR+acfy4i7lytlNIQIEDgVgU+f+ONN973yiuvPMyIAAECBKorsPwDylzdeJIRIECAAAECNRSwgFXDSxeZAAECBAgQIFBWgXa7/a6IeFxZ5zMXAQIjI/DmAwcOPHPv3r1+cDsyV2bQ2xLYvHnz2lNPPfWhEbG8iPVTEfGQiLgnNQIECFRYoNXr9WYrnE80AgQIECBAgAABAgQIEKiYgAWsil2oOAQIECBAgACBURaYnJx8dKPRuGqUM5idAIHSCPzVxo0bf7XT6XyzNBMZhEAfBcbHx+80Njb2gKIoNqeUNuecN0fEKRHR6GMbpQgQILBaAt9Ys2bNfS677LJ/X60B9CVAgAABAgQIECBAgAABAsciYAHrWLQ8S4AAAQIECBAgMHCBVqv1vpTS8jt8+CJAgMCKBHLO708pPWlmZuamFRVymMCICCwvZTUajQd/ayHrQTnnB0bEqRGxdkQiGJMAAQLfFsg5//HCwsJzkBAgQIAAAQIECBAgQIAAgVEQsIA1CrdkRgIECBAgQIBAjQTa7fYTIuIdNYosKgECgxX4eKPR+KXdu3d/abBtVCdQToEtW7asGxsbu9/yu2WllJYXspbfKWv5PyeUc2JTESBA4NsCiymlB8/Pz3+KCQECBAgQIECAAAECBAgQKLuABayy35D5CBAgQIAAAQI1FJicnPybRqPx0BpGF5kAgQEIFEXxmXXr1j3+wgsv/MIAyitJYOQEtmzZMrZx48b7FUXxsJTSw3LOD4uIn4yIsZELY2ACBCotkHN+58LCwvIvaPgiQIAAAQIECBAgQIAAAQKlFrCAVerrMRwBAgQIECBAoJ4CrVbrySmlt9QzvdQECAxCIKX0L0VRPKHb7f7jIOqrSWDUBSYmJk5YfqeZoigekXN+XErpERGxcdRzmZ8AgdEXSCk9cX5+/u2jn0QCAgQIECBAgAABAgQIEKiygAWsKt+ubAQIECBAgACB0RVI7Xb7byPiIaMbweQECJRQ4CtFUTx5dnb2gyWczUgESiVw2mmnrf/BH/zBhy4tLf18SukXI+KnI2JtqYY0DAECdRG49tprr33g1VdffUtdAstJgAABAgQIECBAgAABAqMnYAFr9O7MxAQIECBAgACBWghMTk5uaTQaf1aLsEISIDA0gZzzzWNjY0/fvXu3d9IYmrpGVRA4++yz73DTTTc9ptFoLC9jPT7nfEoVcslAgMBoCOScn7ewsLB3NKY1JQECBAgQIECAAAECBAjUUcACVh1vXWYCBAgQIECAwGgILL8L1scj4kGjMa4pCRAYIYGliHjOzMzMn47QzEYlUCqBiYmJe+ScfzGl9KTl/46I9aUa0DAECFRN4KuNRuOkubm5G6sWTB4CBAgQIECAAAECBAgQqIaABaxq3KMUBAgQIECAAIFKCrRarSenlN5SyXBCESCw2gI5pfSy6enpzmoPoj+BURcYHx+/U6PReELO+dcj4lci4g6jnsn8BAiUTyCldMn8/PzO8k1mIgIECBAgQIAAAQIECBAgEGEBy6uAAAECBAgQIECg1ALtdvvDEfEzpR7ScAQIjKxAzvkPNm3a9PxOp1OMbAiDEyiRwPbt2zcsLS0tvyPWlpzzUyLiTiUazygECIy2wC2NRuMn5+bmPjvaMUxPgAABAgQIECBAgAABAlUUsIBVxVuViQABAgQIECBQIYFdu3Y9bmxs7F0ViiQKAQIlE8g5v+HgwYNn7N2793DJRjMOgZEWWF7GKoriV4qi2BYRvxQRa0c6kOEJECiDwF/2er3l5U5fBAgQIECAAAECBAgQIECgVAIWsEp1HYYhQIAAAQIECBD4fgLtdvs9EfFYOgQIEBiUQM75w2NjY0/ZvXv3lwbVQ10CdRbYunXrXRqNxpaIWF7GekSdLWQnQGDFAo/v9Xp+QWPFjAoQIECAAAECBAgQIECAQD8FLGD1U1MtAgQIECBAgACBgQi02+2fjYgPDqS4ogQIEPhvgesajcYTd+/e7aONvCoIDFBg+/btpywuLm5PKT0r5/y/BthKaQIEqinwicOHD2/ev3//UjXjSUWAAAECBAgQIECAAAECoyhgAWsUb83MBAgQIECAAIEaCrRarf+TUvrlGkYXmQCB4QrcGBG/OjMz84HhttWNQP0Elj+icGlp6UlFUZyVUnpc/QQkJkBgBQLP6vV6r17BeUcJECBAgAABAgQIECBAgEBfBSxg9ZVTMQIECBAgQIAAgUEJ7Nq16wFjY2N/FxGNQfVQlwABAt8SOBwR22dmZl5PhACB4Qg0m82HpJR+J+f8zIhYO5yuuhAgMKoCKaX/PHTo0H32799/06hmMDcBAgQIECBAgAABAgQIVEvAAla17lMaAgQIECBAgEClBVqt1v6U0tMqHVI4AgTKIpBTSi+bnp7ulGUgcxCog8D27dt/uCiK3yqK4rcj4q51yCwjAQLHJ5BSmp6fnz/v+E47RYAAAQIECBAgQIAAAQIE+itgAau/nqoRIECAAAECBAgMUOC88867T1EUn46INQNsozQBAgS+LZBzfvWmTZue0+l0FrEQIDA8gYmJiROWlpbOajQauyLixOF11okAgRESOLS4uHjq61//+n8eoZmNSoAAAQIECBAgQIAAAQIVFbCAVdGLFYsAAQIECBAgUFWBVqt1WUrpjKrmk4sAgfIJ5JzffvDgwdP37t379fJNZyIC1RbYsmXLuvXr1y9/LOGLIuKkaqeVjgCB4xD4s16v94zjOOcIAQIECBAgQIAAAQIECBDoq4AFrL5yKkaAAAECBAgQIDBogXPPPfcn1qxZ89mIWDfoXuoTIEDgvwRyzp9at27dky+44IJ/okKAwPAFNm/evPbUU09tRsTvRsRPDH8CHQkQKKlAzjn/3MLCwgdLOp+xCBAgQIAAAQIECBAgQKAmAhawanLRYhIgQIAAAQIEqiTQbrf/MCKeU6VMshAgMBICN6aUnjY9PX3VSExrSAIVFPjWItZvREQnIv53BSOKRIDAsQt8/N73vvdDO51OcexHnSBAgAABAgQIECBAgAABAv0RsIDVH0dVCBAgQIAAAQIEhihw/vnn/++lpaXrImLTENtqRYAAgWWBIznn3+p2u6/DQYDA6glMTEyckHN+fkS0I+JOqzeJzgQIlEEg5zyxsLDQK8MsZiBAgAABAgT+p8DyD6MzFAIECBAgUAMBC1g1uGQRCRAgQIAAAQJVFJicnJxtNBq7qphNJgIEyi+Qc57dtGnTlHfbKP9dmbDaAtu2bbtrzvklOefnRsRYtdNKR4DAbQh8MaV08vz8/M2UCBAgQIAAAQIECBAgQIDAaghYwFoNdT0JECBAgAABAgRWLDA1NXWXnPPnIuKuKy6mAAECBI5DIOf8jpTSM2dmZm46juOOECDQR4GJiYlTc84XRcRpfSyrFAECIyRQFEVn3759Lx2hkY1KgAABAgQIECBAgAABAhUSsIBVocsUhQABAgQIECBQN4GpqamdOedX1i23vAQIlErgH9auXfuUCy644J9KNZVhCNRUYNu2bU8riuKSiPiRmhKITaDOAjc3Go2T5+bmvlhnBNkJECBAgAABAgQIECBAYHUELGCtjruuBAgQIECAAAECfRDodDrrDh48+KmIOKkP5ZQgQIDA8Qp8Jef8zG63+67jLeAcAQL9EzjrrLM2HThw4CURcW5ErOlfZZUIECi7QFEUc/v27Tuj7HOajwABAgQIECBAgAABAgSqJ2ABq3p3KhEBAgQIECBAoFYCk5OTWxqNxp/VKrSwBAiUUWAppfTC6enpmTIOZyYCdRR45jOf+eCxsbE/SSk9tI75ZSZQU4EipfTT8/Pzf1vT/GITIECAAAECBAgQIECAwCoJWMBaJXhtCRAgQIAAAQIE+ifQarU+kFJ6RP8qqkSAAIHjFnj9xo0bf7PT6Rw47goOEiDQN4EtW7aMrV+/fldEdCJiQ98KK0SAQGkFcs4fXlhYWP67QS7tkAYjQIAAAQIECBAgQIAAgcoJWMCq3JUKRIAAAQIECBCon8B5553300VRfDgi/Pm2ftcvMYEyCvx9SunXpqen/7mMw5mJQB0FxsfH79toNF6Xc35YHfPLTKBuAo1GY8vc3Nwb65ZbXgIECBAgQIAAAQIECBBYPQE/oFo9e50JECBAgAABAgT6KNBqtd6QUnp6H0sqRYAAgZUIfDml9Izp6en3rKSIswQI9E/gMY95zJof+7Efm8w5vzQi1vavskoECJRQ4PM33njjfa+88srDJZzNSAQIECBAgAABAgQIECBQQQELWBW8VJEIECBAgAABAnUUmJycvFej0bgmItbVMb/MBAiUUuCWnPMLut3uH5RyOkMRqKnAxMTET+Wc90XESTUlEJtAXQSmer3eTF3CykmAAAECBAgQIECAAAECqytgAWt1/XUnQIDAUQos/991PspnPUaAAIH6CrTb7Ysi4gX1FZCcAIGSCuxbWlo6a8+ePTeXdD5jEaidwM6dOzd++ctfns45P6924QUmUB+Bb6xZs+Y+l1122b/XJ7KkBAgQIECAAAECBAgQILBaAhawVkteXwIECBAgQIAAgb4LTE1N3SXn/LmIuGvfiytIgACBFQgURfGZNWvWPHX37t3L79TniwCBkgiMj49vTSn9SUTcoSQjGYMAgf4KXNrr9Z7d35KqESBAgAABAgQIECBAgACB7xWwgOVVQYAAAQIECBAgUCmBqampnTnnV1YqlDAECFRF4Bs55x3dbveNVQkkB4EqCDSbzZNzzn+eUrpfFfLIQIDA/xBYajQaD5mbm/skFwIECBAgQIAAAQIECBAgMEgBC1iD1FWbAAECBAgQIEBg6AKdTmfdwYMHPxURJw29uYYECBC4fYGcc977ta99bdell156y+0/7gkCBIYhcPbZZ9/hpptuenVK6RnD6KcHAQLDE0gpvWd+fv4XhtdRJwIECBAgQIAAAQIECBCoo4AFrDreuswECBAgQIAAgYoLTE5Obmk0Gn9W8ZjiESAw2gLvK4riGbOzs/8+2jFMT6BaAuPj4+emlGYiYqxayaQhUG+BnPOTFhYW3lZvBekJECBAgAABAgQGK7C8epEH20J1AgRKLWABq9TXYzgCBAgQIECAAIHjFEitVuuDKaWHH+d5xwgQIDAMgS9GxNNnZmY+NIxmehAgcHQCExMTT8g5vz4ifuDoTniKAIERELju8OHD99u/f/+REZjViAQIECBAgAABAgQIECAwggIWsEbw0oxMgAABAgQIECBw+wKtVutnUkrLSw3+zHv7XJ4gQGD1BG5JKZ03PT39Sr8muXqXoDOB7xbYunXrSWNjY2/NOZ9MhwCBaggURfH8ffv2/X410khBgAABAgQIECBAgAABAmUT8MOost2IeQgQIECAAAECBPom0G63L4+IbX0rqBABAgQGJFAUxVsXFxe3X3zxxV8ZUAtlCRA4RoFt27bdtSiKv4iInzvGox4nQKCEAimlrxw6dOik/fv3+3dtCe/HSAQIECBAgAABAmd3laAAACAASURBVAQIEBh1AQtYo36D5idAgAABAgQIELhVgfPPP//uS0tL/xgRd8ZEgACBsgvknL+Qcz59dnb2g2Wf1XwE6iJw2mmnrb/rXe96WUQ8sy6Z5SRQZYGU0u/Pz88/v8oZZSNAgAABAgQIECBAgACB1RGwgLU67roSIECAAAECBAgMSWBqaurcnPOeIbXThgABAisVWEwpXbhhw4aXdTqdYqXFnCdAoC8CaXx8fDql1OpLNUUIEFhNgcWxsbEHXX755Z9ezSH0JkCAAAECBAgQIECAAIHqCVjAqt6dSkSAAAECBAgQIPAdAp1OZ83Bgwc/HhH3B0OAAIFREfCRhKNyU+ask8D4+Pi5KaXZiPD9tDpdvKyVE0gpvW1+fv5JlQsmEAECBAgQIECAAAECBAisqoBvGK0qv+YECBAgQIAAAQLDEGi1Wr+QUnr3MHrpQYAAgX4JLH8kYUrpmTMzMx/qV011CBBYmcD4+HgzpfS6iFizskpOEyCwmgJjY2NPuPzyy9+5mjPoTYAAAQIECBAgQIAAAQLVErCAVa37lIYAAQIECBAgQOBWBFqt1p+nlH4dEAECBEZMwEcSjtiFGbf6Atu2bXtGURTzEbG2+mklJFBZgWtuuOGGB1511VWLlU0oGAECBAgQIECAAAECBAgMVcAC1lC5NSNAgAABAgQIEFgtgRe+8IU/dsstt1ybUjphtWbQlwABAisQeO+RI0cmLr744i+uoIajBAj0SaDZbD4xIvZHxMY+lVSGAIHhCzy71+tdOvy2OhIgQIAAAQIECBAgQIBAFQUsYFXxVmUiQIAAAQIECBD4vgKTk5MvaTQaL8VDgACBERX4ckTsmJmZeeuIzm9sApUSOOOMMx6/tLT0lojYUKlgwhCoiUBK6T8PHTp0n/37999Uk8hiEiBAgAABAgQIECBAgMAABSxgDRBXaQIECBAgQIAAgXIJdDqdDQcOHLgmpXSPck1mGgIECBy1QM45/+mmTZt2djqdA0d9yoMECAxEYGJi4gk55zdbwhoIr6IEhiEw0+v1pobRSA8CBAgQIECAAAECBAgQqLaABaxq3690BAgQIECAAAEC3yXQarV+NaX0F2AIECAwygI550+nlE6fmZn5h1HOYXYCVRBoNpu/FBHLf7bwTlhVuFAZ6iZwJCLu1+v1rqtbcHkJECBAgAABAgQIECBAoL8CFrD666kaAQIECBAgQIDACAi0Wq23p5ROG4FRjUiAAIHbEjgYEefNzMz8HiYCBFZXYOvWrU9pNBpvjIg1qzuJ7gQIHIfAG3u93pbjOOcIAQIECBAgQIAAAQIECBD4toAFLC8GAgQIECBAgACB2gm0Wq2TU0qfjIh1tQsvMAEClRPIOb9paWnp2RdddNGXKxdOIAIjJDA+Pt5MKc1FhO+3jdC9GZXAskBRFI/et2/f+2gQKIvA8r9IclmGMQcBAgQIECBAgAABAkcl4BtCR8XkIQIECBAgQIAAgaoJtFqtbkppsmq55CFAoLYC/1EUxZmzs7Nvq62A4ARKINBsNs+PiAtLMIoRCBA4BoGU0t/d6173+qlOp1McwzGPEiBAgAABAgQIECBAgACBbwtYwPJiIECAAAECBAgQqKVAq9W6Y0rpMxFxYi0BhCZAoIoCOef8p0VRvGDPnj03VzGgTARGQWBiYuLinPPvjMKsZiRA4H8InNHr9Zbfxc4XAQIECBAgQIAAAQIECBA4ZgELWMdM5gABAgQIECBAgEBVBNrt9jMj4oqq5JGDAAECywJFUXxmbGysOT09fTURAgRWRSBNTExcnnOeWJXumhIgcLwCX0wpnTw/P2+J+XgFnSNAgAABAgQIECBAgECNBSxg1fjyRSdAgAABAgQIEIhotVpvTSn9CgsCBAhUTGAxpXTh9ddf//L9+/cvVSybOARKL7Bly5Z169atW/4zxuNLP+ztDLj8zcM86iHMT+AoBRqNxkvn5uY6R/m4xwgQIECAAAECBAgQIECAwLcFLGB5MRAgQIAAAQIECNRa4Nxzz/2JsbGxT6eUTqg1hPAECFRV4CMppYnp6enrqhpQLgJlFdixY8cdjxw5clVEPKSsM5qLAIHvETjYaDROmZub+9fS2diGLN2VGIgAAQIECBAgQIAAAQLfKWABy+uBAAECBAgQIECg9gLtdrsVETO1hwBAgEBVBb6RUnrB9PT0a7yRTVWvWK6yCmzfvv2HFxcXPxgR9yzrjOYiQOB7BHq9Xs9HiHphECBAgAABAgQIECBAgMAxCVjAOiYuDxMgQIAAAQIECFRRoNPprDl48ODfRMSDq5hPJgIECHxL4J0559/sdrs3ECFAYHgC27dvP2VxcfGjEXGn4XXViQCBFQjkRqPxM3Nzc8t/P/BFgAABAgQIECBAgAABAgSOSsAC1lExeYgAAQIECBAgQKDqAlNTUw/NOX84IsaqnlU+AgRqLXBTSqk1PT19aa0VhCcwZIGtW7c+pdFo/EVE+F7ckO21I3A8Ast/L1hYWHiEd448Hj1nCBAgQIAAAQIECBAgUE8B3/Sp571LTYAAAQIECBAg8H0EpqamXpVzPhsOAQIEqi6Qc357RDyr2+3+W9WzykegLALNZvNlEfHissxjDgIEblfgGb1e789u9ykPECBAgAABAgQIECBAgAABv3XnNUCAAAECBAgQIEDgvwXOOeecO23atOmaiPgRLgQIEKiBwNdyzs/rdrvzNcgqIoEyCKSJiYn9OeenlmEYMxAgcNsCOecvnHDCCadceumlB1gRIECAAAECBAgQIECAAIHbE/AOWLcn5H8nQIAAAQIECBColUCr1XpaSml/rUILW2OB7Pdyanz73xF9/+Li4tkXXXTRl3EQIDBYgR07dtzx8OHDH04p3W+wnVQnQKAfAjnn8xYWFqb7UUsNAgQIECBAgAABAgQIEKi2gAWsat+vdAQIECBAgAABAsch0Gq13ppS+pXjOOoIAQIERlXg33POz+12u28a1QDmJjAqAtu2bbtPURQfjYgfGJWZzUmgxgLfiIiTe73e/62xgegECBAgQIAAAQIECBAgcBQCFrCOAskjBAgQIECAAAEC9RJot9s/HhGfjog71Cu5tAQI1F0g5/y2iHh2t9v9t7pbyE9gkAJnnHHG45eWlt4eEWOD7KM2AQIrF2g0Gq+em5t71sorqUCAAAECBAgQIECAAAECVRawgFXl25WNAAECBAgQIEDguAWmpqbOzTnvOe4CDhIgQGB0Bb6WUmpPT09fOroRTE6g/ALj4+MvTCldUP5JTUig9gJLEbG51+t9ovYSAAgQIECAAAECBAgQIEDgVgUsYHlxECBAgAABAgQIEPg+Alu2bBm75z3v+TcR8RBABAgQqKNAzvnKtWvXPvvCCy/8Qh3zy0xg0AKdTqdx3XXXvSMifnHQvdQnQGBlAiml987Pz//8yqo4TYAAAQIECBAgQIAAAQJVFrCAVeXblY0AAQIECBAgQGBFAq1W66dSSh/x8UArYnSYAIHRFrgppdSanp7+04jIox3F9ATKJ3DmmWfe/dChQ38fET9cvulMRIDAdwk8pdfr/SUVAgQIECBAgAABAgQIECDw/QQsYHldECBAgAABAgQIELgNgXa7fUlEPB8SAQIEai7w7rVr1551wQUX/FPNHcQn0HeBZrP5SxHx9ojwfbq+6ypIoK8C19944433u/LKKw/3tapiBAgQIECAAAECBAgQIFAJAd/YqcQ1CkGAAAECBAgQIDAogU6ns+ngwYOfiIh7D6qHugQIEBgRgQMppZddf/31e/bv3780IjMbk8BICExMTFycc/6dkRjWkARqLJBz3rmwsLD8Cxq+CBAgQIAAAQIECBAgQIDA/xCwgOUFQYAAAQIECBAgQOB2BCYnJx/RaDTeFxENWAQIECAQn0gpPWt6evpjLAgQ6I/Aaaedtv5ud7vbh3POD+5PRVUIEBiQwFeXlpbuc8UVV3x5QPWVJUCAAAECBAgQIECAAIERFbCANaIXZ2wCBAgQIECAAIHhCkxOTv5Bo9F47nC76kaAAIHSCizmnP9w06ZNL+x0Ot8s7ZQGIzBCAs1mc/ndNj8eEXccobGNSqB2AimlvfPz88+rXXCBCRAgQIAAAQIECBAgQOA2BSxgeYEQIECAAAECBAgQOAqBXbt2nTA2Nrb8UYT3OorHPUKAAIFaCOSc/ynnfPbs7Ow7ahFYSAIDFpiYmPjNnPOrB9xGeQIEViawODY29qDLL7/80ysr4zQBAgQIECBAgAABAgQIVEnAAlaVblMWAgQIECBAgACBgQq0Wq3HppT+KiL8OXqg0ooTIDCCAvuXlpZ+e8+ePf85grMbmUCpBCYmJhZyzltLNZRhCBD4boG393q9J2IhQIAAAQIECBAgQIAAAQL/JeAHR14LBAgQIECAAAECBI5BoNVq/VFK6beO4YhHCRAgUBeBrxRFce7s7OzlEZHrElpOAv0W2L59+w8sLi4uv7POif2urR4BAv0TGBsbe8Lll1/+zv5VVIkAAQIECBAgQIAAAQIERlnAAtYo357ZCRAgQIAAAQIEhi6w/FGEjUbjkymlew69uYYECBAYAYGc8/uLojh7z549nxqBcY1IoJQCzWZz+Z113lbK4QxFgMB/CVx7ww03POCqq65aREKAAAECBAgQIECAAAECBCxgeQ0QIECAAAECBAgQOEaBqampn885v9tHER4jnMcJEKiTwC055z/atGnTCzudzjfrFFxWAv0SaDabvYgY71c9dQgQ6L9ASuk58/Pzf9z/yioSIECAAAECBAgQIECAwKgJWMAatRszLwECBAgQIECAQCkE2u32pRHxrFIMYwgCBAiUV+CLOeff6Xa7byzviCYjUE6Bbdu23bUoiuV3kvvhck5oKgIEIuJLhw8fPmn//v030SBAgAABAgQIECBAgACBegtYwKr3/UtPgAABAgQIECBwnALnnHPOnTZt2vQPEfHjx1nCMQIECNRGIOf8tkajcc709PQ/1ya0oAT6INBsNp8cEW/pQyklCBAYnMBsr9drDa68ygQIECBAgAABAgQIECAwCgIWsEbhlsxIgAABAgQIECBQSoFdu3Y9bmxs7J0+irCU12MoAgTKJ3AgpTS7YcOGV3Q6nSPlG89EBMop0Gw23xARTy/ndKYiQCAijhRF8ZP79u37HA0CBAgQIECAAAECBAgQqK+ABaz63r3kBAgQIECAAAECfRBotVqvTSn9Rh9KKUGAAIFaCOScP5VzPnt2dvb9tQgsJIEVCpx++ul3W7Nmzadzzj+0wlKOEyAwIIGc85sWFhaeOqDyyhIgQIAAAQIECBAgQIDACAhYwBqBSzIiAQIECBAgQIBAeQXa7fadc87/kFL6sfJOaTICBAiUT2D5YwnXrl179oUXXviF8k1nIgLlEpiYmHhmzvmKck1lGgIEvlMgpfSY+fn5v6ZCgAABAgQIECBAgAABAvUUsIBVz3uXmgABAgQIECBAoI8C7Xb7iRHxtj6WVIoAAQJ1EfhGRLzsq1/96u9deumlt9QltJwEjkdgfHz8z1NKv348Z50hQGAoAn9/73vfe3On0ymG0k0TAgQIECBAgAABAgQIECiVgAWsUl2HYQgQIECAAAECBEZVoN1uXxoRzxrV+c1NgACBVRb4bFEUz5+dnX3HKs+hPYHSCmzfvv2HFxcXPxMRdy7tkAYjUHOBoih+Y9++fZfVnEF8AgQIECBAgAABAgQI1FLAAlYtr11oAgQIECBAgACBfgvs2rXrhLGxsY9HxH36XVs9AgQI1EVg+WMJG43GOdPT0/9cl8xyEjgWgfHx8XNTSnuO5YxnCRAYqsB/rFu37qTXvva1y+/w6IsAAQIECBAgQIAAAQIEaiRgAatGly0qAQIECBAgQIDAYAVardZPpZQ+FBFrB9tJdQIECFRa4GBKqbthw4bpTqdzqNJJhSNwjAKPecxj1vzoj/7o30bEA4/xqMcJEBiewMt7vd5LhtdOJwIECBAgQIAAAQIECBAog4AFrDLcghkIECBAgAABAgQqI9But18aEX7gUpkbFYQAgVUUuD7n/IJut/uXqziD1gRKJ7Bt27ZHFkXxvojwfb3S3Y6BCPw/gYNFUZy6b9++f+FBgAABAgQIECBAgAABAvUR8I2a+ty1pAQIECBAgAABAkMQ6HQ6aw4ePPiBiPjpIbTTggABApUXKIriPTnnnXv27Plk5cMKSOAoBSYmJuZyzhNH+bjHCBAYskBKad/8/Pz4kNtqR4AAAQIECBAgQIAAAQKrKGABaxXxtSZAgAABAgQIEKimwOTk5L0ajcbfR8QdqplQKgIECAxdYDHn/NqxsbEX7d69+0tD764hgZIJnHnmmXc/dOjQZyLiB0o2mnEIEPj/C+Sc888tLCx8EAgBAgQIECBAgAABAgQI1EPAAlY97llKAgQIECBAgACBIQu02+3nRMQfDrmtdgQIEKi6wFdTSjMbNmy4uNPpHKl6WPkI3JZAs9n87YjYS4kAgXIKNBqNj8zNzf3s8jJWOSc0FQECBAgQIECAAAECBAj0U8ACVj811SJAgAABAgQIECDw3wKp1Wr9ZUrpV6AQIECAQN8F/rHRaLxg9+7db+97ZQUJjIhAp9NpfO5zn/tISumhIzKyMQnUTiCldPr8/PzraxdcYAIECBAgQIAAAQIECNRQwAJWDS9dZAIECBAgQIAAgeEI7Nq164fGxsY+GRF3H05HXQgQIFA7gXc3Go3n7969+5raJReYQERs3779oYuLix+JiAYQAgRKKXDDpk2bTr700ksPlHI6QxEgQIAAAQIECBAgQIBA3wQsYPWNUiECBAgQIECAAAEC3yuwa9euXxsbG3sTGwIECBAYmMDyRxG+6siRIxdcfPHFXxlYF4UJlFRgYmLiNTnnHSUdz1gECES8sNfrvQIEAQIECBAgQIAAAQIECFRbwAJWte9XOgIECBAgQIAAgRIItFqt16aUfqMEoxiBAAECVRb4Zkrpog0bNkx3Op1DVQ4qG4HvFJiYmPihnPPnIuJOZAgQKKXANyPiPr1e7/+WcjpDESBAgAABAgQIECBAgEBfBCxg9YVREQIECBAgQIAAAQK3LrBr164TxsbG/i4iTuJEoI4COSL85bOON79qmW9IKb38+uuvf83+/fuXVm0KjQkMUaDZbL44Il42xJZaESBwbAKv6fV6Zx7bEU8TIECAAAECBAgQIECAwCgJ+B74KN2WWQkQIECAAAECBEZWoN1u/2xEvC8ixkY2hMEJECAwQgI550+PjY21du/e/fYRGtuoBI5LYOfOnRu/9KUvfSYifvy4CjhEgMCgBYqiKB62b9++qwfdSH0CBAgQIECAAAECBAgQWB0BC1ir464rAQIECBAgQIBADQXa7faFEXF+DaOLTIAAgVUTyDm/vSiK9p49ez61akNoTGAIAlu3bp1oNBpzQ2ilBQECxydwVa/Xe+zxHXWKAAECBAgQIECAAAECBMouYAGr7DdkPgIECBAgQIAAgcoIdDqdNQcOHPjrlNLyu2H5IkCAAIHhCRQR8eeLi4uTF1100b8Mr61OBIYqkMbHxz+aUnroULtqRoDAsQj8Wq/Xe/OxHPAsAQIECBAgQIAAAQIECIyGgAWs0bgnUxIgQIAAAQIECFRE4IUvfOGPLS4u/n1E/K+KRBKDAAECoyRwIOe8N6W0e2Zm5qZRGtysBI5GoNlsLi95fyAifM/vaMA8Q2D4Ap+/8cYb73vllVceHn5rHQkQIECAAAECBAgQIEBgkAK+GTNIXbUJECBAgAABAgQIfB+Bqampp+ac3wiHAAECBFZN4MaU0uyGDRsu7nQ6R1ZtCo0JDEBgfHz8z1NKvz6A0koSINAHgUajce7c3Nwr+1BKCQIECBAgQIAAAQIECBAokYAFrBJdhlEIECBAgAABAgTqI9But/84Ip5dn8SSEiBAoJQCny2K4kWzs7PLS7G5lBMaisAxCmzduvWejUbjmohYf4xHPU6AwHAEvra0tHTSFVdc8eXhtNOFAAECBAgQIECAAAECBIYhYAFrGMp6ECBAgAABAgQIEPgugU6ns+HgwYMfiYgHwiFAgACBVRf4aFEUk7Ozs+9f9UkMQKAPAs1mc/nddXb2oZQSBAgMQCCl9Kr5+fnfHkBpJYctsPwTFivcw1bXjwABAgQIECBAgEApBSxglfJaDEWAAAECBAgQIFAHgfPOO+++RVF8LCI21SGvjAQIECi7QM75bY1GY+f09PR1ZZ/VfARuS2Dr1q13GRsbuy7n/L9IESBQSoHFnPMDFxYWlt+tzhcBAgQIECBAgAABAgQIVEDAAtagL9FvwAxaWH0CBAgQIECAwEgLTE1NnZlz/tORDmF4AgQIVEvgSET8SVEUr5idnf33akWTpk4C4+Pj56aU9tQps6wERkzgr3q93uNGbGbjEiBAgAABAgQIECBAgMCtCFjA8tIgQIAAAQIECBAgsMoC7XZ7ISK2rvIY2hMgQIDA/xQ4kHN+9Zo1a17xile84j/gEBg1gS1btqxbv379tRFxz1Gb3bwEaiRwWq/Xe0eN8opKgAABAgQIECBAgACBygpYwKrs1QpGgAABAgQIECAwKgKdTucOBw8evDoi7jMqM5uTAAECNRL4Zs75VUeOHJm+5JJLvlaj3KJWQGB8fLyZUpqvQBQRCFRV4Nprr732gVdfffUtVQ0oFwECBAgQIECAAAECBOoiYAGrLjctJwECBAgQIECAQKkFWq3WT6WUPhgR60o9qOEIECBQX4GvpJT23nzzza/cu3fv1+vLIPmICaRms/mxiNg8YnMbl0BtBHLOz11YWPjD2gQWlAABAgQIECBAgAABAhUVsIBV0YsViwABAgQIECBAYPQEWq3WZEqpO3qTm5jACgVyRPjb6QoRHR+iwJdTSnsOHz78+xdffPHBIfbVisBxCTSbzcdExHuP67BDBAgMXCCl9JVDhw6dtH///q8MvJkGBAgQIECAAAECBAgQIDAwAd/iHhitwgQIECBAgAABAgSOWSBNTk6+pdFoPOmYTzpAgAABAsMWuCEi9hw4cOCP9+7de3jYzfUjcCwC4+Pj70gpPeFYzniWAIHhCaSULpqfn981vI46ESBAgAABAgQIECBAgEC/BSxg9VtUPQIECBAgQIAAAQIrEDjvvPN+sCiKv4+IE1dQxlECBAgQGJJASulfIuIVGzZseG2n01kcUlttCByTwLZt2x5QFMXfRUTjmA56mACBYQkcaTQa95+bm/vssBrqQ4AAAQIECBAgQIAAAQL9FbCA1V9P1QgQIECAAAECBAisWGBqaurnc87vjIixFRdTgAABAgSGJXBtURS/Ozs7+8aIWP5gTV8ESiXQbDYvi4gzSjWUYQgQ+LZAURRv3rdv368hIUCAAAECBAgQIECAAIHRFLCANZr3ZmoCBAgQIECAAIGKC7RarRenlF5W8ZjiESBAoHICOedP5ZxfZhGrclc78oG2bdv2I0VRLL+7zqaRDyMAgYoKNBqNX5ybm3t3ReOJRYAAAQIECBAgQIAAgUoLWMCq9PUKR4AAAQIECBAgMMICaXJy8i8ajcZTRjiD0QkQIFBngY9GxIUzMzNvrTOC7OUSGB8fn0kptco1lWkIEPgOgU8cPnx48/79+5eoECBAgAABAgQIECBAgMBoCVjAGq37Mi0BAgQIECBAgECNBKampu5SFMXVKaV71Ci2qAQIEKiUQM75g41G40XT09NXVSqYMCMpsH379h9YXFy8LiLuOpIBDE2gBgI5599cWFh4bQ2iikiAAAECBAgQIECAAIFKCVjAqtR1CkOAAAECBAgQIFA1gampqYfmnN8fEeurlk0eAgQI1Ekg5/z8brf7+3XKLGs5BbZt2/aCoiguKud0piJAICL+I+d8n4WFha/TIECAAAECBAgQIECAAIHREbCANTp3ZVICBAgQIECAAIGaCkxNTf1WzvmPahpfbAIECFRB4KtLS0un7Nmz5z+rEEaG0RbYsmXLuvXr118TEfca7SSmJ1BdgZTShfPz8y+qbkLJCBAgQIAAAQIECBAgUD0BC1jVu1OJCBAgQIAAAQIEKijQarUuSymdUcFoIhEgQKDyAkVRPG92dnZv5YMKODIC4+PjW1NKCyMzsEEJ1E/gUFEUp+zbt+9f6hddYgIECBAgQIAAAQIECIymgAWs0bw3UxMgQIAAAQIECNRMYOfOnRvXrVv3oYh4UM2ii0uAAIGRFsg5f3rTpk0P6nQ6iyMdxPBVE0jNZvNjEbG5asHkIVAhgSt6vd7WCuURhQABAgQIECBAgAABApUWsIBV6esVjgABAgQIECBAoEoCk5OTJzUajeUflt65SrlkIUCAQJUFUkqPnZ6evqrKGWUbTYFms/mYiHjvaE5vagK1EMiNRuNRc3NzH6hFWiEJECBAgAABAgQIECAw4gIWsEb8Ao1PgAABAgQIECBQL4F2u/2UiPiLiPBn+XpdvbQECIygwPJHvE1PTzdHcHQj10Sg2Wy+PSJOq0lcMQmMosBHe73ewyMij+LwZiZAgMAxCyx/p8P/4x0zmwMECBAgQIBAOQT80KYc92AKAgQIECBAgAABAkct0G63XxkRO4/6gAcJECBAYDUEvnHkyJFTL7744i+uRnM9CRyNwPj4+P1TSn8XEWNH87xnCBAYvkDOeXxhYWHf8DsPr6N9i+FZ60SAAAECBAgQIECAwOAELGANzlZlAgQIECBAgAABAgMR6HQ6aw4cOPCelNLPDaSBogQIECCwYoGcc6vb7c6uuJACBAYsMD4+/rqU0vYBt1GeAIHjF7hh06ZNJ1966aUHjr+EkwQIECBAgAABAgQIECAwaAELWIMWVp8AAQIECBAgQIDAAAQmJyd/OKX08ZTS/x5AeSUJECBAYGUCnztw4MD99+7de3hlZZwmMHiBbdu2/UhRFJ+NiE2D76YDHNSlbAAAIABJREFUAQLHI1AUxYv37dt3wfGcdYYAAQIECBAgQIAAAQIEhiNgAWs4zroQIECAAAECBAgQ6LtAq9V6bErpXT42qO+0ChIgQGBFAkVRnDY7O/uOFRVxmMAQBSYmJnbnnKeG2FIrAgSOTeCb69atO/m1r33tvx3bMU8TIECAAAECBAgQIECAwLAELGANS1ofAgQIECBAgAABAgMQaLVa56WUXjGA0koSIECAwHEI5Jzf1O12n3ocRx0hsGoCW7ZsufP69euvj4i7rtoQGhMgcJsCRVG8bt++fTswESBAgAABAgQIECBAgEA5BSxglfNeTEWAAAECBAgQIEDgaAVSq9W6IqX0jKM94DkCBAgQGJjAwZTSfaenp/95YB0UJjAgga1bt+5sNBqvHFB5ZQkQWLlAkVL66fn5+b9deSkVCBAgQIAAAQIECBAgQKDfAhaw+i2qHgECBAgQIECAAIEhC+zcuXPjunXrPhARDxlya+0IECBA4DsEcs4v6Xa7L4dCYBQFtmzZsm79+vXXRMS9RnF+MxOoicCHer3eIyMi1ySvmAQIECBAgAABAgQIEBgZAQtYI3NVBiVAgAABAgQIECBw6wLnnnvuT6xZs2b5t+HvxokAAQIEhi+Qc/78pk2b7tfpdA4Nv7uOBPoj0Gw2T4+Iff2ppgoBAoMQSCk9dX5+/k2DqK0mAQIECBAgQIAAAQIECBy/gAWs47dzkgABAgQIECBAgECpBFqt1i+klN4REWtKNZhhCBAgUA+BJ8/MzLy1HlGlrLBAajabfxMRP1XhjKIRGHWBz9944433vfLKKw+PehDzEyBAgAABAgQIECBAoEoCFrCqdJuyECBAgAABAgQI1F6g3W6/ICIuqj0EAAJ1Flj+UCJ/2x/2K+CdMzMzTxh2U/0IDEJgYmLi0TnnqwZRW00CBPomMNnr9fb0rZpCBAgQIECAAAECBAgQILBiAd+SXTGhAgQIECBAgAABAgTKJdBut18TETvKNZVpCBAgUFmBI41G4/67d+/+bGUTClY7gWaz+X8i4pdrF1xgAqMj8I0NGzac9OpXv/o/RmdkkxIgQIAAAQIECBAgQKDaAhawqn2/0hEgQIAAAQIECNRQoNPpbLj55pvf12g0HlrD+CITIEBgqAIppQunp6dfNNSmmhEYsMDExMSpOedP+ljjAUMrT2BlAn/U6/XOXlkJpwkQIECAAAECBAgQIECgXwIWsPolqQ4BAgQIECBAgACBEgm0Wq0TU0ofi4gTSzSWUQgQIFA1gRuWlpZO2bNnz81VCyYPgYmJidfknL2jppcCgfIKLOWcH7ywsPAP5R3RZAQIECBAgAABAgQIEKiPgAWs+ty1pAQIECBAgAABAjUTaLfbPxsR742IdTWLLi4BAgSGIlAUxdNnZ2f3D6WZJgSGLLBjx44Tjxw58rmI2DTk1toRIHCUAiml98zPz//CUT7uMQIECBAgQIAAAQIECBAYoIAFrAHiKk2AAAECBAgQIEBgtQXa7fZzIuIPV3sO/QkQIFA1gaIo3jM7O+uH3lW7WHn+h8D4+PgrUkrnYSFAoLwCKaUnzs/Pv728E5qMAAECBAgQIECAAAEC9RCwgFWPe5aSAAECBAgQIECgxgKtVutPUkpn1ZhAdAIECPRbYDEiHjIzM+Njn/otq16pBHbs2HHHW2655bqc8w+VajDDECDwbYGU0meuueaaB1x99dW3YCFAgAABAgQIECBAgACB1ROwgLV69joTIECAAAECBAgQGIrAWWedtfYud7nLuyPiUUNpqAkBAgSqL/DKmZmZc6sfU0ICEc1m8/kRcQkLAgRKLXBOr9f7g1JPaDgCBAgQIECAAAECBAhUXMACVsUvWDwCBAgQIECAAAECywLnn3/+3ZeWlv42In6UCAECBAisSOA/IuLkmZmZm1ZUxWECIyKwefPmtaeeeuo1EXHvERnZmATqKPDVRqNx0tzc3I11DC8zAQIECBAgQIAAAQIEyiBgAasMt2AGAgQIECBAgAABAkMQmJqaemjO+a8jYuMQ2mlBgACBSgoURXHG7OzsXCXDCUXgVgQmJiaemXO+AhABAqUWuLjX672g1BMajgABAgQIECBAgAABAhUWsIBV4csVjQABAgQIECBAgMB3C0xNTT015/xnEdGgQ4AAAQLHJpBz/lC3231kRORjO+lpAiMvkMbHxz+YUnr4yCcRgEB1BW5pNBo/OTc399nqRpSMAAECBAgQIECAAAEC5RWwgFXeuzEZAQIECBAgQIAAgYEItFqtF6eUXjaQ4ooSIECgugJFSulnpqenP1bdiJIRuHWBrVu3PqrRaCy/k6YvAgRKKpBzfsvCwsKvlnQ8YxEgQIAAAQIECBAgQKDSAhawKn29whEgQIAAAQIECBD4vgKp3W4vf3xWkw8BAgQIHJ1ASukPp6enn3t0T3uKQDUFms3m2yLiidVMJxWBygg8vtfrvasyaQQhQIAAAQIECBAgQIDAiAhYwBqRizImAQIECBAgQIAAgX4KdDqddYcOHXpnzvnR/ayrFgECBCoq8JXFxcWTL7rooi9XNJ9YBI5KYGJi4tSc8ycjYs1RHfAQAQKrIfCJw4cPb96/f//SajTXkwABAgQIECBAgAABAnUVsIBV15uXmwABAgQIECBAoPYC55577t3WrFnzkYi4V+0xABAgQOA2BFJKz56enr4UEgECEc1m89UR8ZssCBAotcCzer3e8j+rvggQIECAAAECBAgQIEBgSAIWsIYErQ0BAgQIECBAgACBMgq0Wq1TU0ofjog7l3E+MxEgQKAEAh///Oc//zDvJFKCmzBCKQR27Nhx4pEjRz4bESeUYiBDECDwPQIppf8siuKkhYWFr+MhQIAAAQIECBAgQIAAgeEIWMAajrMuBAgQIECAAAECBEor0G63nxARb/NxQqW9IoMRILB6Ajnn/LPdbnf53QJ9ESDwLYGJiYkLcs4vBEKAQHkFcs67FxYWzi/vhCYjQIAAAQIECBAgQIBAtQQsYFXrPqUhQIAAAQIECBAgcFwC7Xb7+RFxyXEddogAAQLVFXjtzMyMj1qr7v1KdpwCO3bsuOORI0c+FxF3P84SjhEgMHiBw7fccsv93vCGN1w/+FY6ECBAgAABAgQIECBAgIAFLK8BAgQIECBAgAABAgT+n8DU1NSrcs5n4yBAgACB/yfw9bGxsVNe8YpX/F8eBAh8r8DWrVuf12g0fo8NAQLlFcg5v2FhYeGZ5Z3QZAQIECBAgAABAgQIEKiOgAWs6tylJAQIECBAgAABAgRWJLBly5axe9zjHn+ZUvrlFRVymAABAhUQyDk/v9vt/n4FoohAYCACmzdvXnvqqad+OiJOGkgDRQkQ6JfAo3q93vv7VUwdAgQIECBAgAABAgQIEPj+AhawvDIIECBAgAABAgQIEPi2wDnnnHOnjRs3fjCl9JNYCBAgUFeBnPOnv/a1rz340ksvvaWuBnITOBqBZrP59Ih4w9E86xkCBFZN4OP3vve9H9rpdIpVm0BjAgQIECBAgAABAgQI1EDAAlYNLllEAgQIECBAgAABAsci8KIXveget9xyy0cj4geP5ZxnCRAgUBWBlNJjp6enr6pKHjkIDFAgjY+PLy9uP3yAPZQmQGCFAjnniYWFhd4KyzhOgAABAgQIECBAgAABArchYAHLy4MAAQIECBAgUEOB5T8E5hrmFvnoBdrt9qMi4p0Rsf7oT3mSAAECoy+Qc76i2+1uHf0kEhAYjsDWrVsf1Wg0/no43XQhQOA4Bb6YUjp5fn7+5uM87xgBAgQIECBAgAABAgQI3I6ABSwvEQIECBAgQIAAAQIEvq/A1NTUM3LO+yKigYgAAQI1EfjmkSNHTrn44ou/WJO8YhLoi0Cz2fzLiHhSX4opQoDAQARyzr+7sLDwsoEUV5QAAQIECBAgQIAAAQIEwgKWFwEBAgQIECBAgAABArcqMDU11c45TyMiQIBATQTaMzMz3ZpkFZNA3wS2b99+yuLi4j9ExJq+FVWIAIF+Cxxcu3btya973eu+0O/C6hEgQIAAAQIECBAgQIBAWMDyIiBAgAABAgQIECBA4LYF2u3270fEOZwIECBQcYHPHThw4P579+49XPGc4hEYiMC2bdv+tCiKMwdSXFECBPolcHmv19ver2LqECBAgAABAgQIECBAgMB/C3gHLK8GAgQIECBAgAABAgRuU2DLli1j97znPfdHxK+hIkCAQIUFfnlmZubKCucTjcBABXbs2HHikSNHPhsRJwy0keIECKxEoFizZs3PXHbZZR9bSRFnCRAgQIAAAQIECBAgQOB7BSxgeVUQIECAAAECBAgQIHC7Ajt37ty4du3av0opPfx2H/YAAQIERkwg5/ymbrf71BEb27gESicwMTHx8pzzi0o3mIEIEPi2QM75wwsLC4+IiIyFAAECBAgQIECAAAECBPonYAGrf5YqESBAgAABAgQIEKi0wLnnnnu3NWvWfCgiTqp0UOEIEKibwMG1a9fe74ILLvinugWXl0C/Bc4+++w7fP3rX78uIu7e79rqESDQP4FGo7Flbm7ujf2rqBIBAgQIECBAgAABAgQIWMDyGiBAgAABAgQIECBA4KgFJicn75VS+lBK6YeO+pAHCRAgUGKBnHOn2+2+tMQjGo3ASAk0m83fjoi9IzW0YQnUT+Cf1qxZc9/LLrvsUP2iS0yAAAECBAgQIECAAIHBCFjAGoyrqgQIECBAgAABAgQqK9BqtR6WUnpvRGyqbEjBCBCoi8C/bty48dROp3OgLoHlJDBogc2bN6899dRTP+0dMwctrT6BlQmklNrz8/PdlVVxmgABAgQIECBAgEB1BJaXZ3xOd3XuczWSWMBaDXU9CRAgQIAAAQIECIy4QLvdflJE/EVEjI14FOMTIFBvgV+dmZl5S70JpCfQf4GJiYktOec/639lFQkQ6KPAN9asWXOfyy677N/7WFMpAgQIECBAgAABAgQI1FbAAlZtr15wAgQIECBAgAABAisTmJqa+q2c8x+trIrTBAgQWDWBd83MzDx+1bprTKDiAs1m84MR8bMVjykegVEX+JNer/dbox7C/AQIECBAgAABAgQIECiDgAWsMtyCGQgQIECAAAECBAiMqEC73b4oIl4wouMbmwCB+gocyTk/oNvt/mN9CSQnMFiBZrP5cxHxvsF2UZ0AgRUKLOWcH7ywsPAPK6zjOAECBAgQIECAAAECBGovYAGr9i8BAAQIECBAgAABAgRWJJCmpqbmc87jK6riMAECBIYokFLaPT09ff4QW2pFoJYC4+Pjb04pPaWW4YUmMDoC7+r1et4RcnTuy6QECBAgQIAAAQIECJRUwAJWSS/GWAQIECBAgAABAgRGRaDT6Ww4ePDguyLikaMyszkJEKi1wA0bN248tdPpfLPWCsITGIJAs9k8OSKW31ln7RDaaUGAwHEK5JyftLCw8LbjPO4YAQIECBAgQIAAAQIECESEBSwvAwIECBAgQIAAAQIEVizQbrfvHBF/HREPXHExBQgQIDBAgZTSM6enp98wwBZKEyDwHQLNZvNVEXE2FAIEyiuQUvrHa6655v5XX331LeWd0mQECBAgQIAAAQIECBAot4AFrHLfj+kIECBAgAABAgQIjIxAq9U6MaX0wYj4/43M0AYlQKBWAjnn93e73UdHRK5VcGEJrKLAli1bfnD9+vWfi4jlZW1fBAiUVKAoiufv27fv90s6nrEIECBAgAABAgQIECBQegELWKW/IgMSIECAAAECBAgQGB2Bqampe+ecPxARdx+dqU1KgEBNBBaXlpY279mz55M1ySsmgdIINJvN8yPiwtIMZBACBL6fwFcbjcZJc3NzN+IhQIAAAQIECBAgQIAAgWMXsIB17GZOECBAgAABAgQIECBwGwLtdnv5YwiviogfAEWAAIESCVw8MzPzghLNYxQCtRHYvn37hsXFxX+MiB+vTWhBCYygQFEUv7dv377fGcHRjUyAAAECBAgQIECAAIFVF7CAtepXYAACBAgQIECAAAEC1RNotVqPTSldGRHrq5dOIgIERlDgPw4fPnzKJZdc8rURnN3IBCohMD4+fkZK6bJKhBGCQHUFFnPOD1xYWLimuhElI0CAAAECBAgQIECAwGAELGANxlVVAgQIECBAgAABArUXaLVav5pSemNEjNUeAwABAqsqkHPe3u12L1/VITQnUHOBTqfTuO666/4mIjbXnEJ8AmUXeGuv13ty2Yc0HwECBAgQIECAAAECBMomYAGrbDdiHgIECBAgQIAAAQIVEmi328+OiD+uUCRRCBAYMYGc84e73e4jIiKP2OjGJVA5gWaz+ZiIeG/lgglEoGICY2NjT7j88svfWbFY4hAgQIAAAQIECBAgQGCgAhawBsqrOAECBAgQIECAAAECrVbrd1NKHRIECBBYBYEipfQz09PTH1uF3loSIPB9BJrN5v+JiF+GQ4BAqQWuueGGGx541VVXLZZ6SsMRIECAAAECBAgQIECgRAL/H3t3Ah5XXe5x/H3PZGmDIMgiigtrS1kURVEQBRVX5LrGksyZIdZaFcVrlcyE5eqoQDOTVtAqaMRSMkvRuHLRulsVVNSCC4VCK1e9vSi0gAJtls6c9z4Hi6IsTZNZzvKd58nTKz3n///9Pv/cUpI3cxjACtBhEAUBBBBAAAEEEEAAgagKZLPZi0Xk/VHtRy8EEAiswGX5fP7MwKYjGAIxFEilUvPM7Lci0hbD+lRGIEwC7yyVSsNhCkxWBBBAAAEEEEAAAQQQQKCVAgxgtVKfvRFAAAEEEEAAAQQQiI+AZrPZlSKSjk9lmiKAQIsF7qlWq3OXLVu2pcU52B4BBP5NIJVKDZvZO4BBAIHgCqjqXePj43NGR0f/FtyUJEMAAQQQQAABBBBAAAEEgiPAAFZwzoIkCCCAAAIIIIAAAghEWmDRokXte+6559Wq+upIF6UcAggEReBd+Xz+s0EJQw4EEPinQCqV2s/MNorI7rgggECgBfKlUmkg0AkJhwACCCCAAAIIIIAAAggERIABrIAcBDEQQAABBBBAAAEEEIiDQC6X69q2bdt3VfWEOPSlIwIItEzghttvv/240dHRWssSsDECCDyuQG9v74cdx8nBhAACgRaYFJEjS6WSPzDJCwEEEEAAAQQQQAABBBBA4HEEGMDi0wMBBBBAAAEEEEAAAQSaKnDOOefs7XneT0RkXlM3ZjMEEIiLgHmed9LQ0JD/5wwvBBAIqMDixYtnb968+TYReVpAIxILAQT+LjBaKpXeCgYCCCCAAAIIIIAAAggggMDjCzCAxWcIAggggAACCCCAAAIINF3gvPPOe3qtVvuJmT2z6ZuzIQIIRF1gZT6ff1vUS9IPgSgIuK67UEQ+F4UudEAgygL+YHOlUvlxlDvSDQEEEEAAAQQQQAABBBCYqQADWDMV5H4EEEAAAQQQQAABBBCYlkB/f/8hjuP438h56rQW4CYEEEDgkQL3JRKJwy+66KI/g4MAAsEX6O7uTnR2dt4oIkcHPy0JEYivgKreeMghhzwvl8t58VWgOQIIIIAAAggggAACCCDw+AIMYPEZggACCCCAAAIIIIAAAi0TyGQyc1X1RyLy5JaFYGMEEIiMgJktLhQKl0SmEEUQiIGA67qvFpHVMahKRQTCLnBGqVQaCXsJ8iOAAAIIIIAAAggggAACjRJgAKtRsqyLAAIIIIAAAggggAACUxLIZrPPFpEfisheU7qBixBAAIFHF7j53nvvPWZ4eHg7QAggEC6BZDL5bVV9ZbhSkxaB2An8n6rOLRaLW2PXnMIIIIAAAggggAACCCCAwBQEGMCaAhKXIIAAAggggAACCCCAQGMFMpnMC1X1uyLyhMbuxOoIIBBVATN7WaFQ8Ic5eSGAQMgE0un0szzPu0FEEiGLTlwEYiXgOM5HRkZGcrEqTVkEEEAAAQQQQAABBBBAYIoCDGBNEYrLEEAAAQQQQAABBBBAoLECmUzm5ap6jYjMauxOrI4AAhEUuCqfz/dEsBeVEIiNQDKZvEJV+2JTmKIIhFNgzHGcw0dGRv4UzvikRgABBBBAAAEEEEAAAQQaJ8AAVuNsWRkBBBBAAAEEEEAAAQR2USCbzb5KRK4WkY5dvJXLEUAgvgLbqtXqEcuWLftjfAlojkD4BdLp9AGe590qIruFvw0NEIiugKoWi8ViOroNaYYAAggggAACCCCAAAIITE+AAazpuXEXAggggAACCCCAAAIINEhgYGDgzWZ2lYi0NWgLlkUAgWgJnJPP5wejVYk2CMRTIJVKfczMzo9ne1ojEBoBcxznhSMjI78ITWKCIoAAAggggAACCCCAAAJNEGAAqwnIbIEAAggggAACCCCAAAK7JpDJZM5Q1RUi4uzanVyNAAIxE9i4bdu2o5YvXz4Rs97URSCSAmeeeeYT7rvvvg0isn8kC1IKgYgImNnPyuXyi0TEIlKJGggggAACCCCAAAIIIIDAjAUYwJoxIQsggAACCCCAAAIIIIBAIwQymcx7VXV5I9ZmTQQQiIaA4zinLlmy5JvRaEMLBBDwBVzXfbeIXIoGAggEXmB+qVT6YuBTEhABBBBAAAEEEEAAAQQQaJIAA1hNgmYbBBBAAAEEEEAAAQQQ2HWBTCZznqpesOt3cgcCCMRA4Gv5fP6NMehJRQRiJdDd3Z3o6Oj4jaoeGavilEUgZAJm9of29vZ5K1euHA9ZdOIigAACCCCAAAIIIIAAAg0RYACrIawsigACCCCAAAIIIIAAAvUSGBgYuMjMzqnXeqyDAAKREBhrb28/8oILLvifSLShBAII/ItAKpU6zcyuhgUBBIIt4P8dvVwuDwY7JekQQAABBBBAAAEEEEAAgeYIMIDVHGd2QQABBBBAAAEEEEAAgRkIZDKZpar6wRkswa0IIBAhAVX9yODgYC5ClaiCAAL/JuC67vdE5OXAIIBAoAXuF5G5pVLpz4FOSTgEEEAAAQQQQAABBBBAoAkCDGA1AZktEEAAAQQQQAABBBBAYMYCmslkhlV14YxXYgEEEAi7wB8mJyePuPjii8fCXoT8CCDw2AK9vb3HOI6zVkQcnBBAILgCqvq5YrG4KLgJSYYAAggggAACCCCAAAIINEeAAazmOLMLAggggAACCCCAAAIIzFxAs9nsZSLyzpkvxQoIIBBWATN7Y6FQ+FpY85MbAQSmLuC6blFE3KnfwZUIINACAU9Enl8qlW5owd5siQACCCCAAAIIIIAAAggERoABrMAcBUEQQAABBBBAAAEEEEBgZwK5XM7Ztm3bClU9Y2fX8vsIIBBJge/m8/lXRrIZpRBA4BECyWTyaap6q4h0wYMAAsEVUNUfFovFlwU3IckQQAABBBBAAAEEEEAAgcYLMIDVeGN2QAABBBBAAAEEEEAAgToK7BjCWqmqqTouy1IIIBB8gUkze1ahUPCHMXghgEBMBFzXHRSRbEzqUhOBMAu8vlQqXR3mAmRHAAEEEEAAAQQQQAABBGYiwADWTPS4FwEEEEAAAQQQQAABBFoi0N3dnTj44INX8liilvCzKQItEfA8b3BoaOiclmzOpggg0DKBBQsW7D45OblBRJ7cshBsjAACUxH4/d13333k6tWrJ6ZyMdcggAACCCCAAAIIIIAAAlETYAAraidKHwQQQAABBBBAAAEEYiKwYwhrRER6Y1KZmgjEWeAv27Ztm7t8+fL74oxAdwTiKpBMJs9S1U/GtT+9EQiLgJktLpfLl4QlLzkRQAABBBBAAAEEEEAAgXoKMIBVT03WQgABBBBAAAEEEEAAgaYK+ENYBx10UFFVe5q6MZshgECzBXry+fxVzd6U/RBAIBgCxx57bPu8efNuEpE5wUhECgQQeAyBe2u12pxVq1ZtQQgBBBBAAAEEEEAAAQQQiJsAA1hxO3H6IoAAAggggAACCCAQMYEd74RVEpHTI1aNOggg8HeBa/P5/EtExABBAIH4CqRSqTeZ2ZfjK0BzBMIhoKrLi8Xi+8KRlpQIIIAAAggggAACCCCAQP0EGMCqnyUrIYAAAggggAACCCCAQIsEFi1a1L7XXnt9UUTe0KIIbIsAAo0RqNVqtecuXbr0t41ZnlURQCBMAq7r/kRETgxTZrIiEEOBaiKROObKK69cF8PuVEYAAQQQQAABBBBAAIEYCzCAFePDpzoCCCCAAAIIIIAAAlESyOVyHePj46Nm9h9R6kUXBGIu8Il8Pv/+mBtQHwEEdgik0+njPM/7uYjwNU0+KxAItsA3SqXS64IdkXQIIIAAAggggAACCCCAQH0F+GJFfT1ZDQEEEEAAAQQQQAABBFoo4A9hbd269UuO45zWwhhsjQACdRAws7smJyfnXnLJJX+tw3IsgQACERFIJpNXqer8iNShBgKRFVDVVxeLxW9HtiDFEEAAAQQQQAABBBBAAIF/E2AAi08JBBBAAAEEEEAAAQQQiJSAP4S1bdu2L6sqP3UfqZOlTNwEzGxBoVC4Im696YsAAo8vkEqlDjKzW0SkEysEEAi0wC2bNm161po1a6qBTkk4BBBAAAEEEEAAAQQQQKBOAgxg1QmSZRBAAAEEEEAAAQQQQCA4AmeddVbn7Nmz/SGsU4OTiiQIIDBVATP7VVdX1wtyuZw31Xu4DgEE4iPQ29u7zHGcD8SnMU0RCKeAqr67WCx+JpzpSY0AAggggAACCCCAAAII7JoAA1i75sXVCCCAAAIIIIAAAgggEBKBbDb7ThHhGz4hOS9iIvAwAU9VjxscHFyLCgIIIPBoAr29vXs5jrNBRPZGCAEEAi2weWJi4rDR0dG/BTol4RBAAAEEEEAAAQQQQACBOggwgFUHRJZAAAEEEEAAAQQQQACBYAkMDAzsZWa3isi+wUpGGgQQmILAZ/P5/LumcB2XIIBAjAXS6fQHPM9bFmMCqiMQFoGhUqmUCUtYciKCn/pHAAAgAElEQVSAAAIIIIAAAggggAAC0xVgAGu6ctyHAAIIIIAAAggggAACgRXIZrOXisi7AxuQYAgg8FgC91ar1TnLli3bAhECCCDweALd3d0dnZ2d60TkUKQQQCDQApOe5x1VqVT8d63jhQACCCCAAAIIIIAAAghEVoABrMgeLcUQQAABBBBAAAEEEIinwMDAwHPM7JcikoinAK0RCLXAmfl8/rJQNyA8Agg0TSCdTs/3PO+qpm3IRjMS8L8QbTNagZvDKqCqXy4Wi28Ja35yI4AAAggggAACCCCAAAJTEWAAaypKXIMAAggggAACCCCAAAJhEdBsNrtGRF4SlsDkRACBfwjcePvttz9/dHS0hgkCCCAwRQF1XfdaETlhitdzGQIItEjA87yTKpXKj1u0PdsigAACCCCAAAIIIIAAAg0XYACr4cRsgAACCCCAAAIIIIAAAs0S6O/v73Mc54pm7cc+CCBQNwH/TVFOzufzfGO2bqQshEA8BNLp9PGe510nInydMx5HTsuQCqjqjYcccsjzcrmcF9IKxEYAAQQQQAABBBBAAAEEHleAL0zwCYIAAggggAACCCCAAAKREDjrrLP2mD179npVfUokClECgRgJmNmVhUKhL0aVqYoAAnUUSCaTX1bVN9VxSZZCAIEGCHie97ZKpbKyAUuzJAIIIIAAAggggAACCCDQcgEGsFp+BARAAAEEEEAAAQQQQACBeghkMplPqOr76rEWayCAQFMF7k8kEnMvuuiiPzd1VzZDAIHICPT29h7sOM4tItIRmVIUQSCaAnd2dHQctmLFivujWY9WCCCAAAIIIIAAAgggEGcBBrDifPp0RwABBBBAAAEEEEAgIgLZbPZIEblRRNojUokaCMRGQFU/MDg4eHFsClMUAQQaIpBKpT5pZmc1ZHEWRQCBegp8rFQqfaieC7IWAggggAACCCCAAAIIIBAEAQawgnAKZEAAAQQQQAABBBBAAIEZCfT39//QcZyTZ7QINyOAQCsEbr733nuPGR4e3t6KzdkTAQSiI9Dd3f2kWbNmbTCzJ0WnFU0QiKTAmOd58yqVyh8j2Y5SCCCAAAIIIIAAAgggEFsBBrBie/QURwABBBBAAAEEEEAgGgKZTCapqqVotKEFAvESUNWXDw4O/iBerWmLAAKNEnBdNysig41an3URQKBuAuVSqeTWbTUWQgABBBBAAAEEEEAAAQQCIMAAVgAOgQgIIIAAAggggAACCCAwPYFMJrO7qq4XkadObwXuQgCBVgmY2RcKhcLprdqffRFAIHoCfX19s6rVqv/3gmdGrx2NEIiUgJnZi8vl8nWRakUZBBBAAAEEEEAAAQQQiLUAA1ixPn7KI4AAAggggAACCCAQboFMJrNUVT8Y7hakRyCWAtuq1eoRy5Yt4/FDsTx+SiPQOIFkMumqarFxO7AyAgjUQ8BxnJ+PjIycICJWj/VYAwEEEEAAAQQQQAABBBBotQADWK0+AfZHAAEEEEAAAQQQQACBaQmcc845R3ie92sRaZ/WAtyEAAItEzCzcwuFwpKWBWBjBBCIsoC6rvsLEXlelEvSDYEoCKhqT7FYvCoKXeiAAAIIIIAAAggggAACCDCAxecAAggggAACCCCAAAIIhFIgm81+S0ReFcrwhEYg3gIbt23bdtTy5csn4s1AewQQaJRAKpU6yczWNGp91kUAgboJbOrq6po7PDy8rW4rshACCCCAAAIIIIAAAggg0CIBBrAaCu/z8g7KDSVmcQQQQAABBBBAAIFYCmSz2beKyBdiWZ7SCIRcwHGcU5csWfLNkNcgPgIIBFzAdd2rReS0gMckHgIIiJxXKpUuAgIBBBBAAAEEEEAAAQQQCLsAA1hhP0HyI4AAAggggAACCCAQM4FcLtc1Pj5+s5k9M2bVqYtA6AU8z/v60NDQG0JfhAIIIBB4Add154rITSLSFviwBEQg3gIPiMicUqn053gz0B4BBBBAAAEEEEAAAQTCLsAAVthPkPwIIIAAAggggAACCMRMoL+/f4njOAMxq01dBKIgMOF53tFDQ0MbolCGDgggEHyBZDJ5maq+K/hJSYhA7AU+XyqVFsZeAQAEEEAAAQQQQAABBBAItQADWKE+PsIjgAACCCCAAAIIIBAvgYGBgUPNzH83i854NactApEQ+Gg+n/9wJJpQAgEEQiGQSqX2MzN/6HOPUAQmJALxFfA8zzuuUqmsjS8BzRFAAAEEEEAAAQQQQCDsAgxghf0EyY8AAggggAACCCCAQIwEMpnMN1X1NTGqTFUEIiFgZv/red68pUuXbo1EIUoggEBoBHp7e893HOdjoQlMUARiKqCqPywWiy+LaX1qI4AAAggggAACCCCAQAQEGMCKwCFSAQEEEEAAAQQQQACBOAhkMpk3qeqX49CVjghETcDM3lwoFL4StV70QQCB4AssXrx49ubNm9eLyDOCn5aECMRe4I2lUulrsVcAAAEEEEAAAQQQQAABBEIpwABWKI+N0AgggAACCCCAAAIIxEvA/+Zpe3v7OlU9KF7NaYtAJAS+l8/nXxGJJpRAAIFQCriumxaRK0MZntAIxEvg9rvvvvuI1atXT8Sr9iPb+t+4sbgj0B8BBBBAAAEEEEAAgZAJMIAVsgMjLgIIINAwAb6y0zBaFkYAAQQQmLlANpv1Hx10/sxXYgUEEGiywKTjOM9esmSJ/+4zvBBAAIGWCORyOWfjxo3Xi8jzWhKATRFAYMoCjuN8cGRk5ONTvoELEUCgYQJ8ubhhtCyMAAIIIIAAAhEVYAArogdLLQQQQAABBBBAAAEEoiLQ399/iOM4N4nIrKh0ogcCMRIo5PP5bIz6UhUBBAIqkEqlTjKzNQGNRywEEPinwF9rtdphq1at2gIKAggggAACCCCAAAIIIBAmAQawwnRaZEUAAQQQQAABBBBAIIYCmUzmv1X1dTGsTmUEwi7wl23bts1dvnz5fWEvQn4EEIiGQDKZ/Jqqvj4abWiBQHQFVPXTxWLxvdFtSDMEEEAAAQQQQAABBBCIogADWFE8VTohgAACCCCAAAIIIBARgWw2e5qIXB2ROtRAIG4CyXw+X4lbafoigEBwBebPn39Ie3v7zSLSEdyUJEMAARGpqeoxxWLRfxdcXggggAACCCCAAAIIIIBAKAQYwArFMRESAQQQQAABBBBAAIH4CZx11lmdXV1dvxWROfFrT2MEQi9wbT6ff4mIWOibUAABBCIlkEqlPmlmZ0WqFGUQiKbA6lKp9NpoVqMVAggggAACCCCAAAIIRFGAAawoniqdEEAAAQQQQAABBBCIgEB/f/+HHMf5SASqUAGBuAnUROTYfD7/m7gVpy8CCARVwP8S6N/nQXt7e/dKJBIbzexJQU1LLgQQ+IfAa0ql0rfwQAABBBBAAAEEEEAAAQTCIMAAVhhOiYwIIIAAAggggAACCMRMIJvNPsPMblbV3WJWnboIhF7AzD5ZKBT+M/RFKIAAApEVcF33bBEZimxBiiEQHYFbbrnllmevXbt2e3Qq0QQBBBBAAAEE4ifwzx8IiV93GiMQLwEGsOJ13rRFAAEEEEAAAQQQQCAUAtls9qsi8oZQhCUkAgj8Q8DM7pqcnJx7ySWX/BUWBBBAIKgC3d3dHZ2dnetE5NCgZiQXAgj8XcDM3lMuly/FAwEEEEAAAQQQQAABBBAIugADWEE/IfIhgAACCCCAAAIIIBAzgUwm8wpV/U7MalMXgUgIeJ739qGhoRWRKEMJBBCItEAqleo2sy9GuiTlEIiAgKreMz4+ftjo6Og9EahDBQQQQAABBBBAAAEEEIiwAANYET5cqiGAAAIIIIAAAgggEDaBXC7XMTY29lsRmRu27ORFIO4CZvarrq6uF+RyOS/uFvRHAIFwCLiu+xMROTEcaUmJQHwFVHVZsVj0Hx3KCwEEEEAAAQQQQAABBBAIrAADWIE9GoIhgAACCCCAAAIIIBA/gUwmc46qXhS/5jRGIPQCnpkdXygUfhH6JhRAAIHYCKRSqReY2c9EhK+RxubUKRpSgUnP846qVCobQpqf2AgggAACCCCAAAIIIBADAb64EINDpiICCCCAAAIIIIAAAmEQyGQyT1PVW0TkCWHIS0YEEPingJkNFwqFd2KCAAIIhE3Add1VInJ62HKTF4EYCny1VCq9KYa9qYwAAggggAACCCCAAAIhEWAAKyQHRUwEEEAAAQQQQAABBKIukM1mvygi3VHvST8EIihwr+M4c5csWbI5gt2ohAACERc4/fTTD2xra/MHwGdFvCr1EAi9gOM4rxgZGfle6ItQAAEEEEAAAQQQQAABBCIpwABWJI+VUggggAACCCCAAAIIhEsgk8m8XFX5Zkq4jo20CDwoYGbvKRQKl8KBAAIIhFUgmUzmVTUT1vzkRiBGAr8+9NBDj83lcl6MOlMVAQQQQAABBBBAAAEEQiLAAFZIDoqYCCCAAAIIIIAAAghEVSCXy7WNjY3dICJHR7UjvRCIsMDvZs+e/dxcLleNcEeqIYBAxAUWLFiw++Tk5AYReXLEq1IPgdALmNnby+XyitAXoQACCCCAAAIIIIAAAghEToABrMgdKYUQQAABBBBAAAEEEAiXQCaT6VfVQrhSkxYBBPw3vxKRk/P5/I/RQAABBMIukEwm36Oqnwp7D/IjEAOBO81sTrlcvi8GXamIAAIIIIAAAggggAACIRJgACtEh0VUBBBAAAEEEEAAAQSiJtDf37+/4zjrReSJUetGHwSiLmBmxUKhkI56T/ohgEA8BE4++eS2Aw444NeqemQ8GtMSgfAKqOqFxWLx/PA2IDkCCCCAAAIIIIAAAghEUYABrCieKp0QQAABBBBAAAEEEAiJQDabLYtIb0jiEhMBBP4pcL+ZHV4oFO4ABQEEEIiKQCqVOs3Mro5KH3ogEGGBcc/zDq9UKn+McEeqIYAAAggggAACCCCAQMgEGMAK2YERFwEEEEAAAQQQQACBqAhks9kTRcR/dBn/XRKVQ6VHbARU9ezBwcFlsSlMUQQQiI2A67rfEZFXxKYwRREIr8CqUqnED3KE9/xIjgACCCCAAAIIIIBA5AT4RkfkjpRCCCCAAAIIIIAAAggEXyCXy7WNjY39SkSeHfy0JEQAgX8TuOXee+999vDw8HZkEEAAgagJuK7r/93kBhFxotaNPghETMAcx3nJyMjItRHrRR0EEEAAAQQQQAABBBAIqQADWCE9OGIjgAACCCCAAAIIIBBmgUwm835VvTjMHciOQIwFXp3P578d4/5URwCBiAskk8krVLUv4jWph0AUBK4vlUrHi4hFoQwdEEAAAQQQQAABBBBAINwCDGCF+/xIjwACCCCAAAIIIIBA6ATOPffcJ9dqtfUismfowhMYAQRG8/n8W2FAAAEEoiywYMGCp05OTt4mIrtFuSfdEIiCgJkly+VyJQpd6IAAAggggAACCCCAAALhFmAAK9znR3oEEEAAAQQQQAABBEInkM1mrxSRdOiCExgBBMZU9YjBwcE/QIEAAghEXSCdTuc8z/tw1HvSD4EICGzq6uqaOzw8vC0CXaiAAAIIIIAAAggggAACIRZgACvEh0d0BBBAAAEEEEAAAQTCJpDNZk8QkWtFhP8WCdvhkTf2AmZ2fqFQuDD2EAAggEAsBBYvXjz7rrvuulVVnx6LwpREIMQCnuf9V6VSuSDEFYiOAAIIIIAAAggggAACERDgmx4ROEQqIIAAAggggAACCCAQBoFcLuds3br1547jPD8MecmIAAL/IvD72bNnH5XL5cZxQQABBOIikEwmF6jq5+PSl54IhFjggY6OjrkrVqy4I8QdiI4AAggggAACCCCAAAIhF2AAK+QHSHwEEEAAAQQQQAABBMIikM1m3yMinwpLXnIigMC/CLwun89/AxMEEEAgTgL+8PjGjRt/KSLPjVNvuiIQRgHP866oVCoLwpidzAgggAACCCCAAAIIIBANAQawonGOtEAAAQQQQAABBBBAINAC55xzzt6e590qInsHOijhEEDgEQKe5/330NDQf0CDAAIIxFGgt7f3pY7j/CCO3emMQMgEPFV9QbFY/FXIchMXAQQQQAABBBBAAAEEIiLAAFZEDpIaCCCAAAIIIIAAAggEWSCTyVyuqm8PckayIYDAowpMOI7zrCVLltyGDwIIIBBXAdd1rxGRU+Pan94IhEjgulKp9GIRsRBlJioCCCCAAAIIIIAAAghERIABrIgcJDUQQAABBBBAAAEEEAiqQCaTeZ6qXi8iTlAzkgsBBB5dwMw+VigUPoQPAgggEGeBvr6+w6vV6m9FpD3ODnRHIAwCjuO8aWRk5KthyEpGBBBAAAEEEEAAAQQQiJYAA1jROk/aIIAAAggggAACCCAQKIFcLueMjY39TESOC1QwwiCAwE4FzOx/Pc+bt3Tp0q07vZgLEEAAgYgLuK57qYi8O+I1qYdAFARuv/vuu49YvXr1RBTK0AEBBBBAAAEEEEAAAQTCI8AAVnjOiqQIIIAAAggggAACCIROYGBgYJGZfTZ0wQmMAAKiqm8ZHBz8MhQIIIAAAiLd3d37dnZ2bhCRJ+KBAAKBF+gvlUpLA5+SgAgggAACCCCAAAIIIBApAQawInWclEEAAQQQQAABBBBAIDgCAwMDe5nZbSKyT3BSkQQBBKYo8P18Pn/KFK/lMgQQQCAWAslkckBVl8SiLCURCLfA/bNmzTrs8ssvvzPcNUiPAAIIIIAAAggggAACYRJgACtMp0VWBBBAAAEEEEAAAQRCJJDJZC5T1XeFKDJREUDg7wLVWq32nKVLl94ECAIIIIDAPwX6+vpmVavV9SLyTFwQQCDwApeVSqUzA5+SgAg0WMD/d9fk5OTstrY2p1qtPvgujo7j7O55XpvjOJ2O43SpquN53oO/53ne7qra9lAsM2tT1d2nGbMmIvc97N6/qqrt2OeBRCKxfcfvjVer1bEd2R7wPG/cv+/WW299YO3atQ9dM80I3IYAAggggAACCDRPgAGs5lmzEwIIIIAAAggggAACsRHo7+9/ruM4vxCRRGxKUxSBiAiY2VChUMhEpA41EEAAgboKJJPJXlUt13VRFkMAgUYIVBOJxDFXXnnlukYszpoINFIgl8s569at23vWrFn+u0nvsWMAak9/OMr/cBznCf4/F5E9/d8zsyfs+NX/Z/4glT8w5X90NTJnk9auisj9ZvaAqvpDWvfv+PD/b/+f+f97bMfv32Nm96jqg7+KyL3t7e33VKvVe4rF4tYm5WUbBBBAAAEEEIixAANYMT58qiOAAAIIIIAAAggg0CABzWQy16nq8Q1an2URQKBxAn8RkcPz+fzfGrcFKyOAAAKhFtBUKvVzMzsu1C0Ij0AMBMzs2+Vy+dUxqErFYAtoT0/P3olEYm8z20dV9xYR/8MfrtrX87x9HMd58J+p6j5m9tDv8/27+p7rhD+QJSL+YNZDHw/97y2e592RSCTu2r59+5+7urruvP322+9as2aNP/zFCwEEEEAAAQQQmLIAf4GbMhUXIoAAAggggAACCCCAwFQEMpnM21R1xVSu5RoEEAiWgJm5hUKBd3YJ1rGQBgEEAiaQTqdP9DzvJwGLRRwEEHgUATN7bblcXg0OAo0Q6O7u3rejo2N/EXmaqj74q4g8RUQOMLOnqOoBIvJk3hm6EfoNX9N/VOJd/oeZ3WFmd6qq/8Mqf/b/mareoap37rPPPn+4+OKLH3x8Ii8EEEAAAQQQQIABLD4HEEAAAQQQQAABBBBAoG4CZ5111h6zZ89er6r+F515IYBAiATM7LpCofBiEfG/2cALAQQQQOBxBFKp1JfM7M0gIYBA4AVu2bRp07N4J5vAn1PQAuqCBQueMjk5eaCZHeg4jj9Y5Q9VPdUfsDKzA3b8N29n0IKTpyUCm0XkT/6H53n+r390HOdPbW1tD35cfvnld7YkFZsigAACCCCAQNMFGMBqOjkbIoAAAgg0W6C7uzsxOjpaa/a+7IcAAgjEUSCbzX5SRM6KY3c6IxByAf/vSsfm8/nfhLwH8RFAAIGmCMyfP/+Q9vb2m0WkoykbsgkCCMxE4KxSqfSpmSzAvdET6Ovr23/79u3+cNWBnucdqKoPDVs9+KuIMFwVvWNvVaNxVf2jmT04pOUPaInIRlXdMD4+vmF0dJTHv7fqZNgXAQQQQACBOgswgFVnUJZDAAEEEGi9wMKFC5+8devW4xKJxLFm9iIROaxcLh/Euzm0/mxIgAAC0RY4++yzj0okEjeKSFu0m9IOgegJmNmnCoUCw5PRO1oaIYBAAwVc1/24iCxu4BYsjQAC9RHY4nnenEqlcm99lmOVMAi85jWv6dxvv/0O9TxvrogcumOoyh+s8j/8rxPOCkMPMsZCwH8HrQ3+h5ltSCQSGz3P29DR0bFhxYoV98dCgJIIIIAAAghERIABrIgcJDUQQACBOAv09vYeLCInisiLVNX/dZ6I/Mu/48zsOZVK5ddxdqI7Aggg0GABHRgY+KGZndTgfVgeAQTqL3C34zhzlyxZcnf9l2ZFBBBAILoCvb29e/nfJDWzJ0W3Jc0QiIzAxaVS6QORaUORhwQ0nU4/XUTm1Gq1Of7faf2BK1U9TESeKSIJqBAIuYD/+MLbPM/z3zHrNjO7pVar3TRv3rz/yeVyXsi7ER8BBBBAAIHICTCAFbkjpRACCCAQbQH/p9f22muvF/gDV6p6goj4H3vtrLWqDpRKpfzOruP3EUAAAQSmJ5DJZFKqOjK9u7kLAQRaKaCq7xgcHLy8lRnYGwEEEAirgOu6/ykil4Q1P7kRiJHApOd5R1UqFf9dZniFTKCvr29P/13MdgxZHW5m/oDVnB0fXSGrQ1wE6iGwTURu8TxvXSKRWGdm66rV6rqrrrrKf7yh1WMD1kAAAQQQQACBXRdgAGvXzbgDAQQQQKCJAt3d3Yn29vZjHMc5xcxO8d/lSkRm72oEM/tBpVJ5+a7ex/UIIIAAAjsXyGQyu6vqehF56s6v5goEEAiSgOd5a3fbbbfj+OnpIJ0KWRBAIEwC3d3dHZ2dnTeJiD8MwAsBBAIsYGZfL5fLbwhwxNhH83/w8olPfOIRjuMcpar+x7NE5CgReVrscQBAYGoC96vqLSJyk+d5N7e1tf3OH84aGRn5v6ndzlUIIIAAAgggMBMBBrBmose9CCCAAAJ1F/AHrtra2g5PJBL+oJU/dPUKEdmzDhtNTk5O7j06OvpAHdZiCQQQQACBhwlks9mPi8hiUBBAIHQCnuM4JyxZsuT60CUnMAIIIBAggXQ6/UbP874SoEhEQQCBxxZ4ZalU+i5ArRdYsGDBU7dv336smR2hqkf6v+4YtupsfToSIBA5gb+KyDpVXWtmaxOJxNqDDjroFn4QJ3LnTCEEEEAAgRYLMIDV4gNgewQQQAAB0Z6enqMTicRLa7XayxzHeUmdBq4eQauqryuVSt/AHAEEEECgfgLnnHPOEZ7n/VpE2uu3KishgEAzBMzs8kKh8I5m7MUeCCCAQNQFXNf9kYj4/z3LCwEEgi3w64mJieeNjo7Wgh0zOum6u7ufNHv27OdWq1X/639HmZn/rlb+sBWPDozOMdMknAJ/E5EbPc+7QVVvFJEbJicnb+XPx3AeJqkRQAABBIIhwABWMM6BFAgggECsBNLp9N5m9rJarXaKqr62WW8jbmafqFQq748VNmURQACBBgv09/d/33GclzV4G5ZHAIH6C9zrOM7cJUuWbK7/0qyIAAIIxE8glUo9z8x+ISJ8vTV+x0/j8Am8o1QqXR6+2MFP7A9bdXZ2+u9qdayqHisi/sdBwU9OQgQQ2CGwzcx+4w9keZ73y0QicX2xWFwvIoYQAggggAACCOxcgC8I7NyIKxBAAAEEZijgP1awvb39GMdx/EcKniIiJ4tI2wyXnc7t68vl8rzp3Mg9CCCAAAKPFMhms6eLyCpsEEAgfAJmdlahUPhU+JKTGAEEEAiugOu6RRFxg5uQZAgg4Auo6l2e5x1WLpfvQ2T6At3d3U+cPXv20Z7nPThs5Q9diYj/dTe+7zR9Vu5EIIgC94vIb0XkWlW9rlqt/mzVqlVbghiUTAgggAACCLRagL8It/oE2B8BBBCIqEAqldpPRE7yPO80ETlVRJ4UhKq1Wu2gq6666g9ByEIGBBBAIMwCuVyua3x8/GYze2aYe5AdgTgKmNlNXV1dz8nlctU49qczAggg0CiBdDr9DM/z/HeJmN2oPVgXAQTqI2BmS8rl8rn1WS36q/jvZu8PWfnDVv67Wu0Yujow+s1piAACjyLgvxvWejO7XlV/5jjOz8fGxtbx6EI+VxBAAAEEEOAnEfgcQAABBBCok0Aul3N+//vfP9/zvNer6qlm9qw6LV3vZRaVy+XP1XtR1kMAAQTiJpDNZvMikolbb/oiEAEB8zzvpUNDQz+KQBcqIIAAAoETcF33QhFhqCNwJ0MgBB4hMF6tVufxQ3qP/Mzw38m+s7PzKBE5QVWPN7MXishhfA4hgAACjyNwv6r+SkR+KiI/2X333a+79NJLH0AMAQQQQACBuAnwDlhxO3H6IoAAAnUU6Ovrm+V53om1Ws1/l6s3i8gBdVy+IUup6pdKpVJ3QxZnUQQQiK2A/5dq/8f/4vLq7+8/zHGc34lIZ1w60xOBCAmU8vl8KkJ9qIIAAggESuDMM898wn333bdBRPYPVDDCIIDAIwTM7Avlctl/rHqsX8lkco9EInGciJzoP0bQzF4kInvFGoXyCCAwU4GaiPzaf2Sh/+jC8fHx74+Ojt4z00W5HwEEEEAAgaALMIAV9BMiHwIIIBAwge7u7ifNmjXr5TseLfh6EdkjYBF3Fuevk5OT+/CWyDtj4vcRQACBxxbIZDLfVNXXYIQAAqETuN/MDi8UCneELjmBEUAAgRAJuK77ThH5TIgiExWB2Ao4jvPikZGRa+ME0Nvbe7DjOCeKiFM56OUAACAASURBVD9o5f96uIg4cTKgKwIINF3A8x9b6A9jqer3qtXqD1etWrWl6SnYEAEEEEAAgQYLMIDVYGCWRwABBKIgcPrppx/Y1tb2ejN7nYicJCLtIe91fLlc/nnIOxAfAQQQaInAwMDAm83sSy3ZnE0RQGCmAv35fH7pTBfhfgQQQACBxxfwH9/V0dHxG1U9EisEEAi2gKr+olgs+o/Yi+SbGi9atKhrfHz8BDN7sed5L1RVv2vYfpgy2J9EpEMAgekI+H/mrlPVH4nIj8bHx9eMjo5uns5C3IMAAggggECQBBjACtJpkAUBBBAIkEAqlTrIzP7DzPzH9fk/EReZl5nlKpXKRyJTiCIIIIBAkwQWL148u6Oj42YRObBJW7INAgjUT2DDtm3bjl6+fPlE/ZZkJQQQQACBxxJwXffVIrIaIQQQCIWAWyqVyqFIupOQOwaunut53ovM7BRVfTGPjo/CydIBgVgI3K6q16jqfzuOc+3KlSvHY9GakggggAACkRJgACtSx0kZBBBAYGYCUR66+jeZn5bL5UgNlc3s5LkbAQQQmJrAwMDABWZ23tSu5ioEEAiSgOd5rxkaGvpWkDKRBQEEEIi6QDKZ/JaqvirqPemHQAQE/k9V5xaLxa1h65JKpXZT1eP9RwnWarUXMXAVthMkLwIIPIbAmJld5z+u0PO871UqlRui+k6FfAYggAACCERLgAGsaJ0nbRBAAIFdFojR0NXDbWpmtm+lUrl3l8G4AQEEEIipQH9//yGO49wkIrNiSkBtBEIr4D82tFAo+O9qygsBBBBAoIkCyWTyCFX9jYi0NXFbtkIAgWkImNmHy+XyR6dxa1NveZSBq5eISEdTQ7AZAggg0GQBVb3LzPzHFX6vvb199RVXXPG/TY7AdggggAACCExJgAGsKTFxEQIIIBAtgZgOXf3LITqO8+ZisfiVaJ0sbRBAAIHGCWQyGf9t4E9t3A6sjAACDRIYU9UjBgcH/9Cg9VkWAQQQQOBxBNLp9Oc8z1sIEgIIBF5ga0dHx5wVK1bcEaSk/sCViJxkZi81s5NU9bkikghSRrIggAACTRYwEfmdmX3LzL5xxx13/HTNmjXVJmdgOwQQQAABBB5VgAEsPjEQQACBmAi4rvsUEXmrmfnvfhD7x++Z2XClUnlnTI6fmggggMCMBDKZzH+o6tdntAg3I4BAqwT+K5/PX9CqzdkXAQQQiLtAKpXaz8w2iMgecbegPwIhELiyVCr1tTrnGWeccWStVnudmZ3CIwVbfRrsjwACIRDwn3LxPf+jra3t6pUrV/4lBJmJiAACCCAQUQEGsCJ6sNRCAAEEfIHFixfP3rJly+s8z0uLyKt57MG/fF78sVwuH8hnCgIIIIDA4wv4/y5pb2+/SVUPxgoBBEIn8PvZs2cflcvlxkOXnMAIIIBAhAR6e3vPdxznYxGqRBUEoirgtbW1vXDlypW/bGbBhQsXPnliYuIl/sCViLxORJ7azP3ZCwEEEIiQQE1Efu04zjXVavW/K5XKDSLiv2MWLwQQQAABBJoiwABWU5jZBAEEEGieQHd3d2L27NkvrdVqaVV9o5k9oXm7h2unRCIxd2Rk5LZwpSYtAggg0FyBgYGBnJl9uLm7shsCCNRDwPO804aGhq6px1qsgQACCCAwfQF/oH3z5s3rReQZ01+FOxFAoEkCPy2VSic28hv2ixYt6hofHz/B8zx/4Mr/8B8ryPdqmnTAbIMAAvERMLM/qOp3VPWaLVu2fGf16tUT8WlPUwQQQACBVgjwl/pWqLMnAggg0ACBnp6eI1U1papniMj+Ddgiiku+r1wuL49iMTohgAAC9RDIZrP+NwlvEZGueqzHGggg0FSBb+fzef8dUHkhgAACCARAwHVd/52prwxAFCIggMDOBd5SKpW+vPPLpnZFLpdzfv/73/tDVq8ws1eKyAki0jG1u7kKAQQQQKBOAg+IyLdE5Ctm9o1yuXxfndZlGQQQQAABBP4hwAAWnwwIIIBAiAVc132KmfkDV30iMjfEVVoV/ZpyuXxaqzZnXwQQQCDoAv39/V9zHOf1Qc9JPgQQeITApOM4Ry9ZsoR3+uSTAwEEEAiIgD+AsXHjxutF5HkBiUQMBBB4bIHb77777iNm8k4pfX19e9ZqtVebmf9IwVeJyD6AI4AAAggERmBCVb9rZl9xHOfqkZGRuwOTjCAIIIAAAqEWYAAr1MdHeAQQiKPAQ48Y9DxvkZm9QUTa4+hQp85b77nnnr1n8gW1OuVgGQQQQCBwAgMDA680s28HLhiBEEBgpwKqeuHg4OD5O72QCxBAAAEEmiqQTqeP9zzvOh411lR2NkNgWgKqmi0Wi4Vdubm3t/dgx3FO84euVPUlvMvVruhxLQIIINAygZqI/FxERjs6OkZXrFhxR8uSsDECCCCAQOgFGMAK/RFSAAEE4iKQTqfneJ7Xa2YLROTpcend6J6q+tJSqbSm0fuwPgIIIBAmgVwu1zE2NvZb3l0xTKdGVgT+IbCpVqsdvnTp0q2YIIAAAggETyCVSn3JzN4cvGQkQgCBfxO4v62tbc7KlSv/8lgyO35I0h+s9N/lyn+H9SNQRAABBBAItYAnIjc6jnNNtVotVyqVDaFuQ3gEEEAAgaYLMIDVdHI2RAABBKYu0NfXN6tWq53mv9uViLycn5Kdut0uXLmkXC6fuwvXcykCCCAQeYFMJnOeql4Q+aIURCCCAp7nvXVoaGg0gtWohAACCERCYP78+Ye0t7ffzDvjROI4KRF9gc+WSqV3PbxmT0/PPolE4rUi4g9dvVJEnhh9BhoigAACsRQwM/uViHzB/yiXy5tiqUBpBBBAAIFdEmAAa5e4uBgBBBBojkAqlXpBrVZbqKrzRWT35uwaz13M7IZKpXJsPNvTGgEEEHikwHnnnff07du336Kqu+GDAALhEvA87wdDQ0P+0D4vBBBAAIEAC6RSqaVm9sEARyQaAgj8XaBmZs8xs60Pe7TgySLSBhACCCCAQNgF/G+R21RL+O+M9TP/MYWquqpYLN411Ru5DgEEEEAgXgIMYMXrvGmLAAIBFvDf7WpycvKtjuO83//iToCjRi2aOY6zP//RFLVjpQ8CCExXIJvNfklEeCzOdAG5D4HWCVRF5Ln5fP53rYvAzggggAACUxHo6+vbs1qt+o+02Wcq13MNAgi0VGBCRDpbmoDNEUAAAQSCJLBdRL4jIqv22GOPr1966aUPBCkcWRBAAAEEWivAAFZr/dkdAQQQkN7e3sNE5O2q+g4ReRIkzRcwM7dSqZSbvzM7IoAAAsESyGQyL1fV7wUrFWkQQGAqAma2rFAonD2Va7kGAQQQQKD1Aq7rvldElrc+CQkQQAABBBBAAIG4COzSu15NBWXc/zqamY12dXV9aXh4eNtUbuIaBBBAAIHoCjCAFd2zpRkCCARYIJfLObfeeuupjuO8T0T8x8Tw53ELz8vMRiqVyhktjMDWCCCAQMsFcrlcx9jY2K9FZF7LwxAAAQR2VeBOEZmbz+f/tqs3cj0CCCCAQGsETj755LanPe1pv+XvXq3xZ1cEEEAAAQQQQKDOAveKyFc8zyvPmTPnR7lczn9sIS8EEEAAgZgJ8A3/mB04dRFAoLUCfX19+1er1TPM7EwReUZr07D7wwT+Ui6Xn7orD31HDwEEEIiaQDabzYhIPmq96INAHATMLF0oFIpx6EpHBBBAIEoCruueKiLXRKkTXRBAAAEEEEAAAQRkk4j4T9y4vFQqbcQDAQQQQCA+AgxgxeesaYoAAi0U6OnpOUlVz1LV14tIWwujsPVjCKjqMaVS6TcAIYAAAnEU6O/v399xnFtFZI849qczAmEWMLOfFgqFExkkD/Mpkh0BBOIskEwmv62qr4yzAd0RQAABBBBAAIEIC6wVkeGOjo5VK1asuD/CPamGAAIIIMAjr/gcQAABBBon0N3d3TFr1qzXe573ARF5YeN2YuV6CKhqplQqDdVjLdZAAAEEwiaQzWZXicjpYctNXgQQkJrnec8bGhryHx/KCwEEEEAghALJZPIIVfV/GIgf1grh+REZAQQQQAABBBCYosC4iPy34zjDIyMj3+eHqKaoxmUIIIBAyAR4B6yQHRhxEUAg+ALd3d37dnZ2LjCz94rI04KfmIQ7BL5XLpdfgQYCCCAQN4H+/v4XO47zI344I24nT98oCHie9+mhoSH/75y8EEAAAQRCLOC67mdFZFGIKxAdAQQQQAABBBBAYIoCZva/qlrxPG+4UqncPsXbuAwBBBBAIAQCDGCF4JCIiAAC4RBIp9NzarXae0RkoYh0hSM1KR8SUNUJVd27WCxuRQUBBBCIi0Aul2sbHx9fa2bPiktneiIQIYF7HMeZs2TJkrsj1IkqCCCAQCwFFi5c+OTx8fENIrJ7LAEojQACCCCAAAIIxFPAU9U1IvK5LVu2fHX16tUT8WSgNQIIIBAdAQawonOWNEEAgdYIaDqdfnmtVvtPETmVdw9pzSHUa1dVfU2pVPpWvdZjHQQQQCDoAgMDA4vN7ONBz0k+BBB4VIFF+Xz+c9gggAACCERDwHXdc0Xkwmi0oQUCCCCAAAIIIIDALgr8VUS+mEgkPnnllVeu28V7uRwBBBBAICACDGAF5CCIgQAC4RLo6+ubVa1WzzCz94vI4eFKT9rHEvA875JVq1YtRggBBBCIg8C555775FqtdquIPDEOfemIQJQEPM9bu9tuux2Xy+W8KPWiCwIIIBBnAf/rDNu3b79FVQ+MswPdEUAAAQQQQAABBGStiHxyYmLiqtHR0Uk8EEAAAQTCI8AAVnjOiqQIIBAAgQULFuw+OTm5wMz6ReSAAEQiQn0Fbi6Xy0fWd0lWQwABBIIpkMlkRlQ1Fcx0pEIAgccR8MzsRYVC4ecoIYAAAghES8B13R4RqUSrFW0QQAABBBBAAAEEpilwp4is9DxvuFKp3D7NNbgNAQQQQKCJAgxgNRGbrRBAILwCqVRqPzM708zeJyJ7hbcJyXcmkEgknjkyMvKnnV3H7yOAAAJhFujv73+R4zg/4dG5YT5FssdVwMw+XygUFsa1P70RQACBiAuo67r+39FeFPGe1EMAAQQQQAABBBCYuoD/g1g/cBxn+Oabb/7a2rVrt0/9Vq5EAAEEEGimAANYzdSO6l7+Z5FFtRy94i6QSqUO8jzPf8zgO0Rkdtw94tDfcZyFxWLx83HoSkcEEIinQHd3d+Lggw/+lYgcE08BWiMQaoH7PM+bOzQ09JdQtyA8AggggMBjCqTT6eM9z7uOQXk+SRBAAAEEEEAAAQQeReAOx3E+5zjOZ1auXMnXBvgUQQABBAImwABWwA6EOAggEAwB13WfbWYfFBH/7f/bgpGKFE0S+GK5XJ7fpL3YBgEEEGi6QCaTea+qLm/6xmyIAAIzFvA8731DQ0P8/++MJVkAAQQQaIBAHX9A0XXdVSJyegNSsiQCCCCAAAIIIIBANAQmReTrZvaJcrnsD+/zQgABBBAIgAADWAE4BCIggEBwBHp6el7mOE5WRF4ZnFQkabLAPZOTk/uNjo7Wmrwv2yGAAAINFzjnnHP29jzvVhHZu+GbsQECCNRVwMzWdXV1HZPL5ap1XZjFEEAAAQQCJ/C2t73t6du3b18vIl1TCVfH2a+pbMc1CCCAAAIIIIAAAsESWCsiw21tbSMrV64cD1Y00iCAAALxEmAAK17nTVsEEHgMgZ6enhMdx/moiLwUJAQSicQLRkZGfoEEAgggEDWBbDbrP2J1QdR60QeBOAio6ksHBwfXxKErHRFAAAEERFKp1BIzG8ACAQQQQAABBBBAAIEpCviPJLzScZzlIyMj/zfFe7gMAQQQQKCOAgxg1RGTpRBAIHwC/uCViHzMcZyTw5eexI0SMLMPVSqVjzVqfdZFAAEEWiGQyWSep6rXi4jTiv3ZEwEEZiRQyefzyRmtwM0IIIAAAqESWLBgwe6Tk5O3icj+oQpOWAQQQAABBBBAAIFWCzz4eELHcS4eGRn5WavDsD8CCCAQJwEGsOJ02nRFAIF/CKTT6VNqtdoFIvICWBD4dwFVvbZUKr0YGQQQQCAqArlczhkbG/O/4HJcVDrRA4EYCTwwOTl5+MUXX8xPr8bo0KmKAAII+AKu675TRD6DBgIIIIAAAggggAAC0xS4VkQuOfTQQ7+ay+W8aa7BbQgggAACUxRgAGuKUFyGAALRENgxeHUh34COxnk2sEV1cnJyn9HR0b81cA+WRgABBJomMDAw8C4zu6xpG7IRAgjUUyCbz+cL9VyQtRBAAAEEwiHQ3d2d6OzsvFFEjg5HYlIigAACCCCAAAIIBFTgdhH5ZFdX1+eGh4e3BTQjsRBAAIHQCzCAFfojpAACCExFYMfg1UUi8vypXM81CCQSiTeNjIx8FQkEEEAg7AKLFy9+UkdHx60isk/Yu5AfgRgKbNi2bdvRy5cvn4hhdyojgAACCIhIT0/PyxKJxPfBQAABBBBAAAEEEECgDgKbHce5dPv27Z9atWrVljqsxxIIIIAAAg8TYACLTwcEEIi0QE9Pz2mJROIjZvacSBelXCMEPlMul9/diIVZEwEEEGimQCaT+ayqLmrmnuyFAAJ1E3htPp9fXbfVWAgBBBBAIJQCrut+Q0ReG8rwhEYAAQQQQAABBBAIosCEqn5RVS8YGRm5LYgByYQAAgiEUYABrDCeGpkRQGCnAq7rniAiF5nZSTu9mAsQeHSBP5TL5YPAQQABBMIs0N/f/1zHcX4hIokw9yA7AnEUMLOvFAqFN8exO50RQAABBP5VoK+v7/BqtfpbEWnHBgEEEEAAAQQQQACBOgp4qvpNz/MuLJfLP6/juiyFAAIIxFKAAaxYHjulEYiuQDKZPFpV/8vMuqPbkmbNEpicnDxsdHR0Y7P2Yx8EEECgngK5XM4ZGxu7TkReWM91WQsBBJoiMNbe3n7kBRdc8D9N2Y1NEEAAAQQCL+C67qdF5MzAByUgAggggAACCCCAQFgFrlPVfLFYvEZELKwlyI0AAgi0UoABrFbqszcCCNRNYMdPg37UzN4iIvzZVjfZ2C/03nK57H+RmxcCCCAQOoFMJvN2Vb08dMEJjAAC4nneh4eGhj4KBQIIIIAAAg8JdHd379vZ2ek/HmZPVBBAAAEEEEAAAQQQaKDA70Rk6cTERHl0dLTWwH1YGgEEEIicAEMKkTtSCiEQL4HTTz/96Y7jnK+qC0SkrZHt/XF//tBspHDw1vY87+pVq1a9PnjJSIQAAgg8vsDAwMBenuetV9X9sEIAgXAJmNntXV1dR+ZyufFwJSctAggggECjBVzX7ReRQqP3YX0EEEAAAQQQQAABBETkZhHJb9q0qbJmzZoqIggggAACOxdglmDnRlyBAAIBFOjp6dlHVc9W1f8UkVkBjEikaAjcv379+r3Xrl27PRp1aIEAAnER6O/v/5TjOO+JS196IhAlATN7faFQuDpKneiCAAIIIFAfge7u7o7Ozs51InJofVZkFQQQQAABBBBAAAEEdirwPyLyibvvvvszq1evntjp1VyAAAIIxFiAAawYHz7VEQijQHd39xM6Ojr8n/j8oIjsFsYOZA6XgOd5J69atepH4UpNWgQQiLPA2WeffVQikbix0e8MGWdjuiPQQIHv5PP5VzVwfZZGAAEEEAi5QDqdfovneaMhr0F8BBBAAAEEEEAAgfAJ/ElEPr7vvvsOX3zxxWPhi09iBBBAoPECDGA13pgdEECgDgK5XM657bbbXFUdFJGn1GFJlkBgSgKqelGpVDpvShdzEQIIINB6AR0YGPihmZ3U+igkQACBXRSYNLNnFQqFW3fxPi5HAAEEEIiZgOu6PxaRF8esNnURQAABBBBAAAEEAiCgqneZ2ce7urqWDw8PbwtAJCIggAACgRFgACswR0EQBBB4LIF0On2K53nL/G9IoYRAswXM7FeVSuX5zd6X/RBAAIHpCPT396cdx7lyOvdyDwIItFzgonw+z9B3y48hRgH8rwhZjPpSFYEICfT19T2/Wq1eLyJ8bTdC50oVBBBAAAEEEEAgTAL+IJaILBORTxeLxa1hyk5WBBBAoFEC/Ed6o2RZFwEEZizQ09NzZCKRKJjZa2e8GAsgMH0Bz3GcpxSLRf8/JnghgAACgRXIZDK7i8itqso7RQb2lAiGwGMKbJo9e/a8XC73AEYIIIAAAghMRcB13aKIuFO5lmsQQAABBBBAAAEEEGigwBYRWbrvvvt+kkcTNlCZpRFAIBQCDGCF4pgIiUC8BNLp9AHVavVDqvp2EUnEqz1tgyigqr2lUmlVELORCQEEEHhIIJvNXiwi70cEAQRCKTA/n89/MZTJCY0AAggg0BIB/2snnuf5j63drSUB2BQBBBBAAAEEEEAAgYcJPPRowra2tk+sXLlyHBwEEEAgjgIMYMXx1OmMQEAFUqnUbmbWb2YZEZkd0JjEiqfAynK5/LZ4Vqc1AgiEQSCbzR4pIjeKSHsY8pIRAQT+KWBmPykUCifxMDg+KxBAAAEEdlXAdd2Pish/7ep9XI8AAggggAACCCCAQAMF/iQiF27atGnFmjVrqg3ch6URQACBwAkwgBW4IyEQAvETyOVyzsaNGxea2cdEZL/4CdA46AJmdkelUnka3xgN+kmRD4H4CmSz2R+IyEvjK0BzBEIr4H8h8rn5fP53oW1AcAQQQACBlgmceeaZT7jvvvtuExEeQd2yU2BjBBBAAAEEEEAAgUcTMLM/qOqSiYmJz4+OjtZQQgABBOIgwABWHE6ZjggEWGD+/PnPb2trWy4iLwhwTKIhII7jHF0sFm+CAgEEEAiaQH9/f4/jOJWg5SIPAghMSeDj+Xz+g1O6kosQQAABBBB4FIFkMrlAVT8PDgIIIIAAAggggAACARW4RUQGDz300FIul/MCmpFYCCCAQF0EGMCqCyOLIIDArgosWLDgqRMTE4Mi4ooIfxbtKiDXt0Lg7HK5vKwVG7MnAggg8FgCuVzuCWNjY+tF5ACUEEAgdAJ3isjcfD7/t9AlJzACCCCAQGAEdryr+FoROSYwoQiCAAIIIIAAAggggMC/CajqjSJyfrFY/CY4CCCAQFQFGHqI6snSC4GACnR3d3d0dna+e8fjBncPaExiIfBoAt8pl8uvggYBBBCYmYD/12+b2RIPuzuTyRRUtb9uC7IQAgg0TcDzvDOGhoZGmrYhGyGAAAIIRFbAdd2TReSHkS1IMQQQQAABBBBAAIHICJjZzxKJRGZkZOTayJSiCAIIILBDgAEsPhUQQKBpAj09Pac5jnOJiBzctE3ZCIH6CYzvtttuew8PD2+r35KshAACCExfoL+//zDHcX4nIp3TX4U7EUCgFQJm9tNCoXBiXScyW1GEPRFAAAEEAiPguu7XReQ/AhOIIAgggAACCCCAAAIIPI6Aql5jZotLpdJGoBBAAIGoCDCAFZWTpAcCARZIp9NzPM+72MxeG+CYRENgpwKO47y6WCx+e6cXcgECCCDQBIFMJrNaVV/dhK3YAgEE6ivgqeoLBwcHf1nfZVkNAQQQQCDOAvPnzz+kvb39ZhHpiLMD3RFAAAEEEEAAAQRCJbBdRK5oa2v78MqVK/8SquSERQABBB5FgAEsPi0QQKBhAslkcg9VzZnZe0WkvWEbsTACTRIws49XKpUPNmk7tkEAAQQeUyCTybxFVUchQgCBUApcls/nzwxlckIjgAACCARaoLe39xLHcf4z0CEJhwACCCCAAAIIIIDAIwW2isinOjo6LlyxYsX9ACGAAAJhFWAAK6wnR24EAi6w43GDnxaRpwc8KvEQ2BWBm8rl8tG7cgPXIoAAAvUWyOVyXWNjY+tE5MB6r816CCDQcIF7qtXq3GXLlm1p+E5sgAACCCAQO4He3t69HMfZICJ7x648hRFAAAEEEEAAAQSiILBZRC7ctGnTp9esWVONQiE6IIBAvAQYwIrXedMWgYYL+G9539bWtlxEXtPwzdgAgRYI1Gq1Z1x11VX/24Kt2RIBBBB4UCCbzV4oIufCgQACoRR4Vz6f/2wokxMaAQQQQCAUAslk8v2qenEowhISAQQQQAABBBBAAIFHF7hFRAZKpdLVACGAAAJhEmAAK0ynRVYEAixw7LHHts+bN+8DZpYTkVkBjko0BGYkoKoLSqXSFTNahJsRQACBaQoMDAwcama/49+10wTkNgRaK3DD7bffftzo6GittTHYHQEEEEAgygI7vj5zk4jMiXJPuiGAAAIIIIAAAghEX0BVf2hmi0ul0m+i35aGCCAQBQEGsKJwinRAoMUCPT09JzmOc5mIzGtxFLZHoOECZnZVpVLpafhGbIAAAgg8ikAmk/mGqr4WHAQQCJ2A1Wq1Fy1duvRnoUtOYAQQQACB0Am4rvsGEflq6IITGAEEEEAAAQQQQACBRwp4qlru7Ozsv/zyy+8ECAEEEAiyAANYQT4dsiEQcIG+vr79t2/fXhARV0T48yTg50W8+giY2d1z5szZL5fLefVZkVUQQACBqQlkMpk3qCrfSJsaF1chECgBM7uiUCgsCFQowiCAAAIIRFogmUx+V1VPiXRJyiGAAAIIIIAAAgjESeABx3GWbd68ecnq1asn4lScrgggEB4BBibCc1YkRSAwArlczrntttv8oauPq+regQlGEASaJFCtVo/7whe+8Msmbcc2CCCAgCxevHh2e3v7OlU9CA4EEAidwH2JROLwiy666M+hS05gBBBAAIHQCriu+2wRuUFEnNCWIDgCCCCAAAIIIIAAAo8U2KCq5xWLxVFwEEAAgaAJMIAVtBMhDwIBF0gmk0eLyOUiclzAoxIPgUYKnF8uly9s5AasjQACCDxcIJvNfkREPoQKAgiEUuD9+Xz+E6FMTmgEEEAAgVAL9Pb2rnAc522hLkF4BBBAAAEEEEAAAQQeRUBVf6Cqi0dGRn4LEAIIIBAUAQawgnISntcfZAAAIABJREFU5EAg4ALHHnts+7x58z4gIh8xs86AxyUeAo0W+HG5XD6p0ZuwPgIIIOALZLPZZ4jILSLShQgCCIRLwMzW/fWvf33O8PDw9nAlJy0CCCCAQBQEFi5c+OTx8fENIrJ7FPrQAQEEEEAAAQQQQACBfxPwVLUsImcXi8W70EEAAQRaLcAAVqtPgP0RCIFAOp0+vlar+e96dUQI4hIRgWYIVCcnJ/cZHR39WzM2Yw8EEIi3QH9//9WO45wWbwXaIxBOATN7WaFQ+GE405MaAQQQQCAKAslk8kOq6r+bKi8EEEAAAQQQQAABBKIqcK+ZnT85OfnZ0dHRWlRL0gsBBIIvwABW8M+IhAi0TGDRokVdDzzwgP+FurNFJNGyIGyMQAAFzOwNlUrl6wGMRiQEEIiQwMDAwCvN7NsRqkQVBGIjYGarCoVCb2wKUxQBBBBAIJACixcvnr158+b1IuK/qyovBBBAAAEEEEAAAQSiLPBrx3HOHBkZ+VmUS9INAQSCK8AAVnDPhmQItFQglUq9yvO8z4rIM1sahM0RCK7ApeVy+T3BjUcyBBAIu0Aul+sYGxv7nYjMCXsX8iMQQ4FtIjIvn8//KYbdqYwAAgggEDAB13XTInJlwGIRBwEEEEAAAQQQQACBRgiYqpbGx8c/ODo6urkRG7AmAggg8FgCDGDxuYEAAv8i0NfXt+fk5GReVd8hIvwZwecHAo8hoKobS6XSYQAhgAACjRLIZrPni8jHGrU+6yKAQOMEVHVgcHAw37gdWBkBBBBAAIFdEtBkMnm9qj5/l+7iYgQQQAABBBBAAAEEwitwr4h8ZGJi4lM8ljC8h0hyBMImwHBF2E6MvAg0UCCZTM4XkU+KyH4N3IalEYiMQLVaPfQLX/jC7yNTiCIIIBAYgfPOO+/p27dvv0VVdwtMKIIggMBUBTZu27btqOXLl09M9QauQwABBBBAoNEC6XT6eM/zruOH7RotzfoIIIAAAggggAACARO4QVXPLBaL1wcsF3EQQCCCAgxgRfBQqYTArgp0d3fv297efpmqvnlX7+V6BOIsYGZnViqVy+JsQHcEEGiMQCaT+bKqvqkxq7MqAgg0WOC1+Xx+dYP3YHkEEEAAAQR2WSCVSn3JzPjazy7LcQMCCCCAAAIIIIBAyAU8VS1Xq9UPrFq1akvIuxAfAQQCLMAAVoAPh2gINEPAdd1TzexzIvKUZuzHHghEScDMvlapVN4YpU50QQCB1gucffbZpyQSie+2PgkJEEBgGgJfzefzDE9OA45bEEAAAQQaLzB//vxD2tvbbxaRjsbvxg4IIIAAAggggAACCAROYLPneZlKpXKliFjg0hEIAQRCL8AAVuiPkAIITE+gr69vz8nJybyqLpreCtyFAAIicv/69ev3Xvv/7N0LmFtVuf/x992ZCzOVu4DcFYpcBBWrqKBYEZWLB+UvI22yE0utVdGi1U4yxQsRK51kiuDB06NV23GSnYJRjwhaFJCiiIAgokApRVBEQC6tgu10Ltnr/8TDUVRKJzO57LX3d57Hh3Nk73f9fp8VpDOzsnPbbWNoIIAAAvUQyGazHZs3b77DcZzD6jGPGQgg0FSB4fb29pctWbLkgaauymIIIIAAAgjUIOC67oCILKrhFi5FAAEEEEAAAQQQQCBsAmsdx/nA0NDQvWErRh8EEGitAAewWuvP6gi0RMB13ZOeeerVfi0JwKIIhEhAVY8vFos/DVElqiCAQAsF+vr6MsaY/hZGYGkEEJikgDEmm8/nPzvJ27kNAQQQQACBpggkEomdVLX6i6a9mrIgiyCAAAIIIIAAAgggEEyB6hvrv/Dkk0+et2bNmpFgRiQVAgjYJsABLNt2jLwITEGg+kM2Y8yAqr5fRPjnfwqW3IrAswSWeJ73aUQQQACBqQqk0+n9VHWdiLxgqrO4HwEEmi7wYFdX1+HZbHZL01dmQQQQQAABBGoUcF33QyKyvMbbuBwBBBBAAAEEEEAAgTAK3Ok4zvyhoaGfh7EcnRBAoLkCHMBorjerIdAygVQqdWKlUvm6iBzQshAsjEA4BW7xPO+14axGKwQQaKZAOp2+VFXPbOaarIUAAnUTeFcul7u8btMYhAACCCCAQAMFenp6Yp2dnbeLyFENXIbRCCCAAAIIIIAAAgjYImBE5KvGmF7P856yJTQ5EUAgeAIcwArenpAIgboKJJPJadWnXhljPshTr+pKyzAE/k/Aj8View4NDT0JCQIIIDBZgd7e3jc6jnM9/66erCD3IdBSgatzudzbWpqAxRFAAAEEEKhRIJFIvEVVr6nxNi5HAAEEEEAAAQQQQCDMAo+o6kcLhUI5zCXphgACjRPgAFbjbJmMQMsFksnkqyuViqeqL215GAIgEG6BWZ7nXRbuirRDAIFGCWSz2bbh4eFf8gSCRgkzF4GGCowaY16ez+fXN3QVhiOAAAIIINAAAdd1fyAiJzdgNCMRQAABBBBAAAEEELBWQFWvbGtrO3vVqlV/sLYEwRFAoCUCHMBqCTuLItBwAXVd9xxjTF5EOhq+GgsgEHEBx3FWFgqF90WcgfoIIDBJgb6+vk8YY5ZN8nZuQwCBFgr4vt8/MDCwuIURWBoBBBBAAIFJCySTycONMb8WkbZJD+FGBBBAAAEEEEAAAQTCKfCUqmYKhcJXRKT6EYV8IYAAAtsV4ADWdom4AAG7BFKp1AG+7w8ZY95kV3LSImC1wB89z9ufP4RbvYeER6AlAueee+5elUql+uScnVsSgEURQGAqAn/s6uo6LJvN/nUqQ7gXAQQQQACBVgokk8kvGWM+3MoMrI0AAggggAACCCCAQIAFbvB9f26pVNoQ4IxEQwCBgAhwACsgG0EMBOohkEgkzhCR6kns3eoxjxkIIDBxAd/3j1y9evVdE7+DKxFAAAGRTCZTEBEXCwQQsFJgdi6Xu9TK5IRGAIHmCVR/8sZ7pZvnzUo1C/T09OzW2dl5r4jsXvPN3IAAAggggAACCCCAQDQEtojI+dOnTx/IZrN+NCrTEgEEJiPAAazJqHEPAgETSCQSOxljBlR1fsCiEQeByAgYYz5eKpUuikxhiiKAwJQFent7j3Mc56ciwp/Jp6zJAASaLnBDLpc7nmMVTXdnQQQQQACBBgjE4/GFjuN8oQGjGYkAAggggAACCCCAQJgEfub7/lk8DStMW0oXBOorwC976uvJNASaLpBMJl9rjCkaY6Y3fXEWRACBZwtc5XneyZAggAACExHo6emJHXTQQbeJyCsmcj3XIIBAoATGK5XKjGXLlv06UKkIgwACCCCAwCQFZsyY0X744YffKSIvneQIbkMAAQQQQAABBBBAICoCwyLyWZ6GFZXtpicCtQlwAKs2L65GIDACM2fObNtvv/0+YYz5nIi0ByYYQRCIrsDwnnvuuftFF11U/cM3XwgggMDzCqTT6XNU9YswIYCAlQIX53K5hVYmJzQCCCCAAALbEIjH4+90HOe7ACGAAAIIIIAAAggggMCEBH7mOM7coaGh6sd584UAAgj8TYADWLwQELBQIJVKHTA+Pn6pqr7ewvhERiC0Aqr6tmKxeHVoC1IMAQTqIrBo0aI9Y7HYehHZpS4DGYIAAk0TMMY8Njo6eujFF1/856YtykIIIIAAAgg0ScB13R+JyFubtBzLIIAAAggggAACCCBguwBPw7J9B8mPQJ0FOIBVZ1DGIdBoAdd1TzPGrBKR3Rq9FvMRQKA2AWPMslKp1FvbXVyNAAJRE8hkMtV/j8+JWm/6IhAGAd/3zxoYGBgMQxc6IIAAAggg8K8C8Xj8lY7j3CoiMXQQQAABBBBAAAEEEEBgwgLXq+pZhULhgQnfwYUIIBBKAQ5ghXJbKRVGgepHDu6zzz5LVDXN0+vCuMN0CoOAqv66WCy+Igxd6IAAAo0R6Ovre40x5iYRcRqzAlMRQKBRAr7v/2LatGmvy2azfqPWYC4CCCCAAAKtFnBd92si8r5W52B9BBBAAAEEEEAAAQQsE3haRBYVi8UVluUmLgII1FGAA1h1xGQUAo0SiMfjB4rIaj5ysFHCzEWgbgKms7Nzv5UrVz5ct4kMQgCB0Ahks1lneHj45yJyTGhKUQSB6Aj4xpjX5/P5W6JTmaYIIIAAAlEUSCaTexpjNojITlHsT2cEEEAAAQQQQAABBKYosKatrW3u4ODgo1Ocw+0IIGChAAewLNw0IkdLIJVKnV6pVL4uIrtGqzltEbBWYI7ned+wNj3BEUCgYQKZTOZDIrK8YQswGAEEGiZgjPlyPp+v/jPMFwIIIIAAAqEXcF33XBH5fOiLUhABBBBAAAEEEEAAgQYIqOpjxpj3F4vF7zVgPCMRQCDAAhzACvDmEC3aAnPmzNlhbGwsJyLnRFuC9ghYJ1DyPC9hXWoCI4BAQwU+8YlPvLCtrW29iOzW0IUYjgACjRB40nGcQ5cuXfpkI4YzEwEEEEAAgaAJPPMzqXWq+uKgZSMPAggggAACCCCAAAK2CKhqYccddzx7+fLlf7UlMzkRQGBqAhzAmpofdyPQEIFUKvXSSqVymYi8siELMBQBBBop8MQhhxyyVzab9Ru5CLMRQMAugUwms0JE3m9XatIigMAzAh/M5XJfqV2j+u22qf027kAAAQQQQCAAAqlU6kzf9y8NQBQiIIAAAggggAACCCBgs8ADjuOkhoaGbrC5BNkRQGBiAhzAmpgTVyHQNIFEIhFX1a8YY17QtEVZCAEE6ipgjHl1qVS6ra5DGYYAAtYK9PX1zTDG3CIijrUlCI5AdAV+ef/99x9TLpcr0SWgOQIIIIBAVAVc1/2piLwhqv3pjQACCCCAAAIIIIBAnQTGReTCkZGRz5TL5dE6zWQMAggEUIADWAHcFCJFU2DmzJlt++yzzxJVzURTgNYIhErgXM/zloaqEWUQQGBSAtls1hkeHr5RRF47qQHchAACrRQwlUrluGXLlv28lSFYGwEEEEAAgVYJpFKpY3zfv0lE+BlyqzaBdRFAAAEEEEAAAQRCI6Cqt6hqcmho6N7QlKIIAgj8kwDfPPOCQCAAAqlUat9KpfJNETk2AHGIgAACUxTwfX/t6tWr3zzFMdyOAAIhEOjr65tnjPlqCKpQAYEoCqzM5XLvi2JxOiOAAAIIIPB/Aq7rFkUkgQgCCCCAAAIIIIAAAgjURWBYRBYXi8Uv1mUaQxBAIFACHMAK1HYQJooC8Xj8eFW9TEReFMX+dEYgpAJjIvJCz/OeCmk/aiGAwAQE+vr6djXGrBeRPSZwOZcggECwBJ6KxWKHXXDBBY8EKxZpEEAAAQQQaK5A9U2Dvu9X/0w7rbkrsxoCCCCAAAIIIIAAAqEW+FZbW9v7BwcH/xzqlpRDIGICHMCK2IZTN1AC6rruOcaYARFpD1QywiCAwJQFfN8/bfXq1VdMeRADEEDAWoG+vr7/MsacbW0BgiMQYQFjzIJ8Pv+lCBNQHQEEEEAAgb8LuK57voh8GhIEEEAAAQQQQAABBBCon4Ax5nexWCw+NDT08/pNZRICCLRSgANYrdRn7cgKzJ07d8fR0dGVxpgzIotAcQRCLqCqXyoWiwtCXpN6CCCwDYG+vr6jjTG/EJEYSAggYJeAMebO7u7uo7PZ7LhdyUmLAAIIIIBAYwTmz5/fvXnz5ntUdf/GrMBUBBBAAAEEEEAAAQQiKzDuOM7nDzrooPOz2awfWQWKIxASAQ5ghWQjqWGPwJw5cw4bGxv7togcYU9qkiKAwCQENnie99JJ3MctCCBgv4BmMpm1InK8/VVogEDkBIzv+28eGBi4PnLNKYwAAggggMDzCCQSifeq6iBICCCAAAIIIIAAAgggUH8BY8w1qpoqFouP1H86ExFAoFkCHMBqljTrICAiruvONsZ8VUSmAYIAAuEXMMYcXCqV7g9/UxoigMCzBdLpNL+c4iWBgKUCxphCPp9PWRqf2AgggAACCDRMIJvNOhs2bLhJVV/TsEUYjAACCCCAAAIIIIBAhAVU9THf9+d4nrcmwgxUR8BqAQ5gWb19hLdFoKenJ9be3p5X1Y/bkpmcCCBQF4EPeZ735bpMYggCCFghsGDBgp26urqqH8+ytxWBCYkAAs8WeNoYc1g+n38YFgQQQAABBBD4dwHXdY8VkRtEhJ8p8wJBAAEEEEAAAQQQQKAxAkZVL9m6dWtvuVwebcwSTEUAgUYJ8M1yo2SZi8AzAj09Pbu1t7dfqqpvBQUBBCIn8B3P894dudYURiDCAplM5mIR+WiECaiOgM0Cn8jlcl+wuQDZEUAAAQQQaLRAMpn8ljGG73MbDc18BBBAAAEEEEAAgUgLGGN+3tHRceaqVav+EGkIyiNgmQAHsCzbMOLaJZBKpV5aqVQuF5HD7EpOWgQQqJPAU/fcc88Lb7vttrE6zWMMAggEWCCTybxMRG4XkfYAxyQaAgg8t8DdmzZteuWKFSv4dzavEAQQQAABBJ5HIJlMvsQYs05EOoFCAAEEEEAAAQQQQACBhgo8aYxJ8pGEDTVmOAJ1FeAAVl05GYbAPwTi8fgpqloSkZ1xQQCBSAu8wfO8n0VagPIIRESgt7f3OsdxZkakLjURCJWAqr6lv7//x6EqRRkEEEAAAQQaJOC6bl5Eehs0nrEIIIAAAggggAACCCDwDwEjIvmRkZFPlsvlCjAIIBBsAQ5gBXt/SGengLqumzbGXCAijp0VSI0AAnUUON/zvPPqOI9RCCAQQIF0Op1Q1WIAoxEJAQS2L3BpLpebvf3LuAIBBBBAAAEEqgJz587dcXR09F4ReREiCCCAAAIIIIAAAggg0BSBtW1tbbMHBwcfbcpqLIIAApMS4ADWpNi4CYHnFkgmk9OMMYPGmDMwQgABBJ4RuMnzvNejgQAC4RVIp9M7qmr1Y1j2DW9LmiEQWoEt4+PjR1x44YW/D21DiiGAAAIIINAAAdd1PyAiX27AaEYigAACCCCAAAIIIIDAcwio6mO+78c9z7sWIAQQCKYAB7CCuS+kslBg1qxZ+8disf8RkRkWxicyAgg0TqAyOjq6Z7lc3ti4JZiMAAKtFEin08tU9ROtzMDaCCAwOQFV7evv789N7m7uQgABBBBAILoCPT09sc7OzttF5KjoKtAcAQQQQAABBBBAAIGmC4w7jvP5gw466PxsNus3fXUWRACB5xXgABYvEATqIOC67huNMd8SkT3rMI4RCCAQMgHHcd5TKBTKIatFHQQQEJF0On24qt4hIu2AIICAdQIbtmzZctQll1wyYl1yAiOAAAIIIBAAgdmzZ58Qi8V4930A9oIICCCAAAIIIIAAApETuML3/feWSqVNkWtOYQQCLMABrABvDtHsEEgmk+/zff+/+cWrHftFSgRaIWCM+VqpVHp/K9ZmTQQQaKxAJpO5SkTe3thVmI4AAg0SOCWXy61p0GzGIoAAAgggEAkB13WvFJFTW162+lNu0/IUBEAAAQQQQAABBBBAoJkCD4jIGcVi8ZfNXJS1EEBg2wIcwOLVgcDkBdR13fOMMedNfgR3IoBARAQe8jxv/4h0pSYCkRHIZDLvEZHLIlOYogiESMAY8518Pv/uEFWiCgIIIIAAAi0RcF33UBH5DW9MbAk/iyKAAAIIIIAAAgggMGKMOdvzvJVQIIBA6wU4gNX6PSCBhQLJZHJapVIpquq7LIxPZAQQaIGA4zhHFAqFdS1YmiURQKABAtlstnvr1q13G2MObMB4RiKAQGMFhlX1iP7+/t81dhmmI4AAAgggEA2BZDL5n8aYBdFoS0sEEEAAAQQQQAABBAIpsGLdunUfue2228YCmY5QCEREgANYEdloatZPwHXdvX3f/56qvrp+U5mEAAJhF1DVjxWLxS+GvSf9EIiKQG9v71LHcfrC1bf6mS18exCuPaXNNgQ+ncvllqCDAAIIIIAAAvURiMfjuzqOs0FEdq/PRKYggAACCCCAAAIIIIDAJARuaGtr6xkcHHx0EvdyCwII1EGA37DUAZER0RGYPXv2yx3HuUJEDohOa5oigEA9BFT1B8Vi8dR6zGIGAgi0VqCvr2+6MeZOEelsbRJWRwCBSQj8tqur68hsNrt1EvdyCwIIIIAAAghsQyCRSHxMVS8CCAEEEEAAAQQQQAABBFoq8EdVfXehULi5pSlYHIGICnAAK6IbT+3aBVzXPckYc5mI7FT73dyBAAIIyJaNGzfutmbNmhEsEEDAboF0Ov19VT3F7hakRyCyAu/I5XLfj2x7iiOAAAIIINAggRkzZrQfccQRvzHGHNqgJRiLAAIIIIAAAggggAACExOo/h7qI8Vi8WsTu5yrEECgXgIcwKqXJHNCLeC67keNMReKSCzURSmHAAINFahUKideeuml1zZ0EYYjgEBDBRYtWnR6LBb7TkMXYTgCCDREwPf9KwYGBk5ryHCGIoAAAggggIAkk8n/MMZ8DwoEEEAAAQQQQAABBBAIhMCKkZGRBeVyeTQQaQiBQAQEOIAVgU2m4uQFenp6Yp2dnRcbYz4y+SnciQACCPxdIO95XgYPBBCwU2DhwoVd7e3td6nqS+xsQGoEIi0w4vv+UQMDAxsirUB5BBBAAAEEGiyQSCR+qKpva/AyjEcAAQQQQAABBBBAAIGJCfxMRHqKxeIjE7ucqxBAYCoCHMCaih73hlqgp6fnBR0dHd8UkZNDXZRyCCDQTIE7PM97ZTMXZC0EEKifQDqdPl9VP12/iUxCAIEmCpyfy+XOa+J6LIUAAggggEAkBVKp1Mt93/8lT5GP5PZTGgEEEEAAAQQQQCCYAn9sa2s7fXBw8BfBjEcqBMIjwAGs8OwlTeooMG/evL2Gh4e/LyIz6jiWUQgggIBR1X15pwEvBATsE+jt7T3YcZw7RWQH+9IHNLEREb4bCejmhC7Wg5VK5Yhly5ZtDl0zCiGAAAIIIBBAgWQyucIY8/4ARiMSAggggAACCCCAAAJRFRgxxszzPK8YVQB6I9AMAX7l0Qxl1rBK4Mwzzzy4ra1tjYgcYlVwwiKAgBUCxphUqVQqWBGWkAgg8HeBdDp9haq+AxIEELBPwBhzej6f/659yUmMAAIIIICAnQLJZHJPY8y9IrKznQ1IjQACCCCAAAIIIIBAKAWqb4nNT58+/dxsNuuHsiGlEGixAAewWrwBLB8sgVQqdYzv+1caY/YIVjLSIIBAiASKnuclQ9SHKgiEXiCTybxdRK4KfVEKIhBOgatzudzbwlmNVggggAACCARXIJFI9Knq0uAmJBkCCCCAAAIIIIAAApEV+FZ3d/d7V6xYsSWyAhRHoEECHMBqECxj7RNwXfc0Y8xqEem2Lz2JEUDAFgFVfXz69Okv4t0FtuwYOVshUP0DavWtOEH4WrBgQWd3d/evReSlQchDBgQQqElg1Bjz8nw+v76mu7gYAQQQQAABBKYs0NPT09HZ2XmXiEyf8jAGIIAAAggggAACCCCAQL0F7nAc57ShoaEH6z2YeQhEWYADWFHefbr/XSCRSMwVka+ISBssCCCAQKMFKpXKqy699NLbG70O8xFAYOoCvb29n3Ec57NTn8QEBBBotkD1qRv9/f3nNntd1kMAAQQQQACB/xVIJpM9xphv4oEAAggggAACCCCAAAKBFHjEcZx3DQ0N3RLIdIRCwEIBDmBZuGlErquAuq57njHmvLpOZRgCCCDwPAKq2lcsFnMgIYBAsAUymcwBxpi7VXVasJOSDgEEnkPgoa6ursOz2exf0UEAAQQQQACB1gm4rvsTEXlj6xKwMgIIIIAAAggggAACCDyPwIgxZp7neUWUEEBg6gIcwJq6IRMsFZg5c2bb/vvvv9z3/fdbWoHYCCBgr8B1nuedYG98kiMQDYFMJvMdETk9Gm1piUC4BHzff8/AwEA5XK1ogwACCCCAgH0Cs2bNOrqtre1WEXHsS09iBBBAAAEEEEAAAQQiIWBEJD99+vRzs9msH4nGlESgQQIcwGoQLGODLZBMJqf5vv8tETkp2ElJhwACIRUYHR0d3b1cLvNUjpBuMLXsF0in029V1R/Z34QGCERS4NpcLndiJJtTGgEEEEAAgQAKJJPJIWNMMoDRiIQAAggggAACCCCAAAL/ECi3tbWlBgcHt4KCAAKTE+AA1uTcuMtigTlz5uwyNjZ2pYgcZ3ENoiOAgOUCqvqOYrH4fctrEB+BUApks9mO4eHhX4vIoaEsSCkEwi0wLiKvyuVyvwl3TdohgAACCCBgj0AqldrX9/31IsJHe9uzbSRFAAEEEEAAAQQQiKbAzap6WqFQeCya9WmNwNQEOIA1NT/utkxg3rx5ew0PD18lIq+0LDpxEUAgfAL/6XneR8NXi0YI2C+QTqcXq+oF9jehAQLRE/B9f9nAwEBv9JrTGAEEEEAAgWALpFKprO/75wU7JekQQAABBBBAAAEEEEBARO4XkVOKxWL1TRR8IYBADQIcwKoBi0vtFpg1a9aLY7FY9aOEDrG7CekRQCAkAus9zzssJF2ogUBoBNLp9H6quk5EXhCaUhRBIDoCj4rIYblc7i/RqUxTBBBAAAEE7BBYuHBh1+OPP36PiBxgR2JSIoAAAggggAACCCAQXQFV3VipVE4vlUo/ia4CzRGoXYADWLWbcYeFAslk8nDf96uHr/azMD6REUAgpAKO4xxUKBQeCGk9aiFgpUAmk/mmiPRYGZ7QCCCQyOVyJRgQQAABBBBAIJgC8Xg86TjOUDDTkQoBBBBAAAEEEEAAAQT+RWDEGDPX8zx+3sZLA4EJCnAAa4JQXGavQDKZfLXv+2tE5IX2tiA5AgiEVGC+53lfDWk3aiFgnUBfX98JxphrrQtOYAQQqArckMvljhcRAwcCCCCAAAIIBFZAk8nkTcaYYwKbkGAIIIAAAggggAACCCDwbAHjOM75Q0NDWVgQQGD7AhzA2r4RV1gsEI/H36yql4vIjhbXIDoCCIRUQFW/VSwWedJOSPeXWnYJZLPZtuFamQM6AAAgAElEQVTh4V+KyFF2JSctAgiISEVEZuRyuTvQQAABBBBAAIFgC6RSqdf7vv8zEeHn0sHeKtIhgAACCCCAAAIIIPBsga+vW7fuQ7fddtsYLAggsG0BvtHl1RFaAdd1TzPGXCYiO4S2JMUQQMB2gT//8Y9/3GPt2rXjthf524/OeeaI9dsY5QKZTGaRiAxE2YDuCFgs8MVcLvcxi/MTHQEEEEAAgUgJuK7Lx35HascpiwACCCCAAAIIIBASgauNMWd4nvdUSPpQA4G6C3AAq+6kDAyCQCKRmCsiK0QkFoQ8ZEAAAQS2JaCqxxWLxRsRQgCB1gn09va+yHGce0Rk59alYGUEEJiMgDHmsdHR0UMvvvjiP//b/RwOngwp9yCAAAIIINBwgWQy+RJjzN28abLh1CyAAAIIIIAAAggggEBdBVT19lgsdsrg4OCjdR3MMARCIsABrJBsJDX+IZBIJD4oIv8lIg4uCCCAQNAFVPWzxWKRz84O+kaRL9QCmUzGE5F4qEtSDoGQChhj5uTz+W+EtB61EEAAAQQQCK2A67r9IpIJbUGKIYAAAggggAACCCAQXoEHHMc5aWho6N7wVqQZApMT4ADW5Ny4K6ACrusuMsbw8UEB3R9iIYDAvwsYY35eKpWOxQYBBFojkMlk3iAiPxH52wdp8oUAAhYJVP8dms/nj+NDcC3aNKIigAACCCDwjMDcuXN3HB0dXS8ie4OCAAIIIIAAAggggAAC1gn8yff9U0ul0m3WJScwAg0U4BdNDcRldHMFXNfNGGOq757jCwEEELBJoDI6OrpnuVzeaFNosiIQBoGenp7YQQcdVP0G8RVh6EMHBCIm4Kvq6/r7+38Rsd7URQABBBBAIDQCyWTy/caYFaEpRBEEEEAAAQQQQAABBKIl8FdVPaNQKPwwWrVpi8C2BTiAxasjFAKu62aNMeeFogwlEEAgcgLVP6AWi8VvR644hRFosUAmk/moiFzc4hgsjwACkxBQ1eX9/f0fnsSt3IIAAggggAACARHIZrPOfffdVz1M/aqARCIGAggggAACCCCAAAII1CYwqqrvLRQKl9Z2G1cjEE4BDmCFc1+j1Erj8fgyVf14lErTFQEEwiVQfcdvqVT6QLha0QaBYAssWrRoz1gsVv3Ik12CnZR0CCDwHAIbx8fHD73wwgufQAcBBBBAAAEE7BaIx+Nvdhznx3a3ID0CCCCAAAIIIIAAApEWMMaYXs/zLoy0AuUREBEOYPEysFlAE4lE9akV59hcguwIIICAiPze87wXI4EAAs0TSKfTg9V35jRvRVZCAIF6Cajq+/v7+79Wr3nMQQABBBBAAIHWCriu+z0R+Y/WpmB1BBBAAAEEEEAAAQQQmKJArlgsLhYRM8U53I6AtQIcwLJ266Id/JlHlK8wxrwv2hK0RwCBsAio6mHFYrH6NB6+EECgwQKZTOZYEbmBNyM0GJrxCDRAwPf926ZNm3ZMNpv1GzCekQgggAACCCDQAoEzzzzz4Pb29rtFpKMFy7MkAggggAACCCCAAAII1E/gGw899NC8tWvXjtdvJJMQsEeAA1j27BVJnxHo6emJtbW1fd1xHJ5awasCAQTCJHCO53mXhKkQXRAIokD1EPfmzZtvchznNUHMRyYEEHheAd9xnGOXLl16M04IIIAAAgggEC6BeDx+seM4Hw1XK9oggAACCCCAAAIIIBA9AWPM5e3t7bMGBwe3Rq89jaMuwAGsqL8CLOs/c+bMtn333dcTkfdYFp24CCCAwPYEvu953ju2dxF/HwEEpiaQTqfPVtX/mtoU7kYAgRYJfDWXy81v0dosiwACCCCAAAINFIjH47s6jrNBRHZv4DKMRgABBBBAAAEEEEAAgeYIXN/R0fEfK1eufLo5y7EKAsEQ4ABWMPaBFBMQqD75qqOjY0hE4hO4nEsQQAAB2wQ2b9y4cfc1a9aM2BacvAjYIrB48eLdfd+vftQnv9SxZdPIicA/BDY5jnPo0qVLHwcFAQQQQAABBMIpEI/Hz3Ec54vhbEcrBBBAAAEEEEAAAQQiJ3Cr4zgnDQ0NPRm55hSOrAAHsCK79XYVf+bw1aCIuHYlJy0CCCAwcQFjzAmlUum6id/BlQggUItAOp3+qqrOq+UerkUAgWAIGGM+nM/nlwcjDSkQQAABBBBAoBECzzz5/leq+rJGzGcmAggggAACCCCAAAIINFfAGHNXZ2fn21auXPlwc1dmNQRaI8ABrNa4s2oNAs8cvlolIskabuNSBBBAwEaBfs/zFtsYnMwIBF2gr69vhjHmFhFxgp6VfAgg8G8Ct99///2vKZfLFWwQQAABBBBAINwCruueKiJXhrsl7RBAAAEEEEAAAQQQiI6Aqq5va2t766pVq/4QndY0jaoAB7CiuvOW9M5ms8699967SlVTlkQmJgIIIDBpAVW9vVgsvmrSA7gRAQSeU6D654nh4eEbReS1ECGAgHUCRkRm5nK5n1iXnMAIIIAAAgggMCmBRCJxlaq+fVI3cxMCCCCAAAIIIIAAAggEUeBB3/dPLJVKG4IYjkwI1EuAA1j1kmROIwQ0Ho9/WVXnN2I4MxFAAIEACpj29vZ9BgcHHw1gNiIhYK1AX1/ffGPMV6wtQHAEoi0wmMvlzoo2Ae0RQAABBBCIlkAikThCVe8QkbZoNactAggggAACCCCAAAKhFviT4zhvGxoa+nWoW1Iu0gIcwIr09ge6vCYSieUi8sFApyQcAgggUGcBY4xbKpW8Oo9lHAKRFejr69vVGLNeRPaILALFEbBX4KlYLHbYBRdc8Ii9FUiOAAIIIIAAApMRcF33yyLygcncyz0IIIAAAggggAACCCAQWIFNxphTPM+7KbAJCYbAFAQ4gDUFPG5tmIC6rvtfxpgPNWwFBiOAAAIBFTDGDJVKpfcGNB6xELBOIJPJVA9082cK63aOwAj8TeBjuVzui1gggAACCCCAQPQEenp69ujs7Kx+PMnO0WtPYwQQQAABBBBAAAEEQi3wV2PMuzzPuzbULSkXSQEOYEVy2wNduvrkqy+JyNmBTkk4BBBAoHECj3qet4+ImMYtwWQEoiHQ19d3tDHmFyISi0ZjWiIQHgFjzF1//vOfj16xYsVYeFrRBAEEEEAAAQRqEUgmk2ljTK6We7gWAQQQQAABBBBAAAEErBDYIiLvKhaLV1uRlpAITFCAA1gThOKy5gi4rnuJMeYjzVmNVRBAAIFgChhjji6VSr8KZjpSIWCNgKbT6etV9Y3WJCYoAgj8XUBV39zf378WEgQQQAABBBCIrkBPT09HZ2fnnSJySHQVaI4AAggggAACCCCAQGgFRowxZ3ied2VoG1IscgIcwIrclge3cCKRWCoifcFNSDIEEECgaQIZz/PyTVuNhRAIoUA6nT5LVVeGsBqVEIiCQCmXyyWiUJSOCCCAAAIIIPD8Aq7rvltEvoUTAggggAACCCCAAAIIhFJgVER6isXi90LZjlKRE+AAVuS2PJiFE4nEJ0VkSTDTkQoBBBBoroCqXlssFk9s7qqshkB4BBYsWLBTV1fXPaq6d3ha0QSByAg8PTo6evhFF130x8g0pigCCCCAAAIIPK+A67rXi8jxMCGAAAIIIIAAAggggEAoBUZ9339PqVS6PJTtKBUpAQ5gRWq7g1k2kUh8WES+FMx0pEIAAQRaIjDqOM5uhUJhc0tWZ1EELBfIZDL/KSILLK9BfASiKtCby+WWRbU8vRFAAAEEEEDg3wVmzZp1dFtb260i4uCDAAIIIIAAAggggAACoRSo/l5s1tDQ0P+Esh2lIiPAAazIbHUwi8bj8ZSqruIHKMHcH1IhgEBLBU7xPG9NSxOwOAIWCmQymZeJyK9EpM3C+ERGIOoC6zZt2vSKFStWjEUdgv4IIIAAAggg8M8CrusOish7cUEAAQQQQAABBBBAAIHQCoyp6qxCofCd0DakWOgFOIAV+i0ObsFUKnV6pVL5Jr8gDe4ekQwBBFon4Pv+xatXr17YugSsjICVAtrb2/tjx3FmWpme0AggcFIul/shDAgggAACCCCAwL8KzJ07d5/R0dF7RWQaOggggAACCCCAAAIIIBBagUr1jRfFYtELbUOKhVqAA1ih3t7glnNd960icoUxpjO4KUmGAAIItFRgned5R7Q0AYsjYJlAJpNxRaRgWWziIoDA/wqUc7nce8BAAAEEEEAAAQS2JZBIJD6jqp9FCAEEEEAAAQQQQAABBEItUDHGzPE8rxjqlpQLpQAHsEK5rcEu5bruscaYH/GOtWDvE+kQQKD1ArFY7MChoaEHW5+EBAgEXyCdTu+oqveIyD7BT0tCBBD4F4Et4+PjR1x44YW/RwYBBBBAAAEEENiWwPz587s3b958j6rujxICCCCAAAIIIIAAAgiEWqB6CCvleV4p1C0pFzoBDmCFbkuDXSiVSh1TqVSuEZEdg52UdAgggEDrBRzHmVcoFL7e+iQkQCD4AplM5kIR+Xjwk5IQAQT+VcAYc24+n1+KDAIIIIAAAgggsD0B13UTImLvO+GrP40322vJ30cAAQQQQAABBBBAAAERqaiqWygULkUDAVsEOIBly06FIGcymTzS9/3rRWS3ENShAgIIINBwAVUtF4tFPo6p4dIsYLvA4sWLj/B9/1ci0m57F/IjEEGB+7Zs2XLkJZdcMhLB7lRGAAEEEEAAgdoF1HXdn4rIcbXfyh0IIIAAAggggAACCCBgmcCY7/s9pVLpcstyEzeiAhzAiujGN7t2IpHYT0RuFBEeEd5sfNZDAAGbBTaNjo7uUS6XKzaXIDsCjRbo7e291nGcExq9DvMRQKD+Ao7jnLp06dIf1H8yExFAAAEEEEAgrAKJROJ1qlr9OSM/2w7rJtMLAQQQQAABBBBAAIF/CIyq6hmFQuEKUBAIugDfpAZ9h0KQb/bs2S90HKf6zrTDQlCHCgiEWqD6FHz+xRCsLXYc53WFQuHmYKUiDQLBEejr6zvTGMMjiIOzJSRBoBaB7+ZyudNruYFrEUAAAQQQQACBqkAikbhUVc9EAwEEEEAAAQQQQAABBCIhUD2EdXqhUOCNnJHYbntL8nt2e/fOiuTz58/v3rx589UicqwVgQmJAAIIBE/gPM/zzg9eLBIh0HqBbDbbvXXr1ruNMQe2Pg0JEECgRoHh9vb2ly1ZsuSBGu/jcgQQQAABBBBAQM4666z9x8bG7hGRbjgQQAABBBBAAAEEEEAgEgLDvu+fWiqVrotEW0paKcABLCu3zY7QM2bMaD/ssMOqn8d6sh2JSYkAAggEUuBnnue9IZDJCIVAiwXS6XS/qmZaHIPlEUBgEgK+7583MDDAAeNJ2HELAtYLVH8SVX30Ll8IIIDAFAUSicQFqrp4imO4HQEEEEAAAQQQQAABBOwR2OL7/smlUukn9kQmaZQEOIAVpd1ubldNJBIrRWROc5dlNQQQQCB0AuOjo6MvLJfLfwldMwohMAWB3t7eQxzH+Y2IdE5hDLcigEALBIwx93d3d78sm81ubcHyLIkAAggggAACIRE4++yzX/DUU0/dKyJ7h6QSNRBAAAEEEEAAAQQQQGD7Ak+p6tsKhcLN27+UKxBorgAHsJrrHZnVksnkMt/3PxGZwhRFAAEEGigQi8X+39DQ0P80cAlGI2CdQDqd/oGq8pRN63aOwAj8TeC0XC53BRYIIIAAAggggMBUBZLJ5PuMMV+b6hzuRwABBBBAAAEEEEAAAasE/qKqJxYKhVutSk3Y0AtwACv0W9z8golEIi0iueavzIoIIIBAaAW+4nneB0PbjmII1CiQTqf/n6p+u8bbuBwBBIIh8MNcLndSMKKQAgEEEEAAAQRsF+jp6Yl1dnZWf+nyStu7kB8BBBBAAAEEEEAAAQRqEngyFou96Rvf+MZdNd3FxQg0UIADWA3EjeLoeDyeUNWCiPDaiuILgM4IINAogd95nveSRg1nLgI2CSxcuLCro6PjbhF5sU25yYoAAn8TGHUc56ilS5dWPyqILwQQQAABBBBAoC4CruvOFJHr6jKMIQgggAACCCCAAAIIIGCTwMOq+oZCofCATaHJGl4BDsmEd2+b3iwej5+iqt8VkfamL86CCCCAQMgFYrHYoUNDQ/zCOuT7TL3tC2Qymc+JyKe2fyVXIIBAAAWW5HK5TwcwF5EQQAABBBBAwHKBRCLxXVV9p+U1iI8AAggggAACCCCAAAK1C/y2o6Pj+JUrVz5c+63cgUB9BTiAVV/PyE5zXfdVInK9MeYFkUWgOAIIINBAAWPMglKp9KUGLsFoBAIv0Nvbe7DjOHeKyA6BD0tABBD4JwFjzB983z982bJlm6FBAAEEEEAAAQTqLXDmmWce3N7eXv3okc56z2YeAggggAACCCCAAAIIBF7gTsdxZg4NDT0Z+KQEDLUAB7BCvb3NKZdKpfatVCo3ich+zVmRVRBAAIHoCajqFcVi8bToNacxAv8QSKfTV6rqqZgggIB9AsaYd+fz+e/Yl5zECCCAAAIIIGCLgOu6XxCRhbbkJScCCCCAAAIIIIAAAgjUT0BVb2lvbz9x5cqVT9dvKpMQqE2AA1i1eXH1vwgkEomdVPWnxpiXg4MAAggg0FCBzRs3btx9zZo1Iw1dheEIBFQgnU6fpqqXBzQesRBA4PkFrsnlcm8FCQEEEEAAAQQQaKTAnDlzdhkfH98gIi9s5DrMRgABBBBAAAEEEEAAgWAKqOqPY7HYqYODg1uDmZBUYRfgAFbYd7iB/WbMmNF+6KGHfl9V+WVKA50ZjQACCPyfgO/7M1evXn09IghETWDBggWd3d3dvxGRQ6LWnb4IhEBg1HGcVyxduvSeEHShAgIIIIAAAggEXMB13Y+IyCUBj0k8BBBAAAEEEEAAAQQQaJzA9x566KF3r127drxxSzAZgecW4ADW87wyqjiGV862BHT27NmrHMd5L0QIIIAAAs0RUNULisXiJ5uzGqsgEByBdDp9nqpmg5OIJAggMFEBY0wun8/3TfR6rkMAAQQQQAABBKYi0NPTE+vs7PyViBw5lTnciwACCCCAAAIIIIAAAlYLFKdPn/7ebDbrW92C8NYJcADLui0LRmDXdbPGmPOCkYYUCCCAQGQEbvM879WRaUtRBEQkk8kcICLrRKQbEAQQsE7gj11dXYdls9m/WpecwAgggAACCCBgrUAikThZVX9gbQGCI4AAAggggAACCCCAwJQFfN//YqlU+tiUBzEAgRoEOIBVAxaX/q+A67qzjTGeiPD64UWBAAIINFfAdxxn70Kh8Fhzl2U1BFon0Nvb+13Hcd7ZugSsjAACkxVQ1Vn9/f2XTfZ+7kMAAQQQQAABBCYr4LruGhE5abL3cx8CCCCAAAIIIIAAAgiEQuCTxWLxglA0oYQVAhygsWKbghNy9uzZb4rFYj80xnQGJxVJEEAAgUgJJDzPK0WqMWUjK5BOp9+qqj+KLADFEbBYwBjz03w+/yY+1d3iTSQ6AggggAACFgskk8nDjTG/FpE2i2sQHQEEEEAAAQQQQAABBKYmYIwx8zzPWzm1MdyNwMQEOIA1MSeuEpFEInGEiNwgIrsCggACCCDQGgHf97+xevXqOa1ZnVURaJ5ANpvtGB4erv7C5NDmrcpKCCBQJ4HxSqUyY9myZdV/hvlCAAEEEEAAAQRaIuC67nIR+VBLFmdRBBBAAAEEEEAAAQQQCIpAxff9d5dKpcuDEogc4RXgAFZ497auzebNm7fX8PDwzSJyYF0HMwwBBBBAoFaBRzzP25cnitTKxvW2CWQymXNF5PO25SYvAgj8TeALuVzuE1gggAACCCCAAAKtFOjp6dlthx122GCM2a2VOVgbAQQQQAABBBBAAAEEWi6wxXGcE4eGhn7e8iQECLUAB7BCvb31KdfT09PR2dn5I2NM9SNE+EIAAQQQaL3Ayz3P+03rY5AAgcYIpNPp/UTkHlWd1pgVmIoAAg0U+FP1yXW5XO4vDVyD0QgggAACCCCAwIQEXNddJCIDE7qYixBAAAEEEEAAAQQQQCDMAk+IyBuKxeL6MJekW2sFOIDVWn8rVo/H419V1XlWhCUkAgggEAEBVe0tFovLIlCVihEVSKfTZVU9I6L1qY2A7QLJXC5XtL0E+RFAAAEEEEAgHALPvLH0ThE5JByNaIEAAggggAACCCCAAAJTEHigra3t2MHBwUenMINbEdimAAeweHE8r4DruhljTD9MCCCAAALBETDGXF0qld4WnEQkQaB+Aul0+i2qek39JjIJAQSaJWCM+Vk+n38jH5PbLHHWQQABBBBAAIGJCKRSqdN93//ORK7lGgQQQAABBBBAAAEEEAi9wG9GRkbeWC6XeYJ/6Le6+QU5gNV8c2tWTCQSJ4vIFSISsyY0QRFAAIFoCGydNm3a7itWrNgSjbq0jIrA/Pnz23fdddc7ROTwqHSmJwIhEqj4vv/qgYGBX4WoE1UQQAABBBBAICQCiUTialU9MSR1qIEAAggggAACCCCAAAJTEFDV65544omT16xZMzKFMdyKwL8JcACLF8VzCiQSiSNE5EYR2RkiBBBAAIHgCTiOc1KhUPhh8JKRCIHJC6TT6V5VzU9+AncigEALBS7J5XLntHB9lkYAAQQQQAABBLYp4Lruq0TkFyLiwIQAAggggAACCCCAAAIIiEixWCymeJo/r4V6CnAAq56aIZmVSqV2933/ZmPMwSGpRA0EEEAgdAKqelGxWPx46IpRKLICvb29L3IcZ72I7BRZBIojYKmAMeYxx3EO6+/v32RpBWIjgAACCCCAQAQE4vH4SsdxzopAVSoigAACCCCAAAIIIIDABARUdUmhUPj0BC7lEgQmJMABrAkxReeiGTNmtB9++OFXG2PeFJ3WNEUAAQSsFLjL87wjrUxOaASeQyCdTpdUdTY4CCBgn4Dv++8bGBhYaV9yEiOAAAIIIIBAlATmzZu319atW+/lTR9R2nW6IoAAAggggAACCCCwXYEPFovFr2z3Ki5AYAICHMCaAFKULkkmkyt8339/lDrTFQEEELBVoFKpHHDppZf+wdb85Ebg/wQymcwbROQnIsKfTXlZIGCZgDHm1u7u7tdms1nfsujERaAmgeq/oExNd3AxAggggEAQBeLx+Kccx/lcELORCQEEEEAAAQQQQAABBFoiMOY4zilDQ0PXtGR1Fg2VAL/kCtV2Tq2M67qLjDEDU5vC3QgggAACTRR4n+d5PHGkieAsVX+BbDbbtnXr1tuMMS+v/3QmIoBAgwV8Y8zr8/n8LQ1eh/EIIIAAAggggEBdBBYuXNj1+OOPrxORA+sykCEIIIAAAggggAACCCAQBoGnVPW4QqFwZxjK0KF1AhzAap19oFZOpVInViqVq0QkFqhghEEAAQQQeD6ByzzPmwURAjYL9PX1LTTGfMHmDmRHIKoCxpgv5/P5D0W1P70RQAABBBBAwE4B13WrH31esjM9qackwCMtp8THzQhYK8A/+9ZuHcERQACBZgoYY37X1dX1uq997Wt/aua6rBUuAQ5ghWs/J9Vm1qxZL47FYr8QkRdOagA3IYAAAgi0SmDT6OjoHuVyudKqAKyLwFQEzj333L0qlco9IrLLVOZwLwIItERg4/j4+KEXXnjhEy1ZnUURQAABBBBAAIHJC6jruj8VkeMmP4I7EUAAAQQQQAABBBBAIIQCt3Z3d79pxYoVW0LYjUpNEOAAVhOQg7xE9bHbf/rTn25Q1VcFOSfZEEAAAQSeW2B8fPyYyy67rHqIli8ErBPIZDLfEJGUdcEJjAACVYEP5nK5r0CBAAIIIIAAAgjYKJBMJl9rjPm5iPDzcRs3kMwIIIAAAggggAACCDRIQFW/ffDBB78nm836DVqCsSEW4BvMEG/uRKrF4/HVqsrHV00Ei2sQQACBAAoYYz5dKpWWBDAakRB4XoFMJnOsiNzALzx4oSBgpcAv77///mN4AqOVe0doBBBAAAEEEHhGwHXd6scQVj+OkC8EEEAAAQQQQAABBBBA4NkCuWKx2AcJArUKcACrVrEQXe+67iJjzECIKlEFAQQQiJrAoyLyMc/zLotacfraLdDT0xM76KCDbhWRV9rdhPQIRFLAGGOOzefzN0WyPaURQAABBBBAIDQCqVTqAN/3qx+J3hWaUhRBAAEEEEAAAQQQQACBugio6vxCofDVugxjSGQEOIAVma3+56KzZs16SywWu0pE2iJKQG0EEEDAZoGnjTHLVfUCz/OesrkI2aMpkE6nP6Kql0SzPa0RsF5gZS6Xe5/1LSiAAAIIIIAAAgiISDKZXGKM+SQYCCCAAAIIIIAAAggggMC/CIz5vv/2Uql0HTIITFSAA1gTlQrRdfF4/EDHcX5hjNkjRLWogkD4BUydPqirXnPCLx7EhluMMdVDK7lSqbQpiAHJhMD2BBYvXry77/vrRWT37V3L30cAgcAJPOX7/qEDAwPVJzDyhQACCCCAAAIIWC9w9tlnv+Cpp566V0T2tr4MBRBAAAEEEEAAAQQQQKCuAqq60Rjz2mKxeF9dBzMstAIcwArt1j53sTlz5uwwNjZ2g4jMiFh16iKAAAI2C4wZY1Y5jpMtFouP2FyE7AhkMpmvi8hcJBBAwD4BY8yCfD7/JfuSkxgBBBBAAAEEENi2QCKRmKuq1e9T+EIAAQQQQAABBBBAAAEE/lVg3cjIyOvL5fJfoEFgewIcwNqeUMj+fiKRWCUic0JWizoIIIBAWAV8Vf322NjY4ssuu+y3YS1Jr+gIpNPpV6vqzSLiRKc1TREIh4Ax5s7u7u6js9nseDga0QIBBBBAAAEEEPhfgWw269x333238IZVXhEIIIAAAggggAACCCCwDYGrRkZG3lEulysIIfB8AhzAitDrw3XdjxpjLo5QZaoigAACtgqY6sErVf1MoVBYZ2sJciPwbIHqLzWGh4d/LiLHIIMAAtYJGN/33zwwMHC9dckJjOg0sUkAACAASURBVAACCCCAAAIITEDAdd2ZInLdBC7lEgQQQAABBBBAAAEEEIiggKr2FwqFxRGsTuUaBDiAVQOWzZcmk8nX+r7/ExHpsLkH2RFAAIEICFzjOM7iQqFwawS6UjFCAplM5gMi8uUIVaYqAqERMMYU8vl8KjSFKIIAAggggAACCDyHQDwe/x/Hcd4FDgIIIIAAAggggAACCCCwDQG3WCx66CCwLQEOYEXgtdHT07NbR0fHL0XkwAjUpSICCCBgq8BNvu9/cvXq1T+2tQC5EdiWwMKFC6t/FlkvIi9ECQEErBN42hhzWD6ff9i65ARGAAEEEEAAAQRqEIjH4wc5jnO3iHTWcBuXIoAAAggggAACCCCAQHQEthpj3ux53k3RqUzTWgQ4gFWLloXXVj/uZ8OGDd8XkZMsjB/ByEZE+McyghtP5WgL3OU4zmcLhcK3RKT6PwJ8IRA6gUwmU33yVfUJWHwhgIBlAqr68f7+/ossi01cBBBAAAEEEEBgUgLxePxCx3E+PqmbuQkBBBBAAAEEEEAAAQSiIPCoMeY1nuc9FIWydKxNgJMetXlZd3U8Hv+0qp5vXXACI4AAAuEX+J2qLh0ZGfl6uVyuhL8uDaMq0Nvb+yrHcW4RkVhUDeiNgMUCd2/atOmVK1asGLO4A9ERQAABBBBAAIEJC8yZM2eX8fHxDTy9d8JkXIgAAggggAACCCCAQOQEVPX2rq6uN6xYsWJL5MpT+HkFOIAV4hdIPB5/s6pezS88Q7zJVEMAARsFHlLVzz300EMr165dO25jATIjUIOAZjKZG0XkdTXcw6UIIBAQAWPMCfl8/rptx6l+O8nDGwOyXcRAAAEEEEAAgToJJBKJD6vql+o0jjEIIIAAAggggAACCCAQQgFVLRUKhUQIq1FpCgIcwJoCXpBvnTdv3l7Dw8O3i8jeQc5JNgQQQCAqAsaYJx3HGdhjjz3+86KLLhqOSm96Rlugt7d3ruM4X4+2Au0RsFbg0lwuN9va9ARHAAEEEEAAAQQmKdDT0xPr7Oz8lYgcOckR3IYAAggggAACCCCAAAIREPB9/6OlUuk/I1CVihMU4ADWBKFsumzmzJlt++6777UicrxNucmKAAIIhFRgizHmkrGxsaXlcvkvIe1ILQT+TWDBggU7dXd3rxeRF8GDAALWCVQfnX14Lpd70LrkBEYAAQQQQAABBOogkEgkTlbVH9RhFCMQQAABBBBAAAEEEEAgvALjqnpioVC4PrwVaVaLAAewatGy5NpEIpETkbQlcYmJAAIIhFXAV9Vv+77fWyqVfh/WkvRCYFsC6XT6ElX9CEIIIGClQCaXy+WtTE5oBBBAAAEEEECgTgKJROIqVX17ncYxBgEEEEAAAQQQQAABBMIp8CdjzKs9z3sonPVoVYsAB7Bq0bLgWtd1TzXGXCEi7K0F+0VEBBAIrcA1qrqoWCzeEdqGFEPgeQQWLVp0ZCwWq34UchtQCCBgncCGLVu2HHXJJZeMWJecwAgggAACCCCAQB0Fksnk4caYX/N9TR1RGYUAAggggAACCCCAQAgFHMe56fHHH5+5Zs0afqYawv2tpRKHdGrRCvi18Xj8QFX9pYjsFvCoxEMAAQTCKnCb7/vp1atX/zisBemFwAQEtK+v7zpjzJsmcC2XIIBAwAR83z95YGDgqoDFIg4CCCCAAAIIINASgUQi8d+q+sGWLM6iCCCAQHQENovI6ATrdotI5wSv5TIEEEAAAQSaKfDfxWLx7GYuyFrBE+AAVvD2ZFKJZs6c2bbvvvtWP1v02EkN4CYEEEAAgakI/EFVl0yfPv1r2WzWn8og7kXAdoF0Op1U1SHbe5AfgYgKfDuXy50R0e7URgABBBBAAAEE/k2gp6dnj87Ozg0isjM8CCCAAAJiVHWTMWajMWaTiGys/v8isklVN/q+X/3r047j/MX3/RHHcf5qjHm6UqlUnwbyVEdHx5bR0dGRTZs2banHE0Lmzp2749atW6tPX99JRGK+7+/sOI6jqruISJeIVP9a/d/vXVR15+p/b4yp/nfV/+wqIi8SkT040MUrGwEEEECgjgJzi8XiqjrOY5RlAhzAsmzDthXXdd3PG2PODUkdaiCAAAK2CGwUkQs2btz4pXr80MCW0uREYFsC6XR6R1W9R0T2QQkBBKwTGFbVI/r7+39nXXICI4AAAggggAACDRRwXbdXRPINXILRCCCAQKsF/ioiDxpjHlbVR33ff0xVHzbGPNbe3v6n8fHxR7q6uh7bb7/9Hg/jm08TicROqrq34zjVw1h7VCqVvWOx2J7j4+MHqOr+juPsb4w54JlDXa3eK9ZHAAEEEAi2wFZVfWOhULg12DFJ1ygBDmA1SraJc2fPnv0mx3GurZ7wb+KyLIUAAghEWWDMGLNqbGzsU+Vy+fEoQ9AdgWcLZDKZL4jIQlQQQMA+AWPMp/L5/OftS05iBBBAAAEEEECgsQInn3xy5+677363iBzU2JWYjgACCDRM4FER+a2I/MEY86CqVp/m//vq/+37/oOlUqn6FCu+tiPwzFMR9xeR/Xzff3EsFjvYGDNdRA4RkReLSDuICCCAAAIIVA81VyqVGatXr34CjegJcADL8j2v/oGvvb39V6rKkyYs30viI4CANQLX+L7/sdWrV99lTWKCItAEgcWLFx/h+/6v+GFTE7BZAoH6C/y2q6vryGw2u7X+o5mIAAIIIIAAAgjYL+C67rtF5Fv2N6EBAgiEVMCIyB9F5D7Hce7zfb/619+Oj4/ft8suu9y3fPny6hOu+GqgwMyZM9v22muvAzs6Oqb7vj/dcZyX+r5/hKq+TET2buDSjEYAAQQQCKCAMeaaQw455O1hfHJkALkDFYkDWIHajprD6OzZs7/rOM5pNd/JDQgggAACtQqsM8YsKpVKP6j1Rq5HIAoCvb291zmOMzMKXemIQNgEHMc5denSpfz7LWwbSx8EEEAAAQQQqKuA67rXi8jxdR3KMAQQQKA2gYqIPGCMqb4x9G5Vrf51XXd39z0rVqzYUtsorm6WQE9Pz2477LDDUcaYI0TkKBF5maoeaYzZrVkZWAcBBBBAoPkCjuN8dmhoKNv8lVmxlQIcwGql/hTXjsfjC1W1+lE/fCGAAAIINE7gCVVdMjIy8qVyuVz9IQdfCCDwLwK9vb2zHccpAYMAAvYJ+L5/+cDAwLvsS05iBBBAAAEEEECguQLxeHyG4zi3iIjT3JVZDQEEIipQfaJV9Unjd4jInb7vr+vo6LhncHCQJxeH5AURj8cPjMViM4wxf/uPqs4QkReGpB41EEAAAQREfMdx3j40NHQNGNER4ABWkPe6ujvVB8c+x5fruq8SkRuNMZ1BrkA2BBBAwGKBURH5soh82vO8pyzuQXQEGiqQzWZfMDw8fI+I7NvQhRiOAAKNEBhub29/2ZIlSx5oxHBmIoAAAggggAACYRNwXXdQRN4btl70QQCBlgqMG2PWq+rfDls5jnP72NjYr1avXv1ES1OxeEsEnn0oS1Vfb4w5RkSmtSQMiyKAAAIITFlAVR9rb28/euXKlQ9PeRgDrBDgAJYV2/TPIXt6el7Q0dHxSxE5xML4REYAAQSCLmCMMZeJSF+pVPp90MOSD4FWC6TT6byq9rY6B+sjgEDtAsaYz+Tz+c/Vfid3IIAAAggggAAC0RRIpVL7+r6/nl+GR3P/aY1AHQSMqlb/N+QXxphbqk/Vcxzn1zzVqg6yIR0xc+bMtn322ecVInKcqh6rqseJyH4hrUstBBBAIKwCP33ooYdOWLt27XhYC9LrHwIcwLLw1RCPx7+hqikLoxMZAQQQCLSAqt4uIh8tFos/DXRQwiEQEIHe3t5DHMf5jYjwRM6A7AkxEKhB4LddXV1HZrNZPr6iBjQuRQABBBBAAAEEEonEZ1T1s0GVeJ4PVQhqZHIhEGaBR0XkluphK1W9ZWRk5JZyufyXMBemW+MFzjrrrP1HR0ffqKpvEpETRGR641dlBQQQQACBKQrkisVi3xRncLsFAhzAsmCTnh0xkUi4IlKwLDZxEUAAgaALPCYinzrkkEO+ns1m/aCHJR8CQRFIp9NrVPWkoOQhBwII1CTwjlwu9/2a7uBiBBBAAAEEEEAAAZk/f373li1bqk+w4QkkvB4QQODZAtWfKd4lItU3dt7o+/4NPF2fF0gzBFKp1AGVSuXNxpgTHMepHsji30/NgGcNBBBAoDaB6qfvnOZ53pW13cbVtglwAMuiHZs1a9aLY7HYHSKyk0WxiYoAAggEWWBMRP57dHT0M7z7LMjbRLYgCqTT6TNUtRzEbGRCAIHnF/B9//KBgYF34YQAAggggAACCCAwOYF4PJ50HGdocndzFwIIhERguPpRgiJyg6r+LBaL3Tg4OPjnkHSjhsUCqVTqpb7vv0VEqm+arP51msV1iI4AAgiERkBVN1YqlVdxQDs0W/qcRTiAZcn+ZrNZZ/369dc6jjPTksjERAABBAItoKrXqurHCoXCnYEOSjgEAiiwcOHCro6OjrtF5MUBjEckBBB4foHh9vb2ly1ZsuQBoBBAAAEEEEAAAQQmLaCJROJmVX3NpCdwIwII2CawVVVvrFQq16nqdaOjo78ol8ujtpUgb7QETj755M7dd9/9eFU9xRhzioi8NFoCtEUAAQQCJ3DzyMjI8fwZInD7UrdAHMCqG2VjByUSiepngi5t7CpMRwABBMIvoKr3qeq5hUKBJ/eEf7tp2CCBTCbzeRE5t0HjGRsVASMifDfS9N32ff+8gYGB85u+MAsigAACCCCAAAIhE0gkEsepavWjxvhTbcj2ljoIPCMwLiK3qOqPK5XKjzs6On4+ODi4FR0EbBY488wzD25ra6sexHqHqlYf+NBhcx+yI4AAAjYKqOrFhUJhoY3Zybx9Ab453L5Ry6+Ix+OvVNWb+YNQy7eCAAggYLfA06r6+SeffPLiNWvWjNhdhfQItE6gt7f3YMdxqk+O26F1KVgZAQQmKfDbrq6uI7PZLL80mCQgtyGAQIsFqj/Fqh7g5QsBBBAIiIDrupeJyHsCEocYCCAwdYHfqOqPfN+/duedd/7p8uXL/zr1kUxAIJgCc+bM2WV8fPxUVT3dGHOyiHQHMympEEAAgdAJGGPMaZ7nXRm6ZhTi3TlBfw1UHw+62267VT9H/KigZyUfAgggEGCBK2Ox2IeHhoYeDHBGoiFghUA6nb5SVU+1IiwhEUDgnwR83/+PgYEBvrHndYEAAggggAACCNRJIJlMvsQYU/14dt6gUidTxiDQTAFV3WiMuVZErmlvb1+zatWqPzRzfdZCICgCc+bM2aFSqbzVGFN9Mta7jDF7BiUbORBAAIGQCjzR0dHxipUrVz4c0n6RrcUTsAK+9bNnz77IcZyPBTwm8RBAAIFAChhj7o3FYucUCoUfBjIgoRCwTCCTybxTRL5rWWziIoBA9XNxVL/X399f/WeYLwQQQAABBBBAAIE6Criu2y8imTqOZBQCCDROoGKMuUVErnIc54dbt269tVwuVxq3HJMRsE9gxowZ7YcffvhbfN+f7TjO6SKyo30tSIwAAggEX6D6MccHH3zwW7PZrB/8tCScqAAHsCYq1YLr4vH48ap6nYg4LVieJRFAAAGbBbao6sCTTz65lI8btHkbyR4kgYULF3a1t7ffpaovCVIusiCAwIQEhlX1yP7+/vsndDUXIYAAAggggAACCExYIJFI7KSq94rIXhO+iQsRQKCZAn+uHrgSke/5vn9VqVTa1MzFWQsBmwWqPw984okn3mGMmS0ip4hIp819yI4AAggETUBVzy0UCkuDlos8kxfgANbk7Rp6Z/Wzl8fGxu4QkQMauhDDEUAAgfAJ8HGD4dtTGgVAoK+vL2uMOS8AUYiAAAI1Cvi+f97AwMD5Nd7G5QgggAACCCCAAAITFHBdd76IfGWCl3MZAgg0XuA+EbmiUqlc+cgjj/xk7dq1441fkhUQCLfAM7+3/H8iMltVT+DhEeHeb9ohgEDTBMaMMcd7nndT01ZkoYYKcACrobyTH55IJErVP8RMfgJ3IoAAApET2KCq5xSLxeo72vhCAIE6CmQymeqB8HUi0l3HsYxCAIHmCPy2q6vryGw2u7U5y7EKAggggAACCCAQPYGenp5YZ2fn7SJyVPTa0xiBQAhUP0bwRlWtvjHze4ODg/cEIhUhEAipwFlnnbX/2NjYHBF5r4gcHNKa1EIAAQSaJfDAyMjI0eVy+S/NWpB1GifAAazG2U56suu67zbGfGvSA7gRAQQQiJYAHzcYrf2mbQsE+vr6LjfGnNaCpVkSAQSmKOD7/n8MDAxcOcUx3I4AAggggAACCCCwHYHZs2efEIvFrgUKAQSaJlA9dFV9WkRZRL5ZLBYfadrKLIQAAn8XiMfjMxzHqT4JMi4iL4AGAQQQQGBSAuVisfieSd3JTYES4ABWoLZDZO7cufuMjIzcKSK7BiwacRBAAIEgClwei8XOGRoaejCI4ciEQBgE+vr63maM+WEYutABgagJqOr3+vv73xm13vRFAAEEEEAAAQRaJZBMJq8wxryjVeuzLgIREKg+2fdHIvJt3/evKJVKmyLQmYoIWCGQSCR2UtX3OI7zPt/3X2dFaEIigAACwRKYWywWVwUrEmlqFeAAVq1iDb5+9uzZ33Ec5/QGL8N4BBBAwGoBY8zDsVjsY4VCofoON74QQKBBAtlstmN4ePg3IvLSBi3BWAQQaJzAsKoe2d/ff3/jlmAyAggggAACCCCAwLMFXNc9VESq30O1I4MAAnUT2Cwi368eutppp51+sHz58r/WbTKDEECgIQKzZs06ur29/UPGmOpTsaY1ZBGGIoAAAuETqP6ZZ0axWFwfvmrRacQBrADtdTweT6nqNwIUiSgIIIBA0ATGRWR5Z2fnp1auXPl00MKRB4GwCWQymU+JyOfC1os+CERBwPf98wYGBs6PQlc6IoAAAggggAACQRJIJpNfNMacE6RMZEHAQoERVb3aGFPeaaedvsOhKwt3kMgIiMgzT8WaJSIfEZGjQEEAAQQQ2K7AL0dGRl5fLpdHt3slFwRSgANYAdkW13X3NsZUP3pwt4BEIgYCCCAQNIHbHMf5YKFQuDVowciDQBgFPvnJT+4/Nja2TlV5l1oYN5hOYRf4bVdX15HZbLb68Rx8IYAAAggggAACCDRRoKenZ7cddthhgzHm/7N3J2By1NXex8+pniUTkNUoynIRgxAQXCJuqBcFFVRc3xHSVT2ZRORyuUaMJDMT1wZZpmfAIChXI4ahu7on2LiiIgreKHpdI24kLAGVRTEsAhKSWbrO+5Ti+6ICmaWXWr79PHkQqP85v/P5t2Ey8+8qvs/bRHdaJUJg0syuNbN1ExMTX6pWqw8mYiqGQACBUECz2exRjuOcKiJvFZE2WBBAAAEEnlDgY77vfwSfeApwACsi+8ajByOyEcRAAIEoCjygqvmxsbFPVqvVWhQDkgmBJAr09/dfISLvSOJszIRA0gWCIDh+eHj4a0mfk/kQQAABBBBAAIGoCnied5qIXBDVfORCIEICgYj8UESqbW1tl4+MjNwdoWxEQQCBBgiEN6RwHOc/giAI7xa5ewNaUBIBBBCIu8Ck4zivKhaL4ddIvGImwAGsCGxYNpvNqWoxAlGIgAACCERKQFWrc+bMWXbJJZf8KVLBCINAwgVWrFhxTCaT+XbCx2Q8BBIpoKpfHRwcfEsih2MoBBBAAAEEEEAgJgILFy5sX7BgQfi0g+fEJDIxEWi2wEYzK3V0dJQvvfTSO5rdnH4IINB6gfDxhGb2LlV9r6ru3/pEJEAAAQQiJbBZVZ9fKpW2RioVYXYowAGsHRI19gIePdhY32ZUt/Deqc1oRI9oCvAGaNS+3Kaqp/i+zwGQRglTF4EnEMjn8x1bt279peM4B4OEAAKxE9imqs8dHBy8LXbJCYwAAggggAACCCRMwPO8N4vIVxI2FuMgMGMBVb3fzK5wHKdULBa/P+NCLEQAgUQJ5PN559Zbb32jmfWLyJGJGo5hEEAAgdkJfMb3/VNmV4LVzRbg3Eizxf+pH48ebPEG0B4BBKImEJjZJRMTE6dXq9WHoxaOPAikQWBgYKDfzAbTMCszIpA0ATPLDw0NnZG0uZgHAQQQQAABBBCIq4DnedeIyNFxzU9uBOogsN3MvqKqpTvvvPPq9evXT9ahJiUQQCChAq7rHqmqHxCR47j3QUI3mbEQQGA6AuFtQI73ff/r01nEta0V4ABWC/1d1/VEpNTCCLRGAAEEIiOgqr9yHOfdxWLxJ5EJRRAEUiawcuXKvRzHuUlEdknZ6IyLQOwFzOy2uXPnHprP57fHfhgGQAABBBBAAAEEEiLged7zRGSDiGQSMhJjIDBVgf8VkUvHxsaq1Wr1waku4joEEEAgFDjxxBNf0NbWFh7EeruIOHVVCX8yHh5p4IUAAgjEQ+DuWq122Ojo6L3xiEtKDmC16D3Q29u718TExA0iskeLItAWAQQQiIrAdlUtjI2NnVOtVsejEoocCKRRoK+vb52qnpDG2ZkZgbgLBEFw/PDw8NfiPgf5EUAAAQQQQACBpAn09PR8NgiCk5I2F/Mg8DgCfxaRquM4nyoWi79CCAEEEJitQDabPSCTyZxmZv8hIp2zrcd6BBBAII4C4d1Ey+XyW+OYPY2ZOYDVol3PZrNfUlX+j9Iif9oigEBkBP4n/MNTpVK5JTKJCIJASgVWrlz5SsdxvsvtvVP6BmDsWAsEQXDl8PDwm2M9BOERQAABBBBAAIGECoQfxJ2cnLxZRJ6S0BEZK90CNRH5pqqu3bhx45UbNmyYSDcH0yOAQCMETjzxxP3b2tpWisi7OIjVCGFqIoBA1AWCIFhSqVRGop6TfCIcwGrBu8B13f8TfhKkBa1piQACCERF4AFVzc+fP/+ifD4fRCUUORBIq0A+n2/bvn37BjM7PK0GzI1AjAW2qepzBwcHb4vxDERHAAEEEEAAAQQSLZDL5VaZ2TmJHpLh0iZwq5ldmslkRorF4l1pG555EYiTQJKeuNfT07NfEAQfFJElItIep30gKwIIIDBLgYeCIDi8Uqn8fpZ1WN5gAQ5gNRj4n8v39vbuNjExsVFEntHk1rRDAAEEIiEQBMGXOjs7Tx0ZGbk7EoEIgQAC0t/f/34ROR8KBBCIn4CZ5YeGhs6IX3ISI4AAAggggAAC6RHo7e2dMzExsUlV90/P1EyaQIHw7lZfMbNPl8vl74iIJXBGRkIAgRgIhI8mdBznIyLiikhbDCITEQEEEJi1gJldUy6XX8fXYLOmbGgBDmA1lPdfi2ez2c+o6slNbks7BBBAIAoCf1bVAd/310QhDBkQQOBvAh/4wAeeXqvVbhKRXTFBAIF4CZjZbXPnzj00n89vj1dy0iKAAAIIIIAAAukT6OnpOSEIgnXpm5yJEyDwBxEptbe3f+rSSy+9IwHzMAICCCREIJfLPcvMBh59NGEmIWMxBgIIIPBkAv/Bz1mj/QbhAFYT98d13ZeKyA9ExGliW1ohgAACLRdQ1erY2Nh/VavVe1oehgAIIPAPAv39/SUR8WBBAIH4CQRBcPzw8PDX4pecxAgggAACCCCAQCoF1PO874vIy1M5PUPHTSAQkavCu12Nj49fVa1Wa3EbgLwIIJAegcWLFx86MTFxluM4b03P1EyKAAIpFXjIcZzDisXi7SmdP/JjcwCrSVvU3d3d0dHRcb2IHNKklrRBAAEEoiDwJxF5T7lcviIKYciAAAL/KLBy5cojHce5TkT4mpA3BwIxEwiC4Mrh4eE3xyw2cRFAAAEEEEAAgVQL9PT0vDgIgh/xZ7BUvw2iPnz4vbwRVf1MqVT6bdTDkg8BBBB4rEAul3uJmQ2LyCuRQQABBJIqoKrfKZVKx/AowmjuMD9sa9K+eJ6XN7OPNqkdbRBAAIGWC4R3varVaqeOjo7e2/IwBEAAgX8R6O7uzhxwwAE/E5Hnw4MAArETGAuC4LDh4eFbYpecwAgggAACCCCAQMoFPM/zRcRNOQPjR09gg4isaWtrK46MjPCI8+jtD4kQQGAaAj09PcfUarULVPXQaSzjUgQQQCA2Aqp6cqlU+mxsAqco6AwOYIVLLEVEsx/V87yDzOwXIjJn9tWogAACCERe4O5MJnNqsVj8UuSTEhCBFAusXLlymeM4F6aYgNERiK2AmeWHhobOiO0ABEcAAQQQQAABBFIs0NPTs3cQBDeJyE4pZmD0aAiMi8hXzOwT5XL5B9GIRAoEEECgPgILFy5sX7BgwRIRCb9/sld9qlIFAQQQiIwAjyKMzFb8Y5AZHMCK6CQRjZXP553Nmzd/18xeEdGIxEIAAQTqJhAEwWWdnZ3vGxkZeaBuRSmEAAJ1F1ixYsXTMplM+A3/3epenIIIINBQAVX9/Zw5cw7J5/OPNLQRxRFAAAEEEEAAAQQaJuB53pki8uGGNaAwAk8u8Ecz+3RXV9dnLrnkkvCRg7wQQACBxAosXbr0KePj4wMi8n5ulJHYbWYwBFIpYGZXl8vl47h7UrS2nwNYDd4P13VPEZH/bnAbyiOAAAKtFtgSBMF/jI6OfrnVQeiPAAI7Fujr61urquEnwHghgEDMBIIgOH54ePhrMYtNXAQQQAABBBBAAIHHCJx88slzt27deqOq7gsMAk0U4DGDTcSmFQIIREtgyZIl+05OTp5tZrloJSMNAgggMHMBVT2pVCp9buYVWFlvAQ5g1Vv0MfV6e3v3mpiY2CgiuzewDaURQACBlgqo6hW1Wu0/R0dH721pEJojgMCUBAYGBo4wsx+JiDOlBVyEAAKRETCzbw4NDYWfauKFAAIIIIAAAgggEHMBz/PCD8WsjfkYxI++wKSZfSGTyXy8WCz+JPpxSYgAAgg0VqCnp+eYWq12gaoe2thOVEcAAQSaIvCgmT23XC7f2ZRuNNmhAAewdkg08ws82w6ukwAAIABJREFUz/u8mXXPvAIrEUAAgUgL/NnMllUqlXKkUxIOAQT+n0D4aORt27b9UEReDAsCCMROYCwIgsOGh4dviV1yAiOAAAIIIIAAAgj8i0D457PNmzf/WEReBA8CDRD4i6peWqvVPl6pVH7fgPqURAABBGIrcNRRR7Xts88+S0XkbBF5amwHITgCCCDwN4GrfN9/AxjREOAAVoP2wfO815rZtxpUnrIIIIBAqwXC39/exYnqVm8D/RGYnsDAwMApZsajkafHxtUIREJAVc8YHBzMRyIMIRBAAAEEEEAAAQTqIpDL5f7dzNbXpRhFEPibwO1mdqGIfLZcLj8ECgIIIIDAEwssWrToqZlM5iwReTdPC+CdggACcRZwHOfEYrF4eZxnSEp2DmA1YCe7u7s7Ojo6fiUiBzWgPCURQACBVgo8oqof8H0//EaOtTIIvRFAYHoCy5cv36Ojo+MmPtU1PTeuRiAiArd3dXUtyOfzj0QkDzEQQAABBBBAAAEE6iTged4XReRtdSpHmZQKqOr1ZnbBpk2bRjds2DCRUgbGRgABBGYk4HneC83s06p6xIwKsAgBBBBovcCfgiBYUKlU/tz6KOlOwAGsBux/Npv9kKp+rAGlKYkAAgi0UuA6M+utVCq3tTIEvRFAYGYCfX19n1HVk2e2mlUIINBigTcXCoUrW5yB9ggggAACCCCAAAINEPA8b76I3CAiHQ0oT8lkC4QfjvxGEARDlUrle8kelekQQACBxgqEjyXce++936OqZ4rIUxrbjeoIIIBAQwQ+5/v+SQ2pTNEpC3AAa8pUU7uwp6dnv1qttlFEdpraCq5CAAEEIi8wqapnj42NfaxardYin5aACCDwLwIDAwMLzezHIpKBBwEEYidwdaFQODZ2qQmMAAIIIIAAAgggMGWBXC53npmdPuUFXJh2gUBVvyEiZ5RKpZ+lHYP5EUAAgXoKeJ73DFUtmFmunnWphQACCDRBwMzsteVy+dom9KLFEwhwAKvObw3P875qZsfXuSzlEEAAgVYJ3GhmXqVS2dCqAPRFAIHZCeTzeWfbtm0/EJGXzq4SqxFAoAUCY47jHH7uuefe3ILetEQAAQQQQAABBBBokoDruruoavg139Ob1JI28RQYU9XP12q1j1UqlVviOQKpEUAAgXgILFq06DVtbW0Xm9lB8UhMSgQQQOCvAre0tbUdPjIysh2P1ghwAKuO7p7nHWtmV9WxJKUQQACBVgqUHMf5z1KptLWVIeiNAAKzExgYGDjJzD47uyqsRgCBVgio6hmDg4P5VvSmJwIIIIAAAggggEBzBVzXPVVVP9XcrnSLicCfVfViEbmwVCptiUlmYiKAAAKxFzj55JPnPvzwwx9zHOc0niwQ++1kAARSIxA+1ahUKn0oNQNHbFAOYNVpQ5YvX961ZcuW34jIAXUqSRkEEECgJQKqeo+InOT7/ldbEoCmCCBQN4GBgYHdzewmEZlXt6IUQgCBZgnc3tXVtSCfzz/SrIb0QQABBBBAAAEEEGidwFFHHdW2zz77/FJEDmldCjpHTOAPIrK6o6PjM2vXrv1LxLIRBwEEEEiNQC6Xe0kQBJ9T1UNTMzSDIoBAnAUmzGxhuVz+dZyHiGt2DmDVaedc1z1LRD5Yp3KUQQABBFol8K3Ozs4la9euDb/BwwsBBGIusHLlyk86jvNfMR+D+AikVeDNhULhyrQOz9wIIIAAAggggEAaBVzXPVpVr0nj7Mz8DwK3i8jH582bt2b16tXbsEEAAQQQaL3AwoUL2xcsWPB+ETlTRDpan4gECCCAwBMLqOpPtm/f/vJqtVrDqbkCHMCqg3d3d/f8jo6O8AThnDqUowQCCCDQCoFtqrrK9/0LRcRaEYCeCCBQX4H+/v7DROTnItJW38pUQwCBJghcXSgUjm1CH1oggAACCCCAAAIIREzA87yrRISvBSO2L02Kc6uqnrtx48bihg0bJprUkzYIIIAAAtMQ8DzveSLyORFZOI1lXIoAAgi0QmCZ7/ufbEXjNPfkAFYddt913W+IyHF1KEUJBBBAoBUCG0XkRG5F2Qp6eiLQMAHt7+9fLyKvalgHCiOAQKMExhzHOfzcc8+9uVENqIsAAggggAACCCAQXQHXdQ9R1fBRhAn6ME34Ywg+7/dE7zpVvbFWq53zhz/8YXT9+vWT0X13kgwBBBBAIBQIHxu89957r1DVvIh0ooIAAghEVODBtra2g0dGRu6OaL5ExuIA1iy3taen5221Wu2LsyzDcgQQQKAVAuF3vi5ub29fMTIysr0VAeiJAAKNEejr61usqiONqU5VBBBopICqnjE4OBh+A48XAggggAACCCCAQEoFPM/7lIicmtLx0zT2b0RkeGxsrMzjYdK07cyKAAJJEVi8ePGhtVqtKCIvTMpMzIEAAokT8H3fzyVuqggPxAGsWWxOd3d3R0dHR/iHpANnUYalCCCAQCsEHlTVk33f/3wrmtMTAQQaJ7Bs2bJdurq6blTVZzSuC5URQKBBArd3dXUtyOfzjzSoPmURQAABBBBAAAEEYiDQ3d09r7OzM7wj6m4xiEvEaQqo6vVmdqbv+1/h1mDTxONyBBBAIGIC4c+K58yZc4aZrRSRTMTiEQcBBBAIb8bxGt/3wyem8GqCAAewZoHsuu4qETlnFiVYigACCLRC4EeO42RLpdJvW9Gcnggg0FiB/v7+C0TktMZ2oToCCDRI4M2FQuHKBtWmLAIIIIAAAggggECMBDzPWxHeHSlGkYm6AwEzu8FxnDNKpdIVHLzi7YIAAggkS8B13Zeqang3LG7akaytZRoEkiCwcdOmTc/fsGHDRBKGifoMHMCa4Q6ddNJJT9+2bVv4KaRdZliCZQgggECzBWpmdt5NN930Yf4j22x6+iHQHIH+/v5DReR6EWlvTke6IIBAHQWuLhQKx9axHqUQQAABBBBAAAEEYiwQ3lGjs7OTpy/EeA8fE32TiAzyqMFkbCZTIIAAAk8ksHz58q5777130MyWiQg/g+etggACURLo832fD3c0YUf4zX+GyIsWLRpxHGfxDJezDAEEEGi2wJ1m5lYqle81uzH9EECgeQL9/f3fEZFXN68jnRBAoE4CY47jHH7uueeGH/DghQACCCCAAAIIIIDAXwVyudzbzewLcMRTQFVvCoLgzAMPPHBdPp8P4jkFqRFAAAEEpivged4bVXWtmT1tumu5HgEEEGiQwMPt7e2HXHrppXc0qD5lHxXgANYM3gonnHDCEW1tbT8SEWcGy1mCAAIINFVAVa90HGdJsVi8r6mNaYYAAk0V6O/vz4pIualNaYYAAnURUNUzBgcH83UpRhEEEEAAAQQQQACBRAl4nneNiBydqKESPoyZ/U5Vz73zzjvXrl+/fjLh4zIeAggggMDjCORyuaeZ2aUi8gaAEEAAgSgIqOoXSqXS/4lCliRn4ADW9HdXPc/7npm9YvpLWYEAAgg0VWBSVc+eP3/+mXzKrqnuNEOg6QJ9fX1PUdXwkQZ7N705DRFAYLYCt3d1dS3I5/OPzLYQ6xFAAAEEEEAAAQSSJ+B53gtF5Kd8GDgWe/t7MzvzrrvuKnLwKhb7RUgEEECgoQL5fN659dZbV5jZWSLS3tBmFEcAAQSmJnCc7/vfnNqlXDUTAQ5gTVMtm826qupPcxmXI4AAAs0WuFNETiyXyz9odmP6IYBA8wVWrlw57DjOiuZ3piMCCMxWwMzeMjQ09NXZ1mE9AggggAACCCCAQHIFXNe9VFV7kzth7Ce7V0TOa2tr+8TIyMj22E/DAAgggAACdRXI5XIvMrNREZlf18IUQwABBKYvsLmtre0wvmadPtxUV3AAa6pSIrJ8+fKuLVu23Cgi+01jGZcigAACTRVQ1WvnzJnjXnLJJX9qamOaIYBASwT6+voWqOov+RRVS/hpisBsBa4uFArHzrYI6xFAAAEEEEAAAQSSLbB06dJnjo+P3yQiOyd70thN92AQBOfttttuF1x88cUPxy49gRFAAAEEmibguu4ujuP8t5llm9aURggggMDjCARB8OFKpRLemY9XAwQ4gDUNVNd1zxCRj0xjCZcigAACzRSoqepZPHKwmeT0QqD1Av39/eHtYl/f+iQkQACBaQqMOY5z+LnnnnvzNNdxOQIIIIAAAggggEAKBTzP+7CInJnC0aM48jYzu2h8fLxQrVbvj2JAMiGAAAIIRFMgm832Oo7zSRHZKZoJSYUAAikQ2GpmB5fL5fBpSrzqLMABrCmCuq67j4iEnzKaO8UlXIYAAgg0U2BLJpNxi8XiNc1sSi8EEGitwMqVK7sdx/l8a1PQHQEEZiKgqmcMDg7mZ7KWNQgggAACCCCAAALpEwifznDPPfdsEpF/S9/0kZl4QkQu7ejoOGPt2rV/iEwqgiCAAAIIxEqgt7f34ImJiStU9dBYBScsAggkRkBVK6VSyU3MQBEahANYU9wMz/N8M+NNOEUvLkMAgaYKXOM4jlsqlbY0tSvNEECgpQL5fH7u9u3bN5oZ33xv6U7QHIEZCdze1dW1IJ/PPzKj1SxCAAEEEEAAAQQQSKWA53nh96f9VA7f2qEDVV03Pj7+kcsvv/zW1kahOwIIIIBAEgSWLl36lLGxsc+q6glJmIcZEEAgdgImIq/wff9/Y5c84oE5gDWFDcpms89X1Q0i4kzhci5BAAEEmiVgZjY0MTHxwWq1WmtWU/oggEA0BAYGBs4xs1XRSEMKBBCYjoCZvWVoaOir01nDtQgggAACCCCAAAIIiIh6nnediByJRtMErhWRPt/3f960jjRCAAEEEEiNgOd5J4vIRSLSkZqhGRQBBCIhoKrXP/vZz35RPp8PIhEoISE4gDWFjXRd99sicswULuUSBBBAoFkCf1HVJb7vf6FZDemDAALRERgYGJhvZr8Rkc7opCIJAghMUeDqQqFw7BSv5TIEEEAAAQQQQAABBP5BwHXdl6pq+El1vrff2PfGRlXNl0qlamPbUB0BBBBAIO0C2Wx2oeM44X9vnpV2C+ZHAIHmCpjZu8rl8trmdk12N/6QtoP99TzvjWb2tWS/DZgOAQRiJnCj4zhvL5VKm2KWm7gIIFAngb6+vq+r6hvqVI4yCCDQPIExx3EOP/fcc29uXks6IYAAAggggAACCCRNwHXddTyyqDG7amZ3iMiHDzzwwBJ3A2iMMVURQAABBP5VoKenZ88gCEoichw+CCCAQBMF7jazg8rl8kNN7JnoVhzAepLt7e7uznR0dPxCRJ6b6HcBwyGAQGwEzGxdJpM5qVQqbY1NaIIigEBdBfr6+t6qql+qa1GKIYBAUwTMLD80NHRGU5rRBAEEEEAAAQQQQCCxAkuWLNl3YmLiRhGZm9ghmz/Yw47jnL/nnnsWVq9eva357emIAAIIIIDAXx813Cci54iIgwcCCCDQDAEzGyqXy/3N6JWGHhzAepJd9jzvJDP7bBreCMyIAAKRF5hU1Q/5vl+IfFICIoBAwwSWL1/e1d7efoOqcjvqhilTGIGGCdza1dX13Hw+v71hHSiMAAIIIIAAAgggkBoB13XPUdVVqRm4cYNOiMilqvrhUqm0pXFtqIwAAggggMDUBHK53PFm5ovILlNbwVUIIIDArATGHcc5rFgs8tSGWTH+bTEHsJ4AMfwB55YtW24SkX3r4EwJBBBAYMYCqnpPrVY7cXR09DszLsJCBBBIhEB/f39455yPJGIYhkAgZQJBEBw/PDzMo81Ttu+MiwACCCCAAAIINEpg6dKlTxkfH79FRJ7eqB4pqHtFEAT9lUrlthTMyogIIIAAAjEScF33sEefgvDsGMUmKgIIxFfgSt/33xzf+NFJzgGsJ9gL13U/KCJnRWerSIIAAikV+FFnZ+c71q5d+4eUzs/YCCDwqMDAwMABZnaDiMwBBQEEYifw5UKh8LbYpSYwAggggAACCCCAQKQFcrncu81sTaRDRjPczxzHWV4sFr8fzXikQgABBBBAQKS7u3uPjo6OUVV9HR4IIIBAowXM7JhyuXxto/skvT4HsB5nh7u7u+d1dHRs5taOSX/7Mx8C0RZQ1fK8efPevXr16m3RTko6BBBohkBfX9+VqvqmZvSiBwII1FVgW3t7+6FnnXXWb+talWIIIIAAAggggAACqRfI5/PO5s2bfyoiL0w9xtQA7hKRM+fPn39JPp8PpraEqxBAAAEEEGidQHd3d6azs/NsEenjyVat2wc6I5ASgV/Onz//hXydPLvd5gDW4/i5rvspETl1drSsRgABBGYsMKmqH/J9vzDjCixEAIFECfT3979eRL6ZqKEYBoGUCJjZh4aGhsJvlPFCAAEEEEAAAQQQQKDuAq7rHq2q19S9cLIKbjWzoZ122um8NWvWPJKs0ZgGAQQQQCANAq7rZlX1czwdIQ27zYwItE4gCIKeSqVSal2C+HfmANY/7WFPT89zarXab0SkPf7bywQIIBA3ATO7LwiCE9atW8ctHuO2eeRFoEECy5Yt65w7d+6vROQ5DWpBWQQQaJzA5q6ursPy+fz2xrWgMgIIIIAAAggggEDaBTzP+6qIHJ92h8eZ30TkiiAIVlYqld/jgwACCCCAQJwFXNd9qap+WUSeHuc5yI4AApEWuGvu3LnP4UMLM98jDmD9k53neZ83s+6Zk7ISAQQQmLHALx3HeVupVOIRRTMmZOH0BMIvA8LvRfKKskBfX9+HVfXMKGckGwIIPL6A4zhvPPfcc7+BDwIIIIAAAggggAACjRQIP1QcBAEfKv5H5O8FQfD+SqWyoZH21EYAAQQQQKCZAtls9t8cx7lSRA5rZl96IYBAqgQGeErTzPebA1iPsVu0aNHhjuNcLyLOzElZiQACCExfQFWrqrqkVCptnf5qViCAQFIFPvjBD+47MTGxSVV3SuqMzIVAUgXM7IqhoSE+2JHUDWYuBBBAAAEEEEAgYgLZbPYCx3FOi1isVsS5S0Q+4Pt++OgUPnXWih2gJwIIIIBAQwVOPfXUnR966KEKd79sKDPFEUizwF9UdX6pVNqSZoSZzs4BrMfIua77NRF540wxWYcAAgjMQCAQkY+Uy+Vz+KbQDPRYgkDCBfr7+78oIm9L+JiMh0ASBR5R1UMHBwd/l8ThmAkBBBBAAAEEEEAgegLZbHZ3x3FuEZE9o5euKYnGVfXTT3nKUz548cUXP9yUjjRBAAEEEECgRQLd3d2Zzs7Os0Wkv0URaIvAFAV4EssUoSJ1mapeWCqV+HDHDHaFA1iPonme93Iz+8EMDFmCAAIIzFRgu6ou9X1/dKYFWIcAAskVWLFixTGZTObbyZ2QyRBIroCqDgwODhaSOyGTIYAAAggggAACCERRIJvNvtdxnE9EMVsjM6lq+MHq95ZKpd82sg+1EUAAAQQQiJpALpd7t5l9SkTao5aNPAggEGuBiSAIDq1UKuEHPHhNQ4ADWI9iua77HRF59TTsuBQBBBCYsYCZ/SGTybylVCr9bMZFWIgAAokVyOfzHVu3bv2l4zgHJ3ZIBkMguQI3P/LII4dfdNFFY8kdsZGT8am4RupSGwEEEEAAAQSSLbBw4cL2Qw455NdmdlCyJ/3bdGZ2QyaTeV+xWLwmDfMyIwIIIIAAAo8n4HnesSJSFZGdEUIAAQTqKFD1ff+ddayXilIcwBKRnp6eY2q1GneYSMVbniERiITALzOZzJuLxeLtkUhDCAQQiJxAf3//gIicG7lgBEIAgR0KqOrRg4OD4Yc7eCGAAAIIIIAAAggg0HQB13XfpKpXNr1xcxs+ICL5O++881Pr16+fbG5ruiGAAAIIIBA9Ac/zXigiXxeRvaKXjkQIIBBTATOzl5fL5R/FNH9LYnMAS0Rc1/2hiLy0JTtAUwQQSJvAF3faaafcmjVrHknb4MyLAAJTE+jr69tHVTfxiaWpeXEVAhETWFcoFBZFLBNxEEAAAQQQQAABBFIm4Lrut1X1mASOHajq57Zv3/7BarV6TwLnYyQEEEAAAQRmLJDL5Z4lIt8wM56qMGNFFiKAwD8JfNf3/aNQmbpA6g9geZ73ZjP7ytTJuBIBBBCYscCFBx544PJ8Ph/MuAILEUAg8QJ9fX2Xqyq3dU38TjNgAgX+Mj4+vmD16tV3JXA2RkIAAQQQQAABBBCIkYDruoeo6i9FpC1GsZ80qqper6r/VSwWww9T80IAAQQQQACBxxHIZrO7O44T/tz7lQAhgAAC9RDIZDKvv+yyy75Vj1ppqJH2A1jquu7PReT5adhsZkQAgZYJjIvIyeVy+bKWJaAxAgjEQqC/v/9VIrJeRNL+NVos9ouQCDxWQFVXDA4Ono8KAggggAACCCCAAAJREPA87zPh96OikGWWGf76uMGxsbFPVqvV2ixrsRwBBBBAAIHECxx33HGde+yxx2WqekLih2VABBBohsAG3/ePEBFrRrO490j1D/dyudyJQRCMxn0TyY8AApEWuF9V3+r7/nWRTkk4BBBouUA+n2/btm1beDD8sJaHIQACCExLwMxueOCBB16wZs2aiWkt5GIEEEAAAQQQQAABBBokkMvlnmZmN4vIrg1q0eiypqq+iKwolUpbGt2M+ggggAACCCRMQD3PK4jIyoTNxTgIINACAVV9R6lU+mILWseuZWoPYHV3d2c6Ojp+IyI8Bzd2b1sCIxAbgd+2t7e/YWRk5MbYJCYoAgi0TGBgYOB0MzuvZQFojAACMxYws9cMDQ39z4wLsBABBBBAAAEEEEAAgQYIuK47oKrnNqB0Q0uGjxsMguDUcrn8o4Y2ojgCCCCAAAIJF/A87wMicnbCx2Q8BBBovMDGsbGxw7kj7Y6hU3sAK5vN9qrqpTsm4goEEEBgRgI/dhznzXxCb0Z2LEIgdQIrV67cy3Gc8LBmXD+ZnLo9Y2AEHiPgFwqFHCIIIIAAAggggAACCERNoLu7u6Ozs3OjiDw7atmeIA+PG4zJRhETAQQQQCA+Arlc7hQz+5SIOPFJTVIEEIigwGLf94sRzBWpSKk8gBXe/aq9vX2jqj4nUrtBGAQQSISAmX155513dtesWfNIIgZiCAQQaLjAwMCAb2ZuwxvRAAEE6i3wkJktGBoa+kO9C1MPAQQQQAABBBBAAIF6CHie904RubwetRpYw8zsMsdx+vkwYwOVKY0AAgggkFqBXC53YvjfWhHpSC0CgyOAwGwFfjs2NnZwtVodn22hJK9P5QGsbDbbo6rhf2R4IYAAAvUWuHB8fPz93IKx3qzUQyC5Av39/a8Qke+JSCq/LkvuzjJZSgTeVygUPpGSWRkTAQQQQAABBBBAIKYCnueFf+Z8ZUTj3+I4zqnFYvGaiOYjFgIIIIAAAokQcF33aFX9sojsnIiBGAIBBJouYGb/VS6XL2564xg1TN0P+sK7X3V0dNwgIgfFaJ+IigAC0RcwVT3T9/189KOSEAEEoiIQfl1ywAEHbBCR50UlEzkQQGBqAmb2mwceeOCFa9asmZjaCq5CAAEEEEAAAQQQQKA1Ap7nvVBEfhqxRw9tdxyncM8995x71VVXjbVGhq4IIIAAAgikS6Cnp+fFQRB8Q0T2TNfkTIsAAnUS+OPcuXPn8xSoJ9ZM3QGsbDbrqqpfpzcYZRBAAIFQYJvjOF6pVPoiHAgggMB0BPr7+08TkQums4ZrEUAgEgIWBMGrh4eHvxuJNIRAAAEEEEAAAQQQQGAHAp7nlUTEiwjUt0XkVN/3N0ckDzEQQAABBBBIjUBPT8/hQRBcLSJ7pWZoBkUAgboJqGr42PChuhVMWKFUHcDK5/POLbfc8ksReW7C9pFxEECgdQIPqOqbfd+/rnUR6IwAAnEUWLFixdMymcxNIrJbHPOTGYGUC4wUCoUlKTdgfAQQQAABBBBAAIEYCbiuu4+qhn8GndvC2Heb2enlcrnSwgy0RgABBBBAIPUCnufNF5FrRWS/1GMAgAAC0xW4R1WfVSqVtk53YRquT9UBrFwud2IQBKNp2FhmRACBpgj8UVWP830/PNjJCwEEEJiWQH9//6Ui0jutRVyMAAJREHgok8kcfM455/wxCmHIgAACCCCAAAIIIIDAVAVyudwZZvaRqV5fx+ssfCqFqi4vFov31bEupRBAAAEEEEBghgI9PT37BUEQHsIKD2PxQgABBKYj0Of7/vB0FqTl2jQdwFLXdcNDEoelZXOZEwEEGipwYyaTeX2xWLy9oV0ojgACsRRYvnz5Hm1tbbur6u4i8te/quoeQRD8/e/nichiEUnT12Kx3EtCI/A4Au8pFAqfQgYBBBBAAAEEEEAAgbgJLF++vGvLli03qeq+Tcz+K8dxTikWiz9sYk9aIYAAAggggMAUBHp7e/eanJwMD2EdMoXLuQQBBBD4u8C9u+yyy7MuvvjihyH5R4HU/NAvl8t1B0Hwed4ACCCAQB0Efjo+Pv7GarV6Tx1qUQIBBCIo0N/fv6uI7Fqr1XZT1V0dxwkfE7irmf31r+EvVQ3/919/BUGwx6OHrP56wCqCIxEJAQTqI/Dz22677cXVarVWn3JUQQABBBBAAAEEEECguQKu6y5W1ZEmdN3uOE5h27Zt51Sr1fEm9KMFAggggAACCMxA4KSTTnr69u3bv81NTGaAxxIEUixgZivK5fL5KSZ43NHTcgArvPvV9SLyPN4ACCCAwGwEVPXajo6Ot61du/Yvs6nDWgQQaJ7AsmXLOnfaaad9a7Xa3qq6p+M4TzWzp4rIniIS3pVqz/Cfh7/Cv3/0nzvNS0gnBBCIiUBgZkcODQ39KCZ5iYkAAggggAACCCCAwL8I5PN555ZbbvmRqh7RQJ7r2traTh4ZGbmxgT0ojQACCCCAAAJ1Euju7t6js7PzahF5UZ1KUgYBBJIv8Ke5c+cesGbNmkeSP+rUJ0zFAaxcLvf2IAi+MHUWrkQAAQT+VUBVy5s2bVqyYcOGCXwQQCA6AqeffvpTVfXAtra2/URknyAI9lPV/cxLWsYCAAAgAElEQVRsH1XdR0T2ik5akiCAQFwFzOxzQ0NDJ8U1P7kRQAABBBBAAAEEEPi7gOd5LxeR74tIvX8+8KCIfHT+/PkX5fP5AHEEEEDgnwXC33QMFgQQiKRAb2/vbpOTk98UkZdEMiChEEAgcgJBELy/UqmsjlywFgaq9x+wWjjKE7ZWz/M2mNkLohiOTAggEA8BVV3t+/7p/PkwHvtFyuQJ5PP5trGxsfkTExML2tranhMEwUEicrCqhn8N71rFCwEEEGikwP2Tk5MHnX/++fc2sgm1EUAAAQQQQAABBBBolkAul7vCzN5Rx35XtLW1LRsZGbm7jjUphQACCCCAAAJNFOju7t61q6vrm0EQvLSJbWmFAALxFbh73rx5B6xevXpbfEeob/LEH8DKZrNvUNWv15eNagggkCYBMytUKpWBNM3MrAi0UmBgYGB3MztURBaa2SEicqiqhgep57YyF70RQCDVAqcUCoXPpFqA4RFAAAEEEEAAAQQSJZDL5Z5lZptEpHOWg/3RcZz3FovFK2ZZh+UIIIAAAgggEAEB13V3UdVvcSesCGwGERCIh8D7fN//RDyiNj5l4g9gua77XRF5VeMp6YAAAgkUCO+GvLJcLp+fwNkYCYFICLzvfe/brbOz87mPHrZaKCJHquoBkQhHCAQQQEBEgiDY8Lvf/e4l1Wq1BggCCCCAAAIIIIAAAkkS8DxvWERWzHAmU1V/+/bt76tWq/fPsAbLEEAAAQQQQCCCAuGdsObMmfMtM3txBOMRCQEEoiXAXbAesx+JPoDV09Pz4lqt9uNovf9IgwACMRGoqeopvu9fEpO8xEQg8gLLli3rnDt3bnjI6uVm9jJVfZGI7Bf54AREAIE0CwRm9pKhoaGfpRmB2RFAAAEEEEAAAQSSKRD+cLWzs/MWEZk3nQlV9SZVPalYLH5/Ouu4FgEEEEAAAQTiI5DNZnd3HOfb4Yen45OapAgg0AoBM3tvuVy+qBW9o9Yz0Qewstnsl1T1rVFDJw8CCEReYEJVPd/3Px/5pAREIMICp59++lMzmczLVfVIMwvvbBX+QW1OhCMTDQEEEPgHATP79NDQ0H/CggACCCCAAAIIIIBAUgU8zwu/3r14ivOFH1j8lIh8oFQqbZ3iGi5DAAEEEEAAgZgK9Pb27jY5ORkewgo/TM0LAQQQeFwBM7tjfHx8frVaHU87UWIPYHmed5CZbRQRJ+2bzPwIIDB1AVUdq9VqJ46Ojn556qu4EgEEQoF8Pr/zww8//FLHcY4xs2Mcx3kB/x3mvYEAAjEWuG9ycvLg888//94Yz0B0BBBAAAEEEEAAAQSeVKC7uzvT2dl5vYgc9mQXmtkNmUxmabFY/AmkCCCAAAIIIJAegUcPYV3DnbDSs+dMisAMBRb7vl+c4drELEvsAaxsNrtWVZckZqcYBAEEmiGwNZPJvLVYLIZfSPJCAIEdCOTz+Tnbtm37dzN7raq+WkSez4Er3jYIIJAUATM7aWho6HNJmYc5EEAAAQQQQAABBBB4IgHXdY9W1Sf6ftikiJx/3333ffSqq64aQxEBBBBAAAEE0iewaNGi8GkX39nRge30yTAxAgg8RmDT/Pnzn5vP54M0qyTyAFZPT8/etVrtNhHpSPPmMjsCCExL4IFMJvN6PsU3LTMuTqHAwMDAASLy1ztcicixIvKUFDIwMgIIJFwgCIKf7rTTTi9N+x8WE77NjIcAAggggAACCCDwGAHP874hIsf9E8ovJicnl65bty68QxYvBBBAAAEEEEixQC6Xe5qIfNfMDk4xA6MjgMCTCARB8NZKpfKVNCMl8gBWNps9X1Xfn+aNZXYEEJiWAIevpsXFxWkSyOfzHdu3bz9KRN5iZm8Qkf3TND+zIoBAKgVqqnrE4OAgP2RK5fYzNAIIIIDAtAXC7y7atFexAAEEIibQ29t78OTk5K9EpF1EJkTk42NjYx+pVqvjEYtKHAQQQAABBBBokUB4E5QgCK4TkWe1KAJtEUAgwgKq+pNSqfSSCEdseLTEHcDKZrO7q+rvuSNHw987NEAgEQJmdl8QBK/lk3yJ2E6GqJPAwMDA7rVa7RhVPV5V3ywiu9apNGUQQACByAuY2SeHhoaWRT4oARFAAAEEEEAAAQQQqLNALpf7pJm9YnJycgnfK6szLuUQmIHAUUcd1XbAAQc8bevWrXs7jrNX+EtV9zCznVV1J1Xd2cx2C/9eRHZ69Nfu4V/Df//oP59O54dEZKuIPCwi4f/++99vNbMHM5nMX4IgCP/9VlW9X0S2OI5zt4jcdcMNN2zZsGFDeHiTFwIIJFzghBNOeHZ7e/v3ROSZCR+V8RBAYAYCqnpUqVT67gyWJmJJ4g5gua77QRE5KxG7wxAIINBQAVW9JzxkMjo6Gn66jxcCqRZYsWLF09ra2t5eq9W6Hcd5lYi0pRqE4RFAIK0CfxobGzv4ggsueCCtAMyNAAIIIIAAAgggkF6BU089deeNGzduX79+/WR6FZgcgeYI5HK5nSYnJ58tIv+WyWTCQwzPCIJgb1UND1ntbWZ7icjTRcRpTqJZdwnvh/mn8Jeq3hUEwZ8cx7nTzP5kZndmMpnwn91cLpfDQ128EEAg5gKLFy8+tFarrReRp8Z8FOIjgED9Bb7p+/4/P9q8/l0iWjFRB7CWL1/etWXLlt+JSPgMWl4IIIDAkwn8KQiCo0dHR2+ACYG0CqxatWrPycnJN6pqt6q+/tHHDKSVg7kRQAABCYJg8fDwcBEKBBBAAAEEEEAAAQQQQAABBGYrEN7Bav/9958/OTl5qJkdLCLzVXW+mc0XkfCAVRpf4SGtm1T1FjO7OZPJ3DIxMXHzAw88sPmqq64aSyMIMyMQVwHP854nIv8jIuGd93ghgAACjxVY6Pv+z9NIkqgDWK7rniIi/53GjWRmBBCYlsAfHcc5ulQqbZrWKi5GIAEC/f39uwZB8A4RcR3H+XcRySRgLEZAAAEE6iHw/UKhEN4BMPzULi8EEEAAAQQQQAABBBBAAAEEpiywdOnSZ46Pj7/AzJ4vIoep6oJHD111TLlIui+sicjtInJLeEBLRH6tqhvGxsZ+U61Wx9NNw/QIRFegp6fnZUEQfEtEwkeh8kIAAQT+LrDO9/1FaeRI0gEsdV13o4iEnyLghQACCDyRwF2qerTv++Ef4lryCn/j5Se7LaFPbdN8Pt+xbdu215tZt4i8XVV3Si0GgyOAAAKPLxB+o3dhoVD4JUAIIIAAAggggAACCCCAAAIIPJlAeNhqcnLyJbVa7QgRecGjv8LHBfKqv0B4+OrXjuP8PAiCn09OTm7o6ur69cjIyPb6t6IiAgjMRGDx4sWvq9VqXxWRzpmsZw0CCCRSoDYxMXHQ5Zdffmsip3uSoRJzACubzb5BVb+etg1kXgQQmJbAHzOZzFHFYvHmaa3iYgRiKtDX1/dSVe0VkfDg1R4xHYPYCCCAQDMELigUCsub0YgeCCCAAAIIIIAAAggggAACERb4p0/Pho8R3HfffRea2UuDIAi/1/ZyEdkvwhOkIdqEiGw0s5+Hd8lyHOdnd9xxx4b169dPpmF4ZkQgigLZbPYtjuN8gSduRHF3yIRAawRU9cJSqXRaa7q3rmtiDmC5rvttETmmdZR0RgCBKAuo6j21Wu3Vo6OjN0Q5J9mSJdCKu50NDAyEz1vvNrP/FJHwlue8EEAAAQSeXOBPInJQoVB4ECgEEEAAAQQQQAABBBBAAIF0C4QHrp75zGc+z3GcY8zsFSLyShHZNd0qsZj+ERG53sy+39bWds0999xz3VVXXTUWi+SERCAhArlc7hQz+++EjMMYCCAwe4GtY2Nj+1Wr1ftnXyo+FRJxACuXyz03CIJfiUgi5onP24ekCMRG4F7HcV5dKpV+E5vEBEVgGgL5fN4JHzEoIu8SkeNFpGMay7kUAQQQSLWAmXlDQ0PlVCMwPAIIIIAAAggggAACCCCQYoFFixYd6jjOsSLyOhEJD13NTTFHUkZ/RFV/GATBdx3HWX/ffff9hANZSdla5oiyQC6XO8PMPhLljGRDAIGmCvT5vj/c1I4tbpaIA0ue511iZuEPnXkhgAAC/yxwv5kdXalUfgENAkkTeN/73rdbZ2fnYjM7TVWflbT5mAcBBBBotICZXTc0NPTvImKN7kV9BBBAAAEEEEAAAQQQQACBaAh0d3fvOmfOnNeZ2evDXyKyTzSSkaKBAtuDIPhRJpMJD2RdfcABB/w4n88HDexHaQRSK5DL5S40s2WpBWBwBBB4rMBdmzZtetaGDRvCxwen4hX7A1jd3d3zOjo6bheROanYMYZEAIHpCDw4OTn52ssvv/yn01nEtQhEXWBgYGBhEAQnq2pORLqinpd8CCCAQEQFJmu12sLzzjsvvJMuLwQQQAABBBBAAAEEEEAAgQQL9PT07BcEwbFmFt49PrzTFXeQT/B+72g0M7vPcZzvBEHwtYmJia9Uq9UHd7SGf48AAlMTCJ/YsXnz5stF5P9MbQVXIYBAkgUcxzmxWCyGvyek4hX7A1iu64a3MTwjFbvFkAggMB2BhxzHeV2pVPrxdBZxLQJRFVi2bFnnnDlzXMdx3isiz4tqTnIhgAACcREIguC84eHhlXHJS04EEEAAAQQQQAABBBBAAIHpCYSPFsxkMt1m9hYRef70VnN1igTGzey7IvK18FelUrktRbMzKgINEeju7u7o7OwM/z/12oY0oCgCCMRJ4Ge+7x8Rp8CzyRrrA1jHHXdc5x577PE7EdlrNgisRQCBZAmo6sNmdmy5XP5BsiZjmjQKrFq1ap6ZLX30lr17p9GAmRFAAIEGCNz9yCOPHHTRRRc91IDalEQAAQQQQAABBBBAAAEEEGiRgOd5BwVB8E5VPUFEDm1RDNrGW2CjmV1pZl+bnJz8YbVarcV7HNIj0BqB8HGvnZ2d4eFGPlDemi2gKwJREjjS9/3/jVKgRmWJ9QEs13UXi8hIo3CoiwAC8RNQ1THHcd5ULBaviV96EiPw/wVWrVp1SK1WW66qHo/Z5Z2BAAII1FdAVU8cHBxMzW2P66tHNQQQQAABBBBAAAEEEEAgWgJLly595vj4uGtmLj/oj9beJCDNFlX9vIiM+r7/QxGxBMzECAg0TcDzvGeIyI9EZL+mNaURAghEUeAK3/e7oxis3pnifgDrem4bW++3BPUQiLVAzXGcRaVSqRrrKQifaoGBgYGFZtb/6PPRY/3f6VRvJMMjgECUBa4tFArHRDkg2RBAAAEEEEAAAQQQQAABBJ5coLe3d06tVjs+CIIeETlWRNowQ6DBAneIyJfMrFipVDY0uBflEUiMwOLFiw+t1WrfF5HdEjMUgyCAwHQFakEQPCcNj/mN7Q92s9nsq1X1O9PdWa5HAIHECoSfPFlSLpcvS+yEDJZogf7+/leEB69U9U2JHpThEEAAgdYKjJvZ84eGhja1NgbdEUAAAQQQQAABBBBAAAEEZiJwwgknHJHJZE5W1XeKyC4zqcEaBOog8Ovwrli1Wm103bp1v6tDPUogkGgBz/OOEpGrRaQj0YMyHAIIPJnAat/33590otgewHJd9wsi8vakbxDzIYDA1ATM7LRKpXLh1K7mKgSiIdDd3Z3Zf//935nJZAbM7PBopCIFAgggkFyBIAgGh4eHVyV3QiZDAAEEEEAAAQQQQAABBJIn4LpueNAqq6onm9kLkjchE8VYIPxg+A/NbDSTyXy+VCptifEsREegoQKu6y5V1c81tAnFEUAgygJ/GRsb27darT4Y5ZCzzRbLA1iu6+4jIr/llrKz3X7WI5AMATPLVyqVM5IxDVOkQSCfzztbt259h4ic6TjOwWmYmRkRQACBVguY2R1z5849JJ/PP9zqLPRHAAEEEEAAAQQQQAABBBDYscCiRYsOb2tre4+ZLTKznXe8gisQaKnAhKp+ZXJy8tPr1q0Ln+ATHs7ihQACjxHI5XJnmdkHQUEAgXQKmNnycrl8QZKnj+UBLM/zzjSzDyd5Y5gNAQSmJqCqn/R9f9nUruYqBForwMGr1vrTHQEE0i1gZu8YGhr6YroVmB4BBBBAAAEEEEAAAQQQiLZA+P2z22677TW1Wu00EXmjiMTy51jRViZdowVUdbOIXDI2Nra2Wq3e0+h+1EcgRgKay+UuM7NcjDITFQEE6iewef78+Qfl8/mgfiWjVSl2X7guXLiw/eCDD/69iDwjWpSkQQCBFgiMlMvlpXySpAXytJyWQPiNo23btr0zCIKPcseradFxMQIIIFAvgasLhcKx9SpGHQQQQAABBBBAAAEEEEAAgfoKdHd379rZ2fluM/svEdm/vtWphkBrBFR1TESuEJHP+L5/XWtS0BWBaAkcd9xxnXvuuee1InJktJKRBgEEmiGQyWRef9lll32rGb1a0SN2B7Bc1z1BRNa1AoueCCAQHQFV/cadd975lvXr109GJxVJEPhXgRUrVhyTyWQKIvJCfBBAAAEEWiIwbmaHDw0N3dSS7jRFAAEEEEAAAQQQQAABBBB4QoFcLvc0MzvVzN4rIrtDhUCCBW5S1Usdx7mkWCzel+A5GQ2BHQosWrToqZlM5scicsAOL+YCBBBIlICZfaVcLr81UUM9ZpjYHcBatGjR/ziOc1RSN4S5EEBgSgI/cRznNaVSaeuUruYiBFogsHLlyiMdxzlHRF7Vgva0RAABBBB4VEBVzx4cHPwQIAgggAACCCCAAAIIIIAAAtERyGazB2YymZVm1mNmndFJRhIEGi7wiOM44Y0mVpdKpd80vBsNEIiogOu6h6jqD0Vkl4hGJBYCCDRGoDY5OTl/3bp1v2tM+dZWjdUBrPA3YhEJvxiJVe7WbjHdEUiWgJndPDEx8Qqem56sfU3SNKtWrTqkVqsVVPVNSZqLWRBAAIGYCtze1dW1IJ/PPxLT/MRGAAEEEEAAAQQQQAABBBIlsGjRokMdx/mwiHSLiJOo4RgGgekJmIh8IwiC4dHR0e9ObylXI5AMAc/zwrvgfIH/HiRjP5kCgakKmNm55XL5A1O9Pk7Xxeogk+d5F5nZe+IETFYEEKifgKreEwTBkZVK5Zb6VaUSAvURWLVq1Z61Wu0jqnqqiLTVpypVEEAAAQRmI2Bm3UNDQ1fMpgZrEUAAAQQQQAABBBBAAAEEZi/w6AfsB0QkKyKZ2VekAgLJEVDV64MguGBiYqJcrVZryZmMSRDYsYDneeEhjLN3fCVXIIBAggTubWtr23dkZGR7gmb66yixOYDV3d29c0dHx50ismvSNoF5EEBgSgJ/qdVq/75u3brrp3Q1FyHQJIF8Pt+xbdu2/xSRM/hvVJPQaYMAAghMTeDaQqFwzNQu5SoEEEAAAQQQQAABBBBAAIFGCORyuQWPfmjxndzhpBHC1EyYwC2qel5bW1sxiT+UTtheMU79BNTzvJKIuPUrSSUEEIi6gJnlyuWyH/Wc080XmwNYruueIiL/Pd0BuR4BBBIhMOE4zvGlUunqREzDEIkRWLlyZbfjOEMisn9ihmIQBBBAIBkCE2b2vKGhoU3JGIcpEEAAAQQQQAABBBBAAIF4CfT09Ow9OTkZ3i1+KXeLj9fekbb1AuHTQETk4rGxsQur1er9rU9EAgQaK9Db2ztnYmLie6p6RGM7UR0BBKIiYGY/LJfLL49KnnrliNMBrF+IyPPqNTh1EEAgNgIWnoCtVCrl2CQmaOIFBgYG5gdBcJGqHpv4YRkQAQQQiKFAEATnDQ8Pr4xhdCIjgAACCCCAAAIIIIAAArEW6O3t3W18fHxAVd8rIl2xHobwCLRYQFUfDoJgTSaTKZRKpS0tjkN7BBoqsGTJkn0nJyd/ZmZPa2gjiiOAQGQEgiB4UaVS2RCZQHUIEosDWK7rHiki36/DvJRAAIH4CXy0XC6fGb/YJE6iwPLly7s6Ozv7zWxARDqTOCMzIYAAAgkQ+JOIHFQoFB5MwCyMgAACCCCAAAIIIIAAAgjEQqC7u7ujo6NjmYh8QET2iEVoQiIQE4HwIJaIXBh+4KxSqfw5JrGJicC0BcIzAar6PyLSPu3FLEAAgTgKfM73/ZPiGPyJMsfiANaiRYtGHMdZnCR4ZkEAgSkJXF4ulxeJiE3pai5CoIEC/f39x4d/yOVxgw1EpjQCCCBQH4FcoVBI3LPj60NDFQQQQAABBBBAAAEEEECg/gI9PT3H1Gq1T4jIIfWvTkUEEHiMwF/M7GJVPadcLj+EDAJJFHBd93RVPS+JszETAgj8i8C2sbGxfZL0uN3IH8ByXXcXEfmDiOzEGxIBBNIjoKrfv++++4656qqrxtIzNZNGUaCvr28fETlHVXNRzEcmBBBAAIF/EPhxoVB4GYe3eVcggAACCCCAAAIIIIAAAo0X8DzvIBH5uJm9ofHd6IAAAo8RuDc8oDJv3rwLV69evQ0ZBJIm4LruOlU9IWlzMQ8CCPyrQBAE769UKquTYhP5A1ie5/2HmX06KeDMgQACUxK4JZPJvKxYLN43pau5CIEGCJx88sntu++++6kicpaI7NyAFpREAAEEEKi/wCsLhQKPLq+/KxURQAABBBBAAAEEEEAAgf8n0Nvbu9vk5OTHzOwUEWmDBgEEWiZwh4h87MYbbxzZsGHDRMtS0BiBOgssX76869577/2Bmb2gzqUphwACERNQ1RtLpVJ4F9VEPBEr8gewstnsT1X1RRF7HxAHAQQaJ3D/o4evbm5cCyoj8OQCAwMDR5nZp7htOu8UBBBAIFYC1UKh8M5YJSYsAggggAACCCCAAAIIIBAzgUWLFh3vOM7FIhLeNZ4XAghEQ+D34WMJx8bGPletVmvRiEQKBGYn4HnefBH5qYjsNrtKrEYAgRgIHOn7/v/GIOcOI0b6AJbnec8zs1/scAouQACBpAiMB0HwutHR0e8mZSDmiJfA8uXL9+js7LzQzNx4JSctAgggkHqBsSAIDh0eHr419RIAIIBA6gTCb+wk4iOCqds5BkYAAQQQQCBeAj09Pc8JguBiMzs6XslJi0CqBH6hqu/1ff+6VE3NsIkVcF33Tar6VRGJ9JmGxG4AgyHQJAFVXVsqld7VpHYNbRPp36xc171QRJY1VIDiCCAQJYHecrl8WZQCkSU9Av39/ceJyGdFZO/0TM2kCCCAQDIEgiA4b3h4eGUypmEKBBBAAAEEEEAAAQQQQCA6At3d3R2dnZ0fEJEBM+uMTjKSIIDAEwiYmV0eBEHfunXrwkcU8kIg1gK5XG61mb0v1kMQHgEEdiSw1cyeWS6XH9rRhVH/95E9gNXb2ztnYmLiLhHZI+qI5EMAgboIDJfL5b66VKIIAtMQ6O/v39XMhlT15Gks41IEEEAAgegI/Hl8fHz+6tWr749OJJIggAACCCCAAAIIIIAAAvEXyGazz3ccZ62ZvSD+0zABAqkTeERVh+fNm1dYvXr1ttRNz8CJEVi4cGH7ggUL1ovIyxMzFIMggMDjCfyH7/tr4k4T2QNYrutmRaQcd2DyI4DAlAS+NT4+/gaeTT4lKy6qo8DAwMDrgiC4RFX3rWNZSiGAAAIINFEgCIL3Dg8PX9TElrRCAAEEEEAAAQQQQAABBBItEH5Afnx8PK+qK0Qkk+hhGQ6B5AvcaWYfrFQqxeSPyoRJFViyZMm+ExMT14vInkmdkbkQSLuAqv6kVCq9JO4OkT2Alc1mr1XV18QdmPwIILBDgZva29tfOjIy8sAOr+QCBOok0NfX9xRVPV9ETuLZ4XVCpQwCCCDQGoHNf/7znw9Zs2bNRGva0xUBBBBAAAEEEEAAAQQQSJbAokWLXqGqn1PV5yRrMqZBIN0CZvadTCZzWqlU+k26JZg+rgKe571RRK7kZzpx3UFyI7BjgSAIXlCpVH6x4yuje0UkD2DlcrlnBUGwWUSc6NKRDAEE6iAQPsf1ZeVyeWMdalECgSkJ9Pf3v0JELhWR+VNawEUIIIAAAlEWcAuFQiXKAcmGAAIIIIAAAggggAACCMRB4KijjmrbZ599PmRmH+KuV3HYMTIiMCOBIHz60Pj4+OnVavWeGVVgEQItFPA8b1hEwrsz8kIAgQQKqOqFpVLptDiPFskDWJ7nnW1mH4gzLNkRQGCHAjUROb5cLl+1wyu5AIE6CCxfvryrvb39o6q6kgO+dQClBAIIINBiATP7zdy5c5+Xz+fDbx7yQgABBBBAAAEEEEAAAQQQmKGA67qHqKpvZi+YYQmWIYBAvATuFZHl5XLZj1ds0qZdYOHChe0HH3zwd1X1ZWm3YH4EkiigqvdnMpm9R0ZGtsd1vsgdwOru7s50dHT8XkT2jisquRFAYMcC4SEY3/fP2/GVXIHA7AX6+vpepKqj3PVq9pZUQAABBCIk8NZCofCVCOUhCgIIIIAAAggggAACCCAQNwF1Xfc9IlIQka64hScvAgjMTkBVvzE5OXnKunXr7phdJVYj0DyB8ElaZhY+omyX5nWlEwIINEvAzNxyuRzbp15E7gCW67qvE5Grm7WB9EEAgZYI+OVyOdeSzjRNncDAwMDJZnahiHSmbngGRgABBBIqYGY/GxoaerGIWEJHZCwEEEAAAQQQQAABBBBAoKEC3d3d8zo6Oi4TkeMa2ojiCCAQdYGHzGygUql8mu+zRH2ryPd3Ac/z3ikilyOCAALJE1DV75RKpaPjOlkUD2CVRMSLKyi5EUDgyQVU9Vdz58592Zo1ax5Jn1X4Wy4/J27Wvvf39+8qIp8Vke5m9aQPAggggEBzBGq12mvPO++8a5rTjS4IIIAAAggggAACCCCAQLIEstnsq1Q1vLMATyJJ1tYyDQKzEfhBe3v7SSMjIzfOpghrEWiWgOd5nCloFjZ9EGiugE1MTBx4+eWX39rctvXpFqkDWLlcbiczu9vMdq7PeFRBAIGICTwwOTn5orj+hhkxS+I8icDAwMARQRCsU9UDgEIAAQQQSJaAmV03NDT0qmRNxTQIIIAAAggggAACCKMWT9MAACAASURBVCCAQFME1PO895rZsIi0N6Vj6puEH8iN1I/iUr8jjQNIxF5vV9XCpk2bzt6wYcNE46yojMDsBU499dSdH3rooZ+LyIGzr0YFBBCIkoDjOGcUi8V8lDJNNUukvurLZrM5VS1ONTzXIYBArAQsCIK3jI6OXhmr1ISNm4D29/efLiLn8E2kuG0deRFAAIGpCQRB8Irh4eEfTO1qrkIAAQQQQAABBBBAAAEEEAgFent79xofHy+r6msQQQABBJ5MwMx+ZmbvGh0d/RVSCERZoLe394jJycnw+4QcKo7yRpENgWkKmNnvyuVyeJON2D1aKmoHsL6lqq+dpj+XI4BAPATOLpfLH4pHVFLGUeD0009/aiaTGVHVN8YxP5kRQAABBKYkcG2hUDhmSldyEQIIIIAAAggggAACCCCAwF8Fenp6Xlar1ao8cpA3BAIIPJ7AE9y7a0JVB8fGxs6qVqvjyCEQVQHXdT+iqmdENR+5EEBgxgKv8n3/uhmvbtHCyBzAWrp06TPHxsZuF5FMiyxoiwACDRJQ1WvHxsZeX61Waw1qQdmUC6xateol4SMHRWT/lFMwPgIIIJBoATM7Zmho6NpED8lwCCCAAAIIIIAAAggggEAdBTzPO9nMLhKRjjqWpRQCCKRH4DdBELjcDSs9Gx63SfP5vLN58+b1IvLKuGUnb8wFwpM2sbs/U3zMVfWzpVLp5Pgk/lvSyBzA8jxvpZkNxQ2QvAggsEOBO8bHxxdWq9V7dnglFyAwfYHwkYOrRCT8dEPb9JezAgEEEEAgLgJBEPx0eHj4xXHJS04EEEAAAQQQQAABBBBAoJUCxx13XOfuu+/+SVU9qZU5kt37Ce4blOyhmS6dAttVNT9//vzhfD4fpJOAqaMskM1mD3Ac55cisnOUc5INAQSmJfDgvHnznrF69ept01rV4oujdADrl2Z2eIs9aI8AAvUVGM9kMq8sFos/qW9ZqiEgsmLFip0ymcxlIvIOPBBAAAEEki9gZu8YGhr6YvInZUIEEEAAAQQQQAABBBBAYHYCjz5x5MsicsTsKrEaAQQQ+P8CZna14zhLfN//Iy4IRE3A87z3iEh4x0deCCCQHIETfN//fJzGicQBLM/znmdmv4gTHFkRQGBKAsvL5fIFU7qSixCYhkBfX98+ZvZlx3EWTmMZlyKAAAIIxFfgpq6urkP4lGV8N5DkCCCAAAIIIIAAAggg0BwBz/NeaGZfFZG9m9ORLgggkDKBe4MgWDo6OnplyuZm3OgLqOd53xCRY6MflYQIIDAVAVX9WqlUOn4q10blmkgcwMrlcucFQXB6VFDIgQACdRH4erlcDn9D5Om3deFsfpGoPrp45cqVRzqO8wUReXrzVeiIAAIIINAKgSAIlgwPD4+0ojc9EUAAAQQQQAABBBBAAIG4CORyubcHQVAUkZ3ikpmcCCAQS4Hw5z4X3X///X1XXXXVWCwnIHQiBXp6evYOguDXIrJ7IgdkKATSJzDZ1ta278jIyN1xGb3lB7Dy+bxzyy233M6nMeLyliEnAlMSuDOTyTy/WCzeN6WruQiBKQoMDAycZGafEpGOKS7hMgQQQACB+Avc2dXV9ex8Pj8e/1GYAAEEEEAAAQQQQAABBBBojIDneaeZ2cdFxGlMB6oigAAC/yhgZj+fmJg4oVr9v+zdCZwcdZn/8edXnZkQAkgSQcAoAobDBZGNKCIIKB6RwwNHMl3VwxAxnkFHMtMTvAZdzXQPGAWPNWIM01U1wREv5HDxCCq6HvH6qwRFvBJRDrkkYY6u5/9qlmUxhHR1Tx91fPr14rUueX7P7/u8a0gm07+uGr8VGwSiImDb9jnGGD7IGZULQg4EZiigqrF64lbbD2A5jvNSVf2vGbqzHAEEoiMwLSIne553U3QikSTuAkNDQ7O2b99e+QHSirjPQn4EEEAAgdoEjDErh4eHL6ltFdUIIIAAAggggAACCCCAQDoEFi9e3HH44YevFZHedEzMlAggEDGB+0Vkued5V0YsF3FSLGDb9peNMa9KMQGjI5AkgZ+6rrs4LgO1/QBWNptdZ4w5Ny5g5EQAgaoCqzzPG65aRQECIQX6+vrmd3Z2Vv7ydmrIJZQhgAACCCRHYPvk5OTCNWvW/CM5IzEJAggggAACCCCAAAIIINAYgVwuN1dVP6+qr2xMR7oggAAC9Qmo6tqpqakV4+Pj3MG8PkJWNVCgt7d3v+np6d/wKMIGotIKgTYKqOqzPc+rPF408q+2HsB65JMZlec1zo+8FAERQCCMwLcnJydfOj4+Xg5TTA0C1QRWrVp16PT09Fcsyzq8Wi2/jgACCCCQPAFV/WyxWDwveZMxEQIIIIAAAggggAACCCAwM4Genp4F09PTVxtjXjCzTqxGAAEEGiawSVXP8n3/Tw3rSCME6hRwHKdyA5h1dS5nGQIIREhAVYue5+UjFOkJo7T1AJbjOKep6tfiAEVGBBCoKvA3y7KOLpVKd1StpACBEAKrVq16ZRAEYyKyV4hyShBAAAEEEigQBMHikZGRnyZwNEZCAAEEEEAAAQQQQAABBOoWOPvssw/p6Oi4XlWfWXcTFiKAAALNEbgjCILusbGxbzWnPV0RCC9g2/b1xpiXh19BJQIIRFFAVf/ied6BIqJRzPfYTG09gJXNZq8wxvREHYl8CCBQVaDym91pnuddV7WSAgRCCPT39/dYlnW5iHSEKKcEAQQQQCCBAqr6/WKx+MIEjsZICCCAAAIIIIAAAggggEDdAtls9jnGmOtF5Cl1N2EhAggg0FyBsjHm3a7rFuPwZnlzKejeToFsNnugZVmVx5bt2c4c7I0AAg0ReKHrut9vSKcmNmnbAawlS5bMnj9//t9F5ElNnI/WCCDQGoHLPM87vzVbsUvSBfL5/DtEZI2ItO3PqKQbMx8CCCAQEwG7UCj4MclKTAQQQAABBBBAAAEEEECg6QJnn332sZlM5jpjzIKmb8YGCCCAwMwFPj937txz165du23mreiAQH0C2Wz2fMuyPlbfalYhgEBUBIwxl5ZKpcp7yJF+te3N7e7u7ldblvWlSOsQDgEEwgjcvO+++y5es2bN9jDF1CCwCwEzMDAwYoy5ACUEEEAAgdQL3Llt27anXXbZZROplwAAAQQQQAABBBBAAAEEEBCR7u7ukyzLupq7ePDlgAACMRP4uaq+2vf9P8UsN3ETIjA0NGTdeuutN4rICQkZiTEQSKvA3yYmJhaOj4+XowzQtgNY2Wx2zBizNMo4ZEMAgaoCU9PT0y+88sorf1y1kgIEdiGwYsWK2XPmzBk1xrweKAQQQAABBIIgGB4ZGVmFBAIIIIAAAggggAACCCCAgIjjOKep6riIzMEDAQQQiKHAXUEQvG5sbKxyCIYXAi0XyOVyR6jqz0Wks+WbsyECCDRS4BTXdTc2smGje7XlAFZfX9+cO++88w5V3aPRA9EPAQRaKrDK87zhlu7IZokTGBoa2mP79u1XicjLEjccAyGAAAII1CtwZKFQ+HW9i1mHAAIIIIAAAggggAACCCRFwLbts0WkJCIdSZmJORBAIH0CxpjKXc7f4rru59I3PRNHQSCXy31QVd8ThSxkQACB+gRU9T89z3tLfatbs6otB7ByuVxXEASfb82I7IIAAs0QMMZ8b2Ji4uSo3+avGbPTs3EC/f39+1mWda2IHNO4rnRCAAEEEIi5wE8LhcLimM9AfAQQQAABBBBAAAEEEEBgxgKO45ylqhtEZNaMm9EAAQQQiIbApYsWLeobGhoKohGHFGkRWLJkyewFCxb8UkQOTcvMzIlAAgXu2rJly/4bN26cjupsbTmA5TjO51W1K6oo5EIAgaoC96nq0Tyzu6oTBbsQGBwcPFhVvy4izwQKAQQQQACBxwhcUCgUPoIIAggggAACCCCAAAIIIJBmAdu2XyciYxy+SvNXAbMjkFiBKzs6OnrXr1//UGInZLBICpxzzjkvK5fLlfeleCGAQEwFMpnMy6+44or/imr8lh/AyuVyc4Mg+LuIzI0qCrkQQGDXAqp6ru/763FCoF6BwcHBY1X1GhHZp94erEMAAQQQSKRAWVWfXiwW/5rI6RgKAQQQQAABBBBAAAEEEAghkMvlXhsEQeXOVzx2MIQXJQggEEuB/7Ys61WlUumOWKYndGwFHMe5UkReH9sBCI5AygWMMetKpdIbosrQjgNYS4MgqHxqgxcCCMRQwBhzreu6p8UwOpEjIpDP548XketEZK+IRCIGAggggEB0BL5ZKBROjU4ckiCAAAIIIIAAAggggAACrRXo7u5+tWVZn+fwVWvd2Q0BBFovYIz5vWVZrxwdHf1t63dnx7QK9Pb27jc9PX2ziOydVgPmRiDmAvfefffd+1133XUTUZyj5QewHMcZV9XKrXN5IYBA/ATuK5fLR23YsOEv8YtO4igI9Pf3v9CyrMrhqz2jkIcMCCCAAALRElDVZcVi8XPRSkUaBBBAAAEEoipQ+bGeRjUcuRBAAAEE6hDo6ek5NQiCr6nq7DqWswQBBBCIo8A/MpnM6aOjoz+IY3gyx1PAtu0VxphL45me1AggYIw5s1QqXR1FiZYewFqyZMns+fPn38kb71H8UiATAqEEej3PuyJUJUUI7CDQ399/omVZ14rIHuAggAACCCCwE4GHRGS/QqFwHzoIIIAAAggggAACCCCAQNoEbNs+zhhzg6rG/mdnlePBLX3zKW1fLMyLQPIEHhSRLs/zKh/e5oVA0wW6uroys2fP/pGI/HvTN2MDBBBohoDnuq7TjMYz7dnS74Ft2z5dRCJ5Em2mkKxHIAUC13ieV/lvmBcCNQvk8/kTRKRy+Io7X9WsxwIEEEAgHQKqek2xWOR7jXRcbqZEAAEEEEAAAQQQQACBxwjYtn2UiGwUkfnAIIAAAikVmBaRN3mety6l8zN2iwV6enpeEATBTZwZbjE82yHQGIEHZs2ate/69esrH+qO1KulB7Cy2exnjDHnRUqAMAggEEbg3kwmc+To6OjWMMXUIPBYAe58xdcDAggggEAYAVV9W7FY/GSYWmoQQAABBBBAAAEEEEAAgaQI9PT0HFoul78jIk9JykzMgQACCNQpoKp6ge/7a+pczzIEahJwHKckIpG8i05Ng1CMQAoFjDGnlUqlys0/IvVq2QGsyq38Ojs7/yoi+0ZKgDAIIBBGgEcPhlGi5nECHL7iiwIBBBBAIKyAMeag4eHhP4atpw4BBBBAAAEEEEAAAQQQiLvAsmXLDpiYmPi+iBwY91nIjwACCDRKwBjzQdd139eofvRB4IkEent795uenr5FRPZCCQEE4iVgWdblo6Ojb4xa6pYdwHIc50RVrXyKgxcCCMRIQFW/7vv+K2IUmagREcjn8y8SkWtEZI+IRCIGAggggEBEBVT118Vi8ciIxiMWAggggAACCCCAAAIIINBwgWXLlu05MTFRec/kOQ1vTkMEEEAg5gLGmDWu614gIhrzUYgfcQHbtgeNMasjHpN4CCCwg4Ax5o6HHnrogPHx8XKUcFp5AOsjqtoXpeHJggACVQW2qepRvu/fVrWSAgQeI9Df33+SMeYaY8xcYBBAAAEEEKgmoKojxWJxoFodv44AAggggAACCCCAAAIIJEFg8eLFHYcddtjVxpiXJ2EeZkAAAQSaIWBZ1mcOOeSQNw8NDQXN6E9PBCoCXV1dnbvtttsvVfUwRBBAIHYCL3Jd97tRSt2yA1i2bf9eRA6O0vBkQQCBXQsYYwZc1x3BCYFaBFauXHlqJpP5qojMqWUdtQgggAAC6RUwxpwyPDy8Mb0CTI4AAggggAACCCCAAAIpEjDZbPazxphzUzQzoyKAAAJ1CajqhltuuaVn06ZNU3U1YBECIQTOOeecl5XL5a+HKKUEAQSiJVC5W+K7ohSpJQewuru7n21Z1i+iNDhZEECgqsDPt27deuzGjRunq1ZSgMAjAoODg8eq6rd47CBfEggggAACNQjcf8899zx57dq1/CCtBjRKEUAAAQQQQAABBBBAIJ4CjuMMqer745me1DMWqDxMrSXvzM04KQ0QiIyAql51yy23dHMIKzKXJJFBHMe5VkSWJHI4hkIgoQKq+kfP8w6K0ngt+TaPv1BE6ZKTBYFQAkEmkzlhdHT0B6GqKUJARFatWnV4EASV2zw+GRAEEEAAAQRqEPhyoVB4TQ31lCKAAAIIIIAAAggggAACsRTIZrO2MabEEZxYXj5CI4BAewW+uHnz5qUcwmrvRUjy7rlc7ghV/aWIzErynMyGQNIEpqen/33Dhg0/i8pcLTmAZdv2z0Xk6KgMTQ4EENi1gKp+zPf9d+KEQFiBvr6+p86ePfsmVT0w7BrqEEAAAQQQeEQgXygUimgggAACCCCAAAIIIIAAAkkW6O7ufrFlWdeJSGeS52Q2BBBAoIkCHMJqIi6tRRzH+bSILMcCAQRiJfBB13XfF5XETT+AtXTp0mdkMpk/RGVgciCAQFWBv8yePfvf1q1b90DVSgoQ+J87Xy0IguA7IvIsQBBAAAEEEKhD4KRCoVD5c4QXAggggAACCCCAAAIIINAkgcpbIZVnv7XntXTp0mMymcyNIrJnexKwKwIIIJAMAR5HmIzrGNUpcrncvqr6OxHZK6oZyYUAAo8T+JXrukdFxaXpB7Bs214hIpdGZWByIIDArgWCIHjN2NjYl3FCIIzA0NDQ7tu2bbvBGHN8mHpqEEAAAQQQ2EFgulwu733xxRc/iAwCCCCAAAIIIIAAAgggkESBbDZbuWP8940xByRxPmZCAAEEWi1gjPnCli1bujdu3Djd6r3ZL/kC2Wz2PZZlfTD5kzIhAokSONx13VuiMFHTD2Bls9nrjTEvj8KwZEAAgV0LqOoNvu+/DCcEwggsX768Y++99/6KMWZJmHpqEEAAAQQQ2FEgCIJNIyMjz0UGAQQQQAABBBBAAAEEEEiiQFdX15M6Ozu/KyKR+VR+Ep2ZCQEEUingLlq06JyhoaEgldMzdNME+vr65tx5552bReTpTduExggg0FABY0y+VCoVG9q0zmZNPYC1fPny3R988MG7RWS3OvOxDAEEWiRgjJmwLOvZo6Ojv23RlmwTbwGTz+fXi0hPvMcgPQIIIIBAOwWCIPjEyMjI29uZgb0RQAABBBBAAAEEEEAAgfoEdv1Yw97e3t2mp6evV9WT6uvPKgQQQACBKgL/6XneW9v6jFkuUSIFbNs+xxhTeQ+MFwIIxEBAVX/geV4kntbU1ANY3d3dZ1iW9dUYXBMiIoCAyGrP8y4EAoEwAvl8fo2IvDNMLTUIIIAAAgjsQiBXKBRchBBAAAEEEEAAAQQQQACBJAl0dXVlOjo6rjTGnJWkuZgFAQQQiJqAqn7M933eq4jahYl5nqGhIevWW2/9qYgcHfNRiI9AWgTK5XJ5v7GxsbvaPXBTD2DZtv0pEXlzu4dkfwQQqCqwZXJy8ojx8fF/Vq2kIPUC+Xz+PSLC869T/5UAAAIIIDBzgSAIDh0ZGfndzDvRAQEEEEAAAQQQQAABBBCIjIDJ5XKXB0GwLDKJCIIAAggkW+D9nud9INkjMl2rBWzbPt0Yc3Wr92U/BBCoT0BVc57ntf3D3s0+gPUnno9a3xcIqxBopYBlWa8vlUrjrdyTveIpMDg4eJaqVr5WmvrnRzx1SI0AAgggUKPAQ7fddtse4+Pj5RrXUY4AAggggAACCCCAAAIIRFbAtu1LRWRFZAMSDAEEEEimwPme512WzNGYql0CjuNsFBEeJdyuC8C+CNQmsMF13e7aljS+umlvoNu2fZSI/LLxkemIAAKNFFDVb/m+/5JG9qRXMgUGBwePCYLgu8aYucmckKkQQAABBFos8P8KhcKzW7wn2yGAAAIIIIAAAggggAACTRNwHOcDqvrepm1AYwQQQACBJxJQVT3H9/0SRAg0SqCnp+eEyvtijepHHwQQaKrAfTfffPM+mzZtmmrqLlWaN+0AluM4eVUdbudw7I0AAlUFpivPL/Y87zdVKylItcCFF164f7lc/pGILEw1BMMjgAACCDRS4KpCofC6RjakFwIIIIAAAggggAACCCDQLgHbtt8pImvatT/7IoAAAmkXMMZMlMvlV46NjX0r7RbM3zgBx3GuE5FXNK4jnRBAoFkCQRCc5Pv+d5rVP0zfph3Asm37RhF5UZgQ1CCAQHsEjDEfd12X22G3hz82uw4NDe22ffv2ym1Wnx+b0ARFAAEEEIi8gDFm9fDw8IWRD0pABBBAAAEEEEAAAQQQQKCKgOM456nqWhFp2nsuXAQEEEAAgVACD5TL5ZM2bNjws1DVFCFQRaCnp+fZQRBUvp4ssBBAINoCqlr0PC/fzpRN+ctAb2/v3lNTU3eKyKx2DsfeCCCwS4H7JicnF42Pj1f+W+WFwBMJmHw+74pIFiIEEEAAAQQaKaCqy4rF4uca2ZNeCCCAAAIIIIAAAggggECrBRzHeZOqforDV62WZz8EEEDgCQX+ZlnW8aVS6Q8YIdAIAcdxrhSR1zeiFz0QQKB5Aqr6a8/zjmzeDtU7N+UAlm3bZ4vIhurbU4EAAu0SMMYMuK470q792TceAgMDA+81xnwgHmlJiQACCCAQJ4EgCE4YGRm5KU6ZyYoAAggggAACCCCAAAIIPFbAtu1lIvIZ7orB1wUCCCAQOYHNqnq87/v3RC4ZgWIn0Nvbe/j09PSvRCQTu/AERiBlAtPT0wdt2LDhj+0auykHsLLZ7BXGmJ52DcW+CCBQVeCPHR0dR6xfv/6hqpUUpFZg5cqVr8lkMl/gB0ip/RJgcAQQQKCpApZl7bt69WruxNlUZZojgAACCCCAAAIIIIBAswQcxzlXVS/nZ2fNEqYvAgggMDMBY8yNExMTLxsfH5+cWSdWIyDiOE7laTE2FgggEG0BVX2b53mfbFfKZhzAMrZt3y4iT2nXUOyLAAK7FrAsq7tUKnGXOr5QnlBgcHDwmCAIvmuMmQsTAggggAACTRB4oFAo7NWEvrREAAEEEEAAAQQQQAABBJouwJ2vmk7MBggggEBDBIwxn3Vd97yGNKNJqgWy2ewiy7Ju5i5Yqf4yYPh4CFzruu5p7Yra8ANYjuMcrao/b9dA7IsAAlUFfuh53gtERKtWUpBKgQsvvPAp09PTPzbGPC2VAAyNAAIIINB0AVW9rVgsHtL0jdgAAQQQQAABBBBAAAEEEGiwgOM4b1LVyqfqrQa3pl0cBSo/ZW/4O21xhCAzAtEVMMYMuq5biG5CksVFIJfLeaqajUteciKQUoHtu++++5PXrl27rR3zN/zbQsdx3qWql7RjGPZEAIGqAmqMOcF13e9XraQglQJdXV2Zgw8++Osi8pJUAjA0AggggEBLBFT1J8Vi8diWbMYmCCCAAAIIIIAAAggggECDBGzbHhCRYY7cNAiUNggggEBrBAJjzOtd172qNduxS1IFent7D5+env4Vd8FK6hVmrgQJnO667jXtmKfhB7Bs275ORF7RjmHYEwEEqgp80fO8s6pWUZBagcHBwQ+r6qrUAjA4AggggECrBL5eKBT4O0OrtNkHAQQQQAABBBBAAAEEZizgOE5eVSuHr3ghgAACCMRPYLuqnuj7/qb4RSdxlAQcx/FFpDtKmciCAAL/KmCMubRUKr2jHS4NPYDV1dXV2dnZ+Q8RmduOYdgTAQR2KVAWkWd7nvcbnBDYmUA+n18iIl/j9ul8fSCAAAIItEDALxQKdgv2YQsEEEAAAQQQQAABBBBAYKYCxnGcS1S1b6aNWI8AAggg0FaBP01OTh47Pj5+Z1tTsHmsBXp6eg4NgqDyXmsm1oMQHoFkC9zsuu6z2jFiQw9gdXd3n2RZ1sZ2DMKeCCCwa4EgCK4YGxvrxQmBnQkMDAwsNMb8TESejBACCCCAAAItELisUCic34J92AIBBBBAAAEEEEAAAQQQqFvg5JNPnnXAAQesNcacW3cTFiKAAAIIREng25s3b375pk2bpqIUiizxEnAcZ0xElsYrNWkRSJeAqj7N87wtrZ66oQewbNv+DxF5d6uHYD8EEKgqMKmqR/i+f1vVSgpSJzA0NDRr+/bt3xaRE1I3PAMjgAACCLRFwBhz0fDw8FBbNmdTBBBAAAEEEEAAAQQQQCCEQC6XmxsEwQYROT1EOSUIIIAAAvERuMzzPD4YGJ/rFbmkjuMcLSKVmxo09KxF5AYlEAIxFgiC4Fzf99e3eoSG/qZg2/YPROS4Vg/BfgggUFWAbyarEqW3oL+/f8SyrJXpFWByBBBAAIFWCwRBcP7IyMhlrd6X/RBAAAEEEEAAAQQQQACBMAK5XG7fIAi+JiLHhqmnBgEEEEAgXgLGmGWu634uXqlJGyUBx3GuFZElUcpEFgQQ+D8BY4xfKpXsVps07ABWb2/v3lNTU3fxvNNWX0L2Q6CqwINz5sw55PLLL/971UoKUieQz+fPEJGvcEo/dZeegRFAAIG2ClQ+fTIyMtLyT5+0dWg2RwABBBBAAAEEEEAAgVgIZLPZg40x14vIolgEJiQCCCCAQD0CDxljXui67k/rWcwaBHK53EmquhEJBBCIrMBdz3zmM58yNDQUtDJhww5g9fT0vKZcLn+xleHZCwEEQgn8h+d57w1VSVGqBN797nc/bXp6unKL1AWpGpxhEUAAAQTaLqCqTrFY9NoehAAIIIAAAggggAACCCCAwGMEenp6nlcul68WkX2BQQABBBBIvMCfJicn/318fPwfiZ+UAZsi4DjO90TkhU1pTlMEEJixQBAEx/i+//MZN6qhQcMOYNm2/XEReVsNe1OKAALNF7i3o6PjoPXr19/b/K3YIU4Cy5cv79h77703GmOOj1NusiKAAAIIJEPAGLN0eHj4ymRMwxQIIIAAAggggAACCCCQBIFcLrc0CIJ1IjInCfMwAwIIIIBAKIGveJ73GhHRUNUUIfAYAcdxznzkKTO4IIBANAUGF4vqSAAAIABJREFUXNcdaWW0hh3AymaztxhjDm1lePZCAIFdCxhjLnJddwgnBHYUyOfzHxGRPmQQQAABBBBoh4Ax5nXDw8NXtWNv9kQAAQQQQAABBBBAAAEEdhAwjuMMqOpqEWnYeyYoI4AAAgjEQ8AYM+i6biEeaUkZMYHK9xC/FJEjI5aLOAgg8D8CN7iu+7JWYjTkLxNLly59WiaT+XMrg7MXAghUFbhfVZ/h+/49VSspSJXA4ODgi1X1G/xAKVWXnWERQACBSAmo6lnFYpHHl0fqqhAGAQQQQAABBBBAAIH0CeRyublBEIyKyGvTNz0TI4AAAgg8IjCtqi/xff87iCBQq0A2m81ZllX5XoIXAghET+ChffbZZ/6aNWu2typaQw5gVX5jMcbwG0urrhr7IBBO4EOe570nXClVaRFYsWLFXnPnzv2lqh6YlpmZEwEEEEAgegI8gjB614RECCCAAAIIIIAAAgikTaCnp+ep5XL5KyKyOG2zMy8CCCCAwOMEtmQymeeMjo7ejQ0CtQgsXry444gjjrhNRBbWso5aBBBojYBlWS8dHR2t3JikJa9GHcD6jDHmvJYkZhMEEKgqYIz5p2VZz+AbxapUqSvI5/OfFZFlqRucgRFAAAEEoiaQKxQKbtRCkQcBBBBAAAEEEEAAAQTSIdDd3f1iy7LGRGTfdEzMlAgggAACIQS+4nnea0REQ9RSgsCjArlcbpWqfhgSBBCInoCqFj3Py7cqWaMOYN1ijDm0VaHZBwEEdi2gqgXf9wdxQuCxAv39/adblnU1KggggAACCLRbIAiCN4yMjKxrdw72RwABBBBAAAEEEEAAgdQJGMdxzlfVERHpSN30DIwAAgggsEsBVV3h+/7HYUKgFoFsNjvPsqw/i8getayjFgEEWiLwE9d1j23JTiIy4wNYvb29+01NTd3eqsDsgwACVQW2WZZ1UKlUuqNqJQWpEejr65vf0dHxK2PM/qkZmkERQAABBKIs8PZCofCJKAckGwIIIIAAAggggAACCCRLwLbtvUTkcyLy2mRNxjQIIIAAAo0SMMZMTE9Pv2DDhg0/a1RP+qRDIJfLfVxV35aOaZkSgVgJlGfNmvXk9evX39uK1DM+gOU4zutV9cpWhGUPBBCoLqCqH/F9/4LqlVSkSSCfz1duqb40TTMzKwIIIIBAdAVU9cJisbg6uglJhgACCCCAAAIIIIAAAkkSyGazi40x4yJyUJLmYhYEEEAAgaYI3Dx37tznrl27dltTutM0kQLZbHaRZVmbRcRK5IAMhUCMBYwxp5VKpWtbMcKMD2DZtl25DSOnOVtxtdgDgeoCU+Vy+ZANGzb8pXopFWkRGBgYeLUx5ktpmZc5EUAAAQSiLxAEwfDIyMiq6CclIQIIIIAAAggggAACCMRcoPLIwTeq6hoR2T3msxAfAQQQQKB1Apd5nnd+67ZjpyQIOI7zFRE5MwmzMAMCSRJQ1aLneflWzNSIA1j/T0SObEVY9kAAgV0LqOrnfN9fhhMC/yuwatWqfcrlcuXRg/uiggACCCCAQFQEjDGfHB4e5kMcUbkg5EAAAQQQQAABBBBAIIECuVxu3yAI1onIaQkcj5EQQAABBJoroJU/PzzPu66529A9SQKO45wsIt9O0kzMgkBCBH7ouu5xrZhlRgewurq65nd2dt7JrfRacanYA4GqAhoEwVFjY2O/rlpJQWoE+vv7v2xZ1qtSMzCDIoAAAgjERWBDoVDojktYciKAAAIIIIAAAggggEC8BBzHeamqXiEi+8crOWkRQAABBCIksHVycvLZ4+Pj/4hQJqJEXMBxnF+IyLMjHpN4CKRNYLqzs3P+unXrHmj24DM6gJXNZl9ljPlys0PSHwEEQglc43ne6aEqKUqFQH9/f49lWZUfNPFCAAEEEEAgUgJBEGwcGRk5JVKhCIMAAggggAACCCCAAAKxF1i+fPnuDz744LCIvF1EZvT+R+wxGAABBBBAoBECvud5diMa0SMdArlc7s2q+ql0TMuUCMRHIJPJvPyKK674r2YnntFfQBzH+Yiq9jU7JP0RQKC6QBAEJ4+Njd1YvZKKNAj09fVV7lC4WUT2ScO8zIgAAgggEDuBWwqFwuGxS01gBBBAAAEEEEAAAQQQiKyA4zgnqupnRWRRZEMSDAEEEEAgjgJdnud9IY7Bydx6gbe+9a173H///VtE5Emt350dEUBgFwIfdl333c0WmtEBLNu2fyIii5sdkv4IIFBV4Mee5z2vahUFqRHI5/NrReSNqRmYQRFAAAEE4iZwX6FQ2DtuocmLAAIIIIAAAggggAAC0RPo6+ub8/e///39xph+EbGil5BECCCAAAIxF7jLsqx/K5VKd8R8DuK3SCCXy12qqitatB3bIIBAOIHvu677wnCl9VfVfQDLtu29RKTyzNtM/dvHf6VyH+P4X8RkTMDp+2Rcx4ZMMTAwcJwx5iZ+4NQQTpoggAACCDRJoFwu73HxxRc/2KT2tEUAAQQQQAABBBBAAIEUCHR3d59gWdY67nqVgovNiAgggEAbBYwxnuu6ThsjsHWMBHK53BGq+muOEcToohE1DQJTxph5pVKpqe9J1H0AK5fLvTwIguvTcCWYEYGIC9w2OTl56Pj4eDniOYnXAoGurq7MwQcf/GMROaYF27EFAggggAACMxE4slAoVH4QwQsBBBBAAAEEEEAAAQQQqEmgq6trn87OzqKInMObmzXRUYwAAgggUL/AGZ7nfa3+5axMk0Aul/umqr44TTMzKwJRF1DVUz3P+2Yzc9Z9AMtxnCFVfX8zw9EbAQRCCaz0PO+SUJUUJV5gYGDgncaYNYkflAERQAABBGIvEATBGSMjI/zQKvZXkgEQQAABBBBAAAEEEGipgMlmszljTOXnoU9u6c5shgACCCCQdoHbVfXffN+/J+0QzF9dIJfLvVZVr6peSQUCCLRQ4IOu676vmfvVfQDLtu3rROQVzQxHbwQQqCqwTVUX8s1eVadUFPT39+9nWdZmEXlSKgZmSAQQQACBWAuo6juKxeKlsR6C8AgggAACCCCAAAIIINAygaVLlx6TyWQ+JSLPb9mmbIQAAggggMBjBCzL+kypVFoOCgLVBE4++eRZCxcu/LOI7F+tll9HAIGWCdzouu7Jzdyt3gNYxrbtu0VkXjPD0RsBBHYtwDd6fIU8ViCfz4+JyFJUEEAAAQQQiInAxwqFwjtjkpWYCCCAAAIIIIAAAggg0CaB88477ynbt2+/SETOE5FMm2KwLQIIIIAAAhUBFZETPc+7CQ4EqgnYtv1hY8yqanX8OgIItExg+8033/ykTZs2TTVrx7oOYOVyuSOCIPhNs0LRFwEEwgkEQXD02NjYL8NVU5VkgZUrV56ayWRuSPKMzIYAAgggkDiBrxcKBe6om7jLykAIIIAAAggggAACCDRGoKurq3P27NlvUdXK4Svu+N4YVroggAACCMxc4NebN28+pplv4M88Ih2iIJDNZg+2LOt3ImJFIQ8ZEEBAJAiC5/q+v6lZFnUdwHIc51xVXdesUPRFAIHqAsaYpt8ir3oKKqIgMDQ01Pnggw/+wrKsw6OQhwwIIIAAAgiEEVDVvxSLxaeHqaUGAQQQQAABBBBAAAEEUiVgcrnc64IgKIjIQamanGERQAABBOIikPc8rxiXsORsn0Aul/umqr64fQnYGQEEHiugqud7nndZs1TqOoBl2/Z/isibmhWKvgggUF3AGPM613Wvql5JRdIFBgYG3muM+UDS52Q+BBBAAIHECVRu2T6vUCjcl7jJGAgBBBBAAAEEEEAAAQTqEujp6Tm1XC4Pi8jiuhqwCAEEEEAAgdYIbLMs68hSqfSH1mzHLnEVsG07a4zx4pqf3AgkUGDMdd1ss+aq9wDWz0TkOc0KRV8EEKgqsGXr1q0Hbdy4cbpqJQWJFhgYGFhojLlFRHZP9KAMhwACCCCQSAFVfUGxWPzvRA7HUAgggAACCCCAAAIIIBBa4JGDVx8UkeNCL6IQAQQQQACBNgoYY652XffMNkZg6xgILFmyZPaCBQu2iMiTYxCXiAgkXkBV/+h5XtPuslvzAayurq49Ojs77xGRWYnXZ0AEIiqgqkO+718U0XjEaqHAwMDAqDEm18It2QoBBBBAAIFGCry9UCh8opEN6YUAAggggAACCCCAAALxEeju7j4pk8lcpKonxSc1SRFAAAEEEPgfAWPM6a7rXoMHArsSyGazH7Us6x0oIYBANAQ6Ozufum7dur82I03NB7Cy2ewpxphvNSMMPRFAIJRAoKoH+77/p1DVFCVWYHBw8BhV/YmIWIkdksEQQAABBBItoKqlYrHYk+ghGQ4BBBBAAAEEEEAAAQR2FDDd3d2nW5Y1KCLHw4MAAghEU0Arx2uiGY1UkREwxtx69913H3nddddNRCYUQSInYNv2UcaYX0YuGIEQSKmAMeasUqn0xWaMX/N3DrZtrxKRDzcjDD0RQKC6gDHmWtd1T6teSUXSBfL5/DdE5CVJn5P5EEAAAQQSLfC7QqFwaKInZDgEEEAAAQQQQAABBBB4WGDx4sUdhx12WLcxJi8iz4IFAQQQQACBJAgYYwZc1x1JwizM0DwBx3F+JiLPad4OdEYAgRoELnZdt7+G+tCl9RzA+rKIvCr0DhQigEBDBTKZzGtHR0e/1NCmNIudwMDAwGuNMVfFLjiBEUAAAQQQ+FcBnZ6e3veSSy65CxgEEEAAAQQQQAABBBBIpkAul9u3XC6fZ4x5i4gsTOaUTIUAAgggkGKB+zs6Og5bv37931JswOhVBHp6et4VBMElQCGAQCQEbnJd94RmJKnnANbtIrJfM8LQEwEEqgr8bfPmzU/ftGnTVNVKChIrMDQ0NGv79u2/FhHuGJLYq8xgCCCAQKoETi8UCtekamKGRQABBBBAAAEEEEAgBQK5XO655XJ5hWVZZ6vq7BSMzIgIIIAAAukVWO953rnpHZ/JqwlUDqSr6lYRmVWtll9HAIGmC0zcfffdT2rG42NrOoC1dOnSp2UymT83fVw2QACBnQqoasH3/UF40i2Qz+ffKCJr063A9AgggAACSRFQ1Q8Wi8X3JWUe5kAAAQQQQAABBBBAIM0CXV1de3R2dr5eRCo/vzouzRbMjgACCCCQKgFV1WN939+UqqkZtiYBx3GuFZElNS2iGAEEmiJgjDmuVCr9sNHNazqA1d3d/WrLsnj0WaOvAv0QCCdQ+ebtMN/3fxeunKokCgwNDe22bdu23xpjnpbE+ZgJAQQQQCCVAt8oFAovTeXkDI0AAggggAACCCCAQEIEstnsYhFZbozpFpE9EzIWYyCAAAIIIBBawBhzo+u6J4deQGHqBBzHqXyf5KducAZGIIICqtrned5HGx2tpgNYtm1fJCJ8Or3RV4F+CIQQCIJg49jY2CkhSilJsEA+n3+XiPCM6ARfY0ZDAAEEUijwwG233TZvfHy8nMLZGRkBBBBAAAEEEEAAgdgKnH322YfMmjVrqYjkROSw2A5CcAQQQAABBBokYIw53XXdaxrUjjYJE+jr65tz55133i4iT0rYaIyDQOwEjDF+qVSyGx281gNYV4vI6Y0OQT8EEAgl8AbP89aFqqQokQIDAwN7GmN+LyL7JHJAhkIAAQQQSK1AuVw+6uKLL/5VagEYHAEEEEAAAQQQQACBmAj09PQ8NQiC16lql4gcLyI1vccQkzGJiQACCCCAQL0Cm7du3XrUxo0bp+ttwLpkC+Ryuc+q6rJkT8l0CERfwBhzS6lUOrzRSWv6y1E2m91qjDmg0SHohwACVQUempyc3G98fPy+qpUUJFagv7//fZZlVe5EyCsyAsrPGSNzLQiCAAJxFqjc7rdYLDb8dr9xNiE7AggggAACCCCAAAJREejq6nrm7Nmzz1TVV4nICSJiRSUbORBAAAEEEIiagDHmja7rXh61XOSJhkBPT8+pQRDcEI00pEAg1QI6MTFReTJHQ89fhD6A1dvbu9/U1FTllni8EECg9QKf9zzv7NZvy45REcjn85Xbkf5BROZFJRM5EEAAAQQQaKDA1wuFwisa2I9WCCCAAAIIIIAAAgggUKfA0NCQddtttz2/XC6fKSKVf55VZyuWIYAAAgggkDoBVf3rHnvssWjt2rXbUjc8A1cV6OrqysyePXuriDylajEFCCDQVAFjzMmlUunGRm4S+gCW4zinqerXGrk5vRBAIJxAEARnjo2NVR4ByiulAtz9KqUXnrERQACB9AhMzJkz58lDQ0P/TM/ITIoAAggggAACCCCAQHQEKh/ALpfLJwZBcIaqvtIYsyA66UiCAAIIIIBAvASMMQOu647EKzVpWyXgOM4nROStrdqPfRBAYOcCqrrS87xLGukT+gBWNpt9jzHmg43cnF4IIBBK4K7NmzcfsGnTpqlQ1RQlTmDFihV77b777pW7X81P3HAMhAACCCCAwP8JnF4oFK4BBAEEEEAAAQQQQAABBJovsGzZsgMmJiZOFJHKP6eKyGHN35UdEEAAAQQQSI3AXSJyiOd596dmYgYNLZDNZl9kWVZD77oTenMKEUDgsQJjrutmG0kS+gBWd3f3Fy3Lek0jN6cXAgiEEvik53lvC1VJUSIFBgYG3muM+UAih2MoBBBAAAEEHhEIguATIyMjbwcEgbQLVP6SrmlHYH4EEEAAAQQQaKhA5ZGCv//97w9T1eNU9UXGmBNV9ZCGbkIzBBBAAAEEENhR4P2e5/HeDl8XjxOofG926623/llEngoPAgi0VeC3rus29IMooQ9g2bZdufvKM9o6PpsjkEKBTCZz/Ojo6A9SODojiwh3v+LLAAEEEEAgLQKq+odisXhwWuZlTgQQQAABBBBAAAEEmiXQ09PzdFV9brlcfp4x5nkislhE9mrWfvRFAAEEEEAAgZ0K3Dc5OXnw+Pj4P/BBYEeBXC63RlXfiQwCCLRVQGfNmjV//fr19zYqRagDWD09PQvK5XLlVom8EECgtQJ/8Dyv8mk0PgTfWvfI7JbP5wdFZHVkAhEEAQQQQACBJgqo6uHFYvGWJm5BawQQQAABBBBAAAEEEiOwbNmyPaempp6lqkeLyFGq+mwRqfyzd2KGZBAEEEAAAQTiLbDa87wL4z0C6ZshYNv2ccYYbsDRDFx6IlCbwCmu626sbckTV4c9gHVquVy+oVGb0gcBBEILjHieNxC6msJECaxYsWL27rvvfpuIHJCowRgGAQQQQACBJxAwxrxreHh4DUAIIIAAAggggAACCCDwPwJ9fX1z7rnnngPL5fKBlQ8sPPLPocaYyqMyeGwNXygIIIAAAghEW+CBTCZz0Ojo6N3Rjkm6NggYx3H+KCJPb8PebIkAAv8n0O+67sWNAgl1AMu27coBkEKjNqUPAgiEE8hkMs8fHR39UbhqqpImkM/n3ygia5M2F/MggAACCCCwC4EbCoXCyxBCAAEEEEAAAQQQQCAlApU33vZT1QMty3qaqlb+qRy0qrwR9/RH/t0+KbFgTAQQQAABBJIq8AHP896f1OGYq36BXC73MVU9v/4OrEQAgQYIbHBdt7sBfR5uEfYAVklEnEZtSh8EEAgl8GfP857B4wdDWSWuaGhoyNq+ffuvROSIxA3HQAgggAACCDyxwJRlWfuvXr2aTwUm6Kskl8tVvp85shkjBUGwpzFmVjN619Gz8vfryDzuJwiCThGZW8ccTVliWdbcRzI1pf+OTY0xLfvaUNUniYjVksFE5rViH2OM9chcrdiu8t/wnq3YKEF7TIjItibNc0+T+lbyVnLP6BUEwbZMJrPLPkEQlEXk/hAb/VNEpnZVZ4yZMsZU6nb5CoLgfsuyKvs+4UtVJyzLqnrdVPVey7L0iRqVy+XtqvrQDr++05lnzZp13/T0dPDY2s7Ozu3r16/fcX21Efn1kAK5XG6uMWbB5OTkgkwms0/lf6vqfBFZUPnnkf//4f8tIvuKyP4iUvkzmxcCCCCAAAIIJFfgXhE50PO8MN+jJleByR4n4DjOySLybWgQQKCtAr9zXffQRiUIewDrZyLynEZtSh8EEKguYIxZ47ruu6pXUpFEgcHBwbNU9QuNma3yc9tQv903Zju6IIAAAgggMAMBY8ybhoeHuQPkDAyjttRxnH5VLUYtF3kQQAABBBBA4FGBJzq0VnmTcMeDZdtFJNQBsMpBOGPMv6yvHB5T1UqPR1+Vw2uVQ2w7uR47O9hW2ftf1u+wLjDG3Bfi2u6lqpkd6vYQkY7//XeqOktVKwd6d1fV2caYvVW10xizh6pWDjk//O8q/1dEdn/kMGlUDoaHIKAEAQQQQAABBFoloKrv9n3/w63aj33iIXDyySfPWrhw4e0i8uR4JCYlAokUUFXdu1GHZKu+I//If/j/rPwlM5GcDIVAVYH2HF7JZDLHj46O/qBqPAoSKTAwMPB9Y8wLEjkcQyGAAAIIILALgSAINo6MjJwCUnIEstns240xlyVnIiZBAAEEEEAAAQQQQAABBBBAAAEEwguo6t1TU1PPGB8fr3p31fBdqUyCQDabXWdZ1rlJmIUZEIirgKqe4HneTY3IX/UAVm9v7+FTU1M3N2IzeiCAQGiBrYsWLXr60NDQv9wmPvRqCmMtMDAw8FxjzI9jPQThEUAAAQQQqF8gUNUDi8XilvpbsDJKAo7jnKuq66KUiSxxFGjPB2PiKEVmBBBAAAEEEEAAAQQQQACBSAr0eZ730UgmI1TbBHK53Bmq+tW2BWBjBBAQY8xbSqXSfzaCouoBrFwu1xUEwecbsRk9EEAgnICqfsz3/XeGq6YqaQIDAwO+MaY7aXMxDwIIIIAAAmEFjDErh4eHLwlbT120BXK53NIgCMainZJ0CCCAAAIIIIAAAggggAACCCCAQFMFtmzevPngTZs2TTV1F5rHSmDJkiWzFyxYcOcjj7OOVXbCIpAggU+6rvu2RsxT9QCW4zhDqvr+RmxGDwQQCCegqi/2ff/b4aqpSpLAwMDAAcaYP4hIZ5LmYhYEEEAAAQRqEQiCYNPIyMhza1lDbXQFHMc5U1W/Et2EJEMAAQQQQAABBBBAAAEEEEAAAQSaL2CMybquy4fUmk8dqx0cxxkXkdfFKjRhEUiWwPdc1z2xESNVPYBl2/ZVIvLaRmxGDwQQCCVw3+bNm/fhBHwoq8QVDQ4O/oeqvjtxgzEQAggggAACNQqo6rOKxSKPQq/RLYrlPT09p5bL5RuimI1MCCCAAAIIIIAAAggggAACCCCAQAsFfuF53jEioi3ck60iLmDb9jnGmPURj0k8BJIscL/runs34vfmqgewstnsLcaYQ5OsyWwIREzgSs/zlkYsE3FaIDA0NLTb9u3b/ywi+7RgO7ZAAAEEEEAg0gLGmIuGh4eHIh2ScKEEHMc5XlVvClVMEQIIIIAAAggggAACCCCAAAIIIJBggSAIXjI2NvatBI/IaDUKdHV17TN79uy/iYhV41LKEUCgQQLT09MHbdiw4Y8zbbfLA1i9vb27TU1N/VNEMjPdiPUIIBBOQFXP8X1/NFw1VUkSyOfzjoiUkjQTsyCAAAIIIDADgVsLhcKiGaxnaUQEHMc5WlV/HpE4xEAAAQQQQAABBBBAAAEEEEAAAQTaKXCd53mvbGcA9o6eQC6X+6GqPi96yUiEQDoEjDFnlkqlq2c67S4PYDmO8++qummmm7AeAQRCCwSWZe1fKpXuCL2CwsQI5PP574rICYkZiEEQQAABBBCYoYCqHlssFn8ywzYsb7NANptdZIz5bZtjsD0CCCCAAAIIIIAAAggggAACCCAQBQHt6Oh41vr16zdHIQwZoiFg2/b7Kk8EiEYaUiCQPgFVfY/neR+a6eS7PICVzWZ7jDFXzHQT1iOAQGiB73ue98LQ1RQmRmBgYOAIY8yvRaTqo2ETMzSDIIAAAgggUF3go4VCoa962SMVlT9FNXQ1hS0S6OnpeWq5XN7Sou3YBgEEEEAAAQQQQAABBBBAAAEEEIi6wKWe570j6iHJ1zqBbDa72LIsPojaOnJ2SoNADe8XqOqVnuctnSnLLt/ot227KCL9M92E9QggEE5AVd/t+/6Hw1VTlSSBfD5/qYisSNJMzIIAAggggMBMBVT1jnvvvXfh2rVrp2bai/XtE8hms/OMMf9oXwJ2RgABBBBAAAEEEEAAAQQQQAABBCIl8ICILPQ87/5IpSJMOwWM4ziVDzAe0M4Q7I1AigVudl33WTOdv9ojCK9RVZ5BO1Nl1iMQUsAY8xzXdX8RspyyhAj09fXN6ezs3Coi8xIyEmMggAACCCDQMAHLsk5bvXr1tQ1rSKOWCyxZsmT2/PnzH2r5xmyIAAIIIIAAAggggAACCCCAAAIIRFfg7Z7nfSK68UjWaoFcLvdZVV3W6n3ZDwEEHhYo77PPPnuuWbNm+0w8qh3AulVVD5nJBqxFAIHQAn/zPK9yqpkH54QmS0Zhf39/j2VZPO41GZeTKRBAAAEEGixQufVvsVic8a1/GxyLdrUJGNu2yzxquTY0qhFAAAEEEEAAAQQQQAABBBBAILkCqvpb3/cP533B5F7jWidzHOcsEflCreuoRwCBhgksdl33pzPp9oQHsLq6ujo7OzsfFJFZM9mAtQggEFrA9TwvF7qawsQI9Pf3f9uyrJMTMxCDIIAAAggg0FiBhyYmJvb/6Ec/em9j2zawWw3Pkm/grrFq5TjOQ6o6O1ahCYsAAggggAACCCCAAAIIIIAAAgg0USAIgpeMjY19q4lb0DpGAr29vXtPT0/fJSKZGMUmKgJJEnBc1/VmMtATHsDK5XJHBEHwm5k0Zy0CCNQk0Ot5HndBqoks/sUXXHDBgbNmzbpNRKz4T8MECCCAAAIINEdAVc8rFoufbU53urZCwHGcB1R1j1bsxR4IIIAAAggggAACCCCAAAIIIIBAHARUdYPv+91xyErG1gjYtv0jY8yxrdmNXRBAYAeBD7qu+74tFsdFAAAgAElEQVSZqDzhAaxsNvsqY8yXZ9KctQggUJPA0zzP21LTCopjL9Df3/8+y7Iuiv0gDIAAAggggEATBYIg2DgyMnJKE7egdZMFstnsXcaYBU3ehvYIIIAAAggggAACCCCAAAIIIIBAnAQmJycnF46Pj98Zp9BkbZ6A4zgfEpELm7cDnRFAYBcC467rvn4mQk94AMtxnH5VLc6kOWsRQCC0wG88z/u30NUUJkXA5PP534nIIUkZiDkQQAABBBBokkAwOTn59DVr1mxtUn/aNlkgm81uNcYc0ORtaI8AAggggAACCCCAAAIIIIAAAgjETWCl53mXxC00eZsjkM1mT7Esi8dSNoeXrghUE/iV67pHVSva1a/v6g5YnzHGnDeT5qxFAIHQApd6nveO0NUUJkKgv7//RMuyvpOIYRgCAQQQQACBJgsEQXD+yMjIZU3ehvZNErBtu/LI5YOa1J62CCCAAAIIIIAAAggggAACCCCAQFwFbvE87wgR0bgOQO7GCXR1dXXOnj37HyIyt3Fd6YQAAiEFJrds2TJ348aN0yHrH1f2hAewbNu+UUReVG9j1iGAQHiBIAjOHBsbuzr8CiqTIDAwMPBpY8zyJMzCDAgggAACCDRbQFVvKhaLJzR7H/o3R8C27d+ISOWHibwQQAABBBBAAAEEEEAAAQQQQAABBB4joKon+b7PB/b5qnhYwHGc60TkFXAggEBbBBa5rntrvTvv6gDW7SKyX72NWYcAAqEFKicoF3ied3/oFRTGXmD58uUd8+bNq/w+uyD2wzAAAggggAACrRHQ6enpgy655JI/tWY7dmmkgG3bPxeRoxvZk14IIIAAAggggAACCCCAAAIIIIBAEgRU9XO+7y9LwizMMHMB27YvMMZcPPNOdEAAgVoFVPUMz/O+Vuu6/63f6QGsZcuW7TkxMcFhkHpVWYdADQKq+hPf94+tYQmlCRBYtWrVK4MguCYBozACAggggAACrRS4oFAofKSVG7JXYwRs2/6RiPA9b2M46YIAAggggAACCCCAAAIIIIAAAskSuH/u3Ln7r127dluyxmKaegSWLl16zKxZs35az1rWIIDAjAX6Xdet+wDkTg9g5XK55wZB8OMZR6MBAghUFTDGrHFd911VCylIlMDAwMCoMSaXqKEYBgEEEEAAgeYL/LBQKBzX/G3YodECjuN8V1V5hGSjYemHAAIIIIAAAggggAACCCCAAAKJEDDGZF3XHUvEMAwxI4GhoSHr1ltvvVtE9p5RIxYjgEDNApZlXT46OvrGmhc+smCnB7Bs286KiFdvU9YhgEB4AWPM61zXvSr8CirjLjA0NLTb9u3b/y4ie8V9FvIjgAACCCDQYgEVkWcUCoU/t3hftpuhgG3bN4jIqTNsw3IEEEAAAQQQQAABBBBAAAEEEEAgqQLXe563JKnDMVdtArlc7mpVPb22VVQjgEADBL7nuu6J9fbZ6QEsx3GGVPX99TZlHQIIhBcwxhzguu7t4VdQGXeBlStXviaTyXwx7nOQHwEEEEAAgXYIqOqKYrH48XbszZ71C9i2fZ2IvKL+DqxEAAEEEEAAAQQQQAABBBBAAAEEEi1Q7ujoWLh+/fq/JXpKhgsl4DjOShEZCVUslSMflc+t8kIAgQYI3O267pPr7fNEd8Cq3P2qchcsXggg0FyB33med2hzt6B71AQGBwddVbWjlos8CCCAAAIIxETgG4VC4aUxyUrMRwRs275aRPjUHl8RCCCAAAIIIIAAAggggAACCCAQW4HKEZedvrneoIlU9V2+769pUDvaxFigt7f32Onp6R/FeASiIxBbgXK5vM/Y2Nhd9QzwRAewbhKR4+tpyBoEEAgvYFnWulKp9IbwK6iMu8Dy5cs75s2bV3n84Ly4z0J+BBBAAAEE2iQwZYx5yvDw8D1t2p9t6xCwbfvLIvKqOpayBAEEEEAAAQQQQAABBBBAAAEEEEiLwI88z3t+WoZlzicWOPnkk2ctXLjwbhHZCycEEGitgKqe4Hle5cxUza+dHsDKZrNbK49Fq7kbCxBAoFaBN3iet67WRdTHV2BgYOClxpj/iu8EJEcAAQQQQCASAnahUPAjkYQQoQRs275KRF4bqpgiBBBAAAEEEEAAAQQQQAABBBBAIKUC09PTz7zyyit/n9LxGfsxAo7jXCcirwAFAQRaKxAEQY/v+6V6dn3cAaze3t7dpqamHhQRq56GrEEAgfACxpjDXde9JfwKKuMukM/nPykib4n7HORHAAEEEECgnQKq+vlisXh2OzOwd20Ctm1fKSKvr20V1QgggAACCCCAAAIIIIAAAggggEDqBPKe5xVTNzUDP07Atu1BY8xqaBBAoLUCQRAM+b5/UT27Pu4AluM4h6nq5nqasQYBBGoSuM/zvMpj6CqPjOaVDgGTz+f/IiJPTce4TIkAAggggEDTBB7Ytm3bPpdddtlE03agcUMFbNuu3LGsu6FNaYYAAggggAACCCCAAAIIIIAAAggkTEBVf+r7/uKEjcU4dQhks9kXWZZ1Yx1LWYIAAjMQCIJg1Pf9c+pp8bgDWLlc7uVBEFxfTzPWIIBATQLf8DzvpTWtoDjWAoODg8eq6o9iPQThEUAAAQQQiIiAqr6sWCzeEJE4xKgiYNt25ZbNDlAIIIAAAggggAACCCCAAAIIIIAAArsWUNVDfd//HU7pFujr65tz55133iciHemWYHoEWi7wPdd1T6xn153dAWu5qn66nmasQQCBmgSGPc9bVdMKimMt0N/f/z7Lsuq6XWGsByc8AggggAACTRBQ1UuKxeLKJrSmZRMEbNv+nIj0NqE1LRFAAAEEEEAAAQQQQAABBBBAAIGkCazyPG84aUMxT+0CjuNsEpF/r30lKxBAYAYCt7uue0A96x93AMu27Q+LCIdC6tFkDQI1CFiWdVapVPpiDUsojblAPp//gYgcF/MxiI8AAggggEBUBH5TKBT+LSphyLFrAcdxLlfVN+CEAAIIIIAAAggggAACCCCAAAIIIFBV4L89z3tB1SoKEi+Qy+U+rqpvS/ygDIhAtAR0991332Pt2rXbao21swNYvoh019qIegQQqE2gXC4/fcOGDX+pbRXVcRXo6+ub39nZeYeIZOI6A7kRQAABBBCImsD09PQzLrnkkj9FLRd5Hi+QzWY/bYxZjg0CsRdQEXncT1JiPxUDIIAAAggggAACCCCAAAIIREtAM5nM00ZHR7dGKxZpWi3gOI4tIm6r92U/BNIukMlkjrziiit+XavDzg5gcYeWWhWpR6B2gb97nrdf7ctYEVeB/v7+bsuyKgdceSGAAAIIIIBAgwSMMW8aHh5e26B2tGmigOM4n1TVtzRxC1ojgAACCCCAAAIIIIAAAggggAACiREwxrzZdd1PJ2YgBqlLIJvNHmxZ1u/rWswiBBCoW8AYc2apVLq61gY7O4D1VxHZv9ZG1COAQE0C13ied3pNKyiOtcDAwMCoMSYX6yEIjwACCCCAQBsEqtxs5kuFQuG1bYjFljUKOI5zmaq+vcZllCOAAAIIIIAAAggggAACCCCAAAJpFbjO87xXpnV45v4/AcdxbhcRbuzBFwUCLRRQ1T7P8z5a65b/cgCrt7d3t6mpqcpzDCN7Q33u9l/rJaY+igLGmItc1x2KYjYyNUXADAwMbDXGcLi1Kbw0RQABBBBIscAD99xzz4K1a9dOpdggFqPbtn2piKyIRVhCIoAAAggggAACCCCAAAIIIIAAAm0WMMZMdHZ27rNu3boH2hyF7dss4DjOV0XkjDbHYHsEUiVgjLmsVCqdX+vQOx7AOnxqaurmWptQjwACtQlYlnVWqVT6Ym2rqI6rwKpVq54VBEHNz4iN67zkRgABBBBAoMUCLywUCt9v8Z5sV6MAB7BqBKMcAQQQQAABBBBAAAEEEEAAAQRSL5DJZF47Ojr6pdRDpBwgm82+37IsbuyR8q8Dxm+5wDWu69b8RLN/OYBl2/bLROTrLY/OhgikTCCTyRw2Ojr625SNndpx+/v7V1iWVbnrAy8EEEAAAQQQaLCAqr6nWCx+qMFtaddgAQ5gNRiUdggggAACCCCAAAIIIIAAAgggkHgBy7I+UyqVlid+UAbcpYBt26cbY66GCYGGClROClUeP8drpwLGmM2lUumIWnl2PIC1TEQ+W2sT6hFAoCaB7ZOTk3uOj4+Xa1pFcWwF8vl85W5nr4ntAARHAAEEEEAg2gLfLBQKp0Y7Iuk4gMXXAAIIIIAAAggggAACCCCAAAIIIFCzwBbP855W8yoWJEqgt7d3v+np6dsTNRTDIBB9gW2u686tNea/HMDKZrPvNcZ8oNYm1COAQHgBVf2J7/vHhl9BZZwFurq6MgcffPAdIjI/znOQHQEEEEAAgQgLPDRnzpx5Q0NDD0U4Y+qjcQAr9V8CACCAAAIIIIAAAggggAACCCCAQB0CQRAcOTY29us6lrIkQQKO42wVkQMSNBKjIBB5gYmJiQXj4+P/qCXojnfA+pSIvLmWBtQigEBtAqr6Od/3K3eb45UCgcHBwcWVQ3cpGJUREUAAAQQQaJtAEAQnj4yM3Ni2AGxcVYADWFWJKEAAAQQQQAABBBBAAAEEEEAAAQR2JrDS87xLoEm3gOM4XxWRM9KtwPQItFzgOa7r/qKWXXc8gPVlEXlVLQ2oRQCB2gSMMRe4rvuR2lZRHVeBgYGBdxpj1sQ1P7kRQAABBBCIg4Ax5qLh4eGhOGRNa0bbtj8mIuendX7mRgABBBBAAAEEEEAAAQQQQAABBOoU+IbneS+tcy3LEiKQzWbfb1kWP/9MyPVkjHgIqOoZnud9rZa0Oz6C8MfGmOfW0oBaBBCoTSCTybx0dHT0G7WtojquAvl8/vMi0hXX/ORGAAEEEEAgJgLfKRQKJ8UkaypjcgesVF52hkYAAQQQQAABBBBAAAEEEEAAgZkLbJ+cnNx7fHx8cuat6BBXAdu2TzfGXB3X/ORGII4Cxpi3lEql/6wl+44HsLYaY3h2aC2C1CJQo0DlvzHXdW+vcRnlMRXI5/N/EZGFMY1PbAQQQAABBOIisH3OnDl7Dw0N8YOoiF4x7oAV0QtDLAQQQAABBBBAAAEEEEAAAQRSIKAi8i9visdv5hM8z7spfrFJ3CgB27YXGmMq7znyQgCB1gl82HXdd9ey3aN/1nR1dWU6OzsnRCRTSwNqEUCgJoEHPM/bq6YVFMdWYHBw8Bmq+ofYDkBwBBBAAAEEYiRgWdZxq1ev/mGMIqcqKnfAStXlZlgEEEAAAQQQQAABBBBAAAEEEGiswIWe561ubEu6xU0gl8vdrarz45abvAjEVcAYUyqVSj215H/0ANayZcsOmJiY2FrLYmoRQKBmgU2e5/GYz5rZ4rkgn89nRcSLZ3pSI4AAAgggEC8BY8y7hoeH18QrdXrScgArPdeaSRFAAAEEEEAAAQQQQAABBBBAoOEC13uet6ThXWkYKwHHcb4jIifGKjRhEYi3wEbXdU+pZYRHD2D19PQ8r1wu84nxWvSoRaB2gTHP8yqHcnilQGBgYOAyY8zbUzAqIyKAAAIIINB2AVX9QrFY7Gp7EALsVMC27U+IyFvhQQABBBBAAAEEEEAAAQQQQAABBBCoTcAY888tW7bM27hx43RtK6lOkoDjOPx8LUkXlFniIHCr67qLagn66AGs7u7uV1uW9aVaFlOLAAK1CRhjLnJdd6i2VVTHVSCfz/+3iDw/rvnJjQACCCCAQMwE/looFJ4as8ypiZvNZj9tjFmemoEZFAEEEEAAAQQQQAABBBBAAAEEEGiggGVZx5ZKpZ80sCWtYiaQy+XerKqfills4iIQZ4EJ13XniIiGHeLRA1i2bb9NRD4ediF1CCBQu4CqOr7v80i62ulit2L58uUd8+bNu09EKr8p80IAAQQQQACBFggYYw4aHh7+Ywu2YosaBRzHuVxV31DjMsoRQAABBBBAAAEEEEAAAQQQQAABBP5HYKXneZeAkV4B27ZfaIz5XnoFmByB1gtMTEzsOz4+fmfYnR89gOU4zodU9cKwC6lDAIHaBaanp5935ZVX/rj2layIm0A+nz9aRH4et9zkRQABBBBAIOYC3YVCYUPMZ0hk/O7u7vWWZZ2TyOEYCgEEEEAAAQQQQAABBBBAAAEEEGiyQBAEXx0bG3tVk7ehfYQFbNveyxhzr4g8esYjwnGJhkBSBBa7rvvTsMM8+h9nLpf7bBAEy8IupA4BBGoX6OjomLd+/frKH4y8Ei4wODh4nqp+JuFjMh4CCCCAAAKRElDVS4rF4spIhSLMwwK2bZdExIEDAQQQQAABBBBAAAEEEEAAAQRSJFB5aBNHRRp1wf+xaNGifYaGhoJGNaRP/AQcx6nc/f/A+CUnMQLxFDDGnFkqla4Om/6xd8D6qqqeEXYhdQggULPAHZ7nPaXmVSyIpcDAwMCnjDFvjmV4QiOAAAIIIBBTgSAINo6MjJwS0/iJjp3NZseMMUsTPSTDIYAAAggggAACCCCAAAIIIIAAAk0UMMY8x3XdXzRxC1pHXMC27euNMS+PeEziIZAkgTe6rnt52IEePYBl2/Z/i8jzwy6kDgEEahb4sed5z6t5FQtiKZDP5/k9NZZXjtAIIIAAAjEXuH/OnDnz+CRg9K6i4zjjqvq66CUjEQIIIIAAAggggAACCCCAAAIIIBAPAVVd4fv+x+ORlpTNEMjlch9T1fOb0ZueCCDweIEgCN7r+/5/hLV57B2wfqeqzwy7kDoEEKhNQFWv8n2fN51qY4trtcnn8/eJyJ5xHYDcCCCAAAIIxFXAsqzDVq9e/du45k9q7u7u7i9alvWapM7HXAgggAACCCCAAAIIIIAAAggggECzBVR1g+/73c3eh/7RFbBt+63GmE9ENyHJEEicwMdd110RdqrH3gHrXhF5UtiF1CGAQG0CqvoR3/cvqG0V1XEUGBwcPFhVfx/H7GRGAAEEEEAgAQJ2oVDwEzBHokZwHIdH3ifqijIMAggggAACCCCAAAIIIIAAAgi0WkBVf+v7/mGt3pf9oiPQ3d394kwm883oJCIJAokXGHdd9/Vhp3z4AFZXV1dnZ2fnQyLy6IGssA2oQwCB0AJ9nud9NHQ1hbEVyOfzZ4jIV2M7AMERQAABBBCIt8BHCoUCh94jdg1t275WRJZELBZxEEAAAQQQQAABBBBAAAEEEEAAgTgJBLNnz9573bp1D8QpNFkbJ7Bs2bIDJicntzauI50QQKCKwHdd131RWKWHD1w5jrO/qv417CLqEECgdgHLss4qlUpfrH0lK+ImkM/nLxSRD8UtN3kRQAABBBBIiMA3C4XCqQmZJTFj2Lb9dRF5WWIGYhAEEEAAAQQQQAABBBBAAAEEEECgDQJBEJw4Njb2vTZszZYREXAc5z4R2SsicYiBQNIFfuu6bug7Dz58AKu7u/vZlmX9IukyzIdAOwUsyzq2VCr9pJ0Z2Ls1Avl83hORbGt2YxcEEEAAAQQQ2EHgzkKhsC8q0RJwHGejqp4UrVSkQQABBBBAAAEEEEAAAQQQQAABBGIncL7neZfFLjWBGybgOM6PReS5DWtIIwQQ2JXAfa7r7h2W6OEDWEuXLn1JJpP5RthF1CHw/9m78zg5qnr9499TPZkwQXaMbLIJAtddNhWQIOhP7uUqLiNMV/UwIERlESKZ7gkqNgo41YOioKiAceiuUxPu4HZd0AtiVFAB4wU3FFQEWZRFNklgkqnzezXXCGqY3rvrVH3m3z7ne57n3SGamTNdCDQuMDMzs3B6evr+xneywzaBQqHwUxF5hW25yYsAAggggEBSBDKZzDbnnnvun5PSJwk9XNf9kYi8Kgld6IAAAggggAACCCCAAAIIIIAAAgj0SsAY84UwDI/r1fmc23sBz/MCEXF7n4QECKRDoK+vb2BycvKJetqufwThO4wxl9ezgTUIINCUwBNa6wUiYprazaaOCFT/AuzAG6IKhUL1oz836UhohiKAAAIIIIBATQFjzGGlUuk7NReyoGsCnuf91BjDBfWuiXMQAggggAACCCCAAAIIIIAAAggkVOAmrTXfY0nom1tPLc/zPiwiH6xnLWsQQKB1gSiKdg7D8I56Jj11Act13ZNE5FP1bGANAgg0JXC71nrXpnayySqBfD6/nVLqbqtCExYBBBBAAIHkCZzm+/4nk1fL3kau6/5KRPaytwHJEUAAAQQQQAABBBBAAAEEEEAAgVgIrJ03b96m9X4aSywSE6KtAp7nHSsiy9s6lGEIIPCsAkqpV1UqlevrIVr/CVhFY8yH6tnAGgQQaErgx1rrVze1k01WCYyOjh7sOM5Kq0ITFgEEEEAAgYQJGGM+XyqVjk9YLavruK77OxHhFxKsfhc7E776ibRPfWOCLwQQQAABBBBAAAEEEEAAAQQQqEtAKbV3EAQ/rWsxixIn4HneIhH5buKKUQiB+Aq8OQiC/64n3voLWBcaY06uZwNrEECgKYGvaq2PbGonm6wSyOfz71RKXWpVaMIigAACCCCQPIEbfN/fP3m17G3kuu5dIrK9vQ1IjgACCCCAAAIIIIAAAggggAACCMRDQCl1QhAE/CwqHm9H11Mce+yxz1+7du2dXT+YAxFIqYBSanGlUrmknvrrH0EYishQPRtYgwACjQs4jnNJpVJZ3PhOdtgmUCgUfBHJ25abvAgggAACCCRM4BHf9zdPWCer67iue7+IbG11CcIj0EEBPgmsg7iMRgABBBBAAAEEEEAAAQSSJ3CR1vqk5NWiUT0CxWLR+e1vf7taRObXs541CCDQmoAxZpnWeryeKesvYH1TRA6vZwNrEECgKYGztdYfbGonm6wSyOfz00qpt1sVmrAIIIAAAggkUGB2dvZ555133n0JrGZlJdd1HxWRTawMT2gEEEAAAQQQQAABBBBAAAEEEEAgRgLGmB+FYfiaGEUiSpcFPM+7VUR27/KxHIdAKgWMMSWtdaGe8usvYF0nIvwlXY8YaxBoTuBkrfWnm9vKLpsERkdHb3AcZ1+bMpMVAQQQQACBJApEUXTgxMRE9d85fMVAwHXdGRGZF4MoREAAAQQQQAABBBBAAAEEEEAAAQRsF3hYa72F7SXI37yA67rfUkr9v+YnsBMBBOoVcBzn0nK5fEI969dfwPq5iLy4ng2sQQCBpgQGtdZXNLWTTVYJFAqFe0VkG6tCExYBBBBAAIEEChhjjiuVSl9IYDXrKlU/Fv22226btS44gRFAAAEEEEAAAQQQQAABBBBAAIGYCkRR9NypqakHYhqPWB0W8DzvsyLyrg4fw3gEEBARpdQXK5VKXU/AWn8B6w4R2RE9BBDojIAx5uAwDL/fmelMjYvAKaecMn/BggVrqn8PxyUTORBAAAEEEEirgFLqo+Pj42ektX+cei9ZsmTgvvvuWx2nTGRBAAEEEEAAAQQQQAABBBBAAAEEbBbIZDKvKZfLP7K5A9mbF8hmsx9wHOcjzU9gJwII1CuglPpupVJ5XT3r11/AelhENqtnA2sQQKBxgSiKXjw1NfXLxneywyaBsbGx3Ywxt9mUmawIIIAAAggkWOCLvu/X9VspCTaIRbXh4eGtZmdn+Y3MWLwbhEAAAQQQQAABBBBAAAEEEEAAgYQI5LTWQUK6UKNBgWw2O+I4Dp/+36AbyxFoUuDmIAheXs/e6gUs5bruOhFx6tnAGgQQaFwgk8nsUC6X7258JztsEhgbG1tkjPmuTZnJigACCCCAQIIFbvZ9v65/FCXYIBbVhoeHd5ydna1+6jJfCCCAAAIIIIAAAggggAACCCCAAAJtEFBKnRUEQbENoxhhoYDruocqpa62MDqREbBR4M4gCHaqJ3j18tWmIvJIPYtZgwACzQnMzMxsMj09/dfmdrPLFoF8Pu8qpfhtA1veMHIigAACCCRd4GHf97dIekkb+uVyub2iKPqVDVnJiAACCCCAAAIIIIAAAggggAACCNggoJTSQRB4NmQlY/sFPM/bQ0R+3f7JTEQAgQ0I/DUIgk3qkVFHH3308zOZzJ31LGYNAgg0JbBOa90vIqap3WyyRmBsbOx0Y8x51gQmKAIIIIAAAskX2Nz3fX7ZpMfvcy6X2yeKoht7HIPjEUAAAQQQQAABBBBAAAEEEEAAgSQJ3KC13j9JhehSv8DixYsXrF69+vH6d7DSOoHqs+y4XRCbt+3JJ5+cPz09PVMrkBoaGnqR4zi/qLWQ1xFAoDkBY8yDYRhu3dxudtkkUCgUfBHJ25SZrAgggAACCCRc4KW+7/884R1jX29oaOhgx3FWxj4oARFAAAEEEEAAAQQQQAABBBBAAAF7BB7SWm9pT1yStlvA87y/iAhPAGg3LPMQ2IDARhtttM2ll17651o4yvO81xhjrqu1kNcRQKA5AaXU74Ig2K253eyySSCfz08qpY6xKTNZEei4QPV2fvWWPl8IIIBAbwSO8H3/G705mlPXC2Sz2X9XSvE+8EcCAQQQQAABBBBAAIE6Bfh2Sp1QLEMAAQRSLjAzM7PV9PR09RIOXykU8DzvZhF5aQqrUxmBrgv09fXtNTk5WfOxn9ULWG80xlzZ9YQciEB6BFZprfdJT930Ns3n81cqpd6YXgGaI4AAAgggEC8BY8xJpVLponilSl+aXC43GEXRf6WvOY0RQAABBBBAAAEEEEAAAQQQQACBzglkMpn9y+XyDZ07gclxFnBd91tKqf8X54xkQyBBAgcEQfDDWn2U67pHiciKWgt5HQEEmhMwxlwThuGhze1ml00Co6OjP3EcZ2+bMpMVAQQQQACBhAuUfN8vJLxj7Otls9kRpdQXYh+UgAgggAACCCCAAAIIIIAAAggggIBdAq7WOrQrMmnbJZDL5crGmFy75jEHAQSeXUAp9R+VSuWbtYyqn4B1vDHmkloLeR0BBJoTiKLov6empt7c3G522SQwNjb2B2PMTjZlJisCCCCAAAJJFlBK6eqNKWsAACAASURBVPHxcS/JHW3o5rruiSLyaRuykhEBBBBAAAEEEEAAAQQQQAABBBCwSOBDWusPW5SXqG0U8DxvQkSWtnEkoxBA4FkElFLvqFQq07WAqhewTjXGfKLWQl5HAIGmBS7XWh/d9G42WiNQKBQeEZFNrQlMUAQQQAABBJIv8B3f9w9Lfs14N3RdNy8ifrxTkg4BBBBAAAEEEEAAAQQQQAABBBCwTuBzWut3W5eawG0R8DxvVERKbRnGEAQQmFPAGPNOrfXyWkzVC1gFY8x4rYW8jgACTQtMaq2PbXo3G60QKBaLzpo1a9aKiGNFYEIigAACCCCQAgFjzC9LpdKLU1A11hU9zysaYz4U65CEQwABBBBAAAEEEEAAAQQQQAABBOwT+KrW+kj7YpO4HQKu6x6jlJpsxyxmIIDA3AJRFJ0ahuEFtZyqF7D4ZngtJV5HoAUBpdRngiCoPnaFrwQLFAqFzUTk4QRXpBoCCCCAAAI2Cjzo+/7WNgZPUuahoaHzHcc5LUmd6IIAAggggAACCCCAAAIIIIAAAgjEQODHWutXxyAHEXog4HneG0Xkyh4czZEIpFHg/UEQnFuruHJdt/ooiOojIfhCAIG2CxgxRj4ehuHpbR/NwFgJFAqFHUXkjliFIgwCCCCAAAIImIGBgY2KxeIMFL0TyOVyn4+i6LjeJeBkBBBAAAEEEEAAAQQQQAABBBBAIJECf9Ba75LIZpSqKeB53itFZFXNhSxAAIGWBYwxH9Van1FrUPUC1idF5L21FvI6Agg0LXCO1voDTe9moxUChULhJSLyMyvCEhIBBBBAAIEUCRhjnl8qle5KUeXYVc1ms1copd4Wu2AEQgABBBBAAAEEEEAAAQQQQAABBOwWeEJrPWB3BdI3K+C67g5KqT82u599CCDQkMCngiA4pdYOlcvlLo6i6IRaC3kdAQSaFviA1vqcpnez0QqBpUuXvjqTyfzQirCERAABBBBAIEUCSql9xsfH+U2wHr7n2Wz2f5RSr+9hBI5GAAEEEEAAAQQQQAABBBBAAAEEEikwMzOz+fT09COJLEepOQWWLFkycP/996+GCQEEOi8QRdEXwjCs+ZSH6idglUUk1/lInIBAOgWUUqcHQfDxdLZPT+uxsbHXGWO+k57GNEUAAQQQQMAOAWPMG0ql0lV2pE1mStd1rxeR/ZLZjlYIIIAAAggggAACCCCAAAIIIIBA7wSUUnsGQfCb3iXg5F4KeJ63RkQ26mUGzkYgJQLTQRC8o1ZX5XnetDHm7bUW8joCCDQnYIw5JQzDTzW3m122CBQKhf8Qka/bkpecCCCAAAIIpEVAKXX0+Pj45WnpG8eeruveIiJ7xjEbmRBAAAEEEEAAAQQQQAABBBBAAAGbBaIoWjQ1NfU9mzuQvXkBz/PuEZFtm5/ATgQQqFPgW0EQHF5rbfUTsKoXBqoXB/hCAIEOCBhjTgzD8DMdGM3IGAmMjY29zRhzRYwiEQUBBBBAAAEEREQp9Z7x8fHPgtE7Add1+UZQ7/g5GQEEEEAAAQQQQAABBBBAAAEEEiyglDoqCIL/SnBFqs0h4HneL0Xk30BCAIGOC1wbBMFBtU6pfgLW1caYQ2st5HUEEGhOQCn17iAIPtfcbnbZIpDP512lVGBLXnIigAACCCCQIoH3+75/bor6xq6q67qPi8iC2AUjEAIIIIAAAggggAACCCCAAAIIIGC5gDHm1DAML7C8BvGbFPA871oROaDJ7WxDAIH6BW4KguAVtZZXPwHrOhF5Ta2FvI4AAs0JKKXeFQTBxc3tZpctAmNjY8cbYy6xJS85EUAAAQQQSItAFEXnTUxMjKalb9x6Llq0qG/77bdfG7dc5EEAAQQQQAABBBBAAAEEEEAAAQSSIKCUOjcIgvcnoQsdGhfI5XJfM8Yc0fhOdiCAQIMCvwuCYLdae1Q2m12llHplrYW8jgACzQkopU4IguDS5nazyxaBQqHwHhG5yJa85EQAAQQQQCAtAsaYz5dKpePT0jduPQcHB7fs7+9/MG65yIMAAggggAACCCCAAAIIIIAAAggkQcAYc2kYhickoQsdGhfI5XJlY0yu8Z3sQACBBgXuCoLg+bX2VD8Bi+eC1lLidQRaE3in1np5IyOUiJhGNrC25wL5fP5EpdSnex6EAAgggAACCCDwDwLGmCtKpdIgLL0RyGazuyqlfteb0zkVAQQQQAABBBBAAAEEEEAAAQQQSLaAMWZFGIZDyW5Ju2cTyOVynzTGvBchBBDouMD9QRAsrHWK8jzvNmNMzY/KqjWI1xFAYMMCxphjwzCcxCfZAoVC4SQR+VSyW9IOAQQQQAAB+wSMMd8olUp8DHeP3rpcLrdPFEU39uh4jkUAAQQQQAABBBBAAAEEEEAAAQSSLvB1rfV/Jr0k/TYs4LruuUqpZfgggEDHBR4NgmCzWqdUPwHrdhHZudZCXkcAgeYEjDHHhGFYbm43u2wRyOfzJyulLrQlLzkRQAABBBBIi0AURSsnJiYOSUvfuPX0PO+Nxpgr45aLPAgggAACCCCAAAIIIIAAAggggEASBIwx14RheGgSutChcQHXdd+vlDq78Z3sQACBBgWeDIJgo1p7qhew7hCRHWst5HUEEGhOwBgzHIZhpbnd7LJFYHR09BTHcS6wJS85EUAAAQQQSJHADb7v75+ivrGq6rpuVkR0rEIRBgEEEEAAAQQQQAABBBBAAAEEEEiOwA1aa773lZz3s6EmnuedKiKfaGgTixFAoBkBEwSBU2tj9QLWXSKyfa2FvI4AAs0J8AjC5txs28UFLNveMfIigAACCKRFwBjzi1Kp9JK09I1bz2w2+16l1Cfjlos8CCCAAAIIIIAAAggggAACCCCAQEIEfqm1fnFCulCjQQHP844XkUsa3MZyBBBoQuCWW27pX7Vq1dq5tlYvYN0rIts0MZ8tCCBQn8BirTX/w1eflbWreAShtW8dwRFAAAEEEi5gjLm9VCrtmvCasa3neV7RGPOh2AYkGAIIIIAAAggggAACCCCAAAIIIGC3wB+01rvYXYH0zQrkcrmjjTFTze5nHwII1C+w6aabbnLRRRf9da4dyvO8+4wxz61/LCsRQKBBgZO01hc1uIfllgkUCoUTRORiy2ITFwEEEEAAgTQI/Mn3/W3TUDSOHT3Pu9AYc3Ics5EJAQQQQAABBBBAAAEEEEAAAQQQsF1AKXV/EAQLbe9B/uYEcrncfxpj/ru53exCAIFGBBzH2bpcLj841x6VzWYfUEpt1chg1iKAQP0CSqnTgiDgsSv1k1m5cnR0dMRxnC9YGZ7QCCCAAAIIJFvgQd/3t052xfi2c103FJGh+CYkGQIIIIAAAggggAACCCCAAAIIIGC1wBqt9QKrGxC+aYGhoaHXZTKZ7zQ9gI0IINCIwHZBEFSfMPisX9VHED4kIps3MpW1CCBQv4BSajQIgvPq38FKGwVGR0eHHMep/oCRLwQQQAABBBCIl8Ajvu/z750evSeu635bRN7Qo+M5FgEEEEAAAQQQQAABBBBAAAEEEEi6gJmZmZk3PT09m/Si9PtXgVwut78x5sfYIIBA5wWUUrtWKpXb5zqpegHrURHZpPNxOAGB1AqcobX+aGrbp6T42NjY24wxV6SkLjURQAABBBCwSeCvvu/z750evWOu6/5ERPbu0fEciwACCCCAAAIIIIAAAggggAACCCReYGZmZpPp6em/Jr4oBf9F4Oijj35FX1/fT6FBAIGuCOwZBMFv5jqpegGr+pfxxl2JwyEIpFPgQ1rrD6ezenpaj46OHuE4ztfS05imCCCAAAIIWCPwhO/7A9akTVhQ13V/JyK7JqwWdRBAAAEEEEAAAQQQQAABBBBAAIHYCMybN2/bycnJP8UmEEG6JnDMMce8aHZ29hddO5CDEEixgOM4LyuXyz+bi6B6AWu1iPADiRT/QaF6xwXO1lp/sOOncEBPBZYuXXpYJpO5qqchOBwBBBBAAAEENiSwzvf9edD0RoBPXO6NO6cigAACCCCAAAIIIIAAAggggEB6BGZnZ3dZsWLFH9LTmKbrBTzP201EbkMEAQQ6LxBF0T5hGK6a66TqBawZEeEHEp1/PzghvQITWut8euuno/myZcv2j6KIZyyn4+2mJQIIIICAXQLG933HrsjJSLt48eIFjz/++OPJaEMLBBBAAAEEEEAAAQQQQAABBBBAIJ4CxpidwzC8I57pSNVJgWw2u5PjOFy+6yQysxH4m4BSat9KpfKTuUCqF7DWiUgGNQQQ6IyAUuozQRCc2JnpTI2LwLJly/aMouiWuOQhBwIIIIAAAgg8LfC3C1gGk+4K5HK5XaIo+n13T+U0BBBAAAEEEEAAAQQQQAABBBBAIF0CmUxmp3K5fGe6WtO2KuB53rYicg8aCCDQeYG+vr79Jicnb5zrpOoFrFkR4TfCO/9+cEJ6BQKtdS699dPRfMmSJdv39/fflY62tEQAAQQQQMAqgVnf9/usSpyQsLlcjk8ITch7SQ0EEEAAAQQQQAABBBBAAAEEEIivwOzs7I4rVqz4Y3wTkqxTAsPDw1tFUfRAp+YzFwEEnhZQSr2qUqlcP5dJ9QLWWhHhBxL8yUGgQwJRFH15amrqrR0az9iYCOTz+U2UUo/GJA4xEEAAAQQQQOBpgRnf9+cD0n0Bz/PeZIz5avdP5kQEEEAAAQQQQAABBBBAAAEEEEAgPQKZTGaHcrl8d3oa03S9wIknnvicRx999DFEEECg8wLGmFdrrX8810nK87wnjDH8QKLz7wcnpFTAGHNVGIZvSGn9NNVWhUKheqGVR7qm6V2nKwIIIICADQKrfd/f2IagScvouu4JInJx0nrRBwEEEEAAAQQQQAABBBBAAAEEEIiTwPz587dfvnw5j6GL05vSpSwjIyMbrVu3bk2XjuMYBNIucEAQBD+cC6H6CViPi8iCtEvRH4FOCRhjfhSG4Ws6NZ+58REoFAp/EZEt4pOIJAgggAACCCAgIo/5vr8pEt0XyGazH1BKfaT7J3MiAggggAACCCCAAAIIIIAAAgggkB4BpdR2QRDcm57GNF0vwAUs/iwg0D0BY8yBWuvr5jqxegGr+sisTboXi5MQSJ3Az7XWL01d6xQWLhQKt4rI7imsTmUEEEAAAQTiLPCw7/tckO7BO+S67gUickoPjuZIBBBAAAEEEEAAAQQQQAABBBBAIDUC8+bN23ZycvJPqSlM0b8LcAGLPwwIdE/AcZyDyuXytXOdWL2A9ZCIbN69WJyEQOoEbtda75q61iksnM/nr1NK8WlnKXzvqYwAAgggEGuBB3zff26sEyY0nOu6K0TkqITWoxYCCCDQdQEjIqrrp3IgAggggAACCCCAAAIIxF1gYGBgm0svvfTPcc9JvvYLcAGr/aZMRODZBKIoOjgMw+/PJVS9gHW/iGwNIwIIdEzgAa01P/TrGG98Bo+Ojn7FcZw3xycRSRBAAAEEEEDAGPPHUqm0IxLdF3Bd9xoROaT7J3MiAggggAACCCCAAAIIIIAAAgggkB4BLmCl573+56ZcwErve0/z7gsopRZVKpXvzXVy9QJW9Xmw23Q/HicikBqBWa31PBGp/rIqXwkWyOfzlyiljk9wRaohgAACCCBgo8BvfN/f08bgtmd2XfeXIvJvtvcgPwIIIIAAAggggAACCCCAAAIIIBBnAcdxnlepVO6Lc0aydUaAC1idcWUqAs8icEgQBCvn0lHZbPZupdR2ECKAQOcE5s2bt8Xk5OTDnTuByXEQGBsbO9cYsywOWciAAAIIIIAAAn8X+F/f91+JR/cFXNd9REQ27f7JnIgAAggggAACCCCAAAIIIIAAAgikRyCKoudOTU09kJ7GNF0vwAUs/iwg0D2B2dnZQ6empqpPfXjWr+onYN0hIjySo3vvCyelUGDdunW7XX755b9LYfVUVc7n86cppc5PVWnKIoAAAgggEHMBY8x1pVLpwJjHTFy8wcHB5/T39z+WuGIUQgABBBBAAAEEEEAAAQQQQAABBOInsJnW+tH4xSJRpwUOP/zw+VtttdUTnT6H+QggIGKMOUxr/Z25LKoXsH4vIrsAhgACnRNYt27dfpdffvmNnTuByXEQyOfzb1dKTcchCxkQQAABBBBA4O8CV/m+/wY8uivged4exphfd/dUTkMAAQQQQAABBBBAAAEEEEAAAQRSJ2B23333vmKxGKWuOYVl8eLFC1avXv04FAgg0BWB2o8g9DzvNmPMbl2JwyEIpFRAKXV4EATfSmn91NRetmzZ/lEU/Tg1hSmKAAIIIICABQJRFH11YmLiSAuiJiri0NDQ6xzHmfO3gRJVmDIIIIAAAggggAACCCCAAAIIIIBAbwQe01pv2pujObXXAoODg5vNnz//4V7n4HwE0iBgjDlQa33dXF2rn4BV/a3kPdIAQkcEeijgaq3DHp7P0V0QWLJkyfb9/f13deEojkAAAQQQQACBOgWMMZVSqTRc53KWtUkgm83mlFLlNo1jDAIIIIAAAggggAACCCCAAAIIIIDAhgXu1lrvAE46BYaGhrbOZDL3p7M9rRHoroBS6lWVSuX6uU6tXsD6hYi8qLvROA2B1Am8V2t9Yepap6zw4OBgZtddd10jIvNSVp26CCCAAAIIxFbAGHNBqVQ6NbYBExrM87yCMWY8ofWohQACCCCAAAIIIIAAAggggAACCMRF4Nda673iEoYc3RXwPG9bEbmnu6dyGgLpFIiiaJ8wDFfN1V5ls9lVSqlXppOI1gh0R8AYUwzD8KzunMYpvRQoFAp3iMiOvczA2QgggAACCCDwtIBS6qzx8fEiJt0VcF33AhE5pbunchoCCCCAAAIIIIAAAggggAACCCCQOoEbtNb7p641hZ8SGB4e3jGKourPJvlCAIHOC7w8CIKb5zqm+glY14rIAZ3PwgkIpFrgIq31SakWSEn5QqHwAxE5MCV1qYkAAggggIANAqf5vv9JG4ImKePQ0NCXHMd5S5I60QUBBBBAAAEEEEAAAQQQQAABBBCIocDVWuvXxzAXkbogcNRRR71g3rx5v+3CURyBQOoFjDEv0lr/ai6I6gWsq0TksNRrAYBABwWiKPry1NTUWzt4BKNjIlAoFC6rXjiPSRxiIIAAAgggkHoBY8xwqVSqpB6iywCu614vIvt1+ViOQwABBBBAAAEEEEAAAQQQQAABBNIm8CWt9dvSVpq+/ycwMjKy57p1627BAwEEOi/gOM4e5XL51rlOUkNDQ191HOdNnY/DCQikWuDHWutXp1ogJeVHR0fPdByHx02m5P2mJgIIIIBA/AWiKPrPiYmJr8c/abISuq77RxHZIVmtaIMAAggggAACCCCAAAIIIIAAAgjESyCKosumpqZG4pWKNN0ScF33JUqpn3XrPM5BIM0CURS9IAzD389lUP0ErMtF5B1phqI7Al0QuENrvXMXzuGIHguMjo4OOY4T9jgGxyOAAAIIIIDA0wIH+L7/Q0C6J7D33nvP23PPPdeISKZ7p3ISAggggAACCCCAAAIIIIAAAgggkEqBC7TWp6ayOaVleHh4vyiKqp9EzxcCCHRYwHGcncrl8p1zHVO9gPWF6qfTdTgL4xFIu8CM1nojETFph0h6/3w+v59Siv+jk/Q3mn4IIIAAAtYIKKVeMD4+PudvpVhTxpKguVxulyiKMLfk/SImAggggAACCCCAAAIIIIAAAghYLXC21vqDVjcgfNMC2Wz2EMdxrml6ABsRQKARge2CILh3rg3K87yLjDHvaWQqaxFAoHGBTCazdblcfrDxneywSWBsbGwLY8xfbMpMVgQQQAABBJIsMDs7+5zzzjvv8SR3jFu3oaGhgx3HWRm3XORBAAEEEEAAAQQQQAABBBBAAAEEEihQ0FqXEtiLSnUIuK57hFLqa3UsZQkCCLQo8OSTTy6cnp6+f64xKpvNfkwp9b4Wz2I7AgjUEHAc5yWVSuUXQCVfoFAoPCAiWyW/KQ0RQAABBBCIvcBjvu9vGvuUCQvouu4xIjKZsFrUQQABBBBAAAEEEEAAAQQQQAABBGInoJQ6LgiC6hOv+EqhgOd57xCRy1NYncoIdF0giqItwzB8aK6Dq48gPFtE3t/1dByIQMoElFJvCILgqpTVTmXdfD7/faXUQaksT2kEEEAAAQTiJXCr7/t7xCtS8tO4rnumiJyV/KY0RAABBBBAAAEEEEAAAQQQQAABBHor4DjOGyuVyrd7m4LTeyXged6xIrK8V+dzLgJpElBKPadSqcz5tI3qJ2CdoZQ6J00wdEWgRwIjWuvLenQ2x3ZRoFAoXCQiPNq1i+YchQACCCCAwLMIfN/3/YPR6a6A53mXGmPe2d1TOQ0BBBBAAAEEEEAAAQQQQAABBBBIn0AURS+bmpr6Wfqa07gq4HneySJyIRoIINBxAbPbbrv1FYvFaK6TlOd57zPGfKzjcTgAgZQLGGPODMPwIylnSEX9QqFwkoh8KhVlKYkAAggggECMBYwxV5RKpcEYR0xkNM/zrjbGHJrIcpRCAAEEEEAAAQQQQAABBBBAAAEEYiSQyWS2LpfLD8YoElG6KOB5XkFExrt4JEchkFaBJ4IgGKhVvvoIwneLyGdqLeR1BBBoTUAp9fkgCI5vbQq7bRAYGxtbZIz5rg1ZyYgAAggggEDCBT7u+/7pCe8Yu3qu694qIrvHLlgsAxkRUbFMRigEEEAAAQQQQAABBBBAAAEEEIi3gFLqyb9dCKh+g4GvFArkcrmzqh8CksLqVEagqwJKqb9UKpWtah1avYB1jIhM1lrI6wgg0JqAUuo7QRAc1toUdtsgcPrpp2/d19d3vw1ZyYgAAggggECSBYwxp5ZKpQuS3DGG3ar/xlwtIhvFMBuREEAAAQQQQAABBBBAAAEEEEAAgSQJ3K613jVJhejSmEAul/ukMea9je1iNQIINCFwdxAEO9TaV/3m+NtFZLrWQl5HAIHWBJRSvwuCYLfWprDbFoF8Pn+PUmpbW/KSEwEEEEAAgYQKHOn7/lcT2i2WtUZGRrZZu3btvbEMRygEEEAAAQQQQAABBBBAAAEEEEAgWQI/1FofkKxKtGlEIJvNXuY4znAje1iLAAJNCdwWBMELa+1Unue93hjzP7UW8joCCLQsMLP77rsPFIvFqOVJDIi9QD6f/6ZS6vDYByUgAggggAACCRaIougVExMTNyW4Yuyqua5b/abftbELRiAEEEAAAQQQQAABBBBAAAEEEEAgYQJKqekgCN6RsFrUaUDA87zqL5++qYEtLEUAgeYEbg6C4OW1tqqjjjpq376+vhtqLeR1BBBoXSCTyexQLpfvbn0SE+IuMDY2drYx5v1xz0k+BBBAAAEEkiyglNpyfHz8oSR3jFu3bDY7rJS6LG65yIMAAggggAACCCCAAAIIIIAAAggkTSCKok9MTU0tSVov+tQv4Hne90TktfXvYCUCCDQj4DjOj8vl8qtr7VXDw8MvnJ2d/U2thbyOAAKtCyilDgiC4IetT2JC3AXy+fxblVJfjHtO8iGAAAIIIJBggUd9398swf1iWc113bNE5MxYhiMUAggggAACCCCAAAIIIIAAAgggkCyBgta6lKxKtGlEwPO8n4nISxrZw1oEEGhcQCl1TaVSObTWTnX88cc/b82aNX+qtZDXEUCgLQKu1jpsyySGxFpgbGxsZ2PM7bEOSTgEEEAAAQSSLXCT7/uvSHbF+LVzXVeLSDZ+yUiEAAIIIIAAAggggAACCCCAAAIIJE4gp7UOEteKQnULuK57p1Lq+XVvYCECCDQr8I0gCI6otVmNjIxstHbt2jW1FvI6Agi0LmCM+WAYhme3PokJNggUCoX7RWRrG7KSEQEEEEAAgaQJGGP+q1QqHZW0XnHv47ruj0Vk/7jnJB8CCCCAAAIIIIAAAggggAACsRIwIqJilYgwFghEUXTo1NTUNRZEJWKHBDzPe1RENunQeMYigMDTAtNBELyjFshT/1Pued4Txpj5tRbzOgIItCZgjCmHYXhMa1PYbYtAoVD4HxF5vS15yYkAAggggEDCBM72ff+DCesU+zrZbPYBpdRWsQ9KQAQQQAABBBBAAAEEEEAAAQQQQMBygUwms1O5XL7T8hrEb1Jg0aJFfTvssMMM1zebBGQbAg0IRFFU1z2Ppy5gua77ZxFZ2MB8liKAQHMC12utX9XcVnbZJpDP58eVUgXbcpMXAQQQQACBJAhEUXTMxMREOQldbOkwMjKy+dq1ax+yJS85EUAAAQQQQAABBBBAAAEEEEAAAYsF1uy+++7PKRaLkcUdiN6CwMjIyDbr1q27t4URbEUAgToFjDGf1Vq/p9by9RewbhWR3Wst5nUEEGhZ4CGt9ZYtT2GAFQL5fP5IpdSXrQhLSAQQQAABBBImYIx5dalUqj4Oj68uCeRyuX2iKLqxS8dxDAIIIIAAAggggAACCCCAAAIIIJBmgZu11i9PM0Dau3ue9zIRuSntDvRHoEsCfhAEY7XOeuoCVjabvVEptU+txbyOAAKtC8zMzCycnp6+v/VJTIi7wNKlSxdmMpnqJwzyhQACCCCAAAJdFpiZmdnq/PPP/0uXj031ca7rHiUiK1KNQHkEEEAAAQQQQAABBBBAAAEEEECgCwJKqekgCN7RhaM4IqYCnue9XkT+J6bxiIVAogSUUmdUKpWP1iq1/hOwrhKRw2ot5nUEEGiLwIFa6+vaMokhsRfI5/O/V0rtEvugBEQAAQQQQCBZAvf7vs8j1rv8nmaz2TOUUud0+ViOQwABBBBAAAEEEEAAAQQQQAABBNIocI7W+gNpLE7n/xPwPM8VkQAPBBDoisCJQRB8ptZJ6z8B6wql1NtqLeZ1BBBoXUApdVwQBF9ofRITbBAoFAq6+kGDNmQlIwIIIIAAAgkS+I7v+/yCSZff0Gw2e5lSarjLx3IcAggggAACCCCAAAIIIIAAAgggkEaBsvNUxwAAIABJREFUnNaayzdpfOf/1jmbzS5xHOfjKSagOgJdEzDGuFrrsNaBT13AyuVyn4+i6Lhai3kdAQTaIjCutV7WlkkMib1APp8/WSl1YeyDEhABBBBAAIFkCXzC9/0lyaoU/zau614vIvvFPykJEUAAAQQQQAABBBBAAAEEEEAAAbsFMpnM/uVy+Qa7W5C+FQHXdc9VSvEz51YQ2YtA/QJHBEHwjVrL138C1seUUu+rtZjXEUCgdYEoir48NTX11tYnMcEGgbGxsb2NMT+xISsZEUAAAQQQSIpAFEXvnJiYWJ6UPrb0cF33YRHZzJa85EQAAQQQQAABBBBAAAEEEEAAAQRsFZg3b94Wk5OT1e/F8JVSAc/zLhWRd6a0PrUR6KqA4zgHlcvla2sduv4C1hlKqXNqLeZ1BBBoi8CvtdZ7tWUSQ2IvUCwW+1avXv2wUmrj2IclIAIIIIAAAgkRUErtNz4+fmNC6lhRw/O8bY0x91gRlpAIIIAAAggggAACCCCAAAIIIICA3QJ/1lpvY3cF0rcqkMvlvmaMOaLVOexHAIHaAo7jvKxcLv+s1sqnLmC5rnuCiFxcazGvI4BAWwRmFy5cuMn555+/pi3TGBJ7gUKh8D8i8vrYByUgAggggAACyRCYHRgY2LRYLK5ORh07WmSz2UOUUtfYkZaUCCCAAAIIIIAAAggggAACCCCAgNUC39daH2x1A8K3LOB53k0i8rKWBzEAAQRqCjiOs1O5XL6z1sKnLmANDQ0d6TjOl2st5nUEEGiPwOzs7CtXrFjxv+2ZxpS4CxQKhTNEhE8ZjPsbRT4EEEAAgaQI3Or7/h5JKWNLj2w2+x6l1EW25CUnAggggAACCCCAAAIIIIAAAgggYKuA4ziXVCqVxbbmJ3d7BDzPu19Etm7PNKYggMBcAsaYzbTWj9ZSWn8B60DHcX5QazGvI4BAewSMMcNhGFbaM40pcRcYHR09wHGcms+EjXsP8iGAAAIIIGCDgFJKj4+PezZkTVLGoaGh8x3HOS1JneiCAAIIIIAAAggggAACCCCAAAIIxFFAKXV6EAQfj2M2MnVHYGRkZKN169ZVnwDw1H0PvhBAoKMC0W677TavWCxGtU556j/I4eHhF87Ozv6m1mJeRwCB9ggYY/wwDMfaM40pcRcoFov9q1ev/otSauO4ZyUfAggggAACtgsopd43Pj5+vu09bMvvuu6VIvJG23KTFwEEEEAAAQQQQAABBBBAAAEEELBNIIqiRVNTU9+zLTd52yeQzWZ3dRznd+2byCQEEJhD4JEgCDavR+ipC1jZbHYLpdRf6tnAGgQQaIvAN7TWR7RlEkOsECgUCleLyKFWhCUkAggggAACdgsc5Ps+nzzZ5ffQdd3bRWTnLh/LcQgggAACCCCAAAIIIIAAAggggEDaBMzMzMwW09PTj6StOH2fFvA87yAR+T4mCCDQFYE7gyDYqZ6T1n8knXJdd0ZE+urZxBoEEGhZ4E6tdV3/kbZ8EgNiIZDP5z+olPpwLMIQAgEEEEAAgeQKzM7Ozm523nnnPZ7civFrtnjx4gWPP/74YyLixC8diRBAAAEEEEAAAQQQQAABBBBAAIHkCBhjbg3DcI/kNKJJMwKe5w2JSNjMXvYggEBjAkqp/61UKq+sZ9ffnwnquu69IrJNPZtYgwACLQuYefPmbTk5Oflwy5MYYIVAoVB4jYhcZ0VYQiKAAAIIIGCpgDHml6VS6cWWxrc2di6X2yeKohutLUBwBBBAAAEEEEAAAQQQQAABBBBAwB6BUGvt2hOXpJ0QcF33dKXUeZ2YzUwEEPhHAWPM1Vrr19fj8swLWD8TkZfUs4k1CCDQFoEDtdZcyGkLZfyHFIvFvjVr1twvInU9Hzb+jUiIAAIIIIBALAUmfd8/NpbJEhwqm82OKKW+kOCKVEMAAQQQQAABBBBAAAEEEEAAAQTiIrBUa/2xuISJc47qRQgT54AtZMvlchcYY05pYQRbEUCgfoGpIAiy9Sz/+wWsbDb7HaXU6+rZxBoEEGiLwHu11he2ZRJDrBAoFApfEpG3WBGWkAgggAACCNgpsNj3/UvsjG5v6lwud14URafb24DkCCCAAAIIIIAAAggggAACCCCAgB0CxpiDwzD8vh1pSdkpgVwu9zVjzBGdms9cBBB4WkApdUGlUjm1HpNnfgLWChE5qp5NrEEAgbYITGqt+YSGtlDaMWRsbOzdxpjP2JGWlAgggAACCNgnYIz5t1KpdIt9ye1O7Lrut0XkDXa3ID0CCCCAAAIIIIAAAggggAACCCAQe4FIRLbQWj8a+6QE7KiA53m/FJF/6+ghDEcAgfUCZwZB8JF6OP5+AcvzvAuNMSfXs4k1CCDQFoGfa61f2pZJDLFCYGxsbGdjzO1WhCUkAggggAAC9gk84Pv+wgR/snhs35FsNnu3Umq72AYkGAIIIIBAlwSqD/f4+7cau3QmxyCAAAIIIIAAAgggkCqB32it90xVY8puUMDzvL+KyMbwIIBAVwRODIKgrg9ZeeYjCM9QSp3TlXgcggACVYHZjTfeeNOLL754NRzpESgUCreJyG7paUxTBBBAAAEEuiMQRdFXJyYmjuzOaZyyXmBwcHDL/v7+BxFBAAEEEEAAAQQQQAABBBBAAAEEEOisgFJKB0HgdfYUpsdd4Pjjj3/eE0888ae45yQfAkkRcBxnsFwuX1FPn2c+gvAYEZmsZxNrEECgPQKO47yqUqlc355pTLFBYHR09FOO45xkQ1YyIoAAAgggYJlAwff9kmWZrY87NDR0sOM4K60vQgEEEEAAAQQQQAABBBBAAAEEEEAg5gLGmPeFYXh+zGMSr8MCruu+Sin1ow4fw3gEEHha4JAgCOr6HvjfL2AdffTRh2YymatRRACBrgqcpLW+qKsnclhPBZYtW/bvURR9o6chOBwBBBBAAIEECkRRdODExMR1CawW60rZbPZkpdSFsQ5JOAQQQAABBBBAAAEEEEAAAQQQQCABAkqp1wZB8IMEVKFCCwKu62arn4bWwgi2IoBAAwKZTObFl1122S/r2fL3C1i5XG6vKIp+Vc8m1iCAQHsEHMdZXqlU3tmeaUyxQeCUU06Zv2DBggdE5Dk25CUjAggggAACNggYYx5fsGDBlsViccaGvEnK6LruZ0XkXUnqRBcEEEAAAQQQQAABBBBAAIHWBIyI/P0HkK2NYjcCCDwtsNZxnC0qlcrjoKRbwPO8M0TknHQr0B6B7gn09fVtOzk5WddjP5/5CMJNReSR7sXkJAQQEJGbtNavQCJdAqOjo19xHOfN6WpNWwQQQAABBDonYIy5slQq/XvnTmDyswm4rlv91LHXIIQAAggggAACCCCAAAIIIIAAAggg0FGB67TWB3b0BIZbIeB53qSIHGNFWEIiYL+Aueuuu/pXrly5rp4q/3AB3XXdR0Vkk3o2sgYBBNoisHbhwoWbnX/++WvaMo0hVgjk8/l3KqUutSIsIRFAAAEEEJhLICa/0qqUWjo+Pv4x3qzuChSLRee2226r/hty4+6ezGkIIIAAAggggAACCCCAAAIIIIBA6gTO0Vp/IHWtKfwvAsPDwz+KouhV0CCAQFcEHgqCYMt6T/rnC1i3iMie9W5mHQIItC4QRdFBU1NT17Y+iQm2CCxdunRhJpO5V0QcWzKTEwEEEEAAgTgLRFH0iomJiZvinDGJ2UZGRvZcu3Zt9d+QfCGAAAIIIIAAAgggkB6BmPwiSnrAaYoAAgggUBWIoujQqampa9BAwPO8B0RkKyQQQKArArcGQbBHvSf9wwUsz/OuNsYcWu9m1iGAQOsCSql8EAQTrU9igk0ChULhehHZz6bMZEUAAQQQQCCmAg8ODAwsLBaLUUzzJTaW67pZEdGJLUgxBBBAAAEEEEAAAQQQQAABBBBAIB4CMxtvvPEWF1988ep4xCFFrwSGhoa2zmQy9/fqfM5FIG0CSqnvViqV19Xb+x8uYGWz2cuUUsP1bmYdAgi0ReBLWuu3tWUSQ6wRyOfz71dKnW1NYIIigAACCCAQX4Fp3/ffEd94yU2WzWYnqo9/TG5DmiGAAAIIIIAAAggggAACCCCAAAKxEPi+1vrgWCQhRE8FXNc9QCnFk5V6+i5weMoEgiAIcvV2/udPwDrHGHNGvZtZhwACbRG4V2u9XVsmMcQagWXLlr0wiqLfWBOYoAgggAACCMRUIIqid05MTCyPabxEx+ITlBP99lIOAQQQQAABBBBAAAEEEEAAAQRiIqCUOisIgmJM4hCjhwKe5x0rInwvtIfvAUenS8AYU9JaF+pt/Q8XsFzXPVFEPl3vZtYhgEB7BIwxO4dheEd7pjHFFoF8Pv9zpdSLbclLTgQQQAABBGIoYIwxO5RKpXtimC3xkVzXrX7c+daJL0pBBBBAAAEEEEAAAQQQQAABBBBAoIcCURQtmpqa+l4PI3B0TAQ8zxsXkbovg8QkNjEQsFbAGLNEa/2Jegv88yMI36yU+kq9m1mHAALtEXAcZ6hSqaxozzSm2CIwNjZWNMZ8yJa85EQAAQQQQCBuAlEUrZqYmNgnbrnSkOfoo49+fiaTuTMNXemIAAIIIIAAAggggAACCCCAAAII9FDgiXnz5m0xOTn5RA8zcHRMBLLZ7JcdxzkyJnGIgUDiBRzHObpcLl9eb9F/fgThy4wxN9W7mXUIINAeAWPMJ8MwPK0905hii8DSpUtfnMlkfm5LXnIigAACCCAQQ4EP+77PZeYevDHZbJZf3umBO0cigAACCCCAAAIIIIAAAggggEC6BIwx14RheGi6WtP22QQ8z7tNRHZDCAEEuiPgOM5B5XL52npP++dHEG4qIo/Uu5l1CCDQNoHrtdavats0BlkjUCgUfiUie1kTmKAIIIAAAgjESMAYs3+pVLohRpFSEyWbzX5IKVVMTWGKIoAAAggggAACCCCAAAIIIIAAAj0QMMacGYbhR3pwNEfGTGDx4sULVq9e/ZiIODGLRhwEEiuglNq1UqncXm/Bf7iAVd2UzWYfUEptVe8A1iGAQFsEZjbeeOMtLr744tVtmcYQawTGxsbONsa835rABEUAAQQQQCAmAsaY+xYsWLBtsViMYhIpVTFc1/2aiByRqtKURQABBBBAAAEEEEAAAQQQQAABBLosEEXRQVNTU3V/+kqX43FcFwVGRkb2XbduHb+M2kVzjkq9gOnr61vQyCNg/+UCluu6PxGRvVNPCQACXRaIoujQqampa7p8LMf1WCCfz++llKp+ChZfCCCAAAIIINCYwCW+7y9ubAur2yXguu6fRWRhu+YxBwEEEEAAAQQQQAABBBBAAAEEEEDgXwT+cvfddz9v5cqV67BBwHXd45RSn0cCAQS6JvBgEARbN3Lav1zA8jxv2hjz9kaGsBYBBNoi8GGt9YfaMokhVgkUCoWbRORlVoUmLAIIIIAAAj0WiKLo8ImJiW/1OEYqj8/lcrtEUfT7VJanNAIIIIAAAggggAACCCCAAAIIINAlAWNMOQzDY7p0HMfEXMDzvI+LyJKYxyQeAkkS+HkQBC9tpNCGPgGrJCKjjQxhLQIItC6glPpeEASLWp/EBNsECoVCXkR823KTFwEEEEAAgR4KPDIwMLCwWCzO9DBDao/O5XJHR1E0lVoAiiOAAAIIIIAAAggggAACCCCAAALdERjUWl/RnaM4Je4CrutepZQ6LO45yYdAUgSMMd/WWr+xkT7/cgErm82+Ryl1USNDWIsAAq0LKKWe7Ovr27yRZ4i2fioT4iCwZMmS7fv7++8UEScOeciAAAIIIICABQKB7/s5C3ImMmI2m/2YUup9iSxHKQQQQAABBBBAAAEEEEAAAQQQQCAGAtWfG/b39z93+fLlj8UgDhFiIOB53r0isk0MohABgVQIGGMmtdbHNlJ2Q48gfKMx5spGhrAWAQTaI2CMOTgMw++3ZxpTbBIYGxtbWX3/bcpMVgQQQAABBHolYIx5W6lU+lKvzk/7ua7rXisiB6Tdgf4IIIAAAggggAACCCCAAAIIIIBABwW+pbU+vIPzGW2RQC6XW2iM+bNFkYmKgPUCjuOcVS6Xi40U2dAFrD2MMb9uZAhrEUCgPQLGmDPDMPxIe6YxxSaBQqFwgohcbFNmsiKAAAIIINAjgdUDAwPPLRaLq3t0fqqPXbRoUd/222//sIhsnGoIyiOAAAIIIIAAAggggAACCCCAAAKdFThJa81TqzprbM1013UPV0p905rABEUgAQJRFB0bhuFkI1X+5QLWyMjIRmvXrn2cR2E1wshaBNojoJT6ThAEPLu3PZxWTTnttNM2nz9//j0iMmBVcMIigAACCCDQfYEVvu8Pdf9YTqwKHH300a/IZDI/RQMBBBBAAAEEEEAAAQQQQAABBBBAoGMCZnZ2dqcVK1b8sWMnMNgqAdd136+UOtuq0IRFwHKBKIpeF4bhdxup8S8XsKqbs9ns3Uqp7RoZxFoEEGiLwOqZmZktpqenZ9oyjSFWCRQKBV39K9iq0IRFAAEEEECg+wJv8n3/a90/lhOrAp7nvcsY81k0EEAAAQQQQAABBBBAAAEEEEAAAQQ6I2CM+WkYhnt3ZjpTbRRwXfeLSqm32pidzAjYKqCU2rVSqdzeSP4NXsDyPO8HxpgDGxnEWgQQaI+AUuq1QRD8oD3TmGKTwNKlSw/LZDJX2ZSZrAgggAACCHRZ4KGBgYFtisUil9W7DL/+uGw2u1wpdWyPjudYBBBAAAEEEEAAAQQQQAABBBBAIPECSqmzgiAoJr4oBesWcF33dqXUznVvYCECCLQqMHvLLbcMrFq1am0jgzZ4ASuXy30+iqLjGhnEWgQQaJvAh7XWH2rbNAbZJKDy+fxvq7dpbQpNVgQQQAABBLoo8Dnf99/dxfM46p8EXNe9VUR2BwYBBBBAAAEEEEAAAQQQQAABBBBAoDMCSqm9gyD4aWemM9U2gWw2u4XjOA+KyAbvdtjWh7wI2CBgjPmj1nrHRrNu8D9S13XzIuI3Ooz1CCDQuoAx5kdhGL6m9UlMsFFgbGysaIzhAp6Nbx6ZEUAAAQQ6LhBF0aKJiYnvdfwgDtigwNDQ0NaO49zHN3v4A4IAAggggAACCCCAAAIIIIAAAgh0TOBurfXzRcR07AQGWyUwPDx8WBRFPEHHqneNsAkQuDYIgoMa7fFsjyB8kzHmq40OYz0CCLRFYN3MzMzW09PTj7RlGkOsEjj99NN36uvr+72IOFYFJywCCCCAAAIdFqj+xsmCBQt2LhaLUYePYvyzCGSz2Tcrpb4CEAIIIIAAAggggAACCCCAAAIIIIBAxwQu0Fqf2rHpDLZOwPO8UREpWRecwAjYLaCDIPAarbDBC1gjIyN7rl279pZGh7EeAQTaI2CMOTIMQy5BtofTuimFQuHbIvIG64ITGAEEEEAAgc4KnO37/gc7ewTT5xLIZrMTSqmlKCGAAAIIIIAAAggggAACCCCAAAIIdEZg3bp1+11++eU3dmY6U20U8DxvWkTebmN2MiNgq4BS6pxKpfKBRvNv8ALW3nvvPW/PPfd8XETmNTqQ9Qgg0BaBT2utT27LJIZYJ7B06dK3ZDKZL1kXnMAIIIAAAgh0TsBEUbT7xMTE7zp3BJNrCWSz2R8qpV5dax2vI4AAAggggAACCCCAAAIIIIAAAgg0JXCb1vqFTe1kU2IFPM/7o4jskNiCFEMghgJKqcWVSuWSRqNt8AJWdYjrureKyO6NDmQ9Agi0ReA3Wus92zKJIdYJFIvFvjVr1tzO/5my7q0jMAIIIIBAhwSiKFo5MTFxSIfGM7YOgcMPP3z+Vltt9YgxZn4dy1mCAAIIIIAAAggggAACCCCAAAIIINCggDHmzDAMP9LgNpYnWOC4447bbmZm5u4EV6QaAnEVeEMQBFc1Gm6uC1hfE5EjGh3IegQQaI/A7OzsLitWrPhDe6YxxTaBfD7/IaVUsbHcRkSe9a/1xkaxGgEEEEAAgRgJRFF0zMTERDlGkVIXxfO8g4wx3+9pcf6vTk/5ORwBBBBAAAEEEEAAAQQQQAABBDoqYIwxu4Vh+PuOnsJwqwQ8z3ubiFxhVWjCIpAAAcdx9iiXy9UPrWro61l/Up/NZieUUksbmsZiBBBom4DjOMdXKpXPt20gg6wSOOOMM7adnZ29g0fBWvW2ERYBBBBAoDMCjw4MDGxbLBZXd2Y8U+sR8DyvYIwZr2ctaxBAAAEEEEAAAQQQQAABBBBAAAEEGha4Tmt9YMO72JBogVwud54x5vREl6QcAvETmH3wwQc3vvLKK59sNNpcn4B1gohc3OhA1iOAQHsElFLTQRC8oz3TmGKjQKFQqN5or95s5wsBBBBAAIE0C3zO9/13pxkgDt1d1+UTkuPwRpABAQQQQAABBBBAAAEEEEAAAQQSKWCMOTEMw88kshylmhbwPO9aETmg6QFsRACBZgR+HwTBC5rZONcnYL1WKfW9ZoayBwEE2iLw6K9//eutV61atbYt0xhinUA+nz9UKXW1dcEJjAACCCCAQHsFXu77/s3tHcm0RgQGBwcz/f39D4jI5o3sYy0CCCCAAAIIIIAAAggggAACCCCAQF0CM5lMZrtyufxgXatZlAqBvffee95ee+31iIgMpKIwJRGIiYAx5tta6zc2E+dZL2Adf/zxz1uzZs2fmhnKHgQQaI+AUuqQIAhWtmcaU2wUKBQKN4nIy2zMTmYEEEAAAQTaIHCt7/sHtWEOI1oQyOVy+0RRdGMLI9iKAAIIIIAAAggggAACCCCAAAIIIPAsAsaYr4Rh+BaAEHimwMjIyL7r1q27ARUEEOiugFLq05VK5eRmTn3WC1jVYa7rVm/ZbtnMYPYggEDrAsaY88IwHG19EhNsFRgdHT3OcZzP25qf3AgggAACCLQiEEVRdmJiYqqVGextXcB13dNF5LzWJzEBAQQQQAABBBBAAAEEEEAAAQQQQGADAoNa6yuQQeCZAtXvySml+J4cfywQ6LJAFEWnhmF4QTPH1rqAVX0E4WubGcweBBBoi8CvtNYvasskhlgpcMopp8xfsGDBHSLyPCsLEBoBBBBAAIHmBe5fvXr18y+88MInmx/BznYIuK77dRH5j3bMYgYCCCCAAAIIIIAAAgikUcCIyJw/jkojCp0RQACB9QKPLly4cJvzzz9/DSQIPFPAdd2vKKXejAoCCHRXwBjz71rrK5s5tdYFrE+JyEnNDGYPAgi0R8BxnF0rlcrt7ZnGFBsFCoXCWSJypo3ZyYwAAggggECzAkqpc8bHxz/Q7H72tUdgcHAw09/fX/1k5M3aM5EpCCCAAAIIIIAAAggggAACCCCAAALrBRzHuaRSqSxGBIF/ElCe590nIlsjgwACXRfYPQiC3zZzaq0LWO8Wkc80M5g9CCDQNoGTtdafbts0BlknsHTp0oWZTKb6KVgbWReewAgggAACCDQnsLavr+8F55xzzh+b286udgkcddRR+/b19d3QrnnMQQABBBBAAAEEEEAAAQQQQAABBBB4WsBxnH0rlcpPMEHgmQK5XO7Fxpifo4IAAl0XWHfLLbcsWLVq1dpmTq51AesAEbm2mcHsQQCB9ggopb4ZBAGPfGkPp7VT8vn8cqXUsdYWIDgCCCCAAAINCBhjpkqlUraBLSztkIDrunkR8Ts0nrEIIIAAAggggAACCCCAAAIIIIBAmgVu1lq/PM0AdN+wgOu6Jyql+IAO/oAg0H2BW4Mg2KPZY+e8gDU4OLhZf3//Qzycu1le9iHQFoE1G2+88dYXX3zx6rZMY4iVAsuWLdsziqJfiohjZQFCI4AAAggg0ICAMWb/UqnEpy41YNappZ7nfaP6zPtOzWcuAggggAACCCCAAAIIIIAAAgggkFYBpdS7giC4OK396f3sAp7nTYnI0RghgEDXBb4RBMERzZ465wWs6lDXdauPvdqx2QPYhwACrQsYY44Mw/CrrU9igs0ChULhyyJypM0dyI4AAggggEAtAaXU98bHxxfVWsfrnRdYtGhR3/bbb/8XEdmk86dxAgIIIIAAAggggAACCCCAAAIIIJAqgcfmz5+//fLlyx9LVWvK1iXged4fRWSHuhazCAEE2iaglPpEpVJZ0uzAmhew+I3nZmnZh0BbBSa11jx+rq2k9g3L5/P7KaWuty85iRFAAAEEEGhI4Ejf97l43hBZZxYPDQ0d6DjODzoznakIIIAAAggggAACCCCAAAIIIIBAqgU+p7V+d6oFKL9BgWw2u7vjOLfCgwAC3RcwxpystW768Z81L2Bls9lxpVSh+9U4EQEE1gsYYx685557tlm5cuU6VNItMDo6+l3HcfhUkHT/MaA9AgggkGSB3w4MDOxRLBajJJe0pZvrumeJyJm25CUnAggggAACCCCAAAIIIIAAAgggYItAFEUvm5qa+pktecnZPQHP894jIhd170ROQgCB9QKO47y+XC5f3axIzQtYrut6IlJp9gD2IYBAewSMMa8Lw/C77ZnGFFsFRkdH3+g4zpW25ic3AggggAACcwkopU4YHx+/FKV4CGSz2R8qpV4djzSkQAABBBBAAAEEEEAAAQQQQAABBJIhEEXRyqmpqUOS0YYW7RZwXfeLSqm3tnsu8xBAoC6B7YIguLeulRtYVPMClud5LzPG3NTsAexDAIG2CVygtT61bdMYZK1AoVBYJSKvtLYAwRFAAAEEENiwwF0DAwMvKBaLMwD1XmBkZGTztWvX3i8ifb1PQwIEEEAAAQQQQAABBBBAAAEEEEAgOQKO47ytUql8KTmNaNIugcHBwcxGG210nzFmy3bNZA4CCNQt8FAQBC39t1fzAtbhhx8+f8stt3xMRObVHYuFCCDQCYE7tNa7iIjpxHBm2iNQKBTeLCJfsScxSRFAAAEEEKhL4DTf9z9Z10oWdVxgeHj4LbOzs3wjsOPSHIAAAggggAACCCCAAAIIIIAAAikTuPPuu++g9KAcAAAgAElEQVR+wcqVK9elrDd16xAYHh7eL4qi6+tYyhIEEGi/wLVBEBzUytiaF7Cqwz3Pu9kY89JWDmIvAgi0LqCU2jsIgp+2PokJtguMjo7e4DjOvrb3ID8CCCCAAAJ/E3hwYGBg52Kx+FdE4iHguu5nROTd8UhDCgQQQAABBBBAAAEEEEAAAQQQQCAxAgWtdSkxbSjSVgHP884QkXPaOpRhCCBQr8DFQRC8q97FG1pX1wWsbDa7XCl1bCsHsRcBBFoXUEp9JAiCM1ufxATbBfgULNvfQfIjgAACCDxTwBhzRqlU+igq8RHwPO+3xpgXxCcRSRBAYC4BpdTpIsIlVv6YIIAAAgjEXsAY8yYR+Y/YByUgAggggAACnRF4fGZmZsfp6em/dGY8U20XyOVy1xhjDrG9B/kRsFTgtCAIWnpKR70XsE5WSl1oKRKxEUiSwC+01i9JUiG6NC2gRkdHb3QcZ++mJ7ARAQQQQACBeAhUv+G0q+/7j8QjDilyudwuURT9HgkEELBG4E6t9U7WpE1A0Oo300wCelABAQQQ6IXA4ODgc+bNm7dKKfXCXpzPmQgggAACCPRSQCl1fhAE7+tlBs6Or8DixYsXrF69+kER2Si+KUmGQKIF3hAEwVWtNKzrAtbw8PCrZ2dnf9jKQexFAIH2CCil9gyC4DftmcYUmwXy+fyblFJftbkD2RFAAAEEEBCR9/u+fy4S8RFwXbf66MHqIwj5QgABOwQmtdZ8arkd7xUpEUAAAQRE5Kijjtq3r6/vWhHpBwQBBBBAAIEUCcyIyAu01nelqDNVGxDwPK/6KaFfb2ALSxFAoI0C/f392y9fvvyeVkbWdQGretvy8ccfr/5Gel8rh7EXAQRaFzDGnBmG4Udan8SEBAhUPwXresdx9k1AFyoggAACCKRT4IGBgYFdisUij82K0fvvum71Gz08FiZG7wlREJhLwBgzHIZhBSUEEEAAAQRsEnBdt/r43PNsykxWBBBAAAEEWhFwHOeSSqWyuJUZ7E22QC6X+5Qx5qRkt6QdArEVeDgIgi1aTVfXBazqIa7r/kJEXtTqgexHAIGWBXgMYcuEyRkwOjp6sOM4K5PTiCYIIIAAAmkSMMbkS6XSRJo6x73rkiVLBu67774HRGRB3LOSDwEE/k8gk8nsVC6X78QDAQQQQAABywTU0NDQVxzHeZNluYmLAAIIIIBAMwKzxpi9wjC8rZnN7EmHgOd5v61+Slo62tISgdgJXBcEwYGtpqr7AlY2m71MKTXc6oHsRwCBtgi8SGv9q7ZMYoj1AoVCofos2sOsL0IBBBBAAIG0CfxpYGDgBcVicXXaise5b/Wjzo0xfNR5nN8ksiHwDAGl1G+DINgdFAQQQAABBGwUGBwcfG5/f///isj2NuYnMwIIIIAAAg0ITGmtsw2sZ2nKBHK53F7GGH72m7L3nbrxEVBKteVTCuu+gOV53qnGmE/Eh4AkCKRXQCl1VhAExfQK0PyZAmNjY/saY64Xkbr/TkcQAQQQQACBGAic5vv+J2OQgwjPEPA87yJjzHtAQQABOwR4hIUd7xMpEUAAAQSeXSCbzb5WKXVN9UMdcUIAAQQQQCChAmZ2dnbvFStWVC8d84XABgWqj2dWSvF4Zv58INA7gdOCIGj55xV1/7B+aGjoQMdxftC7vpyMAALPEPiN1npPRBBYL1AoFK4QkbchggACCCCAgA0Cxpjb16xZs9eFF174pA1505TRdd0/iMhOaepMVwRsFlBKZYMgmLK5A9kRQAABBBBwXfcsETkTCQQQQAABBJIooJT6WhAEPHI3iW9uGzu5rnuVUoqn3bTRlFEINCLgOM7ry+Xy1Y3s2dDaui9gDQ4OPqe/v/9hfhOlVXL2I9A2gZdqrX/etmkMslpg2bJlL4yi6Jci0md1EcIjICKGj3PjzwECaRAY8n1/RRqK2tRxaGjopY7j3GxTZrIikHaB+fPnb798+fJ70u5AfwQQQAABuwWKxaJz6623Vn/o+Dq7m5AeAQQQQACBDQocqLW+DhsEnk0gl8ttbIx5UETmo4QAAr0RmJ2dfe7U1NQDrZ5e9wWs6kGu61afO7pXq4eyHwEE2iJwttb6g22ZxJBECOTz+c8ppRYnogwlEEAAAQQSKxBF0Y0TExP7/+2+ZWJ72ljMdd0xEfmojdnJjEBKBX6tteZ7NCl986mNAAIIJE1geHh4+3Xr1t2slNoqad3ogwACCCCQXoEoilZOTU0dkl4BmtcjMDw8/JYoir5Uz1rWIIBARwTuCoLg+e2Y3OgFrIqIeO04mBkIINCagDHm1jAM92htCruTJLB06dKFmUzmVhHZLEm96IIAAgggkCwBpdSh4+Pj1ySrVTLaeJ73A2PMgcloQwsEki+glPpMEAQnJr8pDRFAAAEE0iIwNDR0pOM4X05LX3oigAACCCRfQCn1hiAIrkp+Uxq2IpDL5crGmFwrM9iLAAItCbTtUbGNXsA6SUQ+1VJ0NiOAQNsEjDH7hGG4qm0DGWS9QD6fX6aUOtf6IhRAAAEEEEikQBRFX5uYmHhTIstZXmpoaGhrx3H+xCPnLX8jiZ8qAaXUUUEQ/FeqSlMWAQQQQCDxAq7rflZE3pX4ohREAIH/z96dx8lRVvsfP0/1LCFxAWSTBMEFAfG6RRBxCwJi3K4gI5mq6nGIEHclJpkJwaVdIJkhECVXVIQ4TlfVgK0obgiCRtSLiFEUxQAR16CGVRSSWbrO71WK9+cCpJfq7lo+/Xrd1/3D5znne97VmqT76SoEEMiDwA9834/uAs8LgYcVWLBgQde8efOiz+S4CyjvEwQ6J/Ahz/PeF0f7ug5g2bY93xjzwzgaUwOBTguoiNT1X4BOB36I/saYdZ7nvTuB0YjUIYFSqTRrx44dm1V1/w5FoC0CCCCAAAIPJzBtWdYzVq9evRmi5Am4rnuyqm5IXjISIYDAwwjoLrvs8vgLL7zwTwghgAACCCCQJYHBwcFZ09PTPxCR/8rSXMyCAAIIIJA/gUKhcOz4+PhV+ZuciesRcBznaGMM75N60FiLQMwCxpjXlcvlWB4DWtf5k+gE5ty5c+8VkTkxz0Q5BBBoTGDb1q1b527cuHGmse3syqLA8PDwIhGZyOJszIQAAgggkGqBc0dGRpaleoIMh3dd90uq+uoMj8hoCGRN4Ge+7/PFdNauKvMggAACCPxNoFgsPj0Mw+tFZBYkCCCAAAIIpFTgGt/3X5LS7MRuo4DruutF5O1tbEkrBBD4N4EwDJ8cBMFtccDUdQAraug4zrdF5MVxNKcGAgg0L2BZ1svL5fIVzVeiQoYEzNDQ0PeMMc/P0EyMggACCCCQYgFV3WaMeerIyMifUzxGZqP39fU9qqenZ5uI7JLZIRkMgewJrPd9/53ZG4uJEEAAAQQQ+LuA67rvVtVz8EAAAQQQQCCNAoVC4cjx8fFr05idzG0VMI7j/MYYs19bu9IMAQT+WeA+z/N2FZHoAWpNvxo5gDUiIkNNd6YAAgjEJVD2fX8grmLUyYbAihUrnmNZVnS79kI2JmIKBOoRyMJDZuuZl7UIJF9AVU8ZHR29KPlJ85nQcZwTRaSSz+mZGoF0ChQKhRPGx8e/kM70pEYAAQQQQKAmgegLyS+LyCtrWs0iBBBAAAEEEiJgjPmy53mvSUgcYiRYoFgsPldVo7t+8kIAgc4JfNvzvAVxta/7ANbAwMDx1Wo1lucfxjUEdRDIucD9lmXtXS6X78+5A+P/m8DQ0NAnjTFLgEEAAQQQQKDDAj/aZZddDiuVSmGHc9D+YQRc1/VU1QEIAQRSI1Cdmpraq1Kp3J2axARFAAEEEECgAYHBwcF9ZmZmfqqqezawnS0IIIAAAgh0QiA0xjzH87yfdKI5PdMlUCwWP6Sq70lXatIikC0BY8x55XL5XXFNVfcBrFNOOWXv7du3/zGuANRBAIHmBVTVDYLAb74SFbIkcPrppz8uDMObReRxWZqLWRBAAAEEUiUQHbp60cjIyP+mKnWOws6fP7/74IMP/pOI7JajsRkVgbQLfN/3fR43nvarSH4EEEAAgZoEHMdZKCJfFZG6v8uoqQGLEEAAAQQQiFEgDMPPTExMDMZYklIZFnBd9yYROSTDIzIaAokXCMPw5CAIxuIK2tA/WhzH+ZWIHBBXCOoggEBzAqp6RRAEL2+uCruzKDA8PPwmEflEFmdjJgQQQACB5Auo6gWjo6PRn0W8EirgOM7LROSKhMYjFgIIPISAMeZDnue9DxwEEEAAAQTyIuC67npVfXte5mVOBBBAAIHUCmyvVqsHXXzxxb9L7QQEb5uA67rPFJEb2taQRggg8JACYRg+OwiC2P672NABLNu2J4wxi7hGCCCQGIFqoVDYf3x8fGtiEhEkEQKlUsnavn37tSJyeCICEQIBBBBAIE8Cd87MzBxyzjnn3JmnodM2q+M4HxeRN6ctN3kRyLNAGIYvmpiY+G6eDZgdAQQQQCBfAkuXLt1l27Zt14vIofmanGkRQAABBFImsNr3/VUpy0zcDgkUi8UPq+oZHWpPWwQQ+LvA1OTk5KMrlcpUXCCNHsB6pzHmo3GFoA4CCDQvEP0hHQTBWc1XokLWBIaGhg43xkSPfipkbTbmQQABBBBItEBxZGTES3TCnIfr6+sr9PT0/F5E9sk5BeMjkCaBP2/dunWPjRs3zqQpNFkRQAABBBBoVqC/v/8ZhULhB6ra22wt9iOAAAIIIBC3gDHmDlV9iu/798Vdm3rZFHBd9xYROTCb0zEVAukQMMb8oFwuPy/OtA0dwBoYGDi8Wq1eF2cQaiGAQNMCt/m+/xQR0aYrUSBzAsPDw+eJyDsyNxgDIYAAAggkUsAY8+01a9Ycxd9LEnl5/i9Uf3//Sy3LujrZKUmHAAL/LBCG4RcmJiZOQAUBBBBAAIE8Cti2vdQYc24eZ2dmBBBAAIHEC7zN9/3zE5+SgIkQcF33OSKyKRFhCIFAvgX+x/O8WL8/b+gAVl9fX09PT889IjI739eD6RFIloAx5ijP8zYmKxVpkiAwNDT0aBH5uTFmvyTkIQMCCCCAQKYFdliW9czVq1dHv+LilWABx3E+ISJvSnBEoiGAwL8JqOpbgyCIHh3KCwEEEEAAgTwKGNu2LzfGHJfH4ZkZAQQQQCCxAjdt3rz5WZs2bZpObEKCJUrAdd01IjKcqFCEQSCfAm/wPG88ztEbOoAVBbBt+2pjzEvjDEMtBBBoWqDs+/5A01UokEmB008//RVhGH41k8MxFAIIIIBAYgSMMSvXrFkzkphABHlIgQULFnTNnTt3q4jsBRECCKRHQFWfHATBbelJTFIEEEAAAQTiFSgWi3uFYfhTEdk73spUQwABBBBAoDEBy7JeXi6Xr2hsN7vyKOC67hYReXIeZ2dmBJIk0NXVdcjY2NjmODM1fADLcZz3icgH4gxDLQQQaFpge3d3975jY2P3Nl2JApkUGBoa+rwxhkeWZPLqMhQCCCCQCIEf33PPPc+74IIL+MVfIi7Hw4coFovHhWH49YTHJB4CCPyTgDFmi+d5B4KCAAIIIIBA3gUcx1koItGPDBv+fiPvhsyPAAIIIBCPgKp+PgiCE+OpRpU8CAwMDBwehuF1eZiVGRFIuMB9T3nKU3YrlUphnDkb/geK67oLVPVbcYahFgIIxCLwFt/3o8fJ8ELgPwSGhob2NcbcJCKPhQcBBBBAAIGYBaaq1epha9eujX6NzivhArZtbzDGnJzwmMRDAIF/FTjf9/23gYIAAggggAACIo7jRI/kfTMWCCDQjIByjrEZPvYiILK9Wq0+7eKLL/41GAjUKuC67noReXut61mHAAItE7ja87xj4q7e8AGswcHBWTMzM/eqam/coaiHAAKNC6jqD4MgOKzxCuzMusDQ0NAbjTEXZn1O5kMAAQQQaK+AqpZGR0e5Q2572Rvq1tfX19PT0/NHEdmtoQJsQgCBjgio6muDILisI81pigACCCCAQMIElixZMvv+++//oYgckrBoxEEAAQQQyIlA9FlYEAR8FpaT6x3HmAsWLOiaN2/e73mUchya1ECgOQFVXe37/qrmqvzn7oYPYEWlHMe5RkReFHco6iGAQHMCxpj5nuf9qLkq7M6wgBkeHr5cRI7L8IyMhgACCCDQXoEbd9lll+eWSqWp9ralWyMCruu+UlW/0she9iCAQMcEoke77uH7/n0dS0BjBBBAAAEEEiawaNGiZxcKhe+LSE/CohEHAQQQQCD7ArfttddeT1+3bt327I/KhHEJFIvFV6vql+KqRx0EEGhcwLKsE8bHx7/QeIWH3tnsAawPich74g5FPQQQaE5AVS8MguDU5qqwO8sCS5cundvT03Mjd77I8lVmNgQQQKBtApMi8ryRkZGftK0jjZoScBxnXESKTRVhMwIItFvgO77vv7jdTemHAAIIIIBA0gVc112uqmcnPSf5EEAAAQSyJWCMWeh53tezNRXTtFrAdd3Pikhfq/tQHwEEdi5gWda88fHxrTtfWd+Kpg5gua57rKpeWV9LViOAQBsEHlDVeUEQ3NOGXrRIqcDKlStPUdVPpTQ+sRFAAAEEkiMwPDIyMpqcOCR5JIFisThHVf+oqo9CCgEE0iOgqu8NguDD6UlMUgQQQAABBNojUCqVrFtvvfUKETmmPR3pggACCCCAgFzi+/4iHBCoR6Cvr++xvb29fxCRXerZx1oEEGiJwB88z9u3FZWbOoAVfXgfhmF0wKO7FeGoiQACjQuo6ruCIDiv8QrszIPA0NDQ16JfauRhVmZEAAEEEGiJwHdvu+22BZVKpdqS6hSNXcBxHFdEyrEXpiACCLRUoFAoPG98fPwHLW1CcQQQQAABBFIqsHjx4n137NjxU2PM41I6ArERQAABBNIjcF+hUHhaK+6akh4CkjYiUCwWT1XVCxrZyx4EEIhd4Aue550Qe1URaeoAVhTIcZxrReSIVoSjJgIINCXwC9/3DxURbaoKmzMt8OCjCH8qIrtnelCGQwABBBBohcB9xphnrlmz5tetKE7N1gjYtv11Y8xxralOVQQQaIWAqt41PT29N4ddW6FLTQQQQACBrAgMDAwcX61WL83KPMyBAAIIIJBYgbf7vv+xxKYjWGIFXNe9RkRelNiABEMgRwLGmFXlcnl1K0aO4wDWiIgMtSIcNRFAoDkBVX1pEATfaq4Ku7MusHLlypNU9eKsz8l8CCCAAALxCqjq4Ojo6GfirUq1Vgq4rvt4Vf2diBRa2YfaCCAQu0Dg+74Te1UKIoAAAgggkDGBYrF4QRiGp2ZsLMZBAAEEEEiOwHUHHnjgkaVSKUxOJJKkQcC27SdZlrUljpvjpGHe2jJGx1S4h0htVqyKWyAMw5cEQRAdioz91fQBLNu2X2GM+WrsySiIAAJNCxhjKp7nvb7pQhTIvMDQ0NC4MaaY+UEZEAEEEEAgFgFV/ezo6OhJsRSjSNsEXNd9t6qe07aGNHpEgegjpqb/QY5xLgSMMbbneRO5GJYhEUAAAQQQaEKgWCzOqVarPzLGPLWJMmxFAAEEEEDgPwSMMZPVanX+xMTEz+FBoF6BYrG4WlVX1ruP9Qgg0BKB6dmzZ+96wQUXPNCK6k1/3rt48eJHT05O3iUi3a0ISE0EEGhKYNoYs7/neX9oqgqbMy8wPDz8WBG5QUQOyPywDIgAAggg0KzALx944IHnrF+//r5mC7G/vQKO4/xYRJ7V3q50QwCBJgVmVHWvIAjuabIO2xFAAAEEEMiFQLFYfG4Yht8TkZ5cDMyQCCCAAAJtEVDV9wZB8OG2NKNJpgQWLFjQNW/evN+IyL6ZGoxhEEipgKpe6/v+ka2K3/QBrCiY67rfUdUXtiokdRFAoHEBY8yHPM97X+MV2JkXgRUrVrzAsqxv81iivFxx5kQAAQQaEphW1RePjo5+v6HdbOqYgOM4TxMRfqXZsStAYwQaEwjDcOPExMRRje1mFwIIIIAAAvkUcBwnusPE6nxOz9QIIIAAAi0Q+MnmzZsP27Rp03QLalMy4wKu675GRC7L+JiMh0CaBNZ6nreiVYFjOYDlOE50uOMDrQpJXQQQaFzAGHPHnnvuuf+6deu2N16FnXkRWLly5YdV9Yy8zMucCCCAAAL1CRhj3r1mzZp19e1idRIEHMcZEZGhJGQhAwII1C5gjFnhed7a2newEgEEEEAAAQRKpZJ1yy23fMMY81I0EEAAAQQQaFJgplqtHn7xxRdHdxXnhUDdAq7rRoevokNYvBBAIBkCx3ue98VWRYnlAJbrukeqanRbX14IIJBAAWPMqZ7nXZjAaERKmECpVOravn37t0SEuxom7NoQBwEEEOi0gKp+ZXR0NPqwQDudhf71CUS3Ot93331/Y4zhVuf10bEagY4LWJb1tHK5/IuOByEAAggggAACKRNYvHjxvlNTUzeo6p4pi05cBBBAAIFkCZzp+/57khWJNGkRGBwc3GdmZua3ItKdlszkRCDjAmqM2adcLm9r1ZyxHMCKPtCfO3funSLy2FYFpS4CCDQl8HPf9/+LL0ybMszN5qGhoXnGmOjXHHvkZmgGRQABBBB4RAFjzG+mp6efe84550R/5+eVMoHoVueqyq3OU3bdiIuAMeaXnuc9BQkEEEAAAQQQaEzAdd2Xq+rXRCSW70EaS8EuBBBAAIEUC9wwNTX1vEqlMpXiGYjeQYHoscjGGB6L3MFrQGsE/lnAGHNzuVw+uJUqsf3Do7+//zLLsrh9XiuvFrURaELAGPMyz/O+0UQJtuZI4PTTT39FGIZf4QOqHF10RkUAAQQeXmCHMeaFa9as2QRSOgX4t1o6rxupETDGrPM8791IIIAAAggggEDjAsVicW0Yhssar8BOBBBAAIE8ChhjJlX1MN/3b8zj/MzcvED0SOQtW7bcLCL8sKp5TiogEIuAMWZDuVx+YyzFHqZIbAewHMd5h4ic18qw1EYAgcYFjDFf8zzvlY1XYGfeBIaHhz8iIu/K29zMiwACCCDwrwKqesro6OhFuKRTILrV+fT0NLc6T+flI3XOBarV6jEXX3zx1TlnYHwEEEAAAQSaEpg/f373wQcffI2IHNFUITYjgAACCORKwBizzPO8c3M1NMPGKuA4zsLou9lYi1IMAQSaFVjsed6nmy3ySPtjO4A1ODh48PT09C9aGZbaCCDQlIBalnVouVzmv6dNMeZnc6lU6tm+fft3ROTw/EzNpAgggAAC/yygqheOjo6eikp6BRzHOV1EzkrvBCRHILcC901NTe3Joy5ye/0ZHAEEEEAgRoGTTjrpyV1dXT8SkcfEWJZSCCCAAALZFfjOgQceuKBUKoXZHZHJWi1QLBa/rKqvanUf6iOAQO0ClmUdND4+fkvtO+pfGdsBrKi14zjRL6v3qz8GOxBAoE0Cn/B9/y1t6kWbDAgMDw8/QUSiR07tkYFxGAEBBBBAoA4BVf3h7NmzX1QqlXbUsY2lyRIwruveoqrc6jxZ14U0COxUwBjzOc/z+na6kAUIIIAAAgggUJOA67r9qhrUtJhFCCCAAAJ5Fvizqj4zCILf5BmB2ZsTGBgYeEIYhreJSKG5SuxGAIEYBe7wPG9vEdEYa/5HqbgPYEW36xpsZWBqI4BA4wLRM6tF5Ime5/2h8SrszJvAypUrX6qqV/IXxbxdeeZFAIGcC/ypq6vrsDPPPPN3OXdI9fi2bR9ljPlmqocgPAL5FRj0ff8z+R2fyRFAAAEEEIhfoFgsXhSG4eL4K1MRAQQQQCBDAo7v+xzYzdAF7cQoxWJxtaqu7ERveiKAwMMKfMHzvBNa7RP3ASxbRPxWh6Y+Agg0LmCMOcvzvDMar8DOPAoMDw+vEpEz8zg7MyOAAAI5FJgWkWNGRkauyeHsmRrZdV1PVZ1MDcUw/yEQ/WQr1n/YY5wEgdCyrMeXy+VtSQhDBgQQQAABBLIiUCwW54RheL2IHJKVmZgDAQQQQCA+AVW9MAiCU+OrSKU8CixcuLB3jz32+K2q7pXH+ZkZgaQKhGH4riAIzmt1vlg/py0Wi3uFYRjdWcdqdXDqI4BAwwL39vb2PmHDhg1/abgCG/MoYIaGhj5njGn5yeA84jIzAgggkCQBY8ypa9asuTBJmchSv8DAwMDjqtXq70VkVv272YEAAh0W+L7v+8/vcAbaI4AAAgggkEmB/v7+Qy3Luk5E5mRyQIZCAAEEEGhU4KY5c+YcdsEFFzzQaAH2IRAJ2LZdtCxrHA0EEEiWgKo+w/f9G1udKtYDWFFYx3Gif7wc3urg1EcAgcYFjDErPM9b23gFduZR4LTTTtu1t7f3+yJyUB7nZ2YEEEAgJwLnjoyMLMvJrJke03XdFao6mukhGQ6B7Aq8x/d97j6b3evLZAgggAACHRYoFouLwjCc6HAM2iOAAAIIJEdghzHmCM/zfpKcSCRJq8DAwMC1YRgekdb85EYgowJ3eJ63t4hEDxNo6Sv2A1i2bb/fGFNqaWqKI4BAswJbp6amnlSpVKaaLcT+fAkMDQ0dZIyJDmHtmq/JmRYBBBDIvoCqXv6rX/3q1ZVKpZr9abM9YalUsrZs2XKLqj4525MyHQKZFWjLL/Iyq8dgCCCAAAII1CDguu75qvqWGpayBAEEEEAg4wLGmDd7nvfJjI/JeG0QGBwcPGxmZuYHbWhFCwQQqE+g4nne6+vb0tjq2A9gnXTSSYd1dXXxPyyNXQ92IdA2AcuyTimXyxe1rSGNMiOwcuXKl6nq10SkkJmhGAQBBBDIuYCq/swY88KRkZE/55wiE+M7jrNQRKI/q3khgED6BG71ff+p6YtNYgQQQAABBNIlMH/+/O6DDjro28YYHvubrktHWgQQQCBugQnf9+24i1IvnwKO41xsjDkpn9MzNQKJFnir53kfb0fC2A9gRb+2vvXWW28XkegWXrwQQCC5ApsPPPDAQ0ulUpjciCRLqsDw8PByETk7qVoItqUAACAASURBVPnIhQACCCBQl8DtXV1dR5x55pm/q2sXixMr0N/ff5llWa9JbECCIYDAIwmM+r4/DBECCCCAAAIItF5g0aJFBxQKhU0isnvru9EBAQQQQCCBAj+3LOt55XL5/gRmI1LKBAYGBuaGYfgrEelOWXTiIpB5ga6urkPGxsY2t2PQ2A9gRaH7+/vHLMt6QzsGoAcCCDQuYFnW68vlcqXxCuzMs8DQ0NCFxpg35tmA2RFAAIEMCPxFRF40MjLykwzMwggiMjAw8IRqtXobd6rk7YBAOgUsyzqiXC5fl870pEYAAQQQQCB9ArZtv8IY82URsdKXnsQIIIAAAo0KGGP+aow5vFwu/6LRGuxD4J8FXNcdFZEVqCCAQOIE/uB53lwR0XYka8kBLNd1X6+ql7RjAHoggEBTAj8/8MADn8FdsJoyzO3mUqk064EHHrjKGPOC3CIwOAIIIJBugWljzKvWrFlzZbrHIP0/CziOc5aInI4KAgikUmCr7/v7tesDoVQKERoBBBBAAIEWCDiO82EROaMFpSmJAAIIIJBQAW5QkNALk9JYS5Ysmb19+/bfqSp31UzpNSR2dgWMMUG5XHbaNWFLDmANDg7uOj09vY1b7LXrMtIHgcYFLMt6XblcvrTxCuzMs8CyZcv26OrqulZEnpJnB2ZHAAEEUiigqvrG0dHRT6cwO5EfRqCvr6+np6fntzwOnrcIAqkV+Jjv+29PbXqCI4AAAgggkFKBvr6+Qm9v7xWqenRKRyA2AggggEAdAmEYfmRiYmJpHVtYisAjCriuG/1bfj1MCCCQSIFTPc+7sF3JWnIAKwrvuu5GVX1JuwahDwIINCxwg+/7z+FX1g375X7jypUrn6Sq3xeRPXOPAQACCCCQEgFVHRodHT07JXGJWaOAbduOMcarcTnLEEAgYQJhGB49MTHxzYTFIg4CCCCAAAK5EOjr69uzp6fnehHZPxcDMyQCCCCQUwFV/ebtt99+3MaNG2dySsDYMQuUSiVry5Yt0aMsnxpzacohgEA8Agd6nrclnlI7r9LKA1jDqrpm5xFYgQACnRZQ1dcGQXBZp3PQP70Cw8PDLxSRq0SkN71TkBwBBBDIjcD6kZGRd+Zm2hwN6jjOD0TksByNzKgIZEZAVe+6/fbb9+FLgMxcUgZBAAEEEEihgOu6z1TV74nInBTGJzICCCCAwM4Ffj01NXV4pVK5Y+dLWYFAbQLFYvEEVf18batZhQAC7RRQ1d/5vv+EdvZs2QGsYrH49DAMb2znMPRCAIHGBIwxP/Y8bz53wWrMj11/F1ixYkW/ZVm+iLTszxasEUAAAQSaE1DVz4yOjp7Mn/nNOSZxt23bLzbGfDuJ2ciEAAI7F7Asa0O5XH7jzleyAgEEEEAAAQRaKTAwMHB8tVqNvkTl861WQlMbAQQQaLOAMeavqnqk7/t8d91m+6y3KxaL16nq4Vmfk/kQSKNAGIbjQRC8oZ3ZW/qPCMdxfs0te9t5OemFQFMCr/Z9/ytNVWBz7gWGhoZWGGNGcw8BAAIIIJBAgTAMvzxnzpwTSqUSt1hP4PVpNlJ/f/+llmUd32wd9iOAQGcEwjB8zcTExJc7052uCCCAAAIIIPDPAq7rllT1/agggAACCGRGQC3LOrFcLl+amYkYJBECjuMcbYyJng7DCwEEEiigqo7v+0E7o7X6ANZHRYTHm7TzitILgQYFVPWHQRBEJ7S1wRJsQ+BvAkNDQ2uNMcvgQAABBBBIlMDVU1NTr163bt32RKUiTCwCtm0/yRhzi4gUYilIEQQQaLfAX7q7u/caGxvb0e7G9EMAAQQQQACBhxQwjuN8TkROwAcBBBBAIP0CxpgPeJ5XSv8kTJA0Add1rxSRY5OWizwIIPA3gdAY8/hyubytnR4tPYBl2/ZRxphvtnMgeiGAQOMChULhhPHx8S80XoGdCPxNwAwNDV1kjIkeccULAQQQQKDDAqr6v7Nnzz6uVCr9tcNRaN8iAcdx+OFLi2wpi0CbBC7xfX9Rm3rRBgEEEEAAAQRqEFi6dOku27Zt+46IzK9hOUsQQAABBBIqYIypeJ53EjcfSOgFSnEs27afZVnWj3hscYovItGzLvBDz/MOa/eQLT2A1dfXV+jp6fmjiOzR7sHohwACDQn8fGpq6pmVSqXa0G42IfCgwJIlS7p33XXXy4wxC0FBAAEEEOiowHWqeuzo6OhfOpqC5i0TcBznMSLyOxGJ/j8vBBBIp8Ai3/cvSWd0UiOAAAIIIJBdAdu29zfG/EBE9srulEyGAAIIZFrg+jlz5iy44IILHsj0lAzXEQHXdSsicmJHmtMUAQR2KmCM+XC5XH7vThfGvKClB7CirI7jfFpEBmPOTTkEEGiRgKoOBEFQblF5yuZIYPny5XMsy/qGMeb5ORqbURFAAIEkCfxocnLy6I985CP3JikUWeIVcF13uaqeHW9VqiGAQLsEjDGTqrqX7/v3tasnfRBAAAEEEECgdoH+/v4XWpZ1tYj01L6LlQgggAACCRD4lWVZR7T70VMJmJsIbRAYGBh4ahiGN4lIoQ3taIEAAo0JvNjzvOiOtm19tfwAlm3b/22M+WJbp6IZAgg0I3Db5s2bD960adN0M0XYi0AkcNppp+3a29v7LRF5FiIIIIAAAm0V+MnMzMwx55xzzp1t7UqztgrMnz+/++CDD94iIk9oa2OaIYBAnAJf9X3/VXEWpBYCCCCAAAIIxCvguu7JqnoRjxiK15VqCCCAQAsF7unu7j5ybGxscwt7UDrHAtENaIwx3IAmx+8BRk+8wH2/+MUv9ujEeYeWH8BasmTJ7Pvvv/8OEZmd+MtAQAQQ+IfAW3zf/wQcCMQhsGzZsj26urq+LSJPi6MeNRBAAAEEdipww8zMzLEcvtqpU+oX2LY9YIz5TOoHYQAEciygqicHQTCWYwJGRwABBNIhEH2KrumISsrWCNi2/V5jzAdbU52qCCCAAAJxCUR3GQ7DcGEQBNEPw3khELuAbdtPsizrZhHpir04BRFAIBYBVb3U9/3XxVKsziItP4AV5env77/Usqzj68zGcgQQ6JzAH+bMmfMUnovduQuQtc6rVq3au1qtRoewDsrabMyDAAIIJEzgx5ZlHbt69eq7EpaLOPELGMdxfioiT4+/NBURQKAdAtEXA11dXfuMjY3xqNh2gNMDAQQQQACBJgVc112vqm9vsgzbEUAAAQRaJ6Cq+oYgCMqta0HlvAsUi8WLVHVx3h2YH4GEC7zJ87wLOpGxLQew+GV2Jy4tPRFoTsAYs8LzvLXNVWE3Av9f4IwzzthvZmbmGhE5ABcEEEAAgfgFwjDcNDMz87J169bdHX91KiZNwHXd16jqZUnLRR4EEKhL4DLf919b1w4WI4AAAggggEDHBPr6+gq9vb1fUNVXdywEjRFAAAEEHlZAVd8VBMF5ECHQKgHbtve3LOsWEelpVQ/qIoBA8wLGmCeVy+VfNV+p/gptOYDV19e3e09Pz5+4FV/9F4gdCHRQ4N5CofCU8fFx7qDRwYuQtdYrVqw40LKs6Na/c7M2G/MggAACnRRQ1WuNMQtHRkb+3Mkc9G6fgOM43xORI9vXkU4IIBC3gGVZ/eVy+eK461IPAQQQQAABBFonsHTp0l22bdt2FX8Xb50xlRFAAIEGBVb7vr+qwb1sQ6AmgYGBgU+FYXhKTYtZhAACHREwxmwul8uHdKS5iLTlAFY0nG3bVxtjXtqpQemLAAL1Cxhj1nme9+76d7IDgYcXWLly5QGqGh3C4k5YvFEQQACBeAS+par/PTo6+pd4ylEl6QK2bb/YGBM92pcXAgikV+CBqampvSuVyl/TOwLJEUAAAQQQyKfAwMDA46rVavSDiIPyKcDUCCCAQOIEPN/3B0REE5eMQJkRGBgYeEIYhrdy96vMXFIGyahAGIYfDYLgtE6N17YDWI7jvENEuO1jp640fRFoQMAYMxmG4dOCILitge1sQeBhBTiExZsDAQQQiEcgDMPL5syZs6hUKu2IpyJV0iDgOM5XROSVachKRgQQeFiBS3zfX4QPAggggAACCKRTwLbtJxlj/ldE9k7nBKRGAAEEMiNw2datW0/cuHHjTGYmYpBECriu+wkReVMiwxEKAQT+WWCh53lf7xRJ2w5gLV68eN/JycnfiYjVqWHpiwACDQnwxUBDbGzamcCyZcv27+rq2sidsHYmxX+OAAIIPLSAqpZnz569uFQq8QFTjt4k/f39z7As64Z23s04R7yMikDbBMIwPH5iYuKLbWtIIwQQQAABBBCIXcC27fmWZW1U1UfFXpyCCCCAAAK1CFx19913v+ryyy+frGUxaxBoVKBYLD5RVTdz96tGBdmHQNsE/trV1bXn2NhYx36w3rYDWBGp4zjRYzJe3DZeGiGAQBwCaox5oed50S+6eCEQq8CKFSueXCgUrlbV/WMtTDEEEEAg4wJhGK49++yzh7i1esYv9EOM5zjOJSLy+vxNzsQIZErgvu7u7r07+WFQpjQZBgEEEEAAgQ4KOI7zAhG5QkTmdDAGrRFAAIE8Cnx/amrqWB7rnsdL3/6Zbdv+jGVZ0WMueSGAQIIFVPVS3/df18mI7T6A9TYR+Z9ODkxvBBCoX0BVrw2CIPowgedn18/Hjp0InHHGGfvNzMx8Q0QOAgsBBBBAYKcCqqrDo6OjZ+90JQsyJ+A4ztNE5EbuKpy5S8tA+RMY833/5PyNzcQIIIAAAghkU8B13WNV9UsiMiubEzIVAgggkCwBY8xPwzBcEATBPclKRposCriuG3139TMR6crifMyEQJYEwjA8OQiCsU7O1NYDWIODg/tMT0//XkQKnRya3gggUL8Aj8io34wdtQssX758r0KhEP1a8Fm172IlAgggkDuBKRE5eWRkJMjd5Az8NwHufsUbAYFsCBhjFnqe9/VsTMMUCCCAAAIIIBAJ9Pf3v9ayrApfzvJ+QAABBFou8IupqamXVCqVO1reiQYIiIjrupeKyPFgIIBA4gXCWbNm7XvhhRf+qZNJ23oA68EvDb4pIkd1cmh6I4BAQwK3dXd3H8pjMhqyY1MNAqeddtquPT09XzPGPL+G5SxBAAEE8ibwF2PMiWvWrLkyb4Mz798FuPsV7wQEMiNw5+bNm/fdtGnTdGYmYhAEEEAAAQQQ+Mff2U8UkQkOYfGGQAABBFomcHNvb+9LN2zYcHvLOlAYgX8SKBaLz1XVH4hI289UcCEQQKA+geiJXr7vH1nfrvhXt/1/LBzHebOIfDz+UaiIAAJtEDjd9/01behDi04LRH86dOCBk0NDQ482xlzGQd1OvwHojwACCROI7iD7ipGRkejRc7xyKuA4zsUiclJOx2dsBLIk8Enf96PPRXghgAACCCCAQAYFbNseNMZcxGPDM3hxGQkBBDotsLm7u/uosbGxP3Y6CP3zI+C6bvRj2GPzMzGTIpBeAWPMqnK5vLrTE7T9AFZ/f/8elmX9gV+BdPrS0x+B+gWMMX/t6ek5iF8X1G/HjtoF3vGOd/TusssuXnSnl9p3sRIBBBDIrMANqvrq0dHR6BAWr5wKFIvFQ8Iw/Blf4uT0DcDYmRIIw3DBxMTEtzM1FMMggAACCCCAwL8IFIvFRWEYlvkOhDcGAgggEJsAd76KjZJCtQrYtv1iy7L493utYKxDoMMCxpj/KpfL0WfoHX21/QBWNK3jON8QkWM6OjnNEUCgUYGy7/sDjW5mHwI1CpihoaGzjTHLalzPMgQQQCBzAqr6te3bt/evX7/+vswNx0B1Cdi2PWGMWVTXJhYjgEASBf4wNTW1X6VSqSYxHJkQQAABBBBAID4Bx3Giu9d6HMKKz5RKCCCQTwFVvWXWrFlHcWOAfF7/Dk5tXNe9VkSe18EMtEYAgRoFVPXXvu8/scblLV3WkQNYruueoqqfaulkFEcAgVYJRA+mO9L3/e+3qgF1EfiHwPDw8LtEZB3P1+Y9gQACeRNQ1fNmz569tFQqhXmbnXn/VaC/v/9Qy7J+yt2veGcgkH4BVf1oEASnpX8SJkAAAQQQQACBWgQcx7FFZFxECrWsZw0CCCCAwH8I/Ly7u/sYHjvIO6PdAtHdLFV1ot196YcAAo0JGGPOK5fL0XfKHX915ADWwMDA46rVavQYwu6OCxAAAQQaEfjBgQce+Hy+FG6Ejj31CqxYsWKxZVmf5BeD9cqxHgEEUiowqapvGh0d/UxK8xM7ZoH+/v5LLcs6PuaylEMAgQ4IFAqF542Pj/+gA61piQACCCCAAAIdEuBxhB2Cpy0CCKReQFV/pKrHTUxM3Jn6YRggVQJ9fX09vb29N4nIk1MVnLAI5FjAsqxjx8fHr0oCQUcOYEWDO45zuYi8PAkIZEAAgfoFjDGLPc/7dP072YFA/QLDw8PHichnReQx9e9mBwIIIJAagT+JyIkjIyPfTU1igrZUYGBg4PBqtRrddbRj/25r6YAURyBfApt93z8kXyMzLQIIIIAAAghEAq7rvkZVLxGRWYgggAACCNQk8L9TU1OvqFQqf65pNYsQiFHAcZxlxpi1MZakFAIItFbgvsnJyT0rlcpUa9vUVr1jH+Tbtj1gjOGX/bVdJ1YhkESBbap6cBAE9yQxHJmyJ7B8+fKnd3V1fUVV98/edEyEAAIIyI9mZmZOOOecc36DBQL/EHBd9ypVPRoRBBBIv4CqnhEEwVnpn4QJEEAAAQQQQKARgUWLFh3d1dX1RVV9VCP72YMAAgjkRUBVv1koFF5TLpfvz8vMzJkcAdu2dysUCltUdffkpCIJAgjsROCznuedlBSljh3AWrx48aMnJyf/KCKzk4JBDgQQqFvgk77vv7nuXWxAoEGBFStW7CMiX7Is67AGS7ANAQQQSJyAqpanp6fftG7duu2JC0egjgkMDAwcU61Wv9GxADRGAIE4BcJCofDE8fHx38ZZlFoIIIAAAgggkC4Bx3GOEJGvichu6UpOWgQQQKBtAl/p7u7uGxsb29G2jjRC4J8EbNs+x7Ksd4OCAAKpEjjJ87zoKUqJeHXsAFY0veM4vojYiZAgBAIINCIQWpZ1ZLlcvq6RzexBoBGBUqk0e/v27Z6IHN/IfvYggAACCRKIbon7zpGRkU8mKBNRkiFgHMeJ/n7FgeNkXA9SINCUQPQL7iAIuJtdU4psRgABBBBAIBsCrus+U1WvEJG9szERUyCAAALxCKjqp2+//fYlGzdunImnIlUQqE+gWCw+UVV/ISK99e1kNQIIdFBgR09Pz14bNmz4Swcz/Evrjh7Asm37FcaYryYFgxwIIFC/gDHmp7///e/n85fi+u3Y0bhAqVSytm/f/gEROUNEOvpnWeNTsBMBBPIsoKq/C8PwpLVr116bZwdmf2gB13Vfp6qfwwcBBDIjMOj7/mcyMw2DIIAAAggggEBTAtEXvNVq9evGmKc2VYjNCCCAQHYEzvN9/zQR0eyMxCRpE3BdN7qDTl/acpMXgTwLqOplvu+/NkkGHf3SesGCBV1z5879Pb/2SNJbgiwI1C+gqu8KguC8+neyA4HmBIaHh18tItHdsB7TXCV2I4AAAm0VuKpQKLhnnXXWn9ralWapEOjr6yv09PTcKCKHpCIwIRFAYGcC909NTe1TqVT+urOF/OcIIIAAAgggkB+BYrG4VxiGX+Gut/m55kyKAAIPKRCq6lK+X+Ld0WmB/v7+lxYKhas7nYP+CCBQn4CqFn3fj74nTsyrowewIgXbtj9ijHlXYkQIggACjQjcZ4w52PO8PzSymT0INCOwfPnyZ1iW9UVjzBObqcNeBBBAoA0CM8aYM2fNmvXBUqkUtqEfLVIo4LruElXlsZQpvHZERuBhBMq+7w+ggwACCCCAAAII/LtAsVicE4ZhRUQWooMAAgjkTcAYM6mqb/B9/5K8zc68yRKIfgzZ29v7IxF5RrKSkQYBBHYiMB2G4d5BENyTJKmOH8AqFovPDcPw+iShkAUBBBoSuMT3/UUN7WQTAk0KLFu2bI+urq7o9rBHNVmK7QgggEBLBKJHDqpq/9lnn/29ljSgaCYEFi9e/OjJyclbRGSfTAzEEAggIIVC4djx8fGroEAAAQQQQAABBB5K4MGnhHxKRAYRQgABBPIioKp3icgJQRBck5eZmTO5ArZtv9OyrI8mNyHJEEDgYQS+5nneK5Om0/EDWBGI4zi/EJGDk4ZDHgQQqE9AVV8bBMFl9e1iNQLxCJRKpa7t27efKSIrRCQRf77FMxlVEEAg7QJhGF7W1dX1xtWrV0cfLvFC4GEFXNc9U1VXQYQAApkR2Do1NbV/pVKpZmYiBkEAAQQQQACBlgi4rvsuVT1XRKyWNKAoAgggkBABY8wvu7q6XjU2NrY5IZGIkWOBvr6+3Xt7e6MfQz4uxwyMjkAqBVT1jb7vb0ha+ER8QW3b9nuMMR9KGg55EECgPgFVvb2np+fQsbGxe+vbyWoE4hMYHh5+tYh8RkR2i68qlRBAAIGGBLaLyOkjIyPniYg2VIFNuRFwHGeeiNwsIrNzMzSDIpB9gdW+73OoMvvXmQkRQAABBBCIRcBxnBNFZFxEdomlIEUQQKAxgegTnER8e9pY/CTvUtVrp6en/7tSqdyR5Jxky4+A67qfFJEl+ZmYSRHIjEB1cnLy8Un88yQRf4UoFotPDMPwl/yVJjNveAbJt8D5vu+/Ld8ETN9pgZUrVz5FRD6vqjyzu9MXg/4I5FRAVX9mjLFHRkZuzCkBY9cp4DhOWUTcOrexHAEEki1wqO/7NyU7IukQQAABBBBAIEkCAwMDz69Wq18Ukb2SlIssCCCAQAwCwd1337348ssvn4yhFiUQaFpg0aJFz+7q6rpeRApNF6MAAgi0VUBVr/J9/9i2Nq2xWSIOYEVZHceJnvP7ohpzswwBBJIrEIZh+JKJiYnvJjciyfIgUCqVZm/fvv1jIjKYh3mZEQEEEiMQ/Tl47pw5c84olUpTiUlFkEQLFIvF54ZheB2PG0n0ZSIcAvUKXO/7/uH1bmI9AggggAACCCDw4A/Wvywih6KBAAIIZEAgVNX3BkGwmjvEZ+BqZmSEUqlkbdmy5TsicmRGRmIMBPIm8FbP8z6exKETcwDLdd1TVPVTSUQiEwII1C2wubu7+9ljY2M76t7JBgRiFhgaGjrRGBP9+bJrzKUphwACCPy7wK9VdfHo6Oi3oEGgHgHHcb4tIi+uZw9rEUAg8QLv9H1/feJTEhABBBBAAAEEEingOM5jHnwc4X8nMiChEEAAgdoE7gvD0J2YmIgOlfJCIDECxWLxVFW9IDGBCIIAAvUIhCIyz/O8P9SzqV1rE3MAa/HixY+enJyMkOa0a3j6IIBASwXO9H3/PS3tQHEEahRYuXLlAWEYBsaY59e4hWUIIIBAPQL64A8Jlo+Ojv6lno2sRcBxnBNFpIIEAghkSmAqDMO5ExMTd2ZqKoZBAAEEEEAAgXYLGMdxSiLyXhFJzHc57UagHwIIpFPAGLNFVf+bx7Kn8/plOfXAwMDjwjDcLCJ7ZHlOZkMgwwIbPc87KqnzJeov7Y7jfJpHRSX1rUIuBOoWmFbVw4MguKHunWxAoAUCpVKpa8eOHe+JbnfMI55aAExJBPIr8NtqtfrGtWvXXpVfAiZvVGDJkiWz77///l+IyBNqrqF89VKzFQsR6JzApb7vv65z7emMAAIIIIAAAlkSGBgYOL5arX5GRB6dpbmYBQEEMi1wpaouCoLgnkxPyXCpFIjOIxhjBlMZntCxCUSHZKKPWXmlUuBNnucl9g52iTqA1d/f/0LLsqLnrfJCAIEMCBhjfjo5OXlYpVKZysA4jJARgRUrVrzcsqyLRGTfjIzEGAgg0BmB6K5XF23fvn3Z+vXr7+tMBLqmXcBxnA+JCHcMTfuFJD8C/yZgjFnoed7XgUEAAQQQQAABBOIS6O/vP9SyrC+IyIFx1aQOAggg0AKB6DzDmVNTU6VKpVJtQX1KItCUwMDAwAvDMLyGnzc2xchmBDopMG1Z1uPHx8fv6mSIR+qdqANYUVDHcaJfgB+cVDByIYBA3QI8irBuMja0WuC0007btbe3d72IuK3uRX0EEMiegKreFobhm7jrVfaubTsnsm37ScaYn4vIrHb2pRcCCLRc4HdTU1NP5MuGljvTAAEEEEAAgdwJLF68+NGTk5MXisjrczc8AyOAQBoE7isUCoPj4+PRYVFeCCROYMGCBV3z5s3bJCLPSFw4AiGAQE0CxpivlMvlV9e0uEOLEncAy3XdYVVd0yEP2iKAQPwCM5ZlvbBcLl8Xf2kqItCcwIoVK/osy/qEiOzeXCV2I4BATgRmVPX8MAxXrV279v6czMyYLRJwXfdLqprofyy2aHTKIpB1gff7vv/BrA/JfAgg0GEBnpfR4QtAewQ6K+C67hJVjX5Y2NPZJHRHAAEE/k/ghpmZmRMvueSSX2KCQFIFHMdZaYxZndR85EIAgZ0LqKrj+36w85WdW5HEA1iPV9XfikhX51jojAACMQts3muvvZ6zbt267THXpRwCTQucccYZ+83MzHxaRI5uuhgFEEAgswJhGEa/jjrl7LPPviGzQzJY2wQcx1koIl9rW0MaIYBAuwSq1Wr1iRdffPHv2tWQPggggAACCCCQTwHXdY9U1UtEZF4+BZgaAQSSIqCqF+69997v5PufpFwRcjyUQLFYfKKq3igicxBCAIHUCjzwmMc8Zu/zzz//r0meIHEHsCKs/v7+yyzLek2S4ciGAAL1CajquUEQLKtvF6sRaJuAWbly5amqeraIPKZtXWmEAAJpEPizqr5v9uzZ55dKpZk0BCZjsgUWLlzYu/vuu0cf+ByY7KSkQwCBBgS+6vv+qxrYxxYEEEAAAQQQQKBugb6+vj17enrGReTldW9mAwIIINC8wH2WZb2pXC5f3HwpKiDQUgHjOM6VxphjWtqF4ggg0FKB6McHvu8vammTGIon8gCWjuWqjQAAIABJREFUbdv/bYz5YgzzUQIBBJIjEBpjFnie953kRCIJAv8qsGrVqsdXq9XzReS12CCAAAKq+hURecvo6Ojv0UAgLgHbtlcZY86Mqx51EEAgOQKq+togCC5LTiKSIIAAAggggEAOBKIvld8tImfxSMIcXG1GRCA5Ater6qIgCG5LTiSSIPDQAtGje0Xkk/gggEC6BcIwTMXnbok8gLVgwYKuuXPnRrfs3yfdbwPSI4DAvwlEfxl/tu/79yGDQJIFVqxY0WdZVnQQa48k5yQbAgi0TODmarX69rVr117Vsg4UzqVAX1/fU3p6en4qIrvkEoChEci2wB+2bt36hI0bN3K3xGxfZ6ZDAAEEEEAgkQK2bc83xkxwp91EXh5CIZAlAbUs69wdO3asqlQqU1kajFmyKeC67uNF5Ocisls2J2QqBHIjcO9dd921z+WXXz6Z9IkTeQArQnMcZ0REhpIOSD4EEKhPQFXHgyB4Q327WI1A+wVWrVq1d7VaPVdE7PZ3pyMCCHRI4F5jzAdnzZq1nscNdugKZLyt4zjfEBFud57x68x4uRVY7fv+qtxOz+AIIIAAAggg0HGBvr6+R3V3d3/MGDPQ8TAEQACBLApsFZHFvu9fmcXhmCmbArZtf8GyLJ54ks3Ly1T5ErjI87xT0jByYg9gDQwMPLVarW4WkcRmTMMFJiMCCRVY5Pv+JQnNRiwE/kVgxYoVL7Es6+Micgg0CCCQWYFQVf0wDJevXbt2W2anZLCOCjiO44pIuaMhaI4AAq0SUFV9Co/faBUvdRFAAAEEEECgHoFisdhXrVY/box5XD37WIsAAgg8gsBnp6am3lKpVO5GCYG0CBSLxUWqGt0dkhcCCKRcQFWP8X3/6jSMkejDTa7rXqWqR6cBkowIIFCXwL2q+qwgCH5T1y4WI9AhgSVLlnTvvvvu71bVkojM6lAM2iKAQGsErq5Wq+9eu3Zt9Fg4Xgi0RKCvr2/3np6eX4jIXi1pQFEEEOi0wFW+7x/b6RD0RwABBBBAAAEE/iFwyimn7H3//fdfYFnWa1BBAAEEmhC4zxizwvO8C5qowVYE2i7Q39+/R1dX189Vlc/i2q5PQwRiF/jj5OTkvEqlUo29cgsKJv0A1utU9XMtmJuSCCDQeYFrpqamXpqW/7HsPBcJkiAwNDR0kDHmoyJyXBLykAEBBJoSiA7DrBgZGflqU1XYjEANAsVi8aIwDBfXsJQlCCCQTgHu8JvO60ZqBBBAAAEEsi5gXNc9VUTOUdVHZX1Y5kMAgXgFVPWb0SMH+SF9vK5Ua4+A67rRU3he355udEEAgRYLrPU8b0WLe8RWPtEHsObPn9990EEH/doYs29sE1MIAQSSJLDK9/3VSQpEFgRqEVi+fPkxhULhPB5LWIsWaxBInMBWY8wHZ82ataFUKs0kLh2BUiIQ/TNKa8ra398fPcr2WzxavSYuFiGQRoE777777nmXX375ZBrDkxkBBBBAAAEEsi9w0kknPdmyrAsty1qQ/WmZEAEEYhCI7no19OBdr2r78COGppRAIC4BHj0YlyR1EEiGgGVZzxwfH0/NE0wSfQAruqSO43xARN6XjMtLCgQQiFlgemZm5gWXXHLJ9THXpRwCLReIHku42267vVVEPigij2l5QxoggECzAvcYY0YmJyfPW7du3fZmi7EfgVoEli5dusu2bdt+LCIH1bKeNQggkD4BVT03CIJl6UtOYgQQQAABBBDImYBxHOdNIjLC51g5u/KMi0B9AlcWCoVTx8fHf1vfNlYjkAyBYrEYPXLwRh49mIzrQQoEYhDY5Hnec2Oo07YSaTiANU9EfiUiXW1ToRECCLRT4Lbu7u75Y2Nj97azKb0QiEtg6dKlc3t6ej4sIgMiYsVVlzoIIBCbwAOqut6yrJE1a9bcE1tVCiFQg4Bt22cbY5bXsJQlCCCQTgG1LOvQcrkcPdaWFwIIIIAAAgggkHiBRYsW7dfV1fUJVX1F4sMSEAEE2ilwr2VZy8vl8oaab/ndznT0QqBGAdd1LxWR42tczjIEEEi4gKq+0/f99QmP+S/xEn8AK0pr2/YXjDGvTRMsWRFAoHYBVf18EAQn1r6DlQgkT+D0009/WrVaHTHGvCp56UiEQC4FplR1TEQ+MDo6ensuBRi6owKO4xwhIt8VkUJHg9AcAQRaJqCq3wyC4OiWNaAwAggggAACCCDQIgHbtovGmLUiEt0phBcCCORb4BJjzFLP8/6QbwamT7uA4ziLjTEXpX0O8iOAwP8JTE1OTs6rVCp3pMkkFQewisXicWEYfj1NsGRFAIG6Bd7u+/7H6t7FBgQSJrB8+fJjCoXC2SLyrIRFIw4CeRHg4FVernSC51y4cGHv7rvvvklEDk1wTKIhgECTAmEYHj8xMfHFJsuwHQEEEEAAAQQQ6IjA4ODgrtPT0x8Qkbfxw5GOXAKaItBpgejpQ2/zff/yTgehPwLNCgwMDMwNw/BGEdmt2VrsRwCBZAio6qW+778uGWlqT5GKA1giEj2f/GYRObD20ViJAAJpEjDGTIrIkZ7n/ShNucmKwEMJ9PX1FQ444ICiZVnvF5EDUEIAgbYI7FDVC0VkNXe8aos3TR5BwLbtNcaYYZAQQCDTAr/dunXrkzdu3DiT6SkZDgEEEEAAAQQyL2Db9rOMMdEPY4/M/LAMiAACkUD0b5jzp6amzqhUKn+FBIG0C5RKJWvLli1Xigh3qE77xSQ/Av8kEIbha4MguCxtKGk5gCWu665Q1dG0AZMXAQRqFzDG/HJycnJ+pVL5c+27WIlAcgWWLFnSvfvuu5+squ8TkbnJTUoyBFIt8FdV3TA9PT26bt26ramehPCZEFi0aNGzC4XCdSLSnYmBGAIBBB5OYJXv+6vhQQABBBBAAAEEMiJgHnwsYXRXdx5LmJGLyhgI/LuAMeZqVV3q+350pyBeCGRCIDpDICKcIcjE1WQIBP4uYIzZdtNNN83btGnTdNpMUnMAa2Bg4HHVavX3IjIrbcjkRQCB2gWMMRXP815f+w5WIpB8gVKp1LNjx45BVY1u675P8hOTEIFUCNxhjDlfRD66Zs2ae1KRmJCZF3jw0YM/FJGnZ35YBkQgxwLR3XuNMU8ol8vbcszA6AgggAACCCCQQQEeS5jBi8pICPxd4FbLss4ol8sVQBDIkoDrus8RkWtFpCdLczELAnkXMMZ8pFwuL02jQ2oOYEW4tm1/xhgzkEZoMiOAQF0C7/R9f31dO1iMQAoESqXSox544IG3GGOWicjeKYhMRAQSJ6CqvzLGnDM1NbVh3bp12xMXkEC5FnAcZ0REhnKNkMLhNfpVVQpzE7mjAmXf9/lsoqOXgOYIIIAAAggg0EqB6AttVY0eS3hEK/tQGwEEWi5wr6p+8Oabb/6fNN5FpOU6NEi1QLFYnCMiP1TVg1M9COERQOA/BMIwfHYQBDekkSZVnzM/+Jf+TWmEJjMCCNQlEN1O8Cjf979X1y4WI5ASgXe84x29c+bMeYOqvldE5qUkNjER6KhAGIbR3wHPmzNnTlAqlWY6GobmCDyEQH9//0ssy/qmiFgAIYBAtgUsyzqiXC5HjxrlhQACCCCAAAIIZFnAOI5zsoicxQ8Js3yZmS2jAlUR+VQYhu+dmJi4M6MzMlbOBQYGBqL3+Ck5Z2B8BLIo8DPP8/4rrYOl6gBWhOy67ndU9YVpBSc3AgjULPDH3t7e+Rs2bLi95h0sRCBlAtFBrNmzZ0ePJhwyxjwpZfGJi0A7BKZV9XOWZa1bs2bN9e1oSA8EGhHo6+t7bE9Pz09EZP9G9rMHAQTSI6CqPwqCYH56EpMUAQQQQAABBBBoTiC6w4iqvl1VTxeRxzZXjd0IINAGgW+FYXjaxMTET9vQixYIdETAdd3XicjnOtKcpggg0GqB0zzP+2irm7SqfuoOYDmOc6KI8IziVr0jqItAsgSu2bp169EbN27kTifJui6kiVmgr6+vcMABB5xgWdZyETk85vKUQyB1Aqq6zbKsi8IwPH90dPT3qRuAwLkTcBynHP1WJHeDMzAC+RQY9H3/M/kcnakRQAABBBBAIM8C/f39e4jIGYVC4S2q2ptnC2ZHIIkCxpgtYRguD4LgsiTmI1PWBaIjB9qWIQcGBuaGYRj9EPJxbWlIEwQQaKfAjsnJybmVSuXudjaNs1fqDmBFX1L39PTcKiJPjBOCWgggkEwBY8w6z/Pencx0pEIgfoHh4eHoLo/vFJETRKQQfwcqIpBcgegxg4VC4YLJycnyunXrtic3KckQ+P8C0S/uoju1YYIAArkQuLO7u3u/sbGxHbmYliERQAABBBBAAIGHEFi0aNF+lmW9xxjzRj674i2CQOcFjDF3iMg5d91110cuv/zyyc4nIgECrRNYsGBB17x5864WkRe3rguVEUCggwKe53nFDvZvunXqDmBFEzuOMyQiI01PTwEEEEiFgKoOBEEQ3VmCFwK5ERgaGjrIsqx3qmr0F41H52ZwBs2jwF9ExBORj4+MjNyYRwBmTq9A9Iu7arUa3dJ/9/ROQXIEEKhDYLXv+6vqWM9SBBBAAAEEEEAgswLFYvEQVf2AqkZPLUnld02ZvTgMlheBu40x63t6es7ZsGFD9PkaLwQyL+C67pkiwr/LM3+lGTCvAmEYviQIgmvSPH8q/1Js2/ZuxpjocTSz04xPdgQQqE3AGPNXVT3S932+mK+NjFUZEhgaGnq0ZVn9YRi+wxjz9AyNxig5F/jH3a7CMJwYHR3lQ6Kcvx/SOH6pVLK2bNlypaoencb8ZEYAgboFqqr65CAIflP3TjYggAACCCCAAAIZFnAc5wXGmDWqGt3VnRcCCLReIPoc7aNTU1NrK5XKn1vfjg4IJEOgv7//pYVC4UruvpiM60EKBOIWMMbcXC6XD2nb80zjHuDBeqk8gBVldxzn4yLy5ha5UBYBBJIn8KswDA+fmJi4M3nRSIRAWwTM0NDQMar6NsuyXikiXW3pShME4hX4o4iMW5b16dWrV2+OtzTVEGivgOM4p4vIWe3tSjcEEOigwGW+77+2g/1pjQACCCCAAAIIJFrAtu1XGGPOEJEjEx2UcAikV+A+EVlfKBTWjY+P35XeMUiOQP0Cg4OD+8zMzPxYRPapfzc7EEAgDQKWZS0bHx8/Nw1ZHyljmg9gPU1EfsatbdP+FiQ/ArULhGG48ZZbbnnZpk2bpmvfxUoEsicwNDS0rzFmUEQWi8iTszchE2VMYIeIfFVVx2fPnv21Uqk0k7H5GCeHAtEvvEVkI4dhc3jxGTm3AsaYl3me943cAjA4AggggAACCCBQo0B/f/9LLMtaKSIvr3ELyxBA4JEF/myMOS8Mw3VBENwDFgJ5E+jr6yvMmjUrugv9S/M2O/MikCOBqcnJyXmVSuWOtM+c2gNYEbzjOFeIyMvSfhHIjwACtQsYYz7ued5ba9/BSgQyLWBWrlx5VBiGpxhjjheRWZmeluHSJFCNDqeoqm+MuXRkZITboafp6pH1EQX6+vp27+npiX5x9wSoEEAgNwI/833/GWm/BXpurhaDIoAAAggggEAiBBYtWvTsrq6u01X1dSJiJSIUIRBIl8AfVfVjPT09/zM2NnZvuqKTFoH4BFzXPVNEVsVXkUoIIJBAgQnP8+wE5qo7UqoPYD14S9uv1j01GxBAINUCqvrWIAiix5DyQgCBBwVOO+20XWfNmnWiqhZF5EXcIZK3RicEwjC8vlAoTIRheMno6OjtnchATwRaLGBs277UGMNjyFoMTXkEkiSgqicHQTCWpExkQQABBBBAAAEE0iJg2/aTjDHvEpEl/HgwLVeNnB0WuNUY87E999zzgnXr1m3vcBbaI9BRgWKxeJyqfo2DvB29DDRHoOUCYRi+NAiCb7W8URsapPoAVqlUsm699dboMYSHtMGKFgggkByBaVU9Liv/Q5wcVpJkRWBoaGieMSb6dWH0mMJnZWUu5kiswE3GmEq1WvXPPvvsWxObkmAIxCBg2/Y7jTEfjaEUJRBAID0Cf7z77rsPuPzyyyfTE5mkCCCAAAIIIIBA8gQcx5kXhuEyy7JOFZE5yUtIIgQ6LnCVMeYcz/Oip/9ox9MQAIEOC9i2vb9lWT8UkT06HIX2CCDQWoFfep53YFb+7Ev1AazoOheLxTeGYXhha6851RFAIIECd87MzBxxySWX/DKB2YiEQGIEVqxY8axCoRDdGatPRJ6amGAESbNAqKrXWpb1eVX9/MjIyG/TPAzZEahVwLbt+ZZlfU9Ve2vdwzoEEMiEwHt8348ed8ALAQQQQAABBBBAIAaB/v7+PYwxbzbGRHfE2i+GkpRAIM0CU6p6sWVZ53qe95M0D0J2BOIUGBwcnDUzM/NdEZkfZ11qIYBAIgWGPM87O5HJGgiV+gNYCxcu7N19991/JSKPb2B+tiCAQLoFbp6amjqyUqncne4xSI9AewSGh4efKSInikh0GOug9nSlSxYEVPV+Y8w3VPUrXV1dXznrrLP+lIW5mAGBWgUGBwd3nZmZ+aGqPrnWPaxDAIFMCDxQKBSeMD4+flcmpmEIBBBAAAEEEEAgQQJ9fX2Frq6uV1uW9RYROVZEUv99VYJ4iZJ8gXtE5JO9vb3rN2zYcHvy45IQgfYKuK47JiJvaG9XuiGAQAcEpowx+5XL5W0d6N2Slpn4C63jOCtFZHVLhCiKAAKJFgjDcOPMzMxxlUplKtFBCYdAwgROP/30g8MwfI2IvFpEni8ihYRFJE6HBVT1dyLyVWPMl3bZZZdvlUqlHR2ORHsEOiLw4GPPLxORV3UkAE0RQKCTAuf7vv+2TgagNwIIIIAAAgggkAcB27ajx85Ed8U6WUR2y8PMzJhbgeuNMRdOTk4GlUrlr7lVYHAEHkHAcZy3GWP+ByQEEMiFgOd5XjFLk2blANZjRCR6/M1js3RxmAUBBGoTiG7RGwSBnZVnw9Y2NasQiE9g2bJlexQKhVcaY6LDWEeLyK7xVadSigS2i8h3ROSKarV65dq1a3+WouxERaBlArZtv98YU2pZAwojgEBSBcKpqamDKpXKlqQGJBcCCCCAAAIIIJA1geiJJ3vsscdrwjB8l4i8IGvzMU9uBf6sqpeEYfiJiy+++Me5VWBwBGoQcBznCGPMt0Wkp4blLEEAgZQLqOrzfd//fsrH+Jf4mTiAFU3kuu65qro0SxeHWRBAoC6B9/u+/8G6drAYAQT+QyC6/fv+++9/eFdX13FhGL7MGHM4d8fK7BtFRSQ6ZPUNY8wVk5OT31m3bl10CIsXAgg8KOC67stV9asiYoGCAAL5ElDVLwZBcHy+pmZaBBBAAAEEEEAgOQInnXTSYV1dXW8VkdeLyOzkJCMJAjUJqDHmGlW9sLu7+3NjY2PcWb4mNhblWeCUU07Ze8eOHZtEZG6eHZgdgbwIGGN+XC6Xn5O1eTNzAMtxnHki8ktOxGbtLco8CNQsoKr6hiAIyjXvYCECCOxU4LTTTtu1q6vrKMuyFhhjXiIi/8VBhJ2yJXVBKCI3qmr0C6JvV6vVa84555w7kxqWXAh0WsC27f2NMT8UkT06nYX+CCDQEYEX+r7/vY50pikCCCCAAAIIIIDA/wksXbp0lzvvvPNVYRgOiMjLRaQLHgQSLPAnEbnEsqxPlctl7i6f4AtFtGQJ9PX19fT29n6Tux8m67qQBoFWCoRheHIQBGOt7NGJ2pk5gBXhOY4THbxwOwFJTwQQ6LyAMWayWq0eNzExER0u4IUAAi0QWLly5W5hGL7IGLMgDMMXWpb1LBHpbkErSjYv8ICqRr8Yim7f+t3p6envrlu37u7my1IBgewLRB/w33HHHd9T1Wdnf1omRACBhxC4zvf9I5BBAAEEEEAAAQQQSJaA67qPD8NwkTHGEZH5yUpHmhwL7AjD8PKuri7vpptu+vKmTZumc2zB6Ag0JFAsFi9Q1VMb2swmBBBIo8CdXV1d+2XxDpGZOoDluu4zVTV6fnKm5krjf2PIjEAHBe4VkRf7vn9jBzPQGoHcCESHFHp6euYbY54XhmH0fPboy8rorpS82isQPU5wi4hcFx24MsZ8f9asWT8plUoz7Y1BNwSyIdDf3z9mWdYbsjENUyCAQL0CxpiTPM/7bL37WI8AAggggAACCCDQPoFisXhIGIbRQazo/w5oX2c6IfA3geiRgleIyGd7e3u/vGHDhr/g0jmB6Evh6MNRXukUsG17qWVZ56YzPakRQKARAVVd7fv+qkb2Jn1P5g4q2bb9dWPMcUmHJx8CCLRUYGuhUDhyfHz8ty3tQnEEEHhIgaGhoX2NMc9W1Wc9+P+fbYx5ElyxCUS/ovt5dOj8wYPnNxhjbhgdHeWDntiIKZRnAdd1362q5+TZgNkRyLnAr7du3Xrgxo0bOcSc8zcC4yOAAAIIIIBAagRMf3//CyzLcowxr1PVPVOTnKCpEnjwCRxXWJZVEZEv+b5/X6oGICwCCRRwXfdYEfkaj5dN4MUhEgKtE6jO/D/27gRKrqra//jet6qHJBCQBFQCKBJCAvJAAoiCGsUpgjiWpKtulU2EOCt5f+eJdnhOz2fkgagxJE3XvdWNpSiDRBGF5zxFAWWGoDITCGOG7uq6+7+uxvcACemuruEO31qrV0e8Z5/f/pxK0qk6de74+NyRkZG/tG6KzlVO3AasJUuWHJvJZC7tHCkzI4BARASuzWQyLxgaGrovInmIgUCqBT74wQ/uIiKHqOqBQRAsCL+LyHxOy3rSp0XNzG5Q1WtE5Npw01X4fdq0adcPDAyMpfoJRfMItEjAdd1XmtlFIpJp0RSURQCB6Ass933/K9GPSUIEEEAAAQQQQACBxwvkcrlMd3d3eDr7CSLyahFZgBICUxQIX4O7xMyqtVrt/Gq1+uAU6zEcAQS2Cbiue0B4NwcR2RUUBBBIlcB3Pc97fVI7TtwGrHChCoVCePudI5O6aPSFAAITEzCzX+20004vXbly5eaJjeAqBBBot8C73/3umdOmTZuvqnNFJDwlaz8z22/biVlz2p2nA/NtNbObzWy94zjh95szmcz6er1+8wMPPLB+5cqV4WlXPBBAoA0C/f3982u12q940acN2EyBQHQFHujp6dmH24dEd4FIhgACCCCAAAIITEYgn8/vr6onqOqrzewYPmwzGb1UX3tPeHtBVV2bzWbXDg4OPpBqDZpHoAUChUJhpqqGr8OFH9TmgQACKRKo1+vHDg8P/ySpLSdyA5bruieY2flJXTT6QgCBSQl8//bbb38ttxCZlBkXIxAJgYGBgd5NmzbtLSLhLQ33UdVwQ9aeQRCEv95dVWeLyFNFJDxdK2qPrSJyr4hsMLO7ReRuVb1VRO4IgiD8fpuZ3fGlL30pfEGHBwIIdFggn88/RVXDD3Hs3+EoTI8AAh0UUNXPep730Q5GYGoEEEAAAQQQQACBFgnkcrndent7jw2CIDwZKzwhK4qvJ7Woe8ruQKAuIleY2aXhqdgHHHDALwcGBgLUEECgNQILFy7sWrBgwfdFJLz9IA8EEEiXwLWe5x0kIpbUthO5AUtEtFAo/DG81VFSF46+UiIQ/tGT1N+lbVxCM1tTqVTekuQ/zNvIyVQIRE5gYGCge/PmzbODIJjtOM4sVd1JRHbe9v0p4a/NbJqZhf9dVHVm+IlHVe0xs+lP0lD4QsvfjxU3s/AkvVER+ft/U9VHzOyh8CuTyTw8Pj7+oOM4D3R3d9+XzWY3DAwMPBI5KAIhgMATCixatCi75557XqyqvOjDcwSBdAtsdhxn33K5zObodD8P6B4BBBBAAAEEUiCwePHinl133fVox3FeLCLhV3hHla7mtc4L+82zbFmlO83sB47j/CAIgh9VKpX7WzYThRFA4DECruueJSJvhwUBBNInYGbv9H0//DMgsY/Ebu1wXfdNZnZuYleOxhBAYFICZnZ6pVI5dVKDuBgBBBBAAAEEEi9QKBROF5H3JL5RGkQAgR0J/Lfv++/d0UX8/wgggAACCCCAAALJEygWizOCIDhaRBZt25B1uIhkk9dpqju6NwiCX2YymZ9v23B1JR/YTvXzgeY7JOC67kdE5D86ND3TIoBAZwUemDlz5t5nnXVWog8wSOwGrIGBAefGG2+8SkTCI8x4IIAAAqHAp3zfPw0KBBBAAAEEEEAgFHBd961m9nU0EEAg9QI1M9u/Uqn8NfUSACCAAAIIIIAAAghIuCFLVZ8XBMExZhZuzHqhiHRDEyuBO1X15yLyiyAIfl6pVP7AhqtYrR9hEyhQLBZzZjYiIk4C26MlBBDYscAXPM/70I4vi/cVid2AFS5LPp8vqeo58V4i0iOAQJMF3uf7/n81uSblEEAAAQQQQCBmAvl8/jWq+p3wlqQxi05cBBBosoCqnu153slNLks5BBBAAAEEEEAAgYQILF26dOctW7YclslkFppZeDpW+DVXRBL9HluMlq8mIuvM7Jdm9rNsNvtLbi0eo9UjaioESqXSMeHpcyLSm4qGaRIBBB4vUOvq6tpvzZo1tyadJtE/HC5atCg7Z86cG0Rk36QvJP0hgMCEBUxV3+Z53soJj+BCBBBAAAEEEEiUQKlUOrJer18mItMT1RjNIIBAIwJ1M1tQqVRubGQwYxBAAAEEEEAAAQTSKZDL5XbJZrML/7kpS1XDzVn7pVOjrV3fr6pXmdlV4XdVvSKTyfx5cHBwa1tTMBkCCExYIJ/PP8txnF+LyO4THsSFCCCQKAFVLZfL5VKimtpOM4negBX2zG1F0vA0pkcEJi0QqKrred7wpEcyAAEEEEAAAQRiLRC+6KOqvxKRPWLdCOERQKBZAuf6vr+kWcWog0BqBMJXFC013dIoAggggAACExLI5/NPCTdljY+PH6yqBwRBcIDjOAeIyNMnVICLHi1QF5Gbtm22ujIIgqu6urquHBoa+htMCCAQH4FSqTQrCIJfisi8+KQmKQIINFtgfHwE6Mm8AAAgAElEQVT8sJGRkT82u24U6yV+A9bixYt7dtttt5tEZK8oLgCZEECgYwI1x3GWlMvl8zqWgIkRQAABBBBAoK0CuVxut+7u7l+IyPy2TsxkCCAQVYHwdNzneJ53ZVQDkgsBBBBAAAEEEEAg/gLhaVmO48zLZDLzHccJ/z06z8wOUNXwe0/8O2y4g5qq/tXM1otI+HVL+F1V10+fPv26lStXbm64MgMRQKDjAsuXL5+2YcOG8LaDR3c8DAEQQKBjAqp6WblcfknHArR54sRvwAo9Xdd9r5l9pc22TIcAAtEXqJlZrlKpnB/9qCREAAEEEEAAgakI9Pf399ZqtR+KyAunUoexCCCQKIGLfN9/daI6ohkEEEAAAQQQQACB2AgMDAw4N9xww96qupeqzjGzPR3H2SsIgvDErPC/P93M5ojItNg09aigqrrBzDZs+36HqoYbrG6p1+vrw01X9Xr91mq1Gp50xQMBBBImkMvlMr29veea2RsS1hrtIIDA5AWO9zzv+5MfFs8RqdiAtWzZsumbNm0Kd88/NZ7LRGoEEGihwFgQBG8cHh6+sIVzUBoBBBBAAAEEOigQvuiTzWarjuO8roMxmBoBBCImkMlknj80NBTekpQHAggggAACCCCAAAKRFQhPc+7t7d3TzMLNWbNEZKbjODODIHiKqu4S/u9tX4/+9a4iEn41+j7guIg8LCJbRWSLiGwSkTERecjMxh3HeSAIggdV9S5VvTfcaFWv1+/OZDL3dHV1bdi0adMGNldF9ilFMARaLlAsFv/bzN7d8omYAAEEIi2gqtfvt99+Bw4MDASRDtrEcI3+4NXECO0plc/nl6vql9szG7MggECcBFR1NAiC11cqlYvjlJusCCCAAAIIIDAhAc3n8ytV9eQJXc1FCCCQFoHLfN9PzfHnaVlU+kQAAQQQQAABBBDYvsC2E7fCTVr/8qjVaprNZp2enp7xwcHBB3BEAAEEGhUolUoDQRCc1uh4xiGAQKIE3up53spEdbSDZlKzAWvbLUduEpHwuFYeCCCAwOMFwk/vvMH3/YugQQABBBBAAIHkCOTz+c+r6geT0xGdIIBAMwQymczLhoaGLm1GLWoggAACCCCAAAJNFQjftbGmVqQYAggggAACbREoFounmFmqNlu0BZZJEIinwIbdd9/9GStWrAhP0kzNIzUbsMIVzefz71LVM1KzujSKAAKTFQiPU36N7/uXTHYg1yOAAAIIIIBA9ARc1/13M/uv6CUjEQIIdFjgt77vP7fDGZgeAQQQQAABBBBAAAEEEEAAgcQIFIvFV5vZeSKSTUxTNIIAAg0LOI7zyaGhoYGGC8R0YKo2YC1evLhnt912u1FE9o7pehEbAQRaL7BVVd/oed73Wz8VMyCAAAIIIIBAqwTy+XxJVQdFJFX/5mmVJ3URSJJAEASvGx4e/l6SeqIXBBBAAAEEEEAAAQQQQAABBDolUCqVjgmCIDzcYFqnMjAvAghESmBLb2/vvqtWrbo7UqnaECZ1b0YUCoW3icjX2mDLFAggEF+BMcdx+srlcrhTnwcCCCCAAAIIxEzAdd0TzOw7fOIuZgtHXATaI3CF7/uHcWOf9mAzCwIIIIAAAggggAACCCCAQLIF3vzmNx9Ur9d/JiJPSXandIcAAhMVUNWvlsvld030+iRdl7oNWAsXLuyaP3/+9SKyb5IWkl4QQKDpAnUzW1qpVIaaXpmCCCCAAAIIINAyAdd1X2ZmF4hIb8smoTACCMRWQFVf43le+GcEDwQQQAABBBBAAAEEEEAAAQQQmIJAqVTaJwiCcPPVPlMow1AEEEiWQG18fHzeyMjIX5LV1sS6Sd0GrJDFdd2TzeybEyPiKgQQSLFAXVVP8TxvTYoNaB0BBBBAAIHYCPT19R3jOM4PRGRGbEITFAEE2imwzvf9Izj9qp3kzIUAAggggAACCCCAAAIIIJBEgaVLl+45NjYWbr56VhL7oycEEGhY4BzP8/obHh3zgancgJXL5TJdXV3XqOq8mK8f8RFAoPUCZmbvqVQqZ7Z+KmZAAAEEEEAAgUYFXNd9voj80Mx2arQG4xBAINkCZnZcpVK5ONld0h0CCCCAAAIIIIAAAggggAACrRXo6+ub7TjO5ap6UGtnojoCCMRMwDKZzMHnnHPO1THL3bS4qdyAFeoVCoU3i8hg0yQphAACSRYwEXm/7/v/leQm6Q0BBBBAAIG4ChQKhaNE5BIR2TmuPZAbAQRaLvBr3/ef1/JZmAABBBBAAAEEEEAAAQQQQACBBAsUCoWZqvpjETk8wW3SGgIINCCgqt8pl8tvbGBoYoakdgNWeApWd3f3n0VkfmJWk0YQQKClAmb2hUql8mFuWdJSZoojgAACCCAwKYF8Pn/othd9dpvUQC5GAIFUCajqyz3P+1GqmqZZBBBAAAEEEEAAAQQQQAABBJoosHz58mkbNmxYKyIvamJZSiGAQEIEVPWIcrn8+4S001Abqd2AFWoVCoUTRWSkITkGIYBAKgUcx/nm1q1b316tVuupBKBpBBBAAAEEIiTguu5hZhZuqGDzVYTWhSgIRE1AVX/ued4LopaLPAgggAACCCCAAAIIIIAAAgjERWDhwoVdCxYs+K6IHBeXzOREAIH2CZjZJb7vv6J9M0ZzplRvwBIRLRQKvxORhdFcHlIhgEBEBc7v6upaMjg4uDWi+YiFAAIIIIBA4gXy+fxCVQ1vO8jmq8SvNg0iMDUBM3tJpVK5bGpVGI0AAggggAACCCCAAAIIIIBAOgXCO0v19PRURORN6RSgawQQmIDAiz3Pu3wC1yX6krRvwBLXdV8W7sZL9CrTHAIItEIgfAPntb7vP9SK4tREAAEEEEAAge0LFAqFo0XkYhGZiRMCCCCwA4Gf+b7/QpQQQAABBBBAAAEEEGhEIHwTzRoZyBgEEEAgIQIDAwPOzTffPGhmxYS0RBsIINB8gd94nndU88vGr2LqN2CFS+a67qVmdmz8lo/ECCDQYYHfjo2NHV+tVjd0OAfTI4AAAgggkBqBvr6+F2UymYvMbKfUNE2jCCDQsICqvtDzvJ81XICBCCCAAAIIIIAAAggggAACCKRXQF3X/bqILEsvAZ0jgMCOBFT1hHK5fOGOrkvD/88GLBEpFouHB0Hw2/CWhGlYdHpEAIGmCqxX1Vd5nnd9U6tSDAEEEEAAAQT+RYDNVzwpEEBgkgKX+L7/ikmO4XIEEEAAAQQQQAABBBBAAAEEEBDRYrH4DTM7BQwEEEDgSQSu8jzvUA4N/YcQG462PVNc1/2WmeX4rYMAAghMVkBVN6jqq8vl8m8mO5brEUAAAQQQQGBiAq7rvtLMzhORaRMbwVUIIICAPM/3/V/jgAACCCCAAAIIIIAAAggggAACkxIIN1+dYWbvnNQoLkYAgTQKvNHzvO+ksfEn6pkNWNtU8vn8/qp6tYh08eRAAAEEGhDY6jhOqVwuVxsYyxAEEEAAAQQQeBKBvr6+1zqOMywivUAhgAACExFQ1Ys9zztuItdyDQIIIIAAAggggAACCCCAAAII/J+A67pfFJH3Y4IAAgjsQODPc+fOPWRgYCBA6h8CbMB61DOhUCiE97B9K08OBBBAoEGBupm9u1KpfK3B8QxDAAEEEEAAgccJFAqFt4nIV0XEAQcBBBCYoIA5jnNkuVz+/QSv5zIEEEAAAQQQQAABBBBAAAEEEBCRYrH4OTP7EBgIIIDAjgRU9Q3lcjm8awWPbQJswHrUU2Hp0qV7jo6O3igi03mGIIAAAo0KmNkXKpXKh7nXbaOCjEMAAQQQQOAfAvl8/mOq+mk8EEAAgckIqGrV87w3TWYM1yKAAAIIIIAAAggggAACCCCQdgFOvkr7M4D+EZiUwJWe5z2H98Mfa8YGrMc9hwqFwmdFJNw4wQMBBBCYisB5M2bMKK5cuXLzVIowFgEEEEAAgZQKaD6f/6Kqvi+l/dM2Agg0LlAzs4MqlUr44SoeCCCAAAIIIIAAAggggAACCCCwYwEtFotfNrNTd3wpVyCAAAIijuO8fmho6LtYPFaADViPe0b09/fvOjY2dpOqzuLJggACCExRYF1PT88Jq1evvmOKdRiOAAIIIIBAagQWLVqUnTNnzurwxPPUNE2jCCDQTIGzfN9/ZzMLUgsBBBBAAAEEEEAAAQQQQACBBAuEm69ON7N3J7hHWkMAgeYK/Hnu3LmHDAwMBM0tG/9qbMB6gjXM5/PvUdXT47+8dIAAAhEQuF1VT/A87w8RyEIEBBBAAAEEIi2Qy+V26u7uHhGR4yIdlHAIIBBJAVV9JJvN7j84OHhXJAMSCgEEEEAAgXQKqOu6HzOzm33fr6STgK4RQAABBBCIpsDAwIBz0003rRSRt0QzIakQQCCKApx+tf1VYQPWE9hs+9T9lSJyYBSf0GRCAIHYCWzKZDJFjmGM3boRGAEEEECgjQL9/f1Pq9VqF4nIwjZOy1QIIJAgAVX9pOd5AwlqiVYQQAABBBCItUB/f39vvV4/28zy2xr5wfj4+NtHRkb+EuvGCI8AAggggEACBHK5XKanp+dsEXlzAtqhBQQQaJ/AFZ7nHSYi1r4p4zMTG7C2s1b5fP41qvq9+CwlSRFAIOIC4RGMH/V9/wv8hRTxlSIeAggggEDbBQqFQvjBh4tF5Bltn5wJEUAgKQL39PT0zF29evXDSWmIPhBAAAEEEIizwNKlS/ccHR39nqoe8bg+NovIp0ZHR79UrVbrce6R7AgggAACCMRVINx81dvbu8bMinHtgdwIINAxgdd5nsc+mu3wswHrSZ6XhULhRyLy0o49dZkYAQSSKHCu4zhvKZfLm5LYHD0hgAACCCAwWQHXdZ9vZueLyOzJjuV6BBBA4J8CZvbuSqVyJiIIIIAAAggg0HmBYrF4+Laf8ffcXhoz+52qnuJ5XngnCh4IIIAAAggg0CaBXC7X3dvbWzGzN7RpSqZBAIGECKjqH8vlcngHC06/2s6asgHrSZ7s+Xz+UFVdJyJOQn5P0AYCCERAQFWvUtXXlsvlWyIQhwgIIIAAAgh0TKBQKLxRRMoi0tuxEEyMAAJJELhlbGxsfrVaHUtCM/SAAAIIIIBAnAWKxWLOzAZFZPoE+qiZ2Zf22GOPT69YsWLLBK7nEgQQQAABBBCYgkCxWJwRBMF3VPUVUyjDUAQQSKlAEASvrVQq4YepeWxHgA1YO3hq9PX1DTqOw71v+S2EAAJNFTCz+4IgOHFkZOTHTS1MMQQQQAABBOIhoIVC4SMi8mkR4d8k8VgzUiIQWQFVzXueNxzZgARDAAEEEEAgHQLquu4HROSzDXyg+WbHcd42NDR0aTqo6BIBBBBAAIH2C/T39+86Pj5+kYgc3f7ZmREBBOIuoKq/LZfLR3H61ZOvJG927OCZXiqV5tTr9etFZEbcf1OQHwEEIidQV9WPep73hcglIxACCCCAAAItEujv7++t1WorRaTYoikoiwAC6RK4cv/99z9sYGAgSFfbdIsAAggggEB0BMKf8cfHx1eLSN8UUpmqrlHVDwwNDd03hToMRQABBBBAAIHHCZx88slP3bp16w9F5BBwEEAAgUYEgiB4SaVSuayRsWkawwasCax2oVD4pIh8YgKXcgkCCCAwaQFV9adPn75s5cqVmyc9mAEIIIAAAgjESCD8cMP4+Pj3VPXwGMUmKgIIRFhAVV/ued6PIhyRaAgggAACCCRaoK+vb3YmkzlPRF7QpEbvF5EPeZ73TT5d3yRRyiCAAAIIpFogn88/w3GcS0RkXqohaB4BBBoWMLMf+r7/yoYLpGggG7AmsNjLli2bvmnTputEZO8JXM4lCCCAQCMC1wVB8Mbh4eGrGxnMGAQQQAABBKIusGTJkudkMpnw/vD8TB31xSIfAvERuMT3/VfEJy5JEUAAAQQQSJZAqVT6tyAILhCRZ7Sgs59lMpm3n3POObxW1gJcSiKAAAIIpEOgv79/fq1Wu0RVeT0uHUtOlwi0QsAcxzlqaGjot60onrSabMCa4IoWCoWlInL2BC/nMgQQQKARgYcdx3lLuVyuNjKYMQgggAACCERVIJ/PF1R1lYj0RjUjuRBAIHYCgaoe4XneH2KXnMAIIIAAAggkQMB13deKiCciM1rYzpiqfnH27NmfXbFixZYWzkNpBBBAAAEEEidQLBYPN7O1IjI7cc3REAIItFOg6nnem9o5YZznYgPWBFdvYGDAueGGG37D7VImCMZlCCDQsICZnX799de/f926dbWGizAQAQQQQACBCAjkcrlMd3f3Z0Xk/SLCvz0isCZEQCBBAmXf90sJ6odWEEAAAQQQiI2A67rvFZEvi4jTptDrReSdnuf9oE3zMQ0CCCCAAAKxFiiVSi8NguA7IjIz1o0QHgEEOi1QV9WDy+XytZ0OEpf5eRNkEitVKpWeV6/Xf8GbR5NA41IEEGhIwMx+HwRBbmRk5C8NFWAQAggggAACHRbo6+ubraoVVX1Zh6MwPQIIJE9gc71enz8yMnJr8lqjIwQQQAABBKIrsHjx4p5Zs2Z9Q0Te3ImUqnpREARv933/tk7Mz5wIIIAAAgjEQcB13fDDSuFJ9F1xyEtGBBCIroDjOKuGhoZOiW7C6CVjA9Yk16Svr2/QcZyO/ANzklG5HAEEYi6gqhuCIOivVCoXx7wV4iOAAAIIpEygWCw+NwiC8Ja6e6esddpFAIE2CJjZxyuVymfaMBVTIIAAAggggMA2gWKxuIeZnSciR3cY5cHwZ4GxsbGzqtVqvcNZmB4BBBBAAIFICRQKhY+q6qc5TCRSy0IYBOIqsLWrq2vemjVr+ADkJFaQDViTwAovPfnkk5+6ZcuW60Vkl0kO5XIEEECgEQETkTM2btz4gbVr1442UoAxCCCAAAIItFMgn8+XVPXrIjKtnfMyFwIIpEbg1hkzZsxfuXLl5tR0TKMIIIAAAgh0WKBYLD7bzC4QkX07HOXR019pZu/0fT+8YwUPBBBAAAEEUi2Qy+UyPT09Z4jI21MNQfMIINA0AVX9r3K5/L6mFUxJITZgNbDQruu+38y+2MBQhiCAAAINCZjZH0RkSaVSubGhAgxCAAEEEECgxQL9/f29Y2NjZ6jqyS2eivIIIJBiAVU90fO8b6WYgNYRQAABBBBoq4Druq8UkZGIfiDZVNXr6el5/6pVq+5uKwyTIYAAAgggEBGBbbcI9kTkjRGJRAwEEIi/wMOqOrdcLt8T/1ba2wEbsBrwzuVy3d3d3VeJyAENDGcIAggg0KjAwyLyDt/3wx+keSCAAAIIIBAZgVKpNK9er58rIodGJhRBEEAgcQKq+nPP814oIuEpsTwQQAABBBBAoMUChULh/6nqF0Qk0+Kpplr+ARH5+Ojo6Ne4LeFUKRmPAAIIIBAngb6+vtmO41ygqs+LU26yIoBA5AU+4XleeDtTHpMUYAPWJMH+eXmxWHxFEAQ/aHA4wxBAAIGGBcxsqFarvbNarT7ScBEGIoAAAggg0CSBQqHgishZIrJzk0pSBgEEEHgigcDMjqxUKuvgQQABBBBAAIHWCixatCi71157nR5+ELC1MzW9+hVm9i5uS9h0VwoigAACCERQwHXduap6kZlxYEgE14dICMRY4A5VnVculzfFuIeORWcD1hTo+/r6zncc54QplGAoAggg0KjAX1S15HnezxotwDgEEEAAAQSmIrB8+fJp99xzz+dF5D1TqcNYBBBAYCICjuOsLpfLb5nItVyDAAIIIIAAAo0L5HK53Xp7e79tZi9uvEpHR3Jbwo7yMzkCCCCAQDsESqXSMUEQfFdEZrdjPuZAAIH0CARBcFKlUhlMT8fN7ZQNWFPwzOfzz1LVq0WkdwplGIoAAgg0KlA3sy/VarVPVKvVsUaLMA4BBBBAAIHJChQKhQNFJLzl4LMnO5brEUAAgQYEHlbVAzzPu7OBsQxBAAEEEEAAgQkK5PP5/TOZzIXhSRrhGwcxv+dveFvCz4+Ojq7gdbMJPgG4DAEEEEAgFgKFQmGpqn5NRLpjEZiQCCAQJ4Er586de9jAwEAQp9BRysoGrCmuRqFQ+IyIfHSKZRiOAAIITEXgT0EQuMPDw1dNpQhjEUAAAQQQmIhAPp8vbXuRZ/pErucaBBBAYKoCqvohz/O+MNU6jEcAAQQQQACB7Qu4rvsyEfmWiOyaMKcbVHV5uVy+OGF90Q4CCCCAQPoEtFQqnRYEwWnpa52OEUCgTQIv9zzvR22aK5HTsAFrisu6bNmy6Zs2bfqziOw7xVIMRwABBKYisFVVB+bOnfuf7EqeCiNjEUAAAQS2J5DL5Xbv6upaqaqvRQkBBBBoo8D6rq6ugwYHB7e2cU6mQgABBBBAIFUCrusuE5EzRaQrqY2b2aWO47ynXC5fm9Qe6QsBBBBAILkC/f39vePj42tEZElyu6QzBBDosMDFnucd1+EMsZ+eDVhNWMK+vr5XO45zQRNKUQIBBBCYqsAl9Xr95JGRkVunWojxCCCAAAII/FMgn8+/SlXPFpGnoYIAAgi0U8BxnDeUy+Xz2jkncyGAAAIIIJAWgUWLFmXnzJlzhqq+LSU9j6rqip133vk/zjrrrEdS0jNtIoAAAgjEXKBUKs0JguB7InJ4zFshPgIIRFegnslkDjnnnHOujm7EeCRjA1aT1qlQKIR/8b2mSeUogwACCExF4CFVfb/ned8UEZtKIcYigAACCKRbYPny5dPuueeez4vIu0WEfzuk++lA9wh0QuAy3/df0omJmRMBBBBAAIGkC+Tz+ac4jlMVkWOT3usT9HeniIQnya/iJPkUrj4tI4AAAjEScF33+SLybRF5eoxiExUBBOIn8A3P89LyoYyWrg5vojSJt1Qq7RMEwdVmtlOTSlIGAQQQmJKAmYX36D2lUqn8dUqFGIwAAgggkEqBE0888YhMJuOp6rxUAtA0Agh0WmA8CIKFw8PDV3U6CPMjgAACCCCQNIFSqTQvCIILRSTVP+s7jvNrMzu1XC7/JmlrTD8IIIAAAvEXKBaLp5hZeIvg7vh3QwcIIBBhgYez2ey8wcHBuyKcMTbR2IDVxKVyXff9ZvbFJpakFAIIIDBVgYe3nYa1ktOwpkrJeAQQQCAdAgsXLuw64IADPqKqHxORbDq6pksEEIiaQBAEXxkeHl4etVzkQQABBBBAIO4Cruu+QES+IyK7x72XJuUPT4//tqp+sFwu39KkmpRBAAEEEECgYYHwFsF77bXXZ0Tkgw0XYSACCCAwQYEgCD5eqVTCP3N4NEGADVhNQPxnifDNqvnz568TkYObWJZSCCCAwJQFVPXHqnoKLyRNmZICCCCAQKIFlixZ8pxMJrNGRA5JdKM0hwACkRYwsztUdYHv+w9FOijhEEAAAQQQiJnAtpM0vioiXTGL3o64Y6r69a1bt36iWq0+2I4JmQMBBBBAAIHHC/T19c3OZrPfMrMXo4MAAgi0QeB2VT2gXC5vasNcqZiCDVhNXuZCoXC0iPxMRLBtsi3lEEBgygJbVPWLo6Ojn61Wq2NTrkYBBBBAAIHECIQfJFiwYMG/m9mnONY8MctKIwjEWWCJ7/vnxrkBsiOAAAIIIBAlgVwul+nt7f2ymb0nSrkimuVuEfnE6Ojo2dVqtR7RjMRCAAEEEEiggOu6h4nId0VknwS2R0sIIBBNgTd7njcUzWjxTMUmoRasW7FYPDsIgqUtKE1JBBBAYMoCqnqVqi4rl8u/mXIxCiCAAAIIxF6gUCgcJSJni8iBsW+GBhBAIAkCl/q+/7IkNEIPCCCAAAIIREFg6dKlO9dqtYqZHR+FPHHJoKrXBUHwft/3L4pLZnIigAACCMRXwHXdkoh8TUSmx7cLkiOAQJwEzOxXvu+HhwuFt+Tm0SQBNmA1CfLRZUql0qx6vX6diMxuQXlKIoAAAs0QqJvZmb29vR9fvXr1w80oSA0EEEAAgXgJLFu2bPrmzZs/s+1T8Jl4pSctAggkUUBVR8NboHqed30S+6MnBBBAAAEE2i1w4okn7tfV1XUBH7aYkvwPMpnM+84555yrp1SFwQgggAACCDyBwPLly6fde++9Z5oZB3vwDEEAgXYKBKr63HK5/Pt2TpqGudiA1aJVLhQK4V+U4UkCPBBAAIEoC9yqqu/yPC98MY4HAggggEBKBPL5/KtU9UwR2TclLdMmAgjEQ+A/fN//WDyikhIBBBBAAIFoCxQKhaMdxznPzPaIdtJYpAtE5Dvj4+MfGBkZ+UssEhMSAQQQQCDyAqVSaZ96vf5tVT0i8mEJiAACiRJQ1W+Wy+VliWoqIs2wAat1C6Gu615mZi9q3RRURgABBJojEATBBdls9tRyuXxLcypSBQEEEEAgigKlUmlOEARfMbM3RjEfmRBAINUCt8yYMePZK1eu3JxqBZpHAAEEEECgCQLhh4NVNbyNUXcTylHi/wTCn1POyGaznx8cHHwAGAQQQAABBBoVKBQKx6vqkIg8pdEajEMAAQQaFHgom80eMDg4eFeD4xn2JAJswGrh0yOfz++vqleKyLQWTkNpBBBAoFkCW1T1i9teRNrarKLUQQABBBDovMDAwIBz0003nWxm/ykiMzufiAQIIIDAYwWCIDhheHj4QlwQQAABBBBAYEoCWiqVTguC4LQpVWHwkwqo6kYzC19DO31wcJDX0Hi+IIAAAghMWCCXy2WmTZv28SAIPi4izoQHciECCCDQPIFTPc87vXnlqPRoATZgtfj5UCgUPiwin23xNJRHAAEEmimw3nGcD5XL5Wozi1ILAQQQQKAzAvl8/lBV/YaIHNmZBMyKAAII7FDgfN/3X7vDq7gAAQQQQAABBLYrsHTp0p1rtVrFzI6HqW0Ct5jZx/bff/+RgYGB8DaFPBBAAAEEENiuQKFQ2EtVPRHh7kk8TxBAoFMC11x77bWHrlu3rtapAEmflw1YLV7hRYsWZefMmfM7ETm0xVNRHgEEEGi2wEVm9t5KpciQHn0AACAASURBVLK+2YWphwACCCDQeoFSqTQrCIJPm1l4L/dM62dkBgQQQKAhgc31ev2gkZGRvzQ0mkEIIIAAAgggIEuWLHlmNpu9QEQOhqMjAn8QkQ95nvejjszOpAgggAACkRdwXfcEEVktIrMiH5aACCCQWAHHcV42NDR0aWIbjEBjbMBqwyJsO3XgtyLS1YbpmAIBBBBopkC4A/prY2Njn6hWqw82szC1EEAAAQRaIxDebvCGG25wHcf5kpnt3ppZqIoAAgg0TeAjvu9/rmnVKIQAAggggEDKBEql0vOCIPiuiDw1Za1Hsd1fBEHwkUql8tMohiMTAggggED7BRYvXtwze/bsL5rZu0WE9+XbvwTMiEBzBcLfxdbcku2qpqrfKZfLb2zXfGmdhz/o27Ty+Xz+P1X1fW2ajmkQQACBpgqY2X2O43x6dHT0zGq1Wm9qcYohgAACCDRNIJ/Pv9hxnK+Y2b81rSiFEEAAgdYJ3Lhx48aD165dO9q6KaiMAAIIIIBAcgWKxeISMwtP05iW3C7j15mZXVqv1z8wMjLyx/ilJzECCCCAQLMEXNc9QFWHzew5zapJHQQQQKBBgS2qelC5XL6lwfEMm6AAG7AmCDXVy5YtWzZ98+bNV5nZflOtxXgEEECggwJXmtnySqVyWQczMDUCCCCAwOMEwluOhCdeqeobwEEAAQRiImBmdiw/V8ZktYiJAAIIIBApgfDU2xtvvPEzqvrhSAUjzKMFAhEZrtVqp5177rk3Q4MAAgggkC6BfD7f7zjOmSIyI12d0y0CCERRwHGcTw4NDQ1EMVvSMrEBq40rumTJkmMzmUx4H3jc2+jOVAgg0HyB8Gh7Vf1gpVK5sfnVqYgAAgggMFGBXC63S3d394dE5FQR6Z3oOK5DAAEEOi1gZqsqlcopnc7B/AgggAACCMRNoFgszjCzsoi8Lm7ZU5q3JiKrw5Plh4aGbk+pAW0jgAACqRHo7+/fdXx8/CwR6UtN0zSKAAJRF1i/++67P3vFihVboh40CfnYCNTmVczn86tV9aQ2T8t0CCCAQCsEama2xnGcAc/z7mzFBNREAAEEEHhigYULF3YtWLDgJDP7lIg8FScEEEAgZgJ3mtlBlUrl/pjlJi4CCCCAAAIdFTjppJP2Hh8fP59bGXV0GRqdPLzty1nj4+OfHx4evrfRIoxDAAEEEIiuQKlUemkQBGtEZK/opiQZAgikTcDMXuX7/tq09d2pftmA1Wb58JSCrq6ua1R1zzZPzXQIIIBAqwQ2mdmZtVrtc9Vq9cFWTUJdBBBAAIF/CPT19b06k8l82czmYoIAAgjEUSCTybx+aGjou3HMTmYEEEAAAQQ6JbBkyZLnZDKZ81V1705lYN6mCGxS1bN7eno+u2rVqrubUpEiCCCAAAIdFejv7+8dHx8Pb+31fhFxOhqGyRFAAIHHClQ9z3sTKO0TYANW+6z/d6Zisfj6IAi+04GpmRIBBBBomYCqbjCzT4+NjX2jWq2OtWwiCiOAAAIpFXBd9wVm9p8i8tyUEtA2AggkQEBVv+15Xi4BrdACAggggAACbRMoFos5MxsUkeltm5SJWi3wiKquZiNWq5mpjwACCLRWoFAoHKyqnoj8W2tnojoCCCAwaYGHHcdZwG2wJ+02pQFswJoSX+ODC4VChfv/Nu7HSAQQiLTAehE5bWxsbLhardYjnZRwCCCAQAwEXNc9zMw+KSLHxyAuERFAAIEnE7i/q6vrwMHBwbtgQgABBBBAAIEJCajruh8Qkc9yosaEvOJ40SMi8tXR0dEvVqvVjXFsgMwIIIBAGgVyuVymp6fnfSLyKRHpTqMBPSOAQLQFzGy57/tfiXbK5KVjA1aH1rRUKs2q1+t/FpGndSgC0yKAAAKtFrjWzD5fq9V8NmK1mpr6COxIIPyRz3Z0Ef9/xAQKhcKBqjpgZm8UEX5uj9j6EAcBBCYvoKpLPc9bM/mRjEAAAQQQQCB9AsuXL5+2YcOG8NQrbhmSjuV/UFVPz2QyKwYHBx9IR8t0iQACCMRToFgsLghPMQyC4Kh4dkBqBBBIgcAVt9122xGXX375eAp6jVSLvJHTweXo6+t7teM4F3QwAlMjgAAC7RC42nGcT5bL5W+zA6Qd3MyBAAJxFygWi/vW6/UPqepbRCQT937IjwACCGwTuMz3/WP5eZDnAwIIIIAAAjsWWLp06Z6jo6PfU9Ujdnw1VyRM4IEgCMKTCv67Uqncn7DeaAcBBBCItcCiRYuye+21V3gy5SdEpCfWzRAeAQSSLBCo6vPL5fJvktxkVHtjA1aHV6ZQKJRFxO1wDKZHAAEEWi5gZn9Q1dN837+o5ZMxAQIIIBBDgRNPPHG/TCbzCVUtsPEqhgtIZAQQeDKBzWZ2cKVSCW9VzQMBBBBAAAEEnkTAdd1DRCT80O4+QKVa4JHwdJXwdHnP8+5MtQTNI4AAAhEQKBQKB4d/LovI4RGIQwQEEEBguwJm9nXf998OUWcE2IDVGff/nbW/v3/XWq32JxHZq8NRmB4BBBBol8CVZvZlbk3YLm7mQQCBqAuEtxoUkQ+JSJ+IZKOel3wIIIDAZAVU9f95nvflyY7jegQQQAABBNIm4LruG0RkSESmp613+t2uwKiInGNmn/Z9/zacEEAAAQTaK7Bw4cKuBQsW/LuIfEpEuts7O7MhgAACkxa413Gc+UNDQ/dNeiQDmiLABqymME6tiOu6x5kZJ8JMjZHRCCAQP4GrzeyLd9xxR4V7EMdv8UiMAAJTF+jr6/s3x3HeJyJ5TryauicVEEAgsgK/Gxsbe161Wq1HNiHBEEAAAQQQ6LyAFgqFj6jqp0WE1+w7vx5RTBBuxBpU1S+Uy+VbohiQTAgggEDSBIrF4nODIDhbVQ9KWm/0gwACyRQIgqBUqVTCO7Dx6JAA/5jrEPzjpy0UCmtEpD8icYiBAAIItFPgFlU9PZvNfmNwcHBrOydmLgQQQKATAoVC4ehtJ14dx5srnVgB5kQAgTYKjNfr9SNHRkb+2MY5mQoBBBBAAIFYCfT39/eOj4+vEpHwVuQ8ENiRwHgQBJXu7u7PDQ4OXreji/n/EUAAAQQmL5DL5Xbp6en5jIi8Q0ScyVdgBAIIINB+AVX9SblcfqmIWPtnZ8Z/CrABKyLPhW23IvyziMyJSCRiIIAAAu0W+JuIfMlxnNXlcnlTuydnPgQQQKDFAuq67qtE5P1m9qIWz0V5BBBAICoCn/F9/+NRCUMOBBBAAAEEoiZw8sknP3XLli3fVdXnRS0beSIvEKhq+Nz54tDQ0G8jn5aACCCAQEwEXNd9k4h8RUSeHpPIxEQAAQRCgc0icojneTfB0VkBNmB11v8xsxcKhcUi8n1OQojQohAFAQQ6IbBRVb+ezWbPGBwcvKsTAZgTAQQQaJZA+Gn2Wq1WFJHlIrKgWXWpgwACCMRA4M8bN248fO3ateHtcngggAACCCCAwOMECoXCwSJygao+ExwEpijwi223JryIEw+mKMlwBBBIrUA+n3+W4zhnikj4Xi0PBBBAIFYCZvY+3/f/K1ahExqWDVgRW9hCofB1EXlrxGIRBwEEEOiEwJiInBsEwReGh4ev7kQA5kQAAQQaFcjlcrv39PQsDYLgPaq6Z6N1GIcAAgjEVGDccZznlcvl38c0P7ERQAABBBBoqUD4QVxVHRGRmS2diOJpE/hTeLr8tddeO7xu3bpa2pqnXwQQQKARgYULF3YtWLAgvNVgeMvBnRqpwRgEEECgkwKq+sdbb731yMsvv3y8kzmY+x8CbMCK2DOhWCzOCILgjyKyf8SiEQcBBBDolEB4r+Lvm9mXK5XKZZ0KwbwIIIDARASKxeKCer1+qqqGp15Nm8gYrkEAAQSSJmBmn6hUKp9OWl/0gwACCCCAQDMEisXiB8zscyLiNKMeNRB4AoG/BkHw5Uwmc3a5XN6EEAIIIIDAEwuUSqWXBkFwuogciBECCCAQU4Ga4ziHDw0NXRXT/ImLzQasCC5pPp9fqKq/EpGuCMYjEgIIINBJgetV9WuquooXkDq5DMyNAAKPFhgYGHDWr1//knq9/l4ROY4POfD8QACBNAuY2R+uv/76ozh1Ic3PAnpHAAEEEHgigcWLF/fstttuX1fVfoQQaJPAfSJyVjabPWtwcPCuNs3JNAgggEDkBYrF4r5mFt6q63WRD0tABBBA4EkEVPUz5XL54yBFR4ANWNFZi8ckyefzp6nqQETjEQsBBBDotMCDInKO4zhfKZfLt3Q6DPMjgEA6BYrF4h5mdpKZvU1EnplOBbpGAAEE/k9AVUfr9fpCbh/NswIBBBBAAIHHCpRKpVlBEHxbRBZhg0AHBMZE5HzHcb40NDT02w7Mz5QIIIBAJASWLVs2fevWrR8IguCDItIbiVCEQAABBBoUUNXrM5nMoYODg1sbLMGwFgiwAasFqM0ouWjRouycOXN+JiJHNaMeNRBAAIGECtSDILhARM4cHh4Ob08Y3q6QBwIIINBSgWKx+NwgCN6lqjkz62npZBRHAAEEYiRgZv9eqVRWxCgyURFAAAEEEGi5QKlUmhcEwYUiMq/lkzEBAjsW+IWqnr5169bzqtVqfceXcwUCCCCQDIFisfhqMztDRJ6RjI7oYnsC4eYH3iji+ZECgcBxnBcNDQ39PAW9xqpFNmBFeLny+fyzVPUKEdk5wjGJhgACCERF4EZVPXt0dHR1tVrdEJVQ5EAAgWQI9Pf37zo+Pv4mEXmbmT0nGV3RBQIIINBUgV+MjY29iDfymmpKMQQQQACBmAsUi8VXmdmwiMyMeSvET5hAeGKCiHxl2rRpQytXrtycsPZoBwEEEPhfgWKxePi22w2+EBYEEEAgKQKqeka5XH5PUvpJUh9swIr4ahYKhVNEZGXEYxIPAQQQiJLAmKqGx6qvHBoa+jEfdojS0pAFgXgJDAwMONdff/3zVbWoqq6ITI9XB6RFAAEE2iawaWxs7NBqtXpT22ZkIgQQQAABBCIuUCgUTlXVL4lIJuJRiZdugftU9Zuq+rWhoaG/pZuC7hFAIEkCS5YseWZXV9d/mFmfiPB+eJIWl14QQOCvM2fOfPZZZ531CBTRE+AvnOityb8k6uvrCzcSnBCDqEREAAEEoiZwXfgi0ujoaJlTsaK2NORBILoChUJhLzPrV9WlIrJvdJOSDAEEEIiGgKq+1fM8PjgUjeUgBQIIIIBAhwUWLlzYdeCBB37VzMIP1vJAIC4C4e0IL6jX62cODw9fxgca47Js5EQAgccL5PP5pziO82ERebeI9CKEAAIIJFBgsed5P0hgX4loiQ1YMVjGvr6+2Y7j/ElEnhaDuEREAAEEoigQvoh0WXgq1jXXXPO9devW1aIYkkwIINA5geXLl0+79957jw+CoCQirxSRbOfSMDMCCCAQHwEz+1GlUnkFb9LFZ81IigACCCDQOoFcLrdbb29v1cxe0rpZqIxAywVuEJHV2Wz2G4ODgw+0fDYmQAABBJogEG6AXrBgwUmq+mkz26MJJSmBAAIIRFHgbM/zTo5iMDL9Q4ANWDF5Jriue5yZXciaxWTBiIkAAlEWuEdV/Xq9Pjg8PHxVlIOSDQEEWiuwaNGi7Jw5c14mIuHtBV/LLQZb6011BBBIpMDGnp6eg1evXn1HIrujKQQQQAABBCYh0N/fP398fDx8/XbuJIZxKQJRFnhIVQdV9atDQ0PhpiweCCCAQOQEBgYGnBtvvHFJuPFKRJ4VuYAEQgABBJon8DczO9j3/YeaV5JKzRZgA1azRVtYr1AonC4i72nhFJRGAAEEUiVgZn9wHGdIRL7led6dqWqeZhFIsUCxWDx8fHy84DhOn4g8NcUUtI4AAghMVaDg+35lqkUYjwACCCCAQNwFXNcNP9jxLRHZNe69kB+BJxCw8NRTx3G+cc0111zIyfI8RxBAICIC6rru683sk6p6UEQyEQMBBBBolYA5jvPyoaGhS1s1AXWbI8AGrOY4tqXK4sWLe3bbbbdfi8ihbZmQSRBAAIH0CPz9FoUiMtzV1XUex6unZ+HpND0CruseZmY5Vc2Z2X7p6ZxOEUAAgdYIqGrV87w3taY6VRFAAAEEEIiPgOu6y0TkTBHpik9qkiLQsMBdInKOqn6jXC7f0nAVBiKAAAJTECiVSi8NguDzIrJwCmUYigACCMRGIDyRtFwuvys2gVMclA1YMVv8XC43t7u7+w8isnPMohMXAQQQiIWAqo6Gn+ozs2qtVjuvWq0+EovghEQAgX8R6OvrOyiTyYQbrpaIyAEQIYAAAgg0TeC2sbGxQ6rV6samVaQQAggggAACMRPI5XKZ3t7eL5sZdyyI2doRtykCgZn9xHGclddcc833OBWrKaYUQQCBHQiUSqVjgiD4jIi8CCwEEEAgRQK3zJw589/OOuss3q+MwaKzASsGi/T4iK7rnmRmq2MYncgIIIBA3AQeNrPvq+p3ZsyYcfHKlSs3x60B8iKQMgEtlUpH1Ov112476WpuyvqnXQQQQKAdAnVVfbHneT9rx2TMgQACCCCAQBQF+vv7dx0fHw9vORjeepAHAmkXuF1Vzw6/hoaG/pZ2DPpHAIHmC7z5zW9+eb1e/6iIvLD51amIAAIIRFogEJFFvA4X6TV6TDg2YMVnrR6T1HVdz8wKMY1PbAQQQCCOAltF5NJtJ2OdX61WH4xjE1PLHP7YYFMrwWgEmiwQ3qJ59913f0G9Xn+1iLxBROY0eQrKIYAAAgg8SkBVP+l53gAoCCCAAAIIpFXgxBNP3K+rq+tCEVmQVgP6RmA7An8/FUtVy9OnT/82H2TkeYIAAlMU0GKxeLyZhRuvnjvFWgxHAAEEYikQBMGXK5XK/4tl+JSGZgNWTBe+UCjMFJE/isizYtoCsRFAAIHYCvzzNoWO43yvp6fnolWrVt0d22YIjkAMBXK53G5dXV3HOY5zgoi80sx2imEbREYAAQRiJ6CqPx8dHV1UrVbrsQtPYAQQQAABBJogsO3WR+eJyO5NKEcJBJIsEH5w8VzHccpDQ0M/T3Kj9IYAAs0VGBgYcG6++ebjzOw0EVnY3OpUQwABBOIjoKrXzZ49+7AVK1ZsiU9qkrIBK8bPgVKpdGS9Xg//8dIV4zaIjgACCMRdIDz+83cicqGqXuR53pVxb4j8CERNIHzh5YYbbniOqr4y/DKzo0QkG7Wc5EEAAQQSLnB/JpM5lNvKJHyVaQ8BBBBAYLsCxWLxFDP7Kq/F8iRBYNICV4nI6nq97g8PD9876dEMQACBVAjkcrnu7u5uV1U/KCLzUtE0TSKAAALbF6ir6tHlcvk3IMVLgA1Y8Vqvf0lbKBQ+ICJfiHkbxEcAAQSSJPBXEfm+4zgXZDKZ/xkcHAxvXcgDAQQmKZDL5Xbv6up6ebjhSkReLiJ7TLIElyOAAAIINFcg5/v+t5tbkmoIIIAAAghEXyCXy2V6e3u/ZGanRj8tCRGItMCYmV1kZkO1Wm1ttVodi3RawiGAQFsEwpPue3t732pm7xaRp7dlUiZBAAEEIi5gZp/zff8jEY9JvCcQYANWzJ8W4YkQN95449ptb0zGvBviI4AAAokT2GJmPxWRH5rZJcPDw1cnrkMaQqBJAsuXL5925513Pj+bzb4kCIJw49VhIuI0qTxlEEAAAQSmIGBmqyqVyilTKMFQBBBAAAEEYilQKBRmquqIiCyOZQOERiCiAqq6MQiCb4mI5/v+L0XEIhqVWAgg0CIB13XnquqpZtYvIjNaNA1lEUAAgTgKXHHfffcdtXbt2tE4hk97ZjZgJeAZcPLJJz91y5Ytf2RneAIWkxYQQCDpArc5jnOJmf3QcZwfDw0N3Zf0hukPge0JLFy4sGvevHnPdRwn3HD14kwm8zwz60EMAQQQQCByAtc5jnN4uVzeFLlkBEIAAQQQQKCFAsVicd8gCC5U1YNaOA2lEUi9gJnd6jjOd81sted5V6YeBAAEEi6Qz+cXZjKZ95pZXkQyCW+X9hBAAIHJCmw1syN93//TZAdyfTQE2IAVjXWYcoq+vr4XOY5zqYhkp1yMAggggAAC7RAIVPXKIAguM7PLx8fHf1qtVh9sx8TMgUAnBBYvXtwza9ashSLygnDDlaoew6fbOrESzIkAAghMXEBVR4MgOKpSqVwx8VFciQACCCCAQPwFSqXSMUEQnCciu8e/GzpAID4CZvY7VfVF5Fue590Zn+QkRQCBJxMIT77fsGHDEhF5p4iErw/yQAABBBB4AgEze6fv+2eBE18BNmDFd+3+JXmhUPiwiHw2QS3RCgIIIJAmgbqI/EFELheRy3p6en6+evXqh9MEQK/JEsjlcrt1d3c/X0SODjdbmdnhItKbrC7pBgEEEEi2QHg7CM/zTk92l3SHAAIIIIDAYwVc1+0TkdX8+4VnBgIdFQhE5FciUs1ms+cODg7e1dE0TI4AAg0JnHjiift1dXWFt7N/i4jMbqgIgxBAAIH0CPzA87xXcWvmeC84G7DivX6PST8wMODcdNNNF5pZ+BuTBwIIIIBAvAXCDVnhEaO/EJFfmtkvKpXKX+PdEumTKhD+DHLjjTfOD4/GzWQyzw+C4GgRWSAi/KyZ1EWnLwQQSLyAql7sed7xvOiT+KWmQQQQQACB/xPQUql0WhAEp4GCAAKREvjfzVi9vb0jq1atujtS6QiDAAKPEQhfJ1y/fv1LgiBYJiKv5zaDPEEQQACBHQuo6j2ZTOYQNp3v2CrqV/CmWNRXaJL5SqXSrHq9Hp6gss8kh3I5AggggED0BW5X1V+Gm7JU9deZTObKwcHBrdGPTcKkCSxZsmTvbDZ7ZLjhSkSOEJHwdKudk9Yn/SCAAAIpFrjTcZxDy+XyPSk2oHUEEEAAgRQJvOMd79jpoYceCm97dkKK2qZVBOIoUBORHwdBcG6tVrugWq1ujGMTZEYgiQInnXTS3rVarV9EThKRfZPYIz0hgAACLRIwMzvO9/21LapP2TYKsAGrjdjtmqpQKBwlIv8jIt3tmpN5EEAAAQQ6IlAzsz+p6u9U9fci8rvbbrvt6ssvv3y8I2mYNJECxWJx3/Hx8UNU9RDHcRaaWbjh6mmJbJamEEAAAQRCgXFVfZnneeFtkXkggAACCCCQeIFSqTQnCILzRWRh4pulQQSSJRCeHv/r8DaFXV1d561Zs+bWZLVHNwhEX2Dx4sU9s2fPfrmZFUXkdSKSjX5qEiKAAALREgiC4PRKpXJqtFKRplEBNmA1Khfxca7rvtfMvhLxmMRDAAEEEGi+wBYR+eO2ryvDU7J6e3v/vHLlys3Nn4qKSRIIXzCZNWvWQWZ2qIj8fcOVmR0iIrsmqU96QQABBBDYocCHfd///A6v4gIEEEAAAQQSIBB+kFVVv8uHTBKwmLSAgMg1juNUx8fHL6xUKusAQQCB1gkUCoUDVbUkIktFZPfWzURlBBBAIPEC1+y+++6Hr1ixInxvj0cCBNiAlYBF3E4Lms/nq6r6huS2SGcIIIAAAhMUCD8ReJOIXGlmV6rqVY7jXF0ul/8iIjbBGlyWEIFtG63mm9l8EXm2mS1Q1YNEZC6fUkvIItMGAggg0LjARb7vh7de4ueDxg0ZiQACCCAQEwHXdQsiskpEemMSmZgIIDBBAVW9TkS+Z2YXjo6O/qZarYavjfFAAIEpCBQKhb1UtU9Ewr8/ww9t8kAAAQQQmJrAVjM70vf9P02tDKOjJMAGrCitRpOz5HK5XXp6en5vZuEbqjwQQAABBBB4vMBmM7vOcZxrgyC4JpPJXJfJZK7505/+dPO6detqcMVb4OSTT37q1q1b54Ubq8xs/yAI5ocbrVT1WWy0ivfakh4BBBBokcBfzOywSqVyf4vqUxYBBBBAAIGoCGipVDotCIJPiAivj0dlVciBQOsE7hORn4jIRUEQhKdj8fNu66ypnDCB/v7+XcfHx09Q1ZyZLRaRTMJapB0EEECgkwKnep53eicDMHfzBfgHZvNNI1Uxn88fqqq/FJFpkQpGGAQQQACBKAvUzOwWVb05/DKzm4MguNlxnJu7urrWDw4Obo1y+LRkW7RoUXbPPfecIyLPEJFnOY6zf7jpWlX//l1Edk6LBX0igAACCExNQFVHVfWYcrn8+6lVYjQCCCCAAALRFli2bNn0LVu2DJkZdw2I9lKRDoFWCYyLyM9F5GJVvahcLl/bqomoi0BcBcK/Kzdv3ny8meVVNdx01R3XXsiNAAIIRFjgYs/zjucU+givUIPR2IDVIFychuXz+ZKqnhOnzGRFAAEEEIisQHhLottU9a8i8tcgCMJf3xoEwd8ymczfRkdHb61Wqxsjmz5GwXK53G7ZbPbpjuPMUdV9zCzcaBV+PXPb9z05ySpGC0pUBBBAIMICZvaOSqXytQhHJBoCCCCAAAJTFiiVSnOCILhARA6bcjEKIIBAUgTWm9klmUzmki1btvykWq0+mJTG6AOByQiEJ13VarXjVfX1IvJKDnWYjB7XIoAAApMWuL1erx86PDx876RHMiDyAmzAivwSNSeg67pnmNm7mlONKggggAACCDypwCYRuVVE7hGRO0XkbjO7W0TuCP9bEAR3dnd33zNr1qyNK1as2JImy/D2wF1dXXtks9nZtVpttqrOUtWnicjTVXVPM3u6iIQbq8LvvWmyoVcEEEAAgY4JVHzfL3RsdiZGAAEEEECgDQLb7hJwgaru3YbpmAIBBOIpUBeRK0TkUsdxLt2yZctPq9XqWDxbITUCOxYolUqzgiA4btvtBV/OSVc7NuMKBBBAoAkCQb1ef9nw8HB4e2QeCRRgA1YCF/WJWlq4cGHXggULfmJmx6SkZdpEAAEEEIiHQLgB6z5V3Whm95lZeHrWfSJyv6o+aGabMplMuKHrofBrfHx8U/jfHMd5UFXHwl+HbVYqlftb1e7AwIBzww037DJ9+vTuzZs3zzCzaaraa2Y7ZTKZaWa2i6ruYma7isjM8NdBvLvf5QAAIABJREFUEPzz+y6O48wWkfBrloh0tSondRFAAAEEEGhA4JqxsbHnVqvVRxoYyxAEEEAAAQRiIeC67ptEZJDTPGKxXIREIEoC4WlY4ZujP1LVy7ldYZSWhiyNChQKhQNV9TgRCb/C9wszjdZiHAIIIIDA5AXM7GO+7//H5EcyIi4CbMCKy0o1IWd/f//TxsbG1oUnbDShHCUQQAABBBCInICqPmJmNREZFZHNkwzoiMgujxsTbqri56VJQnI5AggggED0Bbb9nflc3/eviX5aEiKAAAIIINCQgLqu+wER+ayIhP/e44EAAgg0LKCq95jZ/4jIL4Ig+HmlUvmDiFjDBRmIQBsE+vv7e4MgOCYIgpeq6mvMbH4bpmUKBBBAAIEnEFDVy7Zu3fqyarUanrrJI6ECvKGY0IXdXluFQuGo8NMaZtaTstZpFwEEEEAAAQQQQAABBBBAYJuAmZUqlUoZEAQQQAABBJIosHz58mkbNmxYLSJLktgfPSGAQCQE7hKRy1U13JT1P+Vy+To2ZEViXVIfwnXdA8zsWFV9pYgcKyLTU48CAAIIINB5gbt6e3sPXbVq1d2dj0KCVgqwAauVuhGtnc/n366qZ0U0HrEQQAABBBBAAAEEEEAAAQRaK/BV3/ff1dopqI4AAggggEBnBFzXfbqqfs/Mjpx0gvDVcs6zmTQbAxBA4O8CD5vZbzKZzC/MbN3WrVt/Wq1Ww9sY8kCgpQLh3W/q9foLzOylIvIKEXlGSyekOAIIIIDAZAUCEXml53k/muxAro+fABuw4rdmTUmcz+dXq+pJTSlGEQQQQAABBBBAAAEEEEAAgbgI/G7jxo0vWLt2bXi7Xh4IIIAAAggkSmDJkiXPyWazF4jIXolqjGYQQCCOAuMicoWq/jL8Ghsb+83IyMhf4tgImaMlUCqV5ohIeFvBF6rqsWZ2QLQSkgYBBBBA4NECqvqpcrl8GirpEGADVjrW+V+6DO/7XKvVfioiR6SUgLYRQAABBBBAAAEEEEAAgVQJmNl9mUzmiHK5fEuqGqdZBBBAAIFUCBSLxVeZ2bCIzExFwzSJAAJxFAhPxPqzqq4LT8lS1Z/xs3kcl7G9mfP5/LMcxzlGRI4ON16JyIHtTcBsCCCAAAJTEPif0dHRY6vVan0KNRgaIwE2YMVosZodtVQq7RMEwe/NbPdm16YeAggggAACCCCAAAIIIIBApARq4aejPc/7WaRSEQYBBBBAAIEmCBSLxQ+b2WdExGlCOUoggAAC7RS4PQiC36nq71X1iq6urqvWrFlzazsDMFd0BIrF4h5BECxU1cNV9UgzCzddPSU6CUmCAAIIIDBRAVW9p6ur6zmrV6++Y6JjuC7+AmzAiv8aTqmDvr6+YxzH+bGIdE+pEIMRQAABBBBAAAEEEEAAAQSiLPB23/e/HuWAZEMAAQQQQGCyAosXL+6ZPXv2N82sONmxXI8AAghEWOB+EblSVa8SkfDrytmzZ1+9YsWKLRHOTLRJCuTz+ac4jhNutDo8CIK/fxeRfSZZhssRQAABBKIpEGQymcXnnHPOJdGMR6pWCbABq1WyMarruu5JZrY6RpGJigACCCCAAAIIIIAAAgggMHGBQd/3T5r45VyJAAIIIIBA9AXCU0LM7Lsi8vzopyUhAgggMGWB8NZFNwdBcE0mk7kuCILrurq6rqnVatf7vv/QlKtToGUCuVyue9q0afODIDhYRP759Ww2W7WMnMIIIIBAxwWCIPh4pVIJT+jlkTIBNmClbMG3167rumeY2bvgQAABBBBAAAEEEEAAAQQQSJTALzdu3PiStWvXjiaqK5pBAAEEEEi1QKFQCN/AvkBVn5lqCJpHAAEE/iFwm5ldp6rXmdkNqro+/MpkMrcMDg5uBak9ArlcbpcZM2bMq9Vq+2cymXlBEBwgIuFGq/B7V3tSMAsCCCCAQAQELpw7d+5rBwYGgghkIUKbBdiA1WbwqE6Xy+Uy3d3dF4rI4qhmJBcCCCCAAAIIIIAAAggggMCkBO7s6ek5fPXq1XdMahQXI4AAAgggEGGBQqFwvKpWRGTnCMckGgIIIBAFAROR20VkvZn9fVOWmd2iqn8NguD2+++//3Y+qDHxZRoYGHD+9re/PW10dHRfVd1n2ybguWY2T1XnmdkeE6/GlQgggAACCRW4OZvNHj44OPhAQvujrR0IsAGLp8j/CoT3m1bV34jI/rAggAACCCCAAAIIIIAAAgjEWmBrJpN50dDQ0G9j3QXhEUAAAQQQeJSA67rvE5HPi0gGGAQQQACBpgjcte0Erdsdx/lb+Ot6vX6n4zgbgiC4K5vNbtiyZcuGarU61pTZIlpk+fLl0+6+++49stnsnuPj43s4jvM0x3GeXq/Xn+E4zjPMbB8R2VtEuiPaArEQQAABBDovsDm8PbrneVd2PgoJOiXABqxOyUd0Xtd1DzCzX4vIrhGNSCwEEEAAAQQQQAABBBBAAIEdCKjqUs/z1gCFAAIIIIBAEgRyuVx3b2/v18xsaRL6oQcEEEAghgL3q+rdZnaviGwQkY2q+kC9Xn/AcZwHgiD4/+zdCZhkZ1k3/Ps53dM9JGzZQCWCQtjEV5SoqGwDojiyL21mqqs6YwgjIltkExVpEGQTIgFZQr5h0lVdM6ERkABBCDKvG75q5NVP0XyGvAhJ4CUQlqy91Hm+qxCQNUzPdFfXOefX18XlxeU5z/P//56C0NV3nfrSxMTEF3POX/vX9aurq9du27Ztrd/vD58CMnwa16b+dDqdYweDwdTExMRtU0rbiqK4Tc75uLIsjx/+34j4yr9SSl/79yemlE7KOf9ARNx6U8NZnAABAgRqL1CW5Vy/3+/WvqiCNytgAMsL5NsEOp3Ow8qyfK9PknlxECBAgAABAgQIECBAoHoCRVG8utvtDp8Q4ocAAQIECFReYPfu3SdOTEz8SUQ8sPJlFCBAgEBzBYYDWMNBrLWIuHbIkFL6Us65/BaS5Zzz8AkiX/s5NqX0rU+dGg5SRc65SCndJiKmI+KY5tJqToAAAQJjIPDGXq/3lDHIIcIWCxjA2uIDGNfth4/zzjm/alzzyUWAAAECBAgQIECAAAEC31Hg4iuvvHLnoUOHhn/Y8EOAAAECBCot0Gq17joxMXFhzvnulS4iPAECBAgQIECAAAECdRX4X5///OcfdNFFFy3XtaBehy9gAOvwrRp3ZavVektK6czGFVeYAAECBAgQIECAAAEC1RT4RFmWP3XgwIHh14L4IUCAAAEClRY4/fTTf3EwGFwQEbetdBHhCRAgQIAAAQIECBCopUBK6bNlWZ66uLh4RS0LKrVuAQNY6yZrzg07d+6cPv744z8YEQ9oTmtNCRAgQIAAAQIECBAgUEmBa4ui+Llut/svlUwvNAECBAgQ+AaBdru9NyJeHxHbwBAgQIAAAQIECBAgQGAMBcqJiYmd559//gfGMJtIWyRgAGuL4Kuy7dzc3Alra2t/k1K6W1Uyy0mAAAECBAgQIECAAIGGCQxSSo/r9XrvblhvdQkQIECgZgKnnnrqtnve856vi4hfq1k1dQgQIECAAAECBAgQqJfAc3q93h/Wq5I2RytgAOtoBRtwf6vVunNRFH+bcz6pAXVVJECAAAECBAgQIECAQKUEcs5P6/f7w6eE+CFAgAABApUVaLVaxxVFsRQRP1/ZEoITIECAAAECBAgQINAEgV6v1+s0oaiO6xMwgLU+r8Ze3W63h19D+MGc83RjERQnQIAAAQIECBAgQIDAmAnknF/b7/efOWaxxCFAgAABAusSaLfbp6SULsw532NdN7qYAAECBAgQIECAAAECoxX4x2OOOeYB55577g2j3dZuVRAwgFWFUxqTjLOzs6dFxIGI8LoZkzMRgwABAgQIECBAgACBRgtctLKy8silpaVBoxWUJ0CgogLDt5dyRbOLvZECX/3g5zsi4sSNXNdaBAgQIECAAAECBAgQ2GCBz+Scf2pxcfGKDV7XcjURMEhTk4McVY12uz2fc37hqPazDwECBAgQIECAAAECBAh8u0BK6aPLy8sPXFpauo4PAQIECBCoqkCn03lSzvmPI2JbVTvITYAAAQIECBAgQIBAIwRWIuKhvV7vLxvRVskjEjCAdURsjb4pzc7Onh8RvtO00S8D5QkQIECAAAECBAgQ2CqBnPNVZVn+zMGDBz+1VRnsS4AAAQIEjkZgZmZmYnp6+qUR8byjWce9BAgQIECAAAECBAgQGJHAk3q93nkj2ss2FRUwgFXRg9vK2DMzM1NTU1Pvj4gHb2UOexMgQIAAAQIECBAgQKCBAjesra3tuOCCC/6+gd1VJkCAAIEaCJxxxhm3Wl1d7eecH1GDOioQIECAAAECBAgQIFB/gbN7vd5v1r+mhkcrYADraAUbev/MzMzx27Zt+0hK6W4NJVCbAAECBAgQIECAAAECoxYoc86P6/f7fzrqje1HgAABAgQ2QqDVat25KIoLI+JHNmI9axD4jgLDv3pkNgQIECBAgAABAgSOXiDnfPGVV16589ChQ2tHv5oV6i5gAKvuJ7yJ/WZmZk6Zmpr664i43SZuY2kCBAgQIECAAAECBAgQiIiU0jN7vd5rYRAgQIAAgSoKzM7O3q8oinfknL2XWMUDlJkAAQIECBAgQIBA8wT+z2Aw+OkDBw58rnnVNT4SAQNYR6Lmnq8LdDqdn8w5fzjnfEssBAgQIECAAAECBAgQILDRAsPHN6QoiuIt3W5370avbj0CBAgQIDAKgU6n88Sc8xsiYmoU+9mDAAECBI5MwAPkjszNXQQIECBQS4FrJyYmfvb888//11q2U2pTBAxgbQprsxadnZ3dGRHvjojJZjXXlgABAgQIECBAgAABAiMReP+VV175SI86H4m1TQgQIEBgYwXS3NzcC8uyfOHGLms1AgQIECBAgAABAgQIbJrAIKX02G63O/z6dD8EDlvAANZhU7nw5gRmZ2fPiIjzvvLRbD8ECBAgQIAAAQIECBAgsFECl0xPTz943759127UgtYhQIAAAQKjEHjKU55yyy996Uu9lNKjR7GfPQgQIECAAAECBAgQILBBAk/r9Xqv36C1LNMgAcMyDTrsza7aarVekFJ68WbvY30CBAgQIECAAAECBAg0QSCl9PHt27ff77zzzvu/TeirIwECBAjUR2B2dvbkoijenXP+ifq00oQAAQIECBAgQIAAgboLlGX52n6//8y699RvcwQMYG2Oa2NXbbfbr8s5P7WxAIoTIECAAAECBAgQIEBgAwRSSleXZXm/fr//HxuwnCUIECBAgMDIBObm5n62LMt3RsTtR7apjQgQIECAAAECBAgQIHD0AhctLy8/cmlpaXD0S1mhiQIGsJp46pvYeWZmZmJqauptEfG4TdzG0gQIECBAgAABAgQIEKizwJdTSg/u9Xr/WOeSuhEgQIBA/QQ6nc6unPO+iLhF/dppRIAAAQIECBAgQIBAXQVSSh+91a1u9cA3vOEN19W1o16bL2AAa/ONG7fDWWeddYvPfvazH4yI+zWuvMIECBAgQIAAAQIECBA4OoGVlNIjer3e8HcqPwQIECBAoCoCaW5u7oVlWb6wKoHlJECAAAECBAgQIECAwFcFPr1t27b7vvWtb/0UEQJHI2AA62j03PtdBebm5k4YDAZ/HRF3x0SAAAECBAgQIECAAAEChyVQFkWxq9vtLh3W1S4iQIAAAQJjINDpdI7NOXcj4rFjEEcEAgQIECBAgAABAgQIrEfghqIoHrywsPB367nJtQS+k4ABLK+LTROYnZ09OSL+KiLutGmbWJgAAQIECBAgQIAAAQI1EUgpPbPX6722JnXUIECAAIEGCMzNzd2hLMs/jYhTG1BXRQIECBAgQIAAAQIE6iVQlmX5uH6/P/ydxg+BoxYwgHXUhBa4OYFWq3XXlNJfRsTtSREgQIAAAQIECBAgQIDAdxV48eLioq9t8gIhQIAAgcoIdDqd++ac3xUR31eZ0IISIECAAAECBAgQIEDgvwV8GNKrYUMFDGBtKKfFvpNAu92+d875UETclhABAgQIECBAgAABAgQIfLNAURRv6Xa7e7kQIECAAIGqCLTb7d0RsS8itlcls5wECBAgQIAAAQIECBD4BoHX93q9pxEhsJECBrA2UtNa31Wg1Wo9OKX0Pm/KeJEQIECAAAECBAgQIEDgvwVSShdeccUVjzt06NAaFwIECBAgUAGB1G63nxsRL4sI7y1X4MBEJECAAAECBAgQIEDg2wTevby8/LilpaUBGwIbKeCX5I3UtNbNCrTb7UflnP8kIiZRESBAgAABAgQIECBAgED87bHHHvvz55577g0sCBAgQIDAuAvs2bNn+9ra2nkRMTvuWeUjQIAAAQIECBAgQIDAdxH4i8nJyYft37//JkIENlrAANZGi1rvZgVmZ2dPj4i3+oScFwoBAgQIECBAgAABAg0X+Kdt27bt2L9//xcb7qA+AQIECFRA4IwzzviB5eXld6WUfqoCcUUkQIAAAQIECBAgQIDAdxL4WFmW9+/3+1/AQ2AzBAxgbYaqNW9WoNVqPTWl9DpMBAgQIECAAAECBAgQaKJAzvn/m5qaetD+/fs/08T+OhMgQIBAtQTa7fa9I+LdEXHHaiWXlgABAgQIECBAgAABAl8XuKooip9dWFj4JBMCmyVgAGuzZK17swKzs7O/HxG/i4kAAQIECBAgQIAAAQINE/jkxMTEA7zZ07BTV5cAAQIVFWi324+PiIWIOKaiFcQmQIAAAQIECBAgQIDAlyPigb1e759QENhMAQNYm6lr7ZsVmJ2dfX1E/AYmAgQIECBAgAABAgQINETgU4PB4IEHDx78REP6qkmAAAEC1RVI7Xb7uRHxBxFRVLeG5AQIECBAgAABAgQINFxgJef8y4uLix9quIP6IxAwgDUCZFt8V4HUarXelFLay4gAAQIECBAgQIAAAQI1F/hsURQ7ut3uv9W8p3oECBAgUHGBnTt3Th933HHnFkUxV/Eq4hMgQIAAAQIECBAg0GyBMqW0q9vtLjWbQftRCRjAGpW0fb6jwPz8fHHZZZct5JxnEREgQIAAAQIECBAgQKCmAp8riuLB3W73X2raTy0CBAgQqInA7t27T5yYmHhHRDygJpXUIECAAAECBAgQIECguQLP7PV6r21ufc1HLWAAa9Ti9vs2gZmZmYmpqanFiDgNDwECBAgQIECAAAECBGom8KWiKB7a7Xb/oWa91CFAgACBmgm02+17R8S7I+KONaumDgECBAgQIECAAAECzRN4Ra/X+63m1dZ4KwUMYG2lvr2/LnDqqaduu8c97jH8dN0jsBAgQIAAAQIECBAgQKAmAjeklH6p1+v9ZU36qEGAAAECNRWYnZ3dmVI6GBG3rmlFtQgQIECAAAEC4ycw/Et9Hr9YEhGogcD5vV7vV/0nrAYnWbEKBrAqdmB1jjszMzM1NTX1rojYWeeeuhEgQIAAAQIECBAg0AiBG3POD+/3+x9uRFslCRAgQKCyAu12+xkR8ZqIKCpbQnACBAgQIECAAAECBAj8l8A7l5eXZ5aWlgZACIxawADWqMXtd7MCe/fuPebaa699b1EUO1ARIECAAAECBAgQIECgogIrKaXH9Xq991Y0v9gECBAg0ACBr34Y8s0ppT0NqKsiAQIECBAgQIAAAQI1F8g5X3zNNdc84qKLLlqueVX1xlTAANaYHkyTY3U6nWPLsrwoIh7QZAfdCRAgQIAAAQIECBCopMAgpdTq9Xpvq2R6oQkQIECgEQJzc3MnlGX5JxHxoEYUVpIAAQIECBAgQIAAgVoL5Jw/UhTFL3S73etrXVS5sRYwgDXWx9PccHv27LntysrKh1JK92muguYECBAgQIAAAQIECFRMYPho87nFxcV+xXKLS4AAAQINEuh0Oj+ac353RPxwg2qrSoAAAQIECBAgQIBAfQX+uSzLHf1+/wv1rahZFQQMYFXhlBqacfhJvMFgcHFE/HhDCdQmQIAAAQIECBAgQKA6Amsppbler3egOpElJUCAAIGmCXQ6nYflnC+IiNs0rbu+BAgQIECAAAECBAjUUuCyycnJB+zfv/8ztWynVKUEDGBV6riaF/arT8L6YErpJ5vXXmMCBAgQIECAAAECBCoiMMg5n97v9xcrkldMAgQIEGigQLvd3hsRfxwRkw2srzIBAgQIECBAgAABAvUTuGJtbe0BBw8e/ET9qmlURQEDWFU8tYZlHg5hra6ufiAifqph1dUlQIAAAQIECBAgQGD8BXzt4PifkYQECBBotMCOHTsmf/AHf/CPcs6/0WgI5QkQIECAAAECBAgQqJPA1ZOTkw/cv3//v9eplC7VFjCAVe3za0x6Q1iNOWpFCRAgQIAAAQIECFRJYHViYuK0hYWFd1YptKwECBAg0ByBubm5E8qyfHtE7GhOa00JECBAgAABAgQIEKi5wBfLsnxwv9//3zXvqV7FBAxgVezAmhzXEFaTT193AgQIECBAgAABAmMnsFKW5WkHDhx419glE4gAAQIECETE7OzsySmlD0fEKUAIECBAgAABAgQIECBQE4Fri6J42MLCwkdq0keNGgkYwKrRYTahyleHsP4sIn66CX11JECAAAECBAgQIEBgLAVWcs6/0u/3/3Qs0wlFgAABAgQiYmZmZmJqauq8lNIeIAQIECBAgAABAgQIEKiBwA0R8fBer3eoBl1UqKGAAawaHmrdKxnCqvsJ60eAAAECBAgQIEBgrAWGT756woEDBy4c65TCESBAgACB/xJI7Xb79RHxFCAECBAgQIAAAQIECBCosMCNg8HgEQcOHPjzCncQveYCBrBqfsB1rTczM3ObqampD3gSVl1PWC8CBAgQIECAAAEC4yeQUlrOOT9hcXHxPeOXTiICBAgQIPBdBYZDWOdExFMZESBAgAABAgQIECBAoIICKymlx3a73fdVMLvIDRIwgNWgw65b1VardVxK6f2GsOp2svoQIECAAAECBAgQGEuBGyYmJh69sLBw8VimE4oAAQIECNy8QGq1WmcXRfEMUAQIECBAgAABAgQIEKiQwHD46gndbtfT6Ct0aE2NagCrqSdfk96dTufYwWDw7pTSQ2pSSQ0CBAgQIECAAAECBMZP4IbBYPCogwcPfmj8oklEgAABAgQOX6Ddbr80In778O9wJQECBAgQIECAAAECBLZMYLUsy5l+v/+nW5bAxgTWIWAAax1YLh1Pgb179x5z3XXXvSul9AvjmVAqAgQIECBAgAABAgQqLPDlsiwfdeDAgf9Z4Q6iEyBAgACBrwu02+0XR8QLkBAgQIAAAQIECBAgQGCMBQYppXa32z04xhlFI/BNAgawvCBqITAzMzM1OTl5sCiKx9aikBIECBAgQIAAAQIECIyDwDUR8fDFxcW/HYcwMhAgQIAAgY0SaLfbz4uIl2/UetYhQIAAAQIECBAgQIDABgoMIuL0Xq+3uIFrWorApgsYwNp0YhuMSmDHjh2Td7jDHd4aEe1R7WkfAgQIECBAgAABAgRqK/DpiHjY4uLi/1vbhooRIECAQKMF2u328ClYw6dh+SFAgAABAgQIECBAgMC4CJRlWe7p9/vdcQkkB4HDFTCAdbhSrquEwMzMzMS2bdveklL61UoEFpIAAQIECBAgQIDAYQvkiPAr3GFzHd2F/2dtbe0XLrjggo8f3TLuJkCAAAEC4y3QbrefExGvHO+U0hEgQIAAAQIECBAg0BCBQc75iYuLi+c3pK+aNRPw7n3NDlSdrwik2dnZP4qIp/MgQIAAAQIECBAgQIDAOgU+Nj09/Qv79u27ap33uZwAAQIECFRSoNVqnVUUxatNelfy+IQmQIAAAQIECBAgUBeBtZRSp9vtHqxLIT2aJ2AAq3ln3pTGqdPpvKosy2c1pbCeBAgQIECAAAECBAgctcDfT0xM7FxYWPj8Ua9kAQIECBAgUCGBVqvVKYpiX0RMVii2qAQIECBAgAABAgQI1ENgNSJ293q9P6lHHS2aKmAAq6kn35De7Xb7xTnnFzSk7ibX9JU3mwxseQIECBAgQIAAga0V+EBRFI/rdrvXb20MuxMgQIAAga0RaLVajy6K4oKImN6aBHYlQIAAAQIECBAgQKCBAisRcVqv13tXA7urXDMBA1g1O1B1vl2g1Wo9NaX02ogo+BAgQIAAAQIECBAgQOBbBcqyfPf09PRp+/fvv4kOAQIECBBossDu3bsfMjEx8acRccsmO+hOgAABAgQIECBAgMBIBJYj4ld6vd67R7KbTQhssoABrE0Gtvx4CLRardmU0lsjYtt4JJKCAAECBAgQIECAAIExEeheeeWVZxw6dGhtTPKIQYAAAQIEtlSg3W4/ICIujIjbbGkQmxMgQIAAAQIECBAgUGeBGyLiMb1e74N1LqlbswQMYDXrvBvddnZ29hER8baIuEWjIZQnQIAAAQIECBAgQOArAiml159yyinPmJ+fL5EQIECAAAEC/y3QbrfvExHvj4iTuBAgQIAAAQIECBAgQGCDBW7IOT9qcXHxQxu8ruUIbKmAAawt5bf5qAWGn+DLOQ8fYXjbUe9tPwIECBAgQIAAAQIExkcg5/yCfr//kvFJJAkBAgQIEBgvgT179txjbW1t+Gn0k8crmTQECBAgQIAAAQIECFRY4PqyLB/Z7/c/XOEOohP4jgIGsLwwGiewe/fuexVF8WcRcYfGlVeYAAECBAgQIECAAIFBRDx1cXHxTSgIECBAgACBmxfYtWvXD01OTl4cEXdhRYAAAQIECBAgQIAAgaMU+FJRFDsXFhY+cpTruJ3AWAoYwBrLYxFqswU6nc4P55w/kHM+ZbP3sj4BAgQIECBAgAABAmMjcH1K6bRer/fesUkkCAECBAgQGHOBM8888/Y33XTTByLix8Y8qngECBAgQIAAAQIECIypQErps6urq7908ODBj45pRLEIHLUDArtTAAAgAElEQVSAAayjJrRAVQX27NnzfaurqxdFxI9XtYPcBAgQIECAAAECBAgctsBncs6P6Pf7lxz2HS4kQIAAAQIEviIwMzNz/PT09Psi4r5ICBAgQIAAAQIECBAgsE6BT0bEL/Z6vUvXeZ/LCVRKwABWpY5L2I0WaLVax6WULoyI+2302tYjQIAAAQIECBAgQGBsBP59MBjsPHjw4CfGJpEgBAgQIECgYgKdTufYnPPbIuKXKxZdXAIECBAgQIAAAQIEtk7g8rIsf6Hf71++dRHsTGA0AgawRuNslzEW2Llz5/Txxx9/fkScNsYxRSNAgAABAgQIECBA4MgE/rYsy0ceOHDgc0d2u7sIECBAgACBrwns2LFj8o53vOMby7I8kwoBAgQIECBAgAABAgS+h8C/TE1NPWzfvn1XkSLQBAEDWE04ZR0PRyDNzs6+IiKeczgXu4YAAQIECBAgQIAAgUoIvON2t7td++yzz76xEmmFJECAAAEC1RBIc3NzLyzL8oXViCslAQIECBAgQIAAAQKjFkgp/d1NN920c2lp6ZpR720/AlslYABrq+TtO5YC7Xb7GTnn10REMZYBhSJAgAABAgQIECBA4HAFzrnrXe961vz8fHm4N7iOAAECBAgQOHyB2dnZp6WU/sj7aIdv5koCBAgQIECAAAECTRBIKf35rW51q0e/4Q1vuK4JfXUk8DUBA1heCwS+RaDdbj8+59yLiO1wCBAgQIAAAQIECBConECOiN9aXFx8ZeWSC0yAAAECBCom0Ol0HpdzXvQ+WsUOTlwCBAgQIECAAAECmyRQluW7vvCFL+y66KKLljdpC8sSGFsBA1hjezSCbaVAq9V6cErpHRFx263MYW8CBAgQIECAAAECBA5fIKW0nHM+fXFx8YLDv8uVBAgQIECAwNEIDN9HK4riXRFx66NZx70ECBAgQIAAAQIECFRboCzLhauuuuqJhw4dWqt2E+kJHJmAAawjc3NXAwR27959r6Io3hcRd2xAXRUJECBAgAABAgQIVF3gmpTSY3q93l9WvYj8BAgQIECgagLtdvs+ETF8H+32VcsuLwECBAgQIECAAAECGyLwil6v9/yIGD6d3g+BRgoYwGrksSt9uAKzs7MnR8RFEfGjh3uP6wgQIECAAAECBAgQGLnApTnnR/b7/f8Y+c42JECAAAECBL4i0Ol0fjjn/P6IuBsSAgQIECBAgAABAgQaIzAcuHpur9f7w8Y0VpTAdxEwgOWlQeB7COzZs+e2Kysrf5JSeggsAgQIECBAgAABAgTGSyDn/MGIOK3f739hvJJJQ4AAAQIEmifQ6XRul3N+b0T8ZPPaa0yAAAECBAgQIECgcQI3FUXRWVhYeHvjmitM4DsIGMDysiBwGAI7duyYPPnkk8/JOf/6YVzuEgIECBAgQIAAAQIERiCQcz730ksvfeoll1yyOoLtbEGAAAECBAgchkCn0zk259yPiEcdxuUuIUCAAAECBAgQIECgmgJfLMvy0f1+/y+qGV9qAhsvYABr402tWGOBdrv9jJzzayKiqHFN1QgQIECAAAECBAiMu8BazvlZ/X7/nHEPKh8BAgQIEGiiwMzMzMT27dtfk3N+ehP760yAAAECBAgQIECg5gJXRcQv93q9f6p5T/UIrEvAANa6uFxMIGJubu6xg8GgFxHH8CBAgAABAgQIECBAYOQCXxgMBjMHDx780Mh3tiEBAgQIECCwLoHhhxkj4tURMbGuG11MgAABAgQIECBAgMC4CnysKIqdCwsLnxzXgHIR2CoBA1hbJW/fSgu02+1755wvjIgfrHQR4QkQIECAAAECBAhUSCCldNnk5OQj9+/f/+8Vii0qAQIECBBotEC73X5MRCz6MGOjXwbKEyBAgAABAgQI1EAg5/yRiYmJRy4sLHy+BnVUILDhAgawNpzUgk0ROOOMM37gpptuujCldJ+mdNaTAAECBAgQIECAwBYKXJxz/pV+v/+FLcxgawIECBAgQOAIBPbs2fNTa2trww8z3v4IbncLAQIECBAgQIAAAQJbL/DOk046afbss8++ceujSEBgPAUMYI3nuUhVEYGZmZlbTk5OLhZF8aiKRBaTAAECBAgQIECAQOUEcs7nXnrppU+95JJLVisXXmACBAgQIEDgKwK7du36ocnJyfdGxI8gIUCAAAECBAgQIECgOgIppXPucpe7nDU/P19WJ7WkBEYvYABr9OZ2rJnAzMzMxLZt216aUnpezaqpQ4AAAQIECBAgQGCrBdZyzs/q9/vnbHUQ+xMgQIAAAQJHL3DGGWfcamVl5W0R8UtHv5oVCBAgQIAAAQIECBDYZIFBRPxOr9d7xSbvY3kCtRAwgFWLY1RiHARmZ2efHBHDPwxtG4c8MhAgQIAAAQIECBCouMAXBoPBzMGDBz9U8R7iEyBAgAABAt8gsGPHjsmTTz75jyNiLxgCBAgQIECAAAECBMZW4PqIaPV6vXePbULBCIyZgAGsMTsQcdYhMHz15nVcP4JLd+/eff+iKN4eEbcfwXa2IECAAAECBAgQIFBXgX/ftm3bY/fv3//vdS2oFwECBAgQaLhAmp2dfUFKaT4ivEfd8BeD+gQIECBAgAABAmMncGVZlo/o9/v/e+ySCURgjAX8cjvGhyNaNQVmZ2dPjoh3RcSp1WwgNQECBAgQIECAAIEtFThQFMWTut3u8FN2fggQIEBgIwXG8MNsG1nPWtUTmJube0JZludHxDHVSy8xAQIECBAgQIAAgVoK/PO2bdse8da3vvVTtWynFIFNFDCAtYm4lm6uQKfTOTbnvD/n/ITmKmhOgAABAgQIECBAYF0Cayml3+31eq9Y110uJkCAAAECBCot0G637x0Rw681uWOliwhPgAABAgQIECBAoPoC7885n7a4uPjl6lfRgMDoBQxgjd7cjs0RSO12+7k55z+IiKI5tTUlQIAAAQIECBAgsD6BlNLVg8Fg14EDB/58fXe6mgABAgQIEKiDQLvd/v6IeGdE3LcOfXQgQIAAAQIECBAgUDWBlNI5N910028uLS0NqpZdXgLjImAAa1xOQo7aCrTb7YfnnPsRcevallSMAAECBAgQIECAwBEK5Jz/YXJy8vELCwufPMIl3EaghgK+J66Gh6oSAQLfQ2Dnzp3Txx133LlFUczBIkCAAAECBAgQIEBgZALDgatn9nq9149sRxsRqKmAAayaHqxa4yUwOzv7PyLiXRFx5/FKJg0BAgQIECBAgACBrRPIOZ+7urr6tKWlpZWtS2FnAgQIECBAYJwE2u32MyLiNZ4oP06nIgsBAgQIECBAgEBNBa6LiF29Xu+9Ne2nFoGRChjAGim3zZosMDc3d8La2trbUkoPabKD7gQIECBAgAABAgQi4saI+PXFxcXzaRAgQIAAAQIEvlWg3W4/JiK6EXFLOgQIECBAgAABAgQIbIrAxycmJh59/vnn/+umrG5RAg0UMIDVwENXeesEZmZmJrZt2/bSlNJzI8J//rbuKOxMgAABAgQIECCwdQKfWltbe/wFF1zw91sXwc4ECBAgQIDAuAt89Yny704p/dC4Z5WvvgK+FLi+Z6sZAQIECBBouMBfLC8vP2FpaenqhjuoT2BDBQyAbCinxQgcnkC73X5UznkhIm5zeHe4igABAgQIECBAgEAtBD5cFMWubrf72Vq0UYIAAQIECBDYVIHhE+XLsnx7ROzY1I0sToAAAQIECBAgQKA5Auf+27/921MvueSS1eZU1pTAaAQMYI3G2S4Evk2g0+ncsyzLd0TEPfAQIECAAAECBAgQqLlAjog/WFlZeeHS0tKg5l3VI0CAAAECBDZQYOfOndMnnHDCORGxdwOXtRQBAgQIECBAgACBpgnclHN+8uLi4vlNK64vgVEJGMAalbR9CHwHgZmZmVtOT0/vyznPACJAgAABAgQIECBQU4HP5ZxP7/f776tpP7UIECBAgACBEQi02+25iHhTRNxiBNvZggABAgQIECBAgECdBK7KOT9+cXHxb+tUShcC4yZgAGvcTkSeJgqkdrv99JzzqyJiWxMBdCZAgAABAgQIEKinQErpf05NTbX27dt3VT0bakWAAAECBAiMUqDdbt8nIoZPlL/TKPe1FwECBAgQIECAAIEKC/xjURSPXVhY+GSFO4hOoBICBrAqcUxCNkGg1Wo9MKX0toi4fRP66kiAAAECBAgQIFBrgZxzfuXq6urv+MrBWp+zcgQIECBAYOQCMzMzJ23fvv1gzvkhI9/chgQIECBAgAABAgQqJJBS6p944olnnn322TdWKLaoBCorYACrskcneB0FZmdnT46IpYj4mTr204kAAQIECBAgQKARAp+NiM7i4uIHGtFWSQIECBAgQGDkAjt27Jg8+eSTXxIRzxv55jYkQIAAAQIECBAgMP4Cg4j4nV6v94rxjyohgfoIGMCqz1lqUhOBnTt3Th9//PGvjIin16SSGgQIECBAgEDlBHJE+FWhcsc2BoFzzn9eFEW71+t9egziiECAAAECBAjUXGB2dvb0lNKbImJ7zauqR4AAAQIECBAgQOBwBa7OOe9eXFz80PCG4bu8w3d7/RAgsPkC/qqy+cZ2IHBEArt3735MURRvjYjbHtECbiJAgAABAgQIECAwOoG1lNJLTznllBfPz8+Xo9vWTgQIECBAgEDTBVqt1o8XRfGOiPjhplvoT4AAAQIECBAg0HiBS9bW1p5w8ODBTzReAgCBLRAwgLUF6LYkcLgCrVbrTimlCyLivod7j+sIECBAgAABAgQIjFjgipRSq9fr/eWI97UdAQIECBAgQOArAnNzcycMBoODKaWHIiFAgAABAgQIECDQUIFzl5eXn7a0tLTS0P5qE9hyAQNYW34EAhC4eQFfSegVQoAAAQIECBAgMMYC75mYmNizsLDw+THOKBoBAgQIECDQAIEdO3ZMnnzyyS+LiGf5Pu3xP3BfhTP+ZyQhAQIECBAgUBmBG8qyfHK/3+9WJrGgBGoqYACrpgerVv0E5ubmHjsYDPb5SsL6na1GBAgQIECAAIEKCvjKwQoemsgECBAgQKAJAp1O55E55/Mj4rgm9NWRAAECBAgQIECg0QKXFUXx+IWFhX9utILyBMZEwADWmByEGAQOR2Bubu5ug8HgbRFx78O53jUECBAgQIAAAQIENkHg0rW1tc4FF1zw95uwtiUJECBAgAABAkctMDc3d8eyLIfvod33qBezAAECBAgQIECAAIExFEgpvWcwGMz1+/0vjGE8kQg0UsAAViOPXekqC+zZs2f76urqKyLi6VXuITsBAgQIECBAgEAlBborKytPWVpauq6S6YUmQIAAAQIEGiOwc+fO6RNPPPGVOWfvoTXm1BUlQIAAAQIECDRCYFAUxUvufOc7v3h+fr5sRGMlCVREwABWRQ5KTALfKjA7O3taRLw5Im5DhwABAgQIECBAgMAmC3wm5/zEfr//vk3ex/IECBAgQIAAgQ0VaLfbsxHxpoi45YYubDECBAgQIECAAAECoxf4XES0er3eB0e/tR0JEPheAgawvpeQ/z+BMRYYPk59MBj0IuIBYxxTNAIECBAgQIAAgWoLvD+ldEav1/t0tWtIT4AAAQIECDRVoNPp3DPn/PaI+JGmGuhNgAABAgQIECBQeYG/zDm3FhcXr6h8EwUI1FTAAFZND1at5gjMzMxMTE9PPzvn/PsRsa05zTUlQIAAAQIECBDYZIEbU0rP7/V6r93kfSxPgAABAgQIENh0gbPOOusWV1999esi4ombvpkNCBAgQIAAAQIECGycQE4pve5jH/vYsy+55JLVjVvWSgQIbLSAAayNFrUegS0SmJ2d/ZmIWIyIO29RBNsSIECAAAECBAjUR+Dvcs7tfr//H/WppAkBAgQIECBAIKLdbs9FxBsj4hgeBAgQIECAAAECBMZZIKX02YiY63a7fzbOOWUjQOC/BAxgeSUQqJHAzMzMbaampoZvIO2uUS1VCBAgQIAAAQIERiewlnN+9aWXXvoCn6gbHbqdCBAgQIAAgdEKtNvt+0TEwYi462h3thsBAgQIECBAgACBwxb44Pbt2zvnnXfe/z3sO1xIgMCWChjA2lJ+mxPYHIFWqzVXFMUf55xvuTk7WJUAAQIECBAgQKCGAv8nIjqLi4t/XcNuKhEgQIAAAQIEvkngjDPOuNXKysofRsReNAQIECBAgAABAgTGSGCtKIqX3vnOd37x/Px8OUa5RCFA4HsIGMDyEiFQU4F2u333siz7KaXhJ/r8ECBAgAABAgQIELg5ge7KyspTlpaWrsNEgAABAgQIEGiSQKfTmck5nxsRt21Sb10JECBAgAABAgTGTyDn/KmJiYnWwsLCX41fOokIEPheAgawvpeQ/z+BCgvs3Llz+rjjjntRSunZETFR4SqiEyBAgAABAgQIbI7AlTnnvf1+/32bs7xVCRAgQIAAAQLjL7Br164fmpiYGH6Q8WfHP62EBAgQIECAAAECNRV4d1EUZywsLHy+pv3UIlB7AQNYtT9iBQlEzM7O/kxELETEXXkQIECAAAECBAgQGAqklJaWl5efvLS0dA0RAgQIECBAgEDTBWZmZqa2bdv2sqIozhr+T6Wme+hPgAABAgQIECAwMoGVnPPzFhcXXxsReWS72ogAgQ0X8IvkhpNakMB4Cuzdu/eY66+//mUR8TRvIo3nGUlFgAABAgQIEBiFQM75qpzzkw8cOHDhKPazBwECBAgQIECgSgJzc3MPLcty+EHG769SblkJECBAgAABAgQqKfBvEdHu9Xr/WMn0QhMg8E0CBrC8IAg0TKDT6TxsMBjsSyn9QMOqq0uAAAECBAgQaLpAzjm/JaX0nMXFxS83HUN/AgQIECBAgMB3E+h0OrfLOe+PiJ2UCBAgQIAAAQIECGyCwPBJV8P36X6z2+1evwnrW5IAgS0QMIC1Bei2JLDVAjMzMydNTU29KSIet9VZ7E+AAAECBAgQIDASgU9MTEw8aWFh4eKR7GYTAgQIECBAgED1BVK73X56RLwyIqaqX0cDAgQIECBAgACBcRBIKX02Is7sdrueTj8OByIDgQ0UMIC1gZiWIlA1gU6nM1OW5Zsj4riqZZeXAAECBAgQIEDgsAS+8tSr7du3P3vfvn3XHtYdLiJAgAABAgQIEPi6wNzc3E+XZdmNiLthIUCAAAECBAgQIHCUAhemlIbDV8MhLD8ECNRMwABWzQ5UHQLrFWi1WndKKb01Ih683ntdT4AAAQIECBAgML4CKaXLyrJ8Yr/f/4vxTSkZAQIECBAgQGD8Bc4666xbfO5zn3t5zvlpEeE99fE/MgkJECBAgAABAuMmcGNEPL/X650TEcOvH/RDgEANBfyyWMNDVYnAEQgMH6n+pJzzH0bErY7gfrcQIECAAAECBAiMj8BXnnq1urr6rKWlpevGJ5YkBAgQIECAAIFqC5x++um/OBgMhh9k/IFqN5GeAAECBAgQIEBghAL/EBHtXq936Qj3tBUBAlsgYABrC9BtSWBcBb76NKzzIuKh45pRLgIECBAgQIAAge8ukFL6eESc2ev1DnEiQIAAAQIECBDYeIHdu3efODExcW5EPHbjV7ciAQIECBAgQIBAjQRySul1N91003OWlpZWatRLFQIEvouAASwvDQIEvlVg+DSsvTnnV0bErfEQIECAAAECBAhUQmAlpfSHJ5100kvOPvvs4SPN/RAgQIAAAQIECGyiQLvd/tWIeK2nyW8isqUJECBAgAABAtUVuDwi9vR6vb+sbgXJCRBYr4ABrPWKuZ5AQwTa7fb3DwaDNxVF8aiGVFaTAAECBAgQIFBJgZTSXw0GgycfOHDgXytZQGgCBAgQIECAQEUFhk+TL4ri/Ih4UEUriE2AAAECBAgQILCxAjki3nLrW9/6WW94wxuu29ilrUaAwLgLGMAa9xOSj8AWC3Q6nZmyLN8UEcdvcRTbEyBAgAABAgQIfLPAF1JKLzrllFNeNz8/X8IhQIAAAQIECBAYvcD8/Hxx2WWXPS0iXhER06NPYEcCBAgQIECAAIExEfjPnPMTFxcXPzQmecQgQGDEAgawRgxuOwJVFNizZ8/3raysvDGl9Jgq5peZAAECBAgQIFA3gZTSUkrpqd1u97N166YPAQIECBAgQKCKArt27fqJycnJhYj40Srml5kAAQIECBAgQOCIBXJK6bxt27Y9a9++fdce8SpuJECg8gIGsCp/hAoQGJ1Aq9WaSym9OiJOHN2udiJAgAABAgQIEPgGgUtzzr/e7/c/TIUAAQIECBAgQGC8BE499dRt97znPX8zIn4/IraNVzppCBAgQIAAAQIENkHg0ymlX+t2uxduwtqWJECgYgIGsCp2YOIS2GqBVqt1XES8PKX0pIjw3yFbfSD2J0CAAAECBJoisJpzfs3U1NT8/v37b2pKaT0JECBAgAABAlUUaLfb904pvTXn/BNVzC8zAQIECBAgQIDAYQksLS8vP3lpaemaw7raRQQI1F7A8ETtj1hBApsjsHv37gcVRfHmiLj75uxgVQIECBAgQIAAga8K/EVRFE/udrv/RoQAAQIECBAgQKAaAp6GVY1zkpIAAQIECBAgcAQCnynL8sn9fv9Pj+BetxAgUGOBMRnAGsbINWZWjUA9Bc4666xbXH311c/LOT8/Iqbq2VIrAgQIECBAgMCWCVyTUnp+r9d7i1+YtuwMbEyAAAECBAgQOCqBTqfzk2VZ7k8p3euoFnIzAQIECBAgQIDAOAj0yrJ8er/f/8I4hJGBAIHxEhiTAazxQpGGAIH1CezevfvHiqIY/mHwp9d3p6sJECBAgAABAgS+g0CZc963urr6PI8w9/ogQIAAAQIECFRfwNOwqn+GGhAgQIAAAQKNF7iqKIqnLiwsvLPxEgAIEPiuAgawvDgIENgQgfn5+eKyyy47M+f8qoi49YYsahECBAgQIECAQMMEcs7/MDk5+fSFhYWPNKy6ugQIECBAgACB2gu02+17p5TemnP+idqXVZAAAQIECBAgUA+B4dd4vWVqaurZ+/btu7YelbQgQGCzBAxgbZasdQk0VGB2dvbknPPrUkqPaSiB2gQIECBAgACBIxH4TET81uLi4oKvGzwSPvcQIECAAAECBKohsHPnzukTTjjh9yLiuRExWY3UUhIgQIAAAQIEGinwsYh4Uq/X+5tGtleaAIF1CxjAWjeZGwgQOByBXbt2/fzExMTrI+Ieh3O9awgQIECAAAECDRVYjYg3RsQLFhcXv9xQA7UJECBAgACBcRIYvmM8/Jy/n00VmJub+7Gc81tyzj+9qRtZnAABAgQIECBAYL0Cw/frXvP5z3/+hRdddNHyem92PQECzRUwgNXcs9ecwKYLzMzMTE1PT5+Vc56PiO2bvqENCBAgQIAAAQIVEkgpfWgwGDzjwIED/1qh2KISIECAAAECBAhskMD8/Hxx2WWXnRkRr46IW27QspYhQIAAAQIECBA4QoGU0kdXV1efePDgwY8e4RJuI0CgwQIGsBp8+KoTGJVAq9W6c0rpnIh4+Kj2tA8BAgQIECBAYFwFUkofTyk9v9vtLo1rRrkIECBAgAABAgRGJ7Br164fmpycHD4V9ZdGt6udCBAgQIAAAQIEvkHghoh48fLy8h8uLS0NyBAgQOBIBAxgHYmaewgQOCKB3bt3P7IoiuEg1g8d0QJuIkCAAAECBAhUW+CGlNKrJicnX75///6bql1FegIECBAgQIAAgY0W6HQ6MxHx+pzz7TZ6besRIECAAAECBAh8V4H3l2X55H6//5+MCBAgcDQCBrCORs+9BAisW+Css866xdVXX/28iPitnPP0uhdwAwECBAgQIECgmgLvmZiY+I2FhYVPVjO+1AQIECBAgAABAqMQaLVaxxVF8fKIeFJEeP9+FOj2IECAAAECBJoq8JmIeF6v11toKoDeBAhsrIBf4DbW02oECBymQLvdvntZlq9LKf3CYd7iMgIECBAgQIBA5QRSSh8dDAZPP3DgwF9VLrzABAgQIECAAAECWybQ6XQeFBFvzjnffctC2JgAAQIECBAgUE+BMiLOyzk/Z3Fx8cv1rKgVAQJbIWAAayvU7UmAwNcF2u32oyLi1TnnU7AQIECAAAECBGokcGVE/N5d73rX/fPz88M3dfwQIECAAAECBAgQWJfA3r17j7nhhhvmI+KsiJhc180uJkCAAAECBAgQ+DaBlNLf5Zx/vdfr/SMeAgQIbLSAAayNFrUeAQLrFjj11FO33fOe93xKzvlFEXGbdS/gBgIECBAgQIDA+Ahcn3N+/fbt21+6b9++a8cnliQECBAgQIAAAQJVFRg+SX74vzFTSg+tage5CRAgQIAAAQJbLPDFiJhfXl5+/dLS0mCLs9ieAIGaChjAqunBqkWgigJzc3MnDAaD34uI34iIiSp2kJkAAQIECBBorMDwKVeLKaXn9Xq9TzdWQXECBAgQIECAAIHNEkjtdrsTEa+MiNtv1ibWJUCAAAECBAjUUGBp+/btTzvvvPP+bw27qUSAwBgJGMAao8MQhQCB/xJot9v3yTn/UUQ8gAkBAgQIECBAoAICF5dl+awDBw78cwWyikiAAAECBAgQIFBhgT179tx2MBi8KOfsA4wVPkfRCRAgQIAAgZEI/MfwoQ+9Xu+DI9nNJgQINF7AAFbjXwIACIyvwO7dux9ZFMU5EfFD45tSMgIECBAgQKDBAv+ac35uv99/X4MNVCdAgAABAgQIENgCgU6n85NlWb4hpfRTW7C9LQkQIECAAAEC4yxwQ0S8dHl5+Q+XlpZWxjmobAQI1EvAAFa9zlMbArUT2Lt37zE33HDDc3POz46IY2tXUCECBAgQIECgigKfzDn/7t3udrfF+fn54VcP+iFAgAABAgQIECCwFQJf+1rCV0fEiVsRwJ5HITD860w+ivvdSoAAAQIECHybQErpPaurqygQH5UAACAASURBVE87ePDgJ/AQIEBg1AIGsEYtbj8CBI5IoN1uf39K6UVlWZ4RERNHtIibCBAgQIAAAQJHJ3BNSunlJ5100uvPPvvsG49uKXcTIECAAAECBAgQ2BiBmZmZ47dv3/7CnPNTI6LYmFWtQoAAAQIECBCojkBK6d8j4pndbvfPqpNaUgIE6iZgAKtuJ6oPgZoL7Nmz5x5ra2svzjnP1LyqegQIECBAgMD4CFyfc3791NTUy/fv3//F8YklCQECBAgQIECAAIH/Fpibm7t/WZavi4gf50KAAAECBAgQaIJASumasix/78orr3zzoUOH1prQWUcCBMZXwADW+J6NZAQI3IzA3Nzczw4Gg1dFxP1AESBAgAABAgQ2SWA15/zWoijme73epzdpD8sSIECAAAECBAgQ2DCB+fn54rLLLmtHxCsj4vYbtrCFCBAgQIAAAQLjJVCmlBYj4tndbvez4xVNGgIEmipgAKupJ683gXoIpE6n84Sc88tyznepRyUtCBAgQIAAgTEQGL6B8yerq6vPv+CCCz4+BnlEIECAAAECBAgQILAugac85Sm3vO66655dluVvRcT0um52MQECBAgQIEBgjAVSSn+XUnrawsLC341xTNEIEGiggAGsBh66ygTqJnDqqaduu+c97/mrOeffj4jb1a2fPgQIECBAgMBIBS5OKT271+v900h3tRkBAgQIECBAgACBTRBotVp3LYripRExswnLW5IAAQIECBAgMEqBqyLi+b1erxsReZQb24sAAQKHI2AA63CUXEOAQCUEWq3WcRHxvOHUe0QcU4nQQhIgQIAAAQLjIvDhoiie3+12/9e4BJKDAAECBAgQIECAwEYJdDqdX46I1+Sc775Ra1qHAAECBAgQIDAigRtSSq+JiJd3u93rR7SnbQgQILBuAQNY6yZzAwEC4y6wZ8+e71tbW/udnPPeiJga97zyESBAgAABAlsq8NcTExPzCwsLF29pCpsTIECAAAECBAgQ2GSBrz1FPiKGT8Q6cZO3szwBAgQIECBA4GgFhk+5evva2tpzDx48+ImjXcz9BAgQ2GwBA1ibLWx9AgS2TGDXrl0/WBTF76aUzoiIyS0LYmMCBAgQIEBg7ARyzh/JOb/swIEDF45dOIEIECBAgAABAgQIbKLAzMzMSdPT0y+JiCdGxMQmbmVpAgQIECBAgMCRCnxobW3tOQcPHvzokS7gPgIECIxawADWqMXtR4DAyAX27Nlzj9XV1d+OiNmIKEYewIYECBAgQIDAOAn8bVmWf2DwapyORBYCBAgQIECAAIGtEOh0OvfMOb8oIma2Yn97EiBAgAABAgS+VSCldGlEvKDb7S7RIUCAQNUEDGBV7cTkJUDgiAU6nc6P5px/L+fsTaUjVnQjAQIECBCorIDBq8oeneAECBAgQIAAAQKbKTA7O/vzKaVXRsR9NnMfaxMgQIAAAQIEbkbg8xHx+1dcccUfHzp0aI0UAQIEqihgAKuKpyYzAQJHJbB79+77T0xMvCTn/KCjWsjNBAgQIECAQBUE/ldEvGhxcfGiKoSVkQABAgQIECBAgMAWCaROp/OEnPMrIuKHtyiDbQkQIECAAIHmCdwYEecsLy+/bGlp6UvNq68xAQJ1EjCAVafT1IUAgXUJtNvtHYPB4IVFUexY140uJkCAAAECBKog8HfDr1Pp9/vvq0JYGQkQIECAAAECBAiMg8BZZ511i6uvvvrpEfH8iLjNOGSSgQABAgQIEKilQBkR3Zzz7y4uLl5Ry4ZKESDQOAEDWI07coUJEPhWgdnZ2ftFxG9FxCPoECBAgAABApUX+OuyLF9x4MCB90RErnwbBQgQIECAAAECBAhsgcDMzMzx09PTz42IZ0bE9BZEsCUBAgQIECBQU4Gc88U55+f0+/3/XdOKahEg0FABA1gNPXi1CRD4doF2u/1zOefhp/sMYnmBECBAgACB6glcnFJ6Ya/X+5vqRZeYAAECBAgQIECAwHgKzM3N3THn/JKcczsi/D1hPI9JKgIECBAgUBWBv0kp/Xa32/2fVQksJwECBNYj4Bem9Wi5lgCBRgjMzc397GAw+G2DWI04biUJECBAoNoCw0eVv68oihd1u91/qHYV6QkQIECAAAECBAiMr0Cn07lvzvmlEfHz45tSMgIECBAgQGAcBVJKH805/3av13v/OOaTiQABAhslYABroyStQ4BA7QRardaPF0Xx2znnJ/iEX+2OVyECBAgQqLbAakQc3LZt2x/s37//36tdRXoCBAgQIECAAAEC1RGYnZ29X0ppOIj1oOqklpQAAQIECBDYCoGc8ydSSi875ZRTzpufnx9+kNIPAQIEai1gAKvWx6scAQIbIdBut++dc35WRLQiYmIj1rQGAQIECBAgsH6BlNJyWZbnl2X5koMHD35q/Su4gwABAgQIECBAgMDRCwzfVM9Hv0ylV5ibm3toWZaviIj7VLqI8AQIECBAgMBmCFwZEa9aXl5+49LS0spmbGBNAgQIjKOAAaxxPBWZCBAYS4G5ubm7ra2tPacoik7OeXosQwpFgAABAgSqLjD8S9a3/5byuZTSG1NKr+92u5+tekX5CRAgQIAAAQIECNRBYH5+vvj4xz/+KznnF0XE3erQSQcCBAgQIEDgqAQ+HxEvP+mkk/747LPPvvGoVnIzAQIEKihgAKuChyYyAQJbK3DmmWfe/qabbvr1nPMzIuK2W5vG7gQIECBAoNYCl6eUzkkpndftdq+vdVPlCBAgQIAAAQIECFRU4KuDWI/POb88Iu5c0RpiEyBAgAABAkcokFK6JqX0uqIo/mj//v1fPMJl3EaAAIHKCxjAqvwRKkCAwFYJzM7O3jql9Ks55+dFxPdvVQ77EiBAgACBGgpcknM+Z3V1dXFpaWlQw34qESBAgAABAgQIEKidwMzMzNT09PSeiJj3XlntjlchAgQIECDwnQS+HBFvnJycfLnBKy8QAgQIfKcv96BCgAABAusS2Llz5/Rxxx13WkrpdyPiruu62cUECBAgQIDA1wTKiHhfSullvV7vb7AQIECAAAECBAgQIFBNgU6nc2zO+cyIeG5E/EA1W0hNgAABAgQI3IzAtRHxBoNXXiMECBD4ZgFPwPKKIECAwAYJDB+3fumllz68KIrfioif26BlLUOAAAECBGotkFK6rizLflEUr+n1epfWuqxyBAgQIECAAAECBBokMPzQ4gknnHB6RLzQIFaDDl5VAgQIEKizgMGrOp+ubgQIHLWAAayjJrQAAQIEvl1g9+7d9y+K4qyIeHRETDAiQIAAAQIEvk3gk8NHlOec39zv97/AhwABAgQIECBAgACBegp8w1cT/l5E3KGeLbUiQIAAAQK1FjB4VevjVY4AgY0SMIC1UZLWIUCAwHcQ6HQ6PzwYDH4tpfRrEXFbSAQIECBAgEBcknM+56qrruofOnRojQcBAgQIECBAgAABAs0Q2LNnz/bV1dUnpZSGX014cjNaa0mAAAECBKorkFK6pizL166srLx2aWnpS9VtIjkBAgRGI2AAazTOdiFAoOECZ5xxxq1WVlbOyDkPn4p1p4ZzqE+AAAECDRNIKS3nnN+WUnp1r9f7p4bVV5cAAQIECBAgQIAAgW8Q+OoTsXZFxPCJWHeBQ4AAAQIECIyXQErpsymlN954441nG7war7ORhgCB8RYwgDXe5yMdAQI1E9ixY8fkHe5wh8dHxHAQ6741q6cOAQIECBD4VoH/jIg3rKysnLe0tHQNHgIECBAgQIAAAQIECHxNYDiItX379uEHFodPxPphMgQIECBAgMCWC1yeUnrV5z73ubdedNFFy1ueRgACBAhUTMAAVsUOTFwCBOoj0Gq1To2IvSmldkQcU59mmhAgQIAAgfjroihe+6lPfeqdvmbQq4EAAQIECBAgQIAAgZsTmJ+fLz7+8Y8/POc8fCLWT9IiQIAAAQIERi7wLxHxqiuuuKLvvbyR29uQAIEaCRjAqtFhqkKAQDUF5ubmThgMBk+MiCf7tF81z1BqAgQIEPiKwJciolcUxZu63e7wTRs/BAgQIECAAAECBAgQWJfA3Nzc/XPOz8s5P2JdN7qYAAECBAgQWLdASumjOec/OuWUU3rz8/PluhdwAwECBAh8k4ABLC8IAgQIjInA8NN+l19++UPKstybc35cREyMSbQNi5Ejwj94NozTQgQIEBgXgUtSSucuLy/3l5aWrhuXUHIQIECAAAECBAgQIFBdgXa7fZ+U0jNzzq06vkdW3ZORnAABAgRqIvDXKaVXdLvdC2vSRw0CBAiMhYC/g4/FMQhRa4Hhf8qGUyd+CKxD4LTTTrvLxMTEkyLizJTSCeu41aUECBAgQGAUAtfmnA8URfHmXq/3j6PY0B4ECBAgQIAAAQIECDRP4PTTT7/X6urqc4ui2B0R25onoDEBAgQIENgwgbWIeHtK6dXdbvcfNmxVCxEgQIDA1wUMYHkxECBAYIwF9u7de8z111+/KyKGw1g/M8ZRRSNAgACBZghcEhFvXllZOeBpV9984Gbum/EfAC0JECBAgAABAgS2RmBubu6OOedn5ZyfGBHHbk0KuxIgQIAAgUoKfDml9JaU0jkLCwufrGQDoQkQIFARAQNYFTkoMQkQINDpdH60LMvhIFY7Io4nQoAAAQIERiGQUroupXRgMBi8ud/vDwew/BAgQIAAAQIECBAgQGBLBGZmZm4zPT29ZziMlVL6wS0JYVMCBAgQIFANgU8XRXHu2traa/v9/heqEVlKAgQIVFvAAFa1z096AgQaKLBz587pE0888VFlWe6NiJ+PCP9d3sDXgcoECBAYgcAlKaVzp6amDuzbt+/aEexnCwIECBAgQIAAAQIECByWwKmnnrrtR37kRx6TUvrNsiw9Nf6w1FxEgAABAk0QSCl9NOf8R1dccUX/0KFDw68d9EOAAAECIxLwR/sRQduGAAECmyEwMzNzyvT0dDvnfEZE+NTfZiBbkwABAs0SuDLn3FtdXT1vaWnpsmZV15YAAQIECBAgQIAAgSoKtFqtUycmJp6Rc94dEZNV7CAzAQIECBA4SoEypfS+lNJrFxYWLj7KtdxOgAABAkcoYADrCOHcRoAAgXESGH7q7173utcjBoPBEyPiYd5sGqfTkYUAAQJjL3BjRLwzpbT/lFNO+dD8/Hw59okFJECAAAECBAgQIECAwLcInHbaaXeZmpoaDmL9akTcEhABAgQIEGiAwJdTSucPBoPX9fv9/2hAXxUJECAw1gIGsMb6eIQjQIDA+gVmZmaOn56efkLOeS4i7rf+FdxBgAABAg0RGH7FYLcoit7CwsLnG9JZTQIECBBoqsDwHbDc1PJ6EyBAoFkCs7Ozt04pDYewzoqIOzWrvbYECBAg0BCB4bDV/zM5Ofnm/fv3f7EhndUkQIDA2AsYwBr7IxKQAAECRy7QbrfvXZblXEqpFRHfd+QruXMUAsO/B/kH8yik7UGg0QKfSCn1U0q9brf7b42WUJ4AAQIECBAgQIAAgVoL7NixY/Lkk09+dErpKTnnB3vbpdbHrRwBAgSaIDAoy/LClNLrFxcX/9xHTJpw5DoSIFA1AX/nrdqJyUuAAIEjEJifny8uv/zyhwwGg+FTsR4XEccewTJuIUCAAIFqClwTEe+dmJhYWFhY+JA3Z6p5iFITIECAAAECBAgQIHDkAq1W665FUTwxpfSknPPxR76SOwkQIECAwMgFvphSWlhdXT374MGDnxj57jYkQIAAgcMWMIB12FQuJECAQD0EZmZmbjM9PT3zDV9RWNSjmRYECBAg8DWBlNJ1Oed35ZwPXHXVVR84dOjQGh0CBAgQIECAAAECBAg0XWDPnj3b19bWfuWrX0/440330J8AAQIExlrgHyPizcccc0zv3HPPvWGskwpHgAABAl8RMIDlhUCAAIEGC8zNzd2hLMsn5JxnIuLn/HOhwS8G1QkQqIPAICI+nHPurq6uvmNpaem6OpTSgQABAgQIECBAgAABApshMDc3d/+yLH/jq0+Ln9qMPaxJgAABAgTWKXBjRLytKIo3LywsfGSd97qcAAECBLZYwADWFh+A7QkQIDAuAqeddtpdJiYmTiuK4rSc84+NSy45CBAgQOBmBQYppUMRsVQUxdsXFhY+z4sAAQIECBAgQIAAAQIEDl9gz54937e6uvrEiPi1lNIPHv6driRAgAABAhsm8M8R8ZbJycne/v37v7hhq1qIAAECBEYqYABrpNw2I0CAQDUEZmdnfySl9Cs559Mi4h7VSC0lAQIEGiMwfNLV36aUliYnJy/Yv3//ZxrTXFECBAgQIECAAAECBAhsksD8/Hxx+eWXP6Qsy70R8ZiI2LZJW1mWAAECBAgMBW6KiAuLojh3YWHhYiQECBAgUH0BA1jVP0MNCBAgsKkCu3bt+omJiYldKaXH55zvsqmbWZwAAQIEvpvASkR8KCLevrKy8q6lpaVrUBEgQIAAAQIECBAgQIDA5giceeaZt7/pppt2RcSZEfGjm7OLVQkQIECgoQIfi4iF5eXlt3iPr6GvALUJEKitgAGs2h6tYgQIENh4gd27d99rYmLiETnnR0bEz0WEf45sPLMVCRAg8DWBrz/panl5ub+0tHQ1GgIECBAgQIAAAQIECBAYrUCr1Tq1KIrhU7FmI+LY0e5uNwIECBCoicC1KaV3pZQWPO2qJieqBgECBL6DgD+ce1kQIECAwBEJtFqtOxdF8bic82Mj4mciojiihdxEgAABAt8o8KWIeH9EvHtlZeW9S0tLw3/vhwABAgQIECBAgAABAgS2WGBmZuY209PTp0XEr0XEfbY4ju0JECBAYPwFyoj4yPBpV1NTUwf27dt37fhHlpAAAQIEjkbAANbR6LmXAAECBL4isHv37hNTSr+cUpqJiF+MiCk0BAgQIHDYAv+Zc/6znPN71tbW/mxpaWn4dYN+CBAgQIAAAQIECBAgQGBMBTqdzk/mHL+aUuzKOR8/pjHFIkCAAIGtEbhsOHRVluVCv9//z62JYFcCBAgQ2AoBA1hboW5PAgQI1Fig1Wodl1LaGREPj4hfighvQtX4vFUjQOCIBHLO+ZLhU66Konh3r9f7pyNaxU0ECBAgQIAAAQIECBAgsKUCMzMzU9u3b39YzrkTEY/2ocQtPQ6bEyBAYCsFvpxS+tOvfsXghyIib2UYexMgQIDA1ggYwNoad7sSIECgEQIzMzMTk5OTP1sUxXAYa/iv/9GI4koSIEDg2wVuTCl9+KtDV+9ZWFi4EhIBAgQIECBAgAABAgQI1Edgz549t11bW/uViJiLiJ+LCH9/qc/xakKAAIHvJPD1rxhMKS12u93rMREgQIBAswX8AtDs89eeAAECIxU488wzb3/DDTc8rCiKR+Sch0/HutVIA9iMAAECoxW4POd88cTExMXbtm17/759+64d7fZ2I0CAAAECBAgQIECAAIGtEGi323dPKbW/+mSsO21FBnsSIECAwKYJ/HNE9HPOi4uLi1ds2i4WJkCAAIHKCRjAqtyRCUyAAIF6CJx11lm3uPrqqx+Sc/7liPiFiLhrPZppQYBAgwWuL8vyQyml90fEn/X7/csbbKE6AQIECBAgQIAAAQIECESkTqfzwOFTsXLOj4uI20K5eYHhH618b5dXCQECYyhwWUQcyDkfXFxc/NgY5hOJAAECBMZAwADWGByCCAQIECAQ0W63vz+ldP/BYPDQlNIjI+L7uRAgQKACAl95ylXO+T1f/OIXP3DRRRctVyCziAQIECBAgAABAgQIECAwYoGZmZmJW9ziFg/OOQ+HsR4dEbcecQTbEfj/27vb37jKM4/jv+s+x/aYpHkgDYSUp6TUsEBYSra7ULIBdVt1s09lX8wuchRpXvGCd/kP/IcgZDm2BRrtqiuQoIKC1U22q7ZpCFs5kOCUOCTEIcQkVIntmXNfq9t1om2VTWMztufhO9LRmUzmnPu6PudIhOOf7xsBBBBYnMAZM/s3M6sODQ0dIh+6ODy+jQACCHSiAAGsTrzq9IwAAgg0ucDAwECYmJh4IsaYZsb6gZl91917mrxsykMAgc4QOB1jfMfM3snz/KdDQ0NnOqNtukQAAQQQQAABBBBAAAEEEGiUQKVSKRVFkZ57ld39nyWtbdS5OQ8CCCCAwFcSmDaz1yVVT58+/cbY2Fj9K52NgxFAAAEEOkqAAFZHXW6aRQABBFpT4IUXXrjtypUru1MgK4SQflPwMUlZa3ZD1Qgg0GIC5yW9mwJXMcZ3R0dHT7RY/ZSLAAIIIIAAAggggAACCCDQxAIvvvji2kuXLv2Tmf2rpB9K4pcQm/h6URoCCLSlwHSM8bUsy14dHx9/6/Dhw7W27JKmEEAAAQSWXYAA1rITMwACCCCAQKMFyuXy2t7e3idjjLvc/WlJuyV1N3oczocAAp0nYGa/c/f/NrO3Y4xv9/X1HRkYGIidJ0HHCCCAAAIIIIAAAggggAACKy1QqVQ2zM3NPRdCSGGs7/G8a6WvAOMhgECnCJjZeXf/sZn9+/j4+DuErjrlytMnAgggsLwCBLCW15ezI4AAAgisgEAKZJVKpafdfbe7PyPpOzygWgF4hkCgPQSmJB2S9J8hhIMzMzNHqtVq0R6t0QUCCCCAAAIIIIAAAggggECrCqQZ4a9evfo3C8sU/kjSulbthboRQACBJhH4zMzeTMsLjo+Pv0noqkmuCmUggAACbSRAAKuNLiatIIAAAgj8XmD//v29U1NTT6aZscws7dO2AR8EEEBAUlpCcD5wZWaHhoeHP0QFAQQQQAABBBBAAAEEEEAAgWYWqFQqpYWZ4P/R3f9F0pZmrpfaEEAAgSYSOGVm/2Fm1aGhofRM0JuoNkpBAAEEEGgzAQJYbXZBaQcBBBBA4MYC/f392yXtMrOdktKyhd+WFPBCAIG2FkgzWX3o7gdT6CrP87GhoaHJtu6Y5hBAAAEEEEAAAQQQQAABBNpaoFwuZ3meP5Pn+XMxxufM7J62bpjmEEAAgcUJpIDVETN7vVar/fiVV145srjD+TYCCCCAAAJLFyCAtXQ7jkQAAQQQaGGBtGxhnuePZ1mWli7ctTBL1tdbuCVKRwAB6VNJh83scFEUaX9wdHR0GhgEEEAAAQQQQAABBBBAAAEE2lTAKpXKX9Tr9eck/Z2kx9u0T9pCAAEEbiZw1cx+6u6vhxBeHxoaOgMXAggggAACqyFAAGs11L/SmOmSMTvmVyLkYAQQQODGAtbf3/9AlmU7Y4xPmNkT7p5my2LpQu4YBJpT4JK7/8LM5rc8z38xODh4rjlLpSoEEEAAAQQQQAABBBBAAAEEll9g3759d7j730r6B0k/lLRu+UdlBAQQQGBVBD4zszclvdbV1fXmyy+//OWqVMGgCCCAAAII/B8BAljcDggggAACCNxEIC1deC2UJWk+lGVmm0BDAIEVFfjSzI66+xF3/1V3d3cKW31IKn1FrwGDIYAAAggggAACCCCAAAIItJBApVIpxRh3xRi/b2Y/cveHWqh8SkUAAQRuJDCeAlcLs1wd4tkgNwkCCCCAQLMJEMBqtitCPQgggAACTS/Q399/X57nTxRFscPMHnX3HZIekJQ3ffEUiEDzC6RlBN9LWwjhyMzMzJFqtTrBA5Xmv3BUiAACCCCAAAIIIIAAAggg0LwCe/fufdjM/n5hqcJdPMdq3mtFZQggcF1gStJb7v6T3t7et1566aX0Z14IIIAAAgg0rQABrKa9NBSGAAIIINBKAnv27OlZv379wyGER1MoS1IKZT0i6d5W6oNaEVhBgbqkFKw6KumImb2X5/l7LCO4gleAoRBAAAEEEEAAAQQQQAABBDpSYN++fWvM7Kk0O5aktD0hiZ8XdeTdQNMINJVAel54NM1wVa/XX+vr6zsyMDAQm6pCikEAAQQQQOAmAvyDmtsDAQQQQACBZRSoVCobZmdnH82y7JEYY18IIU333ufu9/ObhssIz6mbSWA+aOXuvzGzY5J+E2M8Vq/XP6hWq3PNVCi1IIAAAggggAACCCCAAAIIINCJApVKZUtRFH/t7imMlWbJ+kYnOtAzAgisisBJSW+b2dsxxp+MjIxcXpUqGBQBBBBAAIEGCBDAagAip0AAAQQQQGCxAuVyuXvNmjXbZ2dnHwoh9JlZn6QH0+bumxd7Pr6PwGoLmNmsu59093GCVqt9NRgfAQQQQAABBBBAAAEEEEAAgSUL2PPPP/94nucpjPUDSWm5wt4ln40DEUAAgT8U+ETSmJmNFUXx9ujo6CmAEEAAAQQQaBcBAljtciXpAwEEEECgbQT6+/s3ZlnWF2P8lqTtMcbtIYRt6f3CbyDy3++2udot10jN3X9rZidijCdCCCfSezP7aGZmZrJarRYt1xEFI4AAAggggAACCCCAAAIIIIDA/yuwf//+3nPnzj3V1dW1O8b4rKS/klSCDAEEELhFgbOS3k2hq7QNDw9/dIvH8TUEEEAAAQRaToAf4LbcJaNgBBBAAIFOFtizZ0/Ppk2b7nf3FMbaFkJIAa1r4ay0X9/JPvTeEIFpSadijJMhhI8lfZRCVrVa7cTU1NSpsbGxtKQgLwQQQAABBBBAAAEEEEAAAQQQ6ECBZ599Nt+6deufhxC+b2a73H23pHUdSEHLCCBwY4EpST+TdCjGeHB0dPTXkhwsBBBAAAEEOkGAAFYnXGV6RAABBBDoGIH0W4lTU1N35Xm+vV6vbw0h3JVm0DKzrZLukvRNSRs6BoRGbySQAlYnJX3q7mdDCCfN7GRRFCe7u7snBgcHv4ANgaYRSP+3wiO6prkcFIIAAggggAACCCCAAAII/LFAuVzu7u7u/o6ZPZPCWGb2tKS1SCGAQMcIHJf0czM75O4/Gx4e/rBjOqdRBBBAAAEE/kiAABa3BAIIIIAAAh0mUC6X1+d5fncI4d4QwtaiKLaa2WYz2+LuWyRtXghrxVN5gQAACIlJREFUMZtWa90bF6+FqtLezM66+/w+/bkoijOlUunc4ODgTGu1RbUIIIAAAggggAACCCCAAAIIINAqAmmGrHvuuefxGONTIYQn3f2pNIt7q9RPnQggcFOB9FzxsKT/ijEeyrLs5wcOHDiPGQIIIIAAAgj8XoAAFncCAggggAACCNxQoFKplGKMd6SAVoxxc5Zld8YY7zKzr0u63cxujzFuTPu0ufvtkjI4GyaQZqL6zN0vmNnnMcbP8zy/EGO8EEL4rCiK9PmFFLLq7u4+S7CqYe6cCAEEEEAAAQQQQAABBBBAAAEEGihQqVS2FEWRZsnaWRTF02b2XUm3NXAIToUAAssjMGVmvzSzFLo6GEI4yDPI5YHmrAgggAAC7SFAAKs9riNdIIAAAggg0BQCaXatLMs25nmewlibFkJZKaS13t2/FmNck+f5Gnff4O5pOvo1C9vGhenpr/25KfpZYhGFpMtmVnf3LyVNu/ul9FnaQgjz+4Vt2swuF0Vx2d3TZ9M9PT2ff/zxxxfGxsbqSxyfwxBAAAEEEEAAAQQQQAABBBBAAIGmFdi5c2fXjh07Hp+bm5ufJUvSX0r6ZtMWTGEIdIZAejb5a0m/kpRCV788cODAbzujdbpEAAEEEECgMQIEsBrjyFkQQAABBBBAoIEC/f39KZCVXuvSrFpmVnL33qIoQk9Pz/zSiLVabW2e511FUXSHEFJw6w9eKeRlZov5t06UlIJS11/uPhtCuHLtgxSoCiGkYNTler1e1Gq1S11dXem46e7ubh8cHEyzVvFCAAEEEEAAAQQQQAABBBBAAAEEEFiEwN69e9dlWfZYjHFnminL3XdKekhSWMRp+CoCCNyaQE3SiTSrlaS0lODhbdu2HRsYGEjPOXkhgAACCCCAwBIFFvNDySUOwWEIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAII3LpApVLZUKvVdoYQrgWyUiiLmbJunZBvIpAE0gz9/yPpaFpKMM1sNTk5Oc7s+9wcCCCAAAIINF6AAFbjTTkjAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIBAgwVSKGtubu7bZvZoCGGHuz8m6RFJaxs8FKdDoNUEXFJaMvBoCOF9d39/bm7u6KuvvnpSUvo7XggggAACCCCwzAIEsJYZmNMjgAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggsm4D19/dvCyGkJQxTMOsxM0vhrAck5cs2KidGYPUEvgghfBBjTEGro1mWvV8UxfsjIyOXV68kRkYAAQQQQAABAljcAwgggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAm0lUKlUSvV6/WF3fziE8JC7PyipT1La97RVszTTrgJnJR0zsxS2Go8xfpBl2bHh4eFP27Vh+kIAAQQQQKCVBQhgtfLVo3YEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAIFbFhgYGAjHjx+/P4TQF2P8sxDCg2bW5+4PSbrrlk/EFxFojMCMpJPufmIhaPVBnufjV69e/bBarV5qzBCcBQEEEEAAAQRWQoAA1kooMwYCCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggEBTC5TL5fWlUulbkra5+/a0l3Rtf5+krqZugOKaUsDMLsYYJ8xsYiFsNRFCmEifjYyMnJHkTVk4RSGAAAIIIIDAogQIYC2Kiy8jgAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAgh0mkC5XM66urruDiHMh7PSPoWz3P0+d7/XzLYQ0Oq0u+J6v59JOi3pEzM7dW3v7hNFUUyMjo5Od6wMjSOAAAIIINBBAgSwOuhi0yoCCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggEDjBdLShpOTk1vq9frdkr5Rr9fvCSGk91sl3Zs+W9h6Gj86Z1wmgSgphavOL4SqPokxfiLpVIzxdFdX1ychhMnBwcG0jCAvBBBAAAEEEOhwAQJYHX4D0D4CCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggMDKCOzbt++OEMLmoig2p1mzYoxpv1nSne5+58L79Oc0o9bXVqaqjhqlkHQxBavMbErSpylg5e7n0pbem9nZtJ+dnT1frVbT93khgAACCCCAAAJ/UoAA1p8k4gsIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIrKxApVIppUBWrVa73cw2FEWxQdLG9D7Lsg3uvjF9FkKY/1xS+myDma2VlLaula14RUarS/pS0mVJV9Lm7mmJv8tmlvYX3f1iem9mF2OMF4uiSIGr6SzLLo6MjKTjeCGAAAIIIIAAAg0XIIDVcFJOiAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggMDqCqRlEY8fP76+VCr1zszMlFJQK4SQlkBcszC7VneMcX2qMoW63H3+54Zmdpu7zy+VaGa5u1+ficvd15tZuFFnZvaFu/tNuk7hp8Ldo5ldSt9z91kzS0Gq9P53IYSamV0PWbn7laIo0t9PT09PX3njjTdmV1eV0RFAAAEEEEAAgRsLEMDizkAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEElihAAGuJcByGAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCBDA4h5AAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBJYoQABriXAchgACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggQwOIeQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQSWKPC/IqKItRCwXFoAAAAASUVORK5CYII="/>
-</defs>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="20" height="20" fill="none"><path fill="url(#a)" d="M0 .5h20v18.675H0z"/><defs><pattern id="a" width="1" height="1" patternContentUnits="objectBoundingBox"><use xlink:href="#b" transform="scale(.00042 .00045)"/></pattern><image xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAACWAAAAjBCAYAAAB4esWRAAAAAXNSR0IArs4c6QAAIABJREFUeF7s3QuYXWddL/7fu2ZyTyEtCkXuLSIUUEBApQgoCF5Aj0jOn4ugD0IOCsHGZl9Sb0uEzOw9E1MJ4iHHCop4hMBzQG6KeOOioAIqUNHalrtQLi20yUyT2ev9PxtbhVLaSTKXvdb6zPPMkzSs9b6/7+ddPO3MfLN3Ch8ECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgcEoC6ZTuchMBAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIhAKWh4AAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQKnKKCAdYpwbiNAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgIAClmeAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECpyiggHWKcG4jQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQICAApZngAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAqcooIB1inBuI0CAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAgAKWZ4AAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgsByBccsiL+dC1xAg0CYBBaw2nbasBAgQIECAAAECBAgQIECAAIFTENi9e/emjRs3nrFhw4bbRMRtR6PR9unp6TOqqtqeUtoREcX4z8dLj0ajHek/P26Tc55KKW2PiA055y0ppc03bL+5qqotNx3lhv/96/78q69LKY2qqvryzcUoiuJoRByPiCoivjS+Jud89Q2/fnl8b0QcLYrieM55MaW0kHO+bvwZEdcWRTFe90tFUVx7/Pjx6+bn58fr+SBAgAABAgQIECBAgAABAgQIECBwiwIKWB4QAgQIECBAgAABAgQIECBAgEALBPbs2bNlw4YNt6uq6qyiKG5XFMVZOedviojb3fB5VlVV4z8/MyLOyDmfcUO56oxxgaoFRDcXcfx3mq9JKX25qqrrUkrX5py/mFL6YkR8oaqqr/w+5/yFoii+8vvp6enPnzhx4ouDweArBTAfBAgQIECAAAECBAgQIECAAAECzRdQwGr+GUtIgAABAgQIECBAgAABAgQINFRgXKratGnTHXPOZ49GozsURXGniLh9RNwxIs4ef6aUxr+OS1a3+MpSDSVaz1hL47JWRFyVUvp0zvmzEfGZoij+o6qqq4qi+FRK6arFxcXPHDx4cHydDwIECBAgQIAAAQIECBAgQIAAgZoKKGDV9OCMTYAAAQIECBAgQIAAAQIECDRb4IILLtixadOmu1RVdbepqak755zvMv5MKd2tqqrb31C2Gr86lY/6C1yfc74qIj4ZEeNi1idzzh8riuITVVV9Ynp6+hP79+//zPgdFesfVQICBAgQIECAAAECBAgQIECAQPMEFLCad6YSESBAgAABAgQIECBAgAABAjUQuOiii+44Go3OrarqnIi4e0rpLhFx55TSXSNi/Lm9BjGMuHYCx3POn7yxnJVS+kREfHw0Gl2+efPmy8clrbIsl9ZuHDsRIECAAAECBAgQIECAAAECBAjcKKCA5VkgQIAAAQIECBAgQIAAAQIECKyCwK5duzacddZZd1laWjpnenr6nHHRKqX0lV+LorhXRHj1qlVwb/GSJ3LOn0gpXZFzvqIoiitGo9EVU1NTV1RV9W/D4fDaFtuIToAAAQIECBAgQIAAAQIECBBYVQEFrFXltTgBAgQIECBAgAABAgQIECDQdIG9e/fefnp6+ryc87dFxH0i4t4552+94ZWsppueX77aCHw6pXRZzvkj48+U0r+klP51dnb2Y97asDZnaFACBAgQqKPA+Cdx3kS4jidnZgIECBAgQIDASQkoYJ0Ul4sJECBAgAABAgQIECBAgACBtgp0u91vqarqvKmpqfvmnM8bv5pVRNwvIs5uq4ncjRA4HhH/HhEfHr9yVs750qmpqQ8vLS19ZH5+/mgjEgpBgAABAgQIECBAgAABAgQIEFhlAQWsVQa2PAECBAgQIECAAAECBAgQIFAvgU6nc3ZK6f4ppe+IiPtHxLdHxHkRsbFeSUxL4LQERhExLmT9U0T8c0R8sCiKf56dnb3S63iclqubCRAgQIAAAQIECBAgQIAAgQYKKGA18FBFIkCAAAECBAgQIECAAAECBG5dYNeuXRvOPPPMe1VV9Z0ppXHB6r4RMf79HW/9blcQaK3AtVVV/VtK6dKU0vtGo9GHN2zY8E8zMzOfa62I4AQIECBAgAABAgQIECBAgEDrBRSwWv8IACBAgAABAgQIECBAgAABAs0XKMty+8LCwgNyzg9OKX1nRDwoIu4VEdPNTy8hgTUR+GhEfCDn/L7xZ1VV/3DgwIHPr8nONiFAgAABAgQIECBAgAABAgQIrLOAAtY6H4DtCRAgQIAAAQIECBAgQIAAgZUVuLFsNX41q5zz+BWtxoWrb4uIqZXdyWoECNySQM75PyLifUVRfKWUNRqN3js/P38VNQIECBAgQIAAAQIECBAgQIBA0wQUsJp2ovIQIECAAAECBAgQIECAAIEWCYzfRnDHjh3fkXP+npTSQ5StWnT4otZV4KM5538Yv31hVVV/O/79/Pz80bqGMTcBAgQIECBAgAABAgQIECBAYCyggOU5IECAAAECBAgQIECAAAECBGojcNFFF91hNBo9dFy0yjmfHxEPi4ittQlgUAIEbiowioh/zTm/K+f87vGrZQ0Gg0sjIqMiQIAAAQIECBAgQIAAAQIECNRFQAGrLidlTgIECBAgQIAAAQIECBAg0DKBnTt3Tp1zzjn3TimdX1XVw294dav7+AtlLXsQxG2jwGfGr4w1LmMtLS29azQavfvgwYMLbYSQmQABAgQIECBAgAABAgQIEKiHgAJWPc7JlAQIEJg8gfG/Qfx95Mk7FxMRIECAAAECBGossGfPni3T09MPjYhHjj+Lovhur25V4wM1OoGVEzgREe/LOb8zpfTXEfGuwWDwpZVb3koECBAgQIAAAQIECBAgQIAAgdMTUMA6PT93EyBAgAABAgQIECBAgAABAqcoUJbl1oWFhQeNX+Eq5/yYiHh4RGw+xeXcRoBAewS++m0L315V1V8eOHDg8+2JLykBAgQIECBAgAABAgQIECAwaQIKWJN2IuYhQIAAAQIECBAgQIAAAQINFej1ere9oWT1iIgYfz44IqYbGlcsAgTWTmD8+swfyjn/dc75HRs2bHjH/v37P7t229uJAAECBAgQIECAAAECBAgQaLuAAlbbnwD5CRAgQIAAAQIECBAgQIDAKgmUZblxYWFh/DaCPxAR41e4ekhETK3SdpYlQIDAVwtcGhF/VlXV27dt2/ZXZVleh4cAAQIECBAgQIAAAQIECBAgsFoCClirJWtdAgQIECBAgAABAgQIECDQQoF+v3/OuGx1w1sKPjYixq965YMAAQLrKTCqquofU0rjtyt8+/bt299RluXx9RzI3gQIECBAgAABAgQIECBAgECzBBSwmnWe0hAgQIAAAQIECBAgQIAAgTUVuOiii+5w4sSJR6SUxq9w9UMppbus6QA2I0CAwEkK5JyPppT+dlzIioi3z87Ovj8ixm9j6IMAAQIECBAgQIAAAQIECBAgcEoCClinxOYmAgQIECBAgAABAgQIECDQToGyLKcXFxcfnnP+oXHhKiLu304JqQkQaJDAx3POf5JSestoNHr7/Pz80QZlE4UAAQIEJl5g/KM6PeCJPyYDEiBAgAABAgRuRUAByyNCgAABAgQIECBAgAABAgQI3KLAvn37vnlpaelRKaUnjD8jYgcyAgQINFRgKef83qIo3phSeuPMzMylDc0pFgECBAgQIECAAAECBAgQILCCAgpYK4hpKQIECBAgQIAAAQIECBAg0ASBnTt3Tp177rkPiIjHVFU1Ll09LCJ8D6EJhysDAQInJZBzvmL8NoUppTcdO3bsbYcOHbr+pBZwMQECBAgQIECAAAECBAgQINAKAd88bcUxC0mAAAECBAgQIECAAAECBG5ZoNvtnpFSGr+l4I9FxA9GxFnMCBAgQOC/BXLOR3POby+K4s1TU1N/vH///s/yIUCAAAECBAgQIECAAAECBAiMBRSwPAcECBAgQIAAAQIECBAgQKClAhdeeOE3FUXxwymlnSmlH4iITS2lEJsAAQInK1BVVfWBqampN6WU/mhmZuYjJ7uA609WYPyt7HyyN7meAAECBAgQIECAAAECBAisiYAC1pow24QAAQIECBAgQIAAAQIECEyGQL/fPyfn/ISIeHxEPCoipidjMlMQIECgvgI3vFXhuIx1ZDAYvFtTqL5naXICBAgQIECAAAECBAgQIHAqAgpYp6LmHgIECBAgQIAAAQIECBAgUB+BtG/fvocuLS39j6Ioxm8veJ/6jG5SAgQI1FLg4znn10fE66+88sp3HDlyZFTLFIYmQIAAAQIECBAgQIAAAQIEli2ggLVsKhcSIECAAAECBAgQIECAAIHaCKRut/td47cWjIgnRcRdazO5QQkQINAsgS9ExBsi4jVbtmz587Isl5oVTxoCBAgQIECAAAECBAgQIEBgLKCA5TkgQIAAAQIECBAgQIAAAQINEej1evcdl65yzk+LiHs2JJYYBAgQaIrA1Tnnr7xN4dVXX/0nhw8fPtGUYHIQIECAAAECBAgQIECAAIG2Cyhgtf0JkJ8AAQIECBAgQIAAAQIEai3wVaWrp0bEt9Y6jOEJECDQHoEv5pzfPC5jbdmy5a1eGas9By8pAQIECBAgQIAAAQIECDRTQAGrmecqFQECBAgQIECAAAECBAg0WKDf7z8w5/zknPPOlNI9GhxVNAIECLRB4DNVVb2uKIrx2xS+qyzLqg2hZSRAgAABAgQIECBAgAABAk0SUMBq0mnKQoAAAQIECBAgQIAAAQKNFbjwwgvvNj09PX5rwfHneY0NKhgBAgTaLfCpqqr+b875lfPz8//cbgrpCRAgQIAAAQIECBAgQIBAfQQUsOpzViYlQIAAAQIECBAgQIAAgZYJXHDBBTs2bNjwo0VRPD0iHh0Rvo5v2TMgLgECrRa4dPwWhdPT07/3whe+8MpWSwj/dQLj/yDIXAgQIECAAAECBAgQIEBgYgR843ZijsIgBAgQIECAAAECBAgQIEAgYvfu3Zu2bt362BveXvAnImIrFwIECBBotUCVc/7boih+/+jRo3906NChL7daQ3gCBAgQIECAAAECBAgQIDCBAgpYE3goRiJAgAABAgQIECBAgACB1gmkXq/3vTnnp6eUnhQRO1onIDABAgQILEdgIef8+qmpqT/YtGnT28qyXFrOTa4hQIAAAQIECBAgQIAAAQIEVldAAWt1fa1OgAABAgQIECBAgAABAgS+oUC3271zRPxUSumnI+KeqAgQIECAwHIFcs5XpZReFRGXDAaDDy/3PtcRIECAAAECBAgQIECAAAECKy+ggLXyplYkQIAAAQIECBAgQIAAAQLfUKAsy40LCwuPi4inR8SPR8Q0LgIECBAgcDoCVVW9ryiKVx4/fvyVBw8e/OLprOVeAgQIECBAgAABAgQIECBA4OQFFLBO3swdBAgQIECAAAECBAgQIEDgpAX27dt33mg0ekZK6ZkR8c0nvYAbCBAgQIDArQssRsQbR6PR4fn5+T+PiHzrt7iCAAECBAgQIECAAAECBAgQOF0BBazTFXQ/AQIECBAgQIAAAQLLFhh/AeKngMvmcmEDBC644IIdmzdv/p9VVY2LV+c3IJIIBAgQIFAfgctSSn944sSJlx84cOBj9RnbpAQIECBAgAABAgQIECBAoH4CClj1OzMTEyBAgAABAgQIECBAgMCEC3Q6nfOLonhORDwpIjZP+LjGI0CAAIFmCyxVVfXWoiguueKKK9505MiRUbPjSkeAAAECBAgQIECAAAECBNZeQAFr7c3tSIAAAQIECBAgQIAAAQINFNi9e/dttm3b9uSc889FxHc0MKJIBAgQIFBzgZzzf0TE76eUXjoYDD5e8zjGJ0CAAAECBAgQIECAAAECEyOggDUxR2EQAgQIECBAgAABAgQIEKijQL/f/86qqnallJ4aEdvrmMHMBAgQINA6gVHO+a1VVf3m/Pz8n3uX6Nadv8AECBAgQIAAAQIECBAgsMICClgrDGo5AgQIECBAgAABAgQIEGi+QFmWm48ePfqEoih2RcRjmp9YQgIECBBosMBlKaVLUkq/MzMz84UG5xSNAAECBAgQIECAAAECBAismoAC1qrRWpgAAQIECBAgQGAsMP4PzoyCAAECDRHodrvfllJ6bkQ8PSJ2NCSWGAQIECBAYCxwLCL+KOf828Ph8B+QECBAgAABAgQIECBAgAABAssXUMBavpUrCRAgQIAAAQIECBAgQKCdAqnT6TwupfTzKaXH3dAtbaeE1AQIECDQCoGqqv4+pXRo69atry7L8ngrQgtJgAABAgQIECBAgAABAgROQ0AB6zTw3EqAAAECBAgQIECAAAECzRUoy3L74uLiU6uqen5K6b7NTSoZAQIECBC4eYGc81UR8fITJ04cOnjw4Kc4ESBAgAABAgQIECBAgAABAjcvoIDlySBAgAABAgQIECBAgAABAl8l0O/3z6mqaldK6dkRcRYcAgQIECBAIMavgvWGnPNvDIfD9/AgQIAAAQIECBAgQIAAAQIEvlZAAcsTQYAAAQIECBAgQIAAAQIEIqLX6z08Ip4fEU+MiCkoBAgQIECAwNcLVFX1voh48bZt2/6wLMslRgQIECBAgAABAgQIECBAgECEApangAABAgQIECBAgAABAgRaK7B79+5NmzdvflpK6Re8zWBrHwPBCRAgQOAUBHLOV6aUXhIRlwwGgy+dwhJuIUCAAAECBAgQIECAAAECjRFQwGrMUQpCgAABAgQIECBAgAABAssVuOCCC3Zs2rTpOTnn56eU7rjc+1xHgAABAgQIfJ3AtRHxu0tLSwcPHDjwMT4ECBAgQIAAAQIECBAgQKCNAgpYbTx1mQkQIECAAAECBAgQINBSgU6nc/bU1NS4ePXzEbGjpQxiEyBAgACB1RCocs5vKYriBbOzs3+/GhtYkwABAgQIECBAgAABAgQITKqAAtaknoy5CBAgQIAAAQIECBAgQGDFBPbu3fvtRVHsTSk9OSI2rNjCFiJAgAABAgS+TiDn/O6U0mAwGLwpIjIiAgQIECBAgAABAgQIECDQdAEFrKafsHwECBAgQIAAAQIECBBosUCv13t4zrmXUvqRiPA1cIufBdEJECBAYF0E/rGqqoPbtm37w7Isl9ZlApsSIECAAAECBAgQIECAAIE1EPDN5zVAtgUBAgQIECBAgAABAgQIrJ1AWZbF4uLizpxzPyIesHY724kAAQIECBC4OYGc8xURcWDr1q2vKMvyGCUCBAgQIECAAAECBAgQINA0AQWspp2oPAQIECBAgAABAgQIEGipwK5duzbc9ra3fVpRFOPi1be1lEFsAgQIECAwyQKfi4gXX3/99S+5+OKLr5nkQc1GgAABAgQIECBAgAABAgRORkAB62S0XEuAAAECBAgQIECAAAECEydQluXGo0ePPrkoil+OiHtO3IAGIkCAAAECBG4qcG3O+eU555m5ubnP4CFAgAABAgQIECBAgAABAnUXUMCq+wmewvzjQ8+ncJ9bCBAgQIAAAQIECBAgMEkCe/fu3TY1NfWsiOhExJ0maTazECBAgAABArcukHM+GhGXRMRgOBx++tbvcAUBAgQIECBAgAABAgQIEJhMAQWsyTwXUxEgQIAAAQIECBAgQIDANxDodrtnpJSeGRHjtxo8GxQBAgQIECBQe4Hrc86/FxG/PhwOP1n7NAIQIECAAAECBAgQIECAQOsEFLBad+QCEyBAgAABAgQIECBAoJ4C+/btu11VVb8QEc+LiNvUM4WpCRAgQIAAgVsQuD4ifndpaWlw4MCBj5EiQIAAAQIECBAgQIAAAQJ1EVDAqstJmZMAAQIECBAgQIAAAQItFej3+2dWVbUnpXRBRJzRUgaxCRAgQIBAmwRORMQrU0ozs7Oz/96m4LISIECAAAECBAgQIECAQD0FFLDqeW6mJkCAAAECBAgQIECAQOMFyrLcvri4+Nyccy8izmx8YAEJECBAgACBmwpUEfG6qqr2zc3NXY6HAAECBAgQIECAAAECBAhMqoAC1qSejLkIECBAgAABAgQIECDQUoG9e/dum56efl7OuRsRZ7WUQWwCBAgQIEDgvwVO5JxffuLEiRccPHjwU2AIECBAgAABAgQIECBAgMCkCShgTdqJmGcdBcb/d8jruL+tCRAgQIAAAQIECLRboCzLrQsLC8+OiH5EnN1uDekJECBAgACBmxE4nnN+xfT0dLl///7/IESAAAECBAgQIECAAAECBCZFQAFrUk7CHAQIECBAgAABAgQIEGipQFmWGxcXF3+6qqoypXTHljKITYAAAQIECCxTIOd8NCIumZ6e3r9///7PLvM2lxEgQIAAAQIECBAgQIAAgVUTUMBaNVoLEyBAgAABAgQIECBAgMAtCZRlOb24uPjMnPOvRsS30CJAgAABAgQInKTAl1NKB3POBweDwZdO8l6XEyBAgAABAgQIECBAgACBFRNQwFoxSgsRIECAAAECBAgQIECAwDIFUrfb/YmU0osi4l7LvMdlBAgQIECAAIFvJPDFiJjbsmXLi8uyPIaJAAECBAgQIECAAAECBAistYAC1lqL248AAQIECBAgQIAAAQItFuh0OuenlAYppfNbzCA6AQIECBAgsDoCn04p/drmzZt/tyzLpdXZwqoECBAgQIAAAQIECBAgQODrBRSwPBUECBAgQIAAAQIECBAgsOoCe/fuvd/U1NSvRMTOVd/MBgQIECBAgECrBaqq+khE/Mrc3NxrIyK3GkN4AgQIECBAgAABAgQIEFgTAQWsNWG2CQECBAgQIECAAAECBNopcOGFF95tamrqopTSsyKiaKeC1AQIECBAgMA6Cbw3IrqDweAd67S/bQkQIECAAAECBAgQIECgJQIKWC05aDEJECBAgAABAgQIECCwlgKdTufsoijGr3g1Ll5tWMu97UWAAAECBAgQuInA64ui2DczMzN+ZSwfBAgQIECAAAECBAgQIEBgxQUUsFac1IIECBAgQIAAAQIECBBor0BZlhsXFhZ+NiJeEBG3aa+E5AQIECBAgMCECVQ551dFRH84HH56wmYzDgECBAgQIECAAAECBAjUXEABq+YHaHwCBAgQIECAAAECBAhMiEDq9XpPiYiZiLjrhMxkDAIECBAgQIDATQWORcRvbNmyZVCW5XV4CBAgQIAAAQIECBAgQIDASggoYK2EojUIECBAgAABAgQIECDQYoFut/vQ8Q8yU0rnt5hBdAIECBAgQKBGAjnn/yiKorz88ssvOXLkyKhGoxuVAAECBAgQIECAAAECBCZQQAFrAg/FSAQIECBAgAABAgQIEKiDwC/+4i/e5cSJEy9KKf1kRPj6sg6HZkYCBAgQIEDgpgLvr6rqF+bm5v4aDQECBAgQIECAAAECBAgQOFUB3yA/VTn3ESBAgAABAgQIECBAoKUCZVluX1xc3Jtz7kXE5pYyiE2AAAECBAg0SCDn/Kac8wVzc3OXNyiWKAQIECBAgAABAgQIECCwRgIKWGsEbRsCBAgQIECAAAECBAjUXaAsy+mFhYVnR8SvRcQ31z2P+QkQIECAAAECNxG4Pud88cLCwv5Dhw59mQ4BAgQIECBAgAABAgQIEFiugALWcqVcR4AAAQIECBAgQIAAgRYL9Hq9R6SUDuWcv73FDKITIECAwLoJZO92u272rdz4CxHx61dcccVLjhw5MmqlgNAECBAgQIAAAQIECBAgcFICClgnxeViAgQIECBAgAABAgQItEtgz549d9qwYcNcSunJfvLdrrOXlgABAgQIEIh/SildMDs7+1csCBAgQIAAAQIECBAgQIDALQkoYHk+CBAgQIAAAQIECBAgQODrBHbt2rXhzDPP/Lnxqz9ExBmICBDw6jueAQIECLRVIOf8ppTScweDwcfbaiA3AQIECBAgQIAAAQIECNyygAKWJ4QAAQIECBAgQIAAAQIEvkag2+0+OqX04og4Dw0BAgQIECBAgMBXBI6llOaOHj06c+jQoeuZECBAgAABAgQIECBAgACBrxZQwPI8ECBAgAABAgQIECBAgMBXBDqdzrlFUcxExE4kBAgQIECAAAECNyvwbxHx/MFg8Kd8CBAgQIAAAQIECBAgQIDAjQIKWJ4FAgQIECBAgAABAgQItFxg796926anp/flnC+MiM0t5xCfAAECBAgQIHCrAjnn10TEhcPh8JO3erELCBAgQIAAAQIECBAgQKDxAgpYjT9iAQkQIECAAAECBAgQIPCNBTqdzuOLojgUEXfnRIAAAQIECBAgcFIC3pbwpLhcTIAAAQIECBAgQIAAgeYKKGA192wlI0CAAAECBAgQIECAwDcU6Ha73xIRsymlp2MiQIAAAQIECBA4LYHLqqp6/tzc3J+c1ipuJkCAAAECBAgQIECAAIHaCihg1fboDE6AAAECBAgQIECAAIGTFyjLcvrYsWPPSym9ICLOOPkV3EGAAAECBAgQIHBzAjnnV+ecL5ibm/sMIQIECBAgQIAAAQIECBBol4ACVrvOW1oCBAgQIECAAAECBFos0O/3HzgajV5WFMVDWswgOgECBAgQIEBgNQW+FBG/umXLlkNlWVaruZG1CRAgQIAAAQIECBAgQGByBBSwJucsTEKAAAECBAgQIECAAIFVEej1erfNOb8gpfTciJhalU0sSoAAAQKV9DKvAAAgAElEQVQECBAg8F8COee/qarqf83Pz38ICwECBAgQIECAAAECBAg0X0ABq/lnLCEBAgQIECBAgAABAi0W6PV6T4iIl0bEnVvMIDoBAgQIECBAYD0ElnLOL62q6qL5+fmj6zGAPQkQIECAAAECBAgQIEBgbQQUsNbG2S4ECBAgQIAAAQIECBBYU4F+v3/3qqp+O6X0g2u6sc0IECBAgAABAgRuKnB5zvlnh8Phn6EhQIAAAQIECBAgQIAAgWYKKGA181ylIkCAAIGaCIz/RZxrMqsxCRAgQKA2Aqnf7z875zwfEWfUZmqDEiBAgAABAgSaL3BkNBo9b35+/qrmR5WQAAECBAgQIECAAAEC7RJQwGrXeUtLgAABAgQIECBAgECDBfbt23fv0Wj0Oyml8xscUzQCBAgQIECAQJ0FvlhVVWdubu7l/k5WnY/R7AQIECBAgAABAgQIEPhaAQUsTwQBAgQIECBAgAABAgRqLlCW5fTi4uKFOecyIjbXPI7xCRAgQIAAAQKNF8g5vzPn/DNzc3OXNT6sgAQIECBAgAABAgQIEGiBgAJWCw5ZRAIECBAgQIAAAQIEmiuwd+/eby+K4pKU0oObm1IyAgQIECBAgEAjBY6llF6wefPmubIsq0YmFIoAAQIECBAgQIAAAQItEVDAaslBi0mAAAECBAgQIECAQLMEyrLcvLi42M8574uIjc1KJw0BAgQIECBAoD0COee/mZqa+pmZmZmPtCe1pAQIECBAgAABAgQIEGiWgAJWs85TGgIECBAgQIAAAQIEWiDQ6/UeVlXVJUVR3LsFcUUkQIAAAQIECLRBYCGl9GuXX375/JEjR0ZtCCwjAQIECBAgQIAAAQIEmiSggNWk05SFAAECBAgQIECAAIFGC5RlufXYsWMzKaXnRUTR6LDCESBAgAABAgTaKfDeoiieOTMzc2k740tNgAABAgQIECBAgACBegooYNXz3ExNgAABAgQIECBAgEDLBPbt2/ddS0tLr/CqVy07eHEJECBAYFkCOSJ8o3NZVC6qh8CJnPNvbN269VfKsjxej5FNSYAAAQIECBAgQIAAgXYL+L5Eu89fegIECBAgQIAAAQIEJlygLMuNi4uLZc65GxFTEz6u8QgQIECAAAECBFZO4P0R8dODweCDK7eklQgQIECAAAECBAgQIEBgNQQUsFZD1ZoECBAgQIAAAQIECBBYAYG9e/feb2pq6vcj4oErsJwlCBAgQIAAAQIE6idwIqW0//LLL//1I0eOjOo3vokJECBAgAABAgQIECDQDgEFrHacs5QECBAgQIAAAQIECNRIoCzL6cXFxQtzzr8WEZtqNLpRCRAgQIAAAQIEVkEg5/y3Oeefmpubu2wVlrckAQIECBAgQIAAAQIECJymgALWaQK6nQABAgQIECBAgAABAisp0Ol0zi2K4hUR8fCVXNdaBAgQIECAAIG2C+SIqPk3xI9FxEWDweDFETGO44MAAQIECBAgQIAAAQIEJkSg5l9vToiiMQgQIECAAAECBAgQIHD6Aqnf7z+7qqrfSCltO/3lrECAAAECBAgQINBQgT89fvz4zxw8ePBTDc0nFgECBAgQIECAAAECBGonoIBVuyMzMAECBAgQIECAAAECTRPodDpnp5RenlL6waZlk4cAAQIECBAgQGBVBK6JiN2DweAPVmV1ixIgQIAAAQIECBAgQIDASQkoYJ0Ul4sJECBAgAABAgQIECCwsgLdbveJKaXDEXG7lV3ZagQIECBAgAABAi0QOHL8+PHnHDx48IstyCoiAQIECBAgQIAAAQIEJlZAAWtij8ZgBAgQIECAAAECBAg0WaAsy+0LCwu/GRHPbHJO2QgQIECAAAECBFZd4JMppZ+anZ39i1XfyQYECBAgQIAAAQIECBAgcLMCClgeDAIECBAgQIAAAQIECKyxQL/ff0jO+VUR8a1rvLXtCBAgQIAAAQIEmimQc86Htm7d2inL8ngzI0pFgAABAgQIECBAgACByRVQwJrcszEZAQIECBAgQIAAAQINEyjLslhYWNgdEcOI2NiweOIQIECAAAECBAiss0DO+R9yzk+dm5u7bJ1HsT0BAgQIECBAgAABAgRaJaCA1arjFpYAAQIECBAgQIAAgfUS6PV6d42IV0bEI9ZrBvsSIECAAAECBAi0QmAhIvYNBoPx2137IECAAAECBAgQIECAAIE1EFDAWgNkWxAgQIAAAQIECBAg0G6BTqezsyiKl0XEme2WkJ4AAQIECBAgQGANBV6XUnr27Ozs1Wu4p60IECBAgAABAgQIECDQSgEFrFYeu9AECBAgQIAAAQIECKyFQFmW2xcWFn4rIp6xFvvZgwABAgQIECBAgMBNBD5aVdVPzs3NvZsMAQIECBAgQIAAAQIECKyegALW6tlamQABAgQIECBAgACBFgt0u937RMRrUkr3qyVDjghfMdby6AxNgAABAgQIELiJwCjnPH/NNdf88uHDh0/QIUCAAAECBAgQIECAAIGVF/Dt9JU3tSIBAgQIECBAgAABAi0X6Pf7u3LOF0fElpZTiE+AAAECBAgQIDA5Au/KOT9lOBx+cnJGMgkBAgQIECBAgAABAgSaIaCA1YxzlIIAAQIECBAgQIAAgQkQ6Ha7Z6SU/ndEPHUCxjECAQIECBAgQIAAgZsKfL4oip+amZl5CxoCBAgQIECAAAECBAgQWDkBBayVs7QSAQIECBAgQIAAAQItFuj3+w/MOb86Ir61xQyiEyBAgAABAgQITL5Azjkfuuaaa/Z6S8LJPywTEiBAgAABAgQIECBQDwEFrHqckykJECBAgAABAgQIEJhggU6n84yiKMavfOUtByf4nIxGgAABAgQIECDw3wI553eeOHHiKQcPHvwUFwIECBAgQIAAAQIECBA4PQEFrNPzczcBAgQIECBAgAABAi0W2L179222bNlyOKX0/7WYQXQCBAgQIECAAIH6Cnw+Ip4xGAzeWt8IJidAgAABAgQIECBAgMD6Cyhgrf8ZmIAAAQIECBAgQIAAgRoK9Pv9h1RV9eqU0j1qOL6RCRAgQIAAAQIECNwoUKWUZi6//PJfPXLkyAgLAQIECBAgQIAAAQIECJy8gALWyZu5gwABAgQIECBAgACBlgt4y8GWPwDiEyBAgAABAgSaKfCOnPNThsPhp5sZTyoCBAgQIECAAAECBAisnoAC1urZWpkAAQIECBAgQIAAgYYJ7NmzZ8vGjRtfGhE/3bBo4hAgQIAAAQIECBCInPNVEfHU4XD45zgIECBAgAABAgQIECBAYPkCCljLt3IlAQIECBAgQIAAAQItFuj1enetquq1RVE8pMUMohMgQIAAAQIECDRfYJRSeuHmzZtfUJZl1fy4EhIgQIAAAQIECBAgQOD0BRSwTt/QCgQIECBAgAABAgQINFyg1+v9SES8MiLObHhU8QgQIECAAAECBAh8RaCqqjeeOHHiGRdffPE1SAgQIECAAAECBAgQIEDglgUUsDwhBAgQIECAAAECBAgQ+MYCqd/vd3PO+yOiAEWAAAECBAgQIECgZQKXjUajJ87Pz3+oZbnFJUCAAAECBAgQIECAwEkJKGCdFJeLCRAgQIAAAQIECBBoi8C+fftuV1XVqyLicW3JLCcBAgQIECBAgACBmxG4LiJ+ZjAYvIYOAQIECBAgQIAAAQIECNy8gAKWJ4MAAQIECBAgQIAAAQI3Eeh0Og9KKb02pXQPOAQIECBAgAABAgQIROScD19zzTXPO3z48AkeBAgQIECAAAECBAgQIPC1AgpYnggCBAgQIECAAAECBAh8lUCn03lmURQvjYhNYAgQIECAAAECBAgQ+BqBvxyNRk+en5+/igsBAgQIECBAgAABAgQI/LeAApangQABAgQIECBAgAABAhFRluX0sWPHXphS6gEhQIAAAQIECBAgQOAbCnwq5/yk4XD4HkYECBAgQIAAAQIECBAg8J8CClieBAIECBAgQIAAAQIEWi9w4YUXftP09PRrIuL7Wo8BgAABAgQIECBAgMCtC1yfc/7Z4XD48lu/1BUECBAgQIAAAQIECBBovoACVvPPWEICBAgQIECAAAECBG5BoNfr3T/n/IaU0j1AESBAgAABAgQIECCwfIGc8+FrrrnmeYcPHz6x/LtcSYAAAQIECBAgQIAAgeYJKGA170wlIkCAAAECBAgQIEBgmQKdTufxRVG8KiJus8xbXEaAAAECBAgQIECAwNcKvC2l9OTZ2dmrwRAgQIBAAwXGP03ODcwlEgECBAgQWGEBBawVBrUcAQIECBAgQIAAAQK1EEj9fr+bc94fEUUtJjYkAQIECBAgQIAAgckV+PeiKH5sZmbm0skd0WQECBAgQIAAAQIECBBYPQEFrNWztTIBAgQIECBAgAABAhMoUJbl9mPHjv1eSumJEziekQgQIECAAAECBAjUVeDaiHj6YDB4Q10DmJsAAQIECBAgQIAAAQKnKqCAdapy7iNAgAABAgQIECBAoHYCnU7n3JTS61NK96vd8AYmQIAAAQIECBAgMPkCOaX0gtnZ2V/zhlWTf1gmJECAAAECBAgQIEBg5QQUsFbO0koECBAgQIAAAQIECEywQKfTeWRRFK+LiNtN8JhGI0CAAAECBAgQIFB7gZTSqzZv3vyssiwXax9GAAIECBAgQIAAAQIECCxDQAFrGUguIUCAAAECBAgQIECg3gKdTueni6J4WURsrHcS0xMgQIAAAQIECBCojcDf5Zx/fDgcfro2ExuUAAECBAgQIECAAAECpyiggHWKcG4jQIAAAQIECBAgQKAWAqnf7/9qzvlXazGtIQkQIECAAAECBAg0S+DTVVU9YW5u7v3NiiUNAQIECBAgQIAAAQIEvlZAAcsTQYAAAQIECBAgQIBAIwXKstx87Nix300pPaWRAYUiQIAAAQIECBAgUA+B6yLiqYPB4I31GNeUBAgQIECAAAECBAgQOHkBBayTN3MHAQIECBAgQIAAAQITLnDRRRfd8cSJE28oiuIhEz6q8QgQIECAAAECBAi0QWCUc/6F4XD44jaElZEAAQIECBAgQIAAgfYJKGC178wlJkCAAAECBAgQINBogV6vd/+U0htzzndrdFDhCBAgQIAAAQIECNRMIOd8eOvWrc8ty3KpZqMblwABAgQIECBAgAABArcooIDlASFAgAABAgQIECBAoDECvV7vcRHxmoi4TWNCCUKAAAECBAgQIECgWQJ/euzYsf956NChLzcrljQECBAgQIAAAQIECLRZQAGrzacvOwECBAgQIECAAIEGCfT7/V0559+KiOkGxRKFAAECBAgQIECAQBMFPhgRjx8MBh9vYjiZCBAgQIAAAQIECBBon4ACVvvOXGICBAgQIECAAAECjRLYuXPn1N3vfvffLIriuY0KJgwBAgQIECBAgACBZgt8qqqqH52bm3t/s2NKR4AAAQIECBAgQIBAGwQUsNpwyjISIECAAAECBAgQaKjAnj17tmzcuPFVEfHjDY0oFgECBAgQIECAAIEmC1wXEU8eDAZvbnJI2QgQIECAAAECBAgQaL6AAlbzz1hCAgQIECBAgAABAo0U2LNnz1kbNmx4fUrpexsZUCgCBAgQIECAAAEC7RAYRcRzB4PBy9oRV0oCBAgQIECAAAECBJoooIDVxFOViQABAgQIECBAgEDDBfr9/t1Ho9Fbi6K4d8OjikeAAAECBAgQIECgFQI558FwOOy3IqyQBAgQIECAAAECBAg0TkABq3FHKhABAgQIECBAgACBZgvs3bv326empt4SEXdqdlLpCBAgQIAAAQIECLRO4BVXX331rsOHD59oXXKBCRAgQIAAAQIECBCotYACVq2Pz/AECBAgQIAAAQIE2iWwd+/ex0xNTb0uIm7TruTSEiBAgAABAgQIEGiNwNtyzk8aDofXtiaxoAQIECBAgAABAgQI1F5AAav2RygAAQIECBAgQIAAgXYIdLvdn0op/Z+I2NCOxFISIECAAAECBAgQaKdAVVV/n3N+/Pz8/FXtFJCaAAECBAgQIECAAIG6CShg1e3EzEuAAAECBAgQIECghQL9fr+Xc56JCF/DtPD8RSZAgAABAgQIEGifQM75ipzzD87NzV3WvvQSEyBAgAABAgQIECBQNwE/vKjbiZmXAAECBAgQIECAQIsEdu7cOXXOOef8dkQ8u0WxRSVAgAABAgQIECBA4D8FPlNV1Y/Mzc29HwgBAgQIECBAgAABAgQmWUABa5JPx2wECBAgQIAAAQIEWiywe/fuTVu3bn1VRPxEixlEJ0CAAAECBAgQINB2gWtHo9ET5+fn3952CPkJECBAgAABAgQIEJhcAQWsyT0bkxEgQIAAAQIECBBorcDevXu3TU1NvS4iHtdaBMEJECBAgAABAgQIELhR4HjO+WnD4fC1SAgQIECAAAECBAgQIDCJAgpYk3gqZiJAgAABAgQIECDQYoF+v39mVVVvTil9T4sZRCdAgAABAgQIECBA4GsFRiml58zOzv4OGAIECBAgQIAAAQIECEyagALWpJ2IeQgQIECAAAECBAi0WOCiiy6642g0+tOIuH+LGUQnQIAAAQIECBAgQODmBXLOuTccDucAESBAgAABAgQIECBAYJIEFLAm6TTMQoAAAQIECBAgQKDFAv1+/5yc89si4twWM4hOgAABAgQIECBAgMCtCOScB8PhsA+KAAECBAgQIECAAIFx7SdjmAABBawJOAQjECBAgAABAgQIEGi7QKfTeVBK6a0ppdu33UJ+AgQIECBAgAABAgRuXSDn/L+3bt363LIsq1u/2hUECBAgQIAAAQIECBBYXQEFrNX1tToBAgQIECBAgAABArci0Ov1HhERfxwRt4VFgAABAgQIECBAgACBkxD4o6uvvvoZhw8fPnES97iUAAECBAgQIECAAAECKy6ggLXipBYkQIAAAQIECBAgQGC5Ap1O5/FFUbwmIrYs9x7XESBAgAABAgQIECBA4EaBnPNbtm7durMsy2NUCBAgQIAAAQIECBAgsF4CCljrJW9fAgQIECBAgAABAi0X6HQ6TymK4vcjYrrlFOITIECAAAECBAgQIHAaAjnndy4sLDz+0KFDXz6NZdxKgAABAgQIECBAgACBUxZQwDplOjcSIECAAAECBAgQIHCqAt1u92kppVcoX52qoPsIECBAgAABAgQIEPhqgaqq3jc9Pf24mZmZL5AhQIAAAQIECBAgQIDAWgsoYK21uP0IECBAgAABAgQItFyg3+/vyjn/dkQULacQnwABAgQIECBAgACBlRX4x6IoHjszM/O5lV3WagQIECBAgAABAgQIELhlAQUsTwgBAgQIECBAgAABAmsm0O12fy6l9JKI8LXImqnbiAABAgQIECBAgECrBP4l5/yY4XD46ValFpYAAQIECBAgQIAAgXUV8EOPdeW3OQECBAgQIECAAIH2CPT7/V7OebY9iSUlQIAAAQIECBAgQGCdBP71hhLWJ9dpf9sSIECAAAECBAgQINAyAQWslh24uAQIECBAgAABAgTWQ0D5aj3U7UmAAAECBAgQIECg1QIfTSk9enZ29opWKwhPgAABAgQIECBAgMCaCChgrQmzTQgQIECAAAECBAi0V6DX6/16RPxSewUkJ0CAAAECBAgQIEBgnQQ+fkMJ69/XaX/bEiBAgAABAgQIECDQEgEFrJYctJgECBAgQIAAAQIE1kEg9Xq9gxHx8+uwty0JECBAgAABAgQIECAwFvhMRDxmMBh8GAcBAgQIECBAgAABAgRWS0ABa7VkrUuAAAECBAgQIECgxQJlWRbHjh17WUrpWS1mEJ0AAQIECBAgQIAAgckQ+GxEPFoJazIOwxQECBAgQIAAAQIEmiiggNXEU5WJAAECBAgQIECAwPoKpG63+9KU0nPWdwy7EyBAgAABAgQIECBA4L8EPjcajb5/fn7+Q0wIECBAgAABAgRWUWDcQsmruL6lCUyogALWhB6MsQgQIECAAAECBAjUVED5qqYHZ2wCBAgQIECAAAECTRfIOV+VUvp+r4TV9JOWjwABAgQIECBAgMDaCyhgrb25HQkQIECAAAECBAg0VSD1er3fioifbWpAuQgQIECAAAECBAgQqLfAuIQ1NTX1fTMzM5fWO4npCRAgQIAAAQIECBCYJAEFrEk6DbMQIECAAAECBAgQqK9A6vf7L8k5/1x9I5icAAECBAgQIECAAIGWCHy2KIrvV8JqyWmLSYAAAQIECBAgQGANBBSw1gDZFgQIECBAgAABAgQaLqB81fADFo8AAQIECBAgQIBAAwU+m3P+vuFw+C8NzCYSAQIECBAgQIAAAQJrLKCAtcbgtiNAgAABAgQIECDQMIHU6XQOFUXx3IblEocAAQIECBAgQIAAgeYLfKYoivHbEX6k+VElJECAAAECBAgQIEBgNQUUsFZT19oECBAgQIAAAQIEmi2gfNXs85WOAAECBAgQIECAQBsEPllV1aPm5uYub0NYGQkQIECAAAECBAgQWB0BBazVcbUqAQIECBAgQIAAgaYLpG63++KU0vOaHlQ+AgQIECBAgAABAgSaLZBz/sT47QiVsJp9ztIRIECAwAoLjJsGeYXXtBwBAgRqLKCAVePDMzoBAgQIECBAgACBdRLwylfrBG9bAgQIECBAgAABAgRWTeCj09PTj3jRi170iVXbwcIECBAgQIAAAQIECDRWQAGrsUcrGAECBAgQIECAAIHVEej1ehdHxM+vzupWJUCAAAECBAgQIECAwLoJ/NvU1NQj9u/f/9l1m8DGBAgQIECAAAECBAjUUkABq5bHZmgCBAgQIECAAAEC6yPQ7/dfmHP+xfXZ3a4ECBAgQIAAAQIECBBYdYEPFkXxfTMzM19Y9Z1sQIAAAQIECBAgQIBAYwQUsBpzlIIQIECAAAECBAgQWF2Bbrd7QUrp4OruYnUCBAgQIECAAAECBAisu8A/Xn/99d938cUXX7PukxiAAAECBAgQIECAAIFaCChg1eKYDEmAAAECBAgQIEBgfQV6vd5zI+Il6zuF3QkQIECAAAECBAgQILA2Ajnnv9m6devjyrK8bm12tAsBAgQIECBAgAABAnUWUMCq8+mZnQABAgQIECBAgMAaCHQ6nWcURfHyiCjWYDtbECBAgAABAgQIECBAYFIE3r5ly5YnlGW5OCkDmYMAAQIECBAgQIAAgckUUMCazHMxFQECBAgQIECAAIGJEOh2u09MKb06IqYnYiBDECBAgAABAgQIECBAYA0Fqqp6w7Zt255UluXSGm5rKwIECBAgQIAAAQIEaiaggFWzAzMuAQIECBAgQIAAgbUS6Pf7j805/3FEbFqrPe1DgAABAgQIECBAgACBSRPIOb/2yiuvfPKRI0dGkzabeQgQIECAAAECBAgQmAwBBazJOAdTECBAgAABAgQIEJgogX6///055zdHxOaJGswwBAgQIECAAAECBAgQWAeBnPPh4XD4nIjI67C9LQkQIECAAAECBAgQmHABBawJPyDjESBAgAABAgQIEFhrgW63+90ppT+LiO1rvbf9CBAgQIAAAQIECBAgMMEC+weDwS9O8HxGI0CAAAECBAgQIEBgnQQUsNYJ3rYECBAgQIAAAQIEJlGg3+8/MOf8FxGxYxLnMxMBAgQIECBAgAABAgTWWeCCwWDwm+s8g+0JECBAgAABAgQIEJgwAQWsCTsQ4xAgQIAAAQIECBBYL4FOp3NuURTvioiz12sG+xIgQIAAAQIECBAgQGDCBXJVVc+cm5t7xYTPaTwCBAgQIECAAAECBNZQQAFrDbFtRYAAAQIECBAgQGBSBfbu3Xv7qampcfnqWyd1RnMRIECAAAECBAgQIEBgQgRORMSPDQaDt07IPMYgQIAAAQIECBAgQGCdBRSw1vkAbE+AAAECBAgQIEBgvQV27959m61bt/5VRDxwvWexPwECBAgQIECAAAECBGoicKyqqsfOzc29uybzGpMAAQIECBAgQIAAgVUUUMBaRVxLEyBAgAABAgQIEJh0gT179mzZuHHjn0TEIyZ9VvMRIECAAAECBAgQIEBgwgSuGY1Gj5yfn//nCZvLOAQIECBAgAABAgQIrLGAAtYag9uOAAECBAgQIECAwKQI7Ny5c+qcc855dUT8xKTMZA4CBAgQIECAAAECBAjUTOBTS0tL5x84cOBjNZvbuAQIECBAgAABAgQIrKCAAtYKYlqKAAECBAgQIECAQI0EUrfbPZxSelaNZjYqAQIECBAgQIAAAQIEJlHgstFo9PD5+fmrJnE4MxEgQIAAAQIECBAgsPoCClirb2wHAgQIECBAgAABAhMn0O/39+ec903cYAYiQIAAAQIECBAgQIBAPQXes2XLlkeXZXmsnuObmgABAgQIECBAgACB0xFQwDodPfcSIECAAAECBAgQqKFAt9v9uZTSb9VwdCMTIECAAAECBAgQIEBgYgVyzm+68sor/8eRI0dGEzukwQgQIECAAAECBAgQWBUBBaxVYbUoAQIECBAgQIAAgckU6HQ6TymK4g8iopjMCU1FgAABAgQIECBAgACBWgu8bDAYPKfWCQxPgAABAgQIECBAgMBJCyhgnTSZGwgQIECAAAECBAjUU6Db7f5ASunNEbGhnglMTYAAAQIECBAgQIAAgckXSCntnZ2dPTD5k5qQAAECBAgQIECAAIGVElDAWilJ6xAgQIAAAQIECBCYYIFer3ffiHhXROyY4DGNRoAAAQIECBAgQIAAgSYI5Jzz04fD4auaEEYGAgQIECBAgACBUxAYt3HyKdznltoKKGDV9ugMToAAAQIECBAgQGB5At1u91si4j0ppbss7w5XESBAgAABAgQIECBAgMBpCixGxA8MBoPxX4TxQYAAAQIECBAgQIBAwwUUsBp+wOIRIECAAAECBAi0W6Db7Z6RUnpHRDyg3RLSE6hSuvAAACAASURBVCBAgAABAgQIECBAYM0FvphzfthwOPzXNd/ZhgQIECBAgAABAgQIrKmAAtaactuMAAECBAgQIECAwNoJ7Nq1a8OZZ575xoh43NrtaicCBAgQIECAAAECBAgQuFEg53zl9PT09+zfv/+zVAgQIECAAAECBAgQaK6AAlZzz1YyAgQIECBAgACBlgv0er2XRsTPtpxBfAIECBAgQIAAAQIECKyrQM75H6qqetT8/PzRdR3E5gQIECBAgAABAgQIrJqAAtaq0VqYAAECBAgQIECAwPoJdLvdX04pvWD9JrAzAQIECBAgQIAAAQIECHyVwOu3bNnyE2VZVlQIECBAgAABAgQIEGiegAJW885UIgIECBAgQIAAgZYL9Hq9J0fEH0aE/95v+bMgPgECBAgQIECAAAECEyUwHAwGvYmayDAECBAgQIAAAQIECKyIgB/IrAijRQgQIECAAAECBAhMhkCn03lkURR/GhGbJmMiUxAgQIAAAQIECBAgQIDAjQIppf81Ozt7mAgBAgQIECBAgAABAs0SUMBq1nlKQ4AAAQIECBAg0GKBffv2nVdV1bsi4swWM4hOgAABAgQIECBAgACBSRY4kXN+3HA4/MtJHtJsBAgQIECAAAECBAicnIAC1sl5uZoAAQIECBAgQIDARArs3bv39lNTU++NiLtP5ICGIkCAAAECBAgQIECAAIEbBb5QVdV3zc3NXY6EAAECBAgQIECAAIFmCChgNeMcpSBAgAABAgQIEGixQFmWGxcXF9+Wc35kixlEJ0CAAAECBAgQIECAQG0Eqqr6yNTU1MNmZ2evrs3QBiVAgAABAgQIECBA4BsKKGB5OAgQIECAAAECBAjUXKDb7f6flNKzah7D+AQIECBAgAABAgQIEGibwJ9t2bLlh8uyXGpbcHkJECBAgAABAgQINE1AAatpJyoPAQIECBAgQIBAqwS63e6+lNL+VoUWlgABAgQIECBAgAABAg0RyDlfMhwO/YWahpynGAQIECBAgAABAu0VUMBq79lLToAAAQIECBAgUHOBffv2/XBVVX8cEVM1j2J8AgQIECBAgAABAgQItFagqqrnz83NHWotgOAECBAgQIAAAQIEGiCggNWAQxSBAAECBAgQIECgfQKdTucBRVG8MyK2ty+9xAQIECBAgAABAgQIEGiUwCjn/EPD4fDPGpVKGAIECBAgQIAAAQItElDAatFhi0qAAAECBAgQINAMgYsuuugOo9Ho7yLirs1IJAUBAgQIECBAgAABAgRaL3B1Sumhs7Oz/956CQAECBAgQIAAAQIEaiiggFXDQzMyAQIECBBorMD4v0xyY9MJRmBFBMqy3Hzs2LG/SCl9z4osaBECBAgQIECAAAECBAgQmBSBfzl27Nh3Hzp06MuTMpA5CBCYRAHfRJ3EUzETAQIECBBQwPIMECBAgAABAgQIEKiPQOr1er8fET9Zn5FNSoAAAQIECBAgQIAAAQInIfD6wWDwRH9F7STEXEqAAAECBAgQIEBgAgQUsCbgEIxAgAABAgQIECBAYDkCvV7vlyLi15dzrWsIECBAgAABAgQIECBAoJ4COedfGQ6Hvvar5/GZmgABAgQIECBAoKUCClgtPXixCRAgQIAAAQIE6iXQ7XZ/NKX0/yKiqNfkpiVAgAABAgQIECBAgACBkxTIKaWds7OzrzvJ+1xOgAABAgQIECBAgMA6CShgrRO8bQkQIECAAAECBAgsV2Dfvn33qqrq7yLitsu9x3UECBAgQIAAAQIECBAgUGuBayPiewaDwYdrncLwBAgQIECAAAECBFoioIDVkoMWkwABAgQIECBAoJ4C3W73jJTSeyLivHomMDUBAgQIECBAoK0COSJ8+7Wtpy83gRUS+Lfrr7/+uy6++OJrVmg9yxAgQIAAAQIECBAgsEoCvgOwSrCWJUCAAAECBAgQILACAqnb7b4mpfSkFVjLEgQIECBAgAABAgQIECBQP4G3XXHFFT985MiRUf1GNzEBAgQIECBAgACB9ggoYLXnrCUlQIAAAQIECBComUC32/3llNILaja2cQkQIECAAAECBAgQIEBgZQVeOBgMfnlll7QaAQIECBAgQIAAAQIrKaCAtZKa1iJAgAABAgQIECCwQgKdTufxRVG8ISKKFVrSMgQIECBAYFIFvhwRt/SqHhsiYvukDm8uAgQIECCwBgJVVVU/Njc396Y12MsWBAgQIECAAAECBAicgoAC1imguYUAAQIECBAgQIDAagrs27fvXlVVvTcidqzmPtYmQIAAAQInKXAiIr6Qc/5CSukLN/4+Ir5UFMV1OefrUkrjMtWXUkrXVlU1/uejOefFlNJCznlp/OeLi4v54osvvuYk9/6vy/fs2bNl06ZNm8d/UFXVtqIoxr+/bc55y2g02lwUxY6U0uaU0taIOLOqqjPHv6aUxr/uyDnf+Puzxn9+qnO4jwABAgQIrLHA1SmlB8/Ozl6xxvvajgABAgQIECBAgACBZQgoYC0DySUECBAgQIAAAQIE1kqg2+2ekVJ6T0Sct1Z72ocAAQIEWi2QI+KzEfGZnPOnUkqfHf86/ueU0qdyzuN//tzi4uLnDh06NC5XNepj165dG7Zt23b76enpO0xPT5+9tLR0+6mpqTvknM+OiNtHxF1v+LxjRIxficsHAQIECBBYT4EPbNmy5WFlWS6u5xD2JkCAAAECBAgQIEDg6wUUsDwVBAgQIECAAAECBCZHIHW73demlJ44OSOZhAABAgRqLjB+a79xkepjEfHR8WfO+aMppY8VRfGxzZs3f7wsy+M1z7jq4+/cuXPqzne+89kbN268W0TcOaV0l5zz3XLO56aUzo2Ie0TExlUfxAYECBAgQCDidweDwc+AIECAAAECBAgQIEBgsgQUsCbrPExDgAABAgQIECDQYoFer3dRRLyoxQSiEyBAgMCpC3wyIi7LOV+WUrps/PuiKC677rrrLj906ND1p76sO5cjMC5onXvuuXdZWlq659TU1LlVVd2zKIp7RsT9bihnTS1nHdcQIECAAIHlCOScnzUcDi9ZzrWuIUCAAAECBAgQIEBgbQQUsNbG2S4ECBAgQIAAAQIEblGg2+3+QErpTyKiQEWAAAECBL6RQM75EymlS6uq+uD416IoPrS0tHTp/Pz8UWqTKVCW5ebFxcX75JzvW1XVfSPiviml8efd/Xt/Ms/MVAQIEKiBwGJVVefPzc29vwazGpEAAQIECBAgQIBAKwQUsFpxzEISIECAAAECBAhMssCePXvutHHjxg9ExDdP8pxmI0CAAIE1FRj/YHVcsvpASmn8w9UPRsSHB4PBl9Z0CputmkBZllvHxayqqu6XUjov5/yVXyNi/DaHvme3avIWJkCAQDMEcs5XFkXxnbOzs1c3I5EUBAgQIECAAAECBOot4Js59T4/0xMgQIAAAQIECNRcYNeuXRt27Njxlyml82sexfgECBAgcOoC10XEuGT1gZzzB6qq+sD27dsvLcty6dSXdGddBcqy3H7DK2Y9IOf84JTSQ254K8MNdc1kbgIECBBYHYGc85u3bt36o2VZVquzg1UJECBAgAABAgQIEFiugALWcqVcR4AAAQIECBAgQGAVBDqdzlxRFHtXYWlLEiBAgMBkCuSI+EhEvDci3jP+vOKKKz505MiR0WSOa6pJEBi/jeH111//HaPRaFzGevD4M6V074iYmoT5zECAAAEC6yeQc/6l4XD4ovWbwM4ECBAgQIAAAQIECIwFFLA8BwQIECBAgAABAgTWSaDX6/1YRPw//12+TgdgWwIECKyBQM75aErpb3PO7yqKYvzre72N4BrAt2CL8StlLSwsPGhcxvqqV8q6Zwuii0iAAAECXyswfsXMRw8Gg3eAIUCAAAECBAgQIEBg/QQUsNbP3s4ECBAgQIAAAQItFuj3++fknN8XETtazCA6AQIEmijwxZTSu3LO7yyK4p2bNm16n7cSbOIxT2amfr9/ZlVV41fIemhEnJ9SenhEnDGZ05qKAAECBFZQ4JNLS0sPPHDgwOdXcE1LESBAgAABAgQIECBwEgIKWCeB5VICBAgQIECAAAECKyEwfhuhhYWFd0fE+FUrfBAgQIBAvQW+nFL6q6qq/ryqqr/Yvn37pWVZVvWOZPqmCOzcuXPqHve4xwNTSo9IKT0y5zwuZJ3VlHxyECBAgMB/C+Sc3zIcDh8fEeO3O/ZBgAABAgQIECBAgMAaCyhgrTG47QgQIECAAAECBAh0u92XpZR2kSBAgACBWgosVVX1Tymlt1dV9fbt27e/oyzL47VMYuhWCoxfhTMiHlNV1biM9aiU0l1aCSE0AQIEminQGQwG882MJhUBAgQIECBAgACByRZQwJrs8zEdAQIECBAgQIBAwwS63e7TUkp/0LBY4hAgQKDRAjnnKyLiLSmlt4xGo3fMz88fbXRg4Vol0O1273PDK2R9b875URFxp1YBCEuAAIFmCZzIOT9iOBy+p1mxpCFAgAABAgQIECAw+QIKWJN/RiYkQIAAAQIECBBoiMC+ffvOG41Gf5dS2taQSGIQIECgqQLXR8Q7Ukpvrapq/HY+/9rUoHIRuKlAp9M5d2pq6tE558dGxKMjYgclAgQIEKiVwEdTSg+anZ29ulZTG5YAAQIECBAgQIBAzQUUsGp+gMYnQIAAAQIECBCoh8CePXu2bNiw4e9TSvf9/9m7F/g46nL/488zm6ZNqtAiIl5ALBUERVQUEeF4vCAiIApGoU1DuVgVrTZ2d2ZDUQelzc5sMGAFtFykTSlgBFQUlD8er6CACiqIKLYiCgpCodKkTbPz/F/LqQgHpbnsZS6fvF6+PB5mfs/3+/6NtW1+2UlGYlIigAACmRN4UESuFpFvVCqV6/mUq8ztP4X/jUBHR0fuxS9+8f6O41QPYx2qqvuLSA4sBBBAAIHYC1wVBMExImKxT0pABBBAAAEEEEAAAQRSIsABrJRsJDUQQAABBBBAAAEE4i3ged4XReSD8U5JOgQQQCBbAma2TlW/JiJfW7t27Q2Dg4OVbAnQFoHxCSxatGhGa2vr21T1cDN7p6ruNL4VuBoBBBBAoFECURR9rFwuL2/UPOYggAACCCCAAAIIIJB1AQ5gZf0JoD8CCCCAAAIIIIBA3QVc1z1aVa+o+yAGIIAAAgiMReDXZnaFmX29XC7fNpYbuAYBBJ4u4Pu+MzQ0VP10rCPM7HAReRVOCCCAAAKxEtgcRdGB5XL5F7FKRRgEEEAAAQQQQAABBFIqwAGslG4stRBAAAEEEEAAAQTiIeB53q4iUv0G/8x4JCIFAgggkD0BM7vDzL7S0tLyld7e3t9mT4DGCNRfYMmSJbtUKpXqJ2O9W0TeLCKt9Z/KBAQQQACBbQjcValU9uPVyjwnCCCAAAIIIIAAAgjUX4ADWPU3ZgICCCCAAAIIIIBARgWqnwwxPDx8/dZvQmZUgdoIIIBAcwSqrxcUkatVdTAIgh83JwVTEcimQD6fn57L5d5iZh2qWj2Q9exsStAaAQQQaL6Ama0Iw/CDzU9CAgQQQAABBBBAAAEE0i3AAax07y/tEEAAAQQQQAABBJooUCwWfTP7dBMjMBoBBBDImsB9URStcRxndRAEv8xaefoiEEeB7u7uttbW1reb2XtU9V18Kmgcd4lMCCCQdoFKpXJ0X1/fVWnvST8EEEAAAQQQQAABBJopwAGsZuozGwEEEEAAAQQQQCC1AoVC4WDHcb4nIrnUlqQYAgggEA+BYRH5pogMtLW1Xev7/mg8YpECAQT+r0BHR0fuxS9+8Zsdx+lS1aNEZDuUEEAAAQQaIrC+paVl36VLl97bkGkMQQABBBBAAAEEEEAggwIcwMrgplMZAQQQQAABBBBAoL4CxWJxZhRFv1TVXeo7idURQACBzApEIvJdMxuIoujKvr6+jZmVoDgCCRXwfX/a0NDQO0Xk/ap6hIi0J7QKsRFAAIGkCFzf1tZ2qO/71d9H8YUAAggggAACCCCAAAI1FuAAVo1BWQ4BBBBAAAEEEEAAAdd1r1DVo5FAAAEEEKitgKreE0XRl1X1y0EQ/Km2q7MaAgg0SyCfz0+vvp5QVTtV9e0i0tKsLMxFAAEE0iygqvlSqXRmmjvSDQEEEEAAAQQQQACBZglwAKtZ8sxFAAEEEEAAAQQQSKVAsVj8kJmdl8pylEIAAQSaI7BZRL5RfcXg2rVrrxkcHKw0JwZTEUCgEQLd3d07TJ069b1RFFVfU/jGRsxkBgIIIJAhgc1RFB1QLpdvy1BnqiKAAAIIIIAAAggg0BABDmA1hJkhCCCAAAIIIIAAAlkQ6Onp2TuKop+JSFsW+tIRAQQQqLPAnSLyJcdxVvf29j5U51ksjwACMRTwPO/lItIlInNE5EUxjEgkBBBAIIkCvxkZGXltf3//cBLDkxkBBBBAAAEEEEAAgbgKcAArrjtDLgQQQAABBBBAAIFECfi+37Jx48YbHcd5XaKCExYBBBCIl0DFzK6Noujsvr6+74qIxSseaRBAoBkCvu87jz322FtyudwCETlKRFqbkYOZCCCAQFoEVPXcUqn0kbT0oQcCCCCAAAIIIIAAAnEQ4ABWHHaBDAgggAACCCCAAAKJFygWi2eY2ZLEF6EAAggg0ByB+8xshYicH4bhfc2JwFQEEEiCQD6f36mlpWWemZ0kInslITMZEUAAgRgKVA+5HxkEwbdimI1ICCCAAAIIIIAAAggkUoADWIncNkIjgAACCCCAAAIIxEkgn8+/IZfL/UhEcnHKRRYEEEAgAQI/NLPl7e3tX/N9fzQBeYmIAAIxEigUCm9U1ZNU9f0i0h6jaERBAAEEYi9gZvfncrl9eNVz7LeKgAgggAACCCCAAAIJEeAAVkI2ipgIIIAAAggggAAC8RTI5/PTc7ncrSLy0ngmJBUCCCAQO4EREfm6mX0uDMOfxi4dgRBAIHECCxcu3G769OnHRlG0UFVfkbgCBEYAAQSaJ3BVEARHN288kxFAAAEEEEAAAQQQSI8AB7DSs5c0QQABBBBAAAEEEGiCgOu6X1LVBU0YzUgEEEAgaQIPmtlFIvKFMAz/nLTw5EUAgWQIeJ53kIh8TETeLSJTkpGalAgggEDzBFT12FKpdHnzEjAZgbQIVL/lWn27J18IIIAAAgggkFUBDmBldefpjQACCCCAAAIIIDBpAc/zDheRq0WE31dPWpMFEEAgxQK/qX7aVXt7+yW+729KcU+qIYBAjAS6u7tfOGXKlA9uPSj/vBhFIwoCCCAQN4GHqq8iXLZs2f1xC0YeBBBAAAEEEEAAAQSSJMA3ipK0W2RFAAEEEEAAAQQQiI3A4sWLd2xpafm1iOwcm1AEQQABBGIkEEXRz0Xk83/84x8vGRwcrMQoGlEQQCBDAr7vt27cuPEox3HyIrJ/hqpTFQEEEBiPwHVBELyDj+8ZDxnXIoAAAggggAACCCDwVAEOYPFEIIAAAggggAACCCAwAQHP874iIh0TuJVbEEAAgVQLmNkNqhoEQVD9hEC+EEAAgdgIPOn1hEeLSC42wQiCAAIIxEAgiqKTyuVy9XXRfCGAAAIIIIAAAggggMAEBDiANQE0bkEAAQQQQAABBBDItoDruser6sXZVqA9Aggg8BSBLWZ2WRRFYV9f3+3YIIAAAnEWKBQKL1XVj4nICao6Pc5ZyYYAAgg0UGDD6OjoK88888x7GjiTUQgggAACCCCAAAIIpEaAA1ip2UqKIIAAAggggAACCDRCYPHixS9uaWn5pYhs34h5zEAAAQRiLjAiIiunTJnSe8YZZ6yLeVbiIYAAAk8RqL5SesqUKR81s4+KyHPgQQABBLIuEEXR/5TL5bfxKsKsPwn0RwABBBBAAAEEEJiIAAewJqLGPQgggAACCCCAAAJZFVDP874tIm/PKgC9EUAAga0CI2Z2uZmdXi6X/4AKAgggkGSBfD4/PZfLnSwinxCRXZPchewIIIDAZAXM7ONhGH5+sutwPwIIIIAAAggggAACWRPgAFbWdpy+CCCAAAIIIIAAAhMWKBaLC8zsSxNegBsRQACB5AtUD15VX8H62TAM/5z8OjRAAAEE/iWwYMGCKdtvv/1xquqq6suxQQABBDIqMKSq+5ZKpbsz2p/aCCCAAAIIIIAAAghMSIADWBNi4yYEEEAAAQQQQACBrAksWbJkl9HR0dtFZLusdacvAgggICKbRWRFLpfrXbZs2f2IIIAAAikX0Hw+/+5cLvcpEXlVyrtSDwEEEPh3At8LguCtvIqQhwMBBBBAAAEEEEAAgbELcABr7FZciQACCCCAAAIIIJBhAdd1r1HVwzJMQHUEEMimQCQiV6hqsVQqrc0mAa0RQCDLAvl8/m2qusxxnNdl2YHuCCCQSYEPBUHAJ0BncuspjQACCCCAAAIIIDARAQ5gTUSNexBAAAEEEEAAAQQyJeC67gmqelGmSlMWAQSyLmAi8lUz+2QYhndlHYP+CCCAQPUgVi6XO0NEXo8GAgggkBGBDS0tLa9YunTpvRnpS00EEEAAAQQQQAABBCYlwAGsSfFxMwIIIIAAAggggEDaBVzXfYGqVl89ODPtXemHAAIIVAWiKLrazE7r6+v7FSIIIIAAAk8V8DzvsCiKPus4zn7YIIAAAmkXMLNrwjA8PO096YcAAggggAACCCCAQC0EOIBVC0XWQAABBBBAAAEEEEitgOd5V4nIu1NbkGIIIIDAVoEoim4RkUK5XP4BKAgggAACzyyw9ROx+kRkX6wQQACBNAuYWVcYhgNp7kg3BBBAAAEEEEAAAQRqIcABrFoosgYCCCCAAAIIIIBAKgU8z+sUEf6iOZW7SykEEPingKreU6lUPlUul6u/3lVfPcgXAggggMAYBHzfdzZu3HiM4zjLRGT2GG7hEgQQQCCJAg/ncrm9ly1b9rckhiczAggggAACCCCAAAKNEuAAVqOkmYMAAggggAACCCCQKIFCobCz4zjVVw8+J1HBCYsAAgiMXeDvURR9Zvr06V/yfX9k7LdxJQIIIIDAkwV8328dHh7+gJktUdXno4MAAgikTcDMvhqGYUfaetEHAQQQQAABBBBAAIFaCnAAq5aarIUAAggggAACCCCQGgHXda9Q1aNTU4giCCCAwL8ENkVRdNamTZt6ly9fvgEYBBBAAIHaCOTz+emquthxnIKIPKs2q7IKAgggEA8BMzsmDMMr45GGFAgggAACCCCAAAIIxE+AA1jx2xMSIYAAAggggAACCDRZwHXd96rqYJNjMB4BBBCoh8AVU6ZMKZxxxhnr6rE4ayKAAAIIiFQ/SVVVT1fVk0QkhwkCCCCQEoG/joyMvLy/v//hlPShBgIIIIAAAggggAACNRXgAFZNOVkMAQQQQAABBBBAIOkCCxcu3K69vf03IvLCpHchPwIIIPAkgTtFpDsIgu+gggACCCDQGIGenp6XVV/1KiK8tqsx5ExBAIH6C5wfBMGC+o9hAgIIIIAAAggggAACyRPgAFby9ozECCCAAAIIIIAAAnUU8DzvXBH5cB1HsDQCCCDQSIEHReSTa9euvWBwcLDSyMHMQgABBBD4X4FisfgWMztTRF6FSXwETET4y/H47AdJEiNQ/a/OfwVB8OPEJCYoAggggAACCCCAAAINEuDPmA2CZgwCCCCAAAIIIIBA/AXy+fwbcrlc9S+SnfinJSECCCDwjAKjZnbuyMjIp88666xHsEIAAQQQaK5AR0dHbtasWSeLyBkismNz0zAdAQQQmLiAmd3R3t7+Gt/3Rya+CncigAACCCCAAAIIIJA+AQ5gpW9PaYQAAggggAACCCAwAQHf91uGh4dv4ZMJJoDHLQggECsBM/uZ4zinlEql6q9pfCGAAAIIxEhg0aJFM1pbW4uq2i0irTGKRhQEEEBgPAJLgiBYNp4buBYBBBBAAAEEEEAAgbQLcAAr7TtMPwQQQAABBBBAAIExCbiu26Oq/AXymLS4CAEEYirwsIh8pq2tbbnv+1FMMxILAQQQQEBEXNfdU0T6VfUwQBBAAIEECmw2s33DMLwrgdmJjAACCCCAAAIIIIBAXQQ4gFUXVhZFAAEEEEAAAQQQSJJAoVDY3XGcX4tIW5JykxUBBBDYKlA9bPUlVV1SKpXWo4IAAgggkBwB13WPVtV+Edk1OalJigACCDwu8P+CIHg7FggggAACCCCAAAIIIPC/AhzA4klAAAEEEEAAAQQQyLyA53nXicghmYcAAAEEkihwq5ktCMPwZ0kMT2YEEEAAAZF8Pj9dVX3HcT4uIlMwQQABBBIkMDcIgjUJyktUBBBAAAEEEEAAAQTqJsABrLrRsjACCCCAAAIIIIBAEgQ8z+sUkYEkZCUjAggg8CSBYVUNp02btsz3/RFkEEAAAQSSL1B9LaGZnes4zluS34YGCCCQEYG/qepefAprRnabmggggAACCCCAAALPKMABLB4QBBBAAAEEEEAAgcwKdHd37zBlypQ7VXWnzCJQHAEEEiegqj9Q1QW9vb2/S1x4AiOAAAIIbEtAC4XCPMdx+kTkudu6mH+OAAIINFvAzFaEYfjBZudgPgIIIIAAAggggAACzRbgAFazd4D5CCCAAAIIIIAAAk0TcF33AlU9qWkBGIwAAgiMT+DvURQtLpfLq8Z3G1cjgAACCCRNYPHixTvmcrk+VT0+adnJiwACmROwKIoOLpfLN2SuOYURQAABBBBAAAEEEHiSAAeweBwQQAABBBBAAAEEMinged6BIvJjEeH3xJl8AiiNQOIE1jiOs6i3t/fBxCUnMAIIIIDAhAU8zztURL4oIrtNeBFuRAABBOovcNvatWtfOzg4WKn/KCYggAACCCCAAAIIIBBPAb7ZFM99IRUCCCCAAAIIIIBAHQV833c2btz4U8dxXlfHMSyNAAII1ELgb2Z2ShiGV9ZiMdZAAAEEEEiegO/77UNDQ59S1byI5JLXQcXyXQAAIABJREFUgMQIIJARgY8GQXBORrpSEwEEEEAAAQQQQACBpwlwAIuHAgEEEEAAAQQQQCBzAq7rnqKq/MVw5naewggkTmDQcZwP9/b2PpS45ARGAAEEEKi5QD6ff0Mul7tARPau+eIsiAACCExeYEMURXuWy+W/Tn4pVkAAAQQQQAABBBBAIHkCHMBK3p6RGAEEEEAAAQQQQGASAosXL96xpaXlLhHZYRLLcCsCCCBQNwEzu19VPxgEwdV1G8LCCCCAAAKJFFi4cOHU6dOnf9LMPBFpSWQJQiOAQJoFLgqC4KQ0F6QbAggggAACCCCAAAL/SYADWDwbCCCAAAIIIIAAApkS8DxvhYh8IFOlKYsAAokRMLMBx3E+XiqV1icmNEERQAABBBouUCwWX2dmK0Vkr4YPZyACCCDwnwXMzA4Mw/CnICGAAAIIIIAAAgggkDUBDmBlbcfpiwACCCCAAAIIZFigWCzuZ2Y3i4iTYQaqI4BAPAUeEZGPBEGwJp7xSIUAAgggEDcB3/enDQ0N+aqaF5Fc3PKRBwEEMivwi7Vr1+4/ODhYyawAxRFAAAEEEEAAAQQyKcABrExuO6URQAABBBBAAIHsCfi+7wwPD98oIq/PXnsaI4BAzAWuGxkZObG/v/8vMc9JPAQQQACBGAp4nnegiFQ/DWt2DOMRCQEEMiigqh8ulUpfzGB1KiOAAAIIIIAAAghkWIADWBnefKojgAACCCCAAAJZEvA8r/rawerrB/lCAAEE4iIwLCI9QRB8XkQsLqHIgQACCCCQPAHf99uHhoZ6VXWhiPB3vsnbQhIjkDaB9aOjo3uceeaZf09bMfoggAACCCCAAAIIIPCfBPjDOM8GAggggAACCCCAQOoFuru7d2htbb1LRHZMfVkKIoBAUgRudhxnXm9v7++SEpicCCCAAALxF/A870gRuVBEnhv/tCREAIGUC5wfBMGClHekHgIIIIAAAggggAACTwhwAIuHAQEEEEAAAQQQQCD1AsVi8RwzOyX1RSmIAAJJEIhUtXfatGm+7/ujSQhMRgQQQACBZAmceuqpz69UKtVXEh6SrOSkRQCBlAlEZvb6MAx/lrJe1EEAAQQQQAABBBBA4N8KcACLBwMBBBBAAAEEEEAg1QLFYvHVZnaLiORSXZRyCCCQBIG/mNm8MAy/l4SwZEQAAQQQSLSAep63WESWikhropsQHgEEEitgZjeEYXgwr9tO7BYSHAEEEEAAAQQQQGAcAhzAGgcWlyKAAAIIIIAAAggkT8DzvOtF5K3JS05iBBBImcB1URQdXy6X/5qyXtRBAAEEEIixQD6ff4XjOJeq6itiHJNoCCCQYgFVPbZUKl2e4opUQwABBBBAAAEEEEDgcQEOYPEgIIAAAggggAACCKRWIJ/PvyeXy12Z2oIUQwCBJAhsNjM3DMPl/OR/EraLjAgggED6BPL5/HTHcc5W1ZPS145GCCAQdwFVvWfz5s179ff3D8c9K/kQQAABBBBAAAEEEJiMAAewJqPHvQgggAACCCCAAAKxFfB9v3V4ePgOEZkd25AEQwCBtAvcFUXRseVy+ba0F6UfAggggED8BVzXnSci56nq9PinJSECCKRJwMxOC8Ow+kpUvhBAAAEEEEAAAQQQSK0AB7BSu7UUQwABBBBAAAEEsi3geV5eRMrZVqA9Agg0UeBrIjI/CIJHm5iB0QgggAACCDxFwHXdPVV1UET2gQYBBBBooMBjZrZnGIb3NXAmoxBAAAEEEEAAAQQQaKgAB7Aays0wBBBAAAEEEEAAgUYIdHd379Da2vp7EdmhEfOYgQACCDxJYFRVTyuVSgEqCCCAAAIIxFGgu7u7rbW19WwR+UAc85EJAQRSK3BxEAQnpLYdxRBAAAEEEEAAAQQyL8ABrMw/AgAggAACCCCAAALpEygWi+eY2Snpa0YjBBCIs4CZ3RtF0fv7+vp+EuecZEMAAQQQQKAqUCgUuhzHOU9E2hFBAAEEGiAQqeoBpVLplgbMYgQCCCCAAAIIIIAAAg0X4ABWw8lTMrD65FhKulADAQQQQAABBFIl0NPTs3cURb8UkZZUFaMMAgjEWsDMrsnlcl29vb0PxToo4RBAAAEEEHiSQD6ff2Uul7tSRHYHBgEEEKi3gJn9KAzDN/HdhXpLx3R9vq8U040hFgIIIIAAAgjUSoADWLWSZB0EEEAAAQQQQACBWAi4rnuNqh4WizCEQACBLAhEIvLpIAiW8o2kLGw3HRFAAIH0CRSLxZlRFF3C76HTt7c0QiCOAlEUva9cLg/GMRuZEEAAAQQQQAABBBCYjAAHsCajx70IIIAAAggggAACsRLwPO9QEfl2rEIRBgEE0iyw3nGczt7e3mvSXJJuCCCAAALpF/B939m0adNnzOxUEeHvjNO/5TREoJkCf2xra9vL9/1NzQzBbAQQQAABBBBAAAEEai3AH6ZrLcp6CCCAAAIIIIAAAk0R6OjoyL3kJS+5TVVf0ZQADEUAgUwJRFH025aWlvf09vb+NlPFKYsAAgggkGqBQqFwhOM4AyIyI9VFKYcAAk0VUNV8qVQ6s6khGI4AAggggAACCCCAQI0FOIBVY1CWQwABBBBAAAEEEGiOQLFY/JCZndec6UxFAIEsCZjZV9rb20/yff+xLPWmKwIIIIBANgRc191LVa8SkT2z0ZiWCCDQBIGHVXV2qVRa34TZjEQAAQQQQAABBBBAoC4CHMCqCyuLIoAAAggggAACCDRSIJ/PT8/lcneLyM6NnMssBBDInEBFRE4NgqAsIpa59hRGAAEEEMiMwMKFC7dra2u7TFUPy0xpiiKAQKMFwiAIvEYPZR4CCCCAAAIIIIAAAvUS4ABWvWRZFwEEEEAAAQQQQKBhAp7nnSYin23YQAYhgEAWBR5R1feXSqXrsliezggggAAC2ROovuJ71qxZ1UPH3dlrT2MEEGiAwKaWlpY9li5dem8DZjECAQQQQAABBBBAAIG6C3AAq+7EDEAAAQQQQAABBBCop8DixYt3bGlp+YOIbFfPOayNAAKZFviDmR0ZhuGdmVagPAIIIIBAJgVc1z1JVc8VkdZMAlAaAQTqKXBxEAQn1HMAayOAAAIIIIAAAggg0CgBDmA1Spo5CCCAAAIIIIAAAnUR8DyvX0QW1WVxFkUAAQREfuw4ztG9vb0PgoEAAggggEBWBQqFwhtV9UpV3SmrBvRGAIG6CERRFO1XLpdvq8vqLIoAAggggAACCCCAQAMFOIDVQGxGpVOg+l8iS2c1WiGAAAIIIBB7gcWLF7+4paXlLhGZGvuwBEQAgSQKnL9+/fqPrFixYksSw5MZAQQQQACBWgoUi8VZZna1iOxdy3VZCwEEsi1gZteEYXh4thVojwACCCCAAAIIIJAGAQ5gpWEX6YAAAggggAACCGRUwHXdi1X1+IzWpzYCCNRPYDSKok+Uy+Xl9RvByggggAACCCRPwPO87UXkChF5a/LSkxgBBOIqYGZvCcPwe3HNRy4EEEAAAQQQQAABBMYiwAGssShxDQIIIIAAAggggEDsBDzP20dEbhWRXOzCEQgBBJIs8I8oit5XLpe/neQSZEcAAQQQQKBeAr7vtw4PD58vIl31msG6CCCQLYEoim4pl8uv52UT2dp32iKAAAIIIIAAAmkT4ABW2naUPggggAACCCCAQEYEXNe9WlWPyEhdaiKAQGME/hJF0RHlcvm2xoxjCgIIIIAAAokVUNd1T1fVTya2AcERQCBWAqp6bKlUujxWoQiDAAIIIIAAAggggMA4BDiANQ4sLkUAAQQQQAABBBCIh4DneQeJyI/ikYYUCCCQBgEzu11VDw+C4E9p6EMHBBBAAAEEGiFQKBTmO46zQkSmNGIeMxBAINUCv29ra9vb9/3RVLekHAIIIIAAAggggEBqBTiAldqtpRgCCCCAAAIIIJBeAdd1f6yqb0xvQ5ohgECDBa4XkfcGQfBog+cyDgEEEEAAgcQL5PP5t+Vyua+KyPaJL0MBBBBoqoCZnRiG4ZebGoLhCCCAAAIIIIAAAghMUIADWBOE4zYEEEAAAQQQQACB5gi4rvsuVf16c6YzFQEE0iZgZhc+8sgjH16xYsWWtHWjDwIIIIAAAo0SKBQKr3Ic51oR2blRM5mDAALpE1DVe6ZNm7aH7/sj6WtHIwQQQAABBBBAAIG0C3AAK+07TD8EEEAAAQQQQCBdAup53i9E5FXpqkUbBBBohoCZ+WEYnt6M2cxEAAEEEEAgbQKFQmF3Vb1OVWelrRt9EECgoQIfDYLgnIZOZBgCCCCAAAIIIIAAAjUQ4ABWDRBZAgEEEEAAAQQQQKAxAsVi8Rgzq77ehC8EEEBgMgIVVf1oqVT64mQW4V4EEEAAAQQQeKpAoVDYeesnYfEDEzwcCCAwIQEzu7+9vX227/tDE1qAmxBAAAEEEEAAAQQQaJIAB7CaBM9YBBBAAAEEEEAAgXELVD/96lYR2Xfcd3IDAggg8C+B6utM5gVB8BVQEEAAAQQQQKD2AosWLZoxderUq0XkoNqvzooIIJAFATNzwzAsZ6ErHRFAAAEEEEAAAQTSI8ABrPTsJU0QQAABBBBAAIFUCxSLxfeb2WWpLkk5BBCot8BjqnpMqVS6rt6DWB8BBBBAAIEsCyxcuHBqW1vbGlU9OssOdEcAgQkLPDQ0NDRr+fLlGya8AjcigAACCCCAAAIIINBgAQ5gNRiccQgggAACCCCAAALjF/B93xkeHv61iOw9/ru5AwEEEHhc4G+qelipVKp+kh5fCCCAAAIIIFBngQULFkyZOXPmRSLSWedRLI8AAikUMDM/DMPTU1iNSggggAACCCCAAAIpFeAAVko3lloIIIAAAggggECaBDzPmyMil6SpE10QQKBxAma2znGct5dKpbsbN5VJCCCAAAIIIFD9QYqhoaHzVHUBGggggMA4BR4dGRmZ1d/f//A47+NyBBBAAAEEEEAAAQSaIsABrKawMxQBBBBAAAEEEEBgrAIdHR253Xbb7XbHcV421nu4DgEEEHiSwF1m9rYwDP+MCgIIIIAAAgg0RUA9zztTRLqbMp2hCCCQWIEoikrlcrknsQUIjgACCCCAAAIIIJApAQ5gZWq7KYsAAggggAACCCRPoFAodDmOszJ5yUmMAALNFjCzO1paWg5ZtmzZ/c3OwnwEEEAAAQSyLuB5XvVVYp/KugP9EUBg7AJmtjGKoll9fX0PjP0urkQAAQQQQAABBBBAoDkCHMBqjjtTEUAAAQQQQAABBMYgUP30q1mzZt0hInuO4XIuQQABBJ4QiKLolpaWlsN6e3sfggUBBBBAAAEE4iFQLBY9MyvFIw0pEEAgCQJ8ClYSdomMCCCAAAIIIIAAAlUBDmDxHCCAAAIIIIAAAgjEVqBQKJzoOM6FsQ1IMAQQiKVAFEXfV9V3hWH4j1gGJBQCCCCAAAIZFnBdt6CqYYYJqI4AAuMQqH4KVi6Xe0lvb++D47iNSxFAAAEEEEAAAQQQaLgAB7AaTs5ABBBAAAEEEEAAgbEILFiwYMqMGTN+q6qzxnI91yCAAAJVgSiKrp4+ffr7fN/fhAgCCCCAAAIIxFPAdd1Fqtofz3SkQgCBuAmo6tJSqXRa3HKRBwEEEEAAAQQQQACBJwtwAIvnAQEEEEAAAQQQQCCWAq7rHq+qF8cyHKEQQCCWAmb2reHh4WOWL1++OZYBCYUAAggggAACTwhwCIuHAQEExiGwQVV3K5VK68dxD5cigAACCCCAAAIIINBQAQ5gNZSbYQgggAACCCCAAAJjEfB93xkaGvqVqr58LNdzDQIIICAiV6xfv/64FStWbEEDAQQQQAABBJIh4HneJ0TkzGSkJSUCCDRTQFVPL5VKfjMzMBsBBBBAAAEEEEAAgWcS4AAWzwcCCCCAAAIIIIBA7ARc132vqg7GLhiBEEAglgJm9tVHHnlkDoevYrk9hEIAAQQQQOAZBYrF4mIz64MJAQQQ2IbAo5s3b97trLPOegQpBBBAAAEEEEAAAQTiKMABrDjuCpkQQAABBBBAAIGMC7iue4uqvjbjDNRHAIGxCQy2tbXN8X1/dGyXcxUCCCCAAAIIxE3A87y8iJTjlos8CCAQO4FPBkFwRuxSEQgBBBBAAAEEEEAAARHhABaPAQIIpEOg+quZpaMKLRBAAIGsCxQKhXc4jnNt1h2y2b/6P+b8ESWbez+x1mb2lfb29rkcvpqYH3chgAACCCAQJwHP81wRCeKUiSwIIBA7gYfNbLcwDP8Ru2QEQgABBBBAAAEEEMi8AN/dyPwjAAACCCCAAAIIIBAvAdd1f6iqB8crFWkQQCBuAmZ2+bp16+YODg5W4paNPAgggAACCCAwMYFisbjMzHomdjd3IYBAFgTM7NQwDHuz0JWOCCCAAAIIIIAAAskS4ABWsvaLtAgggAACCCCAQKoFCoXCwY7j/DDVJSmHAAK1ELhq/fr171+xYsWWWizGGggggAACCCAQH4FisXiOmZ0Sn0QkQQCBmAk82NbWtpvv+0Mxy0UcBBBAAAEEEEAAgYwLcAAr4w8A9RFAAAEEEEAAgTgJuK57raq+I06ZyIIAArETuG5oaOhdy5cv3xy7ZARCAAEEEEAAgVoIqOd5F4jIibVYjDUQQCB9Amb28TAMP5++ZjRCAAEEEEAAAQQQSLIAB7CSvHtkRwABBBBAAAEEUiRQKBRe5TjOL0SE36OmaF+pgkCNBb7b1tZ2hO/7m2q8LsshgAACCCCAQIwEOjo6crNmzbpURDpiFIsoCCAQEwEzu7e9vX227/sjMYlEDAQQQAABBBBAAAEE+OYWzwACCCCAAAIIIIBAPAQ8z/uqiBwTjzSkQACBuAmY2Y3t7e2H+r7/WNyykQcBBBBAAAEEai/g+37r0NDQ11T1sNqvzooIIJB0gSiKji+Xy6uS3oP8CCCAAAIIIIAAAukR4NMF0rOXNEEAAQQQQAABBBIr0NPT87Ioiu4QESexJQiOAAL1FPipmb09DMN/1HMIayOAAAIIIIBAvATy+fx0x3GuU9UD45WMNAgg0GwBM7sjDMN9RMSanYX5CCCAAAIIIIAAAghUBTiAxXOAAAIIIIAAAggg0HQBz/MuFJETmx6EAAggEDsBM7t9y5Ytb+rv7384duEIhAACCCCAAAJ1F/A8b3sR+YGI7Fv3YQxAAIFECZjZUWEYfiNRoQmLAAIIIIAAAgggkFoBDmCldmsphgACCCCAAAIIJEMgn8/vlMvl7hGRaclITEoEEGiUgJmtbWlpOWjZsmX3N2omcxBAAAEEEEAgfgLd3d0vbG1tvVFEdo1fOhIhgEATBW4KguCAJs5nNAIIIIAAAggggAACTwhwAIuHAQEEEEAAAQQQQKCpAsVi8QwzW9LUEAxHAIHYCZjZAyLyX2EY3hW7cARCAAEEEEAAgYYL9PT07B1F0Y9EZIeGD2cgAgjEWeBNQRD8MM4ByYYAAggggAACCCCQDQEOYGVjn2mJAAIIIIAAAgjEUsD3/fbh4eHqp1/tGMuAhKqJgPHu85o4ZmyRR1X1zaVS6daM9aYuAggggAACCDyDgOu6B6jqd0WkHSgEEECgKmBm14RheDgaCCCAAAIIIIAAAgg0W4ADWM3eAeYjgAACCCCAAAIZFvA87yMi8oUME1AdAQSeLjAcRdGh5XK5+gkXfCGAAAIIIIAAAk8R8DzvSBG5UkRaoEEAAQSqAqr6Gn54g2cBAQQQQAABBBBAoNkCHMBq9g4wHwEEEEAAAQQQyKiA7/vO8PBw9dViszNKQG0EEHi6wKjjOEf19vZeAw4CCCCAAAIIIPCfBIrF4ofM7DyEEEAAga0Ca4IgmIsGAggggAACCCCAAALNFOAAVjP1mY0AAggggAACCGRYIJ/PvyeXy1V/cp0vBBBAoCpgURSdXC6XL4IDAQQQQAABBBDYloDruiVV9bZ1Hf8cAQQyITAqIrsHQfCnTLSlJAIIIIAAAggggEAsBTiAFcttIRQCCCCAAAIIIJB+Add1b1DVA9PflIYIIDAWATP7VBiGnx3LtVyDAAIIIIAAAghU3zrmed4aETkWDQQQQCCKor5yuVxAAgEEEEAAAQQQQACBZglwAKtZ8sxFAAEEEEAAAQQyLFAsFl9nZjdnmIDqCCDwJAEzuyAMww+AggACCCCAAAIIjEegu7u7rbW19X9E5IDx3Me1CCCQSoENQ0NDuyxfvnxDKttRCgEEEEAAAQQQQCD2AhzAiv0WERABBBBAAAEEEEifgOd5XxWRY9LXjEYIIDBeATO7pr29/Sjf96uvDeELAQQQQAABBBAYl0ChUNjZcZybRGTXcd3IxQggkEaBRUEQnJ3GYnRCAAEEEEAAgacKVA+6GCgIxEyAA1gx2xDiIIAAAggggAACaRc47bTTXrJly5bfi0gu7V3phwACzyxgZj9rb29/s+/7j2GFAAIIIIAAAghMVKCnp2fvKIpuFJHtJ7oG9yGAQCoE/rh27drZg4ODlVS0oQQCCCCAAAIIIIBAogQ4gJWo7SIsAggggAACCCCQfAHP884SkY8nvwkNEEBgMgJmti6KogP6+voemMw63IsAAggggAACCFQFenp63hlF0Tf4QQ+eBwSyLWBmx4RheGW2FWiPAAIIIIAAAggg0AwBDmA1Q52ZCCCAAAIIIIBAhgSe/FHAvu8/a3h4+M/8ZHqGHgCqIvDvBTaIyEFBEPwaIAQQQAABBBBAoFYCrut+TFV5/VitQFkHgWQK/DgIgoOTGZ3UCCCAAAIIIIAAAkkW4ABWkneP7AgggAACCCCAQMIEPM/7iIh8IWGxiYsAArUVqL4O5KggCL5V22VZDQEEEEAAAQQQEHFdd7mqfhQLBBDIroDjOAf09vbelF0BmiOAAAIIIIAAAgg0Q4ADWM1QZyYCCCCAAAIIIJBRAdd1f62qr8hofWojgICImNlHwjA8FwwEEEi3wPz586eNjIw8z3GcGao6o1KpPP7vIjIzl8vNGB0dnVH9Z2ZW/f9Nr2qo6rNFpEVVHTPbfqvQNBFp+z9aj1R/Ofnn/09VR8xs49b/PCQi/xCRx0Sket2GKIoea2lp+Uf131V1veM4j46Ojt7f1tb2wIte9KIHfd+P0r0btEMgWwIdHR253Xbb7SrHcY7MVnPaIoDAPwXM7NIwDOcgggACCCCAAAIIIIBAIwU4gNVIbWYhgAACCCCAAAIZFnBd962qen2GCaiOAAIiZwdBsAgIBBBItsBxxx23Yy6X21VVX2hmL1DVF4jIi8xsZxHZRUSeLyI7JqRl9VP5HhCRB0XkviiKHnAc529mdl8ul7tndHR03ZYtW9YNDg4+mpA+xEQAARFZuHDhdm1tbTfwwx88DghkVmBLS0vL7kuXLr03swIURwABBBBAAAEEEGi4wDYPYFUveOJHChsej4EIIIAAAggggAACaRHwPO8qEXl3WvrQAwEExidgZt9at27dUYODg9XDDnwhgEDMBbq6up5jZrOjKHqpqu4hIrOr/1lVXyoi1U+tytrXQyKyrvovM1vnOM7j//eWLVvuuuyyy/6YNQz6IpAEgWKxWP116+bqJ+8lIS8ZEUCgtgJmFoRhWKztqqyGAAIIIIAAAgg8kwCna7L+fGzzAFbWgeiPAAIIIIAAAgggMHmBxYsXv7ilpeUPIpKb/GqsgAACSRMws9tF5MAwDKuvBeMLAQRiJDB37tztVHVfEdnXcZx9zeyVZlY9ZMWBhbHvU/XXtt84jvPr0dHR6r/f3traesdFF11039iX4EoEEKiHgOd5h4nIN0XEqcf6rIkAArEW+HtbW9suvu9vinVKwiGAAAIIIIAAAgikRoADWKnZSooggAACCCCAAALxFfA8LxARN74JSYYAAnUUeFhVX18qle6u4wyWRgCBMQjMmzfvJWa2bxRFjx+2qh66EpGXiAh/PzQGvwlcsl5EblfVX0VRdIuI3PLSl770t77vRxNYi1sQQGCCAq7r9qjqsgnezm0IIJBggSiKTiiXyxcnuALREUAAAQQQQAABBBIkwF+wJWiziIoAAggggAACCCRRoLu7u621tfVeEXlOEvOTGQEEJiVQfd3gkUEQXDupVbgZAQTGLbDffvtN2XPPPV/pOM5BIvJGEflvEXnuuBfihloLPCYiv1TVn5vZz3O53M9Xrlx5R62HsB4CCDxFQF3XvUxV34cLAghkTuDWIAhek7nWFEYAAQQQQAABBBBoigAHsJrCzlAEEEAAAQQQQCA7AoVC4UTHcS7MTmOaIoDAPwXMrDsMw7MQQQCB+guccMIJu1QqlQPN7MAoit6gqq8SkSn1n8yEGgj8VURujqLo+47j/GDz5s2/HBwcrB5g5QsBBGok4Pv+s4aHh28UkX1qtCTLIIBAQgQcxzmgt7f3poTEzUjM6rcmLSNdqYkAAggggAACWRLgAFaWdpuuCCCAAAIIIIBAEwQKhcLPHMfZrwmjGYkAAk0UMLOBMAy7mhiB0QikWqCjo+O506ZNe6uIHGJmbxORXVNdOFvlHhGRH0VR9L3qgazZs2ffxmsLs/UA0LY+AsVicTczq74OdMf6TGBVBBCIowB/LonjrpAJAQQQQAABBBBIpwAHsNK5r7RCAAEEEEAAAQRiIeB53oEickMswhACAQQaKXBzW1vbm3zf39TIocxCIM0C8+fPnxZF0UGVSuUQVa0euKp+wpWT5s50e0KgeiDrh2b2vSlTpnz74osv/i02CCAwMQHP8w4VkW+JSG5iK3AXAggkUGCz4zi79Pb2PpjA7ERGAAEEEEAAAQQQSJAAB7AStFlERQABBBBAAAEEkibged5KEeETcJK2ceRFYHICfxsZGdmvv7//L5NbhrsRQKCzs3NPETlSRN4uIgeJSBsqCIjIWlW9Noqib+20007f7+/vH0YFAQTGLuB5XlFEesd+B1cigEAKBJYEQbAsBT2ogAACCCCAAAIIIBAQsPfkAAAgAElEQVRjAQ5gxXhziIYAAggggAACCCRZYNGiRTOmTp1aPYDRnuQeZEcAgXEJVMzssDAM/9+47uJiBBB4QuD4449/uZl1RFF0hIjwCl+ejW0JDJvZDap6fUtLy9f5dKxtcfHPEXhcQF3XvVRV348HAghkQ8DM7m1vb5/l+/5oNhrTEgEEEEAAAQQQQKAZAhzAaoY6MxFAAAEEEEAAgQwIuK77MVU9OwNVqYgAAv8S8IIgCAFBAIGxC+y3335T9tprr/8WkXeLyFEi8sKx382VCDxN4DeqeqWqDq5atepX+CCAwL8XyOfz03O53C0ishdGCCCQDYFKpXJ0X1/fVdloS0sEEEAAAQQQQACBZghwAKsZ6sxEAAEEEEAAAQQyIOB5XvWbfvtkoCoVEUDgfwW+FgTB0SJigCCAwDMLVA9dvexlLztUVY8VkcNFZAZmCNRaQFXvEpFBDmPVWpb10iLgeV71zyo38XrXtOwoPRDYpsB3gyB42zav4gIEEEAAAQQQQAABBCYowAGsCcJxGwIIIIAAAggggMB/Fsjn82/I5XI3YoQAApkRuFtEXhsEwaOZaUxRBCYgMGfOnP1yuVyXmVVfe/W8CSzBLQhMVGCdql699TDWjye6CPchkDaBYrF4spmdn7Ze9EEAgX8rYI7jvKy3t/d3+CCAAAIIIIAAAgggUA8BDmDVQ5U1EUAAAQQQQACBjAu4rnuRqp6QcQbqI5AVgU2qemCpVLo1K4XpicB4BDo7O2dHUTTXcZxOEZk9nnu5FoF6CFQ/GcvMVlX/dckll/y5HjNYE4EkCXiet1JEupKUmawIIDBhgTAIAm/Cd3MjAggggAACCCCAAALPIMABLB4PBBBAAAEEEEAAgZoKeJ63vZn9RVWn13RhFkMAgVgKmNn8MAyr37jkCwEEtgp0dHTs0NraepyIzFXVNwCDQEwFIjO7XkRW7rTTTlf19/cPxzQnsRCoq0A+n5+ey+VuEZG96jqIxRFAoOkCZvZAe3v7Lr7vjzQ9DAEQQAABBBBAAAEEUifAAazUbSmFEEAAAQQQQACB5gq4rnuKqp7T3BRMRwCBBglcHAQBn3bXIGzGxF+g+opBx3EWiEj1067a45+YhAg8IbBBVb+uqqtWrVr1XRExbBDIkoDneS8XkZv5tTtLu07XrApEUfS+crk8mNX+9EYAAQQQQAABBBConwAHsOpny8oIIIAAAggggEAmBTzP+4WIvDqT5SmNQLYEfmdmrw3D8B/Zqk1bBJ4qMHfu3O2qB65U9YMi8kp8EEi6wNZXFH65UqlceOmll/496X3Ij8BYBQqFwomO41w41uu5DgEEEivw/4IgeHti0xMcAQQQQAABBBBAILYCHMCK7dYQDAEEEEAAAQQQSJ6A67r7q+pNyUtOYgQQGKfAJhE5IAiCX47zPi5HIDUCT/q0qzki8qzUFKMIAv8S2Cwi3zCzsy+55JIbgEEgCwKu616sqsdnoSsdEciwgKnqHqVS6e4MG1AdAQQQQAABBBBAoA4CHMCqAypLIoAAAggggAACWRVwXfd8VT05q/3pjUCGBBYEQXB+hvpSFYHHBTo6OlqnTp16rIgsFJHXwoJAVgRU9eZKpfKF9evXf+Xaa6+tHsziC4FUCuTz+em5XK76KsK9U1mQUggg8E+BZUEQLIEDAQQQQAABBBBAoE4C1ZNIVqe1Y7wsB7BivDlEQwABBBBAAAEEkiTg+/6zhoeH7+dTQJK0a2RFYEIClwVBcNyE7uQmBBIqcOKJJz57ZGTkRDNbrKq7JLQGsRGYtICqPmBmX46i6Lw1a9bcM+kFWQCBGAr09PTsHUXRLSLSHsN4REIAgRoImNn97e3tu/q+P1qD5VgCAQQQQAABBBBAAIHHBTiAxYOAAAIIIIAAAgggUBOBQqHQ5TjOyposxiIIIBBXgbuHhob2W758+Ya4BiQXArUU6Orq2jWKokUiUv10x2fXcm3WQiDhAhURuTKKomDNmjU/T3gX4iPwNAHXdU9R1XOgQQCB9ApUKpWj+/r6rkpvQ5ohgAACCCCAAAIINFqAA1iNFmceAggggAACCCCQUoFCofBdx3HektJ61EIAAZFRMzs4DMOfgoFA2gXmzJnzqlwu9wkzq75ucEra+9IPgUkK3KCqwcDAwDez+YKBSepxe1wFtFAofN1xnCPjGpBcCCAwOQEzuyYMw8Mntwp3I4AAAggggAACCCDwLwEOYPE0IIAAAggggAACCExawPO8XUVknYg4k16MBRBAIK4CnwyC4Iy4hiMXArUQOO64497S0tKyxMw4UFwLUNbImsDPqwexdt999yt834+yVp6+6RM49dRTnzc6OvorVd0pfe1ohAACIlL9NMdZQRD8CQ0EEEAAAQQQQAABBGohwAGsWiiyBgIIIIAAAgggkHEB13WXqCoHMzL+HFA/vQJmdsO6deveNDg4WP0mBV8IpE6gq6vroCiKfBF5a+rKUQiBxgusFZHPP/e5z13R398/3PjxTESgdgKFQuEdjuNcIyL8PXrtWFkJgdgImNlpYRgujU0ggiCAAAIIIIAAAggkWoA/OCZ6+wiPAAIIIIAAAgjEQ6BQKNzpOM7L4pGGFAggUGOBx1T11aVS6e4ar8tyCDRdoLOz879F5HQR+a+mhyEAAukTuN/Meh9++OEV11577eb01aNRVgRc1z1PVT+Ulb70RCBjAr8PgmBPXqGbsV2nLgII1EegeurA6rM0qyKAAAJJEeAAVlJ2ipwIIIAAAggggEBMBfL5/BtyudyNMY1HLAQQmLzAvCAIVk9+GVZAID4C1U+8qlQqn1bVt8UnFUkQSKeAmd2rqmc+9NBDX+QgVjr3OO2tfN9v37hx48/5gZO07zT9sioQRdFB5XL5hqz2pzcCCCCAAAIIIIBA7QQ4gFU7S1ZCAAEEEEAAAQQyKeB53hdF5IOZLE9pBNIvcEUQBO9Nf00aZkWgs7PzYBH5jIhUP/mKLwQQaKzAH6IoOn3Lli1reKVtY+GZNnmBQqHwGsdxfiIirZNfjRUQQCBmAucHQbAgZpmIgwACCCCAAAIIIJBAAQ5gJXDTiIwAAggggAACCMRFwPf9acPDw/eJyMy4ZCIHAgjUTOAvqrpPqVRaX7MVWQiBcQnU7v0FXV1de0RRdIaIdIwrAhcjgEA9BO4UkdLs2bNX+74f1WMAayJQDwHXdXtUdVk91mZNBBBoqsCjIyMjz+/v7x9uagqGI4AAAggggAACCCRegANYid9CCiCAAAIIIIAAAs0T8DzvfSJyefMSMBkBBOoo8M4gCK6t4/osjUDdBebNm7eTmX1aRKqfatBS94EMQACB8QjcJiI9q1ev/vZ4buJaBJol4Pu+s3Hjxu86jsOnKDZrE5iLQJ0EoiiaUy6XL63T8iyLAAIIIIAAAgggkBEBDmBlZKOpWVuB2v0cdm1zsRoCCCCAAAKNFnBd91uq+s5Gz2UeAgjUXYDXcNSdmAH1FOjo6GidOnXqh0XkdBHZvp6zWBsBBCYnYGbX53K5xatWrfrV5FbibgTqL1AsFnczs+qz+uz6T2MCAgg0UOC6IAgObeA8RiGAAAIIIIAAAgikUIADWCncVCohgAACCCCAAAKNEDj11FOfV6lU/swnijRCmxkINFTgj2b2yjAM/9HQqQxDoDYCOm/evPdGURSq6m61WZJVEECgAQKRql4yderUwgUXXPC3BsxjBAITFvA8r3rA99wJL8CNCCAQR4GopaVlt6VLl94bx3BkQgABBBBAAAEEEEiGAAewkrFPpEQAAQQQQAABBGInUCwWu83sc7ELRiAEEJiMgKnqO0ql0nWTWYR7EWiGQFdX10Fm9nkze3Uz5jMTAQRqIvCoiJyxefPmzw8ODo7UZEUWQaD2Aup53ndE5JDaL82KCCDQRIGeIAhKTZzPaAQQQAABBBBAAIGEC3AAK+EbSHwEEEAAAQQQQKBZAoVC4WbHcV7XrPnMRQCBuggsD4LgY3VZmUURqJNAR0fHDtOmTfu0mX1URJw6jWFZBBBorMCfROSTq1evHhARa+xopiGwbYGtryL8tYg8a9tXcwUCCCRE4HdBEOyZkKzERAABBBBAAAEEEIihAAewYrgpREIAAQQQQAABBOIuUCwWZ5nZ3SLC7yfjvlnkQ2DsAndXKpVX9fX1bRz7LVyJQPMEfN937r777g+KyFIRmdm8JExGAIE6CnxfVU8ZGBi4s44zWBqBCQl4nvdxETlrQjdzEwIIxFLAzF4fhuHNsQxHKAQQQAABBBBAAIHYC/ANs9hvEQERQAABBBBAAIH4Cbiuu0RVz4hfMhIhgMAEBaxSqby9r6/v+gnez20INFSgs7PzNY7jnBNF0QENHcwwBBBohsAWVT1PRE4dGBjgkHAzdoCZ/1agehB4aGioekjwYIgQQCA1AmcHQbAoNW0oggACCCCAAAIIINBQAQ5gNZSbYQgggAACCCCAQDoEXNf9taq+Ih1taIEAAmZ2QRiGH0ACgbgLzJ8/f0alUjndzD4iIrm45yUfAgjUVGCtiHxk9erV367pqiyGwCQEenp69oii6DYRaZvEMtyKAALxEfjr2rVrXzQ4OFiJTySSIIAAAggggAACCCRFgANYSdkpciKAAAIIIIAAAjER8DxvHxH5VUziEAMBBCYv8FdV3btUKq2f/FKsgED9BObOndupqp8TkefWbworI4BAAgQuE5FPrF69+v4EZCViBgRc1y2oapiBqlREIBMClUrlED4ZOBNbTUkEEEAAAQQQQKDmAhzAqjkpCyKAAAIIIIAAAukWKBaLy8ysJ90taYdAdgTM7JgwDK/MTmOaJk1g/vz5O4+Ojp4rIu9JWnbyIoBA3QQeFZFPb968+Qt8SkndjFl4jAJbX0X4I1U9cIy3cBkCCMRb4KIgCE6Kd0TSIYAAAggggAACCMRRgANYcdwVMiGAAAIIIIAAAjEW8Dzv9yIyO8YRiYYAAmMUMLNvhmF45Bgv5zIEGi4wd+7c41W1X0RmNnw4AxFAIAkCN6nqCQMDA3cmISwZ0yvQ09PzsiiKbhWRaeltSTMEMiOwoa2t7Xm+72/KTGOKIoAAAggggAACCNREgANYNWFkEQQQQAABBBBAIBsCruvur6o3ZaMtLRFIvcAjZvbyMAzvS31TCiZOoPqpV1u2bPmiqh6VuPAERgCBRgtUv0Hub968uY9Pw2o0PfOeLOC67qdV1UcFAQSSL1CpVI7u6+u7KvlNaIAAAggggAACCCDQSAEOYDVSm1kIIIAAAggggEDCBTzPq34KyaKE1yA+Agj8r8CHgiD4EhgIxE1g3rx5HSLyRTPbIW7ZyIMAAvEVMLOf5HK5+atWrfpdfFOSLM0Cvu9PGx4e/pWIvDTNPemGQEYEBoMgeF9GulITAQQQQAABBBBAoEYCHMCqESTLIIAAAggggAACaRfwfd8ZHh7+k4i8MO1d6YdA2gWiKLpl+vTpB/i+H6W9K/2SI9DV1fXCKIouEJF3JCc1SRFAIGYCG0WkuHr16nNExGKWjTgZEHBd9xBVvS4DVamIQNoFqp+uuHMQBI+mvSj9EEAAAQQQQAABBGonwAGs2lmyEgIIIIAAAgggkGoB13XfrKr/k+qSlEMgGwIVVX1dqVS6NRt1aZkEgTlz5hzlOM6FIvKcJOQlIwIIxF7gBhGZv3r16rtjn5SAqRPwPO9SETk2dcUohEDGBKIoOr5cLq/KWG3qIoAAAggggAACCExCgANYk8DjVgQQQAABBBBAIEsCnuedKyIfzlJnuiKQUoGzgiDoTmk3aiVMoLu7u+2BBx74nKp+KGHRiYsAAvEX+IeZLbrkkksuin9UEqZJoFAo7Ow4zp0iMiNNveiCQNYEzOzbYRgelrXe9EUAAQQQQAABBBCYuAAHsCZux50IIIAAAggggEBmBLa+fvBeEXlBZkpTFIF0Ctw3NDS01/Llyzeksx6tkiQwd+7cvVW1+ikhr0xSbrIigECyBMzsSjM7ec2aNeuTlZy0SRZwXfejqro8yR3IjgACMjo6Ovr8M8888+9YIIAAAggggAACCCAwFoHmHsCqTrexxOQaBBBAAAEEEEAAgWYKFAqFNzqO8+NmZmA2AghMXiCKoveVy+XBya/ECghMSkA7Ozs/ICL9ItI+qZW4GQEEEBibwD2O4xy3atWqn4ztcq5CYHICW3+A5UYRef3kVuJuBBBopoCqfqBUKl3QzAzMRgABBBBAAAEEEEiOQHMPYCXHiaQIIIAAAggggECmBQqFQtlxnHymESiPQPIFvhMEwTuSX4MGSRbo6Oh47rRp0y4ysyOS3IPsCCCQSIFRx3GWzpo16zO+70eJbEDoRAm4rvtaVf2piOQSFZywCCDwhACvIeRhQAABBBBAAAEEEBiPAAewxqPFtQgggAACCCCAQEYFXNf9g6rOymh9aiOQBoERM3tlGIZ3paEMHZIp0NnZebCIXC4iz09mA1IjgEBKBL5VqVTmX3rppbxSKiUbGucarusuV9WPxjkj2RBA4BkFtoyMjOzc39//ME4IIIAAAggggAACCGxLgANY2xLinyOAAAIIIIAAAhkXKBaLrzazX2ScgfoIJFrAzMphGLqJLkH4RAt0dnYuEJEviMiURBchPAIIpEXgb7lcrmvlypXXpaUQPeIpsHDhwu3a29vvFJEXxDMhqRBAYFsCZjY/DMOV27qOf44AAggggAACCCCAAAeweAYQQAABBBBAAAEEnlHA87zTReRTMCGAQGIF/jY0NLTH8uXLNyS2AcETKzBv3rzpZna+iByX2BIERwCBtApUVPWTAwMDJRGxtJakV/MFXNedp6qrmp+EBAggMBEBM/tmGIZHTuRe7kEAAQQQQAABBBDIlgAHsLK137RFAAEEEEAAAQTGLeC67u2q+vJx38gNCCAQC4Eoik4ol8sXxyIMITIlMGfOnJc6jnOFiOyTqeKURQCBpAlcvXnz5nmDg4OPJi04eRMjoJ7n/VRE9k9MYoIigMCTBTaLyPOCIOB/J3guEEAAAQQQQAABBJ5RgANYPCAIIIAAAggggAAC/1GgUChUv3n+O4gQQCCZAlEU/Xz69On7+74fJbMBqZMqMHfu3CNUdUBEZiS1A7kRQCA7Aqp6l4i8Z2BgoPqqOL4QqLmA67oHqOqNIsLfx9dclwURqL+AmXWGYXhJ/ScxAQEEEEAAAQQQQCDJAvyBL8m7R3YEEEAAAQQQQKDOAq7r9qjqsjqPYXkEEKiPQPV1Sv8VBMGP67M8qyLwbwW0s7PTFZHq/3Y4GCGAAAIJEqi+qvf41atXfy1BmYmaIAHP86qHN+YkKDJREUDgXwJXBUFwNCAIIIAAAggggAACCDyTAAeweD4QQAABBBBAAAEE/qOA53k38aoMHhAEkilgZgNhGHYlMz2pkyhwyimnPGvDhg3Vby6/K4n5yYwAAgiISPXwcjh79uxT+fRInodaCyxZsmSX0dHR34pIe63XZj0EEKi7wHBbW9tOvu8/VvdJDEAAAQQQQAABBBBIrAAHsBK7dQRHAAEEEEAAAQTqK7D1GwT38JqM+jqzOgJ1Ehg2sz3CMPxzndZnWQSeItDV1fXCKIq+ISKvgQYBBBBIuoCqfnPTpk2dg4ODjya9C/njJeB53uki8ql4pSINAgiMUeD9QRB8ZYzXchkCCCCAAAIIIIBABgU4gJXBTacyAggggAACCCAwFgHXdU9R1XPGci3XIIBA7ASWBUGwJHapCJRKgXnz5r3ezKqv7No5lQUphQACWRW4PYqiI9asWVP9gQS+EKiJQD6fn57L5aqfgvWimizIIggg0EiBy4IgOK6RA5mFAAIIIIAAAgggkCwBDmAla79IiwACCCCAAAIINEzAdd1rVPWwhg1kEAII1ErgwaGhodnLly/fUKsFWQeB/yTQ1dX13iiKVvI6JZ4RBBBIqcBfVfXIgYGBn6W0H7WaIOB5XqeIDDRhNCMRQGByAo9ufQ3hyOSW4W4EEEAAAQQQQACBtApwACutO0svBBBAAAEEEEBgEgJbfzL77yIybRLLcCsCCDRH4JQgCM5rzmimZkmgs7Pz4yLyORFxstSbrgggkDmBjap63MDAwNWZa07hegmo67o/UtU31msA6yKAQH0EKpXKIX19fdfXZ3VWRQABBBBAAAEEEEi6AAewkr6D5EcAAQQQQAABBOog4HneUSJSfZ0UXwggkCyBu9avX7/PihUrtiQrNmmTJHDYYYdNnTlz5grHcbqSlJusCCCAwCQEKiKyaPXq1V+YxBrcisATAq7rHqCqN4oIfz/Pc4FAggTM7PNhGFZ/CIEvBBBAAAEEEEAAAQSeJsAf8HgoEEAAAQQQQAABBJ4m4HneChH5ADQIIJA4gXcHQfD1xKUmcGIEOjo6tp86dWr1GXtTYkITFAEEEKiRgKqeufvuu7u+70c1WpJlMizguu7lqvq+DBNQHYEkCvwxCIKXJDE4mRFAAAEEEEAAAQTqL8ABrPobMwEBBBBAAAEEEEiagHqe92cReUHSgpMXgYwL/DAIAg7FZPwhqGf9k08++XmbN2++1sxeXc85rI0AAgjEXOCq9vb2zhUrVgzFPCfxYi7Q09OzRxRFd4hIS8yjEg8BBJ4kUKlU9u3r6/sVKAgggAACCCCAAAII/F8BDmDxTCCAAAIIIIAAAgg8RcB13deq6i2wIIBA4gTeFATBDxOXmsCJEJgzZ84sx3G+IyKzExGYkAgggEAdBczsJyMjI0cMDg4+XMcxLJ0BAT55OAObTMXUCZjZp8Iw/GzqilEIAQQQQAABBBBAYNICHMCaNCELIIAAAggggAAC6RIoFou+mX06Xa1og0C6Bczsm2EYHpnulrRrlsDxxx//8kqlUj189cJmZWAuAgggEEOB37S2th5y0UUX3RfDbERKiIDrui9Q1d+LSHtCIhMTgcwLRFF0S7lc3j/zEAAggAACCCCAAAIIPE2AA1g8FAgggAACCCCAAAJPEXBd9xZVfS0sCCCQGAFT1f1KpdKtiUlM0MQIzJs37/Vm9i0ReU5iQhMUAQQQaJzAui1bthxy+eWX/6FxI5mUNoFCoVB2HCeftl70QSDFAmZmu4Zh+OcUd6QaAggggAACCCCAwAQEOIA1ATRuQQABBBBAAAEE0ipw6qmnPr9SqfxFRPh9Ylo3mV5pFLgsCILj0liMTs0VmDt37hGqejmfytHcfWA6AgjEXuD+XC53yMqVK++IfVICxlKgWCzONLPqIb6ZsQxIKAQQ+HcCHwqC4EvQIIAAAggggAACCCDwZAG+scbzgAACCCCAAAIIIPCEQLFYPNnMzocEAQQSI1BxHOcVvb29v01MYoImQqCzs3OuiFwsIi2JCExIBBBAoIkCqvpApVI5dM2aNbc1MQajEyzguu4nVfUzCa5AdAQyJVD9hNgwDI/IVGnKIoAAAggggAACCGxTgANY2yTiAgQQQAABBBBAIDsCnuddJSLvzk5jmiKQbAEzuzAMw5OT3YL0cROYN2/esWY2wOGruO0MeRBAIOYCj4jI4atXr74x5jmJF0MB3/efNTw8fLeIPC+G8YiEAAJPFxgeGRl5Tn9//zA4CCCAAAIIIIAAAgj8U4ADWDwLCCCAAAIIIIAAAo8LLFiwYMrMmTMfEpFnQ4IAAokQ2CwiewRB8KdEpCVkIgTmzp07R1VXiUguEYEJiQACCMRLYGMulzt65cqV18UrFmmSIOC67sdU9ewkZCUjAgg8LvDOIAiuxQIBBBBAAAEEEEAAgX8KcACLZwEBBBBAAAEEEEDgcQHP8/5LRH4ABwIIJENAVc8tlUofSUZaUiZBYN68eSeZ2QoRcZKQl4wIIIBATAU2qeq7BwYGvhPTfMSKqYDv+61DQ0N3quqsmEYkFgIIPFXg7CAIFoGCAAIIIIAAAggggMA/BTiAxbOAAAIIIIAAAggg8LiA53mfFZHT4EAAgUQIjLS0tMxeunTpvYlIS8jYC3D4KvZbREAEEEiWwHClUjni0ksv/Z9kxSZtswUKhcKJjuNc2OwczEcAgTEJ/C4Igj3HdCUXIYAAAggggAACCGRCgANYmdhmSiKAAAIIIIAAAtsW8DzvJhHZf9tXcgUCCDRbwMy+GIbhh5udg/npEOjs7DxZRL7EJ1+lYz9pgQACsREYEpHDV69e/f3YJCJI7AWqr4WfMWPGXar6ktiHJSACCEgURbPL5fIfoEDg/7N353FyVPX+/z+nZrJMwEhANgUR3FjcAMGvXr0uqAiKgBjFmeoxouRKMF6QdJ2euDWKpk91MGgUFCLidPcgRhEVL+5G3JFFRQEFETWCeAUkYsYkM3V+j75X/XllySzVVXXqvPpfqj6f9/tZLTKZk24EEEAAAQQQQACBrgAHsHgfIIAAAggggAACCEitVltkrf1vEemDAwEECi+wTSn1hEajcVvhkxKw8AKVSuXk7oE+Dl8V/lEREAEE3BT4S5IkR4+NjV3pZnxS5yFQq9XeaK09L4/d7EQAgWkLvMkY86Fp38UNCCCAAAIIIIAAAqUU4ABWKR8rpRBAAAEEEEAAgekJaK1fJSKXTO8urkYAgTwErLXnx3H8H3nsZme5BP72tYMX8JezyvVcaYMAAoUT2BQEwYtGR0evKlwyAhVSYPny5fMWLFhwi4jsVciAhEIAgX8IWGsvj+P4GEgQQAABBBBAAAEEEOgKcACL9wECCCCAAAIIIICARFF0gVKq+xVUvBBAoNgC2+bMmfPEs84661fFjkm6oguEYXiciKwXkf6iZyUfAgggUAKBe5VSL2y1WleXoAsVMhCIoujNSqn3Z7CKFQggMAsBa+1fxsfHd1m7du2WWYzhVgQQQAABBBBAAIGSCHAAqyQPkhoIIIAAAggggMBsBGq12m3W2n1mM4N7EUCg9wLW2nVxHJ/c+01sKLPA0NDQEUqpL4jIvDL3pBsCCCBQMIE/icgR7Xb72oLlIsHr7fYAACAASURBVE4BBU4//fSBuXPn3ioiexQwHpEQQOCfBKy1L47j+CugIIAAAggggAACCCDAASzeAwgggAACCCCAgOcCURQ9USl1k+cM1EfABYHJJEkOaDabN7sQlozFFBgeHn5mkiTdXxDtUMyEpEIAAQRKLXCniDy73W53v16OFwIPKaC1XiEiTZgQQKDYAtbas+M47v7vlRcCCCCAAAIIIICA5wIcwPL8DUB9BBBAAAEEEECgWq0uD4LgA0gggECxBay1l8RxfGKxU5KuyAJDQ0NPDoJgg7V25yLnJBsCCCBQcoFb+/v7/+2iiy76fcl7Um+WAitWrNihr6+v+7XTu85yFLcjgEBvBW4wxhzU2xVMRwABBBBAAAEEEHBBgANYLjwlMiKAAAIIIIAAAj0UqFarnwuC4JgermA0AgikIKCUenqj0bgmhVGM8FDg1a9+9WPnzJnzLRHZ08P6VEYAAQSKJvCTLVu2/Pv69evvLVow8hRLQGu9UkTeU6xUpEEAgX8VsNbuHcfxRmQQQCAHge5vum0Oe1mJAAIIIIDAAwhwAIu3BQIIIIAAAggg4LHA0qVL5yxatOiPIrLQYwaqI+CCwJeNMUe6EJSMxRMYHh5+1OTk5LeVUo8pXjoSIYAAAn4KWGu/fNNNN73smmuu2eanAK2nIrB8+fKFCxYsuE1EFk3leq5BAIF8BJIkeW2z2RzNZztbEUAAAQQQQAABBIoiwAGsojwJciCAAAIIIIAAAjkIaK2fLSLdT0ThhQACBRaw1r4wjuOvFTgi0QoqcNJJJz1s69at3X/PP7WgEYmFAAII+Cxw8eMe97iwXq8nPiPQ/aEFtNZnisg7cEIAgUILjBpjXlvohIRDAAEEEEAAAQQQ6LkAB7B6TswCBBBAAAEEEECguAJa67eJyLuLm5BkCCCQJMkPm83m4UggMF2BxYsX982bN+8zIsLXzE4Xj+sRQACB7ARWt9vtanbr2OSawIoVK3br6+vrfgrWgGvZyYuARwK/M8bs5VFfqiKAAAIIIIAAAgg8gAAHsHhbIIAAAggggAACHgtorb8qIkd4TED1HglYEeGHjXRwrbUnxHF8aTrTmOKTQBiGHxKRZT51pisCCCDgokAQBGeMjo6+z8XsZM5GIIqiC5RSb8hmG1sQQGAmAkEQPHHVqlW/mMm93IMAAggggAACCCDgmkD3tx/d34L83xe/E3HtOZIXAQQQQAABBBBISaBer88dHx+/R0QWpDSSMQggkL7ALwcGBp7AVxOlD1v2iZVKJbLWmrL3pB8CCCBQEoFEKXViq9VaX5I+1EhZIIqiA5RSP+PvOKQMyzgE0hVYZow5L92RTEMAAQQQQAABBBBwSYADWC49LbIigAACCCCAAAIpClSr1ecEQXBliiMZhQACKQskSfLmZrO5NuWxjCu5wPDw8CuTJLlERIKSV6UeAgggUCaB8f7+/udedNFFPyxTKbqkJxBF0ReUUkenN5FJCCCQpoC19lNxHC9OcyazEEAAAQQQQAABBNwS4ACWW8+LtAgggAACCCCAQGoCURS9XSn1rtQGMggBBNIW2LR58+a9165duyntwcwrr8CSJUsOm5iY2MCnG5b3GdMMAQRKLXB7EASHj46O/q7ULSk3I4FarfYCa+3XZnQzNyGAQBYCdw0MDOzGpxdnQc0OBBBAAAEEEECgmAIcwCrmcyEVAggggAACCCDQc4Fqtfq1IAhe0PNFLEAAgRkJJEmyutlsVmd0Mzd5KVCpVPYVke9ba3fzEoDSCCCAQAkErLXfu/vuu59/xRVXbClBHSqkLKC1vlZEDk55LOMQQCAlAaXUIY1G47qUxjEGAQQQQAABBBBAwDEBDmA59sCIiwACCCCAAAIIpCFQr9fnjo+P38MnpKShyQwEeiIwOWfOnMefddZZv+rJdIaWTmDZsmU73nvvvd9XSh1UunIUQgABBDwTUEq1Wq3WsGe1qTsFAa11KCKtKVzKJQggkI9A1RizOp/VbEUAAQQQQAABBBDIW4ADWHk/AfYjgAACCCCAAAI5CGit/11EvpnDalYigMAUBKy1n4zj+NVTuJRLEOgKqDAMPykir4QDAQQQQKA0AtV2u80v8UvzONMpsnTp0jk77bTTL5VSe6czkSkIIJCmgLX2ijiOj05zJrMQQAABBBBAAAEE3BHgAJY7z4qkCCCAAAIIIIBAagJRFL1dKfWu1AYyCAEE0hb4N2PMd9MeyrxyCoRh+HYR4d/p5Xy8tEIAAX8FEqXUca1W6/P+EtD8gQS01pGIGHQQQKCQAvcNDAwsqtfrE4VMRygEEEAAAQQQQACBngpwAKunvAxHAAEEEEAAAQSKKVCtVr8WBMELipmOVAj4LZAkyQ+bzebhfivQfqoClUrlaGtt95fzwVTv4ToEEEAAAWcENllrn9npdG5wJjFBey5w2mmn7TRv3rzfisiOPV/GAgQQmLaAUurwRqPxw2nfyA0IIIAAAggggAACzgtwAMv5R0gBBBBAAAEEEEBgegL1en3u+Pj4PSKyYHp3cjUCCGQhYK1dEsfxx7PYxQ63BQYHBx8fBMFVIrKT201IjwACCCDwEAI3b9my5bD169ffixICfxeIougjSqmliCCAQPEElFJvaTQaa4qXjEQIIIAAAggggAACvRbI5gBWd4vtdRXmI4AAAggggAACCExFQGv9bBH51lSu5RoEEMhc4O6tW7futWbNmvHMN7PQKYFly5btuGnTpu+JyJOcCk5YBBBAAIFpC1hrP9vpdI7nT1inTVfaG6rV6tOCILiutAUphoDbApcZY7r/zuaFAAIIIIAAAggg4JlANgewPEOlLgIIIIAAAgggUGQBrXVNRFYVOSPZEPBVwFp7dhzHK3ztT+8pC6gwDD8hIq+a8h1ciAACCCDgtECSJG8ZGxvjE1Wcforpho+i6LtKqWemO5VpCCCQgsAfjTG7cWg2BUlGIIAAAggggAACjglwAMuxB0ZcBBBAAAEEEEBgtgLVavVzQRAcM9s53I8AAqkL2CAI9l+1atUvUp/MwFIJVCqVyFprSlWKMggggAAC2xPYZq19fqfT+c72LuSf+yEQRVFFKTXqR1taIuCWgLX2wDiOb3QrNWkRQAABBBBAAAEEZivAAazZCnI/AggggAACCCDgloDSWt8pIru6FZu0CHgh8CVjzEu8aErJGQsMDw8fniRJ92tk5854CDcigAACCLgq8HsROaTdbt/hagFypyewfPnyeQsWLPgtP9ulZ8okBNISUEr9R6PROD+tecxBAAEEEEAAAQQQcEOAA1huPCdSIoAAAggggAACqQhEUfREpdRNqQxjCAIIpC1wnDHms2kPZV55BJYsWbLTxMTEtSKyb3la0QQBBBBAYJoCGzZu3PiiDRs2TEzzPi4voUC1Wm0GQcDXV5fw2VLJeYG2MabifAsKIIAAAggggAACCExLgANY0+LiYgQQQAABBBBAwG2BarW6JAiCj7ndgvQIlFJg48DAwL71ep1fppby8aZTqlKpfMpae0I605iCAAIIIOCqgFLqrFar9XZX85M7PYFqtfrYIAi6X18dpDeVSQggkILAb4wx+6QwhxEIIIAAAggggAACDglwAMuhh0VUBBBAAAEEEEBgtgJRFF2glHrDbOdwPwIIPLiAFZEZ/KD1LmPMO3FF4MEEhoaGlimlPoQQAggggAACIpIEQXDk6OjoV9FAQGv9JRF5MRIIIFA4gX2MMb8pXCoCIYAAAggggAACCPRMYAa/F+hZFgYjgAACCCCAAAII9FhAa32DiBzQ4zWMRwCB6QnYJEke32w2fzm927jaF4FKpfIka+1VIjLgS2d6IoAAAghsV+DO+fPnP3XdunV3bvdKLii1QBRFxymlPlPqkpRDwEEBa20Yx3HHwehERgABBBBAAAEEEJihAAewZgjHbQgggAACCCCAgGsCtVptkbX2j3w9hWtPjrweCHzVGPMiD3pScQYClUplB2vtDzk8OwM8bkEAAQTKL3BFu91+qYh0P4CTl6cC9Xq9f3x8/FcispenBNRGoJAC1toPx3F8SiHDEQoBBBBAAAEEEECgJwIcwOoJK0MRQAABBBBAAIHiCWitu7+cubx4yUiEgPcCrzHGfMJ7BQAeUGBoaOhjSqkl8CCAAAIIIPBAAkmSvGVsbGwNOn4LaK3fLSJv81uB9ggUTuA6Y8whhUtFIAQQQAABBBBAAIGeCXAAq2e0DEYAAQQQQAABBIoloLV+j4isLFYq0iDgvcDdAwMDj6rX63/1XgKA+wkMDg4eGwTBZdAggAACCCDwEALblFLPabVaP0DJX4FarfY4a+0vRIQ/7/f3bUDz4glMDgwM7FSv1+8rXjQSIYAAAggggAACCPRCgB/IeqHKTAQQQAABBBBAoIAC1Wr1G0EQPK+A0YiEgM8Ca40xb/YZgO4PLFCpVHaz1v5URHbFCAEEEEAAge0I3LJw4cKDzz33XH7J7/FbRWv9LRF5tscEVEegiALPNcZcWcRgZEIAAQQQQAABBBBIX4ADWOmbMhEBBBBAAAEEECicQL1e79+8efOflFI7FC4cgRDwWCBJkoObzeaPPCag+oMIVCqVT1lrTwAIAQQQQACBqQgopS5otVpLp3It15RToFarvcFae0E529EKAWcFtDEmdjY9wRFAAAEEEEAAAQSmJcABrGlxcTECCCCAAAIIIOCmgNb6qSLCIQ83Hx+pyytwnTHmkPLWo9lMBQYHBytBEIzO9H7uQwABBBDwU0Ap9fJWq/V5P9vTevny5QsXLFhwh4gsQAMBBIohYK29NI5j/lJFMR4HKRBAAAEEEEAAgZ4LcACr58QsQAABBBAonUD3/z1t6VpRqOQCWuuTReT8ktekHgKuCZxhjHmfa6HJ21uBk0466ZHbtm273lq7c283MR0BBBBAoIQC/z1//vwnr1u37s4SdqPSFAS01h0RGZzCpVyCAAIZCFhr74jj+JEZrGIFAggggAACCCCAQAEEOIBVgIdABAQQQAABBBBAoNcCURR9RCnFV5L0Gpr5CExdINm6deuj16xZ87up38KVPgiEYfhfInKUD13piAACCCCQvoC19rOdTue49Ccz0QWBWq32Ymvtl1zISkYEfBHo7+9/9Hve857f+tKXnggggAACCCCAgM8CHMDy+enTHQEEEEAAAQS8EdBaXysiB3tTmKIIFF/gy8aYI4sfk4RZCoRh2D0o+5Esd7ILAQQQQKB8AtbaJZ1O5+Pla0aj7QnU6/Vg8+bNtyml9t7etfxzBBDIRiBJklc1m8312WxjCwIIIIAAAggggECeAhzAylOf3QgggAACCCCAQAYC9Xp9/vj4+CYRmZPBOlYggMAUBKy1w3Ect6ZwKZd4IjA4OLhPEATXi8jDPKlMTQQQQACB3glsSpLkKWNjY7/u3QomF1WgVqu911o7UtR85ELANwFr7dlxHK/wrTd9EUAAAQQQQAABHwU4gOXjU6czAggggAACCHglMDIy8owkSb7vVWnKIlBsgc0DAwO71+v1+4odk3RZCoRh+DkROSbLnexCAAEEECivgFLqG61W6wgRseVtSbMHEhgZGXlCkiQ3iQh/9s9bBIECCFhrvxPH8bMLEIUICCCAAAIIIIAAAj0W4IewHgMzHgEEEEAAAQQQyFtAa32qiHww7xzsRwCBfwiMGWOG8EDg7wKVSmWxtfaTiCCAAAIIIJCmgFJqaavVuiDNmcxyQ0Br3f0LOM9wIy0pESi9wPjAwMDCer0+UfqmFEQAAQQQQAABBDwX4ACW528A6iOAAAIIIIBA+QWiKLpIKfXa8jelIQLOCBxtjLnCmbQE7anA0NDQQqXUDSLyqJ4uYjgCCCCAgI8Cm+bMmfOkj33sY7/1sbzPnWu12unW2vf5bEB3BAom8BRjTPfrxnkhgAACCCCAAAIIlFiAA1glfrhUQwABBBBAAAEEugJa65+JyIFoIIBAIQTuGhgY2IO//VyIZ1GIEGEYfkhElhUiDCEQQAABBMoo8F/tdvulZSxGpwcXiKJoL6XUr0UkwAkBBPIXSJLkdc1m86L8k5AAAQQQQAABBBBAoJcCHMDqpS6zEUAAAQQQQACBnAXq9fqO4+PjfxKRvpyjsB4BBP5X4AJjzFIwEOgKLFmy5LCJiYnv8e9o3g8IIIAAAj0WCNvtdqfHOxhfMIEoir6tlPq3gsUiDgJeClhrPxDH8X96WZ7SCCCAAAIIIICARwIcwPLoYVMVAQQQQAABBPwTqFarzw2CYIN/zWmMQDEFrLUvjuP4K8VMR6osBZ73vOf177333ldZaw/Oci+7EEAAAQS8FLhr/vz5B61bt+5OL9t7Wlpr3T3scY6n9amNQNEEvm2MeU7RQpEHAQQQQAABBBBAIF0BDmCl68k0BBBAAAEEEECgUAK1Wu0Ma+3qQoUiDAL+CvxxYGBgT75+0N83wD83D8OwKiIxGggggAACCGQk8Ml2u/3qjHaxpgACK1eu3HNycnIjX0NYgIdBBARE7hsYGHh4vV5PwEAAAQQQQAABBBAorwAHsMr7bGmGAAIIIIAAAgiI1rr7VSODUCCAQCEE+PrBQjyG/EMMDg7uEwTBz0Rkh/zTkAABBBBAwCOBo9rt9hc96ut91SiKrlRK8ak73r8TACiCQBAEB6xateqmImQhAwIIIIAAAggggEBvBDiA1RtXpiKAAAIIIIAAAoUQ0FrfICIHFCIMIRDwXGBycvJFq1ev/qrnDNQXkTAMPykii8FAAAEEEEAgY4Ff7rrrrk9es2bNeMZ7WZeTQLVaXR4EwQdyWs9aBBD4JwFrbRjHcfcvyfFCAAEEEEAAAQQQKKkAB7BK+mCphQACCCCAAAIInH766QNz587dJCL9aCCAQO4CfP1g7o+gGAHCMHyWiHxbRPh5vBiPhBQIIICAbwLvbrfb7/CttK99q9XqHkEQdL+GsM9XA3ojUBQBa+3ZcRyvKEoeciCAAAIIIIAAAgikL8Af+KZvykQEEEAAAQQQQKAQArVa7VBr7dWFCEMIBBDg6wd5D0i9Xg9uvvnm7yulDoMDAQQQQACBnAS2KqWe1mq1bsxpP2szFqjVahustc/NeC3rEEDg/gLfMMa8ABgEEEAAAQQQQACB8gpwAKu8z5ZmCCCAAAIIIOC5QBRFr1dKrfOcgfoIFEXgaGPMFUUJQ458BMIwfJ2IXJjPdrYigAACCCDwD4Fvttvt54uIxaT8AlEULVNKfaj8TWmIQOEF7jXGLOLfvYV/TgREAAEEEEAAAQRmLMABrBnTcSMCCCCAAAIIIFBsgSiK3q+UenOxU5IOAS8E7hsYGNi1Xq//1Yu2lHxAgWXLlu24adOmX4jInhAhgAACCCBQAIGw3W53CpCDCD0WiKLokUqp7tcQ8ruAHlszHoHtCSilHttoNG7d3nX8cwQQQAABBBBAAAE3Bfihy83nRmoEEEAAAQQQQGC7Alrrb4rIv2/3Qi5AAIGeClhrPxXH8eKeLmF44QWGhobeq5QaKXxQAiKAAAII+CJwp7X2CZ1OZ5MvhX3uGUXRD5VST/fZgO4IFETgOGPMZwuShRgIIIAAAggggAACKQtwACtlUMYhgAACCCCAAAIFEVBa67tEpPvx9rwQQCBfgYoxpp1vBLbnKVCpVPa11t4gIvPzzMFuBBBAAAEE/llAKdVotVocDvbgbVGtVt8RBMGZHlSlIgJFF3i7MeasoockHwIIIIAAAggggMDMBDiANTM37kIAAQQQQAABBAotcMYZZ+zT399/W6FDEg4BPwQmgyDYfdWqVd0Dkbw8FQjD8JMiwqegefr8qY0AAggUWGDLtm3bDrrkkkt+WeCMREtBoFarHWytvTaFUYxAAIFZCFhrL4nj+MRZjOBWBBBAAAEEEEAAgQILcACrwA+HaAgggAACCCCAwEwFoih6uVKKj7WfKSD3IZCewDeMMS9IbxyTXBMYHBw8NAiCH4oIP3+79vDIiwACCHggkCTJZWNjY8d7UNX3it1PSP6NiOzlOwT9EchTwFr7sziOn5RnBnYjgAACCCCAAAII9E6APwDunS2TEUAAAQQQQACB3ASiKHq7UupduQVgMQII/F3gNGPM++HwV2BoaOhLSqkX+ytAcwQQQACBogv09fUd+fGPf/zLRc9JvtkJRFF0nlLqjbObwt0IIDBLgYnNmzfvuHbt2i2znMPtCCCAAAIIIIAAAgUU4ABWAR8KkRBAAAEEEEAAgdkKaK35uqvZInI/AikIJEnyuGazydf6pGDp4ogwDJ8jIle6mJ3MCCCAAAJeCdywcePGp27YsGHCq9aelR0ZGTk6SZIveFabuggUUeBpxpgfFzEYmRBAAAEEEEAAAQRmJ8ABrNn5cTcCCCCAAAIIIFBIAa31z0XkCYUMRygE/BH4hTHmif7Upem/CoRh+B0ReRYyCCCAAAIIFF3AWntqp9M5t+g5yTdzgXq9Pn/z5s1/VErtMPMp3IkAArMVsNaGcRx3ZjuH+xFAAAEEEEhHoHtcxKYziikIICAcwOJNgAACCCCAAAIIlEyg+wfr4+Pj94lIX8mqUQcB1wTOMcac7lpo8qYjMDQ09DKl1OfTmcYUBBBAAAEEei7w39bax3U6nU0938SC3AS01p8RkeNyC8BiBBCQJEkazWZzBAoEEEAAAQQQQACB8glwAKt8z5RGCCCAAAIIIOC5QLVafVoQBNd5zkB9BHIXUEod2Wg0vpx7EALkIaAqlco11tqD81jOTgQQQAABBGYiEATBmaOjo/WZ3Ms9bghUq9WTgiD4qBtpSYlAOQWstZfHcXxMOdvRCgEEEEAAAQQQ8FuAA1h+P3/aI4AAAggggEAJBarV6muCIBgrYTUqIeCMgLX2LwsWLHhEvV7/qzOhCZqaQKVSOdFae3FqAxmEAAIIIIBANgL39ff3P/6iiy76fTbr2JK1wMqVK3efnJy8Q4Rvxsjann0I/F1AKfXrRqPxGEQQQAABBBBAAAEEyifAAazyPVMaIYAAAggggIDnAlrrd4vI2zxnoD4CuQrwt5pz5c91+eLFi/vmz5//U2vt/rkGYTkCCCCAAAIzE/hgu91ePrNbucsFAa1199OSn+ZCVjIiUFIBu3nz5p3Wrl3LV76W9AFTCwEEEEAAAQT8FeAAlr/PnuYIIIAAAgggUFIBrfWnROSEktajFgKuCCwzxpznSlhypicQhuGwiHw8vYlMQgABBBBAIFOBrdu2bTvwkksu+WWmW1mWmUAURauVUmdktpBFCCBwPwGl1OGNRuOH0CCAAAIIIIAAAgiUS4ADWOV6nrRBAAEEEEAAAQREa32DiBwABQII5CeglHpso9G4Nb8EbM5JQA0NDV2vlDoop/2sRQABBBBAIA2BT7Tb7dekMYgZxROoVqsvCYLgiuIlIxECXglUjDFtrxpTFgEEEEAAAQQQ8ECAA1gePGQqIoAAAggggIA/AkuXLp2zaNGiv4jIHH9a0xSBwgncaIw5sHCpCNRzgeHh4eOTJLm054tYgAACCCCAQG8FbJIkh4yNjf2ot2uYnodAvV5fMD4+freIzMtjPzsRQOB/BM4yxrwdCwQQQAABBBBAAIFyCXAAq1zPkzYIIIAAAggg4LnAyMjIgUmS/CxVBisi/FdjqqQMK73A+40xp5W+JQXvJzA0NPRdpdQzoUEAAQQQQMB1gSRJLhsbGzve9R7kf2ABrfXXReT5+CCAQD4C1tpPxXG8OJ/tbEUAAQQQQAABBBDolQC/SuuVLHMRQAABBBBAAIEcBKIoeqVSan0Oq1mJAAJ/E0iS5Jhms3k5IH4JDA8PvzBJkq/41Zq2CCCAAAIlFrBKqcNbrdbVJe7obbUoit6qlDrLWwCKI5C/wPXGmKfkH4MECCCAAAIIIIAAAmkKcAArTU1mIYAAAggggAACOQtUq9V3BEFwZs4xWI+AzwITmzdv3mXt2rWbfEbwsXulUvmatfYFPnanMwIIIIBAOQWstZ/tdDrHlbOd361GRkaekSTJ9/1WoD0CuQr89dZbb91x/fr1k7mmYDkCCCCAAAIIIIBAqgIcwEqVk2EIIIAAAggggEC+Alrri0XkxHxTsB0BfwWstd+N4/jf/BXws/nw8PDhSZL8wM/2tEYAAQQQKLNAf3//4RdddNEPy9zRx26LFy/u22+//f4gIjv72J/OCBRBQCm1b6PRuK0IWciAAAIIIIAAAgggkI4AB7DScWQKAggggAACCCBQCIFarfZjay0fY1+Ip0EITwXeZYx5p6fdva09NDR0mVLqWG8BKI4AAgggUGaBz7Xbbf4/roRPOIqiTyulXlHCalRCwBWBlxhjvuRKWHIigAACCCCAAAIIbF+AA1jbN+IKBBBAAAEEEEDACYG//S3m+0RkvhOBCYlAOQWea4y5spzVaPVAAkNDQwcqpX4qIvx8zVsEAQQQQKCMAlYpdXir1bq6jOV87qS1PkVEzvXZgO4I5CxwmjHm/TlnYD0CCCCAAAIIIIBAigL8AXGKmIxCAAEEEEAAAQTyFKjVao+x1v4qzwzsRsBnAWvtXxYsWLBzvV7f6rODb93DMPywiPyHb73piwACCCDgj4C19tJOp3OCP439aDoyMvKEJEl+7kdbWiJQSIHzjDHLCpmMUAgggAACCCCAAAIzEuAA1ozYuAkBBBBAAAEEECiewIoVK17Y19f3leIlIxECfghYa78Yx/FRfrSlZVdgyZIlO01MTGwUkR0QQQABBBBAoMQCiVLqSa1W68YSd/Symtb6DhHZw8vylEYgf4GvGWNemH8MEiCAAAIIIIAAAgikJcABrLQkmYMAAggggAACCOQsUKvV3mitPS/nGKxHwGeBqjFmtc8AvnUPw7AqIrFvvemLAAIIIOCfQBAE60ZHR0/2r3m5G2utLxWR48vdknYIFFbgN8aYfQqbjmAIIIAAAggggAAC0xbgANa0ybgBAQQQQAABVYc7ygAAIABJREFUBBAopkAURauVUmcUMx2pECi/gLX2sDiOry5/Uxp2BRYvXtw3b968m0VkX0QQQAABBBDwQGDL3Llz97vwwgtv96CrNxVrtdoZ1lr+AoE3T5yiBRNINm/evGDt2rVbCpaLOAgggAACCCCAAAIzFOAA1gzhuA0BBBBAAAEEECiaQLVavSwIgmOLlos8CHgicN/AwMCier0+4Ulf72sODw8fnyRJ91MjeCGAAAIIIOCFgLU27nQ62ouynpQcGRl5RpIk3/ekLjURKJyAUurxjUbjlsIFIxACCCCAAAIIIIDAjAQ4gDUjNm5CAAEEEEAAAQSKJxBF0U+VUgcVLxmJECi/gLX2i3EcH1X+pjT8u0ClUvm6tfb5iCCAAAIIIOCRwKb+/v59Lrrooj951LnUVZcuXTpn0aJF3ee5oNRFKYdAQQWUUkc2Go0vFzQesRBAAAEEEEAAAQSmKcABrGmCcTkCCCCAAAIIIFBEgXq9HoyPj98nIgNFzEcmBMouYK1dGcfxqrL3pN//ClQqlSdZa6/HAwEEEEAAAd8ElFK61WrFvvUuc99qtfqNIAieV+aOdEOgqAJKqVMajcaHi5qPXAgggAACCCCAAALTE+AA1vS8uBoBBBBAAAEEECikgNb60SLy60KGIxQCHggkSfLsZrP5HQ+qUvF/D2Cdb609GQwEEEAAAQQ8FPjNxo0bH7thwwa+drkkD19r/W4ReVtJ6lADAdcEYmMMX+3q2lMjLwIIIIAAAggg8CACHMDirYEAAggggAACCJRAoFarvcBa+7USVKECAi4KjG/evHnR2rVrt7gYnszTE1i8ePHD582bdztf1TM9N65GAAEEECiVwCvb7fanS9XI4zLVavUlQRBc4TEB1RHIU2C9MeZVeQZgNwIIIIAAAggggEB6AhzASs+SSQgggAACCCCAQG4CtVptqbX2I7kFYDECfgt8wxjzAr8J/GlfqVTeaK09z5/GNEUAAQQQQOB+At9st9t8ZV1J3hjLly9fuGDBgrtFpK8klaiBgDMCSZJc02w2n+5MYIIigAACCCCAAAIIPKQAB7B4gyCAAAIIIIAAAiUQ0FobEYlKUIUKCDgnoJQ6s9Fo1J0LTuAZCVQqlR9Yaw+f0c3chAACCCCAQHkEntZut39cnjp+N9Fa/0hEnuq3Au0RyEXgbmPMLrlsZikCCCCAAAIIIIBA6gIcwEqdlIEIIIAAAggggED2AlEUfVop9YrsN7MRAQSstS+M45ivAPXgrfDa1772oMnJyZ96UJWKCCCAAAIIbE/go+12+w3bu4h/7oZAFEXnKaXe6EZaUiJQLoEtW7YsOuecc/5Urla0QQABBBBAAAEE/BTgAJafz53WCCCAAAIIIFAygVqt9mNr7VNKVos6CLggMGmtXRTH8Z9dCEvG2QkMDg6eHQTBW2Y3hbsRQAABBBAohcB4EAR7j46O3lWKNp6XqNVqb7DWXuA5A/URyEUgSZJDm83mtbksZykCCCCAAAIIIIBAqgIcwEqVk2EIIIAAAggggEA+Alrre0VkYT7b2YqA1wLXG2M4/OjBW2Dx4sVz58+f/1tr7W4e1KUiAggggAACUxGI2u12cyoXck2xBWq12sHWWg6AFPsxka6kAtbaE+I4vrSk9aiFAAIIIIAAAgh4JcABLK8eN2URQAABBBBAoIwCtVptkbX27jJ2oxMCRRew1p4fx/F/FD0n+WYvUKlUXmGt/fTsJzEBAQQQQACB0gj8ot1u7y8itjSNPC2ydOnSOYsWLdokIvM9JaA2ArkJWGv/M47jD+QWgMUIIIAAAggggAACqQlwACs1SgYhgAACCCCAAAL5CFSr1acFQXBdPtvZioDfAkmSvL7ZbF7ot4If7cMwvFxEXupHW1oigAACCCAwNYEkSZ47NjZ25dSu5qoiC1Sr1auCIDisyBnJhkAZBay1zTiOozJ2oxMCCCCAAAIIIOCbAAewfHvi9EUAAQQQQACB0glorY8VkctKV4xCCDggEATBQatWrbrBgahEnIXAkiVL9piYmPitiPTPYgy3IoAAAgggUDoBpVSr1WoNl66Yh4W01ueKyCkeVqcyArkKWGsvjuN4MNcQLEcAAQQQQAABBBBIRYADWKkwMgQBBBBAAAEEEMhPIIqiNyul3p9fAjYj4K3AvQMDAzvX6/XEWwFPiodhuEJEmp7UpSYCCCCAAALTERhPkuRRY2Nj90znJq4tnkAURa9XSq0rXjISIVBuAWvtt+I4/vdyt6QdAggggAACCCDghwAHsPx4zrREAAEEEEAAgRILaK3PFpG3lLgi1RAoqsCXjTFHFjUcudITCMPwahE5NL2JTEIAAQQQQKA8AtbaN3U6nQ+Vp5GfTfhqez+fO60LIXCbMWbfQiQhBAIIIIAAAggggMCsBDiANSs+bkYAAQQQQAABBPIX0Fp/SkROyD8JCRDwTuBdxph3etfas8KDg4P7BUFwi4jw87Nnz566CCCAAAJTFvhJu91+6pSv5sJCCixdunTOokWLNonI/EIGJBQC5RXYNjAwMJ9PVi7vA6YZAggggAACCPgjwB8g+/OsaYoAAggggAACJRWoVqtXBUFwWEnrUQuBwgokSXJMs9m8vLABCZaKQBiGK0XkPakMYwgCCCCAAAIlFZiYmDjkE5/4xHUlredNLa31D0TkcG8KUxSBgggkSbJns9n8fUHiEAOBfxHo/irZooIAAggggAACUxDgANYUkLgEAQQQQAABBBAosoDW+g8ismuRM5INgTIK9PX1PfK9733vHWXsRqf/XyAMw5+IyJMxQQABBBBA4CEFPP/dpFLq7FartYJ3idsCWutzReQUt1uQHgH3BKy1h8Vx3P3ac14IIIAAAggggAACDgtwAMvhh0d0BBBAAAEEEECgXq8vGB8fv4+vxuK9gEC2AtbaO+I4fmS2W9mWtcCSJUv2n5iYuDHrvexDAAEEEEDAQYHbt2zZ8uj169dPOpidyH8TqNVqS621HwEEAQSyFbDWHh/H8WXZbmUbAggggAACCCCAQNoCHMBKW5R5CCCAAAIIIIBAhgIjIyP7J0nC4YAMzVmFQFfAWnt5HMfHoFFugeHh4XqSJO8sd0vaIYAAAgggkI7A5OTkERdffPHX05nGlDwEtNbPFpFv5bGbnQj4LJAkyZubzeZanw3ojgACCCCAAAIIlEGAA1hleIp0QAABBBBAAAFvBbTWR4rIF70FoDgC+Qm8yxjDwZz8/DPZHIbhz0TkwEyWsQQBBBBAAAHHBZRSF7Zardc7XsPr+KeddtpO8+bNu8drBMojkIOAtdbEcVzLYTUrEUAAAQQQQAABBFIU4ABWipiMQgABBBBAAAEEshbQWp8sIudnvZd9CCAgxxljPotDeQXCMHyqiPyovA1phgACCCCAQOoCm3bdddc91qxZM576ZAZmJqC13igij8psIYsQQKD7Ccsfj+N4CRQIIIAAAggggAACbgtwAMvt50d6BBBAAAEEEPBcoFar1a21fAqP5+8D6mcvYK3dO47j7i+neJVUgK8fLOmDpRYCCCCAQK8FXtlutz/d6yXM752A1vpLIvLi3m1gMgII/KuAtfaKOI6PRgYBBBBAAAEEEEDAbQEOYLn9/EiPAAIIIIAAAp4LaK27n37V/RQsXgggkJGAtfYPcRzvntE61uQkEIbhNSJySE7rWYsAAggggICrAp9st9uvdjU8uUW01u8TkdOxQACBTAWuNcYcmulGliGAAAIIIIAAAgikLsABrNRJGYgAAggggAACCGQnEEXR55VSL8tuI5sQQMBa+8U4jo9CorwCJ5100iO3bt3a/YQzfmYu72OmGQIIIIBAbwTu23XXXXfjawh7g5vF1CiKXq+UWpfFLnYggMA/BDYaY/bGAwEEEEAAAQQQQMBtAf4w2e3nR3oEEEAAAQQQ8FxAa32tiBzsOQP1EchUwFpr4jiuZbo0q2XdnxBtVsuKuycMw6Ui8pHiJiQZAggggAAChRY4tt1uf67QCQn3oAJRFP0/pdT3IEIAgUwFthpj5vPTWKbmLEMAAQQQQAABBFIX4ABW6qQMRAABBBBAAAEEshPQWt8hIntkt5FNCCAgIhVjTBuJ8gqEYfhZEXl5eRvSDAEEEEAAgd4JWGsv6nQ6r+vdBib3UiCKoocppe7lk0B7qcxsBO4voJTaudFo3IMNAggggAACCCCAgLsCHMBy99mRHAEEEEAAAQQ8F6jX6/3j4+N/FZE+zymoj0CmAkmSHNxsNn+U6VKWZSawZMmS+RMTE38UkR0yW8oiBBBAAAEEyiVw18aNG/fYsGHDRLlq+dNGa/1rEXm0P41pikD+AkEQHLBq1aqb8k9CAgQQQAABBBBAAIGZCnAAa6Zy3IcAAggggAACCOQsEEXRXkqp3+Ycg/UI+CYwMTAw8LB6vd49/MirhAKVSuVoa+0XSliNSggggAACCGQmYK19YafT+VpmC1mUqkAURf+llDoq1aEMQwCB7Qk81xhz5fYu4p8jgAACCCCAAAIIFFeAA1jFfTYkQwABBBBAAAEEHlKgVqsdZq29CiYEEMhOIEmSm5rN5gHZbWRT1gJhGH5IRJZlvZd9CCCAAAIIlElAKfWhVqv1pjJ18qmL1vp9InK6T53pikDeAkmSvKrZbK7POwf7EUAAAQQQQAABBGYuwAGsmdtxJwIIIIAAAgggkKuA1vpYEbks1xAsR8A/gfXGmFf5V9ufxkNDQ79SSj3Gn8Y0RQABBBBAIH0Ba+1vO50OX2GXPm0mE7XWp4rIBzNZxhIEEPi7wJuMMd2/DMILAQQQQAABBBBAwFEBDmA5+uCIjQACCCCAAAII1Gq1N1prz0MCAQSyE7DW1uM4PjO7jWzKUmBoaOhApdTPstzJLgQQQAABBMoqYK09qNPp3FDWfmXupbU+UkS+WOaOdEOgaALW2nfHcfyOouUiDwIIIIAAAggggMDUBTiANXUrrkQAAQQQQAABBAolEEXRu5RSby9UKMIgUHIBa+0JcRxfWvKa3tYbGhparpT6gLcAFEcAAQQQQCBFgSAIzhgdHe1+lR0vxwRqtdrjrLU3OxabuAg4LaCUOrfRaHQ/fY4XAggggAACCCCAgKMCHMBy9MERGwEEEEAAAQQQiKLoAqXUG5BAAIHsBKy1+8dx/PPsNrIpS4EwDLuH647Pcie7EEAAAQQQKLHAV9rt9otL3K+01ZYuXTpn0aJFm0Wkv7QlKYZAwQSstRfHcTxYsFjEQQABBBBAAAEEEJiGAAewpoHFpQgggAACCCCAQJEEoij6glLq6CJlIgsCeQhYEcnoB5tt99xzzw7nn3/+tjx6srO3AvV6Pbjlllv+ICK79HYT0xFAAAEEEPBGYMvChQsfce65597nTeMSFY2i6JdKqf1KVIkqCBRd4EvGmJcUPST5EEAAAQQQQAABBB5cIKPfU/AIEEAAAQQQQAABBNIWqFarVwVBcFjac5mHAAIPKvBzY8z++JRTIAzDQ0TkmnK2oxUCCCCAAAL5CFhrj+l0Opfns52tsxHQWn9ZRF40mxnciwAC0xK4yhjzjGndwcUIIIAAAggggAAChRLgAFahHgdhEEAAAQQQQACBqQtEUXSrUmrfqd/BlQggMBsBpdTnGo3GsbOZwb3FFRgaGjpDKbW6uAlJhgACCCCAgJMC57bb7VOdTO556CiKzlNKvdFzBuojkKXAzcaYJ2S5kF0IIIAAAggggAAC6QpwACtdT6YhgAACCCCAAAKZCWitN4nIwzJbyCIEPBdIkmR1s9mses5Q2vphGH5BRPha19I+YYohgAACCOQhoJT6eavV4hNE88Cf5U6t9QoRac5yDLcjgMDUBe4yxjxi6pdzJQIIIIAAAggggEDRBDiAVbQnQh4EEEAAAQQQQGAKAvV6fe74+PhfRYT/npuCF5cgkIaAUurkRqOxLo1ZzCiWwPOe97z+vfba6y4RWVisZKRBAAEEEEDAfYG5c+c+6sILL7zd/SZ+NYii6Dil1Gf8ak1bBHIVmDTGzBERm2sKliOAAAIIIIAAAgjMWIBf2M2YjhsRQAABBBBAAIH8BFauXLnn5OQkv8TI7xGw2U+B5xpjrvSzerlbh2H4LBH5Trlb0g4BBBBAAIF8BIIgOHF0dPSSfLazdaYCWusni8hPZno/9yGAwPQFNm/e/PC1a9d2P+2cFwIIIIAAAggggICDAhzAcvChERkBBBBAAAEEEFixYsWT+vr6rkcCAQSyE0iSZM9ms/n77DayKSuBSqUyYq19b1b72IMAAggggIBPAtbaD3c6nVN86lyGrvV6fcfx8fE/l6ELHRBwRUAptW+j0bjNlbzkRAABBBBAAAEEEPi/AhzA4h2BAAIIIIAAAgg4KFCtVp8bBMEGB6MTGQFXBe41xuzkanhyP7RApVL5vLX2ZTghgAACCCCAQE8Ebmy32wf2ZDJDeyqgtf6TiDy8p0sYjgAC/xBQSh3SaDSugwQBBBBAAAEEEEDATQEOYLn53EiNAAIIIIAAAp4LRFH0SqXUes8ZqI9AlgLXGmMOzXIhu7ITCMOw+8lmu2e3kU0IIIAAAgh4JWDnz5+/57p16+70qnUJykZR9FOl1EElqEIFBJwQUEod0Wg0vu5EWEIigAACCCCAAAII3E+AA1i8KRBAAAEEEEAAAQcFarXaUmvtRxyMTmQEnBSw1l4ax/EJToYn9EMKnHjiiY/p7+//FUwIIIAAAggg0DsBpdSrWq0Wf4Gkd8Q9may1/pKIvLgnwxmKAAL3E7DWnhDH8aXQIIAAAggggAACCLgpwAEsN58bqRFAAAEEEEDAc4Eoit6qlDrLcwbqI5CZgLX27DiOV2S2kEWZCVQqlROttRdntpBFCCCAAAIIeCiglDqn1Wqd7mF1pytrrT8qIic5XYLwCDgkkCTJa5vN5qhDkYmKAAIIIIAAAggg8E8CHMDi7YAAAggggAACCDgooLV+n4jwCwwHnx2R3RRIkuTNzWZzrZvpp5G6+xOincb1Jbi0UqmssdaeVoIqVEAAAQQQQKCwAtba73U6nWcVNiDBHlBAa32miLwDHgQQyExgmTHmvMy2scgBAQ9/SHfgqRARAQQQQACBBxPgABbvDQQQQAABBBBAwEGBKIpGlVIVB6MTGQEnBZIkOabZbF7uZHhCP6TA0NDQd5VSz4QJAQQQQAABBHoq8NctW7Y8fP369Vt7uoXhqQrUarWl1tqPpDqUYQgg8KAC1toojuMmRAgggAACCCCAAAJuCnAAy83nRmoEEEAAAQQQ8FwgiqIvKKWO9pyB+ghkJjA5Ofnk1atX/zSzhSzKRODQQw+dc8ABB9wrIgOZLGQJAggggAACHgsopQ5rtVpXe0zgXHWt9UtFhL+E4NyTI7CrAkqpMxuNRt3V/ORGAAEEEEAAAQR8F+AAlu/vAPojgAACCCCAgJMCWusfiMjhToYnNAIOClhrF8Zx/GcHoxP5IQSWLFly2MTExFUgIYAAAggggEDvBay1p3Y6nXN7v4kNaQlorZ8qIj9Kax5zEEDgoQWstWfHcbwCJwQQQAABBBBAAAE3BTiA5eZzIzUCCCCAAAIIeC4QRdEvlVL7ec5AfQSyEvijMWbXrJaxJzuBoaGhU5VSH8xuI5sQQAABBBDwVyBJktGxsbHX+ivgXvORkZFdkiT5o3vJSYyAmwLW2g/HcXyKm+lJjQACCCCAAAIIIMABLN4DCCCAAAIIIICAgwJa63tEZCcHoxMZAecEkiS5ptlsPt254ATersDw8PAFSZK8YbsXcgECCCCAAAIIzFpAKXVTq9U6YNaDGJClgNJa/4Wva86SnF0+CyilOo1GI/TZgO4IIIAAAggggIDLAhzAcvnpkR0BBBBAAAEEvBSo1+v94+PjW0WE/5bz8h1A6awFlFKfazQax2a9l329F6hUKj+w1vJ1rr2nZgMCCCCAAAJdgWThwoUPP/fcc++Dwx0BPn3ZnWdF0lIIXGaMOb4UTSiBAAIIIIAAAgh4KMAv7Tx86FRGAAEEEEAAAbcFqtXqHkEQ3OF2C9Ij4I6AUurcRqNxqjuJSToVgXq9Htxyyy33isiOU7meaxBAAAEEEEBg9gJKqf/XarV+MPtJTMhKQGv9fRF5Rlb72IOA5wJfMca82HMD6iOAAAIIIIAAAs4KcADL2UdHcAQQQAABBBDwVSCKoid2v77D1/70RiAHgbcbY87KYS8reygwODi4XxAEv+zhCkYjgAACCCCAwP0FTm632+uAcUcgiqIvKKWOdicxSRFwWuD7xphnOt2A8AgggAACCCCAgMcCHMDy+OFTHQEEEEAAAQTcFKjVaodaa692Mz2pEXBPwFp7UhzHH3MvOYkfSmBwcPDYIAguQwkBBBBAAAEEshNQSn2g1Wr9Z3Yb2TRbAa31x0VkeLZzuB8BBKYkcL0x5ilTupKLEEAAAQQQQAABBAonwAGswj0SAiGAAAIIIIAAAg8tUK1WnxsEwQacEEAgGwGl1JGNRuPL2WxjS1YCg4ODbwuC4N1Z7WMPAggggAACCPyPwIZ2u/18LNwRiKJotVLqDHcSkxQBpwV+YYx5otMNCI8AAggggAACCHgswAEsjx8+1RFAAAEEEEDATQGt9UtF5HI305MaAScFnmSM+ZmTyQn9oAJhGF4iIq+CCAEEEEAAAQSyE1BK3d1qtXbJbiObZisQRdGIUuq9s53D/QggMCWB24wx+07pSi5CAAEEEEAAAQQQKJwAB7AK90gIhAACCCCAAAIIPLSA1rp7YKB7cIAXAghkILBly5ZF55xzzp8yWMWKDAXCMLxBRA7IcCWrEEAAAQQQQEBE5s6d+6gLL7zwdjDcENBanywi57uRlpQIOC9wuzHmUc63oAACCCCAAAIIIOCpAAewPH3w1EYAAQQQQAABdwWiKHqdUupCdxuQHAGnBMaNMQucSkzY7QocddRR83bZZZf7RKR/uxdzAQIIIIAAAgikKmCtfWGn0/laqkMZ1jOBKIqOU0p9pmcLGIwAAv8scJcx5hGQIIAAAggggAACCLgpwAEsN58bqRFAAAEEEEDAY4Fqtbo8CIIPeExAdQSyFOArILLUzmjX0NDQk5VSP8loHWsQQAABBBBA4J8ElFKntFqtD4PihkC1Wn1OEARXupGWlAg4L/BnY8xC51tQAAEEEEAAAQQQ8FSAA1iePnhqI4AAAggggIC7AlEUjSil3utuA5Ij4I6AtfbqOI4PcycxSaciMDw8fHySJJdO5VquQQABBBBAAIF0BZRSZ7darRXpTmVarwSiKDpAKdX96mZeCCDQe4Etxpj5vV/DBgQQQAABBBBAAIFeCHAAqxeqzEQAAQQQQAABBHooUKvVzrLWvrWHKxiNAAJ/E7DWfjGO46MAKZdAGIbdX/o2y9WKNggggAACCDgj8Ll2u32sM2k9D3rGGWc8or+//789Z6A+AlkJWGNMkNUy9iCAAAIIIIAAAgikK8ABrHQ9mYYAAggggAACCPRcQGu9RkRO6/kiFiCAgCilOo1GI4SiXAJhGJ4rIqeUqxVtEEAAAQQQcEbgxna7faAzaT0Punjx4r799ttvq4hwKMTz9wL1sxEYGBiYV6/Xu/+b44UAAggggAACCCDgmAAHsBx7YMRFAAEEEEAAAQSiKLpAKfUGJBBAIBOBc4wxp2eyiSWZCQwNDX1RKXVkZgtZhAACCCCAAAL/LLBly5YtO6xfv34SFjcEtNZ/FpEd3UhLSgTcFhgYGHhYvV6/z+0WpEcAAQQQQAABBPwU4ACWn8+d1ggggAACCCDgsIDW+mIROdHhCkRHwCWBtxtjznIpMFm3LxCG4c0i8rjtX8kVCCCAAAIIINALgYmJiX0/8YlP3NaL2cxMXyCKotuVUnumP5mJCCDwrwJbt27dZc2aNXcjgwACCCCAAAIIIOCeAAew3HtmJEYAAQQQQAABzwWiKPq8UuplnjNQH4FMBJRSpzQajQ9nsowlmQh0v0Zn3rx54yIyJ5OFLEEAAQQQQACB+wlMTk4ecfHFF38dGjcEtNY/F5EnuJGWlAi4LZAkyZ7NZvP3brcgPQIIIIAAAggg4KcAB7D8fO60RgABBBBAAAGHBbTW3V9UPN/hCkRHwBkBpdQrG43Gp50JTNDtClQqlX2ttbdu90IuQAABBBBAAIFeCry23W6P9nIBs9MTqFarVwdBcGh6E5mEAAIPJrB169a91qxZ8zuEEEAAAQQQQAABBNwT4ACWe8+MxAgggAACCCDguYDW+gcicrjnDNRHIBMBpdQRjUaDT2fIRDubJUNDQ0copb6azTa2IIAAAggggMADCSilVrZarVXouCFQrVa/EQTB89xIS0oE3Bbo7+9/9Hve857fut2C9AgggAACCCCAgJ8CHMDy87nTGgEEEEAAAQQcFtBa/0xEDnS4AtERcEbAWntYHMdXOxOYoNsVqFQqJ1trz9/uhVyAAAIIIIAAAr0UOLfdbp/aywXMTk8giqLPK6Velt5EJiGAwIMJWGv3juN4I0IIIIAAAggggAAC7glwAMu9Z0ZiBBBAAAEEEPBcQGv9axF5tOcM1EcgE4EgCJ64atWqX2SyjCWZCFQqlXdba9+WyTKWIIAAAggggMADClhrP9vpdI6Dxw2BKIrGlFKvcSMtKRFwW4BPwHL7+ZEeAQQQQAABBPwW4ACW38+f9ggggAACCCDgoIDW+i4R2dnB6ERGwDmBJEn2bDabv3cuOIEfVCAMw3Ui8nqIEEAAAQQQQCBXgWva7fbTc03A8ikLRFH0EaXU0infwIUIIDBjAQ5gzZiOGxFAAAEEEEAAgdwFOICV+yMgAAIIIIAAAgggMD0BrfVmERmY3l1cjQACMxEYGBjYoV6vd/83x6skAmEYfkFEji5JHWoggAACCCDgqsCd7XZ7D1fD+5a7Wq02gyBY4Vtv+iKQk8A+xpjf5LSbtQgggAACCCCAAAIA10q2AAAgAElEQVSzEOAA1izwuBUBBBBAAAEEEMhDQGu9TUT689jNTgQ8E5gwxszxrHPp64ZheLWIHFr6ohREAAEEEECg2ALJxo0b523YsGGi2DFJ1xWIouidSqk6GgggkIkAB7AyYWYJAggggAACCCCQvgAHsNI3ZSICCCCAAAIIINBTAa11IiL8d1xPlRmOwP8I3G2M2QWLcgmEYXi7iOxZrla0QQABBBBAwD0BpdTurVbrD+4l9y+x1votInK2f81pjED2AhMTE485++yzf539ZjYigAACCCCAAAIIzFaAX9zNVpD7EUAAAQQQQACBDAUWL17ct99++/G3xDM0Z5W/AtbaX8VxvJ+/AuVrXq/Xg1tuuWULnyJYvmdLIwQQQAAB9wSUUge2Wq0b3UvuX+IoipYppT407eaWvzo0bTNu8F6AA1jevwUAQAABBBBAAAGHBTiA5fDDIzoCCCCAAAII+CdQr9fnjo+Pdw8P8EIAgd4LXG+MeUrv17AhK4ElS5bsMTExcUdW+9iDAAIIIIAAAg8uEATBc0ZHR7+NUfEFoih6vVJqXfGTkhAB9wWUUvs2Go3b3G9CAwQQQAABBBBAwD8BDmD598xpjAACCCCAAAIOC9Tr9QXj4+N/cbgC0RFwSeAqY8wzXApM1ocWOPHEEw/u7++/FicEEEAAAQQQKITA8e12+7JCJCHEQwpUq9XhIAg+DhMCCPRegANYvTdmAwIIIIAAAggg0CsBDmD1Spa5CCCAAAIIIIBADwSWL1++cMGCBff2YDQjEUDg/gLfNsY8B5jyCAwNDR2llPqv8jSiCQIIIIAAAu4KKKXe0Gq1PupuA3+Sa61PFJGL/WlMUwTyE+AAVn72bEYAAQQQQAABBGYrwAGs2QpyPwIIIIAAAgggkKHA6aefvvPcuXPvynAlqxDwWeCrxpgX+QxQtu5hGL5ORC4sWy/6IIAAAggg4KKAUkq3Wq3Yxey+Za7VaidYaz/lW2/6IpCHwNatW/das2bN7/LYzU4EEEAAAQQQQACB2QlwAGt2ftyNAAIIIIAAAghkKrBixYrd+vr67sx0KcsQ8FTAWnt5HMfHeFq/lLUHBwdPD4LgfaUsRykEEEAAAQQcE7DWxp1ORzsW28u4WuvufxN/zsvylEYgY4HJycndV69e/YeM17IOAQQQQAABBBBAIAUBDmClgMgIBBBAAAEEEEAgK4GVK1fuOTk5eXtW+9iDgOcCnzbGvNJzg1LVHx4eridJ8s5SlaIMAggggAACjgoopT7UarXe5Gh8r2JrrY8UkS96VZqyCOQkoJTaudFo3JPTetYigAACCCCAAAIIzEKAA1izwONWBBBAAAEEEEAga4G3vvWte09MTPwm673sQ8BHAaVUp9FohD52L2vnSqWyxlp7Wln70QsBBBBAAAGXBJIk+djY2NhJLmX2NWutVnuBtfZrvvanNwJZCgwMDDysXq/fl+VOdiGAAAIIIIAAAgikI8ABrHQcmYIAAggggAACCGQi8La3vW3fbdu23ZrJMpYggMCFxpjXw1AegUql8lFrLb/oLc8jpQkCCCCAgMMC1tpLOp3OiQ5X8Ca61vrZIvItbwpTFIEcBTZv3jx/7dq1W3KMwGoEEEAAAQQQQACBGQpwAGuGcNyGAAIIIIAAAgjkIVCr1R5nrb05j93sRMBDgfOMMcs87F3aypVK5VPW2hNKW5BiCCCAAAIIuCXw+Xa7/XK3IvuZtlarHWatvcrP9rRGIFuBW2+9tX/9+vWT2W5lGwIIIIAAAggggEAaAhzASkORGQgggAACCCCAQEYCIyMj+ydJcmNG61iDgNcC1toPxnG83GuEkpUfGhr6ilLqhSWrRR0EEEAAAQScFFBKfb3Vah3hZHjPQler1acFQXCdZ7Wpi0AeAokxpi+PxexEAAEEEEAAAQQQmL0AB7Bmb8gEBBBAAAEEEEAgMwGt9UEi8tPMFrIIAb8F1hpj3uw3QbnaDw0NXaWUOqxcrWiDAAIIIICAmwJBEHx/dHT0mW6m9ys1P4f69bxpm6vAFmPM/FwTsBwBBBBAAAEEEEBgxgIcwJoxHTcigAACCCCAAALZC/A3j7M3Z6PXAu83xpzmtUDJylcqlZustU8sWS3qIIAAAggg4KrA9e12+ymuhvcp94oVK57U19d3vU+d6YpATgL3GWMeltNu1iKAAAIIIIAAAgjMUoADWLME5HYEEEAAAQQQQCBLgVqtdqi19uosd7ILAY8FzjHGnO5x/9JVD8PwDhHZo3TFKIQAAggggICbAje22+0D3YzuV2qt9ZNF5Cd+taYtArkI3GOM2TmXzSxFAAEEEEAAAQQQmLUAB7BmTcgABBBAAAEEEEAgO4Eoig5XSv0gu41sQsBrgTXGmLd4LVCy8mEY/llEdixZLeoggAACCCDgpIBS6uetVmt/J8N7FnrFihVP6evr+7FntamLQOYC1to/xHG8e+aLWYgAAggggAACCCCQigAHsFJhZAgCCCCAAAIIIJCNwIoVK57Z19f33Wy2sQUB7wXeZ4w5w3uFEgGEYbhFROaWqBJVEEAAAQQQcFngF+12m68GduAJaq2fKiI/ciAqERFwXeA3xph9XC9BfgQQQAABBBBAwFcBDmD5+uTpjQACCCCAAAJOCvAJWE4+NkI7KpAkyepms1l1ND6xH0AgDMNJEQnAQQABBBBAAIFCCNzSbrcfX4gkhHhIgWq1+rQgCK6DCQEEei5wozGGr2btOTMLEEAAAQQQQACB3ghwAKs3rkxFAAEEEEAAAQR6IlCr1Q621l7bk+EMRQCB/yNgrW3GcRzBUg6BxYsX982bN2+iHG1ogQACCCCAQCkEbm23248tRZOSl+Dn0JI/YOoVRsBae3Ucx4cVJhBBEEAAAQQQQAABBKYlwAGsaXFxMQIIIIAAAgggkK+A1vrJIvKTfFOwHQE/BKy1Z8dxvMKPtuVvedRRR83bZZdd/lr+pjREAAEEEEDADQFr7W2dTmdfN9L6nbJarR4SBME1fivQHoHeCyilvtloNJ7X+01sQAABBBBAAAEEEOiFAAeweqHKTAQQQAABBBBAoEcCIyMj+ydJcmOPxjMWAQT+ScBa+4E4jv8TlHIILFu2bMdNmzb9uRxtaIEAAggggEApBH7dbrcfU4omJS9Rq9UO7X4yT8lrUg+B3AWstVfEcXx07kEIgAACCCCAAAIIIDAjAQ5gzYiNmxBAAAEEEEAAgXwEarXa46y1N+ezna0I+CVgrf1wHMen+NW6vG0HBwcXBUFwd3kb0gwBBBBAAAHnBDiA5cgji6Lo6UqpHzoSl5gIOCtgrf1UHMeLnS1AcAQQQAABBBBAwHMBDmB5/gagPgIIzF6g+y9SO/sxTEAAAQSmJFCr1R5jrf3VlC7mIgQQmJWAtfajcRy/YVZDuLkwAosXL9513rx5fyhMIIIggAACCCDguYBS6uetVmt/zxmcqF+r1Q6z1l7lRFhCIuCwgLX243EcL3G4AtERQAABBBBAAAGvBTiA5fXjpzwCCCCAAAIIuCZw+umnP2ru3LkbXctNXgRcFLDWtuI4HnYxO5nvL3DSSSc9cuvWrb/DBgEEEEAAAQQKI3B9u91+SmHSEORBBaIoOlwp9QOIEECg5wLnGWOW9XwLCxBAAAEEEEAAAQR6IsABrJ6wMhQBBBBAAAEEEOiNwMqVK3efnJz8fW+mMxUBBP5F4BPGmNegUg6BwcHBfYIguK0cbWiBAAIzF+AzjGdux50IpC5wdbvdPiz1qQxMXUBr/WwR+VbqgxmIAAL/RyBJktXNZrMKCwIIIIAAAggggICbAhzAcvO5kRoBBBBAAAEEPBUYGRnZJUmSP3pan9oIZCpgrb00juMTMl3Ksp4JnHjiiY/p7+/nK1x7JsxgBBBAAAEEpi3wnXa73T3Yw6vgAlEUHaGU+mrBYxIPgTIIvMsY884yFKEDAggggAACCCDgowAHsHx86nRGAAEEEEAAAWcFli9fvnDBggX3OluA4Ag4JJAkyeebzebLHYpM1IcQGB4eflSSJHyFK+8SBBBAAAEECiKglPp6q9U6oiBxiPEQAlrrl4rI5SAhgEDPBbQxJu75FhYggAACCCCAAAII9ESAA1g9YWUoAggggAACCCDQG4F6vb5gfHz8L72ZzlQEEPgXga8aY16ESjkEKpXKbtbaO8vRhhYIIIAAAgiUQuCKdrt9dCmalLxEFEWvUEp9uuQ1qYdA7gLW2lPjOD439yAEQAABBBBAAAEEEJiRAAewZsTGTQgggAACCCCAQD4CS5cunbNo0aKt+WxnKwJ+CVhrvxfH8bP8al3etkuWLNlpYmLinvI2pBkCCCCAAALOCXym3W6/wrnUHgaOomhIKdX2sDqVEchUIEmSwWazeXGmS1mGwD8Eur8ytngggAACCCCAwCwEOIA1CzxuRQABBBBAAAEEchBQWuskh72sRMBHgeuNMU/xsXgZO1cqlR2stfeVsRudEEAAAQQQcFHAWntRp9N5nYvZfcscRdHrlVLrfOtNXwRyEDjaGHNFDntZiQACCCCAAAIIIJCCAAewUkBkBAIIIIAAAgggkKWA1npCRPqy3MkuBHwUsNb+Ko7j/XzsXsbOixcvnjtv3rwtZexGJwQQQAABBFwUSJLk/WNjY6e5mN23zFrrU0Xkg771pi8CWQtMTk4+a/Xq1d/Lei/7EEAAAQQQQAABBNIR4ABWOo5MQQABBBBAAAEEMhPQWv9VROZltpBFCPgr8N/GmN38rV+65ioMQz5BsHSPlUIIIIAAAq4KBEFw5ujoaN3V/D7lrtVqZ1hrV/vUma4I5CEQBMEBq1atuimP3exEAAEEEEAAAQQQmL0AB7Bmb8gEBBBAAAEEEEAgUwGt9Z9FZMdMl7IMAT8FNhtjdvCzejlbh2G4TUT6y9mOVggg4L5A94/prPs1aIDAFAWSJHnL2NjYmilezmU5CmitV4rIe3KMwGoEvBBIkmTPZrP5ey/KUhIBBBBAAAEEECihAAewSvhQqYQAAggggAAC5RbQWt8jIjuVuyXtECiEgL311lvnrF+/frIQaQgxa4EwDDeLyMCsBzEAAQQQQAABBGYtYK19fafTuXDWgxjQcwGt9Zki8o6eL2IBAp4LDAwMDNTr9e6nnvNCAAEEEEAAAQQQcFCAA1gOPjQiI4AAAggggIDfAlrr7t+G3N1vBdojkJnATsaYezPbxqKeCoRh+CcReXhPlzAcAQQQQAABBKYq8Mp2u/3pqV7MdfkJaK2NiET5JWAzAl4IbDHGzPeiKSURQAABBBBAAIGSCnAAq6QPlloIIIAAAgggUF4BrfUtIvLY8jakGQLFEbDW7h3H8cbiJCLJbATCMLxdRPaczQzuRQABBBBAAIHUBF7cbre/kto0BvVMQGv9ARFZ3rMFDEYAga7AncaYPaBAAAEEEEAAAQQQcFeAA1juPjuSI4AAAggggICnAlrrH4nIUz2tT20EshZ4mjHmx1kvZV9vBCqVyk3W2if2ZjpTEUAAAQQQQGA6AkmSHDw2Ntb92YZXwQWi6P9j797D5Kjq/I9/z5khyQQFERGUcBECiIjcBOUmiAmgiPe4MFM9RhZBwahAuk9PAK1VYPpUB6MgXoIiTNcMYlzvS7wvKoqroqIiXgBR4yKLUVxjJpnM1Pk97Y9VLoG5dXXXqXrP8/hXqr7n83mdVmemz3RVrlVKvS7jMYmHgO8Cd1hrn+V7CfIjgAACCCCAAAJFFuAAVpF3n+4IIIAAAggg4KVApVK5WSl1tJfhCY2AZwJKqRfVarWveRabuI8hEATBd0TkeQAhgAACCCCAQOcF5s2bt8uHP/zh+zqfhASTCRhjPikir5zsOv4dAQRmLuCcuyWKoqNmPoE7EUAAAQQQQAABBDotwAGsTu8A6yOAAAIIIIAAAtMUqFQqa5VSJ0/zNi5HAIEZCCRJ8tp6vb5mBrdySwYF+vr6vqiUOjGD0YiEAAIIIIBA0QQmNm/ePHfNmjUTRSvuY19jzFdE5EU+ZiczAr4IOOfWRlH0El/ykhMBBBBAAAEEEEDg0QIcwOJVgQACCCCAAAIIeCZQqVTWKKVe41ls4iLgpYBS6k21Wu2DXoYn9KMEgiD4uIgsgQYBBBBAAAEEOi5wbxzHT+94CgJMSaBSqXxPKfXcKV3MRQggMCMB59x1URQtndHN3IQAAggggAACCCCQCQEOYGViGwiBAAIIIIAAAghMXaBSqVyjlHr91O/gSgQQmKmAc+6iKIounen93JctgVKptNo594ZspSINAggggAACxRNQSv2w0WgcWrzmfjY2xvxCRPb1Mz2pEfBDwDlXj6Ko4kdaUiKAAAIIIIAAAghsTYADWLwuEEAAAQQQQAABzwSMMVeIyDLPYhMXAV8FVllrz/c1PLkfLhAEQV1EluOCAAIIdESg+Vs415GVWRSBLAqsjeOYR21lcWe2kskY8wcR2dmTuMREwEsB51wliqLmzyt8IYAAAggggAACCHgqwAEsTzeO2AgggAACCCBQXIFqtXqZc26guAI0R6CtAkPW2te1dUUWS02gt7f3Iq31u1JbgMEIIIAAAgggMCWBJEk+OjIycsaULuaijgsYYzaKSE/HgxAAgRwLOOeWRlF0XY4rUg0BBBBAAAEEEMi9AAewcr/FFEQAAQQQQACBvAlUKpUBpdRleetFHwSyKOCcuzGKolOymI1M0xfo6+tbppRqfoogXwgggAACCCDQQQHn3ODw8PCKDkZg6SkKnHXWWdvssMMOY1O8nMsQQGCGAlrrUwYHB2+c4e3chgACCCCAAAIIIJABAQ5gZWATiIAAAggggAACCExHoFKpvEUp9d7p3MO1CCAwY4EfWmsPnfHd3JgpgSAI+kWEvyrP1K4QBgEEEECgoAJnx3G8uqDdvao9MDCwY5Ikf/QqNGER8FBAKfXcWq12q4fRiYwAAggggAACCCDwoAAHsHgpIIAAAggggAACnglUKpXXK6Wu8Sw2cRHwVeA+a+0uvoYn98MFgiBofprZ53FBAAEEEEAAgc4KdHV1nXTdddd9qbMpWH0qAtVqdS/n3F1TuZZrEEBg5gLd3d27X3rppb+b+QTuRAABBBBAAAEEEOi0AAewOr0DrI8AAggggAACCExToFwuL9Faf3yat3E5AgjMTCDp6emZG4bh+Mxu564sCZx22mmHdHd3/yBLmciCAAIIIIBAEQWSJNl3ZGTkV0Xs7lvncrl8sNb6h77lJi8Cvgn09PT0hGG4ybfc5EUAAQQQQAABBBD4pwAHsHg1IIAAAggggAACngmUy+WTtdZrPYtNXAS8FRgbG1uwatWq33tbgOD/EFi6dOku4+Pj90KCAAIIIIAAAh0VSNavXz9/7dq1mzuagsWnJFCtVo93zv3nlC7mIgQQmKnA/1prt5/pzdyHAAIIIIAAAgggkA0BDmBlYx9IgQACCCCAAAIITFnAGHOMiHxzyjdwIQIIzErAOXd4FEXfn9UQbs6EQBiG+s4772y+2dudiUCEQAABBBBAoJgC6+I43q2Y1f1rbYx5rYjc4F9yEiPglcCvrLX7epWYsAgggAACCCCAAAKPEuAAFi8KBBBAAAEEEEDAMwFjzEEi8iPPYhMXAZ8FXmat/ZzPBcj+T4EgCNaJyK6YIIAAAggggEDHBG6O4/jYjq3OwtMSqFQq5yilrprWTVyMAALTEnDOfTuKoqOndRMXI4AAAggggAACCGROgANYmdsSAiGAAAIIIIAAAo8vUC6X99Za34kTAgi0R0ApdXatVlvdntVYJW2BIAi+JyLPTXsd5iOAAAIIIIDAYwrEcRyX8PFDoFKpvEMpFfqRlpQI+CngnPtEFEVL/ExPagQQQAABBBBAAIH/E+AAFq8FBBBAAAEEEEDAM4Hly5c/taur6z7PYhMXAZ8F3mmtfYfPBcj+T4EgCD4jIi/DBAEEEEAAAQQ6JvD2OI7f1bHVWXhaApVK5Uql1JundRMXI4DAdAXea61923Rv4noEEEAAAQQQQACBbAlwACtb+0EaBBBAAAEEEEBgUoGzzjprmx122GGziPC93KRaXIBASwSGrLWva8kkhnRcIAiCD4rI2R0PQgAEEEAAAQQKKqC1XjI0NPSJgtb3rnalUrlBKfVa74ITGAG/BMrW2pV+RSYtAggggAACCCCAwCMFeNOO1wQCCCCAAAIIIOChgDHmARHZ3sPoREbAR4FvWGuP8zE4mR8t0Nvb+w6tNY/R4cWBAAIIIIBAhwS6urqefd11193eoeVZdpoC5XL5q1rrE6Z5G5cjgMD0BE631n5serdwNQIIIIAAAggggEDWBDiAlbUdIQ8CCCCAAAIIIDAFAWPMr0Rk4RQu5RIEEJilgHPud1EU7T7LMdyeEYFSqfQG59zqjMQhBgIIIIAAAkUTGF+/fv0T1q5d2/xEX748EDDG/FhEDvQgKhER8FngWGvtzT4XIDsCCCCAAAIIIIAAj63hNYAAAggggAACCHgpUKlUvq2UOtLL8IRGwD+BpKenpycMwzH/opP4kQKlUukk59wXkEEAAQQQQACBjgj8Mo7j/TqyMovOSMAYc6+I7DKjm7kJAQSmJKCUekatVrtnShdzEQIIIIAAAggggEBmBfgErMxuDcEQQAABBBBAAIHHFiiXy5/VWp+KEQIItEcgSZKF9Xr9rvasxippCgRB0Pz0wOanCPKFAAIIIIAAAm0WcM59Znh4+BVtXpblZi6gjDHNTyvbZuYjuBMBBCYRcBs3buy58sor+WRAXioIIIAAAggggIDnAhzA8nwDiY8AAggggAACxRQwxnxERM4oZntaI9B+gYmJicUrV678SvtXZsVWCxx//PHdCxYs2Mgbia2WZR4CCCCAAAJTErBxHFendCUXdVygWq3u4Jz7U8eDEACBfAvcZ63lU+byvce0QwABBBBAAIGCCHAAqyAbTU0EEEAAAQQQyJeAMcaKSCVfrWiDQHYFlFJvqNVqH85uQpJNRyAIguYnYDU/CYsvBBBAAAEEEGivwOviOB5q75KsNlOBcrm8j9b6lzO9n/sQQGBKAj+w1h42pSu5CAEEEEAAAQQQQCDTAhzAyvT2EA4BBBBAAAEEENi6gDFmuYjU8UEAgfYIJElSq9frA+1ZjVXSFujr6/uCUuqktNdhPgIIIIAAAgg8XEApdWCj0fgpLn4IlMvlY7XW3/AjLSkR8FMgSZLP1ev1l/mZntQIIIAAAggggAACDxXgABavBwQQQAABBBBAwEOBcrm8VGv9UQ+jExkBLwWcc5+MoujVXoYn9KMESqXS+5xz50KDAAIIIIAAAm0V2HTHHXdsd+utt25p66osNmOBcrl8utZ6ZMYDuBEBBCYVUEq9v1ar8bPJpFJcgAACCCCAAAIIZF+AA1jZ3yMSIoAAAggggAACjxIwxpwiIp+HBgEE2ibwM2vtAW1bjYVSFejt7T1Pa/3uVBdhOAIIIIAAAgg8TMA5973h4eEjYPFHoFqtXuCcW+lPYpIi4J+Ac25FFEWD/iUnMQIIIIAAAggggMAjBTiAxWsCAQQQQAABBBDwUGBgYOB5SZJ8x8PoREbAV4Gxnp6ebcMwHPe1ALn/KVAqlU51zn0WEwQQQAABBBBoq8DqOI7PbuuKLDYrAWNM88D6ebMaws0IIPC4Akqp02q12g0wIYAAAggggAACCPgvwAEs//eQBggggAACCCBQQIFqtbqXc+6uAlanMgIdE0iSZGG9Xue/dx3bgdYtXCqV9nfO/ax1E5mEAAIIIIAAApMJKKXe1Gg0PjjZdfx7dgQqlcoNSqnXZicRSRDIn4Bz7nlRFH03f81ohAACCCCAAAIIFE+AA1jF23MaI4AAAggggEAOBCqVyhOVUv+bgypUQMAbAa31KYODgzd6E5igjynw4he/eO6OO+64UUQ0TAh4LdD8rY7zugHhEUCgQALOuSOHh4f5FF+P9twY800ROcajyERFwDuB8fHxnS6//PI/ehecwAgggAACCCCAAAKPEuAAFi8KBBBAAAEEEEDAUwFjzCYRmetpfGIj4J2AUur8Wq22yrvgBN6qQBAEvxKRhfAggAACCCCAQFsEJubPn7/d6tWrmweg+fJEoFKp3K2UeoYncYmJgI8Cf7XWbudjcDIjgAACCCCAAAIIPFqAA1i8KhBAAAEEEEAAAU8FjDHrRGRXT+MTGwEfBT5krX2jj8HJ/GiBUqn0Cefcq7FBAAEEEEAAgbYI3BbH8cFtWYlFWiWgjDHNA3PzWjWQOQgg8CiB26y1/G8jLwwEEEAAAQQQQCAnAhzAyslGUgMBBBBAAAEEiidgjPmhiPCLuuJtPY07J3CztfbYzi3Pyq0U6O3tfYfWOmzlTGYhgAACCCCAwGMKfCCO43Pw8UdgYGBgxyRJeCyaP1tGUj8FPm2tfaWf0UmNAAIIIIAAAggg8EgBDmDxmkAAAQQQQAABBDwVMMZ8SUQWexqf2Aj4KPC/1toniYjzMTyZHy4QBMErRORTuCCAAAIIIIBA+gJJkvSPjIw00l+JFVolYIw5SER+1Kp5zEEAga0KvNtaewE2CCCAAAIIIIAAAvkQ4ABWPvaRFggggAACCCBQQIFqtRo75/oKWJ3KCHRMQCn1jFqtdk/HArBwywR6e3v30lrf1bKBDEIAAQQQQACBxxTYsmXLwhtuuIH/3/XoNVIul0/WWq/1KDJREfBOwDm3LIqi93kXnMAIIIAAAggggAACWxXgABYvDAQQQAABBBBAwFOBcrk8qLWuehqf2Aj4KvAKa+1nfA1P7ocJqCAIHhCR7XBBAAEEEEAAgfQElFL/02g0dk5vBSanIVCpVP5VKfXhNGYzEwEE/iHwUmvtf+CBAAIIIIAAAgggkA8BDmDlYx9pgQACCCCAAAIFFDDGnCsi/KVkAfeeyp0TcM69PYqid3UuASu3UiAIgm+JyFGtnMksBBBAAAEEEHi4gO6woDEAACAASURBVHPuM8PDw81H//LlkYAxpvk970UeRSYqAt4JOOeeFUXRHd4FJzACCCCAAAIIIIDAVgU4gMULAwEEEEAAAQQQ8FSgUqm8TCnFJ/F4un/E9lbg3621r/E2PcEfJtDX1/cBpdQbYUEAAQQQQACBVAWqcRzbVFdgeMsFeOR9y0kZiMAjBZKxsbEnrFq1ahQaBBBAAAEEEEAAgXwIcAArH/tICwQQQAABBBAooEC1Wj3EOfeDAlanMgKdFPiVtXbfTgZg7dYJBEHwJhF5f+smMgkBBBBAAAEEtiLwgjiOv4mMXwKVSuVbSik+KdSvbSOtRwJKqd/UarU9PYpMVAQQQAABBBBAAIFJBDiAxUsEAQQQQAABBBDwVOCCCy54Snd39/2exic2Ar4KJBMTE9utXLnyb74WIPc/BYIgaL6p2HwMIV8IIIAAAgggkI7AxvXr1z957dq1m9MZz9S0BIwxvxeRp6c1n7kIICBfstaehAMCCCCAAAIIIIBAfgQ4gJWfvaQJAggggAACCBRQwBjTPAQyv4DVqYxAJwWOtdbe3MkArN0agfPOO6/n/vvvf0BE5rRmIlMQQAABBBBA4BECX47j+ERU/BIIw3De6OjoRhHh/QO/to60Hgk4566IouitHkUmKgIIIIAAAggggMAkAvwAxUsEAQQQQAABBBDwWMAY80sR2cfjCkRHwDsBpdT5tVptlXfBCbxVgSAIviciz4UHAQQQQAABBFovoJRa0Wg0Bls/mYlpCgwMDDwzSZI70lyD2QgUXcA5d24URTwOvegvBPojgAACCCCAQK4EOICVq+2kDAIIIIAAAggUTaBcLn9Va31C0XrTF4FOCjjnro+iqLeTGVi7dQKlUukK59yy1k1kEgIIIIAAAgj8n4BS6vmNRuO/EPFLwBjzYhG50a/UpEXALwHn3KIoir7qV2rSIoAAAggggAACCDyeAAeweH0ggAACCCCAAAIeCxhjrhORfo8rEB0BHwXustYu9DE4mR8t0NfX16uUGsYGAQQQQAABBFou8Nd169Y9+aabbhpv+WQGpipQqVTOUUpdleoiDEeg4AJjY2MLVq1a9fuCM1AfAQQQQAABBBDIlQAHsHK1nZRBAAEEEEAAgaIJVKvVS5xzFxatN30R6LCA01rvNDg4uL7DOVi+BQKlUukZzrm7WzCKEQgggAACCCDwEAGl1OcbjcapoPgnUC6X61rr5f4lJzECfgg45/4WRdETRcT5kZiUCCCAAAIIIIAAAlMR4ADWVJS4BgEEEEAAAQQQyKiAMeZsEflgRuMRC4E8C5xsrf1ingsWqVsQBPeKyC5F6kxXBBBAAAEE0hbQWl8wNDT07rTXYX7rBYwxnxCRV7d+MhMRQKApkCTJrfV6/bloIIAAAggggAACCORLgANY+dpP2iCAAAIIIIBAwQQGBgZekiTJfxSsNnUR6LiAc+7tURS9q+NBCNASgd7e3k9prV/RkmEMQQABBCYVaP46jg+8mJSJC7wX0FofNDQ09GPvixSwgDHmVhE5tIDVqYxAuwRGrLV97VqMdRBAAAEEEEhTgJ9w09Rltm8CHMDybcfIiwACCCCAAAIIPERg+fLlz+nq6roNFAQQaK9AkiSfq9frL2vvqqyWlkAQBEZEamnNZy4CCCCAAAIFFFgXx/HunDb0c+eNMX8SkR38TE9qBLIvkCTJO+r1+juzn5SECCCAAAIIIIAAAtMR4ADWdLS4FgEEEEAAAQQQyJhAtVrdwTnX/OU4Xwgg0F6B9dbanXhTsb3oaa3W29v7Aq3119Oaz1wEEEAAAQQKKLA6juPm49L58kzgggsueEp3d/f9nsUmLgJeCSilTqvVajd4FZqwCCCAAAIIIIAAApMKcABrUiIuQAABBBBAAAEEsi1gjPmriDwh2ylJh0D+BLTWBwwODv4sf82K1+iss86av3Hjxj+LyJzitacxAggggAACqQi8Mo7jT6cymaGpCpTL5aO11jenugjDEUDg2dba22FAAIEcCvAsthxuKpUQQACBqQtwAGvqVlyJAAIIIIAAAghkUqBcLt+htX5mJsMRCoF8C7zRWvuhfFcsTrsgCG4SkeOK05imCCCAAAIIpCYwNmfOnKdcc801zT8U4cszgXK5fIbW+iOexSYuAj4JbP7zn//8xNWrV2/xKTRZEUAAAQQQQAABBCYX4ADW5EZcgQACCCCAAAIIZFrAGPMFETkp0yEJh0AOBZRSw7VaLchhtUJWCoLgYhF5ZyHLUxoBBBBAAIEWCjjnvjI8PLy4hSMZ1UaBSqVSU0qZNi7JUggUTeA2a+3BRStNXwQQQAABBBBAoAgCHMAqwi7TEQEEEEAAAQRyLVCtVq9yzp2T65KUQyCbAuustbtlMxqppisQBMFRIvKt6d7H9QgggAACCCDwcIEkSc4fGRlZhYufAsaYT4nIK/xMT2oEsi/gnGtEUdSf/aQkRAABBBBAAAEEEJiuAAewpivG9QgggAACCCCAQMYEKpXK25RSvMGRsX0hTmEE9rDW/rYwbXNc9Pjjj+9esGDBehHZLsc1qYYAAggggEDqAt3d3ftfe+21P099IRZIRcAYc7uIPCuV4QxFAAFxzlWiKKpDgQACCCCAAAIIIJA/AQ5g5W9PaYQAAggggAACBRMwxpwiIp8vWG3qIpAJAedcEEXRcCbCEGLWAkEQfFZETp31IAYggAACCCBQXIFfxnG8X3Hr+918yZIlXXvttdcGEZnndxPSI5BpgZOttV/MdELCIYAAAggggAACCMxIgANYM2LjJgQQQAABBBBAIDsC5XJ5H631L7OTiCQIFEfAObc6iqKzi9M4302DIHiriLwn3y1phwACCCCAQKoCl8VxfGGqKzA8NYFqtbqXc+6u1BZgMAIIyNjY2IJVq1b9HgoEEEAAAQQQQACB/AlwACt/e0ojBBBAAAEEECiYQBiG3aOjoxtFZJuCVacuAlkQuNNau08WgpBh9gKve93rDpiYmPjp7CcxAQEEEEAAgWIKKKUObzQa3y9me/9bG2NeLCI3+t+EBghkVuBP1todM5uOYAgggAACCCCAAAKzEuAA1qz4uBkBBBBAAAEEEMiGgDGm+QlYHALJxnaQomAC22yzzV6XXHLJrwtWO691VRAEzb9Gf1peC9ILAQQQQACBFAXWxXG8u4i4FNdgdIoClUrlbUqpVSkuwWgEii7wn9baE4qOQH8EEEAAAQQQQCCvAhzAyuvO0gsBBBBAAAEEvBNofmM203cqKpXKfyilXuJdaQIjkA+Bs6y1V+ejCi2CIGiISIAEAggggAACCExPQCl1RaPRaD7Oly9PBYwx7xeRN3kav8Wxmz+d8/ZJi1EZJ/Jea+3bgEAAAQQQQAABBBDIpwA/QeRzX2mFAAIIIIAAAgUTMMY0/0qZX+IVbN+pmw0B59zHoyj6l2ykIcVsBYIgOF1ERmY7h/sRQAABBBAomkCSJMeNjIx8o2i989S3XC5/VWvNp/PkaVPpkikBpdQbarXahzMVijAIIIAAAggggAACLRPgAFbLKBmEAAIIIIAAAgh0TqBSqZyjlLqqcwlYGYFCC/yxp6dn5zAMk0Ir5KT8kiVLtp87d+7/iMicnFSiBgIIIIAAAqkLKKX+Z9OmTU9fs2bNROqLsUBqAsaYP4jIzqktwGAECi6glDqiVqt9r+AM1EcAAQQQQAABBHIrwAGs3G4txRBAAAEEEECgSALVavVE59wXi9SZrghkSSBJksPq9foPspSJLDMX6Ovr+7JSatHMJ3AnAggggAACxRJQSl3daDTOKlbrfLW94IILntLd3X1/vlrRBoFMCYxt3LhxuyuvvHJzplIRBgEEEEAAAQQQQKBlAhzAahklgxBAAAEEEEAAgc4JVKvVPZ1zv+5cAlZGoPACxlobFV4hJwB9fX3LlFJX5KQONRBAAAEEEEhdYGJi4kXXX3/911JfiAVSE6hWqyc4576a2gIMRqDgAkmS3Fqv159bcAbqI4AAAggggAACuRbgAFaut5dyCCCAAAIIIFAUgTAM9ejo6N9EZF5ROtMTgSwJJEnytXq9/qIsZSLLzAX6+/t3T5LkHhHhZ+aZM3InAggggEBxBO7dvHnzbjx+0O8Nr1Qqb1FKvdfvFqRHINMCV1tr+aTATG8R4RBAAAEEEEAAgdkJ8Mvk2flxNwIIIIAAAgggkBkBY8ztIvKszAQiCALFEtiyefPmp77nPe95oFi189s2CIIfichB+W1IMwQQQAABBFomsCqO4/NbNo1BHREwxqwWkTd0ZHEWRaAAAkqps2u1WvO/Z3whgAACCCCAAAII5FSAA1g53VhqIYAAAggggEDxBMrl8qe11i8vXnMaI5ANgSRJXluv19dkIw0pZitQKpX+zTn39tnO4X4EEEAAAQTyLtDd3X3Etdde+72898x7P2PMLSLy/Lz3pB8CnRJQSj23Vqvd2qn1WRcBBBBAAAEEEEAgfQEOYKVvzAoIIIAAAggggEBbBMrlcl1rvbwti7EIAgg8SsA5d10URUuhyYdAb2/vYVrr7+ejDS0QQAABBBBITeCuOI73ERGX2goMboeAMsY0P8l1u3YsxhoIFFBgbOPGjdtdeeWVmwvYncoIIIAAAggggEBhBDiAVZitpigCCCCAAAII5F2gWq2e5Zz7UN570g+BDAvc39PTs0sYhkmGMxJt6gIqCILfisiCqd/ClQgggAACCBRLQCn1zkaj8Y5itc5f22q1uqdz7tf5a0YjBLIh4Jz7fhRFh2cjDSkQQAABBBBAAAEE0hLgAFZassxFAAEEEEAAAQTaLFAul4/TWt/U5mVZDgEEHiLgnDsyiqLvgJIPgVKpdIVzblk+2tACAQQQQACB1gsopZ7VaDTuaP1kJrZToFwuv1Rr/bl2rslaCBRJwDm3Ooqis4vUma4IIIAAAm0QaJ704HNo2wDNEghMXYADWFO34koEEEAAAQQQQCDTAuedd96T58yZsz7TIQnnv0Dzh3p+ini8fbzEWnux/xtNg6ZAf3//kUmSfBsNBBBAAAEEEHi0gFLqh41G41Bs/BeoVCoDSqnL/G9CAwQyK3CWtfbqzKYjGAIIIIAAAggggEBLBHjrpCWMDEEAAQQQQAABBLIhYIxZJyK7ZiMNKRAopMCPrLWHFLJ5Pks3H0N4p4jslc96tEIAAQQQQGBWAuU4jlfOagI3Z0KgWq3Gzrm+TIQhBAI5FEiS5LB6vf6DHFajEgIIIIAAAggggMBDBDiAxcsBAQQQQAABBBDIkUClUlmrlDo5R5WogoB3Attss81el1xyya+9C07grQqUSqVLnHMXwoMAAggggAACDxMYF5Hd4zi+Fxf/BarV6m3Ouef434QGCGRSYFNPT8/2YRiOZTIdoRBAAAEEEEAAAQRaJsABrJZRMggBBBBAAAEEEOi8gDHGikil80lIgEBxBZRSy2u12uXFFchX81KptL9z7mf5akUbBBBAAAEEZi1wYxzHp8x6CgM6LrBs2bK58+fP/6uIbNPxMARAIJ8CN1trj81nNVohgAACCCCAAAIIPFSAA1i8HhBAAAEEEEAAgRwJGGMCEWnkqBJVEPBOwDl3SxRFR3kXnMCPKRAEwW0iwqdC8BpBAAEEEEDgnwL/EsfxxwHxX6BarR7unPuu/01ogEA2BZxz9SiK+EO5bG4PqRBAAAEEEEAAgZYKcACrpZwMQwABBBBAAAEEOitgjDlIRH7U2RSsjkDhBVx3d/cel1566e8KL5ETgL6+vqpSajAndaiBAAIIIIDAbAX+stNOOz1t1apVo7MdxP2dFzDGnC0iH+x8EhIgkE+BiYmJV61cufJT+WxHKwQQQAABBBBAAIGHCnAAi9cDAggggAACCCCQI4EwDOeMjo42Hx8xJ0e1qIKAdwLOuWVRFL3Pu+AE3qpAf3//7kmS3CMi/AzNawQBBBBAoPACzrkPDg8Pv6nwEDkBMMY0D181D2HxhQACKQgkSfK0er3+hxRGMxIBBBBAAAEEEEAgYwL88jhjG0IcBBBAAAEEEEBgtgKVSuUnSqlnz3YO9yOAwMwFkiS5qV6vv3DmE7gzawJBEHxTRI7JWi7yIIAAAggg0G4B59yRw8PD32n3uqyXjkC5XP6u1vrwdKYzFYFiCzjn7o6iaO9iK9AeAQQQQAABBBAojgAHsIqz1zRFAAEEEEAAgYIIGGOGRaS3IHWpiUBWBZIkSXblL52zuj3Tz1Uqld7onPvA9O/kDgQQQAABBHIl8Ms4jvfLVaMClwnDsPvBT1CeV2AGqiOQpkBsrS2luQCzEUAAAQQQQAABBLIjwAGs7OwFSRBAAAEEEEAAgZYIGGOqIjLYkmEMQQCB2Qi80Vr7odkM4N7sCCxZsmT7uXPn/l5Ets1OKpIggAACCCDQdoEL4zi+rO2rsmAqAsaYA0Xkx6kMZygCCDQF3mytvQoKBBBAAAEEEEAAgWIIcACrGPtMSwQQQAABBBAokIAx5hQR+XyBKlMVgawKfMNae1xWw5Fr+gK9vb3XaK1fP/07uQMBBBBAAIFcCExorfcaGhr6bS7aUELK5fJSrfVHoUAAgXQEkiQ5pF6v/yid6UxFAAEEEEAAAQQQyJoAB7CytiPkQQABBBBAAAEEZilw4YUX7jY+Ps6bIrN05HYEWiDglFJ71Wq1e1owixEZEOjv7z8ySZJvZyAKERBAAAEEEOiEwGfjOH55JxZmzXQEKpXKe5VSb0lnOlMRKLaAc+5v8+fPf1IYhuPFlqA9AggggAACCCBQHAEOYBVnr2mKAAIIIIAAAgUSMMasF5EnF6gyVRHIqsCAtbaW1XDkmr5AEATNv2A/aPp3cgcCCCCAAAJ+CzjnTh0eHuaTdv3exoelN8Z8U0SOyVElqiCQJYGvWmsXZSkQWRBAAAEEEEAAAQTSFeAAVrq+TEcAAQQQQAABBDoiYIz5uoi8oCOLsygCCPxDwDn30yiKDoQkPwJBELxVRN6Tn0Y0QQABBBBAYEoC6zZv3rznmjVrJqZ0NRdlXiAMQz06OvqAiDwx82EJ2EIBJyK8LdRC0McbdYm19uI2rcUyCCCAAAIIIIAAAhkQ4DvtDGwCERBAAAEEEEAAgVYLlMvl92mtz231XOYhgMCMBA621t42ozu5KXMCS5cufdL4+PjvRWR+5sIRCAEEEEAAgZQEtNb/NjQ0FKY0nrEdEHjw0fW/EJGeDizPkgjkXsA5d2IURV/OfVEKIoAAAggggAACCPxDgANYvBgQQAABBBBAAIEcChhjzhaRD+awGpUQ8FEgstYaH4OTeesCQRDEItKHDwIIIIAAAgURSJIk2WtkZOQ3BelbmJphGHaPjo4+3zn3UufcIq31ISKiCwNAUQTSE9gyMTGxw8qVK/+W3hJMRgABBBBAAAEEEMiaAAewsrYj5EEAAQQQQAABBFogMDAw8LwkSb7TglGMQACB2Qus6+np2SMMw2T2o5iQBYFSqXScc+6mLGQhAwIIIIAAAm0QuDGO41PasA5LdFhg+fLlT+3q6lokIotF5EQReXqHI7E8Al4KOOe+HUXR0V6GJzQCCCCAAAIIIIDAjAU4gDVjOm5EAAEEEEAAAQSyK7Bs2bK58+fP/4uIzM1uSpIhUByBiYmJxStXrvxKcRrnvqkKguB2Edk/900piAACCCCAgMgr4zj+NBDFE6hWq3uJyKLmp2OJyEkisl3xFGiMwIwELrPWXjijO7kJAQQQQAABBBBAwFsBDmB5u3UERwABBBBAAAEEHl+gXC5/V2t9OE4IIJAJgY9Za0/PRBJCtEQgCAIe9doSSYYggAACCGRc4A933HHH7rfeeuuWjOckXsoCzccVbtq06aCHHMg6XkS6U16W8Qh4KaCUOqlWq33Jy/CERgABBBBAAAEEEJixAAewZkzHjQgggAACCCCAQLYFyuXy+7TW52Y7JekQKIzA2Pj4+K6XX375HwvTOOdFzzvvvJ7777//tyLylJxXpR4CCCCAQIEFlFKXNhqNiwpMQPXHEBgYGNhxfHz8BKXUIqVU83GFe4KFAAJ/Fxh3zj05iqK/4oEAAggggAACCCBQLAEOYBVrv2mLAAIIIIAAAgUSqFQqr1NKXVugylRFINMCSZK8pV6vX5npkISblkCpVLrEOcejRaalxsUIIIAAAh4JuC1btuxzww033OVRZqJ2SOARjytcLCJP6lAUlkWgowLOuVuiKDqqoyFYHAEEEEAAAQQQQKAjAhzA6gg7iyKAAAIIIIAAAukLVCqV/ZVSP0t/JVZIQ8CJCN+spyHbuZlKqR/XarXmY1v4yonAmWeeufOmTZvuEZF5OalEDQQQQAABBP4h4Jz70vDw8EmQIDBdgSVLlnTtvffeBz/kcYXHicg2053D9Qj4KKCUGqzVait8zE5mBBBAAAEEEEAAgdkJ8J7O7Py4GwEEEEAAAQQQyLKAMsb8ib88zvIWka1oAkmSHFav139QtN557tvb23ud1ro/zx3phgACCCBQTAGt9ZKhoaFPFLM9rVspEIbhEzZs2PB8rXXzcYWnisizWjmfWQhkTOBka+0XM5aJOAgggAACCCCAAAJtEOAAVhuQWQIBBBBAAAEEEOiUgDHmKyLyok6tz7oIIPBwAaXU+2u12rm45Eegr6/vQKXUbXxoXX72lCYIIIAAAn8XuO+OO+7Y7dZbb92CBwKtFnjE4woXicgOrV6DeQh0SGDcOffkKIr+2qH1WRYBBBBAAAEEEECggwIcwOogPksjgAACCCCAAAJpC5TL5UGtdTXtdZiPAAJTFnigp6dn1zAMN075Di7MvECpVPqac+6FmQ9KQAQQQAABBKYuYOM45ueIqXtx5QwFmo8r3GOPPY5QSi3WWi8WkeeLSPcMx3EbAp0W+I619shOh2B9BBBAAAEEEEAAgc4IcACrM+6sigACCCCAAAIItEVg+fLlr+zq6vpkWxZjEQQQmJKAUuoNtVrtw1O6mIu8ECiVSqc65z7rRVhCIoAAAgggMLmAS5Jkv5GRkV9NfilXINBageXLl28rIkc2H1fonFuktT6stSswDYH0BJxz74qi6O3prcBkBBBAAAEEEEAAgSwLcAAry7tDNgQQQAABBBBAYJYCK1aseNrExMR/z3IMtyOAQGsFbrPWHtzakUzrpEAYhvrOO+/8qYjs38kcrI0AAggggEArBJRSX2s0GjzGvBWYzJi1QLlc3kVEjlVKnaqUeomI7DjroQxAICWBJEleUK/Xv5nSeMY+rkDz7U6HEQIIIIAAAggg0FEBDmB1lJ/FEUAAAQQQQACB9AWMMetEZNf0V2IFBBCYhsDR1tpvT+N6Ls24QBAEfSISZzwm8RBAAAEEEJhUQGt92tDQ0A2TXsgFCLRZoHnofdOmTYeIyN8/Hat5MEtE5rY5Bssh8FgCf/3zn/+84+rVq7dAhAACCCCAAAIIIFBMAQ5gFXPfaY0AAggggAACBRIwxjQfQfjKAlWmKgI+CIxYa5sHdvjKicCSJUu65s2bd7tzbr+cVKIGAggggEAxBe5fv379bmvXrt1czPq09kkgDMP5GzZsOOohjys8VER4z8OnTcxX1k9ba/ndS772lDYIIIAAAggggMC0BPhhZFpcXJwpAT5RNlPbQRgEEEAAgewKVCqVAaXUZdlNSDIECikw1tXVtftll112XyHb57R0b2/vUq31R3Naj1oIIIAAAgUQUEpd2mg0LipAVSrmUGDFihU7b9my5QVKqUVKqVP4JOgcbnKGKznnzo2i6P0Zjkg0BBBAAAEEEEAAgZQFOICVMjDjEUAAAQQQQACBTgtUKpUXKaW+0ukcrI8AAg8XcM5dFEXRpbjkR6D5KVhz5869Q0T2yU8rmiCAAAIIFEhgYnx8fOHHPvaxewrUmao5FqhWq3s1H1eYJMmpzUNZIjIvx3Wp1mGBJEkW1uv1uzocg+URQAABBBBAAAEEOijAAawO4rM0AggggAACCCDQDgFjzPYi8icR0e1YjzUQQGBqAs65382fP3+vMAzHp3YHV/kgEATBmSJytQ9ZyYgAAggggMAjBD4bx/HLUUEgjwLnnXdez5w5c17gnFustV7snDuQxxXmcac708k5d3cURXt3ZnVWRQABBBBAAAEEEMiKAAewsrIT5EAAAQQQQAABBFIUMMb8TET2T3EJRiOAwMwE/sVa+/GZ3cpdWRQ47LDDttl///1/ISLPyGI+MiGAAAIIIPA4Ai+O4/gLCCFQBIFyubyL1nqRc+7E5qdkKaWeVoTedExHwDn3wSiK3pTOdKYigAACCCCAAAII+CLAASxfdoqcCCCAAAIIIIDALAQqlcrVSqnmp7LwhQACGRJwzn0/iqLDMxSJKC0QKJVKb3TOfaAFoxiBAAIIIIBAuwTuXrhw4T5hGCbtWpB1EMiSwP89rtA513xU4Ukisl2W8pEl2wLOuVdGUfTpbKckHQIIIIAAAggggEDaAhzASluY+QgggAACCCCAQAYEKpVKSSk1lIEoREAAgUcLHGutvRmY/Ag8+ClYvxKRPfLTiiYIIIAAAjkXqMRxXM95R+ohMCWBMAy7N23adJCInDoxMfFSrfUhIqKndDMXFVGg+Uj5p1hr/1LE8nRGAAEEEEAAAQQQ+KcAB7B4NSCAAAIIIIAAAgUQMMbsLiK/KUBVKiLgo8CnrLWv8iN480dI50fUDqcMgqD5qYNXdzgGyyOAAAIIIDAVgc0TExMLrr/++j9O5WKuQaBoAgMDAzslSfKi5uMKlVKLRWRB0Qzo+9gCzrlvRVF0DEYIIIAAAggggAACCHAAi9cAAggggAACCCBQEAFjzK9FZM+C1KUmAj4JJEqp/Wq12p0+hSbr4wssWbKka86cObcppQ7ACgEEEEAAgSwLKKUajUajP8sZyYZAlgQe8bjCE0Vk+yzlI0t7BZxzK6IoGmzvqqyGAAIIIIAAAgggkEUBDmBlcVfIhAACCCCAz5gVHAAAIABJREFUAAIIpCBgjLlORHhjJQVbRiIwW4EkSa6q1+tvnu0c7s+WQBAELxORz2QrFWkQQAABBBB4uIDW+qihoaFbcEEAgekLNA/d77333geLyCLn3CIROU5Etpn+JO7wWOA51tqfeJyf6AgggAACCCCAAAItEuAAVosgGYMAAggggAACCGRdoFwun6G1/kjWc5IPgYIKbNRa7z44OLi+oP1zW7tUKn3NOffC3BakGAIIIICA7wK3xXHcPDzCFwIItEAgDMMnjI6OvtA591IRWayUekYLxjIiuwK/tdbukd14JEMAAQQQQAABBBBopwAHsNqpzVoIIIAAAggggEAHBarV6kLn3K86GIGlEUDg8QUuttZeAlK+BPr7+49IkuQ7IsLP3/naWtoggAACeRE4O47j1XkpQw8EsiZQLpf3UUo1D2ItFpETRGS7rGUkz8wF+CTjmdtxJwIIIIAAAgggkEcBfgGcx12lEwIIIIAAAggg8BgCxph1IrIrQAggkEmB9T09PXuGYbghk+kINWOBIAjWiMhrZjyAGxFAAAEEEEhH4K9z5szZ9ZprrvlrOuOZigACDxXYyuMKXyAic1DyWuBka+0XvW5AeAQQQAABBBBAAIGWCXAAq2WUDEIAAQQQQAABBLIvUKlURpRSp2c/KQkRKKzABdbadxe2fU6L9/b27qW1voM32HK6wdRCAAEE/BV4XxzHy/yNT3IE/BZYvnz5tiJypNZ6kXNukdb6ML8bFS79hp6enp3CMNxUuOYURgABBBBAAAEEENiqAAeweGEggAACCCCAAAIFEqhWq290zn2gQJWpioBvAn8YGxvba9WqVaO+BSfv4wuUSqX3OefOxQkBBBBAAIGsCCilDmw0Gj/NSh5yIFB0gRUrVjxty5Yti7XWLxWRF4nIk4tukuX+zrlPRlH06pZlbL5b51o2jUEIIIAAAggggAACHRDgAFYH0FkSAQQQQAABBBDolMDAwMCzkiS5vVPrsy4CCExJ4BxrLQclp0Tlz0WlUumpzrlfisj2/qQmKQIIIIBAjgW+EcfxcTnuRzUEvBbYyuMKjxWRuV6Xyll459wZURR9NGe1qIMAAggggAACCCAwCwEOYM0Cj1sRQAABBBBAAAEPBVSlUvmDUuqpHmYnMgJFEfhtT0/PPmEYjhWlcFF69vX1vU0ptaoofemJAAIIIJBdAa31aUNDQzdkNyHJEEDgoQJhGM7fsGHDUQ95XOGhIsL7O517mSRJkuxar9f/0LkIrIwAAggggAACCCCQNQG+Qc/ajpAHAQQQQAABBBBIWcAY8wkRad3H5Kecl/EIFFEgSZLX1+v1a4vYPc+djz/++O4FCxb8QEQOzHNPuiGAAAIIZF7gvs2bN+++Zs0aDntnfqsIiMDWBcrl8i4icqxSapFSqvnIwqdj1VaB71hrj2zriiyGAAIIIIAAAgggkHkBDmBlfosIiAACCCCAAAIItFagXC4v01pf0dqpTEMAgRYL/OLuu+8+YM2aNRMtnsu4Dgv09/cfkyTJN/jEgg5vBMsjgAACxRa4LI7jC4tNQHsE8iMQhqHetGnTIc65xUmSLNZaH83jClPf34uttZekvgoLIIAAAggggAACCHglwAEsr7aLsAgggAACCCCAwOwFjDEHiciPZj+JCQggkKZAkiSvq9frQ2muwezOCJRKpWHnXG9nVmdVBBBAAIGCCyRKqYWNRuPXBXegPgK5FWg+rnB0dPQ4EVncPJSllHp2bst2rthzrLU/6dzyrIwAAggggAACCCCQRQEOYGVxV8iEAAIIIIAAAgikKND869jR0dH7ReTJKS7DaAQQmL3APT09PfuFYcjjgWZvmakJS5cu3WV8fPznIrJ9poIRBgEEEECgCAI3xnF8ShGK0hEBBP6/wPLly5+qlDruwccVvkREFmAzK4FfWmv3m9UEbkYAAQQQQAABBBDIpQAHsHK5rZRCAAEEEEAAAQQeX8AY8ykReQVOCCCQeYGzrLVXZz4lAact0N/ff36SJJdP+0ZuQAABBBBAYBYCSqmXNRqNz81iBLcigIDfAsoY85zmp2M9+J9jRaTH70rtTa+UGqzVaivauyqrIYAAAlkXaB45cFkPST4EEEAgdQEOYKVOzAIIIIAAAggggED2BIwxbxKR92cvGYkQQOARAr/duHHjvldeeeVmZPIlcPzxx3cvWLDgVhFpvgHGFwIIIIAAAqkLOOd+NzY29ow1a9ZMpL4YCyCAgBcCYRjO27BhwzFa60XOuUVa60NERHsRvkMhkyQ5rF6v/6BDy7MsAggggAACCCCAQIYFOICV4c0hGgIIIIAAAgggkJZAtVrd0zn367TmMxcBBFoq8GZr7VUtnciwTAgEQXC8iHxNRPjZPBM7QggEEEAg9wJvj+P4XblvSUEEEJixwMDAwE7j4+PHP/i4wpNFZPcZD8vnjfdYa/fiY17yubm0QgABBBBAAAEEZivAL3lnK8j9CCCAAAIIIICApwLGmF+KyD6exic2AoURcM7dO3/+/IVhGG4sTOkCFQ2C4MMi8q8FqkxVBBBAAIHOCIxrrfccGhr6fWeWZ1UEEPBRoFqtNg8b/f3TsUTkJBHZzscercqcJMnKer1ebtU85iCAAAIIIIAAAgjkS4ADWPnaT9oggAACCCCAAAJTFjDGXCEiy6Z8AxcigEAnBS6w1r67kwFYOx2BJUuWbD937tyfisiCdFZgKgIIIIAAAiJKqX9vNBqvwQIBBBCYqUAYhnM2btx4tNZ6cZIki5VShxbtcYUTExNHrVy58paZGnIfAggggAACCCCAQL4FOICV7/2lHQIIIIAAAggg8JgC5XL5pVrrz0GEAAJeCPx5bGxs4apVq/7kRVpCTksgCIJTROTz07qJixFAAAEEEJiewIlxHH95erdwNQIIIPDYAgMDAzuOj4+f8ODjCk8UkT1z7vV7a+1uPH4w57tMPQQQQAABBBBAYBYCHMCaBR63IoAAAggggAACPgssX758266urvUiMtfnHmRHoCgCSZLU6vX6QFH6Fq1nEASxiPQVrTd9EUAAAQTaInDXwoUL9w3DMGnLaiyCAAKFFHjE4woXi8iTcgZxpbX2LTnrRB0EEEAAAQQQQACBFgpwAKuFmIxCAAEEEEAAAQR8EyiXy1/VWp/gW27yIlBQgU0isp+19rcF7Z/r2v39/TsmSXK7iOyc66KUQwABBBDohEAljuN6JxZmTQQQKKbAkiVLuvbee++DRWSRc26RiBwnItv4rJEkyfH1ev3rPncgOwIIIIAAAggggEC6AhzASteX6QgggAACCCCAQKYFjDEVEbGZDkk4BBB4qMC11trXQ5JPgVKptMQ59/F8tqMVAggggECHBMaUUrs1Go3/6dD6LIsAAghIGIZP2LBhw/O11ouUUqeKyLM8Y7nv7rvv3nXNmjUTnuUmLgIIIIAAAggggEAbBTiA1UZslkIAAQQQQAABBLImsHz58ud0dXXdlrVc5EEAgccUSCYmJg5ZuXLljzHKp0CpVPqEc+7V+WxHKwQQQACBDggMx3EcdGBdlkQAAQQeU6BcLu/d1dW12Dl3ooi80IPHFX7AWnsOW4oAAggggAACCCCAwOMJcACL1wcCCCCAAAIIIFBsAWWMWSciTy82A+0R8EfAOfeFKIpe7E9ikk5H4Mwzz9x506ZNzUcR7jid+7gWAQQQQACBxxB4QRzH30QHAQQQyKrAVh5X+AIRmZOxvMdaa2/OWCbiIIAAAggggAACCGRMgANYGdsQ4iCAAAIIIIAAAu0WqFQq1yqlXtfudVkPAQRmLtD8S/Eoir488wncmWWBUqn0Kufcv2c5I9kQQAABBLwQuCOO4wNExHmRlpAIIICAiCxfvnxbETmy+bhC59wirfVhnYRxzv0uiqI9+N/STu4CayOAAAIIIIAAAn4IcADLj30iJQIIIIAAAgggkJpAuVw+XWs9ktoCDEYAgZYLOOdunz9//sFhGI63fDgDMyEQBMGHReRfMxGGEAgggAACXgo4594yPDx8pZfhCY0AAgg8KFAul3cRkWOVUqcqpV7S7k+Kdc7ZKIqqbAgCCCCAAAIIIIAAApMJcABrMiH+HQEEEEAAAQQQyLnAwMDAjkmS/I+I6JxXpR4CeRM4x1r7gbyVos//FyiVSs2//P++c+6ZmCCAAAIIIDADgdEkSXYdGRn58wzu5RYEEEAgkwJhGOpNmzYdIiJ//3Ss5sEsEZmbctiDrbW3pbwG4xFAAAEEEEAAAQRyIMABrBxsIhUQQAABBBBAAIHZCpTL5e9qrQ+f7RzuRwCBtgr8SWu97+Dg4Pq2rspibRMIguBQEblFROa0bVEWQgABBBDIi8BH4jg+My9l6IEAAghsTSAMw/kbNmw46iGPK2x+/9yy972SJPl5vV7fH30EEEAAAQQQQAABBKYi0LJvRKeyGNcggAACCCCAAAIIZFPAGPMuEbkom+lIhQACjyXgnLsiiqK3IpRfgVKpVGk+9iS/DWmGAAIIIJCGQHd39xHXXnvt99KYzUwEEEAgqwIrVqzYecuWLS9QSi1SSp0iIrvOMuvF1tpLZjmD2xFAAAEEEEAAAQQKIsABrIJsNDURQAABBBBAAIHHEzDGHCUi30IJAQS8ExjXWh80ODj4M++SE3hKAs3HrNx5551fEpEXTekGLkIAAQQQQEDkN3Ec7wkEAgggUHABVa1WD3bOLRaR5n+OEZF50zBxSZLsU6/X75rGPVyKAAIIIIAAAgggUGABDmAVePOpjgACCCCAAAII/J9A8w3+0dHR34vILqgggIBfAkmSfK1er3M4x69tm1baM8444+ljY2O3ichTpnUjFyOAAAIIFFZAKXVyo9H4YmEBKI4AAgg8QuC8887r6erqOnoajyv8L2vt84FEAAEEEEAAAQQQQGCqAhzAmqoU1yGAAAIIIIAAAjkXqFQqVyulzsx5TeohkFeBV1hrP5PXcvQS6e3tfbnW+lMiws/xvCAQQAABBKYi8JPNmzcfsmbNmompXMw1CCAwiUDzOzCHUp4EBgYGdhofHz+++bhCEXmxUmq3R/R7m7X2vXnqTBcEEEAAAQQQQACBdAX4xW26vkxHAAEEEEAAAQS8ETDGnCIin/cmMEERQOAfAs65u7ds2fLsVatWjcKSX4EgCCIRKee3Ic0QQAABBFos8MY4jj/U4pmMQwABBPIooIwxz37wUYUnishRXV1d+1122WX35rEsnRBAAAEEEEAAAQTSEeAAVjquTEUAAQQQQAABBLwTCMNw3ujo6P0i8gTvwhMYAQSaApdYay+GIr8CS5Ys6ZozZ86NSqnmm0J8IYAAAgggMJnA/Zs3b95nzZo1f5nsQv4dAQQQQOCfAmEYdodhOI4JAggggAACCCCAAALTEeAA1nS0uBYBBBBAAAEEEMi5QKVSWaOUek3Oa1IPgbwKjGmtDxocHPx5XgvSS6RUKj3VOXeriCzAAwEEEEAAgckEnHPR8PCwmew6/h0BBBBAAAEEEEAAAQQQQAABBGYnwAGs2flxNwIIIIAAAgggkCsBY0wgIo1claIMAgUSUEp9vVarvVBEXIFqF65qqVR6nnPu6yIyt3DlKYwAAgggMF2BMRE5II7jO6d7I9cjgAACCCCAAAIIIIAAAggggMDUBTiANXUrrkQAAQQQQAABBHIv8La3ve1Jc+fOvU9E5uS+LAURyKlAkiS99Xr9+pzWo9aDAn19fecopa4CBAEEEEAAgSkIfCKO4yVTuI5LEEAAAQQQQAABBBBAAAEEEEBghgIcwJohHLchgAACCCCAAAJ5FTDGfEVEXpTXfvRCoAAC923evPmZ73nPex4oQNdCV+zt7b1Ga/36QiNQHgEEEEBgSgJJkhw3MjLyjSldzEUIIIAAAggggAACCCCAAAIIIDBtAQ5gTZuMGxBAAAEEEEAAgXwLlMvlZVrrK/LdknYI5FvAOfe+KIqW5bsl7ZYuXTpvfHz8ZhE5DA0EEEAAAQQeT0Ap9cO99977uWEYJkghgAACCCCAAAIIIIAAAggggEDrBTiA1XpTJiKAAAIIIIAAAl4LXHjhhbuNj4//RkT4XtHrnSR8wQUmnHNHRVH03YI75L5+qVR6hnPuv0Rkp9yXpSACCCCAwKwEnHNLh4eHr5vVEG5GAAEEEEAAAQQQQAABBBBAAIGtCvCmGi8MBBBAAAEEEEAAgUcJlMvl72ut+UQVXhsI+C1wx8aNGw+58sorN/tdg/STCfT19R2tlGo+PnbeZNfy7wgggAAChRb4b6XUvo1G42+FVqA8AggggAACCCCAAAIIIIAAAikIcAArBVRGIoAAAggggAACvgtUKpWLlVLv9L0H+REouoBzLoyi6N+K7lCE/qVSaYlz7gY+vbAIu01HBBBAYOYCze/xG43GO2Y+gTsRQAABBBBAAAEEEEAAAQQQQGBrAhzA4nWBAAIIIIAAAggg8CgBY8yBIvJjaBBAwHuBsYmJicNWrlz5U++bUGBSgd7e3ndorcNJL+QCBBBAAIEiC4xqrZ85NDT02yIj0B0BBBBAAAEEEEAAAQQQQACBVgtwAKvVosxDAAEEEEAAAQRyImCM+aWI7JOTOtRAoMgC37377ruPWrNmzUSREQrSXZVKpeucc6WC9KUmAggggMDMBOI4jvn/ipnZcRcCCCCAAAIIIIAAAggggAACWxXgABYvDAQQQAABBBBAAIGtChhjLheR8+FBAAH/BZRS59dqtVX+N6HBZAJLliyZM2/evC8451442bX8OwIIIIBAYQWciBwTx/G3CytAcQQQQAABBBBAAAEEEEAAAQRaLMABrBaDMg4BBBBAAAEEEMiLgDHmGBH5Zl760AOBIgs45/6mtX5OrVa7u8gORene39+/Y5Ikt/AphkXZcXoigAAC0xdwzt0yPDx8tIg0D2PxhQACCCCAAAIIIIAAAggggAACsxTgANYsAbkdAQQQQAABBBDIq0AYhnrjxo33KKV2y2tHeiFQJIEkSb5Wr9cX8UZrMXY9CIL9RORbIrJjMRrTEgEEEEBgugJa69OGhoZumO59XI8AAggggAACCCCAAAIIIIAAAo8W4AAWrwoEEEAAAQQQQACBxxSoVCorlVIXQIQAAvkQSJLkLfV6/cp8tKHFZAJLly49fHx8/Ksi8sTJruXfEUAAAQSKJ+Cc+9222277zNWrV28sXnsaI4AAAggggAACCCCAAAIIINBaAQ5gtdaTaQgggAACCCCAQK4EqtXqYc657+eqFGUQKLbARufcoVEU/aLYDMVp39vb+0Kt9Y0iMq84rWmKAAIIIDBVAaXUikajMTjV67kOAQQQQAABBBBAAAEEEEAAAQS2LsABLF4ZCCCAAAIIIIAAAo8rYIxpHtTYFyYEEMiHQJIkt/7lL385cvXq1Vvy0YgWkwkEQfAyEfl3Eeme7Fr+HQEEEECgcAIbmt/rx3F8b+GaUxgBBBBAAAEEEEAAAQQQQACBFgpwAKuFmIxCAAEEEEAAAQTyKFCpVN6plLo4j93ohECBBS601l5W4P6Fq97b21vSWl8nIvweoHC7T2EEEEDg8QW01h8eGhp6A04IIIAAAggggAACCCCAAAIIIDBzAX7xOnM77kQAAQQQQAABBAohMDAw8MwkSe4oRFlKIlAcgS1KqSNrtdqtxalM076+vmVKqSuQQAABBBBA4BECSZIkR4yMjPB9AS8NBBBAAAEEEEAAAQQmFWgesXCTXsUFCCBQPAEOYBVvz2mMAAIIIIAAAghMW6Bard7mnHvOtG/kBgQQyLLAz3p6eg4Lw3BTlkOSrbUCQRBcKiIrWjuVaQgggAACvgsopf6z0Wic4HsP8iOAAAIIIIAAAggggAACCCDQKQEOYHVKnnURQAABBBBAAAGPBIwxVREZ9CgyURFAYGoCkbXWTO1SrsqLQBAE7xeRN+WlDz0QQAABBFojkCTJK0ZGRj7TmmlMQQABBBBAAAEEEEAAAQQQQKBYAhzAKtZ+0xYBBBBAAAEEEJiRgDFmdxG5R0T4/nFGgtyEQGYFkomJiZNWrlz5lcwmJFgaAioIguajCN+cxnBmIoAAAgh4K3DX+vXrD1i7du1mbxsQHAEEEEAAAQQQQAABBBBAAIEOCfAGWofgWRYBBBBAAAEEEPBNwBhzi4g837fc5EUAgUkF/nt8fPygyy+//I+TXskFeRJQpVLpPc65t+SpFF0QQAABBGYnkCTJ+SMjI6tmN4W7EUAAAQQQQAABBBBAAAEEECieAAewirfnNEYAAQQQQAABBGYkUKlU3qKUeu+MbuYmBBDItIBz7sYoil4qIi7TQQnXagHV29u7Smv91lYPZh4CCCCAgLcCD0xMTOxz/fXXczDb2y0kOAIIIIAAAggggAACCCCAQCcEOIDVCXXWRAABBBBAAAEEPBQol8u7aK3XiUiXh/GJjAACkwucY639wOSXcUXeBPr6+i5TSg3krRd9EEAAAQRmLPC+OI6XzfhubkQAAQQeQ6D5hhR/8cHLAwEEEEAAAQQQQCCvAhzAyuvO0gsBBBBAAAEEEEhBoFwuf1VrfUIKoxmJAAKdF9g0MTHxvJUrV/6481FI0G6BIAguFZEV7V6X9RBAAAEEMikw3tXVdfB11113eybTEQoBBBBAAAEEEEAAAQQQQACBDApwACuDm0IkBBBAAAEEEEAgqwLGmDeIyOqs5iMXAgjMTsA5d/uWLVsOX7Vq1ejsJnG3jwKlUuldzrmLfMxOZgQQQACBlgvcGMfxKS2fykAEEEAAAQQQQAABBBBAAAEEcirAAaycbiy1EEAAAQQQQACBNATOO++8J8+ZM+deEZmTxnxmIoBA5wWSJLmqXq+/ufNJSNAJgSAI3ikiF3dibdZEAAEEEMiWgFLq5Eaj8cVspSINAggggAACCCCAAAIIIIAAAtkU4ABWNveFVAgggAACCCCAQGYFqtXqZ5xzL8tsQIIhgMCsBZIkeW29Xl8z60EM8FKgr6/vXKXUFSKivSxAaAQQQACBVgncsW7duufcdNNN460ayBwEEEAAAQQQQAABBBBAAAEE8irAAay87iy9EEAAAQQQQACBlASWL1/+yq6urk+mNJ6xCCCQDYENWuvDBwcHf56NOKRot0B/f/8rkyQZEZF57V6b9RBAAAEEMiVwThzHH8hUIsIggAACCCCAAAIIIIAAAgggkEEBDmBlcFOIhAACCCCAAAIIZFkgDMPu0dHR34nILlnOSTYEEJi1wE/Gxsaet2rVqtFZT2KAlwK9vb0v1Fp/SkS297IAoYsp0PxNlytmdVojkJLA/d3d3ftee+21D6Q0n7EIIIAAAggggAACCCCAAAII5EKAA1i52EZKIIAAAggggAAC7RUwxlwuIue3d1VWQwCBDgh8yFr7xg6sy5IZEejr6ztQKbVWRHbNSCRiIIAAAgi0X2BlHMfl9i/LiggggAACCCCAAAIIIIAAAgj4I8ABLH/2iqQIIICAxwL8GbrHm0d0BLYqYIw5QER+Cg8CCORfwDnXH0VRI/9NafhYAqVS6RnOuS+KyD4oIYAAAp0Q4CfKTqg/bM2xJEmePTIy8quOJyEAAggggAACCCCAAAIIIIAAAhkV4ABWRjeGWAgggAACCCCAQNYFyuXyd7XWh2c9J/kQQGB2As65v3V1dR0xODj4s9lN4m6fBc4888ydN23adKOIHOpzD7IjgAACCMxMwDn3yeHh4VfP7G7uQgABBBBAAAEEEEAAAQQQQCD/AhzAyv8e0xABBBBAAAEEEEhFwBjzJhF5fyrDGYoAApkScM7dPn/+/OeHYbghU8EI01aBUqm0rXOu+Wlor2zrwiyGAAIIIJAJAefcouHh4a9mIgwhEEAAAQQQQAABBBBAAAEEEMiYAAewMrYhxEEAAQQQQAABBHwRMMZsLyL/LSLzfclMTgQQmJXAp621rxIRN6sp3Oy7gOrv739HkiRvFxF+p+D7bpIfAQQQmJ7AjxYuXHhYGIbJ9G7jagQQQAABBBBAAAEEEEAAAQTyL8AvS/O/xzREAAEEEEAAAQRSE6hUKiNKqdNTW4DBCCCQNQFjrY2yFoo87Rfo7+//lyRJruEQbvvtWREBBBDosMAZcRx/tMMZWB4BBBBAAAEEEEAAAQQQQACBzAlwACtzW0IgBBBAAAEEEEDAH4FKpbJYKfUlfxKTFAEEZimQJElySr1e/8Is53B7DgROO+20Q7q6uj6jlNotB3WogAACCCAwNYH7nHP7Dg8P/+/ULucqBBBAAAEEEEAAAQQQQAABBIohwAGsYuwzLRFAAAEEEEAAgVQEwjDUmzZtuts5t0cqCzAUAQSyKPAnpdThtVrt7iyGI1N7Bc4444ynb968+dPN10R7V2Y1BBBAAIFOCSilLmk0Ghd3an3WRQABBBBAAAEEEEAAAQQQQCCLAhzAyuKukAkBBBBAAAEEEPBIoFKpvFMpxRswHu0ZURFogcBtPT09R4VhuLEFsxjhucDSpUvnjY+PXy0igedViI8AAgggMDWB0SRJ9h8ZGfnN1C7nKgQQQAABBBBAAAEEEEAAAQTyL8ABrPzvMQ0RQAABBBBAAIFUBS666KJnbNmy5U4R0akuxHAEEMiaQGytLWUtFHk6JqBKpVLZOXepiHR3LAULI4AAAgi0RUApNdJoNPrashiLIIAAAggggAACCCCAAAIIIOCBAAewPNgkIiKAAAIIIIAAAlkXKJfL/6m1Pj7rOcmHAAItF3ibtfa9LZ/KQG8F+vv7j5iYmLhBKbWntyUIjgACCCAwFQHnnDt2eHj4W1O5mGsQQAABBBBAAAEEEEAAAQQQyLsAB7DyvsP0QwABBBBAAAEE2iBQLpf7tdbXtWEplkAAgWwJTIjIy621/5GtWKTppMDpp5/+lK6uroaInNzJHKyNAAIIIJCugNb6O0NDQ0eJiEt3JaYjgAACCCCAAAIIIIAAAgggkH2ystAHAAAgAElEQVQBDmBlf49IiAACCCCAAAIIZF4gDMP5o6Oj94rIdpkPS0AEEGi1wANa6yMHBwd/3urBzPNaQAVBUBGR5iMJu7xuQngEEEAAgccT6I3j+HqIEEAAgWIKNN9i4wxqMfee1ggggAACCCCAwKMFOIDFqwIBBBBAAAEEEECgJQLVavUq59w5LRnGEAQQ8ErAOffriYmJIy6//PI/ehWcsKkLlEql45xzzTfmn5b6YiyAAAIIINAJgXXz58/fb/Xq1Rs7sThrIoAAAggggAACCCCAAAIIIJAVAQ5gZWUnyIEAAggggAACCHguUKlU9ldK3S4ifI/p+V4SH4EZCnyjp6dncRiGYzO8n9tyKlAqlZ7qnItFZHFOK1ILAQQQKLSAc+6i4eHh5ice8oUAAggggAACCCCAAAIIIIBAYQV4c6ywW09xBBBAAAEEEECg9QLVavUm59xxrZ/MRAQQ8EHAOfeRKIrO9CErGdsrEIahvvPOO5eJiBWRue1dndUQQAABBFIW2CAi+8Zx3HwkOV8IIIAAAggggAACCCCAAAIIFFKAA1iF3HZKI4AAAggggAAC6QgYY14rIjekM52pCCDgg4Bz7twoit7vQ1Yytl+gVCo9W0SGnHOHtH91VkQAAQQQSEtAKXVNo9H417TmMxcBBBBAAAEEEEAAAQQQQACBrAtwACvrO0Q+BBBAAAEEEEDAI4EwDLtHR0fvEZFdPYpNVAQQaK3AhHPuVVEUfba1Y5mWF4HDDjtsmwMOOODCJEkuEpGuvPSiBwIIIFBwgSRJkiNGRkZuLbgD9RFAAAEEEEAAAQQQQACB/8fen4dJeld14//5VM8eFnlA8YnbjyUkAVlHUARZFMGIgAoDZLp6Mo4hSDDgkOmqTlgsIGG6qyckOuISWZLu6gk4iCA8hAsQIjtiUBAShAQXgo8KAQJktnTfn+/Vzw8RgSQz01XVd933q6+Liz+4P+ec9+tTITPdp6sI1FTAAlZNL15sAgQIECBAgMCgBNrt9ksj4iWDqq8uAQIjIfCNoigeNTs7+/cjMa0hV0Vg27ZtDy+K4vKIOGlVBtCUAAECBPotcFWv13tsv4uqR4AAAQIECBAgQIAAAQIERkHAAtYo3JIZCRAgQIAAAQIjJNBqtU5MKS2/C9baERrbqAQI9F/g3yLi4TMzM//a/9IqVkXgrLPO2nTw4MHdOedzIsL3KKpysXIQIFBngV/r9XpvrjOA7AQIECBAgAABAgQIECBQTwHf3KznvUtNgAABAgQIEBioQLvdfmNEPHWgTRQnQKD0AjnnTx85cuSRl1xyyddKP6wBV1VgfHz8V1JKfxQRP7qqg2hOgAABAisVuO7w4cP3279//5GVFnKeAAECBAgQIECAAAECBAiMkoAFrFG6LbMSIECAAAECBEZEoNVq/UJK6d0jMq4xCRAYrMB7N27c+EudTscPYgfrPPLVl98N68CBA8sfYbsrIsZGPpAABAgQqKlAznnXwsLCRTWNLzYBAgQIECBAgAABAgQI1FTAAlZNL15sAgQIECBAgMCgBVqt1qdSSvcbdB/1CRAYCYHXzszM/OZITGrIVRfYunXrg8bGxv4k5/ywVR/GAAQIECBwPAJfW1paOumKK6748vEcdoYAAQIECBAgQIAAAQIECIyiQM0XsJbj51G8NzMTIECAAAECBEov0Gq1npdS+r3SD2pAAgSGIpBzflG3271wKM00GXmBTqfTuO66686MiD0RcceRDyQAAQIE6ifwh71e77n1iy0xAQIECBAgQIAAAQIECNRVoOYLWHW9drkJECBAgAABAoMXaLVad0wpfdEPzgdvrQOBERHIOedndbvd14zIvMYsgcCOHTtOPHLkyPIy79NKMI4RCBAgQODoBZZSSg+an5//1NEf8SQBAgQIECBAgAABAgQIEBhdAQtYo3t3JidAgAABAgQIlF6g1Wr9SUrprNIPakACBIYlsJRzfnq3233TsBrqUw2BiYmJXy+K4pKU0o9VI5EUBAgQqIXAO3q93mm1SCokAQIECBAgQIAAAQIECNRewAJW7V8CAAgQIECAAAECgxPYtWvXA8bGxj4xuA4qEyAwggIHi6J4wuzs7PtHcHYjr6LAzp07N37pS196XkScHxF3WsVRtCZAgACBoxc4rdfrvePoH/ckAQIECBAgQIAAAQIECBAYTQELWKN5b6YmQIAAAQIECIyMQKvV+kBK6REjM7BBCRAYhsBNEfHomZkZC5rD0K5Yj9NPP/1ua9aseXHO+bkRMVaxeOIQIECgagLXXnvttQ+8+uqrb6laMHkIECBAgAABAgQIECBAgMB3CljA8nogQIAAAQIECBAYqMDk5OTpjUZj30CbKE6AwCgK3BARj5iZmfnXURzezKsvMD4+ft+U0p6I8PFWq38dJiBAgMCtCuScf3thYeFViAgQIECAAAECBAgQIECAQJUFLGBV+XZlI0CAAAECBAiUQKDT6aw5ePDg9RHx4yUYxwgECJRL4LqlpaVH7Nmz5z/LNZZpRklg27Ztj1taWrokpXS/UZrbrAQIEKiLQErpK4cOHTpp//79X6lLZjkJECBAgAABAgQIECBAoH4CFrDqd+cSEyBAgAABAgSGLjA1NXVuznn5XUp8ESBA4LsF/ibn/Lhut/sNNASOV2Dz5s1rTz755Oc0Go3zI+Lux1vHOQIECBAYjEBRFK/ct2/fuYOprioBAgQIECBAgAABAgQIEFh9AQtYq38HJiBAgAABAgQIVF6g1WrdMaX0hYi4c+XDCkiAwDEL5Jw/WBTFE/bs2XPzMR92gMB3CJx11lmbDhw48KyImIqIH4ZDgAABAqURONJoNO4/Nzf32dJMZBACBAgQIECAAAECBAgQINBHAQtYfcRUigABAgQIECBA4NYF2u32RRHxAkYECBC4FYF3Hjhw4Ml79+49TIjASgUmJiZOyDmfGRHneUeslWo6T4AAgf4IFEXx5n379v1af6qpQoAAAQIECBAgQIAAAQIEyiVgAatc92EaAgQIECBAgEBlBVqt1o+mlD4fEWsrG1IwAgRWJJBzftOmTZue0el0FldUyGEC3xL4r0WslNL5OecfAkOAAAECqyvQaDR+cW5u7t2rO4XuBAgQIECAAAECBAgQIECg/wIWsPpvqiIBAgQIECBAgMCtCLRarX0ppdMBESBA4NYEcs6Xb9q0aUen0ykoEeiXwNlnn32Hr3/968+NiHZE3KVfddUhQIAAgWMW+MThw4c379+/f+mYTzpAgAABAgQIECBAgAABAgRKLGABq8SXYzQCBAgQIECAQNUEpqamNuec/7ZqueQhQKC/AjnnP+h2u+f0t6pqBCJ27NhxxyNHjuyIiJ0R8RNMCBAgQGD4AimlM+fn518z/M46EiBAgAABAgQIECBAgACBwQlYwBqcrcoECBAgQIAAAQLfR2BqauqqnPOj4RAgQOC2BHLOL+92uy+hRGAQAp1Op3H99dc/cfmjCYui+JlB9FCTAAECBL6/QErpP4uiOGlhYeHrjAgQIECAAAECBAgQIECAQFUELGBV5SblIECAAAECBAiMiEC73X5SRPzliIxrTAIEVlfgxTMzMxes7gi6V11g27ZtjyyK4nkR8esRMVb1vPIRIECgJAKv6PV6LyzJLMYgQIAAAQIECBAgQIAAAQIrFrCAtWJCBQgQIECAAAECBI5RILXb7U9HxKnHeM7jBAjUUCDn/KJut3thDaOLPGSBZzzjGfdat27d83LOZ0bEpiG3144AAQJ1Ezi0uLh46utf//p/rltweQkQIECAAAECBAgQIECgmgIWsKp5r1IRIECAAAECBEot0G63nx0Rf1zqIQ1HgEBpBHLO53e73d2lGcgglRY4/fTT79ZoNM5oNBrPyjmfXOmwwhEgQGB1BV7f6/VOX90RdCdAgAABAgQIECBAgAABAv0RsIDVH0dVCBAgQIAAAQIEjkGg0+lsOHjw4PJvu9/9GI55lACBGguklKamp6dnakwg+ioIbN26dXOj0TgrIpreFWsVLkBLAgSqLpAbjcaj5ubmPlD1oPIRIECAAAECBAgQIECAQPUFLGBV/44lJECAAAECBAiUUmBqaqqTc/7dUg5nKAIEyiiQi6J4/uzs7N4yDmemagts2bLlzuvXr39GRJwdEQ+sdlrpCBAgMFSBj/Z6vYdHRB5qV80IECBAgAABAgQIECBAgECfBSxg9RlUOQKDEVj+R9X3oQZjqyoBAgQIrJbAeeed94NFUfxLRGxcrRn0JUBg5ASW/1B8zszMzKtGbnIDV0ag2Wz+bM75WSmlp0XEHSoTTBACBAisnkCz1+strF57nQkQIECAAAECBAgQIECAwMoFLGCt3FAFAgQIECBAgACB4xRot9uXRsSzjvO4YwQI1FMgp5TOnp6e/uN6xpe6LALbt2/fsLS09IsRsSXn/OsRcUJZZjMHAQIERkzghpTSKfPz8zeP2NzGJUCAAAECBAgQIECAAAEC3xawgOXFQIAAAQIECBAgsGoCk5OT92o0Gp+JiDWrNoTGBAiMokDOOb+g2+1eMorDm7l6AmedddamgwcPPjEituWcHx8R66qXUiICBAgMVOAlvV7v5QPtoDgBAgQIECBAgAABAgQIEBiggAWsAeIqTYAAAQIECBAgcPsCU1NTvZzz+O0/6Ym+CSx/iJu/CfSNU6FVFXjxzMzMBas6geYEvktg69atd2k0Gk9KKS2/M9YvWTL2EiFAgMBRCRxYu3btKa973eu+cFRPe4gAAQIECBAgQIAAAQIECJRMwI9dSnYhxiFAgAABAgQI1E2g1WqdmlL6VEQ06pZdXgIEVi6Qc+50u92XrrySCgT6L3DmmWfe/VvvjPXElNLyxxXesf9dVCRAgEA1BHLOly0sLPxGNdJIQYAAAQIECBAgQIAAAQJ1E7CAVbcbl3dEBZb/UV1+qwpfBAgQIECgmgKtVmt/Sulp1UwnFQECgxbIOc90u92pQfdRn8BKBLZs2TK2cePGhxdF8SsR8biI2LySes4SIECgggJFSumn5+fn/7aC2UQiQIAAAQIECBAgQIAAgYoLWMCq+AWLR4AAAQIECBAYBYF2u/3AiPg7H4w3CrdlRgLlFCiKYs/s7OxkOaczFYHvFdi6des9G43G41JKT8o5L7871npOBAgQIBAf6vV6j/SbiF4JBAgQIECAAAECBAgQIDBqAhawRu3GzEuAAAECBAgQqKhAq9V6a0pp+V1BfBEgQOB4BX5vZmZmpx/aHi+fc6slcNZZZ206dOjQQ4qieETOeXkpa3n5YMNqzaMvAQIEVlMgpfTU+fn5N63mDHoTIECAAAECBAgQIECAAIFjFbCAdaxinidAgAABAgQIEBiIwHnnnffTRVF8ZCDFFSVAoE4Ccxs3bvzNTqezWKfQslZL4DGPecyaE0888YHfeoesR+acfy4i7lytlNIQIEDgVgU+f+ONN973yiuvPMyIAAECBKorsPwDylzdeJIRIECAAAECNRSwgFXDSxeZAAECBAgQIFBWgXa7/a6IeFxZ5zMXAQIjI/DmAwcOPHPv3r1+cDsyV2bQ2xLYvHnz2lNPPfWhEbG8iPVTEfGQiLgnNQIECFRYoNXr9WYrnE80AgQIECBAgAABAgQIEKiYgAWsil2oOAQIECBAgACBURaYnJx8dKPRuGqUM5idAIHSCPzVxo0bf7XT6XyzNBMZhEAfBcbHx+80Njb2gKIoNqeUNuecN0fEKRHR6GMbpQgQILBaAt9Ys2bNfS677LJ/X60B9CVAgAABAgQIECBAgAABAsciYAHrWLQ8S4AAAQIECBAgMHCBVqv1vpTS8jt8+CJAgMCKBHLO708pPWlmZuamFRVymMCICCwvZTUajQd/ayHrQTnnB0bEqRGxdkQiGJMAAQLfFsg5//HCwsJzkBAgQIAAAQIECBAgQIAAgVEQsIA1CrdkRgIECBAgQIBAjQTa7fYTIuIdNYosKgECgxX4eKPR+KXdu3d/abBtVCdQToEtW7asGxsbu9/yu2WllJYXspbfKWv5PyeUc2JTESBA4NsCiymlB8/Pz3+KCQECBAgQIECAAAECBAgQKLuABayy35D5CBAgQIAAAQI1FJicnPybRqPx0BpGF5kAgQEIFEXxmXXr1j3+wgsv/MIAyitJYOQEtmzZMrZx48b7FUXxsJTSw3LOD4uIn4yIsZELY2ACBCotkHN+58LCwvIvaPgiQIAAAQIECBAgQIAAAQKlFrCAVerrMRwBAgQIECBAoJ4CrVbrySmlt9QzvdQECAxCIKX0L0VRPKHb7f7jIOqrSWDUBSYmJk5YfqeZoigekXN+XErpERGxcdRzmZ8AgdEXSCk9cX5+/u2jn0QCAgQIECBAgAABAgQIEKiygAWsKt+ubAQIECBAgACB0RVI7Xb7byPiIaMbweQECJRQ4CtFUTx5dnb2gyWczUgESiVw2mmnrf/BH/zBhy4tLf18SukXI+KnI2JtqYY0DAECdRG49tprr33g1VdffUtdAstJgAABAgQIECBAgAABAqMnYAFr9O7MxAQIECBAgACBWghMTk5uaTQaf1aLsEISIDA0gZzzzWNjY0/fvXu3d9IYmrpGVRA4++yz73DTTTc9ptFoLC9jPT7nfEoVcslAgMBoCOScn7ewsLB3NKY1JQECBAgQIECAAAECBAjUUcACVh1vXWYCBAgQIECAwGgILL8L1scj4kGjMa4pCRAYIYGliHjOzMzMn47QzEYlUCqBiYmJe+ScfzGl9KTl/46I9aUa0DAECFRN4KuNRuOkubm5G6sWTB4CBAgQIECAAAECBAgQqIaABaxq3KMUBAgQIECAAIFKCrRarSenlN5SyXBCESCw2gI5pfSy6enpzmoPoj+BURcYHx+/U6PReELO+dcj4lci4g6jnsn8BAiUTyCldMn8/PzO8k1mIgIECBAgQIAAAQIECBAgEGEBy6uAAAECBAgQIECg1ALtdvvDEfEzpR7ScAQIjKxAzvkPNm3a9PxOp1OMbAiDEyiRwPbt2zcsLS0tvyPWlpzzUyLiTiUazygECIy2wC2NRuMn5+bmPjvaMUxPgAABAgQIECBAgAABAlUUsIBVxVuViQABAgQIECBQIYFdu3Y9bmxs7F0ViiQKAQIlE8g5v+HgwYNn7N2793DJRjMOgZEWWF7GKoriV4qi2BYRvxQRa0c6kOEJECiDwF/2er3l5U5fBAgQIECAAAECBAgQIECgVAIWsEp1HYYhQIAAAQIECBD4fgLtdvs9EfFYOgQIEBiUQM75w2NjY0/ZvXv3lwbVQ10CdRbYunXrXRqNxpaIWF7GekSdLWQnQGDFAo/v9Xp+QWPFjAoQIECAAAECBAgQIECAQD8FLGD1U1MtAgQIECBAgACBgQi02+2fjYgPDqS4ogQIEPhvgesajcYTd+/e7aONvCoIDFBg+/btpywuLm5PKT0r5/y/BthKaQIEqinwicOHD2/ev3//UjXjSUWAAAECBAgQIECAAAECoyhgAWsUb83MBAgQIECAAIEaCrRarf+TUvrlGkYXmQCB4QrcGBG/OjMz84HhttWNQP0Elj+icGlp6UlFUZyVUnpc/QQkJkBgBQLP6vV6r17BeUcJECBAgAABAgQIECBAgEBfBSxg9ZVTMQIECBAgQIAAgUEJ7Nq16wFjY2N/FxGNQfVQlwABAt8SOBwR22dmZl5PhACB4Qg0m82HpJR+J+f8zIhYO5yuuhAgMKoCKaX/PHTo0H32799/06hmMDcBAgQIECBAgAABAgQIVEvAAla17lMaAgQIECBAgEClBVqt1v6U0tMqHVI4AgTKIpBTSi+bnp7ulGUgcxCog8D27dt/uCiK3yqK4rcj4q51yCwjAQLHJ5BSmp6fnz/v+E47RYAAAQIECBAgQIAAAQIE+itgAau/nqoRIECAAAECBAgMUOC88867T1EUn46INQNsozQBAgS+LZBzfvWmTZue0+l0FrEQIDA8gYmJiROWlpbOajQauyLixOF11okAgRESOLS4uHjq61//+n8eoZmNSoAAAQIECBAgQIAAAQIVFbCAVdGLFYsAAQIECBAgUFWBVqt1WUrpjKrmk4sAgfIJ5JzffvDgwdP37t379fJNZyIC1RbYsmXLuvXr1y9/LOGLIuKkaqeVjgCB4xD4s16v94zjOOcIAQIECBAgQIAAAQIECBDoq4AFrL5yKkaAAAECBAgQIDBogXPPPfcn1qxZ89mIWDfoXuoTIEDgvwRyzp9at27dky+44IJ/okKAwPAFNm/evPbUU09tRsTvRsRPDH8CHQkQKKlAzjn/3MLCwgdLOp+xCBAgQIAAAQIECBAgQKAmAhawanLRYhIgQIAAAQIEqiTQbrf/MCKeU6VMshAgMBICN6aUnjY9PX3VSExrSAIVFPjWItZvREQnIv53BSOKRIDAsQt8/N73vvdDO51OcexHnSBAgAABAgQIECBAgAABAv0RsIDVH0dVCBAgQIAAAQIEhihw/vnn/++lpaXrImLTENtqRYAAgWWBIznn3+p2u6/DQYDA6glMTEyckHN+fkS0I+JOqzeJzgQIlEEg5zyxsLDQK8MsZiBAgAABAgT+p8DyD6MzFAIECBAgUAMBC1g1uGQRCRAgQIAAAQJVFJicnJxtNBq7qphNJgIEyi+Qc57dtGnTlHfbKP9dmbDaAtu2bbtrzvklOefnRsRYtdNKR4DAbQh8MaV08vz8/M2UCBAgQIAAAQIECBAgQIDAaghYwFoNdT0JECBAgAABAgRWLDA1NXWXnPPnIuKuKy6mAAECBI5DIOf8jpTSM2dmZm46juOOECDQR4GJiYlTc84XRcRpfSyrFAECIyRQFEVn3759Lx2hkY1KgAABAgQIECBAgAABAhUSsIBVocsUhQABAgQIECBQN4GpqamdOedX1i23vAQIlErgH9auXfuUCy644J9KNZVhCNRUYNu2bU8riuKSiPiRmhKITaDOAjc3Go2T5+bmvlhnBNkJECBAgAABAgQIECBAYHUELGCtjruuBAgQIECAAAECfRDodDrrDh48+KmIOKkP5ZQgQIDA8Qp8Jef8zG63+67jLeAcAQL9EzjrrLM2HThw4CURcW5ErOlfZZUIECi7QFEUc/v27Tuj7HOajwABAgQIECBAgAABAgSqJ2ABq3p3KhEBAgQIECBAoFYCk5OTWxqNxp/VKrSwBAiUUWAppfTC6enpmTIOZyYCdRR45jOf+eCxsbE/SSk9tI75ZSZQU4EipfTT8/Pzf1vT/GITIECAAAECBAgQIECAwCoJWMBaJXhtCRAgQIAAAQIE+ifQarU+kFJ6RP8qqkSAAIHjFnj9xo0bf7PT6Rw47goOEiDQN4EtW7aMrV+/fldEdCJiQ98KK0SAQGkFcs4fXlhYWP67QS7tkAYjQIAAAQIECBAgQIAAgcoJWMCq3JUKRIAAAQIECBCon8B5553300VRfDgi/Pm2ftcvMYEyCvx9SunXpqen/7mMw5mJQB0FxsfH79toNF6Xc35YHfPLTKBuAo1GY8vc3Nwb65ZbXgIECBAgQIAAAQIECBBYPQE/oFo9e50JECBAgAABAgT6KNBqtd6QUnp6H0sqRYAAgZUIfDml9Izp6en3rKSIswQI9E/gMY95zJof+7Efm8w5vzQi1vavskoECJRQ4PM33njjfa+88srDJZzNSAQIECBAgAABAgQIECBQQQELWBW8VJEIECBAgAABAnUUmJycvFej0bgmItbVMb/MBAiUUuCWnPMLut3uH5RyOkMRqKnAxMTET+Wc90XESTUlEJtAXQSmer3eTF3CykmAAAECBAgQIECAAAECqytgAWt1/XUnQIDAUQos/991PspnPUaAAIH6CrTb7Ysi4gX1FZCcAIGSCuxbWlo6a8+ePTeXdD5jEaidwM6dOzd++ctfns45P6924QUmUB+Bb6xZs+Y+l1122b/XJ7KkBAgQIECAAAECBAgQILBaAhawVkteXwIECBAgQIAAgb4LTE1N3SXn/LmIuGvfiytIgACBFQgURfGZNWvWPHX37t3L79TniwCBkgiMj49vTSn9SUTcoSQjGYMAgf4KXNrr9Z7d35KqESBAgAABAgQIECBAgACB7xWwgOVVQYAAAQIECBAgUCmBqampnTnnV1YqlDAECFRF4Bs55x3dbveNVQkkB4EqCDSbzZNzzn+eUrpfFfLIQIDA/xBYajQaD5mbm/skFwIECBAgQIAAAQIECBAgMEgBC1iD1FWbAAECBAgQIEBg6AKdTmfdwYMHPxURJw29uYYECBC4fYGcc977ta99bdell156y+0/7gkCBIYhcPbZZ9/hpptuenVK6RnD6KcHAQLDE0gpvWd+fv4XhtdRJwIECBAgQIAAAQIECBCoo4AFrDreuswECBAgQIAAgYoLTE5Obmk0Gn9W8ZjiESAw2gLvK4riGbOzs/8+2jFMT6BaAuPj4+emlGYiYqxayaQhUG+BnPOTFhYW3lZvBekJECBAgAABAgQGK7C8epEH20J1AgRKLWABq9TXYzgCBAgQIECAAIHjFEitVuuDKaWHH+d5xwgQIDAMgS9GxNNnZmY+NIxmehAgcHQCExMTT8g5vz4ifuDoTniKAIERELju8OHD99u/f/+REZjViAQIECBAgAABAgQIECAwggIWsEbw0oxMgAABAgQIECBw+wKtVutnUkrLSw3+zHv7XJ4gQGD1BG5JKZ03PT39Sr8muXqXoDOB7xbYunXrSWNjY2/NOZ9MhwCBaggURfH8ffv2/X410khBgAABAgQIECBAgAABAmUT8MOost2IeQgQIECAAAECBPom0G63L4+IbX0rqBABAgQGJFAUxVsXFxe3X3zxxV8ZUAtlCRA4RoFt27bdtSiKv4iInzvGox4nQKCEAimlrxw6dOik/fv3+3dtCe/HSAQIECBAgAABAmd3laAAACAASURBVAQIEBh1AQtYo36D5idAgAABAgQIELhVgfPPP//uS0tL/xgRd8ZEgACBsgvknL+Qcz59dnb2g2Wf1XwE6iJw2mmnrb/rXe96WUQ8sy6Z5SRQZYGU0u/Pz88/v8oZZSNAgAABAgQIECBAgACB1RGwgLU67roSIECAAAECBAgMSWBqaurcnPOeIbXThgABAisVWEwpXbhhw4aXdTqdYqXFnCdAoC8CaXx8fDql1OpLNUUIEFhNgcWxsbEHXX755Z9ezSH0JkCAAAECBAgQIECAAIHqCVjAqt6dSkSAAAECBAgQIPAdAp1OZ83Bgwc/HhH3B0OAAIFREfCRhKNyU+ask8D4+Pi5KaXZiPD9tDpdvKyVE0gpvW1+fv5JlQsmEAECBAgQIECAAAECBAisqoBvGK0qv+YECBAgQIAAAQLDEGi1Wr+QUnr3MHrpQYAAgX4JLH8kYUrpmTMzMx/qV011CBBYmcD4+HgzpfS6iFizskpOEyCwmgJjY2NPuPzyy9+5mjPoTYAAAQIECBAgQIAAAQLVErCAVa37lIYAAQIECBAgQOBWBFqt1p+nlH4dEAECBEZMwEcSjtiFGbf6Atu2bXtGURTzEbG2+mklJFBZgWtuuOGGB1511VWLlU0oGAECBAgQIECAAAECBAgMVcAC1lC5NSNAgAABAgQIEFgtgRe+8IU/dsstt1ybUjphtWbQlwABAisQeO+RI0cmLr744i+uoIajBAj0SaDZbD4xIvZHxMY+lVSGAIHhCzy71+tdOvy2OhIgQIAAAQIECBAgQIBAFQUsYFXxVmUiQIAAAQIECBD4vgKTk5MvaTQaL8VDgACBERX4ckTsmJmZeeuIzm9sApUSOOOMMx6/tLT0lojYUKlgwhCoiUBK6T8PHTp0n/37999Uk8hiEiBAgAABAgQIECBAgMAABSxgDRBXaQIECBAgQIAAgXIJdDqdDQcOHLgmpXSPck1mGgIECBy1QM45/+mmTZt2djqdA0d9yoMECAxEYGJi4gk55zdbwhoIr6IEhiEw0+v1pobRSA8CBAgQIECAAAECBAgQqLaABaxq3690BAgQIECAAAEC3yXQarV+NaX0F2AIECAwygI550+nlE6fmZn5h1HOYXYCVRBoNpu/FBHLf7bwTlhVuFAZ6iZwJCLu1+v1rqtbcHkJECBAgAABAgQIECBAoL8CFrD666kaAQIECBAgQIDACAi0Wq23p5ROG4FRjUiAAIHbEjgYEefNzMz8HiYCBFZXYOvWrU9pNBpvjIg1qzuJ7gQIHIfAG3u93pbjOOcIAQIECBAgQIAAAQIECBD4toAFLC8GAgQIECBAgACB2gm0Wq2TU0qfjIh1tQsvMAEClRPIOb9paWnp2RdddNGXKxdOIAIjJDA+Pt5MKc1FhO+3jdC9GZXAskBRFI/et2/f+2gQKIvA8r9IclmGMQcBAgQIECBAgAABAkcl4BtCR8XkIQIECBAgQIAAgaoJtFqtbkppsmq55CFAoLYC/1EUxZmzs7Nvq62A4ARKINBsNs+PiAtLMIoRCBA4BoGU0t/d6173+qlOp1McwzGPEiBAgAABAgQIECBAgACBbwtYwPJiIECAAAECBAgQqKVAq9W6Y0rpMxFxYi0BhCZAoIoCOef8p0VRvGDPnj03VzGgTARGQWBiYuLinPPvjMKsZiRA4H8InNHr9Zbfxc4XAQIECBAgQIAAAQIECBA4ZgELWMdM5gABAgQIECBAgEBVBNrt9jMj4oqq5JGDAAECywJFUXxmbGysOT09fTURAgRWRSBNTExcnnOeWJXumhIgcLwCX0wpnTw/P2+J+XgFnSNAgAABAgQIECBAgECNBSxg1fjyRSdAgAABAgQIEIhotVpvTSn9CgsCBAhUTGAxpXTh9ddf//L9+/cvVSybOARKL7Bly5Z169atW/4zxuNLP+ztDLj8zcM86iHMT+AoBRqNxkvn5uY6R/m4xwgQIECAAAECBAgQIECAwLcFLGB5MRAgQIAAAQIECNRa4Nxzz/2JsbGxT6eUTqg1hPAECFRV4CMppYnp6enrqhpQLgJlFdixY8cdjxw5clVEPKSsM5qLAIHvETjYaDROmZub+9fS2diGLN2VGIgAAQIECBAgQIAAAQLfKWABy+uBAAECBAgQIECg9gLtdrsVETO1hwBAgEBVBb6RUnrB9PT0a7yRTVWvWK6yCmzfvv2HFxcXPxgR9yzrjOYiQOB7BHq9Xs9HiHphECBAgAABAgQIECBAgMAxCVjAOiYuDxMgQIAAAQIECFRRoNPprDl48ODfRMSDq5hPJgIECHxL4J0559/sdrs3ECFAYHgC27dvP2VxcfGjEXGn4XXViQCBFQjkRqPxM3Nzc8t/P/BFgAABAgQIECBAgAABAgSOSsAC1lExeYgAAQIECBAgQKDqAlNTUw/NOX84IsaqnlU+AgRqLXBTSqk1PT19aa0VhCcwZIGtW7c+pdFo/EVE+F7ckO21I3A8Ast/L1hYWHiEd448Hj1nCBAgQIAAAQIECBAgUE8B3/Sp571LTYAAAQIECBAg8H0EpqamXpVzPhsOAQIEqi6Qc357RDyr2+3+W9WzykegLALNZvNlEfHissxjDgIEblfgGb1e789u9ykPECBAgAABAgQIECBAgAABv3XnNUCAAAECBAgQIEDgvwXOOeecO23atOmaiPgRLgQIEKiBwNdyzs/rdrvzNcgqIoEyCKSJiYn9OeenlmEYMxAgcNsCOecvnHDCCadceumlB1gRIECAAAECBAgQIECAAIHbE/AOWLcn5H8nQIAAAQIECBColUCr1XpaSml/rUILW2OB7Pdyanz73xF9/+Li4tkXXXTRl3EQIDBYgR07dtzx8OHDH04p3W+wnVQnQKAfAjnn8xYWFqb7UUsNAgQIECBAgAABAgQIEKi2gAWsat+vdAQIECBAgAABAsch0Gq13ppS+pXjOOoIAQIERlXg33POz+12u28a1QDmJjAqAtu2bbtPURQfjYgfGJWZzUmgxgLfiIiTe73e/62xgegECBAgQIAAAQIECBAgcBQCFrCOAskjBAgQIECAAAEC9RJot9s/HhGfjog71Cu5tAQI1F0g5/y2iHh2t9v9t7pbyE9gkAJnnHHG45eWlt4eEWOD7KM2AQIrF2g0Gq+em5t71sorqUCAAAECBAgQIECAAAECVRawgFXl25WNAAECBAgQIEDguAWmpqbOzTnvOe4CDhIgQGB0Bb6WUmpPT09fOroRTE6g/ALj4+MvTCldUP5JTUig9gJLEbG51+t9ovYSAAgQIECAAAECBAgQIEDgVgUsYHlxECBAgAABAgQIEPg+Alu2bBm75z3v+TcR8RBABAgQqKNAzvnKtWvXPvvCCy/8Qh3zy0xg0AKdTqdx3XXXvSMifnHQvdQnQGBlAiml987Pz//8yqo4TYAAAQIECBAgQIAAAQJVFrCAVeXblY0AAQIECBAgQGBFAq1W66dSSh/x8UArYnSYAIHRFrgppdSanp7+04jIox3F9ATKJ3DmmWfe/dChQ38fET9cvulMRIDAdwk8pdfr/SUVAgQIECBAgAABAgQIECDw/QQsYHldECBAgAABAgQIELgNgXa7fUlEPB8SAQIEai7w7rVr1551wQUX/FPNHcQn0HeBZrP5SxHx9ojwfbq+6ypIoK8C19944433u/LKKw/3tapiBAgQIECAAAECBAgQIFAJAd/YqcQ1CkGAAAECBAgQIDAogU6ns+ngwYOfiIh7D6qHugQIEBgRgQMppZddf/31e/bv3780IjMbk8BICExMTFycc/6dkRjWkARqLJBz3rmwsLD8Cxq+CBAgQIAAAQIECBAgQIDA/xCwgOUFQYAAAQIECBAgQOB2BCYnJx/RaDTeFxENWAQIECAQn0gpPWt6evpjLAgQ6I/Aaaedtv5ud7vbh3POD+5PRVUIEBiQwFeXlpbuc8UVV3x5QPWVJUCAAAECBAgQIECAAIERFbCANaIXZ2wCBAgQIECAAIHhCkxOTv5Bo9F47nC76kaAAIHSCizmnP9w06ZNL+x0Ot8s7ZQGIzBCAs1mc/ndNj8eEXccobGNSqB2AimlvfPz88+rXXCBCRAgQIAAAQIECBAgQOA2BSxgeYEQIECAAAECBAgQOAqBXbt2nTA2Nrb8UYT3OorHPUKAAIFaCOSc/ynnfPbs7Ow7ahFYSAIDFpiYmPjNnPOrB9xGeQIEViawODY29qDLL7/80ysr4zQBAgQIECBAgAABAgQIVEnAAlaVblMWAgQIECBAgACBgQq0Wq3HppT+KiL8OXqg0ooTIDCCAvuXlpZ+e8+ePf85grMbmUCpBCYmJhZyzltLNZRhCBD4boG393q9J2IhQIAAAQIECBAgQIAAAQL/JeAHR14LBAgQIECAAAECBI5BoNVq/VFK6beO4YhHCRAgUBeBrxRFce7s7OzlEZHrElpOAv0W2L59+w8sLi4uv7POif2urR4BAv0TGBsbe8Lll1/+zv5VVIkAAQIECBAgQIAAAQIERlnAAtYo357ZCRAgQIAAAQIEhi6w/FGEjUbjkymlew69uYYECBAYAYGc8/uLojh7z549nxqBcY1IoJQCzWZz+Z113lbK4QxFgMB/CVx7ww03POCqq65aREKAAAECBAgQIECAAAECBCxgeQ0QIECAAAECBAgQOEaBqampn885v9tHER4jnMcJEKiTwC055z/atGnTCzudzjfrFFxWAv0SaDabvYgY71c9dQgQ6L9ASuk58/Pzf9z/yioSIECAAAECBAgQIECAwKgJWMAatRszLwECBAgQIECAQCkE2u32pRHxrFIMYwgCBAiUV+CLOeff6Xa7byzviCYjUE6Bbdu23bUoiuV3kvvhck5oKgIEIuJLhw8fPmn//v030SBAgAABAgQIECBAgACBegtYwKr3/UtPgAABAgQIECBwnALnnHPOnTZt2vQPEfHjx1nCMQIECNRGIOf8tkajcc709PQ/1ya0oAT6INBsNp8cEW/pQyklCBAYnMBsr9drDa68ygQIECBAgAABAgQIECAwCgIWsEbhlsxIgAABAgQIECBQSoFdu3Y9bmxs7J0+irCU12MoAgTKJ3AgpTS7YcOGV3Q6nSPlG89EBMop0Gw23xARTy/ndKYiQCAijhRF8ZP79u37HA0CBAgQIECAAAECBAgQqK+ABaz63r3kBAgQIECAAAECfRBotVqvTSn9Rh9KKUGAAIFaCOScP5VzPnt2dvb9tQgsJIEVCpx++ul3W7Nmzadzzj+0wlKOEyAwIIGc85sWFhaeOqDyyhIgQIAAAQIECBAgQIDACAhYwBqBSzIiAQIECBAgQIBAeQXa7fadc87/kFL6sfJOaTICBAiUT2D5YwnXrl179oUXXviF8k1nIgLlEpiYmHhmzvmKck1lGgIEvlMgpfSY+fn5v6ZCgAABAgQIECBAgAABAvUUsIBVz3uXmgABAgQIECBAoI8C7Xb7iRHxtj6WVIoAAQJ1EfhGRLzsq1/96u9deumlt9QltJwEjkdgfHz8z1NKv348Z50hQGAoAn9/73vfe3On0ymG0k0TAgQIECBAgAABAgQIECiVgAWsUl2HYQgQIECAAAECBEZVoN1uXxoRzxrV+c1NgACBVRb4bFEUz5+dnX3HKs+hPYHSCmzfvv2HFxcXPxMRdy7tkAYjUHOBoih+Y9++fZfVnEF8AgQIECBAgAABAgQI1FLAAlYtr11oAgQIECBAgACBfgvs2rXrhLGxsY9HxH36XVs9AgQI1EVg+WMJG43GOdPT0/9cl8xyEjgWgfHx8XNTSnuO5YxnCRAYqsB/rFu37qTXvva1y+/w6IsAAQIECBAgQIAAAQIEaiRgAatGly0qAQIECBAgQIDAYAVardZPpZQ+FBFrB9tJdQIECFRa4GBKqbthw4bpTqdzqNJJhSNwjAKPecxj1vzoj/7o30bEA4/xqMcJEBiewMt7vd5LhtdOJwIECBAgQIAAAQIECBAog4AFrDLcghkIECBAgAABAgQqI9But18aEX7gUpkbFYQAgVUUuD7n/IJut/uXqziD1gRKJ7Bt27ZHFkXxvojwfb3S3Y6BCPw/gYNFUZy6b9++f+FBgAABAgQIECBAgAABAvUR8I2a+ty1pAQIECBAgAABAkMQ6HQ6aw4ePPiBiPjpIbTTggABApUXKIriPTnnnXv27Plk5cMKSOAoBSYmJuZyzhNH+bjHCBAYskBKad/8/Pz4kNtqR4AAAQIECBAgQIAAAQKrKGABaxXxtSZAgAABAgQIEKimwOTk5L0ajcbfR8QdqplQKgIECAxdYDHn/NqxsbEX7d69+0tD764hgZIJnHnmmXc/dOjQZyLiB0o2mnEIEPj/C+Sc888tLCx8EAgBAgQIECBAgAABAgQI1EPAAlY97llKAgQIECBAgACBIQu02+3nRMQfDrmtdgQIEKi6wFdTSjMbNmy4uNPpHKl6WPkI3JZAs9n87YjYS4kAgXIKNBqNj8zNzf3s8jJWOSc0FQECBAgQIECAAAECBAj0U8ACVj811SJAgAABAgQIECDw3wKp1Wr9ZUrpV6AQIECAQN8F/rHRaLxg9+7db+97ZQUJjIhAp9NpfO5zn/tISumhIzKyMQnUTiCldPr8/PzraxdcYAIECBAgQIAAAQIECNRQwAJWDS9dZAIECBAgQIAAgeEI7Nq164fGxsY+GRF3H05HXQgQIFA7gXc3Go3n7969+5raJReYQERs3779oYuLix+JiAYQAgRKKXDDpk2bTr700ksPlHI6QxEgQIAAAQIECBAgQIBA3wQsYPWNUiECBAgQIECAAAEC3yuwa9euXxsbG3sTGwIECBAYmMDyRxG+6siRIxdcfPHFXxlYF4UJlFRgYmLiNTnnHSUdz1gECES8sNfrvQIEAQIECBAgQIAAAQIECFRbwAJWte9XOgIECBAgQIAAgRIItFqt16aUfqMEoxiBAAECVRb4Zkrpog0bNkx3Op1DVQ4qG4HvFJiYmPihnPPnIuJOZAgQKKXANyPiPr1e7/+WcjpDESBAgAABAgQIECBAgEBfBCxg9YVREQIECBAgQIAAAQK3LrBr164TxsbG/i4iTuJEoI4COSL85bOON79qmW9IKb38+uuvf83+/fuXVm0KjQkMUaDZbL44Il42xJZaESBwbAKv6fV6Zx7bEU8TIECAAAECBAgQIECAwCgJ+B74KN2WWQkQIECAAAECBEZWoN1u/2xEvC8ixkY2hMEJECAwQgI550+PjY21du/e/fYRGtuoBI5LYOfOnRu/9KUvfSYifvy4CjhEgMCgBYqiKB62b9++qwfdSH0CBAgQIECAAAECBAgQWB0BC1ir464rAQIECBAgQIBADQXa7faFEXF+DaOLTIAAgVUTyDm/vSiK9p49ez61akNoTGAIAlu3bp1oNBpzQ2ilBQECxydwVa/Xe+zxHXWKAAECBAgQIECAAAECBMouYAGr7DdkPgIECBAgQIAAgcoIdDqdNQcOHPjrlNLyu2H5IkCAAIHhCRQR8eeLi4uTF1100b8Mr61OBIYqkMbHxz+aUnroULtqRoDAsQj8Wq/Xe/OxHPAsAQIECBAgQIAAAQIECIyGgAWs0bgnUxIgQIAAAQIECFRE4IUvfOGPLS4u/n1E/K+KRBKDAAECoyRwIOe8N6W0e2Zm5qZRGtysBI5GoNlsLi95fyAifM/vaMA8Q2D4Ap+/8cYb73vllVceHn5rHQkQIECAAAECBAgQIEBgkAK+GTNIXbUJECBAgAABAgQIfB+Bqampp+ac3wiHAAECBFZN4MaU0uyGDRsu7nQ6R1ZtCo0JDEBgfHz8z1NKvz6A0koSINAHgUajce7c3Nwr+1BKCQIECBAgQIAAAQIECBAokYAFrBJdhlEIECBAgAABAgTqI9But/84Ip5dn8SSEiBAoJQCny2K4kWzs7PLS7G5lBMaisAxCmzduvWejUbjmohYf4xHPU6AwHAEvra0tHTSFVdc8eXhtNOFAAECBAgQIECAAAECBIYhYAFrGMp6ECBAgAABAgQIEPgugU6ns+HgwYMfiYgHwiFAgACBVRf4aFEUk7Ozs+9f9UkMQKAPAs1mc/nddXb2oZQSBAgMQCCl9Kr5+fnfHkBpJYctsPwTFivcw1bXjwABAgQIECBAgEApBSxglfJaDEWAAAECBAgQIFAHgfPOO+++RVF8LCI21SGvjAQIECi7QM75bY1GY+f09PR1ZZ/VfARuS2Dr1q13GRsbuy7n/L9IESBQSoHFnPMDFxYWlt+tzhcBAgQIECBAgAABAgQIVEDAAtagL9FvwAxaWH0CBAgQIECAwEgLTE1NnZlz/tORDmF4AgQIVEvgSET8SVEUr5idnf33akWTpk4C4+Pj56aU9tQps6wERkzgr3q93uNGbGbjEiBAgAABAgQIECBAgMCtCFjA8tIgQIAAAQIECBAgsMoC7XZ7ISK2rvIY2hMgQIDA/xQ4kHN+9Zo1a17xile84j/gEBg1gS1btqxbv379tRFxz1Gb3bwEaiRwWq/Xe0eN8opKgAABAgQIECBAgACBygpYwKrs1QpGgAABAgQIECAwKgKdTucOBw8evDoi7jMqM5uTAAECNRL4Zs75VUeOHJm+5JJLvlaj3KJWQGB8fLyZUpqvQBQRCFRV4Nprr732gVdfffUtVQ0oFwECBAgQIECAAAECBOoiYAGrLjctJwECBAgQIECAQKkFWq3WT6WUPhgR60o9qOEIECBQX4GvpJT23nzzza/cu3fv1+vLIPmICaRms/mxiNg8YnMbl0BtBHLOz11YWPjD2gQWlAABAgQIECBAgAABAhUVsIBV0YsViwABAgQIECBAYPQEWq3WZEqpO3qTm5jACgVyRPjb6QoRHR+iwJdTSnsOHz78+xdffPHBIfbVisBxCTSbzcdExHuP67BDBAgMXCCl9JVDhw6dtH///q8MvJkGBAgQIECAAAECBAgQIDAwAd/iHhitwgQIECBAgAABAgSOWSBNTk6+pdFoPOmYTzpAgAABAsMWuCEi9hw4cOCP9+7de3jYzfUjcCwC4+Pj70gpPeFYzniWAIHhCaSULpqfn981vI46ESBAgAABAgQIECBAgEC/BSxg9VtUPQIECBAgQIAAAQIrEDjvvPN+sCiKv4+IE1dQxlECBAgQGJJASulfIuIVGzZseG2n01kcUlttCByTwLZt2x5QFMXfRUTjmA56mACBYQkcaTQa95+bm/vssBrqQ4AAAQIECBAgQIAAAQL9FbCA1V9P1QgQIECAAAECBAisWGBqaurnc87vjIixFRdTgAABAgSGJXBtURS/Ozs7+8aIWP5gTV8ESiXQbDYvi4gzSjWUYQgQ+LZAURRv3rdv368hIUCAAAECBAgQIECAAIHRFLCANZr3ZmoCBAgQIECAAIGKC7RarRenlF5W8ZjiESBAoHICOedP5ZxfZhGrclc78oG2bdv2I0VRLL+7zqaRDyMAgYoKNBqNX5ybm3t3ReOJRYAAAQIECBAgQIAAgUoLWMCq9PUKR4AAAQIECBAgMMICaXJy8i8ajcZTRjiD0QkQIFBngY9GxIUzMzNvrTOC7OUSGB8fn0kptco1lWkIEPgOgU8cPnx48/79+5eoECBAgAABAgQIECBAgMBoCVjAGq37Mi0BAgQIECBAgECNBKampu5SFMXVKaV71Ci2qAQIEKiUQM75g41G40XT09NXVSqYMCMpsH379h9YXFy8LiLuOpIBDE2gBgI5599cWFh4bQ2iikiAAAECBAgQIECAAIFKCVjAqtR1CkOAAAECBAgQIFA1gampqYfmnN8fEeurlk0eAgQI1Ekg5/z8brf7+3XKLGs5BbZt2/aCoiguKud0piJAICL+I+d8n4WFha/TIECAAAECBAgQIECAAIHREbCANTp3ZVICBAgQIECAAIGaCkxNTf1WzvmPahpfbAIECFRB4KtLS0un7Nmz5z+rEEaG0RbYsmXLuvXr118TEfca7SSmJ1BdgZTShfPz8y+qbkLJCBAgQIAAAQIECBAgUD0BC1jVu1OJCBAgQIAAAQIEKijQarUuSymdUcFoIhEgQKDyAkVRPG92dnZv5YMKODIC4+PjW1NKCyMzsEEJ1E/gUFEUp+zbt+9f6hddYgIECBAgQIAAAQIECIymgAWs0bw3UxMgQIAAAQIECNRMYOfOnRvXrVv3oYh4UM2ii0uAAIGRFsg5f3rTpk0P6nQ6iyMdxPBVE0jNZvNjEbG5asHkIVAhgSt6vd7WCuURhQABAgQIECBAgAABApUWsIBV6esVjgABAgQIECBAoEoCk5OTJzUajeUflt65SrlkIUCAQJUFUkqPnZ6evqrKGWUbTYFms/mYiHjvaE5vagK1EMiNRuNRc3NzH6hFWiEJECBAgAABAgQIECAw4gIWsEb8Ao1PgAABAgQIECBQL4F2u/2UiPiLiPBn+XpdvbQECIygwPJHvE1PTzdHcHQj10Sg2Wy+PSJOq0lcMQmMosBHe73ewyMij+LwZiZAgMAxCyx/p8P/4x0zmwMECBAgQIBAOQT80KYc92AKAgQIECBAgAABAkct0G63XxkRO4/6gAcJECBAYDUEvnHkyJFTL7744i+uRnM9CRyNwPj4+P1TSn8XEWNH87xnCBAYvkDOeXxhYWHf8DsPr6N9i+FZ60SAAAECBAgQIECAwOAELGANzlZlAgQIECBAgAABAgMR6HQ6aw4cOPCelNLPDaSBogQIECCwYoGcc6vb7c6uuJACBAYsMD4+/rqU0vYBt1GeAIHjF7hh06ZNJ1966aUHjr+EkwQIECBAgAABAgQIECAwaAELWIMWVp8AAQIECBAgQIDAAAQmJyd/OKX08ZTS/x5AeSUJECBAYGUCnztw4MD99+7de3hlZZwmMHiBbdu2/UhRFJ+NiE2D76YDHNSlbAAAIABJREFUAQLHI1AUxYv37dt3wfGcdYYAAQIECBAgQIAAAQIEhiNgAWs4zroQIECAAAECBAgQ6LtAq9V6bErpXT42qO+0ChIgQGBFAkVRnDY7O/uOFRVxmMAQBSYmJnbnnKeG2FIrAgSOTeCb69atO/m1r33tvx3bMU8TIECAAAECBAgQIECAwLAELGANS1ofAgQIECBAgAABAgMQaLVa56WUXjGA0koSIECAwHEI5Jzf1O12n3ocRx0hsGoCW7ZsufP69euvj4i7rtoQGhMgcJsCRVG8bt++fTswESBAgAABAgQIECBAgEA5BSxglfNeTEWAAAECBAgQIEDgaAVSq9W6IqX0jKM94DkCBAgQGJjAwZTSfaenp/95YB0UJjAgga1bt+5sNBqvHFB5ZQkQWLlAkVL66fn5+b9deSkVCBAgQIAAAQIECBAgQKDfAhaw+i2qHgECBAgQIECAAIEhC+zcuXPjunXrPhARDxlya+0IECBA4DsEcs4v6Xa7L4dCYBQFtmzZsm79+vXXRMS9RnF+MxOoicCHer3eIyMi1ySvmAQIECBAgAABAgQIEBgZAQtYI3NVBiVAgAABAgQIECBw6wLnnnvuT6xZs2b5t+HvxokAAQIEhi+Qc/78pk2b7tfpdA4Nv7uOBPoj0Gw2T4+Iff2ppgoBAoMQSCk9dX5+/k2DqK0mAQIECBAgQIAAAQIECBy/gAWs47dzkgABAgQIECBAgECpBFqt1i+klN4REWtKNZhhCBAgUA+BJ8/MzLy1HlGlrLBAajabfxMRP1XhjKIRGHWBz9944433vfLKKw+PehDzEyBAgAABAgQIECBAoEoCFrCqdJuyECBAgAABAgQI1F6g3W6/ICIuqj0EAAJ1Flj+UCJ/2x/2K+CdMzMzTxh2U/0IDEJgYmLi0TnnqwZRW00CBPomMNnr9fb0rZpCBAgQIECAAAECBAgQILBiAd+SXTGhAgQIECBAgAABAgTKJdBut18TETvKNZVpCBAgUFmBI41G4/67d+/+bGUTClY7gWaz+X8i4pdrF1xgAqMj8I0NGzac9OpXv/o/RmdkkxIgQIAAAQIECBAgQKDaAhawqn2/0hEgQIAAAQIECNRQoNPpbLj55pvf12g0HlrD+CITIEBgqAIppQunp6dfNNSmmhEYsMDExMSpOedP+ljjAUMrT2BlAn/U6/XOXlkJpwkQIECAAAECBAgQIECgXwIWsPolqQ4BAgQIECBAgACBEgm0Wq0TU0ofi4gTSzSWUQgQIFA1gRuWlpZO2bNnz81VCyYPgYmJidfknL2jppcCgfIKLOWcH7ywsPAP5R3RZAQIECBAgAABAgQIEKiPgAWs+ty1pAQIECBAgAABAjUTaLfbPxsR742IdTWLLi4BAgSGIlAUxdNnZ2f3D6WZJgSGLLBjx44Tjxw58rmI2DTk1toRIHCUAiml98zPz//CUT7uMQIECBAgQIAAAQIECBAYoIAFrAHiKk2AAAECBAgQIEBgtQXa7fZzIuIPV3sO/QkQIFA1gaIo3jM7O+uH3lW7WHn+h8D4+PgrUkrnYSFAoLwCKaUnzs/Pv728E5qMAAECBAgQIECAAAEC9RCwgFWPe5aSAAECBAgQIECgxgKtVutPUkpn1ZhAdAIECPRbYDEiHjIzM+Njn/otq16pBHbs2HHHW2655bqc8w+VajDDECDwbYGU0meuueaaB1x99dW3YCFAgAABAgQIECBAgACB1ROwgLV69joTIECAAAECBAgQGIrAWWedtfYud7nLuyPiUUNpqAkBAgSqL/DKmZmZc6sfU0ICEc1m8/kRcQkLAgRKLXBOr9f7g1JPaDgCBAgQIECAAAECBAhUXMACVsUvWDwCBAgQIECAAAECywLnn3/+3ZeWlv42In6UCAECBAisSOA/IuLkmZmZm1ZUxWECIyKwefPmtaeeeuo1EXHvERnZmATqKPDVRqNx0tzc3I11DC8zAQIECBAgQIAAAQIEyiBgAasMt2AGAgQIECBAgAABAkMQmJqaemjO+a8jYuMQ2mlBgACBSgoURXHG7OzsXCXDCUXgVgQmJiaemXO+AhABAqUWuLjX672g1BMajgABAgQIECBAgAABAhUWsIBV4csVjQABAgQIECBAgMB3C0xNTT015/xnEdGgQ4AAAQLHJpBz/lC3231kRORjO+lpAiMvkMbHxz+YUnr4yCcRgEB1BW5pNBo/OTc399nqRpSMAAECBAgQIECAAAEC5RWwgFXeuzEZAQIECBAgQIAAgYEItFqtF6eUXjaQ4ooSIECgugJFSulnpqenP1bdiJIRuHWBrVu3PqrRaCy/k6YvAgRKKpBzfsvCwsKvlnQ8YxEgQIAAAQIECBAgQKDSAhawKn29whEgQIAAAQIECBD4vgKp3W4vf3xWkw8BAgQIHJ1ASukPp6enn3t0T3uKQDUFms3m2yLiidVMJxWBygg8vtfrvasyaQQhQIAAAQIECBAgQIDAiAhYwBqRizImAQIECBAgQIAAgX4KdDqddYcOHXpnzvnR/ayrFgECBCoq8JXFxcWTL7rooi9XNJ9YBI5KYGJi4tSc8ycjYs1RHfAQAQKrIfCJw4cPb96/f//SajTXkwABAgQIECBAgAABAnUVsIBV15uXmwABAgQIECBAoPYC55577t3WrFnzkYi4V+0xABAgQOA2BFJKz56enr4UEgECEc1m89UR8ZssCBAotcCzer3e8j+rvggQIECAAAECBAgQIEBgSAIWsIYErQ0BAgQIECBAgACBMgq0Wq1TU0ofjog7l3E+MxEgQKAEAh///Oc//zDvJFKCmzBCKQR27Nhx4pEjRz4bESeUYiBDECDwPQIppf8siuKkhYWFr+MhQIAAAQIECBAgQIAAgeEIWMAajrMuBAgQIECAAAECBEor0G63nxARb/NxQqW9IoMRILB6Ajnn/LPdbnf53QJ9ESDwLYGJiYkLcs4vBEKAQHkFcs67FxYWzi/vhCYjQIAAAQIECBAgQIBAtQQsYFXrPqUhQIAAAQIECBAgcFwC7Xb7+RFxyXEddogAAQLVFXjtzMyMj1qr7v1KdpwCO3bsuOORI0c+FxF3P84SjhEgMHiBw7fccsv93vCGN1w/+FY6ECBAgAABAgQIECBAgIAFLK8BAgQIECBAgAABAgT+n8DU1NSrcs5n4yBAgACB/yfw9bGxsVNe8YpX/F8eBAh8r8DWrVuf12g0fo8NAQLlFcg5v2FhYeGZ5Z3QZAQIECBAgAABAgQIEKiOgAWs6tylJAQIECBAgAABAgRWJLBly5axe9zjHn+ZUvrlFRVymAABAhUQyDk/v9vt/n4FoohAYCACmzdvXnvqqad+OiJOGkgDRQkQ6JfAo3q93vv7VUwdAgQIECBAgAABAgQIEPj+AhawvDIIECBAgAABAgQIEPi2wDnnnHOnjRs3fjCl9JNYCBAgUFeBnPOnv/a1rz340ksvvaWuBnITOBqBZrP59Ih4w9E86xkCBFZN4OP3vve9H9rpdIpVm0BjAgQIECBAgAABAgQI1EDAAlYNLllEAgQIECBAgAABAsci8KIXveget9xyy0cj4geP5ZxnCRAgUBWBlNJjp6enr6pKHjkIDFAgjY+PLy9uP3yAPZQmQGCFAjnniYWFhd4KyzhOgAABAgQIECBAgAABArchYAHLy4MAAQIECBAgUEOB5T8E5hrmFvnoBdrt9qMi4p0Rsf7oT3mSAAECoy+Qc76i2+1uHf0kEhAYjsDWrVsf1Wg0/no43XQhQOA4Bb6YUjp5fn7+5uM87xgBAgQIECBAgAABAgQI3I6ABSwvEQIECBAgQIAAAQIEvq/A1NTUM3LO+yKigYgAAQI1EfjmkSNHTrn44ou/WJO8YhLoi0Cz2fzLiHhSX4opQoDAQARyzr+7sLDwsoEUV5QAAQIECBAgQIAAAQIEwgKWFwEBAgQIECBAgAABArcqMDU11c45TyMiQIBATQTaMzMz3ZpkFZNA3wS2b99+yuLi4j9ExJq+FVWIAIF+Cxxcu3btya973eu+0O/C6hEgQIAAAQIECBAgQIBAWMDyIiBAgAABAgQIECBA4LYF2u3270fEOZwIECBQcYHPHThw4P579+49XPGc4hEYiMC2bdv+tCiKMwdSXFECBPolcHmv19ver2LqECBAgAABAgQIECBAgMB/C3gHLK8GAgQIECBAgAABAgRuU2DLli1j97znPfdHxK+hIkCAQIUFfnlmZubKCucTjcBABXbs2HHikSNHPhsRJwy0keIECKxEoFizZs3PXHbZZR9bSRFnCRAgQIAAAQIECBAgQOB7BSxgeVUQIECAAAECBAgQIHC7Ajt37ty4du3av0opPfx2H/YAAQIERkwg5/ymbrf71BEb27gESicwMTHx8pzzi0o3mIEIEPi2QM75wwsLC4+IiIyFAAECBAgQIECAAAECBPonYAGrf5YqESBAgAABAgQIEKi0wLnnnnu3NWvWfCgiTqp0UOEIEKibwMG1a9fe74ILLvinugWXl0C/Bc4+++w7fP3rX78uIu7e79rqESDQP4FGo7Flbm7ujf2rqBIBAgQIECBAgAABAgQIWMDyGiBAgAABAgQIECBA4KgFJicn75VS+lBK6YeO+pAHCRAgUGKBnHOn2+2+tMQjGo3ASAk0m83fjoi9IzW0YQnUT+Cf1qxZc9/LLrvsUP2iS0yAAAECBAgQIECAAIHBCFjAGoyrqgQIECBAgAABAgQqK9BqtR6WUnpvRGyqbEjBCBCoi8C/bty48dROp3OgLoHlJDBogc2bN6899dRTP+0dMwctrT6BlQmklNrz8/PdlVVxmgABAgQIECBAgEB1BJaXZ3xOd3XuczWSWMBaDXU9CRAgQIAAAQIECIy4QLvdflJE/EVEjI14FOMTIFBvgV+dmZl5S70JpCfQf4GJiYktOec/639lFQkQ6KPAN9asWXOfyy677N/7WFMpAgQIECBAgAABAgQI1FbAAlZtr15wAgQIECBAgAABAisTmJqa+q2c8x+trIrTBAgQWDWBd83MzDx+1bprTKDiAs1m84MR8bMVjykegVEX+JNer/dbox7C/AQIECBAgAABAgQIECiDgAWsMtyCGQgQIECAAAECBAiMqEC73b4oIl4wouMbmwCB+gocyTk/oNvt/mN9CSQnMFiBZrP5cxHxvsF2UZ0AgRUKLOWcH7ywsPAPK6zjOAECBAgQIECAAAECBGovYAGr9i8BAAQIECBAgAABAgRWJJCmpqbmc87jK6riMAECBIYokFLaPT09ff4QW2pFoJYC4+Pjb04pPaWW4YUmMDoC7+r1et4RcnTuy6QECBAgQIAAAQIECJRUwAJWSS/GWAQIECBAgAABAgRGRaDT6Ww4ePDguyLikaMyszkJEKi1wA0bN248tdPpfLPWCsITGIJAs9k8OSKW31ln7RDaaUGAwHEK5JyftLCw8LbjPO4YAQIECBAgQIAAAQIECESEBSwvAwIECBAgQIAAAQIEVizQbrfvHBF/HREPXHExBQgQIDBAgZTSM6enp98wwBZKEyDwHQLNZvNVEXE2FAIEyiuQUvrHa6655v5XX331LeWd0mQECBAgQIAAAQIECBAot4AFrHLfj+kIECBAgAABAgQIjIxAq9U6MaX0wYj4/43M0AYlQKBWAjnn93e73UdHRK5VcGEJrKLAli1bfnD9+vWfi4jlZW1fBAiUVKAoiufv27fv90s6nrEIECBAgAABAgQIECBQegELWKW/IgMSIECAAAECBAgQGB2Bqampe+ecPxARdx+dqU1KgEBNBBaXlpY279mz55M1ySsmgdIINJvN8yPiwtIMZBACBL6fwFcbjcZJc3NzN+IhQIAAAQIECBAgQIAAgWMXsIB17GZOECBAgAABAgQIECBwGwLtdnv5YwiviogfAEWAAIESCVw8MzPzghLNYxQCtRHYvn37hsXFxX+MiB+vTWhBCYygQFEUv7dv377fGcHRjUyAAAECBAgQIECAAIFVF7CAtepXYAACBAgQIECAAAEC1RNotVqPTSldGRHrq5dOIgIERlDgPw4fPnzKJZdc8rURnN3IBCohMD4+fkZK6bJKhBGCQHUFFnPOD1xYWLimuhElI0CAAAECBAgQIECAwGAELGANxlVVAgQIECBAgAABArUXaLVav5pSemNEjNUeAwABAqsqkHPe3u12L1/VITQnUHOBTqfTuO666/4mIjbXnEJ8AmUXeGuv13ty2Yc0HwECBAgQIECAAAECBMomYAGrbDdiHgIECBAgQIAAAQIVEmi328+OiD+uUCRRCBAYMYGc84e73e4jIiKP2OjGJVA5gWaz+ZiIeG/lgglEoGICY2NjT7j88svfWbFY4hAgQIAAAQIECBAgQGCgAhawBsqrOAECBAgQIECAAAECrVbrd1NKHRIECBBYBYEipfQz09PTH1uF3loSIPB9BJrN5v+JiF+GQ4BAqQWuueGGGx541VVXLZZ6SsMRIECAAAECBAgQIECgRAL/H3t3Ah5XXe5x/H3PZGmDIMgiigtrS1kURVEQBRVX5LrGksyZIdZaFcVrlcyE5eqoQDOTVtAqaMRSMkvRuHLRulsVVNSCC4VCK1e9vSi0gAJtls6c9z4Hi6IsTZNZzvKd58nTKz3n///9Pv/cUpI3cxjACtBhEAUBBBBAAAEEEEAAgagKZLPZi0Xk/VHtRy8EEAiswGX5fP7MwKYjGAIxFEilUvPM7Lci0hbD+lRGIEwC7yyVSsNhCkxWBBBAAAEEEEAAAQQQQKCVAgxgtVKfvRFAAAEEEEAAAQQQiI+AZrPZlSKSjk9lmiKAQIsF7qlWq3OXLVu2pcU52B4BBP5NIJVKDZvZO4BBAIHgCqjqXePj43NGR0f/FtyUJEMAAQQQQAABBBBAAAEEgiPAAFZwzoIkCCCAAAIIIIAAAghEWmDRokXte+6559Wq+upIF6UcAggEReBd+Xz+s0EJQw4EEPinQCqV2s/MNorI7rgggECgBfKlUmkg0AkJhwACCCCAAAIIIIAAAggERIABrIAcBDEQQAABBBBAAAEEEIiDQC6X69q2bdt3VfWEOPSlIwIItEzghttvv/240dHRWssSsDECCDyuQG9v74cdx8nBhAACgRaYFJEjS6WSPzDJCwEEEEAAAQQQQAABBBBA4HEEGMDi0wMBBBBAAAEEEEAAAQSaKnDOOefs7XneT0RkXlM3ZjMEEIiLgHmed9LQ0JD/5wwvBBAIqMDixYtnb968+TYReVpAIxILAQT+LjBaKpXeCgYCCCCAAAIIIIAAAggggMDjCzCAxWcIAggggAACCCCAAAIINF3gvPPOe3qtVvuJmT2z6ZuzIQIIRF1gZT6ff1vUS9IPgSgIuK67UEQ+F4UudEAgygL+YHOlUvlxlDvSDQEEEEAAAQQQQAABBBCYqQADWDMV5H4EEEAAAQQQQAABBBCYlkB/f/8hjuP438h56rQW4CYEEEDgkQL3JRKJwy+66KI/g4MAAsEX6O7uTnR2dt4oIkcHPy0JEYivgKreeMghhzwvl8t58VWgOQIIIIAAAggggAACCCDw+AIMYPEZggACCCCAAAIIIIAAAi0TyGQyc1X1RyLy5JaFYGMEEIiMgJktLhQKl0SmEEUQiIGA67qvFpHVMahKRQTCLnBGqVQaCXsJ8iOAAAIIIIAAAggggAACjRJgAKtRsqyLAAIIIIAAAggggAACUxLIZrPPFpEfisheU7qBixBAAIFHF7j53nvvPWZ4eHg7QAggEC6BZDL5bVV9ZbhSkxaB2An8n6rOLRaLW2PXnMIIIIAAAggggAACCCCAwBQEGMCaAhKXIIAAAggggAACCCCAQGMFMpnMC1X1uyLyhMbuxOoIIBBVATN7WaFQ8Ic5eSGAQMgE0un0szzPu0FEEiGLTlwEYiXgOM5HRkZGcrEqTVkEEEAAAQQQQAABBBBAYIoCDGBNEYrLEEAAAQQQQAABBBBAoLECmUzm5ap6jYjMauxOrI4AAhEUuCqfz/dEsBeVEIiNQDKZvEJV+2JTmKIIhFNgzHGcw0dGRv4UzvikRgABBBBAAAEEEEAAAQQaJ8AAVuNsWRkBBBBAAAEEEEAAAQR2USCbzb5KRK4WkY5dvJXLEUAgvgLbqtXqEcuWLftjfAlojkD4BdLp9AGe590qIruFvw0NEIiugKoWi8ViOroNaYYAAggggAACCCCAAAIITE+AAazpuXEXAggggAACCCCAAAIINEhgYGDgzWZ2lYi0NWgLlkUAgWgJnJPP5wejVYk2CMRTIJVKfczMzo9ne1ojEBoBcxznhSMjI78ITWKCIoAAAggggAACCCCAAAJNEGAAqwnIbIEAAggggAACCCCAAAK7JpDJZM5Q1RUi4uzanVyNAAIxE9i4bdu2o5YvXz4Rs97URSCSAmeeeeYT7rvvvg0isn8kC1IKgYgImNnPyuXyi0TEIlKJGggggAACCCCAAAIIIIDAjAUYwJoxIQsggAACCCCAAAIIIIBAIwQymcx7VXV5I9ZmTQQQiIaA4zinLlmy5JvRaEMLBBDwBVzXfbeIXIoGAggEXmB+qVT6YuBTEhABBBBAAAEEEEAAAQQQaJIAA1hNgmYbBBBAAAEEEEAAAQQQ2HWBTCZznqpesOt3cgcCCMRA4Gv5fP6NMehJRQRiJdDd3Z3o6Oj4jaoeGavilEUgZAJm9of29vZ5K1euHA9ZdOIigAACCCCAAAIIIIAAAg0RYACrIawsigACCCCAAAIIIIAAAvUSGBgYuMjMzqnXeqyDAAKREBhrb28/8oILLvifSLShBAII/ItAKpU6zcyuhgUBBIIt4P8dvVwuDwY7JekQQAABBBBAAAEEEEAAgeYIMIDVHGd2QQABBBBAAAEEEEAAgRkIZDKZpar6wRkswa0IIBAhAVX9yODgYC5ClaiCAAL/JuC67vdE5OXAIIBAoAXuF5G5pVLpz4FOSTgEEEAAAQQQQAABBBBAoAkCDGA1AZktEEAAAQQQQAABBBBAYMYCmslkhlV14YxXYgEEEAi7wB8mJyePuPjii8fCXoT8CCDw2AK9vb3HOI6zVkQcnBBAILgCqvq5YrG4KLgJSYYAAggggAACCCCAAAIINEeAAazmOLMLAggggAACCCCAAAIIzFxAs9nsZSLyzpkvxQoIIBBWATN7Y6FQ+FpY85MbAQSmLuC6blFE3KnfwZUIINACAU9Enl8qlW5owd5siQACCCCAAAIIIIAAAggERoABrMAcBUEQQAABBBBAAAEEEEBgZwK5XM7Ztm3bClU9Y2fX8vsIIBBJge/m8/lXRrIZpRBA4BECyWTyaap6q4h0wYMAAsEVUNUfFovFlwU3IckQQAABBBBAAAEEEEAAgcYLMIDVeGN2QAABBBBAAAEEEEAAgToK7BjCWqmqqTouy1IIIBB8gUkze1ahUPCHMXghgEBMBFzXHRSRbEzqUhOBMAu8vlQqXR3mAmRHAAEEEEAAAQQQQAABBGYiwADWTPS4FwEEEEAAAQQQQAABBFoi0N3dnTj44INX8liilvCzKQItEfA8b3BoaOiclmzOpggg0DKBBQsW7D45OblBRJ7cshBsjAACUxH4/d13333k6tWrJ6ZyMdcggAACCCCAAAIIIIAAAlETYAAraidKHwQQQAABBBBAAAEEYiKwYwhrRER6Y1KZmgjEWeAv27Ztm7t8+fL74oxAdwTiKpBMJs9S1U/GtT+9EQiLgJktLpfLl4QlLzkRQAABBBBAAAEEEEAAgXoKMIBVT03WQgABBBBAAAEEEEAAgaYK+ENYBx10UFFVe5q6MZshgECzBXry+fxVzd6U/RBAIBgCxx57bPu8efNuEpE5wUhECgQQeAyBe2u12pxVq1ZtQQgBBBBAAAEEEEAAAQQQiJsAA1hxO3H6IoAAAggggAACCCAQMYEd74RVEpHTI1aNOggg8HeBa/P5/EtExABBAIH4CqRSqTeZ2ZfjK0BzBMIhoKrLi8Xi+8KRlpQIIIAAAggggAACCCCAQP0EGMCqnyUrIYAAAggggAACCCCAQIsEFi1a1L7XXnt9UUTe0KIIbIsAAo0RqNVqtecuXbr0t41ZnlURQCBMAq7r/kRETgxTZrIiEEOBaiKROObKK69cF8PuVEYAAQQQQAABBBBAAIEYCzCAFePDpzoCCCCAAAIIIIAAAlESyOVyHePj46Nm9h9R6kUXBGIu8Il8Pv/+mBtQHwEEdgik0+njPM/7uYjwNU0+KxAItsA3SqXS64IdkXQIIIAAAggggAACCCCAQH0F+GJFfT1ZDQEEEEAAAQQQQAABBFoo4A9hbd269UuO45zWwhhsjQACdRAws7smJyfnXnLJJX+tw3IsgQACERFIJpNXqer8iNShBgKRFVDVVxeLxW9HtiDFEEAAAQQQQAABBBBAAIF/E2AAi08JBBBAAAEEEEAAAQQQiJSAP4S1bdu2L6sqP3UfqZOlTNwEzGxBoVC4Im696YsAAo8vkEqlDjKzW0SkEysEEAi0wC2bNm161po1a6qBTkk4BBBAAAEEEEAAAQQQQKBOAgxg1QmSZRBAAAEEEEAAAQQQQCA4AmeddVbn7Nmz/SGsU4OTiiQIIDBVATP7VVdX1wtyuZw31Xu4DgEE4iPQ29u7zHGcD8SnMU0RCKeAqr67WCx+JpzpSY0AAggggAACCCCAAAII7JoAA1i75sXVCCCAAAIIIIAAAgggEBKBbDb7ThHhGz4hOS9iIvAwAU9VjxscHFyLCgIIIPBoAr29vXs5jrNBRPZGCAEEAi2weWJi4rDR0dG/BTol4RBAAAEEEEAAAQQQQACBOggwgFUHRJZAAAEEEEAAAQQQQACBYAkMDAzsZWa3isi+wUpGGgQQmILAZ/P5/LumcB2XIIBAjAXS6fQHPM9bFmMCqiMQFoGhUqmUCUtYciKCn/pHAAAgAElEQVSAAAIIIIAAAggggAAC0xVgAGu6ctyHAAIIIIAAAggggAACgRXIZrOXisi7AxuQYAgg8FgC91ar1TnLli3bAhECCCDweALd3d0dnZ2d60TkUKQQQCDQApOe5x1VqVT8d63jhQACCCCAAAIIIIAAAghEVoABrMgeLcUQQAABBBBAAAEEEIinwMDAwHPM7JcikoinAK0RCLXAmfl8/rJQNyA8Agg0TSCdTs/3PO+qpm3IRjMS8L8QbTNagZvDKqCqXy4Wi28Ja35yI4AAAggggAACCCCAAAJTEWAAaypKXIMAAggggAACCCCAAAJhEdBsNrtGRF4SlsDkRACBfwjcePvttz9/dHS0hgkCCCAwRQF1XfdaETlhitdzGQIItEjA87yTKpXKj1u0PdsigAACCCCAAAIIIIAAAg0XYACr4cRsgAACCCCAAAIIIIAAAs0S6O/v73Mc54pm7cc+CCBQNwH/TVFOzufzfGO2bqQshEA8BNLp9PGe510nInydMx5HTsuQCqjqjYcccsjzcrmcF9IKxEYAAQQQQAABBBBAAAEEHleAL0zwCYIAAggggAACCCCAAAKREDjrrLP2mD179npVfUokClECgRgJmNmVhUKhL0aVqYoAAnUUSCaTX1bVN9VxSZZCAIEGCHie97ZKpbKyAUuzJAIIIIAAAggggAACCCDQcgEGsFp+BARAAAEEEEAAAQQQQACBeghkMplPqOr76rEWayCAQFMF7k8kEnMvuuiiPzd1VzZDAIHICPT29h7sOM4tItIRmVIUQSCaAnd2dHQctmLFivujWY9WCCCAAAIIIIAAAgggEGcBBrDifPp0RwABBBBAAAEEEEAgIgLZbPZIEblRRNojUokaCMRGQFU/MDg4eHFsClMUAQQaIpBKpT5pZmc1ZHEWRQCBegp8rFQqfaieC7IWAggggAACCCCAAAIIIBAEAQawgnAKZEAAAQQQQAABBBBAAIEZCfT39//QcZyTZ7QINyOAQCsEbr733nuPGR4e3t6KzdkTAQSiI9Dd3f2kWbNmbTCzJ0WnFU0QiKTAmOd58yqVyh8j2Y5SCCCAAAIIIIAAAgggEFsBBrBie/QURwABBBBAAAEEEEAgGgKZTCapqqVotKEFAvESUNWXDw4O/iBerWmLAAKNEnBdNysig41an3URQKBuAuVSqeTWbTUWQgABBBBAAAEEEEAAAQQCIMAAVgAOgQgIIIAAAggggAACCCAwPYFMJrO7qq4XkadObwXuQgCBVgmY2RcKhcLprdqffRFAIHoCfX19s6rVqv/3gmdGrx2NEIiUgJnZi8vl8nWRakUZBBBAAAEEEEAAAQQQiLUAA1ixPn7KI4AAAggggAACCCAQboFMJrNUVT8Y7hakRyCWAtuq1eoRy5Yt4/FDsTx+SiPQOIFkMumqarFxO7AyAgjUQ8BxnJ+PjIycICJWj/VYAwEEEEAAAQQQQAABBBBotQADWK0+AfZHAAEEEEAAAQQQQACBaQmcc845R3ie92sRaZ/WAtyEAAItEzCzcwuFwpKWBWBjBBCIsoC6rvsLEXlelEvSDYEoCKhqT7FYvCoKXeiAAAIIIIAAAggggAACCDCAxecAAggggAACCCCAAAIIhFIgm81+S0ReFcrwhEYg3gIbt23bdtTy5csn4s1AewQQaJRAKpU6yczWNGp91kUAgboJbOrq6po7PDy8rW4rshACCCCAAAIIIIAAAggg0CIBBrAaCu/z8g7KDSVmcQQQQAABBBBAAIFYCmSz2beKyBdiWZ7SCIRcwHGcU5csWfLNkNcgPgIIBFzAdd2rReS0gMckHgIIiJxXKpUuAgIBBBBAAAEEEEAAAQQQCLsAA1hhP0HyI4AAAggggAACCCAQM4FcLtc1Pj5+s5k9M2bVqYtA6AU8z/v60NDQG0JfhAIIIBB4Add154rITSLSFviwBEQg3gIPiMicUqn053gz0B4BBBBAAAEEEEAAAQTCLsAAVthPkPwIIIAAAggggAACCMRMoL+/f4njOAMxq01dBKIgMOF53tFDQ0MbolCGDgggEHyBZDJ5maq+K/hJSYhA7AU+XyqVFsZeAQAEEEAAAQQQQAABBBAItQADWKE+PsIjgAACCCCAAAIIIBAvgYGBgUPNzH83i854NactApEQ+Gg+n/9wJJpQAgEEQiGQSqX2MzN/6HOPUAQmJALxFfA8zzuuUqmsjS8BzRFAAAEEEEAAAQQQQCDsAgxghf0EyY8AAggggAACCCCAQIwEMpnMN1X1NTGqTFUEIiFgZv/red68pUuXbo1EIUoggEBoBHp7e893HOdjoQlMUARiKqCqPywWiy+LaX1qI4AAAggggAACCCCAQAQEGMCKwCFSAQEEEEAAAQQQQACBOAhkMpk3qeqX49CVjghETcDM3lwoFL4StV70QQCB4AssXrx49ubNm9eLyDOCn5aECMRe4I2lUulrsVcAAAEEEEAAAQQQQAABBEIpwABWKI+N0AgggAACCCCAAAIIxEvA/+Zpe3v7OlU9KF7NaYtAJAS+l8/nXxGJJpRAAIFQCriumxaRK0MZntAIxEvg9rvvvvuI1atXT8Sr9iPb+t+4sbgj0B8BBBBAAAEEEEAAgZAJMIAVsgMjLgIIINAwAb6y0zBaFkYAAQQQmLlANpv1Hx10/sxXYgUEEGiywKTjOM9esmSJ/+4zvBBAAIGWCORyOWfjxo3Xi8jzWhKATRFAYMoCjuN8cGRk5ONTvoELEUCgYQJ8ubhhtCyMAAIIIIAAAhEVYAArogdLLQQQQAABBBBAAAEEoiLQ399/iOM4N4nIrKh0ogcCMRIo5PP5bIz6UhUBBAIqkEqlTjKzNQGNRywEEPinwF9rtdphq1at2gIKAggggAACCCCAAAIIIBAmAQawwnRaZEUAAQQQQAABBBBAIIYCmUzmv1X1dTGsTmUEwi7wl23bts1dvnz5fWEvQn4EEIiGQDKZ/Jqqvj4abWiBQHQFVPXTxWLxvdFtSDMEEEAAAQQQQAABBBCIogADWFE8VTohgAACCCCAAAIIIBARgWw2e5qIXB2ROtRAIG4CyXw+X4lbafoigEBwBebPn39Ie3v7zSLSEdyUJEMAARGpqeoxxWLRfxdcXggggAACCCCAAAIIIIBAKAQYwArFMRESAQQQQAABBBBAAIH4CZx11lmdXV1dvxWROfFrT2MEQi9wbT6ff4mIWOibUAABBCIlkEqlPmlmZ0WqFGUQiKbA6lKp9NpoVqMVAggggAACCCCAAAIIRFGAAawoniqdEEAAAQQQQAABBBCIgEB/f/+HHMf5SASqUAGBuAnUROTYfD7/m7gVpy8CCARVwP8S6N/nQXt7e/dKJBIbzexJQU1LLgQQ+IfAa0ql0rfwQAABBBBAAAEEEEAAAQTCIMAAVhhOiYwIIIAAAggggAACCMRMIJvNPsPMblbV3WJWnboIhF7AzD5ZKBT+M/RFKIAAApEVcF33bBEZimxBiiEQHYFbbrnllmevXbt2e3Qq0QQBBBBAAAEE4ifwzx8IiV93GiMQLwEGsOJ13rRFAAEEEEAAAQQQQCAUAtls9qsi8oZQhCUkAgj8Q8DM7pqcnJx7ySWX/BUWBBBAIKgC3d3dHZ2dnetE5NCgZiQXAgj8XcDM3lMuly/FAwEEEEAAAQQQQAABBBAIugADWEE/IfIhgAACCCCAAAIIIBAzgUwm8wpV/U7MalMXgUgIeJ739qGhoRWRKEMJBBCItEAqleo2sy9GuiTlEIiAgKreMz4+ftjo6Og9EahDBQQQQAABBBBAAAEEEIiwAANYET5cqiGAAAIIIIAAAgggEDaBXC7XMTY29lsRmRu27ORFIO4CZvarrq6uF+RyOS/uFvRHAIFwCLiu+xMROTEcaUmJQHwFVHVZsVj0Hx3KCwEEEEAAAQQQQAABBBAIrAADWIE9GoIhgAACCCCAAAIIIBA/gUwmc46qXhS/5jRGIPQCnpkdXygUfhH6JhRAAIHYCKRSqReY2c9EhK+RxubUKRpSgUnP846qVCobQpqf2AgggAACCCCAAAIIIBADAb64EINDpiICCCCAAAIIIIAAAmEQyGQyT1PVW0TkCWHIS0YEEPingJkNFwqFd2KCAAIIhE3Add1VInJ62HKTF4EYCny1VCq9KYa9qYwAAggggAACCCCAAAIhEWAAKyQHRUwEEEAAAQQQQAABBKIukM1mvygi3VHvST8EIihwr+M4c5csWbI5gt2ohAACERc4/fTTD2xra/MHwGdFvCr1EAi9gOM4rxgZGfle6ItQAAEEEEAAAQQQQAABBCIpwABWJI+VUggggAACCCCAAAIIhEsgk8m8XFX5Zkq4jo20CDwoYGbvKRQKl8KBAAIIhFUgmUzmVTUT1vzkRiBGAr8+9NBDj83lcl6MOlMVAQQQQAABBBBAAAEEQiLAAFZIDoqYCCCAAAIIIIAAAghEVSCXy7WNjY3dICJHR7UjvRCIsMDvZs+e/dxcLleNcEeqIYBAxAUWLFiw++Tk5AYReXLEq1IPgdALmNnby+XyitAXoQACCCCAAAIIIIAAAghEToABrMgdKYUQQAABBBBAAAEEEAiXQCaT6VfVQrhSkxYBBPw3vxKRk/P5/I/RQAABBMIukEwm36Oqnwp7D/IjEAOBO81sTrlcvi8GXamIAAIIIIAAAggggAACIRJgACtEh0VUBBBAAAEEEEAAAQSiJtDf37+/4zjrReSJUetGHwSiLmBmxUKhkI56T/ohgEA8BE4++eS2Aw444NeqemQ8GtMSgfAKqOqFxWLx/PA2IDkCCCCAAAIIIIAAAghEUYABrCieKp0QQAABBBBAAAEEEAiJQDabLYtIb0jiEhMBBP4pcL+ZHV4oFO4ABQEEEIiKQCqVOs3Mro5KH3ogEGGBcc/zDq9UKn+McEeqIYAAAggggAACCCCAQMgEGMAK2YERFwEEEEAAAQQQQACBqAhks9kTRcR/dBn/XRKVQ6VHbARU9ezBwcFlsSlMUQQQiI2A67rfEZFXxKYwRREIr8CqUqnED3KE9/xIjgACCCCAAAIIIIBA5AT4RkfkjpRCCCCAAAIIIIAAAggEXyCXy7WNjY39SkSeHfy0JEQAgX8TuOXee+999vDw8HZkEEAAgagJuK7r/93kBhFxotaNPghETMAcx3nJyMjItRHrRR0EEEAAAQQQQAABBBAIqQADWCE9OGIjgAACCCCAAAIIIBBmgUwm835VvTjMHciOQIwFXp3P578d4/5URwCBiAskk8krVLUv4jWph0AUBK4vlUrHi4hFoQwdEEAAAQQQQAABBBBAINwCDGCF+/xIjwACCCCAAAIIIIBA6ATOPffcJ9dqtfUismfowhMYAQRG8/n8W2FAAAEEoiywYMGCp05OTt4mIrtFuSfdEIiCgJkly+VyJQpd6IAAAggggAACCCCAAALhFmAAK9znR3oEEEAAAQQQQAABBEInkM1mrxSRdOiCExgBBMZU9YjBwcE/QIEAAghEXSCdTuc8z/tw1HvSD4EICGzq6uqaOzw8vC0CXaiAAAIIIIAAAggggAACIRZgACvEh0d0BBBAAAEEEEAAAQTCJpDNZk8QkWtFhP8WCdvhkTf2AmZ2fqFQuDD2EAAggEAsBBYvXjz7rrvuulVVnx6LwpREIMQCnuf9V6VSuSDEFYiOAAIIIIAAAggggAACERDgmx4ROEQqIIAAAggggAACCCAQBoFcLuds3br1547jPD8MecmIAAL/IvD72bNnH5XL5cZxQQABBOIikEwmF6jq5+PSl54IhFjggY6OjrkrVqy4I8QdiI4AAggggAACCCCAAAIhF2AAK+QHSHwEEEAAAQQQQAABBMIikM1m3yMinwpLXnIigMC/CLwun89/AxMEEEAgTgL+8PjGjRt/KSLPjVNvuiIQRgHP866oVCoLwpidzAgggAACCCCAAAIIIBANAQawonGOtEAAAQQQQAABBBBAINAC55xzzt6e590qInsHOijhEEDgEQKe5/330NDQf0CDAAIIxFGgt7f3pY7j/CCO3emMQMgEPFV9QbFY/FXIchMXAQQQQAABBBBAAAEEIiLAAFZEDpIaCCCAAAIIIIAAAggEWSCTyVyuqm8PckayIYDAowpMOI7zrCVLltyGDwIIIBBXAdd1rxGRU+Pan94IhEjgulKp9GIRsRBlJioCCCCAAAIIIIAAAghERIABrIgcJDUQQAABBBBAAAEEEAiqQCaTeZ6qXi8iTlAzkgsBBB5dwMw+VigUPoQPAgggEGeBvr6+w6vV6m9FpD3ODnRHIAwCjuO8aWRk5KthyEpGBBBAAAEEEEAAAQQQiJYAA1jROk/aIIAAAggggAACCCAQKIFcLueMjY39TESOC1QwwiCAwE4FzOx/Pc+bt3Tp0q07vZgLEEAAgYgLuK57qYi8O+I1qYdAFARuv/vuu49YvXr1RBTK0AEBBBBAAAEEEEAAAQTCI8AAVnjOiqQIIIAAAggggAACCIROYGBgYJGZfTZ0wQmMAAKiqm8ZHBz8MhQIIIAAAiLd3d37dnZ2bhCRJ+KBAAKBF+gvlUpLA5+SgAgggAACCCCAAAIIIBApAQawInWclEEAAQQQQAABBBBAIDgCAwMDe5nZbSKyT3BSkQQBBKYo8P18Pn/KFK/lMgQQQCAWAslkckBVl8SiLCURCLfA/bNmzTrs8ssvvzPcNUiPAAIIIIAAAggggAACYRJgACtMp0VWBBBAAAEEEEAAAQRCJJDJZC5T1XeFKDJREUDg7wLVWq32nKVLl94ECAIIIIDAPwX6+vpmVavV9SLyTFwQQCDwApeVSqUzA5+SgAg0WMD/d9fk5OTstrY2p1qtPvgujo7j7O55XpvjOJ2O43SpquN53oO/53ne7qra9lAsM2tT1d2nGbMmIvc97N6/qqrt2OeBRCKxfcfvjVer1bEd2R7wPG/cv+/WW299YO3atQ9dM80I3IYAAggggAACCDRPgAGs5lmzEwIIIIAAAggggAACsRHo7+9/ruM4vxCRRGxKUxSBiAiY2VChUMhEpA41EEAAgboKJJPJXlUt13VRFkMAgUYIVBOJxDFXXnnlukYszpoINFIgl8s569at23vWrFn+u0nvsWMAak9/OMr/cBznCf4/F5E9/d8zsyfs+NX/Z/4glT8w5X90NTJnk9auisj9ZvaAqvpDWvfv+PD/b/+f+f97bMfv32Nm96jqg7+KyL3t7e33VKvVe4rF4tYm5WUbBBBAAAEEEIixAANYMT58qiOAAAIIIIAAAggg0CABzWQy16nq8Q1an2URQKBxAn8RkcPz+fzfGrcFKyOAAAKhFtBUKvVzMzsu1C0Ij0AMBMzs2+Vy+dUxqErFYAtoT0/P3olEYm8z20dV9xYR/8MfrtrX87x9HMd58J+p6j5m9tDv8/27+p7rhD+QJSL+YNZDHw/97y2e592RSCTu2r59+5+7urruvP322+9as2aNP/zFCwEEEEAAAQQQmLIAf4GbMhUXIoAAAggggAACCCCAwFQEMpnM21R1xVSu5RoEEAiWgJm5hUKBd3YJ1rGQBgEEAiaQTqdP9DzvJwGLRRwEEHgUATN7bblcXg0OAo0Q6O7u3rejo2N/EXmaqj74q4g8RUQOMLOnqOoBIvJk3hm6EfoNX9N/VOJd/oeZ3WFmd6qq/8Mqf/b/mareoap37rPPPn+4+OKLH3x8Ii8EEEAAAQQQQIABLD4HEEAAAQQQQAABBBBAoG4CZ5111h6zZ89er6r+F515IYBAiATM7LpCofBiEfG/2cALAQQQQOBxBFKp1JfM7M0gIYBA4AVu2bRp07N4J5vAn1PQAuqCBQueMjk5eaCZHeg4jj9Y5Q9VPdUfsDKzA3b8N29n0IKTpyUCm0XkT/6H53n+r390HOdPbW1tD35cfvnld7YkFZsigAACCCCAQNMFGMBqOjkbIoAAAgg0W6C7uzsxOjpaa/a+7IcAAgjEUSCbzX5SRM6KY3c6IxByAf/vSsfm8/nfhLwH8RFAAIGmCMyfP/+Q9vb2m0WkoykbsgkCCMxE4KxSqfSpmSzAvdET6Ovr23/79u3+cNWBnucdqKoPDVs9+KuIMFwVvWNvVaNxVf2jmT04pOUPaInIRlXdMD4+vmF0dJTHv7fqZNgXAQQQQACBOgswgFVnUJZDAAEEEGi9wMKFC5+8devW4xKJxLFm9iIROaxcLh/Euzm0/mxIgAAC0RY4++yzj0okEjeKSFu0m9IOgegJmNmnCoUCw5PRO1oaIYBAAwVc1/24iCxu4BYsjQAC9RHY4nnenEqlcm99lmOVMAi85jWv6dxvv/0O9TxvrogcumOoyh+s8j/8rxPOCkMPMsZCwH8HrQ3+h5ltSCQSGz3P29DR0bFhxYoV98dCgJIIIIAAAghERIABrIgcJDUQQACBOAv09vYeLCInisiLVNX/dZ6I/Mu/48zsOZVK5ddxdqI7Aggg0GABHRgY+KGZndTgfVgeAQTqL3C34zhzlyxZcnf9l2ZFBBBAILoCvb29e/nfJDWzJ0W3Jc0QiIzAxaVS6QORaUORhwQ0nU4/XUTm1Gq1Of7faf2BK1U9TESeKSIJqBAIuYD/+MLbPM/z3zHrNjO7pVar3TRv3rz/yeVyXsi7ER8BBBBAAIHICTCAFbkjpRACCCAQbQH/p9f22muvF/gDV6p6goj4H3vtrLWqDpRKpfzOruP3EUAAAQSmJ5DJZFKqOjK9u7kLAQRaKaCq7xgcHLy8lRnYGwEEEAirgOu6/ykil4Q1P7kRiJHApOd5R1UqFf9dZniFTKCvr29P/13MdgxZHW5m/oDVnB0fXSGrQ1wE6iGwTURu8TxvXSKRWGdm66rV6rqrrrrKf7yh1WMD1kAAAQQQQACBXRdgAGvXzbgDAQQQQKCJAt3d3Yn29vZjHMc5xcxO8d/lSkRm72oEM/tBpVJ5+a7ex/UIIIAAAjsXyGQyu6vqehF56s6v5goEEAiSgOd5a3fbbbfj+OnpIJ0KWRBAIEwC3d3dHZ2dnTeJiD8MwAsBBAIsYGZfL5fLbwhwxNhH83/w8olPfOIRjuMcpar+x7NE5CgReVrscQBAYGoC96vqLSJyk+d5N7e1tf3OH84aGRn5v6ndzlUIIIAAAgggMBMBBrBmose9CCCAAAJ1F/AHrtra2g5PJBL+oJU/dPUKEdmzDhtNTk5O7j06OvpAHdZiCQQQQACBhwlks9mPi8hiUBBAIHQCnuM4JyxZsuT60CUnMAIIIBAggXQ6/UbP874SoEhEQQCBxxZ4ZalU+i5ArRdYsGDBU7dv336smR2hqkf6v+4YtupsfToSIBA5gb+KyDpVXWtmaxOJxNqDDjroFn4QJ3LnTCEEEEAAgRYLMIDV4gNgewQQQAAB0Z6enqMTicRLa7XayxzHeUmdBq4eQauqryuVSt/AHAEEEECgfgLnnHPOEZ7n/VpE2uu3KishgEAzBMzs8kKh8I5m7MUeCCCAQNQFXNf9kYj4/z3LCwEEgi3w64mJieeNjo7Wgh0zOum6u7ufNHv27OdWq1X/639HmZn/rlb+sBWPDozOMdMknAJ/E5EbPc+7QVVvFJEbJicnb+XPx3AeJqkRQAABBIIhwABWMM6BFAgggECsBNLp9N5m9rJarXaKqr62WW8jbmafqFQq748VNmURQACBBgv09/d/33GclzV4G5ZHAIH6C9zrOM7cJUuWbK7/0qyIAAIIxE8glUo9z8x+ISJ8vTV+x0/j8Am8o1QqXR6+2MFP7A9bdXZ2+u9qdayqHisi/sdBwU9OQgQQ2CGwzcx+4w9keZ73y0QicX2xWFwvIoYQAggggAACCOxcgC8I7NyIKxBAAAEEZijgP1awvb39GMdx/EcKniIiJ4tI2wyXnc7t68vl8rzp3Mg9CCCAAAKPFMhms6eLyCpsEEAgfAJmdlahUPhU+JKTGAEEEAiugOu6RRFxg5uQZAgg4Auo6l2e5x1WLpfvQ2T6At3d3U+cPXv20Z7nPThs5Q9diYj/dTe+7zR9Vu5EIIgC94vIb0XkWlW9rlqt/mzVqlVbghiUTAgggAACCLRagL8It/oE2B8BBBCIqEAqldpPRE7yPO80ETlVRJ4UhKq1Wu2gq6666g9ByEIGBBBAIMwCuVyua3x8/GYze2aYe5AdgTgKmNlNXV1dz8nlctU49qczAggg0CiBdDr9DM/z/HeJmN2oPVgXAQTqI2BmS8rl8rn1WS36q/jvZu8PWfnDVv67Wu0Yujow+s1piAACjyLgvxvWejO7XlV/5jjOz8fGxtbx6EI+VxBAAAEEEOAnEfgcQAABBBCok0Aul3N+//vfP9/zvNer6qlm9qw6LV3vZRaVy+XP1XtR1kMAAQTiJpDNZvMikolbb/oiEAEB8zzvpUNDQz+KQBcqIIAAAoETcF33QhFhqCNwJ0MgBB4hMF6tVufxQ3qP/Mzw38m+s7PzKBE5QVWPN7MXishhfA4hgAACjyNwv6r+SkR+KiI/2X333a+79NJLH0AMAQQQQACBuAnwDlhxO3H6IoAAAnUU6Ovrm+V53om1Ws1/l6s3i8gBdVy+IUup6pdKpVJ3QxZnUQQQiK2A/5dq/8f/4vLq7+8/zHGc34lIZ1w60xOBCAmU8vl8KkJ9qIIAAggESuDMM898wn333bdBRPYPVDDCIIDAIwTM7Avlctl/rHqsX8lkco9EInGciJzoP0bQzF4kInvFGoXyCCAwU4GaiPzaf2Sh/+jC8fHx74+Ojt4z00W5HwEEEEAAgaALMIAV9BMiHwIIIBAwge7u7ifNmjXr5TseLfh6EdkjYBF3Fuevk5OT+/CWyDtj4vcRQACBxxbIZDLfVNXXYIQAAqETuN/MDi8UCneELjmBEUAAgRAJuK77ThH5TIgiExWB2Ao4jvPikZGRa+ME0Nvbe7DjOCeKiFM56OUAACAASURBVD9o5f96uIg4cTKgKwIINF3A8x9b6A9jqer3qtXqD1etWrWl6SnYEAEEEEAAgQYLMIDVYGCWRwABBKIgcPrppx/Y1tb2ejN7nYicJCLtIe91fLlc/nnIOxAfAQQQaInAwMDAm83sSy3ZnE0RQGCmAv35fH7pTBfhfgQQQACBxxfwH9/V0dHxG1U9EisEEAi2gKr+olgs+o/Yi+SbGi9atKhrfHz8BDN7sed5L1RVv2vYfpgy2J9EpEMAgekI+H/mrlPVH4nIj8bHx9eMjo5uns5C3IMAAggggECQBBjACtJpkAUBBBAIkEAqlTrIzP7DzPzH9fk/EReZl5nlKpXKRyJTiCIIIIBAkwQWL148u6Oj42YRObBJW7INAgjUT2DDtm3bjl6+fPlE/ZZkJQQQQACBxxJwXffVIrIaIQQQCIWAWyqVyqFIupOQOwaunut53ovM7BRVfTGPjo/CydIBgVgI3K6q16jqfzuOc+3KlSvHY9GakggggAACkRJgACtSx0kZBBBAYGYCUR66+jeZn5bL5UgNlc3s5LkbAQQQmJrAwMDABWZ23tSu5ioEEAiSgOd5rxkaGvpWkDKRBQEEEIi6QDKZ/JaqvirqPemHQAQE/k9V5xaLxa1h65JKpXZT1eP9RwnWarUXMXAVthMkLwIIPIbAmJld5z+u0PO871UqlRui+k6FfAYggAACCERLgAGsaJ0nbRBAAIFdFojR0NXDbWpmtm+lUrl3l8G4AQEEEIipQH9//yGO49wkIrNiSkBtBEIr4D82tFAo+O9qygsBBBBAoIkCyWTyCFX9jYi0NXFbtkIAgWkImNmHy+XyR6dxa1NveZSBq5eISEdTQ7AZAggg0GQBVb3LzPzHFX6vvb199RVXXPG/TY7AdggggAACCExJgAGsKTFxEQIIIBAtgZgOXf3LITqO8+ZisfiVaJ0sbRBAAIHGCWQyGf9t4E9t3A6sjAACDRIYU9UjBgcH/9Cg9VkWAQQQQOBxBNLp9Oc8z1sIEgIIBF5ga0dHx5wVK1bcEaSk/sCViJxkZi81s5NU9bkikghSRrIggAACTRYwEfmdmX3LzL5xxx13/HTNmjXVJmdgOwQQQAABBB5VgAEsPjEQQACBmAi4rvsUEXmrmfnvfhD7x++Z2XClUnlnTI6fmggggMCMBDKZzH+o6tdntAg3I4BAqwT+K5/PX9CqzdkXAQQQiLtAKpXaz8w2iMgecbegPwIhELiyVCr1tTrnGWeccWStVnudmZ3CIwVbfRrsjwACIRDwn3LxPf+jra3t6pUrV/4lBJmJiAACCCAQUQEGsCJ6sNRCAAEEfIHFixfP3rJly+s8z0uLyKt57MG/fF78sVwuH8hnCgIIIIDA4wv4/y5pb2+/SVUPxgoBBEIn8PvZs2cflcvlxkOXnMAIIIBAhAR6e3vPdxznYxGqRBUEoirgtbW1vXDlypW/bGbBhQsXPnliYuIl/sCViLxORJ7azP3ZCwEEEIiQQE1Efu04zjXVavW/K5XKDSLiv2MWLwQQQAABBJoiwABWU5jZBAEEEGieQHd3d2L27NkvrdVqaVV9o5k9oXm7h2unRCIxd2Rk5LZwpSYtAggg0FyBgYGBnJl9uLm7shsCCNRDwPO804aGhq6px1qsgQACCCAwfQF/oH3z5s3rReQZ01+FOxFAoEkCPy2VSic28hv2ixYt6hofHz/B8zx/4Mr/8B8ryPdqmnTAbIMAAvERMLM/qOp3VPWaLVu2fGf16tUT8WlPUwQQQACBVgjwl/pWqLMnAggg0ACBnp6eI1U1papniMj+Ddgiiku+r1wuL49iMTohgAAC9RDIZrP+NwlvEZGueqzHGggg0FSBb+fzef8dUHkhgAACCARAwHVd/52prwxAFCIggMDOBd5SKpW+vPPLpnZFLpdzfv/73/tDVq8ws1eKyAki0jG1u7kKAQQQQKBOAg+IyLdE5Ctm9o1yuXxfndZlGQQQQAABBP4hwAAWnwwIIIBAiAVc132KmfkDV30iMjfEVVoV/ZpyuXxaqzZnXwQQQCDoAv39/V9zHOf1Qc9JPgQQeITApOM4Ry9ZsoR3+uSTAwEEEAiIgD+AsXHjxutF5HkBiUQMBBB4bIHb77777iNm8k4pfX19e9ZqtVebmf9IwVeJyD6AI4AAAggERmBCVb9rZl9xHOfqkZGRuwOTjCAIIIAAAqEWYAAr1MdHeAQQiKPAQ48Y9DxvkZm9QUTa4+hQp85b77nnnr1n8gW1OuVgGQQQQCBwAgMDA680s28HLhiBEEBgpwKqeuHg4OD5O72QCxBAAAEEmiqQTqeP9zzvOh411lR2NkNgWgKqmi0Wi4Vdubm3t/dgx3FO84euVPUlvMvVruhxLQIIINAygZqI/FxERjs6OkZXrFhxR8uSsDECCCCAQOgFGMAK/RFSAAEE4iKQTqfneJ7Xa2YLROTpcend6J6q+tJSqbSm0fuwPgIIIBAmgVwu1zE2NvZb3l0xTKdGVgT+IbCpVqsdvnTp0q2YIIAAAggETyCVSn3JzN4cvGQkQgCBfxO4v62tbc7KlSv/8lgyO35I0h+s9N/lyn+H9SNQRAABBBAItYAnIjc6jnNNtVotVyqVDaFuQ3gEEEAAgaYLMIDVdHI2RAABBKYu0NfXN6tWq53mv9uViLycn5Kdut0uXLmkXC6fuwvXcykCCCAQeYFMJnOeql4Q+aIURCCCAp7nvXVoaGg0gtWohAACCERCYP78+Ye0t7ffzDvjROI4KRF9gc+WSqV3PbxmT0/PPolE4rUi4g9dvVJEnhh9BhoigAACsRQwM/uViHzB/yiXy5tiqUBpBBBAAIFdEmAAa5e4uBgBBBBojkAqlXpBrVZbqKrzRWT35uwaz13M7IZKpXJsPNvTGgEEEHikwHnnnff07du336Kqu+GDAALhEvA87wdDQ0P+0D4vBBBAAIEAC6RSqaVm9sEARyQaAgj8XaBmZs8xs60Pe7TgySLSBhACCCCAQNgF/G+R21RL+O+M9TP/MYWquqpYLN411Ru5DgEEEEAgXgIMYMXrvGmLAAIBFvDf7WpycvKtjuO83//iToCjRi2aOY6zP//RFLVjpQ8CCExXIJvNfklEeCzOdAG5D4HWCVRF5Ln5fP53rYvAzggggAACUxHo6+vbs1qt+o+02Wcq13MNAgi0VGBCRDpbmoDNEUAAAQSCJLBdRL4jIqv22GOPr1966aUPBCkcWRBAAAEEWivAAFZr/dkdAQQQkN7e3sNE5O2q+g4ReRIkzRcwM7dSqZSbvzM7IoAAAsESyGQyL1fV7wUrFWkQQGAqAma2rFAonD2Va7kGAQQQQKD1Aq7rvldElrc+CQkQQAABBBBAAIG4COzSu15NBWXc/zqamY12dXV9aXh4eNtUbuIaBBBAAIHoCjCAFd2zpRkCCARYIJfLObfeeuupjuO8T0T8x8Tw53ELz8vMRiqVyhktjMDWCCCAQMsFcrlcx9jY2K9FZF7LwxAAAQR2VeBOEZmbz+f/tqs3cj0CCCCAQGsETj755LanPe1pv+XvXq3xZ1cEEEAAAQQQQKDOAveKyFc8zyvPmTPnR7lczn9sIS8EEEAAgZgJ8A3/mB04dRFAoLUCfX19+1er1TPM7EwReUZr07D7wwT+Ui6Xn7orD31HDwEEEIiaQDabzYhIPmq96INAHATMLF0oFIpx6EpHBBBAIEoCruueKiLXRKkTXRBAAAEEEEAAAQRkk4j4T9y4vFQqbcQDAQQQQCA+AgxgxeesaYoAAi0U6OnpOUlVz1LV14tIWwujsPVjCKjqMaVS6TcAIYAAAnEU6O/v399xnFtFZI849qczAmEWMLOfFgqFExkkD/Mpkh0BBOIskEwmv62qr4yzAd0RQAABBBBAAIEIC6wVkeGOjo5VK1asuD/CPamGAAIIIMAjr/gcQAABBBon0N3d3TFr1qzXe573ARF5YeN2YuV6CKhqplQqDdVjLdZAAAEEwiaQzWZXicjpYctNXgQQkJrnec8bGhryHx/KCwEEEEAghALJZPIIVfV/GIgf1grh+REZAQQQQAABBBCYosC4iPy34zjDIyMj3+eHqKaoxmUIIIBAyAR4B6yQHRhxEUAg+ALd3d37dnZ2LjCz94rI04KfmIQ7BL5XLpdfgQYCCCAQN4H+/v4XO47zI344I24nT98oCHie9+mhoSH/75y8EEAAAQRCLOC67mdFZFGIKxAdAQQQQAABBBBAYIoCZva/qlrxPG+4UqncPsXbuAwBBBBAIAQCDGCF4JCIiAAC4RBIp9NzarXae0RkoYh0hSM1KR8SUNUJVd27WCxuRQUBBBCIi0Aul2sbHx9fa2bPiktneiIQIYF7HMeZs2TJkrsj1IkqCCCAQCwFFi5c+OTx8fENIrJ7LAEojQACCCCAAAIIxFPAU9U1IvK5LVu2fHX16tUT8WSgNQIIIBAdAQawonOWNEEAgdYIaDqdfnmtVvtPETmVdw9pzSHUa1dVfU2pVPpWvdZjHQQQQCDoAgMDA4vN7ONBz0k+BBB4VIFF+Xz+c9gggAACCERDwHXdc0Xkwmi0oQUCCCCAAAIIIIDALgr8VUS+mEgkPnnllVeu28V7uRwBBBBAICACDGAF5CCIgQAC4RLo6+ubVa1WzzCz94vI4eFKT9rHEvA875JVq1YtRggBBBCIg8C555775FqtdquIPDEOfemIQJQEPM9bu9tuux2Xy+W8KPWiCwIIIBBnAf/rDNu3b79FVQ+MswPdEUAAAQQQQAABBGStiHxyYmLiqtHR0Uk8EEAAAQTCI8AAVnjOiqQIIBAAgQULFuw+OTm5wMz6ReSAAEQiQn0Fbi6Xy0fWd0lWQwABBIIpkMlkRlQ1Fcx0pEIAgccR8MzsRYVC4ecoIYAAAghES8B13R4RqUSrFW0QQAABBBBAAAEEpilwp4is9DxvuFKp3D7NNbgNAQQQQKCJAgxgNRGbrRBAILwCqVRqPzM708zeJyJ7hbcJyXcmkEgknjkyMvKnnV3H7yOAAAJhFujv73+R4zg/4dG5YT5FssdVwMw+XygUFsa1P70RQACBiAuo67r+39FeFPGe1EMAAQQQQAABBBCYuoD/g1g/cBxn+Oabb/7a2rVrt0/9Vq5EAAEEEGimAANYzdSO6l7+Z5FFtRy94i6QSqUO8jzPf8zgO0Rkdtw94tDfcZyFxWLx83HoSkcEEIinQHd3d+Lggw/+lYgcE08BWiMQaoH7PM+bOzQ09JdQtyA8AggggMBjCqTT6eM9z7uOQXk+SRBAAAEEEEAAAQQeReAOx3E+5zjOZ1auXMnXBvgUQQABBAImwABWwA6EOAggEAwB13WfbWYfFBH/7f/bgpGKFE0S+GK5XJ7fpL3YBgEEEGi6QCaTea+qLm/6xmyIAAIzFvA8731DQ0P8/++MJVkAAQQQaIBAHX9A0XXdVSJyegNSsiQCCCCAAAIIIIBANAQmReTrZvaJcrnsD+/zQgABBBAIgAADWAE4BCIggEBwBHp6el7mOE5WRF4ZnFQkabLAPZOTk/uNjo7Wmrwv2yGAAAINFzjnnHP29jzvVhHZu+GbsQECCNRVwMzWdXV1HZPL5ap1XZjFEEAAAQQCJ/C2t73t6du3b18vIl1TCVfH2a+pbMc1CCCAAAIIIIAAAsESWCsiw21tbSMrV64cD1Y00iCAAALxEmAAK17nTVsEEHgMgZ6enhMdx/moiLwUJAQSicQLRkZGfoEEAgggEDWBbDbrP2J1QdR60QeBOAio6ksHBwfXxKErHRFAAAEERFKp1BIzG8ACAQQQQAABBBBAAIEpCviPJLzScZzlIyMj/zfFe7gMAQQQQKCOAgxg1RGTpRBAIHwC/uCViHzMcZyTw5eexI0SMLMPVSqVjzVqfdZFAAEEWiGQyWSep6rXi4jTiv3ZEwEEZiRQyefzyRmtwM0IIIAAAqESWLBgwe6Tk5O3icj+oQpOWAQQQAABBBBAAIFWCzz4eELHcS4eGRn5WavDsD8CCCAQJwEGsOJ02nRFAIF/CKTT6VNqtdoFIvICWBD4dwFVvbZUKr0YGQQQQCAqArlczhkbG/O/4HJcVDrRA4EYCTwwOTl5+MUXX8xPr8bo0KmKAAII+AKu675TRD6DBgIIIIAAAggggAAC0xS4VkQuOfTQQ7+ay+W8aa7BbQgggAACUxRgAGuKUFyGAALRENgxeHUh34COxnk2sEV1cnJyn9HR0b81cA+WRgABBJomMDAw8C4zu6xpG7IRAgjUUyCbz+cL9VyQtRBAAAEEwiHQ3d2d6OzsvFFEjg5HYlIigAACCCCAAAIIBFTgdhH5ZFdX1+eGh4e3BTQjsRBAAIHQCzCAFfojpAACCExFYMfg1UUi8vypXM81CCQSiTeNjIx8FQkEEEAg7AKLFy9+UkdHx60isk/Yu5AfgRgKbNi2bdvRy5cvn4hhdyojgAACCIhIT0/PyxKJxPfBQAABBBBAAAEEEECgDgKbHce5dPv27Z9atWrVljqsxxIIIIAAAg8TYACLTwcEEIi0QE9Pz2mJROIjZvacSBelXCMEPlMul9/diIVZEwEEEGimQCaT+ayqLmrmnuyFAAJ1E3htPp9fXbfVWAgBBBBAIJQCrut+Q0ReG8rwhEYAAQQQQAABBBAIosCEqn5RVS8YGRm5LYgByYQAAgiEUYABrDCeGpkRQGCnAq7rniAiF5nZSTu9mAsQeHSBP5TL5YPAQQABBMIs0N/f/1zHcX4hIokw9yA7AnEUMLOvFAqFN8exO50RQAABBP5VoK+v7/BqtfpbEWnHBgEEEEAAAQQQQACBOgp4qvpNz/MuLJfLP6/juiyFAAIIxFKAAaxYHjulEYiuQDKZPFpV/8vMuqPbkmbNEpicnDxsdHR0Y7P2Yx8EEECgngK5XM4ZGxu7TkReWM91WQsBBJoiMNbe3n7kBRdc8D9N2Y1NEEAAAQQCL+C67qdF5MzAByUgAggggAACCCCAQFgFrlPVfLFYvEZELKwlyI0AAgi0UoABrFbqszcCCNRNYMdPg37UzN4iIvzZVjfZ2C/03nK57H+RmxcCCCAQOoFMJvN2Vb08dMEJjAAC4nneh4eGhj4KBQIIIIAAAg8JdHd379vZ2ek/HmZPVBBAAAEEEEAAAQQQaKDA70Rk6cTERHl0dLTWwH1YGgEEEIicAEMKkTtSCiEQL4HTTz/96Y7jnK+qC0SkrZHt/XF//tBspHDw1vY87+pVq1a9PnjJSIQAAgg8vsDAwMBenuetV9X9sEIAgXAJmNntXV1dR+ZyufFwJSctAggggECjBVzX7ReRQqP3YX0EEEAAAQQQQAABBETkZhHJb9q0qbJmzZoqIggggAACOxdglmDnRlyBAAIBFOjp6dlHVc9W1f8UkVkBjEikaAjcv379+r3Xrl27PRp1aIEAAnER6O/v/5TjOO+JS196IhAlATN7faFQuDpKneiCAAIIIFAfge7u7o7Ozs51InJofVZkFQQQQAABBBBAAAEEdirwPyLyibvvvvszq1evntjp1VyAAAIIxFiAAawYHz7VEQijQHd39xM6Ojr8n/j8oIjsFsYOZA6XgOd5J69atepH4UpNWgQQiLPA2WeffVQikbix0e8MGWdjuiPQQIHv5PP5VzVwfZZGAAEEEAi5QDqdfovneaMhr0F8BBBAAAEEEEAAgfAJ/ElEPr7vvvsOX3zxxWPhi09iBBBAoPECDGA13pgdEECgDgK5XM657bbbXFUdFJGn1GFJlkBgSgKqelGpVDpvShdzEQIIINB6AR0YGPihmZ3U+igkQACBXRSYNLNnFQqFW3fxPi5HAAEEEIiZgOu6PxaRF8esNnURQAABBBBAAAEEAiCgqneZ2ce7urqWDw8PbwtAJCIggAACgRFgACswR0EQBBB4LIF0On2K53nL/G9IoYRAswXM7FeVSuX5zd6X/RBAAIHpCPT396cdx7lyOvdyDwIItFzgonw+z9B3y48hRgH8rwhZjPpSFYEICfT19T2/Wq1eLyJ8bTdC50oVBBBAAAEEEEAgTAL+IJaILBORTxeLxa1hyk5WBBBAoFEC/Ed6o2RZFwEEZizQ09NzZCKRKJjZa2e8GAsgMH0Bz3GcpxSLRf8/JnghgAACgRXIZDK7i8itqso7RQb2lAiGwGMKbJo9e/a8XC73AEYIIIAAAghMRcB13aKIuFO5lmsQQAABBBBAAAEEEGigwBYRWbrvvvt+kkcTNlCZpRFAIBQCDGCF4pgIiUC8BNLp9AHVavVDqvp2EUnEqz1tgyigqr2lUmlVELORCQEEEHhIIJvNXiwi70cEAQRCKTA/n89/MZTJCY0AAggg0BIB/2snnuf5j63drSUB2BQBBBBAAAEEEEAAgYcJPPRowra2tk+sXLlyHBwEEEAgjgIMYMXx1OmMQEAFUqnUbmbWb2YZEZkd0JjEiqfAynK5/LZ4Vqc1AgiEQSCbzR4pIjeKSHsY8pIRAQT+KWBmPykUCifxMDg+KxBAAAEEdlXAdd2Pish/7ep9XI8AAggggAACCCCAQAMF/iQiF27atGnFmjVrqg3ch6URQACBwAkwgBW4IyEQAvETyOVyzsaNGxea2cdEZL/4CdA46AJmdkelUnka3xgN+kmRD4H4CmSz2R+IyEvjK0BzBEIr4H8h8rn5fP53oW1AcAQQQACBlgmceeaZT7jvvvtuExEeQd2yU2BjBBBAAAEEEEAAgUcTMLM/qOqSiYmJz4+OjtZQQgABBOIgwABWHE6ZjggEWGD+/PnPb2trWy4iLwhwTKIhII7jHF0sFm+CAgEEEAiaQH9/f4/jOJWg5SIPAghMSeDj+Xz+g1O6kosQQAABBBB4FIFkMrlAVT8PDgIIIIAAAggggAACARW4RUQGDz300FIul/MCmpFYCCCAQF0EGMCqCyOLIIDArgosWLDgqRMTE4Mi4ooIfxbtKiDXt0Lg7HK5vKwVG7MnAggg8FgCuVzuCWNjY+tF5ACUEEAgdAJ3isjcfD7/t9AlJzACCCCAQGAEdryr+FoROSYwoQiCAAIIIIAAAggggMC/CajqjSJyfrFY/CY4CCCAQFQFGHqI6snSC4GACnR3d3d0dna+e8fjBncPaExiIfBoAt8pl8uvggYBBBCYmYD/12+b2RIPuzuTyRRUtb9uC7IQAgg0TcDzvDOGhoZGmrYhGyGAAAIIRFbAdd2TReSHkS1IMQQQQAABBBBAAIHICJjZzxKJRGZkZOTayJSiCAIIILBDgAEsPhUQQKBpAj09Pac5jnOJiBzctE3ZCIH6CYzvtttuew8PD2+r35KshAACCExfoL+//zDHcX4nIp3TX4U7EUCgFQJm9tNCoXBiXScyW1GEPRFAAAEEAiPguu7XReQ/AhOIIAgggAACCCCAAAIIPI6Aql5jZotLpdJGoBBAAIGoCDCAFZWTpAcCARZIp9NzPM+72MxeG+CYRENgpwKO47y6WCx+e6cXcgECCCDQBIFMJrNaVV/dhK3YAgEE6ivgqeoLBwcHf1nfZVkNAQQQQCDOAvPnzz+kvb39ZhHpiLMD3RFAAAEEEEAAAQRCJbBdRK5oa2v78MqVK/8SquSERQABBB5FgAEsPi0QQKBhAslkcg9VzZnZe0WkvWEbsTACTRIws49XKpUPNmk7tkEAAQQeUyCTybxFVUchQgCBUApcls/nzwxlckIjgAACCARaoLe39xLHcf4z0CEJhwACCCCAAAIIIIDAIwW2isinOjo6LlyxYsX9ACGAAAJhFWAAK6wnR24EAi6w43GDnxaRpwc8KvEQ2BWBm8rl8tG7cgPXIoAAAvUWyOVyXWNjY+tE5MB6r816CCDQcIF7qtXq3GXLlm1p+E5sgAACCCAQO4He3t69HMfZICJ7x648hRFAAAEEEEAAAQSiILBZRC7ctGnTp9esWVONQiE6IIBAvAQYwIrXedMWgYYL+G9539bWtlxEXtPwzdgAgRYI1Gq1Z1x11VX/24Kt2RIBBBB4UCCbzV4oIufCgQACoRR4Vz6f/2wokxMaAQQQQCAUAslk8v2qenEowhISAQQQQAABBBBAAIFHF7hFRAZKpdLVACGAAAJhEmAAK0ynRVYEAixw7LHHts+bN+8DZpYTkVkBjko0BGYkoKoLSqXSFTNahJsRQACBaQoMDAwcama/49+10wTkNgRaK3DD7bffftzo6GittTHYHQEEEEAgygI7vj5zk4jMiXJPuiGAAAIIIIAAAghEX0BVf2hmi0ul0m+i35aGCCAQBQEGsKJwinRAoMUCPT09JzmOc5mIzGtxFLZHoOECZnZVpVLpafhGbIAAAgg8ikAmk/mGqr4WHAQQCJ2A1Wq1Fy1duvRnoUtOYAQQQACB0Am4rvsGEflq6IITGAEEEEAAAQQQQACBRwp4qlru7Ozsv/zyy+8ECAEEEAiyAANYQT4dsiEQcIG+vr79t2/fXhARV0T48yTg50W8+giY2d1z5szZL5fLefVZkVUQQACBqQlkMpk3qCrfSJsaF1chECgBM7uiUCgsCFQowiCAAAIIRFogmUx+V1VPiXRJyiGAAAIIIIAAAgjESeABx3GWbd68ecnq1asn4lScrgggEB4BBibCc1YkRSAwArlczrntttv8oauPq+regQlGEASaJFCtVo/7whe+8Msmbcc2CCCAgCxevHh2e3v7OlU9CA4EEAidwH2JROLwiy666M+hS05gBBBAAIHQCriu+2wRuUFEnNCWIDgCCCCAAAIIIIAAAo8U2KCq5xWLxVFwEEAAgaAJMIAVtBMhDwIBF0gmk0eLyOUiclzAoxIPgUYKnF8uly9s5AasjQACCDxcIJvNfkREPoQKAgiEUuD9+Xz+E6FMTmgEEEAAgVAL9Pb2rnAc522hLkF4BBBAAAEEEEAAAQQeRUBVf6Cqi0dGRn4LEAIIIBAUAQawgnISntcfZAAAIABJREFU5EAg4ALHHnts+7x58z4gIh8xs86AxyUeAo0W+HG5XD6p0ZuwPgIIIOALZLPZZ4jILSLShQgCCIRLwMzW/fWvf33O8PDw9nAlJy0CCCCAQBQEFi5c+OTx8fENIrJ7FPrQAQEEEEAAAQQQQACBfxPwVLUsImcXi8W70EEAAQRaLcAAVqtPgP0RCIFAOp0+vlar+e96dUQI4hIRgWYIVCcnJ/cZHR39WzM2Yw8EEIi3QH9//9WO45wWbwXaIxBOATN7WaFQ+GE405MaAQQQQCAKAslk8kOq6r+bKi8EEEAAAQQQQAABBKIqcK+ZnT85OfnZ0dHRWlRL0gsBBIIvwABW8M+IhAi0TGDRokVdDzzwgP+FurNFJNGyIGyMQAAFzOwNlUrl6wGMRiQEEIiQwMDAwCvN7NsRqkQVBGIjYGarCoVCb2wKUxQBBBBAIJACixcvnr158+b1IuK/qyovBBBAAAEEEEAAAQSiLPBrx3HOHBkZ+VmUS9INAQSCK8AAVnDPhmQItFQglUq9yvO8z4rIM1sahM0RCK7ApeVy+T3BjUcyBBAIu0Aul+sYGxv7nYjMCXsX8iMQQ4FtIjIvn8//KYbdqYwAAgggEDAB13XTInJlwGIRBwEEEEAAAQQQQACBRgiYqpbGx8c/ODo6urkRG7AmAggg8FgCDGDxuYEAAv8i0NfXt+fk5GReVd8hIvwZwecHAo8hoKobS6XSYQAhgAACjRLIZrPni8jHGrU+6yKAQOMEVHVgcHAw37gdWBkBBBBAAIFdEtBkMnm9qj5/l+7iYgQQQAABBBBAAAEEwitwr4h8ZGJi4lM8ljC8h0hyBMImwHBF2E6MvAg0UCCZTM4XkU+KyH4N3IalEYiMQLVaPfQLX/jC7yNTiCIIIBAYgfPOO+/p27dvv0VVdwtMKIIggMBUBTZu27btqOXLl09M9QauQwABBBBAoNEC6XT6eM/zruOH7RotzfoIIIAAAggggAACARO4QVXPLBaL1wcsF3EQQCCCAgxgRfBQqYTArgp0d3fv297efpmqvnlX7+V6BOIsYGZnViqVy+JsQHcEEGiMQCaT+bKqvqkxq7MqAgg0WOC1+Xx+dYP3YHkEEEAAAQR2WSCVSn3JzPjazy7LcQMCCCCAAAIIIIBAyAU8VS1Xq9UPrFq1akvIuxAfAQQCLMAAVoAPh2gINEPAdd1TzexzIvKUZuzHHghEScDMvlapVN4YpU50QQCB1gucffbZpyQSie+2PgkJEEBgGgJfzefzDE9OA45bEEAAAQQaLzB//vxD2tvbbxaRjsbvxg4IIIAAAggggAACCAROYLPneZlKpXKliFjg0hEIAQRCL8AAVuiPkAIITE+gr69vz8nJybyqLpreCtyFAAIicv/69ev3Xvv/7N0LmFtVuf/x992ZCzOVu4DcFYpcBBWrqKBYEZWLB+UvI22yE0utVdGi1U4yxQsRK51kiuDB06NV23GSnYJRjwhaFJCiiIAgokApRVBEQC6tgu10Ltnr/8TDUVRKJzO57LX3d57Hh3Nk73f9fp8VpDOzsnPbbWNoIIAAAvUQyGazHZs3b77DcZzD6jGPGQgg0FSB4fb29pctWbLkgaauymIIIIAAAgjUIOC67oCILKrhFi5FAAEEEEAAAQQQQCBsAmsdx/nA0NDQvWErRh8EEGitAAewWuvP6gi0RMB13ZOeeerVfi0JwKIIhEhAVY8vFos/DVElqiCAQAsF+vr6MsaY/hZGYGkEEJikgDEmm8/nPzvJ27kNAQQQQACBpggkEomdVLX6i6a9mrIgiyCAAAIIIIAAAgggEEyB6hvrv/Dkk0+et2bNmpFgRiQVAgjYJsABLNt2jLwITEGg+kM2Y8yAqr5fRPjnfwqW3IrAswSWeJ73aUQQQACBqQqk0+n9VHWdiLxgqrO4HwEEmi7wYFdX1+HZbHZL01dmQQQQQAABBGoUcF33QyKyvMbbuBwBBBBAAAEEEEAAgTAK3Ok4zvyhoaGfh7EcnRBAoLkCHMBorjerIdAygVQqdWKlUvm6iBzQshAsjEA4BW7xPO+14axGKwQQaKZAOp2+VFXPbOaarIUAAnUTeFcul7u8btMYhAACCCCAQAMFenp6Yp2dnbeLyFENXIbRCCCAAAIIIIAAAgjYImBE5KvGmF7P856yJTQ5EUAgeAIcwArenpAIgboKJJPJadWnXhljPshTr+pKyzAE/k/Aj8View4NDT0JCQIIIDBZgd7e3jc6jnM9/66erCD3IdBSgatzudzbWpqAxRFAAAEEEKhRIJFIvEVVr6nxNi5HAAEEEEAAAQQQQCDMAo+o6kcLhUI5zCXphgACjRPgAFbjbJmMQMsFksnkqyuViqeqL215GAIgEG6BWZ7nXRbuirRDAIFGCWSz2bbh4eFf8gSCRgkzF4GGCowaY16ez+fXN3QVhiOAAAIIINAAAdd1fyAiJzdgNCMRQAABBBBAAAEEELBWQFWvbGtrO3vVqlV/sLYEwRFAoCUCHMBqCTuLItBwAXVd9xxjTF5EOhq+GgsgEHEBx3FWFgqF90WcgfoIIDBJgb6+vk8YY5ZN8nZuQwCBFgr4vt8/MDCwuIURWBoBBBBAAIFJCySTycONMb8WkbZJD+FGBBBAAAEEEEAAAQTCKfCUqmYKhcJXRKT6EYV8IYAAAtsV4ADWdom4AAG7BFKp1AG+7w8ZY95kV3LSImC1wB89z9ufP4RbvYeER6AlAueee+5elUql+uScnVsSgEURQGAqAn/s6uo6LJvN/nUqQ7gXAQQQQACBVgokk8kvGWM+3MoMrI0AAggggAACCCCAQIAFbvB9f26pVNoQ4IxEQwCBgAhwACsgG0EMBOohkEgkzhCR6kns3eoxjxkIIDBxAd/3j1y9evVdE7+DKxFAAAGRTCZTEBEXCwQQsFJgdi6Xu9TK5IRGAIHmCVR/8sZ7pZvnzUo1C/T09OzW2dl5r4jsXvPN3IAAAggggAACCCCAQDQEtojI+dOnTx/IZrN+NCrTEgEEJiPAAazJqHEPAgETSCQSOxljBlR1fsCiEQeByAgYYz5eKpUuikxhiiKAwJQFent7j3Mc56ciwp/Jp6zJAASaLnBDLpc7nmMVTXdnQQQQQACBBgjE4/GFjuN8oQGjGYkAAggggAACCCCAQJgEfub7/lk8DStMW0oXBOorwC976uvJNASaLpBMJl9rjCkaY6Y3fXEWRACBZwtc5XneyZAggAACExHo6emJHXTQQbeJyCsmcj3XIIBAoATGK5XKjGXLlv06UKkIgwACCCCAwCQFZsyY0X744YffKSIvneQIbkMAAQQQQAABBBBAICoCwyLyWZ6GFZXtpicCtQlwAKs2L65GIDACM2fObNtvv/0+YYz5nIi0ByYYQRCIrsDwnnvuuftFF11U/cM3XwgggMDzCqTT6XNU9YswIYCAlQIX53K5hVYmJzQCCCCAAALbEIjH4+90HOe7ACGAAAIIIIAAAggggMCEBH7mOM7coaGh6sd584UAAgj8TYADWLwQELBQIJVKHTA+Pn6pqr7ewvhERiC0Aqr6tmKxeHVoC1IMAQTqIrBo0aI9Y7HYehHZpS4DGYIAAk0TMMY8Njo6eujFF1/856YtykIIIIAAAgg0ScB13R+JyFubtBzLIIAAAggggAACCCBguwBPw7J9B8mPQJ0FOIBVZ1DGIdBoAdd1TzPGrBKR3Rq9FvMRQKA2AWPMslKp1FvbXVyNAAJRE8hkMtV/j8+JWm/6IhAGAd/3zxoYGBgMQxc6IIAAAggg8K8C8Xj8lY7j3CoiMXQQQAABBBBAAAEEEEBgwgLXq+pZhULhgQnfwYUIIBBKAQ5ghXJbKRVGgepHDu6zzz5LVDXN0+vCuMN0CoOAqv66WCy+Igxd6IAAAo0R6Ovre40x5iYRcRqzAlMRQKBRAr7v/2LatGmvy2azfqPWYC4CCCCAAAKtFnBd92si8r5W52B9BBBAAAEEEEAAAQQsE3haRBYVi8UVluUmLgII1FGAA1h1xGQUAo0SiMfjB4rIaj5ysFHCzEWgbgKms7Nzv5UrVz5ct4kMQgCB0Ahks1lneHj45yJyTGhKUQSB6Aj4xpjX5/P5W6JTmaYIIIAAAlEUSCaTexpjNojITlHsT2cEEEAAAQQQQAABBKYosKatrW3u4ODgo1Ocw+0IIGChAAewLNw0IkdLIJVKnV6pVL4uIrtGqzltEbBWYI7ned+wNj3BEUCgYQKZTOZDIrK8YQswGAEEGiZgjPlyPp+v/jPMFwIIIIAAAqEXcF33XBH5fOiLUhABBBBAAAEEEEAAgQYIqOpjxpj3F4vF7zVgPCMRQCDAAhzACvDmEC3aAnPmzNlhbGwsJyLnRFuC9ghYJ1DyPC9hXWoCI4BAQwU+8YlPvLCtrW29iOzW0IUYjgACjRB40nGcQ5cuXfpkI4YzEwEEEEAAgaAJPPMzqXWq+uKgZSMPAggggAACCCCAAAK2CKhqYccddzx7+fLlf7UlMzkRQGBqAhzAmpofdyPQEIFUKvXSSqVymYi8siELMBQBBBop8MQhhxyyVzab9Ru5CLMRQMAugUwms0JE3m9XatIigMAzAh/M5XJfqV2j+u22qf027kAAAQQQQCAAAqlU6kzf9y8NQBQiIIAAAggggAACCCBgs8ADjuOkhoaGbrC5BNkRQGBiAhzAmpgTVyHQNIFEIhFX1a8YY17QtEVZCAEE6ipgjHl1qVS6ra5DGYYAAtYK9PX1zTDG3CIijrUlCI5AdAV+ef/99x9TLpcr0SWgOQIIIIBAVAVc1/2piLwhqv3pjQACCCCAAAIIIIBAnQTGReTCkZGRz5TL5dE6zWQMAggEUIADWAHcFCJFU2DmzJlt++yzzxJVzURTgNYIhErgXM/zloaqEWUQQGBSAtls1hkeHr5RRF47qQHchAACrRQwlUrluGXLlv28lSFYGwEEEEAAgVYJpFKpY3zfv0lE+BlyqzaBdRFAAAEEEEAAAQRCI6Cqt6hqcmho6N7QlKIIAgj8kwDfPPOCQCAAAqlUat9KpfJNETk2AHGIgAACUxTwfX/t6tWr3zzFMdyOAAIhEOjr65tnjPlqCKpQAYEoCqzM5XLvi2JxOiOAAAIIIPB/Aq7rFkUkgQgCCCCAAAIIIIAAAgjURWBYRBYXi8Uv1mUaQxBAIFACHMAK1HYQJooC8Xj8eFW9TEReFMX+dEYgpAJjIvJCz/OeCmk/aiGAwAQE+vr6djXGrBeRPSZwOZcggECwBJ6KxWKHXXDBBY8EKxZpEEAAAQQQaK5A9U2Dvu9X/0w7rbkrsxoCCCCAAAIIIIAAAqEW+FZbW9v7BwcH/xzqlpRDIGICHMCK2IZTN1AC6rruOcaYARFpD1QywiCAwJQFfN8/bfXq1VdMeRADEEDAWoG+vr7/MsacbW0BgiMQYQFjzIJ8Pv+lCBNQHQEEEEAAgb8LuK57voh8GhIEEEAAAQQQQAABBBCon4Ax5nexWCw+NDT08/pNZRICCLRSgANYrdRn7cgKzJ07d8fR0dGVxpgzIotAcQRCLqCqXyoWiwtCXpN6CCCwDYG+vr6jjTG/EJEYSAggYJeAMebO7u7uo7PZ7LhdyUmLAAIIIIBAYwTmz5/fvXnz5ntUdf/GrMBUBBBAAAEEEEAAAQQiKzDuOM7nDzrooPOz2awfWQWKIxASAQ5ghWQjqWGPwJw5cw4bGxv7togcYU9qkiKAwCQENnie99JJ3MctCCBgv4BmMpm1InK8/VVogEDkBIzv+28eGBi4PnLNKYwAAggggMDzCCQSifeq6iBICCCAAAIIIIAAAgggUH8BY8w1qpoqFouP1H86ExFAoFkCHMBqljTrICAiruvONsZ8VUSmAYIAAuEXMMYcXCqV7g9/UxoigMCzBdLpNL+c4iWBgKUCxphCPp9PWRqf2AgggAACCDRMIJvNOhs2bLhJVV/TsEUYjAACCCCAAAIIIIBAhAVU9THf9+d4nrcmwgxUR8BqAQ5gWb19hLdFoKenJ9be3p5X1Y/bkpmcCCBQF4EPeZ735bpMYggCCFghsGDBgp26urqqH8+ytxWBCYkAAs8WeNoYc1g+n38YFgQQQAABBBD4dwHXdY8VkRtEhJ8p8wJBAAEEEEAAAQQQQKAxAkZVL9m6dWtvuVwebcwSTEUAgUYJ8M1yo2SZi8AzAj09Pbu1t7dfqqpvBQUBBCIn8B3P894dudYURiDCAplM5mIR+WiECaiOgM0Cn8jlcl+wuQDZEUAAAQQQaLRAMpn8ljGG73MbDc18BBBAAAEEEEAAgUgLGGN+3tHRceaqVav+EGkIyiNgmQAHsCzbMOLaJZBKpV5aqVQuF5HD7EpOWgQQqJPAU/fcc88Lb7vttrE6zWMMAggEWCCTybxMRG4XkfYAxyQaAgg8t8DdmzZteuWKFSv4dzavEAQQQAABBJ5HIJlMvsQYs05EOoFCAAEEEEAAAQQQQACBhgo8aYxJ8pGEDTVmOAJ1FeAAVl05GYbAPwTi8fgpqloSkZ1xQQCBSAu8wfO8n0VagPIIRESgt7f3OsdxZkakLjURCJWAqr6lv7//x6EqRRkEEEAAAQQaJOC6bl5Eehs0nrEIIIAAAggggAACCCDwDwEjIvmRkZFPlsvlCjAIIBBsAQ5gBXt/SGengLqumzbGXCAijp0VSI0AAnUUON/zvPPqOI9RCCAQQIF0Op1Q1WIAoxEJAQS2L3BpLpebvf3LuAIBBBBAAAEEqgJz587dcXR09F4ReREiCCCAAAIIIIAAAggg0BSBtW1tbbMHBwcfbcpqLIIAApMS4ADWpNi4CYHnFkgmk9OMMYPGmDMwQgABBJ4RuMnzvNejgQAC4RVIp9M7qmr1Y1j2DW9LmiEQWoEt4+PjR1x44YW/D21DiiGAAAIIINAAAdd1PyAiX27AaEYigAACCCCAAAIIIIDAcwio6mO+78c9z7sWIAQQCKYAB7CCuS+kslBg1qxZ+8disf8RkRkWxicyAgg0TqAyOjq6Z7lc3ti4JZiMAAKtFEin08tU9ROtzMDaCCAwOQFV7evv789N7m7uQgABBBBAILoCPT09sc7OzttF5KjoKtAcAQQQQAABBBBAAIGmC4w7jvP5gw466PxsNus3fXUWRACB5xXgABYvEATqIOC67huNMd8SkT3rMI4RCCAQMgHHcd5TKBTKIatFHQQQEJF0On24qt4hIu2AIICAdQIbtmzZctQll1wyYl1yAiOAAAIIIBAAgdmzZ58Qi8V4930A9oIICCCAAAIIIIAAApETuML3/feWSqVNkWtOYQQCLMABrABvDtHsEEgmk+/zff+/+cWrHftFSgRaIWCM+VqpVHp/K9ZmTQQQaKxAJpO5SkTe3thVmI4AAg0SOCWXy61p0GzGIoAAAgggEAkB13WvFJFTW162+lNu0/IUBEAAAQQQQAABBBBAoJkCD4jIGcVi8ZfNXJS1EEBg2wIcwOLVgcDkBdR13fOMMedNfgR3IoBARAQe8jxv/4h0pSYCkRHIZDLvEZHLIlOYogiESMAY8518Pv/uEFWiCgIIIIAAAi0RcF33UBH5DW9MbAk/iyKAAAIIIIAAAgggMGKMOdvzvJVQIIBA6wU4gNX6PSCBhQLJZHJapVIpquq7LIxPZAQQaIGA4zhHFAqFdS1YmiURQKABAtlstnvr1q13G2MObMB4RiKAQGMFhlX1iP7+/t81dhmmI4AAAgggEA2BZDL5n8aYBdFoS0sEEEAAAQQQQAABBAIpsGLdunUfue2228YCmY5QCEREgANYEdloatZPwHXdvX3f/56qvrp+U5mEAAJhF1DVjxWLxS+GvSf9EIiKQG9v71LHcfrC1bf6mS18exCuPaXNNgQ+ncvllqCDAAIIIIAAAvURiMfjuzqOs0FEdq/PRKYggAACCCCAAAIIIIDAJARuaGtr6xkcHHx0EvdyCwII1EGA37DUAZER0RGYPXv2yx3HuUJEDohOa5oigEA9BFT1B8Vi8dR6zGIGAgi0VqCvr2+6MeZOEelsbRJWRwCBSQj8tqur68hsNrt1EvdyCwIIIIAAAghsQyCRSHxMVS8CCAEEEEAAAQQQQAABBFoq8EdVfXehULi5pSlYHIGICnAAK6IbT+3aBVzXPckYc5mI7FT73dyBAAIIyJaNGzfutmbNmhEsEEDAboF0Ov19VT3F7hakRyCyAu/I5XLfj2x7iiOAAAIIINAggRkzZrQfccQRvzHGHNqgJRiLAAIIIIAAAggggAACExOo/h7qI8Vi8WsTu5yrEECgXgIcwKqXJHNCLeC67keNMReKSCzURSmHAAINFahUKideeuml1zZ0EYYjgEBDBRYtWnR6LBb7TkMXYTgCCDREwPf9KwYGBk5ryHCGIoAAAggggIAkk8n/MMZ8DwoEEEAAAQQQQAABBBAIhMCKkZGRBeVyeTQQaQiBQAQEOIAVgU2m4uQFenp6Yp2dnRcbYz4y+SnciQACCPxdIO95XgYPBBCwU2DhwoVd7e3td6nqS+xsQGoEIi0w4vv+UQMDAxsirUB5BBBAAAEEGiyQSCR+qKpva/AyjEcAAQQQQAABBBBAAIGJCfxMRHqKxeIjE7ucqxBAYCoCHMCaih73hlqgp6fnBR0dHd8UkZNDXZRyCCDQTIE7PM97ZTMXZC0EEKifQDqdPl9VP12/iUxCAIEmCpyfy+XOa+J6LIUAAggggEAkBVKp1Mt93/8lT5GP5PZTGgEEEEAAAQQQQCCYAn9sa2s7fXBw8BfBjEcqBMIjwAGs8OwlTeooMG/evL2Gh4e/LyIz6jiWUQgggIBR1X15pwEvBATsE+jt7T3YcZw7RWQH+9IHNLEREb4bCejmhC7Wg5VK5Yhly5ZtDl0zCiGAAAIIIBBAgWQyucIY8/4ARiMSAggggAACCCCAAAJRFRgxxszzPK8YVQB6I9AMAX7l0Qxl1rBK4Mwzzzy4ra1tjYgcYlVwwiKAgBUCxphUqVQqWBGWkAgg8HeBdDp9haq+AxIEELBPwBhzej6f/659yUmMAAIIIICAnQLJZHJPY8y9IrKznQ1IjQACCCCAAAIIIIBAKAWqb4nNT58+/dxsNuuHsiGlEGixAAewWrwBLB8sgVQqdYzv+1caY/YIVjLSIIBAiASKnuclQ9SHKgiEXiCTybxdRK4KfVEKIhBOgatzudzbwlmNVggggAACCARXIJFI9Knq0uAmJBkCCCCAAAIIIIAAApEV+FZ3d/d7V6xYsSWyAhRHoEECHMBqECxj7RNwXfc0Y8xqEem2Lz2JEUDAFgFVfXz69Okv4t0FtuwYOVshUP0DavWtOEH4WrBgQWd3d/evReSlQchDBgQQqElg1Bjz8nw+v76mu7gYAQQQQAABBKYs0NPT09HZ2XmXiEyf8jAGIIAAAggggAACCCCAQL0F7nAc57ShoaEH6z2YeQhEWYADWFHefbr/XSCRSMwVka+ISBssCCCAQKMFKpXKqy699NLbG70O8xFAYOoCvb29n3Ec57NTn8QEBBBotkD1qRv9/f3nNntd1kMAAQQQQACB/xVIJpM9xphv4oEAAggggAACCCCAAAKBFHjEcZx3DQ0N3RLIdIRCwEIBDmBZuGlErquAuq57njHmvLpOZRgCCCDwPAKq2lcsFnMgIYBAsAUymcwBxpi7VXVasJOSDgEEnkPgoa6ursOz2exf0UEAAQQQQACB1gm4rvsTEXlj6xKwMgIIIIAAAggggAACCDyPwIgxZp7neUWUEEBg6gIcwJq6IRMsFZg5c2bb/vvvv9z3/fdbWoHYCCBgr8B1nuedYG98kiMQDYFMJvMdETk9Gm1piUC4BHzff8/AwEA5XK1ogwACCCCAgH0Cs2bNOrqtre1WEXHsS09iBBBAAAEEEEAAAQQiIWBEJD99+vRzs9msH4nGlESgQQIcwGoQLGODLZBMJqf5vv8tETkp2ElJhwACIRUYHR0d3b1cLvNUjpBuMLXsF0in029V1R/Z34QGCERS4NpcLndiJJtTGgEEEEAAgQAKJJPJIWNMMoDRiIQAAggggAACCCCAAAL/ECi3tbWlBgcHt4KCAAKTE+AA1uTcuMtigTlz5uwyNjZ2pYgcZ3ENoiOAgOUCqvqOYrH4fctrEB+BUApks9mO4eHhX4vIoaEsSCkEwi0wLiKvyuVyvwl3TdohgAACCCBgj0AqldrX9/31IsJHe9uzbSRFAAEEEEAAAQQQiKbAzap6WqFQeCya9WmNwNQEOIA1NT/utkxg3rx5ew0PD18lIq+0LDpxEUAgfAL/6XneR8NXi0YI2C+QTqcXq+oF9jehAQLRE/B9f9nAwEBv9JrTGAEEEEAAgWALpFKprO/75wU7JekQQAABBBBAAAEEEEBARO4XkVOKxWL1TRR8IYBADQIcwKoBi0vtFpg1a9aLY7FY9aOEDrG7CekRQCAkAus9zzssJF2ogUBoBNLp9H6quk5EXhCaUhRBIDoCj4rIYblc7i/RqUxTBBBAAAEE7BBYuHBh1+OPP36PiBxgR2JSIoAAAggggAACCCAQXQFV3VipVE4vlUo/ia4CzRGoXYADWLWbcYeFAslk8nDf96uHr/azMD6REUAgpAKO4xxUKBQeCGk9aiFgpUAmk/mmiPRYGZ7QCCCQyOVyJRgQQAABBBBAIJgC8Xg86TjOUDDTkQoBBBBAAAEEEEAAAQT+RWDEGDPX8zx+3sZLA4EJCnAAa4JQXGavQDKZfLXv+2tE5IX2tiA5AgiEVGC+53lfDWk3aiFgnUBfX98JxphrrQtOYAQQqArckMvljhcRAwcCCCCAAAIIBFZAk8nkTcaYYwKbkGAIIIAAAggggAACCCDwbAHjOM75Q0NDWVgQQGD7AhzA2r4RV1gsEI/H36yql4vIjhbXIDoCCIRUQFW/VSwWedJOSPeXWnYJZLPZtuFamQM6AAAgAElEQVTh4V+KyFF2JSctAgiISEVEZuRyuTvQQAABBBBAAIFgC6RSqdf7vv8zEeHn0sHeKtIhgAACCCCAAAIIIPBsga+vW7fuQ7fddtsYLAggsG0BvtHl1RFaAdd1TzPGXCYiO4S2JMUQQMB2gT//8Y9/3GPt2rXjthf524/OeeaI9dsY5QKZTGaRiAxE2YDuCFgs8MVcLvcxi/MTHQEEEEAAgUgJuK7Lx35HascpiwACCCCAAAIIIBASgauNMWd4nvdUSPpQA4G6C3AAq+6kDAyCQCKRmCsiK0QkFoQ8ZEAAAQS2JaCqxxWLxRsRQgCB1gn09va+yHGce0Rk59alYGUEEJiMgDHmsdHR0UMvvvjiP//b/RwOngwp9yCAAAIIINBwgWQy+RJjzN28abLh1CyAAAIIIIAAAggggEBdBVT19lgsdsrg4OCjdR3MMARCIsABrJBsJDX+IZBIJD4oIv8lIg4uCCCAQNAFVPWzxWKRz84O+kaRL9QCmUzGE5F4qEtSDoGQChhj5uTz+W+EtB61EEAAAQQQCK2A67r9IpIJbUGKIYAAAggggAACCCAQXoEHHMc5aWho6N7wVqQZApMT4ADW5Ny4K6ACrusuMsbw8UEB3R9iIYDAvwsYY35eKpWOxQYBBFojkMlk3iAiPxH52wdp8oUAAhYJVP8dms/nj+NDcC3aNKIigAACCCDwjMDcuXN3HB0dXS8ie4OCAAIIIIAAAggggAAC1gn8yff9U0ul0m3WJScwAg0U4BdNDcRldHMFXNfNGGOq757jCwEEELBJoDI6OrpnuVzeaFNosiIQBoGenp7YQQcdVP0G8RVh6EMHBCIm4Kvq6/r7+38Rsd7URQABBBBAIDQCyWTy/caYFaEpRBEEEEAAAQQQQAABBKIl8FdVPaNQKPwwWrVpi8C2BTiAxasjFAKu62aNMeeFogwlEEAgcgLVP6AWi8VvR644hRFosUAmk/moiFzc4hgsjwACkxBQ1eX9/f0fnsSt3IIAAggggAACARHIZrPOfffdVz1M/aqARCIGAggggAACCCCAAAII1CYwqqrvLRQKl9Z2G1cjEE4BDmCFc1+j1Erj8fgyVf14lErTFQEEwiVQfcdvqVT6QLha0QaBYAssWrRoz1gsVv3Ik12CnZR0CCDwHAIbx8fHD73wwgufQAcBBBBAAAEE7BaIx+Nvdhznx3a3ID0CCCCAAAIIIIAAApEWMMaYXs/zLoy0AuUREBEOYPEysFlAE4lE9akV59hcguwIIICAiPze87wXI4EAAs0TSKfTg9V35jRvRVZCAIF6Cajq+/v7+79Wr3nMQQABBBBAAIHWCriu+z0R+Y/WpmB1BBBAAAEEEEAAAQQQmKJArlgsLhYRM8U53I6AtQIcwLJ266Id/JlHlK8wxrwv2hK0RwCBsAio6mHFYrH6NB6+EECgwQKZTOZYEbmBNyM0GJrxCDRAwPf926ZNm3ZMNpv1GzCekQgggAACCCDQAoEzzzzz4Pb29rtFpKMFy7MkAggggAACCCCAAAII1E/gGw899NC8tWvXjtdvJJMQsEeAA1j27BVJnxHo6emJtbW1fd1xHJ5awasCAQTCJHCO53mXhKkQXRAIokD1EPfmzZtvchznNUHMRyYEEHheAd9xnGOXLl16M04IIIAAAgggEC6BeDx+seM4Hw1XK9oggAACCCCAAAIIIBA9AWPM5e3t7bMGBwe3Rq89jaMuwAGsqL8CLOs/c+bMtn333dcTkfdYFp24CCCAwPYEvu953ju2dxF/HwEEpiaQTqfPVtX/mtoU7kYAgRYJfDWXy81v0dosiwACCCCAAAINFIjH47s6jrNBRHZv4DKMRgABBBBAAAEEEEAAgeYIXN/R0fEfK1eufLo5y7EKAsEQ4ABWMPaBFBMQqD75qqOjY0hE4hO4nEsQQAAB2wQ2b9y4cfc1a9aM2BacvAjYIrB48eLdfd+vftQnv9SxZdPIicA/BDY5jnPo0qVLHwcFAQQQQAABBMIpEI/Hz3Ec54vhbEcrBBBAAAEEEEAAAQQiJ3Cr4zgnDQ0NPRm55hSOrAAHsCK79XYVf+bw1aCIuHYlJy0CCCAwcQFjzAmlUum6id/BlQggUItAOp3+qqrOq+UerkUAgWAIGGM+nM/nlwcjDSkQQAABBBBAoBECzzz5/leq+rJGzGcmAggggAACCCCAAAIINFfAGHNXZ2fn21auXPlwc1dmNQRaI8ABrNa4s2oNAs8cvlolIskabuNSBBBAwEaBfs/zFtsYnMwIBF2gr69vhjHmFhFxgp6VfAgg8G8Ct99///2vKZfLFWwQQAABBBBAINwCruueKiJXhrsl7RBAAAEEEEAAAQQQiI6Aqq5va2t766pVq/4QndY0jaoAB7CiuvOW9M5ms8699967SlVTlkQmJgIIIDBpAVW9vVgsvmrSA7gRAQSeU6D654nh4eEbReS1ECGAgHUCRkRm5nK5n1iXnMAIIIAAAgggMCmBRCJxlaq+fVI3cxMCCCCAAAIIIIAAAggEUeBB3/dPLJVKG4IYjkwI1EuAA1j1kmROIwQ0Ho9/WVXnN2I4MxFAAIEACpj29vZ9BgcHHw1gNiIhYK1AX1/ffGPMV6wtQHAEoi0wmMvlzoo2Ae0RQAABBBCIlkAikThCVe8QkbZoNactAggggAACCCCAAAKhFviT4zhvGxoa+nWoW1Iu0gIcwIr09ge6vCYSieUi8sFApyQcAgggUGcBY4xbKpW8Oo9lHAKRFejr69vVGLNeRPaILALFEbBX4KlYLHbYBRdc8Ii9FUiOAAIIIIAAApMRcF33yyLygcncyz0IIIAAAggggAACCCAQWIFNxphTPM+7KbAJCYbAFAQ4gDUFPG5tmIC6rvtfxpgPNWwFBiOAAAIBFTDGDJVKpfcGNB6xELBOIJPJVA9082cK63aOwAj8TeBjuVzui1gggAACCCCAQPQEenp69ujs7Kx+PMnO0WtPYwQQQAABBBBAAAEEQi3wV2PMuzzPuzbULSkXSQEOYEVy2wNduvrkqy+JyNmBTkk4BBBAoHECj3qet4+ImMYtwWQEoiHQ19d3tDHmFyISi0ZjWiIQHgFjzF1//vOfj16xYsVYeFrRBAEEEEAAAQRqEUgmk2ljTK6We7gWAQQQQAABBBBAAAEErBDYIiLvKhaLV1uRlpAITFCAA1gThOKy5gi4rnuJMeYjzVmNVRBAAIFgChhjji6VSr8KZjpSIWCNgKbT6etV9Y3WJCYoAgj8XUBV39zf378WEgQQQAABBBCIrkBPT09HZ2fnnSJySHQVaI4AAggggAACCCCAQGgFRowxZ3ied2VoG1IscgIcwIrclge3cCKRWCoifcFNSDIEEECgaQIZz/PyTVuNhRAIoUA6nT5LVVeGsBqVEIiCQCmXyyWiUJSOCCCAAAIIIPD8Aq7rvltEvoUTAggggAACCCCAAAIIhFJgVER6isXi90LZjlKRE+AAVuS2PJiFE4nEJ0VkSTDTkQoBBBBoroCqXlssFk9s7qqshkB4BBYsWLBTV1fXPaq6d3ha0QSByAg8PTo6evhFF130x8g0pigCCCCAAAIIPK+A67rXi8jxMCGAAAIIIIAAAggggEAoBUZ9339PqVS6PJTtKBUpAQ5gRWq7g1k2kUh8WES+FMx0pEIAAQRaIjDqOM5uhUJhc0tWZ1EELBfIZDL/KSILLK9BfASiKtCby+WWRbU8vRFAAAEEEEDg3wVmzZp1dFtb260i4uCDAAIIIIAAAggggAACoRSo/l5s1tDQ0P+Esh2lIiPAAazIbHUwi8bj8ZSqruIHKMHcH1IhgEBLBU7xPG9NSxOwOAIWCmQymZeJyK9EpM3C+ERGIOoC6zZt2vSKFStWjEUdgv4IIIAAAggg8M8CrusOish7cUEAAQQQQAABBBBAAIHQCoyp6qxCofCd0DakWOgFOIAV+i0ObsFUKnV6pVL5Jr8gDe4ekQwBBFon4Pv+xatXr17YugSsjICVAtrb2/tjx3FmWpme0AggcFIul/shDAgggAACCCCAwL8KzJ07d5/R0dF7RWQaOggggAACCCCAAAIIIBBagUr1jRfFYtELbUOKhVqAA1ih3t7glnNd960icoUxpjO4KUmGAAIItFRgned5R7Q0AYsjYJlAJpNxRaRgWWziIoDA/wqUc7nce8BAAAEEEEAAAQS2JZBIJD6jqp9FCAEEEEAAAQQQQAABBEItUDHGzPE8rxjqlpQLpQAHsEK5rcEu5bruscaYH/GOtWDvE+kQQKD1ArFY7MChoaEHW5+EBAgEXyCdTu+oqveIyD7BT0tCBBD4F4Et4+PjR1x44YW/RwYBBBBAAAEEENiWwPz587s3b958j6rujxICCCCAAAIIIIAAAgiEWqB6CCvleV4p1C0pFzoBDmCFbkuDXSiVSh1TqVSuEZEdg52UdAgggEDrBRzHmVcoFL7e+iQkQCD4AplM5kIR+Xjwk5IQAQT+VcAYc24+n1+KDAIIIIAAAgggsD0B13UTImLvO+GrP40322vJ30cAAQQQQAABBBBAAAERqaiqWygULkUDAVsEOIBly06FIGcymTzS9/3rRWS3ENShAgIIINBwAVUtF4tFPo6p4dIsYLvA4sWLj/B9/1ci0m57F/IjEEGB+7Zs2XLkJZdcMhLB7lRGAAEEEEAAgdoF1HXdn4rIcbXfyh0IIIAAAggggAACCCBgmcCY7/s9pVLpcstyEzeiAhzAiujGN7t2IpHYT0RuFBEeEd5sfNZDAAGbBTaNjo7uUS6XKzaXIDsCjRbo7e291nGcExq9DvMRQKD+Ao7jnLp06dIf1H8yExFAAAEEEEAgrAKJROJ1qlr9OSM/2w7rJtMLAQQQQAABBBBAAIF/CIyq6hmFQuEKUBAIugDfpAZ9h0KQb/bs2S90HKf6zrTDQlCHCgiEWqD6FHz+xRCsLXYc53WFQuHmYKUiDQLBEejr6zvTGMMjiIOzJSRBoBaB7+ZyudNruYFrEUAAAQQQQACBqkAikbhUVc9EAwEEEEAAAQQQQAABBCIhUD2EdXqhUOCNnJHYbntL8nt2e/fOiuTz58/v3rx589UicqwVgQmJAAIIBE/gPM/zzg9eLBIh0HqBbDbbvXXr1ruNMQe2Pg0JEECgRoHh9vb2ly1ZsuSBGu/jcgQQQAABBBBAQM4666z9x8bG7hGRbjgQQAABBBBAAAEEEEAgEgLDvu+fWiqVrotEW0paKcABLCu3zY7QM2bMaD/ssMOqn8d6sh2JSYkAAggEUuBnnue9IZDJCIVAiwXS6XS/qmZaHIPlEUBgEgK+7583MDDAAeNJ2HELAtYLVH8SVX30Ll8IIIDAFAUSicQFqrp4imO4HQEEEEAAAQQQQAABBOwR2OL7/smlUukn9kQmaZQEOIAVpd1ubldNJBIrRWROc5dlNQQQQCB0AuOjo6MvLJfLfwldMwohMAWB3t7eQxzH+Y2IdE5hDLcigEALBIwx93d3d78sm81ubcHyLIkAAggggAACIRE4++yzX/DUU0/dKyJ7h6QSNRBAAAEEEEAAAQQQQGD7Ak+p6tsKhcLN27+UKxBorgAHsJrrHZnVksnkMt/3PxGZwhRFAAEEGigQi8X+39DQ0P80cAlGI2CdQDqd/oGq8pRN63aOwAj8TeC0XC53BRYIIIAAAggggMBUBZLJ5PuMMV+b6hzuRwABBBBAAAEEEEAAAasE/qKqJxYKhVutSk3Y0AtwACv0W9z8golEIi0iueavzIoIIIBAaAW+4nneB0PbjmII1CiQTqf/n6p+u8bbuBwBBIIh8MNcLndSMKKQAgEEEEAAAQRsF+jp6Yl1dnZWf+nyStu7kB8BBBBAAAEEEEAAAQRqEngyFou96Rvf+MZdNd3FxQg0UIADWA3EjeLoeDyeUNWCiPDaiuILgM4IINAogd95nveSRg1nLgI2CSxcuLCro6PjbhF5sU25yYoAAn8TGHUc56ilS5dWPyqILwQQQAABBBBAoC4CruvOFJHr6jKMIQgggAACCCCAAAIIIGCTwMOq+oZCofCATaHJGl4BDsmEd2+b3iwej5+iqt8VkfamL86CCCCAQMgFYrHYoUNDQ/zCOuT7TL3tC2Qymc+JyKe2fyVXIIBAAAWW5HK5TwcwF5EQQAABBBBAwHKBRCLxXVV9p+U1iI8AAggggAACCCCAAAK1C/y2o6Pj+JUrVz5c+63cgUB9BTiAVV/PyE5zXfdVInK9MeYFkUWgOAIIINBAAWPMglKp9KUGLsFoBAIv0Nvbe7DjOHeKyA6BD0tABBD4JwFjzB983z982bJlm6FBAAEEEEAAAQTqLXDmmWce3N7eXv3okc56z2YeAggggAACCCCAAAIIBF7gTsdxZg4NDT0Z+KQEDLUAB7BCvb3NKZdKpfatVCo3ich+zVmRVRBAAIHoCajqFcVi8bToNacxAv8QSKfTV6rqqZgggIB9AsaYd+fz+e/Yl5zECCCAAAIIIGCLgOu6XxCRhbbkJScCCCCAAAIIIIAAAgjUT0BVb2lvbz9x5cqVT9dvKpMQqE2AA1i1eXH1vwgkEomdVPWnxpiXg4MAAggg0FCBzRs3btx9zZo1Iw1dheEIBFQgnU6fpqqXBzQesRBA4PkFrsnlcm8FCQEEEEAAAQQQaKTAnDlzdhkfH98gIi9s5DrMRgABBBBAAAEEEEAAgWAKqOqPY7HYqYODg1uDmZBUYRfgAFbYd7iB/WbMmNF+6KGHfl9V+WVKA50ZjQACCPyfgO/7M1evXn09IghETWDBggWd3d3dvxGRQ6LWnb4IhEBg1HGcVyxduvSeEHShAgIIIIAAAggEXMB13Y+IyCUBj0k8BBBAAAEEEEAAAQQQaJzA9x566KF3r127drxxSzAZgecW4ADW87wyqjiGV862BHT27NmrHMd5L0QIIIAAAs0RUNULisXiJ5uzGqsgEByBdDp9nqpmg5OIJAggMFEBY0wun8/3TfR6rkMAAQQQQAABBKYi0NPTE+vs7PyViBw5lTnciwACCCCAAAIIIIAAAlYLFKdPn/7ebDbrW92C8NYJcADLui0LRmDXdbPGmPOCkYYUCCCAQGQEbvM879WRaUtRBEQkk8kcICLrRKQbEAQQsE7gj11dXYdls9m/WpecwAgggAACCCBgrUAikThZVX9gbQGCI4AAAggggAACCCCAwJQFfN//YqlU+tiUBzEAgRoEOIBVAxaX/q+A67qzjTGeiPD64UWBAAIINFfAdxxn70Kh8Fhzl2U1BFon0Nvb+13Hcd7ZugSsjAACkxVQ1Vn9/f2XTfZ+7kMAAQQQQAABBCYr4LruGhE5abL3cx8CCCCAAAIIIIAAAgiEQuCTxWLxglA0oYQVAhygsWKbghNy9uzZb4rFYj80xnQGJxVJEEAAgUgJJDzPK0WqMWUjK5BOp9+qqj+KLADFEbBYwBjz03w+/yY+1d3iTSQ6AggggAACFgskk8nDjTG/FpE2i2sQHQEEEEAAAQQQQAABBKYmYIwx8zzPWzm1MdyNwMQEOIA1MSeuEpFEInGEiNwgIrsCggACCCDQGgHf97+xevXqOa1ZnVURaJ5ANpvtGB4erv7C5NDmrcpKCCBQJ4HxSqUyY9myZdV/hvlCAAEEEEAAAQRaIuC67nIR+VBLFmdRBBBAAAEEEEAAAQQQCIpAxff9d5dKpcuDEogc4RXgAFZ497auzebNm7fX8PDwzSJyYF0HMwwBBBBAoFaBRzzP25cnitTKxvW2CWQymXNF5PO25SYvAgj8TeALuVzuE1gggAACCCCAAAKtFOjp6dlthx122GCM2a2VOVgbAQQQQAABBBBAAAEEWi6wxXGcE4eGhn7e8iQECLUAB7BCvb31KdfT09PR2dn5I2NM9SNE+EIAAQQQaL3Ayz3P+03rY5AAgcYIpNPp/UTkHlWd1pgVmIoAAg0U+FP1yXW5XO4vDVyD0QgggAACCCCAwIQEXNddJCIDE7qYixBAAAEEEEAAAQQQQCDMAk+IyBuKxeL6MJekW2sFOIDVWn8rVo/H419V1XlWhCUkAgggEAEBVe0tFovLIlCVihEVSKfTZVU9I6L1qY2A7QLJXC5XtL0E+RFAAAEEEEAgHALPvLH0ThE5JByNaIEAAggggAACCCCAAAJTEHigra3t2MHBwUenMINbEdimAAeweHE8r4DruhljTD9MCCCAAALBETDGXF0qld4WnEQkQaB+Aul0+i2qek39JjIJAQSaJWCM+Vk+n38jH5PbLHHWQQABBBBAAIGJCKRSqdN93//ORK7lGgQQQAABBBBAAAEEEAi9wG9GRkbeWC6XeYJ/6Le6+QU5gNV8c2tWTCQSJ4vIFSISsyY0QRFAAIFoCGydNm3a7itWrNgSjbq0jIrA/Pnz23fdddc7ROTwqHSmJwIhEqj4vv/qgYGBX4WoE1UQQAABBBBAICQCiUTialU9MSR1qIEAAggggAACCCCAAAJTEFDV65544omT16xZMzKFMdyKwL8JcACLF8VzCiQSiSNE5EYR2RkiBBBAAIHgCTiOc1KhUPhh8JKRCIHJC6TT6V5VzU9+AncigEALBS7J5XLntHB9lkYAAQQQQAABBLYp4Lruq0TkFyLiwIQAAggggAACCCCAAAIIiEixWCymeJo/r4V6CnAAq56aIZmVSqV2933/ZmPMwSGpRA0EEEAgdAKqelGxWPx46IpRKLICvb29L3IcZ72I7BRZBIojYKmAMeYxx3EO6+/v32RpBWIjgAACCCCAQAQE4vH4SsdxzopAVSoigAACCCCAAAIIIIDABARUdUmhUPj0BC7lEgQmJMABrAkxReeiGTNmtB9++OFXG2PeFJ3WNEUAAQSsFLjL87wjrUxOaASeQyCdTpdUdTY4CCBgn4Dv++8bGBhYaV9yEiOAAAIIIIBAlATmzZu319atW+/lTR9R2nW6IoAAAggggAACCCCwXYEPFovFr2z3Ki5AYAICHMCaAFKULkkmkyt8339/lDrTFQEEELBVoFKpHHDppZf+wdb85Ebg/wQymcwbROQnIsKfTXlZIGCZgDHm1u7u7tdms1nfsujERaAmgeq/oExNd3AxAggggEAQBeLx+Kccx/lcELORCQEEEEAAAQQQQAABBFoiMOY4zilDQ0PXtGR1Fg2VAL/kCtV2Tq2M67qLjDEDU5vC3QgggAACTRR4n+d5PHGkieAsVX+BbDbbtnXr1tuMMS+v/3QmIoBAgwV8Y8zr8/n8LQ1eh/EIIIAAAggggEBdBBYuXNj1+OOPrxORA+sykCEIIIAAAggggAACCCAQBoGnVPW4QqFwZxjK0KF1AhzAap19oFZOpVInViqVq0QkFqhghEEAAQQQeD6ByzzPmwURAjYL9PX1LTTGfMHmDmRHIKoCxpgv5/P5D0W1P70RQAABBBBAwE4B13WrH31esjM9qackwCMtp8THzQhYK8A/+9ZuHcERQACBZgoYY37X1dX1uq997Wt/aua6rBUuAQ5ghWs/J9Vm1qxZL47FYr8QkRdOagA3IYAAAgi0SmDT6OjoHuVyudKqAKyLwFQEzj333L0qlco9IrLLVOZwLwIItERg4/j4+KEXXnjhEy1ZnUURQAABBBBAAIHJC6jruj8VkeMmP4I7EUAAAQQQQAABBBBAIIQCt3Z3d79pxYoVW0LYjUpNEOAAVhOQg7xE9bHbf/rTn25Q1VcFOSfZEEAAAQSeW2B8fPyYyy67rHqIli8ErBPIZDLfEJGUdcEJjAACVYEP5nK5r0CBAAIIIIAAAgjYKJBMJl9rjPm5iPDzcRs3kMwIIIAAAggggAACCDRIQFW/ffDBB78nm836DVqCsSEW4BvMEG/uRKrF4/HVqsrHV00Ei2sQQACBAAoYYz5dKpWWBDAakRB4XoFMJnOsiNzALzx4oSBgpcAv77///mN4AqOVe0doBBBAAAEEEHhGwHXd6scQVj+OkC8EEEAAAQQQQAABBBBA4NkCuWKx2AcJArUKcACrVrEQXe+67iJjzECIKlEFAQQQiJrAoyLyMc/zLotacfraLdDT0xM76KCDbhWRV9rdhPQIRFLAGGOOzefzN0WyPaURQAABBBBAIDQCqVTqAN/3qx+J3hWaUhRBAAEEEEAAAQQQQACBugio6vxCofDVugxjSGQEOIAVma3+56KzZs16SywWu0pE2iJKQG0EEEDAZoGnjTHLVfUCz/OesrkI2aMpkE6nP6Kql0SzPa0RsF5gZS6Xe5/1LSiAAAIIIIAAAgiISDKZXGKM+SQYCCCAAAIIIIAAAggggMC/CIz5vv/2Uql0HTIITFSAA1gTlQrRdfF4/EDHcX5hjNkjRLWogkD4BUydPqirXnPCLx7EhluMMdVDK7lSqbQpiAHJhMD2BBYvXry77/vrRWT37V3L30cAgcAJPOX7/qEDAwPVJzDyhQACCCCAAAIIWC9w9tlnv+Cpp566V0T2tr4MBRBAAAEEEEAAAQQQQKCuAqq60Rjz2mKxeF9dBzMstAIcwArt1j53sTlz5uwwNjZ2g4jMiFh16iKAAAI2C4wZY1Y5jpMtFouP2FyE7AhkMpmvi8hcJBBAwD4BY8yCfD7/JfuSkxgBBBBAAAEEENi2QCKRmKuq1e9T+EIAAQQQQAABBBBAAAEE/lVg3cjIyOvL5fJfoEFgewIcwNqeUMj+fiKRWCUic0JWizoIIIBAWAV8Vf322NjY4ssuu+y3YS1Jr+gIpNPpV6vqzSLiRKc1TREIh4Ax5s7u7u6js9nseDga0QIBBBBAAAEEEPhfgWw269x333238IZVXhEIIIAAAggggAACCCCwDYGrRkZG3lEulysIIfB8AhzAitDrw3XdjxpjLo5QZaoigAACtgqY6sErVf1MoVBYZ2sJciPwbIHqLzWGh4d/LiLHIIMAAtYJGN/33zwwMHC9dckJjOg0sUkAACAASURBVAACCCCAAAIITEDAdd2ZInLdBC7lEgQQQAABBBBAAAEEEIiggKr2FwqFxRGsTuUaBDiAVQOWzZcmk8nX+r7/ExHpsLkH2RFAAIEICFzjOM7iQqFwawS6UjFCAplM5gMi8uUIVaYqAqERMMYU8vl8KjSFKIIAAggggAACCDyHQDwe/x/Hcd4FDgIIIIAAAggggAACCCCwDQG3WCx66CCwLQEOYEXgtdHT07NbR0fHL0XkwAjUpSICCCBgq8BNvu9/cvXq1T+2tQC5EdiWwMKFC6t/FlkvIi9ECQEErBN42hhzWD6ff9i65ARGAAEEEEAAAQRqEIjH4wc5jnO3iHTWcBuXIoAAAggggAACCCCAQHQEthpj3ux53k3RqUzTWgQ4gFWLloXXVj/uZ8OGDd8XkZMsjB/ByEZE+McyghtP5WgL3OU4zmcLhcK3RKT6PwJ8IRA6gUwmU33yVfUJWHwhgIBlAqr68f7+/ossi01cBBBAAAEEEEBgUgLxePxCx3E+PqmbuQkBBBBAAAEEEEAAAQSiIPCoMeY1nuc9FIWydKxNgJMetXlZd3U8Hv+0qp5vXXACI4AAAuEX+J2qLh0ZGfl6uVyuhL8uDaMq0Nvb+yrHcW4RkVhUDeiNgMUCd2/atOmVK1asGLO4A9ERQAABBBBAAIEJC8yZM2eX8fHxDTy9d8JkXIgAAggggAACCCCAQOQEVPX2rq6uN6xYsWJL5MpT+HkFOIAV4hdIPB5/s6pezS88Q7zJVEMAARsFHlLVzz300EMr165dO25jATIjUIOAZjKZG0XkdTXcw6UIIBAQAWPMCfl8/rptx6l+O8nDGwOyXcRAAAEEEEAAgToJJBKJD6vql+o0jjEIIIAAAggggAACCCAQQgFVLRUKhUQIq1FpCgIcwJoCXpBvnTdv3l7Dw8O3i8jeQc5JNgQQQCAqAsaYJx3HGdhjjz3+86KLLhqOSm96Rlugt7d3ruM4X4+2Au0RsFbg0lwuN9va9ARHAAEEEEAAAQQmKdDT0xPr7Oz8lYgcOckR3IYAAggggAACCCCAAAIREPB9/6OlUuk/I1CVihMU4ADWBKFsumzmzJlt++6777UicrxNucmKAAIIhFRgizHmkrGxsaXlcvkvIe1ILQT+TWDBggU7dXd3rxeRF8GDAALWCVQfnX14Lpd70LrkBEYAAQQQQAABBOogkEgkTlbVH9RhFCMQQAABBBBAAAEEEEAgvALjqnpioVC4PrwVaVaLAAewatGy5NpEIpETkbQlcYmJAAIIhFXAV9Vv+77fWyqVfh/WkvRCYFsC6XT6ElX9CEIIIGClQCaXy+WtTE5oBBBAAAEEEECgTgKJROIqVX17ncYxBgEEEEAAAQQQQAABBMIp8CdjzKs9z3sonPVoVYsAB7Bq0bLgWtd1TzXGXCEi7K0F+0VEBBAIrcA1qrqoWCzeEdqGFEPgeQQWLVp0ZCwWq34UchtQCCBgncCGLVu2HHXJJZeMWJecwAgggAACCCCAQB0Fksnk4caYX/N9TR1RGYUAAggggAACCCCAQAgFHMe56fHHH5+5Zs0afqYawv2tpRKHdGrRCvi18Xj8QFX9pYjsFvCoxEMAAQTCKnCb7/vp1atX/zisBemFwAQEtK+v7zpjzJsmcC2XIIBAwAR83z95YGDgqoDFIg4CCCCAAAIIINASgUQi8d+q+sGWLM6iCCCAQHQENovI6ATrdotI5wSv5TIEEEAAAQSaKfDfxWLx7GYuyFrBE+AAVvD2ZFKJZs6c2bbvvvtWP1v02EkN4CYEEEAAgakI/EFVl0yfPv1r2WzWn8og7kXAdoF0Op1U1SHbe5AfgYgKfDuXy50R0e7URgABBBBAAAEE/k2gp6dnj87Ozg0isjM8CCCAAAJiVHWTMWajMWaTiGys/v8isklVN/q+X/3r047j/MX3/RHHcf5qjHm6UqlUnwbyVEdHx5bR0dGRTZs2banHE0Lmzp2749atW6tPX99JRGK+7+/sOI6jqruISJeIVP9a/d/vXVR15+p/b4yp/nfV/+wqIi8SkT040MUrGwEEEECgjgJzi8XiqjrOY5RlAhzAsmzDthXXdd3PG2PODUkdaiCAAAK2CGwUkQs2btz4pXr80MCW0uREYFsC6XR6R1W9R0T2QQkBBKwTGFbVI/r7+39nXXICI4AAAggggAACDRRwXbdXRPINXILRCCCAQKsF/ioiDxpjHlbVR33ff0xVHzbGPNbe3v6n8fHxR7q6uh7bb7/9Hg/jm08TicROqrq34zjVw1h7VCqVvWOx2J7j4+MHqOr+juPsb4w54JlDXa3eK9ZHAAEEEAi2wFZVfWOhULg12DFJ1ygBDmA1SraJc2fPnv0mx3GurZ7wb+KyLIUAAghEWWDMGLNqbGzsU+Vy+fEoQ9AdgWcLZDKZL4jIQlQQQMA+AWPMp/L5/OftS05iBBBAAAEEEECgsQInn3xy5+677363iBzU2JWYjgACCDRM4FER+a2I/MEY86CqVp/m//vq/+37/oOlUqn6FCu+tiPwzFMR9xeR/Xzff3EsFjvYGDNdRA4RkReLSDuICCCAAAIIVA81VyqVGatXr34CjegJcADL8j2v/oGvvb39V6rKkyYs30viI4CANQLX+L7/sdWrV99lTWKCItAEgcWLFx/h+/6v+GFTE7BZAoH6C/y2q6vryGw2u7X+o5mIAAIIIIAAAgjYL+C67rtF5Fv2N6EBAgiEVMCIyB9F5D7Hce7zfb/619+Oj4/ft8suu9y3fPny6hOu+GqgwMyZM9v22muvAzs6Oqb7vj/dcZyX+r5/hKq+TET2buDSjEYAAQQQCKCAMeaaQw455O1hfHJkALkDFYkDWIHajprD6OzZs7/rOM5pNd/JDQgggAACtQqsM8YsKpVKP6j1Rq5HIAoCvb291zmOMzMKXemIQNgEHMc5denSpfz7LWwbSx8EEEAAAQQQqKuA67rXi8jxdR3KMAQQQKA2gYqIPGCMqb4x9G5Vrf51XXd39z0rVqzYUtsorm6WQE9Pz2477LDDUcaYI0TkKBF5maoeaYzZrVkZWAcBBBBAoPkCjuN8dmhoKNv8lVmxlQIcwGql/hTXjsfjC1W1+lE/fCGAAAIINE7gCVVdMjIy8qVyuVz9IQdfCCDwLwK9vb2zHccpAYMAAvYJ+L5/+cDAwLvsS05iBBBAAAEEEECguQLxeHyG4zi3iIjT3JVZDQEEIipQfaJV9Unjd4jInb7vr+vo6LhncHCQJxeH5AURj8cPjMViM4wxf/uPqs4QkReGpB41EEAAAQREfMdx3j40NHQNGNER4ABWkPe6ujvVB8c+x5fruq8SkRuNMZ1BrkA2BBBAwGKBURH5soh82vO8pyzuQXQEGiqQzWZfMDw8fI+I7NvQhRiOAAKNEBhub29/2ZIlSx5oxHBmIoAAAggggAACYRNwXXdQRN4btl70QQCBlgqMG2PWq+rfDls5jnP72NjYr1avXv1ES1OxeEsEnn0oS1Vfb4w5RkSmtSQMiyKAAAIITFlAVR9rb28/euXKlQ9PeRgDrBDgAJYV2/TPIXt6el7Q0dHxSxE5xML4REYAAQSCLmCMMZeJSF+pVPp90MOSD4FWC6TT6byq9rY6B+sjgEDtAsaYz+Tz+c/Vfid3IIAAAggggAAC0RRIpVL7+r6/nl+GR3P/aY1AHQSMqlb/N+QXxphbqk/Vcxzn1zzVqg6yIR0xc+bMtn322ecVInKcqh6rqseJyH4hrUstBBBAIKwCP33ooYdOWLt27XhYC9LrHwIcwLLw1RCPx7+hqikLoxMZAQQQCLSAqt4uIh8tFos/DXRQwiEQEIHe3t5DHMf5jYjwRM6A7AkxEKhB4LddXV1HZrNZPr6iBjQuRQABBBBAAAEEEonEZ1T1s0GVeJ4PVQhqZHIhEGaBR0XkluphK1W9ZWRk5JZyufyXMBemW+MFzjrrrP1HR0ffqKpvEpETRGR641dlBQQQQACBKQrkisVi3xRncLsFAhzAsmCTnh0xkUi4IlKwLDZxEUAAgaALPCYinzrkkEO+ns1m/aCHJR8CQRFIp9NrVPWkoOQhBwII1CTwjlwu9/2a7uBiBBBAAAEEEEAAAZk/f373li1bqk+w4QkkvB4QQODZAtWfKd4lItU3dt7o+/4NPF2fF0gzBFKp1AGVSuXNxpgTHMepHsji30/NgGcNBBBAoDaB6qfvnOZ53pW13cbVtglwAMuiHZs1a9aLY7HYHSKyk0WxiYoAAggEWWBMRP57dHT0M7z7LMjbRLYgCqTT6TNUtRzEbGRCAIHnF/B9//KBgYF34YQAAggggAACCCAwOYF4PJ50HGdocndzFwIIhERguPpRgiJyg6r+LBaL3Tg4OPjnkHSjhsUCqVTqpb7vv0VEqm+arP51msV1iI4AAgiERkBVN1YqlVdxQDs0W/qcRTiAZcn+ZrNZZ/369dc6jjPTksjERAABBAItoKrXqurHCoXCnYEOSjgEAiiwcOHCro6OjrtF5MUBjEckBBB4foHh9vb2ly1ZsuQBoBBAAAEEEEAAAQQmLaCJROJmVX3NpCdwIwII2CawVVVvrFQq16nqdaOjo78ol8ujtpUgb7QETj755M7dd9/9eFU9xRhzioi8NFoCtEUAAQQCJ3DzyMjI8fwZInD7UrdAHMCqG2VjByUSiepngi5t7CpMRwABBMIvoKr3qeq5hUKBJ/eEf7tp2CCBTCbzeRE5t0HjGRsVASMifDfS9N32ff+8gYGB85u+MAsigAACCCCAAAIhE0gkEsepavWjxvhTbcj2ljoIPCMwLiK3qOqPK5XKjzs6On4+ODi4FR0EbBY488wzD25ra6sexHqHqlYf+NBhcx+yI4AAAjYKqOrFhUJhoY3Zybx9Ab453L5Ry6+Ix+OvVNWb+YNQy7eCAAggYLfA06r6+SeffPLiNWvWjNhdhfQItE6gt7f3YMdxqk+O26F1KVgZAQQmKfDbrq6uI7PZLL80mCQgtyGAQIsFqj/Fqh7g5QsBBBAIiIDrupeJyHsCEocYCCAwdYHfqOqPfN+/duedd/7p8uXL/zr1kUxAIJgCc+bM2WV8fPxUVT3dGHOyiHQHMympEEAAgdAJGGPMaZ7nXRm6ZhTi3TlBfw1UHw+62267VT9H/KigZyUfAgggEGCBK2Ox2IeHhoYeDHBGoiFghUA6nb5SVU+1IiwhEUDgnwR83/+PgYEBvrHndYEAAggggAACCNRJIJlMvsQYU/14dt6gUidTxiDQTAFV3WiMuVZErmlvb1+zatWqPzRzfdZCICgCc+bM2aFSqbzVGFN9Mta7jDF7BiUbORBAAIGQCjzR0dHxipUrVz4c0n6RrcUTsAK+9bNnz77IcZyPBTwm8RBAAIFAChhj7o3FYucUCoUfBjIgoRCwTCCTybxTRL5rWWziIoBA9XNxVL/X399f/WeYLwQQQAABBBBAAIE6Criu2y8imTqOZBQCCDROoGKMuUVErnIc54dbt269tVwuVxq3HJMRsE9gxowZ7YcffvhbfN+f7TjO6SKyo30tSIwAAggEX6D6MccHH3zwW7PZrB/8tCScqAAHsCYq1YLr4vH48ap6nYg4LVieJRFAAAGbBbao6sCTTz65lI8btHkbyR4kgYULF3a1t7ffpaovCVIusiCAwIQEhlX1yP7+/vsndDUXIYAAAggggAACCExYIJFI7KSq94rIXhO+iQsRQKCZAn+uHrgSke/5vn9VqVTa1MzFWQsBmwWqPw984okn3mGMmS0ip4hIp819yI4AAggETUBVzy0UCkuDlos8kxfgANbk7Rp6Z/Wzl8fGxu4QkQMauhDDEUAAgfAJ8HGD4dtTGgVAoK+vL2uMOS8AUYiAAAI1Cvi+f97AwMD5Nd7G5QgggAACCCCAAAITFHBdd76IfGWCl3MZAgg0XuA+EbmiUqlc+cgjj/xk7dq1441fkhUQCLfAM7+3/H8iMltVT+DhEeHeb9ohgEDTBMaMMcd7nndT01ZkoYYKcACrobyTH55IJErVP8RMfgJ3IoAAApET2KCq5xSLxeo72vhCAIE6CmQymeqB8HUi0l3HsYxCAIHmCPy2q6vryGw2u7U5y7EKAggggAACCCAQPYGenp5YZ2fn7SJyVPTa0xiBQAhUP0bwRlWtvjHze4ODg/cEIhUhEAipwFlnnbX/2NjYHBF5r4gcHNKa1EIAAQSaJfDAyMjI0eVy+S/NWpB1GifAAazG2U56suu67zbGfGvSA7gRAQQQiJYAHzcYrf2mbQsE+vr6LjfGnNaCpVkSAQSmKOD7/n8MDAxcOcUx3I4AAggggAACCCCwHYHZs2efEIvFrgUKAQSaJlA9dFV9WkRZRL5ZLBYfadrKLIQAAn8XiMfjMxzHqT4JMi4iL4AGAQQQQGBSAuVisfieSd3JTYES4ABWoLZDZO7cufuMjIzcKSK7BiwacRBAAIEgClwei8XOGRoaejCI4ciEQBgE+vr63maM+WEYutABgagJqOr3+vv73xm13vRFAAEEEEAAAQRaJZBMJq8wxryjVeuzLgIREKg+2fdHIvJt3/evKJVKmyLQmYoIWCGQSCR2UtX3OI7zPt/3X2dFaEIigAACwRKYWywWVwUrEmlqFeAAVq1iDb5+9uzZ33Ec5/QGL8N4BBBAwGoBY8zDsVjsY4VCofoON74QQKBBAtlstmN4ePg3IvLSBi3BWAQQaJzAsKoe2d/ff3/jlmAyAggggAACCCCAwLMFXNc9VESq30O1I4MAAnUT2Cwi368eutppp51+sHz58r/WbTKDEECgIQKzZs06ur29/UPGmOpTsaY1ZBGGIoAAAuETqP6ZZ0axWFwfvmrRacQBrADtdTweT6nqNwIUiSgIIIBA0ATGRWR5Z2fnp1auXPl00MKRB4GwCWQymU+JyOfC1os+CERBwPf98wYGBs6PQlc6IoAAAggggAACQRJIJpNfNMacE6RMZEHAQoERVb3aGFPeaaedvsOhKwt3kMgIiMgzT8WaJSIfEZGjQEEAAQQQ2K7AL0dGRl5fLpdHt3slFwRSgANYAdkW13X3NsZUP3pwt4BEIgYCCCAQNIHbHMf5YKFQuDVowciDQBgFPvnJT+4/Nja2TlV5l1oYN5hOYRf4bVdX15HZbLb68Rx8IYAAAggggAACCDRRoKenZ7cddthhgzHm/7N3J2By1NXex8+pniUTkNUoynIRgxAQXCJuqBcFFVRc3xHSVT2ZRORyuUaMJDMT1wZZpmfAIChXI4ahu7on2LiiIgreKHpdI24kLAGVRTEsAhKSWbrO+5Ti+6ICmaWXWr79PHkQqP85v/P5t2Ey8+8qvs/bRHdaJUJg0syuNbN1ExMTX6pWqw8mYiqGQACBUECz2exRjuOcKiJvFZE2WBBAAAEEnlDgY77vfwSfeApwACsi+8ajByOyEcRAAIEoCjygqvmxsbFPVqvVWhQDkgmBJAr09/dfISLvSOJszIRA0gWCIDh+eHj4a0mfk/kQQAABBBBAAIGoCnied5qIXBDVfORCIEICgYj8UESqbW1tl4+MjNwdoWxEQQCBBgiEN6RwHOc/giAI7xa5ewNaUBIBBBCIu8Ck4zivKhaL4ddIvGImwAGsCGxYNpvNqWoxAlGIgAACCERKQFWrc+bMWXbJJZf8KVLBCINAwgVWrFhxTCaT+XbCx2Q8BBIpoKpfHRwcfEsih2MoBBBAAAEEEEAgJgILFy5sX7BgQfi0g+fEJDIxEWi2wEYzK3V0dJQvvfTSO5rdnH4IINB6gfDxhGb2LlV9r6ru3/pEJEAAAQQiJbBZVZ9fKpW2RioVYXYowAGsHRI19gIePdhY32ZUt/Deqc1oRI9oCvAGaNS+3Kaqp/i+zwGQRglTF4EnEMjn8x1bt279peM4B4OEAAKxE9imqs8dHBy8LXbJCYwAAggggAACCCRMwPO8N4vIVxI2FuMgMGMBVb3fzK5wHKdULBa/P+NCLEQAgUQJ5PN559Zbb32jmfWLyJGJGo5hEEAAgdkJfMb3/VNmV4LVzRbg3Eizxf+pH48ebPEG0B4BBKImEJjZJRMTE6dXq9WHoxaOPAikQWBgYKDfzAbTMCszIpA0ATPLDw0NnZG0uZgHAQQQQAABBBCIq4DnedeIyNFxzU9uBOogsN3MvqKqpTvvvPPq9evXT9ahJiUQQCChAq7rHqmqHxCR47j3QUI3mbEQQGA6AuFtQI73ff/r01nEta0V4ABWC/1d1/VEpNTCCLRGAAEEIiOgqr9yHOfdxWLxJ5EJRRAEUiawcuXKvRzHuUlEdknZ6IyLQOwFzOy2uXPnHprP57fHfhgGQAABBBBAAAEEEiLged7zRGSDiGQSMhJjIDBVgf8VkUvHxsaq1Wr1waku4joEEEAgFDjxxBNf0NbWFh7EeruIOHVVCX8yHh5p4IUAAgjEQ+DuWq122Ojo6L3xiEtKDmC16D3Q29u718TExA0iskeLItAWAQQQiIrAdlUtjI2NnVOtVsejEoocCKRRoK+vb52qnpDG2ZkZgbgLBEFw/PDw8NfiPgf5EUAAAQQQQACBpAn09PR8NgiCk5I2F/Mg8DgCfxaRquM4nyoWi79CCAEEEJitQDabPSCTyZxmZv8hIp2zrcd6BBBAII4C4d1Ey+XyW+OYPY2ZOYDVol3PZrNfUlX+j9Iif9oigEBkBP4n/MNTpVK5JTKJCIJASgVWrlz5SsdxvsvtvVP6BmDsWAsEQXDl8PDwm2M9BOERQAABBBBAAIGECoQfxJ2cnLxZRJ6S0BEZK90CNRH5pqqu3bhx45UbNmyYSDcH0yOAQCMETjzxxP3b2tpWisi7OIjVCGFqIoBA1AWCIFhSqVRGop6TfCIcwGrBu8B13f8TfhKkBa1piQACCERF4AFVzc+fP/+ifD4fRCUUORBIq0A+n2/bvn37BjM7PK0GzI1AjAW2qepzBwcHb4vxDERHAAEEEEAAAQQSLZDL5VaZ2TmJHpLh0iZwq5ldmslkRorF4l1pG555EYiTQJKeuNfT07NfEAQfFJElItIep30gKwIIIDBLgYeCIDi8Uqn8fpZ1WN5gAQ5gNRj4n8v39vbuNjExsVFEntHk1rRDAAEEIiEQBMGXOjs7Tx0ZGbk7EoEIgQAC0t/f/34ROR8KBBCIn4CZ5YeGhs6IX3ISI4AAAggggAAC6RHo7e2dMzExsUlV90/P1EyaQIHw7lZfMbNPl8vl74iIJXBGRkIAgRgIhI8mdBznIyLiikhbDCITEQEEEJi1gJldUy6XX8fXYLOmbGgBDmA1lPdfi2ez2c+o6slNbks7BBBAIAoCf1bVAd/310QhDBkQQOBvAh/4wAeeXqvVbhKRXTFBAIF4CZjZbXPnzj00n89vj1dy0iKAAAIIIIAAAukT6OnpOSEIgnXpm5yJEyDwBxEptbe3f+rSSy+9IwHzMAICCCREIJfLPcvMBh59NGEmIWMxBgIIIPBkAv/Bz1mj/QbhAFYT98d13ZeKyA9ExGliW1ohgAACLRdQ1erY2Nh/VavVe1oehgAIIPAPAv39/SUR8WBBAIH4CQRBcPzw8PDX4pecxAgggAACCCCAQCoF1PO874vIy1M5PUPHTSAQkavCu12Nj49fVa1Wa3EbgLwIIJAegcWLFx86MTFxluM4b03P1EyKAAIpFXjIcZzDisXi7SmdP/JjcwCrSVvU3d3d0dHRcb2IHNKklrRBAAEEoiDwJxF5T7lcviIKYciAAAL/KLBy5cojHce5TkT4mpA3BwIxEwiC4Mrh4eE3xyw2cRFAAAEEEEAAgVQL9PT0vDgIgh/xZ7BUvw2iPnz4vbwRVf1MqVT6bdTDkg8BBBB4rEAul3uJmQ2LyCuRQQABBJIqoKrfKZVKx/AowmjuMD9sa9K+eJ6XN7OPNqkdbRBAAIGWC4R3varVaqeOjo7e2/IwBEAAgX8R6O7uzhxwwAE/E5Hnw4MAArETGAuC4LDh4eFbYpecwAgggAACCCCAQMoFPM/zRcRNOQPjR09gg4isaWtrK46MjPCI8+jtD4kQQGAaAj09PcfUarULVPXQaSzjUgQQQCA2Aqp6cqlU+mxsAqco6AwOYIVLLEVEsx/V87yDzOwXIjJn9tWogAACCERe4O5MJnNqsVj8UuSTEhCBFAusXLlymeM4F6aYgNERiK2AmeWHhobOiO0ABEcAAQQQQAABBFIs0NPTs3cQBDeJyE4pZmD0aAiMi8hXzOwT5XL5B9GIRAoEEECgPgILFy5sX7BgwRIRCb9/sld9qlIFAQQQiIwAjyKMzFb8Y5AZHMCK6CQRjZXP553Nmzd/18xeEdGIxEIAAQTqJhAEwWWdnZ3vGxkZeaBuRSmEAAJ1F1ixYsXTMplM+A3/3epenIIIINBQAVX9/Zw5cw7J5/OPNLQRxRFAAAEEEEAAAQQaJuB53pki8uGGNaAwAk8u8Ecz+3RXV9dnLrnkkvCRg7wQQACBxAosXbr0KePj4wMi8n5ulJHYbWYwBFIpYGZXl8vl47h7UrS2nwNYDd4P13VPEZH/bnAbyiOAAAKtFtgSBMF/jI6OfrnVQeiPAAI7Fujr61urquEnwHghgEDMBIIgOH54ePhrMYtNXAQQQAABBBBAAIHHCJx88slzt27deqOq7gsMAk0U4DGDTcSmFQIIREtgyZIl+05OTp5tZrloJSMNAgggMHMBVT2pVCp9buYVWFlvAQ5g1Vv0MfV6e3v3mpiY2CgiuzewDaURQACBlgqo6hW1Wu0/R0dH721pEJojgMCUBAYGBo4wsx+JiDOlBVyEAAKRETCzbw4NDYWfauKFAAIIIIAAAgggEHMBz/PCD8WsjfkYxI++wKSZfSGTyXy8WCz+JPpxSYgAAgg0VqCnp+eYWq12gaoe2thOVEcAAQSaIvCgmT23XC7f2ZRuNNmhAAewdkg08ws82w6ukwAAIABJREFUz/u8mXXPvAIrEUAAgUgL/NnMllUqlXKkUxIOAQT+n0D4aORt27b9UEReDAsCCMROYCwIgsOGh4dviV1yAiOAAAIIIIAAAgj8i0D457PNmzf/WEReBA8CDRD4i6peWqvVPl6pVH7fgPqURAABBGIrcNRRR7Xts88+S0XkbBF5amwHITgCCCDwN4GrfN9/AxjREOAAVoP2wfO815rZtxpUnrIIIIBAqwXC39/exYnqVm8D/RGYnsDAwMApZsajkafHxtUIREJAVc8YHBzMRyIMIRBAAAEEEEAAAQTqIpDL5f7dzNbXpRhFEPibwO1mdqGIfLZcLj8ECgIIIIDAEwssWrToqZlM5iwReTdPC+CdggACcRZwHOfEYrF4eZxnSEp2DmA1YCe7u7s7Ojo6fiUiBzWgPCURQACBVgo8oqof8H0//EaOtTIIvRFAYHoCy5cv36Ojo+MmPtU1PTeuRiAiArd3dXUtyOfzj0QkDzEQQAABBBBAAAEE6iTged4XReRtdSpHmZQKqOr1ZnbBpk2bRjds2DCRUgbGRgABBGYk4HneC83s06p6xIwKsAgBBBBovcCfgiBYUKlU/tz6KOlOwAGsBux/Npv9kKp+rAGlKYkAAgi0UuA6M+utVCq3tTIEvRFAYGYCfX19n1HVk2e2mlUIINBigTcXCoUrW5yB9ggggAACCCCAAAINEPA8b76I3CAiHQ0oT8lkC4QfjvxGEARDlUrle8kelekQQACBxgqEjyXce++936OqZ4rIUxrbjeoIIIBAQwQ+5/v+SQ2pTNEpC3AAa8pUU7uwp6dnv1qttlFEdpraCq5CAAEEIi8wqapnj42NfaxardYin5aACCDwLwIDAwMLzezHIpKBBwEEYidwdaFQODZ2qQmMAAIIIIAAAgggMGWBXC53npmdPuUFXJh2gUBVvyEiZ5RKpZ+lHYP5EUAAgXoKeJ73DFUtmFmunnWphQACCDRBwMzsteVy+dom9KLFEwhwAKvObw3P875qZsfXuSzlEEAAgVYJ3GhmXqVS2dCqAPRFAIHZCeTzeWfbtm0/EJGXzq4SqxFAoAUCY47jHH7uuefe3ILetEQAAQQQQAABBBBokoDruruoavg139Ob1JI28RQYU9XP12q1j1UqlVviOQKpEUAAgXgILFq06DVtbW0Xm9lB8UhMSgQQQOCvAre0tbUdPjIysh2P1ghwAKuO7p7nHWtmV9WxJKUQQACBVgqUHMf5z1KptLWVIeiNAAKzExgYGDjJzD47uyqsRgCBVgio6hmDg4P5VvSmJwIIIIAAAggggEBzBVzXPVVVP9XcrnSLicCfVfViEbmwVCptiUlmYiKAAAKxFzj55JPnPvzwwx9zHOc0niwQ++1kAARSIxA+1ahUKn0oNQNHbFAOYNVpQ5YvX961ZcuW34jIAXUqSRkEEECgJQKqeo+InOT7/ldbEoCmCCBQN4GBgYHdzewmEZlXt6IUQgCBZgnc3tXVtSCfzz/SrIb0QQABBBBAAAEEEGidwFFHHdW2zz77/FJEDmldCjpHTOAPIrK6o6PjM2vXrv1LxLIRBwEEEEiNQC6Xe0kQBJ9T1UNTMzSDIoBAnAUmzGxhuVz+dZyHiGt2DmDVaedc1z1LRD5Yp3KUQQABBFol8K3Ozs4la9euDb/BwwsBBGIusHLlyk86jvNfMR+D+AikVeDNhULhyrQOz9wIIIAAAggggEAaBVzXPVpVr0nj7Mz8DwK3i8jH582bt2b16tXbsEEAAQQQaL3AwoUL2xcsWPB+ETlTRDpan4gECCCAwBMLqOpPtm/f/vJqtVrDqbkCHMCqg3d3d/f8jo6O8AThnDqUowQCCCDQCoFtqrrK9/0LRcRaEYCeCCBQX4H+/v7DROTnItJW38pUQwCBJghcXSgUjm1CH1oggAACCCCAAAIIREzA87yrRISvBSO2L02Kc6uqnrtx48bihg0bJprUkzYIIIAAAtMQ8DzveSLyORFZOI1lXIoAAgi0QmCZ7/ufbEXjNPfkAFYddt913W+IyHF1KEUJBBBAoBUCG0XkRG5F2Qp6eiLQMAHt7+9fLyKvalgHCiOAQKMExhzHOfzcc8+9uVENqIsAAggggAACCCAQXQHXdQ9R1fBRhAn6ME34Ywg+7/dE7zpVvbFWq53zhz/8YXT9+vWT0X13kgwBBBBAIBQIHxu89957r1DVvIh0ooIAAghEVODBtra2g0dGRu6OaL5ExuIA1iy3taen5221Wu2LsyzDcgQQQKAVAuF3vi5ub29fMTIysr0VAeiJAAKNEejr61usqiONqU5VBBBopICqnjE4OBh+A48XAggggAACCCCAQEoFPM/7lIicmtLx0zT2b0RkeGxsrMzjYdK07cyKAAJJEVi8ePGhtVqtKCIvTMpMzIEAAokT8H3fzyVuqggPxAGsWWxOd3d3R0dHR/iHpANnUYalCCCAQCsEHlTVk33f/3wrmtMTAQQaJ7Bs2bJdurq6blTVZzSuC5URQKBBArd3dXUtyOfzjzSoPmURQAABBBBAAAEEYiDQ3d09r7OzM7wj6m4xiEvEaQqo6vVmdqbv+1/h1mDTxONyBBBAIGIC4c+K58yZc4aZrRSRTMTiEQcBBBAIb8bxGt/3wyem8GqCAAewZoHsuu4qETlnFiVYigACCLRC4EeO42RLpdJvW9Gcnggg0FiB/v7+C0TktMZ2oToCCDRI4M2FQuHKBtWmLAIIIIAAAggggECMBDzPWxHeHSlGkYm6AwEzu8FxnDNKpdIVHLzi7YIAAggkS8B13Zeqang3LG7akaytZRoEkiCwcdOmTc/fsGHDRBKGifoMHMCa4Q6ddNJJT9+2bVv4KaRdZliCZQgggECzBWpmdt5NN930Yf4j22x6+iHQHIH+/v5DReR6EWlvTke6IIBAHQWuLhQKx9axHqUQQAABBBBAAAEEYiwQ3lGjs7OTpy/EeA8fE32TiAzyqMFkbCZTIIAAAk8ksHz58q5777130MyWiQg/g+etggACURLo832fD3c0YUf4zX+GyIsWLRpxHGfxDJezDAEEEGi2wJ1m5lYqle81uzH9EECgeQL9/f3fEZFXN68jnRBAoE4CY47jHH7uueeGH/DghQACCCCAAAIIIIDAXwVyudzbzewLcMRTQFVvCoLgzAMPPHBdPp8P4jkFqRFAAAEEpivged4bVXWtmT1tumu5HgEEEGiQwMPt7e2HXHrppXc0qD5lHxXgANYM3gonnHDCEW1tbT8SEWcGy1mCAAIINFVAVa90HGdJsVi8r6mNaYYAAk0V6O/vz4pIualNaYYAAnURUNUzBgcH83UpRhEEEEAAAQQQQACBRAl4nneNiBydqKESPoyZ/U5Vz73zzjvXrl+/fjLh4zIeAggggMDjCORyuaeZ2aUi8gaAEEAAgSgIqOoXSqXS/4lCliRn4ADW9HdXPc/7npm9YvpLWYEAAgg0VWBSVc+eP3/+mXzKrqnuNEOg6QJ9fX1PUdXwkQZ7N705DRFAYLYCt3d1dS3I5/OPzLYQ6xFAAAEEEEAAAQSSJ+B53gtF5Kd8GDgWe/t7MzvzrrvuKnLwKhb7RUgEEECgoQL5fN659dZbV5jZWSLS3tBmFEcAAQSmJnCc7/vfnNqlXDUTAQ5gTVMtm826qupPcxmXI4AAAs0WuFNETiyXyz9odmP6IYBA8wVWrlw57DjOiuZ3piMCCMxWwMzeMjQ09NXZ1mE9AggggAACCCCAQHIFXNe9VFV7kzth7Ce7V0TOa2tr+8TIyMj22E/DAAgggAACdRXI5XIvMrNREZlf18IUQwABBKYvsLmtre0wvmadPtxUV3AAa6pSIrJ8+fKuLVu23Cgi+01jGZcigAACTRVQ1WvnzJnjXnLJJX9qamOaIYBASwT6+voWqOov+RRVS/hpisBsBa4uFArHzrYI6xFAAAEEEEAAAQSSLbB06dJnjo+P3yQiOyd70thN92AQBOfttttuF1x88cUPxy49gRFAAAEEmibguu4ujuP8t5llm9aURggggMDjCARB8OFKpRLemY9XAwQ4gDUNVNd1zxCRj0xjCZcigAACzRSoqepZPHKwmeT0QqD1Av39/eHtYl/f+iQkQACBaQqMOY5z+LnnnnvzNNdxOQIIIIAAAggggEAKBTzP+7CInJnC0aM48jYzu2h8fLxQrVbvj2JAMiGAAAIIRFMgm832Oo7zSRHZKZoJSYUAAikQ2GpmB5fL5fBpSrzqLMABrCmCuq67j4iEnzKaO8UlXIYAAgg0U2BLJpNxi8XiNc1sSi8EEGitwMqVK7sdx/l8a1PQHQEEZiKgqmcMDg7mZ7KWNQgggAACCCCAAALpEwifznDPPfdsEpF/S9/0kZl4QkQu7ejoOGPt2rV/iEwqgiCAAAIIxEqgt7f34ImJiStU9dBYBScsAggkRkBVK6VSyU3MQBEahANYU9wMz/N8M+NNOEUvLkMAgaYKXOM4jlsqlbY0tSvNEECgpQL5fH7u9u3bN5oZ33xv6U7QHIEZCdze1dW1IJ/PPzKj1SxCAAEEEEAAAQQQSKWA53nh96f9VA7f2qEDVV03Pj7+kcsvv/zW1kahOwIIIIBAEgSWLl36lLGxsc+q6glJmIcZEEAgdgImIq/wff9/Y5c84oE5gDWFDcpms89X1Q0i4kzhci5BAAEEmiVgZjY0MTHxwWq1WmtWU/oggEA0BAYGBs4xs1XRSEMKBBCYjoCZvWVoaOir01nDtQgggAACCCCAAAIIiIh6nnediByJRtMErhWRPt/3f960jjRCAAEEEEiNgOd5J4vIRSLSkZqhGRQBBCIhoKrXP/vZz35RPp8PIhEoISE4gDWFjXRd99sicswULuUSBBBAoFkCf1HVJb7vf6FZDemDAALRERgYGJhvZr8Rkc7opCIJAghMUeDqQqFw7BSv5TIEEEAAAQQQQAABBP5BwHXdl6pq+El1vrff2PfGRlXNl0qlamPbUB0BBBBAIO0C2Wx2oeM44X9vnpV2C+ZHAIHmCpjZu8rl8trmdk12N/6QtoP99TzvjWb2tWS/DZgOAQRiJnCj4zhvL5VKm2KWm7gIIFAngb6+vq+r6hvqVI4yCCDQPIExx3EOP/fcc29uXks6IYAAAggggAACCCRNwHXddTyyqDG7amZ3iMiHDzzwwBJ3A2iMMVURQAABBP5VoKenZ88gCEoichw+CCCAQBMF7jazg8rl8kNN7JnoVhzAepLt7e7uznR0dPxCRJ6b6HcBwyGAQGwEzGxdJpM5qVQqbY1NaIIigEBdBfr6+t6qql+qa1GKIYBAUwTMLD80NHRGU5rRBAEEEEAAAQQQQCCxAkuWLNl3YmLiRhGZm9ghmz/Yw47jnL/nnnsWVq9eva357emIAAIIIIDAXx813Cci54iIgwcCCCDQDAEzGyqXy/3N6JWGHhzAepJd9jzvJDP7bBreCMyIAAKRF5hU1Q/5vl+IfFICIoBAwwSWL1/e1d7efoOqcjvqhilTGIGGCdza1dX13Hw+v71hHSiMAAIIIIAAAgggkBoB13XPUdVVqRm4cYNOiMilqvrhUqm0pXFtqIwAAggggMDUBHK53PFm5ovILlNbwVUIIIDArATGHcc5rFgs8tSGWTH+bTEHsJ4AMfwB55YtW24SkX3r4EwJBBBAYMYCqnpPrVY7cXR09DszLsJCBBBIhEB/f39455yPJGIYhkAgZQJBEBw/PDzMo81Ttu+MiwACCCCAAAIINEpg6dKlTxkfH79FRJ7eqB4pqHtFEAT9lUrlthTMyogIIIAAAjEScF33sEefgvDsGMUmKgIIxFfgSt/33xzf+NFJzgGsJ9gL13U/KCJnRWerSIIAAikV+FFnZ+c71q5d+4eUzs/YCCDwqMDAwMABZnaDiMwBBQEEYifw5UKh8LbYpSYwAggggAACCCCAQKQFcrncu81sTaRDRjPczxzHWV4sFr8fzXikQgABBBBAQKS7u3uPjo6OUVV9HR4IIIBAowXM7JhyuXxto/skvT4HsB5nh7u7u+d1dHRs5taOSX/7Mx8C0RZQ1fK8efPevXr16m3RTko6BBBohkBfX9+VqvqmZvSiBwII1FVgW3t7+6FnnXXWb+talWIIIIAAAggggAACqRfI5/PO5s2bfyoiL0w9xtQA7hKRM+fPn39JPp8PpraEqxBAAAEEEGidQHd3d6azs/NsEenjyVat2wc6I5ASgV/Onz//hXydPLvd5gDW4/i5rvspETl1drSsRgABBGYsMKmqH/J9vzDjCixEAIFECfT3979eRL6ZqKEYBoGUCJjZh4aGhsJvlPFCAAEEEEAAAQQQQKDuAq7rHq2q19S9cLIKbjWzoZ122um8NWvWPJKs0ZgGAQQQQCANAq7rZlX1czwdIQ27zYwItE4gCIKeSqVSal2C+HfmANY/7WFPT89zarXab0SkPf7bywQIIBA3ATO7LwiCE9atW8ctHuO2eeRFoEECy5Yt65w7d+6vROQ5DWpBWQQQaJzA5q6ursPy+fz2xrWgMgIIIIAAAggggEDaBTzP+6qIHJ92h8eZ30TkiiAIVlYqld/jgwACCCCAQJwFXNd9qap+WUSeHuc5yI4AApEWuGvu3LnP4UMLM98jDmD9k53neZ83s+6Zk7ISAQQQmLHALx3HeVupVOIRRTMmZOH0BMIvA8LvRfKKskBfX9+HVfXMKGckGwIIPL6A4zhvPPfcc7+BDwIIIIAAAggggAACjRQIP1QcBAEfKv5H5O8FQfD+SqWyoZH21EYAAQQQQKCZAtls9t8cx7lSRA5rZl96IYBAqgQGeErTzPebA1iPsVu0aNHhjuNcLyLOzElZiQACCExfQFWrqrqkVCptnf5qViCAQFIFPvjBD+47MTGxSVV3SuqMzIVAUgXM7IqhoSE+2JHUDWYuBBBAAAEEEEAgYgLZbPYCx3FOi1isVsS5S0Q+4Pt++OgUPnXWih2gJwIIIIBAQwVOPfXUnR966KEKd79sKDPFEUizwF9UdX6pVNqSZoSZzs4BrMfIua77NRF540wxWYcAAgjMQCAQkY+Uy+Vz+KbQDPRYgkDCBfr7+78oIm9L+JiMh0ASBR5R1UMHBwd/l8ThmAkBBBBAAAEEEEAgegLZbHZ3x3FuEZE9o5euKYnGVfXTT3nKUz548cUXP9yUjjRBAAEEEECgRQLd3d2Zzs7Os0Wkv0URaIvAFAV4EssUoSJ1mapeWCqV+HDHDHaFA1iPonme93Iz+8EMDFmCAAIIzFRgu6ou9X1/dKYFWIcAAskVWLFixTGZTObbyZ2QyRBIroCqDgwODhaSOyGTIYAAAggggAACCERRIJvNvtdxnE9EMVsjM6lq+MHq95ZKpd82sg+1EUAAAQQQiJpALpd7t5l9SkTao5aNPAggEGuBiSAIDq1UKuEHPHhNQ4ADWI9iua77HRF59TTsuBQBBBCYsYCZ/SGTybylVCr9bMZFWIgAAokVyOfzHVu3bv2l4zgHJ3ZIBkMguQI3P/LII4dfdNFFY8kdsZGT8am4RupSGwEEEEAAAQSSLbBw4cL2Qw455NdmdlCyJ/3bdGZ2QyaTeV+xWLwmDfMyIwIIIIAAAo8n4HnesSJSFZGdEUIAAQTqKFD1ff+ddayXilIcwBKRnp6eY2q1GneYSMVbniERiITALzOZzJuLxeLtkUhDCAQQiJxAf3//gIicG7lgBEIAgR0KqOrRg4OD4Yc7eCGAAAIIIIAAAggg0HQB13XfpKpXNr1xcxs+ICL5O++881Pr16+fbG5ruiGAAAIIIBA9Ac/zXigiXxeRvaKXjkQIIBBTATOzl5fL5R/FNH9LYnMAS0Rc1/2hiLy0JTtAUwQQSJvAF3faaafcmjVrHknb4MyLAAJTE+jr69tHVTfxiaWpeXEVAhETWFcoFBZFLBNxEEAAAQQQQAABBFIm4Lrut1X1mASOHajq57Zv3/7BarV6TwLnYyQEEEAAAQRmLJDL5Z4lIt8wM56qMGNFFiKAwD8JfNf3/aNQmbpA6g9geZ73ZjP7ytTJuBIBBBCYscCFBx544PJ8Ph/MuAILEUAg8QJ9fX2Xqyq3dU38TjNgAgX+Mj4+vmD16tV3JXA2RkIAAQQQQAABBBCIkYDruoeo6i9FpC1GsZ80qqper6r/VSwWww9T80IAAQQQQACBxxHIZrO7O44T/tz7lQAhgAAC9RDIZDKvv+yyy75Vj1ppqJH2A1jquu7PReT5adhsZkQAgZYJjIvIyeVy+bKWJaAxAgjEQqC/v/9VIrJeRNL+NVos9ouQCDxWQFVXDA4Ono8KAggggAACCCCAAAJREPA87zPh96OikGWWGf76uMGxsbFPVqvV2ixrsRwBBBBAAIHECxx33HGde+yxx2WqekLih2VABBBohsAG3/ePEBFrRrO490j1D/dyudyJQRCMxn0TyY8AApEWuF9V3+r7/nWRTkk4BBBouUA+n2/btm1beDD8sJaHIQACCExLwMxueOCBB16wZs2aiWkt5GIEEEAAAQQQQAABBBokkMvlnmZmN4vIrg1q0eiypqq+iKwolUpbGt2M+ggggAACCCRMQD3PK4jIyoTNxTgIINACAVV9R6lU+mILWseuZWoPYHV3d2c6Ojp+IyI8Bzd2b1sCIxAbgd+2t7e/YWRk5MbYJCYoAgi0TGBgYOB0MzuvZQFojAACMxYws9cMDQ39z4wLsBABBBBAAAEEEEAAgQYIuK47oKrnNqB0Q0uGjxsMguDUcrn8o4Y2ojgCCCCAAAIJF/A87wMicnbCx2Q8BBBovMDGsbGxw7kj7Y6hU3sAK5vN9qrqpTsm4goEEEBgRgI/dhznzXxCb0Z2LEIgdQIrV67cy3Gc8LBmXD+ZnLo9Y2AEHiPgFwqFHCIIIIAAAggggAACCERNoLu7u6Ozs3OjiDw7atmeIA+PG4zJRhETAQQQQCA+Arlc7hQz+5SIOPFJTVIEEIigwGLf94sRzBWpSKk8gBXe/aq9vX2jqj4nUrtBGAQQSISAmX155513dtesWfNIIgZiCAQQaLjAwMCAb2ZuwxvRAAEE6i3wkJktGBoa+kO9C1MPAQQQQAABBBBAAIF6CHie904RubwetRpYw8zsMsdx+vkwYwOVKY0AAgggkFqBXC53YvjfWhHpSC0CgyOAwGwFfjs2NnZwtVodn22hJK9P5QGsbDbbo6rhf2R4IYAAAvUWuHB8fPz93IKx3qzUQyC5Av39/a8Qke+JSCq/LkvuzjJZSgTeVygUPpGSWRkTAQQQQAABBBBAIKYCnueFf+Z8ZUTj3+I4zqnFYvGaiOYjFgIIIIAAAokQcF33aFX9sojsnIiBGAIBBJouYGb/VS6XL2564xg1TN0P+sK7X3V0dNwgIgfFaJ+IigAC0RcwVT3T9/189KOSEAEEoiIQfl1ywAEHbBCR50UlEzkQQGBqAmb2mwceeOCFa9asmZjaCq5CAAEEEEAAAQQQQKA1Ap7nvVBEfhqxRw9tdxyncM8995x71VVXjbVGhq4IIIAAAgikS6Cnp+fFQRB8Q0T2TNfkTIsAAnUS+OPcuXPn8xSoJ9ZM3QGsbDbrqqpfpzcYZRBAAIFQYJvjOF6pVPoiHAgggMB0BPr7+08TkQums4ZrEUAgEgIWBMGrh4eHvxuJNIRAAAEEEEAAAQQQQGAHAp7nlUTEiwjUt0XkVN/3N0ckDzEQQAABBBBIjUBPT8/hQRBcLSJ7pWZoBkUAgboJqGr42PChuhVMWKFUHcDK5/POLbfc8ksReW7C9pFxEECgdQIPqOqbfd+/rnUR6IwAAnEUWLFixdMymcxNIrJbHPOTGYGUC4wUCoUlKTdgfAQQQAABBBBAAIEYCbiuu4+qhn8GndvC2Heb2enlcrnSwgy0RgABBBBAIPUCnufNF5FrRWS/1GMAgAAC0xW4R1WfVSqVtk53YRquT9UBrFwud2IQBKNp2FhmRACBpgj8UVWP830/PNjJCwEEEJiWQH9//6Ui0jutRVyMAAJREHgok8kcfM455/wxCmHIgAACCCCAAAIIIIDAVAVyudwZZvaRqV5fx+ssfCqFqi4vFov31bEupRBAAAEEEEBghgI9PT37BUEQHsIKD2PxQgABBKYj0Of7/vB0FqTl2jQdwFLXdcNDEoelZXOZEwEEGipwYyaTeX2xWLy9oV0ojgACsRRYvnz5Hm1tbbur6u4i8te/quoeQRD8/e/nichiEUnT12Kx3EtCI/A4Au8pFAqfQgYBBBBAAAEEEEAAgbgJLF++vGvLli03qeq+Tcz+K8dxTikWiz9sYk9aIYAAAggggMAUBHp7e/eanJwMD2EdMoXLuQQBBBD4u8C9u+yyy7MuvvjihyH5R4HU/NAvl8t1B0Hwed4ACCCAQB0Efjo+Pv7GarV6Tx1qUQIBBCIo0N/fv6uI7Fqr1XZT1V0dxwkfE7irmf31r+EvVQ3/919/BUGwx6OHrP56wCqCIxEJAQTqI/Dz22677cXVarVWn3JUQQABBBBAAAEEEECguQKu6y5W1ZEmdN3uOE5h27Zt51Sr1fEm9KMFAggggAACCMxA4KSTTnr69u3bv81NTGaAxxIEUixgZivK5fL5KSZ43NHTcgArvPvV9SLyPN4ACCCAwGwEVPXajo6Ot61du/Yvs6nDWgQQaJ7AsmXLOnfaaad9a7Xa3qq6p+M4TzWzp4rIniIS3pVqz/Cfh7/Cv3/0nzvNS0gnBBCIiUBgZkcODQ39KCZ5iYkAAggggAACCCCAwL8I5PN555ZbbvmRqh7RQJ7r2traTh4ZGbmxgT0ojQACCCCAAAJ1Euju7t6js7PzahF5UZ1KUgYBBJIv8Ke5c+cesGbNmkeSP+rUJ0zFAaxcLvf2IAi+MHUWrkQAAQT+VUBVy5s2bVqyYcOGCXwQQCA6AqeffvpTVfXAtra2/URknyAI9lPV/cxLWsYCAAAgAElEQVRsH1XdR0T2ik5akiCAQFwFzOxzQ0NDJ8U1P7kRQAABBBBAAAEEEPi7gOd5LxeR74tIvX8+8KCIfHT+/PkX5fP5AHEEEEDgnwXC33QMFgQQiKRAb2/vbpOTk98UkZdEMiChEEAgcgJBELy/UqmsjlywFgaq9x+wWjjKE7ZWz/M2mNkLohiOTAggEA8BVV3t+/7p/PkwHvtFyuQJ5PP5trGxsfkTExML2tranhMEwUEicrCqhn8N71rFCwEEEGikwP2Tk5MHnX/++fc2sgm1EUAAAQQQQAABBBBolkAul7vCzN5Rx35XtLW1LRsZGbm7jjUphQACCCCAAAJNFOju7t61q6vrm0EQvLSJbWmFAALxFbh73rx5B6xevXpbfEeob/LEH8DKZrNvUNWv15eNagggkCYBMytUKpWBNM3MrAi0UmBgYGB3MztURBaa2SEicqiqhgep57YyF70RQCDVAqcUCoXPpFqA4RFAAAEEEEAAAQQSJZDL5Z5lZptEpHOWg/3RcZz3FovFK2ZZh+UIIIAAAgggEAEB13V3UdVvcSesCGwGERCIh8D7fN//RDyiNj5l4g9gua77XRF5VeMp6YAAAgkUCO+GvLJcLp+fwNkYCYFICLzvfe/brbOz87mPHrZaKCJHquoBkQhHCAQQQEBEgiDY8Lvf/e4l1Wq1BggCCCCAAAIIIIAAAkkS8DxvWERWzHAmU1V/+/bt76tWq/fPsAbLEEAAAQQQQCCCAuGdsObMmfMtM3txBOMRCQEEoiXAXbAesx+JPoDV09Pz4lqt9uNovf9IgwACMRGoqeopvu9fEpO8xEQg8gLLli3rnDt3bnjI6uVm9jJVfZGI7Bf54AREAIE0CwRm9pKhoaGfpRmB2RFAAAEEEEAAAQSSKRD+cLWzs/MWEZk3nQlV9SZVPalYLH5/Ouu4FgEEEEAAAQTiI5DNZnd3HOfb4Yen45OapAgg0AoBM3tvuVy+qBW9o9Yz0Qewstnsl1T1rVFDJw8CCEReYEJVPd/3Px/5pAREIMICp59++lMzmczLVfVIMwvvbBX+QW1OhCMTDQEEEPgHATP79NDQ0H/CggACCCCAAAIIIIBAUgU8zwu/3r14ivOFH1j8lIh8oFQqbZ3iGi5DAAEEEEAAgZgK9Pb27jY5ORkewgo/TM0LAQQQeFwBM7tjfHx8frVaHU87UWIPYHmed5CZbRQRJ+2bzPwIIDB1AVUdq9VqJ46Ojn556qu4EgEEQoF8Pr/zww8//FLHcY4xs2Mcx3kB/x3mvYEAAjEWuG9ycvLg888//94Yz0B0BBBAAAEEEEAAAQSeVKC7uzvT2dl5vYgc9mQXmtkNmUxmabFY/AmkCCCAAAIIIJAegUcPYV3DnbDSs+dMisAMBRb7vl+c4drELEvsAaxsNrtWVZckZqcYBAEEmiGwNZPJvLVYLIZfSPJCAIEdCOTz+Tnbtm37dzN7raq+WkSez4Er3jYIIJAUATM7aWho6HNJmYc5EEAAAQQQQAABBBB4IgHXdY9W1Sf6ftikiJx/3333ffSqq64aQxEBBBBAAAEE0iewaNGi8GkX39nRge30yTAxAgg8RmDT/Pnzn5vP54M0qyTyAFZPT8/etVrtNhHpSPPmMjsCCExL4IFMJvN6PsU3LTMuTqHAwMDAASLy1ztcicixIvKUFDIwMgIIJFwgCIKf7rTTTi9N+x8WE77NjIcAAggggAACCCDwGAHP874hIsf9E8ovJicnl65bty68QxYvBBBAAAEEEEixQC6Xe5qIfNfMDk4xA6MjgMCTCARB8NZKpfKVNCMl8gBWNps9X1Xfn+aNZXYEEJiWAIevpsXFxWkSyOfzHdu3bz9KRN5iZm8Qkf3TND+zIoBAKgVqqnrE4OAgP2RK5fYzNAIIIIDAtAXC7y7atFexAAEEIibQ29t78OTk5K9EpF1EJkTk42NjYx+pVqvjEYtKHAQQQAABBBBokUB4E5QgCK4TkWe1KAJtEUAgwgKq+pNSqfSSCEdseLTEHcDKZrO7q+rvuSNHw987NEAgEQJmdl8QBK/lk3yJ2E6GqJPAwMDA7rVa7RhVPV5V3ywiu9apNGUQQACByAuY2SeHhoaWRT4oARFAAAEEEEAAAQQQqLNALpf7pJm9YnJycgnfK6szLuUQmIHAUUcd1XbAAQc8bevWrXs7jrNX+EtV9zCznVV1J1Xd2cx2C/9eRHZ69Nfu4V/Df//oP59O54dEZKuIPCwi4f/++99vNbMHM5nMX4IgCP/9VlW9X0S2OI5zt4jcdcMNN2zZsGFDeHiTFwIIJFzghBNOeHZ7e/v3ROSZCR+V8RBAYAYCqnpUqVT67gyWJmJJ4g5gua77QRE5KxG7wxAIINBQAVW9JzxkMjo6Gn66jxcCqRZYsWLF09ra2t5eq9W6Hcd5lYi0pRqE4RFAIK0CfxobGzv4ggsueCCtAMyNAAIIIIAAAgggkF6BU089deeNGzduX79+/WR6FZgcgeYI5HK5nSYnJ58tIv+WyWTCQwzPCIJgb1UND1ntbWZ7icjTRcRpTqJZdwnvh/mn8Jeq3hUEwZ8cx7nTzP5kZndmMpnwn91cLpfDQ128EEAg5gKLFy8+tFarrReRp8Z8FOIjgED9Bb7p+/4/P9q8/l0iWjFRB7CWL1/etWXLlt+JSPgMWl4IIIDAkwn8KQiCo0dHR2+ACYG0CqxatWrPycnJN6pqt6q+/tHHDKSVg7kRQAABCYJg8fDwcBEKBBBAAAEEEEAAAQQQQAABBGYrEN7Bav/9958/OTl5qJkdLCLzVXW+mc0XkfCAVRpf4SGtm1T1FjO7OZPJ3DIxMXHzAw88sPmqq64aSyMIMyMQVwHP854nIv8jIuGd93ghgAACjxVY6Pv+z9NIkqgDWK7rniIi/53GjWRmBBCYlsAfHcc5ulQqbZrWKi5GIAEC/f39uwZB8A4RcR3H+XcRySRgLEZAAAEE6iHw/UKhEN4BMPzULi8EEEAAAQQQQAABBBBAAAEEpiywdOnSZ46Pj7/AzJ4vIoep6oJHD111TLlIui+sicjtInJLeEBLRH6tqhvGxsZ+U61Wx9NNw/QIRFegp6fnZUEQfEtEwkeh8kIAAQT+LrDO9/1FaeRI0gEsdV13o4iEnyLghQACCDyRwF2qerTv++Ef4lryCn/j5Se7LaFPbdN8Pt+xbdu215tZt4i8XVV3Si0GgyOAAAKPLxB+o3dhoVD4JUAIIIAAAggggAACCCCAAAIIPJlAeNhqcnLyJbVa7QgRecGjv8LHBfKqv0B4+OrXjuP8PAiCn09OTm7o6ur69cjIyPb6t6IiAgjMRGDx4sWvq9VqXxWRzpmsZw0CCCRSoDYxMXHQ5Zdffmsip3uSoRJzACubzb5BVb+etg1kXgQQmJbAHzOZzFHFYvHmaa3iYgRiKtDX1/dSVe0VkfDg1R4xHYPYCCCAQDMELigUCsub0YgeCCCAAAIIIIAAAggggAACERb4p0/Pho8R3HfffRea2UuDIAi/1/ZyEdkvwhOkIdqEiGw0s5+Hd8lyHOdnd9xxx4b169dPpmF4ZkQgigLZbPYtjuN8gSduRHF3yIRAawRU9cJSqXRaa7q3rmtiDmC5rvttETmmdZR0RgCBKAuo6j21Wu3Vo6OjN0Q5J9mSJdCKu50NDAyEz1vvNrP/FJHwlue8EEAAAQSeXOBPInJQoVB4ECgEEEAAAQQQQAABBBBAAIF0C4QHrp75zGc+z3GcY8zsFSLyShHZNd0qsZj+ERG53sy+39bWds0999xz3VVXXTUWi+SERCAhArlc7hQz+++EjMMYCCAwe4GtY2Nj+1Wr1ftnXyo+FRJxACuXyz03CIJfiUgi5onP24ekCMRG4F7HcV5dKpV+E5vEBEVgGgL5fN4JHzEoIu8SkeNFpGMay7kUAQQQSLWAmXlDQ0PlVCMwPAIIIIAAAggggAACCCCQYoFFixYd6jjOsSLyOhEJD13NTTFHUkZ/RFV/GATBdx3HWX/ffff9hANZSdla5oiyQC6XO8PMPhLljGRDAIGmCvT5vj/c1I4tbpaIA0ue511iZuEPnXkhgAAC/yxwv5kdXalUfgENAkkTeN/73rdbZ2fnYjM7TVWflbT5mAcBBBBotICZXTc0NPTvImKN7kV9BBBAAAEEEEAAAQQQQACBaAh0d3fvOmfOnNeZ2evDXyKyTzSSkaKBAtuDIPhRJpMJD2RdfcABB/w4n88HDexHaQRSK5DL5S40s2WpBWBwBBB4rMBdmzZtetaGDRvCxwen4hX7A1jd3d3zOjo6bheROanYMYZEAIHpCDw4OTn52ssvv/yn01nEtQhEXWBgYGBhEAQnq2pORLqinpd8CCCAQEQFJmu12sLzzjsvvJMuLwQQQAABBBBAAAEEEEAAgQQL9PT07BcEwbFmFt49PrzTFXeQT/B+72g0M7vPcZzvBEHwtYmJia9Uq9UHd7SGf48AAlMTCJ/YsXnz5stF5P9MbQVXIYBAkgUcxzmxWCyGvyek4hX7A1iu64a3MTwjFbvFkAggMB2BhxzHeV2pVPrxdBZxLQJRFVi2bFnnnDlzXMdx3isiz4tqTnIhgAACcREIguC84eHhlXHJS04EEEAAAQQQQAABBBBAAIHpCYSPFsxkMt1m9hYRef70VnN1igTGzey7IvK18FelUrktRbMzKgINEeju7u7o7OwM/z/12oY0oCgCCMRJ4Ge+7x8Rp8CzyRrrA1jHHXdc5x577PE7EdlrNgisRQCBZAmo6sNmdmy5XP5BsiZjmjQKrFq1ap6ZLX30lr17p9GAmRFAAIEGCNz9yCOPHHTRRRc91IDalEQAAQQQQAABBBBAAAEEEGiRgOd5BwVB8E5VPUFEDm1RDNrGW2CjmV1pZl+bnJz8YbVarcV7HNIj0BqB8HGvnZ2d4eFGPlDemi2gKwJREjjS9/3/jVKgRmWJ9QEs13UXi8hIo3CoiwAC8RNQ1THHcd5ULBaviV96EiPw/wVWrVp1SK1WW66qHo/Z5Z2BAAII1FdAVU8cHBxMzW2P66tHNQQQQAABBBBAAAEEEEAgWgJLly595vj4uGtmLj/oj9beJCDNFlX9vIiM+r7/QxGxBMzECAg0TcDzvGeIyI9EZL+mNaURAghEUeAK3/e7oxis3pnifgDrem4bW++3BPUQiLVAzXGcRaVSqRrrKQifaoGBgYGFZtb/6PPRY/3f6VRvJMMjgECUBa4tFArHRDkg2RBAAAEEEEAAAQQQQAABBJ5coLe3d06tVjs+CIIeETlWRNowQ6DBAneIyJfMrFipVDY0uBflEUiMwOLFiw+t1WrfF5HdEjMUgyCAwHQFakEQPCcNj/mN7Q92s9nsq1X1O9PdWa5HAIHECoSfPFlSLpcvS+yEDJZogf7+/leEB69U9U2JHpThEEAAgdYKjJvZ84eGhja1NgbdEUAAAQQQQAABBBBAAAEEZiJwwgknHJHJZE5W1XeKyC4zqcEaBOog8Ovwrli1Wm103bp1v6tDPUogkGgBz/OOEpGrRaQj0YMyHAIIPJnAat/33590otgewHJd9wsi8vakbxDzIYDA1ATM7LRKpXLh1K7mKgSiIdDd3Z3Zf//935nJZAbM7PBopCIFAgggkFyBIAgGh4eHVyV3QiZDAAEEEEAAAQQQQAABBJIn4LpueNAqq6onm9kLkjchE8VYIPxg+A/NbDSTyXy+VCptifEsREegoQKu6y5V1c81tAnFEUAgygJ/GRsb27darT4Y5ZCzzRbLA1iu6+4jIr/llrKz3X7WI5AMATPLVyqVM5IxDVOkQSCfzztbt259h4ic6TjOwWmYmRkRQACBVguY2R1z5849JJ/PP9zqLPRHAAEEEEAAAQQQQAABBBDYscCiRYsOb2tre4+ZLTKznXe8gisQaKnAhKp+ZXJy8tPr1q0Ln+ATHs7ihQACjxHI5XJnmdkHQUEAgXQKmNnycrl8QZKnj+UBLM/zzjSzDyd5Y5gNAQSmJqCqn/R9f9nUruYqBForwMGr1vrTHQEE0i1gZu8YGhr6YroVmB4BBBBAAAEEEEAAAQQQiLZA+P2z22677TW1Wu00EXmjiMTy51jRViZdowVUdbOIXDI2Nra2Wq3e0+h+1EcgRgKay+UuM7NcjDITFQEE6iewef78+Qfl8/mgfiWjVSl2X7guXLiw/eCDD/69iDwjWpSkQQCBFgiMlMvlpXySpAXytJyWQPiNo23btr0zCIKPcseradFxMQIIIFAvgasLhcKx9SpGHQQQQAABBBBAAAEEEEAAgfoKdHd379rZ2fluM/svEdm/vtWphkBrBFR1TESuEJHP+L5/XWtS0BWBaAkcd9xxnXvuuee1InJktJKRBgEEmiGQyWRef9lll32rGb1a0SN2B7Bc1z1BRNa1AoueCCAQHQFV/cadd975lvXr109GJxVJEPhXgRUrVhyTyWQKIvJCfBBAAAEEWiIwbmaHDw0N3dSS7jRFAAEEEEAAAQQQQAABBBB4QoFcLvc0MzvVzN4rIrtDhUCCBW5S1Usdx7mkWCzel+A5GQ2BHQosWrToqZlM5scicsAOL+YCBBBIlICZfaVcLr81UUM9ZpjYHcBatGjR/ziOc1RSN4S5EEBgSgI/cRznNaVSaeuUruYiBFogsHLlyiMdxzlHRF7Vgva0RAABBBB4VEBVzx4cHPwQIAgggAACCCCAAAIIIIAAAtERyGazB2YymZVm1mNmndFJRhIEGi7wiOM44Y0mVpdKpd80vBsNEIiogOu6h6jqD0Vkl4hGJBYCCDRGoDY5OTl/3bp1v2tM+dZWjdUBrPA3YhEJvxiJVe7WbjHdEUiWgJndPDEx8Qqem56sfU3SNKtWrTqkVqsVVPVNSZqLWRBAAIGYCtze1dW1IJ/PPxLT/MRGAAEEEEAAAQQQQAABBBIlsGjRokMdx/mwiHSLiJOo4RgGgekJmIh8IwiC4dHR0e9ObylXI5AMAc/zwrvgfIH/HiRjP5kCgakKmNm55XL5A1O9Pk7Xxeogk+d5F5nZe+IETFYEEKifgKreEwTBkZVK5Zb6VaUSAvURWLVq1Z61Wu0jqnqqiLTVpypVEEAAAQRmI2Bm3UNDQ1fMpgZrEUAAAQQQQAABBBBAAAEEZi/w6AfsB0QkKyKZ2VekAgLJEVDV64MguGBiYqJcrVZryZmMSRDYsYDneeEhjLN3fCVXIIBAggTubWtr23dkZGR7gmb66yixOYDV3d29c0dHx50ismvSNoF5EEBgSgJ/qdVq/75u3brrp3Q1FyHQJIF8Pt+xbdu2/xSRM/hvVJPQaYMAAghMTeDaQqFwzNQu5SoEEEAAAQQQQAABBBBAAIFGCORyuQWPfmjxndzhpBHC1EyYwC2qel5bW1sxiT+UTtheMU79BNTzvJKIuPUrSSUEEIi6gJnlyuWyH/Wc080XmwNYruueIiL/Pd0BuR4BBBIhMOE4zvGlUunqREzDEIkRWLlyZbfjOEMisn9ihmIQBBBAIBkCE2b2vKGhoU3JGIcpEEAAAQQQQAABBBBAAIF4CfT09Ow9OTkZ3i1+KXeLj9fekbb1AuHTQETk4rGxsQur1er9rU9EAgQaK9Db2ztnYmLie6p6RGM7UR0BBKIiYGY/LJfLL49KnnrliNMBrF+IyPPqNTh1EEAgNgIWnoCtVCrl2CQmaOIFBgYG5gdBcJGqHpv4YRkQAQQQiKFAEATnDQ8Pr4xhdCIjgAACCCCAAAIIIIAAArEW6O3t3W18fHxAVd8rIl2xHobwCLRYQFUfDoJgTSaTKZRKpS0tjkN7BBoqsGTJkn0nJyd/ZmZPa2gjiiOAQGQEgiB4UaVS2RCZQHUIEosDWK7rHiki36/DvJRAAIH4CXy0XC6fGb/YJE6iwPLly7s6Ozv7zWxARDqTOCMzIYAAAgkQ+JOIHFQoFB5MwCyMgAACCCCAAAIIIIAAAgjEQqC7u7ujo6NjmYh8QET2iEVoQiIQE4HwIJaIXBh+4KxSqfw5JrGJicC0BcIzAar6PyLSPu3FLEAAgTgKfM73/ZPiGPyJMsfiANaiRYtGHMdZnCR4ZkEAgSkJXF4ulxeJiE3pai5CoIEC/f39x4d/yOVxgw1EpjQCCCBQH4FcoVBI3LPj60NDFQQQQAABBBBAAAEEEECg/gI9PT3H1Gq1T4jIIfWvTkUEEHiMwF/M7GJVPadcLj+EDAJJFHBd93RVPS+JszETAgj8i8C2sbGxfZL0uN3IH8ByXXcXEfmDiOzEGxIBBNIjoKrfv++++4656qqrxtIzNZNGUaCvr28fETlHVXNRzEcmBBBAAIF/EPhxoVB4GYe3eVcggAACCCCAAAIIIIAAAo0X8DzvIBH5uJm9ofHd6IAAAo8RuDc8oDJv3rwLV69evQ0ZBJIm4LruOlU9IWlzMQ8CCPyrQBAE769UKquTYhP5A1ie5/2HmX06KeDMgQACUxK4JZPJvKxYLN43pau5CIEGCJx88sntu++++6kicpaI7NyAFpREAAEEEKi/wCsLhQKPLq+/KxURQAABBBBAAAEEEEAAgf8n0Nvbu9vk5OTHzOwUEWmDBgEEWiZwh4h87MYbbxzZsGHDRMtS0BiBOgssX76869577/2Bmb2gzqUphwACERNQ1RtLpVJ4F9VEPBEr8gewstnsT1X1RRF7HxAHAQQaJ3D/o4evbm5cCyoj8OQCAwMDR5nZp7htOu8UBBBAIFYC1UKh8M5YJSYsAggggAACCCCAAAIIIBAzgUWLFh3vOM7FIhLeNZ4XAghEQ+D34WMJx8bGPletVmvRiEQKBGYn4HnefBH5qYjsNrtKrEYAgRgIHOn7/v/GIOcOI0b6AJbnec8zs1/scAouQACBpAiMB0HwutHR0e8mZSDmiJfA8uXL9+js7LzQzNx4JSctAgggkHqBsSAIDh0eHr419RIAIIBA6gTCb+wk4iOCqds5BkYAAQQQQCBeAj09Pc8JguBiMzs6XslJi0CqBH6hqu/1ff+6VE3NsIkVcF33Tar6VRGJ9JmGxG4AgyHQJAFVXVsqld7VpHYNbRPp36xc171QRJY1VIDiCCAQJYHecrl8WZQCkSU9Av39/ceJyGdFZO/0TM2kCCCAQDIEgiA4b3h4eGUypmEKBBBAAAEEEEAAAQQQQCA6At3d3R2dnZ0fEJEBM+uMTjKSIIDAEwiYmV0eBEHfunXrwkcU8kIg1gK5XG61mb0v1kMQHgEEdiSw1cyeWS6XH9rRhVH/95E9gNXb2ztnYmLiLhHZI+qI5EMAgboIDJfL5b66VKIIAtMQ6O/v39XMhlT15Gks41IEEEAAgegI/Hl8fHz+6tWr749OJJIggAACCCCAAAIIIIAAAvEXyGazz3ccZ62ZvSD+0zABAqkTeERVh+fNm1dYvXr1ttRNz8CJEVi4cGH7ggUL1ovIyxMzFIMggMDjCfyH7/tr4k4T2QNYrutmRaQcd2DyI4DAlAS+NT4+/gaeTT4lKy6qo8DAwMDrgiC4RFX3rWNZSiGAAAIINFEgCIL3Dg8PX9TElrRCAAEEEEAAAQQQQAABBBItEH5Afnx8PK+qK0Qkk+hhGQ6B5AvcaWYfrFQqxeSPyoRJFViyZMm+ExMT14vInkmdkbkQSLuAqv6kVCq9JO4OkT2Alc1mr1XV18QdmPwIILBDgZva29tfOjIy8sAOr+QCBOok0NfX9xRVPV9ETuLZ4XVCpQwCCCDQGoHNf/7znw9Zs2bNRGva0xUBBBBAAAEEEEAAAQQQSJbAokWLXqGqn1PV5yRrMqZBIN0CZvadTCZzWqlU+k26JZg+rgKe571RRK7kZzpx3UFyI7BjgSAIXlCpVH6x4yuje0UkD2DlcrlnBUGwWUSc6NKRDAEE6iAQPsf1ZeVyeWMdalECgSkJ9Pf3v0JELhWR+VNawEUIIIAAAlEWcAuFQiXKAcmGAAIIIIAAAggggAACCMRB4KijjmrbZ599PmRmH+KuV3HYMTIiMCOBIHz60Pj4+OnVavWeGVVgEQItFPA8b1hEwrsz8kIAgQQKqOqFpVLptDiPFskDWJ7nnW1mH4gzLNkRQGCHAjUROb5cLl+1wyu5AIE6CCxfvryrvb39o6q6kgO+dQClBAIIINBiATP7zdy5c5+Xz+fDbx7yQgABBBBAAAEEEEAAAQQQmKGA67qHqKpvZi+YYQmWIYBAvATuFZHl5XLZj1ds0qZdYOHChe0HH3zwd1X1ZWm3YH4EkiigqvdnMpm9R0ZGtsd1vsgdwOru7s50dHT8XkT2jisquRFAYMcC4SEY3/fP2/GVXIHA7AX6+vpepKqj3PVq9pZUQAABBCIk8NZCofCVCOUhCgIIIIAAAggggAACCCAQNwF1Xfc9IlIQka64hScvAgjMTkBVvzE5OXnKunXr7phdJVYj0DyB8ElaZhY+omyX5nWlEwIINEvAzNxyuRzbp15E7gCW67qvE5Grm7WB9EEAgZYI+OVyOdeSzjRNncDAwMDJZnahiHSmbngGRgABBBIqYGY/GxoaerGIWEJHZCwEEEAAAQQQQAABBBBAoKEC3d3d8zo6Oi4TkeMa2ojiCCAQdYGHzGygUql8mu+zRH2ryPd3Ac/z3ikilyOCAALJE1DV75RKpaPjOlkUD2CVRMSLKyi5EUDgyQVU9Vdz58592Zo1ax5Jn1X4Wy4/J27Wvvf39+8qIp8Vke5m9aQPAggggEBzBGq12mvPO++8a5rTjS4IIIAAAggggAACCCCAQLIEstnsq1Q1vLMATyJJ1tYyDQKzEfhBe3v7SSMjIzfOpghrEWiWgOd5nCloFjZ9EGiugE1MTBx4+eWX39rctvXpFqkDWLlcbiczu9vMdq7PeFRBAIGICTwwOTn5orj+hhkxS+I8icDAwMARQRCsU9UDgEIAAQQQSJaAmV03NDT0qmRNxTQIIIAAAggggAACCKMWT9MAACAASURBVCCAQFME1PO895rZsIi0N6Vj6puEH8iN1I/iUr8jjQNIxF5vV9XCpk2bzt6wYcNE46yojMDsBU499dSdH3rooZ+LyIGzr0YFBBCIkoDjOGcUi8V8lDJNNUukvurLZrM5VS1ONTzXIYBArAQsCIK3jI6OXhmr1ISNm4D29/efLiLn8E2kuG0deRFAAIGpCQRB8Irh4eEfTO1qrkIAAQQQQAABBBBAAAEEEAgFent79xofHy+r6msQQQABBJ5MwMx+ZmbvGh0d/RVSCERZoLe394jJycnw+4QcKo7yRpENgWkKmNnvyuVyeJON2D1aKmoHsL6lqq+dpj+XI4BAPATOLpfLH4pHVFLGUeD0009/aiaTGVHVN8YxP5kRQAABBKYkcG2hUDhmSldyEQIIIIAAAggggAACCCCAwF8Fenp6Xlar1ao8cpA3BAIIPJ7AE9y7a0JVB8fGxs6qVqvjyCEQVQHXdT+iqmdENR+5EEBgxgKv8n3/uhmvbtHCyBzAWrp06TPHxsZuF5FMiyxoiwACDRJQ1WvHxsZeX61Waw1qQdmUC6xateol4SMHRWT/lFMwPgIIIJBoATM7Zmho6NpED8lwCCCAAAIIIIAAAggggEAdBTzPO9nMLhKRjjqWpRQCCKRH4DdBELjcDSs9Gx63SfP5vLN58+b1IvLKuGUnb8wFwpM2sbs/U3zMVfWzpVLp5Pgk/lvSyBzA8jxvpZkNxQ2QvAggsEOBO8bHxxdWq9V7dnglFyAwfYHwkYOrRCT8dEPb9JezAgEEEEAgLgJBEPx0eHj4xXHJS04EEEAAAQQQQAABBBBAoJUCxx13XOfuu+/+SVU9qZU5kt37Ce4blOyhmS6dAttVNT9//vzhfD4fpJOAqaMskM1mD3Ac55cisnOUc5INAQSmJfDgvHnznrF69ept01rV4oujdADrl2Z2eIs9aI8AAvUVGM9kMq8sFos/qW9ZqiEgsmLFip0ymcxlIvIOPBBAAAEEki9gZu8YGhr6YvInZUIEEEAAAQQQQAABBBBAYHYCjz5x5MsicsTsKrEaAQQQ+P8CZna14zhLfN//Iy4IRE3A87z3iEh4x0deCCCQHIETfN//fJzGicQBLM/znmdmv4gTHFkRQGBKAsvL5fIFU7qSixCYhkBfX98+ZvZlx3EWTmMZlyKAAAIIxFfgpq6urkP4lGV8N5DkCCCAAAIIIIAAAggg0BwBz/NeaGZfFZG9m9ORLgggkDKBe4MgWDo6OnplyuZm3OgLqOd53xCRY6MflYQIIDAVAVX9WqlUOn4q10blmkgcwMrlcucFQXB6VFDIgQACdRH4erlcDn9D5Om3deFsfpGoPrp45cqVRzqO8wUReXrzVeiIAAIIINAKgSAIlgwPD4+0ojc9EUAAAQQQQAABBBBAAIG4CORyubcHQVAUkZ3ikpmcCCAQS4Hw5z4X3X///X1XXXXVWCwnIHQiBXp6evYOguDXIrJ7IgdkKATSJzDZ1ta278jIyN1xGb3lB7Dy+bxzyy233M6nMeLyliEnAlMSuDOTyTy/WCzeN6WruQiBKQoMDAycZGafEpGOKS7hMgQQQACB+Avc2dXV9ex8Pj8e/1GYAAEEEEAAAQQQQAABBBBojIDneaeZ2cdFxGlMB6oigAAC/yhgZj+fmJg4oVr9v+zdCZwcdZn/8edXnZkQAkgSQcAoAobDBZGNKCIIKB6RwwNHMl3VwxAxnkFHMtMTvAZdzXQPGAWPNWIM01U1wREv5HDxCCq6HvH6qwRFvBJRDrkkYY6u5/9qlmUxhHR1Tx91fPr14rUueX7P7/u8a0gm07+uGr8VGwSiImDb9jnGGD7IGZULQg4EZiigqrF64lbbD2A5jvNSVf2vGbqzHAEEoiMwLSIne553U3QikSTuAkNDQ7O2b99e+QHSirjPQn4EEEAAgdoEjDErh4eHL6ltFdUIIIAAAggggAACCCCAQDoEFi9e3HH44YevFZHedEzMlAggEDGB+0Vkued5V0YsF3FSLGDb9peNMa9KMQGjI5AkgZ+6rrs4LgO1/QBWNptdZ4w5Ny5g5EQAgaoCqzzPG65aRQECIQX6+vrmd3Z2Vv7ydmrIJZQhgAACCCRHYPvk5OTCNWvW/CM5IzEJAggggAACCCCAAAIIINAYgVwuN1dVP6+qr2xMR7oggAAC9Qmo6tqpqakV4+Pj3MG8PkJWNVCgt7d3v+np6d/wKMIGotIKgTYKqOqzPc+rPF408q+2HsB65JMZlec1zo+8FAERQCCMwLcnJydfOj4+Xg5TTA0C1QRWrVp16PT09Fcsyzq8Wi2/jgACCCCQPAFV/WyxWDwveZMxEQIIIIAAAggggAACCCAwM4Genp4F09PTVxtjXjCzTqxGAAEEGiawSVXP8n3/Tw3rSCME6hRwHKdyA5h1dS5nGQIIREhAVYue5+UjFOkJo7T1AJbjOKep6tfiAEVGBBCoKvA3y7KOLpVKd1StpACBEAKrVq16ZRAEYyKyV4hyShBAAAEEEigQBMHikZGRnyZwNEZCAAEEEEAAAQQQQAABBOoWOPvssw/p6Oi4XlWfWXcTFiKAAALNEbgjCILusbGxbzWnPV0RCC9g2/b1xpiXh19BJQIIRFFAVf/ied6BIqJRzPfYTG09gJXNZq8wxvREHYl8CCBQVaDym91pnuddV7WSAgRCCPT39/dYlnW5iHSEKKcEAQQQQCCBAqr6/WKx+MIEjsZICCCAAAIIIIAAAggggEDdAtls9jnGmOtF5Cl1N2EhAggg0FyBsjHm3a7rFuPwZnlzKejeToFsNnugZVmVx5bt2c4c7I0AAg0ReKHrut9vSKcmNmnbAawlS5bMnj9//t9F5ElNnI/WCCDQGoHLPM87vzVbsUvSBfL5/DtEZI2ItO3PqKQbMx8CCCAQEwG7UCj4MclKTAQQQAABBBBAAAEEEECg6QJnn332sZlM5jpjzIKmb8YGCCCAwMwFPj937txz165du23mreiAQH0C2Wz2fMuyPlbfalYhgEBUBIwxl5ZKpcp7yJF+te3N7e7u7ldblvWlSOsQDgEEwgjcvO+++y5es2bN9jDF1CCwCwEzMDAwYoy5ACUEEEAAgdQL3Llt27anXXbZZROplwAAAQQQQAABBBBAAAEEEBCR7u7ukyzLupq7ePDlgAACMRP4uaq+2vf9P8UsN3ETIjA0NGTdeuutN4rICQkZiTEQSKvA3yYmJhaOj4+XowzQtgNY2Wx2zBizNMo4ZEMAgaoCU9PT0y+88sorf1y1kgIEdiGwYsWK2XPmzBk1xrweKAQQQAABBIIgGB4ZGVmFBAIIIIAAAggggAACCCCAgIjjOKep6riIzMEDAQQQiKHAXUEQvG5sbKxyCIYXAi0XyOVyR6jqz0Wks+WbsyECCDRS4BTXdTc2smGje7XlAFZfX9+cO++88w5V3aPRA9EPAQRaKrDK87zhlu7IZokTGBoa2mP79u1XicjLEjccAyGAAAII1CtwZKFQ+HW9i1mHAAIIIIAAAggggAACCCRFwLbts0WkJCIdSZmJORBAIH0CxpjKXc7f4rru59I3PRNHQSCXy31QVd8ThSxkQACB+gRU9T89z3tLfatbs6otB7ByuVxXEASfb82I7IIAAs0QMMZ8b2Ji4uSo3+avGbPTs3EC/f39+1mWda2IHNO4rnRCAAEEEIi5wE8LhcLimM9AfAQQQAABBBBAAAEEEEBgxgKO45ylqhtEZNaMm9EAAQQQiIbApYsWLeobGhoKohGHFGkRWLJkyewFCxb8UkQOTcvMzIlAAgXu2rJly/4bN26cjupsbTmA5TjO51W1K6oo5EIAgaoC96nq0Tyzu6oTBbsQGBwcPFhVvy4izwQKAQQQQACBxwhcUCgUPoIIAggggAACCCCAAAIIIJBmAdu2XyciYxy+SvNXAbMjkFiBKzs6OnrXr1//UGInZLBICpxzzjkvK5fLlfeleCGAQEwFMpnMy6+44or/imr8lh/AyuVyc4Mg+LuIzI0qCrkQQGDXAqp6ru/763FCoF6BwcHBY1X1GhHZp94erEMAAQQQSKRAWVWfXiwW/5rI6RgKAQQQQAABBBBAAAEEEAghkMvlXhsEQeXOVzx2MIQXJQggEEuB/7Ys61WlUumOWKYndGwFHMe5UkReH9sBCI5AygWMMetKpdIbosrQjgNYS4MgqHxqgxcCCMRQwBhzreu6p8UwOpEjIpDP548XketEZK+IRCIGAggggEB0BL5ZKBROjU4ckiCAAAIIIIAAAggggAACrRXo7u5+tWVZn+fwVWvd2Q0BBFovYIz5vWVZrxwdHf1t63dnx7QK9Pb27jc9PX2ziOydVgPmRiDmAvfefffd+1133XUTUZyj5QewHMcZV9XKrXN5IYBA/ATuK5fLR23YsOEv8YtO4igI9Pf3v9CyrMrhqz2jkIcMCCCAAALRElDVZcVi8XPRSkUaBBBAAAEEoipQ+bGeRjUcuRBAAAEE6hDo6ek5NQiCr6nq7DqWswQBBBCIo8A/MpnM6aOjoz+IY3gyx1PAtu0VxphL45me1AggYIw5s1QqXR1FiZYewFqyZMns+fPn38kb71H8UiATAqEEej3PuyJUJUUI7CDQ399/omVZ14rIHuAggAACCCCwE4GHRGS/QqFwHzoIIIAAAggggAACCCCAQNoEbNs+zhhzg6rG/mdnlePBLX3zKW1fLMyLQPIEHhSRLs/zKh/e5oVA0wW6uroys2fP/pGI/HvTN2MDBBBohoDnuq7TjMYz7dnS74Ft2z5dRCJ5Em2mkKxHIAUC13ieV/lvmBcCNQvk8/kTRKRy+Io7X9WsxwIEEEAgHQKqek2xWOR7jXRcbqZEAAEEEEAAAQQQQACBxwjYtn2UiGwUkfnAIIAAAikVmBaRN3mety6l8zN2iwV6enpeEATBTZwZbjE82yHQGIEHZs2ate/69esrH+qO1KulB7Cy2exnjDHnRUqAMAggEEbg3kwmc+To6OjWMMXUIPBYAe58xdcDAggggEAYAVV9W7FY/GSYWmoQQAABBBBAAAEEEEAAgaQI9PT0HFoul78jIk9JykzMgQACCNQpoKp6ge/7a+pczzIEahJwHKckIpG8i05Ng1CMQAoFjDGnlUqlys0/IvVq2QGsyq38Ojs7/yoi+0ZKgDAIIBBGgEcPhlGi5nECHL7iiwIBBBBAIKyAMeag4eHhP4atpw4BBBBAAAEEEEAAAQQQiLvAsmXLDpiYmPi+iBwY91nIjwACCDRKwBjzQdd139eofvRB4IkEent795uenr5FRPZCCQEE4iVgWdblo6Ojb4xa6pYdwHIc50RVrXyKgxcCCMRIQFW/7vv+K2IUmagREcjn8y8SkWtEZI+IRCIGAggggEBEBVT118Vi8ciIxiMWAggggAACCCCAAAIIINBwgWXLlu05MTFRec/kOQ1vTkMEEEAg5gLGmDWu614gIhrzUYgfcQHbtgeNMasjHpN4CCCwg4Ax5o6HHnrogPHx8XKUcFp5AOsjqtoXpeHJggACVQW2qepRvu/fVrWSAgQeI9Df33+SMeYaY8xcYBBAAAEEEKgmoKojxWJxoFodv44AAggggAACCCCAAAIIJEFg8eLFHYcddtjVxpiXJ2EeZkAAAQSaIWBZ1mcOOeSQNw8NDQXN6E9PBCoCXV1dnbvtttsvVfUwRBBAIHYCL3Jd97tRSt2yA1i2bf9eRA6O0vBkQQCBXQsYYwZc1x3BCYFaBFauXHlqJpP5qojMqWUdtQgggAAC6RUwxpwyPDy8Mb0CTI4AAggggAACCCCAAAIpEjDZbPazxphzUzQzoyKAAAJ1CajqhltuuaVn06ZNU3U1YBECIQTOOeecl5XL5a+HKKUEAQSiJVC5W+K7ohSpJQewuru7n21Z1i+iNDhZEECgqsDPt27deuzGjRunq1ZSgMAjAoODg8eq6rd47CBfEggggAACNQjcf8899zx57dq1/CCtBjRKEUAAAQQQQAABBBBAIJ4CjuMMqer745me1DMWqDxMrSXvzM04KQ0QiIyAql51yy23dHMIKzKXJJFBHMe5VkSWJHI4hkIgoQKq+kfP8w6K0ngt+TaPv1BE6ZKTBYFQAkEmkzlhdHT0B6GqKUJARFatWnV4EASV2zw+GRAEEEAAAQRqEPhyoVB4TQ31lCKAAAIIIIAAAggggAACsRTIZrO2MabEEZxYXj5CI4BAewW+uHnz5qUcwmrvRUjy7rlc7ghV/aWIzErynMyGQNIEpqen/33Dhg0/i8pcLTmAZdv2z0Xk6KgMTQ4EENi1gKp+zPf9d+KEQFiBvr6+p86ePfsmVT0w7BrqEEAAAQQQeEQgXygUimgggAACCCCAAAIIIIAAAkkW6O7ufrFlWdeJSGeS52Q2BBBAoIkCHMJqIi6tRRzH+bSILMcCAQRiJfBB13XfF5XETT+AtXTp0mdkMpk/RGVgciCAQFWBv8yePfvf1q1b90DVSgoQ+J87Xy0IguA7IvIsQBBAAAEEEKhD4KRCoVD5c4QXAggggAACCCCAAAIIINAkgcpbIZVnv7XntXTp0mMymcyNIrJnexKwKwIIIJAMAR5HmIzrGNUpcrncvqr6OxHZK6oZyYUAAo8T+JXrukdFxaXpB7Bs214hIpdGZWByIIDArgWCIHjN2NjYl3FCIIzA0NDQ7tu2bbvBGHN8mHpqEEAAAQQQ2EFgulwu733xxRc/iAwCCCCAAAIIIIAAAgggkESBbDZbuWP8940xByRxPmZCAAEEWi1gjPnCli1bujdu3Djd6r3ZL/kC2Wz2PZZlfTD5kzIhAokSONx13VuiMFHTD2Bls9nrjTEvj8KwZEAAgV0LqOoNvu+/DCcEwggsX768Y++99/6KMWZJmHpqEEAAAQQQ2FEgCIJNIyMjz0UGAQQQQAABBBBAAAEEEEiiQFdX15M6Ozu/KyKR+VR+Ep2ZCQEEUingLlq06JyhoaEgldMzdNME+vr65tx5552bReTpTduExggg0FABY0y+VCoVG9q0zmZNPYC1fPny3R988MG7RWS3OvOxDAEEWiRgjJmwLOvZo6Ojv23RlmwTbwGTz+fXi0hPvMcgPQIIIIBAOwWCIPjEyMjI29uZgb0RQAABBBBAAAEEEEAAgfoEdv1Yw97e3t2mp6evV9WT6uvPKgQQQACBKgL/6XneW9v6jFkuUSIFbNs+xxhTeQ+MFwIIxEBAVX/geV4kntbU1ANY3d3dZ1iW9dUYXBMiIoCAyGrP8y4EAoEwAvl8fo2IvDNMLTUIIIAAAgjsQiBXKBRchBBAAAEEEEAAAQQQQACBJAl0dXVlOjo6rjTGnJWkuZgFAQQQiJqAqn7M933eq4jahYl5nqGhIevWW2/9qYgcHfNRiI9AWgTK5XJ5v7GxsbvaPXBTD2DZtv0pEXlzu4dkfwQQqCqwZXJy8ojx8fF/Vq2kIPUC+Xz+PSLC869T/5UAAAIIIDBzgSAIDh0ZGfndzDvRAQEEEEAAAQQQQAABBBCIjIDJ5XKXB0GwLDKJCIIAAggkW+D9nud9INkjMl2rBWzbPt0Yc3Wr92U/BBCoT0BVc57ntf3D3s0+gPUnno9a3xcIqxBopYBlWa8vlUrjrdyTveIpMDg4eJaqVr5WmvrnRzx1SI0AAgggUKPAQ7fddtse4+Pj5RrXUY4AAggggAACCCCAAAIIRFbAtu1LRWRFZAMSDAEEEEimwPme512WzNGYql0CjuNsFBEeJdyuC8C+CNQmsMF13e7aljS+umlvoNu2fZSI/LLxkemIAAKNFFDVb/m+/5JG9qRXMgUGBwePCYLgu8aYucmckKkQQAABBFos8P8KhcKzW7wn2yGAAAIIIIAAAggggAACTRNwHOcDqvrepm1AYwQQQACBJxJQVT3H9/0SRAg0SqCnp+eEyvtijepHHwQQaKrAfTfffPM+mzZtmmrqLlWaN+0AluM4eVUdbudw7I0AAlUFpivPL/Y87zdVKylItcCFF164f7lc/pGILEw1BMMjgAACCDRS4KpCofC6RjakFwIIIIAAAggggAACCCDQLgHbtt8pImvatT/7IoAAAmkXMMZMlMvlV46NjX0r7RbM3zgBx3GuE5FXNK4jnRBAoFkCQRCc5Pv+d5rVP0zfph3Asm37RhF5UZgQ1CCAQHsEjDEfd12X22G3hz82uw4NDe22ffv2ym1Wnx+b0ARFAAEEEIi8gDFm9fDw8IWRD0pABBBAAAEEEEAAAQQQQKCKgOM456nqWhFp2nsuXAQEEEAAgVACD5TL5ZM2bNjws1DVFCFQRaCnp+fZQRBUvp4ssBBAINoCqlr0PC/fzpRN+ctAb2/v3lNTU3eKyKx2DsfeCCCwS4H7JicnF42Pj1f+W+WFwBMJmHw+74pIFiIEEEAAAQQaKaCqy4rF4uca2ZNeCCCAAAIIIIAAAggggECrBRzHeZOqforDV62WZz8EEEDgCQX+ZlnW8aVS6Q8YIdAIAcdxrhSR1zeiFz0QQKB5Aqr6a8/zjmzeDtU7N+UAlm3bZ4vIhurbU4EAAu0SMMYMuK470q792TceAgMDA+81xnwgHmlJiQACCCAQJ4EgCE4YGRm5KU6ZyYoAAggggAACCCCAAAIIPFbAtu1lIvIZ7orB1wUCCCAQOYHNqnq87/v3RC4ZgWIn0Nvbe/j09PSvRCQTu/AERiBlAtPT0wdt2LDhj+0auykHsLLZ7BXGmJ52DcW+CCBQVeCPHR0dR6xfv/6hqpUUpFZg5cqVr8lkMl/gB0ip/RJgcAQQQKCpApZl7bt69WruxNlUZZojgAACCCCAAAIIIIBAswQcxzlXVS/nZ2fNEqYvAgggMDMBY8yNExMTLxsfH5+cWSdWIyDiOE7laTE2FgggEG0BVX2b53mfbFfKZhzAMrZt3y4iT2nXUOyLAAK7FrAsq7tUKnGXOr5QnlBgcHDwmCAIvmuMmQsTAggggAACTRB4oFAo7NWEvrREAAEEEEAAAQQQQAABBJouwJ2vmk7MBggggEBDBIwxn3Vd97yGNKNJqgWy2ewiy7Ju5i5Yqf4yYPh4CFzruu5p7Yra8ANYjuMcrao/b9dA7IsAAlUFfuh53gtERKtWUpBKgQsvvPAp09PTPzbGPC2VAAyNAAIIINB0AVW9rVgsHtL0jdgAAQQQQAABBBBAAAEEEGiwgOM4b1LVyqfqrQa3pl0cBSo/ZW/4O21xhCAzAtEVMMYMuq5biG5CksVFIJfLeaqajUteciKQUoHtu++++5PXrl27rR3zN/zbQsdx3qWql7RjGPZEAIGqAmqMOcF13e9XraQglQJdXV2Zgw8++Osi8pJUAjA0AggggEBLBFT1J8Vi8diWbMYmCCCAAAIIIIAAAggggECDBGzbHhCRYY7cNAiUNggggEBrBAJjzOtd172qNduxS1IFent7D5+env4Vd8FK6hVmrgQJnO667jXtmKfhB7Bs275ORF7RjmHYEwEEqgp80fO8s6pWUZBagcHBwQ+r6qrUAjA4AggggECrBL5eKBT4O0OrtNkHAQQQQAABBBBAAAEEZizgOE5eVSuHr3ghgAACCMRPYLuqnuj7/qb4RSdxlAQcx/FFpDtKmciCAAL/KmCMubRUKr2jHS4NPYDV1dXV2dnZ+Q8RmduOYdgTAQR2KVAWkWd7nvcbnBDYmUA+n18iIl/j9ul8fSCAAAIItEDALxQKdgv2YQsEEEAAAQQQQAABBBBAYKYCxnGcS1S1b6aNWI8AAggg0FaBP01OTh47Pj5+Z1tTsHmsBXp6eg4NgqDyXmsm1oMQHoFkC9zsuu6z2jFiQw9gdXd3n2RZ1sZ2DMKeCCCwa4EgCK4YGxvrxQmBnQkMDAwsNMb8TESejBACCCCAAAItELisUCic34J92AIBBBBAAAEEEEAAAQQQqFvg5JNPnnXAAQesNcacW3cTFiKAAAIIREng25s3b375pk2bpqIUiizxEnAcZ0xElsYrNWkRSJeAqj7N87wtrZ66oQewbNv+DxF5d6uHYD8EEKgqMKmqR/i+f1vVSgpSJzA0NDRr+/bt3xaRE1I3PAMjgAACCLRFwBhz0fDw8FBbNmdTBBBAAAEEEEAAAQQQQCCEQC6XmxsEwQYROT1EOSUIIIAAAvERuMzzPD4YGJ/rFbmkjuMcLSKVmxo09KxF5AYlEAIxFgiC4Fzf99e3eoSG/qZg2/YPROS4Vg/BfgggUFWAbyarEqW3oL+/f8SyrJXpFWByBBBAAIFWCwRBcP7IyMhlrd6X/RBAAAEEEEAAAQQQQACBMAK5XG7fIAi+JiLHhqmnBgEEEEAgXgLGmGWu634uXqlJGyUBx3GuFZElUcpEFgQQ+D8BY4xfKpXsVps07ABWb2/v3lNTU3fxvNNWX0L2Q6CqwINz5sw55PLLL/971UoKUieQz+fPEJGvcEo/dZeegRFAAIG2ClQ+fTIyMtLyT5+0dWg2RwABBBBAAAEEEEAAgVgIZLPZg40x14vIolgEJiQCCCCAQD0CDxljXui67k/rWcwaBHK53EmquhEJBBCIrMBdz3zmM58yNDQUtDJhww5g9fT0vKZcLn+xleHZCwEEQgn8h+d57w1VSVGqBN797nc/bXp6unKL1AWpGpxhEUAAAQTaLqCqTrFY9NoehAAIIIAAAggggAACCCCAwGMEenp6nlcul68WkX2BQQABBBBIvMCfJicn/318fPwfiZ+UAZsi4DjO90TkhU1pTlMEEJixQBAEx/i+//MZN6qhQcMOYNm2/XEReVsNe1OKAALNF7i3o6PjoPXr19/b/K3YIU4Cy5cv79h77703GmOOj1NusiKAAAIIJEPAGLN0eHj4ymRMwxQIIIAAAggggAACCCCQBIFcLrc0CIJ1IjInCfMwAwIIIIBAKIGveJ73GhHRUNUUIfAYAcdxznzkKTO4IIBANAUGF4vqSAAAIABJREFUXNcdaWW0hh3AymaztxhjDm1lePZCAIFdCxhjLnJddwgnBHYUyOfzHxGRPmQQQAABBBBoh4Ax5nXDw8NXtWNv9kQAAQQQQAABBBBAAAEEdhAwjuMMqOpqEWnYeyYoI4AAAgjEQ8AYM+i6biEeaUkZMYHK9xC/FJEjI5aLOAgg8D8CN7iu+7JWYjTkLxNLly59WiaT+XMrg7MXAghUFbhfVZ/h+/49VSspSJXA4ODgi1X1G/xAKVWXnWERQACBSAmo6lnFYpHHl0fqqhAGAQQQQAABBBBAAIH0CeRyublBEIyKyGvTNz0TI4AAAgg8IjCtqi/xff87iCBQq0A2m81ZllX5XoIXAghET+ChffbZZ/6aNWu2typaQw5gVX5jMcbwG0urrhr7IBBO4EOe570nXClVaRFYsWLFXnPnzv2lqh6YlpmZEwEEEEAgegI8gjB614RECCCAAAIIIIAAAgikTaCnp+ep5XL5KyKyOG2zMy8CCCCAwOMEtmQymeeMjo7ejQ0CtQgsXry444gjjrhNRBbWso5aBBBojYBlWS8dHR2t3JikJa9GHcD6jDHmvJYkZhMEEKgqYIz5p2VZz+AbxapUqSvI5/OfFZFlqRucgRFAAAEEoiaQKxQKbtRCkQcBBBBAAAEEEEAAAQTSIdDd3f1iy7LGRGTfdEzMlAgggAACIQS+4nnea0REQ9RSgsCjArlcbpWqfhgSBBCInoCqFj3Py7cqWaMOYN1ijDm0VaHZBwEEdi2gqgXf9wdxQuCxAv39/adblnU1KggggAACCLRbIAiCN4yMjKxrdw72RwABBBBAAAEEEEAAgdQJGMdxzlfVERHpSN30DIwAAgggsEsBVV3h+/7HYUKgFoFsNjvPsqw/i8getayjFgEEWiLwE9d1j23JTiIy4wNYvb29+01NTd3eqsDsgwACVQW2WZZ1UKlUuqNqJQWpEejr65vf0dHxK2PM/qkZmkERQAABBKIs8PZCofCJKAckGwIIIIAAAggggAACCCRLwLbtvUTkcyLy2mRNxjQIIIAAAo0SMMZMTE9Pv2DDhg0/a1RP+qRDIJfLfVxV35aOaZkSgVgJlGfNmvXk9evX39uK1DM+gOU4zutV9cpWhGUPBBCoLqCqH/F9/4LqlVSkSSCfz1duqb40TTMzKwIIIIBAdAVU9cJisbg6uglJhgACCCCAAAIIIIAAAkkSyGazi40x4yJyUJLmYhYEEEAAgaYI3Dx37tznrl27dltTutM0kQLZbHaRZVmbRcRK5IAMhUCMBYwxp5VKpWtbMcKMD2DZtl25DSOnOVtxtdgDgeoCU+Vy+ZANGzb8pXopFWkRGBgYeLUx5ktpmZc5EUAAAQSiLxAEwfDIyMiq6CclIQIIIIAAAggggAACCMRcoPLIwTeq6hoR2T3msxAfAQQQQKB1Apd5nnd+67ZjpyQIOI7zFRE5MwmzMAMCSRJQ1aLneflWzNSIA1j/T0SObEVY9kAAgV0LqOrnfN9fhhMC/yuwatWqfcrlcuXRg/uiggACCCCAQFQEjDGfHB4e5kMcUbkg5EAAAQQQQAABBBBAIIECuVxu3yAI1onIaQkcj5EQQAABBJoroJU/PzzPu66529A9SQKO45wsIt9O0kzMgkBCBH7ouu5xrZhlRgewurq65nd2dt7JrfRacanYA4GqAhoEwVFjY2O/rlpJQWoE+vv7v2xZ1qtSMzCDIoAAAgjERWBDoVDojktYciKAAAIIIIAAAggggEC8BBzHeamqXiEi+8crOWkRQAABBCIksHVycvLZ4+Pj/4hQJqJEXMBxnF+IyLMjHpN4CKRNYLqzs3P+unXrHmj24DM6gJXNZl9ljPlys0PSHwEEQglc43ne6aEqKUqFQH9/f49lWZUfNPFCAAEEEEAgUgJBEGwcGRk5JVKhCIMAAggggAACCCCAAAKxF1i+fPnuDz744LCIvF1EZvT+R+wxGAABBBBAoBECvud5diMa0SMdArlc7s2q+ql0TMuUCMRHIJPJvPyKK674r2YnntFfQBzH+Yiq9jU7JP0RQKC6QBAEJ4+Njd1YvZKKNAj09fVV7lC4WUT2ScO8zIgAAgggEDuBWwqFwuGxS01gBBBAAAEEEEAAAQQQiKyA4zgnqupnRWRRZEMSDAEEEEAgjgJdnud9IY7Bydx6gbe+9a173H///VtE5Emt350dEUBgFwIfdl333c0WmtEBLNu2fyIii5sdkv4IIFBV4Mee5z2vahUFqRHI5/NrReSNqRmYQRFAAAEE4iZwX6FQ2DtuocmLAAIIIIAAAggggAAC0RPo6+ub8/e///39xph+EbGil5BECCCAAAIxF7jLsqx/K5VKd8R8DuK3SCCXy12qqitatB3bIIBAOIHvu677wnCl9VfVfQDLtu29RKTyzNtM/dvHf6VyH+P4X8RkTMDp+2Rcx4ZMMTAwcJwx5iZ+4NQQTpoggAACCDRJoFwu73HxxRc/2KT2tEUAAQQQQAABBBBAAIEUCHR3d59gWdY67nqVgovNiAgggEAbBYwxnuu6ThsjsHWMBHK53BGq+muOEcToohE1DQJTxph5pVKpqe9J1H0AK5fLvTwIguvTcCWYEYGIC9w2OTl56Pj4eDniOYnXAoGurq7MwQcf/GMROaYF27EFAggggAACMxE4slAoVH4QwQsBBBBAAAEEEEAAAQQQqEmgq6trn87OzqKInMObmzXRUYwAAgggUL/AGZ7nfa3+5axMk0Aul/umqr44TTMzKwJRF1DVUz3P+2Yzc9Z9AMtxnCFVfX8zw9EbAQRCCaz0PO+SUJUUJV5gYGDgncaYNYkflAERQAABBGIvEATBGSMjI/zQKvZXkgEQQAABBBBAAAEEEGipgMlmszljTOXnoU9u6c5shgACCCCQdoHbVfXffN+/J+0QzF9dIJfLvVZVr6peSQUCCLRQ4IOu676vmfvVfQDLtu3rROQVzQxHbwQQqCqwTVUX8s1eVadUFPT39+9nWdZmEXlSKgZmSAQQQACBWAuo6juKxeKlsR6C8AgggAACCCCAAAIIINAygaVLlx6TyWQ+JSLPb9mmbIQAAggggMBjBCzL+kypVFoOCgLVBE4++eRZCxcu/LOI7F+tll9HAIGWCdzouu7Jzdyt3gNYxrbtu0VkXjPD0RsBBHYtwDd6fIU8ViCfz4+JyFJUEEAAAQQQiInAxwqFwjtjkpWYCCCAAAIIIIAAAggg0CaB88477ynbt2+/SETOE5FMm2KwLQIIIIAAAhUBFZETPc+7CQ4EqgnYtv1hY8yqanX8OgIItExg+8033/ykTZs2TTVrx7oOYOVyuSOCIPhNs0LRFwEEwgkEQXD02NjYL8NVU5VkgZUrV56ayWRuSPKMzIYAAgggkDiBrxcKBe6om7jLykAIIIAAAggggAACCDRGoKurq3P27NlvUdXK4Svu+N4YVroggAACCMxc4NebN28+pplv4M88Ih2iIJDNZg+2LOt3ImJFIQ8ZEEBAJAiC5/q+v6lZFnUdwHIc51xVXdesUPRFAIHqAsaYpt8ir3oKKqIgMDQ01Pnggw/+wrKsw6OQhwwIIIAAAgiEEVDVvxSLxaeHqaUGAQQQQAABBBBAAAEEUiVgcrnc64IgKIjIQamanGERQAABBOIikPc8rxiXsORsn0Aul/umqr64fQnYGQEEHiugqud7nndZs1TqOoBl2/Z/isibmhWKvgggUF3AGPM613Wvql5JRdIFBgYG3muM+UDS52Q+BBBAAIHECVRu2T6vUCjcl7jJGAgBBBBAAAEEEEAAAQTqEujp6Tm1XC4Pi8jiuhqwCAEEEEAAgdYIbLMs68hSqfSH1mzHLnEVsG07a4zx4pqf3AgkUGDMdd1ss+aq9wDWz0TkOc0KRV8EEKgqsGXr1q0Hbdy4cbpqJQWJFhgYGFhojLlFRHZP9KAMhwACCCCQSAFVfUGxWPzvRA7HUAgggAACCCCAAAIIIBBa4JGDVx8UkeNCL6IQAQQQQACBNgoYY652XffMNkZg6xgILFmyZPaCBQu2iMiTYxCXiAgkXkBV/+h5XtPuslvzAayurq49Ojs77xGRWYnXZ0AEIiqgqkO+718U0XjEaqHAwMDAqDEm18It2QoBBBBAAIFGCry9UCh8opEN6YUAAggggAACCCCAAALxEeju7j4pk8lcpKonxSc1SRFAAAEEEPgfAWPM6a7rXoMHArsSyGazH7Us6x0oIYBANAQ6Ozufum7dur82I03NB7Cy2ewpxphvNSMMPRFAIJRAoKoH+77/p1DVFCVWYHBw8BhV/YmIWIkdksEQQAABBBItoKqlYrHYk+ghGQ4BBBBAAAEEEEAAAQR2FDDd3d2nW5Y1KCLHw4MAAghEU0Arx2uiGY1UkREwxtx69913H3nddddNRCYUQSInYNv2UcaYX0YuGIEQSKmAMeasUqn0xWaMX/N3DrZtrxKRDzcjDD0RQKC6gDHmWtd1T6teSUXSBfL5/DdE5CVJn5P5EEAAAQQSLfC7QqFwaKInZDgEEEAAAQQQQAABBBB4WGDx4sUdhx12WLcxJi8iz4IFAQQQQACBJAgYYwZc1x1JwizM0DwBx3F+JiLPad4OdEYAgRoELnZdt7+G+tCl9RzA+rKIvCr0DhQigEBDBTKZzGtHR0e/1NCmNIudwMDAwGuNMVfFLjiBEUAAAQQQ+FcBnZ6e3veSSy65CxgEEEAAAQQQQAABBBBIpkAul9u3XC6fZ4x5i4gsTOaUTIUAAgggkGKB+zs6Og5bv37931JswOhVBHp6et4VBMElQCGAQCQEbnJd94RmJKnnANbtIrJfM8LQEwEEqgr8bfPmzU/ftGnTVNVKChIrMDQ0NGv79u2/FhHuGJLYq8xgCCCAQKoETi8UCtekamKGRQABBBBAAAEEEEAgBQK5XO655XJ5hWVZZ6vq7BSMzIgIIIAAAukVWO953rnpHZ/JqwlUDqSr6lYRmVWtll9HAIGmC0zcfffdT2rG42NrOoC1dOnSp2UymT83fVw2QACBnQqoasH3/UF40i2Qz+ffKCJr063A9AgggAACSRFQ1Q8Wi8X3JWUe5kAAAQQQQAABBBBAIM0CXV1de3R2dr5eRCo/vzouzRbMjgACCCCQKgFV1WN939+UqqkZtiYBx3GuFZElNS2iGAEEmiJgjDmuVCr9sNHNazqA1d3d/WrLsnj0WaOvAv0QCCdQ+ebtMN/3fxeunKokCgwNDe22bdu23xpjnpbE+ZgJAQQQQCCVAt8oFAovTeXkDI0AAggggAACCCCAQEIEstnsYhFZbozpFpE9EzIWYyCAAAIIIBBawBhzo+u6J4deQGHqBBzHqXyf5KducAZGIIICqtrned5HGx2tpgNYtm1fJCJ8Or3RV4F+CIQQCIJg49jY2CkhSilJsEA+n3+XiPCM6ARfY0ZDAAEEUijwwG233TZvfHy8nMLZGRkBBBBAAAEEEEAAgdgKnH322YfMmjVrqYjkROSw2A5CcAQQQAABBBokYIw53XXdaxrUjjYJE+jr65tz55133i4iT0rYaIyDQOwEjDF+qVSyGx281gNYV4vI6Y0OQT8EEAgl8AbP89aFqqQokQIDAwN7GmN+LyL7JHJAhkIAAQQQSK1AuVw+6uKLL/5VagEYHAEEEEAAAQQQQACBmAj09PQ8NQiC16lql4gcLyI1vccQkzGJiQACCCCAQL0Cm7du3XrUxo0bp+ttwLpkC+Ryuc+q6rJkT8l0CERfwBhzS6lUOrzRSWv6y1E2m91qjDmg0SHohwACVQUempyc3G98fPy+qpUUJFagv7//fZZlVe5EyCsyAsrPGSNzLQiCAAJxFqjc7rdYLDb8dr9xNiE7AggggAACCCCAAAJREejq6nrm7Nmzz1TVV4nICSJiRSUbORBAAAEEEIiagDHmja7rXh61XOSJhkBPT8+pQRDcEI00pEAg1QI6MTFReTJHQ89fhD6A1dvbu9/U1FTllni8EECg9QKf9zzv7NZvy45REcjn85Xbkf5BROZFJRM5EEAAAQQQaKDA1wuFwisa2I9WCCCAAAIIIIAAAgggUKfA0NCQddtttz2/XC6fKSKVf55VZyuWIYAAAgggkDoBVf3rHnvssWjt2rXbUjc8A1cV6OrqysyePXuriDylajEFCCDQVAFjzMmlUunGRm4S+gCW4zinqerXGrk5vRBAIJxAEARnjo2NVR4ByiulAtz9KqUXnrERQACB9AhMzJkz58lDQ0P/TM/ITIoAAggggAACCCCAQHQEKh/ALpfLJwZBcIaqvtIYsyA66UiCAAIIIIBAvASMMQOu647EKzVpWyXgOM4nROStrdqPfRBAYOcCqrrS87xLGukT+gBWNpt9jzHmg43cnF4IIBBK4K7NmzcfsGnTpqlQ1RQlTmDFihV77b777pW7X81P3HAMhAACCCCAwP8JnF4oFK4BBAEEEEAAAQQQQAABBJovsGzZsgMmJiZOFJHKP6eKyGHN35UdEEAAAQQQSI3AXSJyiOd596dmYgYNLZDNZl9kWVZD77oTenMKEUDgsQJjrutmG0kS+gBWd3f3Fy3Lek0jN6cXAgiEEvik53lvC1VJUSIFBgYG3muM+UAih2MoBBBAAAEEHhEIguATIyMjbwcEgbQLVP6SrmlHYH4EEEAAAQQQaKhA5ZGCv//97w9T1eNU9UXGmBNV9ZCGbkIzBBBAAAEEENhR4P2e5/HeDl8XjxOofG926623/llEngoPAgi0VeC3rus29IMooQ9g2bZdufvKM9o6PpsjkEKBTCZz/Ojo6A9SODojiwh3v+LLAAEEEEAgLQKq+odisXhwWuZlTgQQQAABBBBAAAEEmiXQ09PzdFV9brlcfp4x5nkislhE9mrWfvRFAAEEEEAAgZ0K3Dc5OXnw+Pj4P/BBYEeBXC63RlXfiQwCCLRVQGfNmjV//fr19zYqRagDWD09PQvK5XLlVom8EECgtQJ/8Dyv8mk0PgTfWvfI7JbP5wdFZHVkAhEEAQQQQACBJgqo6uHFYvGWJm5BawQQQAABBBBAAAEEEiOwbNmyPaempp6lqkeLyFGq+mwRqfyzd2KGZBAEEEAAAQTiLbDa87wL4z0C6ZshYNv2ccYYbsDRDFx6IlCbwCmu626sbckTV4c9gHVquVy+oVGb0gcBBEILjHieNxC6msJECaxYsWL27rvvfpuIHJCowRgGAQQQQACBJxAwxrxreHh4DUAIIIAAAggggAACCCDwPwJ9fX1z7rnnngPL5fKBlQ8sPPLPocaYyqMyeGwNXygIIIAAAghEW+CBTCZz0Ojo6N3Rjkm6NggYx3H+KCJPb8PebIkAAv8n0O+67sWNAgl1AMu27coBkEKjNqUPAgiEE8hkMs8fHR39UbhqqpImkM/n3ygia5M2F/MggAACCCCwC4EbCoXCyxBCAAEEEEAAAQQQQCAlApU33vZT1QMty3qaqlb+qRy0qrwR9/RH/t0+KbFgTAQQQAABBJIq8AHP896f1OGYq36BXC73MVU9v/4OrEQAgQYIbHBdt7sBfR5uEfYAVklEnEZtSh8EEAgl8GfP857B4wdDWSWuaGhoyNq+ffuvROSIxA3HQAgggAACCDyxwJRlWfuvXr2aTwUm6Kskl8tVvp85shkjBUGwpzFmVjN619Gz8vfryDzuJwiCThGZW8ccTVliWdbcRzI1pf+OTY0xLfvaUNUniYjVksFE5rViH2OM9chcrdiu8t/wnq3YKEF7TIjItibNc0+T+lbyVnLP6BUEwbZMJrPLPkEQlEXk/hAb/VNEpnZVZ4yZMsZU6nb5CoLgfsuyKvs+4UtVJyzLqnrdVPVey7L0iRqVy+XtqvrQDr++05lnzZp13/T0dPDY2s7Ozu3r16/fcX21Efn1kAK5XG6uMWbB5OTkgkwms0/lf6vqfBFZUPnnkf//4f8tIvuKyP4iUvkzmxcCCCCAAAIIJFfgXhE50PO8MN+jJleByR4n4DjOySLybWgQQKCtAr9zXffQRiUIewDrZyLynEZtSh8EEKguYIxZ47ruu6pXUpFEgcHBwbNU9QuNma3yc9tQv903Zju6IIAAAgggMAMBY8ybhoeHuQPkDAyjttRxnH5VLUYtF3kQQAABBBBA4FGBJzq0VnmTcMeDZdtFJNQBsMpBOGPMv6yvHB5T1UqPR1+Vw2uVQ2w7uR47O9hW2ftf1u+wLjDG3Bfi2u6lqpkd6vYQkY7//XeqOktVKwd6d1fV2caYvVW10xizh6pWDjk//O8q/1dEdn/kMGlUDoaHIKAEAQQQQAABBFoloKrv9n3/w63aj33iIXDyySfPWrhw4e0i8uR4JCYlAokUUFXdu1GHZKu+I//If/j/rPwlM5GcDIVAVYH2HF7JZDLHj46O/qBqPAoSKTAwMPB9Y8wLEjkcQyGAAAIIILALgSAINo6MjJwCUnIEstns240xlyVnIiZBAAEEEEAAAQQQQAABBBBAAAEEwguo6t1TU1PPGB8fr3p31fBdqUyCQDabXWdZ1rlJmIUZEIirgKqe4HneTY3IX/UAVm9v7+FTU1M3N2IzeiCAQGiBrYsWLXr60NDQv9wmPvRqCmMtMDAw8FxjzI9jPQThEUAAAQQQqF8gUNUDi8XilvpbsDJKAo7jnKuq66KUiSxxFGjPB2PiKEVmBBBAAAEEEEAAAQQQQACBSAr0eZ730UgmI1TbBHK53Bmq+tW2BWBjBBAQY8xbSqXSfzaCouoBrFwu1xUEwecbsRk9EEAgnICqfsz3/XeGq6YqaQIDAwO+MaY7aXMxDwIIIIAAAmEFjDErh4eHLwlbT120BXK53NIgCMainZJ0CCCAAAIIIIAAAggggAACCCCAQFMFtmzevPngTZs2TTV1F5rHSmDJkiWzFyxYcOcjj7OOVXbCIpAggU+6rvu2RsxT9QCW4zhDqvr+RmxGDwQQCCegqi/2ff/b4aqpSpLAwMDAAcaYP4hIZ5LmYhYEEEAAAQRqEQiCYNPIyMhza1lDbXQFHMc5U1W/Et2EJEMAAQQQQAABBBBAAAEEEEAAAQSaL2CMybquy4fUmk8dqx0cxxkXkdfFKjRhEUiWwPdc1z2xESNVPYBl2/ZVIvLaRmxGDwQQCCVw3+bNm/fhBHwoq8QVDQ4O/oeqvjtxgzEQAggggAACNQqo6rOKxSKPQq/RLYrlPT09p5bL5RuimI1MCCCAAAIIIIAAAggggAACCCCAQAsFfuF53jEioi3ck60iLmDb9jnGmPURj0k8BJIscL/runs34vfmqgewstnsLcaYQ5OsyWwIREzgSs/zlkYsE3FaIDA0NLTb9u3b/ywi+7RgO7ZAAAEEEEAg0gLGmIuGh4eHIh2ScKEEHMc5XlVvClVMEQIIIIAAAggggAACCCCAAAIIIJBggSAIXjI2NvatBI/IaDUKdHV17TN79uy/iYhV41LKEUCgQQLT09MHbdiw4Y8zbbfLA1i9vb27TU1N/VNEMjPdiPUIIBBOQFXP8X1/NFw1VUkSyOfzjoiUkjQTsyCAAAIIIDADgVsLhcKiGaxnaUQEHMc5WlV/HpE4xEAAAQQQQAABBBBAAAEEEEAAAQTaKXCd53mvbGcA9o6eQC6X+6GqPi96yUiEQDoEjDFnlkqlq2c67S4PYDmO8++qummmm7AeAQRCCwSWZe1fKpXuCL2CwsQI5PP574rICYkZiEEQQAABBBCYoYCqHlssFn8ywzYsb7NANptdZIz5bZtjsD0CCCCAAAIIIIAAAggggAACCCAQBQHt6Oh41vr16zdHIQwZoiFg2/b7Kk8EiEYaUiCQPgFVfY/neR+a6eS7PICVzWZ7jDFXzHQT1iOAQGiB73ue98LQ1RQmRmBgYOAIY8yvRaTqo2ETMzSDIIAAAgggUF3go4VCoa962SMVlT9FNXQ1hS0S6OnpeWq5XN7Sou3YBgEEEEAAAQQQQAABBBBAAAEEEIi6wKWe570j6iHJ1zqBbDa72LIsPojaOnJ2SoNADe8XqOqVnuctnSnLLt/ot227KCL9M92E9QggEE5AVd/t+/6Hw1VTlSSBfD5/qYisSNJMzIIAAggggMBMBVT1jnvvvXfh2rVrp2bai/XtE8hms/OMMf9oXwJ2RgABBBBAAAEEEEAAAQQQQAABBCIl8ICILPQ87/5IpSJMOwWM4ziVDzAe0M4Q7I1AigVudl33WTOdv9ojCK9RVZ5BO1Nl1iMQUsAY8xzXdX8RspyyhAj09fXN6ezs3Coi8xIyEmMggAACCCDQMAHLsk5bvXr1tQ1rSKOWCyxZsmT2/PnzH2r5xmyIAAIIIIAAAggggAACCCCAAAIIRFfg7Z7nfSK68UjWaoFcLvdZVV3W6n3ZDwEEHhYo77PPPnuuWbNm+0w8qh3AulVVD5nJBqxFAIHQAn/zPK9yqpkH54QmS0Zhf39/j2VZPO41GZeTKRBAAAEEGixQufVvsVic8a1/GxyLdrUJGNu2yzxquTY0qhFAAAEEEEAAAQQQQAABBBBAILkCqvpb3/cP533B5F7jWidzHOcsEflCreuoRwCBhgksdl33pzPp9oQHsLq6ujo7OzsfFJFZM9mAtQggEFrA9TwvF7qawsQI9Pf3f9uyrJMTMxCDIIAAAggg0FiBhyYmJvb/6Ec/em9j2zawWw3Pkm/grrFq5TjOQ6o6O1ahCYsAAggggAACCCCAAAIIIIAAAgg0USAIgpeMjY19q4lb0DpGAr29vXtPT0/fJSKZGMUmKgJJEnBc1/VmMtATHsDK5XJHBEHwm5k0Zy0CCNQk0Ot5HndBqoks/sUXXHDBgbNmzbpNRKz4T8MECCCAAAIINEdAVc8rFoufbU53urZCwHGcB1R1j1bsxR4IIIAAAggggAACCCCAAAIIIIBAHARUdYPv+91xyErG1gjYtv0jY8yxrdmNXRBAYAeBD7qu+74tFsdFAAAgAElEQVSZqDzhAaxsNvsqY8yXZ9KctQggUJPA0zzP21LTCopjL9Df3/8+y7Iuiv0gDIAAAggggEATBYIg2DgyMnJKE7egdZMFstnsXcaYBU3ehvYIIIAAAggggAACCCCAAAIIIIBAnAQmJycnF46Pj98Zp9BkbZ6A4zgfEpELm7cDnRFAYBcC467rvn4mQk94AMtxnH5VLc6kOWsRQCC0wG88z/u30NUUJkXA5PP534nIIUkZiDkQQAABBBBokkAwOTn59DVr1mxtUn/aNlkgm81uNcYc0ORtaI8AAggggAACCCCAAAIIIIAAAgjETWCl53mXxC00eZsjkM1mT7Esi8dSNoeXrghUE/iV67pHVSva1a/v6g5YnzHGnDeT5qxFAIHQApd6nveO0NUUJkKgv7//RMuyvpOIYRgCAQQQQACBJgsEQXD+yMjIZU3ehvZNErBtu/LI5YOa1J62CCCAAAIIIIAAAggggAACCCCAQFwFbvE87wgR0bgOQO7GCXR1dXXOnj37HyIyt3Fd6YQAAiEFJrds2TJ348aN0yHrH1f2hAewbNu+UUReVG9j1iGAQHiBIAjOHBsbuzr8CiqTIDAwMPBpY8zyJMzCDAgggAACCDRbQFVvKhaLJzR7H/o3R8C27d+ISOWHibwQQAABBBBAAAEEEEAAAQQQQAABBB4joKon+b7PB/b5qnhYwHGc60TkFXAggEBbBBa5rntrvTvv6gDW7SKyX72NWYcAAqEFKicoF3ied3/oFRTGXmD58uUd8+bNq/w+uyD2wzAAAggggAACrRHQ6enpgy655JI/tWY7dmmkgG3bPxeRoxvZk14IIIAAAggggAACCCCAAAIIIIBAEgRU9XO+7y9LwizMMHMB27YvMMZcPPNOdEAAgVoFVPUMz/O+Vuu6/63f6QGsZcuW7TkxMcFhkHpVWYdADQKq+hPf94+tYQmlCRBYtWrVK4MguCYBozACAggggAACrRS4oFAofKSVG7JXYwRs2/6RiPA9b2M46YIAAggggAACCCCAAAIIIIAAAskSuH/u3Ln7r127dluyxmKaegSWLl16zKxZs35az1rWIIDAjAX6Xdet+wDkTg9g5XK55wZB8OMZR6MBAghUFTDGrHFd911VCylIlMDAwMCoMSaXqKEYBgEEEEAAgeYL/LBQKBzX/G3YodECjuN8V1V5hGSjYemHAAIIIIAAAggggAACCCCAAAKJEDDGZF3XHUvEMAwxI4GhoSHr1ltvvVtE9p5RIxYjgEDNApZlXT46OvrGmhc+smCnB7Bs286KiFdvU9YhgEB4AWPM61zXvSr8CirjLjA0NLTb9u3b/y4ie8V9FvIjgAACCCDQYgEVkWcUCoU/t3hftpuhgG3bN4jIqTNsw3IEEEAAAQQQQAABBBBAAAEEEEAgqQLXe563JKnDMVdtArlc7mpVPb22VVQjgEADBL7nuu6J9fbZ6QEsx3GGVPX99TZlHQIIhBcwxhzguu7t4VdQGXeBlStXviaTyXwx7nOQHwEEEEAAgXYIqOqKYrH48XbszZ71C9i2fZ2IvKL+DqxEAAEEEEAAAQQQQAABBBBAAAEEEi1Q7ujoWLh+/fq/JXpKhgsl4DjOShEZCVUslSMflc+t8kIAgQYI3O267pPr7fNEd8Cq3P2qchcsXggg0FyB33med2hzt6B71AQGBwddVbWjlos8CCCAAAIIxETgG4VC4aUxyUrMRwRs275aRPjUHl8RCCCAAAIIIIAAAggggAACCCAQW4HKEZedvrneoIlU9V2+769pUDvaxFigt7f32Onp6R/FeASiIxBbgXK5vM/Y2Nhd9QzwRAewbhKR4+tpyBoEEAgvYFnWulKp9IbwK6iMu8Dy5cs75s2bV3n84Ly4z0J+BBBAAAEE2iQwZYx5yvDw8D1t2p9t6xCwbfvLIvKqOpayBAEEEEAAAQQQQAABBBBAAAEEEEiLwI88z3t+WoZlzicWOPnkk2ctXLjwbhHZCycEEGitgKqe4Hle5cxUza+dHsDKZrNbK49Fq7kbCxBAoFaBN3iet67WRdTHV2BgYOClxpj/iu8EJEcAAQQQQCASAnahUPAjkYQQoQRs275KRF4bqpgiBBBAAAEEEEAAAQQQQAABBBBAIKUC09PTz7zyyit/n9LxGfsxAo7jXCcirwAFAQRaKxAEQY/v+6V6dn3cAaze3t7dpqamHhQRq56GrEEAgfACxpjDXde9JfwKKuMukM/nPykib4n7HORHAAEEEECgnQKq+vlisXh2OzOwd20Ctm1fKSKvr20V1QgggAACCCCAAAIIIIAAAggggEDqBPKe5xVTNzUDP07Atu1BY8xqaBBAoLUCQRAM+b5/UT27Pu4AluM4h6nq5nqasQYBBGoSuM/zvMpj6CqPjOaVDgGTz+f/IiJPTce4TIkAAggggEDTBB7Ytm3bPpdddtlE03agcUMFbNuu3LGsu6FNaYYAAggggAACCCCAAAIIIIAAAggkTEBVf+r7/uKEjcU4dQhks9kXWZZ1Yx1LWYIAAjMQCIJg1Pf9c+pp8bgDWLlc7uVBEFxfTzPWIIBATQLf8DzvpTWtoDjWAoODg8eq6o9iPQThEUAAAQQQiIiAqr6sWCzeEJE4xKgiYNt25ZbNDlAIIIAAAggggAACCCCAAAIIIIAAArsWUNVDfd//HU7pFujr65tz55133iciHemWYHoEWi7wPdd1T6xn153dAWu5qn66nmasQQCBmgSGPc9bVdMKimMt0N/f/z7Lsuq6XWGsByc8AggggAACTRBQ1UuKxeLKJrSmZRMEbNv+nIj0NqE1LRFAAAEEEEAAAQQQQAABBBBAAIGkCazyPG84aUMxT+0CjuNsEpF/r30lKxBAYAYCt7uue0A96x93AMu27Q+LCIdC6tFkDQI1CFiWdVapVPpiDUsojblAPp//gYgcF/MxiI8AAggggEBUBH5TKBT+LSphyLFrAcdxLlfVN+CEAAIIIIAAAggggAACCCCAAAIIIFBV4L89z3tB1SoKEi+Qy+U+rqpvS/ygDIhAtAR0991332Pt2rXbao21swNYvoh019qIegQQqE2gXC4/fcOGDX+pbRXVcRXo6+ub39nZeYeIZOI6A7kRQAABBBCImsD09PQzLrnkkj9FLRd5Hi+QzWY/bYxZjg0CsRdQEXncT1JiPxUDIIAAAggggAACCCCAAAIIREtAM5nM00ZHR7dGKxZpWi3gOI4tIm6r92U/BNIukMlkjrziiit+XavDzg5gcYeWWhWpR6B2gb97nrdf7ctYEVeB/v7+bsuyKgdceSGAAAIIIIBAgwSMMW8aHh5e26B2tGmigOM4n1TVtzRxC1ojgAACCCCAAAIIIIAAAggggAACiREwxrzZdd1PJ2YgBqlLIJvNHmxZ1u/rWswiBBCoW8AYc2apVLq61gY7O4D1VxHZv9ZG1COAQE0C13ied3pNKyiOtcDAwMCoMSYX6yEIjwACCCCAQBsEqtxs5kuFQuG1bYjFljUKOI5zmaq+vcZllCOAAAIIIIAAAggggAACCCCAAAJpFbjO87xXpnV45v4/AcdxbhcRbuzBFwUCLRRQ1T7P8z5a65b/cgCrt7d3t6mpqcpzDCN7Q33u9l/rJaY+igLGmItc1x2KYjYyNUXADAwMbDXGcLi1Kbw0RQABBBBIscAD99xzz4K1a9dOpdggFqPbtn2piKyIRVhCIoAAAggggAACCCCAAAIIIIAAAm0WMMZMdHZ27rNu3boH2hyF7dss4DjOV0XkjDbHYHsEUiVgjLmsVCqdX+vQOx7AOnxqaurmWptQjwACtQlYlnVWqVT6Ym2rqI6rwKpVq54VBEHNz4iN67zkRgABBBBAoMUCLywUCt9v8Z5sV6MAB7BqBKMcAQQQQAABBBBAAAEEEEAAAQRSL5DJZF47Ojr6pdRDpBwgm82+37IsbuyR8q8Dxm+5wDWu69b8RLN/OYBl2/bLROTrLY/OhgikTCCTyRw2Ojr625SNndpx+/v7V1iWVbnrAy8EEEAAAQQQaLCAqr6nWCx+qMFtaddgAQ5gNRiUdggggAACCCCAAAIIIIAAAgggkHgBy7I+UyqVlid+UAbcpYBt26cbY66GCYGGClROClUeP8drpwLGmM2lUumIWnl2PIC1TEQ+W2sT6hFAoCaB7ZOTk3uOj4+Xa1pFcWwF8vl85W5nr4ntAARHAAEEEEAg2gLfLBQKp0Y7Iuk4gMXXAAIIIIAAAggggAACCCCAAAIIIFCzwBbP855W8yoWJEqgt7d3v+np6dsTNRTDIBB9gW2u686tNea/HMDKZrPvNcZ8oNYm1COAQHgBVf2J7/vHhl9BZZwFurq6MgcffPAdIjI/znOQHQEEEEAAgQgLPDRnzpx5Q0NDD0U4Y+qjcQAr9V8CACCAAAIIIIAAAggggAACCCCAQB0CQRAcOTY29us6lrIkQQKO42wVkQMSNBKjIBB5gYmJiQXj4+P/qCXojnfA+pSIvLmWBtQigEBtAqr6Od/3K3eb45UCgcHBwcWVQ3cpGJUREUAAAQQQaJtAEAQnj4yM3Ni2AGxcVYADWFWJKEAAAQQQQAABBBBAAAEEEEAAAQR2JrDS87xLoEm3gOM4XxWRM9KtwPQItFzgOa7r/qKWXXc8gPVlEXlVLQ2oRQCB2gSMMRe4rvuR2lZRHVeBgYGBdxpj1sQ1P7kRQAABBBCIg4Ax5qLh4eGhOGRNa0bbtj8mIuendX7mRgABBBBAAAEEEEAAAQQQQAABBOoU+IbneS+tcy3LEiKQzWbfb1kWP/9MyPVkjHgIqOoZnud9rZa0Oz6C8MfGmOfW0oBaBBCoTSCTybx0dHT0G7WtojquAvl8/vMi0hXX/ORGAAEEEEAgJgLfKRQKJ8UkaypjcgesVF52hkYAAQQQQAABBBBAAAEEEEAAgZkLbJ+cnNx7fHx8cuat6BBXAdu2TzfGXB3X/ORGII4Cxpi3lEql/6wl+44HsLYaY3h2aC2C1CJQo0DlvzHXdW+vcRnlMRXI5/N/EZGFMY1PbAQQQAABBOIisH3OnDl7Dw0N8YOoiF4x7oAV0QtDLAQQQAABBBBAAAEEEEAAAQRSIKAi8i9visdv5hM8z7spfrFJ3CgB27YXGmMq7znyQgCB1gl82HXdd9ey3aN/1nR1dWU6OzsnRCRTSwNqEUCgJoEHPM/bq6YVFMdWYHBw8Bmq+ofYDkBwBBBAAAEEYiRgWdZxq1ev/mGMIqcqKnfAStXlZlgEEEAAAQQQQAABBBBAAAEEEGiswIWe561ubEu6xU0gl8vdrarz45abvAjEVcAYUyqVSj215H/0ANayZcsOmJiY2FrLYmoRQKBmgU2e5/GYz5rZ4rkgn89nRcSLZ3pSI4AAAgggEC8BY8y7hoeH18QrdXrScgArPdeaSRFAAAEEEEAAAQQQQAABBBBAoOEC13uet6ThXWkYKwHHcb4jIifGKjRhEYi3wEbXdU+pZYRHD2D19PQ8r1wu84nxWvSoRaB2gTHP8yqHcnilQGBgYOAyY8zbUzAqIyKAAAIIINB2AVX9QrFY7Gp7EALsVMC27U+IyFvhQQABBBBAAAEEEEAAAQQQQAABBBCoTcAY888tW7bM27hx43RtK6lOkoDjOPx8LUkXlFniIHCr67qLagn66AGs7u7uV1uW9aVaFlOLAAK1CRhjLnJdd6i2VVTHVSCfz/+3iDw/rvnJjQACCCCAQMwE/looFJ4as8ypiZvNZj9tjFmemoEZFAEEEEAAAQQQQAABBBBAAAEEEGiggGVZx5ZKpZ80sCWtYiaQy+XerKqfills4iIQZ4EJ13XniIiGHeLRA1i2bb9NRD4ediF1CCBQu4CqOr7v80i62ulit2L58uUd8+bNu09EKr8p80IAAQQQQACBFggYYw4aHh7+Ywu2YosaBRzHuVxV31DjMsoRQAABBBBAAAEEEEAAAQQQQAABBP5HYKXneZeAkV4B27ZfaIz5XnoFmByB1gtMTEzsOz4+fmfYnR89gOU4zodU9cKwC6lDAIHaBaanp5935ZVX/rj2layIm0A+nz9aRH4et9zkRQABBBBAIOYC3YVCYUPMZ0hk/O7u7vWWZZ2TyOEYCgEEEEAAAQQQQAABBBBAAAEEEGiyQBAEXx0bG3tVk7ehfYQFbNveyxhzr4g8esYjwnGJhkBSBBa7rvvTsMM8+h9nLpf7bBAEy8IupA4BBGoX6OjomLd+/frKH4y8Ei4wODh4nqp+JuFjMh4CCCCAAAKRElDVS4rF4spIhSLMwwK2bZdExIEDAQQQQAABBBBAAAEEEEAAAQRSJFB5aBNHRRp1wf+xaNGifYaGhoJGNaRP/AQcx6nc/f/A+CUnMQLxFDDGnFkqla4Om/6xd8D6qqqeEXYhdQggULPAHZ7nPaXmVSyIpcDAwMCnjDFvjmV4QiOAAAIIIBBTgSAINo6MjJwS0/iJjp3NZseMMUsTPSTDIYAAAggggAACCCCAAAIIIIAAAk0UMMY8x3XdXzRxC1pHXMC27euNMS+PeEziIZAkgTe6rnt52IEePYBl2/Z/i8jzwy6kDgEEahb4sed5z6t5FQtiKZDP5/k9NZZXjtAIIIAAAjEXuH/OnDnz+CRg9K6i4zjjqvq66CUjEQIIIIAAAggggAACCCCAAAIIIBAPAVVd4fv+x+ORlpTNEMjlch9T1fOb0ZueCCDweIEgCN7r+/5/hLV57B2wfqeqzwy7kDoEEKhNQFWv8n2fN51qY4trtcnn8/eJyJ5xHYDcCCCAAAIIxFXAsqzDVq9e/du45k9q7u7u7i9alvWapM7HXAgggAACCCCAAAIIIIAAAggggECzBVR1g+/73c3eh/7RFbBt+63GmE9ENyHJEEicwMdd110RdqrH3gHrXhF5UtiF1CGAQG0CqvoR3/cvqG0V1XEUGBwcPFhVfx/H7GRGAAEEEEAgAQJ2oVDwEzBHokZwHIdH3ifqijIMAggggAACCCCAAAIIIIAAAgi0WkBVf+v7/mGt3pf9oiPQ3d394kwm883oJCIJAokXGHdd9/Vhp3z4AFZXV1dnZ2fnQyLy6IGssA2oQwCB0AJ9nud9NHQ1hbEVyOfzZ4jIV2M7AMERQAABBBCIt8BHCoUCh94jdg1t275WRJZELBZxEEAAAQQQQAABBBBAAAEEEEAAgTgJBLNnz9573bp1D8QpNFkbJ7Bs2bIDJicntzauI50QQKCKwHdd131RWKWHD1w5jrO/qv417CLqEECgdgHLss4qlUpfrH0lK+ImkM/nLxSRD8UtN3kRQAABBBBIiMA3C4XCqQmZJTFj2Lb9dRF5WWIGYhAEEEAAAQQQQAABBBBAAAEEEECgDQJBEJw4Njb2vTZszZYREXAc5z4R2SsicYiBQNIFfuu6bug7Dz58AKu7u/vZlmX9IukyzIdAOwUsyzq2VCr9pJ0Z2Ls1Avl83hORbGt2YxcEEEAAAQQQ2EHgzkKhsC8q0RJwHGejqp4UrVSkQQABBBBAAAEEEEAAAQQQQAABBGIncL7neZfFLjWBGybgOM6PReS5DWtIIwQQ2JXAfa7r7h2W6OEDWEuXLn1JJpP5RthF1CHw/9m78zg5qnr9499TPZkwQXaMbLIJAtddNhWQIOhP7uUqLiNMV/UwIERlESKZ7gkqNgo41YOioKiAceiuUxPu4HZd0AtiVFAB4wU3FFQEWZRFNklgkqnzezXXCGqY3rvrVH3m3z7ne57n3SGamTNdCDQuMDMzs3B6evr+xneywzaBQqHwUxF5hW25yYsAAggggEBSBDKZzDbnnnvun5PSJwk9XNf9kYi8Kgld6IAAAggggAACCCCAAAIIIIAAAgj0SsAY84UwDI/r1fmc23sBz/MCEXF7n4QECKRDoK+vb2BycvKJetqufwThO4wxl9ezgTUIINCUwBNa6wUiYprazaaOCFT/AuzAG6IKhUL1oz836UhohiKAAAIIIIBATQFjzGGlUuk7NReyoGsCnuf91BjDBfWuiXMQAggggAACCCCAAAIIIIAAAggkVOAmrTXfY0nom1tPLc/zPiwiH6xnLWsQQKB1gSiKdg7D8I56Jj11Act13ZNE5FP1bGANAgg0JXC71nrXpnayySqBfD6/nVLqbqtCExYBBBBAAIHkCZzm+/4nk1fL3kau6/5KRPaytwHJEUAAAQQQQAABBBBAAAEEEEAAgVgIrJ03b96m9X4aSywSE6KtAp7nHSsiy9s6lGEIIPCsAkqpV1UqlevrIVr/CVhFY8yH6tnAGgQQaErgx1rrVze1k01WCYyOjh7sOM5Kq0ITFgEEEEAAgYQJGGM+XyqVjk9YLavruK77OxHhFxKsfhc7E776ibRPfWOCLwQQQAABBBBAAAEEEEAAAQQQqEtAKbV3EAQ/rWsxixIn4HneIhH5buKKUQiB+Aq8OQiC/64n3voLWBcaY06uZwNrEECgKYGvaq2PbGonm6wSyOfz71RKXWpVaMIigAACCCCQPIEbfN/fP3m17G3kuu5dIrK9vQ1IjgACCCCAAAIIIIAAAggggAACCMRDQCl1QhAE/CwqHm9H11Mce+yxz1+7du2dXT+YAxFIqYBSanGlUrmknvrrH0EYishQPRtYgwACjQs4jnNJpVJZ3PhOdtgmUCgUfBHJ25abvAgggAACCCRM4BHf9zdPWCer67iue7+IbG11CcIj0EEBPgmsg7iMRgABBBBAAAEEEEAAAQSSJ3CR1vqk5NWiUT0CxWLR+e1vf7taRObXs541CCDQmoAxZpnWeryeKesvYH1TRA6vZwNrEECgKYGztdYfbGonm6wSyOfz00qpt1sVmrAIIIAAAggkUGB2dvZ555133n0JrGZlJdd1HxWRTawMT2gEEEAAAQQQQAABBBBAAAEEEEAgRgLGmB+FYfiaGEUiSpcFPM+7VUR27/KxHIdAKgWMMSWtdaGe8usvYF0nIvwlXY8YaxBoTuBkrfWnm9vKLpsERkdHb3AcZ1+bMpMVAQQQQACBJApEUXTgxMRE9d85fMVAwHXdGRGZF4MoREAAAQQQQAABBBBAAAEEEEAAAQRsF3hYa72F7SXI37yA67rfUkr9v+YnsBMBBOoVcBzn0nK5fEI969dfwPq5iLy4ng2sQQCBpgQGtdZXNLWTTVYJFAqFe0VkG6tCExYBBBBAAIEEChhjjiuVSl9IYDXrKlU/Fv22226btS44gRFAAAEEEEAAAQQQQAABBBBAAIGYCkRR9NypqakHYhqPWB0W8DzvsyLyrg4fw3gEEBARpdQXK5VKXU/AWn8B6w4R2RE9BBDojIAx5uAwDL/fmelMjYvAKaecMn/BggVrqn8PxyUTORBAAAEEEEirgFLqo+Pj42ektX+cei9ZsmTgvvvuWx2nTGRBAAEEEEAAAQQQQAABBBBAAAEEbBbIZDKvKZfLP7K5A9mbF8hmsx9wHOcjzU9gJwII1CuglPpupVJ5XT3r11/AelhENqtnA2sQQKBxgSiKXjw1NfXLxneywyaBsbGx3Ywxt9mUmawIIIAAAggkWOCLvu/X9VspCTaIRbXh4eGtZmdn+Y3MWLwbhEAAAQQQQAABBBBAAAEEEEAAgYQI5LTWQUK6UKNBgWw2O+I4Dp/+36AbyxFoUuDmIAheXs/e6gUs5bruOhFx6tnAGgQQaFwgk8nsUC6X7258JztsEhgbG1tkjPmuTZnJigACCCCAQIIFbvZ9v65/FCXYIBbVhoeHd5ydna1+6jJfCCCAAAIIIIAAAggggAACCCCAAAJtEFBKnRUEQbENoxhhoYDruocqpa62MDqREbBR4M4gCHaqJ3j18tWmIvJIPYtZgwACzQnMzMxsMj09/dfmdrPLFoF8Pu8qpfhtA1veMHIigAACCCRd4GHf97dIekkb+uVyub2iKPqVDVnJiAACCCCAAAIIIIAAAggggAACCNggoJTSQRB4NmQlY/sFPM/bQ0R+3f7JTEQAgQ0I/DUIgk3qkVFHH3308zOZzJ31LGYNAgg0JbBOa90vIqap3WyyRmBsbOx0Y8x51gQmKAIIIIAAAskX2Nz3fX7ZpMfvcy6X2yeKoht7HIPjEUAAAQQQQAABBBBAAAEEEEAAgSQJ3KC13j9JhehSv8DixYsXrF69+vH6d7DSOoHqs+y4XRCbt+3JJ5+cPz09PVMrkBoaGnqR4zi/qLWQ1xFAoDkBY8yDYRhu3dxudtkkUCgUfBHJ25SZrAgggAACCCRc4KW+7/884R1jX29oaOhgx3FWxj4oARFAAAEEEEAAAQQQQAABBBBAAAF7BB7SWm9pT1yStlvA87y/iAhPAGg3LPMQ2IDARhtttM2ll17651o4yvO81xhjrqu1kNcRQKA5AaXU74Ig2K253eyySSCfz08qpY6xKTNZEei4QPV2fvWWPl8IIIBAbwSO8H3/G705mlPXC2Sz2X9XSvE+8EcCAQQQQAABBBBAAIE6Bfh2Sp1QLEMAAQRSLjAzM7PV9PR09RIOXykU8DzvZhF5aQqrUxmBrgv09fXtNTk5WfOxn9ULWG80xlzZ9YQciEB6BFZprfdJT930Ns3n81cqpd6YXgGaI4AAAgggEC8BY8xJpVLponilSl+aXC43GEXRf6WvOY0RQAABBBBAAAEEEEAAAQQQQACBzglkMpn9y+XyDZ07gclxFnBd91tKqf8X54xkQyBBAgcEQfDDWn2U67pHiciKWgt5HQEEmhMwxlwThuGhze1ml00Co6OjP3EcZ2+bMpMVAQQQQACBhAuUfN8vJLxj7Otls9kRpdQXYh+UgAgggAACCCCAAAIIIIAAAggggIBdAq7WOrQrMmnbJZDL5crGmFy75jEHAQSeXUAp9R+VSuWbtYyqn4B1vDHmkloLeR0BBJoTiKLov6empt7c3G522SQwNjb2B2PMTjZlJisCCCCAAAJJFlBK6eqNKWsAACAASURBVPHxcS/JHW3o5rruiSLyaRuykhEBBBBAAAEEEEAAAQQQQAABBBCwSOBDWusPW5SXqG0U8DxvQkSWtnEkoxBA4FkElFLvqFQq07WAqhewTjXGfKLWQl5HAIGmBS7XWh/d9G42WiNQKBQeEZFNrQlMUAQQQAABBJIv8B3f9w9Lfs14N3RdNy8ifrxTkg4BBBBAAAEEEEAAAQQQQAABBBCwTuBzWut3W5eawG0R8DxvVERKbRnGEAQQmFPAGPNOrfXyWkzVC1gFY8x4rYW8jgACTQtMaq2PbXo3G60QKBaLzpo1a9aKiGNFYEIigAACCCCQAgFjzC9LpdKLU1A11hU9zysaYz4U65CEQwABBBBAAAEEEEAAAQQQQAABBOwT+KrW+kj7YpO4HQKu6x6jlJpsxyxmIIDA3AJRFJ0ahuEFtZyqF7D4ZngtJV5HoAUBpdRngiCoPnaFrwQLFAqFzUTk4QRXpBoCCCCAAAI2Cjzo+/7WNgZPUuahoaHzHcc5LUmd6IIAAggggAACCCCAAAIIIIAAAgjEQODHWutXxyAHEXog4HneG0Xkyh4czZEIpFHg/UEQnFuruHJdt/ooiOojIfhCAIG2CxgxRj4ehuHpbR/NwFgJFAqFHUXkjliFIgwCCCCAAAIImIGBgY2KxeIMFL0TyOVyn4+i6LjeJeBkBBBAAAEEEEAAAQQQQAABBBBAIJECf9Ba75LIZpSqKeB53itFZFXNhSxAAIGWBYwxH9Van1FrUPUC1idF5L21FvI6Agg0LXCO1voDTe9moxUChULhJSLyMyvCEhIBBBBAAIEUCRhjnl8qle5KUeXYVc1ms1copd4Wu2AEQgABBBBAAAEEEEAAAQQQQAABBOwWeEJrPWB3BdI3K+C67g5KqT82u599CCDQkMCngiA4pdYOlcvlLo6i6IRaC3kdAQSaFviA1vqcpnez0QqBpUuXvjqTyfzQirCERAABBBBAIEUCSql9xsfH+U2wHr7n2Wz2f5RSr+9hBI5GAAEEEEAAAQQQQAABBBBAAAEEEikwMzOz+fT09COJLEepOQWWLFkycP/996+GCQEEOi8QRdEXwjCs+ZSH6idglUUk1/lInIBAOgWUUqcHQfDxdLZPT+uxsbHXGWO+k57GNEUAAQQQQMAOAWPMG0ql0lV2pE1mStd1rxeR/ZLZjlYIIIAAAggggAACCCCAAAIIIIBA7wSUUnsGQfCb3iXg5F4KeJ63RkQ26mUGzkYgJQLTQRC8o1ZX5XnetDHm7bUW8joCCDQnYIw5JQzDTzW3m122CBQKhf8Qka/bkpecCCCAAAIIpEVAKXX0+Pj45WnpG8eeruveIiJ7xjEbmRBAAAEEEEAAAQQQQAABBBBAAAGbBaIoWjQ1NfU9mzuQvXkBz/PuEZFtm5/ATgQQqFPgW0EQHF5rbfUTsKoXBqoXB/hCAIEOCBhjTgzD8DMdGM3IGAmMjY29zRhzRYwiEQUBBBBAAAEEREQp9Z7x8fHPgtE7Add1+UZQ7/g5GQEEEEAAAQQQQAABBBBAAAEEEiyglDoqCIL/SnBFqs0h4HneL0Xk30BCAIGOC1wbBMFBtU6pfgLW1caYQ2st5HUEEGhOQCn17iAIPtfcbnbZIpDP512lVGBLXnIigAACCCCQIoH3+75/bor6xq6q67qPi8iC2AUjEAIIIIAAAggggAACCCCAAAIIIGC5gDHm1DAML7C8BvGbFPA871oROaDJ7WxDAIH6BW4KguAVtZZXPwHrOhF5Ta2FvI4AAs0JKKXeFQTBxc3tZpctAmNjY8cbYy6xJS85EUAAAQQQSItAFEXnTUxMjKalb9x6Llq0qG/77bdfG7dc5EEAAQQQQAABBBBAAAEEEEAAAQSSIKCUOjcIgvcnoQsdGhfI5XJfM8Yc0fhOdiCAQIMCvwuCYLdae1Q2m12llHplrYW8jgACzQkopU4IguDS5nazyxaBQqHwHhG5yJa85EQAAQQQQCAtAsaYz5dKpePT0jduPQcHB7fs7+9/MG65yIMAAggggAACCCCAAAIIIIAAAggkQcAYc2kYhickoQsdGhfI5XJlY0yu8Z3sQACBBgXuCoLg+bX2VD8Bi+eC1lLidQRaE3in1np5IyOUiJhGNrC25wL5fP5EpdSnex6EAAgggAACCCDwDwLGmCtKpdIgLL0RyGazuyqlfteb0zkVAQQQQAABBBBAAAEEEEAAAQQQSLaAMWZFGIZDyW5Ju2cTyOVynzTGvBchBBDouMD9QRAsrHWK8jzvNmNMzY/KqjWI1xFAYMMCxphjwzCcxCfZAoVC4SQR+VSyW9IOAQQQQAAB+wSMMd8olUp8DHeP3rpcLrdPFEU39uh4jkUAAQQQQAABBBBAAAEEEEAAAQSSLvB1rfV/Jr0k/TYs4LruuUqpZfgggEDHBR4NgmCzWqdUPwHrdhHZudZCXkcAgeYEjDHHhGFYbm43u2wRyOfzJyulLrQlLzkRQAABBBBIi0AURSsnJiYOSUvfuPX0PO+Nxpgr45aLPAgggAACCCCAAAIIIIAAAggggEASBIwx14RheGgSutChcQHXdd+vlDq78Z3sQACBBgWeDIJgo1p7qhew7hCRHWst5HUEEGhOwBgzHIZhpbnd7LJFYHR09BTHcS6wJS85EUAAAQQQSJHADb7v75+ivrGq6rpuVkR0rEIRBgEEEEAAAQQQQAABBBBAAAEEEEiOwA1aa773lZz3s6EmnuedKiKfaGgTixFAoBkBEwSBU2tj9QLWXSKyfa2FvI4AAs0J8AjC5txs28UFLNveMfIigAACCKRFwBjzi1Kp9JK09I1bz2w2+16l1Cfjlos8CCCAAAIIIIAAAggggAACCCCAQEIEfqm1fnFCulCjQQHP844XkUsa3MZyBBBoQuCWW27pX7Vq1dq5tlYvYN0rIts0MZ8tCCBQn8BirTX/w1eflbWreAShtW8dwRFAAAEEEi5gjLm9VCrtmvCasa3neV7RGPOh2AYkGAIIIIAAAggggAACCCCAAAIIIGC3wB+01rvYXYH0zQrkcrmjjTFTze5nHwII1C+w6aabbnLRRRf9da4dyvO8+4wxz61/LCsRQKBBgZO01hc1uIfllgkUCoUTRORiy2ITFwEEEEAAgTQI/Mn3/W3TUDSOHT3Pu9AYc3Ics5EJAQQQQAABBBBAAAEEEEAAAQQQsF1AKXV/EAQLbe9B/uYEcrncfxpj/ru53exCAIFGBBzH2bpcLj841x6VzWYfUEpt1chg1iKAQP0CSqnTgiDgsSv1k1m5cnR0dMRxnC9YGZ7QCCCAAAIIJFvgQd/3t052xfi2c103FJGh+CYkGQIIIIAAAggggAACCCCAAAIIIGC1wBqt9QKrGxC+aYGhoaHXZTKZ7zQ9gI0IINCIwHZBEFSfMPisX9VHED4kIps3MpW1CCBQv4BSajQIgvPq38FKGwVGR0eHHMep/oCRLwQQQAABBBCIl8Ajvu/z750evSeu635bRN7Qo+M5FgEEEEAAAQQQQAABBBBAAAEEEEi6gJmZmZk3PT09m/Si9PtXgVwut78x5sfYIIBA5wWUUrtWKpXb5zqpegHrURHZpPNxOAGB1AqcobX+aGrbp6T42NjY24wxV6SkLjURQAABBBCwSeCvvu/z750evWOu6/5ERPbu0fEciwACCCCAAAIIIIAAAggggAACCCReYGZmZpPp6em/Jr4oBf9F4Oijj35FX1/fT6FBAIGuCOwZBMFv5jqpegGr+pfxxl2JwyEIpFPgQ1rrD6ezenpaj46OHuE4ztfS05imCCCAAAIIWCPwhO/7A9akTVhQ13V/JyK7JqwWdRBAAAEEEEAAAQQQQAABBBBAAIHYCMybN2/bycnJP8UmEEG6JnDMMce8aHZ29hddO5CDEEixgOM4LyuXyz+bi6B6AWu1iPADiRT/QaF6xwXO1lp/sOOncEBPBZYuXXpYJpO5qqchOBwBBBBAAAEENiSwzvf9edD0RoBPXO6NO6cigAACCCCAAAIIIIAAAggggEB6BGZnZ3dZsWLFH9LTmKbrBTzP201EbkMEAQQ6LxBF0T5hGK6a66TqBawZEeEHEp1/PzghvQITWut8euuno/myZcv2j6KIZyyn4+2mJQIIIICAXQLG933HrsjJSLt48eIFjz/++OPJaEMLBBBAAAEEEEAAAQQQQAABBBBAIJ4CxpidwzC8I57pSNVJgWw2u5PjOFy+6yQysxH4m4BSat9KpfKTuUCqF7DWiUgGNQQQ6IyAUuozQRCc2JnpTI2LwLJly/aMouiWuOQhBwIIIIAAAgg8LfC3C1gGk+4K5HK5XaIo+n13T+U0BBBAAAEEEEAAAQQQQAABBBBAIF0CmUxmp3K5fGe6WtO2KuB53rYicg8aCCDQeYG+vr79Jicnb5zrpOoFrFkR4TfCO/9+cEJ6BQKtdS699dPRfMmSJdv39/fflY62tEQAAQQQQMAqgVnf9/usSpyQsLlcjk8ITch7SQ0EEEAAAQQQQAABBBBAAAEEEIivwOzs7I4rVqz4Y3wTkqxTAsPDw1tFUfRAp+YzFwEEnhZQSr2qUqlcP5dJ9QLWWhHhBxL8yUGgQwJRFH15amrqrR0az9iYCOTz+U2UUo/GJA4xEEAAAQQQQOBpgRnf9+cD0n0Bz/PeZIz5avdP5kQEEEAAAQQQQAABBBBAAAEEEEAgPQKZTGaHcrl8d3oa03S9wIknnvicRx999DFEEECg8wLGmFdrrX8810nK87wnjDH8QKLz7wcnpFTAGHNVGIZvSGn9NNVWhUKheqGVR7qm6V2nKwIIIICADQKrfd/f2IagScvouu4JInJx0nrRBwEEEEAAAQQQQAABBBBAAAEEEIiTwPz587dfvnw5j6GL05vSpSwjIyMbrVu3bk2XjuMYBNIucEAQBD+cC6H6CViPi8iCtEvRH4FOCRhjfhSG4Ws6NZ+58REoFAp/EZEt4pOIJAgggAACCCAgIo/5vr8pEt0XyGazH1BKfaT7J3MiAggggAACCCCAAAIIIIAAAgggkB4BpdR2QRDcm57GNF0vwAUs/iwg0D0BY8yBWuvr5jqxegGr+sisTboXi5MQSJ3Az7XWL01d6xQWLhQKt4rI7imsTmUEEEAAAQTiLPCw7/tckO7BO+S67gUickoPjuZIBBBAAAEEEEAAAQQQQAABBBBAIDUC8+bN23ZycvJPqSlM0b8LcAGLPwwIdE/AcZyDyuXytXOdWL2A9ZCIbN69WJyEQOoEbtda75q61iksnM/nr1NK8WlnKXzvqYwAAgggEGuBB3zff26sEyY0nOu6K0TkqITWoxYCCCDQdQEjIqrrp3IgAggggAACCCCAAAIIxF1gYGBgm0svvfTPcc9JvvYLcAGr/aZMRODZBKIoOjgMw+/PJVS9gHW/iGwNIwIIdEzgAa01P/TrGG98Bo+Ojn7FcZw3xycRSRBAAAEEEEDAGPPHUqm0IxLdF3Bd9xoROaT7J3MiAggggAACCCCAAAIIIIAAAgggkB4BLmCl573+56ZcwErve0/z7gsopRZVKpXvzXVy9QJW9Xmw23Q/HicikBqBWa31PBGp/rIqXwkWyOfzlyiljk9wRaohgAACCCBgo8BvfN/f08bgtmd2XfeXIvJvtvcgPwIIIIAAAggggAACCCCAAAIIIBBnAcdxnlepVO6Lc0aydUaAC1idcWUqAs8icEgQBCvn0lHZbPZupdR2ECKAQOcE5s2bt8Xk5OTDnTuByXEQGBsbO9cYsywOWciAAAIIIIAAAn8X+F/f91+JR/cFXNd9REQ27f7JnIgAAggggAACCCCAAAIIIIAAAgikRyCKoudOTU09kJ7GNF0vwAUs/iwg0D2B2dnZQ6empqpPfXjWr+onYN0hIjySo3vvCyelUGDdunW7XX755b9LYfVUVc7n86cppc5PVWnKIoAAAgggEHMBY8x1pVLpwJjHTFy8wcHB5/T39z+WuGIUQgABBBBAAAEEEEAAAQQQQAABBOInsJnW+tH4xSJRpwUOP/zw+VtttdUTnT6H+QggIGKMOUxr/Z25LKoXsH4vIrsAhgACnRNYt27dfpdffvmNnTuByXEQyOfzb1dKTcchCxkQQAABBBBA4O8CV/m+/wY8uivged4exphfd/dUTkMAAQQQQAABBBBAAAEEEEAAAQRSJ2B23333vmKxGKWuOYVl8eLFC1avXv04FAgg0BWB2o8g9DzvNmPMbl2JwyEIpFRAKXV4EATfSmn91NRetmzZ/lEU/Tg1hSmKAAIIIICABQJRFH11YmLiSAuiJiri0NDQ6xzHmfO3gRJVmDIIIIAAAggggAACCCCAAAIIIIBAbwQe01pv2pujObXXAoODg5vNnz//4V7n4HwE0iBgjDlQa33dXF2rn4BV/a3kPdIAQkcEeijgaq3DHp7P0V0QWLJkyfb9/f13deEojkAAAQQQQACBOgWMMZVSqTRc53KWtUkgm83mlFLlNo1jDAIIIIAAAggggAACCCCAAAIIIIDAhgXu1lrvAE46BYaGhrbOZDL3p7M9rRHoroBS6lWVSuX6uU6tXsD6hYi8qLvROA2B1Am8V2t9Yepap6zw4OBgZtddd10jIvNSVp26CCCAAAIIxFbAGHNBqVQ6NbYBExrM87yCMWY8ofWohQACCCCAAAIIIIAAAggggAACCMRF4Nda673iEoYc3RXwPG9bEbmnu6dyGgLpFIiiaJ8wDFfN1V5ls9lVSqlXppOI1gh0R8AYUwzD8KzunMYpvRQoFAp3iMiOvczA2QgggAACCCDwtIBS6qzx8fEiJt0VcF33AhE5pbunchoCCCCAAAIIIIAAAggggAACCCCQOoEbtNb7p641hZ8SGB4e3jGKourPJvlCAIHOC7w8CIKb5zqm+glY14rIAZ3PwgkIpFrgIq31SakWSEn5QqHwAxE5MCV1qYkAAggggIANAqf5vv9JG4ImKePQ0NCXHMd5S5I60QUBBBBAAAEEEEAAAQQQQAABBBCIocDVWuvXxzAXkbogcNRRR71g3rx5v+3CURyBQOoFjDEv0lr/ai6I6gWsq0TksNRrAYBABwWiKPry1NTUWzt4BKNjIlAoFC6rXjiPSRxiIIAAAgggkHoBY8xwqVSqpB6iywCu614vIvt1+ViOQwABBBBAAAEEEEAAAQQQQAABBNIm8CWt9dvSVpq+/ycwMjKy57p1627BAwEEOi/gOM4e5XL51rlOUkNDQ191HOdNnY/DCQikWuDHWutXp1ogJeVHR0fPdByHx02m5P2mJgIIIIBA/AWiKPrPiYmJr8c/abISuq77RxHZIVmtaIMAAggggAACCCCAAAIIIIAAAgjESyCKosumpqZG4pWKNN0ScF33JUqpn3XrPM5BIM0CURS9IAzD389lUP0ErMtF5B1phqI7Al0QuENrvXMXzuGIHguMjo4OOY4T9jgGxyOAAAIIIIDA0wIH+L7/Q0C6J7D33nvP23PPPdeISKZ7p3ISAggggAACCCCAAAIIIIAAAgggkEqBC7TWp6ayOaVleHh4vyiKqp9EzxcCCHRYwHGcncrl8p1zHVO9gPWF6qfTdTgL4xFIu8CM1nojETFph0h6/3w+v59Siv+jk/Q3mn4IIIAAAtYIKKVeMD4+PudvpVhTxpKguVxulyiKMLfk/SImAggggAACCCCAAAIIIIAAAghYLXC21vqDVjcgfNMC2Wz2EMdxrml6ABsRQKARge2CILh3rg3K87yLjDHvaWQqaxFAoHGBTCazdblcfrDxneywSWBsbGwLY8xfbMpMVgQQQAABBJIsMDs7+5zzzjvv8SR3jFu3oaGhgx3HWRm3XORBAAEEEEAAAQQQQAABBBBAAAEEEihQ0FqXEtiLSnUIuK57hFLqa3UsZQkCCLQo8OSTTy6cnp6+f64xKpvNfkwp9b4Wz2I7AgjUEHAc5yWVSuUXQCVfoFAoPCAiWyW/KQ0RQAABBBCIvcBjvu9vGvuUCQvouu4xIjKZsFrUQQABBBBAAAEEEEAAAQQQQAABBGInoJQ6LgiC6hOv+EqhgOd57xCRy1NYncoIdF0giqItwzB8aK6Dq48gPFtE3t/1dByIQMoElFJvCILgqpTVTmXdfD7/faXUQaksT2kEEEAAAQTiJXCr7/t7xCtS8tO4rnumiJyV/KY0RAABBBBAAAEEEEAAAQQQQAABBHor4DjOGyuVyrd7m4LTeyXged6xIrK8V+dzLgJpElBKPadSqcz5tI3qJ2CdoZQ6J00wdEWgRwIjWuvLenQ2x3ZRoFAoXCQiPNq1i+YchQACCCCAwLMIfN/3/YPR6a6A53mXGmPe2d1TOQ0BBBBAAAEEEEAAAQQQQAABBBBIn0AURS+bmpr6Wfqa07gq4HneySJyIRoIINBxAbPbbrv1FYvFaK6TlOd57zPGfKzjcTgAgZQLGGPODMPwIylnSEX9QqFwkoh8KhVlKYkAAggggECMBYwxV5RKpcEYR0xkNM/zrjbGHJrIcpRCAAEEEEAAAQQQQAABBBBAAAEEYiSQyWS2LpfLD8YoElG6KOB5XkFExrt4JEchkFaBJ4IgGKhVvvoIwneLyGdqLeR1BBBoTUAp9fkgCI5vbQq7bRAYGxtbZIz5rg1ZyYgAAggggEDCBT7u+/7pCe8Yu3qu694qIrvHLlgsAxkRUbFMRigEEEAAAQQQQAABBBBAAAEEEIi3gFLqyb9dCKh+g4GvFArkcrmzqh8CksLqVEagqwJKqb9UKpWtah1avYB1jIhM1lrI6wgg0JqAUuo7QRAc1toUdtsgcPrpp2/d19d3vw1ZyYgAAggggECSBYwxp5ZKpQuS3DGG3ar/xlwtIhvFMBuREEAAAQQQQAABBBBAAAEEEEAAgSQJ3K613jVJhejSmEAul/ukMea9je1iNQIINCFwdxAEO9TaV/3m+NtFZLrWQl5HAIHWBJRSvwuCYLfWprDbFoF8Pn+PUmpbW/KSEwEEEEAAgYQKHOn7/lcT2i2WtUZGRrZZu3btvbEMRygEEEAAAQQQQAABBBBAAAEEEEAgWQI/1FofkKxKtGlEIJvNXuY4znAje1iLAAJNCdwWBMELa+1Unue93hjzP7UW8joCCLQsMLP77rsPFIvFqOVJDIi9QD6f/6ZS6vDYByUgAggggAACCRaIougVExMTNyW4Yuyqua5b/abftbELRiAEEEAAAQQQQAABBBBAAAEEEEAgYQJKqekgCN6RsFrUaUDA87zqL5++qYEtLEUAgeYEbg6C4OW1tqqjjjpq376+vhtqLeR1BBBoXSCTyexQLpfvbn0SE+IuMDY2drYx5v1xz0k+BBBAAAEEkiyglNpyfHz8oSR3jFu3bDY7rJS6LG65yIMAAggggAACCCCAAAIIIIAAAggkTSCKok9MTU0tSVov+tQv4Hne90TktfXvYCUCCDQj4DjOj8vl8qtr7VXDw8MvnJ2d/U2thbyOAAKtCyilDgiC4IetT2JC3AXy+fxblVJfjHtO8iGAAAIIIJBggUd9398swf1iWc113bNE5MxYhiMUAggggAACCCCAAAIIIIAAAgggkCyBgta6lKxKtGlEwPO8n4nISxrZw1oEEGhcQCl1TaVSObTWTnX88cc/b82aNX+qtZDXEUCgLQKu1jpsyySGxFpgbGxsZ2PM7bEOSTgEEEAAAQSSLXCT7/uvSHbF+LVzXVeLSDZ+yUiEAAIIIIAAAggggAACCCCAAAIIJE4gp7UOEteKQnULuK57p1Lq+XVvYCECCDQr8I0gCI6otVmNjIxstHbt2jW1FvI6Agi0LmCM+WAYhme3PokJNggUCoX7RWRrG7KSEQEEEEAAgaQJGGP+q1QqHZW0XnHv47ruj0Vk/7jnJB8CCCCAAAIIIIAAAggggAACsRIwIqJilYgwFghEUXTo1NTUNRZEJWKHBDzPe1RENunQeMYigMDTAtNBELyjFshT/1Pued4Txpj5tRbzOgIItCZgjCmHYXhMa1PYbYtAoVD4HxF5vS15yYkAAggggEDCBM72ff+DCesU+zrZbPYBpdRWsQ9KQAQQQAABBBBAAAEEEEAAAQQQQMBygUwms1O5XL7T8hrEb1Jg0aJFfTvssMMM1zebBGQbAg0IRFFU1z2Ppy5gua77ZxFZ2MB8liKAQHMC12utX9XcVnbZJpDP58eVUgXbcpMXAQQQQACBJAhEUXTMxMREOQldbOkwMjKy+dq1ax+yJS85EUAAAQQQQAABBBBAAAEEEEAAAYsF1uy+++7PKRaLkcUdiN6CwMjIyDbr1q27t4URbEUAgToFjDGf1Vq/p9by9RewbhWR3Wst5nUEEGhZ4CGt9ZYtT2GAFQL5fP5IpdSXrQhLSAQQQAABBBImYIx5dalUqj4Oj68uCeRyuX2iKLqxS8dxDAIIIIAAAggggAACCCCAAAIIIJBmgZu11i9PM0Dau3ue9zIRuSntDvRHoEsCfhAEY7XOeuoCVjabvVEptU+txbyOAAKtC8zMzCycnp6+v/VJTIi7wNKlSxdmMpnqJwzyhQACCCCAAAJdFpiZmdnq/PPP/0uXj031ca7rHiUiK1KNQHkEEEAAAQQQQAABBBBAAAEEEECgCwJKqekgCN7RhaM4IqYCnue9XkT+J6bxiIVAogSUUmdUKpWP1iq1/hOwrhKRw2ot5nUEEGiLwIFa6+vaMokhsRfI5/O/V0rtEvugBEQAAQQQQCBZAvf7vs8j1rv8nmaz2TOUUud0+ViOQwABBBBAAAEEEEAAAQQQQAABBNIocI7W+gNpLE7n/xPwPM8VkQAPBBDoisCJQRB8ptZJ6z8B6wql1NtqLeZ1BBBoXUApdVwQBF9ofRITbBAoFAq6+kGDNmQlIwIIIIAAAgkS+I7v+/yCSZff0Gw2e5lSarjLx3IcAggggAACCCCAAAIIIIAAAgggkEaBsvNUxwAAIABJREFUnNaayzdpfOf/1jmbzS5xHOfjKSagOgJdEzDGuFrrsNaBT13AyuVyn4+i6Lhai3kdAQTaIjCutV7WlkkMib1APp8/WSl1YeyDEhABBBBAAIFkCXzC9/0lyaoU/zau614vIvvFPykJEUAAAQQQQAABBBBAAAEEEEAAAbsFMpnM/uVy+Qa7W5C+FQHXdc9VSvEz51YQ2YtA/QJHBEHwjVrL138C1seUUu+rtZjXEUCgdYEoir48NTX11tYnMcEGgbGxsb2NMT+xISsZEUAAAQQQSIpAFEXvnJiYWJ6UPrb0cF33YRHZzJa85EQAAQQQQAABBBBAAAEEEEAAAQRsFZg3b94Wk5OT1e/F8JVSAc/zLhWRd6a0PrUR6KqA4zgHlcvla2sduv4C1hlKqXNqLeZ1BBBoi8CvtdZ7tWUSQ2IvUCwW+1avXv2wUmrj2IclIAIIIIAAAgkRUErtNz4+fmNC6lhRw/O8bY0x91gRlpAIIIAAAggggAACCCCAAAIIIICA3QJ/1lpvY3cF0rcqkMvlvmaMOaLVOexHAIHaAo7jvKxcLv+s1sqnLmC5rnuCiFxcazGvI4BAWwRmFy5cuMn555+/pi3TGBJ7gUKh8D8i8vrYByUgAggggAACyRCYHRgY2LRYLK5ORh07WmSz2UOUUtfYkZaUCCCAAAIIIIAAAggggAACCCCAgNUC39daH2x1A8K3LOB53k0i8rKWBzEAAQRqCjiOs1O5XL6z1sKnLmANDQ0d6TjOl2st5nUEEGiPwOzs7CtXrFjxv+2ZxpS4CxQKhTNEhE8ZjPsbRT4EEEAAgaQI3Or7/h5JKWNLj2w2+x6l1EW25CUnAggggAACCCCAAAIIIIAAAgggYKuA4ziXVCqVxbbmJ3d7BDzPu19Etm7PNKYggMBcAsaYzbTWj9ZSWn8B60DHcX5QazGvI4BAewSMMcNhGFbaM40pcRcYHR09wHGcms+EjXsP8iGAAAIIIGCDgFJKj4+PezZkTVLGoaGh8x3HOS1JneiCAAIIIIAAAggggAACCCCAAAIIxFFAKXV6EAQfj2M2MnVHYGRkZKN169ZVnwDw1H0PvhBAoKMC0W677TavWCxGtU556j/I4eHhF87Ozv6m1mJeRwCB9ggYY/wwDMfaM40pcRcoFov9q1ev/otSauO4ZyUfAggggAACtgsopd43Pj5+vu09bMvvuu6VIvJG23KTFwEEEEAAAQQQQAABBBBAAAEEELBNIIqiRVNTU9+zLTd52yeQzWZ3dRznd+2byCQEEJhD4JEgCDavR+ipC1jZbHYLpdRf6tnAGgQQaIvAN7TWR7RlEkOsECgUCleLyKFWhCUkAggggAACdgsc5Ps+nzzZ5ffQdd3bRWTnLh/LcQgggAACCCCAAAIIIIAAAggggEDaBMzMzMwW09PTj6StOH2fFvA87yAR+T4mCCDQFYE7gyDYqZ6T1n8knXJdd0ZE+urZxBoEEGhZ4E6tdV3/kbZ8EgNiIZDP5z+olPpwLMIQAgEEEEAAgeQKzM7Ozm523nnnPZ7civFrtnjx4gWPP/74YyLixC8diRBAAAEEEEAAAQQQQAABBBBAAIHkCBhjbg3DcI/kNKJJMwKe5w2JSNjMXvYggEBjAkqp/61UKq+sZ9ffnwnquu69IrJNPZtYgwACLQuYefPmbTk5Oflwy5MYYIVAoVB4jYhcZ0VYQiKAAAIIIGCpgDHml6VS6cWWxrc2di6X2yeKohutLUBwBBBAAAEEEEAAAQQQQAABBBBAwB6BUGvt2hOXpJ0QcF33dKXUeZ2YzUwEEPhHAWPM1Vrr19fj8swLWD8TkZfUs4k1CCDQFoEDtdZcyGkLZfyHFIvFvjVr1twvInU9Hzb+jUiIAAIIIIBALAUmfd8/NpbJEhwqm82OKKW+kOCKVEMAAQQQQAABBBBAAAEEEEAAAQTiIrBUa/2xuISJc47qRQgT54AtZMvlchcYY05pYQRbEUCgfoGpIAiy9Sz/+wWsbDb7HaXU6+rZxBoEEGiLwHu11he2ZRJDrBAoFApfEpG3WBGWkAgggAACCNgpsNj3/UvsjG5v6lwud14URafb24DkCCCAAAIIIIAAAggggAACCCCAgB0CxpiDwzD8vh1pSdkpgVwu9zVjzBGdms9cBBB4WkApdUGlUjm1HpNnfgLWChE5qp5NrEEAgbYITGqt+YSGtlDaMWRsbOzdxpjP2JGWlAgggAACCNgnYIz5t1KpdIt9ye1O7Lrut0XkDXa3ID0CCCCAAAIIIIAAAggggAACCCAQe4FIRLbQWj8a+6QE7KiA53m/FJF/6+ghDEcAgfUCZwZB8JF6OP5+AcvzvAuNMSfXs4k1CCDQFoGfa61f2pZJDLFCYGxsbGdjzO1WhCUkAggggAAC9gk84Pv+wgR/snhs35FsNnu3Umq72AYkGAIIIIBAlwSqD/f4+7cau3QmxyCAAAIIIIAAAgggkCqB32it90xVY8puUMDzvL+KyMbwIIBAVwRODIKgrg9ZeeYjCM9QSp3TlXgcggACVYHZjTfeeNOLL754NRzpESgUCreJyG7paUxTBBBAAAEEuiMQRdFXJyYmjuzOaZyyXmBwcHDL/v7+BxFBAAEEEEAAAQQQQAABBBBAAAEEEOisgFJKB0HgdfYUpsdd4Pjjj3/eE0888ae45yQfAkkRcBxnsFwuX1FPn2c+gvAYEZmsZxNrEECgPQKO47yqUqlc355pTLFBYHR09FOO45xkQ1YyIoAAAgggYJlAwff9kmWZrY87NDR0sOM4K60vQgEEEEAAAQQQQAABBBBAAAEEEEAg5gLGmPeFYXh+zGMSr8MCruu+Sin1ow4fw3gEEHha4JAgCOr6HvjfL2AdffTRh2YymatRRACBrgqcpLW+qKsnclhPBZYtW/bvURR9o6chOBwBBBBAAIEECkRRdODExMR1CawW60rZbPZkpdSFsQ5JOAQQQAABBBBAAAEEEEAAAQQQQCABAkqp1wZB8IMEVKFCCwKu62arn4bWwgi2IoBAAwKZTObFl1122S/r2fL3C1i5XG6vKIp+Vc8m1iCAQHsEHMdZXqlU3tmeaUyxQeCUU06Zv2DBggdE5Dk25CUjAggggAACNggYYx5fsGDBlsViccaGvEnK6LruZ0XkXUnqRBcEEEAAAQQQQAABBBBAAIHWBIyI/P0HkK2NYjcCCDwtsNZxnC0qlcrjoKRbwPO8M0TknHQr0B6B7gn09fVtOzk5WddjP5/5CMJNReSR7sXkJAQQEJGbtNavQCJdAqOjo19xHOfN6WpNWwQQQAABBDonYIy5slQq/XvnTmDyswm4rlv91LHXIIQAAggggAACCCCAAAIIIIAAAggg0FGB67TWB3b0BIZbIeB53qSIHGNFWEIiYL+Aueuuu/pXrly5rp4q/3AB3XXdR0Vkk3o2sgYBBNoisHbhwoWbnX/++WvaMo0hVgjk8/l3KqUutSIsIRFAAAEEEJhLICa/0qqUWjo+Pv4x3qzuChSLRee2226r/hty4+6ezGkIIIAAAggggAACCCCAAAIIIIBA6gTO0Vp/IHWtKfwvAsPDwz+KouhV0CCAQFcEHgqCYMt6T/rnC1i3iMie9W5mHQIItC4QRdFBU1NT17Y+iQm2CCxdunRhJpO5V0QcWzKTEwEEEEAAgTgLRFH0iomJiZvinDGJ2UZGRvZcu3Zt9d+QfCGAAAIIIIAAAgggkB6BmPwiSnrAaYoAAgggUBWIoujQqampa9BAwPO8B0RkKyQQQKArArcGQbBHvSf9wwUsz/OuNsYcWu9m1iGAQOsCSql8EAQTrU9igk0ChULhehHZz6bMZEUAAQQQQCCmAg8ODAwsLBaLUUzzJTaW67pZEdGJLUgxBBBAAAEEEEAAAQQQQAABBBBAIB4CMxtvvPEWF1988ep4xCFFrwSGhoa2zmQy9/fqfM5FIG0CSqnvViqV19Xb+x8uYGWz2cuUUsP1bmYdAgi0ReBLWuu3tWUSQ6wRyOfz71dKnW1NYIIigAACCCAQX4Fp3/ffEd94yU2WzWYnqo9/TG5DmiGAAAIIIIAAAggggAACCCCAAAKxEPi+1vrgWCQhRE8FXNc9QCnFk5V6+i5weMoEgiAIcvV2/udPwDrHGHNGvZtZhwACbRG4V2u9XVsmMcQagWXLlr0wiqLfWBOYoAgggAACCMRUIIqid05MTCyPabxEx+ITlBP99lIOAQQQQAABBBBAAAEEEEAAAQRiIqCUOisIgmJM4hCjhwKe5x0rInwvtIfvAUenS8AYU9JaF+pt/Q8XsFzXPVFEPl3vZtYhgEB7BIwxO4dheEd7pjHFFoF8Pv9zpdSLbclLTgQQQAABBGIoYIwxO5RKpXtimC3xkVzXrX7c+daJL0pBBBBAAAEEEEAAAQQQQAABBBBAoIcCURQtmpqa+l4PI3B0TAQ8zxsXkbovg8QkNjEQsFbAGLNEa/2Jegv88yMI36yU+kq9m1mHAALtEXAcZ6hSqaxozzSm2CIwNjZWNMZ8yJa85EQAAQQQQCBuAlEUrZqYmNgnbrnSkOfoo49+fiaTuTMNXemIAAIIIIAAAggggAACCCCAAAII9FDgiXnz5m0xOTn5RA8zcHRMBLLZ7JcdxzkyJnGIgUDiBRzHObpcLl9eb9F/fgThy4wxN9W7mXUIINAeAWPMJ8MwPK0905hii8DSpUtfnMlkfm5LXnIigAACCCAQQ4EP+77PZeYevDHZbJZf3umBO0cigAACCCCAAAIIIIAAAggggEC6BIwx14RheGi6WtP22QQ8z7tNRHZDCAEEuiPgOM5B5XL52npP++dHEG4qIo/Uu5l1CCDQNoHrtdavats0BlkjUCgUfiUie1kTmKAIIIAAAgjESMAYs3+pVLohRpFSEyWbzX5IKVVMTWGKIoAAAggggAACCCCAAAIIIIAAAj0QMMacGYbhR3pwNEfGTGDx4sULVq9e/ZiIODGLRhwEEiuglNq1UqncXm/Bf7iAVd2UzWYfUEptVe8A1iGAQFsEZjbeeOMtLr744tVtmcYQawTGxsbONsa835rABEUAAQQQQCAmAsaY+xYsWLBtsViMYhIpVTFc1/2aiByRqtKURQABBBBAAAEEEEAAAQQQQAABBLosEEXRQVNTU3V/+kqX43FcFwVGRkb2XbduHb+M2kVzjkq9gOnr61vQyCNg/+UCluu6PxGRvVNPCQACXRaIoujQqampa7p8LMf1WCCfz++llKp+ChZfCCCAAAIIINCYwCW+7y9ubAur2yXguu6fRWRhu+YxBwEEEEAAAQQQQAABBBBAAAEEEEDgXwT+cvfddz9v5cqV67BBwHXd45RSn0cCAQS6JvBgEARbN3Lav1zA8jxv2hjz9kaGsBYBBNoi8GGt9YfaMokhVgkUCoWbRORlVoUmLAIIIIAAAj0WiKLo8ImJiW/1OEYqj8/lcrtEUfT7VJanNAIIIIAAAggggAACCCCAAAIIINAlAWNMOQzDY7p0HMfEXMDzvI+LyJKYxyQeAkkS+HkQBC9tpNCGPgGrJCKjjQxhLQIItC6glPpeEASLWp/EBNsECoVCXkR823KTFwEEEEAAgR4KPDIwMLCwWCzO9DBDao/O5XJHR1E0lVoAiiOAAAIIIIAAAggggAACCCCAAALdERjUWl/RnaM4Je4CrutepZQ6LO45yYdAUgSMMd/WWr+xkT7/cgErm82+Ryl1USNDWIsAAq0LKKWe7Ovr27yRZ4i2fioT4iCwZMmS7fv7++8UEScOeciAAAIIIICABQKB7/s5C3ImMmI2m/2YUup9iSxHKQQQQAABBBBAAAEEEEAAAQQQQCAGAtWfG/b39z93+fLlj8UgDhFiIOB53r0isk0MohABgVQIGGMmtdbHNlJ2Q48gfKMx5spGhrAWAQTaI2CMOTgMw++3ZxpTbBIYGxtbWX3/bcpMVgQQQAABBHolYIx5W6lU+lKvzk/7ua7rXisiB6Tdgf4IIIAAAggggAACCCCAAAIIIIBABwW+pbU+vIPzGW2RQC6XW2iM+bNFkYmKgPUCjuOcVS6Xi40U2dAFrD2MMb9uZAhrEUCgPQLGmDPDMPxIe6YxxSaBQqFwgohcbFNmsiKAAAIIINAjgdUDAwPPLRaLq3t0fqqPXbRoUd/222//sIhsnGoIyiOAAAIIIIAAAggggAACCCCAAAKdFThJa81TqzprbM1013UPV0p905rABEUgAQJRFB0bhuFkI1X+5QLWyMjIRmvXrn2cR2E1wshaBNojoJT6ThAEPLu3PZxWTTnttNM2nz9//j0iMmBVcMIigAACCCDQfYEVvu8Pdf9YTqwKHH300a/IZDI/RQMBBBBAAAEEEEAAAQQQQAABBBBAoGMCZnZ2dqcVK1b8sWMnMNgqAdd136+UOtuq0IRFwHKBKIpeF4bhdxup8S8XsKqbs9ns3Uqp7RoZxFoEEGiLwOqZmZktpqenZ9oyjSFWCRQKBV39K9iq0IRFAAEEEECg+wJv8n3/a90/lhOrAp7nvcsY81k0EEAAAQQQQAABBBBAAAEEEEAAAQQ6I2CM+WkYhnt3ZjpTbRRwXfeLSqm32pidzAjYKqCU2rVSqdzeSP4NXsDyPO8HxpgDGxnEWgQQaI+AUuq1QRD8oD3TmGKTwNKlSw/LZDJX2ZSZrAgggAACCHRZ4KGBgYFtisUil9W7DL/+uGw2u1wpdWyPjudYBBBAAAEEEEAAAQQQQAABBBBAIPECSqmzgiAoJr4oBesWcF33dqXUznVvYCECCLQqMHvLLbcMrFq1am0jgzZ4ASuXy30+iqLjGhnEWgQQaJvAh7XWH2rbNAbZJKDy+fxvq7dpbQpNVgQQQAABBLoo8Dnf99/dxfM46p8EXNe9VUR2BwYBBBBAAAEEEEAAAQQQQAABBBBAoDMCSqm9gyD4aWemM9U2gWw2u4XjOA+KyAbvdtjWh7wI2CBgjPmj1nrHRrNu8D9S13XzIuI3Ooz1CCDQuoAx5kdhGL6m9UlMsFFgbGysaIzhAp6Nbx6ZEUAAAQQ6LhBF0aKJiYnvdfwgDtigwNDQ0NaO49zHN3v4A4IAAggggAACCCCAAAIIIIAAAgh0TOBurfXzRcR07AQGWyUwPDx8WBRFPEHHqneNsAkQuDYIgoMa7fFsjyB8kzHmq40OYz0CCLRFYN3MzMzW09PTj7RlGkOsEjj99NN36uvr+72IOFYFJywCCCCAAAIdFqj+xsmCBQt2LhaLUYePYvyzCGSz2Tcrpb4CEAIIIIAAAggggAACCCCAAAIIIIBAxwQu0Fqf2rHpDLZOwPO8UREpWRecwAjYLaCDIPAarbDBC1gjIyN7rl279pZGh7EeAQTaI2CMOTIMQy5BtofTuimFQuHbIvIG64ITGAEEEEAAgc4KnO37/gc7ewTT5xLIZrMTSqmlKCGAAAIIIIAAAggggAACCCCAAAIIdEZg3bp1+11++eU3dmY6U20U8DxvWkTebmN2MiNgq4BS6pxKpfKBRvNv8ALW3nvvPW/PPfd8XETmNTqQ9Qgg0BaBT2utT27LJIZYJ7B06dK3ZDKZL1kXnMAIIIAAAgh0TsBEUbT7xMTE7zp3BJNrCWSz2R8qpV5dax2vI4AAAggggAACCCCAAAIIIIAAAgg0JXCb1vqFTe1kU2IFPM/7o4jskNiCFEMghgJKqcWVSuWSRqNt8AJWdYjrureKyO6NDmQ9Agi0ReA3Wus92zKJIdYJFIvFvjVr1tzO/5my7q0jMAIIIIBAhwSiKFo5MTFxSIfGM7YOgcMPP3z+Vltt9YgxZn4dy1mCAAIIIIAAAggggAACCCCAAAIIINCggDHmzDAMP9LgNpYnWOC4447bbmZm5u4EV6QaAnEVeEMQBFc1Gm6uC1hfE5EjGh3IegQQaI/A7OzsLitWrPhDe6YxxTaBfD7/IaVUsbHcRkSe9a/1xkaxGgEEEEAAgRgJRFF0zMTERDlGkVIXxfO8g4wx3+9pcf6vTk/5ORwBBBBAAAEEEEAAAQQQQAABBDoqYIwxu4Vh+PuOnsJwqwQ8z3ubiFxhVWjCIpAAAcdx9iiXy9UPrWro61l/Up/NZieUUksbmsZiBBBom4DjOMdXKpXPt20gg6wSOOOMM7adnZ29g0fBWvW2ERYBBBBAoDMCjw4MDGxbLBZXd2Y8U+sR8DyvYIwZr2ctaxBAAAEEEEAAAQQQQAABBBBAAAEEGha4Tmt9YMO72JBogVwud54x5vREl6QcAvETmH3wwQc3vvLKK59sNNpcn4B1gohc3OhA1iOAQHsElFLTQRC8oz3TmGKjQKFQqN5or95s5wsBBBBAAIE0C3zO9/13pxkgDt1d1+UTkuPwRpABAQQQQAABBBBAAAEEEEAAAQQSKWCMOTEMw88kshylmhbwPO9aETmg6QFsRACBZgR+HwTBC5rZONcnYL1WKfW9ZoayBwEE2iLw6K9//eutV61atbYt0xhinUA+nz9UKXW1dcEJjAACCCCAQHsFXu77/s3tHcm0RgQGBwcz/f39D4jI5o3sYy0CCCCAAAIIIIAAAggggAACCCCAQF0CM5lMZrtyufxgXatZlAqBvffee95ee+31iIgMpKIwJRGIiYAx5tta6zc2E+dZL2Adf/zxz1uzZs2fmhnKHgQQaI+AUuqQIAhWtmcaU2wUKBQKN4nIy2zMTmYEEEAAAQTaIHCt7/sHtWEOI1oQyOVy+0RRdGMLI9iKAAIIIIAAAggggAACCCCAAAIIIPAsAsaYr4Rh+BaAEHimwMjIyL7r1q27ARUEEOiugFLq05VK5eRmTn3WC1jVYa7rVm/ZbtnMYPYggEDrAsaY88IwHG19EhNsFRgdHT3OcZzP25qf3AgggAACCLQiEEVRdmJiYqqVGextXcB13dNF5LzWJzEBAQQQQAABBBBAAAEEEEAAAQQQQGADAoNa6yuQQeCZAtXvySml+J4cfywQ6LJAFEWnhmF4QTPH1rqAVX0E4WubGcweBBBoi8CvtNYvasskhlgpcMopp8xfsGDBHSLyPCsLEBoBBBBAAIHmBe5fvXr18y+88MInmx/BznYIuK77dRH5j3bMYgYCCCCAAAIIIIAAAgikUcCIyJw/jkojCp0RQACB9QKPLly4cJvzzz9/DSQIPFPAdd2vKKXejAoCCHRXwBjz71rrK5s5tdYFrE+JyEnNDGYPAgi0R8BxnF0rlcrt7ZnGFBsFCoXCWSJypo3ZyYwAAggggECzAkqpc8bHxz/Q7H72tUdgcHAw09/fX/1k5M3aM5EpCCCAAAIIIIAAAggggAACCCCAAALrBRzHuaRSqSxGBIF/ElCe590nIlsjgwACXRfYPQiC3zZzaq0LWO8Wkc80M5g9CCDQNoGTtdafbts0BlknsHTp0oWZTKb6KVgbWReewAgggAACCDQnsLavr+8F55xzzh+b286udgkcddRR+/b19d3QrnnMQQABBBBAAAEEEEAAAQQQQAABBBB4WsBxnH0rlcpPMEHgmQK5XO7Fxpifo4IAAl0XWHfLLbcsWLVq1dpmTq51AesAEbm2mcHsQQCB9ggopb4ZBAGPfGkPp7VT8vn8cqXUsdYWIDgCCCCAAAINCBhjpkqlUraBLSztkIDrunkR8Ts0nrEIIIAAAggggAACCCCAAAIIIIBAmgVu1lq/PM0AdN+wgOu6Jyql+IAO/oAg0H2BW4Mg2KPZY+e8gDU4OLhZf3//Qzycu1le9iHQFoE1G2+88dYXX3zx6rZMY4iVAsuWLdsziqJfiohjZQFCI4AAAggg0ICAMWb/UqnEpy41YNappZ7nfaP6zPtOzWcuAggggAACCCCAAAIIIIAAAgggkFYBpdS7giC4OK396f3sAp7nTYnI0RghgEDXBb4RBMERzZ465wWs6lDXdauPvdqx2QPYhwACrQsYY44Mw/CrrU9igs0ChULhyyJypM0dyI4AAggggEAtAaXU98bHxxfVWsfrnRdYtGhR3/bbb/8XEdmk86dxAgIIIIAAAggggAACCCCAAAIIIJAqgcfmz5+//fLlyx9LVWvK1iXged4fRWSHuhazCAEE2iaglPpEpVJZ0uzAmhew+I3nZmnZh0BbBSa11jx+rq2k9g3L5/P7KaWuty85iRFAAAEEEGhI4Ejf97l43hBZZxYPDQ0d6DjODzoznakIIIAAAggggAACCCCAAAIIIIBAqgU+p7V+d6oFKL9BgWw2u7vjOLfCgwAC3RcwxpystW768Z81L2Bls9lxpVSh+9U4EQEE1gsYYx685557tlm5cuU6VNItMDo6+l3HcfhUkHT/MaA9AgggkGSB3w4MDOxRLBajJJe0pZvrumeJyJm25CUnAggggAACCCCAAAIIIIAAAgggYItAFEUvm5qa+pktecnZPQHP894jIhd170ROQgCB9QKO47y+XC5f3axIzQtYrut6IlJp9gD2IYBAewSMMa8Lw/C77ZnGFFsFRkdH3+g4zpW25ic3AggggAACcwkopU4YHx+/FKV4CGSz2R8qpV4djzSkQAABBBBAAAEEEEAAAQQQQAABBJIhEEXRyqmpqUOS0YYW7RZwXfeLSqm3tnsu8xBAoC6B7YIguLeulRtYVPMClud5LzPG3NTsAexDAIG2CVygtT61bdMYZK1AoVBYJSKvtLYAwRFAAAEEENiwwF0DAwMvKBaLMwD1XmBkZGTztWvX3i8ifb1PQwIEEEAAAQQQQAABBBBAAAEEEEAgOQKO47ytUql8KTmNaNIugcHBwcxGG210nzFmy3bNZA4CCNQt8FAQBC39t1fzAtbhhx8+f8stt3xMRObVHYuFCCDQCYE7tNa7iIjpxHBm2iNQKBTeLCJfsScxSRFAAAEEEKhL4DTf9z9Z10oWdVxgeHj4LbOzs3wjsOPSHIAAAggggAACCCCAAAIIIIAAAikTuPPuu++g9KAcAAAgAElEQVR+wcqVK9elrDd16xAYHh7eL4qi6+tYyhIEEGi/wLVBEBzUytiaF7Cqwz3Pu9kY89JWDmIvAgi0LqCU2jsIgp+2PokJtguMjo7e4DjOvrb3ID8CCCCAAAJ/E3hwYGBg52Kx+FdE4iHguu5nROTd8UhDCgQQQAABBBBAAAEEEEAAAQQQQCAxAgWtdSkxbSjSVgHP884QkXPaOpRhCCBQr8DFQRC8q97FG1pX1wWsbDa7XCl1bCsHsRcBBFoXUEp9JAiCM1ufxATbBfgULNvfQfIjgAACCDxTwBhzRqlU+igq8RHwPO+3xpgXxCcRSRBAYC4BpdTpIsIlVv6YIIAAAgjEXsAY8yYR+Y/YByUgAggggAACnRF4fGZmZsfp6em/dGY8U20XyOVy1xhjDrG9B/kRsFTgtCAIWnpKR70XsE5WSl1oKRKxEUiSwC+01i9JUiG6NC2gRkdHb3QcZ++mJ7ARAQQQQACBeAhUv+G0q+/7j8QjDilyudwuURT9HgkEELBG4E6t9U7WpE1A0Oo300wCelABAQQQ6IXA4ODgc+bNm7dKKfXCXpzPmQgggAACCPRSQCl1fhAE7+tlBs6Or8DixYsXrF69+kER2Si+KUmGQKIF3hAEwVWtNKzrAtbw8PCrZ2dnf9jKQexFAIH2CCil9gyC4DftmcYUmwXy+fyblFJftbkD2RFAAAEEEBCR9/u+fy4S8RFwXbf66MHqIwj5QgABOwQmtdZ8arkd7xUpEUAAAQRE5Kijjtq3r6/vWhHpBwQBBBBAAIEUCcyIyAu01nelqDNVGxDwPK/6KaFfb2ALSxFAoI0C/f392y9fvvyeVkbWdQGretvy8ccfr/5Gel8rh7EXAQRaFzDGnBmG4Udan8SEBAhUPwXresdx9k1AFyoggAACCKRT4IGBgYFdisUij82K0fvvum71Gz08FiZG7wlREJhLwBgzHIZhBSUEEEAAAQRsEnBdt/r43PNsykxWBBBAAAEEWhFwHOeSSqWyuJUZ7E22QC6X+5Qx5qRkt6QdArEVeDgIgi1aTVfXBazqIa7r/kJEXtTqgexHAIGWBXgMYcuEyRkwOjp6sOM4K5PTiCYIIIAAAmkSMMbkS6XSRJo6x73rkiVLBu67774HRGRB3LOSDwEE/k8gk8nsVC6X78QDAQQQQAABywTU0NDQVxzHeZNluYmLAAIIIIBAMwKzxpi9wjC8rZnN7EmHgOd5v61+Slo62tISgdgJXBcEwYGtpqr7AlY2m71MKTXc6oHsRwCBtgi8SGv9q7ZMYoj1AoVCofos2sOsL0IBBBBAAIG0CfxpYGDgBcVicXXaise5b/Wjzo0xfNR5nN8ksiHwDAGl1G+DINgdFAQQQAABBGwUGBwcfG5/f///isj2NuYnMwIIIIAAAg0ITGmtsw2sZ2nKBHK53F7GGH72m7L3nbrxEVBKteVTCuu+gOV53qnGmE/Eh4AkCKRXQCl1VhAExfQK0PyZAmNjY/saY64Xkbr/TkcQAQQQQACBGAic5vv+J2OQgwjPEPA87yJjzHtAQQABOwR4hIUd7xMpEUAAAQSeXSCbzb5WKXVN9UMdcUIAAQQQQCChAmZ2dnbvFStWVC8d84XABgWqj2dWSvF4Zv58INA7gdOCIGj55xV1/7B+aGjoQMdxftC7vpyMAALPEPiN1npPRBBYL1AoFK4QkbchggACCCCAgA0Cxpjb16xZs9eFF174pA1505TRdd0/iMhOaepMVwRsFlBKZYMgmLK5A9kRQAABBBBwXfcsETkTCQQQQAABBJIooJT6WhAEPHI3iW9uGzu5rnuVUoqn3bTRlFEINCLgOM7ry+Xy1Y3s2dDaui9gDQ4OPqe/v/9hfhOlVXL2I9A2gZdqrX/etmkMslpg2bJlL4yi6Jci0md1EcIjICKGj3PjzwECaRAY8n1/RRqK2tRxaGjopY7j3GxTZrIikHaB+fPnb798+fJ70u5AfwQQQAABuwWKxaJz6623Vn/o+Dq7m5AeAQQQQACBDQocqLW+DhsEnk0gl8ttbIx5UETmo4QAAr0RmJ2dfe7U1NQDrZ5e9wWs6kGu61afO7pXq4eyHwEE2iJwttb6g22ZxJBECOTz+c8ppRYnogwlEEAAAQQSKxBF0Y0TExP7/+2+ZWJ72ljMdd0xEfmojdnJjEBKBX6tteZ7NCl986mNAAIIJE1geHh4+3Xr1t2slNoqad3ogwACCCCQXoEoilZOTU0dkl4BmtcjMDw8/JYoir5Uz1rWIIBARwTuCoLg+e2Y3OgFrIqIeO04mBkIINCagDHm1jAM92htCruTJLB06dKFmUzmVhHZLEm96IIAAgggkCwBpdSh4+Pj1ySrVTLaeJ73A2PMgcloQwsEki+glPpMEAQnJr8pDRFAAAEE0iIwNDR0pOM4X05LX3oigAACCCRfQCn1hiAIrkp+Uxq2IpDL5crGmFwrM9iLAAItCbTtUbGNXsA6SUQ+1VJ0NiOAQNsEjDH7hGG4qm0DGWS9QD6fX6aUOtf6IhRAAAEEEEikQBRFX5uYmHhTIstZXmpoaGhrx3H+xCPnLX8jiZ8qAaXUUUEQ/FeqSlMWAQQQQCDxAq7rflZE3pX4ohREAIH/z96dx8lRVvsfP0/1LCFxAWSTBMEFAfG6RRBxCwJi3K4gI5mq6nGIEHclJpkJwaVdIJkhECVXVIQ4TlfVgK0obgiCRtSLiFEUxQAR16CGVRSSWbrO71WK9+cCpJfq7lo+/Xrd1/3D5znne97VmqT76SoEEMiDwA9834/uAs8LgYcVWLBgQde8efOiz+S4CyjvEwQ6J/Ahz/PeF0f7ug5g2bY93xjzwzgaUwOBTguoiNT1X4BOB36I/saYdZ7nvTuB0YjUIYFSqTRrx44dm1V1/w5FoC0CCCCAAAIPJzBtWdYzVq9evRmi5Am4rnuyqm5IXjISIYDAwwjoLrvs8vgLL7zwTwghgAACCCCQJYHBwcFZ09PTPxCR/8rSXMyCAAIIIJA/gUKhcOz4+PhV+ZuciesRcBznaGMM75N60FiLQMwCxpjXlcvlWB4DWtf5k+gE5ty5c+8VkTkxz0Q5BBBoTGDb1q1b527cuHGmse3syqLA8PDwIhGZyOJszIQAAgggkGqBc0dGRpaleoIMh3dd90uq+uoMj8hoCGRN4Ge+7/PFdNauKvMggAACCPxNoFgsPj0Mw+tFZBYkCCCAAAIIpFTgGt/3X5LS7MRuo4DruutF5O1tbEkrBBD4N4EwDJ8cBMFtccDUdQAraug4zrdF5MVxNKcGAgg0L2BZ1svL5fIVzVeiQoYEzNDQ0PeMMc/P0EyMggACCCCQYgFV3WaMeerIyMifUzxGZqP39fU9qqenZ5uI7JLZIRkMgewJrPd9/53ZG4uJEEAAAQQQ+LuA67rvVtVz8EAAAQQQQCCNAoVC4cjx8fFr05idzG0VMI7j/MYYs19bu9IMAQT+WeA+z/N2FZHoAWpNvxo5gDUiIkNNd6YAAgjEJVD2fX8grmLUyYbAihUrnmNZVnS79kI2JmIKBOoRyMJDZuuZl7UIJF9AVU8ZHR29KPlJ85nQcZwTRaSSz+mZGoF0ChQKhRPGx8e/kM70pEYAAQQQQKAmgegLyS+LyCtrWs0iBBBAAAEEEiJgjPmy53mvSUgcYiRYoFgsPldVo7t+8kIAgc4JfNvzvAVxta/7ANbAwMDx1Wo1lucfxjUEdRDIucD9lmXtXS6X78+5A+P/m8DQ0NAnjTFLgEEAAQQQQKDDAj/aZZddDiuVSmGHc9D+YQRc1/VU1QEIAQRSI1Cdmpraq1Kp3J2axARFAAEEEECgAYHBwcF9ZmZmfqqqezawnS0IIIAAAgh0QiA0xjzH87yfdKI5PdMlUCwWP6Sq70lXatIikC0BY8x55XL5XXFNVfcBrFNOOWXv7du3/zGuANRBAIHmBVTVDYLAb74SFbIkcPrppz8uDMObReRxWZqLWRBAAAEEUiUQHbp60cjIyP+mKnWOws6fP7/74IMP/pOI7JajsRkVgbQLfN/3fR43nvarSH4EEEAAgZoEHMdZKCJfFZG6v8uoqQGLEEAAAQQQiFEgDMPPTExMDMZYklIZFnBd9yYROSTDIzIaAokXCMPw5CAIxuIK2tA/WhzH+ZWIHBBXCOoggEBzAqp6RRAEL2+uCruzKDA8PPwmEflEFmdjJgQQQACB5Auo6gWjo6PRn0W8EirgOM7LROSKhMYjFgIIPISAMeZDnue9DxwEEEAAAQTyIuC67npVfXte5mVOBBBAAIHUCmyvVqsHXXzxxb9L7QQEb5uA67rPFJEb2taQRggg8JACYRg+OwiC2P672NABLNu2J4wxi7hGCCCQGIFqoVDYf3x8fGtiEhEkEQKlUsnavn37tSJyeCICEQIBBBBAIE8Cd87MzBxyzjnn3JmnodM2q+M4HxeRN6ctN3kRyLNAGIYvmpiY+G6eDZgdAQQQQCBfAkuXLt1l27Zt14vIofmanGkRQAABBFImsNr3/VUpy0zcDgkUi8UPq+oZHWpPWwQQ+LvA1OTk5KMrlcpUXCCNHsB6pzHmo3GFoA4CCDQvEP0hHQTBWc1XokLWBIaGhg43xkSPfipkbTbmQQABBBBItEBxZGTES3TCnIfr6+sr9PT0/F5E9sk5BeMjkCaBP2/dunWPjRs3zqQpNFkRQAABBBBoVqC/v/8ZhULhB6ra22wt9iOAAAIIIBC3gDHmDlV9iu/798Vdm3rZFHBd9xYROTCb0zEVAukQMMb8oFwuPy/OtA0dwBoYGDi8Wq1eF2cQaiGAQNMCt/m+/xQR0aYrUSBzAsPDw+eJyDsyNxgDIYAAAggkUsAY8+01a9Ycxd9LEnl5/i9Uf3//Sy3LujrZKUmHAAL/LBCG4RcmJiZOQAUBBBBAAIE8Cti2vdQYc24eZ2dmBBBAAIHEC7zN9/3zE5+SgIkQcF33OSKyKRFhCIFAvgX+x/O8WL8/b+gAVl9fX09PT889IjI739eD6RFIloAx5ijP8zYmKxVpkiAwNDT0aBH5uTFmvyTkIQMCCCCAQKYFdliW9czVq1dHv+LilWABx3E+ISJvSnBEoiGAwL8JqOpbgyCIHh3KCwEEEEAAgTwKGNu2LzfGHJfH4ZkZAQQQQCCxAjdt3rz5WZs2bZpObEKCJUrAdd01IjKcqFCEQSCfAm/wPG88ztEbOoAVBbBt+2pjzEvjDEMtBBBoWqDs+/5A01UokEmB008//RVhGH41k8MxFAIIIIBAYgSMMSvXrFkzkphABHlIgQULFnTNnTt3q4jsBRECCKRHQFWfHATBbelJTFIEEEAAAQTiFSgWi3uFYfhTEdk73spUQwABBBBAoDEBy7JeXi6Xr2hsN7vyKOC67hYReXIeZ2dmBJIk0NXVdcjY2NjmODM1fADLcZz3icgH4gxDLQQQaFpge3d3975jY2P3Nl2JApkUGBoa+rwxhkeWZPLqMhQCCCCQCIEf33PPPc+74IIL+MVfIi7Hw4coFovHhWH49YTHJB4CCPyTgDFmi+d5B4KCAAIIIIBA3gUcx1koItGPDBv+fiPvhsyPAAIIIBCPgKp+PgiCE+OpRpU8CAwMDBwehuF1eZiVGRFIuMB9T3nKU3YrlUphnDkb/geK67oLVPVbcYahFgIIxCLwFt/3o8fJ8ELgPwSGhob2NcbcJCKPhQcBBBBAAIGYBaaq1epha9eujX6NzivhArZtbzDGnJzwmMRDAIF/FTjf9/23gYIAAggggAACIo7jRI/kfTMWCCDQjIByjrEZPvYiILK9Wq0+7eKLL/41GAjUKuC67noReXut61mHAAItE7ja87xj4q7e8AGswcHBWTMzM/eqam/coaiHAAKNC6jqD4MgOKzxCuzMusDQ0NAbjTEXZn1O5kMAAQQQaK+AqpZGR0e5Q2572Rvq1tfX19PT0/NHEdmtoQJsQgCBjgio6muDILisI81pigACCCCAQMIElixZMvv+++//oYgckrBoxEEAAQQQyIlA9FlYEAR8FpaT6x3HmAsWLOiaN2/e73mUchya1ECgOQFVXe37/qrmqvzn7oYPYEWlHMe5RkReFHco6iGAQHMCxpj5nuf9qLkq7M6wgBkeHr5cRI7L8IyMhgACCCDQXoEbd9lll+eWSqWp9ralWyMCruu+UlW/0she9iCAQMcEoke77uH7/n0dS0BjBBBAAAEEEiawaNGiZxcKhe+LSE/CohEHAQQQQCD7ArfttddeT1+3bt327I/KhHEJFIvFV6vql+KqRx0EEGhcwLKsE8bHx7/QeIWH3tnsAawPich74g5FPQQQaE5AVS8MguDU5qqwO8sCS5cundvT03Mjd77I8lVmNgQQQKBtApMi8ryRkZGftK0jjZoScBxnXESKTRVhMwIItFvgO77vv7jdTemHAAIIIIBA0gVc112uqmcnPSf5EEAAAQSyJWCMWeh53tezNRXTtFrAdd3Pikhfq/tQHwEEdi5gWda88fHxrTtfWd+Kpg5gua57rKpeWV9LViOAQBsEHlDVeUEQ3NOGXrRIqcDKlStPUdVPpTQ+sRFAAAEEkiMwPDIyMpqcOCR5JIFisThHVf+oqo9CCgEE0iOgqu8NguDD6UlMUgQQQAABBNojUCqVrFtvvfUKETmmPR3pggACCCCAgFzi+/4iHBCoR6Cvr++xvb29fxCRXerZx1oEEGiJwB88z9u3FZWbOoAVfXgfhmF0wKO7FeGoiQACjQuo6ruCIDiv8QrszIPA0NDQ16JfauRhVmZEAAEEEGiJwHdvu+22BZVKpdqS6hSNXcBxHFdEyrEXpiACCLRUoFAoPG98fPwHLW1CcQQQQAABBFIqsHjx4n137NjxU2PM41I6ArERQAABBNIjcF+hUHhaK+6akh4CkjYiUCwWT1XVCxrZyx4EEIhd4Aue550Qe1URaeoAVhTIcZxrReSIVoSjJgIINCXwC9/3DxURbaoKmzMt8OCjCH8qIrtnelCGQwABBBBohcB9xphnrlmz5tetKE7N1gjYtv11Y8xxralOVQQQaIWAqt41PT29N4ddW6FLTQQQQACBrAgMDAwcX61WL83KPMyBAAIIIJBYgbf7vv+xxKYjWGIFXNe9RkRelNiABEMgRwLGmFXlcnl1K0aO4wDWiIgMtSIcNRFAoDkBVX1pEATfaq4Ku7MusHLlypNU9eKsz8l8CCCAAALxCqjq4Ojo6GfirUq1Vgq4rvt4Vf2diBRa2YfaCCAQu0Dg+74Te1UKIoAAAgggkDGBYrF4QRiGp2ZsLMZBAAEEEEiOwHUHHnjgkaVSKUxOJJKkQcC27SdZlrUljpvjpGHe2jJGx1S4h0htVqyKWyAMw5cEQRAdioz91fQBLNu2X2GM+WrsySiIAAJNCxhjKp7nvb7pQhTIvMDQ0NC4MaaY+UEZEAEEEEAgFgFV/ezo6OhJsRSjSNsEXNd9t6qe07aGNHpEgegjpqb/QY5xLgSMMbbneRO5GJYhEUAAAQQQaEKgWCzOqVarPzLGPLWJMmxFAAEEEEDgPwSMMZPVanX+xMTEz+FBoF6BYrG4WlVX1ruP9Qgg0BKB6dmzZ+96wQUXPNCK6k1/3rt48eJHT05O3iUi3a0ISE0EEGhKYNoYs7/neX9oqgqbMy8wPDz8WBG5QUQOyPywDIgAAggg0KzALx944IHnrF+//r5mC7G/vQKO4/xYRJ7V3q50QwCBJgVmVHWvIAjuabIO2xFAAAEEEMiFQLFYfG4Yht8TkZ5cDMyQCCCAAAJtEVDV9wZB8OG2NKNJpgQWLFjQNW/evN+IyL6ZGoxhEEipgKpe6/v+ka2K3/QBrCiY67rfUdUXtiokdRFAoHEBY8yHPM97X+MV2JkXgRUrVrzAsqxv81iivFxx5kQAAQQaEphW1RePjo5+v6HdbOqYgOM4TxMRfqXZsStAYwQaEwjDcOPExMRRje1mFwIIIIAAAvkUcBwnusPE6nxOz9QIIIAAAi0Q+MnmzZsP27Rp03QLalMy4wKu675GRC7L+JiMh0CaBNZ6nreiVYFjOYDlOE50uOMDrQpJXQQQaFzAGHPHnnvuuf+6deu2N16FnXkRWLly5YdV9Yy8zMucCCCAAAL1CRhj3r1mzZp19e1idRIEHMcZEZGhJGQhAwII1C5gjFnhed7a2newEgEEEEAAAQRKpZJ1yy23fMMY81I0EEAAAQQQaFJgplqtHn7xxRdHdxXnhUDdAq7rRoevokNYvBBAIBkCx3ue98VWRYnlAJbrukeqanRbX14IIJBAAWPMqZ7nXZjAaERKmECpVOravn37t0SEuxom7NoQBwEEEOi0gKp+ZXR0NPqwQDudhf71CUS3Ot93331/Y4zhVuf10bEagY4LWJb1tHK5/IuOByEAAggggAACKRNYvHjxvlNTUzeo6p4pi05cBBBAAIFkCZzp+/57khWJNGkRGBwc3GdmZua3ItKdlszkRCDjAmqM2adcLm9r1ZyxHMCKPtCfO3funSLy2FYFpS4CCDQl8HPf9/+LL0ybMszN5qGhoXnGmOjXHHvkZmgGRQABBBB4RAFjzG+mp6efe84550R/5+eVMoHoVueqyq3OU3bdiIuAMeaXnuc9BQkEEEAAAQQQaEzAdd2Xq+rXRCSW70EaS8EuBBBAAIEUC9wwNTX1vEqlMpXiGYjeQYHoscjGGB6L3MFrQGsE/lnAGHNzuVw+uJUqsf3Do7+//zLLsrh9XiuvFrURaELAGPMyz/O+0UQJtuZI4PTTT39FGIZf4QOqHF10RkUAAQQeXmCHMeaFa9as2QRSOgX4t1o6rxupETDGrPM8791IIIAAAggggEDjAsVicW0Yhssar8BOBBBAAIE8ChhjJlX1MN/3b8zj/MzcvED0SOQtW7bcLCL8sKp5TiogEIuAMWZDuVx+YyzFHqZIbAewHMd5h4ic18qw1EYAgcYFjDFf8zzvlY1XYGfeBIaHhz8iIu/K29zMiwACCCDwrwKqesro6OhFuKRTILrV+fT0NLc6T+flI3XOBarV6jEXX3zx1TlnYHwEEEAAAQSaEpg/f373wQcffI2IHNFUITYjgAACCORKwBizzPO8c3M1NMPGKuA4zsLou9lYi1IMAQSaFVjsed6nmy3ySPtjO4A1ODh48PT09C9aGZbaCCDQlIBalnVouVzmv6dNMeZnc6lU6tm+fft3ROTw/EzNpAgggAAC/yygqheOjo6eikp6BRzHOV1EzkrvBCRHILcC901NTe3Joy5ye/0ZHAEEEEAgRoGTTjrpyV1dXT8SkcfEWJZSCCCAAALZFfjOgQceuKBUKoXZHZHJWi1QLBa/rKqvanUf6iOAQO0ClmUdND4+fkvtO+pfGdsBrKi14zjRL6v3qz8GOxBAoE0Cn/B9/y1t6kWbDAgMDw8/QUSiR07tkYFxGAEBBBBAoA4BVf3h7NmzX1QqlXbUsY2lyRIwruveoqrc6jxZ14U0COxUwBjzOc/z+na6kAUIIIAAAgggUJOA67r9qhrUtJhFCCCAAAJ5Fvizqj4zCILf5BmB2ZsTGBgYeEIYhreJSKG5SuxGAIEYBe7wPG9vEdEYa/5HqbgPYEW36xpsZWBqI4BA4wLRM6tF5Ime5/2h8SrszJvAypUrX6qqV/IXxbxdeeZFAIGcC/ypq6vrsDPPPPN3OXdI9fi2bR9ljPlmqocgPAL5FRj0ff8z+R2fyRFAAAEEEIhfoFgsXhSG4eL4K1MRAQQQQCBDAo7v+xzYzdAF7cQoxWJxtaqu7ERveiKAwMMKfMHzvBNa7RP3ASxbRPxWh6Y+Agg0LmCMOcvzvDMar8DOPAoMDw+vEpEz8zg7MyOAAAI5FJgWkWNGRkauyeHsmRrZdV1PVZ1MDcUw/yEQ/WQr1n/YY5wEgdCyrMeXy+VtSQhDBgQQQAABBLIiUCwW54RheL2IHJKVmZgDAQQQQCA+AVW9MAiCU+OrSKU8CixcuLB3jz32+K2q7pXH+ZkZgaQKhGH4riAIzmt1vlg/py0Wi3uFYRjdWcdqdXDqI4BAwwL39vb2PmHDhg1/abgCG/MoYIaGhj5njGn5yeA84jIzAgggkCQBY8ypa9asuTBJmchSv8DAwMDjqtXq70VkVv272YEAAh0W+L7v+8/vcAbaI4AAAgggkEmB/v7+Qy3Luk5E5mRyQIZCAAEEEGhU4KY5c+YcdsEFFzzQaAH2IRAJ2LZdtCxrHA0EEEiWgKo+w/f9G1udKtYDWFFYx3Gif7wc3urg1EcAgcYFjDErPM9b23gFduZR4LTTTtu1t7f3+yJyUB7nZ2YEEEAgJwLnjoyMLMvJrJke03XdFao6mukhGQ6B7Aq8x/d97j6b3evLZAgggAACHRYoFouLwjCc6HAM2iOAAAIIJEdghzHmCM/zfpKcSCRJq8DAwMC1YRgekdb85EYgowJ3eJ63t4hEDxNo6Sv2A1i2bb/fGFNqaWqKI4BAswJbp6amnlSpVKaaLcT+fAkMDQ0dZIyJDmHtmq/JmRYBBBDIvoCqXv6rX/3q1ZVKpZr9abM9YalUsrZs2XKLqj4525MyHQKZFWjLL/Iyq8dgCCCAAAII1CDguu75qvqWGpayBAEEEEAg4wLGmDd7nvfJjI/JeG0QGBwcPGxmZuYHbWhFCwQQqE+g4nne6+vb0tjq2A9gnXTSSYd1dXXxPyyNXQ92IdA2AcuyTimXyxe1rSGNMiOwcuXKl6nq10SkkJmhGAQBBBDIuYCq/swY88KRkZE/55wiE+M7jrNQRKI/q3khgED6BG71ff+p6YtNYgQQQAABBNIlMH/+/O6DDjro28YYHvubrktHWgQQQCBugQnf9+24i1IvnwKO41xsjDkpn9MzNQKJFnir53kfb0fC2A9gRb+2vvXWW28XkegWXrwQQCC5ApsPPPDAQ0ulUpjciCRLqsDw8PByETk7qVoItqUAACAASURBVPnIhQACCCBQl8DtXV1dR5x55pm/q2sXixMr0N/ff5llWa9JbECCIYDAIwmM+r4/DBECCCCAAAIItF5g0aJFBxQKhU0isnvru9EBAQQQQCCBAj+3LOt55XL5/gRmI1LKBAYGBuaGYfgrEelOWXTiIpB5ga6urkPGxsY2t2PQ2A9gRaH7+/vHLMt6QzsGoAcCCDQuYFnW68vlcqXxCuzMs8DQ0NCFxpg35tmA2RFAAIEMCPxFRF40MjLykwzMwggiMjAw8IRqtXobd6rk7YBAOgUsyzqiXC5fl870pEYAAQQQQCB9ArZtv8IY82URsdKXnsQIIIAAAo0KGGP+aow5vFwu/6LRGuxD4J8FXNcdFZEVqCCAQOIE/uB53lwR0XYka8kBLNd1X6+ql7RjAHoggEBTAj8/8MADn8FdsJoyzO3mUqk064EHHrjKGPOC3CIwOAIIIJBugWljzKvWrFlzZbrHIP0/CziOc5aInI4KAgikUmCr7/v7tesDoVQKERoBBBBAAIEWCDiO82EROaMFpSmJAAIIIJBQAW5QkNALk9JYS5Ysmb19+/bfqSp31UzpNSR2dgWMMUG5XHbaNWFLDmANDg7uOj09vY1b7LXrMtIHgcYFLMt6XblcvrTxCuzMs8CyZcv26OrqulZEnpJnB2ZHAAEEUiigqvrG0dHRT6cwO5EfRqCvr6+np6fntzwOnrcIAqkV+Jjv+29PbXqCI4AAAgggkFKBvr6+Qm9v7xWqenRKRyA2AggggEAdAmEYfmRiYmJpHVtYisAjCriuG/1bfj1MCCCQSIFTPc+7sF3JWnIAKwrvuu5GVX1JuwahDwIINCxwg+/7z+FX1g375X7jypUrn6Sq3xeRPXOPAQACCCCQEgFVHRodHT07JXGJWaOAbduOMcarcTnLEEAgYQJhGB49MTHxzYTFIg4CCCCAAAK5EOjr69uzp6fnehHZPxcDMyQCCCCQUwFV/ebtt99+3MaNG2dySsDYMQuUSiVry5Yt0aMsnxpzacohgEA8Agd6nrclnlI7r9LKA1jDqrpm5xFYgQACnRZQ1dcGQXBZp3PQP70Cw8PDLxSRq0SkN71TkBwBBBDIjcD6kZGRd+Zm2hwN6jjOD0TksByNzKgIZEZAVe+6/fbb9+FLgMxcUgZBAAEEEEihgOu6z1TV74nInBTGJzICCCCAwM4Ffj01NXV4pVK5Y+dLWYFAbQLFYvEEVf18batZhQAC7RRQ1d/5vv+EdvZs2QGsYrH49DAMb2znMPRCAIHGBIwxP/Y8bz53wWrMj11/F1ixYkW/ZVm+iLTszxasEUAAAQSaE1DVz4yOjp7Mn/nNOSZxt23bLzbGfDuJ2ciEAAI7F7Asa0O5XH7jzleyAgEEEEAAAQRaKTAwMHB8tVqNvkTl861WQlMbAQQQaLOAMeavqnqk7/t8d91m+6y3KxaL16nq4Vmfk/kQSKNAGIbjQRC8oZ3ZW/qPCMdxfs0te9t5OemFQFMCr/Z9/ytNVWBz7gWGhoZWGGNGcw8BAAIIIJBAgTAMvzxnzpwTSqUSt1hP4PVpNlJ/f/+llmUd32wd9iOAQGcEwjB8zcTExJc7052uCCCAAAIIIPDPAq7rllT1/agggAACCGRGQC3LOrFcLl+amYkYJBECjuMcbYyJng7DCwEEEiigqo7v+0E7o7X6ANZHRYTHm7TzitILgQYFVPWHQRBEJ7S1wRJsQ+BvAkNDQ2uNMcvgQAABBBBIlMDVU1NTr163bt32RKUiTCwCtm0/yRhzi4gUYilIEQQQaLfAX7q7u/caGxvb0e7G9EMAAQQQQACBhxQwjuN8TkROwAcBBBBAIP0CxpgPeJ5XSv8kTJA0Add1rxSRY5OWizwIIPA3gdAY8/hyubytnR4tPYBl2/ZRxphvtnMgeiGAQOMChULhhPHx8S80XoGdCPxNwAwNDV1kjIkeccULAQQQQKDDAqr6v7Nnzz6uVCr9tcNRaN8iAcdx+OFLi2wpi0CbBC7xfX9Rm3rRBgEEEEAAAQRqEFi6dOku27Zt+46IzK9hOUsQQAABBBIqYIypeJ53EjcfSOgFSnEs27afZVnWj3hscYovItGzLvBDz/MOa/eQLT2A1dfXV+jp6fmjiOzR7sHohwACDQn8fGpq6pmVSqXa0G42IfCgwJIlS7p33XXXy4wxC0FBAAEEEOiowHWqeuzo6OhfOpqC5i0TcBznMSLyOxGJ/j8vBBBIp8Ai3/cvSWd0UiOAAAIIIJBdAdu29zfG/EBE9srulEyGAAIIZFrg+jlz5iy44IILHsj0lAzXEQHXdSsicmJHmtMUAQR2KmCM+XC5XH7vThfGvKClB7CirI7jfFpEBmPOTTkEEGiRgKoOBEFQblF5yuZIYPny5XMsy/qGMeb5ORqbURFAAIEkCfxocnLy6I985CP3JikUWeIVcF13uaqeHW9VqiGAQLsEjDGTqrqX7/v3tasnfRBAAAEEEECgdoH+/v4XWpZ1tYj01L6LlQgggAACCRD4lWVZR7T70VMJmJsIbRAYGBh4ahiGN4lIoQ3taIEAAo0JvNjzvOiOtm19tfwAlm3b/22M+WJbp6IZAgg0I3Db5s2bD960adN0M0XYi0AkcNppp+3a29v7LRF5FiIIIIAAAm0V+MnMzMwx55xzzp1t7UqztgrMnz+/++CDD94iIk9oa2OaIYBAnAJf9X3/VXEWpBYCCCCAAAIIxCvguu7JqnoRjxiK15VqCCCAQAsF7unu7j5ybGxscwt7UDrHAtENaIwx3IAmx+8BRk+8wH2/+MUv9ujEeYeWH8BasmTJ7Pvvv/8OEZmd+MtAQAQQ+IfAW3zf/wQcCMQhsGzZsj26urq+LSJPi6MeNRBAAAEEdipww8zMzLEcvtqpU+oX2LY9YIz5TOoHYQAEciygqicHQTCWYwJGRwABBNIhEH2KrumISsrWCNi2/V5jzAdbU52qCCCAAAJxCUR3GQ7DcGEQBNEPw3khELuAbdtPsizrZhHpir04BRFAIBYBVb3U9/3XxVKsziItP4AV5env77/Usqzj68zGcgQQ6JzAH+bMmfMUnovduQuQtc6rVq3au1qtRoewDsrabMyDAAIIJEzgx5ZlHbt69eq7EpaLOPELGMdxfioiT4+/NBURQKAdAtEXA11dXfuMjY3xqNh2gNMDAQQQQACBJgVc112vqm9vsgzbEUAAAQRaJ6Cq+oYgCMqta0HlvAsUi8WLVHVx3h2YH4GEC7zJ87wLOpGxLQew+GV2Jy4tPRFoTsAYs8LzvLXNVWE3Av9f4IwzzthvZmbmGhE5ABcEEEAAgfgFwjDcNDMz87J169bdHX91KiZNwHXd16jqZUnLRR4EEKhL4DLf919b1w4WI4AAAggggEDHBPr6+gq9vb1fUNVXdywEjRFAAAEEHlZAVd8VBMF5ECHQKgHbtve3LOsWEelpVQ/qIoBA8wLGmCeVy+VfNV+p/gptOYDV19e3e09Pz5+4FV/9F4gdCHRQ4N5CofCU8fFx7qDRwYuQtdYrVqw40LKs6Na/c7M2G/MggAACnRRQ1WuNMQtHRkb+3Mkc9G6fgOM43xORI9vXkU4IIBC3gGVZ/eVy+eK461IPAQQQQAABBFonsHTp0l22bdt2FX8Xb50xlRFAAIEGBVb7vr+qwb1sQ6AmgYGBgU+FYXhKTYtZhAACHREwxmwul8uHdKS5iLTlAFY0nG3bVxtjXtqpQemLAAL1Cxhj1nme9+76d7IDgYcXWLly5QGqGh3C4k5YvFEQQACBeAS+par/PTo6+pd4ylEl6QK2bb/YGBM92pcXAgikV+CBqampvSuVyl/TOwLJEUAAAQQQyKfAwMDA46rVavSDiIPyKcDUCCCAQOIEPN/3B0REE5eMQJkRGBgYeEIYhrdy96vMXFIGyahAGIYfDYLgtE6N17YDWI7jvENEuO1jp640fRFoQMAYMxmG4dOCILitge1sQeBhBTiExZsDAQQQiEcgDMPL5syZs6hUKu2IpyJV0iDgOM5XROSVachKRgQQeFiBS3zfX4QPAggggAACCKRTwLbtJxlj/ldE9k7nBKRGAAEEMiNw2datW0/cuHHjTGYmYpBECriu+wkReVMiwxEKAQT+WWCh53lf7xRJ2w5gLV68eN/JycnfiYjVqWHpiwACDQnwxUBDbGzamcCyZcv27+rq2sidsHYmxX+OAAIIPLSAqpZnz569uFQq8QFTjt4k/f39z7As64Z23s04R7yMikDbBMIwPH5iYuKLbWtIIwQQQAABBBCIXcC27fmWZW1U1UfFXpyCCCCAAAK1CFx19913v+ryyy+frGUxaxBoVKBYLD5RVTdz96tGBdmHQNsE/trV1bXn2NhYx36w3rYDWBGp4zjRYzJe3DZeGiGAQBwCaox5oed50S+6eCEQq8CKFSueXCgUrlbV/WMtTDEEEEAg4wJhGK49++yzh7i1esYv9EOM5zjOJSLy+vxNzsQIZErgvu7u7r07+WFQpjQZBgEEEEAAgQ4KOI7zAhG5QkTmdDAGrRFAAIE8Cnx/amrqWB7rnsdL3/6Zbdv+jGVZ0WMueSGAQIIFVPVS3/df18mI7T6A9TYR+Z9ODkxvBBCoX0BVrw2CIPowgedn18/Hjp0InHHGGfvNzMx8Q0QOAgsBBBBAYKcCqqrDo6OjZ+90JQsyJ+A4ztNE5EbuKpy5S8tA+RMY833/5PyNzcQIIIAAAghkU8B13WNV9UsiMiubEzIVAgggkCwBY8xPwzBcEATBPclKRposCriuG3139TMR6crifMyEQJYEwjA8OQiCsU7O1NYDWIODg/tMT0//XkQKnRya3gggUL8Aj8io34wdtQssX758r0KhEP1a8Fm172IlAgggkDuBKRE5eWRkJMjd5Az8NwHufsUbAYFsCBhjFnqe9/VsTMMUCCCAAAIIIBAJ9Pf3v9ayrApfzvJ+QAABBFou8IupqamXVCqVO1reiQYIiIjrupeKyPFgIIBA4gXCWbNm7XvhhRf+qZNJ23oA68EvDb4pIkd1cmh6I4BAQwK3dXd3H8pjMhqyY1MNAqeddtquPT09XzPGPL+G5SxBAAEE8ibwF2PMiWvWrLkyb4Mz798FuPsV7wQEMiNw5+bNm/fdtGnTdGYmYhAEEEAAAQQQ+Mff2U8UkQkOYfGGQAABBFomcHNvb+9LN2zYcHvLOlAYgX8SKBaLz1XVH4hI289UcCEQQKA+geiJXr7vH1nfrvhXt/1/LBzHebOIfDz+UaiIAAJtEDjd9/01behDi04LRH86dOCBk0NDQ482xlzGQd1OvwHojwACCROI7iD7ipGRkejRc7xyKuA4zsUiclJOx2dsBLIk8Enf96PPRXghgAACCCCAQAYFbNseNMZcxGPDM3hxGQkBBDotsLm7u/uosbGxP3Y6CP3zI+C6bvRj2GPzMzGTIpBeAWPMqnK5vLrTE7T9AFZ/f/8elmX9gV+BdPrS0x+B+gWMMX/t6ek5iF8X1G/HjtoF3vGOd/TusssuXnSnl9p3sRIBBBDIrMANqvrq0dHR6BAWr5wKFIvFQ8Iw/Blf4uT0DcDYmRIIw3DBxMTEtzM1FMMggAACCCCAwL8IFIvFRWEYlvkOhDcGAgggEJsAd76KjZJCtQrYtv1iy7L493utYKxDoMMCxpj/KpfL0WfoHX21/QBWNK3jON8QkWM6OjnNEUCgUYGy7/sDjW5mHwI1CpihoaGzjTHLalzPMgQQQCBzAqr6te3bt/evX7/+vswNx0B1Cdi2PWGMWVTXJhYjgEASBf4wNTW1X6VSqSYxHJkQQAABBBBAID4Bx3Giu9d6HMKKz5RKCCCQTwFVvWXWrFlHcWOAfF7/Dk5tXNe9VkSe18EMtEYAgRoFVPXXvu8/scblLV3WkQNYruueoqqfaulkFEcAgVYJRA+mO9L3/e+3qgF1EfiHwPDw8LtEZB3P1+Y9gQACeRNQ1fNmz569tFQqhXmbnXn/VaC/v/9Qy7J+yt2veGcgkH4BVf1oEASnpX8SJkAAAQQQQACBWgQcx7FFZFxECrWsZw0CCCCAwH8I/Ly7u/sYHjvIO6PdAtHdLFV1ot196YcAAo0JGGPOK5fL0XfKHX915ADWwMDA46rVavQYwu6OCxAAAQQaEfjBgQce+Hy+FG6Ejj31CqxYsWKxZVmf5BeD9cqxHgEEUiowqapvGh0d/UxK8xM7ZoH+/v5LLcs6PuaylEMAgQ4IFAqF542Pj/+gA61piQACCCCAAAIdEuBxhB2Cpy0CCKReQFV/pKrHTUxM3Jn6YRggVQJ9fX09vb29N4nIk1MVnLAI5FjAsqxjx8fHr0oCQUcOYEWDO45zuYi8PAkIZEAAgfoFjDGLPc/7dP072YFA/QLDw8PHichnReQx9e9mBwIIIJAagT+JyIkjIyPfTU1igrZUYGBg4PBqtRrddbRj/25r6YAURyBfApt93z8kXyMzLQIIIIAAAghEAq7rvkZVLxGRWYgggAACCNQk8L9TU1OvqFQqf65pNYsQiFHAcZxlxpi1MZakFAIItFbgvsnJyT0rlcpUa9vUVr1jH+Tbtj1gjOGX/bVdJ1YhkESBbap6cBAE9yQxHJmyJ7B8+fKnd3V1fUVV98/edEyEAAIIyI9mZmZOOOecc36DBQL/EHBd9ypVPRoRBBBIv4CqnhEEwVnpn4QJEEAAAQQQQKARgUWLFh3d1dX1RVV9VCP72YMAAgjkRUBVv1koFF5TLpfvz8vMzJkcAdu2dysUCltUdffkpCIJAgjsROCznuedlBSljh3AWrx48aMnJyf/KCKzk4JBDgQQqFvgk77vv7nuXWxAoEGBFStW7CMiX7Is67AGS7ANAQQQSJyAqpanp6fftG7duu2JC0egjgkMDAwcU61Wv9GxADRGAIE4BcJCofDE8fHx38ZZlFoIIIAAAgggkC4Bx3GOEJGvichu6UpOWgQQQKBtAl/p7u7uGxsb29G2jjRC4J8EbNs+x7Ksd4OCAAKpEjjJ87zoKUqJeHXsAFY0veM4vojYiZAgBAIINCIQWpZ1ZLlcvq6RzexBoBGBUqk0e/v27Z6IHN/IfvYggAACCRKIbon7zpGRkU8mKBNRkiFgHMeJ/n7FgeNkXA9SINCUQPQL7iAIuJtdU4psRgABBBBAIBsCrus+U1WvEJG9szERUyCAAALxCKjqp2+//fYlGzdunImnIlUQqE+gWCw+UVV/ISK99e1kNQIIdFBgR09Pz14bNmz4Swcz/Evrjh7Asm37FcaYryYFgxwIIFC/gDHmp7///e/n85fi+u3Y0bhAqVSytm/f/gEROUNEOvpnWeNTsBMBBPIsoKq/C8PwpLVr116bZwdmf2gB13Vfp6qfwwcBBDIjMOj7/mcyMw2DIIAAAggggEBTAtEXvNVq9evGmKc2VYjNCCCAQHYEzvN9/zQR0eyMxCRpE3BdN7qDTl/acpMXgTwLqOplvu+/NkkGHf3SesGCBV1z5879Pb/2SNJbgiwI1C+gqu8KguC8+neyA4HmBIaHh18tItHdsB7TXCV2I4AAAm0VuKpQKLhnnXXWn9ralWapEOjr6yv09PTcKCKHpCIwIRFAYGcC909NTe1TqVT+urOF/OcIIIAAAgggkB+BYrG4VxiGX+Gut/m55kyKAAIPKRCq6lK+X+Ld0WmB/v7+lxYKhas7nYP+CCBQn4CqFn3fj74nTsyrowewIgXbtj9ijHlXYkQIggACjQjcZ4w52PO8PzSymT0INCOwfPnyZ1iW9UVjzBObqcNeBBBAoA0CM8aYM2fNmvXBUqkUtqEfLVIo4LruElXlsZQpvHZERuBhBMq+7w+ggwACCCCAAAII/LtAsVicE4ZhRUQWooMAAgjkTcAYM6mqb/B9/5K8zc68yRKIfgzZ29v7IxF5RrKSkQYBBHYiMB2G4d5BENyTJKmOH8AqFovPDcPw+iShkAUBBBoSuMT3/UUN7WQTAk0KLFu2bI+urq7o9rBHNVmK7QgggEBLBKJHDqpq/9lnn/29ljSgaCYEFi9e/OjJyclbRGSfTAzEEAggIIVC4djx8fGroEAAAQQQQAABBB5K4MGnhHxKRAYRQgABBPIioKp3icgJQRBck5eZmTO5ArZtv9OyrI8mNyHJEEDgYQS+5nneK5Om0/EDWBGI4zi/EJGDk4ZDHgQQqE9AVV8bBMFl9e1iNQLxCJRKpa7t27efKSIrRCQRf77FMxlVEEAg7QJhGF7W1dX1xtWrV0cfLvFC4GEFXNc9U1VXQYQAApkR2Do1NbV/pVKpZmYiBkEAAQQQQACBlgi4rvsuVT1XRKyWNKAoAgggkBABY8wvu7q6XjU2NrY5IZGIkWOBvr6+3Xt7e6MfQz4uxwyMjkAqBVT1jb7vb0ha+ER8QW3b9nuMMR9KGg55EECgPgFVvb2np+fQsbGxe+vbyWoE4hMYHh5+tYh8RkR2i68qlRBAAIGGBLaLyOkjIyPniYg2VIFNuRFwHGeeiNwsIrNzMzSDIpB9gdW+73OoMvvXmQkRQAABBBCIRcBxnBNFZFxEdomlIEUQQKAxgegTnER8e9pY/CTvUtVrp6en/7tSqdyR5Jxky4+A67qfFJEl+ZmYSRHIjEB1cnLy8Un88yQRf4UoFotPDMPwl/yVJjNveAbJt8D5vu+/Ld8ETN9pgZUrVz5FRD6vqjyzu9MXg/4I5FRAVX9mjLFHRkZuzCkBY9cp4DhOWUTcOrexHAEEki1wqO/7NyU7IukQQAABBBBAIEkCAwMDz69Wq18Ukb2SlIssCCCAQAwCwd1337348ssvn4yhFiUQaFpg0aJFz+7q6rpeRApNF6MAAgi0VUBVr/J9/9i2Nq2xWSIOYEVZHceJnvP7ohpzswwBBJIrEIZh+JKJiYnvJjciyfIgUCqVZm/fvv1jIjKYh3mZEQEEEiMQ/Tl47pw5c84olUpTiUlFkEQLFIvF54ZheB2PG0n0ZSIcAvUKXO/7/uH1bmI9AggggAACCCDw4A/Wvywih6KBAAIIZEAgVNX3BkGwmjvEZ+BqZmSEUqlkbdmy5TsicmRGRmIMBPIm8FbP8z6exKETcwDLdd1TVPVTSUQiEwII1C2wubu7+9ljY2M76t7JBgRiFhgaGjrRGBP9+bJrzKUphwACCPy7wK9VdfHo6Oi3oEGgHgHHcb4tIi+uZw9rEUAg8QLv9H1/feJTEhABBBBAAAEEEingOM5jHnwc4X8nMiChEEAAgdoE7gvD0J2YmIgOlfJCIDECxWLxVFW9IDGBCIIAAvUIhCIyz/O8P9SzqV1rE3MAa/HixY+enJyMkOa0a3j6IIBASwXO9H3/PS3tQHEEahRYuXLlAWEYBsaY59e4hWUIIIBAPQL64A8Jlo+Ojv6lno2sRcBxnBNFpIIEAghkSmAqDMO5ExMTd2ZqKoZBAAEEEEAAgXYLGMdxSiLyXhFJzHc57UagHwIIpFPAGLNFVf+bx7Kn8/plOfXAwMDjwjDcLCJ7ZHlOZkMgwwIbPc87KqnzJeov7Y7jfJpHRSX1rUIuBOoWmFbVw4MguKHunWxAoAUCpVKpa8eOHe+JbnfMI55aAExJBPIr8NtqtfrGtWvXXpVfAiZvVGDJkiWz77///l+IyBNqrqF89VKzFQsR6JzApb7vv65z7emMAAIIIIAAAlkSGBgYOL5arX5GRB6dpbmYBQEEMi1wpaouCoLgnkxPyXCpFIjOIxhjBlMZntCxCUSHZKKPWXmlUuBNnucl9g52iTqA1d/f/0LLsqLnrfJCAIEMCBhjfjo5OXlYpVKZysA4jJARgRUrVrzcsqyLRGTfjIzEGAgg0BmB6K5XF23fvn3Z+vXr7+tMBLqmXcBxnA+JCHcMTfuFJD8C/yZgjFnoed7XgUEAAQQQQAABBOIS6O/vP9SyrC+IyIFx1aQOAggg0AKB6DzDmVNTU6VKpVJtQX1KItCUwMDAwAvDMLyGnzc2xchmBDopMG1Z1uPHx8fv6mSIR+qdqANYUVDHcaJfgB+cVDByIYBA3QI8irBuMja0WuC0007btbe3d72IuK3uRX0EEMiegKreFobhm7jrVfaubTsnsm37ScaYn4vIrHb2pRcCCLRc4HdTU1NP5MuGljvTAAEEEEAAgdwJLF68+NGTk5MXisjrczc8AyOAQBoE7isUCoPj4+PRYVFeCCROYMGCBV3z5s3bJCLPSFw4AiGAQE0CxpivlMvlV9e0uEOLEncAy3XdYVVd0yEP2iKAQPwCM5ZlvbBcLl8Xf2kqItCcwIoVK/osy/qEiOzeXCV2I4BATgRmVPX8MAxXrV279v6czMyYLRJwXfdLqprofyy2aHTKIpB1gff7vv/BrA/JfAgg0GEBnpfR4QtAewQ6K+C67hJVjX5Y2NPZJHRHAAEE/k/ghpmZmRMvueSSX2KCQFIFHMdZaYxZndR85EIAgZ0LqKrj+36w85WdW5HEA1iPV9XfikhX51jojAACMQts3muvvZ6zbt267THXpRwCTQucccYZ+83MzHxaRI5uuhgFEEAgswJhGEa/jjrl7LPPviGzQzJY2wQcx1koIl9rW0MaIYBAuwSq1Wr1iRdffPHv2tWQPggggAACCCCQTwHXdY9U1UtEZF4+BZgaAQSSIqCqF+69997v5PufpFwRcjyUQLFYfKKq3igicxBCAIHUCjzwmMc8Zu/zzz//r0meIHEHsCKs/v7+yyzLek2S4ciGAAL1CajquUEQLKtvF6sRaJuAWbly5amqeraIPKZtXWmEAAJpEPizqr5v9uzZ55dKpZk0BCZjsgUWLlzYu/vuu0cf+ByY7KSkQwCBBgS+6vv+qxrYxxYEEEAAAQQQQKBugb6+vj17enrGReTldW9mAwIIINC8wH2WZb2pXC5f3HwpKiDQUgHjOM6VxphjWtqF4ggg0FKB6McHvu8vammTGIon8gCWjuWqjQAAIABJREFUbdv/bYz5YgzzUQIBBJIjEBpjFnie953kRCIJAv8qsGrVqsdXq9XzReS12CCAAAKq+hURecvo6Ojv0UAgLgHbtlcZY86Mqx51EEAgOQKq+togCC5LTiKSIIAAAggggEAOBKIvld8tImfxSMIcXG1GRCA5Ater6qIgCG5LTiSSIPDQAtGje0Xkk/gggEC6BcIwTMXnbok8gLVgwYKuuXPnRrfs3yfdbwPSI4DAvwlEfxl/tu/79yGDQJIFVqxY0WdZVnQQa48k5yQbAgi0TODmarX69rVr117Vsg4UzqVAX1/fU3p6en4qIrvkEoChEci2wB+2bt36hI0bN3K3xGxfZ6ZDAAEEEEAgkQK2bc83xkxwp91EXh5CIZAlAbUs69wdO3asqlQqU1kajFmyKeC67uNF5Ocisls2J2QqBHIjcO9dd921z+WXXz6Z9IkTeQArQnMcZ0REhpIOSD4EEKhPQFXHgyB4Q327WI1A+wVWrVq1d7VaPVdE7PZ3pyMCCHRI4F5jzAdnzZq1nscNdugKZLyt4zjfEBFud57x68x4uRVY7fv+qtxOz+AIIIAAAggg0HGBvr6+R3V3d3/MGDPQ8TAEQACBLApsFZHFvu9fmcXhmCmbArZtf8GyLJ54ks3Ly1T5ErjI87xT0jByYg9gDQwMPLVarW4WkcRmTMMFJiMCCRVY5Pv+JQnNRiwE/kVgxYoVL7Es6+Micgg0CCCQWYFQVf0wDJevXbt2W2anZLCOCjiO44pIuaMhaI4AAq0SUFV9Co/faBUvdRFAAAEEEECgHoFisdhXrVY/box5XD37WIsAAgg8gsBnp6am3lKpVO5GCYG0CBSLxUWqGt0dkhcCCKRcQFWP8X3/6jSMkejDTa7rXqWqR6cBkowIIFCXwL2q+qwgCH5T1y4WI9AhgSVLlnTvvvvu71bVkojM6lAM2iKAQGsErq5Wq+9eu3Zt9Fg4Xgi0RKCvr2/3np6eX4jIXi1pQFEEEOi0wFW+7x/b6RD0RwABBBBAAAEE/iFwyimn7H3//fdfYFnWa1BBAAEEmhC4zxizwvO8C5qowVYE2i7Q39+/R1dX189Vlc/i2q5PQwRiF/jj5OTkvEqlUo29cgsKJv0A1utU9XMtmJuSCCDQeYFrpqamXpqW/7HsPBcJkiAwNDR0kDHmoyJyXBLykAEBBJoSiA7DrBgZGflqU1XYjEANAsVi8aIwDBfXsJQlCCCQTgHu8JvO60ZqBBBAAAEEsi5gXNc9VUTOUdVHZX1Y5kMAgXgFVPWb0SMH+SF9vK5Ua4+A67rRU3he355udEEAgRYLrPU8b0WLe8RWPtEHsObPn9990EEH/doYs29sE1MIAQSSJLDK9/3VSQpEFgRqEVi+fPkxhULhPB5LWIsWaxBInMBWY8wHZ82ataFUKs0kLh2BUiIQ/TNKa8ra398fPcr2WzxavSYuFiGQRoE777777nmXX375ZBrDkxkBBBBAAAEEsi9w0kknPdmyrAsty1qQ/WmZEAEEYhCI7no19OBdr2r78COGppRAIC4BHj0YlyR1EEiGgGVZzxwfH0/NE0wSfQAruqSO43xARN6XjMtLCgQQiFlgemZm5gWXXHLJ9THXpRwCLReIHku42267vVVEPigij2l5QxoggECzAvcYY0YmJyfPW7du3fZmi7EfgVoEli5dusu2bdt+LCIH1bKeNQggkD4BVT03CIJl6UtOYgQQQAABBBDImYBxHOdNIjLC51g5u/KMi0B9AlcWCoVTx8fHf1vfNlYjkAyBYrEYPXLwRh49mIzrQQoEYhDY5Hnec2Oo07YSaTiANU9EfiUiXW1ToRECCLRT4Lbu7u75Y2Nj97azKb0QiEtg6dKlc3t6ej4sIgMiYsVVlzoIIBCbwAOqut6yrJE1a9bcE1tVCiFQg4Bt22cbY5bXsJQlCCCQTgG1LOvQcrkcPdaWFwIIIIAAAgggkHiBRYsW7dfV1fUJVX1F4sMSEAEE2ilwr2VZy8vl8oaab/ndznT0QqBGAdd1LxWR42tczjIEEEi4gKq+0/f99QmP+S/xEn8AK0pr2/YXjDGvTRMsWRFAoHYBVf18EAQn1r6DlQgkT+D0009/WrVaHTHGvCp56UiEQC4FplR1TEQ+MDo6ensuBRi6owKO4xwhIt8VkUJHg9AcAQRaJqCq3wyC4OiWNaAwAggggAACCCDQIgHbtovGmLUiEt0phBcCCORb4BJjzFLP8/6QbwamT7uA4ziLjTEXpX0O8iOAwP8JTE1OTs6rVCp3pMkkFQewisXicWEYfj1NsGRFAIG6Bd7u+/7H6t7FBgQSJrB8+fJjCoXC2SLyrIRFIw4CeRHg4FVernSC51y4cGHv7rvvvklEDk1wTKIhgECTAmEYHj8xMfHFJsuwHQEEEEAAAQQQ6IjA4ODgrtPT0x8Qkbfxw5GOXAKaItBpgejpQ2/zff/yTgehPwLNCgwMDMwNw/BGEdmt2VrsRwCBZAio6qW+778uGWlqT5GKA1giEj2f/GYRObD20ViJAAJpEjDGTIrIkZ7n/ShNucmKwEMJ9PX1FQ444ICiZVnvF5EDUEIAgbYI7FDVC0VkNXe8aos3TR5BwLbtNcaYYZAQQCDTAr/dunXrkzdu3DiT6SkZDgEEEEAAAQQyL2Db9rOMMdEPY4/M/LAMiAACkUD0b5jzp6amzqhUKn+FBIG0C5RKJWvLli1Xigh3qE77xSQ/Av8kEIbha4MguCxtKGk5gCWu665Q1dG0AZMXAQRqFzDG/HJycnJ+pVL5c+27WIlAcgWWLFnSvfvuu5+squ8TkbnJTUoyBFIt8FdV3TA9PT26bt26ramehPCZEFi0aNGzC4XCdSLSnYmBGAIBBB5OYJXv+6vhQQABBBBAAAEEMiJgHnwsYXRXdx5LmJGLyhgI/LuAMeZqVV3q+350pyBeCGRCIDpDICKcIcjE1WQIBP4uYIzZdtNNN83btGnTdNpMUnMAa2Bg4HHVavX3IjIrbcjkRQCB2gWMMRXP815f+w5WIpB8gVKp1LNjx45BVY1u675P8hOTEIFUCNxhjDlfRD66Zs2ae1KRmJCZF3jw0YM/FJGnZ35YBkQgxwLR3XuNMU8ol8vbcszA6AgggAACCCCQQQEeS5jBi8pICPxd4FbLss4ol8sVQBDIkoDrus8RkWtFpCdLczELAnkXMMZ8pFwuL02jQ2oOYEW4tm1/xhgzkEZoMiOAQF0C7/R9f31dO1iMQAoESqXSox544IG3GGOWicjeKYhMRAQSJ6CqvzLGnDM1NbVh3bp12xMXkEC5FnAcZ0REhnKNkMLhNfpVVQpzE7mjAmXf9/lsoqOXgOYIIIAAAggg0EqB6AttVY0eS3hEK/tQGwEEWi5wr6p+8Oabb/6fNN5FpOU6NEi1QLFYnCMiP1TVg1M9COERQOA/BMIwfHYQBDekkSZVnzM/+Jf+TWmEJjMCCNQlEN1O8Cjf979X1y4WI5ASgXe84x29c+bMeYOqvldE5qUkNjER6KhAGIbR3wHPmzNnTlAqlWY6GobmCDyEQH9//0ssy/qmiFgAIYBAtgUsyzqiXC5HjxrlhQACCCCAAAIIZFnAOI5zsoicxQ8Js3yZmS2jAlUR+VQYhu+dmJi4M6MzMlbOBQYGBqL3+Ck5Z2B8BLIo8DPP8/4rrYOl6gBWhOy67ndU9YVpBSc3AgjULPDH3t7e+Rs2bLi95h0sRCBlAtFBrNmzZ0ePJhwyxjwpZfGJi0A7BKZV9XOWZa1bs2bN9e1oSA8EGhHo6+t7bE9Pz09EZP9G9rMHAQTSI6CqPwqCYH56EpMUAQQQQAABBBBoTiC6w4iqvl1VTxeRxzZXjd0IINAGgW+FYXjaxMTET9vQixYIdETAdd3XicjnOtKcpggg0GqB0zzP+2irm7SqfuoOYDmOc6KI8IziVr0jqItAsgSu2bp169EbN27kTifJui6kiVmgr6+vcMABB5xgWdZyETk85vKUQyB1Aqq6zbKsi8IwPH90dPT3qRuAwLkTcBynHP1WJHeDMzAC+RQY9H3/M/kcnakRQAABBBBAIM8C/f39e4jIGYVC4S2q2ptnC2ZHIIkCxpgtYRguD4LgsiTmI1PWBaIjB9qWIQcGBuaGYRj9EPJxbWlIEwQQaKfAjsnJybmVSuXudjaNs1fqDmBFX1L39PTcKiJPjBOCWgggkEwBY8w6z/Pencx0pEIgfoHh4eHoLo/vFJETRKQQfwcqIpBcgegxg4VC4YLJycnyunXrtic3KckQ+P8C0S/uoju1YYIAArkQuLO7u3u/sbGxHbmYliERQAABBBBAAIGHEFi0aNF+lmW9xxjzRj674i2CQOcFjDF3iMg5d91110cuv/zyyc4nIgECrRNYsGBB17x5864WkRe3rguVEUCggwKe53nFDvZvunXqDmBFEzuOMyQiI01PTwEEEEiFgKoOBEEQ3VmCFwK5ERgaGjrIsqx3qmr0F41H52ZwBs2jwF9ExBORj4+MjNyYRwBmTq9A9Iu7arUa3dJ/9/ROQXIEEKhDYLXv+6vqWM9SBBBAAAEEEEAgswLFYvEQVf2AqkZPLUnld02ZvTgMlheBu40x63t6es7ZsGFD9PkaLwQyL+C67pkiwr/LM3+lGTCvAmEYviQIgmvSPH8q/1Js2/ZuxpjocTSz04xPdgQQqE3AGPNXVT3S932+mK+NjFUZEhgaGnq0ZVn9YRi+wxjz9AyNxig5F/jH3a7CMJwYHR3lQ6Kcvx/SOH6pVLK2bNlypaoencb8ZEYAgboFqqr65CAIflP3TjYggAACCCCAAAIZFnAc5wXGmDWqGt3VnRcCCLReIPoc7aNTU1NrK5XKn1vfjg4IJEOgv7//pYVC4UruvpiM60EKBOIWMMbcXC6XD2nb80zjHuDBeqk8gBVldxzn4yLy5ha5UBYBBJIn8KswDA+fmJi4M3nRSIRAWwTM0NDQMar6NsuyXikiXW3pShME4hX4o4iMW5b16dWrV2+OtzTVEGivgOM4p4vIWe3tSjcEEOigwGW+77+2g/1pjQACCCCAAAIIJFrAtu1XGGPOEJEjEx2UcAikV+A+EVlfKBTWjY+P35XeMUiOQP0Cg4OD+8zMzPxYRPapfzc7EEAgDQKWZS0bHx8/Nw1ZHyljmg9gPU1EfsatbdP+FiQ/ArULhGG48ZZbbnnZpk2bpmvfxUoEsicwNDS0rzFmUEQWi8iTszchE2VMYIeIfFVVx2fPnv21Uqk0k7H5GCeHAtEvvEVkI4dhc3jxGTm3AsaYl3me943cAjA4AggggAACCCBQo0B/f/9LLMtaKSIvr3ELyxBA4JEF/myMOS8Mw3VBENwDFgJ5E+jr6yvMmjUrugv9S/M2O/MikCOBqcnJyXmVSuWOtM+c2gNYEbzjOFeIyMvSfhHIjwACtQsYYz7ued5ba9/BSgQyLWBWrlx5VBiGpxhjjheRWZmeluHSJFCNDqeoqm+MuXRkZITboafp6pH1EQX6+vp27+npiX5x9wSoEEAgNwI/833/GWm/BXpurhaDIoAAAggggEAiBBYtWvTsrq6u01X1dSJiJSIUIRBIl8AfVfVjPT09/zM2NnZvuqKTFoH4BFzXPVNEVsVXkUoIIJBAgQnP8+wE5qo7UqoPYD14S9uv1j01GxBAINUCqvrWIAiix5DyQgCBBwVOO+20XWfNmnWiqhZF5EXcIZK3RicEwjC8vlAoTIRheMno6OjtnchATwRaLGBs277UGMNjyFoMTXkEkiSgqicHQTCWpExkQQABBBBAAAEE0iJg2/aTjDHvEpEl/HgwLVeNnB0WuNUY87E999zzgnXr1m3vcBbaI9BRgWKxeJyqfo2DvB29DDRHoOUCYRi+NAiCb7W8URsapPoAVqlUsm699dboMYSHtMGKFgggkByBaVU9Liv/Q5wcVpJkRWBoaGieMSb6dWH0mMJnZWUu5kiswE3GmEq1WvXPPvvsWxObkmAIxCBg2/Y7jTEfjaEUJRBAID0Cf7z77rsPuPzyyyfTE5mkCCCAAAIIIIBA8gQcx5kXhuEyy7JOFZE5yUtIIgQ6LnCVMeYcz/Oip/9ox9MQAIEOC9i2vb9lWT8UkT06HIX2CCDQWoFfep53YFb+7Ev1AazoOheLxTeGYXhha6851RFAIIECd87MzBxxySWX/DKB2YiEQGIEVqxY8axCoRDdGatPRJ6amGAESbNAqKrXWpb1eVX9/MjIyG/TPAzZEahVwLbt+ZZlfU9Ve2vdwzoEEMiEwHt8348ed8ALAQQQQAABBBBAIAaB/v7+PYwxbzbGRHfE2i+GkpRAIM0CU6p6sWVZ53qe95M0D0J2BOIUGBwcnDUzM/NdEZkfZ11qIYBAIgWGPM87O5HJGgiV+gNYCxcu7N19991/JSKPb2B+tiCAQLoFbp6amjqyUqncne4xSI9AewSGh4efKSInikh0GOug9nSlSxYEVPV+Y8w3VPUrXV1dXznrrLP+lIW5mAGBWgUGBwd3nZmZ+aGqPrnWPaxDAIFMCDxQKBSeMD4+flcmpmEIBBBAAAEEEEAgQQJ9fX2Frq6uV1uW9RYROVZEUv99VYJ4iZJ8gXtE5JO9vb3rN2zYcHvy45IQgfYKuK47JiJvaG9XuiGAQAcEpowx+5XL5W0d6N2Slpn4C63jOCtFZHVLhCiKAAKJFgjDcOPMzMxxlUplKtFBCYdAwgROP/30g8MwfI2IvFpEni8ihYRFJE6HBVT1dyLyVWPMl3bZZZdvlUqlHR2ORHsEOiLw4GPPLxORV3UkAE0RQKCTAuf7vv+2TgagNwIIIIAAAgggkAcB27ajx85Ed8U6WUR2y8PMzJhbgeuNMRdOTk4GlUrlr7lVYHAEHkHAcZy3GWP+ByQEEMiFgOd5XjFLk2blANZjRCR6/M1js3RxmAUBBGoTiG7RGwSBnZVnw9Y2NasQiE9g2bJlexQKhVcaY6LDWEeLyK7xVadSigS2i8h3ROSKarV65dq1a3+WouxERaBlArZtv98YU2pZAwojgEBSBcKpqamDKpXKlqQGJBcCCCCAAAIIIJA1geiJJ3vsscdrwjB8l4i8IGvzMU9uBf6sqpeEYfiJiy+++Me5VWBwBGoQcBznCGPMt0Wkp4blLEEAgZQLqOrzfd//fsrH+Jf4mTiAFU3kuu65qro0SxeHWRBAoC6B9/u+/8G6drAYAQT+QyC6/fv+++9/eFdX13FhGL7MGHM4d8fK7BtFRSQ6ZPUNY8wVk5OT31m3bl10CIsXAgg8KOC67stV9asiYoGCAAL5ElDVLwZBcHy+pmZaBBBAAAEEEEAgOQInnXTSYV1dXW8VkdeLyOzkJCMJAjUJqDHmGlW9sLu7+3NjY2PcWb4mNhblWeCUU07Ze8eOHZtEZG6eHZgdgbwIGGN+XC6Xn5O1eTNzAMtxnHki8ktOxGbtLco8CNQsoKr6hiAIyjXvYCECCOxU4LTTTtu1q6vrKMuyFhhjXiIi/8VBhJ2yJXVBKCI3qmr0C6JvV6vVa84555w7kxqWXAh0WsC27f2NMT8UkT06nYX+CCDQEYEX+r7/vY50pikCCCCAAAIIIIDA/wksXbp0lzvvvPNVYRgOiMjLRaQLHgQSLPAnEbnEsqxPlctl7i6f4AtFtGQJ9PX19fT29n6Tux8m67qQBoFWCoRheHIQBGOt7NGJ2pk5gBXhOY4THbxwOwFJTwQQ6LyAMWayWq0eNzExER0u4IUAAi0QWLly5W5hGL7IGLMgDMMXWpb1LBHpbkErSjYv8ICqRr8Yim7f+t3p6envrlu37u7my1IBgewLRB/w33HHHd9T1Wdnf1omRACBhxC4zvf9I5BBAAEEEEAAAQQQSJaA67qPD8NwkTHGEZH5yUpHmhwL7AjD8PKuri7vpptu+vKmTZumc2zB6Ag0JFAsFi9Q1VMb2swmBBBIo8CdXV1d+2XxDpGZOoDluu4zVTV6fnKm5krjf2PIjEAHBe4VkRf7vn9jBzPQGoHcCESHFHp6euYbY54XhmH0fPboy8rorpS82isQPU5wi4hcFx24MsZ8f9asWT8plUoz7Y1BNwSyIdDf3z9mWdYbsjENUyCAQL0CxpiTPM/7bL37WI8AAggggAACCCDQPoFisXhIGIbRQazo/w5oX2c6IfA3geiRgleIyGd7e3u/vGHDhr/g0jmB6Evh6MNRXukUsG17qWVZ56YzPakRQKARAVVd7fv+qkb2Jn1P5g4q2bb9dWPMcUmHJx8CCLRUYGuhUDhyfHz8ty3tQnEEEHhIgaGhoX2NMc9W1Wc9+P+fbYx5ElyxCUS/ovt5dOj8wYPnNxhjbhgdHeWDntiIKZRnAdd1362q5+TZgNkRyLnAr7du3Xrgxo0bOcSc8zcC4yOAAAIIIIBAagRMf3//CyzLcowxr1PVPVOTnKCpEnjwCRxXWJZVEZEv+b5/X6oGICwCCRRwXfdYEfkaj5dN4MUhEgKtE6jO/D/27gRKrqra//jet6qHJBCQBFQCKBJCAvJAAoiCGsUpgjiWpKtulU2EOCt5f+eJdnhOz2fkgagxJE3XvdWNpSiDRBGF5zxFAWWGoDITCGOG7uq6+7+uxvcACemuruEO31qrV0e8Z5/f/pxK0qk6de74+NyRkZG/tG6KzlVO3AasJUuWHJvJZC7tHCkzI4BARASuzWQyLxgaGrovInmIgUCqBT74wQ/uIiKHqOqBQRAsCL+LyHxOy3rSp0XNzG5Q1WtE5Npw01X4fdq0adcPDAyMpfoJRfMItEjAdd1XmtlFIpJp0RSURQCB6Ass933/K9GPSUIEEEAAAQQQQACBxwvkcrlMd3d3eDr7CSLyahFZgBICUxQIX4O7xMyqtVrt/Gq1+uAU6zEcAQS2Cbiue0B4NwcR2RUUBBBIlcB3Pc97fVI7TtwGrHChCoVCePudI5O6aPSFAAITEzCzX+20004vXbly5eaJjeAqBBBot8C73/3umdOmTZuvqnNFJDwlaz8z22/biVlz2p2nA/NtNbObzWy94zjh95szmcz6er1+8wMPPLB+5cqV4WlXPBBAoA0C/f3982u12q940acN2EyBQHQFHujp6dmH24dEd4FIhgACCCCAAAIITEYgn8/vr6onqOqrzewYPmwzGb1UX3tPeHtBVV2bzWbXDg4OPpBqDZpHoAUChUJhpqqGr8OFH9TmgQACKRKo1+vHDg8P/ySpLSdyA5bruieY2flJXTT6QgCBSQl8//bbb38ttxCZlBkXIxAJgYGBgd5NmzbtLSLhLQ33UdVwQ9aeQRCEv95dVWeLyFNFJDxdK2qPrSJyr4hsMLO7ReRuVb1VRO4IgiD8fpuZ3fGlL30pfEGHBwIIdFggn88/RVXDD3Hs3+EoTI8AAh0UUNXPep730Q5GYGoEEEAAAQQQQACBFgnkcrndent7jw2CIDwZKzwhK4qvJ7Woe8ruQKAuIleY2aXhqdgHHHDALwcGBgLUEECgNQILFy7sWrBgwfdFJLz9IA8EEEiXwLWe5x0kIpbUthO5AUtEtFAo/DG81VFSF46+UiIQ/tGT1N+lbVxCM1tTqVTekuQ/zNvIyVQIRE5gYGCge/PmzbODIJjtOM4sVd1JRHbe9v0p4a/NbJqZhf9dVHVm+IlHVe0xs+lP0lD4QsvfjxU3s/AkvVER+ft/U9VHzOyh8CuTyTw8Pj7+oOM4D3R3d9+XzWY3DAwMPBI5KAIhgMATCixatCi75557XqyqvOjDcwSBdAtsdhxn33K5zObodD8P6B4BBBBAAAEEUiCwePHinl133fVox3FeLCLhV3hHla7mtc4L+82zbFmlO83sB47j/CAIgh9VKpX7WzYThRFA4DECruueJSJvhwUBBNInYGbv9H0//DMgsY/Ebu1wXfdNZnZuYleOxhBAYFICZnZ6pVI5dVKDuBgBBBBAAAEEEi9QKBROF5H3JL5RGkQAgR0J/Lfv++/d0UX8/wgggAACCCCAAALJEygWizOCIDhaRBZt25B1uIhkk9dpqju6NwiCX2YymZ9v23B1JR/YTvXzgeY7JOC67kdE5D86ND3TIoBAZwUemDlz5t5nnXVWog8wSOwGrIGBAefGG2+8SkTCI8x4IIAAAqHAp3zfPw0KBBBAAAEEEEAgFHBd961m9nU0EEAg9QI1M9u/Uqn8NfUSACCAAAIIIIAAAghIuCFLVZ8XBMExZhZuzHqhiHRDEyuBO1X15yLyiyAIfl6pVP7AhqtYrR9hEyhQLBZzZjYiIk4C26MlBBDYscAXPM/70I4vi/cVid2AFS5LPp8vqeo58V4i0iOAQJMF3uf7/n81uSblEEAAAQQQQCBmAvl8/jWq+p3wlqQxi05cBBBosoCqnu153slNLks5BBBAAAEEEEAAgYQILF26dOctW7YclslkFppZeDpW+DVXRBL9HluMlq8mIuvM7Jdm9rNsNvtLbi0eo9UjaioESqXSMeHpcyLSm4qGaRIBBB4vUOvq6tpvzZo1tyadJtE/HC5atCg7Z86cG0Rk36QvJP0hgMCEBUxV3+Z53soJj+BCBBBAAAEEEEiUQKlUOrJer18mItMT1RjNIIBAIwJ1M1tQqVRubGQwYxBAAAEEEEAAAQTSKZDL5XbJZrML/7kpS1XDzVn7pVOjrV3fr6pXmdlV4XdVvSKTyfx5cHBwa1tTMBkCCExYIJ/PP8txnF+LyO4THsSFCCCQKAFVLZfL5VKimtpOM4negBX2zG1F0vA0pkcEJi0QqKrred7wpEcyAAEEEEAAAQRiLRC+6KOqvxKRPWLdCOERQKBZAuf6vr+kWcWog0BqBMJXFC013dIoAggggAACExLI5/NPCTdljY+PH6yqBwRBcIDjOAeIyNMnVICLHi1QF5Gbtm22ujIIgqu6urquHBoa+htMCCAQH4FSqTQrCIJfisi8+KQmKQIINFtgfHwE6Mm8AAAgAElEQVT8sJGRkT82u24U6yV+A9bixYt7dtttt5tEZK8oLgCZEECgYwI1x3GWlMvl8zqWgIkRQAABBBBAoK0CuVxut+7u7l+IyPy2TsxkCCAQVYHwdNzneJ53ZVQDkgsBBBBAAAEEEEAg/gLhaVmO48zLZDLzHccJ/z06z8wOUNXwe0/8O2y4g5qq/tXM1otI+HVL+F1V10+fPv26lStXbm64MgMRQKDjAsuXL5+2YcOG8LaDR3c8DAEQQKBjAqp6WblcfknHArR54sRvwAo9Xdd9r5l9pc22TIcAAtEXqJlZrlKpnB/9qCREAAEEEEAAgakI9Pf399ZqtR+KyAunUoexCCCQKIGLfN9/daI6ohkEEEAAAQQQQACB2AgMDAw4N9xww96qupeqzjGzPR3H2SsIgvDErPC/P93M5ojItNg09aigqrrBzDZs+36HqoYbrG6p1+vrw01X9Xr91mq1Gp50xQMBBBImkMvlMr29veea2RsS1hrtIIDA5AWO9zzv+5MfFs8RqdiAtWzZsumbNm0Kd88/NZ7LRGoEEGihwFgQBG8cHh6+sIVzUBoBBBBAAAEEOigQvuiTzWarjuO8roMxmBoBBCImkMlknj80NBTekpQHAggggAACCCCAAAKRFQhPc+7t7d3TzMLNWbNEZKbjODODIHiKqu4S/u9tX4/+9a4iEn41+j7guIg8LCJbRWSLiGwSkTERecjMxh3HeSAIggdV9S5VvTfcaFWv1+/OZDL3dHV1bdi0adMGNldF9ilFMARaLlAsFv/bzN7d8omYAAEEIi2gqtfvt99+Bw4MDASRDtrEcI3+4NXECO0plc/nl6vql9szG7MggECcBFR1NAiC11cqlYvjlJusCCCAAAIIIDAhAc3n8ytV9eQJXc1FCCCQFoHLfN9PzfHnaVlU+kQAAQQQQAABBBDYvsC2E7fCTVr/8qjVaprNZp2enp7xwcHBB3BEAAEEGhUolUoDQRCc1uh4xiGAQKIE3up53spEdbSDZlKzAWvbLUduEpHwuFYeCCCAwOMFwk/vvMH3/YugQQABBBBAAIHkCOTz+c+r6geT0xGdIIBAMwQymczLhoaGLm1GLWoggAACCCCAAAJNFQjftbGmVqQYAggggAACbREoFounmFmqNlu0BZZJEIinwIbdd9/9GStWrAhP0kzNIzUbsMIVzefz71LVM1KzujSKAAKTFQiPU36N7/uXTHYg1yOAAAIIIIBA9ARc1/13M/uv6CUjEQIIdFjgt77vP7fDGZgeAQQQQAABBBBAAAEEEEAAgcQIFIvFV5vZeSKSTUxTNIIAAg0LOI7zyaGhoYGGC8R0YKo2YC1evLhnt912u1FE9o7pehEbAQRaL7BVVd/oed73Wz8VMyCAAAIIIIBAqwTy+XxJVQdFJFX/5mmVJ3URSJJAEASvGx4e/l6SeqIXBBBAAAEEEEAAAQQQQAABBDolUCqVjgmCIDzcYFqnMjAvAghESmBLb2/vvqtWrbo7UqnaECZ1b0YUCoW3icjX2mDLFAggEF+BMcdx+srlcrhTnwcCCCCAAAIIxEzAdd0TzOw7fOIuZgtHXATaI3CF7/uHcWOf9mAzCwIIIIAAAggggAACCCCAQLIF3vzmNx9Ur9d/JiJPSXandIcAAhMVUNWvlsvld030+iRdl7oNWAsXLuyaP3/+9SKyb5IWkl4QQKDpAnUzW1qpVIaaXpmCCCCAAAIIINAyAdd1X2ZmF4hIb8smoTACCMRWQFVf43le+GcEDwQQQAABBBBAAAEEEEAAAQQQmIJAqVTaJwiCcPPVPlMow1AEEEiWQG18fHzeyMjIX5LV1sS6Sd0GrJDFdd2TzeybEyPiKgQQSLFAXVVP8TxvTYoNaB0BBBBAAIHYCPT19R3jOM4PRGRGbEITFAEE2imwzvf9Izj9qp3kzIUAAggggAACCCCAAAIIIJBEgaVLl+45NjYWbr56VhL7oycEEGhY4BzP8/obHh3zgancgJXL5TJdXV3XqOq8mK8f8RFAoPUCZmbvqVQqZ7Z+KmZAAAEEEEAAgUYFXNd9voj80Mx2arQG4xBAINkCZnZcpVK5ONld0h0CCCCAAAIIIIAAAggggAACrRXo6+ub7TjO5ap6UGtnojoCCMRMwDKZzMHnnHPO1THL3bS4qdyAFeoVCoU3i8hg0yQphAACSRYwEXm/7/v/leQm6Q0BBBBAAIG4ChQKhaNE5BIR2TmuPZAbAQRaLvBr3/ef1/JZmAABBBBAAAEEEEAAAQQQQACBBAsUCoWZqvpjETk8wW3SGgIINCCgqt8pl8tvbGBoYoakdgNWeApWd3f3n0VkfmJWk0YQQKClAmb2hUql8mFuWdJSZoojgAACCCAwKYF8Pn/othd9dpvUQC5GAIFUCajqyz3P+1GqmqZZBBBAAAEEEEAAAQQQQAABBJoosHz58mkbNmxYKyIvamJZSiGAQEIEVPWIcrn8+4S001Abqd2AFWoVCoUTRWSkITkGIYBAKgUcx/nm1q1b316tVuupBKBpBBBAAAEEIiTguu5hZhZuqGDzVYTWhSgIRE1AVX/ued4LopaLPAgggAACCCCAAAIIIIAAAgjERWDhwoVdCxYs+K6IHBeXzOREAIH2CZjZJb7vv6J9M0ZzplRvwBIRLRQKvxORhdFcHlIhgEBEBc7v6upaMjg4uDWi+YiFAAIIIIBA4gXy+fxCVQ1vO8jmq8SvNg0iMDUBM3tJpVK5bGpVGI0AAggggAACCCCAAAIIIIBAOgXCO0v19PRURORN6RSgawQQmIDAiz3Pu3wC1yX6krRvwBLXdV8W7sZL9CrTHAIItEIgfAPntb7vP9SK4tREAAEEEEAAge0LFAqFo0XkYhGZiRMCCCCwA4Gf+b7/QpQQQAABBBBAAAEEEGhEIHwTzRoZyBgEEEAgIQIDAwPOzTffPGhmxYS0RBsIINB8gd94nndU88vGr2LqN2CFS+a67qVmdmz8lo/ECCDQYYHfjo2NHV+tVjd0OAfTI4AAAgggkBqBvr6+F2UymYvMbKfUNE2jCCDQsICqvtDzvJ81XICBCCCAAAIIIIAAAggggAACCKRXQF3X/bqILEsvAZ0jgMCOBFT1hHK5fOGOrkvD/88GLBEpFouHB0Hw2/CWhGlYdHpEAIGmCqxX1Vd5nnd9U6tSDAEEEEAAAQT+RYDNVzwpEEBgkgKX+L7/ikmO4XIEEEAAAQQQQAABBBBAAAEEEBDRYrH4DTM7BQwEEEDgSQSu8jzvUA4N/YcQG462PVNc1/2WmeX4rYMAAghMVkBVN6jqq8vl8m8mO5brEUAAAQQQQGBiAq7rvtLMzhORaRMbwVUIIICAPM/3/V/jgAACCCCAAAIIIIAAAggggAACkxIIN1+dYWbvnNQoLkYAgTQKvNHzvO+ksfEn6pkNWNtU8vn8/qp6tYh08eRAAAEEGhDY6jhOqVwuVxsYyxAEEEAAAQQQeBKBvr6+1zqOMywivUAhgAACExFQ1Ys9zztuItdyDQIIIIAAAggggAACCCCAAAII/J+A67pfFJH3Y4IAAgjsQODPc+fOPWRgYCBA6h8CbMB61DOhUCiE97B9K08OBBBAoEGBupm9u1KpfK3B8QxDAAEEEEAAgccJFAqFt4nIV0XEAQcBBBCYoIA5jnNkuVz+/QSv5zIEEEAAAQQQQAABBBBAAAEEEBCRYrH4OTP7EBgIIIDAjgRU9Q3lcjm8awWPbQJswHrUU2Hp0qV7jo6O3igi03mGIIAAAo0KmNkXKpXKh7nXbaOCjEMAAQQQQOAfAvl8/mOq+mk8EEAAgckIqGrV87w3TWYM1yKAAAIIIIAAAggggAACCCCQdgFOvkr7M4D+EZiUwJWe5z2H98Mfa8YGrMc9hwqFwmdFJNw4wQMBBBCYisB5M2bMKK5cuXLzVIowFgEEEEAAgZQKaD6f/6Kqvi+l/dM2Agg0LlAzs4MqlUr44SoeCCCAAAIIIIAAAggggAACCCCwYwEtFotfNrNTd3wpVyCAAAIijuO8fmho6LtYPFaADViPe0b09/fvOjY2dpOqzuLJggACCExRYF1PT88Jq1evvmOKdRiOAAIIIIBAagQWLVqUnTNnzurwxPPUNE2jCCDQTIGzfN9/ZzMLUgsBBBBAAAEEEEAAAQQQQACBBAuEm69ON7N3J7hHWkMAgeYK/Hnu3LmHDAwMBM0tG/9qbMB6gjXM5/PvUdXT47+8dIAAAhEQuF1VT/A87w8RyEIEBBBAAAEEIi2Qy+V26u7uHhGR4yIdlHAIIBBJAVV9JJvN7j84OHhXJAMSCgEEEEAAgXQKqOu6HzOzm33fr6STgK4RQAABBBCIpsDAwIBz0003rRSRt0QzIakQQCCKApx+tf1VYQPWE9hs+9T9lSJyYBSf0GRCAIHYCWzKZDJFjmGM3boRGAEEEECgjQL9/f1Pq9VqF4nIwjZOy1QIIJAgAVX9pOd5AwlqiVYQQAABBBCItUB/f39vvV4/28zy2xr5wfj4+NtHRkb+EuvGCI8AAggggEACBHK5XKanp+dsEXlzAtqhBQQQaJ/AFZ7nHSYi1r4p4zMTG7C2s1b5fP41qvq9+CwlSRFAIOIC4RGMH/V9/wv8hRTxlSIeAggggEDbBQqFQvjBh4tF5Bltn5wJEUAgKQL39PT0zF29evXDSWmIPhBAAAEEEIizwNKlS/ccHR39nqoe8bg+NovIp0ZHR79UrVbrce6R7AgggAACCMRVINx81dvbu8bMinHtgdwIINAxgdd5nsc+mu3wswHrSZ6XhULhRyLy0o49dZkYAQSSKHCu4zhvKZfLm5LYHD0hgAACCCAwWQHXdZ9vZueLyOzJjuV6BBBA4J8CZvbuSqVyJiIIIIAAAggg0HmBYrF4+Laf8ffcXhoz+52qnuJ5XngnCh4IIIAAAggg0CaBXC7X3dvbWzGzN7RpSqZBAIGECKjqH8vlcngHC06/2s6asgHrSZ7s+Xz+UFVdJyJOQn5P0AYCCERAQFWvUtXXlsvlWyIQhwgIIIAAAgh0TKBQKLxRRMoi0tuxEEyMAAJJELhlbGxsfrVaHUtCM/SAAAIIIIBAnAWKxWLOzAZFZPoE+qiZ2Zf22GOPT69YsWLLBK7nEgQQQAABBBCYgkCxWJwRBMF3VPUVUyjDUAQQSKlAEASvrVQq4YepeWxHgA1YO3hq9PX1DTqOw71v+S2EAAJNFTCz+4IgOHFkZOTHTS1MMQQQQAABBOIhoIVC4SMi8mkR4d8k8VgzUiIQWQFVzXueNxzZgARDAAEEEEAgHQLquu4HROSzDXyg+WbHcd42NDR0aTqo6BIBBBBAAIH2C/T39+86Pj5+kYgc3f7ZmREBBOIuoKq/LZfLR3H61ZOvJG927OCZXiqV5tTr9etFZEbcf1OQHwEEIidQV9WPep73hcglIxACCCCAAAItEujv7++t1WorRaTYoikoiwAC6RK4cv/99z9sYGAgSFfbdIsAAggggEB0BMKf8cfHx1eLSN8UUpmqrlHVDwwNDd03hToMRQABBBBAAIHHCZx88slP3bp16w9F5BBwEEAAgUYEgiB4SaVSuayRsWkawwasCax2oVD4pIh8YgKXcgkCCCAwaQFV9adPn75s5cqVmyc9mAEIIIAAAgjESCD8cMP4+Pj3VPXwGMUmKgIIRFhAVV/ued6PIhyRaAgggAACCCRaoK+vb3YmkzlPRF7QpEbvF5EPeZ73TT5d3yRRyiCAAAIIpFogn88/w3GcS0RkXqohaB4BBBoWMLMf+r7/yoYLpGggG7AmsNjLli2bvmnTputEZO8JXM4lCCCAQCMC1wVB8Mbh4eGrGxnMGAQQQAABBKIusGTJkudkMpnw/vD8TB31xSIfAvERuMT3/VfEJy5JEUAAAQQQSJZAqVT6tyAILhCRZ7Sgs59lMpm3n3POObxW1gJcSiKAAAIIpEOgv79/fq1Wu0RVeT0uHUtOlwi0QsAcxzlqaGjot60onrSabMCa4IoWCoWlInL2BC/nMgQQQKARgYcdx3lLuVyuNjKYMQgggAACCERVIJ/PF1R1lYj0RjUjuRBAIHYCgaoe4XneH2KXnMAIIIAAAggkQMB13deKiCciM1rYzpiqfnH27NmfXbFixZYWzkNpBBBAAAEEEidQLBYPN7O1IjI7cc3REAIItFOg6nnem9o5YZznYgPWBFdvYGDAueGGG37D7VImCMZlCCDQsICZnX799de/f926dbWGizAQAQQQQACBCAjkcrlMd3f3Z0Xk/SLCvz0isCZEQCBBAmXf90sJ6odWEEAAAQQQiI2A67rvFZEvi4jTptDrReSdnuf9oE3zMQ0CCCCAAAKxFiiVSi8NguA7IjIz1o0QHgEEOi1QV9WDy+XytZ0OEpf5eRNkEitVKpWeV6/Xf8GbR5NA41IEEGhIwMx+HwRBbmRk5C8NFWAQAggggAACHRbo6+ubraoVVX1Zh6MwPQIIJE9gc71enz8yMnJr8lqjIwQQQAABBKIrsHjx4p5Zs2Z9Q0Te3ImUqnpREARv933/tk7Mz5wIIIAAAgjEQcB13fDDSuFJ9F1xyEtGBBCIroDjOKuGhoZOiW7C6CVjA9Yk16Svr2/QcZyO/ANzklG5HAEEYi6gqhuCIOivVCoXx7wV4iOAAAIIpEygWCw+NwiC8Ja6e6esddpFAIE2CJjZxyuVymfaMBVTIIAAAggggMA2gWKxuIeZnSciR3cY5cHwZ4GxsbGzqtVqvcNZmB4BBBBAAIFICRQKhY+q6qc5TCRSy0IYBOIqsLWrq2vemjVr+ADkJFaQDViTwAovPfnkk5+6ZcuW60Vkl0kO5XIEEECgEQETkTM2btz4gbVr1442UoAxCCCAAAIItFMgn8+XVPXrIjKtnfMyFwIIpEbg1hkzZsxfuXLl5tR0TKMIIIAAAgh0WKBYLD7bzC4QkX07HOXR019pZu/0fT+8YwUPBBBAAAEEUi2Qy+UyPT09Z4jI21MNQfMIINA0AVX9r3K5/L6mFUxJITZgNbDQruu+38y+2MBQhiCAAAINCZjZH0RkSaVSubGhAgxCAAEEEECgxQL9/f29Y2NjZ6jqyS2eivIIIJBiAVU90fO8b6WYgNYRQAABBBBoq4Druq8UkZGIfiDZVNXr6el5/6pVq+5uKwyTIYAAAgggEBGBbbcI9kTkjRGJRAwEEIi/wMOqOrdcLt8T/1ba2wEbsBrwzuVy3d3d3VeJyAENDGcIAggg0KjAwyLyDt/3wx+keSCAAAIIIBAZgVKpNK9er58rIodGJhRBEEAgcQKq+nPP814oIuEpsTwQQAABBBBAoMUChULh/6nqF0Qk0+Kpplr+ARH5+Ojo6Ne4LeFUKRmPAAIIIBAngb6+vtmO41ygqs+LU26yIoBA5AU+4XleeDtTHpMUYAPWJMH+eXmxWHxFEAQ/aHA4wxBAAIGGBcxsqFarvbNarT7ScBEGIoAAAggg0CSBQqHgishZIrJzk0pSBgEEEHgigcDMjqxUKuvgQQABBBBAAIHWCixatCi71157nR5+ELC1MzW9+hVm9i5uS9h0VwoigAACCERQwHXduap6kZlxYEgE14dICMRY4A5VnVculzfFuIeORWcD1hTo+/r6zncc54QplGAoAggg0KjAX1S15HnezxotwDgEEEAAAQSmIrB8+fJp99xzz+dF5D1TqcNYBBBAYCICjuOsLpfLb5nItVyDAAIIIIAAAo0L5HK53Xp7e79tZi9uvEpHR3Jbwo7yMzkCCCCAQDsESqXSMUEQfFdEZrdjPuZAAIH0CARBcFKlUhlMT8fN7ZQNWFPwzOfzz1LVq0WkdwplGIoAAgg0KlA3sy/VarVPVKvVsUaLMA4BBBBAAIHJChQKhQNFJLzl4LMnO5brEUAAgQYEHlbVAzzPu7OBsQxBAAEEEEAAgQkK5PP5/TOZzIXhSRrhGwcxv+dveFvCz4+Ojq7gdbMJPgG4DAEEEEAgFgKFQmGpqn5NRLpjEZiQCCAQJ4Er586de9jAwEAQp9BRysoGrCmuRqFQ+IyIfHSKZRiOAAIITEXgT0EQuMPDw1dNpQhjEUAAAQQQmIhAPp8vbXuRZ/pErucaBBBAYKoCqvohz/O+MNU6jEcAAQQQQACB7Qu4rvsyEfmWiOyaMKcbVHV5uVy+OGF90Q4CCCCAQPoEtFQqnRYEwWnpa52OEUCgTQIv9zzvR22aK5HTsAFrisu6bNmy6Zs2bfqziOw7xVIMRwABBKYisFVVB+bOnfuf7EqeCiNjEUAAAQS2J5DL5Xbv6upaqaqvRQkBBBBoo8D6rq6ugwYHB7e2cU6mQgABBBBAIFUCrusuE5EzRaQrqY2b2aWO47ynXC5fm9Qe6QsBBBBAILkC/f39vePj42tEZElyu6QzBBDosMDFnucd1+EMsZ+eDVhNWMK+vr5XO45zQRNKUQIBBBCYqsAl9Xr95JGRkVunWojxCCCAAAII/FMgn8+/SlXPFpGnoYIAAgi0U8BxnDeUy+Xz2jkncyGAAAIIIJAWgUWLFmXnzJlzhqq+LSU9j6rqip133vk/zjrrrEdS0jNtIoAAAgjEXKBUKs0JguB7InJ4zFshPgIIRFegnslkDjnnnHOujm7EeCRjA1aT1qlQKIR/8b2mSeUogwACCExF4CFVfb/ned8UEZtKIcYigAACCKRbYPny5dPuueeez4vIu0WEfzuk++lA9wh0QuAy3/df0omJmRMBBBBAAIGkC+Tz+ac4jlMVkWOT3usT9HeniIQnya/iJPkUrj4tI4AAAjEScF33+SLybRF5eoxiExUBBOIn8A3P89LyoYyWrg5vojSJt1Qq7RMEwdVmtlOTSlIGAQQQmJKAmYX36D2lUqn8dUqFGIwAAgggkEqBE0888YhMJuOp6rxUAtA0Agh0WmA8CIKFw8PDV3U6CPMjgAACCCCQNIFSqTQvCIILRSTVP+s7jvNrMzu1XC7/JmlrTD8IIIAAAvEXKBaLp5hZeIvg7vh3QwcIIBBhgYez2ey8wcHBuyKcMTbR2IDVxKVyXff9ZvbFJpakFAIIIDBVgYe3nYa1ktOwpkrJeAQQQCAdAgsXLuw64IADPqKqHxORbDq6pksEEIiaQBAEXxkeHl4etVzkQQABBBBAIO4Cruu+QES+IyK7x72XJuUPT4//tqp+sFwu39KkmpRBAAEEEECgYYHwFsF77bXXZ0Tkgw0XYSACCCAwQYEgCD5eqVTCP3N4NEGADVhNQPxnifDNqvnz568TkYObWJZSCCCAwJQFVPXHqnoKLyRNmZICCCCAQKIFlixZ8pxMJrNGRA5JdKM0hwACkRYwsztUdYHv+w9FOijhEEAAAQQQiJnAtpM0vioiXTGL3o64Y6r69a1bt36iWq0+2I4JmQMBBBBAAIHHC/T19c3OZrPfMrMXo4MAAgi0QeB2VT2gXC5vasNcqZiCDVhNXuZCoXC0iPxMRLBtsi3lEEBgygJbVPWLo6Ojn61Wq2NTrkYBBBBAAIHECIQfJFiwYMG/m9mnONY8MctKIwjEWWCJ7/vnxrkBsiOAAAIIIBAlgVwul+nt7f2ymb0nSrkimuVuEfnE6Ojo2dVqtR7RjMRCAAEEEEiggOu6h4nId0VknwS2R0sIIBBNgTd7njcUzWjxTMUmoRasW7FYPDsIgqUtKE1JBBBAYMoCqnqVqi4rl8u/mXIxCiCAAAIIxF6gUCgcJSJni8iBsW+GBhBAIAkCl/q+/7IkNEIPCCCAAAIIREFg6dKlO9dqtYqZHR+FPHHJoKrXBUHwft/3L4pLZnIigAACCMRXwHXdkoh8TUSmx7cLkiOAQJwEzOxXvu+HhwuFt+Tm0SQBNmA1CfLRZUql0qx6vX6diMxuQXlKIoAAAs0QqJvZmb29vR9fvXr1w80oSA0EEEAAgXgJLFu2bPrmzZs/s+1T8Jl4pSctAggkUUBVR8NboHqed30S+6MnBBBAAAEE2i1w4okn7tfV1XUBH7aYkvwPMpnM+84555yrp1SFwQgggAACCDyBwPLly6fde++9Z5oZB3vwDEEAgXYKBKr63HK5/Pt2TpqGudiA1aJVLhQK4V+U4UkCPBBAAIEoC9yqqu/yPC98MY4HAggggEBKBPL5/KtU9UwR2TclLdMmAgjEQ+A/fN//WDyikhIBBBBAAIFoCxQKhaMdxznPzPaIdtJYpAtE5Dvj4+MfGBkZ+UssEhMSAQQQQCDyAqVSaZ96vf5tVT0i8mEJiAACiRJQ1W+Wy+VliWoqIs2wAat1C6Gu615mZi9q3RRURgABBJojEATBBdls9tRyuXxLcypSBQEEEEAgigKlUmlOEARfMbM3RjEfmRBAINUCt8yYMePZK1eu3JxqBZpHAAEEEECgCQLhh4NVNbyNUXcTylHi/wTCn1POyGaznx8cHHwAGAQQQAABBBoVKBQKx6vqkIg8pdEajEMAAQQaFHgom80eMDg4eFeD4xn2JAJswGrh0yOfz++vqleKyLQWTkNpBBBAoFkCW1T1i9teRNrarKLUQQABBBDovMDAwIBz0003nWxm/ykiMzufiAQIIIDAYwWCIDhheHj4QlwQQAABBBBAYEoCWiqVTguC4LQpVWHwkwqo6kYzC19DO31wcJDX0Hi+IIAAAghMWCCXy2WmTZv28SAIPi4izoQHciECCCDQPIFTPc87vXnlqPRoATZgtfj5UCgUPiwin23xNJRHAAEEmimw3nGcD5XL5Wozi1ILAQQQQKAzAvl8/lBV/YaIHNmZBMyKAAII7FDgfN/3X7vDq7gAAQQQQAABBLYrsHTp0p1rtVrFzI6HqW0Ct5jZx/bff/+RgYGB8DaFPBBAAAEEENiuQKFQ2EtVPRHh7kk8TxBAoFMC11x77bWHrlu3rtapAEmflw1YLV7hRYsWZefMmfM7ETm0xVNRHgEEEGi2wEVm9t5KpciQHn0AACAASURBVLK+2YWphwACCCDQeoFSqTQrCIJPm1l4L/dM62dkBgQQQKAhgc31ev2gkZGRvzQ0mkEIIIAAAgggIEuWLHlmNpu9QEQOhqMjAn8QkQ95nvejjszOpAgggAACkRdwXfcEEVktIrMiH5aACCCQWAHHcV42NDR0aWIbjEBjbMBqwyJsO3XgtyLS1YbpmAIBBBBopkC4A/prY2Njn6hWqw82szC1EEAAAQRaIxDebvCGG25wHcf5kpnt3ppZqIoAAgg0TeAjvu9/rmnVKIQAAggggEDKBEql0vOCIPiuiDw1Za1Hsd1fBEHwkUql8tMohiMTAggggED7BRYvXtwze/bsL5rZu0WE9+XbvwTMiEBzBcLfxdbcku2qpqrfKZfLb2zXfGmdhz/o27Ty+Xz+P1X1fW2ajmkQQACBpgqY2X2O43x6dHT0zGq1Wm9qcYohgAACCDRNIJ/Pv9hxnK+Y2b81rSiFEEAAgdYJ3Lhx48aD165dO9q6KaiMAAIIIIBAcgWKxeISMwtP05iW3C7j15mZXVqv1z8wMjLyx/ilJzECCCCAQLMEXNc9QFWHzew5zapJHQQQQKBBgS2qelC5XL6lwfEMm6AAG7AmCDXVy5YtWzZ98+bNV5nZflOtxXgEEECggwJXmtnySqVyWQczMDUCCCCAwOMEwluOhCdeqeobwEEAAQRiImBmdiw/V8ZktYiJAAIIIBApgfDU2xtvvPEzqvrhSAUjzKMFAhEZrtVqp5177rk3Q4MAAgggkC6BfD7f7zjOmSIyI12d0y0CCERRwHGcTw4NDQ1EMVvSMrEBq40rumTJkmMzmUx4H3jc2+jOVAgg0HyB8Gh7Vf1gpVK5sfnVqYgAAgggMFGBXC63S3d394dE5FQR6Z3oOK5DAAEEOi1gZqsqlcopnc7B/AgggAACCMRNoFgszjCzsoi8Lm7ZU5q3JiKrw5Plh4aGbk+pAW0jgAACqRHo7+/fdXx8/CwR6UtN0zSKAAJRF1i/++67P3vFihVboh40CfnYCNTmVczn86tV9aQ2T8t0CCCAQCsEama2xnGcAc/z7mzFBNREAAEEEHhigYULF3YtWLDgJDP7lIg8FScEEEAgZgJ3mtlBlUrl/pjlJi4CCCCAAAIdFTjppJP2Hh8fP59bGXV0GRqdPLzty1nj4+OfHx4evrfRIoxDAAEEEIiuQKlUemkQBGtEZK/opiQZAgikTcDMXuX7/tq09d2pftmA1Wb58JSCrq6ua1R1zzZPzXQIIIBAqwQ2mdmZtVrtc9Vq9cFWTUJdBBBAAIF/CPT19b06k8l82czmYoIAAgjEUSCTybx+aGjou3HMTmYEEEAAAQQ6JbBkyZLnZDKZ81V1705lYN6mCGxS1bN7eno+u2rVqrubUpEiCCCAAAIdFejv7+8dHx8Pb+31fhFxOhqGyRFAAIHHClQ9z3sTKO0TYANW+6z/d6Zisfj6IAi+04GpmRIBBBBomYCqbjCzT4+NjX2jWq2OtWwiCiOAAAIpFXBd9wVm9p8i8tyUEtA2AggkQEBVv+15Xi4BrdACAggggAACbRMoFos5MxsUkeltm5SJWi3wiKquZiNWq5mpjwACCLRWoFAoHKyqnoj8W2tnojoCCCAwaYGHHcdZwG2wJ+02pQFswJoSX+ODC4VChfv/Nu7HSAQQiLTAehE5bWxsbLhardYjnZRwCCCAQAwEXNc9zMw+KSLHxyAuERFAAIEnE7i/q6vrwMHBwbtgQgABBBBAAIEJCajruh8Qkc9yosaEvOJ40SMi8tXR0dEvVqvVjXFsgMwIIIBAGgVyuVymp6fnfSLyKRHpTqMBPSOAQLQFzGy57/tfiXbK5KVjA1aH1rRUKs2q1+t/FpGndSgC0yKAAAKtFrjWzD5fq9V8NmK1mpr6COxIIPyRz3Z0Ef9/xAQKhcKBqjpgZm8UEX5uj9j6EAcBBCYvoKpLPc9bM/mRjEAAAQQQQCB9AsuXL5+2YcOG8NQrbhmSjuV/UFVPz2QyKwYHBx9IR8t0iQACCMRToFgsLghPMQyC4Kh4dkBqBBBIgcAVt9122xGXX375eAp6jVSLvJHTweXo6+t7teM4F3QwAlMjgAAC7RC42nGcT5bL5W+zA6Qd3MyBAAJxFygWi/vW6/UPqepbRCQT937IjwACCGwTuMz3/WP5eZDnAwIIIIAAAjsWWLp06Z6jo6PfU9Ujdnw1VyRM4IEgCMKTCv67Uqncn7DeaAcBBBCItcCiRYuye+21V3gy5SdEpCfWzRAeAQSSLBCo6vPL5fJvktxkVHtjA1aHV6ZQKJRFxO1wDKZHAAEEWi5gZn9Q1dN837+o5ZMxAQIIIBBDgRNPPHG/TCbzCVUtsPEqhgtIZAQQeDKBzWZ2cKVSCW9VzQMBBBBAAAEEnkTAdd1DRCT80O4+QKVa4JHwdJXwdHnP8+5MtQTNI4AAAhEQKBQKB4d/LovI4RGIQwQEEEBguwJm9nXf998OUWcE2IDVGff/nbW/v3/XWq32JxHZq8NRmB4BBBBol8CVZvZlbk3YLm7mQQCBqAuEtxoUkQ+JSJ+IZKOel3wIIIDAZAVU9f95nvflyY7jegQQQAABBNIm4LruG0RkSESmp613+t2uwKiInGNmn/Z9/zacEEAAAQTaK7Bw4cKuBQsW/LuIfEpEuts7O7MhgAACkxa413Gc+UNDQ/dNeiQDmiLABqymME6tiOu6x5kZJ8JMjZHRCCAQP4GrzeyLd9xxR4V7EMdv8UiMAAJTF+jr6/s3x3HeJyJ5TryauicVEEAgsgK/Gxsbe161Wq1HNiHBEEAAAQQQ6LyAFgqFj6jqp0WE1+w7vx5RTBBuxBpU1S+Uy+VbohiQTAgggEDSBIrF4nODIDhbVQ9KWm/0gwACyRQIgqBUqVTCO7Dx6JAA/5jrEPzjpy0UCmtEpD8icYiBAAIItFPgFlU9PZvNfmNwcHBrOydmLgQQQKATAoVC4ehtJ14dx5srnVgB5kQAgTYKjNfr9SNHRkb+2MY5mQoBBBBAAIFYCfT39/eOj4+vEpHwVuQ8ENiRwHgQBJXu7u7PDQ4OXreji/n/EUAAAQQmL5DL5Xbp6en5jIi8Q0ScyVdgBAIIINB+AVX9SblcfqmIWPtnZ8Z/CrABKyLPhW23IvyziMyJSCRiIIAAAu0W+JuIfMlxnNXlcnlTuydnPgQQQKDFAuq67qtE5P1m9qIWz0V5BBBAICoCn/F9/+NRCUMOBBBAAAEEoiZw8sknP3XLli3fVdXnRS0beSIvEKhq+Nz54tDQ0G8jn5aACCCAQEwEXNd9k4h8RUSeHpPIxEQAAQRCgc0icojneTfB0VkBNmB11v8xsxcKhcUi8n1OQojQohAFAQQ6IbBRVb+ezWbPGBwcvKsTAZgTAQQQaJZA+Gn2Wq1WFJHlIrKgWXWpgwACCMRA4M8bN248fO3ateHtcngggAACCCCAwOMECoXCwSJygao+ExwEpijwi223JryIEw+mKMlwBBBIrUA+n3+W4zhnikj4Xi0PBBBAIFYCZvY+3/f/K1ahExqWDVgRW9hCofB1EXlrxGIRBwEEEOiEwJiInBsEwReGh4ev7kQA5kQAAQQaFcjlcrv39PQsDYLgPaq6Z6N1GIcAAgjEVGDccZznlcvl38c0P7ERQAABBBBoqUD4QVxVHRGRmS2diOJpE/hTeLr8tddeO7xu3bpa2pqnXwQQQKARgYULF3YtWLAgvNVgeMvBnRqpwRgEEECgkwKq+sdbb731yMsvv3y8kzmY+x8CbMCK2DOhWCzOCILgjyKyf8SiEQcBBBDolEB4r+Lvm9mXK5XKZZ0KwbwIIIDARASKxeKCer1+qqqGp15Nm8gYrkEAAQSSJmBmn6hUKp9OWl/0gwACCCCAQDMEisXiB8zscyLiNKMeNRB4AoG/BkHw5Uwmc3a5XN6EEAIIIIDAEwuUSqWXBkFwuogciBECCCAQU4Ga4ziHDw0NXRXT/ImLzQasCC5pPp9fqKq/EpGuCMYjEgIIINBJgetV9WuquooXkDq5DMyNAAKPFhgYGHDWr1//knq9/l4ROY4POfD8QACBNAuY2R+uv/76ozh1Ic3PAnpHAAEEEHgigcWLF/fstttuX1fVfoQQaJPAfSJyVjabPWtwcPCuNs3JNAgggEDkBYrF4r5mFt6q63WRD0tABBBA4EkEVPUz5XL54yBFR4ANWNFZi8ckyefzp6nqQETjEQsBBBDotMCDInKO4zhfKZfLt3Q6DPMjgEA6BYrF4h5mdpKZvU1EnplOBbpGAAEE/k9AVUfr9fpCbh/NswIBBBBAAIHHCpRKpVlBEHxbRBZhg0AHBMZE5HzHcb40NDT02w7Mz5QIIIBAJASWLVs2fevWrR8IguCDItIbiVCEQAABBBoUUNXrM5nMoYODg1sbLMGwFgiwAasFqM0ouWjRouycOXN+JiJHNaMeNRBAAIGECtSDILhARM4cHh4Ob08Y3q6QBwIIINBSgWKx+NwgCN6lqjkz62npZBRHAAEEYiRgZv9eqVRWxCgyURFAAAEEEGi5QKlUmhcEwYUiMq/lkzEBAjsW+IWqnr5169bzqtVqfceXcwUCCCCQDIFisfhqMztDRJ6RjI7oYnsC4eYH3iji+ZECgcBxnBcNDQ39PAW9xqpFNmBFeLny+fyzVPUKEdk5wjGJhgACCERF4EZVPXt0dHR1tVrdEJVQ5EAAgWQI9Pf37zo+Pv4mEXmbmT0nGV3RBQIIINBUgV+MjY29iDfymmpKMQQQQACBmAsUi8VXmdmwiMyMeSvET5hAeGKCiHxl2rRpQytXrtycsPZoBwEEEPhfgWKxePi22w2+EBYEEEAgKQKqeka5XH5PUvpJUh9swIr4ahYKhVNEZGXEYxIPAQQQiJLAmKqGx6qvHBoa+jEfdojS0pAFgXgJDAwMONdff/3zVbWoqq6ITI9XB6RFAAEE2iawaWxs7NBqtXpT22ZkIgQQQAABBCIuUCgUTlXVL4lIJuJRiZdugftU9Zuq+rWhoaG/pZuC7hFAIEkCS5YseWZXV9d/mFmfiPB+eJIWl14QQOCvM2fOfPZZZ531CBTRE+AvnOityb8k6uvrCzcSnBCDqEREAAEEoiZwXfgi0ujoaJlTsaK2NORBILoChUJhLzPrV9WlIrJvdJOSDAEEEIiGgKq+1fM8PjgUjeUgBQIIIIBAhwUWLlzYdeCBB37VzMIP1vJAIC4C4e0IL6jX62cODw9fxgca47Js5EQAgccL5PP5pziO82ERebeI9CKEAAIIJFBgsed5P0hgX4loiQ1YMVjGvr6+2Y7j/ElEnhaDuEREAAEEoigQvoh0WXgq1jXXXPO9devW1aIYkkwIINA5geXLl0+79957jw+CoCQirxSRbOfSMDMCCCAQHwEz+1GlUnkFb9LFZ81IigACCCDQOoFcLrdbb29v1cxe0rpZqIxAywVuEJHV2Wz2G4ODgw+0fDYmQAABBJogEG6AXrBgwUmq+mkz26MJJSmBAAIIRFHgbM/zTo5iMDL9Q4ANWDF5Jriue5yZXciaxWTBiIkAAlEWuEdV/Xq9Pjg8PHxVlIOSDQEEWiuwaNGi7Jw5c14mIuHtBV/LLQZb6011BBBIpMDGnp6eg1evXn1HIrujKQQQQAABBCYh0N/fP398fDx8/XbuJIZxKQJRFnhIVQdV9atDQ0PhpiweCCCAQOQEBgYGnBtvvHFJuPFKRJ4VuYAEQgABBJon8DczO9j3/YeaV5JKzRZgA1azRVtYr1AonC4i72nhFJRGAAEEUiVgZn9wHGdIRL7led6dqWqeZhFIsUCxWDx8fHy84DhOn4g8NcUUtI4AAghMVaDg+35lqkUYjwACCCCAQNwFXNcNP9jxLRHZNe69kB+BJxCw8NRTx3G+cc0111zIyfI8RxBAICIC6rru683sk6p6UEQyEQMBBBBolYA5jvPyoaGhS1s1AXWbI8AGrOY4tqXK4sWLe3bbbbdfi8ihbZmQSRBAAIH0CPz9FoUiMtzV1XUex6unZ+HpND0CruseZmY5Vc2Z2X7p6ZxOEUAAgdYIqGrV87w3taY6VRFAAAEEEIiPgOu6y0TkTBHpik9qkiLQsMBdInKOqn6jXC7f0nAVBiKAAAJTECiVSi8NguDzIrJwCmUYigACCMRGIDyRtFwuvys2gVMclA1YMVv8XC43t7u7+w8isnPMohMXAQQQiIWAqo6Gn+ozs2qtVjuvWq0+EovghEQAgX8R6OvrOyiTyYQbrpaIyAEQIYAAAgg0TeC2sbGxQ6rV6samVaQQAggggAACMRPI5XKZ3t7eL5sZdyyI2doRtykCgZn9xHGclddcc833OBWrKaYUQQCBHQiUSqVjgiD4jIi8CCwEEEAgRQK3zJw589/OOuss3q+MwaKzASsGi/T4iK7rnmRmq2MYncgIIIBA3AQeNrPvq+p3ZsyYcfHKlSs3x60B8iKQMgEtlUpH1Ov112476WpuyvqnXQQQQKAdAnVVfbHneT9rx2TMgQACCCCAQBQF+vv7dx0fHw9vORjeepAHAmkXuF1Vzw6/hoaG/pZ2DPpHAIHmC7z5zW9+eb1e/6iIvLD51amIAAIIRFogEJFFvA4X6TV6TDg2YMVnrR6T1HVdz8wKMY1PbAQQQCCOAltF5NJtJ2OdX61WH4xjE1PLHP7YYFMrwWgEmiwQ3qJ59913f0G9Xn+1iLxBROY0eQrKIYAAAgg8SkBVP+l53gAoCCCAAAIIpFXgxBNP3K+rq+tCEVmQVgP6RmA7An8/FUtVy9OnT/82H2TkeYIAAlMU0GKxeLyZhRuvnjvFWgxHAAEEYikQBMGXK5XK/4tl+JSGZgNWTBe+UCjMFJE/isizYtoCsRFAAIHYCvzzNoWO43yvp6fnolWrVt0d22YIjkAMBXK53G5dXV3HOY5zgoi80sx2imEbREYAAQRiJ6CqPx8dHV1UrVbrsQtPYAQQQAABBJogsO3WR+eJyO5NKEcJBJIsEH5w8VzHccpDQ0M/T3Kj9IYAAs0VGBgYcG6++ebjzOw0EVnY3OpUQwABBOIjoKrXzZ49+7AVK1ZsiU9qkrIBK8bPgVKpdGS9Xg//8dIV4zaIjgACCMRdIDz+83cicqGqXuR53pVxb4j8CERNIHzh5YYbbniOqr4y/DKzo0QkG7Wc5EEAAQQSLnB/JpM5lNvKJHyVaQ8BBBBAYLsCxWLxFDP7Kq/F8iRBYNICV4nI6nq97g8PD9876dEMQACBVAjkcrnu7u5uV1U/KCLzUtE0TSKAAALbF6ir6tHlcvk3IMVLgA1Y8Vqvf0lbKBQ+ICJfiHkbxEcAAQSSJPBXEfm+4zgXZDKZ/xkcHAxvXcgDAQQmKZDL5Xbv6up6ebjhSkReLiJ7TLIElyOAAAIINFcg5/v+t5tbkmoIIIAAAghEXyCXy2V6e3u/ZGanRj8tCRGItMCYmV1kZkO1Wm1ttVodi3RawiGAQFsEwpPue3t732pm7xaRp7dlUiZBAAEEIi5gZp/zff8jEY9JvCcQYANWzJ8W4YkQN95449ptb0zGvBviI4AAAokT2GJmPxWRH5rZJcPDw1cnrkMaQqBJAsuXL5925513Pj+bzb4kCIJw49VhIuI0qTxlEEAAAQSmIGBmqyqVyilTKMFQBBBAAAEEYilQKBRmquqIiCyOZQOERiCiAqq6MQiCb4mI5/v+L0XEIhqVWAgg0CIB13XnquqpZtYvIjNaNA1lEUAAgTgKXHHfffcdtXbt2tE4hk97ZjZgJeAZcPLJJz91y5Ytf2RneAIWkxYQQCDpArc5jnOJmf3QcZwfDw0N3Zf0hukPge0JLFy4sGvevHnPdRwn3HD14kwm8zwz60EMAQQQQCByAtc5jnN4uVzeFLlkBEIAAQQQQKCFAsVicd8gCC5U1YNaOA2lEUi9gJnd6jjOd81sted5V6YeBAAEEi6Qz+cXZjKZ95pZXkQyCW+X9hBAAIHJCmw1syN93//TZAdyfTQE2IAVjXWYcoq+vr4XOY5zqYhkp1yMAggggAAC7RAIVPXKIAguM7PLx8fHf1qtVh9sx8TMgUAnBBYvXtwza9ashSLygnDDlaoew6fbOrESzIkAAghMXEBVR4MgOKpSqVwx8VFciQACCCCAQPwFSqXSMUEQnCciu8e/GzpAID4CZvY7VfVF5Fue590Zn+QkRQCBJxMIT77fsGHDEhF5p4iErw/yQAABBBB4AgEze6fv+2eBE18BNmDFd+3+JXmhUPiwiHw2QS3RCgIIIJAmgbqI/EFELheRy3p6en6+evXqh9MEQK/JEsjlcrt1d3c/X0SODjdbmdnhItKbrC7pBgEEEEi2QHg7CM/zTk92l3SHAAIIIIDAYwVc1+0TkdX8+4VnBgIdFQhE5FciUs1ms+cODg7e1dE0TI4AAg0JnHjiift1dXWFt7N/i4jMbqgIgxBAAIH0CPzA87xXcWvmeC84G7DivX6PST8wMODcdNNNF5pZ+BuTBwIIIIBAvAXCDVnhEaO/EJFfmtkvKpXKX+PdEumTKhD+DHLjjTfOD4/GzWQyzw+C4GgRWSAi/KyZ1EWnLwQQSLyAql7sed7xvOiT+KWmQQQQQACB/xPQUql0WhAEp4GCAAKREvjfzVi9vb0jq1atujtS6QiDAAKPEQhfJ1y/fv1LgiBYJiKv5zaDPEEQQACBHQuo6j2ZTOYQNp3v2CrqV/CmWNRXaJL5SqXSrHq9Hp6gss8kh3I5AggggED0BW5X1V+Gm7JU9deZTObKwcHBrdGPTcKkCSxZsmTvbDZ7ZLjhSkSOEJHwdKudk9Yn/SCAAAIpFrjTcZxDy+XyPSk2oHUEEEAAgRQJvOMd79jpoYceCm97dkKK2qZVBOIoUBORHwdBcG6tVrugWq1ujGMTZEYgiQInnXTS3rVarV9EThKRfZPYIz0hgAACLRIwMzvO9/21LapP2TYKsAGrjdjtmqpQKBwlIv8jIt3tmpN5EEAAAQQ6IlAzsz+p6u9U9fci8rvbbrvt6ssvv3y8I2mYNJECxWJx3/Hx8UNU9RDHcRaaWbjh6mmJbJamEEAAAQRCgXFVfZnneeFtkXkggAACCCCQeIFSqTQnCILzRWRh4pulQQSSJRCeHv/r8DaFXV1d561Zs+bWZLVHNwhEX2Dx4sU9s2fPfrmZFUXkdSKSjX5qEiKAAALREgiC4PRKpXJqtFKRplEBNmA1Khfxca7rvtfMvhLxmMRDAAEEEGi+wBYR+eO2ryvDU7J6e3v/vHLlys3Nn4qKSRIIXzCZNWvWQWZ2qIj8fcOVmR0iIrsmqU96QQABBBDYocCHfd///A6v4gIEEEAAAQQSIBB+kFVVv8uHTBKwmLSAgMg1juNUx8fHL6xUKusAQQCB1gkUCoUDVbUkIktFZPfWzURlBBBAIPEC1+y+++6Hr1ixInxvj0cCBNiAlYBF3E4Lms/nq6r6huS2SGcIIIAAAhMUCD8ReJOIXGlmV6rqVY7jXF0ul/8iIjbBGlyWEIFtG63mm9l8EXm2mS1Q1YNEZC6fUkvIItMGAggg0LjARb7vh7de4ueDxg0ZiQACCCAQEwHXdQsiskpEemMSmZgIIDBBAVW9TkS+Z2YXjo6O/qZarYavjfFAAIEpCBQKhb1UtU9Ewr8/ww9t8kAAAQQQmJrAVjM70vf9P02tDKOjJMAGrCitRpOz5HK5XXp6en5vZuEbqjwQQAABBBB4vMBmM7vOcZxrgyC4JpPJXJfJZK7505/+dPO6detqcMVb4OSTT37q1q1b54Ubq8xs/yAI5ocbrVT1WWy0ivfakh4BBBBokcBfzOywSqVyf4vqUxYBBBBAAIGoCGipVDotCIJPiAivj0dlVciBQOsE7hORn4jIRUEQhKdj8fNu66ypnDCB/v7+XcfHx09Q1ZyZLRaRTMJapB0EEECgkwKnep53eicDMHfzBfgHZvNNI1Uxn88fqqq/FJFpkQpGGAQQQACBKAvUzOwWVb05/DKzm4MguNlxnJu7urrWDw4Obo1y+LRkW7RoUXbPPfecIyLPEJFnOY6zf7jpWlX//l1Edk6LBX0igAACCExNQFVHVfWYcrn8+6lVYjQCCCCAAALRFli2bNn0LVu2DJkZdw2I9lKRDoFWCYyLyM9F5GJVvahcLl/bqomoi0BcBcK/Kzdv3ny8meVVNdx01R3XXsiNAAIIRFjgYs/zjucU+givUIPR2IDVIFychuXz+ZKqnhOnzGRFAAEEEIisQHhLottU9a8i8tcgCMJf3xoEwd8ymczfRkdHb61Wqxsjmz5GwXK53G7ZbPbpjuPMUdV9zCzcaBV+PXPb9z05ySpGC0pUBBBAIMICZvaOSqXytQhHJBoCCCCAAAJTFiiVSnOCILhARA6bcjEKIIBAUgTWm9klmUzmki1btvykWq0+mJTG6AOByQiEJ13VarXjVfX1IvJKDnWYjB7XIoAAApMWuL1erx86PDx876RHMiDyAmzAivwSNSeg67pnmNm7mlONKggggAACCDypwCYRuVVE7hGRO0XkbjO7W0TuCP9bEAR3dnd33zNr1qyNK1as2JImy/D2wF1dXXtks9nZtVpttqrOUtWnicjTVXVPM3u6iIQbq8LvvWmyoVcEEEAAgY4JVHzfL3RsdiZGAAEEEECgDQLb7hJwgaru3YbpmAIBBOIpUBeRK0TkUsdxLt2yZctPq9XqWDxbITUCOxYolUqzgiA4btvtBV/OSVc7NuMKBBBAoAkCQb1ef9nw8HB4e2QeCRRgA1YCF/WJWlq4cGHXggULfmJmx6SkZdpEAAEEEIiHQLgB6z5V3Whm95lZeHrWfSJyv6o+aGabMplMuKHrofBrfHx8U/jfHMd5UFXHwl+HbVYqlftb1e7AwIBzww037DJ9+vTuzZs3zzCzaaraa2Y7ZTKZaWa2i6ruYma7isjM8NdBvLvf5QAAIABJREFUEPzz+y6O48wWkfBrloh0tSondRFAAAEEEGhA4JqxsbHnVqvVRxoYyxAEEEAAAQRiIeC67ptEZJDTPGKxXIREIEoC4WlY4ZujP1LVy7ldYZSWhiyNChQKhQNV9TgRCb/C9wszjdZiHAIIIIDA5AXM7GO+7//H5EcyIi4CbMCKy0o1IWd/f//TxsbG1oUnbDShHCUQQAABBBCInICqPmJmNREZFZHNkwzoiMgujxsTbqri56VJQnI5AggggED0Bbb9nflc3/eviX5aEiKAAAIIINCQgLqu+wER+ayIhP/e44EAAgg0LKCq95jZ/4jIL4Ig+HmlUvmDiFjDBRmIQBsE+vv7e4MgOCYIgpeq6mvMbH4bpmUKBBBAAIEnEFDVy7Zu3fqyarUanrrJI6ECvKGY0IXdXluFQuGo8NMaZtaTstZpFwEEEEAAAQQQQAABBBBAYJuAmZUqlUoZEAQQQAABBJIosHz58mkbNmxYLSJLktgfPSGAQCQE7hKRy1U13JT1P+Vy+To2ZEViXVIfwnXdA8zsWFV9pYgcKyLTU48CAAIIINB5gbt6e3sPXbVq1d2dj0KCVgqwAauVuhGtnc/n366qZ0U0HrEQQAABBBBAAAEEEEAAAQRaK/BV3/ff1dopqI4AAggggEBnBFzXfbqqfs/Mjpx0gvDVcs6zmTQbAxBA4O8CD5vZbzKZzC/MbN3WrVt/Wq1Ww9sY8kCgpQLh3W/q9foLzOylIvIKEXlGSyekOAIIIIDAZAUCEXml53k/muxAro+fABuw4rdmTUmcz+dXq+pJTSlGEQQQQAABBBBAAAEEEEAAgbgI/G7jxo0vWLt2bXi7Xh4IIIAAAggkSmDJkiXPyWazF4jIXolqjGYQQCCOAuMicoWq/jL8Ghsb+83IyMhf4tgImaMlUCqV5ohIeFvBF6rqsWZ2QLQSkgYBBBBA4NECqvqpcrl8GirpEGADVjrW+V+6DO/7XKvVfioiR6SUgLYRQAABBBBAAAEEEEAAgVQJmNl9mUzmiHK5fEuqGqdZBBBAAIFUCBSLxVeZ2bCIzExFwzSJAAJxFAhPxPqzqq4LT8lS1Z/xs3kcl7G9mfP5/LMcxzlGRI4ON16JyIHtTcBsCCCAAAJTEPif0dHRY6vVan0KNRgaIwE2YMVosZodtVQq7RMEwe/NbPdm16YeAggggAACCCCAAAIIIIBApARq4aejPc/7WaRSEQYBBBBAAIEmCBSLxQ+b2WdExGlCOUoggAAC7RS4PQiC36nq71X1iq6urqvWrFlzazsDMFd0BIrF4h5BECxU1cNV9UgzCzddPSU6CUmCAAIIIDBRAVW9p6ur6zmrV6++Y6JjuC7+AmzAiv8aTqmDvr6+YxzH+bGIdE+pEIMRQAABBBBAAAEEEEAAAQSiLPB23/e/HuWAZEMAAQQQQGCyAosXL+6ZPXv2N82sONmxXI8AAghEWOB+EblSVa8SkfDrytmzZ1+9YsWKLRHOTLRJCuTz+ac4jhNutDo8CIK/fxeRfSZZhssRQAABBKIpEGQymcXnnHPOJdGMR6pWCbABq1WyMarruu5JZrY6RpGJigACCCCAAAIIIIAAAgggMHGBQd/3T5r45VyJAAIIIIBA9AXCU0LM7Lsi8vzopyUhAgggMGWB8NZFNwdBcE0mk7kuCILrurq6rqnVatf7vv/QlKtToGUCuVyue9q0afODIDhYRP759Ww2W7WMnMIIIIBAxwWCIPh4pVIJT+jlkTIBNmClbMG3167rumeY2bvgQAABBBBAAAEEEEAAAQQQSJTALzdu3PiStWvXjiaqK5pBAAEEEEi1QKFQCN/AvkBVn5lqCJpHAAEE/iFwm5ldp6rXmdkNqro+/MpkMrcMDg5uBak9ArlcbpcZM2bMq9Vq+2cymXlBEBwgIuFGq/B7V3tSMAsCCCCAQAQELpw7d+5rBwYGgghkIUKbBdiA1WbwqE6Xy+Uy3d3dF4rI4qhmJBcCCCCAAAIIIIAAAggggMCkBO7s6ek5fPXq1XdMahQXI4AAAgggEGGBQqFwvKpWRGTnCMckGgIIIBAFAROR20VkvZn9fVOWmd2iqn8NguD2+++//3Y+qDHxZRoYGHD+9re/PW10dHRfVd1n2ybguWY2T1XnmdkeE6/GlQgggAACCRW4OZvNHj44OPhAQvujrR0IsAGLp8j/CoT3m1bV34jI/rAggAACCCCAAAIIIIAAAgjEWmBrJpN50dDQ0G9j3QXhEUAAAQQQeJSA67rvE5HPi0gGGAQQQACBpgjcte0Erdsdx/lb+Ot6vX6n4zgbgiC4K5vNbtiyZcuGarU61pTZIlpk+fLl0+6+++49stnsnuPj43s4jvM0x3GeXq/Xn+E4zjPMbB8R2VtEuiPaArEQQAABBDovsDm8PbrneVd2PgoJOiXABqxOyUd0Xtd1DzCzX4vIrhGNSCwEEEAAAQQQQAABBBBAAIEdCKjqUs/z1gCFAAIIIIBAEgRyuVx3b2/v18xsaRL6oQcEEEAghgL3q+rdZnaviGwQkY2q+kC9Xn/AcZwHgiD4/+zdCZhkZ1k3/Ps53dM9JGzZQCWCQtjEV5SoqGwDojiyL21mqqs6YwgjIltkExVpEGQTIgFZQr5h0lVdM6ERkABBCDKvG75q5NVP0XyGvAhJ4CUQlqy91Hm+qxCQNUzPdFfXOefX18XlxeU5z/P//56C0NV3nfrSxMTEF3POX/vX9aurq9du27Ztrd/vD58CMnwa16b+dDqdYweDwdTExMRtU0rbiqK4Tc75uLIsjx/+34j4yr9SSl/79yemlE7KOf9ARNx6U8NZnAABAgRqL1CW5Vy/3+/WvqiCNytgAMsL5NsEOp3Ow8qyfK9PknlxECBAgAABAgQIECBAoHoCRVG8utvtDp8Q4ocAAQIECFReYPfu3SdOTEz8SUQ8sPJlFCBAgEBzBYYDWMNBrLWIuHbIkFL6Us65/BaS5Zzz8AkiX/s5NqX0rU+dGg5SRc65SCndJiKmI+KY5tJqToAAAQJjIPDGXq/3lDHIIcIWCxjA2uIDGNfth4/zzjm/alzzyUWAAAECBAgQIECAAAEC31Hg4iuvvHLnoUOHhn/Y8EOAAAECBCot0Gq17joxMXFhzvnulS4iPAECBAgQIECAAAECdRX4X5///OcfdNFFFy3XtaBehy9gAOvwrRp3ZavVektK6czGFVeYAAECBAgQIECAAAEC1RT4RFmWP3XgwIHh14L4IUCAAAEClRY4/fTTf3EwGFwQEbetdBHhCRAgQIAAAQIECBCopUBK6bNlWZ66uLh4RS0LKrVuAQNY6yZrzg07d+6cPv744z8YEQ9oTmtNCRAgQIAAAQIECBAgUEmBa4ui+Llut/svlUwvNAECBAgQ+AaBdru9NyJeHxHbwBAgQIAAAQIECBAgQGAMBcqJiYmd559//gfGMJtIWyRgAGuL4Kuy7dzc3Alra2t/k1K6W1Uyy0mAAAECBAgQIECAAIGGCQxSSo/r9XrvblhvdQkQIECgZgKnnnrqtnve856vi4hfq1k1dQgQIECAAAECBAgQqJfAc3q93h/Wq5I2RytgAOtoBRtwf6vVunNRFH+bcz6pAXVVJECAAAECBAgQIECAQKUEcs5P6/f7w6eE+CFAgAABApUVaLVaxxVFsRQRP1/ZEoITIECAAAECBAgQINAEgV6v1+s0oaiO6xMwgLU+r8Ze3W63h19D+MGc83RjERQnQIAAAQIECBAgQIDAmAnknF/b7/efOWaxxCFAgAABAusSaLfbp6SULsw532NdN7qYAAECBAgQIECAAAECoxX4x2OOOeYB55577g2j3dZuVRAwgFWFUxqTjLOzs6dFxIGI8LoZkzMRgwABAgQIECBAgACBRgtctLKy8silpaVBoxWUJ0CgogLDt5dyRbOLvZECX/3g5zsi4sSNXNdaBAgQIECAAAECBAgQ2GCBz+Scf2pxcfGKDV7XcjURMEhTk4McVY12uz2fc37hqPazDwECBAgQIECAAAECBAh8u0BK6aPLy8sPXFpauo4PAQIECBCoqkCn03lSzvmPI2JbVTvITYAAAQIECBAgQIBAIwRWIuKhvV7vLxvRVskjEjCAdURsjb4pzc7Onh8RvtO00S8D5QkQIECAAAECBAgQ2CqBnPNVZVn+zMGDBz+1VRnsS4AAAQIEjkZgZmZmYnp6+qUR8byjWce9BAgQIECAAAECBAgQGJHAk3q93nkj2ss2FRUwgFXRg9vK2DMzM1NTU1Pvj4gHb2UOexMgQIAAAQIECBAgQKCBAjesra3tuOCCC/6+gd1VJkCAAIEaCJxxxhm3Wl1d7eecH1GDOioQIECAAAECBAgQIFB/gbN7vd5v1r+mhkcrYADraAUbev/MzMzx27Zt+0hK6W4NJVCbAAECBAgQIECAAAECoxYoc86P6/f7fzrqje1HgAABAgQ2QqDVat25KIoLI+JHNmI9axD4jgLDv3pkNgQIECBAgAABAgSOXiDnfPGVV16589ChQ2tHv5oV6i5gAKvuJ7yJ/WZmZk6Zmpr664i43SZuY2kCBAgQIECAAAECBAgQiIiU0jN7vd5rYRAgQIAAgSoKzM7O3q8oinfknL2XWMUDlJkAAQIECBAgQIBA8wT+z2Aw+OkDBw58rnnVNT4SAQNYR6Lmnq8LdDqdn8w5fzjnfEssBAgQIECAAAECBAgQILDRAsPHN6QoiuIt3W5370avbj0CBAgQIDAKgU6n88Sc8xsiYmoU+9mDAAECBI5MwAPkjszNXQQIECBQS4FrJyYmfvb888//11q2U2pTBAxgbQprsxadnZ3dGRHvjojJZjXXlgABAgQIECBAgAABAiMReP+VV175SI86H4m1TQgQIEBgYwXS3NzcC8uyfOHGLms1AgQIECBAgAABAgQIbJrAIKX02G63O/z6dD8EDlvAANZhU7nw5gRmZ2fPiIjzvvLRbD8ECBAgQIAAAQIECBAgsFECl0xPTz943759127UgtYhQIAAAQKjEHjKU55yyy996Uu9lNKjR7GfPQgQIECAAAECBAgQILBBAk/r9Xqv36C1LNMgAcMyDTrsza7aarVekFJ68WbvY30CBAgQIECAAAECBAg0QSCl9PHt27ff77zzzvu/TeirIwECBAjUR2B2dvbkoijenXP+ifq00oQAAQIECBAgQIAAgboLlGX52n6//8y699RvcwQMYG2Oa2NXbbfbr8s5P7WxAIoTIECAAAECBAgQIEBgAwRSSleXZXm/fr//HxuwnCUIECBAgMDIBObm5n62LMt3RsTtR7apjQgQIECAAAECBAgQIHD0AhctLy8/cmlpaXD0S1mhiQIGsJp46pvYeWZmZmJqauptEfG4TdzG0gQIECBAgAABAgQIEKizwJdTSg/u9Xr/WOeSuhEgQIBA/QQ6nc6unPO+iLhF/dppRIAAAQIECBAgQIBAXQVSSh+91a1u9cA3vOEN19W1o16bL2AAa/ONG7fDWWeddYvPfvazH4yI+zWuvMIECBAgQIAAAQIECBA4OoGVlNIjer3e8HcqPwQIECBAoCoCaW5u7oVlWb6wKoHlJECAAAECBAgQIECAwFcFPr1t27b7vvWtb/0UEQJHI2AA62j03PtdBebm5k4YDAZ/HRF3x0SAAAECBAgQIECAAAEChyVQFkWxq9vtLh3W1S4iQIAAAQJjINDpdI7NOXcj4rFjEEcEAgQIECBAgAABAgQIrEfghqIoHrywsPB367nJtQS+k4ABLK+LTROYnZ09OSL+KiLutGmbWJgAAQIECBAgQIAAAQI1EUgpPbPX6722JnXUIECAAIEGCMzNzd2hLMs/jYhTG1BXRQIECBAgQIAAAQIE6iVQlmX5uH6/P/ydxg+BoxYwgHXUhBa4OYFWq3XXlNJfRsTtSREgQIAAAQIECBAgQIDAdxV48eLioq9t8gIhQIAAgcoIdDqd++ac3xUR31eZ0IISIECAAAECBAgQIEDgvwV8GNKrYUMFDGBtKKfFvpNAu92+d875UETclhABAgQIECBAgAABAgQIfLNAURRv6Xa7e7kQIECAAIGqCLTb7d0RsS8itlcls5wECBAgQIAAAQIECBD4BoHX93q9pxEhsJECBrA2UtNa31Wg1Wo9OKX0Pm/KeJEQIECAAAECBAgQIEDgvwVSShdeccUVjzt06NAaFwIECBAgUAGB1G63nxsRL4sI7y1X4MBEJECAAAECBAgQIEDg2wTevby8/LilpaUBGwIbKeCX5I3UtNbNCrTb7UflnP8kIiZRESBAgAABAgQIECBAgED87bHHHvvz55577g0sCBAgQIDAuAvs2bNn+9ra2nkRMTvuWeUjQIAAAQIECBAgQIDAdxH4i8nJyYft37//JkIENlrAANZGi1rvZgVmZ2dPj4i3+oScFwoBAgQIECBAgAABAg0X+Kdt27bt2L9//xcb7qA+AQIECFRA4IwzzviB5eXld6WUfqoCcUUkQIAAAQIECBAgQIDAdxL4WFmW9+/3+1/AQ2AzBAxgbYaqNW9WoNVqPTWl9DpMBAgQIECAAAECBAgQaKJAzvn/m5qaetD+/fs/08T+OhMgQIBAtQTa7fa9I+LdEXHHaiWXlgABAgQIECBAgAABAl8XuKooip9dWFj4JBMCmyVgAGuzZK17swKzs7O/HxG/i4kAAQIECBAgQIAAAQINE/jkxMTEA7zZ07BTV5cAAQIVFWi324+PiIWIOKaiFcQmQIAAAQIECBAgQIDAlyPigb1e759QENhMAQNYm6lr7ZsVmJ2dfX1E/AYmAgQIECBAgAABAgQINETgU4PB4IEHDx78REP6qkmAAAEC1RVI7Xb7uRHxBxFRVLeG5AQIECBAgAABAgQINFxgJef8y4uLix9quIP6IxAwgDUCZFt8V4HUarXelFLay4gAAQIECBAgQIAAAQI1F/hsURQ7ut3uv9W8p3oECBAgUHGBnTt3Th933HHnFkUxV/Eq4hMgQIAAAQIECBAg0GyBMqW0q9vtLjWbQftRCRjAGpW0fb6jwPz8fHHZZZct5JxnEREgQIAAAQIECBAgQKCmAp8riuLB3W73X2raTy0CBAgQqInA7t27T5yYmHhHRDygJpXUIECAAAECBAgQIECguQLP7PV6r21ufc1HLWAAa9Ti9vs2gZmZmYmpqanFiDgNDwECBAgQIECAAAECBGom8KWiKB7a7Xb/oWa91CFAgACBmgm02+17R8S7I+KONaumDgECBAgQIECAAAECzRN4Ra/X+63m1dZ4KwUMYG2lvr2/LnDqqaduu8c97jH8dN0jsBAgQIAAAQIECBAgQKAmAjeklH6p1+v9ZU36qEGAAAECNRWYnZ3dmVI6GBG3rmlFtQgQIECAAAEC4ycw/Et9Hr9YEhGogcD5vV7vV/0nrAYnWbEKBrAqdmB1jjszMzM1NTX1rojYWeeeuhEgQIAAAQIECBAg0AiBG3POD+/3+x9uRFslCRAgQKCyAu12+xkR8ZqIKCpbQnACBAgQIECAAAECBAj8l8A7l5eXZ5aWlgZACIxawADWqMXtd7MCe/fuPebaa699b1EUO1ARIECAAAECBAgQIECgogIrKaXH9Xq991Y0v9gECBAg0ACBr34Y8s0ppT0NqKsiAQIECBAgQIAAAQI1F8g5X3zNNdc84qKLLlqueVX1xlTAANaYHkyTY3U6nWPLsrwoIh7QZAfdCRAgQIAAAQIECBCopMAgpdTq9Xpvq2R6oQkQIECgEQJzc3MnlGX5JxHxoEYUVpIAAQIECBAgQIAAgVoL5Jw/UhTFL3S73etrXVS5sRYwgDXWx9PccHv27LntysrKh1JK92muguYECBAgQIAAAQIECFRMYPho87nFxcV+xXKLS4AAAQINEuh0Oj+ac353RPxwg2qrSoAAAQIECBAgQIBAfQX+uSzLHf1+/wv1rahZFQQMYFXhlBqacfhJvMFgcHFE/HhDCdQmQIAAAQIECBAgQKA6Amsppbler3egOpElJUCAAIGmCXQ6nYflnC+IiNs0rbu+BAgQIECAAAECBAjUUuCyycnJB+zfv/8ztWynVKUEDGBV6riaF/arT8L6YErpJ5vXXmMCBAgQIECAAAECBCoiMMg5n97v9xcrkldMAgQIEGigQLvd3hsRfxwRkw2srzIBAgQIECBAgAABAvUTuGJtbe0BBw8e/ET9qmlURQEDWFU8tYZlHg5hra6ufiAifqph1dUlQIAAAQIECBAgQGD8BXzt4PifkYQECBBotMCOHTsmf/AHf/CPcs6/0WgI5QkQIECAAAECBAgQqJPA1ZOTkw/cv3//v9eplC7VFjCAVe3za0x6Q1iNOWpFCRAgQIAAAQIECFRJYHViYuK0hYWFd1YptKwECBAg0ByBubm5E8qyfHtE7GhOa00JECBAgAABAgQIEKi5wBfLsnxwv9//3zXvqV7FBAxgVezAmhzXEFaTT193AgQIECBAgAABAmMnsFKW5WkHDhx419glE4gAAQIECETE7OzsySmlD0fEKUAIECBAgAABAgQIECBQE4Fri6J42MLCwkdq0keNGgkYwKrRYTahyleHsP4sIn66CX11JECAAAECBAgQIEBgLAVWcs6/0u/3/3Qs0wlFgAABAgQiYmZmZmJqauq8lNIeIAQIECBAgAABAgQIEKiBwA0R8fBer3eoBl1UqKGAAawaHmrdKxnCqvsJ60eAAAECBAgQIEBgrAWGT756woEDBy4c65TCESBAgACB/xJI7Xb79RHxFCAECBAgQIAAAQIECBCosMCNg8HgEQcOHPjzCncQveYCBrBqfsB1rTczM3ObqampD3gSVl1PWC8CBAgQIECAAAEC4yeQUlrOOT9hcXHxPeOXTiICBAgQIPBdBYZDWOdExFMZESBAgAABAgQIECBAoIICKymlx3a73fdVMLvIDRIwgNWgw65b1VardVxK6f2GsOp2svoQIECAAAECBAgQGEuBGyYmJh69sLBw8VimE4oAAQIECNy8QGq1WmcXRfEMUAQIECBAgAABAgQIEKiQwHD46gndbtfT6Ct0aE2NagCrqSdfk96dTufYwWDw7pTSQ2pSSQ0CBAgQIECAAAECBMZP4IbBYPCogwcPfmj8oklEgAABAgQOX6Ddbr80In778O9wJQECBAgQIECAAAECBLZMYLUsy5l+v/+nW5bAxgTWIWAAax1YLh1Pgb179x5z3XXXvSul9AvjmVAqAgQIECBAgAABAgQqLPDlsiwfdeDAgf9Z4Q6iEyBAgACBrwu02+0XR8QLkBAgQIAAAQIECBAgQGCMBQYppXa32z04xhlFI/BNAgawvCBqITAzMzM1OTl5sCiKx9aikBIECBAgQIAAAQIECIyDwDUR8fDFxcW/HYcwMhAgQIAAgY0SaLfbz4uIl2/UetYhQIAAAQIECBAgQIDABgoMIuL0Xq+3uIFrWorApgsYwNp0YhuMSmDHjh2Td7jDHd4aEe1R7WkfAgQIECBAgAABAgRqK/DpiHjY4uLi/1vbhooRIECAQKMF2u328ClYw6dh+SFAgAABAgQIECBAgMC4CJRlWe7p9/vdcQkkB4HDFTCAdbhSrquEwMzMzMS2bdveklL61UoEFpIAAQIECBAgQIDAYQvkiPAr3GFzHd2F/2dtbe0XLrjggo8f3TLuJkCAAAEC4y3QbrefExGvHO+U0hEgQIAAAQIECBAg0BCBQc75iYuLi+c3pK+aNRPw7n3NDlSdrwik2dnZP4qIp/MgQIAAAQIECBAgQIDAOgU+Nj09/Qv79u27ap33uZwAAQIECFRSoNVqnVUUxatNelfy+IQmQIAAAQIECBAgUBeBtZRSp9vtHqxLIT2aJ2AAq3ln3pTGqdPpvKosy2c1pbCeBAgQIECAAAECBAgctcDfT0xM7FxYWPj8Ua9kAQIECBAgUCGBVqvVKYpiX0RMVii2qAQIECBAgAABAgQI1ENgNSJ293q9P6lHHS2aKmAAq6kn35De7Xb7xTnnFzSk7ibX9JU3mwxseQIECBAgQIAAga0V+EBRFI/rdrvXb20MuxMgQIAAga0RaLVajy6K4oKImN6aBHYlQIAAAQIECBAgQKCBAisRcVqv13tXA7urXDMBA1g1O1B1vl2g1Wo9NaX02ogo+BAgQIAAAQIECBAgQOBbBcqyfPf09PRp+/fvv4kOAQIECBBossDu3bsfMjEx8acRccsmO+hOgAABAgQIECBAgMBIBJYj4ld6vd67R7KbTQhssoABrE0Gtvx4CLRardmU0lsjYtt4JJKCAAECBAgQIECAAIExEeheeeWVZxw6dGhtTPKIQYAAAQIEtlSg3W4/ICIujIjbbGkQmxMgQIAAAQIECBAgUGeBGyLiMb1e74N1LqlbswQMYDXrvBvddnZ29hER8baIuEWjIZQnQIAAAQIECBAgQOArAiml159yyinPmJ+fL5EQIECAAAEC/y3QbrfvExHvj4iTuBAgQIAAAQIECBAgQGCDBW7IOT9qcXHxQxu8ruUIbKmAAawt5bf5qAWGn+DLOQ8fYXjbUe9tPwIECBAgQIAAAQIExkcg5/yCfr//kvFJJAkBAgQIEBgvgT179txjbW1t+Gn0k8crmTQECBAgQIAAAQIECFRY4PqyLB/Z7/c/XOEOohP4jgIGsLwwGiewe/fuexVF8WcRcYfGlVeYAAECBAgQIECAAIFBRDx1cXHxTSgIECBAgACBmxfYtWvXD01OTl4cEXdhRYAAAQIECBAgQIAAgaMU+FJRFDsXFhY+cpTruJ3AWAoYwBrLYxFqswU6nc4P55w/kHM+ZbP3sj4BAgQIECBAgAABAmMjcH1K6bRer/fesUkkCAECBAgQGHOBM8888/Y33XTTByLix8Y8qngECBAgQIAAAQIECIypQErps6urq7908ODBj45pRLEIHLUDArtTAAAgAElEQVSAAayjJrRAVQX27NnzfaurqxdFxI9XtYPcBAgQIECAAAECBAgctsBncs6P6Pf7lxz2HS4kQIAAAQIEviIwMzNz/PT09Psi4r5ICBAgQIAAAQIECBAgsE6BT0bEL/Z6vUvXeZ/LCVRKwABWpY5L2I0WaLVax6WULoyI+2302tYjQIAAAQIECBAgQGBsBP59MBjsPHjw4CfGJpEgBAgQIECgYgKdTufYnPPbIuKXKxZdXAIECBAgQIAAAQIEtk7g8rIsf6Hf71++dRHsTGA0AgawRuNslzEW2Llz5/Txxx9/fkScNsYxRSNAgAABAgQIECBA4MgE/rYsy0ceOHDgc0d2u7sIECBAgACBrwns2LFj8o53vOMby7I8kwoBAgQIECBAgAABAgS+h8C/TE1NPWzfvn1XkSLQBAEDWE04ZR0PRyDNzs6+IiKeczgXu4YAAQIECBAgQIAAgUoIvON2t7td++yzz76xEmmFJECAAAEC1RBIc3NzLyzL8oXViCslAQIECBAgQIAAAQKjFkgp/d1NN920c2lp6ZpR720/AlslYABrq+TtO5YC7Xb7GTnn10REMZYBhSJAgAABAgQIECBA4HAFzrnrXe961vz8fHm4N7iOAAECBAgQOHyB2dnZp6WU/sj7aIdv5koCBAgQIECAAAECTRBIKf35rW51q0e/4Q1vuK4JfXUk8DUBA1heCwS+RaDdbj8+59yLiO1wCBAgQIAAAQIECBConECOiN9aXFx8ZeWSC0yAAAECBCom0Ol0HpdzXvQ+WsUOTlwCBAgQIECAAAECmyRQluW7vvCFL+y66KKLljdpC8sSGFsBA1hjezSCbaVAq9V6cErpHRFx263MYW8CBAgQIECAAAECBA5fIKW0nHM+fXFx8YLDv8uVBAgQIECAwNEIDN9HK4riXRFx66NZx70ECBAgQIAAAQIECFRboCzLhauuuuqJhw4dWqt2E+kJHJmAAawjc3NXAwR27959r6Io3hcRd2xAXRUJECBAgAABAgQIVF3gmpTSY3q93l9WvYj8BAgQIECgagLtdvs+ETF8H+32VcsuLwECBAgQIECAAAECGyLwil6v9/yIGD6d3g+BRgoYwGrksSt9uAKzs7MnR8RFEfGjh3uP6wgQIECAAAECBAgQGLnApTnnR/b7/f8Y+c42JECAAAECBL4i0Ol0fjjn/P6IuBsSAgQIECBAgAABAgQaIzAcuHpur9f7w8Y0VpTAdxEwgOWlQeB7COzZs+e2Kysrf5JSeggsAgQIECBAgAABAgTGSyDn/MGIOK3f739hvJJJQ4AAAQIEmifQ6XRul3N+b0T8ZPPaa0yAAAECBAgQIECgcQI3FUXRWVhYeHvjmitM4DsIGMDysiBwGAI7duyYPPnkk8/JOf/6YVzuEgIECBAgQIAAAQIERiCQcz730ksvfeoll1yyOoLtbEGAAAECBAgchkCn0zk259yPiEcdxuUuIUCAAAECBAgQIECgmgJfLMvy0f1+/y+qGV9qAhsvYABr402tWGOBdrv9jJzzayKiqHFN1QgQIECAAAECBAiMu8BazvlZ/X7/nHEPKh8BAgQIEGiiwMzMzMT27dtfk3N+ehP760yAAAECBAgQIECg5gJXRcQv93q9f6p5T/UIrEvAANa6uFxMIGJubu6xg8GgFxHH8CBAgAABAgQIECBAYOQCXxgMBjMHDx780Mh3tiEBAgQIECCwLoHhhxkj4tURMbGuG11MgAABAgQIECBAgMC4CnysKIqdCwsLnxzXgHIR2CoBA1hbJW/fSgu02+1755wvjIgfrHQR4QkQIECAAAECBAhUSCCldNnk5OQj9+/f/+8Vii0qAQIECBBotEC73X5MRCz6MGOjXwbKEyBAgAABAgQI1EAg5/yRiYmJRy4sLHy+BnVUILDhAgawNpzUgk0ROOOMM37gpptuujCldJ+mdNaTAAECBAgQIECAwBYKXJxz/pV+v/+FLcxgawIECBAgQOAIBPbs2fNTa2trww8z3v4IbncLAQIECBAgQIAAAQJbL/DOk046afbss8++ceujSEBgPAUMYI3nuUhVEYGZmZlbTk5OLhZF8aiKRBaTAAECBAgQIECAQOUEcs7nXnrppU+95JJLVisXXmACBAgQIEDgKwK7du36ocnJyfdGxI8gIUCAAAECBAgQIECgOgIppXPucpe7nDU/P19WJ7WkBEYvYABr9OZ2rJnAzMzMxLZt216aUnpezaqpQ4AAAQIECBAgQGCrBdZyzs/q9/vnbHUQ+xMgQIAAAQJHL3DGGWfcamVl5W0R8UtHv5oVCBAgQIAAAQIECBDYZIFBRPxOr9d7xSbvY3kCtRAwgFWLY1RiHARmZ2efHBHDPwxtG4c8MhAgQIAAAQIECBCouMAXBoPBzMGDBz9U8R7iEyBAgAABAt8gsGPHjsmTTz75jyNiLxgCBAgQIECAAAECBMZW4PqIaPV6vXePbULBCIyZgAGsMTsQcdYhMHz15nVcP4JLd+/eff+iKN4eEbcfwXa2IECAAAECBAgQIFBXgX/ftm3bY/fv3//vdS2oFwECBAgQaLhAmp2dfUFKaT4ivEfd8BeD+gQIECBAgAABAmMncGVZlo/o9/v/e+ySCURgjAX8cjvGhyNaNQVmZ2dPjoh3RcSp1WwgNQECBAgQIECAAIEtFThQFMWTut3u8FN2fggQIEBgIwXG8MNsG1nPWtUTmJube0JZludHxDHVSy8xAQIECBAgQIAAgVoK/PO2bdse8da3vvVTtWynFIFNFDCAtYm4lm6uQKfTOTbnvD/n/ITmKmhOgAABAgQIECBAYF0Cayml3+31eq9Y110uJkCAAAECBCot0G637x0Rw681uWOliwhPgAABAgQIECBAoPoC7885n7a4uPjl6lfRgMDoBQxgjd7cjs0RSO12+7k55z+IiKI5tTUlQIAAAQIECBAgsD6BlNLVg8Fg14EDB/58fXe6mgABAgQIEKiDQLvd/v6IeGdE3LcOfXQgQIAAAQIECBAgUDWBlNI5N910028uLS0NqpZdXgLjImAAa1xOQo7aCrTb7YfnnPsRcevallSMAAECBAgQIECAwBEK5Jz/YXJy8vELCwufPMIl3EaghgK+J66Gh6oSAQLfQ2Dnzp3Txx133LlFUczBIkCAAAECBAgQIEBgZALDgatn9nq9149sRxsRqKmAAayaHqxa4yUwOzv7PyLiXRFx5/FKJg0BAgQIECBAgACBrRPIOZ+7urr6tKWlpZWtS2FnAgQIECBAYJwE2u32MyLiNZ4oP06nIgsBAgQIECBAgEBNBa6LiF29Xu+9Ne2nFoGRChjAGim3zZosMDc3d8La2trbUkoPabKD7gQIECBAgAABAgQi4saI+PXFxcXzaRAgQIAAAQIEvlWg3W4/JiK6EXFLOgQIECBAgAABAgQIbIrAxycmJh59/vnn/+umrG5RAg0UMIDVwENXeesEZmZmJrZt2/bSlNJzI8J//rbuKOxMgAABAgQIECCwdQKfWltbe/wFF1zw91sXwc4ECBAgQIDAuAt89Yny704p/dC4Z5WvvgK+FLi+Z6sZAQIECBBouMBfLC8vP2FpaenqhjuoT2BDBQyAbCinxQgcnkC73X5UznkhIm5zeHe4igABAgQIECBAgEAtBD5cFMWubrf72Vq0UYIAAQIECBDYVIHhE+XLsnx7ROzY1I0sToAAAQIECBAgQKA5Auf+27/921MvueSS1eZU1pTAaAQMYI3G2S4Evk2g0+ncsyzLd0TEPfAQIECAAAECBAgQqLlAjog/WFlZeeHS0tKg5l3VI0CAAAECBDZQYOfOndMnnHDCORGxdwOXtRQBAgQIECBAgACBpgnclHN+8uLi4vlNK64vgVEJGMAalbR9CHwHgZmZmVtOT0/vyznPACJAgAABAgQIECBQU4HP5ZxP7/f776tpP7UIECBAgACBEQi02+25iHhTRNxiBNvZggABAgQIECBAgECdBK7KOT9+cXHxb+tUShcC4yZgAGvcTkSeJgqkdrv99JzzqyJiWxMBdCZAgAABAgQIEKinQErpf05NTbX27dt3VT0bakWAAAECBAiMUqDdbt8nIoZPlL/TKPe1FwECBAgQIECAAIEKC/xjURSPXVhY+GSFO4hOoBICBrAqcUxCNkGg1Wo9MKX0toi4fRP66kiAAAECBAgQIFBrgZxzfuXq6urv+MrBWp+zcgQIECBAYOQCMzMzJ23fvv1gzvkhI9/chgQIECBAgAABAgQqJJBS6p944olnnn322TdWKLaoBCorYACrskcneB0FZmdnT46IpYj4mTr204kAAQIECBAgQKARAp+NiM7i4uIHGtFWSQIECBAgQGDkAjt27Jg8+eSTXxIRzxv55jYkQIAAAQIECBAgMP4Cg4j4nV6v94rxjyohgfoIGMCqz1lqUhOBnTt3Th9//PGvjIin16SSGgQIECBAgEDlBHJE+FWhcsc2BoFzzn9eFEW71+t9egziiECAAAECBAjUXGB2dvb0lNKbImJ7zauqR4AAAQIECBAgQOBwBa7OOe9eXFz80PCG4bu8w3d7/RAgsPkC/qqy+cZ2IHBEArt3735MURRvjYjbHtECbiJAgAABAgQIECAwOoG1lNJLTznllBfPz8+Xo9vWTgQIECBAgEDTBVqt1o8XRfGOiPjhplvoT4AAAQIECBAg0HiBS9bW1p5w8ODBTzReAgCBLRAwgLUF6LYkcLgCrVbrTimlCyLivod7j+sIECBAgAABAgQIjFjgipRSq9fr/eWI97UdAQIECBAgQOArAnNzcycMBoODKaWHIiFAgAABAgQIECDQUIFzl5eXn7a0tLTS0P5qE9hyAQNYW34EAhC4eQFfSegVQoAAAQIECBAgMMYC75mYmNizsLDw+THOKBoBAgQIECDQAIEdO3ZMnnzyyS+LiGf5Pu3xP3BfhTP+ZyQhAQIECBAgUBmBG8qyfHK/3+9WJrGgBGoqYACrpgerVv0E5ubmHjsYDPb5SsL6na1GBAgQIECAAIEKCvjKwQoemsgECBAgQKAJAp1O55E55/Mj4rgm9NWRAAECBAgQIECg0QKXFUXx+IWFhX9utILyBMZEwADWmByEGAQOR2Bubu5ug8HgbRFx78O53jUECBAgQIAAAQIENkHg0rW1tc4FF1zw95uwtiUJECBAgAABAkctMDc3d8eyLIfvod33qBezAAECBAgQIECAAIExFEgpvWcwGMz1+/0vjGE8kQg0UsAAViOPXekqC+zZs2f76urqKyLi6VXuITsBAgQIECBAgEAlBborKytPWVpauq6S6YUmQIAAAQIEGiOwc+fO6RNPPPGVOWfvoTXm1BUlQIAAAQIECDRCYFAUxUvufOc7v3h+fr5sRGMlCVREwABWRQ5KTALfKjA7O3taRLw5Im5DhwABAgQIECBAgMAmC3wm5/zEfr//vk3ex/IECBAgQIAAgQ0VaLfbsxHxpoi45YYubDECBAgQIECAAAECoxf4XES0er3eB0e/tR0JEPheAgawvpeQ/z+BMRYYPk59MBj0IuIBYxxTNAIECBAgQIAAgWoLvD+ldEav1/t0tWtIT4AAAQIECDRVoNPp3DPn/PaI+JGmGuhNgAABAgQIECBQeYG/zDm3FhcXr6h8EwUI1FTAAFZND1at5gjMzMxMTE9PPzvn/PsRsa05zTUlQIAAAQIECBDYZIEbU0rP7/V6r93kfSxPgAABAgQIENh0gbPOOusWV1999esi4ombvpkNCBAgQIAAAQIECGycQE4pve5jH/vYsy+55JLVjVvWSgQIbLSAAayNFrUegS0SmJ2d/ZmIWIyIO29RBNsSIECAAAECBAjUR+Dvcs7tfr//H/WppAkBAgQIECBAIKLdbs9FxBsj4hgeBAgQIECAAAECBMZZIKX02YiY63a7fzbOOWUjQOC/BAxgeSUQqJHAzMzMbaampoZvIO2uUS1VCBAgQIAAAQIERiewlnN+9aWXXvoCn6gbHbqdCBAgQIAAgdEKtNvt+0TEwYi462h3thsBAgQIECBAgACBwxb44Pbt2zvnnXfe/z3sO1xIgMCWChjA2lJ+mxPYHIFWqzVXFMUf55xvuTk7WJUAAQIECBAgQKCGAv8nIjqLi4t/XcNuKhEgQIAAAQIEvkngjDPOuNXKysofRsReNAQIECBAgAABAgTGSGCtKIqX3vnOd37x/Px8OUa5RCFA4HsIGMDyEiFQU4F2u333siz7KaXhJ/r8ECBAgAABAgQIELg5ge7KyspTlpaWrsNEgAABAgQIEGiSQKfTmck5nxsRt21Sb10JECBAgAABAgTGTyDn/KmJiYnWwsLCX41fOokIEPheAgawvpeQ/z+BCgvs3Llz+rjjjntRSunZETFR4SqiEyBAgAABAgQIbI7AlTnnvf1+/32bs7xVCRAgQIAAAQLjL7Br164fmpiYGH6Q8WfHP62EBAgQIECAAAECNRV4d1EUZywsLHy+pv3UIlB7AQNYtT9iBQlEzM7O/kxELETEXXkQIECAAAECBAgQGAqklJaWl5efvLS0dA0RAgQIECBAgEDTBWZmZqa2bdv2sqIozhr+T6Wme+hPgAABAgQIECAwMoGVnPPzFhcXXxsReWS72ogAgQ0X8IvkhpNakMB4Cuzdu/eY66+//mUR8TRvIo3nGUlFgAABAgQIEBiFQM75qpzzkw8cOHDhKPazBwECBAgQIECgSgJzc3MPLcty+EHG769SblkJECBAgAABAgQqKfBvEdHu9Xr/WMn0QhMg8E0CBrC8IAg0TKDT6TxsMBjsSyn9QMOqq0uAAAECBAgQaLpAzjm/JaX0nMXFxS83HUN/AgQIECBAgMB3E+h0OrfLOe+PiJ2UCBAgQIAAAQIECGyCwPBJV8P36X6z2+1evwnrW5IAgS0QMIC1Bei2JLDVAjMzMydNTU29KSIet9VZ7E+AAAECBAgQIDASgU9MTEw8aWFh4eKR7GYTAgQIECBAgED1BVK73X56RLwyIqaqX0cDAgQIECBAgACBcRBIKX02Is7sdrueTj8OByIDgQ0UMIC1gZiWIlA1gU6nM1OW5Zsj4riqZZeXAAECBAgQIEDgsAS+8tSr7du3P3vfvn3XHtYdLiJAgAABAgQIEPi6wNzc3E+XZdmNiLthIUCAAAECBAgQIHCUAhemlIbDV8MhLD8ECNRMwABWzQ5UHQLrFWi1WndKKb01Ih683ntdT4AAAQIECBAgML4CKaXLyrJ8Yr/f/4vxTSkZAQIECBAgQGD8Bc4666xbfO5zn3t5zvlpEeE99fE/MgkJECBAgAABAuMmcGNEPL/X650TEcOvH/RDgEANBfyyWMNDVYnAEQgMH6n+pJzzH0bErY7gfrcQIECAAAECBAiMj8BXnnq1urr6rKWlpevGJ5YkBAgQIECAAIFqC5x++um/OBgMhh9k/IFqN5GeAAECBAgQIEBghAL/EBHtXq936Qj3tBUBAlsgYABrC9BtSWBcBb76NKzzIuKh45pRLgIECBAgQIAAge8ukFL6eESc2ev1DnEiQIAAAQIECBDYeIHdu3efODExcW5EPHbjV7ciAQIECBAgQIBAjQRySul1N91003OWlpZWatRLFQIEvouAASwvDQIEvlVg+DSsvTnnV0bErfEQIECAAAECBAhUQmAlpfSHJ5100kvOPvvs4SPN/RAgQIAAAQIECGyiQLvd/tWIeK2nyW8isqUJECBAgAABAtUVuDwi9vR6vb+sbgXJCRBYr4ABrPWKuZ5AQwTa7fb3DwaDNxVF8aiGVFaTAAECBAgQIFBJgZTSXw0GgycfOHDgXytZQGgCBAgQIECAQEUFhk+TL4ri/Ih4UEUriE2AAAECBAgQILCxAjki3nLrW9/6WW94wxuu29ilrUaAwLgLGMAa9xOSj8AWC3Q6nZmyLN8UEcdvcRTbEyBAgAABAgQIfLPAF1JKLzrllFNeNz8/X8IhQIAAAQIECBAYvcD8/Hxx2WWXPS0iXhER06NPYEcCBAgQIECAAIExEfjPnPMTFxcXPzQmecQgQGDEAgawRgxuOwJVFNizZ8/3raysvDGl9Jgq5peZAAECBAgQIFA3gZTSUkrpqd1u97N166YPAQIECBAgQKCKArt27fqJycnJhYj40Srml5kAAQIECBAgQOCIBXJK6bxt27Y9a9++fdce8SpuJECg8gIGsCp/hAoQGJ1Aq9WaSym9OiJOHN2udiJAgAABAgQIEPgGgUtzzr/e7/c/TIUAAQIECBAgQGC8BE499dRt97znPX8zIn4/IraNVzppCBAgQIAAAQIENkHg0ymlX+t2uxduwtqWJECgYgIGsCp2YOIS2GqBVqt1XES8PKX0pIjw3yFbfSD2J0CAAAECBJoisJpzfs3U1NT8/v37b2pKaT0JECBAgAABAlUUaLfb904pvTXn/BNVzC8zAQIECBAgQIDAYQksLS8vP3lpaemaw7raRQQI1F7A8ETtj1hBApsjsHv37gcVRfHmiLj75uxgVQIECBAgQIAAga8K/EVRFE/udrv/RoQAAQIECBAgQKAaAp6GVY1zkpIAAQIECBAgcAQCnynL8sn9fv9Pj+BetxAgUGOBMRnAGsbINWZWjUA9Bc4666xbXH311c/LOT8/Iqbq2VIrAgQIECBAgMCWCVyTUnp+r9d7i1+YtuwMbEyAAAECBAgQOCqBTqfzk2VZ7k8p3euoFnIzAQIECBAgQIDAOAj0yrJ8er/f/8I4hJGBAIHxEhiTAazxQpGGAIH1CezevfvHiqIY/mHwp9d3p6sJECBAgAABAgS+g0CZc963urr6PI8w9/ogQIAAAQIECFRfwNOwqn+GGhAgQIAAAQKNF7iqKIqnLiwsvLPxEgAIEPiuAgawvDgIENgQgfn5+eKyyy47M+f8qoi49YYsahECBAgQIECAQMMEcs7/MDk5+fSFhYWPNKy6ugQIECBAgACB2gu02+17p5TemnP+idqXVZAAAQIECBAgUA+B4dd4vWVqaurZ+/btu7YelbQgQGCzBAxgbZasdQk0VGB2dvbknPPrUkqPaSiB2gQIECBAgACBIxH4TET81uLi4oKvGzwSPvcQIECAAAECBKohsHPnzukTTjjh9yLiuRExWY3UUhIgQIAAAQIEGinwsYh4Uq/X+5tGtleaAIF1CxjAWjeZGwgQOByBXbt2/fzExMTrI+Ieh3O9awgQIECAAAECDRVYjYg3RsQLFhcXv9xQA7UJECBAgACBcRIYvmM8/Jy/n00VmJub+7Gc81tyzj+9qRtZnAABAgQIECBAYL0Cw/frXvP5z3/+hRdddNHyem92PQECzRUwgNXcs9ecwKYLzMzMTE1PT5+Vc56PiO2bvqENCBAgQIAAAQIVEkgpfWgwGDzjwIED/1qh2KISIECAAAECBAhskMD8/Hxx2WWXnRkRr46IW27QspYhQIAAAQIECBA4QoGU0kdXV1efePDgwY8e4RJuI0CgwQIGsBp8+KoTGJVAq9W6c0rpnIh4+Kj2tA8BAgQIECBAYFwFUkofTyk9v9vtLo1rRrkIECBAgAABAgRGJ7Br164fmpycHD4V9ZdGt6udCBAgQIAAAQIEvkHghoh48fLy8h8uLS0NyBAgQOBIBAxgHYmaewgQOCKB3bt3P7IoiuEg1g8d0QJuIkCAAAECBAhUW+CGlNKrJicnX75///6bql1FegIECBAgQIAAgY0W6HQ6MxHx+pzz7TZ6besRIECAAAECBAh8V4H3l2X55H6//5+MCBAgcDQCBrCORs+9BAisW+Css866xdVXX/28iPitnPP0uhdwAwECBAgQIECgmgLvmZiY+I2FhYVPVjO+1AQIECBAgAABAqMQaLVaxxVF8fKIeFJEeP9+FOj2IECAAAECBJoq8JmIeF6v11toKoDeBAhsrIBf4DbW02oECBymQLvdvntZlq9LKf3CYd7iMgIECBAgQIBA5QRSSh8dDAZPP3DgwF9VLrzABAgQIECAAAECWybQ6XQeFBFvzjnffctC2JgAAQIECBAgUE+BMiLOyzk/Z3Fx8cv1rKgVAQJbIWAAayvU7UmAwNcF2u32oyLi1TnnU7AQIECAAAECBGokcGVE/N5d73rX/fPz88M3dfwQIECAAAECBAgQWJfA3r17j7nhhhvmI+KsiJhc180uJkCAAAECBAgQ+DaBlNLf5Zx/vdfr/SMeAgQIbLSAAayNFrUeAQLrFjj11FO33fOe93xKzvlFEXGbdS/gBgIECBAgQIDA+Ahcn3N+/fbt21+6b9++a8cnliQECBAgQIAAAQJVFRg+SX74vzFTSg+tage5CRAgQIAAAQJbLPDFiJhfXl5+/dLS0mCLs9ieAIGaChjAqunBqkWgigJzc3MnDAaD34uI34iIiSp2kJkAAQIECBBorMDwKVeLKaXn9Xq9TzdWQXECBAgQIECAAIHNEkjtdrsTEa+MiNtv1ibWJUCAAAECBAjUUGBp+/btTzvvvPP+bw27qUSAwBgJGMAao8MQhQCB/xJot9v3yTn/UUQ8gAkBAgQIECBAoAICF5dl+awDBw78cwWyikiAAAECBAgQIFBhgT179tx2MBi8KOfsA4wVPkfRCRAgQIAAgZEI/MfwoQ+9Xu+DI9nNJgQINF7AAFbjXwIACIyvwO7dux9ZFMU5EfFD45tSMgIECBAgQKDBAv+ac35uv99/X4MNVCdAgAABAgQIENgCgU6n85NlWb4hpfRTW7C9LQkQIECAAAEC4yxwQ0S8dHl5+Q+XlpZWxjmobAQI1EvAAFa9zlMbArUT2Lt37zE33HDDc3POz46IY2tXUCECBAgQIECgigKfzDn/7t3udrfF+fn54VcP+iFAgAABAgQIECCwFQJf+1rCV0fEiVsRwJ5HITD860w+ivvdSoAAAQIECHybQErpPaurqygQH5UAACAASURBVE87ePDgJ/AQIEBg1AIGsEYtbj8CBI5IoN1uf39K6UVlWZ4RERNHtIibCBAgQIAAAQJHJ3BNSunlJ5100uvPPvvsG49uKXcTIECAAAECBAgQ2BiBmZmZ47dv3/7CnPNTI6LYmFWtQoAAAQIECBCojkBK6d8j4pndbvfPqpNaUgIE6iZgAKtuJ6oPgZoL7Nmz5x5ra2svzjnP1LyqegQIECBAgMD4CFyfc3791NTUy/fv3//F8YklCQECBAgQIECAAIH/Fpibm7t/WZavi4gf50KAAAECBAgQaIJASumasix/78orr3zzoUOH1prQWUcCBMZXwADW+J6NZAQI3IzA3Nzczw4Gg1dFxP1AESBAgAABAgQ2SWA15/zWoijme73epzdpD8sSIECAAAECBAgQ2DCB+fn54rLLLmtHxCsj4vYbtrCFCBAgQIAAAQLjJVCmlBYj4tndbvez4xVNGgIEmipgAKupJ683gXoIpE6n84Sc88tyznepRyUtCBAgQIAAgTEQGL6B8yerq6vPv+CCCz4+BnlEIECAAAECBAgQILAugac85Sm3vO66655dluVvRcT0um52MQECBAgQIEBgjAVSSn+XUnrawsLC341xTNEIEGiggAGsBh66ygTqJnDqqaduu+c97/mrOeffj4jb1a2fPgQIECBAgMBIBS5OKT271+v900h3tRkBAgQIECBAgACBTRBotVp3LYripRExswnLW5IAAQIECBAgMEqBqyLi+b1erxsReZQb24sAAQKHI2AA63CUXEOAQCUEWq3WcRHxvOHUe0QcU4nQQhIgQIAAAQLjIvDhoiie3+12/9e4BJKDAAECBAgQIECAwEYJdDqdX46I1+Sc775Ra1qHAAECBAgQIDAigRtSSq+JiJd3u93rR7SnbQgQILBuAQNY6yZzAwEC4y6wZ8+e71tbW/udnPPeiJga97zyESBAgAABAlsq8NcTExPzCwsLF29pCpsTIECAAAECBAgQ2GSBrz1FPiKGT8Q6cZO3szwBAgQIECBA4GgFhk+5evva2tpzDx48+ImjXcz9BAgQ2GwBA1ibLWx9AgS2TGDXrl0/WBTF76aUzoiIyS0LYmMCBAgQIEBg7ARyzh/JOb/swIEDF45dOIEIECBAgAABAgQIbKLAzMzMSdPT0y+JiCdGxMQmbmVpAgQIECBAgMCRCnxobW3tOQcPHvzokS7gPgIECIxawADWqMXtR4DAyAX27Nlzj9XV1d+OiNmIKEYewIYECBAgQIDAOAn8bVmWf2DwapyORBYCBAgQIECAAIGtEOh0OvfMOb8oIma2Yn97EiBAgAABAgS+VSCldGlEvKDb7S7RIUCAQNUEDGBV7cTkJUDgiAU6nc6P5px/L+fsTaUjVnQjAQIECBCorIDBq8oeneAECBAgQIAAAQKbKTA7O/vzKaVXRsR9NnMfaxMgQIAAAQIEbkbg8xHx+1dcccUfHzp0aI0UAQIEqihgAKuKpyYzAQJHJbB79+77T0xMvCTn/KCjWsjNBAgQIECAQBUE/ldEvGhxcfGiKoSVkQABAgQIECBAgMAWCaROp/OEnPMrIuKHtyiDbQkQIECAAIHmCdwYEecsLy+/bGlp6UvNq68xAQJ1EjCAVafT1IUAgXUJtNvtHYPB4IVFUexY140uJkCAAAECBKog8HfDr1Pp9/vvq0JYGQkQIECAAAECBAiMg8BZZ511i6uvvvrpEfH8iLjNOGSSgQABAgQIEKilQBkR3Zzz7y4uLl5Ry4ZKESDQOAEDWI07coUJEPhWgdnZ2ftFxG9FxCPoECBAgAABApUX+OuyLF9x4MCB90RErnwbBQgQIECAAAECBAhsgcDMzMzx09PTz42IZ0bE9BZEsCUBAgQIECBQU4Gc88U55+f0+/3/XdOKahEg0FABA1gNPXi1CRD4doF2u/1zOefhp/sMYnmBECBAgACB6glcnFJ6Ya/X+5vqRZeYAAECBAgQIECAwHgKzM3N3THn/JKcczsi/D1hPI9JKgIECBAgUBWBv0kp/Xa32/2fVQksJwECBNYj4Bem9Wi5lgCBRgjMzc397GAw+G2DWI04biUJECBAoNoCw0eVv68oihd1u91/qHYV6QkQIECAAAECBAiMr0Cn07lvzvmlEfHz45tSMgIECBAgQGAcBVJKH805/3av13v/OOaTiQABAhslYABroyStQ4BA7QRardaPF0Xx2znnJ/iEX+2OVyECBAgQqLbAakQc3LZt2x/s37//36tdRXoCBAgQIECAAAEC1RGYnZ29X0ppOIj1oOqklpQAAQIECBDYCoGc8ydSSi875ZRTzpufnx9+kNIPAQIEai1gAKvWx6scAQIbIdBut++dc35WRLQiYmIj1rQGAQIECBAgsH6BlNJyWZbnl2X5koMHD35q/Su4gwABAgQIECBAgMDRCwzfVM9Hv0ylV5ibm3toWZaviIj7VLqI8AQIECBAgMBmCFwZEa9aXl5+49LS0spmbGBNAgQIjKOAAaxxPBWZCBAYS4G5ubm7ra2tPacoik7OeXosQwpFgAABAgSqLjD8S9a3/5byuZTSG1NKr+92u5+tekX5CRAgQIAAAQIECNRBYH5+vvj4xz/+KznnF0XE3erQSQcCBAgQIEDgqAQ+HxEvP+mkk/747LPPvvGoVnIzAQIEKihgAKuChyYyAQJbK3DmmWfe/qabbvr1nPMzIuK2W5vG7gQIECBAoNYCl6eUzkkpndftdq+vdVPlCBAgQIAAAQIECFRU4KuDWI/POb88Iu5c0RpiEyBAgAABAkcokFK6JqX0uqIo/mj//v1fPMJl3EaAAIHKCxjAqvwRKkCAwFYJzM7O3jql9Ks55+dFxPdvVQ77EiBAgACBGgpcknM+Z3V1dXFpaWlQw34qESBAgAABAgQIEKidwMzMzNT09PSeiJj3XlntjlchAgQIECDwnQS+HBFvnJycfLnBKy8QAgQIfKcv96BCgAABAusS2Llz5/Rxxx13WkrpdyPiruu62cUECBAgQIDA1wTKiHhfSullvV7vb7AQIECAAAECBAgQIFBNgU6nc2zO+cyIeG5E/EA1W0hNgAABAgQI3IzAtRHxBoNXXiMECBD4ZgFPwPKKIECAwAYJDB+3fumllz68KIrfioif26BlLUOAAAECBGotkFK6rizLflEUr+n1epfWuqxyBAgQIECAAAECBBokMPzQ4gknnHB6RLzQIFaDDl5VAgQIEKizgMGrOp+ubgQIHLWAAayjJrQAAQIEvl1g9+7d9y+K4qyIeHRETDAiQIAAAQIEvk3gk8NHlOec39zv97/AhwABAgQIECBAgACBegp8w1cT/l5E3KGeLbUiQIAAAQK1FjB4VevjVY4AgY0SMIC1UZLWIUCAwHcQ6HQ6PzwYDH4tpfRrEXFbSAQIECBAgEBcknM+56qrruofOnRojQcBAgQIECBAgAABAs0Q2LNnz/bV1dUnpZSGX014cjNaa0mAAAECBKorkFK6pizL166srLx2aWnpS9VtIjkBAgRGI2AAazTOdiFAoOECZ5xxxq1WVlbOyDkPn4p1p4ZzqE+AAAECDRNIKS3nnN+WUnp1r9f7p4bVV5cAAQIECBAgQIAAgW8Q+OoTsXZFxPCJWHeBQ4AAAQIECIyXQErpsymlN954441nG7war7ORhgCB8RYwgDXe5yMdAQI1E9ixY8fkHe5wh8dHxHAQ6741q6cOAQIECBD4VoH/jIg3rKysnLe0tHQNHgIECBAgQIAAAQIECHxNYDiItX379uEHFodPxPphMgQIECBAgMCWC1yeUnrV5z73ubdedNFFy1ueRgACBAhUTMAAVsUOTFwCBOoj0Gq1To2IvSmldkQcU59mmhAgQIAAgfjroihe+6lPfeqdvmbQq4EAAQIECBAgQIAAgZsTmJ+fLz7+8Y8/POc8fCLWT9IiQIAAAQIERi7wLxHxqiuuuKLvvbyR29uQAIEaCRjAqtFhqkKAQDUF5ubmThgMBk+MiCf7tF81z1BqAgQIEPiKwJciolcUxZu63e7wTRs/BAgQIECAAAECBAgQWJfA3Nzc/XPOz8s5P2JdN7qYAAECBAgQWLdASumjOec/OuWUU3rz8/PluhdwAwECBAh8k4ABLC8IAgQIjInA8NN+l19++UPKstybc35cREyMSbQNi5Ejwj94NozTQgQIEBgXgUtSSucuLy/3l5aWrhuXUHIQIECAAAECBAgQIFBdgXa7fZ+U0jNzzq06vkdW3ZORnAABAgRqIvDXKaVXdLvdC2vSRw0CBAiMhYC/g4/FMQhRa4Hhf8qGUyd+CKxD4LTTTrvLxMTEkyLizJTSCeu41aUECBAgQGAUAtfmnA8URfHmXq/3j6PY0B4ECBAgQIAAAQIECDRP4PTTT7/X6urqc4ui2B0R25onoDEBAgQIENgwgbWIeHtK6dXdbvcfNmxVCxEgQIDA1wUMYHkxECBAYIwF9u7de8z111+/KyKGw1g/M8ZRRSNAgACBZghcEhFvXllZOeBpV9984Gbum/EfAC0JECBAgAABAgS2RmBubu6OOedn5ZyfGBHHbk0KuxIgQIAAgUoKfDml9JaU0jkLCwufrGQDoQkQIFARAQNYFTkoMQkQINDpdH60LMvhIFY7Io4nQoAAAQIERiGQUroupXRgMBi8ud/vDwew/BAgQIAAAQIECBAgQGBLBGZmZm4zPT29ZziMlVL6wS0JYVMCBAgQIFANgU8XRXHu2traa/v9/heqEVlKAgQIVFvAAFa1z096AgQaKLBz587pE0888VFlWe6NiJ+PCP9d3sDXgcoECBAYgcAlKaVzp6amDuzbt+/aEexnCwIECBAgQIAAAQIECByWwKmnnrrtR37kRx6TUvrNsiw9Nf6w1FxEgAABAk0QSCl9NOf8R1dccUX/0KFDw68d9EOAAAECIxLwR/sRQduGAAECmyEwMzNzyvT0dDvnfEZE+NTfZiBbkwABAs0SuDLn3FtdXT1vaWnpsmZV15YAAQIECBAgQIAAgSoKtFqtUycmJp6Rc94dEZNV7CAzAQIECBA4SoEypfS+lNJrFxYWLj7KtdxOgAABAkcoYADrCOHcRoAAgXESGH7q7173utcjBoPBEyPiYd5sGqfTkYUAAQJjL3BjRLwzpbT/lFNO+dD8/Hw59okFJECAAAECBAgQIECAwLcInHbaaXeZmpoaDmL9akTcEhABAgQIEGiAwJdTSucPBoPX9fv9/2hAXxUJECAw1gIGsMb6eIQjQIDA+gVmZmaOn56efkLOeS4i7rf+FdxBgAABAg0RGH7FYLcoit7CwsLnG9JZTQIECBBoqsDwHbDc1PJ6EyBAoFkCs7Ozt04pDYewzoqIOzWrvbYECBAg0BCB4bDV/zM5Ofnm/fv3f7EhndUkQIDA2AsYwBr7IxKQAAECRy7QbrfvXZblXEqpFRHfd+QruXMUAsO/B/kH8yik7UGg0QKfSCn1U0q9brf7b42WUJ4AAQIECBAgQIAAgVoL7NixY/Lkk09+dErpKTnnB3vbpdbHrRwBAgSaIDAoy/LClNLrFxcX/9xHTJpw5DoSIFA1AX/nrdqJyUuAAIEjEJifny8uv/zyhwwGg+FTsR4XEccewTJuIUCAAIFqClwTEe+dmJhYWFhY+JA3Z6p5iFITIECAAAECBAgQIHDkAq1W665FUTwxpfSknPPxR76SOwkQIECAwMgFvphSWlhdXT374MGDnxj57jYkQIAAgcMWMIB12FQuJECAQD0EZmZmbjM9PT3zDV9RWNSjmRYECBAg8DWBlNJ1Oed35ZwPXHXVVR84dOjQGh0CBAgQIECAAAECBAg0XWDPnj3b19bWfuWrX0/440330J8AAQIExlrgHyPizcccc0zv3HPPvWGskwpHgAABAl8RMIDlhUCAAIEGC8zNzd2hLMsn5JxnIuLn/HOhwS8G1QkQqIPAICI+nHPurq6uvmNpaem6OpTSgQABAgQIECBAgAABApshMDc3d/+yLH/jq0+Ln9qMPaxJgAABAgTWKXBjRLytKIo3LywsfGSd97qcAAECBLZYwADWFh+A7QkQIDAuAqeddtpdJiYmTiuK4rSc84+NSy45CBAgQOBmBQYppUMRsVQUxdsXFhY+z4sAAQIECBAgQIAAAQIEDl9gz54937e6uvrEiPi1lNIPHv6driRAgAABAhsm8M8R8ZbJycne/v37v7hhq1qIAAECBEYqYABrpNw2I0CAQDUEZmdnfySl9Cs559Mi4h7VSC0lAQIEGiMwfNLV36aUliYnJy/Yv3//ZxrTXFECBAgQIECAAAECBAhsksD8/Hxx+eWXP6Qsy70R8ZiI2LZJW1mWAAECBAgMBW6KiAuLojh3YWHhYiQECBAgUH0BA1jVP0MNCBAgsKkCu3bt+omJiYldKaXH55zvsqmbWZwAAQIEvpvASkR8KCLevrKy8q6lpaVrUBEgQIAAAQIECBAgQIDA5giceeaZt7/pppt2RcSZEfGjm7OLVQkQIECgoQIfi4iF5eXlt3iPr6GvALUJEKitgAGs2h6tYgQIENh4gd27d99rYmLiETnnR0bEz0WEf45sPLMVCRAg8DWBrz/panl5ub+0tHQ1GgIECBAgQIAAAQIECBAYrUCr1Tq1KIrhU7FmI+LY0e5uNwIECBCoicC1KaV3pZQWPO2qJieqBgECBL6DgD+ce1kQIECAwBEJtFqtOxdF8bic82Mj4mciojiihdxEgAABAt8o8KWIeH9EvHtlZeW9S0tLw3/vhwABAgQIECBAgAABAgS2WGBmZuY209PTp0XEr0XEfbY4ju0JECBAYPwFyoj4yPBpV1NTUwf27dt37fhHlpAAAQIEjkbAANbR6LmXAAECBL4isHv37hNTSr+cUpqJiF+MiCk0BAgQIHDYAv+Zc/6znPN71tbW/mxpaWn4dYN+CBAgQIAAAQIECBAgQGBMBTqdzk/mHL+aUuzKOR8/pjHFIkCAAIGtEbhsOHRVluVCv9//z62JYFcCBAgQ2AoBA1hboW5PAgQI1Fig1Wodl1LaGREPj4hfighvQtX4vFUjQOCIBHLO+ZLhU66Konh3r9f7pyNaxU0ECBAgQIAAAQIECBAgsKUCMzMzU9u3b39YzrkTEY/2ocQtPQ6bEyBAYCsFvpxS+tOvfsXghyIib2UYexMgQIDA1ggYwNoad7sSIECgEQIzMzMTk5OTP1sUxXAYa/iv/9GI4koSIEDg2wVuTCl9+KtDV+9ZWFi4EhIBAgQIECBAgAABAgQI1Edgz549t11bW/uViJiLiJ+LCH9/qc/xakKAAIHvJPD1rxhMKS12u93rMREgQIBAswX8AtDs89eeAAECIxU488wzb3/DDTc8rCiKR+Sch0/HutVIA9iMAAECoxW4POd88cTExMXbtm17/759+64d7fZ2I0CAAAECBAgQIECAAIGtEGi323dPKbW/+mSsO21FBnsSIECAwKYJ/HNE9HPOi4uLi1ds2i4WJkCAAIHKCRjAqtyRCUyAAIF6CJx11lm3uPrqqx+Sc/7liPiFiLhrPZppQYBAgwWuL8vyQyml90fEn/X7/csbbKE6AQIECBAgQIAAAQIECESkTqfzwOFTsXLOj4uI20K5eYHhH618b5dXCQECYyhwWUQcyDkfXFxc/NgY5hOJAAECBMZAwADWGByCCAQIECAQ0W63vz+ldP/BYPDQlNIjI+L7uRAgQKACAl95ylXO+T1f/OIXP3DRRRctVyCziAQIECBAgAABAgQIECAwYoGZmZmJW9ziFg/OOQ+HsR4dEbcecQTbEfj/27vb37jKM4/jv+s+x/aYpHkgDYSUp6TUsEBYSra7ULIBdVt1s09lX8wuchRpXvGCd/kP/IcgZDm2BRrtqiuQoIKC1U22q7ZpCFs5kOCUOCTEIcQkVIntmXNfq9t1om2VTWMztufhO9LRmUzmnPu6PudIhOOf7xsBBBBYnMAZM/s3M6sODQ0dIh+6ODy+jQACCHSiAAGsTrzq9IwAAgg0ucDAwECYmJh4IsaYZsb6gZl91917mrxsykMAgc4QOB1jfMfM3snz/KdDQ0NnOqNtukQAAQQQQAABBBBAAAEEEGiUQKVSKRVFkZ57ld39nyWtbdS5OQ8CCCCAwFcSmDaz1yVVT58+/cbY2Fj9K52NgxFAAAEEOkqAAFZHXW6aRQABBFpT4IUXXrjtypUru1MgK4SQflPwMUlZa3ZD1Qgg0GIC5yW9mwJXMcZ3R0dHT7RY/ZSLAAIIIIAAAggggAACCCDQxAIvvvji2kuXLv2Tmf2rpB9K4pcQm/h6URoCCLSlwHSM8bUsy14dHx9/6/Dhw7W27JKmEEAAAQSWXYAA1rITMwACCCCAQKMFyuXy2t7e3idjjLvc/WlJuyV1N3oczocAAp0nYGa/c/f/NrO3Y4xv9/X1HRkYGIidJ0HHCCCAAAIIIIAAAggggAACKy1QqVQ2zM3NPRdCSGGs7/G8a6WvAOMhgECnCJjZeXf/sZn9+/j4+DuErjrlytMnAgggsLwCBLCW15ezI4AAAgisgEAKZJVKpafdfbe7PyPpOzygWgF4hkCgPQSmJB2S9J8hhIMzMzNHqtVq0R6t0QUCCCCAAAIIIIAAAggggECrCqQZ4a9evfo3C8sU/kjSulbthboRQACBJhH4zMzeTMsLjo+Pv0noqkmuCmUggAACbSRAAKuNLiatIIAAAgj8XmD//v29U1NTT6aZscws7dO2AR8EEEBAUlpCcD5wZWaHhoeHP0QFAQQQQAABBBBAAAEEEEAAgWYWqFQqpYWZ4P/R3f9F0pZmrpfaEEAAgSYSOGVm/2Fm1aGhofRM0JuoNkpBAAEEEGgzAQJYbXZBaQcBBBBA4MYC/f392yXtMrOdktKyhd+WFPBCAIG2FkgzWX3o7gdT6CrP87GhoaHJtu6Y5hBAAAEEEEAAAQQQQAABBNpaoFwuZ3meP5Pn+XMxxufM7J62bpjmEEAAgcUJpIDVETN7vVar/fiVV145srjD+TYCCCCAAAJLFyCAtXQ7jkQAAQQQaGGBtGxhnuePZ1mWli7ctTBL1tdbuCVKRwAB6VNJh83scFEUaX9wdHR0GhgEEEAAAQQQQAABBBBAAAEE2lTAKpXKX9Tr9eck/Z2kx9u0T9pCAAEEbiZw1cx+6u6vhxBeHxoaOgMXAggggAACqyFAAGs11L/SmOmSMTvmVyLkYAQQQODGAtbf3/9AlmU7Y4xPmNkT7p5my2LpQu4YBJpT4JK7/8LM5rc8z38xODh4rjlLpSoEEEAAAQQQQAABBBBAAAEEll9g3759d7j730r6B0k/lLRu+UdlBAQQQGBVBD4zszclvdbV1fXmyy+//OWqVMGgCCCAAAII/B8BAljcDggggAACCNxEIC1deC2UJWk+lGVmm0BDAIEVFfjSzI66+xF3/1V3d3cKW31IKn1FrwGDIYAAAggggAACCCCAAAIItJBApVIpxRh3xRi/b2Y/cveHWqh8SkUAAQRuJDCeAlcLs1wd4tkgNwkCCCCAQLMJEMBqtitCPQgggAACTS/Q399/X57nTxRFscPMHnX3HZIekJQ3ffEUiEDzC6RlBN9LWwjhyMzMzJFqtTrBA5Xmv3BUiAACCCCAAAIIIIAAAggg0LwCe/fufdjM/n5hqcJdPMdq3mtFZQggcF1gStJb7v6T3t7et1566aX0Z14IIIAAAgg0rQABrKa9NBSGAAIIINBKAnv27OlZv379wyGER1MoS1IKZT0i6d5W6oNaEVhBgbqkFKw6KumImb2X5/l7LCO4gleAoRBAAAEEEEAAAQQQQAABBDpSYN++fWvM7Kk0O5aktD0hiZ8XdeTdQNMINJVAel54NM1wVa/XX+vr6zsyMDAQm6pCikEAAQQQQOAmAvyDmtsDAQQQQACBZRSoVCobZmdnH82y7JEYY18IIU333ufu9/ObhssIz6mbSWA+aOXuvzGzY5J+E2M8Vq/XP6hWq3PNVCi1IIAAAggggAACCCCAAAIIINCJApVKZUtRFH/t7imMlWbJ+kYnOtAzAgisisBJSW+b2dsxxp+MjIxcXpUqGBQBBBBAAIEGCBDAagAip0AAAQQQQGCxAuVyuXvNmjXbZ2dnHwoh9JlZn6QH0+bumxd7Pr6PwGoLmNmsu59093GCVqt9NRgfAQQQQAABBBBAAAEEEEAAgSUL2PPPP/94nucpjPUDSWm5wt4ln40DEUAAgT8U+ETSmJmNFUXx9ujo6CmAEEAAAQQQaBcBAljtciXpAwEEEECgbQT6+/s3ZlnWF2P8lqTtMcbtIYRt6f3CbyDy3++2udot10jN3X9rZidijCdCCCfSezP7aGZmZrJarRYt1xEFI4AAAggggAACCCCAAAIIIIDA/yuwf//+3nPnzj3V1dW1O8b4rKS/klSCDAEEELhFgbOS3k2hq7QNDw9/dIvH8TUEEEAAAQRaToAf4LbcJaNgBBBAAIFOFtizZ0/Ppk2b7nf3FMbaFkJIAa1r4ay0X9/JPvTeEIFpSadijJMhhI8lfZRCVrVa7cTU1NSpsbGxtKQgLwQQQAABBBBAAAEEEEAAAQQQ6ECBZ599Nt+6deufhxC+b2a73H23pHUdSEHLCCBwY4EpST+TdCjGeHB0dPTXkhwsBBBAAAEEOkGAAFYnXGV6RAABBBDoGIH0W4lTU1N35Xm+vV6vbw0h3JVm0DKzrZLukvRNSRs6BoRGbySQAlYnJX3q7mdDCCfN7GRRFCe7u7snBgcHv4ANgaYRSP+3wiO6prkcFIIAAggggAACCCCAAAII/LFAuVzu7u7u/o6ZPZPCWGb2tKS1SCGAQMcIHJf0czM75O4/Gx4e/rBjOqdRBBBAAAEE/kiAABa3BAIIIIAAAh0mUC6X1+d5fncI4d4QwtaiKLaa2WYz2+LuWyRtXghrxVN5gQAACIlJREFUMZtWa90bF6+FqtLezM66+/w+/bkoijOlUunc4ODgTGu1RbUIIIAAAggggAACCCCAAAIIINAqAmmGrHvuuefxGONTIYQn3f2pNIt7q9RPnQggcFOB9FzxsKT/ijEeyrLs5wcOHDiPGQIIIIAAAgj8XoAAFncCAggggAACCNxQoFKplGKMd6SAVoxxc5Zld8YY7zKzr0u63cxujzFuTPu0ufvtkjI4GyaQZqL6zN0vmNnnMcbP8zy/EGO8EEL4rCiK9PmFFLLq7u4+S7CqYe6cCAEEEEAAAQQQQAABBBBAAAEEGihQqVS2FEWRZsnaWRTF02b2XUm3NXAIToUAAssjMGVmvzSzFLo6GEI4yDPI5YHmrAgggAAC7SFAAKs9riNdIIAAAggg0BQCaXatLMs25nmewlibFkJZKaS13t2/FmNck+f5Gnff4O5pOvo1C9vGhenpr/25KfpZYhGFpMtmVnf3LyVNu/ul9FnaQgjz+4Vt2swuF0Vx2d3TZ9M9PT2ff/zxxxfGxsbqSxyfwxBAAAEEEEAAAQQQQAABBBBAAIGmFdi5c2fXjh07Hp+bm5ufJUvSX0r6ZtMWTGEIdIZAejb5a0m/kpRCV788cODAbzujdbpEAAEEEECgMQIEsBrjyFkQQAABBBBAoIEC/f39KZCVXuvSrFpmVnL33qIoQk9Pz/zSiLVabW2e511FUXSHEFJw6w9eKeRlZov5t06UlIJS11/uPhtCuHLtgxSoCiGkYNTler1e1Gq1S11dXem46e7ubh8cHEyzVvFCAAEEEEAAAQQQQAABBBBAAAEEEFiEwN69e9dlWfZYjHFnminL3XdKekhSWMRp+CoCCNyaQE3SiTSrlaS0lODhbdu2HRsYGEjPOXkhgAACCCCAwBIFFvNDySUOwWEIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAII3LpApVLZUKvVdoYQrgWyUiiLmbJunZBvIpAE0gz9/yPpaFpKMM1sNTk5Oc7s+9wcCCCAAAIINF6AAFbjTTkjAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIBAgwVSKGtubu7bZvZoCGGHuz8m6RFJaxs8FKdDoNUEXFJaMvBoCOF9d39/bm7u6KuvvnpSUvo7XggggAACCCCwzAIEsJYZmNMjgAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggsm4D19/dvCyGkJQxTMOsxM0vhrAck5cs2KidGYPUEvgghfBBjTEGro1mWvV8UxfsjIyOXV68kRkYAAQQQQAABAljcAwgggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAm0lUKlUSvV6/WF3fziE8JC7PyipT1La97RVszTTrgJnJR0zsxS2Go8xfpBl2bHh4eFP27Vh+kIAAQQQQKCVBQhgtfLVo3YEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAIFbFhgYGAjHjx+/P4TQF2P8sxDCg2bW5+4PSbrrlk/EFxFojMCMpJPufmIhaPVBnufjV69e/bBarV5qzBCcBQEEEEAAAQRWQoAA1kooMwYCCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggEBTC5TL5fWlUulbkra5+/a0l3Rtf5+krqZugOKaUsDMLsYYJ8xsYiFsNRFCmEifjYyMnJHkTVk4RSGAAAIIIIDAogQIYC2Kiy8jgAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAgh0mkC5XM66urruDiHMh7PSPoWz3P0+d7/XzLYQ0Oq0u+J6v59JOi3pEzM7dW3v7hNFUUyMjo5Od6wMjSOAAAIIINBBAgSwOuhi0yoCCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggEDjBdLShpOTk1vq9frdkr5Rr9fvCSGk91sl3Zs+W9h6Gj86Z1wmgSgphavOL4SqPokxfiLpVIzxdFdX1ychhMnBwcG0jCAvBBBAAAEEEOhwAQJYHX4D0D4CCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggMDKCOzbt++OEMLmoig2p1mzYoxpv1nSne5+58L79Oc0o9bXVqaqjhqlkHQxBavMbErSpylg5e7n0pbem9nZtJ+dnT1frVbT93khgAACCCCAAAJ/UoAA1p8k4gsIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIrKxApVIppUBWrVa73cw2FEWxQdLG9D7Lsg3uvjF9FkKY/1xS+myDma2VlLaula14RUarS/pS0mVJV9Lm7mmJv8tmlvYX3f1iem9mF2OMF4uiSIGr6SzLLo6MjKTjeCGAAAIIIIAAAg0XIIDVcFJOiAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggMDqCqRlEY8fP76+VCr1zszMlFJQK4SQlkBcszC7VneMcX2qMoW63H3+54Zmdpu7zy+VaGa5u1+ficvd15tZuFFnZvaFu/tNuk7hp8Ldo5ldSt9z91kzS0Gq9P53IYSamV0PWbn7laIo0t9PT09PX3njjTdmV1eV0RFAAAEEEEAAgRsLEMDizkAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEElihAAGuJcByGAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCBDA4h5AAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBJYoQABriXAchgACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggQwOIeQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQSWKPC/IqKItRCwXFoAAAAASUVORK5CYII=" id="b" width="2400" height="2241"/></defs></svg>
\ No newline at end of file
diff --git a/packages/editor-ui/src/App.vue b/packages/editor-ui/src/App.vue
index 2d1e09cf3648a..4df18d2573b28 100644
--- a/packages/editor-ui/src/App.vue
+++ b/packages/editor-ui/src/App.vue
@@ -9,16 +9,25 @@
 				[$style.sidebarCollapsed]: uiStore.sidebarMenuCollapsed,
 			}"
 		>
+			<div id="banners" :class="$style.banners">
+				<BannerStack v-if="!isDemoMode" />
+			</div>
 			<div id="header" :class="$style.header">
 				<router-view name="header"></router-view>
 			</div>
-			<div id="sidebar" :class="$style.sidebar">
+			<div v-if="usersStore.currentUser" id="sidebar" :class="$style.sidebar">
 				<router-view name="sidebar"></router-view>
 			</div>
 			<div id="content" :class="$style.content">
-				<keep-alive include="NodeView" :max="1">
-					<router-view />
-				</keep-alive>
+				<router-view v-slot="{ Component }">
+					<keep-alive v-if="$route.meta.keepWorkflowAlive" include="NodeView" :max="1">
+						<component :is="Component" />
+					</keep-alive>
+					<component :is="Component" v-else />
+				</router-view>
+			</div>
+			<div id="chat" :class="{ [$style.chat]: true, [$style.open]: aiStore.assistantChatOpen }">
+				<AIAssistantChat v-if="aiStore.assistantChatOpen" />
 			</div>
 			<Modals />
 			<Telemetry />
@@ -27,38 +36,51 @@
 </template>
 
 <script lang="ts">
-import Modals from './components/Modals.vue';
-import LoadingView from './views/LoadingView.vue';
-import Telemetry from './components/Telemetry.vue';
-import { HIRING_BANNER, LOCAL_STORAGE_THEME, VIEWS } from './constants';
+import { defineComponent } from 'vue';
+import { mapStores } from 'pinia';
+
+import BannerStack from '@/components/banners/BannerStack.vue';
+import Modals from '@/components/Modals.vue';
+import LoadingView from '@/views/LoadingView.vue';
+import Telemetry from '@/components/Telemetry.vue';
+import { HIRING_BANNER, VIEWS } from '@/constants';
 
-import mixins from 'vue-typed-mixins';
-import { showMessage } from '@/mixins/showMessage';
 import { userHelpers } from '@/mixins/userHelpers';
-import { loadLanguage } from './plugins/i18n';
+import { loadLanguage } from '@/plugins/i18n';
 import useGlobalLinkActions from '@/composables/useGlobalLinkActions';
-import { mapStores } from 'pinia';
-import { useUIStore } from './stores/ui';
-import { useSettingsStore } from './stores/settings';
-import { useUsersStore } from './stores/users';
-import { useRootStore } from './stores/n8nRootStore';
-import { useTemplatesStore } from './stores/templates';
-import { useNodeTypesStore } from './stores/nodeTypes';
+import { useExternalHooks } from '@/composables/useExternalHooks';
+import { useToast } from '@/composables/useToast';
+import { useCloudPlanStore } from '@/stores/cloudPlan.store';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useSourceControlStore } from '@/stores/sourceControl.store';
+import { useTemplatesStore } from '@/stores/templates.store';
+import { useUIStore } from '@/stores/ui.store';
+import { useUsageStore } from '@/stores/usage.store';
+import { useUsersStore } from '@/stores/users.store';
 import { useHistoryHelper } from '@/composables/useHistoryHelper';
-import { newVersions } from '@/mixins/newVersions';
-import { useRoute } from 'vue-router/composables';
+import { useRoute } from 'vue-router';
+import { initializeAuthenticatedFeatures } from '@/init';
+import { useAIStore } from './stores/ai.store';
+import AIAssistantChat from './components/AIAssistantChat/AIAssistantChat.vue';
 
-export default mixins(newVersions, showMessage, userHelpers).extend({
+export default defineComponent({
 	name: 'App',
 	components: {
+		BannerStack,
 		LoadingView,
 		Telemetry,
 		Modals,
+		AIAssistantChat,
 	},
+	mixins: [userHelpers],
 	setup() {
 		return {
 			...useGlobalLinkActions(),
 			...useHistoryHelper(useRoute()),
+			...useToast(),
+			externalHooks: useExternalHooks(),
 		};
 	},
 	computed: {
@@ -69,143 +91,48 @@ export default mixins(newVersions, showMessage, userHelpers).extend({
 			useTemplatesStore,
 			useUIStore,
 			useUsersStore,
+			useSourceControlStore,
+			useCloudPlanStore,
+			useUsageStore,
+			useAIStore,
 		),
 		defaultLocale(): string {
 			return this.rootStore.defaultLocale;
 		},
+		isDemoMode(): boolean {
+			return this.$route.name === VIEWS.DEMO;
+		},
 	},
 	data() {
 		return {
+			onAfterAuthenticateInitialized: false,
 			loading: true,
 		};
 	},
-	methods: {
-		async initSettings(): Promise<void> {
-			try {
-				await this.settingsStore.getSettings();
-			} catch (e) {
-				this.$showToast({
-					title: this.$locale.baseText('startupError'),
-					message: this.$locale.baseText('startupError.message'),
-					type: 'error',
-					duration: 0,
-				});
-
-				throw e;
-			}
-		},
-		async loginWithCookie(): Promise<void> {
-			try {
-				await this.usersStore.loginWithCookie();
-			} catch (e) {}
-		},
-		async initTemplates(): Promise<void> {
-			if (!this.settingsStore.isTemplatesEnabled) {
-				return;
-			}
-			try {
-				await this.settingsStore.testTemplatesEndpoint();
-			} catch (e) {}
-		},
-		logHiringBanner() {
-			if (this.settingsStore.isHiringBannerEnabled && this.$route.name !== VIEWS.DEMO) {
-				console.log(HIRING_BANNER); // eslint-disable-line no-console
-			}
-		},
-		async initialize(): Promise<void> {
-			await this.initSettings();
-			await Promise.all([this.loginWithCookie(), this.initTemplates()]);
-		},
-		trackPage(): void {
-			this.uiStore.currentView = this.$route.name || '';
-			if (this.$route && this.$route.meta && this.$route.meta.templatesEnabled) {
-				this.templatesStore.setSessionId();
-			} else {
-				this.templatesStore.resetSessionId(); // reset telemetry session id when user leaves template pages
-			}
-
-			this.$telemetry.page(this.$route);
-		},
-		authenticate() {
-			// redirect to setup page. user should be redirected to this only once
-			if (this.settingsStore.isUserManagementEnabled && this.settingsStore.showSetupPage) {
-				if (this.$route.name === VIEWS.SETUP) {
-					return;
-				}
-
-				this.$router.replace({ name: VIEWS.SETUP });
-				return;
-			}
-
-			if (this.canUserAccessCurrentRoute()) {
-				return;
-			}
-
-			// if cannot access page and not logged in, ask to sign in
-			const user = this.usersStore.currentUser;
-			if (!user) {
-				const redirect =
-					this.$route.query.redirect ||
-					encodeURIComponent(`${window.location.pathname}${window.location.search}`);
-				this.$router.replace({ name: VIEWS.SIGNIN, query: { redirect } });
-				return;
-			}
-
-			// if cannot access page and is logged in, respect signin redirect
-			if (this.$route.name === VIEWS.SIGNIN && typeof this.$route.query.redirect === 'string') {
-				const redirect = decodeURIComponent(this.$route.query.redirect);
-				if (redirect.startsWith('/')) {
-					// protect against phishing
-					this.$router.replace(redirect);
-					return;
-				}
-			}
-
-			// if cannot access page and is logged in
-			this.$router.replace({ name: VIEWS.HOMEPAGE });
-		},
-		redirectIfNecessary() {
-			const redirect =
-				this.$route.meta &&
-				typeof this.$route.meta.getRedirect === 'function' &&
-				this.$route.meta.getRedirect();
-			if (redirect) {
-				this.$router.replace(redirect);
+	watch: {
+		// eslint-disable-next-line @typescript-eslint/naming-convention
+		async 'usersStore.currentUser'(currentValue, previousValue) {
+			if (currentValue && !previousValue) {
+				await initializeAuthenticatedFeatures();
 			}
 		},
-		setTheme() {
-			const theme = window.localStorage.getItem(LOCAL_STORAGE_THEME);
-			if (theme) {
-				window.document.body.classList.add(`theme-${theme}`);
-			}
+		defaultLocale(newLocale) {
+			void loadLanguage(newLocale);
 		},
 	},
 	async mounted() {
-		this.setTheme();
-		await this.initialize();
 		this.logHiringBanner();
-		this.authenticate();
-		this.redirectIfNecessary();
-		this.checkForNewVersions();
-
-		this.loading = false;
 
-		this.trackPage();
-		this.$externalHooks().run('app.mount');
+		void initializeAuthenticatedFeatures();
 
-		if (this.defaultLocale !== 'en') {
-			await this.nodeTypesStore.getNodeTranslationHeaders();
-		}
+		void useExternalHooks().run('app.mount');
+		this.loading = false;
 	},
-	watch: {
-		$route(route) {
-			this.authenticate();
-			this.redirectIfNecessary();
-
-			this.trackPage();
-		},
-		defaultLocale(newLocale) {
-			loadLanguage(newLocale);
+	methods: {
+		logHiringBanner() {
+			if (this.settingsStore.isHiringBannerEnabled && !this.isDemoMode) {
+				console.log(HIRING_BANNER);
+			}
 		},
 	},
 });
@@ -220,29 +147,52 @@ export default mixins(newVersions, showMessage, userHelpers).extend({
 .container {
 	display: grid;
 	grid-template-areas:
-		'sidebar header'
-		'sidebar content';
-	grid-auto-columns: fit-content($sidebar-expanded-width) 1fr;
-	grid-template-rows: fit-content($sidebar-width) 1fr;
+		'banners banners banners'
+		'sidebar header chat'
+		'sidebar content chat';
+	grid-auto-columns: fit-content($sidebar-expanded-width) 1fr fit-content($chat-width);
+	grid-template-rows: auto fit-content($header-height) 1fr;
+	height: 100vh;
+}
+
+.banners {
+	grid-area: banners;
+	z-index: 999;
 }
 
 .content {
 	display: flex;
 	grid-area: content;
 	overflow: auto;
-	height: 100vh;
+	height: 100%;
 	width: 100%;
 	justify-content: center;
+
+	main {
+		width: 100%;
+		height: 100%;
+	}
 }
 
 .header {
 	grid-area: header;
-	z-index: 999;
+	z-index: 99;
 }
 
 .sidebar {
 	grid-area: sidebar;
-	height: 100vh;
+	height: 100%;
 	z-index: 999;
 }
+.chat {
+	grid-area: chat;
+	z-index: 999;
+	height: 100%;
+	width: 0;
+	transition: all 0.2s ease-in-out;
+
+	&.open {
+		width: $chat-width;
+	}
+}
 </style>
diff --git a/packages/editor-ui/src/Interface.ts b/packages/editor-ui/src/Interface.ts
index 9ffe8bf9f6b26..6b97ed27a6b18 100644
--- a/packages/editor-ui/src/Interface.ts
+++ b/packages/editor-ui/src/Interface.ts
@@ -1,45 +1,61 @@
-import type { CREDENTIAL_EDIT_MODAL_KEY } from './constants';
-/* eslint-disable @typescript-eslint/no-explicit-any */
-import type { IMenuItem } from 'n8n-design-system';
 import type {
-	GenericValue,
-	IConnections,
-	ICredentialsDecrypted,
-	ICredentialsEncrypted,
-	ICredentialType,
-	IDataObject,
-	INode,
-	INodeIssues,
-	INodeParameters,
-	INodeTypeDescription,
-	IPinData,
-	IRunExecutionData,
-	IRun,
-	IRunData,
-	ITaskData,
-	IWorkflowSettings as IWorkflowSettingsWorkflow,
-	WorkflowExecuteMode,
-	PublicInstalledPackage,
-	INodeTypeNameVersion,
-	ILoadOptions,
-	INodeCredentials,
-	INodeListSearchItems,
-	NodeParameterValueType,
-	INodeActionTypeDescription,
-	IDisplayOptions,
-	IExecutionsSummary,
-	IAbstractEventMessage,
-	FeatureFlags,
-	ExecutionStatus,
-	ITelemetryTrackProperties,
-	IN8nUISettings,
-	IUserManagementSettings,
-	WorkflowSettings,
+	AI_NODE_CREATOR_VIEW,
+	CREDENTIAL_EDIT_MODAL_KEY,
+	SignInType,
+	FAKE_DOOR_FEATURES,
+	TRIGGER_NODE_CREATOR_VIEW,
+	REGULAR_NODE_CREATOR_VIEW,
+	AI_OTHERS_NODE_CREATOR_VIEW,
+	VIEWS,
+	ROLE,
+} from '@/constants';
+import type { IMenuItem } from 'n8n-design-system';
+import {
+	type GenericValue,
+	type IConnections,
+	type ICredentialsDecrypted,
+	type ICredentialsEncrypted,
+	type ICredentialType,
+	type IDataObject,
+	type INode,
+	type INodeIssues,
+	type INodeParameters,
+	type INodeTypeDescription,
+	type IPinData,
+	type IRunExecutionData,
+	type IRun,
+	type IRunData,
+	type ITaskData,
+	type IWorkflowSettings as IWorkflowSettingsWorkflow,
+	type WorkflowExecuteMode,
+	type PublicInstalledPackage,
+	type INodeTypeNameVersion,
+	type ILoadOptions,
+	type INodeCredentials,
+	type INodeListSearchItems,
+	type NodeParameterValueType,
+	type IDisplayOptions,
+	type ExecutionSummary,
+	type FeatureFlags,
+	type ExecutionStatus,
+	type ITelemetryTrackProperties,
+	type IUserManagementSettings,
+	type WorkflowSettings,
+	type IUserSettings,
+	type IN8nUISettings,
+	type BannerName,
+	type INodeExecutionData,
+	type INodeProperties,
+	type NodeConnectionType,
+	type INodeCredentialsDetails,
+	type StartNodeData,
 } from 'n8n-workflow';
-import type { SignInType } from './constants';
-import type { FAKE_DOOR_FEATURES, TRIGGER_NODE_FILTER, REGULAR_NODE_FILTER } from './constants';
 import type { BulkCommand, Undoable } from '@/models/history';
-import type { PartialBy } from '@/utils/typeHelpers';
+import type { PartialBy, TupleToUnion } from '@/utils/typeHelpers';
+import type { Component } from 'vue';
+import type { Scope } from '@n8n/permissions';
+import type { NotificationOptions as ElementNotificationOptions } from 'element-plus';
+import type { Connection } from '@jsplumb/core';
 
 export * from 'n8n-design-system/types';
 
@@ -58,6 +74,10 @@ declare global {
 						isIdentifiedID?: boolean;
 						featureFlags: FeatureFlags;
 					};
+					session_recording?: {
+						maskAllInputs?: boolean;
+						maskInputFn?: ((text: string, element?: HTMLElement) => string) | null;
+					};
 				},
 			): void;
 			isFeatureEnabled?(flagName: string): boolean;
@@ -70,15 +90,29 @@ declare global {
 			reset?(resetDeviceId?: boolean): void;
 			onFeatureFlags?(callback: (keys: string[], map: FeatureFlags) => void): void;
 			reloadFeatureFlags?(): void;
+			capture?(event: string, properties: IDataObject): void;
+			register?(metadata: IDataObject): void;
+			people?: {
+				set?(metadata: IDataObject): void;
+			};
+			debug?(): void;
 		};
 		analytics?: {
-			track(event: string, proeprties?: ITelemetryTrackProperties): void;
+			identify(userId: string): void;
+			track(event: string, properties?: ITelemetryTrackProperties): void;
+			page(category: string, name: string, properties?: ITelemetryTrackProperties): void;
 		};
 		featureFlags?: {
 			getAll: () => FeatureFlags;
 			getVariant: (name: string) => string | boolean | undefined;
 			override: (name: string, value: string) => void;
 		};
+		// eslint-disable-next-line @typescript-eslint/naming-convention
+		Cypress: unknown;
+
+		Sentry?: {
+			captureException: (error: Error, metadata?: unknown) => void;
+		};
 	}
 }
 
@@ -106,6 +140,7 @@ export interface IUpdateInformation {
 		| INodeParameters; // with null makes problems in NodeSettings.vue
 	node?: string;
 	oldValue?: string | number;
+	type?: 'optionsOrderChanged';
 }
 
 export interface INodeUpdatePropertiesInformation {
@@ -135,10 +170,6 @@ export interface INodeTypesMaxCount {
 	};
 }
 
-export interface IExternalHooks {
-	run(eventName: string, metadata?: IDataObject): Promise<void>;
-}
-
 export interface INodeTranslationHeaders {
 	data: {
 		[key: string]: {
@@ -148,9 +179,25 @@ export interface INodeTranslationHeaders {
 	};
 }
 
+export interface IAiDataContent {
+	data: INodeExecutionData[] | null;
+	inOut: 'input' | 'output';
+	type: NodeConnectionType;
+	metadata: {
+		executionTime: number;
+		startTime: number;
+	};
+}
+
+export interface IAiData {
+	data: IAiDataContent[];
+	node: string;
+	runIndex: number;
+}
+
 export interface IStartRunData {
 	workflowData: IWorkflowData;
-	startNodes?: string[];
+	startNodes?: StartNodeData[];
 	destinationNode?: string;
 	runData?: IRunData;
 	pinData?: IPinData;
@@ -186,6 +233,7 @@ export interface IWorkflowData {
 	tags?: string[];
 	pinData?: IPinData;
 	versionId?: string;
+	meta?: WorkflowMetadata;
 }
 
 export interface IWorkflowDataUpdate {
@@ -198,20 +246,34 @@ export interface IWorkflowDataUpdate {
 	tags?: ITag[] | string[]; // string[] when store or requested, ITag[] from API response
 	pinData?: IPinData;
 	versionId?: string;
+	meta?: WorkflowMetadata;
 }
 
 export interface IWorkflowToShare extends IWorkflowDataUpdate {
-	meta?: {
-		instanceId: string;
-	};
+	meta?: WorkflowMetadata;
+}
+
+export interface NewWorkflowResponse {
+	name: string;
+	onboardingFlowEnabled?: boolean;
+	defaultSettings: IWorkflowSettings;
+}
+
+export interface IWorkflowTemplateNode
+	extends Pick<INodeUi, 'name' | 'type' | 'position' | 'parameters' | 'typeVersion' | 'webhookId'> {
+	// The credentials in a template workflow have a different type than in a regular workflow
+	credentials?: IWorkflowTemplateNodeCredentials;
+}
+
+export interface IWorkflowTemplateNodeCredentials {
+	[key: string]: string | INodeCredentialsDetails;
 }
 
 export interface IWorkflowTemplate {
 	id: number;
 	name: string;
-	workflow: {
-		nodes: INodeUi[];
-		connections: IConnections;
+	workflow: Pick<IWorkflowData, 'connections' | 'settings' | 'pinData'> & {
+		nodes: IWorkflowTemplateNode[];
 	};
 }
 
@@ -220,6 +282,18 @@ export interface INewWorkflowData {
 	onboardingFlowEnabled: boolean;
 }
 
+export interface WorkflowMetadata {
+	onboardingId?: string;
+	templateId?: string;
+	instanceId?: string;
+	templateCredsSetupCompleted?: boolean;
+}
+
+export interface GenerateOTPSecretResponse {
+	base32: string;
+	otpauth_url: string;
+}
+
 // Almost identical to cli.Interfaces.ts
 export interface IWorkflowDb {
 	id: string;
@@ -236,6 +310,7 @@ export interface IWorkflowDb {
 	ownedBy?: Partial<IUser>;
 	versionId: string;
 	usedCredentials?: IUsedCredential[];
+	meta?: WorkflowMetadata;
 }
 
 // Identical to cli.Interfaces.ts
@@ -318,6 +393,7 @@ export interface IExecutionPushResponse {
 
 export interface IExecutionResponse extends IExecutionBase {
 	id: string;
+	status: string;
 	data?: IRunExecutionData;
 	workflowData: IWorkflowDb;
 	executedNode?: string;
@@ -338,7 +414,7 @@ export interface IExecutionShortResponse {
 
 export interface IExecutionsListResponse {
 	count: number;
-	results: IExecutionsSummary[];
+	results: ExecutionSummary[];
 	estimated: boolean;
 }
 
@@ -368,62 +444,103 @@ export interface IExecutionDeleteFilter {
 	ids?: string[];
 }
 
+export type PushDataUsersForWorkflow = {
+	workflowId: string;
+	activeUsers: Array<{ user: IUser; lastSeen: string }>;
+};
+
+type PushDataWorkflowUsersChanged = {
+	data: PushDataUsersForWorkflow;
+	type: 'activeWorkflowUsersChanged';
+};
+
 export type IPushData =
 	| PushDataExecutionFinished
 	| PushDataExecutionStarted
 	| PushDataExecuteAfter
 	| PushDataExecuteBefore
+	| PushDataNodeDescriptionUpdated
 	| PushDataConsoleMessage
 	| PushDataReloadNodeType
 	| PushDataRemoveNodeType
 	| PushDataTestWebhook
-	| PushDataExecutionRecovered;
+	| PushDataExecutionRecovered
+	| PushDataWorkerStatusMessage
+	| PushDataActiveWorkflowAdded
+	| PushDataActiveWorkflowRemoved
+	| PushDataWorkflowFailedToActivate
+	| PushDataWorkflowUsersChanged;
+
+export type PushDataActiveWorkflowAdded = {
+	data: IActiveWorkflowAdded;
+	type: 'workflowActivated';
+};
+
+export type PushDataActiveWorkflowRemoved = {
+	data: IActiveWorkflowRemoved;
+	type: 'workflowDeactivated';
+};
 
-type PushDataExecutionRecovered = {
+export type PushDataWorkflowFailedToActivate = {
+	data: IWorkflowFailedToActivate;
+	type: 'workflowFailedToActivate';
+};
+
+export type PushDataExecutionRecovered = {
 	data: IPushDataExecutionRecovered;
 	type: 'executionRecovered';
 };
 
-type PushDataExecutionFinished = {
+export type PushDataExecutionFinished = {
 	data: IPushDataExecutionFinished;
 	type: 'executionFinished';
 };
 
-type PushDataExecutionStarted = {
+export type PushDataExecutionStarted = {
 	data: IPushDataExecutionStarted;
 	type: 'executionStarted';
 };
 
-type PushDataExecuteAfter = {
+export type PushDataExecuteAfter = {
 	data: IPushDataNodeExecuteAfter;
 	type: 'nodeExecuteAfter';
 };
 
-type PushDataExecuteBefore = {
+export type PushDataExecuteBefore = {
 	data: IPushDataNodeExecuteBefore;
 	type: 'nodeExecuteBefore';
 };
 
-type PushDataConsoleMessage = {
+export type PushDataNodeDescriptionUpdated = {
+	data: {};
+	type: 'nodeDescriptionUpdated';
+};
+
+export type PushDataConsoleMessage = {
 	data: IPushDataConsoleMessage;
 	type: 'sendConsoleMessage';
 };
 
-type PushDataReloadNodeType = {
+export type PushDataReloadNodeType = {
 	data: IPushDataReloadNodeType;
 	type: 'reloadNodeType';
 };
 
-type PushDataRemoveNodeType = {
+export type PushDataRemoveNodeType = {
 	data: IPushDataRemoveNodeType;
 	type: 'removeNodeType';
 };
 
-type PushDataTestWebhook = {
+export type PushDataTestWebhook = {
 	data: IPushDataTestWebhook;
 	type: 'testWebhookDeleted' | 'testWebhookReceived';
 };
 
+export type PushDataWorkerStatusMessage = {
+	data: IPushDataWorkerStatusMessage;
+	type: 'sendWorkerStatusMessage';
+};
+
 export interface IPushDataExecutionStarted {
 	executionId: string;
 	mode: WorkflowExecuteMode;
@@ -442,6 +559,19 @@ export interface IPushDataExecutionFinished {
 	retryOf?: string;
 }
 
+export interface IActiveWorkflowAdded {
+	workflowId: string;
+}
+
+export interface IActiveWorkflowRemoved {
+	workflowId: string;
+}
+
+export interface IWorkflowFailedToActivate {
+	workflowId: string;
+	errorMessage: string;
+}
+
 export interface IPushDataUnsavedExecutionFinished {
 	executionId: string;
 	data: { finished: true; stoppedAt: Date };
@@ -481,6 +611,41 @@ export interface IPushDataConsoleMessage {
 	messages: string[];
 }
 
+export interface WorkerJobStatusSummary {
+	jobId: string;
+	executionId: string;
+	retryOf?: string;
+	startedAt: Date;
+	mode: WorkflowExecuteMode;
+	workflowName: string;
+	workflowId: string;
+	status: ExecutionStatus;
+}
+
+export interface IPushDataWorkerStatusPayload {
+	workerId: string;
+	runningJobsSummary: WorkerJobStatusSummary[];
+	freeMem: number;
+	totalMem: number;
+	uptime: number;
+	loadAvg: number[];
+	cpus: string;
+	arch: string;
+	platform: NodeJS.Platform;
+	hostname: string;
+	interfaces: Array<{
+		family: 'IPv4' | 'IPv6';
+		address: string;
+		internal: boolean;
+	}>;
+	version: string;
+}
+
+export interface IPushDataWorkerStatusMessage {
+	workerId: string;
+	status: IPushDataWorkerStatusPayload;
+}
+
 export type IPersonalizationSurveyAnswersV1 = {
 	codingSkill?: string | null;
 	companyIndustry?: string[] | null;
@@ -541,9 +706,12 @@ export type IPersonalizationLatestVersion = IPersonalizationSurveyAnswersV4;
 export type IPersonalizationSurveyVersions =
 	| IPersonalizationSurveyAnswersV1
 	| IPersonalizationSurveyAnswersV2
-	| IPersonalizationSurveyAnswersV3;
+	| IPersonalizationSurveyAnswersV3
+	| IPersonalizationSurveyAnswersV4;
 
-export type IRole = 'default' | 'owner' | 'member';
+export type Roles = typeof ROLE;
+export type IRole = Roles[keyof Roles];
+export type InvitableRoleName = Roles['Member' | 'Admin'];
 
 export interface IUserResponse {
 	id: string;
@@ -551,20 +719,12 @@ export interface IUserResponse {
 	lastName?: string;
 	email?: string;
 	createdAt?: string;
-	globalRole?: {
-		name: IRole;
-		id: string;
-		createdAt: Date;
-	};
+	role?: IRole;
+	globalScopes?: Scope[];
 	personalizationAnswers?: IPersonalizationSurveyVersions | null;
 	isPending: boolean;
 	signInType?: SignInType;
-	settings?: {
-		isOnboarded?: boolean;
-		showUserActivationSurvey?: boolean;
-		firstSuccessfulWorkflowId?: string;
-		userActivated?: boolean;
-	};
+	settings?: IUserSettings;
 }
 
 export interface CurrentUserResponse extends IUserResponse {
@@ -579,9 +739,11 @@ export interface GenerateOTPSecretResponse {
 export interface IUser extends IUserResponse {
 	isDefaultUser: boolean;
 	isPendingUser: boolean;
-	isOwner: boolean;
+	hasRecoveryCodesLeft: boolean;
 	inviteAcceptUrl?: string;
 	fullName?: string;
+	createdAt?: string;
+	mfaEnabled: boolean;
 }
 
 export interface IVersionNotificationSettings {
@@ -590,6 +752,12 @@ export interface IVersionNotificationSettings {
 	infoUrl: string;
 }
 
+export interface IUserListAction {
+	label: string;
+	value: string;
+	guard?: (user: IUser) => boolean;
+}
+
 export interface IN8nPrompts {
 	message: string;
 	title: string;
@@ -662,6 +830,9 @@ export interface ITemplatesCollectionResponse extends ITemplatesCollectionExtend
 	workflows: ITemplatesWorkflow[];
 }
 
+/**
+ * A template without the actual workflow definition
+ */
 export interface ITemplatesWorkflow {
 	id: number;
 	createdAt: string;
@@ -673,18 +844,44 @@ export interface ITemplatesWorkflow {
 	};
 }
 
+export interface ITemplatesWorkflowInfo {
+	nodeCount: number;
+	nodeTypes: {
+		[key: string]: {
+			count: number;
+		};
+	};
+}
+
+export type TemplateSearchFacet = {
+	field_name: string;
+	sampled: boolean;
+	stats: {
+		total_values: number;
+	};
+	counts: Array<{
+		count: number;
+		highlighted: string;
+		value: string;
+	}>;
+};
+
 export interface ITemplatesWorkflowResponse extends ITemplatesWorkflow, IWorkflowTemplate {
 	description: string | null;
 	image: ITemplatesImage[];
 	categories: ITemplatesCategory[];
+	workflowInfo: ITemplatesWorkflowInfo;
 }
 
+/**
+ * A template with also the full workflow definition
+ */
 export interface ITemplatesWorkflowFull extends ITemplatesWorkflowResponse {
 	full: true;
 }
 
 export interface ITemplatesQuery {
-	categories: number[];
+	categories: string[];
 	search: string;
 }
 
@@ -703,6 +900,7 @@ export interface IWorkflowSettings extends IWorkflowSettingsWorkflow {
 	maxExecutionTimeout?: number;
 	callerIds?: string;
 	callerPolicy?: WorkflowSettings.CallerPolicy;
+	executionOrder: NonNullable<IWorkflowSettingsWorkflow['executionOrder']>;
 }
 
 export interface ITimeoutHMS {
@@ -711,88 +909,122 @@ export interface ITimeoutHMS {
 	seconds: number;
 }
 
-export type WorkflowTitleStatus = 'EXECUTING' | 'IDLE' | 'ERROR';
+export type WorkflowTitleStatus = 'EXECUTING' | 'IDLE' | 'ERROR' | 'DEBUG';
 
-export interface ISubcategoryItemProps {
-	subcategory: string;
-	description: string;
-	key?: string;
-	iconType: string;
+export type ExtractActionKeys<T> = T extends SimplifiedNodeType ? T['name'] : never;
+
+export type ActionsRecord<T extends SimplifiedNodeType[]> = {
+	[K in ExtractActionKeys<T[number]>]: ActionTypeDescription[];
+};
+
+export type SimplifiedNodeType = Pick<
+	INodeTypeDescription,
+	| 'displayName'
+	| 'description'
+	| 'name'
+	| 'group'
+	| 'icon'
+	| 'iconUrl'
+	| 'badgeIconUrl'
+	| 'codex'
+	| 'defaults'
+	| 'outputs'
+>;
+export interface SubcategoryItemProps {
+	description?: string;
+	iconType?: string;
 	icon?: string;
+	iconProps?: {
+		color?: string;
+	};
+	panelClass?: string;
+	title?: string;
+	subcategory?: string;
 	defaults?: INodeParameters;
+	forceIncludeNodes?: string[];
+	sections?: string[];
 }
 export interface ViewItemProps {
-	withTopBorder: boolean;
 	title: string;
 	description: string;
 	icon: string;
+	tag?: string;
 }
-
-export interface INodeItemProps {
-	subcategory: string;
-	nodeType: INodeTypeDescription;
+export interface LabelItemProps {
+	key: string;
 }
-
-export interface IActionItemProps {
-	subcategory: string;
-	nodeType: INodeActionTypeDescription;
+export interface ActionTypeDescription extends SimplifiedNodeType {
+	displayOptions?: IDisplayOptions;
+	values?: IDataObject;
+	actionKey: string;
+	codex: {
+		label: string;
+		categories: string[];
+	};
 }
 
-export interface ICategoryItemProps {
-	expanded: boolean;
-	category: string;
+export interface CategoryItemProps {
 	name: string;
+	count: number;
 }
 
 export interface CreateElementBase {
+	uuid?: string;
 	key: string;
-	includedByTrigger?: boolean;
-	includedByRegular?: boolean;
 }
 
 export interface NodeCreateElement extends CreateElementBase {
 	type: 'node';
-	category?: string[];
-	properties: INodeItemProps;
+	subcategory: string;
+	properties: SimplifiedNodeType;
 }
 
 export interface CategoryCreateElement extends CreateElementBase {
 	type: 'category';
-	properties: ICategoryItemProps;
+	subcategory: string;
+	properties: CategoryItemProps;
 }
 
 export interface SubcategoryCreateElement extends CreateElementBase {
 	type: 'subcategory';
-	properties: ISubcategoryItemProps;
+	properties: SubcategoryItemProps;
 }
+
+export interface SectionCreateElement extends CreateElementBase {
+	type: 'section';
+	title: string;
+	children: INodeCreateElement[];
+}
+
 export interface ViewCreateElement extends CreateElementBase {
 	type: 'view';
 	properties: ViewItemProps;
 }
 
+export interface LabelCreateElement extends CreateElementBase {
+	type: 'label';
+	subcategory: string;
+	properties: LabelItemProps;
+}
+
 export interface ActionCreateElement extends CreateElementBase {
 	type: 'action';
-	category: string;
-	properties: IActionItemProps;
+	subcategory: string;
+	properties: ActionTypeDescription;
 }
 
 export type INodeCreateElement =
 	| NodeCreateElement
 	| CategoryCreateElement
 	| SubcategoryCreateElement
+	| SectionCreateElement
 	| ViewCreateElement
+	| LabelCreateElement
 	| ActionCreateElement;
 
-export interface ICategoriesWithNodes {
-	[category: string]: {
-		[subcategory: string]: {
-			regularCount: number;
-			triggerCount: number;
-			nodes: INodeCreateElement[];
-		};
-	};
+export interface SubcategorizedNodeTypes {
+	[subcategory: string]: INodeCreateElement[];
 }
-
 export interface ITag {
 	id: string;
 	name: string;
@@ -838,6 +1070,7 @@ export interface IVersionNode {
 }
 
 export interface ITemplatesNode extends IVersionNode {
+	id: number;
 	categories?: ITemplatesCategory[];
 }
 
@@ -858,10 +1091,10 @@ export interface IUsedCredential {
 export interface WorkflowsState {
 	activeExecutions: IExecutionsCurrentSummaryExtended[];
 	activeWorkflows: string[];
-	activeWorkflowExecution: IExecutionsSummary | null;
-	currentWorkflowExecutions: IExecutionsSummary[];
+	activeWorkflowExecution: ExecutionSummary | null;
+	currentWorkflowExecutions: ExecutionSummary[];
 	activeExecutionId: string | null;
-	executingNode: string | null;
+	executingNode: string[];
 	executionWaitingForWebhook: boolean;
 	finishedExecutionsCount: number;
 	nodeMetadata: NodeMetadataMap;
@@ -871,12 +1104,19 @@ export interface WorkflowsState {
 	workflowExecutionData: IExecutionResponse | null;
 	workflowExecutionPairedItemMappings: { [itemId: string]: Set<string> };
 	workflowsById: IWorkflowsMap;
+	chatMessages: string[];
+	isInDebugMode?: boolean;
+	testSuitesById: TestSuiteDbMap;
+	nodeOutputsById: NodeOutputDbMap;
 }
 
 export interface RootState {
 	baseUrl: string;
 	restEndpoint: string;
 	defaultLocale: string;
+	endpointForm: string;
+	endpointFormTest: string;
+	endpointFormWaiting: string;
 	endpointWebhook: string;
 	endpointWebhookTest: string;
 	pushConnectionActive: boolean;
@@ -888,11 +1128,12 @@ export interface RootState {
 	n8nMetadata: {
 		[key: string]: string | number | undefined;
 	};
-	sessionId: string;
+	pushRef: string;
 	urlBaseWebhook: string;
 	urlBaseEditor: string;
 	instanceId: string;
 	isNpmAvailable: boolean;
+	binaryDataMode: string;
 }
 
 export interface NodeMetadataMap {
@@ -905,10 +1146,13 @@ export interface IRootState {
 	activeCredentialType: string | null;
 	baseUrl: string;
 	defaultLocale: string;
+	endpointForm: string;
+	endpointFormTest: string;
+	endpointFormWaiting: string;
 	endpointWebhook: string;
 	endpointWebhookTest: string;
 	executionId: string | null;
-	executingNode: string | null;
+	executingNode: string[];
 	executionWaitingForWebhook: boolean;
 	pushConnectionActive: boolean;
 	saveDataErrorExecution: string;
@@ -928,7 +1172,7 @@ export interface IRootState {
 	nodeViewOffsetPosition: XYPosition;
 	nodeViewMoveInProgress: boolean;
 	selectedNodes: INodeUi[];
-	sessionId: string;
+	pushRef: string;
 	urlBaseEditor: string;
 	urlBaseWebhook: string;
 	workflow: IWorkflowDb;
@@ -938,6 +1182,7 @@ export interface IRootState {
 	nodeMetadata: NodeMetadataMap;
 	isNpmAvailable: boolean;
 	subworkflowExecutionError: Error | null;
+	binaryDataMode: string;
 }
 
 export interface CommunityPackageMap {
@@ -964,13 +1209,10 @@ export interface ITagsState {
 	fetchedUsageCount: boolean;
 }
 
-export type Modals =
-	| {
-			[key: string]: ModalState;
-	  }
-	| {
-			[CREDENTIAL_EDIT_MODAL_KEY]: NewCredentialsModal;
-	  };
+export type Modals = {
+	[CREDENTIAL_EDIT_MODAL_KEY]: NewCredentialsModal;
+	[key: string]: ModalState;
+};
 
 export type ModalState = {
 	open: boolean;
@@ -981,11 +1223,11 @@ export type ModalState = {
 	httpNodeParameters?: string;
 };
 
-export type NewCredentialsModal = ModalState & {
+export interface NewCredentialsModal extends ModalState {
 	showAuthSelector?: boolean;
-};
+}
 
-export type IRunDataDisplayMode = 'table' | 'json' | 'binary' | 'schema' | 'html';
+export type IRunDataDisplayMode = 'table' | 'json' | 'binary' | 'schema' | 'html' | 'ai';
 export type NodePanelType = 'input' | 'output';
 
 export interface TargetItem {
@@ -998,7 +1240,7 @@ export interface TargetItem {
 export interface NDVState {
 	activeNodeName: string | null;
 	mainPanelDimensions: { [key: string]: { [key: string]: number } };
-	sessionId: string;
+	pushRef: string;
 	input: {
 		displayMode: IRunDataDisplayMode;
 		nodeName?: string;
@@ -1020,16 +1262,23 @@ export interface NDVState {
 		};
 	};
 	focusedMappableInput: string;
+	focusedInputPath: string;
 	mappingTelemetry: { [key: string]: string | number | boolean };
 	hoveringItem: null | TargetItem;
 	draggable: {
 		isDragging: boolean;
 		type: string;
 		data: string;
-		canDrop: boolean;
-		stickyPosition: null | XYPosition;
+		dimensions: DOMRect | null;
+		activeTarget: { id: string; stickyPosition: null | XYPosition } | null;
 	};
 	isMappingOnboarded: boolean;
+	isAutocompleteOnboarded: boolean;
+	highlightDraggables: boolean;
+}
+
+export interface NotificationOptions extends Partial<ElementNotificationOptions> {
+	message: string | ElementNotificationOptions['message'];
 }
 
 export interface UIState {
@@ -1052,14 +1301,21 @@ export interface UIState {
 	stateIsDirty: boolean;
 	lastSelectedNode: string | null;
 	lastSelectedNodeOutputIndex: number | null;
+	lastSelectedNodeEndpointUuid: string | null;
 	nodeViewOffsetPosition: XYPosition;
 	nodeViewMoveInProgress: boolean;
 	selectedNodes: INodeUi[];
-	sidebarMenuItems: IMenuItem[];
 	nodeViewInitialized: boolean;
 	addFirstStepOnLoad: boolean;
-	executionSidebarAutoRefresh: boolean;
+	bannersHeight: number;
+	bannerStack: BannerName[];
+	theme: ThemeOption;
+	suggestedTemplates?: SuggestedTemplates;
+	pendingNotificationsForViews: {
+		[key in VIEWS]?: NotificationOptions[];
+	};
 }
+
 export type IFakeDoor = {
 	id: FAKE_DOOR_FEATURES;
 	featureName: string;
@@ -1078,27 +1334,35 @@ export type IFakeDoorLocation =
 	| 'credentialsModal'
 	| 'workflowShareModal';
 
-export type INodeFilterType = typeof REGULAR_NODE_FILTER | typeof TRIGGER_NODE_FILTER;
+export type NodeFilterType =
+	| typeof REGULAR_NODE_CREATOR_VIEW
+	| typeof TRIGGER_NODE_CREATOR_VIEW
+	| typeof AI_NODE_CREATOR_VIEW
+	| typeof AI_OTHERS_NODE_CREATOR_VIEW;
 
 export type NodeCreatorOpenSource =
 	| ''
+	| 'context_menu'
 	| 'no_trigger_execution_tooltip'
 	| 'plus_endpoint'
+	| 'add_input_endpoint'
 	| 'trigger_placeholder_button'
 	| 'tab'
 	| 'node_connection_action'
 	| 'node_connection_drop'
+	| 'notice_error_message'
 	| 'add_node_button';
 
 export interface INodeCreatorState {
 	itemsFilter: string;
 	showScrim: boolean;
-	rootViewHistory: INodeFilterType[];
-	selectedView: INodeFilterType;
+	rootViewHistory: NodeFilterType[];
+	selectedView: NodeFilterType;
 	openSource: NodeCreatorOpenSource;
 }
 
 export interface ISettingsState {
+	initialized: boolean;
 	settings: IN8nUISettings;
 	promptsData: IN8nPrompts;
 	userManagement: IUserManagementSettings;
@@ -1119,29 +1383,35 @@ export interface ISettingsState {
 		loginLabel: string;
 		loginEnabled: boolean;
 	};
+	mfa: {
+		enabled: boolean;
+	};
 	onboardingCallPromptEnabled: boolean;
 	saveDataErrorExecution: string;
 	saveDataSuccessExecution: string;
 	saveManualExecutions: boolean;
 }
 
-export interface INodeTypesState {
-	nodeTypes: {
-		[nodeType: string]: {
-			[version: number]: INodeTypeDescription;
-		};
+export type NodeTypesByTypeNameAndVersion = {
+	[nodeType: string]: {
+		[version: number]: INodeTypeDescription;
 	};
+};
+
+export interface INodeTypesState {
+	nodeTypes: NodeTypesByTypeNameAndVersion;
 }
 
 export interface ITemplateState {
-	categories: { [id: string]: ITemplatesCategory };
+	categories: ITemplatesCategory[];
 	collections: { [id: string]: ITemplatesCollection };
-	workflows: { [id: string]: ITemplatesWorkflow };
+	workflows: { [id: string]: ITemplatesWorkflow | ITemplatesWorkflowFull };
 	workflowSearches: {
 		[search: string]: {
 			workflowIds: string[];
 			totalWorkflows: number;
 			loadingMore?: boolean;
+			categories?: ITemplatesCategory[];
 		};
 	};
 	collectionSearches: {
@@ -1151,6 +1421,7 @@ export interface ITemplateState {
 	};
 	currentSessionId: string;
 	previousSessionId: string;
+	currentN8nPath: string;
 }
 
 export interface IVersionsState {
@@ -1160,13 +1431,15 @@ export interface IVersionsState {
 }
 
 export interface IUsersState {
+	initialized: boolean;
 	currentUserId: null | string;
 	users: { [userId: string]: IUser };
+	currentUserCloudInfo: Cloud.UserAccount | null;
 }
 
 export interface IWorkflowsState {
-	currentWorkflowExecutions: IExecutionsSummary[];
-	activeWorkflowExecution: IExecutionsSummary | null;
+	currentWorkflowExecutions: ExecutionSummary[];
+	activeWorkflowExecution: ExecutionSummary | null;
 	finishedExecutionsCount: number;
 }
 export interface IWorkflowsMap {
@@ -1180,12 +1453,13 @@ export interface CommunityNodesState {
 
 export interface IRestApiContext {
 	baseUrl: string;
-	sessionId: string;
+	pushRef: string;
 }
 
 export interface IZoomConfig {
 	scale: number;
 	offset: XYPosition;
+	origin?: XYPosition;
 }
 
 export interface IBounds {
@@ -1232,17 +1506,6 @@ export interface ITabBarItem {
 	disabled?: boolean;
 }
 
-export interface IResourceLocatorReqParams {
-	nodeTypeAndVersion: INodeTypeNameVersion;
-	path: string;
-	methodName?: string;
-	searchList?: ILoadOptions;
-	currentNodeParameters: INodeParameters;
-	credentials?: INodeCredentials;
-	filter?: string;
-	paginationToken?: unknown;
-}
-
 export interface IResourceLocatorResultExpanded extends INodeListSearchItems {
 	linkAlt?: string;
 }
@@ -1350,6 +1613,30 @@ export type NodeAuthenticationOption = {
 	displayOptions?: IDisplayOptions;
 };
 
+export declare namespace DynamicNodeParameters {
+	interface BaseRequest {
+		path: string;
+		nodeTypeAndVersion: INodeTypeNameVersion;
+		currentNodeParameters: INodeParameters;
+		methodName?: string;
+		credentials?: INodeCredentials;
+	}
+
+	interface OptionsRequest extends BaseRequest {
+		loadOptions?: ILoadOptions;
+	}
+
+	interface ResourceLocatorResultsRequest extends BaseRequest {
+		methodName: string;
+		filter?: string;
+		paginationToken?: string;
+	}
+
+	interface ResourceMapperFieldsRequest extends BaseRequest {
+		methodName: string;
+	}
+}
+
 export interface EnvironmentVariable {
 	id: number;
 	key: string;
@@ -1423,3 +1710,246 @@ export type SamlPreferencesExtractedData = {
 	entityID: string;
 	returnUrl: string;
 };
+
+export type SshKeyTypes = ['ed25519', 'rsa'];
+
+export type SourceControlPreferences = {
+	connected: boolean;
+	repositoryUrl: string;
+	branchName: string;
+	branches: string[];
+	branchReadOnly: boolean;
+	branchColor: string;
+	publicKey?: string;
+	keyGeneratorType?: TupleToUnion<SshKeyTypes>;
+	currentBranch?: string;
+};
+
+export interface SourceControlStatus {
+	ahead: number;
+	behind: number;
+	conflicted: string[];
+	created: string[];
+	current: string;
+	deleted: string[];
+	detached: boolean;
+	files: Array<{
+		path: string;
+		index: string;
+		working_dir: string;
+	}>;
+	modified: string[];
+	not_added: string[];
+	renamed: string[];
+	staged: string[];
+	tracking: null;
+}
+
+export interface SourceControlAggregatedFile {
+	conflict: boolean;
+	file: string;
+	id: string;
+	location: string;
+	name: string;
+	status: string;
+	type: string;
+	updatedAt?: string;
+}
+
+export declare namespace Cloud {
+	export interface PlanData {
+		planId: number;
+		monthlyExecutionsLimit: number;
+		activeWorkflowsLimit: number;
+		credentialsLimit: number;
+		isActive: boolean;
+		displayName: string;
+		expirationDate: string;
+		metadata: PlanMetadata;
+	}
+
+	export interface PlanMetadata {
+		version: 'v1';
+		group: 'opt-out' | 'opt-in' | 'trial';
+		slug: 'pro-1' | 'pro-2' | 'starter' | 'trial-1';
+		trial?: Trial;
+	}
+
+	interface Trial {
+		length: number;
+		gracePeriod: number;
+	}
+
+	export type UserAccount = {
+		confirmed: boolean;
+		username: string;
+		email: string;
+		hasEarlyAccess?: boolean;
+		role?: string;
+	};
+}
+
+export interface CloudPlanState {
+	initialized: boolean;
+	data: Cloud.PlanData | null;
+	usage: InstanceUsage | null;
+	loadingPlan: boolean;
+}
+
+export interface InstanceUsage {
+	timeframe?: string;
+	executions: number;
+	activeWorkflows: number;
+}
+
+export type CloudPlanAndUsageData = Cloud.PlanData & { usage: InstanceUsage };
+
+export interface ExternalSecretsProviderSecret {
+	key: string;
+}
+
+export type ExternalSecretsProviderData = Record<string, IUpdateInformation['value']>;
+
+export interface ExternalSecretsProvider {
+	icon: string;
+	name: string;
+	displayName: string;
+	connected: boolean;
+	connectedAt: string | false;
+	state: 'connected' | 'tested' | 'initializing' | 'error';
+	data?: ExternalSecretsProviderData;
+}
+
+export interface ExternalSecretsProviderWithProperties extends ExternalSecretsProvider {
+	properties: INodeProperties[];
+}
+
+export type CloudUpdateLinkSourceType =
+	| 'advanced-permissions'
+	| 'canvas-nav'
+	| 'custom-data-filter'
+	| 'workflow_sharing'
+	| 'credential_sharing'
+	| 'settings-n8n-api'
+	| 'audit-logs'
+	| 'ldap'
+	| 'log-streaming'
+	| 'source-control'
+	| 'sso'
+	| 'usage_page'
+	| 'settings-users'
+	| 'variables'
+	| 'community-nodes'
+	| 'workflow-history'
+	| 'worker-view';
+
+export type UTMCampaign =
+	| 'upgrade-custom-data-filter'
+	| 'upgrade-canvas-nav'
+	| 'upgrade-workflow-sharing'
+	| 'upgrade-credentials-sharing'
+	| 'upgrade-api'
+	| 'upgrade-audit-logs'
+	| 'upgrade-ldap'
+	| 'upgrade-log-streaming'
+	| 'upgrade-source-control'
+	| 'upgrade-sso'
+	| 'open'
+	| 'upgrade-users'
+	| 'upgrade-variables'
+	| 'upgrade-community-nodes'
+	| 'upgrade-workflow-history'
+	| 'upgrade-advanced-permissions'
+	| 'upgrade-worker-view';
+
+export type N8nBanners = {
+	[key in BannerName]: {
+		priority: number;
+		component: Component;
+	};
+};
+
+export type AddedNode = {
+	type: string;
+	openDetail?: boolean;
+	isAutoAdd?: boolean;
+	name?: string;
+	position?: XYPosition;
+};
+
+export type AddedNodeConnection = {
+	from: { nodeIndex: number; outputIndex?: number };
+	to: { nodeIndex: number; inputIndex?: number };
+};
+
+export type AddedNodesAndConnections = {
+	nodes: AddedNode[];
+	connections: AddedNodeConnection[];
+};
+
+export type ToggleNodeCreatorOptions = {
+	createNodeActive: boolean;
+	source?: NodeCreatorOpenSource;
+	nodeCreatorView?: string;
+};
+
+export type AppliedThemeOption = 'light' | 'dark';
+export type ThemeOption = AppliedThemeOption | 'system';
+
+export type SuggestedTemplates = {
+	sections: SuggestedTemplatesSection[];
+};
+
+export type SuggestedTemplatesSection = {
+	name: string;
+	title: string;
+	description: string;
+	workflows: SuggestedTemplatesWorkflowPreview[];
+};
+
+export type SuggestedTemplatesWorkflowPreview = {
+	title: string;
+	description: string;
+	preview: IWorkflowData;
+	nodes: Array<Pick<ITemplatesNode, 'id' | 'displayName' | 'icon' | 'defaults' | 'iconData'>>;
+};
+
+export type NewConnectionInfo = {
+	sourceId: string;
+	index: number;
+	eventSource: NodeCreatorOpenSource;
+	connection?: Connection;
+	nodeCreatorView?: string;
+	outputType?: NodeConnectionType;
+	endpointUuid?: string;
+};
+
+export type AIAssistantConnectionInfo = NewConnectionInfo & {
+	stepName: string;
+};
+
+export interface TestSuiteDb {
+	name: string;
+	id: string;
+	createdAt: string;
+	updatedAt: string;
+	description: string;
+}
+
+export interface NodeOutputDb {
+	[key: string]: unknown;
+	id: string;
+	workflowTestId: string;
+	nodeId: string;
+	outputType: 'error' | 'data' | null;
+	errorMessage?: string;
+	data?: unknown;
+}
+
+export interface NodeOutputDbMap {
+	[name: string]: NodeOutputDb;
+}
+
+export interface TestSuiteDbMap {
+	[name: string]: TestSuiteDb;
+}
diff --git a/packages/editor-ui/src/__tests__/defaults.ts b/packages/editor-ui/src/__tests__/defaults.ts
new file mode 100644
index 0000000000000..d448637c33c65
--- /dev/null
+++ b/packages/editor-ui/src/__tests__/defaults.ts
@@ -0,0 +1,151 @@
+import type { INodeTypeData, INodeTypeDescription, IN8nUISettings } from 'n8n-workflow';
+import { AGENT_NODE_TYPE, CHAT_TRIGGER_NODE_TYPE, MANUAL_TRIGGER_NODE_TYPE } from '@/constants';
+import nodeTypesJson from '../../../nodes-base/dist/types/nodes.json';
+import aiNodeTypesJson from '../../../@n8n/nodes-langchain/dist/types/nodes.json';
+
+const allNodeTypes = [...nodeTypesJson, ...aiNodeTypesJson];
+
+function findNodeWithName(name: string): INodeTypeDescription {
+	return allNodeTypes.find((node) => node.name === name) as INodeTypeDescription;
+}
+
+export const testingNodeTypes: INodeTypeData = {
+	[MANUAL_TRIGGER_NODE_TYPE]: {
+		sourcePath: '',
+		type: {
+			description: findNodeWithName(MANUAL_TRIGGER_NODE_TYPE),
+		},
+	},
+	[CHAT_TRIGGER_NODE_TYPE]: {
+		sourcePath: '',
+		type: {
+			description: findNodeWithName(CHAT_TRIGGER_NODE_TYPE),
+		},
+	},
+	[AGENT_NODE_TYPE]: {
+		sourcePath: '',
+		type: {
+			description: findNodeWithName(AGENT_NODE_TYPE),
+		},
+	},
+};
+
+export const defaultMockNodeTypes: INodeTypeData = {
+	[MANUAL_TRIGGER_NODE_TYPE]: testingNodeTypes[MANUAL_TRIGGER_NODE_TYPE],
+};
+
+export function mockNodeTypesToArray(nodeTypes: INodeTypeData): INodeTypeDescription[] {
+	return Object.values(nodeTypes).map(
+		(nodeType) => nodeType.type.description as INodeTypeDescription,
+	);
+}
+
+export const defaultMockNodeTypesArray: INodeTypeDescription[] =
+	mockNodeTypesToArray(defaultMockNodeTypes);
+
+export const defaultSettings: IN8nUISettings = {
+	allowedModules: {},
+	communityNodesEnabled: false,
+	defaultLocale: '',
+	endpointForm: '',
+	endpointFormTest: '',
+	endpointFormWaiting: '',
+	endpointWebhook: '',
+	endpointWebhookTest: '',
+	enterprise: {
+		sharing: false,
+		ldap: false,
+		saml: false,
+		logStreaming: false,
+		debugInEditor: false,
+		advancedExecutionFilters: false,
+		variables: true,
+		sourceControl: false,
+		auditLogs: false,
+		showNonProdBanner: false,
+		workflowHistory: false,
+		binaryDataS3: false,
+		externalSecrets: false,
+		workerView: false,
+		advancedPermissions: false,
+	},
+	expressions: {
+		evaluator: 'tournament',
+	},
+	executionMode: 'regular',
+	executionTimeout: 0,
+	hideUsagePage: false,
+	hiringBannerEnabled: false,
+	instanceId: '',
+	isNpmAvailable: false,
+	license: { environment: 'development' },
+	logLevel: 'info',
+	maxExecutionTimeout: 0,
+	oauthCallbackUrls: { oauth1: '', oauth2: '' },
+	onboardingCallPromptEnabled: false,
+	personalizationSurveyEnabled: false,
+	releaseChannel: 'stable',
+	posthog: {
+		apiHost: '',
+		apiKey: '',
+		autocapture: false,
+		debug: false,
+		disableSessionRecording: false,
+		enabled: false,
+	},
+	publicApi: { enabled: false, latestVersion: 0, path: '', swaggerUi: { enabled: false } },
+	pushBackend: 'websocket',
+	saveDataErrorExecution: 'DEFAULT',
+	saveDataSuccessExecution: 'DEFAULT',
+	saveManualExecutions: false,
+	sso: {
+		ldap: { loginEnabled: false, loginLabel: '' },
+		saml: { loginEnabled: false, loginLabel: '' },
+	},
+	telemetry: {
+		enabled: false,
+	},
+	templates: { enabled: false, host: '' },
+	timezone: '',
+	urlBaseEditor: '',
+	urlBaseWebhook: '',
+	authCookie: {
+		secure: false,
+	},
+	userManagement: {
+		showSetupOnFirstLoad: false,
+		smtpSetup: true,
+		authenticationMethod: 'email',
+		quota: 10,
+	},
+	versionCli: '',
+	versionNotifications: {
+		enabled: true,
+		endpoint: '',
+		infoUrl: '',
+	},
+	workflowCallerPolicyDefaultOption: 'any',
+	workflowTagsDisabled: false,
+	variables: {
+		limit: -1,
+	},
+	deployment: {
+		type: 'default',
+	},
+	banners: {
+		dismissed: [],
+	},
+	binaryDataMode: 'default',
+	previewMode: false,
+	mfa: {
+		enabled: false,
+	},
+	ai: {
+		enabled: false,
+		provider: '',
+	},
+	workflowHistory: {
+		pruneTime: 0,
+		licensePruneTime: 0,
+	},
+};
diff --git a/packages/editor-ui/src/__tests__/init.test.ts b/packages/editor-ui/src/__tests__/init.test.ts
new file mode 100644
index 0000000000000..6bf6f32999a56
--- /dev/null
+++ b/packages/editor-ui/src/__tests__/init.test.ts
@@ -0,0 +1,115 @@
+import { useUsersStore } from '@/stores/users.store';
+import { useCloudPlanStore } from '@/stores/cloudPlan.store';
+import { useSourceControlStore } from '@/stores/sourceControl.store';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import { initializeAuthenticatedFeatures, initializeCore } from '@/init';
+import { createTestingPinia } from '@pinia/testing';
+import { setActivePinia } from 'pinia';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useVersionsStore } from '@/stores/versions.store';
+
+vi.mock('@/stores/users.store', () => ({
+	useUsersStore: vi.fn().mockReturnValue({ initialize: vi.fn() }),
+}));
+
+vi.mock('@/stores/n8nRoot.store', () => ({
+	useRootStore: vi.fn(),
+}));
+
+describe('Init', () => {
+	let settingsStore: ReturnType<typeof useSettingsStore>;
+	let cloudPlanStore: ReturnType<typeof useCloudPlanStore>;
+	let sourceControlStore: ReturnType<typeof useSourceControlStore>;
+	let usersStore: ReturnType<typeof useUsersStore>;
+	let nodeTypesStore: ReturnType<typeof useNodeTypesStore>;
+	let versionsStore: ReturnType<typeof useVersionsStore>;
+
+	beforeEach(() => {
+		setActivePinia(createTestingPinia());
+		settingsStore = useSettingsStore();
+		cloudPlanStore = useCloudPlanStore();
+		sourceControlStore = useSourceControlStore();
+		nodeTypesStore = useNodeTypesStore();
+		usersStore = useUsersStore();
+		versionsStore = useVersionsStore();
+		versionsStore = useVersionsStore();
+	});
+
+	describe('initializeCore()', () => {
+		afterEach(() => {
+			vi.clearAllMocks();
+		});
+
+		it('should initialize core features only once', async () => {
+			const usersStoreSpy = vi.spyOn(usersStore, 'initialize');
+			const settingsStoreSpy = vi.spyOn(settingsStore, 'initialize');
+			const versionsSpy = vi.spyOn(versionsStore, 'checkForNewVersions');
+
+			await initializeCore();
+
+			expect(settingsStoreSpy).toHaveBeenCalled();
+			expect(usersStoreSpy).toHaveBeenCalled();
+			expect(versionsSpy).toHaveBeenCalled();
+
+			await initializeCore();
+
+			expect(settingsStoreSpy).toHaveBeenCalledTimes(1);
+		});
+	});
+
+	describe('initializeAuthenticatedFeatures()', () => {
+		beforeEach(() => {
+			vi.spyOn(settingsStore, 'isCloudDeployment', 'get').mockReturnValue(true);
+			vi.spyOn(settingsStore, 'isTemplatesEnabled', 'get').mockReturnValue(true);
+			vi.spyOn(sourceControlStore, 'isEnterpriseSourceControlEnabled', 'get').mockReturnValue(true);
+			vi.mocked(useRootStore).mockReturnValue({ defaultLocale: 'es' } as ReturnType<
+				typeof useRootStore
+			>);
+			vi.mock('@/hooks/register', () => ({
+				initializeCloudHooks: vi.fn(),
+			}));
+		});
+
+		afterEach(() => {
+			vi.clearAllMocks();
+		});
+
+		it('should not init authenticated features if user is not logged in', async () => {
+			const cloudStoreSpy = vi.spyOn(cloudPlanStore, 'initialize');
+			const templatesTestSpy = vi.spyOn(settingsStore, 'testTemplatesEndpoint');
+			const sourceControlSpy = vi.spyOn(sourceControlStore, 'getPreferences');
+			const nodeTranslationSpy = vi.spyOn(nodeTypesStore, 'getNodeTranslationHeaders');
+			vi.mocked(useUsersStore).mockReturnValue({ currentUser: null } as ReturnType<
+				typeof useUsersStore
+			>);
+
+			await initializeAuthenticatedFeatures();
+			expect(cloudStoreSpy).not.toHaveBeenCalled();
+			expect(templatesTestSpy).not.toHaveBeenCalled();
+			expect(sourceControlSpy).not.toHaveBeenCalled();
+			expect(nodeTranslationSpy).not.toHaveBeenCalled();
+		});
+
+		it('should init authenticated features only once if user is logged in', async () => {
+			const cloudStoreSpy = vi.spyOn(cloudPlanStore, 'initialize');
+			const templatesTestSpy = vi.spyOn(settingsStore, 'testTemplatesEndpoint');
+			const sourceControlSpy = vi.spyOn(sourceControlStore, 'getPreferences');
+			const nodeTranslationSpy = vi.spyOn(nodeTypesStore, 'getNodeTranslationHeaders');
+			vi.mocked(useUsersStore).mockReturnValue({ currentUser: { id: '123' } } as ReturnType<
+				typeof useUsersStore
+			>);
+
+			await initializeAuthenticatedFeatures();
+
+			expect(cloudStoreSpy).toHaveBeenCalled();
+			expect(templatesTestSpy).toHaveBeenCalled();
+			expect(sourceControlSpy).toHaveBeenCalled();
+			expect(nodeTranslationSpy).toHaveBeenCalled();
+
+			await initializeAuthenticatedFeatures();
+
+			expect(cloudStoreSpy).toHaveBeenCalledTimes(1);
+		});
+	});
+});
diff --git a/packages/editor-ui/src/__tests__/mocks.ts b/packages/editor-ui/src/__tests__/mocks.ts
new file mode 100644
index 0000000000000..3c1bc84a22ea7
--- /dev/null
+++ b/packages/editor-ui/src/__tests__/mocks.ts
@@ -0,0 +1,111 @@
+import type {
+	INodeType,
+	INodeTypeData,
+	INodeTypes,
+	IVersionedNodeType,
+	IConnections,
+	IDataObject,
+	INode,
+	IPinData,
+	IWorkflowSettings,
+} from 'n8n-workflow';
+import { NodeHelpers, Workflow } from 'n8n-workflow';
+import { uuid } from '@jsplumb/util';
+import { defaultMockNodeTypes } from '@/__tests__/defaults';
+import type {
+	INodeUi,
+	ITag,
+	IUsedCredential,
+	IUser,
+	IWorkflowDb,
+	WorkflowMetadata,
+} from '@/Interface';
+
+export function createTestNodeTypes(data: INodeTypeData = {}): INodeTypes {
+	const getResolvedKey = (key: string) => {
+		const resolvedKeyParts = key.split(/[\/.]/);
+		return resolvedKeyParts[resolvedKeyParts.length - 1];
+	};
+
+	const nodeTypes = {
+		...defaultMockNodeTypes,
+		...Object.keys(data).reduce<INodeTypeData>((acc, key) => {
+			acc[getResolvedKey(key)] = data[key];
+
+			return acc;
+		}, {}),
+	};
+
+	function getByName(nodeType: string): INodeType | IVersionedNodeType {
+		return nodeTypes[getResolvedKey(nodeType)].type;
+	}
+
+	function getByNameAndVersion(nodeType: string, version?: number): INodeType {
+		return NodeHelpers.getVersionedNodeType(getByName(nodeType), version);
+	}
+
+	return {
+		getByName,
+		getByNameAndVersion,
+	};
+}
+
+export function createTestWorkflowObject(options: {
+	id?: string;
+	name?: string;
+	nodes: INode[];
+	connections: IConnections;
+	active?: boolean;
+	nodeTypes?: INodeTypeData;
+	staticData?: IDataObject;
+	settings?: IWorkflowSettings;
+	pinData?: IPinData;
+}) {
+	return new Workflow({
+		...options,
+		id: options.id ?? uuid(),
+		active: options.active ?? false,
+		nodeTypes: createTestNodeTypes(options.nodeTypes),
+		connections: options.connections ?? {},
+	});
+}
+
+export function createTestWorkflow(options: {
+	id?: string;
+	name: string;
+	active?: boolean;
+	createdAt?: number | string;
+	updatedAt?: number | string;
+	nodes?: INodeUi[];
+	connections?: IConnections;
+	settings?: IWorkflowSettings;
+	tags?: ITag[] | string[];
+	pinData?: IPinData;
+	sharedWith?: Array<Partial<IUser>>;
+	ownedBy?: Partial<IUser>;
+	versionId?: string;
+	usedCredentials?: IUsedCredential[];
+	meta?: WorkflowMetadata;
+}): IWorkflowDb {
+	return {
+		...options,
+		createdAt: options.createdAt ?? '',
+		updatedAt: options.updatedAt ?? '',
+		versionId: options.versionId ?? '',
+		id: options.id ?? uuid(),
+		active: options.active ?? false,
+		connections: options.connections ?? {},
+	} as IWorkflowDb;
+}
+
+export function createTestNode(
+	node: Partial<INode> & { name: INode['name']; type: INode['type'] },
+): INode {
+	return {
+		id: uuid(),
+		typeVersion: 1,
+		position: [0, 0] as [number, number],
+		parameters: {},
+		...node,
+	};
+}
diff --git a/packages/editor-ui/src/__tests__/permissions.spec.ts b/packages/editor-ui/src/__tests__/permissions.spec.ts
index 8ee7edde431a5..f95b9549d9452 100644
--- a/packages/editor-ui/src/__tests__/permissions.spec.ts
+++ b/packages/editor-ui/src/__tests__/permissions.spec.ts
@@ -1,5 +1,6 @@
 import { parsePermissionsTable } from '@/permissions';
 import type { IUser } from '@/Interface';
+import { ROLE } from '@/constants';
 
 describe('parsePermissionsTable()', () => {
 	const user: IUser = {
@@ -7,9 +8,11 @@ describe('parsePermissionsTable()', () => {
 		firstName: 'John',
 		lastName: 'Doe',
 		isDefaultUser: false,
-		isOwner: true,
 		isPending: false,
 		isPendingUser: false,
+		mfaEnabled: false,
+		hasRecoveryCodesLeft: false,
+		role: ROLE.Owner,
 	};
 
 	it('should return permissions object using generic permissions table', () => {
@@ -44,4 +47,14 @@ describe('parsePermissionsTable()', () => {
 
 		expect(permissions.canRead).toBe(true);
 	});
+
+	it('should pass permission to test functions', () => {
+		const permissions = parsePermissionsTable(user, [
+			{ name: 'canRead', test: (p) => !!p.isInstanceOwner },
+			{ name: 'canUpdate', test: (p) => !!p.canRead },
+		]);
+
+		expect(permissions.canRead).toBe(true);
+		expect(permissions.canUpdate).toBe(true);
+	});
 });
diff --git a/packages/editor-ui/src/__tests__/render.ts b/packages/editor-ui/src/__tests__/render.ts
new file mode 100644
index 0000000000000..6561dae4bcdea
--- /dev/null
+++ b/packages/editor-ui/src/__tests__/render.ts
@@ -0,0 +1,86 @@
+import type { Plugin } from 'vue';
+import { render } from '@testing-library/vue';
+import { i18nInstance, I18nPlugin } from '@/plugins/i18n';
+import { GlobalComponentsPlugin } from '@/plugins/components';
+import { GlobalDirectivesPlugin } from '@/plugins/directives';
+import { FontAwesomePlugin } from '@/plugins/icons';
+import type { Pinia } from 'pinia';
+import { PiniaVuePlugin } from 'pinia';
+import type { Telemetry } from '@/plugins/telemetry';
+import vueJsonPretty from 'vue-json-pretty';
+import { merge } from 'lodash-es';
+import type { TestingPinia } from '@pinia/testing';
+
+export type RenderComponent = Parameters<typeof render>[0];
+export type RenderOptions = Parameters<typeof render>[1] & {
+	pinia?: TestingPinia | Pinia;
+};
+
+const TelemetryPlugin: Plugin<{}> = {
+	install(app) {
+		app.config.globalProperties.$telemetry = {
+			track(event: string, properties?: object) {},
+		} as Telemetry;
+	},
+};
+
+const defaultOptions = {
+	global: {
+		stubs: {
+			'router-link': true,
+			'vue-json-pretty': vueJsonPretty,
+		},
+		plugins: [
+			I18nPlugin,
+			i18nInstance,
+			PiniaVuePlugin,
+			FontAwesomePlugin,
+			GlobalComponentsPlugin,
+			GlobalDirectivesPlugin,
+			TelemetryPlugin,
+		],
+	},
+};
+
+export function renderComponent(component: RenderComponent, options: RenderOptions = {}) {
+	const { pinia, ...renderOptions } = options;
+
+	return render(component, {
+		...defaultOptions,
+		...renderOptions,
+		global: {
+			...defaultOptions.global,
+			...renderOptions.global,
+			stubs: { ...defaultOptions.global.stubs, ...(renderOptions.global?.stubs ?? {}) },
+			plugins: [
+				...defaultOptions.global.plugins,
+				...(renderOptions.global?.plugins ?? []),
+				...(pinia ? [pinia] : []),
+			],
+		},
+	});
+}
+
+export function createComponentRenderer(
+	component: RenderComponent,
+	defaultOptions: RenderOptions = {},
+) {
+	return (options: RenderOptions = {}, rendererOptions: { merge?: boolean } = {}) =>
+		renderComponent(
+			component,
+			rendererOptions.merge
+				? merge(defaultOptions, options)
+				: {
+						...defaultOptions,
+						...options,
+						props: {
+							...defaultOptions.props,
+							...options.props,
+						},
+						global: {
+							...defaultOptions.global,
+							...options.global,
+						},
+					},
+		);
+}
diff --git a/packages/editor-ui/src/__tests__/router.test.ts b/packages/editor-ui/src/__tests__/router.test.ts
new file mode 100644
index 0000000000000..6d4be7d80a5dd
--- /dev/null
+++ b/packages/editor-ui/src/__tests__/router.test.ts
@@ -0,0 +1,117 @@
+import { createPinia, setActivePinia } from 'pinia';
+import { createComponentRenderer } from '@/__tests__/render';
+import router from '@/router';
+import { VIEWS } from '@/constants';
+import { setupServer } from '@/__tests__/server';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useRBACStore } from '@/stores/rbac.store';
+import type { Scope } from '@n8n/permissions';
+import type { RouteRecordName } from 'vue-router';
+
+const App = {
+	template: '<div />',
+};
+const renderComponent = createComponentRenderer(App);
+
+describe('router', () => {
+	let server: ReturnType<typeof setupServer>;
+
+	beforeAll(async () => {
+		server = setupServer();
+
+		const pinia = createPinia();
+		setActivePinia(pinia);
+
+		renderComponent({ pinia });
+	});
+
+	afterAll(() => {
+		server.shutdown();
+	});
+
+	test.each([
+		['/', VIEWS.WORKFLOWS],
+		['/workflow', VIEWS.NEW_WORKFLOW],
+		['/workflow/new', VIEWS.NEW_WORKFLOW],
+		['/workflow/R9JFXwkUCL1jZBuw', VIEWS.WORKFLOW],
+		['/workflow/R9JFXwkUCL1jZBuw/executions/29021', VIEWS.EXECUTION_PREVIEW],
+		['/workflows/templates/R9JFXwkUCL1jZBuw', VIEWS.TEMPLATE_IMPORT],
+		['/workflows/demo', VIEWS.DEMO],
+	])(
+		'should resolve %s to %s',
+		async (path, name) => {
+			await router.push(path);
+			expect(router.currentRoute.value.name).toBe(name);
+		},
+		10000,
+	);
+
+	test.each([
+		['/workflow/R9JFXwkUCL1jZBuw/debug/29021', VIEWS.WORKFLOWS],
+		['/workflow/8IFYawZ9dKqJu8sT/history', VIEWS.WORKFLOWS],
+		['/workflow/8IFYawZ9dKqJu8sT/history/6513ed960252b846f3792f0c', VIEWS.WORKFLOWS],
+	])(
+		'should redirect %s to %s if user does not have permissions',
+		async (path, name) => {
+			await router.push(path);
+			expect(router.currentRoute.value.name).toBe(name);
+		},
+		10000,
+	);
+
+	test.each([
+		['/workflow/R9JFXwkUCL1jZBuw/debug/29021', VIEWS.EXECUTION_DEBUG],
+		['/workflow/8IFYawZ9dKqJu8sT/history', VIEWS.WORKFLOW_HISTORY],
+		['/workflow/8IFYawZ9dKqJu8sT/history/6513ed960252b846f3792f0c', VIEWS.WORKFLOW_HISTORY],
+	])(
+		'should resolve %s to %s if user has permissions',
+		async (path, name) => {
+			const settingsStore = useSettingsStore();
+
+			settingsStore.settings.enterprise.debugInEditor = true;
+			settingsStore.settings.enterprise.workflowHistory = true;
+
+			await router.push(path);
+			expect(router.currentRoute.value.name).toBe(name);
+		},
+		10000,
+	);
+
+	test.each<[string, RouteRecordName, Scope[]]>([
+		['/settings/users', VIEWS.WORKFLOWS, []],
+		['/settings/users', VIEWS.USERS_SETTINGS, ['user:create', 'user:update']],
+		['/settings/environments', VIEWS.WORKFLOWS, []],
+		['/settings/environments', VIEWS.SOURCE_CONTROL, ['sourceControl:manage']],
+		['/settings/external-secrets', VIEWS.WORKFLOWS, []],
+		[
+			'/settings/external-secrets',
+			VIEWS.EXTERNAL_SECRETS_SETTINGS,
+			['externalSecretsProvider:list', 'externalSecretsProvider:update'],
+		],
+		['/settings/sso', VIEWS.WORKFLOWS, []],
+		['/settings/sso', VIEWS.SSO_SETTINGS, ['saml:manage']],
+		['/settings/log-streaming', VIEWS.WORKFLOWS, []],
+		['/settings/log-streaming', VIEWS.LOG_STREAMING_SETTINGS, ['logStreaming:manage']],
+		['/settings/community-nodes', VIEWS.WORKFLOWS, []],
+		[
+			'/settings/community-nodes',
+			VIEWS.COMMUNITY_NODES,
+			['communityPackage:list', 'communityPackage:update'],
+		],
+		['/settings/ldap', VIEWS.WORKFLOWS, []],
+		['/settings/ldap', VIEWS.LDAP_SETTINGS, ['ldap:manage']],
+	])(
+		'should resolve %s to %s with %s user permissions',
+		async (path, name, scopes) => {
+			const settingsStore = useSettingsStore();
+			const rbacStore = useRBACStore();
+
+			settingsStore.settings.communityNodesEnabled = true;
+			rbacStore.setGlobalScopes(scopes);
+
+			await router.push(path);
+			expect(router.currentRoute.value.name).toBe(name);
+		},
+		10000,
+	);
+});
diff --git a/packages/editor-ui/src/__tests__/server/endpoints/index.ts b/packages/editor-ui/src/__tests__/server/endpoints/index.ts
index 4ba3315e425fb..93a48d3dfec6d 100644
--- a/packages/editor-ui/src/__tests__/server/endpoints/index.ts
+++ b/packages/editor-ui/src/__tests__/server/endpoints/index.ts
@@ -4,6 +4,10 @@ import { routesForCredentials } from './credential';
 import { routesForCredentialTypes } from './credentialType';
 import { routesForVariables } from './variable';
 import { routesForSettings } from './settings';
+import { routesForSSO } from './sso';
+import { routesForSourceControl } from './sourceControl';
+import { routesForWorkflows } from './workflow';
+import { routesForTags } from './tag';
 
 const endpoints: Array<(server: Server) => void> = [
 	routesForCredentials,
@@ -11,6 +15,10 @@ const endpoints: Array<(server: Server) => void> = [
 	routesForUsers,
 	routesForVariables,
 	routesForSettings,
+	routesForSSO,
+	routesForSourceControl,
+	routesForWorkflows,
+	routesForTags,
 ];
 
 export { endpoints };
diff --git a/packages/editor-ui/src/__tests__/server/endpoints/settings.ts b/packages/editor-ui/src/__tests__/server/endpoints/settings.ts
index 0ffed3e14a6b1..62050417fcea7 100644
--- a/packages/editor-ui/src/__tests__/server/endpoints/settings.ts
+++ b/packages/editor-ui/src/__tests__/server/endpoints/settings.ts
@@ -1,81 +1,7 @@
 import type { Server } from 'miragejs';
 import { Response } from 'miragejs';
 import type { AppSchema } from '../types';
-import type { IN8nUISettings } from 'n8n-workflow';
-
-const defaultSettings: IN8nUISettings = {
-	allowedModules: {},
-	communityNodesEnabled: false,
-	defaultLocale: '',
-	endpointWebhook: '',
-	endpointWebhookTest: '',
-	enterprise: {
-		sharing: false,
-		ldap: false,
-		saml: false,
-		logStreaming: false,
-		advancedExecutionFilters: false,
-		variables: true,
-		versionControl: false,
-	},
-	executionMode: 'regular',
-	executionTimeout: 0,
-	hideUsagePage: false,
-	hiringBannerEnabled: false,
-	instanceId: '',
-	isNpmAvailable: false,
-	license: { environment: 'development' },
-	logLevel: 'info',
-	maxExecutionTimeout: 0,
-	oauthCallbackUrls: { oauth1: '', oauth2: '' },
-	onboardingCallPromptEnabled: false,
-	personalizationSurveyEnabled: false,
-	posthog: {
-		apiHost: '',
-		apiKey: '',
-		autocapture: false,
-		debug: false,
-		disableSessionRecording: false,
-		enabled: false,
-	},
-	publicApi: { enabled: false, latestVersion: 0, path: '', swaggerUi: { enabled: false } },
-	pushBackend: 'websocket',
-	saveDataErrorExecution: 'DEFAULT',
-	saveDataSuccessExecution: 'DEFAULT',
-	saveManualExecutions: false,
-	sso: {
-		ldap: { loginEnabled: false, loginLabel: '' },
-		saml: { loginEnabled: false, loginLabel: '' },
-	},
-	telemetry: {
-		enabled: false,
-	},
-	templates: { enabled: false, host: '' },
-	timezone: '',
-	urlBaseEditor: '',
-	urlBaseWebhook: '',
-	userManagement: {
-		enabled: true,
-		showSetupOnFirstLoad: true,
-		smtpSetup: true,
-		authenticationMethod: 'email',
-	},
-	versionCli: '',
-	versionNotifications: {
-		enabled: true,
-		endpoint: '',
-		infoUrl: '',
-	},
-	workflowCallerPolicyDefaultOption: 'any',
-	workflowTagsDisabled: false,
-	variables: {
-		limit: -1,
-	},
-	userActivationSurveyEnabled: false,
-	deployment: {
-		type: 'default',
-	},
-};
+import { defaultSettings } from '../../defaults';
 
 export function routesForSettings(server: Server) {
 	server.get('/rest/settings', (schema: AppSchema) => {
diff --git a/packages/editor-ui/src/__tests__/server/endpoints/sourceControl.ts b/packages/editor-ui/src/__tests__/server/endpoints/sourceControl.ts
new file mode 100644
index 0000000000000..26d4f93fd241d
--- /dev/null
+++ b/packages/editor-ui/src/__tests__/server/endpoints/sourceControl.ts
@@ -0,0 +1,86 @@
+import type { Server, Request } from 'miragejs';
+import { Response } from 'miragejs';
+import { jsonParse } from 'n8n-workflow';
+import type { AppSchema } from '@/__tests__/server/types';
+import type { SourceControlPreferences } from '@/Interface';
+
+export function routesForSourceControl(server: Server) {
+	const sourceControlApiRoot = '/rest/source-control';
+	const defaultSourceControlPreferences: SourceControlPreferences = {
+		branchName: '',
+		branches: [],
+		repositoryUrl: '',
+		branchReadOnly: false,
+		branchColor: '#1d6acb',
+		connected: false,
+		publicKey: 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHEX+25m',
+		keyGeneratorType: 'ed25519',
+	};
+
+	server.get(`${sourceControlApiRoot}/preferences`, (schema: AppSchema, request: Request) => {
+		return new Response(
+			200,
+			{},
+			{
+				data: defaultSourceControlPreferences,
+			},
+		);
+	});
+
+	server.post(`${sourceControlApiRoot}/preferences`, (schema: AppSchema, request: Request) => {
+		const requestBody: Partial<SourceControlPreferences> = jsonParse(request.requestBody);
+
+		return new Response(
+			200,
+			{},
+			{
+				data: {
+					...defaultSourceControlPreferences,
+					...requestBody,
+				},
+			},
+		);
+	});
+
+	server.patch(`${sourceControlApiRoot}/preferences`, (schema: AppSchema, request: Request) => {
+		const requestBody: Partial<SourceControlPreferences> = jsonParse(request.requestBody);
+
+		return new Response(
+			200,
+			{},
+			{
+				data: {
+					...defaultSourceControlPreferences,
+					...requestBody,
+				},
+			},
+		);
+	});
+
+	server.get(`${sourceControlApiRoot}/get-branches`, () => {
+		return new Response(
+			200,
+			{},
+			{
+				data: {
+					branches: ['main', 'dev'],
+					currentBranch: 'main',
+				},
+			},
+		);
+	});
+
+	server.post(`${sourceControlApiRoot}/disconnect`, () => {
+		return new Response(
+			200,
+			{},
+			{
+				data: {
+					...defaultSourceControlPreferences,
+					branchName: '',
+					connected: false,
+				},
+			},
+		);
+	});
+}
diff --git a/packages/editor-ui/src/__tests__/server/endpoints/sso.ts b/packages/editor-ui/src/__tests__/server/endpoints/sso.ts
new file mode 100644
index 0000000000000..0293bab063218
--- /dev/null
+++ b/packages/editor-ui/src/__tests__/server/endpoints/sso.ts
@@ -0,0 +1,34 @@
+import type { Server, Request } from 'miragejs';
+import { Response } from 'miragejs';
+import type { SamlPreferences, SamlPreferencesExtractedData } from '@/Interface';
+import { faker } from '@faker-js/faker';
+import type { AppSchema } from '@/__tests__/server/types';
+import { jsonParse } from 'n8n-workflow';
+
+let samlConfig: SamlPreferences & SamlPreferencesExtractedData = {
+	metadata: '<?xml version="1.0"?>',
+	metadataUrl: '',
+	entityID: faker.internet.url(),
+	returnUrl: faker.internet.url(),
+};
+
+export function routesForSSO(server: Server) {
+	server.get('/rest/sso/saml/config', () => {
+		return new Response(200, {}, { data: samlConfig });
+	});
+
+	server.post('/rest/sso/saml/config', (schema: AppSchema, request: Request) => {
+		const requestBody = jsonParse(request.requestBody);
+
+		samlConfig = {
+			...samlConfig,
+			...requestBody,
+		};
+
+		return new Response(200, {}, { data: samlConfig });
+	});
+
+	server.get('/rest/sso/saml/config/test', () => {
+		return new Response(200, {}, { data: '<?xml version="1.0"?>' });
+	});
+}
diff --git a/packages/editor-ui/src/__tests__/server/endpoints/tag.ts b/packages/editor-ui/src/__tests__/server/endpoints/tag.ts
new file mode 100644
index 0000000000000..7891c20262b6d
--- /dev/null
+++ b/packages/editor-ui/src/__tests__/server/endpoints/tag.ts
@@ -0,0 +1,11 @@
+import type { Server } from 'miragejs';
+import { Response } from 'miragejs';
+import type { AppSchema } from '../types';
+
+export function routesForTags(server: Server) {
+	server.get('/rest/tags', (schema: AppSchema) => {
+		const { models: data } = schema.all('tag');
+
+		return new Response(200, {}, { data });
+	});
+}
diff --git a/packages/editor-ui/src/__tests__/server/endpoints/workflow.ts b/packages/editor-ui/src/__tests__/server/endpoints/workflow.ts
new file mode 100644
index 0000000000000..4418cdb061377
--- /dev/null
+++ b/packages/editor-ui/src/__tests__/server/endpoints/workflow.ts
@@ -0,0 +1,16 @@
+import type { Server } from 'miragejs';
+import { Response } from 'miragejs';
+import type { AppSchema } from '../types';
+
+export function routesForWorkflows(server: Server) {
+	server.get('/rest/workflows', (schema: AppSchema) => {
+		const { models: data } = schema.all('workflow');
+
+		return new Response(200, {}, { data });
+	});
+	server.get('/rest/active-workflows', (schema: AppSchema) => {
+		const { models: data } = schema.all('workflow');
+
+		return new Response(200, {}, { data });
+	});
+}
diff --git a/packages/editor-ui/src/__tests__/server/factories/credential.ts b/packages/editor-ui/src/__tests__/server/factories/credential.ts
index b97bbbaea5d43..1cd28a06e6fac 100644
--- a/packages/editor-ui/src/__tests__/server/factories/credential.ts
+++ b/packages/editor-ui/src/__tests__/server/factories/credential.ts
@@ -12,9 +12,6 @@ export const credentialFactory = Factory.extend<ICredentialsResponse>({
 	name() {
 		return faker.company.name();
 	},
-	nodesAccess() {
-		return [];
-	},
 	type() {
 		return 'notionApi';
 	},
diff --git a/packages/editor-ui/src/__tests__/server/factories/credentialType.ts b/packages/editor-ui/src/__tests__/server/factories/credentialType.ts
index 517e4e7207a8f..7fdd221cf8b7d 100644
--- a/packages/editor-ui/src/__tests__/server/factories/credentialType.ts
+++ b/packages/editor-ui/src/__tests__/server/factories/credentialType.ts
@@ -1,5 +1,4 @@
 import { Factory } from 'miragejs';
-import { faker } from '@faker-js/faker';
 import type { ICredentialType } from 'n8n-workflow';
 
 const credentialTypes = [
diff --git a/packages/editor-ui/src/__tests__/server/factories/index.ts b/packages/editor-ui/src/__tests__/server/factories/index.ts
index 9b5155c28f1e8..77de915bad3a5 100644
--- a/packages/editor-ui/src/__tests__/server/factories/index.ts
+++ b/packages/editor-ui/src/__tests__/server/factories/index.ts
@@ -2,6 +2,8 @@ import { userFactory } from './user';
 import { credentialFactory } from './credential';
 import { credentialTypeFactory } from './credentialType';
 import { variableFactory } from './variable';
+import { workflowFactory } from './workflow';
+import { tagFactory } from './tag';
 
 export * from './user';
 export * from './credential';
@@ -13,4 +15,6 @@ export const factories = {
 	credentialType: credentialTypeFactory,
 	user: userFactory,
 	variable: variableFactory,
+	workflow: workflowFactory,
+	tag: tagFactory,
 };
diff --git a/packages/editor-ui/src/__tests__/server/factories/tag.ts b/packages/editor-ui/src/__tests__/server/factories/tag.ts
new file mode 100644
index 0000000000000..bed3ca227679d
--- /dev/null
+++ b/packages/editor-ui/src/__tests__/server/factories/tag.ts
@@ -0,0 +1,12 @@
+import { Factory } from 'miragejs';
+import type { ITag } from '@/Interface';
+import { faker } from '@faker-js/faker';
+
+export const tagFactory = Factory.extend<ITag>({
+	id(i: string) {
+		return i;
+	},
+	name() {
+		return faker.lorem.word();
+	},
+});
diff --git a/packages/editor-ui/src/__tests__/server/factories/user.ts b/packages/editor-ui/src/__tests__/server/factories/user.ts
index f8d593b564590..e8fc06cec97fd 100644
--- a/packages/editor-ui/src/__tests__/server/factories/user.ts
+++ b/packages/editor-ui/src/__tests__/server/factories/user.ts
@@ -16,9 +16,6 @@ export const userFactory = Factory.extend<IUser>({
 	isDefaultUser() {
 		return false;
 	},
-	isOwner() {
-		return false;
-	},
 	isPending() {
 		return false;
 	},
@@ -28,4 +25,10 @@ export const userFactory = Factory.extend<IUser>({
 	signInType(): SignInType {
 		return SignInType.EMAIL;
 	},
+	mfaEnabled() {
+		return false;
+	},
+	hasRecoveryCodesLeft() {
+		return false;
+	},
 });
diff --git a/packages/editor-ui/src/__tests__/server/factories/workflow.ts b/packages/editor-ui/src/__tests__/server/factories/workflow.ts
new file mode 100644
index 0000000000000..6d12a8958b180
--- /dev/null
+++ b/packages/editor-ui/src/__tests__/server/factories/workflow.ts
@@ -0,0 +1,18 @@
+import { Factory } from 'miragejs';
+import type { IWorkflowDb } from '@/Interface';
+import { faker } from '@faker-js/faker';
+
+export const workflowFactory = Factory.extend<IWorkflowDb>({
+	id(i: string) {
+		return i;
+	},
+	name() {
+		return faker.lorem.word();
+	},
+	createdAt() {
+		return faker.date.recent().toISOString();
+	},
+	tags() {
+		return faker.lorem.words(2.5).split(' ');
+	},
+});
diff --git a/packages/editor-ui/src/__tests__/server/fixtures/index.ts b/packages/editor-ui/src/__tests__/server/fixtures/index.ts
new file mode 100644
index 0000000000000..12f59798817da
--- /dev/null
+++ b/packages/editor-ui/src/__tests__/server/fixtures/index.ts
@@ -0,0 +1,7 @@
+import { tags } from './tags';
+import { workflows } from './workflows';
+
+export const fixtures = {
+	tags,
+	workflows,
+};
diff --git a/packages/editor-ui/src/__tests__/server/fixtures/tags.ts b/packages/editor-ui/src/__tests__/server/fixtures/tags.ts
new file mode 100644
index 0000000000000..740acef117a84
--- /dev/null
+++ b/packages/editor-ui/src/__tests__/server/fixtures/tags.ts
@@ -0,0 +1,15 @@
+import type { ITag } from '@/Interface';
+export const tags: ITag[] = [
+	{
+		id: '1',
+		name: 'tag1',
+	},
+	{
+		id: '2',
+		name: 'tag2',
+	},
+	{
+		id: '3',
+		name: 'tag3',
+	},
+];
diff --git a/packages/editor-ui/src/__tests__/server/fixtures/workflows.ts b/packages/editor-ui/src/__tests__/server/fixtures/workflows.ts
new file mode 100644
index 0000000000000..68e05e0d9da6f
--- /dev/null
+++ b/packages/editor-ui/src/__tests__/server/fixtures/workflows.ts
@@ -0,0 +1,47 @@
+import type { IWorkflowDb } from '@/Interface';
+import { faker } from '@faker-js/faker';
+
+export const workflows = [
+	{
+		id: '1',
+		name: 'workflow1',
+		tags: [],
+	},
+	{
+		id: '2',
+		name: 'workflow2',
+		tags: [
+			{ id: '1', name: 'tag1' },
+			{ id: '2', name: 'tag2' },
+		],
+	},
+	{
+		id: '3',
+		name: 'workflow3',
+		tags: [
+			{ id: '1', name: 'tag1' },
+			{ id: '3', name: 'tag3' },
+		],
+	},
+	{
+		id: '4',
+		name: 'workflow4',
+		tags: [
+			{ id: '2', name: 'tag2' },
+			{ id: '3', name: 'tag3' },
+		],
+	},
+	{
+		id: '5',
+		name: 'workflow5',
+		tags: [
+			{ id: '1', name: 'tag1' },
+			{ id: '2', name: 'tag2' },
+			{ id: '3', name: 'tag3' },
+		],
+	},
+].map((wf, idx) => ({
+	...wf,
+	createdAt: faker.date.recent().toISOString(),
+	updatedAt: new Date(`2024-1-${idx + 1}`).toISOString(),
+})) as IWorkflowDb[];
diff --git a/packages/editor-ui/src/__tests__/server/index.ts b/packages/editor-ui/src/__tests__/server/index.ts
index 7eb78caacad29..ef8d4e7a23cbf 100644
--- a/packages/editor-ui/src/__tests__/server/index.ts
+++ b/packages/editor-ui/src/__tests__/server/index.ts
@@ -2,12 +2,15 @@ import { createServer } from 'miragejs';
 import { endpoints } from './endpoints';
 import { models } from './models';
 import { factories } from './factories';
+import { fixtures } from './fixtures';
 
 export function setupServer() {
 	const server = createServer({
 		models,
 		factories,
+		fixtures,
 		seeds(server) {
+			server.loadFixtures('tags', 'workflows');
 			server.createList('credentialType', 8);
 			server.create('user', {
 				firstName: 'Nathan',
@@ -23,14 +26,14 @@ export function setupServer() {
 	// Enable logging
 	server.logging = false;
 
-	// Handle undefined endpoints
-	server.post('/rest/:any', () => new Promise(() => {}));
-
 	// Handle defined endpoints
 	for (const endpointsFn of endpoints) {
 		endpointsFn(server);
 	}
 
+	// Handle undefined endpoints
+	server.post('/rest/:any', async () => ({}));
+
 	// Reset for everything else
 	server.namespace = '';
 	server.passthrough();
diff --git a/packages/editor-ui/src/__tests__/server/models/index.ts b/packages/editor-ui/src/__tests__/server/models/index.ts
index 6b9f39327b9bf..f947fb9c531c1 100644
--- a/packages/editor-ui/src/__tests__/server/models/index.ts
+++ b/packages/editor-ui/src/__tests__/server/models/index.ts
@@ -2,10 +2,14 @@ import { UserModel } from './user';
 import { CredentialModel } from './credential';
 import { CredentialTypeModel } from './credentialType';
 import { VariableModel } from './variable';
+import { WorkflowModel } from './workflow';
+import { TagModel } from './tag';
 
 export const models = {
 	credential: CredentialModel,
 	credentialType: CredentialTypeModel,
 	user: UserModel,
 	variable: VariableModel,
+	workflow: WorkflowModel,
+	tag: TagModel,
 };
diff --git a/packages/editor-ui/src/__tests__/server/models/tag.ts b/packages/editor-ui/src/__tests__/server/models/tag.ts
new file mode 100644
index 0000000000000..737e2288562c0
--- /dev/null
+++ b/packages/editor-ui/src/__tests__/server/models/tag.ts
@@ -0,0 +1,5 @@
+import type { ITag } from '@/Interface';
+import { Model } from 'miragejs';
+import type { ModelDefinition } from 'miragejs/-types';
+
+export const TagModel: ModelDefinition<ITag> = Model.extend({});
diff --git a/packages/editor-ui/src/__tests__/server/models/workflow.ts b/packages/editor-ui/src/__tests__/server/models/workflow.ts
new file mode 100644
index 0000000000000..7be4f100035df
--- /dev/null
+++ b/packages/editor-ui/src/__tests__/server/models/workflow.ts
@@ -0,0 +1,5 @@
+import type { IWorkflowDb } from '@/Interface';
+import { Model } from 'miragejs';
+import type { ModelDefinition } from 'miragejs/-types';
+
+export const WorkflowModel: ModelDefinition<IWorkflowDb> = Model.extend({});
diff --git a/packages/editor-ui/src/__tests__/server/types.ts b/packages/editor-ui/src/__tests__/server/types.ts
index ec32f7c97cede..dc86f210f561a 100644
--- a/packages/editor-ui/src/__tests__/server/types.ts
+++ b/packages/editor-ui/src/__tests__/server/types.ts
@@ -1,6 +1,5 @@
 import type { Registry } from 'miragejs';
 
-// eslint-disable-next-line import/no-unresolved
 import type Schema from 'miragejs/orm/schema';
 
 import type { models } from './models';
diff --git a/packages/editor-ui/src/__tests__/setup.ts b/packages/editor-ui/src/__tests__/setup.ts
index 28fef7c5d7849..3b9c07462ea29 100644
--- a/packages/editor-ui/src/__tests__/setup.ts
+++ b/packages/editor-ui/src/__tests__/setup.ts
@@ -1,20 +1,8 @@
 import '@testing-library/jest-dom';
 import { configure } from '@testing-library/vue';
-import Vue from 'vue';
-import '../plugins';
-import { I18nPlugin } from '@/plugins/i18n';
 
 configure({ testIdAttribute: 'data-test-id' });
 
-Vue.config.productionTip = false;
-Vue.config.devtools = false;
-
-// TODO: Investigate why this is needed
-// Without having this 3rd party library imported like this, any component test using 'vue-json-pretty' fail with:
-// [Vue warn]: Failed to mount component: template or render function not defined.
-Vue.component('vue-json-pretty', require('vue-json-pretty').default);
-Vue.use((vue) => I18nPlugin(vue));
-
 window.ResizeObserver =
 	window.ResizeObserver ||
 	vi.fn().mockImplementation(() => ({
@@ -22,3 +10,37 @@ window.ResizeObserver =
 		observe: vi.fn(),
 		unobserve: vi.fn(),
 	}));
+
+Element.prototype.scrollIntoView = vi.fn();
+
+Range.prototype.getBoundingClientRect = vi.fn();
+Range.prototype.getClientRects = vi.fn(() => ({
+	item: vi.fn(),
+	length: 0,
+	[Symbol.iterator]: vi.fn(),
+}));
+
+export class IntersectionObserver {
+	root = null;
+	rootMargin = '';
+	thresholds = [];
+
+	disconnect() {
+		return null;
+	}
+
+	observe() {
+		return null;
+	}
+
+	takeRecords() {
+		return [];
+	}
+
+	unobserve() {
+		return null;
+	}
+}
+
+window.IntersectionObserver = IntersectionObserver;
+global.IntersectionObserver = IntersectionObserver;
diff --git a/packages/editor-ui/src/__tests__/utils.ts b/packages/editor-ui/src/__tests__/utils.ts
index c6d167f06c3ee..3e62559f74cb2 100644
--- a/packages/editor-ui/src/__tests__/utils.ts
+++ b/packages/editor-ui/src/__tests__/utils.ts
@@ -1,10 +1,12 @@
 import type { ISettingsState } from '@/Interface';
 import { UserManagementAuthenticationMethod } from '@/Interface';
-import { render } from '@testing-library/vue';
-import { PiniaVuePlugin } from 'pinia';
+import { defaultSettings } from './defaults';
 
-export const retry = (assertion: () => any, { interval = 20, timeout = 200 } = {}) => {
-	return new Promise((resolve, reject) => {
+export const retry = async (
+	assertion: () => ReturnType<typeof expect>,
+	{ interval = 20, timeout = 1000 } = {},
+) => {
+	return await new Promise((resolve, reject) => {
 		const startTime = Date.now();
 
 		const tryAgain = () => {
@@ -21,80 +23,10 @@ export const retry = (assertion: () => any, { interval = 20, timeout = 200 } = {
 	});
 };
 
-type RenderParams = Parameters<typeof render>;
-export const renderComponent = (Component: RenderParams[0], renderOptions: RenderParams[1] = {}) =>
-	render(Component, renderOptions, (vue) => {
-		vue.use(PiniaVuePlugin);
-	});
-
-export const waitAllPromises = () => new Promise((resolve) => setTimeout(resolve));
+export const waitAllPromises = async () => await new Promise((resolve) => setTimeout(resolve));
 
 export const SETTINGS_STORE_DEFAULT_STATE: ISettingsState = {
-	settings: {
-		userActivationSurveyEnabled: false,
-		allowedModules: {},
-		communityNodesEnabled: false,
-		defaultLocale: '',
-		endpointWebhook: '',
-		endpointWebhookTest: '',
-		enterprise: {
-			advancedExecutionFilters: false,
-			sharing: false,
-			ldap: false,
-			saml: false,
-			logStreaming: false,
-		},
-		executionMode: '',
-		executionTimeout: 0,
-		hideUsagePage: false,
-		hiringBannerEnabled: false,
-		instanceId: '',
-		isNpmAvailable: false,
-		license: { environment: 'production' },
-		logLevel: 'info',
-		maxExecutionTimeout: 0,
-		oauthCallbackUrls: { oauth1: '', oauth2: '' },
-		onboardingCallPromptEnabled: false,
-		personalizationSurveyEnabled: false,
-		posthog: {
-			apiHost: '',
-			apiKey: '',
-			autocapture: false,
-			debug: false,
-			disableSessionRecording: false,
-			enabled: false,
-		},
-		publicApi: { enabled: false, latestVersion: 0, path: '', swaggerUi: { enabled: false } },
-		pushBackend: 'sse',
-		saveDataErrorExecution: '',
-		saveDataSuccessExecution: '',
-		saveManualExecutions: false,
-		sso: {
-			ldap: { loginEnabled: false, loginLabel: '' },
-			saml: { loginEnabled: false, loginLabel: '' },
-		},
-		telemetry: { enabled: false },
-		templates: { enabled: false, host: '' },
-		timezone: '',
-		urlBaseEditor: '',
-		urlBaseWebhook: '',
-		userManagement: {
-			enabled: false,
-			smtpSetup: false,
-			authenticationMethod: UserManagementAuthenticationMethod.Email,
-		},
-		versionCli: '',
-		versionNotifications: {
-			enabled: false,
-			endpoint: '',
-			infoUrl: '',
-		},
-		workflowCallerPolicyDefaultOption: 'any',
-		workflowTagsDisabled: false,
-		deployment: {
-			type: 'default',
-		},
-	},
+	settings: defaultSettings,
 	promptsData: {
 		message: '',
 		title: '',
@@ -102,10 +34,10 @@ export const SETTINGS_STORE_DEFAULT_STATE: ISettingsState = {
 		showValueSurvey: false,
 	},
 	userManagement: {
-		enabled: false,
 		showSetupOnFirstLoad: false,
 		smtpSetup: false,
 		authenticationMethod: UserManagementAuthenticationMethod.Email,
+		quota: defaultSettings.userManagement.quota,
 	},
 	templatesEndpointHealthy: false,
 	api: {
@@ -128,4 +60,5 @@ export const SETTINGS_STORE_DEFAULT_STATE: ISettingsState = {
 	saveDataErrorExecution: 'all',
 	saveDataSuccessExecution: 'all',
 	saveManualExecutions: false,
+	binaryDataMode: 'default',
 };
diff --git a/packages/editor-ui/src/api/ai.ts b/packages/editor-ui/src/api/ai.ts
new file mode 100644
index 0000000000000..ed08cd412828e
--- /dev/null
+++ b/packages/editor-ui/src/api/ai.ts
@@ -0,0 +1,52 @@
+import type { IRestApiContext, Schema } from '@/Interface';
+import { makeRestApiRequest } from '@/utils/apiUtils';
+import type { IDataObject } from 'n8n-workflow';
+
+export interface GenerateCurlPayload {
+	service: string;
+	request: string;
+}
+
+export interface GenerateCurlResponse {
+	curl: string;
+	metadata: object;
+}
+
+export async function generateCodeForPrompt(
+	ctx: IRestApiContext,
+	{
+		question,
+		context,
+		model,
+		n8nVersion,
+	}: {
+		question: string;
+		context: {
+			schema: Array<{ nodeName: string; schema: Schema }>;
+			inputSchema: { nodeName: string; schema: Schema };
+			pushRef: string;
+			ndvPushRef: string;
+		};
+		model: string;
+		n8nVersion: string;
+	},
+): Promise<{ code: string }> {
+	return await makeRestApiRequest(ctx, 'POST', '/ask-ai', {
+		question,
+		context,
+		model,
+		n8nVersion,
+	} as IDataObject);
+}
+
+export const generateCurl = async (
+	context: IRestApiContext,
+	payload: GenerateCurlPayload,
+): Promise<GenerateCurlResponse> => {
+	return await makeRestApiRequest(
+		context,
+		'POST',
+		'/ai/generate-curl',
+		payload as unknown as IDataObject,
+	);
+};
diff --git a/packages/editor-ui/src/api/api-keys.ts b/packages/editor-ui/src/api/api-keys.ts
index f864ffbe17364..b7d2206c43074 100644
--- a/packages/editor-ui/src/api/api-keys.ts
+++ b/packages/editor-ui/src/api/api-keys.ts
@@ -1,14 +1,14 @@
 import type { IRestApiContext } from '@/Interface';
-import { makeRestApiRequest } from '@/utils';
+import { makeRestApiRequest } from '@/utils/apiUtils';
 
-export function getApiKey(context: IRestApiContext): Promise<{ apiKey: string | null }> {
-	return makeRestApiRequest(context, 'GET', '/me/api-key');
+export async function getApiKey(context: IRestApiContext): Promise<{ apiKey: string | null }> {
+	return await makeRestApiRequest(context, 'GET', '/me/api-key');
 }
 
-export function createApiKey(context: IRestApiContext): Promise<{ apiKey: string | null }> {
-	return makeRestApiRequest(context, 'POST', '/me/api-key');
+export async function createApiKey(context: IRestApiContext): Promise<{ apiKey: string | null }> {
+	return await makeRestApiRequest(context, 'POST', '/me/api-key');
 }
 
-export function deleteApiKey(context: IRestApiContext): Promise<{ success: boolean }> {
-	return makeRestApiRequest(context, 'DELETE', '/me/api-key');
+export async function deleteApiKey(context: IRestApiContext): Promise<{ success: boolean }> {
+	return await makeRestApiRequest(context, 'DELETE', '/me/api-key');
 }
diff --git a/packages/editor-ui/src/api/cloudPlans.ts b/packages/editor-ui/src/api/cloudPlans.ts
new file mode 100644
index 0000000000000..c6acad2c54445
--- /dev/null
+++ b/packages/editor-ui/src/api/cloudPlans.ts
@@ -0,0 +1,28 @@
+import type { Cloud, IRestApiContext, InstanceUsage, LeadEnrichmentTemplates } from '@/Interface';
+import { get, post } from '@/utils/apiUtils';
+
+export async function getCurrentPlan(context: IRestApiContext): Promise<Cloud.PlanData> {
+	return await get(context.baseUrl, '/admin/cloud-plan');
+}
+
+export async function getCurrentUsage(context: IRestApiContext): Promise<InstanceUsage> {
+	return await get(context.baseUrl, '/cloud/limits');
+}
+
+export async function getCloudUserInfo(context: IRestApiContext): Promise<Cloud.UserAccount> {
+	return await get(context.baseUrl, '/cloud/proxy/user/me');
+}
+
+export async function confirmEmail(context: IRestApiContext): Promise<Cloud.UserAccount> {
+	return await post(context.baseUrl, '/cloud/proxy/user/resend-confirmation-email');
+}
+
+export async function getAdminPanelLoginCode(context: IRestApiContext): Promise<{ code: string }> {
+	return await get(context.baseUrl, '/cloud/proxy/login/code');
+}
+
+export async function fetchSuggestedTemplates(
+	context: IRestApiContext,
+): Promise<LeadEnrichmentTemplates> {
+	return await get(context.baseUrl, '/cloud/proxy/templates');
+}
diff --git a/packages/editor-ui/src/api/communityNodes.ts b/packages/editor-ui/src/api/communityNodes.ts
index ec8212bff36ba..07c73beae4c12 100644
--- a/packages/editor-ui/src/api/communityNodes.ts
+++ b/packages/editor-ui/src/api/communityNodes.ts
@@ -1,11 +1,11 @@
 import type { IRestApiContext } from '@/Interface';
 import type { PublicInstalledPackage } from 'n8n-workflow';
-import { get, post, makeRestApiRequest } from '@/utils';
+import { get, post, makeRestApiRequest } from '@/utils/apiUtils';
 
 export async function getInstalledCommunityNodes(
 	context: IRestApiContext,
 ): Promise<PublicInstalledPackage[]> {
-	const response = await get(context.baseUrl, '/nodes');
+	const response = await get(context.baseUrl, '/community-packages');
 	return response.data || [];
 }
 
@@ -13,16 +13,16 @@ export async function installNewPackage(
 	context: IRestApiContext,
 	name: string,
 ): Promise<PublicInstalledPackage> {
-	return await post(context.baseUrl, '/nodes', { name });
+	return await post(context.baseUrl, '/community-packages', { name });
 }
 
 export async function uninstallPackage(context: IRestApiContext, name: string): Promise<void> {
-	return await makeRestApiRequest(context, 'DELETE', '/nodes', { name });
+	return await makeRestApiRequest(context, 'DELETE', '/community-packages', { name });
 }
 
 export async function updatePackage(
 	context: IRestApiContext,
 	name: string,
 ): Promise<PublicInstalledPackage> {
-	return await makeRestApiRequest(context, 'PATCH', '/nodes', { name });
+	return await makeRestApiRequest(context, 'PATCH', '/community-packages', { name });
 }
diff --git a/packages/editor-ui/src/api/credentials.ee.ts b/packages/editor-ui/src/api/credentials.ee.ts
index 3067b906888d4..d6bc1cfe3c2aa 100644
--- a/packages/editor-ui/src/api/credentials.ee.ts
+++ b/packages/editor-ui/src/api/credentials.ee.ts
@@ -1,5 +1,5 @@
 import type { ICredentialsResponse, IRestApiContext, IShareCredentialsPayload } from '@/Interface';
-import { makeRestApiRequest } from '@/utils';
+import { makeRestApiRequest } from '@/utils/apiUtils';
 import type { IDataObject } from 'n8n-workflow';
 
 export async function setCredentialSharedWith(
@@ -7,7 +7,7 @@ export async function setCredentialSharedWith(
 	id: string,
 	data: IShareCredentialsPayload,
 ): Promise<ICredentialsResponse> {
-	return makeRestApiRequest(
+	return await makeRestApiRequest(
 		context,
 		'PUT',
 		`/credentials/${id}/share`,
diff --git a/packages/editor-ui/src/api/credentials.ts b/packages/editor-ui/src/api/credentials.ts
index 3bef8e9e9fe41..46b697ac32c75 100644
--- a/packages/editor-ui/src/api/credentials.ts
+++ b/packages/editor-ui/src/api/credentials.ts
@@ -3,7 +3,7 @@ import type {
 	ICredentialsResponse,
 	IRestApiContext,
 } from '@/Interface';
-import { makeRestApiRequest } from '@/utils';
+import { makeRestApiRequest } from '@/utils/apiUtils';
 import type {
 	ICredentialsDecrypted,
 	ICredentialType,
@@ -33,11 +33,11 @@ export async function createNewCredential(
 	context: IRestApiContext,
 	data: ICredentialsDecrypted,
 ): Promise<ICredentialsResponse> {
-	return makeRestApiRequest(context, 'POST', '/credentials', data as unknown as IDataObject);
+	return await makeRestApiRequest(context, 'POST', '/credentials', data as unknown as IDataObject);
 }
 
 export async function deleteCredential(context: IRestApiContext, id: string): Promise<boolean> {
-	return makeRestApiRequest(context, 'DELETE', `/credentials/${id}`);
+	return await makeRestApiRequest(context, 'DELETE', `/credentials/${id}`);
 }
 
 export async function updateCredential(
@@ -45,14 +45,19 @@ export async function updateCredential(
 	id: string,
 	data: ICredentialsDecrypted,
 ): Promise<ICredentialsResponse> {
-	return makeRestApiRequest(context, 'PATCH', `/credentials/${id}`, data as unknown as IDataObject);
+	return await makeRestApiRequest(
+		context,
+		'PATCH',
+		`/credentials/${id}`,
+		data as unknown as IDataObject,
+	);
 }
 
 export async function getCredentialData(
 	context: IRestApiContext,
 	id: string,
 ): Promise<ICredentialsDecryptedResponse | ICredentialsResponse | undefined> {
-	return makeRestApiRequest(context, 'GET', `/credentials/${id}`, {
+	return await makeRestApiRequest(context, 'GET', `/credentials/${id}`, {
 		includeData: true,
 	});
 }
@@ -62,7 +67,7 @@ export async function oAuth1CredentialAuthorize(
 	context: IRestApiContext,
 	data: ICredentialsResponse,
 ): Promise<string> {
-	return makeRestApiRequest(
+	return await makeRestApiRequest(
 		context,
 		'GET',
 		'/oauth1-credential/auth',
@@ -75,7 +80,7 @@ export async function oAuth2CredentialAuthorize(
 	context: IRestApiContext,
 	data: ICredentialsResponse,
 ): Promise<string> {
-	return makeRestApiRequest(
+	return await makeRestApiRequest(
 		context,
 		'GET',
 		'/oauth2-credential/auth',
@@ -87,5 +92,10 @@ export async function testCredential(
 	context: IRestApiContext,
 	data: INodeCredentialTestRequest,
 ): Promise<INodeCredentialTestResult> {
-	return makeRestApiRequest(context, 'POST', '/credentials/test', data as unknown as IDataObject);
+	return await makeRestApiRequest(
+		context,
+		'POST',
+		'/credentials/test',
+		data as unknown as IDataObject,
+	);
 }
diff --git a/packages/editor-ui/src/api/ctas.ts b/packages/editor-ui/src/api/ctas.ts
new file mode 100644
index 0000000000000..88a0e7da71405
--- /dev/null
+++ b/packages/editor-ui/src/api/ctas.ts
@@ -0,0 +1,8 @@
+import type { IRestApiContext } from '@/Interface';
+import { get } from '@/utils/apiUtils';
+
+export async function getBecomeCreatorCta(context: IRestApiContext): Promise<boolean> {
+	const response = await get(context.baseUrl, '/cta/become-creator');
+
+	return response;
+}
diff --git a/packages/editor-ui/src/api/curlHelper.ts b/packages/editor-ui/src/api/curlHelper.ts
index 7089201eb2e70..4727ff1704077 100644
--- a/packages/editor-ui/src/api/curlHelper.ts
+++ b/packages/editor-ui/src/api/curlHelper.ts
@@ -1,9 +1,9 @@
 import type { CurlToJSONResponse, IRestApiContext } from '@/Interface';
-import { makeRestApiRequest } from '@/utils';
+import { makeRestApiRequest } from '@/utils/apiUtils';
 
-export function getCurlToJson(
+export async function getCurlToJson(
 	context: IRestApiContext,
 	curlCommand: string,
 ): Promise<CurlToJSONResponse> {
-	return makeRestApiRequest(context, 'POST', '/curl-to-json', { curlCommand });
+	return await makeRestApiRequest(context, 'POST', '/curl-to-json', { curlCommand });
 }
diff --git a/packages/editor-ui/src/api/environments.ee.ts b/packages/editor-ui/src/api/environments.ee.ts
index f5a386a059319..e24e02c30d9f8 100644
--- a/packages/editor-ui/src/api/environments.ee.ts
+++ b/packages/editor-ui/src/api/environments.ee.ts
@@ -1,5 +1,5 @@
 import type { EnvironmentVariable, IRestApiContext } from '@/Interface';
-import { makeRestApiRequest } from '@/utils';
+import { makeRestApiRequest } from '@/utils/apiUtils';
 import type { IDataObject } from 'n8n-workflow';
 
 export async function getVariables(context: IRestApiContext): Promise<EnvironmentVariable[]> {
diff --git a/packages/editor-ui/src/api/eventbus.ee.ts b/packages/editor-ui/src/api/eventbus.ee.ts
index a979a63fe92c2..fc2b7f760e683 100644
--- a/packages/editor-ui/src/api/eventbus.ee.ts
+++ b/packages/editor-ui/src/api/eventbus.ee.ts
@@ -1,5 +1,5 @@
 import type { IRestApiContext } from '@/Interface';
-import { makeRestApiRequest } from '@/utils';
+import { makeRestApiRequest } from '@/utils/apiUtils';
 import type { IDataObject, MessageEventBusDestinationOptions } from 'n8n-workflow';
 
 export async function saveDestinationToDb(
@@ -12,12 +12,12 @@ export async function saveDestinationToDb(
 			...destination,
 			subscribedEvents,
 		};
-		return makeRestApiRequest(context, 'POST', '/eventbus/destination', data);
+		return await makeRestApiRequest(context, 'POST', '/eventbus/destination', data);
 	}
 }
 
 export async function deleteDestinationFromDb(context: IRestApiContext, destinationId: string) {
-	return makeRestApiRequest(context, 'DELETE', `/eventbus/destination?id=${destinationId}`);
+	return await makeRestApiRequest(context, 'DELETE', `/eventbus/destination?id=${destinationId}`);
 }
 
 export async function sendTestMessageToDestination(
@@ -28,27 +28,27 @@ export async function sendTestMessageToDestination(
 		const data: IDataObject = {
 			...destination,
 		};
-		return makeRestApiRequest(context, 'GET', '/eventbus/testmessage', data);
+		return await makeRestApiRequest(context, 'GET', '/eventbus/testmessage', data);
 	}
 }
 
 export async function getEventNamesFromBackend(context: IRestApiContext): Promise<string[]> {
-	return makeRestApiRequest(context, 'GET', '/eventbus/eventnames');
+	return await makeRestApiRequest(context, 'GET', '/eventbus/eventnames');
 }
 
 export async function getDestinationsFromBackend(
 	context: IRestApiContext,
 ): Promise<MessageEventBusDestinationOptions[]> {
-	return makeRestApiRequest(context, 'GET', '/eventbus/destination');
+	return await makeRestApiRequest(context, 'GET', '/eventbus/destination');
 }
 
 export async function getExecutionEvents(context: IRestApiContext, executionId: string) {
-	return makeRestApiRequest(context, 'GET', `/eventbus/execution/${executionId}`);
+	return await makeRestApiRequest(context, 'GET', `/eventbus/execution/${executionId}`);
 }
 
 export async function recoverExecutionDataFromEvents(
 	context: IRestApiContext,
 	executionId: string,
 ) {
-	return makeRestApiRequest(context, 'GET', `/eventbus/execution-recover/${executionId}`);
+	return await makeRestApiRequest(context, 'GET', `/eventbus/execution-recover/${executionId}`);
 }
diff --git a/packages/editor-ui/src/api/externalSecrets.ee.ts b/packages/editor-ui/src/api/externalSecrets.ee.ts
new file mode 100644
index 0000000000000..69c48f457cc3e
--- /dev/null
+++ b/packages/editor-ui/src/api/externalSecrets.ee.ts
@@ -0,0 +1,58 @@
+import type {
+	IRestApiContext,
+	ExternalSecretsProvider,
+	ExternalSecretsProviderWithProperties,
+} from '@/Interface';
+import { makeRestApiRequest } from '@/utils/apiUtils';
+
+export const getExternalSecrets = async (
+	context: IRestApiContext,
+): Promise<Record<string, string[]>> => {
+	return await makeRestApiRequest(context, 'GET', '/external-secrets/secrets');
+};
+
+export const getExternalSecretsProviders = async (
+	context: IRestApiContext,
+): Promise<ExternalSecretsProvider[]> => {
+	return await makeRestApiRequest(context, 'GET', '/external-secrets/providers');
+};
+
+export const getExternalSecretsProvider = async (
+	context: IRestApiContext,
+	id: string,
+): Promise<ExternalSecretsProviderWithProperties> => {
+	return await makeRestApiRequest(context, 'GET', `/external-secrets/providers/${id}`);
+};
+
+export const testExternalSecretsProviderConnection = async (
+	context: IRestApiContext,
+	id: string,
+	data: ExternalSecretsProvider['data'],
+): Promise<{ testState: ExternalSecretsProvider['state'] }> => {
+	return await makeRestApiRequest(context, 'POST', `/external-secrets/providers/${id}/test`, data);
+};
+
+export const updateProvider = async (
+	context: IRestApiContext,
+	id: string,
+	data: ExternalSecretsProvider['data'],
+): Promise<boolean> => {
+	return await makeRestApiRequest(context, 'POST', `/external-secrets/providers/${id}`, data);
+};
+
+export const reloadProvider = async (
+	context: IRestApiContext,
+	id: string,
+): Promise<{ updated: boolean }> => {
+	return await makeRestApiRequest(context, 'POST', `/external-secrets/providers/${id}/update`);
+};
+
+export const connectProvider = async (
+	context: IRestApiContext,
+	id: string,
+	connected: boolean,
+): Promise<boolean> => {
+	return await makeRestApiRequest(context, 'POST', `/external-secrets/providers/${id}/connect`, {
+		connected,
+	});
+};
diff --git a/packages/editor-ui/src/api/invitation.ts b/packages/editor-ui/src/api/invitation.ts
new file mode 100644
index 0000000000000..f2c7c4c8e0532
--- /dev/null
+++ b/packages/editor-ui/src/api/invitation.ts
@@ -0,0 +1,33 @@
+import type {
+	CurrentUserResponse,
+	IInviteResponse,
+	IRestApiContext,
+	InvitableRoleName,
+} from '@/Interface';
+import type { IDataObject } from 'n8n-workflow';
+import { makeRestApiRequest } from '@/utils/apiUtils';
+
+type AcceptInvitationParams = {
+	inviterId: string;
+	inviteeId: string;
+	firstName: string;
+	lastName: string;
+	password: string;
+};
+
+export async function inviteUsers(
+	context: IRestApiContext,
+	params: Array<{ email: string; role: InvitableRoleName }>,
+) {
+	return await makeRestApiRequest<IInviteResponse[]>(context, 'POST', '/invitations', params);
+}
+
+export async function acceptInvitation(context: IRestApiContext, params: AcceptInvitationParams) {
+	const { inviteeId, ...props } = params;
+	return await makeRestApiRequest<CurrentUserResponse>(
+		context,
+		'POST',
+		`/invitations/${params.inviteeId}/accept`,
+		props as unknown as IDataObject,
+	);
+}
diff --git a/packages/editor-ui/src/api/ldap.ts b/packages/editor-ui/src/api/ldap.ts
index 2daa45905c782..7f1e4bbd69a1b 100644
--- a/packages/editor-ui/src/api/ldap.ts
+++ b/packages/editor-ui/src/api/ldap.ts
@@ -1,29 +1,34 @@
 import type { ILdapConfig, ILdapSyncData, IRestApiContext } from '@/Interface';
-import { makeRestApiRequest } from '@/utils';
+import { makeRestApiRequest } from '@/utils/apiUtils';
 import type { IDataObject } from 'n8n-workflow';
 
-export function getLdapConfig(context: IRestApiContext): Promise<ILdapConfig> {
-	return makeRestApiRequest(context, 'GET', '/ldap/config');
+export async function getLdapConfig(context: IRestApiContext): Promise<ILdapConfig> {
+	return await makeRestApiRequest(context, 'GET', '/ldap/config');
 }
 
-export function testLdapConnection(context: IRestApiContext): Promise<{}> {
-	return makeRestApiRequest(context, 'POST', '/ldap/test-connection');
+export async function testLdapConnection(context: IRestApiContext): Promise<{}> {
+	return await makeRestApiRequest(context, 'POST', '/ldap/test-connection');
 }
 
-export function updateLdapConfig(
+export async function updateLdapConfig(
 	context: IRestApiContext,
 	adConfig: ILdapConfig,
 ): Promise<ILdapConfig> {
-	return makeRestApiRequest(context, 'PUT', '/ldap/config', adConfig as unknown as IDataObject);
+	return await makeRestApiRequest(
+		context,
+		'PUT',
+		'/ldap/config',
+		adConfig as unknown as IDataObject,
+	);
 }
 
-export function runLdapSync(context: IRestApiContext, data: IDataObject): Promise<{}> {
-	return makeRestApiRequest(context, 'POST', '/ldap/sync', data as unknown as IDataObject);
+export async function runLdapSync(context: IRestApiContext, data: IDataObject): Promise<{}> {
+	return await makeRestApiRequest(context, 'POST', '/ldap/sync', data as unknown as IDataObject);
 }
 
-export function getLdapSynchronizations(
+export async function getLdapSynchronizations(
 	context: IRestApiContext,
 	pagination: { page: number },
 ): Promise<ILdapSyncData[]> {
-	return makeRestApiRequest(context, 'GET', '/ldap/sync', pagination);
+	return await makeRestApiRequest(context, 'GET', '/ldap/sync', pagination);
 }
diff --git a/packages/editor-ui/src/api/mfa.ts b/packages/editor-ui/src/api/mfa.ts
new file mode 100644
index 0000000000000..dcc5d2131399e
--- /dev/null
+++ b/packages/editor-ui/src/api/mfa.ts
@@ -0,0 +1,23 @@
+import type { IRestApiContext } from '@/Interface';
+import { makeRestApiRequest } from '@/utils/apiUtils';
+
+export async function getMfaQR(
+	context: IRestApiContext,
+): Promise<{ qrCode: string; secret: string; recoveryCodes: string[] }> {
+	return await makeRestApiRequest(context, 'GET', '/mfa/qr');
+}
+
+export async function enableMfa(context: IRestApiContext, data: { token: string }): Promise<void> {
+	return await makeRestApiRequest(context, 'POST', '/mfa/enable', data);
+}
+
+export async function verifyMfaToken(
+	context: IRestApiContext,
+	data: { token: string },
+): Promise<void> {
+	return await makeRestApiRequest(context, 'POST', '/mfa/verify', data);
+}
+
+export async function disableMfa(context: IRestApiContext): Promise<void> {
+	return await makeRestApiRequest(context, 'DELETE', '/mfa/disable');
+}
diff --git a/packages/editor-ui/src/api/nodeTypes.ts b/packages/editor-ui/src/api/nodeTypes.ts
index 7c7b97a025d28..6ef49c563f026 100644
--- a/packages/editor-ui/src/api/nodeTypes.ts
+++ b/packages/editor-ui/src/api/nodeTypes.ts
@@ -1,20 +1,13 @@
-import { makeRestApiRequest } from '@/utils';
+import { makeRestApiRequest } from '@/utils/apiUtils';
+import type { DynamicNodeParameters, INodeTranslationHeaders, IRestApiContext } from '@/Interface';
 import type {
-	INodeTranslationHeaders,
-	IResourceLocatorReqParams,
-	IRestApiContext,
-} from '@/Interface';
-import type {
-	IDataObject,
-	ILoadOptions,
-	INodeCredentials,
 	INodeListSearchResult,
-	INodeParameters,
 	INodePropertyOptions,
 	INodeTypeDescription,
 	INodeTypeNameVersion,
 } from 'n8n-workflow';
 import axios from 'axios';
+import type { ResourceMapperFields } from 'n8n-workflow/src/Interfaces';
 
 export async function getNodeTypes(baseUrl: string) {
 	const { data } = await axios.get(baseUrl + 'types/nodes.json', { withCredentials: true });
@@ -24,38 +17,43 @@ export async function getNodeTypes(baseUrl: string) {
 export async function getNodeTranslationHeaders(
 	context: IRestApiContext,
 ): Promise<INodeTranslationHeaders | undefined> {
-	return makeRestApiRequest(context, 'GET', '/node-translation-headers');
+	return await makeRestApiRequest(context, 'GET', '/node-translation-headers');
 }
 
 export async function getNodesInformation(
 	context: IRestApiContext,
 	nodeInfos: INodeTypeNameVersion[],
 ): Promise<INodeTypeDescription[]> {
-	return makeRestApiRequest(context, 'POST', '/node-types', { nodeInfos });
+	return await makeRestApiRequest(context, 'POST', '/node-types', { nodeInfos });
 }
 
 export async function getNodeParameterOptions(
 	context: IRestApiContext,
-	sendData: {
-		nodeTypeAndVersion: INodeTypeNameVersion;
-		path: string;
-		methodName?: string;
-		loadOptions?: ILoadOptions;
-		currentNodeParameters: INodeParameters;
-		credentials?: INodeCredentials;
-	},
+	sendData: DynamicNodeParameters.OptionsRequest,
 ): Promise<INodePropertyOptions[]> {
-	return makeRestApiRequest(context, 'GET', '/node-parameter-options', sendData);
+	return await makeRestApiRequest(context, 'GET', '/dynamic-node-parameters/options', sendData);
 }
 
 export async function getResourceLocatorResults(
 	context: IRestApiContext,
-	sendData: IResourceLocatorReqParams,
+	sendData: DynamicNodeParameters.ResourceLocatorResultsRequest,
 ): Promise<INodeListSearchResult> {
-	return makeRestApiRequest(
+	return await makeRestApiRequest(
+		context,
+		'GET',
+		'/dynamic-node-parameters/resource-locator-results',
+		sendData,
+	);
+}
+
+export async function getResourceMapperFields(
+	context: IRestApiContext,
+	sendData: DynamicNodeParameters.ResourceMapperFieldsRequest,
+): Promise<ResourceMapperFields> {
+	return await makeRestApiRequest(
 		context,
 		'GET',
-		'/nodes-list-search',
-		sendData as unknown as IDataObject,
+		'/dynamic-node-parameters/resource-mapper-fields',
+		sendData,
 	);
 }
diff --git a/packages/editor-ui/src/api/orchestration.ts b/packages/editor-ui/src/api/orchestration.ts
new file mode 100644
index 0000000000000..4c8e1cd1e0d33
--- /dev/null
+++ b/packages/editor-ui/src/api/orchestration.ts
@@ -0,0 +1,8 @@
+import type { IRestApiContext } from '@/Interface';
+import { makeRestApiRequest } from '@/utils/apiUtils';
+
+const GET_STATUS_ENDPOINT = '/orchestration/worker/status';
+
+export const sendGetWorkerStatus = async (context: IRestApiContext): Promise<void> => {
+	await makeRestApiRequest(context, 'POST', GET_STATUS_ENDPOINT);
+};
diff --git a/packages/editor-ui/src/api/settings.ts b/packages/editor-ui/src/api/settings.ts
index cdd19d976a1f8..bfd2e9c0b3cc4 100644
--- a/packages/editor-ui/src/api/settings.ts
+++ b/packages/editor-ui/src/api/settings.ts
@@ -4,12 +4,12 @@ import type {
 	IN8nValueSurveyData,
 	IN8nPromptResponse,
 } from '../Interface';
-import { makeRestApiRequest, get, post } from '@/utils';
+import { makeRestApiRequest, get, post } from '@/utils/apiUtils';
 import { N8N_IO_BASE_URL, NPM_COMMUNITY_NODE_SEARCH_API_URL } from '@/constants';
 import type { IN8nUISettings } from 'n8n-workflow';
 
-export function getSettings(context: IRestApiContext): Promise<IN8nUISettings> {
-	return makeRestApiRequest(context, 'GET', '/settings');
+export async function getSettings(context: IRestApiContext): Promise<IN8nUISettings> {
+	return await makeRestApiRequest(context, 'GET', '/settings');
 }
 
 export async function getPromptsData(instanceId: string, userId: string): Promise<IN8nPrompts> {
diff --git a/packages/editor-ui/src/api/sourceControl.ts b/packages/editor-ui/src/api/sourceControl.ts
new file mode 100644
index 0000000000000..615c7d666043a
--- /dev/null
+++ b/packages/editor-ui/src/api/sourceControl.ts
@@ -0,0 +1,82 @@
+import type { IDataObject } from 'n8n-workflow';
+import type {
+	IRestApiContext,
+	SourceControlAggregatedFile,
+	SourceControlPreferences,
+	SourceControlStatus,
+	SshKeyTypes,
+} from '@/Interface';
+import { makeRestApiRequest } from '@/utils/apiUtils';
+import type { TupleToUnion } from '@/utils/typeHelpers';
+
+const sourceControlApiRoot = '/source-control';
+
+const createPreferencesRequestFn =
+	(method: 'POST' | 'PATCH') =>
+	async (
+		context: IRestApiContext,
+		preferences: Partial<SourceControlPreferences>,
+	): Promise<SourceControlPreferences> =>
+		await makeRestApiRequest(context, method, `${sourceControlApiRoot}/preferences`, preferences);
+
+export const pushWorkfolder = async (
+	context: IRestApiContext,
+	data: IDataObject,
+): Promise<void> => {
+	return await makeRestApiRequest(context, 'POST', `${sourceControlApiRoot}/push-workfolder`, data);
+};
+
+export const pullWorkfolder = async (
+	context: IRestApiContext,
+	data: IDataObject,
+): Promise<void> => {
+	return await makeRestApiRequest(context, 'POST', `${sourceControlApiRoot}/pull-workfolder`, data);
+};
+
+export const getBranches = async (
+	context: IRestApiContext,
+): Promise<{ branches: string[]; currentBranch: string }> => {
+	return await makeRestApiRequest(context, 'GET', `${sourceControlApiRoot}/get-branches`);
+};
+
+export const savePreferences = createPreferencesRequestFn('POST');
+export const updatePreferences = createPreferencesRequestFn('PATCH');
+
+export const getPreferences = async (
+	context: IRestApiContext,
+): Promise<SourceControlPreferences> => {
+	return await makeRestApiRequest(context, 'GET', `${sourceControlApiRoot}/preferences`);
+};
+
+export const getStatus = async (context: IRestApiContext): Promise<SourceControlStatus> => {
+	return await makeRestApiRequest(context, 'GET', `${sourceControlApiRoot}/status`);
+};
+
+export const getAggregatedStatus = async (
+	context: IRestApiContext,
+	options: {
+		direction: 'push' | 'pull';
+		preferLocalVersion: boolean;
+		verbose: boolean;
+	} = { direction: 'push', preferLocalVersion: true, verbose: false },
+): Promise<SourceControlAggregatedFile[]> => {
+	return await makeRestApiRequest(context, 'GET', `${sourceControlApiRoot}/get-status`, options);
+};
+
+export const disconnect = async (
+	context: IRestApiContext,
+	keepKeyPair: boolean,
+): Promise<string> => {
+	return await makeRestApiRequest(context, 'POST', `${sourceControlApiRoot}/disconnect`, {
+		keepKeyPair,
+	});
+};
+
+export const generateKeyPair = async (
+	context: IRestApiContext,
+	keyGeneratorType?: TupleToUnion<SshKeyTypes>,
+): Promise<string> => {
+	return await makeRestApiRequest(context, 'POST', `${sourceControlApiRoot}/generate-key-pair`, {
+		keyGeneratorType,
+	});
+};
diff --git a/packages/editor-ui/src/api/sso.ts b/packages/editor-ui/src/api/sso.ts
index 867a7799f9a63..95b0425e95e8e 100644
--- a/packages/editor-ui/src/api/sso.ts
+++ b/packages/editor-ui/src/api/sso.ts
@@ -1,4 +1,4 @@
-import { makeRestApiRequest } from '@/utils';
+import { makeRestApiRequest } from '@/utils/apiUtils';
 import type {
 	IRestApiContext,
 	SamlPreferencesLoginEnabled,
@@ -6,34 +6,34 @@ import type {
 	SamlPreferencesExtractedData,
 } from '@/Interface';
 
-export const initSSO = (context: IRestApiContext): Promise<string> => {
-	return makeRestApiRequest(context, 'GET', '/sso/saml/initsso');
+export const initSSO = async (context: IRestApiContext): Promise<string> => {
+	return await makeRestApiRequest(context, 'GET', '/sso/saml/initsso');
 };
 
-export const getSamlMetadata = (context: IRestApiContext): Promise<SamlPreferences> => {
-	return makeRestApiRequest(context, 'GET', '/sso/saml/metadata');
+export const getSamlMetadata = async (context: IRestApiContext): Promise<SamlPreferences> => {
+	return await makeRestApiRequest(context, 'GET', '/sso/saml/metadata');
 };
 
-export const getSamlConfig = (
+export const getSamlConfig = async (
 	context: IRestApiContext,
 ): Promise<SamlPreferences & SamlPreferencesExtractedData> => {
-	return makeRestApiRequest(context, 'GET', '/sso/saml/config');
+	return await makeRestApiRequest(context, 'GET', '/sso/saml/config');
 };
 
-export const saveSamlConfig = (
+export const saveSamlConfig = async (
 	context: IRestApiContext,
 	data: SamlPreferences,
 ): Promise<SamlPreferences | undefined> => {
-	return makeRestApiRequest(context, 'POST', '/sso/saml/config', data);
+	return await makeRestApiRequest(context, 'POST', '/sso/saml/config', data);
 };
 
-export const toggleSamlConfig = (
+export const toggleSamlConfig = async (
 	context: IRestApiContext,
 	data: SamlPreferencesLoginEnabled,
 ): Promise<void> => {
-	return makeRestApiRequest(context, 'POST', '/sso/saml/config/toggle', data);
+	return await makeRestApiRequest(context, 'POST', '/sso/saml/config/toggle', data);
 };
 
-export const testSamlConfig = (context: IRestApiContext): Promise<string> => {
-	return makeRestApiRequest(context, 'GET', '/sso/saml/config/test');
+export const testSamlConfig = async (context: IRestApiContext): Promise<string> => {
+	return await makeRestApiRequest(context, 'GET', '/sso/saml/config/test');
 };
diff --git a/packages/editor-ui/src/api/tags.ts b/packages/editor-ui/src/api/tags.ts
index 88937cf2e857a..7442a40ef16cf 100644
--- a/packages/editor-ui/src/api/tags.ts
+++ b/packages/editor-ui/src/api/tags.ts
@@ -1,5 +1,5 @@
 import type { IRestApiContext, ITag } from '@/Interface';
-import { makeRestApiRequest } from '@/utils';
+import { makeRestApiRequest } from '@/utils/apiUtils';
 
 export async function getTags(context: IRestApiContext, withUsageCount = false): Promise<ITag[]> {
 	return await makeRestApiRequest(context, 'GET', '/tags', { withUsageCount });
diff --git a/packages/editor-ui/src/api/templates.ts b/packages/editor-ui/src/api/templates.ts
index 46b4bf2f3e9e5..9938852f36645 100644
--- a/packages/editor-ui/src/api/templates.ts
+++ b/packages/editor-ui/src/api/templates.ts
@@ -6,23 +6,24 @@ import type {
 	ITemplatesCollectionResponse,
 	ITemplatesWorkflowResponse,
 	IWorkflowTemplate,
+	TemplateSearchFacet,
 } from '@/Interface';
 import type { IDataObject } from 'n8n-workflow';
-import { get } from '@/utils';
+import { get } from '@/utils/apiUtils';
 
 function stringifyArray(arr: number[]) {
 	return arr.join(',');
 }
 
-export function testHealthEndpoint(apiEndpoint: string) {
-	return get(apiEndpoint, '/health');
+export async function testHealthEndpoint(apiEndpoint: string) {
+	return await get(apiEndpoint, '/health');
 }
 
-export function getCategories(
+export async function getCategories(
 	apiEndpoint: string,
 	headers?: IDataObject,
 ): Promise<{ categories: ITemplatesCategory[] }> {
-	return get(apiEndpoint, '/templates/categories', undefined, headers);
+	return await get(apiEndpoint, '/templates/categories', undefined, headers);
 }
 
 export async function getCollections(
@@ -40,14 +41,18 @@ export async function getCollections(
 
 export async function getWorkflows(
 	apiEndpoint: string,
-	query: { skip: number; limit: number; categories: number[]; search: string },
+	query: { page: number; limit: number; categories: number[]; search: string },
 	headers?: IDataObject,
-): Promise<{ totalWorkflows: number; workflows: ITemplatesWorkflow[] }> {
-	return get(
+): Promise<{
+	totalWorkflows: number;
+	workflows: ITemplatesWorkflow[];
+	filters: TemplateSearchFacet[];
+}> {
+	return await get(
 		apiEndpoint,
-		'/templates/workflows',
+		'/templates/search',
 		{
-			skip: query.skip,
+			page: query.page,
 			rows: query.limit,
 			category: stringifyArray(query.categories),
 			search: query.search,
diff --git a/packages/editor-ui/src/api/ui.ts b/packages/editor-ui/src/api/ui.ts
new file mode 100644
index 0000000000000..5b27669e53b85
--- /dev/null
+++ b/packages/editor-ui/src/api/ui.ts
@@ -0,0 +1,12 @@
+import type { IRestApiContext } from '@/Interface';
+import { makeRestApiRequest } from '@/utils/apiUtils';
+import type { BannerName } from 'n8n-workflow';
+
+export async function dismissBannerPermanently(
+	context: IRestApiContext,
+	data: { bannerName: BannerName; dismissedBanners: string[] },
+): Promise<void> {
+	return await makeRestApiRequest(context, 'POST', '/owner/dismiss-banner', {
+		banner: data.bannerName,
+	});
+}
diff --git a/packages/editor-ui/src/api/usage.ts b/packages/editor-ui/src/api/usage.ts
index 8d79f59e7761b..77ce3e3e1a0f1 100644
--- a/packages/editor-ui/src/api/usage.ts
+++ b/packages/editor-ui/src/api/usage.ts
@@ -1,17 +1,36 @@
-import { makeRestApiRequest } from '@/utils';
+import { makeRestApiRequest, request } from '@/utils/apiUtils';
 import type { IRestApiContext, UsageState } from '@/Interface';
 
-export const getLicense = (context: IRestApiContext): Promise<UsageState['data']> => {
-	return makeRestApiRequest(context, 'GET', '/license');
+export const getLicense = async (context: IRestApiContext): Promise<UsageState['data']> => {
+	return await makeRestApiRequest(context, 'GET', '/license');
 };
 
-export const activateLicenseKey = (
+export const activateLicenseKey = async (
 	context: IRestApiContext,
 	data: { activationKey: string },
 ): Promise<UsageState['data']> => {
-	return makeRestApiRequest(context, 'POST', '/license/activate', data);
+	return await makeRestApiRequest(context, 'POST', '/license/activate', data);
 };
 
-export const renewLicense = (context: IRestApiContext): Promise<UsageState['data']> => {
-	return makeRestApiRequest(context, 'POST', '/license/renew');
+export const renewLicense = async (context: IRestApiContext): Promise<UsageState['data']> => {
+	return await makeRestApiRequest(context, 'POST', '/license/renew');
+};
+
+export const requestLicenseTrial = async (data: {
+	licenseType: 'enterprise';
+	firstName: string;
+	lastName: string;
+	email: string;
+	instanceUrl: string;
+}): Promise<UsageState['data']> => {
+	return await request({
+		method: 'POST',
+		baseURL: 'https://enterprise.n8n.io',
+		endpoint: '/enterprise-trial',
+		data,
+		withCredentials: false,
+		headers: {
+			'Content-Type': 'application/json',
+		},
+	});
 };
diff --git a/packages/editor-ui/src/api/users.ts b/packages/editor-ui/src/api/users.ts
index 7ad7cdb3b9a85..3c39c86b10780 100644
--- a/packages/editor-ui/src/api/users.ts
+++ b/packages/editor-ui/src/api/users.ts
@@ -1,65 +1,70 @@
 import type {
 	CurrentUserResponse,
-	GenerateOTPSecretResponse,
-	IInviteResponse,
 	IPersonalizationLatestVersion,
 	IRestApiContext,
 	IUserResponse,
+	InvitableRoleName,
+	GenerateOTPSecretResponse,
 } from '@/Interface';
 import type { IDataObject } from 'n8n-workflow';
 import { makeRestApiRequest } from '@/utils/apiUtils';
 
-export function loginCurrentUser(context: IRestApiContext): Promise<CurrentUserResponse | null> {
-	return makeRestApiRequest(context, 'GET', '/login');
-}
-
-export function generateOTPSecret(context: IRestApiContext): Promise<GenerateOTPSecretResponse> {
-	return makeRestApiRequest(context, 'POST', '/otp-secret');
+export async function loginCurrentUser(
+	context: IRestApiContext,
+): Promise<CurrentUserResponse | null> {
+	return await makeRestApiRequest(context, 'GET', '/login');
 }
 
-export function login(
+export async function login(
 	context: IRestApiContext,
-	params: { email: string; password: string },
+	params: {
+		email: string;
+		password: string;
+		mfaToken?: string;
+		mfaRecoveryToken?: string;
+		otp?: string;
+	},
 ): Promise<CurrentUserResponse> {
-	return makeRestApiRequest(context, 'POST', '/login', params);
+	return await makeRestApiRequest(context, 'POST', '/login', params);
 }
 
 export async function logout(context: IRestApiContext): Promise<void> {
 	await makeRestApiRequest(context, 'POST', '/logout');
 }
 
-export function preOwnerSetup(
+export async function generateOTPSecret(
 	context: IRestApiContext,
-): Promise<{ credentials: number; workflows: number }> {
-	return makeRestApiRequest(context, 'GET', '/owner/pre-setup');
+): Promise<GenerateOTPSecretResponse> {
+	return await makeRestApiRequest(context, 'POST', '/otp-secret');
 }
 
-export function setupOwner(
+export async function setupOwner(
 	context: IRestApiContext,
 	params: {
 		firstName: string;
 		lastName: string;
 		email: string;
 		password: string;
-		otp: string;
 		otpSecret: string;
+		otp: string;
 	},
-): Promise<IUserResponse> {
-	return makeRestApiRequest(context, 'POST', '/owner/setup', params as unknown as IDataObject);
-}
-
-export function skipOwnerSetup(context: IRestApiContext): Promise<void> {
-	return makeRestApiRequest(context, 'POST', '/owner/skip-setup');
+): Promise<CurrentUserResponse> {
+	return await makeRestApiRequest(
+		context,
+		'POST',
+		'/owner/setup',
+		params as unknown as IDataObject,
+	);
 }
 
-export function validateSignupToken(
+export async function validateSignupToken(
 	context: IRestApiContext,
 	params: { inviterId: string; inviteeId: string },
 ): Promise<{ inviter: { firstName: string; lastName: string } }> {
-	return makeRestApiRequest(context, 'GET', '/resolve-signup-token', params);
+	return await makeRestApiRequest(context, 'GET', '/resolve-signup-token', params);
 }
 
-export function signup(
+export async function signup(
 	context: IRestApiContext,
 	params: {
 		inviterId: string;
@@ -70,7 +75,7 @@ export function signup(
 	},
 ): Promise<CurrentUserResponse> {
 	const { inviteeId, ...props } = params;
-	return makeRestApiRequest(
+	return await makeRestApiRequest(
 		context,
 		'POST',
 		`/users/${params.inviteeId}`,
@@ -87,19 +92,19 @@ export async function sendForgotPasswordEmail(
 
 export async function validatePasswordToken(
 	context: IRestApiContext,
-	params: { token: string; userId: string },
+	params: { token: string },
 ): Promise<void> {
 	await makeRestApiRequest(context, 'GET', '/resolve-password-token', params);
 }
 
 export async function changePassword(
 	context: IRestApiContext,
-	params: { token: string; password: string; userId: string },
+	params: { token: string; password: string; mfaToken?: string },
 ): Promise<void> {
 	await makeRestApiRequest(context, 'POST', '/change-password', params);
 }
 
-export function updateCurrentUser(
+export async function updateCurrentUser(
 	context: IRestApiContext,
 	params: {
 		id?: string;
@@ -108,21 +113,34 @@ export function updateCurrentUser(
 		email: string;
 	},
 ): Promise<IUserResponse> {
-	return makeRestApiRequest(context, 'PATCH', '/me', params as unknown as IDataObject);
+	return await makeRestApiRequest(context, 'PATCH', '/me', params as unknown as IDataObject);
 }
 
-export function updateCurrentUserSettings(
+export async function updateCurrentUserSettings(
 	context: IRestApiContext,
 	settings: IUserResponse['settings'],
 ): Promise<IUserResponse['settings']> {
-	return makeRestApiRequest(context, 'PATCH', '/me/settings', settings);
+	return await makeRestApiRequest(context, 'PATCH', '/me/settings', settings as IDataObject);
 }
 
-export function updateCurrentUserPassword(
+export async function updateOtherUserSettings(
+	context: IRestApiContext,
+	userId: string,
+	settings: IUserResponse['settings'],
+): Promise<IUserResponse['settings']> {
+	return await makeRestApiRequest(
+		context,
+		'PATCH',
+		`/users/${userId}/settings`,
+		settings as IDataObject,
+	);
+}
+
+export async function updateCurrentUserPassword(
 	context: IRestApiContext,
 	params: { newPassword: string; currentPassword: string },
 ): Promise<void> {
-	return makeRestApiRequest(context, 'PATCH', '/me/password', params);
+	return await makeRestApiRequest(context, 'PATCH', '/me/password', params);
 }
 
 export async function deleteUser(
@@ -132,26 +150,22 @@ export async function deleteUser(
 	await makeRestApiRequest(context, 'DELETE', `/users/${id}`, transferId ? { transferId } : {});
 }
 
-export function getUsers(context: IRestApiContext): Promise<IUserResponse[]> {
-	return makeRestApiRequest(context, 'GET', '/users');
+export async function getUsers(context: IRestApiContext): Promise<IUserResponse[]> {
+	return await makeRestApiRequest(context, 'GET', '/users');
 }
 
-export function inviteUsers(
+export async function getInviteLink(
 	context: IRestApiContext,
-	params: Array<{ email: string }>,
-): Promise<IInviteResponse[]> {
-	return makeRestApiRequest(context, 'POST', '/users', params as unknown as IDataObject);
-}
-
-export async function reinvite(context: IRestApiContext, { id }: { id: string }): Promise<void> {
-	await makeRestApiRequest(context, 'POST', `/users/${id}/reinvite`);
+	{ id }: { id: string },
+): Promise<{ link: string }> {
+	return await makeRestApiRequest(context, 'GET', `/users/${id}/invite-link`);
 }
 
-export async function getInviteLink(
+export async function getPasswordResetLink(
 	context: IRestApiContext,
 	{ id }: { id: string },
 ): Promise<{ link: string }> {
-	return await makeRestApiRequest(context, 'GET', `/users/${id}/invite-link`);
+	return await makeRestApiRequest(context, 'GET', `/users/${id}/password-reset-link`);
 }
 
 export async function submitPersonalizationSurvey(
@@ -160,3 +174,15 @@ export async function submitPersonalizationSurvey(
 ): Promise<void> {
 	await makeRestApiRequest(context, 'POST', '/me/survey', params as unknown as IDataObject);
 }
+
+export interface UpdateGlobalRolePayload {
+	id: string;
+	newRoleName: InvitableRoleName;
+}
+
+export async function updateGlobalRole(
+	context: IRestApiContext,
+	{ id, newRoleName }: UpdateGlobalRolePayload,
+): Promise<IUserResponse> {
+	return await makeRestApiRequest(context, 'PATCH', `/users/${id}/role`, { newRoleName });
+}
diff --git a/packages/editor-ui/src/api/versions.ts b/packages/editor-ui/src/api/versions.ts
index 4896318bfa283..307688052b730 100644
--- a/packages/editor-ui/src/api/versions.ts
+++ b/packages/editor-ui/src/api/versions.ts
@@ -1,6 +1,6 @@
 import type { IVersion } from '@/Interface';
 import { INSTANCE_ID_HEADER } from '@/constants';
-import { get } from '@/utils';
+import { get } from '@/utils/apiUtils';
 
 export async function getNextVersions(
 	endpoint: string,
diff --git a/packages/editor-ui/src/api/workflow-webhooks.ts b/packages/editor-ui/src/api/workflow-webhooks.ts
index a6f4e92a67e50..a84de1c9221dc 100644
--- a/packages/editor-ui/src/api/workflow-webhooks.ts
+++ b/packages/editor-ui/src/api/workflow-webhooks.ts
@@ -1,6 +1,6 @@
 import type { IOnboardingCallPrompt, IUser } from '@/Interface';
-import { IOnboardingCallPromptResponse } from '@/Interface';
-import { get, post } from '@/utils';
+import { get, post } from '@/utils/apiUtils';
+import { isUserGlobalOwner } from '@/utils/userUtils';
 
 const N8N_API_BASE_URL = 'https://api.n8n.io/api';
 const ONBOARDING_PROMPTS_ENDPOINT = '/prompts/onboarding';
@@ -8,25 +8,25 @@ const CONTACT_EMAIL_SUBMISSION_ENDPOINT = '/accounts/onboarding';
 
 export async function fetchNextOnboardingPrompt(
 	instanceId: string,
-	currentUer: IUser,
+	currentUser: IUser,
 ): Promise<IOnboardingCallPrompt> {
 	return await get(N8N_API_BASE_URL, ONBOARDING_PROMPTS_ENDPOINT, {
 		instance_id: instanceId,
-		user_id: `${instanceId}#${currentUer.id}`,
-		is_owner: currentUer.isOwner,
-		survey_results: currentUer.personalizationAnswers,
+		user_id: `${instanceId}#${currentUser.id}`,
+		is_owner: isUserGlobalOwner(currentUser),
+		survey_results: currentUser.personalizationAnswers,
 	});
 }
 
 export async function applyForOnboardingCall(
 	instanceId: string,
-	currentUer: IUser,
+	currentUser: IUser,
 	email: string,
 ): Promise<string> {
 	try {
 		const response = await post(N8N_API_BASE_URL, ONBOARDING_PROMPTS_ENDPOINT, {
 			instance_id: instanceId,
-			user_id: `${instanceId}#${currentUer.id}`,
+			user_id: `${instanceId}#${currentUser.id}`,
 			email,
 		});
 		return response;
@@ -37,14 +37,15 @@ export async function applyForOnboardingCall(
 
 export async function submitEmailOnSignup(
 	instanceId: string,
-	currentUer: IUser,
+	currentUser: IUser,
 	email: string | undefined,
 	agree: boolean,
 ): Promise<string> {
 	return await post(N8N_API_BASE_URL, CONTACT_EMAIL_SUBMISSION_ENDPOINT, {
 		instance_id: instanceId,
-		user_id: `${instanceId}#${currentUer.id}`,
+		user_id: `${instanceId}#${currentUser.id}`,
 		email,
 		agree,
+		agree_updates: true,
 	});
 }
diff --git a/packages/editor-ui/src/api/workflowHistory.ts b/packages/editor-ui/src/api/workflowHistory.ts
new file mode 100644
index 0000000000000..29ce2655447f2
--- /dev/null
+++ b/packages/editor-ui/src/api/workflowHistory.ts
@@ -0,0 +1,32 @@
+import type { IRestApiContext } from '@/Interface';
+import { get } from '@/utils/apiUtils';
+import type {
+	WorkflowHistory,
+	WorkflowVersion,
+	WorkflowHistoryRequestParams,
+} from '@/types/workflowHistory';
+
+export const getWorkflowHistory = async (
+	context: IRestApiContext,
+	workflowId: string,
+	queryParams: WorkflowHistoryRequestParams,
+): Promise<WorkflowHistory[]> => {
+	const { data } = await get(
+		context.baseUrl,
+		`/workflow-history/workflow/${workflowId}`,
+		queryParams,
+	);
+	return data;
+};
+
+export const getWorkflowVersion = async (
+	context: IRestApiContext,
+	workflowId: string,
+	versionId: string,
+): Promise<WorkflowVersion> => {
+	const { data } = await get(
+		context.baseUrl,
+		`/workflow-history/workflow/${workflowId}/version/${versionId}`,
+	);
+	return data;
+};
diff --git a/packages/editor-ui/src/api/workflows.ee.ts b/packages/editor-ui/src/api/workflows.ee.ts
index 1282a8ce86b56..19e99335b9d1a 100644
--- a/packages/editor-ui/src/api/workflows.ee.ts
+++ b/packages/editor-ui/src/api/workflows.ee.ts
@@ -1,5 +1,5 @@
 import type { IRestApiContext, IShareWorkflowsPayload, IWorkflowsShareResponse } from '@/Interface';
-import { makeRestApiRequest } from '@/utils';
+import { makeRestApiRequest } from '@/utils/apiUtils';
 import type { IDataObject } from 'n8n-workflow';
 
 export async function setWorkflowSharedWith(
@@ -7,7 +7,7 @@ export async function setWorkflowSharedWith(
 	id: string,
 	data: IShareWorkflowsPayload,
 ): Promise<IWorkflowsShareResponse> {
-	return makeRestApiRequest(
+	return await makeRestApiRequest(
 		context,
 		'PUT',
 		`/workflows/${id}/share`,
diff --git a/packages/editor-ui/src/api/workflows.ts b/packages/editor-ui/src/api/workflows.ts
index 508ed74e4a550..9c985ea5cec06 100644
--- a/packages/editor-ui/src/api/workflows.ts
+++ b/packages/editor-ui/src/api/workflows.ts
@@ -1,34 +1,49 @@
-import type { IExecutionsCurrentSummaryExtended, IRestApiContext } from '@/Interface';
+import type {
+	IExecutionResponse,
+	IExecutionsCurrentSummaryExtended,
+	IRestApiContext,
+	IWorkflowDb,
+	NewWorkflowResponse,
+	NodeOutputDb,
+	TestSuiteDb,
+} from '@/Interface';
 import type { ExecutionFilters, ExecutionOptions, IDataObject } from 'n8n-workflow';
-import { ExecutionStatus, WorkflowExecuteMode } from 'n8n-workflow';
-import { makeRestApiRequest } from '@/utils';
+import { makeRestApiRequest } from '@/utils/apiUtils';
 
 export async function getNewWorkflow(context: IRestApiContext, name?: string) {
-	const response = await makeRestApiRequest(context, 'GET', '/workflows/new', name ? { name } : {});
+	const response = await makeRestApiRequest<NewWorkflowResponse>(
+		context,
+		'GET',
+		'/workflows/new',
+		name ? { name } : {},
+	);
 	return {
 		name: response.name,
 		onboardingFlowEnabled: response.onboardingFlowEnabled === true,
+		settings: response.defaultSettings,
 	};
 }
 
 export async function getWorkflow(context: IRestApiContext, id: string, filter?: object) {
 	const sendData = filter ? { filter } : undefined;
 
-	return await makeRestApiRequest(context, 'GET', `/workflows/${id}`, sendData);
+	return await makeRestApiRequest<IWorkflowDb>(context, 'GET', `/workflows/${id}`, sendData);
 }
 
 export async function getWorkflows(context: IRestApiContext, filter?: object) {
 	const sendData = filter ? { filter } : undefined;
 
-	return await makeRestApiRequest(context, 'GET', '/workflows', sendData);
+	return await makeRestApiRequest<IWorkflowDb[]>(context, 'GET', '/workflows', sendData);
 }
 
 export async function getActiveWorkflows(context: IRestApiContext) {
-	return await makeRestApiRequest(context, 'GET', '/active');
+	return await makeRestApiRequest<string[]>(context, 'GET', '/active-workflows');
 }
 
-export async function getCurrentExecutions(context: IRestApiContext, filter: IDataObject) {
-	return await makeRestApiRequest(context, 'GET', '/executions-current', { filter });
+export async function getActiveExecutions(context: IRestApiContext, filter: IDataObject) {
+	const output = await makeRestApiRequest(context, 'GET', '/executions', { filter });
+
+	return output.results;
 }
 
 export async function getExecutions(
@@ -40,5 +55,50 @@ export async function getExecutions(
 }
 
 export async function getExecutionData(context: IRestApiContext, executionId: string) {
-	return await makeRestApiRequest(context, 'GET', `/executions/${executionId}`);
+	return await makeRestApiRequest<IExecutionResponse | null>(
+		context,
+		'GET',
+		`/executions/${executionId}`,
+	);
+}
+
+export async function getTestSuite(
+	context: IRestApiContext,
+	workFlowId: string,
+): Promise<TestSuiteDb[]> {
+	return await makeRestApiRequest(context, 'GET', `/workflow-tests/${workFlowId}`);
+}
+
+export async function postTestSuite(
+	context: IRestApiContext,
+	payload: {
+		workflowId: string;
+		description: string;
+	},
+): Promise<TestSuiteDb[]> {
+	return await makeRestApiRequest(context, 'POST', '/workflow-tests', payload);
+}
+
+export async function patchTestSuite(
+	context: IRestApiContext,
+	payload: NodeOutputDb,
+): Promise<NodeOutputDb[]> {
+	return await makeRestApiRequest(
+		context,
+		'PATCH',
+		`/workflow-tests/nodes-output/${payload.workflowTestId}`,
+		payload as IDataObject,
+	);
+}
+
+export async function createTestSuite(
+	context: IRestApiContext,
+	payload: Omit<NodeOutputDb, 'id'>,
+): Promise<NodeOutputDb[]> {
+	return await makeRestApiRequest(
+		context,
+		'POST',
+		`/workflow-tests/nodes-output/${payload.workflowTestId}`,
+		payload as IDataObject,
+	);
 }
diff --git a/packages/editor-ui/src/assets/images/aws-secrets-manager.svg b/packages/editor-ui/src/assets/images/aws-secrets-manager.svg
new file mode 100644
index 0000000000000..558b227b83e8b
--- /dev/null
+++ b/packages/editor-ui/src/assets/images/aws-secrets-manager.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="80px" height="80px" viewBox="0 0 80 80" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 64 (93537) - https://sketch.com -->
+    <title>Icon-Architecture/64/Arch_AWS-Secrets-Manager_64</title>
+    <desc>Created with Sketch.</desc>
+    <defs>
+        <linearGradient x1="0%" y1="100%" x2="100%" y2="0%" id="linearGradient-1">
+            <stop stop-color="#BD0816" offset="0%"></stop>
+            <stop stop-color="#FF5252" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g id="Icon-Architecture/64/Arch_AWS-Secrets-Manager_64" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Icon-Architecture-BG/64/Security-Identity-Compliance" fill="url(#linearGradient-1)">
+            <rect id="Rectangle" x="0" y="0" width="80" height="80"></rect>
+        </g>
+        <path d="M38.76,43.36 C38.76,44.044 39.317,44.6 40,44.6 C40.684,44.6 41.24,44.044 41.24,43.36 C41.24,42.676 40.684,42.12 40,42.12 C39.317,42.12 38.76,42.676 38.76,43.36 L38.76,43.36 Z M36.76,43.36 C36.76,41.573 38.213,40.12 40,40.12 C41.787,40.12 43.24,41.573 43.24,43.36 C43.24,44.796 42.296,46.002 41,46.426 L41,49 L39,49 L39,46.426 C37.704,46.002 36.76,44.796 36.76,43.36 L36.76,43.36 Z M49,38 L31,38 L31,51 L49,51 L49,48 L46,48 L46,46 L49,46 L49,43 L46,43 L46,41 L49,41 L49,38 Z M34,36 L45.999,36 L46,31 C46.001,28.384 43.143,26.002 40.004,26 L40.001,26 C38.472,26 36.928,26.574 35.763,27.575 C34.643,28.537 34,29.786 34,31.001 L34,36 Z M48,31.001 L47.999,36 L50,36 C50.553,36 51,36.448 51,37 L51,52 C51,52.552 50.553,53 50,53 L30,53 C29.447,53 29,52.552 29,52 L29,37 C29,36.448 29.447,36 30,36 L32,36 L32,31 C32.001,29.202 32.897,27.401 34.459,26.058 C35.982,24.75 38.001,24 40.001,24 L40.004,24 C44.265,24.002 48.001,27.273 48,31.001 L48,31.001 Z M19.207,55.049 L20.828,53.877 C18.093,50.097 16.581,45.662 16.396,41 L19,41 L19,39 L16.399,39 C16.598,34.366 18.108,29.957 20.828,26.198 L19.207,25.025 C16.239,29.128 14.599,33.942 14.399,39 L12,39 L12,41 L14.396,41 C14.582,46.086 16.224,50.926 19.207,55.049 L19.207,55.049 Z M53.838,59.208 C50.069,61.936 45.648,63.446 41,63.639 L41,61 L39,61 L39,63.639 C34.352,63.447 29.93,61.937 26.159,59.208 L24.988,60.828 C29.1,63.805 33.928,65.445 39,65.639 L39,68 L41,68 L41,65.639 C46.072,65.445 50.898,63.805 55.01,60.828 L53.838,59.208 Z M26.159,20.866 C29.93,18.138 34.352,16.628 39,16.436 L39,19 L41,19 L41,16.436 C45.648,16.628 50.069,18.138 53.838,20.866 L55.01,19.246 C50.898,16.27 46.072,14.63 41,14.436 L41,12 L39,12 L39,14.436 C33.928,14.629 29.1,16.269 24.988,19.246 L26.159,20.866 Z M65.599,39 C65.399,33.942 63.759,29.128 60.79,25.025 L59.169,26.198 C61.89,29.957 63.4,34.366 63.599,39 L61,39 L61,41 L63.602,41 C63.416,45.662 61.905,50.097 59.169,53.877 L60.79,55.049 C63.774,50.926 65.415,46.086 65.602,41 L68,41 L68,39 L65.599,39 Z M56.386,25.064 L64.226,17.224 L62.812,15.81 L54.972,23.65 L56.386,25.064 Z M23.612,55.01 L15.772,62.85 L17.186,64.264 L25.026,56.424 L23.612,55.01 Z M28.666,27.253 L13.825,12.413 L12.411,13.827 L27.252,28.667 L28.666,27.253 Z M54.193,52.78 L67.586,66.173 L66.172,67.587 L52.779,54.194 L54.193,52.78 Z" id="AWS-Secrets-Manager_Icon_64_Squid" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/packages/editor-ui/src/assets/images/doppler.webp b/packages/editor-ui/src/assets/images/doppler.webp
new file mode 100644
index 0000000000000..7bd34406375ca
Binary files /dev/null and b/packages/editor-ui/src/assets/images/doppler.webp differ
diff --git a/packages/editor-ui/src/assets/images/hashicorp.webp b/packages/editor-ui/src/assets/images/hashicorp.webp
new file mode 100644
index 0000000000000..ca52275380f54
Binary files /dev/null and b/packages/editor-ui/src/assets/images/hashicorp.webp differ
diff --git a/packages/editor-ui/src/assets/images/infisical.webp b/packages/editor-ui/src/assets/images/infisical.webp
new file mode 100644
index 0000000000000..abe9a20de36b6
Binary files /dev/null and b/packages/editor-ui/src/assets/images/infisical.webp differ
diff --git a/packages/editor-ui/src/components/AIAssistantChat/AIAssistantChat.vue b/packages/editor-ui/src/components/AIAssistantChat/AIAssistantChat.vue
new file mode 100644
index 0000000000000..484ce7474eb31
--- /dev/null
+++ b/packages/editor-ui/src/components/AIAssistantChat/AIAssistantChat.vue
@@ -0,0 +1,227 @@
+<script setup lang="ts">
+import { useI18n } from '@/composables/useI18n';
+import { useUsersStore } from '@/stores/users.store';
+import ChatComponent from '@n8n/chat/components/Chat.vue';
+import { ChatOptionsSymbol, ChatSymbol } from '@n8n/chat/constants';
+import type { Chat, ChatMessage, ChatOptions } from '@n8n/chat/types';
+import type { Ref } from 'vue';
+import { computed, provide, ref } from 'vue';
+import QuickReplies from './QuickReplies.vue';
+import { DateTime } from 'luxon';
+import { useAIStore } from '@/stores/ai.store';
+import { chatEventBus } from '@n8n/chat/event-buses';
+import { onMounted } from 'vue';
+import {
+	AI_ASSISTANT_EXPERIMENT_URLS,
+	AI_ASSISTANT_LOCAL_STORAGE_KEY,
+	MODAL_CONFIRM,
+} from '@/constants';
+import { useStorage } from '@/composables/useStorage';
+import { useMessage } from '@/composables/useMessage';
+import { useTelemetry } from '@/composables/useTelemetry';
+import { onBeforeUnmount } from 'vue';
+
+const locale = useI18n();
+const telemetry = useTelemetry();
+const { confirm } = useMessage();
+
+const usersStore = useUsersStore();
+const aiStore = useAIStore();
+
+const messages: Ref<ChatMessage[]> = ref([]);
+const waitingForResponse = ref(false);
+const currentSessionId = ref<string>(String(Date.now()));
+const disableChat = ref(false);
+
+const userName = computed(() => usersStore.currentUser?.firstName ?? 'there');
+const latestConnectionInfo = computed(() => aiStore.latestConnectionInfo);
+
+const chatTitle = locale.baseText('aiAssistantChat.title');
+const nowMilliseconds = () => String(DateTime.now().toMillis());
+const nowIsoString = () => new Date().toISOString();
+const thanksResponses: ChatMessage[] = [
+	{
+		id: nowMilliseconds(),
+		sender: 'bot',
+		text: locale.baseText('aiAssistantChat.response.message1'),
+		createdAt: nowIsoString(),
+	},
+	{
+		id: nowMilliseconds(),
+		sender: 'bot',
+		text: locale.baseText('aiAssistantChat.response.message2'),
+		createdAt: nowIsoString(),
+	},
+	{
+		id: nowMilliseconds(),
+		sender: 'bot',
+		text: '🙏',
+		createdAt: new Date().toISOString(),
+	},
+	{
+		id: nowMilliseconds(),
+		type: 'component',
+		key: 'QuickReplies',
+		sender: 'user',
+		createdAt: nowIsoString(),
+		transparent: true,
+		arguments: {
+			suggestions: [
+				{ label: locale.baseText('aiAssistantChat.response.quickReply.close'), key: 'close' },
+				{
+					label: locale.baseText('aiAssistantChat.response.quickReply.giveFeedback'),
+					key: 'give_feedback',
+				},
+				{
+					label: locale.baseText('aiAssistantChat.response.quickReply.signUp'),
+					key: 'sign_up',
+				},
+			],
+			onReplySelected: ({ key }: { key: string; label: string }) => {
+				switch (key) {
+					case 'give_feedback':
+						window.open(AI_ASSISTANT_EXPERIMENT_URLS.FEEDBACK_FORM, '_blank');
+						break;
+					case 'sign_up':
+						window.open(AI_ASSISTANT_EXPERIMENT_URLS.SIGN_UP, '_blank');
+						break;
+				}
+				aiStore.assistantChatOpen = false;
+			},
+		},
+	},
+];
+
+const initialMessageText = computed(() => {
+	if (latestConnectionInfo.value) {
+		return locale.baseText('aiAssistantChat.initialMessage.nextStep', {
+			interpolate: { currentAction: latestConnectionInfo.value.stepName },
+		});
+	}
+
+	return locale.baseText('aiAssistantChat.initialMessage.firstStep');
+});
+
+const initialMessages: Ref<ChatMessage[]> = ref([
+	{
+		id: '1',
+		type: 'text',
+		sender: 'bot',
+		createdAt: new Date().toISOString(),
+		text: `${locale.baseText('aiAssistantChat.greeting', { interpolate: { username: userName.value ?? 'there' } })} ${initialMessageText.value}`,
+	},
+]);
+
+const sendMessage = async (message: string) => {
+	disableChat.value = true;
+	waitingForResponse.value = true;
+	messages.value.push({
+		id: String(messages.value.length + 1),
+		sender: 'user',
+		text: message,
+		createdAt: new Date().toISOString(),
+	});
+	trackUserMessage(message);
+	thanksResponses.forEach((response, index) => {
+		// Push each response with a delay of 1500ms
+		setTimeout(
+			() => {
+				messages.value.push(response);
+				chatEventBus.emit('scrollToBottom');
+				if (index === thanksResponses.length - 1) {
+					waitingForResponse.value = false;
+					// Once last message is sent, disable the experiment
+					useStorage(AI_ASSISTANT_LOCAL_STORAGE_KEY).value = 'true';
+				}
+			},
+			1500 * (index + 1),
+		);
+	});
+	chatEventBus.emit('scrollToBottom');
+};
+
+const trackUserMessage = (message: string) => {
+	telemetry.track('User responded in AI chat', {
+		prompt: message,
+		chatMode: 'nextStepAssistant',
+		initialMessage: initialMessageText.value,
+	});
+};
+
+const chatOptions: ChatOptions = {
+	i18n: {
+		en: {
+			title: chatTitle,
+			footer: '',
+			subtitle: '',
+			inputPlaceholder: locale.baseText('aiAssistantChat.chatPlaceholder'),
+			getStarted: locale.baseText('aiAssistantChat.getStarted'),
+			closeButtonTooltip: locale.baseText('aiAssistantChat.closeButtonTooltip'),
+		},
+	},
+	webhookUrl: 'https://webhook.url',
+	mode: 'window',
+	showWindowCloseButton: true,
+	messageComponents: {
+		QuickReplies,
+	},
+	disabled: disableChat,
+};
+
+const chatConfig: Chat = {
+	messages,
+	sendMessage,
+	initialMessages,
+	currentSessionId,
+	waitingForResponse,
+};
+
+provide(ChatSymbol, chatConfig);
+provide(ChatOptionsSymbol, chatOptions);
+
+onMounted(() => {
+	chatEventBus.emit('focusInput');
+	chatEventBus.on('close', onBeforeClose);
+});
+
+onBeforeUnmount(() => {
+	chatEventBus.off('close', onBeforeClose);
+});
+
+async function onBeforeClose() {
+	const confirmModal = await confirm(locale.baseText('aiAssistantChat.closeChatConfirmation'), {
+		confirmButtonText: locale.baseText('aiAssistantChat.closeChatConfirmation.confirm'),
+		cancelButtonText: locale.baseText('aiAssistantChat.closeChatConfirmation.cancel'),
+	});
+
+	if (confirmModal === MODAL_CONFIRM) {
+		aiStore.assistantChatOpen = false;
+	}
+}
+</script>
+
+<template>
+	<div :class="[$style.container, 'ignore-key-press']">
+		<ChatComponent />
+	</div>
+</template>
+
+<style module lang="scss">
+.container {
+	height: 100%;
+	background-color: var(--color-background-light);
+	filter: drop-shadow(0px 8px 24px #41424412);
+	border-left: 1px solid var(--color-foreground-dark);
+	overflow: hidden;
+}
+
+.header {
+	font-size: var(--font-size-l);
+	background-color: #fff;
+	padding: var(--spacing-xs);
+}
+
+.content {
+	padding: var(--spacing-xs);
+}
+</style>
diff --git a/packages/editor-ui/src/components/AIAssistantChat/NextStepPopup.vue b/packages/editor-ui/src/components/AIAssistantChat/NextStepPopup.vue
new file mode 100644
index 0000000000000..1b5c921217374
--- /dev/null
+++ b/packages/editor-ui/src/components/AIAssistantChat/NextStepPopup.vue
@@ -0,0 +1,148 @@
+<script setup lang="ts">
+import { useAIStore } from '@/stores/ai.store';
+import { useI18n } from '@/composables/useI18n';
+import { computed } from 'vue';
+import { useTelemetry } from '@/composables/useTelemetry';
+
+const aiStore = useAIStore();
+const locale = useI18n();
+const telemetry = useTelemetry();
+
+const emit = defineEmits<{ (event: 'optionSelected', option: string): void }>();
+
+const aiAssistantChatOpen = computed(() => aiStore.assistantChatOpen);
+
+const title = computed(() => {
+	return aiStore.nextStepPopupConfig.title;
+});
+
+const options = computed(() => [
+	{
+		label: locale.baseText('nextStepPopup.option.choose'),
+		icon: '➕',
+		key: 'choose',
+		disabled: false,
+	},
+	{
+		label: locale.baseText('nextStepPopup.option.generate'),
+		icon: '✨',
+		key: 'generate',
+		disabled: aiAssistantChatOpen.value,
+	},
+]);
+
+const position = computed(() => {
+	return [aiStore.nextStepPopupConfig.position[0], aiStore.nextStepPopupConfig.position[1]];
+});
+
+const style = computed(() => {
+	return {
+		left: `${position.value[0]}px`,
+		top: `${position.value[1]}px`,
+	};
+});
+
+const close = () => {
+	aiStore.closeNextStepPopup();
+};
+
+const onOptionSelected = (option: string) => {
+	if (option === 'choose') {
+		emit('optionSelected', option);
+	} else if (option === 'generate') {
+		telemetry.track('User clicked generate AI button', {}, { withPostHog: true });
+		aiStore.assistantChatOpen = true;
+	}
+	close();
+};
+</script>
+
+<template>
+	<div v-on-click-outside="close" :class="$style.container" :style="style">
+		<div :class="$style.title">{{ title }}</div>
+		<ul :class="$style.options">
+			<li
+				v-for="option in options"
+				:key="option.key"
+				:class="{ [$style.option]: true, [$style.disabled]: option.disabled }"
+				@click="onOptionSelected(option.key)"
+			>
+				<div :class="$style.icon">
+					{{ option.icon }}
+				</div>
+				<div :class="$style.label">
+					{{ option.label }}
+				</div>
+			</li>
+		</ul>
+	</div>
+</template>
+
+<style module lang="scss">
+.container {
+	position: fixed;
+	display: flex;
+	flex-direction: column;
+	min-width: 190px;
+	font-size: var(--font-size-2xs);
+	background: var(--color-background-xlight);
+	filter: drop-shadow(0px 6px 16px #441c170f);
+	border: var(--border-width-base) var(--border-style-base) var(--color-foreground-light);
+	border-radius: var(--border-radius-base);
+
+	// Arrow border is created as the outer triange
+	&:before {
+		content: '';
+		position: relative;
+		left: -11px;
+		top: calc(50% - 8px);
+		border-top: 10px solid transparent;
+		border-bottom: 10px solid transparent;
+		border-right: 10px solid var(--color-foreground-light);
+		position: absolute;
+	}
+
+	// Arrow background is created as the inner triangle
+	&:after {
+		content: '';
+		position: relative;
+		left: -10px;
+		top: calc(50% - 8px);
+		border-top: 10px solid transparent;
+		border-bottom: 10px solid transparent;
+		border-right: 10px solid var(--color-background-xlight);
+		position: absolute;
+	}
+}
+
+.title {
+	padding: var(--spacing-xs);
+	color: var(--color-text-base);
+	font-weight: var(--font-weight-bold);
+}
+
+.options {
+	list-style: none;
+	display: flex;
+	flex-direction: column;
+	padding-bottom: var(--spacing-2xs);
+}
+
+.option {
+	display: flex;
+	padding: var(--spacing-3xs) var(--spacing-xs);
+	gap: var(--spacing-xs);
+	cursor: pointer;
+	color: var(--color-text-dark);
+
+	&:hover {
+		background: var(--color-background-base);
+		font-weight: var(--font-weight-bold);
+	}
+
+	&.disabled {
+		pointer-events: none;
+		color: var(--color-text-light);
+	}
+}
+</style>
diff --git a/packages/editor-ui/src/components/AIAssistantChat/QuickReplies.vue b/packages/editor-ui/src/components/AIAssistantChat/QuickReplies.vue
new file mode 100644
index 0000000000000..1a43f625d7bfc
--- /dev/null
+++ b/packages/editor-ui/src/components/AIAssistantChat/QuickReplies.vue
@@ -0,0 +1,66 @@
+<script setup lang="ts">
+import { useI18n } from '@/composables/useI18n';
+import Button from 'n8n-design-system/components/N8nButton/Button.vue';
+
+type QuickReply = {
+	label: string;
+	key: string;
+};
+
+const locale = useI18n();
+
+const emit = defineEmits<{
+	(event: 'replySelected', value: QuickReply): void;
+}>();
+
+defineProps<{
+	suggestions: QuickReply[];
+}>();
+
+function onButtonClick(action: QuickReply) {
+	emit('replySelected', action);
+}
+</script>
+
+<template>
+	<div :class="$style.container">
+		<p :class="$style.hint">{{ locale.baseText('aiAssistantChat.quickReply.title') }}</p>
+		<div :class="$style.suggestions">
+			<Button
+				v-for="action in suggestions"
+				:key="action.key"
+				:class="$style.replyButton"
+				outline
+				type="secondary"
+				@click="onButtonClick(action)"
+			>
+				{{ action.label }}
+			</Button>
+		</div>
+	</div>
+</template>
+
+<style module lang="scss">
+.container {
+	display: flex;
+	flex-direction: column;
+	gap: var(--spacing-2xs);
+	width: auto;
+	justify-content: flex-end;
+	align-items: flex-end;
+}
+.suggestions {
+	display: flex;
+	flex-direction: column;
+	width: fit-content;
+	gap: var(--spacing-4xs);
+}
+.hint {
+	color: var(--color-text-base);
+	font-size: var(--font-size-2xs);
+}
+.replyButton {
+	display: flex;
+	background: var(--chat--color-white);
+}
+</style>
diff --git a/packages/editor-ui/src/components/AboutModal.vue b/packages/editor-ui/src/components/AboutModal.vue
index 19b57c1fd0bb7..067c3daa813d7 100644
--- a/packages/editor-ui/src/components/AboutModal.vue
+++ b/packages/editor-ui/src/components/AboutModal.vue
@@ -1,8 +1,8 @@
 <template>
 	<Modal
-		width="540px"
+		max-width="540px"
 		:title="$locale.baseText('about.aboutN8n')"
-		:eventBus="modalBus"
+		:event-bus="modalBus"
 		:name="ABOUT_MODAL_KEY"
 		:center="true"
 	>
@@ -47,7 +47,12 @@
 
 		<template #footer>
 			<div class="action-buttons">
-				<n8n-button @click="closeDialog" float="right" :label="$locale.baseText('about.close')" />
+				<n8n-button
+					float="right"
+					:label="$locale.baseText('about.close')"
+					data-test-id="close-about-modal-button"
+					@click="closeDialog"
+				/>
 			</div>
 		</template>
 	</Modal>
@@ -55,12 +60,12 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
+import { mapStores } from 'pinia';
+import { createEventBus } from 'n8n-design-system/utils';
 import Modal from './Modal.vue';
 import { ABOUT_MODAL_KEY } from '../constants';
-import { mapStores } from 'pinia';
-import { useSettingsStore } from '@/stores/settings';
-import { useRootStore } from '@/stores/n8nRootStore';
-import { createEventBus } from '@/event-bus';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useRootStore } from '@/stores/n8nRoot.store';
 
 export default defineComponent({
 	name: 'About',
diff --git a/packages/editor-ui/src/components/ActivationModal.vue b/packages/editor-ui/src/components/ActivationModal.vue
index 5a72229d684c5..349bf5d9ddb00 100644
--- a/packages/editor-ui/src/components/ActivationModal.vue
+++ b/packages/editor-ui/src/components/ActivationModal.vue
@@ -25,10 +25,10 @@
 
 		<template #footer="{ close }">
 			<div :class="$style.footer">
-				<el-checkbox :value="checked" @change="handleCheckboxChange">{{
-					$locale.baseText('activationModal.dontShowAgain')
+				<el-checkbox :model-value="checked" @update:model-value="handleCheckboxChange">{{
+					$locale.baseText('generic.dontShowAgain')
 				}}</el-checkbox>
-				<n8n-button @click="close" :label="$locale.baseText('activationModal.gotIt')" />
+				<n8n-button :label="$locale.baseText('activationModal.gotIt')" @click="close" />
 			</div>
 		</template>
 	</Modal>
@@ -36,6 +36,8 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
+import { mapStores } from 'pinia';
+import { createEventBus } from 'n8n-design-system/utils';
 
 import Modal from '@/components/Modal.vue';
 import {
@@ -44,12 +46,12 @@ import {
 	LOCAL_STORAGE_ACTIVATION_FLAG,
 	VIEWS,
 } from '../constants';
-import { getActivatableTriggerNodes, getTriggerNodeServiceName } from '@/utils';
-import { mapStores } from 'pinia';
-import { useUIStore } from '@/stores/ui';
-import { useWorkflowsStore } from '@/stores/workflows';
-import { useNodeTypesStore } from '@/stores/nodeTypes';
-import { createEventBus } from '@/event-bus';
+import { getActivatableTriggerNodes, getTriggerNodeServiceName } from '@/utils/nodeTypesUtils';
+import { useUIStore } from '@/stores/ui.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import { useStorage } from '@/composables/useStorage';
+import { useExecutionsStore } from '@/stores/executions.store';
 
 export default defineComponent({
 	name: 'ActivationModal',
@@ -66,7 +68,7 @@ export default defineComponent({
 	},
 	methods: {
 		async showExecutionsList() {
-			const activeExecution = this.workflowsStore.activeWorkflowExecution;
+			const activeExecution = this.executionsStore.activeExecution;
 			const currentWorkflow = this.workflowsStore.workflowId;
 
 			if (activeExecution) {
@@ -88,11 +90,11 @@ export default defineComponent({
 		},
 		handleCheckboxChange(checkboxValue: boolean) {
 			this.checked = checkboxValue;
-			window.localStorage.setItem(LOCAL_STORAGE_ACTIVATION_FLAG, checkboxValue.toString());
+			useStorage(LOCAL_STORAGE_ACTIVATION_FLAG).value = checkboxValue.toString();
 		},
 	},
 	computed: {
-		...mapStores(useNodeTypesStore, useUIStore, useWorkflowsStore),
+		...mapStores(useNodeTypesStore, useUIStore, useWorkflowsStore, useExecutionsStore),
 		triggerContent(): string {
 			const foundTriggers = getActivatableTriggerNodes(this.workflowsStore.workflowTriggerNodes);
 			if (!foundTriggers.length) {
diff --git a/packages/editor-ui/src/components/AddTestSuiteModal.vue b/packages/editor-ui/src/components/AddTestSuiteModal.vue
new file mode 100644
index 0000000000000..3b579f9509bf1
--- /dev/null
+++ b/packages/editor-ui/src/components/AddTestSuiteModal.vue
@@ -0,0 +1,171 @@
+<template>
+	<Modal
+		width="540px"
+		:name="ADD_TEST_SUITE_MODAL_KEY"
+		:title="$locale.baseText('testSuites.addTestSuite.title')"
+		:event-bus="modalBus"
+		:center="true"
+		:before-close="onModalClose"
+		:show-close="!loading"
+	>
+		<template #content>
+			<div :class="[$style.formContainer, 'mt-m']">
+				<n8n-input-label
+					:class="$style.labelTooltip"
+					:label="$locale.baseText('testSuites.addTest.description.label')"
+					:tooltip-text="$locale.baseText('testSuites.addTest.description.tooltip')"
+				>
+					<n8n-input
+						v-model="description"
+						name="description"
+						type="text"
+						:maxlength="300"
+						:placeholder="''"
+						:required="true"
+						:disabled="loading"
+					/>
+				</n8n-input-label>
+				<div :class="[$style.infoText, 'mt-4xs']">
+					<span
+						size="small"
+						:class="[$style.infoText, infoTextErrorMessage ? $style.error : '']"
+						v-text="infoTextErrorMessage"
+					></span>
+				</div>
+			</div>
+		</template>
+		<template #footer>
+			<n8n-button
+				:loading="loading"
+				:disabled="!description || loading"
+				:label="
+					loading
+						? $locale.baseText('testSuites.addTest.saveButton.label.loading')
+						: $locale.baseText('testSuites.addTest.saveButton.label')
+				"
+				size="large"
+				float="right"
+				@click="onAddClick"
+			/>
+		</template>
+	</Modal>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import Modal from './Modal.vue';
+import { ADD_TEST_SUITE_MODAL_KEY } from '../constants';
+import { mapStores } from 'pinia';
+import { createEventBus } from 'n8n-design-system/utils';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useToast } from '@/composables/useToast';
+
+export default defineComponent({
+	name: 'AddTestSuiteModal',
+	components: {
+		Modal,
+	},
+	props: {
+		workFlowId: {
+			type: String,
+			default: '',
+		},
+	},
+	setup() {
+		return {
+			...useToast(),
+		};
+	},
+	data() {
+		return {
+			loading: false,
+			description: '',
+			modalBus: createEventBus(),
+			infoTextErrorMessage: '',
+			ADD_TEST_SUITE_MODAL_KEY,
+		};
+	},
+	computed: {
+		...mapStores(useWorkflowsStore),
+	},
+	methods: {
+		async onAddClick() {
+			try {
+				this.infoTextErrorMessage = '';
+				this.loading = true;
+				await this.workflowsStore.addWorkflowTestSuite(
+					this.$route.params.workflow as string,
+					this.description,
+				);
+				this.loading = false;
+				this.modalBus.emit('close');
+				this.showMessage({
+					title: this.$locale.baseText('testSuites.addTest.saveButton.success'),
+					type: 'success',
+				});
+			} catch (error) {
+				if (error.httpStatusCode && error.httpStatusCode === 400) {
+					this.infoTextErrorMessage = error.message;
+				} else {
+					this.showError(error, this.$locale.baseText('testSuites.addTest.saveButton.error'));
+				}
+			} finally {
+				this.loading = false;
+			}
+		},
+		onModalClose() {
+			return !this.loading;
+		},
+	},
+});
+</script>
+
+<style module lang="scss">
+.descriptionContainer {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	border: var(--border-width-base) var(--border-style-base) var(--color-info-tint-1);
+	border-radius: var(--border-radius-base);
+	background-color: var(--color-background-light);
+	button {
+		& > span {
+			flex-direction: row-reverse;
+			& > span {
+				margin-left: var(--spacing-3xs);
+			}
+		}
+	}
+}
+.formContainer {
+	font-size: var(--font-size-2xs);
+	font-weight: var(--font-weight-regular);
+	color: var(--color-text-base);
+}
+.checkbox {
+	span:nth-child(2) {
+		vertical-align: text-top;
+	}
+}
+.error {
+	color: var(--color-danger);
+	span {
+		border-color: var(--color-danger);
+	}
+}
+</style>
+
+<style lang="scss">
+.el-tooltip__popper {
+	max-width: 240px;
+	img {
+		width: 100%;
+	}
+	p {
+		line-height: 1.2;
+	}
+	p + p {
+		margin-top: var(--spacing-2xs);
+	}
+}
+</style>
diff --git a/packages/editor-ui/src/components/AskAiModal.vue b/packages/editor-ui/src/components/AskAiModal.vue
deleted file mode 100644
index 9cd992f5166b2..0000000000000
--- a/packages/editor-ui/src/components/AskAiModal.vue
+++ /dev/null
@@ -1,52 +0,0 @@
-<template>
-	<Modal
-		width="460px"
-		:center="true"
-		:eventBus="modalBus"
-		:name="ASK_AI_MODAL_KEY"
-		:title="$locale.baseText('askAi.dialog.title')"
-	>
-		<template #content>
-			<n8n-text v-html="$locale.baseText('askAi.dialog.body')"></n8n-text>
-		</template>
-
-		<template #footer>
-			<n8n-link :to="ASK_AI_WAITLIST_URL">
-				<n8n-button
-					float="right"
-					:label="$locale.baseText('askAi.dialog.signup')"
-					@click="onAskAiWaitlistClick"
-				/>
-			</n8n-link>
-		</template>
-	</Modal>
-</template>
-
-<script lang="ts">
-import { defineComponent } from 'vue';
-import Modal from './Modal.vue';
-import { ASK_AI_MODAL_KEY, ASK_AI_WAITLIST_URL } from '../constants';
-import { createEventBus } from '@/event-bus';
-
-export default defineComponent({
-	name: 'AskAI',
-	components: {
-		Modal,
-	},
-	data() {
-		return {
-			ASK_AI_WAITLIST_URL,
-			ASK_AI_MODAL_KEY,
-			modalBus: createEventBus(),
-		};
-	},
-	methods: {
-		onAskAiWaitlistClick() {
-			this.$telemetry.track('User clicked join waitlist', { source: 'ask-ai-code' });
-			this.modalBus.emit('close');
-		},
-	},
-});
-</script>
-
-<style module lang="scss"></style>
diff --git a/packages/editor-ui/src/components/AssignmentCollection/Assignment.vue b/packages/editor-ui/src/components/AssignmentCollection/Assignment.vue
new file mode 100644
index 0000000000000..c038ae07abbe5
--- /dev/null
+++ b/packages/editor-ui/src/components/AssignmentCollection/Assignment.vue
@@ -0,0 +1,284 @@
+<script setup lang="ts">
+import type { IUpdateInformation } from '@/Interface';
+import InputTriple from '@/components/InputTriple/InputTriple.vue';
+import ParameterInputFull from '@/components/ParameterInputFull.vue';
+import ParameterInputHint from '@/components/ParameterInputHint.vue';
+import ParameterIssues from '@/components/ParameterIssues.vue';
+import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
+import { isExpression, stringifyExpressionResult } from '@/utils/expressions';
+import type { AssignmentValue, INodeProperties, Result } from 'n8n-workflow';
+import { computed, ref } from 'vue';
+import TypeSelect from './TypeSelect.vue';
+import { useNDVStore } from '@/stores/ndv.store';
+import { useRouter } from 'vue-router';
+
+interface Props {
+	path: string;
+	modelValue: AssignmentValue;
+	issues: string[];
+	hideType?: boolean;
+	isReadOnly?: boolean;
+	index?: number;
+}
+
+const props = defineProps<Props>();
+
+const assignment = ref<AssignmentValue>(props.modelValue);
+
+const emit = defineEmits<{
+	(event: 'update:model-value', value: AssignmentValue): void;
+	(event: 'remove'): void;
+}>();
+
+const ndvStore = useNDVStore();
+const router = useRouter();
+const { resolveExpression } = useWorkflowHelpers({ router });
+
+const assignmentTypeToNodeProperty = (
+	type: string,
+): Partial<INodeProperties> & Pick<INodeProperties, 'type'> => {
+	switch (type) {
+		case 'boolean':
+			return {
+				type: 'options',
+				default: false,
+				options: [
+					{ name: 'false', value: false },
+					{ name: 'true', value: true },
+				],
+			};
+		case 'array':
+		case 'object':
+		case 'any':
+			return { type: 'string' };
+		default:
+			return { type } as INodeProperties;
+	}
+};
+
+const nameParameter = computed<INodeProperties>(() => ({
+	name: 'name',
+	displayName: 'Name',
+	default: '',
+	requiresDataPath: 'single',
+	placeholder: 'name',
+	type: 'string',
+}));
+
+const valueParameter = computed<INodeProperties>(() => {
+	return {
+		name: 'value',
+		displayName: 'Value',
+		default: '',
+		placeholder: 'value',
+		...assignmentTypeToNodeProperty(assignment.value.type ?? 'string'),
+	};
+});
+
+const hint = computed(() => {
+	const { value } = assignment.value;
+	if (typeof value !== 'string' || !value.startsWith('=')) {
+		return '';
+	}
+
+	let result: Result<unknown, Error>;
+	try {
+		const resolvedValue = resolveExpression(
+			value,
+			undefined,
+			ndvStore.isInputParentOfActiveNode
+				? {
+						targetItem: ndvStore.hoveringItem ?? undefined,
+						inputNodeName: ndvStore.ndvInputNodeName,
+						inputRunIndex: ndvStore.ndvInputRunIndex,
+						inputBranchIndex: ndvStore.ndvInputBranchIndex,
+					}
+				: {},
+		) as unknown;
+
+		result = { ok: true, result: resolvedValue };
+	} catch (error) {
+		result = { ok: false, error };
+	}
+
+	return stringifyExpressionResult(result);
+});
+
+const highlightHint = computed(() =>
+	Boolean(hint.value && ndvStore.hoveringItem && ndvStore.isInputParentOfActiveNode),
+);
+
+const valueIsExpression = computed(() => {
+	const { value } = assignment.value;
+
+	return typeof value === 'string' && isExpression(value);
+});
+
+const onAssignmentNameChange = (update: IUpdateInformation): void => {
+	assignment.value.name = update.value as string;
+};
+
+const onAssignmentTypeChange = (update: string): void => {
+	assignment.value.type = update;
+
+	if (update === 'boolean' && !valueIsExpression.value) {
+		assignment.value.value = false;
+	}
+};
+
+const onAssignmentValueChange = (update: IUpdateInformation): void => {
+	assignment.value.value = update.value as string;
+};
+
+const onRemove = (): void => {
+	emit('remove');
+};
+
+const onBlur = (): void => {
+	emit('update:model-value', assignment.value);
+};
+</script>
+
+<template>
+	<div
+		:class="{
+			[$style.wrapper]: true,
+			[$style.hasIssues]: issues.length > 0,
+			[$style.hasHint]: !!hint,
+		}"
+		data-test-id="assignment"
+	>
+		<n8n-icon-button
+			v-if="!isReadOnly"
+			type="tertiary"
+			text
+			size="mini"
+			icon="trash"
+			data-test-id="assignment-remove"
+			:class="$style.remove"
+			@click="onRemove"
+		></n8n-icon-button>
+
+		<div :class="$style.inputs">
+			<InputTriple middle-width="100px">
+				<template #left>
+					<ParameterInputFull
+						:key="nameParameter.type"
+						display-options
+						hide-label
+						hide-hint
+						:is-read-only="isReadOnly"
+						:parameter="nameParameter"
+						:value="assignment.name"
+						:path="`${path}.name`"
+						data-test-id="assignment-name"
+						@update="onAssignmentNameChange"
+						@blur="onBlur"
+					/>
+				</template>
+				<template v-if="!hideType" #middle>
+					<TypeSelect
+						:class="$style.select"
+						:model-value="assignment.type ?? 'string'"
+						:is-read-only="isReadOnly"
+						@update:model-value="onAssignmentTypeChange"
+					>
+					</TypeSelect>
+				</template>
+				<template #right="{ breakpoint }">
+					<div :class="$style.value">
+						<ParameterInputFull
+							:key="valueParameter.type"
+							display-options
+							hide-label
+							hide-issues
+							hide-hint
+							is-assignment
+							:is-read-only="isReadOnly"
+							:options-position="breakpoint === 'default' ? 'top' : 'bottom'"
+							:parameter="valueParameter"
+							:value="assignment.value"
+							:path="`${path}.value`"
+							data-test-id="assignment-value"
+							@update="onAssignmentValueChange"
+							@blur="onBlur"
+						/>
+						<ParameterInputHint
+							data-test-id="parameter-expression-preview-value"
+							:class="$style.hint"
+							:highlight="highlightHint"
+							:hint="hint"
+							single-line
+						/>
+					</div>
+				</template>
+			</InputTriple>
+		</div>
+
+		<div :class="$style.status">
+			<ParameterIssues v-if="issues.length > 0" :issues="issues" />
+		</div>
+	</div>
+</template>
+
+<style lang="scss" module>
+.wrapper {
+	position: relative;
+	display: flex;
+	align-items: flex-end;
+	gap: var(--spacing-4xs);
+
+	&.hasIssues {
+		--input-border-color: var(--color-danger);
+	}
+
+	&.hasHint {
+		padding-bottom: var(--spacing-s);
+	}
+
+	&:hover {
+		.remove {
+			opacity: 1;
+		}
+	}
+}
+
+.inputs {
+	display: flex;
+	flex-direction: column;
+	flex-grow: 1;
+	min-width: 0;
+
+	> div {
+		flex-grow: 1;
+	}
+}
+
+.value {
+	position: relative;
+
+	.hint {
+		position: absolute;
+		bottom: calc(var(--spacing-s) * -1);
+		left: 0;
+		right: 0;
+	}
+}
+
+.remove {
+	position: absolute;
+	left: 0;
+	top: var(--spacing-l);
+	opacity: 0;
+	transition: opacity 100ms ease-in;
+}
+
+.status {
+	align-self: flex-start;
+	padding-top: 28px;
+}
+
+.statusIcon {
+	padding-left: var(--spacing-4xs);
+}
+</style>
diff --git a/packages/editor-ui/src/components/AssignmentCollection/AssignmentCollection.vue b/packages/editor-ui/src/components/AssignmentCollection/AssignmentCollection.vue
new file mode 100644
index 0000000000000..7336684f6c8a7
--- /dev/null
+++ b/packages/editor-ui/src/components/AssignmentCollection/AssignmentCollection.vue
@@ -0,0 +1,270 @@
+<script setup lang="ts">
+import { useDebounce } from '@/composables/useDebounce';
+import { useI18n } from '@/composables/useI18n';
+import { useNDVStore } from '@/stores/ndv.store';
+import type {
+	AssignmentCollectionValue,
+	AssignmentValue,
+	INode,
+	INodeProperties,
+} from 'n8n-workflow';
+import { v4 as uuid } from 'uuid';
+import { computed, reactive, watch } from 'vue';
+import DropArea from '../DropArea/DropArea.vue';
+import ParameterOptions from '../ParameterOptions.vue';
+import Assignment from './Assignment.vue';
+import { inputDataToAssignments, nameFromExpression, typeFromExpression } from './utils';
+
+interface Props {
+	parameter: INodeProperties;
+	value: AssignmentCollectionValue;
+	path: string;
+	node: INode | null;
+	isReadOnly?: boolean;
+}
+
+const props = withDefaults(defineProps<Props>(), { isReadOnly: false });
+
+const emit = defineEmits<{
+	(
+		event: 'valueChanged',
+		value: { name: string; node: string; value: AssignmentCollectionValue },
+	): void;
+}>();
+
+const i18n = useI18n();
+
+const state = reactive<{ paramValue: AssignmentCollectionValue }>({
+	paramValue: {
+		assignments: props.value.assignments ?? [],
+	},
+});
+
+const ndvStore = useNDVStore();
+const { callDebounced } = useDebounce();
+
+const issues = computed(() => {
+	if (!ndvStore.activeNode) return {};
+	return ndvStore.activeNode?.issues?.parameters ?? {};
+});
+
+const empty = computed(() => state.paramValue.assignments.length === 0);
+const activeDragField = computed(() => nameFromExpression(ndvStore.draggableData));
+const inputData = computed(() => ndvStore.ndvInputData?.[0]?.json);
+const actions = computed(() => {
+	return [
+		{
+			label: i18n.baseText('assignment.addAll'),
+			value: 'addAll',
+			disabled: !inputData.value,
+		},
+		{
+			label: i18n.baseText('assignment.clearAll'),
+			value: 'clearAll',
+			disabled: state.paramValue.assignments.length === 0,
+		},
+	];
+});
+
+watch(state.paramValue, (value) => {
+	void callDebounced(
+		() => {
+			emit('valueChanged', { name: props.path, value, node: props.node?.name as string });
+		},
+		{ debounceTime: 1000 },
+	);
+});
+
+function addAssignment(): void {
+	state.paramValue.assignments.push({ id: uuid(), name: '', value: '', type: 'string' });
+}
+
+function dropAssignment(expression: string): void {
+	state.paramValue.assignments.push({
+		id: uuid(),
+		name: nameFromExpression(expression),
+		value: `=${expression}`,
+		type: typeFromExpression(expression),
+	});
+}
+
+function onAssignmentUpdate(index: number, value: AssignmentValue): void {
+	state.paramValue.assignments[index] = value;
+}
+
+function onAssignmentRemove(index: number): void {
+	state.paramValue.assignments.splice(index, 1);
+}
+
+function getIssues(index: number): string[] {
+	return issues.value[`${props.parameter.name}.${index}`] ?? [];
+}
+
+function optionSelected(action: 'clearAll' | 'addAll') {
+	if (action === 'clearAll') {
+		state.paramValue.assignments = [];
+	} else {
+		const newAssignments = inputDataToAssignments(inputData.value);
+		state.paramValue.assignments = state.paramValue.assignments.concat(newAssignments);
+	}
+}
+</script>
+
+<template>
+	<div
+		:class="{ [$style.assignmentCollection]: true, [$style.empty]: empty }"
+		:data-test-id="`assignment-collection-${parameter.name}`"
+	>
+		<n8n-input-label
+			:label="parameter.displayName"
+			:show-expression-selector="false"
+			size="small"
+			underline
+			color="text-dark"
+		>
+			<template #options>
+				<ParameterOptions
+					:parameter="parameter"
+					:value="value"
+					:custom-actions="actions"
+					:is-read-only="isReadOnly"
+					:show-expression-selector="false"
+					@update:model-value="optionSelected"
+				/>
+			</template>
+		</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>
+			</div>
+			<div
+				v-if="!isReadOnly"
+				:class="$style.dropAreaWrapper"
+				data-test-id="assignment-collection-drop-area"
+				@click="addAssignment"
+			>
+				<DropArea :sticky-offset="empty ? [-4, 32] : [92, 0]" @drop="dropAssignment">
+					<template #default="{ active, droppable }">
+						<div :class="{ [$style.active]: active, [$style.droppable]: droppable }">
+							<div v-if="droppable" :class="$style.dropArea">
+								<span>{{ i18n.baseText('assignment.dropField') }}</span>
+								<span :class="$style.activeField">{{ activeDragField }}</span>
+							</div>
+							<div v-else :class="$style.dropArea">
+								<span>{{ i18n.baseText('assignment.dragFields') }}</span>
+								<span :class="$style.or">{{ i18n.baseText('assignment.or') }}</span>
+								<span :class="$style.add">{{ i18n.baseText('assignment.add') }} </span>
+							</div>
+						</div>
+					</template>
+				</DropArea>
+			</div>
+		</div>
+	</div>
+</template>
+
+<style lang="scss" module>
+.assignmentCollection {
+	display: flex;
+	flex-direction: column;
+	margin: var(--spacing-xs) 0;
+}
+
+.content {
+	display: flex;
+	gap: var(--spacing-l);
+	flex-direction: column;
+}
+
+.assignments {
+	display: flex;
+	flex-direction: column;
+	gap: var(--spacing-4xs);
+}
+
+.assignment {
+	padding-left: var(--spacing-l);
+}
+
+.dropAreaWrapper {
+	cursor: pointer;
+
+	&:not(.empty .dropAreaWrapper) {
+		padding-left: var(--spacing-l);
+	}
+
+	&:hover .add {
+		color: var(--color-primary-shade-1);
+	}
+}
+
+.dropArea {
+	display: flex;
+	align-items: center;
+	flex-wrap: wrap;
+	justify-content: center;
+	font-size: var(--font-size-xs);
+	color: var(--color-text-dark);
+	gap: 1ch;
+	min-height: 24px;
+
+	> span {
+		white-space: nowrap;
+	}
+}
+
+.or {
+	color: var(--color-text-light);
+	font-size: var(--font-size-2xs);
+}
+
+.add {
+	color: var(--color-primary);
+	font-weight: var(--font-weight-bold);
+}
+
+.activeField {
+	font-weight: var(--font-weight-bold);
+	color: var(--color-ndv-droppable-parameter);
+}
+
+.active {
+	.activeField {
+		color: var(--color-success);
+	}
+}
+
+.empty {
+	.dropArea {
+		flex-direction: column;
+		align-items: center;
+		gap: var(--spacing-3xs);
+		min-height: 20vh;
+	}
+
+	.droppable .dropArea {
+		flex-direction: row;
+		gap: 1ch;
+	}
+
+	.content {
+		gap: var(--spacing-s);
+	}
+}
+
+.icon {
+	font-size: var(--font-size-2xl);
+}
+</style>
diff --git a/packages/editor-ui/src/components/AssignmentCollection/TypeSelect.vue b/packages/editor-ui/src/components/AssignmentCollection/TypeSelect.vue
new file mode 100644
index 0000000000000..2a646a064fa1e
--- /dev/null
+++ b/packages/editor-ui/src/components/AssignmentCollection/TypeSelect.vue
@@ -0,0 +1,68 @@
+<script setup lang="ts">
+import { useI18n } from '@/composables/useI18n';
+import type { BaseTextKey } from '@/plugins/i18n';
+import { ASSIGNMENT_TYPES } from './constants';
+import { computed } from 'vue';
+
+interface Props {
+	modelValue: string;
+	isReadOnly?: boolean;
+}
+
+const props = defineProps<Props>();
+
+const emit = defineEmits<{
+	(event: 'update:model-value', type: string): void;
+}>();
+
+const i18n = useI18n();
+
+const types = ASSIGNMENT_TYPES;
+
+const icon = computed(() => types.find((type) => type.type === props.modelValue)?.icon ?? 'cube');
+
+const onTypeChange = (type: string): void => {
+	emit('update:model-value', type);
+};
+</script>
+
+<template>
+	<n8n-select
+		data-test-id="assignment-type-select"
+		size="small"
+		:model-value="modelValue"
+		:disabled="isReadOnly"
+		@update:model-value="onTypeChange"
+	>
+		<template #prefix>
+			<n8n-icon :class="$style.icon" :icon="icon" color="text-light" size="small" />
+		</template>
+		<n8n-option
+			v-for="option in types"
+			:key="option.type"
+			:value="option.type"
+			:label="i18n.baseText(`type.${option.type}` as BaseTextKey)"
+			:class="$style.option"
+		>
+			<n8n-icon
+				:icon="option.icon"
+				:color="modelValue === option.type ? 'primary' : 'text-light'"
+				size="small"
+			/>
+			<span>{{ i18n.baseText(`type.${option.type}` as BaseTextKey) }}</span>
+		</n8n-option>
+	</n8n-select>
+</template>
+
+<style lang="scss" module>
+.icon {
+	color: var(--color-text-light);
+}
+
+.option {
+	display: flex;
+	gap: var(--spacing-2xs);
+	align-items: center;
+	font-size: var(--font-size-s);
+}
+</style>
diff --git a/packages/editor-ui/src/components/AssignmentCollection/__tests__/Assignment.test.ts b/packages/editor-ui/src/components/AssignmentCollection/__tests__/Assignment.test.ts
new file mode 100644
index 0000000000000..6d2f438afe855
--- /dev/null
+++ b/packages/editor-ui/src/components/AssignmentCollection/__tests__/Assignment.test.ts
@@ -0,0 +1,54 @@
+import { createComponentRenderer } from '@/__tests__/render';
+import { createTestingPinia } from '@pinia/testing';
+import userEvent from '@testing-library/user-event';
+import Assignment from '../Assignment.vue';
+
+const DEFAULT_SETUP = {
+	pinia: createTestingPinia(),
+	props: {
+		path: 'parameters.fields.0',
+		modelValue: {
+			name: '',
+			type: 'string',
+			value: '',
+		},
+		issues: [],
+	},
+};
+
+const renderComponent = createComponentRenderer(Assignment, DEFAULT_SETUP);
+
+describe('Assignment.vue', () => {
+	afterEach(() => {
+		vi.clearAllMocks();
+	});
+
+	it('can edit name, type and value', async () => {
+		const { getByTestId, baseElement, emitted } = renderComponent();
+
+		const nameField = getByTestId('assignment-name').querySelector('input') as HTMLInputElement;
+		const valueField = getByTestId('assignment-value').querySelector('input') as HTMLInputElement;
+
+		expect(getByTestId('assignment')).toBeInTheDocument();
+		expect(getByTestId('assignment-name')).toBeInTheDocument();
+		expect(getByTestId('assignment-value')).toBeInTheDocument();
+		expect(getByTestId('assignment-type-select')).toBeInTheDocument();
+
+		await userEvent.type(nameField, 'New name');
+		await userEvent.type(valueField, 'New value');
+
+		await userEvent.click(baseElement.querySelectorAll('.option')[3]);
+
+		expect(emitted('update:model-value')[0]).toEqual([
+			{ name: 'New name', type: 'array', value: 'New value' },
+		]);
+	});
+
+	it('can remove itself', async () => {
+		const { getByTestId, emitted } = renderComponent();
+
+		await userEvent.click(getByTestId('assignment-remove'));
+
+		expect(emitted('remove')).toEqual([[]]);
+	});
+});
diff --git a/packages/editor-ui/src/components/AssignmentCollection/__tests__/AssignmentCollection.test.ts b/packages/editor-ui/src/components/AssignmentCollection/__tests__/AssignmentCollection.test.ts
new file mode 100644
index 0000000000000..28b2e1755633f
--- /dev/null
+++ b/packages/editor-ui/src/components/AssignmentCollection/__tests__/AssignmentCollection.test.ts
@@ -0,0 +1,121 @@
+import { createComponentRenderer } from '@/__tests__/render';
+import { useNDVStore } from '@/stores/ndv.store';
+import { createTestingPinia } from '@pinia/testing';
+import userEvent from '@testing-library/user-event';
+import { fireEvent, within } from '@testing-library/vue';
+import * as workflowHelpers from '@/composables/useWorkflowHelpers';
+import AssignmentCollection from '../AssignmentCollection.vue';
+import { createPinia, setActivePinia } from 'pinia';
+
+const DEFAULT_SETUP = {
+	pinia: createTestingPinia(),
+	props: {
+		path: 'parameters.fields',
+		node: {
+			parameters: {},
+			id: 'f63efb2d-3cc5-4500-89f9-b39aab19baf5',
+			name: 'Edit Fields',
+			type: 'n8n-nodes-base.set',
+			typeVersion: 3.3,
+			position: [1120, 380],
+			credentials: {},
+			disabled: false,
+		},
+		parameter: { name: 'fields', displayName: 'Fields To Set' },
+		value: {},
+	},
+};
+
+const renderComponent = createComponentRenderer(AssignmentCollection, DEFAULT_SETUP);
+
+const getInput = (e: HTMLElement): HTMLInputElement => {
+	return e.querySelector('input') as HTMLInputElement;
+};
+
+const getAssignmentType = (assignment: HTMLElement): string => {
+	return getInput(within(assignment).getByTestId('assignment-type-select')).value;
+};
+
+async function dropAssignment({
+	key,
+	value,
+	dropArea,
+}: {
+	key: string;
+	value: unknown;
+	dropArea: HTMLElement;
+}): Promise<void> {
+	useNDVStore().draggableStartDragging({
+		type: 'mapping',
+		data: `{{ $json.${key} }}`,
+		dimensions: null,
+	});
+
+	vitest.spyOn(workflowHelpers, 'resolveParameter').mockReturnValueOnce(value as never);
+
+	await userEvent.hover(dropArea);
+	await fireEvent.mouseUp(dropArea);
+}
+
+describe('AssignmentCollection.vue', () => {
+	afterEach(() => {
+		vi.clearAllMocks();
+	});
+
+	it('renders empty state properly', async () => {
+		const { getByTestId, queryByTestId } = renderComponent();
+		expect(getByTestId('assignment-collection-fields')).toBeInTheDocument();
+		expect(getByTestId('assignment-collection-fields')).toHaveClass('empty');
+		expect(getByTestId('assignment-collection-drop-area')).toHaveTextContent(
+			'Drag input fields here',
+		);
+		expect(queryByTestId('assignment')).not.toBeInTheDocument();
+	});
+
+	it('can add and remove assignments', async () => {
+		const { getByTestId, findAllByTestId } = renderComponent();
+
+		await userEvent.click(getByTestId('assignment-collection-drop-area'));
+		await userEvent.click(getByTestId('assignment-collection-drop-area'));
+
+		let assignments = await findAllByTestId('assignment');
+
+		expect(assignments.length).toEqual(2);
+
+		await userEvent.type(getInput(within(assignments[1]).getByTestId('assignment-name')), 'second');
+		await userEvent.type(
+			getInput(within(assignments[1]).getByTestId('assignment-value')),
+			'secondValue',
+		);
+		await userEvent.click(within(assignments[0]).getByTestId('assignment-remove'));
+
+		assignments = await findAllByTestId('assignment');
+		expect(assignments.length).toEqual(1);
+		expect(getInput(within(assignments[0]).getByTestId('assignment-value'))).toHaveValue(
+			'secondValue',
+		);
+	});
+
+	it('can add assignments by drag and drop (and infer type)', async () => {
+		const pinia = createPinia();
+		setActivePinia(pinia);
+
+		const { getByTestId, findAllByTestId } = renderComponent({ pinia });
+		const dropArea = getByTestId('assignment-collection-drop-area');
+
+		await dropAssignment({ key: 'boolKey', value: true, dropArea });
+		await dropAssignment({ key: 'stringKey', value: 'stringValue', dropArea });
+		await dropAssignment({ key: 'numberKey', value: 25, dropArea });
+		await dropAssignment({ key: 'objectKey', value: {}, dropArea });
+		await dropAssignment({ key: 'arrayKey', value: [], dropArea });
+
+		let assignments = await findAllByTestId('assignment');
+
+		expect(assignments.length).toBe(5);
+		expect(getAssignmentType(assignments[0])).toEqual('Boolean');
+		expect(getAssignmentType(assignments[1])).toEqual('String');
+		expect(getAssignmentType(assignments[2])).toEqual('Number');
+		expect(getAssignmentType(assignments[3])).toEqual('Object');
+		expect(getAssignmentType(assignments[4])).toEqual('Array');
+	});
+});
diff --git a/packages/editor-ui/src/components/AssignmentCollection/__tests__/TypeSelect.test.ts b/packages/editor-ui/src/components/AssignmentCollection/__tests__/TypeSelect.test.ts
new file mode 100644
index 0000000000000..78f4b683c6a85
--- /dev/null
+++ b/packages/editor-ui/src/components/AssignmentCollection/__tests__/TypeSelect.test.ts
@@ -0,0 +1,41 @@
+import { createComponentRenderer } from '@/__tests__/render';
+import { createTestingPinia } from '@pinia/testing';
+import userEvent from '@testing-library/user-event';
+import TypeSelect from '../TypeSelect.vue';
+
+const DEFAULT_SETUP = {
+	pinia: createTestingPinia(),
+	props: {
+		modelValue: 'boolean',
+	},
+};
+
+const renderComponent = createComponentRenderer(TypeSelect, DEFAULT_SETUP);
+
+describe('TypeSelect.vue', () => {
+	afterEach(() => {
+		vi.clearAllMocks();
+	});
+
+	it('renders default state correctly and emit events', async () => {
+		const { getByTestId, baseElement, emitted } = renderComponent();
+		expect(getByTestId('assignment-type-select')).toBeInTheDocument();
+
+		await userEvent.click(
+			getByTestId('assignment-type-select').querySelector('.select-trigger') as HTMLElement,
+		);
+
+		const options = baseElement.querySelectorAll('.option');
+		expect(options.length).toEqual(5);
+
+		expect(options[0]).toHaveTextContent('String');
+		expect(options[1]).toHaveTextContent('Number');
+		expect(options[2]).toHaveTextContent('Boolean');
+		expect(options[3]).toHaveTextContent('Array');
+		expect(options[4]).toHaveTextContent('Object');
+
+		await userEvent.click(options[2]);
+
+		expect(emitted('update:model-value')).toEqual([['boolean']]);
+	});
+});
diff --git a/packages/editor-ui/src/components/AssignmentCollection/__tests__/utils.test.ts b/packages/editor-ui/src/components/AssignmentCollection/__tests__/utils.test.ts
new file mode 100644
index 0000000000000..7767a2a4bad6b
--- /dev/null
+++ b/packages/editor-ui/src/components/AssignmentCollection/__tests__/utils.test.ts
@@ -0,0 +1,15 @@
+import { nameFromExpression } from '../utils';
+
+describe('AssignmentCollection > utils', () => {
+	describe('nameFromExpression', () => {
+		test('should extract assignment name from previous node', () => {
+			expect(nameFromExpression('{{ $json.foo.bar }}')).toBe('foo.bar');
+		});
+
+		test('should extract assignment name from another node', () => {
+			expect(nameFromExpression("{{ $('Node's \"Name\" (copy)').item.json.foo.bar }}")).toBe(
+				'foo.bar',
+			);
+		});
+	});
+});
diff --git a/packages/editor-ui/src/components/AssignmentCollection/constants.ts b/packages/editor-ui/src/components/AssignmentCollection/constants.ts
new file mode 100644
index 0000000000000..c448f96ce8dfa
--- /dev/null
+++ b/packages/editor-ui/src/components/AssignmentCollection/constants.ts
@@ -0,0 +1,7 @@
+export const ASSIGNMENT_TYPES = [
+	{ type: 'string', icon: 'font' },
+	{ type: 'number', icon: 'hashtag' },
+	{ type: 'boolean', icon: 'check-square' },
+	{ type: 'array', icon: 'list' },
+	{ type: 'object', icon: 'cube' },
+];
diff --git a/packages/editor-ui/src/components/AssignmentCollection/utils.ts b/packages/editor-ui/src/components/AssignmentCollection/utils.ts
new file mode 100644
index 0000000000000..55c7556fb73e7
--- /dev/null
+++ b/packages/editor-ui/src/components/AssignmentCollection/utils.ts
@@ -0,0 +1,64 @@
+import { isObject } from 'lodash-es';
+import type { AssignmentValue, IDataObject } from 'n8n-workflow';
+import { resolveParameter } from '@/composables/useWorkflowHelpers';
+import { v4 as uuid } from 'uuid';
+
+export function nameFromExpression(expression: string): string {
+	return expression
+		.replace(/^{{\s*|\s*}}$/g, '')
+		.replace('$json.', '')
+		.replace(/^\$\(.*\)(\.item\.json)?\.(.*)/, '$2');
+}
+
+export function inferAssignmentType(value: unknown): string {
+	if (typeof value === 'boolean') return 'boolean';
+	if (typeof value === 'number') return 'number';
+	if (typeof value === 'string') return 'string';
+	if (Array.isArray(value)) return 'array';
+	if (isObject(value)) return 'object';
+	return 'string';
+}
+
+export function typeFromExpression(expression: string): string {
+	try {
+		const resolved = resolveParameter(`=${expression}`);
+		return inferAssignmentType(resolved);
+	} catch (error) {
+		return 'string';
+	}
+}
+
+export function inputDataToAssignments(input: IDataObject): AssignmentValue[] {
+	const assignments: AssignmentValue[] = [];
+
+	function processValue(value: IDataObject, path: Array<string | number> = []) {
+		if (Array.isArray(value)) {
+			value.forEach((element, index) => {
+				processValue(element, [...path, index]);
+			});
+		} else if (isObject(value)) {
+			for (const [key, objectValue] of Object.entries(value)) {
+				processValue(objectValue as IDataObject, [...path, key]);
+			}
+		} else {
+			const stringPath = path.reduce((fullPath: string, part) => {
+				if (typeof part === 'number') {
+					return `${fullPath}[${part}]`;
+				}
+				return `${fullPath}.${part}`;
+			}, '$json');
+
+			const expression = `={{ ${stringPath} }}`;
+			assignments.push({
+				id: uuid(),
+				name: stringPath.replace('$json.', ''),
+				value: expression,
+				type: inferAssignmentType(value),
+			});
+		}
+	}
+
+	processValue(input);
+
+	return assignments;
+}
diff --git a/packages/editor-ui/src/components/Badge.vue b/packages/editor-ui/src/components/Badge.vue
index 0275081a73f02..25ffed271c912 100644
--- a/packages/editor-ui/src/components/Badge.vue
+++ b/packages/editor-ui/src/components/Badge.vue
@@ -1,12 +1,21 @@
 <template>
-	<fragment>
-		<el-tag v-if="type === 'danger'" type="danger" size="small" :class="$style['danger']">
-			{{ text }}
-		</el-tag>
-		<el-tag v-else-if="type === 'warning'" size="small" :class="$style['warning']">
-			{{ text }}
-		</el-tag>
-	</fragment>
+	<el-tag
+		v-if="type === 'danger'"
+		type="danger"
+		size="small"
+		:class="$style['danger']"
+		:disable-transitions="true"
+	>
+		{{ text }}
+	</el-tag>
+	<el-tag
+		v-else-if="type === 'warning'"
+		size="small"
+		:class="$style['warning']"
+		:disable-transitions="true"
+	>
+		{{ text }}
+	</el-tag>
 </template>
 
 <script lang="ts">
diff --git a/packages/editor-ui/src/components/Banner.vue b/packages/editor-ui/src/components/Banner.vue
index 8b48fe6883af4..27188e535b484 100644
--- a/packages/editor-ui/src/components/Banner.vue
+++ b/packages/editor-ui/src/components/Banner.vue
@@ -1,5 +1,5 @@
 <template>
-	<el-tag :type="theme" size="medium" :disable-transitions="true" :class="$style.container">
+	<el-tag :type="theme" :disable-transitions="true" :class="$style.container">
 		<font-awesome-icon
 			:icon="theme === 'success' ? 'check-circle' : 'exclamation-triangle'"
 			:class="theme === 'success' ? $style.icon : $style.dangerIcon"
@@ -16,7 +16,7 @@
 				</div>
 			</div>
 
-			<slot name="button" v-if="$slots.button" />
+			<slot v-if="$slots.button" name="button" />
 			<n8n-button
 				v-else-if="buttonLabel"
 				:label="buttonLoading && buttonLoadingLabel ? buttonLoadingLabel : buttonLabel"
@@ -40,11 +40,6 @@ import { defineComponent } from 'vue';
 
 export default defineComponent({
 	name: 'Banner',
-	data() {
-		return {
-			expanded: false,
-		};
-	},
 	props: {
 		theme: {
 			type: String,
@@ -70,6 +65,11 @@ export default defineComponent({
 			default: false,
 		},
 	},
+	data() {
+		return {
+			expanded: false,
+		};
+	},
 	methods: {
 		expand() {
 			this.expanded = true;
@@ -112,7 +112,7 @@ export default defineComponent({
 
 .dangerMessage {
 	composes: message;
-	color: var(--color-danger);
+	color: var(--color-callout-danger-font);
 }
 
 .banner {
diff --git a/packages/editor-ui/src/components/BecomeTemplateCreatorCta/BecomeTemplateCreatorCta.vue b/packages/editor-ui/src/components/BecomeTemplateCreatorCta/BecomeTemplateCreatorCta.vue
new file mode 100644
index 0000000000000..90bcbcabf769c
--- /dev/null
+++ b/packages/editor-ui/src/components/BecomeTemplateCreatorCta/BecomeTemplateCreatorCta.vue
@@ -0,0 +1,86 @@
+<script setup lang="ts">
+import { useTelemetry } from '@/composables/useTelemetry';
+import { useBecomeTemplateCreatorStore } from './becomeTemplateCreatorStore';
+import { useI18n } from '@/composables/useI18n';
+
+const i18n = useI18n();
+const store = useBecomeTemplateCreatorStore();
+const telemetry = useTelemetry();
+
+const onClick = () => {
+	telemetry.track('User clicked become creator CTA');
+};
+</script>
+
+<template>
+	<div
+		v-if="store.showBecomeCreatorCta"
+		:class="$style.container"
+		data-test-id="become-template-creator-cta"
+	>
+		<div :class="$style.textAndCloseButton">
+			<p :class="$style.text">
+				{{ i18n.baseText('becomeCreator.text') }}
+			</p>
+
+			<button
+				:class="$style.closeButton"
+				data-test-id="close-become-template-creator-cta"
+				@click="store.dismissCta()"
+			>
+				<n8n-icon icon="times" size="xsmall" :title="i18n.baseText('generic.close')" />
+			</button>
+		</div>
+
+		<n8n-button
+			:class="$style.becomeCreatorButton"
+			:label="i18n.baseText('becomeCreator.buttonText')"
+			size="xmini"
+			type="secondary"
+			element="a"
+			href="https://creators.n8n.io/hub"
+			target="_blank"
+			@click="onClick"
+		/>
+	</div>
+</template>
+
+<style module lang="scss">
+.container {
+	display: flex;
+	flex-direction: column;
+	background-color: var(--color-background-light);
+	border: var(--border-base);
+	border-right: 0;
+}
+
+.textAndCloseButton {
+	display: flex;
+	margin-top: var(--spacing-xs);
+	margin-left: var(--spacing-s);
+	margin-right: var(--spacing-2xs);
+}
+
+.text {
+	flex: 1;
+	font-size: var(--font-size-3xs);
+	line-height: var(--font-line-height-compact);
+}
+
+.closeButton {
+	flex: 0;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	width: var(--spacing-2xs);
+	height: var(--spacing-2xs);
+	border: none;
+	color: var(--color-text-light);
+	background-color: transparent;
+	cursor: pointer;
+}
+
+.becomeCreatorButton {
+	margin: var(--spacing-s);
+}
+</style>
diff --git a/packages/editor-ui/src/components/BecomeTemplateCreatorCta/becomeTemplateCreatorStore.ts b/packages/editor-ui/src/components/BecomeTemplateCreatorCta/becomeTemplateCreatorStore.ts
new file mode 100644
index 0000000000000..83785e0faef2d
--- /dev/null
+++ b/packages/editor-ui/src/components/BecomeTemplateCreatorCta/becomeTemplateCreatorStore.ts
@@ -0,0 +1,94 @@
+import { DateTime } from 'luxon';
+import { defineStore } from 'pinia';
+import { computed, ref } from 'vue';
+import { STORES } from '@/constants';
+import { useCloudPlanStore } from '@/stores/cloudPlan.store';
+import { useStorage } from '@/composables/useStorage';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import { getBecomeCreatorCta } from '@/api/ctas';
+
+const LOCAL_STORAGE_KEY = 'N8N_BECOME_TEMPLATE_CREATOR_CTA_DISMISSED_AT';
+const RESHOW_DISMISSED_AFTER_DAYS = 30;
+const POLL_INTERVAL_IN_MS = 15 * 60 * 1000; // 15 minutes
+
+export const useBecomeTemplateCreatorStore = defineStore(STORES.BECOME_TEMPLATE_CREATOR, () => {
+	const cloudPlanStore = useCloudPlanStore();
+	const rootStore = useRootStore();
+
+	//#region State
+
+	const dismissedAt = useStorage(LOCAL_STORAGE_KEY);
+	const ctaMeetsCriteria = ref(false);
+	const monitorCtasTimer = ref<ReturnType<typeof setInterval> | null>(null);
+
+	//#endregion State
+
+	//#region Computed
+
+	const isDismissed = computed(() => {
+		return dismissedAt.value ? !hasEnoughTimePassedSinceDismissal(dismissedAt.value) : false;
+	});
+
+	const showBecomeCreatorCta = computed(() => {
+		return ctaMeetsCriteria.value && !cloudPlanStore.userIsTrialing && !isDismissed.value;
+	});
+
+	//#endregion Computed
+
+	//#region Actions
+
+	const dismissCta = () => {
+		dismissedAt.value = DateTime.now().toISO();
+	};
+
+	const fetchBecomeCreatorCta = async () => {
+		const becomeCreatorCta = await getBecomeCreatorCta(rootStore.getRestApiContext);
+
+		ctaMeetsCriteria.value = becomeCreatorCta;
+	};
+
+	const fetchUserCtasIfNeeded = async () => {
+		if (isDismissed.value || cloudPlanStore.userIsTrialing || ctaMeetsCriteria.value) {
+			return;
+		}
+
+		await fetchBecomeCreatorCta();
+	};
+
+	const startMonitoringCta = () => {
+		if (monitorCtasTimer.value) {
+			return;
+		}
+
+		// Initial check after 1s so we don't bombard the API immediately during startup
+		setTimeout(fetchUserCtasIfNeeded, 1000);
+
+		monitorCtasTimer.value = setInterval(fetchUserCtasIfNeeded, POLL_INTERVAL_IN_MS);
+	};
+
+	const stopMonitoringCta = () => {
+		if (!monitorCtasTimer.value) {
+			return;
+		}
+
+		clearInterval(monitorCtasTimer.value);
+		monitorCtasTimer.value = null;
+	};
+
+	//#endregion Actions
+
+	return {
+		showBecomeCreatorCta,
+		dismissCta,
+		startMonitoringCta,
+		stopMonitoringCta,
+	};
+});
+
+function hasEnoughTimePassedSinceDismissal(dismissedAt: string) {
+	const reshowAtTime = DateTime.fromISO(dismissedAt).plus({
+		days: RESHOW_DISMISSED_AFTER_DAYS,
+	});
+
+	return reshowAtTime <= DateTime.now();
+}
diff --git a/packages/editor-ui/src/components/BinaryDataDisplay.vue b/packages/editor-ui/src/components/BinaryDataDisplay.vue
index 4129fbe5807b9..b84af41bb4feb 100644
--- a/packages/editor-ui/src/components/BinaryDataDisplay.vue
+++ b/packages/editor-ui/src/components/BinaryDataDisplay.vue
@@ -1,36 +1,36 @@
 <template>
 	<div v-if="windowVisible" :class="['binary-data-window', binaryData?.fileType]">
 		<n8n-button
-			@click.stop="closeWindow"
 			size="small"
 			class="binary-data-window-back"
 			:title="$locale.baseText('binaryDataDisplay.backToOverviewPage')"
 			icon="arrow-left"
 			:label="$locale.baseText('binaryDataDisplay.backToList')"
+			@click.stop="closeWindow"
 		/>
 
 		<div class="binary-data-window-wrapper">
 			<div v-if="!binaryData">
 				{{ $locale.baseText('binaryDataDisplay.noDataFoundToDisplay') }}
 			</div>
-			<BinaryDataDisplayEmbed v-else :binaryData="binaryData" />
+			<BinaryDataDisplayEmbed v-else :binary-data="binaryData" />
 		</div>
 	</div>
 </template>
 
 <script lang="ts">
+import { defineComponent } from 'vue';
+import { mapStores } from 'pinia';
 import type { IBinaryData, IRunData } from 'n8n-workflow';
 
 import BinaryDataDisplayEmbed from '@/components/BinaryDataDisplayEmbed.vue';
 
-import { nodeHelpers } from '@/mixins/nodeHelpers';
-
-import mixins from 'vue-typed-mixins';
-import { mapStores } from 'pinia';
-import { useWorkflowsStore } from '@/stores/workflows';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useNodeHelpers } from '@/composables/useNodeHelpers';
 
-export default mixins(nodeHelpers).extend({
+export default defineComponent({
 	name: 'BinaryDataDisplay',
+
 	components: {
 		BinaryDataDisplayEmbed,
 	},
@@ -38,10 +38,17 @@ export default mixins(nodeHelpers).extend({
 		'displayData', // IBinaryData
 		'windowVisible', // boolean
 	],
+	setup() {
+		const nodeHelpers = useNodeHelpers();
+
+		return {
+			nodeHelpers,
+		};
+	},
 	computed: {
 		...mapStores(useWorkflowsStore),
 		binaryData(): IBinaryData | null {
-			const binaryData = this.getBinaryData(
+			const binaryData = this.nodeHelpers.getBinaryData(
 				this.workflowRunData,
 				this.displayData.node,
 				this.displayData.runIndex,
@@ -92,7 +99,7 @@ export default mixins(nodeHelpers).extend({
 	z-index: 10;
 	width: 100%;
 	height: calc(100% - 50px);
-	background-color: var(--color-background-base);
+	background-color: var(--color-run-data-background);
 	overflow: hidden;
 	text-align: center;
 
diff --git a/packages/editor-ui/src/components/BinaryDataDisplayEmbed.vue b/packages/editor-ui/src/components/BinaryDataDisplayEmbed.vue
index 9b534b6f1f57b..719cb53b7d76c 100644
--- a/packages/editor-ui/src/components/BinaryDataDisplayEmbed.vue
+++ b/packages/editor-ui/src/components/BinaryDataDisplayEmbed.vue
@@ -7,30 +7,37 @@
 				<source :src="embedSource" :type="binaryData.mimeType" />
 				{{ $locale.baseText('binaryDataDisplay.yourBrowserDoesNotSupport') }}
 			</video>
-			<vue-json-pretty
+			<audio v-else-if="binaryData.fileType === 'audio'" controls autoplay>
+				<source :src="embedSource" :type="binaryData.mimeType" />
+				{{ $locale.baseText('binaryDataDisplay.yourBrowserDoesNotSupport') }}
+			</audio>
+			<VueJsonPretty
 				v-else-if="binaryData.fileType === 'json'"
-				:data="jsonData"
+				:data="data"
 				:deep="3"
-				:showLength="true"
+				:show-length="true"
 			/>
+			<RunDataHtml v-else-if="binaryData.fileType === 'html'" :input-html="data" />
 			<embed v-else :src="embedSource" class="binary-data" :class="embedClass()" />
 		</span>
 	</span>
 </template>
 
 <script lang="ts">
+import { defineComponent } from 'vue';
+import { mapStores } from 'pinia';
 import type { IBinaryData } from 'n8n-workflow';
 import { jsonParse } from 'n8n-workflow';
 import type { PropType } from 'vue';
 import VueJsonPretty from 'vue-json-pretty';
-import { mapStores } from 'pinia';
-import { useWorkflowsStore } from '@/stores';
-import Vue from 'vue';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import RunDataHtml from '@/components/RunDataHtml.vue';
 
-export default Vue.extend({
+export default defineComponent({
 	name: 'BinaryDataDisplayEmbed',
 	components: {
 		VueJsonPretty,
+		RunDataHtml,
 	},
 	props: {
 		binaryData: {
@@ -43,27 +50,29 @@ export default Vue.extend({
 			isLoading: true,
 			embedSource: '',
 			error: false,
-			jsonData: '',
+			data: '',
 		};
 	},
 	computed: {
 		...mapStores(useWorkflowsStore),
 	},
 	async mounted() {
-		const { id, data, fileName, fileType, mimeType } = (this.binaryData || {}) as IBinaryData;
+		const { id, data, fileName, fileType, mimeType } = this.binaryData;
 		const isJSONData = fileType === 'json';
+		const isHTMLData = fileType === 'html';
 
 		if (!id) {
-			if (isJSONData) {
-				this.jsonData = jsonParse(atob(data));
+			if (isJSONData || isHTMLData) {
+				this.data = jsonParse(atob(data));
 			} else {
 				this.embedSource = 'data:' + mimeType + ';base64,' + data;
 			}
 		} else {
 			try {
 				const binaryUrl = this.workflowsStore.getBinaryUrl(id, 'view', fileName, mimeType);
-				if (isJSONData) {
-					this.jsonData = await (await fetch(binaryUrl)).json();
+				if (isJSONData || isHTMLData) {
+					const fetchedData = await fetch(binaryUrl, { credentials: 'include' });
+					this.data = await (isJSONData ? fetchedData.json() : fetchedData.text());
 				} else {
 					this.embedSource = binaryUrl;
 				}
@@ -76,7 +85,7 @@ export default Vue.extend({
 	},
 	methods: {
 		embedClass(): string[] {
-			const { fileType } = (this.binaryData || {}) as IBinaryData;
+			const { fileType } = this.binaryData;
 			return [fileType ?? 'other'];
 		},
 	},
@@ -92,7 +101,8 @@ export default Vue.extend({
 		max-width: calc(100% - 1em);
 	}
 
-	&.other {
+	&.other,
+	&.pdf {
 		height: calc(100% - 1em);
 		width: calc(100% - 1em);
 	}
diff --git a/packages/editor-ui/src/components/BreakpointsObserver.vue b/packages/editor-ui/src/components/BreakpointsObserver.vue
index 0e639c5566ffc..0676c31c25ae6 100644
--- a/packages/editor-ui/src/components/BreakpointsObserver.vue
+++ b/packages/editor-ui/src/components/BreakpointsObserver.vue
@@ -1,10 +1,11 @@
 <template>
 	<span>
-		<slot v-bind:bp="bp" v-bind:value="value" />
+		<slot :bp="bp" :value="value" />
 	</span>
 </template>
 
 <script lang="ts">
+import { defineComponent } from 'vue';
 import { BREAKPOINT_SM, BREAKPOINT_MD, BREAKPOINT_LG, BREAKPOINT_XL } from '@/constants';
 
 /**
@@ -16,67 +17,57 @@ import { BREAKPOINT_SM, BREAKPOINT_MD, BREAKPOINT_LG, BREAKPOINT_XL } from '@/co
  * xl >= 1920
  */
 
-import mixins from 'vue-typed-mixins';
-import { genericHelpers } from '@/mixins/genericHelpers';
-import { debounceHelper } from '@/mixins/debounce';
+import { useUIStore } from '@/stores/ui.store';
+import { getBannerRowHeight } from '@/utils/htmlUtils';
+import { useDebounce } from '@/composables/useDebounce';
 
-export default mixins(genericHelpers, debounceHelper).extend({
+export default defineComponent({
 	name: 'BreakpointsObserver',
 	props: ['valueXS', 'valueXL', 'valueLG', 'valueMD', 'valueSM', 'valueDefault'],
+	setup() {
+		const { callDebounced } = useDebounce();
+		return { callDebounced };
+	},
 	data() {
 		return {
 			width: window.innerWidth,
 		};
 	},
-	created() {
-		window.addEventListener('resize', this.onResize);
-	},
-	beforeDestroy() {
-		window.removeEventListener('resize', this.onResize);
-	},
-	methods: {
-		onResize() {
-			this.callDebounced('onResizeEnd', { debounceTime: 50 });
-		},
-		onResizeEnd() {
-			this.$data.width = window.innerWidth;
-		},
-	},
 	computed: {
 		bp(): string {
-			if (this.$data.width < BREAKPOINT_SM) {
+			if (this.width < BREAKPOINT_SM) {
 				return 'XS';
 			}
 
-			if (this.$data.width >= BREAKPOINT_XL) {
+			if (this.width >= BREAKPOINT_XL) {
 				return 'XL';
 			}
 
-			if (this.$data.width >= BREAKPOINT_LG) {
+			if (this.width >= BREAKPOINT_LG) {
 				return 'LG';
 			}
 
-			if (this.$data.width >= BREAKPOINT_MD) {
+			if (this.width >= BREAKPOINT_MD) {
 				return 'MD';
 			}
 
 			return 'SM';
 		},
-		// eslint-disable-next-line @typescript-eslint/no-explicit-any
-		value(): any | undefined {
-			if (this.valueXS !== undefined && this.$data.width < BREAKPOINT_SM) {
+
+		value(): number | undefined {
+			if (this.valueXS !== undefined && this.width < BREAKPOINT_SM) {
 				return this.valueXS;
 			}
 
-			if (this.valueXL !== undefined && this.$data.width >= BREAKPOINT_XL) {
+			if (this.valueXL !== undefined && this.width >= BREAKPOINT_XL) {
 				return this.valueXL;
 			}
 
-			if (this.valueLG !== undefined && this.$data.width >= BREAKPOINT_LG) {
+			if (this.valueLG !== undefined && this.width >= BREAKPOINT_LG) {
 				return this.valueLG;
 			}
 
-			if (this.valueMD !== undefined && this.$data.width >= BREAKPOINT_MD) {
+			if (this.valueMD !== undefined && this.width >= BREAKPOINT_MD) {
 				return this.valueMD;
 			}
 
@@ -87,5 +78,23 @@ export default mixins(genericHelpers, debounceHelper).extend({
 			return this.valueDefault;
 		},
 	},
+	created() {
+		window.addEventListener('resize', this.onResize);
+	},
+	beforeUnmount() {
+		window.removeEventListener('resize', this.onResize);
+	},
+	methods: {
+		onResize() {
+			void this.callDebounced(this.onResizeEnd, { debounceTime: 50 });
+		},
+		async onResizeEnd() {
+			this.width = window.innerWidth;
+			await this.$nextTick();
+
+			const bannerHeight = await getBannerRowHeight();
+			useUIStore().updateBannersHeight(bannerHeight);
+		},
+	},
 });
 </script>
diff --git a/packages/editor-ui/src/components/CanvasControls.vue b/packages/editor-ui/src/components/CanvasControls.vue
index e8fe2c409e082..de0ff8eb7cdbe 100644
--- a/packages/editor-ui/src/components/CanvasControls.vue
+++ b/packages/editor-ui/src/components/CanvasControls.vue
@@ -6,52 +6,71 @@
 			[$style.demoZoomMenu]: isDemo,
 		}"
 	>
-		<n8n-icon-button
-			@click="zoomToFit"
-			type="tertiary"
-			size="large"
-			:title="$locale.baseText('nodeView.zoomToFit')"
-			icon="expand"
-			data-test-id="zoom-to-fit"
-		/>
-		<n8n-icon-button
-			@click="zoomIn"
-			type="tertiary"
-			size="large"
-			:title="$locale.baseText('nodeView.zoomIn')"
-			icon="search-plus"
-			data-test-id="zoom-in-button"
-		/>
-		<n8n-icon-button
-			@click="zoomOut"
-			type="tertiary"
-			size="large"
-			:title="$locale.baseText('nodeView.zoomOut')"
-			icon="search-minus"
-			data-test-id="zoom-out-button"
-		/>
-		<n8n-icon-button
-			v-if="nodeViewScale !== 1 && !isDemo"
-			@click="resetZoom"
-			type="tertiary"
-			size="large"
-			:title="$locale.baseText('nodeView.resetZoom')"
-			icon="undo"
-			data-test-id="reset-zoom-button"
-		/>
+		<KeyboardShortcutTooltip
+			:label="$locale.baseText('nodeView.zoomToFit')"
+			:shortcut="{ keys: ['1'] }"
+		>
+			<n8n-icon-button
+				type="tertiary"
+				size="large"
+				icon="expand"
+				data-test-id="zoom-to-fit"
+				@click="zoomToFit"
+			/>
+		</KeyboardShortcutTooltip>
+		<KeyboardShortcutTooltip
+			:label="$locale.baseText('nodeView.zoomIn')"
+			:shortcut="{ keys: ['+'] }"
+		>
+			<n8n-icon-button
+				type="tertiary"
+				size="large"
+				icon="search-plus"
+				data-test-id="zoom-in-button"
+				@click="zoomIn"
+			/>
+		</KeyboardShortcutTooltip>
+		<KeyboardShortcutTooltip
+			:label="$locale.baseText('nodeView.zoomOut')"
+			:shortcut="{ keys: ['-'] }"
+		>
+			<n8n-icon-button
+				type="tertiary"
+				size="large"
+				icon="search-minus"
+				data-test-id="zoom-out-button"
+				@click="zoomOut"
+			/>
+		</KeyboardShortcutTooltip>
+		<KeyboardShortcutTooltip
+			:label="$locale.baseText('nodeView.resetZoom')"
+			:shortcut="{ keys: ['0'] }"
+		>
+			<n8n-icon-button
+				v-if="nodeViewScale !== 1 && !isDemo"
+				type="tertiary"
+				size="large"
+				icon="undo"
+				data-test-id="reset-zoom-button"
+				@click="resetZoom"
+			/>
+		</KeyboardShortcutTooltip>
 	</div>
 </template>
 <script lang="ts" setup>
 import { onBeforeMount, onBeforeUnmount } from 'vue';
 import { storeToRefs } from 'pinia';
-import { useCanvasStore } from '@/stores/canvas';
+import { useCanvasStore } from '@/stores/canvas.store';
+import KeyboardShortcutTooltip from '@/components/KeyboardShortcutTooltip.vue';
+import { useDeviceSupport } from 'n8n-design-system';
 
 const canvasStore = useCanvasStore();
 const { zoomToFit, zoomIn, zoomOut, resetZoom } = canvasStore;
 const { nodeViewScale, isDemo } = storeToRefs(canvasStore);
+const deviceSupport = useDeviceSupport();
 
 const keyDown = (e: KeyboardEvent) => {
-	const isCtrlKeyPressed = e.metaKey || e.ctrlKey;
+	const isCtrlKeyPressed = deviceSupport.isCtrlKeyPressed(e);
 	if ((e.key === '=' || e.key === '+') && !isCtrlKeyPressed) {
 		zoomIn();
 	} else if ((e.key === '_' || e.key === '-') && !isCtrlKeyPressed) {
@@ -75,9 +94,8 @@ onBeforeUnmount(() => {
 <style lang="scss" module>
 .zoomMenu {
 	position: absolute;
-	width: 210px;
-	bottom: 108px;
-	left: 35px;
+	bottom: var(--spacing-l);
+	left: var(--spacing-l);
 	line-height: 25px;
 	color: #444;
 	padding-right: 5px;
diff --git a/packages/editor-ui/src/components/ChangePasswordModal.vue b/packages/editor-ui/src/components/ChangePasswordModal.vue
index e87a5bfc7e04e..978ec9cedb830 100644
--- a/packages/editor-ui/src/components/ChangePasswordModal.vue
+++ b/packages/editor-ui/src/components/ChangePasswordModal.vue
@@ -1,18 +1,18 @@
 <template>
 	<Modal
 		:name="CHANGE_PASSWORD_MODAL_KEY"
-		@enter="onSubmit"
 		:title="$locale.baseText('auth.changePassword')"
 		:center="true"
 		width="460px"
-		:eventBus="modalBus"
+		:event-bus="modalBus"
+		@enter="onSubmit"
 	>
 		<template #content>
 			<n8n-form-inputs
 				:inputs="config"
-				:eventBus="formBus"
-				:columnView="true"
-				@input="onInput"
+				:event-bus="formBus"
+				:column-view="true"
+				@update="onInput"
 				@submit="onSubmit"
 			/>
 		</template>
@@ -20,33 +20,38 @@
 			<n8n-button
 				:loading="loading"
 				:label="$locale.baseText('auth.changePassword')"
-				@click="onSubmitClick"
 				float="right"
 				data-test-id="change-password-button"
+				@click="onSubmitClick"
 			/>
 		</template>
 	</Modal>
 </template>
 
 <script lang="ts">
-import mixins from 'vue-typed-mixins';
+import { defineComponent } from 'vue';
 
-import { showMessage } from '@/mixins/showMessage';
-import Modal from './Modal.vue';
-import type { IFormInputs } from '@/Interface';
 import { CHANGE_PASSWORD_MODAL_KEY } from '../constants';
+import { useToast } from '@/composables/useToast';
+import Modal from '@/components/Modal.vue';
+import type { IFormInputs } from '@/Interface';
 import { mapStores } from 'pinia';
-import { useUsersStore } from '@/stores/users';
-import { createEventBus } from '@/event-bus';
+import { useUsersStore } from '@/stores/users.store';
+import { createEventBus } from 'n8n-design-system/utils';
 
-export default mixins(showMessage).extend({
-	components: { Modal },
+export default defineComponent({
 	name: 'ChangePasswordModal',
+	components: { Modal },
 	props: {
 		modalName: {
 			type: String,
 		},
 	},
+	setup() {
+		return {
+			...useToast(),
+		};
+	},
 	data() {
 		return {
 			config: null as null | IFormInputs,
@@ -61,7 +66,7 @@ export default mixins(showMessage).extend({
 		...mapStores(useUsersStore),
 	},
 	mounted() {
-		this.config = [
+		const form: IFormInputs = [
 			{
 				name: 'currentPassword',
 				properties: {
@@ -102,6 +107,8 @@ export default mixins(showMessage).extend({
 				},
 			},
 		];
+
+		this.config = form;
 	},
 	methods: {
 		passwordsMatch(value: string | number | boolean | null | undefined) {
@@ -122,12 +129,12 @@ export default mixins(showMessage).extend({
 				this.password = e.value;
 			}
 		},
-		async onSubmit(values: { [key: string]: string }) {
+		async onSubmit(values: { currentPassword: string; password: string }) {
 			try {
 				this.loading = true;
 				await this.usersStore.updateCurrentUserPassword(values);
 
-				this.$showMessage({
+				this.showMessage({
 					type: 'success',
 					title: this.$locale.baseText('auth.changePassword.passwordUpdated'),
 					message: this.$locale.baseText('auth.changePassword.passwordUpdatedMessage'),
@@ -135,7 +142,7 @@ export default mixins(showMessage).extend({
 
 				this.modalBus.emit('close');
 			} catch (error) {
-				this.$showError(error, this.$locale.baseText('auth.changePassword.error'));
+				this.showError(error, this.$locale.baseText('auth.changePassword.error'));
 			}
 			this.loading = false;
 		},
diff --git a/packages/editor-ui/src/components/ChatEmbedModal.vue b/packages/editor-ui/src/components/ChatEmbedModal.vue
new file mode 100644
index 0000000000000..26e0cbcbd862e
--- /dev/null
+++ b/packages/editor-ui/src/components/ChatEmbedModal.vue
@@ -0,0 +1,197 @@
+<script lang="ts" setup>
+import type { PropType } from 'vue';
+import { computed, ref } from 'vue';
+import type { EventBus } from 'n8n-design-system/utils';
+import { createEventBus } from 'n8n-design-system/utils';
+import Modal from './Modal.vue';
+import { CHAT_EMBED_MODAL_KEY, CHAT_TRIGGER_NODE_TYPE, WEBHOOK_NODE_TYPE } from '../constants';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import HtmlEditor from '@/components/HtmlEditor/HtmlEditor.vue';
+import JsEditor from '@/components/JsEditor/JsEditor.vue';
+import { useI18n } from '@/composables/useI18n';
+
+const props = defineProps({
+	modalBus: {
+		type: Object as PropType<EventBus>,
+		default: () => createEventBus(),
+	},
+});
+
+const i18n = useI18n();
+const rootStore = useRootStore();
+const workflowsStore = useWorkflowsStore();
+
+const tabs = ref([
+	{
+		label: 'CDN Embed',
+		value: 'cdn',
+	},
+	{
+		label: 'Vue Embed',
+		value: 'vue',
+	},
+	{
+		label: 'React Embed',
+		value: 'react',
+	},
+	{
+		label: 'Other',
+		value: 'other',
+	},
+]);
+const currentTab = ref('cdn');
+
+const webhookNode = computed(() => {
+	for (const type of [CHAT_TRIGGER_NODE_TYPE, WEBHOOK_NODE_TYPE]) {
+		const node = workflowsStore.workflow.nodes.find((node) => node.type === type);
+		if (node) {
+			// This has to be kept up-to-date with the mode in the Chat-Trigger node
+			if (type === CHAT_TRIGGER_NODE_TYPE && !node.parameters.public) {
+				continue;
+			}
+
+			return {
+				type,
+				node,
+			};
+		}
+	}
+
+	return null;
+});
+
+const webhookUrl = computed(() => {
+	const url = `${rootStore.getWebhookUrl}${
+		webhookNode.value ? `/${webhookNode.value.node.webhookId}` : ''
+	}`;
+
+	return webhookNode.value?.type === CHAT_TRIGGER_NODE_TYPE ? `${url}/chat` : url;
+});
+
+function indentLines(code: string, indent: string = '	') {
+	return code
+		.split('\n')
+		.map((line) => `${indent}${line}`)
+		.join('\n');
+}
+
+const importCode = 'import'; // To avoid vite from parsing the import statement
+const commonCode = computed(() => ({
+	import: `${importCode} '@n8n/chat/style.css';
+${importCode} { createChat } from '@n8n/chat';`,
+	createChat: `createChat({
+	webhookUrl: '${webhookUrl.value}'
+});`,
+	install: 'npm install @n8n/chat',
+}));
+
+const cdnCode = computed(
+	() => `<link href="https://cdn.jsdelivr.net/npm/@n8n/chat/style.css" rel="stylesheet" />
+<script type="module">
+${importCode} { createChat } from 'https://cdn.jsdelivr.net/npm/@n8n/chat/chat.bundle.es.js';
+
+${commonCode.value.createChat}
+</${'script'}>`,
+);
+
+const vueCode = computed(
+	() => `<script lang="ts" setup>
+${importCode} { onMounted } from 'vue';
+${commonCode.value.import}
+
+onMounted(() => {
+${indentLines(commonCode.value.createChat)}
+});
+</${'script'}>`,
+);
+
+const reactCode = computed(
+	() => `${importCode} { useEffect } from 'react';
+${commonCode.value.import}
+
+export const App = () => {
+	useEffect(() => {
+${indentLines(commonCode.value.createChat, '		')}
+	}, []);
+
+	return (<div></div>);
+};
+
+</${'script'}>`,
+);
+
+const otherCode = computed(
+	() => `${commonCode.value.import}
+
+${commonCode.value.createChat}`,
+);
+
+function closeDialog() {
+	props.modalBus.emit('close');
+}
+</script>
+
+<template>
+	<Modal
+		max-width="960px"
+		:title="i18n.baseText('chatEmbed.title')"
+		:event-bus="modalBus"
+		:name="CHAT_EMBED_MODAL_KEY"
+		:center="true"
+	>
+		<template #content>
+			<div :class="$style.container">
+				<n8n-tabs v-model="currentTab" :options="tabs" />
+
+				<div v-if="currentTab !== 'cdn'">
+					<div class="mb-s">
+						<n8n-text>
+							{{ i18n.baseText('chatEmbed.install') }}
+						</n8n-text>
+					</div>
+					<HtmlEditor :model-value="commonCode.install" is-read-only />
+				</div>
+
+				<div class="mb-s">
+					<n8n-text>
+						<i18n-t :keypath="`chatEmbed.paste.${currentTab}`">
+							<template #code>
+								<code>{{ i18n.baseText(`chatEmbed.paste.${currentTab}.file`) }}</code>
+							</template>
+						</i18n-t>
+					</n8n-text>
+				</div>
+
+				<HtmlEditor v-if="currentTab === 'cdn'" :model-value="cdnCode" is-read-only />
+				<HtmlEditor v-if="currentTab === 'vue'" :model-value="vueCode" is-read-only />
+				<JsEditor v-if="currentTab === 'react'" :model-value="reactCode" is-read-only />
+				<JsEditor v-if="currentTab === 'other'" :model-value="otherCode" is-read-only />
+
+				<n8n-text>
+					{{ i18n.baseText('chatEmbed.packageInfo.description') }}
+					<n8n-link :href="i18n.baseText('chatEmbed.url')" new-window bold>
+						{{ i18n.baseText('chatEmbed.packageInfo.link') }}
+					</n8n-link>
+				</n8n-text>
+
+				<n8n-info-tip class="mt-s">
+					{{ i18n.baseText('chatEmbed.chatTriggerNode') }}
+				</n8n-info-tip>
+			</div>
+		</template>
+
+		<template #footer>
+			<div class="action-buttons">
+				<n8n-button float="right" :label="i18n.baseText('chatEmbed.close')" @click="closeDialog" />
+			</div>
+		</template>
+	</Modal>
+</template>
+
+<style module lang="scss">
+.container > * {
+	margin-bottom: var(--spacing-s);
+	overflow-wrap: break-word;
+}
+</style>
diff --git a/packages/editor-ui/src/components/CodeEdit.vue b/packages/editor-ui/src/components/CodeEdit.vue
deleted file mode 100644
index b798e5d9fb3f1..0000000000000
--- a/packages/editor-ui/src/components/CodeEdit.vue
+++ /dev/null
@@ -1,282 +0,0 @@
-<template>
-	<el-dialog
-		visible
-		append-to-body
-		:close-on-click-modal="false"
-		width="80%"
-		:title="`${$locale.baseText('codeEdit.edit')} ${$locale
-			.nodeText()
-			.inputLabelDisplayName(parameter, path)}`"
-		:before-close="closeDialog"
-	>
-		<div class="text-editor-wrapper ignore-key-press">
-			<code-editor
-				:value="value"
-				:autocomplete="loadAutocompleteData"
-				:readonly="readonly"
-				@input="$emit('valueChanged', $event)"
-			/>
-		</div>
-	</el-dialog>
-</template>
-
-<script lang="ts">
-import { genericHelpers } from '@/mixins/genericHelpers';
-import { workflowHelpers } from '@/mixins/workflowHelpers';
-
-import mixins from 'vue-typed-mixins';
-import type { INodeUi } from '@/Interface';
-import { IExecutionResponse } from '@/Interface';
-import type {
-	IBinaryKeyData,
-	IDataObject,
-	INodeExecutionData,
-	IRunExecutionData,
-	IWorkflowDataProxyAdditionalKeys,
-} from 'n8n-workflow';
-import { WorkflowDataProxy } from 'n8n-workflow';
-
-import { PLACEHOLDER_FILLED_AT_EXECUTION_TIME } from '@/constants';
-import { CodeEditor } from './forms';
-import { mapStores } from 'pinia';
-import { useWorkflowsStore } from '@/stores/workflows';
-import { useRootStore } from '@/stores/n8nRootStore';
-import { useNDVStore } from '@/stores/ndv';
-
-export default mixins(genericHelpers, workflowHelpers).extend({
-	name: 'CodeEdit',
-	components: {
-		CodeEditor,
-	},
-	props: ['codeAutocomplete', 'parameter', 'path', 'type', 'value', 'readonly'],
-	computed: {
-		...mapStores(useNDVStore, useRootStore, useWorkflowsStore),
-	},
-	methods: {
-		loadAutocompleteData(): string[] {
-			if (['function', 'functionItem'].includes(this.codeAutocomplete)) {
-				const itemIndex = 0;
-				const inputName = 'main';
-				const mode = 'manual';
-				let runIndex = 0;
-
-				const executedWorkflow = this.workflowsStore.getWorkflowExecution;
-				const workflow = this.getCurrentWorkflow();
-				const activeNode: INodeUi | null = this.ndvStore.activeNode;
-				const parentNode = workflow.getParentNodes(activeNode!.name, inputName, 1);
-				const nodeConnection = workflow.getNodeConnectionIndexes(
-					activeNode!.name,
-					parentNode[0],
-				) || {
-					sourceIndex: 0,
-					destinationIndex: 0,
-				};
-
-				const executionData = this.workflowsStore.getWorkflowExecution;
-
-				let runExecutionData: IRunExecutionData;
-				if (!executionData || !executionData.data) {
-					runExecutionData = {
-						resultData: {
-							runData: {},
-						},
-					};
-				} else {
-					runExecutionData = executionData.data;
-					if (runExecutionData.resultData.runData[activeNode!.name]) {
-						runIndex = runExecutionData.resultData.runData[activeNode!.name].length - 1;
-					}
-				}
-
-				const connectionInputData = this.connectionInputData(
-					parentNode,
-					activeNode!.name,
-					inputName,
-					runIndex,
-					nodeConnection,
-				);
-
-				const additionalProxyKeys: IWorkflowDataProxyAdditionalKeys = {
-					$execution: {
-						id: PLACEHOLDER_FILLED_AT_EXECUTION_TIME,
-						mode: 'test',
-						resumeUrl: PLACEHOLDER_FILLED_AT_EXECUTION_TIME,
-					},
-
-					// deprecated
-					$executionId: PLACEHOLDER_FILLED_AT_EXECUTION_TIME,
-					$resumeWebhookUrl: PLACEHOLDER_FILLED_AT_EXECUTION_TIME,
-				};
-
-				const dataProxy = new WorkflowDataProxy(
-					workflow,
-					runExecutionData,
-					runIndex,
-					itemIndex,
-					activeNode!.name,
-					connectionInputData || [],
-					{},
-					mode,
-					this.rootStore.timezone,
-					additionalProxyKeys,
-				);
-				const proxy = dataProxy.getDataProxy();
-
-				const autoCompleteItems = [
-					'function $evaluateExpression(expression: string, itemIndex?: number): any {};',
-					'function getNodeParameter(parameterName: string, itemIndex: number, fallbackValue?: any): any {};',
-					'function getWorkflowStaticData(type: string): {};',
-					'function $item(itemIndex: number, runIndex?: number): {};',
-					'function $items(nodeName?: string, outputIndex?: number, runIndex?: number): {};',
-				];
-
-				const baseKeys = [
-					'$env',
-					'$executionId',
-					'$mode',
-					'$parameter',
-					'$resumeWebhookUrl',
-					'$vars',
-					'$workflow',
-					'$now',
-					'$today',
-					'$thisRunIndex',
-					'DateTime',
-					'Duration',
-					'Interval',
-				];
-
-				const functionItemKeys = ['$json', '$binary', '$position', '$thisItem', '$thisItemIndex'];
-
-				const additionalKeys: string[] = [];
-				if (this.codeAutocomplete === 'functionItem') {
-					additionalKeys.push(...functionItemKeys);
-				}
-
-				if (executedWorkflow && connectionInputData && connectionInputData.length) {
-					baseKeys.push(...additionalKeys);
-				} else {
-					additionalKeys.forEach((key) => {
-						autoCompleteItems.push(`const ${key} = {}`);
-					});
-				}
-
-				for (const key of baseKeys) {
-					autoCompleteItems.push(
-						`const ${key} = ${JSON.stringify(this.createSimpleRepresentation(proxy[key]))}`,
-					);
-				}
-
-				// Add the nodes and their simplified data
-				const nodes: {
-					[key: string]: INodeExecutionData;
-				} = {};
-				for (const [nodeName, node] of Object.entries(workflow.nodes)) {
-					// To not load to much data create a simple representation.
-					nodes[nodeName] = {
-						json: {} as IDataObject,
-						parameter: this.createSimpleRepresentation(
-							proxy.$node[nodeName].parameter,
-						) as IDataObject,
-					};
-
-					try {
-						nodes[nodeName]!.json = this.createSimpleRepresentation(
-							proxy.$node[nodeName].json,
-						) as IDataObject;
-						nodes[nodeName]!.context = this.createSimpleRepresentation(
-							proxy.$node[nodeName].context,
-						) as IDataObject;
-						nodes[nodeName]!.runIndex = proxy.$node[nodeName].runIndex;
-						if (Object.keys(proxy.$node[nodeName].binary).length) {
-							nodes[nodeName]!.binary = this.createSimpleRepresentation(
-								proxy.$node[nodeName].binary,
-							) as IBinaryKeyData;
-						}
-					} catch (error) {}
-				}
-				autoCompleteItems.push(`const $node = ${JSON.stringify(nodes)}`);
-				autoCompleteItems.push('function $jmespath(jsonDoc: object, query: string): {};');
-
-				if (this.codeAutocomplete === 'function') {
-					if (connectionInputData) {
-						autoCompleteItems.push(
-							`const items = ${JSON.stringify(
-								this.createSimpleRepresentation(connectionInputData),
-							)}`,
-						);
-					} else {
-						autoCompleteItems.push('const items: {json: {[key: string]: any}}[] = []');
-					}
-				} else if (this.codeAutocomplete === 'functionItem') {
-					if (connectionInputData) {
-						autoCompleteItems.push('const item = $json');
-					} else {
-						autoCompleteItems.push('const item: {[key: string]: any} = {}');
-					}
-				}
-
-				return autoCompleteItems;
-			}
-
-			return [];
-		},
-		closeDialog() {
-			// Handle the close externally as the visible parameter is an external prop
-			// and is so not allowed to be changed here.
-			this.$emit('closeDialog');
-			return false;
-		},
-
-		createSimpleRepresentation(
-			inputData:
-				| object
-				| null
-				| undefined
-				| boolean
-				| string
-				| number
-				| boolean[]
-				| string[]
-				| number[]
-				| object[],
-		):
-			| object
-			| null
-			| undefined
-			| boolean
-			| string
-			| number
-			| boolean[]
-			| string[]
-			| number[]
-			| object[] {
-			if (inputData === null || inputData === undefined) {
-				return inputData;
-			} else if (typeof inputData === 'string') {
-				return '';
-			} else if (typeof inputData === 'boolean') {
-				return true;
-			} else if (typeof inputData === 'number') {
-				return 1;
-			} else if (Array.isArray(inputData)) {
-				return inputData.map((value) => this.createSimpleRepresentation(value));
-			} else if (typeof inputData === 'object') {
-				const returnData: { [key: string]: object } = {};
-				Object.keys(inputData).forEach((key) => {
-					// @ts-ignore
-					returnData[key] = this.createSimpleRepresentation(inputData[key]);
-				});
-				return returnData;
-			}
-			return inputData;
-		},
-	},
-});
-</script>
-
-<style scoped>
-.text-editor {
-	min-height: 30rem;
-}
-</style>
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/AskAI/AskAI.vue b/packages/editor-ui/src/components/CodeNodeEditor/AskAI/AskAI.vue
new file mode 100644
index 0000000000000..ce06458366efd
--- /dev/null
+++ b/packages/editor-ui/src/components/CodeNodeEditor/AskAI/AskAI.vue
@@ -0,0 +1,393 @@
+<script setup lang="ts">
+import { ref, computed, onMounted } from 'vue';
+import { snakeCase } from 'lodash-es';
+import { useSessionStorage } from '@vueuse/core';
+
+import { N8nButton, N8nInput, N8nTooltip } from 'n8n-design-system/components';
+import type { CodeExecutionMode, INodeExecutionData } from 'n8n-workflow';
+
+import type { BaseTextKey } from '@/plugins/i18n';
+import type { INodeUi, Schema } from '@/Interface';
+import { generateCodeForPrompt } from '@/api/ai';
+import { useTelemetry } from '@/composables/useTelemetry';
+import { useDataSchema } from '@/composables/useDataSchema';
+import { useI18n } from '@/composables/useI18n';
+import { useMessage } from '@/composables/useMessage';
+import { useToast } from '@/composables/useToast';
+import { useNDVStore } from '@/stores/ndv.store';
+import { usePostHog } from '@/stores/posthog.store';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { executionDataToJson } from '@/utils/nodeTypesUtils';
+import {
+	ASK_AI_EXPERIMENT,
+	ASK_AI_MAX_PROMPT_LENGTH,
+	ASK_AI_MIN_PROMPT_LENGTH,
+	ASK_AI_LOADING_DURATION_MS,
+} from '@/constants';
+
+const emit = defineEmits<{
+	(e: 'submit', code: string): void;
+	(e: 'replaceCode', code: string): void;
+	(e: 'startedLoading'): void;
+	(e: 'finishedLoading'): void;
+}>();
+
+const props = defineProps<{
+	hasChanges: boolean;
+}>();
+
+const { getSchemaForExecutionData, getInputDataWithPinned } = useDataSchema();
+const i18n = useI18n();
+
+const loadingPhraseIndex = ref(0);
+const loaderProgress = ref(0);
+
+const isLoading = ref(false);
+const prompt = ref('');
+const parentNodes = ref<INodeUi[]>([]);
+
+const isSubmitEnabled = computed(() => {
+	return (
+		!isEachItemMode.value &&
+		prompt.value.length >= ASK_AI_MIN_PROMPT_LENGTH &&
+		hasExecutionData.value
+	);
+});
+const hasExecutionData = computed(() => (useNDVStore().ndvInputData || []).length > 0);
+const loadingString = computed(() =>
+	i18n.baseText(`codeNodeEditor.askAi.loadingPhrase${loadingPhraseIndex.value}` as BaseTextKey),
+);
+const isEachItemMode = computed(() => {
+	const mode = useNDVStore().activeNode?.parameters.mode as CodeExecutionMode;
+
+	return mode === 'runOnceForEachItem';
+});
+
+function getErrorMessageByStatusCode(statusCode: number) {
+	const errorMessages: Record<number, string> = {
+		400: i18n.baseText('codeNodeEditor.askAi.generationFailedUnknown'),
+		413: i18n.baseText('codeNodeEditor.askAi.generationFailedTooLarge'),
+		429: i18n.baseText('codeNodeEditor.askAi.generationFailedRate'),
+		500: i18n.baseText('codeNodeEditor.askAi.generationFailedUnknown'),
+	};
+
+	return errorMessages[statusCode] || i18n.baseText('codeNodeEditor.askAi.generationFailedUnknown');
+}
+
+function getParentNodes() {
+	const activeNode = useNDVStore().activeNode;
+	const { getCurrentWorkflow, getNodeByName } = useWorkflowsStore();
+	const workflow = getCurrentWorkflow();
+
+	if (!activeNode || !workflow) return [];
+
+	return workflow
+		.getParentNodesByDepth(activeNode?.name)
+		.filter(({ name }, i, nodes) => {
+			return name !== activeNode.name && nodes.findIndex((node) => node.name === name) === i;
+		})
+		.map((n) => getNodeByName(n.name))
+		.filter((n) => n !== null) as INodeUi[];
+}
+
+function getSchemas() {
+	const parentNodesNames = parentNodes.value.map((node) => node?.name);
+	const parentNodesSchemas: Array<{ nodeName: string; schema: Schema }> = parentNodes.value
+		.map((node) => {
+			const inputData: INodeExecutionData[] = getInputDataWithPinned(node);
+
+			return {
+				nodeName: node?.name || '',
+				schema: getSchemaForExecutionData(executionDataToJson(inputData), true),
+			};
+		})
+		.filter((node) => node.schema?.value.length > 0);
+
+	const inputSchema = parentNodesSchemas.shift();
+
+	return {
+		parentNodesNames,
+		inputSchema,
+		parentNodesSchemas,
+	};
+}
+
+function startLoading() {
+	emit('startedLoading');
+	loaderProgress.value = 0;
+	isLoading.value = true;
+
+	triggerLoadingChange();
+}
+
+function stopLoading() {
+	loaderProgress.value = 100;
+	emit('finishedLoading');
+
+	setTimeout(() => {
+		isLoading.value = false;
+	}, 200);
+}
+
+async function onSubmit() {
+	const { getRestApiContext } = useRootStore();
+	const { activeNode } = useNDVStore();
+	const { showMessage } = useToast();
+	const { alert } = useMessage();
+	if (!activeNode) return;
+	const schemas = getSchemas();
+
+	if (props.hasChanges) {
+		const confirmModal = await alert(i18n.baseText('codeNodeEditor.askAi.areYouSureToReplace'), {
+			title: i18n.baseText('codeNodeEditor.askAi.replaceCurrentCode'),
+			confirmButtonText: i18n.baseText('codeNodeEditor.askAi.generateCodeAndReplace'),
+			showClose: true,
+			showCancelButton: true,
+		});
+
+		if (confirmModal === 'cancel') {
+			return;
+		}
+	}
+
+	startLoading();
+
+	try {
+		const version = useRootStore().versionCli;
+		const model =
+			usePostHog().getVariant(ASK_AI_EXPERIMENT.name) === ASK_AI_EXPERIMENT.gpt4
+				? 'gpt-4'
+				: 'gpt-3.5-turbo-16k';
+
+		const { code } = await generateCodeForPrompt(getRestApiContext, {
+			question: prompt.value,
+			context: {
+				schema: schemas.parentNodesSchemas,
+				inputSchema: schemas.inputSchema!,
+				ndvPushRef: useNDVStore().pushRef,
+				pushRef: useRootStore().pushRef,
+			},
+			model,
+			n8nVersion: version,
+		});
+
+		stopLoading();
+		emit('replaceCode', code);
+		showMessage({
+			type: 'success',
+			title: i18n.baseText('codeNodeEditor.askAi.generationCompleted'),
+		});
+		useTelemetry().trackAskAI('askAi.generationFinished', {
+			prompt: prompt.value,
+			code,
+		});
+	} catch (error) {
+		showMessage({
+			type: 'error',
+			title: i18n.baseText('codeNodeEditor.askAi.generationFailed'),
+			message: getErrorMessageByStatusCode(error.httpStatusCode || error?.response.status),
+		});
+		stopLoading();
+		useTelemetry().trackAskAI('askAi.generationFinished', {
+			prompt: prompt.value,
+			code: '',
+			hasError: true,
+		});
+	}
+}
+function triggerLoadingChange() {
+	const loadingPhraseUpdateMs = 2000;
+	const loadingPhrasesCount = 8;
+	let start: number | null = null;
+	let lastPhraseChange = 0;
+	const step = (timestamp: number) => {
+		if (!start) start = timestamp;
+
+		// Loading phrase change
+		if (!lastPhraseChange || timestamp - lastPhraseChange >= loadingPhraseUpdateMs) {
+			loadingPhraseIndex.value = Math.floor(Math.random() * loadingPhrasesCount);
+			lastPhraseChange = timestamp;
+		}
+
+		// Loader progress change
+		const elapsed = timestamp - start;
+		loaderProgress.value = Math.min((elapsed / ASK_AI_LOADING_DURATION_MS) * 100, 100);
+
+		if (!isLoading.value) return;
+		if (loaderProgress.value < 100 || lastPhraseChange + loadingPhraseUpdateMs > timestamp) {
+			window.requestAnimationFrame(step);
+		}
+	};
+
+	window.requestAnimationFrame(step);
+}
+
+function getSessionStoragePrompt() {
+	const codeNodeName = (useNDVStore().activeNode?.name as string) ?? '';
+	const hashedCode = snakeCase(codeNodeName);
+
+	return useSessionStorage(`ask_ai_prompt__${hashedCode}`, '');
+}
+
+function onPromptInput(inputValue: string) {
+	getSessionStoragePrompt().value = inputValue;
+}
+
+onMounted(() => {
+	// Restore prompt from session storage(with empty string fallback)
+	prompt.value = getSessionStoragePrompt().value;
+	parentNodes.value = getParentNodes();
+});
+</script>
+
+<template>
+	<div>
+		<p :class="$style.intro" v-text="i18n.baseText('codeNodeEditor.askAi.intro')" />
+		<div :class="$style.inputContainer">
+			<div :class="$style.meta">
+				<span
+					v-show="prompt.length > 1"
+					:class="$style.counter"
+					data-test-id="ask-ai-prompt-counter"
+					v-text="`${prompt.length} / ${ASK_AI_MAX_PROMPT_LENGTH}`"
+				/>
+				<a href="https://docs.n8n.io/code-examples/ai-code" target="_blank" :class="$style.help">
+					<n8n-icon icon="question-circle" color="text-light" size="large" />{{
+						i18n.baseText('codeNodeEditor.askAi.help')
+					}}
+				</a>
+			</div>
+			<N8nInput
+				v-model="prompt"
+				:class="$style.input"
+				type="textarea"
+				:rows="6"
+				:maxlength="ASK_AI_MAX_PROMPT_LENGTH"
+				:placeholder="i18n.baseText('codeNodeEditor.askAi.placeholder')"
+				data-test-id="ask-ai-prompt-input"
+				@input="onPromptInput"
+			/>
+		</div>
+		<div :class="$style.controls">
+			<div v-if="isLoading" :class="$style.loader">
+				<transition name="text-fade-in-out" mode="out-in">
+					<div :key="loadingPhraseIndex" v-text="loadingString" />
+				</transition>
+				<n8n-circle-loader :radius="8" :progress="loaderProgress" :stroke-width="3" />
+			</div>
+			<N8nTooltip v-else :disabled="isSubmitEnabled">
+				<div>
+					<N8nButton
+						:disabled="!isSubmitEnabled"
+						size="small"
+						data-test-id="ask-ai-cta"
+						@click="onSubmit"
+					>
+						{{ i18n.baseText('codeNodeEditor.askAi.generateCode') }}
+					</N8nButton>
+				</div>
+				<template #content>
+					<span
+						v-if="!hasExecutionData"
+						data-test-id="ask-ai-cta-tooltip-no-input-data"
+						v-text="i18n.baseText('codeNodeEditor.askAi.noInputData')"
+					/>
+					<span
+						v-else-if="prompt.length === 0"
+						data-test-id="ask-ai-cta-tooltip-no-prompt"
+						v-text="i18n.baseText('codeNodeEditor.askAi.noPrompt')"
+					/>
+					<span
+						v-else-if="isEachItemMode"
+						data-test-id="ask-ai-cta-tooltip-only-all-items-mode"
+						v-text="i18n.baseText('codeNodeEditor.askAi.onlyAllItemsMode')"
+					/>
+					<span
+						v-else-if="prompt.length < ASK_AI_MIN_PROMPT_LENGTH"
+						data-test-id="ask-ai-cta-tooltip-prompt-too-short"
+						v-text="
+							i18n.baseText('codeNodeEditor.askAi.promptTooShort', {
+								interpolate: { minLength: ASK_AI_MIN_PROMPT_LENGTH.toString() },
+							})
+						"
+					/>
+				</template>
+			</N8nTooltip>
+		</div>
+	</div>
+</template>
+
+<style scoped>
+.text-fade-in-out-enter-active,
+.text-fade-in-out-leave-active {
+	transition:
+		opacity 0.5s ease-in-out,
+		transform 0.5s ease-in-out;
+}
+.text-fade-in-out-enter,
+.text-fade-in-out-leave-to {
+	opacity: 0;
+	transform: translateX(10px);
+}
+.text-fade-in-out-enter-to,
+.text-fade-in-out-leave {
+	opacity: 1;
+}
+</style>
+
+<style module lang="scss">
+.input * {
+	border: 0 !important;
+}
+.input textarea {
+	font-size: var(--font-size-2xs);
+	padding-bottom: var(--spacing-2xl);
+	font-family: var(--font-family);
+	resize: none;
+}
+.intro {
+	font-weight: var(--font-weight-bold);
+	font-size: var(--font-size-2xs);
+	color: var(--color-text-dark);
+	padding: var(--spacing-2xs) var(--spacing-xs) 0;
+}
+.loader {
+	font-size: var(--font-size-2xs);
+	color: var(--color-text-dark);
+	display: flex;
+	align-items: center;
+	gap: var(--spacing-2xs);
+}
+.inputContainer {
+	position: relative;
+}
+.help {
+	text-decoration: underline;
+	margin-left: auto;
+	color: #909399;
+}
+.meta {
+	display: flex;
+	justify-content: space-between;
+	position: absolute;
+	bottom: var(--spacing-2xs);
+	left: var(--spacing-xs);
+	right: var(--spacing-xs);
+	z-index: 1;
+
+	* {
+		font-size: var(--font-size-2xs);
+		line-height: 1;
+	}
+}
+.counter {
+	color: var(--color-text-light);
+}
+.controls {
+	padding: var(--spacing-2xs) var(--spacing-xs);
+	display: flex;
+	justify-content: flex-end;
+	border-top: 1px solid var(--border-color-base);
+}
+</style>
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
index 8899ab74f6c7b..911454c368db2 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
+++ b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
@@ -1,99 +1,302 @@
 <template>
 	<div
-		:class="$style['code-node-editor-container']"
+		ref="codeNodeEditorContainer"
+		:class="['code-node-editor', $style['code-node-editor-container'], language]"
 		@mouseover="onMouseOver"
 		@mouseout="onMouseOut"
-		ref="codeNodeEditorContainer"
 	>
-		<div ref="codeNodeEditor" class="ph-no-capture"></div>
-		<n8n-button
-			v-if="isCloud && (isEditorHovered || isEditorFocused)"
-			size="small"
-			type="tertiary"
-			:class="$style['ask-ai-button']"
-			@mousedown="onAskAiButtonClick"
+		<el-tabs
+			v-if="aiEnabled"
+			ref="tabs"
+			v-model="activeTab"
+			type="card"
+			:before-leave="onBeforeTabLeave"
 		>
-			{{ $locale.baseText('codeNodeEditor.askAi') }}
-		</n8n-button>
+			<el-tab-pane
+				:label="$locale.baseText('codeNodeEditor.tabs.code')"
+				name="code"
+				data-test-id="code-node-tab-code"
+			>
+				<div
+					ref="codeNodeEditor"
+					:class="['ph-no-capture', 'code-editor-tabs', $style.editorInput]"
+				/>
+				<slot name="suffix" />
+			</el-tab-pane>
+			<el-tab-pane
+				:label="$locale.baseText('codeNodeEditor.tabs.askAi')"
+				name="ask-ai"
+				data-test-id="code-node-tab-ai"
+			>
+				<!-- Key the AskAI tab to make sure it re-mounts when changing tabs -->
+				<AskAI
+					:key="activeTab"
+					:has-changes="hasChanges"
+					@replace-code="onReplaceCode"
+					@started-loading="isLoadingAIResponse = true"
+					@finished-loading="isLoadingAIResponse = false"
+				/>
+			</el-tab-pane>
+		</el-tabs>
+		<!-- If AskAi not enabled, there's no point in rendering tabs -->
+		<div v-else :class="$style.fillHeight">
+			<div ref="codeNodeEditor" :class="['ph-no-capture', $style.fillHeight]" />
+			<slot name="suffix" />
+		</div>
 	</div>
 </template>
 
 <script lang="ts">
-import mixins from 'vue-typed-mixins';
-
+import { defineComponent } from 'vue';
+import type { PropType } from 'vue';
+import jsParser from 'prettier/plugins/babel';
+import { format } from 'prettier';
+import * as estree from 'prettier/plugins/estree';
+import { mapStores } from 'pinia';
+import type { LanguageSupport } from '@codemirror/language';
+import type { Extension, Line } from '@codemirror/state';
 import { Compartment, EditorState } from '@codemirror/state';
 import type { ViewUpdate } from '@codemirror/view';
 import { EditorView } from '@codemirror/view';
 import { javascript } from '@codemirror/lang-javascript';
+import { python } from '@codemirror/lang-python';
+import type { CodeExecutionMode, CodeNodeEditorLanguage } from 'n8n-workflow';
+import { CODE_EXECUTION_MODES, CODE_LANGUAGES } from 'n8n-workflow';
 
-import { baseExtensions } from './baseExtensions';
+import { ASK_AI_EXPERIMENT, CODE_NODE_TYPE } from '@/constants';
+import { codeNodeEditorEventBus } from '@/event-bus';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import { usePostHog } from '@/stores/posthog.store';
+
+import { readOnlyEditorExtensions, writableEditorExtensions } from './baseExtensions';
+import { CODE_PLACEHOLDERS } from './constants';
 import { linterExtension } from './linter';
 import { completerExtension } from './completer';
-import { CODE_NODE_EDITOR_THEME } from './theme';
-import { workflowHelpers } from '@/mixins/workflowHelpers'; // for json field completions
-import { ASK_AI_MODAL_KEY, CODE_NODE_TYPE } from '@/constants';
-import { codeNodeEditorEventBus } from '@/event-bus';
-import { ALL_ITEMS_PLACEHOLDER, EACH_ITEM_PLACEHOLDER } from './constants';
-import { mapStores } from 'pinia';
-import { useRootStore } from '@/stores/n8nRootStore';
-import Modal from '../Modal.vue';
-import { useSettingsStore } from '@/stores/settings';
+import { codeNodeEditorTheme } from './theme';
+import AskAI from './AskAI/AskAI.vue';
+import { useMessage } from '@/composables/useMessage';
+import { useSettingsStore } from '@/stores/settings.store';
 
-export default mixins(linterExtension, completerExtension, workflowHelpers).extend({
-	name: 'code-node-editor',
-	components: { Modal },
+export default defineComponent({
+	name: 'CodeNodeEditor',
+	components: {
+		AskAI,
+	},
+	mixins: [linterExtension, completerExtension],
 	props: {
+		aiButtonEnabled: {
+			type: Boolean,
+			default: false,
+		},
+		fillParent: {
+			type: Boolean,
+			default: false,
+		},
 		mode: {
-			type: String,
-			validator: (value: string): boolean =>
-				['runOnceForAllItems', 'runOnceForEachItem'].includes(value),
+			type: String as PropType<CodeExecutionMode>,
+			validator: (value: CodeExecutionMode): boolean => CODE_EXECUTION_MODES.includes(value),
+			required: true,
+		},
+		language: {
+			type: String as PropType<CodeNodeEditorLanguage>,
+			default: 'javaScript' as CodeNodeEditorLanguage,
+			validator: (value: CodeNodeEditorLanguage): boolean => CODE_LANGUAGES.includes(value),
 		},
 		isReadOnly: {
 			type: Boolean,
 			default: false,
 		},
-		jsCode: {
+		rows: {
+			type: Number,
+			default: 4,
+		},
+		modelValue: {
 			type: String,
+			required: true,
 		},
 	},
+	setup() {
+		return {
+			...useMessage(),
+		};
+	},
 	data() {
 		return {
 			editor: null as EditorView | null,
+			languageCompartment: new Compartment(),
 			linterCompartment: new Compartment(),
 			isEditorHovered: false,
 			isEditorFocused: false,
+			tabs: ['code', 'ask-ai'],
+			activeTab: 'code',
+			hasChanges: false,
+			isLoadingAIResponse: false,
 		};
 	},
 	watch: {
-		mode() {
+		mode(newMode, previousMode: CodeExecutionMode) {
 			this.reloadLinter();
-			this.refreshPlaceholder();
+
+			if (
+				this.getCurrentEditorContent().trim() === CODE_PLACEHOLDERS[this.language]?.[previousMode]
+			) {
+				this.refreshPlaceholder();
+			}
+		},
+		language(newLanguage, previousLanguage: CodeNodeEditorLanguage) {
+			if (
+				this.getCurrentEditorContent().trim() === CODE_PLACEHOLDERS[previousLanguage]?.[this.mode]
+			) {
+				this.refreshPlaceholder();
+			}
+
+			const [languageSupport] = this.languageExtensions;
+			this.editor?.dispatch({
+				effects: this.languageCompartment.reconfigure(languageSupport),
+			});
+		},
+		aiEnabled: {
+			immediate: true,
+			async handler(isEnabled) {
+				if (isEnabled && !this.modelValue) {
+					this.$emit('update:modelValue', this.placeholder);
+				}
+				await this.$nextTick();
+				this.hasChanges = this.modelValue !== this.placeholder;
+			},
 		},
 	},
 	computed: {
-		...mapStores(useRootStore),
-		isCloud() {
-			return useSettingsStore().deploymentType === 'cloud';
-		},
-		content(): string {
-			if (!this.editor) return '';
+		...mapStores(useRootStore, usePostHog, useSettingsStore),
+		aiEnabled(): boolean {
+			const isAiExperimentEnabled = [ASK_AI_EXPERIMENT.gpt3, ASK_AI_EXPERIMENT.gpt4].includes(
+				(this.posthogStore.getVariant(ASK_AI_EXPERIMENT.name) ?? '') as string,
+			);
 
-			return this.editor.state.doc.toString();
+			return (
+				isAiExperimentEnabled &&
+				this.settingsStore.settings.ai.enabled &&
+				this.language === 'javaScript'
+			);
 		},
 		placeholder(): string {
-			return {
-				runOnceForAllItems: ALL_ITEMS_PLACEHOLDER,
-				runOnceForEachItem: EACH_ITEM_PLACEHOLDER,
-			}[this.mode];
+			return CODE_PLACEHOLDERS[this.language]?.[this.mode] ?? '';
 		},
-		previousPlaceholder(): string {
-			return {
-				runOnceForAllItems: EACH_ITEM_PLACEHOLDER,
-				runOnceForEachItem: ALL_ITEMS_PLACEHOLDER,
-			}[this.mode];
+		// eslint-disable-next-line vue/return-in-computed-property
+		languageExtensions(): [LanguageSupport, ...Extension[]] {
+			switch (this.language) {
+				case 'javaScript':
+					return [javascript(), this.autocompletionExtension('javaScript')];
+				case 'python':
+					return [python(), this.autocompletionExtension('python')];
+			}
 		},
 	},
+	beforeUnmount() {
+		if (!this.isReadOnly) codeNodeEditorEventBus.off('error-line-number', this.highlightLine);
+	},
+	mounted() {
+		if (!this.isReadOnly) codeNodeEditorEventBus.on('error-line-number', this.highlightLine);
+
+		const { isReadOnly, language } = this;
+		const extensions: Extension[] = [
+			...readOnlyEditorExtensions,
+			EditorState.readOnly.of(isReadOnly),
+			EditorView.editable.of(!isReadOnly),
+			codeNodeEditorTheme({
+				isReadOnly,
+				maxHeight: this.fillParent ? '100%' : '40vh',
+				minHeight: '20vh',
+				rows: this.rows,
+			}),
+		];
+
+		if (!isReadOnly) {
+			const linter = this.createLinter(language);
+			if (linter) {
+				extensions.push(this.linterCompartment.of(linter));
+			}
+
+			extensions.push(
+				...writableEditorExtensions,
+				EditorView.domEventHandlers({
+					focus: () => {
+						this.isEditorFocused = true;
+					},
+					blur: () => {
+						this.isEditorFocused = false;
+					},
+				}),
+
+				EditorView.updateListener.of((viewUpdate) => {
+					if (!viewUpdate.docChanged) return;
+
+					this.trackCompletion(viewUpdate);
+
+					this.$emit('update:modelValue', this.editor?.state.doc.toString());
+					this.hasChanges = true;
+				}),
+			);
+		}
+
+		const [languageSupport, ...otherExtensions] = this.languageExtensions;
+		extensions.push(this.languageCompartment.of(languageSupport), ...otherExtensions);
+
+		const state = EditorState.create({
+			doc: this.modelValue ?? this.placeholder,
+			extensions,
+		});
+
+		this.editor = new EditorView({
+			parent: this.$refs.codeNodeEditor as HTMLDivElement,
+			state,
+		});
+
+		// empty on first load, default param value
+		if (!this.modelValue) {
+			this.refreshPlaceholder();
+			this.$emit('update:modelValue', this.placeholder);
+		}
+	},
 	methods: {
+		getCurrentEditorContent() {
+			return this.editor?.state.doc.toString() ?? '';
+		},
+		async onBeforeTabLeave(_activeName: string, oldActiveName: string) {
+			// Confirm dialog if leaving ask-ai tab during loading
+			if (oldActiveName === 'ask-ai' && this.isLoadingAIResponse) {
+				const confirmModal = await this.alert(
+					this.$locale.baseText('codeNodeEditor.askAi.sureLeaveTab'),
+					{
+						title: this.$locale.baseText('codeNodeEditor.askAi.areYouSure'),
+						confirmButtonText: this.$locale.baseText('codeNodeEditor.askAi.switchTab'),
+						showClose: true,
+						showCancelButton: true,
+					},
+				);
+
+				if (confirmModal === 'confirm') {
+					return true;
+				}
+
+				return false;
+			}
+
+			return true;
+		},
+		async onReplaceCode(code: string) {
+			const formattedCode = await format(code, {
+				parser: 'babel',
+				plugins: [jsParser, estree],
+			});
+
+			this.editor?.dispatch({
+				changes: { from: 0, to: this.getCurrentEditorContent().length, insert: formattedCode },
+			});
+
+			this.activeTab = 'code';
+			this.hasChanges = false;
+		},
 		onMouseOver(event: MouseEvent) {
 			const fromElement = event.relatedTarget as HTMLElement;
 			const ref = this.$refs.codeNodeEditorContainer as HTMLDivElement | undefined;
@@ -106,39 +309,46 @@ export default mixins(linterExtension, completerExtension, workflowHelpers).exte
 
 			if (!ref?.contains(fromElement)) this.isEditorHovered = false;
 		},
-		onAskAiButtonClick() {
-			this.$telemetry.track('User clicked ask ai button', { source: 'code' });
-
-			this.uiStore.openModal(ASK_AI_MODAL_KEY);
-		},
 		reloadLinter() {
 			if (!this.editor) return;
 
-			this.editor.dispatch({
-				effects: this.linterCompartment.reconfigure(this.linterExtension()),
-			});
+			const linter = this.createLinter(this.language);
+			if (linter) {
+				this.editor.dispatch({
+					effects: this.linterCompartment.reconfigure(linter),
+				});
+			}
 		},
 		refreshPlaceholder() {
 			if (!this.editor) return;
 
-			if (!this.content.trim() || this.content.trim() === this.previousPlaceholder) {
-				this.editor.dispatch({
-					changes: { from: 0, to: this.content.length, insert: this.placeholder },
-				});
+			this.editor.dispatch({
+				changes: { from: 0, to: this.getCurrentEditorContent().length, insert: this.placeholder },
+			});
+		},
+		line(lineNumber: number): Line | null {
+			try {
+				return this.editor?.state.doc.line(lineNumber) ?? null;
+			} catch {
+				return null;
 			}
 		},
-		highlightLine(line: number | 'final') {
+		highlightLine(lineNumber: number | 'final') {
 			if (!this.editor) return;
 
-			if (line === 'final') {
+			if (lineNumber === 'final') {
 				this.editor.dispatch({
-					selection: { anchor: this.content.trim().length },
+					selection: { anchor: (this.modelValue ?? this.getCurrentEditorContent()).length },
 				});
 				return;
 			}
 
+			const line = this.line(lineNumber);
+
+			if (!line) return;
+
 			this.editor.dispatch({
-				selection: { anchor: this.editor.state.doc.line(line).from },
+				selection: { anchor: line.from },
 			});
 		},
 		trackCompletion(viewUpdate: ViewUpdate) {
@@ -149,7 +359,7 @@ export default mixins(linterExtension, completerExtension, workflowHelpers).exte
 			try {
 				// @ts-ignore - undocumented fields
 				const { fromA, toB } = viewUpdate?.changedRanges[0];
-				const full = this.content.slice(fromA, toB);
+				const full = this.getCurrentEditorContent().slice(fromA, toB);
 				const lastDotIndex = full.lastIndexOf('.');
 
 				let context = null;
@@ -163,6 +373,7 @@ export default mixins(linterExtension, completerExtension, workflowHelpers).exte
 					insertedText = full.slice(lastDotIndex + 1);
 				}
 
+				// TODO: Still has to get updated for Python and JSON
 				this.$telemetry.track('User autocompleted code', {
 					instance_id: this.rootStore.instanceId,
 					node_type: CODE_NODE_TYPE,
@@ -174,64 +385,23 @@ export default mixins(linterExtension, completerExtension, workflowHelpers).exte
 			} catch {}
 		},
 	},
-	destroyed() {
-		codeNodeEditorEventBus.off('error-line-number', this.highlightLine);
-	},
-	mounted() {
-		codeNodeEditorEventBus.on('error-line-number', this.highlightLine);
-
-		const stateBasedExtensions = [
-			this.linterCompartment.of(this.linterExtension()),
-			EditorState.readOnly.of(this.isReadOnly),
-			EditorView.domEventHandlers({
-				focus: () => {
-					this.isEditorFocused = true;
-				},
-				blur: () => {
-					this.isEditorFocused = false;
-				},
-			}),
-			EditorView.updateListener.of((viewUpdate: ViewUpdate) => {
-				if (!viewUpdate.docChanged) return;
-
-				this.trackCompletion(viewUpdate);
-
-				this.$emit('valueChanged', this.content);
-			}),
-		];
-
-		// empty on first load, default param value
-		if (this.jsCode === '') {
-			this.$emit('valueChanged', this.placeholder);
-		}
-
-		const state = EditorState.create({
-			doc: this.jsCode === '' ? this.placeholder : this.jsCode,
-			extensions: [
-				...baseExtensions,
-				...stateBasedExtensions,
-				CODE_NODE_EDITOR_THEME,
-				javascript(),
-				this.autocompletionExtension(),
-			],
-		});
-
-		this.editor = new EditorView({
-			parent: this.$refs.codeNodeEditor as HTMLDivElement,
-			state,
-		});
-	},
 });
 </script>
 
+<style scoped lang="scss">
+:deep(.el-tabs) {
+	.code-editor-tabs .cm-editor {
+		border: 0;
+	}
+}
+</style>
+
 <style lang="scss" module>
 .code-node-editor-container {
 	position: relative;
 }
 
-.ask-ai-button {
-	position: absolute;
-	top: var(--spacing-2xs);
-	right: var(--spacing-2xs);
+.fillHeight {
+	height: 100%;
 }
 </style>
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/baseExtensions.ts b/packages/editor-ui/src/components/CodeNodeEditor/baseExtensions.ts
index c5a3c4816a0fc..a9b00a0b82052 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/baseExtensions.ts
+++ b/packages/editor-ui/src/components/CodeNodeEditor/baseExtensions.ts
@@ -8,39 +8,42 @@ import {
 	lineNumbers,
 } from '@codemirror/view';
 import { bracketMatching, foldGutter, indentOnInput } from '@codemirror/language';
-import { acceptCompletion } from '@codemirror/autocomplete';
-import {
-	history,
-	indentWithTab,
-	insertNewlineAndIndent,
-	toggleComment,
-	redo,
-	deleteCharBackward,
-} from '@codemirror/commands';
+import { history, toggleComment, deleteCharBackward } from '@codemirror/commands';
 import { lintGutter } from '@codemirror/lint';
+import { type Extension, Prec } from '@codemirror/state';
 
 import { codeInputHandler } from '@/plugins/codemirror/inputHandlers/code.inputHandler';
+import {
+	autocompleteKeyMap,
+	enterKeyMap,
+	historyKeyMap,
+	tabKeyMap,
+} from '@/plugins/codemirror/keymap';
 
-export const baseExtensions = [
+export const readOnlyEditorExtensions: readonly Extension[] = [
 	lineNumbers(),
-	highlightActiveLineGutter(),
+	EditorView.lineWrapping,
 	highlightSpecialChars(),
+];
+
+export const writableEditorExtensions: readonly Extension[] = [
 	history(),
-	foldGutter(),
 	lintGutter(),
+	foldGutter(),
 	codeInputHandler(),
 	dropCursor(),
 	indentOnInput(),
 	bracketMatching(),
 	highlightActiveLine(),
-	keymap.of([
-		{ key: 'Enter', run: insertNewlineAndIndent },
-		{ key: 'Tab', run: acceptCompletion },
-		{ key: 'Enter', run: acceptCompletion },
-		{ key: 'Mod-/', run: toggleComment },
-		{ key: 'Mod-Shift-z', run: redo },
-		{ key: 'Backspace', run: deleteCharBackward, shift: deleteCharBackward },
-		indentWithTab,
-	]),
-	EditorView.lineWrapping,
+	highlightActiveLineGutter(),
+	Prec.highest(
+		keymap.of([
+			...tabKeyMap(),
+			...enterKeyMap,
+			...autocompleteKeyMap,
+			...historyKeyMap,
+			{ key: 'Mod-/', run: toggleComment },
+			{ key: 'Backspace', run: deleteCharBackward, shift: deleteCharBackward },
+		]),
+	),
 ];
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/completer.ts b/packages/editor-ui/src/components/CodeNodeEditor/completer.ts
index efebc8e76d7ac..6cb2866a7565b 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/completer.ts
+++ b/packages/editor-ui/src/components/CodeNodeEditor/completer.ts
@@ -1,7 +1,8 @@
-import Vue from 'vue';
-import mixins from 'vue-typed-mixins';
+import { defineComponent } from 'vue';
 import { autocompletion } from '@codemirror/autocomplete';
 import { localCompletionSource } from '@codemirror/lang-javascript';
+import type { Completion, CompletionContext, CompletionResult } from '@codemirror/autocomplete';
+import type { Extension } from '@codemirror/state';
 
 import { baseCompletions } from './completions/base.completions';
 import { jsSnippets } from './completions/js.snippets';
@@ -15,34 +16,35 @@ import { itemFieldCompletions } from './completions/itemField.completions';
 import { jsonFieldCompletions } from './completions/jsonField.completions';
 import { variablesCompletions } from './completions/variables.completions';
 
-import type { Completion, CompletionContext, CompletionResult } from '@codemirror/autocomplete';
-import type { Extension } from '@codemirror/state';
-import type { CodeNodeEditorMixin } from './types';
-
-export const completerExtension = mixins(
-	Vue as CodeNodeEditorMixin,
-	baseCompletions,
-	requireCompletions,
-	executionCompletions,
-	workflowCompletions,
-	variablesCompletions,
-	prevNodeCompletions,
-	luxonCompletions,
-	itemIndexCompletions,
-	itemFieldCompletions,
-	jsonFieldCompletions,
-).extend({
+export const completerExtension = defineComponent({
+	mixins: [
+		baseCompletions,
+		requireCompletions,
+		executionCompletions,
+		workflowCompletions,
+		variablesCompletions,
+		prevNodeCompletions,
+		luxonCompletions,
+		itemIndexCompletions,
+		itemFieldCompletions,
+		jsonFieldCompletions,
+	],
 	methods: {
-		autocompletionExtension(): Extension {
+		autocompletionExtension(language: 'javaScript' | 'python'): Extension {
+			const completions = [];
+			if (language === 'javaScript') {
+				completions.push(jsSnippets, localCompletionSource);
+			}
+
 			return autocompletion({
+				icons: false,
 				compareCompletions: (a: Completion, b: Completion) => {
 					if (/\.json$|id$|id['"]\]$/.test(a.label)) return 0;
 
 					return a.label.localeCompare(b.label);
 				},
 				override: [
-					jsSnippets,
-					localCompletionSource,
+					...completions,
 
 					// core
 					this.itemCompletions,
@@ -171,6 +173,7 @@ export const completerExtension = mixins(
 
 				if (value === '$execution') return this.executionCompletions(context, variable);
 				if (value === '$vars') return this.variablesCompletions(context, variable);
+
 				if (value === '$workflow') return this.workflowCompletions(context, variable);
 				if (value === '$prevNode') return this.prevNodeCompletions(context, variable);
 
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/completions/base.completions.ts b/packages/editor-ui/src/components/CodeNodeEditor/completions/base.completions.ts
index a9401714ebce3..f03470915b729 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/completions/base.completions.ts
+++ b/packages/editor-ui/src/components/CodeNodeEditor/completions/base.completions.ts
@@ -1,19 +1,19 @@
-import Vue from 'vue';
+import { defineComponent } from 'vue';
 import { NODE_TYPES_EXCLUDED_FROM_AUTOCOMPLETION } from '../constants';
 import { addVarType } from '../utils';
 import type { Completion, CompletionContext, CompletionResult } from '@codemirror/autocomplete';
 import type { INodeUi } from '@/Interface';
-import type { CodeNodeEditorMixin } from '../types';
 import { mapStores } from 'pinia';
-import { useWorkflowsStore } from '@/stores/workflows';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { escapeMappingString } from '@/utils/mappingUtils';
 
-function getAutocompletableNodeNames(nodes: INodeUi[]) {
+function getAutoCompletableNodeNames(nodes: INodeUi[]) {
 	return nodes
 		.filter((node: INodeUi) => !NODE_TYPES_EXCLUDED_FROM_AUTOCOMPLETION.includes(node.type))
 		.map((node: INodeUi) => node.name);
 }
 
-export const baseCompletions = (Vue as CodeNodeEditorMixin).extend({
+export const baseCompletions = defineComponent({
 	computed: {
 		...mapStores(useWorkflowsStore),
 	},
@@ -45,58 +45,51 @@ export const baseCompletions = (Vue as CodeNodeEditorMixin).extend({
 
 		/**
 		 * - Complete `$` to `$execution $input $prevNode $runIndex $workflow $now $today
-		 * $jmespath $('nodeName')` in both modes.
+		 * $jmespath $ifEmpt $('nodeName')` in both modes.
 		 * - Complete `$` to `$json $binary $itemIndex` in single-item mode.
 		 */
 		baseCompletions(context: CompletionContext): CompletionResult | null {
-			const preCursor = context.matchBefore(/\$\w*/);
+			const prefix = this.language === 'python' ? '_' : '$';
+			const preCursor = context.matchBefore(new RegExp(`\\${prefix}\\w*`));
 
 			if (!preCursor || (preCursor.from === preCursor.to && !context.explicit)) return null;
 
 			const TOP_LEVEL_COMPLETIONS_IN_BOTH_MODES: Completion[] = [
 				{
-					label: '$execution',
+					label: `${prefix}execution`,
 					info: this.$locale.baseText('codeNodeEditor.completer.$execution'),
 				},
-				{ label: '$input', info: this.$locale.baseText('codeNodeEditor.completer.$input') },
 				{
-					label: '$prevNode',
+					label: `${prefix}ifEmpty()`,
+					info: this.$locale.baseText('codeNodeEditor.completer.$ifEmpty'),
+				},
+				{ label: `${prefix}input`, info: this.$locale.baseText('codeNodeEditor.completer.$input') },
+				{
+					label: `${prefix}prevNode`,
 					info: this.$locale.baseText('codeNodeEditor.completer.$prevNode'),
 				},
 				{
-					label: '$workflow',
+					label: `${prefix}workflow`,
 					info: this.$locale.baseText('codeNodeEditor.completer.$workflow'),
 				},
 				{
-					label: '$vars',
+					label: `${prefix}vars`,
 					info: this.$locale.baseText('codeNodeEditor.completer.$vars'),
 				},
 				{
-					label: '$now',
+					label: `${prefix}now`,
 					info: this.$locale.baseText('codeNodeEditor.completer.$now'),
 				},
 				{
-					label: '$today',
+					label: `${prefix}today`,
 					info: this.$locale.baseText('codeNodeEditor.completer.$today'),
 				},
 				{
-					label: '$jmespath()',
+					label: `${prefix}jmespath()`,
 					info: this.$locale.baseText('codeNodeEditor.completer.$jmespath'),
 				},
 				{
-					label: '$if()',
-					info: this.$locale.baseText('codeNodeEditor.completer.$if'),
-				},
-				{
-					label: '$min()',
-					info: this.$locale.baseText('codeNodeEditor.completer.$min'),
-				},
-				{
-					label: '$max()',
-					info: this.$locale.baseText('codeNodeEditor.completer.$max'),
-				},
-				{
-					label: '$runIndex',
+					label: `${prefix}runIndex`,
 					info: this.$locale.baseText('codeNodeEditor.completer.$runIndex'),
 				},
 			];
@@ -104,9 +97,9 @@ export const baseCompletions = (Vue as CodeNodeEditorMixin).extend({
 			const options: Completion[] = TOP_LEVEL_COMPLETIONS_IN_BOTH_MODES.map(addVarType);
 
 			options.push(
-				...getAutocompletableNodeNames(this.workflowsStore.allNodes).map((nodeName) => {
+				...getAutoCompletableNodeNames(this.workflowsStore.allNodes).map((nodeName) => {
 					return {
-						label: `$('${nodeName}')`,
+						label: `${prefix}('${escapeMappingString(nodeName)}')`,
 						type: 'variable',
 						info: this.$locale.baseText('codeNodeEditor.completer.$()', {
 							interpolate: { nodeName },
@@ -117,10 +110,10 @@ export const baseCompletions = (Vue as CodeNodeEditorMixin).extend({
 
 			if (this.mode === 'runOnceForEachItem') {
 				const TOP_LEVEL_COMPLETIONS_IN_SINGLE_ITEM_MODE = [
-					{ label: '$json' },
-					{ label: '$binary' },
+					{ label: `${prefix}json` },
+					{ label: `${prefix}binary` },
 					{
-						label: '$itemIndex',
+						label: `${prefix}itemIndex`,
 						info: this.$locale.baseText('codeNodeEditor.completer.$itemIndex'),
 					},
 				];
@@ -138,14 +131,15 @@ export const baseCompletions = (Vue as CodeNodeEditorMixin).extend({
 		 * Complete `$(` to `$('nodeName')`.
 		 */
 		nodeSelectorCompletions(context: CompletionContext): CompletionResult | null {
-			const preCursor = context.matchBefore(/\$\(.*/);
+			const prefix = this.language === 'python' ? '_' : '$';
+			const preCursor = context.matchBefore(new RegExp(`\\${prefix}\\(.*`));
 
 			if (!preCursor || (preCursor.from === preCursor.to && !context.explicit)) return null;
 
-			const options: Completion[] = getAutocompletableNodeNames(this.workflowsStore.allNodes).map(
+			const options: Completion[] = getAutoCompletableNodeNames(this.workflowsStore.allNodes).map(
 				(nodeName) => {
 					return {
-						label: `$('${nodeName}')`,
+						label: `${prefix}('${escapeMappingString(nodeName)}')`,
 						type: 'variable',
 						info: this.$locale.baseText('codeNodeEditor.completer.$()', {
 							interpolate: { nodeName },
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/completions/execution.completions.ts b/packages/editor-ui/src/components/CodeNodeEditor/completions/execution.completions.ts
index 558e32196097b..502221b48ff70 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/completions/execution.completions.ts
+++ b/packages/editor-ui/src/components/CodeNodeEditor/completions/execution.completions.ts
@@ -1,12 +1,11 @@
-import Vue from 'vue';
+import { defineComponent } from 'vue';
 import { addVarType, escape } from '../utils';
 import type { Completion, CompletionContext, CompletionResult } from '@codemirror/autocomplete';
-import type { CodeNodeEditorMixin } from '../types';
 
-export const executionCompletions = (Vue as CodeNodeEditorMixin).extend({
+export const executionCompletions = defineComponent({
 	methods: {
 		/**
-		 * Complete `$execution.` to `.id .mode .resumeUrl`
+		 * Complete `$execution.` to `.id .mode .resumeUrl .resumeFormUrl`
 		 */
 		executionCompletions(
 			context: CompletionContext,
@@ -40,6 +39,10 @@ export const executionCompletions = (Vue as CodeNodeEditorMixin).extend({
 					label: `${matcher}.resumeUrl`,
 					info: this.$locale.baseText('codeNodeEditor.completer.$execution.resumeUrl'),
 				},
+				{
+					label: `${matcher}.resumeFormUrl`,
+					info: this.$locale.baseText('codeNodeEditor.completer.$execution.resumeFormUrl'),
+				},
 				{
 					label: `${matcher}.customData.set("key", "value")`,
 					info: buildLinkNode(
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/completions/itemField.completions.ts b/packages/editor-ui/src/components/CodeNodeEditor/completions/itemField.completions.ts
index 505a4ed02cf08..728a3ba03b5ea 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/completions/itemField.completions.ts
+++ b/packages/editor-ui/src/components/CodeNodeEditor/completions/itemField.completions.ts
@@ -1,9 +1,8 @@
-import Vue from 'vue';
+import { defineComponent } from 'vue';
 import { addVarType, escape } from '../utils';
 import type { Completion, CompletionContext, CompletionResult } from '@codemirror/autocomplete';
-import type { CodeNodeEditorMixin } from '../types';
 
-export const itemFieldCompletions = (Vue as CodeNodeEditorMixin).extend({
+export const itemFieldCompletions = defineComponent({
 	methods: {
 		/**
 		 * - Complete `x.first().` to `.json .binary`
@@ -50,10 +49,11 @@ export const itemFieldCompletions = (Vue as CodeNodeEditorMixin).extend({
 		 * - Complete `$input.item.` to `.json .binary`.
 		 */
 		inputMethodCompletions(context: CompletionContext): CompletionResult | null {
+			const prefix = this.language === 'python' ? '_' : '$';
 			const patterns = {
-				first: /\$input\.first\(\)\..*/,
-				last: /\$input\.last\(\)\..*/,
-				item: /\$input\.item\..*/,
+				first: new RegExp(`\\${prefix}input\\.first\\(\\)\\..*`),
+				last: new RegExp(`\\${prefix}input\\.last\\(\\)\\..*`),
+				item: new RegExp(`\\${prefix}item\\.first\\(\\)\\..*`),
 				all: /\$input\.all\(\)\[(?<index>\w+)\]\..*/,
 			};
 
@@ -64,11 +64,11 @@ export const itemFieldCompletions = (Vue as CodeNodeEditorMixin).extend({
 
 				let replacementBase = '';
 
-				if (name === 'item') replacementBase = '$input.item';
+				if (name === 'item') replacementBase = `${prefix}input.item`;
 
-				if (name === 'first') replacementBase = '$input.first()';
+				if (name === 'first') replacementBase = `${prefix}input.first()`;
 
-				if (name === 'last') replacementBase = '$input.last()';
+				if (name === 'last') replacementBase = `${prefix}input.last()`;
 
 				if (name === 'all') {
 					const match = preCursor.text.match(regex);
@@ -77,7 +77,7 @@ export const itemFieldCompletions = (Vue as CodeNodeEditorMixin).extend({
 
 					const { index } = match.groups;
 
-					replacementBase = `$input.all()[${index}]`;
+					replacementBase = `${prefix}input.all()[${index}]`;
 				}
 
 				const options: Completion[] = [
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/completions/itemIndex.completions.ts b/packages/editor-ui/src/components/CodeNodeEditor/completions/itemIndex.completions.ts
index a108e88b67e79..e31942a75b6b8 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/completions/itemIndex.completions.ts
+++ b/packages/editor-ui/src/components/CodeNodeEditor/completions/itemIndex.completions.ts
@@ -1,9 +1,8 @@
-import Vue from 'vue';
 import { escape } from '../utils';
 import type { Completion, CompletionContext, CompletionResult } from '@codemirror/autocomplete';
-import type { CodeNodeEditorMixin } from '../types';
+import { defineComponent } from 'vue';
 
-export const itemIndexCompletions = (Vue as CodeNodeEditorMixin).extend({
+export const itemIndexCompletions = defineComponent({
 	methods: {
 		/**
 		 * - Complete `$input.` to `.first() .last() .all() .itemMatching()` in all-items mode.
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/completions/jsonField.completions.ts b/packages/editor-ui/src/components/CodeNodeEditor/completions/jsonField.completions.ts
index 5d5d3f09d3050..8e81e26d06771 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/completions/jsonField.completions.ts
+++ b/packages/editor-ui/src/components/CodeNodeEditor/completions/jsonField.completions.ts
@@ -1,14 +1,13 @@
-import Vue from 'vue';
+import { defineComponent } from 'vue';
 import { escape, toVariableOption } from '../utils';
 import type { Completion, CompletionContext, CompletionResult } from '@codemirror/autocomplete';
 import type { IDataObject, IPinData, IRunData } from 'n8n-workflow';
-import type { CodeNodeEditorMixin } from '../types';
 import { mapStores } from 'pinia';
-import { useWorkflowsStore } from '@/stores/workflows';
-import { useNDVStore } from '@/stores/ndv';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useNDVStore } from '@/stores/ndv.store';
 import { isAllowedInDotNotation } from '@/plugins/codemirror/completions/utils';
 
-export const jsonFieldCompletions = (Vue as CodeNodeEditorMixin).extend({
+export const jsonFieldCompletions = defineComponent({
 	computed: {
 		...mapStores(useNDVStore, useWorkflowsStore),
 	},
@@ -276,11 +275,20 @@ export const jsonFieldCompletions = (Vue as CodeNodeEditorMixin).extend({
 		 * `index` is only passed for `all()`.
 		 */
 		getJsonOutput(quotedNodeName: string, options?: { accessor?: string; index?: number }) {
-			const nodeName = quotedNodeName.replace(/['"]/g, '');
+			let nodeName = quotedNodeName;
 
-			const pinData: IPinData | undefined = this.workflowsStore.getPinData;
+			const isSingleQuoteWrapped = quotedNodeName.startsWith("'") && quotedNodeName.endsWith("'");
+			const isDoubleQuoteWrapped = quotedNodeName.startsWith('"') && quotedNodeName.endsWith('"');
 
-			const nodePinData = pinData && pinData[nodeName];
+			if (isSingleQuoteWrapped) {
+				nodeName = quotedNodeName.replace(/^'/, '').replace(/'$/, '');
+			} else if (isDoubleQuoteWrapped) {
+				nodeName = quotedNodeName.replace(/^"/, '').replace(/"$/, '');
+			}
+
+			const pinData: IPinData | undefined = this.workflowsStore.pinnedWorkflowData;
+
+			const nodePinData = pinData?.[nodeName];
 
 			if (nodePinData) {
 				try {
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/completions/luxon.completions.ts b/packages/editor-ui/src/components/CodeNodeEditor/completions/luxon.completions.ts
index 20c4005a785f4..920a6234b5f7f 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/completions/luxon.completions.ts
+++ b/packages/editor-ui/src/components/CodeNodeEditor/completions/luxon.completions.ts
@@ -1,9 +1,8 @@
-import Vue from 'vue';
 import { escape } from '../utils';
 import type { Completion, CompletionContext, CompletionResult } from '@codemirror/autocomplete';
-import type { CodeNodeEditorMixin } from '../types';
+import { defineComponent } from 'vue';
 
-export const luxonCompletions = (Vue as CodeNodeEditorMixin).extend({
+export const luxonCompletions = defineComponent({
 	methods: {
 		/**
 		 * Complete `$today.` with luxon `DateTime` instance methods.
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/completions/package.json b/packages/editor-ui/src/components/CodeNodeEditor/completions/package.json
new file mode 100644
index 0000000000000..bb1b4118f790e
--- /dev/null
+++ b/packages/editor-ui/src/components/CodeNodeEditor/completions/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "completions",
+  "version": "1.0.0",
+  "dependencies": {
+  }
+}
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/completions/prevNode.completions.ts b/packages/editor-ui/src/components/CodeNodeEditor/completions/prevNode.completions.ts
index 2fa177862e078..6ae4e2e8f9dec 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/completions/prevNode.completions.ts
+++ b/packages/editor-ui/src/components/CodeNodeEditor/completions/prevNode.completions.ts
@@ -1,13 +1,12 @@
-import Vue from 'vue';
 import { addVarType } from '../utils';
 import type { Completion, CompletionContext, CompletionResult } from '@codemirror/autocomplete';
-import type { CodeNodeEditorMixin } from '../types';
+import { defineComponent } from 'vue';
 
 const DEFAULT_MATCHER = '$prevNode';
 
 const escape = (str: string) => str.replace('$', '\\$');
 
-export const prevNodeCompletions = (Vue as CodeNodeEditorMixin).extend({
+export const prevNodeCompletions = defineComponent({
 	methods: {
 		/**
 		 * Complete `$prevNode.` to `.name .outputIndex .runIndex`.
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/completions/require.completions.ts b/packages/editor-ui/src/components/CodeNodeEditor/completions/require.completions.ts
index c9cccc174fc1a..c183a739fc3fb 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/completions/require.completions.ts
+++ b/packages/editor-ui/src/components/CodeNodeEditor/completions/require.completions.ts
@@ -1,10 +1,9 @@
-import Vue from 'vue';
-import { AUTOCOMPLETABLE_BUILT_IN_MODULES } from '../constants';
+import { defineComponent } from 'vue';
+import { AUTOCOMPLETABLE_BUILT_IN_MODULES_JS } from '../constants';
 import type { Completion, CompletionContext, CompletionResult } from '@codemirror/autocomplete';
-import type { CodeNodeEditorMixin } from '../types';
-import { useSettingsStore } from '@/stores/settings';
+import { useSettingsStore } from '@/stores/settings.store';
 
-export const requireCompletions = (Vue as CodeNodeEditorMixin).extend({
+export const requireCompletions = defineComponent({
 	methods: {
 		/**
 		 * Complete `req`	to `require('moduleName')` based on modules available in context.
@@ -25,7 +24,7 @@ export const requireCompletions = (Vue as CodeNodeEditorMixin).extend({
 
 			if (allowedModules.builtIn) {
 				if (allowedModules.builtIn.includes('*')) {
-					options.push(...AUTOCOMPLETABLE_BUILT_IN_MODULES.map(toOption));
+					options.push(...AUTOCOMPLETABLE_BUILT_IN_MODULES_JS.map(toOption));
 				} else if (allowedModules?.builtIn?.length > 0) {
 					options.push(...allowedModules.builtIn.map(toOption));
 				}
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/completions/secrets.completions.ts b/packages/editor-ui/src/components/CodeNodeEditor/completions/secrets.completions.ts
new file mode 100644
index 0000000000000..7bba9b3fa3eae
--- /dev/null
+++ b/packages/editor-ui/src/components/CodeNodeEditor/completions/secrets.completions.ts
@@ -0,0 +1,53 @@
+import { addVarType } from '../utils';
+import type { Completion, CompletionContext, CompletionResult } from '@codemirror/autocomplete';
+import { useExternalSecretsStore } from '@/stores/externalSecrets.ee.store';
+import { defineComponent } from 'vue';
+
+const escape = (str: string) => str.replace('$', '\\$');
+
+export const secretsCompletions = defineComponent({
+	methods: {
+		/**
+		 * Complete `$secrets.` to `$secrets.providerName` and `$secrets.providerName.secretName`.
+		 */
+		secretsCompletions(context: CompletionContext, matcher = '$secrets'): CompletionResult | null {
+			const pattern = new RegExp(`${escape(matcher)}\..*`);
+			const preCursor = context.matchBefore(pattern);
+
+			if (!preCursor || (preCursor.from === preCursor.to && !context.explicit)) return null;
+
+			const provider = preCursor.text.split('.')[1];
+			const externalSecretsStore = useExternalSecretsStore();
+			let options: Completion[];
+
+			const optionsForObject = (leftSide: string, object: object): Completion[] => {
+				return Object.entries(object).flatMap(([key, value]) => {
+					if (typeof value === 'object' && value !== null) {
+						return optionsForObject(`${leftSide}.${key}`, value);
+					}
+					return {
+						label: `${leftSide}.${key}`,
+						info: '*******',
+					};
+				});
+			};
+
+			if (provider) {
+				options = optionsForObject(
+					`${matcher}.${provider}`,
+					externalSecretsStore.secretsAsObject[provider],
+				);
+			} else {
+				options = Object.keys(externalSecretsStore.secretsAsObject).map((provider) => ({
+					label: `${matcher}.${provider}`,
+					info: JSON.stringify(externalSecretsStore.secretsAsObject[provider]),
+				}));
+			}
+
+			return {
+				from: preCursor.from,
+				options: options.map(addVarType),
+			};
+		},
+	},
+});
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/completions/variables.completions.ts b/packages/editor-ui/src/components/CodeNodeEditor/completions/variables.completions.ts
index dc60e9d96359d..c6f7283f91be7 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/completions/variables.completions.ts
+++ b/packages/editor-ui/src/components/CodeNodeEditor/completions/variables.completions.ts
@@ -1,15 +1,14 @@
-import Vue from 'vue';
 import { addVarType } from '../utils';
 import type { Completion, CompletionContext, CompletionResult } from '@codemirror/autocomplete';
-import type { CodeNodeEditorMixin } from '../types';
-import { useEnvironmentsStore } from '@/stores';
+import { useEnvironmentsStore } from '@/stores/environments.ee.store';
+import { defineComponent } from 'vue';
 
 const escape = (str: string) => str.replace('$', '\\$');
 
-export const variablesCompletions = (Vue as CodeNodeEditorMixin).extend({
+export const variablesCompletions = defineComponent({
 	methods: {
 		/**
-		 * Complete `$workflow.` to `.id .name .active`.
+		 * Complete `$vars.` to `$vars.VAR_NAME`.
 		 */
 		variablesCompletions(context: CompletionContext, matcher = '$vars'): CompletionResult | null {
 			const pattern = new RegExp(`${escape(matcher)}\..*`);
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/completions/workflow.completions.ts b/packages/editor-ui/src/components/CodeNodeEditor/completions/workflow.completions.ts
index fc6c6099f3a8f..c367fb8c3cf4e 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/completions/workflow.completions.ts
+++ b/packages/editor-ui/src/components/CodeNodeEditor/completions/workflow.completions.ts
@@ -1,11 +1,10 @@
-import Vue from 'vue';
+import { defineComponent } from 'vue';
 import { addVarType } from '../utils';
 import type { Completion, CompletionContext, CompletionResult } from '@codemirror/autocomplete';
-import type { CodeNodeEditorMixin } from '../types';
 
 const escape = (str: string) => str.replace('$', '\\$');
 
-export const workflowCompletions = (Vue as CodeNodeEditorMixin).extend({
+export const workflowCompletions = defineComponent({
 	methods: {
 		/**
 		 * Complete `$workflow.` to `.id .name .active`.
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/constants.ts b/packages/editor-ui/src/components/CodeNodeEditor/constants.ts
index 20ce31b03b617..177f113bf2a69 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/constants.ts
+++ b/packages/editor-ui/src/components/CodeNodeEditor/constants.ts
@@ -1,9 +1,10 @@
 import { STICKY_NODE_TYPE } from '@/constants';
 import type { Diagnostic } from '@codemirror/lint';
+import type { CodeExecutionMode, CodeNodeEditorLanguage } from 'n8n-workflow';
 
 export const NODE_TYPES_EXCLUDED_FROM_AUTOCOMPLETION = [STICKY_NODE_TYPE];
 
-export const AUTOCOMPLETABLE_BUILT_IN_MODULES = [
+export const AUTOCOMPLETABLE_BUILT_IN_MODULES_JS = [
 	'console',
 	'constants',
 	'crypto',
@@ -34,20 +35,32 @@ export const DEFAULT_LINTER_DELAY_IN_MS = 300;
  */
 export const OFFSET_FOR_SCRIPT_WRAPPER = 'module.exports = async function() {'.length;
 
-export const ALL_ITEMS_PLACEHOLDER = `
-// Loop over input items and add a new field
-// called 'myNewField' to the JSON of each one
+export const CODE_PLACEHOLDERS: Partial<
+	Record<CodeNodeEditorLanguage, Record<CodeExecutionMode, string>>
+> = {
+	javaScript: {
+		runOnceForAllItems: `
+// Loop over input items and add a new field called 'myNewField' to the JSON of each one
 for (const item of $input.all()) {
   item.json.myNewField = 1;
 }
 
-return $input.all();
-`.trim();
-
-export const EACH_ITEM_PLACEHOLDER = `
-// Add a new field called 'myNewField' to the
-// JSON of the item
+return $input.all();`.trim(),
+		runOnceForEachItem: `
+// Add a new field called 'myNewField' to the JSON of the item
 $input.item.json.myNewField = 1;
 
-return $input.item;
-`.trim();
+return $input.item;`.trim(),
+	},
+	python: {
+		runOnceForAllItems: `
+# Loop over input items and add a new field called 'myNewField' to the JSON of each one
+for item in _input.all():
+	item.json.myNewField = 1
+return _input.all()`.trim(),
+		runOnceForEachItem: `
+# Add a new field called 'myNewField' to the JSON of the item
+_input.item.json.myNewField = 1
+return _input.item`.trim(),
+	},
+};
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/linter.ts b/packages/editor-ui/src/components/CodeNodeEditor/linter.ts
index 2eba90c3d9a36..d64d4f83cd82b 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/linter.ts
+++ b/packages/editor-ui/src/components/CodeNodeEditor/linter.ts
@@ -1,7 +1,10 @@
-import Vue from 'vue';
+import { defineComponent } from 'vue';
 import type { Diagnostic } from '@codemirror/lint';
 import { linter as createLinter } from '@codemirror/lint';
+import type { EditorView } from '@codemirror/view';
 import * as esprima from 'esprima-next';
+import type { Node } from 'estree';
+import type { CodeNodeEditorLanguage } from 'n8n-workflow';
 
 import {
 	DEFAULT_LINTER_DELAY_IN_MS,
@@ -9,15 +12,16 @@ import {
 	OFFSET_FOR_SCRIPT_WRAPPER,
 } from './constants';
 import { walk } from './utils';
+import type { RangeNode } from './types';
 
-import type { EditorView } from '@codemirror/view';
-import type { Node } from 'estree';
-import type { CodeNodeEditorMixin, RangeNode } from './types';
-
-export const linterExtension = (Vue as CodeNodeEditorMixin).extend({
+export const linterExtension = defineComponent({
 	methods: {
-		linterExtension() {
-			return createLinter(this.lintSource, { delay: DEFAULT_LINTER_DELAY_IN_MS });
+		createLinter(language: CodeNodeEditorLanguage) {
+			switch (language) {
+				case 'javaScript':
+					return createLinter(this.lintSource, { delay: DEFAULT_LINTER_DELAY_IN_MS });
+			}
+			return undefined;
 		},
 
 		lintSource(editorView: EditorView): Diagnostic[] {
@@ -59,6 +63,8 @@ export const linterExtension = (Vue as CodeNodeEditorMixin).extend({
 				}
 			}
 
+			if (ast === null) return [];
+
 			const lintings: Diagnostic[] = [];
 
 			/**
@@ -144,7 +150,7 @@ export const linterExtension = (Vue as CodeNodeEditorMixin).extend({
 
 				const isUnavailableInputItemAccess = (node: Node) =>
 					node.type === 'MemberExpression' &&
-					node.computed === false &&
+					!node.computed &&
 					node.object.type === 'Identifier' &&
 					node.object.name === '$input' &&
 					node.property.type === 'Identifier' &&
@@ -170,44 +176,6 @@ export const linterExtension = (Vue as CodeNodeEditorMixin).extend({
 				});
 			}
 
-			/**
-			 * Lint for `item` (legacy var from Function Item node) unavailable
-			 * in `runOnceForAllItems` mode, unless user-defined `item`.
-			 *
-			 * item -> $input.all()
-			 */
-			if (this.mode === 'runOnceForAllItems' && !/(let|const|var) item (=|of)/.test(script)) {
-				type TargetNode = RangeNode & { object: RangeNode & { name: string } };
-
-				const isUnavailableLegacyItems = (node: Node) =>
-					node.type === 'Identifier' && node.name === 'item';
-
-				walk<TargetNode>(ast, isUnavailableLegacyItems).forEach((node) => {
-					const [start, end] = this.getRange(node);
-
-					lintings.push({
-						from: start,
-						to: end,
-						severity: DEFAULT_LINTER_SEVERITY,
-						message: this.$locale.baseText('codeNodeEditor.linter.allItems.unavailableItem'),
-						actions: [
-							{
-								name: 'Fix',
-								apply(view, from, to) {
-									// prevent second insertion of unknown origin
-									if (view.state.doc.toString().slice(from, to).includes('$input.all()')) {
-										return;
-									}
-
-									view.dispatch({ changes: { from: start, to: end } });
-									view.dispatch({ changes: { from, insert: '$input.all()' } });
-								},
-							},
-						],
-					});
-				});
-			}
-
 			/**
 			 * Lint for `items` (legacy var from Function node) unavailable
 			 * in `runOnceForEachItem` mode, unless user-defined `items`.
@@ -261,7 +229,7 @@ export const linterExtension = (Vue as CodeNodeEditorMixin).extend({
 
 				const isUnavailableMethodinEachItem = (node: Node) =>
 					node.type === 'MemberExpression' &&
-					node.computed === false &&
+					!node.computed &&
 					node.object.type === 'Identifier' &&
 					node.object.name === '$input' &&
 					node.property.type === 'Identifier' &&
@@ -328,7 +296,7 @@ export const linterExtension = (Vue as CodeNodeEditorMixin).extend({
 				const inputFirstOrLastCalledWithArg = (node: Node) =>
 					node.type === 'CallExpression' &&
 					node.callee.type === 'MemberExpression' &&
-					node.callee.computed === false &&
+					!node.callee.computed &&
 					node.callee.object.type === 'Identifier' &&
 					node.callee.object.name === '$input' &&
 					node.callee.property.type === 'Identifier' &&
@@ -423,7 +391,7 @@ export const linterExtension = (Vue as CodeNodeEditorMixin).extend({
 					node.left.declarations[0].id.type === 'Identifier' &&
 					node.right.type === 'CallExpression' &&
 					node.right.callee.type === 'MemberExpression' &&
-					node.right.callee.computed === false &&
+					!node.right.callee.computed &&
 					node.right.callee.object.type === 'Identifier' &&
 					node.right.callee.object.name.startsWith('$'); // n8n var, e.g $input
 
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/theme.ts b/packages/editor-ui/src/components/CodeNodeEditor/theme.ts
index 96fc32e0b3f4b..a495800f3d341 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/theme.ts
+++ b/packages/editor-ui/src/components/CodeNodeEditor/theme.ts
@@ -27,16 +27,29 @@ const BASE_STYLING = {
 	},
 };
 
-const cssStyleDeclaration = getComputedStyle(document.documentElement);
+interface ThemeSettings {
+	isReadOnly?: boolean;
+	maxHeight?: string;
+	minHeight?: string;
+	rows?: number;
+	highlightColors?: 'default' | 'html';
+}
 
-export const CODE_NODE_EDITOR_THEME = [
+export const codeNodeEditorTheme = ({
+	isReadOnly,
+	minHeight,
+	maxHeight,
+	rows,
+	highlightColors,
+}: ThemeSettings) => [
 	EditorView.theme({
 		'&': {
 			'font-size': BASE_STYLING.fontSize,
-			border: cssStyleDeclaration.getPropertyValue('--border-base'),
-			borderRadius: cssStyleDeclaration.getPropertyValue('--border-radius-base'),
+			border: 'var(--border-base)',
+			borderRadius: 'var(--border-radius-base)',
 			backgroundColor: 'var(--color-code-background)',
 			color: 'var(--color-code-foreground)',
+			height: '100%',
 		},
 		'.cm-content': {
 			fontFamily: BASE_STYLING.fontFamily,
@@ -48,6 +61,10 @@ export const CODE_NODE_EDITOR_THEME = [
 		'&.cm-focused .cm-selectionBackgroundm .cm-selectionBackground, .cm-content ::selection': {
 			backgroundColor: 'var(--color-code-selection)',
 		},
+		'&.cm-editor': {
+			...(isReadOnly ? { backgroundColor: 'var(--color-code-background-readonly)' } : {}),
+			borderColor: 'var(--border-color-base)',
+		},
 		'&.cm-editor.cm-focused': {
 			outline: 'none',
 			borderColor: 'var(--color-secondary)',
@@ -59,9 +76,12 @@ export const CODE_NODE_EDITOR_THEME = [
 			backgroundColor: 'var(--color-code-lineHighlight)',
 		},
 		'.cm-gutters': {
-			backgroundColor: 'var(--color-code-gutterBackground)',
+			backgroundColor: isReadOnly
+				? 'var(--color-code-background-readonly)'
+				: 'var(--color-code-gutterBackground)',
 			color: 'var(--color-code-gutterForeground)',
 			borderRadius: 'var(--border-radius-base)',
+			borderRightColor: 'var(--border-color-base)',
 		},
 		'.cm-tooltip': {
 			maxWidth: BASE_STYLING.tooltip.maxWidth,
@@ -69,58 +89,120 @@ export const CODE_NODE_EDITOR_THEME = [
 		},
 		'.cm-scroller': {
 			overflow: 'auto',
-			maxHeight: BASE_STYLING.maxHeight,
+			maxHeight: maxHeight ?? '100%',
+			...(isReadOnly
+				? {}
+				: { minHeight: rows && rows !== -1 ? `${Number(rows + 1) * 1.3}em` : 'auto' }),
+		},
+		'.cm-gutter,.cm-content': {
+			minHeight: rows && rows !== -1 ? 'auto' : minHeight ?? 'calc(35vh - var(--spacing-2xl))',
 		},
 		'.cm-diagnosticAction': {
 			backgroundColor: BASE_STYLING.diagnosticButton.backgroundColor,
-			color: cssStyleDeclaration.getPropertyValue('--color-primary'),
+			color: 'var(--color-primary)',
 			lineHeight: BASE_STYLING.diagnosticButton.lineHeight,
 			textDecoration: BASE_STYLING.diagnosticButton.textDecoration,
 			marginLeft: BASE_STYLING.diagnosticButton.marginLeft,
 			cursor: BASE_STYLING.diagnosticButton.cursor,
 		},
+		'.cm-diagnostic-error': {
+			backgroundColor: 'var(--color-background-base)',
+		},
+		'.cm-diagnosticText': {
+			color: 'var(--color-text-base)',
+		},
 	}),
-	syntaxHighlighting(
-		HighlightStyle.define([
-			{
-				tag: tags.comment,
-				color: 'var(--color-code-tags-comment)',
-			},
-			{
-				tag: [tags.string, tags.special(tags.brace)],
-				color: 'var(--color-code-tags-string)',
-			},
-			{
-				tag: [tags.number, tags.self, tags.bool, tags.null],
-				color: 'var(--color-code-tags-primitive)',
-			},
-			{
-				tag: tags.keyword,
-				color: 'var(--color-code-tags-keyword)',
-			},
-			{
-				tag: tags.operator,
-				color: 'var(--color-code-tags-operator)',
-			},
-			{
-				tag: [
-					tags.variableName,
-					tags.propertyName,
-					tags.attributeName,
-					tags.regexp,
-					tags.className,
-					tags.typeName,
-				],
-				color: 'var(--color-code-tags-variable)',
-			},
-			{
-				tag: [
-					tags.definition(tags.typeName),
-					tags.definition(tags.propertyName),
-					tags.function(tags.variableName),
-				],
-				color: 'var(--color-code-tags-definition)',
-			},
-		]),
-	),
+	highlightColors === 'html'
+		? syntaxHighlighting(
+				HighlightStyle.define([
+					{ tag: tags.keyword, color: '#c678dd' },
+					{
+						tag: [tags.name, tags.deleted, tags.character, tags.propertyName, tags.macroName],
+						color: '#e06c75',
+					},
+					{ tag: [tags.function(tags.variableName), tags.labelName], color: '#61afef' },
+					{
+						tag: [tags.color, tags.constant(tags.name), tags.standard(tags.name)],
+						color: '#d19a66',
+					},
+					{ tag: [tags.definition(tags.name), tags.separator], color: '#abb2bf' },
+					{
+						tag: [
+							tags.typeName,
+							tags.className,
+							tags.number,
+							tags.changed,
+							tags.annotation,
+							tags.modifier,
+							tags.self,
+							tags.namespace,
+						],
+						color: '#e06c75',
+					},
+					{
+						tag: [
+							tags.operator,
+							tags.operatorKeyword,
+							tags.url,
+							tags.escape,
+							tags.regexp,
+							tags.link,
+							tags.special(tags.string),
+						],
+						color: '#56b6c2',
+					},
+					{ tag: [tags.meta, tags.comment], color: '#7d8799' },
+					{ tag: tags.strong, fontWeight: 'bold' },
+					{ tag: tags.emphasis, fontStyle: 'italic' },
+					{ tag: tags.strikethrough, textDecoration: 'line-through' },
+					{ tag: tags.link, color: '#7d8799', textDecoration: 'underline' },
+					{ tag: tags.heading, fontWeight: 'bold', color: '#e06c75' },
+					{ tag: [tags.atom, tags.bool, tags.special(tags.variableName)], color: '#d19a66' },
+					{ tag: [tags.processingInstruction, tags.string, tags.inserted], color: '#98c379' },
+					{ tag: tags.invalid, color: 'red', 'font-weight': 'bold' },
+				]),
+			)
+		: syntaxHighlighting(
+				HighlightStyle.define([
+					{
+						tag: tags.comment,
+						color: 'var(--color-code-tags-comment)',
+					},
+					{
+						tag: [tags.string, tags.special(tags.brace)],
+						color: 'var(--color-code-tags-string)',
+					},
+					{
+						tag: [tags.number, tags.self, tags.bool, tags.null],
+						color: 'var(--color-code-tags-primitive)',
+					},
+					{
+						tag: tags.keyword,
+						color: 'var(--color-code-tags-keyword)',
+					},
+					{
+						tag: tags.operator,
+						color: 'var(--color-code-tags-operator)',
+					},
+					{
+						tag: [
+							tags.variableName,
+							tags.propertyName,
+							tags.attributeName,
+							tags.regexp,
+							tags.className,
+							tags.typeName,
+						],
+						color: 'var(--color-code-tags-variable)',
+					},
+					{
+						tag: [
+							tags.definition(tags.typeName),
+							tags.definition(tags.propertyName),
+							tags.function(tags.variableName),
+						],
+						color: 'var(--color-code-tags-definition)',
+					},
+				]),
+			),
 ];
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/types.ts b/packages/editor-ui/src/components/CodeNodeEditor/types.ts
index 38d5e669b89b4..61f0871794dad 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/types.ts
+++ b/packages/editor-ui/src/components/CodeNodeEditor/types.ts
@@ -1,13 +1,15 @@
 import type { EditorView } from '@codemirror/view';
 import type { I18nClass } from '@/plugins/i18n';
-import type { Workflow } from 'n8n-workflow';
+import type { Workflow, CodeExecutionMode, CodeNodeEditorLanguage } from 'n8n-workflow';
 import type { Node } from 'estree';
+import type { DefineComponent } from 'vue';
 
-export type CodeNodeEditorMixin = Vue.VueConstructor<
-	Vue & {
+export type CodeNodeEditorMixin = InstanceType<
+	DefineComponent & {
 		$locale: I18nClass;
 		editor: EditorView | null;
-		mode: 'runOnceForAllItems' | 'runOnceForEachItem';
+		mode: CodeExecutionMode;
+		language: CodeNodeEditorLanguage;
 		getCurrentWorkflow(): Workflow;
 	}
 >;
diff --git a/packages/editor-ui/src/components/CollectionCard.vue b/packages/editor-ui/src/components/CollectionCard.vue
deleted file mode 100644
index 642126123508b..0000000000000
--- a/packages/editor-ui/src/components/CollectionCard.vue
+++ /dev/null
@@ -1,41 +0,0 @@
-<template>
-	<Card :loading="loading" :title="collection.name" @click="onClick">
-		<template #footer>
-			<n8n-text size="small" color="text-light">
-				{{ collection.workflows.length }}
-				{{ $locale.baseText('templates.workflows') }}
-			</n8n-text>
-			<NodeList :nodes="collection.nodes" :showMore="false" />
-		</template>
-	</Card>
-</template>
-
-<script lang="ts">
-import { genericHelpers } from '@/mixins/genericHelpers';
-import Card from '@/components/CollectionWorkflowCard.vue';
-import mixins from 'vue-typed-mixins';
-import NodeList from '@/components/NodeList.vue';
-
-export default mixins(genericHelpers).extend({
-	name: 'CollectionCard',
-	props: {
-		loading: {
-			type: Boolean,
-		},
-		collection: {
-			type: Object,
-		},
-	},
-	components: {
-		Card,
-		NodeList,
-	},
-	methods: {
-		onClick(e: MouseEvent) {
-			this.$emit('click', e);
-		},
-	},
-});
-</script>
-
-<style lang="scss" module></style>
diff --git a/packages/editor-ui/src/components/CollectionParameter.vue b/packages/editor-ui/src/components/CollectionParameter.vue
index 919da56fd74e5..55d25ee4052f4 100644
--- a/packages/editor-ui/src/components/CollectionParameter.vue
+++ b/packages/editor-ui/src/components/CollectionParameter.vue
@@ -1,41 +1,44 @@
 <template>
-	<div @keydown.stop class="collection-parameter">
+	<div class="collection-parameter" @keydown.stop>
 		<div class="collection-parameter-wrapper">
 			<div v-if="getProperties.length === 0" class="no-items-exist">
 				<n8n-text size="small">{{ $locale.baseText('collectionParameter.noProperties') }}</n8n-text>
 			</div>
 
-			<parameter-input-list
-				:parameters="getProperties"
-				:nodeValues="nodeValues"
-				:path="path"
-				:hideDelete="hideDelete"
-				:indent="true"
-				:isReadOnly="isReadOnly"
-				@valueChanged="valueChanged"
-			/>
+			<Suspense>
+				<ParameterInputList
+					:parameters="getProperties"
+					:node-values="nodeValues"
+					:path="path"
+					:hide-delete="hideDelete"
+					:indent="true"
+					:is-read-only="isReadOnly"
+					@value-changed="valueChanged"
+				/>
+			</Suspense>
 
 			<div v-if="parameterOptions.length > 0 && !isReadOnly" class="param-options">
 				<n8n-button
-					v-if="parameter.options.length === 1"
+					v-if="(parameter.options ?? []).length === 1"
 					type="tertiary"
 					block
-					@click="optionSelected(parameter.options[0].name)"
 					:label="getPlaceholderText"
+					@click="optionSelected((parameter.options ?? [])[0].name)"
 				/>
 				<div v-else class="add-option">
 					<n8n-select
 						v-model="selectedOption"
 						:placeholder="getPlaceholderText"
 						size="small"
-						@change="optionSelected"
 						filterable
+						@update:model-value="optionSelected"
 					>
 						<n8n-option
 							v-for="item in parameterOptions"
 							:key="item.name"
-							:label="$locale.nodeText().collectionOptionDisplayName(parameter, item, path)"
+							:label="getParameterOptionLabel(item)"
 							:value="item.name"
+							data-test-id="collection-parameter-option"
 						>
 						</n8n-option>
 					</n8n-select>
@@ -45,157 +48,165 @@
 	</div>
 </template>
 
-<script lang="ts">
-import type { INodeUi, IUpdateInformation } from '@/Interface';
+<script lang="ts" setup>
+import { ref, computed } from 'vue';
+import type { IUpdateInformation } from '@/Interface';
 
-import type { INodeProperties, INodePropertyOptions } from 'n8n-workflow';
+import type {
+	INodeParameters,
+	INodeProperties,
+	INodePropertyCollection,
+	INodePropertyOptions,
+} from 'n8n-workflow';
 import { deepCopy } from 'n8n-workflow';
 
-import { nodeHelpers } from '@/mixins/nodeHelpers';
-
 import { get } from 'lodash-es';
 
-import mixins from 'vue-typed-mixins';
-import type { Component } from 'vue';
-import { mapStores } from 'pinia';
-import { useNDVStore } from '@/stores/ndv';
-
-export default mixins(nodeHelpers).extend({
-	name: 'CollectionParameter',
-	props: [
-		'hideDelete', // boolean
-		'nodeValues', // NodeParameters
-		'parameter', // INodeProperties
-		'path', // string
-		'values', // NodeParameters
-		'isReadOnly', // boolean
-	],
-	components: {
-		ParameterInputList: () => import('./ParameterInputList.vue') as Promise<Component>,
-	},
-	data() {
-		return {
-			selectedOption: undefined,
-		};
-	},
-	computed: {
-		...mapStores(useNDVStore),
-		getPlaceholderText(): string {
-			const placeholder = this.$locale.nodeText().placeholder(this.parameter, this.path);
-			return placeholder ? placeholder : this.$locale.baseText('collectionParameter.choose');
-		},
-		getProperties(): INodeProperties[] {
-			const returnProperties = [];
-			let tempProperties;
-			for (const name of this.propertyNames) {
-				tempProperties = this.getOptionProperties(name);
-				if (tempProperties !== undefined) {
-					returnProperties.push(...tempProperties);
-				}
-			}
-			return returnProperties;
-		},
-		// Returns all the options which should be displayed
-		filteredOptions(): Array<INodePropertyOptions | INodeProperties> {
-			return (this.parameter.options as Array<INodePropertyOptions | INodeProperties>).filter(
-				(option) => {
-					return this.displayNodeParameter(option as INodeProperties);
-				},
-			);
-		},
-		node(): INodeUi | null {
-			return this.ndvStore.activeNode;
-		},
-		// Returns all the options which did not get added already
-		parameterOptions(): Array<INodePropertyOptions | INodeProperties> {
-			return (this.filteredOptions as Array<INodePropertyOptions | INodeProperties>).filter(
-				(option) => {
-					return !this.propertyNames.includes(option.name);
-				},
-			);
-		},
-		propertyNames(): string[] {
-			if (this.values) {
-				return Object.keys(this.values);
-			}
-			return [];
-		},
-	},
-	methods: {
-		getArgument(argumentName: string): string | number | boolean | undefined {
-			if (this.parameter.typeOptions === undefined) {
-				return undefined;
-			}
+import { useNDVStore } from '@/stores/ndv.store';
+import { useNodeHelpers } from '@/composables/useNodeHelpers';
+import { useI18n } from '@/composables/useI18n';
+
+const selectedOption = ref<string | undefined>(undefined);
+export interface Props {
+	hideDelete?: boolean;
+	nodeValues: INodeParameters;
+	parameter: INodeProperties;
+	path: string;
+	values: INodeProperties;
+	isReadOnly?: boolean;
+}
+const emit = defineEmits<{
+	(event: 'valueChanged', value: IUpdateInformation): void;
+}>();
+const props = defineProps<Props>();
+const ndvStore = useNDVStore();
+const i18n = useI18n();
+const nodeHelpers = useNodeHelpers();
+
+const getPlaceholderText = computed(() => {
+	return (
+		i18n.nodeText().placeholder(props.parameter, props.path) ??
+		i18n.baseText('collectionParameter.choose')
+	);
+});
 
-			if (this.parameter.typeOptions[argumentName] === undefined) {
-				return undefined;
-			}
+function isNodePropertyCollection(
+	object: INodePropertyOptions | INodeProperties | INodePropertyCollection,
+): object is INodePropertyCollection {
+	return 'values' in object;
+}
 
-			return this.parameter.typeOptions[argumentName];
-		},
-		getOptionProperties(optionName: string): INodeProperties[] {
-			const properties: INodeProperties[] = [];
-			for (const option of this.parameter.options) {
-				if (option.name === optionName) {
-					properties.push(option);
-				}
-			}
+function getParameterOptionLabel(
+	item: INodePropertyOptions | INodeProperties | INodePropertyCollection,
+): string {
+	if (isNodePropertyCollection(item)) {
+		return i18n.nodeText().collectionOptionDisplayName(props.parameter, item, props.path);
+	}
 
-			return properties;
-		},
-		displayNodeParameter(parameter: INodeProperties) {
-			if (parameter.displayOptions === undefined) {
-				// If it is not defined no need to do a proper check
-				return true;
-			}
-			return this.displayParameter(this.nodeValues, parameter, this.path, this.node);
-		},
-		optionSelected(optionName: string) {
-			const options = this.getOptionProperties(optionName);
-			if (options.length === 0) {
-				return;
-			}
+	return 'displayName' in item ? item.displayName : item.name;
+}
 
-			const option = options[0];
-			const name = `${this.path}.${option.name}`;
-
-			let parameterData;
-
-			if (option.typeOptions !== undefined && option.typeOptions.multipleValues === true) {
-				// Multiple values are allowed
-
-				let newValue;
-				if (option.type === 'fixedCollection') {
-					// The "fixedCollection" entries are different as they save values
-					// in an object and then underneath there is an array. So initialize
-					// them differently.
-					newValue = get(this.nodeValues, `${this.path}.${optionName}`, {});
-				} else {
-					// Everything else saves them directly as an array.
-					newValue = get(this.nodeValues, `${this.path}.${optionName}`, []);
-					newValue.push(deepCopy(option.default));
-				}
-
-				parameterData = {
-					name,
-					value: newValue,
-				};
-			} else {
-				// Add a new option
-				parameterData = {
-					name,
-					value: deepCopy(option.default),
-				};
-			}
+function displayNodeParameter(parameter: INodeProperties) {
+	if (parameter.displayOptions === undefined) {
+		// If it is not defined no need to do a proper check
+		return true;
+	}
+	return nodeHelpers.displayParameter(props.nodeValues, parameter, props.path, ndvStore.activeNode);
+}
 
-			this.$emit('valueChanged', parameterData);
-			this.selectedOption = undefined;
-		},
-		valueChanged(parameterData: IUpdateInformation) {
-			this.$emit('valueChanged', parameterData);
+function getOptionProperties(optionName: string) {
+	const properties = [];
+	for (const option of props.parameter.options ?? []) {
+		if (option.name === optionName) {
+			properties.push(option);
+		}
+	}
+
+	return properties;
+}
+const propertyNames = computed<string[]>(() => {
+	if (props.values) {
+		return Object.keys(props.values);
+	}
+	return [];
+});
+const getProperties = computed(() => {
+	const returnProperties = [];
+	let tempProperties;
+	for (const name of propertyNames.value) {
+		tempProperties = getOptionProperties(name);
+		if (tempProperties !== undefined) {
+			returnProperties.push(...tempProperties);
+		}
+	}
+	return returnProperties;
+});
+const filteredOptions = computed<Array<INodePropertyOptions | INodeProperties>>(() => {
+	return (props.parameter.options as Array<INodePropertyOptions | INodeProperties>).filter(
+		(option) => {
+			return displayNodeParameter(option as INodeProperties);
 		},
-	},
+	);
 });
+const parameterOptions = computed(() => {
+	return filteredOptions.value.filter((option) => {
+		return !propertyNames.value.includes(option.name);
+	});
+});
+
+function optionSelected(optionName: string) {
+	const options = getOptionProperties(optionName);
+	if (options.length === 0) {
+		return;
+	}
+
+	const option = options[0];
+	const name = `${props.path}.${option.name}`;
+
+	let parameterData;
+
+	if (
+		'typeOptions' in option &&
+		option.typeOptions !== undefined &&
+		option.typeOptions.multipleValues === true
+	) {
+		// Multiple values are allowed
+		let newValue;
+		if (option.type === 'fixedCollection') {
+			// The "fixedCollection" entries are different as they save values
+			// in an object and then underneath there is an array. So initialize
+			// them differently.
+			const retrievedObjectValue = get(props.nodeValues, [props.path, optionName], {});
+			newValue = retrievedObjectValue;
+		} else {
+			// Everything else saves them directly as an array.
+			const retrievedArrayValue = get(props.nodeValues, [props.path, optionName], []) as Array<
+				typeof option.default
+			>;
+			if (Array.isArray(retrievedArrayValue)) {
+				newValue = retrievedArrayValue;
+				newValue.push(deepCopy(option.default));
+			}
+		}
+
+		parameterData = {
+			name,
+			value: newValue,
+		};
+	} else {
+		// Add a new option
+		parameterData = {
+			name,
+			value: 'default' in option ? deepCopy(option.default) : null,
+		};
+	}
+
+	emit('valueChanged', parameterData);
+	selectedOption.value = undefined;
+}
+function valueChanged(parameterData: IUpdateInformation) {
+	emit('valueChanged', parameterData);
+}
 </script>
 
 <style lang="scss">
@@ -206,7 +217,28 @@ export default mixins(nodeHelpers).extend({
 		margin-top: var(--spacing-xs);
 
 		.button {
+			color: var(--color-text-dark);
+			font-weight: var(--font-weight-normal);
+			--button-border-color: var(--color-foreground-base);
 			--button-background-color: var(--color-background-base);
+
+			--button-hover-font-color: var(--color-button-secondary-font);
+			--button-hover-border-color: var(--color-foreground-base);
+			--button-hover-background-color: var(--color-background-base);
+
+			--button-active-font-color: var(--color-button-secondary-font);
+			--button-active-border-color: var(--color-foreground-base);
+			--button-active-background-color: var(--color-background-base);
+
+			--button-focus-font-color: var(--color-button-secondary-font);
+			--button-focus-border-color: var(--color-foreground-base);
+			--button-focus-background-color: var(--color-background-base);
+
+			&:active,
+			&.active,
+			&:focus {
+				outline: none;
+			}
 		}
 	}
 
diff --git a/packages/editor-ui/src/components/CollectionWorkflowCard.vue b/packages/editor-ui/src/components/CollectionWorkflowCard.vue
index 2826004c691bd..82f6f1b1bc9ca 100644
--- a/packages/editor-ui/src/components/CollectionWorkflowCard.vue
+++ b/packages/editor-ui/src/components/CollectionWorkflowCard.vue
@@ -1,20 +1,19 @@
 <template>
-	<n8n-card :class="$style.card" v-on="$listeners">
-		<template #header v-if="!loading">
-			<span v-text="title" :class="$style.title" />
+	<n8n-card :class="$style.card" v-bind="$attrs">
+		<template v-if="!loading" #header>
+			<span :class="$style.title" v-text="title" />
 		</template>
 		<n8n-loading :loading="loading" :rows="3" variant="p" />
-		<template #footer v-if="!loading">
+		<template v-if="!loading" #footer>
 			<slot name="footer" />
 		</template>
 	</n8n-card>
 </template>
 
 <script lang="ts">
-import { genericHelpers } from '@/mixins/genericHelpers';
-import mixins from 'vue-typed-mixins';
+import { defineComponent } from 'vue';
 
-export default mixins(genericHelpers).extend({
+export default defineComponent({
 	name: 'Card',
 	props: {
 		loading: {
@@ -29,7 +28,7 @@ export default mixins(genericHelpers).extend({
 
 <style lang="scss" module>
 .card {
-	width: 240px !important;
+	min-width: 235px;
 	height: 140px;
 	margin-right: var(--spacing-2xs);
 	cursor: pointer;
diff --git a/packages/editor-ui/src/components/CollectionsCarousel.vue b/packages/editor-ui/src/components/CollectionsCarousel.vue
deleted file mode 100644
index 1672ac976e0fc..0000000000000
--- a/packages/editor-ui/src/components/CollectionsCarousel.vue
+++ /dev/null
@@ -1,212 +0,0 @@
-<template>
-	<div :class="$style.container" v-show="loading || collections.length">
-		<agile
-			ref="slider"
-			:dots="false"
-			:navButtons="false"
-			:infinite="false"
-			:slides-to-show="4"
-			@after-change="updateCarouselScroll"
-		>
-			<Card v-for="n in loading ? 4 : 0" :key="`loading-${n}`" :loading="loading" />
-			<CollectionCard
-				v-for="collection in loading ? [] : collections"
-				:key="collection.id"
-				:collection="collection"
-				@click="(e) => onCardClick(e, collection.id)"
-			/>
-		</agile>
-		<button v-show="carouselScrollPosition > 0" :class="$style.leftButton" @click="scrollLeft">
-			<font-awesome-icon icon="chevron-left" />
-		</button>
-		<button v-show="!scrollEnd" :class="$style.rightButton" @click="scrollRight">
-			<font-awesome-icon icon="chevron-right" />
-		</button>
-	</div>
-</template>
-
-<script lang="ts">
-import type { PropType } from 'vue';
-import type { ITemplatesCollection } from '@/Interface';
-import Card from '@/components/CollectionWorkflowCard.vue';
-import CollectionCard from '@/components/CollectionCard.vue';
-import VueAgile from 'vue-agile';
-
-import { genericHelpers } from '@/mixins/genericHelpers';
-import mixins from 'vue-typed-mixins';
-
-type SliderRef = InstanceType<typeof VueAgile>;
-
-export default mixins(genericHelpers).extend({
-	name: 'CollectionsCarousel',
-	props: {
-		collections: {
-			type: Array as PropType<ITemplatesCollection[]>,
-		},
-		loading: {
-			type: Boolean,
-		},
-	},
-	watch: {
-		collections() {
-			setTimeout(() => {
-				this.updateCarouselScroll();
-			}, 0);
-		},
-		loading() {
-			setTimeout(() => {
-				this.updateCarouselScroll();
-			}, 0);
-		},
-	},
-	components: {
-		Card,
-		CollectionCard,
-		VueAgile,
-	},
-	data() {
-		return {
-			carouselScrollPosition: 0,
-			cardWidth: 240,
-			scrollEnd: false,
-			listElement: null as null | Element,
-		};
-	},
-	methods: {
-		updateCarouselScroll() {
-			if (this.listElement) {
-				this.carouselScrollPosition = Number(this.listElement.scrollLeft.toFixed());
-
-				const width = this.listElement.clientWidth;
-				const scrollWidth = this.listElement.scrollWidth;
-				const scrollLeft = this.carouselScrollPosition;
-				this.scrollEnd = scrollWidth - width <= scrollLeft + 7;
-			}
-		},
-		onCardClick(event: MouseEvent, id: string) {
-			this.$emit('openCollection', { event, id });
-		},
-		scrollLeft() {
-			if (this.listElement) {
-				this.listElement.scrollBy({ left: -(this.cardWidth * 2), top: 0, behavior: 'smooth' });
-			}
-		},
-		scrollRight() {
-			if (this.listElement) {
-				this.listElement.scrollBy({ left: this.cardWidth * 2, top: 0, behavior: 'smooth' });
-			}
-		},
-	},
-	mounted() {
-		this.$nextTick(() => {
-			const sliderRef = this.$refs.slider as SliderRef | undefined;
-			if (!sliderRef) {
-				return;
-			}
-
-			this.listElement = sliderRef.$el.querySelector('.agile__list');
-			if (this.listElement) {
-				this.listElement.addEventListener('scroll', this.updateCarouselScroll);
-			}
-		});
-	},
-	beforeDestroy() {
-		const sliderRef = this.$refs.slider as SliderRef | undefined;
-		if (sliderRef) {
-			sliderRef.destroy();
-		}
-
-		window.removeEventListener('scroll', this.updateCarouselScroll);
-	},
-});
-</script>
-
-<style lang="scss" module>
-.container {
-	position: relative;
-}
-
-.button {
-	width: 28px;
-	height: 37px;
-	position: absolute;
-	top: 35%;
-	border-radius: var(--border-radius-large);
-	border: var(--border-base);
-	background-color: #fbfcfe;
-	cursor: pointer;
-
-	&:after {
-		content: '';
-		width: 40px;
-		height: 140px;
-		top: -55px;
-		position: absolute;
-	}
-	svg {
-		color: var(--color-foreground-xdark);
-	}
-}
-
-.leftButton {
-	composes: button;
-	left: -30px;
-
-	&:after {
-		left: 27px;
-		background: linear-gradient(
-			270deg,
-			hsla(
-				var(--color-background-light-h),
-				var(--color-background-light-s),
-				var(--color-background-light-l),
-				50%
-			),
-			hsla(
-				var(--color-background-light-h),
-				var(--color-background-light-s),
-				var(--color-background-light-l),
-				100%
-			)
-		);
-	}
-}
-
-.rightButton {
-	composes: button;
-	right: -30px;
-	&:after {
-		right: 27px;
-		background: linear-gradient(
-			90deg,
-			hsla(
-				var(--color-background-light-h),
-				var(--color-background-light-s),
-				var(--color-background-light-l),
-				50%
-			),
-			hsla(
-				var(--color-background-light-h),
-				var(--color-background-light-s),
-				var(--color-background-light-l),
-				100%
-			)
-		);
-	}
-}
-</style>
-
-<style lang="scss">
-.agile {
-	&__list {
-		width: 100%;
-		padding-bottom: var(--spacing-2xs);
-		overflow-x: auto;
-		transition: all 1s ease-in-out;
-	}
-
-	&__track {
-		width: 50px;
-	}
-}
-</style>
diff --git a/packages/editor-ui/src/components/CommunityPackageCard.vue b/packages/editor-ui/src/components/CommunityPackageCard.vue
index 8fef13ae282ea..7a3c8faff14c0 100644
--- a/packages/editor-ui/src/components/CommunityPackageCard.vue
+++ b/packages/editor-ui/src/components/CommunityPackageCard.vue
@@ -43,7 +43,7 @@
 							{{ $locale.baseText('settings.communityNodes.updateAvailable.tooltip') }}
 						</div>
 					</template>
-					<n8n-button type="outline" label="Update" @click="onUpdateClick" />
+					<n8n-button outline label="Update" @click="onUpdateClick" />
 				</n8n-tooltip>
 				<n8n-tooltip v-else placement="top">
 					<template #content>
@@ -62,14 +62,13 @@
 </template>
 
 <script lang="ts">
-import { useUIStore } from '@/stores/ui';
+import { useUIStore } from '@/stores/ui.store';
 import type { PublicInstalledPackage } from 'n8n-workflow';
 import { mapStores } from 'pinia';
-import mixins from 'vue-typed-mixins';
-import { NPM_PACKAGE_DOCS_BASE_URL, COMMUNITY_PACKAGE_MANAGE_ACTIONS } from '../constants';
-import { showMessage } from '@/mixins/showMessage';
+import { defineComponent } from 'vue';
+import { NPM_PACKAGE_DOCS_BASE_URL, COMMUNITY_PACKAGE_MANAGE_ACTIONS } from '@/constants';
 
-export default mixins(showMessage).extend({
+export default defineComponent({
 	name: 'CommunityPackageCard',
 	props: {
 		communityPackage: {
diff --git a/packages/editor-ui/src/components/CommunityPackageInstallModal.vue b/packages/editor-ui/src/components/CommunityPackageInstallModal.vue
index 6bc92012104aa..d2122a2ada43b 100644
--- a/packages/editor-ui/src/components/CommunityPackageInstallModal.vue
+++ b/packages/editor-ui/src/components/CommunityPackageInstallModal.vue
@@ -3,10 +3,10 @@
 		width="540px"
 		:name="COMMUNITY_PACKAGE_INSTALL_MODAL_KEY"
 		:title="$locale.baseText('settings.communityNodes.installModal.title')"
-		:eventBus="modalBus"
+		:event-bus="modalBus"
 		:center="true"
-		:beforeClose="onModalClose"
-		:showClose="!loading"
+		:before-close="onModalClose"
+		:show-close="!loading"
 	>
 		<template #content>
 			<div :class="[$style.descriptionContainer, 'p-s']">
@@ -14,6 +14,7 @@
 					<n8n-text>
 						{{ $locale.baseText('settings.communityNodes.installModal.description') }}
 					</n8n-text>
+					{{ ' ' }}
 					<n8n-link :to="COMMUNITY_NODES_INSTALLATION_DOCS_URL" @click="onMoreInfoTopClick">
 						{{ $locale.baseText('_reusableDynamicText.moreInfo') }}
 					</n8n-link>
@@ -29,15 +30,15 @@
 				<n8n-input-label
 					:class="$style.labelTooltip"
 					:label="$locale.baseText('settings.communityNodes.installModal.packageName.label')"
-					:tooltipText="
+					:tooltip-text="
 						$locale.baseText('settings.communityNodes.installModal.packageName.tooltip', {
 							interpolate: { npmURL: NPM_KEYWORD_SEARCH_URL },
 						})
 					"
 				>
 					<n8n-input
-						name="packageNameInput"
 						v-model="packageName"
+						name="packageNameInput"
 						type="text"
 						:maxlength="214"
 						:placeholder="
@@ -59,7 +60,8 @@
 					v-model="userAgreed"
 					:class="[$style.checkbox, checkboxWarning ? $style.error : '', 'mt-l']"
 					:disabled="loading"
-					@change="onCheckboxChecked"
+					data-test-id="user-agreement-checkbox"
+					@update:model-value="onCheckboxChecked"
 				>
 					<n8n-text>
 						{{ $locale.baseText('settings.communityNodes.installModal.checkbox.label') }} </n8n-text
@@ -73,7 +75,7 @@
 		<template #footer>
 			<n8n-button
 				:loading="loading"
-				:disabled="packageName === '' || loading"
+				:disabled="!userAgreed || packageName === '' || loading"
 				:label="
 					loading
 						? $locale.baseText('settings.communityNodes.installModal.installButton.label.loading')
@@ -81,6 +83,7 @@
 				"
 				size="large"
 				float="right"
+				data-test-id="install-community-package-button"
 				@click="onInstallClick"
 			/>
 		</template>
@@ -88,24 +91,29 @@
 </template>
 
 <script lang="ts">
-import Modal from './Modal.vue';
+import { defineComponent } from 'vue';
+import { mapStores } from 'pinia';
+import { createEventBus } from 'n8n-design-system/utils';
+import Modal from '@/components/Modal.vue';
 import {
 	COMMUNITY_PACKAGE_INSTALL_MODAL_KEY,
 	NPM_KEYWORD_SEARCH_URL,
 	COMMUNITY_NODES_INSTALLATION_DOCS_URL,
 	COMMUNITY_NODES_RISKS_DOCS_URL,
-} from '../constants';
-import mixins from 'vue-typed-mixins';
-import { showMessage } from '@/mixins/showMessage';
-import { mapStores } from 'pinia';
-import { useCommunityNodesStore } from '@/stores/communityNodes';
-import { createEventBus } from '@/event-bus';
+} from '@/constants';
+import { useToast } from '@/composables/useToast';
+import { useCommunityNodesStore } from '@/stores/communityNodes.store';
 
-export default mixins(showMessage).extend({
+export default defineComponent({
 	name: 'CommunityPackageInstallModal',
 	components: {
 		Modal,
 	},
+	setup() {
+		return {
+			...useToast(),
+		};
+	},
 	data() {
 		return {
 			loading: false,
@@ -144,7 +152,7 @@ export default mixins(showMessage).extend({
 					await this.communityNodesStore.fetchInstalledPackages();
 					this.loading = false;
 					this.modalBus.emit('close');
-					this.$showMessage({
+					this.showMessage({
 						title: this.$locale.baseText('settings.communityNodes.messages.install.success'),
 						type: 'success',
 					});
@@ -152,7 +160,7 @@ export default mixins(showMessage).extend({
 					if (error.httpStatusCode && error.httpStatusCode === 400) {
 						this.infoTextErrorMessage = error.message;
 					} else {
-						this.$showError(
+						this.showError(
 							error,
 							this.$locale.baseText('settings.communityNodes.messages.install.error'),
 						);
diff --git a/packages/editor-ui/src/components/CommunityPackageManageConfirmModal.vue b/packages/editor-ui/src/components/CommunityPackageManageConfirmModal.vue
index d0f7e75b291c2..16ce3026955a7 100644
--- a/packages/editor-ui/src/components/CommunityPackageManageConfirmModal.vue
+++ b/packages/editor-ui/src/components/CommunityPackageManageConfirmModal.vue
@@ -3,21 +3,19 @@
 		width="540px"
 		:name="COMMUNITY_PACKAGE_CONFIRM_MODAL_KEY"
 		:title="getModalContent.title"
-		:eventBus="modalBus"
+		:event-bus="modalBus"
 		:center="true"
-		:showClose="!loading"
-		:beforeClose="onModalClose"
+		:show-close="!loading"
+		:before-close="onModalClose"
 	>
 		<template #content>
 			<n8n-text>{{ getModalContent.message }}</n8n-text>
 			<div
-				:class="$style.descriptionContainer"
 				v-if="mode === COMMUNITY_PACKAGE_MANAGE_ACTIONS.UPDATE"
+				:class="$style.descriptionContainer"
 			>
 				<n8n-info-tip theme="info" type="note" :bold="false">
-					<template>
-						<span v-text="getModalContent.description"></span>
-					</template>
+					<span v-text="getModalContent.description"></span>
 				</n8n-info-tip>
 			</div>
 		</template>
@@ -35,18 +33,15 @@
 </template>
 
 <script>
-import mixins from 'vue-typed-mixins';
-import Modal from './Modal.vue';
-import {
-	COMMUNITY_PACKAGE_CONFIRM_MODAL_KEY,
-	COMMUNITY_PACKAGE_MANAGE_ACTIONS,
-} from '../constants';
-import { showMessage } from '@/mixins/showMessage';
+import { defineComponent } from 'vue';
+import Modal from '@/components/Modal.vue';
+import { COMMUNITY_PACKAGE_CONFIRM_MODAL_KEY, COMMUNITY_PACKAGE_MANAGE_ACTIONS } from '@/constants';
+import { useToast } from '@/composables/useToast';
 import { mapStores } from 'pinia';
-import { useCommunityNodesStore } from '@/stores/communityNodes';
-import { createEventBus } from '@/event-bus';
+import { useCommunityNodesStore } from '@/stores/communityNodes.store';
+import { createEventBus } from 'n8n-design-system/utils';
 
-export default mixins(showMessage).extend({
+export default defineComponent({
 	name: 'CommunityPackageManageConfirmModal',
 	components: {
 		Modal,
@@ -64,6 +59,11 @@ export default mixins(showMessage).extend({
 			type: String,
 		},
 	},
+	setup() {
+		return {
+			...useToast(),
+		};
+	},
 	data() {
 		return {
 			loading: false,
@@ -140,12 +140,12 @@ export default mixins(showMessage).extend({
 				});
 				this.loading = true;
 				await this.communityNodesStore.uninstallPackage(this.activePackageName);
-				this.$showMessage({
+				this.showMessage({
 					title: this.$locale.baseText('settings.communityNodes.messages.uninstall.success.title'),
 					type: 'success',
 				});
 			} catch (error) {
-				this.$showError(
+				this.showError(
 					error,
 					this.$locale.baseText('settings.communityNodes.messages.uninstall.error'),
 				);
@@ -167,7 +167,7 @@ export default mixins(showMessage).extend({
 				this.loading = true;
 				const updatedVersion = this.activePackage.updateAvailable;
 				await this.communityNodesStore.updatePackage(this.activePackageName);
-				this.$showMessage({
+				this.showMessage({
 					title: this.$locale.baseText('settings.communityNodes.messages.update.success.title'),
 					message: this.$locale.baseText(
 						'settings.communityNodes.messages.update.success.message',
@@ -181,7 +181,7 @@ export default mixins(showMessage).extend({
 					type: 'success',
 				});
 			} catch (error) {
-				this.$showError(
+				this.showError(
 					error,
 					this.$locale.baseText('settings.communityNodes.messages.update.error.title'),
 				);
diff --git a/packages/editor-ui/src/components/ContactPromptModal.vue b/packages/editor-ui/src/components/ContactPromptModal.vue
index 20e5c91b92e9c..dcf1e97598090 100644
--- a/packages/editor-ui/src/components/ContactPromptModal.vue
+++ b/packages/editor-ui/src/components/ContactPromptModal.vue
@@ -1,11 +1,11 @@
 <template>
 	<Modal
 		:name="modalName"
-		:eventBus="modalBus"
+		:event-bus="modalBus"
 		:center="true"
-		:closeOnPressEscape="false"
-		:beforeClose="closeDialog"
-		customClass="contact-prompt-modal"
+		:close-on-press-escape="false"
+		:before-close="closeDialog"
+		custom-class="contact-prompt-modal"
 		width="460px"
 	>
 		<template #header>
@@ -26,28 +26,32 @@
 		</template>
 		<template #footer>
 			<div :class="$style.footer">
-				<n8n-button label="Send" float="right" @click="send" :disabled="!isEmailValid" />
+				<n8n-button label="Send" float="right" :disabled="!isEmailValid" @click="send" />
 			</div>
 		</template>
 	</Modal>
 </template>
 
 <script lang="ts">
-import mixins from 'vue-typed-mixins';
-
+import { defineComponent } from 'vue';
+import { mapStores } from 'pinia';
 import type { IN8nPromptResponse } from '@/Interface';
 import { VALID_EMAIL_REGEX } from '@/constants';
-import { workflowHelpers } from '@/mixins/workflowHelpers';
-import Modal from './Modal.vue';
-import { mapStores } from 'pinia';
-import { useSettingsStore } from '@/stores/settings';
-import { useRootStore } from '@/stores/n8nRootStore';
-import { createEventBus } from '@/event-bus';
+import Modal from '@/components/Modal.vue';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import { createEventBus } from 'n8n-design-system/utils';
+import { useToast } from '@/composables/useToast';
 
-export default mixins(workflowHelpers).extend({
-	components: { Modal },
+export default defineComponent({
 	name: 'ContactPromptModal',
+	components: { Modal },
 	props: ['modalName'],
+	setup() {
+		return {
+			...useToast(),
+		};
+	},
 	data() {
 		return {
 			email: '',
@@ -94,7 +98,7 @@ export default mixins(workflowHelpers).extend({
 						instance_id: this.rootStore.instanceId,
 						email: this.email,
 					});
-					this.$showMessage({
+					this.showMessage({
 						title: 'Thanks!',
 						message: "It's people like you that help make n8n better",
 						type: 'success',
diff --git a/packages/editor-ui/src/components/ContextMenu/ContextMenu.vue b/packages/editor-ui/src/components/ContextMenu/ContextMenu.vue
new file mode 100644
index 0000000000000..2429ec766c118
--- /dev/null
+++ b/packages/editor-ui/src/components/ContextMenu/ContextMenu.vue
@@ -0,0 +1,72 @@
+<script lang="ts" setup>
+import { type ContextMenuAction, useContextMenu } from '@/composables/useContextMenu';
+import { N8nActionDropdown } from 'n8n-design-system';
+import type { INode } from 'n8n-workflow';
+import { watch, ref } from 'vue';
+
+const contextMenu = useContextMenu();
+const { position, isOpen, actions, target } = contextMenu;
+const dropdown = ref<InstanceType<typeof N8nActionDropdown>>();
+const emit = defineEmits<{ (event: 'action', action: ContextMenuAction, nodes: INode[]): void }>();
+
+watch(
+	isOpen,
+	() => {
+		if (isOpen) {
+			dropdown.value?.open();
+		} else {
+			dropdown.value?.close();
+		}
+	},
+	{ flush: 'post' },
+);
+
+function onActionSelect(item: string) {
+	const action = item as ContextMenuAction;
+	contextMenu._dispatchAction(action);
+	emit('action', action, contextMenu.targetNodes.value);
+}
+
+function onVisibleChange(open: boolean) {
+	if (!open) {
+		contextMenu.close();
+	}
+}
+</script>
+
+<template>
+	<Teleport v-if="isOpen" to="body">
+		<div
+			:class="$style.contextMenu"
+			:style="{
+				left: `${position[0]}px`,
+				top: `${position[1]}px`,
+			}"
+		>
+			<N8nActionDropdown
+				ref="dropdown"
+				:items="actions"
+				placement="bottom-start"
+				data-test-id="context-menu"
+				:hide-arrow="target.source !== 'node-button'"
+				@select="onActionSelect"
+				@visible-change="onVisibleChange"
+			>
+				<template #activator>
+					<div :class="$style.activator"></div>
+				</template>
+			</N8nActionDropdown>
+		</div>
+	</Teleport>
+</template>
+
+<style module lang="scss">
+.contextMenu {
+	position: fixed;
+}
+
+.activator {
+	pointer-events: none;
+	opacity: 0;
+}
+</style>
diff --git a/packages/editor-ui/src/components/CopyInput.vue b/packages/editor-ui/src/components/CopyInput.vue
index 534321e140d30..c999d9b5cf82a 100644
--- a/packages/editor-ui/src/components/CopyInput.vue
+++ b/packages/editor-ui/src/components/CopyInput.vue
@@ -2,9 +2,14 @@
 	<div>
 		<n8n-input-label :label="label">
 			<div
-				:class="{ [$style.copyText]: true, [$style[size]]: true, [$style.collapsed]: collapse }"
-				@click="copy"
+				:class="{
+					[$style.copyText]: true,
+					[$style[size]]: true,
+					[$style.collapsed]: collapse,
+					'ph-no-capture': redactValue,
+				}"
 				data-test-id="copy-input"
+				@click="copy"
 			>
 				<span ref="copyInputValue">{{ value }}</span>
 				<div :class="$style.copyButton">
@@ -17,11 +22,12 @@
 </template>
 
 <script lang="ts">
-import mixins from 'vue-typed-mixins';
-import { copyPaste } from '@/mixins/copyPaste';
-import { showMessage } from '@/mixins/showMessage';
+import { defineComponent } from 'vue';
+import { useToast } from '@/composables/useToast';
+import { i18n } from '@/plugins/i18n';
+import { useClipboard } from '@/composables/useClipboard';
 
-export default mixins(copyPaste, showMessage).extend({
+export default defineComponent({
 	props: {
 		label: {
 			type: String,
@@ -35,13 +41,13 @@ export default mixins(copyPaste, showMessage).extend({
 		copyButtonText: {
 			type: String,
 			default(): string {
-				return this.$locale.baseText('generic.copy');
+				return i18n.baseText('generic.copy');
 			},
 		},
 		toastTitle: {
 			type: String,
 			default(): string {
-				return this.$locale.baseText('generic.copiedToClipboard');
+				return i18n.baseText('generic.copiedToClipboard');
 			},
 		},
 		toastMessage: {
@@ -55,13 +61,25 @@ export default mixins(copyPaste, showMessage).extend({
 			type: String,
 			default: 'large',
 		},
+		redactValue: {
+			type: Boolean,
+			default: false,
+		},
+	},
+	setup() {
+		const clipboard = useClipboard();
+
+		return {
+			clipboard,
+			...useToast(),
+		};
 	},
 	methods: {
 		copy(): void {
 			this.$emit('copy');
-			this.copyToClipboard(this.value);
+			void this.clipboard.copy(this.value);
 
-			this.$showMessage({
+			this.showMessage({
 				title: this.toastTitle,
 				message: this.toastMessage,
 				type: 'success',
@@ -102,7 +120,7 @@ export default mixins(copyPaste, showMessage).extend({
 
 .medium {
 	span {
-		font-size: var(--font-size-2xs);
+		font-size: var(--font-size-xs);
 		line-height: 1;
 	}
 }
diff --git a/packages/editor-ui/src/components/CredentialCard.vue b/packages/editor-ui/src/components/CredentialCard.vue
index c274a9c3e8a8c..f9eb6cbe1341a 100644
--- a/packages/editor-ui/src/components/CredentialCard.vue
+++ b/packages/editor-ui/src/components/CredentialCard.vue
@@ -1,62 +1,61 @@
 <template>
-	<n8n-card :class="$style['card-link']" @click="onClick">
+	<n8n-card :class="$style.cardLink" @click="onClick">
 		<template #prepend>
-			<credential-icon :credential-type-name="credentialType ? credentialType.name : ''" />
+			<CredentialIcon :credential-type-name="credentialType ? credentialType.name : ''" />
 		</template>
 		<template #header>
-			<n8n-heading tag="h2" bold class="ph-no-capture" :class="$style['card-heading']">
+			<n8n-heading tag="h2" bold :class="$style.cardHeading">
 				{{ data.name }}
 			</n8n-heading>
 		</template>
-		<n8n-text color="text-light" size="small">
-			<span v-if="credentialType">{{ credentialType.displayName }} | </span>
-			<span v-show="data"
-				>{{ $locale.baseText('credentials.item.updated') }} <time-ago :date="data.updatedAt" /> |
-			</span>
-			<span v-show="data"
-				>{{ $locale.baseText('credentials.item.created') }} {{ formattedCreatedAtDate }}
-			</span>
-		</n8n-text>
+		<div :class="$style.cardDescription">
+			<n8n-text color="text-light" size="small">
+				<span v-if="credentialType">{{ credentialType.displayName }} | </span>
+				<span v-show="data"
+					>{{ $locale.baseText('credentials.item.updated') }} <TimeAgo :date="data.updatedAt" /> |
+				</span>
+				<span v-show="data"
+					>{{ $locale.baseText('credentials.item.created') }} {{ formattedCreatedAtDate }}
+				</span>
+			</n8n-text>
+		</div>
 		<template #append>
-			<div :class="$style['card-actions']">
+			<div ref="cardActions" :class="$style.cardActions">
 				<enterprise-edition :features="[EnterpriseEditionFeature.Sharing]">
 					<n8n-badge v-if="credentialPermissions.isOwner" class="mr-xs" theme="tertiary" bold>
 						{{ $locale.baseText('credentials.item.owner') }}
 					</n8n-badge>
 				</enterprise-edition>
-				<n8n-action-toggle :actions="actions" theme="dark" @action="onAction" />
+				<n8n-action-toggle :actions="actions" theme="dark" @action="onAction" @click.stop />
 			</div>
 		</template>
 	</n8n-card>
 </template>
 
 <script lang="ts">
-import mixins from 'vue-typed-mixins';
+import { defineComponent } from 'vue';
 import type { ICredentialsResponse, IUser } from '@/Interface';
 import type { ICredentialType } from 'n8n-workflow';
-import { EnterpriseEditionFeature } from '@/constants';
-import { showMessage } from '@/mixins/showMessage';
+import { EnterpriseEditionFeature, MODAL_CONFIRM } from '@/constants';
+import { useMessage } from '@/composables/useMessage';
 import CredentialIcon from '@/components/CredentialIcon.vue';
 import type { IPermissions } from '@/permissions';
 import { getCredentialPermissions } from '@/permissions';
 import dateformat from 'dateformat';
 import { mapStores } from 'pinia';
-import { useUIStore } from '@/stores/ui';
-import { useUsersStore } from '@/stores/users';
-import { useCredentialsStore } from '@/stores/credentials';
+import { useUIStore } from '@/stores/ui.store';
+import { useUsersStore } from '@/stores/users.store';
+import { useCredentialsStore } from '@/stores/credentials.store';
+import TimeAgo from '@/components/TimeAgo.vue';
 
 export const CREDENTIAL_LIST_ITEM_ACTIONS = {
 	OPEN: 'open',
 	DELETE: 'delete',
 };
 
-export default mixins(showMessage).extend({
-	data() {
-		return {
-			EnterpriseEditionFeature,
-		};
-	},
+export default defineComponent({
 	components: {
+		TimeAgo,
 		CredentialIcon,
 	},
 	props: {
@@ -69,7 +68,6 @@ export default mixins(showMessage).extend({
 				updatedAt: '',
 				type: '',
 				name: '',
-				nodesAccess: [],
 				sharedWith: [],
 				ownedBy: {} as IUser,
 			}),
@@ -79,12 +77,22 @@ export default mixins(showMessage).extend({
 			default: false,
 		},
 	},
+	setup() {
+		return {
+			...useMessage(),
+		};
+	},
+	data() {
+		return {
+			EnterpriseEditionFeature,
+		};
+	},
 	computed: {
 		...mapStores(useCredentialsStore, useUIStore, useUsersStore),
 		currentUser(): IUser | null {
 			return this.usersStore.currentUser;
 		},
-		credentialType(): ICredentialType {
+		credentialType(): ICredentialType | undefined {
 			return this.credentialsStore.getCredentialTypeByName(this.data.type);
 		},
 		credentialPermissions(): IPermissions | null {
@@ -107,7 +115,7 @@ export default mixins(showMessage).extend({
 								label: this.$locale.baseText('credentials.item.delete'),
 								value: CREDENTIAL_LIST_ITEM_ACTIONS.DELETE,
 							},
-					  ]
+						]
 					: [],
 			);
 		},
@@ -121,14 +129,21 @@ export default mixins(showMessage).extend({
 		},
 	},
 	methods: {
-		async onClick() {
+		async onClick(event: Event) {
+			if (
+				this.$refs.cardActions === event.target ||
+				this.$refs.cardActions?.contains(event.target)
+			) {
+				return;
+			}
+
 			this.uiStore.openExistingCredential(this.data.id);
 		},
 		async onAction(action: string) {
 			if (action === CREDENTIAL_LIST_ITEM_ACTIONS.OPEN) {
-				this.onClick();
+				await this.onClick(new Event('click'));
 			} else if (action === CREDENTIAL_LIST_ITEM_ACTIONS.DELETE) {
-				const deleteConfirmed = await this.confirmMessage(
+				const deleteConfirmed = await this.confirm(
 					this.$locale.baseText(
 						'credentialEdit.credentialEdit.confirmMessage.deleteCredential.message',
 						{
@@ -138,14 +153,15 @@ export default mixins(showMessage).extend({
 					this.$locale.baseText(
 						'credentialEdit.credentialEdit.confirmMessage.deleteCredential.headline',
 					),
-					null,
-					this.$locale.baseText(
-						'credentialEdit.credentialEdit.confirmMessage.deleteCredential.confirmButtonText',
-					),
+					{
+						confirmButtonText: this.$locale.baseText(
+							'credentialEdit.credentialEdit.confirmMessage.deleteCredential.confirmButtonText',
+						),
+					},
 				);
 
-				if (deleteConfirmed) {
-					this.credentialsStore.deleteCredential({ id: this.data.id });
+				if (deleteConfirmed === MODAL_CONFIRM) {
+					await this.credentialsStore.deleteCredential({ id: this.data.id });
 				}
 			}
 		},
@@ -154,23 +170,36 @@ export default mixins(showMessage).extend({
 </script>
 
 <style lang="scss" module>
-.card-link {
+.cardLink {
 	transition: box-shadow 0.3s ease;
 	cursor: pointer;
+	padding: 0 0 0 var(--spacing-s);
+	align-items: stretch;
 
 	&:hover {
 		box-shadow: 0 2px 8px rgba(#441c17, 0.1);
 	}
 }
 
-.card-heading {
+.cardHeading {
 	font-size: var(--font-size-s);
+	padding: var(--spacing-s) 0 0;
+}
+
+.cardDescription {
+	min-height: 19px;
+	display: flex;
+	align-items: center;
+	padding: 0 0 var(--spacing-s);
 }
 
-.card-actions {
+.cardActions {
 	display: flex;
 	flex-direction: row;
 	justify-content: center;
 	align-items: center;
+	align-self: stretch;
+	padding: 0 var(--spacing-s) 0 0;
+	cursor: default;
 }
 </style>
diff --git a/packages/editor-ui/src/components/CredentialEdit/AuthTypeSelector.vue b/packages/editor-ui/src/components/CredentialEdit/AuthTypeSelector.vue
index a462bca0ba578..9044f8f355313 100644
--- a/packages/editor-ui/src/components/CredentialEdit/AuthTypeSelector.vue
+++ b/packages/editor-ui/src/components/CredentialEdit/AuthTypeSelector.vue
@@ -1,20 +1,19 @@
 <script setup lang="ts">
 import ParameterInputFull from '@/components/ParameterInputFull.vue';
 import type { IUpdateInformation, NodeAuthenticationOption } from '@/Interface';
-import { useNDVStore } from '@/stores/ndv';
-import { useNodeTypesStore } from '@/stores/nodeTypes';
+import { useNDVStore } from '@/stores/ndv.store';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import {
 	getAuthTypeForNodeCredential,
 	getNodeAuthFields,
 	getNodeAuthOptions,
 	isAuthRelatedParameter,
-} from '@/utils';
+} from '@/utils/nodeTypesUtils';
 import type { INodeProperties, INodeTypeDescription, NodeParameterValue } from 'n8n-workflow';
 import { computed, onMounted, ref } from 'vue';
-import Vue from 'vue';
 
 export interface Props {
-	credentialType: Object;
+	credentialType: object;
 }
 
 const emit = defineEmits<{
@@ -27,7 +26,7 @@ const ndvStore = useNDVStore();
 const props = defineProps<Props>();
 
 const selected = ref('');
-const authRelatedFieldsValues = ref({} as { [key: string]: NodeParameterValue });
+const authRelatedFieldsValues = ref<{ [key: string]: NodeParameterValue }>({});
 
 onMounted(() => {
 	if (activeNodeType.value?.credentials) {
@@ -43,7 +42,10 @@ onMounted(() => {
 
 	// Populate default values of related fields
 	authRelatedFields.value.forEach((field) => {
-		Vue.set(authRelatedFieldsValues.value, field.name, field.default);
+		authRelatedFieldsValues.value = {
+			...authRelatedFieldsValues.value,
+			[field.name]: field.default as NodeParameterValue,
+		};
 	});
 });
 
@@ -85,7 +87,7 @@ function shouldShowAuthOption(option: NodeAuthenticationOption): boolean {
 
 	let shouldDisplay = false;
 	Object.keys(authRelatedFieldsValues.value).forEach((fieldName) => {
-		if (option.displayOptions && option.displayOptions.show) {
+		if (option.displayOptions?.show) {
 			if (
 				option.displayOptions.show[fieldName]?.includes(authRelatedFieldsValues.value[fieldName])
 			) {
@@ -102,7 +104,10 @@ function onAuthTypeChange(newType: string): void {
 }
 
 function valueChanged(data: IUpdateInformation): void {
-	Vue.set(authRelatedFieldsValues.value, data.name, data.value);
+	authRelatedFieldsValues.value = {
+		...authRelatedFieldsValues.value,
+		[data.name]: data.value as NodeParameterValue,
+	};
 }
 
 defineExpose({
@@ -113,18 +118,18 @@ defineExpose({
 <template>
 	<div v-if="filteredNodeAuthOptions.length > 0" data-test-id="node-auth-type-selector">
 		<div v-for="parameter in authRelatedFields" :key="parameter.name" class="mb-l">
-			<parameter-input-full
+			<ParameterInputFull
 				:parameter="parameter"
 				:value="authRelatedFieldsValues[parameter.name] || parameter.default"
 				:path="parameter.name"
-				:displayOptions="false"
-				@valueChanged="valueChanged"
+				:display-options="false"
+				@update="valueChanged"
 			/>
 		</div>
 		<div>
 			<n8n-input-label
 				:label="$locale.baseText('credentialEdit.credentialConfig.authTypeSelectorLabel')"
-				:tooltipText="$locale.baseText('credentialEdit.credentialConfig.authTypeSelectorTooltip')"
+				:tooltip-text="$locale.baseText('credentialEdit.credentialConfig.authTypeSelectorTooltip')"
 				:required="true"
 			/>
 		</div>
@@ -135,7 +140,7 @@ defineExpose({
 			:label="prop.value"
 			:class="$style.authRadioButton"
 			border
-			@change="onAuthTypeChange"
+			@update:model-value="onAuthTypeChange"
 			>{{ prop.name }}</el-radio
 		>
 	</div>
diff --git a/packages/editor-ui/src/components/CredentialEdit/CredentialConfig.vue b/packages/editor-ui/src/components/CredentialEdit/CredentialConfig.vue
index 8d173f4506c0a..530d39ca4528a 100644
--- a/packages/editor-ui/src/components/CredentialEdit/CredentialConfig.vue
+++ b/packages/editor-ui/src/components/CredentialEdit/CredentialConfig.vue
@@ -1,66 +1,67 @@
 <template>
 	<div :class="$style.container" data-test-id="node-credentials-config-container">
-		<banner
+		<Banner
 			v-show="showValidationWarning"
 			theme="danger"
 			:message="
 				$locale.baseText(
 					`credentialEdit.credentialConfig.pleaseCheckTheErrorsBelow${
-						credentialPermissions.isOwner ? '' : '.sharee'
+						credentialPermissions.update || credentialPermissions.isOwner ? '' : '.sharee'
 					}`,
 					{ interpolate: { owner: credentialOwnerName } },
 				)
 			"
 		/>
 
-		<banner
+		<Banner
 			v-if="authError && !showValidationWarning"
 			theme="danger"
 			:message="
 				$locale.baseText(
 					`credentialEdit.credentialConfig.couldntConnectWithTheseSettings${
-						credentialPermissions.isOwner ? '' : '.sharee'
+						credentialPermissions.update || credentialPermissions.isOwner ? '' : '.sharee'
 					}`,
 					{ interpolate: { owner: credentialOwnerName } },
 				)
 			"
 			:details="authError"
-			:buttonLabel="$locale.baseText('credentialEdit.credentialConfig.retry')"
-			buttonLoadingLabel="Retrying"
-			:buttonTitle="$locale.baseText('credentialEdit.credentialConfig.retryCredentialTest')"
-			:buttonLoading="isRetesting"
+			:button-label="$locale.baseText('credentialEdit.credentialConfig.retry')"
+			button-loading-label="Retrying"
+			:button-title="$locale.baseText('credentialEdit.credentialConfig.retryCredentialTest')"
+			:button-loading="isRetesting"
 			@click="$emit('retest')"
 		/>
 
-		<banner
+		<Banner
 			v-show="showOAuthSuccessBanner && !showValidationWarning"
 			theme="success"
 			:message="$locale.baseText('credentialEdit.credentialConfig.accountConnected')"
-			:buttonLabel="$locale.baseText('credentialEdit.credentialConfig.reconnect')"
-			:buttonTitle="$locale.baseText('credentialEdit.credentialConfig.reconnectOAuth2Credential')"
+			:button-label="$locale.baseText('credentialEdit.credentialConfig.reconnect')"
+			:button-title="$locale.baseText('credentialEdit.credentialConfig.reconnectOAuth2Credential')"
 			@click="$emit('oauth')"
 		>
-			<template #button v-if="isGoogleOAuthType">
+			<template v-if="isGoogleOAuthType" #button>
 				<p
-					v-text="`${$locale.baseText('credentialEdit.credentialConfig.reconnect')}:`"
 					:class="$style.googleReconnectLabel"
+					v-text="`${$locale.baseText('credentialEdit.credentialConfig.reconnect')}:`"
 				/>
 				<GoogleAuthButton @click="$emit('oauth')" />
 			</template>
-		</banner>
+		</Banner>
 
-		<banner
+		<Banner
 			v-show="testedSuccessfully && !showValidationWarning"
 			theme="success"
 			:message="$locale.baseText('credentialEdit.credentialConfig.connectionTestedSuccessfully')"
-			:buttonLabel="$locale.baseText('credentialEdit.credentialConfig.retry')"
-			:buttonLoadingLabel="$locale.baseText('credentialEdit.credentialConfig.retrying')"
-			:buttonTitle="$locale.baseText('credentialEdit.credentialConfig.retryCredentialTest')"
-			:buttonLoading="isRetesting"
+			:button-label="$locale.baseText('credentialEdit.credentialConfig.retry')"
+			:button-loading-label="$locale.baseText('credentialEdit.credentialConfig.retrying')"
+			:button-title="$locale.baseText('credentialEdit.credentialConfig.retryCredentialTest')"
+			:button-loading="isRetesting"
+			data-test-id="credentials-config-container-test-success"
 			@click="$emit('retest')"
 		/>
 
-		<template v-if="credentialPermissions.updateConnection">
+		<template v-if="credentialPermissions.update">
 			<n8n-notice v-if="documentationUrl && credentialProperties.length" theme="warning">
 				{{ $locale.baseText('credentialEdit.credentialConfig.needHelpFillingOutTheseFields') }}
 				<span class="ml-4xs">
@@ -72,25 +73,26 @@
 
 			<AuthTypeSelector
 				v-if="showAuthTypeSelector && isNewCredential"
-				:credentialType="credentialType"
-				@authTypeChanged="onAuthTypeChange"
+				:credential-type="credentialType"
+				@auth-type-changed="onAuthTypeChange"
 			/>
 
 			<CopyInput
-				v-if="isOAuthType && credentialProperties.length"
+				v-if="isOAuthType && !allOAuth2BasePropertiesOverridden"
 				:label="$locale.baseText('credentialEdit.credentialConfig.oAuthRedirectUrl')"
 				:value="oAuthCallbackUrl"
-				:copyButtonText="$locale.baseText('credentialEdit.credentialConfig.clickToCopy')"
+				:copy-button-text="$locale.baseText('credentialEdit.credentialConfig.clickToCopy')"
 				:hint="
 					$locale.baseText('credentialEdit.credentialConfig.subtitle', { interpolate: { appName } })
 				"
-				:toastTitle="
+				:toast-title="
 					$locale.baseText('credentialEdit.credentialConfig.redirectUrlCopiedToClipboard')
 				"
+				:redact-value="true"
 			/>
 		</template>
-		<enterprise-edition v-else :features="[EnterpriseEditionFeature.Sharing]">
-			<div class="ph-no-capture">
+		<EnterpriseEdition v-else :features="[EnterpriseEditionFeature.Sharing]">
+			<div>
 				<n8n-info-tip :bold="false">
 					{{
 						$locale.baseText('credentialEdit.credentialEdit.info.sharee', {
@@ -99,15 +101,15 @@
 					}}
 				</n8n-info-tip>
 			</div>
-		</enterprise-edition>
+		</EnterpriseEdition>
 
 		<CredentialInputs
-			v-if="credentialType && credentialPermissions.updateConnection"
-			:credentialData="credentialData"
-			:credentialProperties="credentialProperties"
-			:documentationUrl="documentationUrl"
-			:showValidationWarnings="showValidationWarning"
-			@change="onDataChange"
+			v-if="credentialType && credentialPermissions.update"
+			:credential-data="credentialData"
+			:credential-properties="credentialProperties"
+			:documentation-url="documentationUrl"
+			:show-validation-warnings="showValidationWarning"
+			@update="onDataChange"
 		/>
 
 		<OauthButton
@@ -117,19 +119,33 @@
 				!isOAuthConnected &&
 				credentialPermissions.isOwner
 			"
-			:isGoogleOAuthType="isGoogleOAuthType"
+			:is-google-o-auth-type="isGoogleOAuthType"
 			@click="$emit('oauth')"
 		/>
 
 		<n8n-text v-if="isMissingCredentials" color="text-base" size="medium">
 			{{ $locale.baseText('credentialEdit.credentialConfig.missingCredentialType') }}
 		</n8n-text>
+
+		<EnterpriseEdition :features="[EnterpriseEditionFeature.ExternalSecrets]">
+			<template #fallback>
+				<n8n-info-tip class="mt-s">
+					{{ $locale.baseText('credentialEdit.credentialConfig.externalSecrets') }}
+					<n8n-link bold :to="$locale.baseText('settings.externalSecrets.docs')" size="small">
+						{{ $locale.baseText('credentialEdit.credentialConfig.externalSecrets.moreInfo') }}
+					</n8n-link>
+				</n8n-info-tip>
+			</template>
+		</EnterpriseEdition>
 	</div>
 </template>
 
 <script lang="ts">
+import { defineComponent } from 'vue';
+import { mapStores } from 'pinia';
+
 import type { ICredentialType, INodeTypeDescription } from 'n8n-workflow';
-import { getAppNameFromCredType, isCommunityPackageName } from '@/utils';
+import { getAppNameFromCredType, isCommunityPackageName } from '@/utils/nodeTypesUtils';
 
 import Banner from '../Banner.vue';
 import CopyInput from '../CopyInput.vue';
@@ -138,21 +154,21 @@ import OauthButton from './OauthButton.vue';
 import { addCredentialTranslation } from '@/plugins/i18n';
 import { BUILTIN_CREDENTIALS_DOCS_URL, DOCS_DOMAIN, EnterpriseEditionFeature } from '@/constants';
 import type { IPermissions } from '@/permissions';
-import { mapStores } from 'pinia';
-import { useUIStore } from '@/stores/ui';
-import { useWorkflowsStore } from '@/stores/workflows';
-import { useRootStore } from '@/stores/n8nRootStore';
-import { useNDVStore } from '@/stores/ndv';
-import { useCredentialsStore } from '@/stores/credentials';
-import { useNodeTypesStore } from '@/stores/nodeTypes';
+import { useUIStore } from '@/stores/ui.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import { useNDVStore } from '@/stores/ndv.store';
+import { useCredentialsStore } from '@/stores/credentials.store';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import type { ICredentialsResponse } from '@/Interface';
 import AuthTypeSelector from '@/components/CredentialEdit/AuthTypeSelector.vue';
 import GoogleAuthButton from './GoogleAuthButton.vue';
-import Vue from 'vue';
+import EnterpriseEdition from '@/components/EnterpriseEdition.ee.vue';
 
-export default Vue.extend({
+export default defineComponent({
 	name: 'CredentialConfig',
 	components: {
+		EnterpriseEdition,
 		AuthTypeSelector,
 		Banner,
 		CopyInput,
@@ -188,6 +204,9 @@ export default Vue.extend({
 		isOAuthType: {
 			type: Boolean,
 		},
+		allOAuth2BasePropertiesOverridden: {
+			type: Boolean,
+		},
 		isOAuthConnected: {
 			type: Boolean,
 		},
@@ -262,7 +281,7 @@ export default Vue.extend({
 			);
 		},
 		credentialTypeName(): string {
-			return (this.credentialType as ICredentialType).name;
+			return (this.credentialType as ICredentialType)?.name;
 		},
 		credentialOwnerName(): string {
 			return this.credentialsStore.getCredentialOwnerNameById(`${this.credentialId}`);
@@ -272,7 +291,7 @@ export default Vue.extend({
 			const activeNode = this.ndvStore.activeNode;
 			const isCommunityNode = activeNode ? isCommunityPackageName(activeNode.type) : false;
 
-			const documentationUrl = type && type.documentationUrl;
+			const documentationUrl = type?.documentationUrl;
 
 			if (!documentationUrl) {
 				return '';
@@ -290,7 +309,7 @@ export default Vue.extend({
 
 			if (url.hostname === DOCS_DOMAIN) {
 				url.searchParams.set('utm_source', 'n8n_app');
-				url.searchParams.set('utm_medium', 'left_nav_menu');
+				url.searchParams.set('utm_medium', 'credential_settings');
 				url.searchParams.set('utm_campaign', 'create_new_credentials_modal');
 			}
 
@@ -329,7 +348,7 @@ export default Vue.extend({
 			return this.credentialsStore.allUsableCredentialsByType[type];
 		},
 		onDataChange(event: { name: string; value: string | number | boolean | Date | null }): void {
-			this.$emit('change', event);
+			this.$emit('update', event);
 		},
 		onDocumentationUrlClick(): void {
 			this.$telemetry.track('User clicked credential modal docs link', {
diff --git a/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue b/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue
index f7b6f816090d3..491a03e6b68c9 100644
--- a/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue
+++ b/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue
@@ -1,10 +1,10 @@
 <template>
 	<Modal
 		:name="modalName"
-		:customClass="$style.credentialModal"
-		:eventBus="modalBus"
+		:custom-class="$style.credentialModal"
+		:event-bus="modalBus"
 		:loading="loading"
-		:beforeClose="beforeClose"
+		:before-close="beforeClose"
 		width="70%"
 		height="80%"
 	>
@@ -12,15 +12,15 @@
 			<div :class="$style.header">
 				<div :class="$style.credInfo">
 					<div :class="$style.credIcon">
-						<CredentialIcon :credentialTypeName="defaultCredentialTypeName" />
+						<CredentialIcon :credential-type-name="defaultCredentialTypeName" />
 					</div>
 					<InlineNameEdit
-						:name="credentialName"
+						:model-value="credentialName"
 						:subtitle="credentialType ? credentialType.displayName : ''"
-						:readonly="!credentialPermissions.updateName || !credentialType"
+						:readonly="!credentialPermissions.update || !credentialType"
 						type="Credential"
-						@input="onNameEdit"
 						data-test-id="credential-name"
+						@update:model-value="onNameEdit"
 					/>
 				</div>
 				<div :class="$style.credActions">
@@ -28,24 +28,23 @@
 						v-if="currentCredential && credentialPermissions.delete"
 						:title="$locale.baseText('credentialEdit.credentialEdit.delete')"
 						icon="trash"
-						size="medium"
 						type="tertiary"
 						:disabled="isSaving"
 						:loading="isDeleting"
-						@click="deleteCredential"
 						data-test-id="credential-delete-button"
+						@click="deleteCredential"
 					/>
 					<SaveButton
 						v-if="(hasUnsavedChanges || credentialId) && credentialPermissions.save"
 						:saved="!hasUnsavedChanges && !isTesting"
-						:isSaving="isSaving || isTesting"
-						:savingLabel="
+						:is-saving="isSaving || isTesting"
+						:saving-label="
 							isTesting
 								? $locale.baseText('credentialEdit.credentialEdit.testing')
 								: $locale.baseText('credentialEdit.credentialEdit.saving')
 						"
-						@click="saveCredential"
 						data-test-id="credential-save-button"
+						@click="saveCredential"
 					/>
 				</div>
 			</div>
@@ -54,54 +53,57 @@
 		<template #content>
 			<div :class="$style.container" data-test-id="credential-edit-dialog">
 				<div :class="$style.sidebar">
-					<n8n-menu mode="tabs" :items="sidebarItems" @select="onTabSelect"></n8n-menu>
+					<n8n-menu
+						mode="tabs"
+						:items="sidebarItems"
+						:transparent-background="true"
+						@select="onTabSelect"
+					></n8n-menu>
 				</div>
-				<div v-if="activeTab === 'connection'" :class="$style.mainContent" ref="content">
+				<div v-if="activeTab === 'connection'" ref="content" :class="$style.mainContent">
 					<CredentialConfig
-						:credentialType="credentialType"
-						:credentialProperties="credentialProperties"
-						:credentialData="credentialData"
-						:credentialId="credentialId"
-						:showValidationWarning="showValidationWarning"
-						:authError="authError"
-						:testedSuccessfully="testedSuccessfully"
-						:isOAuthType="isOAuthType"
-						:isOAuthConnected="isOAuthConnected"
-						:isRetesting="isRetesting"
-						:parentTypes="parentTypes"
-						:requiredPropertiesFilled="requiredPropertiesFilled"
-						:credentialPermissions="credentialPermissions"
+						:credential-type="credentialType"
+						:credential-properties="credentialProperties"
+						:credential-data="credentialData"
+						:credential-id="credentialId"
+						:show-validation-warning="showValidationWarning"
+						:auth-error="authError"
+						:tested-successfully="testedSuccessfully"
+						:is-o-auth-type="isOAuthType"
+						:is-o-auth-connected="isOAuthConnected"
+						:is-retesting="isRetesting"
+						:parent-types="parentTypes"
+						:required-properties-filled="requiredPropertiesFilled"
+						:credential-permissions="credentialPermissions"
+						:all-o-auth2-base-properties-overridden="allOAuth2BasePropertiesOverridden"
 						:mode="mode"
-						:selectedCredential="selectedCredential"
-						:showAuthTypeSelector="requiredCredentials"
-						@change="onDataChange"
+						:selected-credential="selectedCredential"
+						:show-auth-type-selector="requiredCredentials"
+						@update="onDataChange"
 						@oauth="oAuthCredentialAuthorize"
 						@retest="retestCredential"
-						@scrollToTop="scrollToTop"
-						@authTypeChanged="onAuthTypeChanged"
+						@scroll-to-top="scrollToTop"
+						@auth-type-changed="onAuthTypeChanged"
 					/>
 				</div>
 				<div v-else-if="activeTab === 'sharing' && credentialType" :class="$style.mainContent">
 					<CredentialSharing
 						:credential="currentCredential"
-						:credentialData="credentialData"
-						:credentialId="credentialId"
-						:credentialPermissions="credentialPermissions"
-						:modalBus="modalBus"
-						@change="onChangeSharedWith"
+						:credential-data="credentialData"
+						:credential-id="credentialId"
+						:credential-permissions="credentialPermissions"
+						:modal-bus="modalBus"
+						@update:model-value="onChangeSharedWith"
 					/>
 				</div>
 				<div v-else-if="activeTab === 'details' && credentialType" :class="$style.mainContent">
 					<CredentialInfo
-						:nodeAccess="nodeAccess"
-						:nodesWithAccess="nodesWithAccess"
-						:currentCredential="currentCredential"
-						:credentialPermissions="credentialPermissions"
-						@accessChange="onNodeAccessChange"
+						:current-credential="currentCredential"
+						:credential-permissions="credentialPermissions"
 					/>
 				</div>
 				<div v-else-if="activeTab.startsWith('coming-soon')" :class="$style.mainContent">
-					<FeatureComingSoon :featureId="activeTab.split('/')[1]"></FeatureComingSoon>
+					<FeatureComingSoon :feature-id="activeTab.split('/')[1]"></FeatureComingSoon>
 				</div>
 			</div>
 		</template>
@@ -109,14 +111,14 @@
 </template>
 
 <script lang="ts">
-import Vue from 'vue';
+import { defineComponent } from 'vue';
+import { mapStores } from 'pinia';
 
-import type { ICredentialsResponse, IUser, NewCredentialsModal } from '@/Interface';
+import type { ICredentialsResponse, IUser } from '@/Interface';
 
 import type {
 	CredentialInformation,
 	ICredentialDataDecryptedObject,
-	ICredentialNodeAccess,
 	ICredentialsDecrypted,
 	ICredentialType,
 	INode,
@@ -125,47 +127,44 @@ import type {
 	INodeProperties,
 	INodeTypeDescription,
 	ITelemetryTrackProperties,
+	IDataObject,
 } from 'n8n-workflow';
 import { NodeHelpers } from 'n8n-workflow';
-import CredentialIcon from '../CredentialIcon.vue';
-
-import mixins from 'vue-typed-mixins';
-import { nodeHelpers } from '@/mixins/nodeHelpers';
-import { showMessage } from '@/mixins/showMessage';
-
-import CredentialConfig from './CredentialConfig.vue';
-import CredentialInfo from './CredentialInfo.vue';
-import CredentialSharing from './CredentialSharing.ee.vue';
-import SaveButton from '../SaveButton.vue';
-import Modal from '../Modal.vue';
-import InlineNameEdit from '../InlineNameEdit.vue';
-import { CREDENTIAL_EDIT_MODAL_KEY, EnterpriseEditionFeature } from '@/constants';
-import type { IDataObject } from 'n8n-workflow';
-import FeatureComingSoon from '../FeatureComingSoon.vue';
+import CredentialIcon from '@/components/CredentialIcon.vue';
+
+import { useToast } from '@/composables/useToast';
+import { useNodeHelpers } from '@/composables/useNodeHelpers';
+import { useMessage } from '@/composables/useMessage';
+import CredentialConfig from '@/components/CredentialEdit/CredentialConfig.vue';
+import CredentialInfo from '@/components/CredentialEdit/CredentialInfo.vue';
+import CredentialSharing from '@/components/CredentialEdit/CredentialSharing.ee.vue';
+import SaveButton from '@/components/SaveButton.vue';
+import Modal from '@/components/Modal.vue';
+import InlineNameEdit from '@/components/InlineNameEdit.vue';
+import { CREDENTIAL_EDIT_MODAL_KEY, EnterpriseEditionFeature, MODAL_CONFIRM } from '@/constants';
+import FeatureComingSoon from '@/components/FeatureComingSoon.vue';
 import type { IPermissions } from '@/permissions';
 import { getCredentialPermissions } from '@/permissions';
 import type { IMenuItem } from 'n8n-design-system';
-import { createEventBus } from 'n8n-design-system';
-import { mapStores } from 'pinia';
-import { useUIStore } from '@/stores/ui';
-import { useSettingsStore } from '@/stores/settings';
-import { useUsersStore } from '@/stores/users';
-import { useWorkflowsStore } from '@/stores/workflows';
-import { useNDVStore } from '@/stores/ndv';
-import { useCredentialsStore } from '@/stores/credentials';
+import { createEventBus } from 'n8n-design-system/utils';
+import { useUIStore } from '@/stores/ui.store';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useUsersStore } from '@/stores/users.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useNDVStore } from '@/stores/ndv.store';
+import { useCredentialsStore } from '@/stores/credentials.store';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+
 import {
-	isValidCredentialResponse,
 	getNodeAuthOptions,
 	getNodeCredentialForSelectedAuthType,
 	updateNodeAuthType,
-	isCredentialModalState,
-} from '@/utils';
-
-interface NodeAccessMap {
-	[nodeType: string]: ICredentialNodeAccess | null;
-}
+} from '@/utils/nodeTypesUtils';
+import { isValidCredentialResponse, isCredentialModalState } from '@/utils/typeGuards';
+import { isExpression, isTestableExpression } from '@/utils/expressions';
+import { useExternalHooks } from '@/composables/useExternalHooks';
 
-export default mixins(showMessage, nodeHelpers).extend({
+export default defineComponent({
 	name: 'CredentialEdit',
 	components: {
 		CredentialSharing,
@@ -190,6 +189,16 @@ export default mixins(showMessage, nodeHelpers).extend({
 			type: String,
 		},
 	},
+	setup() {
+		const nodeHelpers = useNodeHelpers();
+
+		return {
+			externalHooks: useExternalHooks(),
+			...useToast(),
+			...useMessage(),
+			nodeHelpers,
+		};
+	},
 	data() {
 		return {
 			activeTab: 'connection',
@@ -198,7 +207,6 @@ export default mixins(showMessage, nodeHelpers).extend({
 			credentialName: '',
 			credentialData: {} as ICredentialDataDecryptedObject,
 			modalBus: createEventBus(),
-			nodeAccess: {} as NodeAccessMap,
 			isDeleting: false,
 			isSaving: false,
 			isTesting: false,
@@ -211,6 +219,7 @@ export default mixins(showMessage, nodeHelpers).extend({
 			selectedCredential: '',
 			requiredCredentials: false, // Are credentials required or optional for the node
 			hasUserSpecifiedName: false,
+			isSharedWithChanged: false,
 		};
 	},
 	async mounted() {
@@ -218,20 +227,21 @@ export default mixins(showMessage, nodeHelpers).extend({
 			isCredentialModalState(this.uiStore.modals[CREDENTIAL_EDIT_MODAL_KEY]) &&
 			this.uiStore.modals[CREDENTIAL_EDIT_MODAL_KEY].showAuthSelector === true;
 
-		this.setupNodeAccess();
-
 		if (this.mode === 'new' && this.credentialTypeName) {
 			this.credentialName = await this.credentialsStore.getNewCredentialName({
 				credentialTypeName: this.defaultCredentialTypeName,
 			});
 
 			if (this.currentUser) {
-				Vue.set(this.credentialData, 'ownedBy', {
-					id: this.currentUser.id,
-					firstName: this.currentUser.firstName,
-					lastName: this.currentUser.lastName,
-					email: this.currentUser.email,
-				});
+				this.credentialData = {
+					...this.credentialData,
+					ownedBy: {
+						id: this.currentUser.id,
+						firstName: this.currentUser.firstName,
+						lastName: this.currentUser.lastName,
+						email: this.currentUser.email,
+					},
+				};
 			}
 		} else {
 			await this.loadCurrentCredential();
@@ -243,23 +253,28 @@ export default mixins(showMessage, nodeHelpers).extend({
 					!this.credentialData.hasOwnProperty(property.name) &&
 					!this.credentialType.__overwrittenProperties?.includes(property.name)
 				) {
-					Vue.set(this.credentialData, property.name, property.default as CredentialInformation);
+					this.credentialData = {
+						...this.credentialData,
+						[property.name]: property.default as CredentialInformation,
+					};
 				}
 			}
 		}
 
-		this.$externalHooks().run('credentialsEdit.credentialModalOpened', {
+		await this.externalHooks.run('credentialsEdit.credentialModalOpened', {
 			credentialType: this.credentialTypeName,
 			isEditingCredential: this.mode === 'edit',
 			activeNode: this.ndvStore.activeNode,
 		});
 
-		setTimeout(() => {
+		setTimeout(async () => {
 			if (this.credentialId) {
-				if (!this.requiredPropertiesFilled) {
+				if (!this.requiredPropertiesFilled && this.credentialPermissions.isOwner) {
+					// sharees can't see properties, so this check would always fail for them
+					// if the credential contains required fields.
 					this.showValidationWarning = true;
 				} else {
-					this.retestCredential();
+					await this.retestCredential();
 				}
 			}
 		}, 0);
@@ -274,6 +289,7 @@ export default mixins(showMessage, nodeHelpers).extend({
 			useUIStore,
 			useUsersStore,
 			useWorkflowsStore,
+			useNodeTypesStore,
 		),
 		activeNodeType(): INodeTypeDescription | null {
 			const activeNode = this.ndvStore.activeNode;
@@ -290,7 +306,7 @@ export default mixins(showMessage, nodeHelpers).extend({
 
 			// If there is already selected type, use it
 			if (this.selectedCredential !== '') {
-				return this.credentialsStore.getCredentialTypeByName(this.selectedCredential);
+				return this.credentialsStore.getCredentialTypeByName(this.selectedCredential) ?? null;
 			} else if (this.requiredCredentials) {
 				// Otherwise, use credential type that corresponds to the first auth option in the node definition
 				const nodeAuthOptions = getNodeAuthOptions(this.activeNodeType);
@@ -347,17 +363,22 @@ export default mixins(showMessage, nodeHelpers).extend({
 			};
 		},
 		isCredentialTestable(): boolean {
+			// Sharees can always test since they can't see the data.
+			if (!this.credentialPermissions.isOwner) {
+				return true;
+			}
 			if (this.isOAuthType || !this.requiredPropertiesFilled) {
 				return false;
 			}
 
 			const { ownedBy, sharedWith, ...credentialData } = this.credentialData;
-			const hasExpressions = Object.values(credentialData).reduce(
+			const hasUntestableExpressions = Object.values(credentialData).reduce(
 				(accu: boolean, value: CredentialInformation) =>
-					accu || (typeof value === 'string' && value.startsWith('=')),
+					accu ||
+					(typeof value === 'string' && isExpression(value) && !isTestableExpression(value)),
 				false,
 			);
-			if (hasExpressions) {
+			if (hasUntestableExpressions) {
 				return false;
 			}
 
@@ -393,11 +414,21 @@ export default mixins(showMessage, nodeHelpers).extend({
 			return (
 				!!this.credentialTypeName &&
 				(((this.credentialTypeName === 'oAuth2Api' || this.parentTypes.includes('oAuth2Api')) &&
-					this.credentialData.grantType === 'authorizationCode') ||
+					(this.credentialData.grantType === 'authorizationCode' ||
+						this.credentialData.grantType === 'pkce')) ||
 					this.credentialTypeName === 'oAuth1Api' ||
 					this.parentTypes.includes('oAuth1Api'))
 			);
 		},
+		allOAuth2BasePropertiesOverridden() {
+			if (this.credentialType?.__overwrittenProperties) {
+				return (
+					this.credentialType.__overwrittenProperties.includes('clientId') &&
+					this.credentialType.__overwrittenProperties.includes('clientSecret')
+				);
+			}
+			return false;
+		},
 		isOAuthConnected(): boolean {
 			return this.isOAuthType && !!this.credentialData.oauthTokenData;
 		},
@@ -406,7 +437,7 @@ export default mixins(showMessage, nodeHelpers).extend({
 				return [];
 			}
 
-			return this.credentialType.properties.filter((propertyData: INodeProperties) => {
+			const properties = this.credentialType.properties.filter((propertyData: INodeProperties) => {
 				if (!this.displayCredentialParameter(propertyData)) {
 					return false;
 				}
@@ -415,6 +446,17 @@ export default mixins(showMessage, nodeHelpers).extend({
 					!this.credentialType!.__overwrittenProperties.includes(propertyData.name)
 				);
 			});
+
+			/**
+			 * If after all credentials overrides are applied only "notice"
+			 * properties are left, do not return them. This will avoid
+			 * showing notices that refer to a property that was overridden.
+			 */
+			if (properties.every((p) => p.type === 'notice')) {
+				return [];
+			}
+
+			return properties;
 		},
 		requiredPropertiesFilled(): boolean {
 			for (const property of this.credentialProperties) {
@@ -426,8 +468,14 @@ export default mixins(showMessage, nodeHelpers).extend({
 					return false;
 				}
 
-				if (property.type === 'number' && typeof this.credentialData[property.name] !== 'number') {
-					return false;
+				if (property.type === 'number') {
+					const isExpression =
+						typeof this.credentialData[property.name] === 'string' &&
+						this.credentialData[property.name].startsWith('=');
+
+					if (typeof this.credentialData[property.name] !== 'number' && !isExpression) {
+						return false;
+					}
 				}
 			}
 			return true;
@@ -467,7 +515,7 @@ export default mixins(showMessage, nodeHelpers).extend({
 		defaultCredentialTypeName(): string {
 			let credentialTypeName = this.credentialTypeName;
 			if (!credentialTypeName || credentialTypeName === 'null') {
-				if (this.activeNodeType && this.activeNodeType.credentials) {
+				if (this.activeNodeType?.credentials) {
 					credentialTypeName = this.activeNodeType.credentials[0].name;
 				}
 			}
@@ -480,7 +528,7 @@ export default mixins(showMessage, nodeHelpers).extend({
 
 			if (this.hasUnsavedChanges) {
 				const displayName = this.credentialType ? this.credentialType.displayName : '';
-				keepEditing = await this.confirmMessage(
+				const confirmAction = await this.confirm(
 					this.$locale.baseText(
 						'credentialEdit.credentialEdit.confirmMessage.beforeClose1.message',
 						{ interpolate: { credentialDisplayName: displayName } },
@@ -488,30 +536,34 @@ export default mixins(showMessage, nodeHelpers).extend({
 					this.$locale.baseText(
 						'credentialEdit.credentialEdit.confirmMessage.beforeClose1.headline',
 					),
-					null,
-					this.$locale.baseText(
-						'credentialEdit.credentialEdit.confirmMessage.beforeClose1.cancelButtonText',
-					),
-					this.$locale.baseText(
-						'credentialEdit.credentialEdit.confirmMessage.beforeClose1.confirmButtonText',
-					),
+					{
+						cancelButtonText: this.$locale.baseText(
+							'credentialEdit.credentialEdit.confirmMessage.beforeClose1.cancelButtonText',
+						),
+						confirmButtonText: this.$locale.baseText(
+							'credentialEdit.credentialEdit.confirmMessage.beforeClose1.confirmButtonText',
+						),
+					},
 				);
+				keepEditing = confirmAction === MODAL_CONFIRM;
 			} else if (this.credentialPermissions.isOwner && this.isOAuthType && !this.isOAuthConnected) {
-				keepEditing = await this.confirmMessage(
+				const confirmAction = await this.confirm(
 					this.$locale.baseText(
 						'credentialEdit.credentialEdit.confirmMessage.beforeClose2.message',
 					),
 					this.$locale.baseText(
 						'credentialEdit.credentialEdit.confirmMessage.beforeClose2.headline',
 					),
-					null,
-					this.$locale.baseText(
-						'credentialEdit.credentialEdit.confirmMessage.beforeClose2.cancelButtonText',
-					),
-					this.$locale.baseText(
-						'credentialEdit.credentialEdit.confirmMessage.beforeClose2.confirmButtonText',
-					),
+					{
+						cancelButtonText: this.$locale.baseText(
+							'credentialEdit.credentialEdit.confirmMessage.beforeClose2.cancelButtonText',
+						),
+						confirmButtonText: this.$locale.baseText(
+							'credentialEdit.credentialEdit.confirmMessage.beforeClose2.confirmButtonText',
+						),
+					},
 				);
+				keepEditing = confirmAction === MODAL_CONFIRM;
 			}
 
 			if (!keepEditing) {
@@ -530,12 +582,21 @@ export default mixins(showMessage, nodeHelpers).extend({
 				return false;
 			}
 
+			if (parameter.displayOptions?.hideOnCloud && this.settingsStore.isCloudDeployment) {
+				return false;
+			}
+
 			if (parameter.displayOptions === undefined) {
 				// If it is not defined no need to do a proper check
 				return true;
 			}
 
-			return this.displayParameter(this.credentialData as INodeParameters, parameter, '', null);
+			return this.nodeHelpers.displayParameter(
+				this.credentialData as INodeParameters,
+				parameter,
+				'',
+				null,
+			);
 		},
 		getCredentialProperties(name: string): INodeProperties[] {
 			const credentialTypeData = this.credentialsStore.getCredentialTypeByName(name);
@@ -576,21 +637,23 @@ export default mixins(showMessage, nodeHelpers).extend({
 					);
 				}
 
-				this.credentialData = currentCredentials.data || {};
+				this.credentialData = (currentCredentials.data as ICredentialDataDecryptedObject) || {};
 				if (currentCredentials.sharedWith) {
-					Vue.set(this.credentialData, 'sharedWith', currentCredentials.sharedWith);
+					this.credentialData = {
+						...this.credentialData,
+						sharedWith: currentCredentials.sharedWith as IDataObject[],
+					};
 				}
 				if (currentCredentials.ownedBy) {
-					Vue.set(this.credentialData, 'ownedBy', currentCredentials.ownedBy);
+					this.credentialData = {
+						...this.credentialData,
+						ownedBy: currentCredentials.ownedBy as IDataObject[],
+					};
 				}
 
 				this.credentialName = currentCredentials.name;
-				currentCredentials.nodesAccess.forEach((access: { nodeType: string }) => {
-					// keep node access structure to keep dates when updating
-					this.nodeAccess[access.nodeType] = access;
-				});
 			} catch (error) {
-				this.$showError(
+				this.showError(
 					error,
 					this.$locale.baseText('credentialEdit.credentialEdit.showError.loadCredential.title'),
 				);
@@ -614,29 +677,19 @@ export default mixins(showMessage, nodeHelpers).extend({
 				sharing_enabled: EnterpriseEditionFeature.Sharing,
 			});
 		},
-		onNodeAccessChange({ name, value }: { name: string; value: boolean }) {
-			this.hasUnsavedChanges = true;
-
-			if (value) {
-				this.nodeAccess = {
-					...this.nodeAccess,
-					[name]: {
-						nodeType: name,
-					},
-				};
-			} else {
-				this.nodeAccess = {
-					...this.nodeAccess,
-					[name]: null,
-				};
-			}
-		},
 		onChangeSharedWith(sharees: IDataObject[]) {
-			Vue.set(this.credentialData, 'sharedWith', sharees);
+			this.credentialData = {
+				...this.credentialData,
+				sharedWith: sharees,
+			};
+			this.isSharedWithChanged = true;
 			this.hasUnsavedChanges = true;
 		},
-		// eslint-disable-next-line @typescript-eslint/no-explicit-any
-		onDataChange({ name, value }: { name: string; value: any }) {
+
+		onDataChange({ name, value }: { name: string; value: CredentialInformation }) {
+			// skip update if new value matches the current
+			if (this.credentialData[name] === value) return;
+
 			this.hasUnsavedChanges = true;
 
 			const { oauthTokenData, ...credData } = this.credentialData;
@@ -653,7 +706,7 @@ export default mixins(showMessage, nodeHelpers).extend({
 		getParentTypes(name: string): string[] {
 			const credentialType = this.credentialsStore.getCredentialTypeByName(name);
 
-			if (credentialType === undefined || credentialType.extends === undefined) {
+			if (credentialType?.extends === undefined) {
 				return [];
 			}
 
@@ -698,17 +751,12 @@ export default mixins(showMessage, nodeHelpers).extend({
 				return;
 			}
 
-			const nodesAccess = Object.values(this.nodeAccess).filter(
-				(access) => !!access,
-			) as ICredentialNodeAccess[];
-
 			const { ownedBy, sharedWith, ...credentialData } = this.credentialData;
 			const details: ICredentialsDecrypted = {
 				id: this.credentialId,
 				name: this.credentialName,
 				type: this.credentialTypeName!,
 				data: credentialData,
-				nodesAccess,
 			};
 
 			this.isRetesting = true;
@@ -738,9 +786,6 @@ export default mixins(showMessage, nodeHelpers).extend({
 			}
 
 			this.isSaving = true;
-			const nodesAccess = Object.values(this.nodeAccess).filter(
-				(access) => !!access,
-			) as ICredentialNodeAccess[];
 
 			// Save only the none default data
 			const data = NodeHelpers.getNodeParameters(
@@ -763,7 +808,6 @@ export default mixins(showMessage, nodeHelpers).extend({
 				name: this.credentialName,
 				type: this.credentialTypeName!,
 				data: data as unknown as ICredentialDataDecryptedObject,
-				nodesAccess,
 				sharedWith,
 				ownedBy,
 			};
@@ -780,7 +824,7 @@ export default mixins(showMessage, nodeHelpers).extend({
 
 			this.isSaving = false;
 			if (credential) {
-				this.credentialId = credential.id as string;
+				this.credentialId = credential.id;
 
 				if (this.isCredentialTestable) {
 					this.isTesting = true;
@@ -796,12 +840,17 @@ export default mixins(showMessage, nodeHelpers).extend({
 					this.testedSuccessfully = false;
 				}
 
+				const usesExternalSecrets = Object.entries(credentialDetails.data || {}).some(([, value]) =>
+					/=.*\{\{[^}]*\$secrets\.[^}]+}}.*/.test(`${value}`),
+				);
+
 				const trackProperties: ITelemetryTrackProperties = {
 					credential_type: credentialDetails.type,
 					workflow_id: this.workflowsStore.workflowId,
 					credential_id: credential.id,
 					is_complete: !!this.requiredPropertiesFilled,
 					is_new: isNewCredential,
+					uses_external_secrets: usesExternalSecrets,
 				};
 
 				if (this.isOAuthType) {
@@ -819,7 +868,7 @@ export default mixins(showMessage, nodeHelpers).extend({
 				}
 
 				this.$telemetry.track('User saved credentials', trackProperties);
-				this.$externalHooks().run('credentialEdit.saveCredential', trackProperties);
+				await this.externalHooks.run('credentialEdit.saveCredential', trackProperties);
 			}
 
 			return credential;
@@ -834,7 +883,7 @@ export default mixins(showMessage, nodeHelpers).extend({
 				credential = await this.credentialsStore.createNewCredential(credentialDetails);
 				this.hasUnsavedChanges = false;
 			} catch (error) {
-				this.$showError(
+				this.showError(
 					error,
 					this.$locale.baseText('credentialEdit.credentialEdit.showError.createCredential.title'),
 				);
@@ -842,7 +891,7 @@ export default mixins(showMessage, nodeHelpers).extend({
 				return null;
 			}
 
-			this.$externalHooks().run('credential.saved', {
+			await this.externalHooks.run('credential.saved', {
 				credential_type: credentialDetails.type,
 				credential_id: credential.id,
 				is_new: true,
@@ -862,13 +911,26 @@ export default mixins(showMessage, nodeHelpers).extend({
 		): Promise<ICredentialsResponse | null> {
 			let credential;
 			try {
-				credential = await this.credentialsStore.updateCredential({
-					id: this.credentialId,
-					data: credentialDetails,
-				});
+				if (this.credentialPermissions.update) {
+					credential = await this.credentialsStore.updateCredential({
+						id: this.credentialId,
+						data: credentialDetails,
+					});
+				}
+				if (
+					this.credentialPermissions.share &&
+					this.isSharedWithChanged &&
+					credentialDetails.sharedWith
+				) {
+					credential = await this.credentialsStore.setCredentialSharedWith({
+						credentialId: credentialDetails.id,
+						sharedWith: credentialDetails.sharedWith,
+					});
+					this.isSharedWithChanged = false;
+				}
 				this.hasUnsavedChanges = false;
 			} catch (error) {
-				this.$showError(
+				this.showError(
 					error,
 					this.$locale.baseText('credentialEdit.credentialEdit.showError.updateCredential.title'),
 				);
@@ -876,7 +938,7 @@ export default mixins(showMessage, nodeHelpers).extend({
 				return null;
 			}
 
-			this.$externalHooks().run('credential.saved', {
+			await this.externalHooks.run('credential.saved', {
 				credential_type: credentialDetails.type,
 				credential_id: credential.id,
 				is_new: false,
@@ -884,7 +946,7 @@ export default mixins(showMessage, nodeHelpers).extend({
 
 			// Now that the credentials changed check if any nodes use credentials
 			// which have now a different name
-			this.updateNodesCredentialsIssues();
+			this.nodeHelpers.updateNodesCredentialsIssues();
 
 			return credential;
 		},
@@ -896,7 +958,7 @@ export default mixins(showMessage, nodeHelpers).extend({
 
 			const savedCredentialName = this.currentCredential.name;
 
-			const deleteConfirmed = await this.confirmMessage(
+			const deleteConfirmed = await this.confirm(
 				this.$locale.baseText(
 					'credentialEdit.credentialEdit.confirmMessage.deleteCredential.message',
 					{ interpolate: { savedCredentialName } },
@@ -904,22 +966,23 @@ export default mixins(showMessage, nodeHelpers).extend({
 				this.$locale.baseText(
 					'credentialEdit.credentialEdit.confirmMessage.deleteCredential.headline',
 				),
-				null,
-				this.$locale.baseText(
-					'credentialEdit.credentialEdit.confirmMessage.deleteCredential.confirmButtonText',
-				),
+				{
+					confirmButtonText: this.$locale.baseText(
+						'credentialEdit.credentialEdit.confirmMessage.deleteCredential.confirmButtonText',
+					),
+				},
 			);
 
-			if (deleteConfirmed === false) {
+			if (deleteConfirmed !== MODAL_CONFIRM) {
 				return;
 			}
 
 			try {
 				this.isDeleting = true;
-				this.credentialsStore.deleteCredential({ id: this.credentialId });
+				await this.credentialsStore.deleteCredential({ id: this.credentialId });
 				this.hasUnsavedChanges = false;
 			} catch (error) {
-				this.$showError(
+				this.showError(
 					error,
 					this.$locale.baseText('credentialEdit.credentialEdit.showError.deleteCredential.title'),
 				);
@@ -930,10 +993,10 @@ export default mixins(showMessage, nodeHelpers).extend({
 
 			this.isDeleting = false;
 			// Now that the credentials were removed check if any nodes used them
-			this.updateNodesCredentialsIssues();
+			this.nodeHelpers.updateNodesCredentialsIssues();
 			this.credentialData = {};
 
-			this.$showMessage({
+			this.showMessage({
 				title: this.$locale.baseText('credentialEdit.credentialEdit.showMessage.title'),
 				type: 'success',
 			});
@@ -962,7 +1025,7 @@ export default mixins(showMessage, nodeHelpers).extend({
 					}
 				}
 			} catch (error) {
-				this.$showError(
+				this.showError(
 					error,
 					this.$locale.baseText(
 						'credentialEdit.credentialEdit.showError.generateAuthorizationUrl.title',
@@ -978,7 +1041,11 @@ export default mixins(showMessage, nodeHelpers).extend({
 			const params =
 				'scrollbars=no,resizable=yes,status=no,titlebar=noe,location=no,toolbar=no,menubar=no,width=500,height=700';
 			const oauthPopup = window.open(url, 'OAuth2 Authorization', params);
-			Vue.set(this.credentialData, 'oauthTokenData', null);
+
+			this.credentialData = {
+				...this.credentialData,
+				oauthTokenData: null as unknown as CredentialInformation,
+			};
 
 			const receiveMessage = (event: MessageEvent) => {
 				// // TODO: Add check that it came from n8n
@@ -990,7 +1057,11 @@ export default mixins(showMessage, nodeHelpers).extend({
 
 					// Set some kind of data that status changes.
 					// As data does not get displayed directly it does not matter what data.
-					Vue.set(this.credentialData, 'oauthTokenData', {});
+					this.credentialData = {
+						...this.credentialData,
+						oauthTokenData: {} as CredentialInformation,
+					};
+
 					this.credentialsStore.enableOAuthCredential(credential);
 
 					// Close the window
@@ -1010,7 +1081,6 @@ export default mixins(showMessage, nodeHelpers).extend({
 			if (credentialsForType) {
 				this.selectedCredential = credentialsForType.name;
 				this.resetCredentialData();
-				this.setupNodeAccess();
 				// Update current node auth type so credentials dropdown can be displayed properly
 				updateNodeAuthType(this.ndvStore.activeNode, type);
 				// Also update credential name but only if the default name is still used
@@ -1022,27 +1092,16 @@ export default mixins(showMessage, nodeHelpers).extend({
 				}
 			}
 		},
-		setupNodeAccess(): void {
-			this.nodeAccess = this.nodesWithAccess.reduce(
-				(accu: NodeAccessMap, node: { name: string }) => {
-					if (this.mode === 'new') {
-						accu[node.name] = { nodeType: node.name }; // enable all nodes by default
-					} else {
-						accu[node.name] = null;
-					}
-
-					return accu;
-				},
-				{},
-			);
-		},
 		resetCredentialData(): void {
 			if (!this.credentialType) {
 				return;
 			}
 			for (const property of this.credentialType.properties) {
 				if (!this.credentialType.__overwrittenProperties?.includes(property.name)) {
-					Vue.set(this.credentialData, property.name, property.default as CredentialInformation);
+					this.credentialData = {
+						...this.credentialData,
+						[property.name]: property.default as CredentialInformation,
+					};
 				}
 			}
 		},
diff --git a/packages/editor-ui/src/components/CredentialEdit/CredentialInfo.vue b/packages/editor-ui/src/components/CredentialEdit/CredentialInfo.vue
index bb798284fc343..9574c2c0e0aef 100644
--- a/packages/editor-ui/src/components/CredentialEdit/CredentialInfo.vue
+++ b/packages/editor-ui/src/components/CredentialEdit/CredentialInfo.vue
@@ -1,35 +1,5 @@
 <template>
 	<div :class="$style.container">
-		<el-row>
-			<el-col :span="8" :class="$style.accessLabel">
-				<n8n-text :compact="true" :bold="true">
-					{{ $locale.baseText('credentialEdit.credentialInfo.allowUseBy') }}
-				</n8n-text>
-			</el-col>
-			<el-col :span="16">
-				<div v-for="node in nodesWithAccess" :key="node.name" :class="$style.valueLabel">
-					<el-checkbox
-						v-if="credentialPermissions.updateNodeAccess"
-						:label="
-							$locale.headerText({
-								key: `headers.${shortNodeType(node)}.displayName`,
-								fallback: node.displayName,
-							})
-						"
-						:value="!!nodeAccess[node.name]"
-						@change="(val) => onNodeAccessChange(node.name, val)"
-					/>
-					<n8n-text v-else>
-						{{
-							$locale.headerText({
-								key: `headers.${shortNodeType(node)}.displayName`,
-								fallback: node.displayName,
-							})
-						}}
-					</n8n-text>
-				</div>
-			</el-col>
-		</el-row>
 		<el-row v-if="currentCredential">
 			<el-col :span="8" :class="$style.label">
 				<n8n-text :compact="true" :bold="true">
@@ -75,17 +45,11 @@ import type { INodeTypeDescription } from 'n8n-workflow';
 
 export default defineComponent({
 	name: 'CredentialInfo',
-	props: ['nodesWithAccess', 'nodeAccess', 'currentCredential', 'credentialPermissions'],
 	components: {
 		TimeAgo,
 	},
+	props: ['currentCredential', 'credentialPermissions'],
 	methods: {
-		onNodeAccessChange(name: string, value: string) {
-			this.$emit('accessChange', {
-				name,
-				value,
-			});
-		},
 		shortNodeType(nodeType: INodeTypeDescription) {
 			return this.$locale.shortNodeType(nodeType.name);
 		},
diff --git a/packages/editor-ui/src/components/CredentialEdit/CredentialInputs.vue b/packages/editor-ui/src/components/CredentialEdit/CredentialInputs.vue
index fd471e5f5735d..7ff4aeac07526 100644
--- a/packages/editor-ui/src/components/CredentialEdit/CredentialInputs.vue
+++ b/packages/editor-ui/src/components/CredentialEdit/CredentialInputs.vue
@@ -1,5 +1,5 @@
 <template>
-	<div @keydown.stop :class="$style.container" v-if="credentialProperties.length">
+	<div v-if="credentialProperties.length" :class="$style.container" @keydown.stop>
 		<form
 			v-for="parameter in credentialProperties"
 			:key="parameter.name"
@@ -9,15 +9,15 @@
 		>
 			<!-- Why form? to break up inputs, to prevent Chrome autofill -->
 			<n8n-notice v-if="parameter.type === 'notice'" :content="parameter.displayName" />
-			<parameter-input-expanded
+			<ParameterInputExpanded
 				v-else
 				:parameter="parameter"
 				:value="credentialData[parameter.name]"
-				:documentationUrl="documentationUrl"
-				:showValidationWarnings="showValidationWarnings"
+				:documentation-url="documentationUrl"
+				:show-validation-warnings="showValidationWarnings"
 				:label="label"
-				eventSource="credentials"
-				@change="valueChanged"
+				event-source="credentials"
+				@update="valueChanged"
 			/>
 		</form>
 	</div>
@@ -31,15 +31,15 @@ import ParameterInputExpanded from '../ParameterInputExpanded.vue';
 
 export default defineComponent({
 	name: 'CredentialsInput',
+	components: {
+		ParameterInputExpanded,
+	},
 	props: [
 		'credentialProperties',
 		'credentialData', // ICredentialsDecryptedResponse
 		'documentationUrl',
 		'showValidationWarnings',
 	],
-	components: {
-		ParameterInputExpanded,
-	},
 	data(): { label: IParameterLabel } {
 		return {
 			label: {
@@ -51,7 +51,7 @@ export default defineComponent({
 		valueChanged(parameterData: IUpdateInformation) {
 			const name = parameterData.name.split('.').pop();
 
-			this.$emit('change', {
+			this.$emit('update', {
 				name,
 				value: parameterData.value,
 			});
diff --git a/packages/editor-ui/src/components/CredentialEdit/CredentialSharing.ee.vue b/packages/editor-ui/src/components/CredentialEdit/CredentialSharing.ee.vue
index bf2bc27d46e9e..d5059b2a36340 100644
--- a/packages/editor-ui/src/components/CredentialEdit/CredentialSharing.ee.vue
+++ b/packages/editor-ui/src/components/CredentialEdit/CredentialSharing.ee.vue
@@ -12,12 +12,12 @@
 						uiStore.contextBasedTranslationKeys.credentials.sharing.unavailable.description,
 					)
 				"
-				:buttonText="
+				:button-text="
 					$locale.baseText(
 						uiStore.contextBasedTranslationKeys.credentials.sharing.unavailable.button,
 					)
 				"
-				@click="goToUpgrade"
+				@click:button="goToUpgrade"
 			/>
 		</div>
 		<div v-else-if="isDefaultUser">
@@ -26,43 +26,45 @@
 				:description="
 					$locale.baseText('credentialEdit.credentialSharing.isDefaultUser.description')
 				"
-				:buttonText="$locale.baseText('credentialEdit.credentialSharing.isDefaultUser.button')"
-				@click="goToUsersSettings"
+				:button-text="$locale.baseText('credentialEdit.credentialSharing.isDefaultUser.button')"
+				@click:button="goToUsersSettings"
 			/>
 		</div>
 		<div v-else>
-			<n8n-info-tip :bold="false" class="mb-s">
-				<template v-if="credentialPermissions.isOwner">
-					{{ $locale.baseText('credentialEdit.credentialSharing.info.owner') }}
-				</template>
-				<template v-else>
-					{{
-						$locale.baseText('credentialEdit.credentialSharing.info.sharee', {
-							interpolate: { credentialOwnerName },
-						})
-					}}
-				</template>
+			<n8n-info-tip v-if="credentialPermissions.isOwner" :bold="false" class="mb-s">
+				{{ $locale.baseText('credentialEdit.credentialSharing.info.owner') }}
+			</n8n-info-tip>
+			<n8n-info-tip v-if="!credentialPermissions.share" :bold="false" class="mb-s">
+				{{
+					$locale.baseText('credentialEdit.credentialSharing.info.sharee', {
+						interpolate: { credentialOwnerName },
+					})
+				}}
 			</n8n-info-tip>
 			<n8n-info-tip
 				v-if="
-					!credentialPermissions.isOwner &&
-					!credentialPermissions.isSharee &&
-					credentialPermissions.isInstanceOwner
+					credentialPermissions.read &&
+					credentialPermissions.share &&
+					!credentialPermissions.isOwner
 				"
 				class="mb-s"
 				:bold="false"
 			>
-				{{ $locale.baseText('credentialEdit.credentialSharing.info.instanceOwner') }}
+				<i18n-t keypath="credentialEdit.credentialSharing.info.reader">
+					<template v-if="!isCredentialSharedWithCurrentUser" #notShared>
+						{{ $locale.baseText('credentialEdit.credentialSharing.info.notShared') }}
+					</template>
+				</i18n-t>
 			</n8n-info-tip>
 			<n8n-user-select
-				v-if="credentialPermissions.updateSharing"
+				v-if="credentialPermissions.share"
 				class="mb-s"
 				size="large"
 				:users="usersList"
-				:currentUserId="usersStore.currentUser.id"
+				:current-user-id="usersStore.currentUser.id"
 				:placeholder="$locale.baseText('credentialEdit.credentialSharing.select.placeholder')"
 				data-test-id="credential-sharing-modal-users-select"
-				@input="onAddSharee"
+				@update:model-value="onAddSharee"
 			>
 				<template #prefix>
 					<n8n-icon icon="search" />
@@ -71,8 +73,8 @@
 			<n8n-users-list
 				:actions="usersListActions"
 				:users="sharedWithList"
-				:currentUserId="usersStore.currentUser.id"
-				:readonly="!credentialPermissions.updateSharing"
+				:current-user-id="usersStore.currentUser.id"
+				:readonly="!credentialPermissions.share"
 				@delete="onRemoveSharee"
 			/>
 		</div>
@@ -81,19 +83,17 @@
 
 <script lang="ts">
 import type { IUser, IUserListAction } from '@/Interface';
-import { UIState } from '@/Interface';
-import mixins from 'vue-typed-mixins';
-import { showMessage } from '@/mixins/showMessage';
+import { defineComponent } from 'vue';
+import { useMessage } from '@/composables/useMessage';
 import { mapStores } from 'pinia';
-import { useUsersStore } from '@/stores/users';
-import { useSettingsStore } from '@/stores/settings';
-import { useUIStore } from '@/stores/ui';
-import { useCredentialsStore } from '@/stores/credentials';
-import { useUsageStore } from '@/stores/usage';
-import { EnterpriseEditionFeature, VIEWS } from '@/constants';
-import { BaseTextKey } from '@/plugins/i18n';
+import { useUsersStore } from '@/stores/users.store';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useUIStore } from '@/stores/ui.store';
+import { useCredentialsStore } from '@/stores/credentials.store';
+import { useUsageStore } from '@/stores/usage.store';
+import { EnterpriseEditionFeature, MODAL_CONFIRM, VIEWS } from '@/constants';
 
-export default mixins(showMessage).extend({
+export default defineComponent({
 	name: 'CredentialSharing',
 	props: [
 		'credential',
@@ -103,6 +103,11 @@ export default mixins(showMessage).extend({
 		'credentialPermissions',
 		'modalBus',
 	],
+	setup() {
+		return {
+			...useMessage(),
+		};
+	},
 	computed: {
 		...mapStores(useCredentialsStore, useUsersStore, useUsageStore, useUIStore, useSettingsStore),
 		usersListActions(): IUserListAction[] {
@@ -121,12 +126,12 @@ export default mixins(showMessage).extend({
 		},
 		usersList(): IUser[] {
 			return this.usersStore.allUsers.filter((user: IUser) => {
-				const isCurrentUser = user.id === this.usersStore.currentUser?.id;
 				const isAlreadySharedWithUser = (this.credentialData.sharedWith || []).find(
 					(sharee: IUser) => sharee.id === user.id,
 				);
+				const isOwner = this.credentialData.ownedBy?.id === user.id;
 
-				return !isCurrentUser && !isAlreadySharedWithUser;
+				return !isAlreadySharedWithUser && !isOwner;
 			});
 		},
 		sharedWithList(): IUser[] {
@@ -140,33 +145,42 @@ export default mixins(showMessage).extend({
 		credentialOwnerName(): string {
 			return this.credentialsStore.getCredentialOwnerNameById(`${this.credentialId}`);
 		},
+		isCredentialSharedWithCurrentUser(): boolean {
+			return (this.credentialData.sharedWith || []).some((sharee: IUser) => {
+				return sharee.id === this.usersStore.currentUser?.id;
+			});
+		},
+	},
+	mounted() {
+		void this.loadUsers();
 	},
 	methods: {
 		async onAddSharee(userId: string) {
 			const sharee = { ...this.usersStore.getUserById(userId), isOwner: false };
-			this.$emit('change', (this.credentialData.sharedWith || []).concat(sharee));
+			this.$emit('update:modelValue', (this.credentialData.sharedWith || []).concat(sharee));
 		},
 		async onRemoveSharee(userId: string) {
 			const user = this.usersStore.getUserById(userId);
 
 			if (user) {
-				const confirm = await this.confirmMessage(
+				const confirm = await this.confirm(
 					this.$locale.baseText('credentialEdit.credentialSharing.list.delete.confirm.message', {
 						interpolate: { name: user.fullName || '' },
 					}),
 					this.$locale.baseText('credentialEdit.credentialSharing.list.delete.confirm.title'),
-					null,
-					this.$locale.baseText(
-						'credentialEdit.credentialSharing.list.delete.confirm.confirmButtonText',
-					),
-					this.$locale.baseText(
-						'credentialEdit.credentialSharing.list.delete.confirm.cancelButtonText',
-					),
+					{
+						confirmButtonText: this.$locale.baseText(
+							'credentialEdit.credentialSharing.list.delete.confirm.confirmButtonText',
+						),
+						cancelButtonText: this.$locale.baseText(
+							'credentialEdit.credentialSharing.list.delete.confirm.cancelButtonText',
+						),
+					},
 				);
 
-				if (confirm) {
+				if (confirm === MODAL_CONFIRM) {
 					this.$emit(
-						'change',
+						'update:modelValue',
 						this.credentialData.sharedWith.filter((sharee: IUser) => {
 							return sharee.id !== user.id;
 						}),
@@ -178,16 +192,13 @@ export default mixins(showMessage).extend({
 			await this.usersStore.fetchUsers();
 		},
 		goToUsersSettings() {
-			this.$router.push({ name: VIEWS.USERS_SETTINGS });
+			void this.$router.push({ name: VIEWS.USERS_SETTINGS });
 			this.modalBus.emit('close');
 		},
 		goToUpgrade() {
-			this.uiStore.goToUpgrade('credential_sharing', 'upgrade-credentials-sharing');
+			void this.uiStore.goToUpgrade('credential_sharing', 'upgrade-credentials-sharing');
 		},
 	},
-	mounted() {
-		this.loadUsers();
-	},
 });
 </script>
 
diff --git a/packages/editor-ui/src/components/CredentialEdit/GoogleAuthButton.vue b/packages/editor-ui/src/components/CredentialEdit/GoogleAuthButton.vue
index 1c4880b57a5ba..f2eb2ca9de27e 100644
--- a/packages/editor-ui/src/components/CredentialEdit/GoogleAuthButton.vue
+++ b/packages/editor-ui/src/components/CredentialEdit/GoogleAuthButton.vue
@@ -2,20 +2,21 @@
 	<button
 		:class="$style.googleAuthBtn"
 		:title="$locale.baseText('credentialEdit.oAuthButton.signInWithGoogle')"
-		@click.stop.prevent="$emit('click')"
 		:style="googleAuthButtons"
 	/>
 </template>
 
 <script lang="ts" setup>
-import { useRootStore } from '@/stores/n8nRootStore';
+import { useUIStore } from '@/stores/ui.store';
+import { useRootStore } from '@/stores/n8nRoot.store';
 
 const { baseUrl } = useRootStore();
+const type = useUIStore().appliedTheme === 'dark' ? '.dark.png' : '.png';
 const googleAuthButtons = {
-	'--google-auth-btn-normal': `url(${baseUrl}google-auth/normal.png`,
-	'--google-auth-btn-focus': `url(${baseUrl}google-auth/focus.png`,
-	'--google-auth-btn-pressed': `url(${baseUrl}google-auth/pressed.png`,
-	'--google-auth-btn-disabled': `url(${baseUrl}google-auth/disabled.png`,
+	'--google-auth-btn-normal': `url(${baseUrl}google-auth/normal${type}`,
+	'--google-auth-btn-focus': `url(${baseUrl}google-auth/focus${type}`,
+	'--google-auth-btn-pressed': `url(${baseUrl}google-auth/pressed${type}`,
+	'--google-auth-btn-disabled': `url(${baseUrl}google-auth/disabled${type}`,
 };
 </script>
 
diff --git a/packages/editor-ui/src/components/CredentialEdit/OauthButton.vue b/packages/editor-ui/src/components/CredentialEdit/OauthButton.vue
index ca0586de99b81..27da6ee5702c2 100644
--- a/packages/editor-ui/src/components/CredentialEdit/OauthButton.vue
+++ b/packages/editor-ui/src/components/CredentialEdit/OauthButton.vue
@@ -1,18 +1,16 @@
 <template>
 	<div :class="$style.container">
-		<GoogleAuthButton v-if="isGoogleOAuthType" @click="$emit('click')" />
+		<GoogleAuthButton v-if="isGoogleOAuthType" />
 		<n8n-button
 			v-else
 			:label="$locale.baseText('credentialEdit.oAuthButton.connectMyAccount')"
 			size="large"
-			@click.stop="$emit('click')"
 		/>
 	</div>
 </template>
 
 <script lang="ts" setup>
 import GoogleAuthButton from './GoogleAuthButton.vue';
-import Vue from 'vue';
 
 defineProps<{
 	isGoogleOAuthType: boolean;
diff --git a/packages/editor-ui/src/components/CredentialEdit/__tests__/OauthButton.test.ts b/packages/editor-ui/src/components/CredentialEdit/__tests__/OauthButton.test.ts
new file mode 100644
index 0000000000000..d5e91e1c525ce
--- /dev/null
+++ b/packages/editor-ui/src/components/CredentialEdit/__tests__/OauthButton.test.ts
@@ -0,0 +1,24 @@
+import userEvent from '@testing-library/user-event';
+import { createTestingPinia } from '@pinia/testing';
+import { createComponentRenderer } from '@/__tests__/render';
+import OauthButton from '@/components/CredentialEdit/OauthButton.vue';
+
+const renderComponent = createComponentRenderer(OauthButton, {
+	pinia: createTestingPinia(),
+});
+
+describe('OauthButton', () => {
+	test.each([
+		['GoogleAuthButton', true],
+		['n8n-button', false],
+	])('should emit click event only once when %s is clicked', async (name, isGoogleOAuthType) => {
+		const { emitted, getByRole } = renderComponent({
+			props: { isGoogleOAuthType },
+		});
+
+		const button = getByRole('button');
+		await userEvent.click(button);
+
+		expect(emitted().click).toHaveLength(1);
+	});
+});
diff --git a/packages/editor-ui/src/components/CredentialIcon.vue b/packages/editor-ui/src/components/CredentialIcon.vue
index 5041d365efff3..43cdcd32fbafc 100644
--- a/packages/editor-ui/src/components/CredentialIcon.vue
+++ b/packages/editor-ui/src/components/CredentialIcon.vue
@@ -1,20 +1,25 @@
 <template>
 	<div>
 		<img v-if="filePath" :class="$style.credIcon" :src="filePath" />
-		<NodeIcon v-else-if="relevantNode" :nodeType="relevantNode" :size="28" />
-		<span :class="$style.fallback" v-else></span>
+		<NodeIcon v-else-if="relevantNode" :node-type="relevantNode" :size="28" />
+		<span v-else :class="$style.fallback"></span>
 	</div>
 </template>
 
 <script lang="ts">
-import { useCredentialsStore } from '@/stores/credentials';
-import { useRootStore } from '@/stores/n8nRootStore';
-import { useNodeTypesStore } from '@/stores/nodeTypes';
-import type { ICredentialType, INodeTypeDescription } from 'n8n-workflow';
-import { mapStores } from 'pinia';
 import { defineComponent } from 'vue';
+import { mapStores } from 'pinia';
+
+import { useCredentialsStore } from '@/stores/credentials.store';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import type { ICredentialType, INodeTypeDescription } from 'n8n-workflow';
+import NodeIcon from '@/components/NodeIcon.vue';
 
 export default defineComponent({
+	components: {
+		NodeIcon,
+	},
 	props: {
 		credentialTypeName: {
 			type: String,
@@ -39,8 +44,11 @@ export default defineComponent({
 				const nodeType = this.credentialWithIcon.icon.replace('node:', '');
 				return this.nodeTypesStore.getNodeType(nodeType);
 			}
-			const nodesWithAccess = this.credentialsStore.getNodesWithAccess(this.credentialTypeName);
+			if (!this.credentialTypeName) {
+				return null;
+			}
 
+			const nodesWithAccess = this.credentialsStore.getNodesWithAccess(this.credentialTypeName);
 			if (nodesWithAccess.length) {
 				return nodesWithAccess[0];
 			}
diff --git a/packages/editor-ui/src/components/CredentialPicker/CredentialPicker.vue b/packages/editor-ui/src/components/CredentialPicker/CredentialPicker.vue
new file mode 100644
index 0000000000000..1f3980aca8f98
--- /dev/null
+++ b/packages/editor-ui/src/components/CredentialPicker/CredentialPicker.vue
@@ -0,0 +1,153 @@
+<script setup lang="ts">
+import { computed, ref } from 'vue';
+import { listenForModalChanges, useUIStore } from '@/stores/ui.store';
+import { listenForCredentialChanges, useCredentialsStore } from '@/stores/credentials.store';
+import { assert } from '@/utils/assert';
+import CredentialsDropdown from './CredentialsDropdown.vue';
+import { useI18n } from '@/composables/useI18n';
+import { CREDENTIAL_EDIT_MODAL_KEY } from '@/constants';
+
+const props = defineProps({
+	appName: {
+		type: String,
+		required: true,
+	},
+	credentialType: {
+		type: String,
+		required: true,
+	},
+	selectedCredentialId: {
+		type: String,
+		required: false,
+	},
+});
+
+const $emit = defineEmits({
+	credentialSelected: (_credentialId: string) => true,
+	credentialDeselected: () => true,
+	credentialModalOpened: () => true,
+});
+
+const uiStore = useUIStore();
+const credentialsStore = useCredentialsStore();
+const i18n = useI18n();
+
+const wasModalOpenedFromHere = ref(false);
+
+const availableCredentials = computed(() => {
+	return credentialsStore.getCredentialsByType(props.credentialType);
+});
+
+const credentialOptions = computed(() => {
+	return availableCredentials.value.map((credential) => ({
+		id: credential.id,
+		name: credential.name,
+		typeDisplayName: credentialsStore.getCredentialTypeByName(credential.type)?.displayName,
+	}));
+});
+
+const onCredentialSelected = (credentialId: string) => {
+	$emit('credentialSelected', credentialId);
+};
+const createNewCredential = () => {
+	uiStore.openNewCredential(props.credentialType, true);
+	wasModalOpenedFromHere.value = true;
+	$emit('credentialModalOpened');
+};
+const editCredential = () => {
+	assert(props.selectedCredentialId);
+	uiStore.openExistingCredential(props.selectedCredentialId);
+	wasModalOpenedFromHere.value = true;
+	$emit('credentialModalOpened');
+};
+
+listenForCredentialChanges({
+	store: credentialsStore,
+	onCredentialCreated: (credential) => {
+		if (!wasModalOpenedFromHere.value) {
+			return;
+		}
+
+		$emit('credentialSelected', credential.id);
+	},
+	onCredentialDeleted: (deletedCredentialId) => {
+		if (!wasModalOpenedFromHere.value) {
+			return;
+		}
+
+		if (deletedCredentialId !== props.selectedCredentialId) {
+			return;
+		}
+
+		const optionsWoDeleted = credentialOptions.value
+			.map((credential) => credential.id)
+			.filter((id) => id !== deletedCredentialId);
+		if (optionsWoDeleted.length > 0) {
+			$emit('credentialSelected', optionsWoDeleted[0]);
+		} else {
+			$emit('credentialDeselected');
+		}
+	},
+});
+
+listenForModalChanges({
+	store: uiStore,
+	onModalClosed(modalName) {
+		if (modalName === CREDENTIAL_EDIT_MODAL_KEY && wasModalOpenedFromHere.value) {
+			wasModalOpenedFromHere.value = false;
+		}
+	},
+});
+</script>
+
+<template>
+	<div>
+		<div v-if="credentialOptions.length > 0" :class="$style.dropdown">
+			<CredentialsDropdown
+				:credential-type="props.credentialType"
+				:credential-options="credentialOptions"
+				:selected-credential-id="props.selectedCredentialId"
+				@credential-selected="onCredentialSelected"
+				@new-credential="createNewCredential"
+			/>
+
+			<n8n-icon-button
+				icon="pen"
+				type="secondary"
+				:class="{
+					[$style.edit]: true,
+					[$style.invisible]: !props.selectedCredentialId,
+				}"
+				:title="i18n.baseText('nodeCredentials.updateCredential')"
+				data-test-id="credential-edit-button"
+				@click="editCredential()"
+			/>
+		</div>
+
+		<n8n-button
+			v-else
+			:label="`Create new ${props.appName} credential`"
+			data-test-id="create-credential"
+			@click="createNewCredential"
+		/>
+	</div>
+</template>
+
+<style lang="scss" module>
+.dropdown {
+	display: flex;
+}
+
+.edit {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	min-width: 20px;
+	margin-left: var(--spacing-2xs);
+	font-size: var(--font-size-s);
+}
+
+.invisible {
+	visibility: hidden;
+}
+</style>
diff --git a/packages/editor-ui/src/components/CredentialPicker/CredentialsDropdown.vue b/packages/editor-ui/src/components/CredentialPicker/CredentialsDropdown.vue
new file mode 100644
index 0000000000000..5c9c2d79e9941
--- /dev/null
+++ b/packages/editor-ui/src/components/CredentialPicker/CredentialsDropdown.vue
@@ -0,0 +1,73 @@
+<script setup lang="ts">
+import type { PropType } from 'vue';
+import { useI18n } from '@/composables/useI18n';
+
+export type CredentialOption = {
+	id: string;
+	name: string;
+	typeDisplayName: string | undefined;
+};
+
+const props = defineProps({
+	credentialOptions: {
+		type: Array as PropType<CredentialOption[]>,
+		required: true,
+	},
+	selectedCredentialId: {
+		type: String,
+		required: false,
+	},
+});
+
+const $emit = defineEmits({
+	credentialSelected: (_credentialId: string) => true,
+	newCredential: () => true,
+});
+
+const i18n = useI18n();
+
+const NEW_CREDENTIALS_TEXT = `- ${i18n.baseText('nodeCredentials.createNew')} -`;
+
+const onCredentialSelected = (credentialId: string) => {
+	if (credentialId === NEW_CREDENTIALS_TEXT) {
+		$emit('newCredential');
+	} else {
+		$emit('credentialSelected', credentialId);
+	}
+};
+</script>
+
+<template>
+	<n8n-select
+		size="small"
+		:model-value="props.selectedCredentialId"
+		@update:model-value="onCredentialSelected"
+	>
+		<n8n-option
+			v-for="item in props.credentialOptions"
+			:key="item.id"
+			:data-test-id="`node-credentials-select-item-${item.id}`"
+			:label="item.name"
+			:value="item.id"
+		>
+			<div :class="[$style.credentialOption, 'mt-2xs mb-2xs']">
+				<n8n-text bold>{{ item.name }}</n8n-text>
+				<n8n-text size="small">{{ item.typeDisplayName }}</n8n-text>
+			</div>
+		</n8n-option>
+		<n8n-option
+			:key="NEW_CREDENTIALS_TEXT"
+			data-test-id="node-credentials-select-item-new"
+			:value="NEW_CREDENTIALS_TEXT"
+			:label="NEW_CREDENTIALS_TEXT"
+		>
+		</n8n-option>
+	</n8n-select>
+</template>
+
+<style lang="scss" module>
+.credentialOption {
+	display: flex;
+	flex-direction: column;
+}
+</style>
diff --git a/packages/editor-ui/src/components/CredentialsSelect.vue b/packages/editor-ui/src/components/CredentialsSelect.vue
index 7820cfd47500c..50cdb0b0be2a5 100644
--- a/packages/editor-ui/src/components/CredentialsSelect.vue
+++ b/packages/editor-ui/src/components/CredentialsSelect.vue
@@ -2,25 +2,25 @@
 	<div>
 		<div :class="$style['parameter-value-container']">
 			<n8n-select
+				ref="innerSelect"
 				:size="inputSize"
 				filterable
-				:value="displayValue"
+				:model-value="displayValue"
 				:placeholder="
 					parameter.placeholder ? getPlaceholder() : $locale.baseText('parameterInput.select')
 				"
 				:title="displayTitle"
 				:disabled="isReadOnly"
-				ref="innerSelect"
-				@change="(value) => $emit('valueChanged', value)"
+				data-test-id="credential-select"
+				@update:model-value="(value) => $emit('update:modelValue', value)"
 				@keydown.stop
 				@focus="$emit('setFocus')"
 				@blur="$emit('onBlur')"
-				data-test-id="credential-select"
 			>
 				<n8n-option
 					v-for="credType in supportedCredentialTypes"
-					:value="credType.name"
 					:key="credType.name"
+					:value="credType.name"
 					:label="credType.displayName"
 					data-test-id="credential-select-option"
 				>
@@ -39,16 +39,16 @@
 			<slot name="issues-and-options" />
 		</div>
 
-		<scopes-notice
+		<ScopesNotice
 			v-if="scopes.length > 0"
-			:activeCredentialType="activeCredentialType"
+			:active-credential-type="activeCredentialType"
 			:scopes="scopes"
 		/>
 		<div>
-			<node-credentials
+			<NodeCredentials
 				:node="node"
-				:overrideCredType="node.parameters[parameter.name]"
-				@credentialSelected="(updateInformation) => $emit('credentialSelected', updateInformation)"
+				:override-cred-type="node.parameters[parameter.name]"
+				@credential-selected="(updateInformation) => $emit('credentialSelected', updateInformation)"
 			/>
 		</div>
 	</div>
@@ -56,11 +56,11 @@
 
 <script lang="ts">
 import type { ICredentialType } from 'n8n-workflow';
-import Vue, { defineComponent } from 'vue';
+import { defineComponent } from 'vue';
 import ScopesNotice from '@/components/ScopesNotice.vue';
 import NodeCredentials from '@/components/NodeCredentials.vue';
 import { mapStores } from 'pinia';
-import { useCredentialsStore } from '@/stores/credentials';
+import { useCredentialsStore } from '@/stores/credentials.store';
 import type { N8nSelect } from 'n8n-design-system';
 
 type N8nSelectRef = InstanceType<typeof N8nSelect>;
@@ -109,6 +109,7 @@ export default defineComponent({
 			const supported = this.getSupportedSets(this.parameter.credentialTypes);
 
 			const checkedCredType = this.credentialsStore.getCredentialTypeByName(name);
+			if (!checkedCredType) return false;
 
 			for (const property of supported.has) {
 				if (checkedCredType[property as keyof ICredentialType] !== undefined) {
diff --git a/packages/editor-ui/src/components/CredentialsSelectModal.vue b/packages/editor-ui/src/components/CredentialsSelectModal.vue
index 8298633f39f79..c932db45bde75 100644
--- a/packages/editor-ui/src/components/CredentialsSelectModal.vue
+++ b/packages/editor-ui/src/components/CredentialsSelectModal.vue
@@ -1,12 +1,12 @@
 <template>
 	<Modal
 		:name="CREDENTIAL_SELECT_MODAL_KEY"
-		:eventBus="modalBus"
+		:event-bus="modalBus"
 		width="50%"
 		:center="true"
 		:loading="loading"
-		maxWidth="460px"
-		minHeight="250px"
+		max-width="460px"
+		min-height="250px"
 	>
 		<template #header>
 			<h2 :class="$style.title">
@@ -19,22 +19,22 @@
 					{{ $locale.baseText('credentialSelectModal.selectAnAppOrServiceToConnectTo') }}
 				</div>
 				<n8n-select
+					ref="select"
 					filterable
-					defaultFirstOption
+					default-first-option
 					:placeholder="$locale.baseText('credentialSelectModal.searchForApp')"
 					size="xlarge"
-					ref="select"
-					:value="selected"
-					@change="onSelect"
+					:model-value="selected"
 					data-test-id="new-credential-type-select"
+					@update:model-value="onSelect"
 				>
 					<template #prefix>
 						<font-awesome-icon icon="search" />
 					</template>
 					<n8n-option
 						v-for="credential in credentialsStore.allCredentialTypes"
-						:value="credential.name"
 						:key="credential.name"
+						:value="credential.name"
 						:label="credential.displayName"
 						filterable
 						data-test-id="new-credential-type-select-option"
@@ -49,8 +49,8 @@
 					float="right"
 					size="large"
 					:disabled="!selected"
-					@click="openCredentialType"
 					data-test-id="new-credential-type-button"
+					@click="openCredentialType"
 				/>
 			</div>
 		</template>
@@ -58,21 +58,35 @@
 </template>
 
 <script lang="ts">
-import mixins from 'vue-typed-mixins';
+import { defineComponent } from 'vue';
 import Modal from './Modal.vue';
 import { CREDENTIAL_SELECT_MODAL_KEY } from '../constants';
-import { externalHooks } from '@/mixins/externalHooks';
 import { mapStores } from 'pinia';
-import { useUIStore } from '@/stores/ui';
-import { useWorkflowsStore } from '@/stores/workflows';
-import { useCredentialsStore } from '@/stores/credentials';
-import { createEventBus } from '@/event-bus';
+import { useUIStore } from '@/stores/ui.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useCredentialsStore } from '@/stores/credentials.store';
+import { createEventBus } from 'n8n-design-system/utils';
+import { useExternalHooks } from '@/composables/useExternalHooks';
 
-export default mixins(externalHooks).extend({
+export default defineComponent({
 	name: 'CredentialsSelectModal',
 	components: {
 		Modal,
 	},
+	setup() {
+		const externalHooks = useExternalHooks();
+		return {
+			externalHooks,
+		};
+	},
+	data() {
+		return {
+			modalBus: createEventBus(),
+			selected: '',
+			loading: true,
+			CREDENTIAL_SELECT_MODAL_KEY,
+		};
+	},
 	async mounted() {
 		try {
 			await this.credentialsStore.fetchCredentialTypes(false);
@@ -86,14 +100,6 @@ export default mixins(externalHooks).extend({
 			}
 		}, 0);
 	},
-	data() {
-		return {
-			modalBus: createEventBus(),
-			selected: '',
-			loading: true,
-			CREDENTIAL_SELECT_MODAL_KEY,
-		};
-	},
 	computed: {
 		...mapStores(useCredentialsStore, useUIStore, useWorkflowsStore),
 	},
@@ -113,7 +119,7 @@ export default mixins(externalHooks).extend({
 			};
 
 			this.$telemetry.track('User opened Credential modal', telemetryPayload);
-			this.$externalHooks().run('credentialsSelectModal.openCredentialType', telemetryPayload);
+			void this.externalHooks.run('credentialsSelectModal.openCredentialType', telemetryPayload);
 		},
 	},
 });
diff --git a/packages/editor-ui/src/components/DebugPaywallModal.vue b/packages/editor-ui/src/components/DebugPaywallModal.vue
new file mode 100644
index 0000000000000..854fb399691b3
--- /dev/null
+++ b/packages/editor-ui/src/components/DebugPaywallModal.vue
@@ -0,0 +1,40 @@
+<script lang="ts" setup>
+import { useI18n } from '@/composables/useI18n';
+import Modal from '@/components/Modal.vue';
+
+const props = defineProps<{
+	modalName: string;
+	data: { title: string; footerButtonAction: () => void };
+}>();
+
+const i18n = useI18n();
+</script>
+
+<template>
+	<Modal width="500px" :title="props.data.title" :name="props.modalName">
+		<template #content>
+			<n8n-text>
+				{{ i18n.baseText('executionsList.debug.paywall.content') }}
+				<br />
+				<n8n-link :to="i18n.baseText('executionsList.debug.paywall.link.url')" new-window>
+					{{ i18n.baseText('executionsList.debug.paywall.link.text') }}
+				</n8n-link>
+			</n8n-text>
+		</template>
+		<template #footer>
+			<div :class="$style.footer">
+				<n8n-button @click="props.data.footerButtonAction">
+					{{ i18n.baseText('generic.seePlans') }}
+				</n8n-button>
+			</div>
+		</template>
+	</Modal>
+</template>
+
+<style module lang="scss">
+.footer {
+	display: flex;
+	flex-direction: row;
+	justify-content: flex-end;
+}
+</style>
diff --git a/packages/editor-ui/src/components/DeleteUserModal.vue b/packages/editor-ui/src/components/DeleteUserModal.vue
index 2b644b1d11512..931cf6ab278fb 100644
--- a/packages/editor-ui/src/components/DeleteUserModal.vue
+++ b/packages/editor-ui/src/components/DeleteUserModal.vue
@@ -1,11 +1,11 @@
 <template>
 	<Modal
 		:name="modalName"
-		@enter="onSubmit"
 		:title="title"
 		:center="true"
 		width="460px"
-		:eventBus="modalBus"
+		:event-bus="modalBus"
+		@enter="onSubmit"
 	>
 		<template #content>
 			<div>
@@ -14,43 +14,51 @@
 						$locale.baseText('settings.users.confirmUserDeletion')
 					}}</n8n-text>
 				</div>
-				<div :class="$style.content" v-else>
+				<div v-else :class="$style.content">
 					<div>
 						<n8n-text color="text-base">{{
 							$locale.baseText('settings.users.confirmDataHandlingAfterDeletion')
 						}}</n8n-text>
 					</div>
-					<el-radio :value="operation" label="transfer" @change="() => setOperation('transfer')">
+					<el-radio
+						:model-value="operation"
+						label="transfer"
+						@update:model-value="() => setOperation('transfer')"
+					>
 						<n8n-text color="text-dark">{{
 							$locale.baseText('settings.users.transferWorkflowsAndCredentials')
 						}}</n8n-text>
 					</el-radio>
-					<div :class="$style.optionInput" v-if="operation === 'transfer'">
+					<div v-if="operation === 'transfer'" :class="$style.optionInput">
 						<n8n-input-label :label="$locale.baseText('settings.users.userToTransferTo')">
 							<n8n-user-select
 								:users="usersStore.allUsers"
-								:value="transferId"
-								:ignoreIds="ignoreIds"
-								:currentUserId="usersStore.currentUserId"
-								@input="setTransferId"
+								:model-value="transferId"
+								:ignore-ids="ignoreIds"
+								:current-user-id="usersStore.currentUserId"
+								@update:model-value="setTransferId"
 							/>
 						</n8n-input-label>
 					</div>
-					<el-radio :value="operation" label="delete" @change="() => setOperation('delete')">
+					<el-radio
+						:model-value="operation"
+						label="delete"
+						@update:model-value="() => setOperation('delete')"
+					>
 						<n8n-text color="text-dark">{{
 							$locale.baseText('settings.users.deleteWorkflowsAndCredentials')
 						}}</n8n-text>
 					</el-radio>
 					<div
-						:class="$style.optionInput"
 						v-if="operation === 'delete'"
+						:class="$style.optionInput"
 						data-test-id="delete-data-input"
 					>
 						<n8n-input-label :label="$locale.baseText('settings.users.deleteConfirmationMessage')">
 							<n8n-input
-								:value="deleteConfirmText"
+								:model-value="deleteConfirmText"
 								:placeholder="$locale.baseText('settings.users.deleteConfirmationText')"
-								@input="setConfirmText"
+								@update:model-value="setConfirmText"
 							/>
 						</n8n-input-label>
 					</div>
@@ -62,28 +70,27 @@
 				:loading="loading"
 				:disabled="!enabled"
 				:label="$locale.baseText('settings.users.delete')"
-				@click="onSubmit"
 				float="right"
+				@click="onSubmit"
 			/>
 		</template>
 	</Modal>
 </template>
 
 <script lang="ts">
-import mixins from 'vue-typed-mixins';
-
-import { showMessage } from '@/mixins/showMessage';
-import Modal from './Modal.vue';
-import type { IUser } from '../Interface';
+import { defineComponent } from 'vue';
+import { useToast } from '@/composables/useToast';
+import Modal from '@/components/Modal.vue';
+import type { IUser } from '@/Interface';
 import { mapStores } from 'pinia';
-import { useUsersStore } from '@/stores/users';
-import { createEventBus } from '@/event-bus';
+import { useUsersStore } from '@/stores/users.store';
+import { createEventBus } from 'n8n-design-system/utils';
 
-export default mixins(showMessage).extend({
+export default defineComponent({
+	name: 'DeleteUserModal',
 	components: {
 		Modal,
 	},
-	name: 'DeleteUserModal',
 	props: {
 		modalName: {
 			type: String,
@@ -92,6 +99,11 @@ export default mixins(showMessage).extend({
 			type: String,
 		},
 	},
+	setup() {
+		return {
+			...useToast(),
+		};
+	},
 	data() {
 		return {
 			modalBus: createEventBus(),
@@ -169,7 +181,7 @@ export default mixins(showMessage).extend({
 					}
 				}
 
-				this.$showMessage({
+				this.showMessage({
 					type: 'success',
 					title: this.$locale.baseText('settings.users.userDeleted'),
 					message,
@@ -177,7 +189,7 @@ export default mixins(showMessage).extend({
 
 				this.modalBus.emit('close');
 			} catch (error) {
-				this.$showError(error, this.$locale.baseText('settings.users.userDeletedError'));
+				this.showError(error, this.$locale.baseText('settings.users.userDeletedError'));
 			}
 			this.loading = false;
 		},
diff --git a/packages/editor-ui/src/components/Draggable.vue b/packages/editor-ui/src/components/Draggable.vue
index ce5c9ea0c48ff..8b65ed35d9abe 100644
--- a/packages/editor-ui/src/components/Draggable.vue
+++ b/packages/editor-ui/src/components/Draggable.vue
@@ -1,15 +1,15 @@
 <template>
 	<component
 		:is="tag"
+		ref="wrapper"
 		:class="{ [$style.dragging]: isDragging }"
 		@mousedown="onDragStart"
-		ref="wrapper"
 	>
-		<slot :isDragging="isDragging"></slot>
+		<slot :is-dragging="isDragging"></slot>
 
 		<Teleport to="body">
-			<div ref="draggable" :class="$style.draggable" :style="draggableStyle" v-show="isDragging">
-				<slot name="preview" :canDrop="canDrop" :el="draggingEl"></slot>
+			<div v-show="isDragging" ref="draggable" :class="$style.draggable" :style="draggableStyle">
+				<slot name="preview" :can-drop="canDrop" :el="draggingEl"></slot>
 			</div>
 		</Teleport>
 	</component>
@@ -17,18 +17,12 @@
 
 <script lang="ts">
 import type { XYPosition } from '@/Interface';
-import { useNDVStore } from '@/stores/ndv';
+import { useNDVStore } from '@/stores/ndv.store';
 import { mapStores } from 'pinia';
 import { defineComponent } from 'vue';
 
-// @ts-ignore
-import Teleport from 'vue2-teleport';
-
 export default defineComponent({
-	name: 'draggable',
-	components: {
-		Teleport,
-	},
+	name: 'Draggable',
 	props: {
 		disabled: {
 			type: Boolean,
@@ -123,7 +117,11 @@ export default defineComponent({
 
 				const data =
 					this.targetDataKey && this.draggingEl ? this.draggingEl.dataset.value : this.data || '';
-				this.ndvStore.draggableStartDragging({ type: this.type, data: data || '' });
+				this.ndvStore.draggableStartDragging({
+					type: this.type,
+					data: data || '',
+					dimensions: this.draggingEl?.getBoundingClientRect() ?? null,
+				});
 
 				this.$emit('dragstart', this.draggingEl);
 				document.body.style.cursor = 'grabbing';
diff --git a/packages/editor-ui/src/components/DraggableTarget.vue b/packages/editor-ui/src/components/DraggableTarget.vue
index bec71082ec500..18274cd4ad52c 100644
--- a/packages/editor-ui/src/components/DraggableTarget.vue
+++ b/packages/editor-ui/src/components/DraggableTarget.vue
@@ -1,14 +1,16 @@
 <template>
 	<div ref="target">
-		<slot :droppable="droppable" :activeDrop="activeDrop"></slot>
+		<slot :droppable="droppable" :active-drop="activeDrop"></slot>
 	</div>
 </template>
 
 <script lang="ts">
-import { useNDVStore } from '@/stores/ndv';
-import { mapStores } from 'pinia';
 import { defineComponent } from 'vue';
 import type { PropType } from 'vue';
+import { mapStores } from 'pinia';
+import { useNDVStore } from '@/stores/ndv.store';
+import { v4 as uuid } from 'uuid';
+import type { XYPosition } from '@/Interface';
 
 export default defineComponent({
 	props: {
@@ -25,20 +27,18 @@ export default defineComponent({
 			type: Array as PropType<number[]>,
 			default: () => [0, 0],
 		},
+		stickyOrigin: {
+			type: String as PropType<'top-left' | 'center'>,
+			default: 'top-left',
+		},
 	},
 	data() {
 		return {
 			hovering: false,
+			dimensions: null as DOMRect | null,
+			id: uuid(),
 		};
 	},
-	mounted() {
-		window.addEventListener('mousemove', this.onMouseMove);
-		window.addEventListener('mouseup', this.onMouseUp);
-	},
-	destroyed() {
-		window.removeEventListener('mousemove', this.onMouseMove);
-		window.removeEventListener('mouseup', this.onMouseUp);
-	},
 	computed: {
 		...mapStores(useNDVStore),
 		isDragging(): boolean {
@@ -47,12 +47,57 @@ export default defineComponent({
 		draggableType(): string {
 			return this.ndvStore.draggableType;
 		},
+		draggableDimensions(): DOMRect | null {
+			return this.ndvStore.draggable.dimensions;
+		},
 		droppable(): boolean {
 			return !this.disabled && this.isDragging && this.draggableType === this.type;
 		},
 		activeDrop(): boolean {
 			return this.droppable && this.hovering;
 		},
+		stickyPosition(): XYPosition | null {
+			if (this.disabled || !this.sticky || !this.hovering || !this.dimensions) {
+				return null;
+			}
+
+			if (this.stickyOrigin === 'center') {
+				return [
+					this.dimensions.left +
+						this.stickyOffset[0] +
+						this.dimensions.width / 2 -
+						(this.draggableDimensions?.width ?? 0) / 2,
+					this.dimensions.top +
+						this.stickyOffset[1] +
+						this.dimensions.height / 2 -
+						(this.draggableDimensions?.height ?? 0) / 2,
+				];
+			}
+
+			return [
+				this.dimensions.left + this.stickyOffset[0],
+				this.dimensions.top + this.stickyOffset[1],
+			];
+		},
+	},
+	watch: {
+		activeDrop(active) {
+			if (active) {
+				this.ndvStore.setDraggableTarget({ id: this.id, stickyPosition: this.stickyPosition });
+			} else if (this.ndvStore.draggable.activeTarget?.id === this.id) {
+				// Only clear active target if it is this one
+				this.ndvStore.setDraggableTarget(null);
+			}
+		},
+	},
+	mounted() {
+		window.addEventListener('mousemove', this.onMouseMove);
+		window.addEventListener('mouseup', this.onMouseUp);
+	},
+
+	beforeUnmount() {
+		window.removeEventListener('mousemove', this.onMouseMove);
+		window.removeEventListener('mouseup', this.onMouseUp);
 	},
 	methods: {
 		onMouseMove(e: MouseEvent) {
@@ -61,17 +106,12 @@ export default defineComponent({
 			if (targetRef && this.isDragging) {
 				const dim = targetRef.getBoundingClientRect();
 
+				this.dimensions = dim;
 				this.hovering =
 					e.clientX >= dim.left &&
 					e.clientX <= dim.right &&
 					e.clientY >= dim.top &&
 					e.clientY <= dim.bottom;
-
-				if (!this.disabled && this.sticky && this.hovering) {
-					const [xOffset, yOffset] = this.stickyOffset;
-
-					this.ndvStore.setDraggableStickyPos([dim.left + xOffset, dim.top + yOffset]);
-				}
 			}
 		},
 		onMouseUp(e: MouseEvent) {
@@ -81,10 +121,5 @@ export default defineComponent({
 			}
 		},
 	},
-	watch: {
-		activeDrop(active) {
-			this.ndvStore.setDraggableCanDrop(active);
-		},
-	},
 });
 </script>
diff --git a/packages/editor-ui/src/components/DropArea/DropArea.vue b/packages/editor-ui/src/components/DropArea/DropArea.vue
new file mode 100644
index 0000000000000..a6129983a77da
--- /dev/null
+++ b/packages/editor-ui/src/components/DropArea/DropArea.vue
@@ -0,0 +1,53 @@
+<script setup lang="ts">
+import DraggableTarget from '@/components/DraggableTarget.vue';
+
+const emit = defineEmits<{ (event: 'drop', value: string): void }>();
+
+const onDrop = (value: string) => {
+	emit('drop', value);
+};
+</script>
+
+<template>
+	<DraggableTarget type="mapping" @drop="onDrop">
+		<template #default="{ droppable, activeDrop }">
+			<div
+				data-test-id="drop-area"
+				:class="{ [$style.area]: true, [$style.active]: activeDrop, [$style.droppable]: droppable }"
+			>
+				<slot :active="activeDrop" :droppable="droppable"></slot>
+			</div>
+		</template>
+	</DraggableTarget>
+</template>
+
+<style lang="scss" module>
+.area {
+	border: dashed 1px var(--color-foreground-dark);
+	border-radius: var(--border-radius-large);
+	background: var(--color-background-light);
+	padding: var(--spacing-s) var(--spacing-m);
+	display: flex;
+	align-items: baseline;
+	justify-content: center;
+	font-size: var(--font-size-s);
+	transition: border-color 0.1s ease-in;
+	box-shadow: inset 0 0 0px 1.5px var(--color-background-xlight);
+
+	&:not(.active):hover {
+		border-color: var(--color-ndv-droppable-parameter);
+		background: var(--color-ndv-droppable-parameter-background);
+	}
+}
+
+.droppable {
+	border-color: var(--color-ndv-droppable-parameter);
+	border-width: 1.5px;
+	background: var(--color-ndv-droppable-parameter-background);
+}
+
+.active {
+	border-color: var(--color-success);
+	background: var(--color-ndv-droppable-parameter-active-background);
+}
+</style>
diff --git a/packages/editor-ui/src/components/DropArea/__tests__/DropArea.test.ts b/packages/editor-ui/src/components/DropArea/__tests__/DropArea.test.ts
new file mode 100644
index 0000000000000..d9c8371d72479
--- /dev/null
+++ b/packages/editor-ui/src/components/DropArea/__tests__/DropArea.test.ts
@@ -0,0 +1,40 @@
+import { createComponentRenderer } from '@/__tests__/render';
+import { useNDVStore } from '@/stores/ndv.store';
+import { createTestingPinia } from '@pinia/testing';
+import userEvent from '@testing-library/user-event';
+import { fireEvent } from '@testing-library/vue';
+import { createPinia, setActivePinia } from 'pinia';
+import DropArea from '../DropArea.vue';
+
+const renderComponent = createComponentRenderer(DropArea, {
+	pinia: createTestingPinia(),
+});
+
+async function fireDrop(dropArea: HTMLElement): Promise<void> {
+	useNDVStore().draggableStartDragging({
+		type: 'mapping',
+		data: '{{ $json.something }}',
+		dimensions: null,
+	});
+
+	await userEvent.hover(dropArea);
+	await fireEvent.mouseUp(dropArea);
+}
+
+describe('DropArea.vue', () => {
+	afterEach(() => {
+		vi.clearAllMocks();
+	});
+
+	it('renders default state correctly and emits drop events', async () => {
+		const pinia = createPinia();
+		setActivePinia(pinia);
+
+		const { getByTestId, emitted } = renderComponent({ pinia });
+		expect(getByTestId('drop-area')).toBeInTheDocument();
+
+		await fireDrop(getByTestId('drop-area'));
+
+		expect(emitted('drop')).toEqual([['{{ $json.something }}']]);
+	});
+});
diff --git a/packages/editor-ui/src/components/DuplicateWorkflowDialog.vue b/packages/editor-ui/src/components/DuplicateWorkflowDialog.vue
index 653030aec09c3..1eaaf2f8ce9d6 100644
--- a/packages/editor-ui/src/components/DuplicateWorkflowDialog.vue
+++ b/packages/editor-ui/src/components/DuplicateWorkflowDialog.vue
@@ -1,47 +1,46 @@
 <template>
 	<Modal
 		:name="modalName"
-		:eventBus="modalBus"
-		@enter="save"
+		:event-bus="modalBus"
 		:title="$locale.baseText('duplicateWorkflowDialog.duplicateWorkflow')"
 		:center="true"
 		width="420px"
+		@enter="save"
 	>
 		<template #content>
 			<div :class="$style.content">
 				<n8n-input
-					v-model="name"
 					ref="nameInput"
+					v-model="name"
 					:placeholder="$locale.baseText('duplicateWorkflowDialog.enterWorkflowName')"
 					:maxlength="MAX_WORKFLOW_NAME_LENGTH"
 				/>
 				<TagsDropdown
 					v-if="settingsStore.areTagsEnabled"
-					:createEnabled="true"
-					:currentTagIds="currentTagIds"
-					:eventBus="dropdownBus"
+					ref="dropdown"
+					v-model="currentTagIds"
+					:create-enabled="true"
+					:event-bus="dropdownBus"
+					:placeholder="$locale.baseText('duplicateWorkflowDialog.chooseOrCreateATag')"
 					@blur="onTagsBlur"
 					@esc="onTagsEsc"
-					@update="onTagsUpdate"
-					:placeholder="$locale.baseText('duplicateWorkflowDialog.chooseOrCreateATag')"
-					ref="dropdown"
 				/>
 			</div>
 		</template>
 		<template #footer="{ close }">
 			<div :class="$style.footer">
 				<n8n-button
-					@click="save"
 					:loading="isSaving"
 					:label="$locale.baseText('duplicateWorkflowDialog.save')"
 					float="right"
+					@click="save"
 				/>
 				<n8n-button
 					type="secondary"
-					@click="close"
 					:disabled="isSaving"
 					:label="$locale.baseText('duplicateWorkflowDialog.cancel')"
 					float="right"
+					@click="close"
 				/>
 			</div>
 		</template>
@@ -49,27 +48,36 @@
 </template>
 
 <script lang="ts">
-import mixins from 'vue-typed-mixins';
-
+import { defineComponent } from 'vue';
+import { mapStores } from 'pinia';
 import { MAX_WORKFLOW_NAME_LENGTH, PLACEHOLDER_EMPTY_WORKFLOW_ID } from '@/constants';
-import { workflowHelpers } from '@/mixins/workflowHelpers';
-import { showMessage } from '@/mixins/showMessage';
+import { useToast } from '@/composables/useToast';
 import TagsDropdown from '@/components/TagsDropdown.vue';
-import Modal from './Modal.vue';
-import { mapStores } from 'pinia';
-import { useSettingsStore } from '@/stores/settings';
-import { useWorkflowsStore } from '@/stores/workflows';
+import Modal from '@/components/Modal.vue';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
 import type { IWorkflowDataUpdate } from '@/Interface';
 import type { IPermissions } from '@/permissions';
 import { getWorkflowPermissions } from '@/permissions';
-import { useUsersStore } from '@/stores/users';
-import { createEventBus } from '@/event-bus';
-import { useCredentialsStore } from '@/stores';
+import { useUsersStore } from '@/stores/users.store';
+import { createEventBus } from 'n8n-design-system/utils';
+import { useCredentialsStore } from '@/stores/credentials.store';
+import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
+import { useRouter } from 'vue-router';
 
-export default mixins(showMessage, workflowHelpers).extend({
-	components: { TagsDropdown, Modal },
+export default defineComponent({
 	name: 'DuplicateWorkflow',
+	components: { TagsDropdown, Modal },
 	props: ['modalName', 'isActive', 'data'],
+	setup() {
+		const router = useRouter();
+		const workflowHelpers = useWorkflowHelpers({ router });
+
+		return {
+			...useToast(),
+			workflowHelpers,
+		};
+	},
 	data() {
 		const currentTagIds = this.data.tags;
 
@@ -85,7 +93,8 @@ export default mixins(showMessage, workflowHelpers).extend({
 	},
 	async mounted() {
 		this.name = await this.workflowsStore.getDuplicateCurrentWorkflowName(this.data.name);
-		this.$nextTick(() => this.focusOnNameInput());
+		await this.$nextTick();
+		this.focusOnNameInput();
 	},
 	computed: {
 		...mapStores(useCredentialsStore, useUsersStore, useSettingsStore, useWorkflowsStore),
@@ -117,7 +126,7 @@ export default mixins(showMessage, workflowHelpers).extend({
 		},
 		focusOnNameInput() {
 			const inputRef = this.$refs.nameInput as HTMLElement | undefined;
-			if (inputRef && inputRef.focus) {
+			if (inputRef?.focus) {
 				inputRef.focus();
 			}
 		},
@@ -128,13 +137,10 @@ export default mixins(showMessage, workflowHelpers).extend({
 			// revert last changes
 			this.currentTagIds = this.prevTagIds;
 		},
-		onTagsUpdate(tagIds: string[]) {
-			this.currentTagIds = tagIds;
-		},
 		async save(): Promise<void> {
 			const name = this.name.trim();
 			if (!name) {
-				this.$showMessage({
+				this.showMessage({
 					title: this.$locale.baseText('duplicateWorkflowDialog.errors.missingName.title'),
 					message: this.$locale.baseText('duplicateWorkflowDialog.errors.missingName.message'),
 					type: 'error',
@@ -154,13 +160,13 @@ export default mixins(showMessage, workflowHelpers).extend({
 						await this.workflowsStore.fetchWorkflow(this.data.id);
 					workflowToUpdate = workflow;
 
-					this.removeForeignCredentialsFromWorkflow(
+					this.workflowHelpers.removeForeignCredentialsFromWorkflow(
 						workflowToUpdate,
 						this.credentialsStore.allCredentials,
 					);
 				}
 
-				const saved = await this.saveAsNewWorkflow({
+				const saved = await this.workflowHelpers.saveAsNewWorkflow({
 					name,
 					data: workflowToUpdate,
 					tags: this.currentTagIds,
@@ -181,12 +187,12 @@ export default mixins(showMessage, workflowHelpers).extend({
 				if (error.httpStatusCode === 403) {
 					error.message = this.$locale.baseText('duplicateWorkflowDialog.errors.forbidden.message');
 
-					this.$showError(
+					this.showError(
 						error,
 						this.$locale.baseText('duplicateWorkflowDialog.errors.forbidden.title'),
 					);
 				} else {
-					this.$showError(
+					this.showError(
 						error,
 						this.$locale.baseText('duplicateWorkflowDialog.errors.generic.title'),
 					);
diff --git a/packages/editor-ui/src/components/EditTestSuiteModal.vue b/packages/editor-ui/src/components/EditTestSuiteModal.vue
new file mode 100644
index 0000000000000..ed13f89dfafbf
--- /dev/null
+++ b/packages/editor-ui/src/components/EditTestSuiteModal.vue
@@ -0,0 +1,239 @@
+<template>
+	<Modal
+		width="540px"
+		:name="EDIT_TEST_SUITE_MODAL_KEY"
+		:title="
+			$locale.baseText('testSuites.editTestSuite.title', {
+				interpolate: { name: data.name },
+			})
+		"
+		:event-bus="modalBus"
+		:center="true"
+		:before-close="onModalClose"
+		:show-close="!loading"
+	>
+		<template #content>
+			<div :class="[$style.formContainer]">
+				<N8nRadioButtons
+					:model-value="selectedType"
+					:options="[
+						{ label: $locale.baseText('parameterInput.test.error'), value: 'error' },
+						{ label: $locale.baseText('parameterInput.test.output'), value: 'data' },
+					]"
+					@update:model-value="onTypeSelected"
+				/>
+
+				<div :class="['mt-l']">
+					<n8n-input-label
+						v-if="selectedType === 'error'"
+						:class="$style.labelTooltip"
+						:label="$locale.baseText('testSuites.editTest.error.label')"
+					>
+						<n8n-input
+							v-model="error"
+							name="error"
+							type="text"
+							:placeholder="''"
+							:required="true"
+							:disabled="loading"
+						/>
+					</n8n-input-label>
+
+					<n8n-input-label
+						v-if="selectedType === 'data'"
+						:class="$style.labelTooltip"
+						:label="$locale.baseText('testSuites.editTest.output.label')"
+					>
+						<n8n-input
+							v-model="output"
+							name="output"
+							type="text"
+							:placeholder="''"
+							:required="true"
+							:disabled="loading"
+						/>
+					</n8n-input-label>
+				</div>
+				<div :class="[$style.infoText, 'mt-4xs']">
+					<span
+						size="small"
+						:class="[$style.infoText, infoTextErrorMessage ? $style.error : '']"
+						v-text="infoTextErrorMessage"
+					></span>
+				</div>
+			</div>
+		</template>
+		<template #footer>
+			<n8n-button
+				:loading="loading"
+				:disabled="disabled || loading"
+				:label="
+					loading
+						? $locale.baseText('testSuites.editTest.saveButton.label.loading')
+						: $locale.baseText('testSuites.editTest.saveButton.label')
+				"
+				size="large"
+				float="right"
+				@click="onSave"
+			/>
+		</template>
+	</Modal>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import Modal from './Modal.vue';
+import { EDIT_TEST_SUITE_MODAL_KEY } from '../constants';
+import { mapStores } from 'pinia';
+import { createEventBus } from 'n8n-design-system/utils';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useToast } from '@/composables/useToast';
+import type { NodeOutputDb } from '@/Interface';
+
+export default defineComponent({
+	name: 'EditTestSuiteModal',
+	components: {
+		Modal,
+	},
+	props: {
+		data: {
+			type: Object,
+			default: () => ({
+				name: '',
+			}),
+		},
+	},
+	setup() {
+		return {
+			...useToast(),
+		};
+	},
+	data() {
+		return {
+			loading: false,
+			modalBus: createEventBus(),
+			infoTextErrorMessage: '',
+			EDIT_TEST_SUITE_MODAL_KEY,
+			selectedType: '',
+			output: '',
+			error: '',
+			nodeOutputId: '',
+		};
+	},
+	computed: {
+		...mapStores(useWorkflowsStore),
+		disabled() {
+			if (!this.selectedType) {
+				return true;
+			}
+			if (this.selectedType === 'data' && !this.output) {
+				return true;
+			}
+			if (this.selectedType === 'error' && !this.error) {
+				return true;
+			}
+			return false;
+		},
+	},
+	mounted() {
+		this.nodeOutputId = this.data.nodeOutput.id;
+		this.output = this.data.nodeOutput.data || '';
+		this.error = this.data.nodeOutput.errorMessage || '';
+		this.selectedType = this.data.nodeOutput.outputType ?? 'data';
+	},
+	methods: {
+		onTypeSelected(selected: string) {
+			console.log({ selected });
+			this.selectedType = selected;
+		},
+		async onSave() {
+			try {
+				this.infoTextErrorMessage = '';
+				this.loading = true;
+				const basePayload = {
+					workflowTestId: this.$route.params.test as string,
+					nodeId: this.data.id,
+					outputType: this.selectedType as NodeOutputDb['outputType'],
+					errorMessage: this.error,
+					data: this.output,
+				};
+				if (this.nodeOutputId) {
+					await this.workflowsStore.updateWorkflowTestSuite({
+						id: this.nodeOutputId,
+						...basePayload,
+					});
+				} else {
+					await this.workflowsStore.createWorkflowTestSuite(basePayload);
+				}
+				this.loading = false;
+				this.modalBus.emit('close');
+				this.showMessage({
+					title: this.$locale.baseText('testSuites.editTest.saveButton.success'),
+					type: 'success',
+				});
+			} catch (error) {
+				if (error.httpStatusCode && error.httpStatusCode === 400) {
+					this.infoTextErrorMessage = error.message;
+				} else {
+					this.showError(error, this.$locale.baseText('testSuites.editTest.saveButton.error'));
+				}
+			} finally {
+				this.loading = false;
+			}
+		},
+		onModalClose() {
+			return !this.loading;
+		},
+	},
+});
+</script>
+
+<style module lang="scss">
+.descriptionContainer {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	border: var(--border-width-base) var(--border-style-base) var(--color-info-tint-1);
+	border-radius: var(--border-radius-base);
+	background-color: var(--color-background-light);
+	button {
+		& > span {
+			flex-direction: row-reverse;
+			& > span {
+				margin-left: var(--spacing-3xs);
+			}
+		}
+	}
+}
+.formContainer {
+	font-size: var(--font-size-2xs);
+	font-weight: var(--font-weight-regular);
+	color: var(--color-text-base);
+}
+.checkbox {
+	span:nth-child(2) {
+		vertical-align: text-top;
+	}
+}
+.error {
+	color: var(--color-danger);
+	span {
+		border-color: var(--color-danger);
+	}
+}
+</style>
+
+<style lang="scss">
+.el-tooltip__popper {
+	max-width: 240px;
+	img {
+		width: 100%;
+	}
+	p {
+		line-height: 1.2;
+	}
+	p + p {
+		margin-top: var(--spacing-2xs);
+	}
+}
+</style>
diff --git a/packages/editor-ui/src/components/EnterpriseEdition.ee.vue b/packages/editor-ui/src/components/EnterpriseEdition.ee.vue
index 5e73ce911a3d3..f2056a0b23b7e 100644
--- a/packages/editor-ui/src/components/EnterpriseEdition.ee.vue
+++ b/packages/editor-ui/src/components/EnterpriseEdition.ee.vue
@@ -1,7 +1,7 @@
 <template>
 	<div>
 		<slot v-if="canAccess" />
-		<slot name="fallback" v-else />
+		<slot v-else name="fallback" />
 	</div>
 </template>
 
@@ -9,7 +9,7 @@
 import { defineComponent } from 'vue';
 import type { EnterpriseEditionFeature } from '@/constants';
 import { mapStores } from 'pinia';
-import { useSettingsStore } from '@/stores/settings';
+import { useSettingsStore } from '@/stores/settings.store';
 
 export default defineComponent({
 	name: 'EnterpriseEdition',
diff --git a/packages/editor-ui/src/components/Error/NodeErrorView.vue b/packages/editor-ui/src/components/Error/NodeErrorView.vue
index 3386d4996923f..c992951efc757 100644
--- a/packages/editor-ui/src/components/Error/NodeErrorView.vue
+++ b/packages/editor-ui/src/components/Error/NodeErrorView.vue
@@ -1,333 +1,765 @@
+<script lang="ts" setup>
+import { useI18n } from '@/composables/useI18n';
+import type { PropType } from 'vue';
+import { computed } from 'vue';
+import { useClipboard } from '@/composables/useClipboard';
+import { useToast } from '@/composables/useToast';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import { useNDVStore } from '@/stores/ndv.store';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import type {
+	IDataObject,
+	INodeProperties,
+	INodePropertyCollection,
+	INodePropertyOptions,
+	NodeApiError,
+	NodeError,
+	NodeOperationError,
+} from 'n8n-workflow';
+import { sanitizeHtml } from '@/utils/htmlUtils';
+import { MAX_DISPLAY_DATA_SIZE } from '@/constants';
+import type { BaseTextKey } from '@/plugins/i18n';
+
+const props = defineProps({
+	error: {
+		type: Object as PropType<NodeError | NodeApiError | NodeOperationError>,
+		required: true,
+	},
+});
+
+const clipboard = useClipboard();
+const toast = useToast();
+const i18n = useI18n();
+
+const nodeTypesStore = useNodeTypesStore();
+const ndvStore = useNDVStore();
+const rootStore = useRootStore();
+
+const displayCause = computed(() => {
+	return JSON.stringify(props.error.cause).length < MAX_DISPLAY_DATA_SIZE;
+});
+
+const parameters = computed<INodeProperties[]>(() => {
+	const node = ndvStore.activeNode;
+	if (!node) {
+		return [];
+	}
+	const nodeType = nodeTypesStore.getNodeType(node.type, node.typeVersion);
+
+	if (nodeType === null) {
+		return [];
+	}
+
+	return nodeType.properties;
+});
+
+const n8nVersion = computed(() => {
+	const baseUrl = rootStore.urlBaseEditor;
+	let instanceType = 'Self Hosted';
+
+	if (baseUrl.includes('n8n.cloud')) {
+		instanceType = 'Cloud';
+	}
+
+	return rootStore.versionCli + ` (${instanceType})`;
+});
+
+const hasManyInputItems = computed(() => {
+	return ndvStore.ndvInputData.length > 1;
+});
+
+const nodeDefaultName = computed(() => {
+	const node = props.error?.node;
+	if (!node) {
+		return 'Node';
+	}
+
+	const nodeType = nodeTypesStore.getNodeType(node.type, node.typeVersion);
+	return nodeType?.defaults?.name || node.name;
+});
+
+const prepareRawMessages = computed(() => {
+	const returnData: Array<string | IDataObject> = [];
+	if (!props.error.messages?.length) {
+		return [];
+	}
+	const errorMessage = getErrorMessage();
+
+	Array.from(new Set(props.error.messages)).forEach((message) => {
+		const isParsable = /^\d{3} - \{/.test(message);
+		const parts = isParsable ? message.split(' - ').map((part) => part.trim()) : [];
+
+		//try to parse the message as JSON
+		for (const part of parts) {
+			try {
+				const parsed = JSON.parse(part);
+				if (typeof parsed === 'object') {
+					returnData.push(parsed);
+					return;
+				}
+			} catch (error) {}
+		}
+		//if message is the same as error message, do not include it
+		if (message === errorMessage) return;
+		returnData.push(message);
+	});
+	return returnData;
+});
+
+function nodeVersionTag(nodeType: NodeError['node']): string {
+	if (!nodeType || ('hidden' in nodeType && nodeType.hidden)) {
+		return i18n.baseText('nodeSettings.deprecated');
+	}
+
+	const latestNodeVersion = Math.max(...nodeTypesStore.getNodeVersions(nodeType.type));
+
+	if (latestNodeVersion === nodeType.typeVersion) {
+		return i18n.baseText('nodeSettings.latest');
+	}
+
+	return i18n.baseText('nodeSettings.latestVersion', {
+		interpolate: { version: latestNodeVersion.toString() },
+	});
+}
+
+function replacePlaceholders(parameter: string, message: string): string {
+	const parameterName = parameterDisplayName(parameter, false);
+	const parameterFullName = parameterDisplayName(parameter, true);
+	return message
+		.replace(/%%PARAMETER%%/g, parameterName)
+		.replace(/%%PARAMETER_FULL%%/g, parameterFullName);
+}
+
+function getErrorDescription(): string {
+	const isSubNodeError =
+		props.error.name === 'NodeOperationError' &&
+		(props.error as NodeOperationError).functionality === 'configuration-node';
+
+	if (isSubNodeError) {
+		return sanitizeHtml(
+			props.error.description +
+				i18n.baseText('pushConnection.executionError.openNode', {
+					interpolate: { node: props.error.node.name },
+				}),
+		);
+	}
+
+	if (props.error.context?.descriptionKey) {
+		const interpolate = {
+			nodeCause: props.error.context.nodeCause as string,
+			runIndex: (props.error.context.runIndex as string) ?? '0',
+			itemIndex: (props.error.context.itemIndex as string) ?? '0',
+		};
+		return sanitizeHtml(
+			i18n.baseText(
+				`nodeErrorView.description.${props.error.context.descriptionKey as string}` as BaseTextKey,
+				{ interpolate },
+			),
+		);
+	}
+
+	if (!props.error.context?.descriptionTemplate) {
+		return sanitizeHtml(props.error.description ?? '');
+	}
+
+	const parameterName = parameterDisplayName(props.error.context.parameter as string);
+	return sanitizeHtml(
+		(props.error.context.descriptionTemplate as string).replace(/%%PARAMETER%%/g, parameterName),
+	);
+}
+
+function addItemIndexSuffix(message: string): string {
+	let itemIndexSuffix = '';
+
+	const ITEM_INDEX_SUFFIX_TEXT = '[item ';
+
+	if (
+		hasManyInputItems.value &&
+		!message.includes(ITEM_INDEX_SUFFIX_TEXT) &&
+		props.error?.context?.itemIndex !== undefined
+	) {
+		itemIndexSuffix = ` [item ${props.error.context.itemIndex}]`;
+	}
+
+	return message + itemIndexSuffix;
+}
+
+function getErrorMessage(): string {
+	const baseErrorMessage = '';
+	let message = '';
+
+	const isSubNodeError =
+		props.error.name === 'NodeOperationError' &&
+		(props.error as NodeOperationError).functionality === 'configuration-node';
+
+	if (isSubNodeError) {
+		message = i18n.baseText('nodeErrorView.errorSubNode', {
+			interpolate: { node: props.error.node.name },
+		});
+	} else if (
+		props.error.message === props.error.description ||
+		!props.error.context?.messageTemplate
+	) {
+		message = baseErrorMessage + props.error.message;
+	} else {
+		const parameterName = parameterDisplayName(props.error.context.parameter as string);
+
+		message =
+			baseErrorMessage +
+			(props.error.context.messageTemplate as string).replace(/%%PARAMETER%%/g, parameterName);
+	}
+
+	return addItemIndexSuffix(message);
+}
+
+function parameterDisplayName(path: string, fullPath = true) {
+	try {
+		const params = parameterName(parameters.value, path.split('.'));
+		if (!params.length) {
+			throw new Error();
+		}
+
+		if (!fullPath) {
+			return params.pop()!.displayName;
+		}
+		return params.map((parameter) => parameter.displayName).join(' > ');
+	} catch (error) {
+		return `Could not find parameter "${path}"`;
+	}
+}
+
+function parameterName(
+	params: Array<INodePropertyOptions | INodeProperties | INodePropertyCollection>,
+	pathParts: string[],
+): Array<INodeProperties | INodePropertyCollection> {
+	let currentParameterName = pathParts.shift();
+
+	if (currentParameterName === undefined) {
+		return [];
+	}
+
+	const arrayMatch = currentParameterName.match(/(.*)\[([\d])\]$/);
+	if (arrayMatch !== null && arrayMatch.length > 0) {
+		currentParameterName = arrayMatch[1];
+	}
+	const currentParameter = params.find(
+		(parameter) => parameter.name === currentParameterName,
+	) as unknown as INodeProperties | INodePropertyCollection;
+
+	if (currentParameter === undefined) {
+		throw new Error(`Could not find parameter "${currentParameterName}"`);
+	}
+
+	if (pathParts.length === 0) {
+		return [currentParameter];
+	}
+
+	if (currentParameter.hasOwnProperty('options')) {
+		return [
+			currentParameter,
+			...parameterName((currentParameter as INodeProperties).options!, pathParts),
+		];
+	}
+
+	if (currentParameter.hasOwnProperty('values')) {
+		return [
+			currentParameter,
+			...parameterName((currentParameter as INodePropertyCollection).values, pathParts),
+		];
+	}
+
+	// We can not resolve any deeper so lets stop here and at least return hopefully something useful
+	return [currentParameter];
+}
+
+function copyErrorDetails() {
+	const error = props.error;
+
+	const errorInfo: IDataObject = {
+		errorMessage: getErrorMessage(),
+	};
+	if (error.description) {
+		errorInfo.errorDescription = error.description;
+	}
+
+	//add error details
+	const errorDetails: IDataObject = {};
+
+	if (error?.messages?.length) {
+		errorDetails.rawErrorMessage = error.messages;
+	}
+
+	if ('httpCode' in error && error.httpCode) {
+		errorDetails.httpCode = error.httpCode;
+	}
+
+	if (error.context && error.context.data) {
+		errorDetails.errorData = error.context.data;
+	}
+
+	if (error.extra) {
+		errorDetails.errorExtra = error.extra;
+	}
+
+	errorInfo.errorDetails = errorDetails;
+
+	//add n8n details
+	const n8nDetails: IDataObject = {};
+
+	if (error.node) {
+		n8nDetails.nodeName = error.node.name;
+		n8nDetails.nodeType = error.node.type;
+		n8nDetails.nodeVersion = error.node.typeVersion;
+
+		if (error.node?.parameters?.resource) {
+			n8nDetails.resource = error.node.parameters.resource;
+		}
+		if (error?.node?.parameters?.operation) {
+			n8nDetails.operation = error.node.parameters.operation;
+		}
+	}
+
+	if (error.context) {
+		if (error.context.itemIndex !== undefined) {
+			n8nDetails.itemIndex = error.context.itemIndex;
+		}
+
+		if (error.context.runIndex !== undefined) {
+			n8nDetails.runIndex = error.context.runIndex;
+		}
+
+		if (error.context.parameter !== undefined) {
+			n8nDetails.parameter = error.context.parameter;
+		}
+
+		if (error.context.causeDetailed) {
+			n8nDetails.causeDetailed = error.context.causeDetailed;
+		}
+	}
+
+	if (error.timestamp) {
+		n8nDetails.time = new Date(error.timestamp).toLocaleString();
+	}
+
+	n8nDetails.n8nVersion = n8nVersion.value;
+
+	n8nDetails.binaryDataMode = rootStore.binaryDataMode;
+
+	if (error.cause) {
+		n8nDetails.cause = error.cause;
+	}
+
+	n8nDetails.stackTrace = error.stack?.split('\n');
+
+	errorInfo.n8nDetails = n8nDetails;
+
+	void clipboard.copy(JSON.stringify(errorInfo, null, 2));
+	copySuccess();
+}
+
+function copySuccess() {
+	toast.showMessage({
+		title: i18n.baseText('nodeErrorView.showMessage.title'),
+		type: 'info',
+	});
+}
+</script>
+
 <template>
-	<div>
-		<div class="error-header">
-			<div class="error-message">{{ getErrorMessage() }}</div>
-			<div class="error-description" v-if="error.description" v-html="getErrorDescription()"></div>
+	<div class="node-error-view">
+		<div class="node-error-view__header">
+			<div class="node-error-view__header-message">
+				<div>
+					{{ getErrorMessage() }}
+				</div>
+			</div>
+			<div
+				v-if="error.description || error.context?.descriptionKey"
+				class="node-error-view__header-description"
+				v-html="getErrorDescription()"
+			></div>
 		</div>
-		<details>
-			<summary class="error-details__summary">
-				<font-awesome-icon class="error-details__icon" icon="angle-right" />
-				{{ $locale.baseText('nodeErrorView.details') }}
-			</summary>
-			<div class="error-details__content">
-				<div v-if="error.context && error.context.causeDetailed">
-					<el-card class="box-card" shadow="never">
-						<div>
-							{{ error.context.causeDetailed }}
+
+		<div class="node-error-view__info">
+			<div class="node-error-view__info-header">
+				<p class="node-error-view__info-title">
+					{{ i18n.baseText('nodeErrorView.details.title') }}
+				</p>
+				<n8n-tooltip
+					class="item"
+					:content="i18n.baseText('nodeErrorView.copyToClipboard.tooltip')"
+					placement="left"
+				>
+					<div class="copy-button">
+						<n8n-icon-button
+							icon="copy"
+							type="secondary"
+							size="mini"
+							text="true"
+							transparent-background="transparent"
+							@click="copyErrorDetails"
+						/>
+					</div>
+				</n8n-tooltip>
+			</div>
+
+			<div class="node-error-view__info-content">
+				<details
+					v-if="
+						('httpCode' in error && error.httpCode) ||
+						prepareRawMessages.length ||
+						error?.context?.data ||
+						error.extra
+					"
+					class="node-error-view__details"
+				>
+					<summary class="node-error-view__details-summary">
+						<font-awesome-icon class="node-error-view__details-icon" icon="angle-right" />
+						{{
+							i18n.baseText('nodeErrorView.details.from', {
+								interpolate: { node: `${nodeDefaultName}` },
+							})
+						}}
+					</summary>
+					<div class="node-error-view__details-content">
+						<div v-if="'httpCode' in error && error.httpCode" class="node-error-view__details-row">
+							<p class="node-error-view__details-label">
+								{{ i18n.baseText('nodeErrorView.errorCode') }}
+							</p>
+							<p class="node-error-view__details-value">
+								<code>{{ error.httpCode }}</code>
+							</p>
 						</div>
-					</el-card>
-				</div>
-				<div v-if="error.timestamp">
-					<el-card class="box-card" shadow="never">
-						<template #header>
-							<div class="clearfix box-card__title">
-								<span>{{ $locale.baseText('nodeErrorView.time') }}</span>
+						<div v-if="prepareRawMessages.length" class="node-error-view__details-row">
+							<p class="node-error-view__details-label">
+								{{ i18n.baseText('nodeErrorView.details.rawMessages') }}
+							</p>
+							<div class="node-error-view__details-value">
+								<div v-for="(msg, index) in prepareRawMessages" :key="index">
+									<pre><code>{{ msg }}</code></pre>
+								</div>
 							</div>
-						</template>
-						<div>
-							{{ new Date(error.timestamp).toLocaleString() }}
 						</div>
-					</el-card>
-				</div>
-				<div
-					v-if="error.context && error.context.itemIndex !== undefined"
-					class="el-card box-card is-never-shadow el-card__body"
-				>
-					<span class="error-details__summary"
-						>{{ $locale.baseText('nodeErrorView.itemIndex') }}:</span
-					>
-					{{ error.context.itemIndex }}
-					<span v-if="error.context.runIndex">
-						|
-						<span class="error-details__summary"
-							>{{ $locale.baseText('nodeErrorView.itemIndex') }}:</span
-						>
-						{{ error.context.runIndex }}
-					</span>
-					<span v-if="error.context.parameter">
-						|
-						<span class="error-details__summary"
-							>{{ $locale.baseText('nodeErrorView.inParameter') }}:</span
-						>
-						{{ parameterDisplayName(error.context.parameter) }}
-					</span>
-				</div>
-				<div v-if="error.httpCode">
-					<el-card class="box-card" shadow="never">
-						<template #header>
-							<div class="clearfix box-card__title">
-								<span>{{ $locale.baseText('nodeErrorView.httpCode') }}</span>
+						<div v-if="error?.context?.data" class="node-error-view__details-row">
+							<p class="node-error-view__details-label">
+								{{ i18n.baseText('nodeErrorView.details.errorData') }}
+							</p>
+							<div class="node-error-view__details-value">
+								<pre><code>{{ error.context.data }}</code></pre>
 							</div>
-						</template>
-						<div>
-							{{ error.httpCode }}
 						</div>
-					</el-card>
-				</div>
-				<div v-if="error.cause">
-					<el-card class="box-card" shadow="never">
-						<template #header>
-							<div class="clearfix box-card__title">
-								<span>{{ $locale.baseText('nodeErrorView.cause') }}</span>
-								<br />
-								<span class="box-card__subtitle">{{
-									$locale.baseText('nodeErrorView.dataBelowMayContain')
-								}}</span>
-							</div>
-						</template>
-						<div>
-							<div class="copy-button" v-if="displayCause">
-								<n8n-icon-button
-									@click="copyCause"
-									:title="$locale.baseText('nodeErrorView.copyToClipboard')"
-									icon="copy"
-								/>
+						<div v-if="error.extra" class="node-error-view__details-row">
+							<p class="node-error-view__details-label">
+								{{ i18n.baseText('nodeErrorView.details.errorExtra') }}
+							</p>
+							<div class="node-error-view__details-value">
+								<pre><code>{{ error.extra }}</code></pre>
 							</div>
-							<vue-json-pretty
-								v-if="displayCause"
-								:data="error.cause"
-								:deep="3"
-								:showLength="true"
-								selectableType="single"
-								path="error"
-								class="json-data"
-							/>
-							<span v-else>
-								<font-awesome-icon icon="info-circle" />{{
-									$locale.baseText('nodeErrorView.theErrorCauseIsTooLargeToBeDisplayed')
-								}}
-							</span>
 						</div>
-					</el-card>
-				</div>
-				<div v-if="error.stack">
-					<el-card class="box-card" shadow="never">
-						<template #header>
-							<div class="clearfix box-card__title">
-								<span>{{ $locale.baseText('nodeErrorView.stack') }}</span>
+						<div v-if="error.context && error.context.request" class="node-error-view__details-row">
+							<p class="node-error-view__details-label">
+								{{ i18n.baseText('nodeErrorView.details.request') }}
+							</p>
+							<div class="node-error-view__details-value">
+								<pre><code>{{ error.context.request }}</code></pre>
 							</div>
-						</template>
-						<div>
-							<pre><code>{{error.stack}}</code></pre>
 						</div>
-					</el-card>
-				</div>
-			</div>
-		</details>
-	</div>
-</template>
+					</div>
+				</details>
 
-<script lang="ts">
-//@ts-ignore
-import VueJsonPretty from 'vue-json-pretty';
-import { copyPaste } from '@/mixins/copyPaste';
-import { showMessage } from '@/mixins/showMessage';
-import mixins from 'vue-typed-mixins';
-import { MAX_DISPLAY_DATA_SIZE } from '@/constants';
-import { INodeUi } from '@/Interface';
-
-import type { INodeProperties, INodePropertyCollection, INodePropertyOptions } from 'n8n-workflow';
-import { sanitizeHtml } from '@/utils';
-import { mapStores } from 'pinia';
-import { useNDVStore } from '@/stores/ndv';
-import { useNodeTypesStore } from '@/stores/nodeTypes';
-
-export default mixins(copyPaste, showMessage).extend({
-	name: 'NodeErrorView',
-	props: ['error'],
-	components: {
-		VueJsonPretty,
-	},
-	computed: {
-		...mapStores(useNodeTypesStore, useNDVStore),
-		displayCause(): boolean {
-			return JSON.stringify(this.error.cause).length < MAX_DISPLAY_DATA_SIZE;
-		},
-		parameters(): INodeProperties[] {
-			const node = this.ndvStore.activeNode;
-			if (!node) {
-				return [];
-			}
-			const nodeType = this.nodeTypesStore.getNodeType(node.type, node.typeVersion);
+				<details class="node-error-view__details">
+					<summary class="node-error-view__details-summary">
+						<font-awesome-icon class="node-error-view__details-icon" icon="angle-right" />
+						{{ i18n.baseText('nodeErrorView.details.info') }}
+					</summary>
+					<div class="node-error-view__details-content">
+						<div
+							v-if="error.context && error.context.itemIndex !== undefined"
+							class="node-error-view__details-row"
+						>
+							<p class="node-error-view__details-label">
+								{{ i18n.baseText('nodeErrorView.itemIndex') }}
+							</p>
+							<p class="node-error-view__details-value">
+								<code>{{ error.context.itemIndex }}</code>
+							</p>
+						</div>
 
-			if (nodeType === null) {
-				return [];
-			}
+						<div
+							v-if="error.context && error.context.runIndex !== undefined"
+							class="node-error-view__details-row"
+						>
+							<p class="node-error-view__details-label">
+								{{ i18n.baseText('nodeErrorView.runIndex') }}
+							</p>
+							<p class="node-error-view__details-value">
+								<code>{{ error.context.runIndex }}</code>
+							</p>
+						</div>
 
-			return nodeType.properties;
-		},
-	},
-	methods: {
-		replacePlaceholders(parameter: string, message: string): string {
-			const parameterName = this.parameterDisplayName(parameter, false);
-			const parameterFullName = this.parameterDisplayName(parameter, true);
-			return message
-				.replace(/%%PARAMETER%%/g, parameterName)
-				.replace(/%%PARAMETER_FULL%%/g, parameterFullName);
-		},
-		getErrorDescription(): string {
-			if (!this.error.context || !this.error.context.descriptionTemplate) {
-				return sanitizeHtml(this.error.description);
-			}
+						<div
+							v-if="error.context && error.context.parameter !== undefined"
+							class="node-error-view__details-row"
+						>
+							<p class="node-error-view__details-label">
+								{{ i18n.baseText('nodeErrorView.inParameter') }}
+							</p>
+							<p class="node-error-view__details-value">
+								<code>{{ parameterDisplayName(`${error.context.parameter}`) }}</code>
+							</p>
+						</div>
 
-			const parameterName = this.parameterDisplayName(this.error.context.parameter);
-			return sanitizeHtml(
-				this.error.context.descriptionTemplate.replace(/%%PARAMETER%%/g, parameterName),
-			);
-		},
-		getErrorMessage(): string {
-			const baseErrorMessage = this.$locale.baseText('nodeErrorView.error') + ': ';
+						<div v-if="error.node && error.node.type" class="node-error-view__details-row">
+							<p class="node-error-view__details-label">
+								{{ i18n.baseText('nodeErrorView.details.nodeType') }}
+							</p>
+							<p class="node-error-view__details-value">
+								<code>{{ error.node.type }}</code>
+							</p>
+						</div>
 
-			if (!this.error.context || !this.error.context.messageTemplate) {
-				return baseErrorMessage + this.error.message;
-			}
+						<div v-if="error.node && error.node.typeVersion" class="node-error-view__details-row">
+							<p class="node-error-view__details-label">
+								{{ i18n.baseText('nodeErrorView.details.nodeVersion') }}
+							</p>
+							<p class="node-error-view__details-value">
+								<code>
+									<span>{{ error.node.typeVersion + ' ' }}</span>
+									<span>({{ nodeVersionTag(error.node) }})</span>
+								</code>
+							</p>
+						</div>
 
-			const parameterName = this.parameterDisplayName(this.error.context.parameter);
+						<div class="node-error-view__details-row">
+							<p class="node-error-view__details-label">
+								{{ i18n.baseText('nodeErrorView.details.n8nVersion') }}
+							</p>
+							<p class="node-error-view__details-value">
+								<code>{{ n8nVersion }}</code>
+							</p>
+						</div>
 
-			return (
-				baseErrorMessage +
-				this.error.context.messageTemplate.replace(/%%PARAMETER%%/g, parameterName)
-			);
-		},
-		parameterDisplayName(path: string, fullPath = true) {
-			try {
-				const parameters = this.parameterName(this.parameters, path.split('.'));
-				if (!parameters.length) {
-					throw new Error();
-				}
+						<div v-if="error.timestamp" class="node-error-view__details-row">
+							<p class="node-error-view__details-label">
+								{{ i18n.baseText('nodeErrorView.time') }}
+							</p>
+							<p class="node-error-view__details-value">
+								<code>{{ new Date(error.timestamp).toLocaleString() }}</code>
+							</p>
+						</div>
 
-				if (fullPath === false) {
-					return parameters.pop()!.displayName;
-				}
-				return parameters.map((parameter) => parameter.displayName).join(' > ');
-			} catch (error) {
-				return `Could not find parameter "${path}"`;
-			}
-		},
-		parameterName(
-			parameters: Array<INodePropertyOptions | INodeProperties | INodePropertyCollection>,
-			pathParts: string[],
-		): Array<INodeProperties | INodePropertyCollection> {
-			let currentParameterName = pathParts.shift();
-
-			if (currentParameterName === undefined) {
-				return [];
-			}
+						<div v-if="error.cause && displayCause" class="node-error-view__details-row">
+							<p class="node-error-view__details-label">
+								{{ i18n.baseText('nodeErrorView.details.errorCause') }}
+							</p>
 
-			const arrayMatch = currentParameterName.match(/(.*)\[([\d])\]$/);
-			if (arrayMatch !== null && arrayMatch.length > 0) {
-				currentParameterName = arrayMatch[1];
-			}
-			const currentParameter = parameters.find(
-				(parameter) => parameter.name === currentParameterName,
-			) as unknown as INodeProperties | INodePropertyCollection;
+							<pre class="node-error-view__details-value"><code>{{ error.cause }}</code></pre>
+						</div>
 
-			if (currentParameter === undefined) {
-				throw new Error(`Could not find parameter "${currentParameterName}"`);
-			}
+						<div
+							v-if="error.context && error.context.causeDetailed"
+							class="node-error-view__details-row"
+						>
+							<p class="node-error-view__details-label">
+								{{ i18n.baseText('nodeErrorView.details.causeDetailed') }}
+							</p>
 
-			if (pathParts.length === 0) {
-				return [currentParameter];
-			}
+							<pre
+								class="node-error-view__details-value"
+							><code>{{ error.context.causeDetailed }}</code></pre>
+						</div>
 
-			if (currentParameter.hasOwnProperty('options')) {
-				return [
-					currentParameter,
-					...this.parameterName((currentParameter as INodeProperties).options!, pathParts),
-				];
-			}
+						<div v-if="error.stack" class="node-error-view__details-row">
+							<p class="node-error-view__details-label">
+								{{ i18n.baseText('nodeErrorView.details.stackTrace') }}
+							</p>
+
+							<pre class="node-error-view__details-value"><code>{{ error.stack }}</code></pre>
+						</div>
+					</div>
+				</details>
+			</div>
+		</div>
+	</div>
+</template>
+
+<style lang="scss">
+.node-error-view {
+	&__header {
+		max-width: 960px;
+		margin: 0 auto var(--spacing-s) auto;
+		padding-bottom: var(--spacing-3xs);
+		background-color: var(--color-background-xlight);
+		border: 1px solid var(--color-foreground-base);
+		border-radius: var(--border-radius-large);
+	}
+
+	&__header-title {
+		padding: var(--spacing-2xs) var(--spacing-s);
+		border-bottom: 1px solid var(--color-danger-tint-1);
+		font-size: var(--font-size-3xs);
+		font-weight: var(--font-weight-bold);
+		background-color: var(--color-danger-tint-2);
+		border-radius: var(--border-radius-large) var(--border-radius-large) 0 0;
+		color: var(--color-danger);
+	}
+
+	&__header-message {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		gap: var(--spacing-xs);
+		padding: var(--spacing-xs) var(--spacing-s) var(--spacing-3xs) var(--spacing-s);
+		color: var(--color-ndv-output-error-message);
+		font-weight: var(--font-weight-bold);
+		font-size: var(--font-size-s);
+	}
+
+	&__header-description {
+		padding: 0 var(--spacing-s) var(--spacing-3xs) var(--spacing-s);
+		font-size: var(--font-size-xs);
+
+		ul {
+			padding: var(--spacing-s) 0;
+			padding-left: var(--spacing-l);
+		}
+
+		code {
+			font-size: var(--font-size-xs);
+			color: var(--color-text-base);
+			background: var(--color-background-base);
+			padding: var(--spacing-5xs);
+			border-radius: var(--border-radius-base);
+		}
+	}
+
+	&__debugging {
+		font-size: var(--font-size-s);
+
+		ul,
+		ol,
+		dl {
+			padding-left: var(--spacing-s);
+			margin-top: var(--spacing-2xs);
+			margin-bottom: var(--spacing-2xs);
+		}
 
-			if (currentParameter.hasOwnProperty('values')) {
-				return [
-					currentParameter,
-					...this.parameterName((currentParameter as INodePropertyCollection).values, pathParts),
-				];
+		pre {
+			padding: var(--spacing-s);
+			width: 100%;
+			overflow: auto;
+			background: var(--color-background-light);
+			code {
+				font-size: var(--font-size-s);
 			}
+		}
+	}
 
-			// We can not resolve any deeper so lets stop here and at least return hopefully something useful
-			return [currentParameter];
-		},
-		copyCause() {
-			this.copyToClipboard(JSON.stringify(this.error.cause));
-			this.copySuccess();
-		},
-		copySuccess() {
-			this.$showMessage({
-				title: this.$locale.baseText('nodeErrorView.showMessage.title'),
-				type: 'info',
-			});
-		},
-	},
-});
-</script>
+	&__feedback-toolbar {
+		display: flex;
+		align-items: center;
+		margin-top: var(--spacing-s);
+		padding-top: var(--spacing-3xs);
+		border-top: 1px solid var(--color-foreground-base);
+	}
 
-<style lang="scss">
-.error-header {
-	margin-bottom: 10px;
-}
+	&__feedback-button {
+		width: var(--spacing-2xl);
+		height: var(--spacing-2xl);
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
+		cursor: pointer;
+		&:hover {
+			color: var(--color-primary);
+		}
+	}
 
-.error-message {
-	color: #ff0000;
-	font-weight: bold;
-	font-size: 1.1rem;
-}
+	&__info {
+		max-width: 960px;
+		margin: 0 auto;
+		border: 1px solid var(--color-foreground-base);
+		border-radius: var(--border-radius-large);
+	}
 
-.error-description {
-	margin-top: 10px;
-	font-size: 1rem;
-}
+	&__info-header {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: var(--spacing-3xs) var(--spacing-3xs) var(--spacing-3xs) var(--spacing-s);
+		border-bottom: 1px solid var(--color-foreground-base);
+	}
 
-.error-details__summary {
-	font-weight: 600;
-	font-size: 16px;
-	cursor: pointer;
-	outline: none;
-}
+	&__info-title {
+		font-size: var(--font-size-2xs);
+		font-weight: var(--font-weight-bold);
+		color: var(--color-text-dark);
+	}
 
-.error-details__icon {
-	margin-right: 4px;
-}
+	&__info-content {
+		padding: var(--spacing-2xs) var(--spacing-s);
+	}
 
-details > summary {
-	list-style-type: none;
-}
+	&__details:not(:last-child) {
+		margin-bottom: var(--spacing-2xs);
+	}
 
-details > summary::-webkit-details-marker {
-	display: none;
-}
+	&__details[open] {
+		.node-error-view__details {
+			&-icon {
+				transform: rotate(90deg);
+				transition: transform 0.3s ease;
+			}
+		}
+	}
 
-details[open] {
-	.error-details__icon {
-		transform: rotate(90deg);
+	&__details-summary {
+		padding: var(--spacing-5xs) 0;
+		font-size: var(--font-size-2xs);
+		color: var(--color-text-dark);
+		cursor: pointer;
+		list-style-type: none;
+		outline: none;
 	}
-}
 
-.error-details__content {
-	margin-top: 15px;
-}
+	&__details-content {
+		padding: var(--spacing-2xs) var(--spacing-s);
+	}
 
-.el-divider__text {
-	background-color: var(--color-background-light);
-}
+	&__details-row {
+		display: flex;
+		padding: var(--spacing-4xs) 0;
+	}
 
-.box-card {
-	margin-top: 1em;
-	overflow: auto;
-}
+	&__details-row:not(:first-child) {
+		border-top: 1px solid var(--color-foreground-base);
+	}
 
-.box-card__title {
-	font-weight: 400;
-}
+	&__details-icon {
+		margin-right: var(--spacing-xs);
+	}
 
-.box-card__subtitle {
-	font-weight: 200;
-	font-style: italic;
-	font-size: 0.7rem;
-}
+	&__details-label {
+		flex-grow: 0;
+		flex-shrink: 0;
+		width: 120px;
+		color: var(--color-text);
+		font-size: var(--font-size-2xs);
+	}
+
+	&__details-value {
+		flex: 1;
+		overflow: hidden;
+		margin-right: auto;
+		color: var(--color-text);
+		font-size: var(--font-size-2xs);
+		word-wrap: break-word;
 
-.copy-button {
-	position: absolute;
-	right: 50px;
-	z-index: 1000;
+		code {
+			color: var(--color-json-string);
+			white-space: normal;
+			word-wrap: break-word;
+		}
+	}
 }
 </style>
diff --git a/packages/editor-ui/src/components/ExecutionFilter.vue b/packages/editor-ui/src/components/ExecutionFilter.vue
deleted file mode 100644
index 1f76ddf99f8e0..0000000000000
--- a/packages/editor-ui/src/components/ExecutionFilter.vue
+++ /dev/null
@@ -1,419 +0,0 @@
-<script lang="ts" setup>
-import { computed, reactive, onBeforeMount } from 'vue';
-import debounce from 'lodash/debounce';
-import type { PopoverPlacement } from 'element-ui/types/popover';
-import type {
-	ExecutionFilterType,
-	ExecutionFilterMetadata,
-	IWorkflowShortResponse,
-} from '@/Interface';
-import { i18n as locale } from '@/plugins/i18n';
-import TagsDropdown from '@/components/TagsDropdown.vue';
-import { getObjectKeys, isEmpty } from '@/utils';
-import { EnterpriseEditionFeature } from '@/constants';
-import { useSettingsStore } from '@/stores/settings';
-import { useUsageStore } from '@/stores/usage';
-import { useUIStore } from '@/stores/ui';
-
-export type ExecutionFilterProps = {
-	workflows?: IWorkflowShortResponse[];
-	popoverPlacement?: PopoverPlacement;
-};
-
-const DATE_TIME_MASK = 'yyyy-MM-dd HH:mm';
-
-const settingsStore = useSettingsStore();
-const usageStore = useUsageStore();
-const uiStore = useUIStore();
-const props = withDefaults(defineProps<ExecutionFilterProps>(), {
-	popoverPlacement: 'bottom',
-});
-const emit = defineEmits<{
-	(event: 'filterChanged', value: ExecutionFilterType): void;
-}>();
-const debouncedEmit = debounce(emit, 500);
-
-const isAdvancedExecutionFilterEnabled = computed(() =>
-	settingsStore.isEnterpriseFeatureEnabled(EnterpriseEditionFeature.AdvancedExecutionFilters),
-);
-const showTags = computed(() => false);
-
-const getDefaultFilter = (): ExecutionFilterType => ({
-	status: 'all',
-	workflowId: 'all',
-	tags: [],
-	startDate: '',
-	endDate: '',
-	metadata: [{ key: '', value: '' }],
-});
-const filter = reactive(getDefaultFilter());
-
-// Automatically set up v-models based on filter properties
-const vModel = reactive(
-	getObjectKeys(filter).reduce((acc, key) => {
-		acc[key] = computed({
-			get() {
-				return filter[key];
-			},
-			set(value) {
-				// TODO: find out what exactly is typechecker complaining about
-				// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-				// @ts-ignore
-				filter[key] = value;
-				emit('filterChanged', filter);
-			},
-		});
-		return acc;
-	}, {} as Record<keyof ExecutionFilterType, ReturnType<typeof computed>>),
-);
-
-const statuses = computed(() => [
-	{ id: 'all', name: locale.baseText('executionsList.anyStatus') },
-	{ id: 'error', name: locale.baseText('executionsList.error') },
-	{ id: 'canceled', name: locale.baseText('executionsList.canceled') },
-	{ id: 'running', name: locale.baseText('executionsList.running') },
-	{ id: 'success', name: locale.baseText('executionsList.success') },
-	{ id: 'waiting', name: locale.baseText('executionsList.waiting') },
-]);
-
-const countSelectedFilterProps = computed(() => {
-	let count = 0;
-	if (filter.status !== 'all') {
-		count++;
-	}
-	if (filter.workflowId !== 'all') {
-		count++;
-	}
-	if (!isEmpty(filter.tags)) {
-		count++;
-	}
-	if (!isEmpty(filter.metadata)) {
-		count++;
-	}
-	if (!!filter.startDate) {
-		count++;
-	}
-	if (!!filter.endDate) {
-		count++;
-	}
-	return count;
-});
-
-// vModel.metadata is a text input and needs a debounced emit to avoid too many requests
-// We use the :value and @input combo instead of v-model with this event listener
-const onFilterMetaChange = (index: number, prop: keyof ExecutionFilterMetadata, value: string) => {
-	if (!filter.metadata[index]) {
-		filter.metadata[index] = {
-			key: '',
-			value: '',
-		};
-	}
-	filter.metadata[index][prop] = value;
-	debouncedEmit('filterChanged', filter);
-};
-
-// Can't use v-model on TagsDropdown component and thus vModel.tags is useless
-// We just emit the updated filter
-const onTagsChange = (tags: string[]) => {
-	filter.tags = tags;
-	emit('filterChanged', filter);
-};
-
-const onFilterReset = () => {
-	Object.assign(filter, getDefaultFilter());
-	emit('filterChanged', filter);
-};
-
-const goToUpgrade = () => {
-	uiStore.goToUpgrade('custom-data-filter', 'upgrade-custom-data-filter');
-};
-
-onBeforeMount(() => {
-	emit('filterChanged', filter);
-});
-</script>
-<template>
-	<div :class="$style.filter">
-		<n8n-popover trigger="click" :placement="popoverPlacement">
-			<template #reference>
-				<n8n-button
-					icon="filter"
-					type="tertiary"
-					size="medium"
-					:active="!!countSelectedFilterProps"
-					data-test-id="executions-filter-button"
-				>
-					<n8n-badge
-						v-if="!!countSelectedFilterProps"
-						theme="primary"
-						class="mr-4xs"
-						data-test-id="execution-filter-badge"
-						>{{ countSelectedFilterProps }}</n8n-badge
-					>
-					{{ $locale.baseText('executionsList.filters') }}
-				</n8n-button>
-			</template>
-			<div data-test-id="execution-filter-form">
-				<div v-if="workflows?.length" :class="$style.group">
-					<label for="execution-filter-workflows">{{
-						$locale.baseText('workflows.heading')
-					}}</label>
-					<n8n-select
-						id="execution-filter-workflows"
-						v-model="vModel.workflowId"
-						:placeholder="$locale.baseText('executionsFilter.selectWorkflow')"
-						size="medium"
-						filterable
-						data-test-id="executions-filter-workflows-select"
-					>
-						<div class="ph-no-capture">
-							<n8n-option
-								v-for="item in workflows"
-								:key="item.id"
-								:label="item.name"
-								:value="item.id"
-							/>
-						</div>
-					</n8n-select>
-				</div>
-				<div v-if="showTags" :class="$style.group">
-					<label for="execution-filter-tags">{{
-						$locale.baseText('workflows.filters.tags')
-					}}</label>
-					<TagsDropdown
-						id="execution-filter-tags"
-						:placeholder="$locale.baseText('workflowOpen.filterWorkflows')"
-						:currentTagIds="filter.tags"
-						:createEnabled="false"
-						@update="onTagsChange"
-						data-test-id="executions-filter-tags-select"
-					/>
-				</div>
-				<div :class="$style.group">
-					<label for="execution-filter-status">{{
-						$locale.baseText('executionsList.status')
-					}}</label>
-					<n8n-select
-						id="execution-filter-status"
-						v-model="vModel.status"
-						:placeholder="$locale.baseText('executionsFilter.selectStatus')"
-						size="medium"
-						filterable
-						data-test-id="executions-filter-status-select"
-					>
-						<n8n-option
-							v-for="item in statuses"
-							:key="item.id"
-							:label="item.name"
-							:value="item.id"
-						/>
-					</n8n-select>
-				</div>
-				<div :class="$style.group">
-					<label for="execution-filter-start-date">{{
-						$locale.baseText('executionsFilter.start')
-					}}</label>
-					<div :class="$style.dates">
-						<el-date-picker
-							id="execution-filter-start-date"
-							type="datetime"
-							v-model="vModel.startDate"
-							:format="DATE_TIME_MASK"
-							:placeholder="$locale.baseText('executionsFilter.startDate')"
-							data-test-id="executions-filter-start-date-picker"
-						/>
-						<span :class="$style.divider">to</span>
-						<el-date-picker
-							id="execution-filter-end-date"
-							type="datetime"
-							v-model="vModel.endDate"
-							:format="DATE_TIME_MASK"
-							:placeholder="$locale.baseText('executionsFilter.endDate')"
-							data-test-id="executions-filter-end-date-picker"
-						/>
-					</div>
-				</div>
-				<div :class="$style.group">
-					<n8n-tooltip placement="right">
-						<template #content>
-							<i18n tag="span" path="executionsFilter.customData.docsTooltip">
-								<template #link>
-									<a
-										target="_blank"
-										href="https://docs.n8n.io/workflows/executions/custom-executions-data/"
-									>
-										{{ $locale.baseText('executionsFilter.customData.docsTooltip.link') }}
-									</a>
-								</template>
-							</i18n>
-						</template>
-						<span :class="$style.label">
-							{{ $locale.baseText('executionsFilter.savedData') }}
-							<n8n-icon :class="$style.tooltipIcon" icon="question-circle" size="small" />
-						</span>
-					</n8n-tooltip>
-					<div :class="$style.subGroup">
-						<label for="execution-filter-saved-data-key">{{
-							$locale.baseText('executionsFilter.savedDataKey')
-						}}</label>
-						<n8n-tooltip :disabled="isAdvancedExecutionFilterEnabled" placement="top">
-							<template #content>
-								<i18n tag="span" path="executionsFilter.customData.inputTooltip">
-									<template #link>
-										<a
-											href="#"
-											@click.prevent="goToUpgrade"
-											data-test-id="executions-filter-view-plans-link"
-											>{{ $locale.baseText('executionsFilter.customData.inputTooltip.link') }}</a
-										>
-									</template>
-								</i18n>
-							</template>
-							<n8n-input
-								id="execution-filter-saved-data-key"
-								name="execution-filter-saved-data-key"
-								type="text"
-								size="medium"
-								:disabled="!isAdvancedExecutionFilterEnabled"
-								:placeholder="$locale.baseText('executionsFilter.savedDataKeyPlaceholder')"
-								:value="filter.metadata[0]?.key"
-								@input="onFilterMetaChange(0, 'key', $event)"
-								data-test-id="execution-filter-saved-data-key-input"
-							/>
-						</n8n-tooltip>
-						<label for="execution-filter-saved-data-value">{{
-							$locale.baseText('executionsFilter.savedDataValue')
-						}}</label>
-						<n8n-tooltip :disabled="isAdvancedExecutionFilterEnabled" placement="top">
-							<template #content>
-								<i18n tag="span" path="executionsFilter.customData.inputTooltip">
-									<template #link>
-										<a href="#" @click.prevent="goToUpgrade">{{
-											$locale.baseText('executionsFilter.customData.inputTooltip.link')
-										}}</a>
-									</template>
-								</i18n>
-							</template>
-							<n8n-input
-								id="execution-filter-saved-data-value"
-								name="execution-filter-saved-data-value"
-								type="text"
-								size="medium"
-								:disabled="!isAdvancedExecutionFilterEnabled"
-								:placeholder="$locale.baseText('executionsFilter.savedDataValuePlaceholder')"
-								:value="filter.metadata[0]?.value"
-								@input="onFilterMetaChange(0, 'value', $event)"
-								data-test-id="execution-filter-saved-data-value-input"
-							/>
-						</n8n-tooltip>
-					</div>
-				</div>
-				<n8n-button
-					v-if="!!countSelectedFilterProps"
-					:class="$style.resetBtn"
-					@click="onFilterReset"
-					size="large"
-					text
-					data-test-id="executions-filter-reset-button"
-				>
-					{{ $locale.baseText('executionsFilter.reset') }}
-				</n8n-button>
-			</div>
-		</n8n-popover>
-	</div>
-</template>
-<style lang="scss" module>
-.filter {
-	display: inline-block;
-}
-
-.group {
-	label,
-	.label {
-		display: inline-block;
-		font-size: var(--font-size-2xs);
-		margin: var(--spacing-s) 0 var(--spacing-3xs);
-	}
-}
-
-.subGroup {
-	padding: 0 0 var(--spacing-xs) var(--spacing-s);
-
-	label,
-	.label {
-		font-size: var(--font-size-3xs);
-		margin: var(--spacing-4xs) 0 var(--spacing-4xs);
-	}
-}
-
-.dates {
-	display: flex;
-	border: 1px solid var(--color-foreground-base);
-	border-radius: var(--border-radius-base);
-	white-space: nowrap;
-	align-items: center;
-}
-
-.divider {
-	padding: 0 var(--spacing-m);
-	line-height: 100%;
-}
-
-.resetBtn {
-	padding: 0;
-	margin: var(--spacing-xs) 0 0;
-}
-
-.tooltipIcon {
-	color: var(--color-text-light);
-}
-</style>
-
-<style lang="scss" scoped>
-:deep(.el-date-editor) {
-	input {
-		height: 36px;
-		border: 0;
-		padding-right: 0;
-	}
-
-	.el-input__prefix {
-		color: var(--color-foreground-dark);
-	}
-
-	&:last-of-type {
-		input {
-			padding-left: 0;
-		}
-
-		.el-input__prefix {
-			display: none;
-		}
-	}
-}
-
-:deep(.el-select-dropdown.el-popper[x-placement^='bottom']) {
-	> .popper__arrow {
-		top: -6px;
-		left: 50%;
-		right: unset;
-		margin-bottom: 0;
-		margin-right: 3px;
-		border-left-width: 6px;
-		border-top-width: 0;
-		border-bottom-color: var(--border-color-light);
-		border-right-color: transparent;
-
-		&::after {
-			top: 1px;
-			left: unset;
-			bottom: unset;
-			margin-left: -6px;
-			border-left-width: 6px;
-			border-top-width: 0;
-			border-bottom-color: var(--color-foreground-xlight);
-			border-right-color: transparent;
-		}
-	}
-}
-</style>
diff --git a/packages/editor-ui/src/components/ExecutionTime.vue b/packages/editor-ui/src/components/ExecutionTime.vue
deleted file mode 100644
index 955467313b1ab..0000000000000
--- a/packages/editor-ui/src/components/ExecutionTime.vue
+++ /dev/null
@@ -1,54 +0,0 @@
-<template>
-	<span>
-		{{ time }}
-	</span>
-</template>
-
-<script lang="ts">
-import { genericHelpers } from '@/mixins/genericHelpers';
-
-import mixins from 'vue-typed-mixins';
-
-export default mixins(genericHelpers).extend({
-	name: 'ExecutionTime',
-	props: ['startTime'],
-	computed: {
-		time(): string {
-			if (!this.startTime) {
-				return '...';
-			}
-			const msPassed = this.nowTime - new Date(this.startTime).getTime();
-			return this.displayTimer(msPassed);
-		},
-	},
-	data() {
-		return {
-			nowTime: -1,
-			intervalTimer: null as null | NodeJS.Timeout,
-		};
-	},
-	mounted() {
-		this.setNow();
-		this.intervalTimer = setInterval(() => {
-			this.setNow();
-		}, 1000);
-	},
-	destroyed() {
-		// Make sure that the timer gets destroyed once no longer needed
-		if (this.intervalTimer !== null) {
-			clearInterval(this.intervalTimer);
-		}
-	},
-	methods: {
-		setNow() {
-			this.nowTime = new Date().getTime();
-		},
-	},
-});
-</script>
-
-<style lang="scss">
-// .data-display-wrapper {
-
-// }
-</style>
diff --git a/packages/editor-ui/src/components/ExecutionsList.vue b/packages/editor-ui/src/components/ExecutionsList.vue
deleted file mode 100644
index a26d349a40cb8..0000000000000
--- a/packages/editor-ui/src/components/ExecutionsList.vue
+++ /dev/null
@@ -1,1137 +0,0 @@
-<template>
-	<div :class="$style.execListWrapper">
-		<div :class="$style.execList">
-			<div :class="$style.execListHeader">
-				<n8n-heading tag="h1" size="2xlarge">{{ this.pageTitle }}</n8n-heading>
-				<div :class="$style.execListHeaderControls">
-					<el-checkbox
-						class="mr-xl"
-						v-model="autoRefresh"
-						@change="handleAutoRefreshToggle"
-						data-test-id="execution-auto-refresh-checkbox"
-					>
-						{{ $locale.baseText('executionsList.autoRefresh') }}
-					</el-checkbox>
-					<execution-filter :workflows="workflows" @filterChanged="onFilterChanged" />
-				</div>
-			</div>
-
-			<el-checkbox
-				v-if="allVisibleSelected && finishedExecutionsCount > 0"
-				:class="$style.selectAll"
-				:label="
-					$locale.baseText('executionsList.selectAll', {
-						adjustToNumber: finishedExecutionsCount,
-						interpolate: { executionNum: finishedExecutionsCount },
-					})
-				"
-				:value="allExistingSelected"
-				@change="handleCheckAllExistingChange"
-				data-test-id="select-all-executions-checkbox"
-			/>
-
-			<table :class="$style.execTable">
-				<thead>
-					<tr>
-						<th>
-							<el-checkbox
-								:value="allVisibleSelected"
-								@change="handleCheckAllVisibleChange"
-								:disabled="finishedExecutionsCount < 1"
-								label=""
-								data-test-id="select-visible-executions-checkbox"
-							/>
-						</th>
-						<th>{{ $locale.baseText('executionsList.name') }}</th>
-						<th>{{ $locale.baseText('executionsList.startedAt') }}</th>
-						<th>{{ $locale.baseText('executionsList.status') }}</th>
-						<th>{{ $locale.baseText('executionsList.id') }}</th>
-						<th></th>
-						<th></th>
-						<th></th>
-						<th></th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr
-						v-for="execution in combinedExecutions"
-						:key="execution.id"
-						:class="getRowClass(execution)"
-					>
-						<td>
-							<el-checkbox
-								v-if="execution.stoppedAt !== undefined && execution.id"
-								:value="selectedItems[execution.id] || allExistingSelected"
-								@change="handleCheckboxChanged(execution.id)"
-								label=""
-								data-test-id="select-execution-checkbox"
-							/>
-						</td>
-						<td>
-							<span class="ph-no-capture">{{
-								execution.workflowName || $locale.baseText('executionsList.unsavedWorkflow')
-							}}</span>
-						</td>
-						<td>
-							<span>{{ formatDate(execution.startedAt) }}</span>
-						</td>
-						<td>
-							<div :class="$style.statusColumn">
-								<span v-if="isRunning(execution)" :class="$style.spinner">
-									<font-awesome-icon icon="spinner" spin />
-								</span>
-								<i18n
-									v-if="!isWaitTillIndefinite(execution)"
-									:path="getStatusTextTranslationPath(execution)"
-								>
-									<template #status>
-										<span :class="$style.status">{{ getStatusText(execution) }}</span>
-									</template>
-									<template #time>
-										<span v-if="execution.waitTill">{{ formatDate(execution.waitTill) }}</span>
-										<span
-											v-else-if="execution.stoppedAt !== null && execution.stoppedAt !== undefined"
-										>
-											{{
-												displayTimer(
-													new Date(execution.stoppedAt).getTime() -
-														new Date(execution.startedAt).getTime(),
-													true,
-												)
-											}}
-										</span>
-										<execution-time v-else :start-time="execution.startedAt" />
-									</template>
-								</i18n>
-								<n8n-tooltip v-else placement="top">
-									<template #content>
-										<span>{{ getStatusTooltipText(execution) }}</span>
-									</template>
-									<span :class="$style.status">{{ getStatusText(execution) }}</span>
-								</n8n-tooltip>
-							</div>
-						</td>
-						<td>
-							<span v-if="execution.id">#{{ execution.id }}</span>
-							<span v-if="execution.retryOf !== undefined">
-								<br />
-								<small>
-									({{ $locale.baseText('executionsList.retryOf') }} #{{ execution.retryOf }})
-								</small>
-							</span>
-							<span v-else-if="execution.retrySuccessId !== undefined">
-								<br />
-								<small>
-									({{ $locale.baseText('executionsList.successRetry') }} #{{
-										execution.retrySuccessId
-									}})
-								</small>
-							</span>
-						</td>
-						<td>
-							<n8n-tooltip v-if="execution.mode === 'manual'" placement="top">
-								<template #content>
-									<span>{{ $locale.baseText('executionsList.test') }}</span>
-								</template>
-								<font-awesome-icon icon="flask" />
-							</n8n-tooltip>
-						</td>
-						<td>
-							<div :class="$style.buttonCell">
-								<n8n-button
-									v-if="execution.stoppedAt !== undefined && execution.id"
-									size="small"
-									outline
-									:label="$locale.baseText('executionsList.view')"
-									@click.stop="displayExecution(execution)"
-								/>
-							</div>
-						</td>
-						<td>
-							<div :class="$style.buttonCell">
-								<n8n-button
-									v-if="execution.stoppedAt === undefined || execution.waitTill"
-									size="small"
-									outline
-									:label="$locale.baseText('executionsList.stop')"
-									@click.stop="stopExecution(execution.id)"
-									:loading="stoppingExecutions.includes(execution.id)"
-								/>
-							</div>
-						</td>
-						<td>
-							<el-dropdown
-								v-if="!isRunning(execution)"
-								trigger="click"
-								@command="handleActionItemClick"
-							>
-								<span class="retry-button">
-									<n8n-icon-button
-										text
-										type="tertiary"
-										size="mini"
-										:title="$locale.baseText('executionsList.retryExecution')"
-										icon="ellipsis-v"
-									/>
-								</span>
-								<template #dropdown>
-									<el-dropdown-menu
-										:class="{
-											[$style.actions]: true,
-											[$style.deleteOnly]: !isExecutionRetriable(execution),
-										}"
-									>
-										<el-dropdown-item
-											v-if="isExecutionRetriable(execution)"
-											:class="$style.retryAction"
-											:command="{ command: 'currentlySaved', execution }"
-										>
-											{{ $locale.baseText('executionsList.retryWithCurrentlySavedWorkflow') }}
-										</el-dropdown-item>
-										<el-dropdown-item
-											v-if="isExecutionRetriable(execution)"
-											:class="$style.retryAction"
-											:command="{ command: 'original', execution }"
-										>
-											{{ $locale.baseText('executionsList.retryWithOriginalWorkflow') }}
-										</el-dropdown-item>
-										<el-dropdown-item
-											:class="$style.deleteAction"
-											:command="{ command: 'delete', execution }"
-										>
-											{{ $locale.baseText('generic.delete') }}
-										</el-dropdown-item>
-									</el-dropdown-menu>
-								</template>
-							</el-dropdown>
-						</td>
-					</tr>
-				</tbody>
-			</table>
-
-			<div
-				v-if="!combinedExecutions.length"
-				:class="$style.loadedAll"
-				data-test-id="execution-list-empty"
-			>
-				{{ $locale.baseText('executionsList.empty') }}
-			</div>
-			<div
-				:class="$style.loadMore"
-				v-else-if="
-					finishedExecutionsCount > finishedExecutions.length || finishedExecutionsCountEstimated
-				"
-			>
-				<n8n-button
-					icon="sync"
-					:title="$locale.baseText('executionsList.loadMore')"
-					:label="$locale.baseText('executionsList.loadMore')"
-					@click="loadMore()"
-					:loading="isDataLoading"
-					data-test-id="load-more-button"
-				/>
-			</div>
-			<div v-else :class="$style.loadedAll" data-test-id="execution-all-loaded">
-				{{ $locale.baseText('executionsList.loadedAll') }}
-			</div>
-		</div>
-		<div
-			v-if="numSelected > 0"
-			:class="$style.selectionOptions"
-			data-test-id="selected-executions-info"
-		>
-			<span>
-				{{
-					$locale.baseText('executionsList.selected', {
-						adjustToNumber: numSelected,
-						interpolate: { numSelected },
-					})
-				}}
-			</span>
-			<n8n-button
-				:label="$locale.baseText('generic.delete')"
-				type="tertiary"
-				@click="handleDeleteSelected"
-				data-test-id="delete-selected-button"
-			/>
-			<n8n-button
-				:label="$locale.baseText('executionsList.clearSelection')"
-				type="tertiary"
-				@click="handleClearSelection"
-				data-test-id="clear-selection-button"
-			/>
-		</div>
-	</div>
-</template>
-
-<script lang="ts">
-import Vue from 'vue';
-import ExecutionTime from '@/components/ExecutionTime.vue';
-import WorkflowActivator from '@/components/WorkflowActivator.vue';
-import ExecutionFilter from '@/components/ExecutionFilter.vue';
-import { externalHooks } from '@/mixins/externalHooks';
-import { VIEWS, WAIT_TIME_UNLIMITED } from '@/constants';
-import { genericHelpers } from '@/mixins/genericHelpers';
-import { executionHelpers } from '@/mixins/executionsHelpers';
-import { showMessage } from '@/mixins/showMessage';
-import type {
-	IExecutionsCurrentSummaryExtended,
-	IExecutionDeleteFilter,
-	IExecutionsListResponse,
-	IWorkflowShortResponse,
-	ExecutionFilterType,
-	ExecutionsQueryFilter,
-} from '@/Interface';
-import type { IExecutionsSummary, ExecutionStatus } from 'n8n-workflow';
-import { range as _range } from 'lodash-es';
-import mixins from 'vue-typed-mixins';
-import { mapStores } from 'pinia';
-import { useUIStore } from '@/stores/ui';
-import { useWorkflowsStore } from '@/stores/workflows';
-import { isEmpty, setPageTitle } from '@/utils';
-import { executionFilterToQueryFilter } from '@/utils/executionUtils';
-
-export default mixins(externalHooks, genericHelpers, executionHelpers, showMessage).extend({
-	name: 'ExecutionsList',
-	components: {
-		ExecutionTime,
-		WorkflowActivator,
-		ExecutionFilter,
-	},
-	data() {
-		return {
-			finishedExecutions: [] as IExecutionsSummary[],
-			finishedExecutionsCount: 0,
-			finishedExecutionsCountEstimated: false,
-
-			allVisibleSelected: false,
-			allExistingSelected: false,
-			autoRefresh: true,
-			autoRefreshInterval: undefined as undefined | NodeJS.Timer,
-
-			filter: {} as ExecutionFilterType,
-
-			isDataLoading: false,
-
-			requestItemsPerRequest: 10,
-
-			selectedItems: {} as { [key: string]: boolean },
-
-			stoppingExecutions: [] as string[],
-			workflows: [] as IWorkflowShortResponse[],
-		};
-	},
-	mounted() {
-		setPageTitle(`n8n - ${this.pageTitle}`);
-	},
-	async created() {
-		await this.loadWorkflows();
-		//await this.refreshData();
-		this.handleAutoRefreshToggle();
-
-		this.$externalHooks().run('executionsList.openDialog');
-		this.$telemetry.track('User opened Executions log', {
-			workflow_id: this.workflowsStore.workflowId,
-		});
-	},
-	beforeDestroy() {
-		if (this.autoRefreshInterval) {
-			clearInterval(this.autoRefreshInterval);
-			this.autoRefreshInterval = undefined;
-		}
-	},
-	computed: {
-		...mapStores(useUIStore, useWorkflowsStore),
-		activeExecutions(): IExecutionsCurrentSummaryExtended[] {
-			return this.workflowsStore.activeExecutions;
-		},
-		combinedExecutions(): IExecutionsSummary[] {
-			const returnData: IExecutionsSummary[] = [];
-
-			if (['all', 'running'].includes(this.filter.status)) {
-				returnData.push(...this.activeExecutions);
-			}
-			if (['all', 'error', 'success', 'waiting'].includes(this.filter.status)) {
-				returnData.push(...this.finishedExecutions);
-			}
-
-			return returnData.filter(
-				(execution) =>
-					this.filter.workflowId === 'all' || execution.workflowId === this.filter.workflowId,
-			);
-		},
-		numSelected(): number {
-			if (this.allExistingSelected) {
-				return this.finishedExecutionsCount;
-			}
-
-			return Object.keys(this.selectedItems).length;
-		},
-		workflowFilterCurrent(): ExecutionsQueryFilter {
-			const filter: ExecutionsQueryFilter = {};
-			if (this.filter.workflowId !== 'all') {
-				filter.workflowId = this.filter.workflowId;
-			}
-			return filter;
-		},
-		workflowFilterPast(): ExecutionsQueryFilter {
-			return executionFilterToQueryFilter(this.filter);
-		},
-		pageTitle() {
-			return this.$locale.baseText('executionsList.workflowExecutions');
-		},
-	},
-	methods: {
-		closeDialog() {
-			this.$emit('closeModal');
-		},
-		displayExecution(execution: IExecutionsSummary) {
-			const route = this.$router.resolve({
-				name: VIEWS.EXECUTION_PREVIEW,
-				params: { name: execution.workflowId, executionId: execution.id },
-			});
-			window.open(route.href, '_blank');
-		},
-		handleAutoRefreshToggle() {
-			if (this.autoRefreshInterval) {
-				// Clear any previously existing intervals (if any - there shouldn't)
-				clearInterval(this.autoRefreshInterval);
-				this.autoRefreshInterval = undefined;
-			}
-
-			if (this.autoRefresh) {
-				this.autoRefreshInterval = setInterval(() => this.loadAutoRefresh(), 4 * 1000); // refresh data every 4 secs
-			}
-		},
-		handleCheckAllExistingChange() {
-			this.allExistingSelected = !this.allExistingSelected;
-			this.allVisibleSelected = !this.allExistingSelected;
-			this.handleCheckAllVisibleChange();
-		},
-		handleCheckAllVisibleChange() {
-			this.allVisibleSelected = !this.allVisibleSelected;
-			if (!this.allVisibleSelected) {
-				this.allExistingSelected = false;
-				Vue.set(this, 'selectedItems', {});
-			} else {
-				this.selectAllVisibleExecutions();
-			}
-		},
-		handleCheckboxChanged(executionId: string) {
-			if (this.selectedItems[executionId]) {
-				Vue.delete(this.selectedItems, executionId);
-			} else {
-				Vue.set(this.selectedItems, executionId, true);
-			}
-			this.allVisibleSelected =
-				Object.keys(this.selectedItems).length === this.combinedExecutions.length;
-			this.allExistingSelected =
-				Object.keys(this.selectedItems).length === this.finishedExecutionsCount;
-		},
-		async handleDeleteSelected() {
-			const deleteExecutions = await this.confirmMessage(
-				this.$locale.baseText('executionsList.confirmMessage.message', {
-					interpolate: { numSelected: this.numSelected.toString() },
-				}),
-				this.$locale.baseText('executionsList.confirmMessage.headline'),
-				'warning',
-				this.$locale.baseText('executionsList.confirmMessage.confirmButtonText'),
-				this.$locale.baseText('executionsList.confirmMessage.cancelButtonText'),
-			);
-
-			if (!deleteExecutions) {
-				return;
-			}
-
-			this.isDataLoading = true;
-
-			const sendData: IExecutionDeleteFilter = {};
-			if (this.allExistingSelected) {
-				sendData.deleteBefore = this.finishedExecutions[0].startedAt as Date;
-			} else {
-				sendData.ids = Object.keys(this.selectedItems);
-			}
-
-			sendData.filters = this.workflowFilterPast;
-
-			try {
-				await this.workflowsStore.deleteExecutions(sendData);
-			} catch (error) {
-				this.isDataLoading = false;
-				this.$showError(
-					error,
-					this.$locale.baseText('executionsList.showError.handleDeleteSelected.title'),
-				);
-
-				return;
-			}
-			this.isDataLoading = false;
-
-			this.$showMessage({
-				title: this.$locale.baseText('executionsList.showMessage.handleDeleteSelected.title'),
-				type: 'success',
-			});
-
-			this.handleClearSelection();
-			this.refreshData();
-		},
-		handleClearSelection(): void {
-			this.allVisibleSelected = false;
-			this.allExistingSelected = false;
-			Vue.set(this, 'selectedItems', {});
-		},
-		onFilterChanged(filter: ExecutionFilterType) {
-			this.filter = filter;
-			this.refreshData();
-			this.handleClearSelection();
-		},
-		handleActionItemClick(commandData: { command: string; execution: IExecutionsSummary }) {
-			if (['currentlySaved', 'original'].includes(commandData.command)) {
-				let loadWorkflow = false;
-				if (commandData.command === 'currentlySaved') {
-					loadWorkflow = true;
-				}
-
-				this.retryExecution(commandData.execution, loadWorkflow);
-
-				this.$telemetry.track('User clicked retry execution button', {
-					workflow_id: this.workflowsStore.workflowId,
-					execution_id: commandData.execution.id,
-					retry_type: loadWorkflow ? 'current' : 'original',
-				});
-			}
-			if (commandData.command === 'delete') {
-				this.deleteExecution(commandData.execution);
-			}
-		},
-		getWorkflowName(workflowId: string): string | undefined {
-			return this.workflows.find((data) => data.id === workflowId)?.name;
-		},
-		async loadActiveExecutions(): Promise<void> {
-			const activeExecutions = isEmpty(this.workflowFilterCurrent.metadata)
-				? await this.workflowsStore.getCurrentExecutions(this.workflowFilterCurrent)
-				: [];
-			for (const activeExecution of activeExecutions) {
-				if (activeExecution.workflowId && !activeExecution.workflowName) {
-					activeExecution.workflowName = this.getWorkflowName(activeExecution.workflowId);
-				}
-			}
-
-			this.workflowsStore.activeExecutions = activeExecutions;
-			this.workflowsStore.addToCurrentExecutions(activeExecutions);
-		},
-		async loadAutoRefresh(): Promise<void> {
-			const filter: ExecutionsQueryFilter = this.workflowFilterPast;
-			// We cannot use firstId here as some executions finish out of order. Let's say
-			// You have execution ids 500 to 505 running.
-			// Suppose 504 finishes before 500, 501, 502 and 503.
-			// iF you use firstId, filtering id >= 504 you won't
-			// ever get ids 500, 501, 502 and 503 when they finish
-			const promises = [this.workflowsStore.getPastExecutions(filter, this.requestItemsPerRequest)];
-			if (isEmpty(filter.metadata)) {
-				promises.push(this.workflowsStore.getCurrentExecutions({}));
-			}
-
-			const results = await Promise.all(promises);
-
-			for (const activeExecution of results[1]) {
-				if (
-					activeExecution.workflowId !== undefined &&
-					activeExecution.workflowName === undefined
-				) {
-					activeExecution.workflowName = this.getWorkflowName(activeExecution.workflowId);
-				}
-			}
-
-			this.workflowsStore.activeExecutions = results[1];
-
-			// execution IDs are typed as string, int conversion is necessary so we can order.
-			const alreadyPresentExecutions = [...this.finishedExecutions];
-			const alreadyPresentExecutionIds = alreadyPresentExecutions.map((exec) =>
-				parseInt(exec.id, 10),
-			);
-			let lastId = 0;
-			const gaps = [] as number[];
-			for (let i = results[0].results.length - 1; i >= 0; i--) {
-				const currentItem = results[0].results[i];
-				const currentId = parseInt(currentItem.id, 10);
-				if (lastId !== 0 && !isNaN(currentId)) {
-					// We are doing this iteration to detect possible gaps.
-					// The gaps are used to remove executions that finished
-					// and were deleted from database but were displaying
-					// in this list while running.
-					if (currentId - lastId > 1) {
-						// We have some gaps.
-						const range = _range(lastId + 1, currentId);
-						gaps.push(...range);
-					}
-				}
-				lastId = parseInt(currentItem.id, 10) || 0;
-
-				// Check new results from end to start
-				// Add new items accordingly.
-				const executionIndex = alreadyPresentExecutionIds.indexOf(currentId);
-				if (executionIndex !== -1) {
-					// Execution that we received is already present.
-
-					if (
-						alreadyPresentExecutions[executionIndex].finished === false &&
-						currentItem.finished === true
-					) {
-						// Concurrency stuff. This might happen if the execution finishes
-						// prior to saving all information to database. Somewhat rare but
-						// With auto refresh and several executions, it happens sometimes.
-						// So we replace the execution data so it displays correctly.
-						alreadyPresentExecutions[executionIndex] = currentItem;
-					}
-
-					continue;
-				}
-
-				// Find the correct position to place this newcomer
-				let j;
-				for (j = alreadyPresentExecutions.length - 1; j >= 0; j--) {
-					if (currentId < parseInt(alreadyPresentExecutions[j].id, 10)) {
-						alreadyPresentExecutions.splice(j + 1, 0, currentItem);
-						break;
-					}
-				}
-				if (j === -1) {
-					alreadyPresentExecutions.unshift(currentItem);
-				}
-			}
-			const alreadyPresentExecutionsFiltered = alreadyPresentExecutions.filter(
-				(execution) =>
-					!gaps.includes(parseInt(execution.id, 10)) && lastId >= parseInt(execution.id, 10),
-			);
-			this.finishedExecutionsCount = results[0].count;
-			this.finishedExecutionsCountEstimated = results[0].estimated;
-
-			Vue.set(this, 'finishedExecutions', alreadyPresentExecutionsFiltered);
-			this.workflowsStore.addToCurrentExecutions(alreadyPresentExecutionsFiltered);
-
-			this.adjustSelectionAfterMoreItemsLoaded();
-		},
-		async loadFinishedExecutions(): Promise<void> {
-			if (this.filter.status === 'running') {
-				this.finishedExecutions = [];
-				this.finishedExecutionsCount = 0;
-				this.finishedExecutionsCountEstimated = false;
-				return;
-			}
-			const data = await this.workflowsStore.getPastExecutions(
-				this.workflowFilterPast,
-				this.requestItemsPerRequest,
-			);
-			this.finishedExecutions = data.results;
-			this.finishedExecutionsCount = data.count;
-			this.finishedExecutionsCountEstimated = data.estimated;
-
-			this.workflowsStore.addToCurrentExecutions(data.results);
-
-			if (this.finishedExecutions.length === 0) {
-				this.handleClearSelection();
-			}
-		},
-		async loadMore() {
-			if (this.filter.status === 'running') {
-				return;
-			}
-
-			this.isDataLoading = true;
-
-			const filter = this.workflowFilterPast;
-			let lastId: string | undefined;
-
-			if (this.finishedExecutions.length !== 0) {
-				const lastItem = this.finishedExecutions.slice(-1)[0];
-				lastId = lastItem.id;
-			}
-
-			let data: IExecutionsListResponse;
-			try {
-				data = await this.workflowsStore.getPastExecutions(
-					filter,
-					this.requestItemsPerRequest,
-					lastId,
-				);
-			} catch (error) {
-				this.isDataLoading = false;
-				this.$showError(error, this.$locale.baseText('executionsList.showError.loadMore.title'));
-				return;
-			}
-
-			data.results = data.results.map((execution) => {
-				// @ts-ignore
-				return { ...execution, mode: execution.mode };
-			});
-
-			this.finishedExecutions.push(...data.results);
-			this.finishedExecutionsCount = data.count;
-			this.finishedExecutionsCountEstimated = data.estimated;
-
-			this.isDataLoading = false;
-
-			this.workflowsStore.addToCurrentExecutions(data.results);
-
-			this.adjustSelectionAfterMoreItemsLoaded();
-		},
-		async loadWorkflows() {
-			try {
-				const workflows = await this.workflowsStore.fetchAllWorkflows();
-				workflows.sort((a, b) => {
-					if (a.name.toLowerCase() < b.name.toLowerCase()) {
-						return -1;
-					}
-					if (a.name.toLowerCase() > b.name.toLowerCase()) {
-						return 1;
-					}
-					return 0;
-				});
-
-				// @ts-ignore
-				workflows.unshift({
-					id: 'all',
-					name: this.$locale.baseText('executionsList.allWorkflows'),
-				});
-
-				Vue.set(this, 'workflows', workflows);
-			} catch (error) {
-				this.$showError(
-					error,
-					this.$locale.baseText('executionsList.showError.loadWorkflows.title'),
-				);
-			}
-		},
-		async retryExecution(execution: IExecutionsSummary, loadWorkflow?: boolean) {
-			this.isDataLoading = true;
-
-			try {
-				const retrySuccessful = await this.workflowsStore.retryExecution(
-					execution.id,
-					loadWorkflow,
-				);
-
-				if (retrySuccessful) {
-					this.$showMessage({
-						title: this.$locale.baseText('executionsList.showMessage.retrySuccessfulTrue.title'),
-						type: 'success',
-					});
-				} else {
-					this.$showMessage({
-						title: this.$locale.baseText('executionsList.showMessage.retrySuccessfulFalse.title'),
-						type: 'error',
-					});
-				}
-
-				this.isDataLoading = false;
-			} catch (error) {
-				this.$showError(
-					error,
-					this.$locale.baseText('executionsList.showError.retryExecution.title'),
-				);
-
-				this.isDataLoading = false;
-			}
-		},
-		async refreshData() {
-			this.isDataLoading = true;
-
-			try {
-				await Promise.all([this.loadActiveExecutions(), this.loadFinishedExecutions()]);
-			} catch (error) {
-				this.$showError(error, this.$locale.baseText('executionsList.showError.refreshData.title'));
-			}
-
-			this.isDataLoading = false;
-		},
-		getStatus(execution: IExecutionsSummary): ExecutionStatus {
-			if (execution.status) {
-				return execution.status;
-			} else {
-				// this should not happen but just in case
-				let status: ExecutionStatus = 'unknown';
-				if (execution.waitTill) {
-					status = 'waiting';
-				} else if (execution.stoppedAt === undefined) {
-					status = 'running';
-				} else if (execution.finished) {
-					status = 'success';
-				} else if (execution.stoppedAt !== null) {
-					status = 'failed';
-				} else {
-					status = 'unknown';
-				}
-				return status;
-			}
-		},
-		getRowClass(execution: IExecutionsSummary): string {
-			return [this.$style.execRow, this.$style[this.getStatus(execution)]].join(' ');
-		},
-		getStatusText(entry: IExecutionsSummary): string {
-			const status = this.getStatus(entry);
-			let text = '';
-
-			if (status === 'waiting') {
-				text = this.$locale.baseText('executionsList.waiting');
-			} else if (status === 'canceled') {
-				text = this.$locale.baseText('executionsList.canceled');
-			} else if (status === 'crashed') {
-				text = this.$locale.baseText('executionsList.error');
-			} else if (status === 'new') {
-				text = this.$locale.baseText('executionsList.running');
-			} else if (status === 'running') {
-				text = this.$locale.baseText('executionsList.running');
-			} else if (status === 'success') {
-				text = this.$locale.baseText('executionsList.succeeded');
-			} else if (status === 'failed') {
-				text = this.$locale.baseText('executionsList.error');
-			} else {
-				text = this.$locale.baseText('executionsList.unknown');
-			}
-
-			return text;
-		},
-		getStatusTextTranslationPath(entry: IExecutionsSummary): string {
-			const status = this.getStatus(entry);
-			let path = '';
-
-			if (status === 'waiting') {
-				path = 'executionsList.statusWaiting';
-			} else if (status === 'canceled') {
-				path = 'executionsList.statusCanceled';
-			} else if (status === 'crashed') {
-				path = 'executionsList.statusText';
-			} else if (status === 'new') {
-				path = 'executionsList.statusRunning';
-			} else if (status === 'running') {
-				path = 'executionsList.statusRunning';
-			} else if (status === 'success') {
-				path = 'executionsList.statusText';
-			} else if (status === 'failed') {
-				path = 'executionsList.statusText';
-			} else {
-				path = 'executionsList.statusUnknown';
-			}
-
-			return path;
-		},
-		getStatusTooltipText(entry: IExecutionsSummary): string {
-			const status = this.getStatus(entry);
-			let text = '';
-
-			if (status === 'waiting' && this.isWaitTillIndefinite(entry)) {
-				text = this.$locale.baseText(
-					'executionsList.statusTooltipText.theWorkflowIsWaitingIndefinitely',
-				);
-			}
-
-			return text;
-		},
-		async stopExecution(activeExecutionId: string) {
-			try {
-				// Add it to the list of currently stopping executions that we
-				// can show the user in the UI that it is in progress
-				this.stoppingExecutions.push(activeExecutionId);
-
-				await this.workflowsStore.stopCurrentExecution(activeExecutionId);
-
-				// Remove it from the list of currently stopping executions
-				const index = this.stoppingExecutions.indexOf(activeExecutionId);
-				this.stoppingExecutions.splice(index, 1);
-
-				this.$showMessage({
-					title: this.$locale.baseText('executionsList.showMessage.stopExecution.title'),
-					message: this.$locale.baseText('executionsList.showMessage.stopExecution.message', {
-						interpolate: { activeExecutionId },
-					}),
-					type: 'success',
-				});
-
-				this.refreshData();
-			} catch (error) {
-				this.$showError(
-					error,
-					this.$locale.baseText('executionsList.showError.stopExecution.title'),
-				);
-			}
-		},
-		isExecutionRetriable(execution: IExecutionsSummary): boolean {
-			return (
-				execution.stoppedAt !== undefined &&
-				!execution.finished &&
-				execution.retryOf === undefined &&
-				execution.retrySuccessId === undefined &&
-				!execution.waitTill
-			);
-		},
-		async deleteExecution(execution: IExecutionsSummary) {
-			this.isDataLoading = true;
-			try {
-				await this.workflowsStore.deleteExecutions({ ids: [execution.id] });
-				await this.refreshData();
-
-				if (this.allVisibleSelected) {
-					Vue.set(this, 'selectedItems', {});
-					this.selectAllVisibleExecutions();
-				}
-			} catch (error) {
-				this.$showError(
-					error,
-					this.$locale.baseText('executionsList.showError.handleDeleteSelected.title'),
-				);
-			}
-			this.isDataLoading = true;
-		},
-		isWaitTillIndefinite(execution: IExecutionsSummary): boolean {
-			if (!execution.waitTill) {
-				return false;
-			}
-			return new Date(execution.waitTill).toISOString() === WAIT_TIME_UNLIMITED;
-		},
-		isRunning(execution: IExecutionsSummary): boolean {
-			return this.getStatus(execution) === 'running';
-		},
-		selectAllVisibleExecutions() {
-			this.combinedExecutions.forEach((execution: IExecutionsSummary) => {
-				Vue.set(this.selectedItems, execution.id, true);
-			});
-		},
-		adjustSelectionAfterMoreItemsLoaded() {
-			if (this.allExistingSelected) {
-				this.allVisibleSelected = true;
-				this.selectAllVisibleExecutions();
-			}
-		},
-	},
-});
-</script>
-
-<style module lang="scss">
-.execListWrapper {
-	display: grid;
-	grid-template-rows: 1fr 0;
-	position: relative;
-	height: 100%;
-	width: 100%;
-	max-width: 1280px;
-}
-
-.execList {
-	position: relative;
-	height: 100%;
-	overflow: auto;
-	padding: var(--spacing-l) var(--spacing-l) 0;
-	@media (min-width: 1200px) {
-		padding: var(--spacing-2xl) var(--spacing-2xl) 0;
-	}
-}
-
-.execListHeader {
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	margin-bottom: var(--spacing-s);
-}
-
-.execListHeaderControls {
-	display: flex;
-	align-items: center;
-	justify-content: flex-end;
-}
-
-.selectionOptions {
-	display: flex;
-	align-items: center;
-	position: absolute;
-	padding: var(--spacing-2xs);
-	z-index: 2;
-	left: 50%;
-	transform: translateX(-50%);
-	bottom: var(--spacing-3xl);
-	background: var(--color-background-dark);
-	border-radius: var(--border-radius-base);
-	color: var(--color-text-xlight);
-	font-size: var(--font-size-2xs);
-
-	button {
-		margin-left: var(--spacing-2xs);
-	}
-}
-
-.statusColumn {
-	display: flex;
-	align-items: center;
-}
-
-.spinner {
-	margin-right: var(--spacing-2xs);
-}
-
-.status {
-	line-height: 22.6px;
-	text-align: center;
-	font-size: var(--font-size-s);
-	font-weight: var(--font-weight-bold);
-
-	.crashed &,
-	.failed & {
-		color: var(--color-danger);
-	}
-
-	.waiting & {
-		color: var(--color-secondary);
-	}
-
-	.success & {
-		font-weight: var(--font-weight-normal);
-	}
-
-	.new &,
-	.running & {
-		color: var(--color-warning);
-	}
-
-	.unknown & {
-		color: var(--color-background-dark);
-	}
-}
-
-.buttonCell {
-	overflow: hidden;
-
-	button {
-		transform: translateX(1000%);
-		transition: transform 0s;
-
-		&:focus-visible,
-		.execRow:hover & {
-			transform: translateX(0);
-		}
-	}
-}
-
-.execTable {
-	/*
-	  Table height needs to be set to 0 in order to use height 100% for elements in table cells
-	*/
-	height: 0;
-	width: 100%;
-	text-align: left;
-	font-size: var(--font-size-s);
-
-	thead th {
-		position: sticky;
-		top: calc(var(--spacing-3xl) * -1);
-		z-index: 2;
-		padding: var(--spacing-s) var(--spacing-s) var(--spacing-s) 0;
-		background: var(--color-background-base);
-
-		&:first-child {
-			padding-left: var(--spacing-s);
-		}
-	}
-
-	th,
-	td {
-		height: 100%;
-		padding: var(--spacing-s) var(--spacing-s) var(--spacing-s) 0;
-		background: var(--color-background-xlight);
-
-		&:not(:first-child, :nth-last-child(-n + 3)) {
-			width: 100%;
-		}
-
-		&:nth-last-child(-n + 2) {
-			padding-left: 0;
-		}
-
-		@media (min-width: $breakpoint-sm) {
-			&:not(:nth-child(2)) {
-				&,
-				div,
-				span {
-					white-space: nowrap;
-				}
-			}
-		}
-	}
-
-	.execRow {
-		color: var(--color-text-base);
-
-		td:first-child {
-			width: 30px;
-			padding: 0 var(--spacing-s) 0 0;
-
-			/*
-			  This is needed instead of table cell border because they are overlapping the sticky header
-			*/
-			&::before {
-				content: '';
-				display: inline-block;
-				width: var(--spacing-4xs);
-				height: 100%;
-				vertical-align: middle;
-				margin-right: var(--spacing-xs);
-			}
-		}
-
-		&:nth-child(even) td {
-			background: var(--color-background-light);
-		}
-
-		&:hover td {
-			background: var(--color-primary-tint-3);
-		}
-
-		&.crashed td:first-child::before,
-		&.failed td:first-child::before {
-			background: hsl(var(--color-danger-h), 94%, 80%);
-		}
-
-		&.success td:first-child::before {
-			background: hsl(var(--color-success-h), 60%, 70%);
-		}
-
-		&.new td:first-child::before,
-		&.running td:first-child::before {
-			background: hsl(var(--color-warning-h), 94%, 80%);
-		}
-
-		&.waiting td:first-child::before {
-			background: hsl(var(--color-secondary-h), 94%, 80%);
-		}
-
-		&.unknown td:first-child::before {
-			background: var(--color-text-light);
-		}
-	}
-}
-
-.loadMore {
-	margin: var(--spacing-m) 0;
-	width: 100%;
-	text-align: center;
-}
-
-.loadedAll {
-	text-align: center;
-	font-size: var(--font-size-s);
-	margin: var(--spacing-l) 0;
-}
-
-.actions.deleteOnly {
-	padding: 0;
-}
-
-.retryAction + .deleteAction {
-	border-top: 1px solid var(--color-foreground-light);
-}
-
-.selectAll {
-	display: inline-block;
-	margin: 0 0 var(--spacing-s) var(--spacing-s);
-	color: var(--color-danger);
-}
-</style>
diff --git a/packages/editor-ui/src/components/ExecutionsModal.vue b/packages/editor-ui/src/components/ExecutionsModal.vue
deleted file mode 100644
index e30fd2b01201c..0000000000000
--- a/packages/editor-ui/src/components/ExecutionsModal.vue
+++ /dev/null
@@ -1,34 +0,0 @@
-<template>
-	<Modal :name="EXECUTIONS_MODAL_KEY" width="80%" :eventBus="modalBus">
-		<template #content>
-			<ExecutionsList @closeModal="onCloseModal" />
-		</template>
-	</Modal>
-</template>
-
-<script lang="ts">
-import { defineComponent } from 'vue';
-import ExecutionsList from '@/components/ExecutionsList.vue';
-import Modal from '@/components/Modal.vue';
-import { EXECUTIONS_MODAL_KEY } from '@/constants';
-import { createEventBus } from '@/event-bus';
-
-export default defineComponent({
-	name: 'ExecutionsModal',
-	components: {
-		Modal,
-		ExecutionsList,
-	},
-	data() {
-		return {
-			modalBus: createEventBus(),
-			EXECUTIONS_MODAL_KEY,
-		};
-	},
-	methods: {
-		onCloseModal() {
-			this.modalBus.emit('close');
-		},
-	},
-});
-</script>
diff --git a/packages/editor-ui/src/components/ExecutionsView/ExecutionCard.vue b/packages/editor-ui/src/components/ExecutionsView/ExecutionCard.vue
deleted file mode 100644
index 7778795f91c2e..0000000000000
--- a/packages/editor-ui/src/components/ExecutionsView/ExecutionCard.vue
+++ /dev/null
@@ -1,267 +0,0 @@
-<template>
-	<div
-		:class="{
-			['execution-card']: true,
-			[$style.executionCard]: true,
-			[$style.active]: isActive,
-			[$style[executionUIDetails.name]]: true,
-			[$style.highlight]: highlight,
-			[$style.showGap]: showGap,
-		}"
-	>
-		<router-link
-			:class="$style.executionLink"
-			:to="{
-				name: VIEWS.EXECUTION_PREVIEW,
-				params: { workflowId: currentWorkflow, executionId: execution.id },
-			}"
-			:data-test-execution-status="executionUIDetails.name"
-		>
-			<div :class="$style.description">
-				<n8n-text color="text-dark" :bold="true" size="medium" data-test-id="execution-time">
-					{{ executionUIDetails.startTime }}
-				</n8n-text>
-				<div :class="$style.executionStatus">
-					<n8n-spinner
-						v-if="executionUIDetails.name === 'running'"
-						size="small"
-						:class="[$style.spinner, 'mr-4xs']"
-					/>
-					<n8n-text :class="$style.statusLabel" size="small">{{
-						executionUIDetails.label
-					}}</n8n-text>
-					<n8n-text
-						v-if="executionUIDetails.name === 'running'"
-						:color="isActive ? 'text-dark' : 'text-base'"
-						size="small"
-					>
-						{{ $locale.baseText('executionDetails.runningTimeRunning') }}
-						<execution-time :start-time="execution.startedAt" />
-					</n8n-text>
-					<n8n-text
-						v-else-if="executionUIDetails.runningTime !== ''"
-						:color="isActive ? 'text-dark' : 'text-base'"
-						size="small"
-					>
-						{{
-							$locale.baseText('executionDetails.runningTimeFinished', {
-								interpolate: { time: executionUIDetails?.runningTime },
-							})
-						}}
-					</n8n-text>
-				</div>
-				<div v-if="execution.mode === 'retry'">
-					<n8n-text :color="isActive ? 'text-dark' : 'text-base'" size="small">
-						{{ $locale.baseText('executionDetails.retry') }} #{{ execution.retryOf }}
-					</n8n-text>
-				</div>
-			</div>
-			<div :class="$style.icons">
-				<n8n-action-dropdown
-					v-if="executionUIDetails.name === 'error'"
-					:class="[$style.icon, $style.retry]"
-					:items="retryExecutionActions"
-					activatorIcon="redo"
-					data-test-id="retry-execution-button"
-					@select="onRetryMenuItemSelect"
-				/>
-				<n8n-tooltip v-if="execution.mode === 'manual'" placement="top">
-					<template #content>
-						<span>{{ $locale.baseText('executionsList.test') }}</span>
-					</template>
-					<font-awesome-icon
-						v-if="execution.mode === 'manual'"
-						:class="[$style.icon, $style.manual]"
-						icon="flask"
-					/>
-				</n8n-tooltip>
-			</div>
-		</router-link>
-	</div>
-</template>
-
-<script lang="ts">
-import type { IExecutionsSummary } from '@/Interface';
-import mixins from 'vue-typed-mixins';
-import type { IExecutionUIData } from '@/mixins/executionsHelpers';
-import { executionHelpers } from '@/mixins/executionsHelpers';
-import { VIEWS } from '@/constants';
-import { showMessage } from '@/mixins/showMessage';
-import ExecutionTime from '@/components/ExecutionTime.vue';
-
-export default mixins(executionHelpers, showMessage).extend({
-	name: 'execution-card',
-	components: {
-		ExecutionTime,
-	},
-	data() {
-		return {
-			VIEWS,
-		};
-	},
-	props: {
-		execution: {
-			type: Object as () => IExecutionsSummary,
-			required: true,
-		},
-		highlight: {
-			type: Boolean,
-			default: false,
-		},
-		showGap: {
-			type: Boolean,
-			default: false,
-		},
-	},
-	computed: {
-		retryExecutionActions(): object[] {
-			return [
-				{
-					id: 'current-workflow',
-					label: this.$locale.baseText('executionsList.retryWithCurrentlySavedWorkflow'),
-				},
-				{
-					id: 'original-workflow',
-					label: this.$locale.baseText('executionsList.retryWithOriginalWorkflow'),
-				},
-			];
-		},
-		executionUIDetails(): IExecutionUIData {
-			return this.getExecutionUIDetails(this.execution);
-		},
-		isActive(): boolean {
-			return this.execution.id === this.$route.params.executionId;
-		},
-	},
-	methods: {
-		onRetryMenuItemSelect(action: string): void {
-			this.$emit('retryExecution', { execution: this.execution, command: action });
-		},
-	},
-});
-</script>
-
-<style module lang="scss">
-.executionCard {
-	display: flex;
-	flex-direction: column;
-	padding-right: var(--spacing-m);
-
-	&.active {
-		border-left: var(--spacing-4xs) var(--border-style-base) transparent !important;
-
-		.executionStatus {
-			color: var(--color-text-dark) !important;
-		}
-	}
-
-	&:hover,
-	&.active {
-		.executionLink {
-			background-color: var(--color-foreground-light);
-		}
-	}
-
-	&.running {
-		.spinner {
-			position: relative;
-			top: 1px;
-		}
-		&,
-		& .executionLink {
-			border-left: var(--spacing-4xs) var(--border-style-base) hsl(var(--color-warning-h), 94%, 80%);
-		}
-		.statusLabel,
-		.spinner {
-			color: var(--color-warning);
-		}
-	}
-
-	&.success {
-		&,
-		& .executionLink {
-			border-left: var(--spacing-4xs) var(--border-style-base) hsl(var(--color-success-h), 60%, 70%);
-		}
-	}
-
-	&.waiting {
-		&,
-		& .executionLink {
-			border-left: var(--spacing-4xs) var(--border-style-base)
-				hsl(var(--color-secondary-h), 94%, 80%);
-		}
-		.statusLabel {
-			color: var(--color-secondary);
-		}
-	}
-
-	&.error {
-		&,
-		& .executionLink {
-			border-left: var(--spacing-4xs) var(--border-style-base) hsl(var(--color-danger-h), 94%, 80%);
-		}
-		.statusLabel {
-			color: var(--color-danger);
-		}
-	}
-
-	&.unknown {
-		&,
-		& .executionLink {
-			border-left: var(--spacing-4xs) var(--border-style-base) var(--color-text-light);
-		}
-	}
-}
-
-.executionLink {
-	display: flex;
-	width: 100%;
-	align-items: center;
-	justify-content: space-between;
-	color: var(--color-text-base);
-	font-size: var(--font-size-xs);
-	padding: var(--spacing-xs);
-	padding-right: var(--spacing-s);
-	position: relative;
-	left: calc(
-		-1 * var(--spacing-4xs)
-	); // Hide link border under card border so it's not visible when not hovered
-
-	&:active {
-		.icon,
-		.statusLabel {
-			color: var(--color-text-base);
-		}
-	}
-}
-
-.icons {
-	display: flex;
-	align-items: baseline;
-}
-
-.icon {
-	font-size: var(--font-size-s);
-
-	&.retry {
-		svg {
-			color: var(--color-primary);
-		}
-	}
-
-	&.manual {
-		position: relative;
-		top: 1px;
-	}
-
-	& + & {
-		margin-left: var(--spacing-2xs);
-	}
-}
-.showGap {
-	margin-bottom: var(--spacing-2xs);
-	.executionLink {
-		border-bottom: 1px solid var(--color-foreground-dark);
-	}
-}
-</style>
diff --git a/packages/editor-ui/src/components/ExecutionsView/ExecutionPreview.vue b/packages/editor-ui/src/components/ExecutionsView/ExecutionPreview.vue
deleted file mode 100644
index c4f8c7c11e049..0000000000000
--- a/packages/editor-ui/src/components/ExecutionsView/ExecutionPreview.vue
+++ /dev/null
@@ -1,254 +0,0 @@
-<template>
-	<div v-if="executionUIDetails?.name === 'running'" :class="$style.runningInfo">
-		<div :class="$style.spinner">
-			<n8n-spinner type="ring" />
-		</div>
-		<n8n-text :class="$style.runningMessage" color="text-light">
-			{{ $locale.baseText('executionDetails.runningMessage') }}
-		</n8n-text>
-		<n8n-button class="mt-l" type="tertiary" size="medium" @click="handleStopClick">
-			{{ $locale.baseText('executionsList.stopExecution') }}
-		</n8n-button>
-	</div>
-	<div v-else :class="$style.previewContainer">
-		<div
-			:class="{ [$style.executionDetails]: true, [$style.sidebarCollapsed]: sidebarCollapsed }"
-			v-if="activeExecution"
-			:data-test-id="`execution-preview-details-${executionId}`"
-		>
-			<div>
-				<n8n-text size="large" color="text-base" :bold="true" data-test-id="execution-time">{{
-					executionUIDetails?.startTime
-				}}</n8n-text
-				><br />
-				<n8n-spinner
-					v-if="executionUIDetails?.name === 'running'"
-					size="small"
-					:class="[$style.spinner, 'mr-4xs']"
-				/>
-				<n8n-text
-					size="medium"
-					:class="[$style.status, $style[executionUIDetails.name]]"
-					data-test-id="execution-preview-label"
-				>
-					{{ executionUIDetails.label }}
-				</n8n-text>
-				<n8n-text v-if="executionUIDetails.name === 'running'" color="text-base" size="medium">
-					{{
-						$locale.baseText('executionDetails.runningTimeRunning', {
-							interpolate: { time: executionUIDetails?.runningTime },
-						})
-					}}
-					| ID#{{ activeExecution.id }}
-				</n8n-text>
-				<n8n-text
-					v-else-if="executionUIDetails.name !== 'waiting'"
-					color="text-base"
-					size="medium"
-					data-test-id="execution-preview-id"
-				>
-					{{
-						$locale.baseText('executionDetails.runningTimeFinished', {
-							interpolate: { time: executionUIDetails?.runningTime ?? 'unknown' },
-						})
-					}}
-					| ID#{{ activeExecution.id }}
-				</n8n-text>
-				<n8n-text
-					v-else-if="executionUIDetails?.name === 'waiting'"
-					color="text-base"
-					size="medium"
-				>
-					| ID#{{ activeExecution.id }}
-				</n8n-text>
-				<br /><n8n-text v-if="activeExecution.mode === 'retry'" color="text-base" size="medium">
-					{{ $locale.baseText('executionDetails.retry') }}
-					<router-link
-						:class="$style.executionLink"
-						:to="{
-							name: VIEWS.EXECUTION_PREVIEW,
-							params: {
-								workflowId: activeExecution.workflowId,
-								executionId: activeExecution.retryOf,
-							},
-						}"
-					>
-						#{{ activeExecution.retryOf }}
-					</router-link>
-				</n8n-text>
-			</div>
-			<div>
-				<el-dropdown
-					v-if="executionUIDetails?.name === 'error'"
-					trigger="click"
-					class="mr-xs"
-					@command="handleRetryClick"
-					ref="retryDropdown"
-				>
-					<span class="retry-button">
-						<n8n-icon-button
-							size="large"
-							type="tertiary"
-							:title="$locale.baseText('executionsList.retryExecution')"
-							icon="redo"
-							data-test-id="execution-preview-retry-button"
-							@blur="onRetryButtonBlur"
-						/>
-					</span>
-					<template #dropdown>
-						<el-dropdown-menu>
-							<el-dropdown-item command="current-workflow">
-								{{ $locale.baseText('executionsList.retryWithCurrentlySavedWorkflow') }}
-							</el-dropdown-item>
-							<el-dropdown-item command="original-workflow">
-								{{ $locale.baseText('executionsList.retryWithOriginalWorkflow') }}
-							</el-dropdown-item>
-						</el-dropdown-menu>
-					</template>
-				</el-dropdown>
-				<n8n-icon-button
-					:title="$locale.baseText('executionDetails.deleteExecution')"
-					icon="trash"
-					size="large"
-					type="tertiary"
-					data-test-id="execution-preview-delete-button"
-					@click="onDeleteExecution"
-				/>
-			</div>
-		</div>
-		<workflow-preview
-			mode="execution"
-			loaderType="spinner"
-			:executionId="executionId"
-			:executionMode="executionMode"
-		/>
-	</div>
-</template>
-
-<script lang="ts">
-import mixins from 'vue-typed-mixins';
-import { showMessage } from '@/mixins/showMessage';
-import WorkflowPreview from '@/components/WorkflowPreview.vue';
-import type { IExecutionUIData } from '@/mixins/executionsHelpers';
-import { executionHelpers } from '@/mixins/executionsHelpers';
-import { VIEWS } from '@/constants';
-import { mapStores } from 'pinia';
-import { useUIStore } from '@/stores/ui';
-import { Dropdown as ElDropdown } from 'element-ui';
-
-type RetryDropdownRef = InstanceType<typeof ElDropdown> & { hide: () => void };
-
-export default mixins(showMessage, executionHelpers).extend({
-	name: 'execution-preview',
-	components: {
-		ElDropdown,
-		WorkflowPreview,
-	},
-	data() {
-		return {
-			VIEWS,
-		};
-	},
-	computed: {
-		...mapStores(useUIStore),
-		executionUIDetails(): IExecutionUIData | null {
-			return this.activeExecution ? this.getExecutionUIDetails(this.activeExecution) : null;
-		},
-		sidebarCollapsed(): boolean {
-			return this.uiStore.sidebarMenuCollapsed;
-		},
-		executionMode(): string {
-			return this.activeExecution?.mode || '';
-		},
-	},
-	methods: {
-		async onDeleteExecution(): Promise<void> {
-			const deleteConfirmed = await this.confirmMessage(
-				this.$locale.baseText('executionDetails.confirmMessage.message'),
-				this.$locale.baseText('executionDetails.confirmMessage.headline'),
-				'warning',
-				this.$locale.baseText('executionDetails.confirmMessage.confirmButtonText'),
-				'',
-			);
-			if (!deleteConfirmed) {
-				return;
-			}
-			this.$emit('deleteCurrentExecution');
-		},
-		handleRetryClick(command: string): void {
-			this.$emit('retryExecution', { execution: this.activeExecution, command });
-		},
-		handleStopClick(): void {
-			this.$emit('stopExecution');
-		},
-		onRetryButtonBlur(event: FocusEvent): void {
-			// Hide dropdown when clicking outside of current document
-			const retryDropdownRef = this.$refs.retryDropdown as RetryDropdownRef | undefined;
-			if (retryDropdownRef && event.relatedTarget === null) {
-				retryDropdownRef.hide();
-			}
-		},
-	},
-});
-</script>
-
-<style module lang="scss">
-.previewContainer {
-	height: calc(100% - $header-height);
-	overflow: hidden;
-}
-
-.executionDetails {
-	position: absolute;
-	padding: var(--spacing-m);
-	padding-right: var(--spacing-xl);
-	width: calc(100% - 510px);
-	display: flex;
-	justify-content: space-between;
-	transition: all 150ms ease-in-out;
-	pointer-events: none;
-
-	& * {
-		pointer-events: all;
-	}
-
-	&.sidebarCollapsed {
-		width: calc(100% - 375px);
-	}
-}
-
-.spinner {
-	div div {
-		width: 30px;
-		height: 30px;
-		border-width: 2px;
-	}
-}
-
-.running,
-.spinner {
-	color: var(--color-warning);
-}
-.waiting {
-	color: var(--color-secondary);
-}
-.success {
-	color: var(--color-success);
-}
-.error {
-	color: var(--color-danger);
-}
-
-.runningInfo {
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	margin-top: var(--spacing-4xl);
-}
-
-.runningMessage {
-	width: 200px;
-	margin-top: var(--spacing-l);
-	text-align: center;
-}
-</style>
diff --git a/packages/editor-ui/src/components/ExecutionsView/ExecutionsInfoAccordion.vue b/packages/editor-ui/src/components/ExecutionsView/ExecutionsInfoAccordion.vue
deleted file mode 100644
index 105daef49d918..0000000000000
--- a/packages/editor-ui/src/components/ExecutionsView/ExecutionsInfoAccordion.vue
+++ /dev/null
@@ -1,264 +0,0 @@
-<template>
-	<n8n-info-accordion
-		:class="[$style.accordion, 'mt-2xl']"
-		:title="$locale.baseText('executionsLandingPage.emptyState.accordion.title')"
-		:items="accordionItems"
-		:initiallyExpanded="shouldExpandAccordion"
-		:headerIcon="accordionIcon"
-		@click="onAccordionClick"
-		@tooltipClick="onItemTooltipClick"
-	>
-		<template #customContent>
-			<footer class="mt-2xs">
-				{{ $locale.baseText('executionsLandingPage.emptyState.accordion.footer') }}
-				<n8n-tooltip :disabled="!isNewWorkflow">
-					<template #content>
-						<div>
-							<n8n-link @click.prevent="onSaveWorkflowClick">{{
-								$locale.baseText('executionsLandingPage.emptyState.accordion.footer.tooltipLink')
-							}}</n8n-link>
-							{{
-								$locale.baseText('executionsLandingPage.emptyState.accordion.footer.tooltipText')
-							}}
-						</div>
-					</template>
-					<n8n-link
-						@click.prevent="openWorkflowSettings"
-						:class="{ [$style.disabled]: isNewWorkflow }"
-						size="small"
-					>
-						{{ $locale.baseText('executionsLandingPage.emptyState.accordion.footer.settingsLink') }}
-					</n8n-link>
-				</n8n-tooltip>
-			</footer>
-		</template>
-	</n8n-info-accordion>
-</template>
-
-<script lang="ts">
-import { useRootStore } from '@/stores/n8nRootStore';
-import { useSettingsStore } from '@/stores/settings';
-import { useUIStore } from '@/stores/ui';
-import { useWorkflowsStore } from '@/stores/workflows';
-import { mapStores } from 'pinia';
-import { PLACEHOLDER_EMPTY_WORKFLOW_ID, WORKFLOW_SETTINGS_MODAL_KEY } from '@/constants';
-import type { IWorkflowSettings } from 'n8n-workflow';
-import { deepCopy } from 'n8n-workflow';
-import mixins from 'vue-typed-mixins';
-import { workflowHelpers } from '@/mixins/workflowHelpers';
-
-interface IWorkflowSaveSettings {
-	saveFailedExecutions: boolean;
-	saveSuccessfulExecutions: boolean;
-	saveTestExecutions: boolean;
-}
-
-export default mixins(workflowHelpers).extend({
-	name: 'executions-info-accordion',
-	props: {
-		initiallyExpanded: {
-			type: Boolean,
-			default: false,
-		},
-	},
-	data() {
-		return {
-			defaultValues: {
-				saveFailedExecutions: 'all',
-				saveSuccessfulExecutions: 'all',
-				saveManualExecutions: false,
-			},
-			workflowSaveSettings: {
-				saveFailedExecutions: false,
-				saveSuccessfulExecutions: false,
-				saveTestExecutions: false,
-			} as IWorkflowSaveSettings,
-		};
-	},
-	mounted() {
-		this.defaultValues.saveFailedExecutions = this.settingsStore.saveDataErrorExecution;
-		this.defaultValues.saveSuccessfulExecutions = this.settingsStore.saveDataSuccessExecution;
-		this.defaultValues.saveManualExecutions = this.settingsStore.saveManualExecutions;
-		this.updateSettings(this.workflowSettings);
-	},
-	watch: {
-		workflowSettings(newSettings: IWorkflowSettings) {
-			this.updateSettings(newSettings);
-		},
-	},
-	computed: {
-		...mapStores(useRootStore, useSettingsStore, useUIStore, useWorkflowsStore),
-		accordionItems(): Object[] {
-			return [
-				{
-					id: 'productionExecutions',
-					label: this.$locale.baseText(
-						'executionsLandingPage.emptyState.accordion.productionExecutions',
-					),
-					icon: this.productionExecutionsIcon.icon,
-					iconColor: this.productionExecutionsIcon.color,
-					tooltip:
-						this.productionExecutionsStatus === 'unknown'
-							? this.$locale.baseText(
-									'executionsLandingPage.emptyState.accordion.productionExecutionsWarningTooltip',
-							  )
-							: null,
-				},
-				{
-					id: 'manualExecutions',
-					label: this.$locale.baseText('executionsLandingPage.emptyState.accordion.testExecutions'),
-					icon: this.workflowSaveSettings.saveTestExecutions ? 'check' : 'times',
-					iconColor: this.workflowSaveSettings.saveTestExecutions ? 'success' : 'danger',
-				},
-			];
-		},
-		shouldExpandAccordion(): boolean {
-			if (this.initiallyExpanded === false) {
-				return false;
-			}
-			return (
-				!this.workflowSaveSettings.saveFailedExecutions ||
-				!this.workflowSaveSettings.saveSuccessfulExecutions ||
-				!this.workflowSaveSettings.saveTestExecutions
-			);
-		},
-		productionExecutionsIcon(): { icon: string; color: string } {
-			if (this.productionExecutionsStatus === 'saving') {
-				return { icon: 'check', color: 'success' };
-			} else if (this.productionExecutionsStatus === 'not-saving') {
-				return { icon: 'times', color: 'danger' };
-			}
-			return { icon: 'exclamation-triangle', color: 'warning' };
-		},
-		productionExecutionsStatus(): string {
-			if (
-				this.workflowSaveSettings.saveSuccessfulExecutions ===
-				this.workflowSaveSettings.saveFailedExecutions
-			) {
-				if (this.workflowSaveSettings.saveSuccessfulExecutions) {
-					return 'saving';
-				}
-				return 'not-saving';
-			} else {
-				return 'unknown';
-			}
-		},
-		workflowSettings(): IWorkflowSettings {
-			const workflowSettings = deepCopy(this.workflowsStore.workflowSettings);
-			return workflowSettings;
-		},
-		accordionIcon(): { icon: string; color: string } | null {
-			if (
-				!this.workflowSaveSettings.saveTestExecutions ||
-				this.productionExecutionsStatus !== 'saving'
-			) {
-				return { icon: 'exclamation-triangle', color: 'warning' };
-			}
-			return null;
-		},
-		currentWorkflowId(): string {
-			return this.workflowsStore.workflowId;
-		},
-		isNewWorkflow(): boolean {
-			return (
-				!this.currentWorkflowId ||
-				this.currentWorkflowId === PLACEHOLDER_EMPTY_WORKFLOW_ID ||
-				this.currentWorkflowId === 'new'
-			);
-		},
-		workflowName(): string {
-			return this.workflowsStore.workflowName;
-		},
-		currentWorkflowTagIds(): string[] {
-			return this.workflowsStore.workflowTags;
-		},
-	},
-	methods: {
-		updateSettings(workflowSettings: IWorkflowSettings): void {
-			this.workflowSaveSettings.saveFailedExecutions =
-				workflowSettings.saveDataErrorExecution === undefined
-					? this.defaultValues.saveFailedExecutions === 'all'
-					: workflowSettings.saveDataErrorExecution === 'all';
-			this.workflowSaveSettings.saveSuccessfulExecutions =
-				workflowSettings.saveDataSuccessExecution === undefined
-					? this.defaultValues.saveSuccessfulExecutions === 'all'
-					: workflowSettings.saveDataSuccessExecution === 'all';
-			this.workflowSaveSettings.saveTestExecutions =
-				workflowSettings.saveManualExecutions === undefined
-					? this.defaultValues.saveManualExecutions
-					: (workflowSettings.saveManualExecutions as boolean);
-		},
-		onAccordionClick(event: MouseEvent): void {
-			if (event.target instanceof HTMLAnchorElement) {
-				event.preventDefault();
-				this.uiStore.openModal(WORKFLOW_SETTINGS_MODAL_KEY);
-			}
-		},
-		onItemTooltipClick(item: string, event: MouseEvent): void {
-			if (item === 'productionExecutions' && event.target instanceof HTMLAnchorElement) {
-				event.preventDefault();
-				this.uiStore.openModal(WORKFLOW_SETTINGS_MODAL_KEY);
-			}
-		},
-		openWorkflowSettings(event: MouseEvent): void {
-			this.uiStore.openModal(WORKFLOW_SETTINGS_MODAL_KEY);
-		},
-		async onSaveWorkflowClick(event: MouseEvent): void {
-			let currentId = undefined;
-			if (this.currentWorkflowId !== PLACEHOLDER_EMPTY_WORKFLOW_ID) {
-				currentId = this.currentWorkflowId;
-			} else if (this.$route.params.name && this.$route.params.name !== 'new') {
-				currentId = this.$route.params.name;
-			}
-			const saved = await this.saveCurrentWorkflow({
-				id: currentId,
-				name: this.workflowName,
-				tags: this.currentWorkflowTagIds,
-			});
-			if (saved) this.settingsStore.fetchPromptsData();
-		},
-	},
-});
-</script>
-
-<style module lang="scss">
-.accordion {
-	background: none;
-	width: 320px;
-
-	// Accordion header
-	& > div:nth-child(1) {
-		display: flex;
-		flex-direction: row;
-		padding: var(--spacing-xs);
-		width: 100%;
-		user-select: none;
-		color: var(--color-text-base) !important;
-	}
-
-	// Accordion description
-	& > div:nth-child(2) {
-		display: flex;
-		flex-direction: column;
-		width: 100%;
-		padding: 0 var(--spacing-l) var(--spacing-s) !important;
-
-		span {
-			width: 100%;
-		}
-	}
-
-	footer {
-		text-align: left;
-		width: 100%;
-		font-size: var(--font-size-2xs);
-	}
-
-	.disabled a {
-		color: currentColor;
-		cursor: not-allowed;
-		opacity: 0.5;
-		text-decoration: none;
-	}
-}
-</style>
diff --git a/packages/editor-ui/src/components/ExecutionsView/ExecutionsLandingPage.vue b/packages/editor-ui/src/components/ExecutionsView/ExecutionsLandingPage.vue
deleted file mode 100644
index 2c58834db9f8d..0000000000000
--- a/packages/editor-ui/src/components/ExecutionsView/ExecutionsLandingPage.vue
+++ /dev/null
@@ -1,92 +0,0 @@
-<template>
-	<div :class="['workflow-executions-container', $style.container]">
-		<div v-if="executionCount === 0" :class="[$style.messageContainer, $style.noExecutionsMessage]">
-			<div v-if="!containsTrigger">
-				<n8n-heading tag="h2" size="xlarge" color="text-dark" class="mb-2xs">
-					{{ $locale.baseText('executionsLandingPage.emptyState.noTrigger.heading') }}
-				</n8n-heading>
-				<n8n-text size="medium">
-					{{ $locale.baseText('executionsLandingPage.emptyState.message') }}
-				</n8n-text>
-				<n8n-button class="mt-l" type="tertiary" size="large" @click="onSetupFirstStep">
-					{{ $locale.baseText('executionsLandingPage.emptyState.noTrigger.buttonText') }}
-				</n8n-button>
-			</div>
-			<div v-else>
-				<n8n-heading tag="h2" size="xlarge" color="text-dark" class="mb-2xs">
-					{{ $locale.baseText('executionsLandingPage.emptyState.heading') }}
-				</n8n-heading>
-				<executions-info-accordion />
-			</div>
-		</div>
-	</div>
-</template>
-
-<script lang="ts">
-import { PLACEHOLDER_EMPTY_WORKFLOW_ID, VIEWS } from '@/constants';
-import { useUIStore } from '@/stores/ui';
-import { useWorkflowsStore } from '@/stores/workflows';
-import { mapStores } from 'pinia';
-import { defineComponent } from 'vue';
-import ExecutionsInfoAccordion from './ExecutionsInfoAccordion.vue';
-
-export default defineComponent({
-	name: 'executions-landing-page',
-	components: {
-		ExecutionsInfoAccordion,
-	},
-	computed: {
-		...mapStores(useUIStore, useWorkflowsStore),
-		executionCount(): number {
-			return this.workflowsStore.currentWorkflowExecutions.length;
-		},
-		containsTrigger(): boolean {
-			return this.workflowsStore.workflowTriggerNodes.length > 0;
-		},
-	},
-	methods: {
-		onSetupFirstStep(event: MouseEvent): void {
-			this.uiStore.addFirstStepOnLoad = true;
-			const workflowRoute = this.getWorkflowRoute();
-			this.$router.push(workflowRoute);
-		},
-		getWorkflowRoute(): { name: string; params: {} } {
-			const workflowId = this.workflowsStore.workflowId || this.$route.params.name;
-			if (workflowId === PLACEHOLDER_EMPTY_WORKFLOW_ID) {
-				return { name: VIEWS.NEW_WORKFLOW, params: {} };
-			} else {
-				return { name: VIEWS.WORKFLOW, params: { name: workflowId } };
-			}
-		},
-	},
-});
-</script>
-
-<style module lang="scss">
-.container {
-	width: 100%;
-	height: 100%;
-	flex: 1;
-	background-color: var(--color-background-light);
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-}
-
-.messageContainer {
-	margin-top: var(--spacing-4xl);
-	color: var(--color-text-base);
-
-	div {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		text-align: center;
-	}
-}
-
-.icon {
-	font-size: 24px;
-	color: var(--color-foreground-dark);
-}
-</style>
diff --git a/packages/editor-ui/src/components/ExecutionsView/ExecutionsList.vue b/packages/editor-ui/src/components/ExecutionsView/ExecutionsList.vue
deleted file mode 100644
index 45e4d333ef9c8..0000000000000
--- a/packages/editor-ui/src/components/ExecutionsView/ExecutionsList.vue
+++ /dev/null
@@ -1,698 +0,0 @@
-<template>
-	<div :class="$style.container" v-if="!loading">
-		<executions-sidebar
-			:executions="executions"
-			:loading="loading"
-			:loadingMore="loadingMore"
-			:temporaryExecution="temporaryExecution"
-			@reloadExecutions="setExecutions"
-			@filterUpdated="onFilterUpdated"
-			@loadMore="onLoadMore"
-			@retryExecution="onRetryExecution"
-			@refresh="loadAutoRefresh"
-		/>
-		<div :class="$style.content" v-if="!hidePreview">
-			<router-view
-				name="executionPreview"
-				@deleteCurrentExecution="onDeleteCurrentExecution"
-				@retryExecution="onRetryExecution"
-				@stopExecution="onStopExecution"
-			/>
-		</div>
-	</div>
-</template>
-
-<script lang="ts">
-import ExecutionsSidebar from '@/components/ExecutionsView/ExecutionsSidebar.vue';
-import {
-	MAIN_HEADER_TABS,
-	MODAL_CANCEL,
-	MODAL_CONFIRMED,
-	PLACEHOLDER_EMPTY_WORKFLOW_ID,
-	VIEWS,
-	WEBHOOK_NODE_TYPE,
-} from '@/constants';
-import type {
-	ExecutionFilterType,
-	IExecutionsListResponse,
-	INodeUi,
-	ITag,
-	IWorkflowDb,
-} from '@/Interface';
-import type {
-	IExecutionsSummary,
-	IConnection,
-	IConnections,
-	IDataObject,
-	INodeTypeDescription,
-	INodeTypeNameVersion,
-} from 'n8n-workflow';
-import { NodeHelpers } from 'n8n-workflow';
-import mixins from 'vue-typed-mixins';
-import { showMessage } from '@/mixins/showMessage';
-import { v4 as uuid } from 'uuid';
-import type { Route } from 'vue-router';
-import { executionHelpers } from '@/mixins/executionsHelpers';
-import { range as _range } from 'lodash-es';
-import { debounceHelper } from '@/mixins/debounce';
-import { getNodeViewTab, NO_NETWORK_ERROR_CODE } from '@/utils';
-import { workflowHelpers } from '@/mixins/workflowHelpers';
-import { mapStores } from 'pinia';
-import { useWorkflowsStore } from '@/stores/workflows';
-import { useUIStore } from '@/stores/ui';
-import { useSettingsStore } from '@/stores/settings';
-import { useNodeTypesStore } from '@/stores/nodeTypes';
-import { useTagsStore } from '@/stores/tags';
-import { executionFilterToQueryFilter } from '@/utils/executionUtils';
-
-// Number of execution pages that are fetched before temporary execution card is shown
-const MAX_LOADING_ATTEMPTS = 5;
-// Number of executions fetched on each page
-const LOAD_MORE_PAGE_SIZE = 100;
-
-export default mixins(showMessage, executionHelpers, debounceHelper, workflowHelpers).extend({
-	name: 'executions-list',
-	components: {
-		ExecutionsSidebar,
-	},
-	data() {
-		return {
-			loading: false,
-			loadingMore: false,
-			filter: {} as ExecutionFilterType,
-			temporaryExecution: null as IExecutionsSummary | null,
-		};
-	},
-	computed: {
-		...mapStores(useTagsStore, useNodeTypesStore, useSettingsStore, useUIStore, useWorkflowsStore),
-		hidePreview(): boolean {
-			const activeNotPresent =
-				this.filterApplied &&
-				!(this.executions as IExecutionsSummary[]).find((ex) => ex.id === this.activeExecution?.id);
-			return this.loading || !this.executions.length || activeNotPresent;
-		},
-		filterApplied(): boolean {
-			return this.filter.status !== 'all';
-		},
-		workflowDataNotLoaded(): boolean {
-			return (
-				this.workflowsStore.workflowId === PLACEHOLDER_EMPTY_WORKFLOW_ID &&
-				this.workflowsStore.workflowName === ''
-			);
-		},
-		loadedFinishedExecutionsCount(): number {
-			return this.workflowsStore.getAllLoadedFinishedExecutions.length;
-		},
-		totalFinishedExecutionsCount(): number {
-			return this.workflowsStore.getTotalFinishedExecutionsCount;
-		},
-		requestFilter(): IDataObject {
-			return executionFilterToQueryFilter({
-				...this.filter,
-				workflowId: this.currentWorkflow,
-			});
-		},
-	},
-	watch: {
-		$route(to: Route, from: Route) {
-			const workflowChanged = from.params.name !== to.params.name;
-			this.initView(workflowChanged);
-
-			if (to.params.executionId) {
-				const execution = this.workflowsStore.getExecutionDataById(to.params.executionId);
-				if (execution) {
-					this.workflowsStore.activeWorkflowExecution = execution;
-				}
-			}
-		},
-	},
-	async beforeRouteLeave(to, from, next) {
-		if (getNodeViewTab(to) === MAIN_HEADER_TABS.WORKFLOW) {
-			next();
-			return;
-		}
-		if (this.uiStore.stateIsDirty) {
-			const confirmModal = await this.confirmModal(
-				this.$locale.baseText('generic.unsavedWork.confirmMessage.message'),
-				this.$locale.baseText('generic.unsavedWork.confirmMessage.headline'),
-				'warning',
-				this.$locale.baseText('generic.unsavedWork.confirmMessage.confirmButtonText'),
-				this.$locale.baseText('generic.unsavedWork.confirmMessage.cancelButtonText'),
-				true,
-			);
-
-			if (confirmModal === MODAL_CONFIRMED) {
-				const saved = await this.saveCurrentWorkflow({}, false);
-				if (saved) {
-					await this.settingsStore.fetchPromptsData();
-				}
-				this.uiStore.stateIsDirty = false;
-				next();
-			} else if (confirmModal === MODAL_CANCEL) {
-				this.uiStore.stateIsDirty = false;
-				next();
-			}
-		} else {
-			next();
-		}
-	},
-	async mounted() {
-		this.loading = true;
-		const workflowUpdated = this.$route.params.name !== this.workflowsStore.workflowId;
-		const onNewWorkflow =
-			this.$route.params.name === 'new' &&
-			this.workflowsStore.workflowId === PLACEHOLDER_EMPTY_WORKFLOW_ID;
-		const shouldUpdate = workflowUpdated && !onNewWorkflow;
-		await this.initView(shouldUpdate);
-		if (!shouldUpdate) {
-			if (this.workflowsStore.currentWorkflowExecutions.length > 0) {
-				const workflowExecutions = await this.loadExecutions();
-				this.workflowsStore.addToCurrentExecutions(workflowExecutions);
-				await this.setActiveExecution();
-			} else {
-				await this.setExecutions();
-			}
-		}
-		this.loading = false;
-	},
-	methods: {
-		async initView(loadWorkflow: boolean): Promise<void> {
-			if (loadWorkflow) {
-				if (this.nodeTypesStore.allNodeTypes.length === 0) {
-					await this.nodeTypesStore.getNodeTypes();
-				}
-				await this.openWorkflow(this.$route.params.name);
-				this.uiStore.nodeViewInitialized = false;
-				if (this.workflowsStore.currentWorkflowExecutions.length === 0) {
-					await this.setExecutions();
-				}
-				if (this.activeExecution) {
-					this.$router
-						.push({
-							name: VIEWS.EXECUTION_PREVIEW,
-							params: { name: this.currentWorkflow, executionId: this.activeExecution.id },
-						})
-						.catch(() => {});
-				}
-			}
-		},
-		async onLoadMore(): Promise<void> {
-			if (!this.loadingMore) {
-				await this.callDebounced('loadMore', { debounceTime: 1000 });
-			}
-		},
-		async loadMore(limit = 20): Promise<void> {
-			if (
-				this.filter.status === 'running' ||
-				this.loadedFinishedExecutionsCount >= this.totalFinishedExecutionsCount
-			) {
-				return;
-			}
-			this.loadingMore = true;
-
-			let lastId: string | undefined;
-			if (this.executions.length !== 0) {
-				const lastItem = this.executions.slice(-1)[0];
-				lastId = lastItem.id;
-			}
-
-			let data: IExecutionsListResponse;
-			try {
-				data = await this.workflowsStore.getPastExecutions(this.requestFilter, limit, lastId);
-			} catch (error) {
-				this.loadingMore = false;
-				this.$showError(error, this.$locale.baseText('executionsList.showError.loadMore.title'));
-				return;
-			}
-
-			data.results = data.results.map((execution) => {
-				// @ts-ignore
-				return { ...execution, mode: execution.mode };
-			});
-			const currentExecutions = [...this.executions];
-			for (const newExecution of data.results) {
-				if (currentExecutions.find((ex) => ex.id === newExecution.id) === undefined) {
-					currentExecutions.push(newExecution);
-				}
-				// If we loaded temp execution, put it into it's place and remove from top of the list
-				if (newExecution.id === this.temporaryExecution?.id) {
-					this.temporaryExecution = null;
-				}
-			}
-			this.workflowsStore.currentWorkflowExecutions = currentExecutions;
-			this.loadingMore = false;
-		},
-		async onDeleteCurrentExecution(): Promise<void> {
-			this.loading = true;
-			try {
-				const executionIndex = this.executions.findIndex(
-					(execution: IExecutionsSummary) => execution.id === this.$route.params.executionId,
-				);
-				const nextExecution =
-					this.executions[executionIndex + 1] ||
-					this.executions[executionIndex - 1] ||
-					this.executions[0];
-
-				await this.workflowsStore.deleteExecutions({ ids: [this.$route.params.executionId] });
-				if (this.temporaryExecution?.id === this.$route.params.executionId) {
-					this.temporaryExecution = null;
-				}
-				if (this.executions.length > 0) {
-					await this.$router
-						.push({
-							name: VIEWS.EXECUTION_PREVIEW,
-							params: { name: this.currentWorkflow, executionId: nextExecution.id },
-						})
-						.catch(() => {});
-					this.workflowsStore.activeWorkflowExecution = nextExecution;
-				} else {
-					// If there are no executions left, show empty state and clear active execution from the store
-					this.workflowsStore.activeWorkflowExecution = null;
-					await this.$router.push({
-						name: VIEWS.EXECUTION_HOME,
-						params: { name: this.currentWorkflow },
-					});
-				}
-				await this.setExecutions();
-			} catch (error) {
-				this.loading = false;
-				this.$showError(
-					error,
-					this.$locale.baseText('executionsList.showError.handleDeleteSelected.title'),
-				);
-				return;
-			}
-			this.loading = false;
-
-			this.$showMessage({
-				title: this.$locale.baseText('executionsList.showMessage.handleDeleteSelected.title'),
-				type: 'success',
-			});
-		},
-		async onStopExecution(): Promise<void> {
-			const activeExecutionId = this.$route.params.executionId;
-
-			try {
-				await this.workflowsStore.stopCurrentExecution(activeExecutionId);
-
-				this.$showMessage({
-					title: this.$locale.baseText('executionsList.showMessage.stopExecution.title'),
-					message: this.$locale.baseText('executionsList.showMessage.stopExecution.message', {
-						interpolate: { activeExecutionId },
-					}),
-					type: 'success',
-				});
-
-				this.loadAutoRefresh();
-			} catch (error) {
-				this.$showError(
-					error,
-					this.$locale.baseText('executionsList.showError.stopExecution.title'),
-				);
-			}
-		},
-		onFilterUpdated(filter: ExecutionFilterType): void {
-			this.filter = filter;
-			this.setExecutions();
-		},
-		async setExecutions(): Promise<void> {
-			this.workflowsStore.currentWorkflowExecutions = await this.loadExecutions();
-			await this.setActiveExecution();
-		},
-		async loadAutoRefresh(): Promise<void> {
-			// Most of the auto-refresh logic is taken from the `ExecutionsList` component
-			const fetchedExecutions: IExecutionsSummary[] = await this.loadExecutions();
-			let existingExecutions: IExecutionsSummary[] = [...this.executions];
-			const alreadyPresentExecutionIds = existingExecutions.map((exec) => parseInt(exec.id, 10));
-			let lastId = 0;
-			const gaps = [] as number[];
-			let updatedActiveExecution = null;
-
-			for (let i = fetchedExecutions.length - 1; i >= 0; i--) {
-				const currentItem = fetchedExecutions[i];
-				const currentId = parseInt(currentItem.id, 10);
-				if (lastId !== 0 && !isNaN(currentId)) {
-					if (currentId - lastId > 1) {
-						const range = _range(lastId + 1, currentId);
-						gaps.push(...range);
-					}
-				}
-				lastId = parseInt(currentItem.id, 10) || 0;
-
-				const executionIndex = alreadyPresentExecutionIds.indexOf(currentId);
-				if (executionIndex !== -1) {
-					const existingExecution = existingExecutions.find((ex) => ex.id === currentItem.id);
-					const existingStillRunning =
-						(existingExecution && existingExecution.finished === false) ||
-						existingExecution?.stoppedAt === undefined;
-					const currentFinished =
-						currentItem.finished === true || currentItem.stoppedAt !== undefined;
-
-					if (existingStillRunning && currentFinished) {
-						existingExecutions[executionIndex] = currentItem;
-						if (currentItem.id === this.activeExecution?.id) {
-							updatedActiveExecution = currentItem;
-						}
-					}
-					continue;
-				}
-
-				let j;
-				for (j = existingExecutions.length - 1; j >= 0; j--) {
-					if (currentId < parseInt(existingExecutions[j].id, 10)) {
-						existingExecutions.splice(j + 1, 0, currentItem);
-						break;
-					}
-				}
-				if (j === -1) {
-					existingExecutions.unshift(currentItem);
-				}
-			}
-
-			existingExecutions = existingExecutions.filter(
-				(execution) =>
-					!gaps.includes(parseInt(execution.id, 10)) && lastId >= parseInt(execution.id, 10),
-			);
-			this.workflowsStore.currentWorkflowExecutions = existingExecutions;
-			if (updatedActiveExecution !== null) {
-				this.workflowsStore.activeWorkflowExecution = updatedActiveExecution;
-			} else {
-				const activeInList = existingExecutions.some((ex) => ex.id === this.activeExecution?.id);
-				if (!activeInList && this.executions.length > 0 && !this.temporaryExecution) {
-					this.$router
-						.push({
-							name: VIEWS.EXECUTION_PREVIEW,
-							params: { name: this.currentWorkflow, executionId: this.executions[0].id },
-						})
-						.catch(() => {});
-				} else if (this.executions.length === 0) {
-					this.$router.push({ name: VIEWS.EXECUTION_HOME }).catch(() => {});
-					this.workflowsStore.activeWorkflowExecution = null;
-				}
-			}
-		},
-		async loadExecutions(): Promise<IExecutionsSummary[]> {
-			if (!this.currentWorkflow) {
-				return [];
-			}
-			try {
-				return await this.workflowsStore.loadCurrentWorkflowExecutions(this.requestFilter);
-			} catch (error) {
-				if (error.errorCode === NO_NETWORK_ERROR_CODE) {
-					this.$showMessage(
-						{
-							title: this.$locale.baseText('executionsList.showError.refreshData.title'),
-							message: error.message,
-							type: 'error',
-							duration: 3500,
-						},
-						false,
-					);
-				} else {
-					this.$showError(
-						error,
-						this.$locale.baseText('executionsList.showError.refreshData.title'),
-					);
-				}
-				return [];
-			}
-		},
-		async setActiveExecution(): Promise<void> {
-			const activeExecutionId = this.$route.params.executionId;
-			if (activeExecutionId) {
-				const execution = this.workflowsStore.getExecutionDataById(activeExecutionId);
-				if (execution) {
-					this.workflowsStore.activeWorkflowExecution = execution;
-				} else {
-					await this.tryToFindExecution(activeExecutionId);
-				}
-			}
-
-			// If there is no execution in the route, select the first one
-			if (
-				this.workflowsStore.activeWorkflowExecution === null &&
-				this.executions.length > 0 &&
-				!this.temporaryExecution
-			) {
-				this.workflowsStore.activeWorkflowExecution = this.executions[0];
-				this.$router
-					.push({
-						name: VIEWS.EXECUTION_PREVIEW,
-						params: { name: this.currentWorkflow, executionId: this.executions[0].id },
-					})
-					.catch(() => {});
-			}
-		},
-		async tryToFindExecution(executionId: string, attemptCount = 0): Promise<void> {
-			// First check if executions exists in the DB at all
-			if (attemptCount === 0) {
-				const existingExecution = await this.workflowsStore.fetchExecutionDataById(executionId);
-				if (!existingExecution) {
-					this.workflowsStore.activeWorkflowExecution = null;
-					this.$showError(
-						new Error(
-							this.$locale.baseText('executionView.notFound.message', {
-								interpolate: { executionId },
-							}),
-						),
-						this.$locale.baseText('nodeView.showError.openExecution.title'),
-					);
-					return;
-				} else {
-					this.temporaryExecution = existingExecution as IExecutionsSummary;
-				}
-			}
-			// stop if the execution wasn't found in the first 1000 lookups
-			if (attemptCount >= MAX_LOADING_ATTEMPTS) {
-				if (this.temporaryExecution) {
-					this.workflowsStore.activeWorkflowExecution = this.temporaryExecution;
-					return;
-				}
-				this.workflowsStore.activeWorkflowExecution = null;
-				return;
-			}
-			// Fetch next batch of executions
-			await this.loadMore(LOAD_MORE_PAGE_SIZE);
-			const execution = this.workflowsStore.getExecutionDataById(executionId);
-			if (!execution) {
-				// If it's not there load next until found
-				await this.$nextTick();
-				// But skip fetching execution data since we at this point know it exists
-				await this.tryToFindExecution(executionId, attemptCount + 1);
-			} else {
-				// When found set execution as active
-				this.workflowsStore.activeWorkflowExecution = execution;
-				this.temporaryExecution = null;
-				return;
-			}
-		},
-		async openWorkflow(workflowId: string): Promise<void> {
-			await this.loadActiveWorkflows();
-
-			let data: IWorkflowDb | undefined;
-			try {
-				data = await this.workflowsStore.fetchWorkflow(workflowId);
-			} catch (error) {
-				this.$showError(error, this.$locale.baseText('nodeView.showError.openWorkflow.title'));
-				return;
-			}
-			if (data === undefined) {
-				throw new Error(
-					this.$locale.baseText('nodeView.workflowWithIdCouldNotBeFound', {
-						interpolate: { workflowId },
-					}),
-				);
-			}
-			await this.addNodes(data.nodes, data.connections);
-
-			this.workflowsStore.setActive(data.active || false);
-			this.workflowsStore.setWorkflowId(workflowId);
-			this.workflowsStore.setWorkflowName({ newName: data.name, setStateDirty: false });
-			this.workflowsStore.setWorkflowSettings(data.settings || {});
-			this.workflowsStore.setWorkflowPinData(data.pinData || {});
-			const tags = (data.tags || []) as ITag[];
-			const tagIds = tags.map((tag) => tag.id);
-			this.workflowsStore.setWorkflowTagIds(tagIds || []);
-			this.workflowsStore.setWorkflowVersionId(data.versionId);
-
-			this.tagsStore.upsertTags(tags);
-
-			this.$externalHooks().run('workflow.open', { workflowId, workflowName: data.name });
-			this.uiStore.stateIsDirty = false;
-		},
-		async addNodes(nodes: INodeUi[], connections?: IConnections) {
-			if (!nodes || !nodes.length) {
-				return;
-			}
-
-			await this.loadNodesProperties(
-				nodes.map((node) => ({ name: node.type, version: node.typeVersion })),
-			);
-
-			let nodeType: INodeTypeDescription | null;
-			nodes.forEach((node) => {
-				if (!node.id) {
-					node.id = uuid();
-				}
-
-				nodeType = this.nodeTypesStore.getNodeType(node.type, node.typeVersion);
-
-				// Make sure that some properties always exist
-				if (!node.hasOwnProperty('disabled')) {
-					node.disabled = false;
-				}
-
-				if (!node.hasOwnProperty('parameters')) {
-					node.parameters = {};
-				}
-
-				// Load the defaul parameter values because only values which differ
-				// from the defaults get saved
-				if (nodeType !== null) {
-					let nodeParameters = null;
-					try {
-						nodeParameters = NodeHelpers.getNodeParameters(
-							nodeType.properties,
-							node.parameters,
-							true,
-							false,
-							node,
-						);
-					} catch (e) {
-						console.error(
-							this.$locale.baseText('nodeView.thereWasAProblemLoadingTheNodeParametersOfNode') +
-								`: "${node.name}"`,
-						); // eslint-disable-line no-console
-						console.error(e); // eslint-disable-line no-console
-					}
-					node.parameters = nodeParameters !== null ? nodeParameters : {};
-
-					// if it's a webhook and the path is empty set the UUID as the default path
-					if (node.type === WEBHOOK_NODE_TYPE && node.parameters.path === '') {
-						node.parameters.path = node.webhookId as string;
-					}
-				}
-
-				this.workflowsStore.addNode(node);
-			});
-
-			// Load the connections
-			if (connections !== undefined) {
-				let connectionData;
-				for (const sourceNode of Object.keys(connections)) {
-					for (const type of Object.keys(connections[sourceNode])) {
-						for (
-							let sourceIndex = 0;
-							sourceIndex < connections[sourceNode][type].length;
-							sourceIndex++
-						) {
-							const outwardConnections = connections[sourceNode][type][sourceIndex];
-							if (!outwardConnections) {
-								continue;
-							}
-							outwardConnections.forEach((targetData) => {
-								connectionData = [
-									{
-										node: sourceNode,
-										type,
-										index: sourceIndex,
-									},
-									{
-										node: targetData.node,
-										type: targetData.type,
-										index: targetData.index,
-									},
-								] as [IConnection, IConnection];
-
-								this.workflowsStore.addConnection({
-									connection: connectionData,
-									setStateDirty: false,
-								});
-							});
-						}
-					}
-				}
-			}
-		},
-		async loadNodesProperties(nodeInfos: INodeTypeNameVersion[]): Promise<void> {
-			const allNodes: INodeTypeDescription[] = this.nodeTypesStore.allNodeTypes;
-
-			const nodesToBeFetched: INodeTypeNameVersion[] = [];
-			allNodes.forEach((node) => {
-				const nodeVersions = Array.isArray(node.version) ? node.version : [node.version];
-				if (
-					!!nodeInfos.find((n) => n.name === node.name && nodeVersions.includes(n.version)) &&
-					!node.hasOwnProperty('properties')
-				) {
-					nodesToBeFetched.push({
-						name: node.name,
-						version: Array.isArray(node.version) ? node.version.slice(-1)[0] : node.version,
-					});
-				}
-			});
-
-			if (nodesToBeFetched.length > 0) {
-				// Only call API if node information is actually missing
-				await this.nodeTypesStore.getNodesInformation(nodesToBeFetched);
-			}
-		},
-		async loadActiveWorkflows(): Promise<void> {
-			await this.workflowsStore.fetchActiveWorkflows();
-		},
-		async onRetryExecution(payload: { execution: IExecutionsSummary; command: string }) {
-			const loadWorkflow = payload.command === 'current-workflow';
-
-			this.$showMessage({
-				title: this.$locale.baseText('executionDetails.runningMessage'),
-				type: 'info',
-				duration: 2000,
-			});
-			await this.retryExecution(payload.execution, loadWorkflow);
-			this.loadAutoRefresh();
-
-			this.$telemetry.track('User clicked retry execution button', {
-				workflow_id: this.workflowsStore.workflowId,
-				execution_id: payload.execution.id,
-				retry_type: loadWorkflow ? 'current' : 'original',
-			});
-		},
-		async retryExecution(execution: IExecutionsSummary, loadWorkflow?: boolean) {
-			try {
-				const retrySuccessful = await this.workflowsStore.retryExecution(
-					execution.id,
-					loadWorkflow,
-				);
-
-				if (retrySuccessful === true) {
-					this.$showMessage({
-						title: this.$locale.baseText('executionsList.showMessage.retrySuccessfulTrue.title'),
-						type: 'success',
-					});
-				} else {
-					this.$showMessage({
-						title: this.$locale.baseText('executionsList.showMessage.retrySuccessfulFalse.title'),
-						type: 'error',
-					});
-				}
-			} catch (error) {
-				this.$showError(
-					error,
-					this.$locale.baseText('executionsList.showError.retryExecution.title'),
-				);
-			}
-		},
-	},
-});
-</script>
-
-<style module lang="scss">
-.container {
-	display: flex;
-	height: 100%;
-	width: 100%;
-}
-
-.content {
-	flex: 1;
-}
-</style>
diff --git a/packages/editor-ui/src/components/ExecutionsView/ExecutionsSidebar.vue b/packages/editor-ui/src/components/ExecutionsView/ExecutionsSidebar.vue
deleted file mode 100644
index df91780f8b888..0000000000000
--- a/packages/editor-ui/src/components/ExecutionsView/ExecutionsSidebar.vue
+++ /dev/null
@@ -1,293 +0,0 @@
-<template>
-	<div
-		:class="['executions-sidebar', $style.container]"
-		ref="container"
-		data-test-id="executions-sidebar"
-	>
-		<div :class="$style.heading">
-			<n8n-heading tag="h2" size="medium" color="text-dark">
-				{{ $locale.baseText('generic.executions') }}
-			</n8n-heading>
-		</div>
-		<div :class="$style.controls">
-			<el-checkbox
-				v-model="autoRefresh"
-				@change="onAutoRefreshToggle"
-				data-test-id="auto-refresh-checkbox"
-			>
-				{{ $locale.baseText('executionsList.autoRefresh') }}
-			</el-checkbox>
-			<execution-filter popover-placement="left-start" @filterChanged="onFilterChanged" />
-		</div>
-		<div
-			:class="$style.executionList"
-			ref="executionList"
-			data-test-id="current-executions-list"
-			@scroll="loadMore(20)"
-		>
-			<div v-if="loading" class="mr-m">
-				<n8n-loading :class="$style.loader" variant="p" :rows="1" />
-				<n8n-loading :class="$style.loader" variant="p" :rows="1" />
-				<n8n-loading :class="$style.loader" variant="p" :rows="1" />
-			</div>
-			<div v-if="executions.length === 0" :class="$style.noResultsContainer">
-				<n8n-text color="text-base" size="medium" align="center">
-					{{ $locale.baseText('executionsLandingPage.noResults') }}
-				</n8n-text>
-			</div>
-			<execution-card
-				v-else-if="temporaryExecution"
-				:execution="temporaryExecution"
-				:ref="`execution-${temporaryExecution.id}`"
-				:data-test-id="`execution-details-${temporaryExecution.id}`"
-				:showGap="true"
-				@refresh="onRefresh"
-				@retryExecution="onRetryExecution"
-			/>
-			<execution-card
-				v-for="execution in executions"
-				:key="execution.id"
-				:execution="execution"
-				:ref="`execution-${execution.id}`"
-				:data-test-id="`execution-details-${execution.id}`"
-				@refresh="onRefresh"
-				@retryExecution="onRetryExecution"
-			/>
-			<div v-if="loadingMore" class="mr-m">
-				<n8n-loading :class="$style.loader" variant="p" :rows="1" />
-			</div>
-		</div>
-		<div :class="$style.infoAccordion">
-			<executions-info-accordion :initiallyExpanded="false" />
-		</div>
-	</div>
-</template>
-
-<script lang="ts">
-import ExecutionCard from '@/components/ExecutionsView/ExecutionCard.vue';
-import ExecutionsInfoAccordion from '@/components/ExecutionsView/ExecutionsInfoAccordion.vue';
-import ExecutionFilter from '@/components/ExecutionFilter.vue';
-import { VIEWS } from '@/constants';
-import type { IExecutionsSummary } from 'n8n-workflow';
-import type { Route } from 'vue-router';
-import { defineComponent } from 'vue';
-import type { PropType } from 'vue';
-import { mapStores } from 'pinia';
-import { useUIStore } from '@/stores/ui';
-import { useWorkflowsStore } from '@/stores/workflows';
-import type { ExecutionFilterType } from '@/Interface';
-
-type ExecutionCardRef = InstanceType<typeof ExecutionCard>;
-
-export default defineComponent({
-	name: 'executions-sidebar',
-	components: {
-		ExecutionCard,
-		ExecutionsInfoAccordion,
-		ExecutionFilter,
-	},
-	props: {
-		executions: {
-			type: Array as PropType<IExecutionsSummary[]>,
-			required: true,
-		},
-		loading: {
-			type: Boolean,
-			default: true,
-		},
-		loadingMore: {
-			type: Boolean,
-			default: false,
-		},
-		temporaryExecution: {
-			type: Object as PropType<IExecutionsSummary>,
-			default: null,
-		},
-	},
-	data() {
-		return {
-			VIEWS,
-			filter: {} as ExecutionFilterType,
-			autoRefresh: false,
-			autoRefreshInterval: undefined as undefined | NodeJS.Timer,
-		};
-	},
-	computed: {
-		...mapStores(useUIStore, useWorkflowsStore),
-	},
-	watch: {
-		$route(to: Route, from: Route) {
-			if (from.name === VIEWS.EXECUTION_PREVIEW && to.name === VIEWS.EXECUTION_HOME) {
-				// Skip parent route when navigating through executions with back button
-				this.$router.go(-1);
-			}
-		},
-		'workflowsStore.activeWorkflowExecution'() {
-			this.checkListSize();
-			this.scrollToActiveCard();
-		},
-	},
-	mounted() {
-		this.autoRefresh = this.uiStore.executionSidebarAutoRefresh === true;
-		if (this.autoRefresh) {
-			this.autoRefreshInterval = setInterval(() => this.onRefresh(), 4000);
-		}
-		// On larger screens, we need to load more then first page of executions
-		// for the scroll bar to appear and infinite scrolling is enabled
-		this.checkListSize();
-		this.scrollToActiveCard();
-	},
-	beforeDestroy() {
-		if (this.autoRefreshInterval) {
-			clearInterval(this.autoRefreshInterval);
-			this.autoRefreshInterval = undefined;
-		}
-	},
-	methods: {
-		loadMore(limit = 20): void {
-			if (!this.loading) {
-				const executionsListRef = this.$refs.executionList as HTMLElement | undefined;
-				if (executionsListRef) {
-					const diff =
-						executionsListRef.offsetHeight -
-						(executionsListRef.scrollHeight - executionsListRef.scrollTop);
-					if (diff > -10 && diff < 10) {
-						this.$emit('loadMore', limit);
-					}
-				}
-			}
-		},
-		onRetryExecution(payload: Object) {
-			this.$emit('retryExecution', payload);
-		},
-		onRefresh(): void {
-			this.$emit('refresh');
-		},
-		onFilterChanged(filter: ExecutionFilterType) {
-			this.$emit('filterUpdated', filter);
-		},
-		reloadExecutions(): void {
-			this.$emit('reloadExecutions');
-		},
-		onAutoRefreshToggle(): void {
-			this.uiStore.executionSidebarAutoRefresh = this.autoRefresh;
-			if (this.autoRefreshInterval) {
-				// Clear any previously existing intervals (if any - there shouldn't)
-				clearInterval(this.autoRefreshInterval);
-				this.autoRefreshInterval = undefined;
-			}
-			if (this.autoRefresh) {
-				this.autoRefreshInterval = setInterval(() => this.onRefresh(), 4 * 1000); // refresh data every 4 secs
-			}
-		},
-		checkListSize(): void {
-			const sidebarContainerRef = this.$refs.container as HTMLElement | undefined;
-			const currentExecutionCardRefs = this.$refs[
-				`execution-${this.workflowsStore.activeWorkflowExecution?.id}`
-			] as ExecutionCardRef[] | undefined;
-
-			// Find out how many execution card can fit into list
-			// and load more if needed
-			if (sidebarContainerRef && currentExecutionCardRefs?.length) {
-				const cardElement = currentExecutionCardRefs[0].$el as HTMLElement;
-				const listCapacity = Math.ceil(sidebarContainerRef.clientHeight / cardElement.clientHeight);
-
-				if (listCapacity > this.executions.length) {
-					this.$emit('loadMore', listCapacity - this.executions.length);
-				}
-			}
-		},
-		scrollToActiveCard(): void {
-			const executionsListRef = this.$refs.executionList as HTMLElement | undefined;
-			const currentExecutionCardRefs = this.$refs[
-				`execution-${this.workflowsStore.activeWorkflowExecution?.id}`
-			] as ExecutionCardRef[] | undefined;
-
-			if (
-				executionsListRef &&
-				currentExecutionCardRefs?.length &&
-				this.workflowsStore.activeWorkflowExecution
-			) {
-				const cardElement = currentExecutionCardRefs[0].$el as HTMLElement;
-				const cardRect = cardElement.getBoundingClientRect();
-				const LIST_HEADER_OFFSET = 200;
-				if (cardRect.top > executionsListRef.offsetHeight) {
-					executionsListRef.scrollTo({ top: cardRect.top - LIST_HEADER_OFFSET });
-				}
-			}
-		},
-	},
-});
-</script>
-
-<style module lang="scss">
-.container {
-	flex: 310px 0 0;
-	background-color: var(--color-background-xlight);
-	border-right: var(--border-base);
-	padding: var(--spacing-l) 0 var(--spacing-l) var(--spacing-l);
-	z-index: 1;
-	overflow: hidden;
-}
-
-.heading {
-	display: flex;
-	justify-content: space-between;
-	align-items: baseline;
-	padding-right: var(--spacing-l);
-}
-
-.controls {
-	padding: var(--spacing-s) 0 var(--spacing-xs);
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	padding-right: var(--spacing-m);
-
-	button {
-		display: flex;
-		align-items: center;
-	}
-}
-
-.executionList {
-	height: calc(100% - 10.5em);
-	overflow: auto;
-	margin-bottom: var(--spacing-m);
-	background-color: var(--color-background-xlight) !important;
-
-	// Scrolling fader
-	&::before {
-		position: absolute;
-		display: block;
-		width: 270px;
-		height: 6px;
-		background: linear-gradient(to bottom, rgba(251, 251, 251, 1) 0%, rgba(251, 251, 251, 0) 100%);
-		z-index: 999;
-	}
-
-	// Lower first execution card so fader is not visible when not scrolled
-	& > div:first-child {
-		margin-top: 3px;
-	}
-}
-
-.infoAccordion {
-	position: absolute;
-	bottom: 0;
-	margin-left: calc(-1 * var(--spacing-l));
-	border-top: var(--border-base);
-
-	& > div {
-		width: 309px;
-		background-color: var(--color-background-light);
-		margin-top: 0 !important;
-	}
-}
-
-.noResultsContainer {
-	width: 100%;
-	margin-top: var(--spacing-2xl);
-	text-align: center;
-}
-</style>
diff --git a/packages/editor-ui/src/components/ExpandableInput/ExpandableInputBase.vue b/packages/editor-ui/src/components/ExpandableInput/ExpandableInputBase.vue
index 5d0c57ef24e23..14109db747f46 100644
--- a/packages/editor-ui/src/components/ExpandableInput/ExpandableInputBase.vue
+++ b/packages/editor-ui/src/components/ExpandableInput/ExpandableInputBase.vue
@@ -10,10 +10,10 @@ import { defineComponent } from 'vue';
 
 export default defineComponent({
 	name: 'ExpandableInputBase',
-	props: ['value', 'placeholder', 'staticSize'],
+	props: ['modelValue', 'placeholder', 'staticSize'],
 	computed: {
 		hiddenValue() {
-			let value = (this.value as string).replace(/\s/g, '.'); // force input to expand on space chars
+			let value = (this.modelValue as string).replace(/\s/g, '.'); // force input to expand on space chars
 			if (!value) {
 				// @ts-ignore
 				value = this.placeholder;
@@ -28,23 +28,22 @@ export default defineComponent({
 <style lang="scss" scoped>
 $--horiz-padding: 15px;
 
-input {
-	border: 1px solid transparent;
-	padding: 0 $--horiz-padding - 2px; // -2px for borders
-}
-
-div.el-input {
+.el-input {
 	display: inline-grid;
 	font: inherit;
 	padding: 10px 0;
 
-	&::after,
-	input {
+	:deep(input) {
+		border: 1px solid transparent;
+		padding: 0 $--horiz-padding - 2px; // -2px for borders
+		width: 100%;
 		grid-area: 1 / 2;
 		font: inherit;
 	}
 
 	&::after {
+		grid-area: 1 / 2;
+		font: inherit;
 		content: attr(data-value) ' ';
 		visibility: hidden;
 		white-space: nowrap;
@@ -56,9 +55,13 @@ div.el-input {
 	}
 
 	&:hover {
-		input:not(:focus) {
+		:deep(input):not(:focus) {
 			border: 1px solid var(--color-text-lighter);
 		}
 	}
+
+	:deep(input):focus {
+		border: 1px solid var(--color-secondary);
+	}
 }
 </style>
diff --git a/packages/editor-ui/src/components/ExpandableInput/ExpandableInputEdit.vue b/packages/editor-ui/src/components/ExpandableInput/ExpandableInputEdit.vue
index a7454d79b1dd0..ec9838d429667 100644
--- a/packages/editor-ui/src/components/ExpandableInput/ExpandableInputEdit.vue
+++ b/packages/editor-ui/src/components/ExpandableInput/ExpandableInputEdit.vue
@@ -1,16 +1,16 @@
 <template>
-	<ExpandableInputBase :value="value" :placeholder="placeholder">
+	<ExpandableInputBase :model-value="modelValue" :placeholder="placeholder">
 		<input
+			ref="input"
+			v-on-click-outside="onClickOutside"
 			class="el-input__inner"
-			:value="value"
+			:value="modelValue"
 			:placeholder="placeholder"
 			:maxlength="maxlength"
+			size="4"
 			@input="onInput"
 			@keydown.enter="onEnter"
 			@keydown.esc="onEscape"
-			ref="input"
-			size="4"
-			v-click-outside="onClickOutside"
 		/>
 	</ExpandableInputBase>
 </template>
@@ -19,13 +19,13 @@
 import { defineComponent } from 'vue';
 import ExpandableInputBase from './ExpandableInputBase.vue';
 import type { PropType } from 'vue';
-import type { EventBus } from '@/event-bus';
+import type { EventBus } from 'n8n-design-system';
 
 export default defineComponent({
-	components: { ExpandableInputBase },
 	name: 'ExpandableInputEdit',
+	components: { ExpandableInputBase },
 	props: {
-		value: {},
+		modelValue: {},
 		placeholder: {},
 		maxlength: {},
 		autofocus: {},
@@ -40,7 +40,7 @@ export default defineComponent({
 		}
 		this.eventBus?.on('focus', this.focus);
 	},
-	destroyed() {
+	beforeUnmount() {
 		this.eventBus?.off('focus', this.focus);
 	},
 	methods: {
@@ -50,7 +50,7 @@ export default defineComponent({
 			}
 		},
 		onInput() {
-			this.$emit('input', (this.$refs.input as HTMLInputElement).value);
+			this.$emit('update:modelValue', (this.$refs.input as HTMLInputElement).value);
 		},
 		onEnter() {
 			this.$emit('enter', (this.$refs.input as HTMLInputElement).value);
diff --git a/packages/editor-ui/src/components/ExpandableInput/ExpandableInputPreview.vue b/packages/editor-ui/src/components/ExpandableInput/ExpandableInputPreview.vue
index 7b0d23087e882..6700198b871f7 100644
--- a/packages/editor-ui/src/components/ExpandableInput/ExpandableInputPreview.vue
+++ b/packages/editor-ui/src/components/ExpandableInput/ExpandableInputPreview.vue
@@ -1,13 +1,11 @@
 <template>
-	<ExpandableInputBase :value="value" :staticSize="true">
-		<template>
-			<input
-				:class="{ 'el-input__inner': true, clickable: true }"
-				:value="value"
-				:disabled="true"
-				size="4"
-			/>
-		</template>
+	<ExpandableInputBase :model-value="modelValue" :static-size="true">
+		<input
+			:class="{ 'el-input__inner': true, clickable: true }"
+			:value="modelValue"
+			:disabled="true"
+			size="4"
+		/>
 	</ExpandableInputBase>
 </template>
 
@@ -16,9 +14,9 @@ import { defineComponent } from 'vue';
 import ExpandableInputBase from './ExpandableInputBase.vue';
 
 export default defineComponent({
-	components: { ExpandableInputBase },
 	name: 'ExpandableInputPreview',
-	props: ['value'],
+	components: { ExpandableInputBase },
+	props: ['modelValue'],
 });
 </script>
 
diff --git a/packages/editor-ui/src/components/ExpressionEdit.vue b/packages/editor-ui/src/components/ExpressionEdit.vue
index a8d896cee968f..7e4deea9a2aac 100644
--- a/packages/editor-ui/src/components/ExpressionEdit.vue
+++ b/packages/editor-ui/src/components/ExpressionEdit.vue
@@ -1,9 +1,8 @@
 <template>
-	<div v-if="dialogVisible" @keydown.stop>
+	<div v-if="dialogVisible" class="expression-edit" @keydown.stop>
 		<el-dialog
-			:visible="dialogVisible"
-			custom-class="expression-dialog classic"
-			append-to-body
+			:model-value="dialogVisible"
+			class="expression-dialog classic"
 			width="80%"
 			:title="$locale.baseText('expressionEdit.editExpression')"
 			:before-close="closeDialog"
@@ -20,7 +19,11 @@
 					</div>
 
 					<div class="variable-selector">
-						<variable-selector :path="path" @itemSelected="itemSelected"></variable-selector>
+						<VariableSelector
+							:path="path"
+							:redact-values="redactValues"
+							@item-selected="itemSelected"
+						></VariableSelector>
 					</div>
 				</el-col>
 				<el-col :span="16" class="right-side">
@@ -37,20 +40,22 @@
 								<span>
 									{{ $locale.baseText('expressionEdit.isJavaScript') }}
 								</span>
+								{{ ' ' }}
 								<n8n-link size="medium" :to="expressionsDocsUrl">
 									{{ $locale.baseText('expressionEdit.learnMore') }}
 								</n8n-link>
 							</div>
 						</div>
-						<div class="expression-editor ph-no-capture">
+						<div class="expression-editor">
 							<ExpressionEditorModalInput
-								:value="value"
-								:isReadOnly="isReadOnly"
+								ref="inputFieldExpression"
+								:model-value="modelValue"
+								:is-read-only="isReadOnly"
 								:path="path"
+								:class="{ 'ph-no-capture': redactValues }"
+								data-test-id="expression-modal-input"
 								@change="valueChanged"
 								@close="closeDialog"
-								ref="inputFieldExpression"
-								data-test-id="expression-modal-input"
 							/>
 						</div>
 					</div>
@@ -59,10 +64,11 @@
 						<div class="editor-description">
 							{{ $locale.baseText('expressionEdit.resultOfItem1') }}
 						</div>
-						<div class="ph-no-capture">
-							<ExpressionEditorModalOutput
-								:segments="segments"
+						<div :class="{ 'ph-no-capture': redactValues }">
+							<ExpressionOutput
 								ref="expressionResult"
+								:segments="segments"
+								:extensions="theme"
 								data-test-id="expression-modal-output"
 							/>
 						</div>
@@ -74,55 +80,123 @@
 </template>
 
 <script lang="ts">
+import { defineComponent } from 'vue';
+import { mapStores } from 'pinia';
 import ExpressionEditorModalInput from '@/components/ExpressionEditorModal/ExpressionEditorModalInput.vue';
-import ExpressionEditorModalOutput from '@/components/ExpressionEditorModal/ExpressionEditorModalOutput.vue';
 import VariableSelector from '@/components/VariableSelector.vue';
 
 import type { IVariableItemSelected } from '@/Interface';
 
-import { externalHooks } from '@/mixins/externalHooks';
-import { genericHelpers } from '@/mixins/genericHelpers';
-
 import { EXPRESSIONS_DOCS_URL } from '@/constants';
 
-import mixins from 'vue-typed-mixins';
-import { debounceHelper } from '@/mixins/debounce';
-import { mapStores } from 'pinia';
-import { useWorkflowsStore } from '@/stores/workflows';
-import { useNDVStore } from '@/stores/ndv';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useNDVStore } from '@/stores/ndv.store';
+import { useExternalHooks } from '@/composables/useExternalHooks';
 import { createExpressionTelemetryPayload } from '@/utils/telemetryUtils';
+import { useDebounce } from '@/composables/useDebounce';
 
 import type { Segment } from '@/types/expressions';
+import ExpressionOutput from './InlineExpressionEditor/ExpressionOutput.vue';
+import { outputTheme } from './ExpressionEditorModal/theme';
 
-export default mixins(externalHooks, genericHelpers, debounceHelper).extend({
+export default defineComponent({
 	name: 'ExpressionEdit',
-	props: ['dialogVisible', 'parameter', 'path', 'value', 'eventSource'],
 	components: {
 		ExpressionEditorModalInput,
-		ExpressionEditorModalOutput,
+		ExpressionOutput,
 		VariableSelector,
 	},
+	props: {
+		dialogVisible: {
+			type: Boolean,
+			default: false,
+		},
+		parameter: {
+			type: Object,
+			default: () => ({}),
+		},
+		path: {
+			type: String,
+			default: '',
+		},
+		modelValue: {
+			type: String,
+			default: '',
+		},
+		eventSource: {
+			type: String,
+			default: '',
+		},
+		redactValues: {
+			type: Boolean,
+			default: false,
+		},
+		isReadOnly: {
+			type: Boolean,
+			default: false,
+		},
+	},
+	setup() {
+		const externalHooks = useExternalHooks();
+		const { callDebounced } = useDebounce();
+
+		return {
+			callDebounced,
+			externalHooks,
+		};
+	},
 	data() {
 		return {
 			displayValue: '',
 			latestValue: '',
 			segments: [] as Segment[],
 			expressionsDocsUrl: EXPRESSIONS_DOCS_URL,
+			theme: outputTheme(),
 		};
 	},
 	computed: {
 		...mapStores(useNDVStore, useWorkflowsStore),
 	},
+	watch: {
+		dialogVisible(newValue) {
+			this.displayValue = this.modelValue;
+			this.latestValue = this.modelValue;
+
+			const resolvedExpressionValue =
+				(this.$refs.expressionResult as InstanceType<typeof ExpressionOutput>)?.getValue() || '';
+			void this.externalHooks.run('expressionEdit.dialogVisibleChanged', {
+				dialogVisible: newValue,
+				parameter: this.parameter,
+				value: this.modelValue,
+				resolvedExpressionValue,
+			});
+
+			if (!newValue) {
+				const telemetryPayload = createExpressionTelemetryPayload(
+					this.segments,
+					this.modelValue,
+					this.workflowsStore.workflowId,
+					this.ndvStore.pushRef,
+					this.ndvStore.activeNode?.type ?? '',
+				);
+
+				this.$telemetry.track('User closed Expression Editor', telemetryPayload);
+				void this.externalHooks.run('expressionEdit.closeDialog', telemetryPayload);
+			}
+		},
+	},
 	methods: {
 		valueChanged({ value, segments }: { value: string; segments: Segment[] }, forceUpdate = false) {
 			this.latestValue = value;
 			this.segments = segments;
 
-			if (forceUpdate === true) {
+			if (forceUpdate) {
 				this.updateDisplayValue();
-				this.$emit('valueChanged', this.latestValue);
+				this.$emit('update:modelValue', this.latestValue);
 			} else {
-				this.callDebounced('updateDisplayValue', { debounceTime: 500 });
+				void this.callDebounced(this.updateDisplayValue, {
+					debounceTime: 500,
+				});
 			}
 		},
 
@@ -131,21 +205,24 @@ export default mixins(externalHooks, genericHelpers, debounceHelper).extend({
 		},
 
 		closeDialog() {
-			if (this.latestValue !== this.value) {
+			if (this.latestValue !== this.modelValue) {
 				// Handle the close externally as the visible parameter is an external prop
 				// and is so not allowed to be changed here.
-				this.$emit('valueChanged', this.latestValue);
+				this.$emit('update:modelValue', this.latestValue);
 			}
 			this.$emit('closeDialog');
 			return false;
 		},
 
 		itemSelected(eventData: IVariableItemSelected) {
-			// eslint-disable-next-line @typescript-eslint/no-explicit-any
-			(this.$refs.inputFieldExpression as any).itemSelected(eventData);
-			this.$externalHooks().run('expressionEdit.itemSelected', {
+			(
+				this.$refs.inputFieldExpression as {
+					itemSelected: (variable: IVariableItemSelected) => void;
+				}
+			).itemSelected(eventData);
+			void this.externalHooks.run('expressionEdit.itemSelected', {
 				parameter: this.parameter,
-				value: this.value,
+				value: this.modelValue,
 				selectedItem: eventData,
 			});
 
@@ -181,21 +258,22 @@ export default mixins(externalHooks, genericHelpers, debounceHelper).extend({
 					trackProperties.variable_type = 'Raw value';
 				}
 
-				if (splitVar[0].startsWith('$node')) {
-					const sourceNodeName = splitVar[0].split('"')[1];
-					trackProperties.node_type_source =
-						this.workflowsStore.getNodeByName(sourceNodeName)?.type;
-					const nodeConnections: Array<Array<{ node: string }>> =
-						this.workflowsStore.outgoingConnectionsByNodeName(sourceNodeName).main;
-					trackProperties.is_immediate_input =
-						nodeConnections &&
-						nodeConnections[0] &&
-						!!nodeConnections[0].find(({ node }) => node === this.ndvStore.activeNode?.name || '')
-							? true
-							: false;
-
-					if (splitVar[1].startsWith('parameter')) {
-						trackProperties.parameter_name_source = splitVar[1].split('"')[1];
+				if (splitVar[0].startsWith("$('")) {
+					const match = /\$\('(.*?)'\)/.exec(splitVar[0]);
+					if (match && match.length > 1) {
+						const sourceNodeName = match[1];
+						trackProperties.node_type_source =
+							this.workflowsStore.getNodeByName(sourceNodeName)?.type;
+						const nodeConnections: Array<Array<{ node: string }>> =
+							this.workflowsStore.outgoingConnectionsByNodeName(sourceNodeName).main;
+						trackProperties.is_immediate_input =
+							nodeConnections &&
+							nodeConnections[0] &&
+							nodeConnections[0].some(({ node }) => node === this.ndvStore.activeNode?.name || '');
+
+						if (splitVar[1].startsWith('parameter')) {
+							trackProperties.parameter_name_source = splitVar[1].split('"')[1];
+						}
 					}
 				} else {
 					trackProperties.is_immediate_input = true;
@@ -212,40 +290,32 @@ export default mixins(externalHooks, genericHelpers, debounceHelper).extend({
 			);
 		},
 	},
-	watch: {
-		dialogVisible(newValue) {
-			this.displayValue = this.value;
-			this.latestValue = this.value;
-
-			const resolvedExpressionValue =
-				// eslint-disable-next-line @typescript-eslint/no-explicit-any
-				(this.$refs.expressionResult && (this.$refs.expressionResult as any).getValue()) ||
-				undefined;
-			this.$externalHooks().run('expressionEdit.dialogVisibleChanged', {
-				dialogVisible: newValue,
-				parameter: this.parameter,
-				value: this.value,
-				resolvedExpressionValue,
-			});
-
-			if (!newValue) {
-				const telemetryPayload = createExpressionTelemetryPayload(
-					this.segments,
-					this.value,
-					this.workflowsStore.workflowId,
-					this.ndvStore.sessionId,
-					this.ndvStore.activeNode?.type ?? '',
-				);
-
-				this.$telemetry.track('User closed Expression Editor', telemetryPayload);
-				this.$externalHooks().run('expressionEdit.closeDialog', telemetryPayload);
-			}
-		},
-	},
 });
 </script>
 
 <style scoped lang="scss">
+.expression-edit {
+	:deep(.expression-dialog) {
+		.el-dialog__header {
+			padding: 0;
+		}
+		.el-dialog__title {
+			display: none;
+		}
+
+		.el-dialog__body {
+			padding: 0;
+			font-size: var(--font-size-s);
+		}
+
+		.right-side {
+			background-color: var(--color-background-light);
+			border-top-right-radius: 8px;
+			border-bottom-right-radius: 8px;
+		}
+	}
+}
+
 .editor-description {
 	line-height: 1.5;
 	font-weight: bold;
@@ -286,28 +356,8 @@ export default mixins(externalHooks, genericHelpers, debounceHelper).extend({
 	margin-top: 1em;
 }
 
-::v-deep .expression-dialog {
-	.el-dialog__header {
-		padding: 0;
-	}
-	.el-dialog__title {
-		display: none;
-	}
-
-	.el-dialog__body {
-		padding: 0;
-		font-size: var(--font-size-s);
-	}
-
-	.right-side {
-		background-color: var(--color-background-light);
-		border-top-right-radius: 8px;
-		border-bottom-right-radius: 8px;
-	}
-}
-
 .header-side-menu {
-	padding: 1em 0 0.5em 1.8em;
+	padding: 1em 0 0.5em var(--spacing-s);
 	border-top-left-radius: 8px;
 
 	background-color: var(--color-background-base);
@@ -332,6 +382,6 @@ export default mixins(externalHooks, genericHelpers, debounceHelper).extend({
 }
 
 .variable-selector {
-	margin: 0 1em;
+	margin: 0 var(--spacing-s);
 }
 </style>
diff --git a/packages/editor-ui/src/components/ExpressionEditorModal/ExpressionEditorModalInput.vue b/packages/editor-ui/src/components/ExpressionEditorModal/ExpressionEditorModalInput.vue
index ad790ff2fa808..1f9b7b29305a1 100644
--- a/packages/editor-ui/src/components/ExpressionEditorModal/ExpressionEditorModalInput.vue
+++ b/packages/editor-ui/src/components/ExpressionEditorModal/ExpressionEditorModalInput.vue
@@ -1,141 +1,153 @@
 <template>
-	<div ref="root" class="ph-no-capture" @keydown.stop></div>
+	<div ref="root" :class="$style.editor" @keydown.stop></div>
 </template>
 
-<script lang="ts">
-import mixins from 'vue-typed-mixins';
+<script setup lang="ts">
+import { history } from '@codemirror/commands';
+import { Prec } from '@codemirror/state';
 import { EditorView, keymap } from '@codemirror/view';
-import { EditorState, Prec } from '@codemirror/state';
-import { history, redo } from '@codemirror/commands';
+import { computed, onMounted, ref, toValue, watch } from 'vue';
 
-import { workflowHelpers } from '@/mixins/workflowHelpers';
-import { expressionManager } from '@/mixins/expressionManager';
-import { completionManager } from '@/mixins/completionManager';
 import { expressionInputHandler } from '@/plugins/codemirror/inputHandlers/expression.inputHandler';
-import { n8nLang } from '@/plugins/codemirror/n8nLang';
-import { highlighter } from '@/plugins/codemirror/resolvableHighlighter';
-import { inputTheme } from './theme';
+import { n8nAutocompletion, n8nLang } from '@/plugins/codemirror/n8nLang';
 import { forceParse } from '@/utils/forceParse';
-import { acceptCompletion, autocompletion } from '@codemirror/autocomplete';
+import { completionStatus } from '@codemirror/autocomplete';
+import { inputTheme } from './theme';
 
 import type { IVariableItemSelected } from '@/Interface';
+import { useExpressionEditor } from '@/composables/useExpressionEditor';
+import {
+	autocompleteKeyMap,
+	enterKeyMap,
+	historyKeyMap,
+	tabKeyMap,
+} from '@/plugins/codemirror/keymap';
+import type { Segment } from '@/types/expressions';
+import { removeExpressionPrefix } from '@/utils/expressions';
+
+type Props = {
+	modelValue: string;
+	path: string;
+	isReadOnly?: boolean;
+};
+
+const props = withDefaults(defineProps<Props>(), {
+	isReadOnly: false,
+});
 
-export default mixins(expressionManager, completionManager, workflowHelpers).extend({
-	name: 'ExpressionEditorModalInput',
-	props: {
-		value: {
-			type: String,
-		},
-		path: {
-			type: String,
-		},
-		isReadOnly: {
-			type: Boolean,
-		},
-	},
-	data() {
-		return {
-			editor: null as EditorView | null,
-		};
-	},
-	mounted() {
-		const extensions = [
-			inputTheme(),
-			autocompletion(),
-			Prec.highest(
-				keymap.of([
-					{ key: 'Tab', run: acceptCompletion },
-					{
-						any: (_: EditorView, event: KeyboardEvent) => {
-							if (event.key === 'Escape') {
-								event.stopPropagation();
-								this.$emit('close');
-							}
-
-							return false;
-						},
-					},
-					{ key: 'Mod-Shift-z', run: redo },
-				]),
-			),
-			n8nLang(),
-			history(),
-			expressionInputHandler(),
-			EditorView.lineWrapping,
-			EditorState.readOnly.of(this.isReadOnly),
-			EditorView.contentAttributes.of({ 'data-gramm': 'false' }), // disable grammarly
-			EditorView.domEventHandlers({ scroll: forceParse }),
-			EditorView.updateListener.of((viewUpdate) => {
-				if (!this.editor || !viewUpdate.docChanged) return;
-
-				highlighter.removeColor(this.editor, this.plaintextSegments);
-				highlighter.addColor(this.editor, this.resolvableSegments);
-
-				setTimeout(() => {
-					this.editor?.focus(); // prevent blur on paste
-					try {
-						this.trackCompletion(viewUpdate, this.path);
-					} catch {}
-				});
-
-				this.$emit('change', {
-					value: this.unresolvedExpression,
-					segments: this.displayableSegments,
-				});
-			}),
-		];
-
-		this.editor = new EditorView({
-			parent: this.$refs.root as HTMLDivElement,
-			state: EditorState.create({
-				doc: this.value.startsWith('=') ? this.value.slice(1) : this.value,
-				extensions,
-			}),
-		});
-
-		this.editor.focus();
-
-		highlighter.addColor(this.editor, this.resolvableSegments);
-
-		this.editor.dispatch({
-			selection: { anchor: this.editor.state.doc.length },
-		});
-
-		this.$emit('change', {
-			value: this.unresolvedExpression,
-			segments: this.displayableSegments,
-		});
-	},
-	destroyed() {
-		this.editor?.destroy();
+const emit = defineEmits<{
+	(event: 'change', value: { value: string; segments: Segment[] }): void;
+	(event: 'focus'): void;
+	(event: 'close'): void;
+}>();
+
+const root = ref<HTMLElement>();
+const extensions = computed(() => [
+	inputTheme(),
+	Prec.highest(
+		keymap.of([
+			...tabKeyMap(),
+			...historyKeyMap,
+			...enterKeyMap,
+			...autocompleteKeyMap,
+			{
+				any: (view, event) => {
+					if (event.key === 'Escape' && completionStatus(view.state) === null) {
+						event.stopPropagation();
+						emit('close');
+					}
+
+					return false;
+				},
+			},
+		]),
+	),
+	n8nLang(),
+	n8nAutocompletion(),
+	history(),
+	expressionInputHandler(),
+	EditorView.lineWrapping,
+	EditorView.domEventHandlers({ scroll: forceParse }),
+]);
+const editorValue = ref<string>(removeExpressionPrefix(props.modelValue));
+const {
+	editor: editorRef,
+	segments,
+	readEditorValue,
+	setCursorPosition,
+	hasFocus,
+	focus,
+} = useExpressionEditor({
+	editorRef: root,
+	editorValue,
+	extensions,
+	isReadOnly: props.isReadOnly,
+	autocompleteTelemetry: { enabled: true, parameterPath: props.path },
+});
+
+watch(
+	() => props.modelValue,
+	(newValue) => {
+		editorValue.value = removeExpressionPrefix(newValue);
 	},
-	methods: {
-		itemSelected({ variable }: IVariableItemSelected) {
-			if (!this.editor || this.isReadOnly) return;
+);
 
-			const OPEN_MARKER = '{{';
-			const CLOSE_MARKER = '}}';
+watch(segments.display, (newSegments) => {
+	emit('change', {
+		value: '=' + readEditorValue(),
+		segments: newSegments,
+	});
+});
 
-			const { doc, selection } = this.editor.state;
-			const { head } = selection.main;
+watch(hasFocus, (focused) => {
+	if (focused) {
+		emit('focus');
+	}
+});
 
-			const isInsideResolvable =
-				doc.toString().slice(0, head).includes(OPEN_MARKER) &&
-				doc.toString().slice(head, doc.length).includes(CLOSE_MARKER);
+onMounted(() => {
+	focus();
+});
 
-			const insert = isInsideResolvable
-				? variable
-				: [OPEN_MARKER, variable, CLOSE_MARKER].join(' ');
+function itemSelected({ variable }: IVariableItemSelected) {
+	const editor = toValue(editorRef);
 
-			this.editor.dispatch({
-				changes: {
-					from: head,
-					insert,
-				},
-			});
+	if (!editor || props.isReadOnly) return;
+
+	const OPEN_MARKER = '{{';
+	const CLOSE_MARKER = '}}';
+
+	const { selection, doc } = editor.state;
+	const { head } = selection.main;
+
+	const isInsideResolvable =
+		editor.state.sliceDoc(0, head).includes(OPEN_MARKER) &&
+		editor.state.sliceDoc(head, doc.length).includes(CLOSE_MARKER);
+
+	const insert = isInsideResolvable ? variable : [OPEN_MARKER, variable, CLOSE_MARKER].join(' ');
+
+	editor.dispatch({
+		changes: {
+			from: head,
+			insert,
 		},
-	},
-});
+	});
+
+	focus();
+	setCursorPosition(head + insert.length);
+}
+
+defineExpose({ itemSelected });
 </script>
 
-<style lang="scss"></style>
+<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-content) {
+	border-radius: var(--border-radius-base);
+}
+</style>
diff --git a/packages/editor-ui/src/components/ExpressionEditorModal/ExpressionEditorModalOutput.vue b/packages/editor-ui/src/components/ExpressionEditorModal/ExpressionEditorModalOutput.vue
deleted file mode 100644
index 8c1d9f3ad3bf1..0000000000000
--- a/packages/editor-ui/src/components/ExpressionEditorModal/ExpressionEditorModalOutput.vue
+++ /dev/null
@@ -1,100 +0,0 @@
-<template>
-	<div ref="root" class="ph-no-capture"></div>
-</template>
-
-<script lang="ts">
-import { EditorView } from '@codemirror/view';
-import { EditorState } from '@codemirror/state';
-import { defineComponent } from 'vue';
-import type { PropType } from 'vue';
-
-import { highlighter } from '@/plugins/codemirror/resolvableHighlighter';
-import { outputTheme } from './theme';
-
-import type { Plaintext, Resolved, Segment } from '@/types/expressions';
-import { forceParse } from '@/utils/forceParse';
-
-export default defineComponent({
-	name: 'ExpressionEditorModalOutput',
-	props: {
-		segments: {
-			type: Array as PropType<Segment[]>,
-		},
-	},
-	watch: {
-		segments() {
-			if (!this.editor) return;
-
-			this.editor.dispatch({
-				changes: { from: 0, to: this.editor.state.doc.length, insert: this.resolvedExpression },
-			});
-
-			highlighter.addColor(this.editor, this.resolvedSegments);
-			highlighter.removeColor(this.editor, this.plaintextSegments);
-		},
-	},
-	data() {
-		return {
-			editor: null as EditorView | null,
-		};
-	},
-	mounted() {
-		const extensions = [
-			outputTheme(),
-			EditorState.readOnly.of(true),
-			EditorView.lineWrapping,
-			EditorView.domEventHandlers({ scroll: forceParse }),
-		];
-
-		this.editor = new EditorView({
-			parent: this.$refs.root as HTMLDivElement,
-			state: EditorState.create({
-				doc: this.resolvedExpression,
-				extensions,
-			}),
-		});
-	},
-	destroyed() {
-		this.editor?.destroy();
-	},
-	computed: {
-		resolvedExpression(): string {
-			return this.segments.reduce((acc, segment) => {
-				acc += segment.kind === 'resolvable' ? segment.resolved : segment.plaintext;
-				return acc;
-			}, '');
-		},
-		plaintextSegments(): Plaintext[] {
-			return this.segments.filter((s): s is Plaintext => s.kind === 'plaintext');
-		},
-		resolvedSegments(): Resolved[] {
-			let cursor = 0;
-
-			return this.segments
-				.map((segment) => {
-					segment.from = cursor;
-
-					cursor +=
-						segment.kind === 'plaintext'
-							? segment.plaintext.length
-							: // eslint-disable-next-line @typescript-eslint/no-explicit-any
-							segment.resolved
-							? (segment.resolved as any).toString().length
-							: 0;
-
-					segment.to = cursor;
-
-					return segment;
-				})
-				.filter((segment): segment is Resolved => segment.kind === 'resolvable');
-		},
-	},
-	methods: {
-		getValue() {
-			return '=' + this.resolvedExpression;
-		},
-	},
-});
-</script>
-
-<style lang="scss"></style>
diff --git a/packages/editor-ui/src/components/ExpressionEditorModal/theme.ts b/packages/editor-ui/src/components/ExpressionEditorModal/theme.ts
index 5369f9c32ce0f..f47f7c1535ec3 100644
--- a/packages/editor-ui/src/components/ExpressionEditorModal/theme.ts
+++ b/packages/editor-ui/src/components/ExpressionEditorModal/theme.ts
@@ -18,6 +18,7 @@ const commonThemeProps = {
 		height: '220px',
 		padding: 'var(--spacing-xs)',
 		color: 'var(--input-font-color, var(--color-text-dark))',
+		caretColor: 'var(--color-code-caret)',
 	},
 	'.cm-line': {
 		padding: '0',
diff --git a/packages/editor-ui/src/components/ExpressionParameterInput.vue b/packages/editor-ui/src/components/ExpressionParameterInput.vue
index f26dee0ebe2a6..dcbcb4377c75c 100644
--- a/packages/editor-ui/src/components/ExpressionParameterInput.vue
+++ b/packages/editor-ui/src/components/ExpressionParameterInput.vue
@@ -1,193 +1,188 @@
+<script setup lang="ts">
+import { computed, ref, watch } from 'vue';
+
+import ExpressionFunctionIcon from '@/components/ExpressionFunctionIcon.vue';
+import InlineExpressionEditorInput from '@/components/InlineExpressionEditor/InlineExpressionEditorInput.vue';
+import InlineExpressionEditorOutput from '@/components/InlineExpressionEditor/InlineExpressionEditorOutput.vue';
+import { useNDVStore } from '@/stores/ndv.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { createExpressionTelemetryPayload } from '@/utils/telemetryUtils';
+
+import { useTelemetry } from '@/composables/useTelemetry';
+import type { Segment } from '@/types/expressions';
+import { createEventBus, type EventBus } from 'n8n-design-system/utils';
+import type { IDataObject } from 'n8n-workflow';
+import type { EditorState, SelectionRange } from '@codemirror/state';
+
+const isFocused = ref(false);
+const segments = ref<Segment[]>([]);
+const editorState = ref<EditorState>();
+const selection = ref<SelectionRange>();
+const inlineInput = ref<InstanceType<typeof InlineExpressionEditorInput>>();
+
+type Props = {
+	path: string;
+	modelValue: string;
+	isReadOnly: boolean;
+	rows: number;
+	isAssignment: boolean;
+	additionalExpressionData: IDataObject;
+	eventBus: EventBus;
+};
+
+const props = withDefaults(defineProps<Props>(), {
+	rows: 5,
+	isAssignment: false,
+	additionalExpressionData: () => ({}),
+	eventBus: () => createEventBus(),
+});
+
+const emit = defineEmits<{
+	(event: 'modal-opener-click'): void;
+	(event: 'update:model-value', value: string): void;
+	(event: 'focus'): void;
+	(event: 'blur'): void;
+}>();
+
+const telemetry = useTelemetry();
+const ndvStore = useNDVStore();
+const workflowsStore = useWorkflowsStore();
+
+const hoveringItemNumber = computed(() => ndvStore.hoveringItemNumber);
+const isDragging = computed(() => ndvStore.isDraggableDragging);
+const noInputData = computed(() => ndvStore.hasInputData);
+
+function focus() {
+	if (inlineInput.value) {
+		inlineInput.value.focus();
+	}
+}
+
+function onFocus() {
+	isFocused.value = true;
+	emit('focus');
+}
+
+function onBlur(event?: FocusEvent | KeyboardEvent) {
+	if (
+		event?.target instanceof Element &&
+		Array.from(event.target.classList).some((_class) => _class.includes('resizer'))
+	) {
+		return; // prevent blur on resizing
+	}
+
+	const wasFocused = isFocused.value;
+
+	isFocused.value = false;
+
+	if (wasFocused) {
+		emit('blur');
+
+		const telemetryPayload = createExpressionTelemetryPayload(
+			segments.value,
+			props.modelValue,
+			workflowsStore.workflowId,
+			ndvStore.pushRef,
+			ndvStore.activeNode?.type ?? '',
+		);
+
+		telemetry.track('User closed Expression Editor', telemetryPayload);
+	}
+}
+
+function onValueChange({ value, segments: newSegments }: { value: string; segments: Segment[] }) {
+	segments.value = newSegments;
+
+	if (isDragging.value) return;
+	if (value === '=' + props.modelValue) return; // prevent report on change of target item
+
+	emit('update:model-value', value);
+}
+
+function onSelectionChange({
+	state: newState,
+	selection: newSelection,
+}: {
+	state: EditorState;
+	selection: SelectionRange;
+}) {
+	editorState.value = newState;
+	selection.value = newSelection;
+}
+
+watch(isDragging, (newIsDragging) => {
+	if (newIsDragging) {
+		onBlur();
+	}
+});
+
+defineExpose({ focus });
+</script>
+
 <template>
-	<div :class="$style['expression-parameter-input']" v-click-outside="onBlur" @keydown.tab="onBlur">
-		<div :class="[$style['all-sections'], { [$style['focused']]: isFocused }]">
-			<div
-				:class="[
-					$style['prepend-section'],
-					'el-input-group__prepend',
-					{ [$style['squared']]: isForRecordLocator },
-				]"
-			>
-				<ExpressionFunctionIcon />
+	<div
+		v-on-click-outside="onBlur"
+		:class="$style['expression-parameter-input']"
+		@keydown.tab="onBlur"
+	>
+		<div
+			:class="[
+				$style['all-sections'],
+				{ [$style.focused]: isFocused, [$style.assignment]: isAssignment },
+			]"
+		>
+			<div :class="[$style['prepend-section'], 'el-input-group__prepend']">
+				<span v-if="isAssignment">=</span>
+				<ExpressionFunctionIcon v-else />
 			</div>
 			<InlineExpressionEditorInput
-				:value="value"
-				:isReadOnly="isReadOnly"
-				:targetItem="hoveringItem"
-				:isSingleLine="isForRecordLocator"
+				ref="inlineInput"
+				:model-value="modelValue"
 				:path="path"
+				:is-read-only="isReadOnly"
+				:rows="rows"
+				:additional-data="additionalExpressionData"
+				:event-bus="eventBus"
 				@focus="onFocus"
 				@blur="onBlur"
-				@change="onChange"
-				ref="inlineInput"
+				@update:model-value="onValueChange"
+				@update:selection="onSelectionChange"
 			/>
-			<n8n-icon
+			<n8n-button
 				v-if="!isDragging"
+				square
+				outline
+				type="tertiary"
 				icon="external-link-alt"
 				size="xsmall"
 				:class="$style['expression-editor-modal-opener']"
-				@click="$emit('modalOpenerClick')"
 				data-test-id="expander"
+				@click="emit('modal-opener-click')"
 			/>
 		</div>
-
-		<div :class="isFocused ? $style.dropdown : $style.hidden">
-			<n8n-text size="small" compact :class="$style.header">
-				{{ $locale.baseText('parameterInput.resultForItem') }} {{ hoveringItemNumber }}
-			</n8n-text>
-			<n8n-text :class="$style.body">
-				<InlineExpressionEditorOutput
-					:value="value"
-					:isReadOnly="isReadOnly"
-					:segments="segments"
-				/>
-			</n8n-text>
-			<div :class="$style.footer">
-				<n8n-text size="small" compact>
-					{{ $locale.baseText('parameterInput.anythingInside') }}
-				</n8n-text>
-				<div :class="$style['expression-syntax-example']" v-text="`{{ }}`"></div>
-				<n8n-text size="small" compact>
-					{{ $locale.baseText('parameterInput.isJavaScript') }}
-				</n8n-text>
-				<n8n-link
-					:class="$style['learn-more']"
-					size="small"
-					underline
-					theme="text"
-					:to="expressionsDocsUrl"
-				>
-					{{ $locale.baseText('parameterInput.learnMore') }}
-				</n8n-link>
-			</div>
-		</div>
+		<InlineExpressionEditorOutput
+			:unresolved-expression="modelValue"
+			:selection="selection"
+			:editor-state="editorState"
+			:segments="segments"
+			:is-read-only="isReadOnly"
+			:no-input-data="noInputData"
+			:visible="isFocused"
+			:hovering-item-number="hoveringItemNumber"
+		/>
 	</div>
 </template>
 
-<script lang="ts">
-import { mapStores } from 'pinia';
-import { defineComponent } from 'vue';
-
-import { useNDVStore } from '@/stores/ndv';
-import { useWorkflowsStore } from '@/stores/workflows';
-import InlineExpressionEditorInput from '@/components/InlineExpressionEditor/InlineExpressionEditorInput.vue';
-import InlineExpressionEditorOutput from '@/components/InlineExpressionEditor/InlineExpressionEditorOutput.vue';
-import ExpressionFunctionIcon from '@/components/ExpressionFunctionIcon.vue';
-import { createExpressionTelemetryPayload } from '@/utils/telemetryUtils';
-import { EXPRESSIONS_DOCS_URL } from '@/constants';
-
-import type { Segment } from '@/types/expressions';
-import type { TargetItem } from '@/Interface';
-
-type InlineExpressionEditorInputRef = InstanceType<typeof InlineExpressionEditorInput>;
-
-export default defineComponent({
-	name: 'ExpressionParameterInput',
-	components: {
-		InlineExpressionEditorInput,
-		InlineExpressionEditorOutput,
-		ExpressionFunctionIcon,
-	},
-	data() {
-		return {
-			isFocused: false,
-			segments: [] as Segment[],
-			expressionsDocsUrl: EXPRESSIONS_DOCS_URL,
-		};
-	},
-	props: {
-		path: {
-			type: String,
-		},
-		value: {
-			type: String,
-		},
-		isReadOnly: {
-			type: Boolean,
-			default: false,
-		},
-		isForRecordLocator: {
-			type: Boolean,
-			default: false,
-		},
-	},
-	computed: {
-		...mapStores(useNDVStore, useWorkflowsStore),
-		hoveringItemNumber(): number {
-			return (this.hoveringItem?.itemIndex ?? 0) + 1;
-		},
-		hoveringItem(): TargetItem | null {
-			if (this.ndvStore.isInputParentOfActiveNode) {
-				return this.ndvStore.hoveringItem;
-			}
-
-			return null;
-		},
-		isDragging(): boolean {
-			return this.ndvStore.isDraggableDragging;
-		},
-	},
-	methods: {
-		focus() {
-			const inlineInputRef = this.$refs.inlineInput as InlineExpressionEditorInputRef | undefined;
-			if (inlineInputRef?.$el) {
-				inlineInputRef.focus();
-			}
-		},
-		onFocus() {
-			this.isFocused = true;
-
-			this.$emit('focus');
-		},
-		onBlur(event: FocusEvent | KeyboardEvent) {
-			if (
-				event.target instanceof Element &&
-				Array.from(event.target.classList).some((_class) => _class.includes('resizer'))
-			) {
-				return; // prevent blur on resizing
-			}
-
-			if (this.isDragging) return; // prevent blur on dragging
-
-			const wasFocused = this.isFocused;
-
-			this.isFocused = false;
-
-			this.$emit('blur');
-
-			if (wasFocused) {
-				const telemetryPayload = createExpressionTelemetryPayload(
-					this.segments,
-					this.value,
-					this.workflowsStore.workflowId,
-					this.ndvStore.sessionId,
-					this.ndvStore.activeNode?.type ?? '',
-				);
-
-				this.$telemetry.track('User closed Expression Editor', telemetryPayload);
-			}
-		},
-		onChange({ value, segments }: { value: string; segments: Segment[] }) {
-			if (this.isDragging) return;
-
-			this.segments = segments;
-
-			if (value === '=' + this.value) return; // prevent report on change of target item
-
-			this.$emit('valueChanged', value);
-		},
-	},
-});
-</script>
-
 <style lang="scss" module>
 .expression-parameter-input {
 	position: relative;
 
+	:global(.cm-editor) {
+		background-color: var(--color-code-background);
+	}
+
 	.all-sections {
 		height: 30px;
-		display: flex;
-		flex-direction: row;
 		display: inline-table;
 		width: 100%;
 	}
@@ -198,9 +193,12 @@ export default defineComponent({
 		width: 22px;
 		text-align: center;
 	}
+}
 
-	.squared {
-		border-radius: 0;
+.assignment {
+	.prepend-section {
+		vertical-align: top;
+		padding-top: 4px;
 	}
 }
 
@@ -208,22 +206,26 @@ export default defineComponent({
 	position: absolute;
 	right: 0;
 	bottom: 0;
-	background-color: white;
+	background-color: var(--color-code-background);
 	padding: 3px;
 	line-height: 9px;
-	border: var(--border-base);
-	border-top-left-radius: var(--border-radius-base);
-	border-bottom-right-radius: var(--border-radius-base);
+	border: var(--input-border-color, var(--border-color-base))
+		var(--input-border-style, var(--border-style-base))
+		var(--input-border-width, var(--border-width-base));
 	cursor: pointer;
+	border-radius: 0;
+	border-top-left-radius: var(--border-radius-base);
+
+	&:hover {
+		border: var(--input-border-color, var(--border-color-base))
+			var(--input-border-style, var(--border-style-base))
+			var(--input-border-width, var(--border-width-base));
+	}
 
 	svg {
 		width: 9px !important;
 		height: 9px;
 		transform: rotate(270deg);
-
-		&:hover {
-			color: var(--color-primary);
-		}
 	}
 }
 
@@ -239,66 +241,6 @@ export default defineComponent({
 .focused > .expression-editor-modal-opener {
 	border-color: var(--color-secondary);
 	border-bottom-right-radius: 0;
-	background-color: white;
-}
-
-.hidden {
-	display: none;
-}
-
-.dropdown {
-	display: flex;
-	flex-direction: column;
-	position: absolute;
-	z-index: 2; // cover tooltips
-	background: white;
-	border: var(--border-base);
-	border-top: none;
-	width: 100%;
-	box-shadow: 0 2px 6px 0 rgba(#441c17, 0.1);
-	border-bottom-left-radius: 4px;
-	border-bottom-right-radius: 4px;
-
-	.header,
-	.body,
-	.footer {
-		padding: var(--spacing-3xs);
-	}
-
-	.header {
-		color: var(--color-text-dark);
-		font-weight: var(--font-weight-bold);
-		padding-left: var(--spacing-2xs);
-		padding-top: var(--spacing-2xs);
-	}
-
-	.body {
-		padding-top: 0;
-		padding-left: var(--spacing-2xs);
-		color: var(--color-text-dark);
-	}
-
-	.footer {
-		border-top: var(--border-base);
-		padding: var(--spacing-4xs);
-		padding-left: var(--spacing-2xs);
-		padding-top: 0;
-		line-height: var(--font-line-height-regular);
-		color: var(--color-text-base);
-
-		.expression-syntax-example {
-			display: inline-block;
-			font-size: var(--font-size-2xs);
-			height: var(--font-size-m);
-			background-color: #f0f0f0;
-			margin-left: var(--spacing-5xs);
-			margin-right: var(--spacing-5xs);
-		}
-
-		.learn-more {
-			line-height: 1;
-			white-space: nowrap;
-		}
-	}
+	background-color: var(--color-code-background);
 }
 </style>
diff --git a/packages/editor-ui/src/components/ExternalSecretsProviderCard.ee.vue b/packages/editor-ui/src/components/ExternalSecretsProviderCard.ee.vue
new file mode 100644
index 0000000000000..eb20c7d90e2f8
--- /dev/null
+++ b/packages/editor-ui/src/components/ExternalSecretsProviderCard.ee.vue
@@ -0,0 +1,188 @@
+<script lang="ts" setup>
+import type { PropType, Ref } from 'vue';
+import type { ExternalSecretsProvider } from '@/Interface';
+import ExternalSecretsProviderImage from '@/components/ExternalSecretsProviderImage.ee.vue';
+import ExternalSecretsProviderConnectionSwitch from '@/components/ExternalSecretsProviderConnectionSwitch.ee.vue';
+import { useExternalSecretsStore } from '@/stores/externalSecrets.ee.store';
+import { useUIStore } from '@/stores/ui.store';
+import { useToast } from '@/composables/useToast';
+import { useI18n } from '@/composables/useI18n';
+import { useExternalSecretsProvider } from '@/composables/useExternalSecretsProvider';
+import { EXTERNAL_SECRETS_PROVIDER_MODAL_KEY } from '@/constants';
+import { DateTime } from 'luxon';
+import { computed, nextTick, onMounted, toRefs } from 'vue';
+
+const props = defineProps({
+	provider: {
+		type: Object as PropType<ExternalSecretsProvider>,
+		required: true,
+	},
+});
+
+const externalSecretsStore = useExternalSecretsStore();
+const i18n = useI18n();
+const uiStore = useUIStore();
+const toast = useToast();
+
+const { provider } = toRefs(props) as Ref<ExternalSecretsProvider>;
+const providerData = computed(() => provider.value.data);
+const {
+	connectionState,
+	initialConnectionState,
+	normalizedProviderData,
+	testConnection,
+	setConnectionState,
+} = useExternalSecretsProvider(provider, providerData);
+
+const actionDropdownOptions = computed(() => [
+	{
+		value: 'setup',
+		label: i18n.baseText('settings.externalSecrets.card.actionDropdown.setup'),
+	},
+	...(props.provider.connected
+		? [
+				{
+					value: 'reload',
+					label: i18n.baseText('settings.externalSecrets.card.actionDropdown.reload'),
+				},
+			]
+		: []),
+]);
+
+const canConnect = computed(() => {
+	return props.provider.connected || Object.keys(props.provider.data).length > 0;
+});
+
+const formattedDate = computed((provider: ExternalSecretsProvider) => {
+	return DateTime.fromISO(props.provider.connectedAt ?? new Date()).toFormat('dd LLL yyyy');
+});
+
+onMounted(() => {
+	setConnectionState(props.provider.state);
+});
+
+async function onBeforeConnectionUpdate() {
+	if (props.provider.connected) {
+		return true;
+	}
+
+	await externalSecretsStore.getProvider(props.provider.name);
+	await nextTick();
+	const status = await testConnection();
+
+	return status !== 'error';
+}
+
+function openExternalSecretProvider() {
+	uiStore.openModalWithData({
+		name: EXTERNAL_SECRETS_PROVIDER_MODAL_KEY,
+		data: { name: props.provider.name },
+	});
+}
+
+async function reloadProvider() {
+	try {
+		await externalSecretsStore.reloadProvider(props.provider.name);
+		toast.showMessage({
+			title: i18n.baseText('settings.externalSecrets.card.reload.success.title'),
+			message: i18n.baseText('settings.externalSecrets.card.reload.success.description', {
+				interpolate: { provider: props.provider.displayName },
+			}),
+			type: 'success',
+		});
+	} catch (error) {
+		toast.showError(error, i18n.baseText('error'));
+	}
+}
+
+async function onActionDropdownClick(id: string) {
+	switch (id) {
+		case 'setup':
+			openExternalSecretProvider();
+			break;
+		case 'reload':
+			await reloadProvider();
+			break;
+	}
+}
+</script>
+
+<template>
+	<n8n-card :class="$style.card">
+		<div :class="$style.cardBody">
+			<ExternalSecretsProviderImage :class="$style.cardImage" :provider="provider" />
+			<div :class="$style.cardContent">
+				<n8n-text bold>{{ provider.displayName }}</n8n-text>
+				<n8n-text v-if="provider.connected" color="text-light" size="small">
+					<span>
+						{{
+							i18n.baseText('settings.externalSecrets.card.secretsCount', {
+								interpolate: {
+									count: `${externalSecretsStore.secrets[provider.name]?.length}`,
+								},
+							})
+						}}
+					</span>
+					|
+					<span>
+						{{
+							i18n.baseText('settings.externalSecrets.card.connectedAt', {
+								interpolate: {
+									date: formattedDate,
+								},
+							})
+						}}
+					</span>
+				</n8n-text>
+			</div>
+			<div v-if="canConnect" :class="$style.cardActions">
+				<ExternalSecretsProviderConnectionSwitch
+					:provider="provider"
+					:before-update="onBeforeConnectionUpdate"
+					:disabled="connectionState === 'error' && !provider.connected"
+				/>
+				<n8n-action-toggle
+					class="ml-s"
+					theme="dark"
+					:actions="actionDropdownOptions"
+					@action="onActionDropdownClick"
+				/>
+			</div>
+			<n8n-button v-else type="tertiary" @click="openExternalSecretProvider()">
+				{{ i18n.baseText('settings.externalSecrets.card.setUp') }}
+			</n8n-button>
+		</div>
+	</n8n-card>
+</template>
+
+<style lang="scss" module>
+.card {
+	position: relative;
+	margin-bottom: var(--spacing-2xs);
+}
+
+.cardImage {
+	width: 28px;
+	height: 28px;
+}
+
+.cardBody {
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+}
+
+.cardContent {
+	display: flex;
+	flex-direction: column;
+	flex-grow: 1;
+	margin-left: var(--spacing-s);
+}
+
+.cardActions {
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+	margin-left: var(--spacing-s);
+}
+</style>
diff --git a/packages/editor-ui/src/components/ExternalSecretsProviderConnectionSwitch.ee.vue b/packages/editor-ui/src/components/ExternalSecretsProviderConnectionSwitch.ee.vue
new file mode 100644
index 0000000000000..79aecfd6f7ad5
--- /dev/null
+++ b/packages/editor-ui/src/components/ExternalSecretsProviderConnectionSwitch.ee.vue
@@ -0,0 +1,118 @@
+<script lang="ts" setup>
+import type { PropType } from 'vue';
+import type { ExternalSecretsProvider } from '@/Interface';
+import { useExternalSecretsStore } from '@/stores/externalSecrets.ee.store';
+import { useToast } from '@/composables/useToast';
+import { useI18n } from '@/composables/useI18n';
+import { useLoadingService } from '@/composables/useLoadingService';
+import { computed, onMounted, ref } from 'vue';
+import type { EventBus } from 'n8n-design-system/utils';
+
+const emit = defineEmits<{
+	(e: 'change', value: boolean): void;
+}>();
+
+const props = defineProps({
+	provider: {
+		type: Object as PropType<ExternalSecretsProvider>,
+		required: true,
+	},
+	eventBus: {
+		type: Object as PropType<EventBus>,
+		default: undefined,
+	},
+	disabled: {
+		type: Boolean,
+		default: false,
+	},
+	beforeUpdate: {
+		type: Function,
+		default: undefined,
+	},
+});
+
+const loadingService = useLoadingService();
+const externalSecretsStore = useExternalSecretsStore();
+const i18n = useI18n();
+const toast = useToast();
+
+const saving = ref(false);
+
+const connectedTextColor = computed(() => {
+	return props.provider.connected ? 'success' : 'text-light';
+});
+
+onMounted(() => {
+	if (props.eventBus) {
+		props.eventBus.on('connect', onUpdateConnected);
+	}
+});
+
+async function onUpdateConnected(value: boolean) {
+	try {
+		saving.value = true;
+
+		if (props.beforeUpdate) {
+			const result = await props.beforeUpdate(value);
+			if (result === false) {
+				saving.value = false;
+				return;
+			}
+		}
+
+		await externalSecretsStore.updateProviderConnected(props.provider.name, value);
+
+		emit('change', value);
+	} catch (error) {
+		toast.showError(error, 'Error');
+	} finally {
+		saving.value = false;
+	}
+}
+</script>
+
+<template>
+	<div v-loading="saving" class="connection-switch">
+		<n8n-icon
+			v-if="provider.state === 'error'"
+			color="danger"
+			icon="exclamation-triangle"
+			class="mr-2xs"
+		/>
+		<n8n-text :color="connectedTextColor" bold class="mr-2xs">
+			{{
+				i18n.baseText(
+					`settings.externalSecrets.card.${provider.connected ? 'connected' : 'disconnected'}`,
+				)
+			}}
+		</n8n-text>
+		<el-switch
+			:model-value="provider.connected"
+			:title="
+				i18n.baseText('settings.externalSecrets.card.connectedSwitch.title', {
+					interpolate: { provider: provider.displayName },
+				})
+			"
+			:disabled="disabled"
+			data-test-id="settings-external-secrets-connected-switch"
+			@update:model-value="onUpdateConnected"
+		>
+		</el-switch>
+	</div>
+</template>
+
+<style lang="scss" scoped>
+.connection-switch {
+	position: relative;
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+
+	&.error {
+		:deep(.el-switch.is-checked .el-switch__core) {
+			background-color: #ff4027;
+			border-color: #ff4027;
+		}
+	}
+}
+</style>
diff --git a/packages/editor-ui/src/components/ExternalSecretsProviderImage.ee.vue b/packages/editor-ui/src/components/ExternalSecretsProviderImage.ee.vue
new file mode 100644
index 0000000000000..4f72dc791811a
--- /dev/null
+++ b/packages/editor-ui/src/components/ExternalSecretsProviderImage.ee.vue
@@ -0,0 +1,30 @@
+<script lang="ts" setup>
+import type { PropType } from 'vue';
+import type { ExternalSecretsProvider } from '@/Interface';
+import { computed } from 'vue';
+import infisical from '../assets/images/infisical.webp';
+import doppler from '../assets/images/doppler.webp';
+import vault from '../assets/images/hashicorp.webp';
+import awsSecretsManager from '../assets/images/aws-secrets-manager.svg';
+
+const props = defineProps({
+	provider: {
+		type: Object as PropType<ExternalSecretsProvider>,
+		required: true,
+	},
+});
+
+const image = computed(
+	() =>
+		({
+			doppler,
+			infisical,
+			vault,
+			awsSecretsManager,
+		})[props.provider.name],
+);
+</script>
+
+<template>
+	<img :src="image" :alt="provider.displayName" width="28" height="28" />
+</template>
diff --git a/packages/editor-ui/src/components/ExternalSecretsProviderModal.ee.vue b/packages/editor-ui/src/components/ExternalSecretsProviderModal.ee.vue
new file mode 100644
index 0000000000000..c44c4f8ee7569
--- /dev/null
+++ b/packages/editor-ui/src/components/ExternalSecretsProviderModal.ee.vue
@@ -0,0 +1,337 @@
+<script lang="ts" setup>
+import Modal from './Modal.vue';
+import { EXTERNAL_SECRETS_PROVIDER_MODAL_KEY, MODAL_CONFIRM } from '@/constants';
+import { computed, onMounted, ref } from 'vue';
+import type { PropType, Ref } from 'vue';
+import type { EventBus } from 'n8n-design-system/utils';
+import { useExternalSecretsProvider } from '@/composables/useExternalSecretsProvider';
+import { useI18n } from '@/composables/useI18n';
+import { useMessage } from '@/composables/useMessage';
+import { useToast } from '@/composables/useToast';
+import { useExternalSecretsStore } from '@/stores/externalSecrets.ee.store';
+import { useUIStore } from '@/stores/ui.store';
+import { useRoute } from 'vue-router';
+import ParameterInputExpanded from '@/components/ParameterInputExpanded.vue';
+import type {
+	IUpdateInformation,
+	ExternalSecretsProviderData,
+	ExternalSecretsProvider,
+} from '@/Interface';
+import type { IParameterLabel } from 'n8n-workflow';
+import ExternalSecretsProviderImage from '@/components/ExternalSecretsProviderImage.ee.vue';
+import ExternalSecretsProviderConnectionSwitch from '@/components/ExternalSecretsProviderConnectionSwitch.ee.vue';
+import { createEventBus } from 'n8n-design-system/utils';
+
+const props = defineProps({
+	data: {
+		type: Object as PropType<{ eventBus: EventBus; name: string }>,
+		default: () => ({}),
+	},
+});
+
+const defaultProviderData = {
+	infisical: {
+		siteURL: 'https://app.infisical.com',
+	},
+};
+
+const externalSecretsStore = useExternalSecretsStore();
+const uiStore = useUIStore();
+const toast = useToast();
+const i18n = useI18n();
+const route = useRoute();
+const { confirm } = useMessage();
+
+const saving = ref(false);
+
+const eventBus = createEventBus();
+
+const labelSize: IParameterLabel = { size: 'medium' };
+
+const provider = computed<ExternalSecretsProvider | undefined>(() =>
+	externalSecretsStore.providers.find((p) => p.name === props.data.name),
+) as Ref<ExternalSecretsProvider>;
+const providerData = ref<ExternalSecretsProviderData>({});
+const {
+	connectionState,
+	initialConnectionState,
+	normalizedProviderData,
+	shouldDisplayProperty,
+	setConnectionState,
+	testConnection,
+} = useExternalSecretsProvider(provider, providerData);
+
+const providerDataUpdated = computed(() => {
+	return Object.keys(providerData.value).find((key) => {
+		const value = providerData.value[key];
+		const originalValue = provider.value.data[key];
+
+		return value !== originalValue;
+	});
+});
+
+const canSave = computed(
+	() =>
+		provider.value.properties
+			?.filter((property) => property.required && shouldDisplayProperty(property))
+			.every((property) => {
+				const value = providerData.value[property.name];
+				return !!value;
+			}) && providerDataUpdated.value,
+);
+
+onMounted(async () => {
+	try {
+		const provider = await externalSecretsStore.getProvider(props.data.name);
+		providerData.value = {
+			...(defaultProviderData[props.data.name] || {}),
+			...provider.data,
+		};
+
+		setConnectionState(provider.state);
+
+		if (provider.connected) {
+			initialConnectionState.value = provider.state;
+		} else if (Object.keys(provider.data).length) {
+			await testConnection();
+		}
+
+		if (provider.state === 'connected') {
+			void externalSecretsStore.reloadProvider(props.data.name);
+		}
+	} catch (error) {
+		toast.showError(error, 'Error');
+	}
+});
+
+function close() {
+	uiStore.closeModal(EXTERNAL_SECRETS_PROVIDER_MODAL_KEY);
+}
+
+function onValueChange(updateInformation: IUpdateInformation) {
+	providerData.value = {
+		...providerData.value,
+		[updateInformation.name]: updateInformation.value,
+	};
+}
+
+async function save() {
+	try {
+		saving.value = true;
+		await externalSecretsStore.updateProvider(provider.value.name, {
+			data: normalizedProviderData.value,
+		});
+
+		setConnectionState(provider.value.state);
+	} catch (error) {
+		toast.showError(error, 'Error');
+	}
+
+	await testConnection();
+
+	if (initialConnectionState.value === 'initializing' && connectionState.value === 'tested') {
+		setTimeout(() => {
+			eventBus.emit('connect', true);
+		}, 100);
+	}
+
+	saving.value = false;
+}
+
+async function onBeforeClose() {
+	if (providerDataUpdated.value) {
+		const confirmModal = await confirm(
+			i18n.baseText('settings.externalSecrets.provider.closeWithoutSaving.description', {
+				interpolate: {
+					provider: provider.value.displayName,
+				},
+			}),
+			{
+				title: i18n.baseText('settings.externalSecrets.provider.closeWithoutSaving.title'),
+				confirmButtonText: i18n.baseText(
+					'settings.externalSecrets.provider.closeWithoutSaving.confirm',
+				),
+				cancelButtonText: i18n.baseText(
+					'settings.externalSecrets.provider.closeWithoutSaving.cancel',
+				),
+			},
+		);
+
+		return confirmModal !== MODAL_CONFIRM;
+	}
+
+	return true;
+}
+</script>
+
+<template>
+	<Modal
+		id="external-secrets-provider-modal"
+		width="812px"
+		:title="provider.displayName"
+		:event-bus="data.eventBus"
+		:name="EXTERNAL_SECRETS_PROVIDER_MODAL_KEY"
+		:before-close="onBeforeClose"
+	>
+		<template #header>
+			<div :class="$style.header">
+				<div :class="$style.providerTitle">
+					<ExternalSecretsProviderImage :provider="provider" class="mr-xs" />
+					<span>{{ provider.displayName }}</span>
+				</div>
+				<div :class="$style.providerActions">
+					<ExternalSecretsProviderConnectionSwitch
+						class="mr-s"
+						:disabled="
+							(connectionState === 'initializing' || connectionState === 'error') &&
+							!provider.connected
+						"
+						:event-bus="eventBus"
+						:provider="provider"
+						@change="testConnection"
+					/>
+					<n8n-button
+						type="primary"
+						:loading="saving"
+						:disabled="!canSave && !saving"
+						@click="save"
+					>
+						{{
+							i18n.baseText(
+								`settings.externalSecrets.provider.buttons.${saving ? 'saving' : 'save'}`,
+							)
+						}}
+					</n8n-button>
+				</div>
+			</div>
+		</template>
+
+		<template #content>
+			<div :class="$style.container">
+				<hr class="mb-l" />
+				<div v-if="connectionState !== 'initializing'" class="mb-l">
+					<n8n-callout
+						v-if="connectionState === 'connected' || connectionState === 'tested'"
+						theme="success"
+					>
+						{{
+							i18n.baseText(
+								`settings.externalSecrets.provider.testConnection.success${
+									provider.connected ? '.connected' : ''
+								}`,
+								{
+									interpolate: {
+										count: `${externalSecretsStore.secrets[provider.name]?.length}`,
+										provider: provider.displayName,
+									},
+								},
+							)
+						}}
+						<span v-if="provider.connected">
+							<br />
+							<i18n-t
+								keypath="settings.externalSecrets.provider.testConnection.success.connected.usage"
+							>
+								<template #code>
+									<code>{{ `\{\{ \$secrets\.${provider.name}\.secret_name \}\}` }}</code>
+								</template>
+							</i18n-t>
+							<n8n-link :href="i18n.baseText('settings.externalSecrets.docs.use')" size="small">
+								{{
+									i18n.baseText(
+										'settings.externalSecrets.provider.testConnection.success.connected.docs',
+									)
+								}}
+							</n8n-link>
+						</span>
+					</n8n-callout>
+					<n8n-callout v-else-if="connectionState === 'error'" theme="danger">
+						{{
+							i18n.baseText(
+								`settings.externalSecrets.provider.testConnection.error${
+									provider.connected ? '.connected' : ''
+								}`,
+								{
+									interpolate: { provider: provider.displayName },
+								},
+							)
+						}}
+					</n8n-callout>
+				</div>
+
+				<form
+					v-for="property in provider.properties"
+					v-show="shouldDisplayProperty(property)"
+					:key="property.name"
+					autocomplete="off"
+					data-test-id="external-secrets-provider-properties-form"
+					@submit.prevent
+				>
+					<n8n-notice v-if="property.type === 'notice'" :content="property.displayName" />
+					<ParameterInputExpanded
+						v-else
+						class="mb-l"
+						:parameter="property"
+						:value="providerData[property.name]"
+						:label="labelSize"
+						event-source="external-secrets-provider"
+						@update="onValueChange"
+					/>
+				</form>
+			</div>
+		</template>
+	</Modal>
+</template>
+
+<style module lang="scss">
+.container {
+	> * {
+		overflow-wrap: break-word;
+	}
+}
+
+.header {
+	display: flex;
+	flex-direction: row;
+	justify-content: space-between;
+	align-items: center;
+	flex-grow: 1;
+}
+
+.providerTitle {
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+	flex: 1;
+}
+
+.providerActions {
+	flex: 0;
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+}
+
+.footer {
+	display: flex;
+	flex-direction: row;
+	justify-content: flex-end;
+}
+</style>
+
+<style lang="scss">
+#external-secrets-provider-modal {
+	.el-dialog__header {
+		display: flex;
+		align-items: center;
+		flex-direction: row;
+	}
+
+	.el-dialog__headerbtn {
+		position: relative;
+		top: unset;
+		right: unset;
+		margin-left: var(--spacing-xs);
+	}
+}
+</style>
diff --git a/packages/editor-ui/src/components/FeatureComingSoon.vue b/packages/editor-ui/src/components/FeatureComingSoon.vue
index 637f1028ecbae..ea53f67c5b2c8 100644
--- a/packages/editor-ui/src/components/FeatureComingSoon.vue
+++ b/packages/editor-ui/src/components/FeatureComingSoon.vue
@@ -7,18 +7,16 @@
 		</div>
 		<div v-if="featureInfo.infoText" class="mb-l">
 			<n8n-info-tip theme="info" type="note">
-				<template>
-					<span v-html="$locale.baseText(featureInfo.infoText)"></span>
-				</template>
+				<span v-html="$locale.baseText(featureInfo.infoText)"></span>
 			</n8n-info-tip>
 		</div>
 		<div :class="$style.actionBoxContainer">
 			<n8n-action-box
 				:description="$locale.baseText(featureInfo.actionBoxDescription)"
-				:buttonText="
+				:button-text="
 					$locale.baseText(featureInfo.actionBoxButtonLabel || 'fakeDoor.actionBox.button.label')
 				"
-				@click="openLinkPage"
+				@click:button="openLinkPage"
 			>
 				<template #heading>
 					<span v-html="$locale.baseText(featureInfo.actionBoxTitle)" />
@@ -29,13 +27,13 @@
 </template>
 
 <script lang="ts">
-import type { IFakeDoor } from '@/Interface';
-import { useRootStore } from '@/stores/n8nRootStore';
-import { useSettingsStore } from '@/stores/settings';
-import { useUIStore } from '@/stores/ui';
-import { useUsersStore } from '@/stores/users';
-import { mapStores } from 'pinia';
 import { defineComponent } from 'vue';
+import { mapStores } from 'pinia';
+import type { IFakeDoor } from '@/Interface';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useUIStore } from '@/stores/ui.store';
+import { useUsersStore } from '@/stores/users.store';
 
 export default defineComponent({
 	name: 'FeatureComingSoon',
diff --git a/packages/editor-ui/src/components/Feedback.spec.ts b/packages/editor-ui/src/components/Feedback.spec.ts
new file mode 100644
index 0000000000000..d64283c26e39d
--- /dev/null
+++ b/packages/editor-ui/src/components/Feedback.spec.ts
@@ -0,0 +1,48 @@
+import { render, fireEvent } from '@testing-library/vue';
+import Feedback from '@/components/Feedback.vue';
+
+vi.mock('@/composables/useI18n', () => ({
+	useI18n: () => ({
+		baseText: (key: string) => key,
+	}),
+}));
+
+describe('Feedback', () => {
+	it('should emit update:modelValue event with positive feedback', async () => {
+		const { getByTestId, emitted } = render(Feedback);
+
+		await fireEvent.click(getByTestId('feedback-button-positive'));
+
+		expect(emitted()).toHaveProperty('update:modelValue');
+		expect(emitted()['update:modelValue'][0]).toEqual(['positive']);
+	});
+
+	it('should emit update:modelValue event with negative feedback', async () => {
+		const { getByTestId, emitted } = render(Feedback);
+
+		await fireEvent.click(getByTestId('feedback-button-negative'));
+
+		expect(emitted()).toHaveProperty('update:modelValue');
+		expect(emitted()['update:modelValue'][0]).toEqual(['negative']);
+	});
+
+	it('should display positive feedback message when modelValue is positive', () => {
+		const { getByText } = render(Feedback, {
+			props: {
+				modelValue: 'positive',
+			},
+		});
+
+		expect(getByText(/feedback.positive/i)).toBeInTheDocument();
+	});
+
+	it('should display negative feedback message when modelValue is negative', () => {
+		const { getByText } = render(Feedback, {
+			props: {
+				modelValue: 'negative',
+			},
+		});
+
+		expect(getByText(/feedback.negative/i)).toBeInTheDocument();
+	});
+});
diff --git a/packages/editor-ui/src/components/Feedback.vue b/packages/editor-ui/src/components/Feedback.vue
new file mode 100644
index 0000000000000..91717379353d8
--- /dev/null
+++ b/packages/editor-ui/src/components/Feedback.vue
@@ -0,0 +1,73 @@
+<script lang="ts" setup>
+import { useI18n } from '@/composables/useI18n';
+import type { PropType } from 'vue';
+
+const emit = defineEmits<{
+	(e: 'update:modelValue', feedback: 'positive' | 'negative'): void;
+}>();
+
+defineProps({
+	modelValue: {
+		type: String as PropType<'positive' | 'negative' | undefined>,
+		default: undefined,
+	},
+});
+
+const i18n = useI18n();
+
+function onFeedback(feedback: 'positive' | 'negative') {
+	emit('update:modelValue', feedback);
+}
+</script>
+<template>
+	<div class="feedback">
+		<N8nText v-if="!modelValue" class="mr-2xs">
+			{{ i18n.baseText('feedback.title') }}
+		</N8nText>
+		<N8nText v-else :color="modelValue === 'positive' ? 'success' : 'danger'">
+			<FontAwesomeIcon
+				:icon="modelValue === 'positive' ? 'thumbs-up' : 'thumbs-down'"
+				class="mr-2xs"
+			/>
+			{{ i18n.baseText(`feedback.${modelValue}`) }}
+		</N8nText>
+		<N8nTooltip v-if="!modelValue" :content="i18n.baseText('feedback.positive')">
+			<span
+				class="feedback-button"
+				data-test-id="feedback-button-positive"
+				@click="onFeedback('positive')"
+			>
+				<FontAwesomeIcon icon="thumbs-up" />
+			</span>
+		</N8nTooltip>
+		<N8nTooltip v-if="!modelValue" :content="i18n.baseText('feedback.negative')">
+			<span
+				class="feedback-button"
+				data-test-id="feedback-button-negative"
+				@click="onFeedback('negative')"
+			>
+				<FontAwesomeIcon icon="thumbs-down" />
+			</span>
+		</N8nTooltip>
+	</div>
+</template>
+
+<style lang="scss">
+.feedback {
+	display: flex;
+	align-items: center;
+
+	.feedback-button {
+		cursor: pointer;
+		width: var(--spacing-2xl);
+		height: var(--spacing-2xl);
+		display: flex;
+		justify-content: center;
+		align-items: center;
+
+		&:hover {
+			color: var(--color-primary);
+		}
+	}
+}
+</style>
diff --git a/packages/editor-ui/src/components/FilterConditions/CombinatorSelect.vue b/packages/editor-ui/src/components/FilterConditions/CombinatorSelect.vue
new file mode 100644
index 0000000000000..8ac0a196225cf
--- /dev/null
+++ b/packages/editor-ui/src/components/FilterConditions/CombinatorSelect.vue
@@ -0,0 +1,53 @@
+<script setup lang="ts">
+import { useI18n } from '@/composables/useI18n';
+import type { FilterTypeCombinator } from 'n8n-workflow';
+
+interface Props {
+	options: FilterTypeCombinator[];
+	selected: FilterTypeCombinator;
+	readOnly: boolean;
+}
+
+defineProps<Props>();
+
+const emit = defineEmits<{
+	(event: 'combinatorChange', value: FilterTypeCombinator): void;
+}>();
+
+const i18n = useI18n();
+
+const onCombinatorChange = (combinator: FilterTypeCombinator): void => {
+	emit('combinatorChange', combinator);
+};
+</script>
+
+<template>
+	<div data-test-id="filter-combinator-select" :class="$style.combinatorSelect">
+		<div v-if="readOnly || options.length === 1">
+			{{ i18n.baseText(`filter.combinator.${selected}`) }}
+		</div>
+		<n8n-select
+			v-else
+			size="small"
+			:model-value="selected"
+			@update:model-value="onCombinatorChange"
+		>
+			<n8n-option
+				v-for="option in options"
+				:key="option"
+				:value="option"
+				:label="i18n.baseText(`filter.combinator.${option}`)"
+			>
+			</n8n-option>
+		</n8n-select>
+	</div>
+</template>
+
+<style lang="scss" module>
+.combinatorSelect {
+	max-width: 80px;
+	line-height: var(--font-line-height-xloose);
+	font-size: var(--font-size-2xs);
+	color: var(--color-text-light);
+}
+</style>
diff --git a/packages/editor-ui/src/components/FilterConditions/Condition.vue b/packages/editor-ui/src/components/FilterConditions/Condition.vue
new file mode 100644
index 0000000000000..e3b1be0e1878e
--- /dev/null
+++ b/packages/editor-ui/src/components/FilterConditions/Condition.vue
@@ -0,0 +1,256 @@
+<script setup lang="ts">
+import type { IUpdateInformation } from '@/Interface';
+import InputTriple from '@/components/InputTriple/InputTriple.vue';
+import ParameterInputFull from '@/components/ParameterInputFull.vue';
+import ParameterIssues from '@/components/ParameterIssues.vue';
+import { useI18n } from '@/composables/useI18n';
+import { DateTime } from 'luxon';
+import {
+	type FilterConditionValue,
+	type FilterOptionsValue,
+	type INodeProperties,
+} from 'n8n-workflow';
+import { computed, ref } from 'vue';
+import OperatorSelect from './OperatorSelect.vue';
+import { type FilterOperatorId } from './constants';
+import {
+	getFilterOperator,
+	handleOperatorChange,
+	isEmptyInput,
+	operatorTypeToNodeProperty,
+	resolveCondition,
+} from './utils';
+
+interface Props {
+	path: string;
+	condition: FilterConditionValue;
+	options: FilterOptionsValue;
+	issues?: string[];
+	fixedLeftValue?: boolean;
+	canRemove?: boolean;
+	readOnly?: boolean;
+	index?: number;
+}
+
+const props = withDefaults(defineProps<Props>(), {
+	issues: () => [],
+	canRemove: true,
+	fixedLeftValue: false,
+	readOnly: false,
+	index: 0,
+});
+
+const emit = defineEmits<{
+	(event: 'update', value: FilterConditionValue): void;
+	(event: 'remove'): void;
+}>();
+
+const i18n = useI18n();
+
+const condition = ref<FilterConditionValue>(props.condition);
+
+const operatorId = computed<FilterOperatorId>(() => {
+	const { type, operation } = props.condition.operator;
+	return `${type}:${operation}` as FilterOperatorId;
+});
+const operator = computed(() => getFilterOperator(operatorId.value));
+
+const isEmpty = computed(() => {
+	if (operator.value.singleValue) {
+		return isEmptyInput(condition.value.leftValue);
+	}
+
+	return isEmptyInput(condition.value.leftValue) && isEmptyInput(condition.value.rightValue);
+});
+
+const conditionResult = computed(() =>
+	resolveCondition({ condition: condition.value, options: props.options }),
+);
+
+const allIssues = computed(() => {
+	if (conditionResult.value.status === 'validation_error' && !isEmpty.value) {
+		return [conditionResult.value.error];
+	}
+
+	return props.issues;
+});
+
+const now = computed(() => DateTime.now().toISO());
+
+const leftParameter = computed<INodeProperties>(() => ({
+	name: '',
+	displayName: '',
+	default: '',
+	placeholder:
+		operator.value.type === 'dateTime'
+			? now.value
+			: i18n.baseText('filter.condition.placeholderLeft'),
+	...operatorTypeToNodeProperty(operator.value.type),
+}));
+
+const rightParameter = computed<INodeProperties>(() => {
+	const type = operator.value.rightType ?? operator.value.type;
+	return {
+		name: '',
+		displayName: '',
+		default: '',
+		placeholder:
+			type === 'dateTime' ? now.value : i18n.baseText('filter.condition.placeholderRight'),
+		...operatorTypeToNodeProperty(type),
+	};
+});
+
+const onLeftValueChange = (update: IUpdateInformation): void => {
+	condition.value.leftValue = update.value;
+};
+
+const onRightValueChange = (update: IUpdateInformation): void => {
+	condition.value.rightValue = update.value;
+};
+
+const onOperatorChange = (value: string): void => {
+	const newOperator = getFilterOperator(value);
+
+	condition.value = handleOperatorChange({
+		condition: condition.value,
+		newOperator,
+	});
+
+	emit('update', condition.value);
+};
+
+const onRemove = (): void => {
+	emit('remove');
+};
+
+const onBlur = (): void => {
+	emit('update', condition.value);
+};
+</script>
+
+<template>
+	<div
+		:class="{
+			[$style.wrapper]: true,
+			[$style.hasIssues]: allIssues.length > 0,
+		}"
+		data-test-id="filter-condition"
+	>
+		<n8n-icon-button
+			v-if="canRemove && !readOnly"
+			type="tertiary"
+			text
+			size="mini"
+			icon="trash"
+			data-test-id="filter-remove-condition"
+			:title="i18n.baseText('filter.removeCondition')"
+			:class="$style.remove"
+			@click="onRemove"
+		></n8n-icon-button>
+		<InputTriple>
+			<template #left>
+				<ParameterInputFull
+					v-if="!fixedLeftValue"
+					:key="leftParameter.type"
+					display-options
+					hide-label
+					hide-hint
+					hide-issues
+					:is-read-only="readOnly"
+					:parameter="leftParameter"
+					:value="condition.leftValue"
+					:path="`${path}.left`"
+					:class="[$style.input, $style.inputLeft]"
+					data-test-id="filter-condition-left"
+					@update="onLeftValueChange"
+					@blur="onBlur"
+				/>
+			</template>
+			<template #middle>
+				<OperatorSelect
+					:selected="`${operator.type}:${operator.operation}`"
+					:read-only="readOnly"
+					@operator-change="onOperatorChange"
+				></OperatorSelect>
+			</template>
+			<template v-if="!operator.singleValue" #right="{ breakpoint }">
+				<ParameterInputFull
+					:key="rightParameter.type"
+					display-options
+					hide-label
+					hide-hint
+					hide-issues
+					:is-read-only="readOnly"
+					:options-position="breakpoint === 'default' ? 'top' : 'bottom'"
+					:parameter="rightParameter"
+					:value="condition.rightValue"
+					:path="`${path}.right`"
+					:class="[$style.input, $style.inputRight]"
+					data-test-id="filter-condition-right"
+					@update="onRightValueChange"
+					@blur="onBlur"
+				/>
+			</template>
+		</InputTriple>
+
+		<div :class="$style.status">
+			<ParameterIssues v-if="allIssues.length > 0" :issues="allIssues" />
+
+			<n8n-tooltip
+				v-else-if="conditionResult.status === 'success' && conditionResult.result === true"
+				:show-after="500"
+			>
+				<template #content>
+					{{ i18n.baseText('filter.condition.resolvedTrue') }}
+				</template>
+				<n8n-icon :class="$style.statusIcon" icon="check-circle" size="medium" color="text-light" />
+			</n8n-tooltip>
+
+			<n8n-tooltip
+				v-else-if="conditionResult.status === 'success' && conditionResult.result === false"
+				:show-after="500"
+			>
+				<template #content>
+					{{ i18n.baseText('filter.condition.resolvedFalse') }}
+				</template>
+				<n8n-icon :class="$style.statusIcon" icon="times-circle" size="medium" color="text-light" />
+			</n8n-tooltip>
+		</div>
+	</div>
+</template>
+
+<style lang="scss" module>
+.wrapper {
+	position: relative;
+	display: flex;
+	align-items: flex-end;
+	gap: var(--spacing-4xs);
+
+	&.hasIssues {
+		--input-border-color: var(--color-danger);
+	}
+
+	&:hover {
+		.remove {
+			opacity: 1;
+		}
+	}
+}
+
+.status {
+	align-self: flex-start;
+	padding-top: 28px;
+}
+
+.statusIcon {
+	padding-left: var(--spacing-4xs);
+}
+
+.remove {
+	position: absolute;
+	left: 0;
+	top: var(--spacing-l);
+	opacity: 0;
+	transition: opacity 100ms ease-in;
+}
+</style>
diff --git a/packages/editor-ui/src/components/FilterConditions/FilterConditions.vue b/packages/editor-ui/src/components/FilterConditions/FilterConditions.vue
new file mode 100644
index 0000000000000..9bac77fcf93f4
--- /dev/null
+++ b/packages/editor-ui/src/components/FilterConditions/FilterConditions.vue
@@ -0,0 +1,269 @@
+<script setup lang="ts">
+import { isEmpty, isEqual } from 'lodash-es';
+
+import {
+	type FilterConditionValue,
+	type FilterValue,
+	type INodeProperties,
+	type FilterTypeCombinator,
+	type INode,
+	type NodeParameterValue,
+	type FilterOptionsValue,
+} from 'n8n-workflow';
+import { computed, reactive, watch } from 'vue';
+import { useNDVStore } from '@/stores/ndv.store';
+import {
+	DEFAULT_FILTER_OPTIONS,
+	DEFAULT_MAX_CONDITIONS,
+	DEFAULT_OPERATOR_VALUE,
+} from './constants';
+import { useI18n } from '@/composables/useI18n';
+import { useDebounce } from '@/composables/useDebounce';
+import Condition from './Condition.vue';
+import CombinatorSelect from './CombinatorSelect.vue';
+import { resolveParameter } from '@/composables/useWorkflowHelpers';
+import { v4 as uuid } from 'uuid';
+
+interface Props {
+	parameter: INodeProperties;
+	value: FilterValue;
+	path: string;
+	node: INode | null;
+	readOnly?: boolean;
+}
+
+const props = withDefaults(defineProps<Props>(), { readOnly: false });
+
+const emit = defineEmits<{
+	(event: 'valueChanged', value: { name: string; node: string; value: FilterValue }): void;
+}>();
+
+const i18n = useI18n();
+const ndvStore = useNDVStore();
+const { debounce } = useDebounce();
+
+function createCondition(): FilterConditionValue {
+	return { id: uuid(), leftValue: '', rightValue: '', operator: DEFAULT_OPERATOR_VALUE };
+}
+
+const allowedCombinators = computed<FilterTypeCombinator[]>(
+	() => props.parameter.typeOptions?.filter?.allowedCombinators ?? ['and', 'or'],
+);
+
+const state = reactive<{ paramValue: FilterValue }>({
+	paramValue: {
+		options: props.value?.options ?? DEFAULT_FILTER_OPTIONS,
+		conditions: props.value?.conditions ?? [createCondition()],
+		combinator: props.value?.combinator ?? allowedCombinators.value[0],
+	},
+});
+
+const maxConditions = computed(
+	() => props.parameter.typeOptions?.filter?.maxConditions ?? DEFAULT_MAX_CONDITIONS,
+);
+
+const singleCondition = computed(() => props.parameter.typeOptions?.multipleValues === false);
+
+const maxConditionsReached = computed(
+	() => maxConditions.value <= state.paramValue.conditions.length,
+);
+
+const issues = computed(() => {
+	if (!ndvStore.activeNode) return {};
+	return ndvStore.activeNode?.issues?.parameters ?? {};
+});
+
+watch(
+	() => props.node?.parameters,
+	() => {
+		const typeOptions = props.parameter.typeOptions?.filter;
+
+		if (!typeOptions) {
+			return;
+		}
+
+		let newOptions: FilterOptionsValue = DEFAULT_FILTER_OPTIONS;
+		try {
+			newOptions = {
+				...DEFAULT_FILTER_OPTIONS,
+				...resolveParameter(typeOptions as NodeParameterValue),
+			};
+		} catch (error) {}
+
+		if (!isEqual(state.paramValue.options, newOptions)) {
+			state.paramValue.options = newOptions;
+			debouncedEmitChange();
+		}
+	},
+	{ immediate: true },
+);
+
+watch(
+	() => props.value,
+	(value) => {
+		if (isEmpty(value) || isEqual(state.paramValue, value)) return;
+
+		state.paramValue.conditions = value.conditions;
+		state.paramValue.combinator = value.combinator;
+		state.paramValue.options = value.options;
+	},
+);
+
+function emitChange() {
+	emit('valueChanged', {
+		name: props.path,
+		value: state.paramValue,
+		node: props.node?.name as string,
+	});
+}
+
+const debouncedEmitChange = debounce(emitChange, { debounceTime: 1000 });
+
+function addCondition(): void {
+	state.paramValue.conditions.push(createCondition());
+	debouncedEmitChange();
+}
+
+function onConditionUpdate(index: number, value: FilterConditionValue): void {
+	state.paramValue.conditions[index] = value;
+	debouncedEmitChange();
+}
+
+function onCombinatorChange(combinator: FilterTypeCombinator): void {
+	state.paramValue.combinator = combinator;
+	debouncedEmitChange();
+}
+
+function onConditionRemove(index: number): void {
+	state.paramValue.conditions.splice(index, 1);
+	debouncedEmitChange();
+}
+
+function getIssues(index: number): string[] {
+	return issues.value[`${props.parameter.name}.${index}`] ?? [];
+}
+</script>
+
+<template>
+	<div
+		:class="{ [$style.filter]: true, [$style.single]: singleCondition }"
+		:data-test-id="`filter-${parameter.name}`"
+	>
+		<n8n-input-label
+			v-if="!singleCondition"
+			:label="parameter.displayName"
+			:underline="true"
+			:show-options="true"
+			:show-expression-selector="false"
+			size="small"
+			color="text-dark"
+		>
+		</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>
+			</div>
+			<div v-if="!singleCondition && !readOnly" :class="$style.addConditionWrapper">
+				<n8n-button
+					type="tertiary"
+					block
+					:class="$style.addCondition"
+					:label="i18n.baseText('filter.addCondition')"
+					:title="maxConditionsReached ? i18n.baseText('filter.maxConditions') : ''"
+					:disabled="maxConditionsReached"
+					data-test-id="filter-add-condition"
+					@click="addCondition"
+				/>
+			</div>
+		</div>
+	</div>
+</template>
+
+<style lang="scss" module>
+.filter {
+	display: flex;
+	flex-direction: column;
+	margin: var(--spacing-xs) 0;
+}
+
+.conditions {
+	display: flex;
+	flex-direction: column;
+	gap: var(--spacing-4xs);
+}
+.combinator {
+	position: relative;
+	z-index: 1;
+	margin-top: var(--spacing-2xs);
+	margin-bottom: calc(var(--spacing-2xs) * -1);
+	margin-left: var(--spacing-l);
+}
+
+.condition {
+	padding-left: var(--spacing-l);
+}
+
+.single {
+	.condition {
+		padding-left: 0;
+	}
+
+	.content {
+		margin-top: calc(var(--spacing-xs) * -1);
+	}
+}
+
+.addConditionWrapper {
+	margin-top: var(--spacing-l);
+	margin-left: var(--spacing-l);
+}
+
+.addCondition {
+	// Styling to match collection button (should move to standard button in future)
+	font-weight: var(--font-weight-normal);
+	--button-font-color: var(--color-text-dark);
+	--button-border-color: var(--color-foreground-base);
+	--button-background-color: var(--color-background-base);
+
+	--button-hover-font-color: var(--color-text-dark);
+	--button-hover-border-color: var(--color-foreground-base);
+	--button-hover-background-color: var(--color-background-base);
+
+	--button-active-font-color: var(--color-text-dark);
+	--button-active-border-color: var(--color-foreground-base);
+	--button-active-background-color: var(--color-background-base);
+
+	--button-focus-font-color: var(--color-text-dark);
+	--button-focus-border-color: var(--color-foreground-base);
+	--button-focus-background-color: var(--color-background-base);
+
+	&:hover,
+	&:focus,
+	&:active {
+		outline: none;
+	}
+}
+</style>
diff --git a/packages/editor-ui/src/components/FilterConditions/OperatorSelect.vue b/packages/editor-ui/src/components/FilterConditions/OperatorSelect.vue
new file mode 100644
index 0000000000000..d2b37f54bcfc0
--- /dev/null
+++ b/packages/editor-ui/src/components/FilterConditions/OperatorSelect.vue
@@ -0,0 +1,150 @@
+<script setup lang="ts">
+import { useI18n } from '@/composables/useI18n';
+import { computed, ref } from 'vue';
+import { OPERATOR_GROUPS } from './constants';
+import type { FilterOperator } from './types';
+import { getFilterOperator } from './utils';
+
+interface Props {
+	selected: string;
+	readOnly?: boolean;
+}
+
+const props = withDefaults(defineProps<Props>(), { readOnly: false });
+
+const selected = ref(props.selected);
+const menuOpen = ref(false);
+const shouldRenderItems = ref(false);
+const submenu = ref('none');
+
+const emit = defineEmits<{
+	(event: 'operatorChange', value: string): void;
+}>();
+
+const i18n = useI18n();
+
+const groups = OPERATOR_GROUPS;
+
+const selectedGroupIcon = computed(
+	() => groups.find((group) => group.id === selected.value.split(':')[0])?.icon,
+);
+
+const selectedOperator = computed(() => getFilterOperator(selected.value));
+
+const onOperatorChange = (operator: string): void => {
+	selected.value = operator;
+	emit('operatorChange', operator);
+};
+
+const getOperatorId = (operator: FilterOperator): string =>
+	`${operator.type}:${operator.operation}`;
+
+function onSelectVisibleChange(open: boolean) {
+	menuOpen.value = open;
+	if (!open) {
+		submenu.value = 'none';
+	}
+}
+
+function onGroupSelect(group: string) {
+	if (menuOpen.value) {
+		submenu.value = group;
+	}
+}
+</script>
+
+<template>
+	<n8n-select
+		:key="selectedGroupIcon"
+		data-test-id="filter-operator-select"
+		size="small"
+		:model-value="selected"
+		:disabled="readOnly"
+		@update:model-value="onOperatorChange"
+		@visible-change="onSelectVisibleChange"
+		@mouseenter="shouldRenderItems = true"
+	>
+		<template v-if="selectedGroupIcon" #prefix>
+			<n8n-icon
+				:class="$style.selectedGroupIcon"
+				:icon="selectedGroupIcon"
+				color="text-light"
+				size="small"
+			/>
+		</template>
+		<div v-if="shouldRenderItems" :class="$style.groups">
+			<div v-for="group of groups" :key="group.name">
+				<n8n-popover
+					:visible="submenu === group.id"
+					placement="right-start"
+					:show-arrow="false"
+					:offset="2"
+					:popper-style="{ padding: 'var(--spacing-3xs) 0' }"
+					width="auto"
+				>
+					<template #reference>
+						<div
+							:class="$style.group"
+							@mouseenter="() => onGroupSelect(group.id)"
+							@click="() => onGroupSelect(group.id)"
+						>
+							<div :class="$style.groupTitle">
+								<n8n-icon v-if="group.icon" :icon="group.icon" color="text-light" size="small" />
+								<span>{{ i18n.baseText(group.name) }}</span>
+							</div>
+							<n8n-icon icon="chevron-right" color="text-light" size="xsmall" />
+						</div>
+					</template>
+					<div>
+						<n8n-option
+							v-for="operator in group.children"
+							:key="getOperatorId(operator)"
+							:value="getOperatorId(operator)"
+							:label="i18n.baseText(operator.name)"
+						/>
+					</div>
+				</n8n-popover>
+			</div>
+		</div>
+		<n8n-option
+			v-else
+			:key="selected"
+			:value="selected"
+			:label="i18n.baseText(selectedOperator.name)"
+		/>
+	</n8n-select>
+</template>
+
+<style lang="scss" module>
+.selectedGroupIcon {
+	color: var(--color-text-light);
+}
+
+.groups {
+	display: flex;
+	flex-direction: column;
+}
+
+.group {
+	display: flex;
+	gap: var(--spacing-2xs);
+	align-items: center;
+	justify-content: space-between;
+	font-size: var(--font-size-s);
+	font-weight: var(--font-weight-bold);
+	line-height: var(--font-line-height-regular);
+	color: var(--color-text-dark);
+	padding: var(--spacing-2xs) var(--spacing-s);
+	cursor: pointer;
+
+	&:hover {
+		background: var(--color-background-base);
+	}
+}
+
+.groupTitle {
+	display: flex;
+	gap: var(--spacing-2xs);
+	align-items: center;
+}
+</style>
diff --git a/packages/editor-ui/src/components/FilterConditions/__tests__/FilterConditions.test.ts b/packages/editor-ui/src/components/FilterConditions/__tests__/FilterConditions.test.ts
new file mode 100644
index 0000000000000..568d65c9bc8d5
--- /dev/null
+++ b/packages/editor-ui/src/components/FilterConditions/__tests__/FilterConditions.test.ts
@@ -0,0 +1,380 @@
+import { createComponentRenderer } from '@/__tests__/render';
+import { SETTINGS_STORE_DEFAULT_STATE } from '@/__tests__/utils';
+import FilterConditions from '@/components/FilterConditions/FilterConditions.vue';
+import { STORES } from '@/constants';
+import { useNDVStore } from '@/stores/ndv.store';
+import { createTestingPinia } from '@pinia/testing';
+import userEvent from '@testing-library/user-event';
+import { within } from '@testing-library/vue';
+import { getFilterOperator } from '../utils';
+
+const DEFAULT_SETUP = {
+	pinia: createTestingPinia({
+		initialState: {
+			[STORES.SETTINGS]: SETTINGS_STORE_DEFAULT_STATE,
+		},
+	}),
+	props: {
+		path: 'parameters.conditions',
+		node: {
+			parameters: {},
+			id: 'f63efb2d-3cc5-4500-89f9-b39aab19baf5',
+			name: 'If',
+			type: 'n8n-nodes-base.if',
+			typeVersion: 2,
+			position: [1120, 380],
+			credentials: {},
+			disabled: false,
+		},
+		parameter: { name: 'conditions', displayName: 'Conditions' },
+		value: {},
+	},
+};
+
+const renderComponent = createComponentRenderer(FilterConditions, DEFAULT_SETUP);
+
+describe('FilterConditions.vue', () => {
+	afterEach(() => {
+		vi.clearAllMocks();
+	});
+
+	it('renders default state properly', async () => {
+		const { getByTestId, queryByTestId, findAllByTestId } = renderComponent();
+		expect(getByTestId('filter-conditions')).toBeInTheDocument();
+		expect(await findAllByTestId('filter-condition')).toHaveLength(1);
+		expect(getByTestId('filter-condition-left')).toBeInTheDocument();
+		expect(getByTestId('filter-operator-select')).toBeInTheDocument();
+
+		// Only visible when multiple conditions
+		expect(queryByTestId('filter-combinator-select')).not.toBeInTheDocument();
+	});
+
+	it('renders conditions with different operators', async () => {
+		const { getByTestId, findAllByTestId } = renderComponent({
+			...DEFAULT_SETUP,
+			props: {
+				...DEFAULT_SETUP.props,
+				value: {
+					options: {
+						caseSensitive: true,
+						leftValue: '',
+					},
+					conditions: [
+						{
+							leftValue: '={{ $json.tags }}',
+							rightValue: 'exotic',
+							operator: getFilterOperator('array:contains'),
+						},
+						{
+							leftValue: '={{ $json.meta }}',
+							rightValue: '',
+							operator: getFilterOperator('object:notEmpty'),
+						},
+						{
+							leftValue: '={{ $json.name }}',
+							rightValue: 'John',
+							operator: getFilterOperator('string:equals'),
+						},
+						{
+							leftValue: '={{ $json.tags }}',
+							rightValue: 5,
+							operator: getFilterOperator('array:lengthGte'),
+						},
+					],
+					combinator: 'or',
+				},
+			},
+		});
+		expect(getByTestId('filter-conditions')).toBeInTheDocument();
+		const conditions = await findAllByTestId('filter-condition');
+		const combinators = await findAllByTestId('filter-combinator-select');
+
+		expect(combinators).toHaveLength(3);
+		expect(combinators[0].querySelector('input')).toHaveValue('OR');
+		expect(combinators[1]).toHaveTextContent('OR');
+
+		expect(conditions).toHaveLength(4);
+
+		// array:contains
+		expect(within(conditions[0]).getByTestId('filter-condition-left')).toHaveTextContent(
+			'{{ $json.tags }}',
+		);
+		expect(
+			within(conditions[0]).getByTestId('filter-operator-select').querySelector('input'),
+		).toHaveValue('contains');
+		expect(
+			within(conditions[0]).getByTestId('filter-condition-right').querySelector('input'),
+		).toHaveValue('exotic');
+
+		// object:notEmpty
+		expect(within(conditions[1]).getByTestId('filter-condition-left')).toHaveTextContent(
+			'{{ $json.meta }}',
+		);
+		expect(
+			within(conditions[1]).getByTestId('filter-operator-select').querySelector('input'),
+		).toHaveValue('is not empty');
+		expect(within(conditions[1]).queryByTestId('filter-condition-right')).not.toBeInTheDocument();
+
+		// string:equals
+		expect(within(conditions[2]).getByTestId('filter-condition-left')).toHaveTextContent(
+			'{{ $json.name }}',
+		);
+		expect(
+			within(conditions[2]).getByTestId('filter-operator-select').querySelector('input'),
+		).toHaveValue('is equal to');
+		expect(
+			within(conditions[2]).getByTestId('filter-condition-right').querySelector('input'),
+		).toHaveValue('John');
+
+		// array:lengthGte
+		expect(within(conditions[3]).getByTestId('filter-condition-left')).toHaveTextContent(
+			'{{ $json.tags }}',
+		);
+		expect(
+			within(conditions[3]).getByTestId('filter-operator-select').querySelector('input'),
+		).toHaveValue('length greater than or equal to');
+		expect(
+			within(conditions[3]).getByTestId('filter-condition-right').querySelector('input'),
+		).toHaveValue(5);
+	});
+
+	it('renders parameter issues', async () => {
+		const ndvStore = useNDVStore();
+		vi.spyOn(ndvStore, 'activeNode', 'get').mockReturnValue({
+			...DEFAULT_SETUP.props.node,
+			issues: { parameters: { 'conditions.1': ['not a number sir'] } },
+		} as never);
+
+		const { getByTestId } = renderComponent({
+			props: {
+				...DEFAULT_SETUP.props,
+				value: {
+					conditions: [
+						{
+							leftValue: '={{ $json.num }}',
+							rightValue: '5',
+							operator: getFilterOperator('number:equals'),
+						},
+						{
+							leftValue: '={{ $json.num }}',
+							rightValue: 'not a number',
+							operator: getFilterOperator('number:equals'),
+						},
+					],
+				},
+			},
+		});
+
+		expect(getByTestId('parameter-issues')).toBeInTheDocument();
+	});
+
+	it('renders correctly with typeOptions.multipleValues = false (single mode)', async () => {
+		const { getByTestId, queryByTestId, findAllByTestId } = renderComponent({
+			props: {
+				...DEFAULT_SETUP.props,
+				parameter: {
+					...DEFAULT_SETUP.props.parameter,
+					typeOptions: {
+						multipleValues: false,
+					},
+				},
+			},
+		});
+		expect((await findAllByTestId('filter-condition')).length).toEqual(1);
+		expect(getByTestId('filter-conditions')).toHaveClass('single');
+		expect(queryByTestId('filter-add-condition')).not.toBeInTheDocument();
+	});
+
+	it('renders correctly with typeOptions.filter.leftValue', async () => {
+		const { findAllByTestId } = renderComponent({
+			props: {
+				...DEFAULT_SETUP.props,
+				parameter: {
+					typeOptions: {
+						filter: { leftValue: 'leftValue is always this' },
+					},
+				},
+			},
+		});
+
+		const conditions = await findAllByTestId('filter-condition');
+		expect(conditions[0].querySelector('[data-test-id="filter-condition-left"]')).toBeNull();
+	});
+
+	it('renders correctly with typeOptions.filter.allowedCombinators', async () => {
+		const { getByTestId } = renderComponent({
+			props: {
+				...DEFAULT_SETUP.props,
+				value: {
+					conditions: [
+						{
+							leftValue: 'foo',
+							operator: getFilterOperator('string:equals'),
+							rightValue: 'bar',
+						},
+						{
+							leftValue: 'foo',
+							operator: getFilterOperator('string:equals'),
+							rightValue: 'bar',
+						},
+					],
+				},
+				parameter: {
+					typeOptions: {
+						filter: { allowedCombinators: ['or'] },
+					},
+				},
+			},
+		});
+
+		expect(getByTestId('filter-combinator-select')).toHaveTextContent('OR');
+	});
+
+	it('renders correctly with typeOptions.filter.maxConditions', async () => {
+		const { getByTestId } = renderComponent({
+			props: {
+				...DEFAULT_SETUP.props,
+				value: {
+					conditions: [
+						{
+							leftValue: 'foo',
+							operator: { type: 'string', operation: 'equals' },
+							rightValue: 'bar',
+						},
+						{
+							leftValue: 'foo',
+							operator: { type: 'string', operation: 'equals' },
+							rightValue: 'bar',
+						},
+					],
+				},
+				parameter: {
+					typeOptions: {
+						filter: { maxConditions: 2 },
+					},
+				},
+			},
+		});
+
+		expect(getByTestId('filter-add-condition')).toBeDisabled();
+		expect(getByTestId('filter-add-condition').title).toEqual('Maximum conditions reached');
+	});
+
+	it('can add and remove conditions', async () => {
+		const { getByTestId, findAllByTestId } = renderComponent(DEFAULT_SETUP);
+		await userEvent.click(getByTestId('filter-add-condition'));
+
+		let conditions = await findAllByTestId('filter-condition');
+		expect(conditions.length).toEqual(2);
+
+		await userEvent.click(within(conditions[0]).getByTestId('filter-remove-condition'));
+
+		conditions = await findAllByTestId('filter-condition');
+		expect(conditions.length).toEqual(1);
+		expect(conditions[0].querySelector('[data-test-id="filter-remove-condition"]')).toBeNull();
+	});
+
+	it('renders correctly in read only mode', async () => {
+		const { findAllByTestId, queryByTestId } = renderComponent({
+			props: {
+				...DEFAULT_SETUP.props,
+				value: {
+					conditions: [
+						{
+							leftValue: 'foo',
+							operator: getFilterOperator('string:equals'),
+							rightValue: 'bar',
+						},
+						{
+							leftValue: 'foo',
+							operator: getFilterOperator('string:equals'),
+							rightValue: 'bar',
+						},
+					],
+				},
+				readOnly: true,
+			},
+		});
+
+		expect(queryByTestId('filter-add-condition')).not.toBeInTheDocument();
+
+		const conditions = await findAllByTestId('filter-condition');
+
+		for (const condition of conditions) {
+			const removeButton = within(condition).queryByTestId('filter-remove-condition');
+			expect(removeButton).not.toBeInTheDocument();
+
+			const left = within(condition).getByTestId('filter-condition-left');
+			expect(left.querySelector('input')).toBeDisabled();
+
+			const right = within(condition).getByTestId('filter-condition-right');
+			expect(right.querySelector('input')).toBeDisabled();
+
+			const operatorSelect = within(condition).getByTestId('filter-operator-select');
+			expect(operatorSelect.querySelector('input')).toBeDisabled();
+		}
+	});
+
+	it('re-renders when value prop changes', async () => {
+		const { findAllByTestId, rerender } = renderComponent({
+			...DEFAULT_SETUP,
+			props: {
+				...DEFAULT_SETUP.props,
+				value: {
+					conditions: [
+						{
+							id: '1',
+							leftValue: 'foo',
+							rightValue: 'bar',
+							operator: getFilterOperator('string:equals'),
+						},
+					],
+					combinator: 'and',
+				},
+			},
+		});
+
+		// Rerender with different conditions
+		await rerender({
+			value: {
+				conditions: [
+					{
+						id: '2',
+						leftValue: 'quz',
+						rightValue: 'qux',
+						operator: getFilterOperator('string:notEquals'),
+					},
+					{
+						id: '3',
+						leftValue: 5,
+						rightValue: 6,
+						operator: getFilterOperator('number:gt'),
+					},
+				],
+				combinator: 'and',
+			},
+		});
+
+		const conditions = await findAllByTestId('filter-condition');
+		expect(conditions).toHaveLength(2);
+
+		expect(
+			within(conditions[0]).getByTestId('filter-condition-left').querySelector('input'),
+		).toHaveValue('quz');
+		expect(
+			within(conditions[0]).getByTestId('filter-operator-select').querySelector('input'),
+		).toHaveValue('is not equal to');
+		expect(
+			within(conditions[0]).getByTestId('filter-condition-right').querySelector('input'),
+		).toHaveValue('qux');
+		expect(
+			within(conditions[1]).getByTestId('filter-condition-left').querySelector('input'),
+		).toHaveValue(5);
+		expect(
+			within(conditions[1]).getByTestId('filter-operator-select').querySelector('input'),
+		).toHaveValue('is greater than');
+		expect(
+			within(conditions[1]).getByTestId('filter-condition-right').querySelector('input'),
+		).toHaveValue(6);
+	});
+});
diff --git a/packages/editor-ui/src/components/FilterConditions/__tests__/utils.test.ts b/packages/editor-ui/src/components/FilterConditions/__tests__/utils.test.ts
new file mode 100644
index 0000000000000..9cb5a1d8ed7ee
--- /dev/null
+++ b/packages/editor-ui/src/components/FilterConditions/__tests__/utils.test.ts
@@ -0,0 +1,74 @@
+import { getFilterOperator, handleOperatorChange } from '../utils';
+
+describe('FilterConditions > utils', () => {
+	describe('handleOperatorChange', () => {
+		test('should convert string > number', () => {
+			const condition = {
+				id: '1',
+				leftValue: '45',
+				rightValue: 'notANumber',
+				operator: getFilterOperator('string:equals'),
+			};
+			expect(
+				handleOperatorChange({
+					condition,
+					newOperator: getFilterOperator('number:gt'),
+				}),
+			).toEqual({
+				id: '1',
+				leftValue: 45,
+				rightValue: 'notANumber',
+				operator: {
+					operation: 'gt',
+					type: 'number',
+				},
+			});
+		});
+
+		test('should convert string > boolean', () => {
+			const condition = {
+				id: '1',
+				leftValue: 'notABool',
+				rightValue: 'true',
+				operator: getFilterOperator('string:equals'),
+			};
+			expect(
+				handleOperatorChange({
+					condition,
+					newOperator: getFilterOperator('boolean:notEquals'),
+				}),
+			).toEqual({
+				id: '1',
+				leftValue: false,
+				rightValue: true,
+				operator: {
+					operation: 'notEquals',
+					type: 'boolean',
+				},
+			});
+		});
+
+		test('should not convert or clear expressions', () => {
+			const condition = {
+				id: '1',
+				leftValue: '={{ $json.foo }}',
+				rightValue: '={{ $("nodename").foo }}',
+				operator: getFilterOperator('string:equals'),
+			};
+			expect(
+				handleOperatorChange({
+					condition,
+					newOperator: getFilterOperator('boolean:equals'),
+				}),
+			).toEqual({
+				id: '1',
+				leftValue: '={{ $json.foo }}',
+				rightValue: '={{ $("nodename").foo }}',
+				operator: {
+					operation: 'equals',
+					type: 'boolean',
+				},
+			});
+		});
+	});
+});
diff --git a/packages/editor-ui/src/components/FilterConditions/constants.ts b/packages/editor-ui/src/components/FilterConditions/constants.ts
new file mode 100644
index 0000000000000..b5b6e16c6b872
--- /dev/null
+++ b/packages/editor-ui/src/components/FilterConditions/constants.ts
@@ -0,0 +1,284 @@
+/* eslint-disable @typescript-eslint/naming-convention */
+import type { FilterConditionValue, FilterOptionsValue } from 'n8n-workflow';
+import type { FilterOperator, FilterOperatorGroup } from './types';
+
+export const DEFAULT_MAX_CONDITIONS = 10;
+
+export const DEFAULT_FILTER_OPTIONS: FilterOptionsValue = {
+	caseSensitive: true,
+	leftValue: '',
+	typeValidation: 'strict',
+};
+
+export const OPERATORS_BY_ID = {
+	'string:exists': {
+		type: 'string',
+		operation: 'exists',
+		name: 'filter.operator.exists',
+		singleValue: true,
+	},
+	'string:notExists': {
+		type: 'string',
+		operation: 'notExists',
+		name: 'filter.operator.notExists',
+		singleValue: true,
+	},
+	'string:empty': {
+		type: 'string',
+		operation: 'empty',
+		name: 'filter.operator.empty',
+		singleValue: true,
+	},
+	'string:notEmpty': {
+		type: 'string',
+		operation: 'notEmpty',
+		name: 'filter.operator.notEmpty',
+		singleValue: true,
+	},
+	'string:equals': { type: 'string', operation: 'equals', name: 'filter.operator.equals' },
+	'string:notEquals': { type: 'string', operation: 'notEquals', name: 'filter.operator.notEquals' },
+	'string:contains': { type: 'string', operation: 'contains', name: 'filter.operator.contains' },
+	'string:notContains': {
+		type: 'string',
+		operation: 'notContains',
+		name: 'filter.operator.notContains',
+	},
+	'string:startsWith': {
+		type: 'string',
+		operation: 'startsWith',
+		name: 'filter.operator.startsWith',
+	},
+	'string:notStartsWith': {
+		type: 'string',
+		operation: 'notStartsWith',
+		name: 'filter.operator.notStartsWith',
+	},
+	'string:endsWith': { type: 'string', operation: 'endsWith', name: 'filter.operator.endsWith' },
+	'string:notEndsWith': {
+		type: 'string',
+		operation: 'notEndsWith',
+		name: 'filter.operator.notEndsWith',
+	},
+	'string:regex': { type: 'string', operation: 'regex', name: 'filter.operator.regex' },
+	'string:notRegex': { type: 'string', operation: 'notRegex', name: 'filter.operator.notRegex' },
+	'number:exists': {
+		type: 'number',
+		operation: 'exists',
+		name: 'filter.operator.exists',
+		singleValue: true,
+	},
+	'number:notExists': {
+		type: 'number',
+		operation: 'notExists',
+		name: 'filter.operator.notExists',
+		singleValue: true,
+	},
+	'number:equals': { type: 'number', operation: 'equals', name: 'filter.operator.equals' },
+	'number:notEquals': { type: 'number', operation: 'notEquals', name: 'filter.operator.notEquals' },
+	'number:gt': { type: 'number', operation: 'gt', name: 'filter.operator.gt' },
+	'number:lt': { type: 'number', operation: 'lt', name: 'filter.operator.lt' },
+	'number:gte': { type: 'number', operation: 'gte', name: 'filter.operator.gte' },
+	'number:lte': { type: 'number', operation: 'lte', name: 'filter.operator.lte' },
+	'dateTime:exists': {
+		type: 'dateTime',
+		operation: 'exists',
+		name: 'filter.operator.exists',
+		singleValue: true,
+	},
+	'dateTime:notExists': {
+		type: 'dateTime',
+		operation: 'notExists',
+		name: 'filter.operator.notExists',
+		singleValue: true,
+	},
+	'dateTime:equals': { type: 'dateTime', operation: 'equals', name: 'filter.operator.equals' },
+	'dateTime:notEquals': {
+		type: 'dateTime',
+		operation: 'notEquals',
+		name: 'filter.operator.notEquals',
+	},
+	'dateTime:after': { type: 'dateTime', operation: 'after', name: 'filter.operator.after' },
+	'dateTime:before': { type: 'dateTime', operation: 'before', name: 'filter.operator.before' },
+	'dateTime:afterOrEquals': {
+		type: 'dateTime',
+		operation: 'afterOrEquals',
+		name: 'filter.operator.afterOrEquals',
+	},
+	'dateTime:beforeOrEquals': {
+		type: 'dateTime',
+		operation: 'beforeOrEquals',
+		name: 'filter.operator.beforeOrEquals',
+	},
+	'boolean:exists': {
+		type: 'boolean',
+		operation: 'exists',
+		name: 'filter.operator.exists',
+		singleValue: true,
+	},
+	'boolean:notExists': {
+		type: 'boolean',
+		operation: 'notExists',
+		name: 'filter.operator.notExists',
+		singleValue: true,
+	},
+	'boolean:true': {
+		type: 'boolean',
+		operation: 'true',
+		name: 'filter.operator.true',
+		singleValue: true,
+	},
+	'boolean:false': {
+		type: 'boolean',
+		operation: 'false',
+		name: 'filter.operator.false',
+		singleValue: true,
+	},
+	'boolean:equals': { type: 'boolean', operation: 'equals', name: 'filter.operator.equals' },
+	'boolean:notEquals': {
+		type: 'boolean',
+		operation: 'notEquals',
+		name: 'filter.operator.notEquals',
+	},
+	'array:exists': {
+		type: 'array',
+		operation: 'exists',
+		name: 'filter.operator.exists',
+		singleValue: true,
+	},
+	'array:notExists': {
+		type: 'array',
+		operation: 'notExists',
+		name: 'filter.operator.notExists',
+		singleValue: true,
+	},
+	'array:empty': {
+		type: 'array',
+		operation: 'empty',
+		name: 'filter.operator.empty',
+		singleValue: true,
+	},
+	'array:notEmpty': {
+		type: 'array',
+		operation: 'notEmpty',
+		name: 'filter.operator.notEmpty',
+		singleValue: true,
+	},
+	'array:contains': {
+		type: 'array',
+		operation: 'contains',
+		name: 'filter.operator.contains',
+		rightType: 'any',
+	},
+	'array:notContains': {
+		type: 'array',
+		operation: 'notContains',
+		name: 'filter.operator.notContains',
+		rightType: 'any',
+	},
+	'array:lengthEquals': {
+		type: 'array',
+		operation: 'lengthEquals',
+		name: 'filter.operator.lengthEquals',
+		rightType: 'number',
+	},
+	'array:lengthNotEquals': {
+		type: 'array',
+		operation: 'lengthNotEquals',
+		name: 'filter.operator.lengthNotEquals',
+		rightType: 'number',
+	},
+	'array:lengthGt': {
+		type: 'array',
+		operation: 'lengthGt',
+		name: 'filter.operator.lengthGt',
+		rightType: 'number',
+	},
+	'array:lengthLt': {
+		type: 'array',
+		operation: 'lengthLt',
+		name: 'filter.operator.lengthLt',
+		rightType: 'number',
+	},
+	'array:lengthGte': {
+		type: 'array',
+		operation: 'lengthGte',
+		name: 'filter.operator.lengthGte',
+		rightType: 'number',
+	},
+	'array:lengthLte': {
+		type: 'array',
+		operation: 'lengthLte',
+		name: 'filter.operator.lengthLte',
+		rightType: 'number',
+	},
+	'object:exists': {
+		type: 'object',
+		operation: 'exists',
+		name: 'filter.operator.exists',
+		singleValue: true,
+	},
+	'object:notExists': {
+		type: 'object',
+		operation: 'notExists',
+		name: 'filter.operator.notExists',
+		singleValue: true,
+	},
+	'object:empty': {
+		type: 'object',
+		operation: 'empty',
+		name: 'filter.operator.empty',
+		singleValue: true,
+	},
+	'object:notEmpty': {
+		type: 'object',
+		operation: 'notEmpty',
+		name: 'filter.operator.notEmpty',
+		singleValue: true,
+	},
+} as const satisfies Record<string, FilterOperator>;
+
+export const OPERATORS = Object.values(OPERATORS_BY_ID);
+
+export type FilterOperatorId = keyof typeof OPERATORS_BY_ID;
+
+export const DEFAULT_OPERATOR_VALUE: FilterConditionValue['operator'] =
+	OPERATORS_BY_ID['string:equals'];
+
+export const OPERATOR_GROUPS: FilterOperatorGroup[] = [
+	{
+		id: 'string',
+		name: 'type.string',
+		icon: 'font',
+		children: OPERATORS.filter((operator) => operator.type === 'string'),
+	},
+	{
+		id: 'number',
+		name: 'type.number',
+		icon: 'hashtag',
+		children: OPERATORS.filter((operator) => operator.type === 'number'),
+	},
+	{
+		id: 'dateTime',
+		name: 'type.dateTime',
+		icon: 'calendar',
+		children: OPERATORS.filter((operator) => operator.type === 'dateTime'),
+	},
+	{
+		id: 'boolean',
+		name: 'type.boolean',
+		icon: 'check-square',
+		children: OPERATORS.filter((operator) => operator.type === 'boolean'),
+	},
+	{
+		id: 'array',
+		name: 'type.array',
+		icon: 'list',
+		children: OPERATORS.filter((operator) => operator.type === 'array'),
+	},
+	{
+		id: 'object',
+		name: 'type.object',
+		icon: 'cube',
+		children: OPERATORS.filter((operator) => operator.type === 'object'),
+	},
+];
diff --git a/packages/editor-ui/src/components/FilterConditions/types.ts b/packages/editor-ui/src/components/FilterConditions/types.ts
new file mode 100644
index 0000000000000..cdf6e1cc1819c
--- /dev/null
+++ b/packages/editor-ui/src/components/FilterConditions/types.ts
@@ -0,0 +1,18 @@
+import type { BaseTextKey } from '@/plugins/i18n';
+import type { FilterOperatorValue } from 'n8n-workflow';
+
+export interface FilterOperator extends FilterOperatorValue {
+	name: BaseTextKey;
+}
+
+export interface FilterOperatorGroup {
+	id: string;
+	name: BaseTextKey;
+	icon?: string;
+	children: FilterOperator[];
+}
+
+export type ConditionResult =
+	| { status: 'resolve_error' }
+	| { status: 'validation_error'; error: string }
+	| { status: 'success'; result: boolean };
diff --git a/packages/editor-ui/src/components/FilterConditions/utils.ts b/packages/editor-ui/src/components/FilterConditions/utils.ts
new file mode 100644
index 0000000000000..cbaee87e9695d
--- /dev/null
+++ b/packages/editor-ui/src/components/FilterConditions/utils.ts
@@ -0,0 +1,121 @@
+import { resolveParameter } from '@/composables/useWorkflowHelpers';
+import { i18n } from '@/plugins/i18n';
+import { isExpression } from '@/utils/expressions';
+import {
+	FilterError,
+	executeFilterCondition,
+	validateFieldType,
+	type FilterConditionValue,
+	type FilterOperatorType,
+	type FilterOptionsValue,
+	type NodeParameterValue,
+	type INodeProperties,
+} from 'n8n-workflow';
+import { OPERATORS_BY_ID, type FilterOperatorId } from './constants';
+import type { ConditionResult, FilterOperator } from './types';
+
+export const getFilterOperator = (key: string) =>
+	OPERATORS_BY_ID[key as FilterOperatorId] as FilterOperator;
+
+const convertToType = (value: unknown, type: FilterOperatorType): unknown => {
+	if (type === 'any') return value;
+
+	const fallback = type === 'boolean' ? false : value;
+
+	return validateFieldType('filter', value, type, { parseStrings: true }).newValue ?? fallback;
+};
+
+export const handleOperatorChange = ({
+	condition,
+	newOperator,
+}: {
+	condition: FilterConditionValue;
+	newOperator: FilterOperator;
+}): FilterConditionValue => {
+	const currentOperator = condition.operator;
+	const rightType = currentOperator.rightType ?? currentOperator.type;
+	const newRightType = newOperator.rightType ?? newOperator.type;
+	const leftTypeChanged = currentOperator.type !== newOperator.type;
+	const rightTypeChanged = rightType !== newRightType;
+
+	// Try to convert left & right values to operator type
+	if (leftTypeChanged && !isExpression(condition.leftValue)) {
+		condition.leftValue = convertToType(condition.leftValue, newOperator.type);
+	}
+	if (rightTypeChanged && !newOperator.singleValue && !isExpression(condition.rightValue)) {
+		condition.rightValue = convertToType(condition.rightValue, newRightType);
+	}
+
+	condition.operator = {
+		type: newOperator.type,
+		operation: newOperator.operation,
+		rightType: newOperator.rightType,
+		singleValue: newOperator.singleValue,
+	};
+
+	return condition;
+};
+
+export const isEmptyInput = (value: unknown): boolean => {
+	return value === '' || value === '=';
+};
+
+export const resolveCondition = ({
+	condition,
+	options,
+	index = 0,
+}: {
+	condition: FilterConditionValue;
+	options: FilterOptionsValue;
+	index?: number;
+}): ConditionResult => {
+	try {
+		const resolved = resolveParameter(
+			condition as unknown as NodeParameterValue,
+		) as FilterConditionValue;
+
+		if (resolved.leftValue === undefined || resolved.rightValue === undefined) {
+			return { status: 'resolve_error' };
+		}
+		try {
+			const result = executeFilterCondition(resolved, options, {
+				index,
+				errorFormat: 'inline',
+			});
+			return { status: 'success', result };
+		} catch (error) {
+			let errorMessage = i18n.baseText('parameterInput.error');
+
+			if (error instanceof FilterError) {
+				errorMessage = `${error.message}.\n${error.description}`;
+			}
+			return {
+				status: 'validation_error',
+				error: errorMessage,
+			};
+		}
+	} catch (error) {
+		return { status: 'resolve_error' };
+	}
+};
+
+export const operatorTypeToNodeProperty = (
+	operatorType: FilterOperatorType,
+): Pick<INodeProperties, 'type' | 'options'> => {
+	switch (operatorType) {
+		case 'boolean':
+			return {
+				type: 'options',
+				options: [
+					{ name: 'true', value: true },
+					{ name: 'false', value: false },
+				],
+			};
+		case 'array':
+		case 'object':
+		case 'any':
+			return { type: 'string' };
+		default:
+			return { type: operatorType };
+	}
+};
diff --git a/packages/editor-ui/src/components/FixedCollectionParameter.vue b/packages/editor-ui/src/components/FixedCollectionParameter.vue
index b817034551054..6fabba8532868 100644
--- a/packages/editor-ui/src/components/FixedCollectionParameter.vue
+++ b/packages/editor-ui/src/components/FixedCollectionParameter.vue
@@ -1,5 +1,5 @@
 <template>
-	<div @keydown.stop class="fixed-collection-parameter">
+	<div class="fixed-collection-parameter" @keydown.stop>
 		<div v-if="getProperties.length === 0" class="no-items-exist">
 			<n8n-text size="small">{{
 				$locale.baseText('fixedCollectionParameter.currentlyNoItemsExist')
@@ -24,80 +24,90 @@
 					:key="property.name + index"
 					class="parameter-item"
 				>
-					<div class="parameter-item-wrapper">
-						<div class="delete-option" v-if="!isReadOnly">
-							<font-awesome-icon
+					<div
+						:class="index ? 'border-top-dashed parameter-item-wrapper ' : 'parameter-item-wrapper'"
+					>
+						<div v-if="!isReadOnly" class="delete-option">
+							<n8n-icon-button
+								type="tertiary"
+								text
+								size="mini"
 								icon="trash"
-								class="reset-icon clickable"
 								:title="$locale.baseText('fixedCollectionParameter.deleteItem')"
 								@click="deleteOption(property.name, index)"
-							/>
-							<div v-if="sortable" class="sort-icon">
-								<font-awesome-icon
-									v-if="index !== 0"
-									icon="angle-up"
-									class="clickable"
-									:title="$locale.baseText('fixedCollectionParameter.moveUp')"
-									@click="moveOptionUp(property.name, index)"
-								/>
-								<font-awesome-icon
-									v-if="index !== mutableValues[property.name].length - 1"
-									icon="angle-down"
-									class="clickable"
-									:title="$locale.baseText('fixedCollectionParameter.moveDown')"
-									@click="moveOptionDown(property.name, index)"
-								/>
-							</div>
+							></n8n-icon-button>
+							<n8n-icon-button
+								v-if="sortable && index !== 0"
+								type="tertiary"
+								text
+								size="mini"
+								icon="angle-up"
+								:title="$locale.baseText('fixedCollectionParameter.moveUp')"
+								@click="moveOptionUp(property.name, index)"
+							></n8n-icon-button>
+							<n8n-icon-button
+								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)"
+							></n8n-icon-button>
 						</div>
-						<parameter-input-list
-							:parameters="property.values"
-							:nodeValues="nodeValues"
-							:path="getPropertyPath(property.name, index)"
-							:hideDelete="true"
-							:isReadOnly="isReadOnly"
-							@valueChanged="valueChanged"
-						/>
+						<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>
 			</div>
 			<div v-else class="parameter-item">
 				<div class="parameter-item-wrapper">
-					<div class="delete-option" v-if="!isReadOnly">
-						<font-awesome-icon
+					<div v-if="!isReadOnly" class="delete-option">
+						<n8n-icon-button
+							type="tertiary"
+							text
+							size="mini"
 							icon="trash"
-							class="reset-icon clickable"
 							:title="$locale.baseText('fixedCollectionParameter.deleteItem')"
 							@click="deleteOption(property.name)"
-						/>
+						></n8n-icon-button>
 					</div>
-					<parameter-input-list
+					<ParameterInputList
 						:parameters="property.values"
-						:nodeValues="nodeValues"
+						:node-values="nodeValues"
 						:path="getPropertyPath(property.name)"
-						:isReadOnly="isReadOnly"
+						:is-read-only="isReadOnly"
 						class="parameter-item"
-						@valueChanged="valueChanged"
-						:hideDelete="true"
+						:hide-delete="true"
+						@value-changed="valueChanged"
 					/>
 				</div>
 			</div>
 		</div>
 
-		<div v-if="parameterOptions.length > 0 && !isReadOnly">
+		<div v-if="parameterOptions.length > 0 && !isReadOnly" class="controls">
 			<n8n-button
 				v-if="parameter.options.length === 1"
 				type="tertiary"
 				block
-				@click="optionSelected(parameter.options[0].name)"
 				:label="getPlaceholderText"
+				@click="optionSelected(parameter.options[0].name)"
 			/>
 			<div v-else class="add-option">
 				<n8n-select
 					v-model="selectedOption"
 					:placeholder="getPlaceholderText"
 					size="small"
-					@change="optionSelected"
 					filterable
+					@update:model-value="optionSelected"
 				>
 					<n8n-option
 						v-for="item in parameterOptions"
@@ -113,7 +123,7 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import type { Component, PropType } from 'vue';
+import type { PropType } from 'vue';
 import type { IUpdateInformation } from '@/Interface';
 
 import type {
@@ -150,26 +160,12 @@ export default defineComponent({
 			default: false,
 		},
 	},
-	components: {
-		ParameterInputList: () => import('./ParameterInputList.vue') as Promise<Component>,
-	},
 	data() {
 		return {
 			selectedOption: undefined,
 			mutableValues: {} as Record<string, INodeParameters[]>,
 		};
 	},
-	watch: {
-		values: {
-			handler(newValues: Record<string, INodeParameters[]>) {
-				this.mutableValues = deepCopy(newValues);
-			},
-			deep: true,
-		},
-	},
-	created() {
-		this.mutableValues = deepCopy(this.values);
-	},
 	computed: {
 		getPlaceholderText(): string {
 			const placeholder = this.$locale.nodeText().placeholder(this.parameter, this.path);
@@ -189,7 +185,6 @@ export default defineComponent({
 		multipleValues(): boolean {
 			return !!this.parameter.typeOptions?.multipleValues;
 		},
-
 		parameterOptions(): INodePropertyCollection[] {
 			if (this.multipleValues && isINodePropertyCollectionList(this.parameter.options)) {
 				return this.parameter.options;
@@ -206,6 +201,17 @@ export default defineComponent({
 			return !!this.parameter.typeOptions?.sortable;
 		},
 	},
+	watch: {
+		values: {
+			handler(newValues: Record<string, INodeParameters[]>) {
+				this.mutableValues = deepCopy(newValues);
+			},
+			deep: true,
+		},
+	},
+	created() {
+		this.mutableValues = deepCopy(this.values);
+	},
 	methods: {
 		deleteOption(optionName: string, index?: number) {
 			const currentOptionsOfSameType = this.mutableValues[optionName];
@@ -248,6 +254,7 @@ export default defineComponent({
 			const parameterData = {
 				name: this.getPropertyPath(optionName),
 				value: this.mutableValues[optionName],
+				type: 'optionsOrderChanged',
 			};
 
 			this.$emit('valueChanged', parameterData);
@@ -264,6 +271,7 @@ export default defineComponent({
 			const parameterData = {
 				name: this.getPropertyPath(optionName),
 				value: this.mutableValues[optionName],
+				type: 'optionsOrderChanged',
 			};
 
 			this.$emit('valueChanged', parameterData);
@@ -291,7 +299,7 @@ export default defineComponent({
 					// Multiple values are allowed so append option to array
 					newParameterValue[optionParameter.name] = get(
 						this.nodeValues,
-						`${this.path}.${optionParameter.name}`,
+						[this.path, optionParameter.name],
 						[],
 					);
 					if (Array.isArray(optionParameter.default)) {
@@ -337,34 +345,48 @@ export default defineComponent({
 </script>
 
 <style scoped lang="scss">
-::v-deep {
-	.button {
-		--button-background-color: var(--color-background-base);
-		--button-border-color: var(--color-foreground-base);
-	}
-}
-
 .fixed-collection-parameter {
 	padding-left: var(--spacing-s);
+
+	.delete-option {
+		display: flex;
+		flex-direction: column;
+	}
+
+	.controls {
+		:deep(.button) {
+			font-weight: var(--font-weight-normal);
+			--button-font-color: var(--color-text-dark);
+			--button-border-color: var(--color-foreground-base);
+			--button-background-color: var(--color-background-base);
+
+			--button-hover-font-color: var(--color-text-dark);
+			--button-hover-border-color: var(--color-foreground-base);
+			--button-hover-background-color: var(--color-background-base);
+
+			--button-active-font-color: var(--color-text-dark);
+			--button-active-border-color: var(--color-foreground-base);
+			--button-active-background-color: var(--color-background-base);
+
+			--button-focus-font-color: var(--color-text-dark);
+			--button-focus-border-color: var(--color-foreground-base);
+			--button-focus-background-color: var(--color-background-base);
+
+			&:active,
+			&.active,
+			&:focus {
+				outline: none;
+			}
+		}
+	}
 }
 
 .fixed-collection-parameter-property {
 	margin: var(--spacing-xs) 0;
 }
 
-.delete-option {
-	display: none;
-	position: absolute;
-	z-index: 999;
-	color: #f56c6c;
-	left: 0;
-	top: 0.5em;
-	width: 15px;
-	height: 100%;
-}
-
 .parameter-item:hover > .parameter-item-wrapper > .delete-option {
-	display: block;
+	opacity: 1;
 }
 
 .parameter-item {
@@ -373,8 +395,6 @@ export default defineComponent({
 
 	+ .parameter-item {
 		.parameter-item-wrapper {
-			border-top: 1px dashed #999;
-
 			.delete-option {
 				top: 14px;
 			}
@@ -382,14 +402,11 @@ export default defineComponent({
 	}
 }
 
-.no-items-exist {
-	margin: var(--spacing-xs) 0;
+.border-top-dashed {
+	border-top: 1px dashed #999;
 }
 
-.sort-icon {
-	display: flex;
-	flex-direction: column;
-	margin-left: 1px;
-	margin-top: 0.5em;
+.no-items-exist {
+	margin: var(--spacing-xs) 0;
 }
 </style>
diff --git a/packages/editor-ui/src/components/GenerateCurlModal.vue b/packages/editor-ui/src/components/GenerateCurlModal.vue
new file mode 100644
index 0000000000000..b90bd97bcd95f
--- /dev/null
+++ b/packages/editor-ui/src/components/GenerateCurlModal.vue
@@ -0,0 +1,216 @@
+<template>
+	<Modal
+		width="700px"
+		:title="i18n.baseText('generateCurlModal.title')"
+		:event-bus="modalBus"
+		:name="GENERATE_CURL_MODAL_KEY"
+		:center="true"
+	>
+		<template #content>
+			<div :class="$style.container">
+				<N8nFormInputs
+					:inputs="formInputs"
+					:event-bus="formBus"
+					column-view
+					@update="onUpdate"
+					@submit="onSubmit"
+				/>
+			</div>
+		</template>
+		<template #footer>
+			<div :class="$style.modalFooter">
+				<N8nNotice
+					:class="$style.notice"
+					:content="i18n.baseText('generateCurlModal.notice.content')"
+				/>
+				<div>
+					<N8nButton
+						float="right"
+						:loading="loading"
+						:label="i18n.baseText('generateCurlModal.button.label')"
+						@click="onGenerate"
+					/>
+				</div>
+			</div>
+		</template>
+	</Modal>
+</template>
+
+<script lang="ts" setup>
+import Modal from '@/components/Modal.vue';
+import { GENERATE_CURL_MODAL_KEY } from '@/constants';
+import { ref } from 'vue';
+import { createEventBus } from 'n8n-design-system/utils';
+import { useTelemetry } from '@/composables/useTelemetry';
+import { useI18n } from '@/composables/useI18n';
+import { useAIStore } from '@/stores/ai.store';
+import type { IFormInput } from 'n8n-design-system';
+import { useToast } from '@/composables/useToast';
+import { useImportCurlCommand } from '@/composables/useImportCurlCommand';
+import { useUIStore } from '@/stores/ui.store';
+import { useNDVStore } from '@/stores/ndv.store';
+
+const telemetry = useTelemetry();
+const i18n = useI18n();
+const toast = useToast();
+
+const uiStore = useUIStore();
+const aiStore = useAIStore();
+const ndvStore = useNDVStore();
+
+const modalBus = createEventBus();
+const formBus = createEventBus();
+
+const initialServiceValue = uiStore.getModalData(GENERATE_CURL_MODAL_KEY)?.service as string;
+const initialRequestValue = uiStore.getModalData(GENERATE_CURL_MODAL_KEY)?.request as string;
+
+const formInputs: IFormInput[] = [
+	{
+		name: 'service',
+		initialValue: initialServiceValue,
+		properties: {
+			label: i18n.baseText('generateCurlModal.service.label'),
+			placeholder: i18n.baseText('generateCurlModal.service.placeholder'),
+			type: 'text',
+			required: true,
+			capitalize: true,
+		},
+	},
+	{
+		name: 'request',
+		initialValue: initialRequestValue,
+		properties: {
+			label: i18n.baseText('generateCurlModal.request.label'),
+			placeholder: i18n.baseText('generateCurlModal.request.placeholder'),
+			type: 'text',
+			required: true,
+			capitalize: true,
+		},
+	},
+];
+
+const formValues = ref<{ service: string; request: string }>({
+	service: initialServiceValue ?? '',
+	request: initialRequestValue ?? '',
+});
+
+const loading = ref(false);
+
+const { importCurlCommand } = useImportCurlCommand({
+	onImportSuccess,
+	onImportFailure,
+	onAfterImport,
+	i18n: {
+		invalidCurCommand: {
+			title: 'generateCurlModal.invalidCurlCommand.title',
+			message: 'generateCurlModal.invalidCurlCommand.message',
+		},
+	},
+});
+
+function closeDialog(): void {
+	modalBus.emit('close');
+}
+
+function onImportSuccess() {
+	sendImportCurlTelemetry();
+
+	toast.showMessage({
+		title: i18n.baseText('generateCurlModal.success.title'),
+		message: i18n.baseText('generateCurlModal.success.message'),
+		type: 'success',
+	});
+
+	closeDialog();
+}
+
+function onImportFailure(data: { invalidProtocol: boolean; protocol?: string }) {
+	sendImportCurlTelemetry({ valid: false, ...data });
+}
+
+function onAfterImport() {
+	uiStore.setModalData({
+		name: GENERATE_CURL_MODAL_KEY,
+		data: {
+			service: formValues.value.service,
+			request: formValues.value.request,
+		},
+	});
+}
+
+function sendImportCurlTelemetry(
+	data: { valid: boolean; invalidProtocol: boolean; protocol?: string } = {
+		valid: true,
+		invalidProtocol: false,
+		protocol: '',
+	},
+): void {
+	const service = formValues.value.service;
+	const request = formValues.value.request;
+
+	telemetry.track(
+		'User generated curl command using AI',
+		{
+			request,
+			request_service_name: service,
+			valid_curl_response: data.valid,
+			api_docs_returned: false,
+			invalidProtocol: data.invalidProtocol,
+			protocol: data.protocol,
+			node_type: ndvStore.activeNode?.type,
+			node_name: ndvStore.activeNode?.name,
+		},
+		{ withPostHog: true },
+	);
+}
+
+async function onUpdate(field: { name: string; value: string }) {
+	formValues.value = {
+		...formValues.value,
+		[field.name]: field.value,
+	};
+}
+
+async function onGenerate() {
+	formBus.emit('submit');
+}
+
+async function onSubmit() {
+	const service = formValues.value.service;
+	const request = formValues.value.request;
+
+	try {
+		loading.value = true;
+
+		const data = await aiStore.generateCurl({
+			service,
+			request,
+		});
+
+		await importCurlCommand(data.curl);
+	} catch (error) {
+		toast.showError(error, i18n.baseText('error'));
+	} finally {
+		loading.value = false;
+	}
+}
+</script>
+
+<style module lang="scss">
+.modalFooter {
+	justify-content: space-between;
+	display: flex;
+	flex-direction: row;
+}
+
+.notice {
+	margin: 0;
+}
+
+.container > * {
+	margin-bottom: var(--spacing-s);
+	&:last-child {
+		margin-bottom: 0;
+	}
+}
+</style>
diff --git a/packages/editor-ui/src/components/GoBackButton.vue b/packages/editor-ui/src/components/GoBackButton.vue
index 6dcd409b971be..86b13d8224170 100644
--- a/packages/editor-ui/src/components/GoBackButton.vue
+++ b/packages/editor-ui/src/components/GoBackButton.vue
@@ -6,8 +6,8 @@
 </template>
 
 <script lang="ts">
-import { VIEWS } from '@/constants';
 import { defineComponent } from 'vue';
+import { VIEWS } from '@/constants';
 
 export default defineComponent({
 	name: 'GoBackButton',
@@ -16,15 +16,15 @@ export default defineComponent({
 			routeHasHistory: false,
 		};
 	},
+	mounted() {
+		window.history.state ? (this.routeHasHistory = true) : (this.routeHasHistory = false);
+	},
 	methods: {
 		navigateTo() {
 			if (this.routeHasHistory) this.$router.go(-1);
-			else this.$router.push({ name: VIEWS.TEMPLATES });
+			else void this.$router.push({ name: VIEWS.TEMPLATES });
 		},
 	},
-	mounted() {
-		window.history.state ? (this.routeHasHistory = true) : (this.routeHasHistory = false);
-	},
 });
 </script>
 
diff --git a/packages/editor-ui/src/components/HoverableNodeIcon.vue b/packages/editor-ui/src/components/HoverableNodeIcon.vue
index 5b6e5a634cc9c..22b665f62665d 100644
--- a/packages/editor-ui/src/components/HoverableNodeIcon.vue
+++ b/packages/editor-ui/src/components/HoverableNodeIcon.vue
@@ -7,7 +7,7 @@
 		@mouseleave="showTooltip = false"
 	>
 		<div :class="$style.tooltip">
-			<n8n-tooltip placement="top" manual :value="showTooltip">
+			<n8n-tooltip placement="top" :visible="showTooltip">
 				<template #content>
 					<div v-text="nodeType.displayName"></div>
 				</template>
@@ -45,7 +45,7 @@ import { defineComponent } from 'vue';
 import type { ITemplatesNode } from '@/Interface';
 import type { INodeTypeDescription } from 'n8n-workflow';
 import { mapStores } from 'pinia';
-import { useRootStore } from '@/stores/n8nRootStore';
+import { useRootStore } from '@/stores/n8nRoot.store';
 
 interface NodeIconData {
 	type: string;
@@ -84,7 +84,7 @@ export default defineComponent({
 		},
 		iconStyleData(): object {
 			const nodeType = this.nodeType as ITemplatesNode | null;
-			const color = nodeType ? nodeType.defaults && nodeType!.defaults.color : '';
+			const color = nodeType ? nodeType.defaults && nodeType.defaults.color : '';
 			if (!this.size) {
 				return { color };
 			}
diff --git a/packages/editor-ui/src/components/HtmlEditor/HtmlEditor.vue b/packages/editor-ui/src/components/HtmlEditor/HtmlEditor.vue
index 0d6488d9b8ad2..4f6e89526c0aa 100644
--- a/packages/editor-ui/src/components/HtmlEditor/HtmlEditor.vue
+++ b/packages/editor-ui/src/components/HtmlEditor/HtmlEditor.vue
@@ -1,282 +1,259 @@
 <template>
-	<div ref="htmlEditor" class="ph-no-capture"></div>
+	<div :class="$style.editor">
+		<div ref="htmlEditor"></div>
+		<slot name="suffix" />
+	</div>
 </template>
 
-<script lang="ts">
-import mixins from 'vue-typed-mixins';
-import prettier from 'prettier/standalone';
-import htmlParser from 'prettier/parser-html';
-import cssParser from 'prettier/parser-postcss';
-import jsParser from 'prettier/parser-babel';
-import { htmlLanguage, autoCloseTags, html } from 'codemirror-lang-html-n8n';
-import { autocompletion } from '@codemirror/autocomplete';
-import { indentWithTab, insertNewlineAndIndent, history, redo } from '@codemirror/commands';
+<script setup lang="ts">
+import { history } from '@codemirror/commands';
 import {
+	LanguageSupport,
 	bracketMatching,
 	ensureSyntaxTree,
 	foldGutter,
 	indentOnInput,
-	LanguageSupport,
 } from '@codemirror/language';
-import type { Extension } from '@codemirror/state';
-import { EditorState } from '@codemirror/state';
-import type { ViewUpdate } from '@codemirror/view';
+import { Prec } from '@codemirror/state';
 import {
 	dropCursor,
-	EditorView,
 	highlightActiveLine,
 	highlightActiveLineGutter,
 	keymap,
 	lineNumbers,
 } from '@codemirror/view';
+import { format } from 'prettier';
+import jsParser from 'prettier/plugins/babel';
+import * as estree from 'prettier/plugins/estree';
+import htmlParser from 'prettier/plugins/html';
+import cssParser from 'prettier/plugins/postcss';
+import { computed, onBeforeUnmount, onMounted, ref, toValue, watch } from 'vue';
 
+import { htmlEditorEventBus } from '@/event-bus';
+import { useExpressionEditor } from '@/composables/useExpressionEditor';
 import { n8nCompletionSources } from '@/plugins/codemirror/completions/addCompletions';
 import { expressionInputHandler } from '@/plugins/codemirror/inputHandlers/expression.inputHandler';
-import { highlighter } from '@/plugins/codemirror/resolvableHighlighter';
-import { htmlEditorEventBus } from '@/event-bus';
-import { expressionManager } from '@/mixins/expressionManager';
-import { theme } from './theme';
-import { nonTakenRanges } from './utils';
+import {
+	autocompleteKeyMap,
+	enterKeyMap,
+	historyKeyMap,
+	tabKeyMap,
+} from '@/plugins/codemirror/keymap';
+import { n8nAutocompletion } from '@/plugins/codemirror/n8nLang';
+import { autoCloseTags, htmlLanguage } from 'codemirror-lang-html-n8n';
+import { codeNodeEditorTheme } from '../CodeNodeEditor/theme';
 import type { Range, Section } from './types';
+import { nonTakenRanges } from './utils';
+
+type Props = {
+	modelValue: string;
+	rows?: number;
+	isReadOnly?: boolean;
+	fullscreen?: boolean;
+};
+
+const props = withDefaults(defineProps<Props>(), {
+	rows: 4,
+	isReadOnly: false,
+	fullscreen: false,
+});
+
+const emit = defineEmits<{
+	(event: 'update:model-value', value: string): void;
+}>();
+
+const htmlEditor = ref<HTMLElement>();
+const editorValue = ref<string>(props.modelValue);
+const extensions = computed(() => [
+	bracketMatching(),
+	n8nAutocompletion(),
+	new LanguageSupport(
+		htmlLanguage,
+		n8nCompletionSources().map((source) => htmlLanguage.data.of(source)),
+	),
+	autoCloseTags,
+	expressionInputHandler(),
+	Prec.highest(
+		keymap.of([...tabKeyMap(), ...enterKeyMap, ...historyKeyMap, ...autocompleteKeyMap]),
+	),
+	indentOnInput(),
+	codeNodeEditorTheme({
+		isReadOnly: props.isReadOnly,
+		maxHeight: props.fullscreen ? '100%' : '40vh',
+		minHeight: '20vh',
+		rows: props.rows,
+		highlightColors: 'html',
+	}),
+	lineNumbers(),
+	highlightActiveLineGutter(),
+	history(),
+	foldGutter(),
+	dropCursor(),
+	indentOnInput(),
+	highlightActiveLine(),
+]);
+const {
+	editor: editorRef,
+	segments,
+	readEditorValue,
+} = useExpressionEditor({
+	editorRef: htmlEditor,
+	editorValue,
+	extensions,
+});
+
+const sections = computed(() => {
+	const editor = toValue(editorRef);
+	if (!editor) return [];
+	const { state } = editor;
+
+	const fullTree = ensureSyntaxTree(state, state.doc.length);
+
+	if (fullTree === null) {
+		throw new Error('Failed to parse syntax tree');
+	}
+
+	let documentRange: Range = [-1, -1];
+	const styleRanges: Range[] = [];
+	const scriptRanges: Range[] = [];
+
+	fullTree.cursor().iterate((node) => {
+		if (node.type.name === 'Document') {
+			documentRange = [node.from, node.to];
+		}
+
+		if (node.type.name === 'StyleSheet') {
+			styleRanges.push([node.from - '<style>'.length, node.to + '</style>'.length]);
+		}
+
+		if (node.type.name === 'Script') {
+			scriptRanges.push([node.from - '<script>'.length, node.to + ('<' + '/script>').length]);
+			// typing the closing script tag in full causes ESLint, Prettier and Vite to crash
+		}
+	});
+
+	const htmlRanges = nonTakenRanges(documentRange, [...styleRanges, ...scriptRanges]);
+
+	const styleSections: Section[] = styleRanges.map(([start, end]) => ({
+		kind: 'style' as const,
+		range: [start, end],
+		content: state.sliceDoc(start, end).replace(/<\/?style>/g, ''),
+	}));
+
+	const scriptSections: Section[] = scriptRanges.map(([start, end]) => ({
+		kind: 'script' as const,
+		range: [start, end],
+		content: state.sliceDoc(start, end).replace(/<\/?script>/g, ''),
+	}));
+
+	const htmlSections: Section[] = htmlRanges.map(([start, end]) => ({
+		kind: 'html' as const,
+		range: [start, end] as Range,
+		content: state.sliceDoc(start, end).replace(/<\/html>/g, ''),
+		// opening tag may contain attributes, e.g. <html lang="en">
+	}));
+
+	return [...styleSections, ...scriptSections, ...htmlSections].sort(
+		(a, b) => a.range[0] - b.range[0],
+	);
+});
 
-export default mixins(expressionManager).extend({
-	name: 'HtmlEditor',
-	props: {
-		html: {
-			type: String,
-			required: true,
-		},
-		isReadOnly: {
-			type: Boolean,
-			default: false,
-		},
-		rows: {
-			type: Number,
-			default: -1,
-		},
-		disableExpressionColoring: {
-			type: Boolean,
-			default: false,
-		},
-		disableExpressionCompletions: {
-			type: Boolean,
-			default: false,
-		},
-	},
-	data() {
-		return {
-			editor: {} as EditorView,
-		};
-	},
-	computed: {
-		doc(): string {
-			return this.editor.state.doc.toString();
-		},
-
-		extensions(): Extension[] {
-			function htmlWithCompletions() {
-				return new LanguageSupport(
-					htmlLanguage,
-					n8nCompletionSources().map((source) => htmlLanguage.data.of(source)),
-				);
-			}
-
-			return [
-				bracketMatching(),
-				autocompletion(),
-				this.disableExpressionCompletions ? html() : htmlWithCompletions(),
-				autoCloseTags,
-				expressionInputHandler(),
-				keymap.of([
-					indentWithTab,
-					{ key: 'Enter', run: insertNewlineAndIndent },
-					{ key: 'Mod-Shift-z', run: redo },
-				]),
-				indentOnInput(),
-				theme,
-				lineNumbers(),
-				highlightActiveLineGutter(),
-				history(),
-				foldGutter(),
-				dropCursor(),
-				indentOnInput(),
-				highlightActiveLine(),
-				EditorState.readOnly.of(this.isReadOnly),
-				EditorView.updateListener.of((viewUpdate: ViewUpdate) => {
-					if (!viewUpdate.docChanged) return;
-
-					this.getHighlighter()?.removeColor(this.editor, this.htmlSegments);
-					this.getHighlighter()?.addColor(this.editor, this.resolvableSegments);
-
-					this.$emit('valueChanged', this.doc);
-				}),
-			];
-		},
-
-		sections(): Section[] {
-			const { state } = this.editor;
-
-			const fullTree = ensureSyntaxTree(this.editor.state, this.doc.length);
-
-			if (fullTree === null) {
-				throw new Error(`Failed to parse syntax tree for: ${this.doc}`);
-			}
-
-			let documentRange: Range = [-1, -1];
-			const styleRanges: Range[] = [];
-			const scriptRanges: Range[] = [];
-
-			fullTree.cursor().iterate((node) => {
-				if (node.type.name === 'Document') {
-					documentRange = [node.from, node.to];
-				}
-
-				if (node.type.name === 'StyleSheet') {
-					styleRanges.push([node.from - '<style>'.length, node.to + '</style>'.length]);
-				}
-
-				if (node.type.name === 'Script') {
-					scriptRanges.push([node.from - '<script>'.length, node.to + ('<' + '/script>').length]);
-					// typing the closing script tag in full causes ESLint, Prettier and Vite to crash
-				}
+function isMissingHtmlTags() {
+	const zerothSection = sections.value.at(0);
+
+	return (
+		!zerothSection?.content.trim().startsWith('<html') &&
+		!zerothSection?.content.trim().endsWith('</html>')
+	);
+}
+
+async function formatHtml() {
+	const editor = toValue(editorRef);
+	if (!editor) return;
+
+	const sectionToFormat = sections.value;
+	if (sectionToFormat.length === 1 && isMissingHtmlTags()) {
+		const zerothSection = sectionToFormat.at(0) as Section;
+
+		const formatted = (
+			await format(zerothSection.content, {
+				parser: 'html',
+				plugins: [htmlParser],
+			})
+		).trim();
+
+		return editor.dispatch({
+			changes: { from: 0, to: editor.state.doc.length, insert: formatted },
+		});
+	}
+
+	const formatted = [];
+
+	for (const { kind, content } of sections.value) {
+		if (kind === 'style') {
+			const formattedStyle = await format(content, {
+				parser: 'css',
+				plugins: [cssParser],
 			});
 
-			const htmlRanges = nonTakenRanges(documentRange, [...styleRanges, ...scriptRanges]);
-
-			const styleSections: Section[] = styleRanges.map(([start, end]) => ({
-				kind: 'style' as const,
-				range: [start, end],
-				content: state.sliceDoc(start, end).replace(/<\/?style>/g, ''),
-			}));
-
-			const scriptSections: Section[] = scriptRanges.map(([start, end]) => ({
-				kind: 'script' as const,
-				range: [start, end],
-				content: state.sliceDoc(start, end).replace(/<\/?script>/g, ''),
-			}));
-
-			const htmlSections: Section[] = htmlRanges.map(([start, end]) => ({
-				kind: 'html' as const,
-				range: [start, end] as Range,
-				content: state.sliceDoc(start, end).replace(/<\/html>/g, ''),
-				// opening tag may contain attributes, e.g. <html lang="en">
-			}));
-
-			return [...styleSections, ...scriptSections, ...htmlSections].sort(
-				(a, b) => a.range[0] - b.range[0],
-			);
-		},
-	},
-
-	methods: {
-		root() {
-			const rootRef = this.$refs.htmlEditor as HTMLDivElement | undefined;
-			if (!rootRef) {
-				throw new Error('Expected div with ref "htmlEditor"');
-			}
-
-			return rootRef;
-		},
-
-		isMissingHtmlTags() {
-			const zerothSection = this.sections.at(0);
-
-			return (
-				!zerothSection?.content.trim().startsWith('<html') &&
-				!zerothSection?.content.trim().endsWith('</html>')
-			);
-		},
-
-		format() {
-			if (this.sections.length === 1 && this.isMissingHtmlTags()) {
-				const zerothSection = this.sections.at(0) as Section;
-
-				const formatted = prettier
-					.format(zerothSection.content, {
-						parser: 'html',
-						plugins: [htmlParser],
-					})
-					.trim();
-
-				return this.editor.dispatch({
-					changes: { from: 0, to: this.doc.length, insert: formatted },
-				});
-			}
-
-			const formatted = [];
-
-			for (const { kind, content } of this.sections) {
-				if (kind === 'style') {
-					const formattedStyle = prettier.format(content, {
-						parser: 'css',
-						plugins: [cssParser],
-					});
-
-					formatted.push(`<style>\n${formattedStyle}</style>`);
-				}
-
-				if (kind === 'script') {
-					const formattedScript = prettier.format(content, {
-						parser: 'babel',
-						plugins: [jsParser],
-					});
-
-					formatted.push(`<script>\n${formattedScript}<` + '/script>');
-					// typing the closing script tag in full causes ESLint, Prettier and Vite to crash
-				}
-
-				if (kind === 'html') {
-					const match = content.match(/(?<pre>[\s\S]*<html[\s\S]*?>)(?<rest>[\s\S]*)/);
-
-					if (!match?.groups?.pre || !match.groups?.rest) continue;
-
-					// Prettier cannot format pre-HTML section, e.g. <!DOCTYPE html>, so keep as is
-
-					const { pre, rest } = match.groups;
-
-					const formattedRest = prettier.format(rest, {
-						parser: 'html',
-						plugins: [htmlParser],
-					});
-
-					formatted.push(`${pre}\n${formattedRest}</html>`);
-				}
-			}
-
-			if (formatted.length === 0) return;
-
-			this.editor.dispatch({
-				changes: { from: 0, to: this.doc.length, insert: formatted.join('\n\n') },
+			formatted.push(`<style>\n${formattedStyle}</style>`);
+		}
+
+		if (kind === 'script') {
+			const formattedScript = await format(content, {
+				parser: 'babel',
+				plugins: [jsParser, estree],
 			});
-		},
 
-		getHighlighter() {
-			if (this.disableExpressionColoring) return;
+			formatted.push(`<script>\n${formattedScript}<` + '/script>');
+			// typing the closing script tag in full causes ESLint, Prettier and Vite to crash
+		}
+
+		if (kind === 'html') {
+			const match = content.match(/(?<pre>[\s\S]*<html[\s\S]*?>)(?<rest>[\s\S]*)/);
 
-			return highlighter;
-		},
-	},
+			if (!match?.groups?.pre || !match.groups?.rest) continue;
 
-	mounted() {
-		htmlEditorEventBus.on('format-html', this.format);
+			// Prettier cannot format pre-HTML section, e.g. <!DOCTYPE html>, so keep as is
 
-		let doc = this.html;
+			const { pre, rest } = match.groups;
+
+			const formattedRest = await format(rest, {
+				parser: 'html',
+				plugins: [htmlParser],
+			});
 
-		if (this.html === '' && this.rows > 0) {
-			doc = '\n'.repeat(this.rows - 1);
+			formatted.push(`${pre}\n${formattedRest}</html>`);
 		}
+	}
 
-		const state = EditorState.create({ doc, extensions: this.extensions });
+	if (formatted.length === 0) return;
 
-		this.editor = new EditorView({ parent: this.root(), state });
+	editor.dispatch({
+		changes: { from: 0, to: editor.state.doc.length, insert: formatted.join('\n\n') },
+	});
+}
 
-		this.getHighlighter()?.addColor(this.editor, this.resolvableSegments);
-	},
+watch(segments.display, () => {
+	emit('update:model-value', readEditorValue());
+});
+
+onMounted(() => {
+	htmlEditorEventBus.on('format-html', formatHtml);
+});
 
-	destroyed() {
-		htmlEditorEventBus.off('format-html', this.format);
-	},
+onBeforeUnmount(() => {
+	htmlEditorEventBus.off('format-html', formatHtml);
+	emit('update:model-value', readEditorValue());
 });
 </script>
 
-<style lang="scss" module></style>
+<style lang="scss" module>
+.editor {
+	height: 100%;
+
+	& > div {
+		height: 100%;
+	}
+}
+</style>
diff --git a/packages/editor-ui/src/components/HtmlEditor/theme.ts b/packages/editor-ui/src/components/HtmlEditor/theme.ts
deleted file mode 100644
index 5c2a9845c149d..0000000000000
--- a/packages/editor-ui/src/components/HtmlEditor/theme.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-import { HighlightStyle, syntaxHighlighting } from '@codemirror/language';
-import { EditorView } from '@codemirror/view';
-import { tags } from '@lezer/highlight';
-
-export const theme = [
-	EditorView.theme({
-		'&': {
-			'font-size': '0.8em',
-			border: 'var(--border-base)',
-			borderRadius: 'var(--border-radius-base)',
-			backgroundColor: 'var(--color-code-background)',
-			color: 'var(--color-code-foreground)',
-		},
-		'.cm-content': {
-			fontFamily: "Menlo, Consolas, 'DejaVu Sans Mono', monospace !important",
-			caretColor: 'var(--color-code-caret)',
-		},
-		'.cm-cursor, .cm-dropCursor': {
-			borderLeftColor: 'var(--color-code-caret)',
-		},
-		'&.cm-editor.cm-focused': {
-			outline: '0',
-		},
-		'&.cm-focused .cm-selectionBackgroundm .cm-selectionBackground, .cm-content ::selection': {
-			backgroundColor: 'var(--color-code-selection)',
-		},
-		'.cm-activeLine': {
-			backgroundColor: 'var(--color-code-lineHighlight)',
-		},
-		'.cm-activeLineGutter': {
-			backgroundColor: 'var(--color-code-lineHighlight)',
-		},
-		'.cm-gutters': {
-			backgroundColor: 'var(--color-code-gutterBackground)',
-			color: 'var(--color-code-gutterForeground)',
-			borderTopLeftRadius: 'var(--border-radius-base)',
-			borderBottomLeftRadius: 'var(--border-radius-base)',
-		},
-		'.cm-scroller': {
-			overflow: 'auto',
-			maxHeight: '350px',
-		},
-	}),
-	syntaxHighlighting(
-		HighlightStyle.define([
-			{ tag: tags.keyword, color: '#c678dd' },
-			{
-				tag: [tags.name, tags.deleted, tags.character, tags.propertyName, tags.macroName],
-				color: '#e06c75',
-			},
-			{ tag: [tags.function(tags.variableName), tags.labelName], color: '#61afef' },
-			{ tag: [tags.color, tags.constant(tags.name), tags.standard(tags.name)], color: '#d19a66' },
-			{ tag: [tags.definition(tags.name), tags.separator], color: '#abb2bf' },
-			{
-				tag: [
-					tags.typeName,
-					tags.className,
-					tags.number,
-					tags.changed,
-					tags.annotation,
-					tags.modifier,
-					tags.self,
-					tags.namespace,
-				],
-				color: '#e06c75',
-			},
-			{
-				tag: [
-					tags.operator,
-					tags.operatorKeyword,
-					tags.url,
-					tags.escape,
-					tags.regexp,
-					tags.link,
-					tags.special(tags.string),
-				],
-				color: '#56b6c2',
-			},
-			{ tag: [tags.meta, tags.comment], color: '#7d8799' },
-			{ tag: tags.strong, fontWeight: 'bold' },
-			{ tag: tags.emphasis, fontStyle: 'italic' },
-			{ tag: tags.strikethrough, textDecoration: 'line-through' },
-			{ tag: tags.link, color: '#7d8799', textDecoration: 'underline' },
-			{ tag: tags.heading, fontWeight: 'bold', color: '#e06c75' },
-			{ tag: [tags.atom, tags.bool, tags.special(tags.variableName)], color: '#d19a66' },
-			{ tag: [tags.processingInstruction, tags.string, tags.inserted], color: '#98c379' },
-			{ tag: tags.invalid, color: 'red', 'font-weight': 'bold' },
-		]),
-	),
-];
diff --git a/packages/editor-ui/src/components/ImportCurlModal.vue b/packages/editor-ui/src/components/ImportCurlModal.vue
index 03b30cbd258d6..12e6a32b3edcf 100644
--- a/packages/editor-ui/src/components/ImportCurlModal.vue
+++ b/packages/editor-ui/src/components/ImportCurlModal.vue
@@ -1,37 +1,37 @@
 <template>
 	<Modal
 		width="700px"
-		:title="$locale.baseText('importCurlModal.title')"
-		:eventBus="modalBus"
+		:title="i18n.baseText('importCurlModal.title')"
+		:event-bus="modalBus"
 		:name="IMPORT_CURL_MODAL_KEY"
 		:center="true"
 	>
 		<template #content>
 			<div :class="$style.container">
-				<n8n-input-label :label="$locale.baseText('importCurlModal.input.label')" color="text-dark">
-					<n8n-input
-						:value="curlCommand"
+				<N8nInputLabel :label="i18n.baseText('importCurlModal.input.label')" color="text-dark">
+					<N8nInput
+						ref="inputRef"
+						:model-value="curlCommand"
 						type="textarea"
 						:rows="5"
-						:placeholder="$locale.baseText('importCurlModal.input.placeholder')"
-						@input="onInput"
+						:placeholder="i18n.baseText('importCurlModal.input.placeholder')"
+						@update:model-value="onInput"
 						@focus="$event.target.select()"
-						ref="input"
 					/>
-				</n8n-input-label>
+				</N8nInputLabel>
 			</div>
 		</template>
 		<template #footer>
 			<div :class="$style.modalFooter">
-				<n8n-notice
+				<N8nNotice
 					:class="$style.notice"
-					:content="$locale.baseText('ImportCurlModal.notice.content')"
+					:content="i18n.baseText('ImportCurlModal.notice.content')"
 				/>
 				<div>
-					<n8n-button
-						@click="importCurlCommand"
+					<N8nButton
 						float="right"
-						:label="$locale.baseText('importCurlModal.button.label')"
+						:label="i18n.baseText('importCurlModal.button.label')"
+						@click="onImport"
 					/>
 				</div>
 			</div>
@@ -39,145 +39,81 @@
 	</Modal>
 </template>
 
-<script lang="ts">
-import Modal from './Modal.vue';
-import {
-	IMPORT_CURL_MODAL_KEY,
-	CURL_IMPORT_NOT_SUPPORTED_PROTOCOLS,
-	CURL_IMPORT_NODES_PROTOCOLS,
-} from '../constants';
-import { showMessage } from '@/mixins/showMessage';
-import mixins from 'vue-typed-mixins';
-import type { INodeUi } from '@/Interface';
-import { mapStores } from 'pinia';
-import { useUIStore } from '@/stores/ui';
-import { useNDVStore } from '@/stores/ndv';
-import { createEventBus } from '@/event-bus';
-
-export default mixins(showMessage).extend({
-	name: 'ImportCurlModal',
-	components: {
-		Modal,
-	},
-	data() {
-		return {
-			IMPORT_CURL_MODAL_KEY,
-			curlCommand: '',
-			modalBus: createEventBus(),
-		};
-	},
-	computed: {
-		...mapStores(useNDVStore, useUIStore),
-		node(): INodeUi | null {
-			return this.ndvStore.activeNode;
-		},
-	},
-	methods: {
-		closeDialog(): void {
-			this.modalBus.emit('close');
-		},
-		onInput(value: string): void {
-			this.curlCommand = value;
-		},
-		async importCurlCommand(): Promise<void> {
-			const curlCommand = this.curlCommand;
-			if (curlCommand === '') return;
-
-			try {
-				const parameters = await this.uiStore.getCurlToJson(curlCommand);
-				const url = parameters['parameters.url'];
-
-				const invalidProtocol = CURL_IMPORT_NOT_SUPPORTED_PROTOCOLS.find((p) =>
-					url.includes(`${p}://`),
-				);
-
-				if (!invalidProtocol) {
-					this.uiStore.setHttpNodeParameters({
-						name: IMPORT_CURL_MODAL_KEY,
-						parameters: JSON.stringify(parameters),
-					});
-
-					this.closeDialog();
-
-					this.sendTelemetry();
-
-					return;
-					// if we have a node that supports the invalid protocol
-					// suggest that one
-				} else if (CURL_IMPORT_NODES_PROTOCOLS[invalidProtocol]) {
-					const useNode = CURL_IMPORT_NODES_PROTOCOLS[invalidProtocol];
-
-					this.showProtocolErrorWithSupportedNode(invalidProtocol, useNode);
-					// we do not have a node that supports the use protocol
-				} else {
-					this.showProtocolError(invalidProtocol);
-				}
-				this.sendTelemetry({ success: false, invalidProtocol: true, protocol: invalidProtocol });
-			} catch (e) {
-				this.showInvalidcURLCommandError();
-
-				this.sendTelemetry({ success: false, invalidProtocol: false });
-			} finally {
-				this.uiStore.setCurlCommand({ name: IMPORT_CURL_MODAL_KEY, command: this.curlCommand });
-			}
-		},
-		showProtocolErrorWithSupportedNode(protocol: string, node: string): void {
-			this.$showToast({
-				title: this.$locale.baseText('importParameter.showError.invalidProtocol1.title', {
-					interpolate: {
-						node,
-					},
-				}),
-				message: this.$locale.baseText('importParameter.showError.invalidProtocol.message', {
-					interpolate: {
-						protocol: protocol.toUpperCase(),
-					},
-				}),
-				type: 'error',
-				duration: 0,
-			});
-		},
-		showProtocolError(protocol: string): void {
-			this.$showToast({
-				title: this.$locale.baseText('importParameter.showError.invalidProtocol2.title'),
-				message: this.$locale.baseText('importParameter.showError.invalidProtocol.message', {
-					interpolate: {
-						protocol,
-					},
-				}),
-				type: 'error',
-				duration: 0,
-			});
-		},
-		showInvalidcURLCommandError(): void {
-			this.$showToast({
-				title: this.$locale.baseText('importParameter.showError.invalidCurlCommand.title'),
-				message: this.$locale.baseText('importParameter.showError.invalidCurlCommand.message'),
-				type: 'error',
-				duration: 0,
-			});
-		},
-		sendTelemetry(
-			data: { success: boolean; invalidProtocol: boolean; protocol?: string } = {
-				success: true,
-				invalidProtocol: false,
-				protocol: '',
-			},
-		): void {
-			this.$telemetry.track('User imported curl command', {
-				success: data.success,
-				invalidProtocol: data.invalidProtocol,
-				protocol: data.protocol,
-			});
-		},
-	},
-	mounted() {
-		this.curlCommand = this.uiStore.getCurlCommand || '';
-		setTimeout(() => {
-			(this.$refs.input as HTMLTextAreaElement).focus();
-		});
-	},
+<script lang="ts" setup>
+import Modal from '@/components/Modal.vue';
+import { IMPORT_CURL_MODAL_KEY } from '@/constants';
+import { onMounted, ref } from 'vue';
+import { useUIStore } from '@/stores/ui.store';
+import { createEventBus } from 'n8n-design-system/utils';
+import { useTelemetry } from '@/composables/useTelemetry';
+import { useI18n } from '@/composables/useI18n';
+import { useImportCurlCommand } from '@/composables/useImportCurlCommand';
+
+const telemetry = useTelemetry();
+const i18n = useI18n();
+
+const uiStore = useUIStore();
+
+const curlCommand = ref('');
+const modalBus = createEventBus();
+
+const inputRef = ref<HTMLTextAreaElement | null>(null);
+
+const { importCurlCommand } = useImportCurlCommand({
+	onImportSuccess,
+	onImportFailure,
+	onAfterImport,
 });
+
+onMounted(() => {
+	curlCommand.value = (uiStore.getModalData(IMPORT_CURL_MODAL_KEY)?.curlCommand as string) ?? '';
+
+	setTimeout(() => {
+		inputRef.value?.focus();
+	});
+});
+
+function onInput(value: string): void {
+	curlCommand.value = value;
+}
+
+function closeDialog(): void {
+	modalBus.emit('close');
+}
+
+function onImportSuccess() {
+	sendTelemetry();
+	closeDialog();
+}
+
+function onImportFailure(data: { invalidProtocol: boolean; protocol?: string }) {
+	sendTelemetry({ success: false, ...data });
+}
+
+function onAfterImport() {
+	uiStore.setModalData({
+		name: IMPORT_CURL_MODAL_KEY,
+		data: { curlCommand: curlCommand.value },
+	});
+}
+
+function sendTelemetry(
+	data: { success: boolean; invalidProtocol: boolean; protocol?: string } = {
+		success: true,
+		invalidProtocol: false,
+		protocol: '',
+	},
+): void {
+	telemetry.track('User imported curl command', {
+		success: data.success,
+		invalidProtocol: data.invalidProtocol,
+		protocol: data.protocol,
+	});
+}
+
+async function onImport() {
+	await importCurlCommand(curlCommand);
+}
 </script>
 
 <style module lang="scss">
diff --git a/packages/editor-ui/src/components/ImportCurlParameter.vue b/packages/editor-ui/src/components/ImportCurlParameter.vue
new file mode 100644
index 0000000000000..a1b169d95cda7
--- /dev/null
+++ b/packages/editor-ui/src/components/ImportCurlParameter.vue
@@ -0,0 +1,53 @@
+<script lang="ts" setup>
+import { GENERATE_CURL_MODAL_KEY, IMPORT_CURL_MODAL_KEY } from '@/constants';
+import { useUIStore } from '@/stores/ui.store';
+import { useAIStore } from '@/stores/ai.store';
+
+defineProps({
+	isReadOnly: {
+		type: Boolean,
+		default: false,
+	},
+});
+
+const uiStore = useUIStore();
+const aiStore = useAIStore();
+
+function onImportCurlClicked() {
+	uiStore.openModal(IMPORT_CURL_MODAL_KEY);
+}
+
+function onGenerateCurlClicked() {
+	uiStore.openModal(GENERATE_CURL_MODAL_KEY);
+}
+</script>
+
+<template>
+	<div :class="$style.importSection">
+		<n8n-button
+			type="secondary"
+			:label="$locale.baseText('importCurlParameter.label')"
+			:disabled="isReadOnly"
+			size="mini"
+			@click="onImportCurlClicked"
+		/>
+
+		<n8n-button
+			v-if="aiStore.isGenerateCurlEnabled"
+			class="mr-2xs"
+			type="secondary"
+			:label="$locale.baseText('generateCurlParameter.label')"
+			:disabled="isReadOnly"
+			size="mini"
+			@click="onGenerateCurlClicked"
+		/>
+	</div>
+</template>
+
+<style module lang="scss">
+.importSection {
+	display: flex;
+	flex-direction: row-reverse;
+	margin-top: var(--spacing-xs);
+}
+</style>
diff --git a/packages/editor-ui/src/components/ImportParameter.vue b/packages/editor-ui/src/components/ImportParameter.vue
deleted file mode 100644
index 2c68127e37b85..0000000000000
--- a/packages/editor-ui/src/components/ImportParameter.vue
+++ /dev/null
@@ -1,45 +0,0 @@
-<template>
-	<div :class="$style.importSection">
-		<n8n-button
-			type="secondary"
-			:label="$locale.baseText('importParameter.label')"
-			:disabled="isReadOnly"
-			size="mini"
-			@click="onImportCurlClicked"
-		/>
-	</div>
-</template>
-
-<script lang="ts">
-import { IMPORT_CURL_MODAL_KEY } from '@/constants';
-import { useUIStore } from '@/stores/ui';
-import { mapStores } from 'pinia';
-import mixins from 'vue-typed-mixins';
-import { showMessage } from '@/mixins/showMessage';
-
-export default mixins(showMessage).extend({
-	name: 'import-parameter',
-	props: {
-		isReadOnly: {
-			type: Boolean,
-			default: false,
-		},
-	},
-	computed: {
-		...mapStores(useUIStore),
-	},
-	methods: {
-		onImportCurlClicked() {
-			this.uiStore.openModal(IMPORT_CURL_MODAL_KEY);
-		},
-	},
-});
-</script>
-
-<style module lang="scss">
-.importSection {
-	display: flex;
-	flex-direction: row-reverse;
-	margin-top: 10px;
-}
-</style>
diff --git a/packages/editor-ui/src/components/InlineExpressionEditor/ExpressionOutput.vue b/packages/editor-ui/src/components/InlineExpressionEditor/ExpressionOutput.vue
new file mode 100644
index 0000000000000..ab545be0ab584
--- /dev/null
+++ b/packages/editor-ui/src/components/InlineExpressionEditor/ExpressionOutput.vue
@@ -0,0 +1,117 @@
+<script setup lang="ts">
+import { EditorState, type Extension } from '@codemirror/state';
+import { EditorView } from '@codemirror/view';
+
+import { useI18n } from '@/composables/useI18n';
+import { highlighter } from '@/plugins/codemirror/resolvableHighlighter';
+import type { Plaintext, Resolved, Segment } from '@/types/expressions';
+import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue';
+import { forceParse } from '@/utils/forceParse';
+
+interface ExpressionOutputProps {
+	segments: Segment[];
+	extensions?: Extension[];
+}
+
+const props = withDefaults(defineProps<ExpressionOutputProps>(), { extensions: () => [] });
+
+const i18n = useI18n();
+
+const editor = ref<EditorView | null>(null);
+const root = ref<HTMLElement | null>(null);
+
+const resolvedExpression = computed(() => {
+	if (props.segments.length === 0) {
+		return i18n.baseText('parameterInput.emptyString');
+	}
+
+	return props.segments.reduce(
+		(acc, segment) => {
+			// skip duplicate segments
+			if (acc.cursor >= segment.to) return acc;
+
+			acc.resolved += segment.kind === 'resolvable' ? String(segment.resolved) : segment.plaintext;
+			acc.cursor = segment.to;
+
+			return acc;
+		},
+		{ resolved: '', cursor: 0 },
+	).resolved;
+});
+
+const plaintextSegments = computed<Plaintext[]>(() => {
+	return props.segments.filter((s): s is Plaintext => s.kind === 'plaintext');
+});
+
+const resolvedSegments = computed<Resolved[]>(() => {
+	if (props.segments.length === 0) {
+		const emptyExpression = resolvedExpression.value;
+		const emptySegment: Resolved = {
+			from: 0,
+			to: emptyExpression.length,
+			kind: 'resolvable',
+			error: null,
+			resolvable: '',
+			resolved: emptyExpression,
+			state: 'pending',
+		};
+		return [emptySegment];
+	}
+
+	let cursor = 0;
+
+	return props.segments
+		.map((segment) => {
+			segment.from = cursor;
+			cursor +=
+				segment.kind === 'plaintext'
+					? segment.plaintext.length
+					: segment.resolved
+						? (segment.resolved as string | number | boolean).toString().length
+						: 0;
+			segment.to = cursor;
+			return segment;
+		})
+		.filter((segment): segment is Resolved => segment.kind === 'resolvable');
+});
+
+watch(
+	() => props.segments,
+	() => {
+		if (!editor.value) return;
+
+		editor.value.dispatch({
+			changes: { from: 0, to: editor.value.state.doc.length, insert: resolvedExpression.value },
+		});
+
+		highlighter.addColor(editor.value as EditorView, resolvedSegments.value);
+		highlighter.removeColor(editor.value as EditorView, plaintextSegments.value);
+	},
+);
+
+onMounted(() => {
+	editor.value = new EditorView({
+		parent: root.value as HTMLElement,
+		state: EditorState.create({
+			doc: resolvedExpression.value,
+			extensions: [
+				EditorState.readOnly.of(true),
+				EditorView.lineWrapping,
+				EditorView.editable.of(false),
+				EditorView.domEventHandlers({ scroll: forceParse }),
+				...props.extensions,
+			],
+		}),
+	});
+});
+
+onBeforeUnmount(() => {
+	editor.value?.destroy();
+});
+
+defineExpose({ getValue: () => '=' + resolvedExpression.value });
+</script>
+
+<template>
+	<div ref="root" data-test-id="expression-output"></div>
+</template>
diff --git a/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorInput.vue b/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorInput.vue
index 62831f6b9e9ec..1e547c08ac2b7 100644
--- a/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorInput.vue
+++ b/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorInput.vue
@@ -1,151 +1,158 @@
-<template>
-	<div ref="root" class="ph-no-capture" data-test-id="inline-expression-editor-input"></div>
-</template>
-
-<script lang="ts">
-import mixins from 'vue-typed-mixins';
-import { mapStores } from 'pinia';
+<script setup lang="ts">
+import { startCompletion } from '@codemirror/autocomplete';
+import { history } from '@codemirror/commands';
+import { type EditorState, Prec, type SelectionRange } from '@codemirror/state';
 import { EditorView, keymap } from '@codemirror/view';
-import { EditorState, Prec } from '@codemirror/state';
-import { history, redo } from '@codemirror/commands';
-import { acceptCompletion, autocompletion, completionStatus } from '@codemirror/autocomplete';
-
-import { useNDVStore } from '@/stores/ndv';
-import { workflowHelpers } from '@/mixins/workflowHelpers';
-import { expressionManager } from '@/mixins/expressionManager';
-import { highlighter } from '@/plugins/codemirror/resolvableHighlighter';
+import { computed, nextTick, onBeforeUnmount, onMounted, ref, toValue, watch } from 'vue';
+
+import { useExpressionEditor } from '@/composables/useExpressionEditor';
 import { expressionInputHandler } from '@/plugins/codemirror/inputHandlers/expression.inputHandler';
+import {
+	autocompleteKeyMap,
+	enterKeyMap,
+	historyKeyMap,
+	tabKeyMap,
+} from '@/plugins/codemirror/keymap';
+import { n8nAutocompletion, n8nLang } from '@/plugins/codemirror/n8nLang';
+import { useNDVStore } from '@/stores/ndv.store';
+import type { Segment } from '@/types/expressions';
+import { removeExpressionPrefix } from '@/utils/expressions';
+import { createEventBus, type EventBus } from 'n8n-design-system/utils';
+import type { IDataObject } from 'n8n-workflow';
 import { inputTheme } from './theme';
-import { n8nLang } from '@/plugins/codemirror/n8nLang';
-import { completionManager } from '@/mixins/completionManager';
-
-export default mixins(completionManager, expressionManager, workflowHelpers).extend({
-	name: 'InlineExpressionEditorInput',
-	props: {
-		value: {
-			type: String,
-		},
-		isReadOnly: {
-			type: Boolean,
-			default: false,
-		},
-		isSingleLine: {
-			type: Boolean,
-			default: false,
-		},
-		path: {
-			type: String,
-		},
-	},
-	watch: {
-		value(newValue) {
-			const isInternalChange = newValue === this.editor?.state.doc.toString();
-
-			if (isInternalChange) return;
-
-			// manual update on external change, e.g. from expression modal or mapping drop
-
-			this.editor?.dispatch({
-				changes: {
-					from: 0,
-					to: this.editor?.state.doc.length,
-					insert: newValue,
-				},
-			});
-		},
-		ndvInputData() {
-			this.editor?.dispatch({
-				changes: {
-					from: 0,
-					to: this.editor.state.doc.length,
-					insert: this.value,
-				},
-			});
-
-			setTimeout(() => {
-				this.editor?.contentDOM.blur();
-			});
-		},
-	},
-	computed: {
-		...mapStores(useNDVStore),
-		ndvInputData(): object {
-			return this.ndvStore.ndvInputData;
-		},
+
+type Props = {
+	modelValue: string;
+	path: string;
+	rows?: number;
+	isReadOnly?: boolean;
+	additionalData?: IDataObject;
+	eventBus?: EventBus;
+};
+
+const props = withDefaults(defineProps<Props>(), {
+	rows: 5,
+	isReadOnly: false,
+	additionalData: () => ({}),
+	eventBus: () => createEventBus(),
+});
+
+const emit = defineEmits<{
+	(event: 'update:model-value', value: { value: string; segments: Segment[] }): void;
+	(event: 'update:selection', value: { state: EditorState; selection: SelectionRange }): void;
+	(event: 'focus'): void;
+}>();
+
+const ndvStore = useNDVStore();
+
+const root = ref<HTMLElement>();
+const extensions = computed(() => [
+	Prec.highest(
+		keymap.of([...tabKeyMap(true), ...enterKeyMap, ...autocompleteKeyMap, ...historyKeyMap]),
+	),
+	n8nLang(),
+	n8nAutocompletion(),
+	inputTheme({ rows: props.rows }),
+	history(),
+	expressionInputHandler(),
+	EditorView.lineWrapping,
+]);
+const editorValue = ref<string>(removeExpressionPrefix(props.modelValue));
+const {
+	editor: editorRef,
+	segments,
+	selection,
+	readEditorValue,
+	setCursorPosition,
+	hasFocus,
+	focus,
+} = useExpressionEditor({
+	editorRef: root,
+	editorValue,
+	extensions,
+	isReadOnly: props.isReadOnly,
+	autocompleteTelemetry: { enabled: true, parameterPath: props.path },
+	additionalData: props.additionalData,
+});
+
+defineExpose({
+	focus: () => {
+		if (!hasFocus.value) {
+			setCursorPosition('lastExpression');
+			focus();
+		}
 	},
-	mounted() {
-		const extensions = [
-			inputTheme({ isSingleLine: this.isSingleLine }),
-			Prec.highest(
-				keymap.of([
-					{ key: 'Tab', run: acceptCompletion },
-					{
-						any(view: EditorView, event: KeyboardEvent) {
-							if (event.key === 'Escape' && completionStatus(view.state) !== null) {
-								event.stopPropagation();
-							}
-
-							return false;
-						},
-					},
-					{ key: 'Mod-Shift-z', run: redo },
-				]),
-			),
-			autocompletion(),
-			n8nLang(),
-			history(),
-			expressionInputHandler(),
-			EditorView.lineWrapping,
-			EditorView.editable.of(!this.isReadOnly),
-			EditorView.contentAttributes.of({ 'data-gramm': 'false' }), // disable grammarly
-			EditorView.domEventHandlers({
-				focus: () => {
-					this.$emit('focus');
-				},
-			}),
-			EditorView.updateListener.of((viewUpdate) => {
-				if (!this.editor || !viewUpdate.docChanged) return;
-
-				highlighter.removeColor(this.editor, this.plaintextSegments);
-				highlighter.addColor(this.editor, this.resolvableSegments);
-
-				setTimeout(() => {
-					try {
-						this.trackCompletion(viewUpdate, this.path);
-					} catch {}
-				});
-
-				this.$emit('change', {
-					value: this.unresolvedExpression,
-					segments: this.displayableSegments,
-				});
-			}),
-		];
-
-		this.editor = new EditorView({
-			parent: this.$refs.root as HTMLDivElement,
-			state: EditorState.create({
-				doc: this.value.startsWith('=') ? this.value.slice(1) : this.value,
-				extensions,
-			}),
-		});
+});
+
+async function onDrop() {
+	await nextTick();
+
+	const editor = toValue(editorRef);
+	if (!editor) return;
 
-		highlighter.addColor(this.editor, this.resolvableSegments);
+	focus();
 
-		this.$emit('change', {
-			value: this.unresolvedExpression,
-			segments: this.displayableSegments,
+	setCursorPosition('lastExpression');
+
+	if (!ndvStore.isAutocompleteOnboarded) {
+		setTimeout(() => {
+			startCompletion(editor);
 		});
+	}
+}
+
+watch(
+	() => props.modelValue,
+	(newValue) => {
+		editorValue.value = removeExpressionPrefix(newValue);
 	},
-	destroyed() {
-		this.editor?.destroy();
-	},
-	methods: {
-		focus() {
-			this.editor?.focus();
-		},
-	},
+);
+
+watch(segments.display, (newSegments) => {
+	emit('update:model-value', {
+		value: '=' + readEditorValue(),
+		segments: newSegments,
+	});
+});
+
+watch(selection, (newSelection: SelectionRange) => {
+	if (editorRef.value) {
+		emit('update:selection', {
+			state: editorRef.value.state,
+			selection: newSelection,
+		});
+	}
+});
+
+watch(hasFocus, (focused) => {
+	if (focused) emit('focus');
+});
+
+onMounted(() => {
+	props.eventBus.on('drop', onDrop);
+});
+
+onBeforeUnmount(() => {
+	props.eventBus.off('drop', onDrop);
 });
 </script>
 
-<style lang="scss"></style>
+<template>
+	<div ref="root" :class="$style.editor" 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) {
+	padding-left: var(--spacing-2xs);
+}
+</style>
diff --git a/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorOutput.vue b/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorOutput.vue
index b64a70a2df3ab..3c160848d1f64 100644
--- a/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorOutput.vue
+++ b/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorOutput.vue
@@ -1,90 +1,102 @@
+<script setup lang="ts">
+import type { EditorState, SelectionRange } from '@codemirror/state';
+
+import { useI18n } from '@/composables/useI18n';
+import type { Segment } from '@/types/expressions';
+import ExpressionOutput from './ExpressionOutput.vue';
+import InlineExpressionTip from './InlineExpressionTip.vue';
+import { outputTheme } from './theme';
+
+interface InlineExpressionEditorOutputProps {
+	segments: Segment[];
+	hoveringItemNumber: number;
+	unresolvedExpression?: string;
+	editorState?: EditorState;
+	selection?: SelectionRange;
+	visible?: boolean;
+	noInputData?: boolean;
+}
+
+withDefaults(defineProps<InlineExpressionEditorOutputProps>(), {
+	visible: false,
+	noInputData: false,
+	editorState: undefined,
+	selection: undefined,
+	unresolvedExpression: undefined,
+});
+
+const i18n = useI18n();
+const theme = outputTheme();
+</script>
+
 <template>
-	<div ref="root" class="ph-no-capture" data-test-id="inline-expression-editor-output"></div>
+	<div :class="visible ? $style.dropdown : $style.hidden">
+		<n8n-text v-if="!noInputData" size="small" compact :class="$style.header">
+			{{ i18n.baseText('parameterInput.resultForItem') }} {{ hoveringItemNumber }}
+		</n8n-text>
+		<n8n-text :class="$style.body">
+			<ExpressionOutput
+				data-test-id="inline-expression-editor-output"
+				:segments="segments"
+				:extensions="theme"
+			></ExpressionOutput>
+		</n8n-text>
+		<div :class="$style.footer">
+			<InlineExpressionTip
+				:editor-state="editorState"
+				:selection="selection"
+				:unresolved-expression="unresolvedExpression"
+			/>
+		</div>
+	</div>
 </template>
 
-<script lang="ts">
-import { EditorView } from '@codemirror/view';
-import { EditorState } from '@codemirror/state';
-
-import { defineComponent } from 'vue';
-import type { PropType } from 'vue';
+<style lang="scss" module>
+.hidden {
+	display: none;
+}
 
-import { highlighter } from '@/plugins/codemirror/resolvableHighlighter';
-import { outputTheme } from './theme';
+.dropdown {
+	display: flex;
+	flex-direction: column;
+	position: absolute;
+	z-index: 2; // cover tooltips
+	background: var(--color-code-background);
+	border: var(--border-base);
+	border-top: none;
+	width: 100%;
+	box-shadow: 0 2px 6px 0 rgba(#441c17, 0.1);
+	border-bottom-left-radius: 4px;
+	border-bottom-right-radius: 4px;
 
-import type { Plaintext, Resolved, Segment } from '@/types/expressions';
+	:global(.cm-editor) {
+		background-color: var(--color-code-background);
+	}
 
-export default defineComponent({
-	name: 'InlineExpressionEditorOutput',
-	props: {
-		segments: {
-			type: Array as PropType<Segment[]>,
-		},
-	},
-	watch: {
-		segments() {
-			if (!this.editor) return;
+	.header,
+	.body {
+		padding: var(--spacing-3xs);
+	}
 
-			this.editor.dispatch({
-				changes: { from: 0, to: this.editor.state.doc.length, insert: this.resolvedExpression },
-			});
+	.footer {
+		border-top: var(--border-base);
+	}
 
-			highlighter.addColor(this.editor, this.resolvedSegments);
-			highlighter.removeColor(this.editor, this.plaintextSegments);
-		},
-	},
-	data() {
-		return {
-			editor: null as EditorView | null,
-		};
-	},
-	mounted() {
-		this.editor = new EditorView({
-			parent: this.$refs.root as HTMLDivElement,
-			state: EditorState.create({
-				doc: this.resolvedExpression,
-				extensions: [outputTheme(), EditorState.readOnly.of(true), EditorView.lineWrapping],
-			}),
-		});
-	},
-	destroyed() {
-		this.editor?.destroy();
-	},
-	computed: {
-		resolvedExpression(): string {
-			return this.segments.reduce((acc, segment) => {
-				acc += segment.kind === 'resolvable' ? segment.resolved : segment.plaintext;
-				return acc;
-			}, '');
-		},
-		plaintextSegments(): Plaintext[] {
-			return this.segments.filter((s): s is Plaintext => s.kind === 'plaintext');
-		},
-		resolvedSegments(): Resolved[] {
-			let cursor = 0;
+	.header {
+		color: var(--color-text-dark);
+		font-weight: var(--font-weight-bold);
+		padding-left: var(--spacing-2xs);
+		padding-top: var(--spacing-2xs);
+	}
 
-			return this.segments
-				.map((segment) => {
-					segment.from = cursor;
-					cursor +=
-						segment.kind === 'plaintext'
-							? segment.plaintext.length
-							: // eslint-disable-next-line @typescript-eslint/no-explicit-any
-							segment.resolved
-							? (segment.resolved as any).toString().length
-							: 0;
-					segment.to = cursor;
-					return segment;
-				})
-				.filter((segment): segment is Resolved => segment.kind === 'resolvable');
-		},
-	},
-	methods: {
-		getValue() {
-			return '=' + this.resolvedExpression;
-		},
-	},
-});
-</script>
+	.body {
+		padding-top: 0;
+		padding-left: var(--spacing-2xs);
+		color: var(--color-text-dark);
 
-<style lang="scss"></style>
+		&:first-child {
+			padding-top: var(--spacing-2xs);
+		}
+	}
+}
+</style>
diff --git a/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionTip.vue b/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionTip.vue
new file mode 100644
index 0000000000000..a8cbfb18f3f8d
--- /dev/null
+++ b/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionTip.vue
@@ -0,0 +1,185 @@
+<script setup lang="ts">
+import { useI18n } from '@/composables/useI18n';
+import { useNDVStore } from '@/stores/ndv.store';
+import { computed, ref, watch } from 'vue';
+import { EditorSelection, EditorState, type SelectionRange } from '@codemirror/state';
+import { type Completion, CompletionContext } from '@codemirror/autocomplete';
+import { datatypeCompletions } from '@/plugins/codemirror/completions/datatype.completions';
+import { watchDebounced } from '@vueuse/core';
+import { FIELDS_SECTION } from '@/plugins/codemirror/completions/constants';
+import { isCompletionSection } from '@/plugins/codemirror/completions/utils';
+
+type TipId = 'executePrevious' | 'drag' | 'default' | 'dotObject' | 'dotPrimitive';
+
+type Props = {
+	editorState?: EditorState;
+	unresolvedExpression?: string;
+	selection?: SelectionRange;
+};
+
+const props = withDefaults(defineProps<Props>(), {
+	editorState: undefined,
+	unresolvedExpression: '',
+	selection: () => EditorSelection.cursor(0),
+});
+
+const i18n = useI18n();
+const ndvStore = useNDVStore();
+
+const canAddDotToExpression = ref(false);
+const resolvedExpressionHasFields = ref(false);
+
+const canDragToFocusedInput = computed(
+	() => !ndvStore.isNDVDataEmpty('input') && ndvStore.focusedMappableInput,
+);
+
+const emptyExpression = computed(() => props.unresolvedExpression.trim().length === 0);
+
+const tip = computed<TipId>(() => {
+	if (!ndvStore.hasInputData && ndvStore.isInputParentOfActiveNode) {
+		return 'executePrevious';
+	}
+
+	if (canAddDotToExpression.value) {
+		return resolvedExpressionHasFields.value ? 'dotObject' : 'dotPrimitive';
+	}
+
+	if (canDragToFocusedInput.value && emptyExpression.value) return 'drag';
+
+	return 'default';
+});
+
+function getCompletionsWithDot(): readonly Completion[] {
+	if (!props.editorState || !props.selection || !props.unresolvedExpression) {
+		return [];
+	}
+
+	const cursorAfterDot = props.selection.from + 1;
+	const docWithDot =
+		props.editorState.sliceDoc(0, props.selection.from) +
+		'.' +
+		props.editorState.sliceDoc(props.selection.to);
+	const selectionWithDot = EditorSelection.create([EditorSelection.cursor(cursorAfterDot)]);
+
+	if (cursorAfterDot >= docWithDot.length) {
+		return [];
+	}
+
+	const stateWithDot = EditorState.create({
+		doc: docWithDot,
+		selection: selectionWithDot,
+	});
+
+	const context = new CompletionContext(stateWithDot, cursorAfterDot, true);
+	const completionResult = datatypeCompletions(context);
+	return completionResult?.options ?? [];
+}
+
+watch(tip, (newTip) => {
+	ndvStore.setHighlightDraggables(!ndvStore.isMappingOnboarded && newTip === 'drag');
+});
+
+watchDebounced(
+	[() => props.selection, () => props.unresolvedExpression],
+	() => {
+		const completions = getCompletionsWithDot();
+		canAddDotToExpression.value = completions.length > 0;
+		resolvedExpressionHasFields.value = completions.some(
+			({ section }) => isCompletionSection(section) && section.name === FIELDS_SECTION.name,
+		);
+	},
+	{ debounce: 200 },
+);
+</script>
+
+<template>
+	<div :class="[$style.tip, { [$style.drag]: tip === 'drag' }]">
+		<n8n-text size="small" :class="$style.tipText"
+			>{{ i18n.baseText('parameterInput.tip') }}:
+		</n8n-text>
+
+		<div v-if="tip === 'drag'" :class="$style.content">
+			<n8n-text size="small" :class="$style.text">
+				{{ i18n.baseText('parameterInput.dragTipBeforePill') }}
+			</n8n-text>
+			<div :class="[$style.pill, { [$style.highlight]: !ndvStore.isMappingOnboarded }]">
+				{{ i18n.baseText('parameterInput.inputField') }}
+			</div>
+			<n8n-text size="small" :class="$style.text">
+				{{ i18n.baseText('parameterInput.dragTipAfterPill') }}
+			</n8n-text>
+		</div>
+
+		<div v-else-if="tip === 'executePrevious'" :class="$style.content">
+			<span> {{ i18n.baseText('expressionTip.noExecutionData') }} </span>
+		</div>
+
+		<div v-else-if="tip === 'dotPrimitive'" :class="$style.content">
+			<span v-html="i18n.baseText('expressionTip.typeDotPrimitive')" />
+		</div>
+
+		<div v-else-if="tip === 'dotObject'" :class="$style.content">
+			<span v-html="i18n.baseText('expressionTip.typeDotObject')" />
+		</div>
+
+		<div v-else :class="$style.content">
+			<span v-html="i18n.baseText('expressionTip.javascript')" />
+		</div>
+	</div>
+</template>
+
+<style lang="scss" module>
+.tip {
+	display: flex;
+	align-items: flex-start;
+	gap: var(--spacing-4xs);
+	line-height: var(--font-line-height-regular);
+	color: var(--color-text-base);
+	font-size: var(--font-size-2xs);
+	padding: var(--spacing-2xs);
+}
+
+.content {
+	display: inline-block;
+}
+
+.tipText {
+	display: inline;
+	color: var(--color-text-dark);
+	font-weight: var(--font-weight-bold);
+}
+
+.drag .tipText {
+	line-height: 21px;
+}
+
+.text {
+	display: inline;
+}
+
+code {
+	font-size: var(--font-size-3xs);
+	background: var(--color-background-base);
+	padding: var(--spacing-5xs);
+	border-radius: var(--border-radius-base);
+}
+
+.pill {
+	display: inline-flex;
+	align-items: center;
+	color: var(--color-text-dark);
+
+	border: var(--border-base);
+	border-color: var(--color-foreground-light);
+	background-color: var(--color-background-xlight);
+	padding: var(--spacing-5xs) var(--spacing-3xs);
+	margin: 0 var(--spacing-4xs);
+	border-radius: var(--border-radius-base);
+}
+
+.highlight {
+	color: var(--color-primary);
+	background-color: var(--color-primary-tint-3);
+	border-color: var(--color-primary-tint-1);
+}
+</style>
diff --git a/packages/editor-ui/src/components/InlineExpressionEditor/__tests__/InlineExpressionEditorOutput.test.ts b/packages/editor-ui/src/components/InlineExpressionEditor/__tests__/InlineExpressionEditorOutput.test.ts
new file mode 100644
index 0000000000000..b88a453d20bdd
--- /dev/null
+++ b/packages/editor-ui/src/components/InlineExpressionEditor/__tests__/InlineExpressionEditorOutput.test.ts
@@ -0,0 +1,100 @@
+import { renderComponent } from '@/__tests__/render';
+import { createTestingPinia } from '@pinia/testing';
+import InlineExpressionEditorOutput from '../InlineExpressionEditorOutput.vue';
+
+describe('InlineExpressionEditorOutput.vue', () => {
+	test('should render duplicate segments correctly', async () => {
+		const { getByTestId } = renderComponent(InlineExpressionEditorOutput, {
+			pinia: createTestingPinia(),
+			props: {
+				hoveringItemNumber: 0,
+				segments: [
+					{
+						from: 0,
+						to: 5,
+						plaintext: '[1,2]',
+						kind: 'plaintext',
+					},
+					{
+						from: 0,
+						to: 1,
+						plaintext: '[',
+						kind: 'plaintext',
+					},
+					{
+						from: 1,
+						to: 2,
+						plaintext: '1',
+						kind: 'plaintext',
+					},
+					{
+						from: 2,
+						to: 3,
+						plaintext: ',',
+						kind: 'plaintext',
+					},
+					{
+						from: 3,
+						to: 4,
+						plaintext: '2',
+						kind: 'plaintext',
+					},
+					{
+						from: 4,
+						to: 5,
+						plaintext: ']',
+						kind: 'plaintext',
+					},
+				],
+			},
+		});
+		expect(getByTestId('inline-expression-editor-output')).toHaveTextContent('[1,2]');
+	});
+
+	test('should render segments with resolved expressions', () => {
+		const { getByTestId } = renderComponent(InlineExpressionEditorOutput, {
+			pinia: createTestingPinia(),
+			props: {
+				hoveringItemNumber: 0,
+				segments: [
+					{
+						kind: 'plaintext',
+						from: 0,
+						to: 6,
+						plaintext: 'before>',
+					},
+					{
+						kind: 'plaintext',
+						from: 6,
+						to: 7,
+						plaintext: ' ',
+					},
+					{
+						kind: 'resolvable',
+						from: 7,
+						to: 17,
+						resolvable: '{{ $now }}',
+						resolved: '[Object: "2024-04-18T09:03:26.651-04:00"]',
+						state: 'valid',
+						error: null,
+					},
+					{
+						kind: 'plaintext',
+						from: 17,
+						to: 18,
+						plaintext: ' ',
+					},
+					{
+						kind: 'plaintext',
+						from: 18,
+						to: 24,
+						plaintext: '<after',
+					},
+				],
+			},
+		});
+		expect(getByTestId('inline-expression-editor-output')).toHaveTextContent(
+			'before> [Object: "2024-04-18T09:03:26.651-04:00"] <after',
+		);
+	});
+});
diff --git a/packages/editor-ui/src/components/InlineExpressionEditor/__tests__/InlineExpressionTip.test.ts b/packages/editor-ui/src/components/InlineExpressionEditor/__tests__/InlineExpressionTip.test.ts
new file mode 100644
index 0000000000000..f3cdc81318540
--- /dev/null
+++ b/packages/editor-ui/src/components/InlineExpressionEditor/__tests__/InlineExpressionTip.test.ts
@@ -0,0 +1,128 @@
+import { renderComponent } from '@/__tests__/render';
+import InlineExpressionTip from '@/components/InlineExpressionEditor/InlineExpressionTip.vue';
+import { FIELDS_SECTION } from '@/plugins/codemirror/completions/constants';
+import type { useNDVStore } from '@/stores/ndv.store';
+import type { CompletionResult } from '@codemirror/autocomplete';
+import { EditorSelection, EditorState } from '@codemirror/state';
+import { createTestingPinia } from '@pinia/testing';
+import { waitFor } from '@testing-library/vue';
+
+let mockNdvState: Partial<ReturnType<typeof useNDVStore>>;
+let mockCompletionResult: Partial<CompletionResult>;
+
+vi.mock('@/stores/ndv.store', () => {
+	return {
+		useNDVStore: vi.fn(() => mockNdvState),
+	};
+});
+
+vi.mock('@/plugins/codemirror/completions/datatype.completions', () => {
+	return {
+		datatypeCompletions: vi.fn(() => mockCompletionResult),
+	};
+});
+
+describe('InlineExpressionTip.vue', () => {
+	beforeEach(() => {
+		mockNdvState = {
+			hasInputData: true,
+			isNDVDataEmpty: vi.fn(() => true),
+		};
+	});
+
+	test('should show the default tip', async () => {
+		const { container } = renderComponent(InlineExpressionTip, {
+			pinia: createTestingPinia(),
+		});
+		expect(container).toHaveTextContent('Tip: Anything inside {{ }} is JavaScript. Learn more');
+	});
+
+	describe('When the NDV input is not empty and a mappable input is focused', () => {
+		test('should show the drag-n-drop tip', async () => {
+			mockNdvState = {
+				hasInputData: true,
+				isNDVDataEmpty: vi.fn(() => false),
+				focusedMappableInput: 'Some Input',
+			};
+			const { container } = renderComponent(InlineExpressionTip, {
+				pinia: createTestingPinia(),
+			});
+			expect(container).toHaveTextContent('Tip: Drag aninput fieldfrom the left to use it here.');
+		});
+	});
+
+	describe('When the node has no input data', () => {
+		test('should show the execute previous nodes tip', async () => {
+			mockNdvState = {
+				hasInputData: false,
+				isInputParentOfActiveNode: true,
+				isNDVDataEmpty: vi.fn(() => false),
+				focusedMappableInput: 'Some Input',
+			};
+			const { container } = renderComponent(InlineExpressionTip, {
+				pinia: createTestingPinia(),
+			});
+			expect(container).toHaveTextContent('Tip: Execute previous nodes to use input data');
+		});
+	});
+
+	describe('When the expression can be autocompleted with a dot', () => {
+		test('should show the correct tip for objects', async () => {
+			mockNdvState = {
+				hasInputData: true,
+				isNDVDataEmpty: vi.fn(() => false),
+				focusedMappableInput: 'Some Input',
+				setHighlightDraggables: vi.fn(),
+			};
+			mockCompletionResult = { options: [{ label: 'foo', section: FIELDS_SECTION }] };
+			const selection = EditorSelection.cursor(8);
+			const expression = '{{ $json }}';
+			const { rerender, container } = renderComponent(InlineExpressionTip, {
+				pinia: createTestingPinia(),
+			});
+
+			await rerender({
+				editorState: EditorState.create({
+					doc: expression,
+					selection: EditorSelection.create([selection]),
+				}),
+				selection,
+				unresolvedExpression: expression,
+			});
+			await waitFor(() =>
+				expect(container).toHaveTextContent(
+					'Tip: Type . for data transformation options, or to access fields. Learn more',
+				),
+			);
+		});
+
+		test('should show the correct tip for primitives', async () => {
+			mockNdvState = {
+				hasInputData: true,
+				isNDVDataEmpty: vi.fn(() => false),
+				focusedMappableInput: 'Some Input',
+				setHighlightDraggables: vi.fn(),
+			};
+			mockCompletionResult = { options: [{ label: 'foo' }] };
+			const selection = EditorSelection.cursor(12);
+			const expression = '{{ $json.foo }}';
+			const { rerender, container } = renderComponent(InlineExpressionTip, {
+				pinia: createTestingPinia(),
+			});
+
+			await rerender({
+				editorState: EditorState.create({
+					doc: expression,
+					selection: EditorSelection.create([selection]),
+				}),
+				selection,
+				unresolvedExpression: expression,
+			});
+			await waitFor(() =>
+				expect(container).toHaveTextContent(
+					'Tip: Type . for data transformation options. Learn more',
+				),
+			);
+		});
+	});
+});
diff --git a/packages/editor-ui/src/components/InlineExpressionEditor/theme.ts b/packages/editor-ui/src/components/InlineExpressionEditor/theme.ts
index 0e11f5e8c92a1..4c1225063b868 100644
--- a/packages/editor-ui/src/components/InlineExpressionEditor/theme.ts
+++ b/packages/editor-ui/src/components/InlineExpressionEditor/theme.ts
@@ -8,17 +8,19 @@ const commonThemeProps = {
 	'.cm-content': {
 		fontFamily: 'var(--font-family-monospace)',
 		color: 'var(--input-font-color, var(--color-text-dark))',
+		caretColor: 'var(--color-code-caret)',
 	},
 	'.cm-line': {
 		padding: '0',
 	},
 };
 
-export const inputTheme = ({ isSingleLine } = { isSingleLine: false }) => {
+export const inputTheme = ({ rows } = { rows: 5 }) => {
+	const maxHeight = Math.max(rows * 22 + 8);
 	const theme = EditorView.theme({
 		...commonThemeProps,
 		'&': {
-			maxHeight: isSingleLine ? '30px' : '112px',
+			maxHeight: `${maxHeight}px`,
 			minHeight: '30px',
 			width: '100%',
 			fontSize: 'var(--font-size-2xs)',
@@ -26,14 +28,25 @@ export const inputTheme = ({ isSingleLine } = { isSingleLine: false }) => {
 			borderWidth: 'var(--border-width-base)',
 			borderStyle: 'var(--input-border-style, var(--border-style-base))',
 			borderColor: 'var(--input-border-color, var(--border-color-base))',
+			borderRightColor:
+				'var(--input-border-right-color,var(--input-border-color, var(--border-color-base)))',
+			borderBottomColor:
+				'var(--input-border-bottom-color,var(--input-border-color, var(--border-color-base)))',
 			borderRadius: 'var(--input-border-radius, var(--border-radius-base))',
-			borderTopLeftRadius: '0',
-			borderBottomLeftRadius: '0',
+			borderTopLeftRadius: 0,
+			borderTopRightRadius:
+				'var(--input-border-top-right-radius, var(--input-border-radius, var(--border-radius-base)))',
+			borderBottomLeftRadius: 0,
+			borderBottomRightRadius:
+				'var(--input-border-bottom-right-radius, var(--input-border-radius, var(--border-radius-base)))',
 			backgroundColor: 'white',
 		},
 		'.cm-scroller': {
 			lineHeight: '1.68',
 		},
+		'.cm-lineWrapping': {
+			wordBreak: 'break-all',
+		},
 	});
 
 	return [theme, highlighter.resolvableStyle];
diff --git a/packages/editor-ui/src/components/InlineNameEdit.vue b/packages/editor-ui/src/components/InlineNameEdit.vue
index 269c7d865659a..3a9aaa376fe40 100644
--- a/packages/editor-ui/src/components/InlineNameEdit.vue
+++ b/packages/editor-ui/src/components/InlineNameEdit.vue
@@ -1,44 +1,44 @@
 <template>
-	<div class="ph-no-capture" :class="$style.container">
+	<div :class="$style.container">
 		<span v-if="readonly" :class="$style.headline">
-			{{ name }}
+			{{ modelValue }}
 		</span>
 		<div
 			v-else
+			v-on-click-outside="disableNameEdit"
 			:class="[$style.headline, $style['headline-editable']]"
 			@keydown.stop
 			@click="enableNameEdit"
-			v-click-outside="disableNameEdit"
 		>
 			<div v-if="!isNameEdit">
-				<span>{{ name }}</span>
+				<span>{{ modelValue }}</span>
 				<i><font-awesome-icon icon="pen" /></i>
 			</div>
 			<div v-else :class="$style.nameInput">
 				<n8n-input
-					:value="name"
-					size="xlarge"
 					ref="nameInput"
-					@input="onNameEdit"
-					@change="disableNameEdit"
+					:model-value="modelValue"
+					size="xlarge"
 					:maxlength="64"
+					@update:model-value="onNameEdit"
+					@change="disableNameEdit"
 				/>
 			</div>
 		</div>
-		<div :class="$style.subtitle" v-if="!isNameEdit && subtitle">
+		<div v-if="!isNameEdit && subtitle" :class="$style.subtitle">
 			{{ subtitle }}
 		</div>
 	</div>
 </template>
 
 <script lang="ts">
-import mixins from 'vue-typed-mixins';
-import { showMessage } from '@/mixins/showMessage';
+import { defineComponent } from 'vue';
+import { useToast } from '@/composables/useToast';
 
-export default mixins(showMessage).extend({
+export default defineComponent({
 	name: 'InlineNameEdit',
 	props: {
-		name: {
+		modelValue: {
 			type: String,
 		},
 		subtitle: {
@@ -52,6 +52,11 @@ export default mixins(showMessage).extend({
 			default: false,
 		},
 	},
+	setup() {
+		return {
+			...useToast(),
+		};
+	},
 	data() {
 		return {
 			isNameEdit: false,
@@ -59,7 +64,7 @@ export default mixins(showMessage).extend({
 	},
 	methods: {
 		onNameEdit(value: string) {
-			this.$emit('input', value);
+			this.$emit('update:modelValue', value);
 		},
 		enableNameEdit() {
 			this.isNameEdit = true;
@@ -72,10 +77,10 @@ export default mixins(showMessage).extend({
 			}, 0);
 		},
 		disableNameEdit() {
-			if (!this.name) {
-				this.$emit('input', `Untitled ${this.type}`);
+			if (!this.modelValue) {
+				this.$emit('update:modelValue', `Untitled ${this.type}`);
 
-				this.$showToast({
+				this.showToast({
 					title: 'Error',
 					message: `${this.type} name cannot be empty`,
 					type: 'warning',
diff --git a/packages/editor-ui/src/components/InlineTextEdit.vue b/packages/editor-ui/src/components/InlineTextEdit.vue
index ec2bd9f975e6f..9d3caf8c49b35 100644
--- a/packages/editor-ui/src/components/InlineTextEdit.vue
+++ b/packages/editor-ui/src/components/InlineTextEdit.vue
@@ -1,21 +1,21 @@
 <template>
-	<span @keydown.stop class="inline-edit">
-		<span v-if="isEditEnabled">
+	<span class="inline-edit" @keydown.stop>
+		<span v-if="isEditEnabled && !isDisabled">
 			<ExpandableInputEdit
 				:placeholder="placeholder"
-				:value="newValue"
+				:model-value="newValue"
 				:maxlength="maxLength"
 				:autofocus="true"
-				:eventBus="inputBus"
-				@input="onInput"
+				:event-bus="inputBus"
+				@update:model-value="onInput"
 				@esc="onEscape"
 				@blur="onBlur"
 				@enter="submit"
 			/>
 		</span>
 
-		<span @click="onClick" class="preview" v-else>
-			<ExpandableInputPreview :value="previewValue || value" />
+		<span v-else class="preview" @click="onClick">
+			<ExpandableInputPreview :model-value="previewValue || modelValue" />
 		</span>
 	</span>
 </template>
@@ -24,20 +24,50 @@
 import { defineComponent } from 'vue';
 import ExpandableInputEdit from '@/components/ExpandableInput/ExpandableInputEdit.vue';
 import ExpandableInputPreview from '@/components/ExpandableInput/ExpandableInputPreview.vue';
-import { createEventBus } from '@/event-bus';
+import { createEventBus } from 'n8n-design-system/utils';
 
 export default defineComponent({
 	name: 'InlineTextEdit',
 	components: { ExpandableInputEdit, ExpandableInputPreview },
-	props: ['isEditEnabled', 'value', 'placeholder', 'maxLength', 'previewValue'],
+	props: {
+		isEditEnabled: {
+			type: Boolean,
+			default: false,
+		},
+		modelValue: {
+			type: String,
+			default: '',
+		},
+		placeholder: {
+			type: String,
+			default: '',
+		},
+		maxLength: {
+			type: Number,
+			default: 0,
+		},
+		previewValue: {
+			type: String,
+			default: '',
+		},
+		disabled: {
+			type: Boolean,
+			default: false,
+		},
+	},
 	data() {
 		return {
+			isDisabled: this.disabled,
 			newValue: '',
 			escPressed: false,
-			disabled: false,
 			inputBus: createEventBus(),
 		};
 	},
+	watch: {
+		disabled(value) {
+			this.isDisabled = value;
+		},
+	},
 	methods: {
 		onInput(newValue: string) {
 			if (this.disabled) {
@@ -51,7 +81,7 @@ export default defineComponent({
 				return;
 			}
 
-			this.$data.newValue = this.value;
+			this.newValue = this.modelValue;
 			this.$emit('toggle');
 		},
 		onBlur() {
@@ -59,10 +89,10 @@ export default defineComponent({
 				return;
 			}
 
-			if (!this.$data.escPressed) {
+			if (!this.escPressed) {
 				this.submit();
 			}
-			this.$data.escPressed = false;
+			this.escPressed = false;
 		},
 		submit() {
 			if (this.disabled) {
@@ -70,22 +100,22 @@ export default defineComponent({
 			}
 
 			const onSubmit = (updated: boolean) => {
-				this.$data.disabled = false;
+				this.isDisabled = false;
 
 				if (!updated) {
-					this.$data.inputBus.emit('focus');
+					this.inputBus.emit('focus');
 				}
 			};
 
-			this.$data.disabled = true;
-			this.$emit('submit', this.newValue, onSubmit);
+			this.isDisabled = true;
+			this.$emit('submit', { name: this.newValue, onSubmit });
 		},
 		onEscape() {
 			if (this.disabled) {
 				return;
 			}
 
-			this.$data.escPressed = true;
+			this.escPressed = true;
 			this.$emit('toggle');
 		},
 	},
diff --git a/packages/editor-ui/src/components/InputPanel.vue b/packages/editor-ui/src/components/InputPanel.vue
index 67622724a4686..ae1a6c2206ce4 100644
--- a/packages/editor-ui/src/components/InputPanel.vue
+++ b/packages/editor-ui/src/components/InputPanel.vue
@@ -1,51 +1,54 @@
 <template>
 	<RunData
-		:nodeUi="currentNode"
-		:runIndex="runIndex"
-		:linkedRuns="linkedRuns"
-		:canLinkRuns="canLinkRuns"
-		:tooMuchDataTitle="$locale.baseText('ndv.input.tooMuchData.title')"
-		:noDataInBranchMessage="$locale.baseText('ndv.input.noOutputDataInBranch')"
-		:isExecuting="isExecutingPrevious"
-		:executingMessage="$locale.baseText('ndv.input.executingPrevious')"
-		:sessionId="sessionId"
-		:overrideOutputs="connectedCurrentNodeOutputs"
-		:mappingEnabled="!readOnly"
-		:distanceFromActive="currentNodeDepth"
-		:isProductionExecutionPreview="isProductionExecutionPreview"
-		paneType="input"
-		@itemHover="$emit('itemHover', $event)"
-		@linkRun="onLinkRun"
-		@unlinkRun="onUnlinkRun"
-		@runChange="onRunIndexChange"
-		@tableMounted="$emit('tableMounted', $event)"
+		:node="currentNode"
+		:run-index="runIndex"
+		:linked-runs="linkedRuns"
+		:can-link-runs="!mappedNode && canLinkRuns"
+		:too-much-data-title="$locale.baseText('ndv.input.tooMuchData.title')"
+		:no-data-in-branch-message="$locale.baseText('ndv.input.noOutputDataInBranch')"
+		:is-executing="isExecutingPrevious"
+		:executing-message="$locale.baseText('ndv.input.executingPrevious')"
+		:push-ref="pushRef"
+		:override-outputs="connectedCurrentNodeOutputs"
+		:mapping-enabled="isMappingEnabled"
+		:distance-from-active="currentNodeDepth"
+		:is-production-execution-preview="isProductionExecutionPreview"
+		:is-pane-active="isPaneActive"
+		pane-type="input"
 		data-test-id="ndv-input-panel"
+		@activate-pane="activatePane"
+		@item-hover="$emit('itemHover', $event)"
+		@link-run="onLinkRun"
+		@unlink-run="onUnlinkRun"
+		@run-change="onRunIndexChange"
+		@table-mounted="$emit('tableMounted', $event)"
+		@search="$emit('search', $event)"
 	>
 		<template #header>
 			<div :class="$style.titleSection">
 				<n8n-select
 					v-if="parentNodes.length"
-					:popper-append-to-body="true"
+					teleported
 					size="small"
-					:value="currentNodeName"
-					@input="onSelect"
+					:model-value="currentNodeName"
 					:no-data-text="$locale.baseText('ndv.input.noNodesFound')"
 					:placeholder="$locale.baseText('ndv.input.parentNodes')"
 					filterable
 					data-test-id="ndv-input-select"
+					@update:model-value="onInputNodeChange"
 				>
 					<template #prepend>
 						<span :class="$style.title">{{ $locale.baseText('ndv.input') }}</span>
 					</template>
 					<n8n-option
 						v-for="node of parentNodes"
-						:value="node.name"
 						:key="node.name"
+						:value="node.name"
 						class="node-option"
 						:label="`${truncate(node.name)} ${getMultipleNodesText(node.name)}`"
 						data-test-id="ndv-input-option"
 					>
-						<span class="ph-no-capture">{{ truncate(node.name) }}&nbsp;</span>
+						<span>{{ truncate(node.name) }}&nbsp;</span>
 						<span v-if="getMultipleNodesText(node.name)">{{
 							getMultipleNodesText(node.name)
 						}}</span>
@@ -55,19 +58,47 @@
 					</n8n-option>
 				</n8n-select>
 				<span v-else :class="$style.title">{{ $locale.baseText('ndv.input') }}</span>
+				<n8n-radio-buttons
+					v-if="isActiveNodeConfig && !readOnly"
+					:options="inputModes"
+					:model-value="inputMode"
+					@update:model-value="onInputModeChange"
+				/>
+			</div>
+		</template>
+		<template v-if="isMappingMode" #before-data>
+			<!--
+						Hide the run linking buttons for both input and ouput panels when in 'Mapping Mode' because the run indices wouldn't match.
+						Although this is not the most elegant solution, it's straightforward and simpler than introducing a new props and logic to handle this.
+				-->
+			<component :is="'style'">button.linkRun { display: none }</component>
+			<div :class="$style.mappedNode">
+				<n8n-select
+					:model-value="mappedNode"
+					size="small"
+					teleported
+					@update:model-value="onMappedNodeSelected"
+					@click.stop
+				>
+					<template #prepend>{{ $locale.baseText('ndv.input.previousNode') }}</template>
+					<n8n-option
+						v-for="nodeName in rootNodesParents"
+						:key="nodeName"
+						:label="nodeName"
+						:value="nodeName"
+					/>
+				</n8n-select>
 			</div>
 		</template>
-
 		<template #node-not-run>
-			<div :class="$style.noOutputData" v-if="parentNodes.length">
+			<div
+				v-if="(isActiveNodeConfig && rootNode) || parentNodes.length"
+				:class="$style.noOutputData"
+			>
 				<n8n-text tag="div" :bold="true" color="text-dark" size="large">{{
 					$locale.baseText('ndv.input.noOutputData.title')
 				}}</n8n-text>
-				<n8n-tooltip
-					v-if="!readOnly"
-					:manual="true"
-					:value="showDraggableHint && showDraggableHintWithDelay"
-				>
+				<n8n-tooltip v-if="!readOnly" :visible="showDraggableHint && showDraggableHintWithDelay">
 					<template #content>
 						<div
 							v-html="
@@ -79,19 +110,20 @@
 					</template>
 					<NodeExecuteButton
 						type="secondary"
+						hide-icon
 						:transparent="true"
-						:nodeName="currentNodeName"
+						:node-name="isActiveNodeConfig ? rootNode : currentNodeName"
 						:label="$locale.baseText('ndv.input.noOutputData.executePrevious')"
-						@execute="onNodeExecute"
-						telemetrySource="inputs"
+						telemetry-source="inputs"
 						data-test-id="execute-previous-node"
+						@execute="onNodeExecute"
 					/>
 				</n8n-tooltip>
 				<n8n-text v-if="!readOnly" tag="div" size="small">
 					{{ $locale.baseText('ndv.input.noOutputData.hint') }}
 				</n8n-text>
 			</div>
-			<div :class="$style.notConnected" v-else>
+			<div v-else :class="$style.notConnected">
 				<div>
 					<WireMeUp />
 				</div>
@@ -117,7 +149,7 @@
 			}}</n8n-text>
 		</template>
 
-		<template #recovered-artifical-output-data>
+		<template #recovered-artificial-output-data>
 			<div :class="$style.recoveredOutputData">
 				<n8n-text tag="div" :bold="true" color="text-dark" size="large">{{
 					$locale.baseText('executionDetails.executionFailed.recoveredNodeTitle')
@@ -131,11 +163,18 @@
 </template>
 
 <script lang="ts">
+import { defineComponent } from 'vue';
+import { mapStores } from 'pinia';
 import type { INodeUi } from '@/Interface';
-import type { IConnectedNode, INodeTypeDescription, Workflow } from 'n8n-workflow';
+import { NodeHelpers, NodeConnectionType } from 'n8n-workflow';
+import type {
+	ConnectionTypes,
+	IConnectedNode,
+	INodeOutputConfiguration,
+	INodeTypeDescription,
+	Workflow,
+} from 'n8n-workflow';
 import RunData from './RunData.vue';
-import { workflowHelpers } from '@/mixins/workflowHelpers';
-import mixins from 'vue-typed-mixins';
 import NodeExecuteButton from './NodeExecuteButton.vue';
 import WireMeUp from './WireMeUp.vue';
 import {
@@ -144,12 +183,14 @@ import {
 	MANUAL_TRIGGER_NODE_TYPE,
 	START_NODE_TYPE,
 } from '@/constants';
-import { mapStores } from 'pinia';
-import { useWorkflowsStore } from '@/stores/workflows';
-import { useNDVStore } from '@/stores/ndv';
-import { useNodeTypesStore } from '@/stores/nodeTypes';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useNDVStore } from '@/stores/ndv.store';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import { useUIStore } from '@/stores/ui.store';
+
+type MappingMode = 'debugging' | 'mapping';
 
-export default mixins(workflowHelpers).extend({
+export default defineComponent({
 	name: 'InputPanel',
 	components: { RunData, NodeExecuteButton, WireMeUp },
 	props: {
@@ -158,6 +199,7 @@ export default mixins(workflowHelpers).extend({
 		},
 		runIndex: {
 			type: Number,
+			required: true,
 		},
 		linkedRuns: {
 			type: Boolean,
@@ -166,7 +208,7 @@ export default mixins(workflowHelpers).extend({
 		canLinkRuns: {
 			type: Boolean,
 		},
-		sessionId: {
+		pushRef: {
 			type: String,
 		},
 		readOnly: {
@@ -176,21 +218,34 @@ export default mixins(workflowHelpers).extend({
 			type: Boolean,
 			default: false,
 		},
+		isPaneActive: {
+			type: Boolean,
+			default: false,
+		},
 	},
 	data() {
 		return {
 			showDraggableHintWithDelay: false,
 			draggableHintShown: false,
+			inputMode: 'debugging' as MappingMode,
+			mappedNode: null as string | null,
+			inputModes: [
+				{ value: 'mapping', label: this.$locale.baseText('ndv.input.mapping') },
+				{ value: 'debugging', label: this.$locale.baseText('ndv.input.debugging') },
+			],
 		};
 	},
 	computed: {
-		...mapStores(useNodeTypesStore, useNDVStore, useWorkflowsStore),
+		...mapStores(useNodeTypesStore, useNDVStore, useWorkflowsStore, useUIStore),
 		focusedMappableInput(): string {
 			return this.ndvStore.focusedMappableInput;
 		},
 		isUserOnboarded(): boolean {
 			return this.ndvStore.isMappingOnboarded;
 		},
+		isMappingMode(): boolean {
+			return this.isActiveNodeConfig && this.inputMode === 'mapping';
+		},
 		showDraggableHint(): boolean {
 			const toIgnore = [
 				START_NODE_TYPE,
@@ -204,23 +259,59 @@ export default mixins(workflowHelpers).extend({
 
 			return !!this.focusedMappableInput && !this.isUserOnboarded;
 		},
+		isActiveNodeConfig(): boolean {
+			let inputs = this.activeNodeType?.inputs ?? [];
+			let outputs = this.activeNodeType?.outputs ?? [];
+			if (this.activeNode !== null && this.currentWorkflow !== null) {
+				const node = this.currentWorkflow.getNode(this.activeNode.name);
+				inputs = NodeHelpers.getNodeInputs(this.currentWorkflow, node!, this.activeNodeType!);
+				outputs = NodeHelpers.getNodeOutputs(this.currentWorkflow, node!, this.activeNodeType!);
+			} else {
+				// If we can not figure out the node type we set no outputs
+				if (!Array.isArray(inputs)) {
+					inputs = [] as ConnectionTypes[];
+				}
+				if (!Array.isArray(outputs)) {
+					outputs = [] as ConnectionTypes[];
+				}
+			}
+
+			if (
+				inputs.length === 0 ||
+				(inputs.every((input) => this.filterOutConnectionType(input, NodeConnectionType.Main)) &&
+					outputs.find((output) => this.filterOutConnectionType(output, NodeConnectionType.Main)))
+			) {
+				return true;
+			}
+
+			return false;
+		},
+		isMappingEnabled(): boolean {
+			if (this.readOnly) return false;
+
+			// Mapping is only enabled in mapping mode for config nodes and if node to map is selected
+			if (this.isActiveNodeConfig) return this.isMappingMode && this.mappedNode !== null;
+
+			return true;
+		},
 		isExecutingPrevious(): boolean {
 			if (!this.workflowRunning) {
 				return false;
 			}
 			const triggeredNode = this.workflowsStore.executedNode;
 			const executingNode = this.workflowsStore.executingNode;
+
 			if (
 				this.activeNode &&
 				triggeredNode === this.activeNode.name &&
-				this.activeNode.name !== executingNode
+				!this.workflowsStore.isNodeExecuting(this.activeNode.name)
 			) {
 				return true;
 			}
 
-			if (executingNode || triggeredNode) {
+			if (executingNode.length || triggeredNode) {
 				return !!this.parentNodes.find(
-					(node) => node.name === executingNode || node.name === triggeredNode,
+					(node) => this.workflowsStore.isNodeExecuting(node.name) || node.name === triggeredNode,
 				);
 			}
 			return false;
@@ -234,7 +325,31 @@ export default mixins(workflowHelpers).extend({
 		activeNode(): INodeUi | null {
 			return this.ndvStore.activeNode;
 		},
+
+		rootNode(): string {
+			const workflow = this.currentWorkflow;
+			const rootNodes = workflow.getChildNodes(this.activeNode.name, 'ALL_NON_MAIN');
+
+			return rootNodes[0];
+		},
+		rootNodesParents(): string[] {
+			const workflow = this.currentWorkflow;
+			const parentNodes = [...workflow.getParentNodes(this.rootNode, 'main')].reverse();
+
+			return parentNodes;
+		},
 		currentNode(): INodeUi | null {
+			if (this.isActiveNodeConfig) {
+				// if we're mapping node we want to show the output of the mapped node
+				if (this.mappedNode) {
+					return this.workflowsStore.getNodeByName(this.mappedNode);
+				}
+
+				// in debugging mode data does get set manually and is only for debugging
+				// so we want to force the node to be the active node to make sure we show the correct data
+				return this.activeNode;
+			}
+
 			return this.workflowsStore.getNodeByName(this.currentNodeName);
 		},
 		connectedCurrentNodeOutputs(): number[] | undefined {
@@ -274,14 +389,63 @@ export default mixins(workflowHelpers).extend({
 			return this.activeNodeType !== null && this.activeNodeType.inputs.length > 1;
 		},
 	},
+	watch: {
+		inputMode: {
+			handler(val) {
+				this.onRunIndexChange(-1);
+				if (val === 'mapping') {
+					this.onUnlinkRun();
+					this.mappedNode = this.rootNodesParents[0];
+				} else {
+					this.mappedNode = null;
+				}
+			},
+			immediate: true,
+		},
+		showDraggableHint(curr: boolean, prev: boolean) {
+			if (curr && !prev) {
+				setTimeout(() => {
+					if (this.draggableHintShown) {
+						return;
+					}
+					this.showDraggableHintWithDelay = this.showDraggableHint;
+					if (this.showDraggableHintWithDelay) {
+						this.draggableHintShown = true;
+
+						this.$telemetry.track('User viewed data mapping tooltip', {
+							type: 'unexecuted input pane',
+						});
+					}
+				}, 1000);
+			} else if (!curr) {
+				this.showDraggableHintWithDelay = false;
+			}
+		},
+	},
 	methods: {
+		filterOutConnectionType(
+			item: ConnectionTypes | INodeOutputConfiguration,
+			type: ConnectionTypes,
+		) {
+			if (!item) return false;
+
+			return typeof item === 'string' ? item !== type : item.type !== type;
+		},
+		onInputModeChange(val: MappingMode) {
+			this.inputMode = val;
+		},
+		onMappedNodeSelected(val: string) {
+			this.mappedNode = val;
+
+			this.onRunIndexChange(0);
+			this.onUnlinkRun();
+		},
 		getMultipleNodesText(nodeName?: string): string {
 			if (
 				!nodeName ||
 				!this.isMultiInputNode ||
 				!this.activeNode ||
-				this.activeNodeType === null ||
-				this.activeNodeType.inputNames === undefined
+				this.activeNodeType?.inputNames === undefined
 			)
 				return '';
 
@@ -295,10 +459,7 @@ export default mixins(workflowHelpers).extend({
 
 			// Match connected input indexes to their names specified by active node
 			const connectedInputs = connectedInputIndexes.map(
-				(inputIndex) =>
-					this.activeNodeType &&
-					this.activeNodeType.inputNames &&
-					this.activeNodeType.inputNames[inputIndex],
+				(inputIndex) => this.activeNodeType?.inputNames?.[inputIndex],
 			);
 
 			if (connectedInputs.length === 0) return '';
@@ -311,7 +472,7 @@ export default mixins(workflowHelpers).extend({
 				this.$telemetry.track('User clicked ndv button', {
 					node_type: this.activeNode.type,
 					workflow_id: this.workflowsStore.workflowId,
-					session_id: this.sessionId,
+					push_ref: this.pushRef,
 					pane: 'input',
 					type: 'executePrevious',
 				});
@@ -326,16 +487,16 @@ export default mixins(workflowHelpers).extend({
 		onUnlinkRun() {
 			this.$emit('unlinkRun');
 		},
-		onSelect(value: string) {
+		onInputNodeChange(value: string) {
 			const index = this.parentNodes.findIndex((node) => node.name === value) + 1;
-			this.$emit('select', value, index);
+			this.$emit('changeInputNode', value, index);
 		},
 		onConnectionHelpClick() {
 			if (this.activeNode) {
 				this.$telemetry.track('User clicked ndv link', {
 					node_type: this.activeNode.type,
 					workflow_id: this.workflowsStore.workflowId,
-					session_id: this.sessionId,
+					push_ref: this.pushRef,
 					pane: 'input',
 					type: 'not-connected-help',
 				});
@@ -348,41 +509,30 @@ export default mixins(workflowHelpers).extend({
 			}
 			return truncated;
 		},
-	},
-	watch: {
-		showDraggableHint(curr: boolean, prev: boolean) {
-			if (curr && !prev) {
-				setTimeout(() => {
-					if (this.draggableHintShown) {
-						return;
-					}
-					this.showDraggableHintWithDelay = this.showDraggableHint;
-					if (this.showDraggableHintWithDelay) {
-						this.draggableHintShown = true;
-
-						this.$telemetry.track('User viewed data mapping tooltip', {
-							type: 'unexecuted input pane',
-						});
-					}
-				}, 1000);
-			} else if (!curr) {
-				this.showDraggableHintWithDelay = false;
-			}
+		activatePane() {
+			this.$emit('activatePane');
 		},
 	},
 });
 </script>
 
 <style lang="scss" module>
+.mappedNode {
+	width: max-content;
+	padding: 0 var(--spacing-s) var(--spacing-s);
+}
 .titleSection {
 	display: flex;
 	max-width: 300px;
+	align-items: center;
 
 	> * {
 		margin-right: var(--spacing-2xs);
 	}
 }
-
+.inputModeTab {
+	margin-left: auto;
+}
 .noOutputData {
 	max-width: 180px;
 
diff --git a/packages/editor-ui/src/components/InputTriple/InputTriple.vue b/packages/editor-ui/src/components/InputTriple/InputTriple.vue
new file mode 100644
index 0000000000000..b3a907416de89
--- /dev/null
+++ b/packages/editor-ui/src/components/InputTriple/InputTriple.vue
@@ -0,0 +1,163 @@
+<script setup lang="ts">
+type Props = {
+	middleWidth?: string;
+};
+withDefaults(defineProps<Props>(), { middleWidth: '160px' });
+</script>
+
+<template>
+	<n8n-resize-observer
+		:class="{ [$style.observer]: true }"
+		:breakpoints="[
+			{ bp: 'stacked', width: 400 },
+			{ bp: 'medium', width: 680 },
+		]"
+	>
+		<template #default="{ bp }">
+			<div :class="$style.background"></div>
+			<div
+				:class="{
+					[$style.triple]: true,
+					[$style.stacked]: bp === 'stacked',
+					[$style.medium]: bp === 'medium',
+					[$style.default]: bp === 'default',
+					[$style.noRightSlot]: !$slots.right,
+					[$style.noMiddleSlot]: !$slots.middle,
+				}"
+			>
+				<div v-if="$slots.left" :class="$style.item">
+					<slot name="left" :breakpoint="bp"></slot>
+				</div>
+				<div
+					v-if="$slots.middle"
+					:class="[$style.item, $style.middle]"
+					:style="{ flexBasis: middleWidth }"
+				>
+					<slot name="middle" :breakpoint="bp"></slot>
+				</div>
+				<div v-if="$slots.right" :class="$style.item">
+					<slot name="right" :breakpoint="bp"></slot>
+				</div>
+			</div>
+		</template>
+	</n8n-resize-observer>
+</template>
+
+<style lang="scss" module>
+.triple {
+	display: flex;
+	flex-wrap: nowrap;
+	align-items: flex-start;
+}
+
+.observer {
+	--parameter-input-options-height: 22px;
+	width: 100%;
+	position: relative;
+}
+
+.background {
+	position: absolute;
+	background-color: var(--color-background-input-triple);
+	top: var(--parameter-input-options-height);
+	bottom: 0;
+	left: 0;
+	right: 0;
+	border: 1px solid var(--border-color-base);
+	border-radius: var(--border-radius-base);
+}
+
+.item {
+	flex-shrink: 0;
+	flex-basis: 240px;
+	flex-grow: 1;
+	--input-border-radius: 0;
+}
+
+.default .item:not(:first-child):not(:focus-within + .item) {
+	margin-left: -1px;
+}
+
+.middle {
+	flex-grow: 0;
+	flex-basis: 160px;
+	padding-top: var(--parameter-input-options-height);
+}
+
+.item:first-of-type {
+	--input-border-top-left-radius: var(--border-radius-base);
+	--input-border-bottom-left-radius: var(--border-radius-base);
+	--input-border-top-right-radius: 0;
+	--input-border-bottom-right-radius: 0;
+}
+
+.item:last-of-type {
+	--input-border-top-left-radius: 0;
+	--input-border-bottom-left-radius: 0;
+	--input-border-top-right-radius: var(--border-radius-base);
+	--input-border-bottom-right-radius: var(--border-radius-base);
+}
+
+.medium:not(.noRightSlot) {
+	flex-wrap: wrap;
+
+	.middle {
+		--input-border-top-right-radius: var(--border-radius-base);
+		--input-border-bottom-right-radius: 0;
+
+		&:not(:focus-within + .item) {
+			margin-left: -1px;
+		}
+	}
+
+	.item:first-of-type {
+		--input-border-top-left-radius: var(--border-radius-base);
+		--input-border-top-right-radius: 0;
+		--input-border-bottom-left-radius: 0;
+	}
+
+	.item:last-of-type {
+		flex-basis: 400px;
+
+		--input-border-top-left-radius: 0;
+		--input-border-top-right-radius: 0;
+		--input-border-bottom-left-radius: var(--border-radius-base);
+		--input-border-bottom-right-radius: var(--border-radius-base);
+
+		&:not(:focus-within ~ .item) {
+			margin-top: -1px;
+		}
+	}
+}
+
+.stacked {
+	display: block;
+
+	.middle {
+		padding-top: 0;
+	}
+
+	.middle:not(.item:last-of-type) {
+		width: 100%;
+		--input-border-radius: 0;
+	}
+
+	.item:first-of-type {
+		--input-border-top-left-radius: var(--border-radius-base);
+		--input-border-top-right-radius: var(--border-radius-base);
+		--input-border-bottom-left-radius: 0;
+		--input-border-bottom-right-radius: 0;
+	}
+
+	.item:not(:first-of-type):not(:focus-within + .item) {
+		margin-top: -1px;
+	}
+
+	.item:last-of-type {
+		--input-border-top-left-radius: 0;
+		--input-border-top-right-radius: 0;
+		--input-border-bottom-left-radius: var(--border-radius-base);
+		--input-border-bottom-right-radius: var(--border-radius-base);
+	}
+}
+</style>
diff --git a/packages/editor-ui/src/components/InputTriple/__tests__/InputTriple.test.ts b/packages/editor-ui/src/components/InputTriple/__tests__/InputTriple.test.ts
new file mode 100644
index 0000000000000..a29373ec25583
--- /dev/null
+++ b/packages/editor-ui/src/components/InputTriple/__tests__/InputTriple.test.ts
@@ -0,0 +1,38 @@
+import { createComponentRenderer } from '@/__tests__/render';
+import InputTriple from '../InputTriple.vue';
+
+const renderComponent = createComponentRenderer(InputTriple);
+
+describe('InputTriple.vue', () => {
+	afterEach(() => {
+		vi.clearAllMocks();
+	});
+
+	it('renders layout correctly', async () => {
+		const { container } = renderComponent({
+			props: { middleWidth: '200px' },
+			slots: {
+				left: '<div>left</div>',
+				middle: '<div>middle</div>',
+				right: '<div>right</div>',
+			},
+		});
+
+		expect(container.querySelector('.triple')).toBeInTheDocument();
+		expect(container.querySelectorAll('.item')).toHaveLength(3);
+		expect(container.querySelector('.middle')).toHaveStyle('flex-basis: 200px');
+	});
+
+	it('does not render missing slots', async () => {
+		const { container } = renderComponent({
+			props: { middleWidth: '200px' },
+			slots: {
+				left: '<div>left</div>',
+				middle: '<div>middle</div>',
+			},
+		});
+
+		expect(container.querySelector('.triple')).toBeInTheDocument();
+		expect(container.querySelectorAll('.item')).toHaveLength(2);
+	});
+});
diff --git a/packages/editor-ui/src/components/IntersectionObserved.vue b/packages/editor-ui/src/components/IntersectionObserved.vue
index 88402d4ae705d..3be8dde88eb1b 100644
--- a/packages/editor-ui/src/components/IntersectionObserved.vue
+++ b/packages/editor-ui/src/components/IntersectionObserved.vue
@@ -5,24 +5,34 @@
 </template>
 
 <script lang="ts">
-import mixins from 'vue-typed-mixins';
-import emitter from '@/mixins/emitter';
+import type { PropType } from 'vue';
+import { defineComponent } from 'vue';
+import type { EventBus } from 'n8n-design-system/utils';
+import { createEventBus } from 'n8n-design-system/utils';
 
-export default mixins(emitter).extend({
+export default defineComponent({
 	name: 'IntersectionObserved',
-	props: ['enabled'],
-	mounted() {
+	props: {
+		enabled: {
+			type: Boolean,
+			default: false,
+		},
+		eventBus: {
+			type: Object as PropType<EventBus>,
+			default: () => createEventBus(),
+		},
+	},
+	async mounted() {
 		if (!this.enabled) {
 			return;
 		}
 
-		this.$nextTick(() => {
-			this.$dispatch('IntersectionObserver', 'observe', this.$refs.observed);
-		});
+		await this.$nextTick();
+		this.eventBus.emit('observe', this.$refs.observed);
 	},
-	beforeDestroy() {
+	beforeUnmount() {
 		if (this.enabled) {
-			this.$dispatch('IntersectionObserver', 'unobserve', this.$refs.observed);
+			this.eventBus.emit('unobserve', this.$refs.observed);
 		}
 	},
 });
diff --git a/packages/editor-ui/src/components/IntersectionObserver.vue b/packages/editor-ui/src/components/IntersectionObserver.vue
index e548ec91f6e3a..93ed8e5bb73f4 100644
--- a/packages/editor-ui/src/components/IntersectionObserver.vue
+++ b/packages/editor-ui/src/components/IntersectionObserver.vue
@@ -5,11 +5,27 @@
 </template>
 
 <script lang="ts">
+import type { PropType } from 'vue';
 import { defineComponent } from 'vue';
+import type { EventBus } from 'n8n-design-system/utils';
+import { createEventBus } from 'n8n-design-system/utils';
 
 export default defineComponent({
 	name: 'IntersectionObserver',
-	props: ['threshold', 'enabled'],
+	props: {
+		threshold: {
+			type: Number,
+			default: 0,
+		},
+		enabled: {
+			type: Boolean,
+			default: false,
+		},
+		eventBus: {
+			type: Object as PropType<EventBus>,
+			default: () => createEventBus(),
+		},
+	},
 	data() {
 		return {
 			observer: null,
@@ -35,19 +51,21 @@ export default defineComponent({
 			});
 		}, options);
 
-		this.$data.observer = observer;
+		this.observer = observer;
 
-		this.$on('observe', (observed: Element) => {
-			observer.observe(observed);
+		this.eventBus.on('observe', (observed: Element) => {
+			if (observed) {
+				observer.observe(observed);
+			}
 		});
 
-		this.$on('unobserve', (observed: Element) => {
+		this.eventBus.on('unobserve', (observed: Element) => {
 			observer.unobserve(observed);
 		});
 	},
-	beforeDestroy() {
+	beforeUnmount() {
 		if (this.enabled) {
-			this.$data.observer.disconnect();
+			this.observer.disconnect();
 		}
 	},
 });
diff --git a/packages/editor-ui/src/components/InviteUsersModal.vue b/packages/editor-ui/src/components/InviteUsersModal.vue
index a6fca050e841d..81bc2290062ad 100644
--- a/packages/editor-ui/src/components/InviteUsersModal.vue
+++ b/packages/editor-ui/src/components/InviteUsersModal.vue
@@ -1,7 +1,6 @@
 <template>
 	<Modal
 		:name="INVITE_USER_MODAL_KEY"
-		@enter="onSubmit"
 		:title="
 			$locale.baseText(
 				showInviteUrls ? 'settings.users.copyInviteUrls' : 'settings.users.inviteNewUsers',
@@ -9,9 +8,19 @@
 		"
 		:center="true"
 		width="460px"
-		:eventBus="modalBus"
+		:event-bus="modalBus"
+		@enter="onSubmit"
 	>
 		<template #content>
+			<n8n-notice v-if="!isAdvancedPermissionsEnabled">
+				<i18n-t keypath="settings.users.advancedPermissions.warning">
+					<template #link>
+						<n8n-link size="small" @click="goToUpgradeAdvancedPermissions">
+							{{ $locale.baseText('settings.users.advancedPermissions.warning.link') }}
+						</n8n-link>
+					</template>
+				</i18n-t>
+			</n8n-notice>
 			<div v-if="showInviteUrls">
 				<n8n-users-list :users="invitedUsers">
 					<template #actions="{ user }">
@@ -33,49 +42,41 @@
 			<n8n-form-inputs
 				v-else
 				:inputs="config"
-				:eventBus="formBus"
-				:columnView="true"
-				@input="onInput"
+				:event-bus="formBus"
+				:column-view="true"
+				@update="onInput"
 				@submit="onSubmit"
 			/>
-			<n8n-info-tip v-if="!settingsStore.isSmtpSetup" class="mt-s">
-				<i18n path="settings.users.setupSMTPInfo">
-					<template #link>
-						<a
-							href="https://docs.n8n.io/reference/user-management.html#step-one-smtp"
-							target="_blank"
-						>
-							{{ $locale.baseText('settings.users.setupSMTPInfo.link') }}
-						</a>
-					</template>
-				</i18n>
-			</n8n-info-tip>
 		</template>
 		<template v-if="!showInviteUrls" #footer>
 			<n8n-button
 				:loading="loading"
 				:disabled="!enabledButton"
 				:label="buttonLabel"
-				@click="onSubmitClick"
 				float="right"
+				@click="onSubmitClick"
 			/>
 		</template>
 	</Modal>
 </template>
 
 <script lang="ts">
-import mixins from 'vue-typed-mixins';
-
-import { showMessage } from '@/mixins/showMessage';
-import { copyPaste } from '@/mixins/copyPaste';
+import { defineComponent } from 'vue';
+import { mapStores } from 'pinia';
+import { useToast } from '@/composables/useToast';
 import Modal from './Modal.vue';
 import type { IFormInputs, IInviteResponse, IUser } from '@/Interface';
-import { VALID_EMAIL_REGEX, INVITE_USER_MODAL_KEY } from '@/constants';
-import { ROLE } from '@/utils';
-import { mapStores } from 'pinia';
-import { useUsersStore } from '@/stores/users';
-import { useSettingsStore } from '@/stores/settings';
-import { createEventBus } from '@/event-bus';
+import {
+	EnterpriseEditionFeature,
+	VALID_EMAIL_REGEX,
+	INVITE_USER_MODAL_KEY,
+	ROLE,
+} from '@/constants';
+import { useUsersStore } from '@/stores/users.store';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useUIStore } from '@/stores/ui.store';
+import { createEventBus } from 'n8n-design-system/utils';
+import { useClipboard } from '@/composables/useClipboard';
 
 const NAME_EMAIL_FORMAT_REGEX = /^.* <(.*)>$/;
 
@@ -90,20 +91,29 @@ function getEmail(email: string): string {
 	return parsed;
 }
 
-export default mixins(showMessage, copyPaste).extend({
-	components: { Modal },
+export default defineComponent({
 	name: 'InviteUsersModal',
+	components: { Modal },
 	props: {
 		modalName: {
 			type: String,
 		},
 	},
+	setup() {
+		const clipboard = useClipboard();
+
+		return {
+			clipboard,
+			...useToast(),
+		};
+	},
 	data() {
 		return {
 			config: null as IFormInputs | null,
 			formBus: createEventBus(),
 			modalBus: createEventBus(),
 			emails: '',
+			role: ROLE.Member,
 			showInviteUrls: null as IInviteResponse[] | null,
 			loading: false,
 			INVITE_USER_MODAL_KEY,
@@ -129,7 +139,7 @@ export default mixins(showMessage, copyPaste).extend({
 			},
 			{
 				name: 'role',
-				initialValue: 'member',
+				initialValue: ROLE.Member,
 				properties: {
 					label: this.$locale.baseText('auth.role'),
 					required: true,
@@ -139,6 +149,11 @@ export default mixins(showMessage, copyPaste).extend({
 							value: ROLE.Member,
 							label: this.$locale.baseText('auth.roles.member'),
 						},
+						{
+							value: ROLE.Admin,
+							label: this.$locale.baseText('auth.roles.admin'),
+							disabled: !this.isAdvancedPermissionsEnabled,
+						},
 					],
 					capitalize: true,
 				},
@@ -146,7 +161,7 @@ export default mixins(showMessage, copyPaste).extend({
 		];
 	},
 	computed: {
-		...mapStores(useUsersStore, useSettingsStore),
+		...mapStores(useUsersStore, useSettingsStore, useUIStore),
 		emailsCount(): number {
 			return this.emails.split(',').filter((email: string) => !!email.trim()).length;
 		},
@@ -171,9 +186,14 @@ export default mixins(showMessage, copyPaste).extend({
 			return this.showInviteUrls
 				? this.usersStore.allUsers.filter((user) =>
 						this.showInviteUrls!.find((invite) => invite.user.id === user.id),
-				  )
+					)
 				: [];
 		},
+		isAdvancedPermissionsEnabled(): boolean {
+			return this.settingsStore.isEnterpriseFeatureEnabled(
+				EnterpriseEditionFeature.AdvancedPermissions,
+			);
+		},
 	},
 	methods: {
 		validateEmails(value: string | number | boolean | null | undefined) {
@@ -200,6 +220,9 @@ export default mixins(showMessage, copyPaste).extend({
 			if (e.name === 'emails') {
 				this.emails = e.value;
 			}
+			if (e.name === 'role') {
+				this.role = e.value;
+			}
 		},
 		async onSubmit() {
 			try {
@@ -207,7 +230,7 @@ export default mixins(showMessage, copyPaste).extend({
 
 				const emails = this.emails
 					.split(',')
-					.map((email) => ({ email: getEmail(email) }))
+					.map((email) => ({ email: getEmail(email), role: this.role }))
 					.filter((invite) => !!invite.email);
 
 				if (emails.length === 0) {
@@ -224,7 +247,7 @@ export default mixins(showMessage, copyPaste).extend({
 				);
 
 				if (successfulEmailInvites.length) {
-					this.$showMessage({
+					this.showMessage({
 						type: 'success',
 						title: this.$locale.baseText(
 							successfulEmailInvites.length > 1
@@ -241,10 +264,10 @@ export default mixins(showMessage, copyPaste).extend({
 
 				if (successfulUrlInvites.length) {
 					if (successfulUrlInvites.length === 1) {
-						this.copyToClipboard(successfulUrlInvites[0].user.inviteAcceptUrl);
+						void this.clipboard.copy(successfulUrlInvites[0].user.inviteAcceptUrl);
 					}
 
-					this.$showMessage({
+					this.showMessage({
 						type: 'success',
 						title: this.$locale.baseText(
 							successfulUrlInvites.length > 1
@@ -266,7 +289,7 @@ export default mixins(showMessage, copyPaste).extend({
 
 				if (erroredInvites.length) {
 					setTimeout(() => {
-						this.$showMessage({
+						this.showMessage({
 							type: 'error',
 							title: this.$locale.baseText('settings.users.usersEmailedError'),
 							message: this.$locale.baseText('settings.users.emailInvitesSentError', {
@@ -282,12 +305,12 @@ export default mixins(showMessage, copyPaste).extend({
 					this.modalBus.emit('close');
 				}
 			} catch (error) {
-				this.$showError(error, this.$locale.baseText('settings.users.usersInvitedError'));
+				this.showError(error, this.$locale.baseText('settings.users.usersInvitedError'));
 			}
 			this.loading = false;
 		},
 		showCopyInviteLinkToast(successfulUrlInvites: IInviteResponse[]) {
-			this.$showMessage({
+			this.showMessage({
 				type: 'success',
 				title: this.$locale.baseText(
 					successfulUrlInvites.length > 1
@@ -311,10 +334,13 @@ export default mixins(showMessage, copyPaste).extend({
 		},
 		onCopyInviteLink(user: IUser) {
 			if (user.inviteAcceptUrl && this.showInviteUrls) {
-				this.copyToClipboard(user.inviteAcceptUrl);
+				void this.clipboard.copy(user.inviteAcceptUrl);
 				this.showCopyInviteLinkToast([]);
 			}
 		},
+		goToUpgradeAdvancedPermissions() {
+			void this.uiStore.goToUpgrade('advanced-permissions', 'upgrade-advanced-permissions');
+		},
 	},
 });
 </script>
diff --git a/packages/editor-ui/src/components/JsEditor/JsEditor.vue b/packages/editor-ui/src/components/JsEditor/JsEditor.vue
new file mode 100644
index 0000000000000..4ae28dc67b9db
--- /dev/null
+++ b/packages/editor-ui/src/components/JsEditor/JsEditor.vue
@@ -0,0 +1,125 @@
+<template>
+	<div :class="$style.editor">
+		<div ref="jsEditor" class="ph-no-capture js-editor"></div>
+		<slot name="suffix" />
+	</div>
+</template>
+
+<script lang="ts">
+import { history, toggleComment } from '@codemirror/commands';
+import { javascript } from '@codemirror/lang-javascript';
+import { foldGutter, indentOnInput } from '@codemirror/language';
+import { lintGutter } from '@codemirror/lint';
+import type { Extension } from '@codemirror/state';
+import { EditorState, Prec } from '@codemirror/state';
+import type { ViewUpdate } from '@codemirror/view';
+import {
+	EditorView,
+	dropCursor,
+	highlightActiveLine,
+	highlightActiveLineGutter,
+	keymap,
+	lineNumbers,
+} from '@codemirror/view';
+import { defineComponent } from 'vue';
+
+import { codeNodeEditorTheme } from '../CodeNodeEditor/theme';
+import {
+	autocompleteKeyMap,
+	enterKeyMap,
+	historyKeyMap,
+	tabKeyMap,
+} from '@/plugins/codemirror/keymap';
+import { n8nAutocompletion } from '@/plugins/codemirror/n8nLang';
+
+export default defineComponent({
+	name: 'JsEditor',
+	props: {
+		modelValue: {
+			type: String,
+			required: true,
+		},
+		isReadOnly: {
+			type: Boolean,
+			default: false,
+		},
+		fillParent: {
+			type: Boolean,
+			default: false,
+		},
+		rows: {
+			type: Number,
+			default: 4,
+		},
+	},
+	data() {
+		return {
+			editor: null as EditorView | null,
+			editorState: null as EditorState | null,
+		};
+	},
+	computed: {
+		doc(): string {
+			return this.editor?.state.doc.toString() ?? '';
+		},
+		extensions(): Extension[] {
+			const { isReadOnly } = this;
+			const extensions: Extension[] = [
+				javascript(),
+				lineNumbers(),
+				EditorView.lineWrapping,
+				EditorState.readOnly.of(isReadOnly),
+				EditorView.editable.of(!isReadOnly),
+				codeNodeEditorTheme({
+					isReadOnly,
+					maxHeight: this.fillParent ? '100%' : '40vh',
+					minHeight: '20vh',
+					rows: this.rows,
+				}),
+			];
+			if (!isReadOnly) {
+				extensions.push(
+					history(),
+					Prec.highest(
+						keymap.of([
+							...tabKeyMap(),
+							...enterKeyMap,
+							...historyKeyMap,
+							...autocompleteKeyMap,
+							{ key: 'Mod-/', run: toggleComment },
+						]),
+					),
+					lintGutter(),
+					n8nAutocompletion(),
+					indentOnInput(),
+					highlightActiveLine(),
+					highlightActiveLineGutter(),
+					foldGutter(),
+					dropCursor(),
+					EditorView.updateListener.of((viewUpdate: ViewUpdate) => {
+						if (!viewUpdate.docChanged || !this.editor) return;
+						this.$emit('update:modelValue', this.editor?.state.doc.toString());
+					}),
+				);
+			}
+			return extensions;
+		},
+	},
+	mounted() {
+		const state = EditorState.create({ doc: this.modelValue, extensions: this.extensions });
+		const parent = this.$refs.jsEditor as HTMLDivElement;
+		this.editor = new EditorView({ parent, state });
+		this.editorState = this.editor.state;
+	},
+});
+</script>
+
+<style lang="scss" module>
+.editor {
+	height: 100%;
+
+	& > div {
+		height: 100%;
+	}
+}
+</style>
diff --git a/packages/editor-ui/src/components/JsonEditor/JsonEditor.vue b/packages/editor-ui/src/components/JsonEditor/JsonEditor.vue
new file mode 100644
index 0000000000000..ec530274dc5ea
--- /dev/null
+++ b/packages/editor-ui/src/components/JsonEditor/JsonEditor.vue
@@ -0,0 +1,141 @@
+<template>
+	<div :class="$style.editor">
+		<div ref="jsonEditor" class="ph-no-capture json-editor"></div>
+		<slot name="suffix" />
+	</div>
+</template>
+
+<script lang="ts">
+import { history } from '@codemirror/commands';
+import { json, jsonParseLinter } from '@codemirror/lang-json';
+import { bracketMatching, foldGutter, indentOnInput } from '@codemirror/language';
+import { linter as createLinter, lintGutter } from '@codemirror/lint';
+import type { Extension } from '@codemirror/state';
+import { EditorState, Prec } from '@codemirror/state';
+import type { ViewUpdate } from '@codemirror/view';
+import {
+	EditorView,
+	dropCursor,
+	highlightActiveLine,
+	highlightActiveLineGutter,
+	keymap,
+	lineNumbers,
+} from '@codemirror/view';
+import { defineComponent } from 'vue';
+
+import { codeNodeEditorTheme } from '../CodeNodeEditor/theme';
+import {
+	autocompleteKeyMap,
+	enterKeyMap,
+	historyKeyMap,
+	tabKeyMap,
+} from '@/plugins/codemirror/keymap';
+import { n8nAutocompletion } from '@/plugins/codemirror/n8nLang';
+
+export default defineComponent({
+	name: 'JsonEditor',
+	props: {
+		modelValue: {
+			type: String,
+			required: true,
+		},
+		isReadOnly: {
+			type: Boolean,
+			default: false,
+		},
+		fillParent: {
+			type: Boolean,
+			default: false,
+		},
+		rows: {
+			type: Number,
+			default: 4,
+		},
+	},
+	data() {
+		return {
+			editor: null as EditorView | null,
+			editorState: null as EditorState | null,
+		};
+	},
+	computed: {
+		doc(): string {
+			return this.editor?.state.doc.toString();
+		},
+		extensions(): Extension[] {
+			const { isReadOnly } = this;
+			const extensions: Extension[] = [
+				json(),
+				lineNumbers(),
+				EditorView.lineWrapping,
+				EditorState.readOnly.of(isReadOnly),
+				EditorView.editable.of(!isReadOnly),
+				codeNodeEditorTheme({
+					isReadOnly,
+					maxHeight: this.fillParent ? '100%' : '40vh',
+					minHeight: '20vh',
+					rows: this.rows,
+				}),
+			];
+			if (!isReadOnly) {
+				extensions.push(
+					history(),
+					Prec.highest(
+						keymap.of([...tabKeyMap(), ...enterKeyMap, ...historyKeyMap, ...autocompleteKeyMap]),
+					),
+					createLinter(jsonParseLinter()),
+					lintGutter(),
+					n8nAutocompletion(),
+					indentOnInput(),
+					highlightActiveLine(),
+					highlightActiveLineGutter(),
+					foldGutter(),
+					dropCursor(),
+					bracketMatching(),
+					EditorView.updateListener.of((viewUpdate: ViewUpdate) => {
+						if (!viewUpdate.docChanged || !this.editor) return;
+						this.$emit('update:modelValue', this.editor?.state.doc.toString());
+					}),
+				);
+			}
+			return extensions;
+		},
+	},
+	watch: {
+		modelValue(newValue: string) {
+			const editorValue = this.editor?.state?.doc.toString();
+
+			// If model value changes from outside the component
+			if (editorValue && editorValue.length !== newValue.length && editorValue !== newValue) {
+				this.destroyEditor();
+				this.createEditor();
+			}
+		},
+	},
+	mounted() {
+		this.createEditor();
+	},
+	methods: {
+		createEditor() {
+			const state = EditorState.create({ doc: this.modelValue, extensions: this.extensions });
+			const parent = this.$refs.jsonEditor as HTMLDivElement;
+
+			this.editor = new EditorView({ parent, state });
+			this.editorState = this.editor.state;
+		},
+		destroyEditor() {
+			this.editor?.destroy();
+		},
+	},
+});
+</script>
+
+<style lang="scss" module>
+.editor {
+	height: 100%;
+
+	& > div {
+		height: 100%;
+	}
+}
+</style>
diff --git a/packages/editor-ui/src/components/KeyboardShortcutTooltip.vue b/packages/editor-ui/src/components/KeyboardShortcutTooltip.vue
new file mode 100644
index 0000000000000..66beca4d160f5
--- /dev/null
+++ b/packages/editor-ui/src/components/KeyboardShortcutTooltip.vue
@@ -0,0 +1,36 @@
+<script setup lang="ts">
+import type { Placement } from 'element-plus';
+import type { KeyboardShortcut } from 'n8n-design-system/src/components/N8nKeyboardShortcut';
+
+interface Props {
+	label: string;
+	shortcut: KeyboardShortcut;
+	placement?: Placement;
+}
+withDefaults(defineProps<Props>(), { placement: 'top' });
+</script>
+
+<template>
+	<n8n-tooltip :placement="placement" :show-after="500">
+		<template #content>
+			<div :class="$style.shortcut">
+				<div :class="$style.label">{{ label }}</div>
+				<n8n-keyboard-shortcut v-bind="shortcut"></n8n-keyboard-shortcut>
+			</div>
+		</template>
+		<slot />
+	</n8n-tooltip>
+</template>
+
+<style lang="scss" module>
+.shortcut {
+	display: flex;
+	align-items: center;
+	font-size: var(--font-size-2xs);
+	gap: var(--spacing-2xs);
+}
+
+.label {
+	flex-shrink: 0;
+}
+</style>
diff --git a/packages/editor-ui/src/components/Logo.vue b/packages/editor-ui/src/components/Logo.vue
index 64eeed691369d..e8947b5d99388 100644
--- a/packages/editor-ui/src/components/Logo.vue
+++ b/packages/editor-ui/src/components/Logo.vue
@@ -1,18 +1,22 @@
 <template>
-	<img :src="basePath + 'n8n-logo-expanded.svg'" :class="$style.img" alt="n8n.io" />
+	<img :src="logoPath" :class="$style.img" alt="n8n.io" />
 </template>
 
 <script lang="ts">
-import { useRootStore } from '@/stores/n8nRootStore';
-import { mapStores } from 'pinia';
 import { defineComponent } from 'vue';
+import { mapStores } from 'pinia';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import { useUIStore } from '@/stores/ui.store';
 
 export default defineComponent({
 	computed: {
-		...mapStores(useRootStore),
+		...mapStores(useRootStore, useUIStore),
 		basePath(): string {
 			return this.rootStore.baseUrl;
 		},
+		logoPath(): string {
+			return this.basePath + this.uiStore.logo;
+		},
 	},
 });
 </script>
diff --git a/packages/editor-ui/src/components/MainHeader/CollaborationPane.vue b/packages/editor-ui/src/components/MainHeader/CollaborationPane.vue
new file mode 100644
index 0000000000000..daabc0a1780bc
--- /dev/null
+++ b/packages/editor-ui/src/components/MainHeader/CollaborationPane.vue
@@ -0,0 +1,82 @@
+<script setup lang="ts">
+import { useUsersStore } from '@/stores/users.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useCollaborationStore } from '@/stores/collaboration.store';
+import { onBeforeUnmount, onMounted, computed, ref } from 'vue';
+import { TIME } from '@/constants';
+import { isUserGlobalOwner } from '@/utils/userUtils';
+
+const collaborationStore = useCollaborationStore();
+const usersStore = useUsersStore();
+const workflowsStore = useWorkflowsStore();
+
+const HEARTBEAT_INTERVAL = 5 * TIME.MINUTE;
+const heartbeatTimer = ref<number | null>(null);
+
+const activeUsersSorted = computed(() => {
+	const currentWorkflowUsers = (collaborationStore.getUsersForCurrentWorkflow ?? []).map(
+		(userInfo) => userInfo.user,
+	);
+	const owner = currentWorkflowUsers.find(isUserGlobalOwner);
+	return {
+		defaultGroup: owner
+			? [owner, ...currentWorkflowUsers.filter((user) => user.id !== owner.id)]
+			: currentWorkflowUsers,
+	};
+});
+
+const currentUserEmail = computed(() => {
+	return usersStore.currentUser?.email;
+});
+
+const startHeartbeat = () => {
+	if (heartbeatTimer.value !== null) {
+		clearInterval(heartbeatTimer.value);
+		heartbeatTimer.value = null;
+	}
+	heartbeatTimer.value = window.setInterval(() => {
+		collaborationStore.notifyWorkflowOpened(workflowsStore.workflow.id);
+	}, HEARTBEAT_INTERVAL);
+};
+
+const stopHeartbeat = () => {
+	if (heartbeatTimer.value !== null) {
+		clearInterval(heartbeatTimer.value);
+	}
+};
+
+const onDocumentVisibilityChange = () => {
+	if (document.visibilityState === 'hidden') {
+		stopHeartbeat();
+	} else {
+		startHeartbeat();
+	}
+};
+
+onMounted(() => {
+	collaborationStore.initialize();
+	startHeartbeat();
+	document.addEventListener('visibilitychange', onDocumentVisibilityChange);
+});
+
+onBeforeUnmount(() => {
+	document.removeEventListener('visibilitychange', onDocumentVisibilityChange);
+	stopHeartbeat();
+	collaborationStore.terminate();
+});
+</script>
+
+<template>
+	<div
+		:class="`collaboration-pane-container ${$style.container}`"
+		data-test-id="collaboration-pane"
+	>
+		<n8n-user-stack :users="activeUsersSorted" :current-user-email="currentUserEmail" />
+	</div>
+</template>
+
+<style lang="scss" module>
+.container {
+	margin: 0 var(--spacing-4xs);
+}
+</style>
diff --git a/packages/editor-ui/src/components/MainHeader/MainHeader.vue b/packages/editor-ui/src/components/MainHeader/MainHeader.vue
index 66a7bb111522c..ed7b43715e910 100644
--- a/packages/editor-ui/src/components/MainHeader/MainHeader.vue
+++ b/packages/editor-ui/src/components/MainHeader/MainHeader.vue
@@ -1,13 +1,13 @@
 <template>
 	<div>
-		<div :class="{ 'main-header': true, expanded: !this.uiStore.sidebarMenuCollapsed }">
+		<div :class="{ 'main-header': true, expanded: !uiStore.sidebarMenuCollapsed }">
 			<div v-show="!hideMenuBar" class="top-menu">
-				<WorkflowDetails />
-				<tab-bar
+				<WorkflowDetails v-if="workflow?.name" :workflow="workflow" :read-only="readOnly" />
+				<TabBar
 					v-if="onWorkflowPage"
 					:items="tabBarItems"
-					:activeTab="activeHeaderTab"
-					@select="onTabSelected"
+					:model-value="activeHeaderTab"
+					@update:model-value="onTabSelected"
 				/>
 			</div>
 		</div>
@@ -15,8 +15,10 @@
 </template>
 
 <script lang="ts">
-import mixins from 'vue-typed-mixins';
-import { pushConnection } from '@/mixins/pushConnection';
+import { defineComponent } from 'vue';
+import type { RouteLocation, RouteLocationRaw } from 'vue-router';
+import { useRouter } from 'vue-router';
+import { mapStores } from 'pinia';
 import WorkflowDetails from '@/components/MainHeader/WorkflowDetails.vue';
 import TabBar from '@/components/MainHeader/TabBar.vue';
 import {
@@ -25,28 +27,44 @@ import {
 	STICKY_NODE_TYPE,
 	VIEWS,
 } from '@/constants';
-import type { IExecutionsSummary, INodeUi, ITabBarItem } from '@/Interface';
-import { workflowHelpers } from '@/mixins/workflowHelpers';
-import type { Route } from 'vue-router';
-import { mapStores } from 'pinia';
-import { useUIStore } from '@/stores/ui';
-import { useNDVStore } from '@/stores/ndv';
+import type { INodeUi, ITabBarItem, IWorkflowDb } from '@/Interface';
+import { useNDVStore } from '@/stores/ndv.store';
+import { useSourceControlStore } from '@/stores/sourceControl.store';
+import { useUIStore } from '@/stores/ui.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useExecutionsStore } from '@/stores/executions.store';
+import { usePushConnection } from '@/composables/usePushConnection';
 
-export default mixins(pushConnection, workflowHelpers).extend({
+export default defineComponent({
 	name: 'MainHeader',
 	components: {
 		WorkflowDetails,
 		TabBar,
 	},
+	setup() {
+		const router = useRouter();
+		const pushConnection = usePushConnection({ router });
+
+		return {
+			pushConnection,
+		};
+	},
 	data() {
 		return {
 			activeHeaderTab: MAIN_HEADER_TABS.WORKFLOW,
 			workflowToReturnTo: '',
+			executionToReturnTo: '',
 			dirtyState: false,
 		};
 	},
 	computed: {
-		...mapStores(useNDVStore, useUIStore),
+		...mapStores(
+			useNDVStore,
+			useUIStore,
+			useSourceControlStore,
+			useWorkflowsStore,
+			useExecutionsStore,
+		),
 		tabBarItems(): ITabBarItem[] {
 			return [
 				{ value: MAIN_HEADER_TABS.WORKFLOW, label: this.$locale.baseText('generic.editor') },
@@ -59,6 +77,9 @@ export default mixins(pushConnection, workflowHelpers).extend({
 		hideMenuBar(): boolean {
 			return Boolean(this.activeNode && this.activeNode.type !== STICKY_NODE_TYPE);
 		},
+		workflow(): IWorkflowDb {
+			return this.workflowsStore.workflow;
+		},
 		workflowName(): string {
 			return this.workflowsStore.workflowName;
 		},
@@ -71,80 +92,114 @@ export default mixins(pushConnection, workflowHelpers).extend({
 				(this.$route.meta.nodeView || this.$route.meta.keepWorkflowAlive === true)
 			);
 		},
-		activeExecution(): IExecutionsSummary {
-			return this.workflowsStore.activeWorkflowExecution as IExecutionsSummary;
+		readOnly(): boolean {
+			return this.sourceControlStore.preferences.branchReadOnly;
 		},
 	},
+	watch: {
+		$route(to, from) {
+			this.syncTabsWithRoute(to, from);
+		},
+	},
+	beforeMount() {
+		this.pushConnection.initialize();
+	},
 	mounted() {
 		this.dirtyState = this.uiStore.stateIsDirty;
 		this.syncTabsWithRoute(this.$route);
-		// Initialize the push connection
-		this.pushConnect();
 	},
-	beforeDestroy() {
-		this.pushDisconnect();
-	},
-	watch: {
-		$route(to, from) {
-			this.syncTabsWithRoute(to);
-		},
+	beforeUnmount() {
+		this.pushConnection.terminate();
 	},
 	methods: {
-		syncTabsWithRoute(route: Route): void {
+		syncTabsWithRoute(to: RouteLocation, from?: RouteLocation): void {
 			if (
-				route.name === VIEWS.EXECUTION_HOME ||
-				route.name === VIEWS.WORKFLOW_EXECUTIONS ||
-				route.name === VIEWS.EXECUTION_PREVIEW
+				to.name === VIEWS.EXECUTION_HOME ||
+				to.name === VIEWS.WORKFLOW_EXECUTIONS ||
+				to.name === VIEWS.EXECUTION_PREVIEW
 			) {
 				this.activeHeaderTab = MAIN_HEADER_TABS.EXECUTIONS;
-			} else if (route.name === VIEWS.WORKFLOW || route.name === VIEWS.NEW_WORKFLOW) {
+			} else if (
+				to.name === VIEWS.WORKFLOW ||
+				to.name === VIEWS.NEW_WORKFLOW ||
+				to.name === VIEWS.EXECUTION_DEBUG
+			) {
 				this.activeHeaderTab = MAIN_HEADER_TABS.WORKFLOW;
 			}
-			const workflowName = route.params.name;
-			if (workflowName !== 'new') {
-				this.workflowToReturnTo = workflowName;
+
+			if (to.params.name !== 'new') {
+				this.workflowToReturnTo = to.params.name;
+			}
+
+			if (from?.name === VIEWS.EXECUTION_PREVIEW && to.params.name === from.params.name) {
+				this.executionToReturnTo = from.params.executionId;
 			}
 		},
-		onTabSelected(tab: string, event: MouseEvent) {
+		onTabSelected(tab: MAIN_HEADER_TABS, event: MouseEvent) {
+			const openInNewTab = event.ctrlKey || event.metaKey;
+
 			switch (tab) {
 				case MAIN_HEADER_TABS.WORKFLOW:
-					if (!['', 'new', PLACEHOLDER_EMPTY_WORKFLOW_ID].includes(this.workflowToReturnTo)) {
-						if (this.$route.name !== VIEWS.WORKFLOW) {
-							this.$router.push({
-								name: VIEWS.WORKFLOW,
-								params: { name: this.workflowToReturnTo },
-							});
-						}
-					} else {
-						if (this.$route.name !== VIEWS.NEW_WORKFLOW) {
-							this.$router.push({ name: VIEWS.NEW_WORKFLOW });
-							this.uiStore.stateIsDirty = this.dirtyState;
-						}
-					}
-					this.activeHeaderTab = MAIN_HEADER_TABS.WORKFLOW;
+					void this.navigateToWorkflowView(openInNewTab);
 					break;
+
 				case MAIN_HEADER_TABS.EXECUTIONS:
-					this.dirtyState = this.uiStore.stateIsDirty;
-					this.workflowToReturnTo = this.currentWorkflow;
-					const routeWorkflowId =
-						this.currentWorkflow === PLACEHOLDER_EMPTY_WORKFLOW_ID ? 'new' : this.currentWorkflow;
-					if (this.activeExecution) {
-						this.$router
-							.push({
-								name: VIEWS.EXECUTION_PREVIEW,
-								params: { name: routeWorkflowId, executionId: this.activeExecution.id },
-							})
-							.catch(() => {});
-					} else {
-						this.$router.push({ name: VIEWS.EXECUTION_HOME, params: { name: routeWorkflowId } });
-					}
-					// this.modalBus.emit('closeAll');
-					this.activeHeaderTab = MAIN_HEADER_TABS.EXECUTIONS;
+					void this.navigateToExecutionsView(openInNewTab);
 					break;
+
 				default:
 					break;
 			}
 		},
+
+		async navigateToWorkflowView(openInNewTab: boolean) {
+			let routeToNavigateTo: RouteLocationRaw;
+			if (!['', 'new', PLACEHOLDER_EMPTY_WORKFLOW_ID].includes(this.workflowToReturnTo)) {
+				routeToNavigateTo = {
+					name: VIEWS.WORKFLOW,
+					params: { name: this.workflowToReturnTo },
+				};
+			} else {
+				routeToNavigateTo = { name: VIEWS.NEW_WORKFLOW };
+			}
+
+			if (openInNewTab) {
+				const { href } = this.$router.resolve(routeToNavigateTo);
+				window.open(href, '_blank');
+			} else if (this.$route.name !== routeToNavigateTo.name) {
+				if (this.$route.name === VIEWS.NEW_WORKFLOW) {
+					this.uiStore.stateIsDirty = this.dirtyState;
+				}
+				this.activeHeaderTab = MAIN_HEADER_TABS.WORKFLOW;
+				await this.$router.push(routeToNavigateTo);
+			}
+		},
+
+		async navigateToExecutionsView(openInNewTab: boolean) {
+			const routeWorkflowId =
+				this.currentWorkflow === PLACEHOLDER_EMPTY_WORKFLOW_ID ? 'new' : this.currentWorkflow;
+			const executionToReturnTo =
+				this.executionsStore.activeExecution?.id || this.executionToReturnTo;
+			const routeToNavigateTo: RouteLocationRaw = executionToReturnTo
+				? {
+						name: VIEWS.EXECUTION_PREVIEW,
+						params: { name: routeWorkflowId, executionId: executionToReturnTo },
+					}
+				: {
+						name: VIEWS.EXECUTION_HOME,
+						params: { name: routeWorkflowId },
+					};
+
+			if (openInNewTab) {
+				const { href } = this.$router.resolve(routeToNavigateTo);
+				window.open(href, '_blank');
+			} else if (this.$route.name !== routeToNavigateTo.name) {
+				this.dirtyState = this.uiStore.stateIsDirty;
+				this.workflowToReturnTo = this.currentWorkflow;
+				this.activeHeaderTab = MAIN_HEADER_TABS.EXECUTIONS;
+				await this.$router.push(routeToNavigateTo);
+			}
+		},
 	},
 });
 </script>
@@ -159,6 +214,7 @@ export default mixins(pushConnection, workflowHelpers).extend({
 }
 
 .top-menu {
+	position: relative;
 	display: flex;
 	align-items: center;
 	font-size: 0.9em;
diff --git a/packages/editor-ui/src/components/MainHeader/TabBar.spec.ts b/packages/editor-ui/src/components/MainHeader/TabBar.spec.ts
new file mode 100644
index 0000000000000..2d05ed572f3e6
--- /dev/null
+++ b/packages/editor-ui/src/components/MainHeader/TabBar.spec.ts
@@ -0,0 +1,57 @@
+import { fireEvent } from '@testing-library/vue';
+import { createComponentRenderer } from '@/__tests__/render';
+import TabBar from '@/components/MainHeader/TabBar.vue';
+
+const renderComponent = createComponentRenderer(TabBar);
+
+describe('TabBar', () => {
+	const items = [
+		{ name: 'Workflow', value: 'workflow' },
+		{ name: 'Executions', value: 'executions' },
+	];
+
+	it('should render the correct number of tabs', async () => {
+		const { findAllByRole } = renderComponent({
+			props: {
+				items,
+				modelValue: 'workflow',
+			},
+		});
+
+		const tabs = await findAllByRole('radio');
+		expect(tabs.length).toBe(2);
+	});
+
+	it('should emit update:modelValue event when a tab is clicked', async () => {
+		const { findAllByRole, emitted } = renderComponent({
+			props: {
+				items,
+				modelValue: 'workflow',
+			},
+		});
+
+		const tabs = await findAllByRole('radio');
+		const executionsTab = tabs[1];
+
+		await fireEvent.click(executionsTab);
+
+		expect(emitted()).toHaveProperty('update:modelValue');
+	});
+
+	it('should update the active tab when modelValue prop changes', async () => {
+		const { findAllByRole, rerender } = renderComponent({
+			props: {
+				items,
+				modelValue: 'workflow',
+			},
+		});
+
+		await rerender({ modelValue: 'executions' });
+
+		const tabs = await findAllByRole('radio');
+		const executionsTab = tabs[1];
+		const executionsTabButton = executionsTab.querySelector('.button');
+
+		expect(executionsTabButton).toHaveClass('active');
+	});
+});
diff --git a/packages/editor-ui/src/components/MainHeader/TabBar.vue b/packages/editor-ui/src/components/MainHeader/TabBar.vue
index a15f4e6c23496..1b11891aa403b 100644
--- a/packages/editor-ui/src/components/MainHeader/TabBar.vue
+++ b/packages/editor-ui/src/components/MainHeader/TabBar.vue
@@ -4,57 +4,42 @@
 		:class="{
 			[$style.container]: true,
 			['tab-bar-container']: true,
-			[$style.menuCollapsed]: mainSidebarCollapsed,
 		}"
 	>
-		<n8n-radio-buttons :value="activeTab" :options="items" @input="onSelect" />
+		<N8nRadioButtons
+			:model-value="modelValue"
+			:options="items"
+			@update:model-value="onUpdateModelValue"
+		/>
 	</div>
 </template>
 
-<script lang="ts">
-import { defineComponent } from 'vue';
-import type { PropType } from 'vue';
-import type { ITabBarItem } from '@/Interface';
+<script lang="ts" setup>
 import { MAIN_HEADER_TABS } from '@/constants';
-import { mapStores } from 'pinia';
-import { useUIStore } from '@/stores/ui';
+import type { ITabBarItem } from '@/Interface';
 
-export default defineComponent({
-	name: 'tab-bar',
-	data() {
-		return {
-			MAIN_HEADER_TABS,
-		};
-	},
-	props: {
-		items: {
-			type: Array as PropType<ITabBarItem[]>,
-			required: true,
-		},
-		activeTab: {
-			type: String,
-			default: MAIN_HEADER_TABS.WORKFLOW,
-		},
-	},
-	computed: {
-		...mapStores(useUIStore),
-		mainSidebarCollapsed(): boolean {
-			return this.uiStore.sidebarMenuCollapsed;
-		},
-	},
-	methods: {
-		onSelect(tab: string, event: MouseEvent): void {
-			this.$emit('select', tab, event);
-		},
+withDefaults(
+	defineProps<{
+		items: ITabBarItem[];
+		modelValue?: string;
+	}>(),
+	{
+		modelValue: MAIN_HEADER_TABS.WORKFLOW,
 	},
-});
+);
+
+const emit = defineEmits(['update:modelValue']);
+
+function onUpdateModelValue(tab: string, event: MouseEvent): void {
+	emit('update:modelValue', tab, event);
+}
 </script>
 
 <style module lang="scss">
 .container {
 	position: absolute;
 	top: 47px;
-	left: calc(50% + 100px);
+	left: 50%;
 	transform: translateX(-50%);
 	min-height: 30px;
 	display: flex;
@@ -62,10 +47,6 @@ export default defineComponent({
 	background-color: var(--color-foreground-base);
 	border-radius: var(--border-radius-base);
 	transition: all 150ms ease-in-out;
-
-	&.menuCollapsed {
-		left: 52%;
-	}
 }
 
 @media screen and (max-width: 430px) {
diff --git a/packages/editor-ui/src/components/MainHeader/WorkflowDetails.spec.ts b/packages/editor-ui/src/components/MainHeader/WorkflowDetails.spec.ts
new file mode 100644
index 0000000000000..16735639902c5
--- /dev/null
+++ b/packages/editor-ui/src/components/MainHeader/WorkflowDetails.spec.ts
@@ -0,0 +1,115 @@
+import WorkflowDetails from '@/components/MainHeader/WorkflowDetails.vue';
+import { createComponentRenderer } from '@/__tests__/render';
+import { STORES } from '@/constants';
+import { createTestingPinia } from '@pinia/testing';
+import { fireEvent } from '@testing-library/vue';
+
+vi.mock('vue-router', async () => {
+	const actual = await import('vue-router');
+
+	return {
+		...actual,
+		useRoute: () => ({
+			value: {
+				params: {
+					id: '1',
+				},
+			},
+		}),
+	};
+});
+
+const initialState = {
+	[STORES.SETTINGS]: {
+		settings: {
+			enterprise: {
+				sharing: true,
+			},
+		},
+		areTagsEnabled: true,
+	},
+	[STORES.TAGS]: {
+		tags: {
+			1: {
+				id: '1',
+				name: 'tag1',
+			},
+			2: {
+				id: '2',
+				name: 'tag2',
+			},
+		},
+	},
+};
+
+const renderComponent = createComponentRenderer(WorkflowDetails, {
+	pinia: createTestingPinia({ initialState }),
+});
+
+describe('WorkflowDetails', () => {
+	it('renders workflow name and tags', async () => {
+		const workflow = {
+			id: '1',
+			name: 'Test Workflow',
+			tags: ['1', '2'],
+		};
+
+		const { getByTestId, getByText } = renderComponent({
+			props: {
+				workflow,
+				readOnly: false,
+			},
+		});
+
+		const workflowName = getByTestId('workflow-name-input');
+		const workflowNameInput = workflowName.querySelector('input');
+
+		expect(workflowNameInput).toHaveValue('Test Workflow');
+		expect(getByText('tag1')).toBeInTheDocument();
+		expect(getByText('tag2')).toBeInTheDocument();
+	});
+
+	it('calls save function on save button click', async () => {
+		const onSaveButtonClick = vi.fn();
+		const { getByTestId } = renderComponent({
+			props: {
+				workflow: {
+					id: '1',
+					name: 'Test Workflow',
+					tags: [],
+				},
+				readOnly: false,
+			},
+			global: {
+				mocks: {
+					onSaveButtonClick,
+				},
+			},
+		});
+
+		await fireEvent.click(getByTestId('workflow-save-button'));
+		expect(onSaveButtonClick).toHaveBeenCalled();
+	});
+
+	it('opens share modal on share button click', async () => {
+		const onShareButtonClick = vi.fn();
+		const { getByTestId } = renderComponent({
+			props: {
+				workflow: {
+					id: '1',
+					name: 'Test Workflow',
+					tags: [],
+				},
+				readOnly: false,
+			},
+			global: {
+				mocks: {
+					onShareButtonClick,
+				},
+			},
+		});
+
+		await fireEvent.click(getByTestId('workflow-share-button'));
+		expect(onShareButtonClick).toHaveBeenCalled();
+	});
+});
diff --git a/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue b/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
index 59620e1d4c3b9..f433a077baa4a 100644
--- a/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
+++ b/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
@@ -1,135 +1,11 @@
-<template>
-	<div class="container" v-if="workflowName">
-		<BreakpointsObserver :valueXS="15" :valueSM="25" :valueMD="50" class="name-container">
-			<template #default="{ value }">
-				<ShortenName
-					:name="workflowName"
-					:limit="value"
-					:custom="true"
-					testId="workflow-name-input"
-				>
-					<template #default="{ shortenedName }">
-						<InlineTextEdit
-							:value="workflowName"
-							:previewValue="shortenedName"
-							:isEditEnabled="isNameEditEnabled"
-							:maxLength="MAX_WORKFLOW_NAME_LENGTH"
-							@toggle="onNameToggle"
-							@submit="onNameSubmit"
-							placeholder="Enter workflow name"
-							class="name"
-						/>
-					</template>
-				</ShortenName>
-			</template>
-		</BreakpointsObserver>
-
-		<span v-if="settingsStore.areTagsEnabled" class="tags" data-test-id="workflow-tags-container">
-			<div v-if="isTagsEditEnabled">
-				<TagsDropdown
-					:createEnabled="true"
-					:currentTagIds="appliedTagIds"
-					:eventBus="tagsEditBus"
-					@blur="onTagsBlur"
-					@update="onTagsUpdate"
-					@esc="onTagsEditEsc"
-					:placeholder="$locale.baseText('workflowDetails.chooseOrCreateATag')"
-					ref="dropdown"
-					class="tags-edit"
-					data-test-id="workflow-tags-dropdown"
-				/>
-			</div>
-			<div v-else-if="currentWorkflowTagIds.length === 0">
-				<span class="add-tag clickable" data-test-id="new-tag-link" @click="onTagsEditEnable">
-					+ {{ $locale.baseText('workflowDetails.addTag') }}
-				</span>
-			</div>
-			<TagsContainer
-				v-else
-				:tagIds="currentWorkflowTagIds"
-				:clickable="true"
-				:responsive="true"
-				:key="currentWorkflowId"
-				@click="onTagsEditEnable"
-				data-test-id="workflow-tags"
-			/>
-		</span>
-		<span v-else class="tags"></span>
-
-		<PushConnectionTracker class="actions">
-			<template>
-				<span class="activator">
-					<WorkflowActivator :workflow-active="isWorkflowActive" :workflow-id="currentWorkflowId" />
-				</span>
-				<enterprise-edition :features="[EnterpriseEditionFeature.Sharing]">
-					<n8n-button
-						type="secondary"
-						class="mr-2xs"
-						@click="onShareButtonClick"
-						data-test-id="workflow-share-button"
-					>
-						{{ $locale.baseText('workflowDetails.share') }}
-					</n8n-button>
-					<template #fallback>
-						<n8n-tooltip>
-							<n8n-button type="secondary" :class="['mr-2xs', $style.disabledShareButton]">
-								{{ $locale.baseText('workflowDetails.share') }}
-							</n8n-button>
-							<template #content>
-								<i18n
-									:path="
-										contextBasedTranslationKeys.workflows.sharing.unavailable.description.tooltip
-									"
-									tag="span"
-								>
-									<template #action>
-										<a @click="goToUpgrade">
-											{{
-												$locale.baseText(
-													contextBasedTranslationKeys.workflows.sharing.unavailable.button,
-												)
-											}}
-										</a>
-									</template>
-								</i18n>
-							</template>
-						</n8n-tooltip>
-					</template>
-				</enterprise-edition>
-				<SaveButton
-					type="primary"
-					:saved="!this.isDirty && !this.isNewWorkflow"
-					:disabled="isWorkflowSaving"
-					data-test-id="workflow-save-button"
-					@click="onSaveButtonClick"
-				/>
-				<div :class="$style.workflowMenuContainer">
-					<input
-						:class="$style.hiddenInput"
-						type="file"
-						ref="importFile"
-						data-test-id="workflow-import-input"
-						@change="handleFileImport()"
-					/>
-					<n8n-action-dropdown
-						:items="workflowMenuItems"
-						data-test-id="workflow-menu"
-						@select="onWorkflowMenuSelect"
-					/>
-				</div>
-			</template>
-		</PushConnectionTracker>
-	</div>
-</template>
-
-<script lang="ts">
-import Vue from 'vue';
-import mixins from 'vue-typed-mixins';
+<script lang="ts" setup>
 import {
 	DUPLICATE_MODAL_KEY,
 	EnterpriseEditionFeature,
 	MAX_WORKFLOW_NAME_LENGTH,
+	MODAL_CONFIRM,
 	PLACEHOLDER_EMPTY_WORKFLOW_ID,
+	SOURCE_CONTROL_PUSH_MODAL_KEY,
 	VIEWS,
 	WORKFLOW_MENU_ACTIONS,
 	WORKFLOW_SETTINGS_MODAL_KEY,
@@ -140,27 +16,78 @@ import ShortenName from '@/components/ShortenName.vue';
 import TagsContainer from '@/components/TagsContainer.vue';
 import PushConnectionTracker from '@/components/PushConnectionTracker.vue';
 import WorkflowActivator from '@/components/WorkflowActivator.vue';
-import { workflowHelpers } from '@/mixins/workflowHelpers';
 import SaveButton from '@/components/SaveButton.vue';
 import TagsDropdown from '@/components/TagsDropdown.vue';
 import InlineTextEdit from '@/components/InlineTextEdit.vue';
 import BreakpointsObserver from '@/components/BreakpointsObserver.vue';
-import type { IUser, IWorkflowDataUpdate, IWorkflowDb, IWorkflowToShare } from '@/Interface';
+import CollaborationPane from '@/components/MainHeader/CollaborationPane.vue';
+
+import { useRootStore } from '@/stores/n8nRoot.store';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useSourceControlStore } from '@/stores/sourceControl.store';
+import { useTagsStore } from '@/stores/tags.store';
+import { useUIStore } from '@/stores/ui.store';
+import { useUsersStore } from '@/stores/users.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
 
 import { saveAs } from 'file-saver';
 import { useTitleChange } from '@/composables/useTitleChange';
-import type { MessageBoxInputData } from 'element-ui/types/message-box';
-import { mapStores } from 'pinia';
-import { useUIStore } from '@/stores/ui';
-import { useSettingsStore } from '@/stores/settings';
-import { useWorkflowsStore } from '@/stores/workflows';
-import { useRootStore } from '@/stores/n8nRootStore';
-import { useTagsStore } from '@/stores/tags';
-import type { IPermissions } from '@/permissions';
+import { useMessage } from '@/composables/useMessage';
+import { useToast } from '@/composables/useToast';
+
 import { getWorkflowPermissions } from '@/permissions';
-import { useUsersStore } from '@/stores/users';
-import { useUsageStore } from '@/stores/usage';
-import { createEventBus } from '@/event-bus';
+import { createEventBus } from 'n8n-design-system/utils';
+import { nodeViewEventBus } from '@/event-bus';
+import { hasPermission } from '@/rbac/permissions';
+import { useCanvasStore } from '@/stores/canvas.store';
+import { useRoute, useRouter } from 'vue-router';
+import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
+import { computed, ref, useCssModule, watch } from 'vue';
+import type {
+	ActionDropdownItem,
+	IWorkflowDataUpdate,
+	IWorkflowDb,
+	IWorkflowToShare,
+} from '@/Interface';
+import { useI18n } from '@/composables/useI18n';
+import { useTelemetry } from '@/composables/useTelemetry';
+import type { MessageBoxInputData } from 'element-plus';
+import type { BaseTextKey } from '../../plugins/i18n';
+
+const props = defineProps<{
+	workflow: IWorkflowDb;
+	readOnly?: boolean;
+}>();
+
+const $style = useCssModule();
+
+const rootStore = useRootStore();
+const canvasStore = useCanvasStore();
+const settingsStore = useSettingsStore();
+const sourceControlStore = useSourceControlStore();
+const tagsStore = useTagsStore();
+const uiStore = useUIStore();
+const usersStore = useUsersStore();
+const workflowsStore = useWorkflowsStore();
+
+const router = useRouter();
+const route = useRoute();
+
+const locale = useI18n();
+const telemetry = useTelemetry();
+const message = useMessage();
+const toast = useToast();
+const titleChange = useTitleChange();
+const workflowHelpers = useWorkflowHelpers({ router });
+
+const isTagsEditEnabled = ref(false);
+const isNameEditEnabled = ref(false);
+const appliedTagIds = ref<string[]>([]);
+const tagsSaving = ref(false);
+const importFileRef = ref<HTMLInputElement | undefined>();
+
+const tagsEventBus = createEventBus();
+const sourceControlModalEventBus = createEventBus();
 
 const hasChanged = (prev: string[], curr: string[]) => {
 	if (prev.length !== curr.length) {
@@ -168,428 +95,572 @@ const hasChanged = (prev: string[], curr: string[]) => {
 	}
 
 	const set = new Set(prev);
-	return curr.reduce((accu, val) => accu || !set.has(val), false);
+	return curr.reduce((acc, val) => acc || !set.has(val), false);
 };
 
-export default mixins(workflowHelpers).extend({
-	name: 'WorkflowDetails',
-	components: {
-		TagsContainer,
-		PushConnectionTracker,
-		ShortenName,
-		WorkflowActivator,
-		SaveButton,
-		TagsDropdown,
-		InlineTextEdit,
-		BreakpointsObserver,
-	},
-	setup() {
-		return {
-			...useTitleChange(),
-		};
-	},
-	data() {
-		return {
-			isTagsEditEnabled: false,
-			isNameEditEnabled: false,
-			appliedTagIds: [],
-			tagsEditBus: createEventBus(),
-			MAX_WORKFLOW_NAME_LENGTH,
-			tagsSaving: false,
-			EnterpriseEditionFeature,
-			saveReminderTimeout: '',
-		};
-	},
-	computed: {
-		...mapStores(
-			useTagsStore,
-			useRootStore,
-			useSettingsStore,
-			useUIStore,
-			useUsageStore,
-			useWorkflowsStore,
-			useUsersStore,
-		),
-		currentUser(): IUser | null {
-			return this.usersStore.currentUser;
-		},
-		contextBasedTranslationKeys(): NestedRecord<string> {
-			return this.uiStore.contextBasedTranslationKeys;
-		},
-		isWorkflowActive(): boolean {
-			return this.workflowsStore.isWorkflowActive;
-		},
-		workflowName(): string {
-			return this.workflowsStore.workflowName;
-		},
-		isDirty(): boolean {
-			return this.uiStore.stateIsDirty;
-		},
-		currentWorkflowTagIds(): string[] {
-			return this.workflowsStore.workflowTags;
-		},
-		isNewWorkflow(): boolean {
-			return (
-				!this.currentWorkflowId ||
-				this.currentWorkflowId === PLACEHOLDER_EMPTY_WORKFLOW_ID ||
-				this.currentWorkflowId === 'new'
-			);
-		},
-		isWorkflowSaving(): boolean {
-			return this.uiStore.isActionActive('workflowSaving');
-		},
-		workflow(): IWorkflowDb {
-			return this.workflowsStore.workflow;
-		},
-		currentWorkflowId(): string {
-			return this.workflowsStore.workflowId;
-		},
-		onWorkflowPage(): boolean {
-			return (
-				this.$route.meta &&
-				(this.$route.meta.nodeView || this.$route.meta.keepWorkflowAlive === true)
-			);
-		},
-		onExecutionsTab(): boolean {
-			return [
-				VIEWS.EXECUTION_HOME.toString(),
-				VIEWS.WORKFLOW_EXECUTIONS.toString(),
-				VIEWS.EXECUTION_PREVIEW,
-			].includes(this.$route.name || '');
-		},
-		workflowPermissions(): IPermissions {
-			return getWorkflowPermissions(this.usersStore.currentUser, this.workflow);
+const isNewWorkflow = computed(() => {
+	return (
+		!props.workflow.id ||
+		props.workflow.id === PLACEHOLDER_EMPTY_WORKFLOW_ID ||
+		props.workflow.id === 'new'
+	);
+});
+
+const isWorkflowSaving = computed(() => {
+	return uiStore.isActionActive('workflowSaving');
+});
+
+const onWorkflowPage = computed(() => {
+	return route.meta && (route.meta.nodeView || route.meta.keepWorkflowAlive === true);
+});
+
+const onExecutionsTab = computed(() => {
+	return [
+		VIEWS.EXECUTION_HOME.toString(),
+		VIEWS.WORKFLOW_EXECUTIONS.toString(),
+		VIEWS.EXECUTION_PREVIEW,
+	].includes((route.name as string) || '');
+});
+
+const workflowPermissions = computed(() => {
+	return getWorkflowPermissions(usersStore.currentUser, props.workflow);
+});
+
+const workflowMenuItems = computed<ActionDropdownItem[]>(() => {
+	const actions: ActionDropdownItem[] = [
+		{
+			id: WORKFLOW_MENU_ACTIONS.DOWNLOAD,
+			label: locale.baseText('menuActions.download'),
+			disabled: !onWorkflowPage.value,
 		},
-		workflowMenuItems(): Array<{}> {
-			return [
-				{
-					id: WORKFLOW_MENU_ACTIONS.DUPLICATE,
-					label: this.$locale.baseText('menuActions.duplicate'),
-					disabled: !this.onWorkflowPage || !this.currentWorkflowId,
-				},
-				{
-					id: WORKFLOW_MENU_ACTIONS.DOWNLOAD,
-					label: this.$locale.baseText('menuActions.download'),
-					disabled: !this.onWorkflowPage,
-				},
-				{
-					id: WORKFLOW_MENU_ACTIONS.IMPORT_FROM_URL,
-					label: this.$locale.baseText('menuActions.importFromUrl'),
-					disabled: !this.onWorkflowPage || this.onExecutionsTab,
-				},
-				{
-					id: WORKFLOW_MENU_ACTIONS.IMPORT_FROM_FILE,
-					label: this.$locale.baseText('menuActions.importFromFile'),
-					disabled: !this.onWorkflowPage || this.onExecutionsTab,
-				},
-				{
-					id: WORKFLOW_MENU_ACTIONS.SETTINGS,
-					label: this.$locale.baseText('generic.settings'),
-					disabled: !this.onWorkflowPage || this.isNewWorkflow,
-				},
-				...(this.workflowPermissions.delete
-					? [
-							{
-								id: WORKFLOW_MENU_ACTIONS.DELETE,
-								label: this.$locale.baseText('menuActions.delete'),
-								disabled: !this.onWorkflowPage || this.isNewWorkflow,
-								customClass: this.$style.deleteItem,
-								divided: true,
-							},
-					  ]
-					: []),
-			];
+	];
+
+	if (!props.readOnly) {
+		actions.unshift({
+			id: WORKFLOW_MENU_ACTIONS.DUPLICATE,
+			label: locale.baseText('menuActions.duplicate'),
+			disabled: !onWorkflowPage.value || !props.workflow.id,
+		});
+
+		actions.push(
+			{
+				id: WORKFLOW_MENU_ACTIONS.IMPORT_FROM_URL,
+				label: locale.baseText('menuActions.importFromUrl'),
+				disabled: !onWorkflowPage.value || onExecutionsTab.value,
+			},
+			{
+				id: WORKFLOW_MENU_ACTIONS.IMPORT_FROM_FILE,
+				label: locale.baseText('menuActions.importFromFile'),
+				disabled: !onWorkflowPage.value || onExecutionsTab.value,
+			},
+		);
+	}
+
+	if (hasPermission(['rbac'], { rbac: { scope: 'sourceControl:push' } })) {
+		actions.push({
+			id: WORKFLOW_MENU_ACTIONS.PUSH,
+			label: locale.baseText('menuActions.push'),
+			disabled:
+				!sourceControlStore.isEnterpriseSourceControlEnabled ||
+				!onWorkflowPage.value ||
+				onExecutionsTab.value ||
+				sourceControlStore.preferences.branchReadOnly,
+		});
+	}
+
+	actions.push({
+		id: WORKFLOW_MENU_ACTIONS.SETTINGS,
+		label: locale.baseText('generic.settings'),
+		disabled: !onWorkflowPage.value || isNewWorkflow.value,
+	});
+
+	if (workflowPermissions.value.delete && !props.readOnly) {
+		actions.push({
+			id: WORKFLOW_MENU_ACTIONS.DELETE,
+			label: locale.baseText('menuActions.delete'),
+			disabled: !onWorkflowPage.value || isNewWorkflow.value,
+			customClass: $style.deleteItem,
+			divided: true,
+		});
+	}
+
+	return actions;
+});
+
+const isWorkflowHistoryFeatureEnabled = computed(() => {
+	return settingsStore.isEnterpriseFeatureEnabled(EnterpriseEditionFeature.WorkflowHistory);
+});
+
+const workflowHistoryRoute = computed<{ name: string; params: { workflowId: string } }>(() => {
+	return {
+		name: VIEWS.WORKFLOW_HISTORY,
+		params: {
+			workflowId: props.workflow.id,
 		},
-	},
-	mounted() {
-		const runSaveReminderTimeout = () => {
-			if (this.$data.saveReminderTimeout) clearTimeout(this.$data.saveReminderTimeout);
-			this.$data.saveReminderTimeout = setTimeout(async () => {
-				await this.confirmModal(
-					'If you dont save, you might lose your changes if the browser or system crashes',
-					'Save changes',
-					'warning',
-					'Save',
-					'Cancel',
-					true,
-					{
-						showCancelButton: false,
-						beforeClose: async (action, _nouse, done) => {
-							if (action !== 'confirm') {
-								return done();
-							}
-							let currentId = undefined;
-							if (this.currentWorkflowId !== PLACEHOLDER_EMPTY_WORKFLOW_ID) {
-								currentId = this.currentWorkflowId;
-							} else if (this.$route.params.name && this.$route.params.name !== 'new') {
-								currentId = this.$route.params.name;
-							}
-							const saved = await this.saveCurrentWorkflow({
-								id: currentId,
-								name: this.workflowName,
-								tags: this.currentWorkflowTagIds,
-							});
-							if (saved) {
-								await this.settingsStore.fetchPromptsData();
-								done();
-							}
-						},
-					},
-				);
+	};
+});
 
-				return runSaveReminderTimeout();
-			}, Number(process.env.VUE_APP_SAVE_DIALOG_PERIOD_MINUTES || 20) * 60 * 1000);
-		};
-		runSaveReminderTimeout();
-	},
-	beforeDestroy() {
-		if (this.$data.saveReminderTimeout) {
-			clearTimeout(this.$data.saveReminderTimeout);
-		}
+const isWorkflowHistoryButtonDisabled = computed(() => {
+	return isNewWorkflow.value;
+});
+
+watch(
+	() => props.workflow.id,
+	() => {
+		isTagsEditEnabled.value = false;
+		isNameEditEnabled.value = false;
 	},
-	methods: {
-		async onSaveButtonClick() {
-			let currentId = undefined;
-			if (this.currentWorkflowId !== PLACEHOLDER_EMPTY_WORKFLOW_ID) {
-				currentId = this.currentWorkflowId;
-			} else if (this.$route.params.name && this.$route.params.name !== 'new') {
-				currentId = this.$route.params.name;
-			}
-			const saved = await this.saveCurrentWorkflow({
-				id: currentId,
-				name: this.workflowName,
-				tags: this.currentWorkflowTagIds,
-			});
-			if (saved) await this.settingsStore.fetchPromptsData();
-		},
-		onShareButtonClick() {
-			this.uiStore.openModalWithData({
-				name: WORKFLOW_SHARE_MODAL_KEY,
-				data: { id: this.currentWorkflowId },
-			});
+);
 
-			this.$telemetry.track('User opened sharing modal', {
-				workflow_id: this.currentWorkflowId,
-				user_id_sharer: this.currentUser?.id,
-				sub_view: this.$route.name === VIEWS.WORKFLOWS ? 'Workflows listing' : 'Workflow editor',
+async function onSaveButtonClick() {
+	// If the workflow is saving, do not allow another save
+	if (isWorkflowSaving.value) {
+		return;
+	}
+
+	let id: string | undefined = undefined;
+	if (props.workflow.id !== PLACEHOLDER_EMPTY_WORKFLOW_ID) {
+		id = props.workflow.id;
+	} else if (route.params.name && route.params.name !== 'new') {
+		id = route.params.name as string;
+	}
+
+	const name = props.workflow.name;
+	const tags = props.workflow.tags as string[];
+
+	const saved = await workflowHelpers.saveCurrentWorkflow({
+		id,
+		name,
+		tags,
+	});
+
+	if (saved) {
+		await settingsStore.fetchPromptsData();
+
+		if (route.name === VIEWS.EXECUTION_DEBUG) {
+			await router.replace({
+				name: VIEWS.WORKFLOW,
+				params: { name: props.workflow.id },
 			});
-		},
-		onTagsEditEnable() {
-			this.$data.appliedTagIds = this.currentWorkflowTagIds;
-			this.$data.isTagsEditEnabled = true;
-
-			setTimeout(() => {
-				// allow name update to occur before disabling name edit
-				this.$data.isNameEditEnabled = false;
-				this.$data.tagsEditBus.emit('focus');
-			}, 0);
-		},
-		async onTagsUpdate(tags: string[]) {
-			this.$data.appliedTagIds = tags;
-		},
+		}
+	}
+}
 
-		async onTagsBlur() {
-			const current = this.currentWorkflowTagIds;
-			const tags = this.$data.appliedTagIds;
-			if (!hasChanged(current, tags)) {
-				this.$data.isTagsEditEnabled = false;
+function onShareButtonClick() {
+	uiStore.openModalWithData({
+		name: WORKFLOW_SHARE_MODAL_KEY,
+		data: { id: props.workflow.id },
+	});
+
+	telemetry.track('User opened sharing modal', {
+		workflow_id: props.workflow.id,
+		user_id_sharer: usersStore.currentUser?.id,
+		sub_view: route.name === VIEWS.WORKFLOWS ? 'Workflows listing' : 'Workflow editor',
+	});
+}
 
+function onTagsEditEnable() {
+	appliedTagIds.value = (props.workflow.tags ?? []) as string[];
+	isTagsEditEnabled.value = true;
+
+	setTimeout(() => {
+		// allow name update to occur before disabling name edit
+		isNameEditEnabled.value = false;
+		tagsEventBus.emit('focus');
+	}, 0);
+}
+
+async function onTagsBlur() {
+	const current = (props.workflow.tags ?? []) as string[];
+	const tags = appliedTagIds.value;
+	if (!hasChanged(current, tags)) {
+		isTagsEditEnabled.value = false;
+
+		return;
+	}
+	if (tagsSaving.value) {
+		return;
+	}
+	tagsSaving.value = true;
+
+	const saved = await workflowHelpers.saveCurrentWorkflow({ tags });
+	telemetry.track('User edited workflow tags', {
+		workflow_id: props.workflow.id,
+		new_tag_count: tags.length,
+	});
+
+	tagsSaving.value = false;
+	if (saved) {
+		isTagsEditEnabled.value = false;
+	}
+}
+
+function onTagsEditEsc() {
+	isTagsEditEnabled.value = false;
+}
+
+function onNameToggle() {
+	isNameEditEnabled.value = !isNameEditEnabled.value;
+	if (isNameEditEnabled.value) {
+		if (isTagsEditEnabled.value) {
+			void onTagsBlur();
+		}
+
+		isTagsEditEnabled.value = false;
+	}
+}
+
+async function onNameSubmit({
+	name,
+	onSubmit,
+}: {
+	name: string;
+	onSubmit: (saved: boolean) => void;
+}) {
+	const newName = name.trim();
+	if (!newName) {
+		toast.showMessage({
+			title: locale.baseText('workflowDetails.showMessage.title'),
+			message: locale.baseText('workflowDetails.showMessage.message'),
+			type: 'error',
+		});
+
+		onSubmit(false);
+		return;
+	}
+
+	if (newName === props.workflow.name) {
+		isNameEditEnabled.value = false;
+
+		onSubmit(true);
+		return;
+	}
+
+	uiStore.addActiveAction('workflowSaving');
+	const saved = await workflowHelpers.saveCurrentWorkflow({ name });
+	if (saved) {
+		isNameEditEnabled.value = false;
+	}
+	uiStore.removeActiveAction('workflowSaving');
+	onSubmit(saved);
+}
+
+async function handleFileImport(): Promise<void> {
+	const inputRef = importFileRef.value;
+	if (inputRef?.files && inputRef.files.length !== 0) {
+		const reader = new FileReader();
+		reader.onload = () => {
+			let workflowData: IWorkflowDataUpdate;
+			try {
+				workflowData = JSON.parse(reader.result as string);
+			} catch (error) {
+				toast.showMessage({
+					title: locale.baseText('mainSidebar.showMessage.handleFileImport.title'),
+					message: locale.baseText('mainSidebar.showMessage.handleFileImport.message'),
+					type: 'error',
+				});
 				return;
+			} finally {
+				reader.onload = null;
+				inputRef.value = '';
 			}
-			if (this.$data.tagsSaving) {
-				return;
-			}
-			this.$data.tagsSaving = true;
 
-			const saved = await this.saveCurrentWorkflow({ tags });
-			this.$telemetry.track('User edited workflow tags', {
-				workflow_id: this.currentWorkflowId as string,
-				new_tag_count: tags.length,
+			nodeViewEventBus.emit('importWorkflowData', { data: workflowData });
+		};
+		reader.readAsText(inputRef.files[0]);
+	}
+}
+
+async function onWorkflowMenuSelect(action: string): Promise<void> {
+	switch (action) {
+		case WORKFLOW_MENU_ACTIONS.DUPLICATE: {
+			uiStore.openModalWithData({
+				name: DUPLICATE_MODAL_KEY,
+				data: {
+					id: props.workflow.id,
+					name: props.workflow.name,
+					tags: props.workflow.tags,
+				},
 			});
+			break;
+		}
+		case WORKFLOW_MENU_ACTIONS.DOWNLOAD: {
+			const workflowData = await workflowHelpers.getWorkflowDataToSave();
+			const { tags, ...data } = workflowData;
+			const exportData: IWorkflowToShare = {
+				...data,
+				meta: {
+					...(props.workflow.meta ?? {}),
+					instanceId: rootStore.instanceId,
+				},
+				tags: (tags ?? []).map((tagId) => {
+					const { usageCount, ...tag } = tagsStore.getTagById(tagId);
 
-			this.$data.tagsSaving = false;
-			if (saved) {
-				this.$data.isTagsEditEnabled = false;
-			}
-		},
-		onTagsEditEsc() {
-			this.$data.isTagsEditEnabled = false;
-		},
-		onNameToggle() {
-			this.$data.isNameEditEnabled = !this.$data.isNameEditEnabled;
-			if (this.$data.isNameEditEnabled) {
-				if (this.$data.isTagsEditEnabled) {
-					// @ts-ignore
-					this.onTagsBlur();
+					return tag;
+				}),
+			};
+
+			const blob = new Blob([JSON.stringify(exportData, null, 2)], {
+				type: 'application/json;charset=utf-8',
+			});
+
+			let name = props.workflow.name || 'unsaved_workflow';
+			name = name.replace(/[^a-z0-9]/gi, '_');
+
+			telemetry.track('User exported workflow', { workflow_id: workflowData.id });
+			saveAs(blob, name + '.json');
+			break;
+		}
+		case WORKFLOW_MENU_ACTIONS.IMPORT_FROM_URL: {
+			try {
+				const promptResponse = (await message.prompt(
+					locale.baseText('mainSidebar.prompt.workflowUrl') + ':',
+					locale.baseText('mainSidebar.prompt.importWorkflowFromUrl') + ':',
+					{
+						confirmButtonText: locale.baseText('mainSidebar.prompt.import'),
+						cancelButtonText: locale.baseText('mainSidebar.prompt.cancel'),
+						inputErrorMessage: locale.baseText('mainSidebar.prompt.invalidUrl'),
+						inputPattern: /^http[s]?:\/\/.*\.json$/i,
+					},
+				)) as MessageBoxInputData;
+
+				if ((promptResponse as unknown as string) === 'cancel') {
+					return;
 				}
 
-				this.$data.isTagsEditEnabled = false;
-			}
-		},
-		async onNameSubmit(name: string, cb: (saved: boolean) => void) {
-			const newName = name.trim();
-			if (!newName) {
-				this.$showMessage({
-					title: this.$locale.baseText('workflowDetails.showMessage.title'),
-					message: this.$locale.baseText('workflowDetails.showMessage.message'),
-					type: 'error',
-				});
+				nodeViewEventBus.emit('importWorkflowUrl', { url: promptResponse.value });
+			} catch (e) {}
+			break;
+		}
+		case WORKFLOW_MENU_ACTIONS.IMPORT_FROM_FILE: {
+			importFileRef.value?.click();
+			break;
+		}
+		case WORKFLOW_MENU_ACTIONS.PUSH: {
+			canvasStore.startLoading();
+			try {
+				await onSaveButtonClick();
 
-				cb(false);
-				return;
+				const status = await sourceControlStore.getAggregatedStatus();
+
+				uiStore.openModalWithData({
+					name: SOURCE_CONTROL_PUSH_MODAL_KEY,
+					data: { eventBus: sourceControlModalEventBus, status },
+				});
+			} catch (error) {
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+				switch (error.message) {
+					case 'source_control_not_connected':
+						toast.showError(
+							{ ...error, message: '' },
+							locale.baseText('settings.sourceControl.error.not.connected.title'),
+							locale.baseText('settings.sourceControl.error.not.connected.message'),
+						);
+						break;
+					default:
+						toast.showError(error, locale.baseText('error'));
+				}
+			} finally {
+				canvasStore.stopLoading();
 			}
 
-			if (newName === this.workflowName) {
-				this.$data.isNameEditEnabled = false;
+			break;
+		}
+		case WORKFLOW_MENU_ACTIONS.SETTINGS: {
+			uiStore.openModal(WORKFLOW_SETTINGS_MODAL_KEY);
+			break;
+		}
+		case WORKFLOW_MENU_ACTIONS.DELETE: {
+			const deleteConfirmed = await message.confirm(
+				locale.baseText('mainSidebar.confirmMessage.workflowDelete.message', {
+					interpolate: { workflowName: props.workflow.name },
+				}),
+				locale.baseText('mainSidebar.confirmMessage.workflowDelete.headline'),
+				{
+					type: 'warning',
+					confirmButtonText: locale.baseText(
+						'mainSidebar.confirmMessage.workflowDelete.confirmButtonText',
+					),
+					cancelButtonText: locale.baseText(
+						'mainSidebar.confirmMessage.workflowDelete.cancelButtonText',
+					),
+				},
+			);
 
-				cb(true);
+			if (deleteConfirmed !== MODAL_CONFIRM) {
 				return;
 			}
 
-			const saved = await this.saveCurrentWorkflow({ name });
-			if (saved) {
-				this.$data.isNameEditEnabled = false;
+			try {
+				await workflowsStore.deleteWorkflow(props.workflow.id);
+			} catch (error) {
+				toast.showError(error, locale.baseText('generic.deleteWorkflowError'));
+				return;
 			}
-			cb(saved);
-		},
-		async handleFileImport(): Promise<void> {
-			const reader = new FileReader();
-			reader.onload = (event: ProgressEvent) => {
-				const data = (event.target as FileReader).result;
-
-				let workflowData: IWorkflowDataUpdate;
-				try {
-					workflowData = JSON.parse(data as string);
-				} catch (error) {
-					this.$showMessage({
-						title: this.$locale.baseText('mainSidebar.showMessage.handleFileImport.title'),
-						message: this.$locale.baseText('mainSidebar.showMessage.handleFileImport.message'),
-						type: 'error',
-					});
-					return;
-				}
+			uiStore.stateIsDirty = false;
+			// Reset tab title since workflow is deleted.
+			titleChange.titleReset();
+			toast.showMessage({
+				title: locale.baseText('mainSidebar.showMessage.handleSelect1.title'),
+				type: 'success',
+			});
 
-				this.$root.$emit('importWorkflowData', { data: workflowData });
-			};
+			await router.push({ name: VIEWS.NEW_WORKFLOW });
+			break;
+		}
+		default:
+			break;
+	}
+}
 
-			const inputRef = this.$refs.importFile as HTMLInputElement | undefined;
-			if (inputRef?.files && inputRef.files.length !== 0) {
-				reader.readAsText(inputRef.files[0]);
-			}
-		},
-		async onWorkflowMenuSelect(action: string): Promise<void> {
-			switch (action) {
-				case WORKFLOW_MENU_ACTIONS.DUPLICATE: {
-					this.uiStore.openModalWithData({
-						name: DUPLICATE_MODAL_KEY,
-						data: {
-							id: this.workflowsStore.workflowId,
-							name: this.workflowsStore.workflowName,
-							tags: this.workflowsStore.workflowTags,
-						},
-					});
-					break;
-				}
-				case WORKFLOW_MENU_ACTIONS.DOWNLOAD: {
-					const workflowData = await this.getWorkflowDataToSave();
-					const { tags, ...data } = workflowData;
-					const exportData: IWorkflowToShare = {
-						...data,
-						meta: {
-							instanceId: this.rootStore.instanceId,
-						},
-						tags: (tags || []).map((tagId) => {
-							const { usageCount, ...tag } = this.tagsStore.getTagById(tagId);
-
-							return tag;
-						}),
-					};
-
-					const blob = new Blob([JSON.stringify(exportData, null, 2)], {
-						type: 'application/json;charset=utf-8',
-					});
-
-					let workflowName = this.workflowName || 'unsaved_workflow';
-					workflowName = workflowName.replace(/[^a-z0-9]/gi, '_');
-
-					this.$telemetry.track('User exported workflow', { workflow_id: workflowData.id });
-					saveAs(blob, workflowName + '.json');
-					break;
-				}
-				case WORKFLOW_MENU_ACTIONS.IMPORT_FROM_URL: {
-					try {
-						const promptResponse = (await this.$prompt(
-							this.$locale.baseText('mainSidebar.prompt.workflowUrl') + ':',
-							this.$locale.baseText('mainSidebar.prompt.importWorkflowFromUrl') + ':',
-							{
-								confirmButtonText: this.$locale.baseText('mainSidebar.prompt.import'),
-								cancelButtonText: this.$locale.baseText('mainSidebar.prompt.cancel'),
-								inputErrorMessage: this.$locale.baseText('mainSidebar.prompt.invalidUrl'),
-								inputPattern: /^http[s]?:\/\/.*\.json$/i,
-							},
-						)) as MessageBoxInputData;
-
-						this.$root.$emit('importWorkflowUrl', { url: promptResponse.value });
-					} catch (e) {}
-					break;
-				}
-				case WORKFLOW_MENU_ACTIONS.IMPORT_FROM_FILE: {
-					(this.$refs.importFile as HTMLInputElement).click();
-					break;
-				}
-				case WORKFLOW_MENU_ACTIONS.SETTINGS: {
-					this.uiStore.openModal(WORKFLOW_SETTINGS_MODAL_KEY);
-					break;
-				}
-				case WORKFLOW_MENU_ACTIONS.DELETE: {
-					const deleteConfirmed = await this.confirmMessage(
-						this.$locale.baseText('mainSidebar.confirmMessage.workflowDelete.message', {
-							interpolate: { workflowName: this.workflowName },
-						}),
-						this.$locale.baseText('mainSidebar.confirmMessage.workflowDelete.headline'),
-						'warning',
-						this.$locale.baseText('mainSidebar.confirmMessage.workflowDelete.confirmButtonText'),
-						this.$locale.baseText('mainSidebar.confirmMessage.workflowDelete.cancelButtonText'),
-					);
-
-					if (deleteConfirmed === false) {
-						return;
-					}
-
-					try {
-						await this.workflowsStore.deleteWorkflow(this.currentWorkflowId);
-					} catch (error) {
-						this.$showError(error, this.$locale.baseText('generic.deleteWorkflowError'));
-						return;
-					}
-					this.uiStore.stateIsDirty = false;
-					// Reset tab title since workflow is deleted.
-					this.titleReset();
-					this.$showMessage({
-						title: this.$locale.baseText('mainSidebar.showMessage.handleSelect1.title'),
-						type: 'success',
-					});
-
-					this.$router.push({ name: VIEWS.NEW_WORKFLOW });
-					break;
-				}
-				default:
-					break;
-			}
-		},
-		goToUpgrade() {
-			this.uiStore.goToUpgrade('workflow_sharing', 'upgrade-workflow-sharing');
-		},
-	},
-	watch: {
-		currentWorkflowId() {
-			this.$data.isTagsEditEnabled = false;
-			this.$data.isNameEditEnabled = false;
-		},
-	},
-});
+function goToUpgrade() {
+	void uiStore.goToUpgrade('workflow_sharing', 'upgrade-workflow-sharing');
+}
 </script>
 
+<template>
+	<div class="container">
+		<BreakpointsObserver :value-x-s="15" :value-s-m="25" :value-m-d="50" class="name-container">
+			<template #default="{ value }">
+				<ShortenName
+					:name="workflow.name"
+					:limit="value"
+					:custom="true"
+					test-id="workflow-name-input"
+				>
+					<template #default="{ shortenedName }">
+						<InlineTextEdit
+							:model-value="workflow.name"
+							:preview-value="shortenedName"
+							:is-edit-enabled="isNameEditEnabled"
+							:max-length="MAX_WORKFLOW_NAME_LENGTH"
+							:disabled="readOnly"
+							placeholder="Enter workflow name"
+							class="name"
+							@toggle="onNameToggle"
+							@submit="onNameSubmit"
+						/>
+					</template>
+				</ShortenName>
+			</template>
+		</BreakpointsObserver>
+
+		<span v-if="settingsStore.areTagsEnabled" class="tags" data-test-id="workflow-tags-container">
+			<TagsDropdown
+				v-if="isTagsEditEnabled && !readOnly"
+				ref="dropdown"
+				v-model="appliedTagIds"
+				:create-enabled="true"
+				:event-bus="tagsEventBus"
+				:placeholder="$locale.baseText('workflowDetails.chooseOrCreateATag')"
+				class="tags-edit"
+				data-test-id="workflow-tags-dropdown"
+				@blur="onTagsBlur"
+				@esc="onTagsEditEsc"
+			/>
+			<div v-else-if="(workflow.tags ?? []).length === 0 && !readOnly">
+				<span class="add-tag clickable" data-test-id="new-tag-link" @click="onTagsEditEnable">
+					+ {{ $locale.baseText('workflowDetails.addTag') }}
+				</span>
+			</div>
+			<TagsContainer
+				v-else
+				:key="workflow.id"
+				:tag-ids="workflow.tags"
+				:clickable="true"
+				:responsive="true"
+				data-test-id="workflow-tags"
+				@click="onTagsEditEnable"
+			/>
+		</span>
+		<span v-else class="tags"></span>
+
+		<PushConnectionTracker class="actions">
+			<span :class="`activator ${$style.group}`">
+				<WorkflowActivator :workflow-active="workflow.active" :workflow-id="workflow.id" />
+			</span>
+			<EnterpriseEdition :features="[EnterpriseEditionFeature.Sharing]">
+				<div :class="$style.group">
+					<CollaborationPane />
+					<N8nButton
+						type="secondary"
+						data-test-id="workflow-share-button"
+						@click="onShareButtonClick"
+					>
+						{{ $locale.baseText('workflowDetails.share') }}
+					</N8nButton>
+				</div>
+				<template #fallback>
+					<N8nTooltip>
+						<N8nButton type="secondary" :class="['mr-2xs', $style.disabledShareButton]">
+							{{ $locale.baseText('workflowDetails.share') }}
+						</N8nButton>
+						<template #content>
+							<i18n-t
+								:keypath="
+									uiStore.contextBasedTranslationKeys.workflows.sharing.unavailable.description
+										.tooltip
+								"
+								tag="span"
+							>
+								<template #action>
+									<a @click="goToUpgrade">
+										{{
+											$locale.baseText(
+												uiStore.contextBasedTranslationKeys.workflows.sharing.unavailable
+													.button as BaseTextKey,
+											)
+										}}
+									</a>
+								</template>
+							</i18n-t>
+						</template>
+					</N8nTooltip>
+				</template>
+			</EnterpriseEdition>
+			<div :class="$style.group">
+				<SaveButton
+					type="primary"
+					:saved="!uiStore.stateIsDirty && !isNewWorkflow"
+					:disabled="isWorkflowSaving || readOnly"
+					with-shortcut
+					:shortcut-tooltip="$locale.baseText('saveWorkflowButton.hint')"
+					data-test-id="workflow-save-button"
+					@click="onSaveButtonClick"
+				/>
+				<RouterLink
+					v-if="isWorkflowHistoryFeatureEnabled"
+					:to="workflowHistoryRoute"
+					:class="$style.workflowHistoryButton"
+				>
+					<N8nIconButton
+						:disabled="isWorkflowHistoryButtonDisabled"
+						data-test-id="workflow-history-button"
+						type="tertiary"
+						icon="history"
+						size="medium"
+						text
+					/>
+				</RouterLink>
+			</div>
+			<div :class="[$style.workflowMenuContainer, $style.group]">
+				<input
+					ref="importFileRef"
+					:class="$style.hiddenInput"
+					type="file"
+					data-test-id="workflow-import-input"
+					@change="handleFileImport()"
+				/>
+				<N8nActionDropdown
+					:items="workflowMenuItems"
+					data-test-id="workflow-menu"
+					@select="onWorkflowMenuSelect"
+				/>
+			</div>
+		</PushConnectionTracker>
+	</div>
+</template>
+
 <style scoped lang="scss">
 $--text-line-height: 24px;
 $--header-spacing: 20px;
@@ -618,7 +689,6 @@ $--header-spacing: 20px;
 	line-height: $--text-line-height;
 	display: flex;
 	align-items: center;
-	margin-right: 30px;
 
 	> span {
 		margin-right: 5px;
@@ -638,26 +708,31 @@ $--header-spacing: 20px;
 }
 
 .tags {
+	display: flex;
+	align-items: center;
+	width: 100%;
 	flex: 1;
 	margin-right: $--header-spacing;
 }
 
 .tags-edit {
 	min-width: 100px;
+	width: 100%;
 	max-width: 460px;
 }
 
 .actions {
 	display: flex;
 	align-items: center;
+	gap: var(--spacing-m);
 }
 </style>
 
 <style module lang="scss">
-.workflowMenuContainer {
-	margin-left: var(--spacing-2xs);
+.group {
+	display: flex;
+	gap: var(--spacing-xs);
 }
-
 .hiddenInput {
 	display: none;
 }
@@ -669,4 +744,21 @@ $--header-spacing: 20px;
 .disabledShareButton {
 	cursor: not-allowed;
 }
+
+.workflowHistoryButton {
+	width: 30px;
+	height: 30px;
+	color: var(--color-text-dark);
+	border-radius: var(--border-radius-base);
+
+	&:hover {
+		background-color: var(--color-background-base);
+	}
+
+	:disabled {
+		background: transparent;
+		border: none;
+		opacity: 0.5;
+	}
+}
 </style>
diff --git a/packages/editor-ui/src/components/MainSidebar.vue b/packages/editor-ui/src/components/MainSidebar.vue
index d3c3cff70179e..27e304fb95d30 100644
--- a/packages/editor-ui/src/components/MainSidebar.vue
+++ b/packages/editor-ui/src/components/MainSidebar.vue
@@ -9,39 +9,49 @@
 	>
 		<div
 			id="collapse-change-button"
-			:class="{
-				['clickable']: true,
-				[$style.sideMenuCollapseButton]: true,
-				[$style.expandedButton]: !isCollapsed,
-			}"
+			:class="['clickable', $style.sideMenuCollapseButton]"
 			@click="toggleCollapse"
-		></div>
+		>
+			<n8n-icon v-if="isCollapsed" icon="chevron-right" size="xsmall" class="ml-5xs" />
+			<n8n-icon v-else icon="chevron-left" size="xsmall" class="mr-5xs" />
+		</div>
 		<n8n-menu :items="mainMenuItems" :collapsed="isCollapsed" @select="handleSelect">
 			<template #header>
 				<div :class="$style.logo">
-					<img
-						:src="basePath + (isCollapsed ? 'n8n-logo-collapsed.svg' : 'n8n-logo-expanded.svg')"
-						:class="$style.icon"
-						alt="n8n"
-					/>
+					<img :src="logoPath" data-test-id="n8n-logo" :class="$style.icon" alt="n8n" />
 				</div>
 			</template>
-			<template #menuSuffix v-if="hasVersionUpdates">
-				<div :class="$style.updates" @click="openUpdatesPanel">
-					<div :class="$style.giftContainer">
-						<GiftNotificationIcon />
-					</div>
-					<n8n-text
-						:class="{ ['ml-xs']: true, [$style.expanded]: fullyExpanded }"
-						color="text-base"
+
+			<template #beforeLowerMenu>
+				<BecomeTemplateCreatorCta v-if="fullyExpanded && !userIsTrialing" />
+				<ExecutionsUsage
+					v-if="fullyExpanded && userIsTrialing"
+					:cloud-plan-data="currentPlanAndUsageData"
+			/></template>
+			<template #menuSuffix>
+				<div>
+					<div
+						v-if="hasVersionUpdates"
+						data-test-id="version-updates-panel-button"
+						:class="$style.updates"
+						@click="openUpdatesPanel"
 					>
-						{{ nextVersions.length > 99 ? '99+' : nextVersions.length }} update{{
-							nextVersions.length > 1 ? 's' : ''
-						}}
-					</n8n-text>
+						<div :class="$style.giftContainer">
+							<GiftNotificationIcon />
+						</div>
+						<n8n-text
+							:class="{ ['ml-xs']: true, [$style.expanded]: fullyExpanded }"
+							color="text-base"
+						>
+							{{ nextVersions.length > 99 ? '99+' : nextVersions.length }} update{{
+								nextVersions.length > 1 ? 's' : ''
+							}}
+						</n8n-text>
+					</div>
+					<MainSidebarSourceControl :is-collapsed="isCollapsed" />
 				</div>
 			</template>
-			<template #footer v-if="showUserArea">
+			<template v-if="showUserArea" #footer>
 				<div :class="$style.userArea">
 					<div class="ml-3xs" data-test-id="main-sidebar-user-menu">
 						<!-- This dropdown is only enabled when sidebar is collapsed -->
@@ -53,8 +63,8 @@
 						>
 							<div :class="{ [$style.avatar]: true, ['clickable']: isCollapsed }">
 								<n8n-avatar
-									:firstName="usersStore.currentUser.firstName"
-									:lastName="usersStore.currentUser.lastName"
+									:first-name="usersStore.currentUser.firstName"
+									:last-name="usersStore.currentUser.lastName"
 									size="small"
 								/>
 							</div>
@@ -81,6 +91,7 @@
 						<n8n-action-dropdown
 							:items="userMenuItems"
 							placement="top-start"
+							data-test-id="user-menu"
 							@select="onUserActionToggle"
 						/>
 					</div>
@@ -91,46 +102,52 @@
 </template>
 
 <script lang="ts">
-import type { IExecutionResponse, IMenuItem, IVersion } from '../Interface';
-
+import type { CloudPlanAndUsageData, IExecutionResponse, IMenuItem, IVersion } from '@/Interface';
 import GiftNotificationIcon from './GiftNotificationIcon.vue';
-import WorkflowSettings from '@/components/WorkflowSettings.vue';
-
-import { genericHelpers } from '@/mixins/genericHelpers';
-import { showMessage } from '@/mixins/showMessage';
-import { workflowHelpers } from '@/mixins/workflowHelpers';
-import { workflowRun } from '@/mixins/workflowRun';
 
-import mixins from 'vue-typed-mixins';
+import { useMessage } from '@/composables/useMessage';
 import { ABOUT_MODAL_KEY, VERSIONS_MODAL_KEY, VIEWS } from '@/constants';
 import { userHelpers } from '@/mixins/userHelpers';
-import { debounceHelper } from '@/mixins/debounce';
-import Vue from 'vue';
+import { defineComponent } from 'vue';
 import { mapStores } from 'pinia';
-import { useUIStore } from '@/stores/ui';
-import { useSettingsStore } from '@/stores/settings';
-import { useUsersStore } from '@/stores/users';
-import { useWorkflowsStore } from '@/stores/workflows';
-import { useRootStore } from '@/stores/n8nRootStore';
-import { useVersionsStore } from '@/stores/versions';
-import { isNavigationFailure } from 'vue-router';
+import { useCloudPlanStore } from '@/stores/cloudPlan.store';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useSourceControlStore } from '@/stores/sourceControl.store';
+import { useUIStore } from '@/stores/ui.store';
+import { useUsersStore } from '@/stores/users.store';
+import { useVersionsStore } from '@/stores/versions.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useTemplatesStore } from '@/stores/templates.store';
+import ExecutionsUsage from '@/components/executions/ExecutionsUsage.vue';
+import BecomeTemplateCreatorCta from '@/components/BecomeTemplateCreatorCta/BecomeTemplateCreatorCta.vue';
+import MainSidebarSourceControl from '@/components/MainSidebarSourceControl.vue';
+import { hasPermission } from '@/rbac/permissions';
+import { useExternalHooks } from '@/composables/useExternalHooks';
+import { useDebounce } from '@/composables/useDebounce';
+import { useBecomeTemplateCreatorStore } from '@/components/BecomeTemplateCreatorCta/becomeTemplateCreatorStore';
 
-export default mixins(
-	genericHelpers,
-	showMessage,
-	workflowHelpers,
-	workflowRun,
-	userHelpers,
-	debounceHelper,
-).extend({
+export default defineComponent({
 	name: 'MainSidebar',
 	components: {
 		GiftNotificationIcon,
-		WorkflowSettings,
+		ExecutionsUsage,
+		MainSidebarSourceControl,
+		BecomeTemplateCreatorCta,
+	},
+	mixins: [userHelpers],
+	setup(props, ctx) {
+		const externalHooks = useExternalHooks();
+		const { callDebounced } = useDebounce();
+
+		return {
+			externalHooks,
+			callDebounced,
+			...useMessage(),
+		};
 	},
 	data() {
 		return {
-			// @ts-ignore
 			basePath: '',
 			fullyExpanded: false,
 		};
@@ -143,9 +160,19 @@ export default mixins(
 			useUsersStore,
 			useVersionsStore,
 			useWorkflowsStore,
+			useCloudPlanStore,
+			useSourceControlStore,
+			useBecomeTemplateCreatorStore,
+			useTemplatesStore,
 		),
+		logoPath(): string {
+			return this.basePath + (this.isCollapsed ? 'static/logo/collapsed.svg' : this.uiStore.logo);
+		},
 		hasVersionUpdates(): boolean {
-			return this.versionsStore.hasVersionUpdates;
+			return (
+				this.settingsStore.settings.releaseChannel === 'stable' &&
+				this.versionsStore.hasVersionUpdates
+			);
 		},
 		nextVersions(): IVersion[] {
 			return this.versionsStore.nextVersions;
@@ -158,11 +185,7 @@ export default mixins(
 			return accessibleRoute !== null;
 		},
 		showUserArea(): boolean {
-			return (
-				this.settingsStore.isUserManagementEnabled &&
-				this.usersStore.canUserAccessSidebarUserInfo &&
-				this.usersStore.currentUser !== null
-			);
+			return hasPermission(['authenticated']);
 		},
 		workflowExecution(): IExecutionResponse | null {
 			return this.workflowsStore.getWorkflowExecution;
@@ -181,38 +204,48 @@ export default mixins(
 		},
 		mainMenuItems(): IMenuItem[] {
 			const items: IMenuItem[] = [];
-			const injectedItems = this.uiStore.sidebarMenuItems;
 
-			if (injectedItems && injectedItems.length > 0) {
-				for (const item of injectedItems) {
-					items.push({
-						id: item.id,
-						// @ts-ignore
-						icon: item.properties ? item.properties.icon : '',
-						// @ts-ignore
-						label: item.properties ? item.properties.title : '',
-						position: item.position,
-						type: item.properties?.href ? 'link' : 'regular',
-						properties: item.properties,
-					} as IMenuItem);
-				}
-			}
+			const workflows: IMenuItem = {
+				id: 'workflows',
+				icon: 'network-wired',
+				label: this.$locale.baseText('mainSidebar.workflows'),
+				position: 'top',
+				route: { to: { name: VIEWS.WORKFLOWS } },
+				secondaryIcon: this.sourceControlStore.preferences.branchReadOnly
+					? {
+							name: 'lock',
+							tooltip: {
+								content: this.$locale.baseText('mainSidebar.workflows.readOnlyEnv.tooltip'),
+							},
+						}
+					: undefined,
+			};
 
+			const defaultSettingsRoute = this.findFirstAccessibleSettingsRoute();
 			const regularItems: IMenuItem[] = [
+				workflows,
 				{
-					id: 'workflows',
-					icon: 'network-wired',
-					label: this.$locale.baseText('mainSidebar.workflows'),
+					// Link to in-app templates, available if custom templates are enabled
+					id: 'templates',
+					icon: 'box-open',
+					label: this.$locale.baseText('mainSidebar.templates'),
 					position: 'top',
-					activateOnRouteNames: [VIEWS.WORKFLOWS],
+					available:
+						this.settingsStore.isTemplatesEnabled && this.templatesStore.hasCustomTemplatesHost,
+					route: { to: { name: VIEWS.TEMPLATES } },
 				},
 				{
+					// Link to website templates, available if custom templates are not enabled
 					id: 'templates',
 					icon: 'box-open',
 					label: this.$locale.baseText('mainSidebar.templates'),
 					position: 'top',
-					available: this.settingsStore.isTemplatesEnabled,
-					activateOnRouteNames: [VIEWS.TEMPLATES],
+					available:
+						this.settingsStore.isTemplatesEnabled && !this.templatesStore.hasCustomTemplatesHost,
+					link: {
+						href: this.templatesStore.websiteTemplateRepositoryURL,
+						target: '_blank',
+					},
 				},
 				{
 					id: 'credentials',
@@ -220,7 +253,7 @@ export default mixins(
 					label: this.$locale.baseText('mainSidebar.credentials'),
 					customIconSize: 'medium',
 					position: 'top',
-					activateOnRouteNames: [VIEWS.CREDENTIALS],
+					route: { to: { name: VIEWS.CREDENTIALS } },
 				},
 				{
 					id: 'variables',
@@ -228,14 +261,21 @@ export default mixins(
 					label: this.$locale.baseText('mainSidebar.variables'),
 					customIconSize: 'medium',
 					position: 'top',
-					activateOnRouteNames: [VIEWS.VARIABLES],
+					route: { to: { name: VIEWS.VARIABLES } },
 				},
 				{
 					id: 'executions',
 					icon: 'tasks',
 					label: this.$locale.baseText('mainSidebar.executions'),
 					position: 'top',
-					activateOnRouteNames: [VIEWS.EXECUTIONS],
+					route: { to: { name: VIEWS.EXECUTIONS } },
+				},
+				{
+					id: 'cloud-admin',
+					position: 'bottom',
+					label: 'Admin Panel',
+					icon: 'home',
+					available: this.settingsStore.isCloudDeployment && hasPermission(['instanceOwner']),
 				},
 				{
 					id: 'settings',
@@ -244,6 +284,7 @@ export default mixins(
 					position: 'bottom',
 					available: this.canUserAccessSettings && this.usersStore.currentUser !== null,
 					activateOnRouteNames: [VIEWS.USERS_SETTINGS, VIEWS.API_SETTINGS, VIEWS.PERSONAL_SETTINGS],
+					route: { to: defaultSettingsRoute },
 				},
 				{
 					id: 'help',
@@ -255,40 +296,36 @@ export default mixins(
 							id: 'quickstart',
 							icon: 'video',
 							label: this.$locale.baseText('mainSidebar.helpMenuItems.quickstart'),
-							type: 'link',
-							properties: {
+							link: {
 								href: 'https://www.youtube.com/watch?v=1MwSoB0gnM4',
-								newWindow: true,
+								target: '_blank',
 							},
 						},
 						{
 							id: 'docs',
 							icon: 'book',
 							label: this.$locale.baseText('mainSidebar.helpMenuItems.documentation'),
-							type: 'link',
-							properties: {
-								href: 'https://docs.n8n.io',
-								newWindow: true,
+							link: {
+								href: 'https://docs.n8n.io?utm_source=n8n_app&utm_medium=app_sidebar',
+								target: '_blank',
 							},
 						},
 						{
 							id: 'forum',
 							icon: 'users',
 							label: this.$locale.baseText('mainSidebar.helpMenuItems.forum'),
-							type: 'link',
-							properties: {
-								href: 'https://community.n8n.io',
-								newWindow: true,
+							link: {
+								href: 'https://community.n8n.io?utm_source=n8n_app&utm_medium=app_sidebar',
+								target: '_blank',
 							},
 						},
 						{
 							id: 'examples',
 							icon: 'graduation-cap',
 							label: this.$locale.baseText('mainSidebar.helpMenuItems.course'),
-							type: 'link',
-							properties: {
+							link: {
 								href: 'https://www.youtube.com/watch?v=1MwSoB0gnM4',
-								newWindow: true,
+								target: '_blank',
 							},
 						},
 						{
@@ -302,24 +339,44 @@ export default mixins(
 			];
 			return [...items, ...regularItems];
 		},
+		userIsTrialing(): boolean {
+			return this.cloudPlanStore.userIsTrialing;
+		},
+		currentPlanAndUsageData(): CloudPlanAndUsageData | null {
+			const planData = this.cloudPlanStore.currentPlanData;
+			const usage = this.cloudPlanStore.currentUsageData;
+			if (!planData || !usage) return null;
+			return {
+				...planData,
+				usage,
+			};
+		},
 	},
 	async mounted() {
 		this.basePath = this.rootStore.baseUrl;
 		if (this.$refs.user) {
-			this.$externalHooks().run('mainSidebar.mounted', { userRef: this.$refs.user });
-		}
-		if (window.innerWidth < 900 || this.uiStore.isNodeView) {
-			this.uiStore.sidebarMenuCollapsed = true;
-		} else {
-			this.uiStore.sidebarMenuCollapsed = false;
+			void this.externalHooks.run('mainSidebar.mounted', {
+				userRef: this.$refs.user as Element,
+			});
 		}
-		await Vue.nextTick();
-		this.fullyExpanded = !this.isCollapsed;
+
+		void this.$nextTick(() => {
+			if (window.innerWidth < 900 || this.uiStore.isNodeView) {
+				this.uiStore.sidebarMenuCollapsed = true;
+			} else {
+				this.uiStore.sidebarMenuCollapsed = false;
+			}
+
+			this.fullyExpanded = !this.isCollapsed;
+		});
+
+		this.becomeTemplateCreatorStore.startMonitoringCta();
 	},
 	created() {
 		window.addEventListener('resize', this.onResize);
 	},
-	destroyed() {
+	beforeUnmount() {
+		this.becomeTemplateCreatorStore.stopMonitoringCta();
 		window.removeEventListener('resize', this.onResize);
 	},
 	methods: {
@@ -329,20 +386,26 @@ export default mixins(
 				workflow_id: this.workflowsStore.workflowId,
 			});
 		},
+		trackTemplatesClick() {
+			this.$telemetry.track('User clicked on templates', {
+				role: this.usersStore.currentUserCloudInfo?.role,
+				active_workflow_count: this.workflowsStore.activeWorkflows.length,
+			});
+		},
 		async onUserActionToggle(action: string) {
 			switch (action) {
 				case 'logout':
 					this.onLogout();
 					break;
 				case 'settings':
-					this.$router.push({ name: VIEWS.PERSONAL_SETTINGS });
+					void this.$router.push({ name: VIEWS.PERSONAL_SETTINGS });
 					break;
 				default:
 					break;
 			}
 		},
 		onLogout() {
-			this.$router.push({ name: VIEWS.SIGNOUT });
+			void this.$router.push({ name: VIEWS.SIGNOUT });
 		},
 		toggleCollapse() {
 			this.uiStore.toggleSidebarMenuCollapse();
@@ -360,51 +423,23 @@ export default mixins(
 		},
 		async handleSelect(key: string) {
 			switch (key) {
-				case 'workflows': {
-					if (this.$router.currentRoute.name !== VIEWS.WORKFLOWS) {
-						this.goToRoute({ name: VIEWS.WORKFLOWS });
-					}
-					break;
-				}
-				case 'templates': {
-					if (this.$router.currentRoute.name !== VIEWS.TEMPLATES) {
-						this.goToRoute({ name: VIEWS.TEMPLATES });
-					}
-					break;
-				}
-				case 'credentials': {
-					if (this.$router.currentRoute.name !== VIEWS.CREDENTIALS) {
-						this.goToRoute({ name: VIEWS.CREDENTIALS });
+				case 'templates':
+					if (
+						this.settingsStore.isTemplatesEnabled &&
+						!this.templatesStore.hasCustomTemplatesHost
+					) {
+						this.trackTemplatesClick();
 					}
 					break;
-				}
-				case 'variables': {
-					if (this.$router.currentRoute.name !== VIEWS.VARIABLES) {
-						this.goToRoute({ name: VIEWS.VARIABLES });
-					}
-					break;
-				}
-				case 'executions': {
-					if (this.$router.currentRoute.name !== VIEWS.EXECUTIONS) {
-						this.goToRoute({ name: VIEWS.EXECUTIONS });
-					}
-					break;
-				}
-				case 'settings': {
-					const defaultRoute = this.findFirstAccessibleSettingsRoute();
-					if (defaultRoute) {
-						const routeProps = this.$router.resolve({ name: defaultRoute });
-						if (this.$router.currentRoute.name !== defaultRoute) {
-							this.goToRoute(routeProps.route.path);
-						}
-					}
-					break;
-				}
 				case 'about': {
 					this.trackHelpItemClick('about');
 					this.uiStore.openModal(ABOUT_MODAL_KEY);
 					break;
 				}
+				case 'cloud-admin': {
+					void this.cloudPlanStore.redirectToDashboard();
+					break;
+				}
 				case 'quickstart':
 				case 'docs':
 				case 'forum':
@@ -416,46 +451,36 @@ export default mixins(
 					break;
 			}
 		},
-		goToRoute(route: string | { name: string }) {
-			this.$router.push(route).catch((failure) => {
-				// Catch navigation failures caused by route guards
-				if (!isNavigationFailure(failure)) {
-					console.error(failure);
-				}
-			});
-		},
 		findFirstAccessibleSettingsRoute() {
-			// Get all settings rotes by filtering them by pageCategory property
 			const settingsRoutes = this.$router
 				.getRoutes()
-				.filter(
-					(category) =>
-						category.meta.telemetry && category.meta.telemetry.pageCategory === 'settings',
-				)
-				.map((route) => route.name || '');
-			let defaultSettingsRoute = null;
+				.find((route) => route.path === '/settings')!
+				.children.map((route) => route.name ?? '');
 
+			let defaultSettingsRoute = { name: VIEWS.USERS_SETTINGS };
 			for (const route of settingsRoutes) {
-				if (this.canUserAccessRouteByName(route)) {
-					defaultSettingsRoute = route;
+				if (this.canUserAccessRouteByName(route.toString())) {
+					defaultSettingsRoute = {
+						name: route.toString() as VIEWS,
+					};
 					break;
 				}
 			}
+
 			return defaultSettingsRoute;
 		},
 		onResize(event: UIEvent) {
-			this.callDebounced('onResizeEnd', { debounceTime: 100 }, event);
+			void this.callDebounced(this.onResizeEnd, { debounceTime: 100 }, event);
 		},
-		onResizeEnd(event: UIEvent) {
+		async onResizeEnd(event: UIEvent) {
 			const browserWidth = (event.target as Window).outerWidth;
-			this.checkWidthAndAdjustSidebar(browserWidth);
+			await this.checkWidthAndAdjustSidebar(browserWidth);
 		},
-		checkWidthAndAdjustSidebar(width: number) {
+		async checkWidthAndAdjustSidebar(width: number) {
 			if (width < 900) {
 				this.uiStore.sidebarMenuCollapsed = true;
-				Vue.nextTick(() => {
-					this.fullyExpanded = !this.isCollapsed;
-				});
+				await this.$nextTick();
+				this.fullyExpanded = !this.isCollapsed;
 			}
 		},
 	},
@@ -498,47 +523,25 @@ export default mixins(
 	z-index: 999;
 	display: flex;
 	justify-content: center;
-	align-items: flex-end;
+	align-items: center;
 	color: var(--color-text-base);
 	background-color: var(--color-foreground-xlight);
 	width: 20px;
 	height: 20px;
 	border: var(--border-width-base) var(--border-style-base) var(--color-foreground-base);
-	text-align: center;
 	border-radius: 50%;
 
-	&::before {
-		display: block;
-		position: relative;
-		left: px;
-		top: -2.5px;
-		transform: rotate(270deg);
-		content: '\e6df';
-		font-family: element-icons;
-		font-size: var(--font-size-2xs);
-		font-weight: bold;
-		color: var(--color-text-base);
-	}
-
-	&.expandedButton {
-		&::before {
-			transform: rotate(90deg);
-			left: 0px;
-		}
-	}
-
 	&:hover {
-		&::before {
-			color: var(--color-primary-shade-1);
-		}
+		color: var(--color-primary-shade-1);
 	}
 }
 
 .updates {
 	display: flex;
 	align-items: center;
-	height: 26px;
 	cursor: pointer;
+	padding: var(--spacing-2xs) var(--spacing-l);
+	margin: var(--spacing-2xs) 0 0;
 
 	svg {
 		color: var(--color-text-base) !important;
diff --git a/packages/editor-ui/src/components/MainSidebarSourceControl.vue b/packages/editor-ui/src/components/MainSidebarSourceControl.vue
new file mode 100644
index 0000000000000..b3a4b424d5081
--- /dev/null
+++ b/packages/editor-ui/src/components/MainSidebarSourceControl.vue
@@ -0,0 +1,233 @@
+<script lang="ts" setup>
+import { computed, nextTick, ref } from 'vue';
+import { useRouter } from 'vue-router';
+import { createEventBus } from 'n8n-design-system/utils';
+import { useI18n } from '@/composables/useI18n';
+import { hasPermission } from '@/rbac/permissions';
+import { useToast } from '@/composables/useToast';
+import { useLoadingService } from '@/composables/useLoadingService';
+import { useUIStore } from '@/stores/ui.store';
+import { useSourceControlStore } from '@/stores/sourceControl.store';
+import { SOURCE_CONTROL_PULL_MODAL_KEY, SOURCE_CONTROL_PUSH_MODAL_KEY, VIEWS } from '@/constants';
+import type { SourceControlAggregatedFile } from '../Interface';
+import { sourceControlEventBus } from '@/event-bus/source-control';
+
+const props = defineProps<{
+	isCollapsed: boolean;
+}>();
+
+const responseStatuses = {
+	CONFLICT: 409,
+};
+
+const router = useRouter();
+const loadingService = useLoadingService();
+const uiStore = useUIStore();
+const sourceControlStore = useSourceControlStore();
+const toast = useToast();
+const i18n = useI18n();
+
+const eventBus = createEventBus();
+const tooltipOpenDelay = ref(300);
+
+const currentBranch = computed(() => {
+	return sourceControlStore.preferences.branchName;
+});
+const sourceControlAvailable = computed(
+	() =>
+		sourceControlStore.isEnterpriseSourceControlEnabled &&
+		hasPermission(['rbac'], { rbac: { scope: 'sourceControl:manage' } }),
+);
+
+async function pushWorkfolder() {
+	loadingService.startLoading();
+	loadingService.setLoadingText(i18n.baseText('settings.sourceControl.loading.checkingForChanges'));
+	try {
+		const status = await sourceControlStore.getAggregatedStatus();
+
+		uiStore.openModalWithData({
+			name: SOURCE_CONTROL_PUSH_MODAL_KEY,
+			data: { eventBus, status },
+		});
+	} catch (error) {
+		toast.showError(error, i18n.baseText('error'));
+	} finally {
+		loadingService.stopLoading();
+		loadingService.setLoadingText(i18n.baseText('genericHelpers.loading'));
+	}
+}
+
+async function pullWorkfolder() {
+	loadingService.startLoading();
+	loadingService.setLoadingText(i18n.baseText('settings.sourceControl.loading.pull'));
+
+	try {
+		const status: SourceControlAggregatedFile[] =
+			((await sourceControlStore.pullWorkfolder(
+				false,
+			)) as unknown as SourceControlAggregatedFile[]) || [];
+
+		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'),
+				message: i18n.baseText('settings.sourceControl.pull.upToDate.description'),
+				type: 'success',
+			});
+		} else {
+			toast.showMessage({
+				title: i18n.baseText('settings.sourceControl.pull.success.title'),
+				type: 'success',
+			});
+
+			const incompleteFileTypes = ['variables', 'credential'];
+			const hasVariablesOrCredentials = (status || []).some((file) => {
+				return incompleteFileTypes.includes(file.type);
+			});
+
+			if (hasVariablesOrCredentials) {
+				void nextTick(() => {
+					toast.showMessage({
+						message: i18n.baseText('settings.sourceControl.pull.oneLastStep.description'),
+						title: i18n.baseText('settings.sourceControl.pull.oneLastStep.title'),
+						type: 'info',
+						duration: 0,
+						showClose: true,
+						offset: 0,
+					});
+				});
+			}
+		}
+		sourceControlEventBus.emit('pull');
+	} catch (error) {
+		const errorResponse = error.response;
+
+		if (errorResponse?.status === responseStatuses.CONFLICT) {
+			uiStore.openModalWithData({
+				name: SOURCE_CONTROL_PULL_MODAL_KEY,
+				data: { eventBus, status: errorResponse.data.data },
+			});
+		} else {
+			toast.showError(error, 'Error');
+		}
+	} finally {
+		loadingService.stopLoading();
+		loadingService.setLoadingText(i18n.baseText('genericHelpers.loading'));
+	}
+}
+
+const goToSourceControlSetup = async () => {
+	await router.push({ name: VIEWS.SOURCE_CONTROL });
+};
+</script>
+
+<template>
+	<div
+		v-if="sourceControlAvailable"
+		:class="{
+			[$style.sync]: true,
+			[$style.collapsed]: isCollapsed,
+			[$style.isConnected]: sourceControlStore.isEnterpriseSourceControlEnabled,
+		}"
+		:style="{ borderLeftColor: sourceControlStore.preferences.branchColor }"
+		data-test-id="main-sidebar-source-control"
+	>
+		<div
+			v-if="sourceControlStore.preferences.connected && sourceControlStore.preferences.branchName"
+			:class="$style.connected"
+			data-test-id="main-sidebar-source-control-connected"
+		>
+			<span :class="$style.branchName">
+				<n8n-icon icon="code-branch" />
+				{{ currentBranch }}
+			</span>
+			<div :class="{ 'pt-xs': !isCollapsed }">
+				<n8n-tooltip :disabled="!isCollapsed" :show-after="tooltipOpenDelay" placement="right">
+					<template #content>
+						<div>
+							{{ i18n.baseText('settings.sourceControl.button.pull') }}
+						</div>
+					</template>
+					<n8n-button
+						:class="{
+							'mr-2xs': !isCollapsed,
+							'mb-2xs': isCollapsed && !sourceControlStore.preferences.branchReadOnly,
+						}"
+						icon="arrow-down"
+						type="tertiary"
+						size="mini"
+						:square="isCollapsed"
+						:label="isCollapsed ? '' : i18n.baseText('settings.sourceControl.button.pull')"
+						@click="pullWorkfolder"
+					/>
+				</n8n-tooltip>
+				<n8n-tooltip
+					v-if="!sourceControlStore.preferences.branchReadOnly"
+					:disabled="!isCollapsed"
+					:show-after="tooltipOpenDelay"
+					placement="right"
+				>
+					<template #content>
+						<div>
+							{{ i18n.baseText('settings.sourceControl.button.push') }}
+						</div>
+					</template>
+					<n8n-button
+						:square="isCollapsed"
+						:label="isCollapsed ? '' : i18n.baseText('settings.sourceControl.button.push')"
+						icon="arrow-up"
+						type="tertiary"
+						size="mini"
+						@click="pushWorkfolder"
+					/>
+				</n8n-tooltip>
+			</div>
+		</div>
+	</div>
+</template>
+
+<style lang="scss" module>
+.sync {
+	padding: var(--spacing-s) var(--spacing-s) var(--spacing-s) var(--spacing-l);
+	margin: var(--spacing-2xs) 0 calc(var(--spacing-2xs) * -1);
+	background: var(--color-background-light);
+	border-top: var(--border-width-base) var(--border-style-base) var(--color-foreground-base);
+	font-size: var(--font-size-2xs);
+
+	&.isConnected {
+		padding-left: var(--spacing-m);
+		border-left: var(--spacing-3xs) var(--border-style-base) var(--color-foreground-base);
+
+		&.collapsed {
+			padding-left: var(--spacing-xs);
+		}
+	}
+
+	&:empty {
+		display: none;
+	}
+
+	button {
+		font-size: var(--font-size-3xs);
+	}
+}
+
+.branchName {
+	white-space: normal;
+	line-break: anywhere;
+}
+
+.collapsed {
+	text-align: center;
+	padding-left: var(--spacing-s);
+	padding-right: var(--spacing-s);
+
+	.connected {
+		> span {
+			display: none;
+		}
+	}
+}
+</style>
diff --git a/packages/editor-ui/src/components/MfaSetupModal.vue b/packages/editor-ui/src/components/MfaSetupModal.vue
new file mode 100644
index 0000000000000..4d3baf7d4e23f
--- /dev/null
+++ b/packages/editor-ui/src/components/MfaSetupModal.vue
@@ -0,0 +1,372 @@
+<template>
+	<Modal
+		width="460px"
+		height="80%"
+		max-height="640px"
+		:title="
+			!showRecoveryCodes
+				? $locale.baseText('mfa.setup.step1.title')
+				: $locale.baseText('mfa.setup.step2.title')
+		"
+		:event-bus="modalBus"
+		:name="MFA_SETUP_MODAL_KEY"
+		:center="true"
+		:loading="loadingQrCode"
+	>
+		<template #content>
+			<div v-if="!showRecoveryCodes" :class="[$style.container, $style.modalContent]">
+				<div :class="$style.textContainer">
+					<n8n-text size="large" color="text-dark" :bold="true">{{
+						$locale.baseText('mfa.setup.step1.instruction1.title')
+					}}</n8n-text>
+				</div>
+				<div>
+					<n8n-text size="medium" :bold="false">
+						<i18n-t keypath="mfa.setup.step1.instruction1.subtitle" tag="span">
+							<template #part1>
+								{{ $locale.baseText('mfa.setup.step1.instruction1.subtitle.part1') }}
+							</template>
+							<template #part2>
+								<a
+									:class="$style.secret"
+									data-test-id="mfa-secret-button"
+									@click="onCopySecretToClipboard"
+									>{{ $locale.baseText('mfa.setup.step1.instruction1.subtitle.part2') }}</a
+								>
+							</template>
+						</i18n-t>
+					</n8n-text>
+				</div>
+				<div :class="$style.qrContainer">
+					<QrcodeVue :value="qrCode" size="150" level="H" />
+				</div>
+				<div :class="$style.textContainer">
+					<n8n-text size="large" color="text-dark" :bold="true">{{
+						$locale.baseText('mfa.setup.step1.instruction2.title')
+					}}</n8n-text>
+				</div>
+				<div :class="[$style.form, infoTextErrorMessage ? $style.error : '']">
+					<n8n-input-label
+						size="medium"
+						:bold="false"
+						:class="$style.labelTooltip"
+						:label="$locale.baseText('mfa.setup.step1.input.label')"
+					>
+						<n8n-input
+							v-model="authenticatorCode"
+							type="text"
+							:maxlength="6"
+							:placeholder="$locale.baseText('mfa.code.input.placeholder')"
+							:required="true"
+							data-test-id="mfa-token-input"
+							@input="onInput"
+						/>
+					</n8n-input-label>
+					<div :class="[$style.infoText, 'mt-4xs']">
+						<span size="small" v-text="infoTextErrorMessage"></span>
+					</div>
+				</div>
+			</div>
+			<div v-else :class="$style.container">
+				<div>
+					<n8n-text size="medium" :bold="false">{{
+						$locale.baseText('mfa.setup.step2.description')
+					}}</n8n-text>
+				</div>
+				<div :class="$style.recoveryCodesContainer">
+					<div v-for="recoveryCode in recoveryCodes" :key="recoveryCode">
+						<n8n-text size="medium">{{ recoveryCode }}</n8n-text>
+					</div>
+				</div>
+				<n8n-info-tip :bold="false" :class="$style['edit-mode-footer-infotip']">
+					<i18n-t keypath="mfa.setup.step2.infobox.description" tag="span">
+						<template #part1>
+							{{ $locale.baseText('mfa.setup.step2.infobox.description.part1') }}
+						</template>
+						<template #part2>
+							<n8n-text size="small" :bold="true" :class="$style.loseAccessText">
+								{{ $locale.baseText('mfa.setup.step2.infobox.description.part2') }}
+							</n8n-text>
+						</template>
+					</i18n-t>
+				</n8n-info-tip>
+				<div>
+					<n8n-button
+						type="primary"
+						icon="download"
+						float="right"
+						:label="$locale.baseText('mfa.setup.step2.button.download')"
+						data-test-id="mfa-recovery-codes-button"
+						@click="onDownloadClick"
+					/>
+				</div>
+			</div>
+		</template>
+		<template #footer>
+			<div v-if="showRecoveryCodes">
+				<div>
+					<n8n-button
+						float="right"
+						:disabled="!recoveryCodesDownloaded"
+						:label="$locale.baseText('mfa.setup.step2.button.save')"
+						size="large"
+						data-test-id="mfa-save-button"
+						@click="onSetupClick"
+					/>
+				</div>
+			</div>
+			<div v-else>
+				<div>
+					<n8n-button
+						float="right"
+						:label="$locale.baseText('mfa.setup.step1.button.continue')"
+						size="large"
+						:disabled="!readyToSubmit"
+						@click="onSaveClick"
+					/>
+				</div>
+			</div>
+		</template>
+	</Modal>
+</template>
+
+<script lang="ts">
+import Modal from './Modal.vue';
+import {
+	MFA_AUTHENTICATION_TOKEN_INPUT_MAX_LENGTH,
+	MFA_AUTHENTICATION_TOKEN_WINDOW_EXPIRED,
+	MFA_SETUP_MODAL_KEY,
+} from '../constants';
+import { defineComponent } from 'vue';
+import { mapStores } from 'pinia';
+import { useUIStore } from '@/stores/ui.store';
+import { useNDVStore } from '@/stores/ndv.store';
+import { useUsersStore } from '@/stores/users.store';
+import { mfaEventBus } from '@/event-bus';
+import { useToast } from '@/composables/useToast';
+//@ts-ignore
+import QrcodeVue from 'qrcode.vue';
+import { useClipboard } from '@/composables/useClipboard';
+export default defineComponent({
+	name: 'MfaSetupModal',
+	components: {
+		Modal,
+		QrcodeVue,
+	},
+	setup() {
+		const clipboard = useClipboard();
+
+		return {
+			clipboard,
+			...useToast(),
+		};
+	},
+	data() {
+		return {
+			modalBus: mfaEventBus,
+			MFA_SETUP_MODAL_KEY,
+			secret: '',
+			qrCode: '',
+			readyToSubmit: false,
+			formBus: mfaEventBus,
+			showRecoveryCodes: false,
+			recoveryCodes: [] as string[],
+			recoveryCodesDownloaded: false,
+			authenticatorCode: '',
+			infoTextErrorMessage: '',
+			loadingQrCode: true,
+		};
+	},
+	computed: {
+		...mapStores(useNDVStore, useUIStore, useUsersStore),
+	},
+	async mounted() {
+		await this.getMfaQR();
+	},
+	methods: {
+		closeDialog(): void {
+			this.modalBus.emit('close');
+		},
+		onInput(value: string) {
+			if (value.length !== MFA_AUTHENTICATION_TOKEN_INPUT_MAX_LENGTH) {
+				this.infoTextErrorMessage = '';
+				return;
+			}
+			this.usersStore
+				.verifyMfaToken({ token: value })
+				.then(() => {
+					this.showRecoveryCodes = true;
+					this.authenticatorCode = value;
+				})
+				.catch(() => {
+					this.infoTextErrorMessage = this.$locale.baseText('mfa.setup.invalidCode');
+				});
+		},
+		onCopySecretToClipboard() {
+			void this.clipboard.copy(this.secret);
+			this.showToast({
+				title: this.$locale.baseText('mfa.setup.step1.toast.copyToClipboard.title'),
+				message: this.$locale.baseText('mfa.setup.step1.toast.copyToClipboard.message'),
+				type: 'success',
+			});
+		},
+		async onSubmit(form: { authenticatorCode: string }) {
+			try {
+				await this.usersStore.verifyMfaToken({ token: form.authenticatorCode });
+				this.showRecoveryCodes = true;
+				this.authenticatorCode = form.authenticatorCode;
+			} catch (error) {
+				this.showError(error, this.$locale.baseText('settings.mfa.invalidAuthenticatorCode'));
+			}
+		},
+		onSaveClick() {
+			this.formBus.emit('submit');
+		},
+		onDownloadClick() {
+			const filename = 'n8n-recovery-codes.txt';
+			const temporalElement = document.createElement('a');
+			temporalElement.setAttribute(
+				'href',
+				'data:text/plain;charset=utf-8,' + encodeURIComponent(this.recoveryCodes.join('\n')),
+			);
+			temporalElement.setAttribute('download', filename);
+			temporalElement.style.display = 'none';
+			document.body.appendChild(temporalElement);
+			temporalElement.click();
+			document.body.removeChild(temporalElement);
+			this.recoveryCodesDownloaded = true;
+		},
+		async onSetupClick() {
+			try {
+				await this.usersStore.enableMfa({ token: this.authenticatorCode });
+				this.closeDialog();
+				this.showMessage({
+					type: 'success',
+					title: this.$locale.baseText('mfa.setup.step2.toast.setupFinished.message'),
+				});
+			} catch (e) {
+				if (e.errorCode === MFA_AUTHENTICATION_TOKEN_WINDOW_EXPIRED) {
+					this.showMessage({
+						type: 'error',
+						title: this.$locale.baseText('mfa.setup.step2.toast.tokenExpired.error.message'),
+					});
+					return;
+				}
+
+				this.showMessage({
+					type: 'error',
+					title: this.$locale.baseText('mfa.setup.step2.toast.setupFinished.error.message'),
+				});
+			}
+		},
+		async getMfaQR() {
+			try {
+				const { secret, qrCode, recoveryCodes } = await this.usersStore.getMfaQR();
+				this.qrCode = qrCode;
+				this.secret = secret;
+				this.recoveryCodes = recoveryCodes;
+			} catch (error) {
+				this.showError(error, this.$locale.baseText('settings.api.view.error'));
+			} finally {
+				this.loadingQrCode = false;
+			}
+		},
+	},
+});
+</script>
+
+<style module lang="scss">
+.container {
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+}
+
+.container > * {
+	overflow: visible;
+	margin-bottom: var(--spacing-s);
+	&:last-child {
+		margin-bottom: 0;
+	}
+}
+.textContainer {
+	text-align: left;
+	margin: 0px;
+	margin-bottom: 5px;
+}
+
+.formContainer {
+	padding-bottom: var(--spacing-xl);
+}
+
+.qrContainer {
+	text-align: center;
+
+	canvas {
+		border: 4px solid var(--prim-gray-10);
+	}
+}
+
+.headerContainer {
+	text-align: center;
+}
+.recoveryCodesContainer {
+	display: flex;
+	flex-direction: column;
+	background-color: var(--color-mfa-recovery-code-background);
+	text-align: center;
+	flex-wrap: nowrap;
+	justify-content: space-between;
+	align-items: normal;
+	align-content: normal;
+	padding-top: var(--spacing-xs);
+	padding-bottom: var(--spacing-xs);
+	gap: var(--spacing-xs);
+	margin-bottom: var(--spacing-2xs);
+	overflow-y: auto;
+}
+
+.recoveryCodesContainer span {
+	font-size: var(--font-size-s);
+	font-weight: var(--font-weight-regular);
+	line-height: var(--spacing-m);
+	color: var(--color-mfa-recovery-code-color);
+}
+
+.form:first-child span {
+	color: var(--color-text-base);
+	font-weight: var(--font-weight-regular);
+	font-size: var(--font-size-s);
+}
+.form input {
+	width: 50%;
+	height: 30px;
+}
+.secret {
+	color: var(--color-primary);
+	font-weight: var(--font-weight-bold);
+}
+
+.loseAccessText {
+	color: var(--color-mfa-lose-access-text-color);
+}
+
+.error input {
+	border-color: var(--color-danger);
+}
+
+.error > div > span {
+	color: var(--color-danger);
+	font-size: var(--font-size-2xs);
+}
+
+.modalFooter {
+	justify-content: space-between;
+	display: flex;
+	flex-direction: row;
+}
+
+.notice {
+	margin: 0;
+}
+</style>
diff --git a/packages/editor-ui/src/components/Modal.vue b/packages/editor-ui/src/components/Modal.vue
index 0321d9e0d4a95..5c7ddeff3b63b 100644
--- a/packages/editor-ui/src/components/Modal.vue
+++ b/packages/editor-ui/src/components/Modal.vue
@@ -1,21 +1,26 @@
 <template>
 	<el-dialog
-		:visible="uiStore.isModalOpen(this.name)"
+		:model-value="uiStore.isModalOpen(name)"
 		:before-close="closeDialog"
-		:class="{ 'dialog-wrapper': true, [$style.center]: center, scrollable: scrollable }"
+		:class="{
+			'dialog-wrapper': true,
+			scrollable: scrollable,
+			[getCustomClass()]: true,
+		}"
+		:center="center"
 		:width="width"
 		:show-close="showClose"
-		:custom-class="getCustomClass()"
 		:close-on-click-modal="closeOnClickModal"
 		:close-on-press-escape="closeOnPressEscape"
 		:style="styles"
-		append-to-body
-		:data-test-id="`${this.name}-modal`"
+		:append-to-body="appendToBody"
+		:data-test-id="`${name}-modal`"
+		:modal-class="center ? $style.center : ''"
 	>
-		<template #title v-if="$scopedSlots.header">
-			<slot name="header" v-if="!loading" />
+		<template v-if="$slots.header" #header>
+			<slot v-if="!loading" name="header" />
 		</template>
-		<template #title v-else-if="title">
+		<template v-else-if="title" #title>
 			<div :class="centerTitle ? $style.centerTitle : ''">
 				<div v-if="title">
 					<n8n-heading tag="h1" size="xlarge">{{ title }}</n8n-heading>
@@ -32,26 +37,28 @@
 			@keydown.esc="closeDialog"
 		>
 			<slot v-if="!loading" name="content" />
-			<div :class="$style.loader" v-else>
+			<div v-else :class="$style.loader">
 				<n8n-spinner />
 			</div>
 		</div>
-		<div v-if="!loading && $scopedSlots.footer" :class="$style.footer">
+		<div v-if="!loading && $slots.footer" :class="$style.footer">
 			<slot name="footer" :close="closeDialog" />
 		</div>
 	</el-dialog>
 </template>
 
 <script lang="ts">
+import { ElDialog } from 'element-plus';
 import { defineComponent } from 'vue';
 import type { PropType } from 'vue';
-import { useUIStore } from '@/stores/ui';
 import { mapStores } from 'pinia';
-import type { EventBus } from '@/event-bus';
+import type { EventBus } from 'n8n-design-system';
+import { useUIStore } from '@/stores/ui.store';
 
 export default defineComponent({
 	name: 'Modal',
 	props: {
+		...ElDialog.props,
 		name: {
 			type: String,
 		},
@@ -118,21 +125,23 @@ export default defineComponent({
 			type: Boolean,
 			default: true,
 		},
+		appendToBody: {
+			type: Boolean,
+			default: true,
+		},
 	},
 	mounted() {
 		window.addEventListener('keydown', this.onWindowKeydown);
 
 		this.eventBus?.on('close', this.closeDialog);
-		this.eventBus?.on('closeAll', this.uiStore.closeAllModals);
 
 		const activeElement = document.activeElement as HTMLElement;
 		if (activeElement) {
 			activeElement.blur();
 		}
 	},
-	beforeDestroy() {
+	beforeUnmount() {
 		this.eventBus?.off('close', this.closeDialog);
-		this.eventBus?.off('closeAll', this.uiStore.closeAllModals);
 		window.removeEventListener('keydown', this.onWindowKeydown);
 	},
 	computed: {
@@ -197,7 +206,7 @@ export default defineComponent({
 
 <style lang="scss">
 .dialog-wrapper {
-	.el-dialog {
+	&.el-dialog {
 		display: flex;
 		flex-direction: column;
 		max-width: var(--dialog-max-width, 80%);
@@ -216,6 +225,7 @@ export default defineComponent({
 
 	.modal-content {
 		overflow: hidden;
+		overflow-y: auto;
 		flex-grow: 1;
 	}
 
@@ -226,9 +236,7 @@ export default defineComponent({
 </style>
 
 <style lang="scss" module>
-.center {
-	display: flex;
-	align-items: center;
+.center > div {
 	justify-content: center;
 }
 
diff --git a/packages/editor-ui/src/components/ModalDrawer.vue b/packages/editor-ui/src/components/ModalDrawer.vue
index f3b864851831f..468203788bf8a 100644
--- a/packages/editor-ui/src/components/ModalDrawer.vue
+++ b/packages/editor-ui/src/components/ModalDrawer.vue
@@ -1,32 +1,34 @@
 <template>
-	<el-drawer
+	<ElDrawer
 		:direction="direction"
-		:visible="uiStore.isModalOpen(this.name)"
+		:model-value="uiStore.isModalOpen(name)"
 		:size="width"
 		:before-close="close"
 		:modal="modal"
-		:wrapperClosable="wrapperClosable"
+		:wrapper-closable="wrapperClosable"
 	>
-		<template #title>
+		<template #header>
 			<slot name="header" />
 		</template>
-		<template>
-			<span @keydown.stop>
-				<slot name="content" />
-			</span>
-		</template>
-	</el-drawer>
+		<span @keydown.stop>
+			<slot name="content" />
+		</span>
+	</ElDrawer>
 </template>
 
 <script lang="ts">
-import { useUIStore } from '@/stores/ui';
+import { useUIStore } from '@/stores/ui.store';
 import { mapStores } from 'pinia';
 import { defineComponent } from 'vue';
 import type { PropType } from 'vue';
-import type { EventBus } from '@/event-bus';
+import type { EventBus } from 'n8n-design-system';
+import { ElDrawer } from 'element-plus';
 
 export default defineComponent({
 	name: 'ModalDrawer',
+	components: {
+		ElDrawer,
+	},
 	props: {
 		name: {
 			type: String,
@@ -38,7 +40,8 @@ export default defineComponent({
 			type: Object as PropType<EventBus>,
 		},
 		direction: {
-			type: String,
+			type: String as PropType<'ltr' | 'rtl' | 'ttb' | 'btt'>,
+			required: true,
 		},
 		modal: {
 			type: Boolean,
@@ -61,7 +64,7 @@ export default defineComponent({
 			activeElement.blur();
 		}
 	},
-	beforeDestroy() {
+	beforeUnmount() {
 		this.eventBus?.off('close', this.close);
 		window.removeEventListener('keydown', this.onWindowKeydown);
 	},
diff --git a/packages/editor-ui/src/components/ModalRoot.vue b/packages/editor-ui/src/components/ModalRoot.vue
index a2bfd81016e6c..d9ed7f4137bac 100644
--- a/packages/editor-ui/src/components/ModalRoot.vue
+++ b/packages/editor-ui/src/components/ModalRoot.vue
@@ -1,10 +1,10 @@
 <template>
 	<div v-if="uiStore.isModalOpen(name) || keepAlive">
 		<slot
-			:modalName="name"
+			:modal-name="name"
 			:active="uiStore.isModalActive(name)"
 			:open="uiStore.isModalOpen(name)"
-			:activeId="uiStore.getModalActiveId(name)"
+			:active-id="uiStore.getModalActiveId(name)"
 			:mode="uiStore.getModalMode(name)"
 			:data="uiStore.getModalData(name)"
 		></slot>
@@ -13,7 +13,7 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import { useUIStore } from '@/stores/ui';
+import { useUIStore } from '@/stores/ui.store';
 import { mapStores } from 'pinia';
 
 export default defineComponent({
diff --git a/packages/editor-ui/src/components/Modals.vue b/packages/editor-ui/src/components/Modals.vue
index 3c01907bce00d..a0f7486f320f1 100644
--- a/packages/editor-ui/src/components/Modals.vue
+++ b/packages/editor-ui/src/components/Modals.vue
@@ -2,21 +2,21 @@
 	<div>
 		<ModalRoot :name="CONTACT_PROMPT_MODAL_KEY">
 			<template #default="{ modalName }">
-				<ContactPromptModal :modalName="modalName" />
+				<ContactPromptModal :modal-name="modalName" />
 			</template>
 		</ModalRoot>
 
 		<ModalRoot :name="CREDENTIAL_EDIT_MODAL_KEY">
 			<template #default="{ modalName, activeId, mode }">
-				<CredentialEdit :modalName="modalName" :mode="mode" :activeId="activeId" />
+				<CredentialEdit :modal-name="modalName" :mode="mode" :active-id="activeId" />
 			</template>
 		</ModalRoot>
 		<ModalRoot :name="ABOUT_MODAL_KEY">
 			<AboutModal />
 		</ModalRoot>
 
-		<ModalRoot :name="ASK_AI_MODAL_KEY">
-			<AskAiModal />
+		<ModalRoot :name="CHAT_EMBED_MODAL_KEY">
+			<ChatEmbedModal />
 		</ModalRoot>
 
 		<ModalRoot :name="CREDENTIAL_SELECT_MODAL_KEY">
@@ -25,7 +25,19 @@
 
 		<ModalRoot :name="DUPLICATE_MODAL_KEY">
 			<template #default="{ modalName, active, data }">
-				<DuplicateWorkflowDialog :data="data" :isActive="active" :modalName="modalName" />
+				<DuplicateWorkflowDialog :data="data" :is-active="active" :modal-name="modalName" />
+			</template>
+		</ModalRoot>
+
+		<ModalRoot :name="ADD_TEST_SUITE_MODAL_KEY">
+			<template #default="{ data }">
+				<AddTestSuiteModal :work-flow-id="data?.workflow || ''" />
+			</template>
+		</ModalRoot>
+
+		<ModalRoot :name="EDIT_TEST_SUITE_MODAL_KEY">
+			<template #default="{ data }">
+				<EditTestSuiteModal :data="data" />
 			</template>
 		</ModalRoot>
 
@@ -37,16 +49,20 @@
 			<TagsManager />
 		</ModalRoot>
 
-		<ModalRoot :name="VERSIONS_MODAL_KEY" :keepAlive="true">
+		<ModalRoot :name="VERSIONS_MODAL_KEY" :keep-alive="true">
 			<UpdatesPanel />
 		</ModalRoot>
 
-		<ModalRoot :name="VALUE_SURVEY_MODAL_KEY" :keepAlive="true">
+		<ModalRoot :name="VALUE_SURVEY_MODAL_KEY" :keep-alive="true">
 			<template #default="{ active }">
-				<ValueSurvey :isActive="active" />
+				<ValueSurvey :is-active="active" />
 			</template>
 		</ModalRoot>
 
+		<ModalRoot :name="WORKFLOW_LM_CHAT_MODAL_KEY">
+			<WorkflowLMChat />
+		</ModalRoot>
+
 		<ModalRoot :name="WORKFLOW_SETTINGS_MODAL_KEY">
 			<WorkflowSettings />
 		</ModalRoot>
@@ -61,21 +77,21 @@
 
 		<ModalRoot :name="DELETE_USER_MODAL_KEY">
 			<template #default="{ modalName, activeId }">
-				<DeleteUserModal :modalName="modalName" :activeId="activeId" />
+				<DeleteUserModal :modal-name="modalName" :active-id="activeId" />
 			</template>
 		</ModalRoot>
 
-		<ModalRoot :name="EXECUTIONS_MODAL_KEY">
-			<ExecutionsModal />
-		</ModalRoot>
-
 		<ModalRoot :name="WORKFLOW_ACTIVE_MODAL_KEY">
 			<ActivationModal />
 		</ModalRoot>
 
+		<ModalRoot :name="MFA_SETUP_MODAL_KEY">
+			<MfaSetupModal />
+		</ModalRoot>
+
 		<ModalRoot :name="WORKFLOW_SHARE_MODAL_KEY">
 			<template #default="{ modalName, active, data }">
-				<WorkflowShareModal :data="data" :isActive="active" :modalName="modalName" />
+				<WorkflowShareModal :data="data" :is-active="active" :modal-name="modalName" />
 			</template>
 		</ModalRoot>
 
@@ -91,15 +107,15 @@
 			<ImportCurlModal />
 		</ModalRoot>
 
-		<ModalRoot :name="USER_ACTIVATION_SURVEY_MODAL">
-			<WorkflowSuccessModal />
+		<ModalRoot :name="GENERATE_CURL_MODAL_KEY">
+			<GenerateCurlModal />
 		</ModalRoot>
 
 		<ModalRoot :name="COMMUNITY_PACKAGE_CONFIRM_MODAL_KEY">
 			<template #default="{ modalName, activeId, mode }">
 				<CommunityPackageManageConfirmModal
-					:modalName="modalName"
-					:activePackageName="activeId"
+					:modal-name="modalName"
+					:active-package-name="activeId"
 					:mode="mode"
 				/>
 			</template>
@@ -108,10 +124,67 @@
 		<ModalRoot :name="LOG_STREAM_MODAL_KEY">
 			<template #default="{ modalName, data }">
 				<EventDestinationSettingsModal
-					:modalName="modalName"
+					:modal-name="modalName"
 					:destination="data.destination"
-					:isNew="data.isNew"
-					:eventBus="data.eventBus"
+					:is-new="data.isNew"
+					:event-bus="data.eventBus"
+				/>
+			</template>
+		</ModalRoot>
+
+		<ModalRoot :name="SOURCE_CONTROL_PUSH_MODAL_KEY">
+			<template #default="{ modalName, data }">
+				<SourceControlPushModal :modal-name="modalName" :data="data" />
+			</template>
+		</ModalRoot>
+
+		<ModalRoot :name="SOURCE_CONTROL_PULL_MODAL_KEY">
+			<template #default="{ modalName, data }">
+				<SourceControlPullModal :modal-name="modalName" :data="data" />
+			</template>
+		</ModalRoot>
+
+		<ModalRoot :name="EXTERNAL_SECRETS_PROVIDER_MODAL_KEY">
+			<template #default="{ modalName, data }">
+				<ExternalSecretsProviderModal :modal-name="modalName" :data="data" />
+			</template>
+		</ModalRoot>
+
+		<ModalRoot :name="DEBUG_PAYWALL_MODAL_KEY">
+			<template #default="{ modalName, data }">
+				<DebugPaywallModal
+					data-test-id="debug-paywall-modal"
+					:modal-name="modalName"
+					:data="data"
+				/>
+			</template>
+		</ModalRoot>
+
+		<ModalRoot :name="WORKFLOW_HISTORY_VERSION_RESTORE">
+			<template #default="{ modalName, data }">
+				<WorkflowHistoryVersionRestoreModal
+					data-test-id="workflow-history-version-restore-modal"
+					:modal-name="modalName"
+					:data="data"
+				/>
+			</template>
+		</ModalRoot>
+		<ModalRoot :name="SUGGESTED_TEMPLATES_PREVIEW_MODAL_KEY">
+			<template #default="{ modalName, data }">
+				<SuggestedTemplatesPreviewModal
+					data-test-id="suggested-templates-preview-modal"
+					:modal-name="modalName"
+					:data="data"
+				/>
+			</template>
+		</ModalRoot>
+
+		<ModalRoot :name="SETUP_CREDENTIALS_MODAL_KEY">
+			<template #default="{ modalName, data }">
+				<SetupWorkflowCredentialsModal
+					data-test-id="setup-workflow-credentials-modal"
+					:modal-name="modalName"
+					:data="data"
 				/>
 			</template>
 		</ModalRoot>
@@ -122,6 +195,7 @@
 import { defineComponent } from 'vue';
 import {
 	ABOUT_MODAL_KEY,
+	CHAT_EMBED_MODAL_KEY,
 	CHANGE_PASSWORD_MODAL_KEY,
 	COMMUNITY_PACKAGE_CONFIRM_MODAL_KEY,
 	COMMUNITY_PACKAGE_INSTALL_MODAL_KEY,
@@ -130,7 +204,6 @@ import {
 	CREDENTIAL_SELECT_MODAL_KEY,
 	DELETE_USER_MODAL_KEY,
 	DUPLICATE_MODAL_KEY,
-	EXECUTIONS_MODAL_KEY,
 	INVITE_USER_MODAL_KEY,
 	ONBOARDING_CALL_SIGNUP_MODAL_KEY,
 	PERSONALIZATION_MODAL_KEY,
@@ -138,16 +211,26 @@ import {
 	VALUE_SURVEY_MODAL_KEY,
 	VERSIONS_MODAL_KEY,
 	WORKFLOW_ACTIVE_MODAL_KEY,
+	WORKFLOW_LM_CHAT_MODAL_KEY,
 	WORKFLOW_SETTINGS_MODAL_KEY,
 	WORKFLOW_SHARE_MODAL_KEY,
 	IMPORT_CURL_MODAL_KEY,
 	LOG_STREAM_MODAL_KEY,
-	ASK_AI_MODAL_KEY,
-	USER_ACTIVATION_SURVEY_MODAL,
+	SOURCE_CONTROL_PUSH_MODAL_KEY,
+	SOURCE_CONTROL_PULL_MODAL_KEY,
+	EXTERNAL_SECRETS_PROVIDER_MODAL_KEY,
+	DEBUG_PAYWALL_MODAL_KEY,
+	MFA_SETUP_MODAL_KEY,
+	WORKFLOW_HISTORY_VERSION_RESTORE,
+	SUGGESTED_TEMPLATES_PREVIEW_MODAL_KEY,
+	SETUP_CREDENTIALS_MODAL_KEY,
+	GENERATE_CURL_MODAL_KEY,
+	ADD_TEST_SUITE_MODAL_KEY,
+	EDIT_TEST_SUITE_MODAL_KEY,
 } from '@/constants';
 
 import AboutModal from './AboutModal.vue';
-import AskAiModal from './AskAiModal.vue';
+import ChatEmbedModal from './ChatEmbedModal.vue';
 import CommunityPackageManageConfirmModal from './CommunityPackageManageConfirmModal.vue';
 import CommunityPackageInstallModal from './CommunityPackageInstallModal.vue';
 import ChangePasswordModal from './ChangePasswordModal.vue';
@@ -162,21 +245,31 @@ import PersonalizationModal from './PersonalizationModal.vue';
 import TagsManager from './TagsManager/TagsManager.vue';
 import UpdatesPanel from './UpdatesPanel.vue';
 import ValueSurvey from './ValueSurvey.vue';
+import WorkflowLMChat from './WorkflowLMChat.vue';
 import WorkflowSettings from './WorkflowSettings.vue';
 import DeleteUserModal from './DeleteUserModal.vue';
-import ExecutionsModal from './ExecutionsModal.vue';
 import ActivationModal from './ActivationModal.vue';
 import ImportCurlModal from './ImportCurlModal.vue';
+import GenerateCurlModal from './GenerateCurlModal.vue';
+import MfaSetupModal from './MfaSetupModal.vue';
 import WorkflowShareModal from './WorkflowShareModal.ee.vue';
-import WorkflowSuccessModal from './UserActivationSurveyModal.vue';
 import EventDestinationSettingsModal from '@/components/SettingsLogStreaming/EventDestinationSettingsModal.ee.vue';
+import SourceControlPushModal from '@/components/SourceControlPushModal.ee.vue';
+import SourceControlPullModal from '@/components/SourceControlPullModal.ee.vue';
+import ExternalSecretsProviderModal from '@/components/ExternalSecretsProviderModal.ee.vue';
+import DebugPaywallModal from '@/components/DebugPaywallModal.vue';
+import WorkflowHistoryVersionRestoreModal from '@/components/WorkflowHistory/WorkflowHistoryVersionRestoreModal.vue';
+import SuggestedTemplatesPreviewModal from '@/components/SuggestedTemplates/SuggestedTemplatesPreviewModal.vue';
+import SetupWorkflowCredentialsModal from '@/components/SetupWorkflowCredentialsModal/SetupWorkflowCredentialsModal.vue';
+import AddTestSuiteModal from './AddTestSuiteModal.vue';
+import EditTestSuiteModal from './EditTestSuiteModal.vue';
 
 export default defineComponent({
 	name: 'Modals',
 	components: {
 		AboutModal,
-		AskAiModal,
 		ActivationModal,
+		ChatEmbedModal,
 		CommunityPackageInstallModal,
 		CommunityPackageManageConfirmModal,
 		ContactPromptModal,
@@ -186,27 +279,37 @@ export default defineComponent({
 		DeleteUserModal,
 		DuplicateWorkflowDialog,
 		InviteUsersModal,
-		ExecutionsModal,
 		ModalRoot,
 		OnboardingCallSignupModal,
 		PersonalizationModal,
 		TagsManager,
 		UpdatesPanel,
 		ValueSurvey,
+		WorkflowLMChat,
 		WorkflowSettings,
 		WorkflowShareModal,
 		ImportCurlModal,
+		GenerateCurlModal,
 		EventDestinationSettingsModal,
-		WorkflowSuccessModal,
+		SourceControlPushModal,
+		SourceControlPullModal,
+		ExternalSecretsProviderModal,
+		DebugPaywallModal,
+		MfaSetupModal,
+		WorkflowHistoryVersionRestoreModal,
+		SuggestedTemplatesPreviewModal,
+		SetupWorkflowCredentialsModal,
+		AddTestSuiteModal,
+		EditTestSuiteModal,
 	},
 	data: () => ({
+		CHAT_EMBED_MODAL_KEY,
 		COMMUNITY_PACKAGE_CONFIRM_MODAL_KEY,
 		COMMUNITY_PACKAGE_INSTALL_MODAL_KEY,
 		CONTACT_PROMPT_MODAL_KEY,
 		CREDENTIAL_EDIT_MODAL_KEY,
 		CREDENTIAL_SELECT_MODAL_KEY,
 		ABOUT_MODAL_KEY,
-		ASK_AI_MODAL_KEY,
 		CHANGE_PASSWORD_MODAL_KEY,
 		DELETE_USER_MODAL_KEY,
 		DUPLICATE_MODAL_KEY,
@@ -215,14 +318,24 @@ export default defineComponent({
 		INVITE_USER_MODAL_KEY,
 		TAGS_MANAGER_MODAL_KEY,
 		VERSIONS_MODAL_KEY,
+		WORKFLOW_LM_CHAT_MODAL_KEY,
 		WORKFLOW_SETTINGS_MODAL_KEY,
 		WORKFLOW_SHARE_MODAL_KEY,
 		VALUE_SURVEY_MODAL_KEY,
-		EXECUTIONS_MODAL_KEY,
 		WORKFLOW_ACTIVE_MODAL_KEY,
 		IMPORT_CURL_MODAL_KEY,
+		GENERATE_CURL_MODAL_KEY,
 		LOG_STREAM_MODAL_KEY,
-		USER_ACTIVATION_SURVEY_MODAL,
+		SOURCE_CONTROL_PUSH_MODAL_KEY,
+		SOURCE_CONTROL_PULL_MODAL_KEY,
+		EXTERNAL_SECRETS_PROVIDER_MODAL_KEY,
+		DEBUG_PAYWALL_MODAL_KEY,
+		MFA_SETUP_MODAL_KEY,
+		WORKFLOW_HISTORY_VERSION_RESTORE,
+		SUGGESTED_TEMPLATES_PREVIEW_MODAL_KEY,
+		SETUP_CREDENTIALS_MODAL_KEY,
+		ADD_TEST_SUITE_MODAL_KEY,
+		EDIT_TEST_SUITE_MODAL_KEY,
 	}),
 });
 </script>
diff --git a/packages/editor-ui/src/components/MultipleParameter.vue b/packages/editor-ui/src/components/MultipleParameter.vue
index 2202d49e66559..53830d5fa3803 100644
--- a/packages/editor-ui/src/components/MultipleParameter.vue
+++ b/packages/editor-ui/src/components/MultipleParameter.vue
@@ -1,8 +1,8 @@
 <template>
-	<div @keydown.stop class="duplicate-parameter">
+	<div class="duplicate-parameter" @keydown.stop>
 		<n8n-input-label
 			:label="$locale.nodeText().inputLabelDisplayName(parameter, path)"
-			:tooltipText="$locale.nodeText().inputLabelDescription(parameter, path)"
+			:tooltip-text="$locale.nodeText().inputLabelDescription(parameter, path)"
 			:underline="true"
 			size="small"
 			color="text-dark"
@@ -14,7 +14,7 @@
 			class="duplicate-parameter-item"
 			:class="parameter.type"
 		>
-			<div class="delete-item clickable" v-if="!isReadOnly">
+			<div v-if="!isReadOnly" class="delete-item clickable">
 				<font-awesome-icon
 					icon="trash"
 					:title="$locale.baseText('multipleParameter.deleteItem')"
@@ -38,27 +38,27 @@
 				</div>
 			</div>
 			<div v-if="parameter.type === 'collection'">
-				<collection-parameter
+				<CollectionParameter
 					:parameter="parameter"
 					:values="value"
-					:nodeValues="nodeValues"
+					:node-values="nodeValues"
 					:path="getPath(index)"
-					:hideDelete="hideDelete"
-					:isReadOnly="isReadOnly"
-					@valueChanged="valueChanged"
+					:hide-delete="hideDelete"
+					:is-read-only="isReadOnly"
+					@value-changed="valueChanged"
 				/>
 			</div>
 			<div v-else>
-				<parameter-input-full
+				<ParameterInputFull
 					class="duplicate-parameter-input-item"
 					:parameter="parameter"
 					:value="value"
-					:displayOptions="true"
-					:hideLabel="true"
+					:display-options="true"
+					:hide-label="true"
 					:path="getPath(index)"
-					@valueChanged="valueChanged"
-					inputSize="small"
-					:isReadOnly="isReadOnly"
+					input-size="small"
+					:is-read-only="isReadOnly"
+					@update="valueChanged"
 				/>
 			</div>
 		</div>
@@ -76,8 +76,8 @@
 				v-if="!isReadOnly"
 				type="tertiary"
 				block
-				@click="addItem()"
 				:label="addButtonText"
+				@click="addItem()"
 			/>
 		</div>
 	</div>
@@ -127,17 +127,6 @@ export default defineComponent({
 			mutableValues: [] as INodeParameters[],
 		};
 	},
-	watch: {
-		values: {
-			handler(newValues: INodeParameters[]) {
-				this.mutableValues = deepCopy(newValues);
-			},
-			deep: true,
-		},
-	},
-	created() {
-		this.mutableValues = deepCopy(this.values);
-	},
 	computed: {
 		addButtonText(): string {
 			if (
@@ -156,6 +145,17 @@ export default defineComponent({
 			return !!this.parameter.typeOptions?.sortable;
 		},
 	},
+	watch: {
+		values: {
+			handler(newValues: INodeParameters[]) {
+				this.mutableValues = deepCopy(newValues);
+			},
+			deep: true,
+		},
+	},
+	created() {
+		this.mutableValues = deepCopy(this.values);
+	},
 	methods: {
 		addItem() {
 			const name = this.getPath();
@@ -209,6 +209,32 @@ export default defineComponent({
 </script>
 
 <style scoped lang="scss">
+.duplicate-parameter {
+	:deep(.button) {
+		--button-background-color: var(--color-background-base);
+		--button-border-color: var(--color-foreground-base);
+	}
+
+	:deep(.duplicate-parameter-item) {
+		position: relative;
+
+		.multi > .delete-item {
+			top: 0.1em;
+		}
+	}
+
+	:deep(.duplicate-parameter-input-item) {
+		margin: 0.5em 0 0.25em 2em;
+	}
+
+	:deep(.duplicate-parameter-item + .duplicate-parameter-item) {
+		.collection-parameter-wrapper {
+			border-top: 1px dashed #999;
+			margin-top: var(--spacing-xs);
+		}
+	}
+}
+
 .duplicate-parameter-item {
 	~ .add-item-wrapper {
 		margin-top: var(--spacing-xs);
@@ -230,31 +256,6 @@ export default defineComponent({
 	}
 }
 
-::v-deep {
-	.button {
-		--button-background-color: var(--color-background-base);
-		--button-border-color: var(--color-foreground-base);
-	}
-
-	.duplicate-parameter-item {
-		position: relative;
-
-		.multi > .delete-item {
-			top: 0.1em;
-		}
-	}
-
-	.duplicate-parameter-input-item {
-		margin: 0.5em 0 0.25em 2em;
-	}
-
-	.duplicate-parameter-item + .duplicate-parameter-item {
-		.collection-parameter-wrapper {
-			border-top: 1px dashed #999;
-			margin-top: var(--spacing-xs);
-		}
-	}
-}
 .no-items-exist {
 	margin: var(--spacing-xs) 0;
 }
diff --git a/packages/editor-ui/src/components/NDVDraggablePanels.vue b/packages/editor-ui/src/components/NDVDraggablePanels.vue
index 5334ee9ea37db..15430fc428be5 100644
--- a/packages/editor-ui/src/components/NDVDraggablePanels.vue
+++ b/packages/editor-ui/src/components/NDVDraggablePanels.vue
@@ -1,28 +1,33 @@
 <template>
 	<div>
-		<div :class="$style.inputPanel" v-if="!hideInputAndOutput" :style="inputPanelStyles">
+		<NDVFloatingNodes
+			v-if="activeNode"
+			:root-node="activeNode"
+			@switch-selected-node="onSwitchSelectedNode"
+		/>
+		<div v-if="!hideInputAndOutput" :class="$style.inputPanel" :style="inputPanelStyles">
 			<slot name="input"></slot>
 		</div>
-		<div :class="$style.outputPanel" v-if="!hideInputAndOutput" :style="outputPanelStyles">
+		<div v-if="!hideInputAndOutput" :class="$style.outputPanel" :style="outputPanelStyles">
 			<slot name="output"></slot>
 		</div>
 		<div :class="$style.mainPanel" :style="mainPanelStyles">
 			<n8n-resize-wrapper
-				:isResizingEnabled="currentNodePaneType !== 'unknown'"
+				:is-resizing-enabled="currentNodePaneType !== 'unknown'"
 				:width="relativeWidthToPx(mainPanelDimensions.relativeWidth)"
-				:minWidth="MIN_PANEL_WIDTH"
-				:gridSize="20"
+				:min-width="MIN_PANEL_WIDTH"
+				:grid-size="20"
+				:supported-directions="supportedResizeDirections"
 				@resize="onResizeDebounced"
 				@resizestart="onResizeStart"
 				@resizeend="onResizeEnd"
-				:supportedDirections="supportedResizeDirections"
 			>
 				<div :class="$style.dragButtonContainer">
 					<PanelDragButton
-						:class="{ [$style.draggable]: true, [$style.visible]: isDragging }"
-						:canMoveLeft="canMoveLeft"
-						:canMoveRight="canMoveRight"
 						v-if="!hideInputAndOutput && isDraggable"
+						:class="{ [$style.draggable]: true, [$style.visible]: isDragging }"
+						:can-move-left="canMoveLeft"
+						:can-move-right="canMoveRight"
 						@dragstart="onDragStart"
 						@drag="onDrag"
 						@dragend="onDragEnd"
@@ -37,19 +42,20 @@
 </template>
 
 <script lang="ts">
+import { defineComponent } from 'vue';
 import type { PropType } from 'vue';
-import Vue from 'vue';
+import { mapStores } from 'pinia';
 import { get } from 'lodash-es';
+import { useStorage } from '@/composables/useStorage';
 
 import type { INodeTypeDescription } from 'n8n-workflow';
 import PanelDragButton from './PanelDragButton.vue';
 
 import { LOCAL_STORAGE_MAIN_PANEL_RELATIVE_WIDTH, MAIN_NODE_PANEL_WIDTH } from '@/constants';
-import mixins from 'vue-typed-mixins';
-import { debounceHelper } from '@/mixins/debounce';
-import { mapStores } from 'pinia';
-import { useNDVStore } from '@/stores/ndv';
-import { NodePanelType } from '@/Interface';
+import { useNDVStore } from '@/stores/ndv.store';
+import { ndvEventBus } from '@/event-bus';
+import NDVFloatingNodes from '@/components/NDVFloatingNodes.vue';
+import { useDebounce } from '@/composables/useDebounce';
 
 const SIDE_MARGIN = 24;
 const SIDE_PANELS_MARGIN = 80;
@@ -65,10 +71,11 @@ const initialMainPanelWidth: { [key: string]: number } = {
 	wide: MAIN_NODE_PANEL_WIDTH * 2,
 };
 
-export default mixins(debounceHelper).extend({
+export default defineComponent({
 	name: 'NDVDraggablePanels',
 	components: {
 		PanelDragButton,
+		NDVFloatingNodes,
 	},
 	props: {
 		isDraggable: {
@@ -85,6 +92,11 @@ export default mixins(debounceHelper).extend({
 			default: () => ({}),
 		},
 	},
+	setup() {
+		const { callDebounced } = useDebounce();
+
+		return { callDebounced };
+	},
 	data(): {
 		windowWidth: number;
 		isDragging: boolean;
@@ -119,9 +131,12 @@ export default mixins(debounceHelper).extend({
 		setTimeout(() => {
 			this.initialized = true;
 		}, 0);
+
+		ndvEventBus.on('setPositionByName', this.setPositionByName);
 	},
-	destroyed() {
+	beforeUnmount() {
 		window.removeEventListener('resize', this.setTotalWidth);
+		ndvEventBus.off('setPositionByName', this.setPositionByName);
 	},
 	computed: {
 		...mapStores(useNDVStore),
@@ -132,6 +147,9 @@ export default mixins(debounceHelper).extend({
 		} {
 			return this.ndvStore.getMainPanelDimensions(this.currentNodePaneType);
 		},
+		activeNode() {
+			return this.ndvStore.activeNode;
+		},
 		supportedResizeDirections(): string[] {
 			const supportedDirections = ['right'];
 
@@ -245,6 +263,9 @@ export default mixins(debounceHelper).extend({
 		},
 	},
 	methods: {
+		onSwitchSelectedNode(node: string) {
+			this.$emit('switchSelectedNode', node);
+		},
 		getInitialLeftPosition(width: number) {
 			if (this.currentNodePaneType === 'dragless')
 				return this.pxToRelativeWidth(SIDE_MARGIN + 1 + this.fixedPanelWidth);
@@ -288,7 +309,7 @@ export default mixins(debounceHelper).extend({
 					panelType: this.currentNodePaneType,
 					dimensions: {
 						relativeLeft: 1 - this.mainPanelDimensions.relativeWidth - this.maximumRightPosition,
-						relativeRight: this.maximumRightPosition as number,
+						relativeRight: this.maximumRightPosition,
 					},
 				});
 				return;
@@ -302,6 +323,15 @@ export default mixins(debounceHelper).extend({
 				},
 			});
 		},
+		setPositionByName(position: 'minLeft' | 'maxRight' | 'initial') {
+			const positionByName: Record<string, number> = {
+				minLeft: this.minimumLeftPosition,
+				maxRight: this.maximumRightPosition,
+				initial: this.getInitialLeftPosition(this.mainPanelDimensions.relativeWidth),
+			};
+
+			this.setPositions(positionByName[position]);
+		},
 		pxToRelativeWidth(px: number) {
 			return px / this.windowWidth;
 		},
@@ -316,7 +346,7 @@ export default mixins(debounceHelper).extend({
 		},
 		onResizeDebounced(data: { direction: string; x: number; width: number }) {
 			if (this.initialized) {
-				this.callDebounced('onResize', { debounceTime: 10, trailing: true }, data);
+				void this.callDebounced(this.onResize, { debounceTime: 10, trailing: true }, data);
 			}
 		},
 		onResize({ direction, x, width }: { direction: string; x: number; width: number }) {
@@ -333,9 +363,9 @@ export default mixins(debounceHelper).extend({
 			);
 		},
 		restorePositionData() {
-			const storedPanelWidthData = window.localStorage.getItem(
+			const storedPanelWidthData = useStorage(
 				`${LOCAL_STORAGE_MAIN_PANEL_RELATIVE_WIDTH}_${this.currentNodePaneType}`,
-			);
+			).value;
 
 			if (storedPanelWidthData) {
 				const parsedWidth = parseFloat(storedPanelWidthData);
@@ -348,10 +378,8 @@ export default mixins(debounceHelper).extend({
 			return false;
 		},
 		storePositionData() {
-			window.localStorage.setItem(
-				`${LOCAL_STORAGE_MAIN_PANEL_RELATIVE_WIDTH}_${this.currentNodePaneType}`,
-				this.mainPanelDimensions.relativeWidth.toString(),
-			);
+			useStorage(`${LOCAL_STORAGE_MAIN_PANEL_RELATIVE_WIDTH}_${this.currentNodePaneType}`).value =
+				this.mainPanelDimensions.relativeWidth.toString();
 		},
 		onDragStart() {
 			this.isDragging = true;
@@ -438,6 +466,10 @@ export default mixins(debounceHelper).extend({
 	visibility: hidden;
 }
 
+.double-width {
+	left: 90%;
+}
+
 .dragButtonContainer {
 	position: absolute;
 	top: -12px;
diff --git a/packages/editor-ui/src/components/NDVFloatingNodes.vue b/packages/editor-ui/src/components/NDVFloatingNodes.vue
new file mode 100644
index 0000000000000..f7abf5f1e13ce
--- /dev/null
+++ b/packages/editor-ui/src/components/NDVFloatingNodes.vue
@@ -0,0 +1,254 @@
+<template>
+	<aside :class="$style.floatingNodes">
+		<ul
+			v-for="connectionGroup in connectionGroups"
+			:key="connectionGroup"
+			:class="[$style.nodesList, $style[connectionGroup]]"
+		>
+			<template v-for="{ node, nodeType } in connectedNodes[connectionGroup]">
+				<n8n-tooltip
+					v-if="node && nodeType"
+					:key="node.name"
+					:placement="tooltipPositionMapper[connectionGroup]"
+					:teleported="false"
+					:offset="60"
+				>
+					<template #content>{{ node.name }}</template>
+
+					<li
+						:class="$style.connectedNode"
+						data-test-id="floating-node"
+						:data-node-name="node.name"
+						:data-node-placement="connectionGroup"
+						@click="$emit('switchSelectedNode', node.name)"
+					>
+						<NodeIcon
+							:node-type="nodeType"
+							:node-name="node.name"
+							:tooltip-position="tooltipPositionMapper[connectionGroup]"
+							:size="35"
+							circle
+						/>
+					</li>
+				</n8n-tooltip>
+			</template>
+		</ul>
+	</aside>
+</template>
+
+<script setup lang="ts">
+import type { INodeUi } from '@/Interface';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { computed, onMounted, onBeforeUnmount } from 'vue';
+import NodeIcon from '@/components/NodeIcon.vue';
+import type { INodeTypeDescription } from 'n8n-workflow';
+
+interface Props {
+	rootNode: INodeUi;
+}
+const enum FloatingNodePosition {
+	top = 'outputSub',
+	right = 'outputMain',
+	left = 'inputMain',
+}
+const props = defineProps<Props>();
+const workflowsStore = useWorkflowsStore();
+const nodeTypesStore = useNodeTypesStore();
+const workflow = workflowsStore.getCurrentWorkflow();
+const emit = defineEmits(['switchSelectedNode']);
+
+interface NodeConfig {
+	node: INodeUi;
+	nodeType: INodeTypeDescription;
+}
+function moveNodeDirection(direction: FloatingNodePosition) {
+	const matchedDirectionNode = connectedNodes.value[direction][0];
+	if (matchedDirectionNode) {
+		emit('switchSelectedNode', matchedDirectionNode.node.name);
+	}
+}
+
+function onKeyDown(e: KeyboardEvent) {
+	if (e.shiftKey && e.altKey && (e.ctrlKey || e.metaKey)) {
+		/* eslint-disable @typescript-eslint/naming-convention */
+		const mapper = {
+			ArrowUp: FloatingNodePosition.top,
+			ArrowRight: FloatingNodePosition.right,
+			ArrowLeft: FloatingNodePosition.left,
+		};
+		/* eslint-enable @typescript-eslint/naming-convention */
+
+		const matchingDirection = mapper[e.key as keyof typeof mapper] || null;
+		if (matchingDirection) {
+			moveNodeDirection(matchingDirection);
+		}
+	}
+}
+function getINodesFromNames(names: string[]): NodeConfig[] {
+	return names
+		.map((name) => {
+			const node = workflowsStore.getNodeByName(name);
+			if (node) {
+				const nodeType = nodeTypesStore.getNodeType(node.type);
+				if (nodeType) {
+					return { node, nodeType };
+				}
+			}
+			return null;
+		})
+		.filter((n): n is NodeConfig => n !== null);
+}
+const connectedNodes = computed<
+	Record<FloatingNodePosition, Array<{ node: INodeUi; nodeType: INodeTypeDescription }>>
+>(() => {
+	const rootName = props.rootNode.name;
+	return {
+		[FloatingNodePosition.top]: getINodesFromNames(
+			workflow.getChildNodes(rootName, 'ALL_NON_MAIN'),
+		),
+		[FloatingNodePosition.right]: getINodesFromNames(workflow.getChildNodes(rootName, 'main', 1)),
+		[FloatingNodePosition.left]: getINodesFromNames(workflow.getParentNodes(rootName, 'main', 1)),
+	};
+});
+
+const connectionGroups = [
+	FloatingNodePosition.top,
+	FloatingNodePosition.right,
+	FloatingNodePosition.left,
+];
+const tooltipPositionMapper = {
+	[FloatingNodePosition.top]: 'bottom',
+	[FloatingNodePosition.right]: 'left',
+	[FloatingNodePosition.left]: 'right',
+};
+
+onMounted(() => {
+	document.addEventListener('keydown', onKeyDown, true);
+});
+
+onBeforeUnmount(() => {
+	document.removeEventListener('keydown', onKeyDown, true);
+});
+defineExpose({
+	moveNodeDirection,
+});
+</script>
+
+<style lang="scss" module>
+.floatingNodes {
+	position: fixed;
+	bottom: 0;
+	top: 0;
+	right: 0;
+	left: 0;
+	z-index: 10;
+	pointer-events: none;
+}
+.floatingNodes {
+	right: 0;
+}
+
+.nodesList {
+	list-style: none;
+	padding: 0;
+	position: absolute;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	flex-direction: column;
+	width: min-content;
+	margin: auto;
+	transform-origin: center;
+	gap: var(--spacing-s);
+	transition: transform 0.2s ease-in-out;
+
+	&.inputSub,
+	&.outputSub {
+		right: 0;
+		left: 0;
+		flex-direction: row;
+	}
+	&.outputSub {
+		top: 0;
+	}
+	&.inputSub {
+		bottom: 0;
+	}
+	&.outputMain,
+	&.inputMain {
+		top: 0;
+		bottom: 0;
+	}
+	&.outputMain {
+		right: 0;
+	}
+	&.inputMain {
+		left: 0;
+	}
+
+	&.outputMain {
+		transform: translateX(50%);
+	}
+	&.outputSub {
+		transform: translateY(-50%);
+	}
+	&.inputMain {
+		transform: translateX(-50%);
+	}
+	&.inputSub {
+		transform: translateY(50%);
+	}
+}
+.connectedNode {
+	border: var(--border-base);
+	background-color: var(--color-canvas-node-background);
+	border-radius: 100%;
+	padding: var(--spacing-s);
+	cursor: pointer;
+	pointer-events: all;
+	transition: transform 0.2s cubic-bezier(0.19, 1, 0.22, 1);
+	position: relative;
+	transform: scale(0.8);
+	display: flex;
+	justify-self: center;
+	align-self: center;
+
+	&::after {
+		content: '';
+		position: absolute;
+		top: -35%;
+		right: -30%;
+		bottom: -35%;
+		left: -30%;
+		z-index: -1;
+	}
+	.outputMain &,
+	.inputMain & {
+		border-radius: var(--border-radius-large);
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+	.outputMain & {
+		&:hover {
+			transform: scale(1.2) translateX(-50%);
+		}
+	}
+	.outputSub & {
+		&:hover {
+			transform: scale(1.2) translateY(50%);
+		}
+	}
+	.inputMain & {
+		&:hover {
+			transform: scale(1.2) translateX(50%);
+		}
+	}
+	.inputSub & {
+		&:hover {
+			transform: scale(1.2) translateY(-50%);
+		}
+	}
+}
+</style>
diff --git a/packages/editor-ui/src/components/NDVSubConnections.vue b/packages/editor-ui/src/components/NDVSubConnections.vue
new file mode 100644
index 0000000000000..66032fe96dcae
--- /dev/null
+++ b/packages/editor-ui/src/components/NDVSubConnections.vue
@@ -0,0 +1,457 @@
+<template>
+	<div :class="$style.container">
+		<div
+			:class="$style.connections"
+			:style="`--possible-connections: ${possibleConnections.length}`"
+		>
+			<div
+				v-for="connection in possibleConnections"
+				:key="connection.type"
+				:data-test-id="`subnode-connection-group-${connection.type}`"
+			>
+				<div :class="$style.connectionType">
+					<span
+						:class="{
+							[$style.connectionLabel]: true,
+							[$style.hasIssues]: hasInputIssues(connection.type),
+						}"
+						v-text="`${connection.displayName}${connection.required ? ' *' : ''}`"
+					/>
+					<div
+						v-on-click-outside="() => expandConnectionGroup(connection.type, false)"
+						:class="{
+							[$style.connectedNodesWrapper]: true,
+							[$style.connectedNodesWrapperExpanded]: expandedGroups.includes(connection.type),
+						}"
+						:style="`--nodes-length: ${connectedNodes[connection.type].length}`"
+						@click="expandConnectionGroup(connection.type, true)"
+					>
+						<div
+							v-if="
+								connectedNodes[connection.type].length >= 1 ? connection.maxConnections !== 1 : true
+							"
+							:class="{
+								[$style.plusButton]: true,
+								[$style.hasIssues]: hasInputIssues(connection.type),
+							}"
+							@click="onPlusClick(connection.type)"
+						>
+							<n8n-tooltip
+								placement="top"
+								:teleported="true"
+								:offset="10"
+								:show-after="300"
+								:disabled="
+									shouldShowConnectionTooltip(connection.type) &&
+									connectedNodes[connection.type].length >= 1
+								"
+							>
+								<template #content>
+									Add {{ connection.displayName }}
+									<template v-if="hasInputIssues(connection.type)">
+										<TitledList
+											:title="`${$locale.baseText('node.issues')}:`"
+											:items="nodeInputIssues[connection.type]"
+										/>
+									</template>
+								</template>
+								<n8n-icon-button
+									size="medium"
+									icon="plus"
+									type="tertiary"
+									:data-test-id="`add-subnode-${connection.type}`"
+								/>
+							</n8n-tooltip>
+						</div>
+						<div
+							v-if="connectedNodes[connection.type].length > 0"
+							:class="{
+								[$style.connectedNodes]: true,
+								[$style.connectedNodesMultiple]: connectedNodes[connection.type].length > 1,
+							}"
+						>
+							<div
+								v-for="(node, index) in connectedNodes[connection.type]"
+								:key="node.node.name"
+								:class="{ [$style.nodeWrapper]: true, [$style.hasIssues]: node.issues }"
+								data-test-id="floating-subnode"
+								:data-node-name="node.node.name"
+								:style="`--node-index: ${index}`"
+							>
+								<n8n-tooltip
+									:key="node.node.name"
+									placement="top"
+									:teleported="true"
+									:offset="10"
+									:show-after="300"
+									:disabled="shouldShowConnectionTooltip(connection.type)"
+								>
+									<template #content>
+										{{ node.node.name }}
+										<template v-if="node.issues">
+											<TitledList
+												:title="`${$locale.baseText('node.issues')}:`"
+												:items="node.issues"
+											/>
+										</template>
+									</template>
+
+									<div
+										:class="$style.connectedNode"
+										@click="onNodeClick(node.node.name, connection.type)"
+									>
+										<NodeIcon
+											:node-type="node.nodeType"
+											:node-name="node.node.name"
+											tooltip-position="top"
+											:size="20"
+											circle
+										/>
+									</div>
+								</n8n-tooltip>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script setup lang="ts">
+import type { INodeUi } from '@/Interface';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { computed, ref, watch } from 'vue';
+import { NodeHelpers } from 'n8n-workflow';
+import { useNodeHelpers } from '@/composables/useNodeHelpers';
+import NodeIcon from '@/components/NodeIcon.vue';
+import TitledList from '@/components/TitledList.vue';
+import type { ConnectionTypes, INodeInputConfiguration, INodeTypeDescription } from 'n8n-workflow';
+import { useDebounce } from '@/composables/useDebounce';
+
+interface Props {
+	rootNode: INodeUi;
+}
+
+const props = defineProps<Props>();
+const workflowsStore = useWorkflowsStore();
+const nodeTypesStore = useNodeTypesStore();
+const nodeHelpers = useNodeHelpers();
+const { debounce } = useDebounce();
+const emit = defineEmits(['switchSelectedNode', 'openConnectionNodeCreator']);
+
+interface NodeConfig {
+	node: INodeUi;
+	nodeType: INodeTypeDescription;
+	issues: string[];
+}
+
+const possibleConnections = ref<INodeInputConfiguration[]>([]);
+
+const expandedGroups = ref<ConnectionTypes[]>([]);
+const shouldShowNodeInputIssues = ref(false);
+
+const nodeType = computed(() =>
+	nodeTypesStore.getNodeType(props.rootNode.type, props.rootNode.typeVersion),
+);
+
+const nodeData = computed(() => workflowsStore.getNodeByName(props.rootNode.name));
+
+const workflow = computed(() => workflowsStore.getCurrentWorkflow());
+
+const nodeInputIssues = computed(() => {
+	const issues = nodeHelpers.getNodeIssues(nodeType.value, props.rootNode, workflow.value, [
+		'typeUnknown',
+		'parameters',
+		'credentials',
+		'execution',
+	]);
+	return issues?.input ?? {};
+});
+
+const connectedNodes = computed<Record<ConnectionTypes, NodeConfig[]>>(() => {
+	return possibleConnections.value.reduce(
+		(acc, connection) => {
+			const nodes = getINodesFromNames(
+				workflow.value.getParentNodes(props.rootNode.name, connection.type),
+			);
+			return { ...acc, [connection.type]: nodes };
+		},
+		{} as Record<ConnectionTypes, NodeConfig[]>,
+	);
+});
+
+function getConnectionConfig(connectionType: ConnectionTypes) {
+	return possibleConnections.value.find((c) => c.type === connectionType);
+}
+
+function isMultiConnection(connectionType: ConnectionTypes) {
+	const connectionConfig = getConnectionConfig(connectionType);
+	return connectionConfig?.maxConnections !== 1;
+}
+
+function shouldShowConnectionTooltip(connectionType: ConnectionTypes) {
+	return isMultiConnection(connectionType) && !expandedGroups.value.includes(connectionType);
+}
+
+function expandConnectionGroup(connectionType: ConnectionTypes, isExpanded: boolean) {
+	// If the connection is a single connection, we don't need to expand the group
+	if (!isMultiConnection(connectionType)) {
+		return;
+	}
+
+	if (isExpanded) {
+		expandedGroups.value = [...expandedGroups.value, connectionType];
+	} else {
+		expandedGroups.value = expandedGroups.value.filter((g) => g !== connectionType);
+	}
+}
+
+function getINodesFromNames(names: string[]): NodeConfig[] {
+	return names
+		.map((name) => {
+			const node = workflowsStore.getNodeByName(name);
+			if (node) {
+				const matchedNodeType = nodeTypesStore.getNodeType(node.type);
+				if (matchedNodeType) {
+					const issues = nodeHelpers.getNodeIssues(matchedNodeType, node, workflow.value);
+					const stringifiedIssues = issues ? NodeHelpers.nodeIssuesToString(issues, node) : '';
+					return { node, nodeType: matchedNodeType, issues: stringifiedIssues };
+				}
+			}
+			return null;
+		})
+		.filter((n): n is NodeConfig => n !== null);
+}
+
+function hasInputIssues(connectionType: ConnectionTypes) {
+	return (
+		shouldShowNodeInputIssues.value && (nodeInputIssues.value[connectionType] ?? []).length > 0
+	);
+}
+
+function isNodeInputConfiguration(
+	connectionConfig: ConnectionTypes | INodeInputConfiguration,
+): connectionConfig is INodeInputConfiguration {
+	if (typeof connectionConfig === 'string') return false;
+
+	return 'type' in connectionConfig;
+}
+
+function getPossibleSubInputConnections(): INodeInputConfiguration[] {
+	if (!nodeType.value || !props.rootNode) return [];
+
+	const inputs = NodeHelpers.getNodeInputs(workflow.value, props.rootNode, nodeType.value);
+
+	const nonMainInputs = inputs.filter((input): input is INodeInputConfiguration => {
+		if (!isNodeInputConfiguration(input)) return false;
+
+		return input.type !== 'main';
+	});
+
+	return nonMainInputs;
+}
+
+function onNodeClick(nodeName: string, connectionType: ConnectionTypes) {
+	if (isMultiConnection(connectionType) && !expandedGroups.value.includes(connectionType)) {
+		expandConnectionGroup(connectionType, true);
+		return;
+	}
+
+	emit('switchSelectedNode', nodeName);
+}
+
+function onPlusClick(connectionType: ConnectionTypes) {
+	const connectionNodes = connectedNodes.value[connectionType];
+	if (
+		isMultiConnection(connectionType) &&
+		!expandedGroups.value.includes(connectionType) &&
+		connectionNodes.length >= 1
+	) {
+		expandConnectionGroup(connectionType, true);
+		return;
+	}
+
+	emit('openConnectionNodeCreator', props.rootNode.name, connectionType);
+}
+
+function showNodeInputsIssues() {
+	shouldShowNodeInputIssues.value = false;
+	// Reset animation
+	setTimeout(() => {
+		shouldShowNodeInputIssues.value = true;
+	}, 0);
+}
+
+watch(
+	nodeData,
+	debounce(
+		() =>
+			setTimeout(() => {
+				expandedGroups.value = [];
+				possibleConnections.value = getPossibleSubInputConnections();
+			}, 0),
+		{ debounceTime: 1000 },
+	),
+	{ immediate: true },
+);
+
+defineExpose({
+	showNodeInputsIssues,
+});
+</script>
+
+<style lang="scss" module>
+@keyframes horizontal-shake {
+	0% {
+		transform: translateX(0);
+	}
+	25% {
+		transform: translateX(5px);
+	}
+	50% {
+		transform: translateX(-5px);
+	}
+	75% {
+		transform: translateX(5px);
+	}
+	100% {
+		transform: translateX(0);
+	}
+}
+.container {
+	--node-size: 45px;
+	--plus-button-size: 30px;
+	--animation-duration: 150ms;
+	--collapsed-offset: 10px;
+	padding-top: calc(var(--node-size) + var(--spacing-3xs));
+}
+.connections {
+	// Make sure container has matching height if there's no connections
+	// since the plus button is absolutely positioned
+	min-height: calc(var(--node-size) + var(--spacing-m));
+	position: absolute;
+	bottom: calc((var(--node-size) / 2) * -1);
+	left: 0;
+	right: 0;
+	user-select: none;
+	justify-content: space-between;
+	display: grid;
+	grid-template-columns: repeat(var(--possible-connections), 1fr);
+}
+.connectionType {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	transition: all calc((var(--animation-duration) - 50ms)) ease;
+}
+.connectionLabel {
+	margin-bottom: var(--spacing-2xs);
+	font-size: var(--font-size-2xs);
+	user-select: none;
+	text-wrap: nowrap;
+
+	&.hasIssues {
+		color: var(--color-danger);
+	}
+}
+.connectedNodesWrapper {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: space-between;
+	position: relative;
+}
+.plusButton {
+	transition: all var(--animation-duration) ease;
+	position: absolute;
+	top: var(--spacing-2xs);
+
+	&.hasIssues {
+		animation: horizontal-shake 500ms;
+		button {
+			--button-font-color: var(--color-danger);
+			--button-border-color: var(--color-danger);
+		}
+	}
+
+	&:not(:last-child) {
+		z-index: 1;
+		right: 100%;
+		margin-right: calc((var(--plus-button-size) * -1) * 0.9);
+		pointer-events: none;
+
+		.connectedNodesWrapperExpanded & {
+			// left: 100%;
+			margin-right: var(--spacing-2xs);
+			opacity: 1;
+			pointer-events: all;
+		}
+	}
+}
+
+.connectedNodesMultiple {
+	transition: all var(--animation-duration) ease;
+}
+.connectedNodesWrapperExpanded {
+	z-index: 1;
+}
+// Hide all other connection groups when one is expanded
+.connections:has(.connectedNodesWrapperExpanded)
+	.connectionType:not(:has(.connectedNodesWrapperExpanded)) {
+	opacity: 0;
+	pointer-events: none;
+	visibility: hidden;
+}
+.connectedNode {
+	border: var(--border-base);
+	background-color: var(--color-canvas-node-background);
+	border-radius: 100%;
+	padding: var(--spacing-xs);
+	cursor: pointer;
+	pointer-events: all;
+	transition: all var(--animation-duration) ease;
+	position: relative;
+	display: flex;
+	justify-self: center;
+	align-self: center;
+}
+.connectedNodes {
+	display: flex;
+	justify-content: center;
+	margin-right: calc(
+		(var(--nodes-length) - 1) * (-1 * (var(--node-size) - var(--collapsed-offset)))
+	);
+	.connectedNodesWrapperExpanded & {
+		margin-right: 0;
+		// Negative margin to offset the absolutely positioned plus button
+		// when the nodes are expanded to center the nodes
+		margin-right: calc((var(--spacing-2xs) + var(--plus-button-size)) * -1);
+	}
+}
+.nodeWrapper {
+	transition: all var(--animation-duration) ease;
+	transform-origin: center;
+	z-index: 1;
+	.connectedNodesWrapperExpanded &:not(:first-child) {
+		margin-left: var(--spacing-2xs);
+	}
+	&.hasIssues {
+		.connectedNode {
+			border-width: calc(var(--border-width-base) * 2);
+			border-color: var(--color-danger);
+		}
+	}
+
+	&:not(:first-child) {
+		transform: translateX(
+			calc(var(--node-index) * (-1 * (var(--node-size) - var(--collapsed-offset))))
+		);
+	}
+
+	.connectedNodesWrapperExpanded & {
+		transform: translateX(0);
+	}
+}
+</style>
diff --git a/packages/editor-ui/src/components/Node.vue b/packages/editor-ui/src/components/Node.vue
index f4998a070b9b3..99b4d00f1f97d 100644
--- a/packages/editor-ui/src/components/Node.vue
+++ b/packages/editor-ui/src/components/Node.vue
@@ -1,45 +1,49 @@
 <template>
 	<div
-		:class="{ 'node-wrapper': true, 'node-wrapper--trigger': isTriggerNode }"
-		:style="nodePosition"
 		:id="nodeId"
-		data-test-id="canvas-node"
 		:ref="data.name"
+		:class="nodeWrapperClass"
+		:style="nodeWrapperStyles"
+		data-test-id="canvas-node"
 		:data-name="data.name"
+		:data-node-type="nodeType?.name"
+		@contextmenu="(e: MouseEvent) => openContextMenu(e, 'node-right-click')"
 	>
-		<div class="select-background" v-show="isSelected"></div>
+		<div v-show="isSelected" class="select-background"></div>
 		<div
 			:class="{
 				'node-default': true,
 				'touch-active': isTouchActive,
-				'is-touch-device': isTouchDevice,
+				'is-touch-device': deviceSupport.isTouchDevice,
+				'menu-open': isContextMenuOpen,
+				'disable-pointer-events': disablePointerEvents,
 			}"
 		>
 			<div
+				v-touch:start="touchStart"
+				v-touch:end="touchEnd"
 				:class="nodeClass"
 				:style="nodeStyle"
 				@click.left="onClick"
-				v-touch:start="touchStart"
-				v-touch:end="touchEnd"
 			>
-				<i class="trigger-icon" v-if="isTriggerNode">
+				<i v-if="isTriggerNode" class="trigger-icon">
 					<n8n-tooltip placement="bottom">
 						<template #content>
 							<span v-html="$locale.baseText('node.thisIsATriggerNode')" />
 						</template>
-						<font-awesome-icon icon="bolt" size="lg" />
+						<FontAwesomeIcon icon="bolt" size="lg" />
 					</n8n-tooltip>
 				</i>
 				<div
 					v-if="!data.disabled"
 					:class="{ 'node-info-icon': true, 'shift-icon': shiftOutputCount }"
 				>
-					<div v-if="hasIssues" class="node-issues">
-						<n8n-tooltip placement="bottom">
+					<div v-if="hasIssues && !hideNodeIssues" class="node-issues" data-test-id="node-issues">
+						<n8n-tooltip :show-after="500" placement="bottom">
 							<template #content>
-								<titled-list :title="`${$locale.baseText('node.issues')}:`" :items="nodeIssues" />
+								<TitledList :title="`${$locale.baseText('node.issues')}:`" :items="nodeIssues" />
 							</template>
-							<font-awesome-icon icon="exclamation-triangle" />
+							<FontAwesomeIcon icon="exclamation-triangle" />
 						</n8n-tooltip>
 					</div>
 					<div v-else-if="waiting || nodeExecutionStatus === 'waiting'" class="waiting">
@@ -47,31 +51,31 @@
 							<template #content>
 								<div v-text="waiting"></div>
 							</template>
-							<font-awesome-icon icon="clock" />
+							<FontAwesomeIcon icon="clock" />
 						</n8n-tooltip>
 					</div>
 					<span v-else-if="showPinnedDataInfo" class="node-pin-data-icon">
-						<font-awesome-icon icon="thumbtack" />
+						<FontAwesomeIcon icon="thumbtack" />
 						<span v-if="workflowDataItems > 1" class="items-count"> {{ workflowDataItems }}</span>
 					</span>
 					<span v-else-if="nodeExecutionStatus === 'unknown'">
 						<!-- Do nothing, unknown means the node never executed -->
 					</span>
 					<span v-else-if="workflowDataItems" class="data-count">
-						<font-awesome-icon icon="check" />
+						<FontAwesomeIcon icon="check" />
 						<span v-if="workflowDataItems > 1" class="items-count"> {{ workflowDataItems }}</span>
 					</span>
 				</div>
 
 				<div class="node-executing-info" :title="$locale.baseText('node.nodeIsExecuting')">
-					<font-awesome-icon icon="sync-alt" spin />
+					<FontAwesomeIcon icon="sync-alt" spin />
 				</div>
 
 				<div class="node-trigger-tooltip__wrapper">
 					<n8n-tooltip
 						placement="top"
-						manual
-						:value="showTriggerNodeTooltip"
+						:show-after="500"
+						:visible="showTriggerNodeTooltip"
 						popper-class="node-trigger-tooltip__wrapper--item"
 					>
 						<template #content>
@@ -82,8 +86,7 @@
 					<n8n-tooltip
 						v-if="isTriggerNode"
 						placement="top"
-						manual
-						:value="pinDataDiscoveryTooltipVisible"
+						:visible="pinDataDiscoveryTooltipVisible"
 						popper-class="node-trigger-tooltip__wrapper--item"
 					>
 						<template #content>
@@ -95,67 +98,24 @@
 
 				<NodeIcon
 					class="node-icon"
-					:nodeType="nodeType"
+					:node-type="iconNodeType"
 					:size="40"
 					:shrink="false"
-					:disabled="this.data.disabled"
+					:color-default="iconColorDefault"
+					:disabled="data.disabled"
 				/>
 			</div>
 
-			<div class="node-options no-select-on-click" v-if="!isReadOnly" v-show="!hideActions">
-				<div
-					v-touch:tap="deleteNode"
-					class="option"
-					:title="$locale.baseText('node.deleteNode')"
-					data-test-id="delete-node-button"
-				>
-					<font-awesome-icon icon="trash" />
-				</div>
-				<div
-					v-touch:tap="disableNode"
-					class="option"
-					:title="$locale.baseText('node.activateDeactivateNode')"
-					data-test-id="disable-node-button"
-				>
-					<font-awesome-icon :icon="nodeDisabledIcon" />
-				</div>
-				<div
-					v-touch:tap="duplicateNode"
-					class="option"
-					:title="$locale.baseText('node.duplicateNode')"
-					v-if="isDuplicatable"
-					data-test-id="duplicate-node-button"
-				>
-					<font-awesome-icon icon="clone" />
-				</div>
-				<div
-					v-touch:tap="setNodeActive"
-					class="option touch"
-					:title="$locale.baseText('node.editNode')"
-					data-test-id="activate-node-button"
-				>
-					<font-awesome-icon class="execute-icon" icon="cog" />
-				</div>
-				<div
-					v-touch:tap="executeNode"
-					class="option"
-					:title="$locale.baseText('node.executeNode')"
-					v-if="!workflowRunning"
-					data-test-id="execute-node-button"
-				>
-					<font-awesome-icon class="execute-icon" icon="play-circle" />
-				</div>
-			</div>
 			<div
+				v-if="showDisabledLinethrough"
 				:class="{
 					'disabled-linethrough': true,
 					success: !['unknown'].includes(nodeExecutionStatus) && workflowDataItems > 0,
 				}"
-				v-if="showDisabledLinethrough"
 			></div>
 		</div>
 		<div class="node-description">
-			<div class="node-name ph-no-capture" :title="nodeTitle">
+			<div class="node-name" :title="nodeTitle">
 				<p data-test-id="canvas-node-box-title">
 					{{ nodeTitle }}
 				</p>
@@ -165,71 +125,151 @@
 				{{ nodeSubtitle }}
 			</div>
 		</div>
+
+		<div
+			v-if="!isReadOnly"
+			v-show="!hideActions"
+			class="node-options no-select-on-click"
+			@contextmenu.stop
+			@mousedown.stop
+		>
+			<div class="node-options-inner">
+				<n8n-icon-button
+					v-if="!isConfigNode"
+					data-test-id="execute-node-button"
+					type="tertiary"
+					text
+					size="small"
+					icon="play"
+					:disabled="workflowRunning"
+					:title="$locale.baseText('node.testStep')"
+					@click="executeNode"
+				/>
+				<n8n-icon-button
+					data-test-id="disable-node-button"
+					type="tertiary"
+					text
+					size="small"
+					icon="power-off"
+					:title="nodeDisabledTitle"
+					@click="toggleDisableNode"
+				/>
+				<n8n-icon-button
+					data-test-id="delete-node-button"
+					type="tertiary"
+					size="small"
+					text
+					icon="trash"
+					:title="$locale.baseText('node.delete')"
+					@click="deleteNode"
+				/>
+				<n8n-icon-button
+					data-test-id="overflow-node-button"
+					type="tertiary"
+					size="small"
+					text
+					icon="ellipsis-h"
+					@click="(e: MouseEvent) => openContextMenu(e, 'node-button')"
+				/>
+			</div>
+		</div>
 	</div>
 </template>
 
 <script lang="ts">
-import Vue from 'vue';
+import { defineComponent } from 'vue';
+import { mapStores } from 'pinia';
+import { useStorage } from '@/composables/useStorage';
 import {
 	CUSTOM_API_CALL_KEY,
 	LOCAL_STORAGE_PIN_DATA_DISCOVERY_CANVAS_FLAG,
-	WAIT_TIME_UNLIMITED,
 	MANUAL_TRIGGER_NODE_TYPE,
+	NODE_INSERT_SPACER_BETWEEN_INPUT_GROUPS,
+	NOT_DUPLICATABE_NODE_TYPES,
+	SIMULATE_NODE_TYPE,
+	SIMULATE_TRIGGER_NODE_TYPE,
+	WAIT_TIME_UNLIMITED,
 } from '@/constants';
-import { externalHooks } from '@/mixins/externalHooks';
 import { nodeBase } from '@/mixins/nodeBase';
-import { nodeHelpers } from '@/mixins/nodeHelpers';
-import { workflowHelpers } from '@/mixins/workflowHelpers';
-import { pinData } from '@/mixins/pinData';
-
-import type { INodeTypeDescription, ITaskData } from 'n8n-workflow';
-import { IDataObject, NodeHelpers } from 'n8n-workflow';
+import type {
+	ConnectionTypes,
+	ExecutionSummary,
+	INodeInputConfiguration,
+	INodeOutputConfiguration,
+	INodeTypeDescription,
+	ITaskData,
+	NodeOperationError,
+} from 'n8n-workflow';
+import { NodeConnectionType, NodeHelpers } from 'n8n-workflow';
 
 import NodeIcon from '@/components/NodeIcon.vue';
 import TitledList from '@/components/TitledList.vue';
 
-import mixins from 'vue-typed-mixins';
-
 import { get } from 'lodash-es';
-import { getStyleTokenValue, getTriggerNodeServiceName } from '@/utils';
-import type { IExecutionsSummary, INodeUi, XYPosition } from '@/Interface';
-import { INodeUpdatePropertiesInformation } from '@/Interface';
-import { debounceHelper } from '@/mixins/debounce';
-import { mapStores } from 'pinia';
-import { useUIStore } from '@/stores/ui';
-import { useWorkflowsStore } from '@/stores/workflows';
-import { useNDVStore } from '@/stores/ndv';
-import { useNodeTypesStore } from '@/stores/nodeTypes';
+import { getTriggerNodeServiceName } from '@/utils/nodeTypesUtils';
+import type { INodeUi, XYPosition } from '@/Interface';
+import { useUIStore } from '@/stores/ui.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useNDVStore } from '@/stores/ndv.store';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { EnableNodeToggleCommand } from '@/models/history';
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
-
-export default mixins(
-	externalHooks,
-	nodeBase,
-	nodeHelpers,
-	workflowHelpers,
-	pinData,
-	debounceHelper,
-).extend({
+import { type ContextMenuTarget, useContextMenu } from '@/composables/useContextMenu';
+import { useNodeHelpers } from '@/composables/useNodeHelpers';
+import { useExternalHooks } from '@/composables/useExternalHooks';
+import { usePinnedData } from '@/composables/usePinnedData';
+import { useDeviceSupport } from 'n8n-design-system';
+import { useDebounce } from '@/composables/useDebounce';
+
+export default defineComponent({
 	name: 'Node',
 	components: {
 		TitledList,
 		FontAwesomeIcon,
 		NodeIcon,
 	},
+	mixins: [nodeBase],
 	props: {
 		isProductionExecutionPreview: {
 			type: Boolean,
 			default: false,
 		},
+		disablePointerEvents: {
+			type: Boolean,
+			default: false,
+		},
+		hideNodeIssues: {
+			type: Boolean,
+			default: false,
+		},
+	},
+	setup(props) {
+		const workflowsStore = useWorkflowsStore();
+		const contextMenu = useContextMenu();
+		const externalHooks = useExternalHooks();
+		const nodeHelpers = useNodeHelpers();
+		const node = workflowsStore.getNodeByName(props.name);
+		const pinnedData = usePinnedData(node);
+		const deviceSupport = useDeviceSupport();
+		const { callDebounced } = useDebounce();
+
+		return {
+			contextMenu,
+			externalHooks,
+			nodeHelpers,
+			pinnedData,
+			deviceSupport,
+			callDebounced,
+		};
 	},
 	computed: {
 		...mapStores(useNodeTypesStore, useNDVStore, useUIStore, useWorkflowsStore),
 		showPinnedDataInfo(): boolean {
-			return this.hasPinData && !this.isProductionExecutionPreview;
+			return this.pinnedData.hasData.value && !this.isProductionExecutionPreview;
 		},
 		isDuplicatable(): boolean {
 			if (!this.nodeType) return true;
+			if (NOT_DUPLICATABE_NODE_TYPES.includes(this.nodeType.name)) return false;
 			return (
 				this.nodeType.maxNodes === undefined || this.sameTypeNodes.length < this.nodeType.maxNodes
 			);
@@ -237,16 +277,19 @@ export default mixins(
 		isScheduledGroup(): boolean {
 			return this.nodeType?.group.includes('schedule') === true;
 		},
+		iconColorDefault(): string | undefined {
+			if (this.isConfigNode) {
+				return 'var(--color-text-base)';
+			}
+			return undefined;
+		},
 		nodeRunData(): ITaskData[] {
 			return this.workflowsStore.getWorkflowResultDataByNodeName(this.data?.name || '') || [];
 		},
 		hasIssues(): boolean {
-			if (
-				this.nodeExecutionStatus &&
-				['crashed', 'error', 'failed'].includes(this.nodeExecutionStatus)
-			)
+			if (this.nodeExecutionStatus && ['crashed', 'error'].includes(this.nodeExecutionStatus))
 				return true;
-			if (this.hasPinData) return false;
+			if (this.pinnedData.hasData.value) return false;
 			if (this.data?.issues !== undefined && Object.keys(this.data.issues).length) {
 				return true;
 			}
@@ -279,10 +322,10 @@ export default mixins(
 			}
 		},
 		isPollingTypeNode(): boolean {
-			return !!(this.nodeType && this.nodeType.polling);
+			return !!this.nodeType?.polling;
 		},
 		isExecuting(): boolean {
-			return this.workflowsStore.executingNode === this.data.name;
+			return this.workflowsStore.isNodeExecuting(this.data.name);
 		},
 		isSingleActiveTriggerNode(): boolean {
 			const nodes = this.workflowsStore.workflowTriggerNodes.filter((node: INodeUi) => {
@@ -295,6 +338,16 @@ export default mixins(
 		isManualTypeNode(): boolean {
 			return this.data.type === MANUAL_TRIGGER_NODE_TYPE;
 		},
+		isConfigNode(): boolean {
+			return this.nodeTypesStore.isConfigNode(this.workflow, this.data, this.data?.type ?? '');
+		},
+		isConfigurableNode(): boolean {
+			return this.nodeTypesStore.isConfigurableNode(
+				this.workflow,
+				this.data,
+				this.data?.type ?? '',
+			);
+		},
 		isTriggerNode(): boolean {
 			return this.nodeTypesStore.isTriggerNode(this.data?.type || '');
 		},
@@ -314,6 +367,71 @@ export default mixins(
 		sameTypeNodes(): INodeUi[] {
 			return this.workflowsStore.allNodes.filter((node: INodeUi) => node.type === this.data.type);
 		},
+		nodeWrapperClass(): object {
+			const classes = {
+				'node-wrapper': true,
+				'node-wrapper--trigger': this.isTriggerNode,
+				'node-wrapper--configurable': this.isConfigurableNode,
+				'node-wrapper--config': this.isConfigNode,
+			};
+
+			if (this.outputs.length) {
+				const outputTypes = NodeHelpers.getConnectionTypes(this.outputs);
+				const otherOutputs = outputTypes.filter(
+					(outputName) => outputName !== NodeConnectionType.Main,
+				);
+				if (otherOutputs.length) {
+					otherOutputs.forEach((outputName) => {
+						classes[`node-wrapper--connection-type-${outputName}`] = true;
+					});
+				}
+			}
+
+			return classes;
+		},
+		nodeWrapperStyles(): object {
+			const styles: {
+				[key: string]: string | number;
+			} = {
+				left: this.position[0] + 'px',
+				top: this.position[1] + 'px',
+			};
+
+			if (this.node && this.nodeType) {
+				const inputs =
+					NodeHelpers.getNodeInputs(this.workflow, this.node, this.nodeType) ||
+					([] as Array<ConnectionTypes | INodeInputConfiguration>);
+				const inputTypes = NodeHelpers.getConnectionTypes(inputs);
+
+				const nonMainInputs = inputTypes.filter((input) => input !== NodeConnectionType.Main);
+				if (nonMainInputs.length) {
+					const requiredNonMainInputs = inputs.filter(
+						(input) => typeof input !== 'string' && input.required,
+					);
+
+					let spacerCount = 0;
+					if (NODE_INSERT_SPACER_BETWEEN_INPUT_GROUPS) {
+						const requiredNonMainInputsCount = requiredNonMainInputs.length;
+						const optionalNonMainInputsCount = nonMainInputs.length - requiredNonMainInputsCount;
+						spacerCount = requiredNonMainInputsCount > 0 && optionalNonMainInputsCount > 0 ? 1 : 0;
+					}
+
+					styles['--configurable-node-input-count'] = nonMainInputs.length + spacerCount;
+				}
+
+				let outputs = [] as Array<ConnectionTypes | INodeOutputConfiguration>;
+				if (this.workflow.nodes[this.node.name]) {
+					outputs = NodeHelpers.getNodeOutputs(this.workflow, this.node, this.nodeType);
+				}
+
+				const outputTypes = NodeHelpers.getConnectionTypes(outputs);
+
+				const mainOutputs = outputTypes.filter((output) => output === NodeConnectionType.Main);
+				styles['--node-main-output-count'] = mainOutputs.length;
+			}
+
+			return styles;
+		},
 		nodeClass(): object {
 			return {
 				'node-box': true,
@@ -324,7 +442,7 @@ export default mixins(
 		nodeExecutionStatus(): string {
 			const nodeExecutionRunData = this.workflowsStore.getWorkflowRunData?.[this.name];
 			if (nodeExecutionRunData) {
-				return nodeExecutionRunData[0].executionStatus ?? '';
+				return nodeExecutionRunData.filter(Boolean)[0].executionStatus ?? '';
 			}
 			return '';
 		},
@@ -333,7 +451,7 @@ export default mixins(
 			const nodeExecutionRunData = this.workflowsStore.getWorkflowRunData?.[this.name];
 			if (nodeExecutionRunData) {
 				nodeExecutionRunData.forEach((executionRunData) => {
-					if (executionRunData.error) {
+					if (executionRunData?.error) {
 						issues.push(
 							`${executionRunData.error.message}${
 								executionRunData.error.description ? ` (${executionRunData.error.description})` : ''
@@ -347,34 +465,20 @@ export default mixins(
 			}
 			return issues;
 		},
-		nodeDisabledIcon(): string {
-			if (this.data.disabled === false) {
-				return 'pause';
-			} else {
-				return 'play';
-			}
+		nodeDisabledTitle(): string {
+			return this.data.disabled
+				? this.$locale.baseText('node.enable')
+				: this.$locale.baseText('node.disable');
 		},
 		position(): XYPosition {
 			return this.node ? this.node.position : [0, 0];
 		},
 		showDisabledLinethrough(): boolean {
-			return !!(
-				this.data.disabled &&
-				this.nodeType &&
-				this.nodeType.inputs.length === 1 &&
-				this.nodeType.outputs.length === 1
+			return (
+				!this.isConfigurableNode &&
+				!!(this.data.disabled && this.inputs.length === 1 && this.outputs.length === 1)
 			);
 		},
-		nodePosition(): object {
-			const returnStyles: {
-				[key: string]: string;
-			} = {
-				left: this.position[0] + 'px',
-				top: this.position[1] + 'px',
-			};
-
-			return returnStyles;
-		},
 		shortNodeType(): string {
 			return this.$locale.shortNodeType(this.data.type);
 		},
@@ -389,9 +493,9 @@ export default mixins(
 			return this.data.name;
 		},
 		waiting(): string | undefined {
-			const workflowExecution = this.workflowsStore.getWorkflowExecution as IExecutionsSummary;
+			const workflowExecution = this.workflowsStore.getWorkflowExecution as ExecutionSummary;
 
-			if (workflowExecution && workflowExecution.waitTill) {
+			if (workflowExecution?.waitTill) {
 				const lastNodeExecuted = get(workflowExecution, 'data.resultData.lastNodeExecuted');
 				if (this.name === lastNodeExecuted) {
 					const waitDate = new Date(workflowExecution.waitTill);
@@ -409,33 +513,47 @@ export default mixins(
 				}
 			}
 
-			return;
+			return undefined;
 		},
 		workflowRunning(): boolean {
 			return this.uiStore.isActionActive('workflowRunning');
 		},
 		nodeStyle(): object {
-			let borderColor = getStyleTokenValue('--color-foreground-xdark');
+			const returnStyles: {
+				[key: string]: string;
+			} = {};
+
+			let borderColor = '--color-foreground-xdark';
+
+			if (this.isConfigurableNode || this.isConfigNode) {
+				borderColor = '--color-foreground-dark';
+			}
 
 			if (this.data.disabled) {
-				borderColor = getStyleTokenValue('--color-foreground-base');
+				borderColor = '--color-foreground-base';
 			} else if (!this.isExecuting) {
-				if (this.hasIssues) {
-					borderColor = getStyleTokenValue('--color-danger');
+				if (this.hasIssues && !this.hideNodeIssues) {
+					// Do not set red border if there is an issue with the configuration node
+					if (
+						(this.nodeRunData?.[0]?.error as NodeOperationError)?.functionality !==
+						'configuration-node'
+					) {
+						borderColor = '--color-danger';
+						returnStyles['border-width'] = '2px';
+						returnStyles['border-style'] = 'solid';
+					}
 				} else if (this.waiting || this.showPinnedDataInfo) {
-					borderColor = getStyleTokenValue('--color-secondary');
+					borderColor = '--color-canvas-node-pinned-border';
 				} else if (this.nodeExecutionStatus === 'unknown') {
-					borderColor = getStyleTokenValue('--color-foreground-xdark');
+					borderColor = '--color-foreground-xdark';
 				} else if (this.workflowDataItems) {
-					borderColor = getStyleTokenValue('--color-success');
+					returnStyles['border-width'] = '2px';
+					returnStyles['border-style'] = 'solid';
+					borderColor = '--color-success';
 				}
 			}
 
-			const returnStyles: {
-				[key: string]: string;
-			} = {
-				'border-color': borderColor,
-			};
+			returnStyles['border-color'] = `var(${borderColor})`;
 
 			return returnStyles;
 		},
@@ -446,14 +564,14 @@ export default mixins(
 			);
 		},
 		shiftOutputCount(): boolean {
-			return !!(this.nodeType && this.nodeType.outputs.length > 2);
+			return !!(this.nodeType && this.outputs.length > 2);
 		},
 		shouldShowTriggerTooltip(): boolean {
 			return (
 				!!this.node &&
 				this.isTriggerNode &&
 				!this.isPollingTypeNode &&
-				!this.hasPinData &&
+				!this.pinnedData.hasData.value &&
 				!this.isNodeDisabled &&
 				this.workflowRunning &&
 				this.workflowDataItems === 0 &&
@@ -463,6 +581,32 @@ export default mixins(
 				!this.dragging
 			);
 		},
+		isContextMenuOpen(): boolean {
+			return (
+				this.contextMenu.isOpen.value &&
+				this.contextMenu.target.value.source === 'node-button' &&
+				this.contextMenu.target.value.node.name === this.data?.name
+			);
+		},
+		iconNodeType() {
+			if (
+				this.data?.type === SIMULATE_NODE_TYPE ||
+				this.data?.type === SIMULATE_TRIGGER_NODE_TYPE
+			) {
+				const icon = this.data.parameters?.icon as string;
+				const iconNodeType = this.workflow.expression.getSimpleParameterValue(
+					this.data,
+					icon,
+					'internal',
+					{},
+				);
+				if (iconNodeType && typeof iconNodeType === 'string') {
+					return this.nodeTypesStore.getNodeType(iconNodeType);
+				}
+			}
+
+			return this.nodeType;
+		},
 	},
 	watch: {
 		isActive(newValue, oldValue) {
@@ -495,13 +639,15 @@ export default mixins(
 			}
 		},
 		nodeRunData(newValue) {
+			if (!this.data) {
+				return;
+			}
+
 			this.$emit('run', { name: this.data.name, data: newValue, waiting: !!this.waiting });
 		},
 	},
 	created() {
-		const hasSeenPinDataTooltip = localStorage.getItem(
-			LOCAL_STORAGE_PIN_DATA_DISCOVERY_CANVAS_FLAG,
-		);
+		const hasSeenPinDataTooltip = useStorage(LOCAL_STORAGE_PIN_DATA_DISCOVERY_CANVAS_FLAG).value;
 		if (!hasSeenPinDataTooltip) {
 			this.unwatchWorkflowDataItems = this.$watch('workflowDataItems', (dataItemsCount: number) => {
 				this.showPinDataDiscoveryTooltip(dataItemsCount);
@@ -509,7 +655,9 @@ export default mixins(
 		}
 	},
 	mounted() {
-		this.setSubtitle();
+		setTimeout(() => {
+			this.setSubtitle();
+		}, 0);
 		if (this.nodeRunData) {
 			setTimeout(() => {
 				this.$emit('run', {
@@ -536,24 +684,33 @@ export default mixins(
 				!this.isTriggerNode ||
 				this.isManualTypeNode ||
 				this.isScheduledGroup ||
+				this.uiStore.isModalActive ||
 				dataItemsCount === 0
 			)
 				return;
 
-			localStorage.setItem(LOCAL_STORAGE_PIN_DATA_DISCOVERY_CANVAS_FLAG, 'true');
+			useStorage(LOCAL_STORAGE_PIN_DATA_DISCOVERY_CANVAS_FLAG).value = 'true';
 
 			this.pinDataDiscoveryTooltipVisible = true;
 			this.unwatchWorkflowDataItems();
 		},
 		setSubtitle() {
-			const nodeSubtitle =
-				this.getNodeSubtitle(this.data, this.nodeType, this.getCurrentWorkflow()) || '';
-
-			this.nodeSubtitle = nodeSubtitle.includes(CUSTOM_API_CALL_KEY) ? '' : nodeSubtitle;
+			// why is this not a computed property? because it's a very expensive operation
+			// it requires expressions to resolve each subtitle...
+			// and ends up bogging down the UI with big workflows, for example when pasting a workflow or even opening a node...
+			// so we only update it when necessary (when node is mounted and when it's opened and closed (isActive))
+			try {
+				const nodeSubtitle =
+					this.nodeHelpers.getNodeSubtitle(this.data, this.nodeType, this.workflow) || '';
+
+				this.nodeSubtitle = nodeSubtitle.includes(CUSTOM_API_CALL_KEY) ? '' : nodeSubtitle;
+			} catch (e) {
+				// avoid breaking UI if expression error occurs
+			}
 		},
 		disableNode() {
 			if (this.data !== null) {
-				this.disableNodes([this.data]);
+				this.nodeHelpers.disableNodes([this.data]);
 				this.historyStore.pushCommandToUndo(
 					new EnableNodeToggleCommand(
 						this.data.name,
@@ -568,6 +725,7 @@ export default mixins(
 				});
 			}
 		},
+
 		executeNode() {
 			this.$emit('runWorkflow', this.data.name, 'Node.executeNode');
 			this.$telemetry.track('User clicked node hover button', {
@@ -576,6 +734,7 @@ export default mixins(
 				workflow_id: this.workflowsStore.workflowId,
 			});
 		},
+
 		deleteNode() {
 			this.$telemetry.track('User clicked node hover button', {
 				node_type: this.data.type,
@@ -583,25 +742,21 @@ export default mixins(
 				workflow_id: this.workflowsStore.workflowId,
 			});
 
-			Vue.nextTick(() => {
-				// Wait a tick else vue causes problems because the data is gone
-				this.$emit('removeNode', this.data.name);
-			});
+			this.$emit('removeNode', this.data.name);
 		},
-		duplicateNode() {
+
+		toggleDisableNode(event: MouseEvent) {
+			(event.currentTarget as HTMLButtonElement).blur();
 			this.$telemetry.track('User clicked node hover button', {
 				node_type: this.data.type,
-				button_name: 'duplicate',
+				button_name: 'disable',
 				workflow_id: this.workflowsStore.workflowId,
 			});
-			Vue.nextTick(() => {
-				// Wait a tick else vue causes problems because the data is gone
-				this.$emit('duplicateNode', this.data.name);
-			});
+			this.$emit('toggleDisableNode', this.data);
 		},
 
 		onClick(event: MouseEvent) {
-			this.callDebounced('onClickDebounced', { debounceTime: 50, trailing: true }, event);
+			void this.callDebounced(this.onClickDebounced, { debounceTime: 50, trailing: true }, event);
 		},
 
 		onClickDebounced(event: MouseEvent) {
@@ -618,32 +773,53 @@ export default mixins(
 			this.pinDataDiscoveryTooltipVisible = false;
 		},
 		touchStart() {
-			if (this.isTouchDevice === true && this.isMacOs === false && this.isTouchActive === false) {
+			if (this.deviceSupport.isTouchDevice && !this.deviceSupport.isMacOs && !this.isTouchActive) {
 				this.isTouchActive = true;
 				setTimeout(() => {
 					this.isTouchActive = false;
 				}, 2000);
 			}
 		},
+		openContextMenu(event: MouseEvent, source: ContextMenuTarget['source']) {
+			if (this.data) {
+				this.contextMenu.open(event, { source, node: this.data });
+			}
+		},
 	},
 });
 </script>
 
 <style lang="scss" scoped>
+.context-menu {
+	position: absolute;
+}
+
 .node-wrapper {
+	--node-width: 100px;
+	/*
+		Set the node height to 100px as a base.
+		Increase height by 20px for each output beyond the 4th one.
+		max(0, var(--node-main-output-count, 1) - 4) ensures that we only start counting after the 4th output.
+	*/
+	--node-height: calc(100px + max(0, var(--node-main-output-count, 1) - 4) * 20px);
+
+	--configurable-node-min-input-count: 4;
+	--configurable-node-input-width: 65px;
+
 	position: absolute;
-	width: 100px;
-	height: 100px;
+	width: var(--node-width);
+	height: var(--node-height);
 
 	.node-description {
 		position: absolute;
-		top: 100px;
-		left: -50px;
+		top: var(--node-height);
+		left: calc(var(--node-width) / 2 * -1);
 		line-height: 1.5;
 		text-align: center;
 		cursor: default;
 		padding: 8px;
-		width: 200px;
+		width: 100%;
+		min-width: calc(var(--node-width) * 2);
 		pointer-events: none; // prevent container from being draggable
 
 		.node-name > p {
@@ -668,20 +844,60 @@ export default mixins(
 		}
 	}
 
+	&.touch-active,
+	&:hover,
+	&.menu-open {
+		.node-options {
+			opacity: 1;
+		}
+	}
+
+	.node-options {
+		:deep(.button) {
+			--button-font-color: var(--color-text-light);
+			--button-border-radius: 0;
+		}
+		cursor: default;
+		position: absolute;
+		bottom: 100%;
+		z-index: 11;
+		min-width: 100%;
+		display: flex;
+		left: calc(-1 * var(--spacing-4xs));
+		right: calc(-1 * var(--spacing-4xs));
+		justify-content: center;
+		align-items: center;
+		padding-bottom: var(--spacing-2xs);
+		font-size: var(--font-size-s);
+		opacity: 0;
+		transition: opacity 100ms ease-in;
+
+		&-inner {
+			display: flex;
+			align-items: center;
+			background-color: var(--color-canvas-background);
+			border-radius: var(--border-radius-base);
+		}
+	}
+
 	.node-default {
 		position: absolute;
 		width: 100%;
 		height: 100%;
 		cursor: pointer;
+		&.disable-pointer-events {
+			pointer-events: none;
+		}
 
 		.node-box {
 			width: 100%;
 			height: 100%;
 			border: 2px solid var(--color-foreground-xdark);
 			border-radius: var(--border-radius-large);
-			background-color: var(--color-background-xlight);
+			background-color: var(--color-canvas-node-background);
+			--color-background-node-icon-badge: var(--color-canvas-node-background);
 			&.executing {
-				background-color: var(--color-primary-tint-3) !important;
+				background-color: $node-background-executing !important;
 
 				.node-executing-info {
 					display: inline-block;
@@ -689,17 +905,6 @@ export default mixins(
 			}
 		}
 
-		&.touch-active,
-		&:hover {
-			.node-execute {
-				display: initial;
-			}
-
-			.node-options {
-				display: initial;
-			}
-		}
-
 		.node-executing-info {
 			display: none;
 			position: absolute;
@@ -756,52 +961,113 @@ export default mixins(
 		.waiting {
 			color: var(--color-secondary);
 		}
+	}
 
-		.node-options {
-			display: none;
-			position: absolute;
-			top: -25px;
-			left: -10px;
-			width: 120px;
-			height: 26px;
-			font-size: 0.9em;
-			text-align: left;
-			z-index: 10;
-			color: #aaa;
-			text-align: center;
+	&--config {
+		--configurable-node-input-width: 55px;
+		--node-width: 75px;
+		--node-height: 75px;
 
-			.option {
-				width: 28px;
-				display: inline-block;
+		.node-default {
+			.node-icon {
+				scale: 0.75;
+			}
+
+			.node-box {
+				border: 2px solid var(--color-foreground-xdark);
+				border-radius: 50px;
+
+				&.executing {
+					background-color: $node-background-executing-other !important;
+				}
 
-				&.touch {
-					display: none;
+				.node-executing-info {
+					font-size: 2.85em;
 				}
+			}
+		}
 
-				&:hover {
-					color: $color-primary;
+		@each $node-type in $supplemental-node-types {
+			&.node-wrapper--connection-type-#{$node-type} {
+				.node-default .node-box {
+					background: var(--node-type-#{$node-type}-background);
 				}
 
-				.execute-icon {
-					position: relative;
-					top: 2px;
-					font-size: 1.2em;
+				.node-description {
+					.node-subtitle {
+						color: var(--node-type-#{$node-type}-color);
+					}
 				}
 			}
 		}
 
-		&.is-touch-device .node-options {
-			left: -25px;
-			width: 150px;
+		.node-info-icon {
+			bottom: 4px !important;
+			right: 50% !important;
+			transform: translateX(50%) scale(0.75);
+		}
+
+		&.node-wrapper--configurable {
+			--configurable-node-icon-offset: 20px;
+
+			.node-info-icon {
+				bottom: 1px !important;
+				right: 1px !important;
+			}
+		}
+	}
+
+	&--configurable {
+		--node-width: var(
+			--configurable-node-width,
+			calc(
+				max(var(--configurable-node-input-count, 5), var(--configurable-node-min-input-count)) *
+					var(--configurable-node-input-width)
+			)
+		);
+		--configurable-node-icon-offset: 40px;
+		--configurable-node-icon-size: 30px;
+
+		.node-description {
+			top: calc(50%);
+			transform: translateY(-50%);
+			left: calc(
+				var(--configurable-node-icon-offset) + var(--configurable-node-icon-size) + var(--spacing-s)
+			);
+			text-align: left;
+			overflow: auto;
+			white-space: normal;
+			min-width: unset;
+			max-width: calc(
+				var(--node-width) - var(--configurable-node-icon-offset) - var(
+						--configurable-node-icon-size
+					) - 2 * var(--spacing-s)
+			);
+			.node-name > p {
+				color: var(--color-configurable-node-name);
+			}
+		}
+
+		.node-default {
+			.node-icon {
+				left: var(--configurable-node-icon-offset);
+			}
 
-			.option.touch {
-				display: initial;
+			.node-executing-info {
+				left: -67px;
 			}
 		}
+
+		&[data-node-type='@n8n/n8n-nodes-langchain.chatTrigger'] {
+			--configurable-node-min-input-count: 1;
+			--configurable-node-input-width: 176px;
+		}
 	}
+
 	&--trigger .node-default .node-box {
 		border-radius: 32px 8px 8px 32px;
 	}
+
 	.trigger-icon {
 		position: absolute;
 		right: 100%;
@@ -818,24 +1084,26 @@ export default mixins(
 }
 
 .select-background {
+	--node--selected--box-shadow-radius: 8px;
+
 	display: block;
-	background-color: hsla(
-		var(--color-foreground-base-h),
-		var(--color-foreground-base-s),
-		var(--color-foreground-base-l),
-		60%
-	);
+	background-color: var(--color-canvas-selected);
 	border-radius: var(--border-radius-xlarge);
 	overflow: hidden;
 	position: absolute;
-	left: -8px !important;
-	top: -8px !important;
-	height: 116px;
-	width: 116px !important;
+	left: calc(var(--node--selected--box-shadow-radius) * -1) !important;
+	top: calc(var(--node--selected--box-shadow-radius) * -1) !important;
+	height: calc(100% + 2 * var(--node--selected--box-shadow-radius));
+	width: calc(100% + 2 * var(--node--selected--box-shadow-radius)) !important;
 
 	.node-wrapper--trigger & {
 		border-radius: 36px 8px 8px 36px;
 	}
+
+	.node-wrapper--config & {
+		--node--selected--box-shadow-radius: 4px;
+		border-radius: 60px;
+	}
 }
 
 .disabled-linethrough {
@@ -925,23 +1193,9 @@ export default mixins(
 	z-index: 100;
 }
 
-.node-options {
-	z-index: 10;
-}
-
 .drop-add-node-label {
 	z-index: 10;
 }
-
-.jtk-connector.success:not(.jtk-hover) {
-	path:not(.jtk-connector-outline) {
-		stroke: var(--color-success-light);
-	}
-	path[jtk-overlay-id='endpoint-arrow'],
-	path[jtk-overlay-id='midpoint-arrow'] {
-		fill: var(--color-success-light);
-	}
-}
 </style>
 
 <style lang="scss">
@@ -949,6 +1203,8 @@ export default mixins(
 	--endpoint-size-small: 14px;
 	--endpoint-size-medium: 18px;
 	--stalk-size: 40px;
+	--stalk-medium-size: 60px;
+	--stalk-large-size: 90px;
 	--stalk-success-size: 87px;
 	--stalk-success-size-without-label: 40px;
 	--stalk-long-size: 127px;
@@ -1001,19 +1257,18 @@ export default mixins(
 	// mouse over event.
 	pointer-events: none;
 	span {
-		border-radius: 7px;
 		background-color: hsla(
 			var(--color-canvas-background-h),
 			var(--color-canvas-background-s),
 			var(--color-canvas-background-l),
 			0.85
 		);
+		border-radius: var(--border-radius-base);
 		line-height: 1.3em;
 		padding: 0px 3px;
 		white-space: nowrap;
 		font-size: var(--font-size-s);
 		font-weight: var(--font-weight-regular);
-		color: var(--color-success);
 		margin-top: -15px;
 
 		&.floating {
@@ -1058,6 +1313,15 @@ export default mixins(
 		stroke: var(--color-foreground-xdark);
 	}
 
+	&.error {
+		path {
+			fill: var(--color-node-error-output-text-color);
+		}
+		rect {
+			stroke: var(--color-node-error-output-text-color);
+		}
+	}
+
 	&.small {
 		margin-left: calc((var(--stalk-size) + var(--plus-endpoint-box-size-small) / 2));
 		g {
@@ -1081,23 +1345,141 @@ export default mixins(
 	}
 }
 
+.diamond-output-endpoint {
+	--diamond-output-endpoint--transition-duration: 0.15s;
+
+	transition: transform var(--diamond-output-endpoint--transition-duration) ease;
+	transform: rotate(45deg);
+	z-index: 10;
+}
+
+.add-input-endpoint {
+	--add-input-endpoint--transition-duration: 0.15s;
+
+	&:not(.jtk-endpoint-connected) {
+		cursor: pointer;
+	}
+
+	&.add-input-endpoint-multiple {
+		z-index: 100;
+		cursor: pointer;
+	}
+
+	&.jtk-endpoint-connected {
+		z-index: 10;
+	}
+
+	&.add-input-endpoint-error {
+		--endpoint-svg-color: var(--color-danger);
+	}
+
+	.add-input-endpoint-default {
+		transition: transform var(--add-input-endpoint--transition-duration) ease;
+	}
+
+	.add-input-endpoint-diamond {
+		transition: fill var(--add-input-endpoint--transition-duration) ease;
+		fill: var(--svg-color, var(--color-primary));
+	}
+
+	.add-input-endpoint-line {
+		transition: fill var(--add-input-endpoint--transition-duration) ease;
+		fill: var(--svg-color, var(--color-primary));
+	}
+
+	.add-input-endpoint-plus-rectangle {
+		transition:
+			fill var(--add-input-endpoint--transition-duration) ease,
+			stroke var(--add-input-endpoint--transition-duration) ease;
+		fill: var(--color-foreground-xlight);
+		stroke: var(--svg-color, var(--color-primary));
+	}
+
+	.add-input-endpoint-plus-icon {
+		stroke: none;
+		transition: fill var(--add-input-endpoint--transition-duration) ease;
+		fill: var(--svg-color, var(--color-primary));
+	}
+
+	.add-input-endpoint-connected-rectangle {
+		transition:
+			fill var(--add-input-endpoint--transition-duration) ease,
+			stroke var(--add-input-endpoint--transition-duration) ease;
+		fill: var(--color-foreground-xdark);
+		stroke: var(--color-foreground-xdark);
+	}
+
+	&.rect-input-endpoint-hover {
+		.add-input-endpoint-plus-rectangle {
+			stroke: var(--svg-color, var(--color-primary));
+		}
+
+		.add-input-endpoint-plus-icon {
+			fill: var(--svg-color, var(--color-primary));
+		}
+	}
+
+	&.jtk-endpoint-connected:not(.add-input-endpoint-multiple) {
+		.add-input-endpoint-unconnected {
+			display: none;
+		}
+
+		&.rect-input-endpoint-hover {
+			.add-input-endpoint-connected-rectangle {
+				fill: var(--svg-color, var(--color-primary));
+				stroke: var(--svg-color, var(--color-primary));
+			}
+		}
+	}
+}
+
 .node-input-endpoint-label,
 .node-output-endpoint-label {
+	--node-endpoint-label--transition-duration: 0.15s;
+
 	background-color: hsla(
 		var(--color-canvas-background-h),
 		var(--color-canvas-background-s),
 		var(--color-canvas-background-l),
 		0.85
 	);
-	border-radius: 7px;
-	font-size: 0.7em;
-	padding: 2px;
+	border-radius: var(--border-radius-large);
+	font-size: var(--font-size-3xs);
+	padding: var(--spacing-5xs) var(--spacing-4xs);
 	white-space: nowrap;
+	transition: color var(--node-endpoint-label--transition-duration) ease;
+
+	@each $node-type in $supplemental-node-types {
+		&.node-connection-type-#{$node-type} {
+			color: var(--node-type-supplemental-label-color);
+		}
+	}
+}
+
+.node-output-endpoint-label.node-connection-category-error {
+	color: var(--color-node-error-output-text-color);
 }
 
 .node-output-endpoint-label {
 	margin-left: calc(var(--endpoint-size-small) + var(--spacing-2xs));
+
+	&--data {
+		text-align: center;
+		margin-top: calc(var(--spacing-l) * -1);
+		margin-left: 0;
+	}
+
+	// Some nodes allow for dynamic connection labels
+	// so we need to make sure the label does not overflow
+	&.node-connection-type-main[data-endpoint-label-length] {
+		max-width: calc(var(--stalk-size) - var(--endpoint-size-small) - var(--spacing-4xs));
+		overflow: hidden;
+		text-overflow: ellipsis;
+		transform: translateY(-50%) !important;
+		margin-left: var(--endpoint-size-small);
+	}
 }
+
 .node-input-endpoint-label {
 	text-align: right;
 	margin-left: -25px;
@@ -1105,7 +1487,14 @@ export default mixins(
 	&--moved {
 		margin-left: -40px;
 	}
+
+	&--data {
+		text-align: center;
+		margin-top: calc(var(--spacing-5xs) * -1);
+		margin-left: 0;
+	}
 }
+
 .hover-message.jtk-overlay {
 	--hover-message-width: 110px;
 	font-weight: var(--font-weight-bold);
@@ -1130,6 +1519,7 @@ export default mixins(
 		opacity: 1;
 	}
 }
+
 .long-stalk {
 	--stalk-size: var(--stalk-long-size);
 }
@@ -1139,4 +1529,12 @@ export default mixins(
 .ep-success--without-label {
 	--stalk-size: var(--stalk-success-size-without-label);
 }
+
+[data-endpoint-label-length='medium'] {
+	--stalk-size: var(--stalk-medium-size);
+}
+
+[data-endpoint-label-length='large'] {
+	--stalk-size: var(--stalk-large-size);
+}
 </style>
diff --git a/packages/editor-ui/src/components/Node/NodeCreation.vue b/packages/editor-ui/src/components/Node/NodeCreation.vue
index 5c50b92528146..a30cd243de2f6 100644
--- a/packages/editor-ui/src/components/Node/NodeCreation.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreation.vue
@@ -1,145 +1,152 @@
+<script setup lang="ts">
+import { defineAsyncComponent, reactive } from 'vue';
+import { getMidCanvasPosition } from '@/utils/nodeViewUtils';
+import {
+	DEFAULT_STICKY_HEIGHT,
+	DEFAULT_STICKY_WIDTH,
+	NODE_CREATOR_OPEN_SOURCES,
+	STICKY_NODE_TYPE,
+} from '@/constants';
+import { useUIStore } from '@/stores/ui.store';
+import type { AddedNodesAndConnections, ToggleNodeCreatorOptions } from '@/Interface';
+import { useActions } from './NodeCreator/composables/useActions';
+import KeyboardShortcutTooltip from '@/components/KeyboardShortcutTooltip.vue';
+
+type Props = {
+	nodeViewScale: number;
+	createNodeActive?: boolean;
+};
+
+// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+const NodeCreator = defineAsyncComponent(
+	async () => await import('@/components/Node/NodeCreator/NodeCreator.vue'),
+);
+
+const props = withDefaults(defineProps<Props>(), {
+	createNodeActive: false,
+});
+
+const emit = defineEmits<{
+	(event: 'addNodes', value: AddedNodesAndConnections): void;
+	(event: 'toggleNodeCreator', value: ToggleNodeCreatorOptions): void;
+}>();
+
+const state = reactive({
+	showStickyButton: false,
+});
+
+const uiStore = useUIStore();
+
+const { getAddedNodesAndConnections } = useActions();
+
+function onCreateMenuHoverIn(mouseinEvent: MouseEvent) {
+	const buttonsWrapper = mouseinEvent.target as Element;
+
+	// Once the popup menu is hovered, it's pointer events are disabled so it's not interfering with element underneath it.
+	state.showStickyButton = true;
+	const moveCallback = (mousemoveEvent: MouseEvent) => {
+		if (buttonsWrapper) {
+			const wrapperBounds = buttonsWrapper.getBoundingClientRect();
+			const wrapperH = wrapperBounds.height;
+			const wrapperW = wrapperBounds.width;
+			const wrapperLeftNear = wrapperBounds.left;
+			const wrapperLeftFar = wrapperLeftNear + wrapperW;
+			const wrapperTopNear = wrapperBounds.top;
+			const wrapperTopFar = wrapperTopNear + wrapperH;
+			const inside =
+				mousemoveEvent.pageX > wrapperLeftNear &&
+				mousemoveEvent.pageX < wrapperLeftFar &&
+				mousemoveEvent.pageY > wrapperTopNear &&
+				mousemoveEvent.pageY < wrapperTopFar;
+			if (!inside) {
+				state.showStickyButton = false;
+				document.removeEventListener('mousemove', moveCallback, false);
+			}
+		}
+	};
+	document.addEventListener('mousemove', moveCallback, false);
+}
+
+function openNodeCreator() {
+	emit('toggleNodeCreator', {
+		source: NODE_CREATOR_OPEN_SOURCES.ADD_NODE_BUTTON,
+		createNodeActive: true,
+	});
+}
+
+function addStickyNote() {
+	if (document.activeElement) {
+		(document.activeElement as HTMLElement).blur();
+	}
+
+	const offset: [number, number] = [...uiStore.nodeViewOffsetPosition];
+
+	const position = getMidCanvasPosition(props.nodeViewScale, offset);
+	position[0] -= DEFAULT_STICKY_WIDTH / 2;
+	position[1] -= DEFAULT_STICKY_HEIGHT / 2;
+
+	emit('addNodes', getAddedNodesAndConnections([{ type: STICKY_NODE_TYPE, position }]));
+}
+
+function closeNodeCreator() {
+	emit('toggleNodeCreator', { createNodeActive: false });
+}
+
+function nodeTypeSelected(nodeTypes: string[]) {
+	emit('addNodes', getAddedNodesAndConnections(nodeTypes.map((type) => ({ type }))));
+	closeNodeCreator();
+}
+</script>
+
 <template>
 	<div>
 		<div
 			v-if="!createNodeActive"
-			:class="[$style.nodeButtonsWrapper, showStickyButton ? $style.noEvents : '']"
+			:class="[$style.nodeButtonsWrapper, state.showStickyButton ? $style.noEvents : '']"
 			@mouseenter="onCreateMenuHoverIn"
 		>
 			<div :class="$style.nodeCreatorButton" data-test-id="node-creator-plus-button">
-				<n8n-icon-button
-					size="xlarge"
-					icon="plus"
-					type="tertiary"
-					:class="$style.nodeCreatorPlus"
-					@click="openNodeCreator"
-					:title="$locale.baseText('nodeView.addNode')"
-				/>
-				<div
-					:class="[$style.addStickyButton, showStickyButton ? $style.visibleButton : '']"
-					@click="addStickyNote"
-					data-test-id="add-sticky-button"
+				<KeyboardShortcutTooltip
+					:label="$locale.baseText('nodeView.openNodesPanel')"
+					:shortcut="{ keys: ['Tab'] }"
+					placement="left"
 				>
 					<n8n-icon-button
-						size="medium"
+						size="xlarge"
+						icon="plus"
 						type="tertiary"
-						:icon="['far', 'note-sticky']"
-						:title="$locale.baseText('nodeView.addSticky')"
+						:class="$style.nodeCreatorPlus"
+						@click="openNodeCreator"
 					/>
+				</KeyboardShortcutTooltip>
+				<div
+					:class="[$style.addStickyButton, state.showStickyButton ? $style.visibleButton : '']"
+					data-test-id="add-sticky-button"
+					@click="addStickyNote"
+				>
+					<KeyboardShortcutTooltip
+						:label="$locale.baseText('nodeView.addStickyHint')"
+						:shortcut="{ keys: ['s'], shiftKey: true }"
+						placement="left"
+					>
+						<n8n-icon-button type="tertiary" :icon="['far', 'note-sticky']" />
+					</KeyboardShortcutTooltip>
 				</div>
 			</div>
 		</div>
-		<node-creator
-			:active="createNodeActive"
-			@nodeTypeSelected="nodeTypeSelected"
-			@closeNodeCreator="closeNodeCreator"
-		/>
+		<Suspense>
+			<NodeCreator
+				:active="createNodeActive"
+				@node-type-selected="nodeTypeSelected"
+				@close-node-creator="closeNodeCreator"
+			/>
+		</Suspense>
 	</div>
 </template>
 
-<script lang="ts">
-import { defineComponent } from 'vue';
-import { getMidCanvasPosition } from '@/utils/nodeViewUtils';
-import {
-	DEFAULT_STICKY_HEIGHT,
-	DEFAULT_STICKY_WIDTH,
-	NODE_CREATOR_OPEN_SOURCES,
-	STICKY_NODE_TYPE,
-} from '@/constants';
-import { mapStores } from 'pinia';
-import { useUIStore } from '@/stores/ui';
-
-export default defineComponent({
-	name: 'node-creation',
-	components: {
-		NodeCreator: () => import('@/components/Node/NodeCreator/NodeCreator.vue'),
-	},
-	props: {
-		nodeViewScale: {
-			type: Number,
-			required: true,
-		},
-		createNodeActive: {
-			type: Boolean,
-			default: false,
-		},
-	},
-	data() {
-		return {
-			showStickyButton: false,
-		};
-	},
-	computed: {
-		...mapStores(useUIStore),
-	},
-	methods: {
-		onCreateMenuHoverIn(mouseinEvent: MouseEvent) {
-			const buttonsWrapper = mouseinEvent.target as Element;
-
-			// Once the popup menu is hovered, it's pointer events are disabled so it's not interfering with element underneath it.
-			this.showStickyButton = true;
-			const moveCallback = (mousemoveEvent: MouseEvent) => {
-				if (buttonsWrapper) {
-					const wrapperBounds = buttonsWrapper.getBoundingClientRect();
-					const wrapperH = wrapperBounds.height;
-					const wrapperW = wrapperBounds.width;
-					const wrapperLeftNear = wrapperBounds.left;
-					const wrapperLeftFar = wrapperLeftNear + wrapperW;
-					const wrapperTopNear = wrapperBounds.top;
-					const wrapperTopFar = wrapperTopNear + wrapperH;
-					const inside =
-						mousemoveEvent.pageX > wrapperLeftNear &&
-						mousemoveEvent.pageX < wrapperLeftFar &&
-						mousemoveEvent.pageY > wrapperTopNear &&
-						mousemoveEvent.pageY < wrapperTopFar;
-					if (!inside) {
-						this.showStickyButton = false;
-						document.removeEventListener('mousemove', moveCallback, false);
-					}
-				}
-			};
-			document.addEventListener('mousemove', moveCallback, false);
-		},
-		openNodeCreator() {
-			this.$emit('toggleNodeCreator', {
-				source: NODE_CREATOR_OPEN_SOURCES.ADD_NODE_BUTTON,
-				createNodeActive: true,
-			});
-		},
-		addStickyNote() {
-			if (document.activeElement) {
-				(document.activeElement as HTMLElement).blur();
-			}
-
-			const offset: [number, number] = [...this.uiStore.nodeViewOffsetPosition];
-
-			const position = getMidCanvasPosition(this.nodeViewScale, offset);
-			position[0] -= DEFAULT_STICKY_WIDTH / 2;
-			position[1] -= DEFAULT_STICKY_HEIGHT / 2;
-
-			this.$emit('addNode', [
-				{
-					nodeTypeName: STICKY_NODE_TYPE,
-					position,
-				},
-			]);
-		},
-		closeNodeCreator() {
-			this.$emit('toggleNodeCreator', { createNodeActive: false });
-		},
-		nodeTypeSelected(nodeTypeNames: string[]) {
-			this.$emit(
-				'addNode',
-				nodeTypeNames.map((nodeTypeName) => ({ nodeTypeName })),
-			);
-			this.closeNodeCreator();
-		},
-	},
-});
-</script>
-
 <style lang="scss" module>
 .nodeButtonsWrapper {
-	position: fixed;
+	position: absolute;
 	width: 150px;
 	height: 200px;
 	top: 0;
@@ -164,20 +171,20 @@ export default defineComponent({
 }
 
 .nodeCreatorButton {
-	position: fixed;
+	position: absolute;
 	text-align: center;
-	top: calc(#{$header-height} + var(--spacing-s));
-	right: var(--spacing-s);
+	top: var(--spacing-l);
+	right: var(--spacing-l);
 	pointer-events: all !important;
 
 	button {
-		border-color: var(--color-foreground-xdark);
-		color: var(--color-foreground-xdark);
+		border-color: var(--color-button-node-creator-border-font);
+		color: var(--color-button-node-creator-border-font);
 
 		&:hover {
-			border-color: var(--color-primary);
-			color: var(--color-primary);
-			background: var(--color-background-xlight);
+			border-color: var(--color-button-node-creator-hover-border-font);
+			color: var(--color-button-node-creator-hover-border-font);
+			background: var(--color-button-node-creator-background);
 		}
 	}
 }
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/ActionItem.vue b/packages/editor-ui/src/components/Node/NodeCreator/ActionItem.vue
deleted file mode 100644
index 6d059d9387e61..0000000000000
--- a/packages/editor-ui/src/components/Node/NodeCreator/ActionItem.vue
+++ /dev/null
@@ -1,163 +0,0 @@
-<template>
-	<n8n-node-creator-node
-		:key="`${action.actionKey}_${action.displayName}`"
-		@click="onActionClick(action)"
-		@dragstart="onDragStart"
-		@dragend="onDragEnd"
-		draggable
-		:class="$style.action"
-		:title="action.displayName"
-		:isTrigger="isTriggerAction(action)"
-	>
-		<template #dragContent>
-			<div :class="$style.draggableDataTransfer" ref="draggableDataTransfer" />
-			<div :class="$style.draggable" :style="draggableStyle" v-show="dragging">
-				<node-icon :nodeType="nodeType" @click.capture.stop :size="40" :shrink="false" />
-			</div>
-		</template>
-		<template #icon>
-			<node-icon :nodeType="action" />
-		</template>
-	</n8n-node-creator-node>
-</template>
-
-<script setup lang="ts">
-import { reactive, computed, toRefs, getCurrentInstance } from 'vue';
-import type { INodeTypeDescription, INodeActionTypeDescription } from 'n8n-workflow';
-import { getNewNodePosition, NODE_SIZE } from '@/utils/nodeViewUtils';
-import type { IUpdateInformation } from '@/Interface';
-import NodeIcon from '@/components/NodeIcon.vue';
-import { useNodeCreatorStore } from '@/stores/nodeCreator';
-
-export interface Props {
-	nodeType: INodeTypeDescription;
-	action: INodeActionTypeDescription;
-}
-
-const props = defineProps<Props>();
-const instance = getCurrentInstance();
-const telemetry = instance?.proxy.$telemetry;
-const { getActionData, getNodeTypesWithManualTrigger, setAddedNodeActionParameters } =
-	useNodeCreatorStore();
-
-const state = reactive({
-	dragging: false,
-	draggablePosition: {
-		x: -100,
-		y: -100,
-	},
-	storeWatcher: null as Function | null,
-	draggableDataTransfer: null as Element | null,
-});
-const emit = defineEmits<{
-	(event: 'actionSelected', action: IUpdateInformation): void;
-	(event: 'dragstart', $e: DragEvent): void;
-	(event: 'dragend', $e: DragEvent): void;
-}>();
-
-const draggableStyle = computed<{ top: string; left: string }>(() => ({
-	top: `${state.draggablePosition.y}px`,
-	left: `${state.draggablePosition.x}px`,
-}));
-
-const actionData = computed(() => getActionData(props.action));
-
-const isTriggerAction = (action: INodeActionTypeDescription) =>
-	action.name?.toLowerCase().includes('trigger');
-function onActionClick(actionItem: INodeActionTypeDescription) {
-	emit('actionSelected', getActionData(actionItem));
-}
-
-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';
-		event.dataTransfer.setDragImage(state.draggableDataTransfer as Element, 0, 0);
-		event.dataTransfer.setData(
-			'nodeTypeName',
-			getNodeTypesWithManualTrigger(actionData.value?.key).join(','),
-		);
-
-		state.storeWatcher = setAddedNodeActionParameters(actionData.value, telemetry);
-		document.body.addEventListener('dragend', onDragEnd);
-	}
-
-	state.dragging = true;
-	state.draggablePosition = { x, y };
-	emit('dragstart', event);
-}
-
-function onDragOver(event: DragEvent): void {
-	if (!state.dragging || (event.pageX === 0 && event.pageY === 0)) {
-		return;
-	}
-
-	const [x, y] = getNewNodePosition([], [event.pageX - NODE_SIZE / 2, event.pageY - NODE_SIZE / 2]);
-
-	state.draggablePosition = { x, y };
-}
-
-function onDragEnd(event: DragEvent): void {
-	if (state.storeWatcher) state.storeWatcher();
-	document.body.removeEventListener('dragend', onDragEnd);
-	document.body.removeEventListener('dragover', onDragOver);
-
-	emit('dragend', event);
-
-	state.dragging = false;
-	setTimeout(() => {
-		state.draggablePosition = { x: -100, y: -100 };
-	}, 300);
-}
-const { draggableDataTransfer, dragging } = toRefs(state);
-</script>
-
-<style lang="scss" module>
-.action {
-	margin-left: 15px;
-	margin-right: 12px;
-
-	--trigger-icon-background-color: #{$trigger-icon-background-color};
-	--trigger-icon-border-color: #{$trigger-icon-border-color};
-}
-.nodeIcon {
-	margin-right: var(--spacing-s);
-}
-
-.apiHint {
-	font-size: var(--font-size-2xs);
-	color: var(--color-text-base);
-	padding-top: var(--spacing-s);
-	line-height: var(--font-line-height-regular);
-	border-top: 1px solid #dbdfe7;
-	z-index: 1;
-	// Prevent double borders when the last category is collapsed
-	margin-top: -1px;
-}
-
-.draggable {
-	width: 100px;
-	height: 100px;
-	position: fixed;
-	z-index: 1;
-	opacity: 0.66;
-	border: 2px solid var(--color-foreground-xdark);
-	border-radius: var(--border-radius-large);
-	background-color: var(--color-background-xlight);
-	display: flex;
-	justify-content: center;
-	align-items: center;
-}
-
-.draggableDataTransfer {
-	width: 1px;
-	height: 1px;
-}
-</style>
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/CategorizedItems.vue b/packages/editor-ui/src/components/Node/NodeCreator/CategorizedItems.vue
deleted file mode 100644
index 31cc8bd698c45..0000000000000
--- a/packages/editor-ui/src/components/Node/NodeCreator/CategorizedItems.vue
+++ /dev/null
@@ -1,690 +0,0 @@
-<template>
-	<transition :name="`panel-slide-${state.transitionDirection}`">
-		<div
-			ref="mainPanelContainer"
-			tabindex="0"
-			data-test-id="categorized-items"
-			:class="$style.categorizedItems"
-			:key="`${activeSubcategoryTitle + selectedViewType}_transition`"
-			@keydown.capture="nodeFilterKeyDown"
-		>
-			<div
-				:class="{
-					[$style.header]: true,
-					[$style.headerWithBackground]: activeSubcategory,
-				}"
-				data-test-id="categorized-items-subcategory"
-			>
-				<button
-					:class="$style.backButton"
-					@click="onBackButton"
-					v-if="isViewNavigated || activeSubcategory"
-				>
-					<font-awesome-icon :class="$style.subcategoryBackIcon" icon="arrow-left" size="2x" />
-				</button>
-				<div v-if="isRootView && $slots.header">
-					<slot name="header" />
-				</div>
-				<template v-if="activeSubcategory">
-					<n8n-node-icon
-						:class="$style.nodeIcon"
-						v-if="showSubcategoryIcon && activeSubcategory.properties.icon"
-						:type="activeSubcategory.properties.iconType || 'unknown'"
-						:src="activeSubcategory.properties.icon"
-						:name="activeSubcategory.properties.icon"
-						:color="activeSubcategory.properties.color"
-						:circle="false"
-						:showTooltip="false"
-						:size="16"
-					/>
-					<span v-text="activeSubcategoryTitle" />
-				</template>
-			</div>
-			<div
-				v-if="isRootView && $slots.description"
-				:class="{
-					[$style.description]: true,
-					[$style.descriptionOffset]: isViewNavigated || activeSubcategory,
-				}"
-			>
-				<slot name="description" />
-			</div>
-
-			<search-bar
-				v-if="alwaysShowSearch || isSearchVisible"
-				:key="nodeCreatorStore.selectedView"
-				:value="searchFilter"
-				:placeholder="
-					searchPlaceholder
-						? searchPlaceholder
-						: $locale.baseText('nodeCreator.searchBar.searchNodes')
-				"
-				@input="onNodeFilterChange"
-			/>
-
-			<div :class="$style.scrollable" ref="scrollableContainer">
-				<item-iterator
-					:elements="searchFilter.length === 0 ? renderedItems : mergedFilteredNodes"
-					:activeIndex="activeSubcategory ? activeSubcategoryIndex : activeIndex"
-					:with-actions-getter="withActionsGetter"
-					:with-description-getter="withDescriptionGetter"
-					:lazyRender="true"
-					@selected="selected"
-					@actionsOpen="$listeners.actionsOpen"
-					@nodeTypeSelected="$listeners.nodeTypeSelected"
-				/>
-				<div v-if="searchFilter.length > 0 && mergedFilteredNodes.length === 0">
-					<slot name="noResults" />
-				</div>
-				<div :class="$style.footer" v-else-if="$slots.footer">
-					<slot name="footer" />
-				</div>
-			</div>
-		</div>
-	</transition>
-</template>
-
-<script lang="ts" setup>
-import {
-	computed,
-	reactive,
-	watch,
-	getCurrentInstance,
-	toRefs,
-	ref,
-	onUnmounted,
-	nextTick,
-} from 'vue';
-import { camelCase } from 'lodash-es';
-import type { INodeTypeDescription } from 'n8n-workflow';
-import ItemIterator from './ItemIterator.vue';
-import SearchBar from './SearchBar.vue';
-import type {
-	INodeCreateElement,
-	ISubcategoryItemProps,
-	ICategoryItemProps,
-	SubcategoryCreateElement,
-	NodeCreateElement,
-	CategoryCreateElement,
-	INodeItemProps,
-} from '@/Interface';
-import type { BaseTextKey } from '@/plugins/i18n';
-import { sublimeSearch, matchesNodeType, matchesSelectType } from '@/utils';
-import { useWorkflowsStore } from '@/stores/workflows';
-import { useRootStore } from '@/stores/n8nRootStore';
-import { useNodeCreatorStore } from '@/stores/nodeCreator';
-import { useExternalHooks } from '@/composables';
-
-export interface Props {
-	showSubcategoryIcon?: boolean;
-	alwaysShowSearch?: boolean;
-	hideOtherCategoryItems?: boolean;
-
-	lazyRender?: boolean;
-	searchPlaceholder?: string;
-	withActionsGetter?: (element: NodeCreateElement) => boolean;
-	withDescriptionGetter?: (element: NodeCreateElement) => boolean;
-	searchItems?: INodeCreateElement[];
-	firstLevelItems?: INodeCreateElement[];
-	categorizedItems: INodeCreateElement[];
-	subcategoryOverride?: SubcategoryCreateElement | undefined;
-	allItems?: INodeCreateElement[];
-}
-
-const OTHER_RESULT_CATEGORY = 'searchAll';
-const props = withDefaults(defineProps<Props>(), {
-	allItems: () => [],
-	searchItems: () => [],
-	firstLevelItems: () => [],
-});
-
-const emit = defineEmits<{
-	(event: 'subcategoryClose', value: INodeCreateElement[]): void;
-	(event: 'onSubcategorySelected', value: INodeCreateElement): void;
-	(event: 'nodeTypeSelected', value: string[]): void;
-
-	(event: 'actionSelected', value: INodeCreateElement): void;
-	(event: 'actionsOpen', value: INodeTypeDescription): void;
-}>();
-
-const instance = getCurrentInstance();
-const externalHooks = useExternalHooks();
-
-const { defaultLocale } = useRootStore();
-const { workflowId } = useWorkflowsStore();
-const nodeCreatorStore = useNodeCreatorStore();
-
-const state = reactive({
-	activeCategories: [] as string[],
-	// Keep track of activated subcategories so we could traverse back more than one level
-	activeSubcategoryHistory: [] as Array<{
-		scrollPosition: number;
-		subcategory: INodeCreateElement;
-		activeIndex: number;
-		filter: string;
-	}>,
-	activeIndex: 0,
-	activeSubcategoryIndex: 0,
-	mainPanelContainer: null as HTMLElement | null,
-	transitionDirection: 'in',
-});
-const searchBar = ref<InstanceType<typeof SearchBar>>();
-const scrollableContainer = ref<InstanceType<typeof HTMLElement>>();
-
-const activeSubcategory = computed<INodeCreateElement | null>(() => {
-	return (
-		state.activeSubcategoryHistory[state.activeSubcategoryHistory.length - 1]?.subcategory || null
-	);
-});
-
-const categoriesKeys = computed(() =>
-	props.categorizedItems.filter((item) => item.type === 'category').map((item) => item.key),
-);
-const activeSubcategoryTitle = computed<string>(() => {
-	if (!activeSubcategory.value || !activeSubcategory.value.properties) return '';
-
-	const subcategory = (activeSubcategory.value.properties as ISubcategoryItemProps).subcategory;
-	const subcategoryName = camelCase(subcategory);
-
-	const titleLocaleKey = `nodeCreator.subcategoryTitles.${subcategoryName}` as BaseTextKey;
-	const nameLocaleKey = `nodeCreator.subcategoryNames.${subcategoryName}` as BaseTextKey;
-
-	const titleLocale = instance?.proxy?.$locale.baseText(titleLocaleKey) as string;
-	const nameLocale = instance?.proxy?.$locale.baseText(nameLocaleKey) as string;
-	// If resolved title locale is same as the locale key it means it doesn't exist
-	// so we fallback to the subcategoryName
-	if (titleLocale === titleLocaleKey)
-		return nameLocale === nameLocaleKey ? subcategory : nameLocale;
-
-	return titleLocale;
-});
-
-const searchFilter = computed<string>(() => nodeCreatorStore.itemsFilter.toLowerCase().trim());
-
-const selectedViewType = computed(() => nodeCreatorStore.selectedView);
-
-const filteredNodeTypes = computed<INodeCreateElement[]>(() => {
-	const filter = searchFilter.value;
-
-	let returnItems: INodeCreateElement[] = [];
-	if (defaultLocale !== 'en') {
-		returnItems = props.searchItems.filter((el: INodeCreateElement) => {
-			return (
-				filter &&
-				matchesSelectType(el, nodeCreatorStore.selectedView) &&
-				matchesNodeType(el, filter)
-			);
-		});
-	} else {
-		const matchingNodes =
-			subcategorizedItems.value.length > 0 ? subcategorizedItems.value : props.searchItems;
-
-		returnItems = getFilteredNodes(matchingNodes);
-	}
-	return returnItems;
-});
-
-const isViewNavigated = computed(() => nodeCreatorStore.rootViewHistory.length > 1);
-
-const globalFilteredNodeTypes = computed<INodeCreateElement[]>(() => {
-	const result = getFilteredNodes(props.allItems).reduce((acc, item) => {
-		if (acc.find((el) => trimTriggerNodeName(el.key) === trimTriggerNodeName(item.key))) {
-			return acc;
-		}
-
-		return [...acc, item];
-	}, [] as INodeCreateElement[]);
-
-	return result;
-});
-
-const otherCategoryNodes = computed(() => {
-	const nodes = [];
-
-	// Get diff of nodes between `globalFilteredNodeTypes` and `filteredNodeTypes`
-	for (const node of globalFilteredNodeTypes.value) {
-		const isNodeInFiltered = filteredNodeTypes.value.find(
-			(el) => trimTriggerNodeName(el.key) === trimTriggerNodeName(node.key),
-		);
-
-		if (!isNodeInFiltered) nodes.push(node);
-	}
-
-	return nodes;
-});
-
-const mergedFilteredNodes = computed<INodeCreateElement[]>(() => {
-	if (props.hideOtherCategoryItems) return filteredNodeTypes.value;
-
-	const isExpanded = state.activeCategories.includes(OTHER_RESULT_CATEGORY);
-	const searchCategory: CategoryCreateElement = {
-		type: 'category',
-		key: OTHER_RESULT_CATEGORY,
-		properties: {
-			category: OTHER_RESULT_CATEGORY,
-			name: `Results in other categories (${otherCategoryNodes.value.length})`,
-			expanded: isExpanded,
-		},
-	};
-	const nodeTypes = [...filteredNodeTypes.value];
-
-	if (otherCategoryNodes.value.length > 0) {
-		nodeTypes.push(searchCategory);
-	}
-	if (isExpanded) {
-		nodeTypes.push(...otherCategoryNodes.value);
-	}
-
-	return nodeTypes;
-});
-
-const isRootView = computed(() => activeSubcategory.value === null);
-
-const subcategorizedItems = computed<INodeCreateElement[]>(() => {
-	if (!activeSubcategory.value) return [];
-
-	const items = props.searchItems.filter((el: INodeCreateElement) => {
-		if (!activeSubcategory.value) return false;
-
-		const subcategories = Object.values(
-			(el.properties as INodeItemProps).nodeType.codex?.subcategories || {},
-		).flat();
-		return subcategories.includes(activeSubcategory.value.key);
-	});
-
-	return items.filter((el: INodeCreateElement) =>
-		matchesSelectType(el, nodeCreatorStore.selectedView),
-	);
-});
-
-const filteredCategorizedItems = computed<INodeCreateElement[]>(() => {
-	let categoriesCount = 0;
-	const reducedItems = props.categorizedItems.reduce(
-		(acc: INodeCreateElement[], el: INodeCreateElement) => {
-			if (el.type === 'category') {
-				el.properties.expanded = state.activeCategories.includes(el.key);
-				categoriesCount++;
-				return [...acc, el];
-			}
-
-			if (el.type === 'action' && state.activeCategories.includes(el.category)) {
-				return [...acc, el];
-			}
-
-			return acc;
-		},
-		[],
-	);
-
-	// If there is only one category we don't show it
-	if (categoriesCount <= 1)
-		return reducedItems.filter((el: INodeCreateElement) => el.type !== 'category');
-
-	return reducedItems;
-});
-
-const renderedItems = computed<INodeCreateElement[]>(() => {
-	if (props.firstLevelItems.length > 0 && activeSubcategory.value === null)
-		return props.firstLevelItems;
-
-	// If active subcategory is * then we show all items
-	if (activeSubcategory.value?.key === '*') return props.searchItems;
-	// Otherwise we show only items that match the subcategory
-	if (subcategorizedItems.value.length > 0) return subcategorizedItems.value;
-
-	// Finally if none of the above is true we show the categorized items
-	return filteredCategorizedItems.value;
-});
-
-const isSearchVisible = computed<boolean>(() => {
-	if (subcategorizedItems.value.length === 0) return true;
-
-	return subcategorizedItems.value.length > 9;
-});
-
-// Methods
-function trimTriggerNodeName(nodeName: string) {
-	return nodeName.toLowerCase().replace('trigger', '');
-}
-function getFilteredNodes(items: INodeCreateElement[]) {
-	// In order to support the old search we need to remove the 'trigger' part
-	const trimmedFilter = searchFilter.value.toLowerCase().replace('trigger', '');
-	return (
-		sublimeSearch<INodeCreateElement>(trimmedFilter, items, [
-			{ key: 'properties.nodeType.displayName', weight: 2 },
-			{ key: 'properties.nodeType.codex.alias', weight: 1 },
-		]) || []
-	).map(({ item }) => item);
-}
-function getScrollTop() {
-	return scrollableContainer.value?.scrollTop || 0;
-}
-function setScrollTop(scrollTop: number) {
-	if (scrollableContainer.value) {
-		scrollableContainer.value.scrollTop = scrollTop;
-	}
-}
-function onNodeFilterChange(filter: string) {
-	nodeCreatorStore.setFilter(filter);
-}
-
-function nodeFilterKeyDown(e: KeyboardEvent) {
-	// We only want to propagate 'Escape' as it closes the node-creator and
-	// 'Tab' which toggles it
-	if (!['Escape', 'Tab'].includes(e.key)) e.stopPropagation();
-
-	// Prevent cursors position change
-	if (['ArrowUp', 'ArrowDown'].includes(e.key)) e.preventDefault();
-
-	if (activeSubcategory.value) {
-		const activeList =
-			searchFilter.value.length > 0 ? filteredNodeTypes.value : renderedItems.value;
-		const activeNodeType = activeList[state.activeSubcategoryIndex];
-
-		if (e.key === 'ArrowDown' && activeSubcategory.value) {
-			state.activeSubcategoryIndex++;
-			state.activeSubcategoryIndex = Math.min(state.activeSubcategoryIndex, activeList.length - 1);
-		} else if (e.key === 'ArrowUp' && activeSubcategory.value) {
-			state.activeSubcategoryIndex--;
-			state.activeSubcategoryIndex = Math.max(state.activeSubcategoryIndex, 0);
-		} else if (e.key === 'Enter') {
-			selected(activeNodeType);
-		} else if (
-			e.key === 'ArrowLeft' &&
-			activeNodeType?.type === 'category' &&
-			(activeNodeType.properties as ICategoryItemProps).expanded
-		) {
-			selected(activeNodeType);
-		} else if (e.key === 'ArrowLeft') {
-			onBackButton();
-		} else if (
-			e.key === 'ArrowRight' &&
-			activeNodeType?.type === 'category' &&
-			!(activeNodeType.properties as ICategoryItemProps).expanded
-		) {
-			selected(activeNodeType);
-		} else if (e.key === 'ArrowRight' && ['node', 'action'].includes(activeNodeType?.type)) {
-			selected(activeNodeType);
-		}
-		return;
-	}
-
-	const activeList = searchFilter.value.length > 0 ? filteredNodeTypes.value : renderedItems.value;
-	const activeNodeType = activeList[state.activeIndex];
-
-	if (e.key === 'ArrowDown') {
-		state.activeIndex++;
-		// Make sure that we stop at the last nodeType
-		state.activeIndex = Math.min(state.activeIndex, activeList.length - 1);
-	} else if (e.key === 'ArrowUp') {
-		state.activeIndex--;
-		// Make sure that we do not get before the first nodeType
-		state.activeIndex = Math.max(state.activeIndex, 0);
-	} else if (e.key === 'Enter' && activeNodeType) {
-		selected(activeNodeType);
-	} else if (e.key === 'ArrowRight' && activeNodeType?.type === 'subcategory') {
-		selected(activeNodeType);
-	} else if (e.key === 'ArrowRight' && activeNodeType?.type === 'view') {
-		selected(activeNodeType);
-	} else if (
-		e.key === 'ArrowRight' &&
-		activeNodeType?.type === 'category' &&
-		!(activeNodeType.properties as ICategoryItemProps).expanded
-	) {
-		selected(activeNodeType);
-	} else if (
-		e.key === 'ArrowLeft' &&
-		activeNodeType?.type === 'category' &&
-		(activeNodeType.properties as ICategoryItemProps).expanded
-	) {
-		selected(activeNodeType);
-	} else if (e.key === 'ArrowLeft' && isViewNavigated.value) {
-		onBackButton();
-	} else if (e.key === 'ArrowRight' && ['node', 'action'].includes(activeNodeType?.type)) {
-		selected(activeNodeType);
-	}
-}
-function selected(element: INodeCreateElement) {
-	const typeHandler = {
-		category: () => onCategorySelected(element),
-		subcategory: () => onSubcategorySelected(element),
-		node: () => onNodeSelected(element as NodeCreateElement),
-		action: () => onActionSelected(element),
-		view: () => onViewSelected(element),
-	};
-
-	typeHandler[element.type]();
-}
-function onViewSelected(view: Record<string, any>) {
-	state.transitionDirection = 'in';
-	state.activeIndex = 0;
-	nodeCreatorStore.setSelectedView(view.key);
-	nodeCreatorStore.setFilter('');
-}
-
-function onNodeSelected(element: NodeCreateElement) {
-	const hasActions = (element.properties.nodeType?.actions?.length || 0) > 0;
-	if (props.withActionsGetter && props.withActionsGetter(element) === true && hasActions) {
-		emit('actionsOpen', element.properties.nodeType);
-		return;
-	}
-	emit('nodeTypeSelected', [element.key]);
-}
-
-function onCategorySelected(element: CategoryCreateElement) {
-	const categoryKey = element.properties.category;
-	if (state.activeCategories.includes(categoryKey)) {
-		state.activeCategories = state.activeCategories.filter(
-			(active: string) => active !== categoryKey,
-		);
-	} else {
-		state.activeCategories = [...state.activeCategories, categoryKey];
-		instance?.proxy.$telemetry.trackNodesPanel('nodeCreateList.onCategoryExpanded', {
-			category_name: categoryKey,
-			workflow_id: workflowId,
-		});
-	}
-}
-function onActionSelected(element: INodeCreateElement) {
-	emit('actionSelected', element);
-}
-
-function onSubcategorySelected(selected: INodeCreateElement, track = true) {
-	state.transitionDirection = 'in';
-	// Store the current subcategory UI details in the state
-	// so we could revert it when the user closes the subcategory
-	state.activeSubcategoryHistory.push({
-		subcategory: selected,
-		activeIndex: state.activeSubcategoryIndex,
-		scrollPosition: getScrollTop(),
-		filter: nodeCreatorStore.itemsFilter,
-	});
-	nodeCreatorStore.setFilter('');
-	emit('onSubcategorySelected', selected);
-	state.activeSubcategoryIndex = 0;
-
-	if (track) {
-		instance?.proxy.$telemetry.trackNodesPanel('nodeCreateList.onSubcategorySelected', {
-			selected,
-			workflow_id: workflowId,
-		});
-	}
-}
-
-async function onBackButton() {
-	state.transitionDirection = 'out';
-	// Switching views
-	if (isRootView.value && isViewNavigated.value) {
-		nodeCreatorStore.closeCurrentView();
-		return;
-	}
-
-	const poppedSubCategory = state.activeSubcategoryHistory.pop();
-	onNodeFilterChange(poppedSubCategory?.filter || '');
-	await nextTick();
-	emit(
-		'subcategoryClose',
-		state.activeSubcategoryHistory.map((el) => el.subcategory),
-	);
-	await nextTick();
-	setScrollTop(poppedSubCategory?.scrollPosition || 0);
-	state.activeSubcategoryIndex = poppedSubCategory?.activeIndex || 0;
-}
-
-watch(
-	() => props.subcategoryOverride,
-	(subcategory) => {
-		if (subcategory) onSubcategorySelected(subcategory, false);
-	},
-);
-watch(
-	() => props.categorizedItems,
-	() => {
-		state.activeCategories = [...categoriesKeys.value, OTHER_RESULT_CATEGORY];
-	},
-);
-
-onUnmounted(() => {
-	nodeCreatorStore.setFilter('');
-});
-
-watch(filteredNodeTypes, (returnItems) => {
-	externalHooks.run('nodeCreateList.filteredNodeTypesComputed', {
-		nodeFilter: nodeCreatorStore.itemsFilter,
-		result: returnItems,
-		selectedType: nodeCreatorStore.selectedView,
-	});
-});
-
-watch(isSearchVisible, (isVisible) => {
-	if (isVisible === false) {
-		// Focus the root container when search is hidden to make sure
-		// keyboard navigation still works
-		nextTick(() => state.mainPanelContainer?.focus());
-	}
-});
-watch(
-	() => nodeCreatorStore.itemsFilter,
-	(newValue, oldValue) => {
-		// Reset the index whenver the filter-value changes
-		state.activeIndex = 0;
-		state.activeSubcategoryIndex = 0;
-		externalHooks.run('nodeCreateList.nodeFilterChanged', {
-			oldValue,
-			newValue,
-			selectedType: nodeCreatorStore.selectedView,
-			filteredNodes: filteredNodeTypes.value,
-		});
-		instance?.proxy.$telemetry.trackNodesPanel('nodeCreateList.nodeFilterChanged', {
-			oldValue,
-			newValue,
-			selectedType: nodeCreatorStore.selectedView,
-			filteredNodes: filteredNodeTypes.value,
-			workflow_id: workflowId,
-		});
-	},
-);
-
-const { activeSubcategoryIndex, activeIndex, mainPanelContainer } = toRefs(state);
-</script>
-
-<style lang="scss" module>
-:global(.panel-slide-in-leave-active),
-:global(.panel-slide-in-enter-active),
-:global(.panel-slide-out-leave-active),
-:global(.panel-slide-out-enter-active) {
-	transition: transform 300ms ease;
-	position: absolute;
-	left: 0;
-	right: 0;
-}
-
-:global(.panel-slide-out-enter),
-:global(.panel-slide-in-leave-to) {
-	transform: translateX(0);
-	z-index: -1;
-}
-
-:global(.panel-slide-out-leave-to),
-:global(.panel-slide-in-enter) {
-	transform: translateX(100%);
-	// Make sure the leaving panel stays on top
-	// for the slide-out panel effect
-	z-index: 1;
-}
-.nodeIcon {
-	--node-icon-size: 16px;
-	margin-right: var(--spacing-s);
-}
-.categorizedItems {
-	background: white;
-	height: 100%;
-	background-color: $node-creator-background-color;
-	&:before {
-		box-sizing: border-box;
-		content: '';
-		border-left: 1px solid $node-creator-border-color;
-		width: 1px;
-		position: absolute;
-		height: 100%;
-	}
-}
-.footer {
-	font-size: var(--font-size-2xs);
-	color: var(--color-text-base);
-	margin: 0 var(--spacing-xs) 0;
-	padding: var(--spacing-4xs) 0;
-	line-height: var(--font-line-height-regular);
-	border-top: 1px solid #dbdfe7;
-	z-index: 1;
-	margin-top: -1px;
-}
-.header {
-	font-size: var(--font-size-l);
-	font-weight: var(--font-weight-bold);
-	line-height: var(--font-line-height-compact);
-
-	display: flex;
-	align-items: center;
-	padding: var(--spacing-s) var(--spacing-s) var(--spacing-2xs);
-
-	&.headerWithBackground {
-		border-bottom: $node-creator-border-color solid 1px;
-		height: 50px;
-		background-color: $node-creator-subcategory-panel-header-bacground-color;
-		padding: var(--spacing-s) var(--spacing-s);
-	}
-}
-.description {
-	padding: 0 var(--spacing-s) var(--spacing-2xs) var(--spacing-s);
-	margin-top: -4px;
-}
-.descriptionOffset {
-	margin-left: calc(var(--spacing-xl) + var(--spacing-4xs));
-}
-.backButton {
-	background: transparent;
-	border: none;
-	cursor: pointer;
-	padding: 0 var(--spacing-xs) 0 0;
-}
-
-.subcategoryBackIcon {
-	color: $node-creator-arrow-color;
-	height: 16px;
-	padding: 0;
-}
-
-.scrollable {
-	height: calc(100% - 120px);
-	padding-top: 1px;
-	padding-bottom: var(--spacing-xl);
-	overflow-y: auto;
-	overflow-x: visible;
-
-	scrollbar-width: none; /* Firefox 64 */
-	&::-webkit-scrollbar {
-		display: none;
-	}
-}
-</style>
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/CategoryItem.vue b/packages/editor-ui/src/components/Node/NodeCreator/CategoryItem.vue
deleted file mode 100644
index d2167b6c0b80c..0000000000000
--- a/packages/editor-ui/src/components/Node/NodeCreator/CategoryItem.vue
+++ /dev/null
@@ -1,41 +0,0 @@
-<template>
-	<div :class="$style.category">
-		<span :class="$style.name" v-text="item.name" />
-		<font-awesome-icon v-if="item.expanded" icon="chevron-down" :class="$style.arrow" />
-		<font-awesome-icon :class="$style.arrow" icon="chevron-up" v-else />
-	</div>
-</template>
-
-<script lang="ts" setup>
-import type { ICategoryItemProps } from '@/Interface';
-
-export interface Props {
-	item: ICategoryItemProps;
-}
-defineProps<Props>();
-</script>
-
-<style lang="scss" module>
-.category {
-	font-size: 11px;
-	font-weight: var(--font-weight-bold);
-	letter-spacing: 1px;
-	line-height: 11px;
-	padding: 10px 0;
-	margin: 0 var(--spacing-xs);
-	border-bottom: 1px solid $node-creator-border-color;
-	display: flex;
-	text-transform: uppercase;
-	cursor: pointer;
-}
-
-.name {
-	flex-grow: 1;
-}
-
-.arrow {
-	font-size: var(--font-size-2xs);
-	width: 12px;
-	color: $node-creator-arrow-color;
-}
-</style>
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/ItemIterator.vue b/packages/editor-ui/src/components/Node/NodeCreator/ItemIterator.vue
deleted file mode 100644
index 7228fb48136e1..0000000000000
--- a/packages/editor-ui/src/components/Node/NodeCreator/ItemIterator.vue
+++ /dev/null
@@ -1,210 +0,0 @@
-<template>
-	<div
-		:class="$style.itemIterator"
-		name="accordion"
-		@before-enter="beforeEnter"
-		@enter="enter"
-		@before-leave="beforeLeave"
-		@leave="leave"
-	>
-		<div
-			v-for="(item, index) in renderedItems"
-			:key="`${item.key}-${index}`"
-			data-test-id="item-iterator-item"
-			:class="{
-				clickable: !disabled,
-				[$style[item.type]]: true,
-				[$style.active]: activeIndex === index && !disabled,
-				[$style.iteratorItem]: true,
-			}"
-			ref="iteratorItems"
-			@click="wrappedEmit('selected', item)"
-		>
-			<category-item v-if="item.type === 'category'" :item="item.properties" />
-
-			<subcategory-item v-else-if="item.type === 'subcategory'" :item="item.properties" />
-
-			<node-item
-				v-else-if="item.type === 'node'"
-				:nodeType="item.properties.nodeType"
-				:allow-actions="withActionsGetter && withActionsGetter(item)"
-				:allow-description="withDescriptionGetter && withDescriptionGetter(item)"
-				@dragstart="wrappedEmit('dragstart', item, $event)"
-				@dragend="wrappedEmit('dragend', item, $event)"
-				@nodeTypeSelected="$listeners.nodeTypeSelected"
-				@actionsOpen="$listeners.actionsOpen"
-			/>
-
-			<action-item
-				v-else-if="item.type === 'action'"
-				:nodeType="item.properties.nodeType"
-				:action="item.properties.nodeType"
-				@dragstart="wrappedEmit('dragstart', item, $event)"
-				@dragend="wrappedEmit('dragend', item, $event)"
-			/>
-
-			<view-item v-else-if="item.type === 'view'" :view="item.properties" />
-		</div>
-		<aside
-			v-for="item in elements.length"
-			v-show="renderedItems.length < item"
-			:key="item"
-			:class="$style.loadingItem"
-		>
-			<n8n-loading :loading="true" :rows="1" variant="p" />
-		</aside>
-	</div>
-</template>
-
-<script setup lang="ts">
-import type { INodeCreateElement, NodeCreateElement } from '@/Interface';
-import NodeItem from './NodeItem.vue';
-import SubcategoryItem from './SubcategoryItem.vue';
-import CategoryItem from './CategoryItem.vue';
-import ActionItem from './ActionItem.vue';
-import ViewItem from './ViewItem.vue';
-import { reactive, toRefs, onMounted, watch, onUnmounted, ref } from 'vue';
-
-export interface Props {
-	elements: INodeCreateElement[];
-	activeIndex?: number;
-	disabled?: boolean;
-	lazyRender?: boolean;
-	withActionsGetter?: (element: NodeCreateElement) => boolean;
-	withDescriptionGetter?: (element: NodeCreateElement) => boolean;
-	enableGlobalCategoriesCounter?: boolean;
-}
-
-const props = withDefaults(defineProps<Props>(), {
-	elements: () => [],
-});
-
-const emit = defineEmits<{
-	(event: 'selected', element: INodeCreateElement, $e?: Event): void;
-	(event: 'dragstart', element: INodeCreateElement, $e: Event): void;
-	(event: 'dragend', element: INodeCreateElement, $e: Event): void;
-}>();
-
-const state = reactive({
-	renderedItems: [] as INodeCreateElement[],
-	renderAnimationRequest: 0,
-});
-const iteratorItems = ref<HTMLElement[]>([]);
-
-function wrappedEmit(
-	event: 'selected' | 'dragstart' | 'dragend',
-	element: INodeCreateElement,
-	$e?: Event,
-) {
-	if (props.disabled) return;
-
-	emit((event as 'selected') || 'dragstart' || 'dragend', element, $e);
-}
-
-// Lazy render large items lists to prevent the browser from freezing
-// when loading many items.
-function renderItems() {
-	if (props.elements.length <= 20 || props.lazyRender === false) {
-		state.renderedItems = props.elements;
-		return;
-	}
-
-	if (state.renderedItems.length < props.elements.length) {
-		state.renderedItems.push(
-			...props.elements.slice(state.renderedItems.length, state.renderedItems.length + 10),
-		);
-		state.renderAnimationRequest = window.requestAnimationFrame(renderItems);
-	}
-}
-
-function beforeEnter(el: HTMLElement) {
-	el.style.height = '0';
-}
-
-function enter(el: HTMLElement) {
-	el.style.height = `${el.scrollHeight}px`;
-}
-
-function beforeLeave(el: HTMLElement) {
-	el.style.height = `${el.scrollHeight}px`;
-}
-
-function leave(el: HTMLElement) {
-	el.style.height = '0';
-}
-
-onMounted(() => {
-	renderItems();
-});
-
-onUnmounted(() => {
-	window.cancelAnimationFrame(state.renderAnimationRequest);
-	state.renderedItems = [];
-});
-
-// Make sure the active item is always visible
-// scroll if needed
-watch(
-	() => props.activeIndex,
-	async () => {
-		if (props.activeIndex === undefined) return;
-		iteratorItems.value[props.activeIndex]?.scrollIntoView({ block: 'nearest' });
-	},
-);
-
-// Trigger elements re-render when they change
-watch(
-	() => props.elements,
-	async () => {
-		window.cancelAnimationFrame(state.renderAnimationRequest);
-		state.renderedItems = [];
-		renderItems();
-	},
-);
-
-const { renderedItems } = toRefs(state);
-</script>
-
-<style lang="scss" module>
-.loadingItem {
-	height: 48px;
-	margin: 0 var(--search-margin, var(--spacing-s));
-}
-.iteratorItem {
-	// Make sure border is fully visible
-	margin-left: 1px;
-	position: relative;
-	&::before {
-		content: '';
-		position: absolute;
-		left: -1px;
-		top: 0;
-		bottom: 0;
-		border-left: 2px solid transparent;
-	}
-	&:hover::before {
-		border-color: $node-creator-item-hover-border-color;
-	}
-
-	&.active::before {
-		border-color: $color-primary !important;
-	}
-
-	&.category.singleCategory {
-		display: none;
-	}
-}
-.itemIterator {
-	> *:last-child {
-		margin-bottom: var(--spacing-2xl);
-	}
-}
-.action {
-	&:last-of-type {
-		margin-bottom: var(--spacing-s);
-	}
-}
-.node + .category {
-	margin-top: var(--spacing-s);
-}
-</style>
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/ActionItem.vue b/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/ActionItem.vue
new file mode 100644
index 0000000000000..5ff5305403efe
--- /dev/null
+++ b/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/ActionItem.vue
@@ -0,0 +1,155 @@
+<template>
+	<n8n-node-creator-node
+		draggable
+		:class="$style.action"
+		:title="action.displayName"
+		:is-trigger="isTriggerAction(action)"
+		data-keyboard-nav="true"
+		@dragstart="onDragStart"
+		@dragend="onDragEnd"
+	>
+		<template #dragContent>
+			<div ref="draggableDataTransfer" :class="$style.draggableDataTransfer" />
+			<div v-show="dragging" :class="$style.draggable" :style="draggableStyle">
+				<NodeIcon :node-type="nodeType" :size="40" :shrink="false" @click.capture.stop />
+			</div>
+		</template>
+		<template #icon>
+			<NodeIcon :node-type="action" />
+		</template>
+	</n8n-node-creator-node>
+</template>
+
+<script setup lang="ts">
+import { reactive, computed, toRefs, getCurrentInstance } from 'vue';
+import type { ActionTypeDescription, SimplifiedNodeType } from '@/Interface';
+import { WEBHOOK_NODE_TYPE, DRAG_EVENT_DATA_KEY } from '@/constants';
+
+import { getNewNodePosition, NODE_SIZE } from '@/utils/nodeViewUtils';
+import NodeIcon from '@/components/NodeIcon.vue';
+
+import { useViewStacks } from '../composables/useViewStacks';
+import { useActions } from '../composables/useActions';
+
+export interface Props {
+	nodeType: SimplifiedNodeType;
+	action: ActionTypeDescription;
+}
+
+const props = defineProps<Props>();
+
+const instance = getCurrentInstance();
+const telemetry = instance?.proxy.$telemetry;
+
+const { getActionData, getAddedNodesAndConnections, setAddedNodeActionParameters } = useActions();
+const { activeViewStack } = useViewStacks();
+
+const state = reactive({
+	dragging: false,
+	draggablePosition: {
+		x: -100,
+		y: -100,
+	},
+	storeWatcher: null as Function | null,
+	draggableDataTransfer: null as Element | null,
+});
+
+const draggableStyle = computed<{ top: string; left: string }>(() => ({
+	top: `${state.draggablePosition.y}px`,
+	left: `${state.draggablePosition.x}px`,
+}));
+
+const actionData = computed(() => getActionData(props.action));
+
+const isTriggerAction = (action: ActionTypeDescription) =>
+	action.name?.toLowerCase().includes('trigger') || action.name === WEBHOOK_NODE_TYPE;
+
+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 && actionData.value.key) {
+		event.dataTransfer.effectAllowed = 'copy';
+		event.dataTransfer.dropEffect = 'copy';
+		event.dataTransfer.setDragImage(state.draggableDataTransfer as Element, 0, 0);
+		event.dataTransfer.setData(
+			DRAG_EVENT_DATA_KEY,
+			JSON.stringify(getAddedNodesAndConnections([{ type: actionData.value.key }])),
+		);
+		if (telemetry) {
+			state.storeWatcher = setAddedNodeActionParameters(
+				actionData.value,
+				telemetry,
+				activeViewStack.rootView,
+			);
+		}
+		document.body.addEventListener('dragend', onDragEnd);
+	}
+
+	state.dragging = true;
+	state.draggablePosition = { x, y };
+}
+
+function onDragOver(event: DragEvent): void {
+	if (!state.dragging || (event.pageX === 0 && event.pageY === 0)) {
+		return;
+	}
+
+	const [x, y] = getNewNodePosition([], [event.pageX - NODE_SIZE / 2, event.pageY - NODE_SIZE / 2]);
+
+	state.draggablePosition = { x, y };
+}
+
+function onDragEnd(event: DragEvent): void {
+	if (state.storeWatcher) state.storeWatcher();
+	document.body.removeEventListener('dragend', onDragEnd);
+	document.body.removeEventListener('dragover', onDragOver);
+
+	state.dragging = false;
+	setTimeout(() => {
+		state.draggablePosition = { x: -100, y: -100 };
+	}, 300);
+}
+const { draggableDataTransfer, dragging } = toRefs(state);
+</script>
+
+<style lang="scss" module>
+.action {
+	--node-creator-name-size: var(--font-size-2xs);
+	--node-creator-name-weight: var(--font-weight-normal);
+	--trigger-icon-background-color: #{$trigger-icon-background-color};
+	--trigger-icon-border-color: #{$trigger-icon-border-color};
+	--node-icon-size: 20px;
+	--node-icon-margin-right: var(--spacing-xs);
+
+	margin-left: var(--spacing-s);
+	margin-right: var(--spacing-s);
+	padding: var(--spacing-2xs) 0;
+}
+.nodeIcon {
+	margin-right: var(--spacing-xs);
+}
+
+.draggable {
+	width: 100px;
+	height: 100px;
+	position: fixed;
+	z-index: 1;
+	opacity: 0.66;
+	border: 2px solid var(--color-foreground-xdark);
+	border-radius: var(--border-radius-large);
+	background-color: var(--color-background-xlight);
+	display: flex;
+	justify-content: center;
+	align-items: center;
+}
+
+.draggableDataTransfer {
+	width: 1px;
+	height: 1px;
+}
+</style>
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/CategoryItem.vue b/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/CategoryItem.vue
new file mode 100644
index 0000000000000..ead3d49232b47
--- /dev/null
+++ b/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/CategoryItem.vue
@@ -0,0 +1,81 @@
+<script lang="ts" setup>
+import { computed } from 'vue';
+
+export interface Props {
+	expanded?: boolean;
+	active?: boolean;
+	count?: number;
+	name: string;
+	isTrigger?: boolean;
+}
+const props = withDefaults(defineProps<Props>(), {
+	expanded: true,
+});
+
+const categoryName = computed(() => {
+	const itemsCount = props.count || 0;
+	return itemsCount > 0 ? `${props.name} (${itemsCount})` : props.name;
+});
+</script>
+
+<template>
+	<div
+		:class="$style.categoryWrapper"
+		v-bind="$attrs"
+		data-keyboard-nav="true"
+		data-test-id="node-creator-category-item"
+	>
+		<div :class="{ [$style.category]: true, [$style.active]: active }">
+			<span :class="$style.name">
+				<span v-text="categoryName" />
+				<font-awesome-icon v-if="isTrigger" icon="bolt" size="xs" :class="$style.triggerIcon" />
+				<slot />
+			</span>
+			<font-awesome-icon v-if="expanded" icon="chevron-down" :class="$style.arrow" />
+			<font-awesome-icon v-else :class="$style.arrow" icon="chevron-up" />
+		</div>
+	</div>
+</template>
+
+<style lang="scss" module>
+.triggerIcon {
+	color: var(--color-primary);
+	margin-left: var(--spacing-3xs);
+}
+.category {
+	font-size: var(--font-size-s);
+	font-weight: var(--font-weight-bold);
+	line-height: var(--font-line-height-compact);
+	padding: var(--spacing-2xs) var(--spacing-s);
+	border-bottom: 1px solid $node-creator-border-color;
+	display: flex;
+	cursor: pointer;
+
+	position: relative;
+	&::before {
+		content: '';
+		position: absolute;
+		left: 0;
+		top: 0;
+		bottom: 0;
+		border-left: 2px solid transparent;
+	}
+	&:hover::before {
+		border-color: $node-creator-item-hover-border-color;
+	}
+	&.active::before {
+		border-color: $color-primary;
+	}
+}
+
+.name {
+	flex-grow: 1;
+	color: var(--color-text-dark);
+}
+
+.arrow {
+	font-size: var(--font-size-2xs);
+	width: 12px;
+	color: $node-creator-arrow-color;
+}
+</style>
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/LabelItem.vue b/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/LabelItem.vue
new file mode 100644
index 0000000000000..d3d3b3585c337
--- /dev/null
+++ b/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/LabelItem.vue
@@ -0,0 +1,31 @@
+<template>
+	<div :class="$style.label">
+		<span :class="$style.name" v-text="item.key" />
+	</div>
+</template>
+
+<script lang="ts" setup>
+import type { LabelItemProps } from '@/Interface';
+
+export interface Props {
+	item: LabelItemProps;
+}
+defineProps<Props>();
+</script>
+
+<style lang="scss" module>
+.label {
+	margin-left: var(--spacing-s);
+	margin-right: var(--spacing-s);
+	margin-bottom: var(--spacing-4xs);
+	letter-spacing: 1px;
+	padding-top: var(--spacing-s);
+	font-style: normal;
+	font-weight: 700;
+	font-size: 10px;
+	line-height: 12px;
+	text-transform: uppercase;
+	color: var(--color-text-base);
+	cursor: default;
+}
+</style>
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/NodeItem.vue b/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/NodeItem.vue
new file mode 100644
index 0000000000000..caf8e429c2326
--- /dev/null
+++ b/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/NodeItem.vue
@@ -0,0 +1,227 @@
+<template>
+	<!-- Node Item is draggable only if it doesn't contain actions -->
+	<n8n-node-creator-node
+		:draggable="!showActionArrow"
+		:class="$style.nodeItem"
+		:description="description"
+		:title="displayName"
+		:show-action-arrow="showActionArrow"
+		:is-trigger="isTrigger"
+		:data-test-id="dataTestId"
+		@dragstart="onDragStart"
+		@dragend="onDragEnd"
+	>
+		<template #icon>
+			<div v-if="isSubNodeType" :class="$style.subNodeBackground"></div>
+			<NodeIcon :class="$style.nodeIcon" :node-type="nodeType" />
+		</template>
+
+		<template v-if="isCommunityNode" #tooltip>
+			<p
+				:class="$style.communityNodeIcon"
+				@click="onCommunityNodeTooltipClick"
+				v-html="
+					i18n.baseText('generic.communityNode.tooltip', {
+						interpolate: {
+							packageName: nodeType.name.split('.')[0],
+							docURL: COMMUNITY_NODES_INSTALLATION_DOCS_URL,
+						},
+					})
+				"
+			/>
+		</template>
+		<template #dragContent>
+			<div ref="draggableDataTransfer" :class="$style.draggableDataTransfer" />
+			<div 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>
+</template>
+
+<script setup lang="ts">
+import { computed, ref } from 'vue';
+import type { SimplifiedNodeType } from '@/Interface';
+import {
+	COMMUNITY_NODES_INSTALLATION_DOCS_URL,
+	CREDENTIAL_ONLY_NODE_PREFIX,
+	DEFAULT_SUBCATEGORY,
+	DRAG_EVENT_DATA_KEY,
+} 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';
+
+import { useActions } from '../composables/useActions';
+import { useI18n } from '@/composables/useI18n';
+import { useTelemetry } from '@/composables/useTelemetry';
+import { useNodeType } from '@/composables/useNodeType';
+
+export interface Props {
+	nodeType: SimplifiedNodeType;
+	subcategory?: string;
+	active?: boolean;
+}
+
+const props = withDefaults(defineProps<Props>(), {
+	active: false,
+});
+
+const i18n = useI18n();
+const telemetry = useTelemetry();
+
+const { actions } = useNodeCreatorStore();
+const { getAddedNodesAndConnections } = useActions();
+const { isSubNodeType } = useNodeType({
+	nodeType: props.nodeType,
+});
+
+const dragging = ref(false);
+const draggablePosition = ref({ x: -100, y: -100 });
+const draggableDataTransfer = ref(null as Element | null);
+
+const description = computed<string>(() => {
+	if (
+		props.subcategory === DEFAULT_SUBCATEGORY &&
+		!props.nodeType.name.startsWith(CREDENTIAL_ONLY_NODE_PREFIX)
+	) {
+		return '';
+	}
+
+	return i18n.headerText({
+		key: `headers.${shortNodeType.value}.description`,
+		fallback: props.nodeType.description,
+	});
+});
+const showActionArrow = computed(() => hasActions.value);
+const dataTestId = computed(() =>
+	hasActions.value ? 'node-creator-action-item' : 'node-creator-node-item',
+);
+
+const hasActions = computed(() => {
+	return nodeActions.value.length > 1;
+});
+
+const nodeActions = computed(() => {
+	const nodeActions = actions[props.nodeType.name] || [];
+	return nodeActions;
+});
+
+const shortNodeType = computed<string>(() => i18n.shortNodeType(props.nodeType.name) || '');
+
+const draggableStyle = computed<{ top: string; left: string }>(() => ({
+	top: `${draggablePosition.value.y}px`,
+	left: `${draggablePosition.value.x}px`,
+}));
+
+const isCommunityNode = computed<boolean>(() => isCommunityPackageName(props.nodeType.name));
+
+const displayName = computed<string>(() => {
+	const displayName = props.nodeType.displayName.trimEnd();
+
+	return i18n.headerText({
+		key: `headers.${shortNodeType.value}.displayName`,
+		fallback: hasActions.value ? displayName.replace('Trigger', '') : displayName,
+	});
+});
+
+const isTrigger = computed<boolean>(() => {
+	return props.nodeType.group.includes('trigger') && !hasActions.value;
+});
+
+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';
+		event.dataTransfer.setDragImage(draggableDataTransfer.value as Element, 0, 0);
+		event.dataTransfer.setData(
+			DRAG_EVENT_DATA_KEY,
+			JSON.stringify(getAddedNodesAndConnections([{ type: props.nodeType.name }])),
+		);
+	}
+
+	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(event: DragEvent): void {
+	document.body.removeEventListener('dragover', onDragOver);
+
+	dragging.value = false;
+	setTimeout(() => {
+		draggablePosition.value = { x: -100, y: -100 };
+	}, 300);
+}
+
+function onCommunityNodeTooltipClick(event: MouseEvent) {
+	if ((event.target as Element).localName === 'a') {
+		telemetry.track('user clicked cnr docs link', { source: 'nodes panel node' });
+	}
+}
+</script>
+<style lang="scss" module>
+.nodeItem {
+	--trigger-icon-background-color: #{$trigger-icon-background-color};
+	--trigger-icon-border-color: #{$trigger-icon-border-color};
+	margin-left: 15px;
+	margin-right: 12px;
+	user-select: none;
+}
+
+.nodeIcon {
+	z-index: 2;
+}
+
+.subNodeBackground {
+	background-color: var(--node-type-supplemental-background);
+	border-radius: 50%;
+	height: 40px;
+	position: absolute;
+	transform: translate(-7px, -7px);
+	width: 40px;
+	z-index: 1;
+}
+.communityNodeIcon {
+	vertical-align: top;
+}
+
+.draggable {
+	width: 100px;
+	height: 100px;
+	position: fixed;
+	z-index: 1;
+	opacity: 0.66;
+	border: 2px solid var(--color-foreground-xdark);
+	border-radius: var(--border-radius-large);
+	background-color: var(--color-background-xlight);
+	display: flex;
+	justify-content: center;
+	align-items: center;
+}
+
+.draggableDataTransfer {
+	width: 1px;
+	height: 1px;
+}
+</style>
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/SubcategoryItem.vue b/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/SubcategoryItem.vue
new file mode 100644
index 0000000000000..4be5b146d123a
--- /dev/null
+++ b/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/SubcategoryItem.vue
@@ -0,0 +1,42 @@
+<template>
+	<n8n-node-creator-node
+		:class="$style.subCategory"
+		:title="i18n.baseText(`nodeCreator.subcategoryNames.${subcategoryName}`)"
+		:is-trigger="false"
+		:description="i18n.baseText(`nodeCreator.subcategoryDescriptions.${subcategoryName}`)"
+		:show-action-arrow="true"
+	>
+		<template #icon>
+			<n8n-node-icon
+				type="icon"
+				:name="item.icon"
+				:circle="false"
+				:show-tooltip="false"
+				v-bind="item.iconProps"
+			/>
+		</template>
+	</n8n-node-creator-node>
+</template>
+
+<script setup lang="ts">
+import type { SubcategoryItemProps } from '@/Interface';
+import { camelCase } from 'lodash-es';
+import { computed } from 'vue';
+import { useI18n } from '@/composables/useI18n';
+
+export interface Props {
+	item: SubcategoryItemProps;
+}
+
+const props = defineProps<Props>();
+const i18n = useI18n();
+const subcategoryName = computed(() => camelCase(props.item.subcategory || props.item.title));
+</script>
+
+<style lang="scss" module>
+.subCategory {
+	--action-arrow-color: var(--color-text-light);
+	margin-left: 15px;
+	margin-right: 12px;
+}
+</style>
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/ViewItem.vue b/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/ViewItem.vue
new file mode 100644
index 0000000000000..ee9edaad11dac
--- /dev/null
+++ b/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/ViewItem.vue
@@ -0,0 +1,32 @@
+<template>
+	<n8n-node-creator-node
+		:class="$style.view"
+		:title="view.title"
+		:tag="view.tag"
+		:is-trigger="false"
+		:description="view.description"
+		:show-action-arrow="true"
+	>
+		<template #icon>
+			<n8n-node-icon type="icon" :name="view.icon" :circle="false" :show-tooltip="false" />
+		</template>
+	</n8n-node-creator-node>
+</template>
+
+<script setup lang="ts">
+import type { ViewItemProps } from '@/Interface';
+
+export interface Props {
+	view: ViewItemProps;
+}
+
+defineProps<Props>();
+</script>
+
+<style lang="scss" module>
+.view {
+	--action-arrow-color: var(--color-text-light);
+	margin-left: var(--spacing-s);
+	margin-right: var(--spacing-xs);
+}
+</style>
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/MainPanel.vue b/packages/editor-ui/src/components/Node/NodeCreator/MainPanel.vue
deleted file mode 100644
index 4933d8909f8b0..0000000000000
--- a/packages/editor-ui/src/components/Node/NodeCreator/MainPanel.vue
+++ /dev/null
@@ -1,407 +0,0 @@
-<template>
-	<div :class="{ [$style.mainPanel]: true, [$style.isRoot]: isRoot }">
-		<CategorizedItems
-			:subcategoryOverride="nodeAppSubcategory"
-			:alwaysShowSearch="isActionsActive"
-			:hideOtherCategoryItems="isActionsActive"
-			:categorizedItems="computedCategorizedItems"
-			:searchItems="searchItems"
-			:withActionsGetter="shouldShowNodeActions"
-			:withDescriptionGetter="shouldShowNodeDescription"
-			:firstLevelItems="firstLevelItems"
-			:showSubcategoryIcon="isActionsActive"
-			:allItems="transformCreateElements(mergedAppNodes)"
-			:searchPlaceholder="searchPlaceholder"
-			@subcategoryClose="onSubcategoryClose"
-			@onSubcategorySelected="onSubcategorySelected"
-			@nodeTypeSelected="onNodeTypeSelected"
-			@actionsOpen="setActiveActionsNodeType"
-			@actionSelected="onActionSelected"
-		>
-			<template #noResults>
-				<no-results
-					data-test-id="categorized-no-results"
-					:showRequest="!isActionsActive"
-					:show-icon="!isActionsActive"
-				>
-					<template #title v-if="!isActionsActive">
-						<p v-text="$locale.baseText('nodeCreator.noResults.weDidntMakeThatYet')" />
-					</template>
-
-					<template v-if="isActionsActive" #action>
-						<p
-							v-if="containsAPIAction"
-							v-html="getCustomAPICallHintLocale('apiCallNoResult')"
-							class="clickable"
-							@click.stop="addHttpNode(true)"
-						/>
-						<p v-else v-text="$locale.baseText('nodeCreator.noResults.noMatchingActions')" />
-					</template>
-
-					<template v-else #action>
-						{{ $locale.baseText('nodeCreator.noResults.dontWorryYouCanProbablyDoItWithThe') }}
-						<n8n-link v-if="[REGULAR_NODE_FILTER].includes(selectedView)" @click="addHttpNode">
-							{{ $locale.baseText('nodeCreator.noResults.httpRequest') }}
-						</n8n-link>
-
-						<n8n-link v-if="[TRIGGER_NODE_FILTER].includes(selectedView)" @click="addWebHookNode()">
-							{{ $locale.baseText('nodeCreator.noResults.webhook') }}
-						</n8n-link>
-						{{ $locale.baseText('nodeCreator.noResults.node') }}
-					</template>
-				</no-results>
-			</template>
-
-			<template #header>
-				<p
-					v-if="isRoot && activeView && activeView.title"
-					v-text="activeView.title"
-					:class="$style.title"
-				/>
-			</template>
-			<template #description>
-				<p
-					v-if="isRoot && activeView && activeView.description"
-					v-text="activeView.description"
-					:class="$style.description"
-				/>
-			</template>
-			<template #footer v-if="activeNodeActions && containsAPIAction">
-				<span
-					v-html="getCustomAPICallHintLocale('apiCall')"
-					class="clickable"
-					@click.stop="addHttpNode(true)"
-				/>
-			</template>
-		</CategorizedItems>
-	</div>
-</template>
-
-<script setup lang="ts">
-import { reactive, toRefs, getCurrentInstance, computed, onUnmounted, ref } from 'vue';
-import type { INodeTypeDescription, INodeActionTypeDescription } from 'n8n-workflow';
-import { INodeTypeNameVersion } from 'n8n-workflow';
-import type {
-	INodeCreateElement,
-	NodeCreateElement,
-	IActionItemProps,
-	SubcategoryCreateElement,
-	IUpdateInformation,
-} from '@/Interface';
-import {
-	CORE_NODES_CATEGORY,
-	WEBHOOK_NODE_TYPE,
-	EMAIL_IMAP_NODE_TYPE,
-	CUSTOM_API_CALL_NAME,
-	HTTP_REQUEST_NODE_TYPE,
-	STICKY_NODE_TYPE,
-	REGULAR_NODE_FILTER,
-	TRIGGER_NODE_FILTER,
-	N8N_NODE_TYPE,
-} from '@/constants';
-import CategorizedItems from './CategorizedItems.vue';
-import { useNodeCreatorStore } from '@/stores/nodeCreator';
-import { getCategoriesWithNodes, getCategorizedList } from '@/utils';
-import { useNodeTypesStore } from '@/stores/nodeTypes';
-import type { BaseTextKey } from '@/plugins/i18n';
-import NoResults from './NoResults.vue';
-import { useRootStore } from '@/stores/n8nRootStore';
-import useMainPanelView from './useMainPanelView';
-import { useExternalHooks } from '@/composables';
-
-const instance = getCurrentInstance();
-
-const emit = defineEmits({
-	nodeTypeSelected: (nodeTypes: string[]) => true,
-});
-
-const state = reactive({
-	isRoot: true,
-	selectedSubcategory: '',
-	activeNodeActions: null as INodeTypeDescription | null,
-});
-const { baseUrl } = useRootStore();
-const externalHooks = useExternalHooks();
-
-const {
-	mergedAppNodes,
-	getActionData,
-	getNodeTypesWithManualTrigger,
-	setAddedNodeActionParameters,
-} = useNodeCreatorStore();
-const { activeView } = useMainPanelView();
-const telemetry = instance?.proxy.$telemetry;
-const { isTriggerNode } = useNodeTypesStore();
-const containsAPIAction = computed(
-	() =>
-		state.activeNodeActions?.properties.some((p) =>
-			p.options?.find((o) => o.name === CUSTOM_API_CALL_NAME),
-		) === true,
-);
-
-const selectedView = computed(() => useNodeCreatorStore().selectedView);
-const computedCategorizedItems = computed(() => {
-	if (isActionsActive.value) {
-		return sortActions(getCategorizedList(computedCategoriesWithNodes.value, true));
-	}
-
-	return getCategorizedList(computedCategoriesWithNodes.value, true);
-});
-
-const nodeAppSubcategory = computed<SubcategoryCreateElement | undefined>(() => {
-	if (!state.activeNodeActions) return undefined;
-
-	const icon = state.activeNodeActions.iconUrl
-		? `${baseUrl}${state.activeNodeActions.iconUrl}`
-		: state.activeNodeActions.icon?.split(':')[1];
-
-	return {
-		type: 'subcategory',
-		key: state.activeNodeActions.name,
-		properties: {
-			subcategory: state.activeNodeActions.displayName,
-			description: '',
-			iconType: state.activeNodeActions.iconUrl ? 'file' : 'icon',
-			icon,
-			color: state.activeNodeActions.defaults.color,
-		},
-	};
-});
-const searchPlaceholder = computed(() => {
-	const nodeNameTitle = state.activeNodeActions?.displayName?.trim() as string;
-	const actionsSearchPlaceholder = instance?.proxy.$locale.baseText(
-		'nodeCreator.actionsCategory.searchActions',
-		{ interpolate: { nodeNameTitle } },
-	);
-
-	return isActionsActive.value ? actionsSearchPlaceholder : undefined;
-});
-
-const filteredMergedAppNodes = computed(() => {
-	const WHITELISTED_APP_CORE_NODES = [EMAIL_IMAP_NODE_TYPE, WEBHOOK_NODE_TYPE];
-
-	if (isAppEventSubcategory.value)
-		return mergedAppNodes.filter((node) => {
-			const isTrigger = isTriggerNode(node.name);
-			const isRegularNode = !isTrigger;
-			const isStickyNode = node.name === STICKY_NODE_TYPE;
-			const isCoreNode =
-				node.codex?.categories?.includes(CORE_NODES_CATEGORY) &&
-				!WHITELISTED_APP_CORE_NODES.includes(node.name);
-			const hasActions = (node.actions || []).length > 0;
-
-			// Never show core nodes and sticky node in the Apps subcategory
-			if (isCoreNode || isStickyNode) return false;
-
-			// Only show nodes without action within their view
-			if (!hasActions) {
-				return isRegularNode
-					? selectedView.value === REGULAR_NODE_FILTER
-					: selectedView.value === TRIGGER_NODE_FILTER;
-			}
-
-			return true;
-		});
-
-	return mergedAppNodes;
-});
-
-const computedCategoriesWithNodes = computed(() => {
-	if (!state.activeNodeActions) return getCategoriesWithNodes(filteredMergedAppNodes.value);
-
-	return getCategoriesWithNodes(selectedNodeActions.value, state.activeNodeActions.displayName);
-});
-
-const selectedNodeActions = computed<INodeActionTypeDescription[]>(
-	() => state.activeNodeActions?.actions ?? [],
-);
-const isAppEventSubcategory = computed(() => state.selectedSubcategory === '*');
-const isActionsActive = computed(() => state.activeNodeActions !== null);
-const firstLevelItems = computed(() => (isRoot.value ? activeView.value.items : []));
-
-const searchItems = computed<INodeCreateElement[]>(() => {
-	return state.activeNodeActions
-		? transformCreateElements(selectedNodeActions.value, 'action')
-		: transformCreateElements(filteredMergedAppNodes.value);
-});
-
-// If the user is in the root view, we want to show trigger nodes first
-// otherwise we want to show them last
-function sortActions(nodeCreateElements: INodeCreateElement[]): INodeCreateElement[] {
-	const elements = {
-		trigger: [] as INodeCreateElement[],
-		regular: [] as INodeCreateElement[],
-	};
-
-	nodeCreateElements.forEach((el) => {
-		const isTriggersCategory = el.type === 'category' && el.key === 'Triggers';
-		const isTriggerAction = el.type === 'action' && el.category === 'Triggers';
-
-		elements[isTriggersCategory || isTriggerAction ? 'trigger' : 'regular'].push(el);
-	});
-
-	if (selectedView.value === TRIGGER_NODE_FILTER) {
-		return [...elements.trigger, ...elements.regular];
-	}
-
-	return [...elements.regular, ...elements.trigger];
-}
-
-function transformCreateElements(
-	createElements: Array<INodeTypeDescription | INodeActionTypeDescription>,
-	type: 'node' | 'action' = 'node',
-): INodeCreateElement[] {
-	const sorted = [...createElements];
-
-	sorted.sort((a, b) => {
-		const textA = a.displayName.toLowerCase();
-		const textB = b.displayName.toLowerCase();
-		return textA < textB ? -1 : textA > textB ? 1 : 0;
-	});
-
-	return sorted.map((nodeType) => {
-		const hasTriggerActions = nodeType.actions?.find((action) => action.name.includes('trigger'));
-		const hasRgeularActions = nodeType.actions?.find((action) => !action.name.includes('trigger'));
-
-		return {
-			type,
-			category: nodeType.codex?.categories,
-			key: nodeType.name,
-			properties: {
-				nodeType,
-				subcategory: state.activeNodeActions?.displayName ?? '',
-			},
-			includedByTrigger: hasTriggerActions || nodeType.group.includes('trigger'),
-			includedByRegular: hasRgeularActions || !nodeType.group.includes('trigger'),
-		} as INodeCreateElement;
-	});
-}
-
-function onNodeTypeSelected(nodeTypes: string[]) {
-	emit(
-		'nodeTypeSelected',
-		nodeTypes.length === 1 ? getNodeTypesWithManualTrigger(nodeTypes[0]) : nodeTypes,
-	);
-}
-function getCustomAPICallHintLocale(key: string) {
-	if (!state.activeNodeActions) return '';
-
-	const nodeNameTitle = state.activeNodeActions.displayName;
-	return instance?.proxy.$locale.baseText(`nodeCreator.actionsList.${key}` as BaseTextKey, {
-		interpolate: { nodeNameTitle },
-	});
-}
-
-function setActiveActionsNodeType(nodeType: INodeTypeDescription | null) {
-	state.activeNodeActions = nodeType;
-
-	if (nodeType) trackActionsView();
-}
-
-function onActionSelected(actionCreateElement: INodeCreateElement) {
-	const action = (actionCreateElement.properties as IActionItemProps).nodeType;
-	const actionUpdateData = getActionData(action);
-	emit('nodeTypeSelected', getNodeTypesWithManualTrigger(actionUpdateData.key));
-	setAddedNodeActionParameters(actionUpdateData, telemetry);
-}
-function addWebHookNode() {
-	emit('nodeTypeSelected', [WEBHOOK_NODE_TYPE]);
-}
-
-function addHttpNode(isAction: boolean) {
-	const updateData = {
-		name: '',
-		key: HTTP_REQUEST_NODE_TYPE,
-		value: {
-			authentication: 'predefinedCredentialType',
-		},
-	} as IUpdateInformation;
-
-	emit('nodeTypeSelected', [HTTP_REQUEST_NODE_TYPE]);
-	if (isAction) {
-		setAddedNodeActionParameters(updateData, telemetry, false);
-
-		const app_identifier = state.activeNodeActions?.name;
-		externalHooks.run('nodeCreateList.onActionsCustmAPIClicked', { app_identifier });
-		telemetry?.trackNodesPanel('nodeCreateList.onActionsCustmAPIClicked', { app_identifier });
-	}
-}
-
-function onSubcategorySelected(subcategory: INodeCreateElement) {
-	state.isRoot = false;
-	state.selectedSubcategory = subcategory.key;
-}
-function onSubcategoryClose(activeSubcategories: INodeCreateElement[]) {
-	if (isActionsActive.value === true) setActiveActionsNodeType(null);
-
-	state.isRoot = activeSubcategories.length === 0;
-	state.selectedSubcategory = activeSubcategories[activeSubcategories.length - 1]?.key ?? '';
-}
-
-function shouldShowNodeDescription(node: NodeCreateElement) {
-	return (node.category || []).includes(CORE_NODES_CATEGORY);
-}
-
-function shouldShowNodeActions(node: INodeCreateElement) {
-	if (state.isRoot && useNodeCreatorStore().itemsFilter === '') return false;
-
-	return true;
-}
-
-function trackActionsView() {
-	const trigger_action_count = selectedNodeActions.value.filter((action) =>
-		action.name.toLowerCase().includes('trigger'),
-	).length;
-
-	const trackingPayload = {
-		app_identifier: state.activeNodeActions?.name,
-		actions: selectedNodeActions.value.map((action) => action.displayName),
-		regular_action_count: selectedNodeActions.value.length - trigger_action_count,
-		trigger_action_count,
-	};
-
-	externalHooks.run('nodeCreateList.onViewActions', trackingPayload);
-	telemetry?.trackNodesPanel('nodeCreateList.onViewActions', trackingPayload);
-}
-
-onUnmounted(() => {
-	useNodeCreatorStore().resetRootViewHistory();
-});
-const { isRoot, activeNodeActions } = toRefs(state);
-</script>
-
-<style lang="scss" module>
-.mainPanel {
-	--node-icon-color: var(--color-text-base);
-	height: 100%;
-	display: flex;
-	flex-direction: column;
-
-	// Remove node item border on the root level
-	&.isRoot {
-		--node-item-border: none;
-	}
-}
-.itemCreator {
-	height: calc(100% - 120px);
-	padding-top: 1px;
-	overflow-y: auto;
-	overflow-x: visible;
-
-	&::-webkit-scrollbar {
-		display: none;
-	}
-}
-
-.title {
-	font-size: var(--font-size-l);
-	line-height: var(--font-line-height-xloose);
-	font-weight: var(--font-weight-bold);
-	color: var(--color-text-dark);
-}
-.description {
-	font-size: var(--font-size-s);
-	line-height: var(--font-line-height-loose);
-	color: var(--color-text-base);
-}
-</style>
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/Modes/ActionsMode.vue b/packages/editor-ui/src/components/Node/NodeCreator/Modes/ActionsMode.vue
new file mode 100644
index 0000000000000..cc0801494d546
--- /dev/null
+++ b/packages/editor-ui/src/components/Node/NodeCreator/Modes/ActionsMode.vue
@@ -0,0 +1,363 @@
+<script setup lang="ts">
+import { computed, getCurrentInstance, onMounted, defineComponent, h } from 'vue';
+import type { PropType } from 'vue';
+import type {
+	INodeCreateElement,
+	ActionTypeDescription,
+	NodeFilterType,
+	IUpdateInformation,
+	ActionCreateElement,
+} from '@/Interface';
+import {
+	HTTP_REQUEST_NODE_TYPE,
+	REGULAR_NODE_CREATOR_VIEW,
+	TRIGGER_NODE_CREATOR_VIEW,
+	CUSTOM_API_CALL_KEY,
+	OPEN_AI_NODE_MESSAGE_ASSISTANT_TYPE,
+	OPEN_AI_NODE_TYPE,
+} from '@/constants';
+
+import { useUsersStore } from '@/stores/users.store';
+import { useExternalHooks } from '@/composables/useExternalHooks';
+
+import { useActions } from '../composables/useActions';
+import { useKeyboardNavigation } from '../composables/useKeyboardNavigation';
+import { useViewStacks } from '../composables/useViewStacks';
+
+import ItemsRenderer from '../Renderers/ItemsRenderer.vue';
+import CategorizedItemsRenderer from '../Renderers/CategorizedItemsRenderer.vue';
+import type { IDataObject } from 'n8n-workflow';
+
+const emit = defineEmits({
+	nodeTypeSelected: (nodeTypes: string[]) => true,
+});
+const instance = getCurrentInstance();
+const telemetry = instance?.proxy.$telemetry;
+
+const { userActivated } = useUsersStore();
+const { popViewStack, updateCurrentViewStack } = useViewStacks();
+const { registerKeyHook } = useKeyboardNavigation();
+const {
+	getNodeTypesWithManualTrigger,
+	setAddedNodeActionParameters,
+	getActionData,
+	getPlaceholderTriggerActions,
+	parseCategoryActions,
+	actionsCategoryLocales,
+} = useActions();
+
+// We only inject labels if search is empty
+const parsedTriggerActions = computed(() =>
+	parseActions(actions.value, actionsCategoryLocales.value.triggers, false),
+);
+const parsedActionActions = computed(() =>
+	parseActions(actions.value, actionsCategoryLocales.value.actions, !search.value),
+);
+const parsedTriggerActionsBaseline = computed(() =>
+	parseActions(
+		useViewStacks().activeViewStack.baselineItems || [],
+		actionsCategoryLocales.value.triggers,
+		false,
+	),
+);
+const parsedActionActionsBaseline = computed(() =>
+	parseActions(
+		useViewStacks().activeViewStack.baselineItems || [],
+		actionsCategoryLocales.value.actions,
+		!search.value,
+	),
+);
+
+// Because the placeholder items are inserted into the slots, we need to
+// add the placeholder count to the category name manually
+const triggerCategoryName = computed(() =>
+	parsedTriggerActions.value.length || search.value
+		? actionsCategoryLocales.value.triggers
+		: `${actionsCategoryLocales.value.triggers} (${placeholderTriggerActions.length})`,
+);
+
+const actions = computed(() => {
+	return (useViewStacks().activeViewStack.items || []).filter(
+		(p) => (p as ActionCreateElement).properties.actionKey !== CUSTOM_API_CALL_KEY,
+	);
+});
+
+const search = computed(() => useViewStacks().activeViewStack.search);
+
+const subcategory = computed(() => useViewStacks().activeViewStack.subcategory);
+
+const rootView = computed(() => useViewStacks().activeViewStack.rootView);
+
+const placeholderTriggerActions = getPlaceholderTriggerActions(subcategory.value || '');
+
+const hasNoTriggerActions = computed(
+	() =>
+		parseCategoryActions(
+			useViewStacks().activeViewStack.baselineItems || [],
+			actionsCategoryLocales.value.triggers,
+			!search.value,
+		).length === 0,
+);
+
+const containsAPIAction = computed(() => {
+	const actions = useViewStacks().activeViewStack.baselineItems || [];
+
+	const result = actions.some((p) => {
+		return ((p as ActionCreateElement).properties.actionKey ?? '') === CUSTOM_API_CALL_KEY;
+	});
+
+	return result;
+});
+
+const isTriggerRootView = computed(() => rootView.value === TRIGGER_NODE_CREATOR_VIEW);
+
+registerKeyHook('ActionsKeyRight', {
+	keyboardKeys: ['ArrowRight', 'Enter'],
+	condition: (type) => type === 'action',
+	handler: onKeySelect,
+});
+
+registerKeyHook('ActionsKeyLeft', {
+	keyboardKeys: ['ArrowLeft'],
+	condition: (type) => type === 'action',
+	handler: arrowLeft,
+});
+
+function parseActions(base: INodeCreateElement[], locale: string, withLabels = false) {
+	return parseCategoryActions(base, locale, withLabels);
+}
+
+function arrowLeft() {
+	popViewStack();
+}
+
+function onKeySelect(activeItemId: string) {
+	const mergedActions = [...actions.value, ...placeholderTriggerActions];
+	const activeAction = mergedActions.find((a) => a.uuid === activeItemId);
+
+	if (activeAction) onSelected(activeAction);
+}
+
+function onSelected(actionCreateElement: INodeCreateElement) {
+	const actionData = getActionData(actionCreateElement.properties as ActionTypeDescription);
+	const isPlaceholderTriggerAction = placeholderTriggerActions.some(
+		(p) => p.key === actionCreateElement.key,
+	);
+
+	if (isPlaceholderTriggerAction && isTriggerRootView.value) {
+		const actionNode = actions.value[0].key;
+
+		emit('nodeTypeSelected', [actionData.key as string, actionNode]);
+	} else if (
+		actionData.key === OPEN_AI_NODE_TYPE &&
+		(actionData?.value as IDataObject)?.resource === 'assistant' &&
+		(actionData?.value as IDataObject)?.operation === 'message'
+	) {
+		emit('nodeTypeSelected', [OPEN_AI_NODE_MESSAGE_ASSISTANT_TYPE]);
+	} else {
+		emit('nodeTypeSelected', [actionData.key as string]);
+	}
+
+	if (telemetry) setAddedNodeActionParameters(actionData, telemetry, rootView.value);
+}
+
+function trackActionsView() {
+	const activeViewStack = useViewStacks().activeViewStack;
+
+	const trigger_action_count = (activeViewStack.baselineItems || [])?.filter((action) =>
+		action.key.toLowerCase().includes('trigger'),
+	).length;
+
+	const appIdentifier = [...actions.value, ...placeholderTriggerActions][0].key;
+
+	const trackingPayload = {
+		app_identifier: appIdentifier,
+		actions: (activeViewStack.baselineItems || [])?.map(
+			(action) => (action as ActionCreateElement).properties.displayName,
+		),
+		regular_action_count: (activeViewStack.baselineItems || [])?.length - trigger_action_count,
+		trigger_action_count,
+	};
+
+	void useExternalHooks().run('nodeCreateList.onViewActions', trackingPayload);
+	telemetry?.trackNodesPanel('nodeCreateList.onViewActions', trackingPayload);
+}
+
+function resetSearch() {
+	updateCurrentViewStack({ search: '' });
+}
+
+function addHttpNode() {
+	const updateData = {
+		name: '',
+		key: HTTP_REQUEST_NODE_TYPE,
+		value: {
+			authentication: 'predefinedCredentialType',
+		},
+	} as IUpdateInformation;
+
+	emit('nodeTypeSelected', [HTTP_REQUEST_NODE_TYPE]);
+	if (telemetry) setAddedNodeActionParameters(updateData);
+
+	const app_identifier = actions.value[0].key;
+	void useExternalHooks().run('nodeCreateList.onActionsCustmAPIClicked', {
+		app_identifier,
+	});
+	telemetry?.trackNodesPanel('nodeCreateList.onActionsCustmAPIClicked', { app_identifier });
+}
+
+// Anonymous component to handle triggers and actions rendering order
+const OrderSwitcher = defineComponent({
+	props: {
+		rootView: {
+			type: String as PropType<NodeFilterType>,
+		},
+	},
+	setup(props, { slots }) {
+		return () =>
+			h(
+				'div',
+				{},
+				props.rootView === REGULAR_NODE_CREATOR_VIEW
+					? [slots.actions?.(), slots.triggers?.()]
+					: [slots.triggers?.(), slots.actions?.()],
+			);
+	},
+});
+
+onMounted(() => {
+	trackActionsView();
+});
+</script>
+
+<template>
+	<div :class="$style.container">
+		<OrderSwitcher :root-view="rootView">
+			<template v-if="isTriggerRootView || parsedTriggerActionsBaseline.length !== 0" #triggers>
+				<!-- Triggers Category -->
+				<CategorizedItemsRenderer
+					:elements="parsedTriggerActions"
+					:category="triggerCategoryName"
+					:mouse-over-tooltip="$locale.baseText('nodeCreator.actionsTooltip.triggersStartWorkflow')"
+					is-trigger-category
+					:expanded="isTriggerRootView || parsedActionActions.length === 0"
+					@selected="onSelected"
+				>
+					<!-- Empty state -->
+					<template v-if="hasNoTriggerActions" #empty>
+						<n8n-callout
+							v-if="hasNoTriggerActions"
+							theme="info"
+							iconless
+							slim
+							data-test-id="actions-panel-no-triggers-callout"
+						>
+							<span
+								v-html="
+									$locale.baseText('nodeCreator.actionsCallout.noTriggerItems', {
+										interpolate: { nodeName: subcategory },
+									})
+								"
+							/>
+						</n8n-callout>
+						<ItemsRenderer :elements="placeholderTriggerActions" @selected="onSelected" />
+					</template>
+					<template v-else #empty>
+						<p
+							:class="$style.resetSearch"
+							@click="resetSearch"
+							v-html="$locale.baseText('nodeCreator.actionsCategory.noMatchingTriggers')"
+						/>
+					</template>
+				</CategorizedItemsRenderer>
+			</template>
+			<template v-if="!isTriggerRootView || parsedActionActionsBaseline.length !== 0" #actions>
+				<!-- Actions Category -->
+				<CategorizedItemsRenderer
+					:elements="parsedActionActions"
+					:category="actionsCategoryLocales.actions"
+					:mouse-over-tooltip="$locale.baseText('nodeCreator.actionsTooltip.actionsPerformStep')"
+					:expanded="!isTriggerRootView || parsedTriggerActions.length === 0"
+					@selected="onSelected"
+				>
+					<n8n-callout
+						v-if="!userActivated && isTriggerRootView"
+						theme="info"
+						iconless
+						slim
+						data-test-id="actions-panel-activation-callout"
+					>
+						<span v-html="$locale.baseText('nodeCreator.actionsCallout.triggersStartWorkflow')" />
+					</n8n-callout>
+					<!-- Empty state -->
+					<template #empty>
+						<n8n-info-tip v-if="!search" theme="info" type="note" :class="$style.actionsEmpty">
+							<span
+								v-html="
+									$locale.baseText('nodeCreator.actionsCallout.noActionItems', {
+										interpolate: { nodeName: subcategory },
+									})
+								"
+							/>
+						</n8n-info-tip>
+						<p
+							v-else
+							:class="$style.resetSearch"
+							data-test-id="actions-panel-no-matching-actions"
+							@click="resetSearch"
+							v-html="$locale.baseText('nodeCreator.actionsCategory.noMatchingActions')"
+						/>
+					</template>
+				</CategorizedItemsRenderer>
+			</template>
+		</OrderSwitcher>
+		<div v-if="containsAPIAction" :class="$style.apiHint">
+			<span
+				@click.prevent="addHttpNode"
+				v-html="
+					$locale.baseText('nodeCreator.actionsList.apiCall', {
+						interpolate: { node: subcategory },
+					})
+				"
+			/>
+		</div>
+	</div>
+</template>
+
+<style lang="scss" module>
+.container {
+	display: flex;
+	flex-direction: column;
+	padding-bottom: var(--spacing-3xl);
+}
+
+.resetSearch {
+	cursor: pointer;
+	line-height: var(--font-line-height-regular);
+	font-weight: var(--font-weight-regular);
+	font-size: var(--font-size-2xs);
+	padding: var(--spacing-2xs) var(--spacing-s) 0;
+	color: var(--color-text-base);
+
+	i {
+		font-weight: var(--font-weight-bold);
+		font-style: normal;
+		text-decoration: underline;
+	}
+}
+.actionsEmpty {
+	padding: var(--spacing-2xs) var(--spacing-xs) var(--spacing-s);
+	font-weight: var(--font-weight-regular);
+
+	strong {
+		font-weight: var(--font-weight-bold);
+	}
+}
+.apiHint {
+	padding: 0 var(--spacing-s) var(--spacing-xl);
+	font-size: var(--font-size-2xs);
+	color: var(--color-text-base);
+	line-height: var(--font-line-height-regular);
+	z-index: 1;
+}
+</style>
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/Modes/NodesMode.vue b/packages/editor-ui/src/components/Node/NodeCreator/Modes/NodesMode.vue
new file mode 100644
index 0000000000000..f9b7fbe8bf20f
--- /dev/null
+++ b/packages/editor-ui/src/components/Node/NodeCreator/Modes/NodesMode.vue
@@ -0,0 +1,241 @@
+<script setup lang="ts">
+import { camelCase } from 'lodash-es';
+import { computed } from 'vue';
+import type { INodeCreateElement, NodeFilterType } from '@/Interface';
+import {
+	TRIGGER_NODE_CREATOR_VIEW,
+	HTTP_REQUEST_NODE_TYPE,
+	WEBHOOK_NODE_TYPE,
+	REGULAR_NODE_CREATOR_VIEW,
+	AI_NODE_CREATOR_VIEW,
+	AI_OTHERS_NODE_CREATOR_VIEW,
+} from '@/constants';
+
+import type { BaseTextKey } from '@/plugins/i18n';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import { useNodeCreatorStore } from '@/stores/nodeCreator.store';
+
+import { TriggerView, RegularView, AIView, AINodesView } from '../viewsData';
+import { flattenCreateElements, transformNodeType } from '../utils';
+import { useViewStacks } from '../composables/useViewStacks';
+import { useKeyboardNavigation } from '../composables/useKeyboardNavigation';
+import ItemsRenderer from '../Renderers/ItemsRenderer.vue';
+import CategorizedItemsRenderer from '../Renderers/CategorizedItemsRenderer.vue';
+import NoResults from '../Panel/NoResults.vue';
+import { useI18n } from '@/composables/useI18n';
+import { useTelemetry } from '@/composables/useTelemetry';
+
+export interface Props {
+	rootView: 'trigger' | 'action';
+}
+
+const emit = defineEmits({
+	nodeTypeSelected: (nodeTypes: string[]) => true,
+});
+
+const i18n = useI18n();
+const telemetry = useTelemetry();
+
+const { mergedNodes, actions } = useNodeCreatorStore();
+const { baseUrl } = useRootStore();
+const { pushViewStack, popViewStack } = useViewStacks();
+
+const { registerKeyHook } = useKeyboardNavigation();
+
+const activeViewStack = computed(() => useViewStacks().activeViewStack);
+const globalSearchItemsDiff = computed(() => useViewStacks().globalSearchItemsDiff);
+
+function selectNodeType(nodeTypes: string[]) {
+	emit('nodeTypeSelected', nodeTypes);
+}
+
+function onSelected(item: INodeCreateElement) {
+	if (item.type === 'subcategory') {
+		const subcategoryKey = camelCase(item.properties.title);
+		const title = i18n.baseText(`nodeCreator.subcategoryNames.${subcategoryKey}` as BaseTextKey);
+
+		pushViewStack({
+			subcategory: item.key,
+			title,
+			mode: 'nodes',
+			...(item.properties.icon
+				? {
+						nodeIcon: {
+							icon: item.properties.icon,
+							iconType: 'icon',
+						},
+					}
+				: {}),
+			...(item.properties.panelClass ? { panelClass: item.properties.panelClass } : {}),
+			rootView: activeViewStack.value.rootView,
+			forceIncludeNodes: item.properties.forceIncludeNodes,
+			baseFilter: baseSubcategoriesFilter,
+			itemsMapper: subcategoriesMapper,
+			sections: item.properties.sections,
+		});
+
+		telemetry.trackNodesPanel('nodeCreateList.onSubcategorySelected', {
+			subcategory: item.key,
+		});
+	}
+
+	if (item.type === 'node') {
+		const nodeActions = actions?.[item.key] || [];
+		if (nodeActions.length <= 1) {
+			selectNodeType([item.key]);
+			return;
+		}
+
+		const icon = item.properties.iconUrl
+			? `${baseUrl}${item.properties.iconUrl}`
+			: item.properties.icon?.split(':')[1];
+
+		const transformedActions = nodeActions?.map((a) =>
+			transformNodeType(a, item.properties.displayName, 'action'),
+		);
+
+		pushViewStack({
+			subcategory: item.properties.displayName,
+			title: item.properties.displayName,
+			nodeIcon: {
+				color: item.properties.defaults?.color || '',
+				icon,
+				iconType: item.properties.iconUrl ? 'file' : 'icon',
+			},
+
+			rootView: activeViewStack.value.rootView,
+			hasSearch: true,
+			mode: 'actions',
+			items: transformedActions,
+		});
+	}
+
+	if (item.type === 'view') {
+		const views = {
+			[TRIGGER_NODE_CREATOR_VIEW]: TriggerView,
+			[REGULAR_NODE_CREATOR_VIEW]: RegularView,
+			[AI_NODE_CREATOR_VIEW]: AIView,
+			[AI_OTHERS_NODE_CREATOR_VIEW]: AINodesView,
+		};
+
+		const itemKey = item.key as keyof typeof views;
+		const matchedView = views[itemKey];
+
+		if (!matchedView) {
+			console.warn(`No view found for ${itemKey}`);
+			return;
+		}
+		const view = matchedView(mergedNodes);
+
+		pushViewStack({
+			title: view.title,
+			subtitle: view?.subtitle ?? '',
+			info: view?.info ?? '',
+			items: view.items as INodeCreateElement[],
+			hasSearch: true,
+			rootView: view.value as NodeFilterType,
+			mode: 'nodes',
+			// Root search should include all nodes
+			searchItems: mergedNodes,
+		});
+	}
+}
+
+function subcategoriesMapper(item: INodeCreateElement) {
+	if (item.type !== 'node') return item;
+
+	const hasTriggerGroup = item.properties.group.includes('trigger');
+	const nodeActions = actions?.[item.key] || [];
+	const hasActions = nodeActions.length > 0;
+
+	if (hasTriggerGroup && hasActions) {
+		if (item.properties?.codex) {
+			// Store the original name in the alias so we can search for it
+			item.properties.codex.alias = [
+				...(item.properties.codex?.alias || []),
+				item.properties.displayName,
+			];
+		}
+		item.properties.displayName = item.properties.displayName.replace(' Trigger', '');
+	}
+	return item;
+}
+
+function baseSubcategoriesFilter(item: INodeCreateElement): boolean {
+	if (item.type === 'section') return true;
+	if (item.type !== 'node') return false;
+
+	const hasTriggerGroup = item.properties.group.includes('trigger');
+	const nodeActions = actions?.[item.key] || [];
+	const hasActions = nodeActions.length > 0;
+
+	const isTriggerRootView = activeViewStack.value.rootView === TRIGGER_NODE_CREATOR_VIEW;
+	if (isTriggerRootView) {
+		return hasActions || hasTriggerGroup;
+	}
+
+	return hasActions || !hasTriggerGroup;
+}
+
+function arrowLeft() {
+	popViewStack();
+}
+
+function onKeySelect(activeItemId: string) {
+	const mergedItems = flattenCreateElements([
+		...(activeViewStack.value.items ?? []),
+		...(globalSearchItemsDiff.value ?? []),
+	]);
+
+	const item = mergedItems.find((i) => i.uuid === activeItemId);
+	if (!item) return;
+
+	onSelected(item);
+}
+
+registerKeyHook('MainViewArrowRight', {
+	keyboardKeys: ['ArrowRight', 'Enter'],
+	condition: (type) => ['subcategory', 'node', 'view'].includes(type),
+	handler: onKeySelect,
+});
+
+registerKeyHook('MainViewArrowLeft', {
+	keyboardKeys: ['ArrowLeft'],
+	condition: (type) => ['subcategory', 'node', 'view'].includes(type),
+	handler: arrowLeft,
+});
+</script>
+
+<template>
+	<span>
+		<!-- Main Node Items -->
+		<ItemsRenderer :elements="activeViewStack.items" :class="$style.items" @selected="onSelected">
+			<template
+				v-if="(activeViewStack.items || []).length === 0 && globalSearchItemsDiff.length === 0"
+				#empty
+			>
+				<NoResults
+					:root-view="activeViewStack.rootView"
+					show-icon
+					show-request
+					@add-webhook-node="selectNodeType([WEBHOOK_NODE_TYPE])"
+					@add-http-node="selectNodeType([HTTP_REQUEST_NODE_TYPE])"
+				/>
+			</template>
+		</ItemsRenderer>
+		<!-- Results in other categories -->
+		<CategorizedItemsRenderer
+			v-if="globalSearchItemsDiff.length > 0"
+			:elements="globalSearchItemsDiff"
+			:category="$locale.baseText('nodeCreator.categoryNames.otherCategories')"
+			@selected="onSelected"
+		>
+		</CategorizedItemsRenderer>
+	</span>
+</template>
+
+<style lang="scss" module>
+.items {
+	margin-bottom: var(--spacing-s);
+}
+</style>
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/NoResults.vue b/packages/editor-ui/src/components/Node/NodeCreator/NoResults.vue
deleted file mode 100644
index 31b3fb9f144f9..0000000000000
--- a/packages/editor-ui/src/components/Node/NodeCreator/NoResults.vue
+++ /dev/null
@@ -1,93 +0,0 @@
-<template>
-	<div :class="{ [$style.noResults]: true, [$style.iconless]: !showIcon }">
-		<div :class="$style.icon" v-if="showIcon">
-			<no-results-icon />
-		</div>
-		<div :class="$style.title">
-			<slot name="title" />
-			<div :class="$style.action">
-				<slot name="action" />
-			</div>
-		</div>
-
-		<div :class="$style.request" v-if="showRequest">
-			<p v-text="$locale.baseText('nodeCreator.noResults.wantUsToMakeItFaster')" />
-			<div>
-				<n8n-link :to="REQUEST_NODE_FORM_URL">
-					<span>{{ $locale.baseText('nodeCreator.noResults.requestTheNode') }}</span
-					>&nbsp;
-					<span>
-						<font-awesome-icon
-							:class="$style.external"
-							icon="external-link-alt"
-							:title="$locale.baseText('nodeCreator.noResults.requestTheNode')"
-						/>
-					</span>
-				</n8n-link>
-			</div>
-		</div>
-	</div>
-</template>
-
-<script setup lang="ts">
-import { REQUEST_NODE_FORM_URL } from '@/constants';
-import NoResultsIcon from './NoResultsIcon.vue';
-
-export interface Props {
-	showIcon?: boolean;
-	showRequest?: boolean;
-}
-
-defineProps<Props>();
-</script>
-
-<style lang="scss" module>
-.noResults {
-	background-color: $node-creator-no-results-background-color;
-	text-align: center;
-	height: 100%;
-	border-left: 1px solid $node-creator-border-color;
-	flex-direction: column;
-	font-weight: 400;
-	display: flex;
-	align-items: center;
-	align-content: center;
-	padding: 0 var(--spacing-2xl);
-}
-
-.title {
-	font-size: var(--font-size-m);
-	line-height: var(--font-line-height-regular);
-	margin-top: var(--spacing-xs);
-
-	div {
-		margin-bottom: var(--spacing-s);
-	}
-}
-
-.action p,
-.request p {
-	font-size: var(--font-size-s);
-	line-height: var(--font-line-height-xloose);
-}
-
-.request {
-	position: fixed;
-	bottom: var(--spacing-m);
-	display: none;
-
-	@media (min-height: 550px) {
-		display: block;
-	}
-}
-
-.icon {
-	margin-top: var(--spacing-2xl);
-	min-height: 67px;
-	opacity: 0.6;
-}
-
-.external {
-	font-size: var(--font-size-2xs);
-}
-</style>
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/NodeCreator.vue b/packages/editor-ui/src/components/Node/NodeCreator/NodeCreator.vue
index 77415e2f063aa..ac53473f3d8ca 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/NodeCreator.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/NodeCreator.vue
@@ -1,54 +1,78 @@
 <template>
 	<div>
-		<aside :class="{ 'node-creator-scrim': true, active: nodeCreatorStore.showScrim }" />
-
-		<slide-transition>
+		<aside
+			:class="{
+				[$style.nodeCreatorScrim]: true,
+				[$style.active]: showScrim,
+			}"
+		/>
+		<SlideTransition>
 			<div
 				v-if="active"
-				class="node-creator"
 				ref="nodeCreator"
-				v-click-outside="onClickOutside"
+				:class="{ [$style.nodeCreator]: true, [$style.chatOpened]: chatSidebarOpen }"
+				:style="nodeCreatorInlineStyle"
+				data-test-id="node-creator"
 				@dragover="onDragOver"
 				@drop="onDrop"
 				@mousedown="onMouseDown"
 				@mouseup="onMouseUp"
-				data-test-id="node-creator"
 			>
-				<main-panel @nodeTypeSelected="$listeners.nodeTypeSelected" />
+				<NodesListPanel @node-type-selected="onNodeTypeSelected" />
 			</div>
-		</slide-transition>
+		</SlideTransition>
 	</div>
 </template>
 
 <script setup lang="ts">
-import { watch, reactive, toRefs } from 'vue';
+import { watch, reactive, toRefs, computed, onBeforeUnmount } from 'vue';
+
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import { useNodeCreatorStore } from '@/stores/nodeCreator.store';
 import SlideTransition from '@/components/transitions/SlideTransition.vue';
 
-import MainPanel from './MainPanel.vue';
-import { useNodeCreatorStore } from '@/stores/nodeCreator';
+import { useViewStacks } from './composables/useViewStacks';
+import { useKeyboardNavigation } from './composables/useKeyboardNavigation';
+import { useActionsGenerator } from './composables/useActionsGeneration';
+import NodesListPanel from './Panel/NodesListPanel.vue';
+import { useCredentialsStore } from '@/stores/credentials.store';
+import { useUIStore } from '@/stores/ui.store';
+import { useAIStore } from '@/stores/ai.store';
+import { DRAG_EVENT_DATA_KEY } from '@/constants';
 
 export interface Props {
 	active?: boolean;
+	onNodeTypeSelected?: (nodeType: string[]) => void;
 }
 
 const props = defineProps<Props>();
-
+const { resetViewStacks } = useViewStacks();
+const { registerKeyHook } = useKeyboardNavigation();
 const emit = defineEmits<{
 	(event: 'closeNodeCreator'): void;
+	(event: 'nodeTypeSelected', value: string[]): void;
 }>();
+const uiStore = useUIStore();
+const aiStore = useAIStore();
+
+const { setShowScrim, setActions, setMergeNodes } = useNodeCreatorStore();
+const { generateMergedNodesAndActions } = useActionsGenerator();
 
-const nodeCreatorStore = useNodeCreatorStore();
 const state = reactive({
 	nodeCreator: null as HTMLElement | null,
 	mousedownInsideEvent: null as MouseEvent | null,
 });
 
-function onClickOutside(event: Event) {
-	// We need to prevent cases where user would click inside the node creator
-	// and try to drag undraggable element. In that case the click event would
-	// be fired and the node creator would be closed. So we stop that if we detect
-	// that the click event originated from inside the node creator. And fire click even on the
-	// original target.
+const showScrim = computed(() => useNodeCreatorStore().showScrim);
+
+const viewStacksLength = computed(() => useViewStacks().viewStacks.length);
+
+const chatSidebarOpen = computed(() => aiStore.assistantChatOpen);
+
+const nodeCreatorInlineStyle = computed(() => {
+	return { top: `${uiStore.bannersHeight + uiStore.headerHeight}px` };
+});
+function onMouseUpOutside() {
 	if (state.mousedownInsideEvent) {
 		const clickEvent = new MouseEvent('click', {
 			bubbles: true,
@@ -56,18 +80,21 @@ function onClickOutside(event: Event) {
 		});
 		state.mousedownInsideEvent.target?.dispatchEvent(clickEvent);
 		state.mousedownInsideEvent = null;
-		return;
-	}
-
-	if (event.type === 'click') {
-		emit('closeNodeCreator');
+		unBindOnMouseUpOutside();
 	}
 }
+function unBindOnMouseUpOutside() {
+	document.removeEventListener('mouseup', onMouseUpOutside);
+	document.removeEventListener('touchstart', onMouseUpOutside);
+}
 function onMouseUp() {
 	state.mousedownInsideEvent = null;
+	unBindOnMouseUpOutside();
 }
 function onMouseDown(event: MouseEvent) {
 	state.mousedownInsideEvent = event;
+	document.addEventListener('mouseup', onMouseUpOutside);
+	document.addEventListener('touchstart', onMouseUpOutside);
 }
 function onDragOver(event: DragEvent) {
 	event.preventDefault();
@@ -77,12 +104,12 @@ function onDrop(event: DragEvent) {
 		return;
 	}
 
-	const nodeTypeName = event.dataTransfer.getData('nodeTypeName');
+	const dragData = event.dataTransfer.getData(DRAG_EVENT_DATA_KEY);
 	const nodeCreatorBoundingRect = (state.nodeCreator as Element).getBoundingClientRect();
 
 	// Abort drag end event propagation if dropped inside nodes panel
 	if (
-		nodeTypeName &&
+		dragData &&
 		event.pageX >= nodeCreatorBoundingRect.x &&
 		event.pageY >= nodeCreatorBoundingRect.y
 	) {
@@ -93,21 +120,56 @@ function onDrop(event: DragEvent) {
 watch(
 	() => props.active,
 	(isActive) => {
-		if (isActive === false) nodeCreatorStore.setShowScrim(false);
+		if (!isActive) {
+			setShowScrim(false);
+			resetViewStacks();
+		}
 	},
 );
 
+// Close node creator when the last view stacks is closed
+watch(viewStacksLength, (viewStacksLength) => {
+	if (viewStacksLength === 0) {
+		emit('closeNodeCreator');
+		setShowScrim(false);
+	}
+});
+
+registerKeyHook('NodeCreatorCloseEscape', {
+	keyboardKeys: ['Escape'],
+	handler: () => emit('closeNodeCreator'),
+});
+registerKeyHook('NodeCreatorCloseTab', {
+	keyboardKeys: ['Tab'],
+	handler: () => emit('closeNodeCreator'),
+});
+
+watch(
+	() => ({
+		httpOnlyCredentials: useCredentialsStore().httpOnlyCredentialTypes,
+		nodeTypes: useNodeTypesStore().visibleNodeTypes,
+	}),
+	({ nodeTypes, httpOnlyCredentials }) => {
+		const { actions, mergedNodes } = generateMergedNodesAndActions(nodeTypes, httpOnlyCredentials);
+
+		setActions(actions);
+		setMergeNodes(mergedNodes);
+	},
+	{ immediate: true },
+);
 const { nodeCreator } = toRefs(state);
+
+onBeforeUnmount(() => {
+	unBindOnMouseUpOutside();
+});
 </script>
 
-<style scoped lang="scss">
-::v-deep *,
-*:before,
-*:after {
-	box-sizing: border-box;
+<style module lang="scss">
+:global(strong) {
+	font-weight: var(--font-weight-bold);
 }
-
-.node-creator {
+.nodeCreator {
+	--node-icon-color: var(--color-text-base);
 	position: fixed;
 	top: $header-height;
 	bottom: 0;
@@ -115,9 +177,13 @@ const { nodeCreator } = toRefs(state);
 	z-index: 200;
 	width: $node-creator-width;
 	color: $node-creator-text-color;
+
+	&.chatOpened {
+		right: $chat-width;
+	}
 }
 
-.node-creator-scrim {
+.nodeCreatorScrim {
 	position: fixed;
 	top: $header-height;
 	right: 0;
@@ -125,7 +191,7 @@ const { nodeCreator } = toRefs(state);
 	left: $sidebar-width;
 	opacity: 0;
 	z-index: 1;
-	background: var(--color-background-dark);
+	background: var(--color-dialog-overlay-background);
 	pointer-events: none;
 	transition: opacity 200ms ease-in-out;
 
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/NodeItem.vue b/packages/editor-ui/src/components/Node/NodeCreator/NodeItem.vue
deleted file mode 100644
index bb4acccec7c41..0000000000000
--- a/packages/editor-ui/src/components/Node/NodeCreator/NodeItem.vue
+++ /dev/null
@@ -1,211 +0,0 @@
-<template>
-	<!-- Node Item is draggable only if it doesn't contain actions -->
-	<n8n-node-creator-node
-		:draggable="!showActionArrow"
-		@dragstart="onDragStart"
-		@dragend="onDragEnd"
-		@click.stop="onClick"
-		:class="$style.nodeItem"
-		:description="allowDescription ? description : ''"
-		:title="displayName"
-		:isTrigger="!allowActions && isTriggerNode"
-		:show-action-arrow="showActionArrow"
-	>
-		<template #icon>
-			<node-icon :nodeType="nodeType" />
-		</template>
-
-		<template #tooltip v-if="isCommunityNode">
-			<p
-				:class="$style.communityNodeIcon"
-				v-html="
-					$locale.baseText('generic.communityNode.tooltip', {
-						interpolate: {
-							packageName: nodeType.name.split('.')[0],
-							docURL: COMMUNITY_NODES_INSTALLATION_DOCS_URL,
-						},
-					})
-				"
-				@click="onCommunityNodeTooltipClick"
-			/>
-		</template>
-		<template #dragContent>
-			<div :class="$style.draggableDataTransfer" ref="draggableDataTransfer" />
-			<div :class="$style.draggable" :style="draggableStyle" v-show="dragging">
-				<node-icon :nodeType="nodeType" @click.capture.stop :size="40" :shrink="false" />
-			</div>
-		</template>
-	</n8n-node-creator-node>
-</template>
-
-<script setup lang="ts">
-import { reactive, computed, toRefs, getCurrentInstance } from 'vue';
-import type { INodeTypeDescription } from 'n8n-workflow';
-
-import { getNewNodePosition, NODE_SIZE } from '@/utils/nodeViewUtils';
-import { isCommunityPackageName } from '@/utils';
-import { COMMUNITY_NODES_INSTALLATION_DOCS_URL } from '@/constants';
-import { useNodeCreatorStore } from '@/stores/nodeCreator';
-
-import NodeIcon from '@/components/NodeIcon.vue';
-
-export interface Props {
-	nodeType: INodeTypeDescription;
-	active?: boolean;
-	allowActions?: boolean;
-	allowDescription?: boolean;
-}
-
-const props = withDefaults(defineProps<Props>(), {
-	active: false,
-	allowActions: false,
-	allowDescription: false,
-});
-
-const emit = defineEmits<{
-	(event: 'dragstart', $e: DragEvent): void;
-	(event: 'dragend', $e: DragEvent): void;
-	(event: 'nodeTypeSelected', value: string[]): void;
-	(event: 'actionsOpen', value: INodeTypeDescription): void;
-}>();
-
-const instance = getCurrentInstance();
-const state = reactive({
-	dragging: false,
-	draggablePosition: {
-		x: -100,
-		y: -100,
-	},
-	draggableDataTransfer: null as Element | null,
-});
-const description = computed<string>(() => {
-	return instance?.proxy.$locale.headerText({
-		key: `headers.${shortNodeType.value}.description`,
-		fallback: props.nodeType.description,
-	}) as string;
-});
-const showActionArrow = computed(() => props.allowActions && hasActions.value);
-
-const hasActions = computed<boolean>(() => (props.nodeType.actions?.length || 0) > 0);
-
-const shortNodeType = computed<string>(
-	() => instance?.proxy.$locale.shortNodeType(props.nodeType.name) || '',
-);
-
-const draggableStyle = computed<{ top: string; left: string }>(() => ({
-	top: `${state.draggablePosition.y}px`,
-	left: `${state.draggablePosition.x}px`,
-}));
-
-const isCommunityNode = computed<boolean>(() => isCommunityPackageName(props.nodeType.name));
-
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-const displayName = computed<any>(() => {
-	const displayName = props.nodeType.displayName.trimEnd();
-
-	return instance?.proxy.$locale.headerText({
-		key: `headers.${shortNodeType}.displayName`,
-		fallback:
-			props.allowActions && props.nodeType.actions?.length
-				? displayName.replace('Trigger', '')
-				: displayName,
-	});
-});
-
-const isTriggerNode = computed<boolean>(() =>
-	props.nodeType.displayName.toLowerCase().includes('trigger'),
-);
-
-function onClick() {
-	if (hasActions.value && props.allowActions) emit('actionsOpen', props.nodeType);
-	else emit('nodeTypeSelected', [props.nodeType.name]);
-}
-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';
-		event.dataTransfer.setDragImage(state.draggableDataTransfer as Element, 0, 0);
-		event.dataTransfer.setData(
-			'nodeTypeName',
-			useNodeCreatorStore().getNodeTypesWithManualTrigger(props.nodeType.name).join(','),
-		);
-	}
-
-	state.dragging = true;
-	state.draggablePosition = { x, y };
-	emit('dragstart', event);
-}
-
-function onDragOver(event: DragEvent): void {
-	if (!state.dragging || (event.pageX === 0 && event.pageY === 0)) {
-		return;
-	}
-
-	const [x, y] = getNewNodePosition([], [event.pageX - NODE_SIZE / 2, event.pageY - NODE_SIZE / 2]);
-
-	state.draggablePosition = { x, y };
-}
-
-function onDragEnd(event: DragEvent): void {
-	document.body.removeEventListener('dragover', onDragOver);
-
-	emit('dragend', event);
-
-	state.dragging = false;
-	setTimeout(() => {
-		state.draggablePosition = { x: -100, y: -100 };
-	}, 300);
-}
-
-function onCommunityNodeTooltipClick(event: MouseEvent) {
-	if ((event.target as Element).localName === 'a') {
-		instance?.proxy.$telemetry.track('user clicked cnr docs link', { source: 'nodes panel node' });
-	}
-}
-
-defineExpose({
-	onClick,
-});
-const { dragging, draggableDataTransfer } = toRefs(state);
-</script>
-<style lang="scss" module>
-.nodeItem {
-	--trigger-icon-background-color: #{$trigger-icon-background-color};
-	--trigger-icon-border-color: #{$trigger-icon-border-color};
-	margin-left: 15px;
-	margin-right: 12px;
-	user-select: none;
-}
-
-.communityNodeIcon {
-	vertical-align: top;
-}
-
-.draggable {
-	width: 100px;
-	height: 100px;
-	position: fixed;
-	z-index: 1;
-	opacity: 0.66;
-	border: 2px solid var(--color-foreground-xdark);
-	border-radius: var(--border-radius-large);
-	background-color: var(--color-background-xlight);
-	display: flex;
-	justify-content: center;
-	align-items: center;
-}
-
-.draggableDataTransfer {
-	width: 1px;
-	height: 1px;
-}
-</style>
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/Panel/NoResults.vue b/packages/editor-ui/src/components/Node/NodeCreator/Panel/NoResults.vue
new file mode 100644
index 0000000000000..2f149eae566ce
--- /dev/null
+++ b/packages/editor-ui/src/components/Node/NodeCreator/Panel/NoResults.vue
@@ -0,0 +1,112 @@
+<template>
+	<div
+		:class="{ [$style.noResults]: true, [$style.iconless]: !showIcon }"
+		data-test-id="node-creator-no-results"
+	>
+		<div v-if="showIcon" :class="$style.icon">
+			<NoResultsIcon />
+		</div>
+		<div :class="$style.title">
+			<slot name="title" />
+			<p v-text="$locale.baseText('nodeCreator.noResults.weDidntMakeThatYet')" />
+			<div :class="$style.action">
+				{{ $locale.baseText('nodeCreator.noResults.dontWorryYouCanProbablyDoItWithThe') }}
+				<n8n-link v-if="rootView === REGULAR_NODE_CREATOR_VIEW" @click="$emit('addHttpNode')">
+					{{ $locale.baseText('nodeCreator.noResults.httpRequest') }}
+				</n8n-link>
+
+				<n8n-link v-if="rootView === TRIGGER_NODE_CREATOR_VIEW" @click="$emit('addWebhookNode')">
+					{{ $locale.baseText('nodeCreator.noResults.webhook') }}
+				</n8n-link>
+				{{ $locale.baseText('nodeCreator.noResults.node') }}
+			</div>
+		</div>
+
+		<div v-if="showRequest" :class="$style.request">
+			<p v-text="$locale.baseText('nodeCreator.noResults.wantUsToMakeItFaster')" />
+			<div>
+				<n8n-link :to="REQUEST_NODE_FORM_URL">
+					<span>{{ $locale.baseText('nodeCreator.noResults.requestTheNode') }}</span
+					>&nbsp;
+					<span>
+						<font-awesome-icon
+							:class="$style.external"
+							icon="external-link-alt"
+							:title="$locale.baseText('nodeCreator.noResults.requestTheNode')"
+						/>
+					</span>
+				</n8n-link>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script setup lang="ts">
+import {
+	REQUEST_NODE_FORM_URL,
+	REGULAR_NODE_CREATOR_VIEW,
+	TRIGGER_NODE_CREATOR_VIEW,
+} from '@/constants';
+import type { NodeFilterType } from '@/Interface';
+
+import NoResultsIcon from './NoResultsIcon.vue';
+
+export interface Props {
+	showIcon?: boolean;
+	showRequest?: boolean;
+	rootView?: NodeFilterType;
+}
+
+defineProps<Props>();
+</script>
+
+<style lang="scss" module>
+.noResults {
+	background-color: $node-creator-no-results-background-color;
+	text-align: center;
+	height: 100%;
+	border-left: 1px solid $node-creator-border-color;
+	flex-direction: column;
+	font-weight: 400;
+	display: flex;
+	align-items: center;
+	align-content: center;
+	padding: 0 var(--spacing-2xl);
+}
+
+.title {
+	font-size: var(--font-size-m);
+	line-height: var(--font-line-height-regular);
+	margin-top: var(--spacing-xs);
+
+	div {
+		margin-bottom: var(--spacing-s);
+	}
+}
+
+.action p,
+.request p {
+	font-size: var(--font-size-s);
+	line-height: var(--font-line-height-xloose);
+}
+
+.request {
+	position: fixed;
+	bottom: var(--spacing-m);
+	display: none;
+
+	@media (min-height: 550px) {
+		display: block;
+	}
+}
+
+.icon {
+	margin-top: var(--spacing-2xl);
+	min-height: 67px;
+	opacity: 0.6;
+}
+
+.external {
+	font-size: var(--font-size-2xs);
+}
+</style>
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/NoResultsIcon.vue b/packages/editor-ui/src/components/Node/NodeCreator/Panel/NoResultsIcon.vue
similarity index 100%
rename from packages/editor-ui/src/components/Node/NodeCreator/NoResultsIcon.vue
rename to packages/editor-ui/src/components/Node/NodeCreator/Panel/NoResultsIcon.vue
index 7dc9e10d579b2..a0d52867e1054 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/NoResultsIcon.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/Panel/NoResultsIcon.vue
@@ -33,8 +33,8 @@
 										points="44.5045606 32.0526802 53.8794707 32.0526802 53.8794707 58.5524261 44.5045606 58.5524261"
 									></polygon>
 									<path
-										d="M48.125,23.0859375 C54.15625,23.0859375 59.0625,18.1796875 59.0625,12.1484375 C59.0625,10.3359375 58.5625,8.6484375 57.78125,7.1484375 L49.34375,15.5859375 L44.6875,10.9296875 L53.125,2.4921875 C51.625,1.7109375 49.9375,1.2109375 48.125,1.2109375 C42.09375,1.2109375 37.1875,6.1171875 37.1875,12.1484375 C37.1875,13.4296875 37.4375,14.6484375 37.84375,15.7734375 L32.0625,21.5546875 L26.5,15.9921875 L28.71875,13.7734375 L24.3125,9.3671875 L30.9375,2.7421875 C27.28125,-0.9140625 21.34375,-0.9140625 17.6875,2.7421875 L6.625,13.8046875 L11.03125,18.2109375 L2.21875,18.2109375 L1.38777878e-15,20.4296875 L11.0625,31.4921875 L13.28125,29.2734375 L13.28125,20.4296875 L17.6875,24.8359375 L19.90625,22.6171875 L25.46875,28.1796875 L2.3125,51.3359375 L8.9375,57.9609375 L44.5,22.4296875 C45.625,22.8359375 46.84375,23.0859375 48.125,23.0859375 Z"
 										id="Path"
+										d="M48.125,23.0859375 C54.15625,23.0859375 59.0625,18.1796875 59.0625,12.1484375 C59.0625,10.3359375 58.5625,8.6484375 57.78125,7.1484375 L49.34375,15.5859375 L44.6875,10.9296875 L53.125,2.4921875 C51.625,1.7109375 49.9375,1.2109375 48.125,1.2109375 C42.09375,1.2109375 37.1875,6.1171875 37.1875,12.1484375 C37.1875,13.4296875 37.4375,14.6484375 37.84375,15.7734375 L32.0625,21.5546875 L26.5,15.9921875 L28.71875,13.7734375 L24.3125,9.3671875 L30.9375,2.7421875 C27.28125,-0.9140625 21.34375,-0.9140625 17.6875,2.7421875 L6.625,13.8046875 L11.03125,18.2109375 L2.21875,18.2109375 L1.38777878e-15,20.4296875 L11.0625,31.4921875 L13.28125,29.2734375 L13.28125,20.4296875 L17.6875,24.8359375 L19.90625,22.6171875 L25.46875,28.1796875 L2.3125,51.3359375 L8.9375,57.9609375 L44.5,22.4296875 C45.625,22.8359375 46.84375,23.0859375 48.125,23.0859375 Z"
 									></path>
 								</g>
 							</g>
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/Panel/NodesListPanel.vue b/packages/editor-ui/src/components/Node/NodeCreator/Panel/NodesListPanel.vue
new file mode 100644
index 0000000000000..2cceed685af85
--- /dev/null
+++ b/packages/editor-ui/src/components/Node/NodeCreator/Panel/NodesListPanel.vue
@@ -0,0 +1,322 @@
+<script setup lang="ts">
+import { computed, onMounted, onUnmounted, watch } from 'vue';
+import type { INodeCreateElement } from '@/Interface';
+import {
+	AI_OTHERS_NODE_CREATOR_VIEW,
+	AI_NODE_CREATOR_VIEW,
+	REGULAR_NODE_CREATOR_VIEW,
+	TRIGGER_NODE_CREATOR_VIEW,
+} from '@/constants';
+
+import { useNodeCreatorStore } from '@/stores/nodeCreator.store';
+
+import { TriggerView, RegularView, AIView, AINodesView } from '../viewsData';
+import { useViewStacks } from '../composables/useViewStacks';
+import { useKeyboardNavigation } from '../composables/useKeyboardNavigation';
+import SearchBar from './SearchBar.vue';
+import ActionsRenderer from '../Modes/ActionsMode.vue';
+import NodesRenderer from '../Modes/NodesMode.vue';
+import { useI18n } from '@/composables/useI18n';
+
+const i18n = useI18n();
+
+const { mergedNodes } = useNodeCreatorStore();
+const { pushViewStack, popViewStack, updateCurrentViewStack } = useViewStacks();
+const { setActiveItemIndex, attachKeydownEvent, detachKeydownEvent } = useKeyboardNavigation();
+
+const activeViewStack = computed(() => useViewStacks().activeViewStack);
+
+const viewStacks = computed(() => useViewStacks().viewStacks);
+
+const isActionsMode = computed(() => useViewStacks().activeViewStackMode === 'actions');
+const searchPlaceholder = computed(() =>
+	isActionsMode.value
+		? i18n.baseText('nodeCreator.actionsCategory.searchActions', {
+				interpolate: { node: activeViewStack.value.title as string },
+			})
+		: i18n.baseText('nodeCreator.searchBar.searchNodes'),
+);
+
+const nodeCreatorView = computed(() => useNodeCreatorStore().selectedView);
+
+function getDefaultActiveIndex(search: string = ''): number {
+	if (activeViewStack.value.activeIndex) {
+		return activeViewStack.value.activeIndex;
+	}
+
+	if (activeViewStack.value.mode === 'actions') {
+		// For actions, set the active focus to the first action, not category
+		return 1;
+	} else if (activeViewStack.value.sections) {
+		// For sections, set the active focus to the first node, not section (unless searching)
+		return search ? 0 : 1;
+	}
+
+	return 0;
+}
+
+function onSearch(value: string) {
+	if (activeViewStack.value.uuid) {
+		updateCurrentViewStack({ search: value });
+		void setActiveItemIndex(getDefaultActiveIndex(value));
+	}
+}
+
+function onTransitionEnd() {
+	void setActiveItemIndex(getDefaultActiveIndex());
+}
+
+onMounted(() => {
+	attachKeydownEvent();
+	void setActiveItemIndex(getDefaultActiveIndex());
+});
+
+onUnmounted(() => {
+	detachKeydownEvent();
+});
+
+watch(
+	() => nodeCreatorView.value,
+	(selectedView) => {
+		const views = {
+			[TRIGGER_NODE_CREATOR_VIEW]: TriggerView,
+			[REGULAR_NODE_CREATOR_VIEW]: RegularView,
+			[AI_NODE_CREATOR_VIEW]: AIView,
+			[AI_OTHERS_NODE_CREATOR_VIEW]: AINodesView,
+		};
+
+		const itemKey = selectedView;
+		const matchedView = views[itemKey];
+
+		if (!matchedView) {
+			console.warn(`No view found for ${itemKey}`);
+			return;
+		}
+		const view = matchedView(mergedNodes);
+
+		pushViewStack({
+			title: view.title,
+			subtitle: view?.subtitle ?? '',
+			items: view.items as INodeCreateElement[],
+			info: view.info,
+			hasSearch: true,
+			mode: 'nodes',
+			rootView: selectedView,
+			// Root search should include all nodes
+			searchItems: mergedNodes,
+		});
+	},
+	{ immediate: true },
+);
+
+function onBackButton() {
+	popViewStack();
+}
+</script>
+
+<template>
+	<transition
+		v-if="viewStacks.length > 0"
+		:name="`panel-slide-${activeViewStack.transitionDirection}`"
+		@after-leave="onTransitionEnd"
+	>
+		<aside
+			:key="`${activeViewStack.uuid}`"
+			:class="[$style.nodesListPanel, activeViewStack.panelClass]"
+			@keydown.capture.stop
+		>
+			<header
+				:class="{
+					[$style.header]: true,
+					[$style.hasBg]: !activeViewStack.subtitle,
+					'nodes-list-panel-header': true,
+				}"
+				data-test-id="nodes-list-header"
+			>
+				<div :class="$style.top">
+					<button
+						v-if="viewStacks.length > 1 && !activeViewStack.preventBack"
+						:class="$style.backButton"
+						@click="onBackButton"
+					>
+						<font-awesome-icon :class="$style.backButtonIcon" icon="arrow-left" size="2x" />
+					</button>
+					<n8n-node-icon
+						v-if="activeViewStack.nodeIcon"
+						:class="$style.nodeIcon"
+						:type="activeViewStack.nodeIcon.iconType || 'unknown'"
+						:src="activeViewStack.nodeIcon.icon"
+						:name="activeViewStack.nodeIcon.icon"
+						:color="activeViewStack.nodeIcon.color"
+						:circle="false"
+						:show-tooltip="false"
+						:size="20"
+					/>
+					<p v-if="activeViewStack.title" :class="$style.title" v-text="activeViewStack.title" />
+				</div>
+				<p
+					v-if="activeViewStack.subtitle"
+					:class="{ [$style.subtitle]: true, [$style.offsetSubtitle]: viewStacks.length > 1 }"
+					v-text="activeViewStack.subtitle"
+				/>
+			</header>
+			<SearchBar
+				v-if="activeViewStack.hasSearch"
+				:class="$style.searchBar"
+				:placeholder="
+					searchPlaceholder
+						? searchPlaceholder
+						: $locale.baseText('nodeCreator.searchBar.searchNodes')
+				"
+				:model-value="activeViewStack.search"
+				@update:model-value="onSearch"
+			/>
+			<div :class="$style.renderedItems">
+				<n8n-notice
+					v-if="activeViewStack.info && !activeViewStack.search"
+					:class="$style.info"
+					:content="activeViewStack.info"
+					theme="warning"
+				/>
+				<!-- Actions mode -->
+				<ActionsRenderer v-if="isActionsMode && activeViewStack.subcategory" v-bind="$attrs" />
+
+				<!-- Nodes Mode -->
+				<NodesRenderer v-else :root-view="nodeCreatorView" v-bind="$attrs" />
+			</div>
+		</aside>
+	</transition>
+</template>
+
+<style lang="scss" module>
+:global(.panel-slide-in-leave-active),
+:global(.panel-slide-in-enter-active),
+:global(.panel-slide-out-leave-active),
+:global(.panel-slide-out-enter-active) {
+	transition: transform 200ms ease;
+	position: absolute;
+	left: 0;
+	right: 0;
+}
+
+:global(.panel-slide-out-enter-from),
+:global(.panel-slide-in-leave-to) {
+	transform: translateX(0);
+	z-index: -1;
+}
+
+:global(.panel-slide-out-leave-to),
+:global(.panel-slide-in-enter-from) {
+	transform: translateX(100%);
+	// Make sure the leaving panel stays on top
+	// for the slide-out panel effect
+	z-index: 1;
+}
+.info {
+	margin: var(--spacing-2xs) var(--spacing-s);
+}
+.backButton {
+	background: transparent;
+	border: none;
+	cursor: pointer;
+	padding: 0 var(--spacing-xs) 0 0;
+}
+
+.backButtonIcon {
+	color: $node-creator-arrow-color;
+	height: 16px;
+	padding: 0;
+}
+.nodeIcon {
+	--node-icon-size: 20px;
+	margin-right: var(--spacing-s);
+}
+.renderedItems {
+	overflow: auto;
+	height: 100%;
+	display: flex;
+	flex-direction: column;
+	scrollbar-width: none; /* Firefox 64 */
+	padding-bottom: var(--spacing-xl);
+	&::-webkit-scrollbar {
+		display: none;
+	}
+}
+.searchBar {
+	flex-shrink: 0;
+}
+.nodesListPanel {
+	background: var(--color-background-xlight);
+	height: 100%;
+	background-color: $node-creator-background-color;
+	--color-background-node-icon-badge: var(--color-background-xlight);
+	width: 385px;
+	display: flex;
+	flex-direction: column;
+
+	&:before {
+		box-sizing: border-box;
+		content: '';
+		border-left: 1px solid $node-creator-border-color;
+		width: 1px;
+		position: absolute;
+		height: 100%;
+	}
+}
+.footer {
+	font-size: var(--font-size-2xs);
+	color: var(--color-text-base);
+	margin: 0 var(--spacing-xs) 0;
+	padding: var(--spacing-4xs) 0;
+	line-height: var(--font-line-height-regular);
+	border-top: 1px solid var(--color-foreground-base);
+	z-index: 1;
+	margin-top: -1px;
+}
+.top {
+	display: flex;
+	align-items: center;
+}
+.header {
+	font-size: var(--font-size-l);
+	font-weight: var(--font-weight-bold);
+	line-height: var(--font-line-height-compact);
+
+	padding: var(--spacing-s) var(--spacing-s);
+
+	&.hasBg {
+		border-bottom: $node-creator-border-color solid 1px;
+		background-color: $node-creator-subcategory-panel-header-bacground-color;
+	}
+}
+.title {
+	line-height: 24px;
+	font-weight: var(--font-weight-bold);
+	font-size: var(--font-size-l);
+
+	.hasBg & {
+		font-size: var(--font-size-s-m);
+		line-height: 22px;
+	}
+}
+.subtitle {
+	margin-top: var(--spacing-4xs);
+	font-size: var(--font-size-s);
+	line-height: 19px;
+	color: var(--color-text-base);
+	font-weight: var(--font-weight-regular);
+}
+.offsetSubtitle {
+	margin-left: calc(var(--spacing-xl) + var(--spacing-4xs));
+}
+</style>
+
+<style lang="scss">
+@each $node-type in $supplemental-node-types {
+	.nodes-list-panel-#{$node-type} .nodes-list-panel-header {
+		.n8n-node-icon svg {
+			color: var(--node-type-#{$node-type}-color);
+		}
+	}
+}
+</style>
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/SearchBar.vue b/packages/editor-ui/src/components/Node/NodeCreator/Panel/SearchBar.vue
similarity index 82%
rename from packages/editor-ui/src/components/Node/NodeCreator/SearchBar.vue
rename to packages/editor-ui/src/components/Node/NodeCreator/Panel/SearchBar.vue
index 5e1c5ecea1b0d..eb43450826716 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/SearchBar.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/Panel/SearchBar.vue
@@ -1,21 +1,21 @@
 <template>
 	<div :class="$style.searchContainer" data-test-id="search-bar">
-		<div :class="{ [$style.prefix]: true, [$style.active]: value.length > 0 }">
+		<div :class="{ [$style.prefix]: true, [$style.active]: modelValue.length > 0 }">
 			<font-awesome-icon icon="search" size="sm" />
 		</div>
 		<div :class="$style.text">
 			<input
+				ref="inputRef"
 				:placeholder="placeholder"
-				:value="value"
-				@input="onInput"
+				:value="modelValue"
 				:class="$style.input"
-				ref="inputRef"
 				autofocus
 				data-test-id="node-creator-search-bar"
 				tabindex="0"
+				@input="onInput"
 			/>
 		</div>
-		<div :class="$style.suffix" v-if="value.length > 0" @click="clear">
+		<div v-if="modelValue.length > 0" :class="$style.suffix" @click="clear">
 			<button :class="[$style.clear, $style.clickable]">
 				<font-awesome-icon icon="times-circle" />
 			</button>
@@ -25,45 +25,43 @@
 
 <script setup lang="ts">
 import { onMounted, reactive, toRefs, onBeforeUnmount } from 'vue';
-import type { EventBus } from '@/event-bus';
-import { useExternalHooks } from '@/composables';
+import { useExternalHooks } from '@/composables/useExternalHooks';
 
 export interface Props {
 	placeholder: string;
-	value: string;
-	eventBus?: EventBus;
+	modelValue: string;
 }
 
 withDefaults(defineProps<Props>(), {
 	placeholder: '',
-	value: '',
+	modelValue: '',
 });
 
 const emit = defineEmits<{
-	(event: 'input', value: string): void;
+	(event: 'update:modelValue', value: string): void;
 }>();
 
-const externalHooks = useExternalHooks();
-
 const state = reactive({
 	inputRef: null as HTMLInputElement | null,
 });
 
+const externalHooks = useExternalHooks();
+
 function focus() {
 	state.inputRef?.focus();
 }
 
 function onInput(event: Event) {
 	const input = event.target as HTMLInputElement;
-	emit('input', input.value);
+	emit('update:modelValue', input.value);
 }
 
 function clear() {
-	emit('input', '');
+	emit('update:modelValue', '');
 }
 
 onMounted(() => {
-	externalHooks.run('nodeCreator_searchBar.mount', { inputRef: state.inputRef });
+	void externalHooks.run('nodeCreatorSearchBar.mount', { inputRef: state.inputRef });
 	setTimeout(focus, 0);
 });
 
@@ -132,7 +130,7 @@ defineExpose({
 }
 
 .clear {
-	background-color: $node-creator-search-clear-color;
+	background-color: transparent;
 	padding: 0;
 	border: none;
 	cursor: pointer;
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/Renderers/CategorizedItemsRenderer.vue b/packages/editor-ui/src/components/Node/NodeCreator/Renderers/CategorizedItemsRenderer.vue
new file mode 100644
index 0000000000000..ea24e940ea62f
--- /dev/null
+++ b/packages/editor-ui/src/components/Node/NodeCreator/Renderers/CategorizedItemsRenderer.vue
@@ -0,0 +1,155 @@
+<script setup lang="ts">
+import { computed, watch, ref, getCurrentInstance } from 'vue';
+import type { INodeCreateElement } from '@/Interface';
+
+import { useWorkflowsStore } from '@/stores/workflows.store';
+
+import { useKeyboardNavigation } from '../composables/useKeyboardNavigation';
+import { useViewStacks } from '../composables/useViewStacks';
+import ItemsRenderer from './ItemsRenderer.vue';
+import CategoryItem from '../ItemTypes/CategoryItem.vue';
+
+export interface Props {
+	elements: INodeCreateElement[];
+	category: string;
+	disabled?: boolean;
+	activeIndex?: number;
+	isTriggerCategory?: boolean;
+	mouseOverTooltip?: string;
+	expanded?: boolean;
+}
+
+const props = withDefaults(defineProps<Props>(), {
+	elements: () => [],
+});
+
+const instance = getCurrentInstance();
+
+const { popViewStack } = useViewStacks();
+const { registerKeyHook } = useKeyboardNavigation();
+const { workflowId } = useWorkflowsStore();
+
+const activeItemId = computed(() => useKeyboardNavigation()?.activeItemId);
+const actionCount = computed(() => props.elements.filter(({ type }) => type === 'action').length);
+const expanded = ref(props.expanded ?? false);
+
+function toggleExpanded() {
+	setExpanded(!expanded.value);
+}
+
+function setExpanded(isExpanded: boolean) {
+	expanded.value = isExpanded;
+
+	if (expanded.value) {
+		instance?.proxy.$telemetry.trackNodesPanel('nodeCreateList.onCategoryExpanded', {
+			category_name: props.category,
+			workflow_id: workflowId,
+		});
+	}
+}
+
+function arrowRight() {
+	if (expanded.value) return;
+
+	setExpanded(true);
+}
+
+function arrowLeft() {
+	if (!expanded.value) {
+		popViewStack();
+		return;
+	}
+
+	setExpanded(false);
+}
+
+watch(
+	() => props.elements,
+	() => {
+		setExpanded(true);
+	},
+);
+
+registerKeyHook(`CategoryRight_${props.category}`, {
+	keyboardKeys: ['ArrowRight'],
+	condition: (type, activeItemId) => type === 'category' && props.category === activeItemId,
+	handler: arrowRight,
+});
+registerKeyHook(`CategoryToggle_${props.category}`, {
+	keyboardKeys: ['Enter'],
+	condition: (type, activeItemId) => type === 'category' && props.category === activeItemId,
+	handler: toggleExpanded,
+});
+
+registerKeyHook(`CategoryLeft_${props.category}`, {
+	keyboardKeys: ['ArrowLeft'],
+	condition: (type, activeItemId) => type === 'category' && props.category === activeItemId,
+	handler: arrowLeft,
+});
+</script>
+
+<template>
+	<div :class="$style.categorizedItemsRenderer" :data-category-collapsed="!expanded">
+		<CategoryItem
+			:class="$style.categoryItem"
+			:name="category"
+			:disabled="disabled"
+			:active="activeItemId === category"
+			:count="actionCount"
+			:expanded="expanded"
+			:is-trigger="isTriggerCategory"
+			data-keyboard-nav-type="category"
+			:data-keyboard-nav-id="category"
+			@click="toggleExpanded"
+		>
+			<span v-if="mouseOverTooltip" :class="$style.mouseOverTooltip">
+				<n8n-tooltip placement="top" :popper-class="$style.tooltipPopper">
+					<n8n-icon icon="question-circle" size="small" />
+					<template #content>
+						<div v-html="mouseOverTooltip" />
+					</template>
+				</n8n-tooltip>
+			</span>
+		</CategoryItem>
+		<div v-if="expanded && actionCount > 0 && $slots.default" :class="$style.contentSlot">
+			<slot />
+		</div>
+		<!-- Pass through listeners & empty slot to ItemsRenderer -->
+		<ItemsRenderer
+			v-if="expanded"
+			v-bind="$attrs"
+			:elements="elements"
+			:is-trigger="isTriggerCategory"
+		>
+			<template #default> </template>
+			<template #empty>
+				<slot name="empty" v-bind="{ elements }" />
+			</template>
+		</ItemsRenderer>
+	</div>
+</template>
+
+<style lang="scss" module>
+.mouseOverTooltip {
+	opacity: 0;
+	margin-left: var(--spacing-3xs);
+	color: var(--color-foreground-xdark);
+	&:hover {
+		color: var(--color-primary);
+	}
+
+	.categorizedItemsRenderer:hover & {
+		opacity: 1;
+	}
+}
+.tooltipPopper {
+	max-width: 260px;
+}
+.contentSlot {
+	padding: 0 var(--spacing-s) var(--spacing-3xs);
+	margin-top: var(--spacing-xs);
+}
+.categorizedItemsRenderer {
+	padding-bottom: var(--spacing-s);
+}
+</style>
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/Renderers/ItemsRenderer.vue b/packages/editor-ui/src/components/Node/NodeCreator/Renderers/ItemsRenderer.vue
new file mode 100644
index 0000000000000..abcc29d78d97e
--- /dev/null
+++ b/packages/editor-ui/src/components/Node/NodeCreator/Renderers/ItemsRenderer.vue
@@ -0,0 +1,228 @@
+<script setup lang="ts">
+import type { INodeCreateElement } from '@/Interface';
+import { onMounted, watch, onUnmounted, ref, computed } from 'vue';
+
+import { useKeyboardNavigation } from '../composables/useKeyboardNavigation';
+import NodeItem from '../ItemTypes/NodeItem.vue';
+import SubcategoryItem from '../ItemTypes/SubcategoryItem.vue';
+import LabelItem from '../ItemTypes/LabelItem.vue';
+import ActionItem from '../ItemTypes/ActionItem.vue';
+import ViewItem from '../ItemTypes/ViewItem.vue';
+import CategorizedItemsRenderer from './CategorizedItemsRenderer.vue';
+
+export interface Props {
+	elements: INodeCreateElement[];
+	activeIndex?: number;
+	disabled?: boolean;
+	lazyRender?: boolean;
+}
+
+const LAZY_LOAD_THRESHOLD = 20;
+const LAZY_LOAD_ITEMS_PER_TICK = 5;
+const props = withDefaults(defineProps<Props>(), {
+	elements: () => [],
+	lazyRender: true,
+});
+
+const emit = defineEmits<{
+	(event: 'selected', element: INodeCreateElement, $e?: Event): void;
+	(event: 'dragstart', element: INodeCreateElement, $e: Event): void;
+	(event: 'dragend', element: INodeCreateElement, $e: Event): void;
+}>();
+
+const renderedItems = ref<INodeCreateElement[]>([]);
+const renderAnimationRequest = ref<number>(0);
+
+const activeItemId = computed(() => useKeyboardNavigation()?.activeItemId);
+
+// Lazy render large items lists to prevent the browser from freezing
+// when loading many items.
+function renderItems() {
+	if (props.elements.length <= LAZY_LOAD_THRESHOLD || !props.lazyRender) {
+		renderedItems.value = props.elements;
+		return;
+	}
+
+	if (renderedItems.value.length < props.elements.length) {
+		renderedItems.value.push(
+			...props.elements.slice(
+				renderedItems.value.length,
+				renderedItems.value.length + LAZY_LOAD_ITEMS_PER_TICK,
+			),
+		);
+		renderAnimationRequest.value = window.requestAnimationFrame(renderItems);
+	}
+}
+
+function wrappedEmit(
+	event: 'selected' | 'dragstart' | 'dragend',
+	element: INodeCreateElement,
+	$e?: Event,
+) {
+	if (props.disabled) return;
+
+	emit(event, element, $e);
+}
+
+function beforeEnter(el: HTMLElement) {
+	el.style.height = '0';
+}
+
+function enter(el: HTMLElement) {
+	el.style.height = `${el.scrollHeight}px`;
+}
+
+function beforeLeave(el: HTMLElement) {
+	el.style.height = `${el.scrollHeight}px`;
+}
+
+function leave(el: HTMLElement) {
+	el.style.height = '0';
+}
+
+onMounted(() => {
+	renderItems();
+});
+
+onUnmounted(() => {
+	window.cancelAnimationFrame(renderAnimationRequest.value);
+	renderedItems.value = [];
+});
+
+// Make sure the active item is always visible
+// scroll if needed
+watch(
+	() => props.elements,
+	() => {
+		window.cancelAnimationFrame(renderAnimationRequest.value);
+		renderedItems.value = [];
+		renderItems();
+	},
+);
+</script>
+
+<template>
+	<div
+		v-if="elements.length > 0"
+		:class="$style.itemsRenderer"
+		name="accordion"
+		@before-enter="beforeEnter"
+		@enter="enter"
+		@before-leave="beforeLeave"
+		@leave="leave"
+	>
+		<slot />
+		<div v-for="item in elements" :key="item.uuid">
+			<div v-if="renderedItems.includes(item)">
+				<CategorizedItemsRenderer
+					v-if="item.type === 'section'"
+					:elements="item.children"
+					expanded
+					:category="item.title"
+					@selected="(child) => wrappedEmit('selected', child)"
+				>
+				</CategorizedItemsRenderer>
+
+				<div
+					v-else
+					ref="iteratorItems"
+					:class="{
+						clickable: !disabled,
+						[$style.active]: activeItemId === item.uuid,
+						[$style.iteratorItem]: true,
+						[$style[item.type]]: true,
+					}"
+					data-test-id="item-iterator-item"
+					:data-keyboard-nav-type="item.type !== 'label' ? item.type : undefined"
+					:data-keyboard-nav-id="item.uuid"
+					@click="wrappedEmit('selected', item)"
+				>
+					<LabelItem v-if="item.type === 'label'" :item="item" />
+					<SubcategoryItem v-if="item.type === 'subcategory'" :item="item.properties" />
+
+					<NodeItem
+						v-if="item.type === 'node'"
+						:node-type="item.properties"
+						:active="true"
+						:subcategory="item.subcategory"
+					/>
+
+					<ActionItem
+						v-if="item.type === 'action'"
+						:node-type="item.properties"
+						:action="item.properties"
+						:active="true"
+					/>
+
+					<ViewItem
+						v-else-if="item.type === 'view'"
+						:view="item.properties"
+						:class="$style.viewItem"
+					/>
+				</div>
+			</div>
+			<n8n-loading v-else :loading="true" :rows="1" variant="p" :class="$style.itemSkeleton" />
+		</div>
+	</div>
+	<div v-else :class="$style.empty">
+		<slot name="empty" />
+	</div>
+</template>
+
+<style lang="scss" module>
+.itemSkeleton {
+	height: 50px;
+}
+.iteratorItem {
+	// Make sure border is fully visible
+	margin-left: 1px;
+	position: relative;
+	&::before {
+		content: '';
+		position: absolute;
+		left: -1px;
+		top: 0;
+		bottom: 0;
+		border-left: 2px solid transparent;
+	}
+	&:not(.label):not(.category):hover::before {
+		border-color: $node-creator-item-hover-border-color;
+	}
+
+	&.active:not(.category)::before {
+		border-color: $color-primary;
+	}
+}
+.empty {
+	:global([role='alert']) {
+		margin: var(--spacing-xs) var(--spacing-s);
+	}
+}
+.itemsRenderer {
+	display: flex;
+	flex-direction: column;
+
+	scrollbar-width: none; /* Firefox 64 */
+	& > *::-webkit-scrollbar {
+		display: none;
+	}
+}
+.view {
+	position: relative;
+
+	&:last-child {
+		margin-top: var(--spacing-s);
+		padding-top: var(--spacing-xs);
+		&:after {
+			content: '';
+			position: absolute;
+			left: var(--spacing-s);
+			right: var(--spacing-s);
+			top: 0;
+			margin: auto;
+			bottom: 0;
+			border-top: 1px solid var(--color-foreground-base);
+		}
+	}
+}
+</style>
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/SubcategoryItem.vue b/packages/editor-ui/src/components/Node/NodeCreator/SubcategoryItem.vue
deleted file mode 100644
index cd1dc00f58c8d..0000000000000
--- a/packages/editor-ui/src/components/Node/NodeCreator/SubcategoryItem.vue
+++ /dev/null
@@ -1,38 +0,0 @@
-<template>
-	<n8n-node-creator-node
-		:class="$style.subCategory"
-		:title="$locale.baseText(`nodeCreator.subcategoryNames.${subcategoryName}`)"
-		:isTrigger="false"
-		:description="$locale.baseText(`nodeCreator.subcategoryDescriptions.${subcategoryName}`)"
-		:showActionArrow="true"
-	>
-		<template #icon>
-			<n8n-node-icon type="icon" :name="item.icon" :circle="false" :showTooltip="false" />
-		</template>
-	</n8n-node-creator-node>
-</template>
-
-<script setup lang="ts">
-import type { ISubcategoryItemProps } from '@/Interface';
-import { camelCase } from 'lodash-es';
-import { computed } from 'vue';
-export interface Props {
-	item: ISubcategoryItemProps;
-}
-
-const props = defineProps<Props>();
-const subcategoryName = computed(() => camelCase(props.item.subcategory));
-</script>
-
-<style lang="scss" module>
-.subCategory {
-	--action-arrow-color: var(--color-text-light);
-	margin-left: 15px;
-	margin-right: 12px;
-}
-.withTopBorder {
-	border-top: 1px solid var(--color-foreground-base);
-	margin-top: var(--spacing-m);
-	padding-top: var(--spacing-l);
-}
-</style>
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/ViewItem.vue b/packages/editor-ui/src/components/Node/NodeCreator/ViewItem.vue
deleted file mode 100644
index 66b24bc14eb24..0000000000000
--- a/packages/editor-ui/src/components/Node/NodeCreator/ViewItem.vue
+++ /dev/null
@@ -1,45 +0,0 @@
-<template>
-	<n8n-node-creator-node
-		:class="{
-			[$style.view]: true,
-			[$style.withTopBorder]: view.withTopBorder,
-		}"
-		:title="view.title"
-		:isTrigger="false"
-		:description="view.description"
-		:showActionArrow="true"
-	>
-		<template #icon>
-			<n8n-node-icon
-				type="icon"
-				:name="view.icon"
-				:circle="false"
-				:showTooltip="false"
-			></n8n-node-icon>
-		</template>
-	</n8n-node-creator-node>
-</template>
-
-<script setup lang="ts">
-import type { ViewItemProps } from '@/Interface';
-
-export interface Props {
-	view: ViewItemProps;
-}
-
-defineProps<Props>();
-</script>
-
-<style lang="scss" module>
-.view {
-	--action-arrow-color: var(--color-text-light);
-	margin-left: 15px;
-	margin-right: 12px;
-	padding: 11px 4px 11px 0;
-}
-.withTopBorder {
-	border-top: 1px solid var(--color-foreground-base);
-	margin-top: var(--spacing-xs);
-	padding-top: var(--spacing-l);
-}
-</style>
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/__tests__/CategoryItem.test.ts b/packages/editor-ui/src/components/Node/NodeCreator/__tests__/CategoryItem.test.ts
new file mode 100644
index 0000000000000..fa290aa550a0c
--- /dev/null
+++ b/packages/editor-ui/src/components/Node/NodeCreator/__tests__/CategoryItem.test.ts
@@ -0,0 +1,34 @@
+import { screen } from '@testing-library/vue';
+import CategoryItem from '../ItemTypes/CategoryItem.vue';
+import { createComponentRenderer } from '@/__tests__/render';
+
+const renderComponent = createComponentRenderer(CategoryItem);
+
+describe('CategoryItem', () => {
+	it('should allow expand and collapse', async () => {
+		const { container, rerender } = renderComponent({ props: { name: 'Category Test' } });
+
+		expect(container.querySelector('[data-icon="chevron-down"]')).toBeInTheDocument();
+		await rerender({ expanded: false });
+		expect(container.querySelector('[data-icon="chevron-down"]')).not.toBeInTheDocument();
+		expect(container.querySelector('[data-icon="chevron-up"]')).toBeInTheDocument();
+	});
+
+	it('should show count', async () => {
+		const { rerender } = renderComponent({ props: { name: 'Category Test', count: 10 } });
+
+		expect(screen.getByText('Category Test (10)')).toBeInTheDocument();
+		await rerender({ count: 0 });
+		expect(screen.getByText('Category Test')).toBeInTheDocument();
+	});
+
+	it('should show trigger icon', async () => {
+		const { rerender, container } = renderComponent({
+			props: { name: 'Category Test', isTrigger: true },
+		});
+
+		expect(container.querySelector('[data-icon="bolt"]')).toBeInTheDocument();
+		await rerender({ isTrigger: false });
+		expect(container.querySelector('[data-icon="bolt"]')).not.toBeInTheDocument();
+	});
+});
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/__tests__/ItemsRenderer.test.ts b/packages/editor-ui/src/components/Node/NodeCreator/__tests__/ItemsRenderer.test.ts
new file mode 100644
index 0000000000000..e799015503a87
--- /dev/null
+++ b/packages/editor-ui/src/components/Node/NodeCreator/__tests__/ItemsRenderer.test.ts
@@ -0,0 +1,95 @@
+import { nextTick } from 'vue';
+import { createTestingPinia } from '@pinia/testing';
+import { fireEvent } from '@testing-library/vue';
+import {
+	mockSubcategoryCreateElement,
+	mockLabelCreateElement,
+	mockNodeCreateElement,
+	mockActionCreateElement,
+	mockViewCreateElement,
+	mockSectionCreateElement,
+} from './utils';
+import ItemsRenderer from '../Renderers/ItemsRenderer.vue';
+import { createComponentRenderer } from '@/__tests__/render';
+
+const renderComponent = createComponentRenderer(ItemsRenderer);
+
+describe('ItemsRenderer', () => {
+	it('should render items', async () => {
+		const items = [
+			mockSubcategoryCreateElement({ title: 'Subcategory 1' }),
+			mockLabelCreateElement('subcategory', { key: 'label1' }),
+			mockNodeCreateElement(
+				{ subcategory: 'subcategory' },
+				{ displayName: 'Node 1', name: 'node1' },
+			),
+			mockNodeCreateElement(
+				{ subcategory: 'subcategory' },
+				{ displayName: 'Node 2', name: 'node2' },
+			),
+			mockNodeCreateElement(
+				{ subcategory: 'subcategory' },
+				{ displayName: 'Node 3', name: 'node3' },
+			),
+			mockLabelCreateElement('subcategory', { key: 'label2' }),
+			mockNodeCreateElement(
+				{ subcategory: 'subcategory' },
+				{ displayName: 'Node 2', name: 'node2' },
+			),
+			mockNodeCreateElement(
+				{ subcategory: 'subcategory' },
+				{ displayName: 'Node 3', name: 'node3' },
+			),
+			mockSubcategoryCreateElement({ title: 'Subcategory 2' }),
+			mockSectionCreateElement(),
+		];
+
+		const { container } = renderComponent({
+			pinia: createTestingPinia(),
+			props: { elements: items },
+			global: {
+				stubs: ['n8n-loading'],
+			},
+		});
+
+		await nextTick();
+
+		const nodeItems = container.querySelectorAll('.iteratorItem .nodeItem');
+		const labels = container.querySelectorAll('.iteratorItem .label');
+		const subCategories = container.querySelectorAll('.iteratorItem .subCategory');
+		const sections = container.querySelectorAll('.categoryItem');
+
+		expect(sections.length).toBe(1);
+		expect(nodeItems.length).toBe(7); // 5 nodes in subcategories | 2 nodes in a section
+		expect(labels.length).toBe(2);
+		expect(subCategories.length).toBe(2);
+	});
+
+	it('should fire selected events on click', async () => {
+		const items = [
+			mockSubcategoryCreateElement(),
+			mockNodeCreateElement(),
+			mockActionCreateElement(),
+			mockViewCreateElement(),
+		];
+		const { container, emitted } = renderComponent({
+			pinia: createTestingPinia(),
+			props: { elements: items },
+		});
+		//
+		await nextTick();
+
+		const itemTypes = {
+			node: container.querySelector('.iteratorItem .nodeItem'),
+			subcategory: container.querySelector('.iteratorItem .subCategory'),
+			action: container.querySelector('.iteratorItem .action'),
+			view: container.querySelector('.iteratorItem .view'),
+		};
+
+		for (const [index, itemType] of Object.keys(itemTypes).entries()) {
+			const itemElement = itemTypes[itemType as keyof typeof itemTypes];
+			await fireEvent.click(itemElement!);
+			expect(emitted().selected[index][0].type).toBe(itemType);
+		}
+	});
+});
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/__tests__/NodesListPanel.test.ts b/packages/editor-ui/src/components/Node/NodeCreator/__tests__/NodesListPanel.test.ts
new file mode 100644
index 0000000000000..3c36faa611409
--- /dev/null
+++ b/packages/editor-ui/src/components/Node/NodeCreator/__tests__/NodesListPanel.test.ts
@@ -0,0 +1,251 @@
+import { defineComponent, nextTick, watch } from 'vue';
+import type { PropType } from 'vue';
+import { createPinia } from 'pinia';
+import { screen, fireEvent } from '@testing-library/vue';
+import type { INodeTypeDescription } from 'n8n-workflow';
+import { useNodeCreatorStore } from '@/stores/nodeCreator.store';
+import { mockSimplifiedNodeType } from './utils';
+import NodesListPanel from '../Panel/NodesListPanel.vue';
+import { REGULAR_NODE_CREATOR_VIEW } from '@/constants';
+import type { NodeFilterType } from '@/Interface';
+import { createComponentRenderer } from '@/__tests__/render';
+
+function getWrapperComponent(setup: () => void) {
+	const wrapperComponent = defineComponent({
+		components: {
+			NodesListPanel,
+		},
+		props: {
+			nodeTypes: {
+				type: Array as PropType<INodeTypeDescription[]>,
+				required: false,
+			},
+		},
+		setup,
+		template: '<NodesListPanel @nodeTypeSelected="e => $emit(\'nodeTypeSelected\', e)" />',
+	});
+
+	return createComponentRenderer(wrapperComponent, {
+		global: {
+			plugins: [createPinia()],
+		},
+	})();
+}
+
+describe('NodesListPanel', () => {
+	describe('should render nodes', () => {
+		it('should render trigger items', async () => {
+			const mockedTriggerNodes = [...Array(2).keys()].map((n) =>
+				mockSimplifiedNodeType({
+					name: `Trigger Node ${n}`,
+					displayName: `Trigger Node ${n}`,
+					group: ['trigger'],
+				}),
+			);
+			const mockedRegularNodes = [...Array(2).keys()].map((n) =>
+				mockSimplifiedNodeType({
+					name: `Regular Node ${n}`,
+					displayName: `Regular Node ${n}`,
+					group: ['input'],
+				}),
+			);
+
+			const { container } = getWrapperComponent(() => {
+				const { setMergeNodes } = useNodeCreatorStore();
+
+				setMergeNodes([...mockedTriggerNodes, ...mockedRegularNodes]);
+				return {};
+			});
+
+			await nextTick();
+			expect(screen.getByText('What triggers this workflow?')).toBeInTheDocument();
+			expect(screen.queryByTestId('node-creator-search-bar')).toBeInTheDocument();
+			screen.getByText('On app event').click();
+			await nextTick();
+			expect(screen.queryByTestId('node-creator-search-bar')).not.toBeInTheDocument();
+			mockedTriggerNodes.forEach((n) => {
+				expect(screen.queryByText(n.name)).toBeInTheDocument();
+			});
+
+			mockedRegularNodes.forEach((n) => {
+				expect(screen.queryByText(n.name)).not.toBeInTheDocument();
+			});
+
+			expect(container.querySelector('.backButton')).toBeInTheDocument();
+
+			await fireEvent.click(container.querySelector('.backButton')!);
+			await nextTick();
+
+			expect(screen.queryAllByTestId('item-iterator-item')).toHaveLength(7);
+		});
+
+		it('should render regular nodes', async () => {
+			const mockedNodes = [...Array(8).keys()].map((n) =>
+				mockSimplifiedNodeType({
+					name: `Node ${n}`,
+					displayName: `Node ${n}`,
+					group: ['input'],
+				}),
+			);
+
+			const wrapperComponent = defineComponent({
+				components: {
+					NodesListPanel,
+				},
+				props: {
+					nodeTypes: {
+						type: Array as PropType<INodeTypeDescription[]>,
+						required: true,
+					},
+					selectedView: {
+						type: String as PropType<NodeFilterType>,
+						default: REGULAR_NODE_CREATOR_VIEW,
+						required: false,
+					},
+				},
+				setup(props) {
+					const { setActions, setMergeNodes, setSelectedView } = useNodeCreatorStore();
+
+					watch(
+						() => props.nodeTypes,
+						(nodeTypes: INodeTypeDescription[]) => {
+							setMergeNodes([...nodeTypes]);
+						},
+						{ immediate: true },
+					);
+					watch(
+						() => props.selectedView,
+						(selectedView: NodeFilterType) => {
+							setSelectedView(selectedView);
+						},
+						{ immediate: true },
+					);
+				},
+				template: '<NodesListPanel @nodeTypeSelected="e => $emit(\'nodeTypeSelected\', e)" />',
+			});
+
+			const renderComponent = createComponentRenderer(wrapperComponent);
+
+			renderComponent({
+				pinia: createPinia(),
+				props: {
+					nodeTypes: mockedNodes,
+					selectedView: REGULAR_NODE_CREATOR_VIEW,
+				},
+			});
+
+			await nextTick();
+			expect(screen.getByText('What happens next?')).toBeInTheDocument();
+			expect(screen.queryAllByTestId('item-iterator-item')).toHaveLength(6);
+
+			screen.getByText('Action in an app').click();
+			await nextTick();
+			mockedNodes.forEach((n) => {
+				expect(screen.queryByText(n.displayName)).toBeInTheDocument();
+			});
+		});
+	});
+
+	describe('should search nodes', () => {
+		const mockedNodes = [...Array(8).keys()].map((n) =>
+			mockSimplifiedNodeType({
+				name: `Node ${n}`,
+				displayName: `Node ${n}`,
+				group: ['trigger'],
+			}),
+		);
+
+		const wrapperComponent = defineComponent({
+			components: {
+				NodesListPanel,
+			},
+			props: {
+				nodeTypes: {
+					type: Array as PropType<INodeTypeDescription[]>,
+					required: true,
+				},
+			},
+			setup(props) {
+				const { setMergeNodes } = useNodeCreatorStore();
+
+				watch(
+					() => props.nodeTypes,
+					(nodeTypes: INodeTypeDescription[]) => {
+						setMergeNodes([...nodeTypes]);
+					},
+					{ immediate: true },
+				);
+			},
+			template: '<NodesListPanel @nodeTypeSelected="e => $emit(\'nodeTypeSelected\', e)" />',
+		});
+
+		const renderComponent = createComponentRenderer(wrapperComponent, {
+			pinia: createPinia(),
+			props: {
+				nodeTypes: mockedNodes,
+			},
+		});
+
+		it('should be visible in the root view', async () => {
+			renderComponent();
+			await nextTick();
+
+			expect(screen.queryByTestId('node-creator-search-bar')).toBeInTheDocument();
+		});
+		it('should not be visible if subcategory contains less than 9 items', async () => {
+			renderComponent();
+			await nextTick();
+
+			screen.getByText('On app event').click();
+			await nextTick();
+			expect(screen.queryByTestId('node-creator-search-bar')).not.toBeInTheDocument();
+			expect(screen.queryAllByTestId('item-iterator-item')).toHaveLength(8);
+		});
+		it('should be visible if subcategory contains 9 or more items', async () => {
+			const { rerender } = renderComponent();
+			await nextTick();
+
+			mockedNodes.push(
+				mockSimplifiedNodeType({
+					name: 'Ninth node',
+					displayName: 'Ninth node',
+					group: ['trigger'],
+				}),
+			);
+
+			await rerender({ nodeTypes: [...mockedNodes] });
+			await nextTick();
+
+			screen.getByText('On app event').click();
+			await nextTick();
+
+			expect(screen.queryAllByTestId('item-iterator-item')).toHaveLength(9);
+			expect(screen.queryByTestId('node-creator-search-bar')).toBeInTheDocument();
+		});
+
+		it('should correctly handle search', async () => {
+			const { container } = renderComponent();
+			await nextTick();
+
+			screen.getByText('On app event').click();
+			await nextTick();
+
+			await fireEvent.input(screen.getByTestId('node-creator-search-bar'), {
+				target: { value: 'Ninth' },
+			});
+			await nextTick();
+			expect(screen.queryAllByTestId('item-iterator-item')).toHaveLength(1);
+
+			await fireEvent.input(screen.getByTestId('node-creator-search-bar'), {
+				target: { value: 'Non sense' },
+			});
+			await nextTick();
+			expect(screen.queryAllByTestId('item-iterator-item')).toHaveLength(0);
+			expect(screen.queryByText("We didn't make that... yet")).toBeInTheDocument();
+
+			await fireEvent.click(container.querySelector('.clear')!);
+			await nextTick();
+			expect(screen.queryAllByTestId('item-iterator-item')).toHaveLength(9);
+		});
+	});
+});
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/__tests__/useActions.test.ts b/packages/editor-ui/src/components/Node/NodeCreator/__tests__/useActions.test.ts
new file mode 100644
index 0000000000000..14a03254e164d
--- /dev/null
+++ b/packages/editor-ui/src/components/Node/NodeCreator/__tests__/useActions.test.ts
@@ -0,0 +1,176 @@
+import { setActivePinia } from 'pinia';
+import { createTestingPinia } from '@pinia/testing';
+import { useNodeCreatorStore } from '@/stores/nodeCreator.store';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useActions } from '../composables/useActions';
+import {
+	HTTP_REQUEST_NODE_TYPE,
+	MANUAL_TRIGGER_NODE_TYPE,
+	NODE_CREATOR_OPEN_SOURCES,
+	NO_OP_NODE_TYPE,
+	SCHEDULE_TRIGGER_NODE_TYPE,
+	SLACK_NODE_TYPE,
+	SPLIT_IN_BATCHES_NODE_TYPE,
+	TRIGGER_NODE_CREATOR_VIEW,
+	WEBHOOK_NODE_TYPE,
+} from '@/constants';
+
+describe('useActions', () => {
+	beforeAll(() => {
+		setActivePinia(createTestingPinia());
+	});
+
+	afterEach(() => {
+		vi.clearAllMocks();
+	});
+
+	describe('getAddedNodesAndConnections', () => {
+		test('should insert a manual trigger node when there are no triggers', () => {
+			const workflowsStore = useWorkflowsStore();
+			const nodeCreatorStore = useNodeCreatorStore();
+
+			vi.spyOn(workflowsStore, 'workflowTriggerNodes', 'get').mockReturnValue([]);
+			vi.spyOn(nodeCreatorStore, 'openSource', 'get').mockReturnValue(
+				NODE_CREATOR_OPEN_SOURCES.ADD_NODE_BUTTON,
+			);
+			vi.spyOn(nodeCreatorStore, 'selectedView', 'get').mockReturnValue(TRIGGER_NODE_CREATOR_VIEW);
+
+			const { getAddedNodesAndConnections } = useActions();
+
+			expect(getAddedNodesAndConnections([{ type: HTTP_REQUEST_NODE_TYPE }])).toEqual({
+				connections: [{ from: { nodeIndex: 0 }, to: { nodeIndex: 1 } }],
+				nodes: [
+					{ type: MANUAL_TRIGGER_NODE_TYPE, isAutoAdd: true },
+					{ type: HTTP_REQUEST_NODE_TYPE, openDetail: true },
+				],
+			});
+		});
+
+		test('should not insert a manual trigger node when there is a trigger in the workflow', () => {
+			const workflowsStore = useWorkflowsStore();
+			const nodeCreatorStore = useNodeCreatorStore();
+
+			vi.spyOn(workflowsStore, 'workflowTriggerNodes', 'get').mockReturnValue([
+				{ type: SCHEDULE_TRIGGER_NODE_TYPE } as never,
+			]);
+			vi.spyOn(nodeCreatorStore, 'openSource', 'get').mockReturnValue(
+				NODE_CREATOR_OPEN_SOURCES.ADD_NODE_BUTTON,
+			);
+			vi.spyOn(nodeCreatorStore, 'selectedView', 'get').mockReturnValue(TRIGGER_NODE_CREATOR_VIEW);
+
+			const { getAddedNodesAndConnections } = useActions();
+
+			expect(getAddedNodesAndConnections([{ type: HTTP_REQUEST_NODE_TYPE }])).toEqual({
+				connections: [],
+				nodes: [{ type: HTTP_REQUEST_NODE_TYPE, openDetail: true }],
+			});
+		});
+
+		test('should insert a No Op node when a Loop Over Items Node is added', () => {
+			const workflowsStore = useWorkflowsStore();
+			const nodeCreatorStore = useNodeCreatorStore();
+
+			vi.spyOn(workflowsStore, 'workflowTriggerNodes', 'get').mockReturnValue([]);
+			vi.spyOn(nodeCreatorStore, 'openSource', 'get').mockReturnValue(
+				NODE_CREATOR_OPEN_SOURCES.ADD_NODE_BUTTON,
+			);
+			vi.spyOn(nodeCreatorStore, 'selectedView', 'get').mockReturnValue(TRIGGER_NODE_CREATOR_VIEW);
+
+			const { getAddedNodesAndConnections } = useActions();
+
+			expect(getAddedNodesAndConnections([{ type: SPLIT_IN_BATCHES_NODE_TYPE }])).toEqual({
+				connections: [
+					{ from: { nodeIndex: 0 }, to: { nodeIndex: 1 } },
+					{ from: { nodeIndex: 1, outputIndex: 1 }, to: { nodeIndex: 2 } },
+					{ from: { nodeIndex: 2 }, to: { nodeIndex: 1 } },
+				],
+				nodes: [
+					{ isAutoAdd: true, type: MANUAL_TRIGGER_NODE_TYPE },
+					{ openDetail: true, type: SPLIT_IN_BATCHES_NODE_TYPE },
+					{ isAutoAdd: true, name: 'Replace Me', type: NO_OP_NODE_TYPE },
+				],
+			});
+		});
+
+		test('should connect node to schedule trigger when adding them together', () => {
+			const workflowsStore = useWorkflowsStore();
+			const nodeCreatorStore = useNodeCreatorStore();
+			const nodeTypesStore = useNodeTypesStore();
+
+			vi.spyOn(workflowsStore, 'workflowTriggerNodes', 'get').mockReturnValue([
+				{ type: SCHEDULE_TRIGGER_NODE_TYPE } as never,
+			]);
+			vi.spyOn(nodeCreatorStore, 'openSource', 'get').mockReturnValue(
+				NODE_CREATOR_OPEN_SOURCES.ADD_NODE_BUTTON,
+			);
+			vi.spyOn(nodeCreatorStore, 'selectedView', 'get').mockReturnValue(TRIGGER_NODE_CREATOR_VIEW);
+			nodeTypesStore.nodeTypes = {
+				[SCHEDULE_TRIGGER_NODE_TYPE]: {
+					1: {
+						name: SCHEDULE_TRIGGER_NODE_TYPE,
+						displayName: 'Schedule Trigger',
+						group: ['trigger'],
+						version: 1,
+						defaults: {},
+						inputs: [],
+						outputs: [],
+						properties: [],
+						description: '',
+					},
+				},
+			};
+			const { getAddedNodesAndConnections } = useActions();
+
+			expect(
+				getAddedNodesAndConnections([
+					{ type: SCHEDULE_TRIGGER_NODE_TYPE, openDetail: true },
+					{ type: SLACK_NODE_TYPE },
+				]),
+			).toEqual({
+				connections: [{ from: { nodeIndex: 0 }, to: { nodeIndex: 1 } }],
+				nodes: [{ type: SCHEDULE_TRIGGER_NODE_TYPE, openDetail: true }, { type: SLACK_NODE_TYPE }],
+			});
+		});
+
+		test('should connect node to webhook trigger when adding them together', () => {
+			const workflowsStore = useWorkflowsStore();
+			const nodeCreatorStore = useNodeCreatorStore();
+			const nodeTypesStore = useNodeTypesStore();
+
+			vi.spyOn(workflowsStore, 'workflowTriggerNodes', 'get').mockReturnValue([
+				{ type: SCHEDULE_TRIGGER_NODE_TYPE } as never,
+			]);
+			vi.spyOn(nodeCreatorStore, 'openSource', 'get').mockReturnValue(
+				NODE_CREATOR_OPEN_SOURCES.ADD_NODE_BUTTON,
+			);
+			vi.spyOn(nodeCreatorStore, 'selectedView', 'get').mockReturnValue(TRIGGER_NODE_CREATOR_VIEW);
+			nodeTypesStore.nodeTypes = {
+				[WEBHOOK_NODE_TYPE]: {
+					1: {
+						name: WEBHOOK_NODE_TYPE,
+						displayName: 'Webhook',
+						group: ['trigger'],
+						version: 1,
+						defaults: {},
+						inputs: [],
+						outputs: [],
+						properties: [],
+						description: '',
+					},
+				},
+			};
+			const { getAddedNodesAndConnections } = useActions();
+
+			expect(
+				getAddedNodesAndConnections([
+					{ type: WEBHOOK_NODE_TYPE, openDetail: true },
+					{ type: SLACK_NODE_TYPE },
+				]),
+			).toEqual({
+				connections: [{ from: { nodeIndex: 0 }, to: { nodeIndex: 1 } }],
+				nodes: [{ type: WEBHOOK_NODE_TYPE, openDetail: true }, { type: SLACK_NODE_TYPE }],
+			});
+		});
+	});
+});
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/__tests__/useActionsGeneration.test.ts b/packages/editor-ui/src/components/Node/NodeCreator/__tests__/useActionsGeneration.test.ts
new file mode 100644
index 0000000000000..f74f70a47fa80
--- /dev/null
+++ b/packages/editor-ui/src/components/Node/NodeCreator/__tests__/useActionsGeneration.test.ts
@@ -0,0 +1,390 @@
+import type { INodeProperties, INodeTypeDescription } from 'n8n-workflow';
+import { useActionsGenerator } from '../composables/useActionsGeneration';
+
+describe('useActionsGenerator', () => {
+	const { generateMergedNodesAndActions } = useActionsGenerator();
+	const NODE_NAME = 'n8n-nodes-base.test';
+	const baseV2NodeWoProps: INodeTypeDescription = {
+		name: NODE_NAME,
+		displayName: 'Test',
+		description: 'Test Node',
+		defaultVersion: 2,
+		version: 2,
+		group: ['output'],
+		defaults: {
+			name: 'Test',
+		},
+		inputs: ['main'],
+		outputs: ['main'],
+		properties: [],
+	};
+
+	describe('App actions for resource category', () => {
+		const resourcePropertyWithUser: INodeProperties = {
+			displayName: 'Resource',
+			name: 'resource',
+			type: 'options',
+			noDataExpression: true,
+			options: [
+				{
+					name: 'User',
+					value: 'user',
+				},
+			],
+			default: 'user',
+		};
+		const resourcePropertyWithUserAndPage: INodeProperties = {
+			displayName: 'Resource',
+			name: 'resource',
+			type: 'options',
+			noDataExpression: true,
+			options: [
+				{
+					name: 'User',
+					value: 'user',
+				},
+				{
+					name: 'Page',
+					value: 'page',
+				},
+			],
+			default: 'user',
+		};
+
+		it('returns single action for single resource & single operation without resource filter', () => {
+			const node: INodeTypeDescription = {
+				...baseV2NodeWoProps,
+				properties: [
+					resourcePropertyWithUser,
+					{
+						displayName: 'Operation',
+						name: 'operation',
+						type: 'options',
+						noDataExpression: true,
+						displayOptions: {},
+						options: [
+							{
+								name: 'Get',
+								value: 'get',
+								description: 'Get description',
+							},
+						],
+						default: 'get',
+					},
+				],
+			};
+
+			const { actions } = generateMergedNodesAndActions([node]);
+			expect(actions).toEqual({
+				[NODE_NAME]: [
+					expect.objectContaining({
+						actionKey: 'get',
+						description: 'Get description',
+						displayName: 'User Get',
+						codex: {
+							label: 'User Actions',
+							categories: ['Actions'],
+						},
+					}),
+				],
+			});
+		});
+
+		it('returns single action for single resource & single operation with matching resource filter', () => {
+			const node: INodeTypeDescription = {
+				...baseV2NodeWoProps,
+				properties: [
+					resourcePropertyWithUser,
+					{
+						displayName: 'Operation',
+						name: 'operation',
+						type: 'options',
+						noDataExpression: true,
+						displayOptions: {
+							show: {
+								resource: ['user'],
+							},
+						},
+						options: [
+							{
+								name: 'Get',
+								value: 'get',
+								description: 'Get description',
+							},
+						],
+						default: 'get',
+					},
+				],
+			};
+
+			const { actions } = generateMergedNodesAndActions([node]);
+			expect(actions).toEqual({
+				[NODE_NAME]: [
+					expect.objectContaining({
+						actionKey: 'get',
+						description: 'Get description',
+						displayName: 'User Get',
+						codex: {
+							label: 'User Actions',
+							categories: ['Actions'],
+						},
+					}),
+				],
+			});
+		});
+
+		it('returns nothing for multiple resources & single operation without resource filter', () => {
+			const node: INodeTypeDescription = {
+				...baseV2NodeWoProps,
+				properties: [
+					resourcePropertyWithUserAndPage,
+					{
+						displayName: 'Operation',
+						name: 'operation',
+						type: 'options',
+						noDataExpression: true,
+						displayOptions: {},
+						options: [
+							{
+								name: 'Get',
+								value: 'get',
+								description: 'Get description',
+							},
+						],
+						default: 'get',
+					},
+				],
+			};
+
+			const { actions } = generateMergedNodesAndActions([node]);
+			expect(actions).toEqual({
+				[NODE_NAME]: [],
+			});
+		});
+
+		it('returns single action for multiple resources & single operation with resource filter', () => {
+			const node: INodeTypeDescription = {
+				...baseV2NodeWoProps,
+				properties: [
+					resourcePropertyWithUserAndPage,
+					{
+						displayName: 'Operation',
+						name: 'operation',
+						type: 'options',
+						noDataExpression: true,
+						displayOptions: {
+							show: {
+								resource: ['user'],
+							},
+						},
+						options: [
+							{
+								name: 'Get',
+								value: 'get',
+								description: 'Get description',
+							},
+						],
+						default: 'get',
+					},
+				],
+			};
+
+			const { actions } = generateMergedNodesAndActions([node]);
+			expect(actions).toEqual({
+				[NODE_NAME]: [
+					expect.objectContaining({
+						actionKey: 'get',
+						description: 'Get description',
+						displayName: 'User Get',
+						codex: {
+							label: 'User Actions',
+							categories: ['Actions'],
+						},
+					}),
+				],
+			});
+		});
+
+		it('returns multiple actions for multiple resources & multiple operations with resource filters', () => {
+			const node: INodeTypeDescription = {
+				...baseV2NodeWoProps,
+				properties: [
+					resourcePropertyWithUserAndPage,
+					{
+						displayName: 'Operation',
+						name: 'operation',
+						type: 'options',
+						noDataExpression: true,
+						displayOptions: {
+							show: {
+								resource: ['user'],
+							},
+						},
+						options: [
+							{
+								name: 'Get',
+								value: 'get',
+								description: 'Get description',
+							},
+						],
+						default: 'get',
+					},
+					{
+						displayName: 'Operation',
+						name: 'operation',
+						type: 'options',
+						noDataExpression: true,
+						displayOptions: {
+							show: {
+								resource: ['page'],
+							},
+						},
+						options: [
+							{
+								name: 'Get',
+								value: 'get',
+								description: 'Get description',
+							},
+						],
+						default: 'get',
+					},
+				],
+			};
+
+			const { actions } = generateMergedNodesAndActions([node]);
+			expect(actions).toEqual({
+				[NODE_NAME]: [
+					expect.objectContaining({
+						actionKey: 'get',
+						description: 'Get description',
+						displayName: 'User Get',
+						codex: {
+							label: 'User Actions',
+							categories: ['Actions'],
+						},
+					}),
+					expect.objectContaining({
+						actionKey: 'get',
+						description: 'Get description',
+						displayName: 'Page Get',
+						codex: {
+							label: 'Page Actions',
+							categories: ['Actions'],
+						},
+					}),
+				],
+			});
+		});
+
+		it('returns correct action for single resource & multiple operations with different versions', () => {
+			const node: INodeTypeDescription = {
+				...baseV2NodeWoProps,
+				properties: [
+					resourcePropertyWithUser,
+					{
+						displayName: 'Operation',
+						name: 'operation',
+						type: 'options',
+						noDataExpression: true,
+						displayOptions: {
+							show: {
+								// eslint-disable-next-line @typescript-eslint/naming-convention
+								'@version': [1],
+								resource: ['user'],
+							},
+						},
+						options: [
+							{
+								name: 'Get Version 1',
+								value: 'getv1',
+								description: 'Get version 1',
+							},
+						],
+						default: 'getv1',
+					},
+					{
+						displayName: 'Operation',
+						name: 'operation',
+						type: 'options',
+						noDataExpression: true,
+						displayOptions: {
+							show: {
+								// eslint-disable-next-line @typescript-eslint/naming-convention
+								'@version': [2],
+								resource: ['user'],
+							},
+						},
+						options: [
+							{
+								name: 'Get Version 2',
+								value: 'getv2',
+								description: 'Get version 2',
+							},
+						],
+						default: 'getv2',
+					},
+				],
+			};
+
+			const { actions } = generateMergedNodesAndActions([node]);
+			expect(actions).toEqual({
+				[NODE_NAME]: [
+					expect.objectContaining({
+						actionKey: 'getv2',
+						description: 'Get version 2',
+						displayName: 'User Get Version 2',
+						codex: {
+							label: 'User Actions',
+							categories: ['Actions'],
+						},
+					}),
+				],
+			});
+		});
+
+		it('returns correct action for single resource & single operation with multiple versions', () => {
+			const node: INodeTypeDescription = {
+				...baseV2NodeWoProps,
+				properties: [
+					resourcePropertyWithUser,
+					{
+						displayName: 'Operation',
+						name: 'operation',
+						type: 'options',
+						noDataExpression: true,
+						displayOptions: {
+							show: {
+								// eslint-disable-next-line @typescript-eslint/naming-convention
+								'@version': [1, 2],
+								resource: ['user'],
+							},
+						},
+						options: [
+							{
+								name: 'Get Version 2',
+								value: 'getv2',
+								description: 'Get version 2',
+							},
+						],
+						default: 'getv2',
+					},
+				],
+			};
+
+			const { actions } = generateMergedNodesAndActions([node]);
+			expect(actions).toEqual({
+				[NODE_NAME]: [
+					expect.objectContaining({
+						actionKey: 'getv2',
+						description: 'Get version 2',
+						displayName: 'User Get Version 2',
+						codex: {
+							label: 'User Actions',
+							categories: ['Actions'],
+						},
+					}),
+				],
+			});
+		});
+	});
+});
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/__tests__/useKeyboardNavigation.test.ts b/packages/editor-ui/src/components/Node/NodeCreator/__tests__/useKeyboardNavigation.test.ts
new file mode 100644
index 0000000000000..b53190db397ab
--- /dev/null
+++ b/packages/editor-ui/src/components/Node/NodeCreator/__tests__/useKeyboardNavigation.test.ts
@@ -0,0 +1,88 @@
+import userEvent from '@testing-library/user-event';
+import { defineComponent, computed } from 'vue';
+import { useKeyboardNavigation } from '../composables/useKeyboardNavigation';
+import { createComponentRenderer } from '@/__tests__/render';
+import { createPinia } from 'pinia';
+
+const eventHookSpy = vi.fn();
+describe('useKeyboardNavigation', () => {
+	const TestComponent = defineComponent({
+		setup() {
+			const { attachKeydownEvent, setActiveItemId, detachKeydownEvent, registerKeyHook } =
+				useKeyboardNavigation();
+
+			setActiveItemId('item1');
+			const activeItemId = computed(() => useKeyboardNavigation().activeItemId);
+
+			registerKeyHook('testKeys', {
+				keyboardKeys: ['ArrowDown', 'ArrowUp', 'Enter', 'ArrowRight', 'ArrowLeft', 'Escape'],
+				handler: eventHookSpy,
+			});
+
+			return { attachKeydownEvent, detachKeydownEvent, setActiveItemId, activeItemId };
+		},
+		mounted() {
+			this.attachKeydownEvent();
+		},
+		template: `
+			<span>
+				<div
+					v-for="item in 3"
+					:class="{'active': activeItemId === 'item' + item}"
+					:key="'item' + item"
+					v-text="activeItemId"
+					:data-keyboard-nav-id="'item' + item"
+					data-keyboard-nav-type="node"
+				/>
+			</span>
+		`,
+	});
+
+	const renderComponent = createComponentRenderer(TestComponent, {
+		pinia: createPinia(),
+	});
+
+	afterAll(() => {
+		eventHookSpy.mockClear();
+	});
+
+	test('ArrowDown moves to the next item, cycling after last item', async () => {
+		const { container } = renderComponent();
+
+		expect(container.querySelector('[data-keyboard-nav-id="item1"]')).toHaveClass('active');
+		await userEvent.keyboard('{arrowdown}');
+		await userEvent.keyboard('{arrowdown}');
+		expect(container.querySelector('[data-keyboard-nav-id="item3"]')).toHaveClass('active');
+		await userEvent.keyboard('{arrowdown}');
+		expect(container.querySelector('[data-keyboard-nav-id="item1"]')).toHaveClass('active');
+	});
+
+	test('ArrowUp moves to the previous item, cycling after firstitem', async () => {
+		const { container } = renderComponent();
+
+		expect(container.querySelector('[data-keyboard-nav-id="item1"]')).toHaveClass('active');
+		await userEvent.keyboard('{arrowup}');
+		expect(container.querySelector('[data-keyboard-nav-id="item3"]')).toHaveClass('active');
+		await userEvent.keyboard('{arrowup}');
+		expect(container.querySelector('[data-keyboard-nav-id="item2"]')).toHaveClass('active');
+		await userEvent.keyboard('{arrowup}');
+		expect(container.querySelector('[data-keyboard-nav-id="item1"]')).toHaveClass('active');
+	});
+
+	test('Key hooks are executed', async () => {
+		renderComponent();
+
+		await userEvent.keyboard('{arrowup}');
+		expect(eventHookSpy).toHaveBeenCalledWith('item3', 'ArrowUp');
+		await userEvent.keyboard('{arrowdown}');
+		expect(eventHookSpy).toHaveBeenCalledWith('item1', 'ArrowDown');
+		await userEvent.keyboard('{arrowleft}');
+		expect(eventHookSpy).toHaveBeenCalledWith('item1', 'ArrowLeft');
+		await userEvent.keyboard('{arrowright}');
+		expect(eventHookSpy).toHaveBeenCalledWith('item1', 'ArrowRight');
+		await userEvent.keyboard('{enter}');
+		expect(eventHookSpy).toHaveBeenCalledWith('item1', 'Enter');
+		await userEvent.keyboard('{escape}');
+		expect(eventHookSpy).toHaveBeenCalledWith('item1', 'Escape');
+	});
+});
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/__tests__/utils.test.ts b/packages/editor-ui/src/components/Node/NodeCreator/__tests__/utils.test.ts
new file mode 100644
index 0000000000000..6f7b45cc5cbf0
--- /dev/null
+++ b/packages/editor-ui/src/components/Node/NodeCreator/__tests__/utils.test.ts
@@ -0,0 +1,65 @@
+import type { SectionCreateElement } from '@/Interface';
+import { groupItemsInSections, sortNodeCreateElements } from '../utils';
+import { mockActionCreateElement, mockNodeCreateElement, mockSectionCreateElement } from './utils';
+
+describe('NodeCreator - utils', () => {
+	describe('groupItemsInSections', () => {
+		it('should handle multiple sections (with "other" section)', () => {
+			const node1 = mockNodeCreateElement({ key: 'popularNode' });
+			const node2 = mockNodeCreateElement({ key: 'newNode' });
+			const node3 = mockNodeCreateElement({ key: 'otherNode' });
+			const result = groupItemsInSections(
+				[node1, node2, node3],
+				[
+					{ key: 'popular', title: 'Popular', items: [node1.key] },
+					{ key: 'new', title: 'New', items: [node2.key] },
+				],
+			) as SectionCreateElement[];
+			expect(result.length).toEqual(3);
+			expect(result[0].title).toEqual('Popular');
+			expect(result[0].children).toEqual([node1]);
+			expect(result[1].title).toEqual('New');
+			expect(result[1].children).toEqual([node2]);
+			expect(result[2].title).toEqual('Other');
+			expect(result[2].children).toEqual([node3]);
+		});
+
+		it('should handle no sections', () => {
+			const node1 = mockNodeCreateElement({ key: 'popularNode' });
+			const node2 = mockNodeCreateElement({ key: 'newNode' });
+			const node3 = mockNodeCreateElement({ key: 'otherNode' });
+			const result = groupItemsInSections([node1, node2, node3], []);
+			expect(result).toEqual([node1, node2, node3]);
+		});
+
+		it('should handle only empty sections', () => {
+			const node1 = mockNodeCreateElement({ key: 'popularNode' });
+			const node2 = mockNodeCreateElement({ key: 'newNode' });
+			const node3 = mockNodeCreateElement({ key: 'otherNode' });
+			const result = groupItemsInSections(
+				[node1, node2, node3],
+				[
+					{ key: 'popular', title: 'Popular', items: [] },
+					{ key: 'new', title: 'New', items: ['someOtherNodeType'] },
+				],
+			);
+			expect(result).toEqual([node1, node2, node3]);
+		});
+	});
+
+	describe('sortNodeCreateElements', () => {
+		it('should sort nodes alphabetically by displayName', () => {
+			const node1 = mockNodeCreateElement({ key: 'newNode' }, { displayName: 'xyz' });
+			const node2 = mockNodeCreateElement({ key: 'popularNode' }, { displayName: 'abc' });
+			const node3 = mockNodeCreateElement({ key: 'otherNode' }, { displayName: 'ABC' });
+			expect(sortNodeCreateElements([node1, node2, node3])).toEqual([node2, node3, node1]);
+		});
+
+		it('should not change order for other types (sections, actions)', () => {
+			const node1 = mockSectionCreateElement();
+			const node2 = mockActionCreateElement();
+			const node3 = mockSectionCreateElement();
+			expect(sortNodeCreateElements([node1, node2, node3])).toEqual([node1, node2, node3]);
+		});
+	});
+});
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/__tests__/utils.ts b/packages/editor-ui/src/components/Node/NodeCreator/__tests__/utils.ts
new file mode 100644
index 0000000000000..f8470218680fa
--- /dev/null
+++ b/packages/editor-ui/src/components/Node/NodeCreator/__tests__/utils.ts
@@ -0,0 +1,139 @@
+import type {
+	SimplifiedNodeType,
+	ActionTypeDescription,
+	SubcategoryItemProps,
+	ViewItemProps,
+	LabelItemProps,
+	NodeCreateElement,
+	SubcategoryCreateElement,
+	ViewCreateElement,
+	LabelCreateElement,
+	ActionCreateElement,
+	SectionCreateElement,
+} from '@/Interface';
+import { v4 as uuidv4 } from 'uuid';
+
+export const mockSimplifiedNodeType = (
+	overrides?: Partial<SimplifiedNodeType>,
+): SimplifiedNodeType => ({
+	displayName: 'Sample DisplayName',
+	name: 'sampleName',
+	icon: 'sampleIcon',
+	iconUrl: 'https://example.com/icon.png',
+	group: ['group1', 'group2'],
+	description: 'Sample description',
+	codex: {
+		categories: ['category1', 'category2'],
+		subcategories: {
+			category1: ['subcategory1', 'subcategory2'],
+			category2: ['subcategory3', 'subcategory4'],
+		},
+		alias: ['alias1', 'alias2'],
+	},
+	defaults: {
+		color: '#ffffff',
+	},
+	...overrides,
+});
+
+export const mockActionTypeDescription = (
+	overrides?: Partial<ActionTypeDescription>,
+): ActionTypeDescription => ({
+	...mockSimplifiedNodeType(),
+	values: { value1: 'test', value2: 123 },
+	actionKey: 'sampleActionKey',
+	codex: {
+		label: 'Sample Label',
+		categories: ['category1', 'category2'],
+	},
+	...overrides,
+});
+
+const mockSubcategoryItemProps = (
+	overrides?: Partial<SubcategoryItemProps>,
+): SubcategoryItemProps => ({
+	description: 'Sample description',
+	iconType: 'sampleIconType',
+	icon: 'sampleIcon',
+	title: 'Sample title',
+	subcategory: 'sampleSubcategory',
+	defaults: { color: '#ffffff' },
+	forceIncludeNodes: ['node1', 'node2'],
+	...overrides,
+});
+
+const mockViewItemProps = (overrides?: Partial<ViewItemProps>): ViewItemProps => ({
+	title: 'Sample title',
+	description: 'Sample description',
+	icon: 'sampleIcon',
+	...overrides,
+});
+
+const mockLabelItemProps = (overrides?: Partial<LabelItemProps>): LabelItemProps => ({
+	key: uuidv4(),
+	...overrides,
+});
+
+export const mockNodeCreateElement = (
+	overrides?: Partial<NodeCreateElement>,
+	nodeTypeOverrides?: Partial<SimplifiedNodeType>,
+): NodeCreateElement => ({
+	uuid: uuidv4(),
+	key: uuidv4(),
+	type: 'node',
+	subcategory: 'sampleSubcategory',
+	properties: mockSimplifiedNodeType(nodeTypeOverrides),
+	...overrides,
+});
+
+export const mockSubcategoryCreateElement = (
+	overrides?: Partial<SubcategoryItemProps>,
+): SubcategoryCreateElement => ({
+	uuid: uuidv4(),
+	key: uuidv4(),
+	type: 'subcategory',
+	properties: mockSubcategoryItemProps(overrides),
+});
+
+export const mockSectionCreateElement = (
+	overrides?: Partial<SectionCreateElement>,
+): SectionCreateElement => ({
+	uuid: uuidv4(),
+	key: 'popular',
+	type: 'section',
+	title: 'Popular',
+	children: [mockNodeCreateElement(), mockNodeCreateElement()],
+	...overrides,
+});
+
+export const mockViewCreateElement = (
+	overrides?: Partial<ViewCreateElement>,
+): ViewCreateElement => ({
+	uuid: uuidv4(),
+	key: uuidv4(),
+	type: 'view',
+	properties: mockViewItemProps(),
+	...overrides,
+});
+
+export const mockLabelCreateElement = (
+	subcategory?: string,
+	overrides?: Partial<LabelItemProps>,
+): LabelCreateElement => ({
+	uuid: uuidv4(),
+	key: uuidv4(),
+	type: 'label',
+	subcategory: subcategory || 'sampleSubcategory',
+	properties: mockLabelItemProps(overrides),
+});
+
+export const mockActionCreateElement = (
+	subcategory?: string,
+	overrides?: Partial<ActionTypeDescription>,
+): ActionCreateElement => ({
+	uuid: uuidv4(),
+	key: uuidv4(),
+	type: 'action',
+	subcategory: subcategory || 'sampleSubcategory',
+	properties: mockActionTypeDescription(overrides),
+});
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/composables/useActions.ts b/packages/editor-ui/src/components/Node/NodeCreator/composables/useActions.ts
new file mode 100644
index 0000000000000..3a49ff03e149c
--- /dev/null
+++ b/packages/editor-ui/src/components/Node/NodeCreator/composables/useActions.ts
@@ -0,0 +1,325 @@
+import { getCurrentInstance, computed } from 'vue';
+import type { IDataObject, INodeParameters } from 'n8n-workflow';
+import type {
+	ActionTypeDescription,
+	AddedNode,
+	AddedNodeConnection,
+	AddedNodesAndConnections,
+	INodeCreateElement,
+	IUpdateInformation,
+	LabelCreateElement,
+} from '@/Interface';
+import {
+	AGENT_NODE_TYPE,
+	BASIC_CHAIN_NODE_TYPE,
+	CHAT_TRIGGER_NODE_TYPE,
+	MANUAL_CHAT_TRIGGER_NODE_TYPE,
+	MANUAL_TRIGGER_NODE_TYPE,
+	NODE_CREATOR_OPEN_SOURCES,
+	NO_OP_NODE_TYPE,
+	OPEN_AI_ASSISTANT_NODE_TYPE,
+	OPEN_AI_NODE_MESSAGE_ASSISTANT_TYPE,
+	OPEN_AI_NODE_TYPE,
+	QA_CHAIN_NODE_TYPE,
+	SCHEDULE_TRIGGER_NODE_TYPE,
+	SPLIT_IN_BATCHES_NODE_TYPE,
+	STICKY_NODE_TYPE,
+	TRIGGER_NODE_CREATOR_VIEW,
+	WEBHOOK_NODE_TYPE,
+} from '@/constants';
+import { i18n } from '@/plugins/i18n';
+
+import type { BaseTextKey } from '@/plugins/i18n';
+import type { Telemetry } from '@/plugins/telemetry';
+import { useNodeCreatorStore } from '@/stores/nodeCreator.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import { useExternalHooks } from '@/composables/useExternalHooks';
+
+import { sortNodeCreateElements, transformNodeType } from '../utils';
+
+export const useActions = () => {
+	const nodeCreatorStore = useNodeCreatorStore();
+	const instance = getCurrentInstance();
+
+	const singleNodeOpenSources = [
+		NODE_CREATOR_OPEN_SOURCES.PLUS_ENDPOINT,
+		NODE_CREATOR_OPEN_SOURCES.NODE_CONNECTION_ACTION,
+		NODE_CREATOR_OPEN_SOURCES.NODE_CONNECTION_DROP,
+	];
+
+	const actionsCategoryLocales = computed(() => {
+		return {
+			actions: instance?.proxy.$locale.baseText('nodeCreator.actionsCategory.actions') ?? '',
+			triggers: instance?.proxy.$locale.baseText('nodeCreator.actionsCategory.triggers') ?? '',
+		};
+	});
+
+	function getPlaceholderTriggerActions(subcategory: string) {
+		const nodes = [WEBHOOK_NODE_TYPE, SCHEDULE_TRIGGER_NODE_TYPE];
+
+		const matchedNodeTypes = nodeCreatorStore.mergedNodes
+			.filter((node) => nodes.some((n) => n === node.name))
+			.map((node) => {
+				const transformed = transformNodeType(node, subcategory, 'action');
+
+				if (transformed.type === 'action') {
+					const nameBase = node.name.replace('n8n-nodes-base.', '');
+					const localeKey = `nodeCreator.actionsPlaceholderNode.${nameBase}` as BaseTextKey;
+					const overwriteLocale = instance?.proxy.$locale.baseText(localeKey) as string;
+
+					// If the locale key is not the same as the node name, it means it contain a translation
+					// and we should use it
+					if (overwriteLocale !== localeKey) {
+						transformed.properties.displayName = overwriteLocale;
+					}
+				}
+				return transformed;
+			});
+
+		return matchedNodeTypes;
+	}
+
+	function filterActionsCategory(items: INodeCreateElement[], category: string) {
+		return items.filter(
+			(item) => item.type === 'action' && item.properties.codex.categories.includes(category),
+		);
+	}
+
+	function injectActionsLabels(items: INodeCreateElement[]): INodeCreateElement[] {
+		const extendedActions = sortNodeCreateElements([...items]);
+		const labelsSet = new Set<string>();
+
+		// Collect unique labels
+		for (const action of extendedActions) {
+			if (action.type !== 'action') continue;
+			const label = action.properties?.codex?.label;
+			labelsSet.add(label);
+		}
+
+		if (labelsSet.size <= 1) return extendedActions;
+
+		// Create a map to store the first index of each label
+		const firstIndexMap = new Map<string, number>();
+
+		// Iterate through the extendedActions to find the first index of each label
+		for (let i = 0; i < extendedActions.length; i++) {
+			const action = extendedActions[i];
+			if (action.type !== 'action') continue;
+			const label = action.properties?.codex?.label;
+			if (!firstIndexMap.has(label)) {
+				firstIndexMap.set(label, i);
+			}
+		}
+
+		// Keep track of the number of inserted labels
+		let insertedLabels = 0;
+
+		// Create and insert new label objects at the first index of each label
+		for (const label of labelsSet) {
+			const newLabel: LabelCreateElement = {
+				uuid: label,
+				type: 'label',
+				key: label,
+				subcategory: extendedActions[0].key,
+				properties: {
+					key: label,
+				},
+			};
+
+			const insertIndex = firstIndexMap.get(label)! + insertedLabels;
+			extendedActions.splice(insertIndex, 0, newLabel);
+			insertedLabels++;
+		}
+
+		return extendedActions;
+	}
+
+	function parseCategoryActions(
+		actions: INodeCreateElement[],
+		category: string,
+		withLabels = true,
+	) {
+		const filteredActions = filterActionsCategory(actions, category);
+		if (withLabels) return injectActionsLabels(filteredActions);
+		return filteredActions;
+	}
+
+	function getActionData(actionItem: ActionTypeDescription): IUpdateInformation {
+		const displayOptions = actionItem.displayOptions;
+
+		const displayConditions = Object.keys(displayOptions?.show || {}).reduce(
+			(acc: IDataObject, showCondition: string) => {
+				acc[showCondition] = displayOptions?.show?.[showCondition]?.[0];
+				return acc;
+			},
+			{},
+		);
+
+		return {
+			name: actionItem.displayName,
+			key: actionItem.name,
+			value: { ...actionItem.values, ...displayConditions } as INodeParameters,
+		};
+	}
+
+	/**
+	 * Checks if added nodes contain trigger followed by another node
+	 * In this case, we should connect the trigger with the following node
+	 */
+	function shouldConnectWithExistingTrigger(addedNodes: AddedNode[]): boolean {
+		if (addedNodes.length === 2) {
+			const isTriggerNode = useNodeTypesStore().isTriggerNode(addedNodes[0].type);
+			return isTriggerNode;
+		}
+		return false;
+	}
+
+	function shouldPrependManualTrigger(addedNodes: AddedNode[]): boolean {
+		const { selectedView, openSource } = useNodeCreatorStore();
+		const { workflowTriggerNodes } = useWorkflowsStore();
+		const hasTrigger = addedNodes.some((node) => useNodeTypesStore().isTriggerNode(node.type));
+		const workflowContainsTrigger = workflowTriggerNodes.length > 0;
+		const isTriggerPanel = selectedView === TRIGGER_NODE_CREATOR_VIEW;
+		const onlyStickyNodes = addedNodes.every((node) => node.type === STICKY_NODE_TYPE);
+
+		// If the node creator was opened from the plus endpoint, node connection action, or node connection drop
+		// then we do not want to append the manual trigger
+		const isSingleNodeOpenSource = singleNodeOpenSources.includes(openSource);
+		return (
+			!isSingleNodeOpenSource &&
+			!hasTrigger &&
+			!workflowContainsTrigger &&
+			isTriggerPanel &&
+			!onlyStickyNodes
+		);
+	}
+	function shouldPrependChatTrigger(addedNodes: AddedNode[]): boolean {
+		const { allNodes } = useWorkflowsStore();
+
+		const COMPATIBLE_CHAT_NODES = [
+			QA_CHAIN_NODE_TYPE,
+			AGENT_NODE_TYPE,
+			BASIC_CHAIN_NODE_TYPE,
+			OPEN_AI_ASSISTANT_NODE_TYPE,
+			OPEN_AI_NODE_MESSAGE_ASSISTANT_TYPE,
+		];
+
+		const isChatTriggerMissing =
+			allNodes.find((node) =>
+				[MANUAL_CHAT_TRIGGER_NODE_TYPE, CHAT_TRIGGER_NODE_TYPE].includes(node.type),
+			) === undefined;
+		const isCompatibleNode = addedNodes.some((node) => COMPATIBLE_CHAT_NODES.includes(node.type));
+
+		return isCompatibleNode && isChatTriggerMissing;
+	}
+
+	function getAddedNodesAndConnections(addedNodes: AddedNode[]): AddedNodesAndConnections {
+		if (addedNodes.length === 0) {
+			return { nodes: [], connections: [] };
+		}
+
+		const nodes: AddedNode[] = [];
+		const connections: AddedNodeConnection[] = [];
+
+		const nodeToAutoOpen = addedNodes.find((node) => node.type !== MANUAL_TRIGGER_NODE_TYPE);
+
+		if (nodeToAutoOpen) {
+			nodeToAutoOpen.openDetail = true;
+		}
+
+		if (shouldPrependChatTrigger(addedNodes)) {
+			addedNodes.unshift({ type: CHAT_TRIGGER_NODE_TYPE, isAutoAdd: true });
+			connections.push({
+				from: { nodeIndex: 0 },
+				to: { nodeIndex: 1 },
+			});
+		} else if (shouldPrependManualTrigger(addedNodes)) {
+			addedNodes.unshift({ type: MANUAL_TRIGGER_NODE_TYPE, isAutoAdd: true });
+			connections.push({
+				from: { nodeIndex: 0 },
+				to: { nodeIndex: 1 },
+			});
+		} else if (shouldConnectWithExistingTrigger(addedNodes)) {
+			connections.push({
+				from: { nodeIndex: 0 },
+				to: { nodeIndex: 1 },
+			});
+		}
+
+		addedNodes.forEach((node, index) => {
+			if (node.type === OPEN_AI_NODE_MESSAGE_ASSISTANT_TYPE) {
+				node.type = OPEN_AI_NODE_TYPE;
+			}
+
+			nodes.push(node);
+
+			switch (node.type) {
+				case SPLIT_IN_BATCHES_NODE_TYPE: {
+					const splitInBatchesIndex = index;
+					const noOpIndex = splitInBatchesIndex + 1;
+					nodes.push({
+						type: NO_OP_NODE_TYPE,
+						isAutoAdd: true,
+						name: i18n.baseText('nodeView.replaceMe'),
+					});
+					connections.push(
+						{
+							from: { nodeIndex: splitInBatchesIndex, outputIndex: 1 },
+							to: { nodeIndex: noOpIndex },
+						},
+						{
+							from: { nodeIndex: noOpIndex },
+							to: { nodeIndex: splitInBatchesIndex },
+						},
+					);
+					break;
+				}
+			}
+		});
+
+		return { nodes, connections };
+	}
+
+	// Hook into addNode action to set the last node parameters & track the action selected
+	function setAddedNodeActionParameters(
+		action: IUpdateInformation,
+		telemetry?: Telemetry,
+		rootView = '',
+	) {
+		const { $onAction: onWorkflowStoreAction } = useWorkflowsStore();
+		const storeWatcher = onWorkflowStoreAction(
+			({ name, after, store: { setLastNodeParameters }, args }) => {
+				if (name !== 'addNode' || args[0].type !== action.key) return;
+				after(() => {
+					setLastNodeParameters(action);
+					if (telemetry) trackActionSelected(action, telemetry, rootView);
+					// Unsubscribe from the store watcher
+					storeWatcher();
+				});
+			},
+		);
+
+		return storeWatcher;
+	}
+
+	function trackActionSelected(action: IUpdateInformation, telemetry: Telemetry, rootView: string) {
+		const payload = {
+			node_type: action.key,
+			action: action.name,
+			source_mode: rootView.toLowerCase(),
+			resource: (action.value as INodeParameters).resource || '',
+		};
+		void useExternalHooks().run('nodeCreateList.addAction', payload);
+		telemetry?.trackNodesPanel('nodeCreateList.addAction', payload);
+	}
+
+	return {
+		actionsCategoryLocales,
+		getPlaceholderTriggerActions,
+		parseCategoryActions,
+		getAddedNodesAndConnections,
+		getActionData,
+		setAddedNodeActionParameters,
+	};
+};
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/composables/useActionsGeneration.ts b/packages/editor-ui/src/components/Node/NodeCreator/composables/useActionsGeneration.ts
new file mode 100644
index 0000000000000..490fc97b13f3b
--- /dev/null
+++ b/packages/editor-ui/src/components/Node/NodeCreator/composables/useActionsGeneration.ts
@@ -0,0 +1,327 @@
+import type { ActionTypeDescription, ActionsRecord, SimplifiedNodeType } from '@/Interface';
+import { CUSTOM_API_CALL_KEY, HTTP_REQUEST_NODE_TYPE } from '@/constants';
+import { memoize, startCase } from 'lodash-es';
+import type {
+	ICredentialType,
+	INodeProperties,
+	INodePropertyCollection,
+	INodePropertyOptions,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+
+import { i18n } from '@/plugins/i18n';
+
+import { getCredentialOnlyNodeType } from '@/utils/credentialOnlyNodes';
+
+const PLACEHOLDER_RECOMMENDED_ACTION_KEY = 'placeholder_recommended';
+
+function translate(...args: Parameters<typeof i18n.baseText>) {
+	return i18n.baseText(...args);
+}
+
+// Memoize the translation function so we don't have to re-translate the same string
+// multiple times when generating the actions
+const cachedBaseText = memoize(translate, (...args) => JSON.stringify(args));
+
+const customNodeActionsParsers: {
+	[key: string]: (
+		matchedProperty: INodeProperties,
+		nodeTypeDescription: INodeTypeDescription,
+	) => ActionTypeDescription[] | undefined;
+} = {
+	['n8n-nodes-base.hubspotTrigger']: (matchedProperty, nodeTypeDescription) => {
+		const collection = matchedProperty?.options?.[0] as INodePropertyCollection;
+
+		return (collection?.values[0]?.options as INodePropertyOptions[])?.map(
+			(categoryItem): ActionTypeDescription => ({
+				...getNodeTypeBase(nodeTypeDescription),
+				actionKey: categoryItem.value as string,
+				displayName: cachedBaseText('nodeCreator.actionsCategory.onEvent', {
+					interpolate: { event: startCase(categoryItem.name) },
+				}),
+				description: categoryItem.description || '',
+				displayOptions: matchedProperty.displayOptions,
+				values: { eventsUi: { eventValues: [{ name: categoryItem.value }] } },
+			}),
+		);
+	},
+};
+
+function getNodeTypeBase(nodeTypeDescription: INodeTypeDescription, label?: string) {
+	const isTrigger = nodeTypeDescription.group.includes('trigger');
+	const category = isTrigger
+		? cachedBaseText('nodeCreator.actionsCategory.triggers')
+		: cachedBaseText('nodeCreator.actionsCategory.actions');
+	return {
+		name: nodeTypeDescription.name,
+		group: nodeTypeDescription.group,
+		codex: {
+			label: label || '',
+			categories: [category],
+		},
+		iconUrl: nodeTypeDescription.iconUrl,
+		outputs: nodeTypeDescription.outputs,
+		icon: nodeTypeDescription.icon,
+		defaults: nodeTypeDescription.defaults,
+	};
+}
+
+function operationsCategory(nodeTypeDescription: INodeTypeDescription): ActionTypeDescription[] {
+	if (!!nodeTypeDescription.properties.find((property) => property.name === 'resource')) return [];
+
+	const matchedProperty = nodeTypeDescription.properties.find(
+		(property) => property.name?.toLowerCase() === 'operation',
+	);
+
+	if (!matchedProperty?.options) return [];
+
+	const filteredOutItems = (matchedProperty.options as INodePropertyOptions[]).filter(
+		(categoryItem: INodePropertyOptions) => !['*', '', ' '].includes(categoryItem.name),
+	);
+
+	const items = filteredOutItems.map((item: INodePropertyOptions) => ({
+		...getNodeTypeBase(nodeTypeDescription),
+		actionKey: item.value as string,
+		displayName: item.action ?? startCase(item.name),
+		description: item.description ?? '',
+		displayOptions: matchedProperty.displayOptions,
+		values: {
+			[matchedProperty.name]: matchedProperty.type === 'multiOptions' ? [item.value] : item.value,
+		},
+	}));
+
+	// Do not return empty category
+	if (items.length === 0) return [];
+
+	return items;
+}
+
+function triggersCategory(nodeTypeDescription: INodeTypeDescription): ActionTypeDescription[] {
+	const matchingKeys = ['event', 'events', 'trigger on'];
+	const isTrigger = nodeTypeDescription.displayName?.toLowerCase().includes('trigger');
+	const matchedProperty = nodeTypeDescription.properties.find((property) =>
+		matchingKeys.includes(property.displayName?.toLowerCase()),
+	);
+
+	if (!isTrigger) return [];
+
+	// Inject placeholder action if no events are available
+	// so user is able to add node to the canvas from the actions panel
+	if (!matchedProperty?.options) {
+		return [
+			{
+				...getNodeTypeBase(nodeTypeDescription),
+				actionKey: PLACEHOLDER_RECOMMENDED_ACTION_KEY,
+				displayName: cachedBaseText('nodeCreator.actionsCategory.onNewEvent', {
+					interpolate: { event: nodeTypeDescription.displayName.replace('Trigger', '').trimEnd() },
+				}),
+				description: '',
+			},
+		];
+	}
+
+	const filteredOutItems = (matchedProperty.options as INodePropertyOptions[]).filter(
+		(categoryItem: INodePropertyOptions) => !['*', '', ' '].includes(categoryItem.name),
+	);
+
+	const customParsedItem = customNodeActionsParsers[nodeTypeDescription.name]?.(
+		matchedProperty,
+		nodeTypeDescription,
+	);
+
+	const items =
+		customParsedItem ??
+		filteredOutItems.map((categoryItem: INodePropertyOptions) => ({
+			...getNodeTypeBase(nodeTypeDescription),
+			actionKey: categoryItem.value as string,
+			displayName:
+				categoryItem.action ??
+				cachedBaseText('nodeCreator.actionsCategory.onEvent', {
+					interpolate: { event: startCase(categoryItem.name) },
+				}),
+			description: categoryItem.description || '',
+			displayOptions: matchedProperty.displayOptions,
+			values: {
+				[matchedProperty.name]:
+					matchedProperty.type === 'multiOptions' ? [categoryItem.value] : categoryItem.value,
+			},
+		}));
+
+	return items;
+}
+
+function resourceCategories(nodeTypeDescription: INodeTypeDescription): ActionTypeDescription[] {
+	const transformedNodes: ActionTypeDescription[] = [];
+	const matchedProperties = nodeTypeDescription.properties.filter(
+		(property) => property.displayName?.toLowerCase() === 'resource',
+	);
+
+	matchedProperties.forEach((property) => {
+		((property.options as INodePropertyOptions[]) || [])
+			.filter((option) => option.value !== CUSTOM_API_CALL_KEY)
+			.forEach((resourceOption, i, options) => {
+				const isSingleResource = options.length === 1;
+
+				// Match operations for the resource by checking if displayOptions matches or contains the resource name
+				const operations = nodeTypeDescription.properties.find((operation) => {
+					const isOperation = operation.name === 'operation';
+					const isMatchingResource =
+						operation.displayOptions?.show?.resource?.includes(resourceOption.value) ||
+						isSingleResource;
+
+					// If the operation doesn't have a version defined, it should be
+					// available for all versions. Otherwise, make sure the node type
+					// version matches the operation version
+					const operationVersions = operation.displayOptions?.show?.['@version'];
+					const nodeTypeVersions = Array.isArray(nodeTypeDescription.version)
+						? nodeTypeDescription.version
+						: [nodeTypeDescription.version];
+
+					const isMatchingVersion = operationVersions
+						? operationVersions.some((version) => nodeTypeVersions.includes(version))
+						: true;
+
+					return isOperation && isMatchingResource && isMatchingVersion;
+				});
+
+				if (!operations?.options) return;
+
+				const items = ((operations.options as INodePropertyOptions[]) || []).map(
+					(operationOption) => {
+						const displayName =
+							operationOption.action ?? `${resourceOption.name} ${startCase(operationOption.name)}`;
+
+						// We need to manually populate displayOptions as they are not present in the node description
+						// if the resource has only one option
+						const displayOptions = isSingleResource
+							? { show: { resource: [options[0]?.value] } }
+							: operations?.displayOptions;
+
+						return {
+							...getNodeTypeBase(
+								nodeTypeDescription,
+								`${resourceOption.name} ${cachedBaseText('nodeCreator.actionsCategory.actions')}`,
+							),
+							actionKey: operationOption.value as string,
+							description: operationOption?.description ?? '',
+							displayOptions,
+							values: {
+								operation:
+									operations?.type === 'multiOptions'
+										? [operationOption.value]
+										: operationOption.value,
+							},
+							displayName,
+							group: ['trigger'],
+						};
+					},
+				);
+
+				transformedNodes.push(...items);
+			});
+	});
+
+	return transformedNodes;
+}
+
+export function useActionsGenerator() {
+	function generateNodeActions(node: INodeTypeDescription | undefined) {
+		if (!node) return [];
+		return [...triggersCategory(node), ...operationsCategory(node), ...resourceCategories(node)];
+	}
+	function filterActions(actions: ActionTypeDescription[]) {
+		// Do not show single action nodes
+		if (actions.length <= 1) return [];
+		return actions.filter(
+			(action: ActionTypeDescription, _: number, arr: ActionTypeDescription[]) => {
+				const isApiCall = action.actionKey === CUSTOM_API_CALL_KEY;
+				if (isApiCall) return false;
+
+				const isPlaceholderTriggerAction = action.actionKey === PLACEHOLDER_RECOMMENDED_ACTION_KEY;
+				return !isPlaceholderTriggerAction || (isPlaceholderTriggerAction && arr.length > 1);
+			},
+		);
+	}
+
+	function getSimplifiedNodeType(node: INodeTypeDescription): SimplifiedNodeType {
+		const {
+			displayName,
+			defaults,
+			description,
+			name,
+			group,
+			icon,
+			iconUrl,
+			badgeIconUrl,
+			outputs,
+			codex,
+		} = node;
+
+		return {
+			displayName,
+			defaults,
+			description,
+			name,
+			group,
+			icon,
+			iconUrl,
+			badgeIconUrl,
+			outputs,
+			codex,
+		};
+	}
+
+	function generateMergedNodesAndActions(
+		nodeTypes: INodeTypeDescription[],
+		httpOnlyCredentials: ICredentialType[],
+	) {
+		const visibleNodeTypes = [...nodeTypes];
+		const actions: ActionsRecord<typeof mergedNodes> = {};
+		const mergedNodes: SimplifiedNodeType[] = [];
+
+		visibleNodeTypes
+			.filter((node) => !node.group.includes('trigger'))
+			.forEach((app) => {
+				const appActions = generateNodeActions(app);
+				actions[app.name] = appActions;
+
+				if (app.name === HTTP_REQUEST_NODE_TYPE) {
+					const credentialOnlyNodes = httpOnlyCredentials.map((credentialType) =>
+						getSimplifiedNodeType(getCredentialOnlyNodeType(app, credentialType)),
+					);
+					mergedNodes.push(...credentialOnlyNodes);
+				}
+
+				mergedNodes.push(getSimplifiedNodeType(app));
+			});
+
+		visibleNodeTypes
+			.filter((node) => node.group.includes('trigger'))
+			.forEach((trigger) => {
+				const normalizedName = trigger.name.replace('Trigger', '');
+				const triggerActions = generateNodeActions(trigger);
+				const appActions = actions?.[normalizedName] || [];
+				const app = mergedNodes.find((node) => node.name === normalizedName);
+
+				if (app && appActions?.length > 0) {
+					// merge triggers into regular nodes that match
+					const mergedActions = filterActions([...appActions, ...triggerActions]);
+					actions[normalizedName] = mergedActions;
+
+					app.description = trigger.description; // default to trigger description
+				} else {
+					actions[trigger.name] = filterActions(triggerActions);
+					mergedNodes.push(getSimplifiedNodeType(trigger));
+				}
+			});
+
+		return {
+			actions,
+			mergedNodes,
+		};
+	}
+
+	return {
+		generateMergedNodesAndActions,
+	};
+}
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/composables/useKeyboardNavigation.ts b/packages/editor-ui/src/components/Node/NodeCreator/composables/useKeyboardNavigation.ts
new file mode 100644
index 0000000000000..7026287946271
--- /dev/null
+++ b/packages/editor-ui/src/components/Node/NodeCreator/composables/useKeyboardNavigation.ts
@@ -0,0 +1,156 @@
+import { ref } from 'vue';
+import { defineStore } from 'pinia';
+
+export type KeyboardKey = (typeof WATCHED_KEYS)[number];
+interface KeyHook {
+	keyboardKeys: KeyboardKey[];
+	condition?: (type: string, activeItemId: string) => boolean;
+	handler: (activeItemId: string, keyboardKey: KeyboardKey) => void;
+}
+
+export const KEYBOARD_ID_ATTR = 'data-keyboard-nav-id';
+export const WATCHED_KEYS = [
+	'ArrowUp',
+	'ArrowDown',
+	'ArrowLeft',
+	'ArrowRight',
+	'Enter',
+	'Escape',
+	'Tab',
+];
+
+export const useKeyboardNavigation = defineStore('nodeCreatorKeyboardNavigation', () => {
+	const selectableItems = ref<Array<WeakRef<Element>>>([]);
+	const activeItemId = ref<string | null>(null);
+	// Array of objects that contains key code and handler
+	const keysHooks = ref<Record<string, KeyHook>>({});
+
+	function getItemType(element?: Element) {
+		return element?.getAttribute('data-keyboard-nav-type');
+	}
+	function getElementId(element?: Element) {
+		return element?.getAttribute(KEYBOARD_ID_ATTR) || undefined;
+	}
+	async function refreshSelectableItems(): Promise<void> {
+		return await new Promise((resolve) => {
+			// Wait for DOM to update
+			cleanupSelectableItems();
+			setTimeout(() => {
+				selectableItems.value = Array.from(
+					document.querySelectorAll('[data-keyboard-nav-type]'),
+				).map((el) => new WeakRef(el));
+				resolve();
+			}, 0);
+		});
+	}
+
+	function executeKeyHooks(keyboardKey: KeyboardKey, activeItem: Element) {
+		const flatHooks = Object.values(keysHooks.value);
+		const hooks = flatHooks.filter((hook) => hook.keyboardKeys.includes(keyboardKey));
+
+		hooks.forEach((hook) => {
+			if (!activeItemId.value) return;
+
+			const conditionPassed =
+				hook.condition === undefined ||
+				hook.condition(getItemType(activeItem) || '', activeItemId.value);
+
+			if (conditionPassed && activeItemId.value) {
+				hook.handler(activeItemId.value, keyboardKey);
+			}
+		});
+	}
+
+	async function onKeyDown(e: KeyboardEvent) {
+		const pressedKey = e.key;
+		if (!WATCHED_KEYS.includes(pressedKey)) return;
+		e.preventDefault();
+		e.stopPropagation();
+
+		await refreshSelectableItems();
+		const activeItemIndex = selectableItems.value.findIndex(
+			(item) => getElementId(item?.deref()) === activeItemId.value,
+		);
+		const activeItem = selectableItems.value[activeItemIndex]?.deref();
+
+		const isArrowDown = pressedKey === 'ArrowDown';
+		const isArrowUp = pressedKey === 'ArrowUp';
+
+		if (!activeItem) return;
+
+		if (isArrowDown) {
+			const nextItemIndex =
+				activeItemIndex < selectableItems.value.length - 1 ? activeItemIndex + 1 : 0;
+
+			setActiveItem(selectableItems.value[nextItemIndex]?.deref());
+		}
+		if (isArrowUp) {
+			const previousIndex =
+				activeItemIndex > 0 ? activeItemIndex - 1 : selectableItems.value.length - 1;
+
+			setActiveItem(selectableItems.value[previousIndex]?.deref());
+		}
+		executeKeyHooks(pressedKey, activeItem);
+	}
+
+	function setActiveItemId(id: string) {
+		activeItemId.value = id;
+	}
+
+	function setActiveItem(item?: Element) {
+		const itemId = getElementId(item);
+		if (!itemId) return;
+
+		setActiveItemId(itemId);
+		if (item?.scrollIntoView) {
+			item?.scrollIntoView({ block: 'center' });
+		}
+	}
+
+	async function setActiveItemIndex(index: number) {
+		await refreshSelectableItems();
+
+		setActiveItem(selectableItems.value[index]?.deref());
+	}
+
+	function attachKeydownEvent() {
+		document.addEventListener('keydown', onKeyDown, { capture: true });
+	}
+
+	function detachKeydownEvent() {
+		cleanupSelectableItems();
+		document.removeEventListener('keydown', onKeyDown, { capture: true });
+	}
+
+	function registerKeyHook(name: string, hook: KeyHook) {
+		hook.keyboardKeys.forEach((keyboardKey) => {
+			if (WATCHED_KEYS.includes(keyboardKey)) {
+				keysHooks.value = { ...keysHooks.value, [name]: hook };
+			} else {
+				throw new Error(`Key ${keyboardKey} is not supported`);
+			}
+		});
+	}
+
+	function cleanupSelectableItems() {
+		// Cleanup to make sure DOM elements get garbage collected
+		selectableItems.value = [];
+	}
+
+	function getActiveItemIndex() {
+		return selectableItems.value.findIndex(
+			(item) => getElementId(item?.deref()) === activeItemId.value,
+		);
+	}
+
+	return {
+		activeItemId,
+		attachKeydownEvent,
+		refreshSelectableItems,
+		detachKeydownEvent,
+		registerKeyHook,
+		getActiveItemIndex,
+		setActiveItemId,
+		setActiveItemIndex,
+	};
+});
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/composables/useViewStacks.ts b/packages/editor-ui/src/components/Node/NodeCreator/composables/useViewStacks.ts
new file mode 100644
index 0000000000000..1f2eeb0cee4f9
--- /dev/null
+++ b/packages/editor-ui/src/components/Node/NodeCreator/composables/useViewStacks.ts
@@ -0,0 +1,290 @@
+import type { INodeCreateElement, NodeFilterType, SimplifiedNodeType } from '@/Interface';
+import {
+	AI_CODE_NODE_TYPE,
+	AI_OTHERS_NODE_CREATOR_VIEW,
+	DEFAULT_SUBCATEGORY,
+	TRIGGER_NODE_CREATOR_VIEW,
+} from '@/constants';
+import { defineStore } from 'pinia';
+import { v4 as uuid } from 'uuid';
+import { computed, nextTick, ref } from 'vue';
+
+import { useNodeCreatorStore } from '@/stores/nodeCreator.store';
+
+import {
+	flattenCreateElements,
+	groupItemsInSections,
+	searchNodes,
+	sortNodeCreateElements,
+	subcategorizeItems,
+	transformNodeType,
+} from '../utils';
+
+import type { NodeViewItem, NodeViewItemSection } from '@/components/Node/NodeCreator/viewsData';
+import { AINodesView } from '@/components/Node/NodeCreator/viewsData';
+import { useI18n } from '@/composables/useI18n';
+import { useKeyboardNavigation } from './useKeyboardNavigation';
+
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import type { INodeInputFilter, NodeConnectionType } from 'n8n-workflow';
+
+interface ViewStack {
+	uuid?: string;
+	title?: string;
+	subtitle?: string;
+	search?: string;
+	subcategory?: string;
+	info?: string;
+	nodeIcon?: {
+		iconType?: string;
+		icon?: string;
+		color?: string;
+	};
+	iconUrl?: string;
+	rootView?: NodeFilterType;
+	activeIndex?: number;
+	transitionDirection?: 'in' | 'out';
+	hasSearch?: boolean;
+	preventBack?: boolean;
+	items?: INodeCreateElement[];
+	baselineItems?: INodeCreateElement[];
+	searchItems?: SimplifiedNodeType[];
+	forceIncludeNodes?: string[];
+	mode?: 'actions' | 'nodes';
+	baseFilter?: (item: INodeCreateElement) => boolean;
+	itemsMapper?: (item: INodeCreateElement) => INodeCreateElement;
+	panelClass?: string;
+	sections?: NodeViewItemSection[];
+}
+
+export const useViewStacks = defineStore('nodeCreatorViewStacks', () => {
+	const nodeCreatorStore = useNodeCreatorStore();
+	const { getActiveItemIndex } = useKeyboardNavigation();
+
+	const viewStacks = ref<ViewStack[]>([]);
+
+	const activeStackItems = computed<INodeCreateElement[]>(() => {
+		const stack = viewStacks.value[viewStacks.value.length - 1];
+
+		if (!stack?.baselineItems) {
+			return stack.items ? extendItemsWithUUID(stack.items) : [];
+		}
+
+		if (stack.search && searchBaseItems.value) {
+			const searchBase =
+				searchBaseItems.value.length > 0
+					? searchBaseItems.value
+					: flattenCreateElements(stack.baselineItems ?? []);
+
+			return extendItemsWithUUID(searchNodes(stack.search || '', searchBase));
+		}
+		return extendItemsWithUUID(stack.baselineItems);
+	});
+
+	const activeViewStack = computed<ViewStack>(() => {
+		const stack = viewStacks.value[viewStacks.value.length - 1];
+		if (!stack) return {};
+
+		const flatBaselineItems = flattenCreateElements(stack.baselineItems ?? []);
+
+		return {
+			...stack,
+			items: activeStackItems.value,
+			hasSearch: flatBaselineItems.length > 8 || stack?.hasSearch,
+		};
+	});
+
+	const activeViewStackMode = computed(
+		() => activeViewStack.value.mode || TRIGGER_NODE_CREATOR_VIEW,
+	);
+
+	const searchBaseItems = computed<INodeCreateElement[]>(() => {
+		const stack = viewStacks.value[viewStacks.value.length - 1];
+		if (!stack?.searchItems) return [];
+
+		return stack.searchItems.map((item) => transformNodeType(item, stack.subcategory));
+	});
+
+	// Generate a delta between the global search results(all nodes) and the stack search results
+	const globalSearchItemsDiff = computed<INodeCreateElement[]>(() => {
+		const stack = viewStacks.value[viewStacks.value.length - 1];
+		if (!stack?.search) return [];
+
+		const allNodes = nodeCreatorStore.mergedNodes.map((item) => transformNodeType(item));
+		const globalSearchResult = extendItemsWithUUID(searchNodes(stack.search || '', allNodes));
+
+		return globalSearchResult.filter((item) => {
+			return !activeStackItems.value.find((activeItem) => activeItem.key === item.key);
+		});
+	});
+
+	const itemsBySubcategory = computed(() => subcategorizeItems(nodeCreatorStore.mergedNodes));
+
+	async function gotoCompatibleConnectionView(
+		connectionType: NodeConnectionType,
+		isOutput?: boolean,
+		filter?: INodeInputFilter,
+	) {
+		const i18n = useI18n();
+
+		let nodesByConnectionType: { [key: string]: string[] };
+		let relatedAIView: NodeViewItem | { properties: { title: string; icon: string } } | undefined;
+
+		if (isOutput === true) {
+			nodesByConnectionType = useNodeTypesStore().visibleNodeTypesByInputConnectionTypeNames;
+			relatedAIView = {
+				properties: {
+					title: i18n.baseText('nodeCreator.aiPanel.aiNodes'),
+					icon: 'robot',
+				},
+			};
+		} else {
+			nodesByConnectionType = useNodeTypesStore().visibleNodeTypesByOutputConnectionTypeNames;
+
+			relatedAIView = AINodesView([]).items.find(
+				(item) => item.properties.connectionType === connectionType,
+			);
+		}
+
+		await nextTick();
+		pushViewStack({
+			title: relatedAIView?.properties.title,
+			rootView: AI_OTHERS_NODE_CREATOR_VIEW,
+			mode: 'nodes',
+			items: nodeCreatorStore.allNodeCreatorNodes,
+			nodeIcon: {
+				iconType: 'icon',
+				icon: relatedAIView?.properties.icon,
+				color: relatedAIView?.properties.iconProps?.color,
+			},
+			panelClass: relatedAIView?.properties.panelClass,
+			baseFilter: (i: INodeCreateElement) => {
+				// AI Code node could have any connection type so we don't want to display it
+				// in the compatible connection view as it would be displayed in all of them
+				if (i.key === AI_CODE_NODE_TYPE) return false;
+				const displayNode = nodesByConnectionType[connectionType].includes(i.key);
+
+				// TODO: Filtering works currently fine for displaying compatible node when dropping
+				//       input connections. However, it does not work for output connections.
+				//       For that reason does it currently display nodes that are maybe not compatible
+				//       but then errors once it got selected by the user.
+				if (displayNode && filter?.nodes?.length) {
+					return filter.nodes.includes(i.key);
+				}
+
+				return displayNode;
+			},
+			itemsMapper(item) {
+				return {
+					...item,
+					subcategory: connectionType,
+				};
+			},
+			preventBack: true,
+		});
+	}
+
+	function setStackBaselineItems() {
+		const stack = viewStacks.value[viewStacks.value.length - 1];
+		if (!stack || !activeViewStack.value.uuid) return;
+
+		let stackItems = stack?.items ?? [];
+
+		if (!stack?.items) {
+			const subcategory = stack?.subcategory ?? DEFAULT_SUBCATEGORY;
+			const itemsInSubcategory = itemsBySubcategory.value[subcategory];
+			const sections = stack.sections;
+
+			if (sections) {
+				stackItems = groupItemsInSections(itemsInSubcategory, sections);
+			} else {
+				stackItems = itemsInSubcategory;
+			}
+		}
+
+		// Ensure that the nodes specified in `stack.forceIncludeNodes` are always included,
+		// regardless of whether the subcategory is matched
+		if ((stack.forceIncludeNodes ?? []).length > 0) {
+			const matchedNodes = nodeCreatorStore.mergedNodes
+				.filter((item) => stack.forceIncludeNodes?.includes(item.name))
+				.map((item) => transformNodeType(item, stack.subcategory));
+
+			stackItems.push(...matchedNodes);
+		}
+
+		if (stack.baseFilter) {
+			stackItems = stackItems.filter(stack.baseFilter);
+		}
+
+		if (stack.itemsMapper) {
+			stackItems = stackItems.map(stack.itemsMapper);
+		}
+
+		// Sort only if non-root view
+		if (!stack.items) {
+			stackItems = sortNodeCreateElements(stackItems);
+		}
+
+		updateCurrentViewStack({ baselineItems: stackItems });
+	}
+
+	function extendItemsWithUUID(items: INodeCreateElement[]) {
+		return items.map((item) => ({
+			...item,
+			uuid: `${item.key}-${uuid()}`,
+		}));
+	}
+
+	function pushViewStack(stack: ViewStack) {
+		if (activeViewStack.value.uuid) {
+			updateCurrentViewStack({ activeIndex: getActiveItemIndex() });
+		}
+
+		const newStackUuid = uuid();
+		viewStacks.value.push({
+			...stack,
+			uuid: newStackUuid,
+			transitionDirection: 'in',
+			activeIndex: 0,
+		});
+		setStackBaselineItems();
+	}
+
+	function popViewStack() {
+		if (activeViewStack.value.uuid) {
+			viewStacks.value.pop();
+			updateCurrentViewStack({ transitionDirection: 'out' });
+		}
+	}
+
+	function updateCurrentViewStack(stack: Partial<ViewStack>) {
+		const currentStack = viewStacks.value[viewStacks.value.length - 1];
+		const matchedIndex = viewStacks.value.findIndex((s) => s.uuid === currentStack.uuid);
+		if (!currentStack) return;
+
+		// For each key in the stack, update the matched stack
+		Object.keys(stack).forEach((key) => {
+			const typedKey = key as keyof ViewStack;
+			viewStacks.value[matchedIndex] = {
+				...viewStacks.value[matchedIndex],
+				[key]: stack[typedKey],
+			};
+		});
+	}
+
+	function resetViewStacks() {
+		viewStacks.value = [];
+	}
+
+	return {
+		viewStacks,
+		activeViewStack,
+		activeViewStackMode,
+		globalSearchItemsDiff,
+		gotoCompatibleConnectionView,
+		resetViewStacks,
+		updateCurrentViewStack,
+		pushViewStack,
+		popViewStack,
+	};
+});
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/useMainPanelView.ts b/packages/editor-ui/src/components/Node/NodeCreator/useMainPanelView.ts
deleted file mode 100644
index 05ef090da0432..0000000000000
--- a/packages/editor-ui/src/components/Node/NodeCreator/useMainPanelView.ts
+++ /dev/null
@@ -1,198 +0,0 @@
-import { getCurrentInstance, computed } from 'vue';
-import {
-	CORE_NODES_CATEGORY,
-	WEBHOOK_NODE_TYPE,
-	OTHER_TRIGGER_NODES_SUBCATEGORY,
-	EXECUTE_WORKFLOW_TRIGGER_NODE_TYPE,
-	MANUAL_TRIGGER_NODE_TYPE,
-	SCHEDULE_TRIGGER_NODE_TYPE,
-	REGULAR_NODE_FILTER,
-	TRANSFORM_DATA_SUBCATEGORY,
-	FILES_SUBCATEGORY,
-	FLOWS_CONTROL_SUBCATEGORY,
-	HELPERS_SUBCATEGORY,
-	TRIGGER_NODE_FILTER,
-} from '@/constants';
-import { useNodeCreatorStore } from '@/stores/nodeCreator';
-
-export default () => {
-	const instance = getCurrentInstance();
-	const nodeCreatorStore = useNodeCreatorStore();
-
-	const VIEWS = [
-		{
-			value: REGULAR_NODE_FILTER,
-			title: instance?.proxy.$locale.baseText('nodeCreator.triggerHelperPanel.whatHappensNext'),
-			items: [
-				{
-					key: '*',
-					type: 'subcategory',
-					properties: {
-						subcategory: 'App Regular Nodes',
-						icon: 'globe',
-					},
-				},
-				{
-					type: 'subcategory',
-					key: TRANSFORM_DATA_SUBCATEGORY,
-					category: CORE_NODES_CATEGORY,
-					properties: {
-						subcategory: TRANSFORM_DATA_SUBCATEGORY,
-						icon: 'pen',
-					},
-				},
-				{
-					type: 'subcategory',
-					key: HELPERS_SUBCATEGORY,
-					category: CORE_NODES_CATEGORY,
-					properties: {
-						subcategory: HELPERS_SUBCATEGORY,
-						icon: 'toolbox',
-					},
-				},
-				{
-					type: 'subcategory',
-					key: FLOWS_CONTROL_SUBCATEGORY,
-					category: CORE_NODES_CATEGORY,
-					properties: {
-						subcategory: FLOWS_CONTROL_SUBCATEGORY,
-						icon: 'code-branch',
-					},
-				},
-				{
-					type: 'subcategory',
-					key: FILES_SUBCATEGORY,
-					category: CORE_NODES_CATEGORY,
-					properties: {
-						subcategory: FILES_SUBCATEGORY,
-						icon: 'file-alt',
-					},
-				},
-				{
-					key: TRIGGER_NODE_FILTER,
-					type: 'view',
-					properties: {
-						title: instance?.proxy.$locale.baseText(
-							'nodeCreator.triggerHelperPanel.addAnotherTrigger',
-						),
-						icon: 'bolt',
-						withTopBorder: true,
-						description: instance?.proxy.$locale.baseText(
-							'nodeCreator.triggerHelperPanel.addAnotherTriggerDescription',
-						),
-					},
-				},
-			],
-		},
-		{
-			value: TRIGGER_NODE_FILTER,
-			title: instance?.proxy.$locale.baseText('nodeCreator.triggerHelperPanel.selectATrigger'),
-			description: instance?.proxy.$locale.baseText(
-				'nodeCreator.triggerHelperPanel.selectATriggerDescription',
-			),
-			items: [
-				{
-					key: '*',
-					type: 'subcategory',
-					properties: {
-						subcategory: 'App Trigger Nodes',
-						icon: 'satellite-dish',
-					},
-				},
-				{
-					key: SCHEDULE_TRIGGER_NODE_TYPE,
-					type: 'node',
-					category: [CORE_NODES_CATEGORY],
-					properties: {
-						nodeType: {
-							group: [],
-							name: SCHEDULE_TRIGGER_NODE_TYPE,
-							displayName: instance?.proxy.$locale.baseText(
-								'nodeCreator.triggerHelperPanel.scheduleTriggerDisplayName',
-							),
-							description: instance?.proxy.$locale.baseText(
-								'nodeCreator.triggerHelperPanel.scheduleTriggerDescription',
-							),
-							icon: 'fa:clock',
-						},
-					},
-				},
-				{
-					key: WEBHOOK_NODE_TYPE,
-					type: 'node',
-					category: [CORE_NODES_CATEGORY],
-					properties: {
-						nodeType: {
-							group: [],
-							name: WEBHOOK_NODE_TYPE,
-							displayName: instance?.proxy.$locale.baseText(
-								'nodeCreator.triggerHelperPanel.webhookTriggerDisplayName',
-							),
-							description: instance?.proxy.$locale.baseText(
-								'nodeCreator.triggerHelperPanel.webhookTriggerDescription',
-							),
-							iconData: {
-								type: 'file',
-								icon: 'webhook',
-								fileBuffer: '/static/webhook-icon.svg',
-							},
-						},
-					},
-				},
-				{
-					key: MANUAL_TRIGGER_NODE_TYPE,
-					type: 'node',
-					category: [CORE_NODES_CATEGORY],
-					properties: {
-						nodeType: {
-							group: [],
-							name: MANUAL_TRIGGER_NODE_TYPE,
-							displayName: instance?.proxy.$locale.baseText(
-								'nodeCreator.triggerHelperPanel.manualTriggerDisplayName',
-							),
-							description: instance?.proxy.$locale.baseText(
-								'nodeCreator.triggerHelperPanel.manualTriggerDescription',
-							),
-							icon: 'fa:mouse-pointer',
-						},
-					},
-				},
-				{
-					key: EXECUTE_WORKFLOW_TRIGGER_NODE_TYPE,
-					type: 'node',
-					category: [CORE_NODES_CATEGORY],
-					properties: {
-						nodeType: {
-							group: [],
-							name: EXECUTE_WORKFLOW_TRIGGER_NODE_TYPE,
-							displayName: instance?.proxy.$locale.baseText(
-								'nodeCreator.triggerHelperPanel.workflowTriggerDisplayName',
-							),
-							description: instance?.proxy.$locale.baseText(
-								'nodeCreator.triggerHelperPanel.workflowTriggerDescription',
-							),
-							icon: 'fa:sign-out-alt',
-						},
-					},
-				},
-				{
-					type: 'subcategory',
-					key: OTHER_TRIGGER_NODES_SUBCATEGORY,
-					category: CORE_NODES_CATEGORY,
-					properties: {
-						subcategory: OTHER_TRIGGER_NODES_SUBCATEGORY,
-						icon: 'folder-open',
-					},
-				},
-			],
-		},
-	];
-
-	const activeView = computed(() => {
-		return VIEWS.find((v) => v.value === nodeCreatorStore.selectedView) || VIEWS[0];
-	});
-
-	return {
-		activeView,
-	};
-};
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/utils.ts b/packages/editor-ui/src/components/Node/NodeCreator/utils.ts
new file mode 100644
index 0000000000000..237a253c9011a
--- /dev/null
+++ b/packages/editor-ui/src/components/Node/NodeCreator/utils.ts
@@ -0,0 +1,120 @@
+import type {
+	NodeCreateElement,
+	ActionCreateElement,
+	SubcategorizedNodeTypes,
+	SimplifiedNodeType,
+	INodeCreateElement,
+	SectionCreateElement,
+} from '@/Interface';
+import { AI_SUBCATEGORY, CORE_NODES_CATEGORY, DEFAULT_SUBCATEGORY } from '@/constants';
+import { v4 as uuidv4 } from 'uuid';
+
+import { sublimeSearch } from '@/utils/sortUtils';
+import { i18n } from '@/plugins/i18n';
+import type { NodeViewItemSection } from './viewsData';
+
+export function transformNodeType(
+	node: SimplifiedNodeType,
+	subcategory?: string,
+	type: 'node' | 'action' = 'node',
+): NodeCreateElement | ActionCreateElement {
+	const createElement = {
+		uuid: uuidv4(),
+		key: node.name,
+		subcategory:
+			subcategory ?? node.codex?.subcategories?.[CORE_NODES_CATEGORY]?.[0] ?? DEFAULT_SUBCATEGORY,
+		properties: {
+			...node,
+		},
+		type,
+	};
+
+	return type === 'action'
+		? (createElement as ActionCreateElement)
+		: (createElement as NodeCreateElement);
+}
+
+export function subcategorizeItems(items: SimplifiedNodeType[]) {
+	const WHITE_LISTED_SUBCATEGORIES = [CORE_NODES_CATEGORY, AI_SUBCATEGORY];
+	return items.reduce((acc: SubcategorizedNodeTypes, item) => {
+		// Only some subcategories are allowed
+		let subcategories: string[] = [DEFAULT_SUBCATEGORY];
+
+		WHITE_LISTED_SUBCATEGORIES.forEach((category) => {
+			if (item.codex?.categories?.includes(category)) {
+				subcategories = item.codex?.subcategories?.[category] ?? [];
+			}
+		});
+
+		subcategories.forEach((subcategory: string) => {
+			if (!acc[subcategory]) {
+				acc[subcategory] = [];
+			}
+			acc[subcategory].push(transformNodeType(item, subcategory));
+		});
+
+		return acc;
+	}, {});
+}
+
+export function sortNodeCreateElements(nodes: INodeCreateElement[]) {
+	return nodes.sort((a, b) => {
+		if (a.type !== 'node' || b.type !== 'node') return 0;
+		const displayNameA = a.properties?.displayName?.toLowerCase() || a.key;
+		const displayNameB = b.properties?.displayName?.toLowerCase() || b.key;
+
+		return displayNameA.localeCompare(displayNameB, undefined, { sensitivity: 'base' });
+	});
+}
+
+export function searchNodes(searchFilter: string, items: INodeCreateElement[]) {
+	// In order to support the old search we need to remove the 'trigger' part
+	const trimmedFilter = searchFilter.toLowerCase().replace('trigger', '').trimEnd();
+	const result = (
+		sublimeSearch<INodeCreateElement>(trimmedFilter, items, [
+			{ key: 'properties.displayName', weight: 1.3 },
+			{ key: 'properties.codex.alias', weight: 1 },
+		]) || []
+	).map(({ item }) => item);
+
+	return result;
+}
+
+export function flattenCreateElements(items: INodeCreateElement[]): INodeCreateElement[] {
+	return items.map((item) => (item.type === 'section' ? item.children : item)).flat();
+}
+
+export function groupItemsInSections(
+	items: INodeCreateElement[],
+	sections: NodeViewItemSection[],
+): INodeCreateElement[] {
+	const itemsBySection = items.reduce((acc: Record<string, INodeCreateElement[]>, item) => {
+		const section = sections.find((s) => s.items.includes(item.key));
+		const key = section?.key ?? 'other';
+		acc[key] = [...(acc[key] ?? []), item];
+		return acc;
+	}, {});
+
+	const result: SectionCreateElement[] = sections
+		.map(
+			(section): SectionCreateElement => ({
+				type: 'section',
+				key: section.key,
+				title: section.title,
+				children: sortNodeCreateElements(itemsBySection[section.key] ?? []),
+			}),
+		)
+		.concat({
+			type: 'section',
+			key: 'other',
+			title: i18n.baseText('nodeCreator.sectionNames.other'),
+			children: sortNodeCreateElements(itemsBySection.other ?? []),
+		})
+		.filter((section) => section.children.length > 0);
+
+	if (result.length <= 1) {
+		return items;
+	}
+
+	return result;
+}
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/viewsData.ts b/packages/editor-ui/src/components/Node/NodeCreator/viewsData.ts
new file mode 100644
index 0000000000000..a6011d417fae6
--- /dev/null
+++ b/packages/editor-ui/src/components/Node/NodeCreator/viewsData.ts
@@ -0,0 +1,503 @@
+import {
+	CORE_NODES_CATEGORY,
+	WEBHOOK_NODE_TYPE,
+	OTHER_TRIGGER_NODES_SUBCATEGORY,
+	EXECUTE_WORKFLOW_TRIGGER_NODE_TYPE,
+	FORM_TRIGGER_NODE_TYPE,
+	MANUAL_TRIGGER_NODE_TYPE,
+	SCHEDULE_TRIGGER_NODE_TYPE,
+	REGULAR_NODE_CREATOR_VIEW,
+	TRANSFORM_DATA_SUBCATEGORY,
+	FILES_SUBCATEGORY,
+	FLOWS_CONTROL_SUBCATEGORY,
+	TRIGGER_NODE_CREATOR_VIEW,
+	EMAIL_IMAP_NODE_TYPE,
+	DEFAULT_SUBCATEGORY,
+	AI_NODE_CREATOR_VIEW,
+	AI_CATEGORY_AGENTS,
+	AI_CATEGORY_CHAINS,
+	AI_CATEGORY_DOCUMENT_LOADERS,
+	AI_CATEGORY_LANGUAGE_MODELS,
+	AI_CATEGORY_MEMORY,
+	AI_CATEGORY_OUTPUTPARSER,
+	AI_CATEGORY_RETRIEVERS,
+	AI_CATEGORY_TEXT_SPLITTERS,
+	AI_CATEGORY_TOOLS,
+	AI_CATEGORY_VECTOR_STORES,
+	AI_SUBCATEGORY,
+	AI_CATEGORY_EMBEDDING,
+	AI_OTHERS_NODE_CREATOR_VIEW,
+	AI_UNCATEGORIZED_CATEGORY,
+	CONVERT_TO_FILE_NODE_TYPE,
+	EXTRACT_FROM_FILE_NODE_TYPE,
+	SET_NODE_TYPE,
+	CODE_NODE_TYPE,
+	DATETIME_NODE_TYPE,
+	FILTER_NODE_TYPE,
+	REMOVE_DUPLICATES_NODE_TYPE,
+	SPLIT_OUT_NODE_TYPE,
+	LIMIT_NODE_TYPE,
+	SUMMARIZE_NODE_TYPE,
+	AGGREGATE_NODE_TYPE,
+	MERGE_NODE_TYPE,
+	HTML_NODE_TYPE,
+	MARKDOWN_NODE_TYPE,
+	XML_NODE_TYPE,
+	CRYPTO_NODE_TYPE,
+	IF_NODE_TYPE,
+	SPLIT_IN_BATCHES_NODE_TYPE,
+	HTTP_REQUEST_NODE_TYPE,
+	HELPERS_SUBCATEGORY,
+	RSS_READ_NODE_TYPE,
+	EMAIL_SEND_NODE_TYPE,
+	EDIT_IMAGE_NODE_TYPE,
+	COMPRESSION_NODE_TYPE,
+} from '@/constants';
+import { useI18n } from '@/composables/useI18n';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import type { SimplifiedNodeType } from '@/Interface';
+import type { INodeTypeDescription } from 'n8n-workflow';
+import { NodeConnectionType } from 'n8n-workflow';
+import { useTemplatesStore } from '@/stores/templates.store';
+
+export interface NodeViewItemSection {
+	key: string;
+	title: string;
+	items: string[];
+}
+
+export interface NodeViewItem {
+	key: string;
+	type: string;
+	properties: {
+		name?: string;
+		title: string;
+		icon: string;
+		iconProps?: {
+			color?: string;
+		};
+		connectionType?: NodeConnectionType;
+		panelClass?: string;
+		group?: string[];
+		sections?: NodeViewItemSection[];
+		description?: string;
+		tag?: string;
+		forceIncludeNodes?: string[];
+	};
+	category?: string | string[];
+}
+
+interface NodeView {
+	value: string;
+	title: string;
+	info?: string;
+	subtitle?: string;
+	items: NodeViewItem[];
+}
+
+function getAiNodesBySubcategory(nodes: INodeTypeDescription[], subcategory: string) {
+	return nodes
+		.filter(
+			(node) => !node.hidden && node.codex?.subcategories?.[AI_SUBCATEGORY]?.includes(subcategory),
+		)
+		.map((node) => ({
+			key: node.name,
+			type: 'node',
+			properties: {
+				group: [],
+				name: node.name,
+				displayName: node.displayName,
+				title: node.displayName,
+				description: node.description,
+				// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+				icon: node.icon!,
+				iconData: node.name.toLowerCase().includes('openai')
+					? {
+							type: 'file',
+							icon: 'openai',
+							fileBuffer: '/static/open-ai.svg',
+						}
+					: undefined,
+			},
+		}))
+		.sort((a, b) => a.properties.displayName.localeCompare(b.properties.displayName));
+}
+
+export function AIView(_nodes: SimplifiedNodeType[]): NodeView {
+	const i18n = useI18n();
+	const nodeTypesStore = useNodeTypesStore();
+	const templatesStore = useTemplatesStore();
+
+	const chainNodes = getAiNodesBySubcategory(nodeTypesStore.allLatestNodeTypes, AI_CATEGORY_CHAINS);
+	const agentNodes = getAiNodesBySubcategory(nodeTypesStore.allLatestNodeTypes, AI_CATEGORY_AGENTS);
+
+	return {
+		value: AI_NODE_CREATOR_VIEW,
+		title: i18n.baseText('nodeCreator.aiPanel.aiNodes'),
+		subtitle: i18n.baseText('nodeCreator.aiPanel.selectAiNode'),
+		info: i18n.baseText('nodeCreator.aiPanel.infoBox', {
+			interpolate: { link: templatesStore.getWebsiteCategoryURL('ai') },
+		}),
+		items: [
+			...chainNodes,
+			...agentNodes,
+			{
+				key: AI_OTHERS_NODE_CREATOR_VIEW,
+				type: 'view',
+				properties: {
+					title: i18n.baseText('nodeCreator.aiPanel.aiOtherNodes'),
+					icon: 'robot',
+					description: i18n.baseText('nodeCreator.aiPanel.aiOtherNodesDescription'),
+				},
+			},
+		],
+	};
+}
+export function AINodesView(_nodes: SimplifiedNodeType[]): NodeView {
+	const i18n = useI18n();
+
+	function getAISubcategoryProperties(nodeConnectionType: NodeConnectionType) {
+		return {
+			connectionType: nodeConnectionType,
+			iconProps: {
+				color: `var(--node-type-${nodeConnectionType}-color)`,
+			},
+			panelClass: `nodes-list-panel-${nodeConnectionType}`,
+		};
+	}
+
+	return {
+		value: AI_OTHERS_NODE_CREATOR_VIEW,
+		title: i18n.baseText('nodeCreator.aiPanel.aiOtherNodes'),
+		subtitle: i18n.baseText('nodeCreator.aiPanel.selectAiNode'),
+		items: [
+			{
+				key: AI_CATEGORY_DOCUMENT_LOADERS,
+				type: 'subcategory',
+				properties: {
+					title: AI_CATEGORY_DOCUMENT_LOADERS,
+					icon: 'file-import',
+					...getAISubcategoryProperties(NodeConnectionType.AiDocument),
+				},
+			},
+			{
+				key: AI_CATEGORY_LANGUAGE_MODELS,
+				type: 'subcategory',
+				properties: {
+					title: AI_CATEGORY_LANGUAGE_MODELS,
+					icon: 'language',
+					...getAISubcategoryProperties(NodeConnectionType.AiLanguageModel),
+				},
+			},
+			{
+				key: AI_CATEGORY_MEMORY,
+				type: 'subcategory',
+				properties: {
+					title: AI_CATEGORY_MEMORY,
+					icon: 'brain',
+					...getAISubcategoryProperties(NodeConnectionType.AiMemory),
+				},
+			},
+			{
+				key: AI_CATEGORY_OUTPUTPARSER,
+				type: 'subcategory',
+				properties: {
+					title: AI_CATEGORY_OUTPUTPARSER,
+					icon: 'list',
+					...getAISubcategoryProperties(NodeConnectionType.AiOutputParser),
+				},
+			},
+			{
+				key: AI_CATEGORY_RETRIEVERS,
+				type: 'subcategory',
+				properties: {
+					title: AI_CATEGORY_RETRIEVERS,
+					icon: 'search',
+					...getAISubcategoryProperties(NodeConnectionType.AiRetriever),
+				},
+			},
+			{
+				key: AI_CATEGORY_TEXT_SPLITTERS,
+				type: 'subcategory',
+				properties: {
+					title: AI_CATEGORY_TEXT_SPLITTERS,
+					icon: 'grip-lines-vertical',
+					...getAISubcategoryProperties(NodeConnectionType.AiTextSplitter),
+				},
+			},
+			{
+				key: AI_CATEGORY_TOOLS,
+				type: 'subcategory',
+				properties: {
+					title: AI_CATEGORY_TOOLS,
+					icon: 'tools',
+					...getAISubcategoryProperties(NodeConnectionType.AiTool),
+				},
+			},
+			{
+				key: AI_CATEGORY_EMBEDDING,
+				type: 'subcategory',
+				properties: {
+					title: AI_CATEGORY_EMBEDDING,
+					icon: 'vector-square',
+					...getAISubcategoryProperties(NodeConnectionType.AiEmbedding),
+				},
+			},
+			{
+				key: AI_CATEGORY_VECTOR_STORES,
+				type: 'subcategory',
+				properties: {
+					title: AI_CATEGORY_VECTOR_STORES,
+					icon: 'project-diagram',
+					...getAISubcategoryProperties(NodeConnectionType.AiVectorStore),
+				},
+			},
+			{
+				key: AI_UNCATEGORIZED_CATEGORY,
+				type: 'subcategory',
+				properties: {
+					title: AI_UNCATEGORIZED_CATEGORY,
+					icon: 'code',
+				},
+			},
+		],
+	};
+}
+
+export function TriggerView(nodes: SimplifiedNodeType[]) {
+	const i18n = useI18n();
+
+	const view: NodeView = {
+		value: TRIGGER_NODE_CREATOR_VIEW,
+		title: i18n.baseText('nodeCreator.triggerHelperPanel.selectATrigger'),
+		subtitle: i18n.baseText('nodeCreator.triggerHelperPanel.selectATriggerDescription'),
+		items: [
+			{
+				key: DEFAULT_SUBCATEGORY,
+				type: 'subcategory',
+				properties: {
+					forceIncludeNodes: [WEBHOOK_NODE_TYPE, EMAIL_IMAP_NODE_TYPE],
+					title: 'App Trigger Nodes',
+					icon: 'satellite-dish',
+				},
+			},
+			{
+				key: SCHEDULE_TRIGGER_NODE_TYPE,
+				type: 'node',
+				category: [CORE_NODES_CATEGORY],
+				properties: {
+					group: [],
+					name: SCHEDULE_TRIGGER_NODE_TYPE,
+					displayName: i18n.baseText('nodeCreator.triggerHelperPanel.scheduleTriggerDisplayName'),
+					description: i18n.baseText('nodeCreator.triggerHelperPanel.scheduleTriggerDescription'),
+					icon: 'fa:clock',
+				},
+			},
+			{
+				key: WEBHOOK_NODE_TYPE,
+				type: 'node',
+				category: [CORE_NODES_CATEGORY],
+				properties: {
+					group: [],
+					name: WEBHOOK_NODE_TYPE,
+					displayName: i18n.baseText('nodeCreator.triggerHelperPanel.webhookTriggerDisplayName'),
+					description: i18n.baseText('nodeCreator.triggerHelperPanel.webhookTriggerDescription'),
+					iconData: {
+						type: 'file',
+						icon: 'webhook',
+						fileBuffer: '/static/webhook-icon.svg',
+					},
+				},
+			},
+			{
+				key: FORM_TRIGGER_NODE_TYPE,
+				type: 'node',
+				category: [CORE_NODES_CATEGORY],
+				properties: {
+					group: [],
+					name: FORM_TRIGGER_NODE_TYPE,
+					displayName: i18n.baseText('nodeCreator.triggerHelperPanel.formTriggerDisplayName'),
+					description: i18n.baseText('nodeCreator.triggerHelperPanel.formTriggerDescription'),
+					iconData: {
+						type: 'file',
+						icon: 'form',
+						fileBuffer: '/static/form-grey.svg',
+					},
+				},
+			},
+			{
+				key: MANUAL_TRIGGER_NODE_TYPE,
+				type: 'node',
+				category: [CORE_NODES_CATEGORY],
+				properties: {
+					group: [],
+					name: MANUAL_TRIGGER_NODE_TYPE,
+					displayName: i18n.baseText('nodeCreator.triggerHelperPanel.manualTriggerDisplayName'),
+					description: i18n.baseText('nodeCreator.triggerHelperPanel.manualTriggerDescription'),
+					icon: 'fa:mouse-pointer',
+				},
+			},
+			{
+				key: EXECUTE_WORKFLOW_TRIGGER_NODE_TYPE,
+				type: 'node',
+				category: [CORE_NODES_CATEGORY],
+				properties: {
+					group: [],
+					name: EXECUTE_WORKFLOW_TRIGGER_NODE_TYPE,
+					displayName: i18n.baseText('nodeCreator.triggerHelperPanel.workflowTriggerDisplayName'),
+					description: i18n.baseText('nodeCreator.triggerHelperPanel.workflowTriggerDescription'),
+					icon: 'fa:sign-out-alt',
+				},
+			},
+			{
+				type: 'subcategory',
+				key: OTHER_TRIGGER_NODES_SUBCATEGORY,
+				category: CORE_NODES_CATEGORY,
+				properties: {
+					title: OTHER_TRIGGER_NODES_SUBCATEGORY,
+					icon: 'folder-open',
+				},
+			},
+		],
+	};
+
+	return view;
+}
+
+export function RegularView(nodes: SimplifiedNodeType[]) {
+	const i18n = useI18n();
+
+	const view: NodeView = {
+		value: REGULAR_NODE_CREATOR_VIEW,
+		title: i18n.baseText('nodeCreator.triggerHelperPanel.whatHappensNext'),
+		items: [
+			{
+				key: DEFAULT_SUBCATEGORY,
+				type: 'subcategory',
+				properties: {
+					title: 'App Regular Nodes',
+					icon: 'globe',
+					forceIncludeNodes: [RSS_READ_NODE_TYPE, EMAIL_SEND_NODE_TYPE],
+				},
+			},
+			{
+				type: 'subcategory',
+				key: TRANSFORM_DATA_SUBCATEGORY,
+				category: CORE_NODES_CATEGORY,
+				properties: {
+					title: TRANSFORM_DATA_SUBCATEGORY,
+					icon: 'pen',
+					sections: [
+						{
+							key: 'popular',
+							title: i18n.baseText('nodeCreator.sectionNames.popular'),
+							items: [SET_NODE_TYPE, CODE_NODE_TYPE, DATETIME_NODE_TYPE],
+						},
+						{
+							key: 'addOrRemove',
+							title: i18n.baseText('nodeCreator.sectionNames.transform.addOrRemove'),
+							items: [
+								FILTER_NODE_TYPE,
+								REMOVE_DUPLICATES_NODE_TYPE,
+								SPLIT_OUT_NODE_TYPE,
+								LIMIT_NODE_TYPE,
+							],
+						},
+						{
+							key: 'combine',
+							title: i18n.baseText('nodeCreator.sectionNames.transform.combine'),
+							items: [SUMMARIZE_NODE_TYPE, AGGREGATE_NODE_TYPE, MERGE_NODE_TYPE],
+						},
+						{
+							key: 'convert',
+							title: i18n.baseText('nodeCreator.sectionNames.transform.convert'),
+							items: [
+								HTML_NODE_TYPE,
+								MARKDOWN_NODE_TYPE,
+								XML_NODE_TYPE,
+								CRYPTO_NODE_TYPE,
+								EXTRACT_FROM_FILE_NODE_TYPE,
+								CONVERT_TO_FILE_NODE_TYPE,
+								COMPRESSION_NODE_TYPE,
+								EDIT_IMAGE_NODE_TYPE,
+							],
+						},
+					],
+				},
+			},
+			{
+				type: 'subcategory',
+				key: FLOWS_CONTROL_SUBCATEGORY,
+				category: CORE_NODES_CATEGORY,
+				properties: {
+					title: FLOWS_CONTROL_SUBCATEGORY,
+					icon: 'code-branch',
+					sections: [
+						{
+							key: 'popular',
+							title: i18n.baseText('nodeCreator.sectionNames.popular'),
+							items: [FILTER_NODE_TYPE, IF_NODE_TYPE, SPLIT_IN_BATCHES_NODE_TYPE, MERGE_NODE_TYPE],
+						},
+					],
+				},
+			},
+			{
+				type: 'subcategory',
+				key: FILES_SUBCATEGORY,
+				category: CORE_NODES_CATEGORY,
+				properties: {
+					title: FILES_SUBCATEGORY,
+					icon: 'file-alt',
+					sections: [
+						{
+							key: 'popular',
+							title: i18n.baseText('nodeCreator.sectionNames.popular'),
+							items: [CONVERT_TO_FILE_NODE_TYPE, EXTRACT_FROM_FILE_NODE_TYPE],
+						},
+					],
+				},
+			},
+			{
+				type: 'subcategory',
+				key: HELPERS_SUBCATEGORY,
+				category: CORE_NODES_CATEGORY,
+				properties: {
+					title: HELPERS_SUBCATEGORY,
+					icon: 'toolbox',
+					sections: [
+						{
+							key: 'popular',
+							title: i18n.baseText('nodeCreator.sectionNames.popular'),
+							items: [HTTP_REQUEST_NODE_TYPE, WEBHOOK_NODE_TYPE, CODE_NODE_TYPE],
+						},
+					],
+				},
+			},
+		],
+	};
+
+	const hasAINodes = (nodes ?? []).some((node) => node.codex?.categories?.includes(AI_SUBCATEGORY));
+	if (hasAINodes)
+		view.items.push({
+			key: AI_NODE_CREATOR_VIEW,
+			type: 'view',
+			properties: {
+				title: i18n.baseText('nodeCreator.aiPanel.langchainAiNodes'),
+				icon: 'robot',
+				description: i18n.baseText('nodeCreator.aiPanel.nodesForAi'),
+				tag: i18n.baseText('nodeCreator.aiPanel.newTag'),
+			},
+		});
+
+	view.items.push({
+		key: TRIGGER_NODE_CREATOR_VIEW,
+		type: 'view',
+		properties: {
+			title: i18n.baseText('nodeCreator.triggerHelperPanel.addAnotherTrigger'),
+			icon: 'bolt',
+			description: i18n.baseText('nodeCreator.triggerHelperPanel.addAnotherTriggerDescription'),
+		},
+	});
+
+	return view;
+}
diff --git a/packages/editor-ui/src/components/NodeCredentials.vue b/packages/editor-ui/src/components/NodeCredentials.vue
index 134a1d64d36d4..1d236f6a2b443 100644
--- a/packages/editor-ui/src/components/NodeCredentials.vue
+++ b/packages/editor-ui/src/components/NodeCredentials.vue
@@ -15,9 +15,9 @@
 				color="text-dark"
 				data-test-id="credentials-label"
 			>
-				<div v-if="readonly || isReadOnly">
+				<div v-if="readonly">
 					<n8n-input
-						:value="getSelectedName(credentialTypeDescription.name)"
+						:model-value="getSelectedName(credentialTypeDescription.name)"
 						disabled
 						size="small"
 						data-test-id="node-credentials-select"
@@ -29,8 +29,10 @@
 					data-test-id="node-credentials-select"
 				>
 					<n8n-select
-						:value="getSelectedId(credentialTypeDescription.name)"
-						@change="
+						:model-value="getSelectedId(credentialTypeDescription.name)"
+						:placeholder="getSelectPlaceholder(credentialTypeDescription.name, issues)"
+						size="small"
+						@update:model-value="
 							(value) =>
 								onCredentialSelected(
 									credentialTypeDescription.name,
@@ -39,14 +41,13 @@
 								)
 						"
 						@blur="$emit('blur', 'credentials')"
-						:placeholder="getSelectPlaceholder(credentialTypeDescription.name, issues)"
-						size="small"
 					>
 						<n8n-option
 							v-for="item in getCredentialOptions(
 								getAllRelatedCredentialTypes(credentialTypeDescription),
 							)"
 							:key="item.id"
+							:data-test-id="`node-credentials-select-item-${item.id}`"
 							:label="item.name"
 							:value="item.id"
 						>
@@ -57,16 +58,17 @@
 						</n8n-option>
 						<n8n-option
 							:key="NEW_CREDENTIALS_TEXT"
+							data-test-id="node-credentials-select-item-new"
 							:value="NEW_CREDENTIALS_TEXT"
 							:label="NEW_CREDENTIALS_TEXT"
 						>
 						</n8n-option>
 					</n8n-select>
 
-					<div :class="$style.warning" v-if="issues.length && !hideIssues">
+					<div v-if="issues.length && !hideIssues" :class="$style.warning">
 						<n8n-tooltip placement="top">
 							<template #content>
-								<titled-list
+								<TitledList
 									:title="`${$locale.baseText('nodeCredentials.issues')}:`"
 									:items="issues"
 								/>
@@ -76,18 +78,18 @@
 					</div>
 
 					<div
-						:class="$style.edit"
 						v-if="
 							selected[credentialTypeDescription.name] &&
 							isCredentialExisting(credentialTypeDescription.name)
 						"
+						:class="$style.edit"
 						data-test-id="credential-edit-button"
 					>
 						<font-awesome-icon
 							icon="pen"
-							@click="editCredential(credentialTypeDescription.name)"
 							class="clickable"
 							:title="$locale.baseText('nodeCredentials.updateCredential')"
+							@click="editCredential(credentialTypeDescription.name)"
 						/>
 					</div>
 				</div>
@@ -97,7 +99,9 @@
 </template>
 
 <script lang="ts">
+import { defineComponent } from 'vue';
 import type { PropType } from 'vue';
+import { mapStores } from 'pinia';
 import type {
 	ICredentialsResponse,
 	INodeUi,
@@ -113,21 +117,17 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
-import { genericHelpers } from '@/mixins/genericHelpers';
-import { nodeHelpers } from '@/mixins/nodeHelpers';
-import { showMessage } from '@/mixins/showMessage';
+import { useNodeHelpers } from '@/composables/useNodeHelpers';
+import { useToast } from '@/composables/useToast';
 
 import TitledList from '@/components/TitledList.vue';
-
-import mixins from 'vue-typed-mixins';
-import { mapStores } from 'pinia';
-import { useUIStore } from '@/stores/ui';
-import { useUsersStore } from '@/stores/users';
-import { useWorkflowsStore } from '@/stores/workflows';
-import { useNodeTypesStore } from '@/stores/nodeTypes';
-import { useCredentialsStore } from '@/stores/credentials';
-import { useNDVStore } from '@/stores/ndv';
-import { KEEP_AUTH_IN_NDV_FOR_NODES } from '@/constants';
+import { useUIStore } from '@/stores/ui.store';
+import { useUsersStore } from '@/stores/users.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import { useCredentialsStore } from '@/stores/credentials.store';
+import { useNDVStore } from '@/stores/ndv.store';
+import { CREDENTIAL_ONLY_NODE_PREFIX, KEEP_AUTH_IN_NDV_FOR_NODES } from '@/constants';
 import {
 	getAuthTypeForNodeCredential,
 	getMainAuthField,
@@ -135,14 +135,17 @@ import {
 	getAllNodeCredentialForAuthType,
 	updateNodeAuthType,
 	isRequiredCredential,
-} from '@/utils';
+} from '@/utils/nodeTypesUtils';
 
 interface CredentialDropdownOption extends ICredentialsResponse {
 	typeDisplayName: string;
 }
 
-export default mixins(genericHelpers, nodeHelpers, showMessage).extend({
+export default defineComponent({
 	name: 'NodeCredentials',
+	components: {
+		TitledList,
+	},
 	props: {
 		readonly: {
 			type: Boolean,
@@ -164,8 +167,13 @@ export default mixins(genericHelpers, nodeHelpers, showMessage).extend({
 			default: false,
 		},
 	},
-	components: {
-		TitledList,
+	setup() {
+		const nodeHelpers = useNodeHelpers();
+
+		return {
+			...useToast(),
+			nodeHelpers,
+		};
 	},
 	data() {
 		return {
@@ -174,6 +182,34 @@ export default mixins(genericHelpers, nodeHelpers, showMessage).extend({
 			listeningForAuthChange: false,
 		};
 	},
+	watch: {
+		'node.parameters': {
+			immediate: true,
+			deep: true,
+			handler(newValue: INodeParameters, oldValue: INodeParameters) {
+				// When active node parameters change, check if authentication type has been changed
+				// and set `subscribedToCredentialType` to corresponding credential type
+				const isActive = this.node.name === this.ndvStore.activeNode?.name;
+				const nodeType = this.nodeType;
+				// Only do this for active node and if it's listening for auth change
+				if (isActive && nodeType && this.listeningForAuthChange) {
+					if (this.mainNodeAuthField && oldValue && newValue) {
+						const newAuth = newValue[this.mainNodeAuthField.name];
+
+						if (newAuth) {
+							const credentialType = getNodeCredentialForSelectedAuthType(
+								nodeType,
+								newAuth.toString(),
+							);
+							if (credentialType) {
+								this.subscribedToCredentialType = credentialType.name;
+							}
+						}
+					}
+				}
+			},
+		},
+	},
 	mounted() {
 		// Listen for credentials store changes so credential selection can be updated if creds are changed from the modal
 		this.credentialsStore.$onAction(({ name, after, store, args }) => {
@@ -233,34 +269,6 @@ export default mixins(genericHelpers, nodeHelpers, showMessage).extend({
 			});
 		});
 	},
-	watch: {
-		'node.parameters': {
-			immediate: true,
-			deep: true,
-			handler(newValue: INodeParameters, oldValue: INodeParameters) {
-				// When active node parameters change, check if authentication type has been changed
-				// and set `subscribedToCredentialType` to corresponding credential type
-				const isActive = this.node.name === this.ndvStore.activeNode?.name;
-				const nodeType = this.nodeTypesStore.getNodeType(this.node.type, this.node.typeVersion);
-				// Only do this for active node and if it's listening for auth change
-				if (isActive && nodeType && this.listeningForAuthChange) {
-					if (this.mainNodeAuthField && oldValue && newValue) {
-						const newAuth = newValue[this.mainNodeAuthField.name];
-
-						if (newAuth) {
-							const credentialType = getNodeCredentialForSelectedAuthType(
-								nodeType,
-								newAuth.toString(),
-							);
-							if (credentialType) {
-								this.subscribedToCredentialType = credentialType.name;
-							}
-						}
-					}
-				}
-			},
-		},
-	},
 	computed: {
 		...mapStores(
 			useCredentialsStore,
@@ -284,14 +292,12 @@ export default mixins(genericHelpers, nodeHelpers, showMessage).extend({
 			});
 		},
 		credentialTypesNodeDescription(): INodeCredentialDescription[] {
-			const node = this.node as INodeUi;
-
 			const credType = this.credentialsStore.getCredentialTypeByName(this.overrideCredType);
 
 			if (credType) return [credType];
 
-			const activeNodeType = this.nodeTypesStore.getNodeType(node.type, node.typeVersion);
-			if (activeNodeType && activeNodeType.credentials) {
+			const activeNodeType = this.nodeType;
+			if (activeNodeType?.credentials) {
 				return activeNodeType.credentials;
 			}
 
@@ -301,11 +307,12 @@ export default mixins(genericHelpers, nodeHelpers, showMessage).extend({
 			const returnData: {
 				[key: string]: string;
 			} = {};
-			let credentialType: ICredentialType | null;
+			let credentialType: ICredentialType | undefined;
 			for (const credentialTypeName of this.credentialTypesNode) {
 				credentialType = this.credentialsStore.getCredentialTypeByName(credentialTypeName);
-				returnData[credentialTypeName] =
-					credentialType !== null ? credentialType.displayName : credentialTypeName;
+				returnData[credentialTypeName] = credentialType
+					? credentialType.displayName
+					: credentialTypeName;
 			}
 			return returnData;
 		},
@@ -338,10 +345,13 @@ export default mixins(genericHelpers, nodeHelpers, showMessage).extend({
 			let options: CredentialDropdownOption[] = [];
 			types.forEach((type) => {
 				options = options.concat(
-					this.credentialsStore.allUsableCredentialsByType[type].map((option: any) => ({
-						...option,
-						typeDisplayName: this.credentialsStore.getCredentialTypeByName(type).displayName,
-					})),
+					this.credentialsStore.allUsableCredentialsByType[type].map(
+						(option: ICredentialsResponse) =>
+							({
+								...option,
+								typeDisplayName: this.credentialsStore.getCredentialTypeByName(type)?.displayName,
+							}) as CredentialDropdownOption,
+					),
 				);
 			});
 			return options;
@@ -359,7 +369,7 @@ export default mixins(genericHelpers, nodeHelpers, showMessage).extend({
 			return issues.length && this.getSelectedName(type)
 				? this.$locale.baseText('nodeCredentials.selectedCredentialUnavailable', {
 						interpolate: { name: this.getSelectedName(type) },
-				  })
+					})
 				: this.$locale.baseText('nodeCredentials.selectCredential');
 		},
 		credentialInputWrapperStyle(credentialType: string) {
@@ -422,17 +432,16 @@ export default mixins(genericHelpers, nodeHelpers, showMessage).extend({
 			this.$telemetry.track('User selected credential from node modal', {
 				credential_type: credentialType,
 				node_type: this.node.type,
-				...(this.hasProxyAuth(this.node) ? { is_service_specific: true } : {}),
+				...(this.nodeHelpers.hasProxyAuth(this.node) ? { is_service_specific: true } : {}),
 				workflow_id: this.workflowsStore.workflowId,
 				credential_id: credentialId,
 			});
 
 			const selectedCredentials = this.credentialsStore.getCredentialById(credentialId);
 			const selectedCredentialsType = this.showAll ? selectedCredentials.type : credentialType;
-			const oldCredentials =
-				this.node.credentials && this.node.credentials[selectedCredentialsType]
-					? this.node.credentials[selectedCredentialsType]
-					: {};
+			const oldCredentials = this.node.credentials?.[selectedCredentialsType]
+				? this.node.credentials[selectedCredentialsType]
+				: {};
 
 			const selected = { id: selectedCredentials.id, name: selectedCredentials.name };
 
@@ -451,8 +460,8 @@ export default mixins(genericHelpers, nodeHelpers, showMessage).extend({
 					invalid: oldCredentials,
 					type: selectedCredentialsType,
 				});
-				this.updateNodesCredentialsIssues();
-				this.$showMessage({
+				this.nodeHelpers.updateNodesCredentialsIssues();
+				this.showMessage({
 					title: this.$locale.baseText('nodeCredentials.showMessage.title'),
 					message: this.$locale.baseText('nodeCredentials.showMessage.message', {
 						interpolate: {
@@ -502,13 +511,18 @@ export default mixins(genericHelpers, nodeHelpers, showMessage).extend({
 				// If it is not defined no need to do a proper check
 				return true;
 			}
-			return this.displayParameter(this.node.parameters, credentialTypeDescription, '', this.node);
+			return this.nodeHelpers.displayParameter(
+				this.node.parameters,
+				credentialTypeDescription,
+				'',
+				this.node,
+			);
 		},
 
 		getIssues(credentialTypeName: string): string[] {
-			const node = this.node as INodeUi;
+			const node = this.node;
 
-			if (node.issues === undefined || node.issues.credentials === undefined) {
+			if (node.issues?.credentials === undefined) {
 				return [];
 			}
 
@@ -519,11 +533,7 @@ export default mixins(genericHelpers, nodeHelpers, showMessage).extend({
 		},
 
 		isCredentialExisting(credentialType: string): boolean {
-			if (
-				!this.node.credentials ||
-				!this.node.credentials[credentialType] ||
-				!this.node.credentials[credentialType].id
-			) {
+			if (!this.node.credentials?.[credentialType]?.id) {
 				return false;
 			}
 			const { id } = this.node.credentials[credentialType];
@@ -545,19 +555,25 @@ export default mixins(genericHelpers, nodeHelpers, showMessage).extend({
 			this.subscribedToCredentialType = credentialType;
 		},
 		showMixedCredentials(credentialType: INodeCredentialDescription): boolean {
-			const nodeType = this.nodeTypesStore.getNodeType(this.node.type, this.node.typeVersion);
+			const nodeType = this.nodeType;
 			const isRequired = isRequiredCredential(nodeType, credentialType);
 
 			return !KEEP_AUTH_IN_NDV_FOR_NODES.includes(this.node.type || '') && isRequired;
 		},
 		getCredentialsFieldLabel(credentialType: INodeCredentialDescription): string {
+			if (credentialType.displayName) return credentialType.displayName;
 			const credentialTypeName = this.credentialTypeNames[credentialType.name];
+			const isCredentialOnlyNode = this.node.type.startsWith(CREDENTIAL_ONLY_NODE_PREFIX);
+
+			if (isCredentialOnlyNode) {
+				return this.$locale.baseText('nodeCredentials.credentialFor', {
+					interpolate: { credentialType: this.nodeType?.displayName ?? credentialTypeName },
+				});
+			}
 
 			if (!this.showMixedCredentials(credentialType)) {
 				return this.$locale.baseText('nodeCredentials.credentialFor', {
-					interpolate: {
-						credentialType: credentialTypeName,
-					},
+					interpolate: { credentialType: credentialTypeName },
 				});
 			}
 			return this.$locale.baseText('nodeCredentials.credentialsLabel');
diff --git a/packages/editor-ui/src/components/NodeDetailsView.vue b/packages/editor-ui/src/components/NodeDetailsView.vue
index f1e6ba2239269..35dbd60dd995a 100644
--- a/packages/editor-ui/src/components/NodeDetailsView.vue
+++ b/packages/editor-ui/src/components/NodeDetailsView.vue
@@ -1,26 +1,26 @@
 <template>
 	<el-dialog
-		:visible="(!!activeNode || renaming) && !isActiveStickyNode"
+		:model-value="(!!activeNode || renaming) && !isActiveStickyNode"
 		:before-close="close"
 		:show-close="false"
-		custom-class="data-display-wrapper"
-		class="ndv-wrapper"
+		class="data-display-wrapper ndv-wrapper"
+		overlay-class="data-display-overlay"
 		width="auto"
 		append-to-body
 		data-test-id="ndv"
+		:data-has-output-connection="hasOutputConnection"
 	>
 		<n8n-tooltip
 			placement="bottom-start"
-			:value="showTriggerWaitingWarning"
+			:visible="showTriggerWaitingWarning"
 			:disabled="!showTriggerWaitingWarning"
-			manual
 		>
 			<template #content>
 				<div :class="$style.triggerWarning">
 					{{ $locale.baseText('ndv.backToCanvas.waitingForTriggerWarning') }}
 				</div>
 			</template>
-			<div :class="$style.backToCanvas" @click="close" data-test-id="back-to-canvas">
+			<div :class="$style.backToCanvas" data-test-id="back-to-canvas" @click="close">
 				<n8n-icon icon="arrow-left" color="text-xlight" size="medium" />
 				<n8n-text color="text-xlight" size="medium" :bold="true">
 					{{ $locale.baseText('ndv.backToCanvas') }}
@@ -30,89 +30,102 @@
 
 		<div
 			v-if="activeNode"
-			class="data-display"
 			ref="container"
-			@keydown.capture="onKeyDown"
+			class="data-display"
 			tabindex="0"
+			@keydown.capture="onKeyDown"
 		>
-			<div @click="close" :class="$style.modalBackground"></div>
+			<div :class="$style.modalBackground" @click="close"></div>
 			<NDVDraggablePanels
-				:isTriggerNode="isTriggerNode"
-				:hideInputAndOutput="activeNodeType === null"
+				:key="activeNode.name"
+				:is-trigger-node="isTriggerNode"
+				:hide-input-and-output="activeNodeType === null"
 				:position="isTriggerNode && !showTriggerPanel ? 0 : undefined"
-				:isDraggable="!isTriggerNode"
-				:nodeType="activeNodeType"
+				:is-draggable="!isTriggerNode"
+				:has-double-width="activeNodeType?.parameterPane === 'wide'"
+				:node-type="activeNodeType"
+				@switch-selected-node="onSwitchSelectedNode"
+				@open-connection-node-creator="onOpenConnectionNodeCreator"
 				@close="close"
 				@init="onPanelsInit"
 				@dragstart="onDragStart"
 				@dragend="onDragEnd"
 			>
-				<template #input>
+				<template v-if="showTriggerPanel || !isTriggerNode" #input>
 					<TriggerPanel
 						v-if="showTriggerPanel"
-						:nodeName="activeNode.name"
-						:sessionId="sessionId"
+						:node-name="activeNode.name"
+						:push-ref="pushRef"
 						@execute="onNodeExecute"
 						@activate="onWorkflowActivate"
 					/>
 					<InputPanel
 						v-else-if="!isTriggerNode"
 						:workflow="workflow"
-						:canLinkRuns="canLinkRuns"
-						:runIndex="inputRun"
-						:linkedRuns="linked"
-						:currentNodeName="inputNodeName"
-						:sessionId="sessionId"
-						:readOnly="readOnly || hasForeignCredential"
-						:isProductionExecutionPreview="isProductionExecutionPreview"
-						@linkRun="onLinkRunToInput"
-						@unlinkRun="() => onUnlinkRun('input')"
-						@runChange="onRunInputIndexChange"
-						@openSettings="openSettings"
-						@select="onInputSelect"
+						:can-link-runs="canLinkRuns"
+						:run-index="inputRun"
+						:linked-runs="linked"
+						:current-node-name="inputNodeName"
+						:push-ref="pushRef"
+						:read-only="readOnly || hasForeignCredential"
+						:is-production-execution-preview="isProductionExecutionPreview"
+						:is-pane-active="isInputPaneActive"
+						@activate-pane="activateInputPane"
+						@link-run="onLinkRunToInput"
+						@unlink-run="() => onUnlinkRun('input')"
+						@run-change="onRunInputIndexChange"
+						@open-settings="openSettings"
+						@change-input-node="onInputNodeChange"
 						@execute="onNodeExecute"
-						@tableMounted="onInputTableMounted"
-						@itemHover="onInputItemHover"
+						@table-mounted="onInputTableMounted"
+						@item-hover="onInputItemHover"
+						@search="onSearch"
 					/>
 				</template>
 				<template #output>
 					<OutputPanel
 						data-test-id="output-panel"
-						:canLinkRuns="canLinkRuns"
-						:runIndex="outputRun"
-						:linkedRuns="linked"
-						:sessionId="sessionId"
-						:isReadOnly="readOnly || hasForeignCredential"
-						:blockUI="blockUi && isTriggerNode && !isExecutableTriggerNode"
-						:isProductionExecutionPreview="isProductionExecutionPreview"
-						@linkRun="onLinkRunToOutput"
-						@unlinkRun="() => onUnlinkRun('output')"
-						@runChange="onRunOutputIndexChange"
-						@openSettings="openSettings"
-						@tableMounted="onOutputTableMounted"
-						@itemHover="onOutputItemHover"
+						:can-link-runs="canLinkRuns"
+						:run-index="outputRun"
+						:linked-runs="linked"
+						:push-ref="pushRef"
+						:is-read-only="readOnly || hasForeignCredential"
+						:block-u-i="blockUi && isTriggerNode && !isExecutableTriggerNode"
+						:is-production-execution-preview="isProductionExecutionPreview"
+						:is-pane-active="isOutputPaneActive"
+						@activate-pane="activateOutputPane"
+						@link-run="onLinkRunToOutput"
+						@unlink-run="() => onUnlinkRun('output')"
+						@run-change="onRunOutputIndexChange"
+						@open-settings="openSettings"
+						@table-mounted="onOutputTableMounted"
+						@item-hover="onOutputItemHover"
+						@search="onSearch"
 					/>
 				</template>
 				<template #main>
 					<NodeSettings
-						:eventBus="settingsEventBus"
+						:event-bus="settingsEventBus"
 						:dragging="isDragging"
-						:sessionId="sessionId"
-						:nodeType="activeNodeType"
-						:foreignCredentials="foreignCredentials"
-						:readOnly="readOnly"
-						:blockUI="blockUi && showTriggerPanel"
+						:push-ref="pushRef"
+						:node-type="activeNodeType"
+						:foreign-credentials="foreignCredentials"
+						:read-only="readOnly"
+						:block-u-i="blockUi && showTriggerPanel"
 						:executable="!readOnly"
-						@valueChanged="valueChanged"
+						@value-changed="valueChanged"
 						@execute="onNodeExecute"
-						@stopExecution="onStopExecution"
+						@stop-execution="onStopExecution"
+						@redraw-required="redrawRequired = true"
 						@activate="onWorkflowActivate"
+						@switch-selected-node="onSwitchSelectedNode"
+						@open-connection-node-creator="onOpenConnectionNodeCreator"
 					/>
 					<a
 						v-if="featureRequestUrl"
-						@click="onFeatureRequestClick"
 						:class="$style.featureRequest"
 						target="_blank"
+						@click="onFeatureRequestClick"
 					>
 						<font-awesome-icon icon="lightbulb" />
 						{{ $locale.baseText('ndv.featureRequest') }}
@@ -124,24 +137,23 @@
 </template>
 
 <script lang="ts">
+import { defineComponent } from 'vue';
+import { mapStores, storeToRefs } from 'pinia';
+import { createEventBus } from 'n8n-design-system/utils';
 import type {
 	INodeConnections,
 	INodeTypeDescription,
 	IRunData,
 	IRunExecutionData,
 	Workflow,
+	ConnectionTypes,
 } from 'n8n-workflow';
-import { jsonParse } from 'n8n-workflow';
+import { jsonParse, NodeHelpers, NodeConnectionType } from 'n8n-workflow';
 import type { IExecutionResponse, INodeUi, IUpdateInformation, TargetItem } from '@/Interface';
 
-import { externalHooks } from '@/mixins/externalHooks';
-import { nodeHelpers } from '@/mixins/nodeHelpers';
-import { workflowHelpers } from '@/mixins/workflowHelpers';
-
 import NodeSettings from '@/components/NodeSettings.vue';
 import NDVDraggablePanels from './NDVDraggablePanels.vue';
 
-import mixins from 'vue-typed-mixins';
 import OutputPanel from './OutputPanel.vue';
 import InputPanel from './InputPanel.vue';
 import TriggerPanel from './TriggerPanel.vue';
@@ -149,27 +161,26 @@ import {
 	BASE_NODE_SURVEY_URL,
 	EnterpriseEditionFeature,
 	EXECUTABLE_TRIGGER_NODE_TYPES,
+	MODAL_CONFIRM,
 	START_NODE_TYPE,
 	STICKY_NODE_TYPE,
 } from '@/constants';
 import { workflowActivate } from '@/mixins/workflowActivate';
-import { pinData } from '@/mixins/pinData';
-import { createEventBus, dataPinningEventBus } from '@/event-bus';
-import { mapStores } from 'pinia';
-import { useWorkflowsStore } from '@/stores/workflows';
-import { useNDVStore } from '@/stores/ndv';
-import { useNodeTypesStore } from '@/stores/nodeTypes';
-import { useUIStore } from '@/stores/ui';
-import { useSettingsStore } from '@/stores/settings';
-import useDeviceSupport from '@/composables/useDeviceSupport';
-
-export default mixins(
-	externalHooks,
-	nodeHelpers,
-	workflowHelpers,
-	workflowActivate,
-	pinData,
-).extend({
+import { dataPinningEventBus } from '@/event-bus';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useNDVStore } from '@/stores/ndv.store';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import { useUIStore } from '@/stores/ui.store';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useDeviceSupport } from 'n8n-design-system';
+import { useNodeHelpers } from '@/composables/useNodeHelpers';
+import { useMessage } from '@/composables/useMessage';
+import { useExternalHooks } from '@/composables/useExternalHooks';
+import { usePinnedData } from '@/composables/usePinnedData';
+import { useRouter } from 'vue-router';
+import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
+
+export default defineComponent({
 	name: 'NodeDetailsView',
 	components: {
 		NodeSettings,
@@ -178,6 +189,7 @@ export default mixins(
 		NDVDraggablePanels,
 		TriggerPanel,
 	},
+	mixins: [workflowActivate],
 	props: {
 		readOnly: {
 			type: Boolean,
@@ -190,14 +202,30 @@ export default mixins(
 			default: false,
 		},
 	},
-	setup() {
+	setup(props, ctx) {
+		const ndvStore = useNDVStore();
+		const externalHooks = useExternalHooks();
+		const nodeHelpers = useNodeHelpers();
+		const { activeNode } = storeToRefs(ndvStore);
+		const pinnedData = usePinnedData(activeNode);
+		const router = useRouter();
+		const workflowHelpers = useWorkflowHelpers({ router });
+
 		return {
+			externalHooks,
+			nodeHelpers,
+			pinnedData,
+			workflowHelpers,
 			...useDeviceSupport(),
+			...useMessage(),
+			// eslint-disable-next-line @typescript-eslint/no-misused-promises
+			...workflowActivate.setup?.(props, ctx),
 		};
 	},
 	data() {
 		return {
 			settingsEventBus: createEventBus(),
+			redrawRequired: false,
 			runInputIndex: -1,
 			runOutputIndex: -1,
 			isLinkingEnabled: true,
@@ -208,18 +236,21 @@ export default mixins(
 			pinDataDiscoveryTooltipVisible: false,
 			avgInputRowHeight: 0,
 			avgOutputRowHeight: 0,
+			isInputPaneActive: false,
+			isOutputPaneActive: false,
+			isPairedItemHoveringEnabled: true,
 		};
 	},
 	mounted() {
 		dataPinningEventBus.on('data-pinning-discovery', this.setIsTooltipVisible);
 	},
-	destroyed() {
+	beforeUnmount() {
 		dataPinningEventBus.off('data-pinning-discovery', this.setIsTooltipVisible);
 	},
 	computed: {
 		...mapStores(useNodeTypesStore, useNDVStore, useUIStore, useWorkflowsStore, useSettingsStore),
-		sessionId(): string {
-			return this.ndvStore.sessionId;
+		pushRef(): string {
+			return this.ndvStore.pushRef;
 		},
 		workflowRunning(): boolean {
 			return this.uiStore.isActionActive('workflowRunning');
@@ -253,15 +284,29 @@ export default mixins(
 			return null;
 		},
 		showTriggerPanel(): boolean {
+			const override = !!this.activeNodeType?.triggerPanel;
+			if (typeof this.activeNodeType?.triggerPanel === 'boolean') {
+				return override;
+			}
+
 			const isWebhookBasedNode = !!this.activeNodeType?.webhooks?.length;
 			const isPollingNode = this.activeNodeType?.polling;
-			const override = !!this.activeNodeType?.triggerPanel;
+
 			return (
 				!this.readOnly && this.isTriggerNode && (isWebhookBasedNode || isPollingNode || override)
 			);
 		},
 		workflow(): Workflow {
-			return this.getCurrentWorkflow();
+			return this.workflowHelpers.getCurrentWorkflow();
+		},
+		hasOutputConnection() {
+			if (!this.activeNode) return false;
+			const outgoingConnections = this.workflowsStore.outgoingConnectionsByNodeName(
+				this.activeNode.name,
+			) as INodeConnections;
+
+			// Check if there's at-least one output connection
+			return (Object.values(outgoingConnections)?.[0]?.[0] ?? []).length > 0;
 		},
 		parentNodes(): string[] {
 			if (this.activeNode) {
@@ -273,6 +318,19 @@ export default mixins(
 			return [];
 		},
 		parentNode(): string | undefined {
+			// Return the first parent node that contains data
+			for (const parentNodeName of this.parentNodes) {
+				// Check first for pinned data
+				if (this.workflowsStore.pinnedWorkflowData[parentNodeName]) {
+					return parentNodeName;
+				}
+
+				// Check then the data of the current execution
+				if (this.workflowRunData?.[parentNodeName]) {
+					return parentNodeName;
+				}
+			}
+
 			return this.parentNodes[0];
 		},
 		isExecutableTriggerNode(): boolean {
@@ -298,7 +356,7 @@ export default mixins(
 				return null;
 			}
 			const executionData: IRunExecutionData | undefined = this.workflowExecution.data;
-			if (executionData && executionData.resultData) {
+			if (executionData?.resultData) {
 				return executionData.resultData.runData;
 			}
 			return null;
@@ -328,18 +386,27 @@ export default mixins(
 			return Math.min(this.runOutputIndex, this.maxOutputRun);
 		},
 		maxInputRun(): number {
-			if (this.inputNode === null) {
+			if (this.inputNode === null || this.activeNode === null) {
 				return 0;
 			}
 
+			const workflowNode = this.workflow.getNode(this.activeNode.name);
+			const outputs = NodeHelpers.getNodeOutputs(this.workflow, workflowNode, this.activeNodeType);
+
+			let node = this.inputNode;
+
 			const runData: IRunData | null = this.workflowRunData;
 
-			if (runData === null || !runData.hasOwnProperty(this.inputNode.name)) {
+			if (outputs.some((output) => output !== NodeConnectionType.Main)) {
+				node = this.activeNode;
+			}
+
+			if (!node || !runData || !runData.hasOwnProperty(node.name)) {
 				return 0;
 			}
 
-			if (runData[this.inputNode.name].length) {
-				return runData[this.inputNode.name].length - 1;
+			if (runData[node.name].length) {
+				return runData[node.name].length - 1;
 			}
 
 			return 0;
@@ -409,8 +476,8 @@ export default mixins(
 		},
 	},
 	watch: {
-		activeNode(node: INodeUi | null) {
-			if (node && !this.isActiveStickyNode) {
+		activeNode(node: INodeUi | null, oldNode: INodeUi | null) {
+			if (node && node.name !== oldNode?.name && !this.isActiveStickyNode) {
 				this.runInputIndex = -1;
 				this.runOutputIndex = -1;
 				this.isLinkingEnabled = true;
@@ -419,21 +486,25 @@ export default mixins(
 				this.avgOutputRowHeight = 0;
 				this.avgInputRowHeight = 0;
 
-				setTimeout(this.ndvStore.setNDVSessionId, 0);
-				this.$externalHooks().run('dataDisplay.nodeTypeChanged', {
-					nodeSubtitle: this.getNodeSubtitle(node, this.activeNodeType, this.getCurrentWorkflow()),
+				setTimeout(() => this.ndvStore.setNDVPushRef(), 0);
+				void this.externalHooks.run('dataDisplay.nodeTypeChanged', {
+					nodeSubtitle: this.nodeHelpers.getNodeSubtitle(
+						node,
+						this.activeNodeType,
+						this.workflowHelpers.getCurrentWorkflow(),
+					),
 				});
 
 				setTimeout(() => {
 					if (this.activeNode) {
 						const outgoingConnections = this.workflowsStore.outgoingConnectionsByNodeName(
 							this.activeNode.name,
-						) as INodeConnections;
+						);
 
 						this.$telemetry.track('User opened node modal', {
 							node_type: this.activeNodeType ? this.activeNodeType.name : '',
 							workflow_id: this.workflowsStore.workflowId,
-							session_id: this.sessionId,
+							push_ref: this.pushRef,
 							is_editable: !this.hasForeignCredential,
 							parameters_pane_position: this.mainPanelPosition,
 							input_first_connector_runs: this.maxInputRun,
@@ -443,8 +514,7 @@ export default mixins(
 								: this.ndvStore.inputPanelDisplayMode,
 							selected_view_outputs: this.ndvStore.outputPanelDisplayMode,
 							input_connectors: this.parentNodes.length,
-							output_connectors:
-								outgoingConnections && outgoingConnections.main && outgoingConnections.main.length,
+							output_connectors: outgoingConnections?.main?.length,
 							input_displayed_run_index: this.inputRun,
 							output_displayed_run_index: this.outputRun,
 							data_pinning_tooltip_presented: this.pinDataDiscoveryTooltipVisible,
@@ -490,10 +560,7 @@ export default mixins(
 			}
 		},
 		onInputItemHover(e: { itemIndex: number; outputIndex: number } | null) {
-			if (!this.inputNodeName) {
-				return;
-			}
-			if (e === null) {
+			if (e === null || !this.inputNodeName || !this.isPairedItemHoveringEnabled) {
 				this.ndvStore.setHoveringItem(null);
 				return;
 			}
@@ -507,7 +574,7 @@ export default mixins(
 			this.ndvStore.setHoveringItem(item);
 		},
 		onOutputItemHover(e: { itemIndex: number; outputIndex: number } | null) {
-			if (e === null || !this.activeNode) {
+			if (e === null || !this.activeNode || !this.isPairedItemHoveringEnabled) {
 				this.ndvStore.setHoveringItem(null);
 				return;
 			}
@@ -529,7 +596,7 @@ export default mixins(
 		onWorkflowActivate() {
 			this.ndvStore.activeNodeName = null;
 			setTimeout(() => {
-				this.activateCurrentWorkflow('ndv');
+				void this.activateCurrentWorkflow('ndv');
 			}, 1000);
 		},
 		onFeatureRequestClick() {
@@ -538,8 +605,8 @@ export default mixins(
 				this.$telemetry.track('User clicked ndv link', {
 					node_type: this.activeNode.type,
 					workflow_id: this.workflowsStore.workflowId,
-					session_id: this.sessionId,
-					pane: 'main',
+					push_ref: this.pushRef,
+					pane: NodeConnectionType.Main,
 					type: 'i-wish-this-node-would',
 				});
 			}
@@ -558,7 +625,7 @@ export default mixins(
 				start_position: this.mainPanelPosition,
 				end_position: e.position,
 				node_type: this.activeNodeType ? this.activeNodeType.name : '',
-				session_id: this.sessionId,
+				push_ref: this.pushRef,
 				workflow_id: this.workflowsStore.workflowId,
 			});
 			this.mainPanelPosition = e.position;
@@ -580,7 +647,7 @@ export default mixins(
 		trackLinking(pane: string) {
 			this.$telemetry.track('User changed ndv run linking', {
 				node_type: this.activeNodeType ? this.activeNodeType.name : '',
-				session_id: this.sessionId,
+				push_ref: this.pushRef,
 				linked: this.linked,
 				pane,
 			});
@@ -602,56 +669,63 @@ export default mixins(
 		nodeTypeSelected(nodeTypeName: string) {
 			this.$emit('nodeTypeSelected', nodeTypeName);
 		},
+		onSwitchSelectedNode(nodeTypeName: string) {
+			this.$emit('switchSelectedNode', nodeTypeName);
+		},
+		onOpenConnectionNodeCreator(nodeTypeName: string, connectionType: ConnectionTypes) {
+			this.$emit('openConnectionNodeCreator', nodeTypeName, connectionType);
+		},
 		async close() {
 			if (this.isDragging) {
 				return;
 			}
 
-			if (this.outputPanelEditMode.enabled) {
-				const shouldPinDataBeforeClosing = await this.confirmMessage(
+			if (
+				this.activeNode &&
+				(typeof this.activeNodeType?.outputs === 'string' ||
+					typeof this.activeNodeType?.inputs === 'string' ||
+					this.redrawRequired)
+			) {
+				// TODO: We should keep track of if it actually changed and only do if required
+				// Whenever a node with custom inputs and outputs gets closed redraw it in case
+				// they changed
+				const nodeName = this.activeNode.name;
+				setTimeout(() => {
+					this.$emit('redrawNode', nodeName);
+				}, 1);
+			}
+
+			if (this.outputPanelEditMode.enabled && this.activeNode) {
+				const shouldPinDataBeforeClosing = await this.confirm(
 					'',
 					this.$locale.baseText('ndv.pinData.beforeClosing.title'),
-					null,
-					this.$locale.baseText('ndv.pinData.beforeClosing.confirm'),
-					this.$locale.baseText('ndv.pinData.beforeClosing.cancel'),
+					{
+						confirmButtonText: this.$locale.baseText('ndv.pinData.beforeClosing.confirm'),
+						cancelButtonText: this.$locale.baseText('ndv.pinData.beforeClosing.cancel'),
+					},
 				);
 
-				if (shouldPinDataBeforeClosing) {
+				if (shouldPinDataBeforeClosing === MODAL_CONFIRM) {
 					const { value } = this.outputPanelEditMode;
-
-					if (!this.isValidPinDataSize(value)) {
-						dataPinningEventBus.emit('data-pinning-error', {
-							errorType: 'data-too-large',
-							source: 'on-ndv-close-modal',
-						});
-						return;
-					}
-
-					if (!this.isValidPinDataJSON(value)) {
-						dataPinningEventBus.emit('data-pinning-error', {
-							errorType: 'invalid-json',
-							source: 'on-ndv-close-modal',
-						});
-						return;
-					}
-
-					if (this.activeNode) {
-						this.workflowsStore.pinData({ node: this.activeNode, data: jsonParse(value) });
+					try {
+						this.pinnedData.setData(jsonParse(value), 'on-ndv-close-modal');
+					} catch (error) {
+						console.error(error);
 					}
 				}
 
 				this.ndvStore.setOutputPanelEditModeEnabled(false);
 			}
 
-			this.$externalHooks().run('dataDisplay.nodeEditingFinished');
+			await this.externalHooks.run('dataDisplay.nodeEditingFinished');
 			this.$telemetry.track('User closed node modal', {
 				node_type: this.activeNodeType ? this.activeNodeType.name : '',
-				session_id: this.sessionId,
+				push_ref: this.pushRef,
 				workflow_id: this.workflowsStore.workflowId,
 			});
 			this.triggerWaitingWarningEnabled = false;
 			this.ndvStore.activeNodeName = null;
-			this.ndvStore.resetNDVSessionId();
+			this.ndvStore.resetNDVPushRef();
 		},
 		onRunOutputIndexChange(run: number) {
 			this.runOutputIndex = run;
@@ -666,20 +740,20 @@ export default mixins(
 		},
 		trackRunChange(run: number, pane: string) {
 			this.$telemetry.track('User changed ndv run dropdown', {
-				session_id: this.sessionId,
+				push_ref: this.pushRef,
 				run_index: run,
 				node_type: this.activeNodeType ? this.activeNodeType.name : '',
 				pane,
 			});
 		},
-		onInputSelect(value: string, index: number) {
+		onInputNodeChange(value: string, index: number) {
 			this.runInputIndex = -1;
 			this.isLinkingEnabled = true;
 			this.selectedInput = value;
 
 			this.$telemetry.track('User changed ndv input dropdown', {
 				node_type: this.activeNode ? this.activeNode.type : '',
-				session_id: this.sessionId,
+				push_ref: this.pushRef,
 				workflow_id: this.workflowsStore.workflowId,
 				selection_value: index,
 				input_node_type: this.inputNode ? this.inputNode.type : '',
@@ -688,19 +762,36 @@ export default mixins(
 		onStopExecution() {
 			this.$emit('stopExecution');
 		},
+		activateInputPane() {
+			this.isInputPaneActive = true;
+			this.isOutputPaneActive = false;
+		},
+		activateOutputPane() {
+			this.isInputPaneActive = false;
+			this.isOutputPaneActive = true;
+		},
+		onSearch(search: string) {
+			this.isPairedItemHoveringEnabled = !search;
+		},
 	},
 });
 </script>
 
 <style lang="scss">
+// Hide notice(.ndv-connection-hint-notice) warning when node has output connection
+[data-has-output-connection='true'] .ndv-connection-hint-notice {
+	display: none;
+}
 .ndv-wrapper {
-	overflow: hidden;
+	overflow: visible;
+	margin-top: 0;
 }
 
 .data-display-wrapper {
-	height: 93%;
-	width: 100%;
+	height: calc(100% - var(--spacing-l)) !important;
 	margin-top: var(--spacing-xl) !important;
+	margin-bottom: var(--spacing-xl) !important;
+	width: 100%;
 	background: none;
 	border: none;
 
@@ -712,7 +803,7 @@ export default mixins(
 		padding: 0 !important;
 		height: 100%;
 		min-height: 400px;
-		overflow: hidden;
+		overflow: visible;
 		border-radius: 8px;
 	}
 }
@@ -741,6 +832,10 @@ $main-panel-width: 360px;
 	top: var(--spacing-xs);
 	left: var(--spacing-l);
 
+	span {
+		color: var(--color-ndv-back-font);
+	}
+
 	&:hover {
 		cursor: pointer;
 	}
@@ -761,7 +856,7 @@ $main-panel-width: 360px;
 	position: absolute;
 	bottom: var(--spacing-4xs);
 	left: calc(100% + var(--spacing-s));
-	color: var(--color-text-xlight);
+	color: var(--color-feature-request-font);
 	font-size: var(--font-size-2xs);
 	white-space: nowrap;
 
diff --git a/packages/editor-ui/src/components/NodeExecuteButton.vue b/packages/editor-ui/src/components/NodeExecuteButton.vue
index bd43cc2bc889a..af90ba2e0521a 100644
--- a/packages/editor-ui/src/components/NodeExecuteButton.vue
+++ b/packages/editor-ui/src/components/NodeExecuteButton.vue
@@ -1,39 +1,57 @@
 <template>
-	<n8n-tooltip placement="bottom" :disabled="!disabledHint">
-		<template #content>
-			<div>{{ disabledHint }}</div>
-		</template>
-		<div>
-			<n8n-button
-				:loading="nodeRunning && !isListeningForEvents && !isListeningForWorkflowEvents"
-				:disabled="disabled || !!disabledHint"
-				:label="buttonLabel"
-				:type="type"
-				:size="size"
-				:transparentBackground="transparent"
-				@click="onClick"
-			/>
-		</div>
-	</n8n-tooltip>
+	<div>
+		<n8n-tooltip placement="bottom" :disabled="!disabledHint">
+			<template #content>
+				<div>{{ disabledHint }}</div>
+			</template>
+			<div>
+				<n8n-button
+					v-bind="$attrs"
+					:loading="nodeRunning && !isListeningForEvents && !isListeningForWorkflowEvents"
+					:disabled="disabled || !!disabledHint"
+					:label="buttonLabel"
+					:type="type"
+					:size="size"
+					:icon="!isListeningForEvents && !hideIcon ? 'flask' : undefined"
+					:transparent-background="transparent"
+					:title="!isTriggerNode ? $locale.baseText('ndv.execute.testNode.description') : ''"
+					@click="onClick"
+				/>
+			</div>
+		</n8n-tooltip>
+	</div>
 </template>
 
 <script lang="ts">
-import { WEBHOOK_NODE_TYPE, MANUAL_TRIGGER_NODE_TYPE } from '@/constants';
+import { defineComponent } from 'vue';
+import { mapStores } from 'pinia';
+import {
+	WEBHOOK_NODE_TYPE,
+	MANUAL_TRIGGER_NODE_TYPE,
+	MODAL_CONFIRM,
+	FORM_TRIGGER_NODE_TYPE,
+	CHAT_TRIGGER_NODE_TYPE,
+} from '@/constants';
 import type { INodeUi } from '@/Interface';
 import type { INodeTypeDescription } from 'n8n-workflow';
-import mixins from 'vue-typed-mixins';
-import { workflowRun } from '@/mixins/workflowRun';
-import { pinData } from '@/mixins/pinData';
-import { dataPinningEventBus } from '@/event-bus';
-import { mapStores } from 'pinia';
-import { useWorkflowsStore } from '@/stores/workflows';
-import { useNDVStore } from '@/stores/ndv';
-import { useNodeTypesStore } from '@/stores/nodeTypes';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useNDVStore } from '@/stores/ndv.store';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import { useMessage } from '@/composables/useMessage';
+import { useToast } from '@/composables/useToast';
+import { useExternalHooks } from '@/composables/useExternalHooks';
+import { nodeViewEventBus } from '@/event-bus';
+import { usePinnedData } from '@/composables/usePinnedData';
+import { useRunWorkflow } from '@/composables/useRunWorkflow';
+import { useUIStore } from '@/stores/ui.store';
+import { useRouter } from 'vue-router';
 
-export default mixins(workflowRun, pinData).extend({
+export default defineComponent({
+	inheritAttrs: false,
 	props: {
 		nodeName: {
 			type: String,
+			required: true,
 		},
 		disabled: {
 			type: Boolean,
@@ -55,9 +73,30 @@ export default mixins(workflowRun, pinData).extend({
 		telemetrySource: {
 			type: String,
 		},
+		hideIcon: {
+			type: Boolean,
+		},
+	},
+	emits: ['stopExecution', 'execute'],
+	setup(props) {
+		const router = useRouter();
+		const workflowsStore = useWorkflowsStore();
+		const node = workflowsStore.getNodeByName(props.nodeName);
+		const pinnedData = usePinnedData(node);
+		const externalHooks = useExternalHooks();
+		const { runWorkflow, stopCurrentExecution } = useRunWorkflow({ router });
+
+		return {
+			externalHooks,
+			pinnedData,
+			runWorkflow,
+			stopCurrentExecution,
+			...useToast(),
+			...useMessage(),
+		};
 	},
 	computed: {
-		...mapStores(useNodeTypesStore, useNDVStore, useWorkflowsStore),
+		...mapStores(useNodeTypesStore, useNDVStore, useWorkflowsStore, useUIStore),
 		node(): INodeUi | null {
 			return this.workflowsStore.getNodeByName(this.nodeName);
 		},
@@ -69,26 +108,37 @@ export default mixins(workflowRun, pinData).extend({
 		},
 		nodeRunning(): boolean {
 			const triggeredNode = this.workflowsStore.executedNode;
-			const executingNode = this.workflowsStore.executingNode;
 			return (
 				this.workflowRunning &&
-				(executingNode === this.node.name || triggeredNode === this.node.name)
+				(this.workflowsStore.isNodeExecuting(this.node.name) || triggeredNode === this.node.name)
 			);
 		},
 		workflowRunning(): boolean {
 			return this.uiStore.isActionActive('workflowRunning');
 		},
 		isTriggerNode(): boolean {
+			if (!this.node) {
+				return false;
+			}
 			return this.nodeTypesStore.isTriggerNode(this.node.type);
 		},
 		isManualTriggerNode(): boolean {
 			return Boolean(this.nodeType && this.nodeType.name === MANUAL_TRIGGER_NODE_TYPE);
 		},
+		isChatNode(): boolean {
+			return Boolean(this.nodeType && this.nodeType.name === CHAT_TRIGGER_NODE_TYPE);
+		},
+		isChatChild(): boolean {
+			return this.workflowsStore.checkIfNodeHasChatParent(this.nodeName);
+		},
+		isFormTriggerNode(): boolean {
+			return Boolean(this.nodeType && this.nodeType.name === FORM_TRIGGER_NODE_TYPE);
+		},
 		isPollingTypeNode(): boolean {
-			return !!(this.nodeType && this.nodeType.polling);
+			return !!this.nodeType?.polling;
 		},
 		isScheduleTrigger(): boolean {
-			return !!(this.nodeType && this.nodeType.group.includes('schedule'));
+			return !!this.nodeType?.group.includes('schedule');
 		},
 		isWebhookNode(): boolean {
 			return Boolean(this.nodeType && this.nodeType.name === WEBHOOK_NODE_TYPE);
@@ -115,9 +165,7 @@ export default mixins(workflowRun, pinData).extend({
 		},
 		hasIssues(): boolean {
 			return Boolean(
-				this.node &&
-					this.node.issues &&
-					(this.node.issues.parameters || this.node.issues.credentials),
+				this.node?.issues && (this.node.issues.parameters || this.node.issues.credentials),
 			);
 		},
 		disabledHint(): string {
@@ -153,19 +201,23 @@ export default mixins(workflowRun, pinData).extend({
 				return this.label;
 			}
 
+			if (this.isChatNode) {
+				return this.$locale.baseText('ndv.execute.testChat');
+			}
+
 			if (this.isWebhookNode) {
 				return this.$locale.baseText('ndv.execute.listenForTestEvent');
 			}
 
-			if (this.isPollingTypeNode || (this.nodeType && this.nodeType.mockManualExecution)) {
-				return this.$locale.baseText('ndv.execute.fetchEvent');
+			if (this.isFormTriggerNode) {
+				return this.$locale.baseText('ndv.execute.testStep');
 			}
 
-			if (this.isTriggerNode && !this.isScheduleTrigger && !this.isManualTriggerNode) {
-				return this.$locale.baseText('ndv.execute.listenForEvent');
+			if (this.isPollingTypeNode || this.nodeType?.mockManualExecution) {
+				return this.$locale.baseText('ndv.execute.fetchEvent');
 			}
 
-			return this.$locale.baseText('ndv.execute.executeNode');
+			return this.$locale.baseText('ndv.execute.testNode');
 		},
 	},
 	methods: {
@@ -173,43 +225,53 @@ export default mixins(workflowRun, pinData).extend({
 			try {
 				await this.workflowsStore.removeTestWebhook(this.workflowsStore.workflowId);
 			} catch (error) {
-				this.$showError(error, this.$locale.baseText('ndv.execute.stopWaitingForWebhook.error'));
+				this.showError(error, this.$locale.baseText('ndv.execute.stopWaitingForWebhook.error'));
 				return;
 			}
 		},
 
 		async onClick() {
-			if (this.isListeningForEvents) {
-				this.stopWaitingForWebhook();
+			// Show chat if it's a chat node or a child of a chat node with no input data
+			if (this.isChatNode || (this.isChatChild && this.ndvStore.isNDVDataEmpty('input'))) {
+				this.ndvStore.setActiveNodeName(null);
+				nodeViewEventBus.emit('openChat');
+			} else if (this.isListeningForEvents) {
+				await this.stopWaitingForWebhook();
 			} else if (this.isListeningForWorkflowEvents) {
+				await this.stopCurrentExecution();
 				this.$emit('stopExecution');
 			} else {
 				let shouldUnpinAndExecute = false;
-				if (this.hasPinData) {
-					shouldUnpinAndExecute = await this.confirmMessage(
+				if (this.pinnedData.hasData.value) {
+					const confirmResult = await this.confirm(
 						this.$locale.baseText('ndv.pinData.unpinAndExecute.description'),
 						this.$locale.baseText('ndv.pinData.unpinAndExecute.title'),
-						null,
-						this.$locale.baseText('ndv.pinData.unpinAndExecute.confirm'),
-						this.$locale.baseText('ndv.pinData.unpinAndExecute.cancel'),
+						{
+							confirmButtonText: this.$locale.baseText('ndv.pinData.unpinAndExecute.confirm'),
+							cancelButtonText: this.$locale.baseText('ndv.pinData.unpinAndExecute.cancel'),
+						},
 					);
+					shouldUnpinAndExecute = confirmResult === MODAL_CONFIRM;
 
-					if (shouldUnpinAndExecute) {
-						dataPinningEventBus.emit('data-unpinning', { source: 'unpin-and-execute-modal' });
-						this.workflowsStore.unpinData({ node: this.node });
+					if (shouldUnpinAndExecute && this.node) {
+						this.pinnedData.unsetData('unpin-and-execute-modal');
 					}
 				}
 
-				if (!this.hasPinData || shouldUnpinAndExecute) {
+				if (!this.pinnedData.hasData.value || shouldUnpinAndExecute) {
 					const telemetryPayload = {
 						node_type: this.nodeType ? this.nodeType.name : null,
 						workflow_id: this.workflowsStore.workflowId,
 						source: this.telemetrySource,
+						push_ref: this.ndvStore.pushRef,
 					};
 					this.$telemetry.track('User clicked execute node button', telemetryPayload);
-					this.$externalHooks().run('nodeExecuteButton.onClick', telemetryPayload);
+					await this.externalHooks.run('nodeExecuteButton.onClick', telemetryPayload);
 
-					this.runWorkflow(this.nodeName, 'RunData.ExecuteNodeButton');
+					await this.runWorkflow({
+						destinationNode: this.nodeName,
+						source: 'RunData.ExecuteNodeButton',
+					});
 					this.$emit('execute');
 				}
 			}
diff --git a/packages/editor-ui/src/components/NodeIcon.vue b/packages/editor-ui/src/components/NodeIcon.vue
index 17428e4430dca..edab9b46888b4 100644
--- a/packages/editor-ui/src/components/NodeIcon.vue
+++ b/packages/editor-ui/src/components/NodeIcon.vue
@@ -7,18 +7,20 @@
 		:disabled="disabled"
 		:size="size"
 		:circle="circle"
-		:nodeTypeName="nodeType ? nodeType.displayName : ''"
-		:showTooltip="showTooltip"
+		:node-type-name="nodeName ?? nodeType?.displayName ?? ''"
+		:show-tooltip="showTooltip"
+		:tooltip-position="tooltipPosition"
+		:badge="badge"
 		@click="(e) => $emit('click')"
 	></n8n-node-icon>
 </template>
 
 <script lang="ts">
 import type { IVersionNode } from '@/Interface';
-import { useRootStore } from '@/stores/n8nRootStore';
+import { useRootStore } from '@/stores/n8nRoot.store';
 import type { INodeTypeDescription } from 'n8n-workflow';
 import { mapStores } from 'pinia';
-import { defineComponent } from 'vue';
+import { defineComponent, type PropType } from 'vue';
 
 interface NodeIconSource {
 	path?: string;
@@ -29,7 +31,9 @@ interface NodeIconSource {
 export default defineComponent({
 	name: 'NodeIcon',
 	props: {
-		nodeType: {},
+		nodeType: {
+			type: Object as PropType<INodeTypeDescription | IVersionNode | null>,
+		},
 		size: {
 			type: Number,
 			required: false,
@@ -42,15 +46,27 @@ export default defineComponent({
 			type: Boolean,
 			default: false,
 		},
+		colorDefault: {
+			type: String,
+			required: false,
+		},
 		showTooltip: {
 			type: Boolean,
 			default: false,
 		},
+		tooltipPosition: {
+			type: String,
+			default: 'top',
+		},
+		nodeName: {
+			type: String,
+			required: false,
+		},
 	},
 	computed: {
 		...mapStores(useRootStore),
 		type(): string {
-			const nodeType = this.nodeType as INodeTypeDescription | IVersionNode | null;
+			const nodeType = this.nodeType;
 			let iconType = 'unknown';
 			if (nodeType) {
 				if (nodeType.iconUrl) return 'file';
@@ -63,14 +79,17 @@ export default defineComponent({
 			return iconType;
 		},
 		color(): string {
-			const nodeType = this.nodeType as INodeTypeDescription | IVersionNode | null;
-			if (nodeType && nodeType.defaults && nodeType.defaults.color) {
+			const nodeType = this.nodeType;
+			if (nodeType?.defaults?.color) {
 				return nodeType.defaults.color.toString();
 			}
+			if (this.colorDefault) {
+				return this.colorDefault;
+			}
 			return '';
 		},
 		iconSource(): NodeIconSource {
-			const nodeType = this.nodeType as INodeTypeDescription | IVersionNode | null;
+			const nodeType = this.nodeType;
 			const baseUrl = this.rootStore.getBaseUrl;
 			const iconSource = {} as NodeIconSource;
 
@@ -97,6 +116,14 @@ export default defineComponent({
 			}
 			return iconSource;
 		},
+		badge(): { src: string; type: string } | undefined {
+			const nodeType = this.nodeType as INodeTypeDescription;
+			if (nodeType && 'badgeIconUrl' in nodeType && nodeType.badgeIconUrl) {
+				return { type: 'file', src: this.rootStore.getBaseUrl + nodeType.badgeIconUrl };
+			}
+
+			return undefined;
+		},
 	},
 });
 </script>
diff --git a/packages/editor-ui/src/components/NodeList.vue b/packages/editor-ui/src/components/NodeList.vue
index 39254c975e4cb..53d710ad15932 100644
--- a/packages/editor-ui/src/components/NodeList.vue
+++ b/packages/editor-ui/src/components/NodeList.vue
@@ -1,11 +1,11 @@
 <template>
 	<div :class="$style.list">
-		<div v-for="node in slicedNodes" :class="[$style.container, $style[size]]" :key="node.name">
-			<NodeIcon :nodeType="node" :size="size === 'md' ? 24 : 18" :showTooltip="true" />
+		<div v-for="node in slicedNodes" :key="node.name" :class="[$style.container, $style[size]]">
+			<NodeIcon :node-type="node" :size="size === 'md' ? 24 : 18" :show-tooltip="true" />
 		</div>
 		<div
-			:class="[$style.button, size === 'md' ? $style.buttonMd : $style.buttonSm]"
 			v-if="filteredCoreNodes.length > limit + 1"
+			:class="[$style.button, size === 'md' ? $style.buttonMd : $style.buttonSm]"
 		>
 			+{{ hiddenNodes }}
 		</div>
@@ -13,13 +13,16 @@
 </template>
 
 <script lang="ts">
+import { defineComponent } from 'vue';
 import NodeIcon from '@/components/NodeIcon.vue';
-import { genericHelpers } from '@/mixins/genericHelpers';
 import type { ITemplatesNode } from '@/Interface';
-import mixins from 'vue-typed-mixins';
-import { filterTemplateNodes } from '@/utils';
-export default mixins(genericHelpers).extend({
+import { filterTemplateNodes } from '@/utils/nodeTypesUtils';
+
+export default defineComponent({
 	name: 'NodeList',
+	components: {
+		NodeIcon,
+	},
 	props: {
 		nodes: {
 			type: Array,
@@ -33,9 +36,6 @@ export default mixins(genericHelpers).extend({
 			default: 'sm',
 		},
 	},
-	components: {
-		NodeIcon,
-	},
 	computed: {
 		filteredCoreNodes() {
 			return filterTemplateNodes(this.nodes as ITemplatesNode[]);
diff --git a/packages/editor-ui/src/components/NodeSettings.vue b/packages/editor-ui/src/components/NodeSettings.vue
index 4653b6c446a8a..0aa274177a4dd 100644
--- a/packages/editor-ui/src/components/NodeSettings.vue
+++ b/packages/editor-ui/src/components/NodeSettings.vue
@@ -9,33 +9,34 @@
 		<div :class="$style.header">
 			<div class="header-side-menu">
 				<NodeTitle
+					v-if="node"
 					class="node-name"
-					:value="node && node.name"
-					:nodeType="nodeType"
-					:isReadOnly="isReadOnly"
-					@input="nameChanged"
+					:model-value="node.name"
+					:node-type="nodeType"
+					:read-only="isReadOnly"
+					@update:model-value="nameChanged"
 				></NodeTitle>
 				<div v-if="isExecutable">
 					<NodeExecuteButton
-						v-if="!blockUI"
+						v-if="!blockUI && node && nodeValid"
 						data-test-id="node-execute-button"
-						:nodeName="node.name"
+						:node-name="node.name"
 						:disabled="outputPanelEditMode.enabled && !isTriggerNode"
 						size="small"
-						telemetrySource="parameters"
+						telemetry-source="parameters"
 						@execute="onNodeExecute"
-						@stopExecution="onStopExecution"
+						@stop-execution="onStopExecution"
 					/>
 				</div>
 			</div>
 			<NodeSettingsTabs
 				v-if="node && nodeValid"
 				v-model="openPanel"
-				:nodeType="nodeType"
-				:sessionId="sessionId"
+				:node-type="nodeType"
+				:push-ref="pushRef"
 			/>
 		</div>
-		<div class="node-is-not-valid" v-if="node && !nodeValid">
+		<div v-if="node && !nodeValid" class="node-is-not-valid">
 			<p :class="$style.warningIcon">
 				<font-awesome-icon icon="exclamation-triangle" />
 			</p>
@@ -46,8 +47,8 @@
 			</div>
 			<div v-if="isCommunityNode" :class="$style.descriptionContainer">
 				<div class="mb-l">
-					<i18n
-						path="nodeSettings.communityNodeUnknown.description"
+					<i18n-t
+						keypath="nodeSettings.communityNodeUnknown.description"
 						tag="span"
 						@click="onMissingNodeTextClick"
 					>
@@ -58,7 +59,7 @@
 								>{{ node.type.split('.')[0] }}</a
 							>
 						</template>
-					</i18n>
+					</i18n-t>
 				</div>
 				<n8n-link
 					:to="COMMUNITY_NODES_INSTALLATION_DOCS_URL"
@@ -67,7 +68,7 @@
 					{{ $locale.baseText('nodeSettings.communityNodeUnknown.installLink.text') }}
 				</n8n-link>
 			</div>
-			<i18n v-else path="nodeSettings.nodeTypeUnknown.description" tag="span">
+			<i18n-t v-else keypath="nodeSettings.nodeTypeUnknown.description" tag="span">
 				<template #action>
 					<a
 						:href="CUSTOM_NODES_DOCS_URL"
@@ -75,9 +76,9 @@
 						v-text="$locale.baseText('nodeSettings.nodeTypeUnknown.description.customNode')"
 					/>
 				</template>
-			</i18n>
+			</i18n-t>
 		</div>
-		<div class="node-parameters-wrapper" data-test-id="node-parameters" v-if="node && nodeValid">
+		<div v-if="node && nodeValid" class="node-parameters-wrapper" data-test-id="node-parameters">
 			<n8n-notice
 				v-if="hasForeignCredential"
 				:content="
@@ -87,29 +88,30 @@
 				"
 			/>
 			<div v-show="openPanel === 'params'">
-				<node-webhooks :node="node" :nodeType="nodeType" />
+				<NodeWebhooks :node="node" :node-type="nodeType" />
 
-				<parameter-input-list
+				<ParameterInputList
+					v-if="nodeValuesInitialized"
 					:parameters="parametersNoneSetting"
-					:hideDelete="true"
-					:nodeValues="nodeValues"
-					:isReadOnly="isReadOnly"
-					:hiddenIssuesInputs="hiddenIssuesInputs"
+					:hide-delete="true"
+					:node-values="nodeValues"
+					:is-read-only="isReadOnly"
+					:hidden-issues-inputs="hiddenIssuesInputs"
 					path="parameters"
-					@valueChanged="valueChanged"
+					@value-changed="valueChanged"
 					@activate="onWorkflowActivate"
-					@parameterBlur="onParameterBlur"
+					@parameter-blur="onParameterBlur"
 				>
-					<node-credentials
+					<NodeCredentials
 						:node="node"
 						:readonly="isReadOnly"
-						:showAll="true"
-						@credentialSelected="credentialSelected"
-						@valueChanged="valueChanged"
-						@blur="onParameterBlur"
+						:show-all="true"
 						:hide-issues="hiddenIssuesInputs.includes('credentials')"
+						@credential-selected="credentialSelected"
+						@value-changed="valueChanged"
+						@blur="onParameterBlur"
 					/>
-				</parameter-input-list>
+				</ParameterInputList>
 				<div v-if="parametersNoneSetting.length === 0" class="no-parameters">
 					<n8n-text>
 						{{ $locale.baseText('nodeSettings.thisNodeDoesNotHaveAnyParameters') }}
@@ -117,7 +119,7 @@
 				</div>
 
 				<div
-					v-if="isCustomApiCallSelected(nodeValues)"
+					v-if="nodeHelpers.isCustomApiCallSelected(nodeValues)"
 					class="parameter-item parameter-notice"
 					data-test-id="node-parameters-http-notice"
 				>
@@ -131,92 +133,129 @@
 				</div>
 			</div>
 			<div v-show="openPanel === 'settings'">
-				<parameter-input-list
+				<ParameterInputList
 					:parameters="parametersSetting"
-					:nodeValues="nodeValues"
-					:isReadOnly="isReadOnly"
-					:hiddenIssuesInputs="hiddenIssuesInputs"
+					:node-values="nodeValues"
+					:is-read-only="isReadOnly"
+					:hidden-issues-inputs="hiddenIssuesInputs"
 					path="parameters"
-					@valueChanged="valueChanged"
-					@parameterBlur="onParameterBlur"
+					@value-changed="valueChanged"
+					@parameter-blur="onParameterBlur"
 				/>
-				<parameter-input-list
+				<ParameterInputList
 					:parameters="nodeSettings"
-					:hideDelete="true"
-					:nodeValues="nodeValues"
-					:isReadOnly="isReadOnly"
-					:hiddenIssuesInputs="hiddenIssuesInputs"
+					:hide-delete="true"
+					:node-values="nodeValues"
+					:is-read-only="isReadOnly"
+					:hidden-issues-inputs="hiddenIssuesInputs"
 					path=""
-					@valueChanged="valueChanged"
-					@parameterBlur="onParameterBlur"
+					@value-changed="valueChanged"
+					@parameter-blur="onParameterBlur"
 				/>
+				<div class="node-version" data-test-id="node-version">
+					{{
+						$locale.baseText('nodeSettings.nodeVersion', {
+							interpolate: {
+								node: nodeType?.displayName as string,
+								version: (node.typeVersion ?? latestVersion).toString(),
+							},
+						})
+					}}
+					<span>({{ nodeVersionTag }})</span>
+				</div>
 			</div>
 		</div>
+		<NDVSubConnections
+			v-if="node"
+			ref="subConnections"
+			:root-node="node"
+			@switch-selected-node="onSwitchSelectedNode"
+			@open-connection-node-creator="onOpenConnectionNodeCreator"
+		/>
 		<n8n-block-ui :show="blockUI" />
 	</div>
 </template>
 
 <script lang="ts">
 import type { PropType } from 'vue';
-import Vue from 'vue';
+import { defineComponent } from 'vue';
+import { mapStores } from 'pinia';
 import type {
 	INodeTypeDescription,
 	INodeParameters,
 	INodeProperties,
 	NodeParameterValue,
+	ConnectionTypes,
+} from 'n8n-workflow';
+import {
+	NodeHelpers,
+	NodeConnectionType,
+	deepCopy,
+	isINodePropertyCollectionList,
+	isINodePropertiesList,
+	isINodePropertyOptionsList,
+	displayParameter,
 } from 'n8n-workflow';
-import { NodeHelpers, deepCopy } from 'n8n-workflow';
 import type {
 	INodeUi,
 	INodeUpdatePropertiesInformation,
 	IUpdateInformation,
 	IUsedCredential,
 } from '@/Interface';
-import { ICredentialsResponse, IUser } from '@/Interface';
 
 import {
 	COMMUNITY_NODES_INSTALLATION_DOCS_URL,
 	CUSTOM_NODES_DOCS_URL,
 	MAIN_NODE_PANEL_WIDTH,
-	IMPORT_CURL_MODAL_KEY,
+	SHOULD_CLEAR_NODE_OUTPUTS,
 } from '@/constants';
 
 import NodeTitle from '@/components/NodeTitle.vue';
-import ParameterInputFull from '@/components/ParameterInputFull.vue';
 import ParameterInputList from '@/components/ParameterInputList.vue';
 import NodeCredentials from '@/components/NodeCredentials.vue';
 import NodeSettingsTabs from '@/components/NodeSettingsTabs.vue';
 import NodeWebhooks from '@/components/NodeWebhooks.vue';
+import NDVSubConnections from '@/components/NDVSubConnections.vue';
 import { get, set, unset } from 'lodash-es';
 
-import { externalHooks } from '@/mixins/externalHooks';
-import { nodeHelpers } from '@/mixins/nodeHelpers';
-
-import mixins from 'vue-typed-mixins';
 import NodeExecuteButton from './NodeExecuteButton.vue';
-import { isCommunityPackageName } from '@/utils';
-import { mapStores } from 'pinia';
-import { useUIStore } from '@/stores/ui';
-import { useWorkflowsStore } from '@/stores/workflows';
-import { useNDVStore } from '@/stores/ndv';
-import { useNodeTypesStore } from '@/stores/nodeTypes';
-import { useHistoryStore } from '@/stores/history';
+import { isCommunityPackageName } from '@/utils/nodeTypesUtils';
+import { useUIStore } from '@/stores/ui.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useNDVStore } from '@/stores/ndv.store';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import { useHistoryStore } from '@/stores/history.store';
 import { RenameNodeCommand } from '@/models/history';
-import useWorkflowsEEStore from '@/stores/workflows.ee';
-import { useCredentialsStore } from '@/stores/credentials';
-import type { EventBus } from '@/event-bus';
-
-export default mixins(externalHooks, nodeHelpers).extend({
+import useWorkflowsEEStore from '@/stores/workflows.ee.store';
+import { useCredentialsStore } from '@/stores/credentials.store';
+import type { EventBus } from 'n8n-design-system';
+import { useExternalHooks } from '@/composables/useExternalHooks';
+import { useNodeHelpers } from '@/composables/useNodeHelpers';
+import { importCurlEventBus } from '@/event-bus';
+import { useToast } from '@/composables/useToast';
+
+export default defineComponent({
 	name: 'NodeSettings',
 	components: {
 		NodeTitle,
 		NodeCredentials,
-		ParameterInputFull,
 		ParameterInputList,
 		NodeSettingsTabs,
 		NodeWebhooks,
+		NDVSubConnections,
 		NodeExecuteButton,
 	},
+	setup() {
+		const nodeHelpers = useNodeHelpers();
+		const externalHooks = useExternalHooks();
+		const { showMessage } = useToast();
+
+		return {
+			externalHooks,
+			nodeHelpers,
+			showMessage,
+		};
+	},
 	computed: {
 		...mapStores(
 			useHistoryStore,
@@ -227,13 +266,21 @@ export default mixins(externalHooks, nodeHelpers).extend({
 			useWorkflowsStore,
 			useWorkflowsEEStore,
 		),
-		isCurlImportModalOpen(): boolean {
-			return this.uiStore.isModalOpen(IMPORT_CURL_MODAL_KEY);
-		},
 		isReadOnly(): boolean {
 			return this.readOnly || this.hasForeignCredential;
 		},
 		isExecutable(): boolean {
+			if (this.nodeType && this.node) {
+				const workflow = this.workflowsStore.getCurrentWorkflow();
+				const workflowNode = workflow.getNode(this.node.name);
+				const inputs = NodeHelpers.getNodeInputs(workflow, workflowNode!, this.nodeType);
+				const inputNames = NodeHelpers.getConnectionTypes(inputs);
+
+				if (!inputNames.includes(NodeConnectionType.Main) && !this.isTriggerNode) {
+					return false;
+				}
+			}
+
 			return this.executable || this.hasForeignCredential;
 		},
 		nodeTypeName(): string {
@@ -248,8 +295,31 @@ export default mixins(externalHooks, nodeHelpers).extend({
 
 			return '';
 		},
+		nodeTypeVersions(): number[] {
+			if (!this.node) return [];
+			return this.nodeTypesStore.getNodeVersions(this.node.type);
+		},
+		latestVersion(): number {
+			return Math.max(...this.nodeTypeVersions);
+		},
+		isLatestNodeVersion(): boolean {
+			return !this.node?.typeVersion || this.latestVersion === this.node.typeVersion;
+		},
+		nodeVersionTag(): string {
+			if (!this.nodeType || this.nodeType.hidden) {
+				return this.$locale.baseText('nodeSettings.deprecated');
+			}
+
+			if (this.isLatestNodeVersion) {
+				return this.$locale.baseText('nodeSettings.latest');
+			}
+
+			return this.$locale.baseText('nodeSettings.latestVersion', {
+				interpolate: { version: this.latestVersion.toString() },
+			});
+		},
 		nodeTypeDescription(): string {
-			if (this.nodeType && this.nodeType.description) {
+			if (this.nodeType?.description) {
 				const shortNodeType = this.$locale.shortNodeType(this.nodeType.name);
 
 				return this.$locale.headerText({
@@ -293,10 +363,10 @@ export default mixins(externalHooks, nodeHelpers).extend({
 			return this.ndvStore.outputPanelEditMode;
 		},
 		isCommunityNode(): boolean {
-			return isCommunityPackageName(this.node.type);
+			return isCommunityPackageName(this.node?.type);
 		},
 		isTriggerNode(): boolean {
-			return this.nodeTypesStore.isTriggerNode(this.node.type);
+			return this.nodeTypesStore.isTriggerNode(this.node?.type);
 		},
 		workflowOwnerName(): string {
 			return this.workflowsEEStore.getWorkflowOwnerName(`${this.workflowsStore.workflowId}`);
@@ -315,7 +385,7 @@ export default mixins(externalHooks, nodeHelpers).extend({
 			const credential = this.usedCredentials
 				? Object.values(this.usedCredentials).find((credential) => {
 						return credential.id === this.foreignCredentials[0];
-				  })
+					})
 				: undefined;
 
 			return this.credentialsStore.getCredentialOwnerName(credential);
@@ -328,7 +398,7 @@ export default mixins(externalHooks, nodeHelpers).extend({
 		dragging: {
 			type: Boolean,
 		},
-		sessionId: {
+		pushRef: {
 			type: String,
 		},
 		nodeType: {
@@ -361,101 +431,16 @@ export default mixins(externalHooks, nodeHelpers).extend({
 				alwaysOutputData: false,
 				executeOnce: false,
 				notesInFlow: false,
-				continueOnFail: false,
+				onError: 'stopWorkflow',
 				retryOnFail: false,
 				maxTries: 3,
 				waitBetweenTries: 1000,
 				notes: '',
 				parameters: {},
 			} as INodeParameters,
+			nodeValuesInitialized: false, // Used to prevent nodeValues from being overwritten by defaults on reopening ndv
 
-			nodeSettings: [
-				{
-					displayName: this.$locale.baseText('nodeSettings.alwaysOutputData.displayName'),
-					name: 'alwaysOutputData',
-					type: 'boolean',
-					default: false,
-					noDataExpression: true,
-					description: this.$locale.baseText('nodeSettings.alwaysOutputData.description'),
-				},
-				{
-					displayName: this.$locale.baseText('nodeSettings.executeOnce.displayName'),
-					name: 'executeOnce',
-					type: 'boolean',
-					default: false,
-					noDataExpression: true,
-					description: this.$locale.baseText('nodeSettings.executeOnce.description'),
-				},
-				{
-					displayName: this.$locale.baseText('nodeSettings.retryOnFail.displayName'),
-					name: 'retryOnFail',
-					type: 'boolean',
-					default: false,
-					noDataExpression: true,
-					description: this.$locale.baseText('nodeSettings.retryOnFail.description'),
-				},
-				{
-					displayName: this.$locale.baseText('nodeSettings.maxTries.displayName'),
-					name: 'maxTries',
-					type: 'number',
-					typeOptions: {
-						minValue: 2,
-						maxValue: 5,
-					},
-					default: 3,
-					displayOptions: {
-						show: {
-							retryOnFail: [true],
-						},
-					},
-					noDataExpression: true,
-					description: this.$locale.baseText('nodeSettings.maxTries.description'),
-				},
-				{
-					displayName: this.$locale.baseText('nodeSettings.waitBetweenTries.displayName'),
-					name: 'waitBetweenTries',
-					type: 'number',
-					typeOptions: {
-						minValue: 0,
-						maxValue: 5000,
-					},
-					default: 1000,
-					displayOptions: {
-						show: {
-							retryOnFail: [true],
-						},
-					},
-					noDataExpression: true,
-					description: this.$locale.baseText('nodeSettings.waitBetweenTries.description'),
-				},
-				{
-					displayName: this.$locale.baseText('nodeSettings.continueOnFail.displayName'),
-					name: 'continueOnFail',
-					type: 'boolean',
-					default: false,
-					noDataExpression: true,
-					description: this.$locale.baseText('nodeSettings.continueOnFail.description'),
-				},
-				{
-					displayName: this.$locale.baseText('nodeSettings.notes.displayName'),
-					name: 'notes',
-					type: 'string',
-					typeOptions: {
-						rows: 5,
-					},
-					default: '',
-					noDataExpression: true,
-					description: this.$locale.baseText('nodeSettings.notes.description'),
-				},
-				{
-					displayName: this.$locale.baseText('nodeSettings.notesInFlow.displayName'),
-					name: 'notesInFlow',
-					type: 'boolean',
-					default: false,
-					noDataExpression: true,
-					description: this.$locale.baseText('nodeSettings.notesInFlow.description'),
-				},
-			] as INodeProperties[],
+			nodeSettings: [] as INodeProperties[],
 			COMMUNITY_NODES_INSTALLATION_DOCS_URL,
 			CUSTOM_NODES_DOCS_URL,
 			MAIN_NODE_PANEL_WIDTH,
@@ -466,31 +451,36 @@ export default mixins(externalHooks, nodeHelpers).extend({
 		node(newNode, oldNode) {
 			this.setNodeValues();
 		},
-		isCurlImportModalOpen(newValue, oldValue) {
-			if (newValue === false) {
-				let parameters = this.uiStore.getHttpNodeParameters || '';
-
-				if (!parameters) return;
-
-				try {
-					parameters = JSON.parse(parameters) as {
-						// eslint-disable-next-line @typescript-eslint/no-explicit-any
-						[key: string]: any;
-					};
-
-					//@ts-ignore
-					this.valueChanged({
-						node: this.node.name,
-						name: 'parameters',
-						value: parameters,
-					});
+	},
+	mounted() {
+		this.populateHiddenIssuesSet();
+		this.populateSettings();
+		this.setNodeValues();
+		this.eventBus?.on('openSettings', this.openSettings);
 
-					this.uiStore.setHttpNodeParameters({ name: IMPORT_CURL_MODAL_KEY, parameters: '' });
-				} catch {}
-			}
-		},
+		this.nodeHelpers.updateNodeParameterIssues(this.node as INodeUi, this.nodeType);
+		importCurlEventBus.on('setHttpNodeParameters', this.setHttpNodeParameters);
+	},
+	beforeUnmount() {
+		this.eventBus?.off('openSettings', this.openSettings);
+		importCurlEventBus.off('setHttpNodeParameters', this.setHttpNodeParameters);
 	},
 	methods: {
+		setHttpNodeParameters(parameters: Record<string, unknown>) {
+			try {
+				this.valueChanged({
+					node: this.node.name,
+					name: 'parameters',
+					value: parameters,
+				});
+			} catch {}
+		},
+		onSwitchSelectedNode(node: string) {
+			this.$emit('switchSelectedNode', node);
+		},
+		onOpenConnectionNodeCreator(node: string, connectionType: ConnectionTypes) {
+			this.$emit('openConnectionNodeCreator', node, connectionType);
+		},
 		populateHiddenIssuesSet() {
 			if (!this.node || !this.workflowsStore.isNodePristine(this.node.name)) return;
 
@@ -501,6 +491,132 @@ export default mixins(externalHooks, nodeHelpers).extend({
 
 			this.workflowsStore.setNodePristine(this.node.name, false);
 		},
+		populateSettings() {
+			if (this.isExecutable && !this.isTriggerNode) {
+				this.nodeSettings.push(
+					...([
+						{
+							displayName: this.$locale.baseText('nodeSettings.alwaysOutputData.displayName'),
+							name: 'alwaysOutputData',
+							type: 'boolean',
+							default: false,
+							noDataExpression: true,
+							description: this.$locale.baseText('nodeSettings.alwaysOutputData.description'),
+						},
+						{
+							displayName: this.$locale.baseText('nodeSettings.executeOnce.displayName'),
+							name: 'executeOnce',
+							type: 'boolean',
+							default: false,
+							noDataExpression: true,
+							description: this.$locale.baseText('nodeSettings.executeOnce.description'),
+						},
+						{
+							displayName: this.$locale.baseText('nodeSettings.retryOnFail.displayName'),
+							name: 'retryOnFail',
+							type: 'boolean',
+							default: false,
+							noDataExpression: true,
+							description: this.$locale.baseText('nodeSettings.retryOnFail.description'),
+						},
+						{
+							displayName: this.$locale.baseText('nodeSettings.maxTries.displayName'),
+							name: 'maxTries',
+							type: 'number',
+							typeOptions: {
+								minValue: 2,
+								maxValue: 5,
+							},
+							default: 3,
+							displayOptions: {
+								show: {
+									retryOnFail: [true],
+								},
+							},
+							noDataExpression: true,
+							description: this.$locale.baseText('nodeSettings.maxTries.description'),
+						},
+						{
+							displayName: this.$locale.baseText('nodeSettings.waitBetweenTries.displayName'),
+							name: 'waitBetweenTries',
+							type: 'number',
+							typeOptions: {
+								minValue: 0,
+								maxValue: 5000,
+							},
+							default: 1000,
+							displayOptions: {
+								show: {
+									retryOnFail: [true],
+								},
+							},
+							noDataExpression: true,
+							description: this.$locale.baseText('nodeSettings.waitBetweenTries.description'),
+						},
+						{
+							displayName: this.$locale.baseText('nodeSettings.onError.displayName'),
+							name: 'onError',
+							type: 'options',
+							options: [
+								{
+									name: this.$locale.baseText(
+										'nodeSettings.onError.options.stopWorkflow.displayName',
+									),
+									value: 'stopWorkflow',
+									description: this.$locale.baseText(
+										'nodeSettings.onError.options.stopWorkflow.description',
+									),
+								},
+								{
+									name: this.$locale.baseText(
+										'nodeSettings.onError.options.continueRegularOutput.displayName',
+									),
+									value: 'continueRegularOutput',
+									description: this.$locale.baseText(
+										'nodeSettings.onError.options.continueRegularOutput.description',
+									),
+								},
+								{
+									name: this.$locale.baseText(
+										'nodeSettings.onError.options.continueErrorOutput.displayName',
+									),
+									value: 'continueErrorOutput',
+									description: this.$locale.baseText(
+										'nodeSettings.onError.options.continueErrorOutput.description',
+									),
+								},
+							],
+							default: 'stopWorkflow',
+							noDataExpression: true,
+							description: this.$locale.baseText('nodeSettings.onError.description'),
+						},
+					] as INodeProperties[]),
+				);
+			}
+			this.nodeSettings.push(
+				...([
+					{
+						displayName: this.$locale.baseText('nodeSettings.notes.displayName'),
+						name: 'notes',
+						type: 'string',
+						typeOptions: {
+							rows: 5,
+						},
+						default: '',
+						noDataExpression: true,
+						description: this.$locale.baseText('nodeSettings.notes.description'),
+					},
+					{
+						displayName: this.$locale.baseText('nodeSettings.notesInFlow.displayName'),
+						name: 'notesInFlow',
+						type: 'boolean',
+						default: false,
+						noDataExpression: true,
+						description: this.$locale.baseText('nodeSettings.notesInFlow.description'),
+					},
+				] as INodeProperties[]),
+			);
+		},
 		onParameterBlur(parameterName: string) {
 			this.hiddenIssuesInputs = this.hiddenIssuesInputs.filter((name) => name !== parameterName);
 		},
@@ -510,6 +626,7 @@ export default mixins(externalHooks, nodeHelpers).extend({
 		},
 		onNodeExecute() {
 			this.hiddenIssuesInputs = [];
+			(this.$refs.subConnections as InstanceType<typeof NDVSubConnections>)?.showNodeInputsIssues();
 			this.$emit('execute');
 		},
 		setValue(name: string, value: NodeParameterValue) {
@@ -527,46 +644,59 @@ export default mixins(externalHooks, nodeHelpers).extend({
 				}
 			}
 
-			// Set the value via Vue.set that everything updates correctly in the UI
+			// Set the value so that everything updates correctly in the UI
 			if (nameParts.length === 0) {
 				// Data is on top level
 				if (value === null) {
 					// Property should be deleted
-					// @ts-ignore
-					Vue.delete(this.nodeValues, lastNamePart);
+					const { [lastNamePart]: removedNodeValue, ...remainingNodeValues } = this.nodeValues;
+					this.nodeValues = remainingNodeValues;
 				} else {
 					// Value should be set
-					// @ts-ignore
-					Vue.set(this.nodeValues, lastNamePart, value);
+					this.nodeValues = {
+						...this.nodeValues,
+						[lastNamePart as string]: value,
+					};
 				}
 			} else {
 				// Data is on lower level
 				if (value === null) {
 					// Property should be deleted
-					// @ts-ignore
 					let tempValue = get(this.nodeValues, nameParts.join('.')) as
 						| INodeParameters
 						| INodeParameters[];
-					Vue.delete(tempValue as object, lastNamePart as string);
 
-					if (isArray === true && (tempValue as INodeParameters[]).length === 0) {
+					const { [lastNamePart]: removedNodeValue, ...remainingNodeValues } = tempValue;
+					tempValue = remainingNodeValues;
+
+					if (isArray && (tempValue as INodeParameters[]).length === 0) {
 						// If a value from an array got delete and no values are left
 						// delete also the parent
 						lastNamePart = nameParts.pop();
 						tempValue = get(this.nodeValues, nameParts.join('.')) as INodeParameters;
-						Vue.delete(tempValue as object, lastNamePart as string);
+						const { [lastNamePart]: removedArrayNodeValue, ...remainingArrayNodeValues } =
+							tempValue;
+						tempValue = remainingArrayNodeValues;
 					}
 				} else {
 					// Value should be set
 					if (typeof value === 'object') {
-						// @ts-ignore
-						Vue.set(get(this.nodeValues, nameParts.join('.')), lastNamePart, deepCopy(value));
+						set(
+							get(this.nodeValues, nameParts.join('.')) as Record<string, unknown>,
+							lastNamePart as string,
+							deepCopy(value),
+						);
 					} else {
-						// @ts-ignore
-						Vue.set(get(this.nodeValues, nameParts.join('.')), lastNamePart, value);
+						set(
+							get(this.nodeValues, nameParts.join('.')) as Record<string, unknown>,
+							lastNamePart as string,
+							value,
+						);
 					}
 				}
 			}
+
+			this.nodeValues = { ...this.nodeValues };
 		},
 		credentialSelected(updateInformation: INodeUpdatePropertiesInformation) {
 			// Update the values on the node
@@ -576,10 +706,10 @@ export default mixins(externalHooks, nodeHelpers).extend({
 
 			if (node) {
 				// Update the issues
-				this.updateNodeCredentialIssues(node);
+				this.nodeHelpers.updateNodeCredentialIssues(node);
 			}
 
-			this.$externalHooks().run('nodeSettings.credentialSelected', { updateInformation });
+			void this.externalHooks.run('nodeSettings.credentialSelected', { updateInformation });
 		},
 		nameChanged(name: string) {
 			if (this.node) {
@@ -603,13 +733,18 @@ export default mixins(externalHooks, nodeHelpers).extend({
 			}
 			// Save the node name before we commit the change because
 			// we need the old name to rename the node properly
-			const nodeNameBefore = parameterData.node || this.node.name;
+			const nodeNameBefore = parameterData.node || this.node?.name;
 			const node = this.workflowsStore.getNodeByName(nodeNameBefore);
 
 			if (node === null) {
 				return;
 			}
 
+			if (parameterData.name === 'onError') {
+				// If that parameter changes, we need to redraw the connections, as the error output may need to be added or removed
+				this.$emit('redrawRequired');
+			}
+
 			if (parameterData.name === 'name') {
 				// Name of node changed so we have to set also the new node name as active
 
@@ -663,7 +798,7 @@ export default mixins(externalHooks, nodeHelpers).extend({
 
 						if (Array.isArray(data)) {
 							data.splice(parseInt(index, 10), 1);
-							Vue.set(nodeParameters as object, path, data);
+							set(nodeParameters as object, path, data);
 						}
 					} else {
 						if (newValue === undefined) {
@@ -673,7 +808,7 @@ export default mixins(externalHooks, nodeHelpers).extend({
 						}
 					}
 
-					this.$externalHooks().run('nodeSettings.valueChanged', {
+					void this.externalHooks.run('nodeSettings.valueChanged', {
 						parameterPath,
 						newValue,
 						parameters: this.parameters,
@@ -705,8 +840,8 @@ export default mixins(externalHooks, nodeHelpers).extend({
 
 					this.workflowsStore.setNodeParameters(updateInformation);
 
-					this.updateNodeParameterIssues(node, nodeType);
-					this.updateNodeCredentialIssues(node);
+					this.nodeHelpers.updateNodeParameterIssuesByName(node.name);
+					this.nodeHelpers.updateNodeCredentialIssuesByName(node.name);
 				}
 			} else if (parameterData.name.startsWith('parameters.')) {
 				// A node parameter changed
@@ -716,6 +851,20 @@ export default mixins(externalHooks, nodeHelpers).extend({
 					return;
 				}
 
+				if (
+					parameterData.type &&
+					this.workflowsStore.nodeHasOutputConnection(node.name) &&
+					SHOULD_CLEAR_NODE_OUTPUTS[nodeType.name]?.eventTypes.includes(parameterData.type) &&
+					SHOULD_CLEAR_NODE_OUTPUTS[nodeType.name]?.parameterPaths.includes(parameterData.name)
+				) {
+					this.workflowsStore.removeAllNodeConnection(node, { preserveInputConnections: true });
+					this.showMessage({
+						type: 'warning',
+						title: this.$locale.baseText('nodeSettings.outputCleared.title'),
+						message: this.$locale.baseText('nodeSettings.outputCleared.message'),
+					});
+				}
+
 				// Get only the parameters which are different to the defaults
 				let nodeParameters = NodeHelpers.getNodeParameters(
 					nodeType.properties,
@@ -747,7 +896,7 @@ export default mixins(externalHooks, nodeHelpers).extend({
 
 					if (Array.isArray(data)) {
 						data.splice(parseInt(index, 10), 1);
-						Vue.set(nodeParameters as object, path, data);
+						set(nodeParameters as object, path, data);
 					}
 				} else {
 					if (newValue === undefined) {
@@ -755,6 +904,12 @@ export default mixins(externalHooks, nodeHelpers).extend({
 					} else {
 						set(nodeParameters as object, parameterPath, newValue);
 					}
+					// If value is updated, remove parameter values that have invalid options
+					// so getNodeParameters checks don't fail
+					this.removeMismatchedOptionValues(nodeType, nodeParameters, {
+						name: parameterPath,
+						value: newValue,
+					});
 				}
 
 				// Get the parameters with the now new defaults according to the
@@ -781,20 +936,24 @@ export default mixins(externalHooks, nodeHelpers).extend({
 
 				this.workflowsStore.setNodeParameters(updateInformation);
 
-				this.$externalHooks().run('nodeSettings.valueChanged', {
+				void this.externalHooks.run('nodeSettings.valueChanged', {
 					parameterPath,
 					newValue,
 					parameters: this.parameters,
 					oldNodeParameters,
 				});
 
-				this.updateNodeParameterIssues(node, nodeType);
-				this.updateNodeCredentialIssues(node);
+				this.nodeHelpers.updateNodeParameterIssuesByName(node.name);
+				this.nodeHelpers.updateNodeCredentialIssuesByName(node.name);
+				this.$telemetry.trackNodeParametersValuesChange(nodeType.name, parameterData);
 			} else {
 				// A property on the node itself changed
 
 				// Update data in settings
-				Vue.set(this.nodeValues, parameterData.name, newValue);
+				this.nodeValues = {
+					...this.nodeValues,
+					[parameterData.name]: newValue,
+				};
 
 				// Update data in vuex
 				const updateInformation = {
@@ -806,12 +965,57 @@ export default mixins(externalHooks, nodeHelpers).extend({
 				this.workflowsStore.setNodeValue(updateInformation);
 			}
 		},
+		/**
+		 * Removes node values that are not valid options for the given parameter.
+		 * This can happen when there are multiple node parameters with the same name
+		 * but different options and display conditions
+		 * @param nodeType The node type description
+		 * @param nodeParameterValues Current node parameter values
+		 * @param updatedParameter The parameter that was updated. Will be used to determine which parameters to remove based on their display conditions and option values
+		 */
+		removeMismatchedOptionValues(
+			nodeType: INodeTypeDescription,
+			nodeParameterValues: INodeParameters | null,
+			updatedParameter: { name: string; value: NodeParameterValue },
+		) {
+			nodeType.properties.forEach((prop) => {
+				const displayOptions = prop.displayOptions;
+				// Not processing parameters that are not set or don't have options
+				if (!nodeParameterValues?.hasOwnProperty(prop.name) || !displayOptions || !prop.options) {
+					return;
+				}
+				// Only process the parameters that depend on the updated parameter
+				const showCondition = displayOptions.show?.[updatedParameter.name];
+				const hideCondition = displayOptions.hide?.[updatedParameter.name];
+				if (showCondition === undefined && hideCondition === undefined) {
+					return;
+				}
+
+				let hasValidOptions = true;
+
+				// Every value should be a possible option
+				if (isINodePropertyCollectionList(prop.options) || isINodePropertiesList(prop.options)) {
+					hasValidOptions = Object.keys(nodeParameterValues).every(
+						(key) => (prop.options ?? []).find((option) => option.name === key) !== undefined,
+					);
+				} else if (isINodePropertyOptionsList(prop.options)) {
+					hasValidOptions = !!prop.options.find(
+						(option) => option.value === nodeParameterValues[prop.name],
+					);
+				}
+
+				if (!hasValidOptions && displayParameter(nodeParameterValues, prop, this.node)) {
+					unset(nodeParameterValues as object, prop.name);
+				}
+			});
+		},
 		/**
 		 * Sets the values of the active node in the internal settings variables
 		 */
 		setNodeValues() {
+			// No node selected
 			if (!this.node) {
-				// No node selected
+				this.nodeValuesInitialized = true;
 				return;
 			}
 
@@ -821,61 +1025,104 @@ export default mixins(externalHooks, nodeHelpers).extend({
 				const foundNodeSettings = [];
 				if (this.node.color) {
 					foundNodeSettings.push('color');
-					Vue.set(this.nodeValues, 'color', this.node.color);
+					this.nodeValues = {
+						...this.nodeValues,
+						color: this.node.color,
+					};
 				}
 
 				if (this.node.notes) {
 					foundNodeSettings.push('notes');
-					Vue.set(this.nodeValues, 'notes', this.node.notes);
+					this.nodeValues = {
+						...this.nodeValues,
+						notes: this.node.notes,
+					};
 				}
 
 				if (this.node.alwaysOutputData) {
 					foundNodeSettings.push('alwaysOutputData');
-					Vue.set(this.nodeValues, 'alwaysOutputData', this.node.alwaysOutputData);
+					this.nodeValues = {
+						...this.nodeValues,
+						alwaysOutputData: this.node.alwaysOutputData,
+					};
 				}
 
 				if (this.node.executeOnce) {
 					foundNodeSettings.push('executeOnce');
-					Vue.set(this.nodeValues, 'executeOnce', this.node.executeOnce);
+					this.nodeValues = {
+						...this.nodeValues,
+						executeOnce: this.node.executeOnce,
+					};
 				}
 
 				if (this.node.continueOnFail) {
-					foundNodeSettings.push('continueOnFail');
-					Vue.set(this.nodeValues, 'continueOnFail', this.node.continueOnFail);
+					foundNodeSettings.push('onError');
+					this.nodeValues = {
+						...this.nodeValues,
+						onError: 'continueRegularOutput',
+					};
+				}
+
+				if (this.node.onError) {
+					foundNodeSettings.push('onError');
+					this.nodeValues = {
+						...this.nodeValues,
+						onError: this.node.onError,
+					};
 				}
 
 				if (this.node.notesInFlow) {
 					foundNodeSettings.push('notesInFlow');
-					Vue.set(this.nodeValues, 'notesInFlow', this.node.notesInFlow);
+					this.nodeValues = {
+						...this.nodeValues,
+						notesInFlow: this.node.notesInFlow,
+					};
 				}
 
 				if (this.node.retryOnFail) {
 					foundNodeSettings.push('retryOnFail');
-					Vue.set(this.nodeValues, 'retryOnFail', this.node.retryOnFail);
+					this.nodeValues = {
+						...this.nodeValues,
+						retryOnFail: this.node.retryOnFail,
+					};
 				}
 
 				if (this.node.maxTries) {
 					foundNodeSettings.push('maxTries');
-					Vue.set(this.nodeValues, 'maxTries', this.node.maxTries);
+					this.nodeValues = {
+						...this.nodeValues,
+						maxTries: this.node.maxTries,
+					};
 				}
 
 				if (this.node.waitBetweenTries) {
 					foundNodeSettings.push('waitBetweenTries');
-					Vue.set(this.nodeValues, 'waitBetweenTries', this.node.waitBetweenTries);
+					this.nodeValues = {
+						...this.nodeValues,
+						waitBetweenTries: this.node.waitBetweenTries,
+					};
 				}
 
 				// Set default node settings
 				for (const nodeSetting of this.nodeSettings) {
 					if (!foundNodeSettings.includes(nodeSetting.name)) {
 						// Set default value
-						Vue.set(this.nodeValues, nodeSetting.name, nodeSetting.default);
+						this.nodeValues = {
+							...this.nodeValues,
+							[nodeSetting.name]: nodeSetting.default,
+						};
 					}
 				}
 
-				Vue.set(this.nodeValues, 'parameters', deepCopy(this.node.parameters));
+				this.nodeValues = {
+					...this.nodeValues,
+					parameters: deepCopy(this.node.parameters),
+				};
 			} else {
 				this.nodeValid = false;
 			}
+
+			this.nodeValuesInitialized = true;
 		},
 		onMissingNodeTextClick(event: MouseEvent) {
 			if ((event.target as Element).localName === 'a') {
@@ -887,8 +1134,8 @@ export default mixins(externalHooks, nodeHelpers).extend({
 		onMissingNodeLearnMoreLinkClick() {
 			this.$telemetry.track('user clicked cnr docs link', {
 				source: 'missing node modal source',
-				package_name: this.node.type.split('.')[0],
-				node_type: this.node.type,
+				package_name: this.node?.type.split('.')[0],
+				node_type: this.node?.type,
 			});
 		},
 		onStopExecution() {
@@ -898,16 +1145,6 @@ export default mixins(externalHooks, nodeHelpers).extend({
 			this.openPanel = 'settings';
 		},
 	},
-	mounted() {
-		this.populateHiddenIssuesSet();
-		this.setNodeValues();
-		this.eventBus?.on('openSettings', this.openSettings);
-
-		this.updateNodeParameterIssues(this.node as INodeUi, this.nodeType);
-	},
-	destroyed() {
-		this.eventBus?.off('openSettings', this.openSettings);
-	},
 });
 </script>
 
@@ -927,8 +1164,10 @@ export default mixins(externalHooks, nodeHelpers).extend({
 }
 </style>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .node-settings {
+	display: flex;
+	flex-direction: column;
 	overflow: hidden;
 	background-color: var(--color-background-xlight);
 	height: 100%;
@@ -961,9 +1200,9 @@ export default mixins(externalHooks, nodeHelpers).extend({
 	}
 
 	.node-parameters-wrapper {
-		height: 100%;
 		overflow-y: auto;
-		padding: 0 20px 200px 20px;
+		padding: 0 var(--spacing-m) var(--spacing-l) var(--spacing-m);
+		flex-grow: 1;
 	}
 
 	&.dragging {
@@ -1007,6 +1246,14 @@ export default mixins(externalHooks, nodeHelpers).extend({
 	top: -25px;
 }
 
+.node-version {
+	border-top: var(--border-base);
+	font-size: var(--font-size-xs);
+	font-size: var(--font-size-2xs);
+	padding: var(--spacing-xs) 0 var(--spacing-2xs) 0;
+	color: var(--color-text-light);
+}
+
 .parameter-value {
 	input.expression {
 		border-style: dashed;
diff --git a/packages/editor-ui/src/components/NodeSettingsTabs.vue b/packages/editor-ui/src/components/NodeSettingsTabs.vue
index 737a4527f0414..741cd43ab3f69 100644
--- a/packages/editor-ui/src/components/NodeSettingsTabs.vue
+++ b/packages/editor-ui/src/components/NodeSettingsTabs.vue
@@ -1,34 +1,47 @@
 <template>
-	<n8n-tabs :options="options" :value="value" @input="onTabSelect" @tooltipClick="onTooltipClick" />
+	<n8n-tabs
+		:options="options"
+		:model-value="modelValue"
+		@update:model-value="onTabSelect"
+		@tooltip-click="onTooltipClick"
+	/>
 </template>
 
 <script lang="ts">
-import { externalHooks } from '@/mixins/externalHooks';
+import { defineComponent } from 'vue';
+import { mapStores } from 'pinia';
 import {
 	BUILTIN_NODES_DOCS_URL,
 	COMMUNITY_NODES_INSTALLATION_DOCS_URL,
 	NPM_PACKAGE_DOCS_BASE_URL,
 } from '@/constants';
 import type { INodeUi, ITab } from '@/Interface';
-import { useNDVStore } from '@/stores/ndv';
-import { useWorkflowsStore } from '@/stores/workflows';
+import { useNDVStore } from '@/stores/ndv.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
 import type { INodeTypeDescription } from 'n8n-workflow';
-import { mapStores } from 'pinia';
+import { NodeConnectionType } from 'n8n-workflow';
 
-import mixins from 'vue-typed-mixins';
-import { isCommunityPackageName } from '@/utils';
+import { isCommunityPackageName } from '@/utils/nodeTypesUtils';
+import { useExternalHooks } from '@/composables/useExternalHooks';
 
-export default mixins(externalHooks).extend({
+export default defineComponent({
 	name: 'NodeSettingsTabs',
 	props: {
-		value: {
+		modelValue: {
 			type: String,
+			default: '',
 		},
 		nodeType: {},
-		sessionId: {
+		pushRef: {
 			type: String,
 		},
 	},
+	setup() {
+		const externalHooks = useExternalHooks();
+		return {
+			externalHooks,
+		};
+	},
 	computed: {
 		...mapStores(useNDVStore, useWorkflowsStore),
 		activeNode(): INodeUi | null {
@@ -115,15 +128,15 @@ export default mixins(externalHooks).extend({
 	methods: {
 		onTabSelect(tab: string) {
 			if (tab === 'docs' && this.nodeType) {
-				this.$externalHooks().run('dataDisplay.onDocumentationUrlClick', {
+				void this.externalHooks.run('dataDisplay.onDocumentationUrlClick', {
 					nodeType: this.nodeType as INodeTypeDescription,
 					documentationUrl: this.documentationUrl,
 				});
 				this.$telemetry.track('User clicked ndv link', {
 					node_type: this.activeNode.type,
 					workflow_id: this.workflowsStore.workflowId,
-					session_id: this.sessionId,
-					pane: 'main',
+					push_ref: this.pushRef,
+					pane: NodeConnectionType.Main,
 					type: 'docs',
 				});
 			}
@@ -136,7 +149,7 @@ export default mixins(externalHooks).extend({
 			}
 
 			if (tab === 'settings' || tab === 'params') {
-				this.$emit('input', tab);
+				this.$emit('update:modelValue', tab);
 			}
 		},
 		onTooltipClick(tab: string, event: MouseEvent) {
diff --git a/packages/editor-ui/src/components/NodeTitle.vue b/packages/editor-ui/src/components/NodeTitle.vue
index 87b9c352c666e..a38609d13661c 100644
--- a/packages/editor-ui/src/components/NodeTitle.vue
+++ b/packages/editor-ui/src/components/NodeTitle.vue
@@ -1,7 +1,7 @@
 <template>
 	<span :class="$style.container" data-test-id="node-title-container" @click="onEdit">
-		<span :class="$style.iconWrapper"><NodeIcon :nodeType="nodeType" :size="18" /></span>
-		<n8n-popover placement="right" width="200" :value="editName" :disabled="!editable">
+		<span :class="$style.iconWrapper"><NodeIcon :node-type="nodeType" :size="18" /></span>
+		<n8n-popover placement="right" width="200" :visible="editName" :disabled="!editable">
 			<div
 				:class="$style.editContainer"
 				@keydown.enter="onRename"
@@ -11,27 +11,27 @@
 				<n8n-text :bold="true" color="text-base" tag="div">{{
 					$locale.baseText('ndv.title.renameNode')
 				}}</n8n-text>
-				<n8n-input ref="input" size="small" v-model="newName" data-test-id="node-rename-input" />
+				<n8n-input ref="input" v-model="newName" size="small" data-test-id="node-rename-input" />
 				<div :class="$style.editButtons">
 					<n8n-button
 						type="secondary"
 						size="small"
-						@click="editName = false"
 						:label="$locale.baseText('ndv.title.cancel')"
+						@click="editName = false"
 					/>
 					<n8n-button
 						type="primary"
 						size="small"
-						@click="onRename"
 						:label="$locale.baseText('ndv.title.rename')"
+						@click="onRename"
 					/>
 				</div>
 			</div>
 			<template #reference>
-				<div class="ph-no-capture" :class="{ [$style.title]: true, [$style.hoverable]: editable }">
-					{{ value }}
+				<div :class="{ [$style.title]: true, [$style.hoverable]: editable }">
+					{{ modelValue }}
 					<div :class="$style.editIconContainer">
-						<font-awesome-icon :class="$style.editIcon" icon="pencil-alt" v-if="editable" />
+						<font-awesome-icon v-if="editable" :class="$style.editIcon" icon="pencil-alt" />
 					</div>
 				</div>
 			</template>
@@ -40,13 +40,18 @@
 </template>
 
 <script lang="ts">
+import NodeIcon from '@/components/NodeIcon.vue';
 import { defineComponent } from 'vue';
 
 export default defineComponent({
 	name: 'NodeTitle',
+	components: {
+		NodeIcon,
+	},
 	props: {
-		value: {
+		modelValue: {
 			type: String,
+			default: '',
 		},
 		nodeType: {},
 		readOnly: {
@@ -66,19 +71,18 @@ export default defineComponent({
 		},
 	},
 	methods: {
-		onEdit() {
-			this.newName = this.value;
+		async onEdit() {
+			this.newName = this.modelValue;
 			this.editName = true;
-			this.$nextTick(() => {
-				const inputRef = this.$refs.input as HTMLInputElement | undefined;
-				if (inputRef) {
-					inputRef.focus();
-				}
-			});
+			await this.$nextTick();
+			const inputRef = this.$refs.input as HTMLInputElement | undefined;
+			if (inputRef) {
+				inputRef.focus();
+			}
 		},
 		onRename() {
 			if (this.newName.trim() !== '') {
-				this.$emit('input', this.newName.trim());
+				this.$emit('update:modelValue', this.newName.trim());
 			}
 
 			this.editName = false;
diff --git a/packages/editor-ui/src/components/NodeWebhooks.vue b/packages/editor-ui/src/components/NodeWebhooks.vue
index 9e50397f45529..5ee9d9979fb0a 100644
--- a/packages/editor-ui/src/components/NodeWebhooks.vue
+++ b/packages/editor-ui/src/components/NodeWebhooks.vue
@@ -1,49 +1,34 @@
 <template>
-	<div v-if="webhooksNode.length" class="webhooks">
+	<div v-if="webhooksNode.length && visibleWebhookUrls.length > 0" class="webhooks">
 		<div
 			class="clickable headline"
 			:class="{ expanded: !isMinimized }"
+			:title="isMinimized ? baseText.clickToDisplay : baseText.clickToHide"
 			@click="isMinimized = !isMinimized"
-			:title="
-				isMinimized
-					? $locale.baseText('nodeWebhooks.clickToDisplayWebhookUrls')
-					: $locale.baseText('nodeWebhooks.clickToHideWebhookUrls')
-			"
 		>
-			<font-awesome-icon icon="angle-down" class="minimize-button minimize-icon" />
-			{{ $locale.baseText('nodeWebhooks.webhookUrls') }}
+			<font-awesome-icon icon="angle-right" class="minimize-button minimize-icon" />
+			{{ baseText.toggleTitle }}
 		</div>
 		<el-collapse-transition>
-			<div class="node-webhooks" v-if="!isMinimized">
-				<div class="url-selection">
+			<div v-if="!isMinimized" class="node-webhooks">
+				<div v-if="!isProductionOnly" class="url-selection">
 					<el-row>
 						<el-col :span="24">
-							<n8n-radio-buttons
-								v-model="showUrlFor"
-								:options="[
-									{ label: this.$locale.baseText('nodeWebhooks.testUrl'), value: 'test' },
-									{
-										label: this.$locale.baseText('nodeWebhooks.productionUrl'),
-										value: 'production',
-									},
-								]"
-							/>
+							<n8n-radio-buttons v-model="showUrlFor" :options="urlOptions" />
 						</el-col>
 					</el-row>
 				</div>
 
 				<n8n-tooltip
-					v-for="(webhook, index) in webhooksNode"
+					v-for="(webhook, index) in visibleWebhookUrls"
 					:key="index"
 					class="item"
-					:content="$locale.baseText('nodeWebhooks.clickToCopyWebhookUrls')"
+					:content="baseText.clickToCopy"
 					placement="left"
 				>
-					<div class="webhook-wrapper">
+					<div v-if="isWebhookMethodVisible(webhook)" class="webhook-wrapper">
 						<div class="http-field">
-							<div class="http-method">
-								{{ getWebhookExpressionValue(webhook, 'httpMethod') }}<br />
-							</div>
+							<div class="http-method">{{ getWebhookHttpMethod(webhook) }}<br /></div>
 						</div>
 						<div class="url-field">
 							<div class="webhook-url left-ellipsis clickable" @click="copyWebhookUrl(webhook)">
@@ -51,6 +36,13 @@
 							</div>
 						</div>
 					</div>
+					<div v-else class="webhook-wrapper">
+						<div class="url-field-full-width">
+							<div class="webhook-url left-ellipsis clickable" @click="copyWebhookUrl(webhook)">
+								{{ getWebhookUrlDisplay(webhook) }}<br />
+							</div>
+						</div>
+					</div>
 				</n8n-tooltip>
 			</div>
 		</el-collapse-transition>
@@ -59,27 +51,63 @@
 
 <script lang="ts">
 import type { INodeTypeDescription, IWebhookDescription } from 'n8n-workflow';
+import { defineComponent } from 'vue';
 
-import { WEBHOOK_NODE_TYPE } from '@/constants';
-import { copyPaste } from '@/mixins/copyPaste';
-import { showMessage } from '@/mixins/showMessage';
-import { workflowHelpers } from '@/mixins/workflowHelpers';
-
-import mixins from 'vue-typed-mixins';
+import { useToast } from '@/composables/useToast';
+import {
+	CHAT_TRIGGER_NODE_TYPE,
+	FORM_TRIGGER_NODE_TYPE,
+	OPEN_URL_PANEL_TRIGGER_NODE_TYPES,
+	PRODUCTION_ONLY_TRIGGER_NODE_TYPES,
+} from '@/constants';
+import { useClipboard } from '@/composables/useClipboard';
+import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
+import { useRouter } from 'vue-router';
 
-export default mixins(copyPaste, showMessage, workflowHelpers).extend({
+export default defineComponent({
 	name: 'NodeWebhooks',
 	props: [
 		'node', // NodeUi
 		'nodeType', // INodeTypeDescription
 	],
+	setup() {
+		const router = useRouter();
+		const clipboard = useClipboard();
+		const workflowHelpers = useWorkflowHelpers({ router });
+		return {
+			clipboard,
+			workflowHelpers,
+			...useToast(),
+		};
+	},
 	data() {
 		return {
-			isMinimized: this.nodeType && this.nodeType.name !== WEBHOOK_NODE_TYPE,
+			isMinimized: this.nodeType && !OPEN_URL_PANEL_TRIGGER_NODE_TYPES.includes(this.nodeType.name),
 			showUrlFor: 'test',
 		};
 	},
 	computed: {
+		isProductionOnly(): boolean {
+			return this.nodeType && PRODUCTION_ONLY_TRIGGER_NODE_TYPES.includes(this.nodeType.name);
+		},
+		urlOptions(): Array<{ label: string; value: string }> {
+			return [
+				...(this.isProductionOnly ? [] : [{ label: this.baseText.testUrl, value: 'test' }]),
+				{
+					label: this.baseText.productionUrl,
+					value: 'production',
+				},
+			];
+		},
+		visibleWebhookUrls(): IWebhookDescription[] {
+			return this.webhooksNode.filter((webhook) => {
+				if (typeof webhook.ndvHideUrl === 'string') {
+					return !this.workflowHelpers.getWebhookExpressionValue(webhook, 'ndvHideUrl');
+				}
+
+				return !webhook.ndvHideUrl;
+			});
+		},
 		webhooksNode(): IWebhookDescription[] {
 			if (this.nodeType === null || this.nodeType.webhooks === undefined) {
 				return [];
@@ -89,14 +117,64 @@ export default mixins(copyPaste, showMessage, workflowHelpers).extend({
 				(webhookData) => webhookData.restartWebhook !== true,
 			);
 		},
+		baseText() {
+			const nodeType = this.nodeType.name;
+			switch (nodeType) {
+				case CHAT_TRIGGER_NODE_TYPE:
+					return {
+						toggleTitle: this.$locale.baseText('nodeWebhooks.webhookUrls.chatTrigger'),
+						clickToDisplay: this.$locale.baseText(
+							'nodeWebhooks.clickToDisplayWebhookUrls.formTrigger',
+						),
+						clickToHide: this.$locale.baseText('nodeWebhooks.clickToHideWebhookUrls.chatTrigger'),
+						clickToCopy: this.$locale.baseText('nodeWebhooks.clickToCopyWebhookUrls.chatTrigger'),
+						testUrl: this.$locale.baseText('nodeWebhooks.testUrl'),
+						productionUrl: this.$locale.baseText('nodeWebhooks.productionUrl'),
+						copyTitle: this.$locale.baseText('nodeWebhooks.showMessage.title.chatTrigger'),
+						copyMessage: this.$locale.baseText('nodeWebhooks.showMessage.message.chatTrigger'),
+					};
+
+				case FORM_TRIGGER_NODE_TYPE:
+					return {
+						toggleTitle: this.$locale.baseText('nodeWebhooks.webhookUrls.formTrigger'),
+						clickToDisplay: this.$locale.baseText(
+							'nodeWebhooks.clickToDisplayWebhookUrls.formTrigger',
+						),
+						clickToHide: this.$locale.baseText('nodeWebhooks.clickToHideWebhookUrls.formTrigger'),
+						clickToCopy: this.$locale.baseText('nodeWebhooks.clickToCopyWebhookUrls.formTrigger'),
+						testUrl: this.$locale.baseText('nodeWebhooks.testUrl'),
+						productionUrl: this.$locale.baseText('nodeWebhooks.productionUrl'),
+						copyTitle: this.$locale.baseText('nodeWebhooks.showMessage.title.formTrigger'),
+						copyMessage: this.$locale.baseText('nodeWebhooks.showMessage.message.formTrigger'),
+					};
+
+				default:
+					return {
+						toggleTitle: this.$locale.baseText('nodeWebhooks.webhookUrls'),
+						clickToDisplay: this.$locale.baseText('nodeWebhooks.clickToDisplayWebhookUrls'),
+						clickToHide: this.$locale.baseText('nodeWebhooks.clickToHideWebhookUrls'),
+						clickToCopy: this.$locale.baseText('nodeWebhooks.clickToCopyWebhookUrls'),
+						testUrl: this.$locale.baseText('nodeWebhooks.testUrl'),
+						productionUrl: this.$locale.baseText('nodeWebhooks.productionUrl'),
+						copyTitle: this.$locale.baseText('nodeWebhooks.showMessage.title'),
+						copyMessage: undefined,
+					};
+			}
+		},
+	},
+	watch: {
+		node() {
+			this.isMinimized = !OPEN_URL_PANEL_TRIGGER_NODE_TYPES.includes(this.nodeType.name);
+		},
 	},
 	methods: {
 		copyWebhookUrl(webhookData: IWebhookDescription): void {
 			const webhookUrl = this.getWebhookUrlDisplay(webhookData);
-			this.copyToClipboard(webhookUrl);
+			void this.clipboard.copy(webhookUrl);
 
-			this.$showMessage({
-				title: this.$locale.baseText('nodeWebhooks.showMessage.title'),
+			this.showMessage({
+				title: this.baseText.copyTitle,
+				message: this.baseText.copyMessage,
 				type: 'success',
 			});
 			this.$telemetry.track('User copied webhook URL', {
@@ -106,14 +184,35 @@ export default mixins(copyPaste, showMessage, workflowHelpers).extend({
 		},
 		getWebhookUrlDisplay(webhookData: IWebhookDescription): string {
 			if (this.node) {
-				return this.getWebhookUrl(webhookData, this.node, this.showUrlFor);
+				return this.workflowHelpers.getWebhookUrl(
+					webhookData,
+					this.node,
+					this.isProductionOnly ? 'production' : this.showUrlFor,
+				);
 			}
 			return '';
 		},
-	},
-	watch: {
-		node() {
-			this.isMinimized = this.nodeType.name !== WEBHOOK_NODE_TYPE;
+		isWebhookMethodVisible(webhook: IWebhookDescription): boolean {
+			try {
+				const method = this.workflowHelpers.getWebhookExpressionValue(webhook, 'httpMethod', false);
+				if (Array.isArray(method) && method.length !== 1) {
+					return false;
+				}
+			} catch (error) {}
+
+			if (typeof webhook.ndvHideMethod === 'string') {
+				return !this.workflowHelpers.getWebhookExpressionValue(webhook, 'ndvHideMethod');
+			}
+
+			return !webhook.ndvHideMethod;
+		},
+
+		getWebhookHttpMethod(webhook: IWebhookDescription): string {
+			const method = this.workflowHelpers.getWebhookExpressionValue(webhook, 'httpMethod', false);
+			if (Array.isArray(method)) {
+				return method[0];
+			}
+			return method;
 		},
 	},
 });
@@ -170,6 +269,10 @@ export default mixins(copyPaste, showMessage, workflowHelpers).extend({
 	width: calc(100% - 60px);
 	margin-left: 55px;
 }
+.url-field-full-width {
+	display: inline-block;
+	margin: 5px 10px;
+}
 
 .url-selection {
 	margin-top: var(--spacing-xs);
@@ -188,10 +291,10 @@ export default mixins(copyPaste, showMessage, workflowHelpers).extend({
 	transition-property: transform;
 }
 .expanded .minimize-button {
-	-webkit-transform: rotate(180deg);
-	-moz-transform: rotate(180deg);
-	-o-transform: rotate(180deg);
-	transform: rotate(180deg);
+	-webkit-transform: rotate(90deg);
+	-moz-transform: rotate(90deg);
+	-o-transform: rotate(90deg);
+	transform: rotate(90deg);
 }
 
 .webhook-url {
diff --git a/packages/editor-ui/src/components/OnboardingCallSignupModal.vue b/packages/editor-ui/src/components/OnboardingCallSignupModal.vue
index 5dab6526e2ac8..d8c67020500b1 100644
--- a/packages/editor-ui/src/components/OnboardingCallSignupModal.vue
+++ b/packages/editor-ui/src/components/OnboardingCallSignupModal.vue
@@ -2,10 +2,10 @@
 	<Modal
 		:name="ONBOARDING_CALL_SIGNUP_MODAL_KEY"
 		:title="$locale.baseText('onboardingCallSignupModal.title')"
-		:eventBus="modalBus"
+		:event-bus="modalBus"
 		:center="true"
-		:showClose="false"
-		:beforeClose="onModalClose"
+		:show-close="false"
+		:before-close="onModalClose"
 		width="460px"
 	>
 		<template #content>
@@ -29,7 +29,6 @@
 				<n8n-button
 					:label="$locale.baseText('onboardingCallSignupModal.cancelButton.label')"
 					:disabled="loading"
-					size="medium"
 					float="right"
 					type="outline"
 					@click="onCancel"
@@ -37,7 +36,6 @@
 				<n8n-button
 					:disabled="email === '' || loading"
 					:label="$locale.baseText('onboardingCallSignupModal.signupButton.label')"
-					size="medium"
 					float="right"
 					:loading="loading"
 					@click="onSignup"
@@ -51,18 +49,23 @@
 import { ONBOARDING_CALL_SIGNUP_MODAL_KEY, VALID_EMAIL_REGEX } from '@/constants';
 import Modal from './Modal.vue';
 
-import mixins from 'vue-typed-mixins';
-import { showMessage } from '@/mixins/showMessage';
+import { defineComponent } from 'vue';
+import { useToast } from '@/composables/useToast';
 import { mapStores } from 'pinia';
-import { useUIStore } from '@/stores/ui';
-import { createEventBus } from '@/event-bus';
+import { useUIStore } from '@/stores/ui.store';
+import { createEventBus } from 'n8n-design-system/utils';
 
-export default mixins(showMessage).extend({
+export default defineComponent({
+	name: 'OnboardingCallSignupModal',
 	components: {
 		Modal,
 	},
-	name: 'OnboardingCallSignupModal',
 	props: ['modalName'],
+	setup() {
+		return {
+			...useToast(),
+		};
+	},
 	data() {
 		return {
 			email: '',
@@ -91,7 +94,7 @@ export default mixins(showMessage).extend({
 
 			try {
 				await this.uiStore.applyForOnboardingCall(this.email);
-				this.$showMessage({
+				this.showMessage({
 					type: 'success',
 					title: this.$locale.baseText('onboardingCallSignupSucess.title'),
 					message: this.$locale.baseText('onboardingCallSignupSucess.message'),
@@ -99,7 +102,7 @@ export default mixins(showMessage).extend({
 				this.okToClose = true;
 				this.modalBus.emit('close');
 			} catch (e) {
-				this.$showError(
+				this.showError(
 					e,
 					this.$locale.baseText('onboardingCallSignupFailed.title'),
 					this.$locale.baseText('onboardingCallSignupFailed.message'),
diff --git a/packages/editor-ui/src/components/OutputPanel.vue b/packages/editor-ui/src/components/OutputPanel.vue
index ae84c84a53ce9..3082e29d62211 100644
--- a/packages/editor-ui/src/components/OutputPanel.vue
+++ b/packages/editor-ui/src/components/OutputPanel.vue
@@ -1,53 +1,47 @@
 <template>
 	<RunData
-		:nodeUi="node"
-		:runIndex="runIndex"
-		:linkedRuns="linkedRuns"
-		:canLinkRuns="canLinkRuns"
-		:tooMuchDataTitle="$locale.baseText('ndv.output.tooMuchData.title')"
-		:noDataInBranchMessage="$locale.baseText('ndv.output.noOutputDataInBranch')"
-		:isExecuting="isNodeRunning"
-		:executingMessage="$locale.baseText('ndv.output.executing')"
-		:sessionId="sessionId"
-		:blockUI="blockUI"
-		:isProductionExecutionPreview="isProductionExecutionPreview"
-		paneType="output"
-		@runChange="onRunIndexChange"
-		@linkRun="onLinkRun"
-		@unlinkRun="onUnlinkRun"
-		@tableMounted="$emit('tableMounted', $event)"
-		@itemHover="$emit('itemHover', $event)"
 		ref="runData"
+		:node="node"
+		:run-index="runIndex"
+		:linked-runs="linkedRuns"
+		:can-link-runs="canLinkRuns"
+		:too-much-data-title="$locale.baseText('ndv.output.tooMuchData.title')"
+		:no-data-in-branch-message="$locale.baseText('ndv.output.noOutputDataInBranch')"
+		:is-executing="isNodeRunning"
+		:executing-message="$locale.baseText('ndv.output.executing')"
+		:push-ref="pushRef"
+		:block-u-i="blockUI"
+		:is-production-execution-preview="isProductionExecutionPreview"
+		:is-pane-active="isPaneActive"
+		pane-type="output"
+		:data-output-type="outputMode"
+		@activate-pane="activatePane"
+		@run-change="onRunIndexChange"
+		@link-run="onLinkRun"
+		@unlink-run="onUnlinkRun"
+		@table-mounted="$emit('tableMounted', $event)"
+		@item-hover="$emit('itemHover', $event)"
+		@search="$emit('search', $event)"
 	>
 		<template #header>
 			<div :class="$style.titleSection">
-				<span :class="$style.title">
+				<template v-if="hasAiMetadata">
+					<n8n-radio-buttons
+						v-model="outputMode"
+						:options="outputTypes"
+						@update:model-value="onUpdateOutputMode"
+					/>
+				</template>
+				<span v-else :class="$style.title">
 					{{ $locale.baseText(outputPanelEditMode.enabled ? 'ndv.output.edit' : 'ndv.output') }}
 				</span>
 				<RunInfo
-					v-if="!hasPinData && runsCount === 1"
+					v-if="hasNodeRun && !pinnedData.hasData.value && runsCount === 1"
 					v-show="!outputPanelEditMode.enabled"
-					:taskData="runTaskData"
+					:task-data="runTaskData"
+					:has-stale-data="staleData"
+					:has-pin-data="pinnedData.hasData.value"
 				/>
-
-				<n8n-info-tip
-					theme="warning"
-					type="tooltip"
-					tooltipPlacement="right"
-					v-if="hasNodeRun && staleData"
-				>
-					<template>
-						<span
-							v-html="
-								$locale.baseText(
-									hasPinData
-										? 'ndv.output.staleDataWarning.pinData'
-										: 'ndv.output.staleDataWarning.regular',
-								)
-							"
-						></span>
-					</template>
-				</n8n-info-tip>
 			</div>
 		</template>
 
@@ -56,14 +50,19 @@
 				$locale.baseText('ndv.output.waitingToRun')
 			}}</n8n-text>
 			<n8n-text v-if="!workflowRunning" data-test-id="ndv-output-run-node-hint">
-				{{ $locale.baseText('ndv.output.runNodeHint') }}
-				<span @click="insertTestData" v-if="canPinData">
-					<br />
-					{{ $locale.baseText('generic.or') }}
-					<n8n-text tag="a" size="medium" color="primary">
-						{{ $locale.baseText('ndv.output.insertTestData') }}
-					</n8n-text>
-				</span>
+				<template v-if="isSubNodeType.value">
+					{{ $locale.baseText('ndv.output.runNodeHintSubNode') }}
+				</template>
+				<template v-else>
+					{{ $locale.baseText('ndv.output.runNodeHint') }}
+					<span v-if="canPinData" @click="insertTestData">
+						<br />
+						{{ $locale.baseText('generic.or') }}
+						<n8n-text tag="a" size="medium" color="primary">
+							{{ $locale.baseText('ndv.output.insertTestData') }}
+						</n8n-text>
+					</span>
+				</template>
 			</n8n-text>
 		</template>
 
@@ -80,7 +79,10 @@
 			</n8n-text>
 		</template>
 
-		<template #recovered-artifical-output-data>
+		<template v-if="outputMode === 'logs'" #content>
+			<RunDataAi :node="node" :run-index="runIndex" />
+		</template>
+		<template #recovered-artificial-output-data>
 			<div :class="$style.recoveredOutputData">
 				<n8n-text tag="div" :bold="true" color="text-dark" size="large">{{
 					$locale.baseText('executionDetails.executionFailed.recoveredNodeTitle')
@@ -91,34 +93,42 @@
 			</div>
 		</template>
 
-		<template #run-info v-if="!hasPinData && runsCount > 1">
-			<RunInfo :taskData="runTaskData" />
+		<template v-if="!pinnedData.hasData.value && runsCount > 1" #run-info>
+			<RunInfo :task-data="runTaskData" />
 		</template>
 	</RunData>
 </template>
 
 <script lang="ts">
+import { defineComponent } from 'vue';
 import type { IExecutionResponse, INodeUi } from '@/Interface';
 import type { INodeTypeDescription, IRunData, IRunExecutionData, ITaskData } from 'n8n-workflow';
-import type Vue from 'vue';
-import RunData, { EnterEditModeArgs } from './RunData.vue';
+import RunData from './RunData.vue';
 import RunInfo from './RunInfo.vue';
-import { pinData } from '@/mixins/pinData';
-import mixins from 'vue-typed-mixins';
-import { mapStores } from 'pinia';
-import { useUIStore } from '@/stores/ui';
-import { useWorkflowsStore } from '@/stores/workflows';
-import { useNDVStore } from '@/stores/ndv';
-import { useNodeTypesStore } from '@/stores/nodeTypes';
+import { mapStores, storeToRefs } from 'pinia';
+import { useUIStore } from '@/stores/ui.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useNDVStore } from '@/stores/ndv.store';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import RunDataAi from './RunDataAi/RunDataAi.vue';
+import { ndvEventBus } from '@/event-bus';
+import { useNodeType } from '@/composables/useNodeType';
+import { usePinnedData } from '@/composables/usePinnedData';
 
 type RunDataRef = InstanceType<typeof RunData>;
 
-export default mixins(pinData).extend({
+const OUTPUT_TYPE = {
+	REGULAR: 'regular',
+	LOGS: 'logs',
+};
+
+export default defineComponent({
 	name: 'OutputPanel',
-	components: { RunData, RunInfo },
+	components: { RunData, RunInfo, RunDataAi },
 	props: {
 		runIndex: {
 			type: Number,
+			required: true,
 		},
 		isReadOnly: {
 			type: Boolean,
@@ -129,7 +139,7 @@ export default mixins(pinData).extend({
 		canLinkRuns: {
 			type: Boolean,
 		},
-		sessionId: {
+		pushRef: {
 			type: String,
 		},
 		blockUI: {
@@ -140,6 +150,35 @@ export default mixins(pinData).extend({
 			type: Boolean,
 			default: false,
 		},
+		isPaneActive: {
+			type: Boolean,
+			default: false,
+		},
+	},
+	setup(props) {
+		const ndvStore = useNDVStore();
+		const { activeNode } = storeToRefs(ndvStore);
+		const { isSubNodeType } = useNodeType({
+			node: activeNode,
+		});
+		const pinnedData = usePinnedData(activeNode, {
+			runIndex: props.runIndex,
+			displayMode: ndvStore.getPanelDisplayMode('output'),
+		});
+
+		return {
+			pinnedData,
+			isSubNodeType,
+		};
+	},
+	data() {
+		return {
+			outputMode: 'regular',
+			outputTypes: [
+				{ label: this.$locale.baseText('ndv.output.outType.regular'), value: OUTPUT_TYPE.REGULAR },
+				{ label: this.$locale.baseText('ndv.output.outType.logs'), value: OUTPUT_TYPE.LOGS },
+			],
+		};
 	},
 	computed: {
 		...mapStores(useNodeTypesStore, useNDVStore, useUIStore, useWorkflowsStore),
@@ -155,15 +194,26 @@ export default mixins(pinData).extend({
 		isTriggerNode(): boolean {
 			return this.nodeTypesStore.isTriggerNode(this.node.type);
 		},
+		hasAiMetadata(): boolean {
+			if (this.node) {
+				const resultData = this.workflowsStore.getWorkflowResultDataByNodeName(this.node.name);
+
+				if (!resultData || !Array.isArray(resultData) || resultData.length === 0) {
+					return false;
+				}
+
+				return !!resultData[resultData.length - 1].metadata;
+			}
+			return false;
+		},
 		isPollingTypeNode(): boolean {
-			return !!(this.nodeType && this.nodeType.polling);
+			return !!this.nodeType?.polling;
 		},
 		isScheduleTrigger(): boolean {
 			return !!(this.nodeType && this.nodeType.group.includes('schedule'));
 		},
 		isNodeRunning(): boolean {
-			const executingNode = this.workflowsStore.executingNode;
-			return this.node && executingNode === this.node.name;
+			return this.node && this.workflowsStore.isNodeExecuting(this.node.name);
 		},
 		workflowRunning(): boolean {
 			return this.uiStore.isActionActive('workflowRunning');
@@ -176,7 +226,7 @@ export default mixins(pinData).extend({
 				return null;
 			}
 			const executionData: IRunExecutionData | undefined = this.workflowExecution.data;
-			if (!executionData || !executionData.resultData || !executionData.resultData.runData) {
+			if (!executionData?.resultData?.runData) {
 				return null;
 			}
 			return executionData.resultData.runData;
@@ -237,7 +287,7 @@ export default mixins(pinData).extend({
 			return this.ndvStore.outputPanelEditMode;
 		},
 		canPinData(): boolean {
-			return this.isPinDataNodeType && !this.isReadOnly;
+			return this.pinnedData.isValidNodeType.value && !this.isReadOnly;
 		},
 	},
 	methods: {
@@ -250,7 +300,7 @@ export default mixins(pinData).extend({
 
 				this.$telemetry.track('User clicked ndv link', {
 					workflow_id: this.workflowsStore.workflowId,
-					session_id: this.sessionId,
+					push_ref: this.pushRef,
 					node_type: this.node.type,
 					pane: 'output',
 					type: 'insert-test-data',
@@ -268,7 +318,7 @@ export default mixins(pinData).extend({
 			this.$telemetry.track('User clicked ndv link', {
 				node_type: this.node.type,
 				workflow_id: this.workflowsStore.workflowId,
-				session_id: this.sessionId,
+				push_ref: this.pushRef,
 				pane: 'output',
 				type: 'settings',
 			});
@@ -276,13 +326,34 @@ export default mixins(pinData).extend({
 		onRunIndexChange(run: number) {
 			this.$emit('runChange', run);
 		},
+		onUpdateOutputMode(outputMode: (typeof OUTPUT_TYPE)[string]) {
+			if (outputMode === OUTPUT_TYPE.LOGS) {
+				ndvEventBus.emit('setPositionByName', 'minLeft');
+			} else {
+				ndvEventBus.emit('setPositionByName', 'initial');
+			}
+		},
+		activatePane() {
+			this.$emit('activatePane');
+		},
 	},
 });
 </script>
 
 <style lang="scss" module>
+// The items count and displayModes are rendered in the RunData component
+// this is a workaround to hide it in the output panel(for ai type) to not add unnecessary one-time props
+:global([data-output-type='logs'] [class*='itemsCount']),
+:global([data-output-type='logs'] [class*='displayModes']) {
+	display: none;
+}
+.outputTypeSelect {
+	margin-bottom: var(--spacing-4xs);
+	width: fit-content;
+}
 .titleSection {
 	display: flex;
+	align-items: center;
 
 	> * {
 		margin-right: var(--spacing-2xs);
diff --git a/packages/editor-ui/src/components/PageAlert.vue b/packages/editor-ui/src/components/PageAlert.vue
index d3f914baf6bc1..5c3b463a69c42 100644
--- a/packages/editor-ui/src/components/PageAlert.vue
+++ b/packages/editor-ui/src/components/PageAlert.vue
@@ -1,15 +1,14 @@
 <template>
-	<fragment></fragment>
+	<span v-show="false" />
 </template>
 
 <script lang="ts">
-import mixins from 'vue-typed-mixins';
+import { defineComponent } from 'vue';
+import type { NotificationInstance } from 'element-plus';
+import { sanitizeHtml } from '@/utils/htmlUtils';
+import { useToast } from '@/composables/useToast';
 
-import { showMessage } from '@/mixins/showMessage';
-import type { ElMessageComponent } from 'element-ui/types/message';
-import { sanitizeHtml } from '@/utils';
-
-export default mixins(showMessage).extend({
+export default defineComponent({
 	name: 'PageAlert',
 	props: {
 		message: {
@@ -20,23 +19,28 @@ export default mixins(showMessage).extend({
 			type: String,
 		},
 	},
+	setup() {
+		return {
+			...useToast(),
+		};
+	},
 	data() {
 		return {
-			alert: null as null | ElMessageComponent,
+			alert: null as null | NotificationInstance,
 		};
 	},
 	mounted() {
-		this.alert = this.$showAlert({
+		this.alert = this.showAlert({
+			title: '',
 			message: sanitizeHtml(this.message),
 			type: 'warning',
 			duration: 0,
 			showClose: true,
 			dangerouslyUseHTMLString: true,
-			// @ts-ignore
 			customClass: this.popupClass || '',
 		});
 	},
-	beforeDestroy() {
+	beforeUnmount() {
 		if (this.alert) {
 			this.alert.close();
 		}
diff --git a/packages/editor-ui/src/components/PanelDragButton.vue b/packages/editor-ui/src/components/PanelDragButton.vue
index 58acc80d9f09f..e50d1cbeca63c 100644
--- a/packages/editor-ui/src/components/PanelDragButton.vue
+++ b/packages/editor-ui/src/components/PanelDragButton.vue
@@ -1,10 +1,10 @@
 <template>
 	<Draggable
 		type="panel-resize"
+		:class="$style.dragContainer"
 		@drag="onDrag"
 		@dragstart="onDragStart"
 		@dragend="onDragEnd"
-		:class="$style.dragContainer"
 	>
 		<template #default="{ isDragging }">
 			<div :class="{ [$style.dragButton]: true }">
diff --git a/packages/editor-ui/src/components/ParameterInput.vue b/packages/editor-ui/src/components/ParameterInput.vue
index 840c56599304f..e7b5e5c339a2e 100644
--- a/packages/editor-ui/src/components/ParameterInput.vue
+++ b/packages/editor-ui/src/components/ParameterInput.vue
@@ -1,49 +1,55 @@
 <template>
-	<div @keydown.stop :class="parameterInputClasses">
-		<expression-edit
-			:dialogVisible="expressionEditDialogVisible"
-			:value="
-				isResourceLocatorParameter && typeof value !== 'string' ? (value ? value.value : '') : value
-			"
+	<div ref="wrapper" :class="parameterInputClasses" @keydown.stop>
+		<ExpressionEdit
+			:dialog-visible="expressionEditDialogVisible"
+			:model-value="modelValueExpressionEdit"
 			:parameter="parameter"
 			:path="path"
-			:eventSource="eventSource || 'ndv'"
-			:isReadOnly="isReadOnly"
-			@closeDialog="closeExpressionEditDialog"
-			@valueChanged="expressionUpdated"
-		></expression-edit>
+			:event-source="eventSource || 'ndv'"
+			:is-read-only="isReadOnly"
+			:redact-values="shouldRedactValue"
+			@close-dialog="closeExpressionEditDialog"
+			@update:model-value="expressionUpdated"
+		></ExpressionEdit>
 		<div class="parameter-input ignore-key-press" :style="parameterInputWrapperStyle">
-			<resource-locator
+			<ResourceLocator
 				v-if="isResourceLocatorParameter"
 				ref="resourceLocator"
 				:parameter="parameter"
-				:value="value"
-				:displayTitle="displayTitle"
-				:expressionDisplayValue="expressionDisplayValue"
-				:expressionComputedValue="expressionEvaluated"
-				:isValueExpression="isValueExpression"
-				:isReadOnly="isReadOnly"
-				:parameterIssues="getIssues"
+				:model-value="modelValueResourceLocator"
+				:dependent-parameters-values="dependentParametersValues"
+				:display-title="displayTitle"
+				:expression-display-value="expressionDisplayValue"
+				:expression-computed-value="expressionEvaluated"
+				:is-value-expression="isModelValueExpression"
+				:is-read-only="isReadOnly"
+				:parameter-issues="getIssues"
 				:droppable="droppable"
 				:node="node"
 				:path="path"
-				@input="valueChanged"
-				@modalOpenerClick="openExpressionEditorModal"
+				:event-bus="eventBus"
+				@update:model-value="valueChanged"
+				@modal-opener-click="openExpressionEditorModal"
 				@focus="setFocus"
 				@blur="onBlur"
 				@drop="onResourceLocatorDrop"
 			/>
 			<ExpressionParameterInput
-				v-else-if="isValueExpression || forceShowExpression"
-				:value="expressionDisplayValue"
+				v-else-if="isModelValueExpression || forceShowExpression"
+				ref="inputField"
+				:model-value="expressionDisplayValue"
 				:title="displayTitle"
-				:isReadOnly="isReadOnly"
+				:is-read-only="isReadOnly"
+				:rows="rows"
+				:is-assignment="isAssignment"
 				:path="path"
-				@valueChanged="expressionUpdated"
-				@modalOpenerClick="openExpressionEditorModal"
+				:additional-expression-data="additionalExpressionData"
+				:class="{ 'ph-no-capture': shouldRedactValue }"
+				:event-bus="eventBus"
+				@update:model-value="expressionUpdated"
+				@modal-opener-click="openExpressionEditorModal"
 				@focus="setFocus"
 				@blur="onBlur"
-				ref="inputField"
 			/>
 			<div
 				v-else-if="
@@ -51,76 +57,209 @@
 					remoteParameterOptionsLoadingIssues !== null
 				"
 			>
-				<code-edit
-					v-if="codeEditDialogVisible"
-					:value="value"
-					:parameter="parameter"
-					:type="editorType"
-					:codeAutocomplete="codeAutocomplete"
-					:path="path"
-					:readonly="isReadOnly"
-					@closeDialog="closeCodeEditDialog"
-					@valueChanged="expressionUpdated"
-				></code-edit>
-				<text-edit
-					:dialogVisible="textEditDialogVisible"
-					:value="value"
-					:parameter="parameter"
-					:path="path"
-					:isReadOnly="isReadOnly"
-					@closeDialog="closeTextEditDialog"
-					@valueChanged="expressionUpdated"
-				></text-edit>
-
-				<code-node-editor
-					v-if="getArgument('editor') === 'codeNodeEditor' && isCodeNode(node)"
-					:mode="node.parameters.mode"
-					:jsCode="node.parameters.jsCode"
-					:isReadOnly="isReadOnly"
-					@valueChanged="valueChangedDebounced"
-				/>
+				<el-dialog
+					:model-value="codeEditDialogVisible"
+					append-to-body
+					width="80%"
+					:title="`${i18n.baseText('codeEdit.edit')} ${$locale
+						.nodeText()
+						.inputLabelDisplayName(parameter, path)}`"
+					:before-close="closeCodeEditDialog"
+					data-test-id="code-editor-fullscreen"
+				>
+					<div :key="codeEditDialogVisible.toString()" class="ignore-key-press code-edit-dialog">
+						<CodeNodeEditor
+							v-if="editorType === 'codeNodeEditor'"
+							:mode="codeEditorMode"
+							:model-value="modelValueString"
+							:default-value="parameter.default"
+							:language="editorLanguage"
+							:is-read-only="isReadOnly"
+							fill-parent
+							@update:model-value="valueChangedDebounced"
+						/>
+						<HtmlEditor
+							v-else-if="editorType === 'htmlEditor'"
+							:model-value="modelValueString"
+							:is-read-only="isReadOnly"
+							:rows="editorRows"
+							:disable-expression-coloring="!isHtmlNode"
+							:disable-expression-completions="!isHtmlNode"
+							fullscreen
+							@update:model-value="valueChangedDebounced"
+						/>
+						<SqlEditor
+							v-else-if="editorType === 'sqlEditor'"
+							:model-value="modelValueString"
+							:dialect="getArgument('sqlDialect')"
+							:is-read-only="isReadOnly"
+							:rows="editorRows"
+							fullscreen
+							@update:model-value="valueChangedDebounced"
+						/>
+						<JsEditor
+							v-else-if="editorType === 'jsEditor'"
+							:model-value="modelValueString"
+							:is-read-only="isReadOnly"
+							:rows="editorRows"
+							fill-parent
+							@update:model-value="valueChangedDebounced"
+						/>
 
-				<html-editor
-					v-else-if="getArgument('editor') === 'htmlEditor'"
-					:html="node.parameters.html"
-					:isReadOnly="isReadOnly"
-					:rows="getArgument('rows')"
-					:disableExpressionColoring="!isHtmlNode(node)"
-					:disableExpressionCompletions="!isHtmlNode(node)"
-					@valueChanged="valueChangedDebounced"
-				/>
+						<JsonEditor
+							v-else-if="parameter.type === 'json'"
+							:model-value="modelValueString"
+							:is-read-only="isReadOnly"
+							:rows="editorRows"
+							fill-parent
+							@update:model-value="valueChangedDebounced"
+						/>
+					</div>
+				</el-dialog>
 
-				<div
-					v-else-if="isEditor === true"
-					class="code-edit clickable ph-no-capture"
-					@click="displayEditDialog()"
+				<TextEdit
+					:dialog-visible="textEditDialogVisible"
+					:model-value="modelValue"
+					:parameter="parameter"
+					:path="path"
+					:is-read-only="isReadOnly"
+					@close-dialog="closeTextEditDialog"
+					@update:model-value="expressionUpdated"
+				></TextEdit>
+
+				<CodeNodeEditor
+					v-if="editorType === 'codeNodeEditor' && isCodeNode"
+					:key="'code-' + codeEditDialogVisible.toString()"
+					:mode="codeEditorMode"
+					:model-value="modelValueString"
+					:default-value="parameter.default"
+					:language="editorLanguage"
+					:is-read-only="isReadOnly"
+					:rows="editorRows"
+					:ai-button-enabled="settingsStore.isCloudDeployment"
+					@update:model-value="valueChangedDebounced"
+				>
+					<template #suffix>
+						<n8n-icon
+							data-test-id="code-editor-fullscreen-button"
+							icon="external-link-alt"
+							size="xsmall"
+							class="textarea-modal-opener"
+							:title="$locale.baseText('parameterInput.openEditWindow')"
+							@click="displayEditDialog()"
+						/>
+					</template>
+				</CodeNodeEditor>
+
+				<HtmlEditor
+					v-else-if="editorType === 'htmlEditor'"
+					:key="'html-' + codeEditDialogVisible.toString()"
+					:model-value="modelValueString"
+					:is-read-only="isReadOnly"
+					:rows="editorRows"
+					:disable-expression-coloring="!isHtmlNode"
+					:disable-expression-completions="!isHtmlNode"
+					@update:model-value="valueChangedDebounced"
+				>
+					<template #suffix>
+						<n8n-icon
+							data-test-id="code-editor-fullscreen-button"
+							icon="external-link-alt"
+							size="xsmall"
+							class="textarea-modal-opener"
+							:title="$locale.baseText('parameterInput.openEditWindow')"
+							@click="displayEditDialog()"
+						/>
+					</template>
+				</HtmlEditor>
+
+				<SqlEditor
+					v-else-if="editorType === 'sqlEditor'"
+					:key="'sql-' + codeEditDialogVisible.toString()"
+					:model-value="modelValueString"
+					:dialect="getArgument('sqlDialect')"
+					:is-read-only="isReadOnly"
+					:rows="editorRows"
+					@update:model-value="valueChangedDebounced"
+				>
+					<template #suffix>
+						<n8n-icon
+							data-test-id="code-editor-fullscreen-button"
+							icon="external-link-alt"
+							size="xsmall"
+							class="textarea-modal-opener"
+							:title="$locale.baseText('parameterInput.openEditWindow')"
+							@click="displayEditDialog()"
+						/>
+					</template>
+				</SqlEditor>
+
+				<JsEditor
+					v-else-if="editorType === 'jsEditor'"
+					:key="'js-' + codeEditDialogVisible.toString()"
+					:model-value="modelValueString"
+					:is-read-only="isReadOnly"
+					:rows="editorRows"
+					@update:model-value="valueChangedDebounced"
+				>
+					<template #suffix>
+						<n8n-icon
+							data-test-id="code-editor-fullscreen-button"
+							icon="external-link-alt"
+							size="xsmall"
+							class="textarea-modal-opener"
+							:title="$locale.baseText('parameterInput.openEditWindow')"
+							@click="displayEditDialog()"
+						/>
+					</template>
+				</JsEditor>
+
+				<JsonEditor
+					v-else-if="parameter.type === 'json'"
+					:key="'json-' + codeEditDialogVisible.toString()"
+					:model-value="modelValueString"
+					:is-read-only="isReadOnly"
+					:rows="editorRows"
+					@update:model-value="valueChangedDebounced"
 				>
-					<prism-editor
+					<template #suffix>
+						<n8n-icon
+							data-test-id="code-editor-fullscreen-button"
+							icon="external-link-alt"
+							size="xsmall"
+							class="textarea-modal-opener"
+							:title="$locale.baseText('parameterInput.openEditWindow')"
+							@click="displayEditDialog()"
+						/>
+					</template>
+				</JsonEditor>
+
+				<div v-else-if="editorType" class="readonly-code clickable" @click="displayEditDialog()">
+					<CodeNodeEditor
 						v-if="!codeEditDialogVisible"
-						:lineNumbers="true"
-						:readonly="true"
-						:code="displayValue"
-						language="js"
-					></prism-editor>
+						:mode="codeEditorMode"
+						:model-value="modelValueString"
+						:language="editorLanguage"
+						:is-read-only="true"
+						:rows="editorRows"
+					/>
 				</div>
 
-				<n8n-input
+				<N8nInput
 					v-else
-					v-model="tempValue"
 					ref="inputField"
-					class="input-with-opener"
+					v-model="tempValue"
+					:class="{ 'input-with-opener': true, 'ph-no-capture': shouldRedactValue }"
 					:size="inputSize"
 					:type="getStringInputType"
-					:rows="getArgument('rows')"
-					:value="displayValue"
+					:rows="editorRows"
 					:disabled="isReadOnly"
-					@input="onTextInputChange"
-					@change="valueChanged"
+					:title="displayTitle"
+					:placeholder="getPlaceholder()"
+					@update:model-value="(valueChanged($event) as undefined) && onUpdateTextInput($event)"
 					@keydown.stop
 					@focus="setFocus"
 					@blur="onBlur"
-					:title="displayTitle"
-					:placeholder="getPlaceholder()"
 				>
 					<template #suffix>
 						<n8n-icon
@@ -130,128 +269,128 @@
 							class="edit-window-button textarea-modal-opener"
 							:class="{
 								focused: isFocused,
-								invalid: !isFocused && getIssues.length > 0 && !isValueExpression,
+								invalid: !isFocused && getIssues.length > 0 && !isModelValueExpression,
 							}"
-							:title="$locale.baseText('parameterInput.openEditWindow')"
+							:title="i18n.baseText('parameterInput.openEditWindow')"
 							@click="displayEditDialog()"
 							@focus="setFocus"
 						/>
 					</template>
-				</n8n-input>
+				</N8nInput>
 			</div>
 
 			<div v-else-if="parameter.type === 'color'" ref="inputField" class="color-input">
 				<el-color-picker
 					size="small"
 					class="color-picker"
-					:value="displayValue"
+					:model-value="displayValue"
 					:disabled="isReadOnly"
-					@focus="setFocus"
-					@blur="onBlur"
-					@change="valueChanged"
 					:title="displayTitle"
 					:show-alpha="getArgument('showAlpha')"
+					@focus="setFocus"
+					@blur="onBlur"
+					@update:model-value="valueChanged"
 				/>
-				<n8n-input
+				<N8nInput
 					v-model="tempValue"
 					:size="inputSize"
 					type="text"
-					:value="tempValue"
 					:disabled="isReadOnly"
-					@change="valueChanged"
+					:title="displayTitle"
+					@update:model-value="valueChanged"
 					@keydown.stop
 					@focus="setFocus"
 					@blur="onBlur"
-					:title="displayTitle"
 				/>
 			</div>
 
 			<el-date-picker
 				v-else-if="parameter.type === 'dateTime'"
-				v-model="tempValue"
 				ref="inputField"
+				v-model="tempValue"
 				type="datetime"
+				value-format="YYYY-MM-DDTHH:mm:ss"
 				:size="inputSize"
-				:value="displayValue"
 				:title="displayTitle"
 				:disabled="isReadOnly"
 				:placeholder="
 					parameter.placeholder
 						? getPlaceholder()
-						: $locale.baseText('parameterInput.selectDateAndTime')
+						: i18n.baseText('parameterInput.selectDateAndTime')
 				"
 				:picker-options="dateTimePickerOptions"
-				@change="valueChanged"
+				:class="{ 'ph-no-capture': shouldRedactValue }"
+				@update:model-value="valueChanged"
 				@focus="setFocus"
 				@blur="onBlur"
 				@keydown.stop
 			/>
 
-			<n8n-input-number
+			<N8nInputNumber
 				v-else-if="parameter.type === 'number'"
 				ref="inputField"
 				:size="inputSize"
-				:value="displayValue"
+				:model-value="displayValue"
 				:controls="false"
 				:max="getArgument('maxValue')"
 				:min="getArgument('minValue')"
 				:precision="getArgument('numberPrecision')"
 				:disabled="isReadOnly"
-				@change="valueChanged"
-				@input="onTextInputChange"
+				:class="{ 'ph-no-capture': shouldRedactValue }"
+				:title="displayTitle"
+				:placeholder="parameter.placeholder"
+				@update:model-value="onUpdateTextInput"
 				@focus="setFocus"
 				@blur="onBlur"
 				@keydown.stop
-				:title="displayTitle"
-				:placeholder="parameter.placeholder"
 			/>
 
-			<credentials-select
+			<CredentialsSelect
 				v-else-if="parameter.type === 'credentialsSelect' || parameter.name === 'genericAuthType'"
 				ref="inputField"
 				:parameter="parameter"
 				:node="node"
-				:activeCredentialType="activeCredentialType"
-				:inputSize="inputSize"
-				:displayValue="displayValue"
-				:isReadOnly="isReadOnly"
-				:displayTitle="displayTitle"
-				@credentialSelected="credentialSelected"
-				@valueChanged="valueChanged"
-				@setFocus="setFocus"
-				@onBlur="onBlur"
+				:active-credential-type="activeCredentialType"
+				:input-size="inputSize"
+				:display-value="displayValue"
+				:is-read-only="isReadOnly"
+				:display-title="displayTitle"
+				@credential-selected="credentialSelected"
+				@update:model-value="valueChanged"
+				@set-focus="setFocus"
+				@on-blur="onBlur"
 			>
 				<template #issues-and-options>
-					<parameter-issues :issues="getIssues" />
+					<ParameterIssues :issues="getIssues" />
 				</template>
-			</credentials-select>
+			</CredentialsSelect>
 
-			<n8n-select
+			<N8nSelect
 				v-else-if="parameter.type === 'options'"
 				ref="inputField"
 				:size="inputSize"
 				filterable
-				:value="displayValue"
+				:model-value="displayValue"
 				:placeholder="
-					parameter.placeholder ? getPlaceholder() : $locale.baseText('parameterInput.select')
+					parameter.placeholder ? getPlaceholder() : i18n.baseText('parameterInput.select')
 				"
 				:loading="remoteParameterOptionsLoading"
 				:disabled="isReadOnly || remoteParameterOptionsLoading"
 				:title="displayTitle"
-				@change="valueChanged"
+				@update:model-value="valueChanged"
 				@keydown.stop
 				@focus="setFocus"
 				@blur="onBlur"
 			>
 				<n8n-option
 					v-for="option in parameterOptions"
-					:value="option.value"
 					:key="option.value"
+					:value="option.value"
 					:label="getOptionsOptionDisplayName(option)"
 				>
 					<div class="list-option">
 						<div
-							class="option-headline ph-no-capture"
+							class="option-headline"
 							:class="{ 'remote-parameter-option': isRemoteParameterOption(option) }"
 						>
 							{{ getOptionsOptionDisplayName(option) }}
@@ -263,28 +402,28 @@
 						></div>
 					</div>
 				</n8n-option>
-			</n8n-select>
+			</N8nSelect>
 
-			<n8n-select
+			<N8nSelect
 				v-else-if="parameter.type === 'multiOptions'"
 				ref="inputField"
 				:size="inputSize"
 				filterable
 				multiple
-				:value="displayValue"
+				:model-value="displayValue"
 				:loading="remoteParameterOptionsLoading"
 				:disabled="isReadOnly || remoteParameterOptionsLoading"
 				:title="displayTitle"
-				:placeholder="$locale.baseText('parameterInput.select')"
-				@change="valueChanged"
+				:placeholder="i18n.baseText('parameterInput.select')"
+				@update:model-value="valueChanged"
 				@keydown.stop
 				@focus="setFocus"
 				@blur="onBlur"
 			>
 				<n8n-option
 					v-for="option in parameterOptions"
-					:value="option.value"
 					:key="option.value"
+					:value="option.value"
 					:label="getOptionsOptionDisplayName(option)"
 				>
 					<div class="list-option">
@@ -296,915 +435,963 @@
 						></div>
 					</div>
 				</n8n-option>
-			</n8n-select>
+			</N8nSelect>
 
 			<!-- temporary state of booleans while data is mapped -->
-			<n8n-input
+			<N8nInput
 				v-else-if="parameter.type === 'boolean' && droppable"
 				:size="inputSize"
-				:value="JSON.stringify(displayValue)"
+				:model-value="JSON.stringify(displayValue)"
 				:disabled="isReadOnly"
 				:title="displayTitle"
 			/>
 			<el-switch
 				v-else-if="parameter.type === 'boolean'"
-				class="switch-input"
 				ref="inputField"
+				:class="{ 'switch-input': true, 'ph-no-capture': shouldRedactValue }"
 				active-color="#13ce66"
-				:value="displayValue"
+				:model-value="displayValue"
 				:disabled="isReadOnly"
-				@change="valueChanged"
+				@update:model-value="valueChanged"
 			/>
 		</div>
 
-		<parameter-issues
+		<ParameterIssues
 			v-if="parameter.type !== 'credentialsSelect' && !isResourceLocatorParameter"
 			:issues="getIssues"
 		/>
 	</div>
 </template>
 
-<script lang="ts">
-/* eslint-disable prefer-spread */
+<script setup lang="ts">
+import { computed, nextTick, onBeforeUnmount, onMounted, onUpdated, ref, watch } from 'vue';
 
 import { get } from 'lodash-es';
 
-import type { INodeUi, INodeUpdatePropertiesInformation } from '@/Interface';
 import type {
+	INodeUi,
+	INodeUpdatePropertiesInformation,
+	IUpdateInformation,
+	InputSize,
+} from '@/Interface';
+import type {
+	CodeExecutionMode,
+	CodeNodeEditorLanguage,
+	EditorType,
+	IDataObject,
 	ILoadOptions,
+	INodeParameterResourceLocator,
 	INodeParameters,
-	INodePropertyOptions,
-	Workflow,
 	INodeProperties,
-	INodePropertyCollection,
+	INodePropertyOptions,
+	IParameterLabel,
 	NodeParameterValueType,
 } from 'n8n-workflow';
-import { NodeHelpers, NodeParameterValue } from 'n8n-workflow';
+import { CREDENTIAL_EMPTY_VALUE, NodeHelpers } from 'n8n-workflow';
 
-import CodeEdit from '@/components/CodeEdit.vue';
+import CodeNodeEditor from '@/components/CodeNodeEditor/CodeNodeEditor.vue';
 import CredentialsSelect from '@/components/CredentialsSelect.vue';
-import ImportParameter from '@/components/ImportParameter.vue';
 import ExpressionEdit from '@/components/ExpressionEdit.vue';
-import NodeCredentials from '@/components/NodeCredentials.vue';
-import ScopesNotice from '@/components/ScopesNotice.vue';
-import ParameterOptions from '@/components/ParameterOptions.vue';
+import ExpressionParameterInput from '@/components/ExpressionParameterInput.vue';
+import HtmlEditor from '@/components/HtmlEditor/HtmlEditor.vue';
+import JsEditor from '@/components/JsEditor/JsEditor.vue';
+import JsonEditor from '@/components/JsonEditor/JsonEditor.vue';
 import ParameterIssues from '@/components/ParameterIssues.vue';
 import ResourceLocator from '@/components/ResourceLocator/ResourceLocator.vue';
-import ExpressionParameterInput from '@/components/ExpressionParameterInput.vue';
-// @ts-ignore
-import PrismEditor from 'vue-prism-editor';
+import SqlEditor from '@/components/SqlEditor/SqlEditor.vue';
 import TextEdit from '@/components/TextEdit.vue';
-import CodeNodeEditor from '@/components/CodeNodeEditor/CodeNodeEditor.vue';
-import HtmlEditor from '@/components/HtmlEditor/HtmlEditor.vue';
-import { externalHooks } from '@/mixins/externalHooks';
-import { nodeHelpers } from '@/mixins/nodeHelpers';
-import { showMessage } from '@/mixins/showMessage';
-import { workflowHelpers } from '@/mixins/workflowHelpers';
-import { hasExpressionMapping, isValueExpression, isResourceLocatorValue } from '@/utils';
-
-import mixins from 'vue-typed-mixins';
-import { CUSTOM_API_CALL_KEY, HTML_NODE_TYPE } from '@/constants';
-import { CODE_NODE_TYPE } from '@/constants';
-import type { PropType } from 'vue';
-import { debounceHelper } from '@/mixins/debounce';
-import { mapStores } from 'pinia';
-import { useWorkflowsStore } from '@/stores/workflows';
-import { useNDVStore } from '@/stores/ndv';
-import { useNodeTypesStore } from '@/stores/nodeTypes';
-import { useCredentialsStore } from '@/stores/credentials';
+
+import { hasExpressionMapping, isValueExpression } from '@/utils/nodeTypesUtils';
+import { isResourceLocatorValue } from '@/utils/typeGuards';
+
+import { CUSTOM_API_CALL_KEY, HTML_NODE_TYPE, NODES_USING_CODE_NODE_EDITOR } from '@/constants';
+
+import { useDebounce } from '@/composables/useDebounce';
+import { useExternalHooks } from '@/composables/useExternalHooks';
+import { useI18n } from '@/composables/useI18n';
+import { useNodeHelpers } from '@/composables/useNodeHelpers';
+import { useTelemetry } from '@/composables/useTelemetry';
+import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
 import { htmlEditorEventBus } from '@/event-bus';
+import { useCredentialsStore } from '@/stores/credentials.store';
+import { useNDVStore } from '@/stores/ndv.store';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { isCredentialOnlyNodeType } from '@/utils/credentialOnlyNodes';
+import { N8nInput, N8nSelect } from 'n8n-design-system';
+import type { EventBus } from 'n8n-design-system/utils';
+import { createEventBus } from 'n8n-design-system/utils';
+import { useRouter } from 'vue-router';
+
+type Picker = { $emit: (arg0: string, arg1: Date) => void };
+
+type Props = {
+	parameter: INodeProperties;
+	path: string;
+	modelValue: NodeParameterValueType;
+	eventBus?: EventBus;
+	label?: IParameterLabel;
+	additionalExpressionData?: IDataObject;
+	rows?: number;
+	hint?: string;
+	inputSize?: InputSize;
+	eventSource?: string;
+	expressionEvaluated?: string;
+	documentationUrl?: string;
+	isAssignment?: boolean;
+	isReadOnly?: boolean;
+	hideLabel?: boolean;
+	droppable?: boolean;
+	activeDrop?: boolean;
+	forceShowExpression?: boolean;
+	hideIssues?: boolean;
+	errorHighlight?: boolean;
+	isForCredential?: boolean;
+};
+
+const props = withDefaults(defineProps<Props>(), {
+	rows: 5,
+	hint: undefined,
+	inputSize: undefined,
+	eventSource: undefined,
+	expressionEvaluated: undefined,
+	documentationUrl: undefined,
+	isReadOnly: false,
+	isAssignment: false,
+	eventBus: () => createEventBus(),
+	additionalExpressionData: () => ({}),
+	label: () => ({ size: 'small' }),
+});
 
-type ResourceLocatorRef = InstanceType<typeof ResourceLocator>;
-
-export default mixins(
-	externalHooks,
-	nodeHelpers,
-	showMessage,
-	workflowHelpers,
-	debounceHelper,
-).extend({
-	name: 'parameter-input',
-	components: {
-		CodeEdit,
-		CodeNodeEditor,
-		HtmlEditor,
-		ExpressionEdit,
-		ExpressionParameterInput,
-		NodeCredentials,
-		CredentialsSelect,
-		PrismEditor,
-		ScopesNotice,
-		ParameterOptions,
-		ParameterIssues,
-		ResourceLocator,
-		TextEdit,
-		ImportParameter,
-	},
-	props: {
-		isReadOnly: {
-			type: Boolean,
-		},
-		parameter: {
-			type: Object as PropType<INodeProperties>,
-		},
-		path: {
-			type: String,
-		},
-		value: {
-			type: [String, Number, Boolean, Array, Object] as PropType<NodeParameterValueType>,
-		},
-		hideLabel: {
-			type: Boolean,
-		},
-		droppable: {
-			type: Boolean,
-		},
-		activeDrop: {
-			type: Boolean,
-		},
-		forceShowExpression: {
-			type: Boolean,
-		},
-		hint: {
-			type: String as PropType<string | undefined>,
-		},
-		inputSize: {
-			type: String,
-		},
-		hideIssues: {
-			type: Boolean,
-		},
-		documentationUrl: {
-			type: String as PropType<string | undefined>,
-		},
-		errorHighlight: {
-			type: Boolean,
-		},
-		isForCredential: {
-			type: Boolean,
-		},
-		eventSource: {
-			type: String,
-		},
-		expressionEvaluated: {
-			type: String as PropType<string | undefined>,
+const emit = defineEmits<{
+	(event: 'focus'): void;
+	(event: 'blur'): void;
+	(event: 'drop', expression: string): void;
+	(event: 'textInput', update: IUpdateInformation): void;
+	(event: 'update', update: IUpdateInformation): void;
+}>();
+
+const externalHooks = useExternalHooks();
+const i18n = useI18n();
+const nodeHelpers = useNodeHelpers();
+const { callDebounced } = useDebounce();
+const router = useRouter();
+const workflowHelpers = useWorkflowHelpers({ router });
+const telemetry = useTelemetry();
+
+const credentialsStore = useCredentialsStore();
+const ndvStore = useNDVStore();
+const workflowsStore = useWorkflowsStore();
+const settingsStore = useSettingsStore();
+const nodeTypesStore = useNodeTypesStore();
+
+// ESLint: false positive
+// eslint-disable-next-line @typescript-eslint/no-redundant-type-constituents, @typescript-eslint/no-duplicate-type-constituents
+const inputField = ref<InstanceType<typeof N8nInput | typeof N8nSelect> | HTMLElement>();
+const wrapper = ref<HTMLDivElement>();
+
+const nodeName = ref('');
+const codeEditDialogVisible = ref(false);
+const expressionEditDialogVisible = ref(false);
+const remoteParameterOptions = ref<INodePropertyOptions[]>([]);
+const remoteParameterOptionsLoading = ref(false);
+const remoteParameterOptionsLoadingIssues = ref<string | null>(null);
+const textEditDialogVisible = ref(false);
+const editDialogClosing = ref(false);
+const tempValue = ref('');
+const activeCredentialType = ref('');
+const dateTimePickerOptions = ref({
+	shortcuts: [
+		{
+			text: 'Today', // TODO
+
+			onClick(picker: Picker) {
+				picker.$emit('pick', new Date());
+			},
 		},
-	},
-	data() {
-		return {
-			codeEditDialogVisible: false,
-			nodeName: '',
-			expressionAddOperation: 'set' as 'add' | 'set',
-			expressionEditDialogVisible: false,
-			remoteParameterOptions: [] as INodePropertyOptions[],
-			remoteParameterOptionsLoading: false,
-			remoteParameterOptionsLoadingIssues: null as string | null,
-			textEditDialogVisible: false,
-			tempValue: '', //  el-date-picker and el-input does not seem to work without v-model so add one
-			CUSTOM_API_CALL_KEY,
-			activeCredentialType: '',
-			dateTimePickerOptions: {
-				shortcuts: [
-					{
-						text: 'Today', // TODO
-
-						// eslint-disable-next-line @typescript-eslint/no-explicit-any
-						onClick(picker: any) {
-							picker.$emit('pick', new Date());
-						},
-					},
-					{
-						text: 'Yesterday', // TODO
-
-						// eslint-disable-next-line @typescript-eslint/no-explicit-any
-						onClick(picker: any) {
-							const date = new Date();
-							date.setTime(date.getTime() - 3600 * 1000 * 24);
-							picker.$emit('pick', date);
-						},
-					},
-					{
-						text: 'A week ago', // TODO
-
-						// eslint-disable-next-line @typescript-eslint/no-explicit-any
-						onClick(picker: any) {
-							const date = new Date();
-							date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
-							picker.$emit('pick', date);
-						},
-					},
-				],
+		{
+			text: 'Yesterday', // TODO
+
+			onClick(picker: Picker) {
+				const date = new Date();
+				date.setTime(date.getTime() - 3600 * 1000 * 24);
+				picker.$emit('pick', date);
 			},
-			isFocused: false,
-		};
-	},
-	watch: {
-		dependentParametersValues() {
-			// Reload the remote parameters whenever a parameter
-			// on which the current field depends on changes
-			this.loadRemoteParameterOptions();
 		},
-		value() {
-			if (this.parameter.type === 'color' && this.getArgument('showAlpha') === true) {
-				// Do not set for color with alpha else wrong value gets displayed in field
-				return;
-			}
-			this.tempValue = this.displayValue as string;
+		{
+			text: 'A week ago', // TODO
+
+			onClick(picker: Picker) {
+				const date = new Date();
+				date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
+				picker.$emit('pick', date);
+			},
 		},
-	},
-	computed: {
-		...mapStores(useCredentialsStore, useNodeTypesStore, useNDVStore, useWorkflowsStore),
-		expressionDisplayValue(): string {
-			if (this.forceShowExpression) {
-				return '';
-			}
+	],
+});
+const isFocused = ref(false);
+
+const displayValue = computed<string | number | boolean | null>(() => {
+	if (remoteParameterOptionsLoading.value) {
+		// If it is loading options from server display
+		// to user that the data is loading. If not it would
+		// display the user the key instead of the value it
+		// represents
+		return i18n.baseText('parameterInput.loadingOptions');
+	}
 
-			const value = isResourceLocatorValue(this.value) ? this.value.value : this.value;
-			if (typeof value === 'string' && value.startsWith('=')) {
-				return value.slice(1);
-			}
+	// if the value is marked as empty return empty string, to prevent displaying the asterisks
+	if (props.modelValue === CREDENTIAL_EMPTY_VALUE) {
+		return '';
+	}
 
-			return `${this.displayValue ?? ''}`;
-		},
-		isValueExpression(): boolean {
-			return isValueExpression(this.parameter, this.value);
-		},
-		codeAutocomplete(): string | undefined {
-			return this.getArgument('codeAutocomplete') as string | undefined;
-		},
-		dependentParametersValues(): string | null {
-			const loadOptionsDependsOn = this.getArgument('loadOptionsDependsOn') as string[] | undefined;
+	let returnValue;
+	if (!isModelValueExpression.value) {
+		returnValue = isResourceLocatorParameter.value
+			? isResourceLocatorValue(props.modelValue)
+				? props.modelValue.value
+				: ''
+			: props.modelValue;
+	} else {
+		returnValue = props.expressionEvaluated;
+	}
 
-			if (loadOptionsDependsOn === undefined) {
-				return null;
-			}
+	if (props.parameter.type === 'credentialsSelect' && typeof props.modelValue === 'string') {
+		const credType = credentialsStore.getCredentialTypeByName(props.modelValue);
+		if (credType) {
+			returnValue = credType.displayName;
+		}
+	}
 
-			// Get the resolved parameter values of the current node
-			const currentNodeParameters = this.ndvStore.activeNode?.parameters;
-			try {
-				const resolvedNodeParameters = this.resolveParameter(currentNodeParameters);
+	if (
+		Array.isArray(returnValue) &&
+		props.parameter.type === 'color' &&
+		getArgument('showAlpha') === true &&
+		(returnValue as unknown as string).charAt(0) === '#'
+	) {
+		// Convert the value to rgba that el-color-picker can display it correctly
+		const bigint = parseInt((returnValue as unknown as string).slice(1), 16);
+		const h = [];
+		h.push((bigint >> 24) & 255);
+		h.push((bigint >> 16) & 255);
+		h.push((bigint >> 8) & 255);
+		h.push(((255 - bigint) & 255) / 255);
+
+		returnValue = 'rgba(' + h.join() + ')';
+	}
 
-				const returnValues: string[] = [];
-				for (const parameterPath of loadOptionsDependsOn) {
-					returnValues.push(get(resolvedNodeParameters, parameterPath) as string);
-				}
+	if (returnValue !== undefined && returnValue !== null && props.parameter.type === 'string') {
+		const rows = editorRows.value;
+		if (rows === undefined || rows === 1) {
+			returnValue = (returnValue as string).toString().replace(/\n/, '|');
+		}
+	}
 
-				return returnValues.join('|');
-			} catch (error) {
-				return null;
-			}
-		},
-		node(): INodeUi | null {
-			return this.ndvStore.activeNode;
-		},
-		displayTitle(): string {
-			const interpolation = { interpolate: { shortPath: this.shortPath } };
+	return returnValue as string;
+});
 
-			if (this.getIssues.length && this.isValueExpression) {
-				return this.$locale.baseText(
-					'parameterInput.parameterHasIssuesAndExpression',
-					interpolation,
-				);
-			} else if (this.getIssues.length && !this.isValueExpression) {
-				return this.$locale.baseText('parameterInput.parameterHasIssues', interpolation);
-			} else if (!this.getIssues.length && this.isValueExpression) {
-				return this.$locale.baseText('parameterInput.parameterHasExpression', interpolation);
-			}
+const expressionDisplayValue = computed(() => {
+	if (props.forceShowExpression) {
+		return '';
+	}
 
-			return this.$locale.baseText('parameterInput.parameter', interpolation);
-		},
-		displayValue(): string | number | boolean | null {
-			if (this.remoteParameterOptionsLoading === true) {
-				// If it is loading options from server display
-				// to user that the data is loading. If not it would
-				// display the user the key instead of the value it
-				// represents
-				return this.$locale.baseText('parameterInput.loadingOptions');
-			}
+	const value = isResourceLocatorValue(props.modelValue)
+		? props.modelValue.value
+		: props.modelValue;
+	if (typeof value === 'string' && value.startsWith('=')) {
+		return value.slice(1);
+	}
 
-			let returnValue;
-			if (this.isValueExpression === false) {
-				returnValue = this.isResourceLocatorParameter
-					? isResourceLocatorValue(this.value)
-						? this.value.value
-						: ''
-					: this.value;
-			} else {
-				returnValue = this.expressionEvaluated;
-			}
+	return `${displayValue.value ?? ''}`;
+});
 
-			if (this.parameter.type === 'credentialsSelect' && typeof this.value === 'string') {
-				const credType = this.credentialsStore.getCredentialTypeByName(this.value);
-				if (credType) {
-					returnValue = credType.displayName;
-				}
-			}
+const isModelValueExpression = computed(() => isValueExpression(props.parameter, props.modelValue));
 
-			if (
-				Array.isArray(returnValue) &&
-				this.parameter.type === 'color' &&
-				this.getArgument('showAlpha') === true &&
-				returnValue.charAt(0) === '#'
-			) {
-				// Convert the value to rgba that el-color-picker can display it correctly
-				const bigint = parseInt(returnValue.slice(1), 16);
-				const h = [];
-				h.push((bigint >> 24) & 255);
-				h.push((bigint >> 16) & 255);
-				h.push((bigint >> 8) & 255);
-				h.push(((255 - bigint) & 255) / 255);
-
-				returnValue = 'rgba(' + h.join() + ')';
-			}
+const dependentParametersValues = computed<string | null>(() => {
+	const loadOptionsDependsOn = getArgument<string[] | undefined>('loadOptionsDependsOn');
 
-			if (returnValue !== undefined && returnValue !== null && this.parameter.type === 'string') {
-				const rows = this.getArgument('rows');
-				if (rows === undefined || rows === 1) {
-					returnValue = returnValue.toString().replace(/\n/, '|');
-				}
-			}
+	if (loadOptionsDependsOn === undefined) {
+		return null;
+	}
 
-			return returnValue;
-		},
-		getStringInputType() {
-			if (this.getArgument('password') === true) {
-				return 'password';
-			}
+	// Get the resolved parameter values of the current node
+	const currentNodeParameters = ndvStore.activeNode?.parameters;
+	try {
+		const resolvedNodeParameters = workflowHelpers.resolveParameter(currentNodeParameters);
 
-			const rows = this.getArgument('rows');
-			if (rows !== undefined && rows > 1) {
-				return 'textarea';
-			}
+		const returnValues: string[] = [];
+		for (const parameterPath of loadOptionsDependsOn) {
+			returnValues.push(get(resolvedNodeParameters, parameterPath) as string);
+		}
 
-			if (this.parameter.typeOptions && this.parameter.typeOptions.editor === 'code') {
-				return 'textarea';
-			}
+		return returnValues.join('|');
+	} catch (error) {
+		return null;
+	}
+});
 
-			return 'text';
-		},
-		getIssues(): string[] {
-			if (this.hideIssues === true || this.node === null) {
-				return [];
-			}
+const node = computed(() => ndvStore.activeNode ?? undefined);
 
-			const newPath = this.shortPath.split('.');
-			newPath.pop();
-
-			const issues = NodeHelpers.getParameterIssues(
-				this.parameter,
-				this.node.parameters,
-				newPath.join('.'),
-				this.node,
-			);
-
-			if (this.parameter.type === 'credentialsSelect' && this.displayValue === '') {
-				issues.parameters = issues.parameters || {};
-
-				const issue = this.$locale.baseText('parameterInput.selectACredentialTypeFromTheDropdown');
-
-				issues.parameters[this.parameter.name] = [issue];
-			} else if (
-				['options', 'multiOptions'].includes(this.parameter.type) &&
-				this.remoteParameterOptionsLoading === false &&
-				this.remoteParameterOptionsLoadingIssues === null &&
-				this.parameterOptions
-			) {
-				// Check if the value resolves to a valid option
-				// Currently it only displays an error in the node itself in
-				// case the value is not valid. The workflow can still be executed
-				// and the error is not displayed on the node in the workflow
-				const validOptions = this.parameterOptions.map(
-					(options) => (options as INodePropertyOptions).value,
-				);
+const displayTitle = computed<string>(() => {
+	const interpolation = { interpolate: { shortPath: shortPath.value } };
 
-				const checkValues: string[] = [];
+	if (getIssues.value.length && isModelValueExpression.value) {
+		return i18n.baseText('parameterInput.parameterHasIssuesAndExpression', interpolation);
+	} else if (getIssues.value.length && !isModelValueExpression.value) {
+		return i18n.baseText('parameterInput.parameterHasIssues', interpolation);
+	} else if (!getIssues.value.length && isModelValueExpression.value) {
+		return i18n.baseText('parameterInput.parameterHasExpression', interpolation);
+	}
 
-				if (!this.skipCheck(this.displayValue)) {
-					if (Array.isArray(this.displayValue)) {
-						checkValues.push.apply(checkValues, this.displayValue);
-					} else {
-						checkValues.push(this.displayValue as string);
-					}
-				}
+	return i18n.baseText('parameterInput.parameter', interpolation);
+});
 
-				for (const checkValue of checkValues) {
-					if (checkValue === null || !validOptions.includes(checkValue)) {
-						if (issues.parameters === undefined) {
-							issues.parameters = {};
-						}
+const getStringInputType = computed(() => {
+	if (getArgument('password') === true) {
+		return 'password';
+	}
 
-						const issue = this.$locale.baseText('parameterInput.theValueIsNotSupported', {
-							interpolate: { checkValue },
-						});
+	const rows = editorRows.value;
+	if (rows !== undefined && rows > 1) {
+		return 'textarea';
+	}
 
-						issues.parameters[this.parameter.name] = [issue];
-					}
-				}
-			} else if (this.remoteParameterOptionsLoadingIssues !== null) {
+	if (editorType.value === 'code') {
+		return 'textarea';
+	}
+
+	return 'text';
+});
+
+const getIssues = computed<string[]>(() => {
+	if (props.hideIssues || !node.value) {
+		return [];
+	}
+
+	const newPath = shortPath.value.split('.');
+	newPath.pop();
+
+	const issues = NodeHelpers.getParameterIssues(
+		props.parameter,
+		node.value.parameters,
+		newPath.join('.'),
+		node.value,
+	);
+
+	if (props.parameter.type === 'credentialsSelect' && displayValue.value === '') {
+		issues.parameters = issues.parameters ?? {};
+
+		const issue = i18n.baseText('parameterInput.selectACredentialTypeFromTheDropdown');
+
+		issues.parameters[props.parameter.name] = [issue];
+	} else if (
+		['options', 'multiOptions'].includes(props.parameter.type) &&
+		!remoteParameterOptionsLoading.value &&
+		remoteParameterOptionsLoadingIssues.value === null &&
+		parameterOptions.value
+	) {
+		// Check if the value resolves to a valid option
+		// Currently it only displays an error in the node itself in
+		// case the value is not valid. The workflow can still be executed
+		// and the error is not displayed on the node in the workflow
+		const validOptions = parameterOptions.value.map((options) => options.value);
+
+		let checkValues: string[] = [];
+
+		if (!skipCheck(displayValue.value)) {
+			if (Array.isArray(displayValue.value)) {
+				checkValues = checkValues.concat(displayValue.value);
+			} else {
+				checkValues.push(displayValue.value as string);
+			}
+		}
+
+		for (const checkValue of checkValues) {
+			if (checkValue === null || !validOptions.includes(checkValue)) {
 				if (issues.parameters === undefined) {
 					issues.parameters = {};
 				}
-				issues.parameters[this.parameter.name] = [
-					`There was a problem loading the parameter options from server: "${this.remoteParameterOptionsLoadingIssues}"`,
-				];
-			}
 
-			if (
-				issues !== undefined &&
-				issues.parameters !== undefined &&
-				issues.parameters[this.parameter.name] !== undefined
-			) {
-				return issues.parameters[this.parameter.name];
-			}
+				const issue = i18n.baseText('parameterInput.theValueIsNotSupported', {
+					interpolate: { checkValue },
+				});
 
-			return [];
-		},
-		isEditor(): boolean {
-			return ['code', 'json'].includes(this.editorType);
-		},
-		editorType(): string {
-			return this.getArgument('editor') as string;
-		},
-		parameterOptions():
-			| Array<INodePropertyOptions | INodeProperties | INodePropertyCollection>
-			| undefined {
-			if (this.hasRemoteMethod === false) {
-				// Options are already given
-				return this.parameter.options;
+				issues.parameters[props.parameter.name] = [issue];
 			}
+		}
+	} else if (remoteParameterOptionsLoadingIssues.value !== null && !isModelValueExpression.value) {
+		if (issues.parameters === undefined) {
+			issues.parameters = {};
+		}
+		issues.parameters[props.parameter.name] = [
+			`There was a problem loading the parameter options from server: "${remoteParameterOptionsLoadingIssues.value}"`,
+		];
+	}
 
-			// Options get loaded from server
-			return this.remoteParameterOptions;
-		},
-		parameterInputClasses() {
-			const classes: { [c: string]: boolean } = {
-				droppable: this.droppable,
-				activeDrop: this.activeDrop,
-			};
-
-			const rows = this.getArgument('rows');
-			const isTextarea = this.parameter.type === 'string' && rows !== undefined;
-			const isSwitch = this.parameter.type === 'boolean' && !this.isValueExpression;
-
-			if (!isTextarea && !isSwitch) {
-				classes['parameter-value-container'] = true;
-			}
+	if (issues?.parameters?.[props.parameter.name] !== undefined) {
+		return issues.parameters[props.parameter.name];
+	}
 
-			if (
-				!this.droppable &&
-				!this.activeDrop &&
-				(this.getIssues.length > 0 || this.errorHighlight) &&
-				!this.isValueExpression
-			) {
-				classes['has-issues'] = true;
-			}
+	return [];
+});
 
-			return classes;
-		},
-		parameterInputWrapperStyle() {
-			let deductWidth = 0;
-			const styles = {
-				width: '100%',
-			};
-			if (this.parameter.type === 'credentialsSelect' || this.isResourceLocatorParameter) {
-				return styles;
-			}
-			if (this.getIssues.length) {
-				deductWidth += 20;
-			}
+const editorType = computed<EditorType | 'json' | 'code'>(() => {
+	return getArgument<EditorType>('editor');
+});
 
-			if (deductWidth !== 0) {
-				styles.width = `calc(100% - ${deductWidth}px)`;
-			}
+const editorLanguage = computed<CodeNodeEditorLanguage>(() => {
+	if (editorType.value === 'json' || props.parameter.type === 'json')
+		return 'json' as CodeNodeEditorLanguage;
+	return getArgument<CodeNodeEditorLanguage>('editorLanguage') ?? 'javaScript';
+});
 
-			return styles;
-		},
-		hasRemoteMethod(): boolean {
-			return !!this.getArgument('loadOptionsMethod') || !!this.getArgument('loadOptions');
-		},
-		shortPath(): string {
-			const shortPath = this.path.split('.');
-			shortPath.shift();
-			return shortPath.join('.');
-		},
-		workflow(): Workflow {
-			return this.getCurrentWorkflow();
-		},
-		isResourceLocatorParameter(): boolean {
-			return this.parameter.type === 'resourceLocator';
-		},
-		isSecretParameter(): boolean {
-			return this.getArgument('password') === true;
-		},
-		remoteParameterOptionsKeys(): string[] {
-			return (this.remoteParameterOptions || []).map((o) => o.name);
-		},
-	},
-	methods: {
-		isRemoteParameterOption(option: INodePropertyOptions) {
-			return this.remoteParameterOptionsKeys.includes(option.name);
-		},
-		credentialSelected(updateInformation: INodeUpdatePropertiesInformation) {
-			// Update the values on the node
-			this.workflowsStore.updateNodeProperties(updateInformation);
+const parameterOptions = computed<INodePropertyOptions[] | undefined>(() => {
+	if (!hasRemoteMethod.value) {
+		// Options are already given
+		return props.parameter.options as INodePropertyOptions[];
+	}
 
-			const node = this.workflowsStore.getNodeByName(updateInformation.name);
+	// Options get loaded from server
+	return remoteParameterOptions.value;
+});
 
-			if (node) {
-				// Update the issues
-				this.updateNodeCredentialIssues(node);
-			}
+const parameterInputClasses = computed(() => {
+	const classes: { [c: string]: boolean } = {
+		droppable: props.droppable,
+		activeDrop: props.activeDrop,
+	};
 
-			this.$externalHooks().run('nodeSettings.credentialSelected', { updateInformation });
-		},
-		/**
-		 * Check whether a param value must be skipped when collecting node param issues for validation.
-		 */
-		skipCheck(value: string | number | boolean | null) {
-			return typeof value === 'string' && value.includes(CUSTOM_API_CALL_KEY);
-		},
-		getPlaceholder(): string {
-			return this.isForCredential
-				? this.$locale.credText().placeholder(this.parameter)
-				: this.$locale.nodeText().placeholder(this.parameter, this.path);
-		},
-		getOptionsOptionDisplayName(option: INodePropertyOptions): string {
-			return this.isForCredential
-				? this.$locale.credText().optionsOptionDisplayName(this.parameter, option)
-				: this.$locale.nodeText().optionsOptionDisplayName(this.parameter, option, this.path);
-		},
-		getOptionsOptionDescription(option: INodePropertyOptions): string {
-			return this.isForCredential
-				? this.$locale.credText().optionsOptionDescription(this.parameter, option)
-				: this.$locale.nodeText().optionsOptionDescription(this.parameter, option, this.path);
-		},
+	const rows = editorRows.value;
+	const isTextarea = props.parameter.type === 'string' && rows !== undefined;
+	const isSwitch = props.parameter.type === 'boolean' && !isModelValueExpression.value;
 
-		async loadRemoteParameterOptions() {
-			if (
-				this.node === null ||
-				this.hasRemoteMethod === false ||
-				this.remoteParameterOptionsLoading
-			) {
-				return;
-			}
-			this.remoteParameterOptionsLoadingIssues = null;
-			this.remoteParameterOptionsLoading = true;
-			this.remoteParameterOptions.length = 0;
-
-			// Get the resolved parameter values of the current node
-
-			try {
-				const currentNodeParameters = (this.ndvStore.activeNode as INodeUi).parameters;
-				const resolvedNodeParameters = this.resolveParameter(
-					currentNodeParameters,
-				) as INodeParameters;
-				const loadOptionsMethod = this.getArgument('loadOptionsMethod') as string | undefined;
-				const loadOptions = this.getArgument('loadOptions') as ILoadOptions | undefined;
-
-				const options = await this.nodeTypesStore.getNodeParameterOptions({
-					nodeTypeAndVersion: {
-						name: this.node.type,
-						version: this.node.typeVersion,
-					},
-					path: this.path,
-					methodName: loadOptionsMethod,
-					loadOptions,
-					currentNodeParameters: resolvedNodeParameters,
-					credentials: this.node.credentials,
-				});
+	if (!isTextarea && !isSwitch) {
+		classes['parameter-value-container'] = true;
+	}
 
-				this.remoteParameterOptions.push.apply(this.remoteParameterOptions, options);
-			} catch (error) {
-				this.remoteParameterOptionsLoadingIssues = error.message;
-			}
+	if (
+		!props.droppable &&
+		!props.activeDrop &&
+		(getIssues.value.length > 0 || props.errorHighlight) &&
+		!isModelValueExpression.value
+	) {
+		classes['has-issues'] = true;
+	}
 
-			this.remoteParameterOptionsLoading = false;
-		},
-		closeCodeEditDialog() {
-			this.codeEditDialogVisible = false;
-		},
-		closeExpressionEditDialog() {
-			this.expressionEditDialogVisible = false;
-		},
-		trackExpressionEditOpen() {
-			if (!this.node) {
-				return;
-			}
+	return classes;
+});
 
-			if ((this.node.type as string).startsWith('n8n-nodes-base')) {
-				this.$telemetry.track('User opened Expression Editor', {
-					node_type: this.node.type,
-					parameter_name: this.parameter.displayName,
-					parameter_field_type: this.parameter.type,
-					new_expression: !this.isValueExpression,
-					workflow_id: this.workflowsStore.workflowId,
-					session_id: this.ndvStore.sessionId,
-					source: this.eventSource || 'ndv',
-				});
-			}
-		},
-		closeTextEditDialog() {
-			this.textEditDialogVisible = false;
-		},
-		displayEditDialog() {
-			if (this.isEditor) {
-				this.codeEditDialogVisible = true;
-			} else {
-				this.textEditDialogVisible = true;
-			}
-		},
-		getArgument(argumentName: string): string | number | boolean | undefined {
-			if (this.parameter.typeOptions === undefined) {
-				return undefined;
-			}
+const parameterInputWrapperStyle = computed(() => {
+	let deductWidth = 0;
+	const styles = {
+		width: '100%',
+	};
+	if (props.parameter.type === 'credentialsSelect' || isResourceLocatorParameter.value) {
+		return styles;
+	}
+	if (getIssues.value.length) {
+		deductWidth += 20;
+	}
 
-			if (this.parameter.typeOptions[argumentName] === undefined) {
-				return undefined;
-			}
+	if (deductWidth !== 0) {
+		styles.width = `calc(100% - ${deductWidth}px)`;
+	}
 
-			return this.parameter.typeOptions[argumentName];
-		},
-		expressionUpdated(value: string) {
-			const val: NodeParameterValueType = this.isResourceLocatorParameter
-				? { __rl: true, value, mode: this.value.mode }
-				: value;
-			this.valueChanged(val);
-		},
-		openExpressionEditorModal() {
-			if (!this.isValueExpression) return;
+	return styles;
+});
 
-			this.expressionEditDialogVisible = true;
-			this.trackExpressionEditOpen();
-		},
-		onBlur() {
-			this.$emit('blur');
-			this.isFocused = false;
-		},
-		onResourceLocatorDrop(data: string) {
-			this.$emit('drop', data);
-		},
-		setFocus() {
-			if (['json'].includes(this.parameter.type) && this.getArgument('alwaysOpenEditWindow')) {
-				this.displayEditDialog();
-				return;
-			}
+const hasRemoteMethod = computed<boolean>(() => {
+	return !!getArgument('loadOptionsMethod') || !!getArgument('loadOptions');
+});
 
-			if (this.node !== null) {
-				// When an event like mouse-click removes the active node while
-				// editing is active it does not know where to save the value to.
-				// For that reason do we save the node-name here. We could probably
-				// also just do that once on load but if Vue decides for some reason to
-				// reuse the input it could have the wrong value so lets set it everytime
-				// just to be sure
-				this.nodeName = this.node.name;
-			}
+const shortPath = computed<string>(() => {
+	const short = props.path.split('.');
+	short.shift();
+	return short.join('.');
+});
 
-			// Set focus on field
-			setTimeout(() => {
-				// @ts-ignore
-				if (this.$refs.inputField?.focus && this.$refs.inputField?.$el) {
-					// @ts-ignore
-					this.$refs.inputField.focus();
-					this.isFocused = true;
-				}
-			});
+const isResourceLocatorParameter = computed<boolean>(() => {
+	return props.parameter.type === 'resourceLocator';
+});
 
-			this.$emit('focus');
-		},
-		isCodeNode(node: INodeUi): boolean {
-			return node.type === CODE_NODE_TYPE;
-		},
-		isHtmlNode(node: INodeUi): boolean {
-			return node.type === HTML_NODE_TYPE;
-		},
-		rgbaToHex(value: string): string | null {
-			// Convert rgba to hex from: https://stackoverflow.com/questions/5623838/rgb-to-hex-and-hex-to-rgb
-			const valueMatch = (value as string).match(
-				/^rgba\((\d+),\s*(\d+),\s*(\d+),\s*(\d+(\.\d+)?)\)$/,
-			);
-			if (valueMatch === null) {
-				// TODO: Display something if value is not valid
-				return null;
-			}
-			const [r, g, b, a] = valueMatch.splice(1, 4).map((v) => Number(v));
-			return (
-				'#' +
-				((1 << 24) + (r << 16) + (g << 8) + b).toString(16).slice(1) +
-				((1 << 8) + Math.floor((1 - a) * 255)).toString(16).slice(1)
-			);
-		},
-		onTextInputChange(value: string) {
-			const parameterData = {
-				node: this.node !== null ? this.node.name : this.nodeName,
-				name: this.path,
-				value,
-			};
-
-			this.$emit('textInput', parameterData);
-		},
-		valueChangedDebounced(value: NodeParameterValueType | {} | Date) {
-			this.callDebounced('valueChanged', { debounceTime: 100 }, value);
-		},
-		valueChanged(value: NodeParameterValueType | {} | Date) {
-			if (this.parameter.name === 'nodeCredentialType') {
-				this.activeCredentialType = value as string;
-			}
+const isSecretParameter = computed<boolean>(() => {
+	return getArgument('password') === true;
+});
 
-			if (value instanceof Date) {
-				value = value.toISOString();
-			}
+const remoteParameterOptionsKeys = computed<string[]>(() => {
+	return (remoteParameterOptions.value || []).map((o) => o.name);
+});
 
-			if (
-				this.parameter.type === 'color' &&
-				this.getArgument('showAlpha') === true &&
-				value !== null &&
-				value !== undefined &&
-				value.toString().charAt(0) !== '#'
-			) {
-				const newValue = this.rgbaToHex(value as string);
-				if (newValue !== null) {
-					this.tempValue = newValue;
-					value = newValue;
-				}
-			}
+const shouldRedactValue = computed<boolean>(() => {
+	return getStringInputType.value === 'password' || props.isForCredential;
+});
 
-			const parameterData = {
-				node: this.node !== null ? this.node.name : this.nodeName,
-				name: this.path,
-				value,
-			};
-
-			this.$emit('valueChanged', parameterData);
-
-			if (this.parameter.name === 'operation' || this.parameter.name === 'mode') {
-				this.$telemetry.track('User set node operation or mode', {
-					workflow_id: this.workflowsStore.workflowId,
-					node_type: this.node && this.node.type,
-					resource: this.node && this.node.parameters.resource,
-					is_custom: value === CUSTOM_API_CALL_KEY,
-					session_id: this.ndvStore.sessionId,
-					parameter: this.parameter.name,
-				});
-			}
-		},
-		optionSelected(command: string) {
-			const prevValue = this.value;
-
-			if (command === 'resetValue') {
-				this.valueChanged(this.parameter.default);
-			} else if (command === 'addExpression') {
-				if (this.isResourceLocatorParameter) {
-					if (isResourceLocatorValue(this.value)) {
-						this.valueChanged({ __rl: true, value: `=${this.value.value}`, mode: this.value.mode });
-					} else {
-						this.valueChanged({ __rl: true, value: `=${this.value}`, mode: '' });
-					}
-				} else if (
-					this.parameter.type === 'number' &&
-					(!this.value || this.value === '[Object: null]')
-				) {
-					this.valueChanged('={{ 0 }}');
-				} else if (this.parameter.type === 'number' || this.parameter.type === 'boolean') {
-					this.valueChanged(`={{ ${this.value} }}`);
-				} else {
-					this.valueChanged(`=${this.value}`);
-				}
+const modelValueString = computed<string>(() => {
+	return props.modelValue as string;
+});
 
-				this.setFocus();
-			} else if (command === 'removeExpression') {
-				let value: NodeParameterValueType = this.expressionEvaluated;
+const modelValueResourceLocator = computed<INodeParameterResourceLocator>(() => {
+	return props.modelValue as INodeParameterResourceLocator;
+});
 
-				this.isFocused = false;
+const modelValueExpressionEdit = computed<string>(() => {
+	return isResourceLocatorParameter.value && typeof props.modelValue !== 'string'
+		? props.modelValue
+			? ((props.modelValue as INodeParameterResourceLocator).value as string)
+			: ''
+		: (props.modelValue as string);
+});
 
-				if (this.parameter.type === 'multiOptions' && typeof value === 'string') {
-					value = (value || '')
-						.split(',')
-						.filter((value) =>
-							(this.parameterOptions || []).find(
-								(option) => (option as INodePropertyOptions).value === value,
-							),
-						);
-				}
+const editorRows = computed(() => getArgument<number>('rows'));
 
-				if (this.isResourceLocatorParameter && isResourceLocatorValue(this.value)) {
-					this.valueChanged({ __rl: true, value, mode: this.value.mode });
-				} else {
-					let newValue = typeof value !== 'undefined' ? value : null;
+const codeEditorMode = computed<CodeExecutionMode>(() => {
+	return node.value?.parameters.mode as CodeExecutionMode;
+});
 
-					if (this.parameter.type === 'string') {
-						// Strip the '=' from the beginning
-						newValue = this.value ? this.value.toString().substring(1) : null;
-					}
+const isCodeNode = computed(
+	() => !!node.value && NODES_USING_CODE_NODE_EDITOR.includes(node.value.type),
+);
 
-					this.valueChanged(newValue);
-				}
-			} else if (command === 'refreshOptions') {
-				if (this.isResourceLocatorParameter) {
-					const resourceLocatorRef = this.$refs.resourceLocator as ResourceLocatorRef | undefined;
+const isHtmlNode = computed(() => !!node.value && node.value.type === HTML_NODE_TYPE);
 
-					resourceLocatorRef?.$emit('refreshList');
-				}
-				this.loadRemoteParameterOptions();
-			} else if (command === 'formatHtml') {
-				htmlEditorEventBus.emit('format-html');
-			}
+function isRemoteParameterOption(option: INodePropertyOptions) {
+	return remoteParameterOptionsKeys.value.includes(option.name);
+}
 
-			if (this.node && (command === 'addExpression' || command === 'removeExpression')) {
-				const telemetryPayload = {
-					node_type: this.node.type,
-					parameter: this.path,
-					old_mode: command === 'addExpression' ? 'fixed' : 'expression',
-					new_mode: command === 'removeExpression' ? 'fixed' : 'expression',
-					was_parameter_empty: prevValue === '' || prevValue === undefined,
-					had_mapping: hasExpressionMapping(prevValue),
-					had_parameter: typeof prevValue === 'string' && prevValue.includes('$parameter'),
-				};
-				this.$telemetry.track('User switched parameter mode', telemetryPayload);
-				this.$externalHooks().run('parameterInput.modeSwitch', telemetryPayload);
-			}
-		},
-	},
-	updated() {
-		this.$nextTick(() => {
-			const remoteParameterOptions = this.$el.querySelectorAll('.remote-parameter-option');
+function credentialSelected(updateInformation: INodeUpdatePropertiesInformation) {
+	// Update the values on the node
+	workflowsStore.updateNodeProperties(updateInformation);
 
-			if (remoteParameterOptions.length > 0) {
-				this.$externalHooks().run('parameterInput.updated', { remoteParameterOptions });
-			}
+	const updateNode = workflowsStore.getNodeByName(updateInformation.name);
+
+	if (updateNode) {
+		// Update the issues
+		nodeHelpers.updateNodeCredentialIssues(updateNode);
+	}
+
+	void externalHooks.run('nodeSettings.credentialSelected', { updateInformation });
+}
+
+/**
+ * Check whether a param value must be skipped when collecting node param issues for validation.
+ */
+function skipCheck(value: string | number | boolean | null) {
+	return typeof value === 'string' && value.includes(CUSTOM_API_CALL_KEY);
+}
+
+function getPlaceholder(): string {
+	return props.isForCredential
+		? i18n.credText().placeholder(props.parameter)
+		: i18n.nodeText().placeholder(props.parameter, props.path);
+}
+
+function getOptionsOptionDisplayName(option: INodePropertyOptions): string {
+	return props.isForCredential
+		? i18n.credText().optionsOptionDisplayName(props.parameter, option)
+		: i18n.nodeText().optionsOptionDisplayName(props.parameter, option, props.path);
+}
+
+function getOptionsOptionDescription(option: INodePropertyOptions): string {
+	return props.isForCredential
+		? i18n.credText().optionsOptionDescription(props.parameter, option)
+		: i18n.nodeText().optionsOptionDescription(props.parameter, option, props.path);
+}
+
+async function loadRemoteParameterOptions() {
+	if (
+		!node.value ||
+		!hasRemoteMethod.value ||
+		remoteParameterOptionsLoading.value ||
+		!props.parameter
+	) {
+		return;
+	}
+	remoteParameterOptionsLoadingIssues.value = null;
+	remoteParameterOptionsLoading.value = true;
+	remoteParameterOptions.value.length = 0;
+
+	// Get the resolved parameter values of the current node
+
+	try {
+		const currentNodeParameters = (ndvStore.activeNode as INodeUi).parameters;
+		const resolvedNodeParameters = workflowHelpers.resolveRequiredParameters(
+			props.parameter,
+			currentNodeParameters,
+		) as INodeParameters;
+		const loadOptionsMethod = getArgument<string | undefined>('loadOptionsMethod');
+		const loadOptions = getArgument<ILoadOptions | undefined>('loadOptions');
+
+		const options = await nodeTypesStore.getNodeParameterOptions({
+			nodeTypeAndVersion: {
+				name: node.value.type,
+				version: node.value.typeVersion,
+			},
+			path: props.path,
+			methodName: loadOptionsMethod,
+			loadOptions,
+			currentNodeParameters: resolvedNodeParameters,
+			credentials: node.value.credentials,
 		});
-	},
-	mounted() {
-		this.$on('optionSelected', this.optionSelected);
 
-		this.tempValue = this.displayValue as string;
-		if (this.node !== null) {
-			this.nodeName = this.node.name;
+		remoteParameterOptions.value = remoteParameterOptions.value.concat(options);
+	} catch (error) {
+		remoteParameterOptionsLoadingIssues.value = error.message;
+	}
+
+	remoteParameterOptionsLoading.value = false;
+}
+
+function closeCodeEditDialog() {
+	codeEditDialogVisible.value = false;
+
+	editDialogClosing.value = true;
+
+	void nextTick().then(() => {
+		editDialogClosing.value = false;
+	});
+}
+
+function closeExpressionEditDialog() {
+	expressionEditDialogVisible.value = false;
+}
+
+function trackExpressionEditOpen() {
+	if (!node.value) {
+		return;
+	}
+
+	if (node.value.type.startsWith('n8n-nodes-base') || isCredentialOnlyNodeType(node.value.type)) {
+		telemetry.track('User opened Expression Editor', {
+			node_type: node.value.type,
+			parameter_name: props.parameter.displayName,
+			parameter_field_type: props.parameter.type,
+			new_expression: !isModelValueExpression.value,
+			workflow_id: workflowsStore.workflowId,
+			push_ref: ndvStore.pushRef,
+			source: props.eventSource ?? 'ndv',
+		});
+	}
+}
+
+async function closeTextEditDialog() {
+	textEditDialogVisible.value = false;
+
+	editDialogClosing.value = true;
+	void nextTick().then(() => {
+		inputField.value?.blur?.();
+		editDialogClosing.value = false;
+	});
+}
+
+function displayEditDialog() {
+	if (editDialogClosing.value) {
+		return;
+	}
+
+	if (editorType.value || props.parameter.type === 'json') {
+		codeEditDialogVisible.value = true;
+	} else {
+		textEditDialogVisible.value = true;
+	}
+}
+
+function getArgument<T = string | number | boolean | undefined>(argumentName: string): T {
+	return props.parameter.typeOptions?.[argumentName];
+}
+
+function expressionUpdated(value: string) {
+	const val: NodeParameterValueType = isResourceLocatorParameter.value
+		? { __rl: true, value, mode: modelValueResourceLocator.value.mode }
+		: value;
+	valueChanged(val);
+}
+
+function openExpressionEditorModal() {
+	if (!isModelValueExpression.value) return;
+
+	expressionEditDialogVisible.value = true;
+	trackExpressionEditOpen();
+}
+
+function onBlur() {
+	emit('blur');
+	isFocused.value = false;
+}
+
+function onResourceLocatorDrop(data: string) {
+	emit('drop', data);
+}
+
+async function setFocus() {
+	if (['json'].includes(props.parameter.type) && getArgument('alwaysOpenEditWindow')) {
+		displayEditDialog();
+		return;
+	}
+
+	if (node.value) {
+		// When an event like mouse-click removes the active node while
+		// editing is active it does not know where to save the value to.
+		// For that reason do we save the node-name here. We could probably
+		// also just do that once on load but if Vue decides for some reason to
+		// reuse the input it could have the wrong value so lets set it everytime
+		// just to be sure
+		nodeName.value = node.value.name;
+	}
+
+	await nextTick();
+
+	const inputRef = inputField.value;
+	if (inputRef) {
+		if ('focusOnInput' in inputRef) {
+			inputRef.focusOnInput();
+		} else if (inputRef.focus) {
+			inputRef.focus();
 		}
 
-		if (this.node && this.node.parameters.authentication === 'predefinedCredentialType') {
-			this.activeCredentialType = this.node.parameters.nodeCredentialType as string;
+		isFocused.value = true;
+	}
+
+	emit('focus');
+}
+
+function rgbaToHex(value: string): string | null {
+	// Convert rgba to hex from: https://stackoverflow.com/questions/5623838/rgb-to-hex-and-hex-to-rgb
+	const valueMatch = value.match(/^rgba\((\d+),\s*(\d+),\s*(\d+),\s*(\d+(\.\d+)?)\)$/);
+	if (valueMatch === null) {
+		// TODO: Display something if value is not valid
+		return null;
+	}
+	const [r, g, b, a] = valueMatch.splice(1, 4).map((v) => Number(v));
+	return (
+		'#' +
+		((1 << 24) + (r << 16) + (g << 8) + b).toString(16).slice(1) +
+		((1 << 8) + Math.floor((1 - a) * 255)).toString(16).slice(1)
+	);
+}
+function onTextInputChange(value: string) {
+	const parameterData = {
+		node: node.value ? node.value.name : nodeName.value,
+		name: props.path,
+		value,
+	};
+
+	emit('textInput', parameterData);
+}
+function valueChangedDebounced(value: NodeParameterValueType | {} | Date) {
+	void callDebounced(valueChanged, { debounceTime: 100 }, value);
+}
+function onUpdateTextInput(value: string) {
+	valueChanged(value);
+	onTextInputChange(value);
+}
+
+function valueChanged(value: NodeParameterValueType | {} | Date) {
+	if (remoteParameterOptionsLoading.value) {
+		return;
+	}
+
+	if (props.parameter.name === 'nodeCredentialType') {
+		activeCredentialType.value = value as string;
+	}
+
+	if (value instanceof Date) {
+		value = value.toISOString();
+	}
+
+	if (
+		props.parameter.type === 'color' &&
+		getArgument('showAlpha') === true &&
+		value !== null &&
+		value !== undefined &&
+		(value as string).toString().charAt(0) !== '#'
+	) {
+		const newValue = rgbaToHex(value as string);
+		if (newValue !== null) {
+			tempValue.value = newValue;
+			value = newValue;
 		}
+	}
 
-		if (
-			this.parameter.type === 'color' &&
-			this.getArgument('showAlpha') === true &&
-			this.displayValue !== null &&
-			this.displayValue.toString().charAt(0) !== '#'
-		) {
-			const newValue = this.rgbaToHex(this.displayValue as string);
-			if (newValue !== null) {
-				this.tempValue = newValue;
+	const parameterData = {
+		node: node.value ? node.value.name : nodeName.value,
+		name: props.path,
+		value,
+	};
+
+	emit('update', parameterData);
+
+	if (props.parameter.name === 'operation' || props.parameter.name === 'mode') {
+		telemetry.track('User set node operation or mode', {
+			workflow_id: workflowsStore.workflowId,
+			node_type: node.value?.type,
+			resource: node.value && node.value.parameters.resource,
+			is_custom: value === CUSTOM_API_CALL_KEY,
+			push_ref: ndvStore.pushRef,
+			parameter: props.parameter.name,
+		});
+	}
+}
+
+async function optionSelected(command: string) {
+	const prevValue = props.modelValue;
+
+	if (command === 'resetValue') {
+		valueChanged(props.parameter.default);
+	} else if (command === 'addExpression') {
+		if (isResourceLocatorParameter.value) {
+			if (isResourceLocatorValue(props.modelValue)) {
+				valueChanged({
+					__rl: true,
+					value: `=${props.modelValue.value}`,
+					mode: props.modelValue.mode,
+				});
+			} else {
+				valueChanged({ __rl: true, value: `=${props.modelValue}`, mode: '' });
 			}
+		} else if (
+			props.parameter.type === 'number' &&
+			(!props.modelValue || props.modelValue === '[Object: null]')
+		) {
+			valueChanged('={{ 0 }}');
+		} else if (
+			props.parameter.type === 'number' ||
+			props.parameter.type === 'boolean' ||
+			typeof props.modelValue !== 'string'
+		) {
+			valueChanged(`={{ ${props.modelValue} }}`);
+		} else {
+			valueChanged(`=${props.modelValue}`);
 		}
 
-		if (this.hasRemoteMethod === true && this.node !== null) {
-			// Make sure to load the parameter options
-			// directly and whenever the credentials change
-			this.$watch(
-				() => this.node!.credentials,
-				() => {
-					this.loadRemoteParameterOptions();
-				},
-				{ deep: true, immediate: true },
-			);
-
-			// Reload function on change element from
-			// displayOptions.typeOptions.reloadOnChange parameters
-			if (this.parameter.typeOptions && this.parameter.typeOptions.reloadOnChange) {
-				// Get all parameter in reloadOnChange property
-				// This reload when parameters in reloadOnChange is updated
-				const parametersOnChange: string[] = this.parameter.typeOptions.reloadOnChange;
-				for (let i = 0; i < parametersOnChange.length; i++) {
-					const parameter = parametersOnChange[i] as string;
-					if (parameter in this.node.parameters) {
-						this.$watch(
-							() => {
-								if (this.node && this.node.parameters && this.node.parameters[parameter]) {
-									return this.node.parameters![parameter];
-								} else {
-									return null;
-								}
-							},
-							() => {
-								this.loadRemoteParameterOptions();
-							},
-							{ deep: true, immediate: true },
-						);
-					}
-				}
+		await setFocus();
+	} else if (command === 'removeExpression') {
+		let value: NodeParameterValueType = props.expressionEvaluated;
+
+		isFocused.value = false;
+
+		if (props.parameter.type === 'multiOptions' && typeof value === 'string') {
+			value = (value || '')
+				.split(',')
+				.filter((valueItem) =>
+					(parameterOptions.value ?? []).find((option) => option.value === valueItem),
+				);
+		}
+
+		if (isResourceLocatorParameter.value && isResourceLocatorValue(props.modelValue)) {
+			valueChanged({ __rl: true, value, mode: props.modelValue.mode });
+		} else {
+			let newValue = typeof value !== 'undefined' ? value : null;
+
+			if (props.parameter.type === 'string') {
+				// Strip the '=' from the beginning
+				newValue = modelValueString.value ? modelValueString.value.toString().substring(1) : null;
 			}
+			valueChanged(newValue);
+		}
+	} else if (command === 'refreshOptions') {
+		if (isResourceLocatorParameter.value) {
+			props.eventBus.emit('refreshList');
 		}
+		void loadRemoteParameterOptions();
+	} else if (command === 'formatHtml') {
+		htmlEditorEventBus.emit('format-html');
+	}
 
-		this.$externalHooks().run('parameterInput.mount', {
-			parameter: this.parameter,
-			inputFieldRef: this.$refs['inputField'],
-		});
+	if (node.value && (command === 'addExpression' || command === 'removeExpression')) {
+		const telemetryPayload = {
+			node_type: node.value.type,
+			parameter: props.path,
+			old_mode: command === 'addExpression' ? 'fixed' : 'expression',
+			new_mode: command === 'removeExpression' ? 'fixed' : 'expression',
+			was_parameter_empty: prevValue === '' || prevValue === undefined,
+			had_mapping: hasExpressionMapping(prevValue),
+			had_parameter: typeof prevValue === 'string' && prevValue.includes('$parameter'),
+		};
+		telemetry.track('User switched parameter mode', telemetryPayload);
+		void externalHooks.run('parameterInput.modeSwitch', telemetryPayload);
+	}
+}
+
+onMounted(() => {
+	props.eventBus.on('optionSelected', optionSelected);
+
+	tempValue.value = displayValue.value as string;
+
+	if (node.value) {
+		nodeName.value = node.value.name;
+	}
+
+	if (node.value && node.value.parameters.authentication === 'predefinedCredentialType') {
+		activeCredentialType.value = node.value.parameters.nodeCredentialType as string;
+	}
+
+	if (
+		props.parameter.type === 'color' &&
+		getArgument('showAlpha') === true &&
+		displayValue.value !== null &&
+		displayValue.value.toString().charAt(0) !== '#'
+	) {
+		const newValue = rgbaToHex(displayValue.value as string);
+		if (newValue !== null) {
+			tempValue.value = newValue;
+		}
+	}
+
+	void externalHooks.run('parameterInput.mount', {
+		parameter: props.parameter,
+		inputFieldRef: inputField.value as InstanceType<typeof N8nInput>,
+	});
+});
+
+onBeforeUnmount(() => {
+	props.eventBus.off('optionSelected', optionSelected);
+});
+
+watch(
+	() => node.value?.credentials,
+	() => {
+		if (hasRemoteMethod.value && node.value) {
+			void loadRemoteParameterOptions();
+		}
 	},
+	{ immediate: true },
+);
+
+watch(dependentParametersValues, async () => {
+	// Reload the remote parameters whenever a parameter
+	// on which the current field depends on changes
+	await loadRemoteParameterOptions();
+});
+
+watch(
+	() => props.modelValue,
+	async () => {
+		if (props.parameter.type === 'color' && getArgument('showAlpha') === true) {
+			// Do not set for color with alpha else wrong value gets displayed in field
+			return;
+		}
+		tempValue.value = displayValue.value as string;
+	},
+);
+
+onUpdated(async () => {
+	await nextTick();
+
+	if (wrapper.value) {
+		const remoteParamOptions = wrapper.value.querySelectorAll('.remote-parameter-option') ?? [];
+
+		if (remoteParamOptions.length > 0) {
+			void externalHooks.run('parameterInput.updated', {
+				remoteParameterOptions: remoteParamOptions,
+			});
+		}
+	}
 });
 </script>
 
 <style scoped lang="scss">
-.code-edit {
+.readonly-code {
 	font-size: var(--font-size-xs);
 }
 
@@ -1224,13 +1411,13 @@ export default mixins(
 
 .parameter-input {
 	display: inline-block;
-}
 
-::v-deep .color-input {
-	display: flex;
+	:deep(.color-input) {
+		display: flex;
 
-	.el-color-picker__trigger {
-		border: none;
+		.el-color-picker__trigger {
+			border: none;
+		}
 	}
 }
 </style>
@@ -1243,7 +1430,8 @@ export default mixins(
 }
 
 .droppable {
-	--input-border-color: var(--color-secondary);
+	--input-border-color: var(--color-ndv-droppable-parameter);
+	--input-border-right-color: var(--color-ndv-droppable-parameter);
 	--input-border-style: dashed;
 
 	textarea,
@@ -1255,6 +1443,7 @@ export default mixins(
 
 .activeDrop {
 	--input-border-color: var(--color-success);
+	--input-border-right-color: var(--color-success);
 	--input-background-color: var(--color-foreground-xlight);
 	--input-border-style: solid;
 
@@ -1307,15 +1496,19 @@ export default mixins(
 	align-items: center;
 }
 
-.input-with-opener > .el-input__suffix {
+.input-with-opener .el-input__suffix {
 	right: 0;
 }
 
+.el-input--suffix .el-input__inner {
+	padding-right: 0;
+}
+
 .textarea-modal-opener {
 	position: absolute;
 	right: 0;
 	bottom: 0;
-	background-color: white;
+	background-color: var(--color-code-background);
 	padding: 3px;
 	line-height: 9px;
 	border: var(--border-base);
@@ -1341,4 +1534,12 @@ export default mixins(
 .invalid {
 	border-color: var(--color-danger);
 }
+
+.code-edit-dialog {
+	height: 70vh;
+
+	.code-node-editor {
+		height: 100%;
+	}
+}
 </style>
diff --git a/packages/editor-ui/src/components/ParameterInputExpanded.vue b/packages/editor-ui/src/components/ParameterInputExpanded.vue
index 8f427d8c56af4..b3f5e33c898ad 100644
--- a/packages/editor-ui/src/components/ParameterInputExpanded.vue
+++ b/packages/editor-ui/src/components/ParameterInputExpanded.vue
@@ -1,57 +1,56 @@
 <template>
 	<n8n-input-label
 		:label="$locale.credText().inputLabelDisplayName(parameter)"
-		:tooltipText="$locale.credText().inputLabelDescription(parameter)"
+		:tooltip-text="$locale.credText().inputLabelDescription(parameter)"
 		:required="parameter.required"
-		:showTooltip="focused"
-		:showOptions="menuExpanded"
+		:show-tooltip="focused"
+		:show-options="menuExpanded"
 		:data-test-id="parameter.name"
 		:size="label.size"
 	>
 		<template #options>
-			<parameter-options
+			<ParameterOptions
 				:parameter="parameter"
 				:value="value"
-				:isReadOnly="false"
-				:showOptions="true"
-				:isValueExpression="isValueExpression"
-				@optionSelected="optionSelected"
+				:is-read-only="false"
+				:show-options="true"
+				:is-value-expression="isValueExpression"
+				@update:model-value="optionSelected"
 				@menu-expanded="onMenuExpanded"
 			/>
 		</template>
-		<template>
-			<parameter-input-wrapper
-				ref="param"
-				inputSize="large"
-				:parameter="parameter"
-				:value="value"
-				:path="parameter.name"
-				:hideIssues="true"
-				:documentationUrl="documentationUrl"
-				:errorHighlight="showRequiredErrors"
-				:isForCredential="true"
-				:eventSource="eventSource"
-				:hint="!showRequiredErrors ? hint : ''"
-				@focus="onFocus"
-				@blur="onBlur"
-				@textInput="valueChanged"
-				@valueChanged="valueChanged"
-			/>
-			<div :class="$style.errors" v-if="showRequiredErrors">
-				<n8n-text color="danger" size="small">
-					{{ $locale.baseText('parameterInputExpanded.thisFieldIsRequired') }}
-					<n8n-link
-						v-if="documentationUrl"
-						:to="documentationUrl"
-						size="small"
-						:underline="true"
-						@click="onDocumentationUrlClick"
-					>
-						{{ $locale.baseText('parameterInputExpanded.openDocs') }}
-					</n8n-link>
-				</n8n-text>
-			</div>
-		</template>
+		<ParameterInputWrapper
+			ref="param"
+			input-size="large"
+			:parameter="parameter"
+			:model-value="value"
+			:path="parameter.name"
+			:hide-issues="true"
+			:documentation-url="documentationUrl"
+			:error-highlight="showRequiredErrors"
+			:is-for-credential="true"
+			:event-source="eventSource"
+			:hint="!showRequiredErrors ? hint : ''"
+			:event-bus="eventBus"
+			@focus="onFocus"
+			@blur="onBlur"
+			@text-input="valueChanged"
+			@update="valueChanged"
+		/>
+		<div v-if="showRequiredErrors" :class="$style.errors">
+			<n8n-text color="danger" size="small">
+				{{ $locale.baseText('parameterInputExpanded.thisFieldIsRequired') }}
+				<n8n-link
+					v-if="documentationUrl"
+					:to="documentationUrl"
+					size="small"
+					:underline="true"
+					@click="onDocumentationUrlClick"
+				>
+					{{ $locale.baseText('parameterInputExpanded.openDocs') }}
+				</n8n-link>
+			</n8n-text>
+		</div>
 	</n8n-input-label>
 </template>
 
@@ -61,15 +60,14 @@ import ParameterOptions from './ParameterOptions.vue';
 import { defineComponent } from 'vue';
 import type { PropType } from 'vue';
 import ParameterInputWrapper from './ParameterInputWrapper.vue';
-import { isValueExpression } from '@/utils';
+import { isValueExpression } from '@/utils/nodeTypesUtils';
 import type { INodeParameterResourceLocator, INodeProperties, IParameterLabel } from 'n8n-workflow';
 import { mapStores } from 'pinia';
-import { useWorkflowsStore } from '@/stores/workflows';
-
-type ParamRef = InstanceType<typeof ParameterInputWrapper>;
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { createEventBus } from 'n8n-design-system/utils';
 
 export default defineComponent({
-	name: 'parameter-input-expanded',
+	name: 'ParameterInputExpanded',
 	components: {
 		ParameterOptions,
 		ParameterInputWrapper,
@@ -100,6 +98,7 @@ export default defineComponent({
 			focused: false,
 			blurredEver: false,
 			menuExpanded: false,
+			eventBus: createEventBus(),
 		};
 	},
 	computed: {
@@ -115,6 +114,10 @@ export default defineComponent({
 				}
 
 				if (this.parameter.type === 'number') {
+					if (typeof this.value === 'string' && this.value.startsWith('=')) {
+						return false;
+					}
+
 					return typeof this.value !== 'number';
 				}
 			}
@@ -147,12 +150,10 @@ export default defineComponent({
 			this.menuExpanded = expanded;
 		},
 		optionSelected(command: string) {
-			if (this.$refs.param) {
-				(this.$refs.param as ParamRef).$emit('optionSelected', command);
-			}
+			this.eventBus.emit('optionSelected', command);
 		},
 		valueChanged(parameterData: IUpdateInformation) {
-			this.$emit('change', parameterData);
+			this.$emit('update', parameterData);
 		},
 		onDocumentationUrlClick(): void {
 			this.$telemetry.track('User clicked credential modal docs link', {
diff --git a/packages/editor-ui/src/components/ParameterInputFull.vue b/packages/editor-ui/src/components/ParameterInputFull.vue
index 90e0690bc67bd..20c7a81d5d729 100644
--- a/packages/editor-ui/src/components/ParameterInputFull.vue
+++ b/packages/editor-ui/src/components/ParameterInputFull.vue
@@ -1,132 +1,141 @@
 <template>
 	<n8n-input-label
-		:label="hideLabel ? '' : $locale.nodeText().inputLabelDisplayName(parameter, path)"
-		:tooltipText="hideLabel ? '' : $locale.nodeText().inputLabelDescription(parameter, path)"
-		:showTooltip="focused"
-		:showOptions="menuExpanded || focused || forceShowExpression"
+		:class="[$style.wrapper, { [$style.tipVisible]: showDragnDropTip }]"
+		:label="hideLabel ? '' : i18n.nodeText().inputLabelDisplayName(parameter, path)"
+		:tooltip-text="hideLabel ? '' : i18n.nodeText().inputLabelDescription(parameter, path)"
+		:show-tooltip="focused"
+		:show-options="menuExpanded || focused || forceShowExpression"
+		:options-position="optionsPosition"
 		:bold="false"
 		:size="label.size"
 		color="text-dark"
 	>
-		<template #options>
-			<parameter-options
+		<template v-if="displayOptions && optionsPosition === 'top'" #options>
+			<ParameterOptions
 				:parameter="parameter"
 				:value="value"
-				:isReadOnly="isReadOnly"
-				:showOptions="displayOptions"
-				:showExpressionSelector="showExpressionSelector"
-				@optionSelected="optionSelected"
+				:is-read-only="isReadOnly"
+				:show-options="displayOptions"
+				:show-expression-selector="showExpressionSelector"
+				@update:model-value="optionSelected"
 				@menu-expanded="onMenuExpanded"
 			/>
 		</template>
-		<template>
-			<draggable-target
-				type="mapping"
-				:disabled="isDropDisabled"
-				:sticky="true"
-				:stickyOffset="isValueExpression ? [26, 3] : [3, 3]"
-				@drop="onDrop"
-			>
-				<template #default="{ droppable, activeDrop }">
-					<n8n-tooltip
-						placement="left"
-						:manual="true"
-						:value="showMappingTooltip"
-						:buttons="dataMappingTooltipButtons"
-					>
-						<template #content>
-							<span
-								v-html="
-									$locale.baseText(`dataMapping.${displayMode}Hint`, {
-										interpolate: { name: parameter.displayName },
-									})
-								"
-							/>
-						</template>
-						<parameter-input-wrapper
-							ref="param"
-							:parameter="parameter"
-							:value="value"
-							:path="path"
-							:isReadOnly="isReadOnly"
-							:droppable="droppable"
-							:activeDrop="activeDrop"
-							:forceShowExpression="forceShowExpression"
-							:hint="hint"
-							:hide-issues="hideIssues"
-							@valueChanged="valueChanged"
-							@textInput="onTextInput"
-							@focus="onFocus"
-							@blur="onBlur"
-							@drop="onDrop"
-							inputSize="small"
-						/>
-					</n8n-tooltip>
-				</template>
-			</draggable-target>
-		</template>
+		<DraggableTarget
+			type="mapping"
+			:disabled="isDropDisabled"
+			:sticky="true"
+			:sticky-offset="isValueExpression ? [26, 3] : [3, 3]"
+			@drop="onDrop"
+		>
+			<template #default="{ droppable, activeDrop }">
+				<ParameterInputWrapper
+					ref="param"
+					:parameter="parameter"
+					:model-value="value"
+					:path="path"
+					:is-read-only="isReadOnly"
+					:is-assignment="isAssignment"
+					:rows="rows"
+					:droppable="droppable"
+					:active-drop="activeDrop"
+					:force-show-expression="forceShowExpression"
+					:hint="hint"
+					:hide-hint="hideHint"
+					:hide-issues="hideIssues"
+					:label="label"
+					:event-bus="eventBus"
+					input-size="small"
+					@update="valueChanged"
+					@text-input="onTextInput"
+					@focus="onFocus"
+					@blur="onBlur"
+					@drop="onDrop"
+				/>
+			</template>
+		</DraggableTarget>
+		<div v-if="showDragnDropTip" :class="$style.tip">
+			<InlineExpressionTip />
+		</div>
+		<div
+			:class="{
+				[$style.options]: true,
+				[$style.visible]: menuExpanded || focused || forceShowExpression,
+			}"
+		>
+			<ParameterOptions
+				v-if="optionsPosition === 'bottom'"
+				:parameter="parameter"
+				:value="value"
+				:is-read-only="isReadOnly"
+				:show-options="displayOptions"
+				:show-expression-selector="showExpressionSelector"
+				@update:model-value="optionSelected"
+				@menu-expanded="onMenuExpanded"
+			/>
+		</div>
 	</n8n-input-label>
 </template>
 
 <script lang="ts">
+import { defineComponent } from 'vue';
 import type { PropType } from 'vue';
-import type Vue from 'vue';
+import { mapStores } from 'pinia';
 
-import type { IN8nButton, INodeUi, IRunDataDisplayMode, IUpdateInformation } from '@/Interface';
+import type { INodeUi, IRunDataDisplayMode, IUpdateInformation } from '@/Interface';
 
 import ParameterOptions from '@/components/ParameterOptions.vue';
 import DraggableTarget from '@/components/DraggableTarget.vue';
-import mixins from 'vue-typed-mixins';
-import { showMessage } from '@/mixins/showMessage';
-import {
-	hasExpressionMapping,
-	isResourceLocatorValue,
-	hasOnlyListMode,
-	isValueExpression,
-} from '@/utils';
+import { useI18n } from '@/composables/useI18n';
+import { useToast } from '@/composables/useToast';
+import { hasExpressionMapping, hasOnlyListMode, isValueExpression } from '@/utils/nodeTypesUtils';
+import { isResourceLocatorValue } from '@/utils/typeGuards';
 import ParameterInputWrapper from '@/components/ParameterInputWrapper.vue';
 import type {
-	INodeParameters,
 	INodeProperties,
 	INodePropertyMode,
 	IParameterLabel,
+	NodeParameterValueType,
 } from 'n8n-workflow';
-import type { BaseTextKey } from '@/plugins/i18n';
-import { mapStores } from 'pinia';
-import { useNDVStore } from '@/stores/ndv';
-import { useSegment } from '@/stores/segment';
-import { externalHooks } from '@/mixins/externalHooks';
-import { getMappedResult } from '../utils/mappingUtils';
+import { useNDVStore } from '@/stores/ndv.store';
+import { useSegment } from '@/stores/segment.store';
+import { getMappedResult } from '@/utils/mappingUtils';
+import { createEventBus } from 'n8n-design-system/utils';
+import InlineExpressionTip from './InlineExpressionEditor/InlineExpressionTip.vue';
 
-type ParamterInputWrapperRef = InstanceType<typeof ParameterInputWrapper>;
-
-const DISPLAY_MODES_WITH_DATA_MAPPING = ['table', 'json', 'schema'];
-
-export default mixins(showMessage, externalHooks).extend({
-	name: 'parameter-input-full',
+export default defineComponent({
+	name: 'ParameterInputFull',
 	components: {
 		ParameterOptions,
 		DraggableTarget,
 		ParameterInputWrapper,
-	},
-	data() {
-		return {
-			focused: false,
-			menuExpanded: false,
-			forceShowExpression: false,
-			dataMappingTooltipButtons: [] as IN8nButton[],
-			mappingTooltipEnabled: false,
-		};
+		InlineExpressionTip,
 	},
 	props: {
 		displayOptions: {
 			type: Boolean,
 			default: false,
 		},
+		optionsPosition: {
+			type: String as PropType<'bottom' | 'top'>,
+			default: 'top',
+		},
+		hideHint: {
+			type: Boolean,
+			default: false,
+		},
 		isReadOnly: {
 			type: Boolean,
 			default: false,
 		},
+		rows: {
+			type: Number,
+			default: 5,
+		},
+		isAssignment: {
+			type: Boolean,
+			default: false,
+		},
 		hideLabel: {
 			type: Boolean,
 			default: false,
@@ -137,12 +146,13 @@ export default mixins(showMessage, externalHooks).extend({
 		},
 		parameter: {
 			type: Object as PropType<INodeProperties>,
+			required: true,
 		},
 		path: {
 			type: String,
 		},
 		value: {
-			type: [Number, String, Boolean, Array, Object] as PropType<INodeParameters>,
+			type: [Number, String, Boolean, Array, Object] as PropType<NodeParameterValueType>,
 		},
 		label: {
 			type: Object as PropType<IParameterLabel>,
@@ -150,20 +160,27 @@ export default mixins(showMessage, externalHooks).extend({
 				size: 'small',
 			}),
 		},
+		entryIndex: {
+			type: Number,
+			default: undefined,
+		},
 	},
-	created() {
-		const mappingTooltipDismissHandler = this.onMappingTooltipDismissed.bind(this);
-		this.dataMappingTooltipButtons = [
-			{
-				attrs: {
-					label: this.$locale.baseText('_reusableBaseText.dismiss' as BaseTextKey),
-					'data-test-id': 'dismiss-mapping-tooltip',
-				},
-				listeners: {
-					click: mappingTooltipDismissHandler,
-				},
-			},
-		];
+	setup() {
+		const eventBus = createEventBus();
+		const i18n = useI18n();
+
+		return {
+			i18n,
+			eventBus,
+			...useToast(),
+		};
+	},
+	data() {
+		return {
+			focused: false,
+			menuExpanded: false,
+			forceShowExpression: false,
+		};
 	},
 	computed: {
 		...mapStores(useNDVStore),
@@ -171,11 +188,14 @@ export default mixins(showMessage, externalHooks).extend({
 			return this.ndvStore.activeNode;
 		},
 		hint(): string | null {
-			return this.$locale.nodeText().hint(this.parameter, this.path);
+			return this.i18n.nodeText().hint(this.parameter, this.path);
 		},
 		isInputTypeString(): boolean {
 			return this.parameter.type === 'string';
 		},
+		isInputTypeNumber(): boolean {
+			return this.parameter.type === 'number';
+		},
 		isResourceLocator(): boolean {
 			return this.parameter.type === 'resourceLocator';
 		},
@@ -189,55 +209,54 @@ export default mixins(showMessage, externalHooks).extend({
 			return this.isResourceLocator ? !hasOnlyListMode(this.parameter) : true;
 		},
 		isInputDataEmpty(): boolean {
-			return this.ndvStore.isDNVDataEmpty('input');
+			return this.ndvStore.isNDVDataEmpty('input');
 		},
 		displayMode(): IRunDataDisplayMode {
 			return this.ndvStore.inputPanelDisplayMode;
 		},
-		showMappingTooltip(): boolean {
+		showDragnDropTip(): boolean {
 			return (
-				this.mappingTooltipEnabled &&
-				!this.ndvStore.isMappingOnboarded &&
 				this.focused &&
-				this.isInputTypeString &&
-				!this.isInputDataEmpty &&
-				DISPLAY_MODES_WITH_DATA_MAPPING.includes(this.displayMode)
+				(this.isInputTypeString || this.isInputTypeNumber) &&
+				!this.isValueExpression &&
+				!this.isDropDisabled &&
+				(!this.ndvStore.hasInputData || !this.isInputDataEmpty) &&
+				!this.ndvStore.isMappingOnboarded &&
+				this.ndvStore.isInputParentOfActiveNode
 			);
 		},
 	},
 	methods: {
 		onFocus() {
 			this.focused = true;
-			setTimeout(() => {
-				this.mappingTooltipEnabled = true;
-			}, 500);
 			if (!this.parameter.noDataExpression) {
 				this.ndvStore.setMappableNDVInputFocus(this.parameter.displayName);
 			}
+			this.ndvStore.setFocusedInputPath(this.path ?? '');
 		},
 		onBlur() {
 			this.focused = false;
-			this.mappingTooltipEnabled = false;
-			if (!this.parameter.noDataExpression) {
+			if (
+				!this.parameter.noDataExpression &&
+				this.ndvStore.focusedMappableInput === this.parameter.displayName
+			) {
 				this.ndvStore.setMappableNDVInputFocus('');
 			}
+			this.ndvStore.setFocusedInputPath('');
 			this.$emit('blur');
 		},
 		onMenuExpanded(expanded: boolean) {
 			this.menuExpanded = expanded;
 		},
 		optionSelected(command: string) {
-			const paramRef = this.$refs.param as ParamterInputWrapperRef | undefined;
-			paramRef?.$emit('optionSelected', command);
+			this.eventBus.emit('optionSelected', command);
 		},
 		valueChanged(parameterData: IUpdateInformation) {
-			this.$emit('valueChanged', parameterData);
+			this.$emit('update', parameterData);
 		},
 		onTextInput(parameterData: IUpdateInformation) {
-			const paramRef = this.$refs.param as ParamterInputWrapperRef | undefined;
-
 			if (isValueExpression(this.parameter, parameterData.value)) {
-				paramRef?.$emit('optionSelected', 'addExpression');
+				this.eventBus.emit('optionSelected', 'addExpression');
 			}
 		},
 		onDrop(newParamValue: string) {
@@ -290,16 +309,18 @@ export default mixins(showMessage, externalHooks).extend({
 						};
 					}
 
-					this.$emit('valueChanged', parameterData);
+					this.valueChanged(parameterData);
+					this.eventBus.emit('drop', updatedValue);
 
 					if (!this.ndvStore.isMappingOnboarded) {
-						this.$showMessage({
-							title: this.$locale.baseText('dataMapping.success.title'),
-							message: this.$locale.baseText('dataMapping.success.moreInfo'),
+						this.showMessage({
+							title: this.i18n.baseText('dataMapping.success.title'),
+							message: this.i18n.baseText('dataMapping.success.moreInfo'),
 							type: 'success',
+							dangerouslyUseHTMLString: true,
 						});
 
-						this.ndvStore.disableMappingHint();
+						this.ndvStore.setMappingOnboarded();
 					}
 
 					this.ndvStore.setMappingTelemetry({
@@ -321,16 +342,49 @@ export default mixins(showMessage, externalHooks).extend({
 				this.forceShowExpression = false;
 			}, 200);
 		},
-		onMappingTooltipDismissed() {
-			this.ndvStore.disableMappingHint(false);
-		},
-	},
-	watch: {
-		showMappingTooltip(newValue: boolean) {
-			if (!newValue) {
-				this.$telemetry.track('User viewed data mapping tooltip', { type: 'param focus' });
-			}
-		},
 	},
 });
 </script>
+
+<style lang="scss" module>
+.wrapper {
+	position: relative;
+
+	&:hover {
+		.options {
+			opacity: 1;
+		}
+	}
+}
+
+.tipVisible {
+	--input-border-bottom-left-radius: 0;
+	--input-border-bottom-right-radius: 0;
+}
+
+.tip {
+	position: absolute;
+	z-index: 2;
+	top: 100%;
+	background: var(--color-code-background);
+	border: var(--border-base);
+	border-top: none;
+	width: 100%;
+	box-shadow: 0 2px 6px 0 rgba(#441c17, 0.1);
+	border-bottom-left-radius: 4px;
+	border-bottom-right-radius: 4px;
+}
+
+.options {
+	position: absolute;
+	bottom: -22px;
+	right: 0;
+	z-index: 1;
+	opacity: 0;
+	transition: opacity 100ms ease-in;
+
+	&.visible {
+		opacity: 1;
+	}
+}
+</style>
diff --git a/packages/editor-ui/src/components/ParameterInputHint.vue b/packages/editor-ui/src/components/ParameterInputHint.vue
index fbbd176d784c3..4f6ef5c1e7c79 100644
--- a/packages/editor-ui/src/components/ParameterInputHint.vue
+++ b/packages/editor-ui/src/components/ParameterInputHint.vue
@@ -1,11 +1,6 @@
 <template>
-	<n8n-text size="small" color="text-base" tag="div" v-if="hint">
-		<div
-			v-if="!renderHTML"
-			:class="{ [$style.singleline]: singleLine, [$style.highlight]: highlight }"
-		>
-			{{ hint }}
-		</div>
+	<n8n-text v-if="hint" size="small" color="text-base" tag="div">
+		<div v-if="!renderHTML" :class="classes"><span v-html="simplyText"></span></div>
 		<div
 			v-else
 			ref="hint"
@@ -16,8 +11,8 @@
 </template>
 
 <script lang="ts">
-import { sanitizeHtml } from '@/utils';
 import { defineComponent } from 'vue';
+import { sanitizeHtml } from '@/utils/htmlUtils';
 
 export default defineComponent({
 	name: 'InputHint',
@@ -36,14 +31,34 @@ export default defineComponent({
 			default: false,
 		},
 	},
-	methods: {
-		sanitizeHtml,
+	computed: {
+		classes() {
+			return {
+				[this.$style.singleline]: this.singleLine,
+				[this.$style.highlight]: this.highlight,
+			};
+		},
+		simplyText(): string {
+			if (this.hint) {
+				return String(this.hint)
+					.replace(/&/g, '&amp;') // allows us to keep spaces at the beginning of an expression
+					.replace(/</g, '&lt;') // prevent XSS exploits since we are rendering HTML
+					.replace(/>/g, '&gt;')
+					.replace(/"/g, '&quot;')
+					.replace(/ /g, '&nbsp;');
+			}
+
+			return '';
+		},
 	},
 	mounted() {
 		if (this.$refs.hint) {
 			(this.$refs.hint as Element).querySelectorAll('a').forEach((a) => (a.target = '_blank'));
 		}
 	},
+	methods: {
+		sanitizeHtml,
+	},
 });
 </script>
 
diff --git a/packages/editor-ui/src/components/ParameterInputList.vue b/packages/editor-ui/src/components/ParameterInputList.vue
index afeb684cb8dbe..36cb9751dd80d 100644
--- a/packages/editor-ui/src/components/ParameterInputList.vue
+++ b/packages/editor-ui/src/components/ParameterInputList.vue
@@ -12,126 +12,150 @@
 				v-if="multipleValues(parameter) === true && parameter.type !== 'fixedCollection'"
 				class="parameter-item"
 			>
-				<multiple-parameter
+				<MultipleParameter
 					:parameter="parameter"
-					:values="getParameterValue(nodeValues, parameter.name, path)"
-					:nodeValues="nodeValues"
+					:values="nodeHelpers.getParameterValue(nodeValues, parameter.name, path)"
+					:node-values="nodeValues"
 					:path="getPath(parameter.name)"
-					:isReadOnly="isReadOnly"
-					@valueChanged="valueChanged"
+					:is-read-only="isReadOnly"
+					@value-changed="valueChanged"
 				/>
 			</div>
 
-			<div v-else-if="parameter.type === 'swaggerEditor'">
-				<swagger-editor
-					:node="node"
-					:nodeType="nodeType"
-					:parameters="parameters"
-					:nodeValues="nodeValues"
-					:path="getPath(parameter.name)"
-					@valueChanged="valueChanged"
-				/>
-			</div>
-
-			<div v-else-if="parameter.type === 'sendgridPreview'">
-				<send-grid-preview
-					:node="node"
-					:path="path"
-					:nodeType="nodeType"
-					:parameter="parameter"
-					:parameters="parameters"
-					:nodeValues="nodeValues"
-					@valueChanged="valueChanged"
-				/>
-			</div>
-
-			<import-parameter
-				v-else-if="
-					parameter.type === 'curlImport' &&
-					nodeTypeName === 'n8n-nodes-base.httpRequest' &&
-					nodeTypeVersion >= 3
-				"
-				:isReadOnly="isReadOnly"
-				@valueChanged="valueChanged"
+			<ImportCurlParameter
+				v-else-if="parameter.type === 'curlImport'"
+				:is-read-only="isReadOnly"
+				@value-changed="valueChanged"
 			/>
 
 			<n8n-notice
 				v-else-if="parameter.type === 'notice'"
-				class="parameter-item"
+				:class="['parameter-item', parameter.typeOptions?.containerClass ?? '']"
 				:content="$locale.nodeText().inputLabelDisplayName(parameter, path)"
 				@action="onNoticeAction"
 			/>
 
+			<n8n-button
+				v-else-if="parameter.type === 'button'"
+				class="parameter-item"
+				block
+				@click="onButtonAction(parameter)"
+			>
+				{{ $locale.nodeText().inputLabelDisplayName(parameter, path) }}
+			</n8n-button>
+
 			<div
 				v-else-if="['collection', 'fixedCollection'].includes(parameter.type)"
 				class="multi-parameter"
 			>
-				<div
-					class="delete-option clickable"
+				<n8n-icon-button
+					v-if="hideDelete !== true && !isReadOnly && !parameter.isNodeSetting"
+					type="tertiary"
+					text
+					size="mini"
+					icon="trash"
+					class="delete-option"
 					:title="$locale.baseText('parameterInputList.delete')"
-					v-if="hideDelete !== true && !isReadOnly"
-				>
-					<font-awesome-icon
-						icon="trash"
-						class="reset-icon clickable"
-						:title="$locale.baseText('parameterInputList.parameterOptions')"
-						@click="deleteOption(parameter.name)"
-					/>
-				</div>
+					@click="deleteOption(parameter.name)"
+				></n8n-icon-button>
 				<n8n-input-label
 					:label="$locale.nodeText().inputLabelDisplayName(parameter, path)"
-					:tooltipText="$locale.nodeText().inputLabelDescription(parameter, path)"
+					:tooltip-text="$locale.nodeText().inputLabelDescription(parameter, path)"
 					size="small"
 					:underline="true"
 					color="text-dark"
 				/>
-				<collection-parameter
-					v-if="parameter.type === 'collection'"
-					:parameter="parameter"
-					:values="getParameterValue(nodeValues, parameter.name, path)"
-					:nodeValues="nodeValues"
-					:path="getPath(parameter.name)"
-					:isReadOnly="isReadOnly"
-					@valueChanged="valueChanged"
-				/>
-				<fixed-collection-parameter
-					v-else-if="parameter.type === 'fixedCollection'"
-					:parameter="parameter"
-					:values="getParameterValue(nodeValues, parameter.name, path)"
-					:nodeValues="nodeValues"
-					:path="getPath(parameter.name)"
-					:isReadOnly="isReadOnly"
-					@valueChanged="valueChanged"
-				/>
+				<Suspense v-if="!asyncLoadingError">
+					<template #default>
+						<CollectionParameter
+							v-if="parameter.type === 'collection'"
+							:parameter="parameter"
+							:values="nodeHelpers.getParameterValue(nodeValues, parameter.name, path)"
+							:node-values="nodeValues"
+							:path="getPath(parameter.name)"
+							:is-read-only="isReadOnly"
+							@value-changed="valueChanged"
+						/>
+						<FixedCollectionParameter
+							v-else-if="parameter.type === 'fixedCollection'"
+							:parameter="parameter"
+							:values="nodeHelpers.getParameterValue(nodeValues, parameter.name, path)"
+							:node-values="nodeValues"
+							:path="getPath(parameter.name)"
+							:is-read-only="isReadOnly"
+							@value-changed="valueChanged"
+						/>
+					</template>
+					<template #fallback>
+						<n8n-text size="small" class="async-notice">
+							<n8n-icon icon="sync-alt" size="xsmall" :spin="true" />
+							{{ $locale.baseText('parameterInputList.loadingFields') }}
+						</n8n-text>
+					</template>
+				</Suspense>
+				<n8n-text v-else size="small" color="danger" class="async-notice">
+					<n8n-icon icon="exclamation-triangle" size="xsmall" />
+					{{ $locale.baseText('parameterInputList.loadingError') }}
+				</n8n-text>
 			</div>
-
-			<div v-else-if="displayNodeParameter(parameter)" class="parameter-item">
-				<div
-					class="delete-option clickable"
+			<ResourceMapper
+				v-else-if="parameter.type === 'resourceMapper'"
+				:parameter="parameter"
+				:node="node"
+				:path="getPath(parameter.name)"
+				:dependent-parameters-values="getDependentParametersValues(parameter)"
+				input-size="small"
+				label-size="small"
+				@value-changed="valueChanged"
+			/>
+			<FilterConditions
+				v-else-if="parameter.type === 'filter'"
+				:parameter="parameter"
+				:value="nodeHelpers.getParameterValue(nodeValues, parameter.name, path)"
+				:path="getPath(parameter.name)"
+				:node="node"
+				:read-only="isReadOnly"
+				@value-changed="valueChanged"
+			/>
+			<AssignmentCollection
+				v-else-if="parameter.type === 'assignmentCollection'"
+				:parameter="parameter"
+				:value="nodeHelpers.getParameterValue(nodeValues, parameter.name, path)"
+				:path="getPath(parameter.name)"
+				:node="node"
+				:is-read-only="isReadOnly"
+				@value-changed="valueChanged"
+			/>
+			<div
+				v-else-if="displayNodeParameter(parameter) && credentialsParameterIndex !== index"
+				class="parameter-item"
+			>
+				<n8n-icon-button
+					v-if="hideDelete !== true && !isReadOnly && !parameter.isNodeSetting"
+					type="tertiary"
+					text
+					size="mini"
+					icon="trash"
+					class="delete-option"
 					:title="$locale.baseText('parameterInputList.delete')"
-					v-if="hideDelete !== true && !isReadOnly"
-				>
-					<font-awesome-icon
-						icon="trash"
-						class="reset-icon clickable"
-						:title="$locale.baseText('parameterInputList.deleteParameter')"
-						@click="deleteOption(parameter.name)"
-					/>
-				</div>
-
-				<parameter-input-full
+					@click="deleteOption(parameter.name)"
+				></n8n-icon-button>
+
+				<ParameterInputFull
 					:parameter="parameter"
 					:hide-issues="hiddenIssuesInputs.includes(parameter.name)"
-					:value="getParameterValue(nodeValues, parameter.name, path)"
-					:displayOptions="true"
+					:value="nodeHelpers.getParameterValue(nodeValues, parameter.name, path)"
+					:display-options="shouldShowOptions(parameter)"
 					:path="getPath(parameter.name)"
-					:isReadOnly="isReadOnly"
-					@valueChanged="valueChanged"
+					:is-read-only="isReadOnly"
+					:hide-label="false"
+					:node-values="nodeValues"
+					@update="valueChanged"
 					@blur="onParameterBlur(parameter.name)"
 				/>
 			</div>
 		</div>
-		<div :class="{ indent }" v-if="filteredParameters.length === 0">
+		<div v-if="filteredParameters.length === 0" :class="{ indent }">
 			<slot />
 		</div>
 	</div>
@@ -141,40 +165,53 @@
 import type {
 	INodeParameters,
 	INodeProperties,
-	NodeParameterValue,
 	INodeTypeDescription,
+	NodeParameterValue,
 } from 'n8n-workflow';
 import { deepCopy } from 'n8n-workflow';
+import { mapStores } from 'pinia';
+import type { PropType } from 'vue';
+import { defineAsyncComponent, defineComponent, onErrorCaptured, ref } from 'vue';
 
 import type { INodeUi, IUpdateInformation } from '@/Interface';
 
+import ImportCurlParameter from '@/components/ImportCurlParameter.vue';
 import MultipleParameter from '@/components/MultipleParameter.vue';
-import { workflowHelpers } from '@/mixins/workflowHelpers';
 import ParameterInputFull from '@/components/ParameterInputFull.vue';
-import ImportParameter from '@/components/ImportParameter.vue';
-import SwaggerEditor from '@/components/SwaggerEditor/SwaggerEditor.vue';
-import SendGridPreview from '@/components/SendGridPreview/SendGridPreview.vue';
-
-import { get, set } from 'lodash-es';
-
-import mixins from 'vue-typed-mixins';
-import type { Component, PropType } from 'vue';
-import { mapStores } from 'pinia';
-import { useNDVStore } from '@/stores/ndv';
-import { useNodeTypesStore } from '@/stores/nodeTypes';
-import { isAuthRelatedParameter, getNodeAuthFields, getMainAuthField } from '@/utils';
+import ResourceMapper from '@/components/ResourceMapper/ResourceMapper.vue';
+import FilterConditions from '@/components/FilterConditions/FilterConditions.vue';
+import AssignmentCollection from '@/components/AssignmentCollection/AssignmentCollection.vue';
 import { KEEP_AUTH_IN_NDV_FOR_NODES } from '@/constants';
-
-export default mixins(workflowHelpers).extend({
+import { useNDVStore } from '@/stores/ndv.store';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import {
+	getMainAuthField,
+	getNodeAuthFields,
+	isAuthRelatedParameter,
+} from '@/utils/nodeTypesUtils';
+import { get, set } from 'lodash-es';
+import { useNodeHelpers } from '@/composables/useNodeHelpers';
+import { useRouter } from 'vue-router';
+import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
+
+const FixedCollectionParameter = defineAsyncComponent(
+	async () => await import('./FixedCollectionParameter.vue'),
+);
+const CollectionParameter = defineAsyncComponent(
+	async () => await import('./CollectionParameter.vue'),
+);
+
+export default defineComponent({
 	name: 'ParameterInputList',
 	components: {
 		MultipleParameter,
 		ParameterInputFull,
-		FixedCollectionParameter: () => import('./FixedCollectionParameter.vue') as Promise<Component>,
-		CollectionParameter: () => import('./CollectionParameter.vue') as Promise<Component>,
-		ImportParameter,
-		SwaggerEditor,
-		SendGridPreview,
+		FixedCollectionParameter,
+		CollectionParameter,
+		ImportCurlParameter,
+		ResourceMapper,
+		FilterConditions,
+		AssignmentCollection,
 	},
 	props: {
 		nodeValues: {
@@ -205,6 +242,42 @@ export default mixins(workflowHelpers).extend({
 			type: Array as PropType<string[]>,
 			default: () => [],
 		},
+		entryIndex: {
+			type: Number,
+			default: undefined,
+		},
+	},
+	setup() {
+		const nodeHelpers = useNodeHelpers();
+		const asyncLoadingError = ref(false);
+		const router = useRouter();
+		const workflowHelpers = useWorkflowHelpers({ router });
+
+		// This will catch errors in async components
+		onErrorCaptured((e, component) => {
+			if (
+				!['FixedCollectionParameter', 'CollectionParameter'].includes(
+					component?.$options.name as string,
+				)
+			) {
+				return;
+			}
+			asyncLoadingError.value = true;
+			console.error(e);
+			window?.Sentry?.captureException(e, {
+				tags: {
+					asyncLoadingError: true,
+				},
+			});
+			// Don't propagate the error further
+			return false;
+		});
+
+		return {
+			nodeHelpers,
+			asyncLoadingError,
+			workflowHelpers,
+		};
 	},
 	computed: {
 		...mapStores(useNodeTypesStore, useNDVStore),
@@ -240,7 +313,16 @@ export default mixins(workflowHelpers).extend({
 		nodeAuthFields(): INodeProperties[] {
 			return getNodeAuthFields(this.nodeType);
 		},
+		credentialsParameterIndex(): number {
+			return this.filteredParameters.findIndex((parameter) => parameter.type === 'credentials');
+		},
 		indexToShowSlotAt(): number {
+			const credentialsParameterIndex = this.credentialsParameterIndex;
+
+			if (credentialsParameterIndex !== -1) {
+				return credentialsParameterIndex;
+			}
+
 			let index = 0;
 			// For nodes that use old credentials UI, keep credentials below authentication field in NDV
 			// otherwise credentials will use auth filed position since the auth field is moved to credentials modal
@@ -253,10 +335,30 @@ export default mixins(workflowHelpers).extend({
 				}
 			});
 
-			return index < this.filteredParameters.length ? index : this.filteredParameters.length - 1;
+			return Math.min(index, this.filteredParameters.length - 1);
 		},
 		mainNodeAuthField(): INodeProperties | null {
-			return getMainAuthField(this.nodeType || undefined);
+			return getMainAuthField(this.nodeType || null);
+		},
+	},
+	watch: {
+		filteredParameterNames(newValue, oldValue) {
+			if (newValue === undefined) {
+				return;
+			}
+			// After a parameter does not get displayed anymore make sure that its value gets removed
+			// Is only needed for the edge-case when a parameter gets displayed depending on another field
+			// which contains an expression.
+			for (const parameter of oldValue) {
+				if (!newValue.includes(parameter)) {
+					const parameterData = {
+						name: `${this.path}.${parameter}`,
+						node: this.ndvStore.activeNode?.name || '',
+						value: undefined,
+					};
+					this.$emit('valueChanged', parameterData);
+				}
+			}
 		},
 	},
 	methods: {
@@ -271,9 +373,9 @@ export default mixins(workflowHelpers).extend({
 			);
 
 			// Get names of all fields that credentials rendering depends on (using displayOptions > show)
-			if (nodeType && nodeType.credentials) {
+			if (nodeType?.credentials) {
 				for (const cred of nodeType.credentials) {
-					if (cred.displayOptions && cred.displayOptions.show) {
+					if (cred.displayOptions?.show) {
 						Object.keys(cred.displayOptions.show).forEach((fieldName) =>
 							dependencies.add(fieldName),
 						);
@@ -317,7 +419,7 @@ export default mixins(workflowHelpers).extend({
 		},
 
 		mustHideDuringCustomApiCall(parameter: INodeProperties, nodeValues: INodeParameters): boolean {
-			if (parameter && parameter.displayOptions && parameter.displayOptions.hide) return true;
+			if (parameter?.displayOptions?.hide) return true;
 
 			const MUST_REMAIN_VISIBLE = [
 				'authentication',
@@ -334,7 +436,7 @@ export default mixins(workflowHelpers).extend({
 			}
 
 			if (
-				this.isCustomApiCallSelected(this.nodeValues) &&
+				this.nodeHelpers.isCustomApiCallSelected(this.nodeValues) &&
 				this.mustHideDuringCustomApiCall(parameter, this.nodeValues)
 			) {
 				return false;
@@ -361,6 +463,9 @@ export default mixins(workflowHelpers).extend({
 				rawValues = get(this.nodeValues, this.path);
 			}
 
+			if (!rawValues) {
+				return false;
+			}
 			// Resolve expressions
 			const resolveKeys = Object.keys(rawValues);
 			let key: string;
@@ -380,7 +485,7 @@ export default mixins(workflowHelpers).extend({
 					} else {
 						// Contains probably no expression with a missing parameter so resolve
 						try {
-							nodeValues[key] = this.resolveExpression(
+							nodeValues[key] = this.workflowHelpers.resolveExpression(
 								rawValues[key],
 								nodeValues,
 							) as NodeParameterValue;
@@ -401,17 +506,17 @@ export default mixins(workflowHelpers).extend({
 				}
 			} while (resolveKeys.length !== 0);
 
-			if (parameterGotResolved === true) {
+			if (parameterGotResolved) {
 				if (this.path) {
 					rawValues = deepCopy(this.nodeValues);
 					set(rawValues, this.path, nodeValues);
-					return this.displayParameter(rawValues, parameter, this.path, this.node);
+					return this.nodeHelpers.displayParameter(rawValues, parameter, this.path, this.node);
 				} else {
-					return this.displayParameter(nodeValues, parameter, '', this.node);
+					return this.nodeHelpers.displayParameter(nodeValues, parameter, '', this.node);
 				}
 			}
 
-			return this.displayParameter(this.nodeValues, parameter, this.path, this.node);
+			return this.nodeHelpers.displayParameter(this.nodeValues, parameter, this.path, this.node);
 		},
 		valueChanged(parameterData: IUpdateInformation): void {
 			this.$emit('valueChanged', parameterData);
@@ -421,6 +526,18 @@ export default mixins(workflowHelpers).extend({
 				this.$emit('activate');
 			}
 		},
+		/**
+		 * Handles default node button parameter type actions
+		 * @param parameter
+		 */
+		onButtonAction(parameter: INodeProperties) {
+			const action: string | undefined = parameter.typeOptions?.action;
+
+			switch (action) {
+				default:
+					return;
+			}
+		},
 		isNodeAuthField(name: string): boolean {
 			return this.nodeAuthFields.find((field) => field.name === name) !== undefined;
 		},
@@ -430,24 +547,31 @@ export default mixins(workflowHelpers).extend({
 			// since there is no such case, omitting it to avoid additional computation
 			return isAuthRelatedParameter(this.nodeAuthFields, parameter);
 		},
-	},
-	watch: {
-		filteredParameterNames(newValue, oldValue) {
-			if (newValue === undefined) {
-				return;
+		shouldShowOptions(parameter: INodeProperties): boolean {
+			return parameter.type !== 'resourceMapper';
+		},
+		getDependentParametersValues(parameter: INodeProperties): string | null {
+			const loadOptionsDependsOn = this.getArgument('loadOptionsDependsOn', parameter) as
+				| string[]
+				| undefined;
+
+			if (loadOptionsDependsOn === undefined) {
+				return null;
 			}
-			// After a parameter does not get displayed anymore make sure that its value gets removed
-			// Is only needed for the edge-case when a parameter gets displayed depending on another field
-			// which contains an expression.
-			for (const parameter of oldValue) {
-				if (!newValue.includes(parameter)) {
-					const parameterData = {
-						name: `${this.path}.${parameter}`,
-						node: this.ndvStore.activeNode?.name || '',
-						value: undefined,
-					};
-					this.$emit('valueChanged', parameterData);
+
+			// Get the resolved parameter values of the current node
+			const currentNodeParameters = this.ndvStore.activeNode?.parameters;
+			try {
+				const resolvedNodeParameters = this.workflowHelpers.resolveParameter(currentNodeParameters);
+
+				const returnValues: string[] = [];
+				for (const parameterPath of loadOptionsDependsOn) {
+					returnValues.push(get(resolvedNodeParameters, parameterPath) as string);
 				}
+
+				return returnValues.join('|');
+			} catch (error) {
+				return null;
 			}
 		},
 	},
@@ -457,15 +581,11 @@ export default mixins(workflowHelpers).extend({
 <style lang="scss">
 .parameter-input-list-wrapper {
 	.delete-option {
-		display: none;
 		position: absolute;
-		z-index: 999;
-		color: #f56c6c;
-		font-size: var(--font-size-2xs);
-
-		&:hover {
-			color: #ff0000;
-		}
+		opacity: 0;
+		top: 0;
+		left: calc(-1 * var(--spacing-2xs));
+		transition: opacity 100ms ease-in;
 	}
 
 	.indent > div {
@@ -476,11 +596,6 @@ export default mixins(workflowHelpers).extend({
 		position: relative;
 		margin: var(--spacing-xs) 0;
 
-		.delete-option {
-			top: 0;
-			left: 0;
-		}
-
 		.parameter-info {
 			display: none;
 		}
@@ -489,15 +604,10 @@ export default mixins(workflowHelpers).extend({
 	.parameter-item {
 		position: relative;
 		margin: var(--spacing-xs) 0;
-
-		> .delete-option {
-			top: var(--spacing-5xs);
-			left: 0;
-		}
 	}
 	.parameter-item:hover > .delete-option,
 	.multi-parameter:hover > .delete-option {
-		display: block;
+		opacity: 1;
 	}
 
 	.parameter-notice {
@@ -510,5 +620,10 @@ export default mixins(workflowHelpers).extend({
 			font-weight: var(--font-weight-bold);
 		}
 	}
+
+	.async-notice {
+		display: block;
+		padding: var(--spacing-3xs) 0;
+	}
 }
 </style>
diff --git a/packages/editor-ui/src/components/ParameterInputWrapper.vue b/packages/editor-ui/src/components/ParameterInputWrapper.vue
index 8e29c162cc47f..a3c9c558a4ac8 100644
--- a/packages/editor-ui/src/components/ParameterInputWrapper.vue
+++ b/packages/editor-ui/src/components/ParameterInputWrapper.vue
@@ -1,89 +1,106 @@
 <template>
-	<div>
-		<parameter-input
+	<div :class="$style.parameterInput" data-test-id="parameter-input">
+		<ParameterInput
 			ref="param"
-			:inputSize="inputSize"
+			:input-size="inputSize"
 			:parameter="parameter"
-			:value="value"
+			:model-value="modelValue"
 			:path="path"
-			:isReadOnly="isReadOnly"
+			:is-read-only="isReadOnly"
+			:is-assignment="isAssignment"
 			:droppable="droppable"
-			:activeDrop="activeDrop"
-			:forceShowExpression="forceShowExpression"
-			:hideIssues="hideIssues"
-			:documentationUrl="documentationUrl"
-			:errorHighlight="errorHighlight"
-			:isForCredential="isForCredential"
-			:eventSource="eventSource"
-			:expressionEvaluated="expressionValueComputed"
-			:data-test-id="`parameter-input-${parameter.name}`"
+			:active-drop="activeDrop"
+			:force-show-expression="forceShowExpression"
+			:hide-issues="hideIssues"
+			:documentation-url="documentationUrl"
+			:error-highlight="errorHighlight"
+			:is-for-credential="isForCredential"
+			:event-source="eventSource"
+			:expression-evaluated="evaluatedExpressionValue"
+			:additional-expression-data="resolvedAdditionalExpressionData"
+			:label="label"
+			:rows="rows"
+			:data-test-id="`parameter-input-${parsedParameterName}`"
+			:event-bus="eventBus"
 			@focus="onFocus"
 			@blur="onBlur"
 			@drop="onDrop"
-			@textInput="onTextInput"
-			@valueChanged="onValueChanged"
-		/>
-		<input-hint
-			v-if="expressionOutput"
-			:class="$style.hint"
-			data-test-id="parameter-expression-preview"
-			class="ph-no-capture"
-			:highlight="!!(expressionOutput && targetItem) && isInputParentOfActiveNode"
-			:hint="expressionOutput"
-			:singleLine="true"
-		/>
-		<input-hint
-			v-else-if="parameterHint"
-			:class="$style.hint"
-			:renderHTML="true"
-			:hint="parameterHint"
+			@text-input="onTextInput"
+			@update="onValueChanged"
 		/>
+		<div v-if="!hideHint && (expressionOutput || parameterHint)" :class="$style.hint">
+			<div>
+				<InputHint
+					v-if="expressionOutput"
+					:class="{ [$style.hint]: true, 'ph-no-capture': isForCredential }"
+					:data-test-id="`parameter-expression-preview-${parsedParameterName}`"
+					:highlight="!!(expressionOutput && targetItem) && isInputParentOfActiveNode"
+					:hint="expressionOutput"
+					:single-line="true"
+				/>
+				<InputHint v-else-if="parameterHint" :render-h-t-m-l="true" :hint="parameterHint" />
+			</div>
+			<slot v-if="$slots.options" name="options" />
+		</div>
 	</div>
 </template>
 
 <script lang="ts">
+import { mapStores } from 'pinia';
 import type { PropType } from 'vue';
-import type Vue from 'vue';
+import { defineComponent } from 'vue';
 
+import type { INodeUi, IUpdateInformation, TargetItem } from '@/Interface';
 import ParameterInput from '@/components/ParameterInput.vue';
-import InputHint from './ParameterInputHint.vue';
-import mixins from 'vue-typed-mixins';
-import { showMessage } from '@/mixins/showMessage';
+import InputHint from '@/components/ParameterInputHint.vue';
+import { useEnvironmentsStore } from '@/stores/environments.ee.store';
+import { useExternalSecretsStore } from '@/stores/externalSecrets.ee.store';
+import { useNDVStore } from '@/stores/ndv.store';
+import { isValueExpression, parseResourceMapperFieldName } from '@/utils/nodeTypesUtils';
 import type {
+	IDataObject,
 	INodeProperties,
 	INodePropertyMode,
-	NodeParameterValue,
+	IParameterLabel,
 	NodeParameterValueType,
+	Result,
 } from 'n8n-workflow';
-import { IRunData, isResourceLocatorValue } from 'n8n-workflow';
-import type { INodeUi, IUpdateInformation, TargetItem } from '@/Interface';
-import { workflowHelpers } from '@/mixins/workflowHelpers';
-import { isValueExpression } from '@/utils';
-import { mapStores } from 'pinia';
-import { useNDVStore } from '@/stores/ndv';
+import { isResourceLocatorValue } from 'n8n-workflow';
 
-type ParamRef = InstanceType<typeof ParameterInput>;
+import type { EventBus } from 'n8n-design-system/utils';
+import { createEventBus } from 'n8n-design-system/utils';
+import { useRouter } from 'vue-router';
+import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
+import { stringifyExpressionResult } from '@/utils/expressions';
 
-export default mixins(showMessage, workflowHelpers).extend({
-	name: 'parameter-input-wrapper',
+export default defineComponent({
+	name: 'ParameterInputWrapper',
 	components: {
 		ParameterInput,
 		InputHint,
 	},
-	mounted() {
-		this.$on('optionSelected', this.optionSelected);
-	},
 	props: {
+		additionalExpressionData: {
+			type: Object as PropType<IDataObject>,
+			default: () => ({}),
+		},
 		isReadOnly: {
 			type: Boolean,
 		},
+		rows: {
+			type: Number,
+			default: 5,
+		},
+		isAssignment: {
+			type: Boolean,
+		},
 		parameter: {
 			type: Object as PropType<INodeProperties>,
 		},
 		path: {
 			type: String,
 		},
-		value: {
+		modelValue: {
 			type: [String, Number, Boolean, Array, Object] as PropType<NodeParameterValueType>,
 		},
 		droppable: {
@@ -99,6 +116,10 @@ export default mixins(showMessage, workflowHelpers).extend({
 			type: String,
 			required: false,
 		},
+		hideHint: {
+			type: Boolean,
+			required: false,
+		},
 		inputSize: {
 			type: String,
 		},
@@ -117,25 +138,43 @@ export default mixins(showMessage, workflowHelpers).extend({
 		eventSource: {
 			type: String,
 		},
+		label: {
+			type: Object as PropType<IParameterLabel>,
+			default: () => ({
+				size: 'small',
+			}),
+		},
+		eventBus: {
+			type: Object as PropType<EventBus>,
+			default: () => createEventBus(),
+		},
+	},
+	setup() {
+		const router = useRouter();
+		const workflowHelpers = useWorkflowHelpers({ router });
+
+		return {
+			workflowHelpers,
+		};
 	},
 	computed: {
-		...mapStores(useNDVStore),
+		...mapStores(useNDVStore, useExternalSecretsStore, useEnvironmentsStore),
 		isValueExpression() {
-			return isValueExpression(this.parameter, this.value);
+			return isValueExpression(this.parameter, this.modelValue);
 		},
 		activeNode(): INodeUi | null {
 			return this.ndvStore.activeNode;
 		},
 		selectedRLMode(): INodePropertyMode | undefined {
 			if (
-				typeof this.value !== 'object' ||
+				typeof this.modelValue !== 'object' ||
 				this.parameter.type !== 'resourceLocator' ||
-				!isResourceLocatorValue(this.value)
+				!isResourceLocatorValue(this.modelValue)
 			) {
 				return undefined;
 			}
 
-			const mode = this.value.mode;
+			const mode = this.modelValue.mode;
 			if (mode) {
 				return this.parameter.modes?.find((m: INodePropertyMode) => m.name === mode);
 			}
@@ -146,7 +185,7 @@ export default mixins(showMessage, workflowHelpers).extend({
 			if (this.isValueExpression) {
 				return undefined;
 			}
-			if (this.selectedRLMode && this.selectedRLMode.hint) {
+			if (this.selectedRLMode?.hint) {
 				return this.selectedRLMode.hint;
 			}
 
@@ -158,46 +197,62 @@ export default mixins(showMessage, workflowHelpers).extend({
 		isInputParentOfActiveNode(): boolean {
 			return this.ndvStore.isInputParentOfActiveNode;
 		},
-		expressionValueComputed(): string | null {
-			const value = isResourceLocatorValue(this.value) ? this.value.value : this.value;
-			if (!this.activeNode || !this.isValueExpression || typeof value !== 'string') {
-				return null;
+		evaluatedExpression(): Result<unknown, Error> {
+			const value = isResourceLocatorValue(this.modelValue)
+				? this.modelValue.value
+				: this.modelValue;
+
+			if (
+				!this.isForCredential &&
+				(!this.activeNode || !this.isValueExpression || typeof value !== 'string')
+			) {
+				return { ok: false, error: new Error() };
 			}
 
-			let computedValue: NodeParameterValue;
 			try {
-				let opts;
+				let opts = { isForCredential: this.isForCredential };
 				if (this.ndvStore.isInputParentOfActiveNode) {
 					opts = {
+						...opts,
 						targetItem: this.targetItem ?? undefined,
 						inputNodeName: this.ndvStore.ndvInputNodeName,
 						inputRunIndex: this.ndvStore.ndvInputRunIndex,
 						inputBranchIndex: this.ndvStore.ndvInputBranchIndex,
+						additionalKeys: this.resolvedAdditionalExpressionData,
 					};
 				}
 
-				computedValue = this.resolveExpression(value, undefined, opts);
-
-				if (computedValue === null) {
-					return null;
-				}
-
-				if (typeof computedValue === 'string' && computedValue.trim().length === 0) {
-					computedValue = this.$locale.baseText('parameterInput.emptyString');
-				}
+				return { ok: true, result: this.workflowHelpers.resolveExpression(value, undefined, opts) };
 			} catch (error) {
-				computedValue = `[${this.$locale.baseText('parameterInput.error')}: ${error.message}]`;
+				return { ok: false, error };
 			}
-
-			return typeof computedValue === 'string' ? computedValue : JSON.stringify(computedValue);
+		},
+		evaluatedExpressionValue(): unknown {
+			const evaluated = this.evaluatedExpression;
+			return evaluated.ok ? evaluated.result : null;
+		},
+		evaluatedExpressionString(): string | null {
+			return stringifyExpressionResult(this.evaluatedExpression);
 		},
 		expressionOutput(): string | null {
-			if (this.isValueExpression && this.expressionValueComputed) {
-				return this.expressionValueComputed;
+			if (this.isValueExpression && this.evaluatedExpressionString) {
+				return this.evaluatedExpressionString;
 			}
 
 			return null;
 		},
+		resolvedAdditionalExpressionData() {
+			return {
+				$vars: this.environmentsStore.variablesAsObject,
+				...(this.externalSecretsStore.isEnterpriseExternalSecretsEnabled && this.isForCredential
+					? { $secrets: this.externalSecretsStore.secretsAsObject }
+					: {}),
+				...this.additionalExpressionData,
+			};
+		},
+		parsedParameterName() {
+			return parseResourceMapperFieldName(this.parameter?.name ?? '');
+		},
 	},
 	methods: {
 		onFocus() {
@@ -209,13 +264,8 @@ export default mixins(showMessage, workflowHelpers).extend({
 		onDrop(data: string) {
 			this.$emit('drop', data);
 		},
-		optionSelected(command: string) {
-			const paramRef = this.$refs.param as ParamRef | undefined;
-
-			paramRef?.$emit('optionSelected', command);
-		},
 		onValueChanged(parameterData: IUpdateInformation) {
-			this.$emit('valueChanged', parameterData);
+			this.$emit('update', parameterData);
 		},
 		onTextInput(parameterData: IUpdateInformation) {
 			this.$emit('textInput', parameterData);
@@ -225,8 +275,10 @@ export default mixins(showMessage, workflowHelpers).extend({
 </script>
 
 <style lang="scss" module>
-.hint {
-	margin-top: var(--spacing-4xs);
+.parameterInput {
+	display: flex;
+	flex-direction: column;
+	gap: var(--spacing-4xs);
 }
 
 .hovering {
diff --git a/packages/editor-ui/src/components/ParameterIssues.vue b/packages/editor-ui/src/components/ParameterIssues.vue
index 96da86f7b771c..6e6388cdbfee2 100644
--- a/packages/editor-ui/src/components/ParameterIssues.vue
+++ b/packages/editor-ui/src/components/ParameterIssues.vue
@@ -1,8 +1,8 @@
 <template>
-	<div :class="$style['parameter-issues']" v-if="issues.length">
+	<div v-if="issues.length" :class="$style['parameter-issues']" data-test-id="parameter-issues">
 		<n8n-tooltip placement="top">
 			<template #content>
-				<titled-list :title="`${$locale.baseText('parameterInput.issues')}:`" :items="issues" />
+				<TitledList :title="`${$locale.baseText('parameterInput.issues')}:`" :items="issues" />
 			</template>
 			<font-awesome-icon icon="exclamation-triangle" />
 		</n8n-tooltip>
diff --git a/packages/editor-ui/src/components/ParameterOptions.vue b/packages/editor-ui/src/components/ParameterOptions.vue
index 72a4fdc15dcea..ebb5d74196a05 100644
--- a/packages/editor-ui/src/components/ParameterOptions.vue
+++ b/packages/editor-ui/src/components/ParameterOptions.vue
@@ -1,26 +1,41 @@
 <template>
 	<div :class="$style.container">
-		<n8n-action-toggle
-			v-if="shouldShowOptions"
-			placement="bottom-end"
-			size="small"
-			color="foreground-xdark"
-			iconSize="small"
-			:actions="actions"
-			@action="(action) => $emit('optionSelected', action)"
-			@visible-change="onMenuToggle"
-		/>
-		<n8n-radio-buttons
-			v-if="parameter.noDataExpression !== true && showExpressionSelector"
-			size="small"
-			:value="selectedView"
-			:disabled="isReadOnly"
-			@input="onViewSelected"
-			:options="[
-				{ label: $locale.baseText('parameterInput.fixed'), value: 'fixed' },
-				{ label: $locale.baseText('parameterInput.expression'), value: 'expression' },
-			]"
-		/>
+		<div v-if="loading" :class="$style.loader">
+			<n8n-text v-if="loading" size="small">
+				<n8n-icon icon="sync-alt" size="xsmall" :spin="true" />
+				{{ loadingMessage }}
+			</n8n-text>
+		</div>
+		<div v-else :class="$style.controlsContainer">
+			<div
+				:class="{
+					[$style.noExpressionSelector]: !shouldShowExpressionSelector,
+				}"
+			>
+				<n8n-action-toggle
+					v-if="shouldShowOptions"
+					placement="bottom-end"
+					size="small"
+					color="foreground-xdark"
+					icon-size="small"
+					:actions="actions"
+					:icon-orientation="iconOrientation"
+					@action="(action) => $emit('update:modelValue', action)"
+					@visible-change="onMenuToggle"
+				/>
+			</div>
+			<n8n-radio-buttons
+				v-if="shouldShowExpressionSelector"
+				size="small"
+				:model-value="selectedView"
+				:disabled="isReadOnly"
+				:options="[
+					{ label: $locale.baseText('parameterInput.fixed'), value: 'fixed' },
+					{ label: $locale.baseText('parameterInput.expression'), value: 'expression' },
+				]"
+				@update:model-value="onViewSelected"
+			/>
+		</div>
 	</div>
 </template>
 
@@ -28,10 +43,12 @@
 import type { NodeParameterValueType } from 'n8n-workflow';
 import { defineComponent } from 'vue';
 import type { PropType } from 'vue';
-import { isValueExpression, isResourceLocatorValue } from '@/utils';
+import { isResourceLocatorValue } from '@/utils/typeGuards';
+import { isValueExpression } from '@/utils/nodeTypesUtils';
+import { i18n } from '@/plugins/i18n';
 
 export default defineComponent({
-	name: 'parameter-options',
+	name: 'ParameterOptions',
 	props: {
 		parameter: {
 			type: Object,
@@ -50,6 +67,25 @@ export default defineComponent({
 			type: Boolean,
 			default: true,
 		},
+		customActions: {
+			type: Array as PropType<Array<{ label: string; value: string; disabled?: boolean }>>,
+			default: () => [],
+		},
+		iconOrientation: {
+			type: String,
+			default: 'vertical',
+			validator: (value: string): boolean => ['horizontal', 'vertical'].includes(value),
+		},
+		loading: {
+			type: Boolean,
+			default: false,
+		},
+		loadingMessage: {
+			type: String,
+			default() {
+				return i18n.baseText('genericHelpers.loading');
+			},
+		},
 	},
 	computed: {
 		isDefault(): boolean {
@@ -61,8 +97,11 @@ export default defineComponent({
 		isHtmlEditor(): boolean {
 			return this.getArgument('editor') === 'htmlEditor';
 		},
+		shouldShowExpressionSelector(): boolean {
+			return this.parameter.noDataExpression !== true && this.showExpressionSelector;
+		},
 		shouldShowOptions(): boolean {
-			if (this.isReadOnly === true) {
+			if (this.isReadOnly) {
 				return false;
 			}
 
@@ -70,15 +109,11 @@ export default defineComponent({
 				return false;
 			}
 
-			if (
-				this.parameter.typeOptions &&
-				this.parameter.typeOptions.editor &&
-				this.parameter.typeOptions.editor === 'codeNodeEditor'
-			) {
+			if (['codeNodeEditor', 'sqlEditor'].includes(this.parameter.typeOptions?.editor)) {
 				return false;
 			}
 
-			if (this.showOptions === true) {
+			if (this.showOptions) {
 				return true;
 			}
 
@@ -95,6 +130,10 @@ export default defineComponent({
 			return !!this.getArgument('loadOptionsMethod') || !!this.getArgument('loadOptions');
 		},
 		actions(): Array<{ label: string; value: string; disabled?: boolean }> {
+			if (Array.isArray(this.customActions) && this.customActions.length > 0) {
+				return this.customActions;
+			}
+
 			if (this.isHtmlEditor && !this.isValueExpression) {
 				return [
 					{
@@ -136,11 +175,14 @@ export default defineComponent({
 		},
 		onViewSelected(selected: string) {
 			if (selected === 'expression') {
-				this.$emit('optionSelected', this.isValueExpression ? 'openExpression' : 'addExpression');
+				this.$emit(
+					'update:modelValue',
+					this.isValueExpression ? 'openExpression' : 'addExpression',
+				);
 			}
 
 			if (selected === 'fixed' && this.isValueExpression) {
-				this.$emit('optionSelected', 'removeExpression');
+				this.$emit('update:modelValue', 'removeExpression');
 			}
 		},
 		getArgument(argumentName: string): string | number | boolean | undefined {
@@ -161,5 +203,27 @@ export default defineComponent({
 <style lang="scss" module>
 .container {
 	display: flex;
+	min-height: 22px;
+}
+
+.loader {
+	padding-bottom: var(--spacing-4xs);
+
+	& > span {
+		line-height: 1em;
+	}
+}
+.controlsContainer {
+	display: flex;
+	align-items: center;
+	flex-direction: row;
+}
+
+.noExpressionSelector {
+	margin-bottom: var(--spacing-4xs);
+
+	span {
+		padding-right: 0 !important;
+	}
 }
 </style>
diff --git a/packages/editor-ui/src/components/PersonalizationModal.vue b/packages/editor-ui/src/components/PersonalizationModal.vue
index 1046bdc2cac0b..a07451eedeb89 100644
--- a/packages/editor-ui/src/components/PersonalizationModal.vue
+++ b/packages/editor-ui/src/components/PersonalizationModal.vue
@@ -3,11 +3,11 @@
 		:name="PERSONALIZATION_MODAL_KEY"
 		:title="$locale.baseText('personalizationModal.customizeN8n')"
 		:subtitle="$locale.baseText('personalizationModal.theseQuestionsHelpUs')"
-		:centerTitle="true"
-		:showClose="false"
-		:eventBus="modalBus"
-		:closeOnClickModal="false"
-		:closeOnPressEscape="false"
+		:center-title="true"
+		:show-close="false"
+		:event-bus="modalBus"
+		:close-on-click-modal="false"
+		:close-on-press-escape="false"
 		width="460px"
 		data-test-id="personalization-form"
 		@enter="onSave"
@@ -15,20 +15,37 @@
 		<template #content>
 			<div :class="$style.container">
 				<n8n-form-inputs
+					v-model="formValues"
 					:inputs="survey"
-					:columnView="true"
-					:eventBus="formBus"
+					:column-view="true"
+					:event-bus="formBus"
+					:teleported="teleported"
+					tag-size="small"
 					@submit="onSubmit"
 				/>
+				<n8n-card v-if="canRegisterForEnterpriseTrial">
+					<n8n-checkbox v-model="registerForEnterpriseTrial">
+						<i18n-t keypath="personalizationModal.registerEmailForTrial">
+							<template #trial>
+								<strong>
+									{{ $locale.baseText('personalizationModal.registerEmailForTrial.enterprise') }}
+								</strong>
+							</template>
+						</i18n-t>
+						<n8n-text size="small" tag="div" color="text-light">
+							{{ $locale.baseText('personalizationModal.registerEmailForTrial.notice') }}
+						</n8n-text>
+					</n8n-checkbox>
+				</n8n-card>
 			</div>
 		</template>
 		<template #footer>
 			<div>
 				<n8n-button
-					@click="onSave"
 					:loading="isSaving"
 					:label="$locale.baseText('personalizationModal.getStarted')"
 					float="right"
+					@click="onSave"
 				/>
 			</div>
 		</template>
@@ -36,10 +53,8 @@
 </template>
 
 <script lang="ts">
-import mixins from 'vue-typed-mixins';
-
-const SURVEY_VERSION = 'v4';
-
+import { defineComponent } from 'vue';
+import { mapStores } from 'pinia';
 import {
 	COMPANY_SIZE_100_499,
 	COMPANY_SIZE_1000_OR_MORE,
@@ -124,35 +139,88 @@ import {
 	REPORTED_SOURCE_OTHER_KEY,
 	VIEWS,
 } from '@/constants';
-import { workflowHelpers } from '@/mixins/workflowHelpers';
-import { showMessage } from '@/mixins/showMessage';
-import Modal from './Modal.vue';
+import { useToast } from '@/composables/useToast';
+import Modal from '@/components/Modal.vue';
 import type { IFormInputs, IPersonalizationLatestVersion, IUser } from '@/Interface';
-import { getAccountAge } from '@/utils';
+import { getAccountAge } from '@/utils/userUtils';
 import type { GenericValue } from 'n8n-workflow';
-import { mapStores } from 'pinia';
-import { useUIStore } from '@/stores/ui';
-import { useSettingsStore } from '@/stores/settings';
-import { useRootStore } from '@/stores/n8nRootStore';
-import { useUsersStore } from '@/stores/users';
-import { createEventBus } from '@/event-bus';
+import { useUIStore } from '@/stores/ui.store';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import { useUsersStore } from '@/stores/users.store';
+import { createEventBus } from 'n8n-design-system/utils';
+import { usePostHog } from '@/stores/posthog.store';
+import { useExternalHooks } from '@/composables/useExternalHooks';
+import { useUsageStore } from '@/stores/usage.store';
+import { useMessage } from '@/composables/useMessage';
 
-export default mixins(showMessage, workflowHelpers).extend({
-	components: { Modal },
+const SURVEY_VERSION = 'v4';
+
+export default defineComponent({
 	name: 'PersonalizationModal',
+	components: { Modal },
+	props: {
+		teleported: {
+			type: Boolean,
+			default: true,
+		},
+	},
+	setup() {
+		const externalHooks = useExternalHooks();
+
+		return {
+			externalHooks,
+			...useToast(),
+			...useMessage(),
+		};
+	},
 	data() {
 		return {
+			formValues: {} as Record<string, string>,
 			isSaving: false,
 			PERSONALIZATION_MODAL_KEY,
 			otherWorkAreaFieldVisible: false,
 			otherCompanyIndustryFieldVisible: false,
 			showAllIndustryQuestions: true,
+			registerForEnterpriseTrial: false,
 			modalBus: createEventBus(),
 			formBus: createEventBus(),
+			domainBlocklist: [] as string[],
 		};
 	},
 	computed: {
-		...mapStores(useRootStore, useSettingsStore, useUIStore, useUsersStore),
+		...mapStores(
+			useRootStore,
+			useSettingsStore,
+			useUIStore,
+			useUsersStore,
+			useUsageStore,
+			usePostHog,
+		),
+		currentUser() {
+			return this.usersStore.currentUser;
+		},
+		canRegisterForEnterpriseTrial() {
+			if (
+				this.settingsStore.isCloudDeployment ||
+				this.domainBlocklist.length === 0 ||
+				!this.currentUser?.email
+			) {
+				return false;
+			}
+
+			const isSizeEligible = [COMPANY_SIZE_500_999, COMPANY_SIZE_1000_OR_MORE].includes(
+				this.formValues[COMPANY_SIZE_KEY],
+			);
+
+			const emailParts = this.currentUser.email.split('@');
+			const emailDomain = emailParts[emailParts.length - 1];
+			const isEmailEligible = !this.domainBlocklist.find(
+				(blocklistedDomain) => emailDomain === blocklistedDomain,
+			);
+
+			return isSizeEligible && isEmailEligible;
+		},
 		survey() {
 			const survey: IFormInputs = [
 				{
@@ -604,20 +672,28 @@ export default mixins(showMessage, workflowHelpers).extend({
 			return survey;
 		},
 	},
+	mounted() {
+		void this.loadDomainBlocklist();
+	},
 	methods: {
 		closeDialog() {
 			this.modalBus.emit('close');
 			// In case the redirect to canvas for new users didn't happen
 			// we try again after closing the modal
 			if (this.$route.name !== VIEWS.NEW_WORKFLOW) {
-				this.$router.replace({ name: VIEWS.NEW_WORKFLOW });
+				void this.$router.replace({ name: VIEWS.NEW_WORKFLOW });
 			}
 		},
+		async loadDomainBlocklist() {
+			try {
+				this.domainBlocklist = (await import('email-providers/common.json')).default;
+			} catch (error) {}
+		},
 		onSave() {
 			this.formBus.emit('submit');
 		},
 		async onSubmit(values: IPersonalizationLatestVersion): Promise<void> {
-			this.$data.isSaving = true;
+			this.isSaving = true;
 
 			try {
 				const survey: Record<string, GenericValue> = {
@@ -627,21 +703,57 @@ export default mixins(showMessage, workflowHelpers).extend({
 					personalization_survey_n8n_version: this.rootStore.versionCli,
 				};
 
-				this.$externalHooks().run('personalizationModal.onSubmit', survey);
+				await this.externalHooks.run(
+					'personalizationModal.onSubmit',
+					survey as IPersonalizationLatestVersion,
+				);
 
 				await this.usersStore.submitPersonalizationSurvey(survey as IPersonalizationLatestVersion);
 
+				this.posthogStore.setMetadata(survey, 'user');
+
 				if (Object.keys(values).length === 0) {
 					this.closeDialog();
 				}
 
 				await this.fetchOnboardingPrompt();
 			} catch (e) {
-				this.$showError(e, 'Error while submitting results');
+				this.showError(e, 'Error while submitting results');
 			}
 
-			this.$data.isSaving = false;
+			let licenseRequestSucceeded = false;
+			try {
+				if (this.registerForEnterpriseTrial && this.canRegisterForEnterpriseTrial) {
+					await this.usageStore.requestEnterpriseLicenseTrial();
+					licenseRequestSucceeded = true;
+					this.$telemetry.track('User registered for self serve trial', {
+						email: this.usersStore.currentUser?.email,
+						instance_id: this.rootStore.instanceId,
+					});
+				}
+			} catch (e) {
+				this.showError(
+					e,
+					this.$locale.baseText('personalizationModal.registerEmailForTrial.error'),
+				);
+			}
+
+			this.isSaving = false;
 			this.closeDialog();
+
+			if (licenseRequestSucceeded) {
+				await this.alert(
+					this.$locale.baseText('personalizationModal.registerEmailForTrial.success.message'),
+					{
+						title: this.$locale.baseText(
+							'personalizationModal.registerEmailForTrial.success.title',
+						),
+						confirmButtonText: this.$locale.baseText(
+							'personalizationModal.registerEmailForTrial.success.button',
+						),
+					},
+				);
+			}
 		},
 		async fetchOnboardingPrompt() {
 			if (
@@ -649,29 +761,32 @@ export default mixins(showMessage, workflowHelpers).extend({
 				getAccountAge(this.usersStore.currentUser || ({} as IUser)) <= ONBOARDING_PROMPT_TIMEBOX
 			) {
 				const onboardingResponse = await this.uiStore.getNextOnboardingPrompt();
+
+				if (!onboardingResponse) {
+					return;
+				}
+
 				const promptTimeout =
 					onboardingResponse.toast_sequence_number === 1 ? FIRST_ONBOARDING_PROMPT_TIMEOUT : 1000;
 
-				if (onboardingResponse.title && onboardingResponse.description) {
-					setTimeout(async () => {
-						this.$showToast({
-							type: 'info',
-							title: onboardingResponse.title,
-							message: onboardingResponse.description,
-							duration: 0,
-							customClass: 'clickable',
-							closeOnClick: true,
-							onClick: () => {
-								this.$telemetry.track('user clicked onboarding toast', {
-									seq_num: onboardingResponse.toast_sequence_number,
-									title: onboardingResponse.title,
-									description: onboardingResponse.description,
-								});
-								this.uiStore.openModal(ONBOARDING_CALL_SIGNUP_MODAL_KEY);
-							},
-						});
-					}, promptTimeout);
-				}
+				setTimeout(async () => {
+					this.showToast({
+						type: 'info',
+						title: onboardingResponse.title,
+						message: onboardingResponse.description,
+						duration: 0,
+						customClass: 'clickable',
+						closeOnClick: true,
+						onClick: () => {
+							this.$telemetry.track('user clicked onboarding toast', {
+								seq_num: onboardingResponse.toast_sequence_number,
+								title: onboardingResponse.title,
+								description: onboardingResponse.description,
+							});
+							this.uiStore.openModal(ONBOARDING_CALL_SIGNUP_MODAL_KEY);
+						},
+					});
+				}, promptTimeout);
 			}
 		},
 	},
diff --git a/packages/editor-ui/src/components/PushConnectionTracker.vue b/packages/editor-ui/src/components/PushConnectionTracker.vue
index 6be7906d253da..fb55b39c20df1 100644
--- a/packages/editor-ui/src/components/PushConnectionTracker.vue
+++ b/packages/editor-ui/src/components/PushConnectionTracker.vue
@@ -1,6 +1,6 @@
 <template>
 	<span>
-		<div class="push-connection-lost primary-color" v-if="!rootStore.pushConnectionActive">
+		<div v-if="!rootStore.pushConnectionActive" class="push-connection-lost primary-color">
 			<n8n-tooltip placement="bottom-end">
 				<template #content>
 					<div v-html="$locale.baseText('pushConnectionTracker.cannotConnectToServer')"></div>
@@ -16,9 +16,9 @@
 </template>
 
 <script lang="ts">
-import { useRootStore } from '@/stores/n8nRootStore';
-import { mapStores } from 'pinia';
 import { defineComponent } from 'vue';
+import { mapStores } from 'pinia';
+import { useRootStore } from '@/stores/n8nRoot.store';
 
 export default defineComponent({
 	name: 'PushConnectionTracker',
diff --git a/packages/editor-ui/src/components/RBAC.vue b/packages/editor-ui/src/components/RBAC.vue
new file mode 100644
index 0000000000000..042cd6a888afb
--- /dev/null
+++ b/packages/editor-ui/src/components/RBAC.vue
@@ -0,0 +1,61 @@
+<script lang="ts">
+import type { PropType } from 'vue';
+import { computed, defineComponent } from 'vue';
+import { useRBACStore } from '@/stores/rbac.store';
+import type { HasScopeMode, Scope, Resource } from '@n8n/permissions';
+import {
+	inferProjectIdFromRoute,
+	inferResourceIdFromRoute,
+	inferResourceTypeFromRoute,
+} from '@/utils/rbacUtils';
+import { useRoute } from 'vue-router';
+
+export default defineComponent({
+	props: {
+		scope: {
+			type: [String, Array] as PropType<Scope | Scope[]>,
+			required: true,
+		},
+		mode: {
+			type: String as PropType<HasScopeMode>,
+			default: 'allOf',
+		},
+		resourceType: {
+			type: String as PropType<Resource>,
+			default: undefined,
+		},
+		resourceId: {
+			type: String,
+			default: undefined,
+		},
+		projectId: {
+			type: String,
+			default: undefined,
+		},
+	},
+	setup(props, { slots }) {
+		const rbacStore = useRBACStore();
+		const route = useRoute();
+
+		const hasScope = computed(() => {
+			const projectId = props.projectId ?? inferProjectIdFromRoute(route);
+			const resourceType = props.resourceType ?? inferResourceTypeFromRoute(route);
+			const resourceId = resourceType
+				? props.resourceId ?? inferResourceIdFromRoute(route)
+				: undefined;
+
+			return rbacStore.hasScope(
+				props.scope,
+				{
+					projectId,
+					resourceType,
+					resourceId,
+				},
+				{ mode: props.mode },
+			);
+		});
+
+		return () => (hasScope.value ? slots.default?.() : slots.fallback?.());
+	},
+});
+</script>
diff --git a/packages/editor-ui/src/components/ResourceLocator/ResourceLocator.vue b/packages/editor-ui/src/components/ResourceLocator/ResourceLocator.vue
index cdb56afbc98e1..c048a9ae9ae5a 100644
--- a/packages/editor-ui/src/components/ResourceLocator/ResourceLocator.vue
+++ b/packages/editor-ui/src/components/ResourceLocator/ResourceLocator.vue
@@ -1,31 +1,39 @@
 <template>
-	<div class="resource-locator" ref="container">
-		<resource-locator-dropdown
-			:value="value ? value.value : ''"
-			:show="showResourceDropdown"
+	<div
+		ref="container"
+		class="resource-locator"
+		:data-test-id="`resource-locator-${parameter.name}`"
+	>
+		<ResourceLocatorDropdown
+			ref="dropdown"
+			v-on-click-outside="hideResourceDropdown"
+			:model-value="modelValue ? modelValue.value : ''"
+			:show="resourceDropdownVisible"
 			:filterable="isSearchable"
-			:filterRequired="requiresSearchFilter"
+			:filter-required="requiresSearchFilter"
 			:resources="currentQueryResults"
 			:loading="currentQueryLoading"
 			:filter="searchFilter"
-			:hasMore="currentQueryHasMore"
-			:errorView="currentQueryError"
+			:has-more="currentQueryHasMore"
+			:error-view="currentQueryError"
 			:width="width"
-			@input="onListItemSelected"
-			@hide="onDropdownHide"
+			:event-bus="eventBus"
+			@update:model-value="onListItemSelected"
 			@filter="onSearchFilter"
-			@loadMore="loadResourcesDebounced"
-			ref="dropdown"
+			@load-more="loadResourcesDebounced"
 		>
 			<template #error>
-				<div :class="$style.error">
+				<div :class="$style.error" data-test-id="rlc-error-container">
 					<n8n-text color="text-dark" align="center" tag="div">
 						{{ $locale.baseText('resourceLocator.mode.list.error.title') }}
 					</n8n-text>
-					<n8n-text size="small" color="text-base" v-if="hasCredential">
+					<n8n-text v-if="hasCredential || credentialsNotSet" size="small" color="text-base">
 						{{ $locale.baseText('resourceLocator.mode.list.error.description.part1') }}
-						<a @click="openCredential">{{
-							$locale.baseText('resourceLocator.mode.list.error.description.part2')
+						<a v-if="credentialsNotSet" @click="createNewCredential">{{
+							$locale.baseText('resourceLocator.mode.list.error.description.part2.noCredentials')
+						}}</a>
+						<a v-else-if="hasCredential" @click="openCredential">{{
+							$locale.baseText('resourceLocator.mode.list.error.description.part2.hasCredentials')
 						}}</a>
 					</n8n-text>
 				</div>
@@ -36,20 +44,21 @@
 					[$style.multipleModes]: hasMultipleModes,
 				}"
 			>
+				<div :class="$style.background"></div>
 				<div v-if="hasMultipleModes" :class="$style.modeSelector">
 					<n8n-select
-						:value="selectedMode"
-						filterable
+						:model-value="selectedMode"
 						:size="inputSize"
 						:disabled="isReadOnly"
-						@change="onModeSelected"
 						:placeholder="$locale.baseText('resourceLocator.modeSelector.placeholder')"
+						data-test-id="rlc-mode-selector"
+						@update:model-value="onModeSelected"
 					>
 						<n8n-option
 							v-for="mode in parameter.modes"
 							:key="mode.name"
-							:label="$locale.baseText(getModeLabel(mode.name)) || mode.displayName"
 							:value="mode.name"
+							:label="getModeLabel(mode)"
 							:disabled="isValueExpression && mode.name === 'list'"
 							:title="
 								isValueExpression && mode.name === 'list'
@@ -57,16 +66,17 @@
 									: ''
 							"
 						>
+							{{ getModeLabel(mode) }}
 						</n8n-option>
 					</n8n-select>
 				</div>
 
-				<div :class="$style.inputContainer">
-					<draggable-target
+				<div :class="$style.inputContainer" data-test-id="rlc-input-container">
+					<DraggableTarget
 						type="mapping"
 						:disabled="hasOnlyListMode"
 						:sticky="true"
-						:stickyOffset="isValueExpression ? [26, 3] : [3, 3]"
+						:sticky-offset="isValueExpression ? [26, 3] : [3, 3]"
 						@drop="onDrop"
 					>
 						<template #default="{ droppable, activeDrop }">
@@ -80,25 +90,26 @@
 							>
 								<ExpressionParameterInput
 									v-if="isValueExpression || forceShowExpression"
-									:value="expressionDisplayValue"
-									:path="path"
-									isForRecordLocator
-									@valueChanged="onInputChange"
-									@modalOpenerClick="$emit('modalOpenerClick')"
 									ref="input"
+									:model-value="expressionDisplayValue"
+									:path="path"
+									:rows="3"
+									@update:model-value="onInputChange"
+									@modal-opener-click="$emit('modalOpenerClick')"
 								/>
 								<n8n-input
 									v-else
+									ref="input"
 									:class="{ [$style.selectInput]: isListMode }"
 									:size="inputSize"
-									:value="valueToDisplay"
+									:model-value="valueToDisplay"
 									:disabled="isReadOnly"
 									:readonly="isListMode"
 									:title="displayTitle"
 									:placeholder="inputPlaceholder"
 									type="text"
-									ref="input"
-									@input="onInputChange"
+									data-test-id="rlc-input"
+									@update:model-value="onInputChange"
 									@focus="onInputFocus"
 									@blur="onInputBlur"
 								>
@@ -108,15 +119,15 @@
 												['el-input__icon']: true,
 												['el-icon-arrow-down']: true,
 												[$style.selectIcon]: true,
-												[$style.isReverse]: showResourceDropdown,
+												[$style.isReverse]: resourceDropdownVisible,
 											}"
 										/>
 									</template>
 								</n8n-input>
 							</div>
 						</template>
-					</draggable-target>
-					<parameter-issues
+					</DraggableTarget>
+					<ParameterIssues
 						v-if="parameterIssues && parameterIssues.length"
 						:issues="parameterIssues"
 						:class="$style['parameter-issues']"
@@ -128,15 +139,26 @@
 					</div>
 				</div>
 			</div>
-		</resource-locator-dropdown>
+		</ResourceLocatorDropdown>
 	</div>
 </template>
 
 <script lang="ts">
-import mixins from 'vue-typed-mixins';
-
+import type { IResourceLocatorReqParams, IResourceLocatorResultExpanded } from '@/Interface';
+import DraggableTarget from '@/components/DraggableTarget.vue';
+import ExpressionParameterInput from '@/components/ExpressionParameterInput.vue';
+import ParameterIssues from '@/components/ParameterIssues.vue';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import { useNDVStore } from '@/stores/ndv.store';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import { useUIStore } from '@/stores/ui.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { getAppNameFromNodeName, getMainAuthField, hasOnlyListMode } from '@/utils/nodeTypesUtils';
+import { isResourceLocatorValue } from '@/utils/typeGuards';
+import stringify from 'fast-json-stable-stringify';
+import type { EventBus } from 'n8n-design-system/utils';
+import { createEventBus } from 'n8n-design-system/utils';
 import type {
-	ILoadOptions,
 	INode,
 	INodeCredentials,
 	INodeListSearchItems,
@@ -146,29 +168,13 @@ import type {
 	INodePropertyMode,
 	NodeParameterValue,
 } from 'n8n-workflow';
-import { INodeListSearchResult } from 'n8n-workflow';
-import ExpressionParameterInput from '@/components/ExpressionParameterInput.vue';
-import DraggableTarget from '@/components/DraggableTarget.vue';
-import ExpressionEdit from '@/components/ExpressionEdit.vue';
-import ParameterIssues from '@/components/ParameterIssues.vue';
-import ResourceLocatorDropdown from './ResourceLocatorDropdown.vue';
-import type { PropType } from 'vue';
-import type Vue from 'vue';
-import type { IResourceLocatorReqParams, IResourceLocatorResultExpanded } from '@/Interface';
-import { INodeUi } from '@/Interface';
-import { debounceHelper } from '@/mixins/debounce';
-import stringify from 'fast-json-stable-stringify';
-import { workflowHelpers } from '@/mixins/workflowHelpers';
-import { nodeHelpers } from '@/mixins/nodeHelpers';
-import { getAppNameFromNodeName, isResourceLocatorValue, hasOnlyListMode } from '@/utils';
 import { mapStores } from 'pinia';
-import { useUIStore } from '@/stores/ui';
-import { useWorkflowsStore } from '@/stores/workflows';
-import { useRootStore } from '@/stores/n8nRootStore';
-import { useNDVStore } from '@/stores/ndv';
-import { useNodeTypesStore } from '@/stores/nodeTypes';
-
-type ResourceLocatorDropdownRef = InstanceType<typeof ResourceLocatorDropdown>;
+import type { PropType } from 'vue';
+import { defineComponent } from 'vue';
+import ResourceLocatorDropdown from './ResourceLocatorDropdown.vue';
+import { useDebounce } from '@/composables/useDebounce';
+import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
+import { useRouter } from 'vue-router';
 
 interface IResourceLocatorQuery {
 	results: INodeListSearchItems[];
@@ -177,11 +183,10 @@ interface IResourceLocatorQuery {
 	loading: boolean;
 }
 
-export default mixins(debounceHelper, workflowHelpers, nodeHelpers).extend({
-	name: 'resource-locator',
+export default defineComponent({
+	name: 'ResourceLocator',
 	components: {
 		DraggableTarget,
-		ExpressionEdit,
 		ExpressionParameterInput,
 		ParameterIssues,
 		ResourceLocatorDropdown,
@@ -191,7 +196,7 @@ export default mixins(debounceHelper, workflowHelpers, nodeHelpers).extend({
 			type: Object as PropType<INodeProperties>,
 			required: true,
 		},
-		value: {
+		modelValue: {
 			type: [Object, String] as PropType<
 				INodeParameterResourceLocator | NodeParameterValue | undefined
 			>,
@@ -207,6 +212,10 @@ export default mixins(debounceHelper, workflowHelpers, nodeHelpers).extend({
 			type: Array as PropType<string[]>,
 			default: () => [],
 		},
+		dependentParametersValues: {
+			type: [String, null] as PropType<string | null>,
+			default: null,
+		},
 		displayTitle: {
 			type: String,
 			default: '',
@@ -243,10 +252,23 @@ export default mixins(debounceHelper, workflowHelpers, nodeHelpers).extend({
 		loadOptionsMethod: {
 			type: String,
 		},
+		eventBus: {
+			type: Object as PropType<EventBus>,
+			default: () => createEventBus(),
+		},
+	},
+	setup() {
+		const router = useRouter();
+		const workflowHelpers = useWorkflowHelpers({ router });
+
+		const { callDebounced } = useDebounce();
+
+		return { callDebounced, workflowHelpers };
 	},
 	data() {
 		return {
-			showResourceDropdown: false,
+			resourceDropdownVisible: false,
+			resourceDropdownHiding: false,
 			searchFilter: '',
 			cachedResponses: {} as { [key: string]: IResourceLocatorQuery },
 			hasCompletedASearch: false,
@@ -264,16 +286,16 @@ export default mixins(debounceHelper, workflowHelpers, nodeHelpers).extend({
 			return getAppNameFromNodeName(nodeType?.displayName || '');
 		},
 		selectedMode(): string {
-			if (typeof this.value !== 'object') {
+			if (typeof this.modelValue !== 'object') {
 				// legacy mode
 				return '';
 			}
 
-			if (!this.value) {
+			if (!this.modelValue) {
 				return this.parameter.modes ? this.parameter.modes[0].name : '';
 			}
 
-			return this.value.mode;
+			return this.modelValue.mode;
 		},
 		isListMode(): boolean {
 			return this.selectedMode === 'list';
@@ -283,7 +305,18 @@ export default mixins(debounceHelper, workflowHelpers, nodeHelpers).extend({
 			if (!node) {
 				return false;
 			}
-			return !!(node && node.credentials && Object.keys(node.credentials).length === 1);
+			return !!(node?.credentials && Object.keys(node.credentials).length === 1);
+		},
+		credentialsNotSet(): boolean {
+			const nodeType = this.nodeTypesStore.getNodeType(this.node?.type);
+			if (nodeType) {
+				const usesCredentials =
+					nodeType.credentials !== undefined && nodeType.credentials.length > 0;
+				if (usesCredentials && !this.node?.credentials) {
+					return true;
+				}
+			}
+			return false;
 		},
 		inputPlaceholder(): string {
 			if (this.currentMode.placeholder) {
@@ -307,19 +340,19 @@ export default mixins(debounceHelper, workflowHelpers, nodeHelpers).extend({
 			return hasOnlyListMode(this.parameter);
 		},
 		valueToDisplay(): NodeParameterValue {
-			if (typeof this.value !== 'object') {
-				return this.value;
+			if (typeof this.modelValue !== 'object') {
+				return this.modelValue;
 			}
 
 			if (this.isListMode) {
-				return this.value ? this.value.cachedResultName || this.value.value : '';
+				return this.modelValue ? this.modelValue.cachedResultName || this.modelValue.value : '';
 			}
 
-			return this.value ? this.value.value : '';
+			return this.modelValue ? this.modelValue.value : '';
 		},
 		urlValue(): string | null {
-			if (this.isListMode && typeof this.value === 'object') {
-				return (this.value && this.value.cachedResultUrl) || null;
+			if (this.isListMode && typeof this.modelValue === 'object') {
+				return this.modelValue?.cachedResultUrl || null;
 			}
 
 			if (this.selectedMode === 'url') {
@@ -340,7 +373,7 @@ export default mixins(debounceHelper, workflowHelpers, nodeHelpers).extend({
 				const value = this.isValueExpression ? this.expressionComputedValue : this.valueToDisplay;
 				if (typeof value === 'string') {
 					const expression = this.currentMode.url.replace(/\{\{\$value\}\}/g, value);
-					const resolved = this.resolveExpression(expression);
+					const resolved = this.workflowHelpers.resolveExpression(expression);
 
 					return typeof resolved === 'string' ? resolved : null;
 				}
@@ -363,7 +396,7 @@ export default mixins(debounceHelper, workflowHelpers, nodeHelpers).extend({
 			const cacheKeys = { ...this.currentRequestParams };
 			cacheKeys.parameters = Object.keys(this.node ? this.node.parameters : {}).reduce(
 				(accu: INodeParameters, param) => {
-					if (param !== this.parameter.name && this.node && this.node.parameters) {
+					if (param !== this.parameter.name && this.node?.parameters) {
 						accu[param] = this.node.parameters[param];
 					}
 
@@ -387,7 +420,7 @@ export default mixins(debounceHelper, workflowHelpers, nodeHelpers).extend({
 			);
 		},
 		currentQueryHasMore(): boolean {
-			return !!(this.currentResponse && this.currentResponse.nextPageToken);
+			return !!this.currentResponse?.nextPageToken;
 		},
 		currentQueryLoading(): boolean {
 			if (this.requiresSearchFilter && this.searchFilter === '') {
@@ -410,7 +443,7 @@ export default mixins(debounceHelper, workflowHelpers, nodeHelpers).extend({
 	},
 	watch: {
 		currentQueryError(curr: boolean, prev: boolean) {
-			if (this.showResourceDropdown && curr && !prev) {
+			if (this.resourceDropdownVisible && curr && !prev) {
 				const inputRef = this.$refs.input as HTMLInputElement | undefined;
 				if (inputRef) {
 					inputRef.focus();
@@ -418,33 +451,52 @@ export default mixins(debounceHelper, workflowHelpers, nodeHelpers).extend({
 			}
 		},
 		isValueExpression(newValue: boolean) {
-			if (newValue === true) {
+			if (newValue) {
 				this.switchFromListMode();
 			}
 		},
 		currentMode(mode: INodePropertyMode) {
 			if (
-				mode.extractValue &&
-				mode.extractValue.regex &&
-				isResourceLocatorValue(this.value) &&
-				this.value.__regex !== mode.extractValue.regex
+				mode.extractValue?.regex &&
+				isResourceLocatorValue(this.modelValue) &&
+				this.modelValue.__regex !== mode.extractValue.regex
+			) {
+				this.$emit('update:modelValue', { ...this.modelValue, __regex: mode.extractValue.regex });
+			}
+		},
+		dependentParametersValues(currentValue, oldValue) {
+			const isUpdated = oldValue !== null && currentValue !== null && oldValue !== currentValue;
+			// Reset value if dependent parameters change
+			if (
+				isUpdated &&
+				this.modelValue &&
+				isResourceLocatorValue(this.modelValue) &&
+				this.modelValue.value !== ''
 			) {
-				this.$emit('input', { ...this.value, __regex: mode.extractValue.regex });
+				this.$emit('update:modelValue', {
+					...this.modelValue,
+					cachedResultName: '',
+					cachedResultUrl: '',
+					value: '',
+				});
 			}
 		},
 	},
 	mounted() {
-		this.$on('refreshList', this.refreshList);
+		this.eventBus.on('refreshList', this.refreshList);
 		window.addEventListener('resize', this.setWidth);
+
 		useNDVStore().$subscribe((mutation, state) => {
 			// Update the width when main panel dimension change
 			this.setWidth();
 		});
+
 		setTimeout(() => {
 			this.setWidth();
 		}, 0);
 	},
-	beforeDestroy() {
+	beforeUnmount() {
+		this.eventBus.off('refreshList', this.refreshList);
 		window.removeEventListener('resize', this.setWidth);
 	},
 	methods: {
@@ -469,9 +521,8 @@ export default mixins(debounceHelper, workflowHelpers, nodeHelpers).extend({
 			this.trackEvent('User refreshed resource locator list');
 		},
 		onKeyDown(e: MouseEvent) {
-			const dropdownRef = this.$refs.dropdown as ResourceLocatorDropdownRef | undefined;
-			if (dropdownRef && this.showResourceDropdown && !this.isSearchable) {
-				dropdownRef.$emit('keyDown', e);
+			if (this.resourceDropdownVisible && !this.isSearchable) {
+				this.eventBus.emit('keyDown', e);
 			}
 		},
 		openResource(url: string) {
@@ -496,7 +547,7 @@ export default mixins(debounceHelper, workflowHelpers, nodeHelpers).extend({
 		},
 		openCredential(): void {
 			const node = this.ndvStore.activeNode;
-			if (!node || !node.credentials) {
+			if (!node?.credentials) {
 				return;
 			}
 			const credentialKey = Object.keys(node.credentials)[0];
@@ -506,42 +557,63 @@ export default mixins(debounceHelper, workflowHelpers, nodeHelpers).extend({
 			const id = node.credentials[credentialKey].id;
 			this.uiStore.openExistingCredential(id);
 		},
+		createNewCredential(): void {
+			const nodeType = this.nodeTypesStore.getNodeType(this.node?.type);
+			if (!nodeType) {
+				return;
+			}
+			const mainAuthType = getMainAuthField(nodeType);
+			const showAuthSelector =
+				mainAuthType !== null &&
+				Array.isArray(mainAuthType.options) &&
+				mainAuthType.options?.length > 0;
+			this.uiStore.openNewCredential('', showAuthSelector);
+		},
 		findModeByName(name: string): INodePropertyMode | null {
 			if (this.parameter.modes) {
 				return this.parameter.modes.find((mode: INodePropertyMode) => mode.name === name) || null;
 			}
 			return null;
 		},
-		getModeLabel(name: string): string | null {
-			if (name === 'id' || name === 'url' || name === 'list') {
-				return this.$locale.baseText(`resourceLocator.mode.${name}`);
+		getModeLabel(mode: INodePropertyMode): string | null {
+			if (mode.name === 'id' || mode.name === 'url' || mode.name === 'list') {
+				return this.$locale.baseText(`resourceLocator.mode.${mode.name}`);
 			}
 
-			return null;
+			return mode.displayName;
 		},
 		onInputChange(value: string): void {
 			const params: INodeParameterResourceLocator = { __rl: true, value, mode: this.selectedMode };
 			if (this.isListMode) {
 				const resource = this.currentQueryResults.find((resource) => resource.value === value);
-				if (resource && resource.name) {
+				if (resource?.name) {
 					params.cachedResultName = resource.name;
 				}
 
-				if (resource && resource.url) {
+				if (resource?.url) {
 					params.cachedResultUrl = resource.url;
 				}
 			}
-			this.$emit('input', params);
+			this.$emit('update:modelValue', params);
 		},
 		onModeSelected(value: string): void {
-			if (typeof this.value !== 'object') {
-				this.$emit('input', { __rl: true, value: this.value, mode: value });
-			} else if (value === 'url' && this.value && this.value.cachedResultUrl) {
-				this.$emit('input', { __rl: true, mode: value, value: this.value.cachedResultUrl });
-			} else if (value === 'id' && this.selectedMode === 'list' && this.value && this.value.value) {
-				this.$emit('input', { __rl: true, mode: value, value: this.value.value });
+			if (typeof this.modelValue !== 'object') {
+				this.$emit('update:modelValue', { __rl: true, value: this.modelValue, mode: value });
+			} else if (value === 'url' && this.modelValue?.cachedResultUrl) {
+				this.$emit('update:modelValue', {
+					__rl: true,
+					mode: value,
+					value: this.modelValue.cachedResultUrl,
+				});
+			} else if (
+				value === 'id' &&
+				this.selectedMode === 'list' &&
+				this.modelValue &&
+				this.modelValue.value
+			) {
+				this.$emit('update:modelValue', { __rl: true, mode: value, value: this.modelValue.value });
 			} else {
-				this.$emit('input', { __rl: true, mode: value, value: '' });
+				this.$emit('update:modelValue', { __rl: true, mode: value, value: '' });
 			}
 
 			this.trackEvent('User changed resource locator mode', { mode: value });
@@ -550,9 +622,9 @@ export default mixins(debounceHelper, workflowHelpers, nodeHelpers).extend({
 			this.$telemetry.track(event, {
 				instance_id: this.rootStore.instanceId,
 				workflow_id: this.workflowsStore.workflowId,
-				node_type: this.node && this.node.type,
-				resource: this.node && this.node.parameters && this.node.parameters.resource,
-				operation: this.node && this.node.parameters && this.node.parameters.operation,
+				node_type: this.node?.type,
+				resource: this.node?.parameters && this.node.parameters.resource,
+				operation: this.node?.parameters && this.node.parameters.operation,
 				field_name: this.parameter.name,
 				...params,
 			});
@@ -568,11 +640,14 @@ export default mixins(debounceHelper, workflowHelpers, nodeHelpers).extend({
 		async loadInitialResources(): Promise<void> {
 			if (!this.currentResponse || (this.currentResponse && this.currentResponse.error)) {
 				this.searchFilter = '';
-				this.loadResources();
+				await this.loadResources();
 			}
 		},
 		loadResourcesDebounced() {
-			this.callDebounced('loadResources', { debounceTime: 1000, trailing: true });
+			void this.callDebounced(this.loadResources, {
+				debounceTime: 1000,
+				trailing: true,
+			});
 		},
 		setResponse(paramsKey: string, props: Partial<IResourceLocatorQuery>) {
 			this.cachedResponses = {
@@ -611,13 +686,13 @@ export default mixins(debounceHelper, workflowHelpers, nodeHelpers).extend({
 					});
 				}
 
-				const resolvedNodeParameters = this.resolveParameter(params.parameters) as INodeParameters;
+				const resolvedNodeParameters = this.workflowHelpers.resolveRequiredParameters(
+					this.parameter,
+					params.parameters,
+				) as INodeParameters;
 				const loadOptionsMethod = this.getPropertyArgument(this.currentMode, 'searchListMethod') as
 					| string
 					| undefined;
-				const searchList = this.getPropertyArgument(this.currentMode, 'searchList') as
-					| ILoadOptions
-					| undefined;
 
 				const requestParams: IResourceLocatorReqParams = {
 					nodeTypeAndVersion: {
@@ -626,7 +701,6 @@ export default mixins(debounceHelper, workflowHelpers, nodeHelpers).extend({
 					},
 					path: this.path,
 					methodName: loadOptionsMethod,
-					searchList,
 					currentNodeParameters: resolvedNodeParameters,
 					credentials: this.node.credentials,
 					...(params.filter ? { filter: params.filter } : {}),
@@ -654,12 +728,12 @@ export default mixins(debounceHelper, workflowHelpers, nodeHelpers).extend({
 			}
 		},
 		onInputFocus(): void {
-			if (!this.isListMode || this.showResourceDropdown) {
+			if (!this.isListMode || this.resourceDropdownVisible) {
 				return;
 			}
 
-			this.loadInitialResources();
-			this.showResourceDropdown = true;
+			void this.loadInitialResources();
+			this.showResourceDropdown();
 		},
 		switchFromListMode(): void {
 			if (this.isListMode && this.parameter.modes && this.parameter.modes.length > 1) {
@@ -669,9 +743,10 @@ export default mixins(debounceHelper, workflowHelpers, nodeHelpers).extend({
 				}
 
 				if (mode) {
-					this.$emit('input', {
+					this.$emit('update:modelValue', {
 						__rl: true,
-						value: this.value && typeof this.value === 'object' ? this.value.value : '',
+						value:
+							this.modelValue && typeof this.modelValue === 'object' ? this.modelValue.value : '',
 						mode: mode.name,
 					});
 				}
@@ -679,16 +754,37 @@ export default mixins(debounceHelper, workflowHelpers, nodeHelpers).extend({
 		},
 		onDropdownHide() {
 			if (!this.currentQueryError) {
-				this.showResourceDropdown = false;
+				this.hideResourceDropdown();
+			}
+		},
+		hideResourceDropdown() {
+			if (!this.resourceDropdownVisible) {
+				return;
 			}
+
+			this.resourceDropdownVisible = false;
+
+			const inputRef = this.$refs.input as HTMLInputElement | undefined;
+			this.resourceDropdownHiding = true;
+			void this.$nextTick(() => {
+				inputRef?.blur?.();
+				this.resourceDropdownHiding = false;
+			});
+		},
+		showResourceDropdown() {
+			if (this.resourceDropdownVisible || this.resourceDropdownHiding) {
+				return;
+			}
+
+			this.resourceDropdownVisible = true;
 		},
 		onListItemSelected(value: string) {
 			this.onInputChange(value);
-			this.showResourceDropdown = false;
+			this.hideResourceDropdown();
 		},
 		onInputBlur() {
 			if (!this.isSearchable || this.currentQueryError) {
-				this.showResourceDropdown = false;
+				this.hideResourceDropdown();
 			}
 			this.$emit('blur');
 		},
@@ -723,17 +819,34 @@ $--mode-selector-width: 92px;
 .resourceLocator {
 	display: flex;
 	flex-wrap: wrap;
+	position: relative;
+
+	--input-issues-width: 28px;
 
 	.inputContainer {
 		display: flex;
 		align-items: center;
 		width: 100%;
 
+		--input-border-top-left-radius: 0;
+		--input-border-bottom-left-radius: 0;
+
 		> div {
 			width: 100%;
 		}
 	}
 
+	.background {
+		position: absolute;
+		background-color: var(--color-background-input-triple);
+		top: 0;
+		bottom: 0;
+		left: 0;
+		right: var(--input-issues-width);
+		border: 1px solid var(--border-color-base);
+		border-radius: var(--border-radius-base);
+	}
+
 	&.multipleModes {
 		.inputContainer {
 			display: flex;
@@ -773,12 +886,10 @@ $--mode-selector-width: 92px;
 .selectIcon {
 	cursor: pointer;
 	font-size: 14px;
-	transition: transform 0.3s, -webkit-transform 0.3s;
-	-webkit-transform: rotateZ(0);
+	transition: transform 0.3s;
 	transform: rotateZ(0);
 
 	&.isReverse {
-		-webkit-transform: rotateZ(180deg);
 		transform: rotateZ(180deg);
 	}
 }
@@ -795,7 +906,9 @@ $--mode-selector-width: 92px;
 
 .openResourceLink {
 	width: 25px !important;
-	margin-left: var(--spacing-2xs);
+	padding-left: var(--spacing-2xs);
+	padding-top: var(--spacing-4xs);
+	align-self: flex-start;
 }
 
 .parameter-issues {
diff --git a/packages/editor-ui/src/components/ResourceLocator/ResourceLocatorDropdown.vue b/packages/editor-ui/src/components/ResourceLocator/ResourceLocatorDropdown.vue
index f2702d6a0d767..5bf6c8b9c64c7 100644
--- a/packages/editor-ui/src/components/ResourceLocator/ResourceLocatorDropdown.vue
+++ b/packages/editor-ui/src/components/ResourceLocator/ResourceLocatorDropdown.vue
@@ -3,21 +3,21 @@
 		placement="bottom"
 		:width="width"
 		:popper-class="$style.popover"
-		:value="show"
+		:visible="show"
 		trigger="manual"
-		v-click-outside="onClickOutside"
+		data-test-id="resource-locator-dropdown"
 	>
-		<div :class="$style.messageContainer" v-if="errorView">
+		<div v-if="errorView" :class="$style.messageContainer">
 			<slot name="error"></slot>
 		</div>
-		<div :class="$style.searchInput" v-if="filterable && !errorView" @keydown="onKeyDown">
+		<div v-if="filterable && !errorView" :class="$style.searchInput" @keydown="onKeyDown">
 			<n8n-input
-				size="medium"
-				:value="filter"
-				:clearable="true"
-				@input="onFilterInput"
 				ref="search"
+				:model-value="filter"
+				:clearable="true"
 				:placeholder="$locale.baseText('resourceLocator.search.placeholder')"
+				data-test-id="rlc-search"
+				@update:model-value="onFilterInput"
 			>
 				<template #prefix>
 					<font-awesome-icon :class="$style.searchIcon" icon="search" />
@@ -28,8 +28,8 @@
 			{{ $locale.baseText('resourceLocator.mode.list.searchRequired') }}
 		</div>
 		<div
-			:class="$style.messageContainer"
 			v-else-if="!errorView && sortedResources.length === 0 && !loading"
+			:class="$style.messageContainer"
 		>
 			{{ $locale.baseText('resourceLocator.mode.list.noResults') }}
 		</div>
@@ -42,16 +42,16 @@
 			<div
 				v-for="(result, i) in sortedResources"
 				:key="result.value"
+				:ref="`item-${i}`"
 				:class="{
 					[$style.resourceItem]: true,
-					[$style.selected]: result.value === value,
+					[$style.selected]: result.value === modelValue,
 					[$style.hovering]: hoverIndex === i,
 				}"
-				class="ph-no-capture"
+				data-test-id="rlc-item"
 				@click="() => onItemClick(result.value)"
 				@mouseenter="() => onItemHover(i)"
 				@mouseleave="() => onItemHoverLeave()"
-				:ref="`item-${i}`"
 			>
 				<div :class="$style.resourceNameContainer">
 					<span>{{ result.name }}</span>
@@ -81,14 +81,16 @@
 import type { IResourceLocatorResultExpanded } from '@/Interface';
 import { defineComponent } from 'vue';
 import type { PropType } from 'vue';
+import type { EventBus } from 'n8n-design-system/utils';
+import { createEventBus } from 'n8n-design-system/utils';
 
 const SEARCH_BAR_HEIGHT_PX = 40;
 const SCROLL_MARGIN_PX = 10;
 
 export default defineComponent({
-	name: 'resource-locator-dropdown',
+	name: 'ResourceLocatorDropdown',
 	props: {
-		value: {
+		modelValue: {
 			type: [String, Number],
 		},
 		show: {
@@ -119,6 +121,10 @@ export default defineComponent({
 		width: {
 			type: Number,
 		},
+		eventBus: {
+			type: Object as PropType<EventBus>,
+			default: () => createEventBus(),
+		},
 	},
 	data() {
 		return {
@@ -126,9 +132,6 @@ export default defineComponent({
 			showHoverUrl: false,
 		};
 	},
-	mounted() {
-		this.$on('keyDown', this.onKeyDown);
-	},
 	computed: {
 		sortedResources(): IResourceLocatorResultExpanded[] {
 			const seen = new Set();
@@ -139,7 +142,7 @@ export default defineComponent({
 					}
 					seen.add(item.value);
 
-					if (this.value && item.value === this.value) {
+					if (this.modelValue && item.value === this.modelValue) {
 						acc.selected = item;
 					} else {
 						acc.notSelected.push(item);
@@ -160,6 +163,29 @@ export default defineComponent({
 			return notSelected;
 		},
 	},
+	watch: {
+		show(value) {
+			if (value) {
+				this.hoverIndex = 0;
+				this.showHoverUrl = false;
+
+				setTimeout(() => {
+					if (value && this.filterable && this.$refs.search) {
+						(this.$refs.search as HTMLElement).focus();
+					}
+				}, 0);
+			}
+		},
+		loading() {
+			setTimeout(() => this.onResultsEnd(), 0); // in case of filtering
+		},
+	},
+	mounted() {
+		this.eventBus.on('keyDown', this.onKeyDown);
+	},
+	beforeUnmount() {
+		this.eventBus.off('keyDown', this.onKeyDown);
+	},
 	methods: {
 		openUrl(event: MouseEvent, url: string) {
 			event.preventDefault();
@@ -200,17 +226,14 @@ export default defineComponent({
 					}
 				}
 			} else if (e.key === 'Enter') {
-				this.$emit('input', this.sortedResources[this.hoverIndex].value);
+				this.$emit('update:modelValue', this.sortedResources[this.hoverIndex].value);
 			}
 		},
 		onFilterInput(value: string) {
 			this.$emit('filter', value);
 		},
-		onClickOutside() {
-			this.$emit('hide');
-		},
 		onItemClick(selected: string) {
-			this.$emit('input', selected);
+			this.$emit('update:modelValue', selected);
 		},
 		onItemHover(index: number) {
 			this.hoverIndex = index;
@@ -239,29 +262,13 @@ export default defineComponent({
 			}
 		},
 	},
-	watch: {
-		show(toShow) {
-			if (toShow) {
-				this.hoverIndex = 0;
-				this.showHoverUrl = false;
-			}
-			setTimeout(() => {
-				if (toShow && this.filterable && this.$refs.search) {
-					(this.$refs.search as HTMLElement).focus();
-				}
-			}, 0);
-		},
-		loading() {
-			setTimeout(this.onResultsEnd, 0); // in case of filtering
-		},
-	},
 });
 </script>
 
 <style lang="scss" module>
 :root .popover {
 	--content-height: 236px;
-	padding: 0;
+	padding: 0 !important;
 	border: var(--border-base);
 	display: flex;
 	max-height: calc(var(--content-height) + var(--spacing-xl));
diff --git a/packages/editor-ui/src/components/ResourceMapper/MappingFields.vue b/packages/editor-ui/src/components/ResourceMapper/MappingFields.vue
new file mode 100644
index 0000000000000..0d8e2435c299f
--- /dev/null
+++ b/packages/editor-ui/src/components/ResourceMapper/MappingFields.vue
@@ -0,0 +1,436 @@
+<script setup lang="ts">
+import type { IUpdateInformation } from '@/Interface';
+import type {
+	FieldType,
+	INodeIssues,
+	INodeParameters,
+	INodeProperties,
+	NodePropertyTypes,
+	ResourceMapperField,
+	ResourceMapperValue,
+} from 'n8n-workflow';
+import ParameterInputFull from '@/components/ParameterInputFull.vue';
+import ParameterIssues from '@/components//ParameterIssues.vue';
+import ParameterOptions from '@/components//ParameterOptions.vue';
+import { computed } from 'vue';
+import { i18n as locale } from '@/plugins/i18n';
+import { useNDVStore } from '@/stores/ndv.store';
+import {
+	fieldCannotBeDeleted,
+	isMatchingField,
+	parseResourceMapperFieldName,
+} from '@/utils/nodeTypesUtils';
+import { useNodeSpecificationValues } from '@/composables/useNodeSpecificationValues';
+
+interface Props {
+	parameter: INodeProperties;
+	path: string;
+	nodeValues: INodeParameters | undefined;
+	fieldsToMap: ResourceMapperField[];
+	paramValue: ResourceMapperValue;
+	labelSize: string;
+	showMatchingColumnsSelector: boolean;
+	showMappingModeSelect: boolean;
+	loading: boolean;
+	refreshInProgress: boolean;
+	teleported?: boolean;
+}
+
+const props = withDefaults(defineProps<Props>(), {
+	teleported: true,
+});
+const FORCE_TEXT_INPUT_FOR_TYPES: FieldType[] = ['time', 'object', 'array'];
+
+const {
+	resourceMapperTypeOptions,
+	singularFieldWord,
+	singularFieldWordCapitalized,
+	pluralFieldWord,
+	pluralFieldWordCapitalized,
+} = useNodeSpecificationValues(props.parameter.typeOptions);
+
+const emit = defineEmits<{
+	(event: 'fieldValueChanged', value: IUpdateInformation): void;
+	(event: 'removeField', field: string): void;
+	(event: 'addField', field: string): void;
+	(event: 'refreshFieldList'): void;
+}>();
+
+const ndvStore = useNDVStore();
+
+function markAsReadOnly(field: ResourceMapperField): boolean {
+	if (
+		isMatchingField(field.id, props.paramValue.matchingColumns, props.showMatchingColumnsSelector)
+	) {
+		return false;
+	}
+	return field.readOnly || false;
+}
+
+const fieldsUi = computed<Array<Partial<INodeProperties> & { readOnly?: boolean }>>(() => {
+	return props.fieldsToMap
+		.filter((field) => field.display && field.removed !== true)
+		.map((field) => {
+			return {
+				displayName: getFieldLabel(field),
+				// Set part of the path to each param name so value can be fetched properly by input parameter list component
+				name: `value["${field.id}"]`,
+				type: getParamType(field),
+				default: field.type === 'boolean' ? false : '',
+				required: field.required,
+				description: getFieldDescription(field),
+				options: field.options,
+				readOnly: markAsReadOnly(field),
+			};
+		});
+});
+
+const orderedFields = computed<Array<Partial<INodeProperties> & { readOnly?: boolean }>>(() => {
+	// Sort so that matching columns are first
+	if (props.paramValue.matchingColumns) {
+		fieldsUi.value.forEach((field, i) => {
+			const fieldName = parseResourceMapperFieldName(field.name);
+			if (fieldName) {
+				if (props.paramValue.matchingColumns.includes(fieldName)) {
+					fieldsUi.value.splice(i, 1);
+					fieldsUi.value.unshift(field);
+				}
+			}
+		});
+	}
+	return fieldsUi.value;
+});
+
+const removedFields = computed<ResourceMapperField[]>(() => {
+	return props.fieldsToMap.filter((field) => field.removed === true && field.display);
+});
+
+const addFieldOptions = computed<Array<{ name: string; value: string; disabled?: boolean }>>(() => {
+	return removedFields.value.map((field) => {
+		return {
+			name: field.displayName,
+			value: field.id,
+			disabled: false,
+		};
+	});
+});
+
+const parameterActions = computed<Array<{ label: string; value: string; disabled?: boolean }>>(
+	() => {
+		return [
+			{
+				label: locale.baseText('resourceMapper.refreshFieldList', {
+					interpolate: { fieldWord: singularFieldWordCapitalized.value },
+				}),
+				value: 'refreshFieldList',
+			},
+			{
+				label: locale.baseText('resourceMapper.addAllFields', {
+					interpolate: { fieldWord: pluralFieldWordCapitalized.value },
+				}),
+				value: 'addAllFields',
+				disabled: removedFields.value.length === 0,
+			},
+			{
+				label: locale.baseText('resourceMapper.removeAllFields', {
+					interpolate: { fieldWord: pluralFieldWordCapitalized.value },
+				}),
+				value: 'removeAllFields',
+				disabled: !isRemoveAllAvailable.value,
+			},
+		];
+	},
+);
+
+const isRemoveAllAvailable = computed<boolean>(() => {
+	return (
+		removedFields.value.length !== props.fieldsToMap.length &&
+		props.fieldsToMap.some((field) => {
+			return (
+				field.removed !== true &&
+				!fieldCannotBeDeleted(
+					field,
+					props.showMatchingColumnsSelector,
+					resourceMapperMode.value,
+					props.paramValue.matchingColumns,
+				)
+			);
+		})
+	);
+});
+
+const resourceMapperMode = computed<string | undefined>(() => {
+	return resourceMapperTypeOptions.value?.mode;
+});
+
+const resourceMapperValuesLabel = computed<string | undefined>(() => {
+	return resourceMapperTypeOptions.value?.valuesLabel;
+});
+
+const valuesLabel = computed<string>(() => {
+	if (resourceMapperValuesLabel.value) {
+		return resourceMapperValuesLabel.value;
+	}
+	if (resourceMapperMode.value && resourceMapperMode.value === 'update') {
+		return locale.baseText('resourceMapper.valuesToUpdate.label');
+	}
+	return locale.baseText('resourceMapper.valuesToSend.label');
+});
+
+const fetchingFieldsLabel = computed<string>(() => {
+	return locale.baseText('resourceMapper.fetchingFields.message', {
+		interpolate: {
+			fieldWord: pluralFieldWord.value,
+		},
+	});
+});
+
+function getFieldLabel(field: ResourceMapperField): string {
+	if (
+		isMatchingField(field.id, props.paramValue.matchingColumns, props.showMatchingColumnsSelector)
+	) {
+		const suffix = locale.baseText('resourceMapper.usingToMatch') || '';
+		return `${field.displayName} ${suffix}`;
+	}
+	return field.displayName;
+}
+
+function getFieldDescription(field: ResourceMapperField): string {
+	if (
+		isMatchingField(field.id, props.paramValue.matchingColumns, props.showMatchingColumnsSelector)
+	) {
+		return (
+			locale.baseText('resourceMapper.usingToMatch.description', {
+				interpolate: {
+					fieldWord: singularFieldWord.value,
+				},
+			}) || ''
+		);
+	}
+	return '';
+}
+
+function getParameterValue(parameterName: string): string | number | boolean | null {
+	const fieldName = parseResourceMapperFieldName(parameterName);
+	if (fieldName && props.paramValue.value) {
+		if (
+			props.paramValue.value[fieldName] === undefined ||
+			props.paramValue.value[fieldName] === null
+		) {
+			return '';
+		}
+		return props.paramValue.value[fieldName];
+	}
+	return null;
+}
+
+function getFieldIssues(field: INodeProperties): string[] {
+	if (!ndvStore.activeNode) return [];
+
+	const nodeIssues = ndvStore.activeNode.issues || ({} as INodeIssues);
+	const fieldName = parseResourceMapperFieldName(field.name);
+	if (!fieldName) return [];
+
+	let fieldIssues: string[] = [];
+	const key = `${props.parameter.name}.${fieldName}`;
+	if (nodeIssues.parameters && key in nodeIssues.parameters) {
+		fieldIssues = fieldIssues.concat(nodeIssues.parameters[key]);
+	}
+	return fieldIssues;
+}
+
+function getParamType(field: ResourceMapperField): NodePropertyTypes {
+	if (field.type && !FORCE_TEXT_INPUT_FOR_TYPES.includes(field.type)) {
+		return field.type as NodePropertyTypes;
+	}
+	return 'string';
+}
+
+function getParsedFieldName(fullName: string): string {
+	return parseResourceMapperFieldName(fullName) ?? fullName;
+}
+
+function onValueChanged(value: IUpdateInformation): void {
+	emit('fieldValueChanged', value);
+}
+
+function removeField(fieldName: string) {
+	emit('removeField', fieldName);
+}
+
+function addField(fieldName: string) {
+	emit('addField', fieldName);
+}
+
+function onParameterActionSelected(action: string): void {
+	switch (action) {
+		case 'addAllFields':
+			emit('addField', action);
+			break;
+		case 'removeAllFields':
+			emit('removeField', action);
+			break;
+		case 'refreshFieldList':
+			emit('refreshFieldList');
+			break;
+		default:
+			break;
+	}
+}
+
+defineExpose({
+	orderedFields,
+});
+</script>
+
+<template>
+	<div class="mt-xs" data-test-id="mapping-fields-container">
+		<n8n-input-label
+			:label="valuesLabel"
+			:underline="true"
+			:size="labelSize"
+			:show-options="true"
+			:show-expression-selector="false"
+			input-name="columns"
+			color="text-dark"
+		>
+			<template #options>
+				<ParameterOptions
+					:parameter="parameter"
+					:custom-actions="parameterActions"
+					:loading="props.refreshInProgress"
+					:loading-message="fetchingFieldsLabel"
+					@update:model-value="onParameterActionSelected"
+				/>
+			</template>
+		</n8n-input-label>
+		<div v-if="orderedFields.length === 0" class="mt-3xs mb-xs">
+			<n8n-text size="small">{{
+				$locale.baseText('fixedCollectionParameter.currentlyNoItemsExist')
+			}}</n8n-text>
+		</div>
+		<div
+			v-for="field in orderedFields"
+			:key="field.name"
+			:class="{
+				['parameter-item']: true,
+				[$style.parameterItem]: true,
+				[$style.hasIssues]: getFieldIssues(field).length > 0,
+			}"
+		>
+			<div
+				v-if="resourceMapperMode === 'add' && field.required"
+				:class="['delete-option', 'mt-5xs', $style.parameterTooltipIcon]"
+			>
+				<n8n-tooltip placement="top">
+					<template #content>
+						<span>{{
+							locale.baseText('resourceMapper.mandatoryField.title', {
+								interpolate: { fieldWord: singularFieldWord },
+							})
+						}}</span>
+					</template>
+					<font-awesome-icon icon="question-circle" />
+				</n8n-tooltip>
+			</div>
+			<div
+				v-else-if="
+					!isMatchingField(
+						field.name,
+						props.paramValue.matchingColumns,
+						props.showMatchingColumnsSelector,
+					)
+				"
+				:class="['delete-option', 'mt-5xs']"
+			>
+				<n8n-icon-button
+					type="tertiary"
+					text
+					size="mini"
+					icon="trash"
+					:data-test-id="`remove-field-button-${getParsedFieldName(field.name)}`"
+					:title="
+						locale.baseText('resourceMapper.removeField', {
+							interpolate: {
+								fieldWord: singularFieldWordCapitalized,
+							},
+						})
+					"
+					@click="removeField(field.name)"
+				></n8n-icon-button>
+			</div>
+			<div :class="$style.parameterInput">
+				<ParameterInputFull
+					:parameter="field"
+					:value="getParameterValue(field.name)"
+					:display-options="true"
+					:path="`${props.path}.${field.name}`"
+					:is-read-only="refreshInProgress || field.readOnly"
+					:hide-issues="true"
+					:node-values="nodeValues"
+					:class="$style.parameterInputFull"
+					@update="onValueChanged"
+				/>
+			</div>
+			<ParameterIssues
+				v-if="getFieldIssues(field).length > 0"
+				:issues="getFieldIssues(field)"
+				:class="[$style.parameterIssues, 'ml-5xs']"
+			/>
+		</div>
+		<div :class="['add-option', $style.addOption]" data-test-id="add-fields-select">
+			<n8n-select
+				:placeholder="
+					locale.baseText('resourceMapper.addFieldToSend', {
+						interpolate: { fieldWord: singularFieldWordCapitalized },
+					})
+				"
+				size="small"
+				:teleported="teleported"
+				:disabled="addFieldOptions.length == 0"
+				@update:model-value="addField"
+			>
+				<n8n-option
+					v-for="item in addFieldOptions"
+					:key="item.value"
+					:label="item.name"
+					:value="item.value"
+					:disabled="item.disabled"
+				>
+				</n8n-option>
+			</n8n-select>
+		</div>
+	</div>
+</template>
+
+<style module lang="scss">
+.parameterItem {
+	display: flex;
+	padding: 0 0 0 var(--spacing-s);
+
+	.parameterInput {
+		width: 100%;
+	}
+
+	&.hasIssues {
+		.parameterIssues {
+			float: none;
+			padding-top: var(--spacing-xl);
+		}
+		input,
+		input:focus {
+			--input-border-color: var(--color-danger);
+			border-color: var(--color-danger);
+		}
+	}
+}
+
+.parameterTooltipIcon {
+	color: var(--color-text-light) !important;
+}
+
+.addOption {
+	margin-top: var(--spacing-l);
+	padding: 0 0 0 var(--spacing-s);
+}
+</style>
diff --git a/packages/editor-ui/src/components/ResourceMapper/MappingModeSelect.vue b/packages/editor-ui/src/components/ResourceMapper/MappingModeSelect.vue
new file mode 100644
index 0000000000000..ed5b7a5a25a31
--- /dev/null
+++ b/packages/editor-ui/src/components/ResourceMapper/MappingModeSelect.vue
@@ -0,0 +1,157 @@
+<script setup lang="ts">
+import type { INodePropertyTypeOptions, ResourceMapperFields } from 'n8n-workflow';
+import { computed, ref, watch } from 'vue';
+import { i18n as locale } from '@/plugins/i18n';
+import { useNodeSpecificationValues } from '@/composables/useNodeSpecificationValues';
+
+interface Props {
+	initialValue: string;
+	fieldsToMap: ResourceMapperFields['fields'];
+	inputSize: string;
+	labelSize: string;
+	typeOptions: INodePropertyTypeOptions | undefined;
+	serviceName: string;
+	loading: boolean;
+	loadingError: boolean;
+	teleported?: boolean;
+}
+
+const props = defineProps<Props>();
+const { resourceMapperTypeOptions, pluralFieldWord, singularFieldWord } =
+	useNodeSpecificationValues(props.typeOptions);
+
+// Mapping mode options: Labels here use field words defined in parameter type options
+const mappingModeOptions = [
+	{
+		name: locale.baseText('resourceMapper.mappingMode.defineBelow.name'),
+		value: 'defineBelow',
+		description: locale.baseText('resourceMapper.mappingMode.defineBelow.description', {
+			interpolate: {
+				fieldWord: singularFieldWord.value,
+			},
+		}),
+	},
+	{
+		name: locale.baseText('resourceMapper.mappingMode.autoMapInputData.name'),
+		value: 'autoMapInputData',
+		description: locale.baseText('resourceMapper.mappingMode.autoMapInputData.description', {
+			interpolate: {
+				fieldWord: pluralFieldWord.value,
+				serviceName: props.serviceName,
+			},
+		}),
+	},
+];
+
+const emit = defineEmits<{
+	(event: 'modeChanged', value: string): void;
+	(event: 'retryFetch'): void;
+}>();
+
+const selected = ref(props.initialValue);
+
+watch(
+	() => props.initialValue,
+	() => {
+		selected.value = props.initialValue;
+	},
+);
+
+const errorMessage = computed<string>(() => {
+	if (selected.value === 'defineBelow') {
+		// Loading error message
+		if (props.loadingError) {
+			return locale.baseText('resourceMapper.fetchingFields.errorMessage', {
+				interpolate: {
+					fieldWord: pluralFieldWord.value,
+				},
+			});
+		}
+		// No data error message
+		if (props.fieldsToMap.length === 0) {
+			return (
+				// Use custom error message if defined
+				resourceMapperTypeOptions.value?.noFieldsError ||
+				locale.baseText('resourceMapper.fetchingFields.noFieldsFound', {
+					interpolate: {
+						fieldWord: pluralFieldWord.value,
+						serviceName: props.serviceName,
+					},
+				})
+			);
+		}
+		return '';
+	}
+	return '';
+});
+
+function onModeChanged(value: string): void {
+	selected.value = value;
+	emit('modeChanged', value);
+}
+
+function onRetryClick(): void {
+	emit('retryFetch');
+}
+
+defineExpose({
+	selected,
+	onModeChanged,
+	mappingModeOptions,
+});
+</script>
+
+<template>
+	<div data-test-id="mapping-mode-select">
+		<n8n-input-label
+			:label="locale.baseText('resourceMapper.mappingMode.label')"
+			:bold="false"
+			:required="false"
+			:size="labelSize"
+			color="text-dark"
+		>
+			<div class="mt-5xs">
+				<n8n-select
+					:model-value="selected"
+					:teleported="teleported"
+					:size="props.inputSize"
+					@update:model-value="onModeChanged"
+				>
+					<n8n-option
+						v-for="option in mappingModeOptions"
+						:key="option.value"
+						:value="option.value"
+						:label="option.name"
+						description="sadasd"
+					>
+						<div class="list-option">
+							<div class="option-headline">
+								{{ option.name }}
+							</div>
+							<div class="option-description" v-html="option.description" />
+						</div>
+					</n8n-option>
+				</n8n-select>
+			</div>
+			<div class="mt-5xs">
+				<n8n-text v-if="loading" size="small">
+					<n8n-icon icon="sync-alt" size="xsmall" :spin="true" />
+					{{
+						locale.baseText('resourceMapper.fetchingFields.message', {
+							interpolate: {
+								fieldWord: pluralFieldWord,
+							},
+						})
+					}}
+				</n8n-text>
+				<n8n-text v-else-if="errorMessage !== ''" size="small" color="danger">
+					<n8n-icon icon="exclamation-triangle" size="xsmall" />
+					{{ errorMessage }}
+					<n8n-link size="small" theme="danger" :underline="true" @click="onRetryClick">
+						{{ locale.baseText('generic.retry') }}
+					</n8n-link>
+				</n8n-text>
+			</div>
+		</n8n-input-label>
+	</div>
+</template>
diff --git a/packages/editor-ui/src/components/ResourceMapper/MatchingColumnsSelect.vue b/packages/editor-ui/src/components/ResourceMapper/MatchingColumnsSelect.vue
new file mode 100644
index 0000000000000..21c72d8c07914
--- /dev/null
+++ b/packages/editor-ui/src/components/ResourceMapper/MatchingColumnsSelect.vue
@@ -0,0 +1,217 @@
+<script setup lang="ts">
+import type {
+	INodeProperties,
+	INodePropertyTypeOptions,
+	ResourceMapperField,
+	ResourceMapperFields,
+} from 'n8n-workflow';
+import { computed, reactive, watch } from 'vue';
+import { i18n as locale } from '@/plugins/i18n';
+import { useNodeSpecificationValues } from '@/composables/useNodeSpecificationValues';
+import ParameterOptions from '@/components/ParameterOptions.vue';
+
+interface Props {
+	parameter: INodeProperties;
+	initialValue: string[];
+	fieldsToMap: ResourceMapperFields['fields'];
+	typeOptions: INodePropertyTypeOptions | undefined;
+	labelSize: string;
+	inputSize: string;
+	loading: boolean;
+	serviceName: string;
+	teleported?: boolean;
+	refreshInProgress: boolean;
+}
+
+const props = withDefaults(defineProps<Props>(), {
+	teleported: true,
+});
+const {
+	resourceMapperTypeOptions,
+	singularFieldWord,
+	singularFieldWordCapitalized,
+	pluralFieldWord,
+	pluralFieldWordCapitalized,
+} = useNodeSpecificationValues(props.typeOptions);
+
+const initialValue = computed<string | string[]>(() => {
+	return resourceMapperTypeOptions.value?.multiKeyMatch === true
+		? props.initialValue
+		: props.initialValue[0];
+});
+
+// Depending on the mode (multiple/singe key column), the selected value can be a string or an array of strings
+const state = reactive({
+	selected: initialValue.value,
+});
+
+watch(
+	() => props.initialValue,
+	() => {
+		state.selected = initialValue.value;
+	},
+);
+
+const emit = defineEmits<{
+	(event: 'matchingColumnsChanged', value: string[]): void;
+	(event: 'refreshFieldList'): void;
+}>();
+
+const availableMatchingFields = computed<ResourceMapperField[]>(() => {
+	return props.fieldsToMap.filter((field) => {
+		return (field.canBeUsedToMatch || field.defaultMatch) && field.display;
+	});
+});
+
+// Field label, description and tooltip: Labels here use content and field words defined in parameter type options
+const fieldLabel = computed<string>(() => {
+	if (resourceMapperTypeOptions.value?.matchingFieldsLabels?.title) {
+		return resourceMapperTypeOptions.value.matchingFieldsLabels.title;
+	}
+	const fieldWord =
+		resourceMapperTypeOptions.value?.multiKeyMatch === true
+			? pluralFieldWordCapitalized.value
+			: singularFieldWordCapitalized.value;
+	return locale.baseText('resourceMapper.columnsToMatchOn.label', {
+		interpolate: {
+			fieldWord,
+		},
+	});
+});
+
+const fieldDescription = computed<string>(() => {
+	if (resourceMapperTypeOptions.value?.matchingFieldsLabels?.hint) {
+		return resourceMapperTypeOptions.value.matchingFieldsLabels.hint;
+	}
+	const labeli18nKey =
+		resourceMapperTypeOptions.value?.multiKeyMatch === true
+			? 'resourceMapper.columnsToMatchOn.multi.description'
+			: 'resourceMapper.columnsToMatchOn.single.description';
+	return locale.baseText(labeli18nKey, {
+		interpolate: {
+			fieldWord:
+				resourceMapperTypeOptions.value?.multiKeyMatch === true
+					? `${pluralFieldWord.value}`
+					: `${singularFieldWord.value}`,
+		},
+	});
+});
+
+const fieldTooltip = computed<string>(() => {
+	if (resourceMapperTypeOptions.value?.matchingFieldsLabels?.description) {
+		return resourceMapperTypeOptions.value.matchingFieldsLabels.description;
+	}
+	return locale.baseText('resourceMapper.columnsToMatchOn.tooltip', {
+		interpolate: {
+			fieldWord:
+				resourceMapperTypeOptions.value?.multiKeyMatch === true
+					? `${pluralFieldWord.value}`
+					: `${singularFieldWord.value}`,
+		},
+	});
+});
+
+const parameterActions = computed<Array<{ label: string; value: string; disabled?: boolean }>>(
+	() => {
+		return [
+			{
+				label: locale.baseText('resourceMapper.refreshFieldList', {
+					interpolate: { fieldWord: singularFieldWordCapitalized.value },
+				}),
+				value: 'refreshFieldList',
+			},
+		];
+	},
+);
+
+const fetchingFieldsLabel = computed<string>(() => {
+	return locale.baseText('resourceMapper.fetchingFields.message', {
+		interpolate: {
+			fieldWord: pluralFieldWord.value,
+		},
+	});
+});
+
+function onSelectionChange(value: string | string[]) {
+	if (resourceMapperTypeOptions.value?.multiKeyMatch === true) {
+		state.selected = value as string[];
+	} else {
+		state.selected = value as string;
+	}
+	emitValueChanged();
+}
+
+function emitValueChanged() {
+	if (state.selected) {
+		emit(
+			'matchingColumnsChanged',
+			Array.isArray(state.selected) ? state.selected : [state.selected],
+		);
+	}
+}
+
+function onParameterActionSelected(action: string): void {
+	switch (action) {
+		case 'refreshFieldList':
+			emit('refreshFieldList');
+			break;
+		default:
+			break;
+	}
+}
+
+defineExpose({
+	state,
+});
+</script>
+
+<template>
+	<div class="mt-2xs" data-test-id="matching-column-select">
+		<n8n-input-label
+			v-if="availableMatchingFields.length > 0"
+			:label="fieldLabel"
+			:tooltip-text="fieldTooltip"
+			:bold="false"
+			:required="false"
+			:size="labelSize"
+			color="text-dark"
+		>
+			<template #options>
+				<ParameterOptions
+					:parameter="parameter"
+					:custom-actions="parameterActions"
+					:loading="props.refreshInProgress"
+					:loading-message="fetchingFieldsLabel"
+					@update:model-value="onParameterActionSelected"
+				/>
+			</template>
+			<n8n-select
+				:multiple="resourceMapperTypeOptions?.multiKeyMatch === true"
+				:model-value="state.selected"
+				:size="props.inputSize"
+				:disabled="loading"
+				:teleported="teleported"
+				@update:model-value="onSelectionChange"
+			>
+				<n8n-option
+					v-for="field in availableMatchingFields"
+					:key="field.id"
+					:value="field.id"
+					:data-test-id="`matching-column-option-${field.id}`"
+				>
+					{{ field.displayName }}
+				</n8n-option>
+			</n8n-select>
+			<n8n-text size="small">
+				{{ fieldDescription }}
+			</n8n-text>
+		</n8n-input-label>
+		<n8n-notice v-else>
+			{{
+				locale.baseText('resourceMapper.columnsToMatchOn.noFieldsFound', {
+					interpolate: { fieldWord: singularFieldWord, serviceName: props.serviceName },
+				})
+			}}
+		</n8n-notice>
+	</div>
+</template>
diff --git a/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue b/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue
new file mode 100644
index 0000000000000..6316af72aa09b
--- /dev/null
+++ b/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue
@@ -0,0 +1,535 @@
+<script setup lang="ts">
+import type { IUpdateInformation, ResourceMapperReqParams } from '@/Interface';
+import { resolveRequiredParameters } from '@/composables/useWorkflowHelpers';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import type {
+	INode,
+	INodeParameters,
+	INodeProperties,
+	INodeTypeDescription,
+	ResourceMapperField,
+	ResourceMapperValue,
+} from 'n8n-workflow';
+import { NodeHelpers } from 'n8n-workflow';
+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 { isResourceMapperValue } from '@/utils/typeGuards';
+import { i18n as locale } from '@/plugins/i18n';
+import { useNDVStore } from '@/stores/ndv.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+
+type Props = {
+	parameter: INodeProperties;
+	node: INode | null;
+	path: string;
+	inputSize: string;
+	labelSize: string;
+	dependentParametersValues?: string | null;
+	teleported: boolean;
+};
+
+const nodeTypesStore = useNodeTypesStore();
+const ndvStore = useNDVStore();
+const workflowsStore = useWorkflowsStore();
+
+const props = withDefaults(defineProps<Props>(), {
+	teleported: true,
+});
+
+const emit = defineEmits<{
+	(event: 'valueChanged', value: IUpdateInformation): void;
+}>();
+
+const state = reactive({
+	paramValue: {
+		mappingMode: 'defineBelow',
+		value: {},
+		matchingColumns: [] as string[],
+		schema: [] as ResourceMapperField[],
+	} as ResourceMapperValue,
+	parameterValues: {} as INodeParameters,
+	loading: false,
+	refreshInProgress: false, // Shows inline loader when refreshing fields
+	loadingError: false,
+});
+
+// Reload fields to map when dependent parameters change
+watch(
+	() => props.dependentParametersValues,
+	async (currentValue, oldValue) => {
+		if (oldValue !== null && currentValue !== null && oldValue !== currentValue) {
+			state.paramValue = {
+				...state.paramValue,
+				value: null,
+				schema: [],
+			};
+			emitValueChanged();
+			await initFetching();
+			setDefaultFieldValues(true);
+		}
+	},
+);
+
+// Reload fields to map when node is executed
+watch(
+	() => workflowsStore.getWorkflowExecution,
+	async (data) => {
+		if (data?.status === 'success' && state.paramValue.mappingMode === 'autoMapInputData') {
+			await initFetching(true);
+		}
+	},
+);
+
+onMounted(async () => {
+	if (props.node) {
+		state.parameterValues = {
+			...state.parameterValues,
+			parameters: props.node.parameters,
+		};
+	}
+	const params = state.parameterValues.parameters as INodeParameters;
+	const parameterName = props.parameter.name;
+
+	if (!(parameterName in params)) {
+		return;
+	}
+	let hasSchema = false;
+	const nodeValues = params[parameterName] as unknown as ResourceMapperValue;
+	state.paramValue = {
+		...state.paramValue,
+		...nodeValues,
+	};
+	if (!state.paramValue.schema) {
+		state.paramValue = {
+			...state.paramValue,
+			schema: [],
+		};
+	} else {
+		hasSchema = state.paramValue.schema.length > 0;
+	}
+	Object.keys(state.paramValue.value || {}).forEach((key) => {
+		if (state.paramValue.value && state.paramValue.value[key] === '') {
+			state.paramValue = {
+				...state.paramValue,
+				value: {
+					...state.paramValue.value,
+					[key]: null,
+				},
+			};
+		}
+	});
+	if (nodeValues.matchingColumns) {
+		state.paramValue = {
+			...state.paramValue,
+			matchingColumns: nodeValues.matchingColumns,
+		};
+	}
+	if (!hasSchema) {
+		// Only fetch a schema if it's not already set
+		await initFetching();
+	}
+	// Set default values if this is the first time the parameter is being set
+	if (!state.paramValue.value) {
+		setDefaultFieldValues();
+	}
+	updateNodeIssues();
+});
+
+const resourceMapperMode = computed<string | undefined>(() => {
+	return props.parameter.typeOptions?.resourceMapper?.mode;
+});
+
+const nodeType = computed<INodeTypeDescription | null>(() => {
+	if (props.node) {
+		return nodeTypesStore.getNodeType(props.node.type, props.node.typeVersion);
+	}
+	return null;
+});
+
+const showMappingModeSelect = computed<boolean>(() => {
+	return props.parameter.typeOptions?.resourceMapper?.supportAutoMap !== false;
+});
+
+const showMatchingColumnsSelector = computed<boolean>(() => {
+	return (
+		!state.loading &&
+		props.parameter.typeOptions?.resourceMapper?.mode !== 'add' &&
+		state.paramValue.schema.length > 0
+	);
+});
+
+const showMappingFields = computed<boolean>(() => {
+	return (
+		state.paramValue.mappingMode === 'defineBelow' &&
+		!state.loading &&
+		!state.loadingError &&
+		state.paramValue.schema.length > 0 &&
+		hasAvailableMatchingColumns.value
+	);
+});
+
+const matchingColumns = computed<string[]>(() => {
+	if (!showMatchingColumnsSelector.value) {
+		return [];
+	}
+	if (state.paramValue.matchingColumns) {
+		return state.paramValue.matchingColumns;
+	}
+	return defaultSelectedMatchingColumns.value;
+});
+
+const hasAvailableMatchingColumns = computed<boolean>(() => {
+	if (resourceMapperMode.value !== 'add') {
+		return (
+			state.paramValue.schema.filter(
+				(field) =>
+					(field.canBeUsedToMatch || field.defaultMatch) && field.display && field.removed !== true,
+			).length > 0
+		);
+	}
+	return true;
+});
+
+const defaultSelectedMatchingColumns = computed<string[]>(() => {
+	return state.paramValue.schema.length === 1
+		? [state.paramValue.schema[0].id]
+		: state.paramValue.schema.reduce((acc, field) => {
+				if (field.defaultMatch) {
+					acc.push(field.id);
+				}
+				return acc;
+			}, [] as string[]);
+});
+
+const pluralFieldWord = computed<string>(() => {
+	return (
+		props.parameter.typeOptions?.resourceMapper?.fieldWords?.plural ||
+		locale.baseText('generic.fields')
+	);
+});
+
+async function initFetching(inlineLoading = false): Promise<void> {
+	state.loadingError = false;
+	if (inlineLoading) {
+		state.refreshInProgress = true;
+	} else {
+		state.loading = true;
+	}
+	try {
+		await loadFieldsToMap();
+		if (!state.paramValue.matchingColumns || state.paramValue.matchingColumns.length === 0) {
+			onMatchingColumnsChanged(defaultSelectedMatchingColumns.value);
+		}
+	} catch (error) {
+		state.loadingError = true;
+	} finally {
+		state.loading = false;
+		state.refreshInProgress = false;
+	}
+}
+
+async function loadFieldsToMap(): Promise<void> {
+	if (!props.node) {
+		return;
+	}
+	const requestParams: ResourceMapperReqParams = {
+		nodeTypeAndVersion: {
+			name: props.node?.type,
+			version: props.node.typeVersion,
+		},
+		currentNodeParameters: resolveRequiredParameters(
+			props.parameter,
+			props.node.parameters,
+		) as INodeParameters,
+		path: props.path,
+		methodName: props.parameter.typeOptions?.resourceMapper?.resourceMapperMethod,
+		credentials: props.node.credentials,
+	};
+	const fetchedFields = await nodeTypesStore.getResourceMapperFields(requestParams);
+	if (fetchedFields !== null) {
+		const newSchema = fetchedFields.fields.map((field) => {
+			const existingField = state.paramValue.schema.find((f) => f.id === field.id);
+			if (existingField) {
+				field.removed = existingField.removed;
+			} else if (state.paramValue.value !== null && !(field.id in state.paramValue.value)) {
+				// New fields are shown by default
+				field.removed = false;
+			}
+			return field;
+		});
+		state.paramValue = {
+			...state.paramValue,
+			schema: newSchema,
+		};
+		emitValueChanged();
+	}
+}
+
+async function onModeChanged(mode: string): Promise<void> {
+	state.paramValue.mappingMode = mode;
+	if (mode === 'defineBelow') {
+		await initFetching();
+	} else {
+		state.loadingError = false;
+	}
+	emitValueChanged();
+}
+
+function setDefaultFieldValues(forceMatchingFieldsUpdate = false): void {
+	state.paramValue.value = {};
+	const hideAllFields = props.parameter.typeOptions?.resourceMapper?.addAllFields === false;
+	state.paramValue.schema.forEach((field) => {
+		if (state.paramValue.value) {
+			// Hide all non-required fields if it's configured in node definition
+			if (hideAllFields) {
+				field.removed = !field.required;
+			}
+			if (field.type === 'boolean') {
+				state.paramValue.value = {
+					...state.paramValue.value,
+					[field.id]: false,
+				};
+			} else {
+				state.paramValue.value = {
+					...state.paramValue.value,
+					[field.id]: null,
+				};
+			}
+		}
+	});
+	emitValueChanged();
+	if (!state.paramValue.matchingColumns || forceMatchingFieldsUpdate) {
+		state.paramValue.matchingColumns = defaultSelectedMatchingColumns.value;
+		emitValueChanged();
+	}
+}
+
+function updateNodeIssues(): void {
+	if (props.node) {
+		const parameterIssues = NodeHelpers.getNodeParametersIssues(
+			nodeType.value?.properties || [],
+			props.node,
+		);
+		if (parameterIssues) {
+			ndvStore.updateNodeParameterIssues(parameterIssues);
+		}
+	}
+}
+
+function onMatchingColumnsChanged(matchingColumns: string[]): void {
+	state.paramValue = {
+		...state.paramValue,
+		matchingColumns,
+	};
+	// Set all matching fields to be visible
+	state.paramValue.schema.forEach((field) => {
+		if (state.paramValue.matchingColumns?.includes(field.id)) {
+			field.removed = false;
+			state.paramValue.schema.splice(state.paramValue.schema.indexOf(field), 1, field);
+		}
+	});
+	if (!state.loading) {
+		emitValueChanged();
+	}
+}
+
+function fieldValueChanged(updateInfo: IUpdateInformation): void {
+	let newValue = null;
+	if (
+		updateInfo.value !== undefined &&
+		updateInfo.value !== '' &&
+		updateInfo.value !== null &&
+		isResourceMapperValue(updateInfo.value)
+	) {
+		newValue = updateInfo.value;
+	}
+	const fieldName = parseResourceMapperFieldName(updateInfo.name);
+	if (fieldName && state.paramValue.value) {
+		state.paramValue.value = {
+			...state.paramValue.value,
+			[fieldName]: newValue,
+		};
+		emitValueChanged();
+	}
+}
+
+function removeField(name: string): void {
+	if (name === 'removeAllFields') {
+		return removeAllFields();
+	}
+	const fieldName = parseResourceMapperFieldName(name);
+	if (fieldName) {
+		const field = state.paramValue.schema.find((f) => f.id === fieldName);
+		if (field) {
+			deleteField(field);
+			emitValueChanged();
+		}
+	}
+}
+
+function removeAllFields(): void {
+	state.paramValue.schema.forEach((field) => {
+		if (
+			!fieldCannotBeDeleted(
+				field,
+				showMatchingColumnsSelector.value,
+				resourceMapperMode.value,
+				matchingColumns.value,
+			)
+		) {
+			deleteField(field);
+		}
+	});
+	emitValueChanged();
+}
+
+// Delete a single field from the mapping (set removed flag to true and delete from value)
+// Used when removing one or all fields
+function deleteField(field: ResourceMapperField): void {
+	if (state.paramValue.value) {
+		delete state.paramValue.value[field.id];
+		field.removed = true;
+		state.paramValue.schema.splice(state.paramValue.schema.indexOf(field), 1, field);
+	}
+}
+
+function addField(name: string): void {
+	if (name === 'addAllFields') {
+		return addAllFields();
+	}
+	if (name === 'removeAllFields') {
+		return removeAllFields();
+	}
+	state.paramValue.value = {
+		...state.paramValue.value,
+		[name]: null,
+	};
+	const field = state.paramValue.schema.find((f) => f.id === name);
+	if (field) {
+		field.removed = false;
+		state.paramValue.schema.splice(state.paramValue.schema.indexOf(field), 1, field);
+	}
+	emitValueChanged();
+}
+
+function addAllFields(): void {
+	const newValues: { [name: string]: null } = {};
+	state.paramValue.schema.forEach((field) => {
+		if (field.display && field.removed) {
+			newValues[field.id] = null;
+			field.removed = false;
+			state.paramValue.schema.splice(state.paramValue.schema.indexOf(field), 1, field);
+		}
+	});
+	state.paramValue.value = {
+		...state.paramValue.value,
+		...newValues,
+	};
+	emitValueChanged();
+}
+
+function emitValueChanged(): void {
+	pruneParamValues();
+	emit('valueChanged', {
+		name: `${props.path}`,
+		value: state.paramValue,
+		node: props.node?.name,
+	});
+	updateNodeIssues();
+}
+
+function pruneParamValues(): void {
+	const { value, schema } = state.paramValue;
+	if (!value) {
+		return;
+	}
+
+	const schemaKeys = new Set(schema.map((s) => s.id));
+	for (const key of Object.keys(value)) {
+		if (value[key] === null || !schemaKeys.has(key)) {
+			delete value[key];
+		}
+	}
+}
+
+defineExpose({
+	state,
+});
+</script>
+
+<template>
+	<div class="mt-4xs" data-test-id="resource-mapper-container">
+		<MappingModeSelect
+			v-if="showMappingModeSelect"
+			:input-size="inputSize"
+			:label-size="labelSize"
+			:initial-value="state.paramValue.mappingMode || 'defineBelow'"
+			:type-options="props.parameter.typeOptions"
+			:service-name="nodeType?.displayName || locale.baseText('generic.service')"
+			:loading="state.loading"
+			:loading-error="state.loadingError"
+			:fields-to-map="state.paramValue.schema"
+			:teleported="teleported"
+			@mode-changed="onModeChanged"
+			@retry-fetch="initFetching"
+		/>
+		<MatchingColumnsSelect
+			v-if="showMatchingColumnsSelector"
+			:parameter="props.parameter"
+			:label-size="labelSize"
+			:fields-to-map="state.paramValue.schema"
+			:type-options="props.parameter.typeOptions"
+			:input-size="inputSize"
+			:loading="state.loading"
+			:initial-value="matchingColumns"
+			:service-name="nodeType?.displayName || locale.baseText('generic.service')"
+			:teleported="teleported"
+			:refresh-in-progress="state.refreshInProgress"
+			@matching-columns-changed="onMatchingColumnsChanged"
+			@refresh-field-list="initFetching(true)"
+		/>
+		<n8n-text v-if="!showMappingModeSelect && state.loading" size="small">
+			<n8n-icon icon="sync-alt" size="xsmall" :spin="true" />
+			{{
+				locale.baseText('resourceMapper.fetchingFields.message', {
+					interpolate: {
+						fieldWord: pluralFieldWord,
+					},
+				})
+			}}
+		</n8n-text>
+		<MappingFields
+			v-if="showMappingFields"
+			:parameter="props.parameter"
+			:path="props.path"
+			:node-values="state.parameterValues"
+			:fields-to-map="state.paramValue.schema"
+			:param-value="state.paramValue"
+			:label-size="labelSize"
+			:show-matching-columns-selector="showMatchingColumnsSelector"
+			:show-mapping-mode-select="showMappingModeSelect"
+			:loading="state.loading"
+			:teleported="teleported"
+			:refresh-in-progress="state.refreshInProgress"
+			@field-value-changed="fieldValueChanged"
+			@remove-field="removeField"
+			@add-field="addField"
+			@refresh-field-list="initFetching(true)"
+		/>
+		<n8n-notice
+			v-if="state.paramValue.mappingMode === 'autoMapInputData' && hasAvailableMatchingColumns"
+		>
+			{{
+				locale.baseText('resourceMapper.autoMappingNotice', {
+					interpolate: {
+						fieldWord: pluralFieldWord,
+						serviceName: nodeType?.displayName || locale.baseText('generic.service'),
+					},
+				})
+			}}
+		</n8n-notice>
+	</div>
+</template>
diff --git a/packages/editor-ui/src/components/RunData.vue b/packages/editor-ui/src/components/RunData.vue
index ef2851a2e8943..5adafcd71e944 100644
--- a/packages/editor-ui/src/components/RunData.vue
+++ b/packages/editor-ui/src/components/RunData.vue
@@ -1,19 +1,21 @@
 <template>
-	<div :class="$style.container">
+	<div :class="['run-data', $style.container]" @mouseover="activatePane">
 		<n8n-callout
-			v-if="canPinData && hasPinData && !editMode.enabled && !isProductionExecutionPreview"
+			v-if="
+				canPinData && pinnedData.hasData.value && !editMode.enabled && !isProductionExecutionPreview
+			"
 			theme="secondary"
 			icon="thumbtack"
 			:class="$style.pinnedDataCallout"
 		>
 			{{ $locale.baseText('runData.pindata.thisDataIsPinned') }}
-			<span class="ml-4xs" v-if="!isReadOnly">
+			<span v-if="!isReadOnlyRoute && !readOnlyEnv" class="ml-4xs">
 				<n8n-link
 					theme="secondary"
 					size="small"
 					underline
 					bold
-					@click="onTogglePinData({ source: 'banner-link' })"
+					@click.stop="onTogglePinData({ source: 'banner-link' })"
 				>
 					{{ $locale.baseText('runData.pindata.unpin') }}
 				</n8n-link>
@@ -33,8 +35,8 @@
 		</n8n-callout>
 
 		<BinaryDataDisplay
-			:windowVisible="binaryDataDisplayVisible"
-			:displayData="binaryDataDisplayData"
+			:window-visible="binaryDataDisplayVisible"
+			:display-data="binaryDataDisplayData"
 			@close="closeBinaryDataDisplay"
 		/>
 
@@ -43,23 +45,21 @@
 
 			<div
 				v-show="!hasRunError"
-				@click.stop
 				:class="$style.displayModes"
 				data-test-id="run-data-pane-header"
+				@click.stop
 			>
 				<n8n-radio-buttons
 					v-show="
-						hasNodeRun &&
-						((jsonData && jsonData.length > 0) || (binaryData && binaryData.length > 0)) &&
-						!editMode.enabled
+						hasNodeRun && (inputData.length || binaryData.length || search) && !editMode.enabled
 					"
-					:value="displayMode"
+					:model-value="displayMode"
 					:options="buttons"
-					@input="onDisplayModeChange"
 					data-test-id="ndv-run-data-display-mode"
+					@update:model-value="onDisplayModeChange"
 				/>
 				<n8n-icon-button
-					v-if="canPinData && !isReadOnly"
+					v-if="canPinData && !isReadOnlyRoute && !readOnlyEnv"
 					v-show="!editMode.enabled"
 					:title="$locale.baseText('runData.editOutput')"
 					:circle="false"
@@ -70,42 +70,26 @@
 					data-test-id="ndv-edit-pinned-data"
 					@click="enterEditMode({ origin: 'editIconButton' })"
 				/>
-				<n8n-tooltip
-					placement="bottom-end"
-					v-if="canPinData && jsonData && jsonData.length > 0"
-					v-show="!editMode.enabled"
-					:value="pinDataDiscoveryTooltipVisible"
-					:manual="isControlledPinDataTooltip"
-				>
-					<template #content v-if="!isControlledPinDataTooltip">
-						<div :class="$style.tooltipContainer">
-							<strong>{{ $locale.baseText('ndv.pinData.pin.title') }}</strong>
-							<n8n-text size="small" tag="p">
-								{{ $locale.baseText('ndv.pinData.pin.description') }}
-
-								<n8n-link :to="dataPinningDocsUrl" size="small">
-									{{ $locale.baseText('ndv.pinData.pin.link') }}
-								</n8n-link>
-							</n8n-text>
-						</div>
-					</template>
-					<template #content v-else>
-						<div :class="$style.tooltipContainer">
-							{{ $locale.baseText('node.discovery.pinData.ndv') }}
-						</div>
-					</template>
-					<n8n-icon-button
-						:class="['ml-2xs', $style.pinDataButton]"
-						type="tertiary"
-						:active="hasPinData"
-						icon="thumbtack"
-						:disabled="editMode.enabled || (inputData.length === 0 && !hasPinData) || isReadOnly"
-						@click="onTogglePinData({ source: 'pin-icon-click' })"
-						data-test-id="ndv-pin-data"
-					/>
-				</n8n-tooltip>
 
-				<div :class="$style.editModeActions" v-show="editMode.enabled">
+				<RunDataPinButton
+					v-if="(canPinData || !!binaryData?.length) && rawInputData.length && !editMode.enabled"
+					:disabled="
+						(!rawInputData.length && !pinnedData.hasData.value) ||
+						isReadOnlyRoute ||
+						readOnlyEnv ||
+						!!binaryData?.length
+					"
+					:tooltip-contents-visibility="{
+						binaryDataTooltipContent: !!binaryData?.length,
+						pinDataDiscoveryTooltipContent:
+							isControlledPinDataTooltip && pinDataDiscoveryTooltipVisible,
+					}"
+					:data-pinning-docs-url="dataPinningDocsUrl"
+					:pinned-data="pinnedData"
+					@toggle-pin-data="onTogglePinData({ source: 'pin-icon-click' })"
+				/>
+
+				<div v-show="editMode.enabled" :class="$style.editModeActions">
 					<n8n-button
 						type="tertiary"
 						:label="$locale.baseText('runData.editor.cancel')"
@@ -122,67 +106,108 @@
 		</div>
 
 		<div
-			:class="$style.runSelector"
 			v-if="maxRunIndex > 0"
 			v-show="!editMode.enabled"
+			:class="$style.runSelector"
 			data-test-id="run-selector"
 		>
-			<n8n-select
-				size="small"
-				:value="runIndex"
-				@input="onRunIndexChange"
-				@click.stop
-				popper-append-to-body
-			>
-				<template #prepend>{{ $locale.baseText('ndv.output.run') }}</template>
-				<n8n-option
-					v-for="option in maxRunIndex + 1"
-					:label="getRunLabel(option)"
-					:value="option - 1"
-					:key="option"
-				></n8n-option>
-			</n8n-select>
-
-			<n8n-tooltip
-				placement="right"
-				v-if="canLinkRuns"
-				:content="$locale.baseText(linkedRuns ? 'runData.unlinking.hint' : 'runData.linking.hint')"
-			>
-				<n8n-icon-button
-					v-if="linkedRuns"
-					icon="unlink"
-					text
-					type="tertiary"
+			<div :class="$style.runSelectorWrapper">
+				<n8n-select
 					size="small"
-					@click="unlinkRun"
-				/>
-				<n8n-icon-button v-else icon="link" text type="tertiary" size="small" @click="linkRun" />
-			</n8n-tooltip>
-
-			<slot name="run-info"></slot>
+					:model-value="runIndex"
+					teleported
+					@update:model-value="onRunIndexChange"
+					@click.stop
+				>
+					<template #prepend>{{ $locale.baseText('ndv.output.run') }}</template>
+					<n8n-option
+						v-for="option in maxRunIndex + 1"
+						:key="option"
+						:label="getRunLabel(option)"
+						:value="option - 1"
+					></n8n-option>
+				</n8n-select>
+				<n8n-tooltip v-if="canLinkRuns" placement="right">
+					<template #content>
+						{{ $locale.baseText(linkedRuns ? 'runData.unlinking.hint' : 'runData.linking.hint') }}
+					</template>
+					<n8n-icon-button
+						class="linkRun"
+						:icon="linkedRuns ? 'unlink' : 'link'"
+						text
+						type="tertiary"
+						size="small"
+						@click="toggleLinkRuns"
+					/>
+				</n8n-tooltip>
+				<slot name="run-info"></slot>
+			</div>
+			<RunDataSearch
+				v-if="showIOSearch"
+				v-model="search"
+				:pane-type="paneType"
+				:is-area-active="isPaneActive"
+				@focus="activatePane"
+			/>
 		</div>
+		<slot name="before-data" />
 
 		<div
 			v-if="maxOutputIndex > 0 && branches.length > 1"
 			:class="$style.tabs"
 			data-test-id="branches"
 		>
-			<n8n-tabs :value="currentOutputIndex" @input="onBranchChange" :options="branches" />
+			<n8n-tabs
+				:model-value="currentOutputIndex"
+				:options="branches"
+				@update:model-value="onBranchChange"
+			/>
+			<RunDataSearch
+				v-if="showIOSearch"
+				v-model="search"
+				:pane-type="paneType"
+				:is-area-active="isPaneActive"
+				@focus="activatePane"
+			/>
 		</div>
 
 		<div
 			v-else-if="
-				hasNodeRun && dataCount > 0 && maxRunIndex === 0 && !isArtificialRecoveredEventItem
+				!hasRunError &&
+				hasNodeRun &&
+				((dataCount > 0 && maxRunIndex === 0) || search) &&
+				!isArtificialRecoveredEventItem
 			"
-			v-show="!editMode.enabled"
+			v-show="!editMode.enabled && !hasRunError"
 			:class="$style.itemsCount"
+			data-test-id="ndv-items-count"
 		>
-			<n8n-text>
-				{{ dataCount }} {{ $locale.baseText('ndv.output.items', { adjustToNumber: dataCount }) }}
+			<n8n-text v-if="search">
+				{{
+					$locale.baseText('ndv.search.items', {
+						adjustToNumber: unfilteredDataCount,
+						interpolate: { matched: dataCount, total: unfilteredDataCount },
+					})
+				}}
 			</n8n-text>
+			<n8n-text v-else>
+				{{
+					$locale.baseText('ndv.output.items', {
+						adjustToNumber: dataCount,
+						interpolate: { count: dataCount },
+					})
+				}}
+			</n8n-text>
+			<RunDataSearch
+				v-if="showIOSearch"
+				v-model="search"
+				:pane-type="paneType"
+				:is-area-active="isPaneActive"
+				@focus="activatePane"
+			/>
 		</div>
 
-		<div :class="$style.dataContainer" ref="dataContainer" data-test-id="ndv-data-container">
+		<div ref="dataContainer" :class="$style.dataContainer" data-test-id="ndv-data-container">
 			<div v-if="isExecuting" :class="$style.center" data-test-id="ndv-executing">
 				<div :class="$style.spinner"><n8n-spinner type="ring" /></div>
 				<n8n-text>{{ executingMessage }}</n8n-text>
@@ -190,11 +215,10 @@
 
 			<div v-else-if="editMode.enabled" :class="$style.editMode">
 				<div :class="[$style.editModeBody, 'ignore-key-press']">
-					<code-editor
-						:value="editMode.value"
-						:options="{ scrollBeyondLastLine: false }"
-						type="json"
-						@input="ndvStore.setOutputPanelEditModeValue($event)"
+					<JsonEditor
+						:model-value="editMode.value"
+						:fill-parent="true"
+						@update:model-value="ndvStore.setOutputPanelEditModeValue($event)"
 					/>
 				</div>
 				<div :class="$style.editModeFooter">
@@ -228,7 +252,7 @@
 			</div>
 
 			<div v-else-if="hasNodeRun && isArtificialRecoveredEventItem" :class="$style.center">
-				<slot name="recovered-artifical-output-data"></slot>
+				<slot name="recovered-artificial-output-data"></slot>
 			</div>
 
 			<div v-else-if="hasNodeRun && hasRunError" :class="$style.stretchVertically">
@@ -239,6 +263,7 @@
 						})
 					}}
 				</n8n-text>
+				<slot v-else-if="$slots['content']" name="content"></slot>
 				<NodeErrorView
 					v-else
 					:error="workflowRunData[node.name][runIndex].error"
@@ -247,15 +272,31 @@
 			</div>
 
 			<div
-				v-else-if="hasNodeRun && jsonData && jsonData.length === 0 && branches.length > 1"
+				v-else-if="
+					hasNodeRun && (!unfilteredDataCount || (search && !dataCount)) && branches.length > 1
+				"
 				:class="$style.center"
 			>
-				<n8n-text>
+				<div v-if="search">
+					<n8n-text tag="h3" size="large">{{
+						$locale.baseText('ndv.search.noMatch.title')
+					}}</n8n-text>
+					<n8n-text>
+						<i18n-t keypath="ndv.search.noMatch.description" tag="span">
+							<template #link>
+								<a href="#" @click="onSearchClear">
+									{{ $locale.baseText('ndv.search.noMatch.description.link') }}
+								</a>
+							</template>
+						</i18n-t>
+					</n8n-text>
+				</div>
+				<n8n-text v-else>
 					{{ noDataInBranchMessage }}
 				</n8n-text>
 			</div>
 
-			<div v-else-if="hasNodeRun && jsonData && jsonData.length === 0" :class="$style.center">
+			<div v-else-if="hasNodeRun && !inputData.length && !search" :class="$style.center">
 				<slot name="no-output-data">xxx</slot>
 			</div>
 
@@ -276,14 +317,23 @@
 					:label="$locale.baseText('ndv.output.tooMuchData.showDataAnyway')"
 					@click="showTooMuchData"
 				/>
+
+				<n8n-button
+					size="small"
+					:label="$locale.baseText('runData.downloadBinaryData')"
+					@click="downloadJsonData()"
+				/>
 			</div>
 
+			<!-- V-else slot named content which only renders if $slots.content is passed and hasNodeRun -->
+			<slot v-else-if="hasNodeRun && $slots['content']" name="content"></slot>
+
 			<div
 				v-else-if="
 					hasNodeRun &&
 					displayMode === 'table' &&
 					binaryData.length > 0 &&
-					jsonData.length === 1 &&
+					inputData.length === 1 &&
 					Object.keys(jsonData[0] || {}).length === 0
 				"
 				:class="$style.center"
@@ -296,49 +346,69 @@
 				</n8n-text>
 			</div>
 
-			<run-data-table
-				v-else-if="hasNodeRun && displayMode === 'table'"
-				:node="node"
-				:inputData="inputData"
-				:mappingEnabled="mappingEnabled"
-				:distanceFromActive="distanceFromActive"
-				:runIndex="runIndex"
-				:pageOffset="currentPageOffset"
-				:totalRuns="maxRunIndex"
-				:hasDefaultHoverState="paneType === 'input'"
-				@mounted="$emit('tableMounted', $event)"
-				@activeRowChanged="onItemHover"
-				@displayModeChange="onDisplayModeChange"
-			/>
-
-			<run-data-json
-				v-else-if="hasNodeRun && displayMode === 'json'"
-				:paneType="paneType"
-				:editMode="editMode"
-				:sessioId="sessionId"
-				:node="node"
-				:inputData="inputData"
-				:mappingEnabled="mappingEnabled"
-				:distanceFromActive="distanceFromActive"
-				:runIndex="runIndex"
-				:totalRuns="maxRunIndex"
-			/>
-
-			<run-data-html
-				v-else-if="hasNodeRun && isPaneTypeOutput && displayMode === 'html'"
-				:inputData="inputData"
-			/>
+			<div v-else-if="showIoSearchNoMatchContent" :class="$style.center">
+				<n8n-text tag="h3" size="large">{{
+					$locale.baseText('ndv.search.noMatch.title')
+				}}</n8n-text>
+				<n8n-text>
+					<i18n-t keypath="ndv.search.noMatch.description" tag="span">
+						<template #link>
+							<a href="#" @click="onSearchClear">
+								{{ $locale.baseText('ndv.search.noMatch.description.link') }}
+							</a>
+						</template>
+					</i18n-t>
+				</n8n-text>
+			</div>
 
-			<run-data-schema
-				v-else-if="hasNodeRun && isSchemaView"
-				:data="jsonData"
-				:mappingEnabled="mappingEnabled"
-				:distanceFromActive="distanceFromActive"
-				:node="node"
-				:paneType="paneType"
-				:runIndex="runIndex"
-				:totalRuns="maxRunIndex"
-			/>
+			<Suspense v-else-if="hasNodeRun && displayMode === 'table'">
+				<RunDataTable
+					:node="node"
+					:input-data="inputDataPage"
+					:mapping-enabled="mappingEnabled"
+					:distance-from-active="distanceFromActive"
+					:run-index="runIndex"
+					:page-offset="currentPageOffset"
+					:total-runs="maxRunIndex"
+					:has-default-hover-state="paneType === 'input' && !search"
+					:search="search"
+					@mounted="$emit('tableMounted', $event)"
+					@active-row-changed="onItemHover"
+					@display-mode-change="onDisplayModeChange"
+				/>
+			</Suspense>
+
+			<Suspense v-else-if="hasNodeRun && displayMode === 'json'">
+				<RunDataJson
+					:pane-type="paneType"
+					:edit-mode="editMode"
+					:push-ref="pushRef"
+					:node="node"
+					:input-data="inputDataPage"
+					:mapping-enabled="mappingEnabled"
+					:distance-from-active="distanceFromActive"
+					:run-index="runIndex"
+					:total-runs="maxRunIndex"
+					:search="search"
+				/>
+			</Suspense>
+
+			<Suspense v-else-if="hasNodeRun && isPaneTypeOutput && displayMode === 'html'">
+				<RunDataHtml :input-html="inputDataPage[0].json.html" />
+			</Suspense>
+
+			<Suspense v-else-if="hasNodeRun && isSchemaView">
+				<RunDataSchema
+					:data="jsonData"
+					:mapping-enabled="mappingEnabled"
+					:distance-from-active="distanceFromActive"
+					:node="node"
+					:pane-type="paneType"
+					:run-index="runIndex"
+					:total-runs="maxRunIndex"
+					:search="search"
+				/>
+			</Suspense>
 
 			<div v-else-if="displayMode === 'binary' && binaryData.length === 0" :class="$style.center">
 				<n8n-text align="center" tag="div">{{
@@ -348,7 +418,7 @@
 
 			<div v-else-if="displayMode === 'binary'" :class="$style.dataDisplay">
 				<div v-for="(binaryDataEntry, index) in binaryData" :key="index">
-					<div :class="$style.binaryIndex" v-if="binaryData.length > 1">
+					<div v-if="binaryData.length > 1" :class="$style.binaryIndex">
 						<div>
 							{{ index + 1 }}
 						</div>
@@ -356,11 +426,11 @@
 
 					<div :class="$style.binaryRow">
 						<div
-							:class="$style.binaryCell"
 							v-for="(binaryData, key) in binaryDataEntry"
 							:key="index + '_' + key"
+							:class="$style.binaryCell"
 						>
-							<div>
+							<div :data-test-id="'ndv-binary-data_' + index">
 								<div :class="$style.binaryHeader">
 									{{ key }}
 								</div>
@@ -410,7 +480,7 @@
 										v-if="isViewable(index, key)"
 										size="small"
 										:label="$locale.baseText('runData.showBinaryData')"
-										class="binary-data-show-data-button"
+										data-test-id="ndv-view-binary-data"
 										@click="displayBinaryData(index, key)"
 									/>
 									<n8n-button
@@ -418,7 +488,7 @@
 										size="small"
 										type="secondary"
 										:label="$locale.baseText('runData.downloadBinaryData')"
-										class="binary-data-show-data-button"
+										data-test-id="ndv-download-binary-data"
 										@click="downloadBinaryData(index, key)"
 									/>
 								</div>
@@ -429,24 +499,37 @@
 			</div>
 		</div>
 		<div
-			:class="$style.pagination"
-			v-if="hasNodeRun && !hasRunError && dataCount > pageSize && !isSchemaView"
+			v-if="
+				hasNodeRun &&
+				!hasRunError &&
+				binaryData.length === 0 &&
+				dataCount > pageSize &&
+				!isSchemaView &&
+				!isArtificialRecoveredEventItem
+			"
 			v-show="!editMode.enabled"
+			:class="$style.pagination"
+			data-test-id="ndv-data-pagination"
 		>
 			<el-pagination
 				background
 				:hide-on-single-page="true"
-				:current-page.sync="currentPage"
+				:current-page="currentPage"
 				:pager-count="5"
 				:page-size="pageSize"
 				layout="prev, pager, next"
-				@current-change="onCurrentPageChange"
 				:total="dataCount"
+				@update:current-page="onCurrentPageChange"
 			>
 			</el-pagination>
 
 			<div :class="$style.pageSizeSelector">
-				<n8n-select size="mini" :value="pageSize" @input="onPageSizeChange" popper-append-to-body>
+				<n8n-select
+					size="mini"
+					:model-value="pageSize"
+					teleported
+					@update:model-value="onPageSizeChange"
+				>
 					<template #prepend>{{ $locale.baseText('ndv.output.pageSize') }}</template>
 					<n8n-option v-for="size in pageSizes" :key="size" :label="size" :value="size">
 					</n8n-option>
@@ -459,18 +542,23 @@
 </template>
 
 <script lang="ts">
+import { defineAsyncComponent, defineComponent, toRef } from 'vue';
 import type { PropType } from 'vue';
-import mixins from 'vue-typed-mixins';
+import { mapStores } from 'pinia';
+import { useStorage } from '@/composables/useStorage';
 import { saveAs } from 'file-saver';
 import type {
+	ConnectionTypes,
 	IBinaryData,
 	IBinaryKeyData,
 	IDataObject,
 	INodeExecutionData,
+	INodeOutputConfiguration,
 	INodeTypeDescription,
 	IRunData,
 	IRunExecutionData,
 } from 'n8n-workflow';
+import { NodeHelpers, NodeConnectionType } from 'n8n-workflow';
 
 import type {
 	IExecutionResponse,
@@ -494,49 +582,63 @@ import {
 } from '@/constants';
 
 import BinaryDataDisplay from '@/components/BinaryDataDisplay.vue';
-import WarningTooltip from '@/components/WarningTooltip.vue';
 import NodeErrorView from '@/components/Error/NodeErrorView.vue';
+import JsonEditor from '@/components/JsonEditor/JsonEditor.vue';
 
-import { externalHooks } from '@/mixins/externalHooks';
-import { genericHelpers } from '@/mixins/genericHelpers';
-import { nodeHelpers } from '@/mixins/nodeHelpers';
-import { pinData } from '@/mixins/pinData';
-import { CodeEditor } from '@/components/forms';
+import type { PinDataSource } from '@/composables/usePinnedData';
+import { usePinnedData } from '@/composables/usePinnedData';
 import { dataPinningEventBus } from '@/event-bus';
-import { clearJsonKey, executionDataToJson, stringSizeInBytes } from '@/utils';
-import { isEmpty } from '@/utils';
-import { useWorkflowsStore } from '@/stores/workflows';
-import { mapStores } from 'pinia';
-import { useNDVStore } from '@/stores/ndv';
-import { useNodeTypesStore } from '@/stores/nodeTypes';
-
-const RunDataTable = () => import('@/components/RunDataTable.vue');
-const RunDataJson = () => import('@/components/RunDataJson.vue');
-const RunDataSchema = () => import('@/components/RunDataSchema.vue');
-const RunDataHtml = () => import('@/components/RunDataHtml.vue');
+import { clearJsonKey, isEmpty } from '@/utils/typesUtils';
+import { executionDataToJson } from '@/utils/nodeTypesUtils';
+import { searchInObject } from '@/utils/objectUtils';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useNDVStore } from '@/stores/ndv.store';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import { useNodeHelpers } from '@/composables/useNodeHelpers';
+import { useToast } from '@/composables/useToast';
+import { isEqual, isObject } from 'lodash-es';
+import { useExternalHooks } from '@/composables/useExternalHooks';
+import { useSourceControlStore } from '@/stores/sourceControl.store';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import RunDataPinButton from '@/components/RunDataPinButton.vue';
+
+const RunDataTable = defineAsyncComponent(
+	async () => await import('@/components/RunDataTable.vue'),
+);
+const RunDataJson = defineAsyncComponent(async () => await import('@/components/RunDataJson.vue'));
+const RunDataSchema = defineAsyncComponent(
+	async () => await import('@/components/RunDataSchema.vue'),
+);
+const RunDataHtml = defineAsyncComponent(async () => await import('@/components/RunDataHtml.vue'));
+const RunDataSearch = defineAsyncComponent(
+	async () => await import('@/components/RunDataSearch.vue'),
+);
 
 export type EnterEditModeArgs = {
 	origin: 'editIconButton' | 'insertTestDataLink';
 };
 
-export default mixins(externalHooks, genericHelpers, nodeHelpers, pinData).extend({
+export default defineComponent({
 	name: 'RunData',
 	components: {
 		BinaryDataDisplay,
 		NodeErrorView,
-		WarningTooltip,
-		CodeEditor,
+		JsonEditor,
 		RunDataTable,
 		RunDataJson,
 		RunDataSchema,
 		RunDataHtml,
+		RunDataSearch,
+		RunDataPinButton,
 	},
 	props: {
-		nodeUi: {
+		node: {
 			type: Object as PropType<INodeUi>,
+			default: null,
 		},
 		runIndex: {
 			type: Number,
+			required: true,
 		},
 		linkedRuns: {
 			type: Boolean,
@@ -556,11 +658,12 @@ export default mixins(externalHooks, genericHelpers, nodeHelpers, pinData).exten
 		executingMessage: {
 			type: String,
 		},
-		sessionId: {
+		pushRef: {
 			type: String,
 		},
 		paneType: {
 			type: String as PropType<NodePanelType>,
+			required: true,
 		},
 		overrideOutputs: {
 			type: Array as PropType<number[]>,
@@ -579,9 +682,31 @@ export default mixins(externalHooks, genericHelpers, nodeHelpers, pinData).exten
 			type: Boolean,
 			default: false,
 		},
+		isPaneActive: {
+			type: Boolean,
+			default: false,
+		},
+	},
+	setup(props) {
+		const ndvStore = useNDVStore();
+		const nodeHelpers = useNodeHelpers();
+		const externalHooks = useExternalHooks();
+		const node = toRef(props, 'node');
+		const pinnedData = usePinnedData(node, {
+			runIndex: props.runIndex,
+			displayMode: ndvStore.getPanelDisplayMode(props.paneType),
+		});
+
+		return {
+			...useToast(),
+			externalHooks,
+			nodeHelpers,
+			pinnedData,
+		};
 	},
 	data() {
 		return {
+			connectionType: NodeConnectionType.Main,
 			binaryDataPreviewActive: false,
 			dataSize: 0,
 			showData: false,
@@ -597,31 +722,20 @@ export default mixins(externalHooks, genericHelpers, nodeHelpers, pinData).exten
 
 			pinDataDiscoveryTooltipVisible: false,
 			isControlledPinDataTooltip: false,
+			search: '',
 		};
 	},
-	mounted() {
-		this.init();
-
-		if (!this.isPaneTypeInput) {
-			dataPinningEventBus.on('data-pinning-error', this.onDataPinningError);
-			dataPinningEventBus.on('data-unpinning', this.onDataUnpinning);
-
-			this.showPinDataDiscoveryTooltip(this.jsonData);
-		}
-		this.ndvStore.setNDVBranchIndex({
-			pane: this.paneType as 'input' | 'output',
-			branchIndex: this.currentOutputIndex,
-		});
-
-		if (this.paneType === 'output') this.setDisplayMode();
-	},
-	destroyed() {
-		this.hidePinDataDiscoveryTooltip();
-		dataPinningEventBus.off('data-pinning-error', this.onDataPinningError);
-		dataPinningEventBus.off('data-unpinning', this.onDataUnpinning);
-	},
 	computed: {
-		...mapStores(useNodeTypesStore, useNDVStore, useWorkflowsStore),
+		...mapStores(
+			useNodeTypesStore,
+			useNDVStore,
+			useWorkflowsStore,
+			useSourceControlStore,
+			useRootStore,
+		),
+		isReadOnlyRoute() {
+			return this.$route?.meta?.readOnlyCanvas === true;
+		},
 		activeNode(): INodeUi | null {
 			return this.ndvStore.activeNode;
 		},
@@ -634,9 +748,6 @@ export default mixins(externalHooks, genericHelpers, nodeHelpers, pinData).exten
 		displayMode(): IRunDataDisplayMode {
 			return this.ndvStore.getPanelDisplayMode(this.paneType);
 		},
-		node(): INodeUi | null {
-			return (this.nodeUi as INodeUi | null) || null;
-		},
 		nodeType(): INodeTypeDescription | null {
 			if (this.node) {
 				return this.nodeTypesStore.getNodeType(this.node.type, this.node.typeVersion);
@@ -647,12 +758,22 @@ export default mixins(externalHooks, genericHelpers, nodeHelpers, pinData).exten
 			return this.displayMode === 'schema';
 		},
 		isTriggerNode(): boolean {
+			if (this.node === null) {
+				return false;
+			}
 			return this.nodeTypesStore.isTriggerNode(this.node.type);
 		},
 		canPinData(): boolean {
+			if (this.node === null) {
+				return false;
+			}
+
+			const canPinNode = usePinnedData(this.node).canPinNode(false);
+
 			return (
+				canPinNode &&
 				!this.isPaneTypeInput &&
-				this.isPinDataNodeType &&
+				this.pinnedData.isValidNodeType.value &&
 				!(this.binaryData && this.binaryData.length > 0)
 			);
 		},
@@ -667,7 +788,7 @@ export default mixins(externalHooks, genericHelpers, nodeHelpers, pinData).exten
 			}
 
 			const schemaView = { label: this.$locale.baseText('runData.schema'), value: 'schema' };
-			if (this.isPaneTypeInput) {
+			if (this.isPaneTypeInput && !isEmpty(this.jsonData)) {
 				defaults.unshift(schemaView);
 			} else {
 				defaults.push(schemaView);
@@ -688,11 +809,11 @@ export default mixins(externalHooks, genericHelpers, nodeHelpers, pinData).exten
 				!this.isExecuting &&
 					this.node &&
 					((this.workflowRunData && this.workflowRunData.hasOwnProperty(this.node.name)) ||
-						this.hasPinData),
+						this.pinnedData.hasData.value),
 			);
 		},
 		isArtificialRecoveredEventItem(): boolean {
-			return this.inputData?.[0]?.json?.isArtificialRecoveredEventItem !== undefined ?? false;
+			return !!this.rawInputData?.[0]?.json?.isArtificialRecoveredEventItem;
 		},
 		subworkflowExecutionError(): Error | null {
 			return this.workflowsStore.subWorkflowExecutionError;
@@ -701,13 +822,7 @@ export default mixins(externalHooks, genericHelpers, nodeHelpers, pinData).exten
 			return Boolean(this.subworkflowExecutionError);
 		},
 		hasRunError(): boolean {
-			return Boolean(
-				this.node &&
-					this.workflowRunData &&
-					this.workflowRunData[this.node.name] &&
-					this.workflowRunData[this.node.name][this.runIndex] &&
-					this.workflowRunData[this.node.name][this.runIndex].error,
-			);
+			return Boolean(this.node && this.workflowRunData?.[this.node.name]?.[this.runIndex]?.error);
 		},
 		workflowExecution(): IExecutionResponse | null {
 			return this.workflowsStore.getWorkflowExecution;
@@ -717,7 +832,7 @@ export default mixins(externalHooks, genericHelpers, nodeHelpers, pinData).exten
 				return null;
 			}
 			const executionData: IRunExecutionData | undefined = this.workflowExecution.data;
-			if (executionData && executionData.resultData) {
+			if (executionData?.resultData) {
 				return executionData.resultData.runData;
 			}
 			return null;
@@ -725,11 +840,16 @@ export default mixins(externalHooks, genericHelpers, nodeHelpers, pinData).exten
 		dataCount(): number {
 			return this.getDataCount(this.runIndex, this.currentOutputIndex);
 		},
+		unfilteredDataCount(): number {
+			return this.pinnedData.data.value
+				? this.pinnedData.data.value.length
+				: this.rawInputData.length;
+		},
 		dataSizeInMB(): string {
 			return (this.dataSize / 1024 / 1000).toLocaleString();
 		},
 		maxOutputIndex(): number {
-			if (this.node === null) {
+			if (this.node === null || this.runIndex === undefined) {
 				return 0;
 			}
 
@@ -745,7 +865,7 @@ export default mixins(externalHooks, genericHelpers, nodeHelpers, pinData).exten
 
 			if (runData[this.node.name][this.runIndex]) {
 				const taskData = runData[this.node.name][this.runIndex].data;
-				if (taskData && taskData.main) {
+				if (taskData?.main) {
 					return taskData.main.length - 1;
 				}
 			}
@@ -773,42 +893,15 @@ export default mixins(externalHooks, genericHelpers, nodeHelpers, pinData).exten
 			return 0;
 		},
 		rawInputData(): INodeExecutionData[] {
-			let inputData: INodeExecutionData[] = [];
-
-			if (this.node) {
-				inputData = this.getNodeInputData(this.node, this.runIndex, this.currentOutputIndex);
-			}
-
-			if (inputData.length === 0 || !Array.isArray(inputData)) {
-				return [];
-			}
-
-			return inputData;
+			return this.getRawInputData(this.runIndex, this.currentOutputIndex, this.connectionType);
 		},
 		inputData(): INodeExecutionData[] {
-			let inputData = this.rawInputData;
-
-			if (this.node && this.pinData && !this.isProductionExecutionPreview) {
-				inputData = Array.isArray(this.pinData)
-					? this.pinData.map((value) => ({
-							json: value,
-					  }))
-					: [
-							{
-								json: this.pinData,
-							},
-					  ];
-			}
-
-			// We don't want to paginate the schema view
-			if (this.isSchemaView) {
-				return inputData;
-			}
-
+			const pinOrLiveData = this.getPinDataOrLiveData(this.rawInputData);
+			return this.getFilteredData(pinOrLiveData);
+		},
+		inputDataPage(): INodeExecutionData[] {
 			const offset = this.pageSize * (this.currentPage - 1);
-			inputData = inputData.slice(offset, offset + this.pageSize);
-
-			return inputData;
+			return this.inputData.slice(offset, offset + this.pageSize);
 		},
 		jsonData(): IDataObject[] {
 			return executionDataToJson(this.inputData);
@@ -818,7 +911,7 @@ export default mixins(externalHooks, genericHelpers, nodeHelpers, pinData).exten
 				return [];
 			}
 
-			const binaryData = this.getBinaryData(
+			const binaryData = this.nodeHelpers.getBinaryData(
 				this.workflowRunData,
 				this.node.name,
 				this.runIndex,
@@ -827,29 +920,34 @@ export default mixins(externalHooks, genericHelpers, nodeHelpers, pinData).exten
 			return binaryData.filter((data) => Boolean(data && Object.keys(data).length));
 		},
 		currentOutputIndex(): number {
-			if (
-				this.overrideOutputs &&
-				this.overrideOutputs.length &&
-				!this.overrideOutputs.includes(this.outputIndex)
-			) {
-				return this.overrideOutputs[0] as number;
+			if (this.overrideOutputs?.length && !this.overrideOutputs.includes(this.outputIndex)) {
+				return this.overrideOutputs[0];
 			}
 
 			return this.outputIndex;
 		},
 		branches(): ITab[] {
-			function capitalize(name: string) {
-				return name.charAt(0).toLocaleUpperCase() + name.slice(1);
-			}
+			const capitalize = (name: string) => name.charAt(0).toLocaleUpperCase() + name.slice(1);
+
 			const branches: ITab[] = [];
 
 			for (let i = 0; i <= this.maxOutputIndex; i++) {
 				if (this.overrideOutputs && !this.overrideOutputs.includes(i)) {
 					continue;
 				}
+				const totalItemsCount = this.getRawInputData(this.runIndex, i).length;
 				const itemsCount = this.getDataCount(this.runIndex, i);
-				const items = this.$locale.baseText('ndv.output.items', { adjustToNumber: itemsCount });
+				const items = this.search
+					? this.$locale.baseText('ndv.search.items', {
+							adjustToNumber: totalItemsCount,
+							interpolate: { matched: itemsCount, total: totalItemsCount },
+						})
+					: this.$locale.baseText('ndv.output.items', {
+							adjustToNumber: itemsCount,
+							interpolate: { count: itemsCount },
+						});
 				let outputName = this.getOutputName(i);
+
 				if (`${outputName}` === `${i}`) {
 					outputName = `${this.$locale.baseText('ndv.output')} ${outputName}`;
 				} else {
@@ -861,7 +959,10 @@ export default mixins(externalHooks, genericHelpers, nodeHelpers, pinData).exten
 					outputName = capitalize(`${this.getOutputName(i)}${appendBranchWord}`);
 				}
 				branches.push({
-					label: itemsCount ? `${outputName} (${itemsCount} ${items})` : outputName,
+					label:
+						(this.search && itemsCount) || totalItemsCount
+							? `${outputName} (${items})`
+							: outputName,
 					value: i,
 				});
 			}
@@ -878,8 +979,110 @@ export default mixins(externalHooks, genericHelpers, nodeHelpers, pinData).exten
 		isPaneTypeOutput(): boolean {
 			return this.paneType === 'output';
 		},
+		readOnlyEnv(): boolean {
+			return this.sourceControlStore.preferences.branchReadOnly;
+		},
+		showIOSearch(): boolean {
+			return this.hasNodeRun && !this.hasRunError;
+		},
+		showIoSearchNoMatchContent(): boolean {
+			return this.hasNodeRun && !this.inputData.length && this.search;
+		},
+	},
+	watch: {
+		node(newNode: INodeUi, prevNode: INodeUi) {
+			if (newNode.id === prevNode.id) return;
+			this.init();
+		},
+		hasNodeRun() {
+			if (this.paneType === 'output') this.setDisplayMode();
+		},
+		inputDataPage: {
+			handler(data: INodeExecutionData[]) {
+				if (this.paneType && data) {
+					this.ndvStore.setNDVPanelDataIsEmpty({
+						panel: this.paneType as 'input' | 'output',
+						isEmpty: data.every((item) => isEmpty(item.json)),
+					});
+				}
+			},
+			immediate: true,
+			deep: true,
+		},
+		jsonData(data: IDataObject[], prevData: IDataObject[]) {
+			if (isEqual(data, prevData)) return;
+			this.refreshDataSize();
+			this.showPinDataDiscoveryTooltip(data);
+		},
+		binaryData(newData: IBinaryKeyData[], prevData: IBinaryKeyData[]) {
+			if (newData.length && !prevData.length && this.displayMode !== 'binary') {
+				this.switchToBinary();
+			} else if (!newData.length && this.displayMode === 'binary') {
+				this.onDisplayModeChange('table');
+			}
+		},
+		currentOutputIndex(branchIndex: number) {
+			this.ndvStore.setNDVBranchIndex({
+				pane: this.paneType as 'input' | 'output',
+				branchIndex,
+			});
+		},
+		search(newSearch: string) {
+			this.$emit('search', newSearch);
+		},
+	},
+	mounted() {
+		this.init();
+
+		if (!this.isPaneTypeInput) {
+			this.showPinDataDiscoveryTooltip(this.jsonData);
+		}
+		this.ndvStore.setNDVBranchIndex({
+			pane: this.paneType as 'input' | 'output',
+			branchIndex: this.currentOutputIndex,
+		});
+
+		if (this.paneType === 'output') {
+			this.setDisplayMode();
+			this.activatePane();
+		}
+
+		if (this.hasRunError) {
+			const error = this.workflowRunData?.[this.node.name]?.[this.runIndex]?.error;
+			const errorsToTrack = ['unknown error'];
+
+			if (error && errorsToTrack.some((e) => error.message.toLowerCase().includes(e))) {
+				this.$telemetry.track(
+					`User encountered an error: "${error.message}"`,
+					{
+						node: this.node.type,
+						errorMessage: error.message,
+						nodeVersion: this.node.typeVersion,
+						n8nVersion: this.rootStore.versionCli,
+					},
+					{
+						withPostHog: true,
+					},
+				);
+			}
+		}
+	},
+	beforeUnmount() {
+		this.hidePinDataDiscoveryTooltip();
 	},
 	methods: {
+		getResolvedNodeOutputs() {
+			if (this.node && this.nodeType) {
+				const workflow = this.workflowsStore.getCurrentWorkflow();
+				const workflowNode = workflow.getNode(this.node.name);
+
+				if (workflowNode) {
+					const outputs = NodeHelpers.getNodeOutputs(workflow, workflowNode, this.nodeType);
+					return outputs;
+				}
+			}
+			return [];
+		},
 		onItemHover(itemIndex: number | null) {
 			if (itemIndex === null) {
 				this.$emit('itemHover', null);
@@ -894,7 +1097,7 @@ export default mixins(externalHooks, genericHelpers, nodeHelpers, pinData).exten
 		onClickDataPinningDocsLink() {
 			this.$telemetry.track('User clicked ndv link', {
 				workflow_id: this.workflowsStore.workflowId,
-				session_id: this.sessionId,
+				push_ref: this.pushRef,
 				node_type: this.activeNode?.type,
 				pane: 'output',
 				type: 'data-pinning-docs',
@@ -905,12 +1108,9 @@ export default mixins(externalHooks, genericHelpers, nodeHelpers, pinData).exten
 				return;
 			}
 
-			if (
-				value &&
-				value.length > 0 &&
-				!this.isReadOnly &&
-				!localStorage.getItem(LOCAL_STORAGE_PIN_DATA_DISCOVERY_NDV_FLAG)
-			) {
+			const pinDataDiscoveryFlag = useStorage(LOCAL_STORAGE_PIN_DATA_DISCOVERY_NDV_FLAG).value;
+
+			if (value && value.length > 0 && !this.isReadOnlyRoute && !pinDataDiscoveryFlag) {
 				this.pinDataDiscoveryComplete();
 
 				setTimeout(() => {
@@ -928,12 +1128,12 @@ export default mixins(externalHooks, genericHelpers, nodeHelpers, pinData).exten
 			}
 		},
 		pinDataDiscoveryComplete() {
-			localStorage.setItem(LOCAL_STORAGE_PIN_DATA_DISCOVERY_NDV_FLAG, 'true');
-			localStorage.setItem(LOCAL_STORAGE_PIN_DATA_DISCOVERY_CANVAS_FLAG, 'true');
+			useStorage(LOCAL_STORAGE_PIN_DATA_DISCOVERY_NDV_FLAG).value = 'true';
+			useStorage(LOCAL_STORAGE_PIN_DATA_DISCOVERY_CANVAS_FLAG).value = 'true';
 		},
 		enterEditMode({ origin }: EnterEditModeArgs) {
-			const inputData = this.pinData
-				? clearJsonKey(this.pinData)
+			const inputData = this.pinnedData.data.value
+				? clearJsonKey(this.pinnedData.data.value)
 				: executionDataToJson(this.rawInputData);
 
 			const data = inputData.length > 0 ? inputData : TEST_PIN_DATA;
@@ -944,11 +1144,11 @@ export default mixins(externalHooks, genericHelpers, nodeHelpers, pinData).exten
 			this.$telemetry.track('User opened ndv edit state', {
 				node_type: this.activeNode?.type,
 				click_type: origin === 'editIconButton' ? 'button' : 'link',
-				session_id: this.sessionId,
+				push_ref: this.pushRef,
 				run_index: this.runIndex,
-				is_output_present: this.hasNodeRun || this.hasPinData,
-				view: !this.hasNodeRun && !this.hasPinData ? 'undefined' : this.displayMode,
-				is_data_pinned: this.hasPinData,
+				is_output_present: this.hasNodeRun || this.pinnedData.hasData.value,
+				view: !this.hasNodeRun && !this.pinnedData.hasData.value ? 'undefined' : this.displayMode,
+				is_data_pinned: this.pinnedData.hasData.value,
 			});
 		},
 		onClickCancelEdit() {
@@ -957,119 +1157,67 @@ export default mixins(externalHooks, genericHelpers, nodeHelpers, pinData).exten
 			this.onExitEditMode({ type: 'cancel' });
 		},
 		onClickSaveEdit() {
+			if (!this.node) {
+				return;
+			}
+
 			const { value } = this.editMode;
 
 			this.clearAllStickyNotifications();
 
-			if (!this.isValidPinDataSize(value)) {
-				this.onDataPinningError({ errorType: 'data-too-large', source: 'save-edit' });
-				return;
-			}
-
-			if (!this.isValidPinDataJSON(value)) {
-				this.onDataPinningError({ errorType: 'invalid-json', source: 'save-edit' });
+			try {
+				this.pinnedData.setData(clearJsonKey(value) as INodeExecutionData[], 'save-edit');
+			} catch (error) {
+				console.error(error);
 				return;
 			}
 
 			this.ndvStore.setOutputPanelEditModeEnabled(false);
-			this.workflowsStore.pinData({
-				node: this.node,
-				data: clearJsonKey(value) as INodeExecutionData[],
-			});
-
-			this.onDataPinningSuccess({ source: 'save-edit' });
 
 			this.onExitEditMode({ type: 'save' });
 		},
 		onExitEditMode({ type }: { type: 'save' | 'cancel' }) {
 			this.$telemetry.track('User closed ndv edit state', {
 				node_type: this.activeNode?.type,
-				session_id: this.sessionId,
+				push_ref: this.pushRef,
 				run_index: this.runIndex,
 				view: this.displayMode,
 				type,
 			});
 		},
-		onDataUnpinning({
-			source,
-		}: {
-			source: 'banner-link' | 'pin-icon-click' | 'unpin-and-execute-modal';
-		}) {
-			this.$telemetry.track('User unpinned ndv data', {
-				node_type: this.activeNode?.type,
-				session_id: this.sessionId,
-				run_index: this.runIndex,
-				source,
-				data_size: stringSizeInBytes(this.pinData),
-			});
-		},
-		onDataPinningSuccess({ source }: { source: 'pin-icon-click' | 'save-edit' }) {
-			const telemetryPayload = {
-				pinning_source: source,
-				node_type: this.activeNode.type,
-				session_id: this.sessionId,
-				data_size: stringSizeInBytes(this.pinData),
-				view: this.displayMode,
-				run_index: this.runIndex,
-			};
-			this.$externalHooks().run('runData.onDataPinningSuccess', telemetryPayload);
-			this.$telemetry.track('Ndv data pinning success', telemetryPayload);
-		},
-		onDataPinningError({
-			errorType,
-			source,
-		}: {
-			errorType: 'data-too-large' | 'invalid-json';
-			source: 'on-ndv-close-modal' | 'pin-icon-click' | 'save-edit';
-		}) {
-			this.$telemetry.track('Ndv data pinning failure', {
-				pinning_source: source,
-				node_type: this.activeNode.type,
-				session_id: this.sessionId,
-				data_size: stringSizeInBytes(this.pinData),
-				view: this.displayMode,
-				run_index: this.runIndex,
-				error_type: errorType,
-			});
-		},
-		async onTogglePinData({
-			source,
-		}: {
-			source: 'banner-link' | 'pin-icon-click' | 'unpin-and-execute-modal';
-		}) {
+		async onTogglePinData({ source }: { source: PinDataSource }) {
+			if (!this.node) {
+				return;
+			}
+
 			if (source === 'pin-icon-click') {
 				const telemetryPayload = {
 					node_type: this.activeNode.type,
-					session_id: this.sessionId,
+					push_ref: this.pushRef,
 					run_index: this.runIndex,
-					view: !this.hasNodeRun && !this.hasPinData ? 'none' : this.displayMode,
+					view: !this.hasNodeRun && !this.pinnedData.hasData.value ? 'none' : this.displayMode,
 				};
 
-				this.$externalHooks().run('runData.onTogglePinData', telemetryPayload);
+				void this.externalHooks.run('runData.onTogglePinData', telemetryPayload);
 				this.$telemetry.track('User clicked pin data icon', telemetryPayload);
 			}
 
-			this.updateNodeParameterIssues(this.node);
+			this.nodeHelpers.updateNodeParameterIssues(this.node);
 
-			if (this.hasPinData) {
-				this.onDataUnpinning({ source });
-				this.workflowsStore.unpinData({ node: this.node });
+			if (this.pinnedData.hasData.value) {
+				this.pinnedData.unsetData(source);
 				return;
 			}
 
-			const data = executionDataToJson(this.rawInputData) as INodeExecutionData[];
-
-			if (!this.isValidPinDataSize(data)) {
-				this.onDataPinningError({ errorType: 'data-too-large', source: 'pin-icon-click' });
+			try {
+				this.pinnedData.setData(this.rawInputData, 'pin-icon-click');
+			} catch (error) {
+				console.error(error);
 				return;
 			}
 
-			this.onDataPinningSuccess({ source: 'pin-icon-click' });
-
-			this.workflowsStore.pinData({ node: this.node, data });
-
 			if (this.maxRunIndex > 0) {
-				this.$showToast({
+				this.showToast({
 					title: this.$locale.baseText('ndv.pinData.pin.multipleRuns.title', {
 						interpolate: {
 							index: `${this.runIndex}`,
@@ -1091,7 +1239,7 @@ export default mixins(externalHooks, genericHelpers, nodeHelpers, pinData).exten
 			this.outputIndex = value;
 
 			this.$telemetry.track('User changed ndv branch', {
-				session_id: this.sessionId,
+				push_ref: this.pushRef,
 				branch_index: value,
 				node_type: this.activeNode.type,
 				node_type_input_selection: this.nodeType ? this.nodeType.name : '',
@@ -1103,22 +1251,26 @@ export default mixins(externalHooks, genericHelpers, nodeHelpers, pinData).exten
 			this.$telemetry.track('User clicked ndv button', {
 				node_type: this.activeNode.type,
 				workflow_id: this.workflowsStore.workflowId,
-				session_id: this.sessionId,
+				push_ref: this.pushRef,
 				pane: this.paneType,
 				type: 'showTooMuchData',
 			});
 		},
+		toggleLinkRuns() {
+			this.linkedRuns ? this.unlinkRun() : this.linkRun();
+		},
 		linkRun() {
 			this.$emit('linkRun');
 		},
 		unlinkRun() {
 			this.$emit('unlinkRun');
 		},
-		onCurrentPageChange() {
+		onCurrentPageChange(value) {
+			this.currentPage = value;
 			this.$telemetry.track('User changed ndv page', {
 				node_type: this.activeNode?.type,
 				workflow_id: this.workflowsStore.workflowId,
-				session_id: this.sessionId,
+				push_ref: this.pushRef,
 				pane: this.paneType,
 				page_selected: this.currentPage,
 				page_size: this.pageSize,
@@ -1135,7 +1287,7 @@ export default mixins(externalHooks, genericHelpers, nodeHelpers, pinData).exten
 			this.$telemetry.track('User changed ndv page size', {
 				node_type: this.activeNode?.type,
 				workflow_id: this.workflowsStore.workflowId,
-				session_id: this.sessionId,
+				push_ref: this.pushRef,
 				pane: this.paneType,
 				page_selected: this.currentPage,
 				page_size: this.pageSize,
@@ -1156,7 +1308,7 @@ export default mixins(externalHooks, genericHelpers, nodeHelpers, pinData).exten
 			}
 
 			this.closeBinaryDataDisplay();
-			this.$externalHooks().run('runData.displayModeChanged', {
+			void this.externalHooks.run('runData.displayModeChanged', {
 				newValue: displayMode,
 				oldValue: previous,
 			});
@@ -1166,7 +1318,7 @@ export default mixins(externalHooks, genericHelpers, nodeHelpers, pinData).exten
 					new_view: displayMode,
 					node_type: this.activeNode.type,
 					workflow_id: this.workflowsStore.workflowId,
-					session_id: this.sessionId,
+					push_ref: this.pushRef,
 					pane: this.paneType,
 				});
 			}
@@ -1174,51 +1326,88 @@ export default mixins(externalHooks, genericHelpers, nodeHelpers, pinData).exten
 		getRunLabel(option: number) {
 			let itemsCount = 0;
 			for (let i = 0; i <= this.maxOutputIndex; i++) {
-				itemsCount += this.getDataCount(option - 1, i);
+				itemsCount += this.getPinDataOrLiveData(this.getRawInputData(option - 1, i)).length;
 			}
-			const items = this.$locale.baseText('ndv.output.items', { adjustToNumber: itemsCount });
-			const itemsLabel = itemsCount > 0 ? ` (${itemsCount} ${items})` : '';
+			const items = this.$locale.baseText('ndv.output.items', {
+				adjustToNumber: itemsCount,
+				interpolate: { count: itemsCount },
+			});
+			const itemsLabel = itemsCount > 0 ? ` (${items})` : '';
 			return option + this.$locale.baseText('ndv.output.of') + (this.maxRunIndex + 1) + itemsLabel;
 		},
-		getDataCount(runIndex: number, outputIndex: number) {
-			if (this.pinData) {
-				return this.pinData.length;
-			}
+		getRawInputData(
+			runIndex: number,
+			outputIndex: number,
+			connectionType: ConnectionTypes = NodeConnectionType.Main,
+		): INodeExecutionData[] {
+			let inputData: INodeExecutionData[] = [];
 
-			if (this.node === null) {
-				return 0;
+			if (this.node) {
+				inputData = this.nodeHelpers.getNodeInputData(
+					this.node,
+					runIndex,
+					outputIndex,
+					this.paneType,
+					connectionType,
+				);
 			}
 
-			const runData: IRunData | null = this.workflowRunData;
-
-			if (runData === null || !runData.hasOwnProperty(this.node.name)) {
-				return 0;
+			if (inputData.length === 0 || !Array.isArray(inputData)) {
+				return [];
 			}
 
-			if (runData[this.node.name].length <= runIndex) {
-				return 0;
+			return inputData;
+		},
+		getPinDataOrLiveData(inputData: INodeExecutionData[]): INodeExecutionData[] {
+			if (this.pinnedData.data.value && !this.isProductionExecutionPreview) {
+				return Array.isArray(this.pinnedData.data.value)
+					? this.pinnedData.data.value.map((value) => ({
+							json: value,
+						}))
+					: [
+							{
+								json: this.pinnedData.data.value,
+							},
+						];
 			}
-
-			if (runData[this.node.name][runIndex].hasOwnProperty('error')) {
-				return 1;
+			return inputData;
+		},
+		getFilteredData(inputData: INodeExecutionData[]): INodeExecutionData[] {
+			if (!this.search) {
+				return inputData;
 			}
 
-			if (
-				!runData[this.node.name][runIndex].hasOwnProperty('data') ||
-				runData[this.node.name][runIndex].data === undefined
-			) {
+			this.currentPage = 1;
+			return inputData.filter(({ json }) => searchInObject(json, this.search));
+		},
+		getDataCount(
+			runIndex: number,
+			outputIndex: number,
+			connectionType: ConnectionTypes = NodeConnectionType.Main,
+		) {
+			if (!this.node) {
 				return 0;
 			}
 
-			const inputData = this.getMainInputData(runData[this.node.name][runIndex].data!, outputIndex);
+			if (this.workflowRunData?.[this.node.name]?.[runIndex]?.hasOwnProperty('error')) {
+				return 1;
+			}
 
-			return inputData.length;
+			const rawInputData = this.getRawInputData(runIndex, outputIndex, connectionType);
+			const pinOrLiveData = this.getPinDataOrLiveData(rawInputData);
+			return this.getFilteredData(pinOrLiveData).length;
 		},
 		init() {
 			// Reset the selected output index every time another node gets selected
 			this.outputIndex = 0;
 			this.refreshDataSize();
 			this.closeBinaryDataDisplay();
+			let outputTypes: ConnectionTypes[] = [];
+			if (this.nodeType !== null && this.node !== null) {
+				const outputs = this.getResolvedNodeOutputs();
+				outputTypes = NodeHelpers.getConnectionTypes(outputs);
+			}
+			this.connectionType = outputTypes.length === 0 ? NodeConnectionType.Main : outputTypes[0];
 			if (this.binaryData.length > 0) {
 				this.ndvStore.setPanelDisplayMode({
 					pane: this.paneType as 'input' | 'output',
@@ -1237,11 +1426,13 @@ export default mixins(externalHooks, genericHelpers, nodeHelpers, pinData).exten
 		},
 		clearExecutionData() {
 			this.workflowsStore.setWorkflowExecutionData(null);
-			this.updateNodesExecutionIssues();
+			this.nodeHelpers.updateNodesExecutionIssues();
 		},
 		isViewable(index: number, key: string): boolean {
 			const { fileType } = this.binaryData[index][key];
-			return !!fileType && ['image', 'video', 'text', 'json'].includes(fileType);
+			return (
+				!!fileType && ['image', 'audio', 'video', 'text', 'json', 'pdf', 'html'].includes(fileType)
+			);
 		},
 		isDownloadable(index: number, key: string): boolean {
 			const { mimeType, fileName } = this.binaryData[index][key];
@@ -1256,15 +1447,23 @@ export default mixins(externalHooks, genericHelpers, nodeHelpers, pinData).exten
 				return;
 			} else {
 				const bufferString = 'data:' + mimeType + ';base64,' + data;
-				const blob = await fetch(bufferString).then((d) => d.blob());
+				const blob = await fetch(bufferString).then(async (d) => await d.blob());
 				saveAs(blob, fileName);
 			}
 		},
+		async downloadJsonData() {
+			const fileName = this.node.name.replace(/[^\w\d]/g, '_');
+			const blob = new Blob([JSON.stringify(this.rawInputData, null, 2)], {
+				type: 'application/json',
+			});
+
+			saveAs(blob, `${fileName}.json`);
+		},
 		displayBinaryData(index: number, key: string) {
 			this.binaryDataDisplayVisible = true;
 
 			this.binaryDataDisplayData = {
-				node: this.node!.name,
+				node: this.node.name,
 				runIndex: this.runIndex,
 				outputIndex: this.currentOutputIndex,
 				index,
@@ -1277,7 +1476,13 @@ export default mixins(externalHooks, genericHelpers, nodeHelpers, pinData).exten
 			}
 
 			const nodeType = this.nodeType;
-			if (!nodeType || !nodeType.outputNames || nodeType.outputNames.length <= outputIndex) {
+			const outputs = this.getResolvedNodeOutputs();
+			const outputConfiguration = outputs?.[outputIndex] as INodeOutputConfiguration;
+
+			if (outputConfiguration && isObject(outputConfiguration)) {
+				return outputConfiguration?.displayName;
+			}
+			if (!nodeType?.outputNames || nodeType.outputNames.length <= outputIndex) {
 				return outputIndex + 1;
 			}
 
@@ -1286,15 +1491,8 @@ export default mixins(externalHooks, genericHelpers, nodeHelpers, pinData).exten
 		refreshDataSize() {
 			// Hide by default the data from being displayed
 			this.showData = false;
-
-			// Check how much data there is to display
-			const inputData = this.getNodeInputData(this.node, this.runIndex, this.currentOutputIndex);
-
-			const offset = this.pageSize * (this.currentPage - 1);
-			const jsonItems = inputData.slice(offset, offset + this.pageSize).map((item) => item.json);
-
+			const jsonItems = this.inputDataPage.map((item) => item.json);
 			this.dataSize = JSON.stringify(jsonItems).length;
-
 			if (this.dataSize < this.MAX_DISPLAY_DATA_SIZE) {
 				// Data is reasonable small (< 200kb) so display it directly
 				this.showData = true;
@@ -1329,42 +1527,12 @@ export default mixins(externalHooks, genericHelpers, nodeHelpers, pinData).exten
 				});
 			}
 		},
-	},
-	watch: {
-		node() {
-			this.init();
-		},
-		hasNodeRun() {
-			if (this.paneType === 'output') this.setDisplayMode();
-		},
-		inputData: {
-			handler(data: INodeExecutionData[]) {
-				if (this.paneType && data) {
-					this.ndvStore.setNDVPanelDataIsEmpty({
-						panel: this.paneType as 'input' | 'output',
-						isEmpty: data.every((item) => isEmpty(item.json)),
-					});
-				}
-			},
-			immediate: true,
-			deep: true,
-		},
-		jsonData(value: IDataObject[]) {
-			this.refreshDataSize();
-			this.showPinDataDiscoveryTooltip(value);
+		activatePane() {
+			this.$emit('activatePane');
 		},
-		binaryData(newData: IBinaryKeyData[], prevData: IBinaryKeyData[]) {
-			if (newData.length && !prevData.length && this.displayMode !== 'binary') {
-				this.switchToBinary();
-			} else if (!newData.length && this.displayMode === 'binary') {
-				this.onDisplayModeChange('table');
-			}
-		},
-		currentOutputIndex(branchIndex: number) {
-			this.ndvStore.setNDVBranchIndex({
-				pane: this.paneType as 'input' | 'output',
-				branchIndex,
-			});
+		onSearchClear() {
+			this.search = '';
+			document.dispatchEvent(new KeyboardEvent('keyup', { key: '/' }));
 		},
 	},
 });
@@ -1394,7 +1562,7 @@ export default mixins(externalHooks, genericHelpers, nodeHelpers, pinData).exten
 	position: relative;
 	width: 100%;
 	height: 100%;
-	background-color: var(--color-background-base);
+	background-color: var(--color-run-data-background);
 	display: flex;
 	flex-direction: column;
 }
@@ -1424,6 +1592,7 @@ export default mixins(externalHooks, genericHelpers, nodeHelpers, pinData).exten
 
 .dataContainer {
 	position: relative;
+	overflow-y: auto;
 	height: 100%;
 
 	&:hover {
@@ -1446,24 +1615,32 @@ export default mixins(externalHooks, genericHelpers, nodeHelpers, pinData).exten
 }
 
 .tabs {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
 	margin-bottom: var(--spacing-s);
 }
 
 .itemsCount {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
 	margin-left: var(--spacing-s);
 	margin-bottom: var(--spacing-s);
 }
 
 .runSelector {
-	max-width: 210px;
-	margin-left: var(--spacing-s);
-	margin-bottom: var(--spacing-s);
+	padding-left: var(--spacing-s);
+	padding-bottom: var(--spacing-s);
 	display: flex;
+	width: 100%;
 	align-items: center;
+	justify-content: space-between;
+}
 
-	> * {
-		margin-right: var(--spacing-4xs);
-	}
+.runSelectorWrapper {
+	display: flex;
+	align-items: center;
 }
 
 .pagination {
@@ -1473,7 +1650,7 @@ export default mixins(externalHooks, genericHelpers, nodeHelpers, pinData).exten
 	align-items: center;
 	bottom: 0;
 	padding: 5px;
-	overflow: auto;
+	overflow-y: hidden;
 }
 
 .pageSizeSelector {
@@ -1552,12 +1729,6 @@ export default mixins(externalHooks, genericHelpers, nodeHelpers, pinData).exten
 	max-width: 240px;
 }
 
-.pinDataButton {
-	svg {
-		transition: transform 0.3s ease;
-	}
-}
-
 .spinner {
 	* {
 		color: var(--color-primary);
@@ -1571,28 +1742,29 @@ export default mixins(externalHooks, genericHelpers, nodeHelpers, pinData).exten
 }
 
 .editMode {
-	height: calc(100% - var(--spacing-s));
+	height: 100%;
 	display: flex;
 	flex-direction: column;
-	justify-content: flex-end;
-	align-items: flex-end;
+	justify-content: stretch;
 	padding-left: var(--spacing-s);
 	padding-right: var(--spacing-s);
 }
 
 .editModeBody {
 	flex: 1 1 auto;
+	max-height: 100%;
 	width: 100%;
-	height: 100%;
-	overflow: hidden;
+	overflow: auto;
 }
 
 .editModeFooter {
+	flex: 0 1 auto;
 	display: flex;
 	width: 100%;
 	justify-content: space-between;
 	align-items: center;
 	padding-top: var(--spacing-s);
+	padding-bottom: var(--spacing-s);
 }
 
 .editModeFooterInfotip {
@@ -1617,3 +1789,22 @@ export default mixins(externalHooks, genericHelpers, nodeHelpers, pinData).exten
 	border-bottom-left-radius: 0;
 }
 </style>
+
+<style lang="scss" scoped>
+.run-data {
+	.code-node-editor {
+		height: 100%;
+	}
+}
+</style>
+
+<style lang="scss" scoped>
+:deep(.highlight) {
+	background-color: #f7dc55;
+	color: black;
+	border-radius: var(--border-radius-base);
+	padding: 0 1px;
+	font-weight: normal;
+	font-style: normal;
+}
+</style>
diff --git a/packages/editor-ui/src/components/RunDataAi/AiRunContentBlock.vue b/packages/editor-ui/src/components/RunDataAi/AiRunContentBlock.vue
new file mode 100644
index 0000000000000..3e2bb2da36fc0
--- /dev/null
+++ b/packages/editor-ui/src/components/RunDataAi/AiRunContentBlock.vue
@@ -0,0 +1,269 @@
+<template>
+	<div :class="$style.block">
+		<header :class="$style.blockHeader" @click="onBlockHeaderClick">
+			<button :class="$style.blockToggle">
+				<font-awesome-icon :icon="isExpanded ? 'angle-down' : 'angle-up'" size="lg" />
+			</button>
+			<p :class="$style.blockTitle">{{ capitalize(runData.inOut) }}</p>
+			<!-- @click.stop to prevent event from bubbling to blockHeader and toggling expanded state when clicking on rawSwitch -->
+			<el-switch
+				v-if="contentParsed"
+				v-model="isShowRaw"
+				:class="$style.rawSwitch"
+				active-text="RAW JSON"
+				@click.stop
+			/>
+		</header>
+		<main
+			:class="{
+				[$style.blockContent]: true,
+				[$style.blockContentExpanded]: isExpanded,
+			}"
+		>
+			<div
+				v-for="({ parsedContent, raw }, index) in parsedRun"
+				:key="index"
+				:class="$style.contentText"
+				:data-content-type="parsedContent?.type"
+			>
+				<template v-if="parsedContent && !isShowRaw">
+					<template v-if="parsedContent.type === 'json'">
+						<VueMarkdown
+							:source="jsonToMarkdown(parsedContent.data as JsonMarkdown)"
+							:class="$style.markdown"
+						/>
+					</template>
+					<template v-if="parsedContent.type === 'markdown'">
+						<VueMarkdown :source="parsedContent.data" :class="$style.markdown" />
+					</template>
+					<p
+						v-if="parsedContent.type === 'text'"
+						:class="$style.runText"
+						v-text="parsedContent.data"
+					/>
+				</template>
+				<!-- We weren't able to parse text or raw switch -->
+				<template v-else>
+					<div :class="$style.rawContent">
+						<n8n-icon-button
+							size="small"
+							:class="$style.copyToClipboard"
+							type="secondary"
+							:title="$locale.baseText('nodeErrorView.copyToClipboard')"
+							icon="copy"
+							@click="onCopyToClipboard(raw)"
+						/>
+						<VueMarkdown :source="jsonToMarkdown(raw as JsonMarkdown)" :class="$style.markdown" />
+					</div>
+				</template>
+			</div>
+		</main>
+	</div>
+</template>
+
+<script lang="ts" setup>
+import type { IAiDataContent } from '@/Interface';
+import { capitalize } from 'lodash-es';
+import { ref, onMounted } from 'vue';
+import type { ParsedAiContent } from './useAiContentParsers';
+import { useAiContentParsers } from './useAiContentParsers';
+import VueMarkdown from 'vue-markdown-render';
+import { useClipboard } from '@/composables/useClipboard';
+import { useI18n } from '@/composables/useI18n';
+import { useToast } from '@/composables/useToast';
+import { NodeConnectionType, type IDataObject } from 'n8n-workflow';
+
+const props = defineProps<{
+	runData: IAiDataContent;
+}>();
+
+const i18n = useI18n();
+const clipboard = useClipboard();
+const { showMessage } = useToast();
+const contentParsers = useAiContentParsers();
+
+// eslint-disable-next-line @typescript-eslint/no-use-before-define
+const isExpanded = ref(getInitialExpandedState());
+const isShowRaw = ref(false);
+const contentParsed = ref(false);
+const parsedRun = ref(undefined as ParsedAiContent | undefined);
+function getInitialExpandedState() {
+	const collapsedTypes = {
+		input: [NodeConnectionType.AiDocument, NodeConnectionType.AiTextSplitter],
+		output: [
+			NodeConnectionType.AiDocument,
+			NodeConnectionType.AiEmbedding,
+			NodeConnectionType.AiTextSplitter,
+			NodeConnectionType.AiVectorStore,
+		],
+	};
+
+	return !collapsedTypes[props.runData.inOut].includes(props.runData.type);
+}
+
+function parseAiRunData(run: IAiDataContent) {
+	if (!run.data) {
+		return;
+	}
+	const parsedData = contentParsers.parseAiRunData(run.data, run.type);
+
+	return parsedData;
+}
+
+function isMarkdown(content: JsonMarkdown): boolean {
+	if (typeof content !== 'string') return false;
+	const markdownPatterns = [
+		/^# .+/gm, // headers
+		/\*{1,2}.+\*{1,2}/g, // emphasis and strong
+		/\[.+\]\(.+\)/g, // links
+		/```[\s\S]+```/g, // code blocks
+	];
+
+	return markdownPatterns.some((pattern) => pattern.test(content));
+}
+
+function formatToJsonMarkdown(data: string): string {
+	return '```json\n' + data + '\n```';
+}
+
+type JsonMarkdown = string | object | Array<string | object>;
+
+function jsonToMarkdown(data: JsonMarkdown): string {
+	if (isMarkdown(data)) return data as string;
+
+	if (Array.isArray(data) && data.length && typeof data[0] !== 'number') {
+		const markdownArray = data.map((item: JsonMarkdown) => jsonToMarkdown(item));
+
+		return markdownArray.join('\n\n').trim();
+	}
+
+	if (typeof data === 'string') {
+		return formatToJsonMarkdown(data);
+	}
+
+	return formatToJsonMarkdown(JSON.stringify(data, null, 2));
+}
+
+function setContentParsed(content: ParsedAiContent): void {
+	contentParsed.value = !!content.find((item) => {
+		if (item.parsedContent?.parsed === true) {
+			return true;
+		}
+		return false;
+	});
+}
+
+function onBlockHeaderClick() {
+	isExpanded.value = !isExpanded.value;
+}
+
+function onCopyToClipboard(content: IDataObject | IDataObject[]) {
+	try {
+		void clipboard.copy(JSON.stringify(content, undefined, 2));
+		showMessage({
+			title: i18n.baseText('generic.copiedToClipboard'),
+			type: 'success',
+		});
+	} catch (err) {}
+}
+
+onMounted(() => {
+	parsedRun.value = parseAiRunData(props.runData);
+	if (parsedRun.value) {
+		setContentParsed(parsedRun.value);
+	}
+});
+</script>
+
+<style lang="scss" module>
+.copyToClipboard {
+	position: absolute;
+	right: var(--spacing-s);
+	top: var(--spacing-s);
+}
+.rawContent {
+	position: relative;
+}
+.markdown {
+	& {
+		white-space: pre-wrap;
+
+		h1 {
+			font-size: var(--font-size-xl);
+			line-height: var(--font-line-height-xloose);
+		}
+
+		h2 {
+			font-size: var(--font-size-l);
+			line-height: var(--font-line-height-loose);
+		}
+
+		h3 {
+			font-size: var(--font-size-m);
+			line-height: var(--font-line-height-regular);
+		}
+
+		pre {
+			background-color: var(--color-foreground-light);
+			border-radius: var(--border-radius-base);
+			line-height: var(--font-line-height-xloose);
+			padding: var(--spacing-s);
+			font-size: var(--font-size-s);
+			white-space: pre-wrap;
+		}
+	}
+}
+.contentText {
+	padding-top: var(--spacing-s);
+	font-size: var(--font-size-xs);
+	// max-height: 100%;
+}
+.block {
+	border: 1px solid var(--color-foreground-base);
+	background: var(--color-background-xlight);
+	padding: var(--spacing-xs);
+	border-radius: 4px;
+	margin-bottom: var(--spacing-2xs);
+}
+.blockContent {
+	height: 0;
+	overflow: hidden;
+
+	&.blockContentExpanded {
+		height: auto;
+	}
+}
+.runText {
+	line-height: var(--font-line-height-regular);
+	white-space: pre-line;
+}
+.rawSwitch {
+	margin-left: auto;
+
+	& * {
+		font-size: var(--font-size-2xs);
+	}
+}
+.blockHeader {
+	display: flex;
+	gap: var(--spacing-xs);
+	cursor: pointer;
+	/* This hack is needed to make the whole surface of header clickable  */
+	margin: calc(-1 * var(--spacing-xs));
+	padding: var(--spacing-xs);
+
+	& * {
+		user-select: none;
+	}
+}
+.blockTitle {
+	font-size: var(--font-size-2xs);
+	color: var(--color-text-dark);
+}
+.blockToggle {
+	border: none;
+	background: none;
+	padding: 0;
+	color: var(--color-text-base);
+}
+</style>
diff --git a/packages/editor-ui/src/components/RunDataAi/RunDataAi.vue b/packages/editor-ui/src/components/RunDataAi/RunDataAi.vue
new file mode 100644
index 0000000000000..9731ef4a9abcc
--- /dev/null
+++ b/packages/editor-ui/src/components/RunDataAi/RunDataAi.vue
@@ -0,0 +1,366 @@
+<template>
+	<div v-if="aiData" :class="$style.container">
+		<div :class="{ [$style.tree]: true, [$style.slim]: slim }">
+			<ElTree
+				:data="executionTree"
+				:props="{ label: 'node' }"
+				default-expand-all
+				:indent="12"
+				:expand-on-click-node="false"
+				data-test-id="lm-chat-logs-tree"
+				@node-click="onItemClick"
+			>
+				<template #default="{ node, data }">
+					<div
+						:class="{
+							[$style.treeNode]: true,
+							[$style.isSelected]: isTreeNodeSelected(data),
+						}"
+						:data-tree-depth="data.depth"
+						:style="{ '--item-depth': data.depth }"
+					>
+						<button
+							v-if="data.children.length"
+							:class="$style.treeToggle"
+							@click="toggleTreeItem(node)"
+						>
+							<font-awesome-icon :icon="node.expanded ? 'angle-down' : 'angle-up'" />
+						</button>
+						<n8n-tooltip :disabled="!slim" placement="right">
+							<template #content>
+								{{ node.label }}
+							</template>
+							<span :class="$style.leafLabel">
+								<NodeIcon :node-type="getNodeType(data.node)!" :size="17" />
+								<span v-if="!slim" v-text="node.label" />
+							</span>
+						</n8n-tooltip>
+					</div>
+				</template>
+			</ElTree>
+		</div>
+		<div :class="$style.runData">
+			<div v-if="selectedRun.length === 0" :class="$style.empty">
+				<n8n-text size="large">
+					{{
+						$locale.baseText('ndv.output.ai.empty', {
+							interpolate: {
+								node: props.node.name,
+							},
+						})
+					}}
+				</n8n-text>
+			</div>
+			<div
+				v-for="(data, index) in selectedRun"
+				:key="`${data.node}__${data.runIndex}__index`"
+				data-test-id="lm-chat-logs-entry"
+			>
+				<RunDataAiContent :input-data="data" :content-index="index" />
+			</div>
+		</div>
+	</div>
+</template>
+
+<script lang="ts" setup>
+import type { Ref } from 'vue';
+import { computed, ref, watch } from 'vue';
+import type { ITaskSubRunMetadata, ITaskDataConnections } from 'n8n-workflow';
+import { NodeConnectionType } from 'n8n-workflow';
+import type { IAiData, IAiDataContent, INodeUi } from '@/Interface';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import NodeIcon from '@/components/NodeIcon.vue';
+import RunDataAiContent from './RunDataAiContent.vue';
+import { ElTree } from 'element-plus';
+
+interface AIResult {
+	node: string;
+	runIndex: number;
+	data: IAiDataContent | undefined;
+}
+interface TreeNode {
+	node: string;
+	id: string;
+	children: TreeNode[];
+	depth: number;
+	startTime: number;
+	runIndex: number;
+}
+export interface Props {
+	node: INodeUi;
+	runIndex: number;
+	hideTitle?: boolean;
+	slim?: boolean;
+}
+const props = withDefaults(defineProps<Props>(), { runIndex: 0 });
+const workflowsStore = useWorkflowsStore();
+const nodeTypesStore = useNodeTypesStore();
+const selectedRun: Ref<IAiData[]> = ref([]);
+
+function isTreeNodeSelected(node: TreeNode) {
+	return selectedRun.value.some((run) => run.node === node.node && run.runIndex === node.runIndex);
+}
+
+function getReferencedData(
+	reference: ITaskSubRunMetadata,
+	withInput: boolean,
+	withOutput: boolean,
+): IAiDataContent[] {
+	const resultData = workflowsStore.getWorkflowResultDataByNodeName(reference.node);
+
+	if (!resultData?.[reference.runIndex]) {
+		return [];
+	}
+
+	const taskData = resultData[reference.runIndex];
+
+	if (!taskData) {
+		return [];
+	}
+
+	const returnData: IAiDataContent[] = [];
+
+	function addFunction(data: ITaskDataConnections | undefined, inOut: 'input' | 'output') {
+		if (!data) {
+			return;
+		}
+
+		Object.keys(data).map((type) => {
+			returnData.push({
+				data: data[type][0],
+				inOut,
+				type: type as NodeConnectionType,
+				metadata: {
+					executionTime: taskData.executionTime,
+					startTime: taskData.startTime,
+				},
+			});
+		});
+	}
+
+	if (withInput) {
+		addFunction(taskData.inputOverride, 'input');
+	}
+	if (withOutput) {
+		addFunction(taskData.data, 'output');
+	}
+
+	return returnData;
+}
+
+function toggleTreeItem(node: { expanded: boolean }) {
+	node.expanded = !node.expanded;
+}
+
+function onItemClick(data: TreeNode) {
+	const matchingRun = aiData.value?.find(
+		(run) => run.node === data.node && run.runIndex === data.runIndex,
+	);
+	if (!matchingRun) {
+		selectedRun.value = [];
+
+		return;
+	}
+	selectedRun.value = [
+		{
+			node: data.node,
+			runIndex: data.runIndex,
+			data: getReferencedData(
+				{
+					node: data.node,
+					runIndex: data.runIndex,
+				},
+				true,
+				true,
+			),
+		},
+	];
+}
+
+function getNodeType(nodeName: string) {
+	const node = workflowsStore.getNodeByName(nodeName);
+	if (!node) {
+		return null;
+	}
+	const nodeType = nodeTypesStore.getNodeType(node?.type);
+
+	return nodeType;
+}
+
+function selectFirst() {
+	if (executionTree.value.length && executionTree.value[0].children.length) {
+		onItemClick(executionTree.value[0].children[0]);
+	}
+}
+
+const createNode = (
+	nodeName: string,
+	currentDepth: number,
+	r?: AIResult,
+	children: TreeNode[] = [],
+): TreeNode => ({
+	node: nodeName,
+	id: nodeName,
+	depth: currentDepth,
+	startTime: r?.data?.metadata?.startTime ?? 0,
+	runIndex: r?.runIndex ?? 0,
+	children,
+});
+
+function getTreeNodeData(nodeName: string, currentDepth: number): TreeNode[] {
+	const { connectionsByDestinationNode } = workflowsStore.getCurrentWorkflow();
+	const connections = connectionsByDestinationNode[nodeName];
+	// eslint-disable-next-line @typescript-eslint/no-use-before-define
+	const resultData = aiData.value?.filter((data) => data.node === nodeName) ?? [];
+
+	if (!connections) {
+		return resultData.map((d) => createNode(nodeName, currentDepth, d));
+	}
+
+	const nonMainConnectionsKeys = Object.keys(connections).filter(
+		(key) => key !== NodeConnectionType.Main,
+	);
+	const children = nonMainConnectionsKeys.flatMap((key) =>
+		connections[key][0].flatMap((node) => getTreeNodeData(node.node, currentDepth + 1)),
+	);
+
+	if (resultData.length) {
+		return resultData.map((r) => createNode(nodeName, currentDepth, r, children));
+	}
+
+	children.sort((a, b) => a.startTime - b.startTime);
+
+	return [createNode(nodeName, currentDepth, undefined, children)];
+}
+
+const aiData = computed<AIResult[] | undefined>(() => {
+	const resultData = workflowsStore.getWorkflowResultDataByNodeName(props.node.name);
+
+	if (!resultData || !Array.isArray(resultData)) {
+		return;
+	}
+
+	const subRun = resultData[props.runIndex].metadata?.subRun;
+	if (!Array.isArray(subRun)) {
+		return;
+	}
+	// Extend the subRun with the data and sort by adding execution time + startTime and comparing them
+	const subRunWithData = subRun.flatMap((run) =>
+		getReferencedData(run, false, true).map((data) => ({ ...run, data })),
+	);
+
+	subRunWithData.sort((a, b) => {
+		const aTime = a.data?.metadata?.startTime || 0;
+		const bTime = b.data?.metadata?.startTime || 0;
+		return aTime - bTime;
+	});
+
+	return subRunWithData;
+});
+
+const executionTree = computed<TreeNode[]>(() => {
+	const rootNode = props.node;
+
+	const tree = getTreeNodeData(rootNode.name, 0);
+	return tree || [];
+});
+
+watch(() => props.runIndex, selectFirst, { immediate: true });
+</script>
+
+<style lang="scss" module>
+.treeToggle {
+	border: none;
+	background-color: transparent;
+	padding: 0 var(--spacing-3xs);
+	margin: 0 calc(-1 * var(--spacing-3xs));
+	cursor: pointer;
+}
+.leafLabel {
+	display: flex;
+	align-items: center;
+	gap: var(--spacing-3xs);
+}
+.empty {
+	padding: var(--spacing-l);
+}
+.title {
+	font-size: var(--font-size-s);
+	margin-bottom: var(--spacing-xs);
+}
+.tree {
+	flex-shrink: 0;
+	min-width: 12.8rem;
+	height: 100%;
+	border-right: 1px solid var(--color-foreground-base);
+	padding-right: var(--spacing-xs);
+	padding-left: var(--spacing-2xs);
+	&.slim {
+		min-width: auto;
+	}
+}
+.runData {
+	width: 100%;
+	height: 100%;
+	overflow: auto;
+}
+.container {
+	height: 100%;
+	padding: 0 var(--spacing-xs);
+	display: flex;
+
+	:global(.el-tree > .el-tree-node) {
+		position: relative;
+		&:after {
+			content: '';
+			position: absolute;
+			top: 2rem;
+			bottom: 1.2rem;
+			left: 0.75rem;
+			width: 0.125rem;
+			background-color: var(--color-foreground-base);
+		}
+	}
+	:global(.el-tree-node__expand-icon) {
+		display: none;
+	}
+	:global(.el-tree) {
+		margin-left: calc(-1 * var(--spacing-xs));
+	}
+	:global(.el-tree-node__content) {
+		margin-left: var(--spacing-xs);
+	}
+}
+.isSelected {
+	background-color: var(--color-foreground-base);
+}
+.treeNode {
+	display: inline-flex;
+	border-radius: var(--border-radius-base);
+	align-items: center;
+	gap: var(--spacing-3xs);
+	padding: var(--spacing-4xs) var(--spacing-3xs);
+	font-size: var(--font-size-xs);
+	color: var(--color-text-dark);
+	margin-bottom: var(--spacing-3xs);
+	cursor: pointer;
+
+	&:hover {
+		background-color: var(--color-foreground-base);
+	}
+	&[data-tree-depth='0'] {
+		margin-left: calc(-1 * var(--spacing-2xs));
+	}
+
+	&:after {
+		content: '';
+		position: absolute;
+		margin: auto;
+		background-color: var(--color-foreground-base);
+		height: 0.125rem;
+		left: 0.75rem;
+		width: calc(var(--item-depth) * 0.625rem);
+	}
+}
+</style>
diff --git a/packages/editor-ui/src/components/RunDataAi/RunDataAiContent.vue b/packages/editor-ui/src/components/RunDataAi/RunDataAiContent.vue
new file mode 100644
index 0000000000000..367fd3cba7fe3
--- /dev/null
+++ b/packages/editor-ui/src/components/RunDataAi/RunDataAiContent.vue
@@ -0,0 +1,205 @@
+<template>
+	<div :class="$style.container">
+		<header :class="$style.header">
+			<NodeIcon
+				v-if="runMeta?.node"
+				:class="$style.nodeIcon"
+				:node-type="runMeta.node"
+				:size="20"
+			/>
+			<div :class="$style.headerWrap">
+				<p :class="$style.title">
+					{{ inputData.node }}
+				</p>
+				<ul :class="$style.meta">
+					<li v-if="runMeta?.startTimeMs">{{ runMeta?.executionTimeMs }}ms</li>
+					<li v-if="runMeta?.startTimeMs">
+						<n8n-tooltip>
+							<template #content>
+								{{ new Date(runMeta?.startTimeMs).toLocaleString() }}
+							</template>
+							{{
+								$locale.baseText('runData.aiContentBlock.startedAt', {
+									interpolate: {
+										startTime: new Date(runMeta?.startTimeMs).toLocaleTimeString(),
+									},
+								})
+							}}
+						</n8n-tooltip>
+					</li>
+					<li v-if="(consumedTokensSum?.totalTokens ?? 0) > 0" :class="$style.tokensUsage">
+						{{
+							$locale.baseText('runData.aiContentBlock.tokens', {
+								interpolate: {
+									count: consumedTokensSum?.totalTokens.toString()!,
+								},
+							})
+						}}
+						<n8n-info-tip type="tooltip" theme="info-light" tooltip-placement="right">
+							<div>
+								<n8n-text :bold="true" size="small">
+									{{ $locale.baseText('runData.aiContentBlock.tokens.prompt') }}
+									{{
+										$locale.baseText('runData.aiContentBlock.tokens', {
+											interpolate: {
+												count: consumedTokensSum?.promptTokens.toString()!,
+											},
+										})
+									}}
+								</n8n-text>
+								<br />
+								<n8n-text :bold="true" size="small">
+									{{ $locale.baseText('runData.aiContentBlock.tokens.completion') }}
+									{{
+										$locale.baseText('runData.aiContentBlock.tokens', {
+											interpolate: {
+												count: consumedTokensSum?.completionTokens.toString()!,
+											},
+										})
+									}}
+								</n8n-text>
+							</div>
+						</n8n-info-tip>
+					</li>
+				</ul>
+			</div>
+		</header>
+
+		<main v-for="(run, index) in props.inputData.data" :key="index" :class="$style.content">
+			<AiRunContentBlock :run-data="run" />
+		</main>
+	</div>
+</template>
+
+<script lang="ts" setup>
+import type { IAiData, IAiDataContent } from '@/Interface';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import type {
+	IDataObject,
+	INodeExecutionData,
+	INodeTypeDescription,
+	NodeConnectionType,
+} from 'n8n-workflow';
+import { computed } from 'vue';
+import NodeIcon from '@/components/NodeIcon.vue';
+import AiRunContentBlock from './AiRunContentBlock.vue';
+
+interface RunMeta {
+	startTimeMs: number;
+	executionTimeMs: number;
+	node: INodeTypeDescription | null;
+	type: 'input' | 'output';
+	connectionType: NodeConnectionType;
+}
+const props = defineProps<{
+	inputData: IAiData;
+	contentIndex: number;
+}>();
+
+const nodeTypesStore = useNodeTypesStore();
+const workflowsStore = useWorkflowsStore();
+
+type TokenUsageData = {
+	completionTokens: number;
+	promptTokens: number;
+	totalTokens: number;
+};
+const consumedTokensSum = computed(() => {
+	// eslint-disable-next-line @typescript-eslint/no-use-before-define
+	const consumedTokensSum1 = outputRun.value?.data?.reduce(
+		(acc: TokenUsageData, curr: INodeExecutionData) => {
+			const response = curr.json?.response as IDataObject;
+			const tokenUsageData = (response?.llmOutput as IDataObject)?.tokenUsage as TokenUsageData;
+
+			if (!tokenUsageData) return acc;
+
+			return {
+				completionTokens: acc.completionTokens + tokenUsageData.completionTokens,
+				promptTokens: acc.promptTokens + tokenUsageData.promptTokens,
+				totalTokens: acc.totalTokens + tokenUsageData.totalTokens,
+			};
+		},
+		{
+			completionTokens: 0,
+			promptTokens: 0,
+			totalTokens: 0,
+		},
+	);
+
+	return consumedTokensSum1;
+});
+
+function extractRunMeta(run: IAiDataContent) {
+	const uiNode = workflowsStore.getNodeByName(props.inputData.node);
+	const nodeType = nodeTypesStore.getNodeType(uiNode?.type ?? '');
+
+	const runMeta: RunMeta = {
+		startTimeMs: run.metadata.startTime,
+		executionTimeMs: run.metadata.executionTime,
+		node: nodeType,
+		type: run.inOut,
+		connectionType: run.type,
+	};
+
+	return runMeta;
+}
+
+const outputRun = computed(() => {
+	return props.inputData.data.find((r) => r.inOut === 'output');
+});
+
+const runMeta = computed(() => {
+	if (outputRun.value === undefined) {
+		return;
+	}
+	return extractRunMeta(outputRun.value);
+});
+</script>
+
+<style type="scss" module>
+.container {
+	padding: 0 var(--spacing-s) var(--spacing-s);
+}
+.nodeIcon {
+	margin-top: calc(var(--spacing-3xs) * -1);
+}
+.header {
+	display: flex;
+	align-items: center;
+	gap: var(--spacing-3xs);
+	margin-bottom: var(--spacing-s);
+}
+.headerWrap {
+	display: flex;
+	flex-direction: column;
+}
+.title {
+	display: flex;
+	align-items: center;
+	font-size: var(--font-size-s);
+	gap: var(--spacing-3xs);
+	color: var(--color-text-dark);
+}
+.meta {
+	list-style: none;
+	display: flex;
+	align-items: center;
+	flex-wrap: wrap;
+	font-size: var(--font-size-xs);
+
+	& > li:not(:last-child) {
+		border-right: 1px solid var(--color-text-base);
+		padding-right: var(--spacing-3xs);
+	}
+
+	& > li:not(:first-child) {
+		padding-left: var(--spacing-3xs);
+	}
+}
+.tokensUsage {
+	display: flex;
+	align-items: center;
+	gap: var(--spacing-3xs);
+}
+</style>
diff --git a/packages/editor-ui/src/components/RunDataAi/useAiContentParsers.ts b/packages/editor-ui/src/components/RunDataAi/useAiContentParsers.ts
new file mode 100644
index 0000000000000..dc7d7bc1a6fd0
--- /dev/null
+++ b/packages/editor-ui/src/components/RunDataAi/useAiContentParsers.ts
@@ -0,0 +1,241 @@
+import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import { isObjectEmpty, NodeConnectionType } from 'n8n-workflow';
+
+interface MemoryMessage {
+	lc: number;
+	type: string;
+	id: string[];
+	kwargs: {
+		content: unknown;
+		additional_kwargs: Record<string, unknown>;
+	};
+}
+interface LmGeneration {
+	text: string;
+	message: MemoryMessage;
+}
+
+type ExcludedKeys = NodeConnectionType.Main | NodeConnectionType.AiChain;
+type AllowedEndpointType = Exclude<NodeConnectionType, ExcludedKeys>;
+
+const fallbackParser = (execData: IDataObject) => ({
+	type: 'json' as 'json' | 'text' | 'markdown',
+	data: execData,
+	parsed: false,
+});
+
+const outputTypeParsers: {
+	[key in AllowedEndpointType]: (execData: IDataObject) => {
+		type: 'json' | 'text' | 'markdown';
+		data: unknown;
+		parsed: boolean;
+	};
+} = {
+	[NodeConnectionType.AiLanguageModel](execData: IDataObject) {
+		const response = (execData.response as IDataObject) ?? execData;
+		if (!response) throw new Error('No response from Language Model');
+
+		// Simple LLM output — single string message item
+		if (
+			Array.isArray(response?.messages) &&
+			response?.messages.length === 1 &&
+			typeof response?.messages[0] === 'string'
+		) {
+			return {
+				type: 'text',
+				data: response.messages[0],
+				parsed: true,
+			};
+		}
+		// Use the memory parser if the response is a memory-like(chat) object
+		if (response.messages && Array.isArray(response.messages)) {
+			return outputTypeParsers[NodeConnectionType.AiMemory](execData);
+		}
+		if (response.generations) {
+			const generations = response.generations as LmGeneration[];
+
+			const content = generations.map((generation) => {
+				if (generation?.text) return generation.text;
+
+				if (Array.isArray(generation)) {
+					return generation
+						.map((item: LmGeneration) => item.text ?? item)
+						.join('\n\n')
+						.trim();
+				}
+
+				return generation;
+			});
+
+			return {
+				type: 'json',
+				data: content,
+				parsed: true,
+			};
+		}
+
+		return {
+			type: 'json',
+			data: response,
+			parsed: true,
+		};
+	},
+	[NodeConnectionType.AiTool]: fallbackParser,
+	[NodeConnectionType.AiAgent]: fallbackParser,
+	[NodeConnectionType.AiMemory](execData: IDataObject) {
+		const chatHistory =
+			execData.chatHistory ??
+			execData.messages ??
+			(execData?.response as IDataObject)?.chat_history;
+		if (Array.isArray(chatHistory)) {
+			const responseText = chatHistory
+				.map((content: MemoryMessage) => {
+					if (
+						content.type === 'constructor' &&
+						content.id?.includes('messages') &&
+						content.kwargs
+					) {
+						interface MessageContent {
+							type: string;
+							text?: string;
+							image_url?:
+								| {
+										url: string;
+								  }
+								| string;
+						}
+						let message = content.kwargs.content;
+						if (Array.isArray(message)) {
+							message = (message as MessageContent[])
+								.map((item) => {
+									const { type, image_url } = item;
+									if (
+										type === 'image_url' &&
+										typeof image_url === 'object' &&
+										typeof image_url.url === 'string'
+									) {
+										return `![Input image](${image_url.url})`;
+									} else if (typeof image_url === 'string') {
+										return `![Input image](${image_url})`;
+									}
+									return item.text;
+								})
+								.join('\n');
+						}
+						if (Object.keys(content.kwargs.additional_kwargs).length) {
+							message += ` (${JSON.stringify(content.kwargs.additional_kwargs)})`;
+						}
+						if (content.id.includes('HumanMessage')) {
+							message = `**Human:** ${String(message).trim()}`;
+						} else if (content.id.includes('AIMessage')) {
+							message = `**AI:** ${message}`;
+						} else if (content.id.includes('SystemMessage')) {
+							message = `**System Message:** ${message}`;
+						}
+						if (execData.action && execData.action !== 'getMessages') {
+							message = `## Action: ${execData.action}\n\n${message}`;
+						}
+
+						return message;
+					}
+					return '';
+				})
+				.join('\n\n');
+
+			return {
+				type: 'markdown',
+				data: responseText,
+				parsed: true,
+			};
+		}
+
+		return fallbackParser(execData);
+	},
+	[NodeConnectionType.AiOutputParser]: fallbackParser,
+	[NodeConnectionType.AiRetriever]: fallbackParser,
+	[NodeConnectionType.AiVectorStore](execData: IDataObject) {
+		if (execData.documents) {
+			return {
+				type: 'json',
+				data: execData.documents,
+				parsed: true,
+			};
+		}
+
+		return fallbackParser(execData);
+	},
+	[NodeConnectionType.AiEmbedding](execData: IDataObject) {
+		if (execData.documents) {
+			return {
+				type: 'json',
+				data: execData.documents,
+				parsed: true,
+			};
+		}
+
+		return fallbackParser(execData);
+	},
+	[NodeConnectionType.AiDocument](execData: IDataObject) {
+		if (execData.documents) {
+			return {
+				type: 'json',
+				data: execData.documents,
+				parsed: true,
+			};
+		}
+
+		return fallbackParser(execData);
+	},
+	[NodeConnectionType.AiTextSplitter](execData: IDataObject) {
+		const arrayData = Array.isArray(execData.response)
+			? execData.response
+			: [execData.textSplitter];
+		return {
+			type: 'text',
+			data: arrayData.join('\n\n'),
+			parsed: true,
+		};
+	},
+};
+export type ParsedAiContent = Array<{
+	raw: IDataObject | IDataObject[];
+	parsedContent: {
+		type: 'json' | 'text' | 'markdown';
+		data: unknown;
+		parsed: boolean;
+	} | null;
+}>;
+
+export const useAiContentParsers = () => {
+	const parseAiRunData = (
+		executionData: INodeExecutionData[],
+		endpointType: NodeConnectionType,
+	): ParsedAiContent => {
+		if ([NodeConnectionType.AiChain, NodeConnectionType.Main].includes(endpointType)) {
+			return executionData.map((data) => ({ raw: data.json, parsedContent: null }));
+		}
+
+		const contentJson = executionData.map((node) => {
+			const hasBinarData = !isObjectEmpty(node.binary);
+			return hasBinarData ? node.binary : node.json;
+		});
+
+		const parser = outputTypeParsers[endpointType as AllowedEndpointType];
+		if (!parser)
+			return [
+				{
+					raw: contentJson.filter((item): item is IDataObject => item !== undefined),
+					parsedContent: null,
+				},
+			];
+
+		const parsedOutput = contentJson
+			.filter((c): c is IDataObject => c !== undefined)
+			.map((c) => ({ raw: c, parsedContent: parser(c) }));
+		return parsedOutput;
+	};
+
+	return {
+		parseAiRunData,
+	};
+};
diff --git a/packages/editor-ui/src/components/RunDataHtml.vue b/packages/editor-ui/src/components/RunDataHtml.vue
index afdae703b7a5e..cf0d667a059a8 100644
--- a/packages/editor-ui/src/components/RunDataHtml.vue
+++ b/packages/editor-ui/src/components/RunDataHtml.vue
@@ -1,43 +1,35 @@
 <template>
-	<div class="__html-display ph-no-capture" v-html="html"></div>
+	<iframe class="__html-display" :srcdoc="sanitizedHtml" />
 </template>
 
 <script lang="ts">
 import type { PropType } from 'vue';
-import type { INodeExecutionData } from 'n8n-workflow';
+import sanitizeHtml, { defaults, type IOptions as SanitizeOptions } from 'sanitize-html';
+
+const sanitizeOptions: SanitizeOptions = {
+	allowVulnerableTags: false,
+	enforceHtmlBoundary: false,
+	disallowedTagsMode: 'discard',
+	allowedTags: [...defaults.allowedTags, 'style', 'img', 'title'],
+	allowedAttributes: {
+		...defaults.allowedAttributes,
+		'*': ['class', 'style'],
+	},
+	transformTags: {
+		head: '',
+	},
+};
 
 export default {
 	name: 'RunDataHtml',
 	props: {
-		inputData: {
-			type: Array as PropType<INodeExecutionData[]>,
+		inputHtml: {
+			type: String as PropType<string>,
 		},
 	},
 	computed: {
-		html() {
-			if (!this.inputData) return '';
-
-			return this.scopeCss(this.inputData[0].json.html as string);
-		},
-	},
-	methods: {
-		/**
-		 * Scope all CSS selectors to prevent user stylesheets from leaking.
-		 */
-		scopeCss(str: string) {
-			const stylesheets = str.match(/<style>([\s\S]*?)<\/style>/g);
-
-			if (!stylesheets) return str;
-
-			const map = stylesheets.reduce<Record<string, string>>((acc, match) => {
-				match.split('\n').forEach((line) => {
-					if (line.endsWith('{')) acc[line] = ['.__html-display', line].join(' ');
-				});
-
-				return acc;
-			}, {});
-
-			return Object.entries(map).reduce((acc, [key, value]) => acc.replace(key, value), str);
+		sanitizedHtml() {
+			return sanitizeHtml(this.inputHtml, sanitizeOptions);
 		},
 	},
 };
@@ -45,6 +37,7 @@ export default {
 
 <style lang="scss">
 .__html-display {
-	padding: 0 var(--spacing-s);
+	width: 100%;
+	height: 100%;
 }
 </style>
diff --git a/packages/editor-ui/src/components/RunDataJson.vue b/packages/editor-ui/src/components/RunDataJson.vue
index 83866246a9fcd..b86fa045213c0 100644
--- a/packages/editor-ui/src/components/RunDataJson.vue
+++ b/packages/editor-ui/src/components/RunDataJson.vue
@@ -1,18 +1,20 @@
 <template>
-	<div :class="$style.jsonDisplay">
-		<run-data-json-actions
-			v-if="!editMode.enabled"
-			:node="node"
-			:sessioId="sessionId"
-			:displayMode="displayMode"
-			:distanceFromActive="distanceFromActive"
-			:selectedJsonPath="selectedJsonPath"
-			:jsonData="jsonData"
-			:paneType="paneType"
-		/>
-		<draggable
+	<div :class="[$style.jsonDisplay, { [$style.highlight]: highlight }]">
+		<Suspense>
+			<RunDataJsonActions
+				v-if="!editMode.enabled"
+				:node="node"
+				:push-ref="pushRef"
+				:display-mode="displayMode"
+				:distance-from-active="distanceFromActive"
+				:selected-json-path="selectedJsonPath"
+				:json-data="jsonData"
+				:pane-type="paneType"
+			/>
+		</Suspense>
+		<Draggable
 			type="mapping"
-			targetDataKey="mappable"
+			target-data-key="mappable"
 			:disabled="!mappingEnabled"
 			@dragstart="onDragStart"
 			@dragend="onDragEnd"
@@ -20,85 +22,95 @@
 			<template #preview="{ canDrop, el }">
 				<MappingPill v-if="el" :html="getShortKey(el)" :can-drop="canDrop" />
 			</template>
-			<template>
-				<vue-json-pretty
-					:data="jsonData"
-					:deep="10"
-					:showLength="true"
-					:selected-value.sync="selectedJsonPath"
-					rootPath=""
-					selectableType="single"
-					class="json-data"
-				>
-					<template #nodeKey="{ node }">
-						<span
-							data-target="mappable"
-							:data-value="getJsonParameterPath(node.path)"
-							:data-name="node.key"
-							:data-path="node.path"
-							:data-depth="node.level"
-							:class="{
-								[$style.mappable]: mappingEnabled,
-								[$style.dragged]: draggingPath === node.path,
-							}"
-							>"{{ node.key }}"</span
-						>
-					</template>
-					<template #nodeValue="{ node }">
-						<span v-if="isNaN(node.index)" class="ph-no-capture">{{
-							getContent(node.content)
-						}}</span>
-						<span
-							v-else
-							data-target="mappable"
-							:data-value="getJsonParameterPath(node.path)"
-							:data-name="getListItemName(node.path)"
-							:data-path="node.path"
-							:data-depth="node.level"
-							:class="{
-								[$style.mappable]: mappingEnabled,
-								[$style.dragged]: draggingPath === node.path,
-							}"
-							class="ph-no-capture"
-							>{{ getContent(node.content) }}</span
-						>
-					</template>
-				</vue-json-pretty>
-			</template>
-		</draggable>
+			<VueJsonPretty
+				:data="jsonData"
+				:deep="10"
+				:show-length="true"
+				:selected-value="selectedJsonPath"
+				root-path=""
+				selectable-type="single"
+				class="json-data"
+				@update:selected-value="selectedJsonPath = $event"
+			>
+				<template #renderNodeKey="{ node }">
+					<TextWithHighlights
+						:content="getContent(node.key)"
+						:search="search"
+						data-target="mappable"
+						:data-value="getJsonParameterPath(node.path)"
+						:data-name="node.key"
+						:data-path="node.path"
+						:data-depth="node.level"
+						:class="{
+							[$style.mappable]: mappingEnabled,
+							[$style.dragged]: draggingPath === node.path,
+						}"
+					/>
+				</template>
+				<template #renderNodeValue="{ node }">
+					<TextWithHighlights
+						v-if="isNaN(node.index)"
+						:content="getContent(node.content)"
+						:search="search"
+					/>
+					<TextWithHighlights
+						v-else
+						:content="getContent(node.content)"
+						:search="search"
+						data-target="mappable"
+						:data-value="getJsonParameterPath(node.path)"
+						:data-name="getListItemName(node.path)"
+						:data-path="node.path"
+						:data-depth="node.level"
+						:class="{
+							[$style.mappable]: mappingEnabled,
+							[$style.dragged]: draggingPath === node.path,
+						}"
+						class="ph-no-capture"
+					/>
+				</template>
+			</VueJsonPretty>
+		</Draggable>
 	</div>
 </template>
 
 <script lang="ts">
+import { defineAsyncComponent, defineComponent, ref } from 'vue';
 import type { PropType } from 'vue';
-import mixins from 'vue-typed-mixins';
 import VueJsonPretty from 'vue-json-pretty';
 import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
 import Draggable from '@/components/Draggable.vue';
-import { executionDataToJson, isString, shorten } from '@/utils';
+import { executionDataToJson } from '@/utils/nodeTypesUtils';
+import { isString } from '@/utils/typeGuards';
+import { shorten } from '@/utils/typesUtils';
 import type { INodeUi } from '@/Interface';
-import { externalHooks } from '@/mixins/externalHooks';
 import { mapStores } from 'pinia';
-import { useNDVStore } from '@/stores/ndv';
+import { useNDVStore } from '@/stores/ndv.store';
 import MappingPill from './MappingPill.vue';
 import { getMappedExpression } from '@/utils/mappingUtils';
-import { useWorkflowsStore } from '@/stores/workflows';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { nonExistingJsonPath } from '@/constants';
+import { useExternalHooks } from '@/composables/useExternalHooks';
+import TextWithHighlights from './TextWithHighlights.vue';
 
-const runDataJsonActions = () => import('@/components/RunDataJsonActions.vue');
+const RunDataJsonActions = defineAsyncComponent(
+	async () => await import('@/components/RunDataJsonActions.vue'),
+);
 
-export default mixins(externalHooks).extend({
-	name: 'run-data-json',
+export default defineComponent({
+	name: 'RunDataJson',
 	components: {
 		VueJsonPretty,
 		Draggable,
-		runDataJsonActions,
+		RunDataJsonActions,
 		MappingPill,
+		TextWithHighlights,
 	},
 	props: {
 		editMode: {
 			type: Object as () => { enabled?: boolean; value?: string },
 		},
-		sessionId: {
+		pushRef: {
 			type: String,
 		},
 		paneType: {
@@ -122,12 +134,22 @@ export default mixins(externalHooks).extend({
 		totalRuns: {
 			type: Number,
 		},
+		search: {
+			type: String,
+		},
 	},
-	data() {
+	setup() {
+		const externalHooks = useExternalHooks();
+
+		const selectedJsonPath = ref(nonExistingJsonPath);
+		const draggingPath = ref<null | string>(null);
+		const displayMode = ref('json');
+
 		return {
-			selectedJsonPath: null as null | string,
-			draggingPath: null as null | string,
-			displayMode: 'json',
+			externalHooks,
+			selectedJsonPath,
+			draggingPath,
+			displayMode,
 		};
 	},
 	computed: {
@@ -135,6 +157,9 @@ export default mixins(externalHooks).extend({
 		jsonData(): IDataObject[] {
 			return executionDataToJson(this.inputData);
 		},
+		highlight(): boolean {
+			return this.ndvStore.highlightDraggables;
+		},
 	},
 	methods: {
 		getShortKey(el: HTMLElement): string {
@@ -154,7 +179,7 @@ export default mixins(externalHooks).extend({
 			});
 		},
 		onDragStart(el: HTMLElement) {
-			if (el && el.dataset.path) {
+			if (el?.dataset.path) {
 				this.draggingPath = el.dataset.path;
 			}
 
@@ -162,25 +187,25 @@ export default mixins(externalHooks).extend({
 		},
 		onDragEnd(el: HTMLElement) {
 			this.draggingPath = null;
+			const mappingTelemetry = this.ndvStore.mappingTelemetry;
+			const telemetryPayload = {
+				src_node_type: this.node.type,
+				src_field_name: el.dataset.name || '',
+				src_nodes_back: this.distanceFromActive,
+				src_run_index: this.runIndex,
+				src_runs_total: this.totalRuns,
+				src_field_nest_level: el.dataset.depth || 0,
+				src_view: 'json',
+				src_element: el,
+				success: false,
+				...mappingTelemetry,
+			};
 
 			setTimeout(() => {
-				const mappingTelemetry = this.ndvStore.mappingTelemetry;
-				const telemetryPayload = {
-					src_node_type: this.node.type,
-					src_field_name: el.dataset.name || '',
-					src_nodes_back: this.distanceFromActive,
-					src_run_index: this.runIndex,
-					src_runs_total: this.totalRuns,
-					src_field_nest_level: el.dataset.depth || 0,
-					src_view: 'json',
-					src_element: el,
-					success: false,
-					...mappingTelemetry,
-				};
-
-				this.$externalHooks().run('runDataJson.onDragEnd', telemetryPayload);
-
-				this.$telemetry.track('User dragged data for mapping', telemetryPayload);
+				void this.externalHooks.run('runDataJson.onDragEnd', telemetryPayload);
+				this.$telemetry.track('User dragged data for mapping', telemetryPayload, {
+					withPostHog: true,
+				});
 			}, 1000); // ensure dest data gets set if drop
 		},
 		getContent(value: unknown): string {
@@ -205,7 +230,6 @@ export default mixins(externalHooks).extend({
 	word-break: normal;
 	height: 100%;
 	padding-bottom: var(--spacing-3xl);
-	background-color: var(--color-background-base);
 
 	&:hover {
 		/* Shows .actionsGroup element from <run-data-json-actions /> child component */
@@ -213,20 +237,22 @@ export default mixins(externalHooks).extend({
 			opacity: 1;
 		}
 	}
-}
 
-.mappable {
-	cursor: grab;
+	.mappable {
+		cursor: grab;
 
-	&:hover {
-		background-color: var(--color-json-highlight);
+		&:hover {
+			background-color: var(--color-json-highlight);
+		}
 	}
-}
 
-.dragged {
-	&,
-	&:hover {
-		background-color: var(--color-primary-tint-2);
+	&.highlight .mappable,
+	.dragged {
+		&,
+		&:hover {
+			background-color: var(--color-primary-tint-2);
+			color: var(--color-primary);
+		}
 	}
 }
 </style>
diff --git a/packages/editor-ui/src/components/RunDataJsonActions.vue b/packages/editor-ui/src/components/RunDataJsonActions.vue
index ae8776a3de031..9de388bd98697 100644
--- a/packages/editor-ui/src/components/RunDataJsonActions.vue
+++ b/packages/editor-ui/src/components/RunDataJsonActions.vue
@@ -1,9 +1,17 @@
 <template>
 	<div :class="$style.actionsGroup">
-		<el-dropdown trigger="click" @command="handleCopyClick">
+		<n8n-icon-button
+			v-if="noSelection"
+			:title="i18n.baseText('runData.copyToClipboard')"
+			icon="copy"
+			type="tertiary"
+			:circle="false"
+			@click="handleCopyClick({ command: 'value' })"
+		/>
+		<el-dropdown v-else trigger="click" @command="handleCopyClick">
 			<span class="el-dropdown-link">
 				<n8n-icon-button
-					:title="$locale.baseText('runData.copyToClipboard')"
+					:title="i18n.baseText('runData.copyToClipboard')"
 					icon="copy"
 					type="tertiary"
 					:circle="false"
@@ -12,13 +20,13 @@
 			<template #dropdown>
 				<el-dropdown-menu>
 					<el-dropdown-item :command="{ command: 'value' }">
-						{{ $locale.baseText('runData.copyValue') }}
+						{{ i18n.baseText('runData.copyValue') }}
 					</el-dropdown-item>
 					<el-dropdown-item :command="{ command: 'itemPath' }" divided>
-						{{ $locale.baseText('runData.copyItemPath') }}
+						{{ i18n.baseText('runData.copyItemPath') }}
 					</el-dropdown-item>
 					<el-dropdown-item :command="{ command: 'parameterPath' }">
-						{{ $locale.baseText('runData.copyParameterPath') }}
+						{{ i18n.baseText('runData.copyParameterPath') }}
 					</el-dropdown-item>
 				</el-dropdown-menu>
 			</template>
@@ -27,30 +35,32 @@
 </template>
 
 <script lang="ts">
+import { defineComponent } from 'vue';
 import type { PropType } from 'vue';
-import mixins from 'vue-typed-mixins';
+import { mapStores, storeToRefs } from 'pinia';
 import jp from 'jsonpath';
 import type { INodeUi } from '@/Interface';
 import type { IDataObject } from 'n8n-workflow';
-import { copyPaste } from '@/mixins/copyPaste';
-import { pinData } from '@/mixins/pinData';
-import { nodeHelpers } from '@/mixins/nodeHelpers';
-import { genericHelpers } from '@/mixins/genericHelpers';
-import { clearJsonKey, convertPath, executionDataToJson } from '@/utils';
-import { mapStores } from 'pinia';
-import { useWorkflowsStore } from '@/stores/workflows';
-import { useNDVStore } from '@/stores/ndv';
+import { clearJsonKey, convertPath } from '@/utils/typesUtils';
+import { executionDataToJson } from '@/utils/nodeTypesUtils';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useNDVStore } from '@/stores/ndv.store';
+import { useNodeHelpers } from '@/composables/useNodeHelpers';
+import { useToast } from '@/composables/useToast';
+import { useI18n } from '@/composables/useI18n';
+import { nonExistingJsonPath } from '@/constants';
+import { useClipboard } from '@/composables/useClipboard';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import { useSourceControlStore } from '@/stores/sourceControl.store';
+import { usePinnedData } from '@/composables/usePinnedData';
 
 type JsonPathData = {
 	path: string;
 	startPath: string;
 };
 
-// A path that does not exist so that nothing is selected by default
-const nonExistingJsonPath = '_!^&*';
-
-export default mixins(genericHelpers, nodeHelpers, pinData, copyPaste).extend({
-	name: 'run-data-json-actions',
+export default defineComponent({
+	name: 'RunDataJsonActions',
 	props: {
 		node: {
 			type: Object as PropType<INodeUi>,
@@ -58,7 +68,7 @@ export default mixins(genericHelpers, nodeHelpers, pinData, copyPaste).extend({
 		paneType: {
 			type: String,
 		},
-		sessionId: {
+		pushRef: {
 			type: String,
 		},
 		currentOutputIndex: {
@@ -82,25 +92,49 @@ export default mixins(genericHelpers, nodeHelpers, pinData, copyPaste).extend({
 			required: true,
 		},
 	},
+	setup() {
+		const ndvStore = useNDVStore();
+		const i18n = useI18n();
+		const nodeHelpers = useNodeHelpers();
+		const clipboard = useClipboard();
+		const { activeNode } = storeToRefs(ndvStore);
+		const pinnedData = usePinnedData(activeNode);
+
+		return {
+			i18n,
+			nodeHelpers,
+			clipboard,
+			pinnedData,
+			...useToast(),
+		};
+	},
 	computed: {
-		...mapStores(useNDVStore, useWorkflowsStore),
+		...mapStores(useNodeTypesStore, useNDVStore, useWorkflowsStore, useSourceControlStore),
+		isReadOnlyRoute() {
+			return this.$route?.meta?.readOnlyCanvas === true;
+		},
 		activeNode(): INodeUi | null {
 			return this.ndvStore.activeNode;
 		},
+		noSelection() {
+			return this.selectedJsonPath === nonExistingJsonPath;
+		},
 		normalisedJsonPath(): string {
-			const isNotSelected = this.selectedJsonPath === nonExistingJsonPath;
-			return isNotSelected ? '[""]' : this.selectedJsonPath;
+			return this.noSelection ? '[""]' : this.selectedJsonPath;
 		},
 	},
 	methods: {
 		getJsonValue(): string {
 			let selectedValue = jp.query(this.jsonData, `$${this.normalisedJsonPath}`)[0];
-			if (this.selectedJsonPath === nonExistingJsonPath) {
-				if (this.hasPinData) {
-					selectedValue = clearJsonKey(this.pinData as object);
+			if (this.noSelection) {
+				const inExecutionsFrame =
+					window !== window.parent && window.parent.location.pathname.includes('/executions');
+
+				if (this.pinnedData.hasData.value && !inExecutionsFrame) {
+					selectedValue = clearJsonKey(this.pinnedData.data.value as object);
 				} else {
 					selectedValue = executionDataToJson(
-						this.getNodeInputData(this.node, this.runIndex, this.currentOutputIndex),
+						this.nodeHelpers.getNodeInputData(this.node, this.runIndex, this.currentOutputIndex),
 					);
 				}
 			}
@@ -142,8 +176,8 @@ export default mixins(genericHelpers, nodeHelpers, pinData, copyPaste).extend({
 			if (commandData.command === 'value') {
 				value = this.getJsonValue();
 
-				this.$showToast({
-					title: this.$locale.baseText('runData.copyValue.toast'),
+				this.showToast({
+					title: this.i18n.baseText('runData.copyValue.toast'),
 					message: '',
 					type: 'success',
 					duration: 2000,
@@ -156,8 +190,8 @@ export default mixins(genericHelpers, nodeHelpers, pinData, copyPaste).extend({
 					startPath = jsonItemPath.startPath;
 					path = jsonItemPath.path;
 
-					this.$showToast({
-						title: this.$locale.baseText('runData.copyItemPath.toast'),
+					this.showToast({
+						title: this.i18n.baseText('runData.copyItemPath.toast'),
 						message: '',
 						type: 'success',
 						duration: 2000,
@@ -167,8 +201,8 @@ export default mixins(genericHelpers, nodeHelpers, pinData, copyPaste).extend({
 					startPath = jsonParameterPath.startPath;
 					path = jsonParameterPath.path;
 
-					this.$showToast({
-						title: this.$locale.baseText('runData.copyParameterPath.toast'),
+					this.showToast({
+						title: this.i18n.baseText('runData.copyParameterPath.toast'),
 						message: '',
 						type: 'success',
 						duration: 2000,
@@ -188,16 +222,16 @@ export default mixins(genericHelpers, nodeHelpers, pinData, copyPaste).extend({
 
 			this.$telemetry.track('User copied ndv data', {
 				node_type: this.activeNode.type,
-				session_id: this.sessionId,
+				push_ref: this.pushRef,
 				run_index: this.runIndex,
 				view: 'json',
 				copy_type: copyType,
 				workflow_id: this.workflowsStore.workflowId,
 				pane: this.paneType,
-				in_execution_log: this.isReadOnly,
+				in_execution_log: this.isReadOnlyRoute,
 			});
 
-			this.copyToClipboard(value);
+			void this.clipboard.copy(value);
 		},
 	},
 });
diff --git a/packages/editor-ui/src/components/RunDataPinButton.vue b/packages/editor-ui/src/components/RunDataPinButton.vue
new file mode 100644
index 0000000000000..9fd3539515c18
--- /dev/null
+++ b/packages/editor-ui/src/components/RunDataPinButton.vue
@@ -0,0 +1,68 @@
+<script setup lang="ts">
+import { computed } from 'vue';
+import { useI18n } from '@/composables/useI18n';
+import type { usePinnedData } from '@/composables/usePinnedData';
+
+const locale = useI18n();
+
+type Props = {
+	tooltipContentsVisibility: {
+		binaryDataTooltipContent: boolean;
+		pinDataDiscoveryTooltipContent: boolean;
+	};
+	dataPinningDocsUrl: string;
+	pinnedData: ReturnType<typeof usePinnedData>;
+	disabled: boolean;
+};
+
+const props = defineProps<Props>();
+
+const emit = defineEmits<{
+	(event: 'togglePinData'): void;
+}>();
+
+const visible = computed(() =>
+	props.tooltipContentsVisibility.pinDataDiscoveryTooltipContent ? true : undefined,
+);
+</script>
+
+<template>
+	<n8n-tooltip placement="bottom-end" :visible="visible">
+		<template #content>
+			<div v-if="props.tooltipContentsVisibility.binaryDataTooltipContent">
+				{{ locale.baseText('ndv.pinData.pin.binary') }}
+			</div>
+			<div v-else-if="props.tooltipContentsVisibility.pinDataDiscoveryTooltipContent">
+				{{ locale.baseText('node.discovery.pinData.ndv') }}
+			</div>
+			<div v-else>
+				<strong>{{ locale.baseText('ndv.pinData.pin.title') }}</strong>
+				<n8n-text size="small" tag="p">
+					{{ locale.baseText('ndv.pinData.pin.description') }}
+
+					<n8n-link :to="props.dataPinningDocsUrl" size="small">
+						{{ locale.baseText('ndv.pinData.pin.link') }}
+					</n8n-link>
+				</n8n-text>
+			</div>
+		</template>
+		<n8n-icon-button
+			:class="$style.pinDataButton"
+			type="tertiary"
+			:active="props.pinnedData.hasData.value"
+			icon="thumbtack"
+			:disabled="props.disabled"
+			data-test-id="ndv-pin-data"
+			@click="emit('togglePinData')"
+		/>
+	</n8n-tooltip>
+</template>
+
+<style lang="scss" module>
+.pinDataButton {
+	margin-left: var(--spacing-2xs);
+	svg {
+		transition: transform 0.3s ease;
+	}
+}
+</style>
diff --git a/packages/editor-ui/src/components/RunDataSchema.vue b/packages/editor-ui/src/components/RunDataSchema.vue
index 329e9151e5e9a..5496c1406ac0c 100644
--- a/packages/editor-ui/src/components/RunDataSchema.vue
+++ b/packages/editor-ui/src/components/RunDataSchema.vue
@@ -1,16 +1,16 @@
 <script lang="ts" setup>
 import { computed, ref } from 'vue';
-import { merge } from 'lodash-es';
-import type { INodeUi, Schema } from '@/Interface';
+import type { INodeUi } from '@/Interface';
 import RunDataSchemaItem from '@/components/RunDataSchemaItem.vue';
 import Draggable from '@/components/Draggable.vue';
-import { useNDVStore } from '@/stores/ndv';
-import { useWebhooksStore } from '@/stores/webhooks';
+import { useNDVStore } from '@/stores/ndv.store';
 import { telemetry } from '@/plugins/telemetry';
 import type { IDataObject } from 'n8n-workflow';
-import { getSchema, isEmpty, runExternalHook } from '@/utils';
+import { isEmpty } from '@/utils/typesUtils';
+import { useExternalHooks } from '@/composables/useExternalHooks';
 import { i18n } from '@/plugins/i18n';
 import MappingPill from './MappingPill.vue';
+import { useDataSchema } from '@/composables/useDataSchema';
 
 type Props = {
 	data: IDataObject[];
@@ -20,6 +20,7 @@ type Props = {
 	totalRuns: number;
 	paneType: 'input' | 'output';
 	node: INodeUi | null;
+	search: string;
 };
 
 const props = withDefaults(defineProps<Props>(), {
@@ -28,19 +29,16 @@ const props = withDefaults(defineProps<Props>(), {
 
 const draggingPath = ref<string>('');
 const ndvStore = useNDVStore();
-const webhooksStore = useWebhooksStore();
+const { getSchemaForExecutionData } = useDataSchema();
 
-const schema = computed<Schema>(() => {
-	const [head, ...tail] = props.data;
-	return getSchema(merge({}, head, ...tail, head));
-});
+const schema = computed(() => getSchemaForExecutionData(props.data));
 
-const isDataEmpty = computed(() => {
-	return isEmpty(props.data);
-});
+const isDataEmpty = computed(() => isEmpty(props.data));
+
+const highlight = computed(() => ndvStore.highlightDraggables);
 
 const onDragStart = (el: HTMLElement) => {
-	if (el && el.dataset?.path) {
+	if (el?.dataset?.path) {
 		draggingPath.value = el.dataset.path;
 	}
 
@@ -64,22 +62,22 @@ const onDragEnd = (el: HTMLElement) => {
 			...mappingTelemetry,
 		};
 
-		runExternalHook('runDataJson.onDragEnd', webhooksStore, telemetryPayload);
+		void useExternalHooks().run('runDataJson.onDragEnd', telemetryPayload);
 
-		telemetry.track('User dragged data for mapping', telemetryPayload);
+		telemetry.track('User dragged data for mapping', telemetryPayload, { withPostHog: true });
 	}, 1000); // ensure dest data gets set if drop
 };
 </script>
 
 <template>
-	<div :class="$style.schemaWrapper">
+	<div :class="[$style.schemaWrapper, { highlightSchema: highlight }]">
 		<n8n-info-tip v-if="isDataEmpty">{{
 			i18n.baseText('dataMapping.schemaView.emptyData')
 		}}</n8n-info-tip>
-		<draggable
+		<Draggable
 			v-else
 			type="mapping"
-			targetDataKey="mappable"
+			target-data-key="mappable"
 			:disabled="!mappingEnabled"
 			@dragstart="onDragStart"
 			@dragend="onDragEnd"
@@ -87,22 +85,21 @@ const onDragEnd = (el: HTMLElement) => {
 			<template #preview="{ canDrop, el }">
 				<MappingPill v-if="el" :html="el.outerHTML" :can-drop="canDrop" />
 			</template>
-			<template>
-				<div :class="$style.schema">
-					<run-data-schema-item
-						:schema="schema"
-						:level="0"
-						:parent="null"
-						:paneType="paneType"
-						:subKey="`${schema.type}-0-0`"
-						:mappingEnabled="mappingEnabled"
-						:draggingPath="draggingPath"
-						:distanceFromActive="distanceFromActive"
-						:node="node"
-					/>
-				</div>
-			</template>
-		</draggable>
+			<div :class="$style.schema">
+				<RunDataSchemaItem
+					:schema="schema"
+					:level="0"
+					:parent="null"
+					:pane-type="paneType"
+					:sub-key="`${schema.type}-0-0`"
+					:mapping-enabled="mappingEnabled"
+					:dragging-path="draggingPath"
+					:distance-from-active="distanceFromActive"
+					:node="node"
+					:search="search"
+				/>
+			</div>
+		</Draggable>
 	</div>
 </template>
 
@@ -118,7 +115,6 @@ const onDragEnd = (el: HTMLElement) => {
 	word-break: normal;
 	height: 100%;
 	width: 100%;
-	background-color: var(--color-background-base);
 
 	> div[class*='info'] {
 		padding: 0 var(--spacing-s);
diff --git a/packages/editor-ui/src/components/RunDataSchemaItem.vue b/packages/editor-ui/src/components/RunDataSchemaItem.vue
index b9d0ae7d39182..fe87905ff28ac 100644
--- a/packages/editor-ui/src/components/RunDataSchemaItem.vue
+++ b/packages/editor-ui/src/components/RunDataSchemaItem.vue
@@ -1,8 +1,10 @@
 <script lang="ts" setup>
 import { computed } from 'vue';
 import type { INodeUi, Schema } from '@/Interface';
-import { checkExhaustive, shorten } from '@/utils';
+import { checkExhaustive } from '@/utils/typeGuards';
+import { shorten } from '@/utils/typesUtils';
 import { getMappedExpression } from '@/utils/mappingUtils';
+import TextWithHighlights from './TextWithHighlights.vue';
 
 type Props = {
 	schema: Schema;
@@ -14,6 +16,7 @@ type Props = {
 	draggingPath: string;
 	distanceFromActive: number;
 	node: INodeUi | null;
+	search: string;
 };
 
 const props = defineProps<Props>();
@@ -26,9 +29,9 @@ const isFlat = computed(
 		Array.isArray(props.schema.value) &&
 		props.schema.value.every((v) => !Array.isArray(v.value)),
 );
-const key = computed((): string | undefined =>
-	isSchemaParentTypeArray.value ? `[${props.schema.key}]` : props.schema.key,
-);
+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,
 );
@@ -36,6 +39,8 @@ 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,
@@ -80,7 +85,7 @@ const getIconBySchemaType = (type: Schema['type']): string => {
 			:class="{
 				[$style.pill]: true,
 				[$style.mappable]: mappingEnabled,
-				[$style.dragged]: draggingPath === schema.path,
+				[$style.highlight]: dragged,
 			}"
 		>
 			<span
@@ -92,11 +97,20 @@ const getIconBySchemaType = (type: Schema['type']): string => {
 				data-target="mappable"
 			>
 				<font-awesome-icon :icon="getIconBySchemaType(schema.type)" size="sm" />
-				<span v-if="isSchemaParentTypeArray">{{ parent.key }}</span>
-				<span v-if="key" :class="{ [$style.arrayIndex]: isSchemaParentTypeArray }">{{ key }}</span>
+				<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" class="ph-no-capture">{{ text }}</span>
+		<span v-if="text" :class="$style.text">{{ text }}</span>
 		<input v-if="level > 0 && isSchemaValueArray" :id="subKey" type="checkbox" checked />
 		<label v-if="level > 0 && isSchemaValueArray" :class="$style.toggle" :for="subKey">
 			<font-awesome-icon icon="angle-up" />
@@ -108,20 +122,21 @@ const getIconBySchemaType = (type: Schema['type']): string => {
 				:schema="s"
 				:level="level + 1"
 				:parent="schema"
-				:paneType="paneType"
-				:subKey="`${paneType}_${s.type}-${level}-${i}`"
-				:mappingEnabled="mappingEnabled"
-				:draggingPath="draggingPath"
-				:distanceFromActive="distanceFromActive"
+				:pane-type="paneType"
+				:sub-key="`${paneType}_${s.type}-${level}-${i}`"
+				:mapping-enabled="mappingEnabled"
+				:dragging-path="draggingPath"
+				:distance-from-active="distanceFromActive"
 				:node="node"
 				:style="{ transitionDelay: transitionDelay(i) }"
+				:search="search"
 			/>
 		</div>
 	</div>
 </template>
 
 <style lang="scss" module>
-@import '@/styles/css-animation-helpers.scss';
+@import '@/styles/variables';
 
 .item {
 	display: block;
@@ -190,6 +205,25 @@ const getIconBySchemaType = (type: Schema['type']): string => {
 	}
 }
 
+: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 {
 	float: left;
 	display: inline-flex;
@@ -224,22 +258,6 @@ const getIconBySchemaType = (type: Schema['type']): string => {
 			}
 		}
 	}
-
-	&.dragged {
-		&,
-		&:hover,
-		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);
-				}
-			}
-		}
-	}
 }
 
 .label {
diff --git a/packages/editor-ui/src/components/RunDataSearch.vue b/packages/editor-ui/src/components/RunDataSearch.vue
new file mode 100644
index 0000000000000..9918a004a1cdc
--- /dev/null
+++ b/packages/editor-ui/src/components/RunDataSearch.vue
@@ -0,0 +1,123 @@
+<script setup lang="ts">
+import { computed, ref, onMounted, onUnmounted } from 'vue';
+import { useI18n } from '@/composables/useI18n';
+import type { NodePanelType } from '@/Interface';
+
+type Props = {
+	modelValue: string;
+	paneType?: NodePanelType;
+	isAreaActive?: boolean;
+};
+
+const INITIAL_WIDTH = '34px';
+
+const emit = defineEmits<{
+	(event: 'update:modelValue', value: Props['modelValue']): void;
+	(event: 'focus'): void;
+}>();
+
+const props = withDefaults(defineProps<Props>(), {
+	paneType: 'output',
+	isAreaActive: false,
+});
+
+const locale = useI18n();
+
+const inputRef = ref<HTMLInputElement | null>(null);
+const maxWidth = ref(INITIAL_WIDTH);
+const opened = ref(false);
+const placeholder = computed(() =>
+	props.paneType === 'input'
+		? locale.baseText('ndv.search.placeholder.input')
+		: locale.baseText('ndv.search.placeholder.output'),
+);
+
+const documentKeyHandler = (event: KeyboardEvent) => {
+	const isTargetFormElementOrEditable =
+		event.target instanceof HTMLInputElement ||
+		event.target instanceof HTMLTextAreaElement ||
+		event.target instanceof HTMLSelectElement ||
+		(event.target as HTMLElement)?.getAttribute?.('contentEditable') === 'true';
+
+	if (event.key === '/' && props.isAreaActive && !isTargetFormElementOrEditable) {
+		inputRef.value?.focus();
+		inputRef.value?.select();
+	}
+};
+
+const onSearchUpdate = (value: string) => {
+	emit('update:modelValue', value);
+};
+const onFocus = () => {
+	opened.value = true;
+	maxWidth.value = '30%';
+	inputRef.value?.select();
+	emit('focus');
+};
+const onBlur = () => {
+	if (!props.modelValue) {
+		opened.value = false;
+		maxWidth.value = INITIAL_WIDTH;
+	}
+};
+onMounted(() => {
+	document.addEventListener('keyup', documentKeyHandler);
+});
+onUnmounted(() => {
+	document.removeEventListener('keyup', documentKeyHandler);
+});
+</script>
+
+<template>
+	<n8n-input
+		ref="inputRef"
+		data-test-id="ndv-search"
+		:class="{
+			[$style.ioSearch]: true,
+			[$style.ioSearchOpened]: opened,
+		}"
+		:style="{ maxWidth }"
+		:model-value="modelValue"
+		:placeholder="placeholder"
+		size="small"
+		@update:model-value="onSearchUpdate"
+		@focus="onFocus"
+		@blur="onBlur"
+	>
+		<template #prefix>
+			<n8n-icon :class="$style.ioSearchIcon" icon="search" />
+		</template>
+	</n8n-input>
+</template>
+
+<style lang="scss" module>
+@import '@/styles/variables';
+
+.ioSearch {
+	margin-right: var(--spacing-s);
+	transition: max-width 0.3s $ease-out-expo;
+
+	.ioSearchIcon {
+		color: var(--color-foreground-xdark);
+		cursor: pointer;
+	}
+
+	input {
+		border: 0;
+		background: transparent;
+		cursor: pointer;
+	}
+}
+
+.ioSearchOpened {
+	.ioSearchIcon {
+		cursor: default;
+	}
+	input {
+		border: var(--input-border-color, var(--border-color-base))
+			var(--input-border-style, var(--border-style-base)) var(--border-width-base);
+		background: var(--input-background-color, var(--color-foreground-xlight));
+		cursor: text;
+	}
+}
+</style>
diff --git a/packages/editor-ui/src/components/RunDataTable.vue b/packages/editor-ui/src/components/RunDataTable.vue
index 20ba934a014a2..5bd7c0e7f5cf3 100644
--- a/packages/editor-ui/src/components/RunDataTable.vue
+++ b/packages/editor-ui/src/components/RunDataTable.vue
@@ -1,6 +1,6 @@
 <template>
-	<div :class="$style.dataDisplay">
-		<table :class="$style.table" v-if="tableData.columns && tableData.columns.length === 0">
+	<div :class="[$style.dataDisplay, { [$style.highlight]: highlight }]">
+		<table v-if="tableData.columns && tableData.columns.length === 0" :class="$style.table">
 			<tr>
 				<th :class="$style.emptyCell"></th>
 				<th :class="$style.tableRightMargin"></th>
@@ -21,18 +21,18 @@
 				<td :class="$style.tableRightMargin"></td>
 			</tr>
 		</table>
-		<table :class="$style.table" v-else>
+		<table v-else :class="$style.table">
 			<thead>
 				<tr>
 					<th v-for="(column, i) in tableData.columns || []" :key="column">
-						<n8n-tooltip placement="bottom-start" :disabled="!mappingEnabled" :open-delay="1000">
+						<n8n-tooltip placement="bottom-start" :disabled="!mappingEnabled" :show-after="1000">
 							<template #content>
 								<div>
 									<img src="/static/data-mapping-gif.gif" />
 									{{ $locale.baseText('dataMapping.dragColumnToFieldHint') }}
 								</div>
 							</template>
-							<draggable
+							<Draggable
 								type="mapping"
 								:data="getExpression(column)"
 								:disabled="!mappingEnabled"
@@ -52,27 +52,30 @@
 											[$style.draggingHeader]: isDragging,
 										}"
 									>
-										<span>{{ column || '&nbsp;' }}</span>
+										<TextWithHighlights
+											:content="getValueToRender(column || '')"
+											:search="search"
+										/>
 										<div :class="$style.dragButton">
 											<font-awesome-icon icon="grip-vertical" />
 										</div>
 									</div>
 								</template>
-							</draggable>
+							</Draggable>
 						</n8n-tooltip>
 					</th>
 					<th v-if="columnLimitExceeded" :class="$style.header">
 						<n8n-tooltip placement="bottom-end">
 							<template #content>
 								<div>
-									<i18n path="dataMapping.tableView.tableColumnsExceeded.tooltip">
+									<i18n-t tag="span" keypath="dataMapping.tableView.tableColumnsExceeded.tooltip">
 										<template #columnLimit>{{ columnLimit }}</template>
 										<template #link>
 											<a @click="switchToJsonView">{{
 												$locale.baseText('dataMapping.tableView.tableColumnsExceeded.tooltip.link')
 											}}</a>
 										</template>
-									</i18n>
+									</i18n-t>
 								</div>
 							</template>
 							<span>
@@ -87,14 +90,14 @@
 					<th :class="$style.tableRightMargin"></th>
 				</tr>
 			</thead>
-			<draggable
+			<Draggable
+				ref="draggable"
 				tag="tbody"
 				type="mapping"
-				targetDataKey="mappable"
+				target-data-key="mappable"
 				:disabled="!mappingEnabled"
 				@dragstart="onCellDragStart"
 				@dragend="onCellDragEnd"
-				ref="draggable"
 			>
 				<template #preview="{ canDrop, el }">
 					<MappingPill
@@ -102,88 +105,85 @@
 						:can-drop="canDrop"
 					/>
 				</template>
-				<template>
-					<tr
-						v-for="(row, index1) in tableData.data"
-						:key="index1"
-						:class="{ [$style.hoveringRow]: isHoveringRow(index1) }"
-						:data-test-id="isHoveringRow(index1) ? 'hovering-item' : undefined"
+				<tr
+					v-for="(row, index1) in tableData.data"
+					:key="index1"
+					:class="{ [$style.hoveringRow]: isHoveringRow(index1) }"
+					:data-test-id="isHoveringRow(index1) ? 'hovering-item' : undefined"
+				>
+					<td
+						v-for="(data, index2) in row"
+						:key="index2"
+						:data-row="index1"
+						:data-col="index2"
+						:class="hasJsonInColumn(index2) ? $style.minColWidth : $style.limitColWidth"
+						@mouseenter="onMouseEnterCell"
+						@mouseleave="onMouseLeaveCell"
 					>
-						<td
-							v-for="(data, index2) in row"
-							:key="index2"
-							:data-row="index1"
-							:data-col="index2"
-							@mouseenter="onMouseEnterCell"
-							@mouseleave="onMouseLeaveCell"
-							:class="hasJsonInColumn(index2) ? $style.minColWidth : $style.limitColWidth"
-						>
-							<span
-								v-if="isSimple(data)"
-								:class="{ [$style.value]: true, [$style.empty]: isEmpty(data) }"
-								class="ph-no-capture"
-								>{{ getValueToRender(data) }}</span
-							>
-							<n8n-tree :nodeClass="$style.nodeClass" v-else :value="data">
-								<template #label="{ label, path }">
-									<span
-										@mouseenter="() => onMouseEnterKey(path, index2)"
-										@mouseleave="onMouseLeaveKey"
-										:class="{
-											[$style.hoveringKey]: mappingEnabled && isHovering(path, index2),
-											[$style.draggingKey]: isDraggingKey(path, index2),
-											[$style.dataKey]: true,
-											[$style.mappable]: mappingEnabled,
-										}"
-										data-target="mappable"
-										:data-name="getCellPathName(path, index2)"
-										:data-value="getCellExpression(path, index2)"
-										:data-depth="path.length"
-										>{{ label || $locale.baseText('runData.unnamedField') }}</span
-									>
-								</template>
-								<template #value="{ value }">
-									<span
-										:class="{ [$style.nestedValue]: true, [$style.empty]: isEmpty(value) }"
-										class="ph-no-capture"
-										>{{ getValueToRender(value) }}</span
-									>
-								</template>
-							</n8n-tree>
-						</td>
-						<td v-if="columnLimitExceeded"></td>
-						<td :class="$style.tableRightMargin"></td>
-					</tr>
-				</template>
-			</draggable>
+						<TextWithHighlights
+							v-if="isSimple(data)"
+							:content="getValueToRender(data)"
+							:search="search"
+							:class="{ [$style.value]: true, [$style.empty]: isEmpty(data) }"
+						/>
+						<n8n-tree v-else :node-class="$style.nodeClass" :value="data">
+							<template #label="{ label, path }">
+								<span
+									:class="{
+										[$style.hoveringKey]: mappingEnabled && isHovering(path, index2),
+										[$style.draggingKey]: isDraggingKey(path, index2),
+										[$style.dataKey]: true,
+										[$style.mappable]: mappingEnabled,
+									}"
+									data-target="mappable"
+									:data-name="getCellPathName(path, index2)"
+									:data-value="getCellExpression(path, index2)"
+									:data-depth="path.length"
+									@mouseenter="() => onMouseEnterKey(path, index2)"
+									@mouseleave="onMouseLeaveKey"
+									>{{ label || $locale.baseText('runData.unnamedField') }}</span
+								>
+							</template>
+							<template #value="{ value }">
+								<TextWithHighlights
+									:content="getValueToRender(value)"
+									:search="search"
+									:class="{ [$style.nestedValue]: true, [$style.empty]: isEmpty(value) }"
+								/>
+							</template>
+						</n8n-tree>
+					</td>
+					<td v-if="columnLimitExceeded"></td>
+					<td :class="$style.tableRightMargin"></td>
+				</tr>
+			</Draggable>
 		</table>
 	</div>
 </template>
 
 <script lang="ts">
-/* eslint-disable prefer-spread */
-import type { INodeUi, ITableData, NDVState } from '@/Interface';
-import { getPairedItemId } from '@/utils';
+import { defineComponent } from 'vue';
 import type { PropType } from 'vue';
-import type Vue from 'vue';
-import mixins from 'vue-typed-mixins';
+import { mapStores } from 'pinia';
+import type { INodeUi, ITableData, NDVState } from '@/Interface';
+import { shorten } from '@/utils/typesUtils';
+import { getPairedItemId } from '@/utils/pairedItemUtils';
 import type { GenericValue, IDataObject, INodeExecutionData } from 'n8n-workflow';
 import Draggable from './Draggable.vue';
-import { shorten } from '@/utils';
-import { externalHooks } from '@/mixins/externalHooks';
-import { mapStores } from 'pinia';
-import { useWorkflowsStore } from '@/stores/workflows';
-import { useNDVStore } from '@/stores/ndv';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useNDVStore } from '@/stores/ndv.store';
 import MappingPill from './MappingPill.vue';
 import { getMappedExpression } from '@/utils/mappingUtils';
+import { useExternalHooks } from '@/composables/useExternalHooks';
+import TextWithHighlights from './TextWithHighlights.vue';
 
 const MAX_COLUMNS_LIMIT = 40;
 
 type DraggableRef = InstanceType<typeof Draggable>;
 
-export default mixins(externalHooks).extend({
-	name: 'run-data-table',
-	components: { Draggable, MappingPill },
+export default defineComponent({
+	name: 'RunDataTable',
+	components: { Draggable, MappingPill, TextWithHighlights },
 	props: {
 		node: {
 			type: Object as PropType<INodeUi>,
@@ -212,6 +212,15 @@ export default mixins(externalHooks).extend({
 		hasDefaultHoverState: {
 			type: Boolean,
 		},
+		search: {
+			type: String,
+		},
+	},
+	setup() {
+		const externalHooks = useExternalHooks();
+		return {
+			externalHooks,
+		};
 	},
 	data() {
 		return {
@@ -250,6 +259,9 @@ export default mixins(externalHooks).extend({
 		focusedMappableInput(): string {
 			return this.ndvStore.focusedMappableInput;
 		},
+		highlight(): boolean {
+			return this.ndvStore.highlightDraggables;
+		},
 	},
 	methods: {
 		shorten,
@@ -367,7 +379,7 @@ export default mixins(externalHooks).extend({
 				value === undefined
 			);
 		},
-		getValueToRender(value: unknown) {
+		getValueToRender(value: unknown): string {
 			if (value === '') {
 				return this.$locale.baseText('runData.emptyString');
 			}
@@ -383,6 +395,9 @@ export default mixins(externalHooks).extend({
 			if (value === null || value === undefined) {
 				return `[${value}]`;
 			}
+			if (value === true || value === false || typeof value === 'number') {
+				return value.toString();
+			}
 			return value;
 		},
 		onDragStart() {
@@ -390,7 +405,7 @@ export default mixins(externalHooks).extend({
 			this.ndvStore.resetMappingTelemetry();
 		},
 		onCellDragStart(el: HTMLElement) {
-			if (el && el.dataset.value) {
+			if (el?.dataset.value) {
 				this.draggingPath = el.dataset.value;
 			}
 
@@ -424,9 +439,11 @@ export default mixins(externalHooks).extend({
 					...mappingTelemetry,
 				};
 
-				this.$externalHooks().run('runDataTable.onDragEnd', telemetryPayload);
+				void this.externalHooks.run('runDataTable.onDragEnd', telemetryPayload);
 
-				this.$telemetry.track('User dragged data for mapping', telemetryPayload);
+				this.$telemetry.track('User dragged data for mapping', telemetryPayload, {
+					withPostHog: true,
+				});
 			}, 1000); // ensure dest data gets set if drop
 		},
 		isSimple(data: unknown): boolean {
@@ -630,7 +647,12 @@ export default mixins(externalHooks).extend({
 	}
 }
 
+.highlight .draggableHeader {
+	color: var(--color-primary);
+}
+
 .draggingHeader {
+	color: var(--color-primary);
 	background-color: var(--color-primary-tint-2);
 }
 
diff --git a/packages/editor-ui/src/components/RunInfo.vue b/packages/editor-ui/src/components/RunInfo.vue
index e6a0003393bd6..24a4f3675b388 100644
--- a/packages/editor-ui/src/components/RunInfo.vue
+++ b/packages/editor-ui/src/components/RunInfo.vue
@@ -1,6 +1,36 @@
 <template>
-	<n8n-info-tip type="tooltip" theme="info-light" tooltipPlacement="right" v-if="runMetadata">
+	<n8n-info-tip
+		v-if="hasStaleData"
+		theme="warning"
+		type="tooltip"
+		tooltip-placement="right"
+		data-test-id="node-run-info-stale"
+	>
+		<span
+			v-html="
+				$locale.baseText(
+					hasPinData
+						? 'ndv.output.staleDataWarning.pinData'
+						: 'ndv.output.staleDataWarning.regular',
+				)
+			"
+		></span>
+	</n8n-info-tip>
+	<n8n-info-tip
+		v-else-if="runMetadata"
+		type="tooltip"
+		:theme="theme"
+		:data-test-id="`node-run-info-${theme}`"
+		tooltip-placement="right"
+	>
 		<div>
+			<n8n-text :bold="true" size="small"
+				>{{
+					runTaskData.error
+						? $locale.baseText('runData.executionStatus.failed')
+						: $locale.baseText('runData.executionStatus.success')
+				}} </n8n-text
+			><br />
 			<n8n-text :bold="true" size="small">{{
 				$locale.baseText('runData.startTime') + ':'
 			}}</n8n-text>
@@ -14,15 +44,21 @@
 </template>
 
 <script lang="ts">
-import type { ITaskData } from 'n8n-workflow';
 import { defineComponent } from 'vue';
+import type { ITaskData } from 'n8n-workflow';
+import { convertToDisplayDateComponents } from '@/utils/formatters/dateFormatter';
 
 export default defineComponent({
 	props: {
 		taskData: {}, // ITaskData
+		hasStaleData: Boolean,
+		hasPinData: Boolean,
 	},
 
 	computed: {
+		theme(): string {
+			return this.runTaskData?.error ? 'danger' : 'success';
+		},
 		runTaskData(): ITaskData {
 			return this.taskData as ITaskData;
 		},
@@ -30,9 +66,10 @@ export default defineComponent({
 			if (!this.runTaskData) {
 				return null;
 			}
+			const { date, time } = convertToDisplayDateComponents(this.runTaskData.startTime);
 			return {
 				executionTime: this.runTaskData.executionTime,
-				startTime: new Date(this.runTaskData.startTime).toLocaleString(),
+				startTime: `${date} at ${time}`,
 			};
 		},
 	},
diff --git a/packages/editor-ui/src/components/SSOLogin.vue b/packages/editor-ui/src/components/SSOLogin.vue
index baa5bbacfdd9a..12e956f23ef26 100644
--- a/packages/editor-ui/src/components/SSOLogin.vue
+++ b/packages/editor-ui/src/components/SSOLogin.vue
@@ -1,18 +1,17 @@
 <script lang="ts" setup>
-import { Notification } from 'element-ui';
-import { useSSOStore } from '@/stores/sso';
+import { useSSOStore } from '@/stores/sso.store';
+import { useI18n } from '@/composables/useI18n';
+import { useToast } from '@/composables/useToast';
 
+const i18n = useI18n();
 const ssoStore = useSSOStore();
+const toast = useToast();
 
 const onSSOLogin = async () => {
 	try {
 		window.location.href = await ssoStore.getSSORedirectUrl();
 	} catch (error) {
-		Notification.error({
-			title: 'Error',
-			message: error.message,
-			position: 'bottom-right',
-		});
+		toast.showError(error, 'Error', error.message);
 	}
 };
 </script>
@@ -20,14 +19,14 @@ const onSSOLogin = async () => {
 <template>
 	<div v-if="ssoStore.showSsoLoginButton" :class="$style.ssoLogin">
 		<div :class="$style.divider">
-			<span>{{ $locale.baseText('sso.login.divider') }}</span>
+			<span>{{ i18n.baseText('sso.login.divider') }}</span>
 		</div>
 		<n8n-button
-			@click="onSSOLogin"
 			size="large"
 			type="primary"
 			outline
-			:label="$locale.baseText('sso.login.button')"
+			:label="i18n.baseText('sso.login.button')"
+			@click="onSSOLogin"
 		/>
 	</div>
 </template>
@@ -55,7 +54,7 @@ const onSSOLogin = async () => {
 		position: relative;
 		display: inline-block;
 		padding: var(--spacing-xl) var(--spacing-l);
-		background: var(--color-foreground-xlight);
+		background: var(--color-background-xlight);
 	}
 }
 </style>
diff --git a/packages/editor-ui/src/components/SaveButton.vue b/packages/editor-ui/src/components/SaveButton.vue
index 4d78e8844d9fa..738ddf46b9f98 100644
--- a/packages/editor-ui/src/components/SaveButton.vue
+++ b/packages/editor-ui/src/components/SaveButton.vue
@@ -1,23 +1,42 @@
 <template>
 	<span :class="$style.container" data-test-id="save-button">
-		<span :class="$style.saved" v-if="saved">{{ $locale.baseText('saveButton.saved') }}</span>
-		<n8n-button
-			v-else
-			:label="saveButtonLabel"
-			:loading="isSaving"
-			:disabled="disabled"
-			:class="$style.button"
-			:type="type"
-			@click="$emit('click')"
-		/>
+		<span v-if="saved" :class="$style.saved">{{ $locale.baseText('saveButton.saved') }}</span>
+		<template v-else>
+			<KeyboardShortcutTooltip
+				v-if="withShortcut"
+				:label="shortcutTooltipLabel"
+				:shortcut="{ keys: ['s'], metaKey: true }"
+				placement="bottom"
+			>
+				<n8n-button
+					:label="saveButtonLabel"
+					:loading="isSaving"
+					:disabled="disabled"
+					:class="$style.button"
+					:type="type"
+				/>
+			</KeyboardShortcutTooltip>
+			<n8n-button
+				v-else
+				:label="saveButtonLabel"
+				:loading="isSaving"
+				:disabled="disabled"
+				:class="$style.button"
+				:type="type"
+			/>
+		</template>
 	</span>
 </template>
 
 <script lang="ts">
 import { defineComponent } from 'vue';
+import KeyboardShortcutTooltip from '@/components/KeyboardShortcutTooltip.vue';
 
 export default defineComponent({
 	name: 'SaveButton',
+	components: {
+		KeyboardShortcutTooltip,
+	},
 	props: {
 		saved: {
 			type: Boolean,
@@ -41,6 +60,13 @@ export default defineComponent({
 			type: String,
 			default: 'primary',
 		},
+		withShortcut: {
+			type: Boolean,
+			default: false,
+		},
+		shortcutTooltip: {
+			type: String,
+		},
 	},
 	computed: {
 		saveButtonLabel() {
@@ -48,6 +74,9 @@ export default defineComponent({
 				? this.$locale.baseText('saveButton.saving')
 				: this.$locale.baseText('saveButton.save');
 		},
+		shortcutTooltipLabel() {
+			return this.shortcutTooltip ?? this.$locale.baseText('saveButton.save');
+		},
 	},
 });
 </script>
diff --git a/packages/editor-ui/src/components/ScopesNotice.vue b/packages/editor-ui/src/components/ScopesNotice.vue
index b7a0ddd0f2c71..242836d3cc359 100644
--- a/packages/editor-ui/src/components/ScopesNotice.vue
+++ b/packages/editor-ui/src/components/ScopesNotice.vue
@@ -1,11 +1,11 @@
 <template>
-	<n8n-notice :content="scopesShortContent" :fullContent="scopesFullContent" />
+	<n8n-notice :content="scopesShortContent" :full-content="scopesFullContent" />
 </template>
 
 <script lang="ts">
-import { useCredentialsStore } from '@/stores/credentials';
-import { mapStores } from 'pinia';
 import { defineComponent } from 'vue';
+import { mapStores } from 'pinia';
+import { useCredentialsStore } from '@/stores/credentials.store';
 
 export default defineComponent({
 	name: 'ScopesNotice',
@@ -35,10 +35,12 @@ export default defineComponent({
 			const oauth1Api = this.$locale.baseText('generic.oauth1Api');
 			const oauth2Api = this.$locale.baseText('generic.oauth2Api');
 
-			return this.credentialsStore
-				.getCredentialTypeByName(this.activeCredentialType)
-				.displayName.replace(new RegExp(`${oauth1Api}|${oauth2Api}`), '')
-				.trim();
+			return (
+				this.credentialsStore
+					.getCredentialTypeByName(this.activeCredentialType)
+					?.displayName.replace(new RegExp(`${oauth1Api}|${oauth2Api}`), '')
+					.trim() || ''
+			);
 		},
 	},
 });
diff --git a/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationCard.ee.vue b/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationCard.ee.vue
index 4edc63d535a8c..a24035138172f 100644
--- a/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationCard.ee.vue
+++ b/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationCard.ee.vue
@@ -2,7 +2,7 @@
 	<n8n-card :class="$style.cardLink" data-test-id="destination-card" @click="onClick">
 		<template #header>
 			<div>
-				<n8n-heading tag="h2" bold class="ph-no-capture" :class="$style.cardHeading">
+				<n8n-heading tag="h2" bold :class="$style.cardHeading">
 					{{ destination.label }}
 				</n8n-heading>
 				<div :class="$style.cardDescription">
@@ -13,7 +13,7 @@
 			</div>
 		</template>
 		<template #append>
-			<div :class="$style.cardActions">
+			<div ref="cardActions" :class="$style.cardActions">
 				<div :class="$style.activeStatusText" data-test-id="destination-activator-status">
 					<n8n-text v-if="nodeParameters.enabled" :color="'success'" size="small" bold>
 						{{ $locale.baseText('workflowActivator.active') }}
@@ -25,9 +25,8 @@
 
 				<el-switch
 					class="mr-s"
-					:disabled="!isInstanceOwner"
-					:value="nodeParameters.enabled"
-					@change="onEnabledSwitched($event, destination.id)"
+					:disabled="readonly"
+					:model-value="nodeParameters.enabled"
 					:title="
 						nodeParameters.enabled
 							? $locale.baseText('workflowActivator.deactivateWorkflow')
@@ -35,8 +34,8 @@
 					"
 					active-color="#13ce66"
 					inactive-color="#8899AA"
-					element-loading-spinner="el-icon-loading"
 					data-test-id="workflow-activate-switch"
+					@update:model-value="onEnabledSwitched($event, destination.id)"
 				>
 				</el-switch>
 
@@ -47,31 +46,35 @@
 </template>
 
 <script lang="ts">
-import mixins from 'vue-typed-mixins';
-import { EnterpriseEditionFeature } from '@/constants';
-import { showMessage } from '@/mixins/showMessage';
-import { useLogStreamingStore } from '../../stores/logStreamingStore';
+import { defineComponent } from 'vue';
+import { EnterpriseEditionFeature, MODAL_CONFIRM } from '@/constants';
+import { useMessage } from '@/composables/useMessage';
+import { useLogStreamingStore } from '@/stores/logStreaming.store';
 import type { PropType } from 'vue';
-import Vue from 'vue';
 import { mapStores } from 'pinia';
 import type { MessageEventBusDestinationOptions } from 'n8n-workflow';
 import { deepCopy, defaultMessageEventBusDestinationOptions } from 'n8n-workflow';
-import type { BaseTextKey } from '../../plugins/i18n';
-import type { EventBus } from '@/event-bus';
+import type { BaseTextKey } from '@/plugins/i18n';
+import type { EventBus } from 'n8n-design-system';
 
 export const DESTINATION_LIST_ITEM_ACTIONS = {
 	OPEN: 'open',
 	DELETE: 'delete',
 };
 
-export default mixins(showMessage).extend({
+export default defineComponent({
+	components: {},
+	setup() {
+		return {
+			...useMessage(),
+		};
+	},
 	data() {
 		return {
 			EnterpriseEditionFeature,
 			nodeParameters: {} as MessageEventBusDestinationOptions,
 		};
 	},
-	components: {},
 	props: {
 		eventBus: {
 			type: Object as PropType<EventBus>,
@@ -79,11 +82,9 @@ export default mixins(showMessage).extend({
 		destination: {
 			type: Object,
 			required: true,
-			default: deepCopy(
-				defaultMessageEventBusDestinationOptions,
-			) as MessageEventBusDestinationOptions,
+			default: deepCopy(defaultMessageEventBusDestinationOptions),
 		},
-		isInstanceOwner: Boolean,
+		readonly: Boolean,
 	},
 	mounted() {
 		this.nodeParameters = Object.assign(
@@ -92,7 +93,7 @@ export default mixins(showMessage).extend({
 		);
 		this.eventBus?.on('destinationWasSaved', this.onDestinationWasSaved);
 	},
-	destroyed() {
+	beforeUnmount() {
 		this.eventBus?.off('destinationWasSaved', this.onDestinationWasSaved);
 	},
 	computed: {
@@ -104,7 +105,7 @@ export default mixins(showMessage).extend({
 					value: DESTINATION_LIST_ITEM_ACTIONS.OPEN,
 				},
 			];
-			if (this.isInstanceOwner) {
+			if (!this.readonly) {
 				actions.push({
 					label: this.$locale.baseText('workflows.item.delete'),
 					value: DESTINATION_LIST_ITEM_ACTIONS.DELETE,
@@ -126,21 +127,20 @@ export default mixins(showMessage).extend({
 				);
 			}
 		},
-		async onClick(event?: PointerEvent) {
+		async onClick(event: Event) {
 			if (
-				event &&
-				event.target &&
-				'className' in event.target &&
-				event.target['className'] === 'el-switch__core'
+				this.$refs.cardActions === event.target ||
+				this.$refs.cardActions?.contains(event.target) ||
+				event.target?.contains(this.$refs.cardActions)
 			) {
-				event.stopPropagation();
-			} else {
-				this.$emit('edit', this.destination.id);
+				return;
 			}
+
+			this.$emit('edit', this.destination.id);
 		},
 		onEnabledSwitched(state: boolean, destinationId: string) {
 			this.nodeParameters.enabled = state;
-			this.saveDestination();
+			void this.saveDestination();
 		},
 		async saveDestination() {
 			await this.logStreamingStore.saveDestination(this.nodeParameters);
@@ -149,17 +149,23 @@ export default mixins(showMessage).extend({
 			if (action === DESTINATION_LIST_ITEM_ACTIONS.OPEN) {
 				this.$emit('edit', this.destination.id);
 			} else if (action === DESTINATION_LIST_ITEM_ACTIONS.DELETE) {
-				const deleteConfirmed = await this.confirmMessage(
+				const deleteConfirmed = await this.confirm(
 					this.$locale.baseText('settings.log-streaming.destinationDelete.message', {
 						interpolate: { destinationName: this.destination.label },
 					}),
 					this.$locale.baseText('settings.log-streaming.destinationDelete.headline'),
-					'warning',
-					this.$locale.baseText('settings.log-streaming.destinationDelete.confirmButtonText'),
-					this.$locale.baseText('settings.log-streaming.destinationDelete.cancelButtonText'),
+					{
+						type: 'warning',
+						confirmButtonText: this.$locale.baseText(
+							'settings.log-streaming.destinationDelete.confirmButtonText',
+						),
+						cancelButtonText: this.$locale.baseText(
+							'settings.log-streaming.destinationDelete.cancelButtonText',
+						),
+					},
 				);
 
-				if (deleteConfirmed === false) {
+				if (deleteConfirmed !== MODAL_CONFIRM) {
 					return;
 				}
 
@@ -174,6 +180,8 @@ export default mixins(showMessage).extend({
 .cardLink {
 	transition: box-shadow 0.3s ease;
 	cursor: pointer;
+	padding: 0 0 0 var(--spacing-s);
+	align-items: stretch;
 
 	&:hover {
 		box-shadow: 0 2px 8px rgba(#441c17, 0.1);
@@ -191,12 +199,14 @@ export default mixins(showMessage).extend({
 .cardHeading {
 	font-size: var(--font-size-s);
 	word-break: break-word;
+	padding: var(--spacing-s) 0 0 var(--spacing-s);
 }
 
 .cardDescription {
 	min-height: 19px;
 	display: flex;
 	align-items: center;
+	padding: 0 0 var(--spacing-s) var(--spacing-s);
 }
 
 .cardActions {
@@ -204,5 +214,7 @@ export default mixins(showMessage).extend({
 	flex-direction: row;
 	justify-content: center;
 	align-items: center;
+	padding: 0 var(--spacing-s) 0 0;
+	cursor: default;
 }
 </style>
diff --git a/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationSettingsModal.ee.vue b/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationSettingsModal.ee.vue
index 78e00e080a899..4cf0871189998 100644
--- a/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationSettingsModal.ee.vue
+++ b/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationSettingsModal.ee.vue
@@ -1,15 +1,15 @@
 <template>
 	<Modal
 		:name="modalName"
-		:eventBus="modalBus"
-		:beforeClose="onModalClose"
+		:event-bus="modalBus"
+		:before-close="onModalClose"
 		:scrollable="true"
 		:center="true"
 		:loading="loading"
-		:minWidth="isTypeAbstract ? '460px' : '70%'"
-		:maxWidth="isTypeAbstract ? '460px' : '70%'"
-		:minHeight="isTypeAbstract ? '160px' : '650px'"
-		:maxHeight="isTypeAbstract ? '300px' : '650px'"
+		:min-width="isTypeAbstract ? '460px' : '70%'"
+		:max-width="isTypeAbstract ? '460px' : '70%'"
+		:min-height="isTypeAbstract ? '160px' : '650px'"
+		:max-height="isTypeAbstract ? '300px' : '650px'"
 		data-test-id="destination-modal"
 	>
 		<template #header>
@@ -22,12 +22,12 @@
 				<div :class="$style.header">
 					<div :class="$style.destinationInfo">
 						<InlineNameEdit
-							:name="headerLabel"
+							:model-value="headerLabel"
 							:subtitle="!isTypeAbstract ? $locale.baseText(typeLabelName) : 'Select type'"
 							:readonly="isTypeAbstract"
 							type="Credential"
 							data-test-id="subtitle-showing-type"
-							@input="onLabelChange"
+							@update:model-value="onLabelChange"
 						/>
 					</div>
 					<div :class="$style.destinationActions">
@@ -39,31 +39,29 @@
 									? 'Event sent and returned OK'
 									: 'Event returned with error'
 							"
-							size="medium"
 							type="tertiary"
 							label="Send Test-Event"
 							:disabled="!hasOnceBeenSaved || !unchanged"
-							@click="sendTestEvent"
 							data-test-id="destination-test-button"
+							@click="sendTestEvent"
 						/>
-						<template v-if="isInstanceOwner">
+						<template v-if="canManageLogStreaming">
 							<n8n-icon-button
 								v-if="nodeParameters && hasOnceBeenSaved"
 								:title="$locale.baseText('settings.log-streaming.delete')"
 								icon="trash"
-								size="medium"
 								type="tertiary"
 								:disabled="isSaving"
 								:loading="isDeleting"
-								@click="removeThis"
 								data-test-id="destination-delete-button"
+								@click="removeThis"
 							/>
 							<SaveButton
 								:saved="unchanged && hasOnceBeenSaved"
 								:disabled="isTypeAbstract || unchanged"
-								:savingLabel="$locale.baseText('settings.log-streaming.saving')"
-								@click="saveDestination"
+								:saving-label="$locale.baseText('settings.log-streaming.saving')"
 								data-test-id="destination-save-button"
+								@click="saveDestination"
 							/>
 						</template>
 					</div>
@@ -77,18 +75,18 @@
 					<n8n-input-label
 						:class="$style.typeSelector"
 						:label="$locale.baseText('settings.log-streaming.selecttype')"
-						:tooltipText="$locale.baseText('settings.log-streaming.selecttypehint')"
+						:tooltip-text="$locale.baseText('settings.log-streaming.selecttypehint')"
 						:bold="false"
 						size="medium"
 						:underline="false"
 					>
 						<n8n-select
-							:value="typeSelectValue"
+							ref="typeSelectRef"
+							:model-value="typeSelectValue"
 							:placeholder="typeSelectPlaceholder"
-							@change="onTypeSelectInput"
 							data-test-id="select-destination-type"
 							name="name"
-							ref="typeSelectRef"
+							@update:model-value="onTypeSelectInput"
 						>
 							<n8n-option
 								v-for="option in typeSelectOptions || []"
@@ -100,9 +98,9 @@
 						<div class="mt-m text-right">
 							<n8n-button
 								size="large"
-								@click="onContinueAddClicked"
 								data-test-id="select-destination-button"
 								:disabled="!typeSelectValue"
+								@click="onContinueAddClicked"
 							>
 								{{ $locale.baseText(`settings.log-streaming.continue`) }}
 							</n8n-button>
@@ -113,57 +111,54 @@
 					<div :class="$style.sidebar">
 						<n8n-menu mode="tabs" :items="sidebarItems" @select="onTabSelect"></n8n-menu>
 					</div>
-					<div v-if="activeTab === 'settings'" :class="$style.mainContent" ref="content">
+					<div v-if="activeTab === 'settings'" ref="content" :class="$style.mainContent">
 						<template v-if="isTypeWebhook">
-							<parameter-input-list
+							<ParameterInputList
 								:parameters="webhookDescription"
-								:hideDelete="true"
-								:nodeValues="nodeParameters"
-								:isReadOnly="!isInstanceOwner"
+								:hide-delete="true"
+								:node-values="nodeParameters"
+								:is-read-only="!canManageLogStreaming"
 								path=""
-								@valueChanged="valueChanged"
+								@value-changed="valueChanged"
 							/>
 						</template>
 						<template v-else-if="isTypeSyslog">
-							<parameter-input-list
+							<ParameterInputList
 								:parameters="syslogDescription"
-								:hideDelete="true"
-								:nodeValues="nodeParameters"
-								:isReadOnly="!isInstanceOwner"
+								:hide-delete="true"
+								:node-values="nodeParameters"
+								:is-read-only="!canManageLogStreaming"
 								path=""
-								@valueChanged="valueChanged"
+								@value-changed="valueChanged"
 							/>
 						</template>
 						<template v-else-if="isTypeSentry">
-							<parameter-input-list
+							<ParameterInputList
 								:parameters="sentryDescription"
-								:hideDelete="true"
-								:nodeValues="nodeParameters"
-								:isReadOnly="!isInstanceOwner"
+								:hide-delete="true"
+								:node-values="nodeParameters"
+								:is-read-only="!canManageLogStreaming"
 								path=""
-								@valueChanged="valueChanged"
+								@value-changed="valueChanged"
 							/>
 						</template>
 					</div>
 					<div v-if="activeTab === 'events'" :class="$style.mainContent">
-						<template>
-							<div class="">
-								<n8n-input-label
-									class="mb-m mt-m"
-									:label="$locale.baseText('settings.log-streaming.tab.events.title')"
-									:bold="true"
-									size="medium"
-									:underline="false"
-								/>
-								<event-selection
-									class=""
-									:destinationId="destination.id"
-									@input="onInput"
-									@change="valueChanged"
-									:readonly="!isInstanceOwner"
-								/>
-							</div>
-						</template>
+						<div class="">
+							<n8n-input-label
+								class="mb-m mt-m"
+								:label="$locale.baseText('settings.log-streaming.tab.events.title')"
+								:bold="true"
+								size="medium"
+								:underline="false"
+							/>
+							<EventSelection
+								:destination-id="destination.id"
+								:readonly="!canManageLogStreaming"
+								@input="onInput"
+								@change="valueChanged"
+							/>
+						</div>
 					</div>
 				</template>
 			</div>
@@ -174,13 +169,11 @@
 <script lang="ts">
 import { get, set, unset } from 'lodash-es';
 import { mapStores } from 'pinia';
-import mixins from 'vue-typed-mixins';
-import { useLogStreamingStore } from '../../stores/logStreamingStore';
-import { useNDVStore } from '../../stores/ndv';
-import { useWorkflowsStore } from '../../stores/workflows';
+import { useLogStreamingStore } from '@/stores/logStreaming.store';
+import { useNDVStore } from '@/stores/ndv.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
 import ParameterInputList from '@/components/ParameterInputList.vue';
-import NodeCredentials from '@/components/NodeCredentials.vue';
-import type { IMenuItem, INodeUi, ITab, IUpdateInformation } from '../../Interface';
+import type { IMenuItem, INodeUi, IUpdateInformation } from '@/Interface';
 import type {
 	IDataObject,
 	INodeCredentials,
@@ -196,28 +189,36 @@ import {
 	defaultMessageEventBusDestinationSentryOptions,
 } from 'n8n-workflow';
 import type { PropType } from 'vue';
-import Vue from 'vue';
-import { LOG_STREAM_MODAL_KEY } from '../../constants';
+import { defineComponent } from 'vue';
+import { LOG_STREAM_MODAL_KEY, MODAL_CONFIRM } from '@/constants';
 import Modal from '@/components/Modal.vue';
-import { showMessage } from '@/mixins/showMessage';
-import { useUIStore } from '../../stores/ui';
-import { useUsersStore } from '../../stores/users';
-import { destinationToFakeINodeUi } from './Helpers.ee';
+import { useMessage } from '@/composables/useMessage';
+import { useUIStore } from '@/stores/ui.store';
+import { hasPermission } from '@/rbac/permissions';
+import { destinationToFakeINodeUi } from '@/components/SettingsLogStreaming/Helpers.ee';
 import {
 	webhookModalDescription,
 	sentryModalDescription,
 	syslogModalDescription,
 } from './descriptions.ee';
-import type { BaseTextKey } from '../../plugins/i18n';
-import InlineNameEdit from '../InlineNameEdit.vue';
-import SaveButton from '../SaveButton.vue';
+import type { BaseTextKey } from '@/plugins/i18n';
+import InlineNameEdit from '@/components/InlineNameEdit.vue';
+import SaveButton from '@/components/SaveButton.vue';
 import EventSelection from '@/components/SettingsLogStreaming/EventSelection.ee.vue';
-import { Checkbox } from 'element-ui';
-import type { EventBus } from '@/event-bus';
-import { createEventBus } from '@/event-bus';
+import type { EventBus } from 'n8n-design-system';
+import { createEventBus } from 'n8n-design-system/utils';
+import { useTelemetry } from '@/composables/useTelemetry';
+import { useRootStore } from '@/stores/n8nRoot.store';
 
-export default mixins(showMessage).extend({
-	name: 'event-destination-settings-modal',
+export default defineComponent({
+	name: 'EventDestinationSettingsModal',
+	components: {
+		Modal,
+		ParameterInputList,
+		InlineNameEdit,
+		SaveButton,
+		EventSelection,
+	},
 	props: {
 		modalName: String,
 		destination: {
@@ -229,14 +230,10 @@ export default mixins(showMessage).extend({
 			type: Object as PropType<EventBus>,
 		},
 	},
-	components: {
-		Modal,
-		ParameterInputList,
-		NodeCredentials,
-		InlineNameEdit,
-		SaveButton,
-		EventSelection,
-		Checkbox,
+	setup() {
+		return {
+			...useMessage(),
+		};
 	},
 	data() {
 		return {
@@ -257,12 +254,11 @@ export default mixins(showMessage).extend({
 			headerLabel: this.destination.label,
 			testMessageSent: false,
 			testMessageResult: false,
-			isInstanceOwner: false,
 			LOG_STREAM_MODAL_KEY,
 		};
 	},
 	computed: {
-		...mapStores(useUIStore, useUsersStore, useLogStreamingStore, useNDVStore, useWorkflowsStore),
+		...mapStores(useUIStore, useLogStreamingStore, useNDVStore, useWorkflowsStore),
 		typeSelectOptions(): Array<{ value: string; label: BaseTextKey }> {
 			const options: Array<{ value: string; label: BaseTextKey }> = [];
 			for (const t of Object.values(MessageEventBusDestinationTypeNames)) {
@@ -311,21 +307,11 @@ export default mixins(showMessage).extend({
 			}
 			return items;
 		},
-		tabItems(): ITab[] {
-			return [
-				{
-					label: this.$locale.baseText('settings.log-streaming.tab.settings'),
-					value: 'settings',
-				},
-				{
-					label: this.$locale.baseText('settings.log-streaming.tab.events'),
-					value: 'events',
-				},
-			];
+		canManageLogStreaming(): boolean {
+			return hasPermission(['rbac'], { rbac: { scope: 'logStreaming:manage' } });
 		},
 	},
 	mounted() {
-		this.isInstanceOwner = this.usersStore.currentUser?.globalRole?.name === 'owner';
 		this.setupNode(
 			Object.assign(deepCopy(defaultMessageEventBusDestinationOptions), this.destination),
 		);
@@ -370,7 +356,7 @@ export default mixins(showMessage).extend({
 		onTypeSelectInput(destinationType: MessageEventBusDestinationTypeNames) {
 			this.typeSelectValue = destinationType;
 		},
-		onContinueAddClicked() {
+		async onContinueAddClicked() {
 			let newDestination;
 			switch (this.typeSelectValue) {
 				case MessageEventBusDestinationTypeNames.syslog:
@@ -390,6 +376,7 @@ export default mixins(showMessage).extend({
 					);
 					break;
 			}
+
 			if (newDestination) {
 				this.headerLabel = newDestination?.label ?? this.headerLabel;
 				this.setupNode(newDestination);
@@ -399,9 +386,9 @@ export default mixins(showMessage).extend({
 			this.unchanged = false;
 			this.testMessageSent = false;
 			const newValue: NodeParameterValue = parameterData.value as string | number;
-			const parameterPath = parameterData.name.startsWith('parameters.')
+			const parameterPath = parameterData.name?.startsWith('parameters.')
 				? parameterData.name.split('.').slice(1).join('.')
-				: parameterData.name;
+				: parameterData.name || '';
 
 			const nodeParameters = deepCopy(this.nodeParameters);
 
@@ -412,13 +399,13 @@ export default mixins(showMessage).extend({
 			// Apply the new value
 			if (parameterData.value === undefined && parameterPathArray !== null) {
 				// Delete array item
-				const path = parameterPathArray[1];
+				const path = parameterPathArray[1] as keyof MessageEventBusDestinationOptions;
 				const index = parameterPathArray[2];
 				const data = get(nodeParameters, path);
 
 				if (Array.isArray(data)) {
 					data.splice(parseInt(index, 10), 1);
-					Vue.set(nodeParameters, path, data);
+					nodeParameters[path] = data as never;
 				}
 			} else {
 				if (newValue === undefined) {
@@ -442,17 +429,23 @@ export default mixins(showMessage).extend({
 			this.testMessageSent = true;
 		},
 		async removeThis() {
-			const deleteConfirmed = await this.confirmMessage(
+			const deleteConfirmed = await this.confirm(
 				this.$locale.baseText('settings.log-streaming.destinationDelete.message', {
 					interpolate: { destinationName: this.destination.label },
 				}),
 				this.$locale.baseText('settings.log-streaming.destinationDelete.headline'),
-				'warning',
-				this.$locale.baseText('settings.log-streaming.destinationDelete.confirmButtonText'),
-				this.$locale.baseText('settings.log-streaming.destinationDelete.cancelButtonText'),
+				{
+					type: 'warning',
+					confirmButtonText: this.$locale.baseText(
+						'settings.log-streaming.destinationDelete.confirmButtonText',
+					),
+					cancelButtonText: this.$locale.baseText(
+						'settings.log-streaming.destinationDelete.cancelButtonText',
+					),
+				},
 			);
 
-			if (deleteConfirmed === false) {
+			if (deleteConfirmed !== MODAL_CONFIRM) {
 				return;
 			} else {
 				this.eventBus.emit('remove', this.destination.id);
@@ -474,12 +467,40 @@ export default mixins(showMessage).extend({
 				return;
 			}
 			const saveResult = await this.logStreamingStore.saveDestination(this.nodeParameters);
-			if (saveResult === true) {
+			if (saveResult) {
 				this.hasOnceBeenSaved = true;
 				this.testMessageSent = false;
 				this.unchanged = true;
 				this.eventBus.emit('destinationWasSaved', this.destination.id);
 				this.uiStore.stateIsDirty = false;
+
+				const destinationType = (this.nodeParameters.__type ?? 'unknown')
+					.replace('$$MessageEventBusDestination', '')
+					.toLowerCase();
+
+				const isComplete = () => {
+					if (this.isTypeWebhook) {
+						return this.destination.host !== '';
+					} else if (this.isTypeSentry) {
+						return this.destination.dsn !== '';
+					} else if (this.isTypeSyslog) {
+						return (
+							this.destination.host !== '' &&
+							this.destination.port !== undefined &&
+							this.destination.protocol !== '' &&
+							this.destination.facility !== undefined &&
+							this.destination.app_name !== ''
+						);
+					}
+					return false;
+				};
+
+				useTelemetry().track('User updated log streaming destination', {
+					instance_id: useRootStore().instanceId,
+					destination_type: destinationType,
+					is_complete: isComplete(),
+					is_active: this.destination.enabled,
+				});
 			}
 		},
 	},
diff --git a/packages/editor-ui/src/components/SettingsLogStreaming/EventSelection.ee.vue b/packages/editor-ui/src/components/SettingsLogStreaming/EventSelection.ee.vue
index 0ed8883ef3bae..26efa0a1d0535 100644
--- a/packages/editor-ui/src/components/SettingsLogStreaming/EventSelection.ee.vue
+++ b/packages/editor-ui/src/components/SettingsLogStreaming/EventSelection.ee.vue
@@ -6,12 +6,12 @@
 			shadow="never"
 		>
 			<!-- <template #header> -->
-			<checkbox
-				:value="group.selected"
+			<Checkbox
+				:model-value="group.selected"
 				:indeterminate="!group.selected && group.indeterminate"
-				@input="onInput"
-				@change="onCheckboxChecked(group.name, $event)"
 				:disabled="readonly"
+				@update:model-value="onInput"
+				@change="onCheckboxChecked(group.name, $event)"
 			>
 				<strong>{{ groupLabelName(group.name) }}</strong>
 				<n8n-tooltip
@@ -20,27 +20,27 @@
 					:popper-class="$style.tooltipPopper"
 					class="ml-xs"
 				>
-					<n8n-icon icon="question-circle" size="small" />
+					<n8n-icon icon="question-circle" size="small" class="ml-4xs" />
 					<template #content>
 						{{ groupLabelInfo(group.name) }}
 					</template>
 				</n8n-tooltip>
-			</checkbox>
-			<checkbox
+			</Checkbox>
+			<Checkbox
 				v-if="group.name === 'n8n.audit'"
-				:value="logStreamingStore.items[destinationId]?.destination.anonymizeAuditMessages"
-				@input="onInput"
-				@change="anonymizeAuditMessagesChanged"
+				:model-value="logStreamingStore.items[destinationId]?.destination.anonymizeAuditMessages"
 				:disabled="readonly"
+				@update:model-value="onInput"
+				@change="anonymizeAuditMessagesChanged"
 			>
 				{{ $locale.baseText('settings.log-streaming.tab.events.anonymize') }}
 				<n8n-tooltip placement="top" :popper-class="$style.tooltipPopper">
-					<n8n-icon icon="question-circle" size="small" />
+					<n8n-icon icon="question-circle" size="small" class="ml-4xs" />
 					<template #content>
 						{{ $locale.baseText('settings.log-streaming.tab.events.anonymize.info') }}
 					</template>
 				</n8n-tooltip>
-			</checkbox>
+			</Checkbox>
 			<!-- </template> -->
 			<ul :class="$style.eventList">
 				<li
@@ -48,11 +48,11 @@
 					:key="event.name"
 					:class="`${$style.eventListItem} ${group.selected ? $style.eventListItemDisabled : ''}`"
 				>
-					<checkbox
-						:value="event.selected || group.selected"
+					<Checkbox
+						:model-value="event.selected || group.selected"
 						:indeterminate="event.indeterminate"
 						:disabled="group.selected || readonly"
-						@input="onInput"
+						@update:model-value="onInput"
 						@change="onCheckboxChecked(event.name, $event)"
 					>
 						{{ event.label }}
@@ -61,7 +61,7 @@
 								{{ event.name }}
 							</template>
 						</n8n-tooltip>
-					</checkbox>
+					</Checkbox>
 				</li>
 			</ul>
 		</div>
@@ -69,13 +69,16 @@
 </template>
 
 <script lang="ts">
-import { Checkbox } from 'element-ui';
+import { ElCheckbox as Checkbox } from 'element-plus';
 import { mapStores } from 'pinia';
-import type { BaseTextKey } from '../../plugins/i18n';
-import { useLogStreamingStore } from '../../stores/logStreamingStore';
+import type { BaseTextKey } from '@/plugins/i18n';
+import { useLogStreamingStore } from '@/stores/logStreaming.store';
 
 export default {
-	name: 'event-selection',
+	name: 'EventSelection',
+	components: {
+		Checkbox,
+	},
 	props: {
 		destinationId: {
 			type: String,
@@ -83,9 +86,6 @@ export default {
 		},
 		readonly: Boolean,
 	},
-	components: {
-		Checkbox,
-	},
 	data() {
 		return {
 			unchanged: true,
diff --git a/packages/editor-ui/src/components/SettingsLogStreaming/Helpers.ee.ts b/packages/editor-ui/src/components/SettingsLogStreaming/Helpers.ee.ts
index 23984bc8cf4a2..e7e65d5eb1c0e 100644
--- a/packages/editor-ui/src/components/SettingsLogStreaming/Helpers.ee.ts
+++ b/packages/editor-ui/src/components/SettingsLogStreaming/Helpers.ee.ts
@@ -3,7 +3,7 @@ import type {
 	INodeParameters,
 	MessageEventBusDestinationOptions,
 } from 'n8n-workflow';
-import type { INodeUi } from '../../Interface';
+import type { INodeUi } from '@/Interface';
 
 export function destinationToFakeINodeUi(
 	destination: MessageEventBusDestinationOptions,
diff --git a/packages/editor-ui/src/components/SettingsSidebar.vue b/packages/editor-ui/src/components/SettingsSidebar.vue
index e024bd96be2a4..269617bea14eb 100644
--- a/packages/editor-ui/src/components/SettingsSidebar.vue
+++ b/packages/editor-ui/src/components/SettingsSidebar.vue
@@ -2,7 +2,7 @@
 	<div :class="$style.container">
 		<n8n-menu :items="sidebarMenuItems" @select="handleSelect">
 			<template #header>
-				<div :class="$style.returnButton" @click="$emit('return')" data-test-id="settings-back">
+				<div :class="$style.returnButton" data-test-id="settings-back" @click="$emit('return')">
 					<i class="mr-xs">
 						<font-awesome-icon icon="arrow-left" />
 					</i>
@@ -11,7 +11,7 @@
 			</template>
 			<template #menuSuffix>
 				<div :class="$style.versionContainer">
-					<n8n-link @click="onVersionClick" size="small">
+					<n8n-link size="small" @click="onVersionClick">
 						{{ $locale.baseText('settings.version') }} {{ rootStore.versionCli }}
 					</n8n-link>
 				</div>
@@ -21,19 +21,21 @@
 </template>
 
 <script lang="ts">
-import mixins from 'vue-typed-mixins';
+import { defineComponent } from 'vue';
+import { mapStores } from 'pinia';
 import { ABOUT_MODAL_KEY, VERSIONS_MODAL_KEY, VIEWS } from '@/constants';
 import { userHelpers } from '@/mixins/userHelpers';
 import type { IFakeDoor } from '@/Interface';
 import type { IMenuItem } from 'n8n-design-system';
 import type { BaseTextKey } from '@/plugins/i18n';
-import { mapStores } from 'pinia';
-import { useUIStore } from '@/stores/ui';
-import { useSettingsStore } from '@/stores/settings';
-import { useRootStore } from '@/stores/n8nRootStore';
+import { useUIStore } from '@/stores/ui.store';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import { hasPermission } from '@/rbac/permissions';
 
-export default mixins(userHelpers).extend({
+export default defineComponent({
 	name: 'SettingsSidebar',
+	mixins: [userHelpers],
 	computed: {
 		...mapStores(useRootStore, useSettingsStore, useUIStore),
 		settingsFakeDoorFeatures(): IFakeDoor[] {
@@ -47,7 +49,7 @@ export default mixins(userHelpers).extend({
 					label: this.$locale.baseText('settings.usageAndPlan.title'),
 					position: 'top',
 					available: this.canAccessUsageAndPlan(),
-					activateOnRouteNames: [VIEWS.USAGE],
+					route: { to: { name: VIEWS.USAGE } },
 				},
 				{
 					id: 'settings-personal',
@@ -55,7 +57,7 @@ export default mixins(userHelpers).extend({
 					label: this.$locale.baseText('settings.personal'),
 					position: 'top',
 					available: this.canAccessPersonalSettings(),
-					activateOnRouteNames: [VIEWS.PERSONAL_SETTINGS],
+					route: { to: { name: VIEWS.PERSONAL_SETTINGS } },
 				},
 				{
 					id: 'settings-users',
@@ -63,7 +65,7 @@ export default mixins(userHelpers).extend({
 					label: this.$locale.baseText('settings.users'),
 					position: 'top',
 					available: this.canAccessUsersSettings(),
-					activateOnRouteNames: [VIEWS.USERS_SETTINGS],
+					route: { to: { name: VIEWS.USERS_SETTINGS } },
 				},
 				{
 					id: 'settings-api',
@@ -71,15 +73,24 @@ export default mixins(userHelpers).extend({
 					label: this.$locale.baseText('settings.n8napi'),
 					position: 'top',
 					available: this.canAccessApiSettings(),
-					activateOnRouteNames: [VIEWS.API_SETTINGS],
+					route: { to: { name: VIEWS.API_SETTINGS } },
 				},
 				{
-					id: 'settings-version-control',
+					id: 'settings-external-secrets',
+					icon: 'vault',
+					label: this.$locale.baseText('settings.externalSecrets.title'),
+					position: 'top',
+					available: this.canAccessExternalSecrets(),
+					route: { to: { name: VIEWS.EXTERNAL_SECRETS_SETTINGS } },
+				},
+
+				{
+					id: 'settings-source-control',
 					icon: 'code-branch',
-					label: this.$locale.baseText('settings.versionControl.title'),
+					label: this.$locale.baseText('settings.sourceControl.title'),
 					position: 'top',
-					available: this.canAccessVersionControl(),
-					activateOnRouteNames: [VIEWS.VERSION_CONTROL],
+					available: this.canAccessSourceControl(),
+					route: { to: { name: VIEWS.SOURCE_CONTROL } },
 				},
 				{
 					id: 'settings-sso',
@@ -87,7 +98,7 @@ export default mixins(userHelpers).extend({
 					label: this.$locale.baseText('settings.sso'),
 					position: 'top',
 					available: this.canAccessSso(),
-					activateOnRouteNames: [VIEWS.SSO_SETTINGS],
+					route: { to: { name: VIEWS.SSO_SETTINGS } },
 				},
 				{
 					id: 'settings-ldap',
@@ -95,7 +106,17 @@ export default mixins(userHelpers).extend({
 					label: this.$locale.baseText('settings.ldap'),
 					position: 'top',
 					available: this.canAccessLdapSettings(),
-					activateOnRouteNames: [VIEWS.LDAP_SETTINGS],
+					route: { to: { name: VIEWS.LDAP_SETTINGS } },
+				},
+				{
+					id: 'settings-workersview',
+					icon: 'project-diagram',
+					label: this.$locale.baseText('mainSidebar.workersView'),
+					position: 'top',
+					available:
+						this.settingsStore.isQueueModeEnabled &&
+						hasPermission(['rbac'], { rbac: { scope: 'workersView:manage' } }),
+					route: { to: { name: VIEWS.WORKER_VIEW } },
 				},
 			];
 
@@ -103,7 +124,7 @@ export default mixins(userHelpers).extend({
 				if (item.uiLocations.includes('settings')) {
 					menuItems.push({
 						id: item.id,
-						icon: item.icon || 'question',
+						icon: item.icon ?? 'question',
 						label: this.$locale.baseText(item.featureName as BaseTextKey),
 						position: 'top',
 						available: true,
@@ -118,7 +139,7 @@ export default mixins(userHelpers).extend({
 				label: this.$locale.baseText('settings.log-streaming'),
 				position: 'top',
 				available: this.canAccessLogStreamingSettings(),
-				activateOnRouteNames: [VIEWS.LOG_STREAMING_SETTINGS],
+				route: { to: { name: VIEWS.LOG_STREAMING_SETTINGS } },
 			});
 
 			menuItems.push({
@@ -127,7 +148,16 @@ export default mixins(userHelpers).extend({
 				label: this.$locale.baseText('settings.communityNodes'),
 				position: 'top',
 				available: this.canAccessCommunityNodes(),
-				activateOnRouteNames: [VIEWS.COMMUNITY_NODES],
+				route: { to: { name: VIEWS.COMMUNITY_NODES } },
+			});
+
+			menuItems.push({
+				id: 'settings-test-suites',
+				icon: 'chart-bar',
+				label: this.$locale.baseText('settings.testSuites'),
+				position: 'top',
+				available: true,
+				route: { to: { name: VIEWS.TEST_SUITES } },
 			});
 
 			return menuItems;
@@ -155,8 +185,11 @@ export default mixins(userHelpers).extend({
 		canAccessUsageAndPlan(): boolean {
 			return this.canUserAccessRouteByName(VIEWS.USAGE);
 		},
-		canAccessVersionControl(): boolean {
-			return this.canUserAccessRouteByName(VIEWS.VERSION_CONTROL);
+		canAccessExternalSecrets(): boolean {
+			return this.canUserAccessRouteByName(VIEWS.EXTERNAL_SECRETS_SETTINGS);
+		},
+		canAccessSourceControl(): boolean {
+			return this.canUserAccessRouteByName(VIEWS.SOURCE_CONTROL);
 		},
 		canAccessSso(): boolean {
 			return this.canUserAccessRouteByName(VIEWS.SSO_SETTINGS);
@@ -167,56 +200,20 @@ export default mixins(userHelpers).extend({
 		openUpdatesPanel() {
 			this.uiStore.openModal(VERSIONS_MODAL_KEY);
 		},
+		async navigateTo(routeName: (typeof VIEWS)[keyof typeof VIEWS]) {
+			if (this.$router.currentRoute.name !== routeName) {
+				await this.$router.push({ name: routeName });
+			}
+		},
 		async handleSelect(key: string) {
 			switch (key) {
-				case 'settings-personal':
-					if (this.$router.currentRoute.name !== VIEWS.PERSONAL_SETTINGS) {
-						this.$router.push({ name: VIEWS.PERSONAL_SETTINGS });
-					}
-					break;
-				case 'settings-users':
-					if (this.$router.currentRoute.name !== VIEWS.USERS_SETTINGS) {
-						this.$router.push({ name: VIEWS.USERS_SETTINGS });
-					}
-					break;
-				case 'settings-api':
-					if (this.$router.currentRoute.name !== VIEWS.API_SETTINGS) {
-						this.$router.push({ name: VIEWS.API_SETTINGS });
-					}
-					break;
-				case 'settings-ldap':
-					if (this.$router.currentRoute.name !== VIEWS.LDAP_SETTINGS) {
-						this.$router.push({ name: VIEWS.LDAP_SETTINGS });
-					}
-					break;
-				case 'settings-log-streaming':
-					if (this.$router.currentRoute.name !== VIEWS.LOG_STREAMING_SETTINGS) {
-						this.$router.push({ name: VIEWS.LOG_STREAMING_SETTINGS });
-					}
-					break;
 				case 'users': // Fakedoor feature added via hooks when user management is disabled on cloud
-				case 'environments':
 				case 'logging':
 					this.$router.push({ name: VIEWS.FAKE_DOOR, params: { featureId: key } }).catch(() => {});
 					break;
-				case 'settings-community-nodes':
-					if (this.$router.currentRoute.name !== VIEWS.COMMUNITY_NODES) {
-						this.$router.push({ name: VIEWS.COMMUNITY_NODES });
-					}
-					break;
-				case 'settings-usage-and-plan':
-					if (this.$router.currentRoute.name !== VIEWS.USAGE) {
-						this.$router.push({ name: VIEWS.USAGE });
-					}
-					break;
-				case 'settings-sso':
-					if (this.$router.currentRoute.name !== VIEWS.SSO_SETTINGS) {
-						this.$router.push({ name: VIEWS.SSO_SETTINGS });
-					}
-					break;
-				case 'settings-version-control':
-					if (this.$router.currentRoute.name !== VIEWS.VERSION_CONTROL) {
-						this.$router.push({ name: VIEWS.VERSION_CONTROL });
+				case 'test-suites':
+					if (this.$router.currentRoute.name !== VIEWS.TEST_SUITES) {
+						this.$router.push({ name: VIEWS.TEST_SUITES }).catch(() => {});
 					}
 					break;
 				default:
@@ -230,7 +227,7 @@ export default mixins(userHelpers).extend({
 <style lang="scss" module>
 .container {
 	min-width: $sidebar-expanded-width;
-	height: 100vh;
+	height: 100%;
 	background-color: var(--color-background-xlight);
 	border-right: var(--border-base);
 	position: relative;
@@ -245,8 +242,11 @@ export default mixins(userHelpers).extend({
 	}
 }
 
+.versionContainer {
+	padding: var(--spacing-xs) var(--spacing-l);
+}
+
 @media screen and (max-height: 420px) {
-	.updatesSubmenu,
 	.versionContainer {
 		display: none;
 	}
diff --git a/packages/editor-ui/src/components/SetupWorkflowCredentialsButton/SetupWorkflowCredentialsButton.vue b/packages/editor-ui/src/components/SetupWorkflowCredentialsButton/SetupWorkflowCredentialsButton.vue
new file mode 100644
index 0000000000000..fc6af742cacbf
--- /dev/null
+++ b/packages/editor-ui/src/components/SetupWorkflowCredentialsButton/SetupWorkflowCredentialsButton.vue
@@ -0,0 +1,72 @@
+<script lang="ts" setup>
+import { computed, onBeforeUnmount, watch } from 'vue';
+import { useI18n } from '@/composables/useI18n';
+import { SETUP_CREDENTIALS_MODAL_KEY, TEMPLATE_CREDENTIAL_SETUP_EXPERIMENT } from '@/constants';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import { usePostHog } from '@/stores/posthog.store';
+import { useUIStore } from '@/stores/ui.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { doesNodeHaveAllCredentialsFilled } from '@/utils/nodes/nodeTransforms';
+
+const workflowsStore = useWorkflowsStore();
+const nodeTypesStore = useNodeTypesStore();
+const uiStore = useUIStore();
+const posthogStore = usePostHog();
+const i18n = useI18n();
+
+const isTemplateSetupCompleted = computed(() => {
+	return !!workflowsStore.workflow?.meta?.templateCredsSetupCompleted;
+});
+
+const allCredentialsFilled = computed(() => {
+	if (isTemplateSetupCompleted.value) {
+		return true;
+	}
+
+	const nodes = workflowsStore.getNodes();
+	if (!nodes.length) {
+		return false;
+	}
+
+	return nodes.every((node) => doesNodeHaveAllCredentialsFilled(nodeTypesStore, node));
+});
+
+const showButton = computed(() => {
+	const isFeatureEnabled = posthogStore.isFeatureEnabled(TEMPLATE_CREDENTIAL_SETUP_EXPERIMENT);
+	const isCreatedFromTemplate = !!workflowsStore.workflow?.meta?.templateId;
+	if (!isFeatureEnabled || !isCreatedFromTemplate || isTemplateSetupCompleted.value) {
+		return false;
+	}
+
+	return !allCredentialsFilled.value;
+});
+
+const unsubscribe = watch(allCredentialsFilled, (newValue) => {
+	if (newValue) {
+		workflowsStore.addToWorkflowMetadata({
+			templateCredsSetupCompleted: true,
+		});
+
+		unsubscribe();
+	}
+});
+
+const handleClick = () => {
+	uiStore.openModal(SETUP_CREDENTIALS_MODAL_KEY);
+};
+
+onBeforeUnmount(() => {
+	uiStore.closeModal(SETUP_CREDENTIALS_MODAL_KEY);
+});
+</script>
+
+<template>
+	<n8n-button
+		v-if="showButton"
+		:label="i18n.baseText('nodeView.setupTemplate')"
+		size="large"
+		icon="box-open"
+		type="secondary"
+		@click="handleClick()"
+	/>
+</template>
diff --git a/packages/editor-ui/src/components/SetupWorkflowCredentialsModal/SetupWorkflowCredentialsModal.vue b/packages/editor-ui/src/components/SetupWorkflowCredentialsModal/SetupWorkflowCredentialsModal.vue
new file mode 100644
index 0000000000000..9ed964665fd72
--- /dev/null
+++ b/packages/editor-ui/src/components/SetupWorkflowCredentialsModal/SetupWorkflowCredentialsModal.vue
@@ -0,0 +1,123 @@
+<script lang="ts" setup>
+import Modal from '@/components/Modal.vue';
+import { useSetupWorkflowCredentialsModalState } from '@/components/SetupWorkflowCredentialsModal/useSetupWorkflowCredentialsModalState';
+import { useI18n } from '@/composables/useI18n';
+import N8nHeading from 'n8n-design-system/components/N8nHeading';
+import AppsRequiringCredsNotice from '@/views/SetupWorkflowFromTemplateView/AppsRequiringCredsNotice.vue';
+import SetupTemplateFormStep from '@/views/SetupWorkflowFromTemplateView/SetupTemplateFormStep.vue';
+import { onMounted, onUnmounted } from 'vue';
+import { useTelemetry } from '@/composables/useTelemetry';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useUIStore } from '@/stores/ui.store';
+
+const i18n = useI18n();
+const telemetry = useTelemetry();
+const workflowStore = useWorkflowsStore();
+const uiStore = useUIStore();
+
+const props = defineProps<{
+	modalName: string;
+	data: {};
+}>();
+
+const {
+	appCredentials,
+	credentialUsages,
+	numFilledCredentials,
+	selectedCredentialIdByKey,
+	setInitialCredentialSelection,
+	setCredential,
+	unsetCredential,
+} = useSetupWorkflowCredentialsModalState();
+
+onMounted(() => {
+	setInitialCredentialSelection();
+
+	telemetry.track('User opened cred setup', { source: 'canvas' }, { withPostHog: true });
+});
+
+onUnmounted(() => {
+	telemetry.track('User closed cred setup', {
+		completed: numFilledCredentials.value === credentialUsages.value.length,
+		creds_filled: numFilledCredentials.value,
+		creds_needed: credentialUsages.value.length,
+		workflow_id: workflowStore.workflowId,
+	});
+});
+</script>
+
+<template>
+	<Modal width="700px" max-height="90%" :name="props.modalName">
+		<template #header>
+			<N8nHeading tag="h2" size="xlarge">
+				{{ i18n.baseText('setupCredentialsModal.title') }}
+			</N8nHeading>
+		</template>
+
+		<template #content>
+			<div :class="$style.grid">
+				<div :class="$style.notice" data-test-id="info-callout">
+					<AppsRequiringCredsNotice :app-credentials="appCredentials" />
+				</div>
+
+				<div>
+					<ol :class="$style.appCredentialsContainer">
+						<SetupTemplateFormStep
+							v-for="(credentials, index) in credentialUsages"
+							:key="credentials.key"
+							:class="$style.appCredential"
+							:order="index + 1"
+							:credentials="credentials"
+							:selected-credential-id="selectedCredentialIdByKey[credentials.key]"
+							@credential-selected="setCredential($event.credentialUsageKey, $event.credentialId)"
+							@credential-deselected="unsetCredential($event.credentialUsageKey)"
+						/>
+					</ol>
+				</div>
+			</div>
+		</template>
+
+		<template #footer>
+			<div :class="$style.footer">
+				<n8n-button
+					size="large"
+					:label="i18n.baseText('templateSetup.continue.button')"
+					:disabled="numFilledCredentials === 0"
+					data-test-id="continue-button"
+					@click="uiStore.closeModal(props.modalName)"
+				/>
+			</div>
+		</template>
+	</Modal>
+</template>
+
+<style lang="scss" module>
+.grid {
+	margin: 0 auto;
+	margin-top: var(--spacing-l);
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+}
+
+.notice {
+	margin-bottom: var(--spacing-2xl);
+}
+
+.appCredentialsContainer {
+	display: flex;
+	flex-direction: column;
+	gap: var(--spacing-2xl);
+	margin-bottom: var(--spacing-2xl);
+}
+
+.appCredential:not(:last-of-type) {
+	padding-bottom: var(--spacing-2xl);
+	border-bottom: 1px solid var(--color-foreground-light);
+}
+
+.footer {
+	display: flex;
+	justify-content: flex-end;
+}
+</style>
diff --git a/packages/editor-ui/src/components/SetupWorkflowCredentialsModal/useSetupWorkflowCredentialsModalState.ts b/packages/editor-ui/src/components/SetupWorkflowCredentialsModal/useSetupWorkflowCredentialsModalState.ts
new file mode 100644
index 0000000000000..cd5657f015f9a
--- /dev/null
+++ b/packages/editor-ui/src/components/SetupWorkflowCredentialsModal/useSetupWorkflowCredentialsModalState.ts
@@ -0,0 +1,129 @@
+import { computed } from 'vue';
+import type { INodeCredentialsDetails } from 'n8n-workflow';
+import { useNodeHelpers } from '@/composables/useNodeHelpers';
+import { useCredentialsStore } from '@/stores/credentials.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import type { TemplateCredentialKey } from '@/utils/templates/templateTransforms';
+import { useCredentialSetupState } from '@/views/SetupWorkflowFromTemplateView/useCredentialSetupState';
+
+export const useSetupWorkflowCredentialsModalState = () => {
+	const workflowsStore = useWorkflowsStore();
+	const credentialsStore = useCredentialsStore();
+	const nodeHelpers = useNodeHelpers();
+
+	const workflowNodes = computed(() => {
+		return workflowsStore.allNodes;
+	});
+
+	const {
+		appCredentials,
+		credentialOverrides,
+		credentialUsages,
+		credentialsByKey,
+		numFilledCredentials,
+		selectedCredentialIdByKey,
+		setSelectedCredentialId,
+		unsetSelectedCredential,
+	} = useCredentialSetupState(workflowNodes);
+
+	/**
+	 * Selects initial credentials. For existing workflows this means using
+	 * the credentials that are already set on the nodes.
+	 */
+	const setInitialCredentialSelection = () => {
+		selectedCredentialIdByKey.value = {};
+
+		for (const credUsage of credentialUsages.value) {
+			const typeCredentials = credentialsStore.getCredentialsByType(credUsage.credentialType);
+			// Make sure there is a credential for this type with the given name
+			const credential = typeCredentials.find((cred) => cred.name === credUsage.credentialName);
+			if (!credential) {
+				continue;
+			}
+
+			selectedCredentialIdByKey.value[credUsage.key] = credential.id;
+		}
+	};
+
+	/**
+	 * Sets the given credential to all nodes that use it.
+	 */
+	const setCredential = (credentialKey: TemplateCredentialKey, credentialId: string) => {
+		setSelectedCredentialId(credentialKey, credentialId);
+
+		const usages = credentialsByKey.value.get(credentialKey);
+		if (!usages) {
+			return;
+		}
+
+		const credentialName = credentialsStore.getCredentialById(credentialId)?.name;
+		const credential: INodeCredentialsDetails = {
+			id: credentialId,
+			name: credentialName,
+		};
+
+		usages.usedBy.forEach((node) => {
+			workflowsStore.updateNodeProperties({
+				name: node.name,
+				properties: {
+					position: node.position,
+					credentials: {
+						...node.credentials,
+						[usages.credentialType]: credential,
+					},
+				},
+			});
+
+			// We can't use updateNodeCredentialIssues because the previous
+			// step creates a new instance of the node in the store and
+			// `node` no longer points to the correct node.
+			nodeHelpers.updateNodeCredentialIssuesByName(node.name);
+		});
+
+		setInitialCredentialSelection();
+	};
+
+	/**
+	 * Removes given credential from all nodes that use it.
+	 */
+	const unsetCredential = (credentialKey: TemplateCredentialKey) => {
+		unsetSelectedCredential(credentialKey);
+
+		const usages = credentialsByKey.value.get(credentialKey);
+		if (!usages) {
+			return;
+		}
+
+		usages.usedBy.forEach((node) => {
+			const credentials = { ...node.credentials };
+			delete credentials[usages.credentialType];
+
+			workflowsStore.updateNodeProperties({
+				name: node.name,
+				properties: {
+					position: node.position,
+					credentials,
+				},
+			});
+
+			// We can't use updateNodeCredentialIssues because the previous
+			// step creates a new instance of the node in the store and
+			// `node` no longer points to the correct node.
+			nodeHelpers.updateNodeCredentialIssuesByName(node.name);
+		});
+
+		setInitialCredentialSelection();
+	};
+
+	return {
+		appCredentials,
+		credentialOverrides,
+		credentialUsages,
+		credentialsByKey,
+		numFilledCredentials,
+		selectedCredentialIdByKey,
+		setInitialCredentialSelection,
+		setCredential,
+		unsetCredential,
+	};
+};
diff --git a/packages/editor-ui/src/components/ShortenName.vue b/packages/editor-ui/src/components/ShortenName.vue
index a40b6a7ccfd5f..9d3958457dddd 100644
--- a/packages/editor-ui/src/components/ShortenName.vue
+++ b/packages/editor-ui/src/components/ShortenName.vue
@@ -1,12 +1,12 @@
 <template>
 	<span :title="name" :data-test-id="testId">
-		<slot :shortenedName="shortenedName"></slot>
+		<slot :shortened-name="shortenedName"></slot>
 	</span>
 </template>
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import { shorten } from '@/utils';
+import { shorten } from '@/utils/typesUtils';
 
 const DEFAULT_WORKFLOW_NAME_LIMIT = 25;
 const WORKFLOW_NAME_END_COUNT_TO_KEEP = 4;
diff --git a/packages/editor-ui/src/components/SourceControlPullModal.ee.vue b/packages/editor-ui/src/components/SourceControlPullModal.ee.vue
new file mode 100644
index 0000000000000..9bca97122b6b0
--- /dev/null
+++ b/packages/editor-ui/src/components/SourceControlPullModal.ee.vue
@@ -0,0 +1,161 @@
+<script lang="ts" setup>
+import Modal from './Modal.vue';
+import { SOURCE_CONTROL_PULL_MODAL_KEY } from '@/constants';
+import type { PropType } from 'vue';
+import type { EventBus } from 'n8n-design-system/utils';
+import type { SourceControlAggregatedFile } from '@/Interface';
+import { useI18n } from '@/composables/useI18n';
+import { useLoadingService } from '@/composables/useLoadingService';
+import { useToast } from '@/composables/useToast';
+import { useSourceControlStore } from '@/stores/sourceControl.store';
+import { useUIStore } from '@/stores/ui.store';
+import { useRoute, useRouter } from 'vue-router';
+import { computed, nextTick, ref } from 'vue';
+import { sourceControlEventBus } from '@/event-bus/source-control';
+
+const props = defineProps({
+	data: {
+		type: Object as PropType<{ eventBus: EventBus; status: SourceControlAggregatedFile[] }>,
+		default: () => ({}),
+	},
+});
+
+const incompleteFileTypes = ['variables', 'credential'];
+
+const loadingService = useLoadingService();
+const uiStore = useUIStore();
+const toast = useToast();
+const i18n = useI18n();
+const sourceControlStore = useSourceControlStore();
+const router = useRouter();
+const route = useRoute();
+
+const files = ref<SourceControlAggregatedFile[]>(props.data.status || []);
+
+const workflowFiles = computed(() => {
+	return files.value.filter((file) => file.type === 'workflow');
+});
+
+const modifiedWorkflowFiles = computed(() => {
+	return workflowFiles.value.filter((file) => file.status === 'modified');
+});
+
+const deletedWorkflowFiles = computed(() => {
+	return workflowFiles.value.filter((file) => file.status === 'deleted');
+});
+
+function close() {
+	uiStore.closeModal(SOURCE_CONTROL_PULL_MODAL_KEY);
+}
+
+async function pullWorkfolder() {
+	loadingService.startLoading(i18n.baseText('settings.sourceControl.loading.pull'));
+	close();
+
+	try {
+		await sourceControlStore.pullWorkfolder(true);
+
+		const hasVariablesOrCredentials = files.value.some((file) => {
+			return incompleteFileTypes.includes(file.type);
+		});
+
+		toast.showMessage({
+			title: i18n.baseText('settings.sourceControl.pull.success.title'),
+			type: 'success',
+		});
+
+		if (hasVariablesOrCredentials) {
+			void nextTick(() => {
+				toast.showMessage({
+					message: i18n.baseText('settings.sourceControl.pull.oneLastStep.description'),
+					title: i18n.baseText('settings.sourceControl.pull.oneLastStep.title'),
+					type: 'info',
+					duration: 0,
+					showClose: true,
+					offset: 0,
+				});
+			});
+		}
+		sourceControlEventBus.emit('pull');
+	} catch (error) {
+		toast.showError(error, 'Error');
+	} finally {
+		loadingService.stopLoading();
+	}
+}
+</script>
+
+<template>
+	<Modal
+		width="500px"
+		:title="i18n.baseText('settings.sourceControl.modals.pull.title')"
+		:event-bus="data.eventBus"
+		:name="SOURCE_CONTROL_PULL_MODAL_KEY"
+	>
+		<template #content>
+			<div :class="$style.container">
+				<n8n-text>
+					{{ i18n.baseText('settings.sourceControl.modals.pull.description') }}
+					<n8n-link :to="i18n.baseText('settings.sourceControl.docs.using.pushPull.url')">
+						{{ i18n.baseText('settings.sourceControl.modals.pull.description.learnMore') }}
+					</n8n-link>
+				</n8n-text>
+
+				<div v-if="modifiedWorkflowFiles.length > 0" class="mt-l">
+					<ul :class="$style.filesList">
+						<li v-for="file in modifiedWorkflowFiles" :key="file.id">
+							<n8n-link :class="$style.fileLink" new-window :to="`/workflow/${file.id}`">
+								{{ file.name }}
+								<n8n-icon icon="external-link-alt" />
+							</n8n-link>
+						</li>
+					</ul>
+				</div>
+			</div>
+		</template>
+
+		<template #footer>
+			<div :class="$style.footer">
+				<n8n-button type="tertiary" class="mr-2xs" @click="close">
+					{{ i18n.baseText('settings.sourceControl.modals.pull.buttons.cancel') }}
+				</n8n-button>
+				<n8n-button type="primary" @click="pullWorkfolder">
+					{{ i18n.baseText('settings.sourceControl.modals.pull.buttons.save') }}
+				</n8n-button>
+			</div>
+		</template>
+	</Modal>
+</template>
+
+<style module lang="scss">
+.container > * {
+	overflow-wrap: break-word;
+}
+
+.filesList {
+	list-style: inside;
+	margin-top: var(--spacing-3xs);
+	padding-left: var(--spacing-2xs);
+
+	li {
+		margin-top: var(--spacing-3xs);
+	}
+}
+
+.fileLink {
+	svg {
+		display: none;
+		margin-left: var(--spacing-4xs);
+	}
+
+	&:hover svg {
+		display: inline-flex;
+	}
+}
+
+.footer {
+	display: flex;
+	flex-direction: row;
+	justify-content: flex-end;
+}
+</style>
diff --git a/packages/editor-ui/src/components/SourceControlPushModal.ee.vue b/packages/editor-ui/src/components/SourceControlPushModal.ee.vue
new file mode 100644
index 0000000000000..212516588c137
--- /dev/null
+++ b/packages/editor-ui/src/components/SourceControlPushModal.ee.vue
@@ -0,0 +1,402 @@
+<script lang="ts" setup>
+import Modal from './Modal.vue';
+import { CREDENTIAL_EDIT_MODAL_KEY, SOURCE_CONTROL_PUSH_MODAL_KEY } from '@/constants';
+import { computed, onMounted, ref } from 'vue';
+import type { PropType } from 'vue';
+import type { EventBus } from 'n8n-design-system/utils';
+import type { SourceControlAggregatedFile } from '@/Interface';
+import { useI18n } from '@/composables/useI18n';
+import { useLoadingService } from '@/composables/useLoadingService';
+import { useToast } from '@/composables/useToast';
+import { useSourceControlStore } from '@/stores/sourceControl.store';
+import { useUIStore } from '@/stores/ui.store';
+import { useRoute } from 'vue-router';
+import dateformat from 'dateformat';
+
+const props = defineProps({
+	data: {
+		type: Object as PropType<{ eventBus: EventBus; status: SourceControlAggregatedFile[] }>,
+		default: () => ({}),
+	},
+});
+
+const defaultStagedFileTypes = ['tags', 'variables', 'credential'];
+
+const loadingService = useLoadingService();
+const uiStore = useUIStore();
+const toast = useToast();
+const i18n = useI18n();
+const sourceControlStore = useSourceControlStore();
+const route = useRoute();
+
+const staged = ref<Record<string, boolean>>({});
+const files = ref<SourceControlAggregatedFile[]>(
+	props.data.status.filter((file, index, self) => {
+		// do not show remote workflows that are not yet created locally during push
+		if (file.location === 'remote' && file.type === 'workflow' && file.status === 'created') {
+			return false;
+		}
+		return self.findIndex((f) => f.id === file.id) === index;
+	}) || [],
+);
+
+const commitMessage = ref('');
+const loading = ref(true);
+const context = ref<'workflow' | 'workflows' | 'credentials' | string>('');
+
+const statusToBadgeThemeMap = {
+	created: 'success',
+	deleted: 'danger',
+	modified: 'warning',
+	renamed: 'warning',
+};
+
+const isSubmitDisabled = computed(() => {
+	return !commitMessage.value || Object.values(staged.value).every((value) => !value);
+});
+
+const workflowId = computed(() => {
+	if (context.value === 'workflow') {
+		return route.params.name as string;
+	}
+
+	return '';
+});
+
+const sortedFiles = computed(() => {
+	const statusPriority = {
+		modified: 1,
+		renamed: 2,
+		created: 3,
+		deleted: 4,
+	};
+
+	return [...files.value].sort((a, b) => {
+		if (context.value === 'workflow') {
+			if (a.id === workflowId.value) {
+				return -1;
+			} else if (b.id === workflowId.value) {
+				return 1;
+			}
+		}
+
+		if (statusPriority[a.status] < statusPriority[b.status]) {
+			return -1;
+		} else if (statusPriority[a.status] > statusPriority[b.status]) {
+			return 1;
+		}
+
+		return a.updatedAt < b.updatedAt ? 1 : a.updatedAt > b.updatedAt ? -1 : 0;
+	});
+});
+
+const selectAll = computed(() => {
+	return files.value.every((file) => staged.value[file.file]);
+});
+
+const workflowFiles = computed(() => {
+	return files.value.filter((file) => file.type === 'workflow');
+});
+
+const stagedWorkflowFiles = computed(() => {
+	return workflowFiles.value.filter((workflow) => staged.value[workflow.file]);
+});
+
+const selectAllIndeterminate = computed(() => {
+	return (
+		stagedWorkflowFiles.value.length > 0 &&
+		stagedWorkflowFiles.value.length < workflowFiles.value.length
+	);
+});
+
+onMounted(async () => {
+	context.value = getContext();
+	try {
+		staged.value = getStagedFilesByContext(files.value);
+	} catch (error) {
+		toast.showError(error, i18n.baseText('error'));
+	} finally {
+		loading.value = false;
+	}
+});
+
+function onToggleSelectAll() {
+	if (selectAll.value) {
+		files.value.forEach((file) => {
+			if (!defaultStagedFileTypes.includes(file.type)) {
+				staged.value[file.file] = false;
+			}
+		});
+	} else {
+		files.value.forEach((file) => {
+			if (!defaultStagedFileTypes.includes(file.type)) {
+				staged.value[file.file] = true;
+			}
+		});
+	}
+}
+
+function getContext() {
+	if (route.fullPath.startsWith('/workflows')) {
+		return 'workflows';
+	} else if (
+		route.fullPath.startsWith('/credentials') ||
+		uiStore.modals[CREDENTIAL_EDIT_MODAL_KEY].open
+	) {
+		return 'credentials';
+	} else if (route.fullPath.startsWith('/workflow/')) {
+		return 'workflow';
+	}
+
+	return '';
+}
+
+function getStagedFilesByContext(files: SourceControlAggregatedFile[]): Record<string, boolean> {
+	const stagedFiles = files.reduce((acc, file) => {
+		acc[file.file] = false;
+		return acc;
+	}, {});
+
+	files.forEach((file) => {
+		if (defaultStagedFileTypes.includes(file.type)) {
+			stagedFiles[file.file] = true;
+		}
+
+		if (context.value === 'workflow') {
+			if (file.type === 'workflow' && file.id === workflowId.value) {
+				stagedFiles[file.file] = true;
+			}
+		}
+	});
+
+	return stagedFiles;
+}
+
+function setStagedStatus(file: SourceControlAggregatedFile, status: boolean) {
+	staged.value = {
+		...staged.value,
+		[file.file]: status,
+	};
+}
+
+function close() {
+	uiStore.closeModal(SOURCE_CONTROL_PUSH_MODAL_KEY);
+}
+
+function renderUpdatedAt(file: SourceControlAggregatedFile) {
+	const currentYear = new Date().getFullYear();
+
+	return i18n.baseText('settings.sourceControl.lastUpdated', {
+		interpolate: {
+			date: dateformat(
+				file.updatedAt,
+				`d mmm${file.updatedAt.startsWith(currentYear) ? '' : ', yyyy'}`,
+			),
+			time: dateformat(file.updatedAt, 'HH:MM'),
+		},
+	});
+}
+
+async function onCommitKeyDownEnter() {
+	if (!isSubmitDisabled.value) {
+		await commitAndPush();
+	}
+}
+
+async function commitAndPush() {
+	const fileNames = files.value.filter((file) => staged.value[file.file]);
+
+	loadingService.startLoading(i18n.baseText('settings.sourceControl.loading.push'));
+	close();
+
+	try {
+		await sourceControlStore.pushWorkfolder({
+			force: true,
+			commitMessage: commitMessage.value,
+			fileNames,
+		});
+
+		toast.showToast({
+			title: i18n.baseText('settings.sourceControl.modals.push.success.title'),
+			message: i18n.baseText('settings.sourceControl.modals.push.success.description'),
+			type: 'success',
+		});
+	} catch (error) {
+		toast.showError(error, i18n.baseText('error'));
+	} finally {
+		loadingService.stopLoading();
+	}
+}
+</script>
+
+<template>
+	<Modal
+		width="812px"
+		:title="i18n.baseText('settings.sourceControl.modals.push.title')"
+		:event-bus="data.eventBus"
+		:name="SOURCE_CONTROL_PUSH_MODAL_KEY"
+		max-height="80%"
+	>
+		<template #content>
+			<div :class="$style.container">
+				<div v-if="files.length > 0">
+					<div v-if="workflowFiles.length > 0">
+						<n8n-text>
+							{{ i18n.baseText('settings.sourceControl.modals.push.description') }}
+							<n8n-link :to="i18n.baseText('settings.sourceControl.docs.using.pushPull.url')">
+								{{ i18n.baseText('settings.sourceControl.modals.push.description.learnMore') }}
+							</n8n-link>
+						</n8n-text>
+
+						<div class="mt-l mb-2xs">
+							<n8n-checkbox
+								:indeterminate="selectAllIndeterminate"
+								:model-value="selectAll"
+								@update:model-value="onToggleSelectAll"
+							>
+								<n8n-text bold tag="strong">
+									{{ i18n.baseText('settings.sourceControl.modals.push.workflowsToCommit') }}
+								</n8n-text>
+								<n8n-text v-show="workflowFiles.length > 0" tag="strong">
+									({{ stagedWorkflowFiles.length }}/{{ workflowFiles.length }})
+								</n8n-text>
+							</n8n-checkbox>
+						</div>
+						<n8n-card
+							v-for="file in sortedFiles"
+							v-show="!defaultStagedFileTypes.includes(file.type)"
+							:key="file.file"
+							:class="$style.listItem"
+							@click="setStagedStatus(file, !staged[file.file])"
+						>
+							<div :class="$style.listItemBody">
+								<n8n-checkbox
+									:model-value="staged[file.file]"
+									:class="$style.listItemCheckbox"
+									@update:model-value="setStagedStatus(file, !staged[file.file])"
+								/>
+								<div>
+									<n8n-text v-if="file.status === 'deleted'" color="text-light">
+										<span v-if="file.type === 'workflow'"> Deleted Workflow: </span>
+										<span v-if="file.type === 'credential'"> Deleted Credential: </span>
+										<strong>{{ file.name || file.id }}</strong>
+									</n8n-text>
+									<n8n-text v-else bold> {{ file.name }} </n8n-text>
+									<div v-if="file.updatedAt">
+										<n8n-text color="text-light" size="small">
+											{{ renderUpdatedAt(file) }}
+										</n8n-text>
+									</div>
+								</div>
+								<div :class="$style.listItemStatus">
+									<n8n-badge
+										v-if="workflowId === file.id && file.type === 'workflow'"
+										class="mr-2xs"
+									>
+										Current workflow
+									</n8n-badge>
+									<n8n-badge :theme="statusToBadgeThemeMap[file.status] || 'default'">
+										{{ i18n.baseText(`settings.sourceControl.status.${file.status}`) }}
+									</n8n-badge>
+								</div>
+							</div>
+						</n8n-card>
+					</div>
+					<n8n-notice v-else class="mt-0">
+						<i18n-t keypath="settings.sourceControl.modals.push.noWorkflowChanges">
+							<template #link>
+								<n8n-link size="small" :to="i18n.baseText('settings.sourceControl.docs.using.url')">
+									{{
+										i18n.baseText('settings.sourceControl.modals.push.noWorkflowChanges.moreInfo')
+									}}
+								</n8n-link>
+							</template>
+						</i18n-t>
+					</n8n-notice>
+
+					<n8n-text bold tag="p" class="mt-l mb-2xs">
+						{{ i18n.baseText('settings.sourceControl.modals.push.commitMessage') }}
+					</n8n-text>
+					<n8n-input
+						v-model="commitMessage"
+						type="text"
+						:placeholder="
+							i18n.baseText('settings.sourceControl.modals.push.commitMessage.placeholder')
+						"
+						@keydown.enter="onCommitKeyDownEnter"
+					/>
+				</div>
+				<div v-else-if="!loading">
+					<n8n-notice class="mt-0 mb-0">
+						{{ i18n.baseText('settings.sourceControl.modals.push.everythingIsUpToDate') }}
+					</n8n-notice>
+				</div>
+			</div>
+		</template>
+
+		<template #footer>
+			<div :class="$style.footer">
+				<n8n-button type="tertiary" class="mr-2xs" @click="close">
+					{{ i18n.baseText('settings.sourceControl.modals.push.buttons.cancel') }}
+				</n8n-button>
+				<n8n-button type="primary" :disabled="isSubmitDisabled" @click="commitAndPush">
+					{{ i18n.baseText('settings.sourceControl.modals.push.buttons.save') }}
+				</n8n-button>
+			</div>
+		</template>
+	</Modal>
+</template>
+
+<style module lang="scss">
+.container > * {
+	overflow-wrap: break-word;
+}
+
+.actionButtons {
+	display: flex;
+	justify-content: flex-end;
+	align-items: center;
+}
+
+.listItem {
+	margin-top: var(--spacing-2xs);
+	margin-bottom: var(--spacing-2xs);
+	cursor: pointer;
+	transition: border 0.3s ease;
+	padding: var(--spacing-xs);
+
+	&:hover {
+		border-color: var(--color-foreground-dark);
+	}
+
+	&:first-child {
+		margin-top: 0;
+	}
+
+	&:last-child {
+		margin-bottom: 0;
+	}
+}
+
+.listItemBody {
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+}
+
+.listItemCheckbox {
+	display: inline-flex !important;
+	margin-bottom: 0 !important;
+	margin-right: var(--spacing-2xs) !important;
+}
+
+.listItemStatus {
+	margin-left: auto;
+}
+
+.footer {
+	display: flex;
+	flex-direction: row;
+	justify-content: flex-end;
+}
+</style>
diff --git a/packages/editor-ui/src/components/SqlEditor/SqlEditor.vue b/packages/editor-ui/src/components/SqlEditor/SqlEditor.vue
new file mode 100644
index 0000000000000..daa2b33cd08f0
--- /dev/null
+++ b/packages/editor-ui/src/components/SqlEditor/SqlEditor.vue
@@ -0,0 +1,213 @@
+<template>
+	<div :class="$style.sqlEditor">
+		<div ref="sqlEditor" :class="$style.codemirror" data-test-id="sql-editor-container"></div>
+		<slot name="suffix" />
+		<InlineExpressionEditorOutput
+			v-if="!fullscreen"
+			:segments="segments"
+			:is-read-only="isReadOnly"
+			:visible="hasFocus"
+			:hovering-item-number="hoveringItemNumber"
+		/>
+	</div>
+</template>
+
+<script setup lang="ts">
+import InlineExpressionEditorOutput from '@/components/InlineExpressionEditor/InlineExpressionEditorOutput.vue';
+import { codeNodeEditorEventBus } from '@/event-bus';
+import { useExpressionEditor } from '@/composables/useExpressionEditor';
+import { n8nCompletionSources } from '@/plugins/codemirror/completions/addCompletions';
+import { expressionInputHandler } from '@/plugins/codemirror/inputHandlers/expression.inputHandler';
+import {
+	autocompleteKeyMap,
+	enterKeyMap,
+	historyKeyMap,
+	tabKeyMap,
+} from '@/plugins/codemirror/keymap';
+import { n8nAutocompletion } from '@/plugins/codemirror/n8nLang';
+import { useNDVStore } from '@/stores/ndv.store';
+import { ifNotIn } from '@codemirror/autocomplete';
+import { history, toggleComment } from '@codemirror/commands';
+import { LanguageSupport, bracketMatching, foldGutter, indentOnInput } from '@codemirror/language';
+import { Prec, type Line } from '@codemirror/state';
+import {
+	EditorView,
+	dropCursor,
+	highlightActiveLine,
+	highlightActiveLineGutter,
+	keymap,
+	lineNumbers,
+} from '@codemirror/view';
+import {
+	Cassandra,
+	MSSQL,
+	MariaSQL,
+	MySQL,
+	PLSQL,
+	PostgreSQL,
+	SQLite,
+	StandardSQL,
+	keywordCompletionSource,
+} from '@n8n/codemirror-lang-sql';
+import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue';
+import { codeNodeEditorTheme } from '../CodeNodeEditor/theme';
+
+const SQL_DIALECTS = {
+	StandardSQL,
+	PostgreSQL,
+	MySQL,
+	MariaSQL,
+	MSSQL,
+	SQLite,
+	Cassandra,
+	PLSQL,
+} as const;
+
+type Props = {
+	modelValue: string;
+	dialect?: keyof typeof SQL_DIALECTS;
+	rows?: number;
+	isReadOnly?: boolean;
+	fullscreen?: boolean;
+};
+
+const props = withDefaults(defineProps<Props>(), {
+	dialect: 'StandardSQL',
+	rows: 4,
+	isReadOnly: false,
+	fullscreen: false,
+});
+
+const emit = defineEmits<{
+	(event: 'update:model-value', value: string): void;
+}>();
+
+const sqlEditor = ref<HTMLElement>();
+const extensions = computed(() => {
+	const dialect = SQL_DIALECTS[props.dialect] ?? SQL_DIALECTS.StandardSQL;
+	function sqlWithN8nLanguageSupport() {
+		return new LanguageSupport(dialect.language, [
+			dialect.language.data.of({
+				autocomplete: ifNotIn(['Resolvable'], keywordCompletionSource(dialect, true)),
+			}),
+			n8nCompletionSources().map((source) => dialect.language.data.of(source)),
+		]);
+	}
+
+	const baseExtensions = [
+		sqlWithN8nLanguageSupport(),
+		expressionInputHandler(),
+		codeNodeEditorTheme({
+			isReadOnly: props.isReadOnly,
+			maxHeight: props.fullscreen ? '100%' : '40vh',
+			minHeight: '10vh',
+			rows: props.rows,
+		}),
+		lineNumbers(),
+		EditorView.lineWrapping,
+	];
+
+	if (!props.isReadOnly) {
+		return baseExtensions.concat([
+			history(),
+			Prec.highest(
+				keymap.of([
+					...tabKeyMap(),
+					...enterKeyMap,
+					...historyKeyMap,
+					...autocompleteKeyMap,
+					{ key: 'Mod-/', run: toggleComment },
+				]),
+			),
+			n8nAutocompletion(),
+			indentOnInput(),
+			highlightActiveLine(),
+			highlightActiveLineGutter(),
+			foldGutter(),
+			dropCursor(),
+			bracketMatching(),
+		]);
+	}
+	return baseExtensions;
+});
+const editorValue = ref(props.modelValue);
+const {
+	editor,
+	segments: { all: segments },
+	readEditorValue,
+	hasFocus,
+} = useExpressionEditor({
+	editorRef: sqlEditor,
+	editorValue,
+	extensions,
+	skipSegments: ['Statement', 'CompositeIdentifier', 'Parens', 'Brackets'],
+	isReadOnly: props.isReadOnly,
+});
+const ndvStore = useNDVStore();
+
+const hoveringItemNumber = computed(() => {
+	return ndvStore.hoveringItemNumber;
+});
+
+watch(
+	() => props.modelValue,
+	(newValue) => {
+		editorValue.value = newValue;
+	},
+);
+
+watch(segments, () => {
+	emit('update:model-value', readEditorValue());
+});
+
+onMounted(() => {
+	codeNodeEditorEventBus.on('error-line-number', highlightLine);
+
+	if (props.fullscreen) {
+		focus();
+	}
+});
+
+onBeforeUnmount(() => {
+	codeNodeEditorEventBus.off('error-line-number', highlightLine);
+	emit('update:model-value', readEditorValue());
+});
+
+function line(lineNumber: number): Line | null {
+	try {
+		return editor.value?.state.doc.line(lineNumber) ?? null;
+	} catch {
+		return null;
+	}
+}
+
+function highlightLine(lineNumber: number | 'final') {
+	if (!editor.value) return;
+
+	if (lineNumber === 'final') {
+		editor.value.dispatch({
+			selection: { anchor: editor.value.state.doc.length },
+		});
+		return;
+	}
+
+	const lineToHighlight = line(lineNumber);
+
+	if (!lineToHighlight) return;
+
+	editor.value.dispatch({
+		selection: { anchor: lineToHighlight.from },
+	});
+}
+</script>
+
+<style module lang="scss">
+.sqlEditor {
+	position: relative;
+	height: 100%;
+}
+
+.codemirror {
+	height: 100%;
+}
+</style>
diff --git a/packages/editor-ui/src/components/Sticky.vue b/packages/editor-ui/src/components/Sticky.vue
index c01c09514f556..e1ba62303708e 100644
--- a/packages/editor-ui/src/components/Sticky.vue
+++ b/packages/editor-ui/src/components/Sticky.vue
@@ -1,8 +1,8 @@
 <template>
 	<div
-		class="sticky-wrapper"
 		:id="nodeId"
 		:ref="data.name"
+		class="sticky-wrapper"
 		:style="stickyPosition"
 		:data-name="data.name"
 		data-test-id="sticky"
@@ -11,59 +11,102 @@
 			:class="{
 				'sticky-default': true,
 				'touch-active': isTouchActive,
-				'is-touch-device': isTouchDevice,
+				'is-touch-device': deviceSupport.isTouchDevice,
+				'is-read-only': isReadOnly,
 			}"
 			:style="stickySize"
 		>
-			<div class="select-sticky-background" v-show="isSelected" />
+			<div v-show="isSelected" class="select-sticky-background" />
 			<div
-				class="sticky-box"
-				@click.left="mouseLeftClick"
 				v-touch:start="touchStart"
 				v-touch:end="touchEnd"
+				class="sticky-box"
+				@click.left="mouseLeftClick"
+				@contextmenu="onContextMenu"
 			>
 				<n8n-sticky
-					:content.sync="node.parameters.content"
+					:id="node.id"
+					:model-value="node.parameters.content"
 					:height="node.parameters.height"
 					:width="node.parameters.width"
 					:scale="nodeViewScale"
-					:id="node.id"
-					:readOnly="isReadOnly"
-					:defaultText="defaultText"
-					:editMode="isActive && !isReadOnly"
-					:gridSize="gridSize"
-					@input="onInputChange"
+					:background-color="node.parameters.color"
+					:read-only="isReadOnly"
+					:default-text="defaultText"
+					:edit-mode="isActive && !isReadOnly"
+					:grid-size="gridSize"
 					@edit="onEdit"
 					@resizestart="onResizeStart"
 					@resize="onResize"
 					@resizeend="onResizeEnd"
 					@markdown-click="onMarkdownClick"
+					@update:model-value="onInputChange"
 				/>
 			</div>
 
-			<div v-show="showActions" class="sticky-options no-select-on-click">
+			<div
+				v-show="showActions"
+				:class="{ 'sticky-options': true, 'no-select-on-click': true, 'force-show': forceActions }"
+			>
 				<div
 					v-touch:tap="deleteNode"
 					class="option"
 					data-test-id="delete-sticky"
-					:title="$locale.baseText('node.deleteNode')"
+					:title="$locale.baseText('node.delete')"
 				>
 					<font-awesome-icon icon="trash" />
 				</div>
+				<n8n-popover
+					effect="dark"
+					:popper-style="{ width: '208px' }"
+					trigger="click"
+					placement="top"
+					@show="onShowPopover"
+					@hide="onHidePopover"
+				>
+					<template #reference>
+						<div
+							ref="colorPopoverTrigger"
+							class="option"
+							data-test-id="change-sticky-color"
+							:title="$locale.baseText('node.changeColor')"
+						>
+							<font-awesome-icon icon="palette" />
+						</div>
+					</template>
+					<div class="content">
+						<div
+							v-for="(_, index) in Array.from({ length: 7 })"
+							:key="index"
+							class="color"
+							data-test-id="color"
+							:class="`sticky-color-${index + 1}`"
+							:style="{
+								'border-width': '1px',
+								'border-style': 'solid',
+								'border-color': 'var(--color-foreground-xdark)',
+								'background-color': `var(--color-sticky-background-${index + 1})`,
+								'box-shadow':
+									(index === 0 && node?.parameters.color === '') ||
+									index + 1 === node?.parameters.color
+										? `0 0 0 1px var(--color-sticky-background-${index + 1})`
+										: 'none',
+							}"
+							@click="changeColor(index + 1)"
+						></div>
+					</div>
+				</n8n-popover>
 			</div>
 		</div>
 	</div>
 </template>
 
 <script lang="ts">
-import Vue from 'vue';
+import { defineComponent, ref } from 'vue';
+import { mapStores } from 'pinia';
 
-import mixins from 'vue-typed-mixins';
-import { externalHooks } from '@/mixins/externalHooks';
 import { nodeBase } from '@/mixins/nodeBase';
-import { nodeHelpers } from '@/mixins/nodeHelpers';
-import { workflowHelpers } from '@/mixins/workflowHelpers';
-import { getStyleTokenValue, isNumber, isString } from '@/utils';
+import { isNumber, isString } from '@/utils/typeGuards';
 import type {
 	INodeUi,
 	INodeUpdatePropertiesInformation,
@@ -72,16 +115,17 @@ import type {
 } from '@/Interface';
 
 import type { INodeTypeDescription } from 'n8n-workflow';
-import { IDataObject } from 'n8n-workflow';
 import { QUICKSTART_NOTE_NAME } from '@/constants';
-import { mapStores } from 'pinia';
-import { useUIStore } from '@/stores/ui';
-import { useWorkflowsStore } from '@/stores/workflows';
-import { useNDVStore } from '@/stores/ndv';
-import { useNodeTypesStore } from '@/stores/nodeTypes';
+import { useUIStore } from '@/stores/ui.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useNDVStore } from '@/stores/ndv.store';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import { useContextMenu } from '@/composables/useContextMenu';
+import { useDeviceSupport } from 'n8n-design-system';
 
-export default mixins(externalHooks, nodeBase, nodeHelpers, workflowHelpers).extend({
+export default defineComponent({
 	name: 'Sticky',
+	mixins: [nodeBase],
 	props: {
 		nodeViewScale: {
 			type: Number,
@@ -90,6 +134,22 @@ export default mixins(externalHooks, nodeBase, nodeHelpers, workflowHelpers).ext
 			type: Number,
 		},
 	},
+	setup() {
+		const deviceSupport = useDeviceSupport();
+		const colorPopoverTrigger = ref<HTMLDivElement>();
+		const forceActions = ref(false);
+		const setForceActions = (value: boolean) => {
+			forceActions.value = value;
+		};
+		const contextMenu = useContextMenu((action) => {
+			if (action === 'change_color') {
+				setForceActions(true);
+				colorPopoverTrigger.value?.click();
+			}
+		});
+
+		return { deviceSupport, colorPopoverTrigger, contextMenu, forceActions, setForceActions };
+	},
 	computed: {
 		...mapStores(useNodeTypesStore, useNDVStore, useUIStore, useWorkflowsStore),
 		defaultText(): string {
@@ -149,7 +209,10 @@ export default mixins(externalHooks, nodeBase, nodeHelpers, workflowHelpers).ext
 			return returnStyles;
 		},
 		showActions(): boolean {
-			return !(this.hideActions || this.isReadOnly || this.workflowRunning || this.isResizing);
+			return (
+				!(this.hideActions || this.isReadOnly || this.workflowRunning || this.isResizing) ||
+				this.forceActions
+			);
 		},
 		workflowRunning(): boolean {
 			return this.uiStore.isActionActive('workflowRunning');
@@ -162,10 +225,21 @@ export default mixins(externalHooks, nodeBase, nodeHelpers, workflowHelpers).ext
 		};
 	},
 	methods: {
-		deleteNode() {
-			Vue.nextTick(() => {
-				// Wait a tick else vue causes problems because the data is gone
-				this.$emit('removeNode', this.data.name);
+		onShowPopover() {
+			this.setForceActions(true);
+		},
+		onHidePopover() {
+			this.setForceActions(false);
+		},
+		async deleteNode() {
+			// Wait a tick else vue causes problems because the data is gone
+			await this.$nextTick();
+			this.$emit('removeNode', this.data.name);
+		},
+		changeColor(index: number) {
+			this.workflowsStore.updateNodeProperties({
+				name: this.name,
+				properties: { parameters: { ...this.node.parameters, color: index } },
 			});
 		},
 		onEdit(edit: boolean) {
@@ -183,13 +257,14 @@ export default mixins(externalHooks, nodeBase, nodeHelpers, workflowHelpers).ext
 					isOnboardingNote && isWelcomeVideo
 						? 'welcome_video'
 						: isOnboardingNote && link.getAttribute('href') === '/templates'
-						? 'templates'
-						: 'other';
+							? 'templates'
+							: 'other';
 
 				this.$telemetry.track('User clicked note link', { type });
 			}
 		},
 		onInputChange(content: string) {
+			this.node.parameters.content = content;
 			this.setParameters({ content });
 		},
 		onResizeStart() {
@@ -211,12 +286,13 @@ export default mixins(externalHooks, nodeBase, nodeHelpers, workflowHelpers).ext
 		onResizeEnd() {
 			this.isResizing = false;
 		},
-		setParameters(params: { content?: string; height?: number; width?: number }) {
+		setParameters(params: { content?: string; height?: number; width?: number; color?: string }) {
 			if (this.node) {
 				const nodeParameters = {
 					content: isString(params.content) ? params.content : this.node.parameters.content,
 					height: isNumber(params.height) ? params.height : this.node.parameters.height,
 					width: isNumber(params.width) ? params.width : this.node.parameters.width,
+					color: isString(params.color) ? params.color : this.node.parameters.color,
 				};
 
 				const updateInformation: IUpdateInformation = {
@@ -243,13 +319,20 @@ export default mixins(externalHooks, nodeBase, nodeHelpers, workflowHelpers).ext
 			this.workflowsStore.updateNodeProperties(updateInformation);
 		},
 		touchStart() {
-			if (this.isTouchDevice === true && this.isMacOs === false && this.isTouchActive === false) {
+			if (this.deviceSupport.isTouchDevice && !this.isMacOs && !this.isTouchActive) {
 				this.isTouchActive = true;
 				setTimeout(() => {
 					this.isTouchActive = false;
 				}, 2000);
 			}
 		},
+		onContextMenu(e: MouseEvent): void {
+			if (this.node && !this.isActive) {
+				this.contextMenu.open(e, { source: 'node-right-click', node: this.node });
+			} else {
+				e.stopPropagation();
+			}
+		},
 	},
 });
 </script>
@@ -272,6 +355,10 @@ export default mixins(externalHooks, nodeBase, nodeHelpers, workflowHelpers).ext
 			}
 		}
 
+		&.is-read-only {
+			pointer-events: none;
+		}
+
 		.sticky-options {
 			display: none;
 			justify-content: flex-start;
@@ -299,6 +386,10 @@ export default mixins(externalHooks, nodeBase, nodeHelpers, workflowHelpers).ext
 			}
 		}
 
+		.force-show {
+			display: flex;
+		}
+
 		&.is-touch-device .sticky-options {
 			left: -25px;
 			width: 150px;
@@ -313,12 +404,7 @@ export default mixins(externalHooks, nodeBase, nodeHelpers, workflowHelpers).ext
 .select-sticky-background {
 	display: block;
 	position: absolute;
-	background-color: hsla(
-		var(--color-foreground-base-h),
-		var(--color-foreground-base-s),
-		var(--color-foreground-base-l),
-		60%
-	);
+	background-color: var(--color-canvas-selected);
 	border-radius: var(--border-radius-xlarge);
 	overflow: hidden;
 	height: calc(100% + 16px);
@@ -327,4 +413,22 @@ export default mixins(externalHooks, nodeBase, nodeHelpers, workflowHelpers).ext
 	top: -8px;
 	z-index: 0;
 }
+
+.content {
+	display: flex;
+	flex-direction: row;
+	width: fit-content;
+	gap: var(--spacing-2xs);
+}
+
+.color {
+	width: 20px;
+	height: 20px;
+	border-radius: 50%;
+	border-color: var(--color-primary-shade-1);
+
+	&:hover {
+		cursor: pointer;
+	}
+}
 </style>
diff --git a/packages/editor-ui/src/components/SuggestedTemplates/SuggestedTemplatesPage.vue b/packages/editor-ui/src/components/SuggestedTemplates/SuggestedTemplatesPage.vue
new file mode 100644
index 0000000000000..29c2f5aba0f6f
--- /dev/null
+++ b/packages/editor-ui/src/components/SuggestedTemplates/SuggestedTemplatesPage.vue
@@ -0,0 +1,107 @@
+<script setup lang="ts">
+import { useRouter } from 'vue-router';
+import { computed } from 'vue';
+import { useUsersStore } from '@/stores/users.store';
+import { useUIStore } from '@/stores/ui.store';
+import { VIEWS } from '@/constants';
+import type { ITemplatesCollection, IUser } from '@/Interface';
+import SuggestedTemplatesSection from '@/components/SuggestedTemplates/SuggestedTemplatesSection.vue';
+
+const usersStore = useUsersStore();
+const uiStore = useUIStore();
+const router = useRouter();
+
+const currentUser = computed(() => usersStore.currentUser);
+
+const upperCaseFirstName = (user: IUser | null) => {
+	if (!user?.firstName) return;
+	return user.firstName?.charAt(0)?.toUpperCase() + user?.firstName?.slice(1);
+};
+
+const defaultSection = computed(() => {
+	if (!uiStore.suggestedTemplates) {
+		return null;
+	}
+	return uiStore.suggestedTemplates.sections[0];
+});
+
+const suggestedTemplates = computed(() => {
+	const carouselCollections = Array<ITemplatesCollection>();
+	if (!uiStore.suggestedTemplates || !defaultSection.value) {
+		return carouselCollections;
+	}
+	defaultSection.value.workflows.forEach((workflow, index) => {
+		carouselCollections.push({
+			id: index,
+			name: workflow.title,
+			workflows: [{ id: index }],
+			nodes: workflow.nodes,
+		});
+	});
+	return carouselCollections;
+});
+
+function openCanvas() {
+	uiStore.nodeViewInitialized = false;
+	void router.push({ name: VIEWS.NEW_WORKFLOW });
+}
+
+defineExpose({
+	currentUser,
+	openCanvas,
+	suggestedTemplates,
+});
+</script>
+
+<template>
+	<div :class="$style.container" data-test-id="suggested-templates-page-container">
+		<div :class="$style.header">
+			<n8n-heading tag="h1" size="2xlarge" class="mb-2xs">
+				{{
+					$locale.baseText('suggestedTemplates.heading', {
+						interpolate: {
+							name: upperCaseFirstName(currentUser) || $locale.baseText('generic.welcome'),
+						},
+					})
+				}}
+			</n8n-heading>
+			<n8n-text
+				size="large"
+				color="text-base"
+				data-test-id="suggested-template-section-description"
+			>
+				{{ defaultSection?.description }}
+			</n8n-text>
+		</div>
+		<div :class="$style.content">
+			<SuggestedTemplatesSection
+				v-for="section in uiStore.suggestedTemplates?.sections"
+				:key="section.title"
+				:section="section"
+				:show-title="false"
+			/>
+		</div>
+		<div>
+			<n8n-button
+				:label="$locale.baseText('suggestedTemplates.newWorkflowButton')"
+				type="secondary"
+				size="medium"
+				icon="plus"
+				data-test-id="suggested-templates-new-workflow-button"
+				@click="openCanvas"
+			/>
+		</div>
+	</div>
+</template>
+
+<style lang="scss" module>
+.container {
+	display: flex;
+	flex-direction: column;
+	gap: var(--spacing-l);
+}
+
+.header {
+	margin-bottom: var(--spacing-l);
+}
+</style>
diff --git a/packages/editor-ui/src/components/SuggestedTemplates/SuggestedTemplatesPreviewModal.vue b/packages/editor-ui/src/components/SuggestedTemplates/SuggestedTemplatesPreviewModal.vue
new file mode 100644
index 0000000000000..1bbbb32c1b75f
--- /dev/null
+++ b/packages/editor-ui/src/components/SuggestedTemplates/SuggestedTemplatesPreviewModal.vue
@@ -0,0 +1,109 @@
+<script lang="ts" setup>
+import { useI18n } from '@/composables/useI18n';
+import { useRouter } from 'vue-router';
+import { useToast } from '@/composables/useToast';
+import { useUIStore } from '@/stores/ui.store';
+import { useUsersStore } from '@/stores/users.store';
+import { useTelemetry } from '@/composables/useTelemetry';
+import {
+	SUGGESTED_TEMPLATES_FLAG,
+	SUGGESTED_TEMPLATES_PREVIEW_MODAL_KEY,
+	VIEWS,
+} from '@/constants';
+import type { IWorkflowDb, SuggestedTemplatesWorkflowPreview } from '@/Interface';
+import Modal from '@/components/Modal.vue';
+import WorkflowPreview from '@/components/WorkflowPreview.vue';
+
+const props = defineProps<{
+	modalName: string;
+	data: {
+		workflow: SuggestedTemplatesWorkflowPreview;
+	};
+}>();
+
+const i18n = useI18n();
+const router = useRouter();
+const uiStore = useUIStore();
+const usersStore = useUsersStore();
+const toast = useToast();
+const telemetry = useTelemetry();
+
+function showConfirmationMessage(event: PointerEvent) {
+	if (event.target instanceof HTMLAnchorElement) {
+		event.preventDefault();
+		// @ts-expect-error Additional parameters are not necessary for this function
+		toast.showMessage({
+			title: i18n.baseText('suggestedTemplates.notification.confirmation.title'),
+			message: i18n.baseText('suggestedTemplates.notification.confirmation.message'),
+			type: 'success',
+		});
+		telemetry.track(
+			'User wants to be notified once template is ready',
+			{ templateName: props.data.workflow.title, email: usersStore.currentUser?.email },
+			{
+				withPostHog: true,
+			},
+		);
+	}
+}
+
+function openCanvas() {
+	uiStore.setNotificationsForView(VIEWS.WORKFLOW, [
+		{
+			title: i18n.baseText('suggestedTemplates.notification.comingSoon.title'),
+			message: i18n.baseText('suggestedTemplates.notification.comingSoon.message'),
+			type: 'info',
+			duration: 10000,
+			onClick: showConfirmationMessage,
+		},
+	]);
+	localStorage.setItem(SUGGESTED_TEMPLATES_FLAG, 'false');
+	uiStore.deleteSuggestedTemplates();
+	uiStore.closeModal(SUGGESTED_TEMPLATES_PREVIEW_MODAL_KEY);
+	uiStore.nodeViewInitialized = false;
+	void router.push({ name: VIEWS.NEW_WORKFLOW });
+	telemetry.track(
+		'User clicked Use Template button',
+		{ templateName: props.data.workflow.title },
+		{ withPostHog: true },
+	);
+}
+</script>
+
+<template>
+	<Modal width="900px" height="640px" :name="props.modalName">
+		<template #header>
+			<n8n-heading tag="h2" size="xlarge">
+				{{ $props.data.workflow.title }}
+			</n8n-heading>
+		</template>
+		<template #content>
+			<WorkflowPreview
+				:loading="false"
+				:workflow="$props.data.workflow.preview as IWorkflowDb"
+				:can-open-n-d-v="false"
+				:hide-node-issues="true"
+				@close="uiStore.closeModal(SUGGESTED_TEMPLATES_PREVIEW_MODAL_KEY)"
+			/>
+		</template>
+		<template #footer>
+			<div>
+				<n8n-text> {{ $props.data.workflow.description }} </n8n-text>
+			</div>
+			<div :class="$style.footerButtons">
+				<n8n-button
+					float="right"
+					data-test-id="use-template-button"
+					:label="$locale.baseText('suggestedTemplates.modal.button.label')"
+					@click="openCanvas"
+				/>
+			</div>
+		</template>
+	</Modal>
+</template>
+
+<style module lang="scss">
+.footerButtons {
+	margin-top: var(--spacing-xl);
+}
+</style>
diff --git a/packages/editor-ui/src/components/SuggestedTemplates/SuggestedTemplatesSection.vue b/packages/editor-ui/src/components/SuggestedTemplates/SuggestedTemplatesSection.vue
new file mode 100644
index 0000000000000..f1fa387d8b971
--- /dev/null
+++ b/packages/editor-ui/src/components/SuggestedTemplates/SuggestedTemplatesSection.vue
@@ -0,0 +1,82 @@
+<script setup lang="ts">
+import { type PropType, computed } from 'vue';
+import { useUIStore } from '@/stores/ui.store';
+import { useTelemetry } from '@/composables/useTelemetry';
+import type { ITemplatesCollection, ITemplatesNode, SuggestedTemplatesSection } from '@/Interface';
+import TemplatesInfoCarousel from '@/components/TemplatesInfoCarousel.vue';
+import { SUGGESTED_TEMPLATES_PREVIEW_MODAL_KEY } from '@/constants';
+
+const uiStore = useUIStore();
+const telemetry = useTelemetry();
+
+const props = defineProps({
+	section: {
+		type: Object as PropType<SuggestedTemplatesSection>,
+		required: true,
+	},
+	title: {
+		type: String as PropType<string>,
+		required: false,
+	},
+	showTitle: {
+		type: Boolean as PropType<boolean>,
+		default: true,
+	},
+});
+
+const sectionTemplates = computed(() => {
+	const carouselCollections = Array<ITemplatesCollection>();
+	if (!uiStore.suggestedTemplates) {
+		return carouselCollections;
+	}
+	props.section.workflows.forEach((workflow, index) => {
+		carouselCollections.push({
+			id: index,
+			name: workflow.title,
+			workflows: [{ id: index }],
+			nodes: workflow.nodes as ITemplatesNode[],
+		});
+	});
+	return carouselCollections;
+});
+
+function onOpenCollection({ id }: { event: Event; id: number }) {
+	uiStore.openModalWithData({
+		name: SUGGESTED_TEMPLATES_PREVIEW_MODAL_KEY,
+		data: { workflow: props.section.workflows[id] },
+	});
+	telemetry.track(
+		'User clicked template recommendation',
+		{ templateName: props.section.workflows[id].title },
+		{ withPostHog: true },
+	);
+}
+</script>
+
+<template>
+	<div :class="$style.container" data-test-id="suggested-templates-section-container">
+		<div v-if="showTitle" :class="$style.header">
+			<n8n-text size="large" color="text-base" :bold="true">
+				{{ props.title ?? section.title }}
+			</n8n-text>
+		</div>
+		<div :class="$style.content">
+			<TemplatesInfoCarousel
+				:collections="sectionTemplates"
+				:loading="false"
+				:show-item-count="false"
+				:show-navigation="false"
+				cards-width="24%"
+				@open-collection="onOpenCollection"
+			/>
+		</div>
+	</div>
+</template>
+
+<style lang="scss" module>
+.container {
+	display: flex;
+	flex-direction: column;
+	gap: var(--spacing-l);
+}
+</style>
diff --git a/packages/editor-ui/src/components/TagsContainer.vue b/packages/editor-ui/src/components/TagsContainer.vue
index d46ac3f89801e..8c7fdf1ebc4e2 100644
--- a/packages/editor-ui/src/components/TagsContainer.vue
+++ b/packages/editor-ui/src/components/TagsContainer.vue
@@ -1,51 +1,62 @@
 <template>
 	<IntersectionObserver
+		ref="tagsContainer"
 		:threshold="1.0"
-		@observed="onObserved"
 		class="tags-container"
+		:style="style"
 		:enabled="responsive"
+		:event-bus="intersectionEventBus"
+		@observed="onObserved"
 	>
-		<template>
-			<span class="tags">
-				<span
-					v-for="tag in tags"
-					:key="tag.id"
-					:class="{ clickable: !tag.hidden }"
-					@click="(e) => onClick(e, tag)"
+		<span class="tags">
+			<span
+				v-for="tag in tags"
+				:key="tag.id"
+				:class="{ clickable: !tag.hidden }"
+				@click="(e) => onClick(e, tag)"
+			>
+				<el-tag
+					v-if="tag.isCount"
+					:title="tag.title"
+					type="info"
+					size="small"
+					class="count-container"
+					:disable-transitions="true"
+				>
+					{{ tag.name }}
+				</el-tag>
+				<IntersectionObserved
+					v-else
+					:class="{ hidden: tag.hidden }"
+					:data-id="tag.id"
+					:enabled="responsive"
+					:event-bus="intersectionEventBus"
 				>
 					<el-tag
-						:title="tag.title"
+						:title="tag.name"
 						type="info"
 						size="small"
-						v-if="tag.isCount"
-						class="count-container"
+						:class="{ hoverable }"
+						:disable-transitions="true"
 					>
 						{{ tag.name }}
 					</el-tag>
-					<IntersectionObserved
-						:class="{ hidden: tag.hidden }"
-						:data-id="tag.id"
-						:enabled="responsive"
-						v-else
-					>
-						<el-tag :title="tag.name" type="info" size="small" :class="{ hoverable }">
-							{{ tag.name }}
-						</el-tag>
-					</IntersectionObserved>
-				</span>
+				</IntersectionObserved>
 			</span>
-		</template>
+		</span>
 	</IntersectionObserver>
 </template>
 
 <script lang="ts">
-import Vue, { defineComponent } from 'vue';
+import { defineComponent } from 'vue';
 
 import type { ITag } from '@/Interface';
 import IntersectionObserver from './IntersectionObserver.vue';
 import IntersectionObserved from './IntersectionObserved.vue';
 import { mapStores } from 'pinia';
-import { useTagsStore } from '@/stores/tags';
+import { useTagsStore } from '@/stores/tags.store';
+import { createEventBus } from 'n8n-design-system/utils';
+import { debounce } from 'lodash-es';
 
 // random upper limit if none is set to minimize performance impact of observers
 const DEFAULT_MAX_TAGS_LIMIT = 20;
@@ -57,16 +68,34 @@ interface TagEl extends ITag {
 }
 
 export default defineComponent({
-	components: { IntersectionObserver, IntersectionObserved },
 	name: 'TagsContainer',
+	components: { IntersectionObserver, IntersectionObserved },
 	props: ['tagIds', 'limit', 'clickable', 'responsive', 'hoverable'],
 	data() {
 		return {
+			maxWidth: 320,
+			intersectionEventBus: createEventBus(),
 			visibility: {} as { [id: string]: boolean },
+			debouncedSetMaxWidth: () => {},
 		};
 	},
+	created() {
+		this.debouncedSetMaxWidth = debounce(this.setMaxWidth, 100);
+	},
+	mounted() {
+		this.setMaxWidth();
+		window.addEventListener('resize', this.debouncedSetMaxWidth);
+	},
+	beforeUnmount() {
+		window.removeEventListener('resize', this.debouncedSetMaxWidth);
+	},
 	computed: {
 		...mapStores(useTagsStore),
+		style() {
+			return {
+				'max-width': `${this.maxWidth}px`,
+			};
+		},
 		tags() {
 			const tags = this.tagIds
 				.map((tagId: string) => this.tagsStore.getTagById(tagId))
@@ -77,7 +106,7 @@ export default defineComponent({
 			let toDisplay: TagEl[] = limit ? tags.slice(0, limit) : tags;
 			toDisplay = toDisplay.map((tag: ITag) => ({
 				...tag,
-				hidden: this.responsive && !this.$data.visibility[tag.id],
+				hidden: this.responsive && !this.visibility[tag.id],
 			}));
 
 			let visibleCount = toDisplay.length;
@@ -107,9 +136,20 @@ export default defineComponent({
 		},
 	},
 	methods: {
+		setMaxWidth() {
+			const container = this.$refs.tagsContainer.$el as HTMLElement;
+			const parent = container.parentNode as HTMLElement;
+
+			if (parent) {
+				this.maxWidth = 0;
+				void this.$nextTick(() => {
+					this.maxWidth = parent.clientWidth;
+				});
+			}
+		},
 		onObserved({ el, isIntersecting }: { el: HTMLElement; isIntersecting: boolean }) {
 			if (el.dataset.id) {
-				Vue.set(this.$data.visibility, el.dataset.id, isIntersecting);
+				this.visibility = { ...this.visibility, [el.dataset.id]: isIntersecting };
 			}
 		},
 		onClick(e: MouseEvent, tag: TagEl) {
@@ -128,12 +168,15 @@ export default defineComponent({
 
 <style lang="scss" scoped>
 .tags-container {
-	display: inline-flex;
-	overflow: hidden;
+	display: block;
+	max-width: 300px;
 }
 
 .tags {
-	display: flex;
+	display: block;
+	white-space: nowrap;
+	overflow: hidden;
+	max-width: 100%;
 
 	> span {
 		padding-right: 4px; // why not margin? for space between tags to be clickable
diff --git a/packages/editor-ui/src/components/TagsDropdown.vue b/packages/editor-ui/src/components/TagsDropdown.vue
index a028d81722e05..7f321b3a81c5c 100644
--- a/packages/editor-ui/src/components/TagsDropdown.vue
+++ b/packages/editor-ui/src/components/TagsDropdown.vue
@@ -1,72 +1,79 @@
 <template>
-	<div :class="{ 'tags-container': true, focused }" @keydown.stop v-click-outside="onClickOutside">
+	<div
+		v-on-click-outside="onClickOutside"
+		:class="{ 'tags-container': true, focused }"
+		@keydown.stop
+	>
 		<n8n-select
-			:popperAppendToBody="false"
-			:value="appliedTags"
-			:loading="tagsStore.isLoading"
+			ref="selectRef"
+			:teleported="true"
+			:model-value="appliedTags"
+			:loading="isLoading"
 			:placeholder="placeholder"
 			:filter-method="filterOptions"
-			@change="onTagsUpdated"
-			@visible-change="onVisibleChange"
-			@remove-tag="onRemoveTag"
 			filterable
 			multiple
-			ref="select"
+			:allow-create="createEnabled"
+			:reserve-keyword="false"
 			loading-text="..."
 			popper-class="tags-dropdown"
-			size="medium"
+			data-test-id="tags-dropdown"
+			@update:model-value="onTagsUpdated"
+			@visible-change="onVisibleChange"
+			@remove-tag="onRemoveTag"
 		>
 			<n8n-option
 				v-if="options.length === 0 && filter && createEnabled"
 				:key="CREATE_KEY"
+				ref="createRef"
 				:value="CREATE_KEY"
 				class="ops"
-				ref="create"
 			>
 				<font-awesome-icon icon="plus-circle" />
 				<span>
-					{{ $locale.baseText('tagsDropdown.createTag', { interpolate: { filter } }) }}
+					{{ i18n.baseText('tagsDropdown.createTag', { interpolate: { filter } }) }}
 				</span>
 			</n8n-option>
 			<n8n-option v-else-if="options.length === 0" value="message" disabled>
-				<span v-if="createEnabled">{{ $locale.baseText('tagsDropdown.typeToCreateATag') }}</span>
+				<span v-if="createEnabled">{{ i18n.baseText('tagsDropdown.typeToCreateATag') }}</span>
 				<span v-else-if="allTags.length > 0">{{
-					$locale.baseText('tagsDropdown.noMatchingTagsExist')
+					i18n.baseText('tagsDropdown.noMatchingTagsExist')
 				}}</span>
-				<span v-else>{{ $locale.baseText('tagsDropdown.noTagsExist') }}</span>
+				<span v-else>{{ i18n.baseText('tagsDropdown.noTagsExist') }}</span>
 			</n8n-option>
 
 			<!-- key is id+index for keyboard navigation to work well with filter -->
 			<n8n-option
 				v-for="(tag, i) in options"
-				:value="tag.id"
 				:key="tag.id + '_' + i"
+				ref="tagRefs"
+				:value="tag.id"
 				:label="tag.name"
 				class="tag"
-				ref="tag"
+				data-test-id="tag"
 			/>
 
 			<n8n-option :key="MANAGE_KEY" :value="MANAGE_KEY" class="ops manage-tags">
 				<font-awesome-icon icon="cog" />
-				<span>{{ $locale.baseText('tagsDropdown.manageTags') }}</span>
+				<span>{{ i18n.baseText('tagsDropdown.manageTags') }}</span>
 			</n8n-option>
 		</n8n-select>
 	</div>
 </template>
 
 <script lang="ts">
-import mixins from 'vue-typed-mixins';
+import { computed, defineComponent, nextTick, onBeforeUnmount, onMounted, ref, watch } from 'vue';
 
 import type { ITag } from '@/Interface';
 import { MAX_TAG_NAME_LENGTH, TAGS_MANAGER_MODAL_KEY } from '@/constants';
 
-import { showMessage } from '@/mixins/showMessage';
-import { mapStores } from 'pinia';
-import { useUIStore } from '@/stores/ui';
-import { useTagsStore } from '@/stores/tags';
-import type { EventBus } from '@/event-bus';
+import { useI18n } from '@/composables/useI18n';
+import { useToast } from '@/composables/useToast';
+import { useUIStore } from '@/stores/ui.store';
+import { useTagsStore } from '@/stores/tags.store';
+import type { EventBus, N8nOption, N8nSelect } from 'n8n-design-system';
 import type { PropType } from 'vue';
-import type { N8nOption, N8nSelect } from 'n8n-design-system';
+import { storeToRefs } from 'pinia';
 
 type SelectRef = InstanceType<typeof N8nSelect>;
 type TagRef = InstanceType<typeof N8nOption>;
@@ -75,193 +82,243 @@ type CreateRef = InstanceType<typeof N8nOption>;
 const MANAGE_KEY = '__manage';
 const CREATE_KEY = '__create';
 
-export default mixins(showMessage).extend({
+export default defineComponent({
 	name: 'TagsDropdown',
 	props: {
 		placeholder: {},
-		currentTagIds: {
+		modelValue: {
 			type: Array as PropType<string[]>,
 			default: () => [],
 		},
-		createEnabled: {},
+		createEnabled: {
+			type: Boolean,
+			default: false,
+		},
 		eventBus: {
 			type: Object as PropType<EventBus>,
 		},
 	},
-	data() {
-		return {
-			filter: '',
-			MANAGE_KEY,
-			CREATE_KEY,
-			focused: false,
-			preventUpdate: false,
-		};
-	},
-	mounted() {
-		const selectRef = this.$refs.select as SelectRef | undefined;
-		const select = selectRef?.$refs?.innerSelect;
-		if (select) {
-			const input = select.$refs.input as Element | undefined;
-			if (input) {
-				input.setAttribute('maxlength', `${MAX_TAG_NAME_LENGTH}`);
-				input.addEventListener('keydown', (e: Event) => {
-					const keyboardEvent = e as KeyboardEvent;
-					// events don't bubble outside of select, so need to hook onto input
-					if (keyboardEvent.key === 'Escape') {
-						this.$emit('esc');
-					} else if (keyboardEvent.key === 'Enter' && this.filter.length === 0) {
-						this.$data.preventUpdate = true;
-						this.$emit('blur');
-
-						if (typeof selectRef?.blur === 'function') {
-							selectRef.blur();
+	setup(props, { emit }) {
+		const i18n = useI18n();
+		const { showError } = useToast();
+		const tagsStore = useTagsStore();
+		const uiStore = useUIStore();
+
+		const { isLoading } = storeToRefs(tagsStore);
+
+		const selectRef = ref<SelectRef | undefined>();
+		const tagRefs = ref<TagRef[] | undefined>();
+		const createRef = ref<CreateRef | undefined>();
+
+		const tags = ref([]);
+		const filter = ref('');
+		const focused = ref(false);
+		const preventUpdate = ref(false);
+
+		const allTags = computed<ITag[]>(() => {
+			return tagsStore.allTags;
+		});
+
+		const hasTags = computed<boolean>(() => {
+			return tagsStore.hasTags;
+		});
+
+		const options = computed<ITag[]>(() => {
+			return allTags.value.filter((tag: ITag) => tag && tag.name.includes(filter.value));
+		});
+
+		const appliedTags = computed<string[]>(() => {
+			return props.modelValue.filter((id: string) => tagsStore.getTagById(id));
+		});
+
+		watch(
+			() => allTags.value,
+			() => {
+				// keep applied tags in sync with store, for example in case tag is deleted from store
+				if (props.modelValue.length !== appliedTags.value.length) {
+					emit('update:modelValue', appliedTags.value);
+				}
+			},
+		);
+
+		onMounted(() => {
+			const select = selectRef.value?.$refs?.innerSelect;
+			if (select) {
+				const input = select.$refs.input as Element | undefined;
+				if (input) {
+					input.setAttribute('maxlength', `${MAX_TAG_NAME_LENGTH}`);
+					input.addEventListener('keydown', (e: Event) => {
+						const keyboardEvent = e as KeyboardEvent;
+						// events don't bubble outside of select, so need to hook onto input
+						if (keyboardEvent.key === 'Escape') {
+							emit('esc');
+						} else if (keyboardEvent.key === 'Enter' && filter.value.length === 0) {
+							preventUpdate.value = true;
+
+							emit('blur');
+
+							if (typeof selectRef.value?.blur === 'function') {
+								selectRef.value.blur();
+							}
 						}
-					}
-				});
+					});
+				}
 			}
+
+			props.eventBus?.on('focus', onBusFocus);
+
+			void tagsStore.fetchAll();
+		});
+
+		onBeforeUnmount(() => {
+			props.eventBus?.off('focus', onBusFocus);
+		});
+
+		function onBusFocus() {
+			focusOnInput();
+			focusFirstOption();
 		}
 
-		this.eventBus?.on('focus', this.onBusFocus);
+		function filterOptions(value = '') {
+			filter.value = value;
+			void nextTick(() => focusFirstOption());
+		}
 
-		this.tagsStore.fetchAll();
-	},
-	destroyed() {
-		this.eventBus?.off('focus', this.onBusFocus);
-	},
-	computed: {
-		...mapStores(useTagsStore, useUIStore),
-		allTags(): ITag[] {
-			return this.tagsStore.allTags;
-		},
-		hasTags(): boolean {
-			return this.tagsStore.hasTags;
-		},
-		options(): ITag[] {
-			return this.allTags.filter(
-				(tag: ITag) => tag && tag.name.toLowerCase().includes(this.$data.filter.toLowerCase()),
-			);
-		},
-		appliedTags(): string[] {
-			return this.currentTagIds.filter((id: string) => this.tagsStore.getTagById(id));
-		},
-	},
-	methods: {
-		onBusFocus() {
-			this.focusOnInput();
-			this.focusOnTopOption();
-		},
-		filterOptions(filter = '') {
-			this.$data.filter = filter.trim();
-			this.$nextTick(() => this.focusOnTopOption());
-		},
-		async onCreate() {
-			const name = this.$data.filter;
+		async function onCreate() {
+			const name = filter.value;
 			try {
-				const newTag = await this.tagsStore.create(name);
-				this.$emit('update', [...this.currentTagIds, newTag.id]);
-				this.$nextTick(() => this.focusOnTag(newTag.id));
+				const newTag = await tagsStore.create(name);
+				emit('update:modelValue', [...props.modelValue, newTag.id]);
 
-				this.$data.filter = '';
+				void nextTick(() => focusOnTag(newTag.id));
+
+				filter.value = '';
 			} catch (error) {
-				this.$showError(
+				showError(
 					error,
-					this.$locale.baseText('tagsDropdown.showError.title'),
-					this.$locale.baseText('tagsDropdown.showError.message', { interpolate: { name } }),
+					i18n.baseText('tagsDropdown.showError.title'),
+					i18n.baseText('tagsDropdown.showError.message', { interpolate: { name } }),
 				);
 			}
-		},
-		onTagsUpdated(selected: string[]) {
-			const ops = selected.find((value) => value === MANAGE_KEY || value === CREATE_KEY);
-			if (ops === MANAGE_KEY) {
-				this.$data.filter = '';
-				this.uiStore.openModal(TAGS_MANAGER_MODAL_KEY);
-			} else if (ops === CREATE_KEY) {
-				this.onCreate();
+		}
+
+		function onTagsUpdated(selected: string[]) {
+			const manage = selected.find((value) => value === MANAGE_KEY);
+			const create = selected.find((value) => value === CREATE_KEY);
+
+			if (manage) {
+				filter.value = '';
+				uiStore.openModal(TAGS_MANAGER_MODAL_KEY);
+				emit('blur');
+			} else if (create) {
+				void onCreate();
 			} else {
 				setTimeout(() => {
-					if (!this.$data.preventUpdate) {
-						this.$emit('update', selected);
+					if (!preventUpdate.value) {
+						emit('update:modelValue', selected);
 					}
-					this.$data.preventUpdate = false;
+					preventUpdate.value = false;
 				}, 0);
 			}
-		},
-		focusOnTopOption() {
-			const tagRefs = this.$refs.tag as TagRef[] | undefined;
-			const createRef = this.$refs.create as CreateRef | undefined;
+		}
+
+		function focusFirstOption() {
 			// focus on create option
-			if (createRef && createRef.hoverItem) {
-				createRef.hoverItem();
+			if (createRef.value?.$el) {
+				createRef.value.$el.dispatchEvent(new Event('mouseenter'));
 			}
 			// focus on top option after filter
-			else if (tagRefs && tagRefs[0] && tagRefs[0].hoverItem) {
-				tagRefs[0].hoverItem();
+			else if (tagRefs.value?.[0]?.$el) {
+				tagRefs.value[0].$el.dispatchEvent(new Event('mouseenter'));
 			}
-		},
-		focusOnTag(tagId: string) {
-			const tagOptions = (this.$refs.tag as TagRef[]) || [];
+		}
+
+		function focusOnTag(tagId: string) {
+			const tagOptions = tagRefs.value || [];
 			if (tagOptions && tagOptions.length) {
 				const added = tagOptions.find((ref) => ref.value === tagId);
 			}
-		},
-		focusOnInput() {
-			const selectRef = this.$refs.select as SelectRef | undefined;
-			if (selectRef) {
-				selectRef.focusOnInput();
-				this.focused = true;
+		}
+
+		function focusOnInput() {
+			if (selectRef.value) {
+				selectRef.value.focusOnInput();
+				focused.value = true;
 			}
-		},
-		onVisibleChange(visible: boolean) {
+		}
+
+		function onVisibleChange(visible: boolean) {
 			if (!visible) {
-				this.$data.filter = '';
-				this.focused = false;
+				filter.value = '';
+				focused.value = false;
 			} else {
-				this.focused = true;
+				focused.value = true;
 			}
-		},
-		onRemoveTag() {
-			this.$nextTick(() => {
-				this.focusOnInput();
+		}
+
+		function onRemoveTag() {
+			void nextTick(() => {
+				focusOnInput();
 			});
-		},
-		onClickOutside(e: Event) {
-			if (e.type === 'click') {
-				this.$emit('blur');
-			}
-		},
-	},
-	watch: {
-		allTags() {
-			// keep applied tags in sync with store
-			// for example in case tag is deleted from store
-			if (this.currentTagIds.length !== this.appliedTags.length) {
-				this.$emit('update', this.appliedTags);
+		}
+
+		function onClickOutside(e: Event) {
+			const tagsDropdown = document.querySelector('.tags-dropdown');
+			const tagsModal = document.querySelector('#tags-manager-modal');
+
+			const clickInsideTagsDropdowns =
+				tagsDropdown?.contains(e.target as Node) || tagsDropdown === e.target;
+			const clickInsideTagsModal = tagsModal?.contains(e.target as Node) || tagsModal === e.target;
+
+			if (!clickInsideTagsDropdowns && !clickInsideTagsModal && e.type === 'click') {
+				emit('blur');
 			}
-		},
+		}
+
+		return {
+			i18n,
+			tags,
+			filter,
+			focused,
+			preventUpdate,
+			selectRef,
+			tagRefs,
+			createRef,
+			allTags,
+			appliedTags,
+			options,
+			isLoading,
+			MANAGE_KEY,
+			CREATE_KEY,
+			onTagsUpdated,
+			onCreate,
+			filterOptions,
+			onVisibleChange,
+			onRemoveTag,
+			onClickOutside,
+			...useToast(),
+		};
 	},
 });
 </script>
+<style lang="scss">
+.tags-container {
+	$--max-input-height: 60px;
 
-<style lang="scss" scoped>
-$--max-input-height: 60px;
-
-::v-deep .el-select {
-	.el-select__tags {
-		max-height: $--max-input-height;
-		overflow-y: scroll;
-		overflow-x: hidden;
-	}
+	.el-select-tags-wrapper {
+		.el-tag {
+			max-height: $--max-input-height;
+			overflow-y: scroll;
+			overflow-x: hidden;
+		}
 
-	input {
-		max-height: $--max-input-height;
+		input {
+			max-height: $--max-input-height;
+		}
 	}
-}
-</style>
 
-<style lang="scss">
-.tags-container {
 	.el-tag {
-		padding: 1px var(--spacing-4xs);
+		padding: var(--spacing-5xs) var(--spacing-4xs);
 		color: var(--color-text-dark);
 		background-color: var(--color-background-base);
 		border-radius: var(--border-radius-base);
diff --git a/packages/editor-ui/src/components/TagsManager/NoTagsView.vue b/packages/editor-ui/src/components/TagsManager/NoTagsView.vue
index e9c64f1bd4b9f..074e647d1a1e7 100644
--- a/packages/editor-ui/src/components/TagsManager/NoTagsView.vue
+++ b/packages/editor-ui/src/components/TagsManager/NoTagsView.vue
@@ -3,8 +3,10 @@
 		<el-col class="notags" :span="16">
 			<div class="icon">🗄️</div>
 			<div>
-				<div class="headline">
-					{{ $locale.baseText('noTagsView.readyToOrganizeYourWorkflows') }}
+				<div class="mb-s">
+					<n8n-heading size="large">
+						{{ $locale.baseText('noTagsView.readyToOrganizeYourWorkflows') }}
+					</n8n-heading>
 				</div>
 				<div class="description">
 					{{ $locale.baseText('noTagsView.withWorkflowTagsYouReFree') }}
@@ -47,12 +49,6 @@ $--footer-spacing: 45px;
 	line-height: 14px;
 }
 
-.headline {
-	font-size: 17.6px;
-	color: black;
-	margin-bottom: 12px;
-}
-
 .description {
 	font-size: 14px;
 	line-height: 21px;
diff --git a/packages/editor-ui/src/components/TagsManager/TagsManager.vue b/packages/editor-ui/src/components/TagsManager/TagsManager.vue
index fc2bbc56f86c6..7fc47aec74313 100644
--- a/packages/editor-ui/src/components/TagsManager/TagsManager.vue
+++ b/packages/editor-ui/src/components/TagsManager/TagsManager.vue
@@ -1,51 +1,58 @@
 <template>
 	<Modal
+		id="tags-manager-modal"
 		:title="$locale.baseText('tagsManager.manageTags')"
 		:name="TAGS_MANAGER_MODAL_KEY"
-		:eventBus="modalBus"
+		:event-bus="modalBus"
+		min-width="620px"
+		min-height="420px"
 		@enter="onEnter"
-		minWidth="620px"
-		minHeight="420px"
 	>
 		<template #content>
 			<el-row>
 				<TagsView
 					v-if="hasTags || isCreating"
-					:isLoading="isLoading"
+					:is-loading="isLoading"
 					:tags="tags"
 					@create="onCreate"
 					@update="onUpdate"
 					@delete="onDelete"
-					@disableCreate="onDisableCreate"
+					@disable-create="onDisableCreate"
 				/>
-				<NoTagsView @enableCreate="onEnableCreate" v-else />
+				<NoTagsView v-else @enable-create="onEnableCreate" />
 			</el-row>
 		</template>
 		<template #footer="{ close }">
-			<n8n-button :label="$locale.baseText('tagsManager.done')" @click="close" float="right" />
+			<n8n-button :label="$locale.baseText('tagsManager.done')" float="right" @click="close" />
 		</template>
 	</Modal>
 </template>
 
 <script lang="ts">
-import Vue from 'vue';
-import mixins from 'vue-typed-mixins';
+import { defineComponent } from 'vue';
 
 import type { ITag } from '@/Interface';
 
-import { showMessage } from '@/mixins/showMessage';
+import { useToast } from '@/composables/useToast';
 import TagsView from '@/components/TagsManager/TagsView/TagsView.vue';
 import NoTagsView from '@/components/TagsManager/NoTagsView.vue';
 import Modal from '@/components/Modal.vue';
-import { TAGS_MANAGER_MODAL_KEY } from '../../constants';
+import { TAGS_MANAGER_MODAL_KEY } from '@/constants';
 import { mapStores } from 'pinia';
-import { useTagsStore } from '@/stores/tags';
-import { createEventBus } from '@/event-bus';
+import { useTagsStore } from '@/stores/tags.store';
+import { createEventBus } from 'n8n-design-system/utils';
 
-export default mixins(showMessage).extend({
+export default defineComponent({
 	name: 'TagsManager',
-	created() {
-		this.tagsStore.fetchAll({ force: true, withUsageCount: true });
+	components: {
+		TagsView,
+		NoTagsView,
+		Modal,
+	},
+	setup() {
+		return {
+			...useToast(),
+		};
 	},
 	data() {
 		const tagIds = useTagsStore().allTags.map((tag) => tag.id);
@@ -56,10 +63,8 @@ export default mixins(showMessage).extend({
 			TAGS_MANAGER_MODAL_KEY,
 		};
 	},
-	components: {
-		TagsView,
-		NoTagsView,
-		Modal,
+	created() {
+		void this.tagsStore.fetchAll({ force: true, withUsageCount: true });
 	},
 	computed: {
 		...mapStores(useTagsStore),
@@ -67,9 +72,7 @@ export default mixins(showMessage).extend({
 			return this.tagsStore.isLoading;
 		},
 		tags(): ITag[] {
-			return this.$data.tagIds
-				.map((tagId: string) => this.tagsStore.getTagById(tagId))
-				.filter(Boolean); // if tag is deleted from store
+			return this.tagIds.map((tagId: string) => this.tagsStore.getTagById(tagId)).filter(Boolean); // if tag is deleted from store
 		},
 		hasTags(): boolean {
 			return this.tags.length > 0;
@@ -77,11 +80,11 @@ export default mixins(showMessage).extend({
 	},
 	methods: {
 		onEnableCreate() {
-			this.$data.isCreating = true;
+			this.isCreating = true;
 		},
 
 		onDisableCreate() {
-			this.$data.isCreating = false;
+			this.isCreating = false;
 		},
 
 		async onCreate(name: string, cb: (tag: ITag | null, error?: Error) => void) {
@@ -91,11 +94,11 @@ export default mixins(showMessage).extend({
 				}
 
 				const newTag = await this.tagsStore.create(name);
-				this.$data.tagIds = [newTag.id].concat(this.$data.tagIds);
+				this.tagIds = [newTag.id].concat(this.tagIds);
 				cb(newTag);
 			} catch (error) {
 				const escapedName = escape(name);
-				this.$showError(
+				this.showError(
 					error,
 					this.$locale.baseText('tagsManager.showError.onCreate.title'),
 					this.$locale.baseText('tagsManager.showError.onCreate.message', {
@@ -123,13 +126,13 @@ export default mixins(showMessage).extend({
 				const updatedTag = await this.tagsStore.rename({ id, name });
 				cb(!!updatedTag);
 
-				this.$showMessage({
+				this.showMessage({
 					title: this.$locale.baseText('tagsManager.showMessage.onUpdate.title'),
 					type: 'success',
 				});
 			} catch (error) {
 				const escapedName = escape(oldName);
-				this.$showError(
+				this.showError(
 					error,
 					this.$locale.baseText('tagsManager.showError.onUpdate.title'),
 					this.$locale.baseText('tagsManager.showError.onUpdate.message', {
@@ -150,17 +153,17 @@ export default mixins(showMessage).extend({
 					throw new Error(this.$locale.baseText('tagsManager.couldNotDeleteTag'));
 				}
 
-				this.$data.tagIds = this.$data.tagIds.filter((tagId: string) => tagId !== id);
+				this.tagIds = this.tagIds.filter((tagId: string) => tagId !== id);
 
 				cb(deleted);
 
-				this.$showMessage({
+				this.showMessage({
 					title: this.$locale.baseText('tagsManager.showMessage.onDelete.title'),
 					type: 'success',
 				});
 			} catch (error) {
 				const escapedName = escape(name);
-				this.$showError(
+				this.showError(
 					error,
 					this.$locale.baseText('tagsManager.showError.onDelete.title'),
 					this.$locale.baseText('tagsManager.showError.onDelete.message', {
diff --git a/packages/editor-ui/src/components/TagsManager/TagsView/TagsTable.vue b/packages/editor-ui/src/components/TagsManager/TagsView/TagsTable.vue
index 8b2d43c465c3c..6176dcf7c9ca0 100644
--- a/packages/editor-ui/src/components/TagsManager/TagsView/TagsTable.vue
+++ b/packages/editor-ui/src/components/TagsManager/TagsView/TagsTable.vue
@@ -1,24 +1,25 @@
 <template>
 	<el-table
+		ref="table"
+		v-loading="isLoading"
+		class="tags-table"
 		stripe
 		max-height="450"
-		ref="table"
 		:empty-text="$locale.baseText('tagsTable.noMatchingTagsExist')"
 		:data="rows"
 		:span-method="getSpan"
 		:row-class-name="getRowClasses"
-		v-loading="isLoading"
 	>
 		<el-table-column :label="$locale.baseText('tagsTable.name')">
 			<template #default="scope">
-				<div class="name" :key="scope.row.id" @keydown.stop>
+				<div :key="scope.row.id" class="name" @keydown.stop>
 					<transition name="fade" mode="out-in">
 						<n8n-input
 							v-if="scope.row.create || scope.row.update"
-							:value="newName"
-							:maxlength="maxLength"
-							@input="onNewNameChange"
 							ref="nameInput"
+							:model-value="newName"
+							:maxlength="maxLength"
+							@update:model-value="onNewNameChange"
 						></n8n-input>
 						<span v-else-if="scope.row.delete">
 							<span>{{ $locale.baseText('tagsTable.areYouSureYouWantToDeleteThisTag') }}</span>
@@ -46,58 +47,58 @@
 		<el-table-column>
 			<template #default="scope">
 				<transition name="fade" mode="out-in">
-					<div class="ops" v-if="scope.row.create">
+					<div v-if="scope.row.create" class="ops">
 						<n8n-button
 							:label="$locale.baseText('tagsTable.cancel')"
-							@click.stop="cancel"
 							type="secondary"
 							:disabled="isSaving"
+							@click.stop="cancel"
 						/>
 						<n8n-button
 							:label="$locale.baseText('tagsTable.createTag')"
-							@click.stop="apply"
 							:loading="isSaving"
+							@click.stop="apply"
 						/>
 					</div>
-					<div class="ops" v-else-if="scope.row.update">
+					<div v-else-if="scope.row.update" class="ops">
 						<n8n-button
 							:label="$locale.baseText('tagsTable.cancel')"
-							@click.stop="cancel"
 							type="secondary"
 							:disabled="isSaving"
+							@click.stop="cancel"
 						/>
 						<n8n-button
 							:label="$locale.baseText('tagsTable.saveChanges')"
-							@click.stop="apply"
 							:loading="isSaving"
+							@click.stop="apply"
 						/>
 					</div>
-					<div class="ops" v-else-if="scope.row.delete">
+					<div v-else-if="scope.row.delete" class="ops">
 						<n8n-button
 							:label="$locale.baseText('tagsTable.cancel')"
-							@click.stop="cancel"
 							type="secondary"
 							:disabled="isSaving"
+							@click.stop="cancel"
 						/>
 						<n8n-button
 							:label="$locale.baseText('tagsTable.deleteTag')"
-							@click.stop="apply"
 							:loading="isSaving"
+							@click.stop="apply"
 						/>
 					</div>
-					<div class="ops main" v-else-if="!scope.row.disable">
+					<div v-else-if="!scope.row.disable" class="ops main">
 						<n8n-icon-button
 							:title="$locale.baseText('tagsTable.editTag')"
-							@click.stop="enableUpdate(scope.row)"
 							icon="pen"
 							data-test-id="edit-tag-button"
+							@click.stop="enableUpdate(scope.row)"
 						/>
 						<n8n-icon-button
 							v-if="scope.row.canDelete"
 							:title="$locale.baseText('tagsTable.deleteTag')"
-							@click.stop="enableDelete(scope.row)"
 							icon="trash"
 							data-test-id="delete-tag-button"
+							@click.stop="enableDelete(scope.row)"
 						/>
 					</div>
 				</transition>
@@ -107,7 +108,7 @@
 </template>
 
 <script lang="ts">
-import type { Table as ElTable } from 'element-ui';
+import type { ElTable } from 'element-plus';
 import { MAX_TAG_NAME_LENGTH } from '@/constants';
 import type { ITagRow } from '@/Interface';
 import { defineComponent } from 'vue';
@@ -127,6 +128,13 @@ export default defineComponent({
 			maxLength: MAX_TAG_NAME_LENGTH,
 		};
 	},
+	watch: {
+		rows(newValue: ITagRow[] | undefined) {
+			if (newValue?.[0] && newValue[0].create) {
+				this.focusOnCreate();
+			}
+		},
+	},
 	mounted() {
 		if (this.rows.length === 1 && this.rows[0].create) {
 			this.focusOnInput();
@@ -179,7 +187,7 @@ export default defineComponent({
 		focusOnInput(): void {
 			setTimeout(() => {
 				const inputRef = this.$refs.nameInput as N8nInputRef | undefined;
-				if (inputRef && inputRef.focus) {
+				if (inputRef?.focus) {
 					inputRef.focus();
 				}
 			}, INPUT_TRANSITION_TIMEOUT);
@@ -188,7 +196,7 @@ export default defineComponent({
 		focusOnDelete(): void {
 			setTimeout(() => {
 				const inputRef = this.$refs.deleteHiddenInput as N8nInputRef | undefined;
-				if (inputRef && inputRef.focus) {
+				if (inputRef?.focus) {
 					inputRef.focus();
 				}
 			}, DELETE_TRANSITION_TIMEOUT);
@@ -203,17 +211,16 @@ export default defineComponent({
 			this.focusOnInput();
 		},
 	},
-	watch: {
-		rows(newValue: ITagRow[] | undefined) {
-			if (newValue && newValue[0] && newValue[0].create) {
-				this.focusOnCreate();
-			}
-		},
-	},
 });
 </script>
 
 <style lang="scss" scoped>
+.tags-table {
+	:deep(tr.disabled) {
+		pointer-events: none;
+	}
+}
+
 .name {
 	min-height: 45px;
 	display: flex;
@@ -248,10 +255,6 @@ export default defineComponent({
 	margin-left: 2px;
 }
 
-::v-deep tr.disabled {
-	pointer-events: none;
-}
-
 tr:hover .ops:not(.disabled) {
 	display: flex;
 }
diff --git a/packages/editor-ui/src/components/TagsManager/TagsView/TagsTableHeader.vue b/packages/editor-ui/src/components/TagsManager/TagsView/TagsTableHeader.vue
index 543fd1b213d3e..1a7172a489166 100644
--- a/packages/editor-ui/src/components/TagsManager/TagsView/TagsTableHeader.vue
+++ b/packages/editor-ui/src/components/TagsManager/TagsView/TagsTableHeader.vue
@@ -3,11 +3,11 @@
 		<el-col :span="10">
 			<n8n-input
 				:placeholder="$locale.baseText('tagsTableHeader.searchTags')"
-				:value="search"
-				@input="onSearchChange"
+				:model-value="search"
 				:disabled="disabled"
-				clearable
 				:maxlength="maxLength"
+				clearable
+				@update:model-value="onSearchChange"
 			>
 				<template #prefix>
 					<font-awesome-icon icon="search" />
@@ -16,20 +16,20 @@
 		</el-col>
 		<el-col :span="14">
 			<n8n-button
-				@click="onAddNew"
 				:disabled="disabled"
 				icon="plus"
 				:label="$locale.baseText('tagsTableHeader.addNew')"
 				size="large"
 				float="right"
+				@click="onAddNew"
 			/>
 		</el-col>
 	</el-row>
 </template>
 
 <script lang="ts">
-import { MAX_TAG_NAME_LENGTH } from '@/constants';
 import { defineComponent } from 'vue';
+import { MAX_TAG_NAME_LENGTH } from '@/constants';
 
 export default defineComponent({
 	props: {
diff --git a/packages/editor-ui/src/components/TagsManager/TagsView/TagsView.vue b/packages/editor-ui/src/components/TagsManager/TagsView/TagsView.vue
index 39678020d3460..f303ebf1f7542 100644
--- a/packages/editor-ui/src/components/TagsManager/TagsView/TagsView.vue
+++ b/packages/editor-ui/src/components/TagsManager/TagsView/TagsView.vue
@@ -3,21 +3,21 @@
 		<TagsTableHeader
 			:search="search"
 			:disabled="isHeaderDisabled()"
-			@searchChange="onSearchChange"
-			@createEnable="onCreateEnable"
+			@search-change="onSearchChange"
+			@create-enable="onCreateEnable"
 		/>
 		<TagsTable
-			:rows="rows"
-			:isLoading="isLoading"
-			:isSaving="isSaving"
-			:newName="newName"
-			@newNameChange="onNewNameChange"
-			@updateEnable="onUpdateEnable"
-			@deleteEnable="onDeleteEnable"
-			@cancelOperation="cancelOperation"
-			@applyOperation="applyOperation"
 			ref="tagsTable"
+			:rows="rows"
+			:is-loading="isLoading"
+			:is-saving="isSaving"
+			:new-name="newName"
 			data-test-id="tags-table"
+			@new-name-change="onNewNameChange"
+			@update-enable="onUpdateEnable"
+			@delete-enable="onDeleteEnable"
+			@cancel-operation="cancelOperation"
+			@apply-operation="applyOperation"
 		/>
 	</div>
 </template>
@@ -29,14 +29,15 @@ import type { ITag, ITagRow } from '@/Interface';
 import TagsTableHeader from '@/components/TagsManager/TagsView/TagsTableHeader.vue';
 import TagsTable from '@/components/TagsManager/TagsView/TagsTable.vue';
 import { mapStores } from 'pinia';
-import { useUsersStore } from '@/stores/users';
+import { useUsersStore } from '@/stores/users.store';
+import { useRBACStore } from '@/stores/rbac.store';
 
 const matches = (name: string, filter: string) =>
 	name.toLowerCase().trim().includes(filter.toLowerCase().trim());
 
 export default defineComponent({
-	components: { TagsTableHeader, TagsTable },
 	name: 'TagsView',
+	components: { TagsTableHeader, TagsTable },
 	props: ['tags', 'isLoading'],
 	data() {
 		return {
@@ -50,9 +51,9 @@ export default defineComponent({
 		};
 	},
 	computed: {
-		...mapStores(useUsersStore),
+		...mapStores(useUsersStore, useRBACStore),
 		isCreateEnabled(): boolean {
-			return (this.tags || []).length === 0 || this.$data.createEnabled;
+			return (this.tags || []).length === 0 || this.createEnabled;
 		},
 		rows(): ITagRow[] {
 			const getUsage = (count: number | undefined) =>
@@ -60,17 +61,17 @@ export default defineComponent({
 					? this.$locale.baseText('tagsView.inUse', { adjustToNumber: count })
 					: this.$locale.baseText('tagsView.notBeingUsed');
 
-			const disabled = this.isCreateEnabled || this.$data.updateId || this.$data.deleteId;
+			const disabled = this.isCreateEnabled || this.updateId || this.deleteId;
 			const tagRows = (this.tags || [])
-				.filter((tag: ITag) => this.stickyIds.has(tag.id) || matches(tag.name, this.$data.search))
+				.filter((tag: ITag) => this.stickyIds.has(tag.id) || matches(tag.name, this.search))
 				.map(
 					(tag: ITag): ITagRow => ({
 						tag,
 						usage: getUsage(tag.usageCount),
-						disable: disabled && tag.id !== this.deleteId && tag.id !== this.$data.updateId,
-						update: disabled && tag.id === this.$data.updateId,
-						delete: disabled && tag.id === this.$data.deleteId,
-						canDelete: this.usersStore.canUserDeleteTags,
+						disable: disabled && tag.id !== this.deleteId && tag.id !== this.updateId,
+						update: disabled && tag.id === this.updateId,
+						delete: disabled && tag.id === this.deleteId,
+						canDelete: this.rbacStore.hasScope('tag:delete'),
 					}),
 				);
 
@@ -82,13 +83,11 @@ export default defineComponent({
 			this.newName = name;
 		},
 		onSearchChange(search: string): void {
-			this.$data.stickyIds.clear();
-			this.$data.search = search;
+			this.stickyIds.clear();
+			this.search = search;
 		},
 		isHeaderDisabled(): boolean {
-			return (
-				this.isLoading || !!(this.isCreateEnabled || this.$data.updateId || this.$data.deleteId)
-			);
+			return this.isLoading || !!(this.isCreateEnabled || this.updateId || this.deleteId);
 		},
 
 		onUpdateEnable(updateId: string): void {
@@ -99,10 +98,10 @@ export default defineComponent({
 			this.newName = '';
 		},
 		updateTag(): void {
-			this.$data.isSaving = true;
+			this.isSaving = true;
 			const name = this.newName.trim();
 			const onUpdate = (updated: boolean) => {
-				this.$data.isSaving = false;
+				this.isSaving = false;
 				if (updated) {
 					this.stickyIds.add(this.updateId);
 					this.disableUpdate();
@@ -119,58 +118,58 @@ export default defineComponent({
 			this.deleteId = '';
 		},
 		deleteTag(): void {
-			this.$data.isSaving = true;
+			this.isSaving = true;
 			const onDelete = (deleted: boolean) => {
 				if (deleted) {
 					this.disableDelete();
 				}
-				this.$data.isSaving = false;
+				this.isSaving = false;
 			};
 
 			this.$emit('delete', this.deleteId, onDelete);
 		},
 
 		onCreateEnable(): void {
-			this.$data.createEnabled = true;
-			this.$data.newName = '';
+			this.createEnabled = true;
+			this.newName = '';
 		},
 		disableCreate(): void {
-			this.$data.createEnabled = false;
+			this.createEnabled = false;
 			this.$emit('disableCreate');
 		},
 		createTag(): void {
-			this.$data.isSaving = true;
-			const name = this.$data.newName.trim();
+			this.isSaving = true;
+			const name = this.newName.trim();
 			const onCreate = (created: ITag | null, error?: Error) => {
 				if (created) {
 					this.stickyIds.add(created.id);
 					this.disableCreate();
 				}
-				this.$data.isSaving = false;
+				this.isSaving = false;
 			};
 
 			this.$emit('create', name, onCreate);
 		},
 
 		applyOperation(): void {
-			if (this.$data.isSaving) {
+			if (this.isSaving) {
 				return;
 			} else if (this.isCreateEnabled) {
 				this.createTag();
-			} else if (this.$data.updateId) {
+			} else if (this.updateId) {
 				this.updateTag();
-			} else if (this.$data.deleteId) {
+			} else if (this.deleteId) {
 				this.deleteTag();
 			}
 		},
 		cancelOperation(): void {
-			if (this.$data.isSaving) {
+			if (this.isSaving) {
 				return;
 			} else if (this.isCreateEnabled) {
 				this.disableCreate();
-			} else if (this.$data.updateId) {
+			} else if (this.updateId) {
 				this.disableUpdate();
-			} else if (this.$data.deleteId) {
+			} else if (this.deleteId) {
 				this.disableDelete();
 			}
 		},
diff --git a/packages/editor-ui/src/components/Telemetry.vue b/packages/editor-ui/src/components/Telemetry.vue
index f9c40b0d6c2c8..dc8eec4d60822 100644
--- a/packages/editor-ui/src/components/Telemetry.vue
+++ b/packages/editor-ui/src/components/Telemetry.vue
@@ -1,17 +1,16 @@
 <template>
-	<fragment></fragment>
+	<span v-show="false" />
 </template>
 
 <script lang="ts">
-import { useRootStore } from '@/stores/n8nRootStore';
-import { useSettingsStore } from '@/stores/settings';
-import { useUsersStore } from '@/stores/users';
-import type { ITelemetrySettings } from 'n8n-workflow';
+import { defineComponent } from 'vue';
 import { mapStores } from 'pinia';
-import mixins from 'vue-typed-mixins';
-import { externalHooks } from '@/mixins/externalHooks';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useUsersStore } from '@/stores/users.store';
+import type { ITelemetrySettings } from 'n8n-workflow';
 
-export default mixins(externalHooks).extend({
+export default defineComponent({
 	name: 'Telemetry',
 	data() {
 		return {
@@ -24,9 +23,7 @@ export default mixins(externalHooks).extend({
 			return this.usersStore.currentUserId || '';
 		},
 		isTelemetryEnabledOnRoute(): boolean {
-			return this.$route.meta && this.$route.meta.telemetry
-				? !this.$route.meta.telemetry.disabled
-				: true;
+			return this.$route.meta?.telemetry ? !this.$route.meta.telemetry.disabled : true;
 		},
 		telemetry(): ITelemetrySettings {
 			return this.settingsStore.telemetry;
@@ -35,6 +32,21 @@ export default mixins(externalHooks).extend({
 			return !!this.telemetry?.enabled;
 		},
 	},
+	watch: {
+		telemetry() {
+			this.init();
+		},
+		currentUserId(userId) {
+			if (this.isTelemetryEnabled) {
+				this.$telemetry.identify(this.rootStore.instanceId, userId);
+			}
+		},
+		isTelemetryEnabledOnRoute(enabled) {
+			if (enabled) {
+				this.init();
+			}
+		},
+	},
 	mounted() {
 		this.init();
 	},
@@ -56,20 +68,5 @@ export default mixins(externalHooks).extend({
 			this.isTelemetryInitialized = true;
 		},
 	},
-	watch: {
-		telemetry() {
-			this.init();
-		},
-		currentUserId(userId) {
-			if (this.isTelemetryEnabled) {
-				this.$telemetry.identify(this.rootStore.instanceId, userId);
-			}
-		},
-		isTelemetryEnabledOnRoute(enabled) {
-			if (enabled) {
-				this.init();
-			}
-		},
-	},
 });
 </script>
diff --git a/packages/editor-ui/src/components/TemplateCard.vue b/packages/editor-ui/src/components/TemplateCard.vue
index 7167e183eaa30..1eab5bc6a93ec 100644
--- a/packages/editor-ui/src/components/TemplateCard.vue
+++ b/packages/editor-ui/src/components/TemplateCard.vue
@@ -6,14 +6,15 @@
 			firstItem && $style.first,
 			!loading && $style.loaded,
 		]"
+		data-test-id="template-card"
 		@click="onCardClick"
 	>
-		<div :class="$style.loading" v-if="loading">
-			<n8n-loading :rows="2" :shrinkLast="false" :loading="loading" />
+		<div v-if="loading" :class="$style.loading">
+			<n8n-loading :rows="2" :shrink-last="false" :loading="loading" />
 		</div>
 		<div v-else>
 			<n8n-heading :bold="true" size="small">{{ workflow.name }}</n8n-heading>
-			<div :class="$style.content">
+			<div v-if="!simpleView" :class="$style.content">
 				<span v-if="workflow.totalViews">
 					<n8n-text size="small" color="text-light">
 						<font-awesome-icon icon="eye" />
@@ -30,14 +31,15 @@
 				>
 			</div>
 		</div>
-		<div :class="[$style.nodesContainer, useWorkflowButton && $style.hideOnHover]" v-if="!loading">
+		<div v-if="!loading" :class="[$style.nodesContainer, useWorkflowButton && $style.hideOnHover]">
 			<NodeList v-if="workflow.nodes" :nodes="workflow.nodes" :limit="nodesToBeShown" size="md" />
 		</div>
-		<div :class="$style.buttonContainer" v-if="useWorkflowButton">
+		<div v-if="useWorkflowButton" :class="$style.buttonContainer">
 			<n8n-button
 				v-if="useWorkflowButton"
 				outline
 				label="Use workflow"
+				data-test-id="use-workflow-button"
 				@click.stop="onUseWorkflowClick"
 			/>
 		</div>
@@ -45,13 +47,18 @@
 </template>
 
 <script lang="ts">
-import { genericHelpers } from '@/mixins/genericHelpers';
-import mixins from 'vue-typed-mixins';
-import { filterTemplateNodes, abbreviateNumber } from '@/utils';
+import { defineComponent } from 'vue';
+import { filterTemplateNodes } from '@/utils/nodeTypesUtils';
+import { abbreviateNumber } from '@/utils/typesUtils';
 import NodeList from './NodeList.vue';
+import TimeAgo from '@/components/TimeAgo.vue';
 
-export default mixins(genericHelpers).extend({
+export default defineComponent({
 	name: 'TemplateCard',
+	components: {
+		TimeAgo,
+		NodeList,
+	},
 	props: {
 		lastItem: {
 			type: Boolean,
@@ -70,9 +77,10 @@ export default mixins(genericHelpers).extend({
 		loading: {
 			type: Boolean,
 		},
-	},
-	components: {
-		NodeList,
+		simpleView: {
+			type: Boolean,
+			default: false,
+		},
 	},
 	data() {
 		return {
@@ -119,6 +127,7 @@ export default mixins(genericHelpers).extend({
 	background-color: var(--color-background-xlight);
 
 	display: flex;
+	align-items: center;
 	padding: 0 var(--spacing-s) var(--spacing-s) var(--spacing-s);
 	background-color: var(--color-background-xlight);
 	cursor: pointer;
diff --git a/packages/editor-ui/src/components/TemplateDetails.vue b/packages/editor-ui/src/components/TemplateDetails.vue
index 816dd61ff00cc..6208fa655af85 100644
--- a/packages/editor-ui/src/components/TemplateDetails.vue
+++ b/packages/editor-ui/src/components/TemplateDetails.vue
@@ -2,7 +2,7 @@
 	<div>
 		<n8n-loading :loading="loading" :rows="5" variant="p" />
 
-		<template-details-block v-if="!loading && template.nodes.length > 0" :title="blockTitle">
+		<TemplateDetailsBlock v-if="!loading && template.nodes.length > 0" :title="blockTitle">
 			<div :class="$style.icons">
 				<div
 					v-for="node in filterTemplateNodes(template.nodes)"
@@ -10,30 +10,29 @@
 					:class="$style.icon"
 				>
 					<NodeIcon
-						:nodeType="node"
+						:node-type="node"
 						:size="24"
-						:showTooltip="true"
+						:show-tooltip="true"
 						@click="redirectToSearchPage(node)"
 					/>
 				</div>
 			</div>
-		</template-details-block>
+		</TemplateDetailsBlock>
 
-		<template-details-block
+		<TemplateDetailsBlock
 			v-if="!loading && template?.categories.length > 0"
 			:title="$locale.baseText('template.details.categories')"
 		>
-			<n8n-tags :tags="template.categories" @click="redirectToCategory" />
-		</template-details-block>
+			<n8n-tags :tags="template.categories" @click:tag="redirectToCategory" />
+		</TemplateDetailsBlock>
 
-		<template-details-block v-if="!loading" :title="$locale.baseText('template.details.details')">
+		<TemplateDetailsBlock v-if="!loading" :title="$locale.baseText('template.details.details')">
 			<div :class="$style.text">
 				<n8n-text size="small" color="text-base">
 					{{ $locale.baseText('template.details.created') }}
 					<TimeAgo :date="template.createdAt" />
-					<span>{{ $locale.baseText('template.details.by') }}</span>
-					<span v-if="template.user"> {{ template.user.username }}</span>
-					<span v-else> n8n team</span>
+					{{ $locale.baseText('template.details.by') }}
+					{{ template.user ? template.user.username : 'n8n team' }}
 				</n8n-text>
 			</div>
 			<div :class="$style.text">
@@ -43,21 +42,29 @@
 					{{ $locale.baseText('template.details.times') }}
 				</n8n-text>
 			</div>
-		</template-details-block>
+		</TemplateDetailsBlock>
 	</div>
 </template>
+
 <script lang="ts">
 import { defineComponent } from 'vue';
 import type { PropType } from 'vue';
 import TemplateDetailsBlock from '@/components/TemplateDetailsBlock.vue';
 import NodeIcon from '@/components/NodeIcon.vue';
-import { abbreviateNumber, filterTemplateNodes } from '@/utils';
+import { filterTemplateNodes } from '@/utils/nodeTypesUtils';
+import { abbreviateNumber } from '@/utils/typesUtils';
 import type { ITemplatesNode, ITemplatesWorkflow, ITemplatesWorkflowFull } from '@/Interface';
 import { mapStores } from 'pinia';
-import { useTemplatesStore } from '@/stores/templates';
+import { useTemplatesStore } from '@/stores/templates.store';
+import TimeAgo from '@/components/TimeAgo.vue';
 
 export default defineComponent({
 	name: 'TemplateDetails',
+	components: {
+		NodeIcon,
+		TemplateDetailsBlock,
+		TimeAgo,
+	},
 	props: {
 		blockTitle: {
 			type: String,
@@ -69,10 +76,6 @@ export default defineComponent({
 			type: Object as PropType<ITemplatesWorkflow | ITemplatesWorkflowFull>,
 		},
 	},
-	components: {
-		NodeIcon,
-		TemplateDetailsBlock,
-	},
 	computed: {
 		...mapStores(useTemplatesStore),
 	},
@@ -81,11 +84,11 @@ export default defineComponent({
 		filterTemplateNodes,
 		redirectToCategory(id: string) {
 			this.templatesStore.resetSessionId();
-			this.$router.push(`/templates?categories=${id}`);
+			void this.$router.push(`/templates?categories=${id}`);
 		},
 		redirectToSearchPage(node: ITemplatesNode) {
 			this.templatesStore.resetSessionId();
-			this.$router.push(`/templates?search=${node.displayName}`);
+			void this.$router.push(`/templates?search=${node.displayName}`);
 		},
 	},
 });
diff --git a/packages/editor-ui/src/components/TemplateFilters.vue b/packages/editor-ui/src/components/TemplateFilters.vue
index 14a5d13b68f16..fe7b9022587c7 100644
--- a/packages/editor-ui/src/components/TemplateFilters.vue
+++ b/packages/editor-ui/src/components/TemplateFilters.vue
@@ -1,32 +1,35 @@
 <template>
-	<div :class="$style.filters" class="template-filters">
+	<div :class="$style.filters" class="template-filters" data-test-id="templates-filter-container">
 		<div :class="$style.title" v-text="$locale.baseText('templates.categoriesHeading')" />
 		<div v-if="loading" :class="$style.list">
 			<n8n-loading :loading="loading" :rows="expandLimit" />
 		</div>
 		<ul v-if="!loading" :class="$style.categories">
-			<li :class="$style.item">
-				<el-checkbox
-					:label="$locale.baseText('templates.allCategories')"
-					:value="allSelected"
-					@change="(value) => resetCategories(value)"
-				/>
+			<li :class="$style.item" data-test-id="template-filter-all-categories">
+				<el-checkbox :model-value="allSelected" @update:model-value="() => resetCategories()">
+					{{ $locale.baseText('templates.allCategories') }}
+				</el-checkbox>
 			</li>
 			<li
-				v-for="category in collapsed ? sortedCategories.slice(0, expandLimit) : sortedCategories"
-				:key="category.id"
+				v-for="(category, index) in collapsed
+					? sortedCategories.slice(0, expandLimit)
+					: sortedCategories"
+				:key="index"
 				:class="$style.item"
+				:data-test-id="`template-filter-${category.name.toLowerCase().replaceAll(' ', '-')}`"
 			>
 				<el-checkbox
-					:label="category.name"
-					:value="isSelected(category.id)"
-					@change="(value) => handleCheckboxChanged(value, category)"
-				/>
+					:model-value="isSelected(category)"
+					@update:model-value="(value: boolean) => handleCheckboxChanged(value, category)"
+				>
+					{{ category.name }}
+				</el-checkbox>
 			</li>
 		</ul>
 		<div
-			:class="$style.button"
 			v-if="sortedCategories.length > expandLimit && collapsed && !loading"
+			:class="$style.button"
+			data-test-id="expand-categories-button"
 			@click="collapseAction"
 		>
 			<n8n-text size="small" color="primary">
@@ -37,20 +40,23 @@
 </template>
 
 <script lang="ts">
-import { genericHelpers } from '@/mixins/genericHelpers';
+import { defineComponent } from 'vue';
 import type { ITemplatesCategory } from '@/Interface';
-import mixins from 'vue-typed-mixins';
+import type { PropType } from 'vue';
+import { useTemplatesStore } from '@/stores/templates.store';
+import { mapStores } from 'pinia';
 
-export default mixins(genericHelpers).extend({
+export default defineComponent({
 	name: 'TemplateFilters',
 	props: {
+		categories: {
+			type: Array as PropType<ITemplatesCategory[]>,
+			default: () => [],
+		},
 		sortOnPopulate: {
 			type: Boolean,
 			default: false,
 		},
-		categories: {
-			type: Array,
-		},
 		expandLimit: {
 			type: Number,
 			default: 12,
@@ -59,24 +65,11 @@ export default mixins(genericHelpers).extend({
 			type: Boolean,
 		},
 		selected: {
-			type: Array,
-		},
-	},
-	watch: {
-		categories: {
-			handler(categories: ITemplatesCategory[]) {
-				if (!this.sortOnPopulate) {
-					this.sortedCategories = categories;
-				} else {
-					const selected = this.selected || [];
-					const selectedCategories = categories.filter(({ id }) => selected.includes(id));
-					const notSelectedCategories = categories.filter(({ id }) => !selected.includes(id));
-					this.sortedCategories = selectedCategories.concat(notSelectedCategories);
-				}
-			},
-			immediate: true,
+			type: Array as PropType<ITemplatesCategory[]>,
+			default: () => [],
 		},
 	},
+	emits: ['clearAll', 'select', 'clear'],
 	data() {
 		return {
 			collapsed: true,
@@ -84,19 +77,48 @@ export default mixins(genericHelpers).extend({
 		};
 	},
 	computed: {
+		...mapStores(useTemplatesStore),
 		allSelected(): boolean {
 			return this.selected.length === 0;
 		},
 	},
+	watch: {
+		sortOnPopulate: {
+			handler(value: boolean) {
+				if (value) {
+					this.sortCategories();
+				}
+			},
+			immediate: true,
+		},
+		categories: {
+			handler(categories: ITemplatesCategory[]) {
+				if (categories.length > 0) {
+					this.sortCategories();
+				}
+			},
+			immediate: true,
+		},
+	},
 	methods: {
+		sortCategories() {
+			if (!this.sortOnPopulate) {
+				this.sortedCategories = this.categories;
+			} else {
+				const selected = this.selected || [];
+				const selectedCategories = this.categories.filter((cat) => selected.includes(cat));
+				const notSelectedCategories = this.categories.filter((cat) => !selected.includes(cat));
+				this.sortedCategories = selectedCategories.concat(notSelectedCategories);
+			}
+		},
 		collapseAction() {
 			this.collapsed = false;
 		},
 		handleCheckboxChanged(value: boolean, selectedCategory: ITemplatesCategory) {
-			this.$emit(value ? 'select' : 'clear', selectedCategory.id);
+			this.$emit(value ? 'select' : 'clear', selectedCategory);
 		},
-		isSelected(categoryId: string) {
-			return this.selected.includes(categoryId);
+		isSelected(category: ITemplatesCategory) {
+			return this.selected.includes(category);
 		},
 		resetCategories() {
 			this.$emit('clearAll');
diff --git a/packages/editor-ui/src/components/TemplateList.vue b/packages/editor-ui/src/components/TemplateList.vue
index 62e7fe7d8a626..fe9a6012ce204 100644
--- a/packages/editor-ui/src/components/TemplateList.vue
+++ b/packages/editor-ui/src/components/TemplateList.vue
@@ -1,8 +1,9 @@
 <template>
-	<div :class="$style.list" v-if="loading || workflows.length">
-		<div :class="$style.header">
+	<div v-if="loading || workflows.length" :class="$style.list">
+		<div v-if="!simpleView" :class="$style.header">
 			<n8n-heading :bold="true" size="medium" color="text-light">
 				{{ $locale.baseText('templates.workflows') }}
+				<span v-if="totalCount > 0" data-test-id="template-count-label">({{ totalCount }})</span>
 				<span v-if="!loading && totalWorkflows" v-text="`(${totalWorkflows})`" />
 			</n8n-heading>
 		</div>
@@ -11,20 +12,21 @@
 				v-for="(workflow, index) in workflows"
 				:key="workflow.id"
 				:workflow="workflow"
-				:firstItem="index === 0"
-				:lastItem="index === workflows.length - 1 && !loading"
-				:useWorkflowButton="useWorkflowButton"
+				:first-item="index === 0"
+				:simple-view="simpleView"
+				:last-item="index === workflows.length - 1 && !loading"
+				:use-workflow-button="useWorkflowButton"
 				@click="(e) => onCardClick(e, workflow.id)"
-				@useWorkflow="(e) => onUseWorkflow(e, workflow.id)"
+				@use-workflow="(e) => onUseWorkflow(e, workflow.id)"
 			/>
 			<div v-if="infiniteScrollEnabled" ref="loader" />
-			<div v-if="loading">
+			<div v-if="loading" data-test-id="templates-loading-container">
 				<TemplateCard
 					v-for="n in 4"
 					:key="'index-' + n"
 					:loading="true"
-					:firstItem="workflows.length === 0 && n === 1"
-					:lastItem="n === 4"
+					:first-item="workflows.length === 0 && n === 1"
+					:last-item="n === 4"
 				/>
 			</div>
 		</div>
@@ -32,12 +34,14 @@
 </template>
 
 <script lang="ts">
-import { genericHelpers } from '@/mixins/genericHelpers';
-import mixins from 'vue-typed-mixins';
+import { defineComponent } from 'vue';
 import TemplateCard from './TemplateCard.vue';
 
-export default mixins(genericHelpers).extend({
+export default defineComponent({
 	name: 'TemplateList',
+	components: {
+		TemplateCard,
+	},
 	props: {
 		infiniteScrollEnabled: {
 			type: Boolean,
@@ -52,9 +56,19 @@ export default mixins(genericHelpers).extend({
 		},
 		workflows: {
 			type: Array,
+			default: () => [],
 		},
 		totalWorkflows: {
 			type: Number,
+			default: 0,
+		},
+		simpleView: {
+			type: Boolean,
+			default: false,
+		},
+		totalCount: {
+			type: Number,
+			default: 0,
 		},
 	},
 	mounted() {
@@ -65,15 +79,12 @@ export default mixins(genericHelpers).extend({
 			}
 		}
 	},
-	destroyed() {
+	beforeUnmount() {
 		const content = document.getElementById('content');
 		if (content) {
 			content.removeEventListener('scroll', this.onScroll);
 		}
 	},
-	components: {
-		TemplateCard,
-	},
 	methods: {
 		onScroll() {
 			const loaderRef = this.$refs.loader as HTMLElement | undefined;
diff --git a/packages/editor-ui/src/components/TemplatesInfoCard.vue b/packages/editor-ui/src/components/TemplatesInfoCard.vue
new file mode 100644
index 0000000000000..7084cbf298579
--- /dev/null
+++ b/packages/editor-ui/src/components/TemplatesInfoCard.vue
@@ -0,0 +1,45 @@
+<template>
+	<Card :loading="loading" :title="collection.name" :style="{ width }">
+		<template #footer>
+			<span>
+				<n8n-text v-show="showItemCount" size="small" color="text-light">
+					{{ collection.workflows.length }}
+					{{ $locale.baseText('templates.workflows') }}
+				</n8n-text>
+			</span>
+			<NodeList :nodes="collection.nodes" :show-more="false" />
+		</template>
+	</Card>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import Card from '@/components/CollectionWorkflowCard.vue';
+import NodeList from '@/components/NodeList.vue';
+
+export default defineComponent({
+	name: 'TemplatesInfoCard',
+	components: {
+		Card,
+		NodeList,
+	},
+	props: {
+		loading: {
+			type: Boolean,
+		},
+		collection: {
+			type: Object,
+		},
+		showItemCount: {
+			type: Boolean,
+			default: true,
+		},
+		width: {
+			type: String,
+			required: true,
+		},
+	},
+});
+</script>
+
+<style lang="scss" module></style>
diff --git a/packages/editor-ui/src/components/TemplatesInfoCarousel.vue b/packages/editor-ui/src/components/TemplatesInfoCarousel.vue
new file mode 100644
index 0000000000000..d067e4b2635cd
--- /dev/null
+++ b/packages/editor-ui/src/components/TemplatesInfoCarousel.vue
@@ -0,0 +1,234 @@
+<template>
+	<div v-show="loading || collections.length" :class="$style.container">
+		<agile
+			ref="slider"
+			:dots="false"
+			:nav-buttons="false"
+			:infinite="false"
+			:slides-to-show="4"
+			@after-change="updateCarouselScroll"
+		>
+			<Card v-for="n in loading ? 4 : 0" :key="`loading-${n}`" :loading="loading" />
+			<TemplatesInfoCard
+				v-for="collection in loading ? [] : collections"
+				:key="collection.id"
+				data-test-id="templates-info-card"
+				:collection="collection"
+				:show-item-count="showItemCount"
+				:width="cardsWidth"
+				@click="(e) => onCardClick(e, collection.id)"
+			/>
+		</agile>
+		<button
+			v-show="showNavigation && carouselScrollPosition > 0"
+			:class="{ [$style.leftButton]: true }"
+			@click="scrollLeft"
+		>
+			<font-awesome-icon icon="chevron-left" />
+		</button>
+		<button
+			v-show="showNavigation && !scrollEnd"
+			:class="{ [$style.rightButton]: true }"
+			@click="scrollRight"
+		>
+			<font-awesome-icon icon="chevron-right" />
+		</button>
+	</div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import type { PropType } from 'vue';
+import type { ITemplatesCollection } from '@/Interface';
+import Card from '@/components/CollectionWorkflowCard.vue';
+import TemplatesInfoCard from '@/components/TemplatesInfoCard.vue';
+import { VueAgile } from 'vue-agile';
+
+type SliderRef = InstanceType<typeof VueAgile>;
+
+export default defineComponent({
+	name: 'TemplatesInfoCarousel',
+	components: {
+		Card,
+		TemplatesInfoCard,
+		agile: VueAgile,
+	},
+	props: {
+		collections: {
+			type: Array as PropType<ITemplatesCollection[]>,
+		},
+		loading: {
+			type: Boolean,
+		},
+		showItemCount: {
+			type: Boolean,
+			default: true,
+		},
+		showNavigation: {
+			type: Boolean,
+			default: true,
+		},
+		cardsWidth: {
+			type: String,
+			default: '240px',
+		},
+	},
+	data() {
+		return {
+			carouselScrollPosition: 0,
+			cardWidth: parseInt(this.cardsWidth, 10),
+			sliderWidth: 0,
+			scrollEnd: false,
+			listElement: null as null | Element,
+		};
+	},
+	watch: {
+		collections() {
+			setTimeout(() => {
+				this.updateCarouselScroll();
+			}, 0);
+		},
+		loading() {
+			setTimeout(() => {
+				this.updateCarouselScroll();
+			}, 0);
+		},
+	},
+	async mounted() {
+		await this.$nextTick();
+		const sliderRef = this.$refs.slider as SliderRef | undefined;
+		if (!sliderRef) {
+			return;
+		}
+
+		this.listElement = sliderRef.$el.querySelector('.agile__list');
+		if (this.listElement) {
+			this.listElement.addEventListener('scroll', this.updateCarouselScroll);
+		}
+	},
+	beforeUnmount() {
+		const sliderRef = this.$refs.slider as SliderRef | undefined;
+		if (sliderRef) {
+			sliderRef.destroy();
+		}
+
+		window.removeEventListener('scroll', this.updateCarouselScroll);
+	},
+	methods: {
+		updateCarouselScroll() {
+			if (this.listElement) {
+				this.carouselScrollPosition = Number(this.listElement.scrollLeft.toFixed());
+
+				const width = this.listElement.clientWidth;
+				const scrollWidth = this.listElement.scrollWidth;
+				const scrollLeft = this.carouselScrollPosition;
+				this.scrollEnd = scrollWidth - width <= scrollLeft + 7;
+			}
+		},
+		onCardClick(event: MouseEvent, id: string) {
+			this.$emit('openCollection', { event, id });
+		},
+		scrollLeft() {
+			if (this.listElement) {
+				this.listElement.scrollBy({ left: -(this.cardWidth * 2), top: 0, behavior: 'smooth' });
+			}
+		},
+		scrollRight() {
+			if (this.listElement) {
+				this.listElement.scrollBy({ left: this.cardWidth * 2, top: 0, behavior: 'smooth' });
+			}
+		},
+	},
+});
+</script>
+
+<style lang="scss" module>
+.container {
+	position: relative;
+}
+
+.button {
+	width: 28px;
+	height: 37px;
+	position: absolute;
+	top: 35%;
+	border-radius: var(--border-radius-large);
+	border: var(--border-base);
+	background-color: #fbfcfe;
+	cursor: pointer;
+
+	&:after {
+		content: '';
+		width: 40px;
+		height: 140px;
+		top: -55px;
+		position: absolute;
+	}
+	svg {
+		color: var(--color-foreground-xdark);
+	}
+}
+
+.leftButton {
+	composes: button;
+	left: -30px;
+
+	&:after {
+		left: 27px;
+		background: linear-gradient(
+			270deg,
+			hsla(
+				var(--color-background-light-h),
+				var(--color-background-light-s),
+				var(--color-background-light-l),
+				50%
+			),
+			hsla(
+				var(--color-background-light-h),
+				var(--color-background-light-s),
+				var(--color-background-light-l),
+				100%
+			)
+		);
+	}
+}
+
+.rightButton {
+	composes: button;
+	right: -30px;
+
+	&:after {
+		right: 27px;
+		background: linear-gradient(
+			90deg,
+			hsla(
+				var(--color-background-light-h),
+				var(--color-background-light-s),
+				var(--color-background-light-l),
+				50%
+			),
+			hsla(
+				var(--color-background-light-h),
+				var(--color-background-light-s),
+				var(--color-background-light-l),
+				100%
+			)
+		);
+	}
+}
+</style>
+
+<style lang="scss">
+.agile {
+	&__list {
+		width: 100%;
+		padding-bottom: var(--spacing-2xs);
+		overflow-x: auto;
+		transition: all 1s ease-in-out;
+	}
+
+	&__track {
+		width: 50px;
+	}
+}
+</style>
diff --git a/packages/editor-ui/src/components/TestSuiteCard.vue b/packages/editor-ui/src/components/TestSuiteCard.vue
new file mode 100644
index 0000000000000..6d5bca4770b00
--- /dev/null
+++ b/packages/editor-ui/src/components/TestSuiteCard.vue
@@ -0,0 +1,131 @@
+<template>
+	<n8n-card :class="$style.cardLink" @click="onClick">
+		<template #header>
+			<div>
+				<n8n-heading
+					tag="h2"
+					bold
+					class="ph-no-capture"
+					:class="$style.cardHeading"
+					data-test-id="workflow-card-name"
+				>
+					{{ data.name }}
+				</n8n-heading>
+				<n8n-text color="text-light" size="small">
+					<span v-show="data">
+						{{ $locale.baseText('workflows.item.updated') }} <time-ago :date="data.updatedAt" />
+						|
+					</span>
+					<span v-show="data" class="mr-2xs">
+						{{ $locale.baseText('workflows.item.created') }} {{ formattedCreatedAtDate }}
+					</span>
+				</n8n-text>
+			</div>
+			<div :class="$style.cardDescription">
+				<div v-if="isTestCard" :class="$style.flex1">
+					<n8n-text size="large" color="text-base">{{ data.description }}</n8n-text>
+				</div>
+			</div>
+		</template>
+	</n8n-card>
+</template>
+
+<script lang="ts">
+import type { IUser } from '@/Interface';
+import { VIEWS } from '@/constants';
+import dateformat from 'dateformat';
+import { mapStores } from 'pinia';
+import { useUIStore } from '@/stores/ui.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import type WorkflowActivator from './WorkflowActivator.vue';
+type ActivatorRef = InstanceType<typeof WorkflowActivator>;
+export default {
+	name: 'TestSuiteCard',
+	props: {
+		isTestCard: {
+			type: Boolean,
+			default: false,
+		},
+		data: {
+			type: Object,
+			required: true,
+			default: () => ({
+				id: '',
+				createdAt: '',
+				updatedAt: '',
+				active: false,
+				connections: {},
+				nodes: [],
+				name: '',
+				sharedWith: [],
+				ownedBy: {} as IUser,
+				versionId: '',
+				description: '',
+			}),
+		},
+		readonly: {
+			type: Boolean,
+			default: false,
+		},
+	},
+	computed: {
+		...mapStores(useUIStore, useWorkflowsStore),
+		formattedCreatedAtDate(): string {
+			const currentYear = new Date().getFullYear();
+			return dateformat(
+				this.data.createdAt,
+				`d mmmm${this.data.createdAt.startsWith(currentYear) ? '' : ', yyyy'}`,
+			);
+		},
+	},
+	methods: {
+		onClick(event?: PointerEvent) {
+			const view = this.isTestCard
+				? {
+						name: VIEWS.TEST_SUITE_NODES,
+						params: { workflow: this.$route.params.workflow, test: this.data.id },
+					}
+				: {
+						name: VIEWS.TEST_SUITE,
+						params: { workflow: this.data.id, test: '' },
+					};
+			if (event) {
+				if (this.$refs.activator?.$el.contains(event.target as HTMLElement)) {
+					return;
+				}
+				if (event.metaKey || event.ctrlKey) {
+					const route = this.$router.resolve(view);
+					window.open(route.href, '_blank');
+					return;
+				}
+			}
+			this.$router.push(view);
+		},
+	},
+};
+</script>
+
+<style lang="scss" module>
+.cardLink {
+	transition: box-shadow 0.3s ease;
+	cursor: pointer;
+
+	&:hover {
+		box-shadow: 0 2px 8px rgba(#441c17, 0.1);
+	}
+}
+
+.cardHeading {
+	font-size: var(--font-size-s);
+	word-break: break-word;
+}
+
+.cardDescription {
+	display: flex;
+	justify-content: flex-end;
+}
+
+.flex1 {
+	flex: 1;
+}
+</style>
diff --git a/packages/editor-ui/src/components/TestSuiteNodeCard.vue b/packages/editor-ui/src/components/TestSuiteNodeCard.vue
new file mode 100644
index 0000000000000..7c9e6796e105e
--- /dev/null
+++ b/packages/editor-ui/src/components/TestSuiteNodeCard.vue
@@ -0,0 +1,167 @@
+<template>
+	<n8n-card :class="$style.cardLink">
+		<div :class="$style.cardDescription">
+			<div :class="$style.headerWrapper">
+				<n8n-heading
+					tag="h2"
+					bold
+					class="ph-no-capture"
+					:class="$style.cardHeading"
+					data-test-id="workflow-card-name"
+				>
+					<div>
+						Name: <n8n-text class="ml-4xs" color="text-base"> {{ data.name }}</n8n-text>
+					</div>
+					<div>
+						ID: <n8n-text class="ml-4xs" color="text-base"> {{ data.id }}</n8n-text>
+					</div>
+					<div>
+						Type: <n8n-text class="ml-4xs" color="text-base"> {{ data.type || '' }}</n8n-text>
+					</div>
+				</n8n-heading>
+			</div>
+
+			<div v-show="nodeOutput.outputType" :class="$style.flex1">
+				<n8n-text bold>{{ displayedOutputType }}:</n8n-text>
+				<n8n-text color="text-base">{{ displayedContent }}</n8n-text>
+			</div>
+
+			<div :class="$style.flexNorm">
+				<n8n-button size="large" @click="editTestOutput">{{
+					$locale.baseText('testSuites.edit')
+				}}</n8n-button>
+			</div>
+		</div>
+	</n8n-card>
+</template>
+
+<script lang="ts">
+import { mapStores } from 'pinia';
+import { useUIStore } from '@/stores/ui.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { EDIT_TEST_SUITE_MODAL_KEY } from '@/constants';
+import type { NodeOutputDb } from '@/Interface';
+
+export default {
+	name: 'TestSuiteNodeCard',
+	props: {
+		data: {
+			type: Object,
+			required: true,
+			default: () => ({
+				id: '',
+				name: '',
+				type: '',
+			}),
+		},
+	},
+	data() {
+		return {
+			displayedContent: '',
+			displayedOutputType: '',
+			nodeOutput: {
+				id: '',
+				workflowTestId: '',
+				outputType: null,
+				nodeId: '',
+				errorMessage: '',
+				data: null,
+			} as NodeOutputDb,
+			loading: true,
+		};
+	},
+	computed: {
+		...mapStores(useUIStore, useWorkflowsStore),
+	},
+	watch: {
+		'workflowsStore.nodeOutputsById': {
+			handler: 'handleNodeOutputsChange',
+			deep: true,
+			immediate: true,
+		},
+	},
+	created() {
+		this.getNodeOutput();
+	},
+	methods: {
+		async handleNodeOutputsChange() {
+			await this.getNodeOutput();
+		},
+		async getNodeOutput() {
+			const nodeId = this.data.id;
+			let nodeOutput = this.workflowsStore.nodeOutputsById[nodeId] || {};
+			let outputType = null;
+			let displayedContent = '';
+			let displayedOutputType = '';
+			if (nodeOutput.data) {
+				displayedContent = nodeOutput.data;
+				outputType = 'data';
+				displayedOutputType = 'Output';
+			} else if (nodeOutput.errorMessage) {
+				displayedContent = nodeOutput.errorMessage;
+				outputType = 'error';
+				displayedOutputType = 'Error';
+			}
+			this.displayedContent = displayedContent;
+			this.displayedOutputType = displayedOutputType;
+			nodeOutput = {
+				...nodeOutput,
+				outputType,
+			};
+			this.nodeOutput = nodeOutput;
+			this.loading = false;
+		},
+		editTestOutput() {
+			this.openEditTestModal();
+		},
+		openEditTestModal() {
+			this.uiStore.openModalWithData({
+				name: EDIT_TEST_SUITE_MODAL_KEY,
+				data: {
+					...this.data,
+					nodeOutput: this.nodeOutput,
+				},
+			});
+		},
+	},
+};
+</script>
+
+<style lang="scss" module>
+.cardLink {
+	transition: box-shadow 0.3s ease;
+	&:hover {
+		box-shadow: 0 2px 8px rgba(#441c17, 0.1);
+	}
+}
+.cardHeading {
+	font-size: var(--font-size-s);
+	word-break: break-word;
+	display: flex;
+	flex-direction: column;
+	row-gap: 4px;
+}
+.cardDescription {
+	min-height: 19px;
+	display: flex;
+	justify-content: space-between;
+	flex-flow: nowrap;
+	gap: 16px;
+}
+.headerWrapper {
+	min-width: 295px;
+}
+.flex1 {
+	display: flex;
+	flex-direction: row;
+	justify-content: flex-start;
+	flex: 1;
+	column-gap: 4px;
+}
+.flexNorm {
+	display: flex;
+	flex-direction: row;
+	justify-content: center;
+	align-items: center;
+}
+</style>
diff --git a/packages/editor-ui/src/components/TestsListLayout.vue b/packages/editor-ui/src/components/TestsListLayout.vue
new file mode 100644
index 0000000000000..457df650d7ffd
--- /dev/null
+++ b/packages/editor-ui/src/components/TestsListLayout.vue
@@ -0,0 +1,156 @@
+<template>
+	<PageViewLayout>
+		<div v-if="loading">
+			<n8n-loading :class="[$style['header-loading'], 'mb-l']" variant="custom" />
+			<n8n-loading :class="[$style['card-loading'], 'mb-2xs']" variant="custom" />
+			<n8n-loading :class="$style['card-loading']" variant="custom" />
+		</div>
+		<template v-else>
+			<div v-if="testSuites.length === 0">
+				<n8n-action-box
+					:heading="
+						$locale.baseText('testSuites.workflows.tests.heading', {
+							interpolate: { name: currentWorkFlowName },
+						})
+					"
+					:description="$locale.baseText('testSuites.workflows.tests.empty.description')"
+					:button-text="$locale.baseText('testSuites.add')"
+					button-type="secondary"
+					@click="$emit('click:add', $event)"
+				/>
+			</div>
+			<PageViewLayoutList v-else>
+				<template #header>
+					<div :class="[$style['flex'], 'mb-2xs']">
+						<div>
+							<n8n-heading tag="h2" size="xlarge">
+								{{
+									$locale.baseText('testSuites.workflows.tests.heading', {
+										interpolate: { name: currentWorkFlowName },
+									})
+								}}
+							</n8n-heading>
+						</div>
+						<div>
+							<n8n-button
+								size="large"
+								block
+								:disabled="disabled"
+								@click="$emit('click:add', $event)"
+							>
+								{{ $locale.baseText('testSuites.add') }}
+							</n8n-button>
+						</div>
+					</div>
+				</template>
+
+				<div v-if="testSuites.length > 0" ref="listWrapperRef" :class="$style.listWrapper">
+					<n8n-recycle-scroller
+						:class="[$style.list, 'list-style-none']"
+						:items="testSuites"
+						item-key="id"
+						:item-size="0"
+					>
+						<template #default="{ item, updateItemSize }">
+							<slot :data="item" :update-item-size="updateItemSize" />
+						</template>
+					</n8n-recycle-scroller>
+				</div>
+			</PageViewLayoutList>
+		</template>
+	</PageViewLayout>
+</template>
+
+<script lang="ts">
+import type { IUser } from '@/Interface';
+import { mapStores } from 'pinia';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useUsersStore } from '@/stores/users.store';
+import PageViewLayout from '@/components/layouts/PageViewLayout.vue';
+import PageViewLayoutList from '@/components/layouts/PageViewLayoutList.vue';
+import type { PropType } from 'vue';
+
+export interface IResource {
+	id: string;
+	name: string;
+	updatedAt: string;
+	createdAt: string;
+	ownedBy?: Partial<IUser>;
+	sharedWith?: Array<Partial<IUser>>;
+}
+
+export default {
+	name: 'TestsListLayout',
+	components: {
+		PageViewLayout,
+		PageViewLayoutList,
+	},
+	props: {
+		displayName: {
+			type: Function as PropType<(resource: IResource) => string>,
+			default: (resource: IResource) => resource.name,
+		},
+		testSuites: {
+			type: Array,
+			default: (): IResource[] => [],
+		},
+		disabled: {
+			type: Boolean,
+			default: false,
+		},
+		initialize: {
+			type: Function as PropType<() => Promise<void>>,
+			default: () => async () => {},
+		},
+		currentWorkFlowName: {
+			type: String,
+			default: '',
+		},
+	},
+	emits: ['click:add'],
+	data() {
+		return {
+			loading: true,
+		};
+	},
+	computed: {
+		...mapStores(useSettingsStore, useUsersStore),
+	},
+	mounted() {
+		this.onMounted();
+	},
+	methods: {
+		async onMounted() {
+			await this.initialize();
+			this.loading = false;
+		},
+	},
+};
+</script>
+
+<style lang="scss" module>
+.heading-wrapper {
+	padding-bottom: 1px; // Match input height
+}
+.flex {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	flex-flow: row nowrap;
+}
+.search {
+	max-width: 240px;
+}
+.list {
+	display: block;
+}
+.listWrapper {
+	height: 100%;
+}
+.header-loading {
+	height: 36px;
+}
+.card-loading {
+	height: 69px;
+}
+</style>
diff --git a/packages/editor-ui/src/components/TestsListNodeLayout.vue b/packages/editor-ui/src/components/TestsListNodeLayout.vue
new file mode 100644
index 0000000000000..bc0dd6f830b13
--- /dev/null
+++ b/packages/editor-ui/src/components/TestsListNodeLayout.vue
@@ -0,0 +1,145 @@
+<template>
+	<PageViewLayout>
+		<div v-if="loading">
+			<n8n-loading :class="[headerLoadingClass, 'mb-l']" variant="custom" />
+			<n8n-loading :class="[cardLoadingClass, 'mb-2xs']" variant="custom" />
+			<n8n-loading :class="cardLoadingClass" variant="custom" />
+		</div>
+
+		<PageViewLayoutList v-else>
+			<template #header>
+				<div :class="[flexClass, 'mb-2xs']">
+					<div>
+						<n8n-heading tag="h2" size="xlarge">
+							{{
+								$locale.baseText('testSuites.workflows.tests.node.heading', {
+									interpolate: { id: currentTestSuiteName },
+								})
+							}}
+						</n8n-heading>
+					</div>
+					<div>
+						<n8n-heading tag="h2" size="xlarge">
+							{{ currentTestSuiteDescription }}
+						</n8n-heading>
+					</div>
+				</div>
+			</template>
+
+			<div v-if="workFlowNodes.length > 0" ref="listWrapperRef" :class="listWrapperClass">
+				<n8n-recycle-scroller
+					:class="[listClass, 'list-style-none']"
+					:items="workFlowNodes"
+					item-key="id"
+					:item-size="0"
+				>
+					<template #default="{ item, updateItemSize }">
+						<slot :data="item" :update-item-size="updateItemSize" />
+					</template>
+				</n8n-recycle-scroller>
+			</div>
+		</PageViewLayoutList>
+	</PageViewLayout>
+</template>
+
+<script lang="ts">
+import type { IUser } from '@/Interface';
+import PageViewLayout from '@/components/layouts/PageViewLayout.vue';
+import PageViewLayoutList from '@/components/layouts/PageViewLayoutList.vue';
+import type { PropType } from 'vue';
+import { mapStores } from 'pinia';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useUsersStore } from '@/stores/users.store';
+export interface IResource {
+	id: string;
+	name: string;
+	updatedAt: string;
+	createdAt: string;
+	ownedBy?: Partial<IUser>;
+	sharedWith?: Array<Partial<IUser>>;
+}
+export default {
+	name: 'TestsListNodeLayout',
+	components: {
+		PageViewLayout,
+		PageViewLayoutList,
+	},
+	props: {
+		workFlowNodes: {
+			type: Array,
+			default: (): IResource[] => [],
+		},
+		initialize: {
+			type: Function as PropType<() => Promise<void>>,
+			default: () => async () => {},
+		},
+		currentTestSuiteDescription: {
+			type: String,
+			default: '',
+		},
+		currentTestSuiteName: {
+			type: String,
+			default: '',
+		},
+	},
+	data() {
+		return {
+			loading: true,
+		};
+	},
+	computed: {
+		...mapStores(useSettingsStore, useUsersStore),
+		headerLoadingClass(): string {
+			return `${this.$style['header-loading']} mb-l`;
+		},
+		cardLoadingClass(): string {
+			return `${this.$style['card-loading']} mb-2xs`;
+		},
+		flexClass(): string {
+			return `${this.$style.flex} mb-2xs`;
+		},
+		listWrapperClass(): string {
+			return `${this.$style.listWrapper}`;
+		},
+		listClass(): string {
+			return `${this.$style.list} list-style-none`;
+		},
+	},
+	mounted() {
+		this.onMounted();
+	},
+	methods: {
+		async onMounted() {
+			await this.initialize();
+			this.loading = false;
+		},
+	},
+};
+</script>
+
+<style lang="scss" module>
+.heading-wrapper {
+	padding-bottom: 1px; // Match input height
+}
+.flex {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	flex-flow: row nowrap;
+}
+.search {
+	max-width: 240px;
+}
+.list {
+	display: block;
+}
+.listWrapper {
+	height: 100%;
+}
+.header-loading {
+	height: 36px;
+}
+.card-loading {
+	height: 69px;
+}
+</style>
diff --git a/packages/editor-ui/src/components/TextEdit.vue b/packages/editor-ui/src/components/TextEdit.vue
index c1ebda5687ba2..070e6c67c7a82 100644
--- a/packages/editor-ui/src/components/TextEdit.vue
+++ b/packages/editor-ui/src/components/TextEdit.vue
@@ -1,7 +1,7 @@
 <template>
 	<div v-if="dialogVisible">
 		<el-dialog
-			:visible="dialogVisible"
+			:model-value="dialogVisible"
 			append-to-body
 			width="80%"
 			:title="`${$locale.baseText('textEdit.edit')} ${$locale
@@ -13,14 +13,13 @@
 				<n8n-input-label :label="$locale.nodeText().inputLabelDisplayName(parameter, path)">
 					<div @keydown.stop @keydown.esc="onKeyDownEsc()">
 						<n8n-input
+							ref="inputField"
 							v-model="tempValue"
 							type="textarea"
-							ref="inputField"
-							:value="value"
 							:placeholder="$locale.nodeText().placeholder(parameter, path)"
-							:readOnly="isReadOnly"
-							@change="valueChanged"
+							:read-only="isReadOnly"
 							:rows="15"
+							@update:model-value="valueChanged"
 						/>
 					</div>
 				</n8n-input-label>
@@ -34,20 +33,34 @@ import { nextTick, defineComponent } from 'vue';
 
 export default defineComponent({
 	name: 'TextEdit',
-	props: ['dialogVisible', 'parameter', 'path', 'value', 'isReadOnly'],
+	props: ['dialogVisible', 'parameter', 'path', 'modelValue', 'isReadOnly'],
 	data() {
 		return {
 			tempValue: '', // el-input does not seem to work without v-model so add one
 		};
 	},
+	watch: {
+		async dialogVisible() {
+			if (this.dialogVisible === true) {
+				await nextTick();
+				(this.$refs.inputField as HTMLInputElement).focus();
+			}
+		},
+		modelValue(value: string) {
+			this.tempValue = value;
+		},
+	},
+	mounted() {
+		this.tempValue = this.modelValue as string;
+	},
 	methods: {
 		valueChanged(value: string) {
-			this.$emit('valueChanged', value);
+			this.$emit('update:modelValue', value);
 		},
 
 		onKeyDownEsc() {
 			// Resetting input value when closing the dialog, required when closing it using the `Esc` key
-			this.tempValue = this.value;
+			this.tempValue = this.modelValue;
 
 			this.closeDialog();
 		},
@@ -59,20 +72,5 @@ export default defineComponent({
 			return false;
 		},
 	},
-	mounted() {
-		this.tempValue = this.value as string;
-	},
-	watch: {
-		dialogVisible() {
-			if (this.dialogVisible === true) {
-				nextTick(() => {
-					(this.$refs.inputField as HTMLInputElement).focus();
-				});
-			}
-		},
-		value() {
-			this.tempValue = this.value as string;
-		},
-	},
 });
 </script>
diff --git a/packages/editor-ui/src/components/TextWithHighlights.vue b/packages/editor-ui/src/components/TextWithHighlights.vue
new file mode 100644
index 0000000000000..43951463d8ac7
--- /dev/null
+++ b/packages/editor-ui/src/components/TextWithHighlights.vue
@@ -0,0 +1,52 @@
+<script lang="ts" setup>
+import type { PropType } from 'vue';
+import type { GenericValue } from 'n8n-workflow';
+import { computed } from 'vue';
+
+const props = defineProps({
+	content: {
+		type: [Object, String, Number] as PropType<GenericValue>,
+	},
+	search: {
+		type: String,
+	},
+});
+
+const splitTextBySearch = (
+	text = '',
+	search = '',
+): Array<{ tag: 'span' | 'mark'; content: string }> => {
+	if (!search) {
+		return [
+			{
+				tag: 'span',
+				content: text,
+			},
+		];
+	}
+
+	const escapeRegExp = (s: string) => s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); // $& means the whole matched string
+	const pattern = new RegExp(`(${escapeRegExp(search)})`, 'i');
+	const splitText = text.split(pattern);
+
+	return splitText.map((t) => ({ tag: pattern.test(t) ? 'mark' : 'span', content: t }));
+};
+
+const parts = computed(() => {
+	return props.search && typeof props.content === 'string'
+		? splitTextBySearch(props.content, props.search)
+		: [];
+});
+</script>
+
+<template>
+	<span v-if="parts.length && typeof props.content === 'string'">
+		<template v-for="(part, index) in parts">
+			<mark v-if="part.tag === 'mark' && part.content" :key="`mark-${index}`">{{
+				part.content
+			}}</mark>
+			<span v-else-if="part.content" :key="`span-${index}`">{{ part.content }}</span>
+		</template>
+	</span>
+	<span v-else>{{ props.content }}</span>
+</template>
diff --git a/packages/editor-ui/src/components/TimeAgo.vue b/packages/editor-ui/src/components/TimeAgo.vue
index 85e4969bca8a0..333375ad57ba2 100644
--- a/packages/editor-ui/src/components/TimeAgo.vue
+++ b/packages/editor-ui/src/components/TimeAgo.vue
@@ -7,10 +7,10 @@
 <script lang="ts">
 import type { LocaleFunc } from 'timeago.js';
 import { format, register } from 'timeago.js';
-import { convertToHumanReadableDate } from '@/utils';
+import { convertToHumanReadableDate } from '@/utils/typesUtils';
 import { defineComponent } from 'vue';
 import { mapStores } from 'pinia';
-import { useRootStore } from '@/stores/n8nRootStore';
+import { useRootStore } from '@/stores/n8nRoot.store';
 
 export default defineComponent({
 	name: 'TimeAgo',
diff --git a/packages/editor-ui/src/components/TitledList.vue b/packages/editor-ui/src/components/TitledList.vue
index f15337f055f31..cd73f6d48ec6c 100644
--- a/packages/editor-ui/src/components/TitledList.vue
+++ b/packages/editor-ui/src/components/TitledList.vue
@@ -2,7 +2,7 @@
 	<div class="titled-list">
 		<p v-text="title" />
 		<ul>
-			<li v-for="item in items" class="titled-list-item" :key="item" v-html="item" />
+			<li v-for="item in items" :key="item" class="titled-list-item" v-html="item" />
 		</ul>
 	</div>
 </template>
diff --git a/packages/editor-ui/src/components/TriggerPanel.vue b/packages/editor-ui/src/components/TriggerPanel.vue
index bdba1c976fffe..c53ecfc0deda1 100644
--- a/packages/editor-ui/src/components/TriggerPanel.vue
+++ b/packages/editor-ui/src/components/TriggerPanel.vue
@@ -1,10 +1,10 @@
 <template>
 	<div :class="$style.container">
 		<transition name="fade" mode="out-in">
-			<div key="empty" v-if="hasIssues"></div>
-			<div key="listening" v-else-if="isListeningForEvents">
+			<div v-if="hasIssues || hideContent" key="empty"></div>
+			<div v-else-if="isListeningForEvents" key="listening">
 				<n8n-pulse>
-					<NodeIcon :nodeType="nodeType" :size="40"></NodeIcon>
+					<NodeIcon :node-type="nodeType" :size="40"></NodeIcon>
 				</n8n-pulse>
 				<div v-if="isWebhookNode">
 					<n8n-text tag="div" size="large" color="text-dark" class="mb-2xs" bold>{{
@@ -14,14 +14,14 @@
 						<n8n-text>
 							{{
 								$locale.baseText('ndv.trigger.webhookNode.requestHint', {
-									interpolate: { type: this.webhookHttpMethod },
+									interpolate: { type: webhookHttpMethod },
 								})
 							}}
 						</n8n-text>
 					</div>
 					<CopyInput
 						:value="webhookTestUrl"
-						:toastTitle="$locale.baseText('ndv.trigger.copiedTestUrl')"
+						:toast-title="$locale.baseText('ndv.trigger.copiedTestUrl')"
 						class="mb-2xl"
 						size="medium"
 						:collapse="true"
@@ -29,29 +29,39 @@
 						@copy="onTestLinkCopied"
 					></CopyInput>
 					<NodeExecuteButton
-						:nodeName="nodeName"
-						@execute="onNodeExecute"
+						data-test-id="trigger-execute-button"
+						:node-name="nodeName"
 						size="medium"
-						telemetrySource="inputs"
+						telemetry-source="inputs"
+						@execute="onNodeExecute"
 					/>
 				</div>
 				<div v-else>
 					<n8n-text tag="div" size="large" color="text-dark" class="mb-2xs" bold>{{
-						$locale.baseText('ndv.trigger.webhookBasedNode.listening')
+						listeningTitle
 					}}</n8n-text>
 					<div :class="[$style.shake, 'mb-xs']">
 						<n8n-text tag="div">
-							{{
-								$locale.baseText('ndv.trigger.webhookBasedNode.serviceHint', {
-									interpolate: { service: serviceName },
-								})
-							}}
+							{{ listeningHint }}
 						</n8n-text>
 					</div>
+					<div v-if="displayChatButton">
+						<n8n-button class="mb-xl" @click="openWebhookUrl()">
+							{{ $locale.baseText('ndv.trigger.chatTrigger.openChat') }}
+						</n8n-button>
+					</div>
+
+					<NodeExecuteButton
+						data-test-id="trigger-execute-button"
+						:node-name="nodeName"
+						size="medium"
+						telemetry-source="inputs"
+						@execute="onNodeExecute"
+					/>
 				</div>
 			</div>
-			<div key="default" v-else>
-				<div class="mb-xl" v-if="isActivelyPolling">
+			<div v-else key="default">
+				<div v-if="isActivelyPolling" class="mb-xl">
 					<n8n-spinner type="ring" />
 				</div>
 
@@ -66,29 +76,31 @@
 					</div>
 
 					<NodeExecuteButton
-						:nodeName="nodeName"
-						@execute="onNodeExecute"
+						data-test-id="trigger-execute-button"
+						:node-name="nodeName"
 						size="medium"
-						telemetrySource="inputs"
+						telemetry-source="inputs"
+						@execute="onNodeExecute"
 					/>
 				</div>
 
-				<n8n-text size="small" @click="onLinkClick" v-if="activationHint">
+				<n8n-text v-if="activationHint" size="small" @click="onLinkClick">
 					<span v-html="activationHint"></span>&nbsp;
 				</n8n-text>
 				<n8n-link
-					size="small"
 					v-if="activationHint && executionsHelp"
+					size="small"
 					@click="expandExecutionHelp"
 					>{{ $locale.baseText('ndv.trigger.moreInfo') }}</n8n-link
 				>
 				<n8n-info-accordion
-					ref="help"
 					v-if="executionsHelp"
+					ref="help"
 					:class="$style.accordion"
 					:title="$locale.baseText('ndv.trigger.executionsHint.question')"
 					:description="executionsHelp"
-					@click="onLinkClick"
+					:event-bus="executionsHelpEventBus"
+					@click:body="onLinkClick"
 				></n8n-info-accordion>
 			</div>
 		</transition>
@@ -96,28 +108,30 @@
 </template>
 
 <script lang="ts">
-import { EXECUTIONS_MODAL_KEY, WEBHOOK_NODE_TYPE, WORKFLOW_SETTINGS_MODAL_KEY } from '@/constants';
+import { defineComponent } from 'vue';
+import { mapStores } from 'pinia';
+import {
+	CHAT_TRIGGER_NODE_TYPE,
+	VIEWS,
+	WEBHOOK_NODE_TYPE,
+	WORKFLOW_SETTINGS_MODAL_KEY,
+	FORM_TRIGGER_NODE_TYPE,
+} from '@/constants';
 import type { INodeUi } from '@/Interface';
 import type { INodeTypeDescription } from 'n8n-workflow';
-import { getTriggerNodeServiceName } from '@/utils';
-import NodeExecuteButton from './NodeExecuteButton.vue';
-import { workflowHelpers } from '@/mixins/workflowHelpers';
-import mixins from 'vue-typed-mixins';
-import CopyInput from './CopyInput.vue';
-import NodeIcon from './NodeIcon.vue';
-import { copyPaste } from '@/mixins/copyPaste';
-import { showMessage } from '@/mixins/showMessage';
-import type Vue from 'vue';
-import { mapStores } from 'pinia';
-import { useUIStore } from '@/stores/ui';
-import { useWorkflowsStore } from '@/stores/workflows';
-import { useNDVStore } from '@/stores/ndv';
-import { useNodeTypesStore } from '@/stores/nodeTypes';
-import type { N8nInfoAccordion } from 'n8n-design-system';
-
-type HelpRef = InstanceType<typeof N8nInfoAccordion>;
-
-export default mixins(workflowHelpers, copyPaste, showMessage).extend({
+import { getTriggerNodeServiceName } from '@/utils/nodeTypesUtils';
+import NodeExecuteButton from '@/components/NodeExecuteButton.vue';
+import CopyInput from '@/components/CopyInput.vue';
+import NodeIcon from '@/components/NodeIcon.vue';
+import { useUIStore } from '@/stores/ui.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useNDVStore } from '@/stores/ndv.store';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import { createEventBus } from 'n8n-design-system/utils';
+import { useRouter } from 'vue-router';
+import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
+
+export default defineComponent({
 	name: 'TriggerPanel',
 	components: {
 		NodeExecuteButton,
@@ -128,14 +142,27 @@ export default mixins(workflowHelpers, copyPaste, showMessage).extend({
 		nodeName: {
 			type: String,
 		},
-		sessionId: {
+		pushRef: {
 			type: String,
 		},
 	},
+	setup() {
+		const router = useRouter();
+		const workflowHelpers = useWorkflowHelpers({ router });
+
+		return {
+			workflowHelpers,
+		};
+	},
+	data: () => {
+		return {
+			executionsHelpEventBus: createEventBus(),
+		};
+	},
 	computed: {
 		...mapStores(useNodeTypesStore, useNDVStore, useUIStore, useWorkflowsStore),
 		node(): INodeUi | null {
-			return this.workflowsStore.getNodeByName(this.nodeName);
+			return this.workflowsStore.getNodeByName(this.nodeName as string);
 		},
 		nodeType(): INodeTypeDescription | null {
 			if (this.node) {
@@ -144,11 +171,36 @@ export default mixins(workflowHelpers, copyPaste, showMessage).extend({
 
 			return null;
 		},
+		hideContent(): boolean {
+			if (!this.nodeType?.triggerPanel) {
+				return false;
+			}
+
+			if (
+				this.nodeType?.triggerPanel &&
+				this.nodeType?.triggerPanel.hasOwnProperty('hideContent')
+			) {
+				const hideContent = this.nodeType?.triggerPanel.hideContent;
+				if (typeof hideContent === 'boolean') {
+					return hideContent;
+				}
+
+				if (this.node) {
+					const hideContentValue = this.workflowHelpers
+						.getCurrentWorkflow()
+						.expression.getSimpleParameterValue(this.node, hideContent, 'internal', {});
+
+					if (typeof hideContentValue === 'boolean') {
+						return hideContentValue;
+					}
+				}
+			}
+
+			return false;
+		},
 		hasIssues(): boolean {
 			return Boolean(
-				this.node &&
-					this.node.issues &&
-					(this.node.issues.parameters || this.node.issues.credentials),
+				this.node?.issues && (this.node.issues.parameters || this.node.issues.credentials),
 			);
 		},
 		serviceName(): string {
@@ -158,54 +210,49 @@ export default mixins(workflowHelpers, copyPaste, showMessage).extend({
 
 			return '';
 		},
+		displayChatButton(): boolean {
+			return Boolean(
+				this.node &&
+					this.node.type === CHAT_TRIGGER_NODE_TYPE &&
+					this.node.parameters.mode !== 'webhook',
+			);
+		},
 		isWebhookNode(): boolean {
 			return Boolean(this.node && this.node.type === WEBHOOK_NODE_TYPE);
 		},
 		webhookHttpMethod(): string | undefined {
-			if (
-				!this.node ||
-				!this.nodeType ||
-				!this.nodeType.webhooks ||
-				!this.nodeType.webhooks.length
-			) {
+			if (!this.node || !this.nodeType?.webhooks?.length) {
 				return undefined;
 			}
 
-			return this.getWebhookExpressionValue(this.nodeType.webhooks[0], 'httpMethod');
-		},
-		webhookTestUrl(): string | undefined {
-			if (
-				!this.node ||
-				!this.nodeType ||
-				!this.nodeType.webhooks ||
-				!this.nodeType.webhooks.length
-			) {
-				return undefined;
+			const httpMethod = this.workflowHelpers.getWebhookExpressionValue(
+				this.nodeType.webhooks[0],
+				'httpMethod',
+				false,
+			);
+
+			if (Array.isArray(httpMethod)) {
+				return httpMethod.join(', ');
 			}
 
-			return this.getWebhookUrl(this.nodeType.webhooks[0], this.node, 'test');
+			return httpMethod;
 		},
-		webhookProdUrl(): string | undefined {
-			if (
-				!this.node ||
-				!this.nodeType ||
-				!this.nodeType.webhooks ||
-				!this.nodeType.webhooks.length
-			) {
+		webhookTestUrl(): string | undefined {
+			if (!this.node || !this.nodeType?.webhooks?.length) {
 				return undefined;
 			}
 
-			return this.getWebhookUrl(this.nodeType.webhooks[0], this.node, 'prod');
+			return this.workflowHelpers.getWebhookUrl(this.nodeType.webhooks[0], this.node, 'test');
 		},
 		isWebhookBasedNode(): boolean {
-			return Boolean(this.nodeType && this.nodeType.webhooks && this.nodeType.webhooks.length);
+			return Boolean(this.nodeType?.webhooks?.length);
 		},
 		isPollingNode(): boolean {
-			return Boolean(this.nodeType && this.nodeType.polling);
+			return Boolean(this.nodeType?.polling);
 		},
 		isListeningForEvents(): boolean {
-			const waitingOnWebhook = this.workflowsStore.executionWaitingForWebhook as boolean;
-			const executedNode = this.workflowsStore.executedNode as string | undefined;
+			const waitingOnWebhook = this.workflowsStore.executionWaitingForWebhook;
+			const executedNode = this.workflowsStore.executedNode;
 			return (
 				!!this.node &&
 				!this.node.disabled &&
@@ -225,6 +272,23 @@ export default mixins(workflowHelpers, copyPaste, showMessage).extend({
 		isWorkflowActive(): boolean {
 			return this.workflowsStore.isWorkflowActive;
 		},
+		listeningTitle(): string {
+			return this.nodeType?.name === FORM_TRIGGER_NODE_TYPE
+				? this.$locale.baseText('ndv.trigger.webhookNode.formTrigger.listening')
+				: this.$locale.baseText('ndv.trigger.webhookNode.listening');
+		},
+		listeningHint(): string {
+			switch (this.nodeType?.name) {
+				case CHAT_TRIGGER_NODE_TYPE:
+					return this.$locale.baseText('ndv.trigger.webhookBasedNode.chatTrigger.serviceHint');
+				case FORM_TRIGGER_NODE_TYPE:
+					return this.$locale.baseText('ndv.trigger.webhookBasedNode.formTrigger.serviceHint');
+				default:
+					return this.$locale.baseText('ndv.trigger.webhookBasedNode.serviceHint', {
+						interpolate: { service: this.serviceName },
+					});
+			}
+		},
 		header(): string {
 			const serviceName = this.nodeType ? getTriggerNodeServiceName(this.nodeType) : '';
 
@@ -232,11 +296,7 @@ export default mixins(workflowHelpers, copyPaste, showMessage).extend({
 				return this.$locale.baseText('ndv.trigger.pollingNode.fetchingEvent');
 			}
 
-			if (
-				this.nodeType &&
-				this.nodeType.triggerPanel &&
-				typeof this.nodeType.triggerPanel.header === 'string'
-			) {
+			if (this.nodeType?.triggerPanel && typeof this.nodeType.triggerPanel.header === 'string') {
 				return this.nodeType.triggerPanel.header;
 			}
 
@@ -259,11 +319,7 @@ export default mixins(workflowHelpers, copyPaste, showMessage).extend({
 			return '';
 		},
 		executionsHelp(): string {
-			if (
-				this.nodeType &&
-				this.nodeType.triggerPanel &&
-				this.nodeType.triggerPanel.executionsHelp !== undefined
-			) {
+			if (this.nodeType?.triggerPanel?.executionsHelp !== undefined) {
 				if (typeof this.nodeType.triggerPanel.executionsHelp === 'string') {
 					return this.nodeType.triggerPanel.executionsHelp;
 				}
@@ -306,11 +362,7 @@ export default mixins(workflowHelpers, copyPaste, showMessage).extend({
 				return '';
 			}
 
-			if (
-				this.nodeType &&
-				this.nodeType.triggerPanel &&
-				this.nodeType.triggerPanel.activationHint
-			) {
+			if (this.nodeType?.triggerPanel?.activationHint) {
 				if (typeof this.nodeType.triggerPanel.activationHint === 'string') {
 					return this.nodeType.triggerPanel.activationHint;
 				}
@@ -358,9 +410,18 @@ export default mixins(workflowHelpers, copyPaste, showMessage).extend({
 	methods: {
 		expandExecutionHelp() {
 			if (this.$refs.help) {
-				(this.$refs.help as HelpRef).$emit('expand');
+				this.executionsHelpEventBus.emit('expand');
 			}
 		},
+		openWebhookUrl() {
+			this.$telemetry.track('User clicked ndv link', {
+				workflow_id: this.workflowsStore.workflowId,
+				push_ref: this.pushRef,
+				pane: 'input',
+				type: 'open-chat',
+			});
+			window.open(this.webhookTestUrl, '_blank', 'noreferrer');
+		},
 		onLinkClick(e: MouseEvent) {
 			if (!e.target) {
 				return;
@@ -368,7 +429,7 @@ export default mixins(workflowHelpers, copyPaste, showMessage).extend({
 			const target = e.target as HTMLElement;
 			if (target.localName !== 'a') return;
 
-			if (target.dataset && target.dataset.key) {
+			if (target.dataset?.key) {
 				e.stopPropagation();
 				e.preventDefault();
 
@@ -377,12 +438,14 @@ export default mixins(workflowHelpers, copyPaste, showMessage).extend({
 				} else if (target.dataset.key === 'executions') {
 					this.$telemetry.track('User clicked ndv link', {
 						workflow_id: this.workflowsStore.workflowId,
-						session_id: this.sessionId,
+						push_ref: this.pushRef,
 						pane: 'input',
 						type: 'open-executions-log',
 					});
 					this.ndvStore.activeNodeName = null;
-					this.uiStore.openModal(EXECUTIONS_MODAL_KEY);
+					void this.$router.push({
+						name: VIEWS.EXECUTIONS,
+					});
 				} else if (target.dataset.key === 'settings') {
 					this.uiStore.openModal(WORKFLOW_SETTINGS_MODAL_KEY);
 				}
diff --git a/packages/editor-ui/src/components/UpdatesPanel.vue b/packages/editor-ui/src/components/UpdatesPanel.vue
index 76db9ab412976..cd8580f0783dd 100644
--- a/packages/editor-ui/src/components/UpdatesPanel.vue
+++ b/packages/editor-ui/src/components/UpdatesPanel.vue
@@ -1,5 +1,10 @@
 <template>
-	<ModalDrawer :name="VERSIONS_MODAL_KEY" direction="ltr" width="520px">
+	<ModalDrawer
+		:name="VERSIONS_MODAL_KEY"
+		direction="ltr"
+		width="520px"
+		data-test-id="version-updates-panel"
+	>
 		<template #header>
 			<span :class="$style.title">
 				{{ $locale.baseText('updatesPanel.weVeBeenBusy') }}
@@ -13,21 +18,25 @@
 							interpolate: { currentVersionName: currentVersion.name },
 						})
 					}}
-					<strong><TimeAgo :date="currentVersion.createdAt" /></strong
-					>{{ $locale.baseText('updatesPanel.andIs') }}
-					<strong>{{
-						$locale.baseText('updatesPanel.version', {
-							interpolate: {
-								numberOfVersions: nextVersions.length,
-								howManySuffix: nextVersions.length > 1 ? 's' : '',
-							},
-						})
-					}}</strong>
+					<strong>
+						<TimeAgo :date="currentVersion.createdAt" />
+					</strong>
+					{{ $locale.baseText('updatesPanel.andIs') }}
+					<strong>
+						{{
+							$locale.baseText('updatesPanel.version', {
+								interpolate: {
+									numberOfVersions: nextVersions.length,
+									howManySuffix: nextVersions.length > 1 ? 's' : '',
+								},
+							})
+						}}
+					</strong>
 					{{ $locale.baseText('updatesPanel.behindTheLatest') }}
 				</p>
 
 				<n8n-link v-if="infoUrl" :to="infoUrl" :bold="true">
-					<font-awesome-icon icon="info-circle"></font-awesome-icon>
+					<font-awesome-icon icon="info-circle" class="mr-2xs" />
 					<span>
 						{{ $locale.baseText('updatesPanel.howToUpdateYourN8nVersion') }}
 					</span>
@@ -50,7 +59,7 @@ import TimeAgo from './TimeAgo.vue';
 import VersionCard from './VersionCard.vue';
 import { VERSIONS_MODAL_KEY } from '../constants';
 import { mapStores } from 'pinia';
-import { useVersionsStore } from '@/stores/versions';
+import { useVersionsStore } from '@/stores/versions.store';
 import type { IVersion } from '@/Interface';
 
 export default defineComponent({
diff --git a/packages/editor-ui/src/components/UserActivationSurveyModal.vue b/packages/editor-ui/src/components/UserActivationSurveyModal.vue
deleted file mode 100644
index 3cab5fbf595da..0000000000000
--- a/packages/editor-ui/src/components/UserActivationSurveyModal.vue
+++ /dev/null
@@ -1,170 +0,0 @@
-<template>
-	<Modal
-		width="500px"
-		:title="locale.baseText('userActivationSurveyModal.title')"
-		:eventBus="modalBus"
-		:name="USER_ACTIVATION_SURVEY_MODAL"
-		:center="true"
-		:beforeClose="beforeClosingModal"
-	>
-		<template #content>
-			<div :class="$style.container">
-				<div :class="$style.description">
-					<i18n path="userActivationSurveyModal.description.workflowRan">
-						<template #workflow>
-							<n8n-text :bold="true"> {{ workflowName }} </n8n-text>
-						</template>
-						<template #ranSuccessfully>
-							<n8n-text>
-								{{
-									locale.baseText('userActivationSurveyModal.description.workflowRanSuccessfully')
-								}}
-							</n8n-text>
-						</template>
-						<template #savedTime>
-							<n8n-text>
-								{{ locale.baseText('userActivationSurveyModal.description.savedTime') }}
-							</n8n-text>
-						</template>
-					</i18n>
-				</div>
-				<div :class="$style.form">
-					<n8n-input-label
-						:label="$locale.baseText('userActivationSurveyModal.form.label')"
-						color="text-dark"
-					>
-						<n8n-input
-							type="textarea"
-							:maxlength="FEEDBACK_MAX_LENGTH"
-							:rows="3"
-							v-model="feedback"
-							@input="onInput"
-							data-test-id="activation-feedback-input"
-						/>
-					</n8n-input-label>
-				</div>
-			</div>
-		</template>
-		<template #footer>
-			<div :class="$style.modalFooter">
-				<n8n-button
-					:disabled="!hasAnyChanges"
-					@click="onShareFeedback"
-					size="large"
-					float="right"
-					:label="locale.baseText('userActivationSurveyModal.form.button.shareFeedback')"
-					data-test-id="send-activation-feedback-button"
-				/>
-			</div>
-		</template>
-	</Modal>
-</template>
-
-<script setup lang="ts">
-import { onMounted, ref } from 'vue';
-import Modal from '@/components/Modal.vue';
-import { USER_ACTIVATION_SURVEY_MODAL } from '@/constants';
-import { useUsersStore } from '@/stores/users';
-
-import confetti from 'canvas-confetti';
-import { telemetry } from '@/plugins/telemetry';
-import { i18n as locale } from '@/plugins/i18n';
-import { Notification } from 'element-ui';
-import { useWorkflowsStore } from '@/stores/workflows';
-import { createEventBus } from '@/event-bus';
-
-const FEEDBACK_MAX_LENGTH = 300;
-
-const userStore = useUsersStore();
-const workflowStore = useWorkflowsStore();
-
-const hasAnyChanges = ref(false);
-const feedback = ref('');
-const modalBus = createEventBus();
-const workflowName = ref('');
-
-onMounted(async () => {
-	const currentSettings = getCurrentSettings();
-	try {
-		const { name } = await workflowStore.fetchWorkflow(
-			currentSettings?.firstSuccessfulWorkflowId ?? '',
-		);
-		workflowName.value = name;
-		setTimeout(showConfetti, 500);
-	} catch (e) {}
-});
-
-const onShareFeedback = () => {
-	telemetry.track('User responded to activation modal', { response: getFeedback() });
-	showSharedFeedbackSuccess();
-	modalBus.emit('close');
-};
-
-const getCurrentSettings = () => {
-	return userStore.currentUser?.settings;
-};
-
-const getFeedback = () => {
-	return feedback.value.slice(0, FEEDBACK_MAX_LENGTH);
-};
-
-const beforeClosingModal = async () => {
-	const currentUser = userStore.currentUser;
-	if (currentUser) {
-		try {
-			await userStore.updateUserSettings({ showUserActivationSurvey: false });
-		} catch {
-			showSharedFeedbackError();
-			return false;
-		}
-	}
-	return true;
-};
-
-const onInput = () => {
-	hasAnyChanges.value = true;
-};
-
-const showSharedFeedbackSuccess = () => {
-	Notification.success({
-		title: locale.baseText('userActivationSurveyModal.sharedFeedback.success'),
-		message: '',
-		position: 'bottom-right',
-	});
-};
-
-const showSharedFeedbackError = () => {
-	Notification.error({
-		title: locale.baseText('userActivationSurveyModal.sharedFeedback.error'),
-		message: '',
-		position: 'bottom-right',
-	});
-};
-
-const showConfetti = () => {
-	confetti({
-		particleCount: 200,
-		spread: 100,
-		origin: { y: 0.6 },
-		zIndex: 2050,
-		colors: ['5C4EC2', 'D7E6F1', 'FF9284', '8D7FED', 'B8AFF9', 'FF6D5A'],
-	});
-};
-</script>
-
-<style module lang="scss">
-.form {
-	margin-top: var(--spacing-l);
-}
-
-.description > * {
-	font-size: var(--font-size-s);
-}
-
-.container > * {
-	margin-bottom: var(--spacing-s);
-	&:last-child {
-		margin-bottom: 0;
-	}
-}
-</style>
diff --git a/packages/editor-ui/src/components/ValueSurvey.vue b/packages/editor-ui/src/components/ValueSurvey.vue
index 39274dd2fb84e..b925500f51cd5 100644
--- a/packages/editor-ui/src/components/ValueSurvey.vue
+++ b/packages/editor-ui/src/components/ValueSurvey.vue
@@ -1,13 +1,13 @@
 <template>
 	<ModalDrawer
 		:name="VALUE_SURVEY_MODAL_KEY"
-		:eventBus="modalBus"
-		:beforeClose="closeDialog"
+		:event-bus="modalBus"
+		:before-close="closeDialog"
 		:modal="false"
-		:wrapperClosable="false"
+		:wrapper-closable="false"
 		direction="btt"
 		width="120px"
-		class="value-survey"
+		:class="$style.valueSurvey"
 	>
 		<template #header>
 			<div :class="$style.title">
@@ -22,8 +22,8 @@
 							<n8n-button
 								type="tertiary"
 								:label="(value - 1).toString()"
-								@click="selectSurveyValue((value - 1).toString())"
 								square
+								@click="selectSurveyValue((value - 1).toString())"
 							/>
 						</div>
 					</div>
@@ -37,11 +37,10 @@
 						<n8n-input
 							v-model="form.email"
 							placeholder="Your email address"
-							size="medium"
-							@input="onInputChange"
+							@update:model-value="onInputChange"
 						/>
 						<div :class="$style.button">
-							<n8n-button label="Send" float="right" @click="send" :disabled="!isEmailValid" />
+							<n8n-button label="Send" float="right" :disabled="!isEmailValid" @click="send" />
 						</div>
 					</div>
 					<div :class="$style.disclaimer">
@@ -56,17 +55,17 @@
 </template>
 
 <script lang="ts">
+import { defineComponent } from 'vue';
+import { mapStores } from 'pinia';
 import { VALID_EMAIL_REGEX, VALUE_SURVEY_MODAL_KEY } from '@/constants';
 import type { IN8nPromptResponse } from '@/Interface';
 
-import ModalDrawer from './ModalDrawer.vue';
+import ModalDrawer from '@/components/ModalDrawer.vue';
 
-import mixins from 'vue-typed-mixins';
-import { workflowHelpers } from '@/mixins/workflowHelpers';
-import { mapStores } from 'pinia';
-import { useSettingsStore } from '@/stores/settings';
-import { useRootStore } from '@/stores/n8nRootStore';
-import { createEventBus } from '@/event-bus';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import { createEventBus } from 'n8n-design-system/utils';
+import { useToast } from '@/composables/useToast';
 
 const DEFAULT_TITLE = 'How likely are you to recommend n8n to a friend or colleague?';
 const GREAT_FEEDBACK_TITLE =
@@ -74,12 +73,17 @@ const GREAT_FEEDBACK_TITLE =
 const DEFAULT_FEEDBACK_TITLE =
 	"Thanks for your feedback! We'd love to understand how we can improve. Can we reach out?";
 
-export default mixins(workflowHelpers).extend({
+export default defineComponent({
 	name: 'ValueSurvey',
-	props: ['isActive'],
 	components: {
 		ModalDrawer,
 	},
+	props: ['isActive'],
+	setup() {
+		return {
+			...useToast(),
+		};
+	},
 	watch: {
 		isActive(isActive) {
 			if (isActive) {
@@ -164,7 +168,7 @@ export default mixins(workflowHelpers).extend({
 						instance_id: this.rootStore.instanceId,
 						email: this.form.email,
 					});
-					this.$showMessage({
+					this.showMessage({
 						title: 'Thanks for your feedback',
 						message:
 							'If you’d like to help even more, leave us a <a target="_blank" href="https://www.g2.com/products/n8n/reviews/start">review on G2</a>.',
@@ -194,6 +198,10 @@ export default mixins(workflowHelpers).extend({
 		margin-top: 10px;
 		padding: 0 15px;
 	}
+
+	h2 {
+		color: var(--color-value-survey-font);
+	}
 }
 
 .content {
@@ -208,6 +216,9 @@ export default mixins(workflowHelpers).extend({
 .wrapper {
 	display: flex;
 	flex-direction: column;
+	.text span {
+		color: var(--color-value-survey-font);
+	}
 }
 
 .buttons {
@@ -248,10 +259,9 @@ export default mixins(workflowHelpers).extend({
 .disclaimer {
 	margin-top: var(--spacing-4xs);
 }
-</style>
 
-<style lang="scss">
-.value-survey {
+.valueSurvey {
+	background: var(--color-value-survey-background);
 	height: 120px;
 	top: auto;
 
@@ -259,32 +269,25 @@ export default mixins(workflowHelpers).extend({
 		height: 140px;
 	}
 
-	.el-drawer {
-		background: var(--color-background-dark);
-
-		@media (max-width: $breakpoint-xs) {
-			height: 140px !important;
-		}
-
-		&__header {
-			height: 50px;
-			margin: 0;
-			padding: 18px 0 16px;
+	@media (max-width: $breakpoint-xs) {
+		height: 140px !important;
+	}
 
-			.el-drawer__close-btn {
-				top: 12px;
-				right: 16px;
-				position: absolute;
+	header {
+		height: 50px;
+		margin: 0;
+		padding: 18px 0 16px;
 
-				@media (max-width: $breakpoint-xs) {
-					top: 2px;
-					right: 2px;
-				}
-			}
+		button {
+			top: 12px;
+			right: 16px;
+			position: absolute;
+			font-weight: var(--font-weight-bold);
+			color: var(--color-value-survey-font);
 
-			.el-dialog__close {
-				font-weight: var(--font-weight-bold);
-				color: var(--color-text-xlight);
+			@media (max-width: $breakpoint-xs) {
+				top: 2px;
+				right: 2px;
 			}
 		}
 	}
diff --git a/packages/editor-ui/src/components/VariableSelector.vue b/packages/editor-ui/src/components/VariableSelector.vue
index 0afe604c5201b..1b20417ad6060 100644
--- a/packages/editor-ui/src/components/VariableSelector.vue
+++ b/packages/editor-ui/src/components/VariableSelector.vue
@@ -1,29 +1,32 @@
 <template>
-	<div @keydown.stop class="variable-selector-wrapper">
+	<div class="variable-selector-wrapper" @keydown.stop>
 		<div class="input-wrapper">
 			<n8n-input
-				:placeholder="$locale.baseText('variableSelector.variableFilter')"
-				v-model="variableFilter"
 				ref="inputField"
+				v-model="variableFilter"
+				:placeholder="$locale.baseText('variableSelector.variableFilter')"
 				size="small"
 				type="text"
 			></n8n-input>
 		</div>
 
 		<div class="result-wrapper">
-			<variable-selector-item
-				:item="option"
+			<VariableSelectorItem
 				v-for="option in currentResults"
 				:key="option.key"
-				:extendAll="extendAll"
-				@itemSelected="forwardItemSelected"
-			></variable-selector-item>
+				:item="option"
+				:extend-all="extendAll"
+				:redact-values="redactValues"
+				@item-selected="forwardItemSelected"
+			></VariableSelectorItem>
 		</div>
 	</div>
 </template>
 
 <script lang="ts">
 /* eslint-disable prefer-spread */
+import { defineComponent } from 'vue';
+import { mapStores } from 'pinia';
 import { PLACEHOLDER_FILLED_AT_EXECUTION_TIME, STICKY_NODE_TYPE } from '@/constants';
 
 import type {
@@ -37,29 +40,35 @@ import type {
 	IWorkflowDataProxyAdditionalKeys,
 	Workflow,
 } from 'n8n-workflow';
-import { WorkflowDataProxy } from 'n8n-workflow';
+import { NodeConnectionType, WorkflowDataProxy } from 'n8n-workflow';
 
 import VariableSelectorItem from '@/components/VariableSelectorItem.vue';
 import type { INodeUi, IVariableItemSelected, IVariableSelectorOption } from '@/Interface';
-import { IExecutionResponse } from '@/Interface';
-
-import { workflowHelpers } from '@/mixins/workflowHelpers';
 
-import mixins from 'vue-typed-mixins';
-import { mapStores } from 'pinia';
-import { useWorkflowsStore } from '@/stores/workflows';
-import { useRootStore } from '@/stores/n8nRootStore';
-import { useNDVStore } from '@/stores/ndv';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import { useNDVStore } from '@/stores/ndv.store';
+import { useRouter } from 'vue-router';
+import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
+import { escapeMappingString } from '@/utils/mappingUtils';
 
 // Node types that should not be displayed in variable selector
 const SKIPPED_NODE_TYPES = [STICKY_NODE_TYPE];
 
-export default mixins(workflowHelpers).extend({
+export default defineComponent({
 	name: 'VariableSelector',
 	components: {
 		VariableSelectorItem,
 	},
-	props: ['path'],
+	props: ['path', 'redactValues'],
+	setup() {
+		const router = useRouter();
+		const workflowHelpers = useWorkflowHelpers({ router });
+
+		return {
+			workflowHelpers,
+		};
+	},
 	data() {
 		return {
 			variableFilter: '',
@@ -68,6 +77,13 @@ export default mixins(workflowHelpers).extend({
 	},
 	computed: {
 		...mapStores(useNDVStore, useRootStore, useWorkflowsStore),
+		activeNode(): INodeUi | null {
+			const activeNode = this.ndvStore.activeNode!;
+			if (!activeNode) {
+				return null;
+			}
+			return this.workflow.getParentMainInputNode(activeNode);
+		},
 		extendAll(): boolean {
 			if (this.variableFilter) {
 				return true;
@@ -79,7 +95,7 @@ export default mixins(workflowHelpers).extend({
 			return this.getFilterResults(this.variableFilter.toLowerCase(), 0);
 		},
 		workflow(): Workflow {
-			return this.getCurrentWorkflow();
+			return this.workflowHelpers.getCurrentWorkflow();
 		},
 	},
 	methods: {
@@ -127,7 +143,7 @@ export default mixins(workflowHelpers).extend({
 				return newItems;
 			}
 
-			if (inputData && inputData.options) {
+			if (inputData?.options) {
 				const newOptions = this.removeEmptyEntries(inputData.options);
 				if (Array.isArray(newOptions) && newOptions.length) {
 					// Has still options left so return
@@ -289,9 +305,9 @@ export default mixins(workflowHelpers).extend({
 		 * @param {string} filterText Filter text for parameters
 		 * @param {number} [itemIndex=0] The index of the item
 		 * @param {number} [runIndex=0] The index of the run
-		 * @param {string} [inputName='main'] The name of the input
+		 * @param {string} [inputName=NodeConnectionType.Main] The name of the input
 		 * @param {number} [outputIndex=0] The index of the output
-		 * @param {boolean} [useShort=false] Use short notation $json vs. $node[NodeName].json
+		 * @param {boolean} [useShort=false] Use short notation $json vs. $('NodeName').json
 		 */
 		getNodeRunDataOutput(
 			nodeName: string,
@@ -299,7 +315,7 @@ export default mixins(workflowHelpers).extend({
 			filterText: string,
 			itemIndex = 0,
 			runIndex = 0,
-			inputName = 'main',
+			inputName = NodeConnectionType.Main,
 			outputIndex = 0,
 			useShort = false,
 		): IVariableSelectorOption[] | null {
@@ -352,7 +368,7 @@ export default mixins(workflowHelpers).extend({
 		 * @param {string} nodeName The name of the node to get the data of
 		 * @param {IPinData[string]} pinData The node's pin data
 		 * @param {string} filterText Filter text for parameters
-		 * @param {boolean} [useShort=false] Use short notation $json vs. $node[NodeName].json
+		 * @param {boolean} [useShort=false] Use short notation $json vs. $('NodeName').json
 		 */
 		getNodePinDataOutput(
 			nodeName: string,
@@ -360,7 +376,7 @@ export default mixins(workflowHelpers).extend({
 			filterText: string,
 			useShort = false,
 		): IVariableSelectorOption[] | null {
-			const outputData = pinData.map((data) => ({ json: data } as INodeExecutionData))[0];
+			const outputData = pinData.map((data) => ({ json: data }) as INodeExecutionData)[0];
 
 			return this.getNodeOutput(nodeName, outputData, filterText, useShort);
 		},
@@ -383,7 +399,9 @@ export default mixins(workflowHelpers).extend({
 
 			// Get json data
 			if (outputData.hasOwnProperty('json')) {
-				const jsonPropertyPrefix = useShort === true ? '$json' : `$node["${nodeName}"].json`;
+				const jsonPropertyPrefix = useShort
+					? '$json'
+					: `$('${escapeMappingString(nodeName)}').item.json`;
 
 				const jsonDataOptions: IVariableSelectorOption[] = [];
 				for (const propertyName of Object.keys(outputData.json)) {
@@ -408,7 +426,9 @@ export default mixins(workflowHelpers).extend({
 
 			// Get binary data
 			if (outputData.hasOwnProperty('binary')) {
-				const binaryPropertyPrefix = useShort === true ? '$binary' : `$node["${nodeName}"].binary`;
+				const binaryPropertyPrefix = useShort
+					? '$binary'
+					: `$('${escapeMappingString(nodeName)}').item.binary`;
 
 				const binaryData = [];
 				let binaryPropertyData = [];
@@ -461,22 +481,20 @@ export default mixins(workflowHelpers).extend({
 			filterText: string,
 		): IVariableSelectorOption[] | null {
 			const itemIndex = 0;
-			const inputName = 'main';
+			const inputName = NodeConnectionType.Main;
 			const runIndex = 0;
 			const returnData: IVariableSelectorOption[] = [];
 
-			const activeNode: INodeUi | null = this.ndvStore.activeNode;
-
-			if (activeNode === null) {
+			if (this.activeNode === null) {
 				return returnData;
 			}
 
 			const nodeConnection = this.workflow.getNodeConnectionIndexes(
-				activeNode.name,
+				this.activeNode.name,
 				parentNode[0],
-				'main',
+				inputName,
 			);
-			const connectionInputData = this.connectionInputData(
+			const connectionInputData = this.workflowHelpers.connectionInputData(
 				parentNode,
 				nodeName,
 				inputName,
@@ -493,6 +511,7 @@ export default mixins(workflowHelpers).extend({
 					id: PLACEHOLDER_FILLED_AT_EXECUTION_TIME,
 					mode: 'test',
 					resumeUrl: PLACEHOLDER_FILLED_AT_EXECUTION_TIME,
+					resumeFormUrl: PLACEHOLDER_FILLED_AT_EXECUTION_TIME,
 				},
 
 				// deprecated
@@ -509,7 +528,6 @@ export default mixins(workflowHelpers).extend({
 				connectionInputData,
 				{},
 				'manual',
-				this.rootStore.timezone,
 				additionalKeys,
 			);
 			const proxy = dataProxy.getDataProxy();
@@ -524,7 +542,7 @@ export default mixins(workflowHelpers).extend({
 
 				returnData.push({
 					name: key,
-					key: `$node["${nodeName}"].context["${key}"]`,
+					key: `$('${escapeMappingString(nodeName)}').context['${escapeMappingString(key)}']`,
 					// @ts-ignore
 					value: nodeContext[key],
 				});
@@ -580,16 +598,14 @@ export default mixins(workflowHelpers).extend({
 			return returnParameters;
 		},
 		getFilterResults(filterText: string, itemIndex: number): IVariableSelectorOption[] {
-			const inputName = 'main';
-
-			const activeNode: INodeUi | null = this.ndvStore.activeNode;
+			const inputName = NodeConnectionType.Main;
 
-			if (activeNode === null) {
+			if (this.activeNode === null) {
 				return [];
 			}
 
 			const executionData = this.workflowsStore.getWorkflowExecution;
-			let parentNode = this.workflow.getParentNodes(activeNode.name, inputName, 1);
+			let parentNode = this.workflow.getParentNodes(this.activeNode.name, inputName, 1);
 			let runData = this.workflowsStore.getWorkflowRunData;
 
 			if (runData === null) {
@@ -605,14 +621,15 @@ export default mixins(workflowHelpers).extend({
 			const currentNodeData: IVariableSelectorOption[] = [];
 
 			let tempOptions: IVariableSelectorOption[];
-			if (executionData !== null && executionData.data !== undefined) {
+
+			if (executionData?.data !== undefined) {
 				const runExecutionData: IRunExecutionData = executionData.data;
 
 				tempOptions = this.getNodeContext(
 					this.workflow,
 					runExecutionData,
 					parentNode,
-					activeNode.name,
+					this.activeNode.name,
 					filterText,
 				) as IVariableSelectorOption[];
 				if (tempOptions.length) {
@@ -628,17 +645,23 @@ export default mixins(workflowHelpers).extend({
 			if (parentNode.length) {
 				// If the node has an input node add the input data
 
-				const activeInputParentNode = parentNode.find(
-					(node) => node === this.ndvStore.ndvInputNodeName,
-				)!;
+				let ndvInputNodeName = this.ndvStore.ndvInputNodeName;
+				if (!ndvInputNodeName) {
+					// If no input node is set use the first parent one
+					// this is imporant for config-nodes which do not have
+					// a main input
+					ndvInputNodeName = parentNode[0];
+				}
+
+				const activeInputParentNode = parentNode.find((node) => node === ndvInputNodeName)!;
 
 				// Check from which output to read the data.
 				// Depends on how the nodes are connected.
 				// (example "IF" node. If node is connected to "true" or to "false" output)
 				const nodeConnection = this.workflow.getNodeConnectionIndexes(
-					activeNode.name,
+					this.activeNode.name,
 					activeInputParentNode,
-					'main',
+					inputName,
 				);
 				const outputIndex = nodeConnection === undefined ? 0 : nodeConnection.sourceIndex;
 
@@ -648,7 +671,7 @@ export default mixins(workflowHelpers).extend({
 					filterText,
 					itemIndex,
 					0,
-					'main',
+					inputName,
 					outputIndex,
 					true,
 				) as IVariableSelectorOption[];
@@ -729,7 +752,7 @@ export default mixins(workflowHelpers).extend({
 				name: this.$locale.baseText('variableSelector.parameters'),
 				options: this.sortOptions(
 					this.getNodeParameters(
-						activeNode.name,
+						this.activeNode.name,
 						initialPath,
 						skipParameter,
 						filterText,
@@ -749,7 +772,7 @@ export default mixins(workflowHelpers).extend({
 			// -----------------------------------------
 			const allNodesData: IVariableSelectorOption[] = [];
 			let nodeOptions: IVariableSelectorOption[];
-			const upstreamNodes = this.workflow.getParentNodes(activeNode.name, inputName);
+			const upstreamNodes = this.workflow.getParentNodes(this.activeNode.name, inputName);
 
 			const workflowNodes = Object.entries(this.workflow.nodes);
 
@@ -762,7 +785,7 @@ export default mixins(workflowHelpers).extend({
 				// Add the parameters of all nodes
 				// TODO: Later have to make sure that no parameters can be referenced which have expression which use input-data (for nodes which are not parent nodes)
 
-				if (nodeName === activeNode.name) {
+				if (nodeName === this.activeNode.name) {
 					// Skip the current node as this one get added separately
 					continue;
 				}
@@ -777,7 +800,7 @@ export default mixins(workflowHelpers).extend({
 						options: this.sortOptions(
 							this.getNodeParameters(
 								nodeName,
-								`$node["${nodeName}"].parameter`,
+								`$('${escapeMappingString(nodeName)}').params`,
 								undefined,
 								filterText,
 							),
@@ -785,7 +808,7 @@ export default mixins(workflowHelpers).extend({
 					} as IVariableSelectorOption,
 				];
 
-				if (executionData !== null && executionData.data !== undefined) {
+				if (executionData?.data !== undefined) {
 					const runExecutionData: IRunExecutionData = executionData.data;
 
 					parentNode = this.workflow.getParentNodes(nodeName, inputName, 1);
diff --git a/packages/editor-ui/src/components/VariableSelectorItem.vue b/packages/editor-ui/src/components/VariableSelectorItem.vue
index 138ab476fcd67..1591026a77dfe 100644
--- a/packages/editor-ui/src/components/VariableSelectorItem.vue
+++ b/packages/editor-ui/src/components/VariableSelectorItem.vue
@@ -2,7 +2,7 @@
 	<div class="item">
 		<div v-if="item.options" class="options">
 			<div v-if="item.options.length" class="headline clickable" @click="extended = !extended">
-				<div class="options-toggle" v-if="extendAll !== true">
+				<div v-if="extendAll !== true" class="options-toggle">
 					<font-awesome-icon v-if="extended" icon="angle-down" />
 					<font-awesome-icon v-else icon="angle-right" />
 				</div>
@@ -10,10 +10,10 @@
 					{{ item.name }}
 
 					<el-dropdown
+						v-if="allowParentSelect === true"
 						trigger="click"
 						@click.stop
 						@command="optionSelected($event, item)"
-						v-if="allowParentSelect === true"
 					>
 						<span class="el-dropdown-link clickable" @click.stop>
 							<font-awesome-icon
@@ -24,9 +24,9 @@
 						<template #dropdown>
 							<el-dropdown-menu>
 								<el-dropdown-item
-									:command="operation.command"
 									v-for="operation in itemAddOperations"
 									:key="operation.command"
+									:command="operation.command"
 									>{{ operation.displayName }}</el-dropdown-item
 								>
 							</el-dropdown-menu>
@@ -37,12 +37,13 @@
 			<div v-if="item.options && (extended === true || extendAll === true)">
 				<variable-selector-item
 					v-for="option in item.options"
-					:item="option"
 					:key="option.key"
-					:extendAll="extendAll"
-					:allowParentSelect="option.allowParentSelect"
+					:item="option"
+					:extend-all="extendAll"
+					:allow-parent-select="option.allowParentSelect"
+					:redact-values="redactValues"
 					class="sub-level"
-					@itemSelected="forwardItemSelected"
+					@item-selected="forwardItemSelected"
 				></variable-selector-item>
 			</div>
 		</div>
@@ -51,7 +52,7 @@
 				{{ item.name }}:
 				<font-awesome-icon icon="dot-circle" title="Select Item" />
 			</div>
-			<div class="item-value ph-no-capture">
+			<div :class="{ 'ph-no-capture': redactValues, 'item-value': true }">
 				{{ item.value !== undefined ? item.value : $locale.baseText('variableSelectorItem.empty') }}
 			</div>
 		</div>
@@ -59,27 +60,16 @@
 </template>
 
 <script lang="ts">
+import { defineComponent } from 'vue';
 import type { IVariableSelectorOption, IVariableItemSelected } from '@/Interface';
-import { externalHooks } from '@/mixins/externalHooks';
-import mixins from 'vue-typed-mixins';
 
-export default mixins(externalHooks).extend({
+export default defineComponent({
 	name: 'VariableSelectorItem',
-	props: ['allowParentSelect', 'extendAll', 'item'],
-	mounted() {
-		if (this.extended) return;
-
-		const shouldAutoExtend =
-			[
-				this.$locale.baseText('variableSelectorItem.currentNode'),
-				this.$locale.baseText('variableSelectorItem.inputData'),
-				this.$locale.baseText('variableSelectorItem.binary'),
-				this.$locale.baseText('variableSelectorItem.json'),
-			].includes(this.item.name) && this.item.key === undefined;
-
-		if (shouldAutoExtend) {
-			this.extended = true;
-		}
+	props: ['allowParentSelect', 'extendAll', 'item', 'redactValues'],
+	data() {
+		return {
+			extended: false,
+		};
 	},
 	computed: {
 		itemAddOperations() {
@@ -112,10 +102,20 @@ export default mixins(externalHooks).extend({
 			return returnOptions;
 		},
 	},
-	data() {
-		return {
-			extended: false,
-		};
+	mounted() {
+		if (this.extended) return;
+
+		const shouldAutoExtend =
+			[
+				this.$locale.baseText('variableSelectorItem.currentNode'),
+				this.$locale.baseText('variableSelectorItem.inputData'),
+				this.$locale.baseText('variableSelectorItem.binary'),
+				this.$locale.baseText('variableSelectorItem.json'),
+			].includes(this.item.name) && this.item.key === undefined;
+
+		if (shouldAutoExtend) {
+			this.extended = true;
+		}
 	},
 	methods: {
 		optionSelected(command: string, item: IVariableSelectorOption) {
diff --git a/packages/editor-ui/src/components/VariablesRow.vue b/packages/editor-ui/src/components/VariablesRow.vue
index 2c1f16260690e..e39ddcc014e13 100644
--- a/packages/editor-ui/src/components/VariablesRow.vue
+++ b/packages/editor-ui/src/components/VariablesRow.vue
@@ -2,14 +2,16 @@
 import type { ComponentPublicInstance, PropType } from 'vue';
 import { computed, nextTick, onMounted, ref, watch } from 'vue';
 import type { EnvironmentVariable, Rule, RuleGroup } from '@/Interface';
-import { IValidator, Validatable } from '@/Interface';
-import { useI18n, useToast, useCopyToClipboard } from '@/composables';
+import { useI18n } from '@/composables/useI18n';
+import { useToast } from '@/composables/useToast';
+import { useClipboard } from '@/composables/useClipboard';
 import { EnterpriseEditionFeature } from '@/constants';
-import { useSettingsStore, useUsersStore } from '@/stores';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useUsersStore } from '@/stores/users.store';
 import { getVariablesPermissions } from '@/permissions';
 
 const i18n = useI18n();
-const copyToClipboard = useCopyToClipboard();
+const clipboard = useClipboard();
 const { showMessage } = useToast();
 const settingsStore = useSettingsStore();
 const usersStore = useUsersStore();
@@ -80,12 +82,11 @@ const valueValidationRules: Array<Rule | RuleGroup> = [
 
 watch(
 	() => modelValue.value.key,
-	() => {
-		nextTick(() => {
-			if (formValidationStatus.value.key) {
-				updateUsageSyntax();
-			}
-		});
+	async () => {
+		await nextTick();
+		if (formValidationStatus.value.key) {
+			updateUsageSyntax();
+		}
 	},
 );
 
@@ -119,7 +120,7 @@ function onValidate(key: string, value: boolean) {
 }
 
 function onUsageClick() {
-	copyToClipboard(usage.value);
+	void clipboard.copy(usage.value);
 	showMessage({
 		title: i18n.baseText('variables.row.usage.copiedToClipboard'),
 		type: 'success',
@@ -138,15 +139,15 @@ function focusFirstInput() {
 				<span v-if="!editing">{{ data.key }}</span>
 				<n8n-form-input
 					v-else
+					ref="keyInputRef"
+					v-model="modelValue.key"
 					label
 					name="key"
 					data-test-id="variable-row-key-input"
 					:placeholder="i18n.baseText('variables.editing.key.placeholder')"
 					required
-					validateOnBlur
-					:validationRules="keyValidationRules"
-					v-model="modelValue.key"
-					ref="keyInputRef"
+					validate-on-blur
+					:validation-rules="keyValidationRules"
 					@validate="(value) => onValidate('key', value)"
 				/>
 			</div>
@@ -156,14 +157,14 @@ function focusFirstInput() {
 				<span v-if="!editing">{{ data.value }}</span>
 				<n8n-form-input
 					v-else
+					ref="valueInputRef"
+					v-model="modelValue.value"
 					label
 					name="value"
 					data-test-id="variable-row-value-input"
 					:placeholder="i18n.baseText('variables.editing.value.placeholder')"
-					validateOnBlur
-					:validationRules="valueValidationRules"
-					v-model="modelValue.value"
-					ref="valueInputRef"
+					validate-on-blur
+					:validation-rules="valueValidationRules"
 					@validate="(value) => onValidate('value', value)"
 				/>
 			</div>
@@ -266,8 +267,8 @@ function focusFirstInput() {
 
 .usageSyntax {
 	cursor: pointer;
-	background: var(--color-success-tint-2);
-	color: var(--color-success);
+	background: var(--color-variables-usage-syntax-bg);
+	color: var(--color-variables-usage-font);
 	font-family: var(--font-family-monospace);
 	font-size: var(--font-size-s);
 }
diff --git a/packages/editor-ui/src/components/VersionCard.vue b/packages/editor-ui/src/components/VersionCard.vue
index a444786e3bb3b..e34f857f08e58 100644
--- a/packages/editor-ui/src/components/VersionCard.vue
+++ b/packages/editor-ui/src/components/VersionCard.vue
@@ -1,11 +1,10 @@
 <template>
-	<!-- eslint-disable vue/no-mutating-props -->
 	<a
 		v-if="version"
-		:set="(version = version)"
 		:href="version.documentationUrl"
 		target="_blank"
 		:class="$style.card"
+		data-test-id="version-card"
 	>
 		<div :class="$style.header">
 			<div>
@@ -13,9 +12,7 @@
 					{{ `${$locale.baseText('versionCard.version')} ${version.name}` }}
 				</div>
 				<WarningTooltip v-if="version.hasSecurityIssue">
-					<template>
-						<span v-html="$locale.baseText('versionCard.thisVersionHasASecurityIssue')"></span>
-					</template>
+					<span v-html="$locale.baseText('versionCard.thisVersionHasASecurityIssue')"></span>
 				</WarningTooltip>
 				<Badge
 					v-if="version.hasSecurityFix"
@@ -33,20 +30,20 @@
 			</div>
 		</div>
 		<div
-			:class="$style.divider"
 			v-if="version.description || (version.nodes && version.nodes.length)"
+			:class="$style.divider"
 		></div>
 		<div>
 			<div
 				v-if="version.description"
-				v-html="version.description"
 				:class="$style.description"
+				v-html="version.description"
 			></div>
 			<div v-if="version.nodes && version.nodes.length > 0" :class="$style.nodes">
 				<NodeIcon
 					v-for="node in version.nodes"
 					:key="node.name"
-					:nodeType="node"
+					:node-type="node"
 					:title="$options.nodeName(node)"
 				/>
 			</div>
@@ -55,22 +52,23 @@
 </template>
 
 <script lang="ts">
-import Vue, { defineComponent } from 'vue';
+import type { PropType } from 'vue';
+import { defineComponent } from 'vue';
 import NodeIcon from './NodeIcon.vue';
 import TimeAgo from './TimeAgo.vue';
 import Badge from './Badge.vue';
 import WarningTooltip from './WarningTooltip.vue';
-import type { IVersionNode } from '@/Interface';
-
-Vue.component('NodeIcon', NodeIcon);
-Vue.component('TimeAgo', TimeAgo);
-Vue.component('Badge', Badge);
-Vue.component('WarningTooltip', WarningTooltip);
+import type { IVersionNode, IVersion } from '@/Interface';
 
 export default defineComponent({
-	components: { NodeIcon, TimeAgo, Badge, WarningTooltip },
 	name: 'VersionCard',
-	props: ['version'],
+	components: { NodeIcon, TimeAgo, Badge, WarningTooltip },
+	props: {
+		version: {
+			type: Object as PropType<IVersion>,
+			required: true,
+		},
+	},
 	// @ts-ignore
 	nodeName(node: IVersionNode): string {
 		return node !== null ? node.displayName : this.$locale.baseText('versionCard.unknown');
diff --git a/packages/editor-ui/src/components/WarningTooltip.vue b/packages/editor-ui/src/components/WarningTooltip.vue
index e314fc8775411..a6e71980572cf 100644
--- a/packages/editor-ui/src/components/WarningTooltip.vue
+++ b/packages/editor-ui/src/components/WarningTooltip.vue
@@ -1,10 +1,12 @@
 <template>
-	<n8n-tooltip content=" " placement="top">
-		<template #content>
-			<slot />
-		</template>
-		<font-awesome-icon :class="$style['icon']" icon="exclamation-triangle"></font-awesome-icon>
-	</n8n-tooltip>
+	<span>
+		<n8n-tooltip content=" " placement="top">
+			<template #content>
+				<slot />
+			</template>
+			<font-awesome-icon :class="$style['icon']" icon="exclamation-triangle"></font-awesome-icon>
+		</n8n-tooltip>
+	</span>
 </template>
 
 <style lang="scss" module>
diff --git a/packages/editor-ui/src/components/WorkerList.ee.vue b/packages/editor-ui/src/components/WorkerList.ee.vue
new file mode 100644
index 0000000000000..b336d3f2bb4d8
--- /dev/null
+++ b/packages/editor-ui/src/components/WorkerList.ee.vue
@@ -0,0 +1,139 @@
+<template>
+	<div>
+		<PushConnectionTracker class="actions"></PushConnectionTracker>
+		<div :class="$style.workerListHeader">
+			<n8n-heading tag="h1" size="2xlarge">{{ pageTitle }}</n8n-heading>
+		</div>
+		<div v-if="!initialStatusReceived">
+			<n8n-spinner />
+		</div>
+		<div v-else>
+			<div v-if="workerIds.length === 0">{{ $locale.baseText('workerList.empty') }}</div>
+			<div v-else>
+				<div v-for="workerId in workerIds" :key="workerId" :class="$style.card">
+					<WorkerCard :worker-id="workerId" data-test-id="worker-card" />
+				</div>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import { mapStores } from 'pinia';
+import PushConnectionTracker from '@/components/PushConnectionTracker.vue';
+import { useI18n } from '@/composables/useI18n';
+import { useToast } from '@/composables/useToast';
+import type { IPushDataWorkerStatusPayload } from '@/Interface';
+import type { ExecutionStatus } from 'n8n-workflow';
+import { useUIStore } from '@/stores/ui.store';
+import { useOrchestrationStore } from '@/stores/orchestration.store';
+import { setPageTitle } from '@/utils/htmlUtils';
+import WorkerCard from './Workers/WorkerCard.ee.vue';
+import { usePushConnection } from '@/composables/usePushConnection';
+import { useRouter } from 'vue-router';
+import { usePushConnectionStore } from '@/stores/pushConnection.store';
+import { useRootStore } from '@/stores/n8nRoot.store';
+
+// eslint-disable-next-line import/no-default-export
+export default defineComponent({
+	name: 'WorkerList',
+	// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/naming-convention
+	components: { PushConnectionTracker, WorkerCard },
+	props: {
+		autoRefreshEnabled: {
+			type: Boolean,
+			default: true,
+		},
+	},
+	setup() {
+		const router = useRouter();
+		const i18n = useI18n();
+		const pushConnection = usePushConnection({ router });
+
+		return {
+			i18n,
+			pushConnection,
+			...useToast(),
+		};
+	},
+	computed: {
+		...mapStores(useRootStore, useUIStore, usePushConnectionStore, useOrchestrationStore),
+		combinedWorkers(): IPushDataWorkerStatusPayload[] {
+			const returnData: IPushDataWorkerStatusPayload[] = [];
+			for (const workerId in this.orchestrationManagerStore.workers) {
+				returnData.push(this.orchestrationManagerStore.workers[workerId]);
+			}
+			return returnData;
+		},
+		initialStatusReceived(): boolean {
+			return this.orchestrationManagerStore.initialStatusReceived;
+		},
+		workerIds(): string[] {
+			return Object.keys(this.orchestrationManagerStore.workers);
+		},
+		pageTitle() {
+			return this.i18n.baseText('workerList.pageTitle');
+		},
+	},
+	mounted() {
+		setPageTitle(`n8n - ${this.pageTitle}`);
+
+		this.$telemetry.track('User viewed worker view', {
+			instance_id: this.rootStore.instanceId,
+		});
+	},
+	beforeMount() {
+		if (window.Cypress !== undefined) {
+			return;
+		}
+
+		this.pushConnection.initialize();
+		this.pushStore.pushConnect();
+		this.orchestrationManagerStore.startWorkerStatusPolling();
+	},
+	beforeUnmount() {
+		if (window.Cypress !== undefined) {
+			return;
+		}
+
+		this.orchestrationManagerStore.stopWorkerStatusPolling();
+		this.pushStore.pushDisconnect();
+		this.pushConnection.terminate();
+	},
+	methods: {
+		averageLoadAvg(loads: number[]) {
+			return (loads.reduce((prev, curr) => prev + curr, 0) / loads.length).toFixed(2);
+		},
+		getStatus(payload: IPushDataWorkerStatusPayload): ExecutionStatus {
+			if (payload.runningJobsSummary.length > 0) {
+				return 'running';
+			} else {
+				return 'success';
+			}
+		},
+		getRowClass(payload: IPushDataWorkerStatusPayload): string {
+			return [this.$style.execRow, this.$style[this.getStatus(payload)]].join(' ');
+		},
+	},
+});
+</script>
+
+<style module lang="scss">
+.workerListHeader {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	margin-bottom: var(--spacing-s);
+}
+
+.card {
+	margin-bottom: var(--spacing-s);
+}
+
+.tableLoader {
+	width: 100%;
+	height: 48px;
+	margin-bottom: var(--spacing-2xs);
+}
+</style>
diff --git a/packages/editor-ui/src/components/Workers/WorkerAccordion.ee.vue b/packages/editor-ui/src/components/Workers/WorkerAccordion.ee.vue
new file mode 100644
index 0000000000000..4f5d1453213ca
--- /dev/null
+++ b/packages/editor-ui/src/components/Workers/WorkerAccordion.ee.vue
@@ -0,0 +1,69 @@
+<template>
+	<div :class="['accordion', $style.container]">
+		<div :class="{ [$style.header]: true, [$style.expanded]: expanded }" @click="toggle">
+			<n8n-icon :icon="icon" :color="iconColor" size="small" class="mr-2xs" />
+			<n8n-text :class="$style.headerText" color="text-base" size="small" align="left" bold>
+				<slot name="title"></slot>
+			</n8n-text>
+			<n8n-icon :icon="expanded ? 'chevron-up' : 'chevron-down'" bold />
+		</div>
+		<div v-if="expanded" :class="{ [$style.description]: true, [$style.collapsed]: !expanded }">
+			<slot name="content"></slot>
+		</div>
+	</div>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue';
+
+const props = defineProps({
+	icon: {
+		type: String,
+		default: 'tasks',
+	},
+	iconColor: {
+		type: String,
+		default: 'black',
+	},
+	initialExpanded: {
+		type: Boolean,
+		default: true,
+	},
+});
+
+const expanded = ref<boolean>(props.initialExpanded);
+
+function toggle() {
+	expanded.value = !expanded.value;
+}
+</script>
+
+<style lang="scss" module>
+.container {
+	width: 100%;
+}
+
+.header {
+	cursor: pointer;
+	display: flex;
+	padding-top: var(--spacing-s);
+	align-items: center;
+
+	.headerText {
+		flex-grow: 1;
+	}
+}
+
+.expanded {
+	padding: var(--spacing-s) 0 0 0;
+}
+
+.description {
+	display: flex;
+	padding: 0 var(--spacing-s) var(--spacing-s) var(--spacing-s);
+
+	b {
+		font-weight: var(--font-weight-bold);
+	}
+}
+</style>
diff --git a/packages/editor-ui/src/components/Workers/WorkerCard.ee.vue b/packages/editor-ui/src/components/Workers/WorkerCard.ee.vue
new file mode 100644
index 0000000000000..ac8d09aaf0ec7
--- /dev/null
+++ b/packages/editor-ui/src/components/Workers/WorkerCard.ee.vue
@@ -0,0 +1,133 @@
+<template>
+	<n8n-card v-if="worker" :class="$style.cardLink">
+		<template #header>
+			<n8n-heading
+				tag="h2"
+				bold
+				:class="stale ? [$style.cardHeading, $style.stale] : [$style.cardHeading]"
+				data-test-id="worker-card-name"
+			>
+				Name: {{ worker.workerId }} ({{ worker.hostname }}) <br />
+				Average Load: {{ averageWorkerLoadFromLoadsAsString(worker.loadAvg ?? [0]) }} | Free Memory:
+				{{ memAsGb(worker.freeMem).toFixed(2) }}GB / {{ memAsGb(worker.totalMem).toFixed(2) }}GB
+				{{ stale ? ' (stale)' : '' }}
+			</n8n-heading>
+		</template>
+		<div :class="$style.cardDescription">
+			<n8n-text color="text-light" size="small" :class="$style.container">
+				<span
+					>{{ $locale.baseText('workerList.item.lastUpdated') }} {{ secondsSinceLastUpdateString }}s
+					ago | n8n-Version: {{ worker.version }} | Architecture: {{ worker.arch }} (
+					{{ worker.platform }}) | Uptime: {{ upTime(worker.uptime) }}</span
+				>
+				<WorkerJobAccordion :items="worker.runningJobsSummary" />
+				<WorkerNetAccordion :items="sortedWorkerInterfaces" />
+				<WorkerChartsAccordion :worker-id="worker.workerId" />
+			</n8n-text>
+		</div>
+		<template #append>
+			<div ref="cardActions" :class="$style.cardActions">
+				<!-- For future Worker actions -->
+			</div>
+		</template>
+	</n8n-card>
+</template>
+
+<script setup lang="ts">
+import { useOrchestrationStore } from '@/stores/orchestration.store';
+import type { IPushDataWorkerStatusPayload } from '@/Interface';
+import { computed, onMounted, onBeforeUnmount, ref } from 'vue';
+import { averageWorkerLoadFromLoadsAsString, memAsGb } from '../../utils/workerUtils';
+import WorkerJobAccordion from './WorkerJobAccordion.ee.vue';
+import WorkerNetAccordion from './WorkerNetAccordion.ee.vue';
+import WorkerChartsAccordion from './WorkerChartsAccordion.ee.vue';
+
+let interval: NodeJS.Timer;
+
+const orchestrationStore = useOrchestrationStore();
+
+const props = defineProps<{
+	workerId: string;
+}>();
+
+const secondsSinceLastUpdateString = ref<string>('0');
+const stale = ref<boolean>(false);
+
+const worker = computed((): IPushDataWorkerStatusPayload | undefined => {
+	return orchestrationStore.getWorkerStatus(props.workerId);
+});
+
+const sortedWorkerInterfaces = computed(
+	() => worker.value?.interfaces.toSorted((a, b) => a.family.localeCompare(b.family)) ?? [],
+);
+
+function upTime(seconds: number): string {
+	const days = Math.floor(seconds / (3600 * 24));
+	seconds -= days * 3600 * 24;
+	const hrs = Math.floor(seconds / 3600);
+	seconds -= hrs * 3600;
+	const mnts = Math.floor(seconds / 60);
+	seconds -= mnts * 60;
+	return `${days}d ${hrs}h ${mnts}m ${Math.floor(seconds)}s`;
+}
+
+onMounted(() => {
+	interval = setInterval(() => {
+		const lastUpdated = orchestrationStore.getWorkerLastUpdated(props.workerId);
+		if (!lastUpdated) {
+			return;
+		}
+		const secondsSinceLastUpdate = Math.ceil((Date.now() - lastUpdated) / 1000);
+		stale.value = secondsSinceLastUpdate > 10;
+		secondsSinceLastUpdateString.value = secondsSinceLastUpdate.toFixed(0);
+	}, 500);
+});
+
+onBeforeUnmount(() => {
+	clearInterval(interval);
+});
+</script>
+
+<style lang="scss" module>
+.container {
+	width: 100%;
+}
+
+.cardLink {
+	transition: box-shadow 0.3s ease;
+	cursor: pointer;
+	padding: 0;
+	align-items: stretch;
+
+	&:hover {
+		box-shadow: 0 2px 8px rgba(#441c17, 0.1);
+	}
+}
+
+.cardHeading {
+	font-size: var(--font-size-s);
+	word-break: break-word;
+	padding: var(--spacing-s) 0 0 var(--spacing-s);
+}
+
+.stale {
+	opacity: 0.5;
+}
+
+.cardDescription {
+	min-height: 19px;
+	display: flex;
+	align-items: center;
+	padding: 0 0 var(--spacing-s) var(--spacing-s);
+}
+
+.cardActions {
+	display: flex;
+	flex-direction: row;
+	justify-content: center;
+	align-items: center;
+	align-self: stretch;
+	padding: 0 var(--spacing-s) 0 0;
+	cursor: default;
+}
+</style>
diff --git a/packages/editor-ui/src/components/Workers/WorkerChartsAccordion.ee.vue b/packages/editor-ui/src/components/Workers/WorkerChartsAccordion.ee.vue
new file mode 100644
index 0000000000000..7d930acd21b5d
--- /dev/null
+++ b/packages/editor-ui/src/components/Workers/WorkerChartsAccordion.ee.vue
@@ -0,0 +1,151 @@
+<template>
+	<WorkerAccordion icon="tasks" icon-color="black" :initial-expanded="false">
+		<template #title>
+			{{ $locale.baseText('workerList.item.chartsTitle') }}
+		</template>
+		<template #content>
+			<div :class="$style.charts">
+				<Chart
+					ref="chartRefJobs"
+					type="line"
+					:data="dataJobs"
+					:options="optionsJobs"
+					:class="$style.chart"
+				/>
+				<Chart
+					ref="chartRefCPU"
+					type="line"
+					:data="dataCPU"
+					:options="optionsCPU"
+					:class="$style.chart"
+				/>
+				<Chart
+					ref="chartRefMemory"
+					type="line"
+					:data="dataMemory"
+					:options="optionsMemory"
+					:class="$style.chart"
+				/>
+			</div>
+		</template>
+	</WorkerAccordion>
+</template>
+
+<script setup lang="ts">
+import WorkerAccordion from './WorkerAccordion.ee.vue';
+import { WORKER_HISTORY_LENGTH, useOrchestrationStore } from '@/stores/orchestration.store';
+import { ref } from 'vue';
+import type { ChartData, ChartOptions } from 'chart.js';
+import type { ChartComponentRef } from 'vue-chartjs';
+import { Chart } from 'vue-chartjs';
+import { averageWorkerLoadFromLoads, memAsGb } from '@/utils/workerUtils';
+
+const props = defineProps<{
+	workerId: string;
+}>();
+
+const blankDataSet = (label: string, color: string, prefill: number = 0) => ({
+	datasets: [
+		{
+			label,
+			backgroundColor: color,
+			data: prefill ? Array<number>(Math.min(WORKER_HISTORY_LENGTH, prefill)).fill(0) : [],
+		},
+	],
+	labels: Array<string>(Math.min(WORKER_HISTORY_LENGTH, prefill)).fill(''),
+});
+
+const orchestrationStore = useOrchestrationStore();
+const chartRefJobs = ref<ChartComponentRef | undefined>(undefined);
+const chartRefCPU = ref<ChartComponentRef | undefined>(undefined);
+const chartRefMemory = ref<ChartComponentRef | undefined>(undefined);
+const optionsBase: () => Partial<ChartOptions<'line'>> = () => ({
+	responsive: true,
+	maintainAspectRatio: true,
+	scales: {
+		y: {
+			type: 'linear',
+			display: true,
+			position: 'left',
+			min: 0,
+			suggestedMax: 5,
+		},
+	},
+	// uncomment to disable animation
+	// animation: {
+	// 	duration: 0,
+	// },
+});
+const optionsJobs: Partial<ChartOptions<'line'>> = optionsBase();
+const optionsCPU: Partial<ChartOptions<'line'>> = optionsBase();
+if (optionsCPU.scales?.y) optionsCPU.scales.y.suggestedMax = 100;
+const maxMemory = memAsGb(orchestrationStore.workers[props.workerId]?.totalMem) ?? 1;
+const optionsMemory: Partial<ChartOptions<'line'>> = optionsBase();
+if (optionsMemory.scales?.y) optionsMemory.scales.y.suggestedMax = maxMemory;
+
+// prefilled initial arrays
+const dataJobs = ref<ChartData>(
+	blankDataSet('Job Count', 'rgb(255, 111, 92)', WORKER_HISTORY_LENGTH),
+);
+const dataCPU = ref<ChartData>(
+	blankDataSet('Processor Usage', 'rgb(19, 205, 103)', WORKER_HISTORY_LENGTH),
+);
+const dataMemory = ref<ChartData>(
+	blankDataSet('Memory Usage', 'rgb(244, 216, 174)', WORKER_HISTORY_LENGTH),
+);
+
+orchestrationStore.$onAction(({ name, store }) => {
+	if (name === 'updateWorkerStatus') {
+		const prefillCount =
+			WORKER_HISTORY_LENGTH - (store.workersHistory[props.workerId]?.length ?? 0);
+		const newDataJobs: ChartData = blankDataSet('Job Count', 'rgb(255, 111, 92)', prefillCount);
+		const newDataCPU: ChartData = blankDataSet(
+			'Processor Usage',
+			'rgb(19, 205, 103)',
+			prefillCount,
+		);
+		const newDataMemory: ChartData = blankDataSet(
+			'Memory Usage',
+			'rgb(244, 216, 174)',
+			prefillCount,
+		);
+		store.workersHistory[props.workerId]?.forEach((item) => {
+			newDataJobs.datasets[0].data.push(item.data.runningJobsSummary.length);
+			newDataJobs.labels?.push(new Date(item.timestamp).toLocaleTimeString());
+			newDataCPU.datasets[0].data.push(averageWorkerLoadFromLoads(item.data.loadAvg));
+			newDataCPU.labels = newDataJobs.labels;
+			newDataMemory.datasets[0].data.push(maxMemory - memAsGb(item.data.freeMem));
+			newDataMemory.labels = newDataJobs.labels;
+		});
+		dataJobs.value = newDataJobs;
+		dataCPU.value = newDataCPU;
+		dataMemory.value = newDataMemory;
+	}
+});
+</script>
+
+<style lang="scss" module>
+.accordionItems {
+	display: flex;
+	flex-direction: column !important;
+	align-items: flex-start !important;
+	width: 100%;
+}
+
+.accordionItem {
+	display: block !important;
+	text-align: left;
+	margin-bottom: var(--spacing-4xs);
+}
+
+.charts {
+	width: 100%;
+	flex-direction: column;
+}
+
+.chart {
+	max-width: 100%;
+	max-height: 200px;
+	position: relative;
+}
+</style>
diff --git a/packages/editor-ui/src/components/Workers/WorkerJobAccordion.ee.vue b/packages/editor-ui/src/components/Workers/WorkerJobAccordion.ee.vue
new file mode 100644
index 0000000000000..c8f6f949b3049
--- /dev/null
+++ b/packages/editor-ui/src/components/Workers/WorkerJobAccordion.ee.vue
@@ -0,0 +1,68 @@
+<template>
+	<WorkerAccordion icon="tasks" icon-color="black" :initial-expanded="true">
+		<template #title>
+			{{ $locale.baseText('workerList.item.jobListTitle') }} ({{ items.length }})
+		</template>
+		<template #content>
+			<div v-if="props.items.length > 0" :class="$style.accordionItems">
+				<div v-for="item in props.items" :key="item.executionId" :class="$style.accordionItem">
+					<a :href="'/workflow/' + item.workflowId + '/executions/' + item.executionId">
+						Execution {{ item.executionId }} - {{ item.workflowName }}</a
+					>
+					<n8n-text color="text-base" size="small" align="left">
+						| Started at:
+						{{ new Date(item.startedAt)?.toLocaleTimeString() }} | Running for
+						{{ runningSince(new Date(item.startedAt)) }}
+						{{ item.retryOf ? `| Retry of: ${item.retryOf}` : '' }} |
+					</n8n-text>
+					<a target="_blank" :href="'/workflow/' + item.workflowId"> (Open workflow)</a>
+				</div>
+			</div>
+			<div v-else :class="$style.accordionItems">
+				<span :class="$style.empty">
+					{{ $locale.baseText('workerList.item.jobList.empty') }}
+				</span>
+			</div>
+		</template>
+	</WorkerAccordion>
+</template>
+
+<script setup lang="ts">
+import type { WorkerJobStatusSummary } from '@/Interface';
+import WorkerAccordion from './WorkerAccordion.ee.vue';
+
+const props = defineProps<{
+	items: WorkerJobStatusSummary[];
+}>();
+
+function runningSince(started: Date): string {
+	let seconds = Math.floor((new Date().getTime() - started.getTime()) / 1000);
+	const hrs = Math.floor(seconds / 3600);
+	seconds -= hrs * 3600;
+	const mnts = Math.floor(seconds / 60);
+	seconds -= mnts * 60;
+	return `${hrs}h ${mnts}m ${Math.floor(seconds)}s`;
+}
+</script>
+
+<style lang="scss" module>
+.accordionItems {
+	display: flex;
+	flex-direction: column !important;
+	align-items: flex-start !important;
+	width: 100%;
+}
+
+.accordionItem {
+	display: block !important;
+	text-align: left;
+	margin-bottom: var(--spacing-4xs);
+}
+
+.empty {
+	display: block !important;
+	text-align: left;
+	margin-top: var(--spacing-2xs);
+	margin-left: var(--spacing-4xs);
+}
+</style>
diff --git a/packages/editor-ui/src/components/Workers/WorkerNetAccordion.ee.vue b/packages/editor-ui/src/components/Workers/WorkerNetAccordion.ee.vue
new file mode 100644
index 0000000000000..203ad6895d916
--- /dev/null
+++ b/packages/editor-ui/src/components/Workers/WorkerNetAccordion.ee.vue
@@ -0,0 +1,70 @@
+<template>
+	<WorkerAccordion icon="tasks" icon-color="black" :initial-expanded="false">
+		<template #title>
+			{{ $locale.baseText('workerList.item.netListTitle') }} ({{ items.length }})
+		</template>
+		<template #content>
+			<div v-if="props.items.length > 0" :class="$style.accordionItems">
+				<div
+					v-for="item in props.items"
+					:key="item.address"
+					:class="$style.accordionItem"
+					@click="onCopyToClipboard(item.address)"
+				>
+					{{ item.family }}: <span :class="$style.clickable">{{ item.address }}</span>
+					{{ item.internal ? '(internal)' : '' }}
+				</div>
+			</div>
+		</template>
+	</WorkerAccordion>
+</template>
+
+<script setup lang="ts">
+import type { IPushDataWorkerStatusPayload } from '@/Interface';
+import WorkerAccordion from './WorkerAccordion.ee.vue';
+import { useClipboard } from '@/composables/useClipboard';
+import { useI18n } from '@/composables/useI18n';
+import { useToast } from '@/composables/useToast';
+
+const props = defineProps<{
+	items: IPushDataWorkerStatusPayload['interfaces'];
+}>();
+
+const i18n = useI18n();
+const clipboard = useClipboard();
+const { showMessage } = useToast();
+
+function onCopyToClipboard(content: string) {
+	try {
+		void clipboard.copy(content);
+		showMessage({
+			title: i18n.baseText('workerList.item.copyAddressToClipboard'),
+			type: 'success',
+		});
+	} catch {}
+}
+</script>
+
+<style lang="scss" module>
+.accordionItems {
+	display: flex;
+	flex-direction: column !important;
+	align-items: flex-start !important;
+	width: 100%;
+	margin-top: var(--spacing-2xs);
+}
+
+.accordionItem {
+	display: block !important;
+	text-align: left;
+	margin-bottom: var(--spacing-4xs);
+}
+
+.clickable {
+	cursor: pointer !important;
+
+	&:hover {
+		color: var(--color-primary);
+	}
+}
+</style>
diff --git a/packages/editor-ui/src/components/WorkflowActivator.vue b/packages/editor-ui/src/components/WorkflowActivator.vue
index c4e19c966c1f9..0e0c31f3c242e 100644
--- a/packages/editor-ui/src/components/WorkflowActivator.vue
+++ b/packages/editor-ui/src/components/WorkflowActivator.vue
@@ -15,12 +15,13 @@
 		</div>
 		<n8n-tooltip :disabled="!disabled" placement="bottom">
 			<template #content>
-				<div>{{ $locale.baseText('workflowActivator.thisWorkflowHasNoTriggerNodes') }}</div>
+				<div>
+					{{ $locale.baseText('workflowActivator.thisWorkflowHasNoTriggerNodes') }}
+				</div>
 			</template>
 			<el-switch
 				v-loading="updatingWorkflowActivation"
-				:value="workflowActive"
-				@change="activeChanged"
+				:model-value="workflowActive"
 				:title="
 					workflowActive
 						? $locale.baseText('workflowActivator.deactivateWorkflow')
@@ -29,13 +30,13 @@
 				:disabled="disabled || updatingWorkflowActivation"
 				:active-color="getActiveColor"
 				inactive-color="#8899AA"
-				element-loading-spinner="el-icon-loading"
 				data-test-id="workflow-activate-switch"
+				@update:model-value="activeChanged"
 			>
 			</el-switch>
 		</n8n-tooltip>
 
-		<div class="could-not-be-started" v-if="couldNotBeStarted">
+		<div v-if="couldNotBeStarted" class="could-not-be-started">
 			<n8n-tooltip placement="top">
 				<template #content>
 					<div
@@ -43,29 +44,34 @@
 						v-html="$locale.baseText('workflowActivator.theWorkflowIsSetToBeActiveBut')"
 					></div>
 				</template>
-				<font-awesome-icon @click="displayActivationError" icon="exclamation-triangle" />
+				<font-awesome-icon icon="exclamation-triangle" @click="displayActivationError" />
 			</n8n-tooltip>
 		</div>
 	</div>
 </template>
 
 <script lang="ts">
-import { showMessage } from '@/mixins/showMessage';
+import { useToast } from '@/composables/useToast';
 import { workflowActivate } from '@/mixins/workflowActivate';
-import { useUIStore } from '@/stores/ui';
-import { useWorkflowsStore } from '@/stores/workflows';
+import { useUIStore } from '@/stores/ui.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
 import { mapStores } from 'pinia';
-import mixins from 'vue-typed-mixins';
-import { getActivatableTriggerNodes } from '@/utils';
+import { defineComponent } from 'vue';
+import { getActivatableTriggerNodes } from '@/utils/nodeTypesUtils';
 
-export default mixins(showMessage, workflowActivate).extend({
+export default defineComponent({
 	name: 'WorkflowActivator',
+	mixins: [workflowActivate],
 	props: ['workflowActive', 'workflowId'],
+	setup(props, ctx) {
+		return {
+			...useToast(),
+			// eslint-disable-next-line @typescript-eslint/no-misused-promises
+			...workflowActivate.setup?.(props, ctx),
+		};
+	},
 	computed: {
 		...mapStores(useUIStore, useWorkflowsStore),
-		getStateIsDirty(): boolean {
-			return this.uiStore.stateIsDirty;
-		},
 		nodesIssuesExist(): boolean {
 			return this.workflowsStore.nodesIssuesExist;
 		},
@@ -77,7 +83,7 @@ export default mixins(showMessage, workflowActivate).extend({
 			return this.workflowActive === true && this.isWorkflowActive !== this.workflowActive;
 		},
 		getActiveColor(): string {
-			if (this.couldNotBeStarted === true) {
+			if (this.couldNotBeStarted) {
 				return '#ff4949';
 			}
 			return '#13ce66';
@@ -114,7 +120,7 @@ export default mixins(showMessage, workflowActivate).extend({
 				} else {
 					errorMessage = this.$locale.baseText(
 						'workflowActivator.showMessage.displayActivationError.message.errorDataNotUndefined',
-						{ interpolate: { message: errorData.error.message } },
+						{ interpolate: { message: errorData } },
 					);
 				}
 			} catch (error) {
@@ -123,11 +129,12 @@ export default mixins(showMessage, workflowActivate).extend({
 				);
 			}
 
-			this.$showMessage({
+			this.showMessage({
 				title: this.$locale.baseText('workflowActivator.showMessage.displayActivationError.title'),
 				message: errorMessage,
 				type: 'warning',
 				duration: 0,
+				dangerouslyUseHTMLString: true,
 			});
 		},
 	},
@@ -153,11 +160,7 @@ export default mixins(showMessage, workflowActivate).extend({
 
 .could-not-be-started {
 	display: inline-block;
-	color: #ff4949;
+	color: var(--color-text-danger);
 	margin-left: 0.5em;
 }
-
-::v-deep .el-loading-spinner {
-	margin-top: -10px;
-}
 </style>
diff --git a/packages/editor-ui/src/components/WorkflowCard.vue b/packages/editor-ui/src/components/WorkflowCard.vue
index e98e1d6380c10..b6705e03732a6 100644
--- a/packages/editor-ui/src/components/WorkflowCard.vue
+++ b/packages/editor-ui/src/components/WorkflowCard.vue
@@ -1,20 +1,14 @@
 <template>
 	<n8n-card :class="$style.cardLink" @click="onClick">
 		<template #header>
-			<n8n-heading
-				tag="h2"
-				bold
-				class="ph-no-capture"
-				:class="$style.cardHeading"
-				data-test-id="workflow-card-name"
-			>
+			<n8n-heading tag="h2" bold :class="$style.cardHeading" data-test-id="workflow-card-name">
 				{{ data.name }}
 			</n8n-heading>
 		</template>
 		<div :class="$style.cardDescription">
 			<n8n-text color="text-light" size="small">
 				<span v-show="data"
-					>{{ $locale.baseText('workflows.item.updated') }} <time-ago :date="data.updatedAt" /> |
+					>{{ $locale.baseText('workflows.item.updated') }} <TimeAgo :date="data.updatedAt" /> |
 				</span>
 				<span v-show="data" class="mr-2xs"
 					>{{ $locale.baseText('workflows.item.created') }} {{ formattedCreatedAtDate }}
@@ -25,36 +19,35 @@
 				>
 					<n8n-tags
 						:tags="data.tags"
-						:truncateAt="3"
+						:truncate-at="3"
 						truncate
-						@click="onClickTag"
-						@expand="onExpandTags"
 						data-test-id="workflow-card-tags"
+						@click:tag="onClickTag"
+						@expand="onExpandTags"
 					/>
 				</span>
 			</n8n-text>
 		</div>
 		<template #append>
-			<div :class="$style.cardActions">
+			<div :class="$style.cardActions" @click.stop>
 				<enterprise-edition :features="[EnterpriseEditionFeature.Sharing]">
 					<n8n-badge v-if="workflowPermissions.isOwner" class="mr-xs" theme="tertiary" bold>
 						{{ $locale.baseText('workflows.item.owner') }}
 					</n8n-badge>
 				</enterprise-edition>
 
-				<workflow-activator
+				<WorkflowActivator
 					class="mr-s"
 					:workflow-active="data.active"
 					:workflow-id="data.id"
-					ref="activator"
 					data-test-id="workflow-card-activator"
 				/>
 
 				<n8n-action-toggle
 					:actions="actions"
 					theme="dark"
-					@action="onAction"
 					data-test-id="workflow-card-actions"
+					@action="onAction"
 				/>
 			</div>
 		</template>
@@ -62,27 +55,27 @@
 </template>
 
 <script lang="ts">
-import mixins from 'vue-typed-mixins';
+import { defineComponent } from 'vue';
 import type { IWorkflowDb, IUser, ITag } from '@/Interface';
 import {
 	DUPLICATE_MODAL_KEY,
 	EnterpriseEditionFeature,
+	MODAL_CONFIRM,
 	VIEWS,
 	WORKFLOW_SHARE_MODAL_KEY,
 } from '@/constants';
-import { showMessage } from '@/mixins/showMessage';
+import { useMessage } from '@/composables/useMessage';
+import { useToast } from '@/composables/useToast';
 import type { IPermissions } from '@/permissions';
 import { getWorkflowPermissions } from '@/permissions';
 import dateformat from 'dateformat';
 import WorkflowActivator from '@/components/WorkflowActivator.vue';
-import type Vue from 'vue';
 import { mapStores } from 'pinia';
-import { useUIStore } from '@/stores/ui';
-import { useSettingsStore } from '@/stores/settings';
-import { useUsersStore } from '@/stores/users';
-import { useWorkflowsStore } from '@/stores/workflows';
-
-type ActivatorRef = InstanceType<typeof WorkflowActivator>;
+import { useUIStore } from '@/stores/ui.store';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useUsersStore } from '@/stores/users.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import TimeAgo from '@/components/TimeAgo.vue';
 
 export const WORKFLOW_LIST_ITEM_ACTIONS = {
 	OPEN: 'open',
@@ -91,13 +84,9 @@ export const WORKFLOW_LIST_ITEM_ACTIONS = {
 	DELETE: 'delete',
 };
 
-export default mixins(showMessage).extend({
-	data() {
-		return {
-			EnterpriseEditionFeature,
-		};
-	},
+export default defineComponent({
 	components: {
+		TimeAgo,
 		WorkflowActivator,
 	},
 	props: {
@@ -117,11 +106,22 @@ export default mixins(showMessage).extend({
 				versionId: '',
 			}),
 		},
-		readonly: {
+		readOnly: {
 			type: Boolean,
 			default: false,
 		},
 	},
+	setup() {
+		return {
+			...useToast(),
+			...useMessage(),
+		};
+	},
+	data() {
+		return {
+			EnterpriseEditionFeature,
+		};
+	},
 	computed: {
 		...mapStores(useSettingsStore, useUIStore, useUsersStore, useWorkflowsStore),
 		currentUser(): IUser {
@@ -131,7 +131,7 @@ export default mixins(showMessage).extend({
 			return getWorkflowPermissions(this.currentUser, this.data);
 		},
 		actions(): Array<{ label: string; value: string }> {
-			return [
+			const actions = [
 				{
 					label: this.$locale.baseText('workflows.item.open'),
 					value: WORKFLOW_LIST_ITEM_ACTIONS.OPEN,
@@ -140,20 +140,23 @@ export default mixins(showMessage).extend({
 					label: this.$locale.baseText('workflows.item.share'),
 					value: WORKFLOW_LIST_ITEM_ACTIONS.SHARE,
 				},
-				{
+			];
+
+			if (!this.readOnly) {
+				actions.push({
 					label: this.$locale.baseText('workflows.item.duplicate'),
 					value: WORKFLOW_LIST_ITEM_ACTIONS.DUPLICATE,
-				},
-			].concat(
-				this.workflowPermissions.delete
-					? [
-							{
-								label: this.$locale.baseText('workflows.item.delete'),
-								value: WORKFLOW_LIST_ITEM_ACTIONS.DELETE,
-							},
-					  ]
-					: [],
-			);
+				});
+			}
+
+			if (this.workflowPermissions.delete && !this.readOnly) {
+				actions.push({
+					label: this.$locale.baseText('workflows.item.delete'),
+					value: WORKFLOW_LIST_ITEM_ACTIONS.DELETE,
+				});
+			}
+
+			return actions;
 		},
 		formattedCreatedAtDate(): string {
 			const currentYear = new Date().getFullYear();
@@ -165,24 +168,18 @@ export default mixins(showMessage).extend({
 		},
 	},
 	methods: {
-		async onClick(event?: PointerEvent) {
-			if (event) {
-				if ((this.$refs.activator as ActivatorRef)?.$el.contains(event.target as HTMLElement)) {
-					return;
-				}
-
-				if (event.metaKey || event.ctrlKey) {
-					const route = this.$router.resolve({
-						name: VIEWS.WORKFLOW,
-						params: { name: this.data.id },
-					});
-					window.open(route.href, '_blank');
+		async onClick(event?: KeyboardEvent | PointerEvent) {
+			if (event?.ctrlKey || event?.metaKey) {
+				const route = this.$router.resolve({
+					name: VIEWS.WORKFLOW,
+					params: { name: this.data.id },
+				});
+				window.open(route.href, '_blank');
 
-					return;
-				}
+				return;
 			}
 
-			this.$router.push({
+			await this.$router.push({
 				name: VIEWS.WORKFLOW,
 				params: { name: this.data.id },
 			});
@@ -219,29 +216,35 @@ export default mixins(showMessage).extend({
 					sub_view: this.$route.name === VIEWS.WORKFLOWS ? 'Workflows listing' : 'Workflow editor',
 				});
 			} else if (action === WORKFLOW_LIST_ITEM_ACTIONS.DELETE) {
-				const deleteConfirmed = await this.confirmMessage(
+				const deleteConfirmed = await this.confirm(
 					this.$locale.baseText('mainSidebar.confirmMessage.workflowDelete.message', {
 						interpolate: { workflowName: this.data.name },
 					}),
 					this.$locale.baseText('mainSidebar.confirmMessage.workflowDelete.headline'),
-					'warning',
-					this.$locale.baseText('mainSidebar.confirmMessage.workflowDelete.confirmButtonText'),
-					this.$locale.baseText('mainSidebar.confirmMessage.workflowDelete.cancelButtonText'),
+					{
+						type: 'warning',
+						confirmButtonText: this.$locale.baseText(
+							'mainSidebar.confirmMessage.workflowDelete.confirmButtonText',
+						),
+						cancelButtonText: this.$locale.baseText(
+							'mainSidebar.confirmMessage.workflowDelete.cancelButtonText',
+						),
+					},
 				);
 
-				if (deleteConfirmed === false) {
+				if (deleteConfirmed !== MODAL_CONFIRM) {
 					return;
 				}
 
 				try {
 					await this.workflowsStore.deleteWorkflow(this.data.id);
 				} catch (error) {
-					this.$showError(error, this.$locale.baseText('generic.deleteWorkflowError'));
+					this.showError(error, this.$locale.baseText('generic.deleteWorkflowError'));
 					return;
 				}
 
 				// Reset tab title since workflow is deleted.
-				this.$showMessage({
+				this.showMessage({
 					title: this.$locale.baseText('mainSidebar.showMessage.handleSelect1.title'),
 					type: 'success',
 				});
@@ -255,6 +258,8 @@ export default mixins(showMessage).extend({
 .cardLink {
 	transition: box-shadow 0.3s ease;
 	cursor: pointer;
+	padding: 0;
+	align-items: stretch;
 
 	&:hover {
 		box-shadow: 0 2px 8px rgba(#441c17, 0.1);
@@ -264,12 +269,14 @@ export default mixins(showMessage).extend({
 .cardHeading {
 	font-size: var(--font-size-s);
 	word-break: break-word;
+	padding: var(--spacing-s) 0 0 var(--spacing-s);
 }
 
 .cardDescription {
 	min-height: 19px;
 	display: flex;
 	align-items: center;
+	padding: 0 0 var(--spacing-s) var(--spacing-s);
 }
 
 .cardActions {
@@ -277,5 +284,8 @@ export default mixins(showMessage).extend({
 	flex-direction: row;
 	justify-content: center;
 	align-items: center;
+	align-self: stretch;
+	padding: 0 var(--spacing-s) 0 0;
+	cursor: default;
 }
 </style>
diff --git a/packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryContent.vue b/packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryContent.vue
new file mode 100644
index 0000000000000..207b706606f9b
--- /dev/null
+++ b/packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryContent.vue
@@ -0,0 +1,187 @@
+<script setup lang="ts">
+import { computed } from 'vue';
+import type { IWorkflowDb, UserAction } from '@/Interface';
+import type {
+	WorkflowVersion,
+	WorkflowHistoryActionTypes,
+	WorkflowVersionId,
+} from '@/types/workflowHistory';
+import WorkflowPreview from '@/components/WorkflowPreview.vue';
+import WorkflowHistoryListItem from '@/components/WorkflowHistory/WorkflowHistoryListItem.vue';
+import { useI18n } from '@/composables/useI18n';
+
+const i18n = useI18n();
+
+const props = defineProps<{
+	workflow: IWorkflowDb | null;
+	workflowVersion: WorkflowVersion | null;
+	actions: UserAction[];
+	isListLoading?: boolean;
+	isFirstItemShown?: boolean;
+}>();
+
+const emit = defineEmits<{
+	(
+		event: 'action',
+		value: {
+			action: WorkflowHistoryActionTypes[number];
+			id: WorkflowVersionId;
+			data: { formattedCreatedAt: string };
+		},
+	): void;
+}>();
+
+const workflowVersionPreview = computed<IWorkflowDb | undefined>(() => {
+	if (!props.workflowVersion || !props.workflow) {
+		return;
+	}
+	const { pinData, ...workflow } = props.workflow;
+	return {
+		...workflow,
+		nodes: props.workflowVersion.nodes,
+		connections: props.workflowVersion.connections,
+	};
+});
+
+const actions = computed(() =>
+	props.isFirstItemShown
+		? props.actions.filter((action) => action.value !== 'restore')
+		: props.actions,
+);
+
+const onAction = ({
+	action,
+	id,
+	data,
+}: {
+	action: WorkflowHistoryActionTypes[number];
+	id: WorkflowVersionId;
+	data: { formattedCreatedAt: string };
+}) => {
+	emit('action', { action, id, data });
+};
+</script>
+
+<template>
+	<div :class="$style.content">
+		<WorkflowPreview
+			v-if="props.workflowVersion"
+			:workflow="workflowVersionPreview"
+			:loading="props.isListLoading"
+			loader-type="spinner"
+		/>
+		<ul :class="$style.info">
+			<WorkflowHistoryListItem
+				v-if="props.workflowVersion"
+				:class="$style.card"
+				:index="-1"
+				:item="props.workflowVersion"
+				:is-active="false"
+				:actions="actions"
+				@action="onAction"
+			>
+				<template #default="{ formattedCreatedAt }">
+					<section :class="$style.text">
+						<p>
+							<span :class="$style.label">
+								{{ i18n.baseText('workflowHistory.content.title') }}:
+							</span>
+							<time :datetime="props.workflowVersion.createdAt">{{ formattedCreatedAt }}</time>
+						</p>
+						<p>
+							<span :class="$style.label">
+								{{ i18n.baseText('workflowHistory.content.editedBy') }}:
+							</span>
+							<span>{{ props.workflowVersion.authors }}</span>
+						</p>
+						<p>
+							<span :class="$style.label">
+								{{ i18n.baseText('workflowHistory.content.versionId') }}:
+							</span>
+							<data :value="props.workflowVersion.versionId">{{
+								props.workflowVersion.versionId
+							}}</data>
+						</p>
+					</section>
+				</template>
+				<template #action-toggle-button>
+					<n8n-button type="tertiary" size="large" data-test-id="action-toggle-button">
+						{{ i18n.baseText('workflowHistory.content.actions') }}
+						<n8n-icon class="ml-3xs" icon="chevron-down" size="small" />
+					</n8n-button>
+				</template>
+			</WorkflowHistoryListItem>
+		</ul>
+	</div>
+</template>
+
+<style module lang="scss">
+.content {
+	position: absolute;
+	display: block;
+	left: 0;
+	top: 0;
+	width: 100%;
+	height: 100%;
+	overflow: auto;
+}
+
+.info {
+	position: absolute;
+	z-index: 1;
+	top: 0;
+	left: 0;
+	width: 100%;
+}
+
+.card {
+	padding: var(--spacing-s) var(--spacing-l) 0 var(--spacing-xl);
+	border: 0;
+	align-items: start;
+
+	.text {
+		display: flex;
+		flex-direction: column;
+		flex: 1 1 auto;
+
+		p {
+			display: flex;
+			align-items: center;
+			padding: 0;
+			cursor: default;
+
+			&:first-child {
+				padding-top: var(--spacing-3xs);
+				padding-bottom: var(--spacing-4xs);
+				* {
+					margin-top: auto;
+					font-size: var(--font-size-m);
+				}
+			}
+
+			&:last-child {
+				padding-top: var(--spacing-3xs);
+
+				* {
+					font-size: var(--font-size-2xs);
+				}
+			}
+
+			.label {
+				color: var(--color-text-light);
+				padding-right: var(--spacing-4xs);
+			}
+
+			* {
+				max-width: unset;
+				justify-self: unset;
+				white-space: unset;
+				overflow: hidden;
+				text-overflow: unset;
+				padding: 0;
+				font-size: var(--font-size-s);
+			}
+		}
+	}
+}
+</style>
diff --git a/packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryList.vue b/packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryList.vue
new file mode 100644
index 0000000000000..b1b92be32a900
--- /dev/null
+++ b/packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryList.vue
@@ -0,0 +1,190 @@
+<script setup lang="ts">
+import { ref } from 'vue';
+import type { UserAction } from 'n8n-design-system';
+import { useI18n } from '@/composables/useI18n';
+import type {
+	WorkflowHistory,
+	WorkflowVersionId,
+	WorkflowHistoryActionTypes,
+	WorkflowHistoryRequestParams,
+} from '@/types/workflowHistory';
+import WorkflowHistoryListItem from '@/components/WorkflowHistory/WorkflowHistoryListItem.vue';
+
+const props = defineProps<{
+	items: WorkflowHistory[];
+	activeItem: WorkflowHistory | null;
+	actions: UserAction[];
+	requestNumberOfItems: number;
+	lastReceivedItemsLength: number;
+	evaluatedPruneTime: number;
+	shouldUpgrade?: boolean;
+	isListLoading?: boolean;
+}>();
+
+const emit = defineEmits<{
+	(
+		event: 'action',
+		value: {
+			action: WorkflowHistoryActionTypes[number];
+			id: WorkflowVersionId;
+			data: { formattedCreatedAt: string };
+		},
+	): void;
+	(event: 'preview', value: { event: MouseEvent; id: WorkflowVersionId }): void;
+	(event: 'loadMore', value: WorkflowHistoryRequestParams): void;
+	(event: 'upgrade'): void;
+}>();
+
+const i18n = useI18n();
+
+const listElement = ref<Element | null>(null);
+const shouldAutoScroll = ref(true);
+const observer = ref<IntersectionObserver | null>(null);
+
+const getActions = (index: number) =>
+	index === 0 ? props.actions.filter((action) => action.value !== 'restore') : props.actions;
+
+const observeElement = (element: Element) => {
+	observer.value = new IntersectionObserver(
+		([entry]) => {
+			if (entry.isIntersecting) {
+				observer.value?.unobserve(element);
+				observer.value?.disconnect();
+				observer.value = null;
+				emit('loadMore', { take: props.requestNumberOfItems, skip: props.items.length });
+			}
+		},
+		{
+			root: listElement.value,
+			threshold: 0.01,
+		},
+	);
+
+	observer.value.observe(element);
+};
+
+const onAction = ({
+	action,
+	id,
+	data,
+}: {
+	action: WorkflowHistoryActionTypes[number];
+	id: WorkflowVersionId;
+	data: { formattedCreatedAt: string };
+}) => {
+	shouldAutoScroll.value = false;
+	emit('action', { action, id, data });
+};
+
+const onPreview = ({ event, id }: { event: MouseEvent; id: WorkflowVersionId }) => {
+	shouldAutoScroll.value = false;
+	emit('preview', { event, id });
+};
+
+const onItemMounted = ({
+	index,
+	offsetTop,
+	isActive,
+}: {
+	index: number;
+	offsetTop: number;
+	isActive: boolean;
+}) => {
+	if (isActive && shouldAutoScroll.value) {
+		shouldAutoScroll.value = false;
+		listElement.value?.scrollTo({ top: offsetTop, behavior: 'smooth' });
+	}
+
+	if (
+		index === props.items.length - 1 &&
+		props.lastReceivedItemsLength === props.requestNumberOfItems
+	) {
+		observeElement(listElement.value?.children[index] as Element);
+	}
+};
+</script>
+
+<template>
+	<ul ref="listElement" :class="$style.list" data-test-id="workflow-history-list">
+		<WorkflowHistoryListItem
+			v-for="(item, index) in props.items"
+			:key="item.versionId"
+			:index="index"
+			:item="item"
+			:is-active="item.versionId === props.activeItem?.versionId"
+			:actions="getActions(index)"
+			@action="onAction"
+			@preview="onPreview"
+			@mounted="onItemMounted"
+		/>
+		<li v-if="!props.items.length && !props.isListLoading" :class="$style.empty">
+			{{ i18n.baseText('workflowHistory.empty') }}
+			<br />
+			{{ i18n.baseText('workflowHistory.hint') }}
+		</li>
+		<li
+			v-if="props.isListLoading"
+			:class="$style.loader"
+			role="status"
+			aria-live="polite"
+			aria-busy="true"
+			:aria-label="i18n.baseText('generic.loading')"
+		>
+			<n8n-loading :rows="3" class="mb-xs" />
+			<n8n-loading :rows="3" class="mb-xs" />
+			<n8n-loading :rows="3" class="mb-xs" />
+		</li>
+		<li v-if="props.shouldUpgrade" :class="$style.retention">
+			<span>
+				{{
+					i18n.baseText('workflowHistory.limit', {
+						interpolate: { evaluatedPruneTime: props.evaluatedPruneTime },
+					})
+				}}
+			</span>
+			<i18n-t keypath="workflowHistory.upgrade" tag="span">
+				<template #link>
+					<a href="#" @click="emit('upgrade')">
+						{{ i18n.baseText('workflowHistory.upgrade.link') }}
+					</a>
+				</template>
+			</i18n-t>
+		</li>
+	</ul>
+</template>
+
+<style module lang="scss">
+.list {
+	position: absolute;
+	left: 0;
+	top: 0;
+	width: 100%;
+	height: 100%;
+	overflow: auto;
+}
+
+.empty {
+	display: flex;
+	position: absolute;
+	height: 100%;
+	padding: 0 25%;
+	justify-content: center;
+	align-items: center;
+	text-align: center;
+	color: var(--color-text-base);
+	font-size: var(--font-size-s);
+	line-height: var(--font-line-height-loose);
+}
+
+.loader {
+	padding: 0 var(--spacing-s);
+}
+
+.retention {
+	display: grid;
+	padding: var(--spacing-s);
+	font-size: var(--font-size-2xs);
+	line-height: var(--font-line-height-loose);
+	text-align: center;
+}
+</style>
diff --git a/packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryListItem.vue b/packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryListItem.vue
new file mode 100644
index 0000000000000..b53c76da69528
--- /dev/null
+++ b/packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryListItem.vue
@@ -0,0 +1,194 @@
+<script setup lang="ts">
+import { computed, ref, onMounted } from 'vue';
+import dateformat from 'dateformat';
+import type { UserAction } from 'n8n-design-system';
+import type {
+	WorkflowHistory,
+	WorkflowVersionId,
+	WorkflowHistoryActionTypes,
+} from '@/types/workflowHistory';
+import { useI18n } from '@/composables/useI18n';
+
+const props = defineProps<{
+	item: WorkflowHistory;
+	index: number;
+	actions: UserAction[];
+	isActive: boolean;
+}>();
+const emit = defineEmits<{
+	(
+		event: 'action',
+		value: {
+			action: WorkflowHistoryActionTypes[number];
+			id: WorkflowVersionId;
+			data: { formattedCreatedAt: string };
+		},
+	): void;
+	(event: 'preview', value: { event: MouseEvent; id: WorkflowVersionId }): void;
+	(event: 'mounted', value: { index: number; offsetTop: number; isActive: boolean }): void;
+}>();
+
+const i18n = useI18n();
+
+const actionsVisible = ref(false);
+const itemElement = ref<HTMLElement | null>(null);
+const authorElement = ref<HTMLElement | null>(null);
+const isAuthorElementTruncated = ref(false);
+
+const formattedCreatedAt = computed<string>(() => {
+	const currentYear = new Date().getFullYear().toString();
+	const [date, time] = dateformat(
+		props.item.createdAt,
+		`${props.item.createdAt.startsWith(currentYear) ? '' : 'yyyy '}mmm d"#"HH:MM:ss`,
+	).split('#');
+
+	return i18n.baseText('workflowHistory.item.createdAt', { interpolate: { date, time } });
+});
+
+const authors = computed<{ size: number; label: string }>(() => {
+	const allAuthors = props.item.authors.split(', ');
+	let label = allAuthors[0];
+
+	if (allAuthors.length > 1) {
+		label = `${label} + ${allAuthors.length - 1}`;
+	}
+
+	return {
+		size: allAuthors.length,
+		label,
+	};
+});
+
+const idLabel = computed<string>(() =>
+	i18n.baseText('workflowHistory.item.id', { interpolate: { id: props.item.versionId } }),
+);
+
+const onAction = (action: WorkflowHistoryActionTypes[number]) => {
+	emit('action', {
+		action,
+		id: props.item.versionId,
+		data: { formattedCreatedAt: formattedCreatedAt.value },
+	});
+};
+
+const onVisibleChange = (visible: boolean) => {
+	actionsVisible.value = visible;
+};
+
+const onItemClick = (event: MouseEvent) => {
+	emit('preview', { event, id: props.item.versionId });
+};
+
+onMounted(() => {
+	emit('mounted', {
+		index: props.index,
+		offsetTop: itemElement.value?.offsetTop ?? 0,
+		isActive: props.isActive,
+	});
+	isAuthorElementTruncated.value =
+		authorElement.value?.scrollWidth > authorElement.value?.clientWidth;
+});
+</script>
+<template>
+	<li
+		ref="itemElement"
+		data-test-id="workflow-history-list-item"
+		:class="{
+			[$style.item]: true,
+			[$style.active]: props.isActive,
+			[$style.actionsVisible]: actionsVisible,
+		}"
+	>
+		<slot :formatted-created-at="formattedCreatedAt">
+			<p @click="onItemClick">
+				<time :datetime="item.createdAt">{{ formattedCreatedAt }}</time>
+				<n8n-tooltip
+					placement="right-end"
+					:disabled="authors.size < 2 && !isAuthorElementTruncated"
+				>
+					<template #content>{{ props.item.authors }}</template>
+					<span ref="authorElement">{{ authors.label }}</span>
+				</n8n-tooltip>
+				<data :value="item.versionId">{{ idLabel }}</data>
+			</p>
+		</slot>
+		<div :class="$style.tail">
+			<n8n-badge v-if="props.index === 0">
+				{{ i18n.baseText('workflowHistory.item.latest') }}
+			</n8n-badge>
+			<n8n-action-toggle
+				theme="dark"
+				:class="$style.actions"
+				:actions="props.actions"
+				placement="bottom-end"
+				@action="onAction"
+				@click.stop
+				@visible-change="onVisibleChange"
+			>
+				<slot name="action-toggle-button" />
+			</n8n-action-toggle>
+		</div>
+	</li>
+</template>
+<style module lang="scss">
+.item {
+	display: flex;
+	position: relative;
+	align-items: center;
+	justify-content: space-between;
+	border-left: 2px var(--border-style-base) transparent;
+	border-bottom: var(--border-width-base) var(--border-style-base) var(--color-foreground-base);
+	color: var(--color-text-base);
+	font-size: var(--font-size-2xs);
+
+	p {
+		display: grid;
+		padding: var(--spacing-s);
+		cursor: pointer;
+		flex: 1 1 auto;
+
+		time {
+			padding: 0 0 var(--spacing-5xs);
+			color: var(--color-text-dark);
+			font-size: var(--font-size-s);
+			font-weight: var(--font-weight-bold);
+		}
+
+		span,
+		data {
+			justify-self: start;
+			max-width: 160px;
+			white-space: nowrap;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			margin-top: calc(var(--spacing-4xs) * -1);
+			font-size: var(--font-size-2xs);
+		}
+	}
+
+	.tail {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+
+	&.active {
+		background-color: var(--color-background-base);
+		border-left-color: var(--color-primary);
+
+		p {
+			cursor: default;
+		}
+	}
+
+	&:hover,
+	&.actionsVisible {
+		border-left-color: var(--color-foreground-xdark);
+	}
+}
+
+.actions {
+	display: block;
+	padding: var(--spacing-3xs);
+}
+</style>
diff --git a/packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryVersionRestoreModal.vue b/packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryVersionRestoreModal.vue
new file mode 100644
index 0000000000000..99c1100d84c7e
--- /dev/null
+++ b/packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryVersionRestoreModal.vue
@@ -0,0 +1,90 @@
+<script lang="ts" setup>
+import { useI18n } from '@/composables/useI18n';
+import Modal from '@/components/Modal.vue';
+import { useUIStore } from '@/stores/ui.store';
+
+const props = defineProps<{
+	modalName: string;
+	data: {
+		isWorkflowActivated: boolean;
+		formattedCreatedAt: string;
+		beforeClose: () => void;
+		buttons: Array<{
+			text: string;
+			type: string;
+			action: () => void;
+		}>;
+	};
+}>();
+
+const i18n = useI18n();
+const uiStore = useUIStore();
+
+const closeModal = () => {
+	uiStore.closeModal(props.modalName);
+};
+</script>
+
+<template>
+	<Modal width="500px" :name="props.modalName" :before-close="props.data.beforeClose">
+		<template #header>
+			<n8n-heading tag="h2" size="xlarge">
+				{{ i18n.baseText('workflowHistory.action.restore.modal.title') }}
+			</n8n-heading>
+		</template>
+		<template #content>
+			<div>
+				<n8n-text>
+					<i18n-t keypath="workflowHistory.action.restore.modal.subtitle" tag="span">
+						<template #date>
+							<strong>{{ props.data.formattedCreatedAt }}</strong>
+						</template>
+					</i18n-t>
+					<br />
+					<br />
+					<i18n-t
+						v-if="props.data.isWorkflowActivated"
+						keypath="workflowHistory.action.restore.modal.text"
+						tag="span"
+					>
+						<template #buttonText>
+							&ldquo;{{
+								i18n.baseText('workflowHistory.action.restore.modal.button.deactivateAndRestore')
+							}}&rdquo;
+						</template>
+					</i18n-t>
+				</n8n-text>
+			</div>
+		</template>
+		<template #footer>
+			<div :class="$style.footer">
+				<n8n-button
+					v-for="(button, index) in props.data.buttons"
+					:key="index"
+					size="medium"
+					:type="button.type"
+					@click="
+						() => {
+							button.action();
+							closeModal();
+						}
+					"
+				>
+					{{ button.text }}
+				</n8n-button>
+			</div>
+		</template>
+	</Modal>
+</template>
+
+<style module lang="scss">
+.footer {
+	display: flex;
+	flex-direction: row;
+	justify-content: flex-end;
+
+	button {
+		margin-left: var(--spacing-2xs);
+	}
+}
+</style>
diff --git a/packages/editor-ui/src/components/WorkflowHistory/__tests__/WorkflowHistoryContent.test.ts b/packages/editor-ui/src/components/WorkflowHistory/__tests__/WorkflowHistoryContent.test.ts
new file mode 100644
index 0000000000000..8f57126e17400
--- /dev/null
+++ b/packages/editor-ui/src/components/WorkflowHistory/__tests__/WorkflowHistoryContent.test.ts
@@ -0,0 +1,90 @@
+import { vi } from 'vitest';
+import { createPinia, setActivePinia } from 'pinia';
+import { waitFor } from '@testing-library/vue';
+import userEvent from '@testing-library/user-event';
+import type { UserAction } from 'n8n-design-system';
+import { createComponentRenderer } from '@/__tests__/render';
+import WorkflowHistoryContent from '@/components/WorkflowHistory/WorkflowHistoryContent.vue';
+import type { WorkflowHistoryActionTypes } from '@/types/workflowHistory';
+import { workflowVersionDataFactory } from '@/stores/__tests__/utils/workflowHistoryTestUtils';
+import type { IWorkflowDb } from '@/Interface';
+
+const actionTypes: WorkflowHistoryActionTypes = ['restore', 'clone', 'open', 'download'];
+const actions: UserAction[] = actionTypes.map((value) => ({
+	label: value,
+	disabled: false,
+	value,
+}));
+
+const renderComponent = createComponentRenderer(WorkflowHistoryContent);
+
+let pinia: ReturnType<typeof createPinia>;
+let postMessageSpy: vi.SpyInstance;
+
+describe('WorkflowHistoryContent', () => {
+	beforeEach(() => {
+		pinia = createPinia();
+		setActivePinia(pinia);
+
+		postMessageSpy = vi.fn();
+		Object.defineProperty(HTMLIFrameElement.prototype, 'contentWindow', {
+			writable: true,
+			value: {
+				postMessage: postMessageSpy,
+			},
+		});
+	});
+
+	it('should use the list item component to render version data', () => {
+		const workflowVersion = workflowVersionDataFactory();
+		const { getByTestId } = renderComponent({
+			pinia,
+			props: {
+				workflow: null,
+				workflowVersion,
+				actions,
+			},
+		});
+
+		expect(getByTestId('workflow-history-list-item')).toBeInTheDocument();
+	});
+
+	test.each(actionTypes)('should emit %s event', async (action) => {
+		const workflowVersion = workflowVersionDataFactory();
+		const { getByTestId, emitted } = renderComponent({
+			pinia,
+			props: {
+				workflow: null,
+				workflowVersion,
+				actions,
+			},
+		});
+
+		await userEvent.click(getByTestId('action-toggle-button'));
+		expect(getByTestId('action-toggle-dropdown')).toBeInTheDocument();
+
+		await userEvent.click(getByTestId(`action-${action}`));
+		expect(emitted().action).toEqual([
+			[{ action, id: workflowVersion.versionId, data: { formattedCreatedAt: expect.any(String) } }],
+		]);
+	});
+
+	it('should pass proper workflow data to WorkflowPreview component', async () => {
+		const workflowVersion = workflowVersionDataFactory();
+		const workflow = { pinData: {} } as IWorkflowDb;
+		renderComponent({
+			pinia,
+			props: {
+				workflow,
+				workflowVersion,
+				actions,
+			},
+		});
+
+		window.postMessage('{"command":"n8nReady"}', '*');
+
+		await waitFor(() => {
+			expect(postMessageSpy).toHaveBeenCalledWith(expect.not.stringContaining('pinData'), '*');
+		});
+	});
+});
diff --git a/packages/editor-ui/src/components/WorkflowHistory/__tests__/WorkflowHistoryList.test.ts b/packages/editor-ui/src/components/WorkflowHistory/__tests__/WorkflowHistoryList.test.ts
new file mode 100644
index 0000000000000..696130401e3bb
--- /dev/null
+++ b/packages/editor-ui/src/components/WorkflowHistory/__tests__/WorkflowHistoryList.test.ts
@@ -0,0 +1,179 @@
+import { within } from '@testing-library/vue';
+import userEvent from '@testing-library/user-event';
+import { createPinia, setActivePinia } from 'pinia';
+import { faker } from '@faker-js/faker';
+import type { UserAction } from 'n8n-design-system';
+import { createComponentRenderer } from '@/__tests__/render';
+import WorkflowHistoryList from '@/components/WorkflowHistory/WorkflowHistoryList.vue';
+import type { WorkflowHistoryActionTypes } from '@/types/workflowHistory';
+import { workflowHistoryDataFactory } from '@/stores/__tests__/utils/workflowHistoryTestUtils';
+
+vi.stubGlobal(
+	'IntersectionObserver',
+	vi.fn(() => ({
+		disconnect: vi.fn(),
+		observe: vi.fn(),
+		takeRecords: vi.fn(),
+		unobserve: vi.fn(),
+	})),
+);
+
+const actionTypes: WorkflowHistoryActionTypes = ['restore', 'clone', 'open', 'download'];
+const actions: UserAction[] = actionTypes.map((value) => ({
+	label: value,
+	disabled: false,
+	value,
+}));
+
+const renderComponent = createComponentRenderer(WorkflowHistoryList);
+
+let pinia: ReturnType<typeof createPinia>;
+
+describe('WorkflowHistoryList', () => {
+	beforeAll(() => {
+		Element.prototype.scrollTo = vi.fn();
+	});
+
+	beforeEach(() => {
+		pinia = createPinia();
+		setActivePinia(pinia);
+	});
+
+	it('should render empty list when not loading and no items', () => {
+		const { getByText, queryByRole } = renderComponent({
+			pinia,
+			props: {
+				items: [],
+				actions,
+				activeItem: null,
+				requestNumberOfItems: 20,
+				lastReceivedItemsLength: 0,
+				evaluatedPruneTime: -1,
+			},
+		});
+
+		expect(queryByRole('status')).not.toBeInTheDocument();
+		expect(getByText(/No versions yet/)).toBeInTheDocument();
+	});
+
+	it('should show loader but no empty list message when loading', () => {
+		const { queryByText, getByRole } = renderComponent({
+			pinia,
+			props: {
+				items: [],
+				actions,
+				activeItem: null,
+				requestNumberOfItems: 20,
+				lastReceivedItemsLength: 0,
+				evaluatedPruneTime: -1,
+				isListLoading: true,
+			},
+		});
+
+		expect(getByRole('status')).toBeInTheDocument();
+		expect(queryByText(/No versions yet/)).not.toBeInTheDocument();
+	});
+
+	it('should render list and delegate preview event', async () => {
+		const numberOfItems = faker.number.int({ min: 10, max: 50 });
+		const items = Array.from({ length: numberOfItems }, workflowHistoryDataFactory);
+
+		const { getAllByTestId, emitted, queryByRole } = renderComponent({
+			pinia,
+			props: {
+				items,
+				actions,
+				activeItem: null,
+				requestNumberOfItems: 20,
+				lastReceivedItemsLength: 20,
+				evaluatedPruneTime: -1,
+			},
+		});
+
+		expect(queryByRole('link', { name: /upgrade/i })).not.toBeInTheDocument();
+
+		const listItems = getAllByTestId('workflow-history-list-item');
+		const listItem = listItems[items.length - 1];
+		await userEvent.click(within(listItem).getByText(/ID: /));
+		expect(emitted().preview).toEqual([
+			[
+				{
+					id: items[items.length - 1].versionId,
+					event: expect.any(MouseEvent),
+				},
+			],
+		]);
+
+		expect(listItems).toHaveLength(numberOfItems);
+	});
+
+	it('should scroll to active item', async () => {
+		const items = Array.from({ length: 30 }, workflowHistoryDataFactory);
+
+		const { getByTestId } = renderComponent({
+			pinia,
+			props: {
+				items,
+				actions,
+				activeItem: items[0],
+				requestNumberOfItems: 20,
+				lastReceivedItemsLength: 20,
+				evaluatedPruneTime: -1,
+			},
+		});
+
+		expect(getByTestId('workflow-history-list').scrollTo).toHaveBeenCalled();
+	});
+
+	test.each(actionTypes)('should delegate %s event from item', async (action) => {
+		const items = Array.from({ length: 2 }, workflowHistoryDataFactory);
+		const index = 1;
+		const { getAllByTestId, emitted } = renderComponent({
+			pinia,
+			props: {
+				items,
+				actions,
+				activeItem: null,
+				requestNumberOfItems: 20,
+				lastReceivedItemsLength: 20,
+				evaluatedPruneTime: -1,
+			},
+		});
+
+		const listItem = getAllByTestId('workflow-history-list-item')[index];
+
+		await userEvent.click(within(listItem).getByTestId('action-toggle'));
+		const actionsDropdown = getAllByTestId('action-toggle-dropdown')[index];
+		expect(actionsDropdown).toBeInTheDocument();
+
+		await userEvent.click(within(actionsDropdown).getByTestId(`action-${action}`));
+		expect(emitted().action).toEqual([
+			[
+				{
+					action,
+					id: items[index].versionId,
+					data: { formattedCreatedAt: expect.any(String) },
+				},
+			],
+		]);
+	});
+
+	it('should show upgrade message', async () => {
+		const items = Array.from({ length: 5 }, workflowHistoryDataFactory);
+
+		const { getByRole } = renderComponent({
+			pinia,
+			props: {
+				items,
+				actions,
+				activeItem: items[0],
+				requestNumberOfItems: 20,
+				lastReceivedItemsLength: 20,
+				evaluatedPruneTime: -1,
+				shouldUpgrade: true,
+			},
+		});
+
+		expect(getByRole('link', { name: /upgrade/i })).toBeInTheDocument();
+	});
+});
diff --git a/packages/editor-ui/src/components/WorkflowHistory/__tests__/WorkflowHistoryListItem.test.ts b/packages/editor-ui/src/components/WorkflowHistory/__tests__/WorkflowHistoryListItem.test.ts
new file mode 100644
index 0000000000000..ab84d2c535dfc
--- /dev/null
+++ b/packages/editor-ui/src/components/WorkflowHistory/__tests__/WorkflowHistoryListItem.test.ts
@@ -0,0 +1,80 @@
+import { createPinia, setActivePinia } from 'pinia';
+import userEvent from '@testing-library/user-event';
+import type { UserAction } from 'n8n-design-system';
+import { createComponentRenderer } from '@/__tests__/render';
+import WorkflowHistoryListItem from '@/components/WorkflowHistory/WorkflowHistoryListItem.vue';
+import type { WorkflowHistoryActionTypes } from '@/types/workflowHistory';
+import { workflowHistoryDataFactory } from '@/stores/__tests__/utils/workflowHistoryTestUtils';
+
+const actionTypes: WorkflowHistoryActionTypes = ['restore', 'clone', 'open', 'download'];
+const actions: UserAction[] = actionTypes.map((value) => ({
+	label: value,
+	disabled: false,
+	value,
+}));
+
+const renderComponent = createComponentRenderer(WorkflowHistoryListItem);
+
+let pinia: ReturnType<typeof createPinia>;
+
+describe('WorkflowHistoryListItem', () => {
+	beforeEach(() => {
+		pinia = createPinia();
+		setActivePinia(pinia);
+	});
+
+	it('should render item with badge', async () => {
+		const item = workflowHistoryDataFactory();
+		item.authors = 'John Doe';
+		const { getByText, container, queryByRole, emitted } = renderComponent({
+			pinia,
+			props: {
+				item,
+				index: 0,
+				actions,
+				isActive: false,
+			},
+		});
+
+		await userEvent.hover(container.querySelector('.el-tooltip__trigger')!);
+		expect(queryByRole('tooltip')).not.toBeInTheDocument();
+
+		await userEvent.click(container.querySelector('p')!);
+		expect(emitted().preview).toEqual([
+			[expect.objectContaining({ id: item.versionId, event: expect.any(MouseEvent) })],
+		]);
+
+		expect(emitted().mounted).toEqual([[{ index: 0, isActive: false, offsetTop: 0 }]]);
+		expect(getByText(/Latest saved/)).toBeInTheDocument();
+	});
+
+	test.each(actionTypes)('should emit %s event', async (action) => {
+		const item = workflowHistoryDataFactory();
+		const authors = item.authors.split(', ');
+		const { queryByText, getByRole, getByTestId, container, emitted } = renderComponent({
+			pinia,
+			props: {
+				item,
+				index: 2,
+				actions,
+				isActive: true,
+			},
+		});
+
+		const authorsTag = container.querySelector('.el-tooltip__trigger')!;
+		expect(authorsTag).toHaveTextContent(`${authors[0]} + ${authors.length - 1}`);
+		await userEvent.hover(authorsTag);
+		expect(getByRole('tooltip')).toBeInTheDocument();
+
+		await userEvent.click(getByTestId('action-toggle'));
+		expect(getByTestId('action-toggle-dropdown')).toBeInTheDocument();
+
+		await userEvent.click(getByTestId(`action-${action}`));
+		expect(emitted().action).toEqual([
+			[{ action, id: item.versionId, data: { formattedCreatedAt: expect.any(String) } }],
+		]);
+
+		expect(queryByText(/Latest saved/)).not.toBeInTheDocument();
+		expect(emitted().mounted).toEqual([[{ index: 2, isActive: true, offsetTop: 0 }]]);
+	});
+});
diff --git a/packages/editor-ui/src/components/WorkflowLMChat.vue b/packages/editor-ui/src/components/WorkflowLMChat.vue
new file mode 100644
index 0000000000000..3d4d19e7e5cde
--- /dev/null
+++ b/packages/editor-ui/src/components/WorkflowLMChat.vue
@@ -0,0 +1,689 @@
+<template>
+	<Modal
+		:name="WORKFLOW_LM_CHAT_MODAL_KEY"
+		width="80%"
+		max-height="80%"
+		:title="
+			$locale.baseText('chat.window.title', {
+				interpolate: {
+					nodeName: connectedNode?.name || $locale.baseText('chat.window.noChatNode'),
+				},
+			})
+		"
+		:event-bus="modalBus"
+		:scrollable="false"
+		@keydown.stop
+	>
+		<template #content>
+			<div class="workflow-lm-chat" data-test-id="workflow-lm-chat-dialog">
+				<div class="messages ignore-key-press">
+					<div
+						v-for="message in messages"
+						:key="`${message.executionId}__${message.sender}`"
+						ref="messageContainer"
+						:class="['message', message.sender]"
+					>
+						<div :class="['content', message.sender]">
+							{{ message.text }}
+
+							<div class="message-options no-select-on-click">
+								<n8n-info-tip
+									v-if="message.sender === 'bot'"
+									type="tooltip"
+									theme="info-light"
+									tooltip-placement="right"
+								>
+									<div v-if="message.executionId">
+										<n8n-text :bold="true" size="small">
+											<span @click.stop="displayExecution(message.executionId)">
+												{{ $locale.baseText('chat.window.chat.chatMessageOptions.executionId') }}:
+												<a href="#" class="link">{{ message.executionId }}</a>
+											</span>
+										</n8n-text>
+									</div>
+								</n8n-info-tip>
+
+								<div
+									v-if="message.sender === 'user'"
+									class="option"
+									:title="$locale.baseText('chat.window.chat.chatMessageOptions.repostMessage')"
+									data-test-id="repost-message-button"
+									@click="repostMessage(message)"
+								>
+									<font-awesome-icon icon="redo" />
+								</div>
+								<div
+									v-if="message.sender === 'user'"
+									class="option"
+									:title="$locale.baseText('chat.window.chat.chatMessageOptions.reuseMessage')"
+									data-test-id="reuse-message-button"
+									@click="reuseMessage(message)"
+								>
+									<font-awesome-icon icon="copy" />
+								</div>
+							</div>
+						</div>
+					</div>
+					<MessageTyping v-if="isLoading" ref="messageContainer" />
+				</div>
+				<div v-if="node && messages.length" class="logs-wrapper" data-test-id="lm-chat-logs">
+					<n8n-text class="logs-title" tag="p" size="large">{{
+						$locale.baseText('chat.window.logs')
+					}}</n8n-text>
+					<div class="logs">
+						<RunDataAi :key="messages.length" :node="node" hide-title slim />
+					</div>
+				</div>
+			</div>
+		</template>
+		<template #footer>
+			<div class="workflow-lm-chat-footer">
+				<n8n-input
+					ref="inputField"
+					v-model="currentMessage"
+					class="message-input"
+					type="textarea"
+					:minlength="1"
+					m
+					:placeholder="$locale.baseText('chat.window.chat.placeholder')"
+					data-test-id="workflow-chat-input"
+					@keydown.stop="updated"
+				/>
+				<n8n-tooltip :disabled="currentMessage.length > 0">
+					<n8n-button
+						class="send-button"
+						:disabled="currentMessage === ''"
+						:loading="isLoading"
+						:label="$locale.baseText('chat.window.chat.sendButtonText')"
+						size="large"
+						icon="comment"
+						type="primary"
+						data-test-id="workflow-chat-send-button"
+						@click.stop="sendChatMessage(currentMessage)"
+					/>
+					<template #content>
+						{{ $locale.baseText('chat.window.chat.provideMessage') }}
+					</template>
+				</n8n-tooltip>
+
+				<n8n-info-tip class="mt-s">
+					{{ $locale.baseText('chatEmbed.infoTip.description') }}
+					<a @click="openChatEmbedModal">
+						{{ $locale.baseText('chatEmbed.infoTip.link') }}
+					</a>
+				</n8n-info-tip>
+			</div>
+		</template>
+	</Modal>
+</template>
+
+<script lang="ts">
+import { defineAsyncComponent, defineComponent } from 'vue';
+import { mapStores } from 'pinia';
+
+import { useToast } from '@/composables/useToast';
+import { useMessage } from '@/composables/useMessage';
+import Modal from '@/components/Modal.vue';
+import {
+	AI_CATEGORY_AGENTS,
+	AI_CATEGORY_CHAINS,
+	AI_CODE_NODE_TYPE,
+	AI_SUBCATEGORY,
+	CHAIN_SUMMARIZATION_LANGCHAIN_NODE_TYPE,
+	CHAT_EMBED_MODAL_KEY,
+	CHAT_TRIGGER_NODE_TYPE,
+	MANUAL_CHAT_TRIGGER_NODE_TYPE,
+	MODAL_CONFIRM,
+	VIEWS,
+	WORKFLOW_LM_CHAT_MODAL_KEY,
+} from '@/constants';
+
+import { get, last } from 'lodash-es';
+
+import { useUIStore } from '@/stores/ui.store';
+import { useUsersStore } from '@/stores/users.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { createEventBus } from 'n8n-design-system/utils';
+import type { IDataObject, INodeType, INode, ITaskData } from 'n8n-workflow';
+import { NodeHelpers, NodeConnectionType } from 'n8n-workflow';
+import type { INodeUi, IUser } from '@/Interface';
+import { useExternalHooks } from '@/composables/useExternalHooks';
+
+// eslint-disable-next-line import/no-unresolved
+import MessageTyping from '@n8n/chat/components/MessageTyping.vue';
+import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
+import { useRouter } from 'vue-router';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import { useRunWorkflow } from '@/composables/useRunWorkflow';
+import { usePinnedData } from '@/composables/usePinnedData';
+
+const RunDataAi = defineAsyncComponent(
+	async () => await import('@/components/RunDataAi/RunDataAi.vue'),
+);
+
+interface ChatMessage {
+	text: string;
+	sender: 'bot' | 'user';
+	executionId?: string;
+}
+
+// TODO: Add proper type
+interface LangChainMessage {
+	id: string[];
+	kwargs: {
+		content: string;
+	};
+}
+
+interface MemoryOutput {
+	action: string;
+	chatHistory?: LangChainMessage[];
+}
+// TODO:
+// - display additional information like execution time, tokens used, ...
+// - display errors better
+export default defineComponent({
+	name: 'WorkflowLMChat',
+	components: {
+		Modal,
+		MessageTyping,
+		RunDataAi,
+	},
+	setup() {
+		const router = useRouter();
+		const externalHooks = useExternalHooks();
+		const workflowHelpers = useWorkflowHelpers({ router });
+		const { runWorkflow } = useRunWorkflow({ router });
+
+		return {
+			runWorkflow,
+			externalHooks,
+			workflowHelpers,
+			...useToast(),
+			...useMessage(),
+		};
+	},
+	data() {
+		return {
+			connectedNode: null as INodeUi | null,
+			currentMessage: '',
+			messages: [] as ChatMessage[],
+			modalBus: createEventBus(),
+			node: null as INodeUi | null,
+			WORKFLOW_LM_CHAT_MODAL_KEY,
+			previousMessageIndex: 0,
+		};
+	},
+
+	computed: {
+		...mapStores(useWorkflowsStore, useUIStore, useNodeTypesStore),
+		isLoading(): boolean {
+			return this.uiStore.isActionActive('workflowRunning');
+		},
+	},
+	async mounted() {
+		this.setConnectedNode();
+		this.messages = this.getChatMessages();
+		this.setNode();
+
+		setTimeout(() => {
+			this.scrollToLatestMessage();
+			this.$refs.inputField?.focus();
+		}, 0);
+	},
+	methods: {
+		displayExecution(executionId: string) {
+			const workflow = this.workflowHelpers.getCurrentWorkflow();
+			const route = this.$router.resolve({
+				name: VIEWS.EXECUTION_PREVIEW,
+				params: { name: workflow.id, executionId },
+			});
+			window.open(route.href, '_blank');
+		},
+		repostMessage(message: ChatMessage) {
+			void this.sendChatMessage(message.text);
+		},
+		reuseMessage(message: ChatMessage) {
+			this.currentMessage = message.text;
+			const inputField = this.$refs.inputField as HTMLInputElement;
+			inputField.focus();
+		},
+		updated(event: KeyboardEvent) {
+			const pastMessages = this.workflowsStore.getPastChatMessages;
+			if (
+				(this.currentMessage.length === 0 || pastMessages.includes(this.currentMessage)) &&
+				event.key === 'ArrowUp'
+			) {
+				const inputField = this.$refs.inputField as HTMLInputElement;
+
+				inputField?.blur();
+				this.currentMessage =
+					pastMessages[pastMessages.length - 1 - this.previousMessageIndex] ?? '';
+				this.previousMessageIndex = (this.previousMessageIndex + 1) % pastMessages.length;
+				// Refocus to move the cursor to the end of the input
+				setTimeout(() => inputField?.focus(), 0);
+			}
+			if (event.key === 'Enter' && !event.shiftKey && this.currentMessage) {
+				void this.sendChatMessage(this.currentMessage);
+				event.stopPropagation();
+				event.preventDefault();
+			}
+		},
+		async sendChatMessage(message: string) {
+			if (this.currentMessage.trim() === '') {
+				this.showError(
+					new Error(this.$locale.baseText('chat.window.chat.provideMessage')),
+					this.$locale.baseText('chat.window.chat.emptyChatMessage'),
+				);
+				return;
+			}
+
+			const pinnedChatData = usePinnedData(this.getTriggerNode());
+			if (pinnedChatData.hasData.value) {
+				const confirmResult = await this.confirm(
+					this.$locale.baseText('chat.window.chat.unpinAndExecute.description'),
+					this.$locale.baseText('chat.window.chat.unpinAndExecute.title'),
+					{
+						confirmButtonText: this.$locale.baseText('chat.window.chat.unpinAndExecute.confirm'),
+						cancelButtonText: this.$locale.baseText('chat.window.chat.unpinAndExecute.cancel'),
+					},
+				);
+
+				if (!(confirmResult === MODAL_CONFIRM)) return;
+
+				pinnedChatData.unsetData('unpin-and-send-chat-message-modal');
+			}
+
+			this.messages.push({
+				text: message,
+				sender: 'user',
+			} as ChatMessage);
+
+			this.currentMessage = '';
+			this.previousMessageIndex = 0;
+			await this.$nextTick();
+			this.scrollToLatestMessage();
+			await this.startWorkflowWithMessage(message);
+		},
+
+		setConnectedNode() {
+			const triggerNode = this.getTriggerNode();
+
+			if (!triggerNode) {
+				this.showError(
+					new Error('Chat Trigger Node could not be found!'),
+					'Trigger Node not found',
+				);
+				return;
+			}
+			const workflow = this.workflowHelpers.getCurrentWorkflow();
+
+			const chatNode = this.workflowsStore.getNodes().find((node: INodeUi): boolean => {
+				if (node.type === CHAIN_SUMMARIZATION_LANGCHAIN_NODE_TYPE) return false;
+				const nodeType = this.nodeTypesStore.getNodeType(node.type, node.typeVersion);
+				if (!nodeType) return false;
+
+				const isAgent =
+					nodeType.codex?.subcategories?.[AI_SUBCATEGORY]?.includes(AI_CATEGORY_AGENTS);
+				const isChain =
+					nodeType.codex?.subcategories?.[AI_SUBCATEGORY]?.includes(AI_CATEGORY_CHAINS);
+
+				let isCustomChainOrAgent = false;
+				if (nodeType.name === AI_CODE_NODE_TYPE) {
+					const inputs = NodeHelpers.getNodeInputs(workflow, node, nodeType);
+					const inputTypes = NodeHelpers.getConnectionTypes(inputs);
+
+					const outputs = NodeHelpers.getNodeOutputs(workflow, node, nodeType);
+					const outputTypes = NodeHelpers.getConnectionTypes(outputs);
+
+					if (
+						inputTypes.includes(NodeConnectionType.AiLanguageModel) &&
+						inputTypes.includes(NodeConnectionType.Main) &&
+						outputTypes.includes(NodeConnectionType.Main)
+					) {
+						isCustomChainOrAgent = true;
+					}
+				}
+
+				if (!isAgent && !isChain && !isCustomChainOrAgent) return false;
+
+				const parentNodes = workflow.getParentNodes(node.name);
+				const isChatChild = parentNodes.some(
+					(parentNodeName) => parentNodeName === triggerNode.name,
+				);
+
+				return Boolean(isChatChild && (isAgent || isChain || isCustomChainOrAgent));
+			});
+
+			if (!chatNode) {
+				this.showError(
+					new Error(
+						'Chat only works when an AI agent or chain(except summarization chain) is connected to the chat trigger node',
+					),
+					'Missing AI node',
+				);
+				return;
+			}
+
+			this.connectedNode = chatNode;
+		},
+		getChatMessages(): ChatMessage[] {
+			if (!this.connectedNode) return [];
+
+			const workflow = this.workflowHelpers.getCurrentWorkflow();
+			const connectedMemoryInputs =
+				workflow.connectionsByDestinationNode[this.connectedNode.name][NodeConnectionType.AiMemory];
+			if (!connectedMemoryInputs) return [];
+
+			const memoryConnection = (connectedMemoryInputs ?? []).find((i) => i.length > 0)?.[0];
+
+			if (!memoryConnection) return [];
+
+			const nodeResultData = this.workflowsStore.getWorkflowResultDataByNodeName(
+				memoryConnection.node,
+			);
+
+			const memoryOutputData = (nodeResultData ?? [])
+				.map(
+					(data) => get(data, ['data', NodeConnectionType.AiMemory, 0, 0, 'json']) as MemoryOutput,
+				)
+				.find((data) => data.action === 'saveContext');
+
+			return (memoryOutputData?.chatHistory ?? []).map((message) => {
+				return {
+					text: message.kwargs.content,
+					sender: last(message.id) === 'HumanMessage' ? 'user' : 'bot',
+				};
+			});
+		},
+
+		setNode(): void {
+			const triggerNode = this.getTriggerNode();
+			if (!triggerNode) {
+				return;
+			}
+
+			const workflow = this.workflowHelpers.getCurrentWorkflow();
+			const childNodes = workflow.getChildNodes(triggerNode.name);
+
+			for (const childNode of childNodes) {
+				// Look for the first connected node with metadata
+				// TODO: Allow later users to change that in the UI
+				const resultData = this.workflowsStore.getWorkflowResultDataByNodeName(childNode);
+
+				if (!resultData && !Array.isArray(resultData)) {
+					continue;
+				}
+
+				if (resultData[resultData.length - 1].metadata) {
+					this.node = this.workflowsStore.getNodeByName(childNode);
+					break;
+				}
+			}
+		},
+
+		getTriggerNode(): INode | null {
+			const workflow = this.workflowHelpers.getCurrentWorkflow();
+			const triggerNode = workflow.queryNodes((nodeType: INodeType) =>
+				[CHAT_TRIGGER_NODE_TYPE, MANUAL_CHAT_TRIGGER_NODE_TYPE].includes(nodeType.description.name),
+			);
+
+			if (!triggerNode.length) {
+				return null;
+			}
+
+			return triggerNode[0];
+		},
+		async startWorkflowWithMessage(message: string): Promise<void> {
+			const triggerNode = this.getTriggerNode();
+
+			if (!triggerNode) {
+				this.showError(
+					new Error('Chat Trigger Node could not be found!'),
+					'Trigger Node not found',
+				);
+				return;
+			}
+
+			let inputKey = 'chatInput';
+			if (triggerNode.type === MANUAL_CHAT_TRIGGER_NODE_TYPE && triggerNode.typeVersion < 1.1) {
+				inputKey = 'input';
+			}
+			if (triggerNode.type === CHAT_TRIGGER_NODE_TYPE) {
+				inputKey = 'chatInput';
+			}
+
+			const usersStore = useUsersStore();
+			const currentUser = usersStore.currentUser ?? ({} as IUser);
+
+			const nodeData: ITaskData = {
+				startTime: new Date().getTime(),
+				executionTime: 0,
+				executionStatus: 'success',
+				data: {
+					main: [
+						[
+							{
+								json: {
+									sessionId: `test-${currentUser.id || 'unknown'}`,
+									action: 'sendMessage',
+									[inputKey]: message,
+								},
+							},
+						],
+					],
+				},
+				source: [null],
+			};
+
+			const response = await this.runWorkflow({
+				triggerNode: triggerNode.name,
+				nodeData,
+				source: 'RunData.ManualChatMessage',
+			});
+
+			this.workflowsStore.appendChatMessage(message);
+			if (!response) {
+				this.showError(
+					new Error('It was not possible to start workflow!'),
+					'Workflow could not be started',
+				);
+				return;
+			}
+
+			this.waitForExecution(response.executionId);
+		},
+		extractResponseMessage(responseData?: IDataObject) {
+			if (!responseData) return '<NO RESPONSE FOUND>';
+
+			// Paths where the response message might be located
+			const paths = ['output', 'text', 'response.text'];
+			const matchedPath = paths.find((path) => get(responseData, path));
+
+			if (!matchedPath) return JSON.stringify(responseData, null, 2);
+
+			return get(responseData, matchedPath) as string;
+		},
+		waitForExecution(executionId?: string) {
+			const that = this;
+			const waitInterval = setInterval(() => {
+				if (!that.isLoading) {
+					clearInterval(waitInterval);
+
+					const lastNodeExecuted =
+						this.workflowsStore.getWorkflowExecution?.data?.resultData.lastNodeExecuted;
+
+					const nodeResponseDataArray = get(
+						this.workflowsStore.getWorkflowExecution?.data?.resultData.runData,
+						lastNodeExecuted,
+					) as ITaskData[];
+
+					const nodeResponseData = nodeResponseDataArray[nodeResponseDataArray.length - 1];
+
+					let responseMessage: string;
+
+					if (get(nodeResponseData, 'error')) {
+						responseMessage = '[ERROR: ' + get(nodeResponseData, 'error.message') + ']';
+					} else {
+						const responseData = get(nodeResponseData, 'data.main[0][0].json');
+						responseMessage = this.extractResponseMessage(responseData);
+					}
+
+					this.messages.push({
+						text: responseMessage,
+						sender: 'bot',
+						executionId,
+					} as ChatMessage);
+
+					void this.$nextTick(() => {
+						that.setNode();
+						this.scrollToLatestMessage();
+					});
+				}
+			}, 500);
+		},
+		scrollToLatestMessage() {
+			const containerRef = this.$refs.messageContainer as HTMLElement[] | undefined;
+			if (containerRef) {
+				containerRef[containerRef.length - 1]?.scrollIntoView({
+					behavior: 'smooth',
+					block: 'start',
+				});
+			}
+		},
+		closeDialog() {
+			this.modalBus.emit('close');
+			void this.externalHooks.run('workflowSettings.dialogVisibleChanged', {
+				dialogVisible: false,
+			});
+		},
+		openChatEmbedModal() {
+			this.uiStore.openModal(CHAT_EMBED_MODAL_KEY);
+		},
+	},
+});
+</script>
+
+<style scoped lang="scss">
+.no-node-connected {
+	width: 100%;
+	height: 100%;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+}
+.workflow-lm-chat {
+	color: $custom-font-black;
+	font-size: var(--font-size-s);
+	display: flex;
+	height: 100%;
+	min-height: 400px;
+	z-index: 9999;
+
+	.logs-wrapper {
+		--node-icon-color: var(--color-text-base);
+		border: 1px solid var(--color-foreground-base);
+		border-radius: 4px;
+		height: 100%;
+		overflow-y: auto;
+		width: 100%;
+		padding: var(--spacing-xs) 0;
+
+		.logs-title {
+			margin: 0 var(--spacing-s) var(--spacing-s);
+		}
+	}
+	.messages {
+		background-color: var(--color-lm-chat-messages-background);
+		border: 1px solid var(--color-foreground-base);
+		border-radius: 4px;
+		height: 100%;
+		width: 100%;
+		overflow: hidden auto;
+		padding-top: 1.5em;
+		margin-right: 1em;
+
+		.chat-message {
+			float: left;
+			margin: var(--spacing-2xs) var(--spacing-s);
+		}
+
+		.message {
+			float: left;
+			position: relative;
+			width: 100%;
+
+			.content {
+				border-radius: var(--border-radius-base);
+				line-height: 1.5;
+				margin: var(--spacing-2xs) var(--spacing-s);
+				max-width: 75%;
+				padding: 1em;
+				white-space: pre-wrap;
+				overflow-x: auto;
+
+				&.bot {
+					background-color: var(--color-lm-chat-bot-background);
+					color: var(--color-lm-chat-bot-color);
+					float: left;
+					border-bottom-left-radius: 0;
+
+					.message-options {
+						left: 1.5em;
+					}
+				}
+
+				&.user {
+					background-color: var(--color-lm-chat-user-background);
+					color: var(--color-lm-chat-user-color);
+					float: right;
+					text-align: right;
+					border-bottom-right-radius: 0;
+
+					.message-options {
+						right: 1.5em;
+						text-align: right;
+					}
+				}
+
+				.message-options {
+					color: #aaa;
+					display: none;
+					font-size: 0.9em;
+					height: 26px;
+					position: absolute;
+					text-align: left;
+					top: -1.2em;
+					width: 120px;
+					z-index: 10;
+
+					.option {
+						cursor: pointer;
+						display: inline-block;
+						width: 28px;
+					}
+
+					.link {
+						text-decoration: underline;
+					}
+				}
+
+				&:hover {
+					.message-options {
+						display: initial;
+					}
+				}
+			}
+		}
+	}
+}
+
+.workflow-lm-chat-footer {
+	.message-input {
+		width: calc(100% - 8em);
+	}
+	.send-button {
+		float: right;
+	}
+}
+</style>
diff --git a/packages/editor-ui/src/components/WorkflowPreview.vue b/packages/editor-ui/src/components/WorkflowPreview.vue
index 5ea1a06342e45..106706262d20c 100644
--- a/packages/editor-ui/src/components/WorkflowPreview.vue
+++ b/packages/editor-ui/src/components/WorkflowPreview.vue
@@ -7,182 +7,206 @@
 			<n8n-spinner type="dots" />
 		</div>
 		<iframe
+			ref="iframeRef"
 			:class="{
-				[$style.workflow]: !this.nodeViewDetailsOpened,
+				[$style.workflow]: !nodeViewDetailsOpened,
 				[$style.executionPreview]: mode === 'execution',
-				[$style.openNDV]: this.nodeViewDetailsOpened,
-				[$style.show]: this.showPreview,
+				[$style.openNDV]: nodeViewDetailsOpened,
+				[$style.show]: showPreview,
 			}"
-			ref="preview_iframe"
 			:src="`${rootStore.baseUrl}workflows/demo`"
 			@mouseenter="onMouseEnter"
 			@mouseleave="onMouseLeave"
-		></iframe>
+		/>
 	</div>
 </template>
 
-<script lang="ts">
-import mixins from 'vue-typed-mixins';
-import { showMessage } from '@/mixins/showMessage';
-import type { IWorkflowDb } from '../Interface';
-import { mapStores } from 'pinia';
-import { useRootStore } from '@/stores/n8nRootStore';
-
-export default mixins(showMessage).extend({
-	name: 'WorkflowPreview',
-	props: {
-		loading: {
-			type: Boolean,
-			default: false,
-		},
-		mode: {
-			type: String,
-			default: 'workflow',
-			validator: (value: string): boolean => ['workflow', 'execution'].includes(value),
-		},
-		workflow: {
-			type: Object as () => IWorkflowDb,
-			required: false,
-		},
-		executionId: {
-			type: String,
-			required: false,
-		},
-		executionMode: {
-			type: String,
-			required: false,
-		},
-		loaderType: {
-			type: String,
-			default: 'image',
-			validator: (value: string): boolean => ['image', 'spinner'].includes(value),
-		},
-	},
-	data() {
-		return {
-			nodeViewDetailsOpened: false,
-			ready: false,
-			insideIframe: false,
-			scrollX: 0,
-			scrollY: 0,
-		};
+<script setup lang="ts">
+import { onMounted, onBeforeUnmount, ref, computed, watch } from 'vue';
+import { useI18n } from '@/composables/useI18n';
+import { useToast } from '@/composables/useToast';
+import type { IWorkflowDb } from '@/Interface';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import { useExecutionsStore } from '@/stores/executions.store';
+
+const props = withDefaults(
+	defineProps<{
+		loading?: boolean;
+		mode?: 'workflow' | 'execution';
+		workflow?: IWorkflowDb;
+		executionId?: string;
+		executionMode?: string;
+		loaderType?: 'image' | 'spinner';
+		canOpenNDV?: boolean;
+		hideNodeIssues?: boolean;
+	}>(),
+	{
+		loading: false,
+		mode: 'workflow',
+		loaderType: 'image',
+		canOpenNDV: true,
+		hideNodeIssues: false,
 	},
-	computed: {
-		...mapStores(useRootStore),
-		showPreview(): boolean {
-			return (
-				!this.loading &&
-				((this.mode === 'workflow' && !!this.workflow) ||
-					(this.mode === 'execution' && !!this.executionId)) &&
-				this.ready
+);
+
+const emit = defineEmits<{
+	(event: 'close'): void;
+}>();
+
+const i18n = useI18n();
+const toast = useToast();
+const rootStore = useRootStore();
+const executionsStore = useExecutionsStore();
+
+const iframeRef = ref<HTMLIFrameElement | null>(null);
+const nodeViewDetailsOpened = ref(false);
+const ready = ref(false);
+const insideIframe = ref(false);
+const scrollX = ref(0);
+const scrollY = ref(0);
+
+const showPreview = computed(() => {
+	return (
+		!props.loading &&
+		((props.mode === 'workflow' && props.workflow) ||
+			(props.mode === 'execution' && props.executionId)) &&
+		ready.value
+	);
+});
+
+const loadWorkflow = () => {
+	try {
+		if (!props.workflow) {
+			throw new Error(i18n.baseText('workflowPreview.showError.missingWorkflow'));
+		}
+		if (!props.workflow.nodes || !Array.isArray(props.workflow.nodes)) {
+			throw new Error(i18n.baseText('workflowPreview.showError.arrayEmpty'));
+		}
+		iframeRef.value?.contentWindow?.postMessage?.(
+			JSON.stringify({
+				command: 'openWorkflow',
+				workflow: props.workflow,
+				canOpenNDV: props.canOpenNDV,
+				hideNodeIssues: props.hideNodeIssues,
+			}),
+			'*',
+		);
+	} catch (error) {
+		toast.showError(
+			error,
+			i18n.baseText('workflowPreview.showError.previewError.title'),
+			i18n.baseText('workflowPreview.showError.previewError.message'),
+		);
+	}
+};
+
+const loadExecution = () => {
+	try {
+		if (!props.executionId) {
+			throw new Error(i18n.baseText('workflowPreview.showError.missingExecution'));
+		}
+		iframeRef.value?.contentWindow?.postMessage?.(
+			JSON.stringify({
+				command: 'openExecution',
+				executionId: props.executionId,
+				executionMode: props.executionMode || '',
+				canOpenNDV: props.canOpenNDV,
+			}),
+			'*',
+		);
+
+		if (executionsStore.activeExecution) {
+			iframeRef.value?.contentWindow?.postMessage?.(
+				JSON.stringify({
+					command: 'setActiveExecution',
+					execution: executionsStore.activeExecution,
+				}),
+				'*',
 			);
-		},
-	},
-	methods: {
-		onMouseEnter() {
-			this.insideIframe = true;
-			this.scrollX = window.scrollX;
-			this.scrollY = window.scrollY;
-		},
-		onMouseLeave() {
-			this.insideIframe = false;
-		},
-		loadWorkflow() {
-			try {
-				if (!this.workflow) {
-					throw new Error(this.$locale.baseText('workflowPreview.showError.missingWorkflow'));
-				}
-				if (!this.workflow.nodes || !Array.isArray(this.workflow.nodes)) {
-					throw new Error(this.$locale.baseText('workflowPreview.showError.arrayEmpty'));
-				}
-
-				const iframeRef = this.$refs.preview_iframe as HTMLIFrameElement | undefined;
-				if (iframeRef?.contentWindow) {
-					iframeRef.contentWindow.postMessage(
-						JSON.stringify({
-							command: 'openWorkflow',
-							workflow: this.workflow,
-						}),
-						'*',
-					);
-				}
-			} catch (error) {
-				this.$showError(
-					error,
-					this.$locale.baseText('workflowPreview.showError.previewError.title'),
-					this.$locale.baseText('workflowPreview.showError.previewError.message'),
-				);
-			}
-		},
-		loadExecution() {
-			try {
-				if (!this.executionId) {
-					throw new Error(this.$locale.baseText('workflowPreview.showError.missingExecution'));
-				}
-				const iframeRef = this.$refs.preview_iframe as HTMLIFrameElement | undefined;
-				if (iframeRef?.contentWindow) {
-					iframeRef.contentWindow.postMessage(
-						JSON.stringify({
-							command: 'openExecution',
-							executionId: this.executionId,
-							executionMode: this.executionMode || '',
-						}),
-						'*',
-					);
-				}
-			} catch (error) {
-				this.$showError(
-					error,
-					this.$locale.baseText('workflowPreview.showError.previewError.title'),
-					this.$locale.baseText('workflowPreview.executionMode.showError.previewError.message'),
-				);
-			}
-		},
-		receiveMessage({ data }: MessageEvent) {
-			try {
-				const json = JSON.parse(data);
-				if (json.command === 'n8nReady') {
-					this.ready = true;
-				} else if (json.command === 'openNDV') {
-					this.nodeViewDetailsOpened = true;
-				} else if (json.command === 'closeNDV') {
-					this.nodeViewDetailsOpened = false;
-				} else if (json.command === 'error') {
-					this.$emit('close');
-				}
-			} catch (e) {}
-		},
-		onDocumentScroll() {
-			if (this.insideIframe) {
-				window.scrollTo(this.scrollX, this.scrollY);
-			}
-		},
-	},
-	watch: {
-		showPreview(show) {
-			if (show) {
-				if (this.mode === 'workflow') {
-					this.loadWorkflow();
-				} else if (this.mode === 'execution') {
-					this.loadExecution();
-				}
-			}
-		},
-		executionId(value) {
-			if (this.mode === 'execution' && this.executionId) {
-				this.loadExecution();
+		}
+	} catch (error) {
+		toast.showError(
+			error,
+			i18n.baseText('workflowPreview.showError.previewError.title'),
+			i18n.baseText('workflowPreview.executionMode.showError.previewError.message'),
+		);
+	}
+};
+
+const onMouseEnter = () => {
+	insideIframe.value = true;
+	scrollX.value = window.scrollX;
+	scrollY.value = window.scrollY;
+};
+const onMouseLeave = () => {
+	insideIframe.value = false;
+};
+
+const receiveMessage = ({ data }: MessageEvent) => {
+	if (!data?.includes?.('"command"')) {
+		return;
+	}
+	try {
+		const json = JSON.parse(data);
+		if (json.command === 'n8nReady') {
+			ready.value = true;
+		} else if (json.command === 'openNDV') {
+			nodeViewDetailsOpened.value = true;
+		} else if (json.command === 'closeNDV') {
+			nodeViewDetailsOpened.value = false;
+		} else if (json.command === 'error') {
+			emit('close');
+		}
+	} catch (e) {
+		console.error(e);
+	}
+};
+const onDocumentScroll = () => {
+	if (insideIframe.value) {
+		window.scrollTo(scrollX.value, scrollY.value);
+	}
+};
+
+onMounted(() => {
+	window.addEventListener('message', receiveMessage);
+	document.addEventListener('scroll', onDocumentScroll);
+});
+
+onBeforeUnmount(() => {
+	window.removeEventListener('message', receiveMessage);
+	document.removeEventListener('scroll', onDocumentScroll);
+});
+
+watch(
+	() => showPreview.value,
+	() => {
+		if (showPreview.value) {
+			if (props.mode === 'workflow') {
+				loadWorkflow();
+			} else if (props.mode === 'execution') {
+				loadExecution();
 			}
-		},
+		}
 	},
-	mounted() {
-		window.addEventListener('message', this.receiveMessage);
-		document.addEventListener('scroll', this.onDocumentScroll);
+);
+
+watch(
+	() => props.executionId,
+	() => {
+		if (props.mode === 'execution' && props.executionId) {
+			loadExecution();
+		}
 	},
-	beforeDestroy() {
-		window.removeEventListener('message', this.receiveMessage);
-		document.removeEventListener('scroll', this.onDocumentScroll);
+);
+
+watch(
+	() => props.workflow,
+	() => {
+		if (props.mode === 'workflow' && props.workflow) {
+			loadWorkflow();
+		}
 	},
-});
+);
 </script>
 
 <style lang="scss" module>
@@ -225,6 +249,10 @@ export default mixins(showMessage).extend({
 
 .imageLoader {
 	width: 100%;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	height: 100%;
 }
 
 .executionPreview {
diff --git a/packages/editor-ui/src/components/WorkflowSettings.vue b/packages/editor-ui/src/components/WorkflowSettings.vue
index a3c062213ddca..4c3be4f84ba0d 100644
--- a/packages/editor-ui/src/components/WorkflowSettings.vue
+++ b/packages/editor-ui/src/components/WorkflowSettings.vue
@@ -2,21 +2,46 @@
 	<Modal
 		:name="WORKFLOW_SETTINGS_MODAL_KEY"
 		width="65%"
-		maxHeight="80%"
+		max-height="80%"
 		:title="
 			$locale.baseText('workflowSettings.settingsFor', {
 				interpolate: { workflowName, workflowId },
 			})
 		"
-		:eventBus="modalBus"
+		:event-bus="modalBus"
 		:scrollable="true"
 	>
 		<template #content>
 			<div v-loading="isLoading" class="workflow-settings" data-test-id="workflow-settings-dialog">
+				<el-row>
+					<el-col :span="10" class="setting-name">
+						{{ $locale.baseText('workflowSettings.executionOrder') + ':' }}
+					</el-col>
+					<el-col :span="14" class="ignore-key-press">
+						<n8n-select
+							v-model="workflowSettings.executionOrder"
+							placeholder="Select Execution Order"
+							size="medium"
+							filterable
+							:disabled="readOnlyEnv"
+							:limit-popper-width="true"
+							data-test-id="workflow-settings-execution-order"
+						>
+							<n8n-option
+								v-for="option in executionOrderOptions"
+								:key="option.key"
+								:label="option.value"
+								:value="option.key"
+							>
+							</n8n-option>
+						</n8n-select>
+					</el-col>
+				</el-row>
+
 				<el-row>
 					<el-col :span="10" class="setting-name">
 						{{ $locale.baseText('workflowSettings.errorWorkflow') + ':' }}
-						<n8n-tooltip class="setting-info" placement="top">
+						<n8n-tooltip placement="top">
 							<template #content>
 								<div v-html="helpTexts.errorWorkflow"></div>
 							</template>
@@ -27,8 +52,8 @@
 						<n8n-select
 							v-model="workflowSettings.errorWorkflow"
 							placeholder="Select Workflow"
-							size="medium"
 							filterable
+							:disabled="readOnlyEnv"
 							:limit-popper-width="true"
 							data-test-id="workflow-settings-error-workflow"
 						>
@@ -42,11 +67,11 @@
 						</n8n-select>
 					</el-col>
 				</el-row>
-				<div v-if="isSharingEnabled">
+				<div v-if="isSharingEnabled" data-test-id="workflow-caller-policy">
 					<el-row>
 						<el-col :span="10" class="setting-name">
 							{{ $locale.baseText('workflowSettings.callerPolicy') + ':' }}
-							<n8n-tooltip class="setting-info" placement="top">
+							<n8n-tooltip placement="top">
 								<template #content>
 									<div v-text="helpTexts.workflowCallerPolicy"></div>
 								</template>
@@ -57,8 +82,8 @@
 						<el-col :span="14" class="ignore-key-press">
 							<n8n-select
 								v-model="workflowSettings.callerPolicy"
+								:disabled="readOnlyEnv"
 								:placeholder="$locale.baseText('workflowSettings.selectOption')"
-								size="medium"
 								filterable
 								:limit-popper-width="true"
 							>
@@ -75,7 +100,7 @@
 					<el-row v-if="workflowSettings.callerPolicy === 'workflowsFromAList'">
 						<el-col :span="10" class="setting-name">
 							{{ $locale.baseText('workflowSettings.callerIds') + ':' }}
-							<n8n-tooltip class="setting-info" placement="top">
+							<n8n-tooltip placement="top">
 								<template #content>
 									<div v-text="helpTexts.workflowCallerIds"></div>
 								</template>
@@ -84,11 +109,12 @@
 						</el-col>
 						<el-col :span="14">
 							<n8n-input
+								v-model="workflowSettings.callerIds"
+								:disabled="readOnlyEnv"
 								:placeholder="$locale.baseText('workflowSettings.callerIds.placeholder')"
 								type="text"
-								size="medium"
-								v-model="workflowSettings.callerIds"
-								@input="onCallerIdsInput"
+								data-test-id="workflow-caller-policy-workflow-ids"
+								@update:model-value="onCallerIdsInput"
 							/>
 						</el-col>
 					</el-row>
@@ -96,7 +122,7 @@
 				<el-row>
 					<el-col :span="10" class="setting-name">
 						{{ $locale.baseText('workflowSettings.timezone') + ':' }}
-						<n8n-tooltip class="setting-info" placement="top">
+						<n8n-tooltip placement="top">
 							<template #content>
 								<div v-text="helpTexts.timezone"></div>
 							</template>
@@ -107,8 +133,8 @@
 						<n8n-select
 							v-model="workflowSettings.timezone"
 							placeholder="Select Timezone"
-							size="medium"
 							filterable
+							:disabled="readOnlyEnv"
 							:limit-popper-width="true"
 							data-test-id="workflow-settings-timezone"
 						>
@@ -125,7 +151,7 @@
 				<el-row>
 					<el-col :span="10" class="setting-name">
 						{{ $locale.baseText('workflowSettings.saveDataErrorExecution') + ':' }}
-						<n8n-tooltip class="setting-info" placement="top">
+						<n8n-tooltip placement="top">
 							<template #content>
 								<div v-text="helpTexts.saveDataErrorExecution"></div>
 							</template>
@@ -136,8 +162,8 @@
 						<n8n-select
 							v-model="workflowSettings.saveDataErrorExecution"
 							:placeholder="$locale.baseText('workflowSettings.selectOption')"
-							size="medium"
 							filterable
+							:disabled="readOnlyEnv"
 							:limit-popper-width="true"
 							data-test-id="workflow-settings-save-failed-executions"
 						>
@@ -154,7 +180,7 @@
 				<el-row>
 					<el-col :span="10" class="setting-name">
 						{{ $locale.baseText('workflowSettings.saveDataSuccessExecution') + ':' }}
-						<n8n-tooltip class="setting-info" placement="top">
+						<n8n-tooltip placement="top">
 							<template #content>
 								<div v-text="helpTexts.saveDataSuccessExecution"></div>
 							</template>
@@ -165,8 +191,8 @@
 						<n8n-select
 							v-model="workflowSettings.saveDataSuccessExecution"
 							:placeholder="$locale.baseText('workflowSettings.selectOption')"
-							size="medium"
 							filterable
+							:disabled="readOnlyEnv"
 							:limit-popper-width="true"
 							data-test-id="workflow-settings-save-success-executions"
 						>
@@ -183,7 +209,7 @@
 				<el-row>
 					<el-col :span="10" class="setting-name">
 						{{ $locale.baseText('workflowSettings.saveManualExecutions') + ':' }}
-						<n8n-tooltip class="setting-info" placement="top">
+						<n8n-tooltip placement="top">
 							<template #content>
 								<div v-text="helpTexts.saveManualExecutions"></div>
 							</template>
@@ -194,8 +220,8 @@
 						<n8n-select
 							v-model="workflowSettings.saveManualExecutions"
 							:placeholder="$locale.baseText('workflowSettings.selectOption')"
-							size="medium"
 							filterable
+							:disabled="readOnlyEnv"
 							:limit-popper-width="true"
 							data-test-id="workflow-settings-save-manual-executions"
 						>
@@ -212,7 +238,7 @@
 				<el-row>
 					<el-col :span="10" class="setting-name">
 						{{ $locale.baseText('workflowSettings.saveExecutionProgress') + ':' }}
-						<n8n-tooltip class="setting-info" placement="top">
+						<n8n-tooltip placement="top">
 							<template #content>
 								<div v-text="helpTexts.saveExecutionProgress"></div>
 							</template>
@@ -223,8 +249,8 @@
 						<n8n-select
 							v-model="workflowSettings.saveExecutionProgress"
 							:placeholder="$locale.baseText('workflowSettings.selectOption')"
-							size="medium"
 							filterable
+							:disabled="readOnlyEnv"
 							:limit-popper-width="true"
 							data-test-id="workflow-settings-save-execution-progress"
 						>
@@ -241,7 +267,7 @@
 				<el-row>
 					<el-col :span="10" class="setting-name">
 						{{ $locale.baseText('workflowSettings.timeoutWorkflow') + ':' }}
-						<n8n-tooltip class="setting-info" placement="top">
+						<n8n-tooltip placement="top">
 							<template #content>
 								<div v-text="helpTexts.executionTimeoutToggle"></div>
 							</template>
@@ -252,10 +278,11 @@
 						<div>
 							<el-switch
 								ref="inputField"
-								:value="workflowSettings.executionTimeout > -1"
-								@change="toggleTimeout"
+								:disabled="readOnlyEnv"
+								:model-value="workflowSettings.executionTimeout > -1"
 								active-color="#13ce66"
 								data-test-id="workflow-settings-timeout-workflow"
+								@update:model-value="toggleTimeout"
 							></el-switch>
 						</div>
 					</el-col>
@@ -267,7 +294,7 @@
 					<el-row>
 						<el-col :span="10" class="setting-name">
 							{{ $locale.baseText('workflowSettings.timeoutAfter') + ':' }}
-							<n8n-tooltip class="setting-info" placement="top">
+							<n8n-tooltip placement="top">
 								<template #content>
 									<div v-text="helpTexts.executionTimeout"></div>
 								</template>
@@ -276,32 +303,32 @@
 						</el-col>
 						<el-col :span="4">
 							<n8n-input
-								size="medium"
-								:value="timeoutHMS.hours"
-								@input="(value) => setTimeout('hours', value)"
+								:disabled="readOnlyEnv"
+								:model-value="timeoutHMS.hours"
 								:min="0"
+								@update:model-value="(value) => setTimeout('hours', value)"
 							>
 								<template #append>{{ $locale.baseText('workflowSettings.hours') }}</template>
 							</n8n-input>
 						</el-col>
 						<el-col :span="4" class="timeout-input">
 							<n8n-input
-								size="medium"
-								:value="timeoutHMS.minutes"
-								@input="(value) => setTimeout('minutes', value)"
+								:disabled="readOnlyEnv"
+								:model-value="timeoutHMS.minutes"
 								:min="0"
 								:max="60"
+								@update:model-value="(value) => setTimeout('minutes', value)"
 							>
 								<template #append>{{ $locale.baseText('workflowSettings.minutes') }}</template>
 							</n8n-input>
 						</el-col>
 						<el-col :span="4" class="timeout-input">
 							<n8n-input
-								size="medium"
-								:value="timeoutHMS.seconds"
-								@input="(value) => setTimeout('seconds', value)"
+								:disabled="readOnlyEnv"
+								:model-value="timeoutHMS.seconds"
 								:min="0"
 								:max="60"
+								@update:model-value="(value) => setTimeout('seconds', value)"
 							>
 								<template #append>{{ $locale.baseText('workflowSettings.seconds') }}</template>
 							</n8n-input>
@@ -313,6 +340,7 @@
 		<template #footer>
 			<div class="action-buttons" data-test-id="workflow-settings-save-button">
 				<n8n-button
+					:disabled="readOnlyEnv"
 					:label="$locale.baseText('workflowSettings.save')"
 					size="large"
 					float="right"
@@ -324,11 +352,10 @@
 </template>
 
 <script lang="ts">
-import Vue from 'vue';
+import { defineComponent } from 'vue';
+import { mapStores } from 'pinia';
 
-import { externalHooks } from '@/mixins/externalHooks';
-import { genericHelpers } from '@/mixins/genericHelpers';
-import { showMessage } from '@/mixins/showMessage';
+import { useToast } from '@/composables/useToast';
 import type {
 	ITimeoutHMS,
 	IUser,
@@ -337,31 +364,39 @@ import type {
 	IWorkflowSettings,
 	IWorkflowShortResponse,
 } from '@/Interface';
-import { WorkflowCallerPolicyDefaultOption } from '@/Interface';
-import Modal from './Modal.vue';
+import Modal from '@/components/Modal.vue';
 import {
 	EnterpriseEditionFeature,
 	PLACEHOLDER_EMPTY_WORKFLOW_ID,
 	WORKFLOW_SETTINGS_MODAL_KEY,
-} from '../constants';
-
-import mixins from 'vue-typed-mixins';
+} from '@/constants';
 
 import type { WorkflowSettings } from 'n8n-workflow';
 import { deepCopy } from 'n8n-workflow';
-import { mapStores } from 'pinia';
-import { useWorkflowsStore } from '@/stores/workflows';
-import { useSettingsStore } from '@/stores/settings';
-import { useRootStore } from '@/stores/n8nRootStore';
-import useWorkflowsEEStore from '@/stores/workflows.ee';
-import { useUsersStore } from '@/stores/users';
-import { createEventBus } from '@/event-bus';
-
-export default mixins(externalHooks, genericHelpers, showMessage).extend({
+import { useSettingsStore } from '@/stores/settings.store';
+import { useUsersStore } from '@/stores/users.store';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import { useWorkflowsEEStore } from '@/stores/workflows.ee.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { createEventBus } from 'n8n-design-system/utils';
+import type { IPermissions } from '@/permissions';
+import { getWorkflowPermissions } from '@/permissions';
+import { useExternalHooks } from '@/composables/useExternalHooks';
+import { useSourceControlStore } from '@/stores/sourceControl.store';
+
+export default defineComponent({
 	name: 'WorkflowSettings',
 	components: {
 		Modal,
 	},
+	setup() {
+		const externalHooks = useExternalHooks();
+
+		return {
+			externalHooks,
+			...useToast(),
+		};
+	},
 	data() {
 		return {
 			isLoading: true,
@@ -402,9 +437,14 @@ export default mixins(externalHooks, genericHelpers, showMessage).extend({
 			saveDataSuccessExecutionOptions: [] as Array<{ key: string; value: string }>,
 			saveExecutionProgressOptions: [] as Array<{ key: string | boolean; value: string }>,
 			saveManualOptions: [] as Array<{ key: string | boolean; value: string }>,
+			executionOrderOptions: [
+				{ key: 'v0', value: 'v0 (legacy)' },
+				{ key: 'v1', value: 'v1 (recommended)' },
+			] as Array<{ key: string; value: string }>,
 			timezones: [] as Array<{ key: string; value: string }>,
 			workflowSettings: {} as IWorkflowSettings,
 			workflows: [] as IWorkflowShortResponse[],
+			executionOrder: 'v0',
 			executionTimeout: 0,
 			maxExecutionTimeout: 0,
 			timeoutHMS: { hours: 0, minutes: 0, seconds: 0 } as ITimeoutHMS,
@@ -418,9 +458,13 @@ export default mixins(externalHooks, genericHelpers, showMessage).extend({
 			useRootStore,
 			useUsersStore,
 			useSettingsStore,
+			useSourceControlStore,
 			useWorkflowsStore,
 			useWorkflowsEEStore,
 		),
+		readOnlyEnv(): boolean {
+			return this.sourceControlStore.preferences.branchReadOnly;
+		},
 		workflowName(): string {
 			return this.workflowsStore.workflowName;
 		},
@@ -443,13 +487,16 @@ export default mixins(externalHooks, genericHelpers, showMessage).extend({
 
 			return this.workflowsEEStore.getWorkflowOwnerName(`${this.workflowId}`, fallback);
 		},
+		workflowPermissions(): IPermissions {
+			return getWorkflowPermissions(this.currentUser, this.workflow);
+		},
 	},
 	async mounted() {
 		this.executionTimeout = this.rootStore.executionTimeout;
 		this.maxExecutionTimeout = this.rootStore.maxExecutionTimeout;
 
 		if (!this.workflowId || this.workflowId === PLACEHOLDER_EMPTY_WORKFLOW_ID) {
-			this.$showMessage({
+			this.showMessage({
 				title: 'No workflow active',
 				message: 'No workflow active to display settings of.',
 				type: 'error',
@@ -478,7 +525,7 @@ export default mixins(externalHooks, genericHelpers, showMessage).extend({
 		try {
 			await Promise.all(promises);
 		} catch (error) {
-			this.$showError(
+			this.showError(
 				error,
 				'Problem loading settings',
 				'The following error occurred loading the data:',
@@ -512,25 +559,32 @@ export default mixins(externalHooks, genericHelpers, showMessage).extend({
 		if (workflowSettings.maxExecutionTimeout === undefined) {
 			workflowSettings.maxExecutionTimeout = this.rootStore.maxExecutionTimeout;
 		}
+		if (workflowSettings.executionOrder === undefined) {
+			workflowSettings.executionOrder = 'v0';
+		}
 
-		Vue.set(this, 'workflowSettings', workflowSettings);
+		this.workflowSettings = workflowSettings;
 		this.timeoutHMS = this.convertToHMS(workflowSettings.executionTimeout);
 		this.isLoading = false;
 
-		this.$externalHooks().run('workflowSettings.dialogVisibleChanged', { dialogVisible: true });
+		void this.externalHooks.run('workflowSettings.dialogVisibleChanged', {
+			dialogVisible: true,
+		});
 		this.$telemetry.track('User opened workflow settings', {
 			workflow_id: this.workflowsStore.workflowId,
 		});
 	},
 	methods: {
 		onCallerIdsInput(str: string) {
-			this.workflowSettings.callerIds = /^[0-9,\s]+$/.test(str)
+			this.workflowSettings.callerIds = /^[a-zA-Z0-9,\s]+$/.test(str)
 				? str
-				: str.replace(/[^0-9,\s]/g, '');
+				: str.replace(/[^a-zA-Z0-9,\s]/g, '');
 		},
 		closeDialog() {
 			this.modalBus.emit('close');
-			this.$externalHooks().run('workflowSettings.dialogVisibleChanged', { dialogVisible: false });
+			void this.externalHooks.run('workflowSettings.dialogVisibleChanged', {
+				dialogVisible: false,
+			});
 		},
 		setTimeout(key: string, value: string) {
 			const time = value ? parseInt(value, 10) : 0;
@@ -541,8 +595,6 @@ export default mixins(externalHooks, genericHelpers, showMessage).extend({
 			};
 		},
 		async loadWorkflowCallerPolicyOptions() {
-			const currentUserIsOwner = this.workflow.ownedBy?.id === this.currentUser?.id;
-
 			this.workflowCallerPolicyOptions = [
 				{
 					key: 'none',
@@ -554,10 +606,10 @@ export default mixins(externalHooks, genericHelpers, showMessage).extend({
 						'workflowSettings.callerPolicy.options.workflowsFromSameOwner',
 						{
 							interpolate: {
-								owner: currentUserIsOwner
+								owner: this.workflowPermissions.isOwner
 									? this.$locale.baseText(
 											'workflowSettings.callerPolicy.options.workflowsFromSameOwner.owner',
-									  )
+										)
 									: this.workflowOwnerName,
 							},
 						},
@@ -575,105 +627,91 @@ export default mixins(externalHooks, genericHelpers, showMessage).extend({
 		},
 		async loadSaveDataErrorExecutionOptions() {
 			this.saveDataErrorExecutionOptions.length = 0;
-			this.saveDataErrorExecutionOptions.push.apply(
-				// eslint-disable-line no-useless-call
-				this.saveDataErrorExecutionOptions,
-				[
-					{
-						key: 'DEFAULT',
-						value: this.$locale.baseText(
-							'workflowSettings.saveDataErrorExecutionOptions.defaultSave',
-							{
-								interpolate: {
-									defaultValue:
-										this.defaultValues.saveDataErrorExecution === 'all'
-											? this.$locale.baseText('workflowSettings.saveDataErrorExecutionOptions.save')
-											: this.$locale.baseText(
-													'workflowSettings.saveDataErrorExecutionOptions.doNotSave',
-											  ),
-								},
+			this.saveDataErrorExecutionOptions.push.apply(this.saveDataErrorExecutionOptions, [
+				{
+					key: 'DEFAULT',
+					value: this.$locale.baseText(
+						'workflowSettings.saveDataErrorExecutionOptions.defaultSave',
+						{
+							interpolate: {
+								defaultValue:
+									this.defaultValues.saveDataErrorExecution === 'all'
+										? this.$locale.baseText('workflowSettings.saveDataErrorExecutionOptions.save')
+										: this.$locale.baseText(
+												'workflowSettings.saveDataErrorExecutionOptions.doNotSave',
+											),
 							},
-						),
-					},
-					{
-						key: 'all',
-						value: this.$locale.baseText('workflowSettings.saveDataErrorExecutionOptions.save'),
-					},
-					{
-						key: 'none',
-						value: this.$locale.baseText(
-							'workflowSettings.saveDataErrorExecutionOptions.doNotSave',
-						),
-					},
-				],
-			);
+						},
+					),
+				},
+				{
+					key: 'all',
+					value: this.$locale.baseText('workflowSettings.saveDataErrorExecutionOptions.save'),
+				},
+				{
+					key: 'none',
+					value: this.$locale.baseText('workflowSettings.saveDataErrorExecutionOptions.doNotSave'),
+				},
+			]);
 		},
 		async loadSaveDataSuccessExecutionOptions() {
 			this.saveDataSuccessExecutionOptions.length = 0;
-			this.saveDataSuccessExecutionOptions.push.apply(
-				// eslint-disable-line no-useless-call
-				this.saveDataSuccessExecutionOptions,
-				[
-					{
-						key: 'DEFAULT',
-						value: this.$locale.baseText(
-							'workflowSettings.saveDataSuccessExecutionOptions.defaultSave',
-							{
-								interpolate: {
-									defaultValue:
-										this.defaultValues.saveDataSuccessExecution === 'all'
-											? this.$locale.baseText(
-													'workflowSettings.saveDataSuccessExecutionOptions.save',
-											  )
-											: this.$locale.baseText(
-													'workflowSettings.saveDataSuccessExecutionOptions.doNotSave',
-											  ),
-								},
+			this.saveDataSuccessExecutionOptions.push.apply(this.saveDataSuccessExecutionOptions, [
+				{
+					key: 'DEFAULT',
+					value: this.$locale.baseText(
+						'workflowSettings.saveDataSuccessExecutionOptions.defaultSave',
+						{
+							interpolate: {
+								defaultValue:
+									this.defaultValues.saveDataSuccessExecution === 'all'
+										? this.$locale.baseText('workflowSettings.saveDataSuccessExecutionOptions.save')
+										: this.$locale.baseText(
+												'workflowSettings.saveDataSuccessExecutionOptions.doNotSave',
+											),
 							},
-						),
-					},
-					{
-						key: 'all',
-						value: this.$locale.baseText('workflowSettings.saveDataSuccessExecutionOptions.save'),
-					},
-					{
-						key: 'none',
-						value: this.$locale.baseText(
-							'workflowSettings.saveDataSuccessExecutionOptions.doNotSave',
-						),
-					},
-				],
-			);
+						},
+					),
+				},
+				{
+					key: 'all',
+					value: this.$locale.baseText('workflowSettings.saveDataSuccessExecutionOptions.save'),
+				},
+				{
+					key: 'none',
+					value: this.$locale.baseText(
+						'workflowSettings.saveDataSuccessExecutionOptions.doNotSave',
+					),
+				},
+			]);
 		},
 		async loadSaveExecutionProgressOptions() {
 			this.saveExecutionProgressOptions.length = 0;
-			this.saveExecutionProgressOptions.push.apply(
-				// eslint-disable-line no-useless-call
-				this.saveExecutionProgressOptions,
-				[
-					{
-						key: 'DEFAULT',
-						value: this.$locale.baseText(
-							'workflowSettings.saveExecutionProgressOptions.defaultSave',
-							{
-								interpolate: {
-									defaultValue: this.defaultValues.saveExecutionProgress
-										? this.$locale.baseText('workflowSettings.saveExecutionProgressOptions.yes')
-										: this.$locale.baseText('workflowSettings.saveExecutionProgressOptions.no'),
-								},
+			this.saveExecutionProgressOptions.push.apply(this.saveExecutionProgressOptions, [
+				{
+					key: 'DEFAULT',
+					value: this.$locale.baseText(
+						'workflowSettings.saveExecutionProgressOptions.defaultSave',
+						{
+							interpolate: {
+								defaultValue: this.defaultValues.saveExecutionProgress
+									? this.$locale.baseText('workflowSettings.saveExecutionProgressOptions.save')
+									: this.$locale.baseText(
+											'workflowSettings.saveExecutionProgressOptions.doNotSave',
+										),
 							},
-						),
-					},
-					{
-						key: true,
-						value: this.$locale.baseText('workflowSettings.saveExecutionProgressOptions.yes'),
-					},
-					{
-						key: false,
-						value: this.$locale.baseText('workflowSettings.saveExecutionProgressOptions.no'),
-					},
-				],
-			);
+						},
+					),
+				},
+				{
+					key: true,
+					value: this.$locale.baseText('workflowSettings.saveExecutionProgressOptions.save'),
+				},
+				{
+					key: false,
+					value: this.$locale.baseText('workflowSettings.saveExecutionProgressOptions.doNotSave'),
+				},
+			]);
 		},
 		async loadSaveManualOptions() {
 			this.saveManualOptions.length = 0;
@@ -682,18 +720,18 @@ export default mixins(externalHooks, genericHelpers, showMessage).extend({
 				value: this.$locale.baseText('workflowSettings.saveManualOptions.defaultSave', {
 					interpolate: {
 						defaultValue: this.defaultValues.saveManualExecutions
-							? this.$locale.baseText('workflowSettings.saveManualOptions.yes')
-							: this.$locale.baseText('workflowSettings.saveManualOptions.no'),
+							? this.$locale.baseText('workflowSettings.saveManualOptions.save')
+							: this.$locale.baseText('workflowSettings.saveManualOptions.doNotSave'),
 					},
 				}),
 			});
 			this.saveManualOptions.push({
 				key: true,
-				value: this.$locale.baseText('workflowSettings.saveManualOptions.yes'),
+				value: this.$locale.baseText('workflowSettings.saveManualOptions.save'),
 			});
 			this.saveManualOptions.push({
 				key: false,
-				value: this.$locale.baseText('workflowSettings.saveManualOptions.no'),
+				value: this.$locale.baseText('workflowSettings.saveManualOptions.doNotSave'),
 			});
 		},
 
@@ -724,7 +762,7 @@ export default mixins(externalHooks, genericHelpers, showMessage).extend({
 			}
 		},
 		async loadWorkflows() {
-			const workflows = await this.workflowsStore.fetchAllWorkflows();
+			const workflows = (await this.workflowsStore.fetchAllWorkflows()) as IWorkflowShortResponse[];
 			workflows.sort((a, b) => {
 				if (a.name.toLowerCase() < b.name.toLowerCase()) {
 					return -1;
@@ -735,13 +773,12 @@ export default mixins(externalHooks, genericHelpers, showMessage).extend({
 				return 0;
 			});
 
-			// @ts-ignore
 			workflows.unshift({
 				id: undefined as unknown as string,
 				name: this.$locale.baseText('workflowSettings.noWorkflow'),
-			});
+			} as IWorkflowShortResponse);
 
-			Vue.set(this, 'workflows', workflows);
+			this.workflows = workflows;
 		},
 		async saveSettings() {
 			// Set that the active state should be changed
@@ -755,7 +792,7 @@ export default mixins(externalHooks, genericHelpers, showMessage).extend({
 				data.settings!.executionTimeout !== -1 ? hours * 3600 + minutes * 60 + seconds : -1;
 
 			if (data.settings!.executionTimeout === 0) {
-				this.$showError(
+				this.showError(
 					new Error(this.$locale.baseText('workflowSettings.showError.saveSettings1.errorMessage')),
 					this.$locale.baseText('workflowSettings.showError.saveSettings1.title'),
 					this.$locale.baseText('workflowSettings.showError.saveSettings1.message') + ':',
@@ -768,7 +805,7 @@ export default mixins(externalHooks, genericHelpers, showMessage).extend({
 				const { hours, minutes, seconds } = this.convertToHMS(
 					this.workflowSettings.maxExecutionTimeout as number,
 				);
-				this.$showError(
+				this.showError(
 					new Error(
 						this.$locale.baseText('workflowSettings.showError.saveSettings2.errorMessage', {
 							interpolate: {
@@ -792,7 +829,7 @@ export default mixins(externalHooks, genericHelpers, showMessage).extend({
 				const workflow = await this.workflowsStore.updateWorkflow(this.$route.params.name, data);
 				this.workflowsStore.setWorkflowVersionId(workflow.versionId);
 			} catch (error) {
-				this.$showError(
+				this.showError(
 					error,
 					this.$locale.baseText('workflowSettings.showError.saveSettings3.title'),
 				);
@@ -814,14 +851,14 @@ export default mixins(externalHooks, genericHelpers, showMessage).extend({
 
 			this.isLoading = false;
 
-			this.$showMessage({
+			this.showMessage({
 				title: this.$locale.baseText('workflowSettings.showMessage.saveSettings.title'),
 				type: 'success',
 			});
 
 			this.closeDialog();
 
-			this.$externalHooks().run('workflowSettings.saveSettings', { oldSettings });
+			void this.externalHooks.run('workflowSettings.saveSettings', { oldSettings });
 			this.$telemetry.track('User updated workflow settings', {
 				workflow_id: this.workflowsStore.workflowId,
 			});
@@ -852,17 +889,19 @@ export default mixins(externalHooks, genericHelpers, showMessage).extend({
 	}
 }
 
-.setting-info {
-	display: none;
-}
-
 .setting-name {
 	line-height: 32px;
-}
 
-.setting-name:hover {
-	.setting-info {
-		display: inline;
+	svg {
+		display: inline-flex;
+		opacity: 0;
+		transition: opacity 0.3s ease;
+	}
+
+	&:hover {
+		svg {
+			opacity: 1;
+		}
 	}
 }
 
diff --git a/packages/editor-ui/src/components/WorkflowShareModal.ee.vue b/packages/editor-ui/src/components/WorkflowShareModal.ee.vue
index 4aea80f753711..1253c411c2592 100644
--- a/packages/editor-ui/src/components/WorkflowShareModal.ee.vue
+++ b/packages/editor-ui/src/components/WorkflowShareModal.ee.vue
@@ -1,11 +1,12 @@
 <template>
 	<Modal
 		width="460px"
+		max-height="75%"
 		:title="modalTitle"
-		:eventBus="modalBus"
+		:event-bus="modalBus"
 		:name="WORKFLOW_SHARE_MODAL_KEY"
 		:center="true"
-		:beforeClose="onCloseModal"
+		:before-close="onCloseModal"
 	>
 		<template #content>
 			<div v-if="!isSharingEnabled" :class="$style.container">
@@ -23,23 +24,23 @@
 				</n8n-text>
 			</div>
 			<div v-else :class="$style.container">
-				<n8n-info-tip v-if="!workflowPermissions.isOwner" :bold="false" class="mb-s">
+				<n8n-info-tip v-if="!workflowPermissions.updateSharing" :bold="false" class="mb-s">
 					{{
 						$locale.baseText('workflows.shareModal.info.sharee', {
 							interpolate: { workflowOwnerName },
 						})
 					}}
 				</n8n-info-tip>
-				<enterprise-edition :features="[EnterpriseEditionFeature.Sharing]">
+				<enterprise-edition :features="[EnterpriseEditionFeature.Sharing]" :class="$style.content">
 					<n8n-user-select
 						v-if="workflowPermissions.updateSharing"
 						class="mb-s"
 						size="large"
 						:users="usersList"
-						:currentUserId="currentUser.id"
+						:current-user-id="currentUser.id"
 						:placeholder="$locale.baseText('workflows.shareModal.select.placeholder')"
 						data-test-id="workflow-sharing-modal-users-select"
-						@input="onAddSharee"
+						@update:model-value="onAddSharee"
 					>
 						<template #prefix>
 							<n8n-icon icon="search" />
@@ -48,16 +49,17 @@
 					<n8n-users-list
 						:actions="[]"
 						:users="sharedWithList"
-						:currentUserId="currentUser.id"
+						:current-user-id="currentUser.id"
 						:delete-label="$locale.baseText('workflows.shareModal.list.delete')"
 						:readonly="!workflowPermissions.updateSharing"
+						:class="$style.usersList"
 					>
 						<template #actions="{ user }">
 							<n8n-select
 								:class="$style.roleSelect"
-								value="editor"
+								model-value="editor"
 								size="small"
-								@change="onRoleAction(user, $event)"
+								@update:model-value="onRoleAction(user, $event)"
 							>
 								<n8n-option :label="$locale.baseText('workflows.roles.editor')" value="editor" />
 								<n8n-option :class="$style.roleSelectRemoveOption" value="remove">
@@ -70,14 +72,14 @@
 					</n8n-users-list>
 					<template #fallback>
 						<n8n-text>
-							<i18n
-								:path="
+							<i18n-t
+								:keypath="
 									uiStore.contextBasedTranslationKeys.workflows.sharing.unavailable.description
 								"
 								tag="span"
 							>
 								<template #action />
-							</i18n>
+							</i18n-t>
 						</n8n-text>
 					</template>
 				</enterprise-edition>
@@ -111,7 +113,6 @@
 					v-show="workflowPermissions.updateSharing"
 					:loading="loading"
 					:disabled="!isDirty"
-					size="medium"
 					data-test-id="workflow-sharing-modal-save-button"
 					@click="onSave"
 				>
@@ -123,33 +124,36 @@
 </template>
 
 <script lang="ts">
+import { defineComponent } from 'vue';
+import { mapStores } from 'pinia';
+import { createEventBus } from 'n8n-design-system/utils';
+
 import Modal from './Modal.vue';
 import {
 	EnterpriseEditionFeature,
+	MODAL_CONFIRM,
 	PLACEHOLDER_EMPTY_WORKFLOW_ID,
 	VIEWS,
 	WORKFLOW_SHARE_MODAL_KEY,
-} from '../constants';
+} from '@/constants';
 import type { IUser, IWorkflowDb } from '@/Interface';
-import { UIState } from '@/Interface';
 import type { IPermissions } from '@/permissions';
 import { getWorkflowPermissions } from '@/permissions';
-import mixins from 'vue-typed-mixins';
-import { showMessage } from '@/mixins/showMessage';
-import { createEventBus, nodeViewEventBus } from '@/event-bus';
-import { mapStores } from 'pinia';
-import { useSettingsStore } from '@/stores/settings';
-import { useUIStore } from '@/stores/ui';
-import { useUsersStore } from '@/stores/users';
-import { useWorkflowsStore } from '@/stores/workflows';
-import { useWorkflowsEEStore } from '@/stores/workflows.ee';
+import { useMessage } from '@/composables/useMessage';
+import { useToast } from '@/composables/useToast';
+import { nodeViewEventBus } from '@/event-bus';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useUIStore } from '@/stores/ui.store';
+import { useUsersStore } from '@/stores/users.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useWorkflowsEEStore } from '@/stores/workflows.ee.store';
 import type { ITelemetryTrackProperties } from 'n8n-workflow';
-import { useUsageStore } from '@/stores/usage';
+import { useUsageStore } from '@/stores/usage.store';
 import type { BaseTextKey } from '@/plugins/i18n';
 import { isNavigationFailure } from 'vue-router';
 
-export default mixins(showMessage).extend({
-	name: 'workflow-share-modal',
+export default defineComponent({
+	name: 'WorkflowShareModal',
 	components: {
 		Modal,
 	},
@@ -159,6 +163,12 @@ export default mixins(showMessage).extend({
 			default: () => ({}),
 		},
 	},
+	setup() {
+		return {
+			...useToast(),
+			...useMessage(),
+		};
+	},
 	data() {
 		const workflowsStore = useWorkflowsStore();
 		const workflow =
@@ -189,11 +199,6 @@ export default mixins(showMessage).extend({
 		isSharingEnabled(): boolean {
 			return this.settingsStore.isEnterpriseFeatureEnabled(EnterpriseEditionFeature.Sharing);
 		},
-		fallbackLinkUrl(): string {
-			return `${this.$locale.baseText(
-				this.uiStore.contextBasedTranslationKeys.upgradeLinkUrl as BaseTextKey,
-			)}${true ? '&utm_campaign=upgrade-workflow-sharing' : ''}`;
-		},
 		modalTitle(): string {
 			return this.$locale.baseText(
 				this.isSharingEnabled
@@ -207,21 +212,19 @@ export default mixins(showMessage).extend({
 		},
 		usersList(): IUser[] {
 			return this.usersStore.allUsers.filter((user: IUser) => {
-				const isCurrentUser = user.id === this.usersStore.currentUser?.id;
 				const isAlreadySharedWithUser = (this.sharedWith || []).find(
 					(sharee) => sharee.id === user.id,
 				);
+				const isOwner = this.workflow?.ownedBy?.id === user.id;
 
-				return !isCurrentUser && !isAlreadySharedWithUser;
+				return !isAlreadySharedWithUser && !isOwner;
 			});
 		},
 		sharedWithList(): Array<Partial<IUser>> {
 			return (
 				[
 					{
-						...(this.workflow && this.workflow.ownedBy
-							? this.workflow.ownedBy
-							: this.usersStore.currentUser),
+						...(this.workflow?.ownedBy ? this.workflow.ownedBy : this.usersStore.currentUser),
 						isOwner: true,
 					},
 				] as Array<Partial<IUser>>
@@ -252,6 +255,16 @@ export default mixins(showMessage).extend({
 			);
 		},
 	},
+	watch: {
+		workflow(workflow) {
+			if (workflow.sharedWith) {
+				this.sharedWith = workflow.sharedWith;
+			}
+		},
+	},
+	mounted() {
+		void this.initialize();
+	},
 	methods: {
 		async onSave() {
 			if (this.loading) {
@@ -260,8 +273,8 @@ export default mixins(showMessage).extend({
 
 			this.loading = true;
 
-			const saveWorkflowPromise = () => {
-				return new Promise<string>((resolve) => {
+			const saveWorkflowPromise = async () => {
+				return await new Promise<string>((resolve) => {
 					if (this.workflow.id === PLACEHOLDER_EMPTY_WORKFLOW_ID) {
 						nodeViewEventBus.emit('saveWorkflow', () => {
 							resolve(this.workflow.id);
@@ -293,12 +306,12 @@ export default mixins(showMessage).extend({
 					sharees_removed: shareesRemoved.length,
 				});
 
-				this.$showMessage({
+				this.showMessage({
 					title: this.$locale.baseText('workflows.shareModal.onSave.success.title'),
 					type: 'success',
 				});
 			} catch (error) {
-				this.$showError(error, this.$locale.baseText('workflows.shareModal.onSave.error.title'));
+				this.showError(error, this.$locale.baseText('workflows.shareModal.onSave.error.title'));
 			} finally {
 				this.modalBus.emit('close');
 				this.loading = false;
@@ -355,8 +368,8 @@ export default mixins(showMessage).extend({
 								(workflowSharee) => workflowSharee.id === sharee.id,
 							);
 						}) &&
-						!this.workflow.sharedWith!.find(
-							(workflowSharee) => workflowSharee.id === credential.ownedBy!.id,
+						!this.workflow.sharedWith.find(
+							(workflowSharee) => workflowSharee.id === credential.ownedBy.id,
 						);
 				}
 
@@ -371,7 +384,7 @@ export default mixins(showMessage).extend({
 
 			let confirm = true;
 			if (!isNewSharee && isLastUserWithAccessToCredentials) {
-				confirm = await this.confirmMessage(
+				const confirmAction = await this.confirm(
 					this.$locale.baseText(
 						'workflows.shareModal.list.delete.confirm.lastUserWithAccessToCredentials.message',
 						{
@@ -381,10 +394,18 @@ export default mixins(showMessage).extend({
 					this.$locale.baseText('workflows.shareModal.list.delete.confirm.title', {
 						interpolate: { name: user.fullName as string },
 					}),
-					null,
-					this.$locale.baseText('workflows.shareModal.list.delete.confirm.confirmButtonText'),
-					this.$locale.baseText('workflows.shareModal.list.delete.confirm.cancelButtonText'),
+					{
+						confirmButtonText: this.$locale.baseText(
+							'workflows.shareModal.list.delete.confirm.confirmButtonText',
+						),
+						cancelButtonText: this.$locale.baseText(
+							'workflows.shareModal.list.delete.confirm.cancelButtonText',
+						),
+						dangerouslyUseHTMLString: true,
+					},
 				);
+
+				confirm = confirmAction === MODAL_CONFIRM;
 			}
 
 			if (confirm) {
@@ -400,20 +421,26 @@ export default mixins(showMessage).extend({
 		},
 		onRoleAction(user: IUser, action: string) {
 			if (action === 'remove') {
-				this.onRemoveSharee(user.id);
+				void this.onRemoveSharee(user.id);
 			}
 		},
 		async onCloseModal() {
 			if (this.isDirty) {
-				const shouldSave = await this.confirmMessage(
+				const shouldSave = await this.confirm(
 					this.$locale.baseText('workflows.shareModal.saveBeforeClose.message'),
 					this.$locale.baseText('workflows.shareModal.saveBeforeClose.title'),
-					'warning',
-					this.$locale.baseText('workflows.shareModal.saveBeforeClose.confirmButtonText'),
-					this.$locale.baseText('workflows.shareModal.saveBeforeClose.cancelButtonText'),
+					{
+						type: 'warning',
+						confirmButtonText: this.$locale.baseText(
+							'workflows.shareModal.saveBeforeClose.confirmButtonText',
+						),
+						cancelButtonText: this.$locale.baseText(
+							'workflows.shareModal.saveBeforeClose.cancelButtonText',
+						),
+					},
 				);
 
-				if (shouldSave) {
+				if (shouldSave === MODAL_CONFIRM) {
 					return await this.onSave();
 				}
 			}
@@ -440,7 +467,7 @@ export default mixins(showMessage).extend({
 			});
 		},
 		goToUpgrade() {
-			this.uiStore.goToUpgrade('workflow_sharing', 'upgrade-workflow-sharing');
+			void this.uiStore.goToUpgrade('workflow_sharing', 'upgrade-workflow-sharing');
 		},
 		async initialize() {
 			if (this.isSharingEnabled) {
@@ -457,22 +484,32 @@ export default mixins(showMessage).extend({
 			this.loading = false;
 		},
 	},
-	mounted() {
-		this.initialize();
-	},
-	watch: {
-		workflow(workflow) {
-			this.sharedWith = workflow.sharedWith;
-		},
-	},
 });
 </script>
 
 <style module lang="scss">
+.container {
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+}
+
 .container > * {
 	overflow-wrap: break-word;
 }
 
+.content {
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+	overflow-y: auto;
+}
+
+.usersList {
+	height: 100%;
+	overflow-y: auto;
+}
+
 .actionButtons {
 	display: flex;
 	justify-content: flex-end;
diff --git a/packages/editor-ui/src/components/WorkflowsListLayout.vue b/packages/editor-ui/src/components/WorkflowsListLayout.vue
new file mode 100644
index 0000000000000..62974b6e2ea31
--- /dev/null
+++ b/packages/editor-ui/src/components/WorkflowsListLayout.vue
@@ -0,0 +1,410 @@
+<template>
+	<PageViewLayout>
+		<div v-if="loading">
+			<n8n-loading :class="[$style['header-loading'], 'mb-l']" variant="custom" />
+			<n8n-loading :class="[$style['card-loading'], 'mb-2xs']" variant="custom" />
+			<n8n-loading :class="$style['card-loading']" variant="custom" />
+		</div>
+		<PageViewLayoutList v-else :overflow="type !== 'list'">
+			<template #header>
+				<div class="mb-xs">
+					<div :class="$style['filters-row']">
+						<n8n-input
+							ref="search"
+							v-model="filters.search"
+							:class="[$style['search'], 'mr-2xs']"
+							:placeholder="$locale.baseText(`${resourceKey}.search.placeholder`)"
+							size="medium"
+							clearable
+							data-test-id="resources-list-search"
+						>
+							<template #prefix>
+								<n8n-icon icon="search" />
+							</template>
+						</n8n-input>
+						<div :class="$style['sort-and-filter']">
+							<n8n-select v-model="sortBy" size="medium" data-test-id="resources-list-sort">
+								<n8n-option
+									v-for="sortOption in sortOptions"
+									:key="sortOption"
+									:value="sortOption"
+									:label="$locale.baseText(`${resourceKey}.sort.${sortOption}`)"
+								/>
+							</n8n-select>
+							<ResourceFiltersDropdown
+								v-if="showFiltersDropdown"
+								:keys="filterKeys"
+								:reset="resetFilters"
+								:value="filters"
+								@input="$emit('update:filters', $event)"
+								@update:filters-length="onUpdateFiltersLength"
+							>
+								<template #default="resourceFiltersSlotProps">
+									<slot name="filters" v-bind="resourceFiltersSlotProps" />
+								</template>
+							</ResourceFiltersDropdown>
+						</div>
+					</div>
+				</div>
+
+				<slot name="callout"></slot>
+
+				<div v-show="hasFilters" class="mt-xs">
+					<n8n-info-tip :bold="false">
+						{{ $locale.baseText(`${resourceKey}.filters.active`) }}
+						<n8n-link size="small" @click="resetFilters">
+							{{ $locale.baseText(`${resourceKey}.filters.active.reset`) }}
+						</n8n-link>
+					</n8n-info-tip>
+				</div>
+
+				<div class="pb-xs" />
+			</template>
+
+			<slot name="preamble" />
+
+			<div
+				v-if="filteredAndSortedSubviewResources.length > 0"
+				ref="listWrapperRef"
+				:class="$style.listWrapper"
+			>
+				<n8n-recycle-scroller
+					v-if="type === 'list'"
+					data-test-id="resources-list"
+					:class="[$style.list, 'list-style-none']"
+					:items="filteredAndSortedSubviewResources"
+					:item-size="typeProps.itemSize"
+					item-key="id"
+				>
+					<template #default="{ item, updateItemSize }">
+						<slot :data="item" :update-item-size="updateItemSize" />
+					</template>
+				</n8n-recycle-scroller>
+				<n8n-datatable
+					v-if="typeProps.columns"
+					data-test-id="resources-table"
+					:class="$style.datatable"
+					:columns="typeProps.columns"
+					:rows="filteredAndSortedSubviewResources"
+					:current-page="currentPage"
+					:rows-per-page="rowsPerPage"
+					@update:current-page="setCurrentPage"
+					@update:rows-per-page="setRowsPerPage"
+				>
+					<template #row="{ columns, row }">
+						<slot :data="row" :columns="columns" />
+					</template>
+				</n8n-datatable>
+			</div>
+
+			<n8n-text v-else color="text-base" size="medium" data-test-id="resources-list-empty">
+				{{ $locale.baseText(`${resourceKey}.noResults`) }}
+				<template v-if="shouldSwitchToAllSubview">
+					<span v-if="!filters.search">
+						({{ $locale.baseText(`${resourceKey}.noResults.switchToShared.preamble`) }}
+						<n8n-link @click="setOwnerSubview(false)">
+							{{ $locale.baseText(`${resourceKey}.noResults.switchToShared.link`) }} </n8n-link
+						>)
+					</span>
+
+					<span v-else>
+						({{ $locale.baseText(`${resourceKey}.noResults.withSearch.switchToShared.preamble`) }}
+						<n8n-link @click="setOwnerSubview(false)">
+							{{
+								$locale.baseText(`${resourceKey}.noResults.withSearch.switchToShared.link`)
+							}} </n8n-link
+						>)
+					</span>
+				</template>
+			</n8n-text>
+
+			<slot name="postamble" />
+		</PageViewLayoutList>
+	</PageViewLayout>
+</template>
+
+<script lang="ts">
+import type { IUser } from '@/Interface';
+import { mapStores } from 'pinia';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useUsersStore } from '@/stores/users.store';
+import PageViewLayout from '@/components/layouts/PageViewLayout.vue';
+import PageViewLayoutList from '@/components/layouts/PageViewLayoutList.vue';
+import ResourceFiltersDropdown from '@/components/forms/ResourceFiltersDropdown.vue';
+import type { N8nInput } from 'n8n-design-system';
+import type { PropType } from 'vue';
+
+type IResourceKeyType = 'credentials' | 'workflows';
+type SearchRef = InstanceType<typeof N8nInput>;
+
+export interface IResource {
+	id: string;
+	name: string;
+	updatedAt: string;
+	createdAt: string;
+	ownedBy?: Partial<IUser>;
+	sharedWith?: Array<Partial<IUser>>;
+}
+
+export default {
+	name: 'WorkflowsListLayout',
+	components: {
+		PageViewLayout,
+		PageViewLayoutList,
+		ResourceFiltersDropdown,
+	},
+	props: {
+		resourceKey: {
+			type: String,
+			default: '' as IResourceKeyType,
+		},
+		displayName: {
+			type: Function as PropType<(resource: IResource) => string>,
+			default: (resource: IResource) => resource.name,
+		},
+		resources: {
+			type: Array,
+			default: (): IResource[] => [],
+		},
+		disabled: {
+			type: Boolean,
+			default: false,
+		},
+		initialize: {
+			type: Function as PropType<() => Promise<void>>,
+			default: () => async () => {},
+		},
+		filters: {
+			type: Object,
+			default: (): IFilters => ({ search: '', ownedBy: '', sharedWith: '' }),
+		},
+		additionalFiltersHandler: {
+			type: Function,
+		},
+		showFiltersDropdown: {
+			type: Boolean,
+			default: true,
+		},
+		sortFns: {
+			type: Object as PropType<Record<string, (a: IResource, b: IResource) => number>>,
+			default: (): Record<string, (a: IResource, b: IResource) => number> => ({}),
+		},
+		sortOptions: {
+			type: Array as PropType<string[]>,
+			default: () => ['lastUpdated', 'lastCreated', 'nameAsc', 'nameDesc'],
+		},
+		type: {
+			type: String as PropType<'datatable' | 'list'>,
+			default: 'list',
+		},
+		typeProps: {
+			type: Object as PropType<{ itemSize: number } | { columns: DatatableColumn[] }>,
+			default: () => ({
+				itemSize: 0,
+			}),
+		},
+	},
+	data() {
+		return {
+			loading: true,
+			isOwnerSubview: false,
+			sortBy: this.sortOptions[0],
+			hasFilters: false,
+			currentPage: 1,
+			rowsPerPage: 10 as number | '*',
+			resettingFilters: false,
+			// EnterpriseEditionFeature,
+		};
+	},
+	computed: {
+		...mapStores(useSettingsStore, useUsersStore),
+		subviewResources(): IResource[] {
+			return this.resources as IResource[];
+		},
+		filterKeys(): string[] {
+			return Object.keys(this.filters);
+		},
+		filteredAndSortedSubviewResources(): IResource[] {
+			const filtered: IResource[] = this.subviewResources.filter((resource: IResource) => {
+				let matches = true;
+				if (this.filters.ownedBy) {
+					matches = matches && !!(resource.ownedBy && resource.ownedBy.id === this.filters.ownedBy);
+				}
+				if (this.filters.sharedWith) {
+					matches =
+						matches &&
+						!!resource.sharedWith?.find((sharee) => sharee.id === this.filters.sharedWith);
+				}
+				if (this.filters.search) {
+					const searchString = this.filters.search.toLowerCase();
+					matches = matches && this.displayName(resource).toLowerCase().includes(searchString);
+				}
+				if (this.additionalFiltersHandler) {
+					matches = this.additionalFiltersHandler(resource, this.filters, matches);
+				}
+				return matches;
+			});
+			return filtered.sort((a, b) => {
+				switch (this.sortBy) {
+					case 'lastUpdated':
+						return this.sortFns.lastUpdated
+							? this.sortFns.lastUpdated(a, b)
+							: new Date(b.updatedAt).valueOf() - new Date(a.updatedAt).valueOf();
+					case 'lastCreated':
+						return this.sortFns.lastCreated
+							? this.sortFns.lastCreated(a, b)
+							: new Date(b.createdAt).valueOf() - new Date(a.createdAt).valueOf();
+					case 'nameAsc':
+						return this.sortFns.nameAsc
+							? this.sortFns.nameAsc(a, b)
+							: this.displayName(a).trim().localeCompare(this.displayName(b).trim());
+					case 'nameDesc':
+						return this.sortFns.nameDesc
+							? this.sortFns.nameDesc(a, b)
+							: this.displayName(b).trim().localeCompare(this.displayName(a).trim());
+					default:
+						return this.sortFns[this.sortBy] ? this.sortFns[this.sortBy](a, b) : 0;
+				}
+			});
+		},
+		resourcesNotOwned(): IResource[] {
+			return (this.resources as IResource[]).filter((resource) => {
+				return resource.ownedBy && resource.ownedBy.id !== this.usersStore.currentUser?.id;
+			});
+		},
+		shouldSwitchToAllSubview(): boolean {
+			return !this.hasFilters && this.isOwnerSubview && this.resourcesNotOwned.length > 0;
+		},
+	},
+	watch: {
+		isOwnerSubview() {
+			this.sendSubviewTelemetry();
+		},
+		'filters.ownedBy'(value) {
+			if (value) {
+				this.setOwnerSubview(false);
+			}
+			this.sendFiltersTelemetry('ownedBy');
+		},
+		'filters.sharedWith'() {
+			this.sendFiltersTelemetry('sharedWith');
+		},
+		'filters.search'() {
+			this.callDebounced('sendFiltersTelemetry', { debounceTime: 1000, trailing: true }, 'search');
+		},
+		sortBy(newValue) {
+			this.$emit('sort', newValue);
+			this.sendSortingTelemetry();
+		},
+	},
+	mounted() {
+		this.onMounted();
+	},
+	methods: {
+		async onMounted() {
+			await this.initialize();
+			this.loading = false;
+			this.$nextTick(this.focusSearchInput);
+		},
+		setCurrentPage(page: number) {
+			this.currentPage = page;
+		},
+		setRowsPerPage(rowsPerPage: number | '*') {
+			this.rowsPerPage = rowsPerPage;
+		},
+		resetFilters() {
+			Object.keys(this.filters).forEach((key) => {
+				this.filters[key] = Array.isArray(this.filters[key]) ? [] : '';
+			});
+			this.resettingFilters = true;
+			this.sendFiltersTelemetry('reset');
+		},
+		focusSearchInput() {
+			if (this.$refs.search) {
+				(this.$refs.search as SearchRef).focus();
+			}
+		},
+		setOwnerSubview(active: boolean) {
+			this.isOwnerSubview = active;
+		},
+		getTelemetrySubview(): string {
+			return this.$locale.baseText(
+				`${this.resourceKey as IResourceKeyType}.menu.${this.isOwnerSubview ? 'my' : 'all'}`,
+			);
+		},
+		sendSubviewTelemetry() {
+			this.$telemetry.track(`User changed ${this.resourceKey} sub view`, {
+				sub_view: this.getTelemetrySubview(),
+			});
+		},
+		sendSortingTelemetry() {
+			this.$telemetry.track(`User changed sorting in ${this.resourceKey} list`, {
+				sub_view: this.getTelemetrySubview(),
+				sorting: this.sortBy,
+			});
+		},
+		sendFiltersTelemetry(source: string) {
+			// Prevent sending multiple telemetry events when resetting filters
+			// Timeout is required to wait for search debounce to be over
+			if (this.resettingFilters) {
+				if (source !== 'reset') {
+					return;
+				}
+				setTimeout(() => (this.resettingFilters = false), 1500);
+			}
+			const filters = this.filters as Record<string, string[] | string | boolean>;
+			const filtersSet: string[] = [];
+			const filterValues: Array<string[] | string | boolean | null> = [];
+			Object.keys(filters).forEach((key) => {
+				if (filters[key]) {
+					filtersSet.push(key);
+					filterValues.push(key === 'search' ? null : filters[key]);
+				}
+			});
+			this.$telemetry.track(`User set filters in ${this.resourceKey} list`, {
+				filters_set: filtersSet,
+				filter_values: filterValues,
+				sub_view: this.getTelemetrySubview(),
+				[`${this.resourceKey}_total_in_view`]: this.subviewResources.length,
+				[`${this.resourceKey}_after_filtering`]: this.filteredAndSortedSubviewResources.length,
+			});
+		},
+		onUpdateFiltersLength(length: number) {
+			this.hasFilters = length > 0;
+		},
+	},
+};
+</script>
+
+<style lang="scss" module>
+.heading-wrapper {
+	padding-bottom: 1px; // Match input height
+}
+.filters-row {
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+	justify-content: space-between;
+}
+.search {
+	max-width: 240px;
+}
+.listWrapper {
+	height: 100%;
+}
+.sort-and-filter {
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+	justify-content: space-between;
+}
+.header-loading {
+	height: 36px;
+}
+.card-loading {
+	height: 69px;
+}
+.datatable {
+	padding-bottom: var(--spacing-s);
+}
+</style>
diff --git a/packages/editor-ui/src/components/__tests__/BannersStack.test.ts b/packages/editor-ui/src/components/__tests__/BannersStack.test.ts
new file mode 100644
index 0000000000000..dc4df6bc6eb6a
--- /dev/null
+++ b/packages/editor-ui/src/components/__tests__/BannersStack.test.ts
@@ -0,0 +1,155 @@
+import { merge } from 'lodash-es';
+import userEvent from '@testing-library/user-event';
+
+import { SETTINGS_STORE_DEFAULT_STATE } from '@/__tests__/utils';
+import { ROLE, STORES } from '@/constants';
+
+import { createTestingPinia } from '@pinia/testing';
+import BannerStack from '@/components/banners/BannerStack.vue';
+import type { RenderOptions } from '@/__tests__/render';
+import { createComponentRenderer } from '@/__tests__/render';
+import { waitFor } from '@testing-library/vue';
+import { useUIStore } from '@/stores/ui.store';
+import { useUsersStore } from '@/stores/users.store';
+
+let uiStore: ReturnType<typeof useUIStore>;
+
+const initialState = {
+	[STORES.SETTINGS]: {
+		settings: merge({}, SETTINGS_STORE_DEFAULT_STATE.settings),
+	},
+	[STORES.UI]: {
+		bannerStack: ['TRIAL_OVER', 'V1', 'NON_PRODUCTION_LICENSE', 'EMAIL_CONFIRMATION'],
+	},
+	[STORES.USERS]: {
+		currentUserId: 'aaa-bbb',
+		users: {
+			'aaa-bbb': {
+				id: 'aaa-bbb',
+				role: ROLE.Owner,
+			},
+			'bbb-bbb': {
+				id: 'bbb-bbb',
+				role: ROLE.Member,
+			},
+		},
+	},
+};
+
+const defaultRenderOptions: RenderOptions = {
+	pinia: createTestingPinia({ initialState }),
+};
+
+const renderComponent = createComponentRenderer(BannerStack, defaultRenderOptions);
+
+describe('BannerStack', () => {
+	beforeEach(() => {
+		uiStore = useUIStore();
+	});
+
+	afterEach(() => {
+		vi.clearAllMocks();
+	});
+
+	it('should render banner with the highest priority', async () => {
+		const { getByTestId, queryByTestId } = renderComponent();
+
+		const bannerStack = getByTestId('banner-stack');
+		expect(bannerStack).toBeInTheDocument();
+		// Only V1 banner should be visible
+		expect(getByTestId('banners-V1')).toBeInTheDocument();
+		expect(queryByTestId('banners-TRIAL_OVER')).not.toBeInTheDocument();
+	});
+
+	it('should dismiss banner on click', async () => {
+		const { getByTestId } = renderComponent();
+		const dismissBannerSpy = vi
+			.spyOn(uiStore, 'dismissBanner')
+			.mockImplementation(async (banner, mode) => {});
+		expect(getByTestId('banners-V1')).toBeInTheDocument();
+		const closeTrialBannerButton = getByTestId('banner-V1-close');
+		expect(closeTrialBannerButton).toBeInTheDocument();
+		await userEvent.click(closeTrialBannerButton);
+		expect(dismissBannerSpy).toHaveBeenCalledWith('V1');
+	});
+
+	it('should permanently dismiss banner on click', async () => {
+		const { getByTestId } = renderComponent();
+		const dismissBannerSpy = vi
+			.spyOn(uiStore, 'dismissBanner')
+			.mockImplementation(async (banner, mode) => {});
+
+		const permanentlyDismissBannerLink = getByTestId('banner-confirm-v1');
+		expect(permanentlyDismissBannerLink).toBeInTheDocument();
+		await userEvent.click(permanentlyDismissBannerLink);
+		expect(dismissBannerSpy).toHaveBeenCalledWith('V1', 'permanent');
+	});
+
+	it('should not render permanent dismiss link if user is not owner', async () => {
+		const { queryByTestId } = renderComponent({
+			pinia: createTestingPinia({
+				initialState: merge(initialState, {
+					[STORES.USERS]: {
+						currentUserId: 'bbb-bbb',
+					},
+				}),
+			}),
+		});
+		expect(queryByTestId('banner-confirm-v1')).not.toBeInTheDocument();
+	});
+
+	it('should send email confirmation request from the banner', async () => {
+		const { getByTestId, getByText } = renderComponent({
+			pinia: createTestingPinia({
+				initialState: {
+					...initialState,
+					[STORES.UI]: {
+						bannerStack: ['EMAIL_CONFIRMATION'],
+					},
+				},
+			}),
+		});
+		const confirmEmailSpy = vi.spyOn(useUsersStore(), 'confirmEmail');
+		getByTestId('confirm-email-button').click();
+		await waitFor(() => expect(confirmEmailSpy).toHaveBeenCalled());
+		await waitFor(() => {
+			expect(getByText('Confirmation email sent')).toBeInTheDocument();
+		});
+	});
+
+	it('should show error message if email confirmation fails', async () => {
+		const ERROR_MESSAGE = 'Something went wrong';
+		const { getByTestId, getByText } = renderComponent({
+			pinia: createTestingPinia({
+				initialState: {
+					...initialState,
+					[STORES.UI]: {
+						bannerStack: ['EMAIL_CONFIRMATION'],
+					},
+				},
+			}),
+		});
+		const confirmEmailSpy = vi.spyOn(useUsersStore(), 'confirmEmail').mockImplementation(() => {
+			throw new Error(ERROR_MESSAGE);
+		});
+		getByTestId('confirm-email-button').click();
+		await waitFor(() => expect(confirmEmailSpy).toHaveBeenCalled());
+		await waitFor(() => {
+			expect(getByText(ERROR_MESSAGE)).toBeInTheDocument();
+		});
+	});
+
+	it('should render empty banner stack when there are no banners to display', async () => {
+		const { queryByTestId } = renderComponent({
+			pinia: createTestingPinia({
+				initialState: {
+					...initialState,
+					[STORES.UI]: {
+						bannerStack: [],
+					},
+				},
+			}),
+		});
+		expect(queryByTestId('banner-stack')).toBeEmptyDOMElement();
+	});
+});
diff --git a/packages/editor-ui/src/components/__tests__/ChatEmbedModal.test.ts b/packages/editor-ui/src/components/__tests__/ChatEmbedModal.test.ts
new file mode 100644
index 0000000000000..c2b0466910ba5
--- /dev/null
+++ b/packages/editor-ui/src/components/__tests__/ChatEmbedModal.test.ts
@@ -0,0 +1,45 @@
+import ChatEmbedModal from '@/components/ChatEmbedModal.vue';
+import { createTestingPinia } from '@pinia/testing';
+import { CHAT_EMBED_MODAL_KEY, STORES, WEBHOOK_NODE_TYPE } from '@/constants';
+import { createComponentRenderer } from '@/__tests__/render';
+import { waitFor } from '@testing-library/vue';
+
+const renderComponent = createComponentRenderer(ChatEmbedModal, {
+	props: {
+		teleported: false,
+		appendToBody: false,
+	},
+	pinia: createTestingPinia({
+		initialState: {
+			[STORES.UI]: {
+				modals: {
+					[CHAT_EMBED_MODAL_KEY]: { open: true },
+				},
+			},
+			[STORES.WORKFLOWS]: {
+				workflow: {
+					nodes: [{ type: WEBHOOK_NODE_TYPE }],
+				},
+			},
+		},
+	}),
+});
+
+describe('ChatEmbedModal', () => {
+	it('should render correctly', async () => {
+		const wrapper = renderComponent();
+
+		await waitFor(() =>
+			expect(wrapper.container.querySelector('.modal-content')).toBeInTheDocument(),
+		);
+
+		const tabs = wrapper.container.querySelectorAll('.n8n-tabs .tab');
+		const activeTab = wrapper.container.querySelector('.n8n-tabs .tab.activeTab');
+		const editor = wrapper.container.querySelector('.cm-editor');
+
+		expect(tabs).toHaveLength(4);
+		expect(activeTab).toBeVisible();
+		expect(activeTab).toHaveTextContent('CDN Embed');
+		expect(editor).toBeVisible();
+	});
+});
diff --git a/packages/editor-ui/src/components/__tests__/CollaborationPane.test.ts b/packages/editor-ui/src/components/__tests__/CollaborationPane.test.ts
new file mode 100644
index 0000000000000..793bce590d09d
--- /dev/null
+++ b/packages/editor-ui/src/components/__tests__/CollaborationPane.test.ts
@@ -0,0 +1,117 @@
+import { merge } from 'lodash-es';
+import { SETTINGS_STORE_DEFAULT_STATE, waitAllPromises } from '@/__tests__/utils';
+import { ROLE, STORES } from '@/constants';
+import { createTestingPinia } from '@pinia/testing';
+import { useUIStore } from '@/stores/ui.store';
+import CollaborationPane from '@/components//MainHeader/CollaborationPane.vue';
+import type { RenderOptions } from '@/__tests__/render';
+import { createComponentRenderer } from '@/__tests__/render';
+
+const OWNER_USER = {
+	createdAt: '2023-11-22T10:17:12.246Z',
+	id: 'aaaaaa',
+	email: 'owner@user.com',
+	firstName: 'Owner',
+	lastName: 'User',
+	role: ROLE.Owner,
+	disabled: false,
+	isPending: false,
+	fullName: 'Owner User',
+};
+
+const MEMBER_USER = {
+	createdAt: '2023-11-22T10:17:12.246Z',
+	id: 'aaabbb',
+	email: 'member@user.com',
+	firstName: 'Member',
+	lastName: 'User',
+	role: ROLE.Member,
+	disabled: false,
+	isPending: false,
+	fullName: 'Member User',
+};
+
+const MEMBER_USER_2 = {
+	createdAt: '2023-11-22T10:17:12.246Z',
+	id: 'aaaccc',
+	email: 'member2@user.com',
+	firstName: 'Another Member',
+	lastName: 'User',
+	role: ROLE.Member,
+	disabled: false,
+	isPending: false,
+	fullName: 'Another Member User',
+};
+
+let uiStore: ReturnType<typeof useUIStore>;
+
+const initialState = {
+	[STORES.SETTINGS]: {
+		settings: merge({}, SETTINGS_STORE_DEFAULT_STATE.settings),
+	},
+	[STORES.WORKFLOWS]: {
+		workflow: {
+			id: 'w1',
+		},
+	},
+	[STORES.USERS]: {
+		currentUserId: 'aaaaaa',
+		users: {
+			aaaaaa: OWNER_USER,
+			aaabbb: MEMBER_USER,
+			aaaccc: MEMBER_USER_2,
+		},
+	},
+	[STORES.COLLABORATION]: {
+		usersForWorkflows: {
+			w1: [
+				{ lastSeen: '2023-11-22T10:17:12.246Z', user: MEMBER_USER },
+				{ lastSeen: '2023-11-22T10:17:12.246Z', user: OWNER_USER },
+			],
+			w2: [{ lastSeen: '2023-11-22T10:17:12.246Z', user: MEMBER_USER_2 }],
+		},
+	},
+};
+
+const defaultRenderOptions: RenderOptions = {
+	pinia: createTestingPinia({ initialState }),
+};
+
+const renderComponent = createComponentRenderer(CollaborationPane, defaultRenderOptions);
+
+describe('CollaborationPane', () => {
+	beforeEach(() => {
+		uiStore = useUIStore();
+	});
+
+	afterEach(() => {
+		vi.clearAllMocks();
+	});
+
+	it('should show only current workflow users', async () => {
+		const { getByTestId, queryByTestId } = renderComponent();
+		await waitAllPromises();
+
+		expect(getByTestId('collaboration-pane')).toBeInTheDocument();
+		expect(getByTestId('user-stack-avatars')).toBeInTheDocument();
+		expect(getByTestId(`user-stack-avatar-${OWNER_USER.id}`)).toBeInTheDocument();
+		expect(getByTestId(`user-stack-avatar-${MEMBER_USER.id}`)).toBeInTheDocument();
+		expect(queryByTestId(`user-stack-avatar-${MEMBER_USER_2.id}`)).toBeNull();
+	});
+
+	it('should render current user correctly', async () => {
+		const { getByText, queryByText } = renderComponent();
+		await waitAllPromises();
+		expect(getByText(`${OWNER_USER.fullName} (you)`)).toBeInTheDocument();
+		expect(queryByText(`${MEMBER_USER.fullName} (you)`)).toBeNull();
+		expect(queryByText(`${MEMBER_USER.fullName}`)).toBeInTheDocument();
+	});
+
+	it('should always render owner first in the list', async () => {
+		const { getByTestId } = renderComponent();
+		await waitAllPromises();
+		const firstAvatar = getByTestId('user-stack-avatars').querySelector('.n8n-avatar');
+		// Owner is second in the store bur shourld be rendered first
+		expect(firstAvatar).toHaveAttribute('data-test-id', `user-stack-avatar-${OWNER_USER.id}`);
+	});
+});
diff --git a/packages/editor-ui/src/components/__tests__/CollectionParameter.test.ts b/packages/editor-ui/src/components/__tests__/CollectionParameter.test.ts
new file mode 100644
index 0000000000000..8f1c0b0af2d14
--- /dev/null
+++ b/packages/editor-ui/src/components/__tests__/CollectionParameter.test.ts
@@ -0,0 +1,49 @@
+import { createComponentRenderer } from '@/__tests__/render';
+import { createTestingPinia } from '@pinia/testing';
+import CollectionParameter from '../CollectionParameter.vue';
+
+const renderComponent = createComponentRenderer(CollectionParameter, {
+	pinia: createTestingPinia(),
+});
+
+describe('CollectionParameter', () => {
+	afterEach(() => {
+		vi.clearAllMocks();
+	});
+
+	it('should render collection options correctly', async () => {
+		const { getAllByTestId } = renderComponent({
+			props: {
+				path: 'parameters.additionalFields',
+				parameter: {
+					displayName: 'Additional Fields',
+					name: 'additionalFields',
+					type: 'collection',
+					options: [
+						{
+							displayName: 'Currency',
+							name: 'currency',
+							type: 'string',
+							default: 'USD',
+						},
+						{
+							displayName: 'Value',
+							name: 'value',
+							type: 'number',
+						},
+					],
+				},
+				nodeValues: {
+					parameters: {
+						additionalFields: {},
+					},
+				},
+			},
+		});
+
+		const options = getAllByTestId('collection-parameter-option');
+		expect(options.length).toBe(2);
+		expect(options.at(0)).toHaveTextContent('Currency');
+		expect(options.at(1)).toHaveTextContent('Value');
+	});
+});
diff --git a/packages/editor-ui/src/components/__tests__/CommunityPackageInstallModal.spec.ts b/packages/editor-ui/src/components/__tests__/CommunityPackageInstallModal.spec.ts
new file mode 100644
index 0000000000000..4e21495287efe
--- /dev/null
+++ b/packages/editor-ui/src/components/__tests__/CommunityPackageInstallModal.spec.ts
@@ -0,0 +1,55 @@
+import { createComponentRenderer } from '@/__tests__/render';
+import CommunityPackageInstallModal from '../CommunityPackageInstallModal.vue';
+import { createTestingPinia } from '@pinia/testing';
+import { COMMUNITY_PACKAGE_INSTALL_MODAL_KEY, STORES } from '@/constants';
+import userEvent from '@testing-library/user-event';
+import { retry } from '@/__tests__/utils';
+
+const renderComponent = createComponentRenderer(CommunityPackageInstallModal, {
+	props: {
+		appendToBody: false,
+	},
+	data() {
+		return {
+			packageName: 'n8n-nodes-hello',
+		};
+	},
+	pinia: createTestingPinia({
+		initialState: {
+			[STORES.UI]: {
+				modals: {
+					[COMMUNITY_PACKAGE_INSTALL_MODAL_KEY]: { open: true },
+				},
+			},
+			[STORES.SETTINGS]: {
+				settings: {
+					templates: {
+						host: '',
+					},
+				},
+			},
+		},
+	}),
+});
+
+describe('CommunityPackageInstallModal', () => {
+	it('should disable install button until user agrees', async () => {
+		const wrapper = renderComponent();
+
+		await retry(() =>
+			expect(wrapper.container.querySelector('.modal-content')).toBeInTheDocument(),
+		);
+
+		const installButton = wrapper.getByTestId('install-community-package-button');
+
+		expect(installButton).toBeDisabled();
+
+		await userEvent.click(wrapper.getByTestId('user-agreement-checkbox'));
+
+		expect(installButton).toBeEnabled();
+
+		await userEvent.click(wrapper.getByTestId('user-agreement-checkbox'));
+
+		expect(installButton).toBeDisabled();
+	});
+});
diff --git a/packages/editor-ui/src/components/__tests__/CopyInput.test.ts b/packages/editor-ui/src/components/__tests__/CopyInput.test.ts
new file mode 100644
index 0000000000000..31a44fd8f459c
--- /dev/null
+++ b/packages/editor-ui/src/components/__tests__/CopyInput.test.ts
@@ -0,0 +1,47 @@
+import { merge } from 'lodash-es';
+
+import { SETTINGS_STORE_DEFAULT_STATE } from '@/__tests__/utils';
+import { STORES } from '@/constants';
+
+import { createTestingPinia } from '@pinia/testing';
+import CopyInput from '@/components/CopyInput.vue';
+import { createComponentRenderer } from '@/__tests__/render';
+
+const DEFAULT_SETUP = {
+	pinia: createTestingPinia({
+		initialState: {
+			[STORES.SETTINGS]: {
+				settings: merge({}, SETTINGS_STORE_DEFAULT_STATE.settings),
+			},
+		},
+	}),
+	props: {
+		copyButtonText: 'Click to copy',
+		label: 'Copy Input test',
+	},
+};
+
+const renderComponent = createComponentRenderer(CopyInput, DEFAULT_SETUP);
+
+describe('BannerStack', () => {
+	afterEach(() => {
+		vi.clearAllMocks();
+	});
+
+	it('should render default configuration', async () => {
+		const { getByTestId } = renderComponent();
+		expect(getByTestId('input-label')).toHaveTextContent('Copy Input test');
+		expect(getByTestId('copy-input')).toHaveTextContent('Click to copy');
+	});
+
+	it('should render redacted version', async () => {
+		const { container, getByTestId } = renderComponent(
+			merge(DEFAULT_SETUP, {
+				props: {
+					redactValue: true,
+				},
+			}),
+		);
+		expect(getByTestId('copy-input')).toHaveClass('ph-no-capture');
+	});
+});
diff --git a/packages/editor-ui/src/components/__tests__/CredentialIcon.test.ts b/packages/editor-ui/src/components/__tests__/CredentialIcon.test.ts
new file mode 100644
index 0000000000000..3ebf73f93d0a8
--- /dev/null
+++ b/packages/editor-ui/src/components/__tests__/CredentialIcon.test.ts
@@ -0,0 +1,73 @@
+import { createComponentRenderer } from '@/__tests__/render';
+import CredentialIcon from '@/components/CredentialIcon.vue';
+import { STORES } from '@/constants';
+import { createTestingPinia } from '@pinia/testing';
+import * as testNodeTypes from './testData/nodeTypesTestData';
+import merge from 'lodash-es/merge';
+import { groupNodeTypesByNameAndType } from '@/utils/nodeTypes/nodeTypeTransforms';
+
+const defaultState = {
+	[STORES.CREDENTIALS]: {},
+	[STORES.NODE_TYPES]: {},
+};
+
+const renderComponent = createComponentRenderer(CredentialIcon, {
+	pinia: createTestingPinia({
+		initialState: defaultState,
+	}),
+	global: {
+		stubs: ['n8n-tooltip'],
+	},
+});
+
+describe('CredentialIcon', () => {
+	const findIcon = (baseElement: Element) => baseElement.querySelector('img');
+
+	it('shows correct icon for credential type that is for the latest node type version', () => {
+		const { baseElement } = renderComponent({
+			pinia: createTestingPinia({
+				initialState: merge(defaultState, {
+					[STORES.CREDENTIALS]: {},
+					[STORES.NODE_TYPES]: {
+						nodeTypes: groupNodeTypesByNameAndType([
+							testNodeTypes.twitterV1,
+							testNodeTypes.twitterV2,
+						]),
+					},
+				}),
+			}),
+			props: {
+				credentialTypeName: 'twitterOAuth2Api',
+			},
+		});
+
+		expect(findIcon(baseElement)).toHaveAttribute(
+			'src',
+			'/icons/n8n-nodes-base/dist/nodes/Twitter/x.svg',
+		);
+	});
+
+	it('shows correct icon for credential type that is for an older node type version', () => {
+		const { baseElement } = renderComponent({
+			pinia: createTestingPinia({
+				initialState: merge(defaultState, {
+					[STORES.CREDENTIALS]: {},
+					[STORES.NODE_TYPES]: {
+						nodeTypes: groupNodeTypesByNameAndType([
+							testNodeTypes.twitterV1,
+							testNodeTypes.twitterV2,
+						]),
+					},
+				}),
+			}),
+			props: {
+				credentialTypeName: 'twitterOAuth1Api',
+			},
+		});
+
+		expect(findIcon(baseElement)).toHaveAttribute(
+			'src',
+			'/icons/n8n-nodes-base/dist/nodes/Twitter/x.svg',
+		);
+	});
+});
diff --git a/packages/editor-ui/src/components/__tests__/ExecutionFilter.test.ts b/packages/editor-ui/src/components/__tests__/ExecutionFilter.test.ts
deleted file mode 100644
index 80a3cace0bd42..0000000000000
--- a/packages/editor-ui/src/components/__tests__/ExecutionFilter.test.ts
+++ /dev/null
@@ -1,123 +0,0 @@
-import { describe, test, expect } from 'vitest';
-import Vue from 'vue';
-import { PiniaVuePlugin } from 'pinia';
-import { createTestingPinia } from '@pinia/testing';
-import type { RenderOptions } from '@testing-library/vue';
-import { render } from '@testing-library/vue';
-import userEvent from '@testing-library/user-event';
-import { faker } from '@faker-js/faker';
-import ExecutionFilter from '@/components/ExecutionFilter.vue';
-import { STORES } from '@/constants';
-import { i18nInstance } from '@/plugins/i18n';
-import type { IWorkflowShortResponse, ExecutionFilterType } from '@/Interface';
-
-Vue.use(PiniaVuePlugin);
-
-const defaultFilterState: ExecutionFilterType = {
-	status: 'all',
-	workflowId: 'all',
-	tags: [],
-	startDate: '',
-	endDate: '',
-	metadata: [{ key: '', value: '' }],
-};
-
-const workflowDataFactory = (): IWorkflowShortResponse => ({
-	createdAt: faker.date.past().toDateString(),
-	updatedAt: faker.date.past().toDateString(),
-	id: faker.datatype.uuid(),
-	name: faker.datatype.string(),
-	active: faker.datatype.boolean(),
-	tags: [],
-});
-
-const workflowsData = Array.from({ length: 10 }, workflowDataFactory);
-
-const initialState = {
-	[STORES.SETTINGS]: {
-		settings: {
-			templates: {
-				enabled: true,
-				host: 'https://api.n8n.io/api/',
-			},
-			license: {
-				environment: 'development',
-			},
-			deployment: {
-				type: 'default',
-			},
-			enterprise: {
-				advancedExecutionFilters: true,
-			},
-		},
-	},
-};
-
-const renderOptions: RenderOptions<ExecutionFilter> = {
-	i18n: i18nInstance,
-};
-
-describe('ExecutionFilter', () => {
-	test.each([
-		['development', 'default', false, workflowsData],
-		['development', 'default', true, workflowsData],
-		['development', 'cloud', false, undefined],
-		['development', 'cloud', true, undefined],
-		['production', 'cloud', false, workflowsData],
-		['production', 'cloud', true, undefined],
-		['production', 'default', false, undefined],
-		['production', 'default', true, workflowsData],
-	])(
-		'renders in %s environment on %s deployment with advancedExecutionFilters %s and workflows %s',
-		async (environment, deployment, advancedExecutionFilters, workflows) => {
-			initialState[STORES.SETTINGS].settings.license.environment = environment;
-			initialState[STORES.SETTINGS].settings.deployment.type = deployment;
-			initialState[STORES.SETTINGS].settings.enterprise.advancedExecutionFilters =
-				advancedExecutionFilters;
-
-			renderOptions.pinia = createTestingPinia({ initialState });
-			renderOptions.props = { workflows };
-
-			const { getByTestId, queryByTestId } = render(ExecutionFilter, renderOptions);
-
-			await userEvent.click(getByTestId('executions-filter-button'));
-			await userEvent.hover(getByTestId('execution-filter-saved-data-key-input'));
-
-			if (advancedExecutionFilters) {
-				expect(queryByTestId('executions-filter-view-plans-link')).not.toBeInTheDocument();
-			}
-
-			expect(queryByTestId('executions-filter-reset-button')).not.toBeInTheDocument();
-			expect(!!queryByTestId('executions-filter-workflows-select')).toBe(!!workflows?.length);
-		},
-	);
-
-	test('state change', async () => {
-		const { getByTestId, queryByTestId, emitted } = render(ExecutionFilter, renderOptions);
-
-		const filterChangedEvent = emitted().filterChanged;
-		expect(filterChangedEvent).toHaveLength(1);
-		expect(filterChangedEvent[0]).toEqual([defaultFilterState]);
-
-		expect(getByTestId('execution-filter-form')).not.toBeVisible();
-		expect(queryByTestId('executions-filter-reset-button')).not.toBeInTheDocument();
-		expect(queryByTestId('execution-filter-badge')).not.toBeInTheDocument();
-
-		await userEvent.click(getByTestId('executions-filter-button'));
-		expect(getByTestId('execution-filter-form')).toBeVisible();
-
-		await userEvent.click(getByTestId('executions-filter-status-select'));
-		await userEvent.click(getByTestId('executions-filter-status-select').querySelectorAll('li')[1]);
-
-		expect(emitted().filterChanged).toHaveLength(2);
-		expect(filterChangedEvent[1]).toEqual([{ ...defaultFilterState, status: 'error' }]);
-		expect(getByTestId('executions-filter-reset-button')).toBeInTheDocument();
-		expect(getByTestId('execution-filter-badge')).toBeInTheDocument();
-
-		await userEvent.click(getByTestId('executions-filter-reset-button'));
-		expect(emitted().filterChanged).toHaveLength(3);
-		expect(filterChangedEvent[2]).toEqual([defaultFilterState]);
-		expect(queryByTestId('executions-filter-reset-button')).not.toBeInTheDocument();
-		expect(queryByTestId('execution-filter-badge')).not.toBeInTheDocument();
-	});
-});
diff --git a/packages/editor-ui/src/components/__tests__/ExecutionsList.test.ts b/packages/editor-ui/src/components/__tests__/ExecutionsList.test.ts
deleted file mode 100644
index 9db7d4438e2ba..0000000000000
--- a/packages/editor-ui/src/components/__tests__/ExecutionsList.test.ts
+++ /dev/null
@@ -1,181 +0,0 @@
-import { vi, describe, it, expect } from 'vitest';
-import Vue, { defineComponent } from 'vue';
-import { PiniaVuePlugin } from 'pinia';
-import { createTestingPinia } from '@pinia/testing';
-import { render } from '@testing-library/vue';
-import userEvent from '@testing-library/user-event';
-import { faker } from '@faker-js/faker';
-import { STORES } from '@/constants';
-import ExecutionsList from '@/components/ExecutionsList.vue';
-import { externalHooks } from '@/mixins/externalHooks';
-import { genericHelpers } from '@/mixins/genericHelpers';
-import { executionHelpers } from '@/mixins/executionsHelpers';
-import { showMessage } from '@/mixins/showMessage';
-import { i18nInstance } from '@/plugins/i18n';
-import type { IWorkflowDb } from '@/Interface';
-import type { IExecutionsSummary } from 'n8n-workflow';
-import { waitAllPromises } from '@/__tests__/utils';
-import { useWorkflowsStore } from '@/stores';
-
-const workflowDataFactory = (): IWorkflowDb => ({
-	createdAt: faker.date.past().toDateString(),
-	updatedAt: faker.date.past().toDateString(),
-	id: faker.datatype.uuid(),
-	name: faker.datatype.string(),
-	active: faker.datatype.boolean(),
-	tags: [],
-	nodes: [],
-	connections: {},
-	versionId: faker.datatype.number().toString(),
-});
-
-const executionDataFactory = (): IExecutionsSummary => ({
-	id: faker.datatype.uuid(),
-	finished: faker.datatype.boolean(),
-	mode: faker.helpers.arrayElement(['manual', 'trigger']),
-	startedAt: faker.date.past(),
-	stoppedAt: faker.date.past(),
-	workflowId: faker.datatype.number().toString(),
-	workflowName: faker.datatype.string(),
-	status: faker.helpers.arrayElement(['failed', 'success']),
-	nodeExecutionStatus: {},
-});
-
-const workflowsData = Array.from({ length: 10 }, workflowDataFactory);
-
-const executionsData = Array.from({ length: 2 }, () => ({
-	count: 20,
-	results: Array.from({ length: 10 }, executionDataFactory),
-	estimated: false,
-}));
-
-const renderOptions = {
-	pinia: createTestingPinia({
-		initialState: {
-			[STORES.SETTINGS]: {
-				settings: {
-					templates: {
-						enabled: true,
-						host: 'https://api.n8n.io/api/',
-					},
-					license: {
-						environment: 'development',
-					},
-					deployment: {
-						type: 'default',
-					},
-					enterprise: {
-						advancedExecutionFilters: true,
-					},
-				},
-			},
-		},
-	}),
-	i18n: i18nInstance,
-	stubs: ['font-awesome-icon'],
-	mixins: [externalHooks, genericHelpers, executionHelpers, showMessage],
-};
-
-function TelemetryPlugin(vue: typeof Vue): void {
-	Object.defineProperty(vue, '$telemetry', {
-		get() {
-			return {
-				track: () => {},
-			};
-		},
-	});
-	Object.defineProperty(vue.prototype, '$telemetry', {
-		get() {
-			return {
-				track: () => {},
-			};
-		},
-	});
-}
-
-const renderComponent = async () => {
-	const renderResult = render(ExecutionsList, renderOptions);
-	await waitAllPromises();
-	return renderResult;
-};
-
-Vue.use(TelemetryPlugin);
-Vue.use(PiniaVuePlugin);
-
-describe('ExecutionsList.vue', () => {
-	const workflowsStore: ReturnType<typeof useWorkflowsStore> = useWorkflowsStore();
-	beforeEach(() => {
-		vi.spyOn(workflowsStore, 'fetchAllWorkflows').mockResolvedValue(workflowsData);
-		vi.spyOn(workflowsStore, 'getCurrentExecutions').mockResolvedValue([]);
-	});
-
-	afterEach(() => {
-		vi.clearAllMocks();
-	});
-
-	it('should render empty list', async () => {
-		vi.spyOn(workflowsStore, 'getPastExecutions').mockResolvedValueOnce({
-			count: 0,
-			results: [],
-			estimated: false,
-		});
-		const { queryAllByTestId, queryByTestId, getByTestId } = await renderComponent();
-		await userEvent.click(getByTestId('execution-auto-refresh-checkbox'));
-
-		expect(queryAllByTestId('select-execution-checkbox').length).toBe(0);
-		expect(queryByTestId('load-more-button')).not.toBeInTheDocument();
-		expect(queryByTestId('select-all-executions-checkbox')).not.toBeInTheDocument();
-		expect(getByTestId('execution-list-empty')).toBeInTheDocument();
-	});
-
-	it('should handle selection flow when loading more items', async () => {
-		const storeSpy = vi
-			.spyOn(workflowsStore, 'getPastExecutions')
-			.mockResolvedValueOnce(executionsData[0])
-			.mockResolvedValueOnce(executionsData[1]);
-
-		const { getByTestId, getAllByTestId, queryByTestId } = await renderComponent();
-		await userEvent.click(getByTestId('execution-auto-refresh-checkbox'));
-
-		await userEvent.click(getByTestId('select-visible-executions-checkbox'));
-
-		expect(storeSpy).toHaveBeenCalledTimes(1);
-		expect(
-			getAllByTestId('select-execution-checkbox').filter((el) =>
-				el.contains(el.querySelector(':checked')),
-			).length,
-		).toBe(10);
-		expect(getByTestId('select-all-executions-checkbox')).toBeInTheDocument();
-		expect(getByTestId('selected-executions-info').textContent).toContain(10);
-
-		await userEvent.click(getByTestId('load-more-button'));
-
-		expect(storeSpy).toHaveBeenCalledTimes(2);
-		expect(getAllByTestId('select-execution-checkbox').length).toBe(20);
-		expect(
-			getAllByTestId('select-execution-checkbox').filter((el) =>
-				el.contains(el.querySelector(':checked')),
-			).length,
-		).toBe(10);
-
-		await userEvent.click(getByTestId('select-all-executions-checkbox'));
-		expect(getAllByTestId('select-execution-checkbox').length).toBe(20);
-		expect(
-			getAllByTestId('select-execution-checkbox').filter((el) =>
-				el.contains(el.querySelector(':checked')),
-			).length,
-		).toBe(20);
-		expect(getByTestId('selected-executions-info').textContent).toContain(20);
-
-		await userEvent.click(getAllByTestId('select-execution-checkbox')[2]);
-		expect(getAllByTestId('select-execution-checkbox').length).toBe(20);
-		expect(
-			getAllByTestId('select-execution-checkbox').filter((el) =>
-				el.contains(el.querySelector(':checked')),
-			).length,
-		).toBe(19);
-		expect(getByTestId('selected-executions-info').textContent).toContain(19);
-		expect(getByTestId('select-visible-executions-checkbox')).toBeInTheDocument();
-		expect(queryByTestId('select-all-executions-checkbox')).not.toBeInTheDocument();
-	});
-});
diff --git a/packages/editor-ui/src/components/__tests__/ExpressionEditorModalInput.test.ts b/packages/editor-ui/src/components/__tests__/ExpressionEditorModalInput.test.ts
new file mode 100644
index 0000000000000..0aa1e7d0fe66a
--- /dev/null
+++ b/packages/editor-ui/src/components/__tests__/ExpressionEditorModalInput.test.ts
@@ -0,0 +1,33 @@
+import userEvent from '@testing-library/user-event';
+import { createComponentRenderer } from '@/__tests__/render';
+import ExpressionEditorModalInput from '@/components/ExpressionEditorModal/ExpressionEditorModalInput.vue';
+import { type TestingPinia, createTestingPinia } from '@pinia/testing';
+import { setActivePinia } from 'pinia';
+import { waitFor } from '@testing-library/vue';
+
+describe('ExpressionParameterInput', () => {
+	const renderComponent = createComponentRenderer(ExpressionEditorModalInput);
+	let pinia: TestingPinia;
+
+	beforeEach(() => {
+		pinia = createTestingPinia();
+		setActivePinia(pinia);
+	});
+
+	test.each([
+		['not be editable', 'readonly', true, ''],
+		['be editable', 'not readonly', false, 'test'],
+	])('should %s when %s', async (_, __, isReadOnly, expected) => {
+		const { getByRole } = renderComponent({
+			props: {
+				modelValue: '',
+				path: '',
+				isReadOnly,
+			},
+		});
+
+		const textbox = await waitFor(() => getByRole('textbox'));
+		await userEvent.type(textbox, 'test');
+		expect(getByRole('textbox')).toHaveTextContent(expected);
+	});
+});
diff --git a/packages/editor-ui/src/components/__tests__/ExpressionParameterInput.test.ts b/packages/editor-ui/src/components/__tests__/ExpressionParameterInput.test.ts
new file mode 100644
index 0000000000000..aaad6c9dc500a
--- /dev/null
+++ b/packages/editor-ui/src/components/__tests__/ExpressionParameterInput.test.ts
@@ -0,0 +1,66 @@
+import { createComponentRenderer } from '@/__tests__/render';
+import ExpressionParameterInput from '@/components/ExpressionParameterInput.vue';
+import { type TestingPinia, createTestingPinia } from '@pinia/testing';
+import userEvent from '@testing-library/user-event';
+import { setActivePinia } from 'pinia';
+
+describe('ExpressionParameterInput', () => {
+	const renderComponent = createComponentRenderer(ExpressionParameterInput);
+	let pinia: TestingPinia;
+
+	beforeEach(() => {
+		pinia = createTestingPinia();
+		setActivePinia(pinia);
+	});
+
+	test.each([
+		['not readonly', false, expect.anything()],
+		['readonly', true, expect.anything()],
+	])('should emit open expression editor modal when %s', async (_, isReadOnly, expected) => {
+		const { getByTestId, emitted } = renderComponent({
+			props: {
+				modelValue: '',
+				isReadOnly,
+			},
+		});
+
+		await userEvent.click(getByTestId('expander'));
+		expect(emitted()['modal-opener-click']).toEqual(expected);
+	});
+
+	test('it should only emit blur when input had focus', async () => {
+		const { getByTestId, emitted, baseElement } = renderComponent({
+			props: {
+				modelValue: '={{$json.foo}}',
+			},
+		});
+
+		// trigger click outside -> blur
+		await userEvent.click(baseElement);
+		expect(emitted('blur')).toBeUndefined();
+
+		// focus expression editor
+		await userEvent.click(
+			getByTestId('inline-expression-editor-input').querySelector('.cm-line') as Element,
+		);
+		// trigger click outside -> blur
+		await userEvent.click(baseElement);
+		expect(emitted('blur')).toHaveLength(1);
+	});
+
+	describe('in read-only mode', () => {
+		test('it should render a read-only expression input', async () => {
+			const { container } = renderComponent({
+				props: {
+					modelValue: '={{$json.foo}}',
+					isReadOnly: true,
+				},
+			});
+
+			const editor = container.querySelector('.cm-content') as HTMLDivElement;
+			expect(editor).toBeInTheDocument();
+			expect(editor.getAttribute('contenteditable')).toEqual('false');
+			expect(editor.getAttribute('aria-readonly')).toEqual('true');
+		});
+	});
+});
diff --git a/packages/editor-ui/src/components/__tests__/HtmlEditor.test.ts b/packages/editor-ui/src/components/__tests__/HtmlEditor.test.ts
new file mode 100644
index 0000000000000..7d5f80d4289ed
--- /dev/null
+++ b/packages/editor-ui/src/components/__tests__/HtmlEditor.test.ts
@@ -0,0 +1,76 @@
+import { SETTINGS_STORE_DEFAULT_STATE } from '@/__tests__/utils';
+import { STORES } from '@/constants';
+import { createTestingPinia } from '@pinia/testing';
+
+import { renderComponent } from '@/__tests__/render';
+import HtmlEditor from '@/components/HtmlEditor/HtmlEditor.vue';
+import { userEvent } from '@testing-library/user-event';
+import { waitFor } from '@testing-library/vue';
+import { setActivePinia } from 'pinia';
+import { htmlEditorEventBus } from '../../event-bus';
+
+const DEFAULT_SETUP = {
+	props: {
+		modelValue: '<html><ul><li>one</li><li>two</li></ul></html>',
+		isReadOnly: false,
+	},
+};
+
+describe('HtmlEditor.vue', () => {
+	const pinia = createTestingPinia({
+		initialState: {
+			[STORES.SETTINGS]: {
+				settings: SETTINGS_STORE_DEFAULT_STATE.settings,
+			},
+		},
+	});
+	setActivePinia(pinia);
+
+	afterAll(() => {
+		vi.clearAllMocks();
+	});
+
+	it('renders simple html', async () => {
+		const { getByRole } = renderComponent(HtmlEditor, {
+			...DEFAULT_SETUP,
+			props: DEFAULT_SETUP.props,
+		});
+
+		await waitFor(() =>
+			expect(getByRole('textbox')).toHaveTextContent('<ul><li>one</li><li>two</li></ul>'),
+		);
+	});
+
+	it('formats html (and style/script tags)', async () => {
+		const unformattedHtml =
+			'<!DOCTYPE html><html><head>  <meta charset="UTF-8" />  <title>My HTML document</title></head><body>  <div class="container">    <h1>This is an H1 heading</h1>    <h2>This is an H2 heading</h2>    <p>This is a paragraph</p>  </div> </body> <style>.container {  background-color: #ffffff;  text-align: center;}</style><script>console.log("Hello World!");</script></html>';
+		const { getByRole } = renderComponent(HtmlEditor, {
+			...DEFAULT_SETUP,
+			props: { ...DEFAULT_SETUP.props, modelValue: unformattedHtml },
+		});
+
+		let textbox = await waitFor(() => getByRole('textbox'));
+		expect(textbox.querySelectorAll('.cm-line').length).toBe(1);
+
+		htmlEditorEventBus.emit('format-html');
+		textbox = await waitFor(() => getByRole('textbox'));
+
+		await waitFor(() => expect(textbox.querySelectorAll('.cm-line').length).toBe(24));
+	});
+
+	it('emits update:model-value events', async () => {
+		const { emitted, getByRole } = renderComponent(HtmlEditor, {
+			...DEFAULT_SETUP,
+			props: DEFAULT_SETUP.props,
+		});
+
+		const textbox = await waitFor(() => getByRole('textbox'));
+		await userEvent.type(textbox, '<div>Content');
+
+		await waitFor(() =>
+			expect(emitted('update:model-value')).toEqual([
+				['<div>Content</div><html><ul><li>one</li><li>two</li></ul></html>'],
+			]),
+		);
+	});
+});
diff --git a/packages/editor-ui/src/components/__tests__/JsEditor.test.ts b/packages/editor-ui/src/components/__tests__/JsEditor.test.ts
new file mode 100644
index 0000000000000..f29ea4424ac1c
--- /dev/null
+++ b/packages/editor-ui/src/components/__tests__/JsEditor.test.ts
@@ -0,0 +1,19 @@
+import { createTestingPinia } from '@pinia/testing';
+import JsEditor from '@/components/JsEditor/JsEditor.vue';
+import { renderComponent } from '@/__tests__/render';
+
+describe('JsEditor', () => {
+	const renderEditor = (jsonString: string) =>
+		renderComponent(JsEditor, {
+			global: {
+				plugins: [createTestingPinia()],
+			},
+			props: { modelValue: jsonString },
+		});
+
+	it('renders simple js', async () => {
+		const modelValue = 'return [1, 2, 3]';
+		const result = renderEditor(modelValue);
+		expect(result.container.querySelector('.cm-content')?.textContent).toEqual(modelValue);
+	});
+});
diff --git a/packages/editor-ui/src/components/__tests__/JsonEditor.test.ts b/packages/editor-ui/src/components/__tests__/JsonEditor.test.ts
new file mode 100644
index 0000000000000..74f5e17be7312
--- /dev/null
+++ b/packages/editor-ui/src/components/__tests__/JsonEditor.test.ts
@@ -0,0 +1,30 @@
+import { createTestingPinia } from '@pinia/testing';
+import JsonEditor from '@/components/JsonEditor/JsonEditor.vue';
+import { renderComponent } from '@/__tests__/render';
+
+describe('JsonEditor', () => {
+	const renderEditor = (jsonString: string) =>
+		renderComponent(JsonEditor, {
+			global: {
+				plugins: [createTestingPinia()],
+			},
+			props: { modelValue: jsonString },
+		});
+
+	it('renders simple json', async () => {
+		const modelValue = '{ "testing": [true, 5] }';
+		const result = renderEditor(modelValue);
+		expect(result.container.querySelector('.cm-content')?.textContent).toEqual(modelValue);
+	});
+
+	it('renders multiline json', async () => {
+		const modelValue = '{\n\t"testing": [true, 5]\n}';
+		const result = renderEditor(modelValue);
+		const gutter = result.container.querySelector('.cm-gutters');
+		expect(gutter?.querySelectorAll('.cm-lineNumbers .cm-gutterElement').length).toEqual(4);
+
+		const content = result.container.querySelector('.cm-content');
+		const lines = [...content!.querySelectorAll('.cm-line').values()].map((l) => l.textContent);
+		expect(lines).toEqual(['{', '\t"testing": [true, 5]', '}']);
+	});
+});
diff --git a/packages/editor-ui/src/components/__tests__/MainSidebarSourceControl.test.ts b/packages/editor-ui/src/components/__tests__/MainSidebarSourceControl.test.ts
new file mode 100644
index 0000000000000..5c0423c33a6d1
--- /dev/null
+++ b/packages/editor-ui/src/components/__tests__/MainSidebarSourceControl.test.ts
@@ -0,0 +1,112 @@
+import { describe, it, expect, vi } from 'vitest';
+import { waitFor } from '@testing-library/vue';
+import userEvent from '@testing-library/user-event';
+import { createTestingPinia } from '@pinia/testing';
+import { merge } from 'lodash-es';
+import { SOURCE_CONTROL_PULL_MODAL_KEY, STORES } from '@/constants';
+import { SETTINGS_STORE_DEFAULT_STATE } from '@/__tests__/utils';
+import MainSidebarSourceControl from '@/components/MainSidebarSourceControl.vue';
+import { useSourceControlStore } from '@/stores/sourceControl.store';
+import { useUIStore } from '@/stores/ui.store';
+import { useRBACStore } from '@/stores/rbac.store';
+import { createComponentRenderer } from '@/__tests__/render';
+
+let pinia: ReturnType<typeof createTestingPinia>;
+let sourceControlStore: ReturnType<typeof useSourceControlStore>;
+let uiStore: ReturnType<typeof useUIStore>;
+let rbacStore: ReturnType<typeof useRBACStore>;
+
+const renderComponent = createComponentRenderer(MainSidebarSourceControl);
+
+describe('MainSidebarSourceControl', () => {
+	beforeEach(() => {
+		pinia = createTestingPinia({
+			initialState: {
+				[STORES.SETTINGS]: {
+					settings: merge({}, SETTINGS_STORE_DEFAULT_STATE.settings),
+				},
+			},
+		});
+
+		rbacStore = useRBACStore(pinia);
+		vi.spyOn(rbacStore, 'hasScope').mockReturnValue(true);
+
+		sourceControlStore = useSourceControlStore();
+		vi.spyOn(sourceControlStore, 'isEnterpriseSourceControlEnabled', 'get').mockReturnValue(true);
+
+		uiStore = useUIStore();
+	});
+
+	it('should render nothing when not instance owner', async () => {
+		vi.spyOn(rbacStore, 'hasScope').mockReturnValue(false);
+		const { container } = renderComponent({ pinia, props: { isCollapsed: false } });
+		expect(container).toBeEmptyDOMElement();
+	});
+
+	it('should render empty content when instance owner but not connected', async () => {
+		const { getByTestId } = renderComponent({ pinia, props: { isCollapsed: false } });
+		expect(getByTestId('main-sidebar-source-control')).toBeInTheDocument();
+		expect(getByTestId('main-sidebar-source-control')).toBeEmptyDOMElement();
+	});
+
+	describe('when connected', () => {
+		beforeEach(() => {
+			vi.spyOn(sourceControlStore, 'preferences', 'get').mockReturnValue({
+				branchName: 'main',
+				branches: [],
+				repositoryUrl: '',
+				branchReadOnly: false,
+				branchColor: '#5296D6',
+				connected: true,
+				publicKey: '',
+			});
+		});
+
+		it('should render the appropriate content', async () => {
+			const { getByTestId, queryByTestId } = renderComponent({
+				pinia,
+				props: { isCollapsed: false },
+			});
+			expect(getByTestId('main-sidebar-source-control-connected')).toBeInTheDocument();
+			expect(queryByTestId('main-sidebar-source-control-setup')).not.toBeInTheDocument();
+		});
+
+		it('should show toast error if pull response http status code is not 409', async () => {
+			vi.spyOn(sourceControlStore, 'pullWorkfolder').mockRejectedValueOnce({
+				response: { status: 400 },
+			});
+			const { getAllByRole, getByRole } = renderComponent({
+				pinia,
+				props: { isCollapsed: false },
+			});
+
+			await userEvent.click(getAllByRole('button')[0]);
+			await waitFor(() => expect(getByRole('alert')).toBeInTheDocument());
+		});
+
+		it('should show confirm if pull response http status code is 409', async () => {
+			const status = {};
+			vi.spyOn(sourceControlStore, 'pullWorkfolder').mockRejectedValueOnce({
+				response: { status: 409, data: { data: status } },
+			});
+			const openModalSpy = vi.spyOn(uiStore, 'openModalWithData');
+
+			const { getAllByRole, getByRole } = renderComponent({
+				pinia,
+				props: { isCollapsed: false },
+			});
+
+			await userEvent.click(getAllByRole('button')[0]);
+			await waitFor(() =>
+				expect(openModalSpy).toHaveBeenCalledWith(
+					expect.objectContaining({
+						name: SOURCE_CONTROL_PULL_MODAL_KEY,
+						data: expect.objectContaining({
+							status,
+						}),
+					}),
+				),
+			);
+		});
+	});
+});
diff --git a/packages/editor-ui/src/components/__tests__/NodeDetailsView.test.ts b/packages/editor-ui/src/components/__tests__/NodeDetailsView.test.ts
new file mode 100644
index 0000000000000..19381df410e10
--- /dev/null
+++ b/packages/editor-ui/src/components/__tests__/NodeDetailsView.test.ts
@@ -0,0 +1,87 @@
+import NodeDetailsView from '@/components/NodeDetailsView.vue';
+import { VIEWS } from '@/constants';
+import { createComponentRenderer } from '@/__tests__/render';
+import { waitFor } from '@testing-library/vue';
+import { uuid } from '@jsplumb/util';
+import type { INode } from 'n8n-workflow';
+import { createTestNode, createTestWorkflow } from '@/__tests__/mocks';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useUsersStore } from '@/stores/users.store';
+import { useNDVStore } from '@/stores/ndv.store';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { createPinia, setActivePinia } from 'pinia';
+import { defaultMockNodeTypesArray } from '@/__tests__/defaults';
+import { setupServer } from '@/__tests__/server';
+
+async function createPiniaWithActiveNode(node: INode) {
+	const workflowId = uuid();
+	const workflow = createTestWorkflow({
+		id: workflowId,
+		name: 'Test Workflow',
+		connections: {},
+		active: true,
+		nodes: [node],
+	});
+
+	const pinia = createPinia();
+	setActivePinia(pinia);
+
+	const workflowsStore = useWorkflowsStore();
+	const nodeTypesStore = useNodeTypesStore();
+	const ndvStore = useNDVStore();
+
+	nodeTypesStore.setNodeTypes(defaultMockNodeTypesArray);
+	workflowsStore.workflow = workflow;
+	ndvStore.activeNodeName = node.name;
+
+	await useSettingsStore().getSettings();
+	await useUsersStore().loginWithCookie();
+
+	return pinia;
+}
+
+const renderComponent = createComponentRenderer(NodeDetailsView, {
+	props: {
+		teleported: false,
+		appendToBody: false,
+	},
+	global: {
+		mocks: {
+			$route: {
+				name: VIEWS.WORKFLOW,
+			},
+		},
+	},
+});
+
+describe('NodeDetailsView', () => {
+	let server: ReturnType<typeof setupServer>;
+
+	beforeAll(() => {
+		server = setupServer();
+	});
+
+	afterEach(() => {
+		vi.clearAllMocks();
+	});
+
+	afterAll(() => {
+		server.shutdown();
+	});
+
+	it('should render correctly', async () => {
+		const wrapper = renderComponent({
+			pinia: await createPiniaWithActiveNode(
+				createTestNode({
+					name: 'Manual Trigger',
+					type: 'manualTrigger',
+				}),
+			),
+		});
+
+		await waitFor(() =>
+			expect(wrapper.container.querySelector('.ndv-wrapper')).toBeInTheDocument(),
+		);
+	});
+});
diff --git a/packages/editor-ui/src/components/__tests__/ParameterInput.test.ts b/packages/editor-ui/src/components/__tests__/ParameterInput.test.ts
new file mode 100644
index 0000000000000..02a131a70a456
--- /dev/null
+++ b/packages/editor-ui/src/components/__tests__/ParameterInput.test.ts
@@ -0,0 +1,163 @@
+import { renderComponent } from '@/__tests__/render';
+import ParameterInput from '@/components/ParameterInput.vue';
+import type { useNDVStore } from '@/stores/ndv.store';
+import type { CompletionResult } from '@codemirror/autocomplete';
+import { createTestingPinia } from '@pinia/testing';
+import { faker } from '@faker-js/faker';
+import { waitFor } from '@testing-library/vue';
+import userEvent from '@testing-library/user-event';
+import type { useNodeTypesStore } from '../../stores/nodeTypes.store';
+
+let mockNdvState: Partial<ReturnType<typeof useNDVStore>>;
+let mockNodeTypesState: Partial<ReturnType<typeof useNodeTypesStore>>;
+let mockCompletionResult: Partial<CompletionResult>;
+
+vi.mock('@/stores/ndv.store', () => {
+	return {
+		useNDVStore: vi.fn(() => mockNdvState),
+	};
+});
+
+vi.mock('@/stores/nodeTypes.store', () => {
+	return {
+		useNodeTypesStore: vi.fn(() => mockNodeTypesState),
+	};
+});
+
+vi.mock('@/plugins/codemirror/completions/datatype.completions', () => {
+	return {
+		datatypeCompletions: vi.fn(() => mockCompletionResult),
+	};
+});
+
+vi.mock('vue-router', () => {
+	const push = vi.fn();
+	return {
+		useRouter: () => ({
+			push,
+		}),
+		RouterLink: vi.fn(),
+	};
+});
+
+describe('ParameterInput.vue', () => {
+	beforeEach(() => {
+		mockNdvState = {
+			hasInputData: true,
+			activeNode: {
+				id: faker.string.uuid(),
+				name: faker.word.words(3),
+				parameters: {},
+				position: [faker.number.int(), faker.number.int()],
+				type: 'test',
+				typeVersion: 1,
+			},
+		};
+		mockNodeTypesState = {
+			allNodeTypes: [],
+		};
+	});
+
+	test('should render an options parameter (select)', async () => {
+		const { container, baseElement, emitted } = renderComponent(ParameterInput, {
+			pinia: createTestingPinia(),
+			props: {
+				path: 'operation',
+				parameter: {
+					displayName: 'Operation',
+					name: 'operation',
+					type: 'options',
+					noDataExpression: true,
+					displayOptions: { show: { resource: ['sheet'] } },
+					options: [
+						{
+							name: 'Append or Update Row',
+							value: 'appendOrUpdate',
+							description: 'Append a new row or update an existing one (upsert)',
+							action: 'Append or update row in sheet',
+						},
+						{
+							name: 'Append Row',
+							value: 'append',
+							description: 'Create a new row in a sheet',
+							action: 'Append row in sheet',
+						},
+					],
+					default: 'appendOrUpdate',
+				},
+				modelValue: 'appendOrUpdate',
+			},
+		});
+		const select = container.querySelector('input') as HTMLInputElement;
+		const selectTrigger = container.querySelector('.select-trigger') as HTMLElement;
+		expect(select).toBeInTheDocument();
+		expect(selectTrigger).toBeInTheDocument();
+		await waitFor(() => expect(select).toHaveValue('Append or Update Row'));
+
+		await userEvent.click(selectTrigger);
+
+		const options = baseElement.querySelectorAll('.list-option');
+		expect(options.length).toEqual(2);
+		expect(options[0].querySelector('.option-headline')).toHaveTextContent('Append or Update Row');
+		expect(options[0].querySelector('.option-description')).toHaveTextContent(
+			'Append a new row or update an existing one (upsert)',
+		);
+		expect(options[1].querySelector('.option-headline')).toHaveTextContent('Append Row');
+		expect(options[1].querySelector('.option-description')).toHaveTextContent(
+			'Create a new row in a sheet',
+		);
+
+		await userEvent.click(options[1]);
+
+		expect(emitted('update')).toContainEqual([expect.objectContaining({ value: 'append' })]);
+	});
+
+	test('should render a string parameter', async () => {
+		const { container, emitted } = renderComponent(ParameterInput, {
+			pinia: createTestingPinia(),
+			props: {
+				path: 'tag',
+				parameter: {
+					displayName: 'Tag',
+					name: 'tag',
+					type: 'string',
+				},
+				modelValue: '',
+			},
+		});
+		const input = container.querySelector('input') as HTMLInputElement;
+		expect(input).toBeInTheDocument();
+
+		await userEvent.type(input, 'foo');
+
+		expect(emitted('update')).toContainEqual([expect.objectContaining({ value: 'foo' })]);
+	});
+
+	test('should not reset the value of a multi-select with loadOptionsMethod on load', async () => {
+		mockNodeTypesState.getNodeParameterOptions = vi.fn(async () => [
+			{ name: 'ID', value: 'id' },
+			{ name: 'Title', value: 'title' },
+			{ name: 'Description', value: 'description' },
+		]);
+
+		const { emitted, container } = renderComponent(ParameterInput, {
+			pinia: createTestingPinia(),
+			props: {
+				path: 'columns',
+				parameter: {
+					displayName: 'Columns',
+					name: 'columns',
+					type: 'multiOptions',
+					typeOptions: { loadOptionsMethod: 'getColumnsMultiOptions' },
+				},
+				modelValue: ['id', 'title'],
+			},
+		});
+
+		const input = container.querySelector('input') as HTMLInputElement;
+		expect(input).toBeInTheDocument();
+
+		// Nothing should be emitted
+		expect(emitted('update')).toBeUndefined();
+	});
+});
diff --git a/packages/editor-ui/src/components/__tests__/PersonalizationModal.spec.ts b/packages/editor-ui/src/components/__tests__/PersonalizationModal.spec.ts
index 145426923275f..4af40df601c6f 100644
--- a/packages/editor-ui/src/components/__tests__/PersonalizationModal.spec.ts
+++ b/packages/editor-ui/src/components/__tests__/PersonalizationModal.spec.ts
@@ -1,62 +1,137 @@
-import { PiniaVuePlugin } from 'pinia';
-import { createLocalVue, mount } from '@vue/test-utils';
 import PersonalizationModal from '@/components/PersonalizationModal.vue';
 import { createTestingPinia } from '@pinia/testing';
-import { PERSONALIZATION_MODAL_KEY, ROLE_SALES_AND_MARKETING } from '@/constants';
+import userEvent from '@testing-library/user-event';
+import { PERSONALIZATION_MODAL_KEY, ROLE, STORES, VIEWS } from '@/constants';
 import { retry } from '@/__tests__/utils';
+import { createComponentRenderer } from '@/__tests__/render';
+import { fireEvent } from '@testing-library/vue';
+import { useUsersStore } from '@/stores/users.store';
+import { useUsageStore } from '@/stores/usage.store';
 
-describe('PersonalizationModal.vue', () => {
-	const pinia = createTestingPinia({
-		initialState: {
-			ui: {
-				modals: {
-					[PERSONALIZATION_MODAL_KEY]: { open: true },
-				},
+const pinia = createTestingPinia({
+	initialState: {
+		[STORES.UI]: {
+			modals: {
+				[PERSONALIZATION_MODAL_KEY]: { open: true },
 			},
+		},
+		[STORES.SETTINGS]: {
 			settings: {
-				settings: {
-					templates: {
-						host: '',
-					},
+				templates: {
+					host: '',
 				},
 			},
 		},
-	});
-	const localVue = createLocalVue();
-	localVue.use(PiniaVuePlugin);
+		[STORES.USERS]: {
+			users: {
+				123: {
+					email: 'john@doe.com',
+					firstName: 'John',
+					lastName: 'Doe',
+					isDefaultUser: false,
+					isPendingUser: false,
+					hasRecoveryCodesLeft: true,
+					role: ROLE.Owner,
+					mfaEnabled: false,
+				},
+			},
+			currentUserId: '123',
+		},
+	},
+});
+
+const renderComponent = createComponentRenderer(PersonalizationModal, {
+	props: {
+		teleported: false,
+		appendToBody: false,
+	},
+	pinia,
+	global: {
+		mocks: {
+			$route: {
+				name: VIEWS.NEW_WORKFLOW,
+			},
+		},
+	},
+});
 
+describe('PersonalizationModal.vue', () => {
 	it('should render correctly', async () => {
-		const wrapper = mount(PersonalizationModal, {
-			localVue,
-			pinia,
-		});
+		const wrapper = renderComponent();
 
-		await retry(() => expect(wrapper.find('.modal-content').exists()).toBe(true));
+		await retry(() =>
+			expect(wrapper.container.querySelector('.modal-content')).toBeInTheDocument(),
+		);
 
-		expect(wrapper.findAll('.n8n-select').length).toEqual(5);
-		expect(wrapper.html()).toMatchSnapshot();
+		expect(wrapper.container.querySelectorAll('.n8n-select').length).toEqual(5);
 	});
 
 	it('should display new option when role is "Devops", "Engineering", "IT", or "Sales and marketing"', async () => {
-		const wrapper = mount(PersonalizationModal, {
-			localVue,
-			pinia,
-		});
+		const wrapper = renderComponent();
 
-		await retry(() => expect(wrapper.find('.modal-content').exists()).toBe(true));
+		await retry(() =>
+			expect(wrapper.container.querySelector('.modal-content')).toBeInTheDocument(),
+		);
 
 		for (const index of [3, 4, 5, 6]) {
-			wrapper.find('.n8n-select[name="role"]').trigger('click');
-			wrapper
-				.find('.n8n-select[name="role"]')
-				.findAll('.el-select-dropdown__item')
-				.at(index)
-				.trigger('click');
+			const select = wrapper.container.querySelectorAll('.n8n-select')[1];
+
+			await fireEvent.click(select);
+
+			const item = select.querySelectorAll('.el-select-dropdown__item')[index];
+
+			await fireEvent.click(item);
 
 			await retry(() => {
-				expect(wrapper.findAll('.n8n-select').length).toEqual(6);
-				expect(wrapper.find('.n8n-select[name^="automationGoal"]').exists()).toBe(true);
+				expect(wrapper.container.querySelectorAll('.n8n-select').length).toEqual(6);
+				expect(wrapper.container.querySelector('[name^="automationGoal"]')).toBeInTheDocument();
 			});
 		}
 	});
+
+	it('should display self serve trial option when company size is larger than 500', async () => {
+		const wrapper = renderComponent();
+
+		await retry(() =>
+			expect(wrapper.container.querySelector('.modal-content')).toBeInTheDocument(),
+		);
+
+		const select = wrapper.container.querySelectorAll('.n8n-select')[3];
+		await fireEvent.click(select);
+
+		const item = select.querySelectorAll('.el-select-dropdown__item')[3];
+		await fireEvent.click(item);
+
+		await retry(() => {
+			expect(wrapper.container.querySelector('.card')).not.toBeNull();
+		});
+	});
+
+	it('should display send telemetry when requesting enterprise trial', async () => {
+		const usersStore = useUsersStore(pinia);
+		vi.spyOn(usersStore, 'submitPersonalizationSurvey').mockResolvedValue();
+
+		const usageStore = useUsageStore(pinia);
+		const spyLicenseTrial = vi.spyOn(usageStore, 'requestEnterpriseLicenseTrial');
+
+		const wrapper = renderComponent();
+
+		await retry(() =>
+			expect(wrapper.container.querySelector('.modal-content')).toBeInTheDocument(),
+		);
+
+		const select = wrapper.container.querySelectorAll('.n8n-select')[3];
+		await fireEvent.click(select);
+
+		const item = select.querySelectorAll('.el-select-dropdown__item')[3];
+		await fireEvent.click(item);
+
+		const agreeCheckbox = wrapper.container.querySelector('.n8n-checkbox')!;
+		await fireEvent.click(agreeCheckbox);
+
+		const submitButton = wrapper.getByRole('button');
+		await userEvent.click(submitButton);
+
+		await retry(() => expect(spyLicenseTrial).toHaveBeenCalled());
+	});
 });
diff --git a/packages/editor-ui/src/components/__tests__/RBAC.test.ts b/packages/editor-ui/src/components/__tests__/RBAC.test.ts
new file mode 100644
index 0000000000000..63bd7a1a58659
--- /dev/null
+++ b/packages/editor-ui/src/components/__tests__/RBAC.test.ts
@@ -0,0 +1,51 @@
+import RBAC from '@/components/RBAC.vue';
+import { createComponentRenderer } from '@/__tests__/render';
+import { useRBACStore } from '@/stores/rbac.store';
+
+const renderComponent = createComponentRenderer(RBAC);
+
+vi.mock('vue-router', () => ({
+	useRoute: vi.fn(() => ({
+		path: '/workflows',
+		params: {},
+	})),
+	RouterLink: vi.fn(),
+}));
+
+vi.mock('@/stores/rbac.store', () => ({
+	useRBACStore: vi.fn(),
+}));
+
+describe('RBAC', () => {
+	it('renders default slot when hasScope is true', async () => {
+		vi.mocked(useRBACStore).mockImplementation(() => ({
+			hasScope: () => true,
+		}));
+
+		const wrapper = renderComponent({
+			props: { scope: 'worfklow:list' },
+			slots: {
+				default: 'Default Content',
+				fallback: 'Fallback Content',
+			},
+		});
+
+		expect(wrapper.getByText('Default Content')).toBeInTheDocument();
+	});
+
+	it('renders fallback slot when hasScope is false', async () => {
+		vi.mocked(useRBACStore).mockImplementation(() => ({
+			hasScope: () => false,
+		}));
+
+		const wrapper = renderComponent({
+			props: { scope: 'worfklow:list' },
+			slots: {
+				default: 'Default Content',
+				fallback: 'Fallback Content',
+			},
+		});
+
+		expect(wrapper.getByText('Fallback Content')).toBeInTheDocument();
+	});
+});
diff --git a/packages/editor-ui/src/components/__tests__/ResourceMapper.test.ts b/packages/editor-ui/src/components/__tests__/ResourceMapper.test.ts
new file mode 100644
index 0000000000000..9e56cccc7ae06
--- /dev/null
+++ b/packages/editor-ui/src/components/__tests__/ResourceMapper.test.ts
@@ -0,0 +1,341 @@
+import {
+	DEFAULT_SETUP,
+	MAPPING_COLUMNS_RESPONSE,
+	NODE_PARAMETER_VALUES,
+	UPDATED_SCHEMA,
+} from './utils/ResourceMapper.utils';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import { waitAllPromises } from '@/__tests__/utils';
+import * as workflowHelpers from '@/composables/useWorkflowHelpers';
+import ResourceMapper from '@/components/ResourceMapper/ResourceMapper.vue';
+import userEvent from '@testing-library/user-event';
+import { createComponentRenderer } from '@/__tests__/render';
+import type { SpyInstance } from 'vitest';
+
+let nodeTypeStore: ReturnType<typeof useNodeTypesStore>;
+let fetchFieldsSpy: SpyInstance;
+let resolveParameterSpy: SpyInstance;
+
+const renderComponent = createComponentRenderer(ResourceMapper, DEFAULT_SETUP);
+
+describe('ResourceMapper.vue', () => {
+	beforeAll(() => {
+		nodeTypeStore = useNodeTypesStore();
+		fetchFieldsSpy = vi
+			.spyOn(nodeTypeStore, 'getResourceMapperFields')
+			.mockResolvedValue(MAPPING_COLUMNS_RESPONSE);
+		resolveParameterSpy = vi
+			.spyOn(workflowHelpers, 'resolveRequiredParameters')
+			.mockReturnValue(NODE_PARAMETER_VALUES);
+	});
+
+	afterEach(() => {
+		vi.clearAllMocks();
+	});
+
+	it('renders default configuration properly', async () => {
+		const { getByTestId } = renderComponent();
+		await waitAllPromises();
+		expect(getByTestId('resource-mapper-container')).toBeInTheDocument();
+		expect(getByTestId('mapping-mode-select')).toBeInTheDocument();
+		expect(getByTestId('matching-column-select')).toBeInTheDocument();
+		expect(getByTestId('mapping-fields-container')).toBeInTheDocument();
+		// Should render one parameter input for each fetched column
+		expect(
+			getByTestId('mapping-fields-container').querySelectorAll('.parameter-input').length,
+		).toBe(MAPPING_COLUMNS_RESPONSE.fields.length);
+	});
+
+	it('renders add mode properly', async () => {
+		const { getByTestId, queryByTestId } = renderComponent(
+			{
+				props: {
+					parameter: {
+						typeOptions: {
+							resourceMapper: {
+								mode: 'add',
+							},
+						},
+					},
+				},
+			},
+			{ 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(
+			{
+				props: {
+					parameter: {
+						typeOptions: {
+							resourceMapper: {
+								mode: 'upsert',
+								multiKeyMatch: true,
+							},
+						},
+					},
+				},
+			},
+			{ merge: true },
+		);
+		await waitAllPromises();
+		expect(getByTestId('resource-mapper-container')).toBeInTheDocument();
+		expect(container.querySelector('.el-select__tags')).toBeInTheDocument();
+	});
+
+	it('does not render mapping mode selector if it is disabled', async () => {
+		const { getByTestId, queryByTestId } = renderComponent(
+			{
+				props: {
+					parameter: {
+						typeOptions: {
+							resourceMapper: {
+								supportAutoMap: false,
+							},
+						},
+					},
+				},
+			},
+			{ merge: true },
+		);
+		await waitAllPromises();
+		expect(getByTestId('resource-mapper-container')).toBeInTheDocument();
+		expect(queryByTestId('mapping-mode-select')).not.toBeInTheDocument();
+	});
+
+	it('renders field on top of the list when they are selected for matching', async () => {
+		const user = userEvent.setup();
+		const { container, getByTestId } = renderComponent(
+			{
+				props: {
+					parameter: {
+						typeOptions: {
+							resourceMapper: {
+								supportAutoMap: true,
+								mode: 'upsert',
+								multiKeyMatch: false,
+							},
+						},
+					},
+				},
+			},
+			{ merge: true },
+		);
+		await waitAllPromises();
+		expect(getByTestId('resource-mapper-container')).toBeInTheDocument();
+		// Id should be the first field in the list
+		expect(container.querySelector('.parameter-item')).toContainHTML('id (using to match)');
+		// Select Last Name as matching column
+		await user.click(getByTestId('matching-column-option-Last name'));
+		// Now, last name should be the first field in the list
+		expect(container.querySelector('.parameter-item div.title')).toHaveTextContent(
+			'Last name (using to match)',
+		);
+	}, 10000);
+
+	it('renders selected matching columns properly when multiple key matching is enabled', async () => {
+		const user = userEvent.setup();
+		const { getByTestId, getAllByText, queryByText } = renderComponent(
+			{
+				props: {
+					parameter: {
+						typeOptions: {
+							resourceMapper: {
+								supportAutoMap: true,
+								mode: 'upsert',
+								multiKeyMatch: true,
+							},
+						},
+					},
+				},
+			},
+			{ merge: true },
+		);
+		await waitAllPromises();
+		expect(getByTestId('resource-mapper-container')).toBeInTheDocument();
+		await user.click(getByTestId('matching-column-option-Username'));
+
+		// Both matching columns (id and Username) should be rendered in the dropdown
+		expect(
+			getByTestId('matching-column-select').querySelector('.el-select  > div'),
+		).toHaveTextContent('idUsername');
+		// All selected columns should have correct labels
+		expect(getAllByText('id (using to match)')[0]).toBeInTheDocument();
+		expect(getAllByText('Username (using to match)')[0]).toBeInTheDocument();
+		expect(queryByText('First Name (using to match)')).not.toBeInTheDocument();
+	});
+
+	it('uses field words defined in node definition', async () => {
+		const { getByText } = renderComponent(
+			{
+				props: {
+					parameter: {
+						typeOptions: {
+							resourceMapper: {
+								fieldWords: {
+									singular: 'foo',
+									plural: 'foos',
+								},
+							},
+						},
+					},
+				},
+			},
+			{ merge: true },
+		);
+		await waitAllPromises();
+		expect(getByText('Set the value for each foo')).toBeInTheDocument();
+		expect(
+			getByText('Look for incoming data that matches the foos in the service'),
+		).toBeInTheDocument();
+		expect(getByText('Foos to Match On')).toBeInTheDocument();
+		expect(getByText('The foos that identify the row(s) to modify')).toBeInTheDocument();
+	});
+
+	it('should render correct fields based on saved schema', async () => {
+		const { getByTestId, queryAllByTestId } = renderComponent(
+			{
+				props: {
+					node: {
+						parameters: {
+							columns: {
+								schema: UPDATED_SCHEMA,
+							},
+						},
+					},
+					parameter: {
+						typeOptions: {
+							resourceMapper: {
+								mode: 'add',
+							},
+						},
+					},
+				},
+			},
+			{ merge: true },
+		);
+		await waitAllPromises();
+		// There should be 4 fields rendered and only 1 of them should have remove button
+		expect(
+			getByTestId('mapping-fields-container').querySelectorAll('.parameter-input').length,
+		).toBe(4);
+		expect(
+			getByTestId('mapping-fields-container').querySelectorAll(
+				'[data-test-id^="remove-field-button"]',
+			).length,
+		).toBe(1);
+	});
+
+	it('should render correct options based on saved schema', async () => {
+		const { getByTestId } = renderComponent(
+			{
+				props: {
+					node: {
+						parameters: {
+							columns: {
+								schema: UPDATED_SCHEMA,
+							},
+						},
+					},
+					parameter: {
+						typeOptions: {
+							resourceMapper: {
+								mode: 'add',
+							},
+						},
+					},
+				},
+			},
+			{ merge: true },
+		);
+		await waitAllPromises();
+		// Should have one option in the bottom dropdown for one removed field
+		expect(getByTestId('add-fields-select').querySelectorAll('li').length).toBe(1);
+	});
+
+	it('should fetch fields if there is no cached schema', async () => {
+		renderComponent({
+			props: {
+				node: {
+					parameters: {
+						columns: {
+							schema: null,
+						},
+					},
+				},
+			},
+		});
+		await waitAllPromises();
+		expect(fetchFieldsSpy).toHaveBeenCalledTimes(1);
+	});
+
+	it('should not fetch fields if schema is already fetched', async () => {
+		renderComponent({
+			props: {
+				node: {
+					parameters: {
+						columns: {
+							schema: UPDATED_SCHEMA,
+						},
+					},
+				},
+				parameter: {
+					typeOptions: {
+						resourceMapper: {
+							mode: 'add',
+						},
+					},
+				},
+			},
+		});
+		await waitAllPromises();
+		expect(fetchFieldsSpy).not.toHaveBeenCalled();
+	});
+
+	it('renders initially selected matching column properly', async () => {
+		const { getByTestId } = renderComponent(
+			{
+				props: {
+					node: {
+						parameters: {
+							columns: {
+								mappingMode: 'autoMapInputData',
+								matchingColumns: ['name'],
+								schema: [
+									{
+										id: 'name',
+										displayName: 'name',
+										canBeUsedToMatch: true,
+									},
+									{
+										id: 'email',
+										displayName: 'email',
+										canBeUsedToMatch: true,
+									},
+								],
+							},
+						},
+					},
+					parameter: {
+						typeOptions: {
+							resourceMapper: {
+								supportAutoMap: true,
+								mode: 'upsert',
+								multiKeyMatch: false,
+							},
+						},
+					},
+				},
+			},
+			{ merge: true },
+		);
+		await waitAllPromises();
+
+		expect(getByTestId('matching-column-select').querySelector('input')).toHaveValue('name');
+	});
+});
diff --git a/packages/editor-ui/src/components/__tests__/RunData.test.ts b/packages/editor-ui/src/components/__tests__/RunData.test.ts
new file mode 100644
index 0000000000000..f740b5018fb28
--- /dev/null
+++ b/packages/editor-ui/src/components/__tests__/RunData.test.ts
@@ -0,0 +1,189 @@
+import { waitFor } from '@testing-library/vue';
+import userEvent from '@testing-library/user-event';
+import { createTestingPinia } from '@pinia/testing';
+import { merge } from 'lodash-es';
+import RunData from '@/components/RunData.vue';
+import { STORES, VIEWS } from '@/constants';
+import { SETTINGS_STORE_DEFAULT_STATE } from '@/__tests__/utils';
+import { createComponentRenderer } from '@/__tests__/render';
+import type { INodeUi, IRunDataDisplayMode } from '@/Interface';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { setActivePinia } from 'pinia';
+
+const nodes = [
+	{
+		id: '1',
+		typeVersion: 1,
+		name: 'Test Node',
+		position: [0, 0],
+		type: 'test',
+		parameters: {},
+	},
+] as INodeUi[];
+
+describe('RunData', () => {
+	it('should render data correctly even when "item.json" has another "json" key', async () => {
+		const { getByText, getAllByTestId, getByTestId } = render(
+			[
+				{
+					json: {
+						id: 1,
+						name: 'Test 1',
+						json: {
+							data: 'Json data 1',
+						},
+					},
+				},
+				{
+					json: {
+						id: 2,
+						name: 'Test 2',
+						json: {
+							data: 'Json data 2',
+						},
+					},
+				},
+			],
+			'schema',
+		);
+
+		await userEvent.click(getByTestId('ndv-pin-data'));
+		await waitFor(() => getAllByTestId('run-data-schema-item'), { timeout: 1000 });
+		expect(getByText('Test 1')).toBeInTheDocument();
+		expect(getByText('Json data 1')).toBeInTheDocument();
+	});
+
+	it('should render view and download buttons for PDFs', async () => {
+		const { getByTestId } = render(
+			[
+				{
+					json: {},
+					binary: {
+						data: {
+							fileName: 'test.pdf',
+							fileType: 'pdf',
+							mimeType: 'application/pdf',
+						},
+					},
+				},
+			],
+			'binary',
+		);
+		expect(getByTestId('ndv-view-binary-data')).toBeInTheDocument();
+		expect(getByTestId('ndv-download-binary-data')).toBeInTheDocument();
+		expect(getByTestId('ndv-binary-data_0')).toBeInTheDocument();
+	});
+
+	it('should not render a view button for unknown content-type', async () => {
+		const { getByTestId, queryByTestId } = render(
+			[
+				{
+					json: {},
+					binary: {
+						data: {
+							fileName: 'test.xyz',
+							mimeType: 'application/octet-stream',
+						},
+					},
+				},
+			],
+			'binary',
+		);
+		expect(queryByTestId('ndv-view-binary-data')).not.toBeInTheDocument();
+		expect(getByTestId('ndv-download-binary-data')).toBeInTheDocument();
+		expect(getByTestId('ndv-binary-data_0')).toBeInTheDocument();
+	});
+
+	const render = (outputData: unknown[], displayMode: IRunDataDisplayMode) => {
+		const pinia = createTestingPinia({
+			initialState: {
+				[STORES.SETTINGS]: {
+					settings: merge({}, SETTINGS_STORE_DEFAULT_STATE.settings),
+				},
+				[STORES.NDV]: {
+					output: {
+						displayMode,
+					},
+					activeNodeName: 'Test Node',
+				},
+				[STORES.WORKFLOWS]: {
+					workflow: {
+						nodes,
+					},
+					workflowExecutionData: {
+						id: '1',
+						finished: true,
+						mode: 'trigger',
+						startedAt: new Date(),
+						workflowData: {
+							id: '1',
+							name: 'Test Workflow',
+							versionId: '1',
+							createdAt: new Date().toISOString(),
+							updatedAt: new Date().toISOString(),
+							active: false,
+							nodes: [],
+							connections: {},
+						},
+						data: {
+							resultData: {
+								runData: {
+									'Test Node': [
+										{
+											startTime: new Date().getTime(),
+											executionTime: new Date().getTime(),
+											data: {
+												main: [outputData],
+											},
+											source: [null],
+										},
+									],
+								},
+							},
+						},
+					},
+				},
+			},
+		});
+
+		setActivePinia(pinia);
+
+		const workflowsStore = useWorkflowsStore();
+		vi.mocked(workflowsStore).getNodeByName.mockReturnValue(nodes[0]);
+
+		return createComponentRenderer(RunData, {
+			props: {
+				node: {
+					name: 'Test Node',
+				},
+			},
+			data() {
+				return {
+					canPinData: true,
+					showData: true,
+				};
+			},
+			global: {
+				mocks: {
+					$route: {
+						name: VIEWS.WORKFLOW,
+					},
+				},
+			},
+		})({
+			props: {
+				node: {
+					id: '1',
+					name: 'Test Node',
+					position: [0, 0],
+				},
+				runIndex: 0,
+				paneType: 'output',
+				isExecuting: false,
+				mappingEnabled: true,
+				distanceFromActive: 0,
+			},
+			pinia,
+		});
+	};
+});
diff --git a/packages/editor-ui/src/components/__tests__/RunDataJson.test.ts b/packages/editor-ui/src/components/__tests__/RunDataJson.test.ts
index 22a87e6cdbf07..0016b54a2d880 100644
--- a/packages/editor-ui/src/components/__tests__/RunDataJson.test.ts
+++ b/packages/editor-ui/src/components/__tests__/RunDataJson.test.ts
@@ -1,44 +1,40 @@
-import Vue from 'vue';
-import { PiniaVuePlugin } from 'pinia';
 import { createTestingPinia } from '@pinia/testing';
-import { render, screen, cleanup } from '@testing-library/vue';
+import { screen, cleanup } from '@testing-library/vue';
 import RunDataJson from '@/components/RunDataJson.vue';
+import { createComponentRenderer } from '@/__tests__/render';
 
-Vue.use(PiniaVuePlugin);
-
-describe('RunDataJson.vue', () => {
-	const DEFAULT_SETUP = {
-		pinia: createTestingPinia(),
-		props: {
-			mappingEnabled: true,
-			editMode: { enabled: false },
-			inputData: [
-				{
-					json: {
-						list: [1, 2, 3],
-						record: { name: 'Joe' },
-						myNumber: 123,
-						myStringNumber: '456',
-						myStringText: 'abc',
-						nil: null,
-						d: undefined,
-					},
-				},
-			],
-			node: {
-				parameters: {
-					keepOnlySet: false,
-					values: {},
-					options: {},
+const renderComponent = createComponentRenderer(RunDataJson, {
+	props: {
+		mappingEnabled: true,
+		editMode: { enabled: false },
+		inputData: [
+			{
+				json: {
+					list: [1, 2, 3],
+					record: { name: 'Joe' },
+					myNumber: 123,
+					myStringNumber: '456',
+					myStringText: 'abc',
+					nil: null,
+					d: undefined,
 				},
-				id: '820ea733-d8a6-4379-8e73-88a2347ea003',
-				name: 'Set',
-				type: 'n8n-nodes-base.set',
-				typeVersion: 1,
-				position: [380, 1060],
-				disabled: false,
 			},
+		],
+		node: {
+			parameters: {
+				keepOnlySet: false,
+				values: {},
+				options: {},
+			},
+			id: '820ea733-d8a6-4379-8e73-88a2347ea003',
+			name: 'Set',
+			type: 'n8n-nodes-base.set',
+			typeVersion: 1,
+			position: [380, 1060],
+			disabled: false,
 		},
+	},
+	global: {
 		mocks: {
 			$locale: {
 				baseText() {
@@ -49,13 +45,17 @@ describe('RunDataJson.vue', () => {
 				getters: {},
 			},
 		},
-	};
+	},
+});
 
+describe('RunDataJson.vue', () => {
 	beforeEach(cleanup);
 
 	it('renders json values properly', () => {
-		const { container } = render(RunDataJson, DEFAULT_SETUP, (vue) => {
-			vue.use(PiniaVuePlugin);
+		const { container } = renderComponent({
+			global: {
+				plugins: [createTestingPinia()],
+			},
 		});
 		expect(container).toMatchSnapshot();
 
@@ -65,17 +65,4 @@ describe('RunDataJson.vue', () => {
 		expect(screen.getByText('null')).toBeInTheDocument();
 		expect(screen.queryByText('undefined')).not.toBeInTheDocument();
 	});
-
-	it('sets ph-no-capture class correctly', () => {
-		render(RunDataJson, DEFAULT_SETUP);
-
-		expect(screen.getByText('"list"')).not.toHaveClass('ph-no-capture');
-		expect(screen.getByText('"record"')).not.toHaveClass('ph-no-capture');
-		expect(screen.getByText('"myStringNumber"')).not.toHaveClass('ph-no-capture');
-
-		expect(screen.getByText('123')).toHaveClass('ph-no-capture');
-		expect(screen.getByText('"456"')).toHaveClass('ph-no-capture');
-		expect(screen.getByText('"abc"')).toHaveClass('ph-no-capture');
-		expect(screen.getByText('null')).toHaveClass('ph-no-capture');
-	});
 });
diff --git a/packages/editor-ui/src/components/__tests__/RunDataPinButton.test.ts b/packages/editor-ui/src/components/__tests__/RunDataPinButton.test.ts
new file mode 100644
index 0000000000000..1e6b7958c8364
--- /dev/null
+++ b/packages/editor-ui/src/components/__tests__/RunDataPinButton.test.ts
@@ -0,0 +1,124 @@
+import { createTestingPinia } from '@pinia/testing';
+import { cleanup, waitFor } from '@testing-library/vue';
+import userEvent from '@testing-library/user-event';
+import { createComponentRenderer } from '@/__tests__/render';
+import RunDataPinButton from '@/components/RunDataPinButton.vue';
+import { STORES } from '@/constants';
+
+const renderComponent = createComponentRenderer(RunDataPinButton, {
+	global: {
+		stubs: ['font-awesome-icon'],
+		plugins: [
+			createTestingPinia({
+				initialState: {
+					[STORES.SETTINGS]: {
+						settings: {
+							templates: {
+								enabled: true,
+								host: 'https://api.n8n.io/api/',
+							},
+						},
+					},
+				},
+			}),
+		],
+	},
+	props: {
+		tooltipContentsVisibility: {
+			binaryDataTooltipContent: false,
+			pinDataDiscoveryTooltipContent: false,
+		},
+		dataPinningDocsUrl: '',
+		pinnedData: {
+			hasData: false,
+		},
+		disabled: false,
+	},
+});
+
+describe('RunDataPinButton.vue', () => {
+	beforeEach(cleanup);
+
+	it('shows default tooltip content only on button hover', async () => {
+		const { getByRole, queryByRole, emitted } = renderComponent();
+
+		expect(queryByRole('tooltip')).not.toBeInTheDocument();
+
+		expect(getByRole('button')).toBeEnabled();
+		await userEvent.hover(getByRole('button'));
+
+		expect(getByRole('tooltip')).toBeVisible();
+		expect(getByRole('tooltip')).toHaveTextContent('More info');
+
+		await userEvent.click(getByRole('button'));
+		expect(emitted().togglePinData).toBeDefined();
+	});
+
+	it('shows binary data tooltip content only on disabled button hover', async () => {
+		const { getByRole, queryByRole, emitted } = renderComponent({
+			props: {
+				tooltipContentsVisibility: {
+					binaryDataTooltipContent: true,
+					pinDataDiscoveryTooltipContent: false,
+				},
+				disabled: true,
+			},
+		});
+
+		expect(queryByRole('tooltip')).not.toBeInTheDocument();
+		expect(getByRole('button')).toBeDisabled();
+
+		await userEvent.hover(getByRole('button'));
+
+		expect(getByRole('tooltip')).toBeVisible();
+		expect(getByRole('tooltip')).toHaveTextContent('disabled');
+
+		await userEvent.click(getByRole('button'));
+		expect(emitted().togglePinData).not.toBeDefined();
+	});
+
+	it('shows pin data discoverability tooltip immediately (not on hover)', async () => {
+		const { getByRole } = renderComponent({
+			props: {
+				tooltipContentsVisibility: {
+					binaryDataTooltipContent: false,
+					pinDataDiscoveryTooltipContent: true,
+				},
+			},
+		});
+
+		await waitFor(() => {
+			expect(getByRole('tooltip')).toBeVisible();
+			expect(getByRole('tooltip')).toHaveTextContent('instead of waiting');
+		});
+		expect(getByRole('button')).toBeEnabled();
+
+		await userEvent.hover(getByRole('button'));
+
+		expect(getByRole('tooltip')).toBeVisible();
+		expect(getByRole('tooltip')).toHaveTextContent('instead of waiting');
+	});
+
+	it('shows binary data tooltip content even if discoverability tooltip enabled', async () => {
+		const { getByRole } = renderComponent({
+			props: {
+				tooltipContentsVisibility: {
+					binaryDataTooltipContent: true,
+					pinDataDiscoveryTooltipContent: true,
+				},
+				disabled: true,
+			},
+		});
+
+		await waitFor(() => {
+			expect(getByRole('tooltip')).toBeVisible();
+			expect(getByRole('tooltip')).toHaveTextContent('disabled');
+		});
+		expect(getByRole('button')).toBeDisabled();
+
+		await userEvent.hover(getByRole('button'));
+
+		expect(getByRole('tooltip')).toBeVisible();
+		expect(getByRole('tooltip')).toHaveTextContent('disabled');
+	});
+});
diff --git a/packages/editor-ui/src/components/__tests__/RunDataSchema.test.ts b/packages/editor-ui/src/components/__tests__/RunDataSchema.test.ts
index 0ae6b53458dd0..2c8cfc4c081e3 100644
--- a/packages/editor-ui/src/components/__tests__/RunDataSchema.test.ts
+++ b/packages/editor-ui/src/components/__tests__/RunDataSchema.test.ts
@@ -1,82 +1,86 @@
-import { PiniaVuePlugin } from 'pinia';
 import { createTestingPinia } from '@pinia/testing';
-import { render, cleanup } from '@testing-library/vue';
+import { cleanup } from '@testing-library/vue';
 import RunDataJsonSchema from '@/components/RunDataSchema.vue';
 import { STORES } from '@/constants';
+import { createComponentRenderer } from '@/__tests__/render';
 
-describe('RunDataJsonSchema.vue', () => {
-	const renderOptions = {
-		pinia: createTestingPinia({
-			initialState: {
-				[STORES.SETTINGS]: {
-					settings: {
-						templates: {
-							enabled: true,
-							host: 'https://api.n8n.io/api/',
+const renderComponent = createComponentRenderer(RunDataJsonSchema, {
+	global: {
+		stubs: ['font-awesome-icon'],
+		plugins: [
+			createTestingPinia({
+				initialState: {
+					[STORES.SETTINGS]: {
+						settings: {
+							templates: {
+								enabled: true,
+								host: 'https://api.n8n.io/api/',
+							},
 						},
 					},
 				},
+			}),
+		],
+	},
+	props: {
+		mappingEnabled: true,
+		distanceFromActive: 1,
+		runIndex: 1,
+		totalRuns: 2,
+		paneType: 'input',
+		node: {
+			parameters: {
+				keepOnlySet: false,
+				values: {},
+				options: {},
 			},
-		}),
-		stubs: ['font-awesome-icon'],
-		props: {
-			mappingEnabled: true,
-			distanceFromActive: 1,
-			runIndex: 1,
-			totalRuns: 2,
-			paneType: 'input',
-			node: {
-				parameters: {
-					keepOnlySet: false,
-					values: {},
-					options: {},
-				},
-				id: '820ea733-d8a6-4379-8e73-88a2347ea003',
-				name: 'Set',
-				type: 'n8n-nodes-base.set',
-				typeVersion: 1,
-				position: [380, 1060],
-				disabled: false,
-			},
-			data: [{}],
+			id: '820ea733-d8a6-4379-8e73-88a2347ea003',
+			name: 'Set',
+			type: 'n8n-nodes-base.set',
+			typeVersion: 1,
+			position: [380, 1060],
+			disabled: false,
 		},
-	};
+		data: [{}],
+	},
+});
 
+describe('RunDataJsonSchema.vue', () => {
 	beforeEach(cleanup);
 
 	it('renders schema for empty data', () => {
-		const { container } = render(RunDataJsonSchema, renderOptions, (vue) => {
-			vue.use(PiniaVuePlugin);
-		});
+		const { container } = renderComponent();
 		expect(container).toMatchSnapshot();
 	});
 
 	it('renders schema for data', () => {
-		renderOptions.props.data = [
-			{ name: 'John', age: 22, hobbies: ['surfing', 'traveling'] },
-			{ name: 'Joe', age: 33, hobbies: ['skateboarding', 'gaming'] },
-		];
-		const { container } = render(RunDataJsonSchema, renderOptions, (vue) => {
-			vue.use(PiniaVuePlugin);
+		const { container } = renderComponent({
+			props: {
+				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', () => {
-		renderOptions.props.data = [
-			{
-				'hello world': [
+		const { container } = renderComponent({
+			props: {
+				data: [
 					{
-						test: {
-							'more to think about': 1,
-						},
-						'test.how': 'ignore',
+						'hello world': [
+							{
+								test: {
+									'more to think about': 1,
+								},
+								'test.how': 'ignore',
+							},
+						],
 					},
 				],
 			},
-		];
-		const { container } = render(RunDataJsonSchema, renderOptions, (vue) => {
-			vue.use(PiniaVuePlugin);
 		});
 		expect(container).toMatchSnapshot();
 	});
diff --git a/packages/editor-ui/src/components/__tests__/RunDataSearch.test.ts b/packages/editor-ui/src/components/__tests__/RunDataSearch.test.ts
new file mode 100644
index 0000000000000..55634aeab25f9
--- /dev/null
+++ b/packages/editor-ui/src/components/__tests__/RunDataSearch.test.ts
@@ -0,0 +1,123 @@
+import userEvent from '@testing-library/user-event';
+import { createPinia, setActivePinia } from 'pinia';
+import { createComponentRenderer } from '@/__tests__/render';
+import RunDataSearch from '@/components/RunDataSearch.vue';
+
+const renderComponent = createComponentRenderer(RunDataSearch);
+let pinia: ReturnType<typeof createPinia>;
+
+describe('RunDataSearch', () => {
+	beforeEach(() => {
+		pinia = createPinia();
+		setActivePinia(pinia);
+	});
+
+	it('should not be focused on keyboard shortcut when area is not active', async () => {
+		const { emitted } = renderComponent({
+			pinia,
+			props: {
+				modelValue: '',
+			},
+		});
+
+		await userEvent.keyboard('/');
+		expect(emitted().focus).not.toBeDefined();
+	});
+
+	it('should be focused on click regardless of active area and keyboard shortcut should work after', async () => {
+		const { getByRole, emitted, rerender } = renderComponent({
+			pinia,
+			props: {
+				modelValue: '',
+			},
+		});
+
+		await userEvent.click(getByRole('textbox'));
+		expect(emitted().focus).toHaveLength(1);
+		await userEvent.click(document.body);
+
+		await rerender({ isAreaActive: true });
+		await userEvent.keyboard('/');
+		expect(emitted().focus).toHaveLength(2);
+	});
+
+	it('should be focused twice if area is already active', async () => {
+		const { getByRole, emitted } = renderComponent({
+			pinia,
+			props: {
+				modelValue: '',
+				isAreaActive: true,
+			},
+		});
+
+		await userEvent.click(getByRole('textbox'));
+		expect(emitted().focus).toHaveLength(1);
+		await userEvent.click(document.body);
+
+		await userEvent.keyboard('/');
+		expect(emitted().focus).toHaveLength(2);
+	});
+
+	it('should select all text when focused', async () => {
+		const { getByRole, emitted } = renderComponent({
+			pinia,
+			props: {
+				modelValue: '',
+				isAreaActive: true,
+			},
+		});
+
+		const input = getByRole('textbox');
+
+		await userEvent.click(input);
+		expect(emitted().focus).toHaveLength(1);
+		await userEvent.type(input, 'test');
+
+		await userEvent.click(document.body);
+		await userEvent.click(input);
+		expect(emitted().focus).toHaveLength(2);
+
+		const selectionStart = input.selectionStart;
+		const selectionEnd = input.selectionEnd;
+		const isSelected = selectionStart === 0 && selectionEnd === input.value.length;
+
+		expect(isSelected).toBe(true);
+	});
+
+	it('should not be focused on keyboard shortcut when a contenetEditable element is active', async () => {
+		const { getByTestId } = createComponentRenderer({
+			components: {
+				RunDataSearch,
+			},
+			template: `
+				<div>
+					<div data-test-id="mock-contenteditable" contenteditable="true"></div>
+					<RunDataSearch
+						v-model="modelValue"
+						:isAreaActive="isAreaActive"
+					/>
+				</div>
+			`,
+			props: {
+				modelValue: {
+					type: String,
+					default: '',
+				},
+				isAreaActive: {
+					type: Boolean,
+					default: true,
+				},
+			},
+		})({
+			pinia,
+		});
+
+		const user = userEvent.setup();
+		const contentEditableElement = getByTestId('mock-contenteditable');
+		await user.click(contentEditableElement);
+		expect(document.activeElement).toBe(contentEditableElement);
+		await user.type(contentEditableElement, '/');
+		expect(contentEditableElement.textContent).toBe('/');
+		expect(getByTestId('ndv-search')).not.toHaveFocus();
+	});
+});
diff --git a/packages/editor-ui/src/components/__tests__/SQLEditor.test.ts b/packages/editor-ui/src/components/__tests__/SQLEditor.test.ts
new file mode 100644
index 0000000000000..6de5647cd4eda
--- /dev/null
+++ b/packages/editor-ui/src/components/__tests__/SQLEditor.test.ts
@@ -0,0 +1,162 @@
+import * as workflowHelpers from '@/composables/useWorkflowHelpers';
+import { SETTINGS_STORE_DEFAULT_STATE } from '@/__tests__/utils';
+import { STORES } from '@/constants';
+import { createTestingPinia } from '@pinia/testing';
+
+import SqlEditor from '@/components/SqlEditor/SqlEditor.vue';
+import { renderComponent } from '@/__tests__/render';
+import { waitFor } from '@testing-library/vue';
+import { setActivePinia } from 'pinia';
+import { useRouter } from 'vue-router';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import type { INodeUi } from '@/Interface';
+
+const EXPRESSION_OUTPUT_TEST_ID = 'inline-expression-editor-output';
+
+const DEFAULT_SETUP = {
+	props: {
+		dialect: 'PostgreSQL',
+		isReadOnly: false,
+	},
+};
+
+const nodes = [
+	{
+		id: '1',
+		typeVersion: 1,
+		name: 'Test Node',
+		position: [0, 0],
+		type: 'test',
+		parameters: {},
+	},
+] as INodeUi[];
+
+const mockResolveExpression = () => {
+	const mock = vi.fn();
+	vi.spyOn(workflowHelpers, 'useWorkflowHelpers').mockReturnValueOnce({
+		...workflowHelpers.useWorkflowHelpers({ router: useRouter() }),
+		resolveExpression: mock,
+	});
+
+	return mock;
+};
+
+describe('SqlEditor.vue', () => {
+	beforeEach(() => {
+		const pinia = createTestingPinia({
+			initialState: {
+				[STORES.SETTINGS]: {
+					settings: SETTINGS_STORE_DEFAULT_STATE.settings,
+				},
+				[STORES.NDV]: {
+					activeNodeName: 'Test Node',
+				},
+				[STORES.WORKFLOWS]: {
+					workflow: {
+						nodes,
+						connections: {},
+					},
+				},
+			},
+		});
+		setActivePinia(pinia);
+
+		const workflowsStore = useWorkflowsStore();
+		vi.mocked(workflowsStore).getNodeByName.mockReturnValue(nodes[0]);
+	});
+
+	afterAll(() => {
+		vi.clearAllMocks();
+	});
+
+	it('renders basic query', async () => {
+		const { getByTestId } = renderComponent(SqlEditor, {
+			...DEFAULT_SETUP,
+			props: {
+				...DEFAULT_SETUP.props,
+				modelValue: 'SELECT * FROM users',
+			},
+		});
+
+		await waitFor(() =>
+			expect(getByTestId(EXPRESSION_OUTPUT_TEST_ID)).toHaveTextContent('SELECT * FROM users'),
+		);
+	});
+
+	it('renders basic query with expression', async () => {
+		mockResolveExpression().mockReturnValueOnce('users');
+		const { getByTestId } = renderComponent(SqlEditor, {
+			...DEFAULT_SETUP,
+			props: {
+				...DEFAULT_SETUP.props,
+				modelValue: 'SELECT * FROM {{ $json.table }}',
+			},
+		});
+
+		await waitFor(() =>
+			expect(getByTestId(EXPRESSION_OUTPUT_TEST_ID)).toHaveTextContent('SELECT * FROM users'),
+		);
+	});
+
+	it('renders resolved expressions with dot between resolvables', async () => {
+		mockResolveExpression().mockReturnValueOnce('public.users');
+		const { getByTestId } = renderComponent(SqlEditor, {
+			...DEFAULT_SETUP,
+			props: {
+				...DEFAULT_SETUP.props,
+				modelValue: 'SELECT * FROM {{ $json.schema }}.{{ $json.table }}',
+			},
+		});
+		await waitFor(() =>
+			expect(getByTestId(EXPRESSION_OUTPUT_TEST_ID)).toHaveTextContent(
+				'SELECT * FROM public.users',
+			),
+		);
+	});
+
+	it('renders resolved expressions which resolve to 0', async () => {
+		mockResolveExpression()
+			.mockReturnValueOnce('public')
+			.mockReturnValueOnce('users')
+			.mockReturnValueOnce('id')
+			.mockReturnValueOnce(0);
+		const { getByTestId } = renderComponent(SqlEditor, {
+			...DEFAULT_SETUP,
+			props: {
+				...DEFAULT_SETUP.props,
+				modelValue:
+					'SELECT * FROM {{ $json.schema }}.{{ $json.table }} WHERE {{ $json.id }} > {{ $json.limit - 10 }}',
+			},
+		});
+		await waitFor(() =>
+			expect(getByTestId(EXPRESSION_OUTPUT_TEST_ID)).toHaveTextContent(
+				'SELECT * FROM public.users WHERE id > 0',
+			),
+		);
+	});
+
+	it('keeps query formatting in rendered output', async () => {
+		mockResolveExpression()
+			.mockReturnValueOnce('public')
+			.mockReturnValueOnce('users')
+			.mockReturnValueOnce(0)
+			.mockReturnValueOnce(false);
+		const { getByTestId } = renderComponent(SqlEditor, {
+			...DEFAULT_SETUP,
+			props: {
+				...DEFAULT_SETUP.props,
+				modelValue:
+					'SELECT * FROM {{ $json.schema }}.{{ $json.table }}\n  WHERE id > {{ $json.limit - 10 }}\n  AND active = {{ $json.active }};',
+			},
+		});
+		await waitFor(() =>
+			expect(getByTestId(EXPRESSION_OUTPUT_TEST_ID)).toHaveTextContent(
+				'SELECT * FROM public.users WHERE id > 0 AND active = false;',
+			),
+		);
+		// Output should have the same number of lines as the input
+		expect(getByTestId('sql-editor-container').getElementsByClassName('cm-line').length).toEqual(
+			getByTestId(EXPRESSION_OUTPUT_TEST_ID).getElementsByClassName('cm-line').length,
+		);
+	});
+});
diff --git a/packages/editor-ui/src/components/__tests__/SSOLogin.test.ts b/packages/editor-ui/src/components/__tests__/SSOLogin.test.ts
index 3c168c521d1fc..d387712d6192f 100644
--- a/packages/editor-ui/src/components/__tests__/SSOLogin.test.ts
+++ b/packages/editor-ui/src/components/__tests__/SSOLogin.test.ts
@@ -1,34 +1,24 @@
-import { PiniaVuePlugin } from 'pinia';
-import { render } from '@testing-library/vue';
 import { createTestingPinia } from '@pinia/testing';
 import { merge } from 'lodash-es';
 import SSOLogin from '@/components/SSOLogin.vue';
 import { STORES } from '@/constants';
-import { useSSOStore } from '@/stores/sso';
+import { useSSOStore } from '@/stores/sso.store';
 import { SETTINGS_STORE_DEFAULT_STATE } from '@/__tests__/utils';
 import { afterEach } from 'vitest';
+import { createComponentRenderer } from '@/__tests__/render';
 
 let pinia: ReturnType<typeof createTestingPinia>;
 let ssoStore: ReturnType<typeof useSSOStore>;
 
-const renderComponent = (renderOptions: Parameters<typeof render>[1] = {}) =>
-	render(
-		SSOLogin,
-		merge(
-			{
-				pinia,
-				stubs: {
-					'n8n-button': {
-						template: '<button data-test-id="sso-button"></button>',
-					},
-				},
+const renderComponent = createComponentRenderer(SSOLogin, {
+	global: {
+		stubs: {
+			'n8n-button': {
+				template: '<button data-test-id="sso-button"></button>',
 			},
-			renderOptions,
-		),
-		(vue) => {
-			vue.use(PiniaVuePlugin);
 		},
-	);
+	},
+});
 
 describe('SSOLogin', () => {
 	beforeEach(() => {
@@ -47,13 +37,13 @@ describe('SSOLogin', () => {
 	});
 
 	it('should not render button if conditions are not met', () => {
-		const { queryByRole } = renderComponent();
+		const { queryByRole } = renderComponent({ pinia });
 		expect(queryByRole('button')).not.toBeInTheDocument();
 	});
 
 	it('should render button if the store returns true for the conditions', () => {
 		vi.spyOn(ssoStore, 'showSsoLoginButton', 'get').mockReturnValue(true);
-		const { queryByRole } = renderComponent();
+		const { queryByRole } = renderComponent({ pinia });
 		expect(queryByRole('button')).toBeInTheDocument();
 	});
 });
diff --git a/packages/editor-ui/src/components/__tests__/TemplatesInfoCard.test.ts b/packages/editor-ui/src/components/__tests__/TemplatesInfoCard.test.ts
new file mode 100644
index 0000000000000..a7935f834f7c3
--- /dev/null
+++ b/packages/editor-ui/src/components/__tests__/TemplatesInfoCard.test.ts
@@ -0,0 +1,77 @@
+import { createComponentRenderer } from '@/__tests__/render';
+import { createPinia, setActivePinia } from 'pinia';
+import TemplatesInfoCard from '@/components/TemplatesInfoCard.vue';
+
+let pinia: ReturnType<typeof createPinia>;
+const renderComponent = createComponentRenderer(TemplatesInfoCard);
+
+const TEST_COLLECTION = {
+	id: 8,
+	rank: 1,
+	name: 'Advanced AI',
+	totalViews: null,
+	createdAt: '2023-10-03T17:04:44.645Z',
+	workflows: [{ id: 1951 }, { id: 1953 }, { id: 1954 }, { id: 1955 }],
+	nodes: [
+		{
+			id: 1119,
+			icon: 'fa:robot',
+			name: '@n8n/n8n-nodes-langchain.agent',
+			iconData: {
+				icon: 'robot',
+				type: 'icon',
+			},
+			displayName: 'Agent',
+		},
+		{
+			id: 1121,
+			icon: 'fa:link',
+			name: '@n8n/n8n-nodes-langchain.chainSummarization',
+			iconData: {
+				icon: 'link',
+				type: 'icon',
+			},
+			displayName: 'Summarization Chain',
+		},
+		{
+			id: 1123,
+			icon: 'fa:link',
+			name: '@n8n/n8n-nodes-langchain.chainLlm',
+			iconData: {
+				icon: 'link',
+				type: 'icon',
+			},
+			displayName: 'Basic LLM Chain',
+		},
+	],
+};
+
+describe('TemplatesInfoCard', () => {
+	beforeEach(() => {
+		pinia = createPinia();
+		setActivePinia(pinia);
+	});
+
+	it('should render component properly', () => {
+		const { getByText, container, debug } = renderComponent({
+			pinia,
+			props: {
+				collection: TEST_COLLECTION,
+			},
+		});
+		expect(getByText(TEST_COLLECTION.name)).toBeInTheDocument();
+		expect(getByText(`${TEST_COLLECTION.workflows.length} Workflows`)).toBeVisible();
+		expect(container.querySelectorAll('.n8n-node-icon').length).toBe(TEST_COLLECTION.nodes.length);
+	});
+
+	it('should not render item count if configured so', () => {
+		const { getByText } = renderComponent({
+			pinia,
+			props: {
+				collection: TEST_COLLECTION,
+				showItemCount: false,
+			},
+		});
+		expect(getByText(`${TEST_COLLECTION.workflows.length} Workflows`)).not.toBeVisible();
+	});
+});
diff --git a/packages/editor-ui/src/components/__tests__/TextWithHIghlights.test.ts b/packages/editor-ui/src/components/__tests__/TextWithHIghlights.test.ts
new file mode 100644
index 0000000000000..555ae1dae879b
--- /dev/null
+++ b/packages/editor-ui/src/components/__tests__/TextWithHIghlights.test.ts
@@ -0,0 +1,103 @@
+import { shallowMount } from '@vue/test-utils';
+import TextWithHighlights from '@/components/TextWithHighlights.vue';
+
+describe('TextWithHighlights', () => {
+	it('highlights the search text in the content', () => {
+		const wrapper = shallowMount(TextWithHighlights, {
+			props: {
+				content: 'Test content',
+				search: 'Test',
+			},
+		});
+
+		expect(wrapper.html()).toContain('<mark>Test</mark>');
+		expect(wrapper.html()).toContain('<span> content</span>');
+	});
+
+	it('renders correctly when search is not set', () => {
+		const wrapper = shallowMount(TextWithHighlights, {
+			props: {
+				content: 'Test content',
+			},
+		});
+
+		expect(wrapper.html()).toEqual('<span>Test content</span>');
+		expect(wrapper.html()).not.toContain('<mark>');
+	});
+
+	it('renders correctly numbers when search is not set', () => {
+		const wrapper = shallowMount(TextWithHighlights, {
+			props: {
+				content: 1,
+			},
+		});
+
+		expect(wrapper.html()).toEqual('<span>1</span>');
+		expect(wrapper.html()).not.toContain('<mark>');
+	});
+
+	it('renders correctly objects when search is not set', () => {
+		const wrapper = shallowMount(TextWithHighlights, {
+			props: {
+				content: { hello: 'world' },
+			},
+		});
+
+		expect(wrapper.html()).toEqual('<span>{\n  "hello": "world"\n}</span>');
+		expect(wrapper.html()).not.toContain('<mark>');
+	});
+
+	it('renders correctly objects ignoring search', () => {
+		const wrapper = shallowMount(TextWithHighlights, {
+			props: {
+				content: { hello: 'world' },
+				search: 'yo',
+			},
+		});
+
+		expect(wrapper.html()).toEqual('<span>{\n  "hello": "world"\n}</span>');
+		expect(wrapper.html()).not.toContain('<mark>');
+	});
+
+	it('highlights the search text in middle of the content', () => {
+		const wrapper = shallowMount(TextWithHighlights, {
+			props: {
+				content: 'Test content hello world',
+				search: 'con',
+			},
+		});
+
+		expect(wrapper.html()).toEqual(
+			'<span><span>Test </span><mark>con</mark><span>tent hello world</span></span>',
+		);
+	});
+
+	it('handles special regex characters in search correctly', () => {
+		const wrapper = shallowMount(TextWithHighlights, {
+			props: {
+				content: 'Test content (hello) world',
+				search: '(hello)',
+			},
+		});
+
+		expect(wrapper.html()).toEqual(
+			'<span><span>Test content </span><mark>(hello)</mark><span> world</span></span>',
+		);
+	});
+
+	it('searches for special regex characters correctly', () => {
+		const wrapper = shallowMount(TextWithHighlights, {
+			props: {
+				// eslint-disable-next-line n8n-local-rules/no-interpolation-in-regular-string
+				content: 'Test content ()^${}[] world',
+				// eslint-disable-next-line n8n-local-rules/no-interpolation-in-regular-string
+				search: '()^${}[]',
+			},
+		});
+
+		expect(wrapper.html()).toEqual(
+			// eslint-disable-next-line n8n-local-rules/no-interpolation-in-regular-string
+			'<span><span>Test content </span><mark>()^${}[]</mark><span> world</span></span>',
+		);
+	});
+});
diff --git a/packages/editor-ui/src/components/__tests__/VariablesRow.spec.ts b/packages/editor-ui/src/components/__tests__/VariablesRow.spec.ts
index 2a68e87a2a0a9..d53ec96e6d635 100644
--- a/packages/editor-ui/src/components/__tests__/VariablesRow.spec.ts
+++ b/packages/editor-ui/src/components/__tests__/VariablesRow.spec.ts
@@ -1,24 +1,39 @@
 import VariablesRow from '../VariablesRow.vue';
 import type { EnvironmentVariable } from '@/Interface';
 import { fireEvent } from '@testing-library/vue';
-import { createPinia, setActivePinia } from 'pinia';
 import { setupServer } from '@/__tests__/server';
 import { afterAll, beforeAll } from 'vitest';
-import { useSettingsStore, useUsersStore } from '@/stores';
-import { renderComponent } from '@/__tests__/utils';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useUsersStore } from '@/stores/users.store';
+import { createComponentRenderer } from '@/__tests__/render';
+import { createTestingPinia } from '@pinia/testing';
+import { STORES } from '@/constants';
+
+const renderComponent = createComponentRenderer(VariablesRow, {
+	pinia: createTestingPinia({
+		initialState: {
+			[STORES.SETTINGS]: {
+				settings: {
+					enterprise: {
+						variables: true,
+					},
+				},
+			},
+		},
+	}),
+	global: {
+		stubs: ['n8n-tooltip'],
+	},
+});
 
 describe('VariablesRow', () => {
 	let server: ReturnType<typeof setupServer>;
-	let pinia: ReturnType<typeof createPinia>;
 
 	beforeAll(() => {
 		server = setupServer();
 	});
 
 	beforeEach(async () => {
-		pinia = createPinia();
-		setActivePinia(pinia);
-
 		await useSettingsStore().getSettings();
 		await useUsersStore().loginWithCookie();
 	});
@@ -27,8 +42,6 @@ describe('VariablesRow', () => {
 		server.shutdown();
 	});
 
-	const stubs = ['n8n-tooltip'];
-
 	const environmentVariable: EnvironmentVariable = {
 		id: 1,
 		key: 'key',
@@ -36,25 +49,20 @@ describe('VariablesRow', () => {
 	};
 
 	it('should render correctly', () => {
-		const wrapper = renderComponent(VariablesRow, {
+		const wrapper = renderComponent({
 			props: {
 				data: environmentVariable,
 			},
-			stubs,
-			pinia,
 		});
 
-		expect(wrapper.html()).toMatchSnapshot();
 		expect(wrapper.container.querySelectorAll('td')).toHaveLength(4);
 	});
 
 	it('should show edit and delete buttons on hover', async () => {
-		const wrapper = renderComponent(VariablesRow, {
+		const wrapper = renderComponent({
 			props: {
 				data: environmentVariable,
 			},
-			stubs,
-			pinia,
 		});
 
 		await fireEvent.mouseEnter(wrapper.container);
@@ -64,13 +72,11 @@ describe('VariablesRow', () => {
 	});
 
 	it('should show key and value inputs in edit mode', async () => {
-		const wrapper = renderComponent(VariablesRow, {
+		const wrapper = renderComponent({
 			props: {
 				data: environmentVariable,
 				editing: true,
 			},
-			stubs,
-			pinia,
 		});
 
 		await fireEvent.mouseEnter(wrapper.container);
@@ -83,18 +89,14 @@ describe('VariablesRow', () => {
 		expect(wrapper.getByTestId('variable-row-value-input').querySelector('input')).toHaveValue(
 			environmentVariable.value,
 		);
-
-		expect(wrapper.html()).toMatchSnapshot();
 	});
 
 	it('should show cancel and save buttons in edit mode', async () => {
-		const wrapper = renderComponent(VariablesRow, {
+		const wrapper = renderComponent({
 			props: {
 				data: environmentVariable,
 				editing: true,
 			},
-			stubs,
-			pinia,
 		});
 
 		await fireEvent.mouseEnter(wrapper.container);
diff --git a/packages/editor-ui/src/components/__tests__/WorkflowCard.test.ts b/packages/editor-ui/src/components/__tests__/WorkflowCard.test.ts
new file mode 100644
index 0000000000000..7e68c3c0022ea
--- /dev/null
+++ b/packages/editor-ui/src/components/__tests__/WorkflowCard.test.ts
@@ -0,0 +1,98 @@
+import type { MockInstance } from 'vitest';
+import { setActivePinia, createPinia } from 'pinia';
+import { waitFor, within } from '@testing-library/vue';
+import userEvent from '@testing-library/user-event';
+import { createComponentRenderer } from '@/__tests__/render';
+import { VIEWS } from '@/constants';
+import WorkflowCard from '@/components/WorkflowCard.vue';
+
+const $router = {
+	push: vi.fn(),
+	resolve: vi.fn().mockImplementation(() => ({ href: '' })),
+};
+
+const renderComponent = createComponentRenderer(WorkflowCard, {
+	global: {
+		mocks: {
+			$router,
+		},
+	},
+});
+
+const createWorkflow = (overrides = {}) => ({
+	id: '1',
+	name: 'My Workflow',
+	createdAt: '2021-01-01T00:00:00.000Z',
+	...overrides,
+});
+
+describe('WorkflowCard', () => {
+	let pinia: ReturnType<typeof createPinia>;
+	let windowOpenSpy: MockInstance;
+
+	beforeEach(async () => {
+		pinia = createPinia();
+		setActivePinia(pinia);
+		windowOpenSpy = vi.spyOn(window, 'open');
+	});
+
+	afterEach(() => {
+		vi.clearAllMocks();
+	});
+
+	it('should render a card with the workflow name and open workflow clicking on it', async () => {
+		const data = createWorkflow();
+		const { getByRole } = renderComponent({ props: { data } });
+		const cardTitle = getByRole('heading', { level: 2, name: data.name });
+
+		expect(cardTitle).toBeInTheDocument();
+
+		await userEvent.click(cardTitle);
+		await waitFor(() => {
+			expect($router.push).toHaveBeenCalledWith({
+				name: VIEWS.WORKFLOW,
+				params: { name: data.id },
+			});
+		});
+
+		// Opens in new tab if meta key is used
+		const user = userEvent.setup();
+
+		await user.keyboard('[ControlLeft>]');
+		await user.click(cardTitle);
+		await waitFor(() => {
+			expect($router.push).toHaveBeenCalledTimes(1);
+		});
+		expect(windowOpenSpy).toHaveBeenCalled();
+	});
+
+	it('should open card actions menu and not open workflow, open only on card action', async () => {
+		const data = createWorkflow();
+		const { getByTestId } = renderComponent({ props: { data } });
+		const cardActions = getByTestId('workflow-card-actions');
+
+		expect(cardActions).toBeInTheDocument();
+
+		const cardActionsOpener = within(cardActions).getByRole('button');
+		expect(cardActionsOpener).toBeInTheDocument();
+
+		const controllingId = cardActionsOpener.getAttribute('aria-controls');
+
+		await userEvent.click(cardActions);
+		await waitFor(() => {
+			expect($router.push).not.toHaveBeenCalled();
+		});
+
+		const actions = document.querySelector(`#${controllingId}`);
+		await waitFor(() => {
+			expect(actions).toBeInTheDocument();
+		});
+		await userEvent.click(actions!.querySelectorAll('li')[0]);
+		await waitFor(() => {
+			expect($router.push).toHaveBeenCalledWith({
+				name: VIEWS.WORKFLOW,
+				params: { name: data.id },
+			});
+		});
+	});
+});
diff --git a/packages/editor-ui/src/components/__tests__/WorkflowLMChatModal.test.ts b/packages/editor-ui/src/components/__tests__/WorkflowLMChatModal.test.ts
new file mode 100644
index 0000000000000..ea080df00b977
--- /dev/null
+++ b/packages/editor-ui/src/components/__tests__/WorkflowLMChatModal.test.ts
@@ -0,0 +1,163 @@
+import WorkflowLMChatModal from '@/components/WorkflowLMChat.vue';
+import { AGENT_NODE_TYPE, CHAT_TRIGGER_NODE_TYPE, WORKFLOW_LM_CHAT_MODAL_KEY } from '@/constants';
+import { createComponentRenderer } from '@/__tests__/render';
+import { fireEvent, waitFor } from '@testing-library/vue';
+import { uuid } from '@jsplumb/util';
+import { createTestNode, createTestWorkflow } from '@/__tests__/mocks';
+import { createPinia, setActivePinia } from 'pinia';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useUIStore } from '@/stores/ui.store';
+import { useUsersStore } from '@/stores/users.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { testingNodeTypes, mockNodeTypesToArray } from '@/__tests__/defaults';
+import { setupServer } from '@/__tests__/server';
+
+const renderComponent = createComponentRenderer(WorkflowLMChatModal, {
+	props: {
+		teleported: false,
+		appendToBody: false,
+	},
+});
+
+async function createPiniaWithAINodes(options = { withConnections: true, withAgentNode: true }) {
+	const { withConnections, withAgentNode } = options;
+	const workflowId = uuid();
+	const workflow = createTestWorkflow({
+		id: workflowId,
+		name: 'Test Workflow',
+		connections: withConnections
+			? {
+					'Chat Trigger': {
+						main: [
+							[
+								{
+									node: 'Agent',
+									type: 'main',
+									index: 0,
+								},
+							],
+						],
+					},
+				}
+			: {},
+		active: true,
+		nodes: [
+			createTestNode({
+				name: 'Chat Trigger',
+				type: CHAT_TRIGGER_NODE_TYPE,
+			}),
+			...(withAgentNode
+				? [
+						createTestNode({
+							name: 'Agent',
+							type: AGENT_NODE_TYPE,
+						}),
+					]
+				: []),
+		],
+	});
+
+	const pinia = createPinia();
+	setActivePinia(pinia);
+
+	const workflowsStore = useWorkflowsStore();
+	const nodeTypesStore = useNodeTypesStore();
+	const uiStore = useUIStore();
+
+	nodeTypesStore.setNodeTypes(
+		mockNodeTypesToArray({
+			[CHAT_TRIGGER_NODE_TYPE]: testingNodeTypes[CHAT_TRIGGER_NODE_TYPE],
+			[AGENT_NODE_TYPE]: testingNodeTypes[AGENT_NODE_TYPE],
+		}),
+	);
+	workflowsStore.workflow = workflow;
+
+	await useSettingsStore().getSettings();
+	await useUsersStore().loginWithCookie();
+	uiStore.openModal(WORKFLOW_LM_CHAT_MODAL_KEY);
+
+	return pinia;
+}
+
+describe('WorkflowLMChatModal', () => {
+	let server: ReturnType<typeof setupServer>;
+
+	beforeAll(() => {
+		server = setupServer();
+	});
+
+	afterEach(() => {
+		vi.clearAllMocks();
+	});
+
+	afterAll(() => {
+		server.shutdown();
+	});
+
+	it('should render correctly when Agent Node not present', async () => {
+		renderComponent({
+			pinia: await createPiniaWithAINodes({
+				withConnections: false,
+				withAgentNode: false,
+			}),
+		});
+
+		await waitFor(() =>
+			expect(document.querySelectorAll('.el-notification')[0]).toHaveTextContent(
+				'Missing AI node Chat only works when an AI agent or chain(except summarization chain) is connected to the chat trigger node',
+			),
+		);
+	});
+
+	it('should render correctly when Agent Node present but not connected to Manual Chat Node', async () => {
+		renderComponent({
+			pinia: await createPiniaWithAINodes({
+				withConnections: false,
+				withAgentNode: true,
+			}),
+		});
+
+		await waitFor(() =>
+			expect(document.querySelectorAll('.el-notification')[1]).toHaveTextContent(
+				'Missing AI node Chat only works when an AI agent or chain(except summarization chain) is connected to the chat trigger node',
+			),
+		);
+	});
+
+	it('should render correctly', async () => {
+		const wrapper = renderComponent({
+			pinia: await createPiniaWithAINodes(),
+		});
+
+		await waitFor(() =>
+			expect(wrapper.container.querySelector('.modal-content')).toBeInTheDocument(),
+		);
+
+		expect(wrapper.getByTestId('workflow-lm-chat-dialog')).toBeInTheDocument();
+	});
+
+	it('should send and display chat message', async () => {
+		const wrapper = renderComponent({
+			pinia: await createPiniaWithAINodes({
+				withConnections: true,
+				withAgentNode: true,
+			}),
+		});
+
+		await waitFor(() =>
+			expect(wrapper.container.querySelector('.modal-content')).toBeInTheDocument(),
+		);
+
+		const chatDialog = wrapper.getByTestId('workflow-lm-chat-dialog');
+		const chatSendButton = wrapper.getByTestId('workflow-chat-send-button');
+		const chatInput = wrapper.getByTestId('workflow-chat-input');
+
+		await fireEvent.update(chatInput, 'Hello!');
+		await fireEvent.click(chatSendButton);
+
+		await waitFor(() => expect(chatDialog.querySelectorAll('.message')).toHaveLength(1));
+
+		expect(chatDialog.querySelector('.message')).toHaveTextContent('Hello!');
+	});
+});
diff --git a/packages/editor-ui/src/components/__tests__/WorkflowPreview.test.ts b/packages/editor-ui/src/components/__tests__/WorkflowPreview.test.ts
new file mode 100644
index 0000000000000..c2505912a4326
--- /dev/null
+++ b/packages/editor-ui/src/components/__tests__/WorkflowPreview.test.ts
@@ -0,0 +1,294 @@
+import { vi } from 'vitest';
+import { createPinia, setActivePinia } from 'pinia';
+import { waitFor } from '@testing-library/vue';
+import type { ExecutionSummary } from 'n8n-workflow';
+import { createComponentRenderer } from '@/__tests__/render';
+import type { INodeUi, IWorkflowDb } from '@/Interface';
+import WorkflowPreview from '@/components/WorkflowPreview.vue';
+import { useExecutionsStore } from '@/stores/executions.store';
+
+const renderComponent = createComponentRenderer(WorkflowPreview);
+
+let pinia: ReturnType<typeof createPinia>;
+let executionsStore: ReturnType<typeof useExecutionsStore>;
+let postMessageSpy: vi.SpyInstance;
+let consoleErrorSpy: vi.SpyInstance;
+
+const sendPostMessageCommand = (command: string) => {
+	window.postMessage(`{"command":"${command}"}`, '*');
+};
+
+describe('WorkflowPreview', () => {
+	beforeEach(() => {
+		pinia = createPinia();
+		setActivePinia(pinia);
+		executionsStore = useExecutionsStore();
+
+		consoleErrorSpy = vi.spyOn(console, 'error');
+		postMessageSpy = vi.fn();
+		Object.defineProperty(HTMLIFrameElement.prototype, 'contentWindow', {
+			writable: true,
+			value: {
+				postMessage: postMessageSpy,
+			},
+		});
+	});
+
+	afterEach(() => {
+		consoleErrorSpy.mockRestore();
+	});
+
+	it('should not call iframe postMessage when it is ready and no workflow or executionId props', async () => {
+		renderComponent({
+			pinia,
+			props: {},
+		});
+
+		sendPostMessageCommand('n8nReady');
+
+		await waitFor(() => {
+			expect(postMessageSpy).not.toHaveBeenCalled();
+		});
+	});
+
+	it('should not call iframe postMessage when it is ready and there are no nodes in the workflow', async () => {
+		const workflow = {} as IWorkflowDb;
+		renderComponent({
+			pinia,
+			props: {
+				workflow,
+			},
+		});
+
+		sendPostMessageCommand('n8nReady');
+
+		await waitFor(() => {
+			expect(postMessageSpy).not.toHaveBeenCalled();
+		});
+	});
+
+	it('should not call iframe postMessage when it is ready and nodes is not an array', async () => {
+		const workflow = { nodes: {} } as IWorkflowDb;
+		renderComponent({
+			pinia,
+			props: {
+				workflow,
+			},
+		});
+
+		sendPostMessageCommand('n8nReady');
+
+		await waitFor(() => {
+			expect(postMessageSpy).not.toHaveBeenCalled();
+		});
+	});
+
+	it('should call iframe postMessage with "openWorkflow" when it is ready and the workflow has nodes', async () => {
+		const nodes = [{ name: 'Start' }] as INodeUi[];
+		const workflow = { nodes } as IWorkflowDb;
+		renderComponent({
+			pinia,
+			props: {
+				workflow,
+			},
+		});
+
+		sendPostMessageCommand('n8nReady');
+
+		await waitFor(() => {
+			expect(postMessageSpy).toHaveBeenCalledWith(
+				JSON.stringify({
+					command: 'openWorkflow',
+					workflow,
+					canOpenNDV: true,
+					hideNodeIssues: false,
+				}),
+				'*',
+			);
+		});
+	});
+
+	it('should not call iframe postMessage with "openExecution" when executionId is passed but mode not set to "execution"', async () => {
+		const executionId = '123';
+		renderComponent({
+			pinia,
+			props: {
+				executionId,
+			},
+		});
+
+		sendPostMessageCommand('n8nReady');
+
+		await waitFor(() => {
+			expect(postMessageSpy).not.toHaveBeenCalled();
+		});
+	});
+
+	it('should call iframe postMessage with "openExecution" when executionId is passed and mode is set', async () => {
+		const executionId = '123';
+		renderComponent({
+			pinia,
+			props: {
+				executionId,
+				mode: 'execution',
+			},
+		});
+
+		sendPostMessageCommand('n8nReady');
+
+		await waitFor(() => {
+			expect(postMessageSpy).toHaveBeenCalledWith(
+				JSON.stringify({
+					command: 'openExecution',
+					executionId,
+					executionMode: '',
+					canOpenNDV: true,
+				}),
+				'*',
+			);
+		});
+	});
+
+	it('should call also iframe postMessage with "setActiveExecution" if active execution is set', async () => {
+		vi.spyOn(executionsStore, 'activeExecution', 'get').mockReturnValue({
+			id: 'abc',
+		} as ExecutionSummary);
+
+		const executionId = '123';
+		renderComponent({
+			pinia,
+			props: {
+				executionId,
+				mode: 'execution',
+			},
+		});
+
+		sendPostMessageCommand('n8nReady');
+
+		await waitFor(() => {
+			expect(postMessageSpy).toHaveBeenCalledWith(
+				JSON.stringify({
+					command: 'openExecution',
+					executionId,
+					executionMode: '',
+					canOpenNDV: true,
+				}),
+				'*',
+			);
+
+			expect(postMessageSpy).toHaveBeenCalledWith(
+				JSON.stringify({
+					command: 'setActiveExecution',
+					execution: { id: 'abc' },
+				}),
+				'*',
+			);
+		});
+	});
+
+	it('iframe should toggle "openNDV" class with postmessages', async () => {
+		const nodes = [{ name: 'Start' }] as INodeUi[];
+		const workflow = { nodes } as IWorkflowDb;
+		const { container } = renderComponent({
+			pinia,
+			props: {
+				workflow,
+			},
+		});
+
+		const iframe = container.querySelector('iframe');
+
+		expect(iframe?.classList.toString()).not.toContain('openNDV');
+
+		sendPostMessageCommand('n8nReady');
+
+		await waitFor(() => {
+			expect(postMessageSpy).toHaveBeenCalledWith(
+				JSON.stringify({
+					command: 'openWorkflow',
+					workflow,
+					canOpenNDV: true,
+					hideNodeIssues: false,
+				}),
+				'*',
+			);
+		});
+
+		sendPostMessageCommand('openNDV');
+
+		await waitFor(() => {
+			expect(iframe?.classList.toString()).toContain('openNDV');
+		});
+
+		sendPostMessageCommand('closeNDV');
+
+		await waitFor(() => {
+			expect(iframe?.classList.toString()).not.toContain('openNDV');
+		});
+	});
+
+	it('should pass the "Disable NDV" & "Hide issues" flags to using PostMessage', async () => {
+		const nodes = [{ name: 'Start' }] as INodeUi[];
+		const workflow = { nodes } as IWorkflowDb;
+		renderComponent({
+			pinia,
+			props: {
+				workflow,
+				canOpenNDV: false,
+			},
+		});
+		sendPostMessageCommand('n8nReady');
+		await waitFor(() => {
+			expect(postMessageSpy).toHaveBeenCalledWith(
+				JSON.stringify({
+					command: 'openWorkflow',
+					workflow,
+					canOpenNDV: false,
+					hideNodeIssues: false,
+				}),
+				'*',
+			);
+		});
+	});
+
+	it('should emit "close" event if iframe sends "error" command', async () => {
+		const { emitted } = renderComponent({
+			pinia,
+			props: {},
+		});
+
+		sendPostMessageCommand('error');
+
+		await waitFor(() => {
+			expect(emitted().close).toBeDefined();
+		});
+	});
+
+	it('should not do anything if no "command" is sent in the message', async () => {
+		const { emitted } = renderComponent({
+			pinia,
+			props: {},
+		});
+
+		window.postMessage('commando', '*');
+
+		await waitFor(() => {
+			expect(console.error).not.toHaveBeenCalled();
+			expect(emitted()).toEqual({});
+		});
+	});
+
+	it('should not do anything if no "command" is sent in the message and the `includes` method cannot be applied to the data', async () => {
+		const { emitted } = renderComponent({
+			pinia,
+			props: {},
+		});
+
+		window.postMessage(null, '*');
+
+		await waitFor(() => {
+			expect(console.error).not.toHaveBeenCalled();
+			expect(emitted()).toEqual({});
+		});
+	});
+});
diff --git a/packages/editor-ui/src/components/__tests__/WorkflowSettings.spec.ts b/packages/editor-ui/src/components/__tests__/WorkflowSettings.spec.ts
new file mode 100644
index 0000000000000..ca12ecbd7ddd0
--- /dev/null
+++ b/packages/editor-ui/src/components/__tests__/WorkflowSettings.spec.ts
@@ -0,0 +1,152 @@
+import { createPinia, setActivePinia } from 'pinia';
+import WorkflowSettingsVue from '../WorkflowSettings.vue';
+
+import { setupServer } from '@/__tests__/server';
+import { afterAll, beforeAll } from 'vitest';
+import { within, fireEvent } from '@testing-library/vue';
+
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useUIStore } from '@/stores/ui.store';
+
+import { createComponentRenderer } from '@/__tests__/render';
+import { EnterpriseEditionFeature, WORKFLOW_SETTINGS_MODAL_KEY } from '@/constants';
+
+import { nextTick } from 'vue';
+
+let pinia: ReturnType<typeof createPinia>;
+let workflowsStore: ReturnType<typeof useWorkflowsStore>;
+let settingsStore: ReturnType<typeof useSettingsStore>;
+let uiStore: ReturnType<typeof useUIStore>;
+
+const createComponent = createComponentRenderer(WorkflowSettingsVue, {
+	global: {
+		stubs: ['n8n-tooltip'],
+	},
+});
+
+describe('WorkflowSettingsVue', () => {
+	let server: ReturnType<typeof setupServer>;
+	beforeAll(() => {
+		server = setupServer();
+	});
+
+	beforeEach(async () => {
+		pinia = createPinia();
+		setActivePinia(pinia);
+
+		workflowsStore = useWorkflowsStore();
+		settingsStore = useSettingsStore();
+		uiStore = useUIStore();
+
+		await settingsStore.getSettings();
+
+		vi.spyOn(workflowsStore, 'workflowName', 'get').mockReturnValue('Test Workflow');
+		vi.spyOn(workflowsStore, 'workflowId', 'get').mockReturnValue('1');
+		vi.spyOn(workflowsStore, 'workflow', 'get').mockReturnValue({
+			id: '1',
+			name: 'Test Workflow',
+			active: true,
+			nodes: [],
+			connections: {},
+			createdAt: 1,
+			updatedAt: 1,
+			versionId: '123',
+		} as IWorkflowDb);
+
+		uiStore.modals[WORKFLOW_SETTINGS_MODAL_KEY] = {
+			open: true,
+		};
+	});
+
+	afterAll(() => {
+		server.shutdown();
+	});
+
+	it('should render correctly', async () => {
+		settingsStore.settings.enterprise[EnterpriseEditionFeature.Sharing] = false;
+		const wrapper = createComponent({ pinia });
+		await nextTick();
+		expect(wrapper.getByTestId('workflow-settings-dialog')).toBeVisible();
+	});
+
+	it('should not render workflow caller policy when sharing is not enabled', async () => {
+		settingsStore.settings.enterprise[EnterpriseEditionFeature.Sharing] = false;
+		const wrapper = createComponent({ pinia });
+
+		await nextTick();
+
+		expect(
+			within(wrapper.getByTestId('workflow-settings-dialog')).queryByTestId(
+				'workflow-caller-policy',
+			),
+		).not.toBeInTheDocument();
+	});
+
+	it('should render workflow caller policy when sharing is enabled', async () => {
+		settingsStore.settings.enterprise[EnterpriseEditionFeature.Sharing] = true;
+		const wrapper = createComponent({ pinia });
+
+		await nextTick();
+
+		expect(wrapper.getByTestId('workflow-caller-policy')).toBeVisible();
+	});
+
+	it('should render list of workflows field when policy is set to workflowsFromAList', async () => {
+		settingsStore.settings.enterprise[EnterpriseEditionFeature.Sharing] = true;
+		const wrapper = createComponent({ pinia });
+
+		await nextTick();
+
+		await fireEvent.click(wrapper.getByTestId('workflow-caller-policy'));
+		console.log(window.document.querySelectorAll('.el-select-dropdown__item')[4].innerHTML);
+		await fireEvent.click(window.document.querySelectorAll('.el-select-dropdown__item')[4]);
+
+		expect(wrapper.getByTestId('workflow-caller-policy-workflow-ids')).toBeVisible();
+	});
+
+	it('should not remove valid workflow ID characters', async () => {
+		const validWorkflowList = '1234567890, abcde, efgh, 1234';
+
+		settingsStore.settings.enterprise[EnterpriseEditionFeature.Sharing] = true;
+		const wrapper = createComponent({ pinia });
+
+		await nextTick();
+
+		await fireEvent.click(wrapper.getByTestId('workflow-caller-policy'));
+		console.log(window.document.querySelectorAll('.el-select-dropdown__item')[4].innerHTML);
+		await fireEvent.click(window.document.querySelectorAll('.el-select-dropdown__item')[4]);
+
+		await fireEvent.update(
+			wrapper.getByTestId('workflow-caller-policy-workflow-ids'),
+			validWorkflowList,
+		);
+
+		expect(wrapper.getByTestId('workflow-caller-policy-workflow-ids')).toHaveValue(
+			validWorkflowList,
+		);
+	});
+
+	it('should remove invalid workflow ID characters', async () => {
+		const invalidWorkflowList = '1234567890@, abc/de, ef*gh, 12%34';
+		const cleanedUpWorkflowList = '1234567890, abcde, efgh, 1234';
+
+		settingsStore.settings.enterprise[EnterpriseEditionFeature.Sharing] = true;
+		const wrapper = createComponent({ pinia });
+
+		await nextTick();
+
+		await fireEvent.click(wrapper.getByTestId('workflow-caller-policy'));
+		console.log(window.document.querySelectorAll('.el-select-dropdown__item')[4].innerHTML);
+		await fireEvent.click(window.document.querySelectorAll('.el-select-dropdown__item')[4]);
+
+		await fireEvent.update(
+			wrapper.getByTestId('workflow-caller-policy-workflow-ids'),
+			invalidWorkflowList,
+		);
+
+		expect(wrapper.getByTestId('workflow-caller-policy-workflow-ids')).toHaveValue(
+			cleanedUpWorkflowList,
+		);
+	});
+});
diff --git a/packages/editor-ui/src/components/__tests__/__snapshots__/PersonalizationModal.spec.ts.snap b/packages/editor-ui/src/components/__tests__/__snapshots__/PersonalizationModal.spec.ts.snap
deleted file mode 100644
index e7241c7063f74..0000000000000
--- a/packages/editor-ui/src/components/__tests__/__snapshots__/PersonalizationModal.spec.ts.snap
+++ /dev/null
@@ -1,284 +0,0 @@
-// Vitest Snapshot v1
-
-exports[`PersonalizationModal.vue > should render correctly 1`] = `
-"<transition-stub name=\\"dialog-fade\\" data-test-id=\\"personalization-form\\" class=\\"dialog-wrapper\\" style=\\"z-index: 2001;\\">
-  <div class=\\"el-dialog__wrapper\\">
-    <div role=\\"dialog\\" aria-modal=\\"true\\" aria-label=\\"dialog\\" class=\\"el-dialog\\" style=\\"margin-top: 15vh; width: 460px;\\">
-      <div class=\\"el-dialog__header\\">
-        <div class=\\"centerTitle\\">
-          <div>
-            <h1 class=\\"n8n-heading size-xlarge regular\\">Customize n8n to you</h1>
-          </div>
-          <div class=\\"subtitle\\">
-            <h3 class=\\"n8n-heading text-light size-small regular\\">These questions help us tailor n8n to you</h3>
-          </div>
-        </div>
-        <!---->
-      </div>
-      <div class=\\"el-dialog__body\\">
-        <div class=\\"modal-content\\">
-          <div class=\\"container\\">
-            <div>
-              <div class=\\"grid\\">
-                <div class=\\"\\">
-                  <div class=\\"container\\" data-test-id=\\"companyType\\"><label for=\\"companyType\\" class=\\"n8n-input-label inputLabel heading medium\\">
-                      <div class=\\"title\\"><span class=\\"n8n-text size-medium bold\\"> What best describes your company? <!----></span></div>
-                      <!---->
-                      <!---->
-                      <!---->
-                    </label>
-                    <div class=\\"\\">
-                      <div class=\\"n8n-select container\\" name=\\"companyType\\">
-                        <!---->
-                        <div class=\\"el-select el-select--large\\">
-                          <!---->
-                          <div class=\\"el-input el-input--large el-input--suffix\\">
-                            <!----><input type=\\"text\\" readonly=\\"readonly\\" autocomplete=\\"off\\" placeholder=\\"Select...\\" class=\\"el-input__inner\\">
-                            <!----><span class=\\"el-input__suffix\\"><span class=\\"el-input__suffix-inner\\"><i class=\\"el-select__caret el-input__icon el-icon-arrow-up\\"></i><!----><!----><!----><!----><!----></span>
-                            <!----></span>
-                            <!---->
-                            <!---->
-                          </div>
-                          <transition-stub name=\\"el-zoom-in-top\\">
-                            <div class=\\"el-select-dropdown el-popper\\" style=\\"display: none;\\">
-                              <div class=\\"el-scrollbar\\" style=\\"\\">
-                                <div class=\\"el-select-dropdown__wrap el-scrollbar__wrap el-scrollbar__wrap--hidden-default\\">
-                                  <ul class=\\"el-scrollbar__view el-select-dropdown__list\\">
-                                    <!---->
-                                    <li class=\\"el-select-dropdown__item\\"><span>Software as a service</span></li>
-                                    <li class=\\"el-select-dropdown__item\\"><span>Ecommerce</span></li>
-                                    <li class=\\"el-select-dropdown__item\\"><span>Marketing agency / consultancy</span></li>
-                                    <li class=\\"el-select-dropdown__item\\"><span>Systems integrator / Automation agency</span></li>
-                                    <li class=\\"el-select-dropdown__item\\"><span>Education</span></li>
-                                    <li class=\\"el-select-dropdown__item\\"><span>Other</span></li>
-                                    <li class=\\"el-select-dropdown__item\\"><span>I'm not using n8n for work</span></li>
-                                  </ul>
-                                </div>
-                                <div class=\\"el-scrollbar__bar is-horizontal\\">
-                                  <div class=\\"el-scrollbar__thumb\\" style=\\"transform: translateX(0%); webkit-transform: translateX(0%);\\"></div>
-                                </div>
-                                <div class=\\"el-scrollbar__bar is-vertical\\">
-                                  <div class=\\"el-scrollbar__thumb\\" style=\\"transform: translateY(0%); webkit-transform: translateY(0%);\\"></div>
-                                </div>
-                              </div>
-                              <!---->
-                            </div>
-                          </transition-stub>
-                        </div>
-                      </div>
-                    </div>
-                    <!---->
-                  </div>
-                </div>
-                <div class=\\"\\">
-                  <div class=\\"container\\" data-test-id=\\"role\\"><label for=\\"role\\" class=\\"n8n-input-label inputLabel heading medium\\">
-                      <div class=\\"title\\"><span class=\\"n8n-text size-medium bold\\"> Which role best describes you? <!----></span></div>
-                      <!---->
-                      <!---->
-                      <!---->
-                    </label>
-                    <div class=\\"\\">
-                      <div class=\\"n8n-select container\\" name=\\"role\\">
-                        <!---->
-                        <div class=\\"el-select el-select--large\\">
-                          <!---->
-                          <div class=\\"el-input el-input--large el-input--suffix\\">
-                            <!----><input type=\\"text\\" readonly=\\"readonly\\" autocomplete=\\"off\\" placeholder=\\"Select...\\" class=\\"el-input__inner\\">
-                            <!----><span class=\\"el-input__suffix\\"><span class=\\"el-input__suffix-inner\\"><i class=\\"el-select__caret el-input__icon el-icon-arrow-up\\"></i><!----><!----><!----><!----><!----></span>
-                            <!----></span>
-                            <!---->
-                            <!---->
-                          </div>
-                          <transition-stub name=\\"el-zoom-in-top\\">
-                            <div class=\\"el-select-dropdown el-popper\\" style=\\"display: none;\\">
-                              <div class=\\"el-scrollbar\\" style=\\"\\">
-                                <div class=\\"el-select-dropdown__wrap el-scrollbar__wrap el-scrollbar__wrap--hidden-default\\">
-                                  <ul class=\\"el-scrollbar__view el-select-dropdown__list\\">
-                                    <!---->
-                                    <li class=\\"el-select-dropdown__item\\"><span>Business Owner</span></li>
-                                    <li class=\\"el-select-dropdown__item\\"><span>Customer support</span></li>
-                                    <li class=\\"el-select-dropdown__item\\"><span>Data Science</span></li>
-                                    <li class=\\"el-select-dropdown__item\\"><span>Devops</span></li>
-                                    <li class=\\"el-select-dropdown__item\\"><span>IT</span></li>
-                                    <li class=\\"el-select-dropdown__item\\"><span>Engineering</span></li>
-                                    <li class=\\"el-select-dropdown__item\\"><span>Sales and Marketing</span></li>
-                                    <li class=\\"el-select-dropdown__item\\"><span>Security</span></li>
-                                    <li class=\\"el-select-dropdown__item\\"><span>Other (please specify)</span></li>
-                                  </ul>
-                                </div>
-                                <div class=\\"el-scrollbar__bar is-horizontal\\">
-                                  <div class=\\"el-scrollbar__thumb\\" style=\\"transform: translateX(0%); webkit-transform: translateX(0%);\\"></div>
-                                </div>
-                                <div class=\\"el-scrollbar__bar is-vertical\\">
-                                  <div class=\\"el-scrollbar__thumb\\" style=\\"transform: translateY(0%); webkit-transform: translateY(0%);\\"></div>
-                                </div>
-                              </div>
-                              <!---->
-                            </div>
-                          </transition-stub>
-                        </div>
-                      </div>
-                    </div>
-                    <!---->
-                  </div>
-                </div>
-                <div class=\\"\\">
-                  <div class=\\"container\\" data-test-id=\\"automationBeneficiary\\"><label for=\\"automationBeneficiary\\" class=\\"n8n-input-label inputLabel heading medium\\">
-                      <div class=\\"title\\"><span class=\\"n8n-text size-medium bold\\"> Who will your automations mainly be for? <!----></span></div>
-                      <!---->
-                      <!---->
-                      <!---->
-                    </label>
-                    <div class=\\"\\">
-                      <div class=\\"n8n-select container\\" name=\\"automationBeneficiary\\">
-                        <!---->
-                        <div class=\\"el-select el-select--large\\">
-                          <!---->
-                          <div class=\\"el-input el-input--large el-input--suffix\\">
-                            <!----><input type=\\"text\\" readonly=\\"readonly\\" autocomplete=\\"off\\" placeholder=\\"Select...\\" class=\\"el-input__inner\\">
-                            <!----><span class=\\"el-input__suffix\\"><span class=\\"el-input__suffix-inner\\"><i class=\\"el-select__caret el-input__icon el-icon-arrow-up\\"></i><!----><!----><!----><!----><!----></span>
-                            <!----></span>
-                            <!---->
-                            <!---->
-                          </div>
-                          <transition-stub name=\\"el-zoom-in-top\\">
-                            <div class=\\"el-select-dropdown el-popper\\" style=\\"display: none;\\">
-                              <div class=\\"el-scrollbar\\" style=\\"\\">
-                                <div class=\\"el-select-dropdown__wrap el-scrollbar__wrap el-scrollbar__wrap--hidden-default\\">
-                                  <ul class=\\"el-scrollbar__view el-select-dropdown__list\\">
-                                    <!---->
-                                    <li class=\\"el-select-dropdown__item\\"><span>Myself</span></li>
-                                    <li class=\\"el-select-dropdown__item\\"><span>My team</span></li>
-                                    <li class=\\"el-select-dropdown__item\\"><span>Other teams</span></li>
-                                  </ul>
-                                </div>
-                                <div class=\\"el-scrollbar__bar is-horizontal\\">
-                                  <div class=\\"el-scrollbar__thumb\\" style=\\"transform: translateX(0%); webkit-transform: translateX(0%);\\"></div>
-                                </div>
-                                <div class=\\"el-scrollbar__bar is-vertical\\">
-                                  <div class=\\"el-scrollbar__thumb\\" style=\\"transform: translateY(0%); webkit-transform: translateY(0%);\\"></div>
-                                </div>
-                              </div>
-                              <!---->
-                            </div>
-                          </transition-stub>
-                        </div>
-                      </div>
-                    </div>
-                    <!---->
-                  </div>
-                </div>
-                <div class=\\"\\">
-                  <div class=\\"container\\" data-test-id=\\"companySize\\"><label for=\\"companySize\\" class=\\"n8n-input-label inputLabel heading medium\\">
-                      <div class=\\"title\\"><span class=\\"n8n-text size-medium bold\\"> How big is your company? <!----></span></div>
-                      <!---->
-                      <!---->
-                      <!---->
-                    </label>
-                    <div class=\\"\\">
-                      <div class=\\"n8n-select container\\" name=\\"companySize\\">
-                        <!---->
-                        <div class=\\"el-select el-select--large\\">
-                          <!---->
-                          <div class=\\"el-input el-input--large el-input--suffix\\">
-                            <!----><input type=\\"text\\" readonly=\\"readonly\\" autocomplete=\\"off\\" placeholder=\\"Select...\\" class=\\"el-input__inner\\">
-                            <!----><span class=\\"el-input__suffix\\"><span class=\\"el-input__suffix-inner\\"><i class=\\"el-select__caret el-input__icon el-icon-arrow-up\\"></i><!----><!----><!----><!----><!----></span>
-                            <!----></span>
-                            <!---->
-                            <!---->
-                          </div>
-                          <transition-stub name=\\"el-zoom-in-top\\">
-                            <div class=\\"el-select-dropdown el-popper\\" style=\\"display: none;\\">
-                              <div class=\\"el-scrollbar\\" style=\\"\\">
-                                <div class=\\"el-select-dropdown__wrap el-scrollbar__wrap el-scrollbar__wrap--hidden-default\\">
-                                  <ul class=\\"el-scrollbar__view el-select-dropdown__list\\">
-                                    <!---->
-                                    <li class=\\"el-select-dropdown__item\\"><span>Less than 20 people</span></li>
-                                    <li class=\\"el-select-dropdown__item\\"><span>20-99 people</span></li>
-                                    <li class=\\"el-select-dropdown__item\\"><span>100-499 people</span></li>
-                                    <li class=\\"el-select-dropdown__item\\"><span>500-999 people</span></li>
-                                    <li class=\\"el-select-dropdown__item\\"><span>1000+ people</span></li>
-                                    <li class=\\"el-select-dropdown__item\\"><span>I'm not using n8n for work</span></li>
-                                  </ul>
-                                </div>
-                                <div class=\\"el-scrollbar__bar is-horizontal\\">
-                                  <div class=\\"el-scrollbar__thumb\\" style=\\"transform: translateX(0%); webkit-transform: translateX(0%);\\"></div>
-                                </div>
-                                <div class=\\"el-scrollbar__bar is-vertical\\">
-                                  <div class=\\"el-scrollbar__thumb\\" style=\\"transform: translateY(0%); webkit-transform: translateY(0%);\\"></div>
-                                </div>
-                              </div>
-                              <!---->
-                            </div>
-                          </transition-stub>
-                        </div>
-                      </div>
-                    </div>
-                    <!---->
-                  </div>
-                </div>
-                <div class=\\"\\">
-                  <div class=\\"container\\" data-test-id=\\"reportedSource\\"><label for=\\"reportedSource\\" class=\\"n8n-input-label inputLabel heading medium\\">
-                      <div class=\\"title\\"><span class=\\"n8n-text size-medium bold\\"> How did you hear about n8n? <!----></span></div>
-                      <!---->
-                      <!---->
-                      <!---->
-                    </label>
-                    <div class=\\"\\">
-                      <div class=\\"n8n-select container\\" name=\\"reportedSource\\">
-                        <!---->
-                        <div class=\\"el-select el-select--large\\">
-                          <!---->
-                          <div class=\\"el-input el-input--large el-input--suffix\\">
-                            <!----><input type=\\"text\\" readonly=\\"readonly\\" autocomplete=\\"off\\" placeholder=\\"Select...\\" class=\\"el-input__inner\\">
-                            <!----><span class=\\"el-input__suffix\\"><span class=\\"el-input__suffix-inner\\"><i class=\\"el-select__caret el-input__icon el-icon-arrow-up\\"></i><!----><!----><!----><!----><!----></span>
-                            <!----></span>
-                            <!---->
-                            <!---->
-                          </div>
-                          <transition-stub name=\\"el-zoom-in-top\\">
-                            <div class=\\"el-select-dropdown el-popper\\" style=\\"display: none;\\">
-                              <div class=\\"el-scrollbar\\" style=\\"\\">
-                                <div class=\\"el-select-dropdown__wrap el-scrollbar__wrap el-scrollbar__wrap--hidden-default\\">
-                                  <ul class=\\"el-scrollbar__view el-select-dropdown__list\\">
-                                    <!---->
-                                    <li class=\\"el-select-dropdown__item\\"><span>Google</span></li>
-                                    <li class=\\"el-select-dropdown__item\\"><span>Twitter</span></li>
-                                    <li class=\\"el-select-dropdown__item\\"><span>LinkedIn</span></li>
-                                    <li class=\\"el-select-dropdown__item\\"><span>YouTube</span></li>
-                                    <li class=\\"el-select-dropdown__item\\"><span>Friend / Word of mouth</span></li>
-                                    <li class=\\"el-select-dropdown__item\\"><span>Podcast</span></li>
-                                    <li class=\\"el-select-dropdown__item\\"><span>Event</span></li>
-                                    <li class=\\"el-select-dropdown__item\\"><span>Other (please specify)</span></li>
-                                  </ul>
-                                </div>
-                                <div class=\\"el-scrollbar__bar is-horizontal\\">
-                                  <div class=\\"el-scrollbar__thumb\\" style=\\"transform: translateX(0%); webkit-transform: translateX(0%);\\"></div>
-                                </div>
-                                <div class=\\"el-scrollbar__bar is-vertical\\">
-                                  <div class=\\"el-scrollbar__thumb\\" style=\\"transform: translateY(0%); webkit-transform: translateY(0%);\\"></div>
-                                </div>
-                              </div>
-                              <!---->
-                            </div>
-                          </transition-stub>
-                        </div>
-                      </div>
-                    </div>
-                    <!---->
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-        <div class=\\"footer\\">
-          <div><button aria-live=\\"polite\\" class=\\"button button primary medium float-right\\">
-              <!----><span>Get started</span></button></div>
-        </div>
-      </div>
-      <!---->
-    </div>
-  </div>
-</transition-stub>"
-`;
diff --git a/packages/editor-ui/src/components/__tests__/__snapshots__/RunDataJson.test.ts.snap b/packages/editor-ui/src/components/__tests__/__snapshots__/RunDataJson.test.ts.snap
index e7f97d56767c8..0f8242eacead8 100644
--- a/packages/editor-ui/src/components/__tests__/__snapshots__/RunDataJson.test.ts.snap
+++ b/packages/editor-ui/src/components/__tests__/__snapshots__/RunDataJson.test.ts.snap
@@ -1,4 +1,4 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`RunDataJson.vue > renders json values properly 1`] = `
 <div>
@@ -9,691 +9,734 @@ exports[`RunDataJson.vue > renders json values properly 1`] = `
     <div
       class=""
     >
+      
       <div
-        class="json-data vjs-tree"
+        class="vjs-tree json-data"
       >
+        
         <div
-          class="vjs-tree-list"
+          class="vjs-tree-node"
         >
+          <!---->
+          <!---->
           <div
-            class="vjs-tree-list-holder"
+            class="vjs-indent"
           >
+            
+            
+            <!---->
+          </div>
+          <!---->
+          <span>
+            <span
+              class="vjs-tree-brackets"
+            >
+              [
+            </span>
+            <!---->
+            <!---->
+          </span>
+        </div>
+        <div
+          class="vjs-tree-node"
+        >
+          <!---->
+          <!---->
+          <div
+            class="vjs-indent"
+          >
+            
             <div
-              class="vjs-tree-list-holder-inner"
+              class="vjs-indent-unit has-line"
+            />
+            
+            <!---->
+          </div>
+          <!---->
+          <span>
+            <span
+              class="vjs-tree-brackets"
             >
-              <div
-                class="vjs-tree-node"
-                collapsed-on-click-brackets="true"
-              >
-                <!---->
-                <!---->
-                <div
-                  class="vjs-indent"
-                >
-                  <!---->
-                </div>
-                <!---->
-                <span>
-                  <span
-                    class="vjs-tree-brackets"
-                  >
-                    [
-                  </span>
-                  <!---->
-                  <!---->
-                </span>
-              </div>
-              <div
-                class="vjs-tree-node"
-                collapsed-on-click-brackets="true"
-              >
-                <!---->
-                <!---->
-                <div
-                  class="vjs-indent"
-                >
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <!---->
-                </div>
-                <!---->
-                <span>
-                  <span
-                    class="vjs-tree-brackets"
-                  >
-                    {
-                  </span>
-                  <!---->
-                  <!---->
-                </span>
-              </div>
-              <div
-                class="vjs-tree-node"
-                collapsed-on-click-brackets="true"
-              >
-                <!---->
-                <!---->
-                <div
-                  class="vjs-indent"
-                >
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <!---->
-                </div>
-                <span
-                  class="vjs-key"
-                >
-                  <span
-                    class="mappable"
-                    data-depth="2"
-                    data-name="list"
-                    data-path="[0].list"
-                    data-target="mappable"
-                    data-value="{{ $node.Set.json.list }}"
-                  >
-                    "list"
-                  </span>
-                  <span>
-                    :
-                  </span>
-                </span>
-                <span>
-                  <span
-                    class="vjs-tree-brackets"
-                  >
-                    [
-                  </span>
-                  <!---->
-                  <!---->
-                </span>
-              </div>
-              <div
-                class="vjs-tree-node"
-                collapsed-on-click-brackets="true"
-              >
-                <!---->
-                <!---->
-                <div
-                  class="vjs-indent"
-                >
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <!---->
-                </div>
-                <!---->
-                <span>
-                  <span
-                    class="vjs-value vjs-value-number"
-                  >
-                    <span
-                      class="ph-no-capture mappable"
-                      data-depth="3"
-                      data-name="list[0]"
-                      data-path="[0].list[0]"
-                      data-target="mappable"
-                      data-value="{{ $node.Set.json.list[0] }}"
-                    >
-                      1
-                    </span>
-                  </span>
-                  <span>
-                    ,
-                  </span>
-                  <!---->
-                </span>
-              </div>
-              <div
-                class="vjs-tree-node"
-                collapsed-on-click-brackets="true"
-              >
-                <!---->
-                <!---->
-                <div
-                  class="vjs-indent"
-                >
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <!---->
-                </div>
-                <!---->
-                <span>
-                  <span
-                    class="vjs-value vjs-value-number"
-                  >
-                    <span
-                      class="ph-no-capture mappable"
-                      data-depth="3"
-                      data-name="list[1]"
-                      data-path="[0].list[1]"
-                      data-target="mappable"
-                      data-value="{{ $node.Set.json.list[1] }}"
-                    >
-                      2
-                    </span>
-                  </span>
-                  <span>
-                    ,
-                  </span>
-                  <!---->
-                </span>
-              </div>
-              <div
-                class="vjs-tree-node"
-                collapsed-on-click-brackets="true"
-              >
-                <!---->
-                <!---->
-                <div
-                  class="vjs-indent"
-                >
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <!---->
-                </div>
-                <!---->
-                <span>
-                  <span
-                    class="vjs-value vjs-value-number"
-                  >
-                    <span
-                      class="ph-no-capture mappable"
-                      data-depth="3"
-                      data-name="list[2]"
-                      data-path="[0].list[2]"
-                      data-target="mappable"
-                      data-value="{{ $node.Set.json.list[2] }}"
-                    >
-                      3
-                    </span>
-                  </span>
-                  <!---->
-                  <!---->
-                </span>
-              </div>
-              <div
-                class="vjs-tree-node"
-                collapsed-on-click-brackets="true"
-              >
-                <!---->
-                <!---->
-                <div
-                  class="vjs-indent"
-                >
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <!---->
-                </div>
-                <!---->
-                <span>
-                  <span
-                    class="vjs-tree-brackets"
-                  >
-                    ]
-                  </span>
-                  <span>
-                    ,
-                  </span>
-                  <!---->
-                </span>
-              </div>
-              <div
-                class="vjs-tree-node"
-                collapsed-on-click-brackets="true"
-              >
-                <!---->
-                <!---->
-                <div
-                  class="vjs-indent"
-                >
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <!---->
-                </div>
-                <span
-                  class="vjs-key"
-                >
-                  <span
-                    class="mappable"
-                    data-depth="2"
-                    data-name="record"
-                    data-path="[0].record"
-                    data-target="mappable"
-                    data-value="{{ $node.Set.json.record }}"
-                  >
-                    "record"
-                  </span>
-                  <span>
-                    :
-                  </span>
-                </span>
-                <span>
-                  <span
-                    class="vjs-tree-brackets"
-                  >
-                    {
-                  </span>
-                  <!---->
-                  <!---->
-                </span>
-              </div>
-              <div
-                class="vjs-tree-node"
-                collapsed-on-click-brackets="true"
-              >
-                <!---->
-                <!---->
-                <div
-                  class="vjs-indent"
-                >
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <!---->
-                </div>
-                <span
-                  class="vjs-key"
-                >
-                  <span
-                    class="mappable"
-                    data-depth="3"
-                    data-name="name"
-                    data-path="[0].record.name"
-                    data-target="mappable"
-                    data-value="{{ $node.Set.json.record.name }}"
-                  >
-                    "name"
-                  </span>
-                  <span>
-                    :
-                  </span>
-                </span>
-                <span>
-                  <span
-                    class="vjs-value vjs-value-string"
-                  >
-                    <span
-                      class="ph-no-capture"
-                    >
-                      "Joe"
-                    </span>
-                  </span>
-                  <!---->
-                  <!---->
-                </span>
-              </div>
-              <div
-                class="vjs-tree-node"
-                collapsed-on-click-brackets="true"
-              >
-                <!---->
-                <!---->
-                <div
-                  class="vjs-indent"
-                >
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <!---->
-                </div>
-                <!---->
-                <span>
-                  <span
-                    class="vjs-tree-brackets"
-                  >
-                    }
-                  </span>
-                  <span>
-                    ,
-                  </span>
-                  <!---->
-                </span>
-              </div>
-              <div
-                class="vjs-tree-node"
-                collapsed-on-click-brackets="true"
-              >
-                <!---->
-                <!---->
-                <div
-                  class="vjs-indent"
-                >
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <!---->
-                </div>
-                <span
-                  class="vjs-key"
-                >
-                  <span
-                    class="mappable"
-                    data-depth="2"
-                    data-name="myNumber"
-                    data-path="[0].myNumber"
-                    data-target="mappable"
-                    data-value="{{ $node.Set.json.myNumber }}"
-                  >
-                    "myNumber"
-                  </span>
-                  <span>
-                    :
-                  </span>
-                </span>
-                <span>
-                  <span
-                    class="vjs-value vjs-value-number"
-                  >
-                    <span
-                      class="ph-no-capture"
-                    >
-                      123
-                    </span>
-                  </span>
-                  <span>
-                    ,
-                  </span>
-                  <!---->
-                </span>
-              </div>
-              <div
-                class="vjs-tree-node"
-                collapsed-on-click-brackets="true"
-              >
-                <!---->
-                <!---->
-                <div
-                  class="vjs-indent"
-                >
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <!---->
-                </div>
-                <span
-                  class="vjs-key"
-                >
-                  <span
-                    class="mappable"
-                    data-depth="2"
-                    data-name="myStringNumber"
-                    data-path="[0].myStringNumber"
-                    data-target="mappable"
-                    data-value="{{ $node.Set.json.myStringNumber }}"
-                  >
-                    "myStringNumber"
-                  </span>
-                  <span>
-                    :
-                  </span>
-                </span>
-                <span>
-                  <span
-                    class="vjs-value vjs-value-string"
-                  >
-                    <span
-                      class="ph-no-capture"
-                    >
-                      "456"
-                    </span>
-                  </span>
-                  <span>
-                    ,
-                  </span>
-                  <!---->
-                </span>
-              </div>
-              <div
-                class="vjs-tree-node"
-                collapsed-on-click-brackets="true"
-              >
-                <!---->
-                <!---->
-                <div
-                  class="vjs-indent"
-                >
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <!---->
-                </div>
-                <span
-                  class="vjs-key"
-                >
-                  <span
-                    class="mappable"
-                    data-depth="2"
-                    data-name="myStringText"
-                    data-path="[0].myStringText"
-                    data-target="mappable"
-                    data-value="{{ $node.Set.json.myStringText }}"
-                  >
-                    "myStringText"
-                  </span>
-                  <span>
-                    :
-                  </span>
-                </span>
-                <span>
-                  <span
-                    class="vjs-value vjs-value-string"
-                  >
-                    <span
-                      class="ph-no-capture"
-                    >
-                      "abc"
-                    </span>
-                  </span>
-                  <span>
-                    ,
-                  </span>
-                  <!---->
-                </span>
-              </div>
-              <div
-                class="vjs-tree-node"
-                collapsed-on-click-brackets="true"
-              >
-                <!---->
-                <!---->
-                <div
-                  class="vjs-indent"
-                >
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <!---->
-                </div>
-                <span
-                  class="vjs-key"
-                >
-                  <span
-                    class="mappable"
-                    data-depth="2"
-                    data-name="nil"
-                    data-path="[0].nil"
-                    data-target="mappable"
-                    data-value="{{ $node.Set.json.nil }}"
-                  >
-                    "nil"
-                  </span>
-                  <span>
-                    :
-                  </span>
-                </span>
-                <span>
-                  <span
-                    class="vjs-value vjs-value-null"
-                  >
-                    <span
-                      class="ph-no-capture"
-                    >
-                      null
-                    </span>
-                  </span>
-                  <span>
-                    ,
-                  </span>
-                  <!---->
-                </span>
-              </div>
-              <div
-                class="vjs-tree-node"
-                collapsed-on-click-brackets="true"
+              {
+            </span>
+            <!---->
+            <!---->
+          </span>
+        </div>
+        <div
+          class="vjs-tree-node"
+        >
+          <!---->
+          <!---->
+          <div
+            class="vjs-indent"
+          >
+            
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            
+            <!---->
+          </div>
+          <span
+            class="vjs-key"
+          >
+            
+            <span
+              class="mappable"
+              data-depth="2"
+              data-name="list"
+              data-path="[0].list"
+              data-target="mappable"
+              data-value="{{ $('Set').item.json.list }}"
+            >
+              "list"
+            </span>
+            
+            <span
+              class="vjs-colon"
+            >
+              : 
+            </span>
+          </span>
+          <span>
+            <span
+              class="vjs-tree-brackets"
+            >
+              [
+            </span>
+            <!---->
+            <!---->
+          </span>
+        </div>
+        <div
+          class="vjs-tree-node"
+        >
+          <!---->
+          <!---->
+          <div
+            class="vjs-indent"
+          >
+            
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            
+            <!---->
+          </div>
+          <!---->
+          <span>
+            <span
+              class="vjs-value vjs-value-number"
+            >
+              
+              <span
+                class="mappable ph-no-capture"
+                data-depth="3"
+                data-name="list[0]"
+                data-path="[0].list[0]"
+                data-target="mappable"
+                data-value="{{ $('Set').item.json.list[0] }}"
               >
-                <!---->
-                <!---->
-                <div
-                  class="vjs-indent"
-                >
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <!---->
-                </div>
-                <span
-                  class="vjs-key"
-                >
-                  <span
-                    class="mappable"
-                    data-depth="2"
-                    data-name="d"
-                    data-path="[0].d"
-                    data-target="mappable"
-                    data-value="{{ $node.Set.json.d }}"
-                  >
-                    "d"
-                  </span>
-                  <span>
-                    :
-                  </span>
-                </span>
-                <span>
-                  <span
-                    class="vjs-value vjs-value-undefined"
-                  >
-                    <span
-                      class="ph-no-capture"
-                    >
-                      
-                    </span>
-                  </span>
-                  <!---->
-                  <!---->
-                </span>
-              </div>
-              <div
-                class="vjs-tree-node"
-                collapsed-on-click-brackets="true"
+                1
+              </span>
+              
+            </span>
+            <span>
+              ,
+            </span>
+            <!---->
+          </span>
+        </div>
+        <div
+          class="vjs-tree-node"
+        >
+          <!---->
+          <!---->
+          <div
+            class="vjs-indent"
+          >
+            
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            
+            <!---->
+          </div>
+          <!---->
+          <span>
+            <span
+              class="vjs-value vjs-value-number"
+            >
+              
+              <span
+                class="mappable ph-no-capture"
+                data-depth="3"
+                data-name="list[1]"
+                data-path="[0].list[1]"
+                data-target="mappable"
+                data-value="{{ $('Set').item.json.list[1] }}"
               >
-                <!---->
-                <!---->
-                <div
-                  class="vjs-indent"
-                >
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <!---->
-                </div>
-                <!---->
-                <span>
-                  <span
-                    class="vjs-tree-brackets"
-                  >
-                    }
-                  </span>
-                  <!---->
-                  <!---->
-                </span>
-              </div>
-              <div
-                class="vjs-tree-node"
-                collapsed-on-click-brackets="true"
+                2
+              </span>
+              
+            </span>
+            <span>
+              ,
+            </span>
+            <!---->
+          </span>
+        </div>
+        <div
+          class="vjs-tree-node"
+        >
+          <!---->
+          <!---->
+          <div
+            class="vjs-indent"
+          >
+            
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            
+            <!---->
+          </div>
+          <!---->
+          <span>
+            <span
+              class="vjs-value vjs-value-number"
+            >
+              
+              <span
+                class="mappable ph-no-capture"
+                data-depth="3"
+                data-name="list[2]"
+                data-path="[0].list[2]"
+                data-target="mappable"
+                data-value="{{ $('Set').item.json.list[2] }}"
               >
-                <!---->
-                <!---->
-                <div
-                  class="vjs-indent"
-                >
-                  <!---->
-                </div>
-                <!---->
-                <span>
-                  <span
-                    class="vjs-tree-brackets"
-                  >
-                    ]
-                  </span>
-                  <!---->
-                  <!---->
-                </span>
-              </div>
-            </div>
+                3
+              </span>
+              
+            </span>
+            <!---->
+            <!---->
+          </span>
+        </div>
+        <div
+          class="vjs-tree-node"
+        >
+          <!---->
+          <!---->
+          <div
+            class="vjs-indent"
+          >
+            
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            
+            <!---->
+          </div>
+          <!---->
+          <span>
+            <span
+              class="vjs-tree-brackets"
+            >
+              ]
+            </span>
+            <span>
+              ,
+            </span>
+            <!---->
+          </span>
+        </div>
+        <div
+          class="vjs-tree-node"
+        >
+          <!---->
+          <!---->
+          <div
+            class="vjs-indent"
+          >
+            
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            
+            <!---->
+          </div>
+          <span
+            class="vjs-key"
+          >
+            
+            <span
+              class="mappable"
+              data-depth="2"
+              data-name="record"
+              data-path="[0].record"
+              data-target="mappable"
+              data-value="{{ $('Set').item.json.record }}"
+            >
+              "record"
+            </span>
+            
+            <span
+              class="vjs-colon"
+            >
+              : 
+            </span>
+          </span>
+          <span>
+            <span
+              class="vjs-tree-brackets"
+            >
+              {
+            </span>
+            <!---->
+            <!---->
+          </span>
+        </div>
+        <div
+          class="vjs-tree-node"
+        >
+          <!---->
+          <!---->
+          <div
+            class="vjs-indent"
+          >
+            
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            
+            <!---->
+          </div>
+          <span
+            class="vjs-key"
+          >
+            
+            <span
+              class="mappable"
+              data-depth="3"
+              data-name="name"
+              data-path="[0].record.name"
+              data-target="mappable"
+              data-value="{{ $('Set').item.json.record.name }}"
+            >
+              "name"
+            </span>
+            
+            <span
+              class="vjs-colon"
+            >
+              : 
+            </span>
+          </span>
+          <span>
+            <span
+              class="vjs-value vjs-value-string"
+            >
+              
+              <span>
+                "Joe"
+              </span>
+              
+            </span>
+            <!---->
+            <!---->
+          </span>
+        </div>
+        <div
+          class="vjs-tree-node"
+        >
+          <!---->
+          <!---->
+          <div
+            class="vjs-indent"
+          >
+            
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            
+            <!---->
+          </div>
+          <!---->
+          <span>
+            <span
+              class="vjs-tree-brackets"
+            >
+              }
+            </span>
+            <span>
+              ,
+            </span>
+            <!---->
+          </span>
+        </div>
+        <div
+          class="vjs-tree-node"
+        >
+          <!---->
+          <!---->
+          <div
+            class="vjs-indent"
+          >
+            
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            
+            <!---->
           </div>
+          <span
+            class="vjs-key"
+          >
+            
+            <span
+              class="mappable"
+              data-depth="2"
+              data-name="myNumber"
+              data-path="[0].myNumber"
+              data-target="mappable"
+              data-value="{{ $('Set').item.json.myNumber }}"
+            >
+              "myNumber"
+            </span>
+            
+            <span
+              class="vjs-colon"
+            >
+              : 
+            </span>
+          </span>
+          <span>
+            <span
+              class="vjs-value vjs-value-number"
+            >
+              
+              <span>
+                123
+              </span>
+              
+            </span>
+            <span>
+              ,
+            </span>
+            <!---->
+          </span>
         </div>
+        <div
+          class="vjs-tree-node"
+        >
+          <!---->
+          <!---->
+          <div
+            class="vjs-indent"
+          >
+            
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            
+            <!---->
+          </div>
+          <span
+            class="vjs-key"
+          >
+            
+            <span
+              class="mappable"
+              data-depth="2"
+              data-name="myStringNumber"
+              data-path="[0].myStringNumber"
+              data-target="mappable"
+              data-value="{{ $('Set').item.json.myStringNumber }}"
+            >
+              "myStringNumber"
+            </span>
+            
+            <span
+              class="vjs-colon"
+            >
+              : 
+            </span>
+          </span>
+          <span>
+            <span
+              class="vjs-value vjs-value-string"
+            >
+              
+              <span>
+                "456"
+              </span>
+              
+            </span>
+            <span>
+              ,
+            </span>
+            <!---->
+          </span>
+        </div>
+        <div
+          class="vjs-tree-node"
+        >
+          <!---->
+          <!---->
+          <div
+            class="vjs-indent"
+          >
+            
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            
+            <!---->
+          </div>
+          <span
+            class="vjs-key"
+          >
+            
+            <span
+              class="mappable"
+              data-depth="2"
+              data-name="myStringText"
+              data-path="[0].myStringText"
+              data-target="mappable"
+              data-value="{{ $('Set').item.json.myStringText }}"
+            >
+              "myStringText"
+            </span>
+            
+            <span
+              class="vjs-colon"
+            >
+              : 
+            </span>
+          </span>
+          <span>
+            <span
+              class="vjs-value vjs-value-string"
+            >
+              
+              <span>
+                "abc"
+              </span>
+              
+            </span>
+            <span>
+              ,
+            </span>
+            <!---->
+          </span>
+        </div>
+        <div
+          class="vjs-tree-node"
+        >
+          <!---->
+          <!---->
+          <div
+            class="vjs-indent"
+          >
+            
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            
+            <!---->
+          </div>
+          <span
+            class="vjs-key"
+          >
+            
+            <span
+              class="mappable"
+              data-depth="2"
+              data-name="nil"
+              data-path="[0].nil"
+              data-target="mappable"
+              data-value="{{ $('Set').item.json.nil }}"
+            >
+              "nil"
+            </span>
+            
+            <span
+              class="vjs-colon"
+            >
+              : 
+            </span>
+          </span>
+          <span>
+            <span
+              class="vjs-value vjs-value-null"
+            >
+              
+              <span>
+                null
+              </span>
+              
+            </span>
+            <span>
+              ,
+            </span>
+            <!---->
+          </span>
+        </div>
+        <div
+          class="vjs-tree-node"
+        >
+          <!---->
+          <!---->
+          <div
+            class="vjs-indent"
+          >
+            
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            
+            <!---->
+          </div>
+          <span
+            class="vjs-key"
+          >
+            
+            <span
+              class="mappable"
+              data-depth="2"
+              data-name="d"
+              data-path="[0].d"
+              data-target="mappable"
+              data-value="{{ $('Set').item.json.d }}"
+            >
+              "d"
+            </span>
+            
+            <span
+              class="vjs-colon"
+            >
+              : 
+            </span>
+          </span>
+          <span>
+            <span
+              class="vjs-value vjs-value-undefined"
+            >
+              
+              <span />
+              
+            </span>
+            <!---->
+            <!---->
+          </span>
+        </div>
+        <div
+          class="vjs-tree-node"
+        >
+          <!---->
+          <!---->
+          <div
+            class="vjs-indent"
+          >
+            
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            
+            <!---->
+          </div>
+          <!---->
+          <span>
+            <span
+              class="vjs-tree-brackets"
+            >
+              }
+            </span>
+            <!---->
+            <!---->
+          </span>
+        </div>
+        <div
+          class="vjs-tree-node"
+        >
+          <!---->
+          <!---->
+          <div
+            class="vjs-indent"
+          >
+            
+            
+            <!---->
+          </div>
+          <!---->
+          <span>
+            <span
+              class="vjs-tree-brackets"
+            >
+              ]
+            </span>
+            <!---->
+            <!---->
+          </span>
+        </div>
+        
       </div>
-      <div
-        class="teleporter hidden"
-        data-v-d4e6e290=""
-      />
+      
+      <!--teleport start-->
+      <!--teleport end-->
     </div>
   </div>
 </div>
diff --git a/packages/editor-ui/src/components/__tests__/__snapshots__/RunDataSchema.test.ts.snap b/packages/editor-ui/src/components/__tests__/__snapshots__/RunDataSchema.test.ts.snap
index 317edebadbe10..60c00cceb70c6 100644
--- a/packages/editor-ui/src/components/__tests__/__snapshots__/RunDataSchema.test.ts.snap
+++ b/packages/editor-ui/src/components/__tests__/__snapshots__/RunDataSchema.test.ts.snap
@@ -1,4 +1,4 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`RunDataJsonSchema.vue > renders schema for data 1`] = `
 <div>
@@ -8,6 +8,7 @@ exports[`RunDataJsonSchema.vue > renders schema for data 1`] = `
     <div
       class=""
     >
+      
       <div
         class="schema"
       >
@@ -15,13 +16,14 @@ exports[`RunDataJsonSchema.vue > renders schema for data 1`] = `
           class="item"
           data-test-id="run-data-schema-item"
         >
-          <!---->
-          <!---->
-          <!---->
-          <!---->
+          <!--v-if-->
+          <!--v-if-->
+          <!--v-if-->
+          <!--v-if-->
           <div
             class="sub"
           >
+            
             <div
               class="item"
               data-test-id="run-data-schema-item"
@@ -39,11 +41,23 @@ exports[`RunDataJsonSchema.vue > renders schema for data 1`] = `
                   data-target="mappable"
                   data-value="{{ $json.name }}"
                 >
-                  <font-awesome-icon-stub
-                    icon="font"
-                    size="sm"
-                  />
-                  <!---->
+                  <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=""
                   >
@@ -52,13 +66,13 @@ exports[`RunDataJsonSchema.vue > renders schema for data 1`] = `
                 </span>
               </div>
               <span
-                class="ph-no-capture text"
+                class="text"
               >
                 John
               </span>
-              <!---->
-              <!---->
-              <!---->
+              <!--v-if-->
+              <!--v-if-->
+              <!--v-if-->
             </div>
             <div
               class="item"
@@ -77,11 +91,23 @@ exports[`RunDataJsonSchema.vue > renders schema for data 1`] = `
                   data-target="mappable"
                   data-value="{{ $json.age }}"
                 >
-                  <font-awesome-icon-stub
-                    icon="hashtag"
-                    size="sm"
-                  />
-                  <!---->
+                  <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=""
                   >
@@ -90,13 +116,13 @@ exports[`RunDataJsonSchema.vue > renders schema for data 1`] = `
                 </span>
               </div>
               <span
-                class="ph-no-capture text"
+                class="text"
               >
                 22
               </span>
-              <!---->
-              <!---->
-              <!---->
+              <!--v-if-->
+              <!--v-if-->
+              <!--v-if-->
             </div>
             <div
               class="item"
@@ -115,11 +141,23 @@ exports[`RunDataJsonSchema.vue > renders schema for data 1`] = `
                   data-target="mappable"
                   data-value="{{ $json.hobbies }}"
                 >
-                  <font-awesome-icon-stub
-                    icon="list"
-                    size="sm"
-                  />
-                  <!---->
+                  <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=""
                   >
@@ -127,9 +165,8 @@ exports[`RunDataJsonSchema.vue > renders schema for data 1`] = `
                   </span>
                 </span>
               </div>
-              <!---->
+              <!--v-if-->
               <input
-                checked="checked"
                 id="input_array-0-2"
                 type="checkbox"
               />
@@ -137,13 +174,27 @@ exports[`RunDataJsonSchema.vue > renders schema for data 1`] = `
                 class="toggle"
                 for="input_array-0-2"
               >
-                <font-awesome-icon-stub
-                  icon="angle-up"
-                />
+                <svg
+                  aria-hidden="true"
+                  class="svg-inline--fa fa-angle-up fa-w-10"
+                  data-icon="angle-up"
+                  data-prefix="fas"
+                  focusable="false"
+                  role="img"
+                  viewBox="0 0 320 512"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    class=""
+                    d="M177 159.7l136 136c9.4 9.4 9.4 24.6 0 33.9l-22.6 22.6c-9.4 9.4-24.6 9.4-33.9 0L160 255.9l-96.4 96.4c-9.4 9.4-24.6 9.4-33.9 0L7 329.7c-9.4-9.4-9.4-24.6 0-33.9l136-136c9.4-9.5 24.6-9.5 34-.1z"
+                    fill="currentColor"
+                  />
+                </svg>
               </label>
               <div
                 class="sub"
               >
+                
                 <div
                   class="item"
                   data-test-id="run-data-schema-item"
@@ -161,10 +212,22 @@ exports[`RunDataJsonSchema.vue > renders schema for data 1`] = `
                       data-target="mappable"
                       data-value="{{ $json.hobbies[0] }}"
                     >
-                      <font-awesome-icon-stub
-                        icon="font"
-                        size="sm"
-                      />
+                      <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>
                         hobbies
                       </span>
@@ -176,13 +239,13 @@ exports[`RunDataJsonSchema.vue > renders schema for data 1`] = `
                     </span>
                   </div>
                   <span
-                    class="ph-no-capture text"
+                    class="text"
                   >
                     surfing
                   </span>
-                  <!---->
-                  <!---->
-                  <!---->
+                  <!--v-if-->
+                  <!--v-if-->
+                  <!--v-if-->
                 </div>
                 <div
                   class="item"
@@ -201,10 +264,22 @@ exports[`RunDataJsonSchema.vue > renders schema for data 1`] = `
                       data-target="mappable"
                       data-value="{{ $json.hobbies[1] }}"
                     >
-                      <font-awesome-icon-stub
-                        icon="font"
-                        size="sm"
-                      />
+                      <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>
                         hobbies
                       </span>
@@ -216,23 +291,24 @@ exports[`RunDataJsonSchema.vue > renders schema for data 1`] = `
                     </span>
                   </div>
                   <span
-                    class="ph-no-capture text"
+                    class="text"
                   >
                     traveling
                   </span>
-                  <!---->
-                  <!---->
-                  <!---->
+                  <!--v-if-->
+                  <!--v-if-->
+                  <!--v-if-->
                 </div>
+                
               </div>
             </div>
+            
           </div>
         </div>
       </div>
-      <div
-        class="teleporter hidden"
-        data-v-d4e6e290=""
-      />
+      
+      <!--teleport start-->
+      <!--teleport end-->
     </div>
   </div>
 </div>
@@ -244,21 +320,37 @@ exports[`RunDataJsonSchema.vue > renders schema for empty data 1`] = `
     class="schemaWrapper"
   >
     <div
-      class="n8n-info-tip info note bold"
+      class="n8n-info-tip infoTip info note bold"
     >
       <span
         class="iconText"
       >
         <span
-          class="n8n-icon n8n-text compact size-medium regular"
+          class="n8n-text compact size-medium regular n8n-icon n8n-icon"
         >
-          <font-awesome-icon-stub
-            class="medium"
-            icon="info-circle"
-          />
+          
+          <svg
+            aria-hidden="true"
+            class="svg-inline--fa fa-info-circle fa-w-16 medium"
+            data-icon="info-circle"
+            data-prefix="fas"
+            focusable="false"
+            role="img"
+            viewBox="0 0 512 512"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              class=""
+              d="M256 8C119.043 8 8 119.083 8 256c0 136.997 111.043 248 248 248s248-111.003 248-248C504 119.083 392.957 8 256 8zm0 110c23.196 0 42 18.804 42 42s-18.804 42-42 42-42-18.804-42-42 18.804-42 42-42zm56 254c0 6.627-5.373 12-12 12h-88c-6.627 0-12-5.373-12-12v-24c0-6.627 5.373-12 12-12h12v-64h-12c-6.627 0-12-5.373-12-12v-24c0-6.627 5.373-12 12-12h64c6.627 0 12 5.373 12 12v100h12c6.627 0 12 5.373 12 12v24z"
+              fill="currentColor"
+            />
+          </svg>
+          
         </span>
         <span>
+          
           No data to show - item(s) exist, but they’re empty
+          
         </span>
       </span>
     </div>
@@ -274,6 +366,7 @@ exports[`RunDataJsonSchema.vue > renders schema with spaces and dots 1`] = `
     <div
       class=""
     >
+      
       <div
         class="schema"
       >
@@ -281,13 +374,14 @@ exports[`RunDataJsonSchema.vue > renders schema with spaces and dots 1`] = `
           class="item"
           data-test-id="run-data-schema-item"
         >
-          <!---->
-          <!---->
-          <!---->
-          <!---->
+          <!--v-if-->
+          <!--v-if-->
+          <!--v-if-->
+          <!--v-if-->
           <div
             class="sub"
           >
+            
             <div
               class="item"
               data-test-id="run-data-schema-item"
@@ -305,11 +399,23 @@ exports[`RunDataJsonSchema.vue > renders schema with spaces and dots 1`] = `
                   data-target="mappable"
                   data-value="{{ $json['hello world'] }}"
                 >
-                  <font-awesome-icon-stub
-                    icon="list"
-                    size="sm"
-                  />
-                  <!---->
+                  <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=""
                   >
@@ -317,9 +423,8 @@ exports[`RunDataJsonSchema.vue > renders schema with spaces and dots 1`] = `
                   </span>
                 </span>
               </div>
-              <!---->
+              <!--v-if-->
               <input
-                checked="checked"
                 id="input_array-0-0"
                 type="checkbox"
               />
@@ -327,13 +432,27 @@ exports[`RunDataJsonSchema.vue > renders schema with spaces and dots 1`] = `
                 class="toggle"
                 for="input_array-0-0"
               >
-                <font-awesome-icon-stub
-                  icon="angle-up"
-                />
+                <svg
+                  aria-hidden="true"
+                  class="svg-inline--fa fa-angle-up fa-w-10"
+                  data-icon="angle-up"
+                  data-prefix="fas"
+                  focusable="false"
+                  role="img"
+                  viewBox="0 0 320 512"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    class=""
+                    d="M177 159.7l136 136c9.4 9.4 9.4 24.6 0 33.9l-22.6 22.6c-9.4 9.4-24.6 9.4-33.9 0L160 255.9l-96.4 96.4c-9.4 9.4-24.6 9.4-33.9 0L7 329.7c-9.4-9.4-9.4-24.6 0-33.9l136-136c9.4-9.5 24.6-9.5 34-.1z"
+                    fill="currentColor"
+                  />
+                </svg>
               </label>
               <div
                 class="sub"
               >
+                
                 <div
                   class="item"
                   data-test-id="run-data-schema-item"
@@ -351,10 +470,22 @@ exports[`RunDataJsonSchema.vue > renders schema with spaces and dots 1`] = `
                       data-target="mappable"
                       data-value="{{ $json['hello world'][0] }}"
                     >
-                      <font-awesome-icon-stub
-                        icon="cube"
-                        size="sm"
-                      />
+                      <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>
                         hello world
                       </span>
@@ -365,9 +496,8 @@ exports[`RunDataJsonSchema.vue > renders schema with spaces and dots 1`] = `
                       </span>
                     </span>
                   </div>
-                  <!---->
+                  <!--v-if-->
                   <input
-                    checked="checked"
                     id="input_object-1-0"
                     type="checkbox"
                   />
@@ -375,13 +505,27 @@ exports[`RunDataJsonSchema.vue > renders schema with spaces and dots 1`] = `
                     class="toggle"
                     for="input_object-1-0"
                   >
-                    <font-awesome-icon-stub
-                      icon="angle-up"
-                    />
+                    <svg
+                      aria-hidden="true"
+                      class="svg-inline--fa fa-angle-up fa-w-10"
+                      data-icon="angle-up"
+                      data-prefix="fas"
+                      focusable="false"
+                      role="img"
+                      viewBox="0 0 320 512"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        class=""
+                        d="M177 159.7l136 136c9.4 9.4 9.4 24.6 0 33.9l-22.6 22.6c-9.4 9.4-24.6 9.4-33.9 0L160 255.9l-96.4 96.4c-9.4 9.4-24.6 9.4-33.9 0L7 329.7c-9.4-9.4-9.4-24.6 0-33.9l136-136c9.4-9.5 24.6-9.5 34-.1z"
+                        fill="currentColor"
+                      />
+                    </svg>
                   </label>
                   <div
                     class="sub"
                   >
+                    
                     <div
                       class="item"
                       data-test-id="run-data-schema-item"
@@ -399,11 +543,23 @@ exports[`RunDataJsonSchema.vue > renders schema with spaces and dots 1`] = `
                           data-target="mappable"
                           data-value="{{ $json['hello world'][0].test }}"
                         >
-                          <font-awesome-icon-stub
-                            icon="cube"
-                            size="sm"
-                          />
-                          <!---->
+                          <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=""
                           >
@@ -411,9 +567,8 @@ exports[`RunDataJsonSchema.vue > renders schema with spaces and dots 1`] = `
                           </span>
                         </span>
                       </div>
-                      <!---->
+                      <!--v-if-->
                       <input
-                        checked="checked"
                         id="input_object-2-0"
                         type="checkbox"
                       />
@@ -421,13 +576,27 @@ exports[`RunDataJsonSchema.vue > renders schema with spaces and dots 1`] = `
                         class="toggle"
                         for="input_object-2-0"
                       >
-                        <font-awesome-icon-stub
-                          icon="angle-up"
-                        />
+                        <svg
+                          aria-hidden="true"
+                          class="svg-inline--fa fa-angle-up fa-w-10"
+                          data-icon="angle-up"
+                          data-prefix="fas"
+                          focusable="false"
+                          role="img"
+                          viewBox="0 0 320 512"
+                          xmlns="http://www.w3.org/2000/svg"
+                        >
+                          <path
+                            class=""
+                            d="M177 159.7l136 136c9.4 9.4 9.4 24.6 0 33.9l-22.6 22.6c-9.4 9.4-24.6 9.4-33.9 0L160 255.9l-96.4 96.4c-9.4 9.4-24.6 9.4-33.9 0L7 329.7c-9.4-9.4-9.4-24.6 0-33.9l136-136c9.4-9.5 24.6-9.5 34-.1z"
+                            fill="currentColor"
+                          />
+                        </svg>
                       </label>
                       <div
                         class="sub"
                       >
+                        
                         <div
                           class="item"
                           data-test-id="run-data-schema-item"
@@ -445,11 +614,23 @@ exports[`RunDataJsonSchema.vue > renders schema with spaces and dots 1`] = `
                               data-target="mappable"
                               data-value="{{ $json['hello world'][0].test['more to think about'] }}"
                             >
-                              <font-awesome-icon-stub
-                                icon="hashtag"
-                                size="sm"
-                              />
-                              <!---->
+                              <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=""
                               >
@@ -458,14 +639,15 @@ exports[`RunDataJsonSchema.vue > renders schema with spaces and dots 1`] = `
                             </span>
                           </div>
                           <span
-                            class="ph-no-capture text"
+                            class="text"
                           >
                             1
                           </span>
-                          <!---->
-                          <!---->
-                          <!---->
+                          <!--v-if-->
+                          <!--v-if-->
+                          <!--v-if-->
                         </div>
+                        
                       </div>
                     </div>
                     <div
@@ -485,11 +667,23 @@ exports[`RunDataJsonSchema.vue > renders schema with spaces and dots 1`] = `
                           data-target="mappable"
                           data-value="{{ $json['hello world'][0]['test.how'] }}"
                         >
-                          <font-awesome-icon-stub
-                            icon="font"
-                            size="sm"
-                          />
-                          <!---->
+                          <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=""
                           >
@@ -498,25 +692,27 @@ exports[`RunDataJsonSchema.vue > renders schema with spaces and dots 1`] = `
                         </span>
                       </div>
                       <span
-                        class="ph-no-capture text"
+                        class="text"
                       >
                         ignore
                       </span>
-                      <!---->
-                      <!---->
-                      <!---->
+                      <!--v-if-->
+                      <!--v-if-->
+                      <!--v-if-->
                     </div>
+                    
                   </div>
                 </div>
+                
               </div>
             </div>
+            
           </div>
         </div>
       </div>
-      <div
-        class="teleporter hidden"
-        data-v-d4e6e290=""
-      />
+      
+      <!--teleport start-->
+      <!--teleport end-->
     </div>
   </div>
 </div>
diff --git a/packages/editor-ui/src/components/__tests__/__snapshots__/VariablesRow.spec.ts.snap b/packages/editor-ui/src/components/__tests__/__snapshots__/VariablesRow.spec.ts.snap
deleted file mode 100644
index 0ade8504236bd..0000000000000
--- a/packages/editor-ui/src/components/__tests__/__snapshots__/VariablesRow.spec.ts.snap
+++ /dev/null
@@ -1,78 +0,0 @@
-// Vitest Snapshot v1
-
-exports[`VariablesRow > should render correctly 1`] = `
-"<tr data-test-id=\\"variables-row\\" class=\\"variablesRow\\">
-  <td class=\\"variables-key-column\\">
-    <div><span>key</span></div>
-  </td>
-  <td class=\\"variables-value-column\\">
-    <div><span>value</span></div>
-  </td>
-  <td class=\\"variables-usage-column\\">
-    <div>
-      <n8n-tooltip-stub justifybuttons=\\"flex-end\\" buttons=\\"\\" placement=\\"top\\"><span class=\\"usageSyntax\\">$vars.key</span></n8n-tooltip-stub>
-    </div>
-  </td>
-  <td>
-    <div class=\\"buttons hoverButtons\\">
-      <n8n-tooltip-stub justifybuttons=\\"flex-end\\" buttons=\\"\\" placement=\\"top\\">
-        <div><button disabled=\\"disabled\\" aria-disabled=\\"true\\" aria-live=\\"polite\\" class=\\"mr-xs button button tertiary medium disabled\\" data-test-id=\\"variable-row-edit-button\\">
-            <!----><span> Edit </span></button></div>
-      </n8n-tooltip-stub>
-      <n8n-tooltip-stub justifybuttons=\\"flex-end\\" buttons=\\"\\" placement=\\"top\\">
-        <div><button disabled=\\"disabled\\" aria-disabled=\\"true\\" aria-live=\\"polite\\" class=\\"button button tertiary medium disabled\\" data-test-id=\\"variable-row-delete-button\\">
-            <!----><span> Delete </span></button></div>
-      </n8n-tooltip-stub>
-    </div>
-  </td>
-</tr>"
-`;
-
-exports[`VariablesRow > should show key and value inputs in edit mode 1`] = `
-"<tr data-test-id=\\"variables-row\\" class=\\"variablesRow\\">
-  <td class=\\"variables-key-column\\">
-    <div>
-      <div class=\\"container\\" data-test-id=\\"variable-row-key-input\\">
-        <!---->
-        <div class=\\"\\">
-          <div class=\\"el-input el-input--large n8n-input\\">
-            <!----><input type=\\"text\\" autocomplete=\\"off\\" name=\\"key\\" placeholder=\\"Enter a name\\" class=\\"el-input__inner\\">
-            <!---->
-            <!---->
-            <!---->
-            <!---->
-          </div>
-        </div>
-        <!---->
-      </div>
-    </div>
-  </td>
-  <td class=\\"variables-value-column\\">
-    <div>
-      <div class=\\"container\\" data-test-id=\\"variable-row-value-input\\">
-        <!---->
-        <div class=\\"\\">
-          <div class=\\"el-input el-input--large n8n-input\\">
-            <!----><input type=\\"text\\" autocomplete=\\"off\\" name=\\"value\\" placeholder=\\"Enter a value\\" class=\\"el-input__inner\\">
-            <!---->
-            <!---->
-            <!---->
-            <!---->
-          </div>
-        </div>
-        <!---->
-      </div>
-    </div>
-  </td>
-  <td class=\\"variables-usage-column\\">
-    <div>
-      <n8n-tooltip-stub justifybuttons=\\"flex-end\\" buttons=\\"\\" placement=\\"top\\"><span class=\\"usageSyntax\\">$vars.key</span></n8n-tooltip-stub>
-    </div>
-  </td>
-  <td>
-    <div class=\\"buttons\\"><button aria-live=\\"polite\\" class=\\"mr-xs button button tertiary medium\\" data-test-id=\\"variable-row-cancel-button\\">
-        <!----><span> Cancel </span></button><button aria-live=\\"polite\\" class=\\"button button primary medium\\" data-test-id=\\"variable-row-save-button\\">
-        <!----><span> Save </span></button></div>
-  </td>
-</tr>"
-`;
diff --git a/packages/editor-ui/src/components/__tests__/testData/nodeTypesTestData.ts b/packages/editor-ui/src/components/__tests__/testData/nodeTypesTestData.ts
new file mode 100644
index 0000000000000..c5c07eb767a29
--- /dev/null
+++ b/packages/editor-ui/src/components/__tests__/testData/nodeTypesTestData.ts
@@ -0,0 +1,964 @@
+import type { INodeTypeDescription } from 'n8n-workflow';
+
+export const twitterV2: INodeTypeDescription = {
+	displayName: 'X (Formerly Twitter)',
+	name: 'n8n-nodes-base.twitter',
+	group: ['output'],
+	subtitle: '={{$parameter["operation"] + ":" + $parameter["resource"]}}',
+	description: 'Post, like, and search tweets, send messages, search users, and add users to lists',
+	defaultVersion: 2,
+	version: 2,
+	defaults: { name: 'X' },
+	inputs: ['main'],
+	outputs: ['main'],
+	credentials: [{ name: 'twitterOAuth2Api', required: true }],
+	properties: [
+		{
+			displayName: 'Resource',
+			name: 'resource',
+			type: 'options',
+			noDataExpression: true,
+			options: [
+				{
+					name: 'Direct Message',
+					value: 'directMessage',
+					description: 'Send a direct message to a user',
+				},
+				{ name: 'List', value: 'list', description: 'Add a user to a list' },
+				{ name: 'Tweet', value: 'tweet', description: 'Create, like, search, or delete a tweet' },
+				{ name: 'User', value: 'user', description: 'Search users by username' },
+				{ name: 'Custom API Call', value: '__CUSTOM_API_CALL__' },
+			],
+			default: 'tweet',
+		},
+		{
+			displayName: 'Operation',
+			name: 'operation',
+			type: 'options',
+			noDataExpression: true,
+			displayOptions: { show: { resource: ['directMessage'] } },
+			options: [
+				{
+					name: 'Create',
+					value: 'create',
+					description: 'Send a direct message to a user',
+					action: 'Create Direct Message',
+				},
+				{ name: 'Custom API Call', value: '__CUSTOM_API_CALL__' },
+			],
+			default: 'create',
+		},
+		{
+			displayName: 'User',
+			name: 'user',
+			type: 'resourceLocator',
+			default: { mode: 'username', value: '' },
+			required: true,
+			description: 'The user you want to send the message to',
+			displayOptions: { show: { operation: ['create'], resource: ['directMessage'] } },
+			modes: [
+				{
+					displayName: 'By Username',
+					name: 'username',
+					type: 'string',
+					validation: [],
+					placeholder: 'e.g. n8n',
+					url: '',
+				},
+				{
+					displayName: 'By ID',
+					name: 'id',
+					type: 'string',
+					validation: [],
+					placeholder: 'e.g. 1068479892537384960',
+					url: '',
+				},
+			],
+		},
+		{
+			displayName: 'Text',
+			name: 'text',
+			type: 'string',
+			required: true,
+			default: '',
+			typeOptions: { rows: 2 },
+			displayOptions: { show: { operation: ['create'], resource: ['directMessage'] } },
+			description:
+				'The text of the direct message. URL encoding is required. Max length of 10,000 characters.',
+		},
+		{
+			displayName: 'Additional Fields',
+			name: 'additionalFields',
+			type: 'collection',
+			placeholder: 'Add Field',
+			default: {},
+			displayOptions: { show: { operation: ['create'], resource: ['directMessage'] } },
+			options: [
+				{
+					displayName: 'Attachment ID',
+					name: 'attachments',
+					type: 'string',
+					default: '',
+					placeholder: '1664279886239010824',
+					description: 'The attachment ID to associate with the message',
+				},
+			],
+		},
+		{
+			displayName: 'Operation',
+			name: 'operation',
+			type: 'options',
+			noDataExpression: true,
+			displayOptions: { show: { resource: ['list'] } },
+			options: [
+				{
+					name: 'Add Member',
+					value: 'add',
+					description: 'Add a member to a list',
+					action: 'Add Member to List',
+				},
+				{ name: 'Custom API Call', value: '__CUSTOM_API_CALL__' },
+			],
+			default: 'add',
+		},
+		{
+			displayName: 'List',
+			name: 'list',
+			type: 'resourceLocator',
+			default: { mode: 'id', value: '' },
+			required: true,
+			description: 'The list you want to add the user to',
+			displayOptions: { show: { operation: ['add'], resource: ['list'] } },
+			modes: [
+				{
+					displayName: 'By ID',
+					name: 'id',
+					type: 'string',
+					validation: [],
+					placeholder: 'e.g. 99923132',
+					url: '',
+				},
+				{
+					displayName: 'By URL',
+					name: 'url',
+					type: 'string',
+					validation: [],
+					placeholder: 'e.g. https://twitter.com/i/lists/99923132',
+					url: '',
+				},
+			],
+		},
+		{
+			displayName: 'User',
+			name: 'user',
+			type: 'resourceLocator',
+			default: { mode: 'username', value: '' },
+			required: true,
+			description: 'The user you want to add to the list',
+			displayOptions: { show: { operation: ['add'], resource: ['list'] } },
+			modes: [
+				{
+					displayName: 'By Username',
+					name: 'username',
+					type: 'string',
+					validation: [],
+					placeholder: 'e.g. n8n',
+					url: '',
+				},
+				{
+					displayName: 'By ID',
+					name: 'id',
+					type: 'string',
+					validation: [],
+					placeholder: 'e.g. 1068479892537384960',
+					url: '',
+				},
+			],
+		},
+		{
+			displayName: 'Operation',
+			name: 'operation',
+			type: 'options',
+			noDataExpression: true,
+			displayOptions: { show: { resource: ['tweet'] } },
+			options: [
+				{
+					name: 'Create',
+					value: 'create',
+					description: 'Create, quote, or reply to a tweet',
+					action: 'Create Tweet',
+				},
+				{ name: 'Delete', value: 'delete', description: 'Delete a tweet', action: 'Delete Tweet' },
+				{ name: 'Like', value: 'like', description: 'Like a tweet', action: 'Like Tweet' },
+				{
+					name: 'Retweet',
+					value: 'retweet',
+					description: 'Retweet a tweet',
+					action: 'Retweet Tweet',
+				},
+				{
+					name: 'Search',
+					value: 'search',
+					description: 'Search for tweets from the last seven days',
+					action: 'Search Tweets',
+				},
+				{ name: 'Custom API Call', value: '__CUSTOM_API_CALL__' },
+			],
+			default: 'create',
+		},
+		{
+			displayName: 'Text',
+			name: 'text',
+			type: 'string',
+			typeOptions: { rows: 2 },
+			default: '',
+			required: true,
+			displayOptions: { show: { operation: ['create'], resource: ['tweet'] } },
+			description:
+				'The text of the status update. URLs must be encoded. Links wrapped with the t.co shortener will affect character count',
+		},
+		{
+			displayName: 'Options',
+			name: 'additionalFields',
+			type: 'collection',
+			placeholder: 'Add Field',
+			default: {},
+			displayOptions: { show: { operation: ['create'], resource: ['tweet'] } },
+			options: [
+				{
+					displayName: 'Location ID',
+					name: 'location',
+					type: 'string',
+					placeholder: '4e696bef7e24d378',
+					default: '',
+					description: 'Location information for the tweet',
+				},
+				{
+					displayName: 'Media ID',
+					name: 'attachments',
+					type: 'string',
+					default: '',
+					placeholder: '1664279886239010824',
+					description: 'The attachment ID to associate with the message',
+				},
+				{
+					displayName: 'Quote a Tweet',
+					name: 'inQuoteToStatusId',
+					type: 'resourceLocator',
+					default: { mode: 'id', value: '' },
+					description: 'The tweet being quoted',
+					modes: [
+						{
+							displayName: 'By ID',
+							name: 'id',
+							type: 'string',
+							validation: [],
+							placeholder: 'e.g. 1187836157394112513',
+							url: '',
+						},
+						{
+							displayName: 'By URL',
+							name: 'url',
+							type: 'string',
+							validation: [],
+							placeholder: 'e.g. https://twitter.com/n8n_io/status/1187836157394112513',
+							url: '',
+						},
+					],
+				},
+				{
+					displayName: 'Reply to Tweet',
+					name: 'inReplyToStatusId',
+					type: 'resourceLocator',
+					default: { mode: 'id', value: '' },
+					description: 'The tweet being replied to',
+					modes: [
+						{
+							displayName: 'By ID',
+							name: 'id',
+							type: 'string',
+							validation: [],
+							placeholder: 'e.g. 1187836157394112513',
+							url: '',
+						},
+						{
+							displayName: 'By URL',
+							name: 'url',
+							type: 'string',
+							validation: [],
+							placeholder: 'e.g. https://twitter.com/n8n_io/status/1187836157394112513',
+							url: '',
+						},
+					],
+				},
+			],
+		},
+		{
+			displayName: 'Locations are not supported due to Twitter V2 API limitations',
+			name: 'noticeLocation',
+			type: 'notice',
+			displayOptions: { show: { '/additionalFields.location': [''] } },
+			default: '',
+		},
+		{
+			displayName: 'Attachements are not supported due to Twitter V2 API limitations',
+			name: 'noticeAttachments',
+			type: 'notice',
+			displayOptions: { show: { '/additionalFields.attachments': [''] } },
+			default: '',
+		},
+		{
+			displayName: 'Tweet',
+			name: 'tweetDeleteId',
+			type: 'resourceLocator',
+			default: { mode: 'id', value: '' },
+			required: true,
+			description: 'The tweet to delete',
+			displayOptions: { show: { resource: ['tweet'], operation: ['delete'] } },
+			modes: [
+				{
+					displayName: 'By ID',
+					name: 'id',
+					type: 'string',
+					validation: [],
+					placeholder: 'e.g. 1187836157394112513',
+					url: '',
+				},
+				{
+					displayName: 'By URL',
+					name: 'url',
+					type: 'string',
+					validation: [],
+					placeholder: 'e.g. https://twitter.com/n8n_io/status/1187836157394112513',
+					url: '',
+				},
+			],
+		},
+		{
+			displayName: 'Tweet',
+			name: 'tweetId',
+			type: 'resourceLocator',
+			default: { mode: 'id', value: '' },
+			required: true,
+			description: 'The tweet to like',
+			displayOptions: { show: { operation: ['like'], resource: ['tweet'] } },
+			modes: [
+				{
+					displayName: 'By ID',
+					name: 'id',
+					type: 'string',
+					validation: [],
+					placeholder: 'e.g. 1187836157394112513',
+					url: '',
+				},
+				{
+					displayName: 'By URL',
+					name: 'url',
+					type: 'string',
+					validation: [],
+					placeholder: 'e.g. https://twitter.com/n8n_io/status/1187836157394112513',
+					url: '',
+				},
+			],
+		},
+		{
+			displayName: 'Search Term',
+			name: 'searchText',
+			type: 'string',
+			required: true,
+			default: '',
+			placeholder: 'e.g. automation',
+			displayOptions: { show: { operation: ['search'], resource: ['tweet'] } },
+			description:
+				'A UTF-8, URL-encoded search query of 500 characters maximum, including operators. Queries may additionally be limited by complexity. Check the searching examples <a href="https://developer.twitter.com/en/docs/tweets/search/guides/standard-operators">here</a>.',
+		},
+		{
+			displayName: 'Return All',
+			name: 'returnAll',
+			type: 'boolean',
+			default: false,
+			description: 'Whether to return all results or only up to a given limit',
+			displayOptions: { show: { resource: ['tweet'], operation: ['search'] } },
+		},
+		{
+			displayName: 'Limit',
+			name: 'limit',
+			type: 'number',
+			default: 50,
+			description: 'Max number of results to return',
+			typeOptions: { minValue: 1 },
+			displayOptions: { show: { resource: ['tweet'], operation: ['search'], returnAll: [false] } },
+		},
+		{
+			displayName: 'Options',
+			name: 'additionalFields',
+			type: 'collection',
+			placeholder: 'Add Field',
+			default: {},
+			displayOptions: { show: { operation: ['search'], resource: ['tweet'] } },
+			options: [
+				{
+					displayName: 'Sort Order',
+					name: 'sortOrder',
+					type: 'options',
+					options: [
+						{ name: 'Recent', value: 'recency' },
+						{ name: 'Relevant', value: 'relevancy' },
+					],
+					description: 'The order in which to return results',
+					default: 'recency',
+				},
+				{
+					displayName: 'After',
+					name: 'startTime',
+					type: 'dateTime',
+					default: '',
+					description:
+						"Tweets before this date will not be returned. This date must be within the last 7 days if you don't have Academic Research access.",
+				},
+				{
+					displayName: 'Before',
+					name: 'endTime',
+					type: 'dateTime',
+					default: '',
+					description:
+						"Tweets after this date will not be returned. This date must be within the last 7 days if you don't have Academic Research access.",
+				},
+				{
+					displayName: 'Tweet Fields',
+					name: 'tweetFieldsObject',
+					type: 'multiOptions',
+					options: [
+						{ name: 'Attachments', value: 'attachments' },
+						{ name: 'Author ID', value: 'author_id' },
+						{ name: 'Context Annotations', value: 'context_annotations' },
+						{ name: 'Conversation ID', value: 'conversation_id' },
+						{ name: 'Created At', value: 'created_at' },
+						{ name: 'Edit Controls', value: 'edit_controls' },
+						{ name: 'Entities', value: 'entities' },
+						{ name: 'Geo', value: 'geo' },
+						{ name: 'ID', value: 'id' },
+						{ name: 'In Reply To User ID', value: 'in_reply_to_user_id' },
+						{ name: 'Lang', value: 'lang' },
+						{ name: 'Non Public Metrics', value: 'non_public_metrics' },
+						{ name: 'Public Metrics', value: 'public_metrics' },
+						{ name: 'Organic Metrics', value: 'organic_metrics' },
+						{ name: 'Promoted Metrics', value: 'promoted_metrics' },
+						{ name: 'Possibly Sensitive', value: 'possibly_sensitive' },
+						{ name: 'Referenced Tweets', value: 'referenced_tweets' },
+						{ name: 'Reply Settings', value: 'reply_settings' },
+						{ name: 'Source', value: 'source' },
+						{ name: 'Text', value: 'text' },
+						{ name: 'Withheld', value: 'withheld' },
+					],
+					default: [],
+					description:
+						'The fields to add to each returned tweet object. Default fields are: ID, text, edit_history_tweet_ids.',
+				},
+			],
+		},
+		{
+			displayName: 'Tweet',
+			name: 'tweetId',
+			type: 'resourceLocator',
+			default: { mode: 'id', value: '' },
+			required: true,
+			description: 'The tweet to retweet',
+			displayOptions: { show: { operation: ['retweet'], resource: ['tweet'] } },
+			modes: [
+				{
+					displayName: 'By ID',
+					name: 'id',
+					type: 'string',
+					validation: [],
+					placeholder: 'e.g. 1187836157394112513',
+					url: '',
+				},
+				{
+					displayName: 'By URL',
+					name: 'url',
+					type: 'string',
+					validation: [],
+					placeholder: 'e.g. https://twitter.com/n8n_io/status/1187836157394112513',
+					url: '',
+				},
+			],
+		},
+		{
+			displayName: 'Operation',
+			name: 'operation',
+			type: 'options',
+			noDataExpression: true,
+			displayOptions: { show: { resource: ['user'] } },
+			options: [
+				{
+					name: 'Get',
+					value: 'searchUser',
+					description: 'Retrieve a user by username',
+					action: 'Get User',
+				},
+				{ name: 'Custom API Call', value: '__CUSTOM_API_CALL__' },
+			],
+			default: 'searchUser',
+		},
+		{
+			displayName: 'User',
+			name: 'user',
+			type: 'resourceLocator',
+			default: { mode: 'username', value: '' },
+			required: true,
+			description: 'The user you want to search',
+			displayOptions: {
+				show: { operation: ['searchUser'], resource: ['user'] },
+				hide: { me: [true] },
+			},
+			modes: [
+				{
+					displayName: 'By Username',
+					name: 'username',
+					type: 'string',
+					validation: [],
+					placeholder: 'e.g. n8n',
+					url: '',
+				},
+				{
+					displayName: 'By ID',
+					name: 'id',
+					type: 'string',
+					validation: [],
+					placeholder: 'e.g. 1068479892537384960',
+					url: '',
+				},
+			],
+		},
+		{
+			displayName: 'Me',
+			name: 'me',
+			type: 'boolean',
+			displayOptions: { show: { operation: ['searchUser'], resource: ['user'] } },
+			default: false,
+			description: 'Whether you want to search the authenticated user',
+		},
+	],
+	iconUrl: 'icons/n8n-nodes-base/dist/nodes/Twitter/x.svg',
+	codex: {
+		categories: ['Marketing & Content'],
+		resources: {
+			primaryDocumentation: [
+				{ url: 'https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.twitter/' },
+			],
+			credentialDocumentation: [{ url: 'https://docs.n8n.io/credentials/twitter' }],
+		},
+		alias: ['Tweet', 'Twitter', 'X', 'X API'],
+	},
+};
+
+export const twitterV1: INodeTypeDescription = {
+	displayName: 'X (Formerly Twitter)',
+	name: 'n8n-nodes-base.twitter',
+	group: ['output'],
+	subtitle: '={{$parameter["operation"] + ":" + $parameter["resource"]}}',
+	description: 'Consume Twitter API',
+	defaultVersion: 2,
+	version: 1,
+	defaults: { name: 'Twitter' },
+	inputs: ['main'],
+	outputs: ['main'],
+	credentials: [{ name: 'twitterOAuth1Api', required: true }],
+	properties: [
+		{
+			displayName: 'Resource',
+			name: 'resource',
+			type: 'options',
+			noDataExpression: true,
+			options: [
+				{ name: 'Direct Message', value: 'directMessage' },
+				{ name: 'Tweet', value: 'tweet' },
+			],
+			default: 'tweet',
+		},
+		{
+			displayName: 'Operation',
+			name: 'operation',
+			type: 'options',
+			noDataExpression: true,
+			displayOptions: { show: { resource: ['directMessage'] } },
+			options: [
+				{
+					name: 'Create',
+					value: 'create',
+					description: 'Create a direct message',
+					action: 'Create a direct message',
+				},
+			],
+			default: 'create',
+		},
+		{
+			displayName: 'User ID',
+			name: 'userId',
+			type: 'string',
+			required: true,
+			default: '',
+			displayOptions: { show: { operation: ['create'], resource: ['directMessage'] } },
+			description: 'The ID of the user who should receive the direct message',
+		},
+		{
+			displayName: 'Text',
+			name: 'text',
+			type: 'string',
+			required: true,
+			default: '',
+			displayOptions: { show: { operation: ['create'], resource: ['directMessage'] } },
+			description:
+				'The text of your Direct Message. URL encode as necessary. Max length of 10,000 characters.',
+		},
+		{
+			displayName: 'Additional Fields',
+			name: 'additionalFields',
+			type: 'collection',
+			placeholder: 'Add Field',
+			default: {},
+			displayOptions: { show: { operation: ['create'], resource: ['directMessage'] } },
+			options: [
+				{
+					displayName: 'Attachment',
+					name: 'attachment',
+					type: 'string',
+					default: 'data',
+					description:
+						'Name of the binary property which contain data that should be added to the direct message as attachment',
+				},
+			],
+		},
+		{
+			displayName: 'Operation',
+			name: 'operation',
+			type: 'options',
+			noDataExpression: true,
+			displayOptions: { show: { resource: ['tweet'] } },
+			options: [
+				{
+					name: 'Create',
+					value: 'create',
+					description: 'Create or reply a tweet',
+					action: 'Create a tweet',
+				},
+				{
+					name: 'Delete',
+					value: 'delete',
+					description: 'Delete a tweet',
+					action: 'Delete a tweet',
+				},
+				{ name: 'Like', value: 'like', description: 'Like a tweet', action: 'Like a tweet' },
+				{
+					name: 'Retweet',
+					value: 'retweet',
+					description: 'Retweet a tweet',
+					action: 'Retweet a tweet',
+				},
+				{
+					name: 'Search',
+					value: 'search',
+					description: 'Search tweets',
+					action: 'Search for tweets',
+				},
+			],
+			default: 'create',
+		},
+		{
+			displayName: 'Text',
+			name: 'text',
+			type: 'string',
+			required: true,
+			default: '',
+			displayOptions: { show: { operation: ['create'], resource: ['tweet'] } },
+			description:
+				'The text of the status update. URL encode as necessary. t.co link wrapping will affect character counts.',
+		},
+		{
+			displayName: 'Additional Fields',
+			name: 'additionalFields',
+			type: 'collection',
+			placeholder: 'Add Field',
+			default: {},
+			displayOptions: { show: { operation: ['create'], resource: ['tweet'] } },
+			options: [
+				{
+					displayName: 'Attachments',
+					name: 'attachments',
+					type: 'string',
+					default: 'data',
+					description:
+						'Name of the binary properties which contain data which should be added to tweet as attachment. Multiple ones can be comma-separated.',
+				},
+				{
+					displayName: 'Display Coordinates',
+					name: 'displayCoordinates',
+					type: 'boolean',
+					default: false,
+					description:
+						'Whether or not to put a pin on the exact coordinates a Tweet has been sent from',
+				},
+				{
+					displayName: 'In Reply to Tweet',
+					name: 'inReplyToStatusId',
+					type: 'string',
+					default: '',
+					description: 'The ID of an existing status that the update is in reply to',
+				},
+				{
+					displayName: 'Location',
+					name: 'locationFieldsUi',
+					type: 'fixedCollection',
+					placeholder: 'Add Location',
+					default: {},
+					description: 'Subscriber location information.n',
+					options: [
+						{
+							name: 'locationFieldsValues',
+							displayName: 'Location',
+							values: [
+								{
+									displayName: 'Latitude',
+									name: 'latitude',
+									type: 'string',
+									required: true,
+									description: 'The location latitude',
+									default: '',
+								},
+								{
+									displayName: 'Longitude',
+									name: 'longitude',
+									type: 'string',
+									required: true,
+									description: 'The location longitude',
+									default: '',
+								},
+							],
+						},
+					],
+				},
+				{
+					displayName: 'Possibly Sensitive',
+					name: 'possiblySensitive',
+					type: 'boolean',
+					default: false,
+					description:
+						'Whether you are uploading Tweet media that might be considered sensitive content such as nudity, or medical procedures',
+				},
+			],
+		},
+		{
+			displayName: 'Tweet ID',
+			name: 'tweetId',
+			type: 'string',
+			required: true,
+			default: '',
+			displayOptions: { show: { operation: ['delete'], resource: ['tweet'] } },
+			description: 'The ID of the tweet to delete',
+		},
+		{
+			displayName: 'Search Text',
+			name: 'searchText',
+			type: 'string',
+			required: true,
+			default: '',
+			displayOptions: { show: { operation: ['search'], resource: ['tweet'] } },
+			description:
+				'A UTF-8, URL-encoded search query of 500 characters maximum, including operators. Queries may additionally be limited by complexity. Check the searching examples <a href="https://developer.twitter.com/en/docs/tweets/search/guides/standard-operators">here</a>.',
+		},
+		{
+			displayName: 'Return All',
+			name: 'returnAll',
+			type: 'boolean',
+			displayOptions: { show: { operation: ['search'], resource: ['tweet'] } },
+			default: false,
+			description: 'Whether to return all results or only up to a given limit',
+		},
+		{
+			displayName: 'Limit',
+			name: 'limit',
+			type: 'number',
+			displayOptions: { show: { operation: ['search'], resource: ['tweet'], returnAll: [false] } },
+			typeOptions: { minValue: 1 },
+			default: 50,
+			description: 'Max number of results to return',
+		},
+		{
+			displayName: 'Additional Fields',
+			name: 'additionalFields',
+			type: 'collection',
+			placeholder: 'Add Field',
+			default: {},
+			displayOptions: { show: { operation: ['search'], resource: ['tweet'] } },
+			options: [
+				{
+					displayName: 'Include Entities',
+					name: 'includeEntities',
+					type: 'boolean',
+					default: false,
+					description: 'Whether the entities node will be included',
+				},
+				{
+					displayName: 'Language Name or ID',
+					name: 'lang',
+					type: 'options',
+					typeOptions: { loadOptionsMethod: 'getLanguages' },
+					default: '',
+					description:
+						'Restricts tweets to the given language, given by an ISO 639-1 code. Language detection is best-effort. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+				},
+				{
+					displayName: 'Location',
+					name: 'locationFieldsUi',
+					type: 'fixedCollection',
+					placeholder: 'Add Location',
+					default: {},
+					description: 'Subscriber location information.n',
+					options: [
+						{
+							name: 'locationFieldsValues',
+							displayName: 'Location',
+							values: [
+								{
+									displayName: 'Latitude',
+									name: 'latitude',
+									type: 'string',
+									required: true,
+									description: 'The location latitude',
+									default: '',
+								},
+								{
+									displayName: 'Longitude',
+									name: 'longitude',
+									type: 'string',
+									required: true,
+									description: 'The location longitude',
+									default: '',
+								},
+								{
+									displayName: 'Radius',
+									name: 'radius',
+									type: 'options',
+									options: [
+										{ name: 'Milles', value: 'mi' },
+										{ name: 'Kilometers', value: 'km' },
+									],
+									required: true,
+									description:
+										'Returns tweets by users located within a given radius of the given latitude/longitude',
+									default: '',
+								},
+								{
+									displayName: 'Distance',
+									name: 'distance',
+									type: 'number',
+									typeOptions: { minValue: 0 },
+									required: true,
+									default: '',
+								},
+							],
+						},
+					],
+				},
+				{
+					displayName: 'Result Type',
+					name: 'resultType',
+					type: 'options',
+					options: [
+						{
+							name: 'Mixed',
+							value: 'mixed',
+							description: 'Include both popular and real time results in the response',
+						},
+						{
+							name: 'Recent',
+							value: 'recent',
+							description: 'Return only the most recent results in the response',
+						},
+						{
+							name: 'Popular',
+							value: 'popular',
+							description: 'Return only the most popular results in the response',
+						},
+					],
+					default: 'mixed',
+					description: 'Specifies what type of search results you would prefer to receive',
+				},
+				{
+					displayName: 'Tweet Mode',
+					name: 'tweetMode',
+					type: 'options',
+					options: [
+						{ name: 'Compatibility', value: 'compat' },
+						{ name: 'Extended', value: 'extended' },
+					],
+					default: 'compat',
+					description:
+						'When the extended mode is selected, the response contains the entire untruncated text of the Tweet',
+				},
+				{
+					displayName: 'Until',
+					name: 'until',
+					type: 'dateTime',
+					default: '',
+					description: 'Returns tweets created before the given date',
+				},
+			],
+		},
+		{
+			displayName: 'Tweet ID',
+			name: 'tweetId',
+			type: 'string',
+			required: true,
+			default: '',
+			displayOptions: { show: { operation: ['like'], resource: ['tweet'] } },
+			description: 'The ID of the tweet',
+		},
+		{
+			displayName: 'Additional Fields',
+			name: 'additionalFields',
+			type: 'collection',
+			placeholder: 'Add Field',
+			default: {},
+			displayOptions: { show: { operation: ['like'], resource: ['tweet'] } },
+			options: [
+				{
+					displayName: 'Include Entities',
+					name: 'includeEntities',
+					type: 'boolean',
+					default: false,
+					description: 'Whether the entities will be omitted',
+				},
+			],
+		},
+		{
+			displayName: 'Tweet ID',
+			name: 'tweetId',
+			type: 'string',
+			required: true,
+			default: '',
+			displayOptions: { show: { operation: ['retweet'], resource: ['tweet'] } },
+			description: 'The ID of the tweet',
+		},
+		{
+			displayName: 'Additional Fields',
+			name: 'additionalFields',
+			type: 'collection',
+			placeholder: 'Add Field',
+			default: {},
+			displayOptions: { show: { operation: ['retweet'], resource: ['tweet'] } },
+			options: [
+				{
+					displayName: 'Trim User',
+					name: 'trimUser',
+					type: 'boolean',
+					default: false,
+					description:
+						'Whether each tweet returned in a timeline will include a user object including only the status authors numerical ID',
+				},
+			],
+		},
+	],
+	iconUrl: 'icons/n8n-nodes-base/dist/nodes/Twitter/x.svg',
+};
diff --git a/packages/editor-ui/src/components/__tests__/utils/ResourceMapper.utils.ts b/packages/editor-ui/src/components/__tests__/utils/ResourceMapper.utils.ts
new file mode 100644
index 0000000000000..3e2fe5b33e37e
--- /dev/null
+++ b/packages/editor-ui/src/components/__tests__/utils/ResourceMapper.utils.ts
@@ -0,0 +1,216 @@
+import { SETTINGS_STORE_DEFAULT_STATE } from '@/__tests__/utils';
+import { STORES } from '@/constants';
+import { createTestingPinia } from '@pinia/testing';
+import { merge } from 'lodash-es';
+import type { ResourceMapperFields, ResourceMapperValue } from 'n8n-workflow';
+
+export const NODE_PARAMETER_VALUES = {
+	authentication: 'oAuth2',
+	resource: 'sheet',
+	operation: 'appendOrUpdate',
+	documentId: {
+		__rl: true,
+		value:
+			'https://docs.google.com/spreadsheets/d/1BAjxEhlUu5tXDCMQcjqjguIZDFuct3FYkdo7flxl3yc/edit#gid=0',
+		mode: 'url',
+		__regex: 'https:\\/\\/(?:drive|docs)\\.google\\.com\\/\\w+\\/d\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)',
+	},
+	sheetName: {
+		__rl: true,
+		value: 'gid=0',
+		mode: 'list',
+		cachedResultName: 'Users',
+		cachedResultUrl:
+			'https://docs.google.com/spreadsheets/d/1BAjxEhlUu5tXDCMQcjqjguIZDFuct3FYkdo7flxl3yc/edit#gid=0',
+	},
+	columns: {
+		mappingMode: 'defineBelow',
+		value: null,
+	},
+	options: {},
+};
+
+export const UPDATED_SCHEMA = [
+	{
+		id: 'First name',
+		displayName: 'First name',
+		match: false,
+		required: true,
+		defaultMatch: false,
+		display: true,
+		type: 'string',
+		canBeUsedToMatch: true,
+		removed: false,
+	},
+	{
+		id: 'Last name',
+		displayName: 'Last name',
+		match: false,
+		required: true,
+		defaultMatch: false,
+		display: true,
+		type: 'string',
+		canBeUsedToMatch: true,
+		removed: false,
+	},
+	{
+		id: 'Username',
+		displayName: 'Username',
+		match: false,
+		required: false,
+		defaultMatch: false,
+		display: true,
+		type: 'string',
+		canBeUsedToMatch: true,
+		removed: false,
+	},
+	{
+		id: 'Address',
+		displayName: 'Address',
+		match: false,
+		required: false,
+		defaultMatch: false,
+		display: true,
+		type: 'string',
+		canBeUsedToMatch: true,
+		removed: true,
+	},
+	{
+		id: 'id',
+		displayName: 'id',
+		match: false,
+		required: true,
+		defaultMatch: true,
+		display: true,
+		type: 'string',
+		canBeUsedToMatch: true,
+		removed: false,
+	},
+];
+
+export const DEFAULT_SETUP = {
+	pinia: createTestingPinia({
+		initialState: {
+			[STORES.SETTINGS]: {
+				settings: merge({}, SETTINGS_STORE_DEFAULT_STATE.settings),
+			},
+		},
+	}),
+	props: {
+		path: 'parameters.columns',
+		dependentParametersValues: 'gid=0',
+		inputSize: 'small',
+		labelSize: 'small',
+		teleported: false,
+		node: {
+			parameters: NODE_PARAMETER_VALUES,
+			id: 'f63efb2d-3cc5-4500-89f9-b39aab19baf5',
+			name: 'Google Sheets',
+			type: 'n8n-nodes-base.googleSheets',
+			typeVersion: 4,
+			position: [1120, 380],
+			credentials: {},
+			disabled: false,
+		},
+		parameter: {
+			displayName: 'Columns',
+			name: 'columns',
+			type: 'resourceMapper',
+			default: {
+				mappingMode: 'defineBelow',
+				value: {},
+			},
+			required: true,
+			typeOptions: {
+				loadOptionsDependsOn: ['sheetName.value'],
+				resourceMapper: {
+					resourceMapperMethod: 'getMappingColumns',
+					mode: 'upsert',
+					addAllFields: true,
+					noFieldsError: 'No columns found in sheet.',
+					multiKeyMatch: false,
+					fieldWords: {
+						singular: 'column',
+						plural: 'columns',
+					},
+				},
+			},
+			displayOptions: {
+				show: {
+					resource: ['sheet'],
+					operation: ['appendOrUpdate'],
+					'@version': [4],
+				},
+				hide: {
+					sheetName: [''],
+				},
+			},
+		},
+	},
+};
+
+export const MAPPING_COLUMNS_RESPONSE: ResourceMapperFields = {
+	fields: [
+		{
+			id: 'First name',
+			displayName: 'First name',
+			match: false,
+			required: true,
+			defaultMatch: false,
+			display: true,
+			type: 'string',
+			canBeUsedToMatch: true,
+		},
+		{
+			id: 'Last name',
+			displayName: 'Last name',
+			match: false,
+			required: true,
+			defaultMatch: false,
+			display: true,
+			type: 'string',
+			canBeUsedToMatch: true,
+		},
+		{
+			id: 'Username',
+			displayName: 'Username',
+			match: false,
+			required: false,
+			defaultMatch: false,
+			display: true,
+			type: 'string',
+			canBeUsedToMatch: true,
+		},
+		{
+			id: 'Address',
+			displayName: 'Address',
+			match: false,
+			required: false,
+			defaultMatch: false,
+			display: true,
+			type: 'string',
+			canBeUsedToMatch: true,
+		},
+		{
+			id: 'id',
+			displayName: 'id',
+			match: true,
+			required: true,
+			defaultMatch: true,
+			display: true,
+			type: 'string',
+			canBeUsedToMatch: true,
+		},
+	],
+};
+
+// Gets the latest `valueChanged` event emitted by the component
+// This will be used to inspect current resource mapper value set in node parameters
+export function getLatestValueChangeEvent(emitted: Record<string, unknown[]>) {
+	const valueChangeEmits = emitted.valueChanged as [];
+	return valueChangeEmits[valueChangeEmits.length - 1] as Array<{
+		name: string;
+		value: ResourceMapperValue;
+		node: string;
+	}>;
+}
diff --git a/packages/editor-ui/src/components/banners/BannerStack.vue b/packages/editor-ui/src/components/banners/BannerStack.vue
new file mode 100644
index 0000000000000..f78aa0d851dea
--- /dev/null
+++ b/packages/editor-ui/src/components/banners/BannerStack.vue
@@ -0,0 +1,59 @@
+<script lang="ts">
+import NonProductionLicenseBanner from '@/components/banners/NonProductionLicenseBanner.vue';
+import TrialOverBanner from '@/components/banners/TrialOverBanner.vue';
+import TrialBanner from '@/components/banners/TrialBanner.vue';
+import V1Banner from '@/components/banners/V1Banner.vue';
+import EmailConfirmationBanner from '@/components/banners/EmailConfirmationBanner.vue';
+import type { Component } from 'vue';
+import type { N8nBanners } from '@/Interface';
+
+// All banners that can be shown in the app should be registered here.
+// This component renders the banner with the highest priority from the banner stack, located in the UI store.
+// When registering a new banner, please consult this document to determine it's priority:
+// https://www.notion.so/n8n/Banner-stack-60948c4167c743718fde80d6745258d5
+export const N8N_BANNERS: N8nBanners = {
+	V1: { priority: 350, component: V1Banner as Component },
+	TRIAL_OVER: { priority: 260, component: TrialOverBanner as Component },
+	EMAIL_CONFIRMATION: { priority: 250, component: EmailConfirmationBanner as Component },
+	TRIAL: { priority: 150, component: TrialBanner as Component },
+	NON_PRODUCTION_LICENSE: { priority: 140, component: NonProductionLicenseBanner as Component },
+};
+</script>
+
+<script setup lang="ts">
+import { useUIStore } from '@/stores/ui.store';
+import { computed, onMounted } from 'vue';
+import { getBannerRowHeight } from '@/utils/htmlUtils';
+
+const uiStore = useUIStore();
+
+async function updateCurrentBannerHeight() {
+	const bannerHeight = await getBannerRowHeight();
+	uiStore.updateBannersHeight(bannerHeight);
+}
+
+const currentlyShownBanner = computed(() => {
+	void updateCurrentBannerHeight();
+	if (uiStore.bannerStack.length === 0) return null;
+	// Find the banner with the highest priority
+	let banner = N8N_BANNERS[uiStore.bannerStack[0]];
+	uiStore.bannerStack.forEach((bannerName, index) => {
+		if (index === 0) return;
+		const bannerToCompare = N8N_BANNERS[bannerName];
+		if (bannerToCompare.priority > banner.priority) {
+			banner = bannerToCompare;
+		}
+	});
+	return banner.component;
+});
+
+onMounted(async () => {
+	await updateCurrentBannerHeight();
+});
+</script>
+
+<template>
+	<div data-test-id="banner-stack">
+		<component :is="currentlyShownBanner" />
+	</div>
+</template>
diff --git a/packages/editor-ui/src/components/banners/BaseBanner.vue b/packages/editor-ui/src/components/banners/BaseBanner.vue
new file mode 100644
index 0000000000000..761305d769ae9
--- /dev/null
+++ b/packages/editor-ui/src/components/banners/BaseBanner.vue
@@ -0,0 +1,74 @@
+<script lang="ts" setup>
+import { useUIStore } from '@/stores/ui.store';
+import { computed, useSlots } from 'vue';
+import type { BannerName } from 'n8n-workflow';
+
+interface Props {
+	name: BannerName;
+	theme?: string;
+	customIcon?: string;
+	dismissible?: boolean;
+}
+
+const uiStore = useUIStore();
+const slots = useSlots();
+
+const props = withDefaults(defineProps<Props>(), {
+	theme: 'info',
+	dismissible: true,
+});
+
+const emit = defineEmits(['close']);
+
+const hasTrailingContent = computed(() => {
+	return !!slots.trailingContent;
+});
+
+async function onCloseClick() {
+	await uiStore.dismissBanner(props.name);
+	emit('close');
+}
+</script>
+<template>
+	<n8n-callout
+		:theme="props.theme"
+		:icon="props.customIcon"
+		icon-size="medium"
+		:round-corners="false"
+		:data-test-id="`banners-${props.name}`"
+	>
+		<div :class="[$style.mainContent, !hasTrailingContent ? $style.keepSpace : '']">
+			<slot name="mainContent" />
+		</div>
+		<template #trailingContent>
+			<div :class="$style.trailingContent">
+				<slot name="trailingContent" />
+				<n8n-icon
+					v-if="dismissible"
+					size="small"
+					icon="times"
+					title="Dismiss"
+					class="clickable"
+					:data-test-id="`banner-${props.name}-close`"
+					@click="onCloseClick"
+				/>
+			</div>
+		</template>
+	</n8n-callout>
+</template>
+
+<style lang="scss" module>
+.mainContent {
+	display: flex;
+	gap: var(--spacing-4xs);
+}
+
+.keepSpace {
+	padding: 5px 0;
+}
+.trailingContent {
+	display: flex;
+	align-items: center;
+	gap: var(--spacing-l);
+}
+</style>
diff --git a/packages/editor-ui/src/components/banners/EmailConfirmationBanner.vue b/packages/editor-ui/src/components/banners/EmailConfirmationBanner.vue
new file mode 100644
index 0000000000000..45b3d8c425368
--- /dev/null
+++ b/packages/editor-ui/src/components/banners/EmailConfirmationBanner.vue
@@ -0,0 +1,54 @@
+<script lang="ts" setup>
+import BaseBanner from '@/components/banners/BaseBanner.vue';
+import { useToast } from '@/composables/useToast';
+import { i18n as locale } from '@/plugins/i18n';
+import { useUsersStore } from '@/stores/users.store';
+import { computed } from 'vue';
+
+const toast = useToast();
+
+const userEmail = computed(() => {
+	const { currentUserCloudInfo } = useUsersStore();
+	return currentUserCloudInfo?.email ?? '';
+});
+
+async function onConfirmEmailClick() {
+	try {
+		await useUsersStore().confirmEmail();
+		toast.showMessage({
+			type: 'success',
+			title: locale.baseText('banners.confirmEmail.toast.success.heading'),
+			message: locale.baseText('banners.confirmEmail.toast.success.message'),
+		});
+	} catch (error) {
+		toast.showMessage({
+			type: 'error',
+			title: locale.baseText('banners.confirmEmail.toast.error.heading'),
+			message: error.message,
+		});
+	}
+}
+</script>
+
+<template>
+	<BaseBanner name="EMAIL_CONFIRMATION" theme="warning">
+		<template #mainContent>
+			<span>
+				{{ locale.baseText('banners.confirmEmail.message.1') }}
+				<router-link to="/settings/personal">{{ userEmail }}</router-link>
+				{{ locale.baseText('banners.confirmEmail.message.2') }}
+			</span>
+		</template>
+		<template #trailingContent>
+			<n8n-button
+				type="success"
+				icon="envelope"
+				size="small"
+				data-test-id="confirm-email-button"
+				@click="onConfirmEmailClick"
+			>
+				{{ locale.baseText('banners.confirmEmail.button') }}
+			</n8n-button>
+		</template>
+	</BaseBanner>
+</template>
diff --git a/packages/editor-ui/src/components/banners/NonProductionLicenseBanner.vue b/packages/editor-ui/src/components/banners/NonProductionLicenseBanner.vue
new file mode 100644
index 0000000000000..29a258531b18b
--- /dev/null
+++ b/packages/editor-ui/src/components/banners/NonProductionLicenseBanner.vue
@@ -0,0 +1,12 @@
+<script lang="ts" setup>
+import BaseBanner from '@/components/banners/BaseBanner.vue';
+import { i18n as locale } from '@/plugins/i18n';
+</script>
+
+<template>
+	<BaseBanner name="NON_PRODUCTION_LICENSE" :dismissible="false">
+		<template #mainContent>
+			<span>{{ locale.baseText('banners.nonProductionLicense.message') }}</span>
+		</template>
+	</BaseBanner>
+</template>
diff --git a/packages/editor-ui/src/components/banners/TrialBanner.vue b/packages/editor-ui/src/components/banners/TrialBanner.vue
new file mode 100644
index 0000000000000..3707571d0dda9
--- /dev/null
+++ b/packages/editor-ui/src/components/banners/TrialBanner.vue
@@ -0,0 +1,36 @@
+<script lang="ts" setup>
+import BaseBanner from '@/components/banners/BaseBanner.vue';
+import { i18n as locale } from '@/plugins/i18n';
+import { useCloudPlanStore } from '@/stores/cloudPlan.store';
+import { computed } from 'vue';
+import { useUIStore } from '@/stores/ui.store';
+
+const trialDaysLeft = computed(() => {
+	const { trialDaysLeft } = useCloudPlanStore();
+	return -1 * trialDaysLeft;
+});
+
+const messageText = computed(() => {
+	return locale.baseText('banners.trial.message', {
+		adjustToNumber: trialDaysLeft.value,
+		interpolate: { count: String(trialDaysLeft.value) },
+	});
+});
+
+function onUpdatePlanClick() {
+	void useUIStore().goToUpgrade('canvas-nav', 'upgrade-canvas-nav', 'redirect');
+}
+</script>
+
+<template>
+	<BaseBanner name="TRIAL" theme="custom">
+		<template #mainContent>
+			<span>{{ messageText }}</span>
+		</template>
+		<template #trailingContent>
+			<n8n-button type="success" icon="gem" size="small" @click="onUpdatePlanClick">{{
+				locale.baseText('generic.upgradeNow')
+			}}</n8n-button>
+		</template>
+	</BaseBanner>
+</template>
diff --git a/packages/editor-ui/src/components/banners/TrialOverBanner.vue b/packages/editor-ui/src/components/banners/TrialOverBanner.vue
new file mode 100644
index 0000000000000..9080ad0fed9d3
--- /dev/null
+++ b/packages/editor-ui/src/components/banners/TrialOverBanner.vue
@@ -0,0 +1,22 @@
+<script lang="ts" setup>
+import BaseBanner from '@/components/banners/BaseBanner.vue';
+import { i18n as locale } from '@/plugins/i18n';
+import { useUIStore } from '@/stores/ui.store';
+
+function onUpdatePlanClick() {
+	void useUIStore().goToUpgrade('canvas-nav', 'upgrade-canvas-nav', 'redirect');
+}
+</script>
+
+<template>
+	<BaseBanner custom-icon="info-circle" theme="warning" name="TRIAL_OVER">
+		<template #mainContent>
+			<span>{{ locale.baseText('banners.trialOver.message') }}</span>
+		</template>
+		<template #trailingContent>
+			<n8n-button type="success" icon="gem" size="small" @click="onUpdatePlanClick">{{
+				locale.baseText('generic.upgradeNow')
+			}}</n8n-button>
+		</template>
+	</BaseBanner>
+</template>
diff --git a/packages/editor-ui/src/components/banners/V1Banner.vue b/packages/editor-ui/src/components/banners/V1Banner.vue
new file mode 100644
index 0000000000000..c335b2129fb01
--- /dev/null
+++ b/packages/editor-ui/src/components/banners/V1Banner.vue
@@ -0,0 +1,41 @@
+<script lang="ts" setup>
+import { computed } from 'vue';
+import BaseBanner from '@/components/banners/BaseBanner.vue';
+import { i18n as locale } from '@/plugins/i18n';
+import { hasPermission } from '@/rbac/permissions';
+import { useUIStore } from '@/stores/ui.store';
+
+const uiStore = useUIStore();
+
+async function dismissPermanently() {
+	await uiStore.dismissBanner('V1', 'permanent');
+}
+
+const hasOwnerPermission = computed(() => hasPermission(['instanceOwner']));
+</script>
+
+<template>
+	<BaseBanner custom-icon="info-circle" theme="warning" name="V1" :class="$style.v1container">
+		<template #mainContent>
+			<span v-html="locale.baseText('banners.v1.message')"></span>
+			<a
+				v-if="hasOwnerPermission"
+				:class="$style.link"
+				data-test-id="banner-confirm-v1"
+				@click="dismissPermanently"
+			>
+				<span v-html="locale.baseText('generic.dontShowAgain')"></span>
+			</a>
+		</template>
+	</BaseBanner>
+</template>
+
+<style lang="scss" module>
+.v1container {
+	a,
+	.link {
+		font-weight: var(--font-weight-bold);
+		text-decoration: underline;
+	}
+}
+</style>
diff --git a/packages/editor-ui/src/components/banners/__tests__/V1Banner.spec.ts b/packages/editor-ui/src/components/banners/__tests__/V1Banner.spec.ts
new file mode 100644
index 0000000000000..b2e7ac6f4a6ca
--- /dev/null
+++ b/packages/editor-ui/src/components/banners/__tests__/V1Banner.spec.ts
@@ -0,0 +1,34 @@
+import { render } from '@testing-library/vue';
+import V1Banner from '../V1Banner.vue';
+import { createPinia, setActivePinia } from 'pinia';
+import { useUsersStore } from '@/stores/users.store';
+import { ROLE } from '@/constants';
+import type { IUser } from '@/Interface';
+
+describe('V1 Banner', () => {
+	let pinia: ReturnType<typeof createPinia>;
+	let usersStore: ReturnType<typeof useUsersStore>;
+
+	beforeEach(async () => {
+		pinia = createPinia();
+		setActivePinia(pinia);
+
+		usersStore = useUsersStore();
+	});
+
+	it('should render banner', () => {
+		const { container } = render(V1Banner);
+		expect(container).toMatchSnapshot();
+		expect(container.querySelectorAll('a')).toHaveLength(1);
+	});
+
+	it('should render banner with dismiss call if user is owner', () => {
+		vi.spyOn(usersStore, 'currentUser', 'get').mockReturnValue({
+			role: ROLE.Owner,
+		} as IUser);
+
+		const { container } = render(V1Banner);
+		expect(container).toMatchSnapshot();
+		expect(container.querySelectorAll('a')).toHaveLength(2);
+	});
+});
diff --git a/packages/editor-ui/src/components/banners/__tests__/__snapshots__/V1Banner.spec.ts.snap b/packages/editor-ui/src/components/banners/__tests__/__snapshots__/V1Banner.spec.ts.snap
new file mode 100644
index 0000000000000..9f153ce0f58f3
--- /dev/null
+++ b/packages/editor-ui/src/components/banners/__tests__/__snapshots__/V1Banner.spec.ts.snap
@@ -0,0 +1,70 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`V1 Banner > should render banner 1`] = `
+<div>
+  <n8n-callout
+    class="v1container"
+    data-test-id="banners-V1"
+    icon="info-circle"
+    icon-size="medium"
+    round-corners="false"
+    theme="warning"
+  >
+    <div
+      class="mainContent keepSpace"
+    >
+      
+      <span>
+        n8n has been updated to version 1, introducing some breaking changes. Please consult the 
+        <a
+          href="https://docs.n8n.io/1-0-migration-checklist"
+          target="_blank"
+        >
+          migration guide
+        </a>
+         for more information.
+      </span>
+      <!--v-if-->
+      
+    </div>
+  </n8n-callout>
+</div>
+`;
+
+exports[`V1 Banner > should render banner with dismiss call if user is owner 1`] = `
+<div>
+  <n8n-callout
+    class="v1container"
+    data-test-id="banners-V1"
+    icon="info-circle"
+    icon-size="medium"
+    round-corners="false"
+    theme="warning"
+  >
+    <div
+      class="mainContent keepSpace"
+    >
+      
+      <span>
+        n8n has been updated to version 1, introducing some breaking changes. Please consult the 
+        <a
+          href="https://docs.n8n.io/1-0-migration-checklist"
+          target="_blank"
+        >
+          migration guide
+        </a>
+         for more information.
+      </span>
+      <a
+        class="link"
+        data-test-id="banner-confirm-v1"
+      >
+        <span>
+          Don't show again
+        </span>
+      </a>
+      
+    </div>
+  </n8n-callout>
+</div>
+`;
diff --git a/packages/editor-ui/src/components/executions/ExecutionsFilter.test.ts b/packages/editor-ui/src/components/executions/ExecutionsFilter.test.ts
new file mode 100644
index 0000000000000..923bb14dd55cb
--- /dev/null
+++ b/packages/editor-ui/src/components/executions/ExecutionsFilter.test.ts
@@ -0,0 +1,168 @@
+import { describe, test, expect } from 'vitest';
+import { createTestingPinia } from '@pinia/testing';
+import userEvent from '@testing-library/user-event';
+import { faker } from '@faker-js/faker';
+import ExecutionsFilter from '@/components/executions/ExecutionsFilter.vue';
+import { STORES } from '@/constants';
+import type { IWorkflowShortResponse, ExecutionFilterType } from '@/Interface';
+import { createComponentRenderer } from '@/__tests__/render';
+import * as telemetryModule from '@/composables/useTelemetry';
+import type { Telemetry } from '@/plugins/telemetry';
+import { merge } from 'lodash-es';
+
+const defaultFilterState: ExecutionFilterType = {
+	status: 'all',
+	workflowId: 'all',
+	tags: [],
+	startDate: '',
+	endDate: '',
+	metadata: [{ key: '', value: '' }],
+};
+
+const workflowDataFactory = (): IWorkflowShortResponse => ({
+	createdAt: faker.date.past().toDateString(),
+	updatedAt: faker.date.past().toDateString(),
+	id: faker.string.uuid(),
+	name: faker.string.sample(),
+	active: faker.datatype.boolean(),
+	tags: [],
+});
+
+const workflowsData = Array.from({ length: 10 }, workflowDataFactory);
+
+const initialState = {
+	[STORES.SETTINGS]: {
+		settings: {
+			templates: {
+				enabled: true,
+				host: 'https://api.n8n.io/api/',
+			},
+			license: {
+				environment: 'development',
+			},
+			deployment: {
+				type: 'default',
+			},
+			enterprise: {
+				advancedExecutionFilters: true,
+			},
+		},
+	},
+};
+
+const renderComponent = createComponentRenderer(ExecutionsFilter, {
+	props: {
+		teleported: false,
+	},
+});
+
+describe('ExecutionsFilter', () => {
+	afterAll(() => {
+		vi.clearAllMocks();
+	});
+
+	test('telemetry sent only once after component is mounted', async () => {
+		const track = vi.fn();
+		const spy = vi.spyOn(telemetryModule, 'useTelemetry');
+		spy.mockImplementation(
+			() =>
+				({
+					track,
+				}) as unknown as Telemetry,
+		);
+
+		const { getByTestId } = renderComponent({
+			pinia: createTestingPinia({ initialState }),
+		});
+		const customDataKeyInput = getByTestId('execution-filter-saved-data-key-input');
+
+		await userEvent.type(customDataKeyInput, 'test');
+		await userEvent.type(customDataKeyInput, 'key');
+
+		expect(track).toHaveBeenCalledTimes(1);
+	});
+
+	test.each([
+		['development', 'default', false, workflowsData],
+		['development', 'default', true, workflowsData],
+		['development', 'cloud', false, undefined],
+		['development', 'cloud', true, undefined],
+		['production', 'cloud', false, workflowsData],
+		['production', 'cloud', true, undefined],
+		['production', 'default', false, undefined],
+		['production', 'default', true, workflowsData],
+	])(
+		'renders in %s environment on %s deployment with advancedExecutionFilters %s',
+		async (environment, deployment, advancedExecutionFilters, workflows) => {
+			const { html, getByTestId, queryByTestId, queryAllByTestId } = renderComponent({
+				props: { workflows },
+				pinia: createTestingPinia({
+					initialState: merge(initialState, {
+						[STORES.SETTINGS]: {
+							settings: {
+								license: {
+									environment,
+								},
+								deployment: {
+									type: deployment,
+								},
+								enterprise: {
+									advancedExecutionFilters,
+								},
+							},
+						},
+					}),
+				}),
+			});
+
+			await userEvent.click(getByTestId('executions-filter-button'));
+			await userEvent.hover(getByTestId('execution-filter-saved-data-key-input'));
+
+			if (advancedExecutionFilters) {
+				expect(queryByTestId('executions-filter-view-plans-link')).not.toBeVisible();
+			}
+
+			expect(queryByTestId('executions-filter-reset-button')).not.toBeInTheDocument();
+
+			const select = queryByTestId('executions-filter-workflows-select');
+			if (workflows && workflows.length > 0) {
+				expect(select).toBeVisible();
+			} else {
+				expect(select).not.toBeInTheDocument();
+			}
+		},
+	);
+
+	test('state change', async () => {
+		const { getByTestId, queryByTestId, emitted } = renderComponent({
+			pinia: createTestingPinia({ initialState }),
+		});
+
+		let filterChangedEvent = emitted().filterChanged;
+
+		expect(getByTestId('execution-filter-form')).not.toBeVisible();
+		expect(queryByTestId('executions-filter-reset-button')).not.toBeInTheDocument();
+		expect(queryByTestId('execution-filter-badge')).not.toBeInTheDocument();
+
+		await userEvent.click(getByTestId('executions-filter-button'));
+		expect(getByTestId('execution-filter-form')).toBeVisible();
+
+		await userEvent.click(getByTestId('executions-filter-status-select'));
+
+		await userEvent.click(getByTestId('executions-filter-status-select').querySelectorAll('li')[1]);
+		filterChangedEvent = emitted().filterChanged;
+
+		expect(filterChangedEvent).toHaveLength(1);
+		expect(filterChangedEvent[0]).toEqual([{ ...defaultFilterState, status: 'error' }]);
+		expect(getByTestId('executions-filter-reset-button')).toBeInTheDocument();
+		expect(getByTestId('execution-filter-badge')).toBeInTheDocument();
+
+		await userEvent.click(getByTestId('executions-filter-reset-button'));
+		filterChangedEvent = emitted().filterChanged;
+
+		expect(filterChangedEvent).toHaveLength(2);
+		expect(filterChangedEvent[1]).toEqual([defaultFilterState]);
+		expect(queryByTestId('executions-filter-reset-button')).not.toBeInTheDocument();
+		expect(queryByTestId('execution-filter-badge')).not.toBeInTheDocument();
+	});
+});
diff --git a/packages/editor-ui/src/components/executions/ExecutionsFilter.vue b/packages/editor-ui/src/components/executions/ExecutionsFilter.vue
new file mode 100644
index 0000000000000..3133fcc0912d1
--- /dev/null
+++ b/packages/editor-ui/src/components/executions/ExecutionsFilter.vue
@@ -0,0 +1,425 @@
+<script lang="ts" setup>
+import { computed, reactive, onBeforeMount, ref } from 'vue';
+import type {
+	ExecutionFilterType,
+	ExecutionFilterMetadata,
+	IWorkflowShortResponse,
+	IWorkflowDb,
+} from '@/Interface';
+import { i18n as locale } from '@/plugins/i18n';
+import TagsDropdown from '@/components/TagsDropdown.vue';
+import { getObjectKeys, isEmpty } from '@/utils/typesUtils';
+import { EnterpriseEditionFeature } from '@/constants';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useUIStore } from '@/stores/ui.store';
+import { useTelemetry } from '@/composables/useTelemetry';
+import type { Placement } from '@floating-ui/core';
+import { useDebounce } from '@/composables/useDebounce';
+
+export type ExecutionFilterProps = {
+	workflows?: Array<IWorkflowDb | IWorkflowShortResponse>;
+	popoverPlacement?: Placement;
+	teleported?: boolean;
+};
+
+const DATE_TIME_MASK = 'YYYY-MM-DD HH:mm';
+
+const settingsStore = useSettingsStore();
+const uiStore = useUIStore();
+const { debounce } = useDebounce();
+
+const telemetry = useTelemetry();
+
+const props = withDefaults(defineProps<ExecutionFilterProps>(), {
+	workflows: [] as Array<IWorkflowDb | IWorkflowShortResponse>,
+	popoverPlacement: 'bottom' as Placement,
+	teleported: true,
+});
+const emit = defineEmits<{
+	(event: 'filterChanged', value: ExecutionFilterType): void;
+}>();
+const debouncedEmit = debounce(emit, {
+	debounceTime: 500,
+});
+
+const isCustomDataFilterTracked = ref(false);
+const isAdvancedExecutionFilterEnabled = computed(() =>
+	settingsStore.isEnterpriseFeatureEnabled(EnterpriseEditionFeature.AdvancedExecutionFilters),
+);
+const showTags = computed(() => false);
+
+const getDefaultFilter = (): ExecutionFilterType => ({
+	status: 'all',
+	workflowId: 'all',
+	tags: [],
+	startDate: '',
+	endDate: '',
+	metadata: [{ key: '', value: '' }],
+});
+const filter = reactive(getDefaultFilter());
+
+// Automatically set up v-models based on filter properties
+const vModel = reactive(
+	getObjectKeys(filter).reduce(
+		(acc, key) => {
+			acc[key] = computed({
+				get() {
+					return filter[key];
+				},
+				set(value) {
+					// TODO: find out what exactly is typechecker complaining about
+
+					// @ts-ignore
+					filter[key] = value;
+					emit('filterChanged', filter);
+				},
+			});
+			return acc;
+		},
+		{} as Record<keyof ExecutionFilterType, ReturnType<typeof computed>>,
+	),
+);
+
+const statuses = computed(() => [
+	{ id: 'all', name: locale.baseText('executionsList.anyStatus') },
+	{ id: 'error', name: locale.baseText('executionsList.error') },
+	{ id: 'canceled', name: locale.baseText('executionsList.canceled') },
+	{ id: 'running', name: locale.baseText('executionsList.running') },
+	{ id: 'success', name: locale.baseText('executionsList.success') },
+	{ id: 'waiting', name: locale.baseText('executionsList.waiting') },
+]);
+
+const countSelectedFilterProps = computed(() => {
+	let count = 0;
+	if (filter.status !== 'all') {
+		count++;
+	}
+	if (filter.workflowId !== 'all' && props.workflows.length) {
+		count++;
+	}
+	if (!isEmpty(filter.tags)) {
+		count++;
+	}
+	if (!isEmpty(filter.metadata)) {
+		count++;
+	}
+	if (!!filter.startDate) {
+		count++;
+	}
+	if (!!filter.endDate) {
+		count++;
+	}
+	return count;
+});
+
+// vModel.metadata is a text input and needs a debounced emit to avoid too many requests
+// We use the :value and @input combo instead of v-model with this event listener
+const onFilterMetaChange = (index: number, prop: keyof ExecutionFilterMetadata, value: string) => {
+	if (!filter.metadata[index]) {
+		filter.metadata[index] = {
+			key: '',
+			value: '',
+		};
+	}
+	filter.metadata[index][prop] = value;
+
+	if (!isCustomDataFilterTracked.value) {
+		telemetry.track('User filtered executions with custom data');
+		isCustomDataFilterTracked.value = true;
+	}
+
+	debouncedEmit('filterChanged', filter);
+};
+
+// Can't use v-model on TagsDropdown component and thus vModel.tags is useless
+// We just emit the updated filter
+const onTagsChange = (tags: string[]) => {
+	filter.tags = tags;
+	emit('filterChanged', filter);
+};
+
+const onFilterReset = () => {
+	Object.assign(filter, getDefaultFilter());
+	emit('filterChanged', filter);
+};
+
+const goToUpgrade = () => {
+	void uiStore.goToUpgrade('custom-data-filter', 'upgrade-custom-data-filter');
+};
+
+onBeforeMount(() => {
+	isCustomDataFilterTracked.value = false;
+});
+</script>
+<template>
+	<n8n-popover trigger="click" :placement="popoverPlacement" width="440">
+		<template #reference>
+			<n8n-button
+				icon="filter"
+				type="tertiary"
+				:active="!!countSelectedFilterProps"
+				data-test-id="executions-filter-button"
+			>
+				<n8n-badge
+					v-if="!!countSelectedFilterProps"
+					theme="primary"
+					class="mr-4xs"
+					data-test-id="execution-filter-badge"
+					>{{ countSelectedFilterProps }}</n8n-badge
+				>
+				{{ locale.baseText('executionsList.filters') }}
+			</n8n-button>
+		</template>
+		<div data-test-id="execution-filter-form">
+			<div v-if="workflows && workflows.length > 0" :class="$style.group">
+				<label for="execution-filter-workflows">{{ locale.baseText('workflows.heading') }}</label>
+				<n8n-select
+					id="execution-filter-workflows"
+					v-model="vModel.workflowId"
+					:placeholder="locale.baseText('executionsFilter.selectWorkflow')"
+					filterable
+					data-test-id="executions-filter-workflows-select"
+					:teleported="teleported"
+				>
+					<div>
+						<n8n-option
+							v-for="(item, idx) in props.workflows"
+							:key="idx"
+							:label="item.name"
+							:value="item.id"
+						/>
+					</div>
+				</n8n-select>
+			</div>
+			<div v-if="showTags" :class="$style.group">
+				<label for="execution-filter-tags">{{ locale.baseText('workflows.filters.tags') }}</label>
+				<TagsDropdown
+					id="execution-filter-tags"
+					:placeholder="locale.baseText('workflowOpen.filterWorkflows')"
+					:model-value="filter.tags"
+					:create-enabled="false"
+					data-test-id="executions-filter-tags-select"
+					@update:model-value="onTagsChange"
+				/>
+			</div>
+			<div :class="$style.group">
+				<label for="execution-filter-status">{{ locale.baseText('executionsList.status') }}</label>
+				<n8n-select
+					id="execution-filter-status"
+					v-model="vModel.status"
+					:placeholder="locale.baseText('executionsFilter.selectStatus')"
+					filterable
+					data-test-id="executions-filter-status-select"
+					:teleported="teleported"
+				>
+					<n8n-option
+						v-for="(item, idx) in statuses"
+						:key="idx"
+						:label="item.name"
+						:value="item.id"
+					/>
+				</n8n-select>
+			</div>
+			<div :class="$style.group">
+				<label for="execution-filter-start-date">{{
+					locale.baseText('executionsFilter.start')
+				}}</label>
+				<div :class="$style.dates">
+					<el-date-picker
+						id="execution-filter-start-date"
+						v-model="vModel.startDate"
+						type="datetime"
+						:teleported="false"
+						:format="DATE_TIME_MASK"
+						:placeholder="locale.baseText('executionsFilter.startDate')"
+						data-test-id="executions-filter-start-date-picker"
+					/>
+					<span :class="$style.divider">to</span>
+					<el-date-picker
+						id="execution-filter-end-date"
+						v-model="vModel.endDate"
+						type="datetime"
+						:teleported="false"
+						:format="DATE_TIME_MASK"
+						:placeholder="locale.baseText('executionsFilter.endDate')"
+						data-test-id="executions-filter-end-date-picker"
+					/>
+				</div>
+			</div>
+			<div :class="$style.group">
+				<n8n-tooltip placement="right">
+					<template #content>
+						<i18n-t tag="span" keypath="executionsFilter.customData.docsTooltip">
+							<template #link>
+								<a
+									target="_blank"
+									href="https://docs.n8n.io/workflows/executions/custom-executions-data/"
+								>
+									{{ locale.baseText('executionsFilter.customData.docsTooltip.link') }}
+								</a>
+							</template>
+						</i18n-t>
+					</template>
+					<span :class="$style.label">
+						{{ locale.baseText('executionsFilter.savedData') }}
+						<n8n-icon :class="$style.tooltipIcon" icon="question-circle" size="small" />
+					</span>
+				</n8n-tooltip>
+				<div :class="$style.subGroup">
+					<label for="execution-filter-saved-data-key">{{
+						locale.baseText('executionsFilter.savedDataKey')
+					}}</label>
+					<n8n-tooltip :disabled="isAdvancedExecutionFilterEnabled" placement="top">
+						<template #content>
+							<i18n-t tag="span" keypath="executionsFilter.customData.inputTooltip">
+								<template #link>
+									<a
+										href="#"
+										data-test-id="executions-filter-view-plans-link"
+										@click.prevent="goToUpgrade"
+										>{{ locale.baseText('executionsFilter.customData.inputTooltip.link') }}</a
+									>
+								</template>
+							</i18n-t>
+						</template>
+						<n8n-input
+							id="execution-filter-saved-data-key"
+							name="execution-filter-saved-data-key"
+							type="text"
+							:disabled="!isAdvancedExecutionFilterEnabled"
+							:placeholder="locale.baseText('executionsFilter.savedDataKeyPlaceholder')"
+							:model-value="filter.metadata[0]?.key"
+							data-test-id="execution-filter-saved-data-key-input"
+							@update:model-value="onFilterMetaChange(0, 'key', $event)"
+						/>
+					</n8n-tooltip>
+					<label for="execution-filter-saved-data-value">{{
+						locale.baseText('executionsFilter.savedDataValue')
+					}}</label>
+					<n8n-tooltip :disabled="isAdvancedExecutionFilterEnabled" placement="top">
+						<template #content>
+							<i18n-t tag="span" keypath="executionsFilter.customData.inputTooltip">
+								<template #link>
+									<a href="#" @click.prevent="goToUpgrade">{{
+										locale.baseText('executionsFilter.customData.inputTooltip.link')
+									}}</a>
+								</template>
+							</i18n-t>
+						</template>
+						<n8n-input
+							id="execution-filter-saved-data-value"
+							name="execution-filter-saved-data-value"
+							type="text"
+							:disabled="!isAdvancedExecutionFilterEnabled"
+							:placeholder="locale.baseText('executionsFilter.savedDataValuePlaceholder')"
+							:model-value="filter.metadata[0]?.value"
+							data-test-id="execution-filter-saved-data-value-input"
+							@update:model-value="onFilterMetaChange(0, 'value', $event)"
+						/>
+					</n8n-tooltip>
+				</div>
+			</div>
+			<n8n-button
+				v-if="!!countSelectedFilterProps"
+				:class="$style.resetBtn"
+				size="large"
+				text
+				data-test-id="executions-filter-reset-button"
+				@click="onFilterReset"
+			>
+				{{ locale.baseText('executionsFilter.reset') }}
+			</n8n-button>
+		</div>
+	</n8n-popover>
+</template>
+<style lang="scss" module>
+.group {
+	label,
+	.label {
+		display: inline-block;
+		font-size: var(--font-size-2xs);
+		margin: var(--spacing-s) 0 var(--spacing-3xs);
+	}
+}
+
+.subGroup {
+	padding: 0 0 var(--spacing-xs) var(--spacing-s);
+
+	label,
+	.label {
+		font-size: var(--font-size-3xs);
+		margin: var(--spacing-4xs) 0 var(--spacing-4xs);
+	}
+}
+
+.dates {
+	display: flex;
+	border: 1px solid var(--color-foreground-base);
+	border-radius: var(--border-radius-base);
+	white-space: nowrap;
+	align-items: center;
+}
+
+.divider {
+	padding: 0 var(--spacing-m);
+	line-height: 100%;
+}
+
+.resetBtn {
+	padding: 0;
+	margin: var(--spacing-xs) 0 0;
+}
+
+.tooltipIcon {
+	color: var(--color-text-light);
+}
+</style>
+
+<style lang="scss" scoped>
+:deep(.el-date-editor) {
+	input {
+		height: 36px;
+		border: 0;
+		padding-right: 0;
+	}
+
+	.el-input__prefix {
+		color: var(--color-foreground-dark);
+	}
+
+	&:last-of-type {
+		input {
+			padding-left: 0;
+		}
+
+		.el-input__prefix {
+			display: none;
+		}
+	}
+}
+
+:deep(.el-select-dropdown.el-popper[data-popper-placement^='bottom']) {
+	> .popper__arrow {
+		top: -6px;
+		left: 50%;
+		right: unset;
+		margin-bottom: 0;
+		margin-right: 3px;
+		border-left-width: 6px;
+		border-top-width: 0;
+		border-bottom-color: var(--border-color-light);
+		border-right-color: transparent;
+
+		&::after {
+			top: 1px;
+			left: unset;
+			bottom: unset;
+			margin-left: -6px;
+			border-left-width: 6px;
+			border-top-width: 0;
+			border-bottom-color: var(--color-foreground-xlight);
+			border-right-color: transparent;
+		}
+	}
+}
+</style>
diff --git a/packages/editor-ui/src/components/executions/ExecutionsTime.vue b/packages/editor-ui/src/components/executions/ExecutionsTime.vue
new file mode 100644
index 0000000000000..4e490287a7ec7
--- /dev/null
+++ b/packages/editor-ui/src/components/executions/ExecutionsTime.vue
@@ -0,0 +1,46 @@
+<template>
+	<span>
+		{{ time }}
+	</span>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+
+export default defineComponent({
+	name: 'ExecutionsTime',
+	props: ['startTime'],
+	data() {
+		return {
+			nowTime: -1,
+			intervalTimer: null as null | NodeJS.Timeout,
+		};
+	},
+	computed: {
+		time(): string {
+			if (!this.startTime) {
+				return '...';
+			}
+			const msPassed = this.nowTime - new Date(this.startTime).getTime();
+			return this.$locale.displayTimer(msPassed);
+		},
+	},
+	mounted() {
+		this.setNow();
+		this.intervalTimer = setInterval(() => {
+			this.setNow();
+		}, 1000);
+	},
+	beforeUnmount() {
+		// Make sure that the timer gets destroyed once no longer needed
+		if (this.intervalTimer !== null) {
+			clearInterval(this.intervalTimer);
+		}
+	},
+	methods: {
+		setNow() {
+			this.nowTime = new Date().getTime();
+		},
+	},
+});
+</script>
diff --git a/packages/editor-ui/src/components/executions/ExecutionsUsage.vue b/packages/editor-ui/src/components/executions/ExecutionsUsage.vue
new file mode 100644
index 0000000000000..3f9490f51d3e5
--- /dev/null
+++ b/packages/editor-ui/src/components/executions/ExecutionsUsage.vue
@@ -0,0 +1,203 @@
+<template>
+	<div :class="$style.container">
+		<div v-if="isTrialExpired" :class="$style.usageText">
+			<n8n-text size="small" color="danger">
+				{{ locale.baseText('executionUsage.expired.text') }}
+			</n8n-text>
+		</div>
+		<div v-else-if="!isTrialExpired && trialHasExecutionsLeft" :class="$style.usageText">
+			<i18n-t tag="span" keypath="executionUsage.currentUsage">
+				<template #text>
+					<n8n-text size="small" color="text-dark">
+						{{ locale.baseText('executionUsage.currentUsage.text') }}
+					</n8n-text>
+				</template>
+				<template #count>
+					<n8n-text size="small" :bold="true" color="warning">
+						{{
+							locale.baseText('executionUsage.currentUsage.count', {
+								adjustToNumber: daysLeftOnTrial || 0,
+							})
+						}}
+					</n8n-text>
+				</template>
+			</i18n-t>
+		</div>
+		<div v-else-if="!trialHasExecutionsLeft" :class="$style.usageText">
+			<n8n-text size="small">
+				{{ locale.baseText('executionUsage.ranOutOfExecutions.text') }}
+			</n8n-text>
+		</div>
+		<div v-if="!isTrialExpired" :class="$style.usageCounter">
+			<div :class="$style.progressBarDiv">
+				<progress
+					:class="[
+						trialHasExecutionsLeft ? $style.progressBarSuccess : $style.progressBarDanger,
+						$style.progressBar,
+					]"
+					:value="currentExecutionsWithThreshold"
+					:max="maxExecutions"
+				></progress>
+			</div>
+			<div :class="$style.executionsCountSection">
+				<n8n-text size="xsmall" :color="trialHasExecutionsLeft ? 'text-dark' : 'danger'">
+					{{ currentExecutions }}/{{ maxExecutions }}
+				</n8n-text>
+				<n8n-text size="xsmall" :color="trialHasExecutionsLeft ? 'text-dark' : 'danger'">{{
+					locale.baseText('executionUsage.label.executions')
+				}}</n8n-text>
+			</div>
+		</div>
+
+		<div :class="$style.upgradeButtonSection">
+			<n8n-button
+				:label="locale.baseText('executionUsage.button.upgrade')"
+				size="xmini"
+				icon="gem"
+				type="success"
+				:block="true"
+				@click="onUpgradeClicked"
+			/>
+		</div>
+	</div>
+</template>
+
+<script setup lang="ts">
+import { i18n as locale } from '@/plugins/i18n';
+import { DateTime } from 'luxon';
+import type { CloudPlanAndUsageData } from '@/Interface';
+import { computed } from 'vue';
+import { useUIStore } from '@/stores/ui.store';
+
+const PROGRESS_BAR_MINIMUM_THRESHOLD = 8;
+
+const props = defineProps<{ cloudPlanData: CloudPlanAndUsageData | null }>();
+
+const now = DateTime.utc();
+
+const daysLeftOnTrial = computed(() => {
+	const { days = 0 } = getPlanExpirationDate().diff(now, ['days']).toObject();
+	return Math.ceil(days);
+});
+
+const isTrialExpired = computed(() => {
+	if (!props.cloudPlanData?.expirationDate) return false;
+	const trialEndsAt = DateTime.fromISO(props.cloudPlanData.expirationDate);
+	return now.toMillis() > trialEndsAt.toMillis();
+});
+
+const getPlanExpirationDate = () => DateTime.fromISO(props?.cloudPlanData?.expirationDate ?? '');
+
+const trialHasExecutionsLeft = computed(() => {
+	if (!props.cloudPlanData?.usage) return 0;
+	return props.cloudPlanData.usage.executions < props.cloudPlanData.monthlyExecutionsLimit;
+});
+
+const currentExecutions = computed(() => {
+	if (!props.cloudPlanData?.usage) return 0;
+	const usedExecutions = props.cloudPlanData.usage.executions;
+	const executionsQuota = props.cloudPlanData.monthlyExecutionsLimit;
+	return usedExecutions > executionsQuota ? executionsQuota : usedExecutions;
+});
+
+const currentExecutionsWithThreshold = computed(() => {
+	if (!props.cloudPlanData?.usage) return 0;
+	const usedExecutions = props.cloudPlanData.usage.executions;
+	const executionsQuota = props.cloudPlanData.monthlyExecutionsLimit;
+	const threshold = (PROGRESS_BAR_MINIMUM_THRESHOLD * executionsQuota) / 100;
+	return usedExecutions < threshold ? threshold : usedExecutions;
+});
+
+const maxExecutions = computed(() => {
+	if (!props.cloudPlanData?.monthlyExecutionsLimit) return 0;
+	return props.cloudPlanData.monthlyExecutionsLimit;
+});
+
+const onUpgradeClicked = () => {
+	void useUIStore().goToUpgrade('canvas-nav', 'upgrade-canvas-nav', 'redirect');
+};
+</script>
+
+<style module lang="scss">
+.container {
+	display: flex;
+	flex-direction: column;
+	background-color: var(--color-background-light);
+	border: var(--border-base);
+	border-right: 0;
+}
+
+.progressBarDiv {
+	display: flex;
+	align-items: center;
+}
+
+.progressBar {
+	width: 62.4px;
+	border: 0;
+	height: 5px;
+	border-radius: 20px;
+	background-color: var(--color-foreground-base);
+}
+.progressBar::-webkit-progress-bar {
+	width: 62.4px;
+	border: 0;
+	height: 5px;
+	border-radius: 20px;
+	background-color: var(--color-foreground-base);
+}
+.progressBar::-moz-progress-bar {
+	width: 62.4px;
+	border: 0;
+	height: 5px;
+	border-radius: 20px;
+	background-color: var(--color-foreground-base);
+}
+
+.progressBarSuccess::-moz-progress-bar {
+	background: var(--color-foreground-xdark);
+	border-radius: 20px;
+}
+
+.progressBarSuccess::-webkit-progress-value {
+	background: var(--color-foreground-xdark);
+	border-radius: 20px;
+}
+
+.progressBarDanger::-webkit-progress-value {
+	background: var(--color-danger);
+	border-radius: 20px;
+}
+
+.progressBarDanger::-moz-progress-bar {
+	background: var(--color-danger);
+}
+
+.usageText {
+	margin-left: var(--spacing-s);
+	margin-right: var(--spacing-s);
+	margin-top: var(--spacing-xs);
+	line-height: var(--spacing-xs);
+}
+
+.usageCounter {
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+	justify-content: center;
+	margin-top: var(--spacing-2xs);
+	font-size: var(--font-size-3xs);
+}
+
+.danger {
+	color: var(--color-danger);
+}
+
+.executionsCountSection {
+	margin-left: var(--spacing-xs);
+}
+
+.upgradeButtonSection {
+	margin: var(--spacing-s);
+}
+</style>
diff --git a/packages/editor-ui/src/components/executions/global/GlobalExecutionsList.test.ts b/packages/editor-ui/src/components/executions/global/GlobalExecutionsList.test.ts
new file mode 100644
index 0000000000000..a2fb907e91e19
--- /dev/null
+++ b/packages/editor-ui/src/components/executions/global/GlobalExecutionsList.test.ts
@@ -0,0 +1,211 @@
+import { vi, describe, it, expect } from 'vitest';
+import { merge } from 'lodash-es';
+import { createTestingPinia } from '@pinia/testing';
+import userEvent from '@testing-library/user-event';
+import { faker } from '@faker-js/faker';
+import { STORES, VIEWS } from '@/constants';
+import ExecutionsList from '@/components/executions/global/GlobalExecutionsList.vue';
+import type { IWorkflowDb } from '@/Interface';
+import type { ExecutionSummary } from 'n8n-workflow';
+import { retry, SETTINGS_STORE_DEFAULT_STATE, waitAllPromises } from '@/__tests__/utils';
+import { createComponentRenderer } from '@/__tests__/render';
+import { waitFor } from '@testing-library/vue';
+
+vi.mock('vue-router', () => ({
+	useRoute: vi.fn().mockReturnValue({
+		name: VIEWS.WORKFLOW_EXECUTIONS,
+	}),
+	useRouter: vi.fn(),
+	RouterLink: vi.fn(),
+}));
+
+let pinia: ReturnType<typeof createTestingPinia>;
+
+const generateUndefinedNullOrString = () => {
+	switch (Math.floor(Math.random() * 4)) {
+		case 0:
+			return undefined;
+		case 1:
+			return null;
+		case 2:
+			return faker.string.uuid();
+		case 3:
+			return '';
+		default:
+			return undefined;
+	}
+};
+
+const workflowDataFactory = (): IWorkflowDb => ({
+	createdAt: faker.date.past().toDateString(),
+	updatedAt: faker.date.past().toDateString(),
+	id: faker.string.uuid(),
+	name: faker.string.sample(),
+	active: faker.datatype.boolean(),
+	tags: [],
+	nodes: [],
+	connections: {},
+	versionId: faker.number.int().toString(),
+});
+
+const executionDataFactory = (): ExecutionSummary => ({
+	id: faker.string.uuid(),
+	finished: faker.datatype.boolean(),
+	mode: faker.helpers.arrayElement(['manual', 'trigger']),
+	startedAt: faker.date.past(),
+	stoppedAt: faker.date.past(),
+	workflowId: faker.number.int().toString(),
+	workflowName: faker.string.sample(),
+	status: faker.helpers.arrayElement(['error', 'success']),
+	nodeExecutionStatus: {},
+	retryOf: generateUndefinedNullOrString(),
+	retrySuccessId: generateUndefinedNullOrString(),
+});
+
+const generateWorkflowsData = () => Array.from({ length: 10 }, workflowDataFactory);
+
+const generateExecutionsData = () =>
+	Array.from({ length: 2 }, () => ({
+		count: 20,
+		results: Array.from({ length: 10 }, executionDataFactory),
+		estimated: false,
+	}));
+
+const renderComponent = createComponentRenderer(ExecutionsList, {
+	props: {
+		autoRefreshEnabled: false,
+	},
+	global: {
+		mocks: {
+			$route: {
+				params: {},
+			},
+		},
+		stubs: ['font-awesome-icon'],
+	},
+});
+
+describe('GlobalExecutionsList', () => {
+	let executionsData: Array<{
+		count: number;
+		results: ExecutionSummary[];
+		estimated: boolean;
+	}>;
+
+	beforeEach(() => {
+		executionsData = generateExecutionsData();
+
+		pinia = createTestingPinia({
+			initialState: {
+				[STORES.EXECUTIONS]: {
+					executions: [],
+				},
+				[STORES.SETTINGS]: {
+					settings: merge(SETTINGS_STORE_DEFAULT_STATE.settings, {
+						enterprise: {
+							advancedExecutionFilters: true,
+						},
+					}),
+				},
+			},
+		});
+	});
+
+	it('should render empty list', async () => {
+		const { queryAllByTestId, queryByTestId, getByTestId } = renderComponent({
+			props: {
+				executions: [],
+			},
+			pinia,
+		});
+		await waitAllPromises();
+
+		await userEvent.click(getByTestId('execution-auto-refresh-checkbox'));
+
+		expect(queryAllByTestId('select-execution-checkbox').length).toBe(0);
+		expect(queryByTestId('load-more-button')).not.toBeInTheDocument();
+		expect(queryByTestId('select-all-executions-checkbox')).not.toBeInTheDocument();
+		expect(getByTestId('execution-list-empty')).toBeInTheDocument();
+	});
+
+	it(
+		'should handle selection flow when loading more items',
+		async () => {
+			const { getByTestId, getAllByTestId, queryByTestId, rerender } = renderComponent({
+				props: {
+					executions: executionsData[0].results,
+					total: executionsData[0].count,
+					filteredExecutions: executionsData[0].results,
+				},
+				pinia,
+			});
+			await waitAllPromises();
+
+			await userEvent.click(getByTestId('select-visible-executions-checkbox'));
+
+			await retry(() =>
+				expect(
+					getAllByTestId('select-execution-checkbox').filter((el) =>
+						el.contains(el.querySelector(':checked')),
+					).length,
+				).toBe(10),
+			);
+			expect(getByTestId('select-all-executions-checkbox')).toBeInTheDocument();
+			expect(getByTestId('selected-executions-info').textContent).toContain(10);
+
+			await userEvent.click(getByTestId('load-more-button'));
+			await rerender({
+				executions: executionsData[0].results.concat(executionsData[1].results),
+				filteredExecutions: executionsData[0].results.concat(executionsData[1].results),
+			});
+
+			await waitFor(() => expect(getAllByTestId('select-execution-checkbox').length).toBe(20));
+			expect(
+				getAllByTestId('select-execution-checkbox').filter((el) =>
+					el.contains(el.querySelector(':checked')),
+				).length,
+			).toBe(10);
+
+			await userEvent.click(getByTestId('select-all-executions-checkbox'));
+			expect(getAllByTestId('select-execution-checkbox').length).toBe(20);
+			expect(
+				getAllByTestId('select-execution-checkbox').filter((el) =>
+					el.contains(el.querySelector(':checked')),
+				).length,
+			).toBe(20);
+			expect(getByTestId('selected-executions-info').textContent).toContain(20);
+
+			await userEvent.click(getAllByTestId('select-execution-checkbox')[2]);
+			expect(getAllByTestId('select-execution-checkbox').length).toBe(20);
+			expect(
+				getAllByTestId('select-execution-checkbox').filter((el) =>
+					el.contains(el.querySelector(':checked')),
+				).length,
+			).toBe(19);
+			expect(getByTestId('selected-executions-info').textContent).toContain(19);
+			expect(getByTestId('select-visible-executions-checkbox')).toBeInTheDocument();
+			expect(queryByTestId('select-all-executions-checkbox')).not.toBeInTheDocument();
+		},
+		{ timeout: 10000 },
+	);
+
+	it('should show "retry" data when appropriate', async () => {
+		const retryOf = executionsData[0].results.filter((execution) => execution.retryOf);
+		const retrySuccessId = executionsData[0].results.filter(
+			(execution) => !execution.retryOf && execution.retrySuccessId,
+		);
+
+		const { queryAllByText } = renderComponent({
+			props: {
+				executions: executionsData[0].results,
+				total: executionsData[0].count,
+				filteredExecutions: executionsData[0].results,
+			},
+			pinia,
+		});
+		await waitAllPromises();
+
+		expect(queryAllByText(/Retry of/).length).toBe(retryOf.length);
+		expect(queryAllByText(/Success retry/).length).toBe(retrySuccessId.length);
+	});
+});
diff --git a/packages/editor-ui/src/components/executions/global/GlobalExecutionsList.vue b/packages/editor-ui/src/components/executions/global/GlobalExecutionsList.vue
new file mode 100644
index 0000000000000..32731bfb80be1
--- /dev/null
+++ b/packages/editor-ui/src/components/executions/global/GlobalExecutionsList.vue
@@ -0,0 +1,550 @@
+<script lang="ts" setup>
+import type { PropType } from 'vue';
+import { watch, computed, ref, onMounted } from 'vue';
+import ExecutionsFilter from '@/components/executions/ExecutionsFilter.vue';
+import GlobalExecutionsListItem from '@/components/executions/global/GlobalExecutionsListItem.vue';
+import { MODAL_CONFIRM } from '@/constants';
+import { useToast } from '@/composables/useToast';
+import { useMessage } from '@/composables/useMessage';
+import { useI18n } from '@/composables/useI18n';
+import { useTelemetry } from '@/composables/useTelemetry';
+import type { ExecutionFilterType, IWorkflowDb } from '@/Interface';
+import type { ExecutionSummary } from 'n8n-workflow';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useExecutionsStore } from '@/stores/executions.store';
+
+const props = defineProps({
+	executions: {
+		type: Array as PropType<ExecutionSummary[]>,
+		default: () => [],
+	},
+	filters: {
+		type: Object as PropType<ExecutionFilterType>,
+		default: () => ({}),
+	},
+	total: {
+		type: Number,
+		default: 0,
+	},
+	estimated: {
+		type: Boolean,
+		default: false,
+	},
+});
+
+const emit = defineEmits(['closeModal', 'execution:stop', 'update:autoRefresh', 'update:filters']);
+
+const i18n = useI18n();
+const telemetry = useTelemetry();
+const workflowsStore = useWorkflowsStore();
+const executionsStore = useExecutionsStore();
+
+const isMounted = ref(false);
+const allVisibleSelected = ref(false);
+const allExistingSelected = ref(false);
+const selectedItems = ref<Record<string, boolean>>({});
+
+const message = useMessage();
+const toast = useToast();
+
+const selectedCount = computed(() => {
+	if (allExistingSelected.value) {
+		return props.total;
+	}
+
+	return Object.keys(selectedItems.value).length;
+});
+
+const workflows = computed<IWorkflowDb[]>(() => {
+	return [
+		{
+			id: 'all',
+			name: i18n.baseText('executionsList.allWorkflows'),
+		} as IWorkflowDb,
+		...workflowsStore.allWorkflows,
+	];
+});
+
+watch(
+	() => props.executions,
+	() => {
+		if (props.executions.length === 0) {
+			handleClearSelection();
+		}
+		adjustSelectionAfterMoreItemsLoaded();
+	},
+);
+
+onMounted(() => {
+	isMounted.value = true;
+});
+
+function handleCheckAllExistingChange() {
+	allExistingSelected.value = !allExistingSelected.value;
+	allVisibleSelected.value = !allExistingSelected.value;
+	handleCheckAllVisibleChange();
+}
+
+function handleCheckAllVisibleChange() {
+	allVisibleSelected.value = !allVisibleSelected.value;
+	if (!allVisibleSelected.value) {
+		allExistingSelected.value = false;
+		selectedItems.value = {};
+	} else {
+		selectAllVisibleExecutions();
+	}
+}
+
+function toggleSelectExecution(execution: ExecutionSummary) {
+	const executionId = execution.id;
+	if (selectedItems.value[executionId]) {
+		const { [executionId]: removedSelectedItem, ...rest } = selectedItems.value;
+		selectedItems.value = rest;
+	} else {
+		selectedItems.value = {
+			...selectedItems.value,
+			[executionId]: true,
+		};
+	}
+	allVisibleSelected.value = Object.keys(selectedItems.value).length === props.executions.length;
+	allExistingSelected.value = Object.keys(selectedItems.value).length === props.total;
+}
+
+async function handleDeleteSelected() {
+	const deleteExecutions = await message.confirm(
+		i18n.baseText('executionsList.confirmMessage.message', {
+			interpolate: { count: selectedCount.value.toString() },
+		}),
+		i18n.baseText('executionsList.confirmMessage.headline'),
+		{
+			type: 'warning',
+			confirmButtonText: i18n.baseText('executionsList.confirmMessage.confirmButtonText'),
+			cancelButtonText: i18n.baseText('executionsList.confirmMessage.cancelButtonText'),
+		},
+	);
+
+	if (deleteExecutions !== MODAL_CONFIRM) {
+		return;
+	}
+
+	try {
+		await executionsStore.deleteExecutions({
+			filters: executionsStore.executionsFilters,
+			...(allExistingSelected.value
+				? { deleteBefore: props.executions[0].startedAt }
+				: {
+						ids: Object.keys(selectedItems.value),
+					}),
+		});
+	} catch (error) {
+		toast.showError(error, i18n.baseText('executionsList.showError.handleDeleteSelected.title'));
+		return;
+	}
+
+	toast.showMessage({
+		title: i18n.baseText('executionsList.showMessage.handleDeleteSelected.title'),
+		type: 'success',
+	});
+
+	handleClearSelection();
+}
+
+function handleClearSelection() {
+	allVisibleSelected.value = false;
+	allExistingSelected.value = false;
+	selectedItems.value = {};
+}
+
+async function onFilterChanged(filters: ExecutionFilterType) {
+	emit('update:filters', filters);
+	handleClearSelection();
+}
+
+function getExecutionWorkflowName(execution: ExecutionSummary): string {
+	return (
+		getWorkflowName(execution.workflowId ?? '') ?? i18n.baseText('executionsList.unsavedWorkflow')
+	);
+}
+
+function getWorkflowName(workflowId: string): string | undefined {
+	return workflows.value.find((data: IWorkflowDb) => data.id === workflowId)?.name;
+}
+
+async function loadMore() {
+	if (executionsStore.filters.status === 'running') {
+		return;
+	}
+
+	let lastId: string | undefined;
+	if (props.executions.length !== 0) {
+		const lastItem = props.executions.slice(-1)[0];
+		lastId = lastItem.id;
+	}
+
+	try {
+		await executionsStore.fetchExecutions(executionsStore.executionsFilters, lastId);
+	} catch (error) {
+		toast.showError(error, i18n.baseText('executionsList.showError.loadMore.title'));
+	}
+}
+
+function selectAllVisibleExecutions() {
+	props.executions.forEach((execution: ExecutionSummary) => {
+		selectedItems.value[execution.id] = true;
+	});
+}
+
+function adjustSelectionAfterMoreItemsLoaded() {
+	if (allExistingSelected.value) {
+		allVisibleSelected.value = true;
+		selectAllVisibleExecutions();
+	}
+}
+
+async function retrySavedExecution(execution: ExecutionSummary) {
+	await retryExecution(execution, true);
+}
+
+async function retryOriginalExecution(execution: ExecutionSummary) {
+	await retryExecution(execution, false);
+}
+
+async function retryExecution(execution: ExecutionSummary, loadWorkflow?: boolean) {
+	try {
+		const retrySuccessful = await executionsStore.retryExecution(execution.id, loadWorkflow);
+
+		if (retrySuccessful) {
+			toast.showMessage({
+				title: i18n.baseText('executionsList.showMessage.retrySuccessfulTrue.title'),
+				type: 'success',
+			});
+		} else {
+			toast.showMessage({
+				title: i18n.baseText('executionsList.showMessage.retrySuccessfulFalse.title'),
+				type: 'error',
+			});
+		}
+	} catch (error) {
+		toast.showError(error, i18n.baseText('executionsList.showError.retryExecution.title'));
+	}
+
+	telemetry.track('User clicked retry execution button', {
+		workflow_id: workflowsStore.workflowId,
+		execution_id: execution.id,
+		retry_type: loadWorkflow ? 'current' : 'original',
+	});
+}
+
+async function stopExecution(execution: ExecutionSummary) {
+	try {
+		await executionsStore.stopCurrentExecution(execution.id);
+
+		toast.showMessage({
+			title: i18n.baseText('executionsList.showMessage.stopExecution.title'),
+			message: i18n.baseText('executionsList.showMessage.stopExecution.message', {
+				interpolate: { activeExecutionId: execution.id },
+			}),
+			type: 'success',
+		});
+
+		emit('execution:stop');
+	} catch (error) {
+		toast.showError(error, i18n.baseText('executionsList.showError.stopExecution.title'));
+	}
+}
+
+async function deleteExecution(execution: ExecutionSummary) {
+	try {
+		await executionsStore.deleteExecutions({ ids: [execution.id] });
+
+		if (allVisibleSelected.value) {
+			const { [execution.id]: _, ...rest } = selectedItems.value;
+			selectedItems.value = rest;
+		}
+	} catch (error) {
+		toast.showError(error, i18n.baseText('executionsList.showError.handleDeleteSelected.title'));
+	}
+}
+
+async function onAutoRefreshToggle(value: boolean) {
+	if (value) {
+		await executionsStore.startAutoRefreshInterval();
+	} else {
+		executionsStore.stopAutoRefreshInterval();
+	}
+}
+</script>
+
+<template>
+	<div :class="$style.execListWrapper">
+		<div :class="$style.execList">
+			<div :class="$style.execListHeader">
+				<N8nHeading tag="h1" size="2xlarge">
+					{{ i18n.baseText('executionsList.workflowExecutions') }}
+				</N8nHeading>
+				<div :class="$style.execListHeaderControls">
+					<N8nLoading v-if="!isMounted" :class="$style.filterLoader" variant="custom" />
+					<ElCheckbox
+						v-else
+						v-model="executionsStore.autoRefresh"
+						class="mr-xl"
+						data-test-id="execution-auto-refresh-checkbox"
+						@update:model-value="onAutoRefreshToggle($event)"
+					>
+						{{ i18n.baseText('executionsList.autoRefresh') }}
+					</ElCheckbox>
+					<ExecutionsFilter
+						v-show="isMounted"
+						:workflows="workflows"
+						@filter-changed="onFilterChanged"
+					/>
+				</div>
+			</div>
+
+			<ElCheckbox
+				v-if="allVisibleSelected && total > 0"
+				:class="$style.selectAll"
+				:label="
+					i18n.baseText('executionsList.selectAll', {
+						adjustToNumber: total,
+						interpolate: { executionNum: `${total}` },
+					})
+				"
+				:model-value="allExistingSelected"
+				data-test-id="select-all-executions-checkbox"
+				@update:model-value="handleCheckAllExistingChange"
+			/>
+
+			<div v-if="!isMounted">
+				<N8nLoading :class="$style.tableLoader" variant="custom" />
+				<N8nLoading :class="$style.tableLoader" variant="custom" />
+				<N8nLoading :class="$style.tableLoader" variant="custom" />
+			</div>
+			<table v-else :class="$style.execTable">
+				<thead>
+					<tr>
+						<th>
+							<el-checkbox
+								:model-value="allVisibleSelected"
+								:disabled="total < 1"
+								label=""
+								data-test-id="select-visible-executions-checkbox"
+								@update:model-value="handleCheckAllVisibleChange"
+							/>
+						</th>
+						<th>{{ i18n.baseText('executionsList.name') }}</th>
+						<th>{{ i18n.baseText('executionsList.startedAt') }}</th>
+						<th>{{ i18n.baseText('executionsList.status') }}</th>
+						<th>{{ i18n.baseText('executionsList.id') }}</th>
+						<th></th>
+						<th></th>
+						<th></th>
+						<th></th>
+					</tr>
+				</thead>
+				<TransitionGroup tag="tbody" name="executions-list">
+					<GlobalExecutionsListItem
+						v-for="execution in executions"
+						:key="execution.id"
+						:execution="execution"
+						:workflow-name="getExecutionWorkflowName(execution)"
+						:selected="selectedItems[execution.id] || allExistingSelected"
+						@stop="stopExecution"
+						@delete="deleteExecution"
+						@select="toggleSelectExecution"
+						@retry-saved="retrySavedExecution"
+						@retry-original="retryOriginalExecution"
+					/>
+				</TransitionGroup>
+			</table>
+
+			<div
+				v-if="!executions.length && isMounted && !executionsStore.loading"
+				:class="$style.loadedAll"
+				data-test-id="execution-list-empty"
+			>
+				{{ i18n.baseText('executionsList.empty') }}
+			</div>
+			<div v-else-if="total > executions.length || estimated" :class="$style.loadMore">
+				<N8nButton
+					icon="sync"
+					:title="i18n.baseText('executionsList.loadMore')"
+					:label="i18n.baseText('executionsList.loadMore')"
+					:loading="executionsStore.loading"
+					data-test-id="load-more-button"
+					@click="loadMore()"
+				/>
+			</div>
+			<div
+				v-else-if="isMounted && !executionsStore.loading"
+				:class="$style.loadedAll"
+				data-test-id="execution-all-loaded"
+			>
+				{{ i18n.baseText('executionsList.loadedAll') }}
+			</div>
+		</div>
+		<div
+			v-if="selectedCount > 0"
+			:class="$style.selectionOptions"
+			data-test-id="selected-executions-info"
+		>
+			<span>
+				{{
+					i18n.baseText('executionsList.selected', {
+						adjustToNumber: selectedCount,
+						interpolate: { count: `${selectedCount}` },
+					})
+				}}
+			</span>
+			<N8nButton
+				:label="i18n.baseText('generic.delete')"
+				type="tertiary"
+				data-test-id="delete-selected-button"
+				@click="handleDeleteSelected"
+			/>
+			<N8nButton
+				:label="i18n.baseText('executionsList.clearSelection')"
+				type="tertiary"
+				data-test-id="clear-selection-button"
+				@click="handleClearSelection"
+			/>
+		</div>
+	</div>
+</template>
+
+<style module lang="scss">
+.execListWrapper {
+	display: grid;
+	grid-template-rows: 1fr 0;
+	position: relative;
+	height: 100%;
+	width: 100%;
+	max-width: 1280px;
+}
+
+.execList {
+	position: relative;
+	height: 100%;
+	overflow: auto;
+	padding: var(--spacing-l) var(--spacing-l) 0;
+	@media (min-width: 1200px) {
+		padding: var(--spacing-2xl) var(--spacing-2xl) 0;
+	}
+}
+
+.execListHeader {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	margin-bottom: var(--spacing-s);
+}
+
+.execListHeaderControls {
+	display: flex;
+	align-items: center;
+	justify-content: flex-end;
+}
+
+.selectionOptions {
+	display: flex;
+	align-items: center;
+	position: absolute;
+	padding: var(--spacing-2xs);
+	z-index: 2;
+	left: 50%;
+	transform: translateX(-50%);
+	bottom: var(--spacing-3xl);
+	background: var(--color-background-dark);
+	border-radius: var(--border-radius-base);
+	color: var(--color-text-xlight);
+	font-size: var(--font-size-2xs);
+
+	button {
+		margin-left: var(--spacing-2xs);
+	}
+}
+
+.execTable {
+	/*
+	  Table height needs to be set to 0 in order to use height 100% for elements in table cells
+	*/
+	height: 0;
+	width: 100%;
+	text-align: left;
+	font-size: var(--font-size-s);
+
+	thead th {
+		position: sticky;
+		top: calc(var(--spacing-3xl) * -1);
+		z-index: 2;
+		padding: var(--spacing-s) var(--spacing-s) var(--spacing-s) 0;
+		background: var(--color-table-header-background);
+
+		&:first-child {
+			padding-left: var(--spacing-s);
+		}
+	}
+
+	th,
+	td {
+		height: 100%;
+		padding: var(--spacing-s) var(--spacing-s) var(--spacing-s) 0;
+
+		&:not(:first-child, :nth-last-child(-n + 3)) {
+			width: 100%;
+		}
+
+		&:nth-last-child(-n + 2) {
+			padding-left: 0;
+		}
+
+		@media (min-width: $breakpoint-sm) {
+			&:not(:nth-child(2)) {
+				&,
+				div,
+				span {
+					white-space: nowrap;
+				}
+			}
+		}
+	}
+}
+
+.loadMore {
+	margin: var(--spacing-m) 0;
+	width: 100%;
+	text-align: center;
+}
+
+.loadedAll {
+	text-align: center;
+	font-size: var(--font-size-s);
+	color: var(--color-text-light);
+	margin: var(--spacing-l) 0;
+}
+
+.actions.deleteOnly {
+	padding: 0;
+}
+
+.retryAction + .deleteAction {
+	border-top: 1px solid var(--color-foreground-light);
+}
+
+.selectAll {
+	display: inline-block;
+	margin: 0 0 var(--spacing-s) var(--spacing-s);
+	color: var(--color-danger);
+}
+
+.filterLoader {
+	width: 220px;
+	height: 32px;
+}
+
+.tableLoader {
+	width: 100%;
+	height: 48px;
+	margin-bottom: var(--spacing-2xs);
+}
+</style>
diff --git a/packages/editor-ui/src/components/executions/global/GlobalExecutionsListItem.test.ts b/packages/editor-ui/src/components/executions/global/GlobalExecutionsListItem.test.ts
new file mode 100644
index 0000000000000..a98389a5e7cb6
--- /dev/null
+++ b/packages/editor-ui/src/components/executions/global/GlobalExecutionsListItem.test.ts
@@ -0,0 +1,101 @@
+import { describe, it, expect, vi } from 'vitest';
+import { fireEvent } from '@testing-library/vue';
+import GlobalExecutionsListItem from './GlobalExecutionsListItem.vue';
+import { createComponentRenderer } from '@/__tests__/render';
+
+vi.mock('vue-router', async () => {
+	const actual = await vi.importActual('vue-router');
+
+	return {
+		...actual,
+		useRouter: vi.fn(() => ({
+			resolve: vi.fn(() => ({ href: 'mockedRoute' })),
+		})),
+	};
+});
+
+const renderComponent = createComponentRenderer(GlobalExecutionsListItem, {
+	global: {
+		stubs: ['font-awesome-icon', 'n8n-tooltip', 'n8n-button', 'i18n-t'],
+	},
+});
+
+describe('GlobalExecutionsListItem', () => {
+	it('should render the status text for an execution', () => {
+		const { getByTestId } = renderComponent({
+			props: { execution: { status: 'running', id: 123, workflowName: 'Test Workflow' } },
+		});
+
+		expect(getByTestId('execution-status')).toBeInTheDocument();
+	});
+
+	it('should emit stop event on stop button click for a running execution', async () => {
+		const { getByTestId, emitted } = renderComponent({
+			props: { execution: { status: 'running', id: 123, stoppedAt: undefined, waitTill: true } },
+		});
+
+		const stopButton = getByTestId('stop-execution-button');
+
+		expect(stopButton).toBeInTheDocument();
+
+		await fireEvent.click(stopButton);
+		expect(emitted().stop).toBeTruthy();
+	});
+
+	it('should emit retry events on retry original and retry saved dropdown items click', async () => {
+		const { getByTestId, emitted } = renderComponent({
+			props: {
+				execution: {
+					status: 'error',
+					id: 123,
+					stoppedAt: '01-01-2024',
+					finished: false,
+					retryOf: undefined,
+					retrySuccessfulId: undefined,
+					waitTill: false,
+				},
+			},
+		});
+
+		await fireEvent.click(getByTestId('execution-retry-saved-dropdown-item'));
+		expect(emitted().retrySaved).toBeTruthy();
+
+		await fireEvent.click(getByTestId('execution-retry-original-dropdown-item'));
+		expect(emitted().retryOriginal).toBeTruthy();
+	});
+
+	it('should emit delete event on delete dropdown item click', async () => {
+		const { getByTestId, emitted } = renderComponent({
+			props: {
+				execution: {
+					status: 'error',
+					id: 123,
+					stoppedAt: undefined,
+				},
+			},
+		});
+
+		await fireEvent.click(getByTestId('execution-delete-dropdown-item'));
+		expect(emitted().delete).toBeTruthy();
+	});
+
+	it('should open a new window on execution click', async () => {
+		global.window.open = vi.fn();
+
+		const { getByText } = renderComponent({
+			props: { execution: { status: 'success', id: 123, workflowName: 'TestWorkflow' } },
+		});
+
+		await fireEvent.click(getByText('TestWorkflow'));
+		expect(window.open).toHaveBeenCalledWith('mockedRoute', '_blank');
+	});
+
+	it('should show formatted start date', () => {
+		const testDate = '2022-01-01T12:00:00Z';
+		const { getByText } = renderComponent({
+			props: { execution: { status: 'success', id: 123, startedAt: testDate } },
+		});
+
+		expect(getByText(`1 Jan, 2022 at ${new Date(testDate).getHours()}:00:00`)).toBeInTheDocument();
+	});
+});
diff --git a/packages/editor-ui/src/components/executions/global/GlobalExecutionsListItem.vue b/packages/editor-ui/src/components/executions/global/GlobalExecutionsListItem.vue
new file mode 100644
index 0000000000000..82c690ed4677d
--- /dev/null
+++ b/packages/editor-ui/src/components/executions/global/GlobalExecutionsListItem.vue
@@ -0,0 +1,404 @@
+<script lang="ts" setup>
+import type { PropType } from 'vue';
+import { ref, computed, useCssModule } from 'vue';
+import type { ExecutionSummary } from 'n8n-workflow';
+import { useI18n } from '@/composables/useI18n';
+import { VIEWS, WAIT_TIME_UNLIMITED } from '@/constants';
+import { useRouter } from 'vue-router';
+import { convertToDisplayDate } from '@/utils/formatters/dateFormatter';
+import { i18n as locale } from '@/plugins/i18n';
+import ExecutionsTime from '@/components/executions/ExecutionsTime.vue';
+import { useExecutionHelpers } from '@/composables/useExecutionHelpers';
+
+const emit = defineEmits(['stop', 'select', 'retrySaved', 'retryOriginal', 'delete']);
+
+const props = defineProps({
+	execution: {
+		type: Object as PropType<ExecutionSummary>,
+		required: true,
+	},
+	selected: {
+		type: Boolean,
+		default: false,
+	},
+	workflowName: {
+		type: String,
+		default: undefined,
+	},
+});
+
+const style = useCssModule();
+const i18n = useI18n();
+const router = useRouter();
+const executionHelpers = useExecutionHelpers();
+
+const isStopping = ref(false);
+
+const isRunning = computed(() => {
+	return props.execution.status === 'running';
+});
+
+const isWaitTillIndefinite = computed(() => {
+	if (!props.execution.waitTill) {
+		return false;
+	}
+
+	return new Date(props.execution.waitTill).toISOString() === WAIT_TIME_UNLIMITED;
+});
+
+const isRetriable = computed(() => executionHelpers.isExecutionRetriable(props.execution));
+
+const classes = computed(() => {
+	return {
+		[style.executionListItem]: true,
+		[style[props.execution.status ?? '']]: !!props.execution.status,
+	};
+});
+
+const formattedStartedAtDate = computed(() => {
+	return props.execution.startedAt ? formatDate(props.execution.startedAt) : '';
+});
+
+const formattedWaitTillDate = computed(() => {
+	return props.execution.waitTill ? formatDate(props.execution.waitTill) : '';
+});
+
+const formattedStoppedAtDate = computed(() => {
+	return props.execution.stoppedAt
+		? i18n.displayTimer(
+				new Date(props.execution.stoppedAt).getTime() -
+					new Date(props.execution.startedAt).getTime(),
+				true,
+			)
+		: '';
+});
+
+const statusTooltipText = computed(() => {
+	if (props.execution.status === 'waiting' && isWaitTillIndefinite.value) {
+		return i18n.baseText('executionsList.statusTooltipText.theWorkflowIsWaitingIndefinitely');
+	}
+	return '';
+});
+
+const statusText = computed(() => {
+	switch (props.execution.status) {
+		case 'waiting':
+			return i18n.baseText('executionsList.waiting');
+		case 'canceled':
+			return i18n.baseText('executionsList.canceled');
+		case 'crashed':
+			return i18n.baseText('executionsList.error');
+		case 'new':
+			return i18n.baseText('executionsList.running');
+		case 'running':
+			return i18n.baseText('executionsList.running');
+		case 'success':
+			return i18n.baseText('executionsList.succeeded');
+		case 'error':
+			return i18n.baseText('executionsList.error');
+		default:
+			return i18n.baseText('executionsList.unknown');
+	}
+});
+
+const statusTextTranslationPath = computed(() => {
+	switch (props.execution.status) {
+		case 'waiting':
+			return 'executionsList.statusWaiting';
+		case 'canceled':
+			return 'executionsList.statusCanceled';
+		case 'crashed':
+		case 'error':
+		case 'success':
+			if (!props.execution.stoppedAt) {
+				return 'executionsList.statusTextWithoutTime';
+			} else {
+				return 'executionsList.statusText';
+			}
+		case 'new':
+			return 'executionsList.statusRunning';
+		case 'running':
+			return 'executionsList.statusRunning';
+		default:
+			return 'executionsList.statusUnknown';
+	}
+});
+
+function formatDate(fullDate: Date | string | number) {
+	const { date, time } = convertToDisplayDate(fullDate);
+	return locale.baseText('executionsList.started', { interpolate: { time, date } });
+}
+
+function displayExecution() {
+	const route = router.resolve({
+		name: VIEWS.EXECUTION_PREVIEW,
+		params: { name: props.execution.workflowId, executionId: props.execution.id },
+	});
+	window.open(route.href, '_blank');
+}
+
+function onStopExecution() {
+	isStopping.value = true;
+	emit('stop', props.execution);
+}
+
+function onSelect() {
+	emit('select', props.execution);
+}
+
+async function handleActionItemClick(commandData: 'retrySaved' | 'retryOriginal' | 'delete') {
+	emit(commandData, props.execution);
+}
+</script>
+<template>
+	<tr :class="classes">
+		<td>
+			<ElCheckbox
+				v-if="!!execution.stoppedAt && execution.id"
+				:model-value="selected"
+				label=""
+				data-test-id="select-execution-checkbox"
+				@update:model-value="onSelect"
+			/>
+		</td>
+		<td>
+			<span :class="$style.link" @click.stop="displayExecution">
+				{{ execution.workflowName || workflowName }}
+			</span>
+		</td>
+		<td>
+			<span>{{ formattedStartedAtDate }}</span>
+		</td>
+		<td>
+			<div :class="$style.statusColumn">
+				<span v-if="isRunning" :class="$style.spinner">
+					<FontAwesomeIcon icon="spinner" spin />
+				</span>
+				<i18n-t
+					v-if="!isWaitTillIndefinite"
+					data-test-id="execution-status"
+					tag="span"
+					:keypath="statusTextTranslationPath"
+				>
+					<template #status>
+						<span :class="$style.status">{{ statusText }}</span>
+					</template>
+					<template #time>
+						<span v-if="execution.waitTill">{{ formattedWaitTillDate }}</span>
+						<span v-else-if="!!execution.stoppedAt">
+							{{ formattedStoppedAtDate }}
+						</span>
+						<ExecutionsTime v-else :start-time="execution.startedAt" />
+					</template>
+				</i18n-t>
+				<N8nTooltip v-else placement="top">
+					<template #content>
+						<span>{{ statusTooltipText }}</span>
+					</template>
+					<span :class="$style.status">{{ statusText }}</span>
+				</N8nTooltip>
+			</div>
+		</td>
+		<td>
+			<span v-if="execution.id">#{{ execution.id }}</span>
+			<span v-if="execution.retryOf">
+				<br />
+				<small> ({{ i18n.baseText('executionsList.retryOf') }} #{{ execution.retryOf }}) </small>
+			</span>
+			<span v-else-if="execution.retrySuccessId">
+				<br />
+				<small>
+					({{ i18n.baseText('executionsList.successRetry') }} #{{ execution.retrySuccessId }})
+				</small>
+			</span>
+		</td>
+		<td>
+			<N8nTooltip v-if="execution.mode === 'manual'" placement="top">
+				<template #content>
+					<span>{{ i18n.baseText('executionsList.test') }}</span>
+				</template>
+				<FontAwesomeIcon icon="flask" />
+			</N8nTooltip>
+		</td>
+		<td>
+			<div :class="$style.buttonCell">
+				<N8nButton
+					v-if="!!execution.stoppedAt && execution.id"
+					size="small"
+					outline
+					:label="i18n.baseText('executionsList.view')"
+					@click.stop="displayExecution"
+				/>
+			</div>
+		</td>
+		<td>
+			<div :class="$style.buttonCell">
+				<N8nButton
+					v-if="!execution.stoppedAt || execution.waitTill"
+					data-test-id="stop-execution-button"
+					size="small"
+					outline
+					:label="i18n.baseText('executionsList.stop')"
+					:loading="isStopping"
+					@click.stop="onStopExecution"
+				/>
+			</div>
+		</td>
+		<td>
+			<ElDropdown v-if="!isRunning" trigger="click" @command="handleActionItemClick">
+				<N8nIconButton text type="tertiary" size="mini" icon="ellipsis-v" />
+				<template #dropdown>
+					<ElDropdownMenu
+						:class="{
+							[$style.actions]: true,
+							[$style.deleteOnly]: !isRetriable,
+						}"
+					>
+						<ElDropdownItem
+							v-if="isRetriable"
+							data-test-id="execution-retry-saved-dropdown-item"
+							:class="$style.retryAction"
+							command="retrySaved"
+						>
+							{{ i18n.baseText('executionsList.retryWithCurrentlySavedWorkflow') }}
+						</ElDropdownItem>
+						<ElDropdownItem
+							v-if="isRetriable"
+							data-test-id="execution-retry-original-dropdown-item"
+							:class="$style.retryAction"
+							command="retryOriginal"
+						>
+							{{ i18n.baseText('executionsList.retryWithOriginalWorkflow') }}
+						</ElDropdownItem>
+						<ElDropdownItem
+							data-test-id="execution-delete-dropdown-item"
+							:class="$style.deleteAction"
+							command="delete"
+						>
+							{{ i18n.baseText('generic.delete') }}
+						</ElDropdownItem>
+					</ElDropdownMenu>
+				</template>
+			</ElDropdown>
+		</td>
+	</tr>
+</template>
+
+<style lang="scss" module>
+@import '@/styles/variables';
+
+.executionListItem {
+	--execution-list-item-background: var(--color-table-row-background);
+	--execution-list-item-highlight-background: var(--color-table-row-highlight-background);
+	color: var(--color-text-base);
+
+	td {
+		background: var(--execution-list-item-background);
+	}
+
+	&:nth-child(even) td {
+		--execution-list-item-background: var(--color-table-row-even-background);
+	}
+
+	&:hover td {
+		background: var(--color-table-row-hover-background);
+	}
+
+	td:first-child {
+		width: 30px;
+		padding: 0 var(--spacing-s) 0 0;
+
+		/*
+			This is needed instead of table cell border because they are overlapping the sticky header
+		*/
+		&::before {
+			content: '';
+			display: inline-block;
+			width: var(--spacing-4xs);
+			height: 100%;
+			vertical-align: middle;
+			margin-right: var(--spacing-xs);
+		}
+	}
+
+	&.crashed td:first-child::before,
+	&.error td:first-child::before {
+		background: var(--execution-card-border-error);
+	}
+
+	&.success td:first-child::before {
+		background: var(--execution-card-border-success);
+	}
+
+	&.new td:first-child::before,
+	&.running td:first-child::before {
+		background: var(--execution-card-border-running);
+	}
+
+	&.waiting td:first-child::before {
+		background: var(--execution-card-border-waiting);
+	}
+
+	&.unknown td:first-child::before {
+		background: var(--execution-card-border-unknown);
+	}
+}
+
+.link {
+	color: var(--color-text-base);
+	text-decoration: underline;
+	cursor: pointer;
+}
+
+.statusColumn {
+	display: flex;
+	align-items: center;
+}
+
+.spinner {
+	margin-right: var(--spacing-2xs);
+}
+
+.status {
+	line-height: 22.6px;
+	text-align: center;
+	font-size: var(--font-size-s);
+	font-weight: var(--font-weight-bold);
+
+	.crashed &,
+	.error & {
+		color: var(--color-danger);
+	}
+
+	.waiting & {
+		color: var(--color-secondary);
+	}
+
+	.success & {
+		font-weight: var(--font-weight-normal);
+	}
+
+	.new &,
+	.running & {
+		color: var(--color-warning);
+	}
+
+	.unknown & {
+		color: var(--color-background-dark);
+	}
+}
+
+.buttonCell {
+	overflow: hidden;
+
+	button {
+		transform: translateX(1000%);
+		transition: transform 0s;
+
+		&:focus-visible,
+		.executionListItem:hover & {
+			transform: translateX(0);
+		}
+	}
+}
+</style>
diff --git a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsCard.test.ts b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsCard.test.ts
new file mode 100644
index 0000000000000..ec850664740ea
--- /dev/null
+++ b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsCard.test.ts
@@ -0,0 +1,77 @@
+import { createComponentRenderer } from '@/__tests__/render';
+import WorkflowExecutionsCard from '@/components/executions/workflow/WorkflowExecutionsCard.vue';
+import { createPinia, setActivePinia } from 'pinia';
+
+const renderComponent = createComponentRenderer(WorkflowExecutionsCard, {
+	global: {
+		stubs: {
+			'router-link': {
+				template: '<div><slot /></div>',
+			},
+		},
+		mocks: {
+			$route: {
+				params: {},
+			},
+		},
+	},
+});
+
+describe('WorkflowExecutionsCard', () => {
+	beforeEach(() => {
+		setActivePinia(createPinia());
+	});
+
+	test.each([
+		[
+			{
+				id: '1',
+				mode: 'manual',
+				status: 'success',
+				retryOf: null,
+				retrySuccessId: null,
+			},
+			false,
+		],
+		[
+			{
+				id: '2',
+				mode: 'manual',
+				status: 'error',
+				retryOf: null,
+				retrySuccessId: null,
+			},
+			true,
+		],
+		[
+			{
+				id: '3',
+				mode: 'manual',
+				status: 'error',
+				retryOf: '2',
+				retrySuccessId: null,
+			},
+			false,
+		],
+		[
+			{
+				id: '4',
+				mode: 'manual',
+				status: 'error',
+				retryOf: null,
+				retrySuccessId: '3',
+			},
+			false,
+		],
+	])('with execution %j retry button visibility is %s', (execution, shouldRenderRetryBtn) => {
+		const { queryByTestId } = renderComponent({
+			props: {
+				execution,
+			},
+		});
+
+		expect(!!queryByTestId('retry-execution-button') && shouldRenderRetryBtn).toBe(
+			shouldRenderRetryBtn,
+		);
+	});
+});
diff --git a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsCard.vue b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsCard.vue
new file mode 100644
index 0000000000000..0b337b95a1a30
--- /dev/null
+++ b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsCard.vue
@@ -0,0 +1,285 @@
+<template>
+	<div
+		:class="{
+			['execution-card']: true,
+			[$style.WorkflowExecutionsCard]: true,
+			[$style.active]: isActive,
+			[$style[executionUIDetails.name]]: true,
+			[$style.highlight]: highlight,
+			[$style.showGap]: showGap,
+		}"
+	>
+		<router-link
+			:class="$style.executionLink"
+			:to="{
+				name: VIEWS.EXECUTION_PREVIEW,
+				params: { name: currentWorkflow, executionId: execution.id },
+			}"
+			:data-test-execution-status="executionUIDetails.name"
+		>
+			<div :class="$style.description">
+				<n8n-text color="text-dark" :bold="true" size="medium" data-test-id="execution-time">
+					{{ executionUIDetails.startTime }}
+				</n8n-text>
+				<div :class="$style.executionStatus">
+					<n8n-spinner
+						v-if="executionUIDetails.name === 'running'"
+						size="small"
+						:class="[$style.spinner, 'mr-4xs']"
+					/>
+					<n8n-text :class="$style.statusLabel" size="small">{{
+						executionUIDetails.label
+					}}</n8n-text>
+					{{ ' ' }}
+					<n8n-text
+						v-if="executionUIDetails.name === 'running'"
+						:color="isActive ? 'text-dark' : 'text-base'"
+						size="small"
+					>
+						{{ $locale.baseText('executionDetails.runningTimeRunning') }}
+						<ExecutionsTime :start-time="execution.startedAt" />
+					</n8n-text>
+					<n8n-text
+						v-else-if="executionUIDetails.runningTime !== ''"
+						:color="isActive ? 'text-dark' : 'text-base'"
+						size="small"
+					>
+						{{
+							$locale.baseText('executionDetails.runningTimeFinished', {
+								interpolate: { time: executionUIDetails?.runningTime },
+							})
+						}}
+					</n8n-text>
+				</div>
+				<div v-if="execution.mode === 'retry'">
+					<n8n-text :color="isActive ? 'text-dark' : 'text-base'" size="small">
+						{{ $locale.baseText('executionDetails.retry') }} #{{ execution.retryOf }}
+					</n8n-text>
+				</div>
+			</div>
+			<div :class="$style.icons">
+				<n8n-action-dropdown
+					v-if="isRetriable"
+					:class="[$style.icon, $style.retry]"
+					:items="retryExecutionActions"
+					activator-icon="redo"
+					data-test-id="retry-execution-button"
+					@select="onRetryMenuItemSelect"
+				/>
+				<n8n-tooltip v-if="execution.mode === 'manual'" placement="top">
+					<template #content>
+						<span>{{ $locale.baseText('executionsList.test') }}</span>
+					</template>
+					<font-awesome-icon
+						v-if="execution.mode === 'manual'"
+						:class="[$style.icon, $style.manual]"
+						icon="flask"
+					/>
+				</n8n-tooltip>
+			</div>
+		</router-link>
+	</div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import type { IExecutionUIData } from '@/composables/useExecutionHelpers';
+import { VIEWS } from '@/constants';
+import ExecutionsTime from '@/components/executions/ExecutionsTime.vue';
+import { useExecutionHelpers } from '@/composables/useExecutionHelpers';
+import type { ExecutionSummary } from 'n8n-workflow';
+import { mapStores } from 'pinia';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+
+export default defineComponent({
+	name: 'WorkflowExecutionsCard',
+	components: {
+		ExecutionsTime,
+	},
+	props: {
+		execution: {
+			type: Object as () => ExecutionSummary,
+			required: true,
+		},
+		highlight: {
+			type: Boolean,
+			default: false,
+		},
+		showGap: {
+			type: Boolean,
+			default: false,
+		},
+	},
+	setup() {
+		const executionHelpers = useExecutionHelpers();
+
+		return {
+			executionHelpers,
+			VIEWS,
+		};
+	},
+	computed: {
+		...mapStores(useWorkflowsStore),
+		currentWorkflow(): string {
+			return (this.$route.params.name as string) || this.workflowsStore.workflowId;
+		},
+		retryExecutionActions(): object[] {
+			return [
+				{
+					id: 'current-workflow',
+					label: this.$locale.baseText('executionsList.retryWithCurrentlySavedWorkflow'),
+				},
+				{
+					id: 'original-workflow',
+					label: this.$locale.baseText('executionsList.retryWithOriginalWorkflow'),
+				},
+			];
+		},
+		executionUIDetails(): IExecutionUIData {
+			return this.executionHelpers.getUIDetails(this.execution);
+		},
+		isActive(): boolean {
+			return this.execution.id === this.$route.params.executionId;
+		},
+		isRetriable(): boolean {
+			return this.executionHelpers.isExecutionRetriable(this.execution);
+		},
+	},
+	methods: {
+		onRetryMenuItemSelect(action: string): void {
+			this.$emit('retryExecution', { execution: this.execution, command: action });
+		},
+	},
+});
+</script>
+
+<style module lang="scss">
+@import '@/styles/variables';
+
+.WorkflowExecutionsCard {
+	--execution-list-item-background: var(--color-foreground-xlight);
+	--execution-list-item-highlight-background: var(--color-warning-tint-1);
+
+	display: flex;
+	flex-direction: column;
+	padding-right: var(--spacing-m);
+
+	&.active {
+		border-left: var(--spacing-4xs) var(--border-style-base) transparent !important;
+
+		.executionStatus {
+			color: var(--color-text-dark) !important;
+		}
+	}
+
+	&:hover,
+	&.active {
+		.executionLink {
+			--execution-list-item-background: var(--color-foreground-light);
+		}
+	}
+
+	&.new,
+	&.running {
+		.spinner {
+			position: relative;
+			top: 1px;
+		}
+		&,
+		& .executionLink {
+			border-left: var(--spacing-4xs) var(--border-style-base) var(--execution-card-border-running);
+		}
+		.statusLabel,
+		.spinner {
+			color: var(--color-warning);
+		}
+	}
+
+	&.success {
+		&,
+		& .executionLink {
+			border-left: var(--spacing-4xs) var(--border-style-base) var(--execution-card-border-success);
+		}
+	}
+
+	&.waiting {
+		&,
+		& .executionLink {
+			border-left: var(--spacing-4xs) var(--border-style-base) var(--execution-card-border-waiting);
+		}
+		.statusLabel {
+			color: var(--color-secondary);
+		}
+	}
+
+	&.error {
+		&,
+		& .executionLink {
+			border-left: var(--spacing-4xs) var(--border-style-base) var(--execution-card-border-error);
+		}
+		.statusLabel {
+			color: var(--color-danger);
+		}
+	}
+
+	&.unknown {
+		&,
+		& .executionLink {
+			border-left: var(--spacing-4xs) var(--border-style-base) var(--execution-card-border-unknown);
+		}
+	}
+}
+
+.executionLink {
+	background: var(--execution-list-item-background);
+	display: flex;
+	width: 100%;
+	align-items: center;
+	justify-content: space-between;
+	color: var(--color-text-base);
+	font-size: var(--font-size-xs);
+	padding: var(--spacing-xs);
+	padding-right: var(--spacing-s);
+	position: relative;
+	left: calc(
+		-1 * var(--spacing-4xs)
+	); // Hide link border under card border so it's not visible when not hovered
+
+	&:active {
+		.icon,
+		.statusLabel {
+			color: var(--color-text-base);
+		}
+	}
+}
+
+.icons {
+	display: flex;
+	align-items: center;
+}
+
+.icon {
+	font-size: var(--font-size-s);
+
+	&.retry {
+		svg {
+			color: var(--color-primary);
+		}
+	}
+
+	&.manual {
+		position: relative;
+		top: 1px;
+	}
+
+	& + & {
+		margin-left: var(--spacing-2xs);
+	}
+}
+.showGap {
+	margin-bottom: var(--spacing-2xs);
+	.executionLink {
+		border-bottom: 1px solid var(--color-foreground-dark);
+	}
+}
+</style>
diff --git a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsInfoAccordion.vue b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsInfoAccordion.vue
new file mode 100644
index 0000000000000..38e274dcd3bd0
--- /dev/null
+++ b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsInfoAccordion.vue
@@ -0,0 +1,273 @@
+<template>
+	<n8n-info-accordion
+		:class="[$style.accordion, 'mt-2xl']"
+		:title="$locale.baseText('executionsLandingPage.emptyState.accordion.title')"
+		:items="accordionItems"
+		:initially-expanded="shouldExpandAccordion"
+		:header-icon="accordionIcon"
+		@click:body="onAccordionClick"
+		@tooltip-click="onItemTooltipClick"
+	>
+		<template #customContent>
+			<footer class="mt-2xs">
+				{{ $locale.baseText('executionsLandingPage.emptyState.accordion.footer') }}
+				<n8n-tooltip :disabled="!isNewWorkflow">
+					<template #content>
+						<div>
+							<n8n-link @click.prevent="onSaveWorkflowClick">{{
+								$locale.baseText('executionsLandingPage.emptyState.accordion.footer.tooltipLink')
+							}}</n8n-link>
+							{{
+								$locale.baseText('executionsLandingPage.emptyState.accordion.footer.tooltipText')
+							}}
+						</div>
+					</template>
+					<n8n-link
+						:class="{ [$style.disabled]: isNewWorkflow }"
+						size="small"
+						@click.prevent="openWorkflowSettings"
+					>
+						{{ $locale.baseText('executionsLandingPage.emptyState.accordion.footer.settingsLink') }}
+					</n8n-link>
+				</n8n-tooltip>
+			</footer>
+		</template>
+	</n8n-info-accordion>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import { mapStores } from 'pinia';
+import { useRouter } from 'vue-router';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useUIStore } from '@/stores/ui.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { PLACEHOLDER_EMPTY_WORKFLOW_ID, WORKFLOW_SETTINGS_MODAL_KEY } from '@/constants';
+import type { IWorkflowSettings } from 'n8n-workflow';
+import { deepCopy } from 'n8n-workflow';
+import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
+
+interface IWorkflowSaveSettings {
+	saveFailedExecutions: boolean;
+	saveSuccessfulExecutions: boolean;
+	saveTestExecutions: boolean;
+}
+
+export default defineComponent({
+	name: 'WorkflowExecutionsInfoAccordion',
+	props: {
+		initiallyExpanded: {
+			type: Boolean,
+			default: false,
+		},
+	},
+	setup() {
+		const router = useRouter();
+		const workflowHelpers = useWorkflowHelpers({ router });
+
+		return {
+			workflowHelpers,
+		};
+	},
+	data() {
+		return {
+			defaultValues: {
+				saveFailedExecutions: 'all',
+				saveSuccessfulExecutions: 'all',
+				saveManualExecutions: false,
+			},
+			workflowSaveSettings: {
+				saveFailedExecutions: false,
+				saveSuccessfulExecutions: false,
+				saveTestExecutions: false,
+			} as IWorkflowSaveSettings,
+		};
+	},
+	watch: {
+		workflowSettings(newSettings: IWorkflowSettings) {
+			this.updateSettings(newSettings);
+		},
+	},
+	mounted() {
+		this.defaultValues.saveFailedExecutions = this.settingsStore.saveDataErrorExecution;
+		this.defaultValues.saveSuccessfulExecutions = this.settingsStore.saveDataSuccessExecution;
+		this.defaultValues.saveManualExecutions = this.settingsStore.saveManualExecutions;
+		this.updateSettings(this.workflowSettings);
+	},
+	computed: {
+		...mapStores(useRootStore, useSettingsStore, useUIStore, useWorkflowsStore),
+		accordionItems(): object[] {
+			return [
+				{
+					id: 'productionExecutions',
+					label: this.$locale.baseText(
+						'executionsLandingPage.emptyState.accordion.productionExecutions',
+					),
+					icon: this.productionExecutionsIcon.icon,
+					iconColor: this.productionExecutionsIcon.color,
+					tooltip:
+						this.productionExecutionsStatus === 'unknown'
+							? this.$locale.baseText(
+									'executionsLandingPage.emptyState.accordion.productionExecutionsWarningTooltip',
+								)
+							: null,
+				},
+				{
+					id: 'manualExecutions',
+					label: this.$locale.baseText('executionsLandingPage.emptyState.accordion.testExecutions'),
+					icon: this.workflowSaveSettings.saveTestExecutions ? 'check' : 'times',
+					iconColor: this.workflowSaveSettings.saveTestExecutions ? 'success' : 'danger',
+				},
+			];
+		},
+		shouldExpandAccordion(): boolean {
+			if (!this.initiallyExpanded) {
+				return false;
+			}
+			return (
+				!this.workflowSaveSettings.saveFailedExecutions ||
+				!this.workflowSaveSettings.saveSuccessfulExecutions ||
+				!this.workflowSaveSettings.saveTestExecutions
+			);
+		},
+		productionExecutionsIcon(): { icon: string; color: string } {
+			if (this.productionExecutionsStatus === 'saving') {
+				return { icon: 'check', color: 'success' };
+			} else if (this.productionExecutionsStatus === 'not-saving') {
+				return { icon: 'times', color: 'danger' };
+			}
+			return { icon: 'exclamation-triangle', color: 'warning' };
+		},
+		productionExecutionsStatus(): string {
+			if (
+				this.workflowSaveSettings.saveSuccessfulExecutions ===
+				this.workflowSaveSettings.saveFailedExecutions
+			) {
+				if (this.workflowSaveSettings.saveSuccessfulExecutions) {
+					return 'saving';
+				}
+				return 'not-saving';
+			} else {
+				return 'unknown';
+			}
+		},
+		workflowSettings(): IWorkflowSettings {
+			const workflowSettings = deepCopy(this.workflowsStore.workflowSettings);
+			return workflowSettings;
+		},
+		accordionIcon(): { icon: string; color: string } | null {
+			if (
+				!this.workflowSaveSettings.saveTestExecutions ||
+				this.productionExecutionsStatus !== 'saving'
+			) {
+				return { icon: 'exclamation-triangle', color: 'warning' };
+			}
+			return null;
+		},
+		currentWorkflowId(): string {
+			return this.workflowsStore.workflowId;
+		},
+		isNewWorkflow(): boolean {
+			return (
+				!this.currentWorkflowId ||
+				this.currentWorkflowId === PLACEHOLDER_EMPTY_WORKFLOW_ID ||
+				this.currentWorkflowId === 'new'
+			);
+		},
+		workflowName(): string {
+			return this.workflowsStore.workflowName;
+		},
+		currentWorkflowTagIds(): string[] {
+			return this.workflowsStore.workflowTags;
+		},
+	},
+	methods: {
+		updateSettings(workflowSettings: IWorkflowSettings): void {
+			this.workflowSaveSettings.saveFailedExecutions =
+				workflowSettings.saveDataErrorExecution === undefined
+					? this.defaultValues.saveFailedExecutions === 'all'
+					: workflowSettings.saveDataErrorExecution === 'all';
+			this.workflowSaveSettings.saveSuccessfulExecutions =
+				workflowSettings.saveDataSuccessExecution === undefined
+					? this.defaultValues.saveSuccessfulExecutions === 'all'
+					: workflowSettings.saveDataSuccessExecution === 'all';
+			this.workflowSaveSettings.saveTestExecutions =
+				workflowSettings.saveManualExecutions === undefined
+					? this.defaultValues.saveManualExecutions
+					: (workflowSettings.saveManualExecutions as boolean);
+		},
+		onAccordionClick(event: MouseEvent): void {
+			if (event.target instanceof HTMLAnchorElement) {
+				event.preventDefault();
+				this.uiStore.openModal(WORKFLOW_SETTINGS_MODAL_KEY);
+			}
+		},
+		onItemTooltipClick(item: string, event: MouseEvent): void {
+			if (item === 'productionExecutions' && event.target instanceof HTMLAnchorElement) {
+				event.preventDefault();
+				this.uiStore.openModal(WORKFLOW_SETTINGS_MODAL_KEY);
+			}
+		},
+		openWorkflowSettings(event: MouseEvent): void {
+			this.uiStore.openModal(WORKFLOW_SETTINGS_MODAL_KEY);
+		},
+		async onSaveWorkflowClick(event: MouseEvent): void {
+			let currentId = undefined;
+			if (this.currentWorkflowId !== PLACEHOLDER_EMPTY_WORKFLOW_ID) {
+				currentId = this.currentWorkflowId;
+			} else if (this.$route.params.name && this.$route.params.name !== 'new') {
+				currentId = this.$route.params.name;
+			}
+			const saved = await this.workflowHelpers.saveCurrentWorkflow({
+				id: currentId,
+				name: this.workflowName,
+				tags: this.currentWorkflowTagIds,
+			});
+			if (saved) await this.settingsStore.fetchPromptsData();
+		},
+	},
+});
+</script>
+
+<style module lang="scss">
+.accordion {
+	background: none;
+	width: 320px;
+
+	// Accordion header
+	& > div:nth-child(1) {
+		display: flex;
+		flex-direction: row;
+		padding: var(--spacing-xs);
+		width: 100%;
+		user-select: none;
+		color: var(--color-text-base) !important;
+	}
+
+	// Accordion description
+	& > div:nth-child(2) {
+		display: flex;
+		flex-direction: column;
+		width: 100%;
+		padding: 0 var(--spacing-l) var(--spacing-s) !important;
+
+		span {
+			width: 100%;
+		}
+	}
+
+	footer {
+		text-align: left;
+		width: 100%;
+		font-size: var(--font-size-2xs);
+	}
+
+	.disabled a {
+		color: currentColor;
+		cursor: not-allowed;
+		opacity: 0.5;
+		text-decoration: none;
+	}
+}
+</style>
diff --git a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsLandingPage.vue b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsLandingPage.vue
new file mode 100644
index 0000000000000..1f1d6f47d26fb
--- /dev/null
+++ b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsLandingPage.vue
@@ -0,0 +1,92 @@
+<template>
+	<div :class="['workflow-executions-container', $style.container]">
+		<div v-if="executionCount === 0" :class="[$style.messageContainer, $style.noExecutionsMessage]">
+			<div v-if="!containsTrigger">
+				<n8n-heading tag="h2" size="xlarge" color="text-dark" class="mb-2xs">
+					{{ $locale.baseText('executionsLandingPage.emptyState.noTrigger.heading') }}
+				</n8n-heading>
+				<n8n-text size="medium">
+					{{ $locale.baseText('executionsLandingPage.emptyState.message') }}
+				</n8n-text>
+				<n8n-button class="mt-l" type="tertiary" size="large" @click="onSetupFirstStep">
+					{{ $locale.baseText('executionsLandingPage.emptyState.noTrigger.buttonText') }}
+				</n8n-button>
+			</div>
+			<div v-else>
+				<n8n-heading tag="h2" size="xlarge" color="text-dark" class="mb-2xs">
+					{{ $locale.baseText('executionsLandingPage.emptyState.heading') }}
+				</n8n-heading>
+				<WorkflowExecutionsInfoAccordion />
+			</div>
+		</div>
+	</div>
+</template>
+
+<script lang="ts">
+import { PLACEHOLDER_EMPTY_WORKFLOW_ID, VIEWS } from '@/constants';
+import { useUIStore } from '@/stores/ui.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { mapStores } from 'pinia';
+import { defineComponent } from 'vue';
+import WorkflowExecutionsInfoAccordion from './WorkflowExecutionsInfoAccordion.vue';
+
+export default defineComponent({
+	name: 'ExecutionsLandingPage',
+	components: {
+		WorkflowExecutionsInfoAccordion,
+	},
+	computed: {
+		...mapStores(useUIStore, useWorkflowsStore),
+		executionCount(): number {
+			return this.workflowsStore.currentWorkflowExecutions.length;
+		},
+		containsTrigger(): boolean {
+			return this.workflowsStore.workflowTriggerNodes.length > 0;
+		},
+	},
+	methods: {
+		onSetupFirstStep(event: MouseEvent): void {
+			this.uiStore.addFirstStepOnLoad = true;
+			const workflowRoute = this.getWorkflowRoute();
+			void this.$router.push(workflowRoute);
+		},
+		getWorkflowRoute(): { name: string; params: {} } {
+			const workflowId = this.workflowsStore.workflowId || this.$route.params.name;
+			if (workflowId === PLACEHOLDER_EMPTY_WORKFLOW_ID) {
+				return { name: VIEWS.NEW_WORKFLOW, params: {} };
+			} else {
+				return { name: VIEWS.WORKFLOW, params: { name: workflowId } };
+			}
+		},
+	},
+});
+</script>
+
+<style module lang="scss">
+.container {
+	width: 100%;
+	height: 100%;
+	flex: 1;
+	background-color: var(--color-background-light);
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+}
+
+.messageContainer {
+	margin-top: var(--spacing-4xl);
+	color: var(--color-text-base);
+
+	div {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		text-align: center;
+	}
+}
+
+.icon {
+	font-size: 24px;
+	color: var(--color-foreground-dark);
+}
+</style>
diff --git a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsList.vue b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsList.vue
new file mode 100644
index 0000000000000..4ff59580bc2c5
--- /dev/null
+++ b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsList.vue
@@ -0,0 +1,208 @@
+<template>
+	<div :class="$style.container">
+		<WorkflowExecutionsSidebar
+			:executions="executions"
+			:loading="loading && !executions.length"
+			:loading-more="loadingMore"
+			:temporary-execution="temporaryExecution"
+			@update:auto-refresh="$emit('update:auto-refresh', $event)"
+			@reload-executions="$emit('reload')"
+			@filter-updated="$emit('update:filters', $event)"
+			@load-more="$emit('load-more')"
+			@retry-execution="onRetryExecution"
+		/>
+		<div v-if="!hidePreview" :class="$style.content">
+			<router-view
+				name="executionPreview"
+				:execution="execution"
+				@delete-current-execution="onDeleteCurrentExecution"
+				@retry-execution="onRetryExecution"
+				@stop-execution="onStopExecution"
+			/>
+		</div>
+	</div>
+</template>
+
+<script lang="ts">
+import type { PropType } from 'vue';
+import { defineComponent } from 'vue';
+import { mapStores } from 'pinia';
+import { useRouter } from 'vue-router';
+import WorkflowExecutionsSidebar from '@/components/executions/workflow/WorkflowExecutionsSidebar.vue';
+import {
+	MAIN_HEADER_TABS,
+	MODAL_CANCEL,
+	MODAL_CONFIRM,
+	PLACEHOLDER_EMPTY_WORKFLOW_ID,
+	VIEWS,
+} from '@/constants';
+import type { ExecutionFilterType, IWorkflowDb } from '@/Interface';
+import type { ExecutionSummary, IDataObject } from 'n8n-workflow';
+import { useMessage } from '@/composables/useMessage';
+import { useToast } from '@/composables/useToast';
+import { getNodeViewTab } from '@/utils/canvasUtils';
+import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
+import { useUIStore } from '@/stores/ui.store';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import { useTagsStore } from '@/stores/tags.store';
+import { executionFilterToQueryFilter } from '@/utils/executionUtils';
+import { useExternalHooks } from '@/composables/useExternalHooks';
+import { useDebounce } from '@/composables/useDebounce';
+
+export default defineComponent({
+	name: 'WorkflowExecutionsList',
+	components: {
+		WorkflowExecutionsSidebar,
+	},
+	async beforeRouteLeave(to, _, next) {
+		if (getNodeViewTab(to) === MAIN_HEADER_TABS.WORKFLOW) {
+			next();
+			return;
+		}
+		if (this.uiStore.stateIsDirty) {
+			const confirmModal = await this.confirm(
+				this.$locale.baseText('generic.unsavedWork.confirmMessage.message'),
+				{
+					title: this.$locale.baseText('generic.unsavedWork.confirmMessage.headline'),
+					type: 'warning',
+					confirmButtonText: this.$locale.baseText(
+						'generic.unsavedWork.confirmMessage.confirmButtonText',
+					),
+					cancelButtonText: this.$locale.baseText(
+						'generic.unsavedWork.confirmMessage.cancelButtonText',
+					),
+					showClose: true,
+				},
+			);
+
+			if (confirmModal === MODAL_CONFIRM) {
+				const saved = await this.workflowHelpers.saveCurrentWorkflow({}, false);
+				if (saved) {
+					await this.settingsStore.fetchPromptsData();
+				}
+				this.uiStore.stateIsDirty = false;
+				next();
+			} else if (confirmModal === MODAL_CANCEL) {
+				this.uiStore.stateIsDirty = false;
+				next();
+			}
+		} else {
+			next();
+		}
+	},
+	props: {
+		loading: {
+			type: Boolean,
+			default: false,
+		},
+		workflow: {
+			type: Object as PropType<IWorkflowDb>,
+			required: true,
+		},
+		executions: {
+			type: Array as PropType<ExecutionSummary[]>,
+			default: () => [],
+		},
+		filters: {
+			type: Object as PropType<ExecutionFilterType>,
+			default: () => ({}),
+		},
+		execution: {
+			type: Object as PropType<ExecutionSummary>,
+			default: null,
+		},
+		loadingMore: {
+			type: Boolean,
+			default: false,
+		},
+	},
+	emits: [
+		'execution:delete',
+		'execution:stop',
+		'execution:retry',
+		'update:auto-refresh',
+		'update:filters',
+		'load-more',
+		'reload',
+	],
+	setup() {
+		const externalHooks = useExternalHooks();
+		const router = useRouter();
+		const workflowHelpers = useWorkflowHelpers(router);
+		const { callDebounced } = useDebounce();
+
+		return {
+			externalHooks,
+			workflowHelpers,
+			callDebounced,
+			...useToast(),
+			...useMessage(),
+		};
+	},
+	computed: {
+		...mapStores(useTagsStore, useNodeTypesStore, useSettingsStore, useUIStore),
+		temporaryExecution(): ExecutionSummary | undefined {
+			const isTemporary = !this.executions.find((execution) => execution.id === this.execution?.id);
+			return isTemporary ? this.execution : undefined;
+		},
+		hidePreview(): boolean {
+			return this.loading || (!this.execution && this.executions.length);
+		},
+		filterApplied(): boolean {
+			return this.filters.status !== 'all';
+		},
+		workflowDataNotLoaded(): boolean {
+			return this.workflow.id === PLACEHOLDER_EMPTY_WORKFLOW_ID && this.workflow.name === '';
+		},
+		requestFilter(): IDataObject {
+			return executionFilterToQueryFilter({
+				...this.filters,
+				workflowId: this.workflow.id,
+			});
+		},
+	},
+	watch: {
+		execution(value: ExecutionSummary) {
+			if (!value) {
+				return;
+			}
+
+			this.$router
+				.push({
+					name: VIEWS.EXECUTION_PREVIEW,
+					params: { name: this.workflow.id, executionId: value.id },
+				})
+				.catch(() => {});
+		},
+	},
+	methods: {
+		async onDeleteCurrentExecution(): Promise<void> {
+			this.$emit('execution:delete', this.execution.id);
+		},
+		async onStopExecution(): Promise<void> {
+			this.$emit('execution:stop', this.execution.id);
+		},
+		async onRetryExecution(payload: { execution: ExecutionSummary; command: string }) {
+			const loadWorkflow = payload.command === 'current-workflow';
+
+			this.$emit('execution:retry', {
+				id: payload.execution.id,
+				loadWorkflow,
+			});
+		},
+	},
+});
+</script>
+
+<style module lang="scss">
+.container {
+	display: flex;
+	height: 100%;
+	width: 100%;
+}
+
+.content {
+	flex: 1;
+}
+</style>
diff --git a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsPreview.test.ts b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsPreview.test.ts
new file mode 100644
index 0000000000000..62d852d794930
--- /dev/null
+++ b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsPreview.test.ts
@@ -0,0 +1,111 @@
+import { vi, describe, expect } from 'vitest';
+import { render } from '@testing-library/vue';
+import userEvent from '@testing-library/user-event';
+import { faker } from '@faker-js/faker';
+import { createRouter, createWebHistory } from 'vue-router';
+import { createPinia, PiniaVuePlugin, setActivePinia } from 'pinia';
+import type { ExecutionSummary } from 'n8n-workflow';
+import { useSettingsStore } from '@/stores/settings.store';
+import WorkflowExecutionsPreview from '@/components/executions/workflow/WorkflowExecutionsPreview.vue';
+import { VIEWS } from '@/constants';
+import { i18nInstance, I18nPlugin } from '@/plugins/i18n';
+import { FontAwesomePlugin } from '@/plugins/icons';
+import { GlobalComponentsPlugin } from '@/plugins/components';
+
+let pinia: ReturnType<typeof createPinia>;
+
+const routes = [
+	{ path: '/', name: 'home', component: { template: '<div></div>' } },
+	{
+		path: '/workflow/:name/debug/:executionId',
+		name: VIEWS.EXECUTION_DEBUG,
+		component: { template: '<div></div>' },
+	},
+];
+
+const router = createRouter({
+	history: createWebHistory(),
+	routes,
+});
+
+const $route = {
+	params: {},
+};
+
+const generateUndefinedNullOrString = () => {
+	switch (Math.floor(Math.random() * 4)) {
+		case 0:
+			return undefined;
+		case 1:
+			return null;
+		case 2:
+			return faker.string.uuid();
+		case 3:
+			return '';
+		default:
+			return undefined;
+	}
+};
+
+const executionDataFactory = (): ExecutionSummary => ({
+	id: faker.string.uuid(),
+	finished: faker.datatype.boolean(),
+	mode: faker.helpers.arrayElement(['manual', 'trigger']),
+	startedAt: faker.date.past(),
+	stoppedAt: faker.date.past(),
+	workflowId: faker.number.int().toString(),
+	workflowName: faker.string.sample(),
+	status: faker.helpers.arrayElement(['error', 'success']),
+	nodeExecutionStatus: {},
+	retryOf: generateUndefinedNullOrString(),
+	retrySuccessId: generateUndefinedNullOrString(),
+});
+
+describe('WorkflowExecutionsPreview.vue', () => {
+	let settingsStore: ReturnType<typeof useSettingsStore>;
+	const executionData: ExecutionSummary = executionDataFactory();
+
+	beforeEach(() => {
+		pinia = createPinia();
+		setActivePinia(pinia);
+
+		settingsStore = useSettingsStore();
+	});
+
+	test.each([
+		[false, '/'],
+		[true, `/workflow/${executionData.workflowId}/debug/${executionData.id}`],
+	])(
+		'when debug enterprise feature is %s it should handle debug link click accordingly',
+		async (availability, path) => {
+			vi.spyOn(settingsStore, 'isEnterpriseFeatureEnabled', 'get').mockReturnValue(
+				() => availability,
+			);
+
+			// Not using createComponentRenderer helper here because this component should not stub `router-link`
+			const { getByTestId } = render(WorkflowExecutionsPreview, {
+				props: {
+					execution: executionData,
+				},
+				global: {
+					plugins: [
+						I18nPlugin,
+						i18nInstance,
+						PiniaVuePlugin,
+						FontAwesomePlugin,
+						GlobalComponentsPlugin,
+						pinia,
+						router,
+					],
+					mocks: {
+						$route,
+					},
+				},
+			});
+
+			await userEvent.click(getByTestId('execution-debug-button'));
+
+			expect(router.currentRoute.value.path).toBe(path);
+		},
+	);
+});
diff --git a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsPreview.vue b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsPreview.vue
new file mode 100644
index 0000000000000..df1c9358fe9ea
--- /dev/null
+++ b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsPreview.vue
@@ -0,0 +1,316 @@
+<template>
+	<div v-if="executionUIDetails?.name === 'running'" :class="$style.runningInfo">
+		<div :class="$style.spinner">
+			<n8n-spinner type="ring" />
+		</div>
+		<n8n-text :class="$style.runningMessage" color="text-light">
+			{{ $locale.baseText('executionDetails.runningMessage') }}
+		</n8n-text>
+		<n8n-button class="mt-l" type="tertiary" @click="handleStopClick">
+			{{ $locale.baseText('executionsList.stopExecution') }}
+		</n8n-button>
+	</div>
+	<div v-else :class="$style.previewContainer">
+		<div
+			v-if="execution"
+			:class="$style.executionDetails"
+			:data-test-id="`execution-preview-details-${executionId}`"
+		>
+			<div>
+				<n8n-text size="large" color="text-base" :bold="true" data-test-id="execution-time">{{
+					executionUIDetails?.startTime
+				}}</n8n-text
+				><br />
+				<n8n-spinner
+					v-if="executionUIDetails?.name === 'running'"
+					size="small"
+					:class="[$style.spinner, 'mr-4xs']"
+				/>
+				<n8n-text
+					size="medium"
+					:class="[$style.status, $style[executionUIDetails.name]]"
+					data-test-id="execution-preview-label"
+				>
+					{{ executionUIDetails.label }}
+				</n8n-text>
+				{{ ' ' }}
+				<n8n-text v-if="executionUIDetails.name === 'running'" color="text-base" size="medium">
+					{{
+						$locale.baseText('executionDetails.runningTimeRunning', {
+							interpolate: { time: executionUIDetails?.runningTime },
+						})
+					}}
+					| ID#{{ execution.id }}
+				</n8n-text>
+				<n8n-text
+					v-else-if="executionUIDetails.name !== 'waiting'"
+					color="text-base"
+					size="medium"
+					data-test-id="execution-preview-id"
+				>
+					{{
+						$locale.baseText('executionDetails.runningTimeFinished', {
+							interpolate: { time: executionUIDetails?.runningTime ?? 'unknown' },
+						})
+					}}
+					| ID#{{ execution.id }}
+				</n8n-text>
+				<n8n-text
+					v-else-if="executionUIDetails?.name === 'waiting'"
+					color="text-base"
+					size="medium"
+				>
+					| ID#{{ execution.id }}
+				</n8n-text>
+				<br /><n8n-text v-if="execution.mode === 'retry'" color="text-base" size="medium">
+					{{ $locale.baseText('executionDetails.retry') }}
+					<router-link
+						:class="$style.executionLink"
+						:to="{
+							name: VIEWS.EXECUTION_PREVIEW,
+							params: {
+								workflowId: execution.workflowId,
+								executionId: execution.retryOf,
+							},
+						}"
+					>
+						#{{ execution.retryOf }}
+					</router-link>
+				</n8n-text>
+			</div>
+			<div>
+				<n8n-button size="medium" :type="debugButtonData.type" :class="$style.debugLink">
+					<router-link
+						:to="{
+							name: VIEWS.EXECUTION_DEBUG,
+							params: {
+								name: execution.workflowId,
+								executionId: execution.id,
+							},
+						}"
+					>
+						<span data-test-id="execution-debug-button" @click="handleDebugLinkClick">{{
+							debugButtonData.text
+						}}</span>
+					</router-link>
+				</n8n-button>
+
+				<ElDropdown
+					v-if="isRetriable"
+					ref="retryDropdown"
+					trigger="click"
+					class="mr-xs"
+					@command="handleRetryClick"
+				>
+					<span class="retry-button">
+						<n8n-icon-button
+							size="medium"
+							type="tertiary"
+							:title="$locale.baseText('executionsList.retryExecution')"
+							icon="redo"
+							data-test-id="execution-preview-retry-button"
+							@blur="onRetryButtonBlur"
+						/>
+					</span>
+					<template #dropdown>
+						<el-dropdown-menu>
+							<el-dropdown-item command="current-workflow">
+								{{ $locale.baseText('executionsList.retryWithCurrentlySavedWorkflow') }}
+							</el-dropdown-item>
+							<el-dropdown-item command="original-workflow">
+								{{ $locale.baseText('executionsList.retryWithOriginalWorkflow') }}
+							</el-dropdown-item>
+						</el-dropdown-menu>
+					</template>
+				</ElDropdown>
+				<n8n-icon-button
+					:title="$locale.baseText('executionDetails.deleteExecution')"
+					icon="trash"
+					size="medium"
+					type="tertiary"
+					data-test-id="execution-preview-delete-button"
+					@click="onDeleteExecution"
+				/>
+			</div>
+		</div>
+		<WorkflowPreview
+			mode="execution"
+			loader-type="spinner"
+			:execution-id="executionId"
+			:execution-mode="executionMode"
+		/>
+	</div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import { ElDropdown } from 'element-plus';
+import { useExecutionDebugging } from '@/composables/useExecutionDebugging';
+import { useMessage } from '@/composables/useMessage';
+import WorkflowPreview from '@/components/WorkflowPreview.vue';
+import { MODAL_CONFIRM, VIEWS } from '@/constants';
+import type { ExecutionSummary } from 'n8n-workflow';
+import type { IExecutionUIData } from '@/composables/useExecutionHelpers';
+import { useExecutionHelpers } from '@/composables/useExecutionHelpers';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { mapStores } from 'pinia';
+
+type RetryDropdownRef = InstanceType<typeof ElDropdown> & { hide: () => void };
+
+export default defineComponent({
+	name: 'WorkflowExecutionsPreview',
+	components: {
+		ElDropdown,
+		WorkflowPreview,
+	},
+	props: {
+		execution: {
+			type: Object as () => ExecutionSummary | null,
+			required: true,
+		},
+	},
+	setup() {
+		const executionHelpers = useExecutionHelpers();
+
+		return {
+			VIEWS,
+			executionHelpers,
+			...useMessage(),
+			...useExecutionDebugging(),
+		};
+	},
+	computed: {
+		...mapStores(useWorkflowsStore),
+		executionId(): string {
+			return this.$route.params.executionId as string;
+		},
+		executionUIDetails(): IExecutionUIData | null {
+			return this.execution ? this.executionHelpers.getUIDetails(this.execution) : null;
+		},
+		executionMode(): string {
+			return this.execution?.mode || '';
+		},
+		debugButtonData(): Record<string, string> {
+			return this.execution?.status === 'success'
+				? {
+						text: this.$locale.baseText('executionsList.debug.button.copyToEditor'),
+						type: 'secondary',
+					}
+				: {
+						text: this.$locale.baseText('executionsList.debug.button.debugInEditor'),
+						type: 'primary',
+					};
+		},
+		isRetriable(): boolean {
+			return !!this.execution && this.executionHelpers.isExecutionRetriable(this.execution);
+		},
+	},
+	methods: {
+		async onDeleteExecution(): Promise<void> {
+			const deleteConfirmed = await this.confirm(
+				this.$locale.baseText('executionDetails.confirmMessage.message'),
+				this.$locale.baseText('executionDetails.confirmMessage.headline'),
+				{
+					type: 'warning',
+					confirmButtonText: this.$locale.baseText(
+						'executionDetails.confirmMessage.confirmButtonText',
+					),
+					cancelButtonText: '',
+				},
+			);
+			if (deleteConfirmed !== MODAL_CONFIRM) {
+				return;
+			}
+			this.$emit('deleteCurrentExecution');
+		},
+		handleRetryClick(command: string): void {
+			this.$emit('retryExecution', { execution: this.execution, command });
+		},
+		handleStopClick(): void {
+			this.$emit('stopExecution');
+		},
+		onRetryButtonBlur(event: FocusEvent): void {
+			// Hide dropdown when clicking outside of current document
+			const retryDropdownRef = this.$refs.retryDropdown as RetryDropdownRef | undefined;
+			if (retryDropdownRef && event.relatedTarget === null) {
+				retryDropdownRef.handleClose();
+			}
+		},
+	},
+});
+</script>
+
+<style module lang="scss">
+.previewContainer {
+	position: relative;
+	height: 100%;
+	overflow: hidden;
+}
+
+.executionDetails {
+	position: absolute;
+	padding: var(--spacing-m);
+	padding-right: var(--spacing-xl);
+	width: 100%;
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	transition: all 150ms ease-in-out;
+	pointer-events: none;
+
+	> div:last-child {
+		display: flex;
+		align-items: center;
+	}
+
+	& * {
+		pointer-events: all;
+	}
+}
+
+.spinner {
+	div div {
+		width: 30px;
+		height: 30px;
+		border-width: 2px;
+	}
+}
+
+.running,
+.spinner {
+	color: var(--color-warning);
+}
+.waiting {
+	color: var(--color-secondary);
+}
+.success {
+	color: var(--color-success);
+}
+.error {
+	color: var(--color-danger);
+}
+
+.runningInfo {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	margin-top: var(--spacing-4xl);
+}
+
+.runningMessage {
+	width: 200px;
+	margin-top: var(--spacing-l);
+	text-align: center;
+}
+
+.debugLink {
+	margin-right: var(--spacing-xs);
+	padding: 0;
+
+	a > span {
+		display: block;
+		padding: var(--button-padding-vertical, var(--spacing-xs))
+			var(--button-padding-horizontal, var(--spacing-m));
+	}
+}
+</style>
diff --git a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsSidebar.vue b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsSidebar.vue
new file mode 100644
index 0000000000000..36e4e75ff69b8
--- /dev/null
+++ b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsSidebar.vue
@@ -0,0 +1,281 @@
+<template>
+	<div
+		ref="container"
+		:class="['executions-sidebar', $style.container]"
+		data-test-id="executions-sidebar"
+	>
+		<div :class="$style.heading">
+			<n8n-heading tag="h2" size="medium" color="text-dark">
+				{{ $locale.baseText('generic.executions') }}
+			</n8n-heading>
+		</div>
+		<div :class="$style.controls">
+			<el-checkbox
+				v-model="executionsStore.autoRefresh"
+				data-test-id="auto-refresh-checkbox"
+				@update:model-value="$emit('update:autoRefresh', $event)"
+			>
+				{{ $locale.baseText('executionsList.autoRefresh') }}
+			</el-checkbox>
+			<ExecutionsFilter popover-placement="left-start" @filter-changed="onFilterChanged" />
+		</div>
+		<div
+			ref="executionList"
+			:class="$style.executionList"
+			data-test-id="current-executions-list"
+			@scroll="loadMore(20)"
+		>
+			<div v-if="loading" class="mr-l">
+				<n8n-loading variant="rect" />
+			</div>
+			<div
+				v-if="!loading && executions.length === 0"
+				:class="$style.noResultsContainer"
+				data-test-id="execution-list-empty"
+			>
+				<n8n-text color="text-base" size="medium" align="center">
+					{{ $locale.baseText('executionsLandingPage.noResults') }}
+				</n8n-text>
+			</div>
+			<WorkflowExecutionsCard
+				v-else-if="temporaryExecution"
+				:ref="`execution-${temporaryExecution.id}`"
+				:execution="temporaryExecution"
+				:data-test-id="`execution-details-${temporaryExecution.id}`"
+				:show-gap="true"
+				@retry-execution="onRetryExecution"
+			/>
+			<TransitionGroup name="executions-list">
+				<WorkflowExecutionsCard
+					v-for="execution in executions"
+					:key="execution.id"
+					:ref="`execution-${execution.id}`"
+					:execution="execution"
+					:data-test-id="`execution-details-${execution.id}`"
+					@retry-execution="onRetryExecution"
+				/>
+			</TransitionGroup>
+			<div v-if="loadingMore" class="mr-m">
+				<n8n-loading variant="p" :rows="1" />
+			</div>
+		</div>
+		<div :class="$style.infoAccordion">
+			<WorkflowExecutionsInfoAccordion :initially-expanded="false" />
+		</div>
+	</div>
+</template>
+
+<script lang="ts">
+import WorkflowExecutionsCard from '@/components/executions/workflow/WorkflowExecutionsCard.vue';
+import WorkflowExecutionsInfoAccordion from '@/components/executions/workflow/WorkflowExecutionsInfoAccordion.vue';
+import ExecutionsFilter from '@/components/executions/ExecutionsFilter.vue';
+import { VIEWS } from '@/constants';
+import type { ExecutionSummary } from 'n8n-workflow';
+import type { Route } from 'vue-router';
+import { defineComponent } from 'vue';
+import type { PropType } from 'vue';
+import { mapStores } from 'pinia';
+import { useExecutionsStore } from '@/stores/executions.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import type { ExecutionFilterType } from '@/Interface';
+
+type WorkflowExecutionsCardRef = InstanceType<typeof WorkflowExecutionsCard>;
+
+export default defineComponent({
+	name: 'WorkflowExecutionsSidebar',
+	components: {
+		WorkflowExecutionsCard,
+		WorkflowExecutionsInfoAccordion,
+		ExecutionsFilter,
+	},
+	props: {
+		executions: {
+			type: Array as PropType<ExecutionSummary[]>,
+			required: true,
+		},
+		loading: {
+			type: Boolean,
+			default: true,
+		},
+		loadingMore: {
+			type: Boolean,
+			default: false,
+		},
+		temporaryExecution: {
+			type: Object as PropType<ExecutionSummary>,
+			default: null,
+		},
+	},
+	data() {
+		return {
+			VIEWS,
+			filter: {} as ExecutionFilterType,
+		};
+	},
+	computed: {
+		...mapStores(useExecutionsStore, useWorkflowsStore),
+	},
+	watch: {
+		$route(to: Route, from: Route) {
+			if (from.name === VIEWS.EXECUTION_PREVIEW && to.name === VIEWS.EXECUTION_HOME) {
+				// Skip parent route when navigating through executions with back button
+				this.$router.go(-1);
+			}
+		},
+	},
+	mounted() {
+		// On larger screens, we need to load more then first page of executions
+		// for the scroll bar to appear and infinite scrolling is enabled
+		this.checkListSize();
+		setTimeout(() => {
+			this.scrollToActiveCard();
+		}, 1000);
+	},
+	methods: {
+		loadMore(limit = 20): void {
+			if (!this.loading) {
+				const executionsListRef = this.$refs.executionList as HTMLElement | undefined;
+				if (executionsListRef) {
+					const diff =
+						executionsListRef.offsetHeight -
+						(executionsListRef.scrollHeight - executionsListRef.scrollTop);
+					if (diff > -10 && diff < 10) {
+						this.$emit('loadMore', limit);
+					}
+				}
+			}
+		},
+		onRetryExecution(payload: object) {
+			this.$emit('retryExecution', payload);
+		},
+		onRefresh(): void {
+			this.$emit('refresh');
+		},
+		onFilterChanged(filter: ExecutionFilterType) {
+			this.$emit('filterUpdated', filter);
+		},
+		reloadExecutions(): void {
+			this.$emit('reloadExecutions');
+		},
+		checkListSize(): void {
+			const sidebarContainerRef = this.$refs.container as HTMLElement | undefined;
+			const currentWorkflowExecutionsCardRefs = this.$refs[
+				`execution-${this.executionsStore.activeExecution?.id}`
+			] as WorkflowExecutionsCardRef[] | undefined;
+
+			// Find out how many execution card can fit into list
+			// and load more if needed
+			if (sidebarContainerRef && currentWorkflowExecutionsCardRefs?.length) {
+				const cardElement = currentWorkflowExecutionsCardRefs[0].$el as HTMLElement;
+				const listCapacity = Math.ceil(sidebarContainerRef.clientHeight / cardElement.clientHeight);
+
+				if (listCapacity > this.executions.length) {
+					this.$emit('loadMore', listCapacity - this.executions.length);
+				}
+			}
+		},
+		scrollToActiveCard(): void {
+			const executionsListRef = this.$refs.executionList as HTMLElement | undefined;
+			const currentWorkflowExecutionsCardRefs = this.$refs[
+				`execution-${this.executionsStore.activeExecution?.id}`
+			] as WorkflowExecutionsCardRef[] | undefined;
+
+			if (
+				executionsListRef &&
+				currentWorkflowExecutionsCardRefs?.length &&
+				this.executionsStore.activeExecution
+			) {
+				const cardElement = currentWorkflowExecutionsCardRefs[0].$el as HTMLElement;
+				const cardRect = cardElement.getBoundingClientRect();
+				const LIST_HEADER_OFFSET = 200;
+				if (cardRect.top > executionsListRef.offsetHeight) {
+					executionsListRef.scrollTo({ top: cardRect.top - LIST_HEADER_OFFSET });
+				}
+			}
+		},
+	},
+});
+</script>
+
+<style module lang="scss">
+.container {
+	flex: 310px 0 0;
+	background-color: var(--color-background-xlight);
+	border-right: var(--border-base);
+	padding: var(--spacing-l) 0 var(--spacing-l) var(--spacing-l);
+	z-index: 1;
+	display: flex;
+	flex-direction: column;
+	overflow: hidden;
+}
+
+.heading {
+	display: flex;
+	justify-content: space-between;
+	align-items: baseline;
+	padding-right: var(--spacing-l);
+}
+
+.controls {
+	padding: var(--spacing-s) 0 var(--spacing-xs);
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	padding-right: var(--spacing-m);
+
+	button {
+		display: flex;
+		align-items: center;
+	}
+}
+
+.executionList {
+	flex: 1;
+	overflow: auto;
+	margin-bottom: var(--spacing-m);
+	background-color: var(--color-background-xlight) !important;
+
+	// Scrolling fader
+	&::before {
+		position: absolute;
+		display: block;
+		width: 270px;
+		height: 6px;
+		background: linear-gradient(to bottom, rgba(251, 251, 251, 1) 0%, rgba(251, 251, 251, 0) 100%);
+		z-index: 999;
+	}
+
+	// Lower first execution card so fader is not visible when not scrolled
+	& > div:first-child {
+		margin-top: 3px;
+	}
+}
+
+.infoAccordion {
+	position: absolute;
+	bottom: 0;
+	margin-left: calc(-1 * var(--spacing-l));
+	border-top: var(--border-base);
+
+	& > div {
+		width: 309px;
+		background-color: var(--color-background-light);
+		margin-top: 0 !important;
+	}
+}
+
+.noResultsContainer {
+	width: 100%;
+	margin-top: var(--spacing-2xl);
+	text-align: center;
+}
+</style>
+
+<style lang="scss" scoped>
+.executions-sidebar {
+	:deep(.el-skeleton__item) {
+		height: 60px;
+		border-radius: 0;
+	}
+}
+</style>
diff --git a/packages/editor-ui/src/components/forms/CodeEditor.vue b/packages/editor-ui/src/components/forms/CodeEditor.vue
deleted file mode 100644
index 3145452786428..0000000000000
--- a/packages/editor-ui/src/components/forms/CodeEditor.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-	<div ref="code" class="text-editor ph-no-capture" @keydown.stop />
-</template>
-
-<script lang="ts">
-import { defineComponent } from 'vue';
-import * as monaco from 'monaco-editor';
-
-export default defineComponent({
-	props: {
-		type: {
-			type: String,
-			default: 'code',
-		},
-		readonly: {
-			type: Boolean,
-			default: false,
-		},
-		value: {
-			type: String,
-			default: '',
-		},
-		autocomplete: {
-			type: Function,
-		},
-		options: {
-			type: Object,
-			default: () => ({}),
-		},
-	},
-	data() {
-		return {
-			monacoInstance: null as monaco.editor.IStandaloneCodeEditor | null,
-			monacoLibrary: null as monaco.IDisposable | null,
-		};
-	},
-	methods: {
-		loadEditor() {
-			if (!this.$refs.code) return;
-
-			this.monacoInstance = monaco.editor.create(this.$refs.code as HTMLElement, {
-				automaticLayout: true,
-				value: this.value,
-				language: this.type === 'code' ? 'javascript' : 'json',
-				tabSize: 2,
-				wordBasedSuggestions: false,
-				readOnly: this.readonly,
-				padding: {
-					top: 16,
-				},
-				minimap: {
-					enabled: false,
-				},
-				...this.options,
-			});
-
-			this.monacoInstance.onDidChangeModelContent(() => {
-				const model = this.monacoInstance!.getModel();
-				if (model) {
-					this.$emit('input', model.getValue());
-				}
-			});
-
-			const darkModeBetaEnabled =
-				document.body.classList.contains('theme-dark-beta') &&
-				window.matchMedia('(prefers-color-scheme: dark)').matches;
-
-			monaco.editor.defineTheme('n8nCustomTheme', {
-				base: darkModeBetaEnabled ? 'vs-dark' : 'vs',
-				inherit: true,
-				rules: [],
-				colors: {},
-			});
-			monaco.editor.setTheme('n8nCustomTheme');
-
-			if (this.type === 'code') {
-				// As wordBasedSuggestions: false does not have any effect does it however seem
-				// to remove all all suggestions from the editor if I do this
-				monaco.languages.typescript.javascriptDefaults.setCompilerOptions({
-					allowNonTsExtensions: true,
-				});
-
-				if (this.autocomplete) {
-					this.monacoLibrary = monaco.languages.typescript.javascriptDefaults.addExtraLib(
-						this.autocomplete().join('\n'),
-					);
-				}
-			} else if (this.type === 'json') {
-				monaco.languages.json.jsonDefaults.setDiagnosticsOptions({
-					validate: true,
-				});
-			}
-		},
-		handleResize() {
-			if (this.monacoInstance) {
-				// Workaround to force Monaco to recompute its boundaries
-				this.monacoInstance.layout({} as unknown as undefined);
-			}
-		},
-	},
-	mounted() {
-		setTimeout(this.loadEditor);
-		window.addEventListener('resize', this.handleResize);
-	},
-	destroyed() {
-		if (this.monacoLibrary) {
-			this.monacoLibrary.dispose();
-		}
-		window.removeEventListener('resize', this.handleResize);
-	},
-});
-</script>
-
-<style lang="scss" scoped>
-.text-editor {
-	width: 100%;
-	height: 100%;
-	flex: 1 1 auto;
-	border: 1px solid var(--color-foreground-base);
-	border-radius: var(--border-radius-base);
-}
-
-::v-deep {
-	.monaco-editor {
-		.slider {
-			border-radius: var(--border-radius-base);
-		}
-
-		&,
-		&-background,
-		.inputarea.ime-input,
-		.margin {
-			border-radius: var(--border-radius-base);
-		}
-	}
-}
-</style>
diff --git a/packages/editor-ui/src/components/forms/ResourceFiltersDropdown.vue b/packages/editor-ui/src/components/forms/ResourceFiltersDropdown.vue
index 0aa5f6b35535f..3b8daeccd6bb9 100644
--- a/packages/editor-ui/src/components/forms/ResourceFiltersDropdown.vue
+++ b/packages/editor-ui/src/components/forms/ResourceFiltersDropdown.vue
@@ -1,10 +1,9 @@
 <template>
-	<n8n-popover trigger="click">
+	<n8n-popover trigger="click" width="304" size="large">
 		<template #reference>
 			<n8n-button
 				icon="filter"
 				type="tertiary"
-				size="medium"
 				:active="hasFilters"
 				:class="[$style['filter-button'], 'ml-2xs']"
 				data-test-id="resources-list-filters-trigger"
@@ -16,11 +15,11 @@
 			</n8n-button>
 		</template>
 		<div :class="$style['filters-dropdown']" data-test-id="resources-list-filters-dropdown">
-			<slot :filters="value" :setKeyValue="setKeyValue" />
+			<slot :filters="modelValue" :set-key-value="setKeyValue" />
 			<enterprise-edition
+				v-if="shareable"
 				class="mb-s"
 				:features="[EnterpriseEditionFeature.Sharing]"
-				v-if="shareable"
 			>
 				<n8n-input-label
 					:label="$locale.baseText('forms.resourceFiltersDropdown.ownedBy')"
@@ -31,13 +30,13 @@
 				/>
 				<n8n-user-select
 					:users="ownedByUsers"
-					:currentUserId="usersStore.currentUser.id"
-					:value="value.ownedBy"
+					:current-user-id="usersStore.currentUser.id"
+					:model-value="modelValue.ownedBy"
 					size="medium"
-					@input="setKeyValue('ownedBy', $event)"
+					@update:model-value="setKeyValue('ownedBy', $event)"
 				/>
 			</enterprise-edition>
-			<enterprise-edition :features="[EnterpriseEditionFeature.Sharing]" v-if="shareable">
+			<enterprise-edition v-if="shareable" :features="[EnterpriseEditionFeature.Sharing]">
 				<n8n-input-label
 					:label="$locale.baseText('forms.resourceFiltersDropdown.sharedWith')"
 					:bold="false"
@@ -47,13 +46,13 @@
 				/>
 				<n8n-user-select
 					:users="sharedWithUsers"
-					:currentUserId="usersStore.currentUser.id"
-					:value="value.sharedWith"
+					:current-user-id="usersStore.currentUser.id"
+					:model-value="modelValue.sharedWith"
 					size="medium"
-					@input="setKeyValue('sharedWith', $event)"
+					@update:model-value="setKeyValue('sharedWith', $event)"
 				/>
 			</enterprise-edition>
-			<div :class="[$style['filters-dropdown-footer'], 'mt-s']" v-if="hasFilters">
+			<div v-if="hasFilters" :class="[$style['filters-dropdown-footer'], 'mt-s']">
 				<n8n-link @click="resetFilters">
 					{{ $locale.baseText('forms.resourceFiltersDropdown.reset') }}
 				</n8n-link>
@@ -66,7 +65,7 @@
 import { defineComponent } from 'vue';
 import { EnterpriseEditionFeature } from '@/constants';
 import { mapStores } from 'pinia';
-import { useUsersStore } from '@/stores/users';
+import { useUsersStore } from '@/stores/users.store';
 import type { PropType } from 'vue';
 import type { IUser } from '@/Interface';
 
@@ -74,7 +73,7 @@ export type IResourceFiltersType = Record<string, boolean | string | string[]>;
 
 export default defineComponent({
 	props: {
-		value: {
+		modelValue: {
 			type: Object as PropType<IResourceFiltersType>,
 			default: () => ({}),
 		},
@@ -99,24 +98,26 @@ export default defineComponent({
 		...mapStores(useUsersStore),
 		ownedByUsers(): IUser[] {
 			return this.usersStore.allUsers.map((user) =>
-				user.id === this.value.sharedWith ? { ...user, disabled: true } : user,
+				user.id === this.modelValue.sharedWith ? { ...user, disabled: true } : user,
 			);
 		},
 		sharedWithUsers(): IUser[] {
 			return this.usersStore.allUsers.map((user) =>
-				user.id === this.value.ownedBy ? { ...user, disabled: true } : user,
+				user.id === this.modelValue.ownedBy ? { ...user, disabled: true } : user,
 			);
 		},
 		filtersLength(): number {
 			let length = 0;
 
-			(this.keys as string[]).forEach((key) => {
+			this.keys.forEach((key) => {
 				if (key === 'search') {
 					return;
 				}
 
 				length += (
-					Array.isArray(this.value[key]) ? this.value[key].length > 0 : this.value[key] !== ''
+					Array.isArray(this.modelValue[key])
+						? this.modelValue[key].length > 0
+						: this.modelValue[key] !== ''
 				)
 					? 1
 					: 0;
@@ -128,40 +129,40 @@ export default defineComponent({
 			return this.filtersLength > 0;
 		},
 	},
+	watch: {
+		filtersLength(value: number) {
+			this.$emit('update:filtersLength', value);
+		},
+	},
 	methods: {
 		setKeyValue(key: string, value: unknown) {
 			const filters = {
-				...this.value,
+				...this.modelValue,
 				[key]: value,
 			};
 
-			this.$emit('input', filters);
+			this.$emit('update:modelValue', filters);
 		},
 		resetFilters() {
 			if (this.reset) {
 				this.reset();
 			} else {
-				const filters = { ...this.value };
+				const filters = { ...this.modelValue };
 
-				(this.keys as string[]).forEach((key) => {
-					filters[key] = Array.isArray(this.value[key]) ? [] : '';
+				this.keys.forEach((key) => {
+					filters[key] = Array.isArray(this.modelValue[key]) ? [] : '';
 				});
 
-				this.$emit('input', filters);
+				this.$emit('update:modelValue', filters);
 			}
 		},
 	},
-	watch: {
-		filtersLength(value: number) {
-			this.$emit('update:filtersLength', value);
-		},
-	},
 });
 </script>
 
 <style lang="scss" module>
 .filter-button {
-	height: 36px;
+	height: 40px;
 	align-items: center;
 }
 
diff --git a/packages/editor-ui/src/components/forms/ResourceOwnershipSelect.ee.vue b/packages/editor-ui/src/components/forms/ResourceOwnershipSelect.ee.vue
index 1c5ccc865782d..8897ea7d40feb 100644
--- a/packages/editor-ui/src/components/forms/ResourceOwnershipSelect.ee.vue
+++ b/packages/editor-ui/src/components/forms/ResourceOwnershipSelect.ee.vue
@@ -1,10 +1,12 @@
 <template>
-	<n8n-menu
-		:items="menuItems"
-		mode="tabs"
-		:value="value ? 'owner' : 'all'"
-		@input="onSelectOwner"
-	/>
+	<div class="resource-ownership-select">
+		<n8n-menu
+			:items="menuItems"
+			mode="tabs"
+			:model-value="value ? 'owner' : 'all'"
+			@update:model-value="onSelectOwner"
+		/>
+	</div>
 </template>
 
 <script lang="ts">
@@ -46,7 +48,7 @@ export default defineComponent({
 	},
 	methods: {
 		onSelectOwner(type: string) {
-			this.$emit('input', type === 'owner');
+			this.$emit('update:modelValue', type === 'owner');
 		},
 	},
 });
diff --git a/packages/editor-ui/src/components/forms/index.ts b/packages/editor-ui/src/components/forms/index.ts
deleted file mode 100644
index 345b928ff05d8..0000000000000
--- a/packages/editor-ui/src/components/forms/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default as CodeEditor } from './CodeEditor.vue';
diff --git a/packages/editor-ui/src/components/layouts/PageViewLayout.vue b/packages/editor-ui/src/components/layouts/PageViewLayout.vue
index f3340c5983728..7f18b4203af85 100644
--- a/packages/editor-ui/src/components/layouts/PageViewLayout.vue
+++ b/packages/editor-ui/src/components/layouts/PageViewLayout.vue
@@ -1,7 +1,7 @@
 <template>
-	<div :class="[$style.wrapper, !this.uiStore.sidebarMenuCollapsed && $style.expandedSidebar]">
+	<div :class="[$style.wrapper, !uiStore.sidebarMenuCollapsed && $style.expandedSidebar]">
 		<div :class="$style.container">
-			<aside :class="$style.aside" v-if="$slots.aside">
+			<aside v-if="$slots.aside" :class="$style.aside">
 				<slot name="aside" />
 			</aside>
 			<main :class="$style.content">
@@ -12,9 +12,9 @@
 </template>
 
 <script lang="ts">
-import { useUIStore } from '@/stores/ui';
-import { mapStores } from 'pinia';
 import { defineComponent } from 'vue';
+import { mapStores } from 'pinia';
+import { useUIStore } from '@/stores/ui.store';
 
 export default defineComponent({
 	name: 'PageViewLayout',
@@ -37,7 +37,6 @@ export default defineComponent({
 	max-width: 1280px;
 	justify-content: center;
 	box-sizing: border-box;
-	background: var(--color-gray-light);
 	padding: var(--spacing-l) var(--spacing-l) 0;
 	@media (min-width: 1200px) {
 		padding: var(--spacing-2xl) var(--spacing-2xl) 0;
diff --git a/packages/editor-ui/src/components/layouts/ResourcesListLayout.vue b/packages/editor-ui/src/components/layouts/ResourcesListLayout.vue
index 9ac79df859a43..81f201c45b98a 100644
--- a/packages/editor-ui/src/components/layouts/ResourcesListLayout.vue
+++ b/packages/editor-ui/src/components/layouts/ResourcesListLayout.vue
@@ -1,31 +1,31 @@
 <template>
-	<page-view-layout>
-		<template #aside v-if="showAside">
+	<PageViewLayout>
+		<template v-if="showAside" #aside>
 			<div :class="[$style['heading-wrapper'], 'mb-xs']">
 				<n8n-heading size="2xlarge">
-					{{ $locale.baseText(`${resourceKey}.heading`) }}
+					{{ i18n.baseText(`${resourceKey}.heading`) }}
 				</n8n-heading>
 			</div>
 
 			<div class="mt-xs mb-l">
-				<slot name="add-button">
+				<slot name="add-button" :disabled="disabled">
 					<n8n-button
 						size="large"
 						block
 						:disabled="disabled"
-						@click="$emit('click:add', $event)"
 						data-test-id="resources-list-add"
+						@click="$emit('click:add', $event)"
 					>
-						{{ $locale.baseText(`${resourceKey}.add`) }}
+						{{ i18n.baseText(`${resourceKey}.add`) }}
 					</n8n-button>
 				</slot>
 			</div>
 
-			<enterprise-edition :features="[EnterpriseEditionFeature.Sharing]" v-if="shareable">
-				<resource-ownership-select
+			<enterprise-edition v-if="shareable" :features="[EnterpriseEditionFeature.Sharing]">
+				<ResourceOwnershipSelect
 					v-model="isOwnerSubview"
-					:my-resources-label="$locale.baseText(`${resourceKey}.menu.my`)"
-					:all-resources-label="$locale.baseText(`${resourceKey}.menu.all`)"
+					:my-resources-label="i18n.baseText(`${resourceKey}.menu.my`)"
+					:all-resources-label="i18n.baseText(`${resourceKey}.menu.all`)"
 				/>
 			</enterprise-edition>
 		</template>
@@ -42,7 +42,7 @@
 						data-test-id="empty-resources-list"
 						emoji="👋"
 						:heading="
-							$locale.baseText(
+							i18n.baseText(
 								usersStore.currentUser.firstName
 									? `${resourceKey}.empty.heading`
 									: `${resourceKey}.empty.heading.userNotSetup`,
@@ -51,63 +51,64 @@
 								},
 							)
 						"
-						:description="$locale.baseText(`${resourceKey}.empty.description`)"
-						:buttonText="$locale.baseText(`${resourceKey}.empty.button`)"
-						buttonType="secondary"
-						@click="$emit('click:add', $event)"
+						:description="i18n.baseText(`${resourceKey}.empty.description`)"
+						:button-text="i18n.baseText(`${resourceKey}.empty.button`)"
+						button-type="secondary"
+						@click:button="$emit('click:add', $event)"
 					/>
 				</slot>
 			</div>
-			<page-view-layout-list :overflow="type !== 'list'" v-else>
+			<PageViewLayoutList v-else :overflow="type !== 'list'">
 				<template #header>
 					<div class="mb-xs">
 						<div :class="$style['filters-row']">
 							<n8n-input
+								ref="search"
+								:model-value="filtersModel.search"
 								:class="[$style['search'], 'mr-2xs']"
-								:placeholder="$locale.baseText(`${resourceKey}.search.placeholder`)"
-								v-model="filters.search"
-								size="medium"
+								:placeholder="i18n.baseText(`${resourceKey}.search.placeholder`)"
 								clearable
-								ref="search"
 								data-test-id="resources-list-search"
+								@update:model-value="onSearch"
 							>
 								<template #prefix>
 									<n8n-icon icon="search" />
 								</template>
 							</n8n-input>
 							<div :class="$style['sort-and-filter']">
-								<n8n-select v-model="sortBy" size="medium" data-test-id="resources-list-sort">
+								<n8n-select v-model="sortBy" data-test-id="resources-list-sort">
 									<n8n-option
 										v-for="sortOption in sortOptions"
 										:key="sortOption"
+										data-test-id="resources-list-sort-item"
 										:value="sortOption"
-										:label="$locale.baseText(`${resourceKey}.sort.${sortOption}`)"
+										:label="i18n.baseText(`${resourceKey}.sort.${sortOption}`)"
 									/>
 								</n8n-select>
-								<resource-filters-dropdown
+								<ResourceFiltersDropdown
 									v-if="showFiltersDropdown"
 									:keys="filterKeys"
 									:reset="resetFilters"
-									:value="filters"
+									:model-value="filtersModel"
 									:shareable="shareable"
-									@input="$emit('update:filters', $event)"
-									@update:filtersLength="onUpdateFiltersLength"
+									@update:model-value="$emit('update:filters', $event)"
+									@update:filters-length="onUpdateFiltersLength"
 								>
 									<template #default="resourceFiltersSlotProps">
 										<slot name="filters" v-bind="resourceFiltersSlotProps" />
 									</template>
-								</resource-filters-dropdown>
+								</ResourceFiltersDropdown>
 							</div>
 						</div>
 					</div>
 
 					<slot name="callout"></slot>
 
-					<div v-show="hasFilters" class="mt-xs">
+					<div v-if="showFiltersDropdown" v-show="hasFilters" class="mt-xs">
 						<n8n-info-tip :bold="false">
-							{{ $locale.baseText(`${resourceKey}.filters.active`) }}
-							<n8n-link @click="resetFilters" size="small">
-								{{ $locale.baseText(`${resourceKey}.filters.active.reset`) }}
+							{{ i18n.baseText(`${resourceKey}.filters.active`) }}
+							<n8n-link data-test-id="workflows-filter-reset" size="small" @click="resetFilters">
+								{{ i18n.baseText(`${resourceKey}.filters.active.reset`) }}
 							</n8n-link>
 						</n8n-info-tip>
 					</div>
@@ -119,8 +120,8 @@
 
 				<div
 					v-if="filteredAndSortedSubviewResources.length > 0"
-					:class="$style.listWrapper"
 					ref="listWrapperRef"
+					:class="$style.listWrapper"
 				>
 					<n8n-recycle-scroller
 						v-if="type === 'list'"
@@ -131,7 +132,10 @@
 						item-key="id"
 					>
 						<template #default="{ item, updateItemSize }">
-							<slot :data="item" :updateItemSize="updateItemSize" />
+							<slot :data="item" :update-item-size="updateItemSize" />
+						</template>
+						<template #postListContent>
+							<slot name="postListContent" />
 						</template>
 					</n8n-recycle-scroller>
 					<n8n-datatable
@@ -140,10 +144,10 @@
 						:class="$style.datatable"
 						:columns="typeProps.columns"
 						:rows="filteredAndSortedSubviewResources"
-						:currentPage="currentPage"
-						:rowsPerPage="rowsPerPage"
-						@update:currentPage="setCurrentPage"
-						@update:rowsPerPage="setRowsPerPage"
+						:current-page="currentPage"
+						:rows-per-page="rowsPerPage"
+						@update:current-page="setCurrentPage"
+						@update:rows-per-page="setRowsPerPage"
 					>
 						<template #row="{ columns, row }">
 							<slot :data="row" :columns="columns" />
@@ -151,23 +155,21 @@
 					</n8n-datatable>
 				</div>
 
-				<n8n-text color="text-base" size="medium" data-test-id="resources-list-empty" v-else>
-					{{ $locale.baseText(`${resourceKey}.noResults`) }}
+				<n8n-text v-else color="text-base" size="medium" data-test-id="resources-list-empty">
+					{{ i18n.baseText(`${resourceKey}.noResults`) }}
 					<template v-if="shouldSwitchToAllSubview">
-						<span v-if="!filters.search">
-							({{ $locale.baseText(`${resourceKey}.noResults.switchToShared.preamble`) }}
+						<span v-if="!filtersModel.search">
+							({{ i18n.baseText(`${resourceKey}.noResults.switchToShared.preamble`) }}
 							<n8n-link @click="setOwnerSubview(false)">
-								{{ $locale.baseText(`${resourceKey}.noResults.switchToShared.link`) }} </n8n-link
+								{{ i18n.baseText(`${resourceKey}.noResults.switchToShared.link`) }} </n8n-link
 							>)
 						</span>
 
 						<span v-else>
-							({{
-								$locale.baseText(`${resourceKey}.noResults.withSearch.switchToShared.preamble`)
-							}}
+							({{ i18n.baseText(`${resourceKey}.noResults.withSearch.switchToShared.preamble`) }}
 							<n8n-link @click="setOwnerSubview(false)">
 								{{
-									$locale.baseText(`${resourceKey}.noResults.withSearch.switchToShared.link`)
+									i18n.baseText(`${resourceKey}.noResults.withSearch.switchToShared.link`)
 								}} </n8n-link
 							>)
 						</span>
@@ -175,30 +177,27 @@
 				</n8n-text>
 
 				<slot name="postamble" />
-			</page-view-layout-list>
+			</PageViewLayoutList>
 		</template>
-	</page-view-layout>
+	</PageViewLayout>
 </template>
 
 <script lang="ts">
-import { showMessage } from '@/mixins/showMessage';
-import type { IUser } from '@/Interface';
-import mixins from 'vue-typed-mixins';
+import { defineComponent } from 'vue';
+import type { PropType } from 'vue';
+import { mapStores } from 'pinia';
 
+import type { IUser } from '@/Interface';
 import PageViewLayout from '@/components/layouts/PageViewLayout.vue';
 import PageViewLayoutList from '@/components/layouts/PageViewLayoutList.vue';
 import { EnterpriseEditionFeature } from '@/constants';
-import TemplateCard from '@/components/TemplateCard.vue';
-import type { PropType } from 'vue';
-import type Vue from 'vue';
-import { debounceHelper } from '@/mixins/debounce';
 import ResourceOwnershipSelect from '@/components/forms/ResourceOwnershipSelect.ee.vue';
 import ResourceFiltersDropdown from '@/components/forms/ResourceFiltersDropdown.vue';
-import { mapStores } from 'pinia';
-import { useSettingsStore } from '@/stores/settings';
-import { useUsersStore } from '@/stores/users';
-import type { N8nInput } from 'n8n-design-system';
-import type { DatatableColumn } from 'n8n-design-system';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useUsersStore } from '@/stores/users.store';
+import type { N8nInput, DatatableColumn } from 'n8n-design-system';
+import { useI18n } from '@/composables/useI18n';
+import { useDebounce } from '@/composables/useDebounce';
 
 export interface IResource {
 	id: string;
@@ -220,12 +219,9 @@ interface IFilters {
 type IResourceKeyType = 'credentials' | 'workflows';
 type SearchRef = InstanceType<typeof N8nInput>;
 
-const filterKeys = ['ownedBy', 'sharedWith'];
-
-export default mixins(showMessage, debounceHelper).extend({
-	name: 'resources-list-layout',
+export default defineComponent({
+	name: 'ResourcesListLayout',
 	components: {
-		TemplateCard,
 		PageViewLayout,
 		PageViewLayoutList,
 		ResourceOwnershipSelect,
@@ -286,16 +282,26 @@ export default mixins(showMessage, debounceHelper).extend({
 		typeProps: {
 			type: Object as PropType<{ itemSize: number } | { columns: DatatableColumn[] }>,
 			default: () => ({
-				itemSize: 0,
+				itemSize: 80,
 			}),
 		},
 	},
+	setup() {
+		const i18n = useI18n();
+		const { callDebounced } = useDebounce();
+
+		return {
+			i18n,
+			callDebounced,
+		};
+	},
 	data() {
 		return {
 			loading: true,
 			isOwnerSubview: false,
 			sortBy: this.sortOptions[0],
 			hasFilters: false,
+			filtersModel: { ...this.filters },
 			currentPage: 1,
 			rowsPerPage: 10 as number | '*',
 			resettingFilters: false,
@@ -321,33 +327,31 @@ export default mixins(showMessage, debounceHelper).extend({
 			});
 		},
 		filterKeys(): string[] {
-			return Object.keys(this.filters);
+			return Object.keys(this.filtersModel);
 		},
 		filteredAndSortedSubviewResources(): IResource[] {
 			const filtered: IResource[] = this.subviewResources.filter((resource: IResource) => {
 				let matches = true;
 
-				if (this.filters.ownedBy) {
-					matches = matches && !!(resource.ownedBy && resource.ownedBy.id === this.filters.ownedBy);
+				if (this.filtersModel.ownedBy) {
+					matches =
+						matches && !!(resource.ownedBy && resource.ownedBy.id === this.filtersModel.ownedBy);
 				}
 
-				if (this.filters.sharedWith) {
+				if (this.filtersModel.sharedWith) {
 					matches =
 						matches &&
-						!!(
-							resource.sharedWith &&
-							resource.sharedWith.find((sharee) => sharee.id === this.filters.sharedWith)
-						);
+						!!resource.sharedWith?.find((sharee) => sharee.id === this.filtersModel.sharedWith);
 				}
 
-				if (this.filters.search) {
-					const searchString = this.filters.search.toLowerCase();
+				if (this.filtersModel.search) {
+					const searchString = this.filtersModel.search.toLowerCase();
 
 					matches = matches && this.displayName(resource).toLowerCase().includes(searchString);
 				}
 
 				if (this.additionalFiltersHandler) {
-					matches = this.additionalFiltersHandler(resource, this.filters, matches);
+					matches = this.additionalFiltersHandler(resource, this.filtersModel, matches);
 				}
 
 				return matches;
@@ -356,20 +360,20 @@ export default mixins(showMessage, debounceHelper).extend({
 			return filtered.sort((a, b) => {
 				switch (this.sortBy) {
 					case 'lastUpdated':
-						return this.sortFns['lastUpdated']
-							? this.sortFns['lastUpdated'](a, b)
+						return this.sortFns.lastUpdated
+							? this.sortFns.lastUpdated(a, b)
 							: new Date(b.updatedAt).valueOf() - new Date(a.updatedAt).valueOf();
 					case 'lastCreated':
-						return this.sortFns['lastCreated']
-							? this.sortFns['lastCreated'](a, b)
+						return this.sortFns.lastCreated
+							? this.sortFns.lastCreated(a, b)
 							: new Date(b.createdAt).valueOf() - new Date(a.createdAt).valueOf();
 					case 'nameAsc':
-						return this.sortFns['nameAsc']
-							? this.sortFns['nameAsc'](a, b)
+						return this.sortFns.nameAsc
+							? this.sortFns.nameAsc(a, b)
 							: this.displayName(a).trim().localeCompare(this.displayName(b).trim());
 					case 'nameDesc':
-						return this.sortFns['nameDesc']
-							? this.sortFns['nameDesc'](a, b)
+						return this.sortFns.nameDesc
+							? this.sortFns.nameDesc(a, b)
 							: this.displayName(b).trim().localeCompare(this.displayName(a).trim());
 					default:
 						return this.sortFns[this.sortBy] ? this.sortFns[this.sortBy](a, b) : 0;
@@ -385,12 +389,57 @@ export default mixins(showMessage, debounceHelper).extend({
 			return !this.hasFilters && this.isOwnerSubview && this.resourcesNotOwned.length > 0;
 		},
 	},
+	watch: {
+		isOwnerSubview() {
+			this.sendSubviewTelemetry();
+		},
+		filters(value) {
+			this.filtersModel = value;
+		},
+		'filtersModel.ownedBy'(value) {
+			if (value) {
+				this.setOwnerSubview(false);
+			}
+			this.sendFiltersTelemetry('ownedBy');
+		},
+		'filtersModel.sharedWith'() {
+			this.sendFiltersTelemetry('sharedWith');
+		},
+		'filtersModel.search'() {
+			void this.callDebounced(
+				this.sendFiltersTelemetry,
+				{ debounceTime: 1000, trailing: true },
+				'search',
+			);
+		},
+		sortBy(newValue) {
+			this.$emit('sort', newValue);
+			this.sendSortingTelemetry();
+		},
+	},
+	mounted() {
+		void this.onMounted();
+	},
 	methods: {
 		async onMounted() {
 			await this.initialize();
 
 			this.loading = false;
-			this.$nextTick(this.focusSearchInput);
+			await this.$nextTick();
+			this.focusSearchInput();
+
+			if (this.hasAppliedFilters()) {
+				this.hasFilters = true;
+			}
+		},
+		hasAppliedFilters(): boolean {
+			return !!this.filterKeys.find(
+				(key) =>
+					key !== 'search' &&
+					(Array.isArray(this.filters[key])
+						? this.filters[key].length > 0
+						: this.filters[key] !== ''),
+			);
 		},
 		setCurrentPage(page: number) {
 			this.currentPage = page;
@@ -399,12 +448,13 @@ export default mixins(showMessage, debounceHelper).extend({
 			this.rowsPerPage = rowsPerPage;
 		},
 		resetFilters() {
-			Object.keys(this.filters).forEach((key) => {
-				this.filters[key] = Array.isArray(this.filters[key]) ? [] : '';
+			Object.keys(this.filtersModel).forEach((key) => {
+				this.filtersModel[key] = Array.isArray(this.filtersModel[key]) ? [] : '';
 			});
 
 			this.resettingFilters = true;
 			this.sendFiltersTelemetry('reset');
+			this.$emit('update:filters', this.filtersModel);
 		},
 		focusSearchInput() {
 			if (this.$refs.search) {
@@ -415,7 +465,7 @@ export default mixins(showMessage, debounceHelper).extend({
 			this.isOwnerSubview = active;
 		},
 		getTelemetrySubview(): string {
-			return this.$locale.baseText(
+			return this.i18n.baseText(
 				`${this.resourceKey as IResourceKeyType}.menu.${this.isOwnerSubview ? 'my' : 'all'}`,
 			);
 		},
@@ -441,7 +491,7 @@ export default mixins(showMessage, debounceHelper).extend({
 				setTimeout(() => (this.resettingFilters = false), 1500);
 			}
 
-			const filters = this.filters as Record<string, string[] | string | boolean>;
+			const filters = this.filtersModel as Record<string, string[] | string | boolean>;
 			const filtersSet: string[] = [];
 			const filterValues: Array<string[] | string | boolean | null> = [];
 
@@ -463,29 +513,9 @@ export default mixins(showMessage, debounceHelper).extend({
 		onUpdateFiltersLength(length: number) {
 			this.hasFilters = length > 0;
 		},
-	},
-	mounted() {
-		this.onMounted();
-	},
-	watch: {
-		isOwnerSubview() {
-			this.sendSubviewTelemetry();
-		},
-		'filters.ownedBy'(value) {
-			if (value) {
-				this.setOwnerSubview(false);
-			}
-			this.sendFiltersTelemetry('ownedBy');
-		},
-		'filters.sharedWith'() {
-			this.sendFiltersTelemetry('sharedWith');
-		},
-		'filters.search'() {
-			this.callDebounced('sendFiltersTelemetry', { debounceTime: 1000, trailing: true }, 'search');
-		},
-		sortBy(newValue) {
-			this.$emit('sort', newValue);
-			this.sendSortingTelemetry();
+		onSearch(search: string) {
+			this.filtersModel.search = search;
+			this.$emit('update:filters', this.filtersModel);
 		},
 	},
 });
diff --git a/packages/editor-ui/src/components/transitions/SlideTransition.vue b/packages/editor-ui/src/components/transitions/SlideTransition.vue
index bb5227eb869fc..2f86c9073dc5c 100644
--- a/packages/editor-ui/src/components/transitions/SlideTransition.vue
+++ b/packages/editor-ui/src/components/transitions/SlideTransition.vue
@@ -15,10 +15,10 @@ export default defineComponent({
 <style lang="scss" scoped>
 .slide-leave-active,
 .slide-enter-active {
-	transition: 0.3s ease;
+	transition: 200ms ease;
 }
 .slide-leave-to,
-.slide-enter {
+.slide-enter-from {
 	transform: translateX(100%);
 }
 </style>
diff --git a/packages/editor-ui/src/composables/__tests__/__snapshots__/useContextMenu.test.ts.snap b/packages/editor-ui/src/composables/__tests__/__snapshots__/useContextMenu.test.ts.snap
new file mode 100644
index 0000000000000..ec9c211eacbdb
--- /dev/null
+++ b/packages/editor-ui/src/composables/__tests__/__snapshots__/useContextMenu.test.ts.snap
@@ -0,0 +1,507 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`useContextMenu > Read-only mode > should return the correct actions when right clicking a Node 1`] = `
+[
+  {
+    "id": "open",
+    "label": "Open...",
+    "shortcut": {
+      "keys": [
+        "↵",
+      ],
+    },
+  },
+  {
+    "disabled": true,
+    "id": "execute",
+    "label": "Test step",
+  },
+  {
+    "disabled": true,
+    "id": "rename",
+    "label": "Rename",
+    "shortcut": {
+      "keys": [
+        "F2",
+      ],
+    },
+  },
+  {
+    "disabled": true,
+    "id": "toggle_activation",
+    "label": "Deactivate",
+    "shortcut": {
+      "keys": [
+        "D",
+      ],
+    },
+  },
+  {
+    "disabled": true,
+    "id": "toggle_pin",
+    "label": "Pin",
+    "shortcut": {
+      "keys": [
+        "p",
+      ],
+    },
+  },
+  {
+    "id": "copy",
+    "label": "Copy",
+    "shortcut": {
+      "keys": [
+        "C",
+      ],
+      "metaKey": true,
+    },
+  },
+  {
+    "disabled": true,
+    "id": "duplicate",
+    "label": "Duplicate",
+    "shortcut": {
+      "keys": [
+        "D",
+      ],
+      "metaKey": true,
+    },
+  },
+  {
+    "disabled": false,
+    "divided": true,
+    "id": "select_all",
+    "label": "Select all",
+    "shortcut": {
+      "keys": [
+        "A",
+      ],
+      "metaKey": true,
+    },
+  },
+  {
+    "disabled": false,
+    "id": "deselect_all",
+    "label": "Clear selection",
+  },
+  {
+    "disabled": true,
+    "divided": true,
+    "id": "delete",
+    "label": "Delete",
+    "shortcut": {
+      "keys": [
+        "Del",
+      ],
+    },
+  },
+]
+`;
+
+exports[`useContextMenu > Read-only mode > should return the correct actions when right clicking a sticky 1`] = `
+[
+  {
+    "disabled": true,
+    "id": "open",
+    "label": "Edit sticky note",
+    "shortcut": {
+      "keys": [
+        "↵",
+      ],
+    },
+  },
+  {
+    "disabled": true,
+    "id": "change_color",
+    "label": "Change color",
+  },
+  {
+    "id": "copy",
+    "label": "Copy",
+    "shortcut": {
+      "keys": [
+        "C",
+      ],
+      "metaKey": true,
+    },
+  },
+  {
+    "disabled": true,
+    "id": "duplicate",
+    "label": "Duplicate",
+    "shortcut": {
+      "keys": [
+        "D",
+      ],
+      "metaKey": true,
+    },
+  },
+  {
+    "disabled": false,
+    "divided": true,
+    "id": "select_all",
+    "label": "Select all",
+    "shortcut": {
+      "keys": [
+        "A",
+      ],
+      "metaKey": true,
+    },
+  },
+  {
+    "disabled": false,
+    "id": "deselect_all",
+    "label": "Clear selection",
+  },
+  {
+    "disabled": true,
+    "divided": true,
+    "id": "delete",
+    "label": "Delete",
+    "shortcut": {
+      "keys": [
+        "Del",
+      ],
+    },
+  },
+]
+`;
+
+exports[`useContextMenu > should return the correct actions opening the menu from the button 1`] = `
+[
+  {
+    "id": "open",
+    "label": "Open...",
+    "shortcut": {
+      "keys": [
+        "↵",
+      ],
+    },
+  },
+  {
+    "disabled": false,
+    "id": "execute",
+    "label": "Test step",
+  },
+  {
+    "disabled": false,
+    "id": "rename",
+    "label": "Rename",
+    "shortcut": {
+      "keys": [
+        "F2",
+      ],
+    },
+  },
+  {
+    "disabled": false,
+    "id": "toggle_activation",
+    "label": "Deactivate",
+    "shortcut": {
+      "keys": [
+        "D",
+      ],
+    },
+  },
+  {
+    "disabled": true,
+    "id": "toggle_pin",
+    "label": "Pin",
+    "shortcut": {
+      "keys": [
+        "p",
+      ],
+    },
+  },
+  {
+    "id": "copy",
+    "label": "Copy",
+    "shortcut": {
+      "keys": [
+        "C",
+      ],
+      "metaKey": true,
+    },
+  },
+  {
+    "disabled": true,
+    "id": "duplicate",
+    "label": "Duplicate",
+    "shortcut": {
+      "keys": [
+        "D",
+      ],
+      "metaKey": true,
+    },
+  },
+  {
+    "disabled": false,
+    "divided": true,
+    "id": "select_all",
+    "label": "Select all",
+    "shortcut": {
+      "keys": [
+        "A",
+      ],
+      "metaKey": true,
+    },
+  },
+  {
+    "disabled": false,
+    "id": "deselect_all",
+    "label": "Clear selection",
+  },
+  {
+    "disabled": false,
+    "divided": true,
+    "id": "delete",
+    "label": "Delete",
+    "shortcut": {
+      "keys": [
+        "Del",
+      ],
+    },
+  },
+]
+`;
+
+exports[`useContextMenu > should return the correct actions when right clicking a Node 1`] = `
+[
+  {
+    "id": "open",
+    "label": "Open...",
+    "shortcut": {
+      "keys": [
+        "↵",
+      ],
+    },
+  },
+  {
+    "disabled": false,
+    "id": "execute",
+    "label": "Test step",
+  },
+  {
+    "disabled": false,
+    "id": "rename",
+    "label": "Rename",
+    "shortcut": {
+      "keys": [
+        "F2",
+      ],
+    },
+  },
+  {
+    "disabled": false,
+    "id": "toggle_activation",
+    "label": "Deactivate",
+    "shortcut": {
+      "keys": [
+        "D",
+      ],
+    },
+  },
+  {
+    "disabled": true,
+    "id": "toggle_pin",
+    "label": "Pin",
+    "shortcut": {
+      "keys": [
+        "p",
+      ],
+    },
+  },
+  {
+    "id": "copy",
+    "label": "Copy",
+    "shortcut": {
+      "keys": [
+        "C",
+      ],
+      "metaKey": true,
+    },
+  },
+  {
+    "disabled": true,
+    "id": "duplicate",
+    "label": "Duplicate",
+    "shortcut": {
+      "keys": [
+        "D",
+      ],
+      "metaKey": true,
+    },
+  },
+  {
+    "disabled": false,
+    "divided": true,
+    "id": "select_all",
+    "label": "Select all",
+    "shortcut": {
+      "keys": [
+        "A",
+      ],
+      "metaKey": true,
+    },
+  },
+  {
+    "disabled": false,
+    "id": "deselect_all",
+    "label": "Clear selection",
+  },
+  {
+    "disabled": false,
+    "divided": true,
+    "id": "delete",
+    "label": "Delete",
+    "shortcut": {
+      "keys": [
+        "Del",
+      ],
+    },
+  },
+]
+`;
+
+exports[`useContextMenu > should return the correct actions when right clicking a sticky 1`] = `
+[
+  {
+    "disabled": false,
+    "id": "open",
+    "label": "Edit sticky note",
+    "shortcut": {
+      "keys": [
+        "↵",
+      ],
+    },
+  },
+  {
+    "disabled": false,
+    "id": "change_color",
+    "label": "Change color",
+  },
+  {
+    "id": "copy",
+    "label": "Copy",
+    "shortcut": {
+      "keys": [
+        "C",
+      ],
+      "metaKey": true,
+    },
+  },
+  {
+    "disabled": true,
+    "id": "duplicate",
+    "label": "Duplicate",
+    "shortcut": {
+      "keys": [
+        "D",
+      ],
+      "metaKey": true,
+    },
+  },
+  {
+    "disabled": false,
+    "divided": true,
+    "id": "select_all",
+    "label": "Select all",
+    "shortcut": {
+      "keys": [
+        "A",
+      ],
+      "metaKey": true,
+    },
+  },
+  {
+    "disabled": false,
+    "id": "deselect_all",
+    "label": "Clear selection",
+  },
+  {
+    "disabled": false,
+    "divided": true,
+    "id": "delete",
+    "label": "Delete",
+    "shortcut": {
+      "keys": [
+        "Del",
+      ],
+    },
+  },
+]
+`;
+
+exports[`useContextMenu > should support opening and closing (default = right click on canvas) 1`] = `
+[
+  {
+    "disabled": false,
+    "id": "toggle_activation",
+    "label": "Deactivate 2 nodes",
+    "shortcut": {
+      "keys": [
+        "D",
+      ],
+    },
+  },
+  {
+    "disabled": true,
+    "id": "toggle_pin",
+    "label": "Pin 2 nodes",
+    "shortcut": {
+      "keys": [
+        "p",
+      ],
+    },
+  },
+  {
+    "id": "copy",
+    "label": "Copy 2 nodes",
+    "shortcut": {
+      "keys": [
+        "C",
+      ],
+      "metaKey": true,
+    },
+  },
+  {
+    "disabled": true,
+    "id": "duplicate",
+    "label": "Duplicate 2 nodes",
+    "shortcut": {
+      "keys": [
+        "D",
+      ],
+      "metaKey": true,
+    },
+  },
+  {
+    "disabled": false,
+    "divided": true,
+    "id": "select_all",
+    "label": "Select all",
+    "shortcut": {
+      "keys": [
+        "A",
+      ],
+      "metaKey": true,
+    },
+  },
+  {
+    "disabled": false,
+    "id": "deselect_all",
+    "label": "Clear selection",
+  },
+  {
+    "disabled": false,
+    "divided": true,
+    "id": "delete",
+    "label": "Delete 2 nodes",
+    "shortcut": {
+      "keys": [
+        "Del",
+      ],
+    },
+  },
+]
+`;
diff --git a/packages/editor-ui/src/composables/__tests__/useActiveNode.test.ts b/packages/editor-ui/src/composables/__tests__/useActiveNode.test.ts
new file mode 100644
index 0000000000000..883bab87d2d71
--- /dev/null
+++ b/packages/editor-ui/src/composables/__tests__/useActiveNode.test.ts
@@ -0,0 +1,43 @@
+import { describe, it, expect, vi } from 'vitest';
+import { useActiveNode } from '@/composables/useActiveNode';
+import { useNodeType } from '@/composables/useNodeType';
+import { createTestNode } from '@/__tests__/mocks';
+import { MANUAL_TRIGGER_NODE_TYPE } from '@/constants';
+import { computed } from 'vue';
+import { defaultMockNodeTypes } from '@/__tests__/defaults';
+
+const node = computed(() => createTestNode({ name: 'Node', type: MANUAL_TRIGGER_NODE_TYPE }));
+const nodeType = computed(() => defaultMockNodeTypes[MANUAL_TRIGGER_NODE_TYPE]);
+
+vi.mock('@/stores/ndv.store', () => ({
+	useNDVStore: vi.fn(() => ({
+		activeNode: node,
+	})),
+}));
+
+vi.mock('@/composables/useNodeType', () => ({
+	useNodeType: vi.fn(() => ({
+		nodeType,
+	})),
+}));
+
+vi.mock('pinia', () => ({
+	storeToRefs: vi.fn((store) => store),
+}));
+
+describe('useActiveNode()', () => {
+	it('should call useNodeType()', () => {
+		useActiveNode();
+
+		expect(useNodeType).toHaveBeenCalledWith({
+			node,
+		});
+	});
+
+	it('should return activeNode and activeNodeType', () => {
+		const { activeNode, activeNodeType } = useActiveNode();
+
+		expect(activeNode).toBe(node);
+		expect(activeNodeType).toBe(nodeType);
+	});
+});
diff --git a/packages/editor-ui/src/composables/__tests__/useAutocompleteTelemetry.test.ts b/packages/editor-ui/src/composables/__tests__/useAutocompleteTelemetry.test.ts
new file mode 100644
index 0000000000000..13df44088d3a1
--- /dev/null
+++ b/packages/editor-ui/src/composables/__tests__/useAutocompleteTelemetry.test.ts
@@ -0,0 +1,94 @@
+import { insertCompletionText, pickedCompletion } from '@codemirror/autocomplete';
+import { Compartment, EditorState } from '@codemirror/state';
+import { EditorView } from '@codemirror/view';
+import { createTestingPinia } from '@pinia/testing';
+import { waitFor } from '@testing-library/vue';
+import { setActivePinia } from 'pinia';
+import { beforeEach, describe, vi } from 'vitest';
+import { useAutocompleteTelemetry } from '../useAutocompleteTelemetry';
+
+const trackSpy = vi.fn();
+const setAutocompleteOnboardedSpy = vi.fn();
+
+vi.mock('@/composables/useTelemetry', () => ({
+	useTelemetry: vi.fn(() => ({ track: trackSpy })),
+}));
+
+vi.mock('@/stores/ndv.store', () => ({
+	useNDVStore: vi.fn(() => ({
+		activeNode: { type: 'n8n-nodes-base.test' },
+		setAutocompleteOnboarded: setAutocompleteOnboardedSpy,
+	})),
+}));
+
+vi.mock('@/stores/n8nRoot.store', () => ({
+	useRootStore: vi.fn(() => ({
+		instanceId: 'test-instance-id',
+	})),
+}));
+
+describe('useAutocompleteTelemetry', () => {
+	beforeEach(() => {
+		setActivePinia(createTestingPinia());
+	});
+
+	afterEach(() => {
+		vi.clearAllMocks();
+	});
+
+	const getEditor = (defaultDoc = '') => {
+		const extensionCompartment = new Compartment();
+		const state = EditorState.create({
+			doc: defaultDoc,
+			extensions: [extensionCompartment.of([])],
+		});
+		const editorRoot = document.createElement('div');
+		return {
+			editor: new EditorView({ parent: editorRoot, state }),
+			editorRoot,
+			compartment: extensionCompartment,
+		};
+	};
+
+	test('should track user autocomplete', async () => {
+		const { editor, compartment } = getEditor('$json.');
+		useAutocompleteTelemetry({
+			editor,
+			parameterPath: 'param',
+			compartment,
+		});
+
+		editor.dispatch({
+			...insertCompletionText(editor.state, 'foo', 6, 6),
+			annotations: pickedCompletion.of({ label: 'foo' }),
+		});
+
+		await waitFor(() =>
+			expect(trackSpy).toHaveBeenCalledWith('User autocompleted code', {
+				category: 'n/a',
+				context: '$json',
+				field_name: 'param',
+				field_type: 'expression',
+				inserted_text: 'foo',
+				instance_id: 'test-instance-id',
+				node_type: 'n8n-nodes-base.test',
+			}),
+		);
+	});
+
+	test('should mark user as onboarded on autocomplete', async () => {
+		const { editor, compartment } = getEditor();
+		useAutocompleteTelemetry({
+			editor,
+			parameterPath: 'param',
+			compartment,
+		});
+
+		editor.dispatch({
+			...insertCompletionText(editor.state, 'foo', 0, 0),
+			annotations: pickedCompletion.of({ label: 'foo' }),
+		});
+
+		await waitFor(() => expect(setAutocompleteOnboardedSpy).toHaveBeenCalled());
+	});
+});
diff --git a/packages/editor-ui/src/composables/__tests__/useCanvasPanning.test.ts b/packages/editor-ui/src/composables/__tests__/useCanvasPanning.test.ts
new file mode 100644
index 0000000000000..e45a3e646313e
--- /dev/null
+++ b/packages/editor-ui/src/composables/__tests__/useCanvasPanning.test.ts
@@ -0,0 +1,97 @@
+import type { Ref } from 'vue';
+import { ref } from 'vue';
+import { useCanvasPanning } from '@/composables/useCanvasPanning';
+import { getMousePosition } from '@/utils/nodeViewUtils';
+import { useUIStore } from '@/stores/ui.store';
+
+vi.mock('@/stores/ui.store', () => ({
+	useUIStore: vi.fn(() => ({
+		nodeViewOffsetPosition: [0, 0],
+		nodeViewMoveInProgress: false,
+		isActionActive: vi.fn(),
+	})),
+}));
+
+vi.mock('@/utils/nodeViewUtils', () => ({
+	getMousePosition: vi.fn(() => [0, 0]),
+}));
+
+describe('useCanvasPanning()', () => {
+	let element: HTMLElement;
+	let elementRef: Ref<null | HTMLElement>;
+
+	beforeEach(() => {
+		element = document.createElement('div');
+		element.id = 'node-view';
+		elementRef = ref(element);
+		document.body.appendChild(element);
+	});
+
+	afterEach(() => {
+		document.body.removeChild(element);
+	});
+
+	describe('onMouseDown()', () => {
+		it('should attach mousemove event listener on mousedown', () => {
+			const addEventListenerSpy = vi.spyOn(element, 'addEventListener');
+			const { onMouseDown, onMouseMove } = useCanvasPanning(elementRef);
+			const mouseEvent = new MouseEvent('mousedown', { button: 1 });
+
+			onMouseDown(mouseEvent, true);
+
+			expect(addEventListenerSpy).toHaveBeenCalledWith('mousemove', onMouseMove);
+		});
+	});
+
+	describe('onMouseMove()', () => {
+		it('should update node view position on mousemove', () => {
+			vi.mocked(getMousePosition).mockReturnValueOnce([0, 0]).mockReturnValueOnce([100, 100]);
+			const { onMouseDown, onMouseMove, moveLastPosition } = useCanvasPanning(elementRef);
+
+			expect(moveLastPosition.value).toEqual([0, 0]);
+
+			onMouseDown(new MouseEvent('mousedown', { button: 1 }), true);
+			onMouseMove(new MouseEvent('mousemove', { buttons: 4 }));
+
+			expect(moveLastPosition.value).toEqual([100, 100]);
+		});
+	});
+
+	describe('onMouseUp()', () => {
+		it('should remove mousemove event listener on mouseup', () => {
+			vi.mocked(useUIStore).mockReturnValueOnce({
+				nodeViewOffsetPosition: [0, 0],
+				nodeViewMoveInProgress: true,
+				isActionActive: vi.fn(),
+			} as unknown as ReturnType<typeof useUIStore>);
+
+			const removeEventListenerSpy = vi.spyOn(element, 'removeEventListener');
+			const { onMouseDown, onMouseMove, onMouseUp } = useCanvasPanning(elementRef);
+
+			onMouseDown(new MouseEvent('mousedown', { button: 1 }), true);
+			onMouseUp(new MouseEvent('mouseup'));
+
+			expect(removeEventListenerSpy).toHaveBeenCalledWith('mousemove', onMouseMove);
+		});
+	});
+
+	describe('panCanvas()', () => {
+		it('should update node view offset position correctly', () => {
+			vi.mocked(getMousePosition).mockReturnValueOnce([100, 100]);
+
+			const { panCanvas } = useCanvasPanning(elementRef);
+			const [x, y] = panCanvas(new MouseEvent('mousemove'));
+
+			expect(x).toEqual(100);
+			expect(y).toEqual(100);
+		});
+
+		it('should not update offset position if mouse is not moved', () => {
+			const { panCanvas } = useCanvasPanning(elementRef);
+			const [x, y] = panCanvas(new MouseEvent('mousemove'));
+
+			expect(x).toEqual(0);
+			expect(y).toEqual(0);
+		});
+	});
+});
diff --git a/packages/editor-ui/src/composables/__tests__/useClipboard.test.ts b/packages/editor-ui/src/composables/__tests__/useClipboard.test.ts
new file mode 100644
index 0000000000000..c3c150c0cccec
--- /dev/null
+++ b/packages/editor-ui/src/composables/__tests__/useClipboard.test.ts
@@ -0,0 +1,54 @@
+import { render } from '@testing-library/vue';
+import userEvent from '@testing-library/user-event';
+import { defineComponent, h, ref } from 'vue';
+import { useClipboard } from '@/composables/useClipboard';
+
+const testValue = 'This is a test';
+
+const TestComponent = defineComponent({
+	setup() {
+		const pasted = ref('');
+		const clipboard = useClipboard({
+			onPaste(data) {
+				pasted.value = data;
+			},
+		});
+
+		return () =>
+			h('div', [
+				h('button', {
+					'data-test-id': 'copy',
+					onClick: () => {
+						void clipboard.copy(testValue);
+					},
+				}),
+				h('div', { 'data-test-id': 'paste' }, pasted.value),
+			]);
+	},
+});
+
+describe('useClipboard()', () => {
+	beforeAll(() => {
+		userEvent.setup();
+	});
+
+	describe('copy()', () => {
+		it('should copy text value', async () => {
+			const { getByTestId } = render(TestComponent);
+
+			const copyButton = getByTestId('copy');
+			copyButton.click();
+			expect((window.navigator.clipboard as unknown as { items: string[] }).items).toHaveLength(1);
+		});
+	});
+
+	describe('onClipboardPasteEvent()', () => {
+		it('should trigger on clipboard paste event', async () => {
+			const { getByTestId } = render(TestComponent);
+
+			const pasteElement = getByTestId('paste');
+			await userEvent.paste(testValue);
+			expect(pasteElement.textContent).toEqual(testValue);
+		});
+	});
+});
diff --git a/packages/editor-ui/src/composables/__tests__/useContextMenu.test.ts b/packages/editor-ui/src/composables/__tests__/useContextMenu.test.ts
new file mode 100644
index 0000000000000..4ceff5ae45cbd
--- /dev/null
+++ b/packages/editor-ui/src/composables/__tests__/useContextMenu.test.ts
@@ -0,0 +1,145 @@
+import type { INodeUi } from '@/Interface';
+import { useContextMenu } from '@/composables/useContextMenu';
+import { BASIC_CHAIN_NODE_TYPE, NO_OP_NODE_TYPE, STICKY_NODE_TYPE } from '@/constants';
+import { faker } from '@faker-js/faker';
+import { createPinia, setActivePinia } from 'pinia';
+import { useSourceControlStore } from '@/stores/sourceControl.store';
+import { useUIStore } from '@/stores/ui.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { NodeHelpers } from 'n8n-workflow';
+
+const nodeFactory = (data: Partial<INodeUi> = {}): INodeUi => ({
+	id: faker.string.uuid(),
+	name: faker.word.words(3),
+	parameters: {},
+	position: [faker.number.int(), faker.number.int()],
+	type: NO_OP_NODE_TYPE,
+	typeVersion: 1,
+	...data,
+});
+
+describe('useContextMenu', () => {
+	let sourceControlStore: ReturnType<typeof useSourceControlStore>;
+	let uiStore: ReturnType<typeof useUIStore>;
+	let workflowsStore: ReturnType<typeof useWorkflowsStore>;
+	const nodes = [nodeFactory(), nodeFactory(), nodeFactory()];
+	const selectedNodes = nodes.slice(0, 2);
+
+	beforeAll(() => {
+		setActivePinia(createPinia());
+		sourceControlStore = useSourceControlStore();
+		vi.spyOn(sourceControlStore, 'preferences', 'get').mockReturnValue({
+			branchReadOnly: false,
+		} as never);
+
+		uiStore = useUIStore();
+		uiStore.selectedNodes = selectedNodes;
+		vi.spyOn(uiStore, 'isReadOnlyView', 'get').mockReturnValue(false);
+
+		workflowsStore = useWorkflowsStore();
+		workflowsStore.workflow.nodes = nodes;
+		vi.spyOn(workflowsStore, 'getCurrentWorkflow').mockReturnValue({
+			nodes,
+			getNode: (_: string) => {
+				return {};
+			},
+		} as never);
+
+		vi.spyOn(NodeHelpers, 'getNodeInputs').mockReturnValue([]);
+	});
+
+	afterEach(() => {
+		useContextMenu().close();
+		vi.clearAllMocks();
+	});
+
+	const mockEvent = new MouseEvent('contextmenu', { clientX: 500, clientY: 300 });
+
+	it('should support opening and closing (default = right click on canvas)', () => {
+		const { open, close, isOpen, actions, position, target, targetNodes } = useContextMenu();
+		expect(isOpen.value).toBe(false);
+		expect(actions.value).toEqual([]);
+		expect(position.value).toEqual([0, 0]);
+		expect(targetNodes.value).toEqual([]);
+
+		open(mockEvent);
+		expect(isOpen.value).toBe(true);
+		expect(useContextMenu().isOpen.value).toEqual(true);
+		expect(actions.value).toMatchSnapshot();
+		expect(position.value).toEqual([500, 300]);
+		expect(target.value).toEqual({ source: 'canvas' });
+		expect(targetNodes.value).toEqual(selectedNodes);
+
+		close();
+		expect(isOpen.value).toBe(false);
+		expect(useContextMenu().isOpen.value).toEqual(false);
+		expect(actions.value).toEqual([]);
+		expect(position.value).toEqual([0, 0]);
+		expect(targetNodes.value).toEqual([]);
+	});
+
+	it('should return the correct actions when right clicking a sticky', () => {
+		const { open, isOpen, actions, targetNodes } = useContextMenu();
+		const sticky = nodeFactory({ type: STICKY_NODE_TYPE });
+		open(mockEvent, { source: 'node-right-click', node: sticky });
+
+		expect(isOpen.value).toBe(true);
+		expect(actions.value).toMatchSnapshot();
+		expect(targetNodes.value).toEqual([sticky]);
+	});
+
+	it('should disable pinning for node that has other inputs then "main"', () => {
+		const { open, isOpen, actions, targetNodes } = useContextMenu();
+		const basicChain = nodeFactory({ type: BASIC_CHAIN_NODE_TYPE });
+		vi.spyOn(NodeHelpers, 'getConnectionTypes').mockReturnValue(['main', 'ai_languageModel']);
+		open(mockEvent, { source: 'node-right-click', node: basicChain });
+
+		expect(isOpen.value).toBe(true);
+		expect(actions.value.find((action) => action.id === 'toggle_pin')?.disabled).toBe(true);
+		expect(targetNodes.value).toEqual([basicChain]);
+	});
+
+	it('should return the correct actions when right clicking a Node', () => {
+		const { open, isOpen, actions, targetNodes } = useContextMenu();
+		const node = nodeFactory();
+		open(mockEvent, { source: 'node-right-click', node });
+
+		expect(isOpen.value).toBe(true);
+		expect(actions.value).toMatchSnapshot();
+		expect(targetNodes.value).toEqual([node]);
+	});
+
+	it('should return the correct actions opening the menu from the button', () => {
+		const { open, isOpen, actions, targetNodes } = useContextMenu();
+		const node = nodeFactory();
+		open(mockEvent, { source: 'node-button', node });
+
+		expect(isOpen.value).toBe(true);
+		expect(actions.value).toMatchSnapshot();
+		expect(targetNodes.value).toEqual([node]);
+	});
+
+	describe('Read-only mode', () => {
+		it('should return the correct actions when right clicking a sticky', () => {
+			vi.spyOn(uiStore, 'isReadOnlyView', 'get').mockReturnValue(true);
+			const { open, isOpen, actions, targetNodes } = useContextMenu();
+			const sticky = nodeFactory({ type: STICKY_NODE_TYPE });
+			open(mockEvent, { source: 'node-right-click', node: sticky });
+
+			expect(isOpen.value).toBe(true);
+			expect(actions.value).toMatchSnapshot();
+			expect(targetNodes.value).toEqual([sticky]);
+		});
+
+		it('should return the correct actions when right clicking a Node', () => {
+			vi.spyOn(uiStore, 'isReadOnlyView', 'get').mockReturnValue(true);
+			const { open, isOpen, actions, targetNodes } = useContextMenu();
+			const node = nodeFactory();
+			open(mockEvent, { source: 'node-right-click', node });
+
+			expect(isOpen.value).toBe(true);
+			expect(actions.value).toMatchSnapshot();
+			expect(targetNodes.value).toEqual([node]);
+		});
+	});
+});
diff --git a/packages/editor-ui/src/composables/__tests__/useDataSchema.test.ts b/packages/editor-ui/src/composables/__tests__/useDataSchema.test.ts
new file mode 100644
index 0000000000000..8ec6ce8283559
--- /dev/null
+++ b/packages/editor-ui/src/composables/__tests__/useDataSchema.test.ts
@@ -0,0 +1,355 @@
+import jp from 'jsonpath';
+import { useDataSchema } from '@/composables/useDataSchema';
+import type { Schema } from '@/Interface';
+
+describe('useDataSchema', () => {
+	const getSchema = useDataSchema().getSchema;
+	describe('getSchema', () => {
+		test.each([
+			[, { type: 'undefined', value: 'undefined', path: '' }],
+			[undefined, { type: 'undefined', value: 'undefined', path: '' }],
+			[null, { type: 'null', value: '[null]', path: '' }],
+			['John', { type: 'string', value: 'John', path: '' }],
+			['123', { type: 'string', value: '123', path: '' }],
+			[123, { type: 'number', value: '123', path: '' }],
+			[true, { type: 'boolean', value: 'true', path: '' }],
+			[false, { type: 'boolean', value: 'false', path: '' }],
+			[() => {}, { type: 'function', value: '', path: '' }],
+			[{}, { type: 'object', value: [], path: '' }],
+			[[], { type: 'array', value: [], path: '' }],
+			[
+				new Date('2022-11-22T00:00:00.000Z'),
+				{ type: 'string', value: '2022-11-22T00:00:00.000Z', path: '' },
+			],
+			[Symbol('x'), { type: 'symbol', value: 'Symbol(x)', path: '' }],
+			[1n, { type: 'bigint', value: '1', path: '' }],
+			[
+				['John', 1, true],
+				{
+					type: 'array',
+					value: [
+						{ type: 'string', value: 'John', key: '0', path: '[0]' },
+						{ type: 'number', value: '1', key: '1', path: '[1]' },
+						{ type: 'boolean', value: 'true', key: '2', path: '[2]' },
+					],
+					path: '',
+				},
+			],
+			[
+				{ people: ['Joe', 'John'] },
+				{
+					type: 'object',
+					value: [
+						{
+							type: 'array',
+							key: 'people',
+							value: [
+								{ type: 'string', value: 'Joe', key: '0', path: '.people[0]' },
+								{ type: 'string', value: 'John', key: '1', path: '.people[1]' },
+							],
+							path: '.people',
+						},
+					],
+					path: '',
+				},
+			],
+			[
+				{ 'with space': [], 'with.dot': 'test' },
+				{
+					type: 'object',
+					value: [
+						{
+							type: 'array',
+							key: 'with space',
+							value: [],
+							path: "['with space']",
+						},
+						{
+							type: 'string',
+							key: 'with.dot',
+							value: 'test',
+							path: "['with.dot']",
+						},
+					],
+					path: '',
+				},
+			],
+			[
+				[
+					{ name: 'John', age: 22 },
+					{ name: 'Joe', age: 33 },
+				],
+				{
+					type: 'array',
+					value: [
+						{
+							type: 'object',
+							key: '0',
+							value: [
+								{ type: 'string', key: 'name', value: 'John', path: '[0].name' },
+								{ type: 'number', key: 'age', value: '22', path: '[0].age' },
+							],
+							path: '[0]',
+						},
+						{
+							type: 'object',
+							key: '1',
+							value: [
+								{ type: 'string', key: 'name', value: 'Joe', path: '[1].name' },
+								{ type: 'number', key: 'age', value: '33', path: '[1].age' },
+							],
+							path: '[1]',
+						},
+					],
+					path: '',
+				},
+			],
+			[
+				[
+					{ name: 'John', age: 22, hobbies: ['surfing', 'traveling'] },
+					{ name: 'Joe', age: 33, hobbies: ['skateboarding', 'gaming'] },
+				],
+				{
+					type: 'array',
+					value: [
+						{
+							type: 'object',
+							key: '0',
+							value: [
+								{ type: 'string', key: 'name', value: 'John', path: '[0].name' },
+								{ type: 'number', key: 'age', value: '22', path: '[0].age' },
+								{
+									type: 'array',
+									key: 'hobbies',
+									value: [
+										{ type: 'string', key: '0', value: 'surfing', path: '[0].hobbies[0]' },
+										{ type: 'string', key: '1', value: 'traveling', path: '[0].hobbies[1]' },
+									],
+									path: '[0].hobbies',
+								},
+							],
+							path: '[0]',
+						},
+						{
+							type: 'object',
+							key: '1',
+							value: [
+								{ type: 'string', key: 'name', value: 'Joe', path: '[1].name' },
+								{ type: 'number', key: 'age', value: '33', path: '[1].age' },
+								{
+									type: 'array',
+									key: 'hobbies',
+									value: [
+										{ type: 'string', key: '0', value: 'skateboarding', path: '[1].hobbies[0]' },
+										{ type: 'string', key: '1', value: 'gaming', path: '[1].hobbies[1]' },
+									],
+									path: '[1].hobbies',
+								},
+							],
+							path: '[1]',
+						},
+					],
+					path: '',
+				},
+			],
+			[[], { type: 'array', value: [], path: '' }],
+			[
+				[[1, 2]],
+				{
+					type: 'array',
+					value: [
+						{
+							type: 'array',
+							key: '0',
+							value: [
+								{ type: 'number', key: '0', value: '1', path: '[0][0]' },
+								{ type: 'number', key: '1', value: '2', path: '[0][1]' },
+							],
+							path: '[0]',
+						},
+					],
+					path: '',
+				},
+			],
+			[
+				[
+					[
+						{ name: 'John', age: 22 },
+						{ name: 'Joe', age: 33 },
+					],
+				],
+				{
+					type: 'array',
+					value: [
+						{
+							type: 'array',
+							key: '0',
+							value: [
+								{
+									type: 'object',
+									key: '0',
+									value: [
+										{ type: 'string', key: 'name', value: 'John', path: '[0][0].name' },
+										{ type: 'number', key: 'age', value: '22', path: '[0][0].age' },
+									],
+									path: '[0][0]',
+								},
+								{
+									type: 'object',
+									key: '1',
+									value: [
+										{ type: 'string', key: 'name', value: 'Joe', path: '[0][1].name' },
+										{ type: 'number', key: 'age', value: '33', path: '[0][1].age' },
+									],
+									path: '[0][1]',
+								},
+							],
+							path: '[0]',
+						},
+					],
+					path: '',
+				},
+			],
+			[
+				[
+					{
+						dates: [
+							[new Date('2022-11-22T00:00:00.000Z'), new Date('2022-11-23T00:00:00.000Z')],
+							[new Date('2022-12-22T00:00:00.000Z'), new Date('2022-12-23T00:00:00.000Z')],
+						],
+					},
+				],
+				{
+					type: 'array',
+					value: [
+						{
+							type: 'object',
+							key: '0',
+							value: [
+								{
+									type: 'array',
+									key: 'dates',
+									value: [
+										{
+											type: 'array',
+											key: '0',
+											value: [
+												{
+													type: 'string',
+													key: '0',
+													value: '2022-11-22T00:00:00.000Z',
+													path: '[0].dates[0][0]',
+												},
+												{
+													type: 'string',
+													key: '1',
+													value: '2022-11-23T00:00:00.000Z',
+													path: '[0].dates[0][1]',
+												},
+											],
+											path: '[0].dates[0]',
+										},
+										{
+											type: 'array',
+											key: '1',
+											value: [
+												{
+													type: 'string',
+													key: '0',
+													value: '2022-12-22T00:00:00.000Z',
+													path: '[0].dates[1][0]',
+												},
+												{
+													type: 'string',
+													key: '1',
+													value: '2022-12-23T00:00:00.000Z',
+													path: '[0].dates[1][1]',
+												},
+											],
+											path: '[0].dates[1]',
+										},
+									],
+									path: '[0].dates',
+								},
+							],
+							path: '[0]',
+						},
+					],
+					path: '',
+				},
+			],
+		])('should return the correct json schema for %s', (input, schema) => {
+			expect(getSchema(input)).toEqual(schema);
+		});
+
+		it('should return the correct data when using the generated json path on an object', () => {
+			const input = { people: ['Joe', 'John'] };
+			const schema = getSchema(input);
+			const pathData = jp.query(
+				input,
+				`$${((schema.value as Schema[])[0].value as Schema[])[0].path}`,
+			);
+			expect(pathData).toEqual(['Joe']);
+		});
+
+		it('should return the correct data when using the generated json path on a list', () => {
+			const input = [
+				{ name: 'John', age: 22, hobbies: ['surfing', 'traveling'] },
+				{ name: 'Joe', age: 33, hobbies: ['skateboarding', 'gaming'] },
+			];
+			const schema = getSchema(input);
+			const pathData = jp.query(
+				input,
+				`$${(((schema.value as Schema[])[0].value as Schema[])[2].value as Schema[])[1].path}`,
+			);
+			expect(pathData).toEqual(['traveling']);
+		});
+
+		it('should return the correct data when using the generated json path on a list of list', () => {
+			const input = [[1, 2]];
+			const schema = getSchema(input);
+			const pathData = jp.query(
+				input,
+				`$${((schema.value as Schema[])[0].value as Schema[])[1].path}`,
+			);
+			expect(pathData).toEqual([2]);
+		});
+
+		it('should return the correct data when using the generated json path on a list of list of objects', () => {
+			const input = [
+				[
+					{ name: 'John', age: 22 },
+					{ name: 'Joe', age: 33 },
+				],
+			];
+			const schema = getSchema(input);
+			const pathData = jp.query(
+				input,
+				`$${(((schema.value as Schema[])[0].value as Schema[])[1].value as Schema[])[1].path}`,
+			);
+			expect(pathData).toEqual([33]);
+		});
+
+		it('should return the correct data when using the generated json path on a list of objects with a list of date tuples', () => {
+			const input = [
+				{
+					dates: [
+						[new Date('2022-11-22T00:00:00.000Z'), new Date('2022-11-23T00:00:00.000Z')],
+						[new Date('2022-12-22T00:00:00.000Z'), new Date('2022-12-23T00:00:00.000Z')],
+					],
+				},
+			];
+			const schema = getSchema(input);
+			const pathData = jp.query(
+				input,
+				`$${
+					(
+						(((schema.value as Schema[])[0].value as Schema[])[0].value as Schema[])[0]
+							.value as Schema[]
+					)[0].path
+				}`,
+			);
+			expect(pathData).toEqual([new Date('2022-11-22T00:00:00.000Z')]);
+		});
+	});
+});
diff --git a/packages/editor-ui/src/composables/__tests__/useDebounce.test.ts b/packages/editor-ui/src/composables/__tests__/useDebounce.test.ts
index 7de407d96aab2..ea342da77aa91 100644
--- a/packages/editor-ui/src/composables/__tests__/useDebounce.test.ts
+++ b/packages/editor-ui/src/composables/__tests__/useDebounce.test.ts
@@ -1,8 +1,8 @@
 import { vi, describe, it, expect } from 'vitest';
-import { useDebounceHelper } from '../useDebounce';
+import { useDebounce } from '../useDebounce';
 import { render, screen } from '@testing-library/vue';
 
-describe('useDebounceHelper', () => {
+describe('useDebounce()', () => {
 	const debounceTime = 500;
 
 	const TestComponent = {
@@ -24,7 +24,7 @@ describe('useDebounceHelper', () => {
 		},
 		setup() {
 			vitest.useFakeTimers();
-			const { callDebounced } = useDebounceHelper();
+			const { callDebounced } = useDebounce();
 			return {
 				callDebounced,
 				debounceTime,
diff --git a/packages/editor-ui/src/composables/__tests__/useExecutionHelpers.test.ts b/packages/editor-ui/src/composables/__tests__/useExecutionHelpers.test.ts
new file mode 100644
index 0000000000000..550f20adefe9d
--- /dev/null
+++ b/packages/editor-ui/src/composables/__tests__/useExecutionHelpers.test.ts
@@ -0,0 +1,50 @@
+import { useExecutionHelpers } from '@/composables/useExecutionHelpers';
+import type { ExecutionSummary } from 'n8n-workflow';
+import { i18n } from '@/plugins/i18n';
+import { convertToDisplayDate } from '@/utils/formatters/dateFormatter';
+
+describe('useExecutionHelpers()', () => {
+	describe('getUIDetails()', () => {
+		it.each([
+			['waiting', 'waiting', i18n.baseText('executionsList.waiting')],
+			['canceled', 'unknown', i18n.baseText('executionsList.canceled')],
+			['running', 'running', i18n.baseText('executionsList.running')],
+			['new', 'running', i18n.baseText('executionsList.running')],
+			['success', 'success', i18n.baseText('executionsList.succeeded')],
+			['error', 'error', i18n.baseText('executionsList.error')],
+			['crashed', 'error', i18n.baseText('executionsList.error')],
+			[undefined, 'unknown', 'Status unknown'],
+		])(
+			'should return %s status name %s and label %s based on execution status',
+			async (status, expectedName, expectedLabel) => {
+				const date = new Date();
+				const execution = {
+					id: '1',
+					startedAt: date,
+					stoppedAt: date,
+					status,
+				};
+				const { getUIDetails } = useExecutionHelpers();
+				const uiDetails = getUIDetails(execution as ExecutionSummary);
+
+				expect(uiDetails.name).toEqual(expectedName);
+				expect(uiDetails.label).toEqual(expectedLabel);
+				expect(uiDetails.runningTime).toEqual('0s');
+			},
+		);
+	});
+
+	describe('formatDate()', () => {
+		it('should return formatted date', async () => {
+			const { formatDate } = useExecutionHelpers();
+			const fullDate = new Date();
+			const { date, time } = convertToDisplayDate(fullDate);
+
+			expect(formatDate(fullDate)).toEqual(
+				i18n.baseText('executionsList.started', {
+					interpolate: { time, date },
+				}),
+			);
+		});
+	});
+});
diff --git a/packages/editor-ui/src/composables/__tests__/useExpressionEditor.test.ts b/packages/editor-ui/src/composables/__tests__/useExpressionEditor.test.ts
new file mode 100644
index 0000000000000..916b80952559e
--- /dev/null
+++ b/packages/editor-ui/src/composables/__tests__/useExpressionEditor.test.ts
@@ -0,0 +1,251 @@
+import * as workflowHelpers from '@/composables/useWorkflowHelpers';
+import { EditorView } from '@codemirror/view';
+import { createTestingPinia } from '@pinia/testing';
+import { waitFor } from '@testing-library/vue';
+import { setActivePinia } from 'pinia';
+import { beforeEach, describe, vi } from 'vitest';
+import { ref, toValue } from 'vue';
+import { n8nLang } from '../../plugins/codemirror/n8nLang';
+import { useExpressionEditor } from '../useExpressionEditor';
+import { useRouter } from 'vue-router';
+import { EditorSelection } from '@codemirror/state';
+
+vi.mock('@/composables/useAutocompleteTelemetry', () => ({
+	useAutocompleteTelemetry: vi.fn(),
+}));
+
+vi.mock('@/stores/ndv.store', () => ({
+	useNDVStore: vi.fn(() => ({
+		activeNode: { type: 'n8n-nodes-base.test' },
+	})),
+}));
+
+describe('useExpressionEditor', () => {
+	const mockResolveExpression = () => {
+		const mock = vi.fn();
+		vi.spyOn(workflowHelpers, 'useWorkflowHelpers').mockReturnValueOnce({
+			...workflowHelpers.useWorkflowHelpers({ router: useRouter() }),
+			resolveExpression: mock,
+		});
+
+		return mock;
+	};
+
+	beforeEach(() => {
+		setActivePinia(createTestingPinia());
+	});
+
+	afterEach(() => {
+		vi.clearAllMocks();
+	});
+
+	test('should create an editor', async () => {
+		const root = ref<HTMLElement>();
+		const { editor } = useExpressionEditor({
+			editorRef: root,
+		});
+
+		root.value = document.createElement('div');
+
+		await waitFor(() => expect(toValue(editor)).toBeInstanceOf(EditorView));
+	});
+
+	test('should calculate segments', async () => {
+		mockResolveExpression().mockReturnValueOnce(15);
+		const root = ref<HTMLElement>();
+		const { segments } = useExpressionEditor({
+			editorRef: root,
+			editorValue: 'before {{ $json.test.length }} after',
+			extensions: [n8nLang()],
+		});
+
+		root.value = document.createElement('div');
+
+		await waitFor(() => {
+			expect(toValue(segments.all)).toEqual([
+				{
+					from: 0,
+					kind: 'plaintext',
+					plaintext: 'before ',
+					to: 7,
+				},
+				{
+					error: null,
+					from: 7,
+					kind: 'resolvable',
+					resolvable: '{{ $json.test.length }}',
+					resolved: '15',
+					state: 'valid',
+					to: 30,
+				},
+				{
+					from: 30,
+					kind: 'plaintext',
+					plaintext: ' after',
+					to: 36,
+				},
+			]);
+
+			expect(toValue(segments.resolvable)).toEqual([
+				{
+					error: null,
+					from: 7,
+					kind: 'resolvable',
+					resolvable: '{{ $json.test.length }}',
+					resolved: '15',
+					state: 'valid',
+					to: 30,
+				},
+			]);
+
+			expect(toValue(segments.plaintext)).toEqual([
+				{
+					from: 0,
+					kind: 'plaintext',
+					plaintext: 'before ',
+					to: 7,
+				},
+				{
+					from: 30,
+					kind: 'plaintext',
+					plaintext: ' after',
+					to: 36,
+				},
+			]);
+		});
+	});
+
+	describe('readEditorValue()', () => {
+		test('should return the full editor value (unresolved)', async () => {
+			mockResolveExpression().mockReturnValueOnce(15);
+			const root = ref<HTMLElement>();
+			const { readEditorValue } = useExpressionEditor({
+				editorRef: root,
+				editorValue: 'before {{ $json.test.length }} after',
+				extensions: [n8nLang()],
+			});
+
+			root.value = document.createElement('div');
+
+			await waitFor(() =>
+				expect(readEditorValue()).toEqual('before {{ $json.test.length }} after'),
+			);
+		});
+	});
+
+	describe('setCursorPosition()', () => {
+		test('should set cursor position to number correctly', async () => {
+			const root = ref<HTMLElement>();
+			const editorValue = 'text here';
+			const { editor, setCursorPosition } = useExpressionEditor({
+				editorRef: root,
+				editorValue,
+				extensions: [],
+			});
+
+			root.value = document.createElement('div');
+			await waitFor(() => toValue(editor));
+			setCursorPosition(4);
+
+			await waitFor(() =>
+				expect(toValue(editor)?.state.selection).toEqual(EditorSelection.single(4)),
+			);
+		});
+
+		test('should set cursor position to end correctly', async () => {
+			const root = ref<HTMLElement>();
+			const editorValue = 'text here';
+			const correctPosition = editorValue.length;
+			const { editor, setCursorPosition } = useExpressionEditor({
+				editorRef: root,
+				editorValue,
+				extensions: [],
+			});
+
+			root.value = document.createElement('div');
+			await waitFor(() => toValue(editor));
+			setCursorPosition('end');
+
+			await waitFor(() =>
+				expect(toValue(editor)?.state.selection).toEqual(EditorSelection.single(correctPosition)),
+			);
+		});
+
+		test('should set cursor position to last expression correctly', async () => {
+			const root = ref<HTMLElement>();
+			const editorValue = 'text {{ $json.foo }} {{ $json.bar }} here';
+			const correctPosition = editorValue.indexOf('bar') + 'bar'.length;
+			const { editor, setCursorPosition } = useExpressionEditor({
+				editorRef: root,
+				editorValue,
+				extensions: [n8nLang()],
+			});
+
+			root.value = document.createElement('div');
+			await waitFor(() => toValue(editor));
+			setCursorPosition('lastExpression');
+
+			await waitFor(() =>
+				expect(toValue(editor)?.state.selection).toEqual(EditorSelection.single(correctPosition)),
+			);
+		});
+	});
+
+	describe('select()', () => {
+		test('should select number range', async () => {
+			const root = ref<HTMLElement>();
+			const editorValue = 'text here';
+			const { editor, select } = useExpressionEditor({
+				editorRef: root,
+				editorValue,
+				extensions: [],
+			});
+
+			root.value = document.createElement('div');
+			await waitFor(() => toValue(editor));
+			select(4, 7);
+
+			await waitFor(() =>
+				expect(toValue(editor)?.state.selection).toEqual(EditorSelection.single(4, 7)),
+			);
+		});
+
+		test('should select until end', async () => {
+			const root = ref<HTMLElement>();
+			const editorValue = 'text here';
+			const { editor, select } = useExpressionEditor({
+				editorRef: root,
+				editorValue,
+				extensions: [],
+			});
+
+			root.value = document.createElement('div');
+			await waitFor(() => toValue(editor));
+			select(4, 'end');
+
+			await waitFor(() =>
+				expect(toValue(editor)?.state.selection).toEqual(EditorSelection.single(4, 9)),
+			);
+		});
+	});
+
+	describe('selectAll()', () => {
+		test('should select all', async () => {
+			const root = ref<HTMLElement>();
+			const editorValue = 'text here';
+			const { editor, selectAll } = useExpressionEditor({
+				editorRef: root,
+				editorValue,
+				extensions: [],
+			});
+
+			root.value = document.createElement('div');
+			await waitFor(() => toValue(editor));
+			selectAll();
+
+			await waitFor(() =>
+				expect(toValue(editor)?.state.selection).toEqual(EditorSelection.single(0, 9)),
+			);
+		});
+	});
+});
diff --git a/packages/editor-ui/src/composables/__tests__/useHistoryHelper.test.ts b/packages/editor-ui/src/composables/__tests__/useHistoryHelper.test.ts
index 069b2f30b7196..304902aed26bf 100644
--- a/packages/editor-ui/src/composables/__tests__/useHistoryHelper.test.ts
+++ b/packages/editor-ui/src/composables/__tests__/useHistoryHelper.test.ts
@@ -8,13 +8,13 @@ import type { Route } from 'vue-router';
 
 const undoMock = vi.fn();
 const redoMock = vi.fn();
-vi.mock('@/stores/ndv', () => ({
+vi.mock('@/stores/ndv.store', () => ({
 	useNDVStore: () => ({
 		activeNodeName: null,
 		activeNode: {},
 	}),
 }));
-vi.mock('@/stores/history', () => {
+vi.mock('@/stores/history.store', () => {
 	return {
 		useHistoryStore: () => ({
 			popUndoableToUndo: undoMock,
@@ -22,9 +22,16 @@ vi.mock('@/stores/history', () => {
 		}),
 	};
 });
-vi.mock('@/stores/ui');
-vi.mock('vue-router/composables', () => ({
+vi.mock('@/stores/ui.store', () => {
+	return {
+		useUIStore: () => ({
+			isAnyModalOpen: false,
+		}),
+	};
+});
+vi.mock('vue-router', () => ({
 	useRoute: () => ({}),
+	RouterLink: vi.fn(),
 }));
 
 const TestComponent = defineComponent({
diff --git a/packages/editor-ui/src/composables/__tests__/useNodeHelpers.test.ts b/packages/editor-ui/src/composables/__tests__/useNodeHelpers.test.ts
new file mode 100644
index 0000000000000..1969b3d5b8192
--- /dev/null
+++ b/packages/editor-ui/src/composables/__tests__/useNodeHelpers.test.ts
@@ -0,0 +1,182 @@
+import { setActivePinia } from 'pinia';
+import { createTestingPinia } from '@pinia/testing';
+import { useNodeHelpers } from '@/composables/useNodeHelpers';
+import { createTestNode } from '@/__tests__/mocks';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+
+vi.mock('@/stores/workflows.store', () => ({
+	useWorkflowsStore: vi.fn(),
+}));
+
+describe('useNodeHelpers()', () => {
+	beforeAll(() => {
+		setActivePinia(createTestingPinia());
+	});
+
+	afterEach(() => {
+		vi.clearAllMocks();
+	});
+
+	describe('getNodeInputData()', () => {
+		it('should return an empty array when node is null', () => {
+			const { getNodeInputData } = useNodeHelpers();
+
+			const result = getNodeInputData(null);
+			expect(result).toEqual([]);
+		});
+
+		it('should return an empty array when workflowsStore.getWorkflowExecution() is null', () => {
+			vi.mocked(useWorkflowsStore).mockReturnValue({
+				getWorkflowExecution: null,
+			} as ReturnType<typeof useWorkflowsStore>);
+			const { getNodeInputData } = useNodeHelpers();
+			const node = createTestNode({
+				name: 'test',
+				type: 'test',
+			});
+
+			const result = getNodeInputData(node);
+			expect(result).toEqual([]);
+		});
+
+		it('should return an empty array when workflowsStore.getWorkflowExecution() is null', () => {
+			vi.mocked(useWorkflowsStore).mockReturnValue({
+				getWorkflowExecution: null,
+			} as ReturnType<typeof useWorkflowsStore>);
+			const { getNodeInputData } = useNodeHelpers();
+			const node = createTestNode({
+				name: 'test',
+				type: 'test',
+			});
+
+			const result = getNodeInputData(node);
+			expect(result).toEqual([]);
+		});
+
+		it('should return an empty array when resultData is not available', () => {
+			vi.mocked(useWorkflowsStore).mockReturnValue({
+				getWorkflowExecution: {
+					data: {
+						resultData: null,
+					},
+				},
+			} as unknown as ReturnType<typeof useWorkflowsStore>);
+			const { getNodeInputData } = useNodeHelpers();
+			const node = createTestNode({
+				name: 'test',
+				type: 'test',
+			});
+
+			const result = getNodeInputData(node);
+			expect(result).toEqual([]);
+		});
+
+		it('should return an empty array when taskData is unavailable', () => {
+			const nodeName = 'Code';
+			vi.mocked(useWorkflowsStore).mockReturnValue({
+				getWorkflowExecution: {
+					data: {
+						resultData: {
+							runData: {
+								[nodeName]: [],
+							},
+						},
+					},
+				},
+			} as unknown as ReturnType<typeof useWorkflowsStore>);
+			const { getNodeInputData } = useNodeHelpers();
+			const node = createTestNode({
+				name: nodeName,
+				type: 'test',
+			});
+
+			const result = getNodeInputData(node);
+			expect(result).toEqual([]);
+		});
+
+		it('should return an empty array when taskData.data is unavailable', () => {
+			const nodeName = 'Code';
+			vi.mocked(useWorkflowsStore).mockReturnValue({
+				getWorkflowExecution: {
+					data: {
+						resultData: {
+							runData: {
+								[nodeName]: [{ data: undefined }],
+							},
+						},
+					},
+				},
+			} as unknown as ReturnType<typeof useWorkflowsStore>);
+			const { getNodeInputData } = useNodeHelpers();
+			const node = createTestNode({
+				name: nodeName,
+				type: 'test',
+			});
+
+			const result = getNodeInputData(node);
+			expect(result).toEqual([]);
+		});
+
+		it('should return input data from inputOverride', () => {
+			const nodeName = 'Code';
+			const data = { hello: 'world' };
+			vi.mocked(useWorkflowsStore).mockReturnValue({
+				getWorkflowExecution: {
+					data: {
+						resultData: {
+							runData: {
+								[nodeName]: [
+									{
+										inputOverride: {
+											main: [data],
+										},
+									},
+								],
+							},
+						},
+					},
+				},
+			} as unknown as ReturnType<typeof useWorkflowsStore>);
+			const { getNodeInputData } = useNodeHelpers();
+			const node = createTestNode({
+				name: nodeName,
+				type: 'test',
+			});
+
+			const result = getNodeInputData(node, 0, 0, 'input');
+			expect(result).toEqual(data);
+		});
+
+		it.each(['example', 'example.withdot', 'example.with.dots', 'example.with.dots and spaces'])(
+			'should return input data for "%s" node name, with given connection type and output index',
+			(nodeName) => {
+				const data = { hello: 'world' };
+				vi.mocked(useWorkflowsStore).mockReturnValue({
+					getWorkflowExecution: {
+						data: {
+							resultData: {
+								runData: {
+									[nodeName]: [
+										{
+											data: {
+												main: [data],
+											},
+										},
+									],
+								},
+							},
+						},
+					},
+				} as unknown as ReturnType<typeof useWorkflowsStore>);
+				const { getNodeInputData } = useNodeHelpers();
+				const node = createTestNode({
+					name: nodeName,
+					type: 'test',
+				});
+
+				const result = getNodeInputData(node);
+				expect(result).toEqual(data);
+			},
+		);
+	});
+});
diff --git a/packages/editor-ui/src/composables/__tests__/useNodeType.test.ts b/packages/editor-ui/src/composables/__tests__/useNodeType.test.ts
new file mode 100644
index 0000000000000..1cd25c7864836
--- /dev/null
+++ b/packages/editor-ui/src/composables/__tests__/useNodeType.test.ts
@@ -0,0 +1,51 @@
+import { describe, it, expect, vi } from 'vitest';
+import { useNodeType } from '@/composables/useNodeType';
+import type { INodeUi, SimplifiedNodeType } from '@/Interface'; // Adjust the path accordingly
+
+vi.mock('@/stores/nodeTypes.store', () => ({
+	useNodeTypesStore: vi.fn(() => ({
+		getNodeType: vi.fn().mockImplementation((type, version) => ({ type, version })),
+	})),
+}));
+
+describe('useNodeType()', () => {
+	describe('nodeType', () => {
+		it('returns correct nodeType from nodeType option', () => {
+			const nodeTypeOption = { name: 'testNodeType' } as SimplifiedNodeType;
+			const { nodeType } = useNodeType({ nodeType: nodeTypeOption });
+
+			expect(nodeType.value).toEqual(nodeTypeOption);
+		});
+
+		it('returns correct nodeType from node option', () => {
+			const nodeOption = { type: 'testType', typeVersion: 1 } as INodeUi;
+			const { nodeType } = useNodeType({ node: nodeOption });
+
+			expect(nodeType.value).toEqual({ type: 'testType', version: 1 });
+		});
+	});
+
+	describe('isSubNodeType', () => {
+		it('identifies sub node type correctly', () => {
+			const nodeTypeOption = {
+				name: 'testNodeType',
+				outputs: ['Main', 'Other'],
+			} as unknown as SimplifiedNodeType;
+			const { isSubNodeType } = useNodeType({ nodeType: nodeTypeOption });
+
+			expect(isSubNodeType.value).toBe(true);
+		});
+	});
+
+	describe('isMultipleOutputsNodeType', () => {
+		it('identifies multiple outputs node type correctly', () => {
+			const nodeTypeOption = {
+				name: 'testNodeType',
+				outputs: ['Main', 'Other'],
+			} as unknown as SimplifiedNodeType;
+			const { isMultipleOutputsNodeType } = useNodeType({ nodeType: nodeTypeOption });
+
+			expect(isMultipleOutputsNodeType.value).toBe(true);
+		});
+	});
+});
diff --git a/packages/editor-ui/src/composables/__tests__/usePinnedData.test.ts b/packages/editor-ui/src/composables/__tests__/usePinnedData.test.ts
new file mode 100644
index 0000000000000..499c3714965a0
--- /dev/null
+++ b/packages/editor-ui/src/composables/__tests__/usePinnedData.test.ts
@@ -0,0 +1,136 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { setActivePinia, createPinia } from 'pinia';
+import { ref } from 'vue';
+import { usePinnedData } from '@/composables/usePinnedData';
+import type { INodeUi } from '@/Interface';
+import { MAX_PINNED_DATA_SIZE } from '@/constants';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useTelemetry } from '@/composables/useTelemetry';
+
+vi.mock('@/composables/useToast', () => ({ useToast: vi.fn(() => ({ showError: vi.fn() })) }));
+vi.mock('@/composables/useI18n', () => ({
+	useI18n: vi.fn(() => ({ baseText: vi.fn((key) => key) })),
+}));
+vi.mock('@/composables/useExternalHooks', () => ({
+	useExternalHooks: vi.fn(() => ({
+		run: vi.fn(),
+	})),
+}));
+
+describe('usePinnedData', () => {
+	beforeEach(() => {
+		setActivePinia(createPinia());
+	});
+
+	describe('isValidJSON()', () => {
+		it('should return true for valid JSON', () => {
+			const { isValidJSON } = usePinnedData(ref(null));
+
+			expect(isValidJSON('{"key":"value"}')).toBe(true);
+		});
+
+		it('should return false for invalid JSON', () => {
+			const { isValidJSON } = usePinnedData(ref(null));
+			const result = isValidJSON('invalid json');
+
+			expect(result).toBe(false);
+		});
+	});
+
+	describe('isValidSize()', () => {
+		it('should return true when data size is at upper limit', () => {
+			const { isValidSize } = usePinnedData(ref({ name: 'testNode' } as INodeUi));
+			const largeData = new Array(MAX_PINNED_DATA_SIZE + 1).join('a');
+
+			expect(isValidSize(largeData)).toBe(true);
+		});
+
+		it('should return false when data size is too large', () => {
+			const { isValidSize } = usePinnedData(ref({ name: 'testNode' } as INodeUi));
+			const largeData = new Array(MAX_PINNED_DATA_SIZE + 2).join('a');
+
+			expect(isValidSize(largeData)).toBe(false);
+		});
+	});
+
+	describe('setData()', () => {
+		it('should throw if data is not valid JSON', () => {
+			const { setData } = usePinnedData(ref({ name: 'testNode' } as INodeUi));
+
+			expect(() => setData('invalid json', 'pin-icon-click')).toThrow();
+		});
+
+		it('should throw if data size is too large', () => {
+			const { setData } = usePinnedData(ref({ name: 'testNode' } as INodeUi));
+			const largeData = new Array(MAX_PINNED_DATA_SIZE + 2).join('a');
+
+			expect(() => setData(largeData, 'pin-icon-click')).toThrow();
+		});
+
+		it('should set data correctly for valid inputs', () => {
+			const workflowsStore = useWorkflowsStore();
+			const node = ref({ name: 'testNode' } as INodeUi);
+			const { setData } = usePinnedData(node);
+			const testData = [{ json: { key: 'value' } }];
+
+			expect(() => setData(testData, 'pin-icon-click')).not.toThrow();
+			expect(workflowsStore.workflow.pinData?.[node.value.name]).toEqual(testData);
+		});
+	});
+
+	describe('unsetData()', () => {
+		it('should unset data correctly', () => {
+			const workflowsStore = useWorkflowsStore();
+			const node = ref({ name: 'testNode' } as INodeUi);
+			const { setData, unsetData } = usePinnedData(node);
+			const testData = [{ json: { key: 'value' } }];
+
+			setData(testData, 'pin-icon-click');
+			unsetData('context-menu');
+
+			expect(workflowsStore.workflow.pinData?.[node.value.name]).toBeUndefined();
+		});
+	});
+
+	describe('onSetDataSuccess()', () => {
+		it('should trigger telemetry on successful data setting', async () => {
+			const telemetry = useTelemetry();
+			const spy = vi.spyOn(telemetry, 'track');
+			const pinnedData = usePinnedData(ref({ name: 'testNode', type: 'someType' } as INodeUi), {
+				displayMode: ref('json'),
+				runIndex: ref(0),
+			});
+
+			pinnedData.onSetDataSuccess({ source: 'pin-icon-click' });
+			expect(spy).toHaveBeenCalled();
+		});
+	});
+
+	describe('onSetDataError()', () => {
+		it('should trigger telemetry tracking on error in data setting', () => {
+			const telemetry = useTelemetry();
+			const spy = vi.spyOn(telemetry, 'track');
+			const pinnedData = usePinnedData(ref({ name: 'testNode', type: 'someType' } as INodeUi), {
+				displayMode: ref('json'),
+				runIndex: ref(0),
+			});
+
+			pinnedData.onSetDataError({ errorType: 'data-too-large', source: 'pin-icon-click' });
+			expect(spy).toHaveBeenCalled();
+		});
+	});
+
+	describe('onUnsetData()', () => {
+		it('should trigger telemetry on successful data unsetting', async () => {
+			const telemetry = useTelemetry();
+			const spy = vi.spyOn(telemetry, 'track');
+			const pinnedData = usePinnedData(ref({ name: 'testNode', type: 'someType' } as INodeUi), {
+				displayMode: ref('json'),
+				runIndex: ref(0),
+			});
+
+			pinnedData.onUnsetData({ source: 'context-menu' });
+			expect(spy).toHaveBeenCalled();
+		});
+	});
+});
diff --git a/packages/editor-ui/src/composables/__tests__/useUniqueNodeName.test.ts b/packages/editor-ui/src/composables/__tests__/useUniqueNodeName.test.ts
new file mode 100644
index 0000000000000..e650c48e77d6b
--- /dev/null
+++ b/packages/editor-ui/src/composables/__tests__/useUniqueNodeName.test.ts
@@ -0,0 +1,79 @@
+import { setActivePinia } from 'pinia';
+import { createTestingPinia } from '@pinia/testing';
+import { useUniqueNodeName } from '@/composables/useUniqueNodeName';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+
+describe('useUniqueNodeName', () => {
+	beforeAll(() => {
+		setActivePinia(createTestingPinia());
+	});
+
+	afterEach(() => {
+		vi.clearAllMocks();
+	});
+
+	test('should return a unique node name for an alphabetic node name', () => {
+		const workflowsStore = useWorkflowsStore();
+
+		const mockCanvasNames = new Set(['Hello']);
+
+		vi.spyOn(workflowsStore, 'canvasNames', 'get').mockReturnValue(mockCanvasNames);
+
+		const { uniqueNodeName } = useUniqueNodeName();
+
+		expect(uniqueNodeName('Hello')).toBe('Hello1');
+
+		mockCanvasNames.add('Hello1');
+
+		expect(uniqueNodeName('Hello')).toBe('Hello2');
+	});
+
+	test('should return a unique node name for a numeric node name', () => {
+		const workflowsStore = useWorkflowsStore();
+
+		const mockCanvasNames = new Set(['123']);
+
+		vi.spyOn(workflowsStore, 'canvasNames', 'get').mockReturnValue(mockCanvasNames);
+
+		const { uniqueNodeName } = useUniqueNodeName();
+
+		expect(uniqueNodeName('123')).toBe('123-1');
+
+		mockCanvasNames.add('123-1');
+
+		expect(uniqueNodeName('123')).toBe('123-2');
+	});
+
+	test('should return a unique node name for a number-suffixed node name', () => {
+		const workflowsStore = useWorkflowsStore();
+		const nodeTypesStore = useNodeTypesStore();
+
+		const mockCanvasNames = new Set(['S3']);
+
+		vi.spyOn(workflowsStore, 'canvasNames', 'get').mockReturnValue(mockCanvasNames);
+		vi.spyOn(nodeTypesStore, 'allNodeTypes', 'get').mockReturnValue([
+			{
+				displayName: 'S3',
+				name: 'S3',
+				description: '',
+				version: 1,
+				inputs: [''],
+				outputs: [''],
+				group: [''],
+				properties: [],
+				defaults: {
+					name: 'S3',
+				},
+			},
+		]);
+
+		const { uniqueNodeName } = useUniqueNodeName();
+
+		expect(uniqueNodeName('S3')).toBe('S31');
+
+		mockCanvasNames.add('S31');
+
+		expect(uniqueNodeName('S3')).toBe('S32');
+	});
+});
diff --git a/packages/editor-ui/src/composables/index.ts b/packages/editor-ui/src/composables/index.ts
deleted file mode 100644
index 86ee35fe50793..0000000000000
--- a/packages/editor-ui/src/composables/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export * from './useCopyToClipboard';
-export * from './useExternalHooks';
-export * from './useGlobalLinkActions';
-export * from './useI18n';
-export * from './useMessage';
-export * from './useTelemetry';
-export * from './useToast';
-export * from './useUpgradeLink';
diff --git a/packages/editor-ui/src/composables/useActiveNode.ts b/packages/editor-ui/src/composables/useActiveNode.ts
new file mode 100644
index 0000000000000..6faf76b93b5ba
--- /dev/null
+++ b/packages/editor-ui/src/composables/useActiveNode.ts
@@ -0,0 +1,17 @@
+import { storeToRefs } from 'pinia';
+import { useNDVStore } from '@/stores/ndv.store';
+import { useNodeType } from '@/composables/useNodeType';
+
+export function useActiveNode() {
+	const ndvStore = useNDVStore();
+
+	const { activeNode } = storeToRefs(ndvStore);
+	const { nodeType: activeNodeType } = useNodeType({
+		node: activeNode,
+	});
+
+	return {
+		activeNode,
+		activeNodeType,
+	};
+}
diff --git a/packages/editor-ui/src/composables/useAutocompleteTelemetry.ts b/packages/editor-ui/src/composables/useAutocompleteTelemetry.ts
new file mode 100644
index 0000000000000..cd500588befc6
--- /dev/null
+++ b/packages/editor-ui/src/composables/useAutocompleteTelemetry.ts
@@ -0,0 +1,114 @@
+import { type MaybeRefOrGetter, computed, toValue, watchEffect } from 'vue';
+import { ExpressionExtensions } from 'n8n-workflow';
+import { EditorView, type ViewUpdate } from '@codemirror/view';
+
+import { useNDVStore } from '@/stores/ndv.store';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import { useTelemetry } from '../composables/useTelemetry';
+import type { Compartment } from '@codemirror/state';
+import { debounce } from 'lodash-es';
+
+export const useAutocompleteTelemetry = ({
+	editor: editorRef,
+	parameterPath,
+	compartment,
+}: {
+	editor: MaybeRefOrGetter<EditorView | undefined>;
+	parameterPath: MaybeRefOrGetter<string>;
+	compartment: MaybeRefOrGetter<Compartment>;
+}) => {
+	const ndvStore = useNDVStore();
+	const rootStore = useRootStore();
+	const telemetry = useTelemetry();
+
+	const expressionExtensionsCategories = computed(() => {
+		return ExpressionExtensions.reduce<Record<string, string | undefined>>((acc, cur) => {
+			for (const fnName of Object.keys(cur.functions)) {
+				acc[fnName] = cur.typeName;
+			}
+
+			return acc;
+		}, {});
+	});
+
+	function findCompletionBaseStartIndex(fromIndex: number) {
+		const editor = toValue(editorRef);
+
+		if (!editor) return -1;
+
+		const INDICATORS = [
+			' $', // proxy
+			'{ ', // primitive
+		];
+
+		const doc = editor.state.doc.toString();
+
+		for (let index = fromIndex; index > 0; index--) {
+			if (INDICATORS.some((indicator) => indicator === doc[index] + doc[index + 1])) {
+				return index + 1;
+			}
+		}
+
+		return -1;
+	}
+
+	function trackCompletion(viewUpdate: ViewUpdate, path: string) {
+		const editor = toValue(editorRef);
+
+		if (!editor) return;
+		const completionTx = viewUpdate.transactions.find((tx) => tx.isUserEvent('input.complete'));
+
+		if (!completionTx) return;
+
+		ndvStore.setAutocompleteOnboarded();
+
+		let completion = '';
+		let completionBase = '';
+
+		viewUpdate.changes.iterChanges((_: number, __: number, fromB: number, toB: number) => {
+			completion = toValue(editor).state.doc.slice(fromB, toB).toString();
+
+			const index = findCompletionBaseStartIndex(fromB);
+
+			completionBase = toValue(editor)
+				.state.doc.slice(index, fromB - 1)
+				.toString()
+				.trim();
+		});
+
+		const category = expressionExtensionsCategories.value[completion];
+
+		const payload = {
+			instance_id: rootStore.instanceId,
+			node_type: ndvStore.activeNode?.type,
+			field_name: path,
+			field_type: 'expression',
+			context: completionBase,
+			inserted_text: completion,
+			category: category ?? 'n/a', // only applicable if expression extension completion
+		};
+
+		telemetry.track('User autocompleted code', payload);
+	}
+
+	const safeTrackCompletion = (viewUpdate: ViewUpdate, path: string) => {
+		try {
+			trackCompletion(viewUpdate, path);
+		} catch {}
+	};
+	const debouncedTrackCompletion = debounce(safeTrackCompletion, 100);
+
+	watchEffect(() => {
+		const editor = toValue(editorRef);
+		if (!editor) return;
+
+		editor.dispatch({
+			effects: toValue(compartment).reconfigure([
+				EditorView.updateListener.of((viewUpdate) => {
+					if (!viewUpdate.docChanged || !editor) return;
+					debouncedTrackCompletion(viewUpdate, toValue(parameterPath));
+				}),
+			]),
+		});
+	});
+};
diff --git a/packages/editor-ui/src/composables/useCanvasMouseSelect.ts b/packages/editor-ui/src/composables/useCanvasMouseSelect.ts
index a00d57cb064cd..a04342db2319b 100644
--- a/packages/editor-ui/src/composables/useCanvasMouseSelect.ts
+++ b/packages/editor-ui/src/composables/useCanvasMouseSelect.ts
@@ -1,17 +1,12 @@
 import type { INodeUi, XYPosition } from '@/Interface';
 
-import useDeviceSupport from './useDeviceSupport';
-import { useUIStore } from '@/stores/ui';
-import { useWorkflowsStore } from '@/stores/workflows';
-import {
-	getMousePosition,
-	getRelativePosition,
-	HEADER_HEIGHT,
-	SIDEBAR_WIDTH,
-	SIDEBAR_WIDTH_EXPANDED,
-} from '@/utils/nodeViewUtils';
-import { ref, watchEffect, onMounted, computed, onUnmounted } from 'vue';
-import { useCanvasStore } from '@/stores/canvas';
+import { useDeviceSupport } from 'n8n-design-system';
+import { useUIStore } from '@/stores/ui.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { getMousePosition, getRelativePosition } from '@/utils/nodeViewUtils';
+import { ref, onMounted, computed } from 'vue';
+import { useCanvasStore } from '@/stores/canvas.store';
+import { useContextMenu } from './useContextMenu';
 
 interface ExtendedHTMLSpanElement extends HTMLSpanElement {
 	x: number;
@@ -26,6 +21,7 @@ export default function useCanvasMouseSelect() {
 	const uiStore = useUIStore();
 	const canvasStore = useCanvasStore();
 	const workflowsStore = useWorkflowsStore();
+	const { isOpen: isContextMenuOpen } = useContextMenu();
 
 	function _setSelectBoxStyle(styles: Record<string, string>) {
 		Object.assign(selectBox.value.style, styles);
@@ -133,8 +129,11 @@ export default function useCanvasMouseSelect() {
 	}
 
 	function mouseUpMouseSelect(e: MouseEvent) {
-		if (selectActive.value === false) {
-			if (isTouchDevice === true && e.target instanceof HTMLElement) {
+		// Ignore right-click
+		if (e.button === 2 || isContextMenuOpen.value) return;
+
+		if (!selectActive.value) {
+			if (isTouchDevice && e.target instanceof HTMLElement) {
 				if (e.target && e.target.id.includes('node-view')) {
 					// Deselect all nodes
 					deselectAllNodes();
@@ -162,7 +161,7 @@ export default function useCanvasMouseSelect() {
 		_hideSelectBox();
 	}
 	function mouseDownMouseSelect(e: MouseEvent, moveButtonPressed: boolean) {
-		if (isCtrlKeyPressed(e) === true || moveButtonPressed) {
+		if (isCtrlKeyPressed(e) || moveButtonPressed || e.button === 2) {
 			// We only care about it when the ctrl key is not pressed at the same time.
 			// So we exit when it is pressed.
 			return;
@@ -180,17 +179,9 @@ export default function useCanvasMouseSelect() {
 	}
 
 	function getMousePositionWithinNodeView(event: MouseEvent | TouchEvent): XYPosition {
-		const [mouseX, mouseY] = getMousePosition(event);
-
-		const sidebarWidth = canvasStore.isDemo
-			? 0
-			: uiStore.sidebarMenuCollapsed
-			? SIDEBAR_WIDTH
-			: SIDEBAR_WIDTH_EXPANDED;
-		const headerHeight = canvasStore.isDemo ? 0 : HEADER_HEIGHT;
+		const mousePosition = getMousePosition(event);
 
-		const relativeX = mouseX - sidebarWidth;
-		const relativeY = mouseY - headerHeight;
+		const [relativeX, relativeY] = canvasStore.canvasPositionFromPagePosition(mousePosition);
 		const nodeViewScale = canvasStore.nodeViewScale;
 		const nodeViewOffsetPosition = uiStore.nodeViewOffsetPosition;
 
@@ -224,6 +215,7 @@ export default function useCanvasMouseSelect() {
 	});
 
 	return {
+		selectActive,
 		getMousePositionWithinNodeView,
 		mouseUpMouseSelect,
 		mouseDownMouseSelect,
diff --git a/packages/editor-ui/src/composables/useCanvasPanning.ts b/packages/editor-ui/src/composables/useCanvasPanning.ts
new file mode 100644
index 0000000000000..b11b92b1f9df5
--- /dev/null
+++ b/packages/editor-ui/src/composables/useCanvasPanning.ts
@@ -0,0 +1,126 @@
+import type { Ref } from 'vue';
+import { ref, unref } from 'vue';
+
+import { getMousePosition } from '@/utils/nodeViewUtils';
+import { useUIStore } from '@/stores/ui.store';
+import { useDeviceSupport } from 'n8n-design-system';
+import { MOUSE_EVENT_BUTTON, MOUSE_EVENT_BUTTONS } from '@/constants';
+
+/**
+ * Composable for handling canvas panning interactions - it facilitates the movement of the
+ * canvas element in response to mouse events
+ */
+export function useCanvasPanning(
+	elementRef: Ref<null | HTMLElement>,
+	options: {
+		// @TODO To be refactored (unref) when migrating NodeView to composition API
+		onMouseMoveEnd?: Ref<null | ((e: MouseEvent) => void)>;
+	} = {},
+) {
+	const uiStore = useUIStore();
+	const moveLastPosition = ref([0, 0]);
+	const deviceSupport = useDeviceSupport();
+
+	/**
+	 * Updates the canvas offset position based on the mouse movement
+	 */
+	function panCanvas(e: MouseEvent) {
+		const offsetPosition = uiStore.nodeViewOffsetPosition;
+
+		const [x, y] = getMousePosition(e);
+
+		const nodeViewOffsetPositionX = offsetPosition[0] + (x - moveLastPosition.value[0]);
+		const nodeViewOffsetPositionY = offsetPosition[1] + (y - moveLastPosition.value[1]);
+		uiStore.nodeViewOffsetPosition = [nodeViewOffsetPositionX, nodeViewOffsetPositionY];
+
+		// Update the last position
+		moveLastPosition.value = [x, y];
+
+		return [nodeViewOffsetPositionX, nodeViewOffsetPositionY];
+	}
+
+	/**
+	 * Initiates the panning process when specific conditions are met (middle mouse or ctrl key pressed)
+	 */
+	function onMouseDown(e: MouseEvent, moveButtonPressed: boolean) {
+		if (!(deviceSupport.isCtrlKeyPressed(e) || moveButtonPressed)) {
+			// We only care about it when the ctrl key is pressed at the same time.
+			// So we exit when it is not pressed.
+			return;
+		}
+
+		if (uiStore.isActionActive('dragActive')) {
+			// If a node does currently get dragged we do not activate the selection
+			return;
+		}
+
+		// Prevent moving canvas on anything but middle button
+		if (e.button !== MOUSE_EVENT_BUTTON.MIDDLE) {
+			uiStore.nodeViewMoveInProgress = true;
+		}
+
+		const [x, y] = getMousePosition(e);
+
+		moveLastPosition.value = [x, y];
+
+		const element = unref(elementRef);
+		element?.addEventListener('mousemove', onMouseMove);
+	}
+
+	/**
+	 * Ends the panning process and removes the mousemove event listener
+	 */
+	function onMouseUp(_: MouseEvent) {
+		if (!uiStore.nodeViewMoveInProgress) {
+			// If it is not active return directly.
+			// Else normal node dragging will not work.
+			return;
+		}
+
+		const element = unref(elementRef);
+		element?.removeEventListener('mousemove', onMouseMove);
+
+		uiStore.nodeViewMoveInProgress = false;
+
+		// Nothing else to do. Simply leave the node view at the current offset
+	}
+
+	/**
+	 * Handles the actual movement of the canvas during a mouse drag,
+	 * updating the position based on the current mouse position
+	 */
+	function onMouseMove(e: MouseEvent) {
+		const element = unref(elementRef);
+		if (e.target && !(element === e.target || element?.contains(e.target as Node))) {
+			return;
+		}
+
+		if (uiStore.isActionActive('dragActive')) {
+			return;
+		}
+
+		// Signal that moving canvas is active if middle button is pressed and mouse is moved
+		if (e.buttons === MOUSE_EVENT_BUTTONS.MIDDLE) {
+			uiStore.nodeViewMoveInProgress = true;
+		}
+
+		if (e.buttons === MOUSE_EVENT_BUTTONS.NONE) {
+			// Mouse button is not pressed anymore so stop selection mode
+			// Happens normally when mouse leave the view pressed and then
+			// comes back unpressed.
+			const onMouseMoveEnd = unref(options.onMouseMoveEnd);
+			onMouseMoveEnd?.(e);
+			return;
+		}
+
+		panCanvas(e);
+	}
+
+	return {
+		moveLastPosition,
+		onMouseDown,
+		onMouseUp,
+		onMouseMove,
+		panCanvas,
+	};
+}
diff --git a/packages/editor-ui/src/composables/useClipboard.ts b/packages/editor-ui/src/composables/useClipboard.ts
new file mode 100644
index 0000000000000..1cd4c9ef709ec
--- /dev/null
+++ b/packages/editor-ui/src/composables/useClipboard.ts
@@ -0,0 +1,83 @@
+import { onBeforeUnmount, onMounted, ref } from 'vue';
+import { useClipboard as useClipboardCore } from '@vueuse/core';
+import { useDebounce } from '@/composables/useDebounce';
+
+type ClipboardEventFn = (data: string, event?: ClipboardEvent) => void;
+
+export function useClipboard(
+	options: {
+		onPaste: ClipboardEventFn;
+	} = {
+		onPaste() {},
+	},
+) {
+	const { debounce } = useDebounce();
+	const { copy, copied, isSupported, text } = useClipboardCore({ legacy: true });
+
+	const ignoreClasses = ['el-messsage-box', 'ignore-key-press'];
+	const initialized = ref(false);
+
+	const onPasteCallback = ref<ClipboardEventFn | null>(options.onPaste || null);
+
+	/**
+	 * Handles copy/paste events
+	 * @param event
+	 */
+	function onPaste(event: ClipboardEvent) {
+		if (!onPasteCallback.value) {
+			return;
+		}
+
+		// Check if the event got emitted from a message box or from something
+		// else which should ignore the copy/paste
+		const path = event.composedPath?.() as HTMLElement[];
+		for (const pathElement of path) {
+			if (
+				pathElement.className &&
+				ignoreClasses.some((className) => pathElement.className.includes?.(className))
+			) {
+				return;
+			}
+		}
+
+		const clipboardData = event.clipboardData;
+		if (clipboardData !== null) {
+			const clipboardValue = clipboardData.getData('text/plain');
+			onPasteCallback.value(clipboardValue, event);
+		}
+	}
+
+	const debouncedOnPaste = debounce(onPaste, {
+		debounceTime: 1000,
+	});
+
+	/**
+	 * Initialize copy/paste elements and events
+	 */
+	onMounted(() => {
+		if (initialized.value) {
+			return;
+		}
+
+		document.addEventListener('paste', debouncedOnPaste);
+
+		initialized.value = true;
+	});
+
+	/**
+	 * Remove copy/paste elements and events
+	 */
+	onBeforeUnmount(() => {
+		if (initialized.value) {
+			document.removeEventListener('paste', debouncedOnPaste);
+		}
+	});
+
+	return {
+		copy,
+		copied,
+		isSupported,
+		text,
+		onPaste: onPasteCallback,
+	};
+}
diff --git a/packages/editor-ui/src/composables/useContextMenu.ts b/packages/editor-ui/src/composables/useContextMenu.ts
new file mode 100644
index 0000000000000..8517bb89c4e73
--- /dev/null
+++ b/packages/editor-ui/src/composables/useContextMenu.ts
@@ -0,0 +1,249 @@
+import type { ActionDropdownItem, XYPosition } from '@/Interface';
+import { NOT_DUPLICATABE_NODE_TYPES, STICKY_NODE_TYPE } from '@/constants';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import { useSourceControlStore } from '@/stores/sourceControl.store';
+import { useUIStore } from '@/stores/ui.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import type { INode, INodeTypeDescription } from 'n8n-workflow';
+import { computed, ref, watch } from 'vue';
+import { getMousePosition } from '../utils/nodeViewUtils';
+import { useI18n } from './useI18n';
+import { usePinnedData } from './usePinnedData';
+
+export type ContextMenuTarget =
+	| { source: 'canvas' }
+	| { source: 'node-right-click'; node: INode }
+	| { source: 'node-button'; node: INode };
+export type ContextMenuActionCallback = (action: ContextMenuAction, targets: INode[]) => void;
+export type ContextMenuAction =
+	| 'open'
+	| 'copy'
+	| 'toggle_activation'
+	| 'duplicate'
+	| 'execute'
+	| 'rename'
+	| 'toggle_pin'
+	| 'delete'
+	| 'select_all'
+	| 'deselect_all'
+	| 'add_node'
+	| 'add_sticky'
+	| 'change_color';
+
+const position = ref<XYPosition>([0, 0]);
+const isOpen = ref(false);
+const target = ref<ContextMenuTarget>({ source: 'canvas' });
+const actions = ref<ActionDropdownItem[]>([]);
+const actionCallback = ref<ContextMenuActionCallback>(() => {});
+
+export const useContextMenu = (onAction: ContextMenuActionCallback = () => {}) => {
+	const uiStore = useUIStore();
+	const nodeTypesStore = useNodeTypesStore();
+	const workflowsStore = useWorkflowsStore();
+	const sourceControlStore = useSourceControlStore();
+
+	const i18n = useI18n();
+
+	const isReadOnly = computed(
+		() => sourceControlStore.preferences.branchReadOnly || uiStore.isReadOnlyView,
+	);
+
+	const targetNodes = computed(() => {
+		if (!isOpen.value) return [];
+		const selectedNodes = uiStore.selectedNodes.map((node) =>
+			workflowsStore.getNodeByName(node.name),
+		) as INode[];
+		const currentTarget = target.value;
+		if (currentTarget.source === 'canvas') {
+			return selectedNodes;
+		} else if (currentTarget.source === 'node-right-click') {
+			const isNodeInSelection = selectedNodes.some((node) => node.name === currentTarget.node.name);
+			return isNodeInSelection ? selectedNodes : [currentTarget.node];
+		}
+
+		return [currentTarget.node];
+	});
+
+	const canAddNodeOfType = (nodeType: INodeTypeDescription) => {
+		const sameTypeNodes = workflowsStore.allNodes.filter((n) => n.type === nodeType.name);
+		return nodeType.maxNodes === undefined || sameTypeNodes.length < nodeType.maxNodes;
+	};
+
+	const canDuplicateNode = (node: INode): boolean => {
+		const nodeType = nodeTypesStore.getNodeType(node.type, node.typeVersion);
+		if (!nodeType) return false;
+		if (NOT_DUPLICATABE_NODE_TYPES.includes(nodeType.name)) return false;
+
+		return canAddNodeOfType(nodeType);
+	};
+
+	const hasPinData = (node: INode): boolean => {
+		return !!workflowsStore.pinDataByNodeName(node.name);
+	};
+	const close = () => {
+		target.value = { source: 'canvas' };
+		isOpen.value = false;
+		actions.value = [];
+		position.value = [0, 0];
+	};
+
+	const open = (event: MouseEvent, menuTarget: ContextMenuTarget = { source: 'canvas' }) => {
+		event.stopPropagation();
+
+		if (isOpen.value && menuTarget.source === target.value.source) {
+			// Close context menu, let browser open native context menu
+			close();
+			return;
+		}
+
+		event.preventDefault();
+
+		actionCallback.value = onAction;
+		target.value = menuTarget;
+		position.value = getMousePosition(event);
+		isOpen.value = true;
+
+		const nodes = targetNodes.value;
+		const onlyStickies = nodes.every((node) => node.type === STICKY_NODE_TYPE);
+		const i18nOptions = {
+			adjustToNumber: nodes.length,
+			interpolate: {
+				subject: onlyStickies
+					? i18n.baseText('contextMenu.sticky', { adjustToNumber: nodes.length })
+					: i18n.baseText('contextMenu.node', { adjustToNumber: nodes.length }),
+			},
+		};
+
+		const selectionActions = [
+			{
+				id: 'select_all',
+				divided: true,
+				label: i18n.baseText('contextMenu.selectAll'),
+				shortcut: { metaKey: true, keys: ['A'] },
+				disabled: nodes.length === workflowsStore.allNodes.length,
+			},
+			{
+				id: 'deselect_all',
+				label: i18n.baseText('contextMenu.deselectAll'),
+				disabled: nodes.length === 0,
+			},
+		];
+
+		if (nodes.length === 0) {
+			actions.value = [
+				{
+					id: 'add_node',
+					shortcut: { keys: ['Tab'] },
+					label: i18n.baseText('contextMenu.addNode'),
+					disabled: isReadOnly.value,
+				},
+				{
+					id: 'add_sticky',
+					shortcut: { shiftKey: true, keys: ['s'] },
+					label: i18n.baseText('contextMenu.addSticky'),
+					disabled: isReadOnly.value,
+				},
+				...selectionActions,
+			];
+		} else {
+			const menuActions: ActionDropdownItem[] = [
+				!onlyStickies && {
+					id: 'toggle_activation',
+					label: nodes.every((node) => node.disabled)
+						? i18n.baseText('contextMenu.activate', i18nOptions)
+						: i18n.baseText('contextMenu.deactivate', i18nOptions),
+					shortcut: { keys: ['D'] },
+					disabled: isReadOnly.value,
+				},
+				!onlyStickies && {
+					id: 'toggle_pin',
+					label: nodes.every((node) => hasPinData(node))
+						? i18n.baseText('contextMenu.unpin', i18nOptions)
+						: i18n.baseText('contextMenu.pin', i18nOptions),
+					shortcut: { keys: ['p'] },
+					disabled: isReadOnly.value || !nodes.every((n) => usePinnedData(n).canPinNode(true)),
+				},
+				{
+					id: 'copy',
+					label: i18n.baseText('contextMenu.copy', i18nOptions),
+					shortcut: { metaKey: true, keys: ['C'] },
+				},
+				{
+					id: 'duplicate',
+					label: i18n.baseText('contextMenu.duplicate', i18nOptions),
+					shortcut: { metaKey: true, keys: ['D'] },
+					disabled: isReadOnly.value || !nodes.every(canDuplicateNode),
+				},
+				...selectionActions,
+				{
+					id: 'delete',
+					divided: true,
+					label: i18n.baseText('contextMenu.delete', i18nOptions),
+					shortcut: { keys: ['Del'] },
+					disabled: isReadOnly.value,
+				},
+			].filter(Boolean) as ActionDropdownItem[];
+
+			if (nodes.length === 1) {
+				const singleNodeActions = onlyStickies
+					? [
+							{
+								id: 'open',
+								label: i18n.baseText('contextMenu.editSticky'),
+								shortcut: { keys: ['↵'] },
+								disabled: isReadOnly.value,
+							},
+							{
+								id: 'change_color',
+								label: i18n.baseText('contextMenu.changeColor'),
+								disabled: isReadOnly.value,
+							},
+						]
+					: [
+							{
+								id: 'open',
+								label: i18n.baseText('contextMenu.open'),
+								shortcut: { keys: ['↵'] },
+							},
+							{
+								id: 'execute',
+								label: i18n.baseText('contextMenu.test'),
+								disabled: isReadOnly.value,
+							},
+							{
+								id: 'rename',
+								label: i18n.baseText('contextMenu.rename'),
+								shortcut: { keys: ['F2'] },
+								disabled: isReadOnly.value,
+							},
+						];
+				// Add actions only available for a single node
+				menuActions.unshift(...singleNodeActions);
+			}
+
+			actions.value = menuActions;
+		}
+	};
+
+	const _dispatchAction = (action: ContextMenuAction) => {
+		actionCallback.value(action, targetNodes.value);
+	};
+
+	watch(
+		() => uiStore.nodeViewOffsetPosition,
+		() => {
+			close();
+		},
+	);
+
+	return {
+		isOpen,
+		position,
+		target,
+		actions,
+		targetNodes,
+		open,
+		close,
+		_dispatchAction,
+	};
+};
diff --git a/packages/editor-ui/src/composables/useCopyToClipboard.ts b/packages/editor-ui/src/composables/useCopyToClipboard.ts
deleted file mode 100644
index 7e71370d3b79a..0000000000000
--- a/packages/editor-ui/src/composables/useCopyToClipboard.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import copyToClipboard from 'copy-to-clipboard';
-
-export function useCopyToClipboard(): (text: string) => void {
-	return copyToClipboard;
-}
diff --git a/packages/editor-ui/src/composables/useDataSchema.ts b/packages/editor-ui/src/composables/useDataSchema.ts
new file mode 100644
index 0000000000000..d6c446421891f
--- /dev/null
+++ b/packages/editor-ui/src/composables/useDataSchema.ts
@@ -0,0 +1,135 @@
+import type { Optional, Primitives, Schema, INodeUi } from '@/Interface';
+import {
+	type ITaskDataConnections,
+	type IDataObject,
+	type INodeExecutionData,
+	NodeConnectionType,
+} from 'n8n-workflow';
+import { merge } from 'lodash-es';
+import { generatePath } from '@/utils/mappingUtils';
+import { isObj } from '@/utils/typeGuards';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+
+export function useDataSchema() {
+	function getSchema(
+		input: Optional<Primitives | object>,
+		path = '',
+		excludeValues = false,
+	): Schema {
+		let schema: Schema = { type: 'undefined', value: 'undefined', path };
+		switch (typeof input) {
+			case 'object':
+				if (input === null) {
+					schema = { type: 'null', value: '[null]', path };
+				} else if (input instanceof Date) {
+					schema = { type: 'string', value: input.toISOString(), path };
+				} else if (Array.isArray(input)) {
+					schema = {
+						type: 'array',
+						value: input.map((item, index) => ({
+							key: index.toString(),
+							...getSchema(item, `${path}[${index}]`, excludeValues),
+						})),
+						path,
+					};
+				} else if (isObj(input)) {
+					schema = {
+						type: 'object',
+						value: Object.entries(input).map(([k, v]) => ({
+							key: k,
+							...getSchema(v, generatePath(path, [k]), excludeValues),
+						})),
+						path,
+					};
+				}
+				break;
+			case 'function':
+				schema = { type: 'function', value: '', path };
+				break;
+			default:
+				schema = {
+					type: typeof input,
+					value: excludeValues ? '' : String(input),
+					path,
+				};
+		}
+
+		return schema;
+	}
+
+	function getSchemaForExecutionData(data: IDataObject[], excludeValues = false) {
+		const [head, ...tail] = data;
+
+		return getSchema(merge({}, head, ...tail, head), undefined, excludeValues);
+	}
+
+	// Returns the data of the main input
+	function getMainInputData(
+		connectionsData: ITaskDataConnections,
+		outputIndex: number,
+	): INodeExecutionData[] {
+		if (
+			!connectionsData?.hasOwnProperty(NodeConnectionType.Main) ||
+			connectionsData.main === undefined ||
+			connectionsData.main.length < outputIndex ||
+			connectionsData.main[outputIndex] === null
+		) {
+			return [];
+		}
+		return connectionsData.main[outputIndex] as INodeExecutionData[];
+	}
+
+	function getNodeInputData(
+		node: INodeUi | null,
+		runIndex = 0,
+		outputIndex = 0,
+	): INodeExecutionData[] {
+		const { getWorkflowExecution } = useWorkflowsStore();
+		if (node === null) {
+			return [];
+		}
+
+		if (getWorkflowExecution === null) {
+			return [];
+		}
+		const executionData = getWorkflowExecution.data;
+		if (!executionData?.resultData) {
+			// unknown status
+			return [];
+		}
+		const runData = executionData.resultData.runData;
+
+		if (!runData?.[node.name]?.[runIndex].data || runData[node.name][runIndex].data === undefined) {
+			return [];
+		}
+
+		return getMainInputData(runData[node.name][runIndex].data!, outputIndex);
+	}
+
+	function getInputDataWithPinned(
+		node: INodeUi | null,
+		runIndex = 0,
+		outputIndex = 0,
+	): INodeExecutionData[] {
+		if (!node) return [];
+
+		const { pinDataByNodeName } = useWorkflowsStore();
+		const pinnedData = pinDataByNodeName(node.name);
+		let inputData = getNodeInputData(node, runIndex, outputIndex);
+
+		if (pinnedData) {
+			inputData = Array.isArray(pinnedData)
+				? pinnedData.map((json) => ({ json }))
+				: [{ json: pinnedData }];
+		}
+
+		return inputData;
+	}
+
+	return {
+		getSchema,
+		getSchemaForExecutionData,
+		getNodeInputData,
+		getInputDataWithPinned,
+	};
+}
diff --git a/packages/editor-ui/src/composables/useDebounce.ts b/packages/editor-ui/src/composables/useDebounce.ts
index a5b4c403165cd..8d22974058f50 100644
--- a/packages/editor-ui/src/composables/useDebounce.ts
+++ b/packages/editor-ui/src/composables/useDebounce.ts
@@ -1,38 +1,54 @@
 import { ref } from 'vue';
-import { debounce } from 'lodash-es';
+import { debounce as _debounce } from 'lodash-es';
 
-type DebouncedFunction = (...args: unknown[]) => Promise<void> | void;
+export interface DebounceOptions {
+	debounceTime: number;
+	trailing?: boolean;
+}
+
+export type DebouncedFunction<R = void> = (...args: unknown[]) => R;
 
-export function useDebounceHelper() {
+export function useDebounce() {
 	// Create a ref for the WeakMap to store debounced functions.
-	const debouncedFunctions = ref(new WeakMap<DebouncedFunction, DebouncedFunction>());
+	const debounceCache = ref(new WeakMap<DebouncedFunction<unknown>, DebouncedFunction<unknown>>());
 
-	const callDebounced = async (
-		func: DebouncedFunction,
-		options: { debounceTime: number; trailing?: boolean },
-		...inputParameters: unknown[]
-	): Promise<void> => {
+	const debounce = <T extends DebouncedFunction<ReturnType<T>>>(
+		fn: T,
+		options: DebounceOptions,
+	): T => {
 		const { trailing, debounceTime } = options;
 
 		// Check if a debounced version of the function is already stored in the WeakMap.
-		let debouncedFunc = debouncedFunctions.value.get(func);
+		let debouncedFn = debounceCache.value.get(fn);
 
 		// If a debounced version is not found, create one and store it in the WeakMap.
-		if (debouncedFunc === undefined) {
-			debouncedFunc = debounce(
+		if (debouncedFn === undefined) {
+			debouncedFn = _debounce(
 				async (...args: unknown[]) => {
-					await func(...args);
+					return fn(...args);
 				},
 				debounceTime,
 				trailing ? { trailing } : { leading: true },
 			);
-			debouncedFunctions.value.set(func, debouncedFunc);
+
+			debounceCache.value.set(fn, debouncedFn);
 		}
 
-		await debouncedFunc(...inputParameters);
+		return debouncedFn as T;
+	};
+
+	const callDebounced = <T extends DebouncedFunction<ReturnType<T>>>(
+		fn: T,
+		options: DebounceOptions,
+		...inputParameters: Parameters<T>
+	): ReturnType<T> => {
+		const debouncedFn = debounce(fn, options);
+
+		return debouncedFn(...inputParameters);
 	};
 
 	return {
+		debounce,
 		callDebounced,
 	};
 }
diff --git a/packages/editor-ui/src/composables/useDeviceSupport.ts b/packages/editor-ui/src/composables/useDeviceSupport.ts
deleted file mode 100644
index 1c7e5083eee3e..0000000000000
--- a/packages/editor-ui/src/composables/useDeviceSupport.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { ref } from 'vue';
-
-interface DeviceSupportHelpers {
-	isTouchDevice: boolean;
-	isMacOs: boolean;
-	controlKeyCode: string;
-	isCtrlKeyPressed: (e: MouseEvent | KeyboardEvent) => boolean;
-}
-
-export default function useDeviceSupportHelpers(): DeviceSupportHelpers {
-	const isTouchDevice = ref('ontouchstart' in window || navigator.maxTouchPoints > 0);
-	const userAgent = ref(navigator.userAgent.toLowerCase());
-	const isMacOs = ref(
-		userAgent.value.includes('macintosh') ||
-			userAgent.value.includes('ipad') ||
-			userAgent.value.includes('iphone') ||
-			userAgent.value.includes('ipod'),
-	);
-	const controlKeyCode = ref(isMacOs.value ? 'Meta' : 'Control');
-
-	function isCtrlKeyPressed(e: MouseEvent | KeyboardEvent): boolean {
-		if (isTouchDevice.value === true && e instanceof MouseEvent) {
-			return true;
-		}
-		if (isMacOs.value) {
-			return (e as KeyboardEvent).metaKey;
-		}
-		return (e as KeyboardEvent).ctrlKey;
-	}
-
-	return {
-		isTouchDevice: isTouchDevice.value,
-		isMacOs: isMacOs.value,
-		controlKeyCode: controlKeyCode.value,
-		isCtrlKeyPressed,
-	};
-}
diff --git a/packages/editor-ui/src/composables/useExecutionDebugging.ts b/packages/editor-ui/src/composables/useExecutionDebugging.ts
new file mode 100644
index 0000000000000..b0f9a60cf9c3b
--- /dev/null
+++ b/packages/editor-ui/src/composables/useExecutionDebugging.ts
@@ -0,0 +1,163 @@
+import { h, computed } from 'vue';
+import { useRouter } from 'vue-router';
+import { useI18n } from '@/composables/useI18n';
+import { useMessage } from '@/composables/useMessage';
+import { useToast } from '@/composables/useToast';
+import {
+	DEBUG_PAYWALL_MODAL_KEY,
+	EnterpriseEditionFeature,
+	MODAL_CONFIRM,
+	VIEWS,
+} from '@/constants';
+import type { INodeUi } from '@/Interface';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useUIStore } from '@/stores/ui.store';
+import { useTelemetry } from './useTelemetry';
+import { useRootStore } from '@/stores/n8nRoot.store';
+
+export const useExecutionDebugging = () => {
+	const telemetry = useTelemetry();
+
+	const router = useRouter();
+	const i18n = useI18n();
+	const message = useMessage();
+	const toast = useToast();
+	const workflowsStore = useWorkflowsStore();
+	const settingsStore = useSettingsStore();
+	const uiStore = useUIStore();
+
+	const isDebugEnabled = computed(() =>
+		settingsStore.isEnterpriseFeatureEnabled(EnterpriseEditionFeature.DebugInEditor),
+	);
+
+	const applyExecutionData = async (executionId: string): Promise<void> => {
+		const execution = await workflowsStore.getExecution(executionId);
+		const workflow = workflowsStore.getCurrentWorkflow();
+		const workflowNodes = workflowsStore.getNodes();
+
+		if (!execution?.data?.resultData) {
+			return;
+		}
+
+		const { runData } = execution.data.resultData;
+
+		const executionNodeNames = Object.keys(runData);
+		const missingNodeNames = executionNodeNames.filter(
+			(name) => !workflowNodes.some((node) => node.name === name),
+		);
+
+		// Using the pinned data of the workflow to check if the node is pinned
+		// because workflowsStore.getCurrentWorkflow() returns a cached workflow without the updated pinned data
+		const workflowPinnedNodeNames = Object.keys(workflowsStore.workflow.pinData ?? {});
+		const matchingPinnedNodeNames = executionNodeNames.filter((name) =>
+			workflowPinnedNodeNames.includes(name),
+		);
+
+		if (matchingPinnedNodeNames.length > 0) {
+			const confirmMessage = h('p', [
+				i18n.baseText('nodeView.confirmMessage.debug.message'),
+				h(
+					'ul',
+					{ class: 'mt-l ml-l' },
+					matchingPinnedNodeNames.map((name) => h('li', name)),
+				),
+			]);
+
+			const overWritePinnedDataConfirm = await message.confirm(
+				confirmMessage,
+				i18n.baseText('nodeView.confirmMessage.debug.headline'),
+				{
+					type: 'warning',
+					confirmButtonText: i18n.baseText('nodeView.confirmMessage.debug.confirmButtonText'),
+					cancelButtonText: i18n.baseText('nodeView.confirmMessage.debug.cancelButtonText'),
+					dangerouslyUseHTMLString: true,
+					customClass: 'matching-pinned-nodes-confirmation',
+				},
+			);
+
+			if (overWritePinnedDataConfirm === MODAL_CONFIRM) {
+				matchingPinnedNodeNames.forEach((name) => {
+					const node = workflowsStore.getNodeByName(name);
+					if (node) {
+						workflowsStore.unpinData({ node });
+					}
+				});
+			} else {
+				await router.push({
+					name: VIEWS.EXECUTION_PREVIEW,
+					params: { name: workflow.id, executionId },
+				});
+				return;
+			}
+		}
+
+		// Set execution data
+		workflowsStore.setWorkflowExecutionData(execution);
+
+		// Pin data of all nodes which do not have a parent node
+		const pinnableNodes = workflowNodes.filter(
+			(node: INodeUi) => !workflow.getParentNodes(node.name).length,
+		);
+
+		let pinnings = 0;
+
+		pinnableNodes.forEach((node: INodeUi) => {
+			const nodeData = runData[node.name]?.[0].data?.main[0];
+			if (nodeData) {
+				pinnings++;
+				workflowsStore.pinData({
+					node,
+					data: nodeData,
+				});
+			}
+		});
+
+		toast.showToast({
+			title: i18n.baseText('nodeView.showMessage.debug.title'),
+			message: i18n.baseText('nodeView.showMessage.debug.content'),
+			type: 'info',
+		});
+
+		if (missingNodeNames.length) {
+			toast.showToast({
+				title: i18n.baseText('nodeView.showMessage.debug.missingNodes.title'),
+				message: i18n.baseText('nodeView.showMessage.debug.missingNodes.content', {
+					interpolate: { nodeNames: missingNodeNames.join(', ') },
+				}),
+				type: 'warning',
+			});
+		}
+
+		telemetry.track('User clicked debug execution button', {
+			instance_id: useRootStore().instanceId,
+			exec_status: execution.status,
+			override_pinned_data: pinnableNodes.length === pinnings,
+			all_exec_data_imported: missingNodeNames.length === 0,
+		});
+	};
+
+	const handleDebugLinkClick = (event: Event): void => {
+		if (!isDebugEnabled.value) {
+			uiStore.openModalWithData({
+				name: DEBUG_PAYWALL_MODAL_KEY,
+				data: {
+					title: i18n.baseText(uiStore.contextBasedTranslationKeys.feature.unavailable.title),
+					footerButtonAction: () => {
+						uiStore.closeModal(DEBUG_PAYWALL_MODAL_KEY);
+						void uiStore.goToUpgrade('debug', 'upgrade-debug');
+					},
+				},
+			});
+			event.preventDefault();
+			event.stopPropagation();
+			return;
+		}
+		workflowsStore.isInDebugMode = false;
+	};
+
+	return {
+		applyExecutionData,
+		handleDebugLinkClick,
+	};
+};
diff --git a/packages/editor-ui/src/composables/useExecutionHelpers.ts b/packages/editor-ui/src/composables/useExecutionHelpers.ts
new file mode 100644
index 0000000000000..47f74ecf6c56c
--- /dev/null
+++ b/packages/editor-ui/src/composables/useExecutionHelpers.ts
@@ -0,0 +1,70 @@
+import type { ExecutionSummary } from 'n8n-workflow';
+import { convertToDisplayDate } from '@/utils/formatters/dateFormatter';
+import { useI18n } from '@/composables/useI18n';
+
+export interface IExecutionUIData {
+	name: string;
+	label: string;
+	startTime: string;
+	runningTime: string;
+}
+
+export function useExecutionHelpers() {
+	const i18n = useI18n();
+
+	function getUIDetails(execution: ExecutionSummary): IExecutionUIData {
+		const status = {
+			name: 'unknown',
+			startTime: formatDate(execution.startedAt),
+			label: 'Status unknown',
+			runningTime: '',
+		};
+
+		if (execution.status === 'waiting') {
+			status.name = 'waiting';
+			status.label = i18n.baseText('executionsList.waiting');
+		} else if (execution.status === 'canceled') {
+			status.label = i18n.baseText('executionsList.canceled');
+		} else if (execution.status === 'running' || execution.status === 'new') {
+			status.name = 'running';
+			status.label = i18n.baseText('executionsList.running');
+		} else if (execution.status === 'success') {
+			status.name = 'success';
+			status.label = i18n.baseText('executionsList.succeeded');
+		} else if (execution.status === 'error' || execution.status === 'crashed') {
+			status.name = 'error';
+			status.label = i18n.baseText('executionsList.error');
+		}
+
+		if (!execution.status) execution.status = 'unknown';
+
+		if (execution.startedAt && execution.stoppedAt) {
+			const stoppedAt = execution.stoppedAt ? new Date(execution.stoppedAt).getTime() : Date.now();
+			status.runningTime = i18n.displayTimer(
+				stoppedAt - new Date(execution.startedAt).getTime(),
+				true,
+			);
+		}
+
+		return status;
+	}
+
+	function formatDate(fullDate: Date | string | number) {
+		const { date, time } = convertToDisplayDate(fullDate);
+		return i18n.baseText('executionsList.started', { interpolate: { time, date } });
+	}
+
+	function isExecutionRetriable(execution: ExecutionSummary): boolean {
+		return (
+			['crashed', 'error'].includes(execution.status ?? '') &&
+			!execution.retryOf &&
+			!execution.retrySuccessId
+		);
+	}
+
+	return {
+		getUIDetails,
+		formatDate,
+		isExecutionRetriable,
+	};
+}
diff --git a/packages/editor-ui/src/composables/useExpressionEditor.ts b/packages/editor-ui/src/composables/useExpressionEditor.ts
new file mode 100644
index 0000000000000..a4a423f5129ce
--- /dev/null
+++ b/packages/editor-ui/src/composables/useExpressionEditor.ts
@@ -0,0 +1,426 @@
+import {
+	computed,
+	type MaybeRefOrGetter,
+	onBeforeUnmount,
+	ref,
+	watchEffect,
+	type Ref,
+	toValue,
+	watch,
+} from 'vue';
+
+import { ensureSyntaxTree } from '@codemirror/language';
+import type { IDataObject } from 'n8n-workflow';
+import { Expression, ExpressionExtensions } from 'n8n-workflow';
+
+import { EXPRESSION_EDITOR_PARSER_TIMEOUT } from '@/constants';
+import { useNDVStore } from '@/stores/ndv.store';
+
+import type { TargetItem } from '@/Interface';
+import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
+import type { Html, Plaintext, RawSegment, Resolvable, Segment } from '@/types/expressions';
+import {
+	getExpressionErrorMessage,
+	getResolvableState,
+	isEmptyExpression,
+} from '@/utils/expressions';
+import { completionStatus } from '@codemirror/autocomplete';
+import {
+	Compartment,
+	EditorState,
+	type SelectionRange,
+	type Extension,
+	EditorSelection,
+} from '@codemirror/state';
+import { EditorView, type ViewUpdate } from '@codemirror/view';
+import { debounce, isEqual } from 'lodash-es';
+import { useRouter } from 'vue-router';
+import { useI18n } from '../composables/useI18n';
+import { highlighter } from '../plugins/codemirror/resolvableHighlighter';
+import { useWorkflowsStore } from '../stores/workflows.store';
+import { useAutocompleteTelemetry } from './useAutocompleteTelemetry';
+
+export const useExpressionEditor = ({
+	editorRef,
+	editorValue,
+	extensions = [],
+	additionalData = {},
+	skipSegments = [],
+	autocompleteTelemetry,
+	isReadOnly = false,
+}: {
+	editorRef: Ref<HTMLElement | undefined>;
+	editorValue?: MaybeRefOrGetter<string>;
+	extensions?: MaybeRefOrGetter<Extension[]>;
+	additionalData?: MaybeRefOrGetter<IDataObject>;
+	skipSegments?: MaybeRefOrGetter<string[]>;
+	autocompleteTelemetry?: MaybeRefOrGetter<{ enabled: true; parameterPath: string }>;
+	isReadOnly?: MaybeRefOrGetter<boolean>;
+}) => {
+	const ndvStore = useNDVStore();
+	const workflowsStore = useWorkflowsStore();
+	const router = useRouter();
+	const workflowHelpers = useWorkflowHelpers({ router });
+	const i18n = useI18n();
+	const editor = ref<EditorView>();
+	const hasFocus = ref(false);
+	const segments = ref<Segment[]>([]);
+	const selection = ref<SelectionRange>(EditorSelection.cursor(0)) as Ref<SelectionRange>;
+	const customExtensions = ref<Compartment>(new Compartment());
+	const readOnlyExtensions = ref<Compartment>(new Compartment());
+	const telemetryExtensions = ref<Compartment>(new Compartment());
+	const autocompleteStatus = ref<'pending' | 'active' | null>(null);
+
+	const updateSegments = (): void => {
+		const state = editor.value?.state;
+		if (!state) return;
+
+		const rawSegments: RawSegment[] = [];
+
+		const fullTree = ensureSyntaxTree(state, state.doc.length, EXPRESSION_EDITOR_PARSER_TIMEOUT);
+
+		if (fullTree === null) return;
+
+		const skip = ['Program', 'Script', 'Document', ...toValue(skipSegments)];
+
+		fullTree.cursor().iterate((node) => {
+			const text = state.sliceDoc(node.from, node.to);
+
+			if (skip.includes(node.type.name)) return;
+
+			const newSegment: RawSegment = {
+				from: node.from,
+				to: node.to,
+				text,
+				token: node.type.name === 'Resolvable' ? 'Resolvable' : 'Plaintext',
+			};
+
+			// Avoid duplicates
+			if (isEqual(newSegment, rawSegments.at(-1))) return;
+
+			rawSegments.push(newSegment);
+		});
+
+		segments.value = rawSegments.reduce<Segment[]>((acc, segment) => {
+			const { from, to, text, token } = segment;
+
+			if (token === 'Resolvable') {
+				const { resolved, error, fullError } = resolve(text, hoveringItem.value);
+				acc.push({
+					kind: 'resolvable',
+					from,
+					to,
+					resolvable: text,
+					// TODO:
+					// For some reason, expressions that resolve to a number 0 are breaking preview in the SQL editor
+					// This fixes that but as as TODO we should figure out why this is happening
+					resolved: String(resolved),
+					state: getResolvableState(fullError ?? error, autocompleteStatus.value !== null),
+					error: fullError,
+				});
+
+				return acc;
+			}
+
+			acc.push({ kind: 'plaintext', from, to, plaintext: text });
+
+			return acc;
+		}, []);
+	};
+
+	function readEditorValue(): string {
+		return editor.value?.state.doc.toString() ?? '';
+	}
+
+	function updateHighlighting(): void {
+		if (!editor.value) return;
+		highlighter.removeColor(editor.value, plaintextSegments.value);
+		highlighter.addColor(editor.value, resolvableSegments.value);
+	}
+
+	function updateSelection(viewUpdate: ViewUpdate) {
+		const currentSelection = selection.value;
+		const newSelection = viewUpdate.state.selection.ranges[0];
+
+		if (!currentSelection?.eq(newSelection)) {
+			selection.value = newSelection;
+		}
+	}
+
+	const debouncedUpdateSegments = debounce(updateSegments, 200);
+
+	function onEditorUpdate(viewUpdate: ViewUpdate) {
+		autocompleteStatus.value = completionStatus(viewUpdate.view.state);
+		updateSelection(viewUpdate);
+
+		if (!viewUpdate.docChanged) return;
+
+		debouncedUpdateSegments();
+	}
+
+	watch(editorRef, () => {
+		const parent = toValue(editorRef);
+
+		if (!parent) return;
+
+		const state = EditorState.create({
+			doc: toValue(editorValue),
+			extensions: [
+				customExtensions.value.of(toValue(extensions)),
+				readOnlyExtensions.value.of([
+					EditorState.readOnly.of(toValue(isReadOnly)),
+					EditorView.editable.of(!toValue(isReadOnly)),
+				]),
+				telemetryExtensions.value.of([]),
+				EditorView.updateListener.of(onEditorUpdate),
+				EditorView.focusChangeEffect.of((_, newHasFocus) => {
+					hasFocus.value = newHasFocus;
+					selection.value = state.selection.ranges[0];
+					return null;
+				}),
+				EditorView.contentAttributes.of({ 'data-gramm': 'false' }), // disable grammarly
+			],
+		});
+
+		if (editor.value) {
+			editor.value.destroy();
+		}
+		editor.value = new EditorView({ parent, state, scrollTo: EditorView.scrollIntoView(0) });
+		debouncedUpdateSegments();
+	});
+
+	watchEffect(() => {
+		if (editor.value) {
+			editor.value.dispatch({
+				effects: customExtensions.value.reconfigure(toValue(extensions)),
+			});
+		}
+	});
+
+	watchEffect(() => {
+		if (editor.value) {
+			editor.value.dispatch({
+				effects: readOnlyExtensions.value.reconfigure([
+					EditorState.readOnly.of(toValue(isReadOnly)),
+					EditorView.editable.of(!toValue(isReadOnly)),
+				]),
+			});
+		}
+	});
+
+	watchEffect(() => {
+		if (!editor.value) return;
+
+		const newValue = toValue(editorValue);
+		const currentValue = readEditorValue();
+		if (newValue === undefined || newValue === currentValue) return;
+
+		editor.value.dispatch({
+			changes: { from: 0, to: currentValue.length, insert: newValue },
+		});
+	});
+
+	watchEffect(() => {
+		const telemetry = toValue(autocompleteTelemetry);
+		if (!telemetry?.enabled) return;
+
+		useAutocompleteTelemetry({
+			editor,
+			parameterPath: telemetry.parameterPath,
+			compartment: telemetryExtensions,
+		});
+	});
+
+	onBeforeUnmount(() => {
+		editor.value?.destroy();
+	});
+
+	const expressionExtensionNames = computed<Set<string>>(() => {
+		return new Set(
+			ExpressionExtensions.reduce<string[]>((acc, cur) => {
+				return [...acc, ...Object.keys(cur.functions)];
+			}, []),
+		);
+	});
+
+	function isUncalledExpressionExtension(resolvable: string) {
+		const end = resolvable
+			.replace(/^{{|}}$/g, '')
+			.trim()
+			.split('.')
+			.pop();
+
+		return end !== undefined && expressionExtensionNames.value.has(end);
+	}
+
+	function resolve(resolvable: string, hoverItem: TargetItem | null) {
+		const result: { resolved: unknown; error: boolean; fullError: Error | null } = {
+			resolved: undefined,
+			error: false,
+			fullError: null,
+		};
+
+		try {
+			if (!ndvStore.activeNode) {
+				// e.g. credential modal
+				result.resolved = Expression.resolveWithoutWorkflow(resolvable, toValue(additionalData));
+			} else {
+				let opts;
+				if (ndvStore.isInputParentOfActiveNode) {
+					opts = {
+						targetItem: hoverItem ?? undefined,
+						inputNodeName: ndvStore.ndvInputNodeName,
+						inputRunIndex: ndvStore.ndvInputRunIndex,
+						inputBranchIndex: ndvStore.ndvInputBranchIndex,
+						additionalKeys: toValue(additionalData),
+					};
+				}
+				result.resolved = workflowHelpers.resolveExpression('=' + resolvable, undefined, opts);
+			}
+		} catch (error) {
+			result.resolved = `[${getExpressionErrorMessage(error)}]`;
+			result.error = true;
+			result.fullError = error;
+		}
+
+		if (result.resolved === '') {
+			result.resolved = i18n.baseText('expressionModalInput.empty');
+		}
+
+		if (result.resolved === undefined && isEmptyExpression(resolvable)) {
+			result.resolved = i18n.baseText('expressionModalInput.empty');
+		}
+
+		if (result.resolved === undefined) {
+			result.resolved = isUncalledExpressionExtension(resolvable)
+				? i18n.baseText('expressionEditor.uncalledFunction')
+				: i18n.baseText('expressionModalInput.undefined');
+
+			result.error = true;
+		}
+
+		if (typeof result.resolved === 'number' && isNaN(result.resolved)) {
+			result.resolved = i18n.baseText('expressionModalInput.null');
+		}
+
+		return result;
+	}
+
+	const hoveringItem = computed(() => {
+		return ndvStore.hoveringItem;
+	});
+
+	const resolvableSegments = computed<Resolvable[]>(() => {
+		return segments.value.filter((s): s is Resolvable => s.kind === 'resolvable');
+	});
+
+	const plaintextSegments = computed<Plaintext[]>(() => {
+		return segments.value.filter((s): s is Plaintext => s.kind === 'plaintext');
+	});
+
+	const htmlSegments = computed<Html[]>(() => {
+		return segments.value.filter((s): s is Html => s.kind !== 'resolvable');
+	});
+
+	/**
+	 * Segments to display in the output of an expression editor.
+	 *
+	 * Some segments are not displayed when they are _part_ of the result,
+	 * but displayed when they are the _entire_ result:
+	 *
+	 * - `This is a {{ [] }} test` displays as `This is a test`.
+	 * - `{{ [] }}` displays as `[Array: []]`.
+	 *
+	 * Some segments display differently based on context:
+	 *
+	 * Date displays as
+	 * - `Mon Nov 14 2022 17:26:13 GMT+0100 (CST)` when part of the result
+	 * - `[Object: "2022-11-14T17:26:13.130Z"]` when the entire result
+	 *
+	 * Only needed in order to mimic behavior of `ParameterInputHint`.
+	 */
+	const displayableSegments = computed<Segment[]>(() => {
+		const cachedSegments = segments.value;
+		return cachedSegments
+			.map((s) => {
+				if (cachedSegments.length <= 1 || s.kind !== 'resolvable') return s;
+
+				if (typeof s.resolved === 'string' && /\[Object: "\d{4}-\d{2}-\d{2}T/.test(s.resolved)) {
+					const utcDateString = s.resolved.replace(/(\[Object: "|\"\])/g, '');
+					s.resolved = new Date(utcDateString).toString();
+				}
+
+				if (typeof s.resolved === 'string' && /\[Array:\s\[.+\]\]/.test(s.resolved)) {
+					s.resolved = s.resolved.replace(/(\[Array: \[|\])/g, '');
+				}
+
+				return s;
+			})
+			.filter((s) => {
+				if (
+					cachedSegments.length > 1 &&
+					s.kind === 'resolvable' &&
+					typeof s.resolved === 'string' &&
+					(s.resolved === '[Array: []]' ||
+						s.resolved === i18n.baseText('expressionModalInput.empty'))
+				) {
+					return false;
+				}
+
+				return true;
+			});
+	});
+
+	watch(
+		[
+			() => workflowsStore.getWorkflowExecution,
+			() => workflowsStore.getWorkflowRunData,
+			() => ndvStore.hoveringItemNumber,
+		],
+		debouncedUpdateSegments,
+	);
+
+	watch(resolvableSegments, updateHighlighting);
+
+	function setCursorPosition(pos: number | 'lastExpression' | 'end'): void {
+		if (pos === 'lastExpression') {
+			const END_OF_EXPRESSION = ' }}';
+			const endOfLastExpression = readEditorValue().lastIndexOf(END_OF_EXPRESSION);
+			pos = endOfLastExpression !== -1 ? endOfLastExpression : editor.value?.state.doc.length ?? 0;
+		} else if (pos === 'end') {
+			pos = editor.value?.state.doc.length ?? 0;
+		}
+		editor.value?.dispatch({ selection: { head: pos, anchor: pos } });
+	}
+
+	function select(anchor: number, head: number | 'end' = 'end'): void {
+		editor.value?.dispatch({
+			selection: { anchor, head: head === 'end' ? editor.value?.state.doc.length ?? 0 : head },
+		});
+	}
+
+	const selectAll = () => select(0, 'end');
+
+	function focus(): void {
+		if (hasFocus.value) return;
+		editor.value?.focus();
+	}
+
+	return {
+		editor,
+		hasFocus,
+		selection,
+		segments: {
+			all: segments,
+			html: htmlSegments,
+			display: displayableSegments,
+			plaintext: plaintextSegments,
+			resolvable: resolvableSegments,
+		},
+		readEditorValue,
+		setCursorPosition,
+		select,
+		selectAll,
+		focus,
+	};
+};
diff --git a/packages/editor-ui/src/composables/useExternalHooks.ts b/packages/editor-ui/src/composables/useExternalHooks.ts
index cd9b1049b5060..6e69d6f035a91 100644
--- a/packages/editor-ui/src/composables/useExternalHooks.ts
+++ b/packages/editor-ui/src/composables/useExternalHooks.ts
@@ -1,12 +1,39 @@
-import type { IExternalHooks } from '@/Interface';
 import type { IDataObject } from 'n8n-workflow';
-import { useWebhooksStore } from '@/stores';
-import { runExternalHook } from '@/utils';
+import type {
+	ExternalHooks,
+	ExternalHooksKey,
+	ExternalHooksGenericContext,
+	ExtractExternalHooksMethodPayloadFromKey,
+} from '@/types/externalHooks';
+import { useWebhooksStore } from '@/stores/webhooks.store';
 
-export function useExternalHooks(): IExternalHooks {
+export async function runExternalHook<T extends ExternalHooksKey>(
+	eventName: T,
+	metadata?: ExtractExternalHooksMethodPayloadFromKey<T>,
+) {
+	if (!window.n8nExternalHooks) {
+		return;
+	}
+
+	const store = useWebhooksStore();
+
+	const [resource, operator] = eventName.split('.') as [
+		keyof ExternalHooks,
+		keyof ExternalHooks[keyof ExternalHooks],
+	];
+
+	const context = window.n8nExternalHooks[resource] as ExternalHooksGenericContext;
+	if (context?.[operator]) {
+		const hookMethods = context[operator];
+
+		for (const hookMethod of hookMethods) {
+			await hookMethod(store, metadata as IDataObject);
+		}
+	}
+}
+
+export function useExternalHooks() {
 	return {
-		async run(eventName: string, metadata?: IDataObject): Promise<void> {
-			return await runExternalHook(eventName, useWebhooksStore(), metadata);
-		},
+		run: runExternalHook,
 	};
 }
diff --git a/packages/editor-ui/src/composables/useExternalSecretsProvider.ts b/packages/editor-ui/src/composables/useExternalSecretsProvider.ts
new file mode 100644
index 0000000000000..45ee1a1164a86
--- /dev/null
+++ b/packages/editor-ui/src/composables/useExternalSecretsProvider.ts
@@ -0,0 +1,101 @@
+import type {
+	ExternalSecretsProviderWithProperties,
+	ExternalSecretsProvider,
+	IUpdateInformation,
+	ExternalSecretsProviderData,
+} from '@/Interface';
+import type { Ref } from 'vue';
+import { computed, ref } from 'vue';
+import { useExternalSecretsStore } from '@/stores/externalSecrets.ee.store';
+import { useToast } from '@/composables/useToast';
+
+export function useExternalSecretsProvider(
+	provider: Ref<ExternalSecretsProvider>,
+	providerData: Ref<ExternalSecretsProviderData>,
+) {
+	const toast = useToast();
+	const externalSecretsStore = useExternalSecretsStore();
+
+	const initialConnectionState = ref<ExternalSecretsProviderWithProperties['state'] | undefined>(
+		'initializing',
+	);
+	const connectionState = computed(
+		() => externalSecretsStore.connectionState[provider.value?.name],
+	);
+	const setConnectionState = (state: ExternalSecretsProviderWithProperties['state']) => {
+		externalSecretsStore.setConnectionState(provider.value?.name, state);
+	};
+
+	const normalizedProviderData = computed(() => {
+		return Object.entries(providerData.value).reduce(
+			(acc, [key, value]) => {
+				const property = provider.value?.properties?.find((property) => property.name === key);
+				if (shouldDisplayProperty(property)) {
+					acc[key] = value;
+				}
+
+				return acc;
+			},
+			{} as Record<string, IUpdateInformation['value']>,
+		);
+	});
+
+	function shouldDisplayProperty(
+		property: ExternalSecretsProviderWithProperties['properties'][0],
+	): boolean {
+		let visible = true;
+
+		if (property.displayOptions?.show) {
+			visible =
+				visible &&
+				Object.entries(property.displayOptions.show).every(([key, value]) => {
+					return value?.includes(providerData.value[key]);
+				});
+		}
+
+		if (property.displayOptions?.hide) {
+			visible =
+				visible &&
+				!Object.entries(property.displayOptions.hide).every(([key, value]) => {
+					return value?.includes(providerData.value[key]);
+				});
+		}
+
+		return visible;
+	}
+
+	async function testConnection(options: { showError?: boolean } = { showError: true }) {
+		try {
+			const { testState } = await externalSecretsStore.testProviderConnection(
+				provider.value.name,
+				normalizedProviderData.value,
+			);
+			setConnectionState(testState);
+
+			return testState;
+		} catch (error) {
+			setConnectionState('error');
+
+			if (options.showError) {
+				toast.showError(error, 'Error', error.response?.data?.data.error);
+			}
+
+			return 'error';
+		} finally {
+			if (provider.value.connected && ['connected', 'error'].includes(connectionState.value)) {
+				externalSecretsStore.updateStoredProvider(provider.value.name, {
+					state: connectionState.value,
+				});
+			}
+		}
+	}
+
+	return {
+		initialConnectionState,
+		connectionState,
+		normalizedProviderData,
+		testConnection,
+		setConnectionState,
+		shouldDisplayProperty,
+	};
+}
diff --git a/packages/editor-ui/src/composables/useGlobalLinkActions.ts b/packages/editor-ui/src/composables/useGlobalLinkActions.ts
index ae20bbb086361..801fe1f71b6a7 100644
--- a/packages/editor-ui/src/composables/useGlobalLinkActions.ts
+++ b/packages/editor-ui/src/composables/useGlobalLinkActions.ts
@@ -2,19 +2,34 @@
  * Creates event listeners for `data-action` attribute to allow for actions to be called from locale without using
  * unsafe onclick attribute
  */
-import { reactive, del, computed, onMounted, onUnmounted, getCurrentInstance } from 'vue';
+import { reactive, computed, onMounted, onUnmounted } from 'vue';
+import { globalLinkActionsEventBus } from '@/event-bus';
 
 const state = reactive({
 	customActions: {} as Record<string, Function>,
+	delegatedClickHandler: null as null | ((e: MouseEvent) => void),
 });
 
 export default () => {
-	function registerCustomAction(key: string, action: Function) {
+	function registerCustomAction({ key, action }: { key: string; action: Function }) {
 		state.customActions[key] = action;
 	}
 	function unregisterCustomAction(key: string) {
-		del(state.customActions, key);
+		const { [key]: _, ...rest } = state.customActions;
+		state.customActions = rest;
 	}
+	function getElementAttributes(element: Element) {
+		const attributesObject: Record<string, string> = {};
+
+		for (let i = 0; i < element.attributes.length; i++) {
+			const attr = element.attributes[i];
+			if (attr.name.startsWith('data-action-parameter-')) {
+				attributesObject[attr.name.replace('data-action-parameter-', '')] = attr.value;
+			}
+		}
+		return attributesObject;
+	}
+
 	function delegateClick(e: MouseEvent) {
 		const clickedElement = e.target;
 		if (!(clickedElement instanceof Element) || clickedElement.tagName !== 'A') return;
@@ -22,7 +37,9 @@ export default () => {
 		const actionAttribute = clickedElement.getAttribute('data-action');
 		if (actionAttribute && typeof availableActions.value[actionAttribute] === 'function') {
 			e.preventDefault();
-			availableActions.value[actionAttribute]();
+			// Extract and parse `data-action-parameter-` attributes and pass them to the action
+			const elementAttributes = getElementAttributes(clickedElement);
+			availableActions.value[actionAttribute](elementAttributes);
 		}
 	}
 
@@ -40,15 +57,19 @@ export default () => {
 	}));
 
 	onMounted(() => {
-		const instance = getCurrentInstance();
+		if (state.delegatedClickHandler) return;
+
+		state.delegatedClickHandler = delegateClick;
 		window.addEventListener('click', delegateClick);
-		instance?.proxy.$root.$on('registerGlobalLinkAction', registerCustomAction);
+
+		globalLinkActionsEventBus.on('registerGlobalLinkAction', registerCustomAction);
 	});
 
 	onUnmounted(() => {
-		const instance = getCurrentInstance();
 		window.removeEventListener('click', delegateClick);
-		instance?.proxy.$root.$off('registerGlobalLinkAction', registerCustomAction);
+		state.delegatedClickHandler = null;
+
+		globalLinkActionsEventBus.off('registerGlobalLinkAction', registerCustomAction);
 	});
 
 	return {
diff --git a/packages/editor-ui/src/composables/useHistoryHelper.ts b/packages/editor-ui/src/composables/useHistoryHelper.ts
index c4c0241adb4fe..bbcaaf2004b68 100644
--- a/packages/editor-ui/src/composables/useHistoryHelper.ts
+++ b/packages/editor-ui/src/composables/useHistoryHelper.ts
@@ -1,34 +1,32 @@
 import { MAIN_HEADER_TABS } from '@/constants';
-import { useNDVStore } from '@/stores/ndv';
+import { useNDVStore } from '@/stores/ndv.store';
 import type { Undoable } from '@/models/history';
-import { BulkCommand } from '@/models/history';
-import { useHistoryStore } from '@/stores/history';
-import { useUIStore } from '@/stores/ui';
+import { BulkCommand, Command } from '@/models/history';
+import { useHistoryStore } from '@/stores/history.store';
+import { useUIStore } from '@/stores/ui.store';
 
-import { ref, onMounted, onUnmounted, Ref, nextTick, getCurrentInstance } from 'vue';
-import { Command } from '@/models/history';
-import { useDebounceHelper } from './useDebounce';
-import useDeviceSupportHelpers from './useDeviceSupport';
-import { getNodeViewTab } from '@/utils';
+import { onMounted, onUnmounted, nextTick } from 'vue';
+import { useDeviceSupport } from 'n8n-design-system';
+import { getNodeViewTab } from '@/utils/canvasUtils';
 import type { Route } from 'vue-router';
+import { useTelemetry } from './useTelemetry';
+import { useDebounce } from '@/composables/useDebounce';
 
 const UNDO_REDO_DEBOUNCE_INTERVAL = 100;
+const ELEMENT_UI_OVERLAY_SELECTOR = '.el-overlay';
 
 export function useHistoryHelper(activeRoute: Route) {
-	const instance = getCurrentInstance();
-	const telemetry = instance?.proxy.$telemetry;
+	const telemetry = useTelemetry();
 
 	const ndvStore = useNDVStore();
 	const historyStore = useHistoryStore();
 	const uiStore = useUIStore();
 
-	const { callDebounced } = useDebounceHelper();
-	const { isCtrlKeyPressed } = useDeviceSupportHelpers();
+	const { callDebounced } = useDebounce();
+	const { isCtrlKeyPressed } = useDeviceSupport();
 
-	const isNDVOpen = ref<boolean>(ndvStore.activeNodeName !== null);
-
-	const undo = () =>
-		callDebounced(
+	const undo = async () =>
+		await callDebounced(
 			async () => {
 				const command = historyStore.popUndoableToUndo();
 				if (!command) {
@@ -56,8 +54,8 @@ export function useHistoryHelper(activeRoute: Route) {
 			{ debounceTime: UNDO_REDO_DEBOUNCE_INTERVAL },
 		);
 
-	const redo = () =>
-		callDebounced(
+	const redo = async () =>
+		await callDebounced(
 			async () => {
 				const command = historyStore.popUndoableToRedo();
 				if (!command) {
@@ -87,38 +85,52 @@ export function useHistoryHelper(activeRoute: Route) {
 
 	function trackCommand(command: Undoable, type: 'undo' | 'redo'): void {
 		if (command instanceof Command) {
-			telemetry?.track(`User hit ${type}`, { commands_length: 1, commands: [command.name] });
+			telemetry.track(`User hit ${type}`, { commands_length: 1, commands: [command.name] });
 		} else if (command instanceof BulkCommand) {
-			telemetry?.track(`User hit ${type}`, {
+			telemetry.track(`User hit ${type}`, {
 				commands_length: command.commands.length,
 				commands: command.commands.map((c) => c.name),
 			});
 		}
 	}
 
-	function trackUndoAttempt(event: KeyboardEvent) {
-		if (isNDVOpen.value && !event.shiftKey) {
-			const activeNode = ndvStore.activeNode;
-			if (activeNode) {
-				telemetry?.track('User hit undo in NDV', { node_type: activeNode.type });
-			}
+	function trackUndoAttempt() {
+		const activeNode = ndvStore.activeNode;
+		if (activeNode) {
+			telemetry?.track('User hit undo in NDV', { node_type: activeNode.type });
 		}
 	}
 
+	/**
+	 * Checks if there is a Element UI dialog open by querying
+	 * for the visible overlay element.
+	 */
+	function isMessageDialogOpen(): boolean {
+		return (
+			document.querySelector(`${ELEMENT_UI_OVERLAY_SELECTOR}:not([style*="display: none"])`) !==
+			null
+		);
+	}
+
 	function handleKeyDown(event: KeyboardEvent) {
 		const currentNodeViewTab = getNodeViewTab(activeRoute);
+		const isNDVOpen = ndvStore.isNDVOpen;
+		const isAnyModalOpen = uiStore.isAnyModalOpen || isMessageDialogOpen();
+		const undoKeysPressed = isCtrlKeyPressed(event) && event.key.toLowerCase() === 'z';
 
 		if (event.repeat || currentNodeViewTab !== MAIN_HEADER_TABS.WORKFLOW) return;
-		if (isCtrlKeyPressed(event) && event.key.toLowerCase() === 'z') {
+		if (isNDVOpen || isAnyModalOpen) {
+			if (isNDVOpen && undoKeysPressed && !event.shiftKey) {
+				trackUndoAttempt();
+			}
+			return;
+		}
+		if (undoKeysPressed) {
 			event.preventDefault();
-			if (!isNDVOpen.value) {
-				if (event.shiftKey) {
-					redo();
-				} else {
-					undo();
-				}
-			} else if (!event.shiftKey) {
-				trackUndoAttempt(event);
+			if (event.shiftKey) {
+				void redo();
+			} else {
+				void undo();
 			}
 		}
 	}
diff --git a/packages/editor-ui/src/composables/useImportCurlCommand.ts b/packages/editor-ui/src/composables/useImportCurlCommand.ts
new file mode 100644
index 0000000000000..a9a2e6bd5b10d
--- /dev/null
+++ b/packages/editor-ui/src/composables/useImportCurlCommand.ts
@@ -0,0 +1,119 @@
+import type { MaybeRef } from 'vue';
+import { unref } from 'vue';
+import { CURL_IMPORT_NODES_PROTOCOLS, CURL_IMPORT_NOT_SUPPORTED_PROTOCOLS } from '@/constants';
+import { useToast } from '@/composables/useToast';
+import { useUIStore } from '@/stores/ui.store';
+import { useI18n } from '@/composables/useI18n';
+import { importCurlEventBus } from '@/event-bus';
+import type { BaseTextKey } from '@/plugins/i18n';
+
+export function useImportCurlCommand(options?: {
+	onImportSuccess?: () => void;
+	onImportFailure?: (data: { invalidProtocol: boolean; protocol?: string }) => void;
+	onAfterImport?: () => void;
+	i18n?: {
+		invalidCurCommand: {
+			title: string;
+			message: string;
+		};
+	};
+}) {
+	const uiStore = useUIStore();
+	const toast = useToast();
+	const i18n = useI18n();
+
+	const translationStrings = {
+		invalidCurCommand: {
+			title: 'importCurlParameter.showError.invalidCurlCommand.title',
+			message: 'importCurlParameter.showError.invalidCurlCommand.message',
+		},
+		...options?.i18n,
+	};
+
+	async function importCurlCommand(curlCommandRef: MaybeRef<string>): Promise<void> {
+		const curlCommand = unref(curlCommandRef);
+		if (curlCommand === '') return;
+
+		try {
+			const parameters = await uiStore.getCurlToJson(curlCommand);
+			const url = parameters['parameters.url'];
+
+			const invalidProtocol = CURL_IMPORT_NOT_SUPPORTED_PROTOCOLS.find((p) =>
+				url.includes(`${p}://`),
+			);
+
+			if (!invalidProtocol) {
+				importCurlEventBus.emit('setHttpNodeParameters', parameters);
+
+				options?.onImportSuccess?.();
+
+				return;
+				// if we have a node that supports the invalid protocol
+				// suggest that one
+			} else if (CURL_IMPORT_NODES_PROTOCOLS[invalidProtocol]) {
+				const useNode = CURL_IMPORT_NODES_PROTOCOLS[invalidProtocol];
+
+				showProtocolErrorWithSupportedNode(invalidProtocol, useNode);
+				// we do not have a node that supports the use protocol
+			} else {
+				showProtocolError(invalidProtocol);
+			}
+
+			options?.onImportFailure?.({
+				invalidProtocol: true,
+				protocol: invalidProtocol,
+			});
+		} catch (e) {
+			showInvalidcURLCommandError();
+
+			options?.onImportFailure?.({
+				invalidProtocol: false,
+			});
+		} finally {
+			options?.onAfterImport?.();
+		}
+	}
+
+	function showProtocolErrorWithSupportedNode(protocol: string, node: string): void {
+		toast.showToast({
+			title: i18n.baseText('importCurlParameter.showError.invalidProtocol1.title', {
+				interpolate: {
+					node,
+				},
+			}),
+			message: i18n.baseText('importCurlParameter.showError.invalidProtocol.message', {
+				interpolate: {
+					protocol: protocol.toUpperCase(),
+				},
+			}),
+			type: 'error',
+			duration: 0,
+		});
+	}
+
+	function showProtocolError(protocol: string): void {
+		toast.showToast({
+			title: i18n.baseText('importCurlParameter.showError.invalidProtocol2.title'),
+			message: i18n.baseText('importCurlParameter.showError.invalidProtocol.message', {
+				interpolate: {
+					protocol,
+				},
+			}),
+			type: 'error',
+			duration: 0,
+		});
+	}
+
+	function showInvalidcURLCommandError(): void {
+		toast.showToast({
+			title: i18n.baseText(translationStrings.invalidCurCommand.title as BaseTextKey),
+			message: i18n.baseText(translationStrings.invalidCurCommand.message as BaseTextKey),
+			type: 'error',
+			duration: 0,
+		});
+	}
+
+	return {
+		importCurlCommand,
+	};
+}
diff --git a/packages/editor-ui/src/composables/useLoadingService.ts b/packages/editor-ui/src/composables/useLoadingService.ts
new file mode 100644
index 0000000000000..c96ff16acda49
--- /dev/null
+++ b/packages/editor-ui/src/composables/useLoadingService.ts
@@ -0,0 +1,48 @@
+import { ref, computed } from 'vue';
+import { useI18n } from '@/composables/useI18n';
+import { ElLoading as Loading } from 'element-plus';
+
+interface LoadingService {
+	text: string;
+	close: () => void;
+}
+
+export function useLoadingService() {
+	const i18n = useI18n();
+	const loadingService = ref<LoadingService | null>(null);
+
+	function startLoading(text?: string) {
+		if (loadingService.value !== null) {
+			return;
+		}
+
+		loadingService.value = Loading.service({
+			lock: true,
+			text: text || i18n.baseText('genericHelpers.loading'),
+			background: 'var(--color-dialog-overlay-background)',
+		}) as unknown as LoadingService;
+	}
+
+	function setLoadingText(text: string) {
+		if (loadingService.value) {
+			loadingService.value.text = text;
+		}
+	}
+
+	function stopLoading() {
+		if (loadingService.value) {
+			loadingService.value.close();
+			loadingService.value = null;
+		}
+	}
+
+	const isLoading = computed(() => loadingService.value !== null);
+
+	return {
+		loadingService,
+		isLoading,
+		startLoading,
+		setLoadingText,
+		stopLoading,
+	};
+}
diff --git a/packages/editor-ui/src/composables/useMessage.ts b/packages/editor-ui/src/composables/useMessage.ts
index 2a5dd6e8e7ac8..ecf7a0ba1620d 100644
--- a/packages/editor-ui/src/composables/useMessage.ts
+++ b/packages/editor-ui/src/composables/useMessage.ts
@@ -1,11 +1,18 @@
-import type { ElMessageBoxOptions } from 'element-ui/types/message-box';
-import { Message, MessageBox } from 'element-ui';
+import type { ElMessageBoxOptions } from 'element-plus';
+import { ElMessageBox as MessageBox } from 'element-plus';
+
+export type MessageBoxConfirmResult = 'confirm' | 'cancel';
 
 export function useMessage() {
+	const handleCancelOrClose = (e: unknown) => {
+		if (e instanceof Error) throw e;
+		else return e;
+	};
+
 	async function alert(
-		message: string,
-		configOrTitle: string | ElMessageBoxOptions | undefined,
-		config: ElMessageBoxOptions | undefined,
+		message: ElMessageBoxOptions['message'],
+		configOrTitle?: string | ElMessageBoxOptions,
+		config?: ElMessageBoxOptions,
 	) {
 		const resolvedConfig = {
 			...(config || (typeof configOrTitle === 'object' ? configOrTitle : {})),
@@ -14,16 +21,18 @@ export function useMessage() {
 		};
 
 		if (typeof configOrTitle === 'string') {
-			return await MessageBox.alert(message, configOrTitle, resolvedConfig);
+			return await MessageBox.alert(message, configOrTitle, resolvedConfig).catch(
+				handleCancelOrClose,
+			);
 		}
-		return await MessageBox.alert(message, resolvedConfig);
+		return await MessageBox.alert(message, resolvedConfig).catch(handleCancelOrClose);
 	}
 
 	async function confirm(
-		message: string,
-		configOrTitle: string | ElMessageBoxOptions | undefined,
-		config: ElMessageBoxOptions | undefined,
-	) {
+		message: ElMessageBoxOptions['message'],
+		configOrTitle?: string | ElMessageBoxOptions,
+		config?: ElMessageBoxOptions,
+	): Promise<MessageBoxConfirmResult> {
 		const resolvedConfig = {
 			...(config || (typeof configOrTitle === 'object' ? configOrTitle : {})),
 			cancelButtonClass: 'btn--cancel',
@@ -34,15 +43,19 @@ export function useMessage() {
 		};
 
 		if (typeof configOrTitle === 'string') {
-			return await MessageBox.confirm(message, configOrTitle, resolvedConfig);
+			return await (MessageBox.confirm(message, configOrTitle, resolvedConfig).catch(
+				handleCancelOrClose,
+			) as unknown as Promise<MessageBoxConfirmResult>);
 		}
-		return await MessageBox.confirm(message, resolvedConfig);
+		return await (MessageBox.confirm(message, resolvedConfig).catch(
+			handleCancelOrClose,
+		) as unknown as Promise<MessageBoxConfirmResult>);
 	}
 
 	async function prompt(
-		message: string,
-		configOrTitle: string | ElMessageBoxOptions | undefined,
-		config: ElMessageBoxOptions | undefined,
+		message: ElMessageBoxOptions['message'],
+		configOrTitle?: string | ElMessageBoxOptions,
+		config?: ElMessageBoxOptions,
 	) {
 		const resolvedConfig = {
 			...(config || (typeof configOrTitle === 'object' ? configOrTitle : {})),
@@ -51,15 +64,17 @@ export function useMessage() {
 		};
 
 		if (typeof configOrTitle === 'string') {
-			return await MessageBox.prompt(message, configOrTitle, resolvedConfig);
+			return await MessageBox.prompt(message, configOrTitle, resolvedConfig).catch(
+				handleCancelOrClose,
+			);
 		}
-		return await MessageBox.prompt(message, resolvedConfig);
+		return await MessageBox.prompt(message, resolvedConfig).catch(handleCancelOrClose);
 	}
 
 	return {
 		alert,
 		confirm,
 		prompt,
-		message: Message,
+		message: MessageBox,
 	};
 }
diff --git a/packages/editor-ui/src/composables/useNodeHelpers.ts b/packages/editor-ui/src/composables/useNodeHelpers.ts
new file mode 100644
index 0000000000000..7eb41633b1c95
--- /dev/null
+++ b/packages/editor-ui/src/composables/useNodeHelpers.ts
@@ -0,0 +1,804 @@
+import { useHistoryStore } from '@/stores/history.store';
+import {
+	CUSTOM_API_CALL_KEY,
+	NODE_OUTPUT_DEFAULT_KEY,
+	PLACEHOLDER_FILLED_AT_EXECUTION_TIME,
+} from '@/constants';
+
+import { NodeHelpers, NodeConnectionType, ExpressionEvaluatorProxy } from 'n8n-workflow';
+import type {
+	INodeProperties,
+	INodeCredentialDescription,
+	INodeTypeDescription,
+	INodeIssues,
+	ICredentialType,
+	INodeIssueObjectProperty,
+	ConnectionTypes,
+	INodeInputConfiguration,
+	Workflow,
+	INodeExecutionData,
+	ITaskDataConnections,
+	IRunData,
+	IBinaryKeyData,
+	IDataObject,
+	INode,
+	INodePropertyOptions,
+	INodeCredentialsDetails,
+	INodeParameters,
+	ITaskData,
+} from 'n8n-workflow';
+
+import type {
+	ICredentialsResponse,
+	INodeUi,
+	INodeUpdatePropertiesInformation,
+	NodePanelType,
+} from '@/Interface';
+
+import { isString } from '@/utils/typeGuards';
+import { isObject } from '@/utils/objectUtils';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useUsersStore } from '@/stores/users.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import { useCredentialsStore } from '@/stores/credentials.store';
+import { get } from 'lodash-es';
+import { useI18n } from './useI18n';
+import { EnableNodeToggleCommand } from '@/models/history';
+import { useTelemetry } from './useTelemetry';
+import { getCredentialPermissions } from '@/permissions';
+import { hasPermission } from '@/rbac/permissions';
+import type { N8nPlusEndpoint } from '@/plugins/jsplumb/N8nPlusEndpointType';
+import * as NodeViewUtils from '@/utils/nodeViewUtils';
+import { useCanvasStore } from '@/stores/canvas.store';
+
+declare namespace HttpRequestNode {
+	namespace V2 {
+		type AuthParams = {
+			authentication: 'none' | 'genericCredentialType' | 'predefinedCredentialType';
+			genericAuthType: string;
+			nodeCredentialType: string;
+		};
+	}
+}
+
+export function useNodeHelpers() {
+	const credentialsStore = useCredentialsStore();
+	const historyStore = useHistoryStore();
+	const nodeTypesStore = useNodeTypesStore();
+	const workflowsStore = useWorkflowsStore();
+	const i18n = useI18n();
+	const canvasStore = useCanvasStore();
+
+	function hasProxyAuth(node: INodeUi): boolean {
+		return Object.keys(node.parameters).includes('nodeCredentialType');
+	}
+
+	function isCustomApiCallSelected(nodeValues: INodeParameters): boolean {
+		const { parameters } = nodeValues;
+
+		if (!isObject(parameters)) return false;
+
+		const { resource, operation } = parameters;
+		if (!isString(resource) || !isString(operation)) return false;
+
+		return resource.includes(CUSTOM_API_CALL_KEY) || operation.includes(CUSTOM_API_CALL_KEY);
+	}
+
+	function getParameterValue(nodeValues: INodeParameters, parameterName: string, path: string) {
+		return get(nodeValues, path ? path + '.' + parameterName : parameterName);
+	}
+
+	// Returns if the given parameter should be displayed or not
+	function displayParameter(
+		nodeValues: INodeParameters,
+		parameter: INodeProperties | INodeCredentialDescription,
+		path: string,
+		node: INodeUi | null,
+	) {
+		return NodeHelpers.displayParameterPath(nodeValues, parameter, path, node);
+	}
+
+	function refreshNodeIssues(): void {
+		const nodes = workflowsStore.allNodes;
+		const workflow = workflowsStore.getCurrentWorkflow();
+		let nodeType: INodeTypeDescription | null;
+		let foundNodeIssues: INodeIssues | null;
+
+		nodes.forEach((node) => {
+			if (node.disabled === true) return;
+
+			nodeType = nodeTypesStore.getNodeType(node.type, node.typeVersion);
+			foundNodeIssues = getNodeIssues(nodeType, node, workflow);
+			if (foundNodeIssues !== null) {
+				node.issues = foundNodeIssues;
+			}
+		});
+	}
+
+	function getNodeIssues(
+		nodeType: INodeTypeDescription | null,
+		node: INodeUi,
+		workflow: Workflow,
+		ignoreIssues?: string[],
+	): INodeIssues | null {
+		const pinDataNodeNames = Object.keys(workflowsStore.pinnedWorkflowData ?? {});
+
+		let nodeIssues: INodeIssues | null = null;
+		ignoreIssues = ignoreIssues ?? [];
+
+		if (node.disabled === true || pinDataNodeNames.includes(node.name)) {
+			// Ignore issues on disabled and pindata nodes
+			return null;
+		}
+
+		if (nodeType === null) {
+			// Node type is not known
+			if (!ignoreIssues.includes('typeUnknown')) {
+				nodeIssues = {
+					typeUnknown: true,
+				};
+			}
+		} else {
+			// Node type is known
+
+			// Add potential parameter issues
+			if (!ignoreIssues.includes('parameters')) {
+				nodeIssues = NodeHelpers.getNodeParametersIssues(nodeType.properties, node);
+			}
+
+			if (!ignoreIssues.includes('credentials')) {
+				// Add potential credential issues
+				const nodeCredentialIssues = getNodeCredentialIssues(node, nodeType);
+				if (nodeIssues === null) {
+					nodeIssues = nodeCredentialIssues;
+				} else {
+					NodeHelpers.mergeIssues(nodeIssues, nodeCredentialIssues);
+				}
+			}
+
+			const nodeInputIssues = getNodeInputIssues(workflow, node, nodeType);
+			if (nodeIssues === null) {
+				nodeIssues = nodeInputIssues;
+			} else {
+				NodeHelpers.mergeIssues(nodeIssues, nodeInputIssues);
+			}
+		}
+
+		if (hasNodeExecutionIssues(node) && !ignoreIssues.includes('execution')) {
+			if (nodeIssues === null) {
+				nodeIssues = {};
+			}
+			nodeIssues.execution = true;
+		}
+
+		return nodeIssues;
+	}
+
+	// Set the status on all the nodes which produced an error so that it can be
+	// displayed in the node-view
+	function hasNodeExecutionIssues(node: INodeUi): boolean {
+		const workflowResultData = workflowsStore.getWorkflowRunData;
+
+		if (workflowResultData === null || !workflowResultData.hasOwnProperty(node.name)) {
+			return false;
+		}
+
+		for (const taskData of workflowResultData[node.name]) {
+			if (taskData.error !== undefined) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	function reportUnsetCredential(credentialType: ICredentialType) {
+		return {
+			credentials: {
+				[credentialType.name]: [
+					i18n.baseText('nodeHelpers.credentialsUnset', {
+						interpolate: {
+							credentialType: credentialType.displayName,
+						},
+					}),
+				],
+			},
+		};
+	}
+
+	function updateNodesInputIssues() {
+		const nodes = workflowsStore.allNodes;
+		const workflow = workflowsStore.getCurrentWorkflow();
+
+		for (const node of nodes) {
+			const nodeType = nodeTypesStore.getNodeType(node.type, node.typeVersion);
+			if (!nodeType) {
+				return;
+			}
+			const nodeInputIssues = getNodeInputIssues(workflow, node, nodeType);
+
+			workflowsStore.setNodeIssue({
+				node: node.name,
+				type: 'input',
+				value: nodeInputIssues?.input ? nodeInputIssues.input : null,
+			});
+		}
+	}
+
+	function updateNodesExecutionIssues() {
+		const nodes = workflowsStore.allNodes;
+
+		for (const node of nodes) {
+			workflowsStore.setNodeIssue({
+				node: node.name,
+				type: 'execution',
+				value: hasNodeExecutionIssues(node) ? true : null,
+			});
+		}
+	}
+
+	function updateNodeCredentialIssuesByName(name: string): void {
+		const node = workflowsStore.getNodeByName(name);
+
+		if (node) {
+			updateNodeCredentialIssues(node);
+		}
+	}
+
+	function updateNodeCredentialIssues(node: INodeUi): void {
+		const fullNodeIssues: INodeIssues | null = getNodeCredentialIssues(node);
+
+		let newIssues: INodeIssueObjectProperty | null = null;
+		if (fullNodeIssues !== null) {
+			newIssues = fullNodeIssues.credentials!;
+		}
+
+		workflowsStore.setNodeIssue({
+			node: node.name,
+			type: 'credentials',
+			value: newIssues,
+		});
+	}
+
+	function updateNodeParameterIssuesByName(name: string): void {
+		const node = workflowsStore.getNodeByName(name);
+
+		if (node) {
+			updateNodeParameterIssues(node);
+		}
+	}
+
+	function updateNodeParameterIssues(node: INodeUi, nodeType?: INodeTypeDescription): void {
+		const localNodeType = nodeType ?? nodeTypesStore.getNodeType(node.type, node.typeVersion);
+
+		if (localNodeType === null) {
+			// Could not find localNodeType so can not update issues
+			return;
+		}
+
+		// All data got updated everywhere so update now the issues
+		const fullNodeIssues: INodeIssues | null = NodeHelpers.getNodeParametersIssues(
+			localNodeType.properties,
+			node,
+		);
+
+		let newIssues: INodeIssueObjectProperty | null = null;
+		if (fullNodeIssues !== null) {
+			newIssues = fullNodeIssues.parameters!;
+		}
+
+		workflowsStore.setNodeIssue({
+			node: node.name,
+			type: 'parameters',
+			value: newIssues,
+		});
+	}
+
+	function getNodeInputIssues(
+		workflow: Workflow,
+		node: INodeUi,
+		nodeType?: INodeTypeDescription,
+	): INodeIssues | null {
+		const foundIssues: INodeIssueObjectProperty = {};
+
+		const workflowNode = workflow.getNode(node.name);
+		let inputs: Array<ConnectionTypes | INodeInputConfiguration> = [];
+		if (nodeType && workflowNode) {
+			inputs = NodeHelpers.getNodeInputs(workflow, workflowNode, nodeType);
+		}
+
+		inputs.forEach((input) => {
+			if (typeof input === 'string' || input.required !== true) {
+				return;
+			}
+
+			const parentNodes = workflow.getParentNodes(node.name, input.type, 1);
+
+			if (parentNodes.length === 0) {
+				foundIssues[input.type] = [
+					i18n.baseText('nodeIssues.input.missing', {
+						interpolate: { inputName: input.displayName || input.type },
+					}),
+				];
+			}
+		});
+
+		if (Object.keys(foundIssues).length) {
+			return {
+				input: foundIssues,
+			};
+		}
+
+		return null;
+	}
+
+	function getNodeCredentialIssues(
+		node: INodeUi,
+		nodeType?: INodeTypeDescription,
+	): INodeIssues | null {
+		const localNodeType = nodeType ?? nodeTypesStore.getNodeType(node.type, node.typeVersion);
+		if (node.disabled) {
+			// Node is disabled
+			return null;
+		}
+		if (!localNodeType?.credentials) {
+			// Node does not need any credentials or nodeType could not be found
+			return null;
+		}
+
+		const foundIssues: INodeIssueObjectProperty = {};
+
+		let userCredentials: ICredentialsResponse[] | null;
+		let credentialType: ICredentialType | undefined;
+		let credentialDisplayName: string;
+		let selectedCredentials: INodeCredentialsDetails;
+
+		const { authentication, genericAuthType, nodeCredentialType } =
+			node.parameters as HttpRequestNode.V2.AuthParams;
+
+		if (
+			authentication === 'genericCredentialType' &&
+			genericAuthType !== '' &&
+			selectedCredsAreUnusable(node, genericAuthType)
+		) {
+			const credential = credentialsStore.getCredentialTypeByName(genericAuthType);
+			return credential ? reportUnsetCredential(credential) : null;
+		}
+
+		if (
+			hasProxyAuth(node) &&
+			authentication === 'predefinedCredentialType' &&
+			nodeCredentialType !== '' &&
+			node.credentials !== undefined
+		) {
+			const stored = credentialsStore.getCredentialsByType(nodeCredentialType);
+			// Prevents HTTP Request node from being unusable if a sharee does not have direct
+			// access to a credential
+			const isCredentialUsedInWorkflow =
+				workflowsStore.usedCredentials?.[node.credentials?.[nodeCredentialType]?.id as string];
+
+			if (
+				selectedCredsDoNotExist(node, nodeCredentialType, stored) &&
+				!isCredentialUsedInWorkflow
+			) {
+				const credential = credentialsStore.getCredentialTypeByName(nodeCredentialType);
+				return credential ? reportUnsetCredential(credential) : null;
+			}
+		}
+
+		if (
+			hasProxyAuth(node) &&
+			authentication === 'predefinedCredentialType' &&
+			nodeCredentialType !== '' &&
+			selectedCredsAreUnusable(node, nodeCredentialType)
+		) {
+			const credential = credentialsStore.getCredentialTypeByName(nodeCredentialType);
+			return credential ? reportUnsetCredential(credential) : null;
+		}
+
+		for (const credentialTypeDescription of localNodeType.credentials) {
+			// Check if credentials should be displayed else ignore
+			if (!displayParameter(node.parameters, credentialTypeDescription, '', node)) {
+				continue;
+			}
+
+			// Get the display name of the credential type
+			credentialType = credentialsStore.getCredentialTypeByName(credentialTypeDescription.name);
+			if (!credentialType) {
+				credentialDisplayName = credentialTypeDescription.name;
+			} else {
+				credentialDisplayName = credentialType.displayName;
+			}
+
+			if (!node.credentials?.[credentialTypeDescription.name]) {
+				// Credentials are not set
+				if (credentialTypeDescription.required) {
+					foundIssues[credentialTypeDescription.name] = [
+						i18n.baseText('nodeIssues.credentials.notSet', {
+							interpolate: { type: localNodeType.displayName },
+						}),
+					];
+				}
+			} else {
+				// If they are set check if the value is valid
+				selectedCredentials = node.credentials[credentialTypeDescription.name];
+				if (typeof selectedCredentials === 'string') {
+					selectedCredentials = {
+						id: null,
+						name: selectedCredentials,
+					};
+				}
+
+				const usersStore = useUsersStore();
+				const currentUser = usersStore.currentUser;
+				userCredentials = credentialsStore
+					.getCredentialsByType(credentialTypeDescription.name)
+					.filter((credential: ICredentialsResponse) => {
+						const permissions = getCredentialPermissions(currentUser, credential);
+						return permissions.use;
+					});
+
+				if (userCredentials === null) {
+					userCredentials = [];
+				}
+
+				if (selectedCredentials.id) {
+					const idMatch = userCredentials.find(
+						(credentialData) => credentialData.id === selectedCredentials.id,
+					);
+					if (idMatch) {
+						continue;
+					}
+				}
+
+				const nameMatches = userCredentials.filter(
+					(credentialData) => credentialData.name === selectedCredentials.name,
+				);
+				if (nameMatches.length > 1) {
+					foundIssues[credentialTypeDescription.name] = [
+						i18n.baseText('nodeIssues.credentials.notIdentified', {
+							interpolate: { name: selectedCredentials.name, type: credentialDisplayName },
+						}),
+						i18n.baseText('nodeIssues.credentials.notIdentified.hint'),
+					];
+					continue;
+				}
+
+				if (nameMatches.length === 0) {
+					const isCredentialUsedInWorkflow =
+						workflowsStore.usedCredentials?.[selectedCredentials.id as string];
+
+					if (
+						!isCredentialUsedInWorkflow &&
+						!hasPermission(['rbac'], { rbac: { scope: 'credential:read' } })
+					) {
+						foundIssues[credentialTypeDescription.name] = [
+							i18n.baseText('nodeIssues.credentials.doNotExist', {
+								interpolate: { name: selectedCredentials.name, type: credentialDisplayName },
+							}),
+							i18n.baseText('nodeIssues.credentials.doNotExist.hint'),
+						];
+					}
+				}
+			}
+		}
+
+		// TODO: Could later check also if the node has access to the credentials
+		if (Object.keys(foundIssues).length === 0) {
+			return null;
+		}
+
+		return {
+			credentials: foundIssues,
+		};
+	}
+	/**
+	 * Whether the node has no selected credentials, or none of the node's
+	 * selected credentials are of the specified type.
+	 */
+	function selectedCredsAreUnusable(node: INodeUi, credentialType: string) {
+		return !node.credentials || !Object.keys(node.credentials).includes(credentialType);
+	}
+
+	/**
+	 * Whether the node's selected credentials of the specified type
+	 * can no longer be found in the database.
+	 */
+	function selectedCredsDoNotExist(
+		node: INodeUi,
+		nodeCredentialType: string,
+		storedCredsByType: ICredentialsResponse[] | null,
+	) {
+		if (!node.credentials || !storedCredsByType) return false;
+
+		const selectedCredsByType = node.credentials[nodeCredentialType];
+
+		if (!selectedCredsByType) return false;
+
+		return !storedCredsByType.find((c) => c.id === selectedCredsByType.id);
+	}
+
+	function updateNodesCredentialsIssues() {
+		const nodes = workflowsStore.allNodes;
+		let issues: INodeIssues | null;
+
+		for (const node of nodes) {
+			issues = getNodeCredentialIssues(node);
+
+			workflowsStore.setNodeIssue({
+				node: node.name,
+				type: 'credentials',
+				value: issues === null ? null : issues.credentials,
+			});
+		}
+	}
+
+	function getNodeInputData(
+		node: INodeUi | null,
+		runIndex = 0,
+		outputIndex = 0,
+		paneType: NodePanelType = 'output',
+		connectionType: ConnectionTypes = NodeConnectionType.Main,
+	): INodeExecutionData[] {
+		if (node === null) {
+			return [];
+		}
+		if (workflowsStore.getWorkflowExecution === null) {
+			return [];
+		}
+
+		const executionData = workflowsStore.getWorkflowExecution.data;
+		if (!executionData?.resultData) {
+			// unknown status
+			return [];
+		}
+		const runData = executionData.resultData.runData;
+
+		const taskData = get(runData, [node.name, runIndex]);
+		if (!taskData) {
+			return [];
+		}
+
+		let data: ITaskDataConnections | undefined = taskData.data;
+		if (paneType === 'input' && taskData.inputOverride) {
+			data = taskData.inputOverride;
+		}
+
+		if (!data) {
+			return [];
+		}
+
+		return getInputData(data, outputIndex, connectionType);
+	}
+
+	function getInputData(
+		connectionsData: ITaskDataConnections,
+		outputIndex: number,
+		connectionType: ConnectionTypes = NodeConnectionType.Main,
+	): INodeExecutionData[] {
+		return connectionsData?.[connectionType]?.[outputIndex] ?? [];
+	}
+
+	function getBinaryData(
+		workflowRunData: IRunData | null,
+		node: string | null,
+		runIndex: number,
+		outputIndex: number,
+		connectionType: ConnectionTypes = NodeConnectionType.Main,
+	): IBinaryKeyData[] {
+		if (node === null) {
+			return [];
+		}
+
+		const runData: IRunData | null = workflowRunData;
+
+		const runDataOfNode = runData?.[node]?.[runIndex]?.data;
+		if (!runDataOfNode) {
+			return [];
+		}
+
+		const inputData = getInputData(runDataOfNode, outputIndex, connectionType);
+
+		const returnData: IBinaryKeyData[] = [];
+		for (let i = 0; i < inputData.length; i++) {
+			const binaryDataInIdx = inputData[i]?.binary;
+			if (binaryDataInIdx !== undefined) {
+				returnData.push(binaryDataInIdx);
+			}
+		}
+
+		return returnData;
+	}
+
+	function disableNodes(nodes: INodeUi[], trackHistory = false) {
+		const telemetry = useTelemetry();
+
+		if (trackHistory) {
+			historyStore.startRecordingUndo();
+		}
+
+		const newDisabledState = nodes.some((node) => !node.disabled);
+		for (const node of nodes) {
+			if (newDisabledState === node.disabled) {
+				continue;
+			}
+
+			// Toggle disabled flag
+			const updateInformation = {
+				name: node.name,
+				properties: {
+					disabled: newDisabledState,
+				} as IDataObject,
+			} as INodeUpdatePropertiesInformation;
+
+			telemetry.track('User set node enabled status', {
+				node_type: node.type,
+				is_enabled: node.disabled,
+				workflow_id: workflowsStore.workflowId,
+			});
+
+			workflowsStore.updateNodeProperties(updateInformation);
+			workflowsStore.clearNodeExecutionData(node.name);
+			updateNodeParameterIssues(node);
+			updateNodeCredentialIssues(node);
+			updateNodesInputIssues();
+			if (trackHistory) {
+				historyStore.pushCommandToUndo(
+					new EnableNodeToggleCommand(node.name, node.disabled === true, newDisabledState),
+				);
+			}
+		}
+		if (trackHistory) {
+			historyStore.stopRecordingUndo();
+		}
+	}
+
+	function getNodeSubtitle(
+		data: INode,
+		nodeType: INodeTypeDescription,
+		workflow: Workflow,
+	): string | undefined {
+		if (!data) {
+			return undefined;
+		}
+
+		if (data.notesInFlow) {
+			return data.notes;
+		}
+
+		if (nodeType?.subtitle !== undefined) {
+			try {
+				ExpressionEvaluatorProxy.setEvaluator(
+					useSettingsStore().settings.expressions?.evaluator ?? 'tmpl',
+				);
+				return workflow.expression.getSimpleParameterValue(
+					data,
+					nodeType.subtitle,
+					'internal',
+					{},
+					undefined,
+					PLACEHOLDER_FILLED_AT_EXECUTION_TIME,
+				) as string | undefined;
+			} catch (e) {
+				return undefined;
+			}
+		}
+
+		if (data.parameters.operation !== undefined) {
+			const operation = data.parameters.operation as string;
+			if (nodeType === null) {
+				return operation;
+			}
+
+			const operationData = nodeType.properties.find((property: INodeProperties) => {
+				return property.name === 'operation';
+			});
+			if (operationData === undefined) {
+				return operation;
+			}
+
+			if (operationData.options === undefined) {
+				return operation;
+			}
+
+			const optionData = operationData.options.find((option) => {
+				return (option as INodePropertyOptions).value === data.parameters.operation;
+			});
+			if (optionData === undefined) {
+				return operation;
+			}
+
+			return optionData.name;
+		}
+		return undefined;
+	}
+
+	function setSuccessOutput(data: ITaskData[], sourceNode: INodeUi | null) {
+		if (!sourceNode) {
+			throw new Error('Source node is null or not defined');
+		}
+
+		const allNodeConnections = workflowsStore.outgoingConnectionsByNodeName(sourceNode.name);
+
+		const connectionType = Object.keys(allNodeConnections)[0];
+		const nodeConnections = allNodeConnections[connectionType];
+		const outputMap = NodeViewUtils.getOutputSummary(
+			data,
+			nodeConnections || [],
+			(connectionType as ConnectionTypes) ?? NodeConnectionType.Main,
+		);
+		const sourceNodeType = nodeTypesStore.getNodeType(sourceNode.type, sourceNode.typeVersion);
+
+		Object.keys(outputMap).forEach((sourceOutputIndex: string) => {
+			Object.keys(outputMap[sourceOutputIndex]).forEach((targetNodeName: string) => {
+				Object.keys(outputMap[sourceOutputIndex][targetNodeName]).forEach(
+					(targetInputIndex: string) => {
+						if (targetNodeName) {
+							const targetNode = workflowsStore.getNodeByName(targetNodeName);
+							const connection = NodeViewUtils.getJSPlumbConnection(
+								sourceNode,
+								parseInt(sourceOutputIndex, 10),
+								targetNode,
+								parseInt(targetInputIndex, 10),
+								connectionType as ConnectionTypes,
+								sourceNodeType,
+								canvasStore.jsPlumbInstance,
+							);
+
+							if (connection) {
+								const output = outputMap[sourceOutputIndex][targetNodeName][targetInputIndex];
+
+								if (output.isArtificialRecoveredEventItem) {
+									NodeViewUtils.recoveredConnection(connection);
+								} else if (!output?.total && !output.isArtificialRecoveredEventItem) {
+									NodeViewUtils.resetConnection(connection);
+								} else {
+									NodeViewUtils.addConnectionOutputSuccess(connection, output);
+								}
+							}
+						}
+
+						const endpoint = NodeViewUtils.getPlusEndpoint(
+							sourceNode,
+							parseInt(sourceOutputIndex, 10),
+							canvasStore.jsPlumbInstance,
+						);
+						if (endpoint?.endpoint) {
+							const output = outputMap[sourceOutputIndex][NODE_OUTPUT_DEFAULT_KEY][0];
+
+							if (output && output.total > 0) {
+								(endpoint.endpoint as N8nPlusEndpoint).setSuccessOutput(
+									NodeViewUtils.getRunItemsLabel(output),
+								);
+							} else {
+								(endpoint.endpoint as N8nPlusEndpoint).clearSuccessOutput();
+							}
+						}
+					},
+				);
+			});
+		});
+	}
+
+	return {
+		hasProxyAuth,
+		isCustomApiCallSelected,
+		getParameterValue,
+		displayParameter,
+		getNodeIssues,
+		refreshNodeIssues,
+		updateNodesInputIssues,
+		updateNodesExecutionIssues,
+		updateNodeCredentialIssuesByName,
+		updateNodeCredentialIssues,
+		updateNodeParameterIssuesByName,
+		updateNodeParameterIssues,
+		getBinaryData,
+		disableNodes,
+		getNodeSubtitle,
+		updateNodesCredentialsIssues,
+		getNodeInputData,
+		setSuccessOutput,
+	};
+}
diff --git a/packages/editor-ui/src/composables/useNodeSpecificationValues.ts b/packages/editor-ui/src/composables/useNodeSpecificationValues.ts
new file mode 100644
index 0000000000000..8f55949e8efd7
--- /dev/null
+++ b/packages/editor-ui/src/composables/useNodeSpecificationValues.ts
@@ -0,0 +1,35 @@
+import type { INodePropertyTypeOptions, ResourceMapperTypeOptions } from 'n8n-workflow';
+import { computed } from 'vue';
+import { i18n as locale } from '@/plugins/i18n';
+
+export function useNodeSpecificationValues(typeOptions: INodePropertyTypeOptions | undefined) {
+	const resourceMapperTypeOptions = computed<ResourceMapperTypeOptions | undefined>(() => {
+		return typeOptions?.resourceMapper;
+	});
+
+	const singularFieldWord = computed<string>(() => {
+		const singularFieldWord =
+			resourceMapperTypeOptions.value?.fieldWords?.singular || locale.baseText('generic.field');
+		return singularFieldWord;
+	});
+
+	const singularFieldWordCapitalized = computed<string>(() => {
+		return singularFieldWord.value.charAt(0).toUpperCase() + singularFieldWord.value.slice(1);
+	});
+
+	const pluralFieldWord = computed<string>(() => {
+		return resourceMapperTypeOptions.value?.fieldWords?.plural || locale.baseText('generic.fields');
+	});
+
+	const pluralFieldWordCapitalized = computed<string>(() => {
+		return pluralFieldWord.value.charAt(0).toUpperCase() + pluralFieldWord.value.slice(1);
+	});
+
+	return {
+		resourceMapperTypeOptions,
+		singularFieldWord,
+		singularFieldWordCapitalized,
+		pluralFieldWord,
+		pluralFieldWordCapitalized,
+	};
+}
diff --git a/packages/editor-ui/src/composables/useNodeType.ts b/packages/editor-ui/src/composables/useNodeType.ts
new file mode 100644
index 0000000000000..d41c22c001f4b
--- /dev/null
+++ b/packages/editor-ui/src/composables/useNodeType.ts
@@ -0,0 +1,52 @@
+import type { MaybeRef } from 'vue';
+import { computed, unref } from 'vue';
+import type { INodeTypeDescription } from 'n8n-workflow';
+import type { INodeUi, SimplifiedNodeType } from '@/Interface';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import { NodeConnectionType, NodeHelpers } from 'n8n-workflow';
+
+export function useNodeType(
+	options: {
+		node?: MaybeRef<INodeUi | null>;
+		nodeType?: MaybeRef<INodeTypeDescription | SimplifiedNodeType | null>;
+	} = {},
+) {
+	const nodeTypesStore = useNodeTypesStore();
+
+	const nodeType = computed(() => {
+		if (options.nodeType) {
+			return unref(options.nodeType);
+		}
+
+		const activeNode = unref(options.node);
+		if (activeNode) {
+			return nodeTypesStore.getNodeType(activeNode.type, activeNode.typeVersion);
+		}
+
+		return null;
+	});
+
+	const isSubNodeType = computed(() => {
+		if (!nodeType.value?.outputs || typeof nodeType.value?.outputs === 'string') {
+			return false;
+		}
+		const outputTypes = NodeHelpers.getConnectionTypes(nodeType.value?.outputs);
+		return outputTypes
+			? outputTypes.filter((output) => output !== NodeConnectionType.Main).length > 0
+			: false;
+	});
+
+	const isMultipleOutputsNodeType = computed(() => {
+		const outputs = nodeType.value?.outputs;
+
+		if (typeof outputs === 'string') return false; // e.g. Webhook node
+
+		return (outputs ?? []).length > 1;
+	});
+
+	return {
+		nodeType,
+		isSubNodeType,
+		isMultipleOutputsNodeType,
+	};
+}
diff --git a/packages/editor-ui/src/composables/usePinnedData.ts b/packages/editor-ui/src/composables/usePinnedData.ts
new file mode 100644
index 0000000000000..1dce344656123
--- /dev/null
+++ b/packages/editor-ui/src/composables/usePinnedData.ts
@@ -0,0 +1,281 @@
+import { useToast } from '@/composables/useToast';
+import { useI18n } from '@/composables/useI18n';
+import type { INodeExecutionData, IPinData } from 'n8n-workflow';
+import { jsonParse, jsonStringify, NodeConnectionType, NodeHelpers } from 'n8n-workflow';
+import {
+	MAX_EXPECTED_REQUEST_SIZE,
+	MAX_PINNED_DATA_SIZE,
+	MAX_WORKFLOW_SIZE,
+	PIN_DATA_NODE_TYPES_DENYLIST,
+} from '@/constants';
+import { stringSizeInBytes } from '@/utils/typesUtils';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import type { INodeUi, IRunDataDisplayMode } from '@/Interface';
+import { useExternalHooks } from '@/composables/useExternalHooks';
+import { useTelemetry } from '@/composables/useTelemetry';
+import type { MaybeRef } from 'vue';
+import { computed, unref } from 'vue';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import { storeToRefs } from 'pinia';
+import { useNodeType } from '@/composables/useNodeType';
+import { useDataSchema } from './useDataSchema';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+
+export type PinDataSource =
+	| 'pin-icon-click'
+	| 'save-edit'
+	| 'on-ndv-close-modal'
+	| 'duplicate-node'
+	| 'add-nodes'
+	| 'context-menu'
+	| 'keyboard-shortcut';
+
+export type UnpinDataSource =
+	| 'unpin-and-execute-modal'
+	| 'context-menu'
+	| 'keyboard-shortcut'
+	| 'unpin-and-send-chat-message-modal';
+
+export function usePinnedData(
+	node: MaybeRef<INodeUi | null>,
+	options: {
+		displayMode?: MaybeRef<IRunDataDisplayMode>;
+		runIndex?: MaybeRef<number>;
+	} = {},
+) {
+	const rootStore = useRootStore();
+	const workflowsStore = useWorkflowsStore();
+	const toast = useToast();
+	const i18n = useI18n();
+	const telemetry = useTelemetry();
+	const externalHooks = useExternalHooks();
+	const { getInputDataWithPinned } = useDataSchema();
+
+	const { pushRef } = storeToRefs(rootStore);
+	const { isSubNodeType, isMultipleOutputsNodeType } = useNodeType({
+		node,
+	});
+
+	const data = computed<IPinData[string] | undefined>(() => {
+		const targetNode = unref(node);
+		return targetNode ? workflowsStore.pinDataByNodeName(targetNode.name) : undefined;
+	});
+
+	const hasData = computed<boolean>(() => {
+		const targetNode = unref(node);
+		return !!targetNode && typeof data.value !== 'undefined';
+	});
+
+	const isValidNodeType = computed(() => {
+		const targetNode = unref(node);
+		return (
+			!!targetNode &&
+			!isSubNodeType.value &&
+			!isMultipleOutputsNodeType.value &&
+			!PIN_DATA_NODE_TYPES_DENYLIST.includes(targetNode.type)
+		);
+	});
+
+	function canPinNode(checkDataEmpty = false) {
+		const targetNode = unref(node);
+		if (targetNode === null) return false;
+
+		const nodeType = useNodeTypesStore().getNodeType(targetNode.type, targetNode.typeVersion);
+		const dataToPin = getInputDataWithPinned(targetNode);
+
+		if (!nodeType || (checkDataEmpty && dataToPin.length === 0)) return false;
+
+		const workflow = workflowsStore.getCurrentWorkflow();
+		const outputs = NodeHelpers.getNodeOutputs(workflow, targetNode, nodeType);
+		const mainOutputs = outputs.filter((output) =>
+			typeof output === 'string'
+				? output === NodeConnectionType.Main
+				: output.type === NodeConnectionType.Main,
+		);
+
+		return mainOutputs.length === 1 && !PIN_DATA_NODE_TYPES_DENYLIST.includes(targetNode.type);
+	}
+
+	function isValidJSON(data: string): boolean {
+		try {
+			JSON.parse(data);
+
+			return true;
+		} catch (error) {
+			const title = i18n.baseText('runData.editOutputInvalid');
+
+			const toRemove = new RegExp(/JSON\.parse:|of the JSON data/, 'g');
+			const message = error.message.replace(toRemove, '').trim();
+			const positionMatchRegEx = /at position (\d+)/;
+			const positionMatch = error.message.match(positionMatchRegEx);
+
+			error.message = message.charAt(0).toUpperCase() + message.slice(1);
+			error.message = error.message.replace(
+				"Unexpected token ' in JSON",
+				i18n.baseText('runData.editOutputInvalid.singleQuote'),
+			);
+
+			if (positionMatch) {
+				const position = parseInt(positionMatch[1], 10);
+				const lineBreaksUpToPosition = (data.slice(0, position).match(/\n/g) || []).length;
+
+				error.message = error.message.replace(
+					positionMatchRegEx,
+					i18n.baseText('runData.editOutputInvalid.atPosition', {
+						interpolate: {
+							position: `${position}`,
+						},
+					}),
+				);
+
+				error.message = `${i18n.baseText('runData.editOutputInvalid.onLine', {
+					interpolate: {
+						line: `${lineBreaksUpToPosition + 1}`,
+					},
+				})} ${error.message}`;
+			}
+
+			toast.showError(error, title);
+
+			return false;
+		}
+	}
+
+	function isValidSize(data: string | object): boolean {
+		const targetNode = unref(node);
+		if (!targetNode) {
+			return false;
+		}
+
+		if (typeof data === 'object') data = JSON.stringify(data);
+
+		const { pinData: currentPinData, ...workflow } = workflowsStore.getCurrentWorkflow();
+		const workflowJson = jsonStringify(workflow, { replaceCircularRefs: true });
+
+		const newPinData = { ...currentPinData, [targetNode.name]: data };
+		const newPinDataSize = workflowsStore.getPinDataSize(newPinData);
+
+		if (newPinDataSize > MAX_PINNED_DATA_SIZE) {
+			toast.showError(
+				new Error(i18n.baseText('ndv.pinData.error.tooLarge.description')),
+				i18n.baseText('ndv.pinData.error.tooLarge.title'),
+			);
+
+			return false;
+		}
+
+		if (
+			stringSizeInBytes(workflowJson) + newPinDataSize >
+			MAX_WORKFLOW_SIZE - MAX_EXPECTED_REQUEST_SIZE
+		) {
+			toast.showError(
+				new Error(i18n.baseText('ndv.pinData.error.tooLargeWorkflow.description')),
+				i18n.baseText('ndv.pinData.error.tooLargeWorkflow.title'),
+			);
+
+			return false;
+		}
+
+		return true;
+	}
+
+	function onSetDataSuccess({ source }: { source: PinDataSource }) {
+		const targetNode = unref(node);
+		const displayMode = unref(options.displayMode);
+		const runIndex = unref(options.runIndex);
+		const telemetryPayload = {
+			pinning_source: source,
+			node_type: targetNode?.type,
+			push_ref: pushRef.value,
+			data_size: stringSizeInBytes(data.value),
+			view: displayMode,
+			run_index: runIndex,
+		};
+
+		void externalHooks.run('runData.onDataPinningSuccess', telemetryPayload);
+		telemetry.track('Ndv data pinning success', telemetryPayload);
+	}
+
+	function onSetDataError({
+		errorType,
+		source,
+	}: {
+		errorType: 'data-too-large' | 'invalid-json';
+		source: PinDataSource;
+	}) {
+		const targetNode = unref(node);
+		const displayMode = unref(options.displayMode);
+		const runIndex = unref(options.runIndex);
+
+		telemetry.track('Ndv data pinning failure', {
+			pinning_source: source,
+			node_type: targetNode?.type,
+			push_ref: pushRef.value,
+			data_size: stringSizeInBytes(data.value),
+			view: displayMode,
+			run_index: runIndex,
+			error_type: errorType,
+		});
+	}
+
+	function setData(data: string | INodeExecutionData[], source: PinDataSource) {
+		const targetNode = unref(node);
+		if (!targetNode) {
+			return;
+		}
+
+		if (typeof data === 'string') {
+			if (!isValidJSON(data)) {
+				onSetDataError({ errorType: 'invalid-json', source });
+				throw new Error('Invalid JSON');
+			}
+
+			data = jsonParse(data);
+		}
+
+		if (!isValidSize(data)) {
+			onSetDataError({ errorType: 'data-too-large', source });
+			throw new Error('Data too large');
+		}
+
+		workflowsStore.pinData({ node: targetNode, data: data as INodeExecutionData[] });
+		onSetDataSuccess({ source });
+	}
+
+	function onUnsetData({ source }: { source: UnpinDataSource }) {
+		const targetNode = unref(node);
+		const runIndex = unref(options.runIndex);
+
+		telemetry.track('User unpinned ndv data', {
+			node_type: targetNode?.type,
+			push_ref: pushRef.value,
+			run_index: runIndex,
+			source,
+			data_size: stringSizeInBytes(data.value),
+		});
+	}
+
+	function unsetData(source: UnpinDataSource): void {
+		const targetNode = unref(node);
+		if (!targetNode) {
+			return;
+		}
+
+		onUnsetData({ source });
+		workflowsStore.unpinData({ node: targetNode });
+	}
+
+	return {
+		data,
+		hasData,
+		isValidNodeType,
+		canPinNode,
+		setData,
+		onSetDataSuccess,
+		onSetDataError,
+		unsetData,
+		onUnsetData,
+		isValidJSON,
+		isValidSize,
+	};
+}
diff --git a/packages/editor-ui/src/composables/usePushConnection.spec.ts b/packages/editor-ui/src/composables/usePushConnection.spec.ts
new file mode 100644
index 0000000000000..595f0dfa22e73
--- /dev/null
+++ b/packages/editor-ui/src/composables/usePushConnection.spec.ts
@@ -0,0 +1,123 @@
+import { usePushConnection } from '@/composables/usePushConnection';
+import { useRouter } from 'vue-router';
+import { createPinia, setActivePinia } from 'pinia';
+import { usePushConnectionStore } from '@/stores/pushConnection.store';
+import { useCollaborationStore } from '@/stores/collaboration.store';
+import type { IPushData, PushDataWorkerStatusMessage } from '@/Interface';
+import { useOrchestrationStore } from '@/stores/orchestration.store';
+
+vi.mock('vue-router', () => {
+	return {
+		RouterLink: vi.fn(),
+		useRouter: () => ({
+			push: vi.fn(),
+		}),
+	};
+});
+
+vi.useFakeTimers();
+
+describe('usePushConnection()', () => {
+	let router: ReturnType<typeof useRouter>;
+	let pushStore: ReturnType<typeof usePushConnectionStore>;
+	let collaborationStore: ReturnType<typeof useCollaborationStore>;
+	let orchestrationStore: ReturnType<typeof useOrchestrationStore>;
+	let pushConnection: ReturnType<typeof usePushConnection>;
+
+	beforeEach(() => {
+		setActivePinia(createPinia());
+
+		router = vi.mocked(useRouter)();
+		pushStore = usePushConnectionStore();
+		collaborationStore = useCollaborationStore();
+		orchestrationStore = useOrchestrationStore();
+		pushConnection = usePushConnection({ router });
+	});
+
+	describe('initialize()', () => {
+		it('should add event listener to the pushStore', () => {
+			const spy = vi.spyOn(pushStore, 'addEventListener').mockImplementation(() => () => {});
+
+			pushConnection.initialize();
+
+			expect(spy).toHaveBeenCalled();
+		});
+
+		it('should initialize collaborationStore', () => {
+			const spy = vi.spyOn(collaborationStore, 'initialize').mockImplementation(() => {});
+			pushConnection.initialize();
+			expect(spy).toHaveBeenCalled();
+		});
+	});
+
+	describe('terminate()', () => {
+		it('should remove event listener from the pushStore', () => {
+			const returnFn = vi.fn();
+			vi.spyOn(pushStore, 'addEventListener').mockImplementation(() => returnFn);
+
+			pushConnection.initialize();
+			pushConnection.terminate();
+
+			expect(returnFn).toHaveBeenCalled();
+		});
+
+		it('should terminate collaborationStore', () => {
+			const spy = vi.spyOn(collaborationStore, 'terminate').mockImplementation(() => {});
+			pushConnection.terminate();
+			expect(spy).toHaveBeenCalled();
+		});
+	});
+
+	describe('queuePushMessage()', () => {
+		it('should add message to the queue and sets timeout if not already set', () => {
+			const event: IPushData = {
+				type: 'sendWorkerStatusMessage',
+				data: {
+					workerId: '1',
+					status: {},
+				},
+			} as PushDataWorkerStatusMessage;
+
+			pushConnection.queuePushMessage(event, 5);
+
+			expect(pushConnection.pushMessageQueue.value).toHaveLength(1);
+			expect(pushConnection.pushMessageQueue.value[0]).toEqual({ message: event, retriesLeft: 5 });
+			expect(pushConnection.retryTimeout.value).not.toBeNull();
+		});
+	});
+
+	describe('processWaitingPushMessages()', () => {
+		it('should clear the queue and reset the timeout', async () => {
+			const event: IPushData = { type: 'executionRecovered', data: { executionId: '1' } };
+
+			pushConnection.queuePushMessage(event, 0);
+			expect(pushConnection.pushMessageQueue.value).toHaveLength(1);
+			expect(pushConnection.retryTimeout.value).toBeDefined();
+
+			await pushConnection.processWaitingPushMessages();
+
+			expect(pushConnection.pushMessageQueue.value).toHaveLength(0);
+			expect(pushConnection.retryTimeout.value).toBeNull();
+		});
+	});
+
+	describe('pushMessageReceived()', () => {
+		describe('sendWorkerStatusMessage', () => {
+			it('should handle event type correctly', async () => {
+				const spy = vi.spyOn(orchestrationStore, 'updateWorkerStatus').mockImplementation(() => {});
+				const event: IPushData = {
+					type: 'sendWorkerStatusMessage',
+					data: {
+						workerId: '1',
+						status: {},
+					},
+				} as PushDataWorkerStatusMessage;
+
+				const result = await pushConnection.pushMessageReceived(event);
+
+				expect(spy).toHaveBeenCalledWith(event.data.status);
+				expect(result).toBeTruthy();
+			});
+		});
+	});
+});
diff --git a/packages/editor-ui/src/composables/usePushConnection.ts b/packages/editor-ui/src/composables/usePushConnection.ts
new file mode 100644
index 0000000000000..4762b8aba9975
--- /dev/null
+++ b/packages/editor-ui/src/composables/usePushConnection.ts
@@ -0,0 +1,632 @@
+import type {
+	IExecutionResponse,
+	IExecutionsCurrentSummaryExtended,
+	IPushData,
+	IPushDataExecutionFinished,
+} from '@/Interface';
+
+import { useNodeHelpers } from '@/composables/useNodeHelpers';
+import { useTitleChange } from '@/composables/useTitleChange';
+import { useToast } from '@/composables/useToast';
+
+import type {
+	ExpressionError,
+	IDataObject,
+	INodeTypeNameVersion,
+	IRun,
+	IRunExecutionData,
+	IWorkflowBase,
+	SubworkflowOperationError,
+	IExecuteContextData,
+	NodeOperationError,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+import { TelemetryHelpers } from 'n8n-workflow';
+
+import { WORKFLOW_SETTINGS_MODAL_KEY } from '@/constants';
+import { getTriggerNodeServiceName } from '@/utils/nodeTypesUtils';
+import { codeNodeEditorEventBus, globalLinkActionsEventBus } from '@/event-bus';
+import { useUIStore } from '@/stores/ui.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import { useCredentialsStore } from '@/stores/credentials.store';
+import { useSettingsStore } from '@/stores/settings.store';
+import { parse } from 'flatted';
+import { useSegment } from '@/stores/segment.store';
+import { ref } from 'vue';
+import { useOrchestrationStore } from '@/stores/orchestration.store';
+import { usePushConnectionStore } from '@/stores/pushConnection.store';
+import { useCollaborationStore } from '@/stores/collaboration.store';
+import { useExternalHooks } from '@/composables/useExternalHooks';
+import type { useRouter } from 'vue-router';
+import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
+import { useI18n } from '@/composables/useI18n';
+import { useTelemetry } from '@/composables/useTelemetry';
+import type { PushMessageQueueItem } from '@/types';
+
+export function usePushConnection({ router }: { router: ReturnType<typeof useRouter> }) {
+	const workflowHelpers = useWorkflowHelpers({ router });
+	const nodeHelpers = useNodeHelpers();
+	const titleChange = useTitleChange();
+	const toast = useToast();
+	const i18n = useI18n();
+	const telemetry = useTelemetry();
+
+	const collaborationStore = useCollaborationStore();
+	const credentialsStore = useCredentialsStore();
+	const nodeTypesStore = useNodeTypesStore();
+	const orchestrationManagerStore = useOrchestrationStore();
+	const pushStore = usePushConnectionStore();
+	const settingsStore = useSettingsStore();
+	const segmentStore = useSegment();
+	const uiStore = useUIStore();
+	const workflowsStore = useWorkflowsStore();
+
+	const retryTimeout = ref<NodeJS.Timeout | null>(null);
+	const pushMessageQueue = ref<PushMessageQueueItem[]>([]);
+	const removeEventListener = ref<(() => void) | null>(null);
+
+	function initialize() {
+		removeEventListener.value = pushStore.addEventListener((message) => {
+			void pushMessageReceived(message);
+		});
+		collaborationStore.initialize();
+	}
+
+	function terminate() {
+		collaborationStore.terminate();
+		if (typeof removeEventListener.value === 'function') {
+			removeEventListener.value();
+		}
+	}
+
+	/**
+	 * Sometimes the push message is faster as the result from
+	 * the REST API so we do not know yet what execution ID
+	 * is currently active. So internally resend the message
+	 * a few more times
+	 */
+	function queuePushMessage(event: IPushData, retryAttempts: number) {
+		pushMessageQueue.value.push({ message: event, retriesLeft: retryAttempts });
+
+		if (retryTimeout.value === null) {
+			retryTimeout.value = setTimeout(processWaitingPushMessages, 20);
+		}
+	}
+
+	/**
+	 * Process the push messages which are waiting in the queue
+	 */
+	async function processWaitingPushMessages() {
+		if (retryTimeout.value !== null) {
+			clearTimeout(retryTimeout.value);
+			retryTimeout.value = null;
+		}
+
+		const queueLength = pushMessageQueue.value.length;
+		for (let i = 0; i < queueLength; i++) {
+			const messageData = pushMessageQueue.value.shift() as PushMessageQueueItem;
+
+			const result = await pushMessageReceived(messageData.message, true);
+			if (!result) {
+				// Was not successful
+				messageData.retriesLeft -= 1;
+
+				if (messageData.retriesLeft > 0) {
+					// If still retries are left add it back and stop execution
+					pushMessageQueue.value.unshift(messageData);
+				}
+				break;
+			}
+		}
+
+		if (pushMessageQueue.value.length !== 0 && retryTimeout.value === null) {
+			retryTimeout.value = setTimeout(processWaitingPushMessages, 25);
+		}
+	}
+
+	/**
+	 * Process a newly received message
+	 */
+	async function pushMessageReceived(receivedData: IPushData, isRetry?: boolean): Promise<boolean> {
+		const retryAttempts = 5;
+
+		if (receivedData.type === 'sendWorkerStatusMessage') {
+			const pushData = receivedData.data;
+			orchestrationManagerStore.updateWorkerStatus(pushData.status);
+			return true;
+		}
+
+		if (receivedData.type === 'sendConsoleMessage') {
+			const pushData = receivedData.data;
+			console.log(pushData.source, ...pushData.messages);
+			return true;
+		}
+
+		if (
+			!['testWebhookReceived'].includes(receivedData.type) &&
+			isRetry !== true &&
+			pushMessageQueue.value.length
+		) {
+			// If there are already messages in the queue add the new one that all of them
+			// get executed in order
+			queuePushMessage(receivedData, retryAttempts);
+			return false;
+		}
+
+		if (receivedData.type === 'nodeExecuteAfter' || receivedData.type === 'nodeExecuteBefore') {
+			if (!uiStore.isActionActive('workflowRunning')) {
+				// No workflow is running so ignore the messages
+				return false;
+			}
+			const pushData = receivedData.data;
+			if (workflowsStore.activeExecutionId !== pushData.executionId) {
+				// The data is not for the currently active execution or
+				// we do not have the execution id yet.
+				if (isRetry !== true) {
+					queuePushMessage(event as unknown as IPushData, retryAttempts);
+				}
+				return false;
+			}
+		}
+
+		// recovered execution data is handled like executionFinished data, however for security reasons
+		// we need to fetch the data from the server again rather than push it to all clients
+		let recoveredPushData: IPushDataExecutionFinished | undefined = undefined;
+		if (receivedData.type === 'executionRecovered') {
+			const recoveredExecutionId = receivedData.data?.executionId;
+			const isWorkflowRunning = uiStore.isActionActive('workflowRunning');
+			if (isWorkflowRunning && workflowsStore.activeExecutionId === recoveredExecutionId) {
+				// pull execution data for the recovered execution from the server
+				const executionData = await workflowsStore.fetchExecutionDataById(
+					workflowsStore.activeExecutionId,
+				);
+				if (executionData?.data) {
+					// data comes in as 'flatten' object, so we need to parse it
+					executionData.data = parse(executionData.data as unknown as string) as IRunExecutionData;
+					const iRunExecutionData: IRunExecutionData = {
+						startData: executionData.data?.startData,
+						resultData: executionData.data?.resultData ?? { runData: {} },
+						executionData: executionData.data?.executionData,
+					};
+					if (workflowsStore.workflowExecutionData?.workflowId === executionData.workflowId) {
+						const activeRunData = workflowsStore.workflowExecutionData?.data?.resultData?.runData;
+						if (activeRunData) {
+							for (const key of Object.keys(activeRunData)) {
+								iRunExecutionData.resultData.runData[key] = activeRunData[key];
+							}
+						}
+					}
+					const iRun: IRun = {
+						data: iRunExecutionData,
+						finished: executionData.finished,
+						mode: executionData.mode,
+						waitTill: executionData.data?.waitTill,
+						startedAt: executionData.startedAt,
+						stoppedAt: executionData.stoppedAt,
+						status: 'crashed',
+					};
+					if (executionData.data) {
+						recoveredPushData = {
+							executionId: executionData.id,
+							data: iRun,
+						};
+					}
+				}
+			}
+		}
+
+		if (
+			receivedData.type === 'workflowFailedToActivate' &&
+			workflowsStore.workflowId === receivedData.data.workflowId
+		) {
+			workflowsStore.setWorkflowInactive(receivedData.data.workflowId);
+			workflowsStore.setActive(false);
+
+			toast.showError(
+				new Error(receivedData.data.errorMessage),
+				i18n.baseText('workflowActivator.showError.title', {
+					interpolate: { newStateName: 'activated' },
+				}) + ':',
+			);
+
+			return true;
+		}
+
+		if (receivedData.type === 'workflowActivated') {
+			workflowsStore.setWorkflowActive(receivedData.data.workflowId);
+			return true;
+		}
+
+		if (receivedData.type === 'workflowDeactivated') {
+			workflowsStore.setWorkflowInactive(receivedData.data.workflowId);
+			return true;
+		}
+
+		if (receivedData.type === 'executionFinished' || receivedData.type === 'executionRecovered') {
+			// The workflow finished executing
+			let pushData: IPushDataExecutionFinished;
+			if (receivedData.type === 'executionRecovered' && recoveredPushData !== undefined) {
+				pushData = recoveredPushData;
+			} else {
+				pushData = receivedData.data as IPushDataExecutionFinished;
+			}
+
+			const { activeExecutionId } = workflowsStore;
+			if (activeExecutionId === pushData.executionId) {
+				const activeRunData = workflowsStore.workflowExecutionData?.data?.resultData?.runData;
+				if (activeRunData) {
+					for (const key of Object.keys(activeRunData)) {
+						if (
+							pushData.data.data.resultData.runData[key]?.[0]?.data?.main?.[0]?.[0]?.json
+								?.isArtificialRecoveredEventItem === true &&
+							activeRunData[key].length > 0
+						)
+							pushData.data.data.resultData.runData[key] = activeRunData[key];
+					}
+				}
+				workflowsStore.finishActiveExecution(pushData);
+			}
+
+			if (!uiStore.isActionActive('workflowRunning')) {
+				// No workflow is running so ignore the messages
+				return false;
+			}
+
+			if (activeExecutionId !== pushData.executionId) {
+				// The workflow which did finish execution did either not get started
+				// by this session or we do not have the execution id yet.
+				if (isRetry !== true) {
+					queuePushMessage(event as unknown as IPushData, retryAttempts);
+				}
+				return false;
+			}
+
+			const runDataExecuted = pushData.data;
+
+			let runDataExecutedErrorMessage = getExecutionError(runDataExecuted.data);
+
+			if (runDataExecuted.status === 'crashed') {
+				runDataExecutedErrorMessage = i18n.baseText('pushConnection.executionFailed.message');
+			} else if (runDataExecuted.status === 'canceled') {
+				runDataExecutedErrorMessage = i18n.baseText(
+					'executionsList.showMessage.stopExecution.message',
+					{
+						interpolate: { activeExecutionId },
+					},
+				);
+			}
+
+			const lineNumber = runDataExecuted?.data?.resultData?.error?.lineNumber;
+
+			codeNodeEditorEventBus.emit('error-line-number', lineNumber || 'final');
+
+			const workflow = workflowHelpers.getCurrentWorkflow();
+			if (runDataExecuted.waitTill !== undefined) {
+				const workflowSettings = workflowsStore.workflowSettings;
+				const saveManualExecutions = settingsStore.saveManualExecutions;
+
+				const isSavingExecutions =
+					workflowSettings.saveManualExecutions === undefined
+						? saveManualExecutions
+						: workflowSettings.saveManualExecutions;
+
+				let action;
+				if (!isSavingExecutions) {
+					globalLinkActionsEventBus.emit('registerGlobalLinkAction', {
+						key: 'open-settings',
+						action: async () => {
+							if (workflowsStore.isNewWorkflow) await workflowHelpers.saveAsNewWorkflow();
+							uiStore.openModal(WORKFLOW_SETTINGS_MODAL_KEY);
+						},
+					});
+
+					action =
+						'<a data-action="open-settings">Turn on saving manual executions</a> and run again to see what happened after this node.';
+				} else {
+					action = `<a href="/workflow/${workflow.id}/executions/${activeExecutionId}">View the execution</a> to see what happened after this node.`;
+				}
+
+				// Workflow did start but had been put to wait
+				titleChange.titleSet(workflow.name as string, 'IDLE');
+				toast.showToast({
+					title: 'Workflow started waiting',
+					message: `${action} <a href="https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.wait/" target="_blank">More info</a>`,
+					type: 'success',
+					duration: 0,
+				});
+			} else if (runDataExecuted.finished !== true) {
+				titleChange.titleSet(workflow.name as string, 'ERROR');
+
+				if (
+					runDataExecuted.data.resultData.error?.name === 'ExpressionError' &&
+					(runDataExecuted.data.resultData.error as ExpressionError).context.functionality ===
+						'pairedItem'
+				) {
+					const error = runDataExecuted.data.resultData.error as ExpressionError;
+
+					void workflowHelpers.getWorkflowDataToSave().then((workflowData) => {
+						const eventData: IDataObject = {
+							caused_by_credential: false,
+							error_message: error.description,
+							error_title: error.message,
+							error_type: error.context.type,
+							node_graph_string: JSON.stringify(
+								TelemetryHelpers.generateNodesGraph(
+									workflowData as IWorkflowBase,
+									workflowHelpers.getNodeTypes(),
+								).nodeGraph,
+							),
+							workflow_id: workflowsStore.workflowId,
+						};
+
+						if (
+							error.context.nodeCause &&
+							['paired_item_no_info', 'paired_item_invalid_info'].includes(
+								error.context.type as string,
+							)
+						) {
+							const node = workflow.getNode(error.context.nodeCause as string);
+
+							if (node) {
+								eventData.is_pinned = !!workflow.getPinDataOfNode(node.name);
+								eventData.mode = node.parameters.mode;
+								eventData.node_type = node.type;
+								eventData.operation = node.parameters.operation;
+								eventData.resource = node.parameters.resource;
+							}
+						}
+
+						telemetry.track('Instance FE emitted paired item error', eventData, {
+							withPostHog: true,
+						});
+					});
+				}
+
+				if (runDataExecuted.data.resultData.error?.name === 'SubworkflowOperationError') {
+					const error = runDataExecuted.data.resultData.error as SubworkflowOperationError;
+
+					workflowsStore.subWorkflowExecutionError = error;
+
+					toast.showMessage({
+						title: error.message,
+						message: error.description,
+						type: 'error',
+						duration: 0,
+					});
+				} else if (
+					runDataExecuted.data.resultData.error?.name === 'NodeOperationError' &&
+					(runDataExecuted.data.resultData.error as NodeOperationError).functionality ===
+						'configuration-node'
+				) {
+					// If the error is a configuration error of the node itself doesn't get executed so we can't use lastNodeExecuted for the title
+					let title: string;
+					const nodeError = runDataExecuted.data.resultData.error as NodeOperationError;
+					if (nodeError.node.name) {
+						title = `Error in sub-node ‘${nodeError.node.name}‘`;
+					} else {
+						title = 'Problem executing workflow';
+					}
+
+					toast.showMessage({
+						title,
+						message:
+							(nodeError?.description ?? runDataExecutedErrorMessage) +
+							i18n.baseText('pushConnection.executionError.openNode', {
+								interpolate: {
+									node: nodeError.node.name,
+								},
+							}),
+						type: 'error',
+						duration: 0,
+						dangerouslyUseHTMLString: true,
+					});
+				} else {
+					let title: string;
+					const isManualExecutionCancelled =
+						runDataExecuted.mode === 'manual' && runDataExecuted.status === 'canceled';
+
+					// Do not show the error message if the workflow got canceled manually
+					if (isManualExecutionCancelled) {
+						toast.showMessage({
+							title: i18n.baseText('nodeView.showMessage.stopExecutionTry.title'),
+							type: 'success',
+						});
+					} else {
+						if (runDataExecuted.data.resultData.lastNodeExecuted) {
+							title = `Problem in node ‘${runDataExecuted.data.resultData.lastNodeExecuted}‘`;
+						} else {
+							title = 'Problem executing workflow';
+						}
+
+						toast.showMessage({
+							title,
+							message: runDataExecutedErrorMessage,
+							type: 'error',
+							duration: 0,
+							dangerouslyUseHTMLString: true,
+						});
+					}
+				}
+			} else {
+				// Workflow did execute without a problem
+				titleChange.titleSet(workflow.name as string, 'IDLE');
+
+				const execution = workflowsStore.getWorkflowExecution;
+				if (execution?.executedNode) {
+					const node = workflowsStore.getNodeByName(execution.executedNode);
+					const nodeType = node && nodeTypesStore.getNodeType(node.type, node.typeVersion);
+					const nodeOutput =
+						execution &&
+						execution.executedNode &&
+						execution.data?.resultData?.runData?.[execution.executedNode];
+					if (nodeType?.polling && !nodeOutput) {
+						toast.showMessage({
+							title: i18n.baseText('pushConnection.pollingNode.dataNotFound', {
+								interpolate: {
+									service: getTriggerNodeServiceName(nodeType),
+								},
+							}),
+							message: i18n.baseText('pushConnection.pollingNode.dataNotFound.message', {
+								interpolate: {
+									service: getTriggerNodeServiceName(nodeType),
+								},
+							}),
+							type: 'success',
+						});
+					} else {
+						toast.showMessage({
+							title: i18n.baseText('pushConnection.nodeExecutedSuccessfully'),
+							type: 'success',
+						});
+					}
+				} else {
+					toast.showMessage({
+						title: i18n.baseText('pushConnection.workflowExecutedSuccessfully'),
+						type: 'success',
+					});
+				}
+			}
+
+			// It does not push the runData as it got already pushed with each
+			// node that did finish. For that reason copy in here the data
+			// which we already have.
+			if (workflowsStore.getWorkflowRunData) {
+				runDataExecuted.data.resultData.runData = workflowsStore.getWorkflowRunData;
+			}
+
+			workflowsStore.executingNode.length = 0;
+			workflowsStore.setWorkflowExecutionData(runDataExecuted as IExecutionResponse);
+			uiStore.removeActiveAction('workflowRunning');
+
+			// Set the node execution issues on all the nodes which produced an error so that
+			// it can be displayed in the node-view
+			nodeHelpers.updateNodesExecutionIssues();
+
+			const lastNodeExecuted: string | undefined = runDataExecuted.data.resultData.lastNodeExecuted;
+			let itemsCount = 0;
+			if (
+				lastNodeExecuted &&
+				runDataExecuted.data.resultData.runData[lastNodeExecuted] &&
+				!runDataExecutedErrorMessage
+			) {
+				itemsCount =
+					runDataExecuted.data.resultData.runData[lastNodeExecuted][0].data!.main[0]!.length;
+			}
+
+			void useExternalHooks().run('pushConnection.executionFinished', {
+				itemsCount,
+				nodeName: runDataExecuted.data.resultData.lastNodeExecuted,
+				errorMessage: runDataExecutedErrorMessage,
+				runDataExecutedStartData: runDataExecuted.data.startData,
+				resultDataError: runDataExecuted.data.resultData.error,
+			});
+			if (!runDataExecuted.data.resultData.error) {
+				segmentStore.trackSuccessfulWorkflowExecution(runDataExecuted);
+			}
+		} else if (receivedData.type === 'executionStarted') {
+			const pushData = receivedData.data;
+
+			const executionData: IExecutionsCurrentSummaryExtended = {
+				id: pushData.executionId,
+				finished: false,
+				mode: pushData.mode,
+				startedAt: pushData.startedAt,
+				retryOf: pushData.retryOf,
+				workflowId: pushData.workflowId,
+				workflowName: pushData.workflowName,
+			};
+
+			workflowsStore.addActiveExecution(executionData);
+		} else if (receivedData.type === 'nodeExecuteAfter') {
+			// A node finished to execute. Add its data
+			const pushData = receivedData.data;
+			workflowsStore.addNodeExecutionData(pushData);
+			workflowsStore.removeExecutingNode(pushData.nodeName);
+		} else if (receivedData.type === 'nodeExecuteBefore') {
+			// A node started to be executed. Set it as executing.
+			const pushData = receivedData.data;
+			workflowsStore.addExecutingNode(pushData.nodeName);
+		} else if (receivedData.type === 'testWebhookDeleted') {
+			// A test-webhook was deleted
+			const pushData = receivedData.data;
+
+			if (pushData.workflowId === workflowsStore.workflowId) {
+				workflowsStore.executionWaitingForWebhook = false;
+				uiStore.removeActiveAction('workflowRunning');
+			}
+		} else if (receivedData.type === 'testWebhookReceived') {
+			// A test-webhook did get called
+			const pushData = receivedData.data;
+
+			if (pushData.workflowId === workflowsStore.workflowId) {
+				workflowsStore.executionWaitingForWebhook = false;
+				workflowsStore.activeExecutionId = pushData.executionId;
+			}
+
+			void processWaitingPushMessages();
+		} else if (receivedData.type === 'reloadNodeType') {
+			await nodeTypesStore.getNodeTypes();
+			await nodeTypesStore.getFullNodesProperties([receivedData.data]);
+		} else if (receivedData.type === 'removeNodeType') {
+			const pushData = receivedData.data;
+
+			const nodesToBeRemoved: INodeTypeNameVersion[] = [pushData];
+
+			// Force reload of all credential types
+			await credentialsStore.fetchCredentialTypes(false).then(() => {
+				nodeTypesStore.removeNodeTypes(nodesToBeRemoved as INodeTypeDescription[]);
+			});
+		} else if (receivedData.type === 'nodeDescriptionUpdated') {
+			await nodeTypesStore.getNodeTypes();
+			await credentialsStore.fetchCredentialTypes(true);
+		}
+
+		return true;
+	}
+
+	function getExecutionError(data: IRunExecutionData | IExecuteContextData) {
+		const error = data.resultData.error;
+
+		let errorMessage: string;
+
+		if (data.resultData.lastNodeExecuted && error) {
+			errorMessage = error.message || error.description;
+		} else {
+			errorMessage = i18n.baseText('pushConnection.executionError', {
+				interpolate: { error: '!' },
+			});
+
+			if (error?.message) {
+				let nodeName: string | undefined;
+				if ('node' in error) {
+					nodeName = typeof error.node === 'string' ? error.node : error.node!.name;
+				}
+
+				const receivedError = nodeName ? `${nodeName}: ${error.message}` : error.message;
+				errorMessage = i18n.baseText('pushConnection.executionError', {
+					interpolate: {
+						error: `.${i18n.baseText('pushConnection.executionError.details', {
+							interpolate: {
+								details: receivedError,
+							},
+						})}`,
+					},
+				});
+			}
+		}
+
+		return errorMessage;
+	}
+
+	return {
+		initialize,
+		terminate,
+		pushMessageReceived,
+		queuePushMessage,
+		processWaitingPushMessages,
+		pushMessageQueue,
+		removeEventListener,
+		retryTimeout,
+	};
+}
diff --git a/packages/editor-ui/src/composables/useRunWorkflow.test.ts b/packages/editor-ui/src/composables/useRunWorkflow.test.ts
new file mode 100644
index 0000000000000..4b429325a8d8e
--- /dev/null
+++ b/packages/editor-ui/src/composables/useRunWorkflow.test.ts
@@ -0,0 +1,314 @@
+import { useRootStore } from '@/stores/n8nRoot.store';
+import { useRunWorkflow } from '@/composables/useRunWorkflow';
+import { createTestingPinia } from '@pinia/testing';
+import { setActivePinia } from 'pinia';
+import type { IStartRunData, IWorkflowData } from '@/Interface';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useUIStore } from '@/stores/ui.store';
+import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
+import { useRouter } from 'vue-router';
+import { ExpressionError, type IPinData, type IRunData, type Workflow } from 'n8n-workflow';
+
+vi.mock('@/stores/n8nRoot.store', () => ({
+	useRootStore: vi.fn().mockReturnValue({ pushConnectionActive: true }),
+}));
+
+vi.mock('@/stores/workflows.store', () => ({
+	useWorkflowsStore: vi.fn().mockReturnValue({
+		runWorkflow: vi.fn(),
+		subWorkflowExecutionError: null,
+		getWorkflowRunData: null,
+		setWorkflowExecutionData: vi.fn(),
+		activeExecutionId: null,
+		nodesIssuesExist: false,
+		executionWaitingForWebhook: false,
+		getCurrentWorkflow: vi.fn().mockReturnValue({ id: '123' }),
+		getNodeByName: vi.fn(),
+	}),
+}));
+
+vi.mock('@/stores/ui.store', () => ({
+	useUIStore: vi.fn().mockReturnValue({
+		isActionActive: vi.fn().mockReturnValue(false),
+		addActiveAction: vi.fn(),
+		removeActiveAction: vi.fn(),
+	}),
+}));
+
+vi.mock('@/composables/useTelemetry', () => ({
+	useTelemetry: vi.fn().mockReturnValue({ track: vi.fn() }),
+}));
+
+vi.mock('@/composables/useI18n', () => ({
+	useI18n: vi.fn().mockReturnValue({ baseText: vi.fn().mockImplementation((key) => key) }),
+}));
+
+vi.mock('@/composables/useExternalHooks', () => ({
+	useExternalHooks: vi.fn().mockReturnValue({
+		run: vi.fn(),
+	}),
+}));
+
+vi.mock('@/composables/useToast', () => ({
+	useToast: vi.fn().mockReturnValue({
+		clearAllStickyNotifications: vi.fn(),
+		showMessage: vi.fn(),
+		showError: vi.fn(),
+	}),
+}));
+
+vi.mock('@/composables/useWorkflowHelpers', () => ({
+	useWorkflowHelpers: vi.fn().mockReturnValue({
+		getCurrentWorkflow: vi.fn(),
+		checkReadyForExecution: vi.fn(),
+		saveCurrentWorkflow: vi.fn(),
+		getWorkflowDataToSave: vi.fn(),
+	}),
+}));
+
+vi.mock('@/composables/useNodeHelpers', () => ({
+	useNodeHelpers: vi.fn().mockReturnValue({
+		updateNodesExecutionIssues: vi.fn(),
+	}),
+}));
+
+vi.mock('@/composables/useTitleChange', () => ({
+	useTitleChange: vi.fn().mockReturnValue({ titleSet: vi.fn() }),
+}));
+
+vi.mock('vue-router', async (importOriginal) => {
+	const { RouterLink } = await importOriginal();
+	return {
+		RouterLink,
+		useRouter: vi.fn().mockReturnValue({
+			push: vi.fn(),
+		}),
+	};
+});
+
+describe('useRunWorkflow({ router })', () => {
+	let rootStore: ReturnType<typeof useRootStore>;
+	let uiStore: ReturnType<typeof useUIStore>;
+	let workflowsStore: ReturnType<typeof useWorkflowsStore>;
+	let router: ReturnType<typeof useRouter>;
+	let workflowHelpers: ReturnType<typeof useWorkflowHelpers>;
+
+	beforeAll(() => {
+		const pinia = createTestingPinia();
+
+		setActivePinia(pinia);
+
+		rootStore = useRootStore();
+		uiStore = useUIStore();
+		workflowsStore = useWorkflowsStore();
+
+		router = useRouter();
+		workflowHelpers = useWorkflowHelpers({ router });
+	});
+
+	describe('runWorkflowApi()', () => {
+		it('should throw an error if push connection is not active', async () => {
+			const { runWorkflowApi } = useRunWorkflow({ router });
+			rootStore.pushConnectionActive = false;
+
+			await expect(runWorkflowApi({} as IStartRunData)).rejects.toThrow(
+				'workflowRun.noActiveConnectionToTheServer',
+			);
+		});
+
+		it('should successfully run a workflow', async () => {
+			const { runWorkflowApi } = useRunWorkflow({ router });
+			rootStore.pushConnectionActive = true;
+
+			const mockResponse = { executionId: '123', waitingForWebhook: false };
+			vi.mocked(workflowsStore).runWorkflow.mockResolvedValue(mockResponse);
+
+			const response = await runWorkflowApi({} as IStartRunData);
+
+			expect(response).toEqual(mockResponse);
+			expect(workflowsStore.activeExecutionId).toBe('123');
+			expect(workflowsStore.executionWaitingForWebhook).toBe(false);
+			expect(uiStore.addActiveAction).toHaveBeenCalledWith('workflowRunning');
+		});
+
+		it('should handle workflow run failure', async () => {
+			const { runWorkflowApi } = useRunWorkflow({ router });
+
+			rootStore.pushConnectionActive = true;
+			vi.mocked(workflowsStore).runWorkflow.mockRejectedValue(new Error('Failed to run workflow'));
+
+			await expect(runWorkflowApi({} as IStartRunData)).rejects.toThrow('Failed to run workflow');
+			expect(uiStore.removeActiveAction).toHaveBeenCalledWith('workflowRunning');
+		});
+
+		it('should set waitingForWebhook if response indicates waiting', async () => {
+			const { runWorkflowApi } = useRunWorkflow({ router });
+
+			rootStore.pushConnectionActive = true;
+			const mockResponse = { executionId: '123', waitingForWebhook: true };
+			vi.mocked(workflowsStore).runWorkflow.mockResolvedValue(mockResponse);
+
+			const response = await runWorkflowApi({} as IStartRunData);
+
+			expect(response).toEqual(mockResponse);
+			expect(workflowsStore.executionWaitingForWebhook).toBe(true);
+		});
+	});
+
+	describe('runWorkflow()', () => {
+		it('should return undefined if UI action "workflowRunning" is active', async () => {
+			const { runWorkflow } = useRunWorkflow({ router });
+			vi.mocked(uiStore).isActionActive.mockReturnValue(true);
+			const result = await runWorkflow({});
+			expect(result).toBeUndefined();
+		});
+
+		it('should execute workflow even if it has issues', async () => {
+			const mockExecutionResponse = { executionId: '123' };
+			const { runWorkflow } = useRunWorkflow({ router });
+
+			vi.mocked(uiStore).isActionActive.mockReturnValue(false);
+			vi.mocked(workflowHelpers).getCurrentWorkflow.mockReturnValue({
+				name: 'Test Workflow',
+			} as unknown as Workflow);
+			vi.mocked(workflowsStore).runWorkflow.mockResolvedValue(mockExecutionResponse);
+			vi.mocked(workflowsStore).nodesIssuesExist = true;
+			vi.mocked(workflowHelpers).getWorkflowDataToSave.mockResolvedValue({
+				id: 'workflowId',
+				nodes: [],
+			} as unknown as IWorkflowData);
+			vi.mocked(workflowsStore).getWorkflowRunData = {
+				NodeName: [],
+			};
+
+			const result = await runWorkflow({});
+			expect(result).toEqual(mockExecutionResponse);
+		});
+
+		it('should execute workflow successfully', async () => {
+			const mockExecutionResponse = { executionId: '123' };
+			const { runWorkflow } = useRunWorkflow({ router });
+
+			vi.mocked(rootStore).pushConnectionActive = true;
+			vi.mocked(workflowsStore).runWorkflow.mockResolvedValue(mockExecutionResponse);
+			vi.mocked(workflowsStore).nodesIssuesExist = false;
+			vi.mocked(workflowHelpers).getCurrentWorkflow.mockReturnValue({
+				name: 'Test Workflow',
+			} as Workflow);
+			vi.mocked(workflowHelpers).getWorkflowDataToSave.mockResolvedValue({
+				id: 'workflowId',
+				nodes: [],
+			} as unknown as IWorkflowData);
+			vi.mocked(workflowsStore).getWorkflowRunData = {
+				NodeName: [],
+			};
+
+			const result = await runWorkflow({});
+			expect(result).toEqual(mockExecutionResponse);
+		});
+	});
+
+	describe('consolidateRunDataAndStartNodes()', () => {
+		it('should return empty runData and startNodeNames if runData is null', () => {
+			const { consolidateRunDataAndStartNodes } = useRunWorkflow({ router });
+			const workflowMock = {
+				getParentNodes: vi.fn(),
+				nodes: {},
+			} as unknown as Workflow;
+
+			const result = consolidateRunDataAndStartNodes([], null, undefined, workflowMock);
+			expect(result).toEqual({ runData: undefined, startNodeNames: [] });
+		});
+
+		it('should return correct startNodeNames and newRunData for given directParentNodes and runData', () => {
+			const { consolidateRunDataAndStartNodes } = useRunWorkflow({ router });
+			const directParentNodes = ['node1', 'node2'];
+			const runData = {
+				node2: [{ data: { main: [[{ json: { value: 'data2' } }]] } }],
+				node3: [{ data: { main: [[{ json: { value: 'data3' } }]] } }],
+			} as unknown as IRunData;
+			const pinData: IPinData = {
+				node2: [{ json: { value: 'data2' } }],
+			};
+			const workflowMock = {
+				getParentNodes: vi.fn().mockImplementation((node) => {
+					if (node === 'node1') return ['node3'];
+					return [];
+				}),
+				nodes: {
+					node1: { disabled: false },
+					node2: { disabled: false },
+					node3: { disabled: true },
+				},
+			} as unknown as Workflow;
+
+			const result = consolidateRunDataAndStartNodes(
+				directParentNodes,
+				runData,
+				pinData,
+				workflowMock,
+			);
+
+			expect(result.startNodeNames).toContain('node1');
+			expect(result.startNodeNames).not.toContain('node3');
+			expect(result.runData).toEqual(runData);
+		});
+
+		it('should include directParentNode in startNodeNames if it has no runData or pinData', () => {
+			const { consolidateRunDataAndStartNodes } = useRunWorkflow({ router });
+			const directParentNodes = ['node1'];
+			const runData = {
+				node2: [
+					{
+						data: {
+							main: [[{ json: { value: 'data2' } }]],
+						},
+					},
+				],
+			} as unknown as IRunData;
+			const workflowMock = {
+				getParentNodes: vi.fn().mockReturnValue([]),
+				nodes: { node1: { disabled: false } },
+			} as unknown as Workflow;
+
+			const result = consolidateRunDataAndStartNodes(
+				directParentNodes,
+				runData,
+				undefined,
+				workflowMock,
+			);
+
+			expect(result.startNodeNames).toContain('node1');
+			expect(result.runData).toBeUndefined();
+		});
+
+		it('should rerun failed parent nodes, adding them to the returned list of start nodes and not adding their result to runData', () => {
+			const { consolidateRunDataAndStartNodes } = useRunWorkflow({ router });
+			const directParentNodes = ['node1'];
+			const runData = {
+				node1: [
+					{
+						error: new ExpressionError('error'),
+					},
+				],
+			} as unknown as IRunData;
+			const workflowMock = {
+				getParentNodes: vi.fn().mockReturnValue([]),
+				nodes: {
+					node1: { disabled: false },
+					node2: { disabled: false },
+				},
+			} as unknown as Workflow;
+
+			const result = consolidateRunDataAndStartNodes(
+				directParentNodes,
+				runData,
+				undefined,
+				workflowMock,
+			);
+
+			expect(result.startNodeNames).toContain('node1');
+			expect(result.runData).toEqual(undefined);
+		});
+	});
+});
diff --git a/packages/editor-ui/src/composables/useRunWorkflow.ts b/packages/editor-ui/src/composables/useRunWorkflow.ts
new file mode 100644
index 0000000000000..71527e8ed65b1
--- /dev/null
+++ b/packages/editor-ui/src/composables/useRunWorkflow.ts
@@ -0,0 +1,445 @@
+import type {
+	IExecutionPushResponse,
+	IExecutionResponse,
+	IPushDataExecutionFinished,
+	IStartRunData,
+	IWorkflowDb,
+} from '@/Interface';
+import type {
+	IDataObject,
+	IRunData,
+	IRunExecutionData,
+	ITaskData,
+	IPinData,
+	Workflow,
+	StartNodeData,
+	IRun,
+} from 'n8n-workflow';
+import { NodeConnectionType, FORM_TRIGGER_PATH_IDENTIFIER } from 'n8n-workflow';
+
+import { useToast } from '@/composables/useToast';
+import { useNodeHelpers } from '@/composables/useNodeHelpers';
+
+import {
+	CHAT_TRIGGER_NODE_TYPE,
+	FORM_TRIGGER_NODE_TYPE,
+	WAIT_NODE_TYPE,
+	WORKFLOW_LM_CHAT_MODAL_KEY,
+} from '@/constants';
+import { useTitleChange } from '@/composables/useTitleChange';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import { useUIStore } from '@/stores/ui.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { openPopUpWindow } from '@/utils/executionUtils';
+import { useExternalHooks } from '@/composables/useExternalHooks';
+import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
+import type { useRouter } from 'vue-router';
+import { isEmpty } from '@/utils/typesUtils';
+import { useI18n } from '@/composables/useI18n';
+import { get } from 'lodash-es';
+import { useExecutionsStore } from '@/stores/executions.store';
+
+export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType<typeof useRouter> }) {
+	const nodeHelpers = useNodeHelpers();
+	const workflowHelpers = useWorkflowHelpers({ router: useRunWorkflowOpts.router });
+	const i18n = useI18n();
+	const toast = useToast();
+	const { titleSet } = useTitleChange();
+
+	const rootStore = useRootStore();
+	const uiStore = useUIStore();
+	const workflowsStore = useWorkflowsStore();
+	const executionsStore = useExecutionsStore();
+
+	// Starts to execute a workflow on server
+	async function runWorkflowApi(runData: IStartRunData): Promise<IExecutionPushResponse> {
+		if (!rootStore.pushConnectionActive) {
+			// Do not start if the connection to server is not active
+			// because then it can not receive the data as it executes.
+			throw new Error(i18n.baseText('workflowRun.noActiveConnectionToTheServer'));
+		}
+
+		workflowsStore.subWorkflowExecutionError = null;
+
+		uiStore.addActiveAction('workflowRunning');
+
+		let response: IExecutionPushResponse;
+
+		try {
+			response = await workflowsStore.runWorkflow(runData);
+		} catch (error) {
+			uiStore.removeActiveAction('workflowRunning');
+			throw error;
+		}
+
+		if (response.executionId !== undefined) {
+			workflowsStore.activeExecutionId = response.executionId;
+		}
+
+		if (response.waitingForWebhook === true) {
+			workflowsStore.executionWaitingForWebhook = true;
+		}
+
+		return response;
+	}
+
+	async function runWorkflow(options: {
+		destinationNode?: string;
+		triggerNode?: string;
+		nodeData?: ITaskData;
+		source?: string;
+	}): Promise<IExecutionPushResponse | undefined> {
+		const workflow = workflowHelpers.getCurrentWorkflow();
+
+		if (uiStore.isActionActive('workflowRunning')) {
+			return;
+		}
+
+		titleSet(workflow.name as string, 'EXECUTING');
+
+		toast.clearAllStickyNotifications();
+
+		try {
+			// Get the direct parents of the node
+			let directParentNodes: string[] = [];
+			if (options.destinationNode !== undefined) {
+				directParentNodes = workflow.getParentNodes(
+					options.destinationNode,
+					NodeConnectionType.Main,
+					-1,
+				);
+			}
+
+			const runData = workflowsStore.getWorkflowRunData;
+
+			if (workflowsStore.isNewWorkflow) {
+				await workflowHelpers.saveCurrentWorkflow();
+			}
+
+			const workflowData = await workflowHelpers.getWorkflowDataToSave();
+
+			const consolidatedData = consolidateRunDataAndStartNodes(
+				directParentNodes,
+				runData,
+				workflowData.pinData,
+				workflow,
+			);
+
+			const { startNodeNames } = consolidatedData;
+			const destinationNodeType = options.destinationNode
+				? workflowsStore.getNodeByName(options.destinationNode)?.type
+				: '';
+
+			let { runData: newRunData } = consolidatedData;
+			let executedNode: string | undefined;
+			if (
+				startNodeNames.length === 0 &&
+				'destinationNode' in options &&
+				options.destinationNode !== undefined
+			) {
+				executedNode = options.destinationNode;
+				startNodeNames.push(options.destinationNode);
+			} else if ('triggerNode' in options && 'nodeData' in options) {
+				startNodeNames.push(
+					...workflow.getChildNodes(options.triggerNode as string, NodeConnectionType.Main, 1),
+				);
+				newRunData = {
+					[options.triggerNode as string]: [options.nodeData],
+				} as IRunData;
+				executedNode = options.triggerNode;
+			}
+
+			// If the destination node is specified, check if it is a chat node or has a chat parent
+			if (
+				options.destinationNode &&
+				(workflowsStore.checkIfNodeHasChatParent(options.destinationNode) ||
+					destinationNodeType === CHAT_TRIGGER_NODE_TYPE)
+			) {
+				const startNode = workflow.getStartNode(options.destinationNode);
+				if (startNode && startNode.type === CHAT_TRIGGER_NODE_TYPE) {
+					// Check if the chat node has input data or pin data
+					const chatHasInputData =
+						nodeHelpers.getNodeInputData(startNode, 0, 0, 'input')?.length > 0;
+					const chatHasPinData = !!workflowData.pinData?.[startNode.name];
+
+					// If the chat node has no input data or pin data, open the chat modal
+					// and halt the execution
+					if (!chatHasInputData && !chatHasPinData) {
+						uiStore.openModal(WORKFLOW_LM_CHAT_MODAL_KEY);
+						return;
+					}
+				}
+			}
+
+			//if no destination node is specified
+			//and execution is not triggered from chat
+			//and there are other triggers in the workflow
+			//disable chat trigger node to avoid modal opening and webhook creation
+			if (
+				!options.destinationNode &&
+				options.source !== 'RunData.ManualChatMessage' &&
+				workflowData.nodes.some((node) => node.type === CHAT_TRIGGER_NODE_TYPE)
+			) {
+				const otherTriggers = workflowData.nodes.filter(
+					(node) =>
+						node.type !== CHAT_TRIGGER_NODE_TYPE &&
+						node.type.toLowerCase().includes('trigger') &&
+						!node.disabled,
+				);
+
+				if (otherTriggers.length) {
+					const chatTriggerNode = workflowData.nodes.find(
+						(node) => node.type === CHAT_TRIGGER_NODE_TYPE,
+					);
+					if (chatTriggerNode) {
+						chatTriggerNode.disabled = true;
+					}
+				}
+			}
+
+			const startNodes: StartNodeData[] = startNodeNames.map((name) => {
+				// Find for each start node the source data
+				let sourceData = get(runData, [name, 0, 'source', 0], null);
+				if (sourceData === null) {
+					const parentNodes = workflow.getParentNodes(name, NodeConnectionType.Main, 1);
+					const executeData = workflowHelpers.executeData(
+						parentNodes,
+						name,
+						NodeConnectionType.Main,
+						0,
+					);
+					sourceData = get(executeData, ['source', NodeConnectionType.Main, 0], null);
+				}
+				return {
+					name,
+					sourceData,
+				};
+			});
+
+			const startRunData: IStartRunData = {
+				workflowData,
+				runData: newRunData,
+				pinData: workflowData.pinData,
+				startNodes,
+			};
+			if ('destinationNode' in options) {
+				startRunData.destinationNode = options.destinationNode;
+			}
+
+			// Init the execution data to represent the start of the execution
+			// that data which gets reused is already set and data of newly executed
+			// nodes can be added as it gets pushed in
+			const executionData: IExecutionResponse = {
+				id: '__IN_PROGRESS__',
+				finished: false,
+				mode: 'manual',
+				status: 'running',
+				startedAt: new Date(),
+				stoppedAt: undefined,
+				workflowId: workflow.id,
+				executedNode,
+				data: {
+					resultData: {
+						runData: newRunData ?? {},
+						pinData: workflowData.pinData,
+						workflowData,
+					},
+				} as IRunExecutionData,
+				workflowData: {
+					id: workflowsStore.workflowId,
+					name: workflowData.name!,
+					active: workflowData.active!,
+					createdAt: 0,
+					updatedAt: 0,
+					...workflowData,
+				} as IWorkflowDb,
+			};
+			workflowsStore.setWorkflowExecutionData(executionData);
+			nodeHelpers.updateNodesExecutionIssues();
+
+			const runWorkflowApiResponse = await runWorkflowApi(startRunData);
+			const pinData = workflowData.pinData ?? {};
+
+			for (const node of workflowData.nodes) {
+				if (pinData[node.name]) continue;
+
+				if (![FORM_TRIGGER_NODE_TYPE, WAIT_NODE_TYPE].includes(node.type)) {
+					continue;
+				}
+
+				if (
+					options.destinationNode &&
+					options.destinationNode !== node.name &&
+					!directParentNodes.includes(node.name)
+				) {
+					continue;
+				}
+
+				if (node.name === options.destinationNode || !node.disabled) {
+					let testUrl = '';
+
+					if (node.type === FORM_TRIGGER_NODE_TYPE && node.typeVersion === 1) {
+						const webhookPath = (node.parameters.path as string) || node.webhookId;
+						testUrl = `${rootStore.getWebhookTestUrl}/${webhookPath}/${FORM_TRIGGER_PATH_IDENTIFIER}`;
+					}
+
+					if (node.type === FORM_TRIGGER_NODE_TYPE && node.typeVersion > 1) {
+						const webhookPath = (node.parameters.path as string) || node.webhookId;
+						testUrl = `${rootStore.getFormTestUrl}/${webhookPath}`;
+					}
+
+					if (
+						node.type === WAIT_NODE_TYPE &&
+						node.parameters.resume === 'form' &&
+						runWorkflowApiResponse.executionId
+					) {
+						const workflowTriggerNodes = workflow
+							.getTriggerNodes()
+							.map((triggerNode) => triggerNode.name);
+
+						const showForm =
+							options.destinationNode === node.name ||
+							directParentNodes.includes(node.name) ||
+							workflowTriggerNodes.some((triggerNode) =>
+								workflowsStore.isNodeInOutgoingNodeConnections(triggerNode, node.name),
+							);
+
+						if (!showForm) continue;
+
+						const { webhookSuffix } = (node.parameters.options ?? {}) as IDataObject;
+						const suffix = webhookSuffix ? `/${webhookSuffix}` : '';
+						testUrl = `${rootStore.getFormWaitingUrl}/${runWorkflowApiResponse.executionId}${suffix}`;
+					}
+
+					if (testUrl) openPopUpWindow(testUrl);
+				}
+			}
+
+			await useExternalHooks().run('workflowRun.runWorkflow', {
+				nodeName: options.destinationNode,
+				source: options.source,
+			});
+
+			return runWorkflowApiResponse;
+		} catch (error) {
+			titleSet(workflow.name as string, 'ERROR');
+			toast.showError(error, i18n.baseText('workflowRun.showError.title'));
+			return undefined;
+		}
+	}
+
+	function consolidateRunDataAndStartNodes(
+		directParentNodes: string[],
+		runData: IRunData | null,
+		pinData: IPinData | undefined,
+		workflow: Workflow,
+	): { runData: IRunData | undefined; startNodeNames: string[] } {
+		const startNodeNames = new Set<string>();
+		let newRunData: IRunData | undefined;
+
+		if (runData !== null && Object.keys(runData).length !== 0) {
+			newRunData = {};
+			// Go over the direct parents of the node
+			for (const directParentNode of directParentNodes) {
+				// Go over the parents of that node so that we can get a start
+				// node for each of the branches
+				const parentNodes = workflow.getParentNodes(directParentNode, NodeConnectionType.Main);
+
+				// Add also the enabled direct parent to be checked
+				if (workflow.nodes[directParentNode].disabled) continue;
+
+				parentNodes.push(directParentNode);
+
+				for (const parentNode of parentNodes) {
+					// We want to execute nodes that don't have run data neither pin data
+					// in addition, if a node failed we want to execute it again
+					if (
+						(!runData[parentNode]?.length && !pinData?.[parentNode]?.length) ||
+						runData[parentNode]?.[0]?.error !== undefined
+					) {
+						// When we hit a node which has no data we stop and set it
+						// as a start node the execution from and then go on with other
+						// direct input nodes
+						startNodeNames.add(parentNode);
+						break;
+					}
+					if (runData[parentNode] && !runData[parentNode]?.[0]?.error) {
+						newRunData[parentNode] = runData[parentNode]?.slice(0, 1);
+					}
+				}
+			}
+
+			if (isEmpty(newRunData)) {
+				// If there is no data for any of the parent nodes make sure
+				// that run data is empty that it runs regularly
+				newRunData = undefined;
+			}
+		}
+
+		return { runData: newRunData, startNodeNames: [...startNodeNames] };
+	}
+
+	async function stopCurrentExecution() {
+		const executionId = workflowsStore.activeExecutionId;
+		if (executionId === null) {
+			return;
+		}
+
+		try {
+			await executionsStore.stopCurrentExecution(executionId);
+		} catch (error) {
+			// Execution stop might fail when the execution has already finished. Let's treat this here.
+			const execution = await workflowsStore.getExecution(executionId);
+
+			if (execution === undefined) {
+				// execution finished but was not saved (e.g. due to low connectivity)
+				workflowsStore.finishActiveExecution({
+					executionId,
+					data: { finished: true, stoppedAt: new Date() },
+				});
+				workflowsStore.executingNode.length = 0;
+				uiStore.removeActiveAction('workflowRunning');
+
+				titleSet(workflowsStore.workflowName, 'IDLE');
+				toast.showMessage({
+					title: i18n.baseText('nodeView.showMessage.stopExecutionCatch.unsaved.title'),
+					message: i18n.baseText('nodeView.showMessage.stopExecutionCatch.unsaved.message'),
+					type: 'success',
+				});
+			} else if (execution?.finished) {
+				// execution finished before it could be stopped
+				const executedData = {
+					data: execution.data,
+					finished: execution.finished,
+					mode: execution.mode,
+					startedAt: execution.startedAt,
+					stoppedAt: execution.stoppedAt,
+				} as IRun;
+				const pushData = {
+					data: executedData,
+					executionId,
+					retryOf: execution.retryOf,
+				} as IPushDataExecutionFinished;
+				workflowsStore.finishActiveExecution(pushData);
+				titleSet(execution.workflowData.name, 'IDLE');
+				workflowsStore.executingNode.length = 0;
+				workflowsStore.setWorkflowExecutionData(executedData as IExecutionResponse);
+				uiStore.removeActiveAction('workflowRunning');
+				toast.showMessage({
+					title: i18n.baseText('nodeView.showMessage.stopExecutionCatch.title'),
+					message: i18n.baseText('nodeView.showMessage.stopExecutionCatch.message'),
+					type: 'success',
+				});
+			} else {
+				toast.showError(error, i18n.baseText('nodeView.showError.stopExecution.title'));
+			}
+		}
+	}
+
+	return {
+		consolidateRunDataAndStartNodes,
+		runWorkflow,
+		runWorkflowApi,
+		stopCurrentExecution,
+	};
+}
diff --git a/packages/editor-ui/src/composables/useStorage.test.ts b/packages/editor-ui/src/composables/useStorage.test.ts
new file mode 100644
index 0000000000000..cbe58864d1c2f
--- /dev/null
+++ b/packages/editor-ui/src/composables/useStorage.test.ts
@@ -0,0 +1,48 @@
+import { nextTick } from 'vue';
+import { useStorage } from './useStorage';
+
+describe('useStorage', () => {
+	beforeEach(() => {
+		localStorage.clear();
+	});
+
+	it('should initialize with null if no value is stored in localStorage', () => {
+		const key = 'test-key';
+		const data = useStorage(key);
+
+		expect(data.value).toBeNull();
+	});
+
+	it('should initialize with the stored value if it exists in localStorage', () => {
+		const key = 'test-key';
+		const value = 'test-value';
+		localStorage.setItem(key, value);
+
+		const data = useStorage(key);
+		expect(data.value).toBe(value);
+	});
+
+	it('should update localStorage when the data ref is updated', async () => {
+		const key = 'test-key';
+		const value = 'test-value';
+		const data = useStorage(key);
+
+		data.value = value;
+		await nextTick();
+
+		expect(localStorage.getItem(key)).toBe(value);
+	});
+
+	it('should remove the key from localStorage when the data ref is set to null', async () => {
+		const key = 'test-key';
+		const value = 'test-value';
+		localStorage.setItem(key, value);
+
+		const data = useStorage(key);
+
+		data.value = null;
+		await nextTick();
+
+		expect(localStorage.getItem(key)).toBeNull();
+	});
+});
diff --git a/packages/editor-ui/src/composables/useStorage.ts b/packages/editor-ui/src/composables/useStorage.ts
new file mode 100644
index 0000000000000..2feeafe1f4daf
--- /dev/null
+++ b/packages/editor-ui/src/composables/useStorage.ts
@@ -0,0 +1,13 @@
+import { useStorage as useStorageComposable } from '@vueuse/core';
+import type { Ref } from 'vue';
+
+export function useStorage(key: string): Ref<string | null> {
+	const data = useStorageComposable(key, null, undefined, { writeDefaults: false });
+
+	// bug in 1.15.1
+	if (data.value === 'undefined') {
+		data.value = null;
+	}
+
+	return data;
+}
diff --git a/packages/editor-ui/src/composables/useTitleChange.ts b/packages/editor-ui/src/composables/useTitleChange.ts
index 55cd41988fbae..7f22cf9e4fcc4 100644
--- a/packages/editor-ui/src/composables/useTitleChange.ts
+++ b/packages/editor-ui/src/composables/useTitleChange.ts
@@ -1,19 +1,30 @@
 import type { WorkflowTitleStatus } from '@/Interface';
+import { useSettingsStore } from '@/stores/settings.store';
 
 export function useTitleChange() {
-	return {
-		titleSet(workflow: string, status: WorkflowTitleStatus) {
-			let icon = '⚠️';
-			if (status === 'EXECUTING') {
-				icon = '🔄';
-			} else if (status === 'IDLE') {
-				icon = '▶️';
-			}
+	const prependBeta = (title: string) => {
+		const settingsStore = useSettingsStore();
+		const { releaseChannel } = settingsStore.settings;
+		return releaseChannel === 'stable' ? title : `[${releaseChannel.toUpperCase()}] ${title}`;
+	};
+
+	const titleSet = (workflow: string, status: WorkflowTitleStatus) => {
+		let icon = '⚠️';
+		if (status === 'EXECUTING') {
+			icon = '🔄';
+		} else if (status === 'IDLE') {
+			icon = '▶️';
+		}
+
+		window.document.title = prependBeta(`n8n - ${icon} ${workflow}`);
+	};
+
+	const titleReset = () => {
+		window.document.title = prependBeta('n8n - Workflow Automation');
+	};
 
-			window.document.title = `n8n - ${icon} ${workflow}`;
-		},
-		titleReset() {
-			document.title = 'n8n - Workflow Automation';
-		},
+	return {
+		titleSet,
+		titleReset,
 	};
 }
diff --git a/packages/editor-ui/src/composables/useToast.ts b/packages/editor-ui/src/composables/useToast.ts
index 97fff04d7030a..07bc5f7dbc1bd 100644
--- a/packages/editor-ui/src/composables/useToast.ts
+++ b/packages/editor-ui/src/composables/useToast.ts
@@ -1,35 +1,48 @@
-import { Notification } from 'element-ui';
-import type { ElNotificationComponent, ElNotificationOptions } from 'element-ui/types/notification';
-import type { MessageType } from 'element-ui/types/message';
-import { sanitizeHtml } from '@/utils';
+import { ElNotification as Notification } from 'element-plus';
+import type { NotificationHandle, MessageBoxState } from 'element-plus';
+import type { NotificationOptions } from '@/Interface';
+import { sanitizeHtml } from '@/utils/htmlUtils';
 import { useTelemetry } from '@/composables/useTelemetry';
-import { useWorkflowsStore } from '@/stores';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useUIStore } from '@/stores/ui.store';
 import { useI18n } from './useI18n';
 import { useExternalHooks } from './useExternalHooks';
+import { VIEWS } from '@/constants';
 
-const messageDefaults: Partial<Omit<ElNotificationOptions, 'message'>> = {
+export interface NotificationErrorWithNodeAndDescription extends Error {
+	node: {
+		name: string;
+	};
+	description: string;
+}
+
+const messageDefaults: Partial<Omit<NotificationOptions, 'message'>> = {
 	dangerouslyUseHTMLString: true,
 	position: 'bottom-right',
 };
 
-const stickyNotificationQueue: ElNotificationComponent[] = [];
+const stickyNotificationQueue: NotificationHandle[] = [];
 
 export function useToast() {
 	const telemetry = useTelemetry();
 	const workflowsStore = useWorkflowsStore();
+	const uiStore = useUIStore();
 	const externalHooks = useExternalHooks();
 	const i18n = useI18n();
 
-	function showMessage(
-		messageData: Omit<ElNotificationOptions, 'message'> & { message?: string },
-		track = true,
-	) {
+	function showMessage(messageData: Partial<NotificationOptions>, track = true) {
 		messageData = { ...messageDefaults, ...messageData };
-		messageData.message = messageData.message
-			? sanitizeHtml(messageData.message)
-			: messageData.message;
 
-		const notification = Notification(messageData as ElNotificationOptions);
+		Object.defineProperty(messageData, 'message', {
+			value:
+				typeof messageData.message === 'string'
+					? sanitizeHtml(messageData.message)
+					: messageData.message,
+			writable: true,
+			enumerable: true,
+		});
+
+		const notification = Notification(messageData);
 
 		if (messageData.duration === 0) {
 			stickyNotificationQueue.push(notification);
@@ -39,6 +52,7 @@ export function useToast() {
 			telemetry.track('Instance FE emitted error', {
 				error_title: messageData.title,
 				error_message: messageData.message,
+				caused_by_credential: causedByCredential(messageData.message as string),
 				workflow_id: workflowsStore.workflowId,
 			});
 		}
@@ -48,16 +62,17 @@ export function useToast() {
 
 	function showToast(config: {
 		title: string;
-		message: string;
+		message: NotificationOptions['message'];
 		onClick?: () => void;
 		onClose?: () => void;
 		duration?: number;
 		customClass?: string;
 		closeOnClick?: boolean;
-		type?: MessageType;
+		type?: MessageBoxState['type'];
+		dangerouslyUseHTMLString?: boolean;
 	}) {
 		// eslint-disable-next-line prefer-const
-		let notification: ElNotificationComponent;
+		let notification: NotificationHandle;
 		if (config.closeOnClick) {
 			const cb = config.onClick;
 			config.onClick = () => {
@@ -79,12 +94,13 @@ export function useToast() {
 			duration: config.duration,
 			customClass: config.customClass,
 			type: config.type,
+			dangerouslyUseHTMLString: config.dangerouslyUseHTMLString ?? true,
 		});
 
 		return notification;
 	}
 
-	function collapsableDetails({ description, node }: Error) {
+	function collapsableDetails({ description, node }: NotificationErrorWithNodeAndDescription) {
 		if (!description) return '';
 
 		const errorDescription =
@@ -105,7 +121,7 @@ export function useToast() {
 	}
 
 	function showError(e: Error | unknown, title: string, message?: string) {
-		const error = e as Error;
+		const error = e as NotificationErrorWithNodeAndDescription;
 		const messageLine = message ? `${message}<br/>` : '';
 		showMessage(
 			{
@@ -120,7 +136,7 @@ export function useToast() {
 			false,
 		);
 
-		externalHooks.run('showMessage.showError', {
+		void externalHooks.run('showMessage.showError', {
 			title,
 			message,
 			errorMessage: error.message,
@@ -130,13 +146,55 @@ export function useToast() {
 			error_title: title,
 			error_description: message,
 			error_message: error.message,
+			caused_by_credential: causedByCredential(error.message),
 			workflow_id: workflowsStore.workflowId,
 		});
 	}
 
+	function showAlert(config: NotificationOptions): NotificationHandle {
+		return Notification(config);
+	}
+
+	function causedByCredential(message: string | undefined) {
+		if (!message) return false;
+
+		return message.includes('Credentials for') && message.includes('are not set');
+	}
+
+	function clearAllStickyNotifications() {
+		stickyNotificationQueue.forEach((notification) => {
+			if (notification) {
+				notification.close();
+			}
+		});
+
+		stickyNotificationQueue.length = 0;
+	}
+
+	// Pick up and display notifications for the given list of views
+	function showNotificationForViews(views: VIEWS[]) {
+		const notifications: NotificationOptions[] = [];
+		views.forEach((view) => {
+			notifications.push(...uiStore.getNotificationsForView(view));
+		});
+		if (notifications.length) {
+			notifications.forEach(async (notification) => {
+				// Notifications show on top of each other without this timeout
+				setTimeout(() => {
+					showMessage(notification);
+				}, 5);
+			});
+			// Clear the queue once all notifications are shown
+			uiStore.setNotificationsForView(VIEWS.WORKFLOW, []);
+		}
+	}
+
 	return {
 		showMessage,
 		showToast,
 		showError,
+		showAlert,
+		clearAllStickyNotifications,
+		showNotificationForViews,
 	};
 }
diff --git a/packages/editor-ui/src/composables/useUniqueNodeName.ts b/packages/editor-ui/src/composables/useUniqueNodeName.ts
new file mode 100644
index 0000000000000..f408625a8ec40
--- /dev/null
+++ b/packages/editor-ui/src/composables/useUniqueNodeName.ts
@@ -0,0 +1,108 @@
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+
+export function useUniqueNodeName() {
+	/**
+	 * All in-store node name defaults ending with a number, e.g.
+	 * `AWS S3`, `Magento 2`, `MSG91`, `S3`, `SIGNL4`, `sms77`
+	 */
+	function numberSuffixedNames() {
+		return useNodeTypesStore().allNodeTypes.reduce<string[]>((acc, nodeType) => {
+			if (typeof nodeType.defaults.name !== 'string') {
+				throw new Error('Expected node name default to be a string');
+			}
+
+			if (/\d$/.test(nodeType.defaults.name)) acc.push(nodeType.defaults.name);
+
+			return acc;
+		}, []);
+	}
+
+	/**
+	 * Create a unique node name from an original name, based on the names of
+	 * all nodes on canvas and any extra names that cannot be used.
+	 */
+	function uniqueNodeName(originalName: string, extraNames: string[] = []) {
+		const { canvasNames } = useWorkflowsStore();
+
+		const isUnique = !canvasNames.has(originalName) && !extraNames.includes(originalName);
+
+		if (isUnique) return originalName;
+
+		const nsn = numberSuffixedNames().find((nsn) => originalName.startsWith(nsn));
+
+		// edge case, number suffix as part of name: S3 -> S31 -> S32
+
+		if (nsn) {
+			let unique = '';
+			let index = 1;
+
+			const remainder = originalName.split(nsn).pop();
+
+			const lastChar = remainder?.[remainder.length - 1];
+
+			if (lastChar && Number.isInteger(Number(lastChar))) {
+				index = parseInt(lastChar, 10);
+				originalName = originalName.slice(0, -1);
+			}
+
+			unique = originalName;
+
+			while (canvasNames.has(unique) || extraNames.includes(unique)) {
+				unique = originalName + index++;
+			}
+
+			return unique;
+		}
+
+		// edge case, all-number name: 123 -> 123-1 -> 123-2
+
+		if (/^\d+-?\d*$/.test(originalName)) {
+			let unique = '';
+			let index = 1;
+
+			const match = originalName.match(/(?<base>\d+)-?(?<suffix>\d*)/);
+
+			if (!match?.groups) {
+				throw new Error('Failed to find match for unique name');
+			}
+
+			if (match?.groups?.suffix !== '') {
+				index = parseInt(match.groups.suffix, 10);
+			}
+
+			unique = match.groups.base;
+
+			while (canvasNames.has(unique) || extraNames.includes(unique)) {
+				unique = match.groups.base + '-' + index++;
+			}
+
+			return unique;
+		}
+
+		// normal case: A -> A1 -> A2
+
+		let unique = '';
+		let index = 1;
+
+		const match = originalName.match(/(?<base>.*\D+)(?<suffix>\d*)/);
+
+		if (!match?.groups) {
+			throw new Error('Failed to find match for unique name');
+		}
+
+		if (match?.groups?.suffix !== '') {
+			index = parseInt(match.groups.suffix, 10);
+		}
+
+		unique = match.groups.base;
+
+		while (canvasNames.has(unique) || extraNames.includes(unique)) {
+			unique = match.groups.base + index++;
+		}
+
+		return unique;
+	}
+
+	return { uniqueNodeName };
+}
diff --git a/packages/editor-ui/src/composables/useUpgradeLink.ts b/packages/editor-ui/src/composables/useUpgradeLink.ts
deleted file mode 100644
index 0b9dd7889d0a3..0000000000000
--- a/packages/editor-ui/src/composables/useUpgradeLink.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import type { BaseTextKey } from '@/plugins/i18n';
-import { useUIStore, useUsageStore } from '@/stores';
-import { useI18n } from '@/composables';
-import { computed } from 'vue';
-
-export function useUpgradeLink(queryParams = { default: '', desktop: '' }) {
-	const uiStore = useUIStore();
-	const usageStore = useUsageStore();
-	const i18n = useI18n();
-
-	const upgradeLinkUrl = computed(() => {
-		const linkUrlTranslationKey = uiStore.contextBasedTranslationKeys.upgradeLinkUrl as BaseTextKey;
-		let url = i18n.baseText(linkUrlTranslationKey);
-
-		if (linkUrlTranslationKey.endsWith('.upgradeLinkUrl')) {
-			url = `${usageStore.viewPlansUrl}${queryParams.default}`;
-		} else if (linkUrlTranslationKey.endsWith('.desktop')) {
-			url = `${url}${queryParams.desktop}`;
-		}
-
-		return url;
-	});
-
-	return { upgradeLinkUrl };
-}
diff --git a/packages/editor-ui/src/composables/useWorkflowHelpers.ts b/packages/editor-ui/src/composables/useWorkflowHelpers.ts
new file mode 100644
index 0000000000000..9a44f5bb877f6
--- /dev/null
+++ b/packages/editor-ui/src/composables/useWorkflowHelpers.ts
@@ -0,0 +1,1216 @@
+import {
+	EnterpriseEditionFeature,
+	HTTP_REQUEST_NODE_TYPE,
+	MODAL_CONFIRM,
+	PLACEHOLDER_EMPTY_WORKFLOW_ID,
+	PLACEHOLDER_FILLED_AT_EXECUTION_TIME,
+	VIEWS,
+	WEBHOOK_NODE_TYPE,
+} from '@/constants';
+import { computed } from 'vue';
+
+import type {
+	IConnections,
+	IDataObject,
+	IExecuteData,
+	INode,
+	INodeConnection,
+	INodeCredentials,
+	INodeExecutionData,
+	INodeIssues,
+	INodeParameters,
+	INodeProperties,
+	INodeType,
+	INodeTypes,
+	IRunExecutionData,
+	IWebhookDescription,
+	IWorkflowDataProxyAdditionalKeys,
+	IWorkflowIssues,
+	IWorkflowSettings,
+	NodeParameterValue,
+	Workflow,
+} from 'n8n-workflow';
+import { NodeConnectionType, ExpressionEvaluatorProxy, NodeHelpers } from 'n8n-workflow';
+
+import type {
+	ICredentialsResponse,
+	INodeTypesMaxCount,
+	INodeUi,
+	ITag,
+	IUpdateInformation,
+	IWorkflowData,
+	IWorkflowDataUpdate,
+	IWorkflowDb,
+	TargetItem,
+	XYPosition,
+} from '@/Interface';
+
+import { useMessage } from '@/composables/useMessage';
+import { useToast } from '@/composables/useToast';
+import { useNodeHelpers } from '@/composables/useNodeHelpers';
+
+import { get, isEqual } from 'lodash-es';
+
+import type { IPermissions } from '@/permissions';
+import { getWorkflowPermissions } from '@/permissions';
+import { useEnvironmentsStore } from '@/stores/environments.ee.store';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import { useNDVStore } from '@/stores/ndv.store';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import { useTemplatesStore } from '@/stores/templates.store';
+import { useUIStore } from '@/stores/ui.store';
+import { useUsersStore } from '@/stores/users.store';
+import { useWorkflowsEEStore } from '@/stores/workflows.ee.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { getSourceItems } from '@/utils/pairedItemUtils';
+import { v4 as uuid } from 'uuid';
+import { useSettingsStore } from '@/stores/settings.store';
+import { getCredentialTypeName, isCredentialOnlyNodeType } from '@/utils/credentialOnlyNodes';
+import { useExternalHooks } from '@/composables/useExternalHooks';
+import { useCanvasStore } from '@/stores/canvas.store';
+import { useSourceControlStore } from '@/stores/sourceControl.store';
+import { tryToParseNumber } from '@/utils/typesUtils';
+import { useI18n } from '@/composables/useI18n';
+import type { useRouter } from 'vue-router';
+import { useTelemetry } from '@/composables/useTelemetry';
+
+export function resolveParameter(
+	parameter: NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[],
+	opts: {
+		targetItem?: TargetItem;
+		inputNodeName?: string;
+		inputRunIndex?: number;
+		inputBranchIndex?: number;
+		additionalKeys?: IWorkflowDataProxyAdditionalKeys;
+		isForCredential?: boolean;
+	} = {},
+): IDataObject | null {
+	let itemIndex = opts?.targetItem?.itemIndex || 0;
+
+	const workflow = getCurrentWorkflow();
+
+	const additionalKeys: IWorkflowDataProxyAdditionalKeys = {
+		$execution: {
+			id: PLACEHOLDER_FILLED_AT_EXECUTION_TIME,
+			mode: 'test',
+			resumeUrl: PLACEHOLDER_FILLED_AT_EXECUTION_TIME,
+			resumeFormUrl: PLACEHOLDER_FILLED_AT_EXECUTION_TIME,
+		},
+		$vars: useEnvironmentsStore().variablesAsObject,
+
+		// deprecated
+		$executionId: PLACEHOLDER_FILLED_AT_EXECUTION_TIME,
+		$resumeWebhookUrl: PLACEHOLDER_FILLED_AT_EXECUTION_TIME,
+
+		...opts.additionalKeys,
+	};
+
+	if (opts.isForCredential) {
+		// node-less expression resolution
+		return workflow.expression.getParameterValue(
+			parameter,
+			null,
+			0,
+			itemIndex,
+			'',
+			[],
+			'manual',
+			additionalKeys,
+			undefined,
+			false,
+			undefined,
+			'',
+		) as IDataObject;
+	}
+
+	const inputName = NodeConnectionType.Main;
+	const activeNode = useNDVStore().activeNode;
+	let contextNode = activeNode;
+
+	if (activeNode) {
+		contextNode = workflow.getParentMainInputNode(activeNode);
+	}
+
+	const workflowRunData = useWorkflowsStore().getWorkflowRunData;
+	let parentNode = workflow.getParentNodes(contextNode!.name, inputName, 1);
+	const executionData = useWorkflowsStore().getWorkflowExecution;
+
+	let runIndexParent = opts?.inputRunIndex ?? 0;
+	const nodeConnection = workflow.getNodeConnectionIndexes(contextNode!.name, parentNode[0]);
+	if (opts.targetItem && opts?.targetItem?.nodeName === contextNode!.name && executionData) {
+		const sourceItems = getSourceItems(executionData, opts.targetItem);
+		if (!sourceItems.length) {
+			return null;
+		}
+		parentNode = [sourceItems[0].nodeName];
+		runIndexParent = sourceItems[0].runIndex;
+		itemIndex = sourceItems[0].itemIndex;
+		if (nodeConnection) {
+			nodeConnection.sourceIndex = sourceItems[0].outputIndex;
+		}
+	} else {
+		parentNode = opts.inputNodeName ? [opts.inputNodeName] : parentNode;
+		if (nodeConnection) {
+			nodeConnection.sourceIndex = opts.inputBranchIndex ?? nodeConnection.sourceIndex;
+		}
+
+		if (opts?.inputRunIndex === undefined && workflowRunData !== null && parentNode.length) {
+			const firstParentWithWorkflowRunData = parentNode.find(
+				(parentNodeName) => workflowRunData[parentNodeName],
+			);
+			if (firstParentWithWorkflowRunData) {
+				runIndexParent = workflowRunData[firstParentWithWorkflowRunData].length - 1;
+			}
+		}
+	}
+
+	let _connectionInputData = connectionInputData(
+		parentNode,
+		contextNode!.name,
+		inputName,
+		runIndexParent,
+		nodeConnection,
+	);
+
+	if (_connectionInputData === null && contextNode && activeNode?.name !== contextNode.name) {
+		// For Sub-Nodes connected to Trigger-Nodes use the data of the root-node
+		// (Gets for example used by the Memory connected to the Chat-Trigger-Node)
+		const _executeData = executeData([contextNode.name], contextNode.name, inputName, 0);
+		_connectionInputData = get(_executeData, ['data', inputName, 0], null);
+	}
+
+	let runExecutionData: IRunExecutionData;
+	if (!executionData?.data) {
+		runExecutionData = {
+			resultData: {
+				runData: {},
+			},
+		};
+	} else {
+		runExecutionData = executionData.data;
+	}
+
+	if (_connectionInputData === null) {
+		_connectionInputData = [];
+	}
+
+	if (activeNode?.type === HTTP_REQUEST_NODE_TYPE) {
+		const EMPTY_RESPONSE = { statusCode: 200, headers: {}, body: {} };
+		const EMPTY_REQUEST = { headers: {}, body: {}, qs: {} };
+		// Add $request,$response,$pageCount for HTTP Request-Nodes as it is used
+		// in pagination expressions
+		additionalKeys.$pageCount = 0;
+		additionalKeys.$response = get(
+			executionData,
+			['data', 'executionData', 'contextData', `node:${activeNode.name}`, 'response'],
+			EMPTY_RESPONSE,
+		);
+		additionalKeys.$request = EMPTY_REQUEST;
+	}
+
+	let runIndexCurrent = opts?.targetItem?.runIndex ?? 0;
+	if (
+		opts?.targetItem === undefined &&
+		workflowRunData !== null &&
+		workflowRunData[contextNode!.name]
+	) {
+		runIndexCurrent = workflowRunData[contextNode!.name].length - 1;
+	}
+	let _executeData = executeData(parentNode, contextNode!.name, inputName, runIndexCurrent);
+
+	if (!_executeData.source) {
+		// fallback to parent's run index for multi-output case
+		_executeData = executeData(parentNode, contextNode!.name, inputName, runIndexParent);
+	}
+
+	ExpressionEvaluatorProxy.setEvaluator(
+		useSettingsStore().settings.expressions?.evaluator ?? 'tmpl',
+	);
+
+	return workflow.expression.getParameterValue(
+		parameter,
+		runExecutionData,
+		runIndexCurrent,
+		itemIndex,
+		activeNode!.name,
+		_connectionInputData,
+		'manual',
+		additionalKeys,
+		_executeData,
+		false,
+		{},
+		contextNode!.name,
+	) as IDataObject;
+}
+
+export function resolveRequiredParameters(
+	currentParameter: INodeProperties,
+	parameters: INodeParameters,
+	opts: {
+		targetItem?: TargetItem;
+		inputNodeName?: string;
+		inputRunIndex?: number;
+		inputBranchIndex?: number;
+	} = {},
+): IDataObject | null {
+	const loadOptionsDependsOn = new Set(currentParameter?.typeOptions?.loadOptionsDependsOn ?? []);
+
+	const resolvedParameters = Object.fromEntries(
+		Object.entries(parameters).map(([name, parameter]): [string, IDataObject | null] => {
+			const required = loadOptionsDependsOn.has(name);
+
+			if (required) {
+				return [name, resolveParameter(parameter as NodeParameterValue, opts)];
+			} else {
+				try {
+					return [name, resolveParameter(parameter as NodeParameterValue, opts)];
+				} catch (error) {
+					// ignore any expressions errors for non required parameters
+					return [name, null];
+				}
+			}
+		}),
+	);
+
+	return resolvedParameters;
+}
+
+function getCurrentWorkflow(copyData?: boolean): Workflow {
+	return useWorkflowsStore().getCurrentWorkflow(copyData);
+}
+
+function getConnectedNodes(
+	direction: 'upstream' | 'downstream',
+	workflow: Workflow,
+	nodeName: string,
+): string[] {
+	let checkNodes: string[];
+	if (direction === 'downstream') {
+		checkNodes = workflow.getChildNodes(nodeName);
+	} else if (direction === 'upstream') {
+		checkNodes = workflow.getParentNodes(nodeName);
+	} else {
+		throw new Error(`The direction "${direction}" is not supported!`);
+	}
+
+	// Find also all nodes which are connected to the child nodes via a non-main input
+	let connectedNodes: string[] = [];
+	checkNodes.forEach((checkNode) => {
+		connectedNodes = [
+			...connectedNodes,
+			checkNode,
+			...workflow.getParentNodes(checkNode, 'ALL_NON_MAIN'),
+		];
+	});
+
+	// Remove duplicates
+	return [...new Set(connectedNodes)];
+}
+
+function getNodes(): INodeUi[] {
+	return useWorkflowsStore().getNodes();
+}
+
+// Returns a workflow instance.
+function getWorkflow(nodes: INodeUi[], connections: IConnections, copyData?: boolean): Workflow {
+	return useWorkflowsStore().getWorkflow(nodes, connections, copyData);
+}
+
+function getNodeTypes(): INodeTypes {
+	return useWorkflowsStore().getNodeTypes();
+}
+
+// Returns connectionInputData to be able to execute an expression.
+function connectionInputData(
+	parentNode: string[],
+	currentNode: string,
+	inputName: string,
+	runIndex: number,
+	nodeConnection: INodeConnection = { sourceIndex: 0, destinationIndex: 0 },
+): INodeExecutionData[] | null {
+	let connectionInputData: INodeExecutionData[] | null = null;
+	const _executeData = executeData(parentNode, currentNode, inputName, runIndex);
+	if (parentNode.length) {
+		if (
+			!Object.keys(_executeData.data).length ||
+			_executeData.data[inputName].length <= nodeConnection.sourceIndex
+		) {
+			connectionInputData = [];
+		} else {
+			connectionInputData = _executeData.data[inputName][nodeConnection.sourceIndex];
+
+			if (connectionInputData !== null) {
+				// Update the pairedItem information on items
+				connectionInputData = connectionInputData.map((item, itemIndex) => {
+					return {
+						...item,
+						pairedItem: {
+							item: itemIndex,
+							input: nodeConnection.destinationIndex,
+						},
+					};
+				});
+			}
+		}
+	}
+
+	const workflowsStore = useWorkflowsStore();
+
+	if (workflowsStore.shouldReplaceInputDataWithPinData) {
+		const parentPinData = parentNode.reduce<INodeExecutionData[]>((acc, parentNodeName, index) => {
+			const pinData = workflowsStore.pinDataByNodeName(parentNodeName);
+
+			if (pinData) {
+				acc.push({
+					json: pinData[0],
+					pairedItem: {
+						item: index,
+						input: 1,
+					},
+				});
+			}
+
+			return acc;
+		}, []);
+
+		if (parentPinData.length > 0) {
+			if (connectionInputData && connectionInputData.length > 0) {
+				parentPinData.forEach((parentPinDataEntry) => {
+					connectionInputData![0].json = {
+						...connectionInputData![0].json,
+						...parentPinDataEntry.json,
+					};
+				});
+			} else {
+				connectionInputData = parentPinData;
+			}
+		}
+	}
+
+	return connectionInputData;
+}
+
+export function executeData(
+	parentNodes: string[],
+	currentNode: string,
+	inputName: string,
+	runIndex: number,
+): IExecuteData {
+	const executeData = {
+		node: {},
+		data: {},
+		source: null,
+	} as IExecuteData;
+
+	const workflowsStore = useWorkflowsStore();
+
+	// Find the parent node which has data
+	for (const parentNodeName of parentNodes) {
+		if (workflowsStore.shouldReplaceInputDataWithPinData) {
+			const parentPinData = workflowsStore.pinnedWorkflowData![parentNodeName];
+
+			// populate `executeData` from `pinData`
+
+			if (parentPinData) {
+				executeData.data = { main: [parentPinData] };
+				executeData.source = { main: [{ previousNode: parentNodeName }] };
+
+				return executeData;
+			}
+		}
+
+		// populate `executeData` from `runData`
+		const workflowRunData = workflowsStore.getWorkflowRunData;
+		if (workflowRunData === null) {
+			return executeData;
+		}
+
+		if (
+			!workflowRunData[parentNodeName] ||
+			workflowRunData[parentNodeName].length <= runIndex ||
+			!workflowRunData[parentNodeName][runIndex] ||
+			!workflowRunData[parentNodeName][runIndex].hasOwnProperty('data') ||
+			workflowRunData[parentNodeName][runIndex].data === undefined ||
+			!workflowRunData[parentNodeName][runIndex].data!.hasOwnProperty(inputName)
+		) {
+			executeData.data = {};
+		} else {
+			executeData.data = workflowRunData[parentNodeName][runIndex].data!;
+			if (workflowRunData[currentNode] && workflowRunData[currentNode][runIndex]) {
+				executeData.source = {
+					[inputName]: workflowRunData[currentNode][runIndex].source,
+				};
+			} else {
+				const workflow = getCurrentWorkflow();
+
+				let previousNodeOutput: number | undefined;
+				// As the node can be connected through either of the outputs find the correct one
+				// and set it to make pairedItem work on not executed nodes
+				if (workflow.connectionsByDestinationNode[currentNode]?.main) {
+					mainConnections: for (const mainConnections of workflow.connectionsByDestinationNode[
+						currentNode
+					].main) {
+						for (const connection of mainConnections) {
+							if (
+								connection.type === NodeConnectionType.Main &&
+								connection.node === parentNodeName
+							) {
+								previousNodeOutput = connection.index;
+								break mainConnections;
+							}
+						}
+					}
+				}
+
+				// The current node did not get executed in UI yet so build data manually
+				executeData.source = {
+					[inputName]: [
+						{
+							previousNode: parentNodeName,
+							previousNodeOutput,
+						},
+					],
+				};
+			}
+			return executeData;
+		}
+	}
+
+	return executeData;
+}
+
+export function useWorkflowHelpers(options: { router: ReturnType<typeof useRouter> }) {
+	const router = options.router;
+	const nodeTypesStore = useNodeTypesStore();
+	const rootStore = useRootStore();
+	const templatesStore = useTemplatesStore();
+	const workflowsStore = useWorkflowsStore();
+	const workflowsEEStore = useWorkflowsEEStore();
+	const usersStore = useUsersStore();
+	const uiStore = useUIStore();
+	const nodeHelpers = useNodeHelpers();
+
+	const toast = useToast();
+	const message = useMessage();
+	const i18n = useI18n();
+	const telemetry = useTelemetry();
+
+	const workflowPermissions = computed<IPermissions>(() => {
+		return getWorkflowPermissions(usersStore.currentUser, workflowsStore.workflow);
+	});
+
+	function getNodeTypesMaxCount() {
+		const nodes = workflowsStore.allNodes;
+
+		const returnData: INodeTypesMaxCount = {};
+
+		const nodeTypes = nodeTypesStore.allNodeTypes;
+		for (const nodeType of nodeTypes) {
+			if (nodeType.maxNodes !== undefined) {
+				returnData[nodeType.name] = {
+					exist: 0,
+					max: nodeType.maxNodes,
+					nodeNames: [],
+				};
+			}
+		}
+
+		for (const node of nodes) {
+			if (returnData[node.type] !== undefined) {
+				returnData[node.type].exist += 1;
+				returnData[node.type].nodeNames.push(node.name);
+			}
+		}
+
+		return returnData;
+	}
+
+	function getNodeTypeCount(nodeType: string) {
+		const nodes = workflowsStore.allNodes;
+
+		let count = 0;
+
+		for (const node of nodes) {
+			if (node.type === nodeType) {
+				count++;
+			}
+		}
+
+		return count;
+	}
+
+	/** Checks if everything in the workflow is complete and ready to be executed */
+	function checkReadyForExecution(workflow: Workflow, lastNodeName?: string) {
+		let node: INode;
+		let nodeType: INodeType | undefined;
+		let nodeIssues: INodeIssues | null = null;
+		const workflowIssues: IWorkflowIssues = {};
+
+		let checkNodes = Object.keys(workflow.nodes);
+		if (lastNodeName) {
+			checkNodes = workflow.getParentNodes(lastNodeName);
+			checkNodes.push(lastNodeName);
+		} else {
+			// As webhook nodes always take precedence check first
+			// if there are any
+			let checkWebhook: string[] = [];
+			for (const nodeName of Object.keys(workflow.nodes)) {
+				if (
+					workflow.nodes[nodeName].disabled !== true &&
+					workflow.nodes[nodeName].type === WEBHOOK_NODE_TYPE
+				) {
+					const childNodes = workflow.getChildNodes(nodeName);
+					checkWebhook = [nodeName, ...checkWebhook, ...childNodes];
+				}
+			}
+
+			if (checkWebhook.length) {
+				checkNodes = checkWebhook;
+			} else {
+				// If no webhook nodes got found try to find another trigger node
+				const startNode = workflow.getStartNode();
+				if (startNode !== undefined) {
+					checkNodes = [...workflow.getChildNodes(startNode.name), startNode.name];
+
+					// For the short-listed checkNodes, we also need to check them for any
+					// connected sub-nodes
+					for (const nodeName of checkNodes) {
+						const childNodes = workflow.getParentNodes(nodeName, 'ALL_NON_MAIN');
+						checkNodes.push(...childNodes);
+					}
+				}
+			}
+		}
+
+		for (const nodeName of checkNodes) {
+			nodeIssues = null;
+			node = workflow.nodes[nodeName];
+
+			if (node.disabled === true) {
+				// Ignore issues on disabled nodes
+				continue;
+			}
+
+			nodeType = workflow.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
+
+			if (nodeType === undefined) {
+				// Node type is not known
+				nodeIssues = {
+					typeUnknown: true,
+				};
+			} else {
+				nodeIssues = nodeHelpers.getNodeIssues(nodeType.description, node, workflow, ['execution']);
+			}
+
+			if (nodeIssues !== null) {
+				workflowIssues[node.name] = nodeIssues;
+			}
+		}
+
+		if (Object.keys(workflowIssues).length === 0) {
+			return null;
+		}
+
+		return workflowIssues;
+	}
+
+	async function getWorkflowDataToSave() {
+		const workflowNodes = workflowsStore.allNodes;
+		const workflowConnections = workflowsStore.allConnections;
+
+		let nodeData;
+
+		const nodes: INode[] = [];
+		for (let nodeIndex = 0; nodeIndex < workflowNodes.length; nodeIndex++) {
+			// @ts-ignore
+			nodeData = getNodeDataToSave(workflowNodes[nodeIndex]);
+
+			nodes.push(nodeData);
+		}
+
+		const data: IWorkflowData = {
+			name: workflowsStore.workflowName,
+			nodes,
+			pinData: workflowsStore.pinnedWorkflowData,
+			connections: workflowConnections,
+			active: workflowsStore.isWorkflowActive,
+			settings: workflowsStore.workflow.settings,
+			tags: workflowsStore.workflowTags,
+			versionId: workflowsStore.workflow.versionId,
+			meta: workflowsStore.workflow.meta,
+		};
+
+		const workflowId = workflowsStore.workflowId;
+		if (workflowId !== PLACEHOLDER_EMPTY_WORKFLOW_ID) {
+			data.id = workflowId;
+		}
+
+		return data;
+	}
+
+	function getNodeDataToSave(node: INodeUi): INodeUi {
+		const skipKeys = [
+			'color',
+			'continueOnFail',
+			'credentials',
+			'disabled',
+			'issues',
+			'onError',
+			'notes',
+			'parameters',
+			'status',
+		];
+
+		// @ts-ignore
+		const nodeData: INodeUi = {
+			parameters: {},
+		};
+
+		for (const key in node) {
+			if (key.charAt(0) !== '_' && skipKeys.indexOf(key) === -1) {
+				// @ts-ignore
+				nodeData[key] = node[key];
+			}
+		}
+
+		// Get the data of the node type that we can get the default values
+		// TODO: Later also has to care about the node-type-version as defaults could be different
+		const nodeType = nodeTypesStore.getNodeType(node.type, node.typeVersion);
+
+		if (nodeType !== null) {
+			const isCredentialOnly = isCredentialOnlyNodeType(nodeType.name);
+
+			if (isCredentialOnly) {
+				nodeData.type = HTTP_REQUEST_NODE_TYPE;
+				nodeData.extendsCredential = getCredentialTypeName(nodeType.name);
+			}
+
+			// Node-Type is known so we can save the parameters correctly
+			const nodeParameters = NodeHelpers.getNodeParameters(
+				nodeType.properties,
+				node.parameters,
+				isCredentialOnly,
+				false,
+				node,
+			);
+			nodeData.parameters = nodeParameters !== null ? nodeParameters : {};
+
+			// Add the node credentials if there are some set and if they should be displayed
+			if (node.credentials !== undefined && nodeType.credentials !== undefined) {
+				const saveCredentials: INodeCredentials = {};
+				for (const nodeCredentialTypeName of Object.keys(node.credentials)) {
+					if (
+						nodeHelpers.hasProxyAuth(node) ||
+						Object.keys(node.parameters).includes('genericAuthType')
+					) {
+						saveCredentials[nodeCredentialTypeName] = node.credentials[nodeCredentialTypeName];
+						continue;
+					}
+
+					const credentialTypeDescription = nodeType.credentials
+						// filter out credentials with same name in different node versions
+						.filter((c) => nodeHelpers.displayParameter(node.parameters, c, '', node))
+						.find((c) => c.name === nodeCredentialTypeName);
+
+					if (credentialTypeDescription === undefined) {
+						// Credential type is not know so do not save
+						continue;
+					}
+
+					if (!nodeHelpers.displayParameter(node.parameters, credentialTypeDescription, '', node)) {
+						// Credential should not be displayed so do also not save
+						continue;
+					}
+
+					saveCredentials[nodeCredentialTypeName] = node.credentials[nodeCredentialTypeName];
+				}
+
+				// Set credential property only if it has content
+				if (Object.keys(saveCredentials).length !== 0) {
+					nodeData.credentials = saveCredentials;
+				}
+			}
+		} else {
+			// Node-Type is not known so save the data as it is
+			nodeData.credentials = node.credentials;
+			nodeData.parameters = node.parameters;
+			if (nodeData.color !== undefined) {
+				nodeData.color = node.color;
+			}
+		}
+
+		// Save the disabled property, continueOnFail and onError only when is set
+		if (node.disabled === true) {
+			nodeData.disabled = true;
+		}
+		if (node.continueOnFail === true) {
+			nodeData.continueOnFail = true;
+		}
+		if (node.onError !== 'stopWorkflow') {
+			nodeData.onError = node.onError;
+		}
+		// Save the notes only if when they contain data
+		if (![undefined, ''].includes(node.notes)) {
+			nodeData.notes = node.notes;
+		}
+
+		return nodeData;
+	}
+
+	function getWebhookExpressionValue(
+		webhookData: IWebhookDescription,
+		key: string,
+		stringify = true,
+	): string {
+		if (webhookData[key] === undefined) {
+			return 'empty';
+		}
+		try {
+			return resolveExpression(
+				webhookData[key] as string,
+				undefined,
+				undefined,
+				stringify,
+			) as string;
+		} catch (e) {
+			return i18n.baseText('nodeWebhooks.invalidExpression');
+		}
+	}
+
+	function getWebhookUrl(
+		webhookData: IWebhookDescription,
+		node: INode,
+		showUrlFor?: string,
+	): string {
+		const { isForm, restartWebhook } = webhookData;
+		if (restartWebhook === true) {
+			return isForm ? '$execution.resumeFormUrl' : '$execution.resumeUrl';
+		}
+
+		let baseUrl;
+		if (showUrlFor === 'test') {
+			baseUrl = isForm ? rootStore.getFormTestUrl : rootStore.getWebhookTestUrl;
+		} else {
+			baseUrl = isForm ? rootStore.getFormUrl : rootStore.getWebhookUrl;
+		}
+
+		const workflowId = workflowsStore.workflowId;
+		const path = getWebhookExpressionValue(webhookData, 'path');
+		const isFullPath =
+			(getWebhookExpressionValue(webhookData, 'isFullPath') as unknown as boolean) || false;
+
+		return NodeHelpers.getNodeWebhookUrl(baseUrl, workflowId, node, path, isFullPath);
+	}
+
+	function resolveExpression(
+		expression: string,
+		siblingParameters: INodeParameters = {},
+		opts: {
+			targetItem?: TargetItem;
+			inputNodeName?: string;
+			inputRunIndex?: number;
+			inputBranchIndex?: number;
+			c?: number;
+			additionalKeys?: IWorkflowDataProxyAdditionalKeys;
+			isForCredential?: boolean;
+		} = {},
+		stringifyObject = true,
+	) {
+		const parameters = {
+			__xxxxxxx__: expression,
+			...siblingParameters,
+		};
+		const returnData: IDataObject | null = resolveParameter(parameters, opts);
+		if (!returnData) {
+			return null;
+		}
+
+		const obj = returnData.__xxxxxxx__;
+		if (typeof obj === 'object' && stringifyObject) {
+			const proxy = obj as { isProxy: boolean; toJSON?: () => unknown } | null;
+			if (proxy?.isProxy && proxy.toJSON) return JSON.stringify(proxy.toJSON());
+			const workflow = getCurrentWorkflow();
+			return workflow.expression.convertObjectValueToString(obj as object);
+		}
+		return obj;
+	}
+
+	async function updateWorkflow(
+		{ workflowId, active }: { workflowId: string; active?: boolean },
+		partialData = false,
+	) {
+		let data: IWorkflowDataUpdate = {};
+
+		const isCurrentWorkflow = workflowId === workflowsStore.workflowId;
+		if (isCurrentWorkflow) {
+			data = partialData
+				? { versionId: workflowsStore.workflowVersionId }
+				: await getWorkflowDataToSave();
+		} else {
+			const { versionId } = await workflowsStore.fetchWorkflow(workflowId);
+			data.versionId = versionId;
+		}
+
+		if (active !== undefined) {
+			data.active = active;
+		}
+
+		const workflow = await workflowsStore.updateWorkflow(workflowId, data);
+		workflowsStore.setWorkflowVersionId(workflow.versionId);
+
+		if (isCurrentWorkflow) {
+			workflowsStore.setActive(!!workflow.active);
+			uiStore.stateIsDirty = false;
+		}
+
+		if (workflow.active) {
+			workflowsStore.setWorkflowActive(workflowId);
+		} else {
+			workflowsStore.setWorkflowInactive(workflowId);
+		}
+	}
+
+	async function saveCurrentWorkflow(
+		{ id, name, tags }: { id?: string; name?: string; tags?: string[] } = {},
+		redirect = true,
+		forceSave = false,
+	): Promise<boolean> {
+		const readOnlyEnv = useSourceControlStore().preferences.branchReadOnly;
+		if (readOnlyEnv) {
+			return false;
+		}
+
+		const isLoading = useCanvasStore().isLoading;
+		const currentWorkflow = id || (router.currentRoute.value.params.name as string);
+
+		if (!currentWorkflow || ['new', PLACEHOLDER_EMPTY_WORKFLOW_ID].includes(currentWorkflow)) {
+			return await saveAsNewWorkflow({ name, tags }, redirect);
+		}
+
+		// Workflow exists already so update it
+		try {
+			if (!forceSave && isLoading) {
+				return true;
+			}
+			uiStore.addActiveAction('workflowSaving');
+
+			const workflowDataRequest: IWorkflowDataUpdate = await getWorkflowDataToSave();
+
+			if (name) {
+				workflowDataRequest.name = name.trim();
+			}
+
+			if (tags) {
+				workflowDataRequest.tags = tags;
+			}
+
+			workflowDataRequest.versionId = workflowsStore.workflowVersionId;
+
+			const workflowData = await workflowsStore.updateWorkflow(
+				currentWorkflow,
+				workflowDataRequest,
+				forceSave,
+			);
+			workflowsStore.setWorkflowVersionId(workflowData.versionId);
+
+			if (name) {
+				workflowsStore.setWorkflowName({ newName: workflowData.name, setStateDirty: false });
+			}
+
+			if (tags) {
+				const createdTags = (workflowData.tags || []) as ITag[];
+				const tagIds = createdTags.map((tag: ITag): string => tag.id);
+				workflowsStore.setWorkflowTagIds(tagIds);
+			}
+
+			uiStore.stateIsDirty = false;
+			uiStore.removeActiveAction('workflowSaving');
+			void useExternalHooks().run('workflow.afterUpdate', { workflowData });
+
+			return true;
+		} catch (error) {
+			console.error(error);
+
+			uiStore.removeActiveAction('workflowSaving');
+
+			if (error.errorCode === 100) {
+				telemetry.track('User attempted to save locked workflow', {
+					workflowId: currentWorkflow,
+					sharing_role: workflowPermissions.value.isOwner ? 'owner' : 'sharee',
+				});
+
+				const url = router.resolve({
+					name: VIEWS.WORKFLOW,
+					params: { name: currentWorkflow },
+				}).href;
+
+				const overwrite = await message.confirm(
+					i18n.baseText('workflows.concurrentChanges.confirmMessage.message', {
+						interpolate: {
+							url,
+						},
+					}),
+					i18n.baseText('workflows.concurrentChanges.confirmMessage.title'),
+					{
+						dangerouslyUseHTMLString: true,
+						confirmButtonText: i18n.baseText(
+							'workflows.concurrentChanges.confirmMessage.confirmButtonText',
+						),
+						cancelButtonText: i18n.baseText(
+							'workflows.concurrentChanges.confirmMessage.cancelButtonText',
+						),
+					},
+				);
+
+				if (overwrite === MODAL_CONFIRM) {
+					return await saveCurrentWorkflow({ id, name, tags }, redirect, true);
+				}
+
+				return false;
+			}
+
+			toast.showMessage({
+				title: i18n.baseText('workflowHelpers.showMessage.title'),
+				message: error.message,
+				type: 'error',
+			});
+
+			return false;
+		}
+	}
+
+	async function saveAsNewWorkflow(
+		{
+			name,
+			tags,
+			resetWebhookUrls,
+			resetNodeIds,
+			openInNewWindow,
+			data,
+		}: {
+			name?: string;
+			tags?: string[];
+			resetWebhookUrls?: boolean;
+			openInNewWindow?: boolean;
+			resetNodeIds?: boolean;
+			data?: IWorkflowDataUpdate;
+		} = {},
+		redirect = true,
+	): Promise<boolean> {
+		try {
+			uiStore.addActiveAction('workflowSaving');
+
+			const workflowDataRequest: IWorkflowDataUpdate = data || (await getWorkflowDataToSave());
+			const changedNodes = {} as IDataObject;
+
+			if (resetNodeIds) {
+				workflowDataRequest.nodes = workflowDataRequest.nodes!.map((node) => {
+					node.id = uuid();
+
+					return node;
+				});
+			}
+
+			if (resetWebhookUrls) {
+				workflowDataRequest.nodes = workflowDataRequest.nodes!.map((node) => {
+					if (node.webhookId) {
+						node.webhookId = uuid();
+						changedNodes[node.name] = node.webhookId;
+					}
+					return node;
+				});
+			}
+
+			if (name) {
+				workflowDataRequest.name = name.trim();
+			}
+
+			if (tags) {
+				workflowDataRequest.tags = tags;
+			}
+			const workflowData = await workflowsStore.createNewWorkflow(workflowDataRequest);
+
+			workflowsStore.addWorkflow(workflowData);
+			if (
+				useSettingsStore().isEnterpriseFeatureEnabled(EnterpriseEditionFeature.Sharing) &&
+				usersStore.currentUser
+			) {
+				workflowsEEStore.setWorkflowOwnedBy({
+					workflowId: workflowData.id,
+					ownedBy: usersStore.currentUser,
+				});
+			}
+
+			if (openInNewWindow) {
+				const routeData = router.resolve({
+					name: VIEWS.WORKFLOW,
+					params: { name: workflowData.id },
+				});
+				window.open(routeData.href, '_blank');
+				uiStore.removeActiveAction('workflowSaving');
+				return true;
+			}
+
+			workflowsStore.setActive(workflowData.active || false);
+			workflowsStore.setWorkflowId(workflowData.id);
+			workflowsStore.setWorkflowVersionId(workflowData.versionId);
+			workflowsStore.setWorkflowName({ newName: workflowData.name, setStateDirty: false });
+			workflowsStore.setWorkflowSettings((workflowData.settings as IWorkflowSettings) || {});
+			uiStore.stateIsDirty = false;
+			Object.keys(changedNodes).forEach((nodeName) => {
+				const changes = {
+					key: 'webhookId',
+					value: changedNodes[nodeName],
+					name: nodeName,
+				} as IUpdateInformation;
+				workflowsStore.setNodeValue(changes);
+			});
+
+			const createdTags = (workflowData.tags || []) as ITag[];
+			const tagIds = createdTags.map((tag: ITag): string => tag.id);
+			workflowsStore.setWorkflowTagIds(tagIds);
+
+			const templateId = router.currentRoute.value.query.templateId;
+			if (templateId) {
+				telemetry.track('User saved new workflow from template', {
+					template_id: tryToParseNumber(String(templateId)),
+					workflow_id: workflowData.id,
+					wf_template_repo_session_id: templatesStore.previousSessionId,
+				});
+			}
+
+			if (redirect) {
+				void router.replace({
+					name: VIEWS.WORKFLOW,
+					params: { name: workflowData.id, action: 'workflowSave' },
+				});
+			}
+
+			uiStore.removeActiveAction('workflowSaving');
+			uiStore.stateIsDirty = false;
+			void useExternalHooks().run('workflow.afterUpdate', { workflowData });
+
+			getCurrentWorkflow(true); // refresh cache
+			return true;
+		} catch (e) {
+			uiStore.removeActiveAction('workflowSaving');
+
+			toast.showMessage({
+				title: i18n.baseText('workflowHelpers.showMessage.title'),
+				message: (e as Error).message,
+				type: 'error',
+			});
+
+			return false;
+		}
+	}
+
+	// Updates the position of all the nodes that the top-left node
+	// is at the given position
+	function updateNodePositions(
+		workflowData: IWorkflowData | IWorkflowDataUpdate,
+		position: XYPosition,
+	): void {
+		if (workflowData.nodes === undefined) {
+			return;
+		}
+
+		// Find most top-left node
+		const minPosition = [99999999, 99999999];
+		for (const node of workflowData.nodes) {
+			if (node.position[1] < minPosition[1]) {
+				minPosition[0] = node.position[0];
+				minPosition[1] = node.position[1];
+			} else if (node.position[1] === minPosition[1]) {
+				if (node.position[0] < minPosition[0]) {
+					minPosition[0] = node.position[0];
+					minPosition[1] = node.position[1];
+				}
+			}
+		}
+
+		// Update the position on all nodes so that the
+		// most top-left one is at given position
+		const offsetPosition = [position[0] - minPosition[0], position[1] - minPosition[1]];
+		for (const node of workflowData.nodes) {
+			node.position[0] += offsetPosition[0];
+			node.position[1] += offsetPosition[1];
+		}
+	}
+
+	async function dataHasChanged(id: string) {
+		const currentData = await getWorkflowDataToSave();
+
+		const data: IWorkflowDb = await workflowsStore.fetchWorkflow(id);
+
+		if (data !== undefined) {
+			const x = {
+				nodes: data.nodes,
+				connections: data.connections,
+				settings: data.settings,
+				name: data.name,
+			};
+			const y = {
+				nodes: currentData.nodes,
+				connections: currentData.connections,
+				settings: currentData.settings,
+				name: currentData.name,
+			};
+			return !isEqual(x, y);
+		}
+
+		return true;
+	}
+
+	function removeForeignCredentialsFromWorkflow(
+		workflow: IWorkflowData | IWorkflowDataUpdate,
+		usableCredentials: ICredentialsResponse[],
+	): void {
+		(workflow.nodes ?? []).forEach((node: INode) => {
+			if (!node.credentials) {
+				return;
+			}
+
+			node.credentials = Object.entries(node.credentials).reduce<INodeCredentials>(
+				(acc, [credentialType, credential]) => {
+					const isUsableCredential = usableCredentials.some(
+						(ownCredential) => `${ownCredential.id}` === `${credential.id}`,
+					);
+					if (credential.id && isUsableCredential) {
+						acc[credentialType] = node.credentials![credentialType];
+					}
+
+					return acc;
+				},
+				{},
+			);
+		});
+	}
+
+	return {
+		resolveParameter,
+		resolveRequiredParameters,
+		getCurrentWorkflow,
+		getConnectedNodes,
+		getNodes,
+		getWorkflow,
+		getNodeTypes,
+		connectionInputData,
+		executeData,
+		getNodeTypesMaxCount,
+		getNodeTypeCount,
+		checkReadyForExecution,
+		getWorkflowDataToSave,
+		getNodeDataToSave,
+		getWebhookExpressionValue,
+		getWebhookUrl,
+		resolveExpression,
+		updateWorkflow,
+		saveCurrentWorkflow,
+		saveAsNewWorkflow,
+		updateNodePositions,
+		dataHasChanged,
+		removeForeignCredentialsFromWorkflow,
+		workflowPermissions,
+	};
+}
diff --git a/packages/editor-ui/src/constants.ts b/packages/editor-ui/src/constants.ts
index 9fbf469b31d0a..51a60ec4191f2 100644
--- a/packages/editor-ui/src/constants.ts
+++ b/packages/editor-ui/src/constants.ts
@@ -1,8 +1,12 @@
 import type { NodeCreatorOpenSource } from './Interface';
-
-export const MAX_WORKFLOW_SIZE = 16777216; // Workflow size limit in bytes
-export const MAX_WORKFLOW_PINNED_DATA_SIZE = 12582912; // Workflow pinned data size limit in bytes
-export const MAX_DISPLAY_DATA_SIZE = 204800;
+import { NodeConnectionType } from 'n8n-workflow';
+
+export const MAX_WORKFLOW_SIZE = 1024 * 1024 * 16; // Workflow size limit in bytes
+export const MAX_EXPECTED_REQUEST_SIZE = 2048; // Expected maximum workflow request metadata (i.e. headers) size in bytes
+export const MAX_PINNED_DATA_SIZE = import.meta.env.VUE_APP_MAX_PINNED_DATA_SIZE
+	? parseInt(import.meta.env.VUE_APP_MAX_PINNED_DATA_SIZE, 10)
+	: 1024 * 1024 * 12; // Workflow pinned data size limit in bytes
+export const MAX_DISPLAY_DATA_SIZE = 1024 * 200;
 export const MAX_DISPLAY_ITEMS_AUTO_ALL = 250;
 
 export const PLACEHOLDER_FILLED_AT_EXECUTION_TIME = '[filled at execution time]';
@@ -26,7 +30,7 @@ export const MAX_TAG_NAME_LENGTH = 24;
 
 // modals
 export const ABOUT_MODAL_KEY = 'about';
-export const ASK_AI_MODAL_KEY = 'askAi';
+export const CHAT_EMBED_MODAL_KEY = 'chatEmbed';
 export const CHANGE_PASSWORD_MODAL_KEY = 'changePassword';
 export const CREDENTIAL_EDIT_MODAL_KEY = 'editCredential';
 export const CREDENTIAL_SELECT_MODAL_KEY = 'selectCredential';
@@ -36,18 +40,29 @@ export const DUPLICATE_MODAL_KEY = 'duplicate';
 export const TAGS_MANAGER_MODAL_KEY = 'tagsManager';
 export const VERSIONS_MODAL_KEY = 'versions';
 export const WORKFLOW_SETTINGS_MODAL_KEY = 'settings';
+export const WORKFLOW_LM_CHAT_MODAL_KEY = 'lmChat';
 export const WORKFLOW_SHARE_MODAL_KEY = 'workflowShare';
 export const PERSONALIZATION_MODAL_KEY = 'personalization';
 export const CONTACT_PROMPT_MODAL_KEY = 'contactPrompt';
 export const VALUE_SURVEY_MODAL_KEY = 'valueSurvey';
-export const EXECUTIONS_MODAL_KEY = 'executions';
+export const ADD_TEST_SUITE_MODAL_KEY = 'addTestSuite';
+export const EDIT_TEST_SUITE_MODAL_KEY = 'editTestSuite';
 export const WORKFLOW_ACTIVE_MODAL_KEY = 'activation';
 export const ONBOARDING_CALL_SIGNUP_MODAL_KEY = 'onboardingCallSignup';
 export const COMMUNITY_PACKAGE_INSTALL_MODAL_KEY = 'communityPackageInstall';
 export const COMMUNITY_PACKAGE_CONFIRM_MODAL_KEY = 'communityPackageManageConfirm';
 export const IMPORT_CURL_MODAL_KEY = 'importCurl';
+export const GENERATE_CURL_MODAL_KEY = 'generateCurl';
 export const LOG_STREAM_MODAL_KEY = 'settingsLogStream';
-export const USER_ACTIVATION_SURVEY_MODAL = 'userActivationSurvey';
+export const SOURCE_CONTROL_PUSH_MODAL_KEY = 'sourceControlPush';
+export const SOURCE_CONTROL_PULL_MODAL_KEY = 'sourceControlPull';
+export const DEBUG_PAYWALL_MODAL_KEY = 'debugPaywall';
+export const MFA_SETUP_MODAL_KEY = 'mfaSetup';
+export const WORKFLOW_HISTORY_VERSION_RESTORE = 'workflowHistoryVersionRestore';
+export const SUGGESTED_TEMPLATES_PREVIEW_MODAL_KEY = 'suggestedTemplatePreview';
+export const SETUP_CREDENTIALS_MODAL_KEY = 'setupCredentials';
+
+export const EXTERNAL_SECRETS_PROVIDER_MODAL_KEY = 'externalSecretsProvider';
 
 export const COMMUNITY_PACKAGE_MANAGE_ACTIONS = {
 	UNINSTALL: 'uninstall',
@@ -67,12 +82,14 @@ export const BUILTIN_NODES_DOCS_URL = `https://${DOCS_DOMAIN}/integrations/built
 export const BUILTIN_CREDENTIALS_DOCS_URL = `https://${DOCS_DOMAIN}/integrations/builtin/credentials/`;
 export const DATA_PINNING_DOCS_URL = `https://${DOCS_DOMAIN}/data/data-pinning/`;
 export const DATA_EDITING_DOCS_URL = `https://${DOCS_DOMAIN}/data/data-editing/`;
+export const MFA_DOCS_URL = `https://${DOCS_DOMAIN}/user-management/two-factor-auth/`;
 export const NPM_COMMUNITY_NODE_SEARCH_API_URL = 'https://api.npms.io/v2/';
 export const NPM_PACKAGE_DOCS_BASE_URL = 'https://www.npmjs.com/package/';
 export const NPM_KEYWORD_SEARCH_URL =
 	'https://www.npmjs.com/search?q=keywords%3An8n-community-node-package';
 export const N8N_QUEUE_MODE_DOCS_URL = `https://${DOCS_DOMAIN}/hosting/scaling/queue-mode/`;
-export const COMMUNITY_NODES_INSTALLATION_DOCS_URL = `https://${DOCS_DOMAIN}/integrations/community-nodes/installation/`;
+export const COMMUNITY_NODES_INSTALLATION_DOCS_URL = `https://${DOCS_DOMAIN}/integrations/community-nodes/installation/gui-install/`;
+export const COMMUNITY_NODES_MANUAL_INSTALLATION_DOCS_URL = `https://${DOCS_DOMAIN}/integrations/community-nodes/installation/manual-install/`;
 export const COMMUNITY_NODES_NPM_INSTALLATION_URL =
 	'https://docs.npmjs.com/downloading-and-installing-node-js-and-npm';
 export const COMMUNITY_NODES_RISKS_DOCS_URL = `https://${DOCS_DOMAIN}/integrations/community-nodes/risks/`;
@@ -81,22 +98,28 @@ export const CUSTOM_NODES_DOCS_URL = `https://${DOCS_DOMAIN}/integrations/creati
 export const EXPRESSIONS_DOCS_URL = `https://${DOCS_DOMAIN}/code-examples/expressions/`;
 export const N8N_PRICING_PAGE_URL = 'https://n8n.io/pricing';
 
+export const NODE_INSERT_SPACER_BETWEEN_INPUT_GROUPS = false;
+export const NODE_MIN_INPUT_ITEMS_COUNT = 4;
+
 // node types
 export const BAMBOO_HR_NODE_TYPE = 'n8n-nodes-base.bambooHr';
 export const CALENDLY_TRIGGER_NODE_TYPE = 'n8n-nodes-base.calendlyTrigger';
 export const CODE_NODE_TYPE = 'n8n-nodes-base.code';
+export const AI_CODE_NODE_TYPE = '@n8n/n8n-nodes-langchain.code';
 export const CRON_NODE_TYPE = 'n8n-nodes-base.cron';
 export const CLEARBIT_NODE_TYPE = 'n8n-nodes-base.clearbit';
 export const FILTER_NODE_TYPE = 'n8n-nodes-base.filter';
 export const FUNCTION_NODE_TYPE = 'n8n-nodes-base.function';
 export const GITHUB_TRIGGER_NODE_TYPE = 'n8n-nodes-base.githubTrigger';
 export const GIT_NODE_TYPE = 'n8n-nodes-base.git';
+export const GOOGLE_GMAIL_NODE_TYPE = 'n8n-nodes-base.gmail';
 export const GOOGLE_SHEETS_NODE_TYPE = 'n8n-nodes-base.googleSheets';
 export const ERROR_TRIGGER_NODE_TYPE = 'n8n-nodes-base.errorTrigger';
 export const ELASTIC_SECURITY_NODE_TYPE = 'n8n-nodes-base.elasticSecurity';
 export const EMAIL_SEND_NODE_TYPE = 'n8n-nodes-base.emailSend';
 export const EMAIL_IMAP_NODE_TYPE = 'n8n-nodes-base.emailReadImap';
 export const EXECUTE_COMMAND_NODE_TYPE = 'n8n-nodes-base.executeCommand';
+export const FORM_TRIGGER_NODE_TYPE = 'n8n-nodes-base.formTrigger';
 export const HTML_NODE_TYPE = 'n8n-nodes-base.html';
 export const HTTP_REQUEST_NODE_TYPE = 'n8n-nodes-base.httpRequest';
 export const HUBSPOT_TRIGGER_NODE_TYPE = 'n8n-nodes-base.hubspotTrigger';
@@ -107,6 +130,15 @@ export const JIRA_NODE_TYPE = 'n8n-nodes-base.jira';
 export const JIRA_TRIGGER_NODE_TYPE = 'n8n-nodes-base.jiraTrigger';
 export const MICROSOFT_EXCEL_NODE_TYPE = 'n8n-nodes-base.microsoftExcel';
 export const MANUAL_TRIGGER_NODE_TYPE = 'n8n-nodes-base.manualTrigger';
+export const MANUAL_CHAT_TRIGGER_NODE_TYPE = '@n8n/n8n-nodes-langchain.manualChatTrigger';
+export const CHAT_TRIGGER_NODE_TYPE = '@n8n/n8n-nodes-langchain.chatTrigger';
+export const AGENT_NODE_TYPE = '@n8n/n8n-nodes-langchain.agent';
+export const OPEN_AI_NODE_TYPE = '@n8n/n8n-nodes-langchain.openAi';
+export const OPEN_AI_NODE_MESSAGE_ASSISTANT_TYPE =
+	'@n8n/n8n-nodes-langchain.openAi.assistant.message';
+export const OPEN_AI_ASSISTANT_NODE_TYPE = '@n8n/n8n-nodes-langchain.openAiAssistant';
+export const BASIC_CHAIN_NODE_TYPE = '@n8n/n8n-nodes-langchain.chainLlm';
+export const QA_CHAIN_NODE_TYPE = '@n8n/n8n-nodes-langchain.chainRetrievalQa';
 export const MICROSOFT_TEAMS_NODE_TYPE = 'n8n-nodes-base.microsoftTeams';
 export const N8N_NODE_TYPE = 'n8n-nodes-base.n8n';
 export const NO_OP_NODE_TYPE = 'n8n-nodes-base.noOp';
@@ -123,17 +155,42 @@ export const SPREADSHEET_FILE_NODE_TYPE = 'n8n-nodes-base.spreadsheetFile';
 export const SPLIT_IN_BATCHES_NODE_TYPE = 'n8n-nodes-base.splitInBatches';
 export const START_NODE_TYPE = 'n8n-nodes-base.start';
 export const SWITCH_NODE_TYPE = 'n8n-nodes-base.switch';
+export const TELEGRAM_NODE_TYPE = 'n8n-nodes-base.telegram';
 export const THE_HIVE_TRIGGER_NODE_TYPE = 'n8n-nodes-base.theHiveTrigger';
 export const QUICKBOOKS_NODE_TYPE = 'n8n-nodes-base.quickbooks';
 export const WAIT_NODE_TYPE = 'n8n-nodes-base.wait';
 export const WEBHOOK_NODE_TYPE = 'n8n-nodes-base.webhook';
 export const WORKABLE_TRIGGER_NODE_TYPE = 'n8n-nodes-base.workableTrigger';
 export const WORKFLOW_TRIGGER_NODE_TYPE = 'n8n-nodes-base.workflowTrigger';
+export const EXECUTE_WORKFLOW_NODE_TYPE = 'n8n-nodes-base.executeWorkflow';
 export const EXECUTE_WORKFLOW_TRIGGER_NODE_TYPE = 'n8n-nodes-base.executeWorkflowTrigger';
 export const WOOCOMMERCE_TRIGGER_NODE_TYPE = 'n8n-nodes-base.wooCommerceTrigger';
 export const XERO_NODE_TYPE = 'n8n-nodes-base.xero';
 export const ZENDESK_NODE_TYPE = 'n8n-nodes-base.zendesk';
 export const ZENDESK_TRIGGER_NODE_TYPE = 'n8n-nodes-base.zendeskTrigger';
+export const DISCORD_NODE_TYPE = 'n8n-nodes-base.discord';
+export const EXTRACT_FROM_FILE_NODE_TYPE = 'n8n-nodes-base.extractFromFile';
+export const CONVERT_TO_FILE_NODE_TYPE = 'n8n-nodes-base.convertToFile';
+export const DATETIME_NODE_TYPE = 'n8n-nodes-base.dateTime';
+export const REMOVE_DUPLICATES_NODE_TYPE = 'n8n-nodes-base.removeDuplicates';
+export const SPLIT_OUT_NODE_TYPE = 'n8n-nodes-base.splitOut';
+export const LIMIT_NODE_TYPE = 'n8n-nodes-base.limit';
+export const SUMMARIZE_NODE_TYPE = 'n8n-nodes-base.summarize';
+export const AGGREGATE_NODE_TYPE = 'n8n-nodes-base.aggregate';
+export const MERGE_NODE_TYPE = 'n8n-nodes-base.merge';
+export const MARKDOWN_NODE_TYPE = 'n8n-nodes-base.markdown';
+export const XML_NODE_TYPE = 'n8n-nodes-base.xml';
+export const CRYPTO_NODE_TYPE = 'n8n-nodes-base.crypto';
+export const RSS_READ_NODE_TYPE = 'n8n-nodes-base.rssFeedRead';
+export const COMPRESSION_NODE_TYPE = 'n8n-nodes-base.compression';
+export const EDIT_IMAGE_NODE_TYPE = 'n8n-nodes-base.editImage';
+export const CHAIN_SUMMARIZATION_LANGCHAIN_NODE_TYPE =
+	'@n8n/n8n-nodes-langchain.chainSummarization';
+export const SIMULATE_NODE_TYPE = 'n8n-nodes-base.simulate';
+export const SIMULATE_TRIGGER_NODE_TYPE = 'n8n-nodes-base.simulateTrigger';
+
+export const CREDENTIAL_ONLY_NODE_PREFIX = 'n8n-creds-base';
+export const CREDENTIAL_ONLY_HTTP_NODE_VERSION = 4.1;
 
 export const EXECUTABLE_TRIGGER_NODE_TYPES = [
 	START_NODE_TYPE,
@@ -147,9 +204,20 @@ export const NON_ACTIVATABLE_TRIGGER_NODE_TYPES = [
 	ERROR_TRIGGER_NODE_TYPE,
 	MANUAL_TRIGGER_NODE_TYPE,
 	EXECUTE_WORKFLOW_TRIGGER_NODE_TYPE,
+	MANUAL_CHAT_TRIGGER_NODE_TYPE,
 ];
 
-export const PIN_DATA_NODE_TYPES_DENYLIST = [SPLIT_IN_BATCHES_NODE_TYPE];
+export const NODES_USING_CODE_NODE_EDITOR = [CODE_NODE_TYPE, AI_CODE_NODE_TYPE];
+
+export const PIN_DATA_NODE_TYPES_DENYLIST = [SPLIT_IN_BATCHES_NODE_TYPE, STICKY_NODE_TYPE];
+
+export const OPEN_URL_PANEL_TRIGGER_NODE_TYPES = [
+	WEBHOOK_NODE_TYPE,
+	FORM_TRIGGER_NODE_TYPE,
+	CHAT_TRIGGER_NODE_TYPE,
+];
+
+export const PRODUCTION_ONLY_TRIGGER_NODE_TYPES = [CHAT_TRIGGER_NODE_TYPE];
 
 // Node creator
 export const NODE_CREATOR_OPEN_SOURCES: Record<
@@ -158,43 +226,50 @@ export const NODE_CREATOR_OPEN_SOURCES: Record<
 > = {
 	NO_TRIGGER_EXECUTION_TOOLTIP: 'no_trigger_execution_tooltip',
 	PLUS_ENDPOINT: 'plus_endpoint',
+	ADD_INPUT_ENDPOINT: 'add_input_endpoint',
 	TRIGGER_PLACEHOLDER_BUTTON: 'trigger_placeholder_button',
 	ADD_NODE_BUTTON: 'add_node_button',
 	TAB: 'tab',
 	NODE_CONNECTION_ACTION: 'node_connection_action',
 	NODE_CONNECTION_DROP: 'node_connection_drop',
+	NOTICE_ERROR_MESSAGE: 'notice_error_message',
+	CONTEXT_MENU: 'context_menu',
 	'': '',
 };
-
 export const CORE_NODES_CATEGORY = 'Core Nodes';
-export const COMMUNICATION_CATEGORY = 'Communication';
 export const CUSTOM_NODES_CATEGORY = 'Custom Nodes';
-export const RECOMMENDED_CATEGORY = 'Recommended';
-export const SUBCATEGORY_DESCRIPTIONS: {
-	[category: string]: { [subcategory: string]: string };
-} = {
-	'Core Nodes': {
-		// this - all subkeys are set from codex
-		Flow: 'Branches, core triggers, merge data',
-		Files: 'Work with CSV, XML, text, images etc.',
-		'Data Transformation': 'Manipulate data fields, run code',
-		Helpers: 'HTTP Requests (API calls), date and time, scrape HTML',
-	},
-};
-export const REGULAR_NODE_FILTER = 'Regular';
-export const TRIGGER_NODE_FILTER = 'Trigger';
-export const ALL_NODE_FILTER = 'All';
-export const UNCATEGORIZED_CATEGORY = 'Miscellaneous';
-export const UNCATEGORIZED_SUBCATEGORY = 'Helpers';
-export const PERSONALIZED_CATEGORY = 'Suggested Nodes';
+export const DEFAULT_SUBCATEGORY = '*';
+export const AI_OTHERS_NODE_CREATOR_VIEW = 'AI Other';
+export const AI_NODE_CREATOR_VIEW = 'AI';
+export const REGULAR_NODE_CREATOR_VIEW = 'Regular';
+export const TRIGGER_NODE_CREATOR_VIEW = 'Trigger';
 export const OTHER_TRIGGER_NODES_SUBCATEGORY = 'Other Trigger Nodes';
 export const TRANSFORM_DATA_SUBCATEGORY = 'Data Transformation';
 export const FILES_SUBCATEGORY = 'Files';
 export const FLOWS_CONTROL_SUBCATEGORY = 'Flow';
+export const AI_SUBCATEGORY = 'AI';
 export const HELPERS_SUBCATEGORY = 'Helpers';
+export const AI_CATEGORY_AGENTS = 'Agents';
+export const AI_CATEGORY_CHAINS = 'Chains';
+export const AI_CATEGORY_LANGUAGE_MODELS = 'Language Models';
+export const AI_CATEGORY_MEMORY = 'Memory';
+export const AI_CATEGORY_OUTPUTPARSER = 'Output Parsers';
+export const AI_CATEGORY_TOOLS = 'Tools';
+export const AI_CATEGORY_VECTOR_STORES = 'Vector Stores';
+export const AI_CATEGORY_RETRIEVERS = 'Retrievers';
+export const AI_CATEGORY_EMBEDDING = 'Embeddings';
+export const AI_CATEGORY_DOCUMENT_LOADERS = 'Document Loaders';
+export const AI_CATEGORY_TEXT_SPLITTERS = 'Text Splitters';
+export const AI_UNCATEGORIZED_CATEGORY = 'Miscellaneous';
 
 export const REQUEST_NODE_FORM_URL = 'https://n8n-community.typeform.com/to/K1fBVTZ3';
-export const ASK_AI_WAITLIST_URL = 'https://n8n-community.typeform.com/to/odKU4oDR';
+
+// Node Connection Types
+export const NODE_CONNECTION_TYPE_ALLOW_MULTIPLE: NodeConnectionType[] = [
+	NodeConnectionType.AiTool,
+
+	NodeConnectionType.Main,
+];
 
 // General
 export const INSTANCE_ID_HEADER = 'n8n-instance-id';
@@ -319,7 +394,7 @@ export const ROLE_OTHER = 'other';
 
 export const MODAL_CANCEL = 'cancel';
 export const MODAL_CLOSE = 'close';
-export const MODAL_CONFIRMED = 'confirmed';
+export const MODAL_CONFIRM = 'confirm';
 
 export 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,}))$/;
@@ -327,6 +402,7 @@ export const LOCAL_STORAGE_ACTIVATION_FLAG = 'N8N_HIDE_ACTIVATION_ALERT';
 export const LOCAL_STORAGE_PIN_DATA_DISCOVERY_NDV_FLAG = 'N8N_PIN_DATA_DISCOVERY_NDV';
 export const LOCAL_STORAGE_PIN_DATA_DISCOVERY_CANVAS_FLAG = 'N8N_PIN_DATA_DISCOVERY_CANVAS';
 export const LOCAL_STORAGE_MAPPING_IS_ONBOARDED = 'N8N_MAPPING_ONBOARDED';
+export const LOCAL_STORAGE_AUTOCOMPLETE_IS_ONBOARDED = 'N8N_AUTOCOMPLETE_ONBOARDED';
 export const LOCAL_STORAGE_MAIN_PANEL_RELATIVE_WIDTH = 'N8N_MAIN_PANEL_RELATIVE_WIDTH';
 export const LOCAL_STORAGE_ACTIVE_MODAL = 'N8N_ACTIVE_MODAL';
 export const LOCAL_STORAGE_THEME = 'N8N_THEME';
@@ -355,11 +431,6 @@ export const HIRING_BANNER = `
 Love n8n? Help us build the future of automation! https://n8n.io/careers?utm_source=n8n_user&utm_medium=console_output
 `;
 
-export const NODE_TYPE_COUNT_MAPPER = {
-	[REGULAR_NODE_FILTER]: ['regularCount'],
-	[TRIGGER_NODE_FILTER]: ['triggerCount'],
-	[ALL_NODE_FILTER]: ['triggerCount', 'regularCount'],
-};
 export const TEMPLATES_NODES_FILTER = ['n8n-nodes-base.start', 'n8n-nodes-base.respondToWebhook'];
 
 export const enum VIEWS {
@@ -367,8 +438,10 @@ export const enum VIEWS {
 	COLLECTION = 'TemplatesCollectionView',
 	EXECUTIONS = 'Executions',
 	EXECUTION_PREVIEW = 'ExecutionPreview',
+	EXECUTION_DEBUG = 'ExecutionDebug',
 	EXECUTION_HOME = 'ExecutionsLandingPage',
 	TEMPLATE = 'TemplatesWorkflowView',
+	TEMPLATE_SETUP = 'TemplatesWorkflowSetupView',
 	TEMPLATES = 'TemplatesSearchView',
 	CREDENTIALS = 'CredentialsView',
 	VARIABLES = 'VariablesView',
@@ -376,6 +449,7 @@ export const enum VIEWS {
 	WORKFLOW = 'NodeViewExisting',
 	DEMO = 'WorkflowDemo',
 	TEMPLATE_IMPORT = 'WorkflowTemplate',
+	WORKFLOW_ONBOARDING = 'WorkflowOnboarding',
 	SIGNIN = 'SigninView',
 	SIGNUP = 'SignupView',
 	SIGNOUT = 'SignoutView',
@@ -385,6 +459,9 @@ export const enum VIEWS {
 	USERS_SETTINGS = 'UsersSettings',
 	LDAP_SETTINGS = 'LdapSettings',
 	PERSONAL_SETTINGS = 'PersonalSettings',
+	TEST_SUITES = 'TestSuitesView',
+	TEST_SUITE = 'TestSuiteView',
+	TEST_SUITE_NODES = 'TestSuiteNodesView',
 	API_SETTINGS = 'APISettings',
 	NOT_FOUND = 'NotFoundView',
 	FAKE_DOOR = 'ComingSoon',
@@ -394,10 +471,16 @@ export const enum VIEWS {
 	USAGE = 'Usage',
 	LOG_STREAMING_SETTINGS = 'LogStreamingSettingsView',
 	SSO_SETTINGS = 'SSoSettings',
+	EXTERNAL_SECRETS_SETTINGS = 'ExternalSecretsSettings',
 	SAML_ONBOARDING = 'SamlOnboarding',
-	VERSION_CONTROL = 'VersionControl',
+	SOURCE_CONTROL = 'SourceControl',
+	MFA_VIEW = 'MfaView',
+	WORKFLOW_HISTORY = 'WorkflowHistory',
+	WORKER_VIEW = 'WorkerView',
 }
 
+export const EDITABLE_CANVAS_VIEWS = [VIEWS.WORKFLOW, VIEWS.NEW_WORKFLOW, VIEWS.EXECUTION_DEBUG];
+
 export const enum FAKE_DOOR_FEATURES {
 	ENVIRONMENTS = 'environments',
 	LOGGING = 'logging',
@@ -423,6 +506,7 @@ export const MAPPING_PARAMS = [
 	'$env',
 	'$evaluateExpression',
 	'$execution',
+	'$ifEmpty',
 	'$input',
 	'$item',
 	'$jmespath',
@@ -448,6 +532,7 @@ export const enum WORKFLOW_MENU_ACTIONS {
 	DOWNLOAD = 'download',
 	IMPORT_FROM_URL = 'import-from-url',
 	IMPORT_FROM_FILE = 'import-from-file',
+	PUSH = 'push',
 	SETTINGS = 'settings',
 	DELETE = 'delete',
 }
@@ -462,7 +547,13 @@ export const enum EnterpriseEditionFeature {
 	LogStreaming = 'logStreaming',
 	Variables = 'variables',
 	Saml = 'saml',
-	VersionControl = 'versionControl',
+	SourceControl = 'sourceControl',
+	ExternalSecrets = 'externalSecrets',
+	AuditLogs = 'auditLogs',
+	DebugInEditor = 'debugInEditor',
+	WorkflowHistory = 'workflowHistory',
+	WorkerView = 'workerView',
+	AdvancedPermissions = 'advancedPermissions',
 }
 export const MAIN_NODE_PANEL_WIDTH = 360;
 
@@ -512,6 +603,7 @@ export const enum STORES {
 	USERS = 'users',
 	WORKFLOWS = 'workflows',
 	WORKFLOWS_EE = 'workflowsEE',
+	EXECUTIONS = 'executions',
 	NDV = 'ndv',
 	TEMPLATES = 'templates',
 	NODE_TYPES = 'nodeTypes',
@@ -521,6 +613,11 @@ export const enum STORES {
 	NODE_CREATOR = 'nodeCreator',
 	WEBHOOKS = 'webhooks',
 	HISTORY = 'history',
+	CLOUD_PLAN = 'cloudPlan',
+	RBAC = 'rbac',
+	COLLABORATION = 'collaboration',
+	PUSH = 'push',
+	BECOME_TEMPLATE_CREATOR = 'becomeTemplateCreator',
 }
 
 export const enum SignInType {
@@ -534,16 +631,191 @@ export const N8N_CONTACT_EMAIL = 'contact@n8n.io';
 
 export const EXPRESSION_EDITOR_PARSER_TIMEOUT = 15_000; // ms
 
-export const KEEP_AUTH_IN_NDV_FOR_NODES = [HTTP_REQUEST_NODE_TYPE, WEBHOOK_NODE_TYPE];
+export const KEEP_AUTH_IN_NDV_FOR_NODES = [
+	HTTP_REQUEST_NODE_TYPE,
+	WEBHOOK_NODE_TYPE,
+	WAIT_NODE_TYPE,
+	DISCORD_NODE_TYPE,
+	CHAT_TRIGGER_NODE_TYPE,
+];
 export const MAIN_AUTH_FIELD_NAME = 'authentication';
 export const NODE_RESOURCE_FIELD_NAME = 'resource';
 
-export const TEMPLATE_EXPERIMENT = {
-	name: '002_remove_templates',
+export const ASK_AI_EXPERIMENT = {
+	name: '011_ask_AI',
+	control: 'control',
+	gpt3: 'gpt3',
+	gpt4: 'gpt4',
+};
+
+export const TEMPLATE_CREDENTIAL_SETUP_EXPERIMENT = '017_template_credential_setup_v2';
+
+export const AI_ASSISTANT_EXPERIMENT = {
+	name: '19_ai_assistant_experiment',
 	control: 'control',
 	variant: 'variant',
 };
 
-export const EXPERIMENTS_TO_TRACK = [TEMPLATE_EXPERIMENT.name];
+export const EXPERIMENTS_TO_TRACK = [
+	ASK_AI_EXPERIMENT.name,
+	TEMPLATE_CREDENTIAL_SETUP_EXPERIMENT,
+	AI_ASSISTANT_EXPERIMENT.name,
+];
+
+export const MFA_AUTHENTICATION_REQUIRED_ERROR_CODE = 998;
+
+export const MFA_AUTHENTICATION_TOKEN_WINDOW_EXPIRED = 997;
+
+export const MFA_AUTHENTICATION_TOKEN_INPUT_MAX_LENGTH = 6;
+
+export const MFA_AUTHENTICATION_RECOVERY_CODE_INPUT_MAX_LENGTH = 36;
+
+export const NODE_TYPES_EXCLUDED_FROM_OUTPUT_NAME_APPEND = [FILTER_NODE_TYPE, SWITCH_NODE_TYPE];
+
+type ClearOutgoingConnectonsEvents = {
+	[nodeName: string]: {
+		parameterPaths: string[];
+		eventTypes: string[];
+	};
+};
+
+export const SHOULD_CLEAR_NODE_OUTPUTS: ClearOutgoingConnectonsEvents = {
+	[SWITCH_NODE_TYPE]: {
+		parameterPaths: ['parameters.rules.values'],
+		eventTypes: ['optionsOrderChanged'],
+	},
+};
+
+export const ALLOWED_HTML_ATTRIBUTES = ['href', 'name', 'target', 'title', 'class', 'id', 'style'];
+
+export const ALLOWED_HTML_TAGS = [
+	'p',
+	'strong',
+	'b',
+	'code',
+	'a',
+	'br',
+	'i',
+	'ul',
+	'li',
+	'em',
+	'small',
+	'details',
+	'summary',
+	'mark',
+];
+
+export const CLOUD_CHANGE_PLAN_PAGE = window.location.host.includes('stage-app.n8n.cloud')
+	? 'https://stage-app.n8n.cloud/account/change-plan'
+	: 'https://app.n8n.cloud/account/change-plan';
+
+export const CLOUD_BASE_URL_STAGING = 'https://stage-api.n8n.cloud';
+
+export const CLOUD_BASE_URL_PRODUCTION = 'https://api.n8n.cloud';
+
+export const CLOUD_TRIAL_CHECK_INTERVAL = 5000;
+
+// A path that does not exist so that nothing is selected by default
+export const nonExistingJsonPath = '_!^&*';
+
+// Ask AI
+export const ASK_AI_MAX_PROMPT_LENGTH = 600;
+export const ASK_AI_MIN_PROMPT_LENGTH = 15;
+export const ASK_AI_LOADING_DURATION_MS = 12000;
+
+export const APPEND_ATTRIBUTION_DEFAULT_PATH = 'parameters.options.appendAttribution';
+
+export const DRAG_EVENT_DATA_KEY = 'nodesAndConnections';
+
+export const NOT_DUPLICATABE_NODE_TYPES = [FORM_TRIGGER_NODE_TYPE];
+export const UPDATE_WEBHOOK_ID_NODE_TYPES = [FORM_TRIGGER_NODE_TYPE];
+
+export const CREATOR_HUB_URL = 'https://creators.n8n.io/hub';
+
+/**
+ * Units of time in milliseconds
+ */
+export const TIME = {
+	SECOND: 1000,
+	MINUTE: 60 * 1000,
+	HOUR: 60 * 60 * 1000,
+	DAY: 24 * 60 * 60 * 1000,
+};
+
+export const SUGGESTED_TEMPLATES_FLAG = 'SHOW_N8N_SUGGESTED_TEMPLATES';
+
+/**
+ * Mouse button codes
+ */
+
+/**
+ * Mapping for the MouseEvent.button property that indicates which button was pressed
+ * on the mouse to trigger the event.
+ *
+ * @docs https://www.w3.org/TR/uievents/#dom-mouseevent-button
+ */
+export const MOUSE_EVENT_BUTTON = {
+	PRIMARY: 0,
+	MIDDLE: 1,
+	SECONDARY: 2,
+	BROWSER_BACK: 3,
+	BROWSER_FORWARD: 4,
+} as const;
+
+/**
+ * Mapping for the MouseEvent.buttons property that indicates which buttons are pressed
+ * on the mouse when a mouse event is triggered. If multiple buttons are pressed,
+ * the values are added together to produce a new number.
+ *
+ * @docs https://www.w3.org/TR/uievents/#dom-mouseevent-buttons
+ */
+export const MOUSE_EVENT_BUTTONS = {
+	NONE: 0,
+	PRIMARY: 1,
+	SECONDARY: 2,
+	MIDDLE: 4,
+	BROWSER_BACK: 8,
+	BROWSER_FORWARD: 16,
+} as const;
+
+/**
+ * Urls used to route users to the right template repository
+ */
+export const TEMPLATES_URLS = {
+	DEFAULT_API_HOST: 'https://api.n8n.io/api/',
+	BASE_WEBSITE_URL: 'https://n8n.io/workflows',
+	UTM_QUERY: {
+		utm_source: 'n8n_app',
+		utm_medium: 'template_library',
+	},
+};
+
+export const ROLE = {
+	Owner: 'global:owner',
+	Member: 'global:member',
+	Admin: 'global:admin',
+	Default: 'default', // default user with no email when setting up instance
+} as const;
+
+export const INSECURE_CONNECTION_WARNING = `
+<body style="margin-top: 20px; font-family: 'Open Sans', sans-serif; text-align: center;">
+<h1 style="font-size: 40px">&#x1F6AB;</h1>
+<h2>Your n8n server is configured to use a secure cookie, <br/>however you are visiting this via an insecure URL
+</h2>
+<br/>
+<div style="font-size: 18px; max-width: 640px; text-align: left; margin: 10px auto">
+	To fix this, please consider the following options:
+	<ul>
+		<li>Setup TLS/HTTPS (<strong>recommended</strong>), or</li>
+		<li>If you are running this locally, try using <a href="http://localhost:5678">localhost</a> instead</li>
+		<li>If you prefer to disable this security feature (<strong>not recommended</strong>), set the environment variable <code>N8N_SECURE_COOKIE</code> to <code>false</code></li>
+	</ul>
+</div>
+</body>`;
+
+export const AI_ASSISTANT_EXPERIMENT_URLS = {
+	FEEDBACK_FORM: 'https://chat.arro.co/to4639rATEMV',
+	SIGN_UP: 'https://adore.app.n8n.cloud/form/4704cce3-4cef-4dc8-b67f-8a510c5d561a',
+};
 
-export const NODE_TYPES_EXCLUDED_FROM_OUTPUT_NAME_APPEND = [FILTER_NODE_TYPE];
+export const AI_ASSISTANT_LOCAL_STORAGE_KEY = 'N8N_AI_ASSISTANT_EXPERIMENT';
diff --git a/packages/editor-ui/src/declarations/normalize-wheel.d.ts b/packages/editor-ui/src/declarations/normalize-wheel.d.ts
deleted file mode 100644
index c6f249fef3687..0000000000000
--- a/packages/editor-ui/src/declarations/normalize-wheel.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-declare module 'normalize-wheel' {
-	function normalizeWheel(e: WheelEvent): {
-		spinX: number;
-		spinY: number;
-		pixelX: number;
-		pixelY: number;
-	};
-
-	export = normalizeWheel;
-}
diff --git a/packages/editor-ui/src/declarations/vue-json-pretty.d.ts b/packages/editor-ui/src/declarations/vue-json-pretty.d.ts
deleted file mode 100644
index 083e70eba349e..0000000000000
--- a/packages/editor-ui/src/declarations/vue-json-pretty.d.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-declare module 'vue-json-pretty' {
-	import { Component } from 'vue';
-	const vueJsonPretty: Component;
-	export default vueJsonPretty;
-}
diff --git a/packages/editor-ui/src/event-bus/code-node-editor.ts b/packages/editor-ui/src/event-bus/code-node-editor.ts
index 08a5f865ef35c..128e07606f2a0 100644
--- a/packages/editor-ui/src/event-bus/code-node-editor.ts
+++ b/packages/editor-ui/src/event-bus/code-node-editor.ts
@@ -1,3 +1,3 @@
-import { createEventBus } from '@/event-bus';
+import { createEventBus } from 'n8n-design-system/utils';
 
 export const codeNodeEditorEventBus = createEventBus();
diff --git a/packages/editor-ui/src/event-bus/data-pinning.ts b/packages/editor-ui/src/event-bus/data-pinning.ts
index 36b83a23ca17e..aa6548741f10a 100644
--- a/packages/editor-ui/src/event-bus/data-pinning.ts
+++ b/packages/editor-ui/src/event-bus/data-pinning.ts
@@ -1,3 +1,3 @@
-import { createEventBus } from '@/event-bus';
+import { createEventBus } from 'n8n-design-system/utils';
 
 export const dataPinningEventBus = createEventBus();
diff --git a/packages/editor-ui/src/event-bus/html-editor.ts b/packages/editor-ui/src/event-bus/html-editor.ts
index 2ca2807f96575..7a53bf86a4369 100644
--- a/packages/editor-ui/src/event-bus/html-editor.ts
+++ b/packages/editor-ui/src/event-bus/html-editor.ts
@@ -1,3 +1,3 @@
-import { createEventBus } from '@/event-bus';
+import { createEventBus } from 'n8n-design-system/utils';
 
 export const htmlEditorEventBus = createEventBus();
diff --git a/packages/editor-ui/src/event-bus/import-curl.ts b/packages/editor-ui/src/event-bus/import-curl.ts
new file mode 100644
index 0000000000000..7a517bf3f4a2a
--- /dev/null
+++ b/packages/editor-ui/src/event-bus/import-curl.ts
@@ -0,0 +1,3 @@
+import { createEventBus } from 'n8n-design-system/utils';
+
+export const importCurlEventBus = createEventBus();
diff --git a/packages/editor-ui/src/event-bus/index.ts b/packages/editor-ui/src/event-bus/index.ts
index 2429883237a81..91d9a1a5429f7 100644
--- a/packages/editor-ui/src/event-bus/index.ts
+++ b/packages/editor-ui/src/event-bus/index.ts
@@ -1,5 +1,8 @@
-export * from 'n8n-design-system/utils/event-bus';
 export * from './code-node-editor';
 export * from './data-pinning';
+export * from './link-actions';
 export * from './html-editor';
+export * from './import-curl';
 export * from './node-view';
+export * from './mfa';
+export * from './ndv';
diff --git a/packages/editor-ui/src/event-bus/link-actions.ts b/packages/editor-ui/src/event-bus/link-actions.ts
new file mode 100644
index 0000000000000..41386147ea2e0
--- /dev/null
+++ b/packages/editor-ui/src/event-bus/link-actions.ts
@@ -0,0 +1,3 @@
+import { createEventBus } from 'n8n-design-system/utils';
+
+export const globalLinkActionsEventBus = createEventBus();
diff --git a/packages/editor-ui/src/event-bus/mfa.ts b/packages/editor-ui/src/event-bus/mfa.ts
new file mode 100644
index 0000000000000..dbd264ff4c22a
--- /dev/null
+++ b/packages/editor-ui/src/event-bus/mfa.ts
@@ -0,0 +1,3 @@
+import { createEventBus } from 'n8n-design-system/utils';
+
+export const mfaEventBus = createEventBus();
diff --git a/packages/editor-ui/src/event-bus/ndv.ts b/packages/editor-ui/src/event-bus/ndv.ts
new file mode 100644
index 0000000000000..a6d705b4efea1
--- /dev/null
+++ b/packages/editor-ui/src/event-bus/ndv.ts
@@ -0,0 +1,3 @@
+import { createEventBus } from 'n8n-design-system/utils';
+
+export const ndvEventBus = createEventBus();
diff --git a/packages/editor-ui/src/event-bus/node-view.ts b/packages/editor-ui/src/event-bus/node-view.ts
index 830bbad00ef0b..9023b161b7f70 100644
--- a/packages/editor-ui/src/event-bus/node-view.ts
+++ b/packages/editor-ui/src/event-bus/node-view.ts
@@ -1,3 +1,3 @@
-import { createEventBus } from '@/event-bus';
+import { createEventBus } from 'n8n-design-system/utils';
 
 export const nodeViewEventBus = createEventBus();
diff --git a/packages/editor-ui/src/event-bus/source-control.ts b/packages/editor-ui/src/event-bus/source-control.ts
new file mode 100644
index 0000000000000..2f79901a1f55c
--- /dev/null
+++ b/packages/editor-ui/src/event-bus/source-control.ts
@@ -0,0 +1,3 @@
+import { createEventBus } from 'n8n-design-system/utils';
+
+export const sourceControlEventBus = createEventBus();
diff --git a/packages/editor-ui/src/hooks/cloud.ts b/packages/editor-ui/src/hooks/cloud.ts
new file mode 100644
index 0000000000000..91901339c62c9
--- /dev/null
+++ b/packages/editor-ui/src/hooks/cloud.ts
@@ -0,0 +1,507 @@
+import { hooksAddFakeDoorFeatures } from '@/hooks/utils';
+import {
+	getAuthenticationModalEventData,
+	getExpressionEditorEventsData,
+	getInsertedItemFromExpEditorEventData,
+	getNodeTypeChangedEventData,
+	getOpenWorkflowSettingsEventData,
+	getOutputModeChangedEventData,
+	getUpdatedWorkflowSettingsEventData,
+	getUserSavedCredentialsEventData,
+	getExecutionFinishedEventData,
+	getNodeRemovedEventData,
+	getNodeEditingFinishedEventData,
+	getExecutionStartedEventData,
+} from '@/hooks/segment';
+import { useNDVStore } from '@/stores/ndv.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import {
+	hooksGenerateNodesPanelEvent,
+	hooksResetNodesPanelSession,
+	nodesPanelSession,
+} from '@/hooks/utils/hooksNodesPanel';
+import { useSegment } from '@/stores/segment.store';
+import type { PartialDeep } from 'type-fest';
+import type { IDataObject } from 'n8n-workflow';
+import type { INodeUi } from '@/Interface';
+import type { ExternalHooks } from '@/types';
+
+export const n8nCloudHooks: PartialDeep<ExternalHooks> = {
+	app: {
+		mount: [
+			() => {
+				hooksAddFakeDoorFeatures();
+			},
+		],
+	},
+	nodeView: {
+		mount: [
+			() => {
+				const segmentStore = useSegment();
+				segmentStore.identify();
+			},
+		],
+		createNodeActiveChanged: [
+			(_, meta) => {
+				const segmentStore = useSegment();
+				const eventData = {
+					source: meta.source,
+					nodes_panel_session_id: nodesPanelSession.pushRef,
+				};
+
+				hooksResetNodesPanelSession();
+				segmentStore.track('User opened nodes panel', eventData);
+				segmentStore.page('Cloud instance', 'Nodes panel', eventData);
+			},
+		],
+		addNodeButton: [
+			(_, meta) => {
+				const segmentStore = useSegment();
+				const eventData = {
+					eventName: 'User added node to workflow canvas',
+					properties: {
+						node_type: meta.nodeTypeName.split('.')[1],
+						nodes_panel_session_id: nodesPanelSession.pushRef,
+					},
+				};
+
+				segmentStore.track(eventData.eventName, eventData.properties);
+			},
+		],
+	},
+	main: {
+		routeChange: [
+			(_, meta) => {
+				const segmentStore = useSegment();
+				const splitPath = meta.to.path.split('/');
+				if (meta.from.path !== '/' && splitPath[1] === 'workflow') {
+					const eventData = {
+						workflow_id: splitPath[2],
+					};
+
+					segmentStore.page('Cloud instance', 'Workflow editor', eventData);
+				}
+			},
+		],
+	},
+	credential: {
+		saved: [
+			(_, meta) => {
+				const segmentStore = useSegment();
+				const eventData = getUserSavedCredentialsEventData(meta);
+
+				segmentStore.track(eventData.eventName, eventData.properties);
+			},
+		],
+	},
+	credentialsEdit: {
+		credentialTypeChanged: [
+			(_, meta) => {
+				const segmentStore = useSegment();
+				if (meta.newValue) {
+					const eventData = {
+						eventName: 'User opened Credentials modal',
+						properties: {
+							source: meta.setCredentialType === meta.credentialType ? 'node' : 'primary_menu',
+							new_credential: !meta.editCredentials,
+							credential_type: meta.credentialType,
+						},
+					};
+
+					segmentStore.track(eventData.eventName, eventData.properties);
+					segmentStore.page('Cloud instance', 'Credentials modal', eventData.properties);
+				}
+			},
+		],
+		credentialModalOpened: [
+			(_, meta) => {
+				const segmentStore = useSegment();
+				const eventData = {
+					eventName: 'User opened Credentials modal',
+					properties: {
+						source: meta.activeNode ? 'node' : 'primary_menu',
+						new_credential: !meta.isEditingCredential,
+						credential_type: meta.credentialType,
+					},
+				};
+
+				segmentStore.track(eventData.eventName, eventData.properties);
+				segmentStore.page('Cloud instance', 'Credentials modal', eventData.properties);
+			},
+		],
+	},
+	credentialsList: {
+		mounted: [
+			() => {
+				const segmentStore = useSegment();
+				const eventData = {
+					eventName: 'User opened global Credentials panel',
+				};
+
+				segmentStore.track(eventData.eventName);
+				segmentStore.page('Cloud instance', 'Credentials panel');
+			},
+		],
+		dialogVisibleChanged: [
+			(_, meta) => {
+				const segmentStore = useSegment();
+				if (meta.dialogVisible) {
+					const eventData = {
+						eventName: 'User opened global Credentials panel',
+					};
+
+					segmentStore.track(eventData.eventName);
+					segmentStore.page('Cloud instance', 'Credentials panel');
+				}
+			},
+		],
+	},
+	workflowSettings: {
+		dialogVisibleChanged: [
+			(_, meta) => {
+				const segmentStore = useSegment();
+				if (meta.dialogVisible) {
+					const eventData = getOpenWorkflowSettingsEventData();
+					segmentStore.track(eventData.eventName, eventData.properties);
+				}
+			},
+		],
+		saveSettings: [
+			(_, meta) => {
+				const segmentStore = useSegment();
+				const eventData = getUpdatedWorkflowSettingsEventData(meta);
+				segmentStore.track(eventData.eventName, eventData.properties);
+			},
+		],
+	},
+	dataDisplay: {
+		onDocumentationUrlClick: [
+			(_, meta) => {
+				const segmentStore = useSegment();
+				const eventData = {
+					eventName: 'User clicked node modal docs link',
+					properties: {
+						node_type: meta.nodeType.name.split('.')[1],
+						docs_link: meta.documentationUrl,
+					},
+				};
+
+				segmentStore.track(eventData.eventName, eventData.properties);
+			},
+		],
+		nodeTypeChanged: [
+			(_, meta) => {
+				const segmentStore = useSegment();
+				const ndvStore = useNDVStore();
+				const eventData = getNodeTypeChangedEventData(meta);
+
+				segmentStore.track(eventData.eventName, eventData.properties);
+				segmentStore.page('Cloud instance', 'Node modal', {
+					node: ndvStore.activeNode?.name,
+				});
+			},
+		],
+		nodeEditingFinished: [
+			() => {
+				const segmentStore = useSegment();
+				const ndvStore = useNDVStore();
+				const workflowsStore = useWorkflowsStore();
+
+				const eventData = getNodeEditingFinishedEventData(ndvStore.activeNode);
+				if (eventData) {
+					eventData.properties!.workflow_id = workflowsStore.workflowId;
+				}
+
+				if (eventData) {
+					segmentStore.track(eventData.eventName, eventData.properties);
+				}
+			},
+		],
+	},
+	executionsList: {
+		openDialog: [
+			() => {
+				const segmentStore = useSegment();
+				const eventData = {
+					eventName: 'User opened Executions log',
+				};
+
+				segmentStore.track(eventData.eventName);
+				segmentStore.page('Cloud instance', 'Executions log');
+			},
+		],
+	},
+	showMessage: {
+		showError: [
+			(_, meta) => {
+				const segmentStore = useSegment();
+				const eventData = {
+					eventName: 'Instance FE emitted error',
+					properties: {
+						error_title: meta.title,
+						error_description: meta.message,
+						error_message: meta.errorMessage,
+					},
+				};
+
+				segmentStore.track(eventData.eventName, eventData.properties);
+			},
+		],
+	},
+	expressionEdit: {
+		itemSelected: [
+			(_, meta) => {
+				const segmentStore = useSegment();
+				const eventData = getInsertedItemFromExpEditorEventData(meta);
+
+				if (meta.selectedItem.variable.startsWith('Object.keys')) {
+					eventData.properties!.variable_type = 'Keys';
+				} else if (meta.selectedItem.variable.startsWith('Object.values')) {
+					eventData.properties!.variable_type = 'Values';
+				} else {
+					eventData.properties!.variable_type = 'Raw value';
+				}
+
+				segmentStore.track(eventData.eventName, eventData.properties);
+			},
+		],
+		dialogVisibleChanged: [
+			(_, meta) => {
+				const segmentStore = useSegment();
+				const currentValue = meta.value?.slice(1) ?? '';
+				let isValueDefault = false;
+
+				switch (typeof meta.parameter.default) {
+					case 'boolean':
+						isValueDefault =
+							(currentValue === 'true' && meta.parameter.default) ||
+							(currentValue === 'false' && !meta.parameter.default);
+						break;
+					case 'string':
+						isValueDefault = currentValue === meta.parameter.default;
+						break;
+					case 'number':
+						isValueDefault = currentValue === meta.parameter.default.toString();
+						break;
+				}
+
+				const eventData = getExpressionEditorEventsData(meta, isValueDefault);
+
+				segmentStore.track(eventData.eventName, eventData.properties);
+			},
+		],
+	},
+	nodeSettings: {
+		valueChanged: [
+			(_, meta) => {
+				const segmentStore = useSegment();
+				if (meta.parameterPath !== 'authentication') {
+					return;
+				}
+
+				const eventData = getAuthenticationModalEventData(meta);
+
+				segmentStore.track(eventData.eventName, eventData.properties);
+			},
+		],
+		credentialSelected: [
+			(_, meta) => {
+				const segmentStore = useSegment();
+				const creds = Object.keys(meta.updateInformation.properties.credentials || {});
+				if (creds.length < 1) {
+					return;
+				}
+
+				const eventData = {
+					eventName: 'User selected credential from node modal',
+					properties: {
+						credential_name: (meta.updateInformation.properties.credentials as IDataObject)[
+							creds[0]
+						],
+						credential_type: creds[0],
+					},
+				};
+
+				segmentStore.track(eventData.eventName, eventData.properties);
+			},
+		],
+	},
+	workflowRun: {
+		runWorkflow: [
+			(_, meta) => {
+				const segmentStore = useSegment();
+				const eventData = getExecutionStartedEventData(meta);
+
+				segmentStore.track(eventData.eventName, eventData.properties);
+			},
+		],
+		runError: [
+			(_, meta) => {
+				const segmentStore = useSegment();
+				const eventData = {
+					eventName: meta.nodeName
+						? 'Node execution finished'
+						: 'Manual workflow execution finished',
+					properties: {
+						preflight: 'true',
+						status: 'failed',
+						error_message: meta.errorMessages.join('<br />&nbsp;&nbsp;- '),
+						error_timestamp: new Date(),
+						node_name: meta.nodeName,
+					},
+				};
+
+				segmentStore.track(eventData.eventName, eventData.properties);
+			},
+		],
+	},
+	runData: {
+		displayModeChanged: [
+			(_, meta) => {
+				const segmentStore = useSegment();
+				const eventData = getOutputModeChangedEventData(meta);
+
+				segmentStore.track(eventData.eventName, eventData.properties);
+			},
+		],
+	},
+	pushConnection: {
+		executionFinished: [
+			(_, meta) => {
+				const segmentStore = useSegment();
+				const eventData = getExecutionFinishedEventData(meta);
+
+				segmentStore.track(eventData.eventName, eventData.properties);
+			},
+		],
+	},
+	node: {
+		deleteNode: [
+			(_, meta) => {
+				const segmentStore = useSegment();
+				const eventData = getNodeRemovedEventData(meta);
+
+				segmentStore.track(eventData.eventName, eventData.properties);
+			},
+		],
+	},
+	workflow: {
+		activeChange: [
+			(_, meta) => {
+				const segmentStore = useSegment();
+				const eventData = {
+					eventName: (meta.active && 'User activated workflow') || 'User deactivated workflow',
+					properties: {
+						workflow_id: meta.workflowId,
+						source: 'workflow_modal',
+					},
+				};
+
+				segmentStore.track(eventData.eventName, eventData.properties);
+			},
+		],
+		activeChangeCurrent: [
+			(_, meta) => {
+				const segmentStore = useSegment();
+				const workflowsStore = useWorkflowsStore();
+
+				const eventData = {
+					eventName: (meta.active && 'User activated workflow') || 'User deactivated workflow',
+					properties: {
+						source: 'main nav',
+						workflow_id: meta.workflowId,
+						workflow_name: workflowsStore.workflowName,
+						workflow_nodes: workflowsStore.allNodes.map((n) => n.type.split('.')[1]),
+					},
+				};
+
+				segmentStore.track(eventData.eventName, eventData.properties);
+			},
+		],
+		afterUpdate: [
+			(_, meta) => {
+				const segmentStore = useSegment();
+				const eventData = {
+					eventName: 'User saved workflow',
+					properties: {
+						workflow_id: meta.workflowData.id,
+						workflow_name: meta.workflowData.name,
+						workflow_nodes: meta.workflowData.nodes.map((n) => n.type.split('.')[1]),
+					},
+				};
+
+				segmentStore.track(eventData.eventName, eventData.properties);
+			},
+		],
+	},
+	execution: {
+		open: [
+			(_, meta) => {
+				const segmentStore = useSegment();
+				const eventData = {
+					eventName: 'User opened read-only execution',
+					properties: {
+						workflow_id: meta.workflowId,
+						workflow_name: meta.workflowName,
+						execution_id: meta.executionId,
+					},
+				};
+
+				segmentStore.track(eventData.eventName, eventData.properties);
+			},
+		],
+	},
+	nodeCreateList: {
+		destroyed: [
+			() => {
+				const segmentStore = useSegment();
+				if (
+					nodesPanelSession.data.nodeFilter.length > 0 &&
+					nodesPanelSession.data.nodeFilter !== ''
+				) {
+					const eventData = hooksGenerateNodesPanelEvent();
+
+					segmentStore.track(eventData.eventName, eventData.properties);
+				}
+			},
+		],
+		selectedTypeChanged: [
+			(_, meta) => {
+				const segmentStore = useSegment();
+				const eventData = {
+					eventName: 'User changed nodes panel filter',
+					properties: {
+						old_filter: meta.oldValue,
+						new_filter: meta.newValue,
+						nodes_panel_session_id: nodesPanelSession.pushRef,
+					},
+				};
+				nodesPanelSession.data.filterMode = meta.newValue;
+
+				segmentStore.track(eventData.eventName, eventData.properties);
+			},
+		],
+		nodeFilterChanged: [
+			(_, meta) => {
+				const segmentStore = useSegment();
+				if (meta.newValue.length === 0 && nodesPanelSession.data.nodeFilter.length > 0) {
+					const eventData = hooksGenerateNodesPanelEvent();
+
+					segmentStore.track(eventData.eventName, eventData.properties);
+				}
+
+				if (meta.newValue.length > meta.oldValue.length) {
+					nodesPanelSession.data.nodeFilter = meta.newValue;
+					nodesPanelSession.data.resultsNodes = meta.filteredNodes.map((node) => {
+						if ((node as unknown as INodeUi).name) {
+							return (node as unknown as INodeUi).name.split('.')[1];
+						} else if (node.key) {
+							return node.key.split('.')[1];
+						}
+						return '';
+					});
+				}
+			},
+		],
+	},
+};
diff --git a/packages/editor-ui/src/hooks/register.ts b/packages/editor-ui/src/hooks/register.ts
new file mode 100644
index 0000000000000..86bf2fc416075
--- /dev/null
+++ b/packages/editor-ui/src/hooks/register.ts
@@ -0,0 +1,40 @@
+import type { PartialDeep } from 'type-fest';
+import type { ExternalHooks, ExternalHooksGenericContext } from '@/types';
+
+export function extendExternalHooks(hooksExtension: PartialDeep<ExternalHooks>) {
+	if (typeof window.n8nExternalHooks === 'undefined') {
+		window.n8nExternalHooks = {};
+	}
+
+	for (const resource of Object.keys(hooksExtension) as Array<keyof ExternalHooks>) {
+		if (typeof window.n8nExternalHooks[resource] === 'undefined') {
+			window.n8nExternalHooks[resource] = {};
+		}
+
+		const extensionContext = hooksExtension[resource] as ExternalHooksGenericContext;
+		const context = window.n8nExternalHooks[resource] as ExternalHooksGenericContext;
+		for (const operator of Object.keys(extensionContext)) {
+			if (typeof context[operator] === 'undefined') {
+				context[operator] = [];
+			}
+
+			context[operator].push(...extensionContext[operator]);
+		}
+	}
+}
+
+let cloudHooksInitialized = false;
+export async function initializeCloudHooks() {
+	if (cloudHooksInitialized) {
+		return;
+	}
+
+	try {
+		const { n8nCloudHooks } = await import('@/hooks/cloud');
+		extendExternalHooks(n8nCloudHooks);
+	} catch (error) {
+		throw new Error(`Failed to extend external hooks: ${error.message}`);
+	} finally {
+		cloudHooksInitialized = true;
+	}
+}
diff --git a/packages/editor-ui/src/hooks/segment/getters.ts b/packages/editor-ui/src/hooks/segment/getters.ts
new file mode 100644
index 0000000000000..d486884d2abde
--- /dev/null
+++ b/packages/editor-ui/src/hooks/segment/getters.ts
@@ -0,0 +1,350 @@
+import { deepCopy } from 'n8n-workflow';
+import type {
+	ExecutionError,
+	GenericValue,
+	INodeParameters,
+	INodeProperties,
+	ITelemetryTrackProperties,
+	NodeParameterValue,
+	INode,
+} from 'n8n-workflow';
+import { useNDVStore } from '@/stores/ndv.store';
+import type { TelemetryEventData } from '@/hooks/types';
+import type { INodeUi } from '@/Interface';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useRootStore } from '@/stores/n8nRoot.store';
+
+export interface UserSavedCredentialsEventData {
+	credential_type: string;
+	credential_id: string;
+	is_new: boolean;
+}
+
+export const getUserSavedCredentialsEventData = (meta: UserSavedCredentialsEventData) => {
+	const rootStore = useRootStore();
+	const workflowsStore = useWorkflowsStore();
+
+	return {
+		eventName: 'User saved credentials',
+		properties: {
+			instance_id: rootStore.instanceId,
+			credential_type: meta.credential_type,
+			credential_id: meta.credential_id,
+			workflow_id: workflowsStore.workflowId,
+			node_type: workflowsStore.activeNode?.name,
+			is_new: meta.is_new,
+			// is_complete: true,
+			// is_valid: true,
+			// error_message: ''
+		},
+	};
+};
+
+export const getOpenWorkflowSettingsEventData = (): TelemetryEventData => {
+	const workflowsStore = useWorkflowsStore();
+
+	return {
+		eventName: 'User opened workflow settings',
+		properties: {
+			workflow_id: workflowsStore.workflowId,
+			workflow_name: workflowsStore.workflowName,
+			current_settings: deepCopy(workflowsStore.workflowSettings),
+		},
+	};
+};
+
+export interface UpdatedWorkflowSettingsEventData {
+	oldSettings: Record<string, unknown>;
+}
+
+export const getUpdatedWorkflowSettingsEventData = (
+	meta: UpdatedWorkflowSettingsEventData,
+): TelemetryEventData => {
+	const workflowsStore = useWorkflowsStore();
+
+	return {
+		eventName: 'User updated workflow settings',
+		properties: {
+			workflow_id: workflowsStore.workflowId,
+			workflow_name: workflowsStore.workflowName,
+			new_settings: deepCopy(workflowsStore.workflowSettings),
+			old_settings: meta.oldSettings,
+		},
+	};
+};
+
+export interface NodeTypeChangedEventData {
+	nodeSubtitle?: string;
+}
+
+export const getNodeTypeChangedEventData = (meta: NodeTypeChangedEventData): TelemetryEventData => {
+	const store = useNDVStore();
+
+	return {
+		eventName: 'User opened node modal',
+		properties: {
+			node_name: store.activeNode?.name,
+			node_subtitle: meta.nodeSubtitle,
+		},
+	};
+};
+
+export interface InsertedItemFromExpEditorEventData {
+	parameter: {
+		displayName: string;
+	};
+	value: string;
+	selectedItem: {
+		variable: string;
+	};
+}
+
+export const getInsertedItemFromExpEditorEventData = (
+	meta: InsertedItemFromExpEditorEventData,
+): TelemetryEventData => {
+	const store = useNDVStore();
+
+	return {
+		eventName: 'User inserted item from Expression Editor variable selector',
+		properties: {
+			node_name: store.activeNode?.name,
+			node_type: store.activeNode?.type.split('.')[1],
+			parameter_name: meta.parameter.displayName,
+			variable_expression: meta.selectedItem.variable,
+		} as ITelemetryTrackProperties,
+	};
+};
+
+export interface ExpressionEditorEventsData {
+	dialogVisible: boolean;
+	value: string;
+	resolvedExpressionValue: string;
+	parameter: INodeParameters;
+}
+
+export const getExpressionEditorEventsData = (
+	meta: ExpressionEditorEventsData,
+	isValueDefault: boolean,
+): TelemetryEventData => {
+	const store = useNDVStore();
+	const eventData: TelemetryEventData = {
+		eventName: '',
+		properties: {},
+	};
+
+	if (!meta.dialogVisible) {
+		eventData.eventName = 'User closed Expression Editor';
+		eventData.properties = {
+			empty_expression: isValueDefault,
+			expression_value: meta.value,
+			expression_result: meta.resolvedExpressionValue.slice(1),
+		};
+	} else {
+		eventData.eventName = 'User opened Expression Editor';
+		eventData.properties = {
+			node_name: store.activeNode?.name,
+			node_type: store.activeNode?.type.split('.')[1],
+			parameter_name: meta.parameter.displayName,
+			parameter_field_type: meta.parameter.type,
+			new_expression: isValueDefault,
+		};
+	}
+	return eventData;
+};
+
+export interface AuthenticationModalEventData {
+	parameterPath: string;
+	oldNodeParameters: Record<string, GenericValue>;
+	parameters: INodeProperties[];
+	newValue: NodeParameterValue;
+}
+export const getAuthenticationModalEventData = (
+	meta: AuthenticationModalEventData,
+): TelemetryEventData => {
+	const store = useNDVStore();
+
+	return {
+		eventName: 'User changed Authentication type from node modal',
+		properties: {
+			node_name: store.activeNode?.name,
+			node_type: store.activeNode?.type.split('.')[1],
+			old_mode:
+				meta.oldNodeParameters.authentication ||
+				(
+					meta.parameters.find((param) => param.name === 'authentication') || {
+						default: 'default',
+					}
+				).default,
+			new_mode: meta.newValue,
+		},
+	};
+};
+
+export interface OutputModeChangedEventData {
+	oldValue: string;
+	newValue: string;
+}
+
+export const getOutputModeChangedEventData = (
+	meta: OutputModeChangedEventData,
+): TelemetryEventData => {
+	const store = useNDVStore();
+
+	return {
+		eventName: 'User changed node output view mode',
+		properties: {
+			old_mode: meta.oldValue,
+			new_mode: meta.newValue,
+			node_name: store.activeNode?.name,
+			node_type: store.activeNode?.type.split('.')[1],
+		},
+	};
+};
+
+export interface ExecutionFinishedEventData {
+	runDataExecutedStartData:
+		| { destinationNode?: string | undefined; runNodeFilter?: string[] | undefined }
+		| undefined;
+	nodeName?: string;
+	errorMessage: string;
+	resultDataError: ExecutionError | undefined;
+	itemsCount: number;
+}
+
+export const getExecutionFinishedEventData = (
+	meta: ExecutionFinishedEventData,
+): TelemetryEventData => {
+	const store = useWorkflowsStore();
+
+	const eventData: TelemetryEventData = {
+		eventName: '',
+		properties: {
+			execution_id: store.activeExecutionId,
+		},
+	};
+
+	if (meta.runDataExecutedStartData?.destinationNode) {
+		eventData.eventName = 'Node execution finished';
+		eventData.properties!.node_type = store.getNodeByName(meta.nodeName || '')?.type.split('.')[1];
+		eventData.properties!.node_name = meta.nodeName;
+	} else {
+		eventData.eventName = 'Manual workflow execution finished';
+		eventData.properties!.workflow_id = store.workflowId;
+		eventData.properties!.workflow_name = store.workflowName;
+	}
+
+	if (meta.errorMessage || meta.resultDataError) {
+		eventData.properties!.status = 'failed';
+		eventData.properties!.error_message = meta.resultDataError?.message || '';
+		eventData.properties!.error_stack = meta.resultDataError?.stack || '';
+		eventData.properties!.error_ui_message = meta.errorMessage || '';
+		eventData.properties!.error_timestamp = new Date();
+
+		if (meta.resultDataError && (meta.resultDataError as unknown as { node: INodeUi })?.node) {
+			eventData.properties!.error_node =
+				typeof (meta.resultDataError as unknown as { node: string })?.node === 'string'
+					? (meta.resultDataError as unknown as { node: string })?.node
+					: (meta.resultDataError as unknown as { node: INodeUi })?.node?.name;
+		} else {
+			eventData.properties!.error_node = meta.nodeName;
+		}
+	} else {
+		eventData.properties!.status = 'success';
+		if (meta.runDataExecutedStartData?.destinationNode) {
+			// Node execution finished
+			eventData.properties!.items_count = meta.itemsCount || 0;
+		}
+	}
+	return eventData;
+};
+
+export interface NodeRemovedEventData {
+	node: INodeUi;
+}
+
+export const getNodeRemovedEventData = (meta: NodeRemovedEventData): TelemetryEventData => {
+	const workflowsStore = useWorkflowsStore();
+
+	return {
+		eventName: 'User removed node from workflow canvas',
+		properties: {
+			node_name: meta.node.name,
+			node_type: meta.node.type,
+			node_disabled: meta.node.disabled,
+			workflow_id: workflowsStore.workflowId,
+		},
+	};
+};
+
+export const getNodeEditingFinishedEventData = (
+	activeNode: INode | null,
+): TelemetryEventData | undefined => {
+	switch (activeNode?.type) {
+		case 'n8n-nodes-base.httpRequest':
+			const domain = (activeNode.parameters.url as string).split('/')[2];
+			return {
+				eventName: 'User finished httpRequest node editing',
+				properties: {
+					method: activeNode.parameters.method,
+					domain,
+				},
+			};
+		case 'n8n-nodes-base.function':
+			return {
+				eventName: 'User finished function node editing',
+				properties: {
+					node_name: activeNode.name,
+					code: activeNode.parameters.functionCode,
+				},
+			};
+		case 'n8n-nodes-base.functionItem':
+			return {
+				eventName: 'User finished functionItem node editing',
+				properties: {
+					node_name: activeNode.name,
+					code: activeNode.parameters.functionCode,
+				},
+			};
+		default:
+			return;
+	}
+};
+
+export interface ExecutionStartedEventData {
+	nodeName?: string;
+	source?: string;
+}
+
+export const getExecutionStartedEventData = (
+	meta: ExecutionStartedEventData,
+): TelemetryEventData => {
+	const store = useWorkflowsStore();
+
+	const eventData: TelemetryEventData = {
+		eventName: '',
+		properties: {
+			execution_id: store.activeExecutionId,
+		},
+	};
+
+	// node execution
+	if (meta.nodeName) {
+		eventData.eventName = 'User started node execution';
+		eventData.properties!.source = 'unknown';
+		eventData.properties!.node_type = store.getNodeByName(meta.nodeName)?.type.split('.')[1];
+		eventData.properties!.node_name = meta.nodeName;
+
+		if (meta.source === 'RunData.ExecuteNodeButton') {
+			eventData.properties!.source = 'node_modal';
+		} else if (meta.source === 'Node.executeNode') {
+			eventData.properties!.source = 'workflow_canvas';
+		}
+	} else {
+		// workflow execution
+		eventData.eventName = 'User started manual workflow execution';
+		eventData.properties!.workflow_id = store.workflowId;
+		eventData.properties!.workflow_name = store.workflowName;
+	}
+
+	return eventData;
+};
diff --git a/packages/editor-ui/src/hooks/segment/index.ts b/packages/editor-ui/src/hooks/segment/index.ts
new file mode 100644
index 0000000000000..b2fc0d3b65e18
--- /dev/null
+++ b/packages/editor-ui/src/hooks/segment/index.ts
@@ -0,0 +1 @@
+export * from './getters';
diff --git a/packages/editor-ui/src/hooks/types.ts b/packages/editor-ui/src/hooks/types.ts
new file mode 100644
index 0000000000000..1c293a5888159
--- /dev/null
+++ b/packages/editor-ui/src/hooks/types.ts
@@ -0,0 +1,6 @@
+import type { ITelemetryTrackProperties } from 'n8n-workflow';
+
+export interface TelemetryEventData {
+	eventName: string;
+	properties?: ITelemetryTrackProperties;
+}
diff --git a/packages/editor-ui/src/hooks/utils/hooksAddFakeDoorFeatures.ts b/packages/editor-ui/src/hooks/utils/hooksAddFakeDoorFeatures.ts
new file mode 100644
index 0000000000000..e768983c90366
--- /dev/null
+++ b/packages/editor-ui/src/hooks/utils/hooksAddFakeDoorFeatures.ts
@@ -0,0 +1,33 @@
+import { useUIStore } from '@/stores/ui.store';
+import type { IFakeDoor } from '@/Interface';
+import { FAKE_DOOR_FEATURES } from '@/constants';
+
+export function compileFakeDoorFeatures(): IFakeDoor[] {
+	const store = useUIStore();
+	const fakeDoorFeatures: IFakeDoor[] = store.fakeDoorFeatures.map((feature) => ({ ...feature }));
+
+	const environmentsFeature = fakeDoorFeatures.find(
+		(feature) => feature.id === FAKE_DOOR_FEATURES.ENVIRONMENTS,
+	);
+	if (environmentsFeature) {
+		environmentsFeature.actionBoxTitle += '.cloud';
+		environmentsFeature.linkURL += '&edition=cloud';
+	}
+
+	const loggingFeature = fakeDoorFeatures.find(
+		(feature) => feature.id === FAKE_DOOR_FEATURES.LOGGING,
+	);
+	if (loggingFeature) {
+		loggingFeature.actionBoxTitle += '.cloud';
+		loggingFeature.linkURL += '&edition=cloud';
+		loggingFeature.infoText = '';
+	}
+
+	return fakeDoorFeatures;
+}
+
+export const hooksAddFakeDoorFeatures = () => {
+	const store = useUIStore();
+
+	store.fakeDoorFeatures = compileFakeDoorFeatures();
+};
diff --git a/packages/editor-ui/src/hooks/utils/hooksNodesPanel.ts b/packages/editor-ui/src/hooks/utils/hooksNodesPanel.ts
new file mode 100644
index 0000000000000..2784f35a0eb52
--- /dev/null
+++ b/packages/editor-ui/src/hooks/utils/hooksNodesPanel.ts
@@ -0,0 +1,30 @@
+export const nodesPanelSession = {
+	pushRef: '',
+	data: {
+		nodeFilter: '',
+		resultsNodes: [] as string[],
+		filterMode: 'Regular',
+	},
+};
+
+export const hooksGenerateNodesPanelEvent = () => {
+	return {
+		eventName: 'User entered nodes panel search term',
+		properties: {
+			search_string: nodesPanelSession.data.nodeFilter,
+			results_count: nodesPanelSession.data.resultsNodes.length,
+			results_nodes: nodesPanelSession.data.resultsNodes,
+			filter_mode: nodesPanelSession.data.filterMode,
+			nodes_panel_session_id: nodesPanelSession.pushRef,
+		},
+	};
+};
+
+export const hooksResetNodesPanelSession = () => {
+	nodesPanelSession.pushRef = `nodes_panel_session_${new Date().valueOf()}`;
+	nodesPanelSession.data = {
+		nodeFilter: '',
+		resultsNodes: [],
+		filterMode: 'Regular',
+	};
+};
diff --git a/packages/editor-ui/src/hooks/utils/index.ts b/packages/editor-ui/src/hooks/utils/index.ts
new file mode 100644
index 0000000000000..43979c51414b7
--- /dev/null
+++ b/packages/editor-ui/src/hooks/utils/index.ts
@@ -0,0 +1,2 @@
+export * from './hooksAddFakeDoorFeatures';
+export * from './hooksNodesPanel';
diff --git a/packages/editor-ui/src/init.ts b/packages/editor-ui/src/init.ts
new file mode 100644
index 0000000000000..1e6ca97b6585c
--- /dev/null
+++ b/packages/editor-ui/src/init.ts
@@ -0,0 +1,86 @@
+import { useCloudPlanStore } from '@/stores/cloudPlan.store';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useSourceControlStore } from '@/stores/sourceControl.store';
+import { useUsersStore } from '@/stores/users.store';
+import { initializeCloudHooks } from '@/hooks/register';
+import { useVersionsStore } from '@/stores/versions.store';
+
+let coreInitialized = false;
+let authenticatedFeaturesInitialized = false;
+
+/**
+ * Initializes the core application stores and hooks
+ * This is called once, when the first route is loaded.
+ */
+export async function initializeCore() {
+	if (coreInitialized) {
+		return;
+	}
+
+	const settingsStore = useSettingsStore();
+	const usersStore = useUsersStore();
+	const versionsStore = useVersionsStore();
+
+	await settingsStore.initialize();
+	if (!settingsStore.isPreviewMode) {
+		await usersStore.initialize();
+
+		void versionsStore.checkForNewVersions();
+
+		if (settingsStore.isCloudDeployment) {
+			try {
+				await initializeCloudHooks();
+			} catch (e) {
+				console.error('Failed to initialize cloud hooks:', e);
+			}
+		}
+	}
+
+	coreInitialized = true;
+}
+
+/**
+ * Initializes the features of the application that require an authenticated user
+ */
+export async function initializeAuthenticatedFeatures() {
+	if (authenticatedFeaturesInitialized) {
+		return;
+	}
+
+	const usersStore = useUsersStore();
+	if (!usersStore.currentUser) {
+		return;
+	}
+
+	const sourceControlStore = useSourceControlStore();
+	const settingsStore = useSettingsStore();
+	const rootStore = useRootStore();
+	const nodeTypesStore = useNodeTypesStore();
+	const cloudPlanStore = useCloudPlanStore();
+
+	if (sourceControlStore.isEnterpriseSourceControlEnabled) {
+		await sourceControlStore.getPreferences();
+	}
+
+	if (settingsStore.isTemplatesEnabled) {
+		try {
+			await settingsStore.testTemplatesEndpoint();
+		} catch (e) {}
+	}
+
+	if (rootStore.defaultLocale !== 'en') {
+		await nodeTypesStore.getNodeTranslationHeaders();
+	}
+
+	if (settingsStore.isCloudDeployment) {
+		try {
+			await cloudPlanStore.initialize();
+		} catch (e) {
+			console.error('Failed to initialize cloud plan store:', e);
+		}
+	}
+
+	authenticatedFeaturesInitialized = true;
+}
diff --git a/packages/editor-ui/src/main.ts b/packages/editor-ui/src/main.ts
index c25f6cc79d1f6..33cf110c2a818 100644
--- a/packages/editor-ui/src/main.ts
+++ b/packages/editor-ui/src/main.ts
@@ -1,16 +1,10 @@
-// The Vue build version to load with the `import` command
-// (runtime-only or standalone) has been set in webpack.base.conf with an alias.
-import Vue from 'vue';
+import { createApp } from 'vue';
 
-import './plugins';
-import 'prismjs';
-import 'prismjs/themes/prism.css';
-import 'vue-prism-editor/dist/VuePrismEditor.css';
 import 'vue-json-pretty/lib/styles.css';
 import '@jsplumb/browser-ui/css/jsplumbtoolkit.css';
 import 'n8n-design-system/css/index.scss';
+
 import './n8n-theme.scss';
-import './styles/autocomplete-theme.scss';
 
 import '@fontsource/open-sans/latin-400.css';
 import '@fontsource/open-sans/latin-600.css';
@@ -19,37 +13,33 @@ import '@fontsource/open-sans/latin-700.css';
 import App from '@/App.vue';
 import router from './router';
 
-import { runExternalHook } from '@/utils';
 import { TelemetryPlugin } from './plugins/telemetry';
 import { I18nPlugin, i18nInstance } from './plugins/i18n';
+import { GlobalComponentsPlugin } from './plugins/components';
+import { GlobalDirectivesPlugin } from './plugins/directives';
+import { FontAwesomePlugin } from './plugins/icons';
 
 import { createPinia, PiniaVuePlugin } from 'pinia';
-
-import { useWebhooksStore, useUsersStore } from '@/stores';
-import { VIEWS } from '@/constants';
-
-Vue.config.productionTip = false;
-
-Vue.use(TelemetryPlugin);
-Vue.use((vue) => I18nPlugin(vue));
-Vue.use(PiniaVuePlugin);
+import { JsPlumbPlugin } from '@/plugins/jsplumb';
+import { ChartJSPlugin } from '@/plugins/chartjs';
 
 const pinia = createPinia();
 
-new Vue({
-	i18n: i18nInstance,
-	router,
-	pinia,
-	render: (h) => h(App),
-}).$mount('#app');
+const app = createApp(App);
+
+app.use(TelemetryPlugin);
+app.use(PiniaVuePlugin);
+app.use(I18nPlugin);
+app.use(FontAwesomePlugin);
+app.use(GlobalComponentsPlugin);
+app.use(GlobalDirectivesPlugin);
+app.use(JsPlumbPlugin);
+app.use(pinia);
+app.use(router);
+app.use(i18nInstance);
+app.use(ChartJSPlugin);
 
-router.afterEach((to, from) => {
-	runExternalHook('main.routeChange', useWebhooksStore(), { from, to });
-	const userStore = useUsersStore();
-	if (userStore.currentUser && to.name && to.name !== VIEWS.SIGNOUT && !to.name.includes('Modal')) {
-		userStore.showUserActivationSurveyModal();
-	}
-});
+app.mount('#app');
 
 if (!import.meta.env.PROD) {
 	// Make sure that we get all error messages properly displayed
@@ -60,8 +50,8 @@ if (!import.meta.env.PROD) {
 			// not do anything about it anyway
 			return;
 		}
-		console.error('error caught in main.ts'); // eslint-disable-line no-console
-		console.error(message); // eslint-disable-line no-console
-		console.error(error); // eslint-disable-line no-console
+		console.error('error caught in main.ts');
+		console.error(message);
+		console.error(error);
 	};
 }
diff --git a/packages/editor-ui/src/mixins/__tests__/workflowHelpers.spec.ts b/packages/editor-ui/src/mixins/__tests__/workflowHelpers.spec.ts
new file mode 100644
index 0000000000000..48dd163c91532
--- /dev/null
+++ b/packages/editor-ui/src/mixins/__tests__/workflowHelpers.spec.ts
@@ -0,0 +1,233 @@
+import { createPinia, setActivePinia } from 'pinia';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { setupServer } from '@/__tests__/server';
+import { executeData } from '@/composables/useWorkflowHelpers';
+import type { IExecutionResponse } from '@/Interface';
+
+describe('workflowHelpers', () => {
+	let server: ReturnType<typeof setupServer>;
+	let pinia: ReturnType<typeof createPinia>;
+	let workflowsStore: ReturnType<typeof useWorkflowsStore>;
+	let settingsStore: ReturnType<typeof useSettingsStore>;
+
+	beforeAll(() => {
+		server = setupServer();
+	});
+
+	beforeEach(async () => {
+		pinia = createPinia();
+		setActivePinia(pinia);
+
+		workflowsStore = useWorkflowsStore();
+		settingsStore = useSettingsStore();
+
+		await settingsStore.getSettings();
+	});
+
+	afterAll(() => {
+		server.shutdown();
+	});
+
+	describe('executeData()', () => {
+		it('should return empty execute data if no parent nodes', () => {
+			const parentNodes: string[] = [];
+			const currentNode = 'Set';
+			const inputName = 'main';
+			const runIndex = 0;
+
+			const result = executeData(parentNodes, currentNode, inputName, runIndex);
+
+			expect(result).toEqual({
+				node: {},
+				data: {},
+				source: null,
+			});
+		});
+
+		it('should return the correct execution data with one parent node', () => {
+			const parentNodes = ['Start'];
+			const currentNode = 'Set';
+			const inputName = 'main';
+			const runIndex = 0;
+			const jsonData = {
+				name: 'Test',
+			};
+
+			workflowsStore.workflowExecutionData = {
+				data: {
+					resultData: {
+						runData: {
+							[parentNodes[0]]: [
+								{
+									startTime: 0,
+									executionTime: 0,
+									data: {
+										main: [
+											{
+												json: jsonData,
+												index: 0,
+											},
+										],
+									},
+									source: [],
+								},
+							],
+						},
+					},
+				},
+			} as unknown as IExecutionResponse;
+
+			const result = executeData(parentNodes, currentNode, inputName, runIndex);
+
+			expect(result).toEqual({
+				node: {},
+				data: {
+					main: [
+						{
+							index: 0,
+							json: jsonData,
+						},
+					],
+				},
+				source: {
+					main: [
+						{
+							previousNode: parentNodes[0],
+						},
+					],
+				},
+			});
+		});
+
+		it('should return the correct execution data with multiple parent nodes, only one with execution data', () => {
+			const parentNodes = ['Parent A', 'Parent B'];
+			const currentNode = 'Set';
+			const inputName = 'main';
+			const runIndex = 0;
+			const jsonData = {
+				name: 'Test',
+			};
+
+			workflowsStore.workflowExecutionData = {
+				data: {
+					resultData: {
+						runData: {
+							[parentNodes[1]]: [
+								{
+									startTime: 0,
+									executionTime: 0,
+									data: {
+										main: [
+											{
+												json: jsonData,
+												index: 0,
+											},
+										],
+									},
+									source: [],
+								},
+							],
+						},
+					},
+				},
+			} as unknown as IExecutionResponse;
+
+			const result = executeData(parentNodes, currentNode, inputName, runIndex);
+
+			expect(result).toEqual({
+				node: {},
+				data: {
+					main: [
+						{
+							index: 0,
+							json: jsonData,
+						},
+					],
+				},
+				source: {
+					main: [
+						{
+							previousNode: parentNodes[1],
+						},
+					],
+				},
+			});
+		});
+
+		it('should return the correct execution data with multiple parent nodes, all with execution data', () => {
+			const parentNodes = ['Parent A', 'Parent B'];
+			const currentNode = 'Set';
+			const inputName = 'main';
+			const runIndex = 0;
+
+			const jsonDataA = {
+				name: 'Test A',
+			};
+
+			const jsonDataB = {
+				name: 'Test B',
+			};
+
+			workflowsStore.workflowExecutionData = {
+				data: {
+					resultData: {
+						runData: {
+							[parentNodes[0]]: [
+								{
+									startTime: 0,
+									executionTime: 0,
+									data: {
+										main: [
+											{
+												json: jsonDataA,
+												index: 0,
+											},
+										],
+									},
+									source: [],
+								},
+							],
+							[parentNodes[1]]: [
+								{
+									startTime: 0,
+									executionTime: 0,
+									data: {
+										main: [
+											{
+												json: jsonDataB,
+												index: 0,
+											},
+										],
+									},
+									source: [],
+								},
+							],
+						},
+					},
+				},
+			} as unknown as IExecutionResponse;
+
+			const result = executeData(parentNodes, currentNode, inputName, runIndex);
+
+			expect(result).toEqual({
+				node: {},
+				data: {
+					main: [
+						{
+							index: 0,
+							json: jsonDataA,
+						},
+					],
+				},
+				source: {
+					main: [
+						{
+							previousNode: parentNodes[0],
+						},
+					],
+				},
+			});
+		});
+	});
+});
diff --git a/packages/editor-ui/src/mixins/completionManager.ts b/packages/editor-ui/src/mixins/completionManager.ts
deleted file mode 100644
index 6b73ea645b296..0000000000000
--- a/packages/editor-ui/src/mixins/completionManager.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-import mixins from 'vue-typed-mixins';
-import { ExpressionExtensions } from 'n8n-workflow';
-import type { EditorView, ViewUpdate } from '@codemirror/view';
-
-import { expressionManager } from './expressionManager';
-
-export const completionManager = mixins(expressionManager).extend({
-	data() {
-		return {
-			editor: {} as EditorView,
-		};
-	},
-	computed: {
-		expressionExtensionsCategories() {
-			return ExpressionExtensions.reduce<Record<string, string | undefined>>((acc, cur) => {
-				for (const fnName of Object.keys(cur.functions)) {
-					acc[fnName] = cur.typeName;
-				}
-
-				return acc;
-			}, {});
-		},
-	},
-	methods: {
-		trackCompletion(viewUpdate: ViewUpdate, parameterPath: string) {
-			const completionTx = viewUpdate.transactions.find((tx) => tx.isUserEvent('input.complete'));
-
-			if (!completionTx) return;
-
-			let completion = '';
-			let completionBase = '';
-
-			viewUpdate.changes.iterChanges((_: number, __: number, fromB: number, toB: number) => {
-				completion = this.editor.state.doc.slice(fromB, toB).toString();
-
-				const index = this.findCompletionBaseStartIndex(fromB);
-
-				completionBase = this.editor.state.doc
-					.slice(index, fromB - 1)
-					.toString()
-					.trim();
-			});
-
-			const category = this.expressionExtensionsCategories[completion];
-
-			const payload = {
-				instance_id: this.rootStore.instanceId,
-				node_type: this.ndvStore.activeNode?.type,
-				field_name: parameterPath,
-				field_type: 'expression',
-				context: completionBase,
-				inserted_text: completion,
-				category: category ?? 'n/a', // only applicable if expression extension completion
-			};
-
-			this.$telemetry.track('User autocompleted code', payload);
-		},
-
-		findCompletionBaseStartIndex(fromIndex: number) {
-			const INDICATORS = [
-				' $', // proxy
-				'{ ', // primitive
-			];
-
-			const doc = this.editor.state.doc.toString();
-
-			for (let index = fromIndex; index > 0; index--) {
-				if (INDICATORS.some((indicator) => indicator === doc[index] + doc[index + 1])) {
-					return index + 1;
-				}
-			}
-
-			return -1;
-		},
-	},
-});
diff --git a/packages/editor-ui/src/mixins/copyPaste.ts b/packages/editor-ui/src/mixins/copyPaste.ts
deleted file mode 100644
index 49c4ae830d233..0000000000000
--- a/packages/editor-ui/src/mixins/copyPaste.ts
+++ /dev/null
@@ -1,242 +0,0 @@
-/**
- * Captures any pasted data and sends it to method "receivedCopyPasteData" which has to be
- * defined on the component which uses this mixin
- */
-import { defineComponent } from 'vue';
-import { debounce } from 'lodash-es';
-
-export const copyPaste = defineComponent({
-	data() {
-		return {
-			copyPasteElementsGotCreated: false,
-			hiddenInput: null as null | Element,
-			onPaste: null as null | Function,
-			onBeforePaste: null as null | Function,
-		};
-	},
-	mounted() {
-		if (this.copyPasteElementsGotCreated === true) {
-			return;
-		}
-
-		this.copyPasteElementsGotCreated = true;
-		// Define the style of the html elements that get created to make
-		// sure that they are not visible
-		const style = document.createElement('style');
-		style.type = 'text/css';
-		style.innerHTML = `
-			.hidden-copy-paste {
-			position: absolute;
-			bottom: 0;
-			left: 0;
-			width: 10px;
-			height: 10px;
-			display: block;
-			font-size: 1px;
-			z-index: -1;
-			color: transparent;
-			background: transparent;
-			overflow: hidden;
-			border: none;
-			padding: 0;
-			resize: none;
-			outline: none;
-			-webkit-user-select: text;
-			user-select: text;
-		}
-		`;
-		document.getElementsByTagName('head')[0].appendChild(style);
-
-		// Code is mainly from
-		// https://www.lucidchart.com/techblog/2014/12/02/definitive-guide-copying-pasting-javascript/
-		const isSafari =
-			navigator.appVersion.search('Safari') !== -1 &&
-			navigator.appVersion.search('Chrome') === -1 &&
-			navigator.appVersion.search('CrMo') === -1 &&
-			navigator.appVersion.search('CriOS') === -1;
-		const isIe =
-			navigator.userAgent.toLowerCase().indexOf('msie') !== -1 ||
-			navigator.userAgent.toLowerCase().indexOf('trident') !== -1;
-
-		const hiddenInput = document.createElement('input');
-		hiddenInput.setAttribute('type', 'text');
-		hiddenInput.setAttribute('id', 'hidden-input-copy-paste');
-		hiddenInput.setAttribute('class', 'hidden-copy-paste');
-		hiddenInput.setAttribute('data-test-id', 'hidden-copy-paste');
-		this.hiddenInput = hiddenInput;
-
-		document.body.append(hiddenInput);
-
-		let ieClipboardDiv: HTMLDivElement | null = null;
-		if (isIe) {
-			ieClipboardDiv = document.createElement('div');
-			ieClipboardDiv.setAttribute('id', 'hidden-ie-clipboard-copy-paste');
-			ieClipboardDiv.setAttribute('class', 'hidden-copy-paste');
-			ieClipboardDiv.setAttribute('contenteditable', 'true');
-			document.body.append(ieClipboardDiv);
-
-			this.onBeforePaste = () => {
-				// @ts-ignore
-				if (hiddenInput.is(':focus')) {
-					this.focusIeClipboardDiv(ieClipboardDiv as HTMLDivElement);
-				}
-			};
-			// @ts-ignore
-			document.addEventListener('beforepaste', this.onBeforePaste, true);
-		}
-
-		let userInput = '';
-		const hiddenInputListener = (text: string) => {};
-
-		hiddenInput.addEventListener('input', (e) => {
-			const value = hiddenInput.value;
-			userInput += value;
-			hiddenInputListener(userInput);
-
-			// There is a bug (sometimes) with Safari and the input area can't be updated during
-			// the input event, so we update the input area after the event is done being processed
-			if (isSafari) {
-				hiddenInput.focus();
-				setTimeout(() => {
-					this.focusHiddenArea(hiddenInput);
-				}, 0);
-			} else {
-				this.focusHiddenArea(hiddenInput);
-			}
-		});
-
-		this.onPaste = debounce(
-			(e) => {
-				const event = 'paste';
-				// Check if the event got emitted from a message box or from something
-				// else which should ignore the copy/paste
-				// @ts-ignore
-				const path = e.path || (e.composedPath && e.composedPath());
-				for (let index = 0; index < path.length; index++) {
-					if (
-						path[index].className &&
-						typeof path[index].className === 'string' &&
-						(path[index].className.includes('el-message-box') ||
-							path[index].className.includes('ignore-key-press'))
-					) {
-						return;
-					}
-				}
-
-				if (ieClipboardDiv !== null) {
-					this.ieClipboardEvent(event, ieClipboardDiv);
-				} else {
-					this.standardClipboardEvent(event, e as ClipboardEvent);
-					// @ts-ignore
-					if (
-						!document.activeElement ||
-						(document.activeElement &&
-							['textarea', 'text', 'email', 'password'].indexOf(document.activeElement.type) === -1)
-					) {
-						// That it still allows to paste into text, email, password & textarea-fields we
-						// check if we can identify the active element and if so only
-						// run it if something else is selected.
-						this.focusHiddenArea(hiddenInput);
-						e.preventDefault();
-					}
-				}
-			},
-			1000,
-			{ leading: true },
-		);
-
-		// Set clipboard event listeners on the document.
-		// @ts-ignore
-		document.addEventListener('paste', this.onPaste);
-	},
-	methods: {
-		receivedCopyPasteData(plainTextData: string, event?: ClipboardEvent): void {
-			// THIS HAS TO BE DEFINED IN COMPONENT!
-		},
-
-		// For every browser except IE, we can easily get and set data on the clipboard
-		standardClipboardEvent(clipboardEventName: string, event: ClipboardEvent) {
-			const clipboardData = event.clipboardData;
-			if (clipboardData !== null && clipboardEventName === 'paste') {
-				const clipboardText = clipboardData.getData('text/plain');
-				this.receivedCopyPasteData(clipboardText, event);
-			}
-		},
-
-		// For IE, we can get/set Text or URL just as we normally would
-		ieClipboardEvent(clipboardEventName: string, ieClipboardDiv: HTMLDivElement) {
-			// @ts-ignore
-			const clipboardData = window.clipboardData;
-			if (clipboardEventName === 'paste') {
-				const clipboardText = clipboardData.getData('Text');
-				// @ts-ignore
-				ieClipboardDiv.empty();
-				this.receivedCopyPasteData(clipboardText);
-			}
-		},
-
-		// Focuses an element to be ready for copy/paste (used exclusively for IE)
-		focusIeClipboardDiv(ieClipboardDiv: HTMLDivElement) {
-			ieClipboardDiv.focus();
-			const range = document.createRange();
-			// @ts-ignore
-			range.selectNodeContents(ieClipboardDiv.get(0));
-			const selection = window.getSelection();
-			if (selection !== null) {
-				selection.removeAllRanges();
-				selection.addRange(range);
-			}
-		},
-
-		focusHiddenArea(hiddenInput: HTMLInputElement) {
-			// In order to ensure that the browser will fire clipboard events, we always need to have something selected
-			hiddenInput.value = ' ';
-			hiddenInput.focus();
-			hiddenInput.select();
-		},
-
-		/**
-		 * Copies given data to clipboard
-		 */
-		copyToClipboard(value: string): void {
-			// FROM: https://hackernoon.com/copying-text-to-clipboard-with-javascript-df4d4988697f
-			const element = document.createElement('textarea'); // Create a <textarea> element
-			element.value = value; // Set its value to the string that you want copied
-			element.setAttribute('readonly', ''); // Make it readonly to be tamper-proof
-			element.style.position = 'absolute';
-			element.style.left = '-9999px'; // Move outside the screen to make it invisible
-			document.body.appendChild(element); // Append the <textarea> element to the HTML document
-
-			const selection = document.getSelection();
-			if (selection === null) {
-				return;
-			}
-
-			const selected =
-				selection.rangeCount > 0 // Check if there is any content selected previously
-					? selection.getRangeAt(0) // Store selection if found
-					: false; // Mark as false to know no selection existed before
-			element.select(); // Select the <textarea> content
-			document.execCommand('copy'); // Copy - only works as a result of a user action (e.g. click events)
-			document.body.removeChild(element); // Remove the <textarea> element
-			if (selected) {
-				// If a selection existed before copying
-				selection.removeAllRanges(); // Unselect everything on the HTML document
-				selection.addRange(selected); // Restore the original selection
-			}
-		},
-	},
-	beforeDestroy() {
-		if (this.hiddenInput) {
-			this.hiddenInput.remove();
-		}
-		if (this.onPaste) {
-			// @ts-ignore
-			document.removeEventListener('paste', this.onPaste);
-		}
-		if (this.onBeforePaste) {
-			// @ts-ignore
-			document.removeEventListener('beforepaste', this.onBeforePaste);
-		}
-	},
-});
diff --git a/packages/editor-ui/src/mixins/debounce.ts b/packages/editor-ui/src/mixins/debounce.ts
deleted file mode 100644
index 217db45d7a66e..0000000000000
--- a/packages/editor-ui/src/mixins/debounce.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { debounce } from 'lodash-es';
-import { defineComponent } from 'vue';
-
-export const debounceHelper = defineComponent({
-	data() {
-		return {
-			debouncedFunctions: [] as any[],
-		};
-	},
-	methods: {
-		// eslint-disable-next-line @typescript-eslint/no-explicit-any
-		async callDebounced(...inputParameters: any[]): Promise<void> {
-			const functionName = inputParameters.shift() as string;
-			const { trailing, debounceTime } = inputParameters.shift();
-
-			// @ts-ignore
-			if (this.debouncedFunctions[functionName] === undefined) {
-				// @ts-ignore
-				this.debouncedFunctions[functionName] = debounce(
-					this[functionName],
-					debounceTime,
-					trailing ? { trailing } : { leading: true },
-				);
-			}
-			// @ts-ignore
-			await this.debouncedFunctions[functionName].apply(this, inputParameters);
-		},
-	},
-});
diff --git a/packages/editor-ui/src/mixins/deviceSupportHelpers.ts b/packages/editor-ui/src/mixins/deviceSupportHelpers.ts
deleted file mode 100644
index a8f87f8820aee..0000000000000
--- a/packages/editor-ui/src/mixins/deviceSupportHelpers.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { defineComponent } from 'vue';
-
-export const deviceSupportHelpers = defineComponent({
-	data() {
-		return {
-			// @ts-ignore msMaxTouchPoints is deprecated but must fix tablet bugs before fixing this.. otherwise breaks touchscreen computers
-			isTouchDevice: 'ontouchstart' in window || navigator.msMaxTouchPoints,
-			isMacOs: /(ipad|iphone|ipod|mac)/i.test(navigator.platform), // TODO: `platform` deprecated
-		};
-	},
-	computed: {
-		// TODO: Check if used anywhere
-		controlKeyCode(): string {
-			if (this.isMacOs) {
-				return 'Meta';
-			}
-			return 'Control';
-		},
-	},
-	methods: {
-		isCtrlKeyPressed(e: MouseEvent | KeyboardEvent): boolean {
-			if (this.isTouchDevice === true && e instanceof MouseEvent) {
-				return true;
-			}
-			if (this.isMacOs) {
-				return e.metaKey;
-			}
-			return e.ctrlKey;
-		},
-	},
-});
diff --git a/packages/editor-ui/src/mixins/emitter.ts b/packages/editor-ui/src/mixins/emitter.ts
deleted file mode 100644
index 913b9c295b7dc..0000000000000
--- a/packages/editor-ui/src/mixins/emitter.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-import { defineComponent } from 'vue';
-
-function broadcast(
-	this: InstanceType<typeof EmitterMixin>,
-	componentName: string,
-	eventName: string,
-	params: any,
-) {
-	this.$children.forEach((child) => {
-		const name = child.$options.name;
-
-		if (name === componentName) {
-			// eslint-disable-next-line prefer-spread
-			child.$emit.apply(child, [eventName].concat(params) as Parameters<typeof child.$emit>);
-		} else {
-			broadcast.apply(
-				child as InstanceType<typeof EmitterMixin>,
-				[componentName, eventName].concat([params]) as Parameters<typeof broadcast>,
-			);
-		}
-	});
-}
-
-const EmitterMixin = defineComponent({
-	methods: {
-		$dispatch(componentName: string, eventName: string, params: any) {
-			let parent = this.$parent || this.$root;
-			let name = parent.$options.name;
-
-			while (parent && (!name || name !== componentName)) {
-				parent = parent.$parent as InstanceType<typeof EmitterMixin>;
-
-				if (parent) {
-					name = parent.$options.name;
-				}
-			}
-			if (parent) {
-				// eslint-disable-next-line prefer-spread
-				parent.$emit.apply(parent, [eventName].concat(params) as Parameters<typeof parent.$emit>);
-			}
-		},
-
-		$broadcast(componentName: string, eventName: string, params: any) {
-			broadcast.call(this, componentName, eventName, params);
-		},
-	},
-});
-
-export default EmitterMixin;
diff --git a/packages/editor-ui/src/mixins/executionsHelpers.ts b/packages/editor-ui/src/mixins/executionsHelpers.ts
deleted file mode 100644
index d3bcb7555bff4..0000000000000
--- a/packages/editor-ui/src/mixins/executionsHelpers.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-import { useWorkflowsStore } from '@/stores/workflows';
-import { i18n as locale } from '@/plugins/i18n';
-import { mapStores } from 'pinia';
-import mixins from 'vue-typed-mixins';
-import { genericHelpers } from './genericHelpers';
-import type { IExecutionsSummary } from 'n8n-workflow';
-
-export interface IExecutionUIData {
-	name: string;
-	label: string;
-	startTime: string;
-	runningTime: string;
-}
-
-export const executionHelpers = mixins(genericHelpers).extend({
-	computed: {
-		...mapStores(useWorkflowsStore),
-		executionId(): string {
-			return this.$route.params.executionId;
-		},
-		workflowName(): string {
-			return this.workflowsStore.workflowName;
-		},
-		currentWorkflow(): string {
-			return this.$route.params.name || this.workflowsStore.workflowId;
-		},
-		executions(): IExecutionsSummary[] {
-			return this.workflowsStore.currentWorkflowExecutions;
-		},
-		activeExecution(): IExecutionsSummary | null {
-			return this.workflowsStore.activeWorkflowExecution;
-		},
-	},
-	methods: {
-		getExecutionUIDetails(execution: IExecutionsSummary): IExecutionUIData {
-			const status = {
-				name: 'unknown',
-				startTime: this.formatDate(execution.startedAt),
-				label: 'Status unknown',
-				runningTime: '',
-			};
-
-			if (execution.status === 'waiting' || execution.waitTill) {
-				status.name = 'waiting';
-				status.label = this.$locale.baseText('executionsList.waiting');
-			} else if (
-				execution.status === 'running' ||
-				execution.status === 'new' ||
-				execution.stoppedAt === undefined
-			) {
-				status.name = 'running';
-				status.label = this.$locale.baseText('executionsList.running');
-			} else if (execution.status === 'success' || execution.finished) {
-				status.name = 'success';
-				status.label = this.$locale.baseText('executionsList.succeeded');
-			} else if (execution.status === 'failed' || execution.status === 'crashed') {
-				status.name = 'error';
-				status.label = this.$locale.baseText('executionsList.error');
-			} else if (execution.status === 'canceled') {
-				status.label = this.$locale.baseText('executionsList.canceled');
-			}
-
-			if (!execution.status) execution.status = 'unknown';
-
-			if (execution.startedAt && execution.stoppedAt) {
-				const stoppedAt = execution.stoppedAt
-					? new Date(execution.stoppedAt).getTime()
-					: Date.now();
-				status.runningTime = this.displayTimer(
-					stoppedAt - new Date(execution.startedAt).getTime(),
-					true,
-				);
-			}
-
-			return status;
-		},
-		formatDate(fullDate: Date | string | number) {
-			const { date, time } = this.convertToDisplayDate(fullDate);
-			return locale.baseText('executionsList.started', { interpolate: { time, date } });
-		},
-	},
-});
diff --git a/packages/editor-ui/src/mixins/expressionManager.ts b/packages/editor-ui/src/mixins/expressionManager.ts
deleted file mode 100644
index fe2a4fe4e5ebb..0000000000000
--- a/packages/editor-ui/src/mixins/expressionManager.ts
+++ /dev/null
@@ -1,228 +0,0 @@
-import mixins from 'vue-typed-mixins';
-import { Expression, ExpressionExtensions } from 'n8n-workflow';
-import { mapStores } from 'pinia';
-import { ensureSyntaxTree } from '@codemirror/language';
-
-import { workflowHelpers } from '@/mixins/workflowHelpers';
-import { useNDVStore } from '@/stores/ndv';
-import { EXPRESSION_EDITOR_PARSER_TIMEOUT } from '@/constants';
-
-import type { PropType } from 'vue';
-import type { EditorView } from '@codemirror/view';
-import type { TargetItem } from '@/Interface';
-import type { Html, Plaintext, RawSegment, Resolvable, Segment } from '@/types/expressions';
-
-export const expressionManager = mixins(workflowHelpers).extend({
-	props: {
-		targetItem: {
-			type: Object as PropType<TargetItem | null>,
-		},
-	},
-	data() {
-		return {
-			editor: {} as EditorView,
-		};
-	},
-	watch: {
-		targetItem() {
-			setTimeout(() => {
-				this.$emit('change', {
-					value: this.unresolvedExpression,
-					segments: this.displayableSegments,
-				});
-			});
-		},
-	},
-	computed: {
-		...mapStores(useNDVStore),
-
-		unresolvedExpression(): string {
-			return this.segments.reduce((acc, segment) => {
-				acc += segment.kind === 'resolvable' ? segment.resolvable : segment.plaintext;
-
-				return acc;
-			}, '=');
-		},
-
-		hoveringItem(): TargetItem | undefined {
-			return this.ndvStore.hoveringItem ?? undefined;
-		},
-
-		resolvableSegments(): Resolvable[] {
-			return this.segments.filter((s): s is Resolvable => s.kind === 'resolvable');
-		},
-
-		plaintextSegments(): Plaintext[] {
-			return this.segments.filter((s): s is Plaintext => s.kind === 'plaintext');
-		},
-
-		expressionExtensionNames(): Set<string> {
-			return new Set(
-				ExpressionExtensions.reduce<string[]>((acc, cur) => {
-					return [...acc, ...Object.keys(cur.functions)];
-				}, []),
-			);
-		},
-
-		htmlSegments(): Html[] {
-			return this.segments.filter((s): s is Html => s.kind !== 'resolvable');
-		},
-
-		segments(): Segment[] {
-			const rawSegments: RawSegment[] = [];
-
-			const fullTree = ensureSyntaxTree(
-				this.editor.state,
-				this.editor.state.doc.length,
-				EXPRESSION_EDITOR_PARSER_TIMEOUT,
-			);
-
-			if (fullTree === null) {
-				throw new Error(`Failed to parse expression: ${this.editor.state.doc.toString()}`);
-			}
-
-			fullTree.cursor().iterate((node) => {
-				if (node.type.name === 'Program') return;
-
-				rawSegments.push({
-					from: node.from,
-					to: node.to,
-					text: this.editor.state.sliceDoc(node.from, node.to),
-					token: node.type.name,
-				});
-			});
-
-			return rawSegments.reduce<Segment[]>((acc, segment) => {
-				const { from, to, text, token } = segment;
-
-				if (token === 'Resolvable') {
-					const { resolved, error, fullError } = this.resolve(text, this.hoveringItem);
-
-					acc.push({ kind: 'resolvable', from, to, resolvable: text, resolved, error, fullError });
-
-					return acc;
-				}
-
-				acc.push({ kind: 'plaintext', from, to, plaintext: text });
-
-				return acc;
-			}, []);
-		},
-
-		/**
-		 * Segments to display in the output of an expression editor.
-		 *
-		 * Some segments are not displayed when they are _part_ of the result,
-		 * but displayed when they are the _entire_ result:
-		 *
-		 * - `This is a {{ [] }} test` displays as `This is a test`.
-		 * - `{{ [] }}` displays as `[Array: []]`.
-		 *
-		 * Some segments display differently based on context:
-		 *
-		 * Date displays as
-		 * - `Mon Nov 14 2022 17:26:13 GMT+0100 (CST)` when part of the result
-		 * - `[Object: "2022-11-14T17:26:13.130Z"]` when the entire result
-		 *
-		 * Only needed in order to mimic behavior of `ParameterInputHint`.
-		 */
-		displayableSegments(): Segment[] {
-			return this.segments
-				.map((s) => {
-					if (this.segments.length <= 1 || s.kind !== 'resolvable') return s;
-
-					if (typeof s.resolved === 'string' && /\[Object: "\d{4}-\d{2}-\d{2}T/.test(s.resolved)) {
-						const utcDateString = s.resolved.replace(/(\[Object: "|\"\])/g, '');
-						s.resolved = new Date(utcDateString).toString();
-					}
-
-					if (typeof s.resolved === 'string' && /\[Array:\s\[.+\]\]/.test(s.resolved)) {
-						s.resolved = s.resolved.replace(/(\[Array: \[|\])/g, '');
-					}
-
-					return s;
-				})
-				.filter((s) => {
-					if (
-						this.segments.length > 1 &&
-						s.kind === 'resolvable' &&
-						typeof s.resolved === 'string' &&
-						(s.resolved === '[Array: []]' ||
-							s.resolved === this.$locale.baseText('expressionModalInput.empty'))
-					) {
-						return false;
-					}
-
-					return true;
-				});
-		},
-	},
-	methods: {
-		isEmptyExpression(resolvable: string) {
-			return /\{\{\s*\}\}/.test(resolvable);
-		},
-
-		resolve(resolvable: string, targetItem?: TargetItem) {
-			const result: { resolved: unknown; error: boolean; fullError: Error | null } = {
-				resolved: undefined,
-				error: false,
-				fullError: null,
-			};
-
-			try {
-				const ndvStore = useNDVStore();
-				if (!ndvStore.activeNode) {
-					// e.g. credential modal
-					result.resolved = Expression.resolveWithoutWorkflow(resolvable);
-				} else {
-					let opts;
-					if (ndvStore.isInputParentOfActiveNode) {
-						opts = {
-							targetItem: targetItem ?? undefined,
-							inputNodeName: this.ndvStore.ndvInputNodeName,
-							inputRunIndex: this.ndvStore.ndvInputRunIndex,
-							inputBranchIndex: this.ndvStore.ndvInputBranchIndex,
-						};
-					}
-					result.resolved = this.resolveExpression('=' + resolvable, undefined, opts);
-				}
-			} catch (error) {
-				result.resolved = `[${error.message}]`;
-				result.error = true;
-				result.fullError = error;
-			}
-
-			if (result.resolved === '') {
-				result.resolved = this.$locale.baseText('expressionModalInput.empty');
-			}
-
-			if (result.resolved === undefined && this.isEmptyExpression(resolvable)) {
-				result.resolved = this.$locale.baseText('expressionModalInput.empty');
-			}
-
-			if (result.resolved === undefined) {
-				result.resolved = this.isUncalledExpressionExtension(resolvable)
-					? this.$locale.baseText('expressionEditor.uncalledFunction')
-					: this.$locale.baseText('expressionModalInput.undefined');
-
-				result.error = true;
-			}
-
-			if (typeof result.resolved === 'number' && isNaN(result.resolved)) {
-				result.resolved = this.$locale.baseText('expressionModalInput.null');
-			}
-
-			return result;
-		},
-
-		isUncalledExpressionExtension(resolvable: string) {
-			const end = resolvable
-				.replace(/^{{|}}$/g, '')
-				.trim()
-				.split('.')
-				.pop();
-
-			return end !== undefined && this.expressionExtensionNames.has(end);
-		},
-	},
-});
diff --git a/packages/editor-ui/src/mixins/externalHooks.ts b/packages/editor-ui/src/mixins/externalHooks.ts
deleted file mode 100644
index 09b180b039641..0000000000000
--- a/packages/editor-ui/src/mixins/externalHooks.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import type { IExternalHooks } from '@/Interface';
-import type { IDataObject } from 'n8n-workflow';
-import { useWebhooksStore } from '@/stores/webhooks';
-import { defineComponent } from 'vue';
-import { runExternalHook } from '@/utils';
-
-export const externalHooks = defineComponent({
-	methods: {
-		$externalHooks(): IExternalHooks {
-			return {
-				run: async (eventName: string, metadata?: IDataObject): Promise<void> => {
-					await runExternalHook.call(this, eventName, useWebhooksStore(), metadata);
-				},
-			};
-		},
-	},
-});
diff --git a/packages/editor-ui/src/mixins/genericHelpers.ts b/packages/editor-ui/src/mixins/genericHelpers.ts
deleted file mode 100644
index c47f4f71903c4..0000000000000
--- a/packages/editor-ui/src/mixins/genericHelpers.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-import mixins from 'vue-typed-mixins';
-import dateformat from 'dateformat';
-
-import { VIEWS } from '@/constants';
-import { showMessage } from '@/mixins/showMessage';
-
-export const genericHelpers = mixins(showMessage).extend({
-	data() {
-		return {
-			// eslint-disable-next-line @typescript-eslint/no-explicit-any
-			loadingService: null as any | null,
-		};
-	},
-	computed: {
-		isReadOnly(): boolean {
-			return ![VIEWS.WORKFLOW, VIEWS.NEW_WORKFLOW, VIEWS.LOG_STREAMING_SETTINGS].includes(
-				this.$route.name as VIEWS,
-			);
-		},
-	},
-	methods: {
-		displayTimer(msPassed: number, showMs = false): string {
-			if (msPassed < 60000) {
-				if (!showMs) {
-					return `${Math.floor(msPassed / 1000)}${this.$locale.baseText(
-						'genericHelpers.secShort',
-					)}`;
-				}
-
-				return `${msPassed / 1000}${this.$locale.baseText('genericHelpers.secShort')}`;
-			}
-
-			const secondsPassed = Math.floor(msPassed / 1000);
-			const minutesPassed = Math.floor(secondsPassed / 60);
-			const secondsLeft = (secondsPassed - minutesPassed * 60).toString().padStart(2, '0');
-
-			return `${minutesPassed}:${secondsLeft}${this.$locale.baseText('genericHelpers.minShort')}`;
-		},
-		convertToDisplayDate(fullDate: Date | string | number): { date: string; time: string } {
-			const mask = `d mmm${
-				new Date(fullDate).getFullYear() === new Date().getFullYear() ? '' : ', yyyy'
-			}#HH:MM:ss`;
-			const formattedDate = dateformat(fullDate, mask);
-			const [date, time] = formattedDate.split('#');
-			return { date, time };
-		},
-		editAllowedCheck(): boolean {
-			if (this.isReadOnly) {
-				this.$showMessage({
-					// title: 'Workflow can not be changed!',
-					title: this.$locale.baseText('genericHelpers.showMessage.title'),
-					message: this.$locale.baseText('genericHelpers.showMessage.message'),
-					type: 'info',
-					duration: 0,
-				});
-
-				return false;
-			}
-			return true;
-		},
-
-		startLoading(text?: string) {
-			if (this.loadingService !== null) {
-				return;
-			}
-
-			// @ts-ignore
-			this.loadingService = this.$loading({
-				lock: true,
-				text: text || this.$locale.baseText('genericHelpers.loading'),
-				spinner: 'el-icon-loading',
-				background: 'rgba(255, 255, 255, 0.8)',
-			});
-		},
-		setLoadingText(text: string) {
-			this.loadingService.text = text;
-		},
-		stopLoading() {
-			if (this.loadingService !== null) {
-				this.loadingService.close();
-				this.loadingService = null;
-			}
-		},
-	},
-});
diff --git a/packages/editor-ui/src/mixins/moveNodeWorkflow.ts b/packages/editor-ui/src/mixins/moveNodeWorkflow.ts
deleted file mode 100644
index d35a46b8645d9..0000000000000
--- a/packages/editor-ui/src/mixins/moveNodeWorkflow.ts
+++ /dev/null
@@ -1,96 +0,0 @@
-import mixins from 'vue-typed-mixins';
-import { deviceSupportHelpers } from '@/mixins/deviceSupportHelpers';
-import { getMousePosition } from '@/utils/nodeViewUtils';
-import { mapStores } from 'pinia';
-import { useUIStore } from '@/stores/ui';
-
-export const moveNodeWorkflow = mixins(deviceSupportHelpers).extend({
-	data() {
-		return {
-			moveLastPosition: [0, 0],
-		};
-	},
-	computed: {
-		...mapStores(useUIStore),
-	},
-	methods: {
-		moveWorkflow(e: MouseEvent) {
-			const offsetPosition = this.uiStore.nodeViewOffsetPosition;
-
-			const [x, y] = getMousePosition(e);
-
-			const nodeViewOffsetPositionX = offsetPosition[0] + (x - this.moveLastPosition[0]);
-			const nodeViewOffsetPositionY = offsetPosition[1] + (y - this.moveLastPosition[1]);
-			this.uiStore.nodeViewOffsetPosition = [nodeViewOffsetPositionX, nodeViewOffsetPositionY];
-
-			// Update the last position
-			this.moveLastPosition[0] = x;
-			this.moveLastPosition[1] = y;
-		},
-		mouseDownMoveWorkflow(e: MouseEvent, moveButtonPressed: boolean) {
-			if (this.isCtrlKeyPressed(e) === false && !moveButtonPressed) {
-				// We only care about it when the ctrl key is pressed at the same time.
-				// So we exit when it is not pressed.
-				return;
-			}
-
-			if (this.uiStore.isActionActive('dragActive')) {
-				// If a node does currently get dragged we do not activate the selection
-				return;
-			}
-
-			// Prevent moving canvas on anything but middle button
-			if (e.button !== 1) {
-				this.uiStore.nodeViewMoveInProgress = true;
-			}
-
-			const [x, y] = getMousePosition(e);
-
-			this.moveLastPosition[0] = x;
-			this.moveLastPosition[1] = y;
-
-			// @ts-ignore
-			this.$el.addEventListener('mousemove', this.mouseMoveNodeWorkflow);
-		},
-		mouseUpMoveWorkflow(e: MouseEvent) {
-			if (this.uiStore.nodeViewMoveInProgress === false) {
-				// If it is not active return directly.
-				// Else normal node dragging will not work.
-				return;
-			}
-
-			// @ts-ignore
-			this.$el.removeEventListener('mousemove', this.mouseMoveNodeWorkflow);
-
-			this.uiStore.nodeViewMoveInProgress = false;
-
-			// Nothing else to do. Simply leave the node view at the current offset
-		},
-		mouseMoveNodeWorkflow(e: MouseEvent) {
-			// @ts-ignore
-			if (e.target && !e.target.id.includes('node-view')) {
-				return;
-			}
-
-			if (this.uiStore.isActionActive('dragActive')) {
-				return;
-			}
-
-			// Signal that moving canvas is active if middle button is pressed and mouse is moved
-			if (e.buttons === 4) {
-				this.uiStore.nodeViewMoveInProgress = true;
-			}
-
-			if (e.buttons === 0) {
-				// Mouse button is not pressed anymore so stop selection mode
-				// Happens normally when mouse leave the view pressed and then
-				// comes back unpressed.
-				// @ts-ignore
-				this.mouseUp(e);
-				return;
-			}
-
-			this.moveWorkflow(e);
-		},
-	},
-});
diff --git a/packages/editor-ui/src/mixins/newVersions.ts b/packages/editor-ui/src/mixins/newVersions.ts
deleted file mode 100644
index 16f8a3ca4f797..0000000000000
--- a/packages/editor-ui/src/mixins/newVersions.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import mixins from 'vue-typed-mixins';
-import { showMessage } from './showMessage';
-import { VERSIONS_MODAL_KEY } from '@/constants';
-import { mapStores } from 'pinia';
-import { useUIStore } from '@/stores/ui';
-import { useVersionsStore } from '@/stores/versions';
-
-export const newVersions = mixins(showMessage).extend({
-	computed: {
-		...mapStores(useUIStore, useVersionsStore),
-	},
-	methods: {
-		async checkForNewVersions() {
-			const enabled = this.versionsStore.areNotificationsEnabled;
-			if (!enabled) {
-				return;
-			}
-
-			await this.versionsStore.fetchVersions();
-
-			const currentVersion = this.versionsStore.currentVersion;
-			const nextVersions = this.versionsStore.nextVersions;
-			if (currentVersion && currentVersion.hasSecurityIssue && nextVersions.length) {
-				const fixVersion = currentVersion.securityIssueFixVersion;
-				let message = 'Please update to latest version.';
-				if (fixVersion) {
-					message = `Please update to version ${fixVersion} or higher.`;
-				}
-
-				message = `${message} <a class="primary-color">More info</a>`;
-				this.$showToast({
-					title: 'Critical update available',
-					message,
-					onClick: () => {
-						this.uiStore.openModal(VERSIONS_MODAL_KEY);
-					},
-					closeOnClick: true,
-					customClass: 'clickable',
-					type: 'warning',
-					duration: 0,
-				});
-			}
-		},
-	},
-});
diff --git a/packages/editor-ui/src/mixins/nodeBase.ts b/packages/editor-ui/src/mixins/nodeBase.ts
index 79f95814ff426..2852021bb0c31 100644
--- a/packages/editor-ui/src/mixins/nodeBase.ts
+++ b/packages/editor-ui/src/mixins/nodeBase.ts
@@ -1,21 +1,74 @@
+import { defineComponent } from 'vue';
 import type { PropType } from 'vue';
-import mixins from 'vue-typed-mixins';
+import { mapStores } from 'pinia';
+
 import type { INodeUi } from '@/Interface';
-import { deviceSupportHelpers } from '@/mixins/deviceSupportHelpers';
-import { NO_OP_NODE_TYPE } from '@/constants';
+import {
+	NO_OP_NODE_TYPE,
+	NODE_CONNECTION_TYPE_ALLOW_MULTIPLE,
+	NODE_INSERT_SPACER_BETWEEN_INPUT_GROUPS,
+	NODE_MIN_INPUT_ITEMS_COUNT,
+} from '@/constants';
 
-import type { INodeTypeDescription } from 'n8n-workflow';
-import { mapStores } from 'pinia';
-import { useUIStore } from '@/stores/ui';
-import { useWorkflowsStore } from '@/stores/workflows';
-import { useNodeTypesStore } from '@/stores/nodeTypes';
+import { NodeHelpers, NodeConnectionType } from 'n8n-workflow';
+import type {
+	ConnectionTypes,
+	INodeInputConfiguration,
+	INodeTypeDescription,
+	INodeOutputConfiguration,
+	Workflow,
+} from 'n8n-workflow';
+import { useUIStore } from '@/stores/ui.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import type { BrowserJsPlumbInstance } from '@jsplumb/browser-ui';
 import type { Endpoint, EndpointOptions } from '@jsplumb/core';
 import * as NodeViewUtils from '@/utils/nodeViewUtils';
-import { useHistoryStore } from '@/stores/history';
-import { useCanvasStore } from '@/stores/canvas';
+import { useHistoryStore } from '@/stores/history.store';
+import { useCanvasStore } from '@/stores/canvas.store';
+import type { EndpointSpec } from '@jsplumb/common';
+import { useDeviceSupport } from 'n8n-design-system';
+import type { N8nEndpointLabelLength } from '@/plugins/jsplumb/N8nPlusEndpointType';
+
+const createAddInputEndpointSpec = (
+	connectionName: NodeConnectionType,
+	color: string,
+): EndpointSpec => {
+	const multiple = NODE_CONNECTION_TYPE_ALLOW_MULTIPLE.includes(connectionName);
 
-export const nodeBase = mixins(deviceSupportHelpers).extend({
+	return {
+		type: 'N8nAddInput',
+		options: {
+			width: 24,
+			height: 72,
+			color,
+			multiple,
+		},
+	};
+};
+
+const createDiamondOutputEndpointSpec = (): EndpointSpec => ({
+	type: 'Rectangle',
+	options: {
+		height: 10,
+		width: 10,
+		cssClass: 'diamond-output-endpoint',
+	},
+});
+
+const getEndpointLabelLength = (length: number): N8nEndpointLabelLength => {
+	if (length <= 2) return 'small';
+	else if (length <= 6) return 'medium';
+	return 'large';
+};
+
+export const nodeBase = defineComponent({
+	data() {
+		return {
+			inputs: [] as Array<ConnectionTypes | INodeInputConfiguration>,
+			outputs: [] as Array<ConnectionTypes | INodeOutputConfiguration>,
+		};
+	},
 	mounted() {
 		// Initialize the node
 		if (this.data !== null) {
@@ -39,6 +92,7 @@ export const nodeBase = mixins(deviceSupportHelpers).extend({
 	props: {
 		name: {
 			type: String,
+			required: true,
 		},
 		instance: {
 			type: Object as PropType<BrowserJsPlumbInstance>,
@@ -58,6 +112,10 @@ export const nodeBase = mixins(deviceSupportHelpers).extend({
 		showCustomTooltip: {
 			type: Boolean,
 		},
+		workflow: {
+			type: Object as () => Workflow,
+			required: true,
+		},
 	},
 	methods: {
 		__addEndpointTestingData(endpoint: Endpoint, type: string, inputIndex: number) {
@@ -70,59 +128,151 @@ export const nodeBase = mixins(deviceSupportHelpers).extend({
 		},
 		__addInputEndpoints(node: INodeUi, nodeTypeData: INodeTypeDescription) {
 			// Add Inputs
-			let index;
-			const indexData: {
+			const rootTypeIndexData: {
 				[key: string]: number;
 			} = {};
+			const typeIndexData: {
+				[key: string]: number;
+			} = {};
+
+			const inputs: Array<ConnectionTypes | INodeInputConfiguration> =
+				NodeHelpers.getNodeInputs(this.workflow, this.data!, nodeTypeData) || [];
+			this.inputs = inputs;
+
+			const sortedInputs = [...inputs];
+			sortedInputs.sort((a, b) => {
+				if (typeof a === 'string') {
+					return 1;
+				} else if (typeof b === 'string') {
+					return -1;
+				}
+
+				if (a.required && !b.required) {
+					return -1;
+				} else if (!a.required && b.required) {
+					return 1;
+				}
+
+				return 0;
+			});
+
+			sortedInputs.forEach((value, i) => {
+				let inputConfiguration: INodeInputConfiguration;
+				if (typeof value === 'string') {
+					inputConfiguration = {
+						type: value,
+					};
+				} else {
+					inputConfiguration = value;
+				}
+
+				const inputName: ConnectionTypes = inputConfiguration.type;
+
+				const rootCategoryInputName =
+					inputName === NodeConnectionType.Main ? NodeConnectionType.Main : 'other';
 
-			nodeTypeData.inputs.forEach((inputName: string, i: number) => {
 				// Increment the index for inputs with current name
-				if (indexData.hasOwnProperty(inputName)) {
-					indexData[inputName]++;
+				if (rootTypeIndexData.hasOwnProperty(rootCategoryInputName)) {
+					rootTypeIndexData[rootCategoryInputName]++;
+				} else {
+					rootTypeIndexData[rootCategoryInputName] = 0;
+				}
+
+				if (typeIndexData.hasOwnProperty(inputName)) {
+					typeIndexData[inputName]++;
 				} else {
-					indexData[inputName] = 0;
+					typeIndexData[inputName] = 0;
 				}
-				index = indexData[inputName];
+
+				const rootTypeIndex = rootTypeIndexData[rootCategoryInputName];
+				const typeIndex = typeIndexData[inputName];
+
+				const inputsOfSameRootType = inputs.filter((inputData) => {
+					const thisInputName: string = typeof inputData === 'string' ? inputData : inputData.type;
+					return inputName === NodeConnectionType.Main
+						? thisInputName === NodeConnectionType.Main
+						: thisInputName !== NodeConnectionType.Main;
+				});
+
+				const nonMainInputs = inputsOfSameRootType.filter((inputData) => {
+					return inputData !== NodeConnectionType.Main;
+				});
+				const requiredNonMainInputs = nonMainInputs.filter((inputData) => {
+					return typeof inputData !== 'string' && inputData.required;
+				});
+				const optionalNonMainInputs = nonMainInputs.filter((inputData) => {
+					return typeof inputData !== 'string' && !inputData.required;
+				});
+				const spacerIndexes = this.getSpacerIndexes(
+					requiredNonMainInputs.length,
+					optionalNonMainInputs.length,
+				);
 
 				// Get the position of the anchor depending on how many it has
-				const anchorPosition =
-					NodeViewUtils.ANCHOR_POSITIONS.input[nodeTypeData.inputs.length][index];
+				const anchorPosition = NodeViewUtils.getAnchorPosition(
+					inputName,
+					'input',
+					inputsOfSameRootType.length,
+					spacerIndexes,
+				)[rootTypeIndex];
+
+				const scope = NodeViewUtils.getEndpointScope(inputName as NodeConnectionType);
 
 				const newEndpointData: EndpointOptions = {
-					uuid: NodeViewUtils.getInputEndpointUUID(this.nodeId, index),
+					uuid: NodeViewUtils.getInputEndpointUUID(this.nodeId, inputName, typeIndex),
 					anchor: anchorPosition,
-					maxConnections: -1,
+					// We potentially want to change that in the future to allow people to dynamically
+					// activate and deactivate connected nodes
+					maxConnections: inputConfiguration.maxConnections ?? -1,
 					endpoint: 'Rectangle',
-					paintStyle: NodeViewUtils.getInputEndpointStyle(nodeTypeData, '--color-foreground-xdark'),
-					hoverPaintStyle: NodeViewUtils.getInputEndpointStyle(nodeTypeData, '--color-primary'),
-					source: false,
-					target: !this.isReadOnly && nodeTypeData.inputs.length > 1, // only enabled for nodes with multiple inputs.. otherwise attachment handled by connectionDrag event in NodeView,
+					paintStyle: NodeViewUtils.getInputEndpointStyle(
+						nodeTypeData,
+						'--color-foreground-xdark',
+						inputName,
+					),
+					hoverPaintStyle: NodeViewUtils.getInputEndpointStyle(
+						nodeTypeData,
+						'--color-primary',
+						inputName,
+					),
+					scope: NodeViewUtils.getScope(scope),
+					source: inputName !== NodeConnectionType.Main,
+					target: !this.isReadOnly && inputs.length > 1, // only enabled for nodes with multiple inputs.. otherwise attachment handled by connectionDrag event in NodeView,
 					parameters: {
+						connection: 'target',
 						nodeId: this.nodeId,
 						type: inputName,
-						index,
+						index: typeIndex,
 					},
 					enabled: !this.isReadOnly, // enabled in default case to allow dragging
 					cssClass: 'rect-input-endpoint',
 					dragAllowedWhenFull: true,
-					hoverClass: 'dropHover',
+					hoverClass: 'rect-input-endpoint-hover',
+					...this.__getInputConnectionStyle(inputName, nodeTypeData),
 				};
 
 				const endpoint = this.instance?.addEndpoint(
 					this.$refs[this.data.name] as Element,
 					newEndpointData,
-				);
-				this.__addEndpointTestingData(endpoint, 'input', index);
-				if (nodeTypeData.inputNames) {
+				) as Endpoint;
+				this.__addEndpointTestingData(endpoint, 'input', typeIndex);
+				if (inputConfiguration.displayName || nodeTypeData.inputNames?.[i]) {
 					// Apply input names if they got set
-					endpoint.addOverlay(NodeViewUtils.getInputNameOverlay(nodeTypeData.inputNames[index]));
+					endpoint.addOverlay(
+						NodeViewUtils.getInputNameOverlay(
+							inputConfiguration.displayName || nodeTypeData.inputNames[i],
+							inputName,
+							inputConfiguration.required,
+						),
+					);
 				}
 				if (!Array.isArray(endpoint)) {
 					endpoint.__meta = {
 						nodeName: node.name,
 						nodeId: this.nodeId,
-						index: i,
-						totalEndpoints: nodeTypeData.inputs.length,
+						index: typeIndex,
+						totalEndpoints: inputsOfSameRootType.length,
+						nodeType: node.type,
 					};
 				}
 
@@ -132,71 +282,185 @@ export const nodeBase = mixins(deviceSupportHelpers).extend({
 				//       different to the regular one (have different ids). So that seems to make
 				//       problems when hiding the input-name.
 
-				// if (index === 0 && inputName === 'main') {
+				// if (index === 0 && inputName === NodeConnectionType.Main) {
 				// 	// Make the first main-input the default one to connect to when connection gets dropped on node
 				// 	this.instance.makeTarget(this.nodeId, newEndpointData);
 				// }
 			});
-			if (nodeTypeData.inputs.length === 0) {
+			if (sortedInputs.length === 0) {
 				this.instance.manage(this.$refs[this.data.name] as Element);
 			}
 		},
+		getSpacerIndexes(
+			leftGroupItemsCount: number,
+			rightGroupItemsCount: number,
+			insertSpacerBetweenGroups = NODE_INSERT_SPACER_BETWEEN_INPUT_GROUPS,
+			minItemsCount = NODE_MIN_INPUT_ITEMS_COUNT,
+		): number[] {
+			const spacerIndexes = [];
+
+			if (leftGroupItemsCount > 0 && rightGroupItemsCount > 0) {
+				if (insertSpacerBetweenGroups) {
+					spacerIndexes.push(leftGroupItemsCount);
+				} else if (leftGroupItemsCount + rightGroupItemsCount < minItemsCount) {
+					for (
+						let spacerIndex = leftGroupItemsCount;
+						spacerIndex < minItemsCount - rightGroupItemsCount;
+						spacerIndex++
+					) {
+						spacerIndexes.push(spacerIndex);
+					}
+				}
+			} else {
+				if (
+					leftGroupItemsCount > 0 &&
+					leftGroupItemsCount < minItemsCount &&
+					rightGroupItemsCount === 0
+				) {
+					for (
+						let spacerIndex = 0;
+						spacerIndex < minItemsCount - leftGroupItemsCount;
+						spacerIndex++
+					) {
+						spacerIndexes.push(spacerIndex + leftGroupItemsCount);
+					}
+				} else if (
+					leftGroupItemsCount === 0 &&
+					rightGroupItemsCount > 0 &&
+					rightGroupItemsCount < minItemsCount
+				) {
+					for (
+						let spacerIndex = 0;
+						spacerIndex < minItemsCount - rightGroupItemsCount;
+						spacerIndex++
+					) {
+						spacerIndexes.push(spacerIndex);
+					}
+				}
+			}
+
+			return spacerIndexes;
+		},
 		__addOutputEndpoints(node: INodeUi, nodeTypeData: INodeTypeDescription) {
-			let index;
-			const indexData: {
+			const rootTypeIndexData: {
 				[key: string]: number;
 			} = {};
+			const typeIndexData: {
+				[key: string]: number;
+			} = {};
+
+			this.outputs = NodeHelpers.getNodeOutputs(this.workflow, this.data, nodeTypeData) || [];
+
+			// TODO: There are still a lot of references of "main" in NodesView and
+			//       other locations. So assume there will be more problems
+			let maxLabelLength = 0;
+			const outputConfigurations: INodeOutputConfiguration[] = [];
+			this.outputs.forEach((value, i) => {
+				let outputConfiguration: INodeOutputConfiguration;
+				if (typeof value === 'string') {
+					outputConfiguration = {
+						type: value,
+					};
+				} else {
+					outputConfiguration = value;
+				}
+				if (nodeTypeData.outputNames?.[i]) {
+					outputConfiguration.displayName = nodeTypeData.outputNames[i];
+				}
+
+				if (outputConfiguration.displayName) {
+					maxLabelLength =
+						outputConfiguration.displayName.length > maxLabelLength
+							? outputConfiguration.displayName.length
+							: maxLabelLength;
+				}
+
+				outputConfigurations.push(outputConfiguration);
+			});
+
+			const endpointLabelLength = getEndpointLabelLength(maxLabelLength);
+
+			this.outputs.forEach((value, i) => {
+				const outputConfiguration = outputConfigurations[i];
+
+				const outputName: ConnectionTypes = outputConfiguration.type;
+
+				const rootCategoryOutputName =
+					outputName === NodeConnectionType.Main ? NodeConnectionType.Main : 'other';
 
-			nodeTypeData.outputs.forEach((inputName: string, i: number) => {
 				// Increment the index for outputs with current name
-				if (indexData.hasOwnProperty(inputName)) {
-					indexData[inputName]++;
+				if (rootTypeIndexData.hasOwnProperty(rootCategoryOutputName)) {
+					rootTypeIndexData[rootCategoryOutputName]++;
 				} else {
-					indexData[inputName] = 0;
+					rootTypeIndexData[rootCategoryOutputName] = 0;
 				}
-				index = indexData[inputName];
+
+				if (typeIndexData.hasOwnProperty(outputName)) {
+					typeIndexData[outputName]++;
+				} else {
+					typeIndexData[outputName] = 0;
+				}
+
+				const rootTypeIndex = rootTypeIndexData[rootCategoryOutputName];
+				const typeIndex = typeIndexData[outputName];
+
+				const outputsOfSameRootType = this.outputs.filter((outputData) => {
+					const thisOutputName: string =
+						typeof outputData === 'string' ? outputData : outputData.type;
+					return outputName === NodeConnectionType.Main
+						? thisOutputName === NodeConnectionType.Main
+						: thisOutputName !== NodeConnectionType.Main;
+				});
 
 				// Get the position of the anchor depending on how many it has
-				const anchorPosition =
-					NodeViewUtils.ANCHOR_POSITIONS.output[nodeTypeData.outputs.length][index];
+				const anchorPosition = NodeViewUtils.getAnchorPosition(
+					outputName,
+					'output',
+					outputsOfSameRootType.length,
+				)[rootTypeIndex];
+
+				const scope = NodeViewUtils.getEndpointScope(outputName as NodeConnectionType);
 
 				const newEndpointData: EndpointOptions = {
-					uuid: NodeViewUtils.getOutputEndpointUUID(this.nodeId, index),
+					uuid: NodeViewUtils.getOutputEndpointUUID(this.nodeId, outputName, typeIndex),
 					anchor: anchorPosition,
 					maxConnections: -1,
 					endpoint: {
 						type: 'Dot',
 						options: {
-							radius: nodeTypeData && nodeTypeData.outputs.length > 2 ? 7 : 9,
+							radius: nodeTypeData && outputsOfSameRootType.length > 2 ? 7 : 9,
 						},
 					},
-					paintStyle: NodeViewUtils.getOutputEndpointStyle(
-						nodeTypeData,
-						'--color-foreground-xdark',
-					),
 					hoverPaintStyle: NodeViewUtils.getOutputEndpointStyle(nodeTypeData, '--color-primary'),
+					scope,
 					source: true,
-					target: false,
+					target: outputName !== NodeConnectionType.Main,
 					enabled: !this.isReadOnly,
 					parameters: {
+						connection: 'source',
 						nodeId: this.nodeId,
-						type: inputName,
-						index,
+						type: outputName,
+						index: typeIndex,
 					},
 					hoverClass: 'dot-output-endpoint-hover',
 					connectionsDirected: true,
-					cssClass: 'dot-output-endpoint',
 					dragAllowedWhenFull: false,
+					...this.__getOutputConnectionStyle(outputName, outputConfiguration, nodeTypeData),
 				};
 
 				const endpoint = this.instance.addEndpoint(
 					this.$refs[this.data.name] as Element,
 					newEndpointData,
 				);
-				this.__addEndpointTestingData(endpoint, 'output', index);
-				if (nodeTypeData.outputNames) {
+
+				this.__addEndpointTestingData(endpoint, 'output', typeIndex);
+				if (outputConfiguration.displayName) {
 					// Apply output names if they got set
-					const overlaySpec = NodeViewUtils.getOutputNameOverlay(nodeTypeData.outputNames[index]);
+					const overlaySpec = NodeViewUtils.getOutputNameOverlay(
+						outputConfiguration.displayName,
+						outputName,
+						outputConfiguration?.category,
+					);
 					endpoint.addOverlay(overlaySpec);
 				}
 
@@ -204,14 +468,15 @@ export const nodeBase = mixins(deviceSupportHelpers).extend({
 					endpoint.__meta = {
 						nodeName: node.name,
 						nodeId: this.nodeId,
-						index: i,
-						totalEndpoints: nodeTypeData.outputs.length,
+						index: typeIndex,
+						totalEndpoints: outputsOfSameRootType.length,
+						endpointLabelLength,
 					};
 				}
 
-				if (!this.isReadOnly) {
+				if (!this.isReadOnly && outputName === NodeConnectionType.Main) {
 					const plusEndpointData: EndpointOptions = {
-						uuid: NodeViewUtils.getOutputEndpointUUID(this.nodeId, index),
+						uuid: NodeViewUtils.getOutputEndpointUUID(this.nodeId, outputName, typeIndex),
 						anchor: anchorPosition,
 						maxConnections: -1,
 						endpoint: {
@@ -219,8 +484,9 @@ export const nodeBase = mixins(deviceSupportHelpers).extend({
 							options: {
 								dimensions: 24,
 								connectedEndpoint: endpoint,
-								showOutputLabel: nodeTypeData.outputs.length === 1,
-								size: nodeTypeData.outputs.length >= 3 ? 'small' : 'medium',
+								showOutputLabel: this.outputs.length === 1,
+								size: this.outputs.length >= 3 ? 'small' : 'medium',
+								endpointLabelLength,
 								hoverMessage: this.$locale.baseText('nodeBase.clickToAddNodeOrDragToConnect'),
 							},
 						},
@@ -234,25 +500,33 @@ export const nodeBase = mixins(deviceSupportHelpers).extend({
 							outlineStroke: 'none',
 						},
 						parameters: {
+							connection: 'source',
 							nodeId: this.nodeId,
-							type: inputName,
-							index,
+							type: outputName,
+							index: typeIndex,
+							category: outputConfiguration?.category,
 						},
 						cssClass: 'plus-draggable-endpoint',
 						dragAllowedWhenFull: false,
 					};
+
+					if (outputConfiguration?.category) {
+						plusEndpointData.cssClass = `${plusEndpointData.cssClass} ${outputConfiguration?.category}`;
+					}
+
 					const plusEndpoint = this.instance.addEndpoint(
 						this.$refs[this.data.name] as Element,
 						plusEndpointData,
 					);
-					this.__addEndpointTestingData(plusEndpoint, 'plus', index);
+					this.__addEndpointTestingData(plusEndpoint, 'plus', typeIndex);
 
 					if (!Array.isArray(plusEndpoint)) {
 						plusEndpoint.__meta = {
 							nodeName: node.name,
 							nodeId: this.nodeId,
-							index: i,
-							totalEndpoints: nodeTypeData.outputs.length,
+							index: typeIndex,
+							nodeType: node.type,
+							totalEndpoints: outputsOfSameRootType.length,
 						};
 					}
 				}
@@ -265,14 +539,98 @@ export const nodeBase = mixins(deviceSupportHelpers).extend({
 			this.__addInputEndpoints(node, nodeTypeData);
 			this.__addOutputEndpoints(node, nodeTypeData);
 		},
+		__getEndpointColor(connectionType: ConnectionTypes) {
+			return `--node-type-${connectionType}-color`;
+		},
+		__getInputConnectionStyle(
+			connectionType: ConnectionTypes,
+			nodeTypeData: INodeTypeDescription,
+		): EndpointOptions {
+			if (connectionType === NodeConnectionType.Main) {
+				return {
+					paintStyle: NodeViewUtils.getInputEndpointStyle(
+						nodeTypeData,
+						this.__getEndpointColor(NodeConnectionType.Main),
+						connectionType,
+					),
+				};
+			}
+
+			if (!Object.values(NodeConnectionType).includes(connectionType as NodeConnectionType)) {
+				return {};
+			}
+
+			const createSupplementalConnectionType = (
+				connectionName: ConnectionTypes,
+			): EndpointOptions => ({
+				endpoint: createAddInputEndpointSpec(
+					connectionName as NodeConnectionType,
+					this.__getEndpointColor(connectionName),
+				),
+			});
+
+			return createSupplementalConnectionType(connectionType);
+		},
+		__getOutputConnectionStyle(
+			connectionType: ConnectionTypes,
+			outputConfiguration: INodeOutputConfiguration,
+			nodeTypeData: INodeTypeDescription,
+		): EndpointOptions {
+			const type = 'output';
+
+			const createSupplementalConnectionType = (
+				connectionName: ConnectionTypes,
+			): EndpointOptions => ({
+				endpoint: createDiamondOutputEndpointSpec(),
+				paintStyle: NodeViewUtils.getOutputEndpointStyle(
+					nodeTypeData,
+					this.__getEndpointColor(connectionName),
+				),
+				hoverPaintStyle: NodeViewUtils.getOutputEndpointStyle(
+					nodeTypeData,
+					this.__getEndpointColor(connectionName),
+				),
+			});
+
+			if (connectionType === NodeConnectionType.Main) {
+				if (outputConfiguration.category === 'error') {
+					return {
+						paintStyle: {
+							...NodeViewUtils.getOutputEndpointStyle(
+								nodeTypeData,
+								this.__getEndpointColor(NodeConnectionType.Main),
+							),
+							fill: 'var(--color-danger)',
+						},
+						cssClass: `dot-${type}-endpoint`,
+					};
+				}
+				return {
+					paintStyle: NodeViewUtils.getOutputEndpointStyle(
+						nodeTypeData,
+						this.__getEndpointColor(NodeConnectionType.Main),
+					),
+					cssClass: `dot-${type}-endpoint`,
+				};
+			}
+
+			if (!Object.values(NodeConnectionType).includes(connectionType as NodeConnectionType)) {
+				return {};
+			}
+
+			return createSupplementalConnectionType(connectionType);
+		},
 		touchEnd(e: MouseEvent) {
-			if (this.isTouchDevice) {
+			const deviceSupport = useDeviceSupport();
+			if (deviceSupport.isTouchDevice) {
 				if (this.uiStore.isActionActive('dragActive')) {
 					this.uiStore.removeActiveAction('dragActive');
 				}
 			}
 		},
 		mouseLeftClick(e: MouseEvent) {
+			const deviceSupport = useDeviceSupport();
+
 			// @ts-ignore
 			const path = e.path || (e.composedPath && e.composedPath());
 			for (let index = 0; index < path.length; index++) {
@@ -285,11 +643,11 @@ export const nodeBase = mixins(deviceSupportHelpers).extend({
 				}
 			}
 
-			if (!this.isTouchDevice) {
+			if (!deviceSupport.isTouchDevice) {
 				if (this.uiStore.isActionActive('dragActive')) {
 					this.uiStore.removeActiveAction('dragActive');
 				} else {
-					if (!this.isCtrlKeyPressed(e)) {
+					if (!deviceSupport.isCtrlKeyPressed(e)) {
 						this.$emit('deselectAllNodes');
 					}
 
diff --git a/packages/editor-ui/src/mixins/nodeHelpers.ts b/packages/editor-ui/src/mixins/nodeHelpers.ts
deleted file mode 100644
index 2a959684b9546..0000000000000
--- a/packages/editor-ui/src/mixins/nodeHelpers.ts
+++ /dev/null
@@ -1,600 +0,0 @@
-import { EnableNodeToggleCommand } from './../models/history';
-import { useHistoryStore } from '@/stores/history';
-import {
-	PLACEHOLDER_FILLED_AT_EXECUTION_TIME,
-	CUSTOM_API_CALL_KEY,
-	EnterpriseEditionFeature,
-} from '@/constants';
-
-import type {
-	IBinaryKeyData,
-	ICredentialType,
-	INodeCredentialDescription,
-	INodeCredentialsDetails,
-	INodeExecutionData,
-	INodeIssues,
-	INodeIssueObjectProperty,
-	INodeParameters,
-	INodeProperties,
-	INodeTypeDescription,
-	IRunData,
-	ITaskDataConnections,
-	INode,
-	INodePropertyOptions,
-	IDataObject,
-} from 'n8n-workflow';
-import { NodeHelpers } from 'n8n-workflow';
-
-import type {
-	ICredentialsResponse,
-	INodeUi,
-	INodeUpdatePropertiesInformation,
-	IUser,
-} from '@/Interface';
-
-import { get } from 'lodash-es';
-
-import { isObjectLiteral } from '@/utils';
-import { getCredentialPermissions } from '@/permissions';
-import { mapStores } from 'pinia';
-import { useSettingsStore } from '@/stores/settings';
-import { useUsersStore } from '@/stores/users';
-import { useWorkflowsStore } from '@/stores/workflows';
-import { useNodeTypesStore } from '@/stores/nodeTypes';
-import { useCredentialsStore } from '@/stores/credentials';
-import Vue from 'vue';
-
-export const nodeHelpers = Vue.extend({
-	computed: {
-		...mapStores(
-			useCredentialsStore,
-			useHistoryStore,
-			useNodeTypesStore,
-			useSettingsStore,
-			useWorkflowsStore,
-		),
-	},
-	methods: {
-		hasProxyAuth(node: INodeUi): boolean {
-			return Object.keys(node.parameters).includes('nodeCredentialType');
-		},
-
-		isCustomApiCallSelected(nodeValues: INodeParameters): boolean {
-			const { parameters } = nodeValues;
-
-			if (!isObjectLiteral(parameters)) return false;
-
-			return (
-				(parameters.resource !== undefined && parameters.resource.includes(CUSTOM_API_CALL_KEY)) ||
-				(parameters.operation !== undefined && parameters.operation.includes(CUSTOM_API_CALL_KEY))
-			);
-		},
-
-		// Returns the parameter value
-		getParameterValue(nodeValues: INodeParameters, parameterName: string, path: string) {
-			return get(nodeValues, path ? path + '.' + parameterName : parameterName);
-		},
-
-		// Returns if the given parameter should be displayed or not
-		displayParameter(
-			nodeValues: INodeParameters,
-			parameter: INodeProperties | INodeCredentialDescription,
-			path: string,
-			node: INodeUi | null,
-		) {
-			return NodeHelpers.displayParameterPath(nodeValues, parameter, path, node);
-		},
-
-		// Returns all the issues of the node
-		getNodeIssues(
-			nodeType: INodeTypeDescription | null,
-			node: INodeUi,
-			ignoreIssues?: string[],
-		): INodeIssues | null {
-			const pinDataNodeNames = Object.keys(this.workflowsStore.getPinData || {});
-
-			let nodeIssues: INodeIssues | null = null;
-			ignoreIssues = ignoreIssues || [];
-
-			if (node.disabled === true || pinDataNodeNames.includes(node.name)) {
-				// Ignore issues on disabled and pindata nodes
-				return null;
-			}
-
-			if (nodeType === null) {
-				// Node type is not known
-				if (!ignoreIssues.includes('typeUnknown')) {
-					nodeIssues = {
-						typeUnknown: true,
-					};
-				}
-			} else {
-				// Node type is known
-
-				// Add potential parameter issues
-				if (!ignoreIssues.includes('parameters')) {
-					nodeIssues = NodeHelpers.getNodeParametersIssues(nodeType.properties, node);
-				}
-
-				if (!ignoreIssues.includes('credentials')) {
-					// Add potential credential issues
-					const nodeCredentialIssues = this.getNodeCredentialIssues(node, nodeType);
-					if (nodeIssues === null) {
-						nodeIssues = nodeCredentialIssues;
-					} else {
-						NodeHelpers.mergeIssues(nodeIssues, nodeCredentialIssues);
-					}
-				}
-			}
-
-			if (this.hasNodeExecutionIssues(node) === true && !ignoreIssues.includes('execution')) {
-				if (nodeIssues === null) {
-					nodeIssues = {};
-				}
-				nodeIssues.execution = true;
-			}
-
-			return nodeIssues;
-		},
-
-		// Set the status on all the nodes which produced an error so that it can be
-		// displayed in the node-view
-		hasNodeExecutionIssues(node: INodeUi): boolean {
-			const workflowResultData = this.workflowsStore.getWorkflowRunData;
-
-			if (workflowResultData === null || !workflowResultData.hasOwnProperty(node.name)) {
-				return false;
-			}
-
-			for (const taskData of workflowResultData[node.name]) {
-				if (taskData.error !== undefined) {
-					return true;
-				}
-			}
-
-			return false;
-		},
-
-		reportUnsetCredential(credentialType: ICredentialType) {
-			return {
-				credentials: {
-					[credentialType.name]: [
-						this.$locale.baseText('nodeHelpers.credentialsUnset', {
-							interpolate: {
-								credentialType: credentialType.displayName,
-							},
-						}),
-					],
-				},
-			};
-		},
-
-		// Updates the execution issues.
-		updateNodesExecutionIssues() {
-			const nodes = this.workflowsStore.allNodes;
-
-			for (const node of nodes) {
-				this.workflowsStore.setNodeIssue({
-					node: node.name,
-					type: 'execution',
-					value: this.hasNodeExecutionIssues(node) ? true : null,
-				});
-			}
-		},
-
-		// Updates the credential-issues of the node
-		updateNodeCredentialIssues(node: INodeUi): void {
-			const fullNodeIssues: INodeIssues | null = this.getNodeCredentialIssues(node);
-
-			let newIssues: INodeIssueObjectProperty | null = null;
-			if (fullNodeIssues !== null) {
-				newIssues = fullNodeIssues.credentials!;
-			}
-
-			this.workflowsStore.setNodeIssue({
-				node: node.name,
-				type: 'credentials',
-				value: newIssues,
-			});
-		},
-
-		// Updates the parameter-issues of the node
-		updateNodeParameterIssues(node: INodeUi, nodeType?: INodeTypeDescription): void {
-			if (nodeType === undefined) {
-				nodeType = this.nodeTypesStore.getNodeType(node.type, node.typeVersion);
-			}
-
-			if (nodeType === null) {
-				// Could not find nodeType so can not update issues
-				return;
-			}
-
-			// All data got updated everywhere so update now the issues
-			const fullNodeIssues: INodeIssues | null = NodeHelpers.getNodeParametersIssues(
-				nodeType!.properties,
-				node,
-			);
-
-			let newIssues: INodeIssueObjectProperty | null = null;
-			if (fullNodeIssues !== null) {
-				newIssues = fullNodeIssues.parameters!;
-			}
-
-			this.workflowsStore.setNodeIssue({
-				node: node.name,
-				type: 'parameters',
-				value: newIssues,
-			});
-		},
-
-		// Returns all the credential-issues of the node
-		getNodeCredentialIssues(node: INodeUi, nodeType?: INodeTypeDescription): INodeIssues | null {
-			if (node.disabled) {
-				// Node is disabled
-				return null;
-			}
-
-			if (!nodeType) {
-				nodeType = this.nodeTypesStore.getNodeType(node.type, node.typeVersion);
-			}
-
-			if (!nodeType?.credentials) {
-				// Node does not need any credentials or nodeType could not be found
-				return null;
-			}
-
-			const foundIssues: INodeIssueObjectProperty = {};
-
-			let userCredentials: ICredentialsResponse[] | null;
-			let credentialType: ICredentialType | null;
-			let credentialDisplayName: string;
-			let selectedCredentials: INodeCredentialsDetails;
-
-			const { authentication, genericAuthType, nodeCredentialType } =
-				node.parameters as HttpRequestNode.V2.AuthParams;
-
-			if (
-				authentication === 'genericCredentialType' &&
-				genericAuthType !== '' &&
-				selectedCredsAreUnusable(node, genericAuthType)
-			) {
-				const credential = this.credentialsStore.getCredentialTypeByName(genericAuthType);
-				return this.reportUnsetCredential(credential);
-			}
-
-			if (
-				this.hasProxyAuth(node) &&
-				authentication === 'predefinedCredentialType' &&
-				nodeCredentialType !== '' &&
-				node.credentials !== undefined
-			) {
-				const stored = this.credentialsStore.getCredentialsByType(nodeCredentialType);
-
-				if (selectedCredsDoNotExist(node, nodeCredentialType, stored)) {
-					const credential = this.credentialsStore.getCredentialTypeByName(nodeCredentialType);
-					return this.reportUnsetCredential(credential);
-				}
-			}
-
-			if (
-				this.hasProxyAuth(node) &&
-				authentication === 'predefinedCredentialType' &&
-				nodeCredentialType !== '' &&
-				selectedCredsAreUnusable(node, nodeCredentialType)
-			) {
-				const credential = this.credentialsStore.getCredentialTypeByName(nodeCredentialType);
-				return this.reportUnsetCredential(credential);
-			}
-
-			for (const credentialTypeDescription of nodeType.credentials) {
-				// Check if credentials should be displayed else ignore
-				if (!this.displayParameter(node.parameters, credentialTypeDescription, '', node)) {
-					continue;
-				}
-
-				// Get the display name of the credential type
-				credentialType = this.credentialsStore.getCredentialTypeByName(
-					credentialTypeDescription.name,
-				);
-				if (credentialType === null) {
-					credentialDisplayName = credentialTypeDescription.name;
-				} else {
-					credentialDisplayName = credentialType.displayName;
-				}
-
-				if (!node.credentials || !node.credentials?.[credentialTypeDescription.name]) {
-					// Credentials are not set
-					if (credentialTypeDescription.required) {
-						foundIssues[credentialTypeDescription.name] = [
-							this.$locale.baseText('nodeIssues.credentials.notSet', {
-								interpolate: { type: nodeType.displayName },
-							}),
-						];
-					}
-				} else {
-					// If they are set check if the value is valid
-					selectedCredentials = node.credentials[
-						credentialTypeDescription.name
-					] as INodeCredentialsDetails;
-					if (typeof selectedCredentials === 'string') {
-						selectedCredentials = {
-							id: null,
-							name: selectedCredentials,
-						};
-					}
-
-					const usersStore = useUsersStore();
-					const currentUser = usersStore.currentUser || ({} as IUser);
-					userCredentials = this.credentialsStore
-						.getCredentialsByType(credentialTypeDescription.name)
-						.filter((credential: ICredentialsResponse) => {
-							const permissions = getCredentialPermissions(currentUser, credential);
-							return permissions.use;
-						});
-
-					if (userCredentials === null) {
-						userCredentials = [];
-					}
-
-					if (selectedCredentials.id) {
-						const idMatch = userCredentials.find(
-							(credentialData) => credentialData.id === selectedCredentials.id,
-						);
-						if (idMatch) {
-							continue;
-						}
-					}
-
-					const nameMatches = userCredentials.filter(
-						(credentialData) => credentialData.name === selectedCredentials.name,
-					);
-					if (nameMatches.length > 1) {
-						foundIssues[credentialTypeDescription.name] = [
-							this.$locale.baseText('nodeIssues.credentials.notIdentified', {
-								interpolate: { name: selectedCredentials.name, type: credentialDisplayName },
-							}),
-							this.$locale.baseText('nodeIssues.credentials.notIdentified.hint'),
-						];
-						continue;
-					}
-
-					if (nameMatches.length === 0) {
-						const isCredentialUsedInWorkflow =
-							this.workflowsStore.usedCredentials?.[selectedCredentials.id as string];
-						if (!isCredentialUsedInWorkflow) {
-							foundIssues[credentialTypeDescription.name] = [
-								this.$locale.baseText('nodeIssues.credentials.doNotExist', {
-									interpolate: { name: selectedCredentials.name, type: credentialDisplayName },
-								}),
-								this.$locale.baseText('nodeIssues.credentials.doNotExist.hint'),
-							];
-						}
-					}
-				}
-			}
-
-			// TODO: Could later check also if the node has access to the credentials
-			if (Object.keys(foundIssues).length === 0) {
-				return null;
-			}
-
-			return {
-				credentials: foundIssues,
-			};
-		},
-
-		// Updates the node credential issues
-		updateNodesCredentialsIssues() {
-			const nodes = this.workflowsStore.allNodes;
-			let issues: INodeIssues | null;
-
-			for (const node of nodes) {
-				issues = this.getNodeCredentialIssues(node);
-
-				this.workflowsStore.setNodeIssue({
-					node: node.name,
-					type: 'credentials',
-					value: issues === null ? null : issues.credentials,
-				});
-			}
-		},
-
-		getNodeInputData(node: INodeUi | null, runIndex = 0, outputIndex = 0): INodeExecutionData[] {
-			if (node === null) {
-				return [];
-			}
-
-			if (this.workflowsStore.getWorkflowExecution === null) {
-				return [];
-			}
-			const executionData = this.workflowsStore.getWorkflowExecution.data;
-			if (!executionData || !executionData.resultData) {
-				// unknown status
-				return [];
-			}
-			const runData = executionData.resultData.runData;
-
-			if (
-				runData === null ||
-				runData[node.name] === undefined ||
-				!runData[node.name][runIndex].data ||
-				runData[node.name][runIndex].data === undefined
-			) {
-				return [];
-			}
-
-			return this.getMainInputData(runData[node.name][runIndex].data!, outputIndex);
-		},
-
-		// Returns the data of the main input
-		getMainInputData(
-			connectionsData: ITaskDataConnections,
-			outputIndex: number,
-		): INodeExecutionData[] {
-			if (
-				!connectionsData ||
-				!connectionsData.hasOwnProperty('main') ||
-				connectionsData.main === undefined ||
-				connectionsData.main.length < outputIndex ||
-				connectionsData.main[outputIndex] === null
-			) {
-				return [];
-			}
-			return connectionsData.main[outputIndex] as INodeExecutionData[];
-		},
-
-		// Returns all the binary data of all the entries
-		getBinaryData(
-			workflowRunData: IRunData | null,
-			node: string | null,
-			runIndex: number,
-			outputIndex: number,
-		): IBinaryKeyData[] {
-			if (node === null) {
-				return [];
-			}
-
-			const runData: IRunData | null = workflowRunData;
-
-			if (
-				runData === null ||
-				!runData[node] ||
-				!runData[node][runIndex] ||
-				!runData[node][runIndex].data
-			) {
-				return [];
-			}
-
-			const inputData = this.getMainInputData(runData[node][runIndex].data!, outputIndex);
-
-			const returnData: IBinaryKeyData[] = [];
-			for (let i = 0; i < inputData.length; i++) {
-				if (inputData[i].hasOwnProperty('binary') && inputData[i].binary !== undefined) {
-					returnData.push(inputData[i].binary!);
-				}
-			}
-
-			return returnData;
-		},
-
-		disableNodes(nodes: INodeUi[], trackHistory = false) {
-			if (trackHistory) {
-				this.historyStore.startRecordingUndo();
-			}
-			for (const node of nodes) {
-				const oldState = node.disabled;
-				// Toggle disabled flag
-				const updateInformation = {
-					name: node.name,
-					properties: {
-						disabled: !oldState,
-					} as IDataObject,
-				} as INodeUpdatePropertiesInformation;
-
-				this.$telemetry.track('User set node enabled status', {
-					node_type: node.type,
-					is_enabled: node.disabled,
-					workflow_id: this.workflowsStore.workflowId,
-				});
-
-				this.workflowsStore.updateNodeProperties(updateInformation);
-				this.workflowsStore.clearNodeExecutionData(node.name);
-				this.updateNodeParameterIssues(node);
-				this.updateNodeCredentialIssues(node);
-				if (trackHistory) {
-					this.historyStore.pushCommandToUndo(
-						new EnableNodeToggleCommand(node.name, oldState === true, node.disabled === true),
-					);
-				}
-			}
-			if (trackHistory) {
-				this.historyStore.stopRecordingUndo();
-			}
-		},
-		// @ts-ignore
-		getNodeSubtitle(data, nodeType, workflow): string | undefined {
-			if (!data) {
-				return undefined;
-			}
-
-			if (data.notesInFlow) {
-				return data.notes;
-			}
-
-			if (nodeType !== null && nodeType.subtitle !== undefined) {
-				return workflow.expression.getSimpleParameterValue(
-					data as INode,
-					nodeType.subtitle,
-					'internal',
-					PLACEHOLDER_FILLED_AT_EXECUTION_TIME,
-				) as string | undefined;
-			}
-
-			if (data.parameters.operation !== undefined) {
-				const operation = data.parameters.operation as string;
-				if (nodeType === null) {
-					return operation;
-				}
-
-				const operationData: INodeProperties = nodeType.properties.find(
-					(property: INodeProperties) => {
-						return property.name === 'operation';
-					},
-				);
-				if (operationData === undefined) {
-					return operation;
-				}
-
-				if (operationData.options === undefined) {
-					return operation;
-				}
-
-				const optionData = operationData.options.find((option) => {
-					return (option as INodePropertyOptions).value === data.parameters.operation;
-				});
-				if (optionData === undefined) {
-					return operation;
-				}
-
-				return optionData.name;
-			}
-			return undefined;
-		},
-	},
-});
-
-/**
- * Whether the node has no selected credentials, or none of the node's
- * selected credentials are of the specified type.
- */
-function selectedCredsAreUnusable(node: INodeUi, credentialType: string) {
-	return !node.credentials || !Object.keys(node.credentials).includes(credentialType);
-}
-
-/**
- * Whether the node's selected credentials of the specified type
- * can no longer be found in the database.
- */
-function selectedCredsDoNotExist(
-	node: INodeUi,
-	nodeCredentialType: string,
-	storedCredsByType: ICredentialsResponse[] | null,
-) {
-	if (!node.credentials || !storedCredsByType) return false;
-
-	const selectedCredsByType = node.credentials[nodeCredentialType];
-
-	if (!selectedCredsByType) return false;
-
-	return !storedCredsByType.find((c) => c.id === selectedCredsByType.id);
-}
-
-declare namespace HttpRequestNode {
-	namespace V2 {
-		type AuthParams = {
-			authentication: 'none' | 'genericCredentialType' | 'predefinedCredentialType';
-			genericAuthType: string;
-			nodeCredentialType: string;
-		};
-	}
-}
diff --git a/packages/editor-ui/src/mixins/pinData.ts b/packages/editor-ui/src/mixins/pinData.ts
deleted file mode 100644
index 990d8a2b903bf..0000000000000
--- a/packages/editor-ui/src/mixins/pinData.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-import Vue from 'vue';
-import type { INodeUi } from '@/Interface';
-import type { INodeTypeDescription, IPinData } from 'n8n-workflow';
-import { stringSizeInBytes } from '@/utils';
-import { MAX_WORKFLOW_PINNED_DATA_SIZE, PIN_DATA_NODE_TYPES_DENYLIST } from '@/constants';
-import { mapStores } from 'pinia';
-import { useWorkflowsStore } from '@/stores/workflows';
-
-export interface IPinDataContext {
-	node: INodeUi;
-	nodeType: INodeTypeDescription;
-	$showError(error: Error, title: string): void;
-}
-
-export const pinData = (Vue as Vue.VueConstructor<Vue & IPinDataContext>).extend({
-	computed: {
-		...mapStores(useWorkflowsStore),
-		pinData(): IPinData[string] | undefined {
-			return this.node ? this.workflowsStore.pinDataByNodeName(this.node!.name) : undefined;
-		},
-		hasPinData(): boolean {
-			return !!this.node && typeof this.pinData !== 'undefined';
-		},
-		isPinDataNodeType(): boolean {
-			return (
-				!!this.node &&
-				!this.isMultipleOutputsNodeType &&
-				!PIN_DATA_NODE_TYPES_DENYLIST.includes(this.node.type)
-			);
-		},
-		isMultipleOutputsNodeType(): boolean {
-			return this.nodeType?.outputs.length > 1;
-		},
-	},
-	methods: {
-		isValidPinDataJSON(data: string): boolean {
-			try {
-				JSON.parse(data);
-
-				return true;
-			} catch (error) {
-				const title = this.$locale.baseText('runData.editOutputInvalid');
-
-				const toRemove = new RegExp(/JSON\.parse:|of the JSON data/, 'g');
-				const message = error.message.replace(toRemove, '').trim();
-				const positionMatchRegEx = /at position (\d+)/;
-				const positionMatch = error.message.match(positionMatchRegEx);
-
-				error.message = message.charAt(0).toUpperCase() + message.slice(1);
-				error.message = error.message.replace(
-					"Unexpected token ' in JSON",
-					this.$locale.baseText('runData.editOutputInvalid.singleQuote'),
-				);
-
-				if (positionMatch) {
-					const position = parseInt(positionMatch[1], 10);
-					const lineBreaksUpToPosition = (data.slice(0, position).match(/\n/g) || []).length;
-
-					error.message = error.message.replace(
-						positionMatchRegEx,
-						this.$locale.baseText('runData.editOutputInvalid.atPosition', {
-							interpolate: {
-								position: `${position}`,
-							},
-						}),
-					);
-
-					error.message = `${this.$locale.baseText('runData.editOutputInvalid.onLine', {
-						interpolate: {
-							line: `${lineBreaksUpToPosition + 1}`,
-						},
-					})} ${error.message}`;
-				}
-
-				this.$showError(error, title);
-
-				return false;
-			}
-		},
-		isValidPinDataSize(data: string | object): boolean {
-			if (typeof data === 'object') data = JSON.stringify(data);
-
-			if (
-				this.workflowsStore.pinDataSize + stringSizeInBytes(data) >
-				MAX_WORKFLOW_PINNED_DATA_SIZE
-			) {
-				this.$showError(
-					new Error(this.$locale.baseText('ndv.pinData.error.tooLarge.description')),
-					this.$locale.baseText('ndv.pinData.error.tooLarge.title'),
-				);
-
-				return false;
-			}
-
-			return true;
-		},
-	},
-});
diff --git a/packages/editor-ui/src/mixins/pushConnection.ts b/packages/editor-ui/src/mixins/pushConnection.ts
deleted file mode 100644
index 6759174e398f9..0000000000000
--- a/packages/editor-ui/src/mixins/pushConnection.ts
+++ /dev/null
@@ -1,586 +0,0 @@
-import type {
-	IExecutionResponse,
-	IExecutionsCurrentSummaryExtended,
-	IPushData,
-	IPushDataExecutionFinished,
-} from '@/Interface';
-
-import { externalHooks } from '@/mixins/externalHooks';
-import { nodeHelpers } from '@/mixins/nodeHelpers';
-import { showMessage } from '@/mixins/showMessage';
-import { useTitleChange } from '@/composables/useTitleChange';
-import { workflowHelpers } from '@/mixins/workflowHelpers';
-
-import type {
-	ExpressionError,
-	IDataObject,
-	INodeTypeNameVersion,
-	IRun,
-	IRunExecutionData,
-	IWorkflowBase,
-	SubworkflowOperationError,
-} from 'n8n-workflow';
-import { TelemetryHelpers } from 'n8n-workflow';
-
-import mixins from 'vue-typed-mixins';
-import { WORKFLOW_SETTINGS_MODAL_KEY } from '@/constants';
-import { getTriggerNodeServiceName } from '@/utils';
-import { codeNodeEditorEventBus } from '@/event-bus';
-import { mapStores } from 'pinia';
-import { useUIStore } from '@/stores/ui';
-import { useWorkflowsStore } from '@/stores/workflows';
-import { useNodeTypesStore } from '@/stores/nodeTypes';
-import { useCredentialsStore } from '@/stores/credentials';
-import { useSettingsStore } from '@/stores/settings';
-import { parse } from 'flatted';
-import { useSegment } from '@/stores/segment';
-
-export const pushConnection = mixins(
-	externalHooks,
-	nodeHelpers,
-	showMessage,
-	workflowHelpers,
-).extend({
-	setup() {
-		return {
-			...useTitleChange(),
-		};
-	},
-	data() {
-		return {
-			pushSource: null as WebSocket | EventSource | null,
-			reconnectTimeout: null as NodeJS.Timeout | null,
-			retryTimeout: null as NodeJS.Timeout | null,
-			pushMessageQueue: [] as Array<{ event: Event; retriesLeft: number }>,
-			connectRetries: 0,
-			lostConnection: false,
-		};
-	},
-	computed: {
-		...mapStores(
-			useCredentialsStore,
-			useNodeTypesStore,
-			useUIStore,
-			useWorkflowsStore,
-			useSettingsStore,
-			useSegment,
-		),
-		sessionId(): string {
-			return this.rootStore.sessionId;
-		},
-	},
-	methods: {
-		attemptReconnect() {
-			this.pushConnect();
-		},
-
-		/**
-		 * Connect to server to receive data via a WebSocket or EventSource
-		 */
-		pushConnect(): void {
-			// always close the previous connection so that we do not end up with multiple connections
-			this.pushDisconnect();
-
-			if (this.reconnectTimeout) {
-				clearTimeout(this.reconnectTimeout);
-				this.reconnectTimeout = null;
-			}
-
-			const useWebSockets = this.settingsStore.pushBackend === 'websocket';
-
-			const { getRestUrl: restUrl } = this.rootStore;
-			const url = `/push?sessionId=${this.sessionId}`;
-
-			if (useWebSockets) {
-				const { protocol, host } = window.location;
-				const baseUrl = restUrl.startsWith('http')
-					? restUrl.replace(/^http/, 'ws')
-					: `${protocol === 'https:' ? 'wss' : 'ws'}://${host + restUrl}`;
-				this.pushSource = new WebSocket(`${baseUrl}${url}`);
-			} else {
-				this.pushSource = new EventSource(`${restUrl}${url}`, { withCredentials: true });
-			}
-
-			this.pushSource.addEventListener('open', this.onConnectionSuccess, false);
-			this.pushSource.addEventListener('message', this.pushMessageReceived, false);
-			this.pushSource.addEventListener(
-				useWebSockets ? 'close' : 'error',
-				this.onConnectionError,
-				false,
-			);
-		},
-
-		onConnectionSuccess() {
-			this.connectRetries = 0;
-			this.lostConnection = false;
-			this.rootStore.pushConnectionActive = true;
-			this.clearAllStickyNotifications();
-			this.pushSource?.removeEventListener('open', this.onConnectionSuccess);
-		},
-
-		onConnectionError() {
-			this.pushDisconnect();
-			this.connectRetries++;
-			this.reconnectTimeout = setTimeout(
-				this.attemptReconnect,
-				Math.min(this.connectRetries * 3000, 30000), // maximum 30 seconds backoff
-			);
-		},
-
-		/**
-		 * Close connection to server
-		 */
-		pushDisconnect(): void {
-			if (this.pushSource !== null) {
-				this.pushSource.removeEventListener('error', this.onConnectionError);
-				this.pushSource.removeEventListener('close', this.onConnectionError);
-				this.pushSource.removeEventListener('message', this.pushMessageReceived);
-				if (this.pushSource.readyState < 2) this.pushSource.close();
-				this.pushSource = null;
-			}
-
-			this.rootStore.pushConnectionActive = false;
-		},
-
-		/**
-		 * Sometimes the push message is faster as the result from
-		 * the REST API so we do not know yet what execution ID
-		 * is currently active. So internally resend the message
-		 * a few more times
-		 */
-		queuePushMessage(event: Event, retryAttempts: number) {
-			this.pushMessageQueue.push({ event, retriesLeft: retryAttempts });
-
-			if (this.retryTimeout === null) {
-				this.retryTimeout = setTimeout(this.processWaitingPushMessages, 20);
-			}
-		},
-
-		/**
-		 * Process the push messages which are waiting in the queue
-		 */
-		processWaitingPushMessages() {
-			if (this.retryTimeout !== null) {
-				clearTimeout(this.retryTimeout);
-				this.retryTimeout = null;
-			}
-
-			const queueLength = this.pushMessageQueue.length;
-			for (let i = 0; i < queueLength; i++) {
-				const messageData = this.pushMessageQueue.shift();
-
-				if (this.pushMessageReceived(messageData!.event, true) === false) {
-					// Was not successful
-					messageData!.retriesLeft -= 1;
-
-					if (messageData!.retriesLeft > 0) {
-						// If still retries are left add it back and stop execution
-						this.pushMessageQueue.unshift(messageData!);
-					}
-					break;
-				}
-			}
-
-			if (this.pushMessageQueue.length !== 0 && this.retryTimeout === null) {
-				this.retryTimeout = setTimeout(this.processWaitingPushMessages, 25);
-			}
-		},
-
-		/**
-		 * Process a newly received message
-		 */
-		async pushMessageReceived(event: Event, isRetry?: boolean): Promise<boolean> {
-			const retryAttempts = 5;
-			let receivedData: IPushData;
-			try {
-				// @ts-ignore
-				receivedData = JSON.parse(event.data);
-			} catch (error) {
-				return false;
-			}
-
-			if (receivedData.type === 'sendConsoleMessage') {
-				const pushData = receivedData.data;
-				console.log(pushData.source, ...pushData.messages); // eslint-disable-line no-console
-				return true;
-			}
-
-			if (
-				!['testWebhookReceived'].includes(receivedData.type) &&
-				isRetry !== true &&
-				this.pushMessageQueue.length
-			) {
-				// If there are already messages in the queue add the new one that all of them
-				// get executed in order
-				this.queuePushMessage(event, retryAttempts);
-				return false;
-			}
-
-			if (receivedData.type === 'nodeExecuteAfter' || receivedData.type === 'nodeExecuteBefore') {
-				if (!this.uiStore.isActionActive('workflowRunning')) {
-					// No workflow is running so ignore the messages
-					return false;
-				}
-				const pushData = receivedData.data;
-				if (this.workflowsStore.activeExecutionId !== pushData.executionId) {
-					// The data is not for the currently active execution or
-					// we do not have the execution id yet.
-					if (isRetry !== true) {
-						this.queuePushMessage(event, retryAttempts);
-					}
-					return false;
-				}
-			}
-
-			// recovered execution data is handled like executionFinished data, however for security reasons
-			// we need to fetch the data from the server again rather than push it to all clients
-			let recoveredPushData: IPushDataExecutionFinished | undefined = undefined;
-			if (receivedData.type === 'executionRecovered') {
-				const recoveredExecutionId = receivedData.data?.executionId;
-				const isWorkflowRunning = this.uiStore.isActionActive('workflowRunning');
-				if (isWorkflowRunning && this.workflowsStore.activeExecutionId === recoveredExecutionId) {
-					// pull execution data for the recovered execution from the server
-					const executionData = await this.workflowsStore.fetchExecutionDataById(
-						this.workflowsStore.activeExecutionId,
-					);
-					if (executionData?.data) {
-						// data comes in as 'flatten' object, so we need to parse it
-						executionData.data = parse(
-							executionData.data as unknown as string,
-						) as IRunExecutionData;
-						const iRunExecutionData: IRunExecutionData = {
-							startData: executionData.data?.startData,
-							resultData: executionData.data?.resultData ?? { runData: {} },
-							executionData: executionData.data?.executionData,
-						};
-						if (
-							this.workflowsStore.workflowExecutionData?.workflowId === executionData.workflowId
-						) {
-							const activeRunData =
-								this.workflowsStore.workflowExecutionData?.data?.resultData?.runData;
-							if (activeRunData) {
-								for (const key of Object.keys(activeRunData)) {
-									iRunExecutionData.resultData.runData[key] = activeRunData[key];
-								}
-							}
-						}
-						const iRun: IRun = {
-							data: iRunExecutionData,
-							finished: executionData.finished,
-							mode: executionData.mode,
-							waitTill: executionData.data?.waitTill,
-							startedAt: executionData.startedAt,
-							stoppedAt: executionData.stoppedAt,
-							status: 'crashed',
-						};
-						if (executionData.data) {
-							recoveredPushData = {
-								executionId: executionData.id,
-								data: iRun,
-							};
-						}
-					}
-				}
-			}
-
-			if (receivedData.type === 'executionFinished' || receivedData.type === 'executionRecovered') {
-				// The workflow finished executing
-				let pushData: IPushDataExecutionFinished;
-				if (receivedData.type === 'executionRecovered' && recoveredPushData !== undefined) {
-					pushData = recoveredPushData as IPushDataExecutionFinished;
-				} else {
-					pushData = receivedData.data as IPushDataExecutionFinished;
-				}
-
-				if (this.workflowsStore.activeExecutionId === pushData.executionId) {
-					const activeRunData =
-						this.workflowsStore.workflowExecutionData?.data?.resultData?.runData;
-					if (activeRunData) {
-						for (const key of Object.keys(activeRunData)) {
-							if (
-								pushData.data.data.resultData.runData[key]?.[0]?.data?.main?.[0]?.[0]?.json
-									?.isArtificialRecoveredEventItem === true &&
-								activeRunData[key].length > 0
-							)
-								pushData.data.data.resultData.runData[key] = activeRunData[key];
-						}
-					}
-					this.workflowsStore.finishActiveExecution(pushData);
-				}
-
-				if (!this.uiStore.isActionActive('workflowRunning')) {
-					// No workflow is running so ignore the messages
-					return false;
-				}
-
-				if (this.workflowsStore.activeExecutionId !== pushData.executionId) {
-					// The workflow which did finish execution did either not get started
-					// by this session or we do not have the execution id yet.
-					if (isRetry !== true) {
-						this.queuePushMessage(event, retryAttempts);
-					}
-					return false;
-				}
-
-				const runDataExecuted = pushData.data;
-
-				let runDataExecutedErrorMessage = this.$getExecutionError(runDataExecuted.data);
-
-				if (pushData.data.status === 'crashed') {
-					runDataExecutedErrorMessage = this.$locale.baseText(
-						'pushConnection.executionFailed.message',
-					);
-				}
-
-				const lineNumber =
-					runDataExecuted &&
-					runDataExecuted.data &&
-					runDataExecuted.data.resultData &&
-					runDataExecuted.data.resultData.error &&
-					runDataExecuted.data.resultData.error.lineNumber;
-
-				codeNodeEditorEventBus.emit('error-line-number', lineNumber || 'final');
-
-				const workflow = this.getCurrentWorkflow();
-				if (runDataExecuted.waitTill !== undefined) {
-					const activeExecutionId = this.workflowsStore.activeExecutionId;
-					const workflowSettings = this.workflowsStore.workflowSettings;
-					const saveManualExecutions = this.rootStore.saveManualExecutions;
-
-					const isSavingExecutions =
-						workflowSettings.saveManualExecutions === undefined
-							? saveManualExecutions
-							: workflowSettings.saveManualExecutions;
-
-					let action;
-					if (!isSavingExecutions) {
-						this.$root.$emit('registerGlobalLinkAction', 'open-settings', async () => {
-							if (this.workflowsStore.isNewWorkflow) await this.saveAsNewWorkflow();
-							this.uiStore.openModal(WORKFLOW_SETTINGS_MODAL_KEY);
-						});
-
-						action =
-							'<a data-action="open-settings">Turn on saving manual executions</a> and run again to see what happened after this node.';
-					} else {
-						action = `<a href="/workflow/${workflow.id}/executions/${activeExecutionId}">View the execution</a> to see what happened after this node.`;
-					}
-
-					// Workflow did start but had been put to wait
-					this.titleSet(workflow.name as string, 'IDLE');
-					this.$showToast({
-						title: 'Workflow started waiting',
-						message: `${action} <a href="https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.wait/" target="_blank">More info</a>`,
-						type: 'success',
-						duration: 0,
-					});
-				} else if (runDataExecuted.finished !== true) {
-					this.titleSet(workflow.name as string, 'ERROR');
-
-					if (
-						runDataExecuted.data.resultData.error?.name === 'ExpressionError' &&
-						(runDataExecuted.data.resultData.error as ExpressionError).context.functionality ===
-							'pairedItem'
-					) {
-						const error = runDataExecuted.data.resultData.error as ExpressionError;
-
-						this.getWorkflowDataToSave().then((workflowData) => {
-							const eventData: IDataObject = {
-								caused_by_credential: false,
-								error_message: error.description,
-								error_title: error.message,
-								error_type: error.context.type,
-								node_graph_string: JSON.stringify(
-									TelemetryHelpers.generateNodesGraph(
-										workflowData as IWorkflowBase,
-										this.getNodeTypes(),
-									).nodeGraph,
-								),
-								workflow_id: this.workflowsStore.workflowId,
-							};
-
-							if (
-								error.context.nodeCause &&
-								['no pairing info', 'invalid pairing info'].includes(error.context.type as string)
-							) {
-								const node = workflow.getNode(error.context.nodeCause as string);
-
-								if (node) {
-									eventData.is_pinned = !!workflow.getPinDataOfNode(node.name);
-									eventData.mode = node.parameters.mode;
-									eventData.node_type = node.type;
-									eventData.operation = node.parameters.operation;
-									eventData.resource = node.parameters.resource;
-								}
-							}
-
-							this.$telemetry.track('Instance FE emitted paired item error', eventData);
-						});
-					}
-
-					if (runDataExecuted.data.resultData.error?.name === 'SubworkflowOperationError') {
-						const error = runDataExecuted.data.resultData.error as SubworkflowOperationError;
-
-						this.workflowsStore.subWorkflowExecutionError = error;
-
-						this.$showMessage({
-							title: error.message,
-							message: error.description,
-							type: 'error',
-							duration: 0,
-						});
-					} else {
-						let title: string;
-						if (runDataExecuted.data.resultData.lastNodeExecuted) {
-							title = `Problem in node ‘${runDataExecuted.data.resultData.lastNodeExecuted}‘`;
-						} else {
-							title = 'Problem executing workflow';
-						}
-
-						this.$showMessage({
-							title,
-							message: runDataExecutedErrorMessage,
-							type: 'error',
-							duration: 0,
-						});
-					}
-				} else {
-					// Workflow did execute without a problem
-					this.titleSet(workflow.name as string, 'IDLE');
-
-					const execution = this.workflowsStore.getWorkflowExecution;
-					if (execution && execution.executedNode) {
-						const node = this.workflowsStore.getNodeByName(execution.executedNode);
-						const nodeType = node && this.nodeTypesStore.getNodeType(node.type, node.typeVersion);
-						const nodeOutput =
-							execution &&
-							execution.executedNode &&
-							execution.data &&
-							execution.data.resultData &&
-							execution.data.resultData.runData &&
-							execution.data.resultData.runData[execution.executedNode];
-						if (node && nodeType && !nodeOutput) {
-							this.$showMessage({
-								title: this.$locale.baseText('pushConnection.pollingNode.dataNotFound', {
-									interpolate: {
-										service: getTriggerNodeServiceName(nodeType),
-									},
-								}),
-								message: this.$locale.baseText('pushConnection.pollingNode.dataNotFound.message', {
-									interpolate: {
-										service: getTriggerNodeServiceName(nodeType),
-									},
-								}),
-								type: 'success',
-							});
-						} else {
-							this.$showMessage({
-								title: this.$locale.baseText('pushConnection.nodeExecutedSuccessfully'),
-								type: 'success',
-							});
-						}
-					} else {
-						this.$showMessage({
-							title: this.$locale.baseText('pushConnection.workflowExecutedSuccessfully'),
-							type: 'success',
-						});
-					}
-				}
-
-				// It does not push the runData as it got already pushed with each
-				// node that did finish. For that reason copy in here the data
-				// which we already have.
-				if (this.workflowsStore.getWorkflowRunData) {
-					runDataExecuted.data.resultData.runData = this.workflowsStore.getWorkflowRunData;
-				}
-
-				this.workflowsStore.executingNode = null;
-				this.workflowsStore.setWorkflowExecutionData(runDataExecuted as IExecutionResponse);
-				this.uiStore.removeActiveAction('workflowRunning');
-
-				// Set the node execution issues on all the nodes which produced an error so that
-				// it can be displayed in the node-view
-				this.updateNodesExecutionIssues();
-
-				const lastNodeExecuted: string | undefined =
-					runDataExecuted.data.resultData.lastNodeExecuted;
-				let itemsCount = 0;
-				if (
-					lastNodeExecuted &&
-					runDataExecuted.data.resultData.runData[lastNodeExecuted as string] &&
-					!runDataExecutedErrorMessage
-				) {
-					itemsCount =
-						runDataExecuted.data.resultData.runData[lastNodeExecuted as string][0].data!.main[0]!
-							.length;
-				}
-
-				this.$externalHooks().run('pushConnection.executionFinished', {
-					itemsCount,
-					nodeName: runDataExecuted.data.resultData.lastNodeExecuted,
-					errorMessage: runDataExecutedErrorMessage,
-					runDataExecutedStartData: runDataExecuted.data.startData,
-					resultDataError: runDataExecuted.data.resultData.error,
-				});
-				if (!runDataExecuted.data.resultData.error) {
-					this.segmentStore.trackSuccessfulWorkflowExecution(runDataExecuted);
-				}
-			} else if (receivedData.type === 'executionStarted') {
-				const pushData = receivedData.data;
-
-				const executionData: IExecutionsCurrentSummaryExtended = {
-					id: pushData.executionId,
-					finished: false,
-					mode: pushData.mode,
-					startedAt: pushData.startedAt,
-					retryOf: pushData.retryOf,
-					workflowId: pushData.workflowId,
-					workflowName: pushData.workflowName,
-				};
-
-				this.workflowsStore.addActiveExecution(executionData);
-			} else if (receivedData.type === 'nodeExecuteAfter') {
-				// A node finished to execute. Add its data
-				const pushData = receivedData.data;
-				this.workflowsStore.addNodeExecutionData(pushData);
-			} else if (receivedData.type === 'nodeExecuteBefore') {
-				// A node started to be executed. Set it as executing.
-				const pushData = receivedData.data;
-				this.workflowsStore.executingNode = pushData.nodeName;
-			} else if (receivedData.type === 'testWebhookDeleted') {
-				// A test-webhook was deleted
-				const pushData = receivedData.data;
-
-				if (pushData.workflowId === this.workflowsStore.workflowId) {
-					this.workflowsStore.executionWaitingForWebhook = false;
-					this.uiStore.removeActiveAction('workflowRunning');
-				}
-			} else if (receivedData.type === 'testWebhookReceived') {
-				// A test-webhook did get called
-				const pushData = receivedData.data;
-
-				if (pushData.workflowId === this.workflowsStore.workflowId) {
-					this.workflowsStore.executionWaitingForWebhook = false;
-					this.workflowsStore.activeExecutionId = pushData.executionId;
-				}
-
-				this.processWaitingPushMessages();
-			} else if (receivedData.type === 'reloadNodeType') {
-				this.nodeTypesStore.getNodeTypes();
-				this.nodeTypesStore.getFullNodesProperties([receivedData.data]);
-			} else if (receivedData.type === 'removeNodeType') {
-				const pushData = receivedData.data;
-
-				const nodesToBeRemoved: INodeTypeNameVersion[] = [pushData];
-
-				// Force reload of all credential types
-				this.credentialsStore.fetchCredentialTypes(false).then(() => {
-					this.nodeTypesStore.removeNodeTypes(nodesToBeRemoved);
-				});
-			} else if (receivedData.type === 'nodeDescriptionUpdated') {
-				this.nodeTypesStore.getNodeTypes();
-				this.credentialsStore.fetchCredentialTypes(true);
-			}
-			return true;
-		},
-	},
-});
diff --git a/packages/editor-ui/src/mixins/showMessage.ts b/packages/editor-ui/src/mixins/showMessage.ts
deleted file mode 100644
index 47f4f4973599d..0000000000000
--- a/packages/editor-ui/src/mixins/showMessage.ts
+++ /dev/null
@@ -1,243 +0,0 @@
-// @ts-ignore
-import type { ElNotificationComponent, ElNotificationOptions } from 'element-ui/types/notification';
-import mixins from 'vue-typed-mixins';
-
-import { externalHooks } from '@/mixins/externalHooks';
-import type { IExecuteContextData, IRunExecutionData } from 'n8n-workflow';
-import type { ElMessageBoxOptions } from 'element-ui/types/message-box';
-import type { ElMessageComponent, ElMessageOptions, MessageType } from 'element-ui/types/message';
-import { sanitizeHtml } from '@/utils';
-import { mapStores } from 'pinia';
-import { useWorkflowsStore } from '@/stores/workflows';
-
-let stickyNotificationQueue: ElNotificationComponent[] = [];
-
-export const showMessage = mixins(externalHooks).extend({
-	computed: {
-		...mapStores(useWorkflowsStore),
-	},
-	methods: {
-		$showMessage(
-			messageData: Omit<ElNotificationOptions, 'message'> & { message?: string },
-			track = true,
-		) {
-			messageData.dangerouslyUseHTMLString = true;
-			messageData.message = messageData.message
-				? sanitizeHtml(messageData.message)
-				: messageData.message;
-
-			if (messageData.position === undefined) {
-				messageData.position = 'bottom-right';
-			}
-
-			const notification = this.$notify(messageData as ElNotificationOptions);
-
-			if (messageData.duration === 0) {
-				stickyNotificationQueue.push(notification);
-			}
-
-			if (messageData.type === 'error' && track) {
-				this.$telemetry.track('Instance FE emitted error', {
-					error_title: messageData.title,
-					error_message: messageData.message,
-					caused_by_credential: this.causedByCredential(messageData.message),
-					workflow_id: this.workflowsStore.workflowId,
-				});
-			}
-
-			return notification;
-		},
-
-		$showToast(config: {
-			title: string;
-			message: string;
-			onClick?: () => void;
-			onClose?: () => void;
-			duration?: number;
-			customClass?: string;
-			closeOnClick?: boolean;
-			type?: MessageType;
-		}) {
-			// eslint-disable-next-line prefer-const
-			let notification: ElNotificationComponent;
-			if (config.closeOnClick) {
-				const cb = config.onClick;
-				config.onClick = () => {
-					if (notification) {
-						notification.close();
-					}
-					if (cb) {
-						cb();
-					}
-				};
-			}
-
-			notification = this.$showMessage({
-				title: config.title,
-				message: config.message,
-				onClick: config.onClick,
-				onClose: config.onClose,
-				duration: config.duration,
-				customClass: config.customClass,
-				type: config.type,
-			});
-
-			return notification;
-		},
-
-		$showAlert(config: ElMessageOptions): ElMessageComponent {
-			return this.$message(config);
-		},
-
-		$getExecutionError(data: IRunExecutionData | IExecuteContextData) {
-			const error = data.resultData.error;
-
-			let errorMessage: string;
-
-			if (data.resultData.lastNodeExecuted && error) {
-				errorMessage = error.message || error.description;
-			} else {
-				errorMessage = 'There was a problem executing the workflow!';
-
-				if (error && error.message) {
-					let nodeName: string | undefined;
-					if ('node' in error) {
-						nodeName = typeof error.node === 'string' ? error.node : error.node!.name;
-					}
-
-					const receivedError = nodeName ? `${nodeName}: ${error.message}` : error.message;
-					errorMessage = `There was a problem executing the workflow:<br /><strong>"${receivedError}"</strong>`;
-				}
-			}
-
-			return errorMessage;
-		},
-
-		$showError(e: Error | unknown, title: string, message?: string) {
-			const error = e as Error;
-			const messageLine = message ? `${message}<br/>` : '';
-			this.$showMessage(
-				{
-					title,
-					message: `
-					${messageLine}
-					<i>${error.message}</i>
-					${this.collapsableDetails(error)}`,
-					type: 'error',
-					duration: 0,
-				},
-				false,
-			);
-
-			this.$externalHooks().run('showMessage.showError', {
-				title,
-				message,
-				errorMessage: error.message,
-			});
-
-			this.$telemetry.track('Instance FE emitted error', {
-				error_title: title,
-				error_description: message,
-				error_message: error.message,
-				caused_by_credential: this.causedByCredential(error.message),
-				workflow_id: this.workflowsStore.workflowId,
-			});
-		},
-
-		async confirmMessage(
-			message: string,
-			headline: string,
-			type: MessageType | null = 'warning',
-			confirmButtonText?: string,
-			cancelButtonText?: string,
-		): Promise<boolean> {
-			try {
-				const options: ElMessageBoxOptions = {
-					confirmButtonText: confirmButtonText || this.$locale.baseText('showMessage.ok'),
-					cancelButtonText: cancelButtonText || this.$locale.baseText('showMessage.cancel'),
-					dangerouslyUseHTMLString: true,
-					...(type && { type }),
-				};
-
-				const sanitizedMessage = sanitizeHtml(message);
-				await this.$confirm(sanitizedMessage, headline, options);
-				return true;
-			} catch (e) {
-				return false;
-			}
-		},
-
-		async confirmModal(
-			message: string,
-			headline: string,
-			type: MessageType | null = 'warning',
-			confirmButtonText?: string,
-			cancelButtonText?: string,
-			showClose = false,
-			moreOptions: {
-				showCancelButton?: boolean;
-				beforeClose?: ElMessageBoxOptions['beforeClose'];
-			} = {
-				showCancelButton: true,
-			},
-		): Promise<string | { action: string; done: Function }> {
-			try {
-				const options: ElMessageBoxOptions = {
-					confirmButtonText: confirmButtonText || this.$locale.baseText('showMessage.ok'),
-					cancelButtonText: cancelButtonText || this.$locale.baseText('showMessage.cancel'),
-					dangerouslyUseHTMLString: true,
-					showClose,
-					showCancelButton: moreOptions.showCancelButton,
-					beforeClose: moreOptions.beforeClose,
-					...(type && { type }),
-				};
-
-				const sanitizedMessage = sanitizeHtml(message);
-				await this.$confirm(sanitizedMessage, headline, options);
-				return 'confirmed';
-			} catch (e) {
-				return e as string;
-			}
-		},
-
-		clearAllStickyNotifications() {
-			stickyNotificationQueue.map((notification: ElNotificationComponent) => {
-				if (notification) {
-					notification.close();
-				}
-			});
-
-			stickyNotificationQueue = [];
-		},
-
-		// @ts-ignore
-		collapsableDetails({ description, node }: Error) {
-			if (!description) return '';
-
-			const errorDescription =
-				description.length > 500 ? `${description.slice(0, 500)}...` : description;
-
-			return `
-				<br>
-				<br>
-				<details>
-					<summary
-						style="color: #ff6d5a; font-weight: bold; cursor: pointer;"
-					>
-						${this.$locale.baseText('showMessage.showDetails')}
-					</summary>
-					<p>${node.name}: ${errorDescription}</p>
-				</details>
-			`;
-		},
-
-		/**
-		 * Whether a workflow execution error was caused by a credential issue, as reflected by the error message.
-		 */
-		causedByCredential(message: string | undefined) {
-			if (!message) return false;
-
-			return message.includes('Credentials for') && message.includes('are not set');
-		},
-	},
-});
diff --git a/packages/editor-ui/src/mixins/userHelpers.ts b/packages/editor-ui/src/mixins/userHelpers.ts
index ecf4bd6d9da8a..b45bd676b1339 100644
--- a/packages/editor-ui/src/mixins/userHelpers.ts
+++ b/packages/editor-ui/src/mixins/userHelpers.ts
@@ -1,27 +1,30 @@
-import type { IPermissions } from '@/Interface';
-import { isAuthorized } from '@/utils';
-import { useUsersStore } from '@/stores/users';
 import { defineComponent } from 'vue';
-import type { Route } from 'vue-router';
+import type { RouteLocation } from 'vue-router';
+import { hasPermission } from '@/rbac/permissions';
+import type { RouteConfig } from '@/types/router';
+import type { PermissionTypeOptions } from '@/types/rbac';
 
 export const userHelpers = defineComponent({
 	methods: {
-		canUserAccessRouteByName(name: string): boolean {
-			const { route } = this.$router.resolve({ name });
+		canUserAccessRouteByName(name: string) {
+			const route = this.$router.resolve({ name });
 
 			return this.canUserAccessRoute(route);
 		},
 
-		canUserAccessCurrentRoute(): boolean {
+		canUserAccessCurrentRoute() {
 			return this.canUserAccessRoute(this.$route);
 		},
 
-		canUserAccessRoute(route: Route): boolean {
-			const permissions: IPermissions = route.meta && route.meta.permissions;
-			const usersStore = useUsersStore();
-			const currentUser = usersStore.currentUser;
+		canUserAccessRoute(route: RouteLocation & RouteConfig) {
+			const middleware = route.meta?.middleware;
+			const middlewareOptions = route.meta?.middlewareOptions;
 
-			return permissions && isAuthorized(permissions, currentUser);
+			if (!middleware) {
+				return true;
+			}
+
+			return hasPermission(middleware, middlewareOptions as PermissionTypeOptions | undefined);
 		},
 	},
 });
diff --git a/packages/editor-ui/src/mixins/workflowActivate.ts b/packages/editor-ui/src/mixins/workflowActivate.ts
index 8b1024c75b838..185e8c7bee48c 100644
--- a/packages/editor-ui/src/mixins/workflowActivate.ts
+++ b/packages/editor-ui/src/mixins/workflowActivate.ts
@@ -1,19 +1,30 @@
-import { externalHooks } from '@/mixins/externalHooks';
-import { workflowHelpers } from '@/mixins/workflowHelpers';
-import { showMessage } from '@/mixins/showMessage';
+import { defineComponent } from 'vue';
+import { mapStores } from 'pinia';
+import { useStorage } from '@/composables/useStorage';
+
+import { useToast } from '@/composables/useToast';
 
-import mixins from 'vue-typed-mixins';
 import {
 	LOCAL_STORAGE_ACTIVATION_FLAG,
 	PLACEHOLDER_EMPTY_WORKFLOW_ID,
 	WORKFLOW_ACTIVE_MODAL_KEY,
 } from '@/constants';
-import { mapStores } from 'pinia';
-import { useUIStore } from '@/stores/ui';
-import { useSettingsStore } from '@/stores/settings';
-import { useWorkflowsStore } from '@/stores/workflows';
+import { useUIStore } from '@/stores/ui.store';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useExternalHooks } from '@/composables/useExternalHooks';
+import { useRouter } from 'vue-router';
+import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
 
-export const workflowActivate = mixins(externalHooks, workflowHelpers, showMessage).extend({
+export const workflowActivate = defineComponent({
+	setup() {
+		const router = useRouter();
+		const workflowHelpers = useWorkflowHelpers({ router });
+		return {
+			workflowHelpers,
+			...useToast(),
+		};
+	},
 	data() {
 		return {
 			updatingWorkflowActivation: false,
@@ -25,7 +36,7 @@ export const workflowActivate = mixins(externalHooks, workflowHelpers, showMessa
 	methods: {
 		async activateCurrentWorkflow(telemetrySource?: string) {
 			const workflowId = this.workflowsStore.workflowId;
-			return this.updateWorkflowActivation(workflowId, true, telemetrySource);
+			return await this.updateWorkflowActivation(workflowId, true, telemetrySource);
 		},
 		async updateWorkflowActivation(
 			workflowId: string | undefined,
@@ -33,16 +44,16 @@ export const workflowActivate = mixins(externalHooks, workflowHelpers, showMessa
 			telemetrySource?: string,
 		) {
 			this.updatingWorkflowActivation = true;
-			const nodesIssuesExist = this.workflowsStore.nodesIssuesExist as boolean;
+			const nodesIssuesExist = this.workflowsStore.nodesIssuesExist;
 
 			let currWorkflowId: string | undefined = workflowId;
 			if (!currWorkflowId || currWorkflowId === PLACEHOLDER_EMPTY_WORKFLOW_ID) {
-				const saved = await this.saveCurrentWorkflow();
+				const saved = await this.workflowHelpers.saveCurrentWorkflow();
 				if (!saved) {
 					this.updatingWorkflowActivation = false;
 					return;
 				}
-				currWorkflowId = this.workflowsStore.workflowId as string;
+				currWorkflowId = this.workflowsStore.workflowId;
 			}
 			const isCurrentWorkflow = currWorkflowId === this.workflowsStore.workflowId;
 
@@ -56,11 +67,11 @@ export const workflowActivate = mixins(externalHooks, workflowHelpers, showMessa
 				ndv_input: telemetrySource === 'ndv',
 			};
 			this.$telemetry.track('User set workflow active status', telemetryPayload);
-			this.$externalHooks().run('workflowActivate.updateWorkflowActivation', telemetryPayload);
+			void useExternalHooks().run('workflowActivate.updateWorkflowActivation', telemetryPayload);
 
 			try {
 				if (isWorkflowActive && newActiveState) {
-					this.$showMessage({
+					this.showMessage({
 						title: this.$locale.baseText('workflowActivator.workflowIsActive'),
 						type: 'success',
 					});
@@ -69,8 +80,8 @@ export const workflowActivate = mixins(externalHooks, workflowHelpers, showMessa
 					return;
 				}
 
-				if (isCurrentWorkflow && nodesIssuesExist) {
-					this.$showMessage({
+				if (isCurrentWorkflow && nodesIssuesExist && newActiveState) {
+					this.showMessage({
 						title: this.$locale.baseText(
 							'workflowActivator.showMessage.activeChangedNodesIssuesExistTrue.title',
 						),
@@ -84,10 +95,13 @@ export const workflowActivate = mixins(externalHooks, workflowHelpers, showMessa
 					return;
 				}
 
-				await this.updateWorkflow({ workflowId: currWorkflowId, active: newActiveState });
+				await this.workflowHelpers.updateWorkflow(
+					{ workflowId: currWorkflowId, active: newActiveState },
+					!this.uiStore.stateIsDirty,
+				);
 			} catch (error) {
-				const newStateName = newActiveState === true ? 'activated' : 'deactivated';
-				this.$showError(
+				const newStateName = newActiveState ? 'activated' : 'deactivated';
+				this.showError(
 					error,
 					this.$locale.baseText('workflowActivator.showError.title', {
 						interpolate: { newStateName },
@@ -100,7 +114,7 @@ export const workflowActivate = mixins(externalHooks, workflowHelpers, showMessa
 			const activationEventName = isCurrentWorkflow
 				? 'workflow.activeChangeCurrent'
 				: 'workflow.activeChange';
-			this.$externalHooks().run(activationEventName, {
+			void useExternalHooks().run(activationEventName, {
 				workflowId: currWorkflowId,
 				active: newActiveState,
 			});
@@ -109,13 +123,10 @@ export const workflowActivate = mixins(externalHooks, workflowHelpers, showMessa
 			this.updatingWorkflowActivation = false;
 
 			if (isCurrentWorkflow) {
-				if (
-					newActiveState &&
-					window.localStorage.getItem(LOCAL_STORAGE_ACTIVATION_FLAG) !== 'true'
-				) {
+				if (newActiveState && useStorage(LOCAL_STORAGE_ACTIVATION_FLAG).value !== 'true') {
 					this.uiStore.openModal(WORKFLOW_ACTIVE_MODAL_KEY);
 				} else {
-					this.settingsStore.fetchPromptsData();
+					await this.settingsStore.fetchPromptsData();
 				}
 			}
 		},
diff --git a/packages/editor-ui/src/mixins/workflowHelpers.ts b/packages/editor-ui/src/mixins/workflowHelpers.ts
deleted file mode 100644
index e4f94a2a184a5..0000000000000
--- a/packages/editor-ui/src/mixins/workflowHelpers.ts
+++ /dev/null
@@ -1,991 +0,0 @@
-import {
-	ERROR_TRIGGER_NODE_TYPE,
-	PLACEHOLDER_FILLED_AT_EXECUTION_TIME,
-	PLACEHOLDER_EMPTY_WORKFLOW_ID,
-	START_NODE_TYPE,
-	WEBHOOK_NODE_TYPE,
-	VIEWS,
-	EnterpriseEditionFeature,
-} from '@/constants';
-
-import type {
-	IConnections,
-	IDataObject,
-	INode,
-	INodeExecutionData,
-	INodeIssues,
-	INodeParameters,
-	NodeParameterValue,
-	INodeCredentials,
-	INodeType,
-	INodeTypes,
-	IRunExecutionData,
-	IWorkflowIssues,
-	IWorkflowDataProxyAdditionalKeys,
-	Workflow,
-	IExecuteData,
-	INodeConnection,
-	IWebhookDescription,
-} from 'n8n-workflow';
-import { INodeTypeData, IPinData, NodeHelpers, deepCopy } from 'n8n-workflow';
-
-import type {
-	INodeTypesMaxCount,
-	INodeUi,
-	IWorkflowData,
-	IWorkflowDb,
-	IWorkflowDataUpdate,
-	XYPosition,
-	ITag,
-	TargetItem,
-} from '../Interface';
-
-import { externalHooks } from '@/mixins/externalHooks';
-import { nodeHelpers } from '@/mixins/nodeHelpers';
-import { showMessage } from '@/mixins/showMessage';
-
-import { isEqual } from 'lodash-es';
-
-import mixins from 'vue-typed-mixins';
-import { v4 as uuid } from 'uuid';
-import { getSourceItems } from '@/utils';
-import { mapStores } from 'pinia';
-import { useUIStore } from '@/stores/ui';
-import { useWorkflowsStore } from '@/stores/workflows';
-import { useRootStore } from '@/stores/n8nRootStore';
-import type { IWorkflowSettings } from 'n8n-workflow';
-import { useNDVStore } from '@/stores/ndv';
-import { useTemplatesStore } from '@/stores/templates';
-import { useNodeTypesStore } from '@/stores/nodeTypes';
-import { useWorkflowsEEStore } from '@/stores/workflows.ee';
-import { useUsersStore } from '@/stores/users';
-import type { IPermissions } from '@/permissions';
-import { getWorkflowPermissions } from '@/permissions';
-import type { ICredentialsResponse } from '@/Interface';
-import { useEnvironmentsStore } from '@/stores';
-
-export function resolveParameter(
-	parameter: NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[],
-	opts: {
-		targetItem?: TargetItem;
-		inputNodeName?: string;
-		inputRunIndex?: number;
-		inputBranchIndex?: number;
-	} = {},
-): IDataObject | null {
-	let itemIndex = opts?.targetItem?.itemIndex || 0;
-
-	const inputName = 'main';
-	const activeNode = useNDVStore().activeNode;
-
-	const workflow = getCurrentWorkflow();
-	const workflowRunData = useWorkflowsStore().getWorkflowRunData;
-	let parentNode = workflow.getParentNodes(activeNode!.name, inputName, 1);
-	const executionData = useWorkflowsStore().getWorkflowExecution;
-
-	let runIndexParent = opts?.inputRunIndex ?? 0;
-	const nodeConnection = workflow.getNodeConnectionIndexes(activeNode!.name, parentNode[0]);
-	if (opts.targetItem && opts?.targetItem?.nodeName === activeNode!.name && executionData) {
-		const sourceItems = getSourceItems(executionData, opts.targetItem);
-		if (!sourceItems.length) {
-			return null;
-		}
-		parentNode = [sourceItems[0].nodeName];
-		runIndexParent = sourceItems[0].runIndex;
-		itemIndex = sourceItems[0].itemIndex;
-		if (nodeConnection) {
-			nodeConnection.sourceIndex = sourceItems[0].outputIndex;
-		}
-	} else {
-		parentNode = opts.inputNodeName ? [opts.inputNodeName] : parentNode;
-		if (nodeConnection) {
-			nodeConnection.sourceIndex = opts.inputBranchIndex ?? nodeConnection.sourceIndex;
-		}
-
-		if (opts?.inputRunIndex === undefined && workflowRunData !== null && parentNode.length) {
-			const firstParentWithWorkflowRunData = parentNode.find(
-				(parentNodeName) => workflowRunData[parentNodeName],
-			);
-			if (firstParentWithWorkflowRunData) {
-				runIndexParent = workflowRunData[firstParentWithWorkflowRunData].length - 1;
-			}
-		}
-	}
-
-	let _connectionInputData = connectionInputData(
-		parentNode,
-		activeNode!.name,
-		inputName,
-		runIndexParent,
-		nodeConnection,
-	);
-
-	let runExecutionData: IRunExecutionData;
-	if (executionData === null || !executionData.data) {
-		runExecutionData = {
-			resultData: {
-				runData: {},
-			},
-		};
-	} else {
-		runExecutionData = executionData.data;
-	}
-
-	if (_connectionInputData === null) {
-		_connectionInputData = [];
-	}
-
-	const additionalKeys: IWorkflowDataProxyAdditionalKeys = {
-		$execution: {
-			id: PLACEHOLDER_FILLED_AT_EXECUTION_TIME,
-			mode: 'test',
-			resumeUrl: PLACEHOLDER_FILLED_AT_EXECUTION_TIME,
-		},
-		$vars: useEnvironmentsStore().variablesAsObject,
-
-		// deprecated
-		$executionId: PLACEHOLDER_FILLED_AT_EXECUTION_TIME,
-		$resumeWebhookUrl: PLACEHOLDER_FILLED_AT_EXECUTION_TIME,
-	};
-
-	let runIndexCurrent = opts?.targetItem?.runIndex ?? 0;
-	if (
-		opts?.targetItem === undefined &&
-		workflowRunData !== null &&
-		workflowRunData[activeNode!.name]
-	) {
-		runIndexCurrent = workflowRunData[activeNode!.name].length - 1;
-	}
-	const _executeData = executeData(parentNode, activeNode!.name, inputName, runIndexCurrent);
-
-	return workflow.expression.getParameterValue(
-		parameter,
-		runExecutionData,
-		runIndexCurrent,
-		itemIndex,
-		activeNode!.name,
-		_connectionInputData,
-		'manual',
-		useRootStore().timezone,
-		additionalKeys,
-		_executeData,
-		false,
-	) as IDataObject;
-}
-
-function getCurrentWorkflow(copyData?: boolean): Workflow {
-	return useWorkflowsStore().getCurrentWorkflow(copyData);
-}
-
-function getNodes(): INodeUi[] {
-	return useWorkflowsStore().getNodes();
-}
-
-// Returns a workflow instance.
-function getWorkflow(nodes: INodeUi[], connections: IConnections, copyData?: boolean): Workflow {
-	return useWorkflowsStore().getWorkflow(nodes, connections, copyData);
-}
-
-function getNodeTypes(): INodeTypes {
-	return useWorkflowsStore().getNodeTypes();
-}
-
-// Returns connectionInputData to be able to execute an expression.
-function connectionInputData(
-	parentNode: string[],
-	currentNode: string,
-	inputName: string,
-	runIndex: number,
-	nodeConnection: INodeConnection = { sourceIndex: 0, destinationIndex: 0 },
-): INodeExecutionData[] | null {
-	let connectionInputData: INodeExecutionData[] | null = null;
-	const _executeData = executeData(parentNode, currentNode, inputName, runIndex);
-	if (parentNode.length) {
-		if (
-			!Object.keys(_executeData.data).length ||
-			_executeData.data[inputName].length <= nodeConnection.sourceIndex
-		) {
-			connectionInputData = [];
-		} else {
-			connectionInputData = _executeData.data![inputName][nodeConnection.sourceIndex];
-
-			if (connectionInputData !== null) {
-				// Update the pairedItem information on items
-				connectionInputData = connectionInputData.map((item, itemIndex) => {
-					return {
-						...item,
-						pairedItem: {
-							item: itemIndex,
-							input: nodeConnection.destinationIndex,
-						},
-					};
-				});
-			}
-		}
-	}
-
-	const parentPinData = parentNode.reduce((acc: INodeExecutionData[], parentNodeName, index) => {
-		const pinData = useWorkflowsStore().pinDataByNodeName(parentNodeName);
-
-		if (pinData) {
-			acc.push({
-				json: pinData[0],
-				pairedItem: {
-					item: index,
-					input: 1,
-				},
-			});
-		}
-
-		return acc;
-	}, []);
-
-	if (parentPinData.length > 0) {
-		if (connectionInputData && connectionInputData.length > 0) {
-			parentPinData.forEach((parentPinDataEntry) => {
-				connectionInputData![0].json = {
-					...connectionInputData![0].json,
-					...parentPinDataEntry.json,
-				};
-			});
-		} else {
-			connectionInputData = parentPinData;
-		}
-	}
-
-	return connectionInputData;
-}
-
-function executeData(
-	parentNode: string[],
-	currentNode: string,
-	inputName: string,
-	runIndex: number,
-): IExecuteData {
-	const executeData = {
-		node: {},
-		data: {},
-		source: null,
-	} as IExecuteData;
-
-	if (parentNode.length) {
-		// Add the input data to be able to also resolve the short expression format
-		// which does not use the node name
-		const parentNodeName = parentNode[0];
-
-		const parentPinData = useWorkflowsStore().getPinData![parentNodeName];
-
-		// populate `executeData` from `pinData`
-
-		if (parentPinData) {
-			executeData.data = { main: [parentPinData] };
-			executeData.source = { main: [{ previousNode: parentNodeName }] };
-
-			return executeData;
-		}
-
-		// populate `executeData` from `runData`
-
-		const workflowRunData = useWorkflowsStore().getWorkflowRunData;
-		if (workflowRunData === null) {
-			return executeData;
-		}
-
-		if (
-			!workflowRunData[parentNodeName] ||
-			workflowRunData[parentNodeName].length <= runIndex ||
-			!workflowRunData[parentNodeName][runIndex] ||
-			!workflowRunData[parentNodeName][runIndex].hasOwnProperty('data') ||
-			workflowRunData[parentNodeName][runIndex].data === undefined ||
-			!workflowRunData[parentNodeName][runIndex].data!.hasOwnProperty(inputName)
-		) {
-			executeData.data = {};
-		} else {
-			executeData.data = workflowRunData[parentNodeName][runIndex].data!;
-			if (workflowRunData[currentNode] && workflowRunData[currentNode][runIndex]) {
-				executeData.source = {
-					[inputName]: workflowRunData[currentNode][runIndex].source!,
-				};
-			} else {
-				// The current node did not get executed in UI yet so build data manually
-				executeData.source = {
-					[inputName]: [
-						{
-							previousNode: parentNodeName,
-						},
-					],
-				};
-			}
-		}
-	}
-
-	return executeData;
-}
-
-export const workflowHelpers = mixins(externalHooks, nodeHelpers, showMessage).extend({
-	computed: {
-		...mapStores(
-			useNodeTypesStore,
-			useNDVStore,
-			useRootStore,
-			useTemplatesStore,
-			useWorkflowsStore,
-			useWorkflowsEEStore,
-			useUsersStore,
-			useUIStore,
-		),
-		workflowPermissions(): IPermissions {
-			return getWorkflowPermissions(this.usersStore.currentUser, this.workflowsStore.workflow);
-		},
-	},
-	methods: {
-		resolveParameter,
-		getCurrentWorkflow,
-		getNodes,
-		getWorkflow,
-		getNodeTypes,
-		connectionInputData,
-		executeData,
-
-		// Returns data about nodeTypes which have a "maxNodes" limit set.
-		// For each such type does it return how high the limit is, how many
-		// already exist and the name of this nodes.
-		getNodeTypesMaxCount(): INodeTypesMaxCount {
-			const nodes = this.workflowsStore.allNodes;
-
-			const returnData: INodeTypesMaxCount = {};
-
-			const nodeTypes = this.nodeTypesStore.allNodeTypes;
-			for (const nodeType of nodeTypes) {
-				if (nodeType.maxNodes !== undefined) {
-					returnData[nodeType.name] = {
-						exist: 0,
-						max: nodeType.maxNodes,
-						nodeNames: [],
-					};
-				}
-			}
-
-			for (const node of nodes) {
-				if (returnData[node.type] !== undefined) {
-					returnData[node.type].exist += 1;
-					returnData[node.type].nodeNames.push(node.name);
-				}
-			}
-
-			return returnData;
-		},
-
-		// Returns how many nodes of the given type currently exist
-		getNodeTypeCount(nodeType: string): number {
-			const nodes = this.workflowsStore.allNodes;
-
-			let count = 0;
-
-			for (const node of nodes) {
-				if (node.type === nodeType) {
-					count++;
-				}
-			}
-
-			return count;
-		},
-
-		// Checks if everything in the workflow is complete and ready to be executed
-		checkReadyForExecution(workflow: Workflow, lastNodeName?: string) {
-			let node: INode;
-			let nodeType: INodeType | undefined;
-			let nodeIssues: INodeIssues | null = null;
-			const workflowIssues: IWorkflowIssues = {};
-
-			let checkNodes = Object.keys(workflow.nodes);
-			if (lastNodeName) {
-				checkNodes = workflow.getParentNodes(lastNodeName);
-				checkNodes.push(lastNodeName);
-			} else {
-				// As webhook nodes always take precedence check first
-				// if there are any
-				let checkWebhook: string[] = [];
-				for (const nodeName of Object.keys(workflow.nodes)) {
-					if (
-						workflow.nodes[nodeName].disabled !== true &&
-						workflow.nodes[nodeName].type === WEBHOOK_NODE_TYPE
-					) {
-						checkWebhook = [nodeName, ...checkWebhook, ...workflow.getChildNodes(nodeName)];
-					}
-				}
-
-				if (checkWebhook.length) {
-					checkNodes = checkWebhook;
-				} else {
-					// If no webhook nodes got found try to find another trigger node
-					const startNode = workflow.getStartNode();
-					if (startNode !== undefined) {
-						checkNodes = workflow.getChildNodes(startNode.name);
-						checkNodes.push(startNode.name);
-					}
-				}
-			}
-
-			for (const nodeName of checkNodes) {
-				nodeIssues = null;
-				node = workflow.nodes[nodeName];
-
-				if (node.disabled === true) {
-					// Ignore issues on disabled nodes
-					continue;
-				}
-
-				nodeType = workflow.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
-
-				if (nodeType === undefined) {
-					// Node type is not known
-					nodeIssues = {
-						typeUnknown: true,
-					};
-				} else {
-					nodeIssues = this.getNodeIssues(nodeType.description, node, ['execution']);
-				}
-
-				if (nodeIssues !== null) {
-					workflowIssues[node.name] = nodeIssues;
-				}
-			}
-
-			if (Object.keys(workflowIssues).length === 0) {
-				return null;
-			}
-
-			return workflowIssues;
-		},
-
-		// Returns the currently loaded workflow as JSON.
-		async getWorkflowDataToSave(): Promise<IWorkflowData> {
-			const workflowNodes = this.workflowsStore.allNodes;
-			const workflowConnections = this.workflowsStore.allConnections;
-
-			let nodeData;
-
-			const nodes = [];
-			for (let nodeIndex = 0; nodeIndex < workflowNodes.length; nodeIndex++) {
-				// @ts-ignore
-				nodeData = this.getNodeDataToSave(workflowNodes[nodeIndex]);
-
-				nodes.push(nodeData);
-			}
-
-			const data: IWorkflowData = {
-				name: this.workflowsStore.workflowName,
-				nodes,
-				pinData: this.workflowsStore.getPinData,
-				connections: workflowConnections,
-				active: this.workflowsStore.isWorkflowActive,
-				settings: this.workflowsStore.workflow.settings,
-				tags: this.workflowsStore.workflowTags,
-				versionId: this.workflowsStore.workflow.versionId,
-			};
-
-			const workflowId = this.workflowsStore.workflowId;
-			if (workflowId !== PLACEHOLDER_EMPTY_WORKFLOW_ID) {
-				data.id = workflowId;
-			}
-
-			return data;
-		},
-
-		// Returns all node-types
-		getNodeDataToSave(node: INodeUi): INodeUi {
-			const skipKeys = [
-				'color',
-				'continueOnFail',
-				'credentials',
-				'disabled',
-				'issues',
-				'notes',
-				'parameters',
-				'status',
-			];
-
-			// @ts-ignore
-			const nodeData: INodeUi = {
-				parameters: {},
-			};
-
-			for (const key in node) {
-				if (key.charAt(0) !== '_' && skipKeys.indexOf(key) === -1) {
-					// @ts-ignore
-					nodeData[key] = node[key];
-				}
-			}
-
-			// Get the data of the node type that we can get the default values
-			// TODO: Later also has to care about the node-type-version as defaults could be different
-			const nodeType = this.nodeTypesStore.getNodeType(node.type, node.typeVersion);
-
-			if (nodeType !== null) {
-				// Node-Type is known so we can save the parameters correctly
-				const nodeParameters = NodeHelpers.getNodeParameters(
-					nodeType.properties,
-					node.parameters,
-					false,
-					false,
-					node,
-				);
-				nodeData.parameters = nodeParameters !== null ? nodeParameters : {};
-
-				// Add the node credentials if there are some set and if they should be displayed
-				if (node.credentials !== undefined && nodeType.credentials !== undefined) {
-					const saveCredentials: INodeCredentials = {};
-					for (const nodeCredentialTypeName of Object.keys(node.credentials)) {
-						if (
-							this.hasProxyAuth(node) ||
-							Object.keys(node.parameters).includes('genericAuthType')
-						) {
-							saveCredentials[nodeCredentialTypeName] = node.credentials[nodeCredentialTypeName];
-							continue;
-						}
-
-						const credentialTypeDescription = nodeType.credentials
-							// filter out credentials with same name in different node versions
-							.filter((c) => this.displayParameter(node.parameters, c, '', node))
-							.find((c) => c.name === nodeCredentialTypeName);
-
-						if (credentialTypeDescription === undefined) {
-							// Credential type is not know so do not save
-							continue;
-						}
-
-						if (
-							this.displayParameter(node.parameters, credentialTypeDescription, '', node) === false
-						) {
-							// Credential should not be displayed so do also not save
-							continue;
-						}
-
-						saveCredentials[nodeCredentialTypeName] = node.credentials[nodeCredentialTypeName];
-					}
-
-					// Set credential property only if it has content
-					if (Object.keys(saveCredentials).length !== 0) {
-						nodeData.credentials = saveCredentials;
-					}
-				}
-			} else {
-				// Node-Type is not known so save the data as it is
-				nodeData.credentials = node.credentials;
-				nodeData.parameters = node.parameters;
-				if (nodeData.color !== undefined) {
-					nodeData.color = node.color;
-				}
-			}
-
-			// Save the disabled property and continueOnFail only when is set
-			if (node.disabled === true) {
-				nodeData.disabled = true;
-			}
-			if (node.continueOnFail === true) {
-				nodeData.continueOnFail = true;
-			}
-
-			// Save the notes only if when they contain data
-			if (![undefined, ''].includes(node.notes)) {
-				nodeData.notes = node.notes;
-			}
-
-			return nodeData;
-		},
-
-		getWebhookExpressionValue(webhookData: IWebhookDescription, key: string): string {
-			if (webhookData[key] === undefined) {
-				return 'empty';
-			}
-			try {
-				return this.resolveExpression(webhookData[key] as string) as string;
-			} catch (e) {
-				return this.$locale.baseText('nodeWebhooks.invalidExpression');
-			}
-		},
-
-		getWebhookUrl(webhookData: IWebhookDescription, node: INode, showUrlFor?: string): string {
-			if (webhookData.restartWebhook === true) {
-				return '$execution.resumeUrl';
-			}
-			let baseUrl = this.rootStore.getWebhookUrl;
-			if (showUrlFor === 'test') {
-				baseUrl = this.rootStore.getWebhookTestUrl;
-			}
-
-			const workflowId = this.workflowsStore.workflowId;
-			const path = this.getWebhookExpressionValue(webhookData, 'path');
-			const isFullPath =
-				(this.getWebhookExpressionValue(webhookData, 'isFullPath') as unknown as boolean) || false;
-
-			return NodeHelpers.getNodeWebhookUrl(baseUrl, workflowId, node, path, isFullPath, true);
-		},
-
-		resolveExpression(
-			expression: string,
-			siblingParameters: INodeParameters = {},
-			opts: {
-				targetItem?: TargetItem;
-				inputNodeName?: string;
-				inputRunIndex?: number;
-				inputBranchIndex?: number;
-				c?: number;
-			} = {},
-		) {
-			const parameters = {
-				__xxxxxxx__: expression,
-				...siblingParameters,
-			};
-			const returnData: IDataObject | null = resolveParameter(parameters, opts);
-			if (!returnData) {
-				return null;
-			}
-
-			if (typeof returnData['__xxxxxxx__'] === 'object') {
-				const workflow = getCurrentWorkflow();
-				return workflow.expression.convertObjectValueToString(returnData['__xxxxxxx__'] as object);
-			}
-			return returnData['__xxxxxxx__'];
-		},
-
-		async updateWorkflow({ workflowId, active }: { workflowId: string; active?: boolean }) {
-			let data: IWorkflowDataUpdate = {};
-
-			const isCurrentWorkflow = workflowId === this.workflowsStore.workflowId;
-			if (isCurrentWorkflow) {
-				data = await this.getWorkflowDataToSave();
-			} else {
-				const { versionId } = await this.workflowsStore.fetchWorkflow(workflowId);
-				data.versionId = versionId;
-			}
-
-			if (active !== undefined) {
-				data.active = active;
-			}
-
-			const workflow = await this.workflowsStore.updateWorkflow(workflowId, data);
-			this.workflowsStore.setWorkflowVersionId(workflow.versionId);
-
-			if (isCurrentWorkflow) {
-				this.workflowsStore.setActive(!!workflow.active);
-				this.uiStore.stateIsDirty = false;
-			}
-
-			if (workflow.active) {
-				this.workflowsStore.setWorkflowActive(workflowId);
-			} else {
-				this.workflowsStore.setWorkflowInactive(workflowId);
-			}
-		},
-
-		async saveCurrentWorkflow(
-			{ id, name, tags }: { id?: string; name?: string; tags?: string[] } = {},
-			redirect = true,
-			forceSave = false,
-		): Promise<boolean> {
-			const currentWorkflow = id || this.$route.params.name;
-
-			if (!currentWorkflow || ['new', PLACEHOLDER_EMPTY_WORKFLOW_ID].includes(currentWorkflow)) {
-				return this.saveAsNewWorkflow({ name, tags }, redirect);
-			}
-
-			// Workflow exists already so update it
-			try {
-				this.uiStore.addActiveAction('workflowSaving');
-
-				const workflowDataRequest: IWorkflowDataUpdate = await this.getWorkflowDataToSave();
-
-				if (name) {
-					workflowDataRequest.name = name.trim();
-				}
-
-				if (tags) {
-					workflowDataRequest.tags = tags;
-				}
-
-				workflowDataRequest.versionId = this.workflowsStore.workflowVersionId;
-
-				const workflowData = await this.workflowsStore.updateWorkflow(
-					currentWorkflow,
-					workflowDataRequest,
-					forceSave,
-				);
-				this.workflowsStore.setWorkflowVersionId(workflowData.versionId);
-
-				if (name) {
-					this.workflowsStore.setWorkflowName({ newName: workflowData.name, setStateDirty: false });
-				}
-
-				if (tags) {
-					const createdTags = (workflowData.tags || []) as ITag[];
-					const tagIds = createdTags.map((tag: ITag): string => tag.id);
-					this.workflowsStore.setWorkflowTagIds(tagIds);
-				}
-
-				this.uiStore.stateIsDirty = false;
-				this.uiStore.removeActiveAction('workflowSaving');
-				this.$externalHooks().run('workflow.afterUpdate', { workflowData });
-
-				this.$showMessage({
-					title: 'Changes Saved Successfully',
-					type: 'success',
-				});
-
-				return true;
-			} catch (error) {
-				this.uiStore.removeActiveAction('workflowSaving');
-
-				if (error.errorCode === 100) {
-					this.$telemetry.track('User attempted to save locked workflow', {
-						workflowId: currentWorkflow,
-						sharing_role: this.workflowPermissions.isOwner ? 'owner' : 'sharee',
-					});
-
-					const url = this.$router.resolve({
-						name: VIEWS.WORKFLOW,
-						params: { name: currentWorkflow },
-					}).href;
-
-					const overwrite = await this.confirmMessage(
-						this.$locale.baseText('workflows.concurrentChanges.confirmMessage.message', {
-							interpolate: {
-								url,
-							},
-						}),
-						this.$locale.baseText('workflows.concurrentChanges.confirmMessage.title'),
-						null,
-						this.$locale.baseText('workflows.concurrentChanges.confirmMessage.confirmButtonText'),
-						this.$locale.baseText('workflows.concurrentChanges.confirmMessage.cancelButtonText'),
-					);
-
-					if (overwrite) {
-						return this.saveCurrentWorkflow({ id, name, tags }, redirect, true);
-					}
-
-					return false;
-				}
-
-				this.$showMessage({
-					title: this.$locale.baseText('workflowHelpers.showMessage.title'),
-					message: error.message,
-					type: 'error',
-				});
-
-				return false;
-			}
-		},
-
-		async saveAsNewWorkflow(
-			{
-				name,
-				tags,
-				resetWebhookUrls,
-				resetNodeIds,
-				openInNewWindow,
-				data,
-			}: {
-				name?: string;
-				tags?: string[];
-				resetWebhookUrls?: boolean;
-				openInNewWindow?: boolean;
-				resetNodeIds?: boolean;
-				data?: IWorkflowDataUpdate;
-			} = {},
-			redirect = true,
-		): Promise<boolean> {
-			try {
-				this.uiStore.addActiveAction('workflowSaving');
-
-				const workflowDataRequest: IWorkflowDataUpdate =
-					data || (await this.getWorkflowDataToSave());
-				// make sure that the new ones are not active
-				workflowDataRequest.active = false;
-				const changedNodes = {} as IDataObject;
-
-				if (resetNodeIds) {
-					workflowDataRequest.nodes = workflowDataRequest.nodes!.map((node) => {
-						node.id = uuid();
-
-						return node;
-					});
-				}
-
-				if (resetWebhookUrls) {
-					workflowDataRequest.nodes = workflowDataRequest.nodes!.map((node) => {
-						if (node.webhookId) {
-							node.webhookId = uuid();
-							changedNodes[node.name] = node.webhookId;
-						}
-						return node;
-					});
-				}
-
-				if (name) {
-					workflowDataRequest.name = name.trim();
-				}
-
-				if (tags) {
-					workflowDataRequest.tags = tags;
-				}
-				const workflowData = await this.workflowsStore.createNewWorkflow(workflowDataRequest);
-
-				this.workflowsStore.addWorkflow(workflowData);
-
-				if (
-					this.settingsStore.isEnterpriseFeatureEnabled(EnterpriseEditionFeature.Sharing) &&
-					this.usersStore.currentUser
-				) {
-					this.workflowsEEStore.setWorkflowOwnedBy({
-						workflowId: workflowData.id,
-						ownedBy: this.usersStore.currentUser,
-					});
-				}
-
-				if (openInNewWindow) {
-					const routeData = this.$router.resolve({
-						name: VIEWS.WORKFLOW,
-						params: { name: workflowData.id },
-					});
-					window.open(routeData.href, '_blank');
-					this.uiStore.removeActiveAction('workflowSaving');
-					return true;
-				}
-
-				this.workflowsStore.setActive(workflowData.active || false);
-				this.workflowsStore.setWorkflowId(workflowData.id);
-				this.workflowsStore.setWorkflowVersionId(workflowData.versionId);
-				this.workflowsStore.setWorkflowName({ newName: workflowData.name, setStateDirty: false });
-				this.workflowsStore.setWorkflowSettings((workflowData.settings as IWorkflowSettings) || {});
-				this.uiStore.stateIsDirty = false;
-				Object.keys(changedNodes).forEach((nodeName) => {
-					const changes = {
-						key: 'webhookId',
-						value: changedNodes[nodeName],
-						name: nodeName,
-					};
-					this.workflowsStore.setNodeValue(changes);
-				});
-
-				const createdTags = (workflowData.tags || []) as ITag[];
-				const tagIds = createdTags.map((tag: ITag): string => tag.id);
-				this.workflowsStore.setWorkflowTagIds(tagIds);
-
-				const templateId = this.$route.query.templateId;
-				if (templateId) {
-					this.$telemetry.track('User saved new workflow from template', {
-						template_id: templateId,
-						workflow_id: workflowData.id,
-						wf_template_repo_session_id: this.templatesStore.previousSessionId,
-					});
-				}
-
-				if (redirect) {
-					this.$router.replace({
-						name: VIEWS.WORKFLOW,
-						params: { name: workflowData.id as string, action: 'workflowSave' },
-					});
-				}
-
-				this.uiStore.removeActiveAction('workflowSaving');
-				this.uiStore.stateIsDirty = false;
-				this.$externalHooks().run('workflow.afterUpdate', { workflowData });
-
-				getCurrentWorkflow(true); // refresh cache
-				return true;
-			} catch (e) {
-				this.uiStore.removeActiveAction('workflowSaving');
-
-				this.$showMessage({
-					title: this.$locale.baseText('workflowHelpers.showMessage.title'),
-					message: (e as Error).message,
-					type: 'error',
-				});
-
-				return false;
-			}
-		},
-
-		// Updates the position of all the nodes that the top-left node
-		// is at the given position
-		updateNodePositions(
-			workflowData: IWorkflowData | IWorkflowDataUpdate,
-			position: XYPosition,
-		): void {
-			if (workflowData.nodes === undefined) {
-				return;
-			}
-
-			// Find most top-left node
-			const minPosition = [99999999, 99999999];
-			for (const node of workflowData.nodes) {
-				if (node.position[1] < minPosition[1]) {
-					minPosition[0] = node.position[0];
-					minPosition[1] = node.position[1];
-				} else if (node.position[1] === minPosition[1]) {
-					if (node.position[0] < minPosition[0]) {
-						minPosition[0] = node.position[0];
-						minPosition[1] = node.position[1];
-					}
-				}
-			}
-
-			// Update the position on all nodes so that the
-			// most top-left one is at given position
-			const offsetPosition = [position[0] - minPosition[0], position[1] - minPosition[1]];
-			for (const node of workflowData.nodes) {
-				node.position[0] += offsetPosition[0];
-				node.position[1] += offsetPosition[1];
-			}
-		},
-		async dataHasChanged(id: string) {
-			const currentData = await this.getWorkflowDataToSave();
-
-			const data: IWorkflowDb = await this.workflowsStore.fetchWorkflow(id);
-
-			if (data !== undefined) {
-				const x = {
-					nodes: data.nodes,
-					connections: data.connections,
-					settings: data.settings,
-					name: data.name,
-				};
-				const y = {
-					nodes: currentData.nodes,
-					connections: currentData.connections,
-					settings: currentData.settings,
-					name: currentData.name,
-				};
-				return !isEqual(x, y);
-			}
-
-			return true;
-		},
-
-		removeForeignCredentialsFromWorkflow(
-			workflow: IWorkflowData | IWorkflowDataUpdate,
-			usableCredentials: ICredentialsResponse[],
-		): void {
-			workflow.nodes.forEach((node: INode) => {
-				if (!node.credentials) {
-					return;
-				}
-
-				node.credentials = Object.entries(node.credentials).reduce<INodeCredentials>(
-					(acc, [credentialType, credential]) => {
-						const isUsableCredential = usableCredentials.some(
-							(ownCredential) => `${ownCredential.id}` === `${credential.id}`,
-						);
-						if (credential.id && isUsableCredential) {
-							acc[credentialType] = node.credentials![credentialType];
-						}
-
-						return acc;
-					},
-					{},
-				);
-			});
-		},
-	},
-});
diff --git a/packages/editor-ui/src/mixins/workflowRun.ts b/packages/editor-ui/src/mixins/workflowRun.ts
deleted file mode 100644
index f848ae670a1de..0000000000000
--- a/packages/editor-ui/src/mixins/workflowRun.ts
+++ /dev/null
@@ -1,247 +0,0 @@
-import type { IExecutionPushResponse, IExecutionResponse, IStartRunData } from '@/Interface';
-
-import type { IRunData, IRunExecutionData, IWorkflowBase } from 'n8n-workflow';
-import { NodeHelpers, TelemetryHelpers } from 'n8n-workflow';
-
-import { externalHooks } from '@/mixins/externalHooks';
-import { workflowHelpers } from '@/mixins/workflowHelpers';
-import { showMessage } from '@/mixins/showMessage';
-
-import mixins from 'vue-typed-mixins';
-import { useTitleChange } from '@/composables/useTitleChange';
-import { mapStores } from 'pinia';
-import { useUIStore } from '@/stores/ui';
-import { useWorkflowsStore } from '@/stores/workflows';
-import { useRootStore } from '@/stores/n8nRootStore';
-
-export const workflowRun = mixins(externalHooks, workflowHelpers, showMessage).extend({
-	setup() {
-		return {
-			...useTitleChange(),
-		};
-	},
-	computed: {
-		...mapStores(useRootStore, useUIStore, useWorkflowsStore),
-	},
-	methods: {
-		// Starts to executes a workflow on server.
-		async runWorkflowApi(runData: IStartRunData): Promise<IExecutionPushResponse> {
-			if (this.rootStore.pushConnectionActive === false) {
-				// Do not start if the connection to server is not active
-				// because then it can not receive the data as it executes.
-				throw new Error(this.$locale.baseText('workflowRun.noActiveConnectionToTheServer'));
-			}
-
-			this.workflowsStore.subWorkflowExecutionError = null;
-
-			this.uiStore.addActiveAction('workflowRunning');
-
-			let response: IExecutionPushResponse;
-
-			try {
-				response = await this.workflowsStore.runWorkflow(runData);
-			} catch (error) {
-				this.uiStore.removeActiveAction('workflowRunning');
-				throw error;
-			}
-
-			if (response.executionId !== undefined) {
-				this.workflowsStore.activeExecutionId = response.executionId;
-			}
-
-			if (response.waitingForWebhook === true) {
-				this.workflowsStore.executionWaitingForWebhook = true;
-			}
-
-			return response;
-		},
-		async runWorkflow(
-			nodeName?: string,
-			source?: string,
-		): Promise<IExecutionPushResponse | undefined> {
-			const workflow = this.getCurrentWorkflow();
-
-			if (this.uiStore.isActionActive('workflowRunning')) {
-				return;
-			}
-
-			this.titleSet(workflow.name as string, 'EXECUTING');
-
-			this.clearAllStickyNotifications();
-
-			try {
-				// Check first if the workflow has any issues before execute it
-				const issuesExist = this.workflowsStore.nodesIssuesExist;
-				if (issuesExist === true) {
-					// If issues exist get all of the issues of all nodes
-					const workflowIssues = this.checkReadyForExecution(workflow, nodeName);
-					if (workflowIssues !== null) {
-						const errorMessages = [];
-						let nodeIssues: string[];
-						const trackNodeIssues: Array<{
-							node_type: string;
-							error: string;
-						}> = [];
-						const trackErrorNodeTypes: string[] = [];
-						for (const nodeName of Object.keys(workflowIssues)) {
-							nodeIssues = NodeHelpers.nodeIssuesToString(workflowIssues[nodeName]);
-							let issueNodeType = 'UNKNOWN';
-							const issueNode = this.workflowsStore.getNodeByName(nodeName);
-
-							if (issueNode) {
-								issueNodeType = issueNode.type;
-							}
-
-							trackErrorNodeTypes.push(issueNodeType);
-							const trackNodeIssue = {
-								node_type: issueNodeType,
-								error: '',
-								caused_by_credential: !!workflowIssues[nodeName].credentials,
-							};
-
-							for (const nodeIssue of nodeIssues) {
-								errorMessages.push(`<strong>${nodeName}</strong>: ${nodeIssue}`);
-								trackNodeIssue.error = trackNodeIssue.error.concat(', ', nodeIssue);
-							}
-							trackNodeIssues.push(trackNodeIssue);
-						}
-
-						this.$showMessage({
-							title: this.$locale.baseText('workflowRun.showMessage.title'),
-							message: errorMessages.join('<br />'),
-							type: 'error',
-							duration: 0,
-						});
-						this.titleSet(workflow.name as string, 'ERROR');
-						this.$externalHooks().run('workflowRun.runError', { errorMessages, nodeName });
-
-						this.getWorkflowDataToSave().then((workflowData) => {
-							this.$telemetry.track('Workflow execution preflight failed', {
-								workflow_id: workflow.id,
-								workflow_name: workflow.name,
-								execution_type: nodeName ? 'node' : 'workflow',
-								node_graph_string: JSON.stringify(
-									TelemetryHelpers.generateNodesGraph(
-										workflowData as IWorkflowBase,
-										this.getNodeTypes(),
-									).nodeGraph,
-								),
-								error_node_types: JSON.stringify(trackErrorNodeTypes),
-								errors: JSON.stringify(trackNodeIssues),
-							});
-						});
-						return;
-					}
-				}
-
-				// Get the direct parents of the node
-				let directParentNodes: string[] = [];
-				if (nodeName !== undefined) {
-					directParentNodes = workflow.getParentNodes(nodeName, 'main', 1);
-				}
-
-				const runData = this.workflowsStore.getWorkflowRunData;
-
-				let newRunData: IRunData | undefined;
-
-				const startNodes: string[] = [];
-
-				if (runData !== null && Object.keys(runData).length !== 0) {
-					newRunData = {};
-
-					// Go over the direct parents of the node
-					for (const directParentNode of directParentNodes) {
-						// Go over the parents of that node so that we can get a start
-						// node for each of the branches
-						const parentNodes = workflow.getParentNodes(directParentNode, 'main');
-
-						// Add also the enabled direct parent to be checked
-						if (workflow.nodes[directParentNode].disabled) continue;
-
-						parentNodes.push(directParentNode);
-
-						for (const parentNode of parentNodes) {
-							if (runData[parentNode] === undefined || runData[parentNode].length === 0) {
-								// When we hit a node which has no data we stop and set it
-								// as a start node the execution from and then go on with other
-								// direct input nodes
-								startNodes.push(parentNode);
-								break;
-							}
-							newRunData[parentNode] = runData[parentNode].slice(0, 1);
-						}
-					}
-
-					if (Object.keys(newRunData).length === 0) {
-						// If there is no data for any of the parent nodes make sure
-						// that run data is empty that it runs regularly
-						newRunData = undefined;
-					}
-				}
-
-				if (startNodes.length === 0 && nodeName !== undefined) {
-					startNodes.push(nodeName);
-				}
-
-				const isNewWorkflow = this.workflowsStore.isNewWorkflow;
-				const hasWebhookNode = this.workflowsStore.currentWorkflowHasWebhookNode;
-				if (isNewWorkflow && hasWebhookNode) {
-					await this.saveCurrentWorkflow();
-				}
-
-				const workflowData = await this.getWorkflowDataToSave();
-
-				const startRunData: IStartRunData = {
-					workflowData,
-					runData: newRunData,
-					pinData: workflowData.pinData,
-					startNodes,
-				};
-				if (nodeName) {
-					startRunData.destinationNode = nodeName;
-				}
-
-				// Init the execution data to represent the start of the execution
-				// that data which gets reused is already set and data of newly executed
-				// nodes can be added as it gets pushed in
-				const executionData: IExecutionResponse = {
-					id: '__IN_PROGRESS__',
-					finished: false,
-					mode: 'manual',
-					startedAt: new Date(),
-					stoppedAt: undefined,
-					workflowId: workflow.id,
-					executedNode: nodeName,
-					data: {
-						resultData: {
-							runData: newRunData || {},
-							pinData: workflowData.pinData,
-							startNodes,
-							workflowData,
-						},
-					} as IRunExecutionData,
-					workflowData: {
-						id: this.workflowsStore.workflowId,
-						name: workflowData.name!,
-						active: workflowData.active!,
-						createdAt: 0,
-						updatedAt: 0,
-						...workflowData,
-					},
-				};
-				this.workflowsStore.setWorkflowExecutionData(executionData);
-				this.updateNodesExecutionIssues();
-
-				const runWorkflowApiResponse = await this.runWorkflowApi(startRunData);
-
-				this.$externalHooks().run('workflowRun.runWorkflow', { nodeName, source });
-
-				return runWorkflowApiResponse;
-			} catch (error) {
-				this.titleSet(workflow.name as string, 'ERROR');
-				this.$showError(error, this.$locale.baseText('workflowRun.showError.title'));
-				return undefined;
-			}
-		},
-	},
-});
diff --git a/packages/editor-ui/src/models/history.ts b/packages/editor-ui/src/models/history.ts
index f907af1a615c1..f0c90a8856ad5 100644
--- a/packages/editor-ui/src/models/history.ts
+++ b/packages/editor-ui/src/models/history.ts
@@ -1,7 +1,6 @@
-import type { INodeUi } from '@/Interface';
+import type { INodeUi, XYPosition } from '@/Interface';
 import type { IConnection } from 'n8n-workflow';
-import type { XYPosition } from '../Interface';
-import { createEventBus } from '@/event-bus';
+import { createEventBus } from 'n8n-design-system/utils';
 
 // Command names don't serve any particular purpose in the app
 // but they make it easier to identify each command on stack
@@ -48,7 +47,9 @@ export class BulkCommand extends Undoable {
 
 export class MoveNodeCommand extends Command {
 	nodeName: string;
+
 	oldPosition: XYPosition;
+
 	newPosition: XYPosition;
 
 	constructor(nodeName: string, oldPosition: XYPosition, newPosition: XYPosition) {
@@ -74,7 +75,7 @@ export class MoveNodeCommand extends Command {
 	}
 
 	async revert(): Promise<void> {
-		return new Promise<void>((resolve) => {
+		return await new Promise<void>((resolve) => {
 			historyBus.emit('nodeMove', {
 				nodeName: this.nodeName,
 				position: this.oldPosition,
@@ -101,7 +102,7 @@ export class AddNodeCommand extends Command {
 	}
 
 	async revert(): Promise<void> {
-		return new Promise<void>((resolve) => {
+		return await new Promise<void>((resolve) => {
 			historyBus.emit('revertAddNode', { node: this.node });
 			resolve();
 		});
@@ -125,7 +126,7 @@ export class RemoveNodeCommand extends Command {
 	}
 
 	async revert(): Promise<void> {
-		return new Promise<void>((resolve) => {
+		return await new Promise<void>((resolve) => {
 			historyBus.emit('revertRemoveNode', { node: this.node });
 			resolve();
 		});
@@ -155,7 +156,7 @@ export class AddConnectionCommand extends Command {
 	}
 
 	async revert(): Promise<void> {
-		return new Promise<void>((resolve) => {
+		return await new Promise<void>((resolve) => {
 			historyBus.emit('revertAddConnection', { connection: this.connectionData });
 			resolve();
 		});
@@ -185,7 +186,7 @@ export class RemoveConnectionCommand extends Command {
 	}
 
 	async revert(): Promise<void> {
-		return new Promise<void>((resolve) => {
+		return await new Promise<void>((resolve) => {
 			setTimeout(() => {
 				historyBus.emit('revertRemoveConnection', { connection: this.connectionData });
 				resolve();
@@ -196,7 +197,9 @@ export class RemoveConnectionCommand extends Command {
 
 export class EnableNodeToggleCommand extends Command {
 	nodeName: string;
+
 	oldState: boolean;
+
 	newState: boolean;
 
 	constructor(nodeName: string, oldState: boolean, newState: boolean) {
@@ -217,7 +220,7 @@ export class EnableNodeToggleCommand extends Command {
 	}
 
 	async revert(): Promise<void> {
-		return new Promise<void>((resolve) => {
+		return await new Promise<void>((resolve) => {
 			historyBus.emit('enableNodeToggle', {
 				nodeName: this.nodeName,
 				isDisabled: this.oldState,
@@ -229,6 +232,7 @@ export class EnableNodeToggleCommand extends Command {
 
 export class RenameNodeCommand extends Command {
 	currentName: string;
+
 	newName: string;
 
 	constructor(currentName: string, newName: string) {
@@ -250,7 +254,7 @@ export class RenameNodeCommand extends Command {
 	}
 
 	async revert(): Promise<void> {
-		return new Promise<void>((resolve) => {
+		return await new Promise<void>((resolve) => {
 			historyBus.emit('revertRenameNode', {
 				currentName: this.currentName,
 				newName: this.newName,
diff --git a/packages/editor-ui/src/n8n-theme-variables.scss b/packages/editor-ui/src/n8n-theme-variables.scss
index 5e751f208ce40..eb29815eddf78 100644
--- a/packages/editor-ui/src/n8n-theme-variables.scss
+++ b/packages/editor-ui/src/n8n-theme-variables.scss
@@ -11,7 +11,7 @@ $custom-font-light: var(--color-text-light);
 $custom-font-very-light: var(--color-text-light);
 
 $custom-expression-text: var(--color-secondary);
-$custom-expression-background: var(--color-background-lighter);
+$custom-expression-background: var(--color-background-light);
 
 // Badge
 $badge-danger-color: var(--color-danger);
@@ -34,7 +34,9 @@ $badge-warning-color: var(--color-text-dark);
 // Warning tooltip
 $warning-tooltip-color: var(--color-danger);
 
-$header-height: 65px;
+// sass variable is used for scss files
+$header-height: calc(var(--header-height) * 1px);
+$chat-width: calc(var(--chat-width) * 1px);
 
 // sidebar
 $sidebar-width: 65px;
@@ -60,6 +62,13 @@ $tag-text-color: var(--color-text-dark);
 $tag-close-background-color: var(--color-text-light);
 $tag-close-background-hover-color: var(--color-text-dark);
 
+// nodes
+$node-background-default: var(--color-background-xlight);
+$node-background-executing: var(--color-primary-tint-3);
+$node-background-executing-other: #ede9ff;
+// TODO: Define that differently
+$node-background-type-other: #ede9ff;
+
 // Node creator
 $node-creator-width: 385px;
 $node-creator-text-color: var(--color-text-dark);
@@ -88,7 +97,7 @@ $drawer-background-color: var(--color-background-xlight);
 // updates-panel
 $updates-panel-info-url-color: $color-primary;
 $updates-panel-border: var(--border-base);
-$updates-panel-dark-background-color: var(--color-background-lighter);
+$updates-panel-dark-background-color: var(--color-background-light);
 $updates-panel-description-text-color: var(--color-text-base);
 $updates-panel-text-color: var(--color-text-dark);
 
@@ -104,3 +113,7 @@ $version-card-box-shadow-color: hsla(
 	var(--color-background-dark-l),
 	0.07
 );
+
+// supplemental node types
+$supplemental-node-types: ai_chain ai_document ai_embedding ai_languageModel ai_memory
+	ai_outputParser ai_tool ai_retriever ai_textSplitter ai_vectorRetriever ai_vectorStore;
diff --git a/packages/editor-ui/src/n8n-theme.scss b/packages/editor-ui/src/n8n-theme.scss
index a099eda430481..7893d0610dc30 100644
--- a/packages/editor-ui/src/n8n-theme.scss
+++ b/packages/editor-ui/src/n8n-theme.scss
@@ -1,3 +1,206 @@
+@import '@n8n/chat/css';
+@import 'styles';
+
+:root {
+	--node-type-background-l: 95%;
+
+	--node-type-supplemental-label-color-h: 235;
+	--node-type-supplemental-label-color-s: 28%;
+	--node-type-supplemental-label-color-l: 40%;
+	--node-type-supplemental-label-color: hsl(
+		var(--node-type-supplemental-label-color-h),
+		var(--node-type-supplemental-label-color-s),
+		var(--node-type-supplemental-label-color-l)
+	);
+	--node-type-supplemental-color-h: 235;
+	--node-type-supplemental-color-s: 28%;
+	--node-type-supplemental-color-l: 60%;
+	--node-type-supplemental-icon: var(--color-foreground-dark);
+	--node-type-supplemental-color: hsl(
+		var(--node-type-supplemental-color-h),
+		var(--node-type-supplemental-color-s),
+		var(--node-type-supplemental-color-l)
+	);
+	--node-type-supplemental-background: hsl(
+		var(--node-type-supplemental-color-h),
+		var(--node-type-supplemental-color-s),
+		var(--node-type-background-l)
+	);
+	--node-type-supplemental-connector-color: var(--color-foreground-dark);
+	--node-type-ai_chain-color-h: var(--node-type-supplemental-color-h);
+	--node-type-ai_chain-color-s: var(--node-type-supplemental-color-s);
+	--node-type-ai_chain-color-l: var(--node-type-supplemental-color-l);
+	--node-type-ai_chain-color: hsl(
+		var(--node-type-ai_chain-color-h),
+		var(--node-type-ai_chain-color-s),
+		var(--node-type-ai_chain-color-l)
+	);
+	--node-type-chain-background: hsl(
+		var(--node-type-ai_chain-color-h),
+		var(--node-type-ai_chain-color-s),
+		var(--node-type-background-l)
+	);
+	--node-type-ai_document-color-h: var(--node-type-supplemental-color-h);
+	--node-type-ai_document-color-s: var(--node-type-supplemental-color-s);
+	--node-type-ai_document-color-l: var(--node-type-supplemental-color-l);
+	--node-type-ai_document-color: hsl(
+		var(--node-type-ai_document-color-h),
+		var(--node-type-ai_document-color-s),
+		var(--node-type-ai_document-color-l)
+	);
+	--node-type-ai_document-background: hsl(
+		var(--node-type-ai_document-color-h),
+		var(--node-type-ai_document-color-s),
+		var(--node-type-background-l)
+	);
+	--node-type-ai_embedding-color-h: var(--node-type-supplemental-color-h);
+	--node-type-ai_embedding-color-s: var(--node-type-supplemental-color-s);
+	--node-type-ai_embedding-color-l: var(--node-type-supplemental-color-l);
+	--node-type-ai_embedding-color: hsl(
+		var(--node-type-ai_embedding-color-h),
+		var(--node-type-ai_embedding-color-s),
+		var(--node-type-ai_embedding-color-l)
+	);
+	--node-type-ai_embedding-background: hsl(
+		var(--node-type-ai_embedding-color-h),
+		var(--node-type-ai_embedding-color-s),
+		var(--node-type-background-l)
+	);
+	--node-type-ai_languageModel-color-h: var(--node-type-supplemental-color-h);
+	--node-type-ai_languageModel-color-s: var(--node-type-supplemental-color-s);
+	--node-type-ai_languageModel-color-l: var(--node-type-supplemental-color-l);
+	--node-type-ai_languageModel-color: hsl(
+		var(--node-type-ai_languageModel-color-h),
+		var(--node-type-ai_languageModel-color-s),
+		var(--node-type-ai_languageModel-color-l)
+	);
+	--node-type-ai_languageModel-background: hsl(
+		var(--node-type-ai_languageModel-color-h),
+		var(--node-type-ai_languageModel-color-s),
+		var(--node-type-background-l)
+	);
+	--node-type-ai_memory-color-h: var(--node-type-supplemental-color-h);
+	--node-type-ai_memory-color-s: var(--node-type-supplemental-color-s);
+	--node-type-ai_memory-color-l: var(--node-type-supplemental-color-l);
+	--node-type-ai_memory-color: hsl(
+		var(--node-type-ai_memory-color-h),
+		var(--node-type-ai_memory-color-s),
+		var(--node-type-ai_memory-color-l)
+	);
+	--node-type-ai_memory-background: hsl(
+		var(--node-type-ai_memory-color-h),
+		var(--node-type-ai_memory-color-s),
+		var(--node-type-background-l)
+	);
+	--node-type-ai_outputParser-color-h: var(--node-type-supplemental-color-h);
+	--node-type-ai_outputParser-color-s: var(--node-type-supplemental-color-s);
+	--node-type-ai_outputParser-color-l: var(--node-type-supplemental-color-l);
+	--node-type-ai_outputParser-color: hsl(
+		var(--node-type-ai_outputParser-color-h),
+		var(--node-type-ai_outputParser-color-s),
+		var(--node-type-ai_outputParser-color-l)
+	);
+	--node-type-ai_outputParser-background: hsl(
+		var(--node-type-ai_outputParser-color-h),
+		var(--node-type-ai_outputParser-color-s),
+		var(--node-type-background-l)
+	);
+	--node-type-ai_tool-color-h: var(--node-type-supplemental-color-h);
+	--node-type-ai_tool-color-s: var(--node-type-supplemental-color-s);
+	--node-type-ai_tool-color-l: var(--node-type-supplemental-color-l);
+	--node-type-ai_tool-color: hsl(
+		var(--node-type-ai_tool-color-h),
+		var(--node-type-ai_tool-color-s),
+		var(--node-type-ai_tool-color-l)
+	);
+	--node-type-ai_tool-background: hsl(
+		var(--node-type-ai_tool-color-h),
+		var(--node-type-ai_tool-color-s),
+		var(--node-type-background-l)
+	);
+	--node-type-ai_retriever-color-h: var(--node-type-supplemental-color-h);
+	--node-type-ai_retriever-color-s: var(--node-type-supplemental-color-s);
+	--node-type-ai_retriever-color-l: var(--node-type-supplemental-color-l);
+	--node-type-ai_retriever-color: hsl(
+		var(--node-type-ai_retriever-color-h),
+		var(--node-type-ai_retriever-color-s),
+		var(--node-type-ai_retriever-color-l)
+	);
+	--node-type-ai_retriever-background: hsl(
+		var(--node-type-ai_retriever-color-h),
+		var(--node-type-ai_retriever-color-s),
+		var(--node-type-background-l)
+	);
+	--node-type-ai_textSplitter-color-h: var(--node-type-supplemental-color-h);
+	--node-type-ai_textSplitter-color-s: var(--node-type-supplemental-color-s);
+	--node-type-ai_textSplitter-color-l: var(--node-type-supplemental-color-l);
+	--node-type-ai_textSplitter-color: hsl(
+		var(--node-type-ai_textSplitter-color-h),
+		var(--node-type-ai_textSplitter-color-s),
+		var(--node-type-ai_textSplitter-color-l)
+	);
+	--node-type-ai_textSplitter-background: hsl(
+		var(--node-type-ai_textSplitter-color-h),
+		var(--node-type-ai_textSplitter-color-s),
+		var(--node-type-background-l)
+	);
+	--node-type-ai_vectorRetriever-color-h: var(--node-type-supplemental-color-h);
+	--node-type-ai_vectorRetriever-color-s: var(--node-type-supplemental-color-s);
+	--node-type-ai_vectorRetriever-color-l: var(--node-type-supplemental-color-l);
+	--node-type-ai_vectorRetriever-color: hsl(
+		var(--node-type-ai_vectorRetriever-color-h),
+		var(--node-type-ai_vectorRetriever-color-s),
+		var(--node-type-ai_vectorRetriever-color-l)
+	);
+	--node-type-ai_vectorRetriever-background: hsl(
+		var(--node-type-ai_vectorRetriever-color-h),
+		var(--node-type-ai_vectorRetriever-color-s),
+		var(--node-type-background-l)
+	);
+	--node-type-ai_vectorStore-color-h: var(--node-type-supplemental-color-h);
+	--node-type-ai_vectorStore-color-s: var(--node-type-supplemental-color-s);
+	--node-type-ai_vectorStore-color-l: var(--node-type-supplemental-color-l);
+	--node-type-ai_vectorStore-color: hsl(
+		var(--node-type-ai_vectorStore-color-h),
+		var(--node-type-ai_vectorStore-color-s),
+		var(--node-type-ai_vectorStore-color-l)
+	);
+	--node-type-ai_vectorStore-background: hsl(
+		var(--node-type-ai_vectorStore-color-h),
+		var(--node-type-ai_vectorStore-color-s),
+		var(--node-type-background-l)
+	);
+
+	// Using native css variable enables us to use this value in JS
+	--header-height: 65;
+	--chat-width: 350;
+
+	// n8n-chat customizations
+	--chat--spacing: var(--spacing-2xs);
+
+	--chat--header-height: calc(var(--header-height) * 1px);
+	--chat--header--padding: 0 var(--spacing-xs);
+	--chat--heading--font-size: var(--font-size-m);
+	--chat--subtitle--font-size: var(--font-size-s);
+	--chat--subtitle--line-height: var(--font-line-height-base);
+	--chat--header--background: var(--color-background-xlight);
+	--chat--header--color: var(--color-text-dark);
+	--chat--header--border-bottom: var(--border-base);
+	--chat--close--button--color-hover: var(--color-primary);
+	// Message styles
+	--chat--message--padding: var(--spacing-3xs);
+	--chat--message--font-size: 14px;
+	--chat--message-line-height: 1.5;
+	--chat--message--bot--border: 1px solid var(--color-foreground-light);
+	--chat--message--bot--color: var(--color-text-dark);
+	--chat--message--user--color: var(--color-text-dark);
+	--chat--message--user--background: var(--color-success-tint-1);
+	--chat--message--user--border: 1px solid var(--color-success-light-2);
+	// Chat input
+	--chat--input--font-size: var(--font-size-s);
+	--chat--input--send--button--color: var(--color-success);
+}
+
 .clickable {
 	cursor: pointer !important;
 }
@@ -9,18 +212,16 @@
 	font-weight: 400;
 }
 
+// Dialog
+.el-overlay {
+	background-color: var(--color-dialog-overlay-background-dark);
+}
+
 .el-dialog {
 	border: var(--border-base);
 	box-shadow: 0px 6px 16px rgb(68 28 23 / 6%);
 	border-radius: 8px;
 
-	@media (max-height: 1050px) {
-		margin: 4em auto !important;
-	}
-
-	@media (max-height: 930px) {
-		margin: 1em auto !important;
-	}
 	&.classic {
 		.el-dialog__header {
 			padding: 15px 20px;
@@ -69,6 +270,13 @@
 	.el-message-box__title {
 		color: $custom-dialog-text-color;
 	}
+	.el-message-box-icon {
+		width: var(--spacing-l);
+		height: var(--spacing-l);
+		&--warning {
+			color: var(--color-warning);
+		}
+	}
 }
 
 // Notification Message
@@ -93,20 +301,6 @@
 		color: var(--color-text-dark);
 	}
 }
-.el-table--striped {
-	.el-table__body {
-		tr.el-table__row--striped {
-			background-color: var(--color-background-light);
-			td {
-				background: none;
-			}
-		}
-		tr.el-table__row:hover,
-		tr.el-table__row:hover > td {
-			background-color: var(--color-primary-tint-3);
-		}
-	}
-}
 
 // Tabs
 .type-selector:focus,
@@ -120,6 +314,30 @@
 	font-weight: bold;
 }
 
+.el-tabs__content {
+	border: 1px solid var(--color-foreground-base);
+	border-radius: 0px var(--border-radius-base) var(--border-radius-base);
+}
+.el-tabs__header {
+	border-bottom: 0 !important;
+}
+.el-tabs__nav {
+	padding: 0;
+	overflow: hidden;
+}
+.el-tabs__item {
+	padding: var(--spacing-5xs) var(--spacing-2xs) !important;
+	height: auto;
+	line-height: var(--font-line-height-xloose);
+	font-weight: var(--font-weight-regular);
+	font-size: var(--font-size-2xs);
+
+	&:not([aria-selected='true']) {
+		background-color: var(--color-background-base);
+		border-bottom: 1px solid var(--color-foreground-base) !important;
+	}
+}
+
 // Loading Indicator
 .el-loading-mask {
 	background-color: var(--color-foreground-xlight);
@@ -156,21 +374,20 @@
 }
 
 .tags-container {
-	.el-tag {
-		color: $tag-text-color;
+	.el-select-tags-wrapper .el-tag {
 		font-size: 12px;
-		background-color: $tag-background-color;
-		border-radius: 12px;
-		height: auto;
-		border-color: $tag-background-color;
 		font-weight: 400;
+		display: flex;
+		align-items: center;
+
+		&.is-closable {
+			overflow-y: hidden;
+		}
 
-		.el-icon-close {
-			color: $tag-background-color;
-			background-color: $tag-close-background-color !important;
+		.el-tag__close {
 			max-height: 15px;
 			max-width: 15px;
-			margin-right: 6px;
+			margin-left: var(--spacing-4xs);
 
 			&:hover {
 				background-color: $tag-close-background-hover-color !important;
@@ -184,13 +401,29 @@
 		border: none;
 	}
 
-	i.el-select__caret {
+	.el-select .el-input.is-disabled {
+		.el-input__icon {
+			opacity: 1 !important;
+			cursor: not-allowed;
+			color: var(--color-foreground-dark);
+		}
+		.el-input__inner,
+		.el-input__inner::placeholder {
+			opacity: 1;
+			color: var(--color-foreground-dark);
+		}
+	}
+	.el-select .el-input:not(.is-disabled) .el-input__icon {
 		color: var(--color-text-dark);
 	}
 	.el-input .el-input__inner {
+		text-align: center;
+	}
+	.el-input:not(.is-disabled) .el-input__inner {
 		&,
 		&:hover,
 		&:focus {
+			padding-left: 35px;
 			border-radius: var(--border-radius-base);
 			color: var(--color-text-dark);
 			background-color: var(--color-background-base);
diff --git a/packages/editor-ui/src/permissions.ts b/packages/editor-ui/src/permissions.ts
index d2f0503c3fa95..1343a8bd49e16 100644
--- a/packages/editor-ui/src/permissions.ts
+++ b/packages/editor-ui/src/permissions.ts
@@ -5,9 +5,15 @@
  */
 
 import type { IUser, ICredentialsResponse, IWorkflowDb } from '@/Interface';
-import { IRootState, EnvironmentVariable } from '@/Interface';
 import { EnterpriseEditionFeature, PLACEHOLDER_EMPTY_WORKFLOW_ID } from '@/constants';
-import { useSettingsStore } from './stores/settings';
+import { useSettingsStore } from '@/stores/settings.store';
+import { hasPermission } from './rbac/permissions';
+import { isUserGlobalOwner } from './utils/userUtils';
+
+/**
+ * Old permissions implementation
+ * @deprecated
+ */
 
 export const enum UserRole {
 	InstanceOwner = 'isInstanceOwner',
@@ -37,15 +43,20 @@ export const parsePermissionsTable = (
 	user: IUser | null,
 	table: IPermissionsTable,
 ): IPermissions => {
-	const genericTable = [{ name: UserRole.InstanceOwner, test: () => user?.isOwner }];
+	const genericTable: IPermissionsTable = [
+		{ name: UserRole.InstanceOwner, test: () => (user ? isUserGlobalOwner(user) : false) },
+	];
 
-	return [...genericTable, ...table].reduce((permissions: IPermissions, row) => {
-		permissions[row.name] = Array.isArray(row.test)
-			? row.test.some((ability) => permissions[ability])
-			: (row.test as IPermissionsTableRowTestFn)(permissions);
+	return [...genericTable, ...table].reduce(
+		(permissions: IPermissions, row: IPermissionsTableRow) => {
+			permissions[row.name] = Array.isArray(row.test)
+				? row.test.some((ability) => permissions[ability])
+				: row.test(permissions);
 
-		return permissions;
-	}, {});
+			return permissions;
+		},
+		{},
+	);
 };
 
 /**
@@ -61,30 +72,41 @@ export const getCredentialPermissions = (user: IUser | null, credential: ICreden
 	const table: IPermissionsTable = [
 		{
 			name: UserRole.ResourceOwner,
-			test: () =>
-				!!(credential && credential.ownedBy && credential.ownedBy.id === user?.id) ||
-				!isSharingEnabled,
+			test: () => !!(credential?.ownedBy?.id === user?.id) || !isSharingEnabled,
 		},
 		{
 			name: UserRole.ResourceSharee,
-			test: () =>
-				!!(
-					credential &&
-					credential.sharedWith &&
-					credential.sharedWith.find((sharee) => sharee.id === user?.id)
-				),
+			test: () => !!credential?.sharedWith?.find((sharee) => sharee.id === user?.id),
 		},
 		{
 			name: 'read',
-			test: [UserRole.ResourceOwner, UserRole.InstanceOwner, UserRole.ResourceSharee],
+			test: (permissions) =>
+				hasPermission(['rbac'], { rbac: { scope: 'credential:read' } }) || !!permissions.isOwner,
+		},
+		{
+			name: 'save',
+			test: (permissions) =>
+				hasPermission(['rbac'], { rbac: { scope: 'credential:create' } }) || !!permissions.isOwner,
+		},
+		{
+			name: 'update',
+			test: (permissions) =>
+				hasPermission(['rbac'], { rbac: { scope: 'credential:update' } }) || !!permissions.isOwner,
+		},
+		{
+			name: 'share',
+			test: (permissions) =>
+				hasPermission(['rbac'], { rbac: { scope: 'credential:share' } }) || !!permissions.isOwner,
+		},
+		{
+			name: 'delete',
+			test: (permissions) =>
+				hasPermission(['rbac'], { rbac: { scope: 'credential:delete' } }) || !!permissions.isOwner,
+		},
+		{
+			name: 'use',
+			test: (permissions) => !!permissions.isOwner || !!permissions.isSharee,
 		},
-		{ name: 'save', test: [UserRole.ResourceOwner, UserRole.InstanceOwner] },
-		{ name: 'updateName', test: [UserRole.ResourceOwner, UserRole.InstanceOwner] },
-		{ name: 'updateConnection', test: [UserRole.ResourceOwner] },
-		{ name: 'updateSharing', test: [UserRole.ResourceOwner] },
-		{ name: 'updateNodeAccess', test: [UserRole.ResourceOwner] },
-		{ name: 'delete', test: [UserRole.ResourceOwner, UserRole.InstanceOwner] },
-		{ name: 'use', test: [UserRole.ResourceOwner, UserRole.ResourceSharee] },
 	];
 
 	return parsePermissionsTable(user, table);
@@ -100,32 +122,17 @@ export const getWorkflowPermissions = (user: IUser | null, workflow: IWorkflowDb
 	const table: IPermissionsTable = [
 		{
 			name: UserRole.ResourceOwner,
-			test: () =>
-				!!(isNewWorkflow || (workflow && workflow.ownedBy && workflow.ownedBy.id === user?.id)) ||
-				!isSharingEnabled,
-		},
-		{
-			name: UserRole.ResourceSharee,
-			test: () =>
-				!!(
-					workflow &&
-					workflow.sharedWith &&
-					workflow.sharedWith.find((sharee) => sharee.id === user?.id)
-				),
+			test: () => !!(isNewWorkflow || workflow?.ownedBy?.id === user?.id) || !isSharingEnabled,
 		},
 		{
-			name: 'read',
-			test: [UserRole.ResourceOwner, UserRole.InstanceOwner, UserRole.ResourceSharee],
+			name: 'updateSharing',
+			test: (permissions) =>
+				hasPermission(['rbac'], { rbac: { scope: 'workflow:share' } }) || !!permissions.isOwner,
 		},
-		{ name: 'save', test: [UserRole.ResourceOwner, UserRole.InstanceOwner] },
-		{ name: 'updateName', test: [UserRole.ResourceOwner, UserRole.InstanceOwner] },
-		{ name: 'updateConnection', test: [UserRole.ResourceOwner] },
-		{ name: 'updateSharing', test: [UserRole.ResourceOwner] },
-		{ name: 'updateNodeAccess', test: [UserRole.ResourceOwner] },
-		{ name: 'delete', test: [UserRole.ResourceOwner, UserRole.InstanceOwner] },
 		{
-			name: 'use',
-			test: [UserRole.ResourceOwner, UserRole.InstanceOwner, UserRole.ResourceSharee],
+			name: 'delete',
+			test: (permissions) =>
+				hasPermission(['rbac'], { rbac: { scope: 'workflow:delete' } }) || !!permissions.isOwner,
 		},
 	];
 
@@ -134,19 +141,10 @@ export const getWorkflowPermissions = (user: IUser | null, workflow: IWorkflowDb
 
 export const getVariablesPermissions = (user: IUser | null) => {
 	const table: IPermissionsTable = [
-		{
-			name: 'create',
-			test: [UserRole.InstanceOwner],
-		},
-		{
-			name: 'edit',
-			test: [UserRole.InstanceOwner],
-		},
-		{
-			name: 'delete',
-			test: [UserRole.InstanceOwner],
-		},
-		{ name: 'use', test: () => true },
+		{ name: 'create', test: () => hasPermission(['rbac'], { rbac: { scope: 'variable:create' } }) },
+		{ name: 'edit', test: () => hasPermission(['rbac'], { rbac: { scope: 'variable:update' } }) },
+		{ name: 'delete', test: () => hasPermission(['rbac'], { rbac: { scope: 'variable:delete' } }) },
+		{ name: 'use', test: () => hasPermission(['rbac'], { rbac: { scope: 'variable:read' } }) },
 	];
 
 	return parsePermissionsTable(user, table);
diff --git a/packages/editor-ui/src/plugins/__tests__/telemetry.test.ts b/packages/editor-ui/src/plugins/__tests__/telemetry.test.ts
new file mode 100644
index 0000000000000..26ca079ccdba5
--- /dev/null
+++ b/packages/editor-ui/src/plugins/__tests__/telemetry.test.ts
@@ -0,0 +1,160 @@
+import { SETTINGS_STORE_DEFAULT_STATE } from '@/__tests__/utils';
+import { Telemetry } from '@/plugins/telemetry';
+import { useSettingsStore } from '@/stores/settings.store';
+import merge from 'lodash-es/merge';
+import { createPinia, setActivePinia } from 'pinia';
+
+let telemetry: Telemetry;
+
+let settingsStore: ReturnType<typeof useSettingsStore>;
+
+const MOCK_VERSION_CLI = '0.0.0';
+
+describe('telemetry', () => {
+	beforeAll(() => {
+		telemetry = new Telemetry();
+		setActivePinia(createPinia());
+		settingsStore = useSettingsStore();
+		telemetry.init(
+			{ enabled: true, config: { url: '', key: '' } },
+			{ versionCli: '1', instanceId: '1' },
+		);
+	});
+
+	describe('identify', () => {
+		it('Rudderstack identify method should be called when proving userId ', () => {
+			const identifyFunction = vi.spyOn(window.rudderanalytics, 'identify');
+
+			const userId = '1';
+			const instanceId = '1';
+
+			settingsStore.setSettings(
+				merge({}, SETTINGS_STORE_DEFAULT_STATE.settings, {
+					deployment: {
+						type: '',
+					},
+				}),
+			);
+
+			telemetry.identify(userId, instanceId);
+			expect(identifyFunction).toHaveBeenCalledTimes(1);
+			expect(identifyFunction).toHaveBeenCalledWith(`${instanceId}#${userId}`, {
+				instance_id: instanceId,
+			});
+		});
+
+		it('Rudderstack identify method should be called when proving userId and versionCli ', () => {
+			const identifyFunction = vi.spyOn(window.rudderanalytics, 'identify');
+
+			const userId = '1';
+			const instanceId = '1';
+			const versionCli = '1';
+
+			settingsStore.setSettings(
+				merge({}, SETTINGS_STORE_DEFAULT_STATE.settings, {
+					deployment: {
+						type: '',
+					},
+				}),
+			);
+
+			telemetry.identify(userId, instanceId, versionCli);
+			expect(identifyFunction).toHaveBeenCalledTimes(1);
+			expect(identifyFunction).toHaveBeenCalledWith(`${instanceId}#${userId}`, {
+				instance_id: instanceId,
+				version_cli: versionCli,
+			});
+		});
+
+		it('Rudderstack identify method should be called when proving userId and deployment type is cloud ', () => {
+			const identifyFunction = vi.spyOn(window.rudderanalytics, 'identify');
+
+			const userId = '1';
+			const instanceId = '1';
+			const versionCli = '1';
+			const userCloudId = '1';
+
+			settingsStore.setSettings(
+				merge({}, SETTINGS_STORE_DEFAULT_STATE.settings, {
+					n8nMetadata: {
+						userId: userCloudId,
+					},
+					deployment: {
+						type: 'cloud',
+					},
+				}),
+			);
+
+			telemetry.identify(userId, instanceId, versionCli);
+			expect(identifyFunction).toHaveBeenCalledTimes(1);
+			expect(identifyFunction).toHaveBeenCalledWith(`${instanceId}#${userId}`, {
+				instance_id: instanceId,
+				version_cli: versionCli,
+				user_cloud_id: userCloudId,
+			});
+		});
+
+		it('Rudderstack identify method should be called when proving userId and deployment type is cloud', () => {
+			const identifyFunction = vi.spyOn(window.rudderanalytics, 'identify');
+
+			const userId = '1';
+			const instanceId = '1';
+			const versionCli = '1';
+			const userCloudId = '1';
+
+			settingsStore.setSettings(
+				merge({}, SETTINGS_STORE_DEFAULT_STATE.settings, {
+					n8nMetadata: {
+						userId: userCloudId,
+					},
+					deployment: {
+						type: 'cloud',
+					},
+				}),
+			);
+
+			telemetry.identify(userId, instanceId, versionCli);
+			expect(identifyFunction).toHaveBeenCalledTimes(1);
+			expect(identifyFunction).toHaveBeenCalledWith(`${instanceId}#${userId}`, {
+				instance_id: instanceId,
+				version_cli: versionCli,
+				user_cloud_id: userCloudId,
+			});
+		});
+
+		it('Rudderstack reset method should be called when proving userId and deployment type is cloud', () => {
+			const resetFunction = vi.spyOn(window.rudderanalytics, 'reset');
+
+			const instanceId = '1';
+
+			settingsStore.setSettings(
+				merge({}, SETTINGS_STORE_DEFAULT_STATE.settings, {
+					deployment: {
+						type: '',
+					},
+				}),
+			);
+
+			telemetry.identify(instanceId);
+			expect(resetFunction).toHaveBeenCalledTimes(1);
+		});
+	});
+
+	describe('track function', () => {
+		it('should call Rudderstack track method with correct parameters', () => {
+			const trackFunction = vi.spyOn(window.rudderanalytics, 'track');
+
+			const event = 'testEvent';
+			const properties = { test: '1' };
+			const options = { withPostHog: false };
+
+			telemetry.track(event, properties, options);
+
+			expect(trackFunction).toHaveBeenCalledTimes(1);
+			expect(trackFunction).toHaveBeenCalledWith(event, {
+				...properties,
+				version_cli: MOCK_VERSION_CLI,
+			});
+		});
+	});
+});
diff --git a/packages/editor-ui/src/plugins/chartjs.ts b/packages/editor-ui/src/plugins/chartjs.ts
new file mode 100644
index 0000000000000..5b4c2fc5a68cd
--- /dev/null
+++ b/packages/editor-ui/src/plugins/chartjs.ts
@@ -0,0 +1,28 @@
+import {
+	Chart as ChartJS,
+	Title,
+	Tooltip,
+	Legend,
+	BarElement,
+	LineElement,
+	PointElement,
+	CategoryScale,
+	LinearScale,
+	LineController,
+} from 'chart.js';
+
+export const ChartJSPlugin = {
+	install: () => {
+		ChartJS.register(
+			CategoryScale,
+			LinearScale,
+			BarElement,
+			LineElement,
+			PointElement,
+			Title,
+			Tooltip,
+			Legend,
+			LineController,
+		);
+	},
+};
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/__tests__/completions.test.ts b/packages/editor-ui/src/plugins/codemirror/completions/__tests__/completions.test.ts
index d99e41eea06cf..28ff31972fde3 100644
--- a/packages/editor-ui/src/plugins/codemirror/completions/__tests__/completions.test.ts
+++ b/packages/editor-ui/src/plugins/codemirror/completions/__tests__/completions.test.ts
@@ -2,7 +2,7 @@ import { createTestingPinia } from '@pinia/testing';
 import { setActivePinia } from 'pinia';
 import { DateTime } from 'luxon';
 
-import * as workflowHelpers from '@/mixins/workflowHelpers';
+import * as workflowHelpers from '@/composables/useWorkflowHelpers';
 import { dollarOptions } from '@/plugins/codemirror/completions/dollar.completions';
 import * as utils from '@/plugins/codemirror/completions/utils';
 import {
@@ -17,9 +17,31 @@ import type { CompletionSource, CompletionResult } from '@codemirror/autocomplet
 import { CompletionContext } from '@codemirror/autocomplete';
 import { EditorState } from '@codemirror/state';
 import { n8nLang } from '@/plugins/codemirror/n8nLang';
-
-beforeEach(() => {
+import { useExternalSecretsStore } from '@/stores/externalSecrets.ee.store';
+import { useUIStore } from '@/stores/ui.store';
+import { useSettingsStore } from '@/stores/settings.store';
+import { CREDENTIAL_EDIT_MODAL_KEY, EnterpriseEditionFeature } from '@/constants';
+import {
+	ARRAY_NUMBER_ONLY_METHODS,
+	LUXON_RECOMMENDED_OPTIONS,
+	METADATA_SECTION,
+	METHODS_SECTION,
+	RECOMMENDED_SECTION,
+	STRING_RECOMMENDED_OPTIONS,
+} from '../constants';
+import { set, uniqBy } from 'lodash-es';
+
+let externalSecretsStore: ReturnType<typeof useExternalSecretsStore>;
+let uiStore: ReturnType<typeof useUIStore>;
+let settingsStore: ReturnType<typeof useSettingsStore>;
+
+beforeEach(async () => {
 	setActivePinia(createTestingPinia());
+
+	externalSecretsStore = useExternalSecretsStore();
+	uiStore = useUIStore();
+	settingsStore = useSettingsStore();
+
 	vi.spyOn(utils, 'receivesNoBinaryData').mockReturnValue(true); // hide $binary
 	vi.spyOn(utils, 'isSplitInBatchesAbsent').mockReturnValue(false); // show context
 	vi.spyOn(utils, 'hasActiveNode').mockReturnValue(true);
@@ -37,7 +59,24 @@ describe('No completions', () => {
 
 describe('Top-level completions', () => {
 	test('should return dollar completions for blank position: {{ | }}', () => {
-		expect(completions('{{ | }}')).toHaveLength(dollarOptions().length);
+		const result = completions('{{ | }}');
+		expect(result).toHaveLength(dollarOptions().length);
+
+		expect(result?.[0]).toEqual(
+			expect.objectContaining({
+				label: '$json',
+				section: RECOMMENDED_SECTION,
+			}),
+		);
+		expect(result?.[4]).toEqual(
+			expect.objectContaining({
+				label: '$execution',
+				section: METADATA_SECTION,
+			}),
+		);
+		expect(result?.[14]).toEqual(
+			expect.objectContaining({ label: '$max()', section: METHODS_SECTION }),
+		);
 	});
 
 	test('should return DateTime completion for: {{ D| }}', () => {
@@ -72,77 +111,73 @@ describe('Top-level completions', () => {
 	});
 
 	test('should return node selector completions for: {{ $(| }}', () => {
-		const initialState = { workflows: { workflow: { nodes: mockNodes } } };
-
-		setActivePinia(createTestingPinia({ initialState }));
+		vi.spyOn(utils, 'autocompletableNodeNames').mockReturnValue(mockNodes.map((node) => node.name));
 
 		expect(completions('{{ $(| }}')).toHaveLength(mockNodes.length);
 	});
 });
 
 describe('Luxon method completions', () => {
-	const resolveParameterSpy = vi.spyOn(workflowHelpers, 'resolveParameter');
-
 	test('should return class completions for: {{ DateTime.| }}', () => {
 		// @ts-expect-error Spied function is mistyped
-		resolveParameterSpy.mockReturnValueOnce(DateTime);
+		vi.spyOn(workflowHelpers, 'resolveParameter').mockReturnValueOnce(DateTime);
 
 		expect(completions('{{ DateTime.| }}')).toHaveLength(luxonStaticOptions().length);
 	});
 
 	test('should return instance completions for: {{ $now.| }}', () => {
 		// @ts-expect-error Spied function is mistyped
-		resolveParameterSpy.mockReturnValueOnce(DateTime.now());
+		vi.spyOn(workflowHelpers, 'resolveParameter').mockReturnValueOnce(DateTime.now());
 
 		expect(completions('{{ $now.| }}')).toHaveLength(
-			luxonInstanceOptions().length + extensions('date').length,
+			uniqBy(luxonInstanceOptions().concat(extensions('date')), (option) => option.label).length +
+				LUXON_RECOMMENDED_OPTIONS.length,
 		);
 	});
 
 	test('should return instance completions for: {{ $today.| }}', () => {
 		// @ts-expect-error Spied function is mistyped
-		resolveParameterSpy.mockReturnValueOnce(DateTime.now());
+		vi.spyOn(workflowHelpers, 'resolveParameter').mockReturnValueOnce(DateTime.now());
 
 		expect(completions('{{ $today.| }}')).toHaveLength(
-			luxonInstanceOptions().length + extensions('date').length,
+			uniqBy(luxonInstanceOptions().concat(extensions('date')), (option) => option.label).length +
+				LUXON_RECOMMENDED_OPTIONS.length,
 		);
 	});
 });
 
 describe('Resolution-based completions', () => {
-	const resolveParameterSpy = vi.spyOn(workflowHelpers, 'resolveParameter');
-
 	describe('literals', () => {
 		test('should return completions for string literal: {{ "abc".| }}', () => {
 			// @ts-expect-error Spied function is mistyped
-			resolveParameterSpy.mockReturnValueOnce('abc');
+			vi.spyOn(workflowHelpers, 'resolveParameter').mockReturnValueOnce('abc');
 
 			expect(completions('{{ "abc".| }}')).toHaveLength(
-				natives('string').length + extensions('string').length,
+				natives('string').length + extensions('string').length + STRING_RECOMMENDED_OPTIONS.length,
 			);
 		});
 
 		test('should properly handle string that contain dollar signs', () => {
 			// @ts-expect-error Spied function is mistyped
-			resolveParameterSpy.mockReturnValueOnce('"You \'owe\' me 200$"');
+			vi.spyOn(workflowHelpers, 'resolveParameter').mockReturnValueOnce("You 'owe' me 200$ ");
 
-			expect(completions('{{ "You \'owe\' me 200$".| }}')).toHaveLength(
-				natives('string').length + extensions('string').length,
-			);
+			const result = completions('{{ "You \'owe\' me 200$".| }}');
+
+			expect(result).toHaveLength(natives('string').length + extensions('string').length + 1);
 		});
 
 		test('should return completions for number literal: {{ (123).| }}', () => {
 			// @ts-expect-error Spied function is mistyped
-			resolveParameterSpy.mockReturnValueOnce(123);
+			vi.spyOn(workflowHelpers, 'resolveParameter').mockReturnValueOnce(123);
 
 			expect(completions('{{ (123).| }}')).toHaveLength(
-				natives('number').length + extensions('number').length,
+				natives('number').length + extensions('number').length + ['isEven()', 'isOdd()'].length,
 			);
 		});
 
 		test('should return completions for array literal: {{ [1, 2, 3].| }}', () => {
 			// @ts-expect-error Spied function is mistyped
-			resolveParameterSpy.mockReturnValueOnce([1, 2, 3]);
+			vi.spyOn(workflowHelpers, 'resolveParameter').mockReturnValueOnce([1, 2, 3]);
 
 			expect(completions('{{ [1, 2, 3].| }}')).toHaveLength(
 				natives('array').length + extensions('array').length,
@@ -151,7 +186,7 @@ describe('Resolution-based completions', () => {
 
 		test('should return completions for Object methods: {{ Object.values({ abc: 123 }).| }}', () => {
 			// @ts-expect-error Spied function is mistyped
-			resolveParameterSpy.mockReturnValueOnce([123]);
+			vi.spyOn(workflowHelpers, 'resolveParameter').mockReturnValueOnce([123]);
 
 			const found = completions('{{ Object.values({ abc: 123 }).| }}');
 
@@ -163,23 +198,35 @@ describe('Resolution-based completions', () => {
 		test('should return completions for object literal', () => {
 			const object = { a: 1 };
 
-			resolveParameterSpy.mockReturnValueOnce(object);
+			vi.spyOn(workflowHelpers, 'resolveParameter').mockReturnValueOnce(object);
 
 			expect(completions('{{ ({ a: 1 }).| }}')).toHaveLength(
-				Object.keys(object).length + natives('object').length + extensions('object').length,
+				Object.keys(object).length + extensions('object').length,
+			);
+		});
+	});
+
+	describe('indexed access completions', () => {
+		test('should return string completions for indexed access that resolves to string literal: {{ "abc"[0].| }}', () => {
+			// @ts-expect-error Spied function is mistyped
+			vi.spyOn(workflowHelpers, 'resolveParameter').mockReturnValueOnce('a');
+
+			expect(completions('{{ "abc"[0].| }}')).toHaveLength(
+				natives('string').length + extensions('string').length + STRING_RECOMMENDED_OPTIONS.length,
 			);
 		});
 	});
 
 	describe('complex expression completions', () => {
-		const resolveParameterSpy = vi.spyOn(workflowHelpers, 'resolveParameter');
 		const { $input } = mockProxy;
 
 		test('should return completions when $input is used as a function parameter', () => {
-			resolveParameterSpy.mockReturnValue($input.item.json.num);
+			vi.spyOn(workflowHelpers, 'resolveParameter').mockReturnValue($input.item.json.num);
 			const found = completions('{{ Math.abs($input.item.json.num1).| }}');
 			if (!found) throw new Error('Expected to find completions');
-			expect(found).toHaveLength(extensions('number').length + natives('number').length);
+			expect(found).toHaveLength(
+				extensions('number').length + natives('number').length + ['isEven()', 'isOdd()'].length,
+			);
 		});
 
 		test('should return completions when node reference is used as a function parameter', () => {
@@ -191,69 +238,74 @@ describe('Resolution-based completions', () => {
 		});
 
 		test('should return completions for complex expression: {{ $now.diff($now.diff($now.|)) }}', () => {
+			vi.spyOn(workflowHelpers, 'resolveParameter').mockReturnValueOnce(DateTime.now());
 			expect(completions('{{ $now.diff($now.diff($now.|)) }}')).toHaveLength(
-				natives('date').length + extensions('object').length,
+				uniqBy(luxonInstanceOptions().concat(extensions('date')), (option) => option.label).length +
+					LUXON_RECOMMENDED_OPTIONS.length,
 			);
 		});
 
 		test('should return completions for complex expression: {{ $execution.resumeUrl.includes($json.) }}', () => {
-			resolveParameterSpy.mockReturnValue($input.item.json);
+			vi.spyOn(workflowHelpers, 'resolveParameter').mockReturnValueOnce($input.item.json);
 			const { $json } = mockProxy;
 			const found = completions('{{ $execution.resumeUrl.includes($json.|) }}');
 
 			if (!found) throw new Error('Expected to find completions');
-			expect(found).toHaveLength(Object.keys($json).length + natives('object').length);
+			expect(found).toHaveLength(Object.keys($json).length + extensions('object').length);
 		});
 
 		test('should return completions for operation expression: {{ $now.day + $json. }}', () => {
-			resolveParameterSpy.mockReturnValue($input.item.json);
+			vi.spyOn(workflowHelpers, 'resolveParameter').mockReturnValueOnce($input.item.json);
 			const { $json } = mockProxy;
 			const found = completions('{{ $now.day + $json.| }}');
 
 			if (!found) throw new Error('Expected to find completions');
 
-			expect(found).toHaveLength(Object.keys($json).length + natives('object').length);
+			expect(found).toHaveLength(Object.keys($json).length + extensions('object').length);
 		});
 
 		test('should return completions for operation expression: {{ Math.abs($now.day) >= 10 ? $now : Math.abs($json.). }}', () => {
-			resolveParameterSpy.mockReturnValue($input.item.json);
+			vi.spyOn(workflowHelpers, 'resolveParameter').mockReturnValue($input.item.json);
 			const { $json } = mockProxy;
 			const found = completions('{{ Math.abs($now.day) >= 10 ? $now : Math.abs($json.|) }}');
 
 			if (!found) throw new Error('Expected to find completions');
 
-			expect(found).toHaveLength(Object.keys($json).length + natives('object').length);
+			expect(found).toHaveLength(Object.keys($json).length + extensions('object').length);
 		});
 	});
 
 	describe('bracket-aware completions', () => {
-		const resolveParameterSpy = vi.spyOn(workflowHelpers, 'resolveParameter');
 		const { $input } = mockProxy;
 
 		test('should return bracket-aware completions for: {{ $input.item.json.str.|() }}', () => {
-			resolveParameterSpy.mockReturnValue($input.item.json.str);
+			vi.spyOn(workflowHelpers, 'resolveParameter').mockReturnValue($input.item.json.str);
 
 			const found = completions('{{ $input.item.json.str.|() }}');
 
 			if (!found) throw new Error('Expected to find completions');
 
-			expect(found).toHaveLength(extensions('string').length + natives('string').length);
+			expect(found).toHaveLength(
+				extensions('string').length + natives('string').length + STRING_RECOMMENDED_OPTIONS.length,
+			);
 			expect(found.map((c) => c.label).every((l) => !l.endsWith('()')));
 		});
 
 		test('should return bracket-aware completions for: {{ $input.item.json.num.|() }}', () => {
-			resolveParameterSpy.mockReturnValue($input.item.json.num);
+			vi.spyOn(workflowHelpers, 'resolveParameter').mockReturnValue($input.item.json.num);
 
 			const found = completions('{{ $input.item.json.num.|() }}');
 
 			if (!found) throw new Error('Expected to find completions');
 
-			expect(found).toHaveLength(extensions('number').length + natives('number').length);
+			expect(found).toHaveLength(
+				extensions('number').length + natives('number').length + ['isEven()', 'isOdd()'].length,
+			);
 			expect(found.map((c) => c.label).every((l) => !l.endsWith('()')));
 		});
 
 		test('should return bracket-aware completions for: {{ $input.item.json.arr.| }}', () => {
-			resolveParameterSpy.mockReturnValue($input.item.json.arr);
+			vi.spyOn(workflowHelpers, 'resolveParameter').mockReturnValue($input.item.json.arr);
 
 			const found = completions('{{ $input.item.json.arr.|() }}');
 
@@ -264,120 +316,189 @@ describe('Resolution-based completions', () => {
 		});
 	});
 
+	describe('secrets', () => {
+		const { $input } = mockProxy;
+
+		beforeEach(() => {});
+
+		test('should return completions for: {{ $secrets.| }}', () => {
+			const provider = 'infisical';
+			const secrets = ['SECRET'];
+
+			vi.spyOn(workflowHelpers, 'resolveParameter').mockReturnValue($input);
+
+			uiStore.modals[CREDENTIAL_EDIT_MODAL_KEY].open = true;
+			set(settingsStore.settings, ['enterprise', EnterpriseEditionFeature.ExternalSecrets], true);
+			externalSecretsStore.state.secrets = {
+				[provider]: secrets,
+			};
+
+			const result = completions('{{ $secrets.| }}');
+
+			expect(result).toEqual([
+				{
+					info: expect.any(Function),
+					label: provider,
+					type: 'keyword',
+					apply: expect.any(Function),
+				},
+			]);
+		});
+
+		test('should return completions for: {{ $secrets.provider.| }}', () => {
+			const provider = 'infisical';
+			const secrets = ['SECRET1', 'SECRET2'];
+
+			vi.spyOn(workflowHelpers, 'resolveParameter').mockReturnValue($input);
+
+			uiStore.modals[CREDENTIAL_EDIT_MODAL_KEY].open = true;
+			set(settingsStore.settings, ['enterprise', EnterpriseEditionFeature.ExternalSecrets], true);
+			externalSecretsStore.state.secrets = {
+				[provider]: secrets,
+			};
+
+			const result = completions(`{{ $secrets.${provider}.| }}`);
+
+			expect(result).toEqual([
+				{
+					info: expect.any(Function),
+					label: secrets[0],
+					type: 'keyword',
+					apply: expect.any(Function),
+				},
+				{
+					info: expect.any(Function),
+					label: secrets[1],
+					type: 'keyword',
+					apply: expect.any(Function),
+				},
+			]);
+		});
+	});
+
 	describe('references', () => {
-		const resolveParameterSpy = vi.spyOn(workflowHelpers, 'resolveParameter');
 		const { $input, $ } = mockProxy;
 
 		test('should return completions for: {{ $input.| }}', () => {
-			resolveParameterSpy.mockReturnValue($input);
+			vi.spyOn(workflowHelpers, 'resolveParameter').mockReturnValue($input);
 
-			expect(completions('{{ $input.| }}')).toHaveLength(
-				Reflect.ownKeys($input).length + natives('object').length,
-			);
+			expect(completions('{{ $input.| }}')).toHaveLength(Reflect.ownKeys($input).length);
+		});
+
+		test('should return completions for: {{ "hello"+input.| }}', () => {
+			vi.spyOn(workflowHelpers, 'resolveParameter').mockReturnValue($input);
+
+			expect(completions('{{ "hello"+$input.| }}')).toHaveLength(Reflect.ownKeys($input).length);
 		});
 
 		test("should return completions for: {{ $('nodeName').| }}", () => {
-			resolveParameterSpy.mockReturnValue($('Rename'));
+			vi.spyOn(workflowHelpers, 'resolveParameter').mockReturnValue($('Rename'));
 
 			expect(completions('{{ $("Rename").| }}')).toHaveLength(
-				Reflect.ownKeys($('Rename')).length + natives('object').length - ['pairedItem'].length,
+				Reflect.ownKeys($('Rename')).length - ['pairedItem'].length,
+			);
+		});
+
+		test("should return completions for: {{ $('(Complex) \"No\\'de\" name').| }}", () => {
+			vi.spyOn(workflowHelpers, 'resolveParameter').mockReturnValue($('Rename'));
+
+			expect(completions("{{ $('(Complex) \"No\\'de\" name').| }}")).toHaveLength(
+				Reflect.ownKeys($('Rename')).length - ['pairedItem'].length,
 			);
 		});
 
 		test('should return completions for: {{ $input.item.| }}', () => {
-			resolveParameterSpy.mockReturnValue($input.item);
+			vi.spyOn(workflowHelpers, 'resolveParameter').mockReturnValue($input.item);
 
 			const found = completions('{{ $input.item.| }}');
 
 			if (!found) throw new Error('Expected to find completion');
 
-			expect(found).toHaveLength(3);
+			expect(found).toHaveLength(1);
 			expect(found[0].label).toBe('json');
 		});
 
 		test('should return completions for: {{ $input.first().| }}', () => {
-			resolveParameterSpy.mockReturnValue($input.first());
+			vi.spyOn(workflowHelpers, 'resolveParameter').mockReturnValue($input.first());
 
 			const found = completions('{{ $input.first().| }}');
 
 			if (!found) throw new Error('Expected to find completion');
 
-			expect(found).toHaveLength(3);
+			expect(found).toHaveLength(1);
 			expect(found[0].label).toBe('json');
 		});
 
 		test('should return completions for: {{ $input.last().| }}', () => {
-			resolveParameterSpy.mockReturnValue($input.last());
+			vi.spyOn(workflowHelpers, 'resolveParameter').mockReturnValue($input.last());
 
 			const found = completions('{{ $input.last().| }}');
 
 			if (!found) throw new Error('Expected to find completion');
 
-			expect(found).toHaveLength(3);
+			expect(found).toHaveLength(1);
 			expect(found[0].label).toBe('json');
 		});
 
-		test('should return no completions for: {{ $input.all().| }}', () => {
+		test('should return completions for: {{ $input.all().| }}', () => {
 			// @ts-expect-error
-			resolveParameterSpy.mockReturnValue([$input.item]);
+			vi.spyOn(workflowHelpers, 'resolveParameter').mockReturnValue([$input.item]);
 
-			expect(completions('{{ $input.all().| }}')).toBeNull();
+			expect(completions('{{ $input.all().| }}')).toHaveLength(
+				extensions('array').length + natives('array').length - ARRAY_NUMBER_ONLY_METHODS.length,
+			);
 		});
 
 		test("should return completions for: '{{ $input.item.| }}'", () => {
-			resolveParameterSpy.mockReturnValue($input.item.json);
+			vi.spyOn(workflowHelpers, 'resolveParameter').mockReturnValue($input.item.json);
 
 			expect(completions('{{ $input.item.| }}')).toHaveLength(
-				Object.keys($input.item.json).length +
-					(extensions('object').length + natives('object').length),
+				Object.keys($input.item.json).length + extensions('object').length,
 			);
 		});
 
 		test("should return completions for: '{{ $input.first().| }}'", () => {
-			resolveParameterSpy.mockReturnValue($input.first().json);
+			vi.spyOn(workflowHelpers, 'resolveParameter').mockReturnValue($input.first().json);
 
 			expect(completions('{{ $input.first().| }}')).toHaveLength(
-				Object.keys($input.first().json).length +
-					(extensions('object').length + natives('object').length),
+				Object.keys($input.first().json).length + extensions('object').length,
 			);
 		});
 
 		test("should return completions for: '{{ $input.last().| }}'", () => {
-			resolveParameterSpy.mockReturnValue($input.last().json);
+			vi.spyOn(workflowHelpers, 'resolveParameter').mockReturnValue($input.last().json);
 
 			expect(completions('{{ $input.last().| }}')).toHaveLength(
-				Object.keys($input.last().json).length +
-					(extensions('object').length + natives('object').length),
+				Object.keys($input.last().json).length + extensions('object').length,
 			);
 		});
 
 		test("should return completions for: '{{ $input.all()[0].| }}'", () => {
-			resolveParameterSpy.mockReturnValue($input.all()[0].json);
+			vi.spyOn(workflowHelpers, 'resolveParameter').mockReturnValue($input.all()[0].json);
 
 			expect(completions('{{ $input.all()[0].| }}')).toHaveLength(
-				Object.keys($input.all()[0].json).length +
-					(extensions('object').length + natives('object').length),
+				Object.keys($input.all()[0].json).length + extensions('object').length,
 			);
 		});
 
 		test('should return completions for: {{ $input.item.json.str.| }}', () => {
-			resolveParameterSpy.mockReturnValue($input.item.json.str);
+			vi.spyOn(workflowHelpers, 'resolveParameter').mockReturnValue($input.item.json.str);
 
 			expect(completions('{{ $input.item.json.str.| }}')).toHaveLength(
-				extensions('string').length + natives('string').length,
+				extensions('string').length + natives('string').length + STRING_RECOMMENDED_OPTIONS.length,
 			);
 		});
 
 		test('should return completions for: {{ $input.item.json.num.| }}', () => {
-			resolveParameterSpy.mockReturnValue($input.item.json.num);
+			vi.spyOn(workflowHelpers, 'resolveParameter').mockReturnValue($input.item.json.num);
 
 			expect(completions('{{ $input.item.json.num.| }}')).toHaveLength(
-				extensions('number').length + natives('number').length,
+				extensions('number').length + natives('number').length + ['isEven()', 'isOdd()'].length,
 			);
 		});
 
 		test('should return completions for: {{ $input.item.json.arr.| }}', () => {
-			resolveParameterSpy.mockReturnValue($input.item.json.arr);
+			vi.spyOn(workflowHelpers, 'resolveParameter').mockReturnValue($input.item.json.arr);
 
 			expect(completions('{{ $input.item.json.arr.| }}')).toHaveLength(
 				extensions('array').length + natives('array').length,
@@ -385,22 +506,20 @@ describe('Resolution-based completions', () => {
 		});
 
 		test('should return completions for: {{ $input.item.json.obj.| }}', () => {
-			resolveParameterSpy.mockReturnValue($input.item.json.obj);
+			vi.spyOn(workflowHelpers, 'resolveParameter').mockReturnValue($input.item.json.obj);
 
 			expect(completions('{{ $input.item.json.obj.| }}')).toHaveLength(
-				Object.keys($input.item.json.obj).length +
-					(extensions('object').length + natives('object').length),
+				Object.keys($input.item.json.obj).length + extensions('object').length,
 			);
 		});
 	});
 
 	describe('bracket access', () => {
-		const resolveParameterSpy = vi.spyOn(workflowHelpers, 'resolveParameter');
 		const { $input } = mockProxy;
 
 		['{{ $input.item.json[| }}', '{{ $json[| }}'].forEach((expression) => {
 			test(`should return completions for: ${expression}`, () => {
-				resolveParameterSpy.mockReturnValue($input.item.json);
+				vi.spyOn(workflowHelpers, 'resolveParameter').mockReturnValue($input.item.json);
 
 				const found = completions(expression);
 
@@ -413,7 +532,7 @@ describe('Resolution-based completions', () => {
 
 		["{{ $input.item.json['obj'][| }}", "{{ $json['obj'][| }}"].forEach((expression) => {
 			test(`should return completions for: ${expression}`, () => {
-				resolveParameterSpy.mockReturnValue($input.item.json.obj);
+				vi.spyOn(workflowHelpers, 'resolveParameter').mockReturnValue($input.item.json.obj);
 
 				const found = completions(expression);
 
@@ -423,10 +542,242 @@ describe('Resolution-based completions', () => {
 				expect(found.map((c) => c.label).every((l) => l.endsWith(']')));
 			});
 		});
+
+		test('should give completions for keys that need bracket access', () => {
+			vi.spyOn(workflowHelpers, 'resolveParameter').mockReturnValue({
+				foo: 'bar',
+				'Key with spaces': 1,
+				'Key with spaces and \'quotes"': 1,
+			});
+
+			const found = completions('{{ $json.| }}');
+			if (!found) throw new Error('Expected to find completions');
+			expect(found).toContainEqual(
+				expect.objectContaining({
+					label: 'Key with spaces',
+					apply: utils.applyBracketAccessCompletion,
+				}),
+			);
+			expect(found).toContainEqual(
+				expect.objectContaining({
+					label: 'Key with spaces and \'quotes"',
+					apply: utils.applyBracketAccessCompletion,
+				}),
+			);
+		});
+
+		test('should escape keys with quotes', () => {
+			vi.spyOn(workflowHelpers, 'resolveParameter').mockReturnValue({
+				'Key with spaces and \'quotes"': 1,
+			});
+
+			const found = completions('{{ $json[| }}');
+			if (!found) throw new Error('Expected to find completions');
+			expect(found).toContainEqual(
+				expect.objectContaining({
+					label: "'Key with spaces and \\'quotes\"']",
+				}),
+			);
+		});
+	});
+
+	describe('recommended completions', () => {
+		test('should recommend toDateTime() for {{ "1-Feb-2024".| }}', () => {
+			// @ts-expect-error Spied function is mistyped
+			vi.spyOn(workflowHelpers, 'resolveParameter').mockReturnValueOnce('1-Feb-2024');
+
+			expect(completions('{{ "1-Feb-2024".| }}')?.[0]).toEqual(
+				expect.objectContaining({ label: 'toDateTime()', section: RECOMMENDED_SECTION }),
+			);
+		});
+
+		test('should recommend toInt(),toFloat() for: {{ "5.3".| }}', () => {
+			// @ts-expect-error Spied function is mistyped
+			vi.spyOn(workflowHelpers, 'resolveParameter').mockReturnValueOnce('5.3');
+			const options = completions('{{ "5.3".| }}');
+			expect(options?.[0]).toEqual(
+				expect.objectContaining({ label: 'toInt()', section: RECOMMENDED_SECTION }),
+			);
+			expect(options?.[1]).toEqual(
+				expect.objectContaining({ label: 'toFloat()', section: RECOMMENDED_SECTION }),
+			);
+		});
+
+		test('should recommend extractEmail() for: {{ "string with test@n8n.io in it".| }}', () => {
+			vi.spyOn(workflowHelpers, 'resolveParameter').mockReturnValueOnce(
+				// @ts-expect-error Spied function is mistyped
+				'string with test@n8n.io in it',
+			);
+			const options = completions('{{ "string with test@n8n.io in it".| }}');
+			expect(options?.[0]).toEqual(
+				expect.objectContaining({ label: 'extractEmail()', section: RECOMMENDED_SECTION }),
+			);
+		});
+
+		test('should recommend extractDomain(), isEmail() for: {{ "test@n8n.io".| }}', () => {
+			vi.spyOn(workflowHelpers, 'resolveParameter').mockReturnValueOnce(
+				// @ts-expect-error Spied function is mistyped
+				'test@n8n.io',
+			);
+			const options = completions('{{ "test@n8n.io".| }}');
+			expect(options?.[0]).toEqual(
+				expect.objectContaining({ label: 'extractDomain()', section: RECOMMENDED_SECTION }),
+			);
+			expect(options?.[1]).toEqual(
+				expect.objectContaining({ label: 'isEmail()', section: RECOMMENDED_SECTION }),
+			);
+		});
+
+		test('should recommend extractDomain(), extractUrlPath() for: {{ "https://n8n.io/pricing".| }}', () => {
+			vi.spyOn(workflowHelpers, 'resolveParameter').mockReturnValueOnce(
+				// @ts-expect-error Spied function is mistyped
+				'https://n8n.io/pricing',
+			);
+			const options = completions('{{ "https://n8n.io/pricing".| }}');
+			expect(options?.[0]).toEqual(
+				expect.objectContaining({ label: 'extractDomain()', section: RECOMMENDED_SECTION }),
+			);
+			expect(options?.[1]).toEqual(
+				expect.objectContaining({ label: 'extractUrlPath()', section: RECOMMENDED_SECTION }),
+			);
+		});
+
+		test('should recommend round(),floor(),ceil() for: {{ (5.46).| }}', () => {
+			vi.spyOn(workflowHelpers, 'resolveParameter').mockReturnValueOnce(
+				// @ts-expect-error Spied function is mistyped
+				5.46,
+			);
+			const options = completions('{{ (5.46).| }}');
+			expect(options?.[0]).toEqual(
+				expect.objectContaining({ label: 'round()', section: RECOMMENDED_SECTION }),
+			);
+			expect(options?.[1]).toEqual(
+				expect.objectContaining({ label: 'floor()', section: RECOMMENDED_SECTION }),
+			);
+			expect(options?.[2]).toEqual(
+				expect.objectContaining({ label: 'ceil()', section: RECOMMENDED_SECTION }),
+			);
+		});
+
+		test('should recommend toDateTime("s") for: {{ (1900062210).| }}', () => {
+			vi.spyOn(workflowHelpers, 'resolveParameter').mockReturnValueOnce(
+				// @ts-expect-error Spied function is mistyped
+				1900062210,
+			);
+			const options = completions('{{ (1900062210).| }}');
+			expect(options?.[0]).toEqual(
+				expect.objectContaining({ label: 'toDateTime("s")', section: RECOMMENDED_SECTION }),
+			);
+		});
+
+		test('should recommend toDateTime("ms") for: {{ (1900062210000).| }}', () => {
+			vi.spyOn(workflowHelpers, 'resolveParameter').mockReturnValueOnce(
+				// @ts-expect-error Spied function is mistyped
+				1900062210000,
+			);
+			const options = completions('{{ (1900062210000).| }}');
+			expect(options?.[0]).toEqual(
+				expect.objectContaining({ label: 'toDateTime("ms")', section: RECOMMENDED_SECTION }),
+			);
+		});
+
+		test('should recommend toBoolean() for: {{ (0).| }}', () => {
+			vi.spyOn(workflowHelpers, 'resolveParameter').mockReturnValueOnce(
+				// @ts-expect-error Spied function is mistyped
+				0,
+			);
+			const options = completions('{{ (0).| }}');
+			expect(options?.[0]).toEqual(
+				expect.objectContaining({ label: 'toBoolean()', section: RECOMMENDED_SECTION }),
+			);
+		});
+
+		test('should recommend toBoolean() for: {{ "true".| }}', () => {
+			vi.spyOn(workflowHelpers, 'resolveParameter').mockReturnValueOnce(
+				// @ts-expect-error Spied function is mistyped
+				'true',
+			);
+			const options = completions('{{ "true".| }}');
+			expect(options?.[0]).toEqual(
+				expect.objectContaining({ label: 'toBoolean()', section: RECOMMENDED_SECTION }),
+			);
+		});
+	});
+
+	describe('explicit completions (opened by Ctrl+Space or programatically)', () => {
+		test('should return completions for: {{ $json.foo| }}', () => {
+			vi.spyOn(workflowHelpers, 'resolveParameter')
+				// @ts-expect-error Spied function is mistyped
+				.mockReturnValueOnce(undefined)
+				// @ts-expect-error Spied function is mistyped
+				.mockReturnValueOnce('foo');
+
+			const result = completions('{{ $json.foo| }}', true);
+			expect(result).toHaveLength(
+				extensions('string').length + natives('string').length + STRING_RECOMMENDED_OPTIONS.length,
+			);
+		});
+	});
+
+	describe('type information', () => {
+		test('should display type information for: {{ $json.obj.| }}', () => {
+			vi.spyOn(workflowHelpers, 'resolveParameter').mockReturnValueOnce({
+				str: 'bar',
+				empty: null,
+				arr: [],
+				obj: {},
+			});
+
+			const result = completions('{{ $json.obj.| }}');
+			expect(result).toContainEqual(expect.objectContaining({ label: 'str', detail: 'string' }));
+			expect(result).toContainEqual(expect.objectContaining({ label: 'empty', detail: 'null' }));
+			expect(result).toContainEqual(expect.objectContaining({ label: 'arr', detail: 'array' }));
+			expect(result).toContainEqual(expect.objectContaining({ label: 'obj', detail: 'object' }));
+		});
+
+		test('should display type information for: {{ $input.item.json.| }}', () => {
+			vi.spyOn(workflowHelpers, 'resolveParameter').mockReturnValueOnce({
+				str: 'bar',
+				empty: null,
+				arr: [],
+				obj: {},
+			});
+
+			const result = completions('{{ $json.item.json.| }}');
+			expect(result).toContainEqual(expect.objectContaining({ label: 'str', detail: 'string' }));
+			expect(result).toContainEqual(expect.objectContaining({ label: 'empty', detail: 'null' }));
+			expect(result).toContainEqual(expect.objectContaining({ label: 'arr', detail: 'array' }));
+			expect(result).toContainEqual(expect.objectContaining({ label: 'obj', detail: 'object' }));
+		});
+
+		test('should display type information for: {{ $("My Node").item.json.| }}', () => {
+			vi.spyOn(workflowHelpers, 'resolveParameter').mockReturnValueOnce({
+				str: 'bar',
+				empty: null,
+				arr: [],
+				obj: {},
+			});
+
+			const result = completions('{{ $("My Node").item.json.| }}');
+			expect(result).toContainEqual(expect.objectContaining({ label: 'str', detail: 'string' }));
+			expect(result).toContainEqual(expect.objectContaining({ label: 'empty', detail: 'null' }));
+			expect(result).toContainEqual(expect.objectContaining({ label: 'arr', detail: 'array' }));
+			expect(result).toContainEqual(expect.objectContaining({ label: 'obj', detail: 'object' }));
+		});
+
+		test('should not display type information for other completions', () => {
+			vi.spyOn(workflowHelpers, 'resolveParameter').mockReturnValue({
+				str: 'bar',
+			});
+
+			expect(completions('{{ $execution.| }}')?.every((item) => !item.detail)).toBe(true);
+			expect(completions('{{ $input.params.| }}')?.every((item) => !item.detail)).toBe(true);
+			expect(completions('{{ $("My Node").| }}')?.every((item) => !item.detail)).toBe(true);
+		});
 	});
 });
 
-export function completions(docWithCursor: string) {
+export function completions(docWithCursor: string, explicit = false) {
 	const cursorPosition = docWithCursor.indexOf('|');
 
 	const doc = docWithCursor.slice(0, cursorPosition) + docWithCursor.slice(cursorPosition + 1);
@@ -437,7 +788,7 @@ export function completions(docWithCursor: string) {
 		extensions: [n8nLang()],
 	});
 
-	const context = new CompletionContext(state, cursorPosition, false);
+	const context = new CompletionContext(state, cursorPosition, explicit);
 
 	for (const completionSource of state.languageDataAt<CompletionSource>(
 		'autocomplete',
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/__tests__/mock.ts b/packages/editor-ui/src/plugins/codemirror/completions/__tests__/mock.ts
index 9616deb087b58..9e9b371b9a239 100644
--- a/packages/editor-ui/src/plugins/codemirror/completions/__tests__/mock.ts
+++ b/packages/editor-ui/src/plugins/codemirror/completions/__tests__/mock.ts
@@ -4,57 +4,45 @@ import type {
 	IConnections,
 	IRunExecutionData,
 	IExecuteData,
-	INodeType,
 	INodeTypeData,
-	INodeTypes,
-	IVersionedNodeType,
 } from 'n8n-workflow';
-import { Workflow, WorkflowDataProxy, NodeHelpers } from 'n8n-workflow';
+import { WorkflowDataProxy } from 'n8n-workflow';
+import { createTestWorkflowObject } from '@/__tests__/mocks';
 
-class NodeTypesClass implements INodeTypes {
-	nodeTypes: INodeTypeData = {
-		'test.set': {
-			sourcePath: '',
-			type: {
-				description: {
-					displayName: 'Set',
-					name: 'set',
-					group: ['input'],
-					version: 1,
-					description: 'Sets a value',
-					defaults: {
-						name: 'Set',
-						color: '#0000FF',
-					},
-					inputs: ['main'],
-					outputs: ['main'],
-					properties: [
-						{
-							displayName: 'Value1',
-							name: 'value1',
-							type: 'string',
-							default: 'default-value1',
-						},
-						{
-							displayName: 'Value2',
-							name: 'value2',
-							type: 'string',
-							default: 'default-value2',
-						},
-					],
+const nodeTypes: INodeTypeData = {
+	'test.set': {
+		sourcePath: '',
+		type: {
+			description: {
+				displayName: 'Set',
+				name: 'set',
+				group: ['input'],
+				version: 1,
+				description: 'Sets a value',
+				defaults: {
+					name: 'Set',
+					color: '#0000FF',
 				},
+				inputs: ['main'],
+				outputs: ['main'],
+				properties: [
+					{
+						displayName: 'Value1',
+						name: 'value1',
+						type: 'string',
+						default: 'default-value1',
+					},
+					{
+						displayName: 'Value2',
+						name: 'value2',
+						type: 'string',
+						default: 'default-value2',
+					},
+				],
 			},
 		},
-	};
-
-	getByName(nodeType: string): INodeType | IVersionedNodeType {
-		return this.nodeTypes[nodeType].type;
-	}
-
-	getByNameAndVersion(nodeType: string, version?: number): INodeType {
-		return NodeHelpers.getVersionedNodeType(this.nodeTypes[nodeType].type, version);
-	}
-}
+	},
+};
 
 const nodes: INode[] = [
 	{
@@ -273,13 +261,13 @@ const runExecutionData: IRunExecutionData = {
 	},
 };
 
-const workflow = new Workflow({
+const workflow = createTestWorkflowObject({
 	id: '123',
 	name: 'test workflow',
 	nodes,
 	connections,
 	active: false,
-	nodeTypes: new NodeTypesClass(),
+	nodeTypes,
 });
 
 const lastNodeName = 'End';
@@ -291,7 +279,7 @@ const executeData: IExecuteData = {
 	data: runExecutionData.resultData.runData[lastNodeName][0].data!,
 	node: nodes.find((node) => node.name === lastNodeName) as INode,
 	source: {
-		main: runExecutionData.resultData.runData[lastNodeName][0].source!,
+		main: runExecutionData.resultData.runData[lastNodeName][0].source,
 	},
 };
 
@@ -304,7 +292,6 @@ const dataProxy = new WorkflowDataProxy(
 	lastNodeConnectionInputData || [],
 	{},
 	'manual',
-	'America/New_York',
 	{},
 	executeData,
 );
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/bracketAccess.completions.ts b/packages/editor-ui/src/plugins/codemirror/completions/bracketAccess.completions.ts
index 26f579c760ea3..a922b1354cdf5 100644
--- a/packages/editor-ui/src/plugins/codemirror/completions/bracketAccess.completions.ts
+++ b/packages/editor-ui/src/plugins/codemirror/completions/bracketAccess.completions.ts
@@ -1,8 +1,9 @@
-import { resolveParameter } from '@/mixins/workflowHelpers';
+import { resolveParameter } from '@/composables/useWorkflowHelpers';
 import { prefixMatch, longestCommonPrefix } from './utils';
 import type { IDataObject } from 'n8n-workflow';
 import type { Completion, CompletionContext, CompletionResult } from '@codemirror/autocomplete';
 import type { Resolved } from './types';
+import { escapeMappingString } from '@/utils/mappingUtils';
 
 /**
  * Resolution-based completions offered at the start of bracket access notation.
@@ -67,7 +68,7 @@ function bracketAccessOptions(resolved: IDataObject) {
 			const isNumber = !isNaN(parseInt(key)); // array or string index
 
 			return {
-				label: isNumber ? `${key}]` : `'${key}']`,
+				label: isNumber ? `${key}]` : `'${escapeMappingString(key)}']`,
 				type: 'keyword',
 			};
 		});
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/constants.ts b/packages/editor-ui/src/plugins/codemirror/completions/constants.ts
new file mode 100644
index 0000000000000..cb8b3aeb3fadd
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/completions/constants.ts
@@ -0,0 +1,192 @@
+import type { Completion, CompletionSection } from '@codemirror/autocomplete';
+import { i18n } from '@/plugins/i18n';
+import { withSectionHeader } from './utils';
+
+export const FIELDS_SECTION: CompletionSection = withSectionHeader({
+	name: i18n.baseText('codeNodeEditor.completer.section.fields'),
+	rank: -1,
+});
+
+export const RECOMMENDED_SECTION: CompletionSection = withSectionHeader({
+	name: i18n.baseText('codeNodeEditor.completer.section.recommended'),
+	rank: 0,
+});
+
+export const RECOMMENDED_METHODS_SECTION: CompletionSection = withSectionHeader({
+	name: i18n.baseText('codeNodeEditor.completer.section.recommendedMethods'),
+	rank: 0,
+});
+
+export const PREVIOUS_NODES_SECTION: CompletionSection = withSectionHeader({
+	name: i18n.baseText('codeNodeEditor.completer.section.prevNodes'),
+	rank: 1,
+});
+
+export const PROPERTIES_SECTION: CompletionSection = withSectionHeader({
+	name: i18n.baseText('codeNodeEditor.completer.section.properties'),
+	rank: 2,
+});
+
+export const METHODS_SECTION: CompletionSection = withSectionHeader({
+	name: i18n.baseText('codeNodeEditor.completer.section.methods'),
+	rank: 3,
+});
+
+export const METADATA_SECTION: CompletionSection = withSectionHeader({
+	name: i18n.baseText('codeNodeEditor.completer.section.metadata'),
+	rank: 4,
+});
+
+export const OTHER_METHODS_SECTION: CompletionSection = withSectionHeader({
+	name: i18n.baseText('codeNodeEditor.completer.section.otherMethods'),
+	rank: 100,
+});
+
+export const OTHER_SECTION: CompletionSection = withSectionHeader({
+	name: i18n.baseText('codeNodeEditor.completer.section.other'),
+	rank: 101,
+});
+
+export const ROOT_DOLLAR_COMPLETIONS: Completion[] = [
+	{
+		label: '$json',
+		section: RECOMMENDED_SECTION,
+		info: i18n.rootVars.$json,
+	},
+	{
+		label: '$binary',
+		section: RECOMMENDED_SECTION,
+		info: i18n.rootVars.$binary,
+	},
+	{
+		label: '$now',
+		section: RECOMMENDED_SECTION,
+		info: i18n.rootVars.$now,
+	},
+	{
+		label: '$if()',
+		section: RECOMMENDED_SECTION,
+		info: i18n.rootVars.$if,
+	},
+	{
+		label: '$ifEmpty()',
+		section: RECOMMENDED_SECTION,
+		info: i18n.rootVars.$ifEmpty,
+	},
+	{
+		label: '$execution',
+		section: METADATA_SECTION,
+		info: i18n.rootVars.$execution,
+	},
+	{
+		label: '$itemIndex',
+		section: METADATA_SECTION,
+		info: i18n.rootVars.$itemIndex,
+	},
+	{
+		label: '$input',
+		section: METADATA_SECTION,
+		info: i18n.rootVars.$input,
+	},
+	{
+		label: '$parameter',
+		section: METADATA_SECTION,
+		info: i18n.rootVars.$parameter,
+	},
+	{
+		label: '$prevNode',
+		section: METADATA_SECTION,
+		info: i18n.rootVars.$prevNode,
+	},
+	{
+		label: '$runIndex',
+		section: METADATA_SECTION,
+		info: i18n.rootVars.$runIndex,
+	},
+	{
+		label: '$today',
+		section: METADATA_SECTION,
+		info: i18n.rootVars.$today,
+	},
+	{
+		label: '$vars',
+		section: METADATA_SECTION,
+		info: i18n.rootVars.$vars,
+	},
+	{
+		label: '$workflow',
+		section: METADATA_SECTION,
+		info: i18n.rootVars.$workflow,
+	},
+	{
+		label: '$jmespath()',
+		section: METHODS_SECTION,
+		info: i18n.rootVars.$jmespath,
+	},
+	{
+		label: '$max()',
+		section: METHODS_SECTION,
+		info: i18n.rootVars.$max,
+	},
+	{
+		label: '$min()',
+		section: METHODS_SECTION,
+		info: i18n.rootVars.$min,
+	},
+];
+
+export const STRING_RECOMMENDED_OPTIONS = [
+	'includes()',
+	'split()',
+	'startsWith()',
+	'replaceAll()',
+	'length',
+];
+
+export const DATE_RECOMMENDED_OPTIONS = ['format()', 'minus()', 'plus()', 'extract()'];
+export const LUXON_RECOMMENDED_OPTIONS = ['format()', 'minus()', 'plus()', 'diff()', 'extract()'];
+export const OBJECT_RECOMMENDED_OPTIONS = ['keys()', 'values()', 'isEmpty()', 'hasField()'];
+export const ARRAY_RECOMMENDED_OPTIONS = ['length', 'last()', 'includes()', 'map()', 'filter()'];
+export const ARRAY_NUMBER_ONLY_METHODS = ['max()', 'min()', 'sum()', 'average()'];
+
+export const LUXON_SECTIONS: Record<string, CompletionSection> = {
+	edit: withSectionHeader({
+		name: i18n.baseText('codeNodeEditor.completer.section.edit'),
+		rank: 1,
+	}),
+	compare: withSectionHeader({
+		name: i18n.baseText('codeNodeEditor.completer.section.compare'),
+		rank: 2,
+	}),
+	format: withSectionHeader({
+		name: i18n.baseText('codeNodeEditor.completer.section.format'),
+		rank: 3,
+	}),
+	query: withSectionHeader({
+		name: i18n.baseText('codeNodeEditor.completer.section.component'),
+		rank: 4,
+	}),
+};
+
+export const STRING_SECTIONS: Record<string, CompletionSection> = {
+	edit: withSectionHeader({
+		name: i18n.baseText('codeNodeEditor.completer.section.edit'),
+		rank: 1,
+	}),
+	query: withSectionHeader({
+		name: i18n.baseText('codeNodeEditor.completer.section.query'),
+		rank: 2,
+	}),
+	validation: withSectionHeader({
+		name: i18n.baseText('codeNodeEditor.completer.section.validation'),
+		rank: 3,
+	}),
+	case: withSectionHeader({
+		name: i18n.baseText('codeNodeEditor.completer.section.case'),
+		rank: 4,
+	}),
+	cast: withSectionHeader({
+		name: i18n.baseText('codeNodeEditor.completer.section.cast'),
+		rank: 5,
+	}),
+};
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/datatype.completions.ts b/packages/editor-ui/src/plugins/codemirror/completions/datatype.completions.ts
index b2ad69094a5d6..d3669da3c85d9 100644
--- a/packages/editor-ui/src/plugins/codemirror/completions/datatype.completions.ts
+++ b/packages/editor-ui/src/plugins/codemirror/completions/datatype.completions.ts
@@ -1,8 +1,8 @@
-import type { IDataObject, DocMetadata } from 'n8n-workflow';
-import { ExpressionExtensions, NativeMethods } from 'n8n-workflow';
+import type { IDataObject, DocMetadata, NativeDoc } from 'n8n-workflow';
+import { Expression, ExpressionExtensions, NativeMethods, validateFieldType } from 'n8n-workflow';
 import { DateTime } from 'luxon';
 import { i18n } from '@/plugins/i18n';
-import { resolveParameter } from '@/mixins/workflowHelpers';
+import { resolveParameter } from '@/composables/useWorkflowHelpers';
 import {
 	setRank,
 	hasNoParams,
@@ -13,15 +13,53 @@ import {
 	splitBaseTail,
 	isPseudoParam,
 	stripExcessParens,
+	isCredentialsModalOpen,
+	applyCompletion,
+	sortCompletionsAlpha,
+	hasRequiredArgs,
+	getDefaultArgs,
+	insertDefaultArgs,
+	applyBracketAccessCompletion,
+	applyBracketAccess,
 } from './utils';
-import type { Completion, CompletionContext, CompletionResult } from '@codemirror/autocomplete';
-import type { AutocompleteOptionType, ExtensionTypeName, FnToDoc, Resolved } from './types';
-import { sanitizeHtml } from '@/utils';
-import type { NativeDoc } from 'n8n-workflow/src/Extensions/Extensions';
+import type {
+	Completion,
+	CompletionContext,
+	CompletionResult,
+	CompletionSection,
+} from '@codemirror/autocomplete';
+import type {
+	AutocompleteInput,
+	AutocompleteOptionType,
+	ExtensionTypeName,
+	FnToDoc,
+	Resolved,
+} from './types';
+import { sanitizeHtml } from '@/utils/htmlUtils';
 import { isFunctionOption } from './typeGuards';
 import { luxonInstanceDocs } from './nativesAutocompleteDocs/luxon.instance.docs';
 import { luxonStaticDocs } from './nativesAutocompleteDocs/luxon.static.docs';
-import { useEnvironmentsStore } from '@/stores';
+import { useEnvironmentsStore } from '@/stores/environments.ee.store';
+import { useExternalSecretsStore } from '@/stores/externalSecrets.ee.store';
+import {
+	ARRAY_NUMBER_ONLY_METHODS,
+	ARRAY_RECOMMENDED_OPTIONS,
+	DATE_RECOMMENDED_OPTIONS,
+	FIELDS_SECTION,
+	LUXON_RECOMMENDED_OPTIONS,
+	LUXON_SECTIONS,
+	METHODS_SECTION,
+	OBJECT_RECOMMENDED_OPTIONS,
+	OTHER_METHODS_SECTION,
+	OTHER_SECTION,
+	PROPERTIES_SECTION,
+	RECOMMENDED_METHODS_SECTION,
+	RECOMMENDED_SECTION,
+	STRING_RECOMMENDED_OPTIONS,
+	STRING_SECTIONS,
+} from './constants';
+import { VALID_EMAIL_REGEX } from '@/constants';
+import { uniqBy } from 'lodash-es';
 
 /**
  * Resolution-based completions offered according to datatype.
@@ -33,17 +71,22 @@ export function datatypeCompletions(context: CompletionContext): CompletionResul
 
 	if (word.from === word.to && !context.explicit) return null;
 
-	// eslint-disable-next-line prefer-const
-	let [base, tail] = splitBaseTail(word.text);
+	const [base, tail] = splitBaseTail(word.text);
 
 	let options: Completion[] = [];
 
+	const isCredential = isCredentialsModalOpen();
+
 	if (base === 'DateTime') {
 		options = luxonStaticOptions().map(stripExcessParens(context));
 	} else if (base === 'Object') {
 		options = objectGlobalOptions().map(stripExcessParens(context));
 	} else if (base === '$vars') {
 		options = variablesOptions();
+	} else if (/\$secrets\./.test(base) && isCredential) {
+		options = secretOptions(base).map(stripExcessParens(context));
+	} else if (base === '$secrets' && isCredential) {
+		options = secretProvidersOptions();
 	} else {
 		let resolved: Resolved;
 
@@ -56,20 +99,29 @@ export function datatypeCompletions(context: CompletionContext): CompletionResul
 		if (resolved === null) return null;
 
 		try {
-			options = datatypeOptions(resolved, base).map(stripExcessParens(context));
+			options = datatypeOptions({ resolved, base, tail }).map(stripExcessParens(context));
 		} catch {
 			return null;
 		}
 	}
 
-	if (options.length === 0) return null;
-
 	if (tail !== '') {
 		options = options.filter((o) => prefixMatch(o.label, tail) && o.label !== tail);
 	}
 
+	let from = word.to - tail.length;
+
+	// When autocomplete is explicitely opened (by Ctrl+Space or programatically), add completions for the current word with '.' prefix
+	// example: {{ $json.str| }} -> ['length', 'includes()'...] (would usually need a '.' suffix)
+	if (context.explicit && !word.text.endsWith('.') && options.length === 0) {
+		options = explicitDataTypeOptions(word.text);
+		from = word.to;
+	}
+
+	if (options.length === 0) return null;
+
 	return {
-		from: word.to - tail.length,
+		from,
 		options,
 		filter: false,
 		getMatch(completion: Completion) {
@@ -80,57 +132,83 @@ export function datatypeCompletions(context: CompletionContext): CompletionResul
 	};
 }
 
-function datatypeOptions(resolved: Resolved, toResolve: string) {
+function explicitDataTypeOptions(expression: string): Completion[] {
+	try {
+		const resolved = resolveParameter(`={{ ${expression} }}`);
+		return datatypeOptions({
+			resolved,
+			base: expression,
+			tail: '',
+			transformLabel: (label) => '.' + label,
+		});
+	} catch {
+		return [];
+	}
+}
+
+function datatypeOptions(input: AutocompleteInput): Completion[] {
+	const { resolved } = input;
+
 	if (resolved === null) return [];
 
 	if (typeof resolved === 'number') {
-		return [...natives('number'), ...extensions('number')];
+		return numberOptions(input as AutocompleteInput<number>);
 	}
 
 	if (typeof resolved === 'string') {
-		return [...natives('string'), ...extensions('string')];
+		return stringOptions(input as AutocompleteInput<string>);
 	}
 
-	if (['$now', '$today'].includes(toResolve)) {
-		return [...luxonInstanceOptions(), ...extensions('date')];
+	if (typeof resolved === 'boolean') {
+		return booleanOptions();
+	}
+
+	if (resolved instanceof DateTime) {
+		return luxonOptions(input as AutocompleteInput<DateTime>);
 	}
 
 	if (resolved instanceof Date) {
-		return [...natives('date'), ...extensions('date')];
+		return dateOptions(input as AutocompleteInput<Date>);
 	}
 
 	if (Array.isArray(resolved)) {
-		if (/all\(.*?\)/.test(toResolve)) return [];
-
-		const arrayMethods = [...natives('array'), ...extensions('array')];
-
-		if (resolved.length > 0 && resolved.some((i) => typeof i !== 'number')) {
-			const NUMBER_ONLY_ARRAY_EXTENSIONS = new Set(['max()', 'min()', 'sum()', 'average()']);
-
-			return arrayMethods.filter((m) => !NUMBER_ONLY_ARRAY_EXTENSIONS.has(m.label));
-		}
-		return arrayMethods;
+		return arrayOptions(input as AutocompleteInput<unknown[]>);
 	}
 
 	if (typeof resolved === 'object') {
-		return objectOptions(toResolve, resolved);
+		return objectOptions(input as AutocompleteInput<IDataObject>);
 	}
 
 	return [];
 }
 
-export const natives = (typeName: ExtensionTypeName): Completion[] => {
+export const natives = (
+	typeName: ExtensionTypeName,
+	transformLabel: (label: string) => string = (label) => label,
+): Completion[] => {
 	const natives: NativeDoc = NativeMethods.find((ee) => ee.typeName.toLowerCase() === typeName);
 
 	if (!natives) return [];
 
-	const nativeProps = natives.properties ? toOptions(natives.properties, typeName, 'keyword') : [];
-	const nativeMethods = toOptions(natives.functions, typeName, 'native-function');
+	const nativeProps = natives.properties
+		? toOptions(natives.properties, typeName, 'keyword', false, transformLabel)
+		: [];
+	const nativeMethods = toOptions(
+		natives.functions,
+		typeName,
+		'native-function',
+		false,
+		transformLabel,
+	);
 
 	return [...nativeProps, ...nativeMethods];
 };
 
-export const extensions = (typeName: ExtensionTypeName) => {
+export const extensions = (
+	typeName: ExtensionTypeName,
+	includeHidden = false,
+	transformLabel: (label: string) => string = (label) => label,
+) => {
 	const extensions = ExpressionExtensions.find((ee) => ee.typeName.toLowerCase() === typeName);
 
 	if (!extensions) return [];
@@ -139,18 +217,39 @@ export const extensions = (typeName: ExtensionTypeName) => {
 		return { ...acc, [fnName]: { doc: fn.doc } };
 	}, {});
 
-	return toOptions(fnToDoc, typeName, 'extension-function');
+	return toOptions(fnToDoc, typeName, 'extension-function', includeHidden, transformLabel);
+};
+
+export const getType = (value: unknown): string => {
+	if (Array.isArray(value)) return 'array';
+	if (value === null) return 'null';
+	return (typeof value).toLocaleLowerCase();
+};
+
+export const isInputData = (base: string): boolean => {
+	return (
+		/^\$input\..*\.json]/.test(base) || /^\$json/.test(base) || /^\$\(.*\)\..*\.json/.test(base)
+	);
+};
+
+export const getDetail = (base: string, value: unknown): string | undefined => {
+	const type = getType(value);
+	if (!isInputData(base) || type === 'function') return undefined;
+	return type;
 };
 
 export const toOptions = (
 	fnToDoc: FnToDoc,
 	typeName: ExtensionTypeName,
 	optionType: AutocompleteOptionType = 'native-function',
+	includeHidden = false,
+	transformLabel: (label: string) => string = (label) => label,
 ) => {
 	return Object.entries(fnToDoc)
 		.sort((a, b) => a[0].localeCompare(b[0]))
-		.map(([fnName, fn]) => {
-			return createCompletionOption(typeName, fnName, optionType, fn);
+		.filter(([, docInfo]) => (docInfo.doc && !docInfo.doc?.hidden) || includeHidden)
+		.map(([fnName, docInfo]) => {
+			return createCompletionOption(typeName, fnName, optionType, docInfo, transformLabel);
 		});
 };
 
@@ -159,10 +258,19 @@ const createCompletionOption = (
 	name: string,
 	optionType: AutocompleteOptionType,
 	docInfo: { doc?: DocMetadata | undefined },
+	transformLabel: (label: string) => string = (label) => label,
 ): Completion => {
+	const isFunction = isFunctionOption(optionType);
+	const label = isFunction ? name + '()' : name;
 	const option: Completion = {
-		label: isFunctionOption(optionType) ? name + '()' : name,
+		label,
 		type: optionType,
+		section: docInfo.doc?.section,
+		apply: applyCompletion({
+			hasArgs: hasRequiredArgs(docInfo?.doc),
+			defaultArgs: getDefaultArgs(docInfo?.doc),
+			transformLabel,
+		}),
 	};
 
 	option.info = () => {
@@ -189,7 +297,7 @@ const createCompletionOption = (
 				const descriptionLink = document.createElement('a');
 				descriptionLink.setAttribute('target', '_blank');
 				descriptionLink.setAttribute('href', docInfo.doc.docURL);
-				descriptionLink.innerText = i18n.autocompleteUIValues['docLinkLabel'] || 'Learn more';
+				descriptionLink.innerText = i18n.autocompleteUIValues.docLinkLabel || 'Learn more';
 				descriptionLink.addEventListener('mousedown', (event: MouseEvent) => {
 					// This will prevent documentation popup closing before click
 					// event gets to links
@@ -248,7 +356,11 @@ const createPropHeader = (typeName: string, property: { doc?: DocMetadata | unde
 	const header = document.createElement('div');
 	if (property.doc) {
 		const typeNameSpan = document.createElement('span');
-		typeNameSpan.innerHTML = typeName.slice(0, 1).toUpperCase() + typeName.slice(1) + '.';
+		typeNameSpan.innerHTML = typeName.charAt(0).toUpperCase() + typeName.slice(1);
+
+		if (!property.doc.name.startsWith("['")) {
+			typeNameSpan.innerHTML += '.';
+		}
 
 		const propNameSpan = document.createElement('span');
 		propNameSpan.classList.add('autocomplete-info-name');
@@ -264,15 +376,16 @@ const createPropHeader = (typeName: string, property: { doc?: DocMetadata | unde
 	return header;
 };
 
-const objectOptions = (toResolve: string, resolved: IDataObject) => {
+const objectOptions = (input: AutocompleteInput<IDataObject>): Completion[] => {
+	const { base, resolved, transformLabel = (label) => label } = input;
 	const rank = setRank(['item', 'all', 'first', 'last']);
 	const SKIP = new Set(['__ob__', 'pairedItem']);
 
 	if (isSplitInBatchesAbsent()) SKIP.add('context');
 
-	const name = toResolve.startsWith('$(') ? '$()' : toResolve;
+	const name = /^\$\(.*\)$/.test(base) ? '$()' : base;
 
-	if (['$input', '$()'].includes(name) && hasNoParams(toResolve)) SKIP.add('params');
+	if (['$input', '$()'].includes(name) && hasNoParams(base)) SKIP.add('params');
 
 	let rawKeys = Object.keys(resolved);
 
@@ -280,35 +393,47 @@ const objectOptions = (toResolve: string, resolved: IDataObject) => {
 		rawKeys = Reflect.ownKeys(resolved) as string[];
 	}
 
-	if (toResolve === 'Math') {
+	if (base === 'Math') {
 		const descriptors = Object.getOwnPropertyDescriptors(Math);
 		rawKeys = Object.keys(descriptors).sort((a, b) => a.localeCompare(b));
 	}
 
 	const localKeys = rank(rawKeys)
-		.filter((key) => !SKIP.has(key) && isAllowedInDotNotation(key) && !isPseudoParam(key))
+		.filter((key) => !SKIP.has(key) && !isPseudoParam(key))
 		.map((key) => {
 			ensureKeyCanBeResolved(resolved, key);
+			const needsBracketAccess = !isAllowedInDotNotation(key);
+			const resolvedProp = resolved[key];
 
-			const isFunction = typeof resolved[key] === 'function';
+			const isFunction = typeof resolvedProp === 'function';
+			const hasArgs = isFunction && resolvedProp.length > 0 && name !== '$()';
 
 			const option: Completion = {
 				label: isFunction ? key + '()' : key,
-				type: isFunction ? 'function' : 'keyword',
+				section: getObjectPropertySection({ name, key, isFunction }),
+				apply: needsBracketAccess
+					? applyBracketAccessCompletion
+					: applyCompletion({
+							hasArgs,
+							transformLabel,
+						}),
+				detail: getDetail(name, resolvedProp),
 			};
 
 			const infoKey = [name, key].join('.');
+			const infoName = needsBracketAccess ? applyBracketAccess(key) : key;
 			option.info = createCompletionOption(
-				'Object',
-				key,
+				'',
+				infoName,
 				isFunction ? 'native-function' : 'keyword',
 				{
 					doc: {
-						name: key,
-						returnType: typeof resolved[key],
+						name: infoName,
+						returnType: getType(resolvedProp),
 						description: i18n.proxyVars[infoKey],
 					},
 				},
+				transformLabel,
 			).info;
 
 			return option;
@@ -317,14 +442,274 @@ const objectOptions = (toResolve: string, resolved: IDataObject) => {
 	const skipObjectExtensions =
 		resolved.isProxy ||
 		resolved.json ||
-		/json('])?$/.test(toResolve) ||
-		toResolve === '$execution' ||
-		toResolve.endsWith('params') ||
-		toResolve === 'Math';
+		/json('])$/.test(base) ||
+		base === '$execution' ||
+		base.endsWith('params') ||
+		base === 'Math';
+
+	if (skipObjectExtensions) {
+		return sortCompletionsAlpha([...localKeys, ...natives('object')]);
+	}
+
+	return applySections({
+		options: sortCompletionsAlpha([...localKeys, ...natives('object'), ...extensions('object')]),
+		recommended: OBJECT_RECOMMENDED_OPTIONS,
+		recommendedSection: RECOMMENDED_METHODS_SECTION,
+		methodsSection: OTHER_METHODS_SECTION,
+		propSection: FIELDS_SECTION,
+		excludeRecommended: true,
+	});
+};
+
+const getObjectPropertySection = ({
+	name,
+	key,
+	isFunction,
+}: {
+	name: string;
+	key: string;
+	isFunction: boolean;
+}): CompletionSection => {
+	if (name === '$input' || name === '$()') {
+		if (key === 'item') return RECOMMENDED_SECTION;
+		return OTHER_SECTION;
+	}
+
+	return isFunction ? METHODS_SECTION : FIELDS_SECTION;
+};
+
+const applySections = ({
+	options,
+	sections,
+	recommended = [],
+	excludeRecommended = false,
+	methodsSection = METHODS_SECTION,
+	propSection = PROPERTIES_SECTION,
+	recommendedSection = RECOMMENDED_SECTION,
+}: {
+	options: Completion[];
+	recommended?: Array<string | { label: string; args: unknown[] }>;
+	recommendedSection?: CompletionSection;
+	methodsSection?: CompletionSection;
+	propSection?: CompletionSection;
+	sections?: Record<string, CompletionSection>;
+	excludeRecommended?: boolean;
+}) => {
+	const recommendedSet = new Set(recommended);
+	const optionByLabel = options.reduce(
+		(acc, option) => {
+			acc[option.label] = option;
+			return acc;
+		},
+		{} as Record<string, Completion>,
+	);
+	return recommended
+		.map((reco): Completion => {
+			const option = optionByLabel[typeof reco === 'string' ? reco : reco.label];
+			const label =
+				typeof reco === 'string' ? option.label : insertDefaultArgs(reco.label, reco.args);
+			return { ...option, label, section: recommendedSection };
+		})
+		.concat(
+			options
+				.filter((option) => !excludeRecommended || !recommendedSet.has(option.label))
+				.map((option) => {
+					if (sections) {
+						option.section = sections[option.section as string] ?? OTHER_SECTION;
+					} else {
+						option.section = option.label.endsWith('()') ? methodsSection : propSection;
+					}
+					return option;
+				}),
+		);
+};
+
+const isUrl = (url: string): boolean => {
+	try {
+		new URL(url);
+		return true;
+	} catch (error) {
+		return false;
+	}
+};
+
+const stringOptions = (input: AutocompleteInput<string>): Completion[] => {
+	const { resolved, transformLabel } = input;
+	const options = sortCompletionsAlpha([
+		...natives('string', transformLabel),
+		...extensions('string', false, transformLabel),
+	]);
+
+	if (validateFieldType('string', resolved, 'number').valid) {
+		return applySections({
+			options,
+			recommended: ['toInt()', 'toFloat()'],
+			sections: STRING_SECTIONS,
+		});
+	}
+
+	if (validateFieldType('string', resolved, 'dateTime').valid) {
+		return applySections({
+			options,
+			recommended: ['toDateTime()'],
+			sections: STRING_SECTIONS,
+		});
+	}
+
+	if (VALID_EMAIL_REGEX.test(resolved)) {
+		return applySections({
+			options,
+			recommended: ['extractDomain()', 'isEmail()', ...STRING_RECOMMENDED_OPTIONS],
+			sections: STRING_SECTIONS,
+		});
+	}
+
+	if (isUrl(resolved)) {
+		return applySections({
+			options,
+			recommended: ['extractDomain()', 'extractUrlPath()', ...STRING_RECOMMENDED_OPTIONS],
+			sections: STRING_SECTIONS,
+		});
+	}
+
+	if (resolved.split(/\s/).find((token) => VALID_EMAIL_REGEX.test(token))) {
+		return applySections({
+			options,
+			recommended: ['extractEmail()', ...STRING_RECOMMENDED_OPTIONS],
+			sections: STRING_SECTIONS,
+		});
+	}
+
+	const trimmed = resolved.trim();
+	if (
+		(trimmed.startsWith('{') && trimmed.endsWith('}')) ||
+		(trimmed.startsWith('[') && trimmed.endsWith(']'))
+	) {
+		return applySections({
+			options,
+			recommended: ['parseJson()', ...STRING_RECOMMENDED_OPTIONS],
+			sections: STRING_SECTIONS,
+		});
+	}
 
-	if (skipObjectExtensions) return [...localKeys, ...natives('object')];
+	if (['true', 'false'].includes(resolved.toLocaleLowerCase())) {
+		return applySections({
+			options,
+			recommended: ['toBoolean()', ...STRING_RECOMMENDED_OPTIONS],
+			sections: STRING_SECTIONS,
+		});
+	}
+
+	return applySections({
+		options,
+		recommended: STRING_RECOMMENDED_OPTIONS,
+		sections: STRING_SECTIONS,
+	});
+};
 
-	return [...localKeys, ...natives('object'), ...extensions('object')];
+const booleanOptions = (): Completion[] => {
+	return applySections({
+		options: sortCompletionsAlpha([...natives('boolean'), ...extensions('boolean')]),
+	});
+};
+
+const numberOptions = (input: AutocompleteInput<number>): Completion[] => {
+	const { resolved, transformLabel } = input;
+	const options = sortCompletionsAlpha([
+		...natives('number', transformLabel),
+		...extensions('number', false, transformLabel),
+	]);
+	const ONLY_INTEGER = ['isEven()', 'isOdd()'];
+
+	if (Number.isInteger(resolved)) {
+		const nowMillis = Date.now();
+		const marginMillis = 946_707_779_000; // 30y
+		const isPlausableMillisDateTime =
+			resolved > nowMillis - marginMillis && resolved < nowMillis + marginMillis;
+
+		if (isPlausableMillisDateTime) {
+			return applySections({
+				options,
+				recommended: [{ label: 'toDateTime()', args: ['ms'] }],
+			});
+		}
+
+		const nowSeconds = nowMillis / 1000;
+		const marginSeconds = marginMillis / 1000;
+		const isPlausableSecondsDateTime =
+			resolved > nowSeconds - marginSeconds && resolved < nowSeconds + marginSeconds;
+		if (isPlausableSecondsDateTime) {
+			return applySections({
+				options,
+				recommended: [{ label: 'toDateTime()', args: ['s'] }],
+			});
+		}
+
+		if (resolved === 0 || resolved === 1) {
+			return applySections({
+				options,
+				recommended: ['toBoolean()'],
+			});
+		}
+
+		return applySections({
+			options,
+			recommended: ONLY_INTEGER,
+		});
+	} else {
+		const exclude = new Set(ONLY_INTEGER);
+		return applySections({
+			options: options.filter((option) => !exclude.has(option.label)),
+			recommended: ['round()', 'floor()', 'ceil()'],
+		});
+	}
+};
+
+const dateOptions = (input: AutocompleteInput<Date>): Completion[] => {
+	return applySections({
+		options: sortCompletionsAlpha([
+			...natives('date', input.transformLabel),
+			...extensions('date', true, input.transformLabel),
+		]),
+		recommended: DATE_RECOMMENDED_OPTIONS,
+	});
+};
+
+const luxonOptions = (input: AutocompleteInput<DateTime>): Completion[] => {
+	return applySections({
+		options: sortCompletionsAlpha(
+			uniqBy(
+				[
+					...extensions('date', false, input.transformLabel),
+					...luxonInstanceOptions(false, input.transformLabel),
+				],
+				(option) => option.label,
+			),
+		),
+		recommended: LUXON_RECOMMENDED_OPTIONS,
+		sections: LUXON_SECTIONS,
+	});
+};
+
+const arrayOptions = (input: AutocompleteInput<unknown[]>): Completion[] => {
+	const { resolved, transformLabel } = input;
+	const options = applySections({
+		options: sortCompletionsAlpha([
+			...natives('array', transformLabel),
+			...extensions('array', false, transformLabel),
+		]),
+		recommended: ARRAY_RECOMMENDED_OPTIONS,
+		methodsSection: OTHER_SECTION,
+		propSection: OTHER_SECTION,
+		excludeRecommended: true,
+	});
+
+	if (resolved.length > 0 && resolved.some((i) => typeof i !== 'number')) {
+		const NUMBER_ONLY_ARRAY_EXTENSIONS = new Set(ARRAY_NUMBER_ONLY_METHODS);
+
+		return options.filter((m) => !NUMBER_ONLY_ARRAY_EXTENSIONS.has(m.label));
+	}
+	return options;
 };
 
 function ensureKeyCanBeResolved(obj: IDataObject, key: string) {
@@ -352,10 +737,61 @@ export const variablesOptions = () => {
 	);
 };
 
+export const secretOptions = (base: string) => {
+	const externalSecretsStore = useExternalSecretsStore();
+	let resolved: Resolved;
+
+	try {
+		resolved = Expression.resolveWithoutWorkflow(`{{ ${base} }}`, {
+			$secrets: externalSecretsStore.secretsAsObject,
+		});
+	} catch {
+		return [];
+	}
+
+	if (resolved === null) return [];
+
+	try {
+		if (typeof resolved !== 'object') {
+			return [];
+		}
+		return Object.entries(resolved).map(([secret, value]) =>
+			createCompletionOption('', secret, 'keyword', {
+				doc: {
+					name: secret,
+					returnType: typeof value,
+					description: i18n.baseText('codeNodeEditor.completer.$secrets.provider.varName'),
+					docURL: i18n.baseText('settings.externalSecrets.docs'),
+				},
+			}),
+		);
+	} catch {
+		return [];
+	}
+};
+
+export const secretProvidersOptions = () => {
+	const externalSecretsStore = useExternalSecretsStore();
+
+	return Object.keys(externalSecretsStore.secretsAsObject).map((provider) =>
+		createCompletionOption('Object', provider, 'keyword', {
+			doc: {
+				name: provider,
+				returnType: 'object',
+				description: i18n.baseText('codeNodeEditor.completer.$secrets.provider'),
+				docURL: i18n.baseText('settings.externalSecrets.docs'),
+			},
+		}),
+	);
+};
+
 /**
  * Methods and fields defined on a Luxon `DateTime` class instance.
  */
-export const luxonInstanceOptions = () => {
+export const luxonInstanceOptions = (
+	includeHidden = false,
+	transformLabel: (label: string) => string = (label) => label,
+) => {
 	const SKIP = new Set(['constructor', 'get', 'invalidExplanation', 'invalidReason']);
 
 	return Object.entries(Object.getOwnPropertyDescriptors(DateTime.prototype))
@@ -364,8 +800,16 @@ export const luxonInstanceOptions = () => {
 		.map(([key, descriptor]) => {
 			const isFunction = typeof descriptor.value === 'function';
 			const optionType = isFunction ? 'native-function' : 'keyword';
-			return createLuxonAutocompleteOption(key, optionType, luxonInstanceDocs, i18n.luxonInstance);
-		});
+			return createLuxonAutocompleteOption(
+				key,
+				optionType,
+				luxonInstanceDocs,
+				i18n.luxonInstance,
+				includeHidden,
+				transformLabel,
+			) as Completion;
+		})
+		.filter(Boolean);
 };
 
 /**
@@ -374,17 +818,19 @@ export const luxonInstanceOptions = () => {
 export const luxonStaticOptions = () => {
 	const SKIP = new Set(['prototype', 'name', 'length', 'invalid']);
 
-	return Object.keys(Object.getOwnPropertyDescriptors(DateTime))
-		.filter((key) => !SKIP.has(key) && !key.includes('_'))
-		.sort((a, b) => a.localeCompare(b))
-		.map((key) => {
-			return createLuxonAutocompleteOption(
-				key,
-				'native-function',
-				luxonStaticDocs,
-				i18n.luxonStatic,
-			);
-		});
+	return sortCompletionsAlpha(
+		Object.keys(Object.getOwnPropertyDescriptors(DateTime))
+			.filter((key) => !SKIP.has(key) && !key.includes('_'))
+			.map((key) => {
+				return createLuxonAutocompleteOption(
+					key,
+					'native-function',
+					luxonStaticDocs,
+					i18n.luxonStatic,
+				) as Completion;
+			})
+			.filter(Boolean),
+	);
 };
 
 const createLuxonAutocompleteOption = (
@@ -392,11 +838,11 @@ const createLuxonAutocompleteOption = (
 	type: AutocompleteOptionType,
 	docDefinition: NativeDoc,
 	translations: Record<string, string | undefined>,
-): Completion => {
-	const option: Completion = {
-		label: isFunctionOption(type) ? name + '()' : name,
-		type,
-	};
+	includeHidden = false,
+	transformLabel: (label: string) => string = (label) => label,
+): Completion | null => {
+	const isFunction = isFunctionOption(type);
+	const label = isFunction ? name + '()' : name;
 
 	let doc: DocMetadata | undefined;
 	if (docDefinition.properties && docDefinition.properties.hasOwnProperty(name)) {
@@ -414,10 +860,31 @@ const createLuxonAutocompleteOption = (
 			docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetime',
 		};
 	}
-	option.info = createCompletionOption('DateTime', name, type, {
-		// Add translated description
-		doc: { ...doc, description: translations[name] } as DocMetadata,
-	}).info;
+
+	if (!doc || (doc?.hidden && !includeHidden)) {
+		return null;
+	}
+
+	const option: Completion = {
+		label,
+		type,
+		section: doc?.section,
+		apply: applyCompletion({
+			hasArgs: hasRequiredArgs(doc),
+			defaultArgs: getDefaultArgs(doc),
+			transformLabel,
+		}),
+	};
+	option.info = createCompletionOption(
+		'DateTime',
+		name,
+		type,
+		{
+			// Add translated description
+			doc: { ...doc, description: translations[name] } as DocMetadata,
+		},
+		transformLabel,
+	).info;
 	return option;
 };
 
@@ -440,18 +907,20 @@ export const objectGlobalOptions = () => {
 };
 
 const regexes = {
-	generalRef: /\$[^$]+\.([^{\s])*/, // $input. or $json. or similar ones
-	selectorRef: /\$\(['"][\S\s]+['"]\)\.([^{\s])*/, // $('nodeName').
-
-	numberLiteral: /\((\d+)\.?(\d*)\)\.([^{\s])*/, // (123). or (123.4).
-	stringLiteral: /(".+"|('.+'))\.([^{\s])*/, // 'abc'. or "abc".
-	dateLiteral: /\(?new Date\(\(?.*?\)\)?\.([^{\s])*/, // new Date(). or (new Date()).
-	arrayLiteral: /(\[.+\])\.([^{\s])*/, // [1, 2, 3].
-	objectLiteral: /\(\{.*\}\)\.([^{\s])*/, // ({}).
-
-	mathGlobal: /Math\.([^{\s])*/, // Math.
-	datetimeGlobal: /DateTime\.[^.}]*/, // DateTime.
-	objectGlobal: /Object\.(\w+\(.*\)\.[^{\s]*)?/, // Object. or Object.method(arg).
+	generalRef: /\$[^$'"]+\.(.*)/, // $input. or $json. or similar ones
+	selectorRef: /\$\(['"][\S\s]+['"]\)\.(.*)/, // $('nodeName').
+
+	numberLiteral: /\((\d+)\.?(\d*)\)\.(.*)/, // (123). or (123.4).
+	singleQuoteStringLiteral: /('.+')\.([^'{\s])*/, // 'abc'.
+	doubleQuoteStringLiteral: /(".+")\.([^"{\s])*/, // "abc".
+	dateLiteral: /\(?new Date\(\(?.*?\)\)?\.(.*)/, // new Date(). or (new Date()).
+	arrayLiteral: /\(?(\[.*\])\)?\.(.*)/, // [1, 2, 3].
+	indexedAccess: /([^"{\s]+\[.+\])\.(.*)/, // 'abc'[0]. or 'abc'.split('')[0] or similar ones
+	objectLiteral: /\(\{.*\}\)\.(.*)/, // ({}).
+
+	mathGlobal: /Math\.(.*)/, // Math.
+	datetimeGlobal: /DateTime\.(.*)/, // DateTime.
+	objectGlobal: /Object\.(.*)/, // Object. or Object.method(arg).
 };
 
 const DATATYPE_REGEX = new RegExp(
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/dollar.completions.ts b/packages/editor-ui/src/plugins/codemirror/completions/dollar.completions.ts
index 01c4eb1fee5fa..3337bb922176b 100644
--- a/packages/editor-ui/src/plugins/codemirror/completions/dollar.completions.ts
+++ b/packages/editor-ui/src/plugins/codemirror/completions/dollar.completions.ts
@@ -3,12 +3,17 @@ import {
 	autocompletableNodeNames,
 	receivesNoBinaryData,
 	longestCommonPrefix,
-	setRank,
 	prefixMatch,
 	stripExcessParens,
 	hasActiveNode,
+	isCredentialsModalOpen,
+	applyCompletion,
+	isInHttpNodePagination,
 } from './utils';
 import type { Completion, CompletionContext, CompletionResult } from '@codemirror/autocomplete';
+import { useExternalSecretsStore } from '@/stores/externalSecrets.ee.store';
+import { escapeMappingString } from '@/utils/mappingUtils';
+import { PREVIOUS_NODES_SECTION, RECOMMENDED_SECTION, ROOT_DOLLAR_COMPLETIONS } from './constants';
 
 /**
  * Completions offered at the dollar position: `$|`
@@ -42,38 +47,49 @@ export function dollarCompletions(context: CompletionContext): CompletionResult
 	};
 }
 
-export function dollarOptions() {
-	const rank = setRank(['$json', '$input']);
+export function dollarOptions(): Completion[] {
 	const SKIP = new Set();
-	const DOLLAR_FUNCTIONS = ['$jmespath'];
-
-	if (!hasActiveNode()) return []; // e.g. credential modal
-
-	if (receivesNoBinaryData()) SKIP.add('$binary');
-
-	const keys = Object.keys(i18n.rootVars).sort((a, b) => a.localeCompare(b));
-
-	return rank(keys)
-		.filter((key) => !SKIP.has(key))
-		.map((key) => {
-			const isFunction = DOLLAR_FUNCTIONS.includes(key);
+	let recommendedCompletions: Completion[] = [];
+
+	if (isInHttpNodePagination()) {
+		recommendedCompletions = [
+			{ label: '$pageCount', section: RECOMMENDED_SECTION, info: i18n.rootVars.$pageCount },
+			{ label: '$response', section: RECOMMENDED_SECTION, info: i18n.rootVars.$response },
+			{ label: '$request', section: RECOMMENDED_SECTION, info: i18n.rootVars.$request },
+		];
+	}
 
-			const option: Completion = {
-				label: isFunction ? key + '()' : key,
-				type: isFunction ? 'function' : 'keyword',
-			};
+	if (isCredentialsModalOpen()) {
+		return useExternalSecretsStore().isEnterpriseExternalSecretsEnabled
+			? [
+					{
+						label: '$secrets',
+						type: 'keyword',
+					},
+					{
+						label: '$vars',
+						type: 'keyword',
+					},
+				]
+			: [];
+	}
 
-			const info = i18n.rootVars[key];
+	if (!hasActiveNode()) {
+		return [];
+	}
 
-			if (info) option.info = info;
+	if (receivesNoBinaryData()) SKIP.add('$binary');
 
-			return option;
-		})
-		.concat(
-			autocompletableNodeNames().map((nodeName) => ({
-				label: `$('${nodeName}')`,
-				type: 'keyword',
-				info: i18n.baseText('codeNodeEditor.completer.$()', { interpolate: { nodeName } }),
-			})),
-		);
+	const previousNodesCompletions = autocompletableNodeNames().map((nodeName) => ({
+		label: `$('${escapeMappingString(nodeName)}')`,
+		type: 'keyword',
+		info: i18n.baseText('codeNodeEditor.completer.$()', { interpolate: { nodeName } }),
+		section: PREVIOUS_NODES_SECTION,
+	}));
+
+	return recommendedCompletions
+		.concat(ROOT_DOLLAR_COMPLETIONS)
+		.filter(({ label }) => !SKIP.has(label))
+		.concat(previousNodesCompletions)
+		.map((completion) => ({ ...completion, apply: applyCompletion() }));
 }
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/nativesAutocompleteDocs/luxon.instance.docs.ts b/packages/editor-ui/src/plugins/codemirror/completions/nativesAutocompleteDocs/luxon.instance.docs.ts
index 9df1f5b6c86cb..021ebabb70c97 100644
--- a/packages/editor-ui/src/plugins/codemirror/completions/nativesAutocompleteDocs/luxon.instance.docs.ts
+++ b/packages/editor-ui/src/plugins/codemirror/completions/nativesAutocompleteDocs/luxon.instance.docs.ts
@@ -1,4 +1,4 @@
-import type { NativeDoc } from 'n8n-workflow/src/Extensions/Extensions';
+import type { NativeDoc } from 'n8n-workflow';
 
 // Autocomplete documentation definition for DateTime instance props and methods
 // Descriptions are added dynamically so they can be localized
@@ -8,6 +8,7 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		day: {
 			doc: {
 				name: 'day',
+				section: 'query',
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimeday',
 				returnType: 'number',
 			},
@@ -15,6 +16,8 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		daysInMonth: {
 			doc: {
 				name: 'daysInMonth',
+				section: 'query',
+				hidden: true,
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimedaysinmonth',
 				returnType: 'number',
 			},
@@ -22,6 +25,8 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		daysInYear: {
 			doc: {
 				name: 'daysInYear',
+				hidden: true,
+				section: 'query',
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimedaysinyear',
 				returnType: 'number',
 			},
@@ -29,6 +34,7 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		hour: {
 			doc: {
 				name: 'hour',
+				section: 'query',
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimehour',
 				returnType: 'number',
 			},
@@ -36,6 +42,7 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		locale: {
 			doc: {
 				name: 'locale',
+				section: 'query',
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimelocale',
 				returnType: 'string',
 			},
@@ -43,6 +50,7 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		millisecond: {
 			doc: {
 				name: 'millisecond',
+				section: 'query',
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimemillisecond',
 				returnType: 'number',
 			},
@@ -50,6 +58,7 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		minute: {
 			doc: {
 				name: 'minute',
+				section: 'query',
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimeminute',
 				returnType: 'number',
 			},
@@ -57,6 +66,7 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		month: {
 			doc: {
 				name: 'month',
+				section: 'query',
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimemonth',
 				returnType: 'number',
 			},
@@ -64,6 +74,7 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		monthLong: {
 			doc: {
 				name: 'monthLong',
+				section: 'query',
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimemonthlong',
 				returnType: 'string',
 			},
@@ -71,6 +82,7 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		monthShort: {
 			doc: {
 				name: 'monthShort',
+				section: 'query',
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimemonthshort',
 				returnType: 'string',
 			},
@@ -78,6 +90,8 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		numberingSystem: {
 			doc: {
 				name: 'numberingSystem',
+				section: 'query',
+				hidden: true,
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimenumberingsystem',
 				returnType: 'string',
 			},
@@ -85,6 +99,8 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		offset: {
 			doc: {
 				name: 'offset',
+				section: 'query',
+				hidden: true,
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimeoffset',
 				returnType: 'number',
 			},
@@ -92,6 +108,8 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		offsetNameLong: {
 			doc: {
 				name: 'offsetNameLong',
+				section: 'query',
+				hidden: true,
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimeoffsetnamelong',
 				returnType: 'string',
 			},
@@ -99,6 +117,8 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		offsetNameShort: {
 			doc: {
 				name: 'offsetNameShort',
+				section: 'query',
+				hidden: true,
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimeoffsetnameshort',
 				returnType: 'string',
 			},
@@ -106,6 +126,8 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		ordinal: {
 			doc: {
 				name: 'ordinal',
+				section: 'query',
+				hidden: true,
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimeordinal',
 				returnType: 'string',
 			},
@@ -113,6 +135,8 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		outputCalendar: {
 			doc: {
 				name: 'outputCalendar',
+				section: 'query',
+				hidden: true,
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimeoutputcalendar',
 				returnType: 'string',
 			},
@@ -120,6 +144,7 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		quarter: {
 			doc: {
 				name: 'quarter',
+				section: 'query',
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimequarter',
 				returnType: 'number',
 			},
@@ -127,6 +152,7 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		second: {
 			doc: {
 				name: 'second',
+				section: 'query',
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimesecond',
 				returnType: 'number',
 			},
@@ -134,6 +160,7 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		weekday: {
 			doc: {
 				name: 'weekday',
+				section: 'query',
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimeweekday',
 				returnType: 'number',
 			},
@@ -141,6 +168,7 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		weekdayLong: {
 			doc: {
 				name: 'weekdayLong',
+				section: 'query',
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimeweekdaylong',
 				returnType: 'string',
 			},
@@ -148,6 +176,7 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		weekdayShort: {
 			doc: {
 				name: 'weekdayShort',
+				section: 'query',
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimeweekdayshort',
 				returnType: 'string',
 			},
@@ -155,6 +184,7 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		weekNumber: {
 			doc: {
 				name: 'weekNumber',
+				section: 'query',
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimeweeknumber',
 				returnType: 'number',
 			},
@@ -162,6 +192,8 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		weeksInWeekYear: {
 			doc: {
 				name: 'weeksInWeekYear',
+				section: 'query',
+				hidden: true,
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimeweeksinweekyear',
 				returnType: 'number',
 			},
@@ -169,6 +201,7 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		weekYear: {
 			doc: {
 				name: 'weekYear',
+				section: 'query',
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimeweekyear',
 				returnType: 'number',
 			},
@@ -176,6 +209,7 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		year: {
 			doc: {
 				name: 'year',
+				section: 'query',
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimeyear',
 				returnType: 'number',
 			},
@@ -183,6 +217,7 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		zone: {
 			doc: {
 				name: 'zone',
+				section: 'query',
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimezone',
 				returnType: 'Zone',
 			},
@@ -190,6 +225,7 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		zoneName: {
 			doc: {
 				name: 'zoneName',
+				section: 'query',
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimezonename',
 				returnType: 'string',
 			},
@@ -197,6 +233,7 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		isInDST: {
 			doc: {
 				name: 'isInDST',
+				section: 'query',
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimeisindst',
 				returnType: 'boolean',
 			},
@@ -204,6 +241,7 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		isInLeapYear: {
 			doc: {
 				name: 'isInLeapYear',
+				section: 'query',
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimeisinleapyear',
 				returnType: 'boolean',
 			},
@@ -211,6 +249,8 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		isOffsetFixed: {
 			doc: {
 				name: 'isOffsetFixed',
+				section: 'query',
+				hidden: true,
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimeisoffsetfixed',
 				returnType: 'boolean',
 			},
@@ -218,6 +258,8 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		isValid: {
 			doc: {
 				name: 'isValid',
+				hidden: true,
+				section: 'query',
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimeisvalid',
 				returnType: 'boolean',
 			},
@@ -227,6 +269,7 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		diff: {
 			doc: {
 				name: 'diff',
+				section: 'compare',
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimediff',
 				returnType: 'Duration',
 				args: [
@@ -239,6 +282,7 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		diffNow: {
 			doc: {
 				name: 'diffNow',
+				section: 'compare',
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimediffnow',
 				returnType: 'Duration',
 				args: [
@@ -250,6 +294,7 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		endOf: {
 			doc: {
 				name: 'endOf',
+				section: 'edit',
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimeendof',
 				returnType: 'DateTime',
 				args: [{ name: 'unit', type: 'string' }],
@@ -258,6 +303,7 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		equals: {
 			doc: {
 				name: 'equals',
+				section: 'compare',
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimeequals',
 				returnType: 'boolean',
 				args: [{ name: 'other', type: 'DateTime' }],
@@ -266,6 +312,7 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		hasSame: {
 			doc: {
 				name: 'hasSame',
+				section: 'compare',
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimehassame',
 				returnType: 'boolean',
 				args: [
@@ -277,6 +324,7 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		minus: {
 			doc: {
 				name: 'minus',
+				section: 'edit',
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimeminus',
 				returnType: 'DateTime',
 				args: [{ name: 'duration', type: 'Duration|object|number' }],
@@ -285,6 +333,7 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		plus: {
 			doc: {
 				name: 'plus',
+				section: 'edit',
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimeplus',
 				returnType: 'DateTime',
 				args: [{ name: 'duration', type: 'Duration|object|number' }],
@@ -293,6 +342,8 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		reconfigure: {
 			doc: {
 				name: 'reconfigure',
+				section: 'other',
+				hidden: true,
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimereconfigure',
 				returnType: 'DateTime',
 				args: [{ name: 'properties', type: 'object' }],
@@ -301,6 +352,8 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		resolvedLocaleOptions: {
 			doc: {
 				name: 'resolvedLocaleOptions',
+				section: 'other',
+				hidden: true,
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimeresolvedlocaleoptions',
 				returnType: 'object',
 				args: [{ name: 'opts', type: 'object' }],
@@ -309,6 +362,7 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		set: {
 			doc: {
 				name: 'set',
+				section: 'edit',
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimeset',
 				returnType: 'DateTime',
 				args: [{ name: 'values', type: 'object' }],
@@ -317,6 +371,7 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		setLocale: {
 			doc: {
 				name: 'setLocale',
+				section: 'edit',
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimesetlocale',
 				returnType: 'DateTime',
 				args: [{ name: 'locale', type: 'any' }],
@@ -325,6 +380,7 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		setZone: {
 			doc: {
 				name: 'setZone',
+				section: 'edit',
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimesetzone',
 				returnType: 'DateTime',
 				args: [
@@ -336,6 +392,7 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		startOf: {
 			doc: {
 				name: 'startOf',
+				section: 'edit',
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimestartof',
 				returnType: 'DateTime',
 				args: [{ name: 'unit', type: 'string' }],
@@ -344,6 +401,8 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		toBSON: {
 			doc: {
 				name: 'toBSON',
+				section: 'format',
+				hidden: true,
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimetobson',
 				returnType: 'Date',
 			},
@@ -351,6 +410,8 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		toFormat: {
 			doc: {
 				name: 'toFormat',
+				section: 'format',
+				hidden: true,
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetime',
 				returnType: 'string',
 				args: [
@@ -362,6 +423,8 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		toHTTP: {
 			doc: {
 				name: 'toHTTP',
+				section: 'format',
+				hidden: true,
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimetohttp',
 				returnType: 'string',
 			},
@@ -369,6 +432,7 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		toISO: {
 			doc: {
 				name: 'toISO',
+				section: 'format',
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimetoiso',
 				returnType: 'string',
 				args: [{ name: 'opts', type: 'object' }],
@@ -377,6 +441,8 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		toISODate: {
 			doc: {
 				name: 'toISODate',
+				section: 'format',
+				hidden: true,
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimetoisodate',
 				returnType: 'string',
 				args: [{ name: 'opts', type: 'object' }],
@@ -385,6 +451,8 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		toISOTime: {
 			doc: {
 				name: 'toISOTime',
+				section: 'format',
+				hidden: true,
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimetoisotime',
 				returnType: 'string',
 				args: [{ name: 'opts', type: 'object' }],
@@ -393,6 +461,8 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		toISOWeekDate: {
 			doc: {
 				name: 'toISOWeekDate',
+				section: 'format',
+				hidden: true,
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimetoisoweekdate',
 				returnType: 'string',
 			},
@@ -400,6 +470,8 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		toJSDate: {
 			doc: {
 				name: 'toJSDate',
+				section: 'format',
+				hidden: true,
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimetojsdate',
 				returnType: 'Date',
 			},
@@ -407,6 +479,8 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		toJSON: {
 			doc: {
 				name: 'toJSON',
+				section: 'format',
+				hidden: true,
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimetojson',
 				returnType: 'string',
 			},
@@ -414,6 +488,7 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		toLocal: {
 			doc: {
 				name: 'toLocal',
+				section: 'format',
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimetolocal',
 				returnType: 'DateTime',
 			},
@@ -421,6 +496,8 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		toLocaleParts: {
 			doc: {
 				name: 'toLocaleParts',
+				section: 'format',
+				hidden: true,
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimetolocaleparts',
 				returnType: 'string',
 				args: [
@@ -432,6 +509,7 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		toLocaleString: {
 			doc: {
 				name: 'toLocaleString',
+				section: 'format',
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimetolocalestring',
 				returnType: 'string',
 				args: [
@@ -443,6 +521,7 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		toMillis: {
 			doc: {
 				name: 'toMillis',
+				section: 'format',
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimetomillis',
 				returnType: 'number',
 			},
@@ -450,6 +529,8 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		toObject: {
 			doc: {
 				name: 'toObject',
+				section: 'format',
+				hidden: true,
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimetoobject',
 				returnType: 'object',
 				args: [{ name: 'opts', type: 'any' }],
@@ -458,6 +539,7 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		toRelative: {
 			doc: {
 				name: 'toRelative',
+				section: 'format',
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimetorelative',
 				returnType: 'string',
 				args: [{ name: 'options', type: 'object' }],
@@ -466,6 +548,8 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		toRelativeCalendar: {
 			doc: {
 				name: 'toRelativeCalendar',
+				section: 'format',
+				hidden: true,
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimetorelativecalendar',
 				returnType: 'string',
 				args: [{ name: 'options', type: 'object' }],
@@ -474,6 +558,8 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		toRFC2822: {
 			doc: {
 				name: 'toRFC2822',
+				section: 'format',
+				hidden: true,
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimetorfc2822',
 				returnType: 'string',
 			},
@@ -481,6 +567,7 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		toSeconds: {
 			doc: {
 				name: 'toSeconds',
+				section: 'format',
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimetoseconds',
 				returnType: 'number',
 			},
@@ -488,14 +575,18 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		toSQL: {
 			doc: {
 				name: 'toSQL',
+				section: 'format',
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimetosql',
 				returnType: 'string',
+				hidden: true,
 				args: [{ name: 'options', type: 'object' }],
 			},
 		},
 		toSQLDate: {
 			doc: {
 				name: 'toSQLDate',
+				section: 'format',
+				hidden: true,
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimetosqldate',
 				returnType: 'string',
 			},
@@ -503,6 +594,8 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		toSQLTime: {
 			doc: {
 				name: 'toSQLTime',
+				section: 'format',
+				hidden: true,
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimetosqltime',
 				returnType: 'string',
 			},
@@ -510,6 +603,7 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		toString: {
 			doc: {
 				name: 'toString',
+				section: 'format',
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimetostring',
 				returnType: 'string',
 			},
@@ -517,6 +611,8 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		toUnixInteger: {
 			doc: {
 				name: 'toUnixInteger',
+				section: 'format',
+				hidden: true,
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimetounixinteger',
 				returnType: 'number',
 			},
@@ -524,6 +620,7 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		toUTC: {
 			doc: {
 				name: 'toUTC',
+				section: 'edit',
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimetoutc',
 				returnType: 'DateTime',
 				args: [
@@ -535,6 +632,7 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		until: {
 			doc: {
 				name: 'until',
+				section: 'compare',
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimeuntil',
 				returnType: 'Interval',
 				args: [{ name: 'other', type: 'DateTime' }],
@@ -543,6 +641,8 @@ export const luxonInstanceDocs: Required<NativeDoc> = {
 		valueOf: {
 			doc: {
 				name: 'valueOf',
+				section: 'format',
+				hidden: true,
 				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimevalueof',
 				returnType: 'number',
 			},
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/nativesAutocompleteDocs/luxon.static.docs.ts b/packages/editor-ui/src/plugins/codemirror/completions/nativesAutocompleteDocs/luxon.static.docs.ts
index 8d1ed738c2964..2911e8fe0e620 100644
--- a/packages/editor-ui/src/plugins/codemirror/completions/nativesAutocompleteDocs/luxon.static.docs.ts
+++ b/packages/editor-ui/src/plugins/codemirror/completions/nativesAutocompleteDocs/luxon.static.docs.ts
@@ -1,4 +1,4 @@
-import type { NativeDoc } from 'n8n-workflow/src/Extensions/Extensions';
+import type { NativeDoc } from 'n8n-workflow';
 
 // Autocomplete documentation definition for DateTime class static props and methods
 // Descriptions are added dynamically so they can be localized
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/types.ts b/packages/editor-ui/src/plugins/codemirror/completions/types.ts
index e85f05196e9bc..031eb12d6e83f 100644
--- a/packages/editor-ui/src/plugins/codemirror/completions/types.ts
+++ b/packages/editor-ui/src/plugins/codemirror/completions/types.ts
@@ -1,12 +1,17 @@
-import type { resolveParameter } from '@/mixins/workflowHelpers';
 import type { DocMetadata } from 'n8n-workflow';
 
-export type Resolved = ReturnType<typeof resolveParameter>;
+export type Resolved = unknown;
 
-export type ExtensionTypeName = 'number' | 'string' | 'date' | 'array' | 'object';
+export type ExtensionTypeName = 'number' | 'string' | 'date' | 'array' | 'object' | 'boolean';
 
 export type FnToDoc = { [fnName: string]: { doc?: DocMetadata } };
 
 export type FunctionOptionType = 'native-function' | 'extension-function';
 export type KeywordOptionType = 'keyword';
 export type AutocompleteOptionType = FunctionOptionType | KeywordOptionType;
+export type AutocompleteInput<R = Resolved> = {
+	resolved: R;
+	base: string;
+	tail: string;
+	transformLabel?: (label: string) => string;
+};
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/utils.ts b/packages/editor-ui/src/plugins/codemirror/completions/utils.ts
index 446ce3ff333a8..479878875f916 100644
--- a/packages/editor-ui/src/plugins/codemirror/completions/utils.ts
+++ b/packages/editor-ui/src/plugins/codemirror/completions/utils.ts
@@ -1,23 +1,45 @@
-import { NODE_TYPES_EXCLUDED_FROM_AUTOCOMPLETION } from '@/components/CodeNodeEditor/constants';
-import { SPLIT_IN_BATCHES_NODE_TYPE } from '@/constants';
-import { useWorkflowsStore } from '@/stores/workflows';
-import { resolveParameter } from '@/mixins/workflowHelpers';
-import { useNDVStore } from '@/stores/ndv';
-import type { Completion, CompletionContext } from '@codemirror/autocomplete';
-
-// String literal expression is everything enclosed in single, double or tick quotes following a dot
-const stringLiteralRegex = /^"[^"]+"|^'[^']+'|^`[^`]+`\./;
-// JavaScript operands
-const operandsRegex = /[+\-*/><<==>**!=?]/;
+import {
+	CREDENTIAL_EDIT_MODAL_KEY,
+	HTTP_REQUEST_NODE_TYPE,
+	SPLIT_IN_BATCHES_NODE_TYPE,
+} from '@/constants';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { resolveParameter, useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
+import { useNDVStore } from '@/stores/ndv.store';
+import { useUIStore } from '@/stores/ui.store';
+import {
+	insertCompletionText,
+	type Completion,
+	type CompletionContext,
+	pickedCompletion,
+	type CompletionSection,
+} from '@codemirror/autocomplete';
+import type { EditorView } from '@codemirror/view';
+import type { TransactionSpec } from '@codemirror/state';
+import type { SyntaxNode } from '@lezer/common';
+import { javascriptLanguage } from '@codemirror/lang-javascript';
+import { useRouter } from 'vue-router';
+import type { DocMetadata } from 'n8n-workflow';
+import { escapeMappingString } from '@/utils/mappingUtils';
+
 /**
  * Split user input into base (to resolve) and tail (to filter).
  */
 export function splitBaseTail(userInput: string): [string, string] {
-	const processedInput = extractSubExpression(userInput);
-	const parts = processedInput.split('.');
-	const tail = parts.pop() ?? '';
+	const read = (node: SyntaxNode | null) => (node ? userInput.slice(node.from, node.to) : '');
+	const lastNode = javascriptLanguage.parser.parse(userInput).resolveInner(userInput.length, -1);
 
-	return [parts.join('.'), tail];
+	switch (lastNode.type.name) {
+		case '.':
+			return [read(lastNode.parent).slice(0, -1), ''];
+		case 'MemberExpression':
+			return [read(lastNode.parent), read(lastNode)];
+		case 'PropertyName':
+			const tail = read(lastNode);
+			return [read(lastNode.parent).slice(0, -(tail.length + 1)), tail];
+		default:
+			return ['', ''];
+	}
 }
 
 export function longestCommonPrefix(...strings: string[]) {
@@ -33,31 +55,7 @@ export function longestCommonPrefix(...strings: string[]) {
 		}
 
 		return acc.slice(0, i);
-	});
-}
-
-// Process user input if expressions are used as part of complex expression
-// i.e. as a function parameter or an operation expression
-// this function will extract expression that is currently typed so autocomplete
-// suggestions can be matched based on it.
-function extractSubExpression(userInput: string): string {
-	const dollarSignIndex = userInput.indexOf('$');
-	// If it's not a dollar sign expression just strip parentheses
-	if (dollarSignIndex === -1) {
-		userInput = userInput.replace(/^.+(\(|\[|{)/, '');
-	} else if (!stringLiteralRegex.test(userInput)) {
-		// If there is a dollar sign in the input and input is not a string literal,
-		// extract part of following the last $
-		const expressionParts = userInput.split('$');
-		userInput = `$${expressionParts[expressionParts.length - 1]}`;
-		// If input is part of a complex operation expression and extract last operand
-		const operationPart = userInput.split(operandsRegex).pop()?.trim() || '';
-		const lastOperand = operationPart.split(' ').pop();
-		if (lastOperand) {
-			userInput = lastOperand;
-		}
-	}
-	return userInput;
+	}, '');
 }
 
 export const prefixMatch = (first: string, second: string) =>
@@ -98,11 +96,21 @@ export const isAllowedInDotNotation = (str: string) => {
 // ----------------------------------
 
 export function receivesNoBinaryData() {
-	return resolveParameter('={{ $binary }}')?.data === undefined;
+	try {
+		return resolveParameter('={{ $binary }}')?.data === undefined;
+	} catch {
+		return true;
+	}
 }
 
 export function hasNoParams(toResolve: string) {
-	const params = resolveParameter(`={{ ${toResolve}.params }}`);
+	let params;
+
+	try {
+		params = resolveParameter(`={{ ${toResolve}.params }}`);
+	} catch {
+		return true;
+	}
 
 	if (!params) return true;
 
@@ -115,21 +123,31 @@ export function hasNoParams(toResolve: string) {
 //        state-based utils
 // ----------------------------------
 
+export const isCredentialsModalOpen = () => useUIStore().modals[CREDENTIAL_EDIT_MODAL_KEY].open;
+
+export const isInHttpNodePagination = () => {
+	const ndvStore = useNDVStore();
+	return (
+		ndvStore.activeNode?.type === HTTP_REQUEST_NODE_TYPE &&
+		ndvStore.focusedInputPath.startsWith('parameters.options.pagination')
+	);
+};
+
 export const hasActiveNode = () => useNDVStore().activeNode?.name !== undefined;
 
 export const isSplitInBatchesAbsent = () =>
 	!useWorkflowsStore().workflow.nodes.some((node) => node.type === SPLIT_IN_BATCHES_NODE_TYPE);
 
 export function autocompletableNodeNames() {
-	return useWorkflowsStore()
-		.allNodes.filter((node) => {
-			const activeNodeName = useNDVStore().activeNode?.name;
-
-			return (
-				!NODE_TYPES_EXCLUDED_FROM_AUTOCOMPLETION.includes(node.type) && node.name !== activeNodeName
-			);
-		})
-		.map((node) => node.name);
+	const activeNodeName = useNDVStore().activeNode?.name;
+
+	if (!activeNodeName) return [];
+
+	return useWorkflowHelpers({ router: useRouter() })
+		.getCurrentWorkflow()
+		.getParentNodesByDepth(activeNodeName)
+		.map((node) => node.name)
+		.filter((name) => name !== activeNodeName);
 }
 
 /**
@@ -145,3 +163,108 @@ export const stripExcessParens = (context: CompletionContext) => (option: Comple
 
 	return option;
 };
+
+export const getDefaultArgs = (doc?: DocMetadata): unknown[] => {
+	return doc?.args?.map((arg) => arg.default).filter(Boolean) ?? [];
+};
+
+export const insertDefaultArgs = (label: string, args: unknown[]): string => {
+	if (!label.endsWith('()')) return label;
+	const argList = args.map((arg) => JSON.stringify(arg)).join(', ');
+	const fnName = label.replace('()', '');
+
+	return `${fnName}(${argList})`;
+};
+
+/**
+ * When a function completion is selected, set the cursor correctly
+ *
+ *  @example `.includes()` -> `.includes(<cursor>)`
+ *  @example `$max()` -> `$max()<cursor>`
+ */
+export const applyCompletion =
+	({
+		hasArgs = true,
+		defaultArgs = [],
+		transformLabel = (label) => label,
+	}: {
+		hasArgs?: boolean;
+		defaultArgs?: unknown[];
+		transformLabel?: (label: string) => string;
+	} = {}) =>
+	(view: EditorView, completion: Completion, from: number, to: number): void => {
+		const isFunction = completion.label.endsWith('()');
+		const label = insertDefaultArgs(transformLabel(completion.label), defaultArgs);
+		const tx: TransactionSpec = {
+			...insertCompletionText(view.state, label, from, to),
+			annotations: pickedCompletion.of(completion),
+		};
+
+		if (isFunction) {
+			if (defaultArgs.length > 0) {
+				tx.selection = { anchor: from + label.indexOf('(') + 1, head: from + label.length - 1 };
+			} else if (hasArgs) {
+				const cursorPosition = from + label.length - 1;
+				tx.selection = { anchor: cursorPosition, head: cursorPosition };
+			}
+		}
+
+		view.dispatch(tx);
+	};
+
+export const applyBracketAccess = (key: string): string => {
+	return `['${escapeMappingString(key)}']`;
+};
+
+/**
+ * Apply a bracket-access completion
+ *
+ *  @example `$json.` -> `$json['key with spaces']`
+ *  @example `$json` -> `$json['key with spaces']`
+ */
+export const applyBracketAccessCompletion = (
+	view: EditorView,
+	completion: Completion,
+	from: number,
+	to: number,
+): void => {
+	const label = applyBracketAccess(completion.label);
+	const completionAtDot = view.state.sliceDoc(from - 1, from) === '.';
+
+	view.dispatch({
+		...insertCompletionText(view.state, label, completionAtDot ? from - 1 : from, to),
+		annotations: pickedCompletion.of(completion),
+	});
+};
+
+export const hasRequiredArgs = (doc?: DocMetadata): boolean => {
+	if (!doc) return false;
+	const requiredArgs = doc?.args?.filter((arg) => !arg.name.endsWith('?')) ?? [];
+	return requiredArgs.length > 0;
+};
+
+export const sortCompletionsAlpha = (completions: Completion[]): Completion[] => {
+	return completions.sort((a, b) => a.label.localeCompare(b.label));
+};
+
+export const renderSectionHeader = (section: CompletionSection): HTMLElement => {
+	const container = document.createElement('li');
+	container.classList.add('cm-section-header');
+	const inner = document.createElement('div');
+	inner.classList.add('cm-section-title');
+	inner.textContent = section.name;
+	container.appendChild(inner);
+
+	return container;
+};
+
+export const withSectionHeader = (section: CompletionSection): CompletionSection => {
+	section.header = renderSectionHeader;
+	return section;
+};
+
+export const isCompletionSection = (
+	section: CompletionSection | string | undefined,
+): section is CompletionSection => {
+	return typeof section === 'object';
+};
diff --git a/packages/editor-ui/src/plugins/codemirror/keymap.ts b/packages/editor-ui/src/plugins/codemirror/keymap.ts
new file mode 100644
index 0000000000000..f1d9316491584
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/keymap.ts
@@ -0,0 +1,76 @@
+import {
+	acceptCompletion,
+	completionStatus,
+	moveCompletionSelection,
+	selectedCompletion,
+} from '@codemirror/autocomplete';
+import { indentLess, indentMore, insertNewlineAndIndent, redo, undo } from '@codemirror/commands';
+import type { EditorView, KeyBinding } from '@codemirror/view';
+
+export const tabKeyMap = (singleLine = false): KeyBinding[] => [
+	{
+		any(view, event) {
+			if (
+				event.key === 'Tab' ||
+				(event.key === 'Escape' && completionStatus(view.state) !== null)
+			) {
+				event.stopPropagation();
+			}
+
+			return false;
+		},
+	},
+	{
+		key: 'Tab',
+		run: (view) => {
+			if (selectedCompletion(view.state)) {
+				return acceptCompletion(view);
+			}
+
+			if (!singleLine) return indentMore(view);
+			return false;
+		},
+	},
+	{ key: 'Shift-Tab', run: indentLess },
+];
+
+export const enterKeyMap: KeyBinding[] = [
+	{
+		key: 'Enter',
+		run: (view) => {
+			if (selectedCompletion(view.state)) {
+				return acceptCompletion(view);
+			}
+
+			return insertNewlineAndIndent(view);
+		},
+	},
+];
+
+const SELECTED_AUTOCOMPLETE_OPTION_SELECTOR = '.cm-tooltip-autocomplete li[aria-selected]';
+const onAutocompleteNavigate = (dir: 'up' | 'down') => (view: EditorView) => {
+	if (completionStatus(view.state) !== null) {
+		moveCompletionSelection(dir === 'down')(view);
+		document
+			.querySelector(SELECTED_AUTOCOMPLETE_OPTION_SELECTOR)
+			?.scrollIntoView({ block: 'nearest' });
+		return true;
+	}
+	return false;
+};
+
+export const autocompleteKeyMap: KeyBinding[] = [
+	{
+		key: 'ArrowDown',
+		run: onAutocompleteNavigate('down'),
+	},
+	{
+		key: 'ArrowUp',
+		run: onAutocompleteNavigate('up'),
+	},
+];
+
+export const historyKeyMap: KeyBinding[] = [
+	{ key: 'Mod-z', run: undo },
+	{ key: 'Mod-Shift-z', run: redo },
+];
diff --git a/packages/editor-ui/src/plugins/codemirror/n8nLang.ts b/packages/editor-ui/src/plugins/codemirror/n8nLang.ts
index 33cc5493d2004..8bce81bb703de 100644
--- a/packages/editor-ui/src/plugins/codemirror/n8nLang.ts
+++ b/packages/editor-ui/src/plugins/codemirror/n8nLang.ts
@@ -4,6 +4,7 @@ import { parseMixed } from '@lezer/common';
 import { javascriptLanguage } from '@codemirror/lang-javascript';
 
 import { n8nCompletionSources } from './completions/addCompletions';
+import { autocompletion } from '@codemirror/autocomplete';
 
 const n8nParserWithNestedJsParser = n8nParser.configure({
 	wrap: parseMixed((node) => {
@@ -23,3 +24,5 @@ export function n8nLang() {
 		...n8nCompletionSources().map((source) => n8nLanguage.data.of(source)),
 	]);
 }
+
+export const n8nAutocompletion = () => autocompletion({ icons: false });
diff --git a/packages/editor-ui/src/plugins/codemirror/resolvableHighlighter.ts b/packages/editor-ui/src/plugins/codemirror/resolvableHighlighter.ts
index 8b5baa51fa082..6bbe3dcf4233a 100644
--- a/packages/editor-ui/src/plugins/codemirror/resolvableHighlighter.ts
+++ b/packages/editor-ui/src/plugins/codemirror/resolvableHighlighter.ts
@@ -4,12 +4,17 @@ import { StateField, StateEffect } from '@codemirror/state';
 import { tags } from '@lezer/highlight';
 import { syntaxHighlighting, HighlightStyle } from '@codemirror/language';
 
-import type { ColoringStateEffect, Plaintext, Resolvable, Resolved } from '@/types/expressions';
+import type {
+	ColoringStateEffect,
+	Plaintext,
+	Resolvable,
+	ResolvableState,
+} from '@/types/expressions';
 
 const cssClasses = {
 	validResolvable: 'cm-valid-resolvable',
 	invalidResolvable: 'cm-invalid-resolvable',
-	brokenResolvable: 'cm-broken-resolvable',
+	pendingResolvable: 'cm-pending-resolvable',
 	plaintext: 'cm-plaintext',
 };
 
@@ -22,20 +27,25 @@ const resolvablesTheme = EditorView.theme({
 		color: 'var(--color-invalid-resolvable-foreground)',
 		backgroundColor: 'var(--color-invalid-resolvable-background)',
 	},
+	['.' + cssClasses.pendingResolvable]: {
+		color: 'var(--color-pending-resolvable-foreground)',
+		backgroundColor: 'var(--color-pending-resolvable-background)',
+	},
 });
 
-const marks = {
+const resolvableStateToDecoration: Record<ResolvableState, Decoration> = {
 	valid: Decoration.mark({ class: cssClasses.validResolvable }),
 	invalid: Decoration.mark({ class: cssClasses.invalidResolvable }),
+	pending: Decoration.mark({ class: cssClasses.pendingResolvable }),
 };
 
 const coloringStateEffects = {
 	addColorEffect: StateEffect.define<ColoringStateEffect.Value>({
-		map: ({ from, to, kind, error }, change) => ({
+		map: ({ from, to, kind, state }, change) => ({
 			from: change.mapPos(from),
 			to: change.mapPos(to),
 			kind,
-			error,
+			state,
 		}),
 	}),
 	removeColorEffect: StateEffect.define<ColoringStateEffect.Value>({
@@ -52,37 +62,41 @@ const coloringStateField = StateField.define<DecorationSet>({
 		return Decoration.none;
 	},
 	update(colorings, transaction) {
-		colorings = colorings.map(transaction.changes); // recalculate positions for new doc
+		try {
+			colorings = colorings.map(transaction.changes); // recalculate positions for new doc
 
-		for (const txEffect of transaction.effects) {
-			if (txEffect.is(coloringStateEffects.removeColorEffect)) {
-				colorings = colorings.update({
-					filter: (from, to) => txEffect.value.from !== from && txEffect.value.to !== to,
-				});
-			}
+			for (const txEffect of transaction.effects) {
+				if (txEffect.is(coloringStateEffects.removeColorEffect)) {
+					colorings = colorings.update({
+						filter: (from, to) => txEffect.value.from !== from && txEffect.value.to !== to,
+					});
+				}
 
-			if (txEffect.is(coloringStateEffects.addColorEffect)) {
-				colorings = colorings.update({
-					filter: (from, to) => txEffect.value.from !== from && txEffect.value.to !== to,
-				});
+				if (txEffect.is(coloringStateEffects.addColorEffect)) {
+					colorings = colorings.update({
+						filter: (from, to) => txEffect.value.from !== from && txEffect.value.to !== to,
+					});
 
-				const decoration = txEffect.value.error ? marks.invalid : marks.valid;
+					const decoration = resolvableStateToDecoration[txEffect.value.state ?? 'pending'];
 
-				if (txEffect.value.from === 0 && txEffect.value.to === 0) continue;
+					if (txEffect.value.from === 0 && txEffect.value.to === 0) continue;
 
-				colorings = colorings.update({
-					add: [decoration.range(txEffect.value.from, txEffect.value.to)],
-				});
+					colorings = colorings.update({
+						add: [decoration.range(txEffect.value.from, txEffect.value.to)],
+					});
+				}
 			}
+		} catch (error) {
+			window?.Sentry?.captureException(error);
 		}
 
 		return colorings;
 	},
 });
 
-function addColor(view: EditorView, segments: Array<Resolvable | Resolved>) {
-	const effects: Array<StateEffect<unknown>> = segments.map(({ from, to, kind, error }) =>
-		coloringStateEffects.addColorEffect.of({ from, to, kind, error }),
+function addColor(view: EditorView, segments: Resolvable[]) {
+	const effects: Array<StateEffect<unknown>> = segments.map(({ from, to, kind, state }) =>
+		coloringStateEffects.addColorEffect.of({ from, to, kind, state }),
 	);
 
 	if (effects.length === 0) return;
@@ -114,10 +128,6 @@ const resolvableStyle = syntaxHighlighting(
 			tag: tags.content,
 			class: cssClasses.plaintext,
 		},
-		{
-			tag: tags.className,
-			class: cssClasses.brokenResolvable,
-		},
 		/**
 		 * CSS classes for valid and invalid resolvables
 		 * dynamically applied based on state fields
diff --git a/packages/editor-ui/src/plugins/components.ts b/packages/editor-ui/src/plugins/components.ts
index 32100d08c087a..24ed30d3b7434 100644
--- a/packages/editor-ui/src/plugins/components.ts
+++ b/packages/editor-ui/src/plugins/components.ts
@@ -1,33 +1,33 @@
-import Vue from 'vue';
-import Fragment from 'vue-fragment';
-import VueAgile from 'vue-agile';
+import type { Plugin } from 'vue';
 
 import 'regenerator-runtime/runtime';
 
-import ElementUI from 'element-ui';
-import { Loading, MessageBox, Notification } from 'element-ui';
+import ElementPlus, { ElLoading, ElMessageBox } from 'element-plus';
 import { N8nPlugin } from 'n8n-design-system';
-import EnterpriseEdition from '@/components/EnterpriseEdition.ee.vue';
 import { useMessage } from '@/composables/useMessage';
-
-Vue.use(Fragment.Plugin);
-Vue.use(VueAgile);
-
-Vue.use(ElementUI);
-Vue.use(N8nPlugin);
-
-Vue.component('enterprise-edition', EnterpriseEdition);
-
-Vue.use(Loading.directive);
-
-Vue.prototype.$loading = Loading.service;
-Vue.prototype.$msgbox = MessageBox;
-
-const messageService = useMessage();
-
-Vue.prototype.$alert = messageService.alert;
-Vue.prototype.$confirm = messageService.confirm;
-Vue.prototype.$prompt = messageService.prompt;
-Vue.prototype.$message = messageService.message;
-
-Vue.prototype.$notify = Notification;
+import EnterpriseEdition from '@/components/EnterpriseEdition.ee.vue';
+import RBAC from '@/components/RBAC.vue';
+import ParameterInputList from '@/components/ParameterInputList.vue';
+
+export const GlobalComponentsPlugin: Plugin<{}> = {
+	install(app) {
+		const messageService = useMessage();
+
+		app.component('EnterpriseEdition', EnterpriseEdition);
+		app.component('RBAC', RBAC);
+		app.component('ParameterInputList', ParameterInputList);
+
+		app.use(ElementPlus);
+		app.use(N8nPlugin);
+
+		// app.use(ElLoading);
+		// app.use(ElNotification);
+
+		app.config.globalProperties.$loading = ElLoading.service;
+		app.config.globalProperties.$msgbox = ElMessageBox;
+		app.config.globalProperties.$alert = messageService.alert;
+		app.config.globalProperties.$confirm = messageService.confirm;
+		app.config.globalProperties.$prompt = messageService.prompt;
+		app.config.globalProperties.$message = messageService.message;
+	},
+};
diff --git a/packages/editor-ui/src/plugins/connectors/N8nCustomConnector.ts b/packages/editor-ui/src/plugins/connectors/N8nCustomConnector.ts
index ac790dcc4aa1f..b8b2d671663f9 100644
--- a/packages/editor-ui/src/plugins/connectors/N8nCustomConnector.ts
+++ b/packages/editor-ui/src/plugins/connectors/N8nCustomConnector.ts
@@ -1,5 +1,5 @@
 import type { PointXY } from '@jsplumb/util';
-import { log, extend, quadrant } from '@jsplumb/util';
+import { quadrant } from '@jsplumb/util';
 
 import type {
 	Connection,
@@ -14,7 +14,7 @@ import { BezierSegment } from '@jsplumb/connector-bezier';
 import { isArray } from 'lodash-es';
 import { deepCopy } from 'n8n-workflow';
 
-export interface N8nConnectorOptions extends ConnectorOptions {}
+export type N8nConnectorOptions = ConnectorOptions;
 interface N8nConnectorPaintGeometry extends PaintGeometry {
 	sourceEndpoint: Endpoint;
 	targetEndpoint: Endpoint;
@@ -140,25 +140,43 @@ const stubCalculators = {
 
 export class N8nConnector extends AbstractConnector {
 	static type = 'N8nConnector';
+
 	type = N8nConnector.type;
 
 	majorAnchor: number;
+
 	minorAnchor: number;
+
 	midpoint: number;
+
 	alwaysRespectStubs: boolean;
+
 	loopbackVerticalLength: number;
+
 	lastx: number | null;
+
 	lasty: number | null;
+
 	cornerRadius: number;
+
 	loopbackMinimum: number;
+
 	curvinessCoefficient: number;
+
 	zBezierOffset: number;
+
 	targetGap: number;
+
 	overrideTargetEndpoint: Endpoint | null;
+
 	getEndpointOffset: Function | null;
+
 	private internalSegments: FlowchartSegment[] = [];
 
-	constructor(public connection: Connection, params: N8nConnectorOptions) {
+	constructor(
+		public connection: Connection,
+		params: N8nConnectorOptions,
+	) {
 		super(connection, params);
 		params = params || {};
 		this.minorAnchor = 0; // seems to be angle at which connector leaves endpoint
@@ -307,14 +325,14 @@ export class N8nConnector extends AbstractConnector {
 						current[2] === current[0]
 							? 0
 							: current[2] > current[0]
-							? paintInfo.lw / 2
-							: -(paintInfo.lw / 2),
+								? paintInfo.lw / 2
+								: -(paintInfo.lw / 2),
 					dy =
 						current[3] === current[1]
 							? 0
 							: current[3] > current[1]
-							? paintInfo.lw / 2
-							: -(paintInfo.lw / 2);
+								? paintInfo.lw / 2
+								: -(paintInfo.lw / 2);
 
 				this._addSegment(StraightSegment, {
 					x1: current[0] - dx,
@@ -337,7 +355,7 @@ export class N8nConnector extends AbstractConnector {
 	}
 
 	calculateStubSegment(paintInfo: PaintGeometry): StubPositions {
-		return stubCalculators['opposite'](paintInfo, {
+		return stubCalculators.opposite(paintInfo, {
 			axis: paintInfo.sourceAxis,
 			alwaysRespectStubs: this.alwaysRespectStubs,
 		});
@@ -363,7 +381,7 @@ export class N8nConnector extends AbstractConnector {
 			// original flowchart behavior
 			midy = paintInfo.startStubY + (paintInfo.endStubY - paintInfo.startStubY) * this.midpoint;
 		}
-		return lineCalculators['opposite'](paintInfo, { axis, startStub, endStub, idx, midx, midy });
+		return lineCalculators.opposite(paintInfo, { axis, startStub, endStub, idx, midx, midy });
 	}
 
 	_getPaintInfo(params: ConnectorComputeParams): N8nConnectorPaintGeometry {
@@ -491,6 +509,7 @@ export class N8nConnector extends AbstractConnector {
 			}
 		} catch (error) {}
 	}
+
 	/**
 	 * Set target endpoint
 	 * (to override default behavior tracking mouse when dragging mouse)
@@ -499,9 +518,11 @@ export class N8nConnector extends AbstractConnector {
 	setTargetEndpoint(endpoint: Endpoint) {
 		this.overrideTargetEndpoint = endpoint;
 	}
+
 	resetTargetEndpoint() {
 		this.overrideTargetEndpoint = null;
 	}
+
 	_computeBezier(paintInfo: N8nConnectorPaintGeometry) {
 		const sp = paintInfo.sourcePos;
 		const tp = paintInfo.targetPos;
diff --git a/packages/editor-ui/src/plugins/directives.ts b/packages/editor-ui/src/plugins/directives.ts
index ace3fa1776591..9302499e3144b 100644
--- a/packages/editor-ui/src/plugins/directives.ts
+++ b/packages/editor-ui/src/plugins/directives.ts
@@ -1,8 +1,10 @@
-import Vue from 'vue';
+import type { Plugin } from 'vue';
+import VueTouchEvents from 'vue3-touch-events';
+import { vOnClickOutside } from '@vueuse/components';
 
-import Vue2TouchEvents from 'vue2-touch-events';
-// @ts-ignore
-import vClickOutside from 'v-click-outside';
-
-Vue.use(Vue2TouchEvents);
-Vue.use(vClickOutside);
+export const GlobalDirectivesPlugin: Plugin<{}> = {
+	install(app) {
+		app.use(VueTouchEvents);
+		app.directive('on-click-outside', vOnClickOutside);
+	},
+};
diff --git a/packages/editor-ui/src/plugins/i18n/docs/README.md b/packages/editor-ui/src/plugins/i18n/docs/README.md
index 344ae7ab57226..98ae353758ea5 100644
--- a/packages/editor-ui/src/plugins/i18n/docs/README.md
+++ b/packages/editor-ui/src/plugins/i18n/docs/README.md
@@ -219,8 +219,10 @@ export class Github implements INodeType {
 
 ```json
 {
-	"header.displayName": "🇩🇪 GitHub",
-	"header.description": "🇩🇪 Consume GitHub API"
+	"header": {
+		"displayName": "🇩🇪 GitHub",
+		"description": "🇩🇪 Consume GitHub API"
+	}
 }
 ```
 
@@ -495,7 +497,7 @@ pnpm start
 ```sh
 export N8N_DEFAULT_LOCALE=de
 cd packages/nodes-base
-pnpm build:translations
+pnpm n8n-generate-translations
 pnpm watch
 ```
 
@@ -504,6 +506,6 @@ After changing the dynamic text file:
 1. Stop and restart the first terminal.
 2. Refresh the browser at `http://localhost:5678`
 
-If a `headerText` section was changed, re-run `pnpm build:translations` in `/nodes-base`.
+If a `headerText` section was changed, re-run `pnpm n8n-generate-translations` in `/nodes-base`.
 
 > **Note**: To translate base and dynamic text simultaneously, run three terminals following the steps from both sections (first terminal running only once) and browse `http://localhost:8080`.
diff --git a/packages/editor-ui/src/plugins/i18n/index.ts b/packages/editor-ui/src/plugins/i18n/index.ts
index 579f66d91837e..1f2fe1395fb1e 100644
--- a/packages/editor-ui/src/plugins/i18n/index.ts
+++ b/packages/editor-ui/src/plugins/i18n/index.ts
@@ -1,45 +1,32 @@
-import Vue from 'vue';
+import type { Plugin } from 'vue';
 import axios from 'axios';
-import VueI18n from 'vue-i18n';
+import { createI18n } from 'vue-i18n';
+import { locale } from 'n8n-design-system';
+import type { INodeProperties, INodePropertyCollection, INodePropertyOptions } from 'n8n-workflow';
+
 import type { INodeTranslationHeaders } from '@/Interface';
-import { IRootState } from '@/Interface';
+import { useUIStore } from '@/stores/ui.store';
+import { useNDVStore } from '@/stores/ndv.store';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import englishBaseText from './locales/en.json';
 import {
 	deriveMiddleKey,
 	isNestedInCollectionLike,
 	normalize,
 	insertOptionsAndValues,
 } from './utils';
-import { locale } from 'n8n-design-system';
-
-import englishBaseText from './locales/en.json';
-import { useUIStore } from '@/stores/ui';
-import { useNDVStore } from '@/stores/ndv';
-import type { INodeProperties, INodePropertyCollection, INodePropertyOptions } from 'n8n-workflow';
-
-Vue.use(VueI18n);
-locale.use('en');
-
-export let i18n: I18nClass;
-
-export function I18nPlugin(vue: typeof Vue): void {
-	i18n = new I18nClass();
-
-	Object.defineProperty(vue, '$locale', {
-		get() {
-			return i18n;
-		},
-	});
 
-	Object.defineProperty(vue.prototype, '$locale', {
-		get() {
-			return i18n;
-		},
-	});
-}
+export const i18nInstance = createI18n({
+	locale: 'en',
+	fallbackLocale: 'en',
+	messages: { en: englishBaseText },
+});
 
 export class I18nClass {
-	private get i18n(): VueI18n {
-		return i18nInstance;
+	private baseTextCache = new Map<string, string>();
+
+	private get i18n() {
+		return i18nInstance.global;
 	}
 
 	// ----------------------------------
@@ -65,11 +52,25 @@ export class I18nClass {
 		key: BaseTextKey,
 		options?: { adjustToNumber?: number; interpolate?: { [key: string]: string } },
 	): string {
-		if (options && options.adjustToNumber) {
-			return this.i18n.tc(key, options.adjustToNumber, options && options.interpolate).toString();
+		// Create a unique cache key
+		const cacheKey = `${key}-${JSON.stringify(options)}`;
+
+		// Check if the result is already cached
+		if (this.baseTextCache.has(cacheKey)) {
+			return this.baseTextCache.get(cacheKey) ?? key;
+		}
+
+		let result: string;
+		if (options?.adjustToNumber !== undefined) {
+			result = this.i18n.tc(key, options.adjustToNumber, options?.interpolate ?? {}).toString();
+		} else {
+			result = this.i18n.t(key, options?.interpolate ?? {}).toString();
 		}
 
-		return this.i18n.t(key, options && options.interpolate).toString();
+		// Store the result in the cache
+		this.baseTextCache.set(cacheKey, result);
+
+		return result;
 	}
 
 	/**
@@ -79,6 +80,22 @@ export class I18nClass {
 		return this.i18n.te(key) ? this.i18n.t(key).toString() : fallback ?? '';
 	}
 
+	displayTimer(msPassed: number, showMs = false): string {
+		if (msPassed < 60000) {
+			if (!showMs) {
+				return `${Math.floor(msPassed / 1000)}${this.baseText('genericHelpers.secShort')}`;
+			}
+
+			return `${msPassed / 1000}${this.baseText('genericHelpers.secShort')}`;
+		}
+
+		const secondsPassed = Math.floor(msPassed / 1000);
+		const minutesPassed = Math.floor(secondsPassed / 60);
+		const secondsLeft = (secondsPassed - minutesPassed * 60).toString().padStart(2, '0');
+
+		return `${minutesPassed}:${secondsLeft}${this.baseText('genericHelpers.minShort')}`;
+	}
+
 	/**
 	 * Render a string of header text (a node's name and description),
 	 * used variously in the nodes panel, under the node icon, etc.
@@ -179,7 +196,7 @@ export class I18nClass {
 	nodeText() {
 		const ndvStore = useNDVStore();
 		const activeNode = ndvStore.activeNode;
-		const nodeType = activeNode ? this.shortNodeType(activeNode.type as string) : ''; // unused in eventTriggerDescription
+		const nodeType = activeNode ? this.shortNodeType(activeNode.type) : ''; // unused in eventTriggerDescription
 		const initialKey = `n8n-nodes-base.nodes.${nodeType}.nodeView`;
 		const context = this;
 
@@ -327,9 +344,23 @@ export class I18nClass {
 		};
 	}
 
-	rootVars: Record<string, string | undefined> = {
+	localizeNodeName(nodeName: string, type: string) {
+		const isEnglishLocale = useRootStore().defaultLocale === 'en';
+
+		if (isEnglishLocale) return nodeName;
+
+		const nodeTypeName = this.shortNodeType(type);
+
+		return this.headerText({
+			key: `headers.${nodeTypeName}.displayName`,
+			fallback: nodeName,
+		});
+	}
+
+	rootVars = {
 		$binary: this.baseText('codeNodeEditor.completer.binary'),
 		$execution: this.baseText('codeNodeEditor.completer.$execution'),
+		$ifEmpty: this.baseText('codeNodeEditor.completer.$ifEmpty'),
 		$input: this.baseText('codeNodeEditor.completer.$input'),
 		$jmespath: this.baseText('codeNodeEditor.completer.$jmespath'),
 		$json: this.baseText('codeNodeEditor.completer.json'),
@@ -344,7 +375,11 @@ export class I18nClass {
 		$today: this.baseText('codeNodeEditor.completer.$today'),
 		$vars: this.baseText('codeNodeEditor.completer.$vars'),
 		$workflow: this.baseText('codeNodeEditor.completer.$workflow'),
-	};
+		DateTime: this.baseText('codeNodeEditor.completer.dateTime'),
+		$request: this.baseText('codeNodeEditor.completer.$request'),
+		$response: this.baseText('codeNodeEditor.completer.$response'),
+		$pageCount: this.baseText('codeNodeEditor.completer.$pageCount'),
+	} as const satisfies Record<string, string | undefined>;
 
 	proxyVars: Record<string, string | undefined> = {
 		'$input.all': this.baseText('codeNodeEditor.completer.$input.all'),
@@ -359,6 +394,7 @@ export class I18nClass {
 		'$().itemMatching': this.baseText('codeNodeEditor.completer.selector.itemMatching'),
 		'$().last': this.baseText('codeNodeEditor.completer.selector.last'),
 		'$().params': this.baseText('codeNodeEditor.completer.selector.params'),
+		'$().isExecuted': this.baseText('codeNodeEditor.completer.selector.isExecuted'),
 
 		'$prevNode.name': this.baseText('codeNodeEditor.completer.$prevNode.name'),
 		'$prevNode.outputIndex': this.baseText('codeNodeEditor.completer.$prevNode.outputIndex'),
@@ -367,6 +403,7 @@ export class I18nClass {
 		'$execution.id': this.baseText('codeNodeEditor.completer.$workflow.id'),
 		'$execution.mode': this.baseText('codeNodeEditor.completer.$execution.mode'),
 		'$execution.resumeUrl': this.baseText('codeNodeEditor.completer.$execution.resumeUrl'),
+		'$execution.resumeFormUrl': this.baseText('codeNodeEditor.completer.$execution.resumeFormUrl'),
 
 		'$workflow.active': this.baseText('codeNodeEditor.completer.$workflow.active'),
 		'$workflow.id': this.baseText('codeNodeEditor.completer.$workflow.id'),
@@ -510,26 +547,15 @@ export class I18nClass {
 	};
 }
 
-export const i18nInstance = new VueI18n({
-	locale: 'en',
-	fallbackLocale: 'en',
-	messages: { en: englishBaseText },
-	silentTranslationWarn: true,
-});
-
-locale.i18n((key: string, options?: { interpolate: object }) =>
-	i18nInstance.t(key, options && options.interpolate),
-);
-
 const loadedLanguages = ['en'];
 
-function setLanguage(language: string) {
-	i18nInstance.locale = language;
+async function setLanguage(language: string) {
+	i18nInstance.global.locale = language as 'en';
 	axios.defaults.headers.common['Accept-Language'] = language;
 	document!.querySelector('html')!.setAttribute('lang', language);
 
 	// update n8n design system and element ui
-	locale.use(language);
+	await locale.use(language);
 
 	return language;
 }
@@ -537,27 +563,25 @@ function setLanguage(language: string) {
 export async function loadLanguage(language?: string) {
 	if (!language) return;
 
-	if (i18nInstance.locale === language) {
-		setLanguage(language);
-		return;
+	if (i18nInstance.global.locale === language) {
+		return await setLanguage(language);
 	}
 
 	if (loadedLanguages.includes(language)) {
-		setLanguage(language);
-		return;
+		return await setLanguage(language);
 	}
 
 	const { numberFormats, ...rest } = (await import(`./locales/${language}.json`)).default;
 
-	i18nInstance.setLocaleMessage(language, rest);
+	i18nInstance.global.setLocaleMessage(language, rest);
 
 	if (numberFormats) {
-		i18nInstance.setNumberFormat(language, numberFormats);
+		i18nInstance.global.setNumberFormat(language, numberFormats);
 	}
 
 	loadedLanguages.push(language);
 
-	setLanguage(language);
+	return await setLanguage(language);
 }
 
 /**
@@ -567,7 +591,7 @@ export function addNodeTranslation(
 	nodeTranslation: { [nodeType: string]: object },
 	language: string,
 ) {
-	const oldNodesBase = i18nInstance.messages[language]['n8n-nodes-base'] || {};
+	const oldNodesBase = i18nInstance.global.messages[language]['n8n-nodes-base'] || {};
 
 	const updatedNodes = {
 		// @ts-ignore
@@ -579,9 +603,9 @@ export function addNodeTranslation(
 		'n8n-nodes-base': Object.assign(oldNodesBase, { nodes: updatedNodes }),
 	};
 
-	i18nInstance.setLocaleMessage(
+	i18nInstance.global.setLocaleMessage(
 		language,
-		Object.assign(i18nInstance.messages[language], newNodesBase),
+		Object.assign(i18nInstance.global.messages[language], newNodesBase),
 	);
 }
 
@@ -592,7 +616,7 @@ export function addCredentialTranslation(
 	nodeCredentialTranslation: { [credentialType: string]: object },
 	language: string,
 ) {
-	const oldNodesBase = i18nInstance.messages[language]['n8n-nodes-base'] || {};
+	const oldNodesBase = i18nInstance.global.messages[language]['n8n-nodes-base'] || {};
 
 	const updatedCredentials = {
 		// @ts-ignore
@@ -604,9 +628,9 @@ export function addCredentialTranslation(
 		'n8n-nodes-base': Object.assign(oldNodesBase, { credentials: updatedCredentials }),
 	};
 
-	i18nInstance.setLocaleMessage(
+	i18nInstance.global.setLocaleMessage(
 		language,
-		Object.assign(i18nInstance.messages[language], newNodesBase),
+		Object.assign(i18nInstance.global.messages[language], newNodesBase),
 	);
 }
 
@@ -614,22 +638,30 @@ export function addCredentialTranslation(
  * Add a node's header strings to the i18n instance's `messages` object.
  */
 export function addHeaders(headers: INodeTranslationHeaders, language: string) {
-	i18nInstance.setLocaleMessage(
+	i18nInstance.global.setLocaleMessage(
 		language,
-		Object.assign(i18nInstance.messages[language], { headers }),
+		Object.assign(i18nInstance.global.messages[language], { headers }),
 	);
 }
 
+export const i18n: I18nClass = new I18nClass();
+
+export const I18nPlugin: Plugin<{}> = {
+	async install(app) {
+		locale.i18n((key: string, options?: { interpolate: Record<string, unknown> }) =>
+			i18nInstance.global.t(key, options?.interpolate || {}),
+		);
+
+		app.config.globalProperties.$locale = i18n;
+
+		await locale.use('en');
+	},
+};
+
 // ----------------------------------
 //             typings
 // ----------------------------------
 
-declare module 'vue/types/vue' {
-	interface Vue {
-		$locale: I18nClass;
-	}
-}
-
 type GetBaseTextKey<T> = T extends `_${string}` ? never : T;
 
 export type BaseTextKey = GetBaseTextKey<keyof typeof englishBaseText>;
diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index 905ef90dad8c4..b7f09d71c3476 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -1,26 +1,41 @@
 {
-	"_reusableBaseText.cancel": "Cancel",
-	"_reusableBaseText.codeNodeEditor.linter.useJson": "Access the properties of an item under `.json`, e.g. `item.json`",
-	"_reusableBaseText.codeNodeEditor.completer.all": "Get all items",
-	"_reusableBaseText.codeNodeEditor.completer.first": "Get the first item",
-	"_reusableBaseText.codeNodeEditor.completer.last": "Get the last item",
-	"_reusableBaseText.codeNodeEditor.completer.itemMatching": "Get the item matching a specified input item. Pass the input item index",
-	"_reusableBaseText.name": "Name",
-	"_reusableBaseText.save": "Save",
-	"_reusableBaseText.dismiss": "Dismiss",
-	"_reusableDynamicText.readMore": "Read more",
-	"_reusableDynamicText.learnMore": "Learn more",
-	"_reusableDynamicText.moreInfo": "More info",
-	"_reusableDynamicText.oauth2.clientId": "Client ID",
-	"_reusableDynamicText.oauth2.clientSecret": "Client Secret",
-	"_reusableBaseText.unlimited": "Unlimited",
-	"_reusableBaseText.activate": "Activate",
-	"_reusableBaseText.error": "Error",
+	"_reusableBaseText": {
+		"cancel": "Cancel",
+		"codeNodeEditor": {
+			"linter": {
+				"useJson": "Access the properties of an item under `.json`, e.g. `item.json`"
+			},
+			"completer": {
+				"all": "Get all items",
+				"first": "Get the first item",
+				"last": "Get the last item",
+				"itemMatching": "Get the item matching a specified input item. Pass the input item index"
+			}
+		},
+		"name": "Name",
+		"save": "Save",
+		"dismiss": "Dismiss",
+		"unlimited": "Unlimited",
+		"activate": "Activate",
+		"error": "Error"
+	},
+	"_reusableDynamicText": {
+		"readMore": "Read more",
+		"learnMore": "Learn more",
+		"moreInfo": "More info",
+		"oauth2": {
+			"clientId": "Client ID",
+			"clientSecret": "Client Secret"
+		}
+	},
 	"generic.any": "Any",
 	"generic.cancel": "Cancel",
+	"generic.close": "Close",
 	"generic.confirm": "Confirm",
 	"generic.deleteWorkflowError": "Problem deleting workflow",
 	"generic.filtersApplied": "Filters are currently applied.",
+	"generic.field": "field",
+	"generic.fields": "fields",
 	"generic.learnMore": "Learn more",
 	"generic.reset": "Reset",
 	"generic.resetAllFilters": "Reset all filters",
@@ -28,6 +43,7 @@
 	"generic.communityNode.tooltip": "This is a node from our community. It's part of the {packageName} package. <a href=\"{docURL}\" target=\"_blank\" title=\"Read the n8n docs\">Learn more</a>",
 	"generic.copy": "Copy",
 	"generic.delete": "Delete",
+	"generic.dontShowAgain": "Don't show again",
 	"generic.executions": "Executions",
 	"generic.or": "or",
 	"generic.clickToCopy": "Click to copy",
@@ -35,14 +51,22 @@
 	"generic.beta": "beta",
 	"generic.yes": "Yes",
 	"generic.no": "No",
+	"generic.retry": "Retry",
+	"generic.error": "Something went wrong",
 	"generic.settings": "Settings",
+	"generic.service": "the service",
 	"generic.unsavedWork.confirmMessage.headline": "Save changes before leaving?",
 	"generic.unsavedWork.confirmMessage.message": "If you don't save, you will lose your changes.",
 	"generic.unsavedWork.confirmMessage.confirmButtonText": "Save",
 	"generic.unsavedWork.confirmMessage.cancelButtonText": "Leave without saving",
+	"generic.upgradeNow": "Upgrade now",
 	"generic.workflow": "Workflow",
 	"generic.workflowSaved": "Workflow changes saved",
 	"generic.editor": "Editor",
+	"generic.seePlans": "See plans",
+	"generic.loading": "Loading",
+	"generic.and": "and",
+	"generic.welcome": "Welcome",
 	"about.aboutN8n": "About n8n",
 	"about.close": "Close",
 	"about.license": "License",
@@ -54,7 +78,6 @@
 	"askAi.dialog.body": "We’re still applying the finishing touches. Soon, you will be able to <strong>automatically generate code from simple text prompts</strong>. Join the waitlist to get early access to this feature.",
 	"askAi.dialog.signup": "Join Waitlist",
 	"activationModal.butYouCanSeeThem": "but you can see them in the",
-	"activationModal.dontShowAgain": "Don't show again",
 	"activationModal.executionList": "execution list",
 	"activationModal.gotIt": "Got it",
 	"activationModal.ifYouChooseTo": "if you choose to",
@@ -65,42 +88,48 @@
 	"activationModal.yourTriggersWillNowFire": "Your triggers will now fire production executions automatically.",
 	"activationModal.yourWorkflowWillNowListenForEvents": "Your workflow will now listen for events from {serviceName} and trigger executions.",
 	"activationModal.yourWorkflowWillNowRegularlyCheck": "Your workflow will now regularly check {serviceName} for events and trigger executions for them.",
-	"auth.changePassword": "Change Password",
-	"auth.changePassword.currentPassword": "Current Password",
+	"aiAssistantChat.title": "✨ Generate workflow step with AI",
+	"aiAssistantChat.greeting": "Hi {username}!",
+	"aiAssistantChat.chatPlaceholder": "Enter your response...",
+	"aiAssistantChat.getStarted": "Get started",
+	"aiAssistantChat.initialMessage.firstStep": "What should the first step in your workflow do?",
+	"aiAssistantChat.initialMessage.nextStep": "Can you describe the next step after the __{currentAction}__ action in your workflow?",
+	"aiAssistantChat.response.message1": "Thanks for trying our new __Generate Workflow Step__ feature. Currently, the feature is not ready yet. We're gathering real-world prompts like yours to ensure we're creating a high-quality, valuable feature.",
+	"aiAssistantChat.response.message2": "We understand this may be disappointing, but we believe it's crucial to developing the best possible feature for you and others. We’d love to invite you to be one of the first users to get their hands on the real feature once it’s ready.",
+	"aiAssistantChat.response.quickReply.close": "Close chat thread",
+	"aiAssistantChat.response.quickReply.signUp": "Sign up for early access",
+	"aiAssistantChat.response.quickReply.giveFeedback": "Give feedback to product team",
+	"aiAssistantChat.closeButtonTooltip": "Close chat",
+	"aiAssistantChat.closeChatConfirmation": "Are you sure you want to end this chat session?",
+	"aiAssistantChat.closeChatConfirmation.confirm": "Yes, close it",
+	"aiAssistantChat.closeChatConfirmation.cancel": "No, stay",
+	"aiAssistantChat.quickReply.title": "Quick reply 👇",
+	"auth.changePassword": "Change password",
+	"auth.changePassword.currentPassword": "Current password",
 	"auth.changePassword.error": "Problem changing the password",
 	"auth.changePassword.missingTokenError": "Missing token",
 	"auth.changePassword.missingUserIdError": "Missing user ID",
 	"auth.changePassword.passwordUpdated": "Password updated",
 	"auth.changePassword.passwordUpdatedMessage": "You can now sign in with your new password",
 	"auth.changePassword.passwordsMustMatchError": "Passwords must match",
-	"auth.changePassword.reenterNewPassword": "Re-enter New Password",
-	"auth.changePassword.tokenValidationError": "Issue validating invite token",
+	"auth.changePassword.reenterNewPassword": "Re-enter new password",
+	"auth.changePassword.tokenValidationError": "Invalid password-reset token",
 	"auth.defaultPasswordRequirements": "8+ characters, at least 1 number and 1 capital letter",
 	"auth.validation.missingParameters": "Missing token or user id",
 	"auth.email": "Email",
 	"auth.firstName": "First Name",
 	"auth.lastName": "Last Name",
-	"auth.newPassword": "New Password",
+	"auth.newPassword": "New password",
 	"auth.password": "Password",
 	"auth.otp": "OTP",
 	"auth.role": "Role",
 	"auth.roles.member": "Member",
+	"auth.roles.admin": "Admin",
 	"auth.roles.owner": "Owner",
-	"auth.agreement.label": "Inform me about security vulnerabilities if they arise",
-	"auth.setup.confirmOwnerSetup": "Set up owner account?",
-	"auth.setup.confirmOwnerSetupMessage": "To give others access to your <b>{entities}</b>, you’ll need to share these account details with them. Or you can continue as before with no account, by going back and skipping this setup. <a href=\"https://docs.n8n.io/user-management/\" target=\"_blank\">More info</a>",
-	"auth.setup.createAccount": "Create account",
-	"auth.setup.goBack": "Go back",
+	"auth.agreement.label": "I want to receive security and product updates",
 	"auth.setup.next": "Next",
-	"auth.setup.ownerAccountBenefits": "Setting up an owner account allows you to invite others, and prevents people using n8n without an account",
 	"auth.setup.settingUpOwnerError": "Problem setting up owner",
-	"auth.setup.setupConfirmation.concatEntities": "{workflows} and {credentials}",
-	"auth.setup.setupConfirmation.credentials": "{count} credential | {count} credentials",
-	"auth.setup.setupConfirmation.existingWorkflows": "{count} existing workflow | {count} existing workflows",
 	"auth.setup.setupOwner": "Set up owner account",
-	"auth.setup.skipOwnerSetupQuestion": "Skip owner account setup?",
-	"auth.setup.skipSetup": "Skip setup",
-	"auth.setup.skipSetupTemporarily": "Skip setup for now",
 	"auth.signin": "Sign in",
 	"auth.signin.error": "Problem logging in",
 	"auth.signout": "Sign out",
@@ -110,10 +139,53 @@
 	"auth.signup.setupYourAccount": "Set up your account",
 	"auth.signup.setupYourAccountError": "Problem setting up your account",
 	"auth.signup.tokenValidationError": "Issue validating invite token",
+	"banners.confirmEmail.message.1": "To secure your account and prevent future access issues, please confirm your",
+	"banners.confirmEmail.message.2": "email address.",
+	"banners.confirmEmail.button": "Confirm email",
+	"banners.confirmEmail.toast.success.heading": "Confirmation email sent",
+	"banners.confirmEmail.toast.success.message": "Please check your inbox and click the confirmation link.",
+	"banners.confirmEmail.toast.error.heading": "Problem sending confirmation email",
+	"banners.confirmEmail.toast.error.message": "Please try again later.",
+	"banners.nonProductionLicense.message": "This n8n instance is not licensed for production purposes.",
+	"banners.trial.message": "1 day left in your n8n trial | {count} days left in your n8n trial",
+	"banners.trialOver.message": "Your trial is over. Upgrade now to keep automating.",
+	"banners.v1.message": "n8n has been updated to version 1, introducing some breaking changes. Please consult the <a target=\"_blank\" href=\"https://docs.n8n.io/1-0-migration-checklist\">migration guide</a> for more information.",
 	"binaryDataDisplay.backToList": "Back to list",
 	"binaryDataDisplay.backToOverviewPage": "Back to overview page",
 	"binaryDataDisplay.noDataFoundToDisplay": "No data found to display",
 	"binaryDataDisplay.yourBrowserDoesNotSupport": "Your browser does not support the video element. Kindly update it to latest version.",
+	"chat.window.title": "Chat Window ({nodeName})",
+	"chat.window.logs": "Log (for last message)",
+	"chat.window.noChatNode": "No Chat Node",
+	"chat.window.noExecution": "Nothing got executed yet",
+	"chat.window.chat.placeholder": "Type a message, or press ‘up’ arrow for previous one",
+	"chat.window.chat.sendButtonText": "Send",
+	"chat.window.chat.provideMessage": "Please provide a message",
+	"chat.window.chat.emptyChatMessage": "Empty chat message",
+	"chat.window.chat.chatMessageOptions.reuseMessage": "Reuse Message",
+	"chat.window.chat.chatMessageOptions.repostMessage": "Repost Message",
+	"chat.window.chat.chatMessageOptions.executionId": "Execution ID",
+	"chat.window.chat.unpinAndExecute.description": "Sending the message overwrites the pinned chat node data.",
+	"chat.window.chat.unpinAndExecute.title": "Unpin chat output data?",
+	"chat.window.chat.unpinAndExecute.confirm": "Unpin and send",
+	"chat.window.chat.unpinAndExecute.cancel": "Cancel",
+	"chatEmbed.infoTip.description": "Add chat to external applications using the n8n chat package.",
+	"chatEmbed.infoTip.link": "More info",
+	"chatEmbed.title": "Embed Chat in your website",
+	"chatEmbed.close": "Close",
+	"chatEmbed.install": "First, install the n8n chat package:",
+	"chatEmbed.paste.cdn": "Paste the following code anywhere in the {code} tag of your HTML file.",
+	"chatEmbed.paste.cdn.file": "<body>",
+	"chatEmbed.paste.vue": "Next, paste the following code in your {code} file.",
+	"chatEmbed.paste.vue.file": "App.vue",
+	"chatEmbed.paste.react": "Next, paste the following code in your {code} file.",
+	"chatEmbed.paste.react.file": "App.ts",
+	"chatEmbed.paste.other": "Next, paste the following code in your {code} file.",
+	"chatEmbed.paste.other.file": "main.ts",
+	"chatEmbed.packageInfo.description": "The n8n Chat widget can be easily customized to fit your needs.",
+	"chatEmbed.packageInfo.link": "Read the full documentation",
+	"chatEmbed.chatTriggerNode": "You can use a Chat Trigger Node to embed the chat widget directly into n8n.",
+	"chatEmbed.url": "https://www.npmjs.com/package/{'@'}n8n/chat",
 	"codeEdit.edit": "Edit",
 	"codeNodeEditor.askAi": "✨ Ask AI",
 	"codeNodeEditor.completer.$()": "Output data of the {nodeName} node",
@@ -121,10 +193,12 @@
 	"codeNodeEditor.completer.$execution.id": "The ID of the current execution",
 	"codeNodeEditor.completer.$execution.mode": "How the execution was triggered: 'test' or 'production'",
 	"codeNodeEditor.completer.$execution.resumeUrl": "Used when using the 'wait' node to wait for a webhook. The webhook to call to resume execution",
+	"codeNodeEditor.completer.$execution.resumeFormUrl": "Used when using the 'wait' node to wait for a form submission. The url of form submitting which will resume execution",
 	"codeNodeEditor.completer.$execution.customData.set()": "Set custom data for the current execution. <a href=\"https://docs.n8n.io/workflows/executions/custom-executions-data/\" target=\"_blank\">Learn More</a>",
 	"codeNodeEditor.completer.$execution.customData.get()": "Get custom data set in the current execution. <a href=\"https://docs.n8n.io/workflows/executions/custom-executions-data/\" target=\"_blank\">Learn More</a>",
 	"codeNodeEditor.completer.$execution.customData.setAll()": "Set multiple custom data key/value pairs with an object for the current execution. <a href=\"https://docs.n8n.io/workflows/executions/custom-executions-data/\" target=\"_blank\">Learn More</a>",
 	"codeNodeEditor.completer.$execution.customData.getAll()": "Get all custom data for the current execution. <a href=\"https://docs.n8n.io/workflows/executions/custom-executions-data/\" target=\"_blank\">Learn More</a>",
+	"codeNodeEditor.completer.$ifEmpty": "Checks whether the first parameter is empty, and if so returns the second parameter. Otherwise returns the first parameter. The following count as empty: null/undefined values, empty strings, empty arrays, objects with no keys.",
 	"codeNodeEditor.completer.$input": "This node’s input data",
 	"codeNodeEditor.completer.$input.all": "@:_reusableBaseText.codeNodeEditor.completer.all",
 	"codeNodeEditor.completer.$input.first": "@:_reusableBaseText.codeNodeEditor.completer.first",
@@ -146,10 +220,17 @@
 	"codeNodeEditor.completer.$today": "A timestamp representing the current day (at midnight, as a Luxon object)",
 	"codeNodeEditor.completer.$vars": "The variables defined in your instance",
 	"codeNodeEditor.completer.$vars.varName": "Variable set on this n8n instance. All variables evaluate to strings.",
+	"codeNodeEditor.completer.$secrets": "The external secrets connected to your instance",
+	"codeNodeEditor.completer.$secrets.provider": "External secrets providers connected to this n8n instance.",
+	"codeNodeEditor.completer.$secrets.provider.varName": "External secrets connected to this n8n instance. All secrets evaluate to strings.",
 	"codeNodeEditor.completer.$workflow": "Information about the workflow",
 	"codeNodeEditor.completer.$workflow.active": "Whether the workflow is active or not (boolean)",
 	"codeNodeEditor.completer.$workflow.id": "The ID of the workflow",
 	"codeNodeEditor.completer.$workflow.name": "The name of the workflow",
+	"codeNodeEditor.completer.$response": "The response object received by the HTTP node.",
+	"codeNodeEditor.completer.$request": "The request object sent by the HTTP node.",
+	"codeNodeEditor.completer.$pageCount": "Tracks how many pages the HTTP node has fetched.",
+	"codeNodeEditor.completer.dateTime": "Luxon DateTime. Use this object to parse, format and manipulate dates and times",
 	"codeNodeEditor.completer.binary": "The item's binary (file) data",
 	"codeNodeEditor.completer.globalObject.assign": "Copy of the object containing all enumerable own properties",
 	"codeNodeEditor.completer.globalObject.entries": "The object's keys and values",
@@ -259,6 +340,25 @@
 	"codeNodeEditor.completer.selector.itemMatching": "@:_reusableBaseText.codeNodeEditor.completer.itemMatching",
 	"codeNodeEditor.completer.selector.last": "@:_reusableBaseText.codeNodeEditor.completer.last",
 	"codeNodeEditor.completer.selector.params": "The parameters of the node",
+	"codeNodeEditor.completer.selector.isExecuted": "Whether the node has executed",
+	"codeNodeEditor.completer.section.input": "Input",
+	"codeNodeEditor.completer.section.prevNodes": "Earlier nodes",
+	"codeNodeEditor.completer.section.metadata": "Metadata",
+	"codeNodeEditor.completer.section.fields": "Fields",
+	"codeNodeEditor.completer.section.properties": "Properties",
+	"codeNodeEditor.completer.section.methods": "Methods",
+	"codeNodeEditor.completer.section.otherMethods": "Other methods",
+	"codeNodeEditor.completer.section.recommended": "Suggested",
+	"codeNodeEditor.completer.section.recommendedMethods": "Suggested methods",
+	"codeNodeEditor.completer.section.other": "Other",
+	"codeNodeEditor.completer.section.edit": "Edit",
+	"codeNodeEditor.completer.section.query": "Query",
+	"codeNodeEditor.completer.section.format": "Format",
+	"codeNodeEditor.completer.section.component": "Component",
+	"codeNodeEditor.completer.section.case": "Case",
+	"codeNodeEditor.completer.section.cast": "Cast",
+	"codeNodeEditor.completer.section.compare": "Compare",
+	"codeNodeEditor.completer.section.validation": "Validate",
 	"codeNodeEditor.linter.allItems.firstOrLastCalledWithArg": "expects no argument.",
 	"codeNodeEditor.linter.allItems.emptyReturn": "Code doesn't return items properly. Please return an array of objects, one for each item you would like to output.",
 	"codeNodeEditor.linter.allItems.itemCall": "`item` is a property to access, not a method to call. Did you mean `.item` without brackets?",
@@ -276,6 +376,36 @@
 	"codeNodeEditor.linter.eachItem.unavailableItems": "Legacy `items` is only available in the 'Run Once for All Items' mode.",
 	"codeNodeEditor.linter.eachItem.unavailableMethod": "Method `$input.{method}()` is only available in the 'Run Once for All Items' mode.",
 	"codeNodeEditor.linter.bothModes.syntaxError": "Syntax error",
+	"codeNodeEditor.askAi.placeholder": "Tell AI what you want the code to achieve. You can reference input data fields using dot notation (e.g. user.email)",
+	"codeNodeEditor.askAi.intro": "Hey AI, generate JavaScript code that...",
+	"codeNodeEditor.askAi.help": "Help",
+	"codeNodeEditor.askAi.generateCode": "Generate Code",
+	"codeNodeEditor.askAi.noInputData": "You can generate code once this node has incoming input data (from a node earlier in your workflow)",
+	"codeNodeEditor.askAi.sureLeaveTab": "Are you sure you want to switch tab? The code generation will stop",
+	"codeNodeEditor.askAi.areYouSure": "Are you sure?",
+	"codeNodeEditor.askAi.switchTab": "Switch Tab",
+	"codeNodeEditor.askAi.noPrompt": "First enter a prompt above before generating code",
+	"codeNodeEditor.askAi.onlyAllItemsMode": "Ask AI generation works only in 'Run Once for All Items' mode",
+	"codeNodeEditor.askAi.promptTooShort": "Enter a minimum of {minLength} characters before attempting to generate code",
+	"codeNodeEditor.askAi.generateCodeAndReplace": "Generate and Replace Code",
+	"codeNodeEditor.askAi.replaceCurrentCode": "Replace current code?",
+	"codeNodeEditor.askAi.areYouSureToReplace": "Are you sure you want to generate new code? Your current code will be replaced.",
+	"codeNodeEditor.askAi.loadingPhrase0": "AI cogs whirring, almost there…",
+	"codeNodeEditor.askAi.loadingPhrase1": "up up down down left right b a start…",
+	"codeNodeEditor.askAi.loadingPhrase2": "Consulting Jan Oberhauser…",
+	"codeNodeEditor.askAi.loadingPhrase3": "Gathering bytes and pieces…",
+	"codeNodeEditor.askAi.loadingPhrase4": "Checking if another AI knows the answer…",
+	"codeNodeEditor.askAi.loadingPhrase5": "Checking on Stack Overflow…",
+	"codeNodeEditor.askAi.loadingPhrase6": "Crunching data, AI-style…",
+	"codeNodeEditor.askAi.loadingPhrase7": "Stand by, AI magic at work…",
+	"codeNodeEditor.askAi.generationCompleted": "✨ Code generation completed",
+	"codeNodeEditor.askAi.generationFailed": "Code generation failed",
+	"codeNodeEditor.askAi.generationFailedUnknown": "Code generation failed due to an unknown reason. Try again in a few minutes.",
+	"codeNodeEditor.askAi.generationFailedDown": "We're sorry, our AI service is currently unavailable. Please try again later. If the problem persists, contact support.",
+	"codeNodeEditor.askAi.generationFailedRate": "We've hit our rate limit with our AI partner (too many requests). Please wait a minute before trying again.",
+	"codeNodeEditor.askAi.generationFailedTooLarge": "Your workflow data is too large for AI to process. Simplify the data being sent into the Code node and retry.",
+	"codeNodeEditor.tabs.askAi": "✨ Ask AI",
+	"codeNodeEditor.tabs.code": "Code",
 	"collectionParameter.choose": "Choose...",
 	"collectionParameter.noProperties": "No properties",
 	"credentialEdit.credentialConfig.accountConnected": "Account connected",
@@ -300,12 +430,14 @@
 	"credentialEdit.credentialConfig.authTypeSelectorLabel": "Connect using",
 	"credentialEdit.credentialConfig.authTypeSelectorTooltip": "The authentication method to use for the connection",
 	"credentialEdit.credentialConfig.recommendedAuthTypeSuffix": "(recommended)",
-	"credentialEdit.credentialEdit.confirmMessage.beforeClose1.cancelButtonText": "Keep Editing",
-	"credentialEdit.credentialEdit.confirmMessage.beforeClose1.confirmButtonText": "Close",
+	"credentialEdit.credentialConfig.externalSecrets": "Enterprise plan users can pull in credentials from external vaults.",
+	"credentialEdit.credentialConfig.externalSecrets.moreInfo": "More info",
+	"credentialEdit.credentialEdit.confirmMessage.beforeClose1.cancelButtonText": "Close",
+	"credentialEdit.credentialEdit.confirmMessage.beforeClose1.confirmButtonText": "Keep Editing",
 	"credentialEdit.credentialEdit.confirmMessage.beforeClose1.headline": "Close without saving?",
 	"credentialEdit.credentialEdit.confirmMessage.beforeClose1.message": "Are you sure you want to throw away the changes you made to the {credentialDisplayName} credential?",
-	"credentialEdit.credentialEdit.confirmMessage.beforeClose2.cancelButtonText": "Keep Editing",
-	"credentialEdit.credentialEdit.confirmMessage.beforeClose2.confirmButtonText": "Close",
+	"credentialEdit.credentialEdit.confirmMessage.beforeClose2.cancelButtonText": "Close",
+	"credentialEdit.credentialEdit.confirmMessage.beforeClose2.confirmButtonText": "Keep Editing",
 	"credentialEdit.credentialEdit.confirmMessage.beforeClose2.headline": "Close without connecting?",
 	"credentialEdit.credentialEdit.confirmMessage.beforeClose2.message": "You need to connect your credential for it to work",
 	"credentialEdit.credentialEdit.confirmMessage.deleteCredential.cancelButtonText": "",
@@ -335,7 +467,8 @@
 	"credentialEdit.oAuthButton.connectMyAccount": "Connect my account",
 	"credentialEdit.oAuthButton.signInWithGoogle": "Sign in with Google",
 	"credentialEdit.credentialSharing.info.owner": "Sharing a credential allows people to use it in their workflows. They cannot access credential details.",
-	"credentialEdit.credentialSharing.info.instanceOwner": "You can view this credential because you are the instance owner (and rename or delete it too). To use it in a workflow, ask the credential owner to share it with you.",
+	"credentialEdit.credentialSharing.info.reader": "You can view this credential because you have permission to read and share (and rename or delete it too).{notShared}",
+	"credentialEdit.credentialSharing.info.notShared": "You can share it with yourself or other users to use it in a workflow.",
 	"credentialEdit.credentialSharing.info.sharee": "Only {credentialOwnerName} can change who this credential is shared with",
 	"credentialEdit.credentialSharing.info.sharee.fallback": "the owner",
 	"credentialEdit.credentialSharing.select.placeholder": "Add users...",
@@ -370,7 +503,7 @@
 	"credentialsList.updated": "Updated",
 	"credentialsList.yourSavedCredentials": "Your saved credentials",
 	"credentials.heading": "Credentials",
-	"credentials.add": "Add Credential",
+	"credentials.add": "Add credential",
 	"credentials.empty.heading": "{name}, let's set up a credential",
 	"credentials.empty.heading.userNotSetup": "Set up a credential",
 	"credentials.empty.description": "Credentials let workflows interact with your apps and services",
@@ -402,9 +535,6 @@
 	"dataMapping.dragFromPreviousHint": "Map data from previous nodes to <b>{name}</b> by first clicking this button",
 	"dataMapping.success.title": "You just mapped some data!",
 	"dataMapping.success.moreInfo": "Check out our <a href=\"https://docs.n8n.io/data/data-mapping\" target=\"_blank\">docs</a> for more details on mapping data in n8n",
-	"dataMapping.tableHint": "<img src='/static/data-mapping-gif.gif'/> Drag a column onto <b>{name}</b> to map it",
-	"dataMapping.jsonHint": "<img src='/static/json-mapping-gif.gif'/> Drag a JSON key onto <b>{name}</b> to map data",
-	"dataMapping.schemaHint": "<img src='/static/schema-mapping-gif.gif'/> Drag a datapill onto <b>{name}</b> to map data",
 	"dataMapping.tableView.tableColumnsExceeded": "Some columns are hidden",
 	"dataMapping.tableView.tableColumnsExceeded.tooltip": "Your data has more than {columnLimit} columns so some are hidden. Switch to {link} to see all data.",
 	"dataMapping.tableView.tableColumnsExceeded.tooltip.link": "JSON view",
@@ -467,11 +597,11 @@
 	"executionsList.confirmMessage.cancelButtonText": "",
 	"executionsList.confirmMessage.confirmButtonText": "Yes, delete",
 	"executionsList.confirmMessage.headline": "Delete Executions?",
-	"executionsList.confirmMessage.message": "Are you sure that you want to delete the {numSelected} selected execution(s)?",
+	"executionsList.confirmMessage.message": "Are you sure that you want to delete the {count} selected execution(s)?",
 	"executionsList.clearSelection": "Clear selection",
-	"executionsList.error": "Failed",
+	"executionsList.error": "Error",
 	"executionsList.filters": "Filters",
-	"executionsList.loadMore": "Load More",
+	"executionsList.loadMore": "Load more",
 	"executionsList.empty": "No executions",
 	"executionsList.loadedAll": "No more executions to fetch",
 	"executionsList.modes.error": "error",
@@ -490,9 +620,8 @@
 	"executionsList.succeeded": "Succeeded",
 	"executionsList.selectStatus": "Select Status",
 	"executionsList.selectWorkflow": "Select Workflow",
-	"executionsList.selected": "{numSelected} execution selected: | {numSelected} executions selected:",
+	"executionsList.selected": "{count} execution selected: | {count} executions selected:",
 	"executionsList.selectAll": "Select {executionNum} finished execution | Select all {executionNum} finished executions",
-	"executionsList.selected": "{numSelected} execution selected:",
 	"executionsList.test": "Test execution",
 	"executionsList.showError.handleDeleteSelected.title": "Problem deleting executions",
 	"executionsList.showError.loadMore.title": "Problem loading executions",
@@ -511,6 +640,7 @@
 	"executionsList.status": "Status",
 	"executionsList.statusCanceled": "Canceled",
 	"executionsList.statusText": "{status} in {time}",
+	"executionsList.statusTextWithoutTime": "{status}",
 	"executionsList.statusRunning": "{status} for {time}",
 	"executionsList.statusWaiting": "{status} until {time}",
 	"executionsList.statusUnknown": "Could not complete",
@@ -524,6 +654,24 @@
 	"executionsList.view": "View",
 	"executionsList.stop": "Stop",
 	"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",
+	"executionsList.debug.paywall.content": "Debug in Editor allows you to debug a previous execution with the actual data pinned, right in your editor.",
+	"executionsList.debug.paywall.link.text": "Read more in the docs",
+	"executionsList.debug.paywall.link.url": "https://docs.n8n.io/workflows/executions/debug/",
+	"workerList.pageTitle": "Workers",
+	"workerList.empty": "No workers are responding or available",
+	"workerList.item.lastUpdated": "Last updated",
+	"workerList.item.jobList.empty": "No current jobs",
+	"workerList.item.jobListTitle": "Current Jobs",
+	"workerList.item.netListTitle": "Network Interfaces",
+	"workerList.item.chartsTitle": "Performance Monitoring",
+	"workerList.item.copyAddressToClipboard": "Address copied to clipboard",
+	"workerList.actionBox.title": "Available on the Enterprise plan",
+	"workerList.actionBox.description": "View the current state of workers connected to your instance.",
+	"workerList.actionBox.description.link": "More info",
+	"workerList.actionBox.buttonText": "See plans",
+	"workerList.docs.url": "https://docs.n8n.io/hosting/scaling/queue-mode/#view-running-workers",
 	"executionSidebar.executionName": "Execution {id}",
 	"executionSidebar.searchPlaceholder": "Search executions...",
 	"executionView.onPaste.title": "Cannot paste here",
@@ -544,8 +692,8 @@
 	"executionsFilter.customData.inputTooltip.link": "View plans",
 	"executionsFilter.customData.docsTooltip": "Filter executions by data that you have explicitly saved in them (by calling $execution.customData.set(key, value)). {link}",
 	"executionsFilter.customData.docsTooltip.link": "More info",
-	"expressionEdit.anythingInside": "Anything inside",
-	"expressionEdit.isJavaScript": "is JavaScript.",
+	"expressionEdit.anythingInside": "Anything inside ",
+	"expressionEdit.isJavaScript": " is JavaScript.",
 	"expressionEdit.learnMore": "Learn more",
 	"expressionEdit.editExpression": "Edit Expression",
 	"expressionEdit.expression": "Expression",
@@ -555,11 +703,17 @@
 	"expressionModalInput.empty": "[empty]",
 	"expressionModalInput.undefined": "[undefined]",
 	"expressionModalInput.null": "null",
+	"expressionTip.noExecutionData": "Execute previous nodes to use input data",
+	"expressionTip.typeDotPrimitive": "Type <code>.</code> for data transformation options. <a target=\"_blank\" href=\"https://docs.n8n.io/code/builtin/data-transformation-functions/\">Learn more</a>",
+	"expressionTip.typeDotObject": "Type <code>.</code> for data transformation options, or to access fields. <a target=\"_blank\" href=\"https://docs.n8n.io/code/builtin/data-transformation-functions/\">Learn more</a>",
+	"expressionTip.javascript": "Anything inside <code>{'{{ }}'}</code> is JavaScript. <a target=\"_blank\" href=\"https://docs.n8n.io/code-examples/expressions/\">Learn more</a>",
+	"expressionModalInput.noExecutionData": "Execute previous nodes for preview",
+	"expressionModalInput.noNodeExecutionData": "Execute node ‘{node}’ for preview",
+	"expressionModalInput.noInputConnection": "No input connected",
+	"expressionModalInput.pairedItemConnectionError": "No path back to node",
+	"expressionModalInput.pairedItemInvalidPinnedError": "Unpin node ‘{node}’ and execute",
+	"expressionModalInput.pairedItemError": "Can’t determine which item to use",
 	"fakeDoor.settings.environments.name": "Environments",
-	"fakeDoor.settings.environments.infoText": "Environments allow you to use different settings and credentials in a workflow when you're building it vs when it's running in production",
-	"fakeDoor.settings.environments.actionBox.title": "We’re working on environments (as a paid feature)",
-	"fakeDoor.settings.environments.actionBox.title.cloud": "We’re working on this",
-	"fakeDoor.settings.environments.actionBox.description": "If you'd like to be the first to hear when it's ready, join the list.",
 	"fakeDoor.settings.sso.name": "Single Sign-On",
 	"fakeDoor.settings.sso.actionBox.title": "We’re working on this (as a paid feature)",
 	"fakeDoor.settings.sso.actionBox.title.cloud": "We’re working on this",
@@ -580,6 +734,7 @@
 	"forgotPassword.sendingEmailError": "Problem sending email",
 	"forgotPassword.ldapUserPasswordResetUnavailable": "Please contact your LDAP administrator to reset your password",
 	"forgotPassword.smtpErrorContactAdministrator": "Please contact your administrator (problem with your SMTP setup)",
+	"forgotPassword.tooManyRequests": "You’ve reached the password reset limit. Please try again in a few minutes.",
 	"forms.resourceFiltersDropdown.filters": "Filters",
 	"forms.resourceFiltersDropdown.ownedBy": "Owned by",
 	"forms.resourceFiltersDropdown.sharedWith": "Shared with",
@@ -591,8 +746,20 @@
 	"genericHelpers.minShort": "m",
 	"genericHelpers.sec": "sec",
 	"genericHelpers.secShort": "s",
-	"genericHelpers.showMessage.message": "Executions are read-only. Make changes from the <b>Workflow</b> tab.",
-	"genericHelpers.showMessage.title": "Cannot edit execution",
+	"suggestedTemplates.heading": "{name}, get started with n8n 👇",
+	"suggestedTemplates.sectionTitle": "Explore {sectionName} workflow templates",
+	"suggestedTemplates.newWorkflowButton": "Create blank workflow",
+	"suggestedTemplates.modal.button.label": "Use Template",
+	"suggestedTemplates.notification.comingSoon.title": "Template coming soon!",
+	"suggestedTemplates.notification.confirmation.title": "Got it!",
+	"suggestedTemplates.notification.confirmation.message": "We will contact you via email once this template is released.",
+	"suggestedTemplates.notification.comingSoon.message": "This template is still in the works. <b><a href=\"#\">Notify me when it's available</a></b>",
+	"readOnly.showMessage.executions.message": "Executions are read-only. Make changes from the <b>Workflow</b> tab.",
+	"readOnly.showMessage.executions.title": "Cannot edit execution",
+	"readOnlyEnv.showMessage.executions.message": "Executions are read-only.",
+	"readOnlyEnv.showMessage.executions.title": "Cannot edit execution",
+	"readOnlyEnv.showMessage.workflows.message": "Workflows are read-only in protected instances.",
+	"readOnlyEnv.showMessage.workflows.title": "Cannot edit workflow",
 	"mainSidebar.aboutN8n": "About n8n",
 	"mainSidebar.confirmMessage.workflowDelete.cancelButtonText": "",
 	"mainSidebar.confirmMessage.workflowDelete.confirmButtonText": "Yes, delete",
@@ -623,9 +790,13 @@
 	"mainSidebar.showMessage.stopExecution.title": "Execution stopped",
 	"mainSidebar.templates": "Templates",
 	"mainSidebar.workflows": "Workflows",
+	"mainSidebar.workflows.readOnlyEnv.tooltip": "Protected instances prevent editing workflows (recommended for production environments). {link}",
+	"mainSidebar.workflows.readOnlyEnv.tooltip.link": "More info",
 	"mainSidebar.executions": "All executions",
+	"mainSidebar.workersView": "Workers",
 	"menuActions.duplicate": "Duplicate",
 	"menuActions.download": "Download",
+	"menuActions.push": "Push to Git",
 	"menuActions.importFromUrl": "Import from URL...",
 	"menuActions.importFromFile": "Import from File...",
 	"menuActions.delete": "Delete",
@@ -636,12 +807,14 @@
 	"multipleParameter.moveUp": "Move up",
 	"ndv.backToCanvas": "Back to canvas",
 	"ndv.backToCanvas.waitingForTriggerWarning": "Waiting for a Trigger node to execute. Close this view to see the Workflow Canvas.",
-	"ndv.execute.executeNode": "Execute node",
+	"ndv.execute.testNode": "Test step",
+	"ndv.execute.testNode.description": "Runs the current node. Will also run previous nodes if they have not been run yet",
 	"ndv.execute.executing": "Executing",
 	"ndv.execute.fetchEvent": "Fetch Test Event",
 	"ndv.execute.fixPrevious": "Fix previous node first",
-	"ndv.execute.listenForEvent": "Listen For Event",
-	"ndv.execute.listenForTestEvent": "Listen For Test Event",
+	"ndv.execute.listenForTestEvent": "Listen for test event",
+	"ndv.execute.testChat": "Test chat",
+	"ndv.execute.testStep": "Test step",
 	"ndv.execute.stopListening": "Stop Listening",
 	"ndv.execute.nodeIsDisabled": "Enable node to execute",
 	"ndv.execute.requiredFieldsMissing": "Complete required fields first",
@@ -651,7 +824,10 @@
 	"ndv.input": "Input",
 	"ndv.input.nodeDistance": "({count} node back) | ({count} nodes back)",
 	"ndv.input.noNodesFound": "No nodes found",
+	"ndv.input.mapping": "Mapping",
+	"ndv.input.debugging": "Debugging",
 	"ndv.input.parentNodes": "Parent nodes",
+	"ndv.input.previousNode": "Previous node",
 	"ndv.input.tooMuchData.title": "Input data is huge",
 	"ndv.input.noOutputDataInBranch": "No input data in this branch",
 	"ndv.input.noOutputDataInNode": "Node did not output any data. n8n stops executing the workflow when a node has no output data.",
@@ -666,11 +842,14 @@
 	"ndv.input.disabled": "The '{nodeName}' node is disabled and won’t execute.",
 	"ndv.input.disabled.cta": "Enable it",
 	"ndv.output": "Output",
+	"ndv.output.ai.empty": "👈 This is {node}’s AI Logs. Click on a node to see the input it received and data it outputted.",
+	"ndv.output.outType.logs": "Logs",
+	"ndv.output.outType.regular": "Output",
 	"ndv.output.edit": "Edit Output",
 	"ndv.output.all": "all",
 	"ndv.output.branch": "Branch",
 	"ndv.output.executing": "Executing node...",
-	"ndv.output.items": "item | items",
+	"ndv.output.items": "{count} item | {count} items",
 	"ndv.output.noOutputData.message": "n8n stops executing the workflow when a node has no output data. You can change this default behaviour via",
 	"ndv.output.noOutputData.message.settings": "Settings",
 	"ndv.output.noOutputData.message.settingsOption": "> “Always Output Data”.",
@@ -679,40 +858,50 @@
 	"ndv.output.of": " of ",
 	"ndv.output.pageSize": "Page Size",
 	"ndv.output.run": "Run",
-	"ndv.output.runNodeHint": "Execute this node to output data",
+	"ndv.output.runNodeHint": "Test this node to output data",
+	"ndv.output.runNodeHintSubNode": "Output will appear here once the parent node is run",
 	"ndv.output.insertTestData": "insert test data",
-	"ndv.output.staleDataWarning.regular": "Node parameters have changed.<br>Execute node again to refresh output.",
+	"ndv.output.staleDataWarning.regular": "Node parameters have changed.<br>Test node again to refresh output.",
 	"ndv.output.staleDataWarning.pinData": "Node parameter changes will not affect pinned output data.",
 	"ndv.output.tooMuchData.message": "The node contains {size} MB of data. Displaying it may cause problems. <br /> If you do decide to display it, avoid the JSON view.",
 	"ndv.output.tooMuchData.showDataAnyway": "Show data anyway",
-	"ndv.output.tooMuchData.title": "Output data is huge!",
+	"ndv.output.tooMuchData.title": "Output data is large",
 	"ndv.output.waitingToRun": "Waiting to execute...",
 	"ndv.title.cancel": "Cancel",
 	"ndv.title.rename": "Rename",
 	"ndv.title.renameNode": "Rename node",
 	"ndv.pinData.pin.title": "Pin data",
-	"ndv.pinData.pin.description": "Node will always output this data instead of executing. You can also pin data from previous executions.",
+	"ndv.pinData.pin.description": "Node will always output this data instead of executing.",
+	"ndv.pinData.pin.binary": "Pin Data is disabled as this node's output contains binary data.",
 	"ndv.pinData.pin.link": "More info",
 	"ndv.pinData.pin.multipleRuns.title": "Run #{index} was pinned",
 	"ndv.pinData.pin.multipleRuns.description": "This run will be outputted each time the node is run.",
 	"ndv.pinData.unpinAndExecute.title": "Unpin output data?",
-	"ndv.pinData.unpinAndExecute.description": "Executing a node overwrites pinned data.",
+	"ndv.pinData.unpinAndExecute.description": "Testing a node overwrites pinned data.",
 	"ndv.pinData.unpinAndExecute.cancel": "Cancel",
-	"ndv.pinData.unpinAndExecute.confirm": "Unpin and execute",
+	"ndv.pinData.unpinAndExecute.confirm": "Unpin and test",
 	"ndv.pinData.beforeClosing.title": "Save output changes before closing?",
 	"ndv.pinData.beforeClosing.cancel": "Discard",
 	"ndv.pinData.beforeClosing.confirm": "Save",
-	"ndv.pinData.error.tooLarge.title": "Output data is too large to pin",
-	"ndv.pinData.error.tooLarge.description": "You can pin at most 12MB of output per workflow.",
+	"ndv.pinData.error.tooLarge.title": "Pinned data too big",
+	"ndv.pinData.error.tooLarge.description": "Workflow has reached the maximum allowed pinned data size",
+	"ndv.pinData.error.tooLargeWorkflow.title": "Pinned data too big",
+	"ndv.pinData.error.tooLargeWorkflow.description": "Workflow has reached the maximum allowed size",
+	"ndv.httpRequest.credentialOnly.docsNotice": "Use the <a target=\"_blank\" href=\"{docsUrl}\">{nodeName} docs</a> to construct your request. We'll take care of the authentication part if you add a {nodeName} credential below.",
 	"noTagsView.readyToOrganizeYourWorkflows": "Ready to organize your workflows?",
 	"noTagsView.withWorkflowTagsYouReFree": "With workflow tags, you're free to create the perfect tagging system for your flows",
+	"nextStepPopup.title.firstStep": "What triggers this workflow?",
+	"nextStepPopup.title.nextStep": "What happens next?",
+	"nextStepPopup.option.choose": "Choose from list...",
+	"nextStepPopup.option.generate": "Generate step with AI...",
 	"node.thisIsATriggerNode": "This is a Trigger node. <a target=\"_blank\" href=\"https://docs.n8n.io/workflows/components/nodes/\">Learn more</a>",
 	"node.activateDeactivateNode": "Activate/Deactivate Node",
-	"node.deleteNode": "Delete Node",
-	"node.disabled": "Disabled",
-	"node.duplicateNode": "Duplicate Node",
-	"node.editNode": "Edit Node",
-	"node.executeNode": "Execute Node",
+	"node.changeColor": "Change color",
+	"node.disabled": "Deactivated",
+	"node.testStep": "Test step",
+	"node.disable": "Deactivate",
+	"node.enable": "Activate",
+	"node.delete": "Delete",
 	"node.issues": "Issues",
 	"node.nodeIsExecuting": "Node is executing",
 	"node.nodeIsWaitingTill": "Node is waiting until {date} {time}",
@@ -720,30 +909,23 @@
 	"node.waitingForYouToCreateAnEventIn": "Waiting for you to create an event in {nodeType}",
 	"node.discovery.pinData.canvas": "You can pin this output instead of waiting for a test event. Open node to do so.",
 	"node.discovery.pinData.ndv": "You can pin this output instead of waiting for a test event.",
-	"nodeBase.clickToAddNodeOrDragToConnect": "Click to add node<br />or drag to connect",
+	"nodeBase.clickToAddNodeOrDragToConnect": "Click to add node \n or drag to connect",
+	"nodeCreator.actionsPlaceholderNode.scheduleTrigger": "On a Schedule",
+	"nodeCreator.actionsPlaceholderNode.webhook": "On a Webhook call",
 	"nodeCreator.actionsCategory.actions": "Actions",
 	"nodeCreator.actionsCategory.onNewEvent": "On new {event} event",
 	"nodeCreator.actionsCategory.onEvent": "On {event}",
 	"nodeCreator.actionsCategory.triggers": "Triggers",
-	"nodeCreator.actionsCategory.searchActions": "Search {nodeNameTitle} Actions...",
-	"nodeCreator.actionsList.apiCall": "Didn't find the right event? Make a <a data-action='addHttpNode'>custom {nodeNameTitle} API call</a>",
-	"nodeCreator.actionsList.apiCallNoResult": "Nothing found — try making a <a data-action='addHttpNode'>custom {nodeNameTitle} API call</a>",
-	"nodeCreator.categoryNames.analytics": "Analytics",
-	"nodeCreator.categoryNames.communication": "Communication",
-	"nodeCreator.categoryNames.coreNodes": "Core Nodes",
-	"nodeCreator.categoryNames.customNodes": "Custom Nodes",
-	"nodeCreator.categoryNames.dataStorage": "Data & Storage",
-	"nodeCreator.categoryNames.development": "Development",
-	"nodeCreator.categoryNames.financeAccounting": "Finance & Accounting",
-	"nodeCreator.categoryNames.marketingContent": "Marketing & Content",
-	"nodeCreator.categoryNames.miscellaneous": "Miscellaneous",
-	"nodeCreator.categoryNames.productivity": "Productivity",
-	"nodeCreator.categoryNames.sales": "Sales",
-	"nodeCreator.categoryNames.suggestedNodes": "Suggested Nodes ✨",
-	"nodeCreator.categoryNames.utility": "Utility",
-	"nodeCreator.mainPanel.all": "All",
-	"nodeCreator.mainPanel.regular": "Regular",
-	"nodeCreator.mainPanel.trigger": "Trigger",
+	"nodeCreator.actionsCategory.searchActions": "Search {node} Actions...",
+	"nodeCreator.actionsCategory.noMatchingActions": "No matching Actions. <i>Reset search</i>",
+	"nodeCreator.actionsCategory.noMatchingTriggers": "No matching Triggers. <i>Reset search</i>",
+	"nodeCreator.actionsList.apiCall": "Didn't find the right event? Make a <a data-action='addHttpNode'>custom {node} API call</a>",
+	"nodeCreator.actionsCallout.noActionItems": "We don't have <strong>{nodeName}</strong> actions yet. Have one in mind? Make a <a target=\"_blank\" href=\"https://community.n8n.io/c/feature-requests/5\"> request in our community</a>",
+	"nodeCreator.actionsCallout.triggersStartWorkflow": "Actions need to be triggered by another node, e.g. at regular intervals with the <strong>Schedule</strong> node. <a target=\"_blank\" href=\"https://docs.n8n.io/integrations/builtin/\"> Learn more</a>",
+	"nodeCreator.actionsTooltip.triggersStartWorkflow": "A trigger is a step that starts your workflow. <a target=\"_blank\" href=\"https://docs.n8n.io/integrations/builtin/\"> Learn more</a>",
+	"nodeCreator.actionsTooltip.actionsPerformStep": "Actions perform a step once your workflow has already started. <a target=\"_blank\" href=\"https://docs.n8n.io/integrations/builtin/\"> Learn more</a>",
+	"nodeCreator.actionsCallout.noTriggerItems": "No <strong>{nodeName}</strong> Triggers available. Users often combine the following Triggers with <strong>{nodeName}</strong> Actions.",
+	"nodeCreator.categoryNames.otherCategories": "Results in other categories",
 	"nodeCreator.noResults.dontWorryYouCanProbablyDoItWithThe": "Don’t worry, you can probably do it with the",
 	"nodeCreator.noResults.httpRequest": "HTTP Request",
 	"nodeCreator.noResults.node": "node",
@@ -751,8 +933,6 @@
 	"nodeCreator.noResults.requestTheNode": "Request the node",
 	"nodeCreator.noResults.wantUsToMakeItFaster": "Want us to make it faster?",
 	"nodeCreator.noResults.weDidntMakeThatYet": "We didn't make that... yet",
-	"nodeCreator.noResults.noMatchingActions": "No actions matching your results",
-	"nodeCreator.noResults.clickToSeeResults": "To see all results, <a data-action='showAllNodeCreatorNodes'>click here</a>",
 	"nodeCreator.noResults.webhook": "Webhook",
 	"nodeCreator.searchBar.searchNodes": "Search nodes...",
 	"nodeCreator.subcategoryDescriptions.appTriggerNodes": "Runs the flow when something happens in an app like Telegram, Notion or Airtable",
@@ -760,16 +940,44 @@
 	"nodeCreator.subcategoryDescriptions.dataTransformation": "Manipulate data, run JavaScript code, etc.",
 	"nodeCreator.subcategoryDescriptions.files": "CSV, XLS, XML, text, images, etc.",
 	"nodeCreator.subcategoryDescriptions.flow": "IF, Switch, Wait, Compare and Merge data, etc.",
-	"nodeCreator.subcategoryDescriptions.helpers": "HTTP Requests (API Calls), date and time, scrape HTML, RSS, SSH, etc.",
+	"nodeCreator.subcategoryDescriptions.helpers": "Code, HTTP Requests (API Calls), Webhook, and other helpers",
 	"nodeCreator.subcategoryDescriptions.otherTriggerNodes": "Runs the flow on workflow errors, file changes, etc.",
+	"nodeCreator.subcategoryDescriptions.agents": "Autonomous entities that interact and make decisions.",
+	"nodeCreator.subcategoryDescriptions.chains": "Structured assemblies for specific tasks.",
+	"nodeCreator.subcategoryDescriptions.documentLoaders": "Handles loading of documents for processing.",
+	"nodeCreator.subcategoryDescriptions.embeddings": "Transforms text into vector representations.",
+	"nodeCreator.subcategoryDescriptions.languageModels": "AI models that understand and generate language.",
+	"nodeCreator.subcategoryDescriptions.memory": "Manages storage and retrieval of information during execution.",
+	"nodeCreator.subcategoryDescriptions.outputParsers": "Ensures the output adheres to a defined format.",
+	"nodeCreator.subcategoryDescriptions.retrievers": "Fetches relevant information from a source.",
+	"nodeCreator.subcategoryDescriptions.textSplitters": "Breaks down text into smaller parts.",
+	"nodeCreator.subcategoryDescriptions.tools": "Utility components providing various functionalities.",
+	"nodeCreator.subcategoryDescriptions.vectorStores": "Handles storage and retrieval of vector representations.",
+	"nodeCreator.subcategoryDescriptions.miscellaneous": "Other AI related nodes.",
 	"nodeCreator.subcategoryNames.appTriggerNodes": "On app event",
 	"nodeCreator.subcategoryNames.appRegularNodes": "Action in an app",
 	"nodeCreator.subcategoryNames.dataTransformation": "Data transformation",
 	"nodeCreator.subcategoryNames.files": "Files",
 	"nodeCreator.subcategoryNames.flow": "Flow",
-	"nodeCreator.subcategoryNames.helpers": "Helpers",
+	"nodeCreator.subcategoryNames.helpers": "Core",
 	"nodeCreator.subcategoryNames.otherTriggerNodes": "Other ways...",
-	"nodeCreator.subcategoryTitles.otherTriggerNodes": "Other Trigger Nodes",
+	"nodeCreator.subcategoryNames.agents": "Agents",
+	"nodeCreator.subcategoryNames.chains": "Chains",
+	"nodeCreator.subcategoryNames.documentLoaders": "Document Loaders",
+	"nodeCreator.subcategoryNames.embeddings": "Embeddings",
+	"nodeCreator.subcategoryNames.languageModels": "Language Models",
+	"nodeCreator.subcategoryNames.memory": "Memory",
+	"nodeCreator.subcategoryNames.outputParsers": "Output Parsers",
+	"nodeCreator.subcategoryNames.retrievers": "Retrievers",
+	"nodeCreator.subcategoryNames.textSplitters": "Text Splitters",
+	"nodeCreator.subcategoryNames.tools": "Tools",
+	"nodeCreator.subcategoryNames.vectorStores": "Vector Stores",
+	"nodeCreator.subcategoryNames.miscellaneous": "Miscellaneous",
+	"nodeCreator.sectionNames.popular": "Popular",
+	"nodeCreator.sectionNames.other": "Other",
+	"nodeCreator.sectionNames.transform.combine": "Combine items",
+	"nodeCreator.sectionNames.transform.addOrRemove": "Add or remove items",
+	"nodeCreator.sectionNames.transform.convert": "Convert data",
 	"nodeCreator.triggerHelperPanel.addAnotherTrigger": "Add another trigger",
 	"nodeCreator.triggerHelperPanel.addAnotherTriggerDescription": "Triggers start your workflow. Workflows can have multiple triggers.",
 	"nodeCreator.triggerHelperPanel.title": "When should this workflow run?",
@@ -777,13 +985,37 @@
 	"nodeCreator.triggerHelperPanel.scheduleTriggerDescription": "Runs the flow every day, hour, or custom interval",
 	"nodeCreator.triggerHelperPanel.webhookTriggerDisplayName": "On webhook call",
 	"nodeCreator.triggerHelperPanel.webhookTriggerDescription": "Runs the flow when another app sends a webhook",
+	"nodeCreator.triggerHelperPanel.formTriggerDisplayName": "On form submission",
+	"nodeCreator.triggerHelperPanel.formTriggerDescription": "Runs the flow when an n8n generated webform is submitted",
 	"nodeCreator.triggerHelperPanel.manualTriggerDisplayName": "Manually",
 	"nodeCreator.triggerHelperPanel.manualTriggerDescription": "Runs the flow on clicking a button in n8n",
 	"nodeCreator.triggerHelperPanel.whatHappensNext": "What happens next?",
-	"nodeCreator.triggerHelperPanel.selectATrigger": "Select a trigger",
+	"nodeCreator.triggerHelperPanel.selectATrigger": "What triggers this workflow?",
 	"nodeCreator.triggerHelperPanel.selectATriggerDescription": "A trigger is a step that starts your workflow",
 	"nodeCreator.triggerHelperPanel.workflowTriggerDisplayName": "When called by another workflow",
 	"nodeCreator.triggerHelperPanel.workflowTriggerDescription": "Runs the flow when called by the Execute Workflow node from a different workflow",
+	"nodeCreator.aiPanel.aiNodes": "AI Nodes",
+	"nodeCreator.aiPanel.aiOtherNodes": "Other AI Nodes",
+	"nodeCreator.aiPanel.aiOtherNodesDescription": "Embeddings, Vector Stores, LLMs and other AI nodes",
+	"nodeCreator.aiPanel.selectAiNode": "Select an Al Node to add to your workflow",
+	"nodeCreator.aiPanel.nodesForAi": "Build autonomous agents, summarize or search documents, etc.",
+	"nodeCreator.aiPanel.newTag": "New",
+	"nodeCreator.aiPanel.langchainAiNodes": "Advanced AI",
+	"nodeCreator.aiPanel.title": "When should this workflow run?",
+	"nodeCreator.aiPanel.infoBox": "Check out our <a href=\"{link}\" target=\"_blank\">templates</a> for workflow examples and inspiration.",
+	"nodeCreator.aiPanel.scheduleTriggerDisplayName": "On a schedule",
+	"nodeCreator.aiPanel.scheduleTriggerDescription": "Runs the flow every day, hour, or custom interval",
+	"nodeCreator.aiPanel.webhookTriggerDisplayName": "On webhook call",
+	"nodeCreator.aiPanel.webhookTriggerDescription": "Runs the flow when another app sends a webhook",
+	"nodeCreator.aiPanel.manualTriggerDisplayName": "Manually",
+	"nodeCreator.aiPanel.manualTriggerDescription": "Runs the flow on clicking a button in n8n",
+	"nodeCreator.aiPanel.whatHappensNext": "What happens next?",
+	"nodeCreator.aiPanel.selectATrigger": "Select an AI Component",
+	"nodeCreator.aiPanel.selectATriggerDescription": "A trigger is a step that starts your workflow",
+	"nodeCreator.aiPanel.workflowTriggerDisplayName": "When called by another workflow",
+	"nodeCreator.aiPanel.workflowTriggerDescription": "Runs the flow when called by the Execute Workflow node from a different workflow",
+	"nodeCreator.nodeItem.triggerIconTitle": "Trigger Node",
+	"nodeCreator.nodeItem.aiIconTitle": "LangChain AI Node",
 	"nodeCredentials.createNew": "Create New Credential",
 	"nodeCredentials.credentialFor": "Credential for {credentialType}",
 	"nodeCredentials.credentialsLabel": "Credential to connect with",
@@ -795,10 +1027,27 @@
 	"nodeCredentials.updateCredential": "Update Credential",
 	"nodeErrorView.cause": "Cause",
 	"nodeErrorView.copyToClipboard": "Copy to Clipboard",
+	"nodeErrorView.copyToClipboard.tooltip": "Copy error details for debugging. Copied data may contain sensitive information. Proceed with caution when sharing.",
 	"nodeErrorView.dataBelowMayContain": "Data below may contain sensitive information. Proceed with caution when sharing.",
 	"nodeErrorView.details": "Details",
+	"nodeErrorView.details.from": "From {node}",
+	"nodeErrorView.details.rawMessages": "Full message",
+	"nodeErrorView.details.errorData": "Error data",
+	"nodeErrorView.details.errorExtra": "Error extra",
+	"nodeErrorView.details.request": "Request",
+	"nodeErrorView.details.title": "Error details",
+	"nodeErrorView.details.message": "Error message",
+	"nodeErrorView.details.info": "Other info",
+	"nodeErrorView.details.nodeVersion": "Node version",
+	"nodeErrorView.details.nodeType": "Node type",
+	"nodeErrorView.details.n8nVersion": "n8n version",
+	"nodeErrorView.details.errorCause": "Error cause",
+	"nodeErrorView.details.causeDetailed": "Cause detailed",
+	"nodeErrorView.details.stackTrace": "Stack trace",
 	"nodeErrorView.error": "ERROR",
+	"nodeErrorView.errorSubNode": "Error in sub-node ‘{node}’",
 	"nodeErrorView.httpCode": "HTTP Code",
+	"nodeErrorView.errorCode": "Error code",
 	"nodeErrorView.inParameter": "In or underneath Parameter",
 	"nodeErrorView.itemIndex": "Item Index",
 	"nodeErrorView.runIndex": "Run Index",
@@ -807,12 +1056,29 @@
 	"nodeErrorView.theErrorCauseIsTooLargeToBeDisplayed": "The error cause is too large to be displayed",
 	"nodeErrorView.time": "Time",
 	"nodeErrorView.inputPanel.previousNodeError.title": "Error running node '{nodeName}'",
+	"nodeErrorView.description.pairedItemInvalidInfo": "An expression here won't work because it uses <code>.item</code> and n8n can't figure out the <a href=”https://docs.n8n.io/data/data-mapping/data-item-linking/item-linking-errors/”>matching item</a>. This is because the node <strong>'{nodeCause}'</strong> returned incorrect matching information (for item {itemIndex} of run {runIndex}).  <br/><br/>Try using <code>.first()</code>, <code>.last()</code> or <code>.all()[index]</code> instead of <code>.item</code>.",
+	"nodeErrorView.description.pairedItemNoInfo": "An expression here won't work because it uses <code>.item</code> and n8n can't figure out the <a href=”https://docs.n8n.io/data/data-mapping/data-item-linking/item-linking-errors/”>matching item</a>. The node <strong>'{nodeCause}'</strong> didn't return enough information.",
+	"nodeErrorView.description.pairedItemNoInfoCodeNode": "An expression here won't work because it uses <code>.item</code> and n8n can't figure out the <a href=\"https://docs.n8n.io/data/data-mapping/data-item-linking/item-linking-errors/\">matching item</a>. You can either: <ul><li>Add the <a href=\"https://docs.n8n.io/data/data-mapping/data-item-linking/item-linking-code-node/\">missing information</a> to the node <strong>'{nodeCause}'</strong></li><li>Or use <code>.first()</code>, <code>.last()</code> or <code>.all()[index]</code> instead of <code>.item</code></li></ul>",
+	"nodeErrorView.description.pairedItemNoConnection": "There is no connection back to the node <strong>'{nodeCause}'</strong>, but it's used in an expression here.<br/><br/>Please wire up the node (there can be other nodes in between).",
+	"nodeErrorView.description.pairedItemNoConnectionCodeNode": "There is no connection back to the node <strong>'{nodeCause}'</strong>, but it's used in code here.<br/><br/>Please wire up the node (there can be other nodes in between).",
+	"nodeErrorView.description.noNodeExecutionData": "An expression references the node <strong>'{nodeCause}'</strong>, but it hasn't been executed yet. Either change the expression, or re-wire your workflow to make sure that node executes first.",
+	"nodeErrorView.description.nodeNotFound": "The node <strong>'{nodeCause}'</strong> doesn't exist, but it's used in an expression here.",
+	"nodeErrorView.description.noInputConnection": "This node has no input data. Please make sure this node is connected to another node.",
+	"nodeErrorView.description.pairedItemMultipleMatches": "An expression here won't work because it uses <code>.item</code> and n8n can't figure out the <a href=”https://docs.n8n.io/data/data-mapping/data-item-linking/item-linking-errors/”>matching item</a>. (There are multiple possible matches) <br/><br/>Try using <code>.first()</code>, <code>.last()</code> or <code>.all()[index]</code> instead of <code>.item</code> or <a href=”https://docs.n8n.io/data/data-mapping/data-item-linking/item-linking-code-node/”>reference a different node</a>.",
+	"nodeErrorView.description.pairedItemMultipleMatchesCodeNode": "The code here won't work because it uses <code>.item</code> and n8n can't figure out the <a href=”https://docs.n8n.io/data/data-mapping/data-item-linking/item-linking-errors/”>matching item</a>. (There are multiple possible matches) <br/><br/>Try using <code>.first()</code>, <code>.last()</code> or <code>.all()[index]</code> instead of <code>.item</code> or <a href=”https://docs.n8n.io/data/data-mapping/data-item-linking/item-linking-code-node/”>reference a different node</a>.",
+	"nodeErrorView.description.pairedItemPinned": "The <a href=”https://docs.n8n.io/data/data-mapping/data-item-linking/item-linking-errors/”>item-matching</a> data in that node may be stale. It is needed by an expression in this node that uses <code>.item</code>.",
 	"nodeHelpers.credentialsUnset": "Credentials for '{credentialType}' are not set.",
 	"nodeSettings.alwaysOutputData.description": "If active, will output a single, empty item when the output would have been empty. Use to prevent the workflow finishing on this node.",
 	"nodeSettings.alwaysOutputData.displayName": "Always Output Data",
 	"nodeSettings.clickOnTheQuestionMarkIcon": "Click the '?' icon to open this node on n8n.io",
-	"nodeSettings.continueOnFail.description": "If active, the workflow continues even if this node's execution fails. When this occurs, the node passes along input data from previous nodes - so your workflow should account for unexpected output data.",
-	"nodeSettings.continueOnFail.displayName": "Continue On Fail",
+	"nodeSettings.onError.description": "Action to take when the node execution fails",
+	"nodeSettings.onError.displayName": "On Error",
+	"nodeSettings.onError.options.continueRegularOutput.description": "Pass error message as item in regular output",
+	"nodeSettings.onError.options.continueRegularOutput.displayName": "Continue",
+	"nodeSettings.onError.options.continueErrorOutput.description": "Pass item to an extra `error` output",
+	"nodeSettings.onError.options.continueErrorOutput.displayName": "Continue (using error output)",
+	"nodeSettings.onError.options.stopWorkflow.description": "Halt execution and fail workflow",
+	"nodeSettings.onError.options.stopWorkflow.displayName": "Stop Workflow",
 	"nodeSettings.docs": "Docs",
 	"nodeSettings.executeOnce.description": "If active, the node executes only once, with data from the first item it receives",
 	"nodeSettings.executeOnce.displayName": "Execute Once",
@@ -841,20 +1107,31 @@
 	"nodeSettings.waitBetweenTries.description": "How long to wait between each attempt (in milliseconds)",
 	"nodeSettings.waitBetweenTries.displayName": "Wait Between Tries (ms)",
 	"nodeSettings.hasForeignCredential": "To edit this node, either:<br/>a) Ask {owner} to share the credential with you, or<br/>b) Duplicate the node and add your own credential",
+	"nodeSettings.latest": "Latest",
+	"nodeSettings.deprecated": "Deprecated",
+	"nodeSettings.latestVersion": "Latest version: {version}",
+	"nodeSettings.outputCleared.title": "Parameters changed",
+	"nodeSettings.outputCleared.message": "Order of parameters changed, outgoing connections were cleared",
+	"nodeSettings.nodeVersion": "{node} node version {version}",
 	"nodeView.addNode": "Add node",
+	"nodeView.openNodesPanel": "Open nodes panel",
 	"nodeView.addATriggerNodeFirst": "Add a <a data-action='showNodeCreator'>Trigger Node</a> first",
 	"nodeView.addOrEnableTriggerNode": "<a data-action='showNodeCreator'>Add</a> or enable a Trigger node to execute the workflow",
 	"nodeView.addSticky": "Click to add sticky note",
+	"nodeView.addStickyHint": "Add sticky note",
 	"nodeView.cantExecuteNoTrigger": "Cannot execute workflow",
 	"nodeView.canvasAddButton.addATriggerNodeBeforeExecuting": "Add a Trigger Node before executing the workflow",
 	"nodeView.canvasAddButton.addFirstStep": "Add first step…",
-	"nodeView.confirmMessage.receivedCopyPasteData.cancelButtonText": "",
-	"nodeView.confirmMessage.receivedCopyPasteData.confirmButtonText": "Yes, import",
-	"nodeView.confirmMessage.receivedCopyPasteData.headline": "Import Workflow?",
-	"nodeView.confirmMessage.receivedCopyPasteData.message": "Workflow will be imported from<br /><i>{plainTextData}<i>",
+	"nodeView.confirmMessage.onClipboardPasteEvent.cancelButtonText": "",
+	"nodeView.confirmMessage.onClipboardPasteEvent.confirmButtonText": "Yes, import",
+	"nodeView.confirmMessage.onClipboardPasteEvent.headline": "Import Workflow?",
+	"nodeView.confirmMessage.onClipboardPasteEvent.message": "Workflow will be imported from<br /><i>{plainTextData}<i>",
+	"nodeView.confirmMessage.debug.cancelButtonText": "Cancel",
+	"nodeView.confirmMessage.debug.confirmButtonText": "Unpin",
+	"nodeView.confirmMessage.debug.headline": "Unpin workflow data",
+	"nodeView.confirmMessage.debug.message": "Loading this execution will unpin the data currently pinned in these nodes",
 	"nodeView.couldntImportWorkflow": "Could not import workflow",
 	"nodeView.deletesTheCurrentExecutionData": "Deletes the current execution data",
-	"nodeView.executesTheWorkflowFromATriggerNode": "Runs the workflow, starting from a Trigger node",
 	"nodeView.itLooksLikeYouHaveBeenEditingSomething": "It looks like you made some edits. If you leave before saving, your changes will be lost.",
 	"nodeView.loadingTemplate": "Loading template",
 	"nodeView.moreInfo": "More info",
@@ -867,9 +1144,10 @@
 	"nodeView.redirecting": "Redirecting",
 	"nodeView.refresh": "Refresh",
 	"nodeView.resetZoom": "Reset Zoom",
-	"nodeView.runButtonText.executeWorkflow": "Execute Workflow",
-	"nodeView.runButtonText.executingWorkflow": "Executing Workflow",
-	"nodeView.runButtonText.waitingForTriggerEvent": "Waiting for Trigger Event",
+	"nodeView.runButtonText.executeWorkflow": "Test workflow",
+	"nodeView.runButtonText.executingWorkflow": "Executing workflow",
+	"nodeView.runButtonText.waitingForTriggerEvent": "Waiting for trigger event",
+	"nodeView.showError.workflowError": "Workflow execution finished with an error",
 	"nodeView.showError.getWorkflowDataFromUrl.title": "Problem loading workflow",
 	"nodeView.showError.importWorkflowData.title": "Problem importing workflow",
 	"nodeView.showError.mounted1.message": "There was a problem loading init data",
@@ -880,6 +1158,8 @@
 	"nodeView.showError.openWorkflow.title": "Problem opening workflow",
 	"nodeView.showError.stopExecution.title": "Problem stopping execution",
 	"nodeView.showError.stopWaitingForWebhook.title": "Problem deleting test webhook",
+	"nodeView.showError.nodeNodeCompatible.title": "Connection not possible",
+	"nodeView.showError.nodeNodeCompatible.message": "The node \"{sourceNodeName}\" can't be connected to the node \"{targetNodeName}\" because they are not compatible.",
 	"nodeView.showMessage.addNodeButton.message": "'{nodeTypeName}' is an unknown node type",
 	"nodeView.showMessage.addNodeButton.title": "Could not insert node",
 	"nodeView.showMessage.keyDown.title": "Workflow created",
@@ -890,6 +1170,10 @@
 	"nodeView.showMessage.stopExecutionCatch.message": "It completed before it could be stopped",
 	"nodeView.showMessage.stopExecutionCatch.title": "Workflow finished executing",
 	"nodeView.showMessage.stopExecutionTry.title": "Execution stopped",
+	"nodeView.showMessage.debug.title": "Execution data imported",
+	"nodeView.showMessage.debug.content": "You can make edits and re-execute. Once you're done, unpin the the first node.",
+	"nodeView.showMessage.debug.missingNodes.title": "Some execution data wasn't imported",
+	"nodeView.showMessage.debug.missingNodes.content": "Some nodes have been deleted or renamed or added to the workflow since the execution ran.",
 	"nodeView.stopCurrentExecution": "Stop current execution",
 	"nodeView.stopWaitingForWebhookCall": "Stop waiting for webhook call",
 	"nodeView.stoppingCurrentExecution": "Stopping current execution",
@@ -901,14 +1185,46 @@
 	"nodeView.zoomIn": "Zoom In",
 	"nodeView.zoomOut": "Zoom Out",
 	"nodeView.zoomToFit": "Zoom to Fit",
+	"nodeView.replaceMe": "Replace Me",
+	"nodeView.setupTemplate": "Set up template",
+	"contextMenu.node": "node | nodes",
+	"contextMenu.sticky": "sticky note | sticky notes",
+	"contextMenu.selectAll": "Select all",
+	"contextMenu.deselectAll": "Clear selection",
+	"contextMenu.duplicate": "Duplicate | Duplicate {count} {subject}",
+	"contextMenu.open": "Open...",
+	"contextMenu.test": "Test step",
+	"contextMenu.rename": "Rename",
+	"contextMenu.copy": "Copy | Copy {count} {subject}",
+	"contextMenu.deactivate": "Deactivate | Deactivate {count} {subject}",
+	"contextMenu.activate": "Activate | Activate {count} nodes",
+	"contextMenu.pin": "Pin | Pin {count} nodes",
+	"contextMenu.unpin": "Unpin | Unpin {count} nodes",
+	"contextMenu.delete": "Delete | Delete {count} {subject}",
+	"contextMenu.addNode": "Add node",
+	"contextMenu.addSticky": "Add sticky note",
+	"contextMenu.editSticky": "Edit sticky note",
+	"contextMenu.changeColor": "Change color",
 	"nodeWebhooks.clickToCopyWebhookUrls": "Click to copy webhook URLs",
+	"nodeWebhooks.clickToCopyWebhookUrls.formTrigger": "Click to copy Form URL",
+	"nodeWebhooks.clickToCopyWebhookUrls.chatTrigger": "Click to copy Chat URL",
 	"nodeWebhooks.clickToDisplayWebhookUrls": "Click to display webhook URLs",
+	"nodeWebhooks.clickToDisplayWebhookUrls.formTrigger": "Click to display Form URL",
+	"nodeWebhooks.clickToDisplayWebhookUrls.chatTrigger": "Click to display Chat URL",
 	"nodeWebhooks.clickToHideWebhookUrls": "Click to hide webhook URLs",
+	"nodeWebhooks.clickToHideWebhookUrls.formTrigger": "Click to hide Form URL",
+	"nodeWebhooks.clickToHideWebhookUrls.chatTrigger": "Click to hide Chat URL",
 	"nodeWebhooks.invalidExpression": "[INVALID EXPRESSION]",
 	"nodeWebhooks.productionUrl": "Production URL",
 	"nodeWebhooks.showMessage.title": "URL copied",
+	"nodeWebhooks.showMessage.title.formTrigger": "Form URL copied",
+	"nodeWebhooks.showMessage.title.chatTrigger": "Chat URL copied",
+	"nodeWebhooks.showMessage.message.formTrigger": "Form submissions made via this URL will trigger the workflow when it's activated",
+	"nodeWebhooks.showMessage.message.chatTrigger": "Chat submissions made via this URL will trigger the workflow when it's activated",
 	"nodeWebhooks.testUrl": "Test URL",
 	"nodeWebhooks.webhookUrls": "Webhook URLs",
+	"nodeWebhooks.webhookUrls.formTrigger": "Form URLs",
+	"nodeWebhooks.webhookUrls.chatTrigger": "Chat URL",
 	"onboardingCallSignupModal.title": "Your onboarding session",
 	"onboardingCallSignupModal.description": "Pop in your email and we'll send you some scheduling options",
 	"onboardingCallSignupModal.emailInput.placeholder": "Your work email",
@@ -924,8 +1240,10 @@
 	"openWorkflow.workflowImportError": "Could not import workflow",
 	"openWorkflow.workflowNotFoundError": "Could not find workflow",
 	"parameterInput.expressionResult": "e.g. {result}",
-	"parameterInput.anythingInside": "Anything inside",
-	"parameterInput.isJavaScript": "is JavaScript.",
+	"parameterInput.tip": "Tip",
+	"parameterInput.dragTipBeforePill": "Drag an",
+	"parameterInput.inputField": "input field",
+	"parameterInput.dragTipAfterPill": "from the left to use it here.",
 	"parameterInput.learnMore": "Learn more",
 	"parameterInput.resultForItem": "Result for Item",
 	"parameterInput.emptyString": "[empty]",
@@ -933,6 +1251,8 @@
 	"parameterInput.error": "ERROR",
 	"parameterInput.expression": "Expression",
 	"parameterInput.fixed": "Fixed",
+	"parameterInput.test.error": "Error",
+	"parameterInput.test.output": "Output",
 	"parameterInput.formatHtml": "Format HTML",
 	"parameterInput.issues": "Issues",
 	"parameterInput.loadingOptions": "Loading options...",
@@ -952,6 +1272,8 @@
 	"parameterInputList.delete": "Delete",
 	"parameterInputList.deleteParameter": "Delete Parameter",
 	"parameterInputList.parameterOptions": "Parameter Options",
+	"parameterInputList.loadingFields": "Loading fields...",
+	"parameterInputList.loadingError": "Error loading fields. Refresh you page and try again.",
 	"personalizationModal.businessOwner": "Business Owner",
 	"personalizationModal.continue": "Continue",
 	"personalizationModal.cicd": "CI/CD",
@@ -1033,6 +1355,13 @@
 	"personalizationModal.buildBackendServices": "Build backend services (endpoints)",
 	"personalizationModal.manipulateFiles": "Manipulate/transfer files",
 	"personalizationModal.specifyOtherSalesAndMarketingGoal": "Specify your other Sales and Marketing goals",
+	"personalizationModal.registerEmailForTrial": "Register your email to activate a free 14 day trial of our {trial}",
+	"personalizationModal.registerEmailForTrial.enterprise": "Enterprise features",
+	"personalizationModal.registerEmailForTrial.notice": "By checking this box, you agree to let us store your name and email to activate your trial and send over your license key. We’ll check-in at the end of the trial to ensure you’re getting the most out of our Enterprise features.",
+	"personalizationModal.registerEmailForTrial.success.title": "Your enterprise license is on its way",
+	"personalizationModal.registerEmailForTrial.success.message": "You'll shortly receive an email to activate your enterprise license. If you don't see it, check your spam folder.",
+	"personalizationModal.registerEmailForTrial.success.button": "Start using n8n",
+	"personalizationModal.registerEmailForTrial.error": "Error while registering for enterprise trial",
 	"pushConnection.nodeExecutedSuccessfully": "Node executed successfully",
 	"pushConnection.workflowExecutedSuccessfully": "Workflow executed successfully",
 	"pushConnectionTracker.cannotConnectToServer": "You have a connection issue or the server is down. <br />n8n should reconnect automatically once the issue is resolved.",
@@ -1042,6 +1371,9 @@
 	"pushConnection.pollingNode.dataNotFound.message": "We didn’t find any data in {service} to simulate an event. Please create one in {service} and try again.",
 	"pushConnection.executionFailed": "Execution failed",
 	"pushConnection.executionFailed.message": "There might not be enough memory to finish the execution. Tips for avoiding this <a target=\"_blank\" href=\"https://docs.n8n.io/flow-logic/error-handling/memory-errors/\">here</a>",
+	"pushConnection.executionError": "There was a problem executing the workflow{error}",
+	"pushConnection.executionError.openNode": " <a data-action='openNodeDetail' data-action-parameter-node='{node}'>Open node</a>",
+	"pushConnection.executionError.details": "<br /><strong>{details}</strong>",
 	"resourceLocator.id.placeholder": "Enter ID...",
 	"resourceLocator.mode.id": "By ID",
 	"resourceLocator.mode.url": "By URL",
@@ -1049,7 +1381,8 @@
 	"resourceLocator.mode.list.disabled.title": "Change to Fixed mode to choose From List",
 	"resourceLocator.mode.list.error.title": "Could not load list",
 	"resourceLocator.mode.list.error.description.part1": "Please",
-	"resourceLocator.mode.list.error.description.part2": "check your credential",
+	"resourceLocator.mode.list.error.description.part2.hasCredentials": "check your credential",
+	"resourceLocator.mode.list.error.description.part2.noCredentials": "add your credential",
 	"resourceLocator.mode.list.noResults": "No results",
 	"resourceLocator.mode.list.openUrl": "Open URL",
 	"resourceLocator.mode.list.placeholder": "Choose...",
@@ -1059,6 +1392,31 @@
 	"resourceLocator.openResource": "Open in {appName}",
 	"resourceLocator.search.placeholder": "Search...",
 	"resourceLocator.url.placeholder": "Enter URL...",
+	"resourceMapper.autoMappingNotice": "In this mode, make sure the incoming data fields are named the same as the {fieldWord} in {serviceName}. (Use an 'Edit Fields' node before this node to change them if required.)",
+	"resourceMapper.mappingMode.label": "Mapping Column Mode",
+	"resourceMapper.mappingMode.defineBelow.name": "Map Each Column Manually",
+	"resourceMapper.mappingMode.defineBelow.description": "Set the value for each {fieldWord}",
+	"resourceMapper.mappingMode.autoMapInputData.name": "Map Automatically",
+	"resourceMapper.mappingMode.autoMapInputData.description": "Look for incoming data that matches the {fieldWord} in {serviceName}",
+	"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.multi.description": "The {fieldWord} that identify the row(s) to modify",
+	"resourceMapper.columnsToMatchOn.single.description": "The {fieldWord} that identifies the row(s) to modify",
+	"resourceMapper.columnsToMatchOn.tooltip": "The {fieldWord} to compare when finding the rows to update",
+	"resourceMapper.columnsToMatchOn.noFieldsFound": "No {fieldWord} that can be used for matching found in {serviceName}.",
+	"resourceMapper.valuesToSend.label": "Values to Send",
+	"resourceMapper.valuesToUpdate.label": "Values to Update",
+	"resourceMapper.usingToMatch": "(using to match)",
+	"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.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",
 	"runData.emptyItemHint": "This is an item, but it's empty.",
 	"runData.emptyArray": "[empty array]",
 	"runData.emptyString": "[empty]",
@@ -1083,8 +1441,10 @@
 	"runData.editOutputInvalid.onLine": "On line {line}:",
 	"runData.editOutputInvalid.atPosition": "(at position {position})",
 	"runData.editValue": "Edit Value",
+	"runData.executionStatus.success": "Executed successfully",
+	"runData.executionStatus.failed": "Execution failed",
 	"runData.downloadBinaryData": "Download",
-	"runData.executeNode": "Execute Node",
+	"runData.executeNode": "Test Node",
 	"runData.executionTime": "Execution Time",
 	"runData.fileExtension": "File Extension",
 	"runData.fileName": "File Name",
@@ -1109,8 +1469,13 @@
 	"runData.editor.save": "Save",
 	"runData.editor.cancel": "Cancel",
 	"runData.editor.copyDataInfo": "You can copy data from previous executions and paste it above.",
+	"runData.aiContentBlock.startedAt": "Started at {startTime}",
+	"runData.aiContentBlock.tokens": "{count} Tokens",
+	"runData.aiContentBlock.tokens.prompt": "Prompt:",
+	"runData.aiContentBlock.tokens.completion": "Completion:",
 	"saveButton.save": "@:_reusableBaseText.save",
 	"saveButton.saved": "Saved",
+	"saveWorkflowButton.hint": "Save workflow",
 	"saveButton.saving": "Saving",
 	"settings": "Settings",
 	"settings.communityNodes": "Community nodes",
@@ -1130,10 +1495,24 @@
 	"settings.communityNodes.fetchError.title": "Problem fetching installed packages",
 	"settings.communityNodes.fetchError.message": "There may be a problem with your internet connection or your n8n instance",
 	"settings.communityNodes.installModal.title": "Install community nodes",
+	"testSuites.addTestSuite.title": "Add Test",
+	"testSuites.editTestSuite.title": "Edit {name} Test Output",
 	"settings.communityNodes.installModal.description": "Find community nodes to add on the npm public registry.",
 	"settings.communityNodes.browseButton.label": "Browse",
 	"settings.communityNodes.installModal.packageName.label": "npm Package Name",
-	"settings.communityNodes.installModal.packageName.tooltip": "<img src='/static/community_package_tooltip_img.png'/><p>This is the title of the package on <a href='{npmURL}'>npmjs.com</a></p><p>Install a specific version by adding it after @, e.g. <code>package-name@0.15.0</code></p>",
+	"testSuites.addTest.description.label": "Description",
+	"testSuites.addTest.saveButton.label.loading": "Saving",
+	"testSuites.editTest.error.label": "Error",
+	"testSuites.editTest.output.label": "Output",
+	"testSuites.editTest.saveButton.label.loading": "Saving",
+	"testSuites.addTest.saveButton.label": "Save",
+	"testSuites.editTest.saveButton.label": "Save",
+	"testSuites.addTest.saveButton.success": "Test Added",
+	"testSuites.editTest.saveButton.success": "Output Updated",
+	"testSuites.addTest.saveButton.error": "Error adding new test",
+	"testSuites.editTest.saveButton.error": "Error updating test",
+	"testSuites.addTest.description.tooltip": "Briefly describe this test and provide information of what it does.",
+	"settings.communityNodes.installModal.packageName.tooltip": "<img src='/static/community_package_tooltip_img.png'/><p>This is the title of the package on <a href='{npmURL}'>npmjs.com</a></p><p>Install a specific version by adding it after {'@'}, e.g. <code>package-name{'@'}0.15.0</code></p>",
 	"settings.communityNodes.installModal.packageName.placeholder": "e.g. n8n-nodes-chatwork",
 	"settings.communityNodes.installModal.checkbox.label": "I understand the risks of installing unverified code from a public source.",
 	"settings.communityNodes.installModal.installButton.label": "Install",
@@ -1174,6 +1553,9 @@
 	"settings.users.actions.delete": "Delete User",
 	"settings.users.actions.reinvite": "Resend Invite",
 	"settings.users.actions.copyInviteLink": "Copy Invite Link",
+	"settings.users.actions.copyPasswordResetLink": "Copy Password Reset Link",
+	"settings.users.actions.allowSSOManualLogin": "Allow Manual Login",
+	"settings.users.actions.disallowSSOManualLogin": "Disallow Manual Login",
 	"settings.users.deleteWorkflowsAndCredentials": "Delete their workflows and credentials",
 	"settings.users.emailInvitesSent": "An invite email was sent to {emails}",
 	"settings.users.emailInvitesSentError": "Could not invite {emails}",
@@ -1192,6 +1574,12 @@
 	"settings.users.inviteXUser.inviteUrl": "Create {count} invite links",
 	"settings.users.inviteUrlCreated": "Invite link copied to clipboard",
 	"settings.users.inviteUrlCreated.message": "Send the invite link to your invitee for activation",
+	"settings.users.passwordResetUrlCreated": "Password reset link copied to clipboard",
+	"settings.users.passwordResetUrlCreated.message": "Send the reset link to your user for them to reset their password",
+	"settings.users.allowSSOManualLogin": "Manual Login Allowed",
+	"settings.users.allowSSOManualLogin.message": "User can now login manually and through SSO",
+	"settings.users.disallowSSOManualLogin": "Manual Login Disallowed",
+	"settings.users.disallowSSOManualLogin.message": "User must now login through SSO only",
 	"settings.users.multipleInviteUrlsCreated": "Invite links created",
 	"settings.users.multipleInviteUrlsCreated.message": "Send the invite links to your invitees for activation",
 	"settings.users.newEmailsToInvite": "New User Email Addresses",
@@ -1199,8 +1587,6 @@
 	"settings.users.setupMyAccount": "Set up my owner account",
 	"settings.users.setupToInviteUsers": "To invite users, set up your own account",
 	"settings.users.setupToInviteUsersInfo": "Invited users won’t be able to see workflows and credentials of other users unless you upgrade. <a href=\"https://docs.n8n.io/user-management/\" target=\"_blank\">More info</a> <br /> <br />",
-	"settings.users.setupSMTPInfo": "You will need details of an {link} to complete the setup.",
-	"settings.users.setupSMTPInfo.link": "SMTP server",
 	"settings.users.smtpToAddUsersWarning": "Set up SMTP before adding users (so that n8n can send them invitation emails). <a target=\"_blank\" href=\"https://docs.n8n.io/hosting/authentication/user-management-self-hosted/\">Instructions</a>",
 	"settings.users.transferWorkflowsAndCredentials": "Transfer their workflows and credentials to another user",
 	"settings.users.transferredToUser": "Data transferred to {user}",
@@ -1213,15 +1599,17 @@
 	"settings.users.usersEmailedError": "Couldn't send invite email",
 	"settings.users.usersInvited": "Users invited",
 	"settings.users.usersInvitedError": "Could not invite users",
+	"settings.users.advancedPermissions.warning": "{link} to unlock the ability to create additional admin users",
+	"settings.users.advancedPermissions.warning.link": "Upgrade",
 	"settings.api": "API",
 	"settings.n8napi": "n8n API",
 	"settings.log-streaming": "Log Streaming",
 	"settings.log-streaming.heading": "Log Streaming",
 	"settings.log-streaming.add": "Add new destination",
-	"settings.log-streaming.actionBox.title": "Available on Enterprise plan",
+	"settings.log-streaming.actionBox.title": "Available on the Enterprise plan",
 	"settings.log-streaming.actionBox.description": "Log Streaming is available as a paid feature. Learn more about it.",
 	"settings.log-streaming.actionBox.button": "See plans",
-	"settings.log-streaming.infoText": "Send logs to external endpoints of your choice. You can also write logs to a file or the console using environment variables. <a href=\"https://docs.n8n.io/hosting/logging/\" target=\"_blank\">More info</a>",
+	"settings.log-streaming.infoText": "Send logs to external endpoints of your choice. You can also write logs to a file or the console using environment variables. <a href=\"https://docs.n8n.io/log-streaming/\" target=\"_blank\">More info</a>",
 	"settings.log-streaming.addFirstTitle": "Set up a destination to get started",
 	"settings.log-streaming.addFirst": "Add your first destination by clicking on the button and selecting a destination type.",
 	"settings.log-streaming.saving": "Saving",
@@ -1234,6 +1622,7 @@
 	"settings.log-streaming.tab.events.title": "Select groups or single events to subscribe to:",
 	"settings.log-streaming.tab.events.anonymize": "Anonymize sensitive data",
 	"settings.log-streaming.tab.events.anonymize.info": "Fields containing personal information like name or email are anonymized",
+	"settings.log-streaming.eventGroup.n8n.ai": "AI node logs",
 	"settings.log-streaming.eventGroup.n8n.audit": "Audit Events",
 	"settings.log-streaming.eventGroup.n8n.audit.info": "Will send events when user details or other audit data changes",
 	"settings.log-streaming.eventGroup.n8n.workflow": "Workflow Events",
@@ -1241,6 +1630,7 @@
 	"settings.log-streaming.eventGroup.n8n.user": "User",
 	"settings.log-streaming.eventGroup.n8n.node": "Node Executions",
 	"settings.log-streaming.eventGroup.n8n.node.info": "Will send step-wise execution events every time a node executes. Please note that this can lead to a high frequency of logged events and is probably not suitable for general use.",
+	"settings.log-streaming.eventGroup.n8n.worker": "Worker",
 	"settings.log-streaming.$$AbstractMessageEventBusDestination": "Generic",
 	"settings.log-streaming.$$MessageEventBusDestinationWebhook": "Webhook",
 	"settings.log-streaming.$$MessageEventBusDestinationSentry": "Sentry",
@@ -1252,6 +1642,9 @@
 	"settings.log-streaming.destinationDelete.message": "Are you sure that you want to delete '{destinationName}'?",
 	"settings.log-streaming.addDestination": "Add new destination",
 	"settings.log-streaming.destinations": "Log destinations",
+	"settings.api.trial.upgradePlan.title": "Upgrade to use API",
+	"settings.api.trial.upgradePlan.description": "To prevent abuse, we limit API access to your workspace during your trial. If this is hindering your evaluation of n8n, please contact <a href=\"mailto:support{'@'}n8n.io\">support{'@'}n8n.io</a>",
+	"settings.api.trial.upgradePlan.cta": "Upgrade plan",
 	"settings.api.create.description": "Control n8n programmatically using the <a href=\"https://docs.n8n.io/api\" target=\"_blank\">n8n API</a>",
 	"settings.api.create.button": "Create an API Key",
 	"settings.api.create.button.loading": "Creating API Key...",
@@ -1293,10 +1686,137 @@
 	"settings.usageAndPlan.license.activation.success.message": "Your {name} {type} has been successfully activated.",
 	"settings.usageAndPlan.desktop.title": "Upgrade to n8n Cloud for the full experience",
 	"settings.usageAndPlan.desktop.description": "Cloud plans allow you to collaborate with teammates. Plus you don’t need to leave this app open all the time for your workflows to run.",
-	"settings.versionControl.title": "Version Control",
-	"settings.versionControl.actionBox.title": "Available on Enterprise plan",
-	"settings.versionControl.actionBox.description": "Use Version Control to connect your instance to an external Git repository to backup and track changes made to your workflows, variables, and credentials. With Version Control you can also sync instances across multiple environments (development, production...).",
-	"settings.versionControl.actionBox.buttonText": "See plans",
+	"settings.externalSecrets.title": "External Secrets",
+	"settings.externalSecrets.info": "Connect external secrets tools for centralized credentials management across environments, and to enhance system security.",
+	"settings.externalSecrets.info.link": "More info",
+	"settings.externalSecrets.actionBox.title": "Available on the Enterprise plan",
+	"settings.externalSecrets.actionBox.description": "Connect external secrets tools for centralized credentials management across instances. {link}",
+	"settings.externalSecrets.actionBox.description.link": "More info",
+	"settings.externalSecrets.actionBox.buttonText": "See plans",
+	"settings.externalSecrets.card.setUp": "Set Up",
+	"settings.externalSecrets.card.secretsCount": "{count} secrets",
+	"settings.externalSecrets.card.connectedAt": "Connected {date}",
+	"settings.externalSecrets.card.connected": "Enabled",
+	"settings.externalSecrets.card.disconnected": "Disabled",
+	"settings.externalSecrets.card.actionDropdown.setup": "Edit connection",
+	"settings.externalSecrets.card.actionDropdown.reload": "Reload secrets",
+	"settings.externalSecrets.card.reload.success.title": "Reloaded successfully",
+	"settings.externalSecrets.card.reload.success.description": "All secrets have been reloaded from {provider}.",
+	"settings.externalSecrets.provider.title": "Commit and push changes",
+	"settings.externalSecrets.provider.description": "Select the files you want to stage in your commit and add a commit message. ",
+	"settings.externalSecrets.provider.buttons.cancel": "Cancel",
+	"settings.externalSecrets.provider.buttons.save": "Save",
+	"settings.externalSecrets.provider.buttons.saving": "Saving",
+	"settings.externalSecrets.card.connectedSwitch.title": "Enable {provider}",
+	"settings.externalSecrets.provider.save.success.title": "Provider settings saved successfully",
+	"settings.externalSecrets.provider.connected.success.title": "Provider connected successfully",
+	"settings.externalSecrets.provider.disconnected.success.title": "Provider disconnected successfully",
+	"settings.externalSecrets.provider.testConnection.success.connected": "Service enabled, {count} secrets available on {provider}.",
+	"settings.externalSecrets.provider.testConnection.success.connected.usage": "Use secrets in credentials by setting a parameter to an expression and typing: {code}. ",
+	"settings.externalSecrets.provider.testConnection.success.connected.docs": "More info",
+	"settings.externalSecrets.provider.testConnection.success": "Connection to {provider} executed successfully. Enable the service to use the secrets in credentials.",
+	"settings.externalSecrets.provider.testConnection.error.connected": "Connection unsuccessful, please check your {provider} settings",
+	"settings.externalSecrets.provider.testConnection.error": "Connection unsuccessful, please check your {provider} settings",
+	"settings.externalSecrets.provider.closeWithoutSaving.title": "Close without saving?",
+	"settings.externalSecrets.provider.closeWithoutSaving.description": "Are you sure you want to throw away the changes you made to the {provider} settings?",
+	"settings.externalSecrets.provider.closeWithoutSaving.cancel": "Close",
+	"settings.externalSecrets.provider.closeWithoutSaving.confirm": "Keep editing",
+	"settings.externalSecrets.docs": "https://docs.n8n.io/external-secrets/",
+	"settings.externalSecrets.docs.use": "https://docs.n8n.io/external-secrets/#use-secrets-in-n8n-credentials",
+	"settings.sourceControl.title": "Environments",
+	"settings.sourceControl.actionBox.title": "Available on the Enterprise plan",
+	"settings.sourceControl.actionBox.description": "Use multiple instances for different environments (dev, prod, etc.), deploying between them via a Git repository.",
+	"settings.sourceControl.actionBox.description.link": "More info",
+	"settings.sourceControl.actionBox.buttonText": "See plans",
+	"settings.sourceControl.description": "Use multiple instances for different environments (dev, prod, etc.), deploying between them via a Git repository. {link}",
+	"settings.sourceControl.description.link": "More info",
+	"settings.sourceControl.gitConfig": "Git configuration",
+	"settings.sourceControl.repoUrl": "Git repository URL (SSH)",
+	"settings.sourceControl.repoUrlPlaceholder": "e.g. git{'@'}github.com:my-team/my-repository",
+	"settings.sourceControl.repoUrlInvalid": "The Git repository URL is not valid",
+	"settings.sourceControl.authorName": "Commit author  name",
+	"settings.sourceControl.authorEmail": "Commit author  email",
+	"settings.sourceControl.authorEmailInvalid": "The provided email is not correct",
+	"settings.sourceControl.sshKey": "SSH Key",
+	"settings.sourceControl.sshKeyDescription": "Paste the SSH key in your git repository/account settings. {link}",
+	"settings.sourceControl.sshKeyDescriptionLink": "More info",
+	"settings.sourceControl.refreshSshKey": "Refresh Key",
+	"settings.sourceControl.refreshSshKey.successful.title": "SSH Key refreshed successfully",
+	"settings.sourceControl.refreshSshKey.error.title": "SSH Key refresh failed",
+	"settings.sourceControl.button.continue": "Continue",
+	"settings.sourceControl.button.connect": "Connect",
+	"settings.sourceControl.button.disconnect": "Disconnect Git",
+	"settings.sourceControl.button.save": "Save settings",
+	"settings.sourceControl.instanceSettings": "Instance settings",
+	"settings.sourceControl.branches": "Branch connected to this n8n instance",
+	"settings.sourceControl.protected": "{bold}: prevent editing workflows (recommended for production environments).",
+	"settings.sourceControl.protected.bold": "Protected instance",
+	"settings.sourceControl.color": "Color",
+	"settings.sourceControl.switchBranch.title": "Switch to {branch} branch",
+	"settings.sourceControl.switchBranch.description": "Please confirm you want to switch the current n8n instance to the branch: {branch}",
+	"settings.sourceControl.sync.prompt.title": "Sync changes in {branch} branch",
+	"settings.sourceControl.sync.prompt.description": "All the changes on your n8n instances will be synced with branch {branch} on the remote git repository. The following git sequence will be executed: pull > commit > push.",
+	"settings.sourceControl.sync.prompt.placeholder": "Commit message",
+	"settings.sourceControl.sync.prompt.error": "Please enter a commit message",
+	"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.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.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.status.modified": "Modified",
+	"settings.sourceControl.status.deleted": "Deleted",
+	"settings.sourceControl.status.created": "New",
+	"settings.sourceControl.pull.oneLastStep.title": "One last step",
+	"settings.sourceControl.pull.oneLastStep.description": "You have new creds/vars. Fill them out to make sure your workflows function properly",
+	"settings.sourceControl.pull.success.title": "Pulled successfully",
+	"settings.sourceControl.pull.upToDate.title": "Up to date",
+	"settings.sourceControl.pull.upToDate.description": "No workflow changes to pull from Git",
+	"settings.sourceControl.modals.pull.title": "Pull changes",
+	"settings.sourceControl.modals.pull.description": "These workflows will be updated, and any local changes to them will be overridden. To keep the local version, push it before pulling.",
+	"settings.sourceControl.modals.pull.description.learnMore": "More info",
+	"settings.sourceControl.modals.pull.buttons.cancel": "@:_reusableBaseText.cancel",
+	"settings.sourceControl.modals.pull.buttons.save": "Pull and override",
+	"settings.sourceControl.modals.disconnect.title": "Disconnect Git repository",
+	"settings.sourceControl.modals.disconnect.message": "Please confirm you want to disconnect this n8n instance from the Git repository",
+	"settings.sourceControl.modals.disconnect.confirm": "Disconnect Git",
+	"settings.sourceControl.modals.disconnect.cancel": "@:_reusableBaseText.cancel",
+	"settings.sourceControl.modals.refreshSshKey.title": "Refresh SSH Key",
+	"settings.sourceControl.modals.refreshSshKey.message": "This will delete the current SSH key and create a new one. You will not be able to authenticate with the current key anymore.",
+	"settings.sourceControl.modals.refreshSshKey.cancel": "Cancel",
+	"settings.sourceControl.modals.refreshSshKey.confirm": "Refresh key",
+	"settings.sourceControl.loading.connecting": "Connecting",
+	"settings.sourceControl.toast.connected.title": "Git repository connected",
+	"settings.sourceControl.toast.connected.message": "Select the branch to complete the configuration",
+	"settings.sourceControl.toast.connected.error": "Error connecting to Git",
+	"settings.sourceControl.toast.disconnected.title": "Git repository disconnected",
+	"settings.sourceControl.toast.disconnected.message": "You can no longer sync your instance with the remote repository",
+	"settings.sourceControl.toast.disconnected.error": "Error disconnecting from Git",
+	"settings.sourceControl.loading.pull": "Pulling from remote",
+	"settings.sourceControl.loading.checkingForChanges": "Checking for changes",
+	"settings.sourceControl.loading.push": "Pushing to remote",
+	"settings.sourceControl.lastUpdated": "Last updated {date} at {time}",
+	"settings.sourceControl.saved.title": "Settings successfully saved",
+	"settings.sourceControl.refreshBranches.tooltip": "Reload branches list",
+	"settings.sourceControl.refreshBranches.success": "Branches successfully refreshed",
+	"settings.sourceControl.refreshBranches.error": "Error refreshing branches",
+	"settings.sourceControl.docs.url": "https://docs.n8n.io/source-control-environments/",
+	"settings.sourceControl.docs.setup.url": "https://docs.n8n.io/source-control-environments/setup/",
+	"settings.sourceControl.docs.setup.ssh.url": "https://docs.n8n.io/source-control-environments/setup/#step-3-set-up-a-deploy-key",
+	"settings.sourceControl.docs.using.url": "https://docs.n8n.io/source-control-environments/using/",
+	"settings.sourceControl.docs.using.pushPull.url": "https://docs.n8n.io/source-control-environments/using/push-pull",
+	"settings.sourceControl.error.not.connected.title": "Environments have not been enabled",
+	"settings.sourceControl.error.not.connected.message": "Please head over to <a href='/settings/environments'>environment settings</a> to connect a git repository first to activate this functionality.",
 	"showMessage.cancel": "@:_reusableBaseText.cancel",
 	"showMessage.ok": "OK",
 	"showMessage.showDetails": "Show Details",
@@ -1334,6 +1854,7 @@
 	"tagsTableHeader.searchTags": "Search Tags",
 	"tagsView.inUse": "{count} workflow | {count} workflows",
 	"tagsView.notBeingUsed": "Not being used",
+	"onboarding.title": "Demo: {name}",
 	"template.buttons.goBackButton": "Go back",
 	"template.buttons.useThisWorkflowButton": "Use this workflow",
 	"template.details.appsInTheCollection": "This collection features",
@@ -1350,9 +1871,8 @@
 	"templates.collections": "Collections",
 	"templates.collectionsNotFound": "Collection could not be found",
 	"templates.connectionWarning": "⚠️ There was a problem fetching workflow templates. Check your internet connection.",
-	"templates.endResult": "Share your own useful workflows through your <a href='https://n8n.io/dashboard' target='_blank'>n8n.io account</a>",
 	"templates.heading": "Workflow templates",
-	"templates.newButton": "New blank workflow",
+	"templates.shareWorkflow": "Share template",
 	"templates.noSearchResults": "Nothing found. Try adjusting your search to see more.",
 	"templates.searchPlaceholder": "Search workflows",
 	"templates.workflows": "Workflows",
@@ -1390,14 +1910,20 @@
 	"nodeIssues.credentials.doNotExist.hint": "You can create credentials with the exact name and then they get auto-selected on refresh..",
 	"nodeIssues.credentials.notIdentified": "Credentials with name {name} exist for {type}.",
 	"nodeIssues.credentials.notIdentified.hint": "Credentials are not clearly identified. Please select the correct credentials.",
+	"nodeIssues.input.missing": "No node connected to required input \"{inputName}\"",
+	"nodeIssues.input.missingSubNode": "On the canvas, <a data-action='openSelectiveNodeCreator' data-action-parameter-connectiontype='{inputType}' data-action-parameter-node='{node}'>add a ‘{inputName}’</a> connected to the ‘{node}’ node ",
 	"ndv.trigger.moreInfo": "More info",
 	"ndv.trigger.copiedTestUrl": "Test URL copied to clipboard",
 	"ndv.trigger.webhookBasedNode.executionsHelp.inactive": "<b>While building your workflow</b>, click the 'listen' button, then go to {service} and make an event happen. This will trigger an execution, which will show up in this editor.<br /> <br /> <b>Once you're happy with your workflow</b>, <a data-key=\"activate\">activate</a> it. Then every time there's a matching event in {service}, the workflow will execute. These executions will show up in the <a data-key=\"executions\">executions list</a>, but not in the editor.",
 	"ndv.trigger.webhookBasedNode.executionsHelp.active": "<b>While building your workflow</b>, click the 'listen' button, then go to {service} and make an event happen. This will trigger an execution, which will show up in this editor.<br /> <br /> <b>Your workflow will also execute automatically</b>, since it's activated. Every time there’s a matching event in {service}, this node will trigger an execution. These executions will show up in the <a data-key=\"executions\">executions list</a>, but not in the editor. ",
 	"ndv.trigger.webhookNode.listening": "Listening for test event",
+	"ndv.trigger.chatTrigger.openChat": "Open Chat Window",
+	"ndv.trigger.webhookNode.formTrigger.listening": "Listening for a test form submission",
 	"ndv.trigger.webhookBasedNode.listening": "Listening for your trigger event",
 	"ndv.trigger.webhookNode.requestHint": "Make a {type} request to:",
 	"ndv.trigger.webhookBasedNode.serviceHint": "Go to {service} and create an event",
+	"ndv.trigger.webhookBasedNode.chatTrigger.serviceHint": "Send a message in the chat",
+	"ndv.trigger.webhookBasedNode.formTrigger.serviceHint": "Submit the test form that just opened in a new tab",
 	"ndv.trigger.webhookBasedNode.activationHint.inactive": "Once you’ve finished building your workflow, <a data-key=\"activate\">activate it</a> to have it also listen continuously (you just won’t see those executions here).",
 	"ndv.trigger.webhookBasedNode.activationHint.active": "This node will also trigger automatically on new {service} events (but those executions won’t show up here).",
 	"ndv.trigger.pollingNode.activationHint.inactive": "Once you’ve finished building your workflow, <a data-key=\"activate\">activate it</a> to have it also check for events regularly (you just won’t see those executions here).",
@@ -1408,6 +1934,12 @@
 	"ndv.trigger.pollingNode.executionsHelp.inactive": "<b>While building your workflow</b>, click the 'fetch' button to fetch a single mock event. It will show up in this editor.<br /><br /><b>Once you're happy with your workflow</b>, <a data-key=\"activate\">activate</a> it. Then n8n will regularly check {service} for new events, and execute this workflow if it finds any. These executions will show up in the <a data-key=\"executions\">executions list</a>, but not in the editor.",
 	"ndv.trigger.pollingNode.executionsHelp.active": "<b>While building your workflow</b>, click the 'fetch' button to fetch a single mock event. It will show up in this editor.<br /><br /><b>Your workflow will also execute automatically</b>, since it's activated. n8n will regularly check {app_name} for new events, and execute this workflow if it finds any. These executions will show up in the <a data-key=\"executions\">executions list</a>, but not in the editor.",
 	"ndv.trigger.webhookBasedNode.action": "Pull in events from {name}",
+	"ndv.search.placeholder.output": "Filter output",
+	"ndv.search.placeholder.input": "Filter input",
+	"ndv.search.noMatch.title": "No matching items",
+	"ndv.search.noMatch.description": "Try changing or {link} the filter to see more",
+	"ndv.search.noMatch.description.link": "clearing",
+	"ndv.search.items": "{matched} of {total} item | {matched} of {total} items",
 	"updatesPanel.andIs": "and is",
 	"updatesPanel.behindTheLatest": "behind the latest and greatest n8n",
 	"updatesPanel.howToUpdateYourN8nVersion": "How to update your n8n version",
@@ -1476,8 +2008,16 @@
 	"workflowPreview.showError.previewError.title": "Preview error",
 	"workflowRun.noActiveConnectionToTheServer": "Lost connection to the server",
 	"workflowRun.showError.title": "Problem running workflow",
+	"workflowRun.showError.payloadTooLarge": "Please execute the whole workflow, rather than just the node. (Existing execution data is too large.)",
 	"workflowRun.showMessage.message": "Please fix them before executing",
 	"workflowRun.showMessage.title": "Workflow has issues",
+	"testSuites.workflows.tests.heading": "{name} tests",
+	"testSuites.workflows.tests.node.heading": "Test ID: {id}",
+	"testSuites.add": "Add test",
+	"testSuites.edit": "Edit Output",
+	"testSuites.workflows.empty.description": "You have no workflow",
+	"testSuites.workflows.tests.empty.description": "You have no tests for this workflow",
+	"settings.testSuites": "Test Suites",
 	"workflowSettings.callerIds": "IDs of workflows that can call this one",
 	"workflowSettings.callerIds.placeholder": "e.g. 14, 18",
 	"workflowSettings.callerPolicy": "This workflow can be called by",
@@ -1490,6 +2030,7 @@
 	"workflowSettings.defaultTimezone": "Default - {defaultTimezoneValue}",
 	"workflowSettings.defaultTimezoneNotValid": "Default Timezone not valid",
 	"workflowSettings.errorWorkflow": "Error Workflow",
+	"workflowSettings.executionOrder": "Execution Order",
 	"workflowSettings.helpTexts.errorWorkflow": "A second workflow to run if the current one fails.<br />The second workflow should an 'Error Trigger' node.",
 	"workflowSettings.helpTexts.executionTimeout": "How long the workflow should wait before timing out",
 	"workflowSettings.helpTexts.executionTimeoutToggle": "Whether to cancel workflow execution after a defined time",
@@ -1514,12 +2055,12 @@
 	"workflowSettings.saveDataSuccessExecutionOptions.save": "@:_reusableBaseText.save",
 	"workflowSettings.saveExecutionProgress": "Save execution progress",
 	"workflowSettings.saveExecutionProgressOptions.defaultSave": "Default - {defaultValue}",
-	"workflowSettings.saveExecutionProgressOptions.no": "No",
-	"workflowSettings.saveExecutionProgressOptions.yes": "Yes",
+	"workflowSettings.saveExecutionProgressOptions.doNotSave": "Do not save",
+	"workflowSettings.saveExecutionProgressOptions.save": "@:_reusableBaseText.save",
 	"workflowSettings.saveManualExecutions": "Save manual executions",
 	"workflowSettings.saveManualOptions.defaultSave": "Default - {defaultValue}",
-	"workflowSettings.saveManualOptions.no": "No",
-	"workflowSettings.saveManualOptions.yes": "Yes",
+	"workflowSettings.saveManualOptions.doNotSave": "Do not save",
+	"workflowSettings.saveManualOptions.save": "@:_reusableBaseText.save",
 	"workflowSettings.seconds": "seconds",
 	"workflowSettings.selectOption": "Select Option",
 	"workflowSettings.settingsFor": "Workflow settings for {workflowName} (#{workflowId})",
@@ -1534,8 +2075,36 @@
 	"workflowSettings.timeoutAfter": "Timeout After",
 	"workflowSettings.timeoutWorkflow": "Timeout Workflow",
 	"workflowSettings.timezone": "Timezone",
+	"workflowHistory.title": "Version History",
+	"workflowHistory.content.title": "Version",
+	"workflowHistory.content.editedBy": "Edited by",
+	"workflowHistory.content.versionId": "Version ID",
+	"workflowHistory.content.actions": "Actions",
+	"workflowHistory.item.id": "ID: {id}",
+	"workflowHistory.item.createdAt": "{date} at {time}",
+	"workflowHistory.item.actions.restore": "Restore this version",
+	"workflowHistory.item.actions.clone": "Clone to new workflow",
+	"workflowHistory.item.actions.open": "Open version in new tab",
+	"workflowHistory.item.actions.download": "Download",
+	"workflowHistory.item.unsaved.title": "Unsaved version",
+	"workflowHistory.item.latest": "Latest saved",
+	"workflowHistory.empty": "No versions yet.",
+	"workflowHistory.hint": "Save the workflow to create the first version!",
+	"workflowHistory.limit": "Version history is limited to {evaluatedPruneTime} days",
+	"workflowHistory.upgrade": "{link} to activate full history",
+	"workflowHistory.upgrade.link": "Upgrade plan",
+	"workflowHistory.action.error.title": "Failed to {action}",
+	"workflowHistory.action.restore.modal.title": "Restore previous workflow version?",
+	"workflowHistory.action.restore.modal.subtitle": "Your workflow will revert to the version from {date}",
+	"workflowHistory.action.restore.modal.text": "Your workflow is currently active, so production executions will immediately start using the restored version. If you'd like to deactivate it before restoring, click {buttonText}.",
+	"workflowHistory.action.restore.modal.button.deactivateAndRestore": "Deactivate and restore",
+	"workflowHistory.action.restore.modal.button.restore": "Restore",
+	"workflowHistory.action.restore.modal.button.cancel": "Cancel",
+	"workflowHistory.action.restore.success.title": "Successfully restored workflow version",
+	"workflowHistory.action.clone.success.title": "Successfully cloned workflow version",
+	"workflowHistory.action.clone.success.message": "Open cloned workflow in a new tab",
 	"workflows.heading": "Workflows",
-	"workflows.add": "Add Workflow",
+	"workflows.add": "Add workflow",
 	"workflows.menu.my": "My workflows",
 	"workflows.menu.all": "All workflows",
 	"workflows.item.open": "Open",
@@ -1570,7 +2139,9 @@
 	"workflows.empty.heading": "👋 Welcome {name}!",
 	"workflows.empty.heading.userNotSetup": "👋 Welcome!",
 	"workflows.empty.description": "Create your first workflow",
+	"workflows.empty.description.readOnlyEnv": "No workflows here yet",
 	"workflows.empty.startFromScratch": "Start from scratch",
+	"workflows.empty.browseTemplates": "Browse {category} templates",
 	"workflows.shareModal.title": "Share '{name}'",
 	"workflows.shareModal.select.placeholder": "Add users...",
 	"workflows.shareModal.list.delete": "Remove access",
@@ -1588,7 +2159,7 @@
 	"workflows.shareModal.changesHint": "You made changes",
 	"workflows.shareModal.isDefaultUser.description": "You first need to set up your owner account to enable workflow sharing features.",
 	"workflows.shareModal.isDefaultUser.button": "Go to settings",
-	"workflows.shareModal.info.sharee": "Only {workflowOwnerName} can change who this workflow is shared with",
+	"workflows.shareModal.info.sharee": "Only {workflowOwnerName} or users with workflow sharing permission can change who this workflow is shared with",
 	"workflows.shareModal.info.sharee.fallback": "the owner",
 	"workflows.roles.editor": "Editor",
 	"workflows.concurrentChanges.confirmMessage.title": "Workflow was changed by someone else",
@@ -1598,16 +2169,28 @@
 	"importCurlModal.title": "Import cURL command",
 	"importCurlModal.input.label": "cURL Command",
 	"importCurlModal.input.placeholder": "Paste the cURL command here",
-	"ImportCurlModal.notice.content": "This will overwrite any changes you have already made",
+	"ImportCurlModal.notice.content": "This will overwrite any changes you have already made to the current node",
 	"importCurlModal.button.label": "Import",
-	"importParameter.label": "Import cURL",
-	"importParameter.showError.invalidCurlCommand.title": "Couldn’t import cURL command",
-	"importParameter.showError.invalidCurlCommand.message": "This command is in an unsupported format",
-	"importParameter.showError.invalidProtocol1.title": "Use the {node} node",
-	"importParameter.showError.invalidProtocol2.title": "Invalid Protocol",
-	"importParameter.showError.invalidProtocol.message": "The HTTP node doesn’t support {protocol} requests",
+	"importCurlParameter.label": "Import cURL",
+	"importCurlParameter.showError.invalidCurlCommand.title": "Couldn’t import cURL command",
+	"importCurlParameter.showError.invalidCurlCommand.message": "This command is in an unsupported format",
+	"importCurlParameter.showError.invalidProtocol1.title": "Use the {node} node",
+	"importCurlParameter.showError.invalidProtocol2.title": "Invalid Protocol",
+	"importCurlParameter.showError.invalidProtocol.message": "The HTTP node doesn’t support {protocol} requests",
+	"generateCurlParameter.label": "Ask AI ✨",
+	"generateCurlModal.title": "Generate HTTP Request",
+	"generateCurlModal.notice.content": "This will overwrite any changes you have already made to the current node",
+	"generateCurlModal.button.label": "Generate",
+	"generateCurlModal.service.label": "Service",
+	"generateCurlModal.service.placeholder": "Enter the name of the service",
+	"generateCurlModal.request.label": "Request",
+	"generateCurlModal.request.placeholder": "Describe the request you want to make",
+	"generateCurlModal.invalidCurlCommand.title": "Generation failed",
+	"generateCurlModal.invalidCurlCommand.message": "The AI couldn't process your request",
+	"generateCurlModal.success.title": "HTTP Request filled out",
+	"generateCurlModal.success.message": "Please check carefully as AI content can be inaccurate",
 	"variables.heading": "Variables",
-	"variables.add": "Add Variable",
+	"variables.add": "Add variable",
 	"variables.add.unavailable": "Upgrade plan to keep using variables",
 	"variables.add.unavailable.empty": "Upgrade plan to start using variables",
 	"variables.add.onlyOwnerCanCreate": "Only owner can create variables",
@@ -1615,6 +2198,8 @@
 	"variables.empty.heading.userNotSetup": "Set up a variable",
 	"variables.empty.description": "Variables can be used to store data that can be referenced easily across multiple workflows.",
 	"variables.empty.button": "Add first variable",
+	"variables.empty.notAllowedToCreate.heading": "{name}, start using variables",
+	"variables.empty.notAllowedToCreate.description": "Ask your n8n instance owner to create the variables you need. Once configured, you can utilize them in your workflows using the syntax $vars.MY_VAR.",
 	"variables.noResults": "No variables found",
 	"variables.sort.nameAsc": "Sort by name (A-Z)",
 	"variables.sort.nameDesc": "Sort by name (Z-A)",
@@ -1649,7 +2234,6 @@
 	"contextual.credentials.sharing.unavailable.button": "View plans",
 	"contextual.credentials.sharing.unavailable.button.cloud": "Upgrade now",
 	"contextual.credentials.sharing.unavailable.button.desktop": "View plans",
-
 	"contextual.workflows.sharing.title": "Sharing",
 	"contextual.workflows.sharing.unavailable.title": "Sharing",
 	"contextual.workflows.sharing.unavailable.title.cloud": "Upgrade to collaborate",
@@ -1663,15 +2247,13 @@
 	"contextual.workflows.sharing.unavailable.button": "View plans",
 	"contextual.workflows.sharing.unavailable.button.cloud": "Upgrade now",
 	"contextual.workflows.sharing.unavailable.button.desktop": "View plans",
-
-	"contextual.variables.unavailable.title": "Available on Enterprise plan",
-	"contextual.variables.unavailable.title.cloud": "Available on Power plan",
+	"contextual.variables.unavailable.title": "Available on the Enterprise plan",
+	"contextual.variables.unavailable.title.cloud": "Available on Pro plan",
 	"contextual.variables.unavailable.title.desktop": "Upgrade to n8n Cloud to collaborate",
 	"contextual.variables.unavailable.description": "Variables can be used to store and access data across workflows. Reference them in n8n using the prefix <code>$vars</code> (e.g. <code>$vars.myVariable</code>). Variables are immutable and cannot be modified within your workflows.<br/><a href=\"https://docs.n8n.io/environments/variables/\" target=\"_blank\">Learn more in the docs.</a>",
 	"contextual.variables.unavailable.button": "View plans",
 	"contextual.variables.unavailable.button.cloud": "Upgrade now",
 	"contextual.variables.unavailable.button.desktop": "View plans",
-
 	"contextual.users.settings.unavailable.title": "Upgrade to add users",
 	"contextual.users.settings.unavailable.title.cloud": "Upgrade to add users",
 	"contextual.users.settings.unavailable.title.desktop": "Upgrade to add users",
@@ -1681,14 +2263,11 @@
 	"contextual.users.settings.unavailable.button": "View plans",
 	"contextual.users.settings.unavailable.button.cloud": "Upgrade now",
 	"contextual.users.settings.unavailable.button.desktop": "View plans",
-
 	"contextual.communityNodes.unavailable.description.desktop": "Community nodes feature is unavailable on desktop. Please choose one of our available self-hosting plans.",
 	"contextual.communityNodes.unavailable.button.desktop": "View plans",
-
-	"contextual.upgradeLinkUrl": "https://subscription.n8n.io/",
-	"contextual.upgradeLinkUrl.cloud": "https://app.n8n.cloud/account/change-plan",
-	"contextual.upgradeLinkUrl.desktop": "https://n8n.io/pricing/?utm_source=n8n-internal&utm_medium=desktop",
-
+	"contextual.feature.unavailable.title": "Available on the Enterprise Plan",
+	"contextual.feature.unavailable.title.cloud": "Available on the Pro Plan",
+	"contextual.feature.unavailable.title.desktop": "Available on cloud hosting",
 	"settings.ldap": "LDAP",
 	"settings.ldap.note": "LDAP allows users to authenticate with their centralized account. It's compatible with services that provide an LDAP interface like Active Directory, Okta and Jumpcloud.",
 	"settings.ldap.infoTip": "Learn more about <a href='https://docs.n8n.io/user-management/ldap/' target='_blank'>LDAP in the Docs</a>",
@@ -1711,11 +2290,11 @@
 	"settings.ldap.synchronizationError": "LDAP Synchronization Error",
 	"settings.ldap.configurationError": "LDAP Configuration Error",
 	"settings.ldap.usersScanned": "Users scanned {scanned}",
-	"settings.ldap.confirmMessage.beforeSaveForm.cancelButtonText": "Yes, disable it",
-	"settings.ldap.confirmMessage.beforeSaveForm.confirmButtonText": "No",
+	"settings.ldap.confirmMessage.beforeSaveForm.cancelButtonText": "No",
+	"settings.ldap.confirmMessage.beforeSaveForm.confirmButtonText": "Yes, disable it",
 	"settings.ldap.confirmMessage.beforeSaveForm.headline": "Are you sure you want to disable LDAP login?",
 	"settings.ldap.confirmMessage.beforeSaveForm.message": "If you do so, all LDAP users will be converted to email users.",
-	"settings.ldap.disabled.title": "Available on Enterprise plan",
+	"settings.ldap.disabled.title": "Available on the Enterprise plan",
 	"settings.ldap.disabled.description": "LDAP is available as a paid feature. Learn more about it.",
 	"settings.ldap.disabled.buttonText": "See plans",
 	"settings.ldap.toast.sync.success": "Synchronization succeeded",
@@ -1773,33 +2352,162 @@
 	"settings.ldap.section.synchronization.title": "Synchronization",
 	"settings.sso": "SSO",
 	"settings.sso.title": "Single Sign On",
-	"settings.sso.subtitle": "SAML 2.0",
-	"settings.sso.info": "SAML SSO (Security Assertion Markup Language Single Sign-On) is a type of authentication process that enables users to access multiple applications with a single set of login credentials. {link}",
-	"settings.sso.info.link": "More info.",
+	"settings.sso.subtitle": "SAML 2.0 Configuration",
+	"settings.sso.info": "Activate SAML SSO to enable passwordless login via your existing user management tool and enhance security through unified authentication.",
+	"settings.sso.info.link": "Learn how to configure SAML 2.0.",
 	"settings.sso.activation.tooltip": "You need to save the settings first before activating SAML",
 	"settings.sso.activated": "Activated",
 	"settings.sso.deactivated": "Deactivated",
 	"settings.sso.settings.redirectUrl.label": "Redirect URL",
 	"settings.sso.settings.redirectUrl.copied": "Redirect URL copied to clipboard",
-	"settings.sso.settings.redirectUrl.help": "Save the Redirect URL as you’ll need it to configure these in the SAML provider’s settings.",
+	"settings.sso.settings.redirectUrl.help": "Copy the Redirect URL to configure your SAML provider",
 	"settings.sso.settings.entityId.label": "Entity ID",
 	"settings.sso.settings.entityId.copied": "Entity ID copied to clipboard",
-	"settings.sso.settings.entityId.help": "Save the Entity URL as you’ll need it to configure these in the SAML provider’s settings.",
+	"settings.sso.settings.entityId.help": "Copy the Entity ID URL to configure your SAML provider",
 	"settings.sso.settings.ips.label": "Identity Provider Settings",
-	"settings.sso.settings.ips.help": "Add the raw Metadata XML provided by your Identity Provider",
+	"settings.sso.settings.ips.xml.help": "Paste here the raw Metadata XML provided by your Identity Provider",
+	"settings.sso.settings.ips.url.help": "Paste here the Internet Provider Metadata URL",
+	"settings.sso.settings.ips.url.placeholder": "e.g. https://samltest.id/saml/idp",
+	"settings.sso.settings.ips.options.url": "Metadata URL",
+	"settings.sso.settings.ips.options.xml": "XML",
 	"settings.sso.settings.test": "Test settings",
 	"settings.sso.settings.save": "Save settings",
-	"settings.sso.actionBox.title": "Available on Enterprise plan",
+	"settings.sso.settings.save.activate.title": "Test and activate SAML SSO",
+	"settings.sso.settings.save.activate.message": "SAML SSO configuration saved successfully. Test your SAML SSO settings first, then activate to enable single sign-on for your organization.",
+	"settings.sso.settings.save.activate.cancel": "Cancel",
+	"settings.sso.settings.save.activate.test": "Test settings",
+	"settings.sso.settings.save.error": "Error saving SAML SSO configuration",
+	"settings.sso.settings.footer.hint": "Don't forget to activate SAML SSO once you've saved the settings.",
+	"settings.sso.actionBox.title": "Available on the Enterprise plan",
 	"settings.sso.actionBox.description": "Use Single Sign On to consolidate authentication into a single platform to improve security and agility.",
 	"settings.sso.actionBox.buttonText": "See plans",
-	"userActivationSurveyModal.title": "Congrats! Your workflow ran automatically 👏",
-	"userActivationSurveyModal.description.workflowRan": "{workflow} {ranSuccessfully} {savedTime}",
-	"userActivationSurveyModal.description.workflowRanSuccessfully": "ran successfully",
-	"userActivationSurveyModal.description.savedTime": "for the first time. Looks like n8n just saved you some time! Can you help us make n8n even better and answer the following question?",
-	"userActivationSurveyModal.form.label": "What almost stopped you from creating this workflow?",
-	"userActivationSurveyModal.form.button.shareFeedback": "Share feedback",
-	"userActivationSurveyModal.sharedFeedback.success": "Thanks for your feedback",
-	"userActivationSurveyModal.sharedFeedback.error": "Problem sharing feedback, try again",
+	"settings.mfa.secret": "Secret {secret}",
+	"settings.mfa": "MFA",
+	"settings.mfa.title": "Multi-factor Authentication",
+	"settings.mfa.updateConfiguration": "MFA configuration updated",
+	"settings.mfa.invalidAuthenticatorCode": "Invalid authenticator code",
+	"mfa.setup.invalidAuthenticatorCode": "{code} is not a valid number",
+	"mfa.setup.invalidCode": "Two-factor code failed. Please try again.",
+	"mfa.code.modal.title": "Two-factor authentication",
+	"mfa.recovery.modal.title": "Two-factor recovery",
+	"mfa.code.input.info": "Don't have your auth device?",
+	"mfa.code.input.info.action": "Enter a recovery code",
+	"mfa.recovery.input.info.action": "enter a recovery code",
+	"mfa.code.button.continue": "Continue",
+	"mfa.recovery.button.verify": "Verify",
+	"mfa.button.back": "Back",
+	"mfa.code.input.label": "Two-factor code",
+	"mfa.code.input.placeholder": "e.g. 123456",
+	"mfa.recovery.input.label": "Recovery Code",
+	"mfa.recovery.input.placeholder": "e.g c79f9c02-7b2e-44...",
+	"mfa.code.invalid": "This code is invalid, try again or",
+	"mfa.recovery.invalid": "This code is invalid or was already used, try again",
+	"mfa.setup.step1.title": "Setup Authenticator app [1/2]",
+	"mfa.setup.step2.title": "Download your recovery codes [2/2]",
+	"mfa.setup.step1.instruction1.title": "1. Scan the QR code",
+	"mfa.setup.step1.instruction1.subtitle": "{part1} {part2}",
+	"mfa.setup.step1.instruction1.subtitle.part1": "Use an authenticator app from your phone to scan. If you can't scan the QR code, enter",
+	"mfa.setup.step1.instruction1.subtitle.part2": "this text code",
+	"mfa.setup.step1.instruction2.title": "2. Enter the code from the app",
+	"mfa.setup.step2.description": "You can use recovery codes as a second factor to authenticate in case you lose access to your device.",
+	"mfa.setup.step2.infobox.description": "{part1} {part2}",
+	"mfa.setup.step2.infobox.description.part1": "Keep your recovery codes somewhere safe. If you lose your device and your recovery codes, you will",
+	"mfa.setup.step2.infobox.description.part2": "lose access to your account.",
+	"mfa.setup.step2.button.download": "Download recovery codes",
+	"mfa.setup.step2.button.save": "I have downloaded my recovery codes",
+	"mfa.setup.step1.button.continue": "Continue",
+	"mfa.setup.step1.input.label": "Code from your authenticator app",
+	"mfa.setup.step1.toast.copyToClipboard.title": "Code copied to clipboard",
+	"mfa.setup.step1.toast.copyToClipboard.message": "Enter the code in your authenticator app",
+	"mfa.setup.step2.toast.setupFinished.message": "Two-factor authentication enabled",
+	"mfa.setup.step2.toast.setupFinished.error.message": "Error enabling two-factor authentication",
+	"mfa.setup.step2.toast.tokenExpired.error.message": "MFA token expired. Close the modal and enable MFA again",
+	"settings.personal.mfa.section.title": "Two-factor authentication (2FA)",
+	"settings.personal.personalisation": "Personalisation",
+	"settings.personal.theme": "Theme",
+	"settings.personal.theme.systemDefault": "System default",
+	"settings.personal.theme.light": "Light theme",
+	"settings.personal.theme.dark": "Dark theme",
+	"settings.personal.mfa.button.disabled.infobox": "Two-factor authentication is currently disabled.",
+	"settings.personal.mfa.button.enabled.infobox": "Two-factor authentication is currently enabled.",
+	"settings.personal.mfa.button.enabled": "Enable 2FA",
+	"settings.personal.mfa.button.disabled": "Disable two-factor authentication",
+	"settings.personal.mfa.toast.disabledMfa.title": "Two-factor authentication disabled",
+	"settings.personal.mfa.toast.disabledMfa.message": "You will no longer need your authenticator app when signing in",
+	"settings.personal.mfa.toast.disabledMfa.error.message": "Error disabling two-factor authentication",
+	"settings.mfa.toast.noRecoveryCodeLeft.title": "No 2FA recovery codes remaining",
+	"settings.mfa.toast.noRecoveryCodeLeft.message": "You have used all of your recovery codes. Disable then re-enable two-factor authentication to generate new codes. <a href='/settings/personal' target='_blank' >Open settings</a>",
 	"sso.login.divider": "or",
-	"sso.login.button": "Continue with SSO"
+	"sso.login.button": "Continue with SSO",
+	"executionUsage.currentUsage": "{text} {count}",
+	"executionUsage.currentUsage.text": "You are in a free trial with limited executions. You have",
+	"executionUsage.currentUsage.count": "{n} day left. | {n} days left.",
+	"executionUsage.label.executions": "Executions",
+	"executionUsage.button.upgrade": "Upgrade plan",
+	"executionUsage.expired.text": "Your trial is over. Upgrade now to keep your data.",
+	"executionUsage.ranOutOfExecutions.text": "You’re out of executions. Upgrade your plan to keep automating.",
+	"type.string": "String",
+	"type.number": "Number",
+	"type.dateTime": "Date & Time",
+	"type.boolean": "Boolean",
+	"type.array": "Array",
+	"type.object": "Object",
+	"filter.operator.equals": "is equal to",
+	"filter.operator.notEquals": "is not equal to",
+	"filter.operator.contains": "contains",
+	"filter.operator.notContains": "does not contain",
+	"filter.operator.startsWith": "starts with",
+	"filter.operator.notStartsWith": "does not start with",
+	"filter.operator.endsWith": "ends with",
+	"filter.operator.notEndsWith": "does not end with",
+	"filter.operator.exists": "exists",
+	"filter.operator.notExists": "does not exist",
+	"filter.operator.regex": "matches regex",
+	"filter.operator.notRegex": "does not match regex",
+	"filter.operator.gt": "is greater than",
+	"filter.operator.lt": "is less than",
+	"filter.operator.gte": "is greater than or equal to",
+	"filter.operator.lte": "is less than or equal to",
+	"filter.operator.after": "is after",
+	"filter.operator.before": "is before",
+	"filter.operator.afterOrEquals": "is after or equal to",
+	"filter.operator.beforeOrEquals": "is before or equal to",
+	"filter.operator.true": "is true",
+	"filter.operator.false": "is false",
+	"filter.operator.lengthEquals": "length equal to",
+	"filter.operator.lengthNotEquals": "length not equal to",
+	"filter.operator.lengthGt": "length greater than",
+	"filter.operator.lengthLt": "length less than",
+	"filter.operator.lengthGte": "length greater than or equal to",
+	"filter.operator.lengthLte": "length less than or equal to",
+	"filter.operator.empty": "is empty",
+	"filter.operator.notEmpty": "is not empty",
+	"filter.combinator.or": "OR",
+	"filter.combinator.and": "AND",
+	"filter.addCondition": "Add condition",
+	"filter.removeCondition": "Remove 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",
+	"filter.condition.placeholderLeft": "value1",
+	"filter.condition.placeholderRight": "value2",
+	"assignment.dragFields": "Drag input fields here",
+	"assignment.dropField": "Drop here to add the field",
+	"assignment.or": "or",
+	"assignment.add": "Add Field",
+	"assignment.addAll": "Add All",
+	"assignment.clearAll": "Clear All",
+	"templateSetup.title": "Set up '{name}' template",
+	"templateSetup.instructions": "You need {0} account to setup this template",
+	"templateSetup.skip": "Skip",
+	"templateSetup.continue.button": "Continue",
+	"templateSetup.credential.description": "The credential you select will be used in the {0} node of the workflow template. | The credential you select will be used in the {0} nodes of the workflow template.",
+	"templateSetup.continue.button.fillRemaining": "Fill remaining credentials to continue",
+	"setupCredentialsModal.title": "Set up template",
+	"becomeCreator.text": "Share your workflows with 40k+ users, unlock perks, and shine as a featured template creator!",
+	"becomeCreator.buttonText": "Become a creator",
+	"becomeCreator.closeButtonTitle": "Close",
+	"feedback.title": "Was this helpful?",
+	"feedback.positive": "I found this helpful",
+	"feedback.negative": "I didn't find this helpful"
 }
diff --git a/packages/editor-ui/src/plugins/icons/custom.ts b/packages/editor-ui/src/plugins/icons/custom.ts
index 9817abf254e84..b8c0ac28003d4 100644
--- a/packages/editor-ui/src/plugins/icons/custom.ts
+++ b/packages/editor-ui/src/plugins/icons/custom.ts
@@ -11,3 +11,27 @@ export const faVariable: IconDefinition = {
 		'M42.6,17.8c2.4,0,7.2-2,7.2-8.4c0-6.4-4.6-6.8-6.1-6.8c-2.8,0-5.6,2-8.1,6.3c-2.5,4.4-5.3,9.1-5.3,9.1 l-0.1,0c-0.6-3.1-1.1-5.6-1.3-6.7c-0.5-2.7-3.6-8.4-9.9-8.4c-6.4,0-12.2,3.7-12.2,3.7l0,0C5.8,7.3,5.1,8.5,5.1,9.9 c0,2.1,1.7,3.9,3.9,3.9c0.6,0,1.2-0.2,1.7-0.4l0,0c0,0,4.8-2.7,5.9,0c0.3,0.8,0.6,1.7,0.9,2.7c1.2,4.2,2.4,9.1,3.3,13.5l-4.2,6 c0,0-4.7-1.7-7.1-1.7s-7.2,2-7.2,8.4s4.6,6.8,6.1,6.8c2.8,0,5.6-2,8.1-6.3c2.5-4.4,5.3-9.1,5.3-9.1c0.8,4,1.5,7.1,1.9,8.5 c1.6,4.5,5.3,7.2,10.1,7.2c0,0,5,0,10.9-3.3c1.4-0.6,2.4-2,2.4-3.6c0-2.1-1.7-3.9-3.9-3.9c-0.6,0-1.2,0.2-1.7,0.4l0,0 c0,0-4.2,2.4-5.6,0.5c-1-2-1.9-4.6-2.6-7.8c-0.6-2.8-1.3-6.2-2-9.5l4.3-6.2C35.5,16.1,40.2,17.8,42.6,17.8z',
 	],
 };
+
+export const faVault: IconDefinition = {
+	prefix: 'fas' as IconPrefix,
+	iconName: 'vault' as IconName,
+	icon: [
+		576,
+		512,
+		[],
+		'e006',
+		'M64 0C28.7 0 0 28.7 0 64v352c0 35.3 28.7 64 64 64h16l16 32h64l16-32h224l16 32h64l16-32h16c35.3 0 64-28.7 64-64V64c0-35.3-28.7-64-64-64H64zm160 320a80 80 0 1 0 0-160a80 80 0 1 0 0 160zm0-240a160 160 0 1 1 0 320a160 160 0 1 1 0-320zm256 141.3V336c0 8.8-7.2 16-16 16s-16-7.2-16-16V221.3c-18.6-6.6-32-24.4-32-45.3c0-26.5 21.5-48 48-48s48 21.5 48 48c0 20.9-13.4 38.7-32 45.3z',
+	],
+};
+
+export const faXmark: IconDefinition = {
+	prefix: 'fas' as IconPrefix,
+	iconName: 'xmark' as IconName,
+	icon: [
+		400,
+		400,
+		[],
+		'',
+		'M342.6 150.6c12.5-12.5 12.5-32.8 0-45.3s-32.8-12.5-45.3 0L192 210.7 86.6 105.4c-12.5-12.5-32.8-12.5-45.3 0s-12.5 32.8 0 45.3L146.7 256 41.4 361.4c-12.5 12.5-12.5 32.8 0 45.3s32.8 12.5 45.3 0L192 301.3 297.4 406.6c12.5 12.5 32.8 12.5 45.3 0s12.5-32.8 0-45.3L237.3 256 342.6 150.6z',
+	],
+};
diff --git a/packages/editor-ui/src/plugins/icons/index.ts b/packages/editor-ui/src/plugins/icons/index.ts
index 90257a28ce316..eb08473278b1d 100644
--- a/packages/editor-ui/src/plugins/icons/index.ts
+++ b/packages/editor-ui/src/plugins/icons/index.ts
@@ -1,5 +1,4 @@
-import Vue from 'vue';
-
+import type { Plugin } from 'vue';
 import { library } from '@fortawesome/fontawesome-svg-core';
 import type { IconDefinition } from '@fortawesome/fontawesome-svg-core';
 import {
@@ -10,12 +9,16 @@ import {
 	faAngleUp,
 	faArrowLeft,
 	faArrowRight,
+	faArrowUp,
+	faArrowDown,
 	faAt,
 	faBan,
+	faBars,
 	faBolt,
 	faBook,
 	faBoxOpen,
 	faBug,
+	faBrain,
 	faCalculator,
 	faCalendar,
 	faChartBar,
@@ -30,6 +33,9 @@ import {
 	faCodeBranch,
 	faCog,
 	faCogs,
+	faComment,
+	faComments,
+	faClipboardList,
 	faClock,
 	faClone,
 	faCloud,
@@ -37,8 +43,10 @@ import {
 	faCopy,
 	faCube,
 	faCut,
+	faDatabase,
 	faDotCircle,
 	faEdit,
+	faEllipsisH,
 	faEllipsisV,
 	faEnvelope,
 	faEye,
@@ -64,10 +72,15 @@ import {
 	faGift,
 	faGlobe,
 	faGraduationCap,
+	faGripLinesVertical,
 	faGripVertical,
+	faHandHoldingUsd,
+	faHandScissors,
 	faHandPointLeft,
+	faHandshake,
 	faHashtag,
 	faHdd,
+	faHistory,
 	faHome,
 	faHourglass,
 	faImage,
@@ -75,12 +88,15 @@ import {
 	faInfo,
 	faInfoCircle,
 	faKey,
+	faLanguage,
 	faLink,
 	faList,
 	faLightbulb,
+	faLock,
 	faMapSigns,
 	faMousePointer,
 	faNetworkWired,
+	faPalette,
 	faPause,
 	faPauseCircle,
 	faPen,
@@ -94,6 +110,7 @@ import {
 	faQuestion,
 	faQuestionCircle,
 	faRedo,
+	faRobot,
 	faRss,
 	faSave,
 	faSatelliteDish,
@@ -101,6 +118,7 @@ import {
 	faSearchMinus,
 	faSearchPlus,
 	faServer,
+	faScrewdriver,
 	faSignInAlt,
 	faSignOutAlt,
 	faSlidersH,
@@ -114,6 +132,8 @@ import {
 	faTerminal,
 	faThLarge,
 	faThumbtack,
+	faThumbsDown,
+	faThumbsUp,
 	faTimes,
 	faTimesCircle,
 	faToolbox,
@@ -124,12 +144,20 @@ import {
 	faUserCircle,
 	faUserFriends,
 	faUsers,
+	faVectorSquare,
 	faVideo,
 	faTree,
 	faStickyNote as faSolidStickyNote,
 	faUserLock,
+	faGem,
+	faDownload,
+	faRemoveFormat,
+	faTools,
+	faProjectDiagram,
+	faStream,
+	faPowerOff,
 } from '@fortawesome/free-solid-svg-icons';
-import { faVariable } from './custom';
+import { faVariable, faXmark, faVault } from './custom';
 import { faStickyNote } from '@fortawesome/free-regular-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
 
@@ -137,132 +165,167 @@ function addIcon(icon: IconDefinition) {
 	library.add(icon);
 }
 
-addIcon(faAngleDoubleLeft);
-addIcon(faAngleDown);
-addIcon(faAngleLeft);
-addIcon(faAngleRight);
-addIcon(faAngleUp);
-addIcon(faArrowLeft);
-addIcon(faArrowRight);
-addIcon(faAt);
-addIcon(faBan);
-addIcon(faBolt);
-addIcon(faBook);
-addIcon(faBoxOpen);
-addIcon(faBug);
-addIcon(faCalculator);
-addIcon(faCalendar);
-addIcon(faChartBar);
-addIcon(faCheck);
-addIcon(faCheckCircle);
-addIcon(faCheckSquare);
-addIcon(faChevronLeft);
-addIcon(faChevronRight);
-addIcon(faChevronDown);
-addIcon(faChevronUp);
-addIcon(faCode);
-addIcon(faCodeBranch);
-addIcon(faCog);
-addIcon(faCogs);
-addIcon(faClock);
-addIcon(faClone);
-addIcon(faCloud);
-addIcon(faCloudDownloadAlt);
-addIcon(faCopy);
-addIcon(faCube);
-addIcon(faCut);
-addIcon(faDotCircle);
-addIcon(faGripVertical);
-addIcon(faEdit);
-addIcon(faEllipsisV);
-addIcon(faEnvelope);
-addIcon(faEye);
-addIcon(faExclamationTriangle);
-addIcon(faExpand);
-addIcon(faExpandAlt);
-addIcon(faExternalLinkAlt);
-addIcon(faExchangeAlt);
-addIcon(faFile);
-addIcon(faFileAlt);
-addIcon(faFileArchive);
-addIcon(faFileCode);
-addIcon(faFileDownload);
-addIcon(faFileExport);
-addIcon(faFileImport);
-addIcon(faFilePdf);
-addIcon(faFilter);
-addIcon(faFingerprint);
-addIcon(faFlask);
-addIcon(faFolderOpen);
-addIcon(faFont);
-addIcon(faGift);
-addIcon(faGlobe);
-addIcon(faGlobeAmericas);
-addIcon(faGraduationCap);
-addIcon(faHandPointLeft);
-addIcon(faHashtag);
-addIcon(faHdd);
-addIcon(faHome);
-addIcon(faHourglass);
-addIcon(faImage);
-addIcon(faInbox);
-addIcon(faInfo);
-addIcon(faInfoCircle);
-addIcon(faKey);
-addIcon(faLink);
-addIcon(faList);
-addIcon(faLightbulb);
-addIcon(faMapSigns);
-addIcon(faMousePointer);
-addIcon(faNetworkWired);
-addIcon(faPause);
-addIcon(faPauseCircle);
-addIcon(faPen);
-addIcon(faPencilAlt);
-addIcon(faPlay);
-addIcon(faPlayCircle);
-addIcon(faPlug);
-addIcon(faPlus);
-addIcon(faPlusCircle);
-addIcon(faPlusSquare);
-addIcon(faQuestion);
-addIcon(faQuestionCircle);
-addIcon(faRedo);
-addIcon(faRss);
-addIcon(faSave);
-addIcon(faSatelliteDish);
-addIcon(faSearch);
-addIcon(faSearchMinus);
-addIcon(faSearchPlus);
-addIcon(faServer);
-addIcon(faSignInAlt);
-addIcon(faSignOutAlt);
-addIcon(faSlidersH);
-addIcon(faSpinner);
-addIcon(faSolidStickyNote);
-addIcon(faStickyNote as IconDefinition);
-addIcon(faStop);
-addIcon(faSun);
-addIcon(faSync);
-addIcon(faSyncAlt);
-addIcon(faTable);
-addIcon(faTasks);
-addIcon(faTerminal);
-addIcon(faThLarge);
-addIcon(faThumbtack);
-addIcon(faTimes);
-addIcon(faTimesCircle);
-addIcon(faToolbox);
-addIcon(faTrash);
-addIcon(faUndo);
-addIcon(faUnlink);
-addIcon(faUser);
-addIcon(faUserCircle);
-addIcon(faUserFriends);
-addIcon(faUsers);
-addIcon(faVariable);
-addIcon(faVideo);
-addIcon(faTree);
-addIcon(faUserLock);
+export const FontAwesomePlugin: Plugin<{}> = {
+	install: (app) => {
+		addIcon(faAngleDoubleLeft);
+		addIcon(faAngleDown);
+		addIcon(faAngleLeft);
+		addIcon(faAngleRight);
+		addIcon(faAngleUp);
+		addIcon(faArrowLeft);
+		addIcon(faArrowRight);
+		addIcon(faArrowUp);
+		addIcon(faArrowDown);
+		addIcon(faAt);
+		addIcon(faBan);
+		addIcon(faBars);
+		addIcon(faBolt);
+		addIcon(faBook);
+		addIcon(faBoxOpen);
+		addIcon(faBug);
+		addIcon(faBrain);
+		addIcon(faCalculator);
+		addIcon(faCalendar);
+		addIcon(faChartBar);
+		addIcon(faCheck);
+		addIcon(faCheckCircle);
+		addIcon(faCheckSquare);
+		addIcon(faChevronLeft);
+		addIcon(faChevronRight);
+		addIcon(faChevronDown);
+		addIcon(faChevronUp);
+		addIcon(faCode);
+		addIcon(faCodeBranch);
+		addIcon(faCog);
+		addIcon(faCogs);
+		addIcon(faComment);
+		addIcon(faComments);
+		addIcon(faClipboardList);
+		addIcon(faClock);
+		addIcon(faClone);
+		addIcon(faCloud);
+		addIcon(faCloudDownloadAlt);
+		addIcon(faCopy);
+		addIcon(faCube);
+		addIcon(faCut);
+		addIcon(faDatabase);
+		addIcon(faDotCircle);
+		addIcon(faGripLinesVertical);
+		addIcon(faGripVertical);
+		addIcon(faEdit);
+		addIcon(faEllipsisH);
+		addIcon(faEllipsisV);
+		addIcon(faEnvelope);
+		addIcon(faEye);
+		addIcon(faExclamationTriangle);
+		addIcon(faExpand);
+		addIcon(faExpandAlt);
+		addIcon(faExternalLinkAlt);
+		addIcon(faExchangeAlt);
+		addIcon(faFile);
+		addIcon(faFileAlt);
+		addIcon(faFileArchive);
+		addIcon(faFileCode);
+		addIcon(faFileDownload);
+		addIcon(faFileExport);
+		addIcon(faFileImport);
+		addIcon(faFilePdf);
+		addIcon(faFilter);
+		addIcon(faFingerprint);
+		addIcon(faFlask);
+		addIcon(faFolderOpen);
+		addIcon(faFont);
+		addIcon(faGift);
+		addIcon(faGlobe);
+		addIcon(faGlobeAmericas);
+		addIcon(faGraduationCap);
+		addIcon(faHandHoldingUsd);
+		addIcon(faHandScissors);
+		addIcon(faHandshake);
+		addIcon(faHandPointLeft);
+		addIcon(faHashtag);
+		addIcon(faHdd);
+		addIcon(faHistory);
+		addIcon(faHome);
+		addIcon(faHourglass);
+		addIcon(faImage);
+		addIcon(faInbox);
+		addIcon(faInfo);
+		addIcon(faInfoCircle);
+		addIcon(faKey);
+		addIcon(faLanguage);
+		addIcon(faLink);
+		addIcon(faList);
+		addIcon(faLightbulb);
+		addIcon(faLock);
+		addIcon(faMapSigns);
+		addIcon(faMousePointer);
+		addIcon(faNetworkWired);
+		addIcon(faPalette);
+		addIcon(faPause);
+		addIcon(faPauseCircle);
+		addIcon(faPen);
+		addIcon(faPencilAlt);
+		addIcon(faPlay);
+		addIcon(faPlayCircle);
+		addIcon(faPlug);
+		addIcon(faPlus);
+		addIcon(faPlusCircle);
+		addIcon(faPlusSquare);
+		addIcon(faProjectDiagram);
+		addIcon(faQuestion);
+		addIcon(faQuestionCircle);
+		addIcon(faRedo);
+		addIcon(faRemoveFormat);
+		addIcon(faRobot);
+		addIcon(faRss);
+		addIcon(faSave);
+		addIcon(faSatelliteDish);
+		addIcon(faSearch);
+		addIcon(faSearchMinus);
+		addIcon(faSearchPlus);
+		addIcon(faServer);
+		addIcon(faScrewdriver);
+		addIcon(faSignInAlt);
+		addIcon(faSignOutAlt);
+		addIcon(faSlidersH);
+		addIcon(faSpinner);
+		addIcon(faSolidStickyNote);
+		addIcon(faStickyNote as IconDefinition);
+		addIcon(faStop);
+		addIcon(faStream);
+		addIcon(faSun);
+		addIcon(faSync);
+		addIcon(faSyncAlt);
+		addIcon(faTable);
+		addIcon(faTasks);
+		addIcon(faTerminal);
+		addIcon(faThLarge);
+		addIcon(faThumbtack);
+		addIcon(faThumbsDown);
+		addIcon(faThumbsUp);
+		addIcon(faTimes);
+		addIcon(faTimesCircle);
+		addIcon(faToolbox);
+		addIcon(faTools);
+		addIcon(faTrash);
+		addIcon(faUndo);
+		addIcon(faUnlink);
+		addIcon(faUser);
+		addIcon(faUserCircle);
+		addIcon(faUserFriends);
+		addIcon(faUsers);
+		addIcon(faVariable);
+		addIcon(faVault);
+		addIcon(faVectorSquare);
+		addIcon(faVideo);
+		addIcon(faTree);
+		addIcon(faUserLock);
+		addIcon(faGem);
+		addIcon(faXmark);
+		addIcon(faDownload);
+		addIcon(faPowerOff);
 
-Vue.component('font-awesome-icon', FontAwesomeIcon);
+		app.component('FontAwesomeIcon', FontAwesomeIcon);
+	},
+};
diff --git a/packages/editor-ui/src/plugins/index.ts b/packages/editor-ui/src/plugins/index.ts
index 809f2a95fc6f8..0a059f69245d6 100644
--- a/packages/editor-ui/src/plugins/index.ts
+++ b/packages/editor-ui/src/plugins/index.ts
@@ -1,3 +1,4 @@
 import './icons';
 import './directives';
 import './components';
+import './chartjs';
diff --git a/packages/editor-ui/src/plugins/jsplumb/N8nAddInputEndpointRenderer.ts b/packages/editor-ui/src/plugins/jsplumb/N8nAddInputEndpointRenderer.ts
new file mode 100644
index 0000000000000..54d4d98695598
--- /dev/null
+++ b/packages/editor-ui/src/plugins/jsplumb/N8nAddInputEndpointRenderer.ts
@@ -0,0 +1,79 @@
+import { registerEndpointRenderer, svg } from '@jsplumb/browser-ui';
+import { N8nAddInputEndpoint } from './N8nAddInputEndpointType';
+
+export const register = () => {
+	registerEndpointRenderer<N8nAddInputEndpoint>(N8nAddInputEndpoint.type, {
+		makeNode: (endpointInstance: N8nAddInputEndpoint) => {
+			const xOffset = 1;
+			const lineYOffset = -2;
+			const width = endpointInstance.params.width;
+			const height = endpointInstance.params.height;
+			const unconnectedDiamondSize = width / 2;
+			const unconnectedDiamondWidth = unconnectedDiamondSize * Math.sqrt(2);
+			const unconnectedPlusStroke = 2;
+			const unconnectedPlusSize = width - 2 * unconnectedPlusStroke;
+
+			const sizeDifference = (unconnectedPlusSize - unconnectedDiamondWidth) / 2;
+
+			const container = svg.node('g', {
+				style: `--svg-color: var(--endpoint-svg-color, var(${endpointInstance.params.color}))`,
+				width,
+				height,
+			});
+
+			const unconnectedGroup = svg.node('g', { class: 'add-input-endpoint-unconnected' });
+			const unconnectedLine = svg.node('rect', {
+				x: xOffset / 2 + unconnectedDiamondWidth / 2 + sizeDifference,
+				y: unconnectedDiamondWidth + lineYOffset,
+				width: 2,
+				height: height - unconnectedDiamondWidth - unconnectedPlusSize,
+				'stroke-width': 0,
+				class: 'add-input-endpoint-line',
+			});
+			const unconnectedPlusGroup = svg.node('g', {
+				transform: `translate(${xOffset / 2}, ${height - unconnectedPlusSize + lineYOffset})`,
+			});
+			const plusRectangle = svg.node('rect', {
+				x: 1,
+				y: 1,
+				rx: 3,
+				'stroke-width': unconnectedPlusStroke,
+				fillOpacity: 0,
+				height: unconnectedPlusSize,
+				width: unconnectedPlusSize,
+				class: 'add-input-endpoint-plus-rectangle',
+			});
+			const plusIcon = svg.node('path', {
+				transform: `scale(${width / 24})`,
+				d: 'm15.40655,9.89837l-3.30491,0l0,-3.30491c0,-0.40555 -0.32889,-0.73443 -0.73443,-0.73443l-0.73443,0c-0.40554,0 -0.73442,0.32888 -0.73442,0.73443l0,3.30491l-3.30491,0c-0.40555,0 -0.73443,0.32888 -0.73443,0.73442l0,0.73443c0,0.40554 0.32888,0.73443 0.73443,0.73443l3.30491,0l0,3.30491c0,0.40554 0.32888,0.73442 0.73442,0.73442l0.73443,0c0.40554,0 0.73443,-0.32888 0.73443,-0.73442l0,-3.30491l3.30491,0c0.40554,0 0.73442,-0.32889 0.73442,-0.73443l0,-0.73443c0,-0.40554 -0.32888,-0.73442 -0.73442,-0.73442z',
+				class: 'add-input-endpoint-plus-icon',
+			});
+
+			unconnectedPlusGroup.appendChild(plusRectangle);
+			unconnectedPlusGroup.appendChild(plusIcon);
+			unconnectedGroup.appendChild(unconnectedLine);
+			unconnectedGroup.appendChild(unconnectedPlusGroup);
+
+			const defaultGroup = svg.node('g', { class: 'add-input-endpoint-default' });
+			const defaultDiamond = svg.node('rect', {
+				x: xOffset + sizeDifference + unconnectedPlusStroke,
+				y: 0,
+				'stroke-width': 0,
+				width: unconnectedDiamondSize,
+				height: unconnectedDiamondSize,
+				transform: `translate(${unconnectedDiamondWidth / 2}, 0) rotate(45)`,
+				class: 'add-input-endpoint-diamond',
+			});
+
+			defaultGroup.appendChild(defaultDiamond);
+
+			container.appendChild(unconnectedGroup);
+			container.appendChild(defaultGroup);
+
+			endpointInstance.setVisible(false);
+
+			return container;
+		},
+		updateNode: (endpointInstance: N8nAddInputEndpoint) => {},
+	});
+};
diff --git a/packages/editor-ui/src/plugins/jsplumb/N8nAddInputEndpointType.ts b/packages/editor-ui/src/plugins/jsplumb/N8nAddInputEndpointType.ts
new file mode 100644
index 0000000000000..4bd54ae486b58
--- /dev/null
+++ b/packages/editor-ui/src/plugins/jsplumb/N8nAddInputEndpointType.ts
@@ -0,0 +1,86 @@
+import type { EndpointHandler, Endpoint } from '@jsplumb/core';
+import { EndpointRepresentation } from '@jsplumb/core';
+import type { AnchorPlacement, EndpointRepresentationParams } from '@jsplumb/common';
+import { EVENT_ENDPOINT_CLICK } from '@jsplumb/browser-ui';
+
+export type ComputedN8nAddInputEndpoint = [number, number, number, number, number];
+interface N8nAddInputEndpointParams extends EndpointRepresentationParams {
+	endpoint: Endpoint;
+	width: number;
+	height: number;
+	color: string;
+	multiple: boolean;
+}
+export const N8nAddInputEndpointType = 'N8nAddInput';
+export const EVENT_ADD_INPUT_ENDPOINT_CLICK = 'eventAddInputEndpointClick';
+export class N8nAddInputEndpoint extends EndpointRepresentation<ComputedN8nAddInputEndpoint> {
+	params: N8nAddInputEndpointParams;
+
+	constructor(endpoint: Endpoint, params: N8nAddInputEndpointParams) {
+		super(endpoint, params);
+
+		this.params = params;
+		this.params.width = params.width || 18;
+		this.params.height = params.height || 48;
+		this.params.color = params.color || '--color-foreground-xdark';
+		this.params.multiple = params.multiple || false;
+
+		this.unbindEvents();
+		this.bindEvents();
+	}
+
+	static type = N8nAddInputEndpointType;
+
+	type = N8nAddInputEndpoint.type;
+
+	bindEvents() {
+		this.instance.bind(EVENT_ENDPOINT_CLICK, this.fireClickEvent);
+	}
+
+	unbindEvents() {
+		this.instance.unbind(EVENT_ENDPOINT_CLICK, this.fireClickEvent);
+	}
+
+	setError() {
+		this.endpoint.addClass('add-input-endpoint-error');
+	}
+
+	resetError() {
+		this.endpoint.removeClass('add-input-endpoint-error');
+	}
+
+	fireClickEvent = (endpoint: Endpoint) => {
+		if (endpoint === this.endpoint) {
+			this.instance.fire(EVENT_ADD_INPUT_ENDPOINT_CLICK, this.endpoint);
+		}
+	};
+}
+
+export const N8nAddInputEndpointHandler: EndpointHandler<
+	N8nAddInputEndpoint,
+	ComputedN8nAddInputEndpoint
+> = {
+	type: N8nAddInputEndpoint.type,
+	cls: N8nAddInputEndpoint,
+	compute: (ep: N8nAddInputEndpoint, anchorPoint: AnchorPlacement): ComputedN8nAddInputEndpoint => {
+		const x = anchorPoint.curX - ep.params.width / 2;
+		const y = anchorPoint.curY - ep.params.width / 2;
+		const w = ep.params.width;
+		const h = ep.params.height;
+
+		ep.x = x;
+		ep.y = y;
+		ep.w = w;
+		ep.h = h;
+
+		ep.addClass('add-input-endpoint');
+		if (ep.params.multiple) {
+			ep.addClass('add-input-endpoint-multiple');
+		}
+		return [x, y, w, h, ep.params.width];
+	},
+
+	getParams: (ep: N8nAddInputEndpoint): N8nAddInputEndpointParams => {
+		return ep.params;
+	},
+};
diff --git a/packages/editor-ui/src/plugins/endpoints/N8nPlusEndpointRenderer.ts b/packages/editor-ui/src/plugins/jsplumb/N8nPlusEndpointRenderer.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/endpoints/N8nPlusEndpointRenderer.ts
rename to packages/editor-ui/src/plugins/jsplumb/N8nPlusEndpointRenderer.ts
diff --git a/packages/editor-ui/src/plugins/endpoints/N8nPlusEndpointType.ts b/packages/editor-ui/src/plugins/jsplumb/N8nPlusEndpointType.ts
similarity index 93%
rename from packages/editor-ui/src/plugins/endpoints/N8nPlusEndpointType.ts
rename to packages/editor-ui/src/plugins/jsplumb/N8nPlusEndpointType.ts
index 8481a2e350faf..2cf9ddd464a66 100644
--- a/packages/editor-ui/src/plugins/endpoints/N8nPlusEndpointType.ts
+++ b/packages/editor-ui/src/plugins/jsplumb/N8nPlusEndpointType.ts
@@ -10,10 +10,12 @@ import {
 } from '@jsplumb/browser-ui';
 
 export type ComputedN8nPlusEndpoint = [number, number, number, number, number];
+export type N8nEndpointLabelLength = 'small' | 'medium' | 'large';
 interface N8nPlusEndpointParams extends EndpointRepresentationParams {
 	dimensions: number;
 	connectedEndpoint: Endpoint;
 	hoverMessage: string;
+	endpointLabelLength: N8nEndpointLabelLength;
 	size: 'small' | 'medium';
 	showOutputLabel: boolean;
 }
@@ -23,15 +25,17 @@ export const N8nPlusEndpointType = 'N8nPlus';
 export const EVENT_PLUS_ENDPOINT_CLICK = 'eventPlusEndpointClick';
 export class N8nPlusEndpoint extends EndpointRepresentation<ComputedN8nPlusEndpoint> {
 	params: N8nPlusEndpointParams;
+
 	label: string;
+
 	stalkOverlay: Overlay | null;
+
 	messageOverlay: Overlay | null;
 
 	constructor(endpoint: Endpoint, params: N8nPlusEndpointParams) {
 		super(endpoint, params);
 
 		this.params = params;
-
 		this.label = '';
 		this.stalkOverlay = null;
 		this.messageOverlay = null;
@@ -41,15 +45,18 @@ export class N8nPlusEndpoint extends EndpointRepresentation<ComputedN8nPlusEndpo
 	}
 
 	static type = N8nPlusEndpointType;
+
 	type = N8nPlusEndpoint.type;
 
 	setupOverlays() {
 		this.clearOverlays();
-		this.endpoint.instance.setSuspendDrawing(true);
 		this.stalkOverlay = this.endpoint.addOverlay({
 			type: 'Custom',
 			options: {
 				id: PlusStalkOverlay,
+				attributes: {
+					'data-endpoint-label-length': this.params.endpointLabelLength,
+				},
 				create: () => {
 					const stalk = createElement('div', {}, `${PlusStalkOverlay} ${this.params.size}`);
 					return stalk;
@@ -61,6 +68,9 @@ export class N8nPlusEndpoint extends EndpointRepresentation<ComputedN8nPlusEndpo
 			options: {
 				id: HoverMessageOverlay,
 				location: 0.5,
+				attributes: {
+					'data-endpoint-label-length': this.params.endpointLabelLength,
+				},
 				create: () => {
 					const hoverMessage = createElement('p', {}, `${HoverMessageOverlay} ${this.params.size}`);
 					hoverMessage.innerHTML = this.params.hoverMessage;
@@ -68,25 +78,28 @@ export class N8nPlusEndpoint extends EndpointRepresentation<ComputedN8nPlusEndpo
 				},
 			},
 		});
-		this.endpoint.instance.setSuspendDrawing(false);
 	}
+
 	bindEvents() {
 		this.instance.bind(EVENT_ENDPOINT_MOUSEOVER, this.setHoverMessageVisible);
 		this.instance.bind(EVENT_ENDPOINT_MOUSEOUT, this.unsetHoverMessageVisible);
 		this.instance.bind(EVENT_ENDPOINT_CLICK, this.fireClickEvent);
 		this.instance.bind(EVENT_CONNECTION_ABORT, this.setStalkLabels);
 	}
+
 	unbindEvents() {
 		this.instance.unbind(EVENT_ENDPOINT_MOUSEOVER, this.setHoverMessageVisible);
 		this.instance.unbind(EVENT_ENDPOINT_MOUSEOUT, this.unsetHoverMessageVisible);
 		this.instance.unbind(EVENT_ENDPOINT_CLICK, this.fireClickEvent);
 		this.instance.unbind(EVENT_CONNECTION_ABORT, this.setStalkLabels);
 	}
+
 	setStalkLabels = () => {
 		if (!this.endpoint) return;
 
 		const stalkOverlay = this.endpoint.getOverlay(PlusStalkOverlay);
 		const messageOverlay = this.endpoint.getOverlay(HoverMessageOverlay);
+
 		if (stalkOverlay && messageOverlay) {
 			// Increase the size of the stalk overlay if the label is too long
 			const fnKey = this.label.length > 10 ? 'add' : 'remove';
@@ -100,21 +113,25 @@ export class N8nPlusEndpoint extends EndpointRepresentation<ComputedN8nPlusEndpo
 			}
 		}
 	};
+
 	fireClickEvent = (endpoint: Endpoint) => {
 		if (endpoint === this.endpoint) {
 			this.instance.fire(EVENT_PLUS_ENDPOINT_CLICK, this.endpoint);
 		}
 	};
+
 	setHoverMessageVisible = (endpoint: Endpoint) => {
 		if (endpoint === this.endpoint && this.messageOverlay) {
 			this.instance.addOverlayClass(this.messageOverlay, 'visible');
 		}
 	};
+
 	unsetHoverMessageVisible = (endpoint: Endpoint) => {
 		if (endpoint === this.endpoint && this.messageOverlay) {
 			this.instance.removeOverlayClass(this.messageOverlay, 'visible');
 		}
 	};
+
 	clearOverlays() {
 		Object.keys(this.endpoint.getOverlays()).forEach((key) => {
 			this.endpoint.removeOverlay(key);
@@ -122,6 +139,7 @@ export class N8nPlusEndpoint extends EndpointRepresentation<ComputedN8nPlusEndpo
 		this.stalkOverlay = null;
 		this.messageOverlay = null;
 	}
+
 	getConnections() {
 		const connections = [
 			...this.endpoint.connections,
@@ -130,19 +148,16 @@ export class N8nPlusEndpoint extends EndpointRepresentation<ComputedN8nPlusEndpo
 
 		return connections;
 	}
+
 	setIsVisible(visible: boolean) {
-		this.instance.setSuspendDrawing(true);
 		Object.keys(this.endpoint.getOverlays()).forEach((overlay) => {
 			this.endpoint.getOverlays()[overlay].setVisible(visible);
 		});
-
 		this.setVisible(visible);
-
 		// Re-trigger the success state if label is set
 		if (visible && this.label) {
 			this.setSuccessOutput(this.label);
 		}
-		this.instance.setSuspendDrawing(false);
 	}
 
 	setSuccessOutput(label: string) {
@@ -179,6 +194,8 @@ export const N8nPlusEndpointHandler: EndpointHandler<N8nPlusEndpoint, ComputedN8
 		ep.w = w;
 		ep.h = h;
 
+		ep.canvas?.setAttribute('data-endpoint-label-length', ep.params.endpointLabelLength);
+
 		ep.addClass('plus-endpoint');
 		return [x, y, w, h, ep.params.dimensions];
 	},
diff --git a/packages/editor-ui/src/plugins/jsplumb/index.ts b/packages/editor-ui/src/plugins/jsplumb/index.ts
new file mode 100644
index 0000000000000..123e82896002a
--- /dev/null
+++ b/packages/editor-ui/src/plugins/jsplumb/index.ts
@@ -0,0 +1,19 @@
+import type { Plugin } from 'vue';
+import { N8nPlusEndpointHandler } from '@/plugins/jsplumb/N8nPlusEndpointType';
+import * as N8nPlusEndpointRenderer from '@/plugins/jsplumb/N8nPlusEndpointRenderer';
+import { N8nConnector } from '@/plugins/connectors/N8nCustomConnector';
+import * as N8nAddInputEndpointRenderer from '@/plugins/jsplumb/N8nAddInputEndpointRenderer';
+import { N8nAddInputEndpointHandler } from '@/plugins/jsplumb/N8nAddInputEndpointType';
+import { Connectors, EndpointFactory } from '@jsplumb/core';
+
+export const JsPlumbPlugin: Plugin<{}> = {
+	install: () => {
+		Connectors.register(N8nConnector.type, N8nConnector);
+
+		N8nPlusEndpointRenderer.register();
+		EndpointFactory.registerHandler(N8nPlusEndpointHandler);
+
+		N8nAddInputEndpointRenderer.register();
+		EndpointFactory.registerHandler(N8nAddInputEndpointHandler);
+	},
+};
diff --git a/packages/editor-ui/src/plugins/telemetry/index.ts b/packages/editor-ui/src/plugins/telemetry/index.ts
index 8d213483c649a..462941c1c968d 100644
--- a/packages/editor-ui/src/plugins/telemetry/index.ts
+++ b/packages/editor-ui/src/plugins/telemetry/index.ts
@@ -1,15 +1,25 @@
-import type _Vue from 'vue';
+import type { Plugin } from 'vue';
 import type { ITelemetrySettings, ITelemetryTrackProperties, IDataObject } from 'n8n-workflow';
-import type { Route } from 'vue-router';
+import type { RouteLocation } from 'vue-router';
 
-import type { INodeCreateElement } from '@/Interface';
+import type { INodeCreateElement, IUpdateInformation } from '@/Interface';
 import type { IUserNodesPanelSession } from './telemetry.types';
-import { useSettingsStore } from '@/stores/settings';
-import { useRootStore } from '@/stores/n8nRootStore';
-import { useTelemetryStore } from '@/stores/telemetry';
+import {
+	APPEND_ATTRIBUTION_DEFAULT_PATH,
+	MICROSOFT_TEAMS_NODE_TYPE,
+	SLACK_NODE_TYPE,
+	TELEGRAM_NODE_TYPE,
+} from '@/constants';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import { useNDVStore } from '@/stores/ndv.store';
+import { usePostHog } from '@/stores/posthog.store';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useTelemetryStore } from '@/stores/telemetry.store';
+import { useUIStore } from '@/stores/ui.store';
 
 export class Telemetry {
-	private pageEventQueue: Array<{ route: Route }>;
+	private pageEventQueue: Array<{ route: RouteLocation }>;
+
 	private previousPath: string;
 
 	private get rudderStack() {
@@ -17,7 +27,7 @@ export class Telemetry {
 	}
 
 	private userNodesPanelSession: IUserNodesPanelSession = {
-		sessionId: '',
+		pushRef: '',
 		data: {
 			nodeFilter: '',
 			resultsNodes: [],
@@ -66,11 +76,19 @@ export class Telemetry {
 		this.identify(instanceId, userId, versionCli);
 
 		this.flushPageEvents();
-		this.track('Session started', { session_id: rootStore.sessionId });
+		this.track('Session started', { session_id: rootStore.pushRef });
 	}
 
 	identify(instanceId: string, userId?: string, versionCli?: string) {
-		const traits = { instance_id: instanceId, version_cli: versionCli };
+		const settingsStore = useSettingsStore();
+		const traits: { instance_id: string; version_cli?: string; user_cloud_id?: string } = {
+			instance_id: instanceId,
+			version_cli: versionCli,
+		};
+
+		if (settingsStore.isCloudDeployment) {
+			traits.user_cloud_id = settingsStore.settings?.n8nMetadata?.userId ?? '';
+		}
 		if (userId) {
 			this.rudderStack.identify(`${instanceId}#${userId}`, traits);
 		} else {
@@ -78,7 +96,11 @@ export class Telemetry {
 		}
 	}
 
-	track(event: string, properties?: ITelemetryTrackProperties) {
+	track(
+		event: string,
+		properties?: ITelemetryTrackProperties,
+		options: { withPostHog?: boolean } = {},
+	) {
 		if (!this.rudderStack) return;
 
 		const updatedProperties = {
@@ -87,6 +109,10 @@ export class Telemetry {
 		};
 
 		this.rudderStack.track(event, updatedProperties);
+
+		if (options.withPostHog) {
+			usePostHog().capture(event, updatedProperties);
+		}
 	}
 
 	page(route: Route) {
@@ -99,17 +125,14 @@ export class Telemetry {
 
 			const pageName = route.name;
 			let properties: { [key: string]: string } = {};
-			if (
-				route.meta &&
-				route.meta.telemetry &&
-				typeof route.meta.telemetry.getProperties === 'function'
-			) {
+			if (route.meta?.telemetry && typeof route.meta.telemetry.getProperties === 'function') {
 				properties = route.meta.telemetry.getProperties(route);
 			}
 
-			const category =
-				(route.meta && route.meta.telemetry && route.meta.telemetry.pageCategory) || 'Editor';
-			this.rudderStack.page(category, pageName!, properties);
+			properties.theme = useUIStore().appliedTheme;
+
+			const category = route.meta?.telemetry?.pageCategory || 'Editor';
+			this.rudderStack.page(category, pageName, properties);
 		} else {
 			this.pageEventQueue.push({
 				route,
@@ -125,21 +148,31 @@ export class Telemetry {
 		});
 	}
 
+	trackAskAI(event: string, properties: IDataObject = {}) {
+		if (this.rudderStack) {
+			properties.session_id = useRootStore().pushRef;
+			properties.ndv_session_id = useNDVStore().pushRef;
+
+			switch (event) {
+				case 'askAi.generationFinished':
+					this.track('Ai code generation finished', properties, { withPostHog: true });
+				default:
+					break;
+			}
+		}
+	}
+
 	trackNodesPanel(event: string, properties: IDataObject = {}) {
 		if (this.rudderStack) {
-			properties.nodes_panel_session_id = this.userNodesPanelSession.sessionId;
+			properties.nodes_panel_session_id = this.userNodesPanelSession.pushRef;
 			switch (event) {
 				case 'nodeView.createNodeActiveChanged':
 					if (properties.createNodeActive !== false) {
 						this.resetNodesPanelSession();
-						properties.nodes_panel_session_id = this.userNodesPanelSession.sessionId;
+						properties.nodes_panel_session_id = this.userNodesPanelSession.pushRef;
 						this.track('User opened nodes panel', properties);
 					}
 					break;
-				case 'nodeCreateList.selectedTypeChanged':
-					this.userNodesPanelSession.data.filterMode = properties.new_filter as string;
-					this.track('User changed nodes panel filter', properties);
-					break;
 				case 'nodeCreateList.destroyed':
 					if (
 						this.userNodesPanelSession.data.nodeFilter.length > 0 &&
@@ -167,33 +200,30 @@ export class Telemetry {
 					break;
 				case 'nodeCreateList.onCategoryExpanded':
 					properties.is_subcategory = false;
-					properties.nodes_panel_session_id = this.userNodesPanelSession.sessionId;
+					properties.nodes_panel_session_id = this.userNodesPanelSession.pushRef;
 					this.track('User viewed node category', properties);
 					break;
 				case 'nodeCreateList.onViewActions':
-					properties.nodes_panel_session_id = this.userNodesPanelSession.sessionId;
+					properties.nodes_panel_session_id = this.userNodesPanelSession.pushRef;
 					this.track('User viewed node actions', properties);
 					break;
 				case 'nodeCreateList.onActionsCustmAPIClicked':
-					properties.nodes_panel_session_id = this.userNodesPanelSession.sessionId;
+					properties.nodes_panel_session_id = this.userNodesPanelSession.pushRef;
 					this.track('User clicked custom API from node actions', properties);
 					break;
 				case 'nodeCreateList.addAction':
-					properties.nodes_panel_session_id = this.userNodesPanelSession.sessionId;
+					properties.nodes_panel_session_id = this.userNodesPanelSession.pushRef;
 					this.track('User added action', properties);
 					break;
 				case 'nodeCreateList.onSubcategorySelected':
-					const selectedProperties = (properties.selected as IDataObject).properties as IDataObject;
-					if (selectedProperties && selectedProperties.subcategory) {
-						properties.category_name = selectedProperties.subcategory;
-					}
+					properties.category_name = properties.subcategory;
 					properties.is_subcategory = true;
-					properties.nodes_panel_session_id = this.userNodesPanelSession.sessionId;
+					properties.nodes_panel_session_id = this.userNodesPanelSession.pushRef;
 					delete properties.selected;
 					this.track('User viewed node category', properties);
 					break;
 				case 'nodeView.addNodeButton':
-					this.track('User added node to workflow canvas', properties);
+					this.track('User added node to workflow canvas', properties, { withPostHog: true });
 					break;
 				case 'nodeView.addSticky':
 					this.track('User inserted workflow note', properties);
@@ -204,8 +234,31 @@ export class Telemetry {
 		}
 	}
 
+	// We currently do not support tracking directly from within node implementation
+	// so we are using this method as centralized way to track node parameters changes
+	trackNodeParametersValuesChange(nodeType: string, change: IUpdateInformation) {
+		if (this.rudderStack) {
+			const changeNameMap: { [key: string]: string } = {
+				[SLACK_NODE_TYPE]: 'parameters.otherOptions.includeLinkToWorkflow',
+				[MICROSOFT_TEAMS_NODE_TYPE]: 'parameters.options.includeLinkToWorkflow',
+				[TELEGRAM_NODE_TYPE]: 'parameters.additionalFields.appendAttribution',
+			};
+			const changeName = changeNameMap[nodeType] || APPEND_ATTRIBUTION_DEFAULT_PATH;
+			if (change.name === changeName) {
+				this.track(
+					'User toggled n8n reference option',
+					{
+						node: nodeType,
+						toValue: change.value,
+					},
+					{ withPostHog: true },
+				);
+			}
+		}
+	}
+
 	private resetNodesPanelSession() {
-		this.userNodesPanelSession.sessionId = `nodes_panel_session_${new Date().valueOf()}`;
+		this.userNodesPanelSession.pushRef = `nodes_panel_session_${new Date().valueOf()}`;
 		this.userNodesPanelSession.data = {
 			nodeFilter: '',
 			resultsNodes: [],
@@ -218,7 +271,7 @@ export class Telemetry {
 			search_string: this.userNodesPanelSession.data.nodeFilter,
 			results_count: this.userNodesPanelSession.data.resultsNodes.length,
 			filter_mode: this.userNodesPanelSession.data.filterMode,
-			nodes_panel_session_id: this.userNodesPanelSession.sessionId,
+			nodes_panel_session_id: this.userNodesPanelSession.pushRef,
 		};
 	}
 
@@ -272,15 +325,8 @@ export class Telemetry {
 
 export const telemetry = new Telemetry();
 
-export function TelemetryPlugin(vue: typeof _Vue): void {
-	Object.defineProperty(vue, '$telemetry', {
-		get() {
-			return telemetry;
-		},
-	});
-	Object.defineProperty(vue.prototype, '$telemetry', {
-		get() {
-			return telemetry;
-		},
-	});
-}
+export const TelemetryPlugin: Plugin<{}> = {
+	install(app) {
+		app.config.globalProperties.$telemetry = telemetry;
+	},
+};
diff --git a/packages/editor-ui/src/plugins/telemetry/telemetry.types.ts b/packages/editor-ui/src/plugins/telemetry/telemetry.types.ts
index 960875d920311..4e4e083c7431f 100644
--- a/packages/editor-ui/src/plugins/telemetry/telemetry.types.ts
+++ b/packages/editor-ui/src/plugins/telemetry/telemetry.types.ts
@@ -1,11 +1,3 @@
-import type { Telemetry } from '.';
-
-declare module 'vue/types/vue' {
-	interface Vue {
-		$telemetry: Telemetry;
-	}
-}
-
 declare global {
 	interface Window {
 		rudderanalytics: RudderStack;
@@ -13,7 +5,7 @@ declare global {
 }
 
 export interface IUserNodesPanelSession {
-	sessionId: string;
+	pushRef: string;
 	data: IUserNodesPanelSessionData;
 }
 
@@ -60,3 +52,5 @@ interface RudderStack extends Array<unknown> {
 
 	reset(): void;
 }
+
+export {};
diff --git a/packages/editor-ui/src/rbac/__tests__/permissions.test.ts b/packages/editor-ui/src/rbac/__tests__/permissions.test.ts
new file mode 100644
index 0000000000000..01ff6b9bf1bd6
--- /dev/null
+++ b/packages/editor-ui/src/rbac/__tests__/permissions.test.ts
@@ -0,0 +1,76 @@
+import { hasPermission } from '@/rbac/permissions';
+import * as checks from '@/rbac/checks';
+
+vi.mock('@/rbac/checks', () => ({
+	hasRole: vi.fn(),
+	hasScope: vi.fn(),
+	isGuest: vi.fn(),
+	isDefaultUser: vi.fn(),
+	isInstanceOwner: vi.fn(),
+	isAuthenticated: vi.fn(),
+	isEnterpriseFeatureEnabled: vi.fn(),
+	isValid: vi.fn(),
+}));
+
+describe('hasPermission()', () => {
+	it('should return true if all permissions are valid', () => {
+		vi.mocked(checks.hasRole).mockReturnValue(true);
+		vi.mocked(checks.hasScope).mockReturnValue(true);
+		vi.mocked(checks.isGuest).mockReturnValue(true);
+		vi.mocked(checks.isDefaultUser).mockReturnValue(true);
+		vi.mocked(checks.isInstanceOwner).mockReturnValue(true);
+		vi.mocked(checks.isAuthenticated).mockReturnValue(true);
+		vi.mocked(checks.isEnterpriseFeatureEnabled).mockReturnValue(true);
+		vi.mocked(checks.isValid).mockReturnValue(true);
+
+		expect(
+			hasPermission([
+				'authenticated',
+				'custom',
+				'enterprise',
+				'guest',
+				'rbac',
+				'role',
+				'defaultUser',
+				'instanceOwner',
+			]),
+		).toBe(true);
+	});
+
+	it('should return false if any permission is invalid', () => {
+		vi.mocked(checks.hasRole).mockReturnValue(true);
+		vi.mocked(checks.isGuest).mockReturnValue(true);
+		vi.mocked(checks.isAuthenticated).mockReturnValue(true);
+		vi.mocked(checks.isEnterpriseFeatureEnabled).mockReturnValue(true);
+		vi.mocked(checks.isValid).mockReturnValue(true);
+
+		vi.mocked(checks.hasScope).mockReturnValue(false);
+
+		expect(hasPermission(['authenticated', 'custom', 'enterprise', 'guest', 'rbac', 'role'])).toBe(
+			false,
+		);
+	});
+
+	it('should return true for a specific valid permission', () => {
+		vi.mocked(checks.isAuthenticated).mockReturnValue(true);
+
+		expect(hasPermission(['authenticated'])).toBe(true);
+	});
+
+	it('should return false for a specific invalid permission', () => {
+		vi.mocked(checks.isGuest).mockReturnValue(false);
+
+		expect(hasPermission(['guest'])).toBe(false);
+	});
+
+	it('should call permission function with given permission options', () => {
+		const customFn = () => true;
+		vi.mocked(checks.isValid).mockReturnValue(true);
+
+		hasPermission(['custom'], {
+			custom: customFn,
+		});
+
+		expect(checks.isValid).toHaveBeenCalledWith(customFn);
+	});
+});
diff --git a/packages/editor-ui/src/rbac/checks/__tests__/hasRole.test.ts b/packages/editor-ui/src/rbac/checks/__tests__/hasRole.test.ts
new file mode 100644
index 0000000000000..5e7ff0a4152fc
--- /dev/null
+++ b/packages/editor-ui/src/rbac/checks/__tests__/hasRole.test.ts
@@ -0,0 +1,51 @@
+import { useUsersStore } from '@/stores/users.store';
+import { hasRole } from '@/rbac/checks';
+import { ROLE } from '@/constants';
+
+vi.mock('@/stores/users.store', () => ({
+	useUsersStore: vi.fn(),
+}));
+
+describe('Checks', () => {
+	describe('hasRole', () => {
+		it('should return true if the user has the specified role', () => {
+			vi.mocked(useUsersStore).mockReturnValue({
+				currentUser: {
+					isDefaultUser: false,
+					role: ROLE.Owner,
+				},
+			} as ReturnType<typeof useUsersStore>);
+
+			expect(hasRole([ROLE.Owner])).toBe(true);
+		});
+
+		it('should return false if the user does not have the specified role', () => {
+			vi.mocked(useUsersStore).mockReturnValue({
+				currentUser: {
+					isDefaultUser: false,
+					role: 'global:member',
+				},
+			} as ReturnType<typeof useUsersStore>);
+
+			expect(hasRole([ROLE.Owner])).toBe(false);
+		});
+
+		it('should return true for default user if checking for default role', () => {
+			vi.mocked(useUsersStore).mockReturnValue({
+				currentUser: {
+					isDefaultUser: true,
+				},
+			} as ReturnType<typeof useUsersStore>);
+
+			expect(hasRole([ROLE.Default])).toBe(true);
+		});
+
+		it('should return false if there is no current user', () => {
+			vi.mocked(useUsersStore).mockReturnValue({ currentUser: null } as ReturnType<
+				typeof useUsersStore
+			>);
+
+			expect(hasRole([ROLE.Owner])).toBe(false);
+		});
+	});
+});
diff --git a/packages/editor-ui/src/rbac/checks/__tests__/hasScope.test.ts b/packages/editor-ui/src/rbac/checks/__tests__/hasScope.test.ts
new file mode 100644
index 0000000000000..bf33c75e5609d
--- /dev/null
+++ b/packages/editor-ui/src/rbac/checks/__tests__/hasScope.test.ts
@@ -0,0 +1,54 @@
+import { useRBACStore } from '@/stores/rbac.store';
+import { hasScope } from '@/rbac/checks/hasScope';
+import type { ScopeOptions } from '@n8n/permissions';
+
+vi.mock('@/stores/rbac.store', () => ({
+	useRBACStore: vi.fn(),
+}));
+
+describe('Checks', () => {
+	describe('hasScope()', () => {
+		it('should return true if no scope is provided', () => {
+			expect(hasScope({})).toBe(true);
+		});
+
+		it('should call rbacStore.hasScope with the correct parameters', () => {
+			const mockHasScope = vi.fn().mockReturnValue(true);
+			vi.mocked(useRBACStore).mockReturnValue({
+				hasScope: mockHasScope,
+			} as unknown as ReturnType<typeof useRBACStore>);
+
+			const scope = 'workflow:read';
+			const options: ScopeOptions = { mode: 'allOf' };
+			const projectId = 'proj123';
+			const resourceType = 'workflow';
+			const resourceId = 'res123';
+
+			hasScope({ scope, options, projectId, resourceType, resourceId });
+
+			expect(mockHasScope).toHaveBeenCalledWith(
+				scope,
+				{ projectId, resourceType, resourceId },
+				options,
+			);
+		});
+
+		it('should return true if rbacStore.hasScope returns true', () => {
+			const mockHasScope = vi.fn().mockReturnValue(true);
+			vi.mocked(useRBACStore).mockReturnValue({ hasScope: mockHasScope } as unknown as ReturnType<
+				typeof useRBACStore
+			>);
+
+			expect(hasScope({ scope: 'workflow:read' })).toBe(true);
+		});
+
+		it('should return false if rbacStore.hasScope returns false', () => {
+			const mockHasScope = vi.fn().mockReturnValue(false);
+			vi.mocked(useRBACStore).mockReturnValue({ hasScope: mockHasScope } as unknown as ReturnType<
+				typeof useRBACStore
+			>);
+
+			expect(hasScope({ scope: 'workflow:read' })).toBe(false);
+		});
+	});
+});
diff --git a/packages/editor-ui/src/rbac/checks/__tests__/isAuthenticated.test.ts b/packages/editor-ui/src/rbac/checks/__tests__/isAuthenticated.test.ts
new file mode 100644
index 0000000000000..b38cb1d35bde7
--- /dev/null
+++ b/packages/editor-ui/src/rbac/checks/__tests__/isAuthenticated.test.ts
@@ -0,0 +1,52 @@
+import { useUsersStore } from '@/stores/users.store';
+import { isAuthenticated } from '@/rbac/checks/isAuthenticated';
+
+vi.mock('@/stores/users.store', () => ({
+	useUsersStore: vi.fn(),
+}));
+
+describe('Checks', () => {
+	describe('isAuthenticated()', () => {
+		const mockUser = { id: 'user123', name: 'Test User' };
+
+		it('should return true if there is a current user', () => {
+			vi.mocked(useUsersStore).mockReturnValue({ currentUser: mockUser } as unknown as ReturnType<
+				typeof useUsersStore
+			>);
+
+			expect(isAuthenticated()).toBe(true);
+		});
+
+		it('should return false if there is no current user', () => {
+			vi.mocked(useUsersStore).mockReturnValue({ currentUser: null } as ReturnType<
+				typeof useUsersStore
+			>);
+
+			expect(isAuthenticated()).toBe(false);
+		});
+
+		it('should return true if there is a current user and bypass returns false', () => {
+			vi.mocked(useUsersStore).mockReturnValue({ currentUser: mockUser } as ReturnType<
+				typeof useUsersStore
+			>);
+
+			expect(isAuthenticated({ bypass: () => false })).toBe(true);
+		});
+
+		it('should return true if there is no current user and bypass returns true', () => {
+			vi.mocked(useUsersStore).mockReturnValue({ currentUser: null } as ReturnType<
+				typeof useUsersStore
+			>);
+
+			expect(isAuthenticated({ bypass: () => true })).toBe(true);
+		});
+
+		it('should return false if there is no current user and bypass returns false', () => {
+			vi.mocked(useUsersStore).mockReturnValue({ currentUser: null } as ReturnType<
+				typeof useUsersStore
+			>);
+
+			expect(isAuthenticated({ bypass: () => false })).toBe(false);
+		});
+	});
+});
diff --git a/packages/editor-ui/src/rbac/checks/__tests__/isDefaultUser.test.ts b/packages/editor-ui/src/rbac/checks/__tests__/isDefaultUser.test.ts
new file mode 100644
index 0000000000000..815c0217683ca
--- /dev/null
+++ b/packages/editor-ui/src/rbac/checks/__tests__/isDefaultUser.test.ts
@@ -0,0 +1,27 @@
+import { useUsersStore } from '@/stores/users.store';
+import { isDefaultUser } from '@/rbac/checks/isDefaultUser';
+
+vi.mock('@/stores/users.store', () => ({
+	useUsersStore: vi.fn(),
+}));
+
+describe('Checks', () => {
+	describe('isDefaultUser()', () => {
+		it('should return false if user not logged in', () => {
+			vi.mocked(useUsersStore).mockReturnValue({ currentUser: null } as ReturnType<
+				typeof useUsersStore
+			>);
+
+			expect(isDefaultUser()).toBe(false);
+		});
+
+		it('should return true if user is default user', () => {
+			const mockUser = { id: 'user123', name: 'Test User', isDefaultUser: true };
+			vi.mocked(useUsersStore).mockReturnValue({ currentUser: mockUser } as unknown as ReturnType<
+				typeof useUsersStore
+			>);
+
+			expect(isDefaultUser()).toBe(mockUser.isDefaultUser);
+		});
+	});
+});
diff --git a/packages/editor-ui/src/rbac/checks/__tests__/isEnterpriseFeatureEnabled.test.ts b/packages/editor-ui/src/rbac/checks/__tests__/isEnterpriseFeatureEnabled.test.ts
new file mode 100644
index 0000000000000..9de45f6bd6b18
--- /dev/null
+++ b/packages/editor-ui/src/rbac/checks/__tests__/isEnterpriseFeatureEnabled.test.ts
@@ -0,0 +1,87 @@
+import { useSettingsStore } from '@/stores/settings.store';
+import { isEnterpriseFeatureEnabled } from '@/rbac/checks/isEnterpriseFeatureEnabled';
+import { EnterpriseEditionFeature } from '@/constants';
+
+vi.mock('@/stores/settings.store', () => ({
+	useSettingsStore: vi.fn(),
+}));
+
+describe('Checks', () => {
+	describe('isEnterpriseFeatureEnabled()', () => {
+		it('should return true if no feature is provided', () => {
+			expect(isEnterpriseFeatureEnabled({})).toBe(true);
+		});
+
+		it('should return true if feature is enabled', () => {
+			vi.mocked(useSettingsStore).mockReturnValue({
+				isEnterpriseFeatureEnabled: vi
+					.fn()
+					.mockImplementation((feature) => feature !== EnterpriseEditionFeature.Variables),
+			} as unknown as ReturnType<typeof useSettingsStore>);
+
+			expect(
+				isEnterpriseFeatureEnabled({
+					feature: EnterpriseEditionFeature.Saml,
+				}),
+			).toBe(true);
+		});
+
+		it('should return true if all features are enabled in allOf mode', () => {
+			vi.mocked(useSettingsStore).mockReturnValue({
+				isEnterpriseFeatureEnabled: vi
+					.fn()
+					.mockImplementation((feature) => feature !== EnterpriseEditionFeature.Variables),
+			} as unknown as ReturnType<typeof useSettingsStore>);
+
+			expect(
+				isEnterpriseFeatureEnabled({
+					feature: [EnterpriseEditionFeature.Ldap, EnterpriseEditionFeature.Saml],
+					mode: 'allOf',
+				}),
+			).toBe(true);
+		});
+
+		it('should return false if any feature is not enabled in allOf mode', () => {
+			vi.mocked(useSettingsStore).mockReturnValue({
+				isEnterpriseFeatureEnabled: vi
+					.fn()
+					.mockImplementation((feature) => feature !== EnterpriseEditionFeature.Saml),
+			} as unknown as ReturnType<typeof useSettingsStore>);
+
+			expect(
+				isEnterpriseFeatureEnabled({
+					feature: [EnterpriseEditionFeature.Ldap, EnterpriseEditionFeature.Saml],
+					mode: 'allOf',
+				}),
+			).toBe(false);
+		});
+
+		it('should return true if any feature is enabled in oneOf mode', () => {
+			vi.mocked(useSettingsStore).mockReturnValue({
+				isEnterpriseFeatureEnabled: vi
+					.fn()
+					.mockImplementation((feature) => feature === EnterpriseEditionFeature.Ldap),
+			} as unknown as ReturnType<typeof useSettingsStore>);
+
+			expect(
+				isEnterpriseFeatureEnabled({
+					feature: [EnterpriseEditionFeature.Ldap, EnterpriseEditionFeature.Saml],
+					mode: 'oneOf',
+				}),
+			).toBe(true);
+		});
+
+		it('should return false if no features are enabled in anyOf mode', () => {
+			vi.mocked(useSettingsStore).mockReturnValue({
+				isEnterpriseFeatureEnabled: vi.fn().mockReturnValue(false),
+			} as unknown as ReturnType<typeof useSettingsStore>);
+
+			expect(
+				isEnterpriseFeatureEnabled({
+					feature: [EnterpriseEditionFeature.Ldap, EnterpriseEditionFeature.Saml],
+					mode: 'oneOf',
+				}),
+			).toBe(false);
+		});
+	});
+});
diff --git a/packages/editor-ui/src/rbac/checks/__tests__/isGuest.test.ts b/packages/editor-ui/src/rbac/checks/__tests__/isGuest.test.ts
new file mode 100644
index 0000000000000..8f539ded62191
--- /dev/null
+++ b/packages/editor-ui/src/rbac/checks/__tests__/isGuest.test.ts
@@ -0,0 +1,27 @@
+import { useUsersStore } from '@/stores/users.store';
+import { isGuest } from '@/rbac/checks/isGuest';
+
+vi.mock('@/stores/users.store', () => ({
+	useUsersStore: vi.fn(),
+}));
+
+describe('Checks', () => {
+	describe('isGuest()', () => {
+		it('should return false if there is a current user', () => {
+			const mockUser = { id: 'user123', name: 'Test User' };
+			vi.mocked(useUsersStore).mockReturnValue({ currentUser: mockUser } as unknown as ReturnType<
+				typeof useUsersStore
+			>);
+
+			expect(isGuest()).toBe(false);
+		});
+
+		it('should return true if there is no current user', () => {
+			vi.mocked(useUsersStore).mockReturnValue({ currentUser: null } as ReturnType<
+				typeof useUsersStore
+			>);
+
+			expect(isGuest()).toBe(true);
+		});
+	});
+});
diff --git a/packages/editor-ui/src/rbac/checks/__tests__/isInstanceOwner.test.ts b/packages/editor-ui/src/rbac/checks/__tests__/isInstanceOwner.test.ts
new file mode 100644
index 0000000000000..b63e55bb06718
--- /dev/null
+++ b/packages/editor-ui/src/rbac/checks/__tests__/isInstanceOwner.test.ts
@@ -0,0 +1,26 @@
+import { useUsersStore } from '@/stores/users.store';
+import { isInstanceOwner } from '@/rbac/checks/isInstanceOwner';
+
+vi.mock('@/stores/users.store', () => ({
+	useUsersStore: vi.fn(),
+}));
+
+describe('Checks', () => {
+	describe('isInstanceOwner()', () => {
+		it('should return false if user not logged in', () => {
+			vi.mocked(useUsersStore).mockReturnValue({ isInstanceOwner: false } as ReturnType<
+				typeof useUsersStore
+			>);
+
+			expect(isInstanceOwner()).toBe(false);
+		});
+
+		it('should return true if user is default user', () => {
+			vi.mocked(useUsersStore).mockReturnValue({ isInstanceOwner: true } as unknown as ReturnType<
+				typeof useUsersStore
+			>);
+
+			expect(isInstanceOwner()).toBe(true);
+		});
+	});
+});
diff --git a/packages/editor-ui/src/rbac/checks/__tests__/isValid.test.ts b/packages/editor-ui/src/rbac/checks/__tests__/isValid.test.ts
new file mode 100644
index 0000000000000..644f816330078
--- /dev/null
+++ b/packages/editor-ui/src/rbac/checks/__tests__/isValid.test.ts
@@ -0,0 +1,19 @@
+import { isValid } from '@/rbac/checks/isValid';
+
+describe('Checks', () => {
+	describe('isValid()', () => {
+		it('should return true if the provided function returns true', () => {
+			const mockFn = () => true;
+			expect(isValid(mockFn)).toBe(true);
+		});
+
+		it('should return false if the provided function returns false', () => {
+			const mockFn = () => false;
+			expect(isValid(mockFn)).toBe(false);
+		});
+
+		it('should return false if no function is provided', () => {
+			expect(isValid(undefined)).toBe(false);
+		});
+	});
+});
diff --git a/packages/editor-ui/src/rbac/checks/hasRole.ts b/packages/editor-ui/src/rbac/checks/hasRole.ts
new file mode 100644
index 0000000000000..f9590026e77de
--- /dev/null
+++ b/packages/editor-ui/src/rbac/checks/hasRole.ts
@@ -0,0 +1,16 @@
+import { useUsersStore } from '@/stores/users.store';
+import type { RBACPermissionCheck, RolePermissionOptions } from '@/types/rbac';
+import { ROLE } from '@/constants';
+import type { IRole } from '@/Interface';
+
+export const hasRole: RBACPermissionCheck<RolePermissionOptions> = (checkRoles) => {
+	const usersStore = useUsersStore();
+	const currentUser = usersStore.currentUser;
+
+	if (currentUser && checkRoles) {
+		const userRole = currentUser.isDefaultUser ? ROLE.Default : currentUser.role;
+		return checkRoles.includes(userRole as IRole);
+	}
+
+	return false;
+};
diff --git a/packages/editor-ui/src/rbac/checks/hasScope.ts b/packages/editor-ui/src/rbac/checks/hasScope.ts
new file mode 100644
index 0000000000000..60ba995de050f
--- /dev/null
+++ b/packages/editor-ui/src/rbac/checks/hasScope.ts
@@ -0,0 +1,20 @@
+import { useRBACStore } from '@/stores/rbac.store';
+import type { RBACPermissionCheck, RBACPermissionOptions } from '@/types/rbac';
+
+export const hasScope: RBACPermissionCheck<RBACPermissionOptions> = (opts) => {
+	if (!opts?.scope) {
+		return true;
+	}
+	const { projectId, resourceType, resourceId, scope, options } = opts;
+
+	const rbacStore = useRBACStore();
+	return rbacStore.hasScope(
+		scope,
+		{
+			projectId,
+			resourceType,
+			resourceId,
+		},
+		options,
+	);
+};
diff --git a/packages/editor-ui/src/rbac/checks/index.ts b/packages/editor-ui/src/rbac/checks/index.ts
new file mode 100644
index 0000000000000..a6f6f580f4480
--- /dev/null
+++ b/packages/editor-ui/src/rbac/checks/index.ts
@@ -0,0 +1,8 @@
+export * from './hasRole';
+export * from './hasScope';
+export * from './isAuthenticated';
+export * from './isDefaultUser';
+export * from './isInstanceOwner';
+export * from './isEnterpriseFeatureEnabled';
+export * from './isGuest';
+export * from './isValid';
diff --git a/packages/editor-ui/src/rbac/checks/isAuthenticated.ts b/packages/editor-ui/src/rbac/checks/isAuthenticated.ts
new file mode 100644
index 0000000000000..4cbdd4cf18ec5
--- /dev/null
+++ b/packages/editor-ui/src/rbac/checks/isAuthenticated.ts
@@ -0,0 +1,11 @@
+import { useUsersStore } from '@/stores/users.store';
+import type { RBACPermissionCheck, AuthenticatedPermissionOptions } from '@/types/rbac';
+
+export const isAuthenticated: RBACPermissionCheck<AuthenticatedPermissionOptions> = (options) => {
+	if (options?.bypass?.()) {
+		return true;
+	}
+
+	const usersStore = useUsersStore();
+	return !!usersStore.currentUser;
+};
diff --git a/packages/editor-ui/src/rbac/checks/isDefaultUser.ts b/packages/editor-ui/src/rbac/checks/isDefaultUser.ts
new file mode 100644
index 0000000000000..f0f812df69c86
--- /dev/null
+++ b/packages/editor-ui/src/rbac/checks/isDefaultUser.ts
@@ -0,0 +1,12 @@
+import { useUsersStore } from '@/stores/users.store';
+import type { DefaultUserMiddlewareOptions, RBACPermissionCheck } from '@/types/rbac';
+
+export const isDefaultUser: RBACPermissionCheck<DefaultUserMiddlewareOptions> = () => {
+	const usersStore = useUsersStore();
+	const currentUser = usersStore.currentUser;
+
+	if (currentUser) {
+		return currentUser.isDefaultUser;
+	}
+	return false;
+};
diff --git a/packages/editor-ui/src/rbac/checks/isEnterpriseFeatureEnabled.ts b/packages/editor-ui/src/rbac/checks/isEnterpriseFeatureEnabled.ts
new file mode 100644
index 0000000000000..652e7ec0beab8
--- /dev/null
+++ b/packages/editor-ui/src/rbac/checks/isEnterpriseFeatureEnabled.ts
@@ -0,0 +1,19 @@
+import { useSettingsStore } from '@/stores/settings.store';
+import type { RBACPermissionCheck, EnterprisePermissionOptions } from '@/types/rbac';
+
+export const isEnterpriseFeatureEnabled: RBACPermissionCheck<EnterprisePermissionOptions> = (
+	options,
+) => {
+	if (!options?.feature) {
+		return true;
+	}
+
+	const features = Array.isArray(options.feature) ? options.feature : [options.feature];
+	const settingsStore = useSettingsStore();
+	const mode = options.mode ?? 'allOf';
+	if (mode === 'allOf') {
+		return features.every(settingsStore.isEnterpriseFeatureEnabled);
+	} else {
+		return features.some(settingsStore.isEnterpriseFeatureEnabled);
+	}
+};
diff --git a/packages/editor-ui/src/rbac/checks/isGuest.ts b/packages/editor-ui/src/rbac/checks/isGuest.ts
new file mode 100644
index 0000000000000..d3de02a37d174
--- /dev/null
+++ b/packages/editor-ui/src/rbac/checks/isGuest.ts
@@ -0,0 +1,7 @@
+import { useUsersStore } from '@/stores/users.store';
+import type { RBACPermissionCheck, GuestPermissionOptions } from '@/types/rbac';
+
+export const isGuest: RBACPermissionCheck<GuestPermissionOptions> = () => {
+	const usersStore = useUsersStore();
+	return !usersStore.currentUser;
+};
diff --git a/packages/editor-ui/src/rbac/checks/isInstanceOwner.ts b/packages/editor-ui/src/rbac/checks/isInstanceOwner.ts
new file mode 100644
index 0000000000000..fe52d9933abe3
--- /dev/null
+++ b/packages/editor-ui/src/rbac/checks/isInstanceOwner.ts
@@ -0,0 +1,5 @@
+import { useUsersStore } from '@/stores/users.store';
+import type { DefaultUserMiddlewareOptions, RBACPermissionCheck } from '@/types/rbac';
+
+export const isInstanceOwner: RBACPermissionCheck<DefaultUserMiddlewareOptions> = () =>
+	useUsersStore().isInstanceOwner;
diff --git a/packages/editor-ui/src/rbac/checks/isValid.ts b/packages/editor-ui/src/rbac/checks/isValid.ts
new file mode 100644
index 0000000000000..35b1244ab1fe5
--- /dev/null
+++ b/packages/editor-ui/src/rbac/checks/isValid.ts
@@ -0,0 +1,5 @@
+import type { RBACPermissionCheck, CustomPermissionOptions } from '@/types/rbac';
+
+export const isValid: RBACPermissionCheck<CustomPermissionOptions> = (fn) => {
+	return fn ? fn() : false;
+};
diff --git a/packages/editor-ui/src/rbac/middleware.ts b/packages/editor-ui/src/rbac/middleware.ts
new file mode 100644
index 0000000000000..e6805b381338d
--- /dev/null
+++ b/packages/editor-ui/src/rbac/middleware.ts
@@ -0,0 +1,22 @@
+import type { RouterMiddleware, RouterMiddlewareType, MiddlewareOptions } from '@/types/router';
+import { authenticatedMiddleware } from '@/rbac/middleware/authenticated';
+import { enterpriseMiddleware } from '@/rbac/middleware/enterprise';
+import { guestMiddleware } from '@/rbac/middleware/guest';
+import { rbacMiddleware } from '@/rbac/middleware/rbac';
+import { roleMiddleware } from '@/rbac/middleware/role';
+import { customMiddleware } from '@/rbac/middleware/custom';
+import { defaultUserMiddleware } from '@/rbac/middleware/defaultUser';
+
+type Middleware = {
+	[key in RouterMiddlewareType]: RouterMiddleware<MiddlewareOptions[key]>;
+};
+
+export const middleware: Middleware = {
+	authenticated: authenticatedMiddleware,
+	custom: customMiddleware,
+	defaultUser: defaultUserMiddleware,
+	enterprise: enterpriseMiddleware,
+	guest: guestMiddleware,
+	rbac: rbacMiddleware,
+	role: roleMiddleware,
+};
diff --git a/packages/editor-ui/src/rbac/middleware/__tests__/authenticated.test.ts b/packages/editor-ui/src/rbac/middleware/__tests__/authenticated.test.ts
new file mode 100644
index 0000000000000..50a9320c1cfd9
--- /dev/null
+++ b/packages/editor-ui/src/rbac/middleware/__tests__/authenticated.test.ts
@@ -0,0 +1,60 @@
+import { authenticatedMiddleware } from '@/rbac/middleware/authenticated';
+import { useUsersStore } from '@/stores/users.store';
+import { VIEWS } from '@/constants';
+import type { RouteLocationNormalized } from 'vue-router';
+
+vi.mock('@/stores/users.store', () => ({
+	useUsersStore: vi.fn(),
+}));
+
+describe('Middleware', () => {
+	describe('authenticated', () => {
+		it('should redirect to signin if no current user is present', async () => {
+			vi.mocked(useUsersStore).mockReturnValue({ currentUser: null } as ReturnType<
+				typeof useUsersStore
+			>);
+
+			const nextMock = vi.fn();
+			const toMock = { query: {} } as RouteLocationNormalized;
+			const fromMock = {} as RouteLocationNormalized;
+
+			await authenticatedMiddleware(toMock, fromMock, nextMock, {});
+
+			expect(nextMock).toHaveBeenCalledWith({
+				name: VIEWS.SIGNIN,
+				query: { redirect: encodeURIComponent('/') },
+			});
+		});
+
+		it('should call next with the correct redirect query if present', async () => {
+			vi.mocked(useUsersStore).mockReturnValue({ currentUser: null } as ReturnType<
+				typeof useUsersStore
+			>);
+
+			const nextMock = vi.fn();
+			const toMock = { query: { redirect: '/' } } as unknown as RouteLocationNormalized;
+			const fromMock = {} as RouteLocationNormalized;
+
+			await authenticatedMiddleware(toMock, fromMock, nextMock, {});
+
+			expect(nextMock).toHaveBeenCalledWith({
+				name: VIEWS.SIGNIN,
+				query: { redirect: '/' },
+			});
+		});
+
+		it('should allow navigation if a current user is present', async () => {
+			vi.mocked(useUsersStore).mockReturnValue({ currentUser: { id: '123' } } as ReturnType<
+				typeof useUsersStore
+			>);
+
+			const nextMock = vi.fn();
+			const toMock = { query: {} } as RouteLocationNormalized;
+			const fromMock = {} as RouteLocationNormalized;
+
+			await authenticatedMiddleware(toMock, fromMock, nextMock, {});
+
+			expect(nextMock).not.toHaveBeenCalled();
+		});
+	});
+});
diff --git a/packages/editor-ui/src/rbac/middleware/__tests__/custom.test.ts b/packages/editor-ui/src/rbac/middleware/__tests__/custom.test.ts
new file mode 100644
index 0000000000000..54960ba037c90
--- /dev/null
+++ b/packages/editor-ui/src/rbac/middleware/__tests__/custom.test.ts
@@ -0,0 +1,35 @@
+import { customMiddleware } from '@/rbac/middleware/custom';
+import type { RouteLocationNormalized } from 'vue-router';
+import { VIEWS } from '@/constants';
+
+describe('Middleware', () => {
+	describe('custom', () => {
+		it('should redirect to homepage if validation function returns false', async () => {
+			const nextMock = vi.fn();
+			const fn = () => false;
+
+			await customMiddleware(
+				{} as RouteLocationNormalized,
+				{} as RouteLocationNormalized,
+				nextMock,
+				fn,
+			);
+
+			expect(nextMock).toHaveBeenCalledWith({ name: VIEWS.HOMEPAGE });
+		});
+
+		it('should pass if validation function returns true', async () => {
+			const nextMock = vi.fn();
+			const fn = () => true;
+
+			await customMiddleware(
+				{} as RouteLocationNormalized,
+				{} as RouteLocationNormalized,
+				nextMock,
+				fn,
+			);
+
+			expect(nextMock).not.toHaveBeenCalled();
+		});
+	});
+});
diff --git a/packages/editor-ui/src/rbac/middleware/__tests__/defaultUser.test.ts b/packages/editor-ui/src/rbac/middleware/__tests__/defaultUser.test.ts
new file mode 100644
index 0000000000000..d550dd9fe0b94
--- /dev/null
+++ b/packages/editor-ui/src/rbac/middleware/__tests__/defaultUser.test.ts
@@ -0,0 +1,54 @@
+import { useUsersStore } from '@/stores/users.store';
+import { VIEWS } from '@/constants';
+import { defaultUserMiddleware } from '@/rbac/middleware/defaultUser';
+import type { RouteLocationNormalized } from 'vue-router';
+
+vi.mock('@/stores/users.store', () => ({
+	useUsersStore: vi.fn(),
+}));
+
+describe('Middleware', () => {
+	describe('defaultUser', () => {
+		it('should redirect to homepage if user not logged in', async () => {
+			vi.mocked(useUsersStore).mockReturnValue({
+				currentUser: null,
+			} as ReturnType<typeof useUsersStore>);
+
+			const nextMock = vi.fn();
+			const toMock = { query: {} } as RouteLocationNormalized;
+			const fromMock = {} as RouteLocationNormalized;
+
+			await defaultUserMiddleware(toMock, fromMock, nextMock, {});
+
+			expect(nextMock).toHaveBeenCalledWith({ name: VIEWS.HOMEPAGE });
+		});
+
+		it('should redirect to homepage if user is not default user', async () => {
+			vi.mocked(useUsersStore).mockReturnValue({
+				currentUser: { id: '123', isDefaultUser: false },
+			} as ReturnType<typeof useUsersStore>);
+
+			const nextMock = vi.fn();
+			const toMock = { query: {} } as RouteLocationNormalized;
+			const fromMock = {} as RouteLocationNormalized;
+
+			await defaultUserMiddleware(toMock, fromMock, nextMock, {});
+
+			expect(nextMock).toHaveBeenCalledWith({ name: VIEWS.HOMEPAGE });
+		});
+
+		it('should allow navigation if a current user is present', async () => {
+			vi.mocked(useUsersStore).mockReturnValue({
+				currentUser: { id: '123', isDefaultUser: true },
+			} as ReturnType<typeof useUsersStore>);
+
+			const nextMock = vi.fn();
+			const toMock = { query: {} } as RouteLocationNormalized;
+			const fromMock = {} as RouteLocationNormalized;
+
+			await defaultUserMiddleware(toMock, fromMock, nextMock, {});
+
+			expect(nextMock).not.toHaveBeenCalled();
+		});
+	});
+});
diff --git a/packages/editor-ui/src/rbac/middleware/__tests__/enterprise.test.ts b/packages/editor-ui/src/rbac/middleware/__tests__/enterprise.test.ts
new file mode 100644
index 0000000000000..330e7aaa5e8cb
--- /dev/null
+++ b/packages/editor-ui/src/rbac/middleware/__tests__/enterprise.test.ts
@@ -0,0 +1,98 @@
+import { useSettingsStore } from '@/stores/settings.store';
+import { VIEWS, EnterpriseEditionFeature } from '@/constants';
+import { enterpriseMiddleware } from '@/rbac/middleware/enterprise';
+import { type RouteLocationNormalized } from 'vue-router';
+import type { EnterprisePermissionOptions } from '@/types/rbac';
+
+vi.mock('@/stores/settings.store', () => ({
+	useSettingsStore: vi.fn(),
+}));
+
+describe('Middleware', () => {
+	describe('enterprise', () => {
+		it('should redirect to homepage if none of the required features are enabled in allOf mode', async () => {
+			vi.mocked(useSettingsStore).mockReturnValue({
+				isEnterpriseFeatureEnabled: (_) => false,
+			} as ReturnType<typeof useSettingsStore>);
+
+			const nextMock = vi.fn();
+			const options: EnterprisePermissionOptions = {
+				feature: [EnterpriseEditionFeature.Saml, EnterpriseEditionFeature.Ldap],
+				mode: 'allOf',
+			};
+
+			await enterpriseMiddleware(
+				{} as RouteLocationNormalized,
+				{} as RouteLocationNormalized,
+				nextMock,
+				options,
+			);
+
+			expect(nextMock).toHaveBeenCalledWith({ name: VIEWS.HOMEPAGE });
+		});
+
+		it('should allow navigation if all of the required features are enabled in allOf mode', async () => {
+			vi.mocked(useSettingsStore).mockReturnValue({
+				isEnterpriseFeatureEnabled: (feature) =>
+					[EnterpriseEditionFeature.Saml, EnterpriseEditionFeature.Ldap].includes(feature),
+			} as ReturnType<typeof useSettingsStore>);
+
+			const nextMock = vi.fn();
+			const options: EnterprisePermissionOptions = {
+				feature: [EnterpriseEditionFeature.Saml, EnterpriseEditionFeature.Ldap],
+				mode: 'allOf',
+			};
+
+			await enterpriseMiddleware(
+				{} as RouteLocationNormalized,
+				{} as RouteLocationNormalized,
+				nextMock,
+				options,
+			);
+
+			expect(nextMock).toHaveBeenCalledTimes(0);
+		});
+
+		it('should redirect to homepage if none of the required features are enabled in oneOf mode', async () => {
+			vi.mocked(useSettingsStore).mockReturnValue({
+				isEnterpriseFeatureEnabled: (_) => false,
+			} as ReturnType<typeof useSettingsStore>);
+
+			const nextMock = vi.fn();
+			const options: EnterprisePermissionOptions = {
+				feature: [EnterpriseEditionFeature.Saml],
+				mode: 'oneOf',
+			};
+
+			await enterpriseMiddleware(
+				{} as RouteLocationNormalized,
+				{} as RouteLocationNormalized,
+				nextMock,
+				options,
+			);
+
+			expect(nextMock).toHaveBeenCalledWith({ name: VIEWS.HOMEPAGE });
+		});
+
+		it('should allow navigation if at least one of the required features is enabled in oneOf mode', async () => {
+			vi.mocked(useSettingsStore).mockReturnValue({
+				isEnterpriseFeatureEnabled: (feature) => feature === EnterpriseEditionFeature.Saml,
+			} as ReturnType<typeof useSettingsStore>);
+
+			const nextMock = vi.fn();
+			const options: EnterprisePermissionOptions = {
+				feature: [EnterpriseEditionFeature.Saml, EnterpriseEditionFeature.Ldap],
+				mode: 'oneOf',
+			};
+
+			await enterpriseMiddleware(
+				{} as RouteLocationNormalized,
+				{} as RouteLocationNormalized,
+				nextMock,
+				options,
+			);
+
+			expect(nextMock).toHaveBeenCalledTimes(0);
+		});
+	});
+});
diff --git a/packages/editor-ui/src/rbac/middleware/__tests__/guest.test.ts b/packages/editor-ui/src/rbac/middleware/__tests__/guest.test.ts
new file mode 100644
index 0000000000000..6b27a232839dc
--- /dev/null
+++ b/packages/editor-ui/src/rbac/middleware/__tests__/guest.test.ts
@@ -0,0 +1,54 @@
+import { useUsersStore } from '@/stores/users.store';
+import { VIEWS } from '@/constants';
+import { guestMiddleware } from '@/rbac/middleware/guest';
+import type { RouteLocationNormalized } from 'vue-router';
+
+vi.mock('@/stores/users.store', () => ({
+	useUsersStore: vi.fn(),
+}));
+
+describe('Middleware', () => {
+	describe('guest', () => {
+		it('should redirect to given path if current user is present and valid redirect is provided', async () => {
+			vi.mocked(useUsersStore).mockReturnValue({ currentUser: { id: '123' } } as ReturnType<
+				typeof useUsersStore
+			>);
+
+			const nextMock = vi.fn();
+			const toMock = { query: { redirect: '/some-path' } } as unknown as RouteLocationNormalized;
+			const fromMock = {} as RouteLocationNormalized;
+
+			await guestMiddleware(toMock, fromMock, nextMock, {});
+
+			expect(nextMock).toHaveBeenCalledWith('/some-path');
+		});
+
+		it('should redirect to homepage if current user is present and no valid redirect', async () => {
+			vi.mocked(useUsersStore).mockReturnValue({ currentUser: { id: '123' } } as ReturnType<
+				typeof useUsersStore
+			>);
+
+			const nextMock = vi.fn();
+			const toMock = { query: {} } as RouteLocationNormalized;
+			const fromMock = {} as RouteLocationNormalized;
+
+			await guestMiddleware(toMock, fromMock, nextMock, {});
+
+			expect(nextMock).toHaveBeenCalledWith({ name: VIEWS.HOMEPAGE });
+		});
+
+		it('should allow navigation if no current user is present', async () => {
+			vi.mocked(useUsersStore).mockReturnValue({ currentUser: null } as ReturnType<
+				typeof useUsersStore
+			>);
+
+			const nextMock = vi.fn();
+			const toMock = { query: {} } as RouteLocationNormalized;
+			const fromMock = {} as RouteLocationNormalized;
+
+			await guestMiddleware(toMock, fromMock, nextMock, {});
+
+			expect(nextMock).toHaveBeenCalledTimes(0);
+		});
+	});
+});
diff --git a/packages/editor-ui/src/rbac/middleware/__tests__/rbac.test.ts b/packages/editor-ui/src/rbac/middleware/__tests__/rbac.test.ts
new file mode 100644
index 0000000000000..07439363305bf
--- /dev/null
+++ b/packages/editor-ui/src/rbac/middleware/__tests__/rbac.test.ts
@@ -0,0 +1,60 @@
+import { useRBACStore } from '@/stores/rbac.store';
+import { rbacMiddleware } from '@/rbac/middleware/rbac';
+import { VIEWS } from '@/constants';
+import {
+	inferProjectIdFromRoute,
+	inferResourceIdFromRoute,
+	inferResourceTypeFromRoute,
+} from '@/utils/rbacUtils';
+import type { RouteLocationNormalized } from 'vue-router';
+import type { Scope } from '@n8n/permissions';
+
+vi.mock('@/stores/rbac.store', () => ({
+	useRBACStore: vi.fn(),
+}));
+
+vi.mock('@/utils/rbacUtils', () => ({
+	inferProjectIdFromRoute: vi.fn(),
+	inferResourceIdFromRoute: vi.fn(),
+	inferResourceTypeFromRoute: vi.fn(),
+}));
+
+describe('Middleware', () => {
+	describe('rbac', () => {
+		it('should redirect to homepage if the user does not have the required scope', async () => {
+			vi.mocked(useRBACStore).mockReturnValue({
+				hasScope: vi.fn().mockReturnValue(false),
+			} as unknown as ReturnType<typeof useRBACStore>);
+			vi.mocked(inferProjectIdFromRoute).mockReturnValue('123');
+			vi.mocked(inferResourceTypeFromRoute).mockReturnValue('workflow');
+			vi.mocked(inferResourceIdFromRoute).mockReturnValue('456');
+
+			const nextMock = vi.fn();
+			const scope: Scope = 'workflow:read';
+
+			await rbacMiddleware({} as RouteLocationNormalized, {} as RouteLocationNormalized, nextMock, {
+				scope,
+			});
+
+			expect(nextMock).toHaveBeenCalledWith({ name: VIEWS.HOMEPAGE });
+		});
+
+		it('should allow navigation if the user has the required scope', async () => {
+			vi.mocked(useRBACStore).mockReturnValue({
+				hasScope: vi.fn().mockReturnValue(true),
+			} as unknown as ReturnType<typeof useRBACStore>);
+			vi.mocked(inferProjectIdFromRoute).mockReturnValue('123');
+			vi.mocked(inferResourceTypeFromRoute).mockReturnValue(undefined);
+			vi.mocked(inferResourceIdFromRoute).mockReturnValue(undefined);
+
+			const nextMock = vi.fn();
+			const scope: Scope = 'workflow:read';
+
+			await rbacMiddleware({} as RouteLocationNormalized, {} as RouteLocationNormalized, nextMock, {
+				scope,
+			});
+
+			expect(nextMock).toHaveBeenCalledTimes(0);
+		});
+	});
+});
diff --git a/packages/editor-ui/src/rbac/middleware/__tests__/role.test.ts b/packages/editor-ui/src/rbac/middleware/__tests__/role.test.ts
new file mode 100644
index 0000000000000..17a87cf8d30e6
--- /dev/null
+++ b/packages/editor-ui/src/rbac/middleware/__tests__/role.test.ts
@@ -0,0 +1,73 @@
+import { roleMiddleware } from '@/rbac/middleware/role';
+import { useUsersStore } from '@/stores/users.store';
+import type { IUser } from '@/Interface';
+import type { RouteLocationNormalized } from 'vue-router';
+import { VIEWS, ROLE } from '@/constants';
+
+vi.mock('@/stores/users.store', () => ({
+	useUsersStore: vi.fn(),
+}));
+
+describe('Middleware', () => {
+	describe('role', () => {
+		it('should redirect to homepage if the user does not have the required role', async () => {
+			vi.mocked(useUsersStore).mockReturnValue({
+				currentUser: {
+					isDefaultUser: false,
+					role: ROLE.Owner,
+				} as IUser,
+			} as ReturnType<typeof useUsersStore>);
+
+			const nextMock = vi.fn();
+			const role = [ROLE.Default];
+
+			await roleMiddleware(
+				{} as RouteLocationNormalized,
+				{} as RouteLocationNormalized,
+				nextMock,
+				role,
+			);
+
+			expect(nextMock).toHaveBeenCalledWith({ name: VIEWS.HOMEPAGE });
+		});
+
+		it('should redirect to homepage if the user is not logged in', async () => {
+			vi.mocked(useUsersStore).mockReturnValue({
+				currentUser: null,
+			} as ReturnType<typeof useUsersStore>);
+
+			const nextMock = vi.fn();
+			const role = [ROLE.Default];
+
+			await roleMiddleware(
+				{} as RouteLocationNormalized,
+				{} as RouteLocationNormalized,
+				nextMock,
+				role,
+			);
+
+			expect(nextMock).toHaveBeenCalledWith({ name: VIEWS.HOMEPAGE });
+		});
+
+		it('should nor redirect if the user has the required role', async () => {
+			vi.mocked(useUsersStore).mockReturnValue({
+				currentUser: {
+					isDefaultUser: false,
+					role: ROLE.Owner,
+				} as IUser,
+			} as ReturnType<typeof useUsersStore>);
+
+			const nextMock = vi.fn();
+			const role = [ROLE.Owner];
+
+			await roleMiddleware(
+				{} as RouteLocationNormalized,
+				{} as RouteLocationNormalized,
+				nextMock,
+				role,
+			);
+
+			expect(nextMock).not.toHaveBeenCalled();
+		});
+	});
+});
diff --git a/packages/editor-ui/src/rbac/middleware/authenticated.ts b/packages/editor-ui/src/rbac/middleware/authenticated.ts
new file mode 100644
index 0000000000000..0f74161600ed6
--- /dev/null
+++ b/packages/editor-ui/src/rbac/middleware/authenticated.ts
@@ -0,0 +1,19 @@
+import type { RouterMiddleware } from '@/types/router';
+import { VIEWS } from '@/constants';
+import type { AuthenticatedPermissionOptions } from '@/types/rbac';
+import { isAuthenticated } from '@/rbac/checks';
+
+export const authenticatedMiddleware: RouterMiddleware<AuthenticatedPermissionOptions> = async (
+	to,
+	from,
+	next,
+	options,
+) => {
+	const valid = isAuthenticated(options);
+	if (!valid) {
+		const redirect =
+			to.query.redirect ??
+			encodeURIComponent(`${window.location.pathname}${window.location.search}`);
+		return next({ name: VIEWS.SIGNIN, query: { redirect } });
+	}
+};
diff --git a/packages/editor-ui/src/rbac/middleware/custom.ts b/packages/editor-ui/src/rbac/middleware/custom.ts
new file mode 100644
index 0000000000000..debf9e8ba9d0c
--- /dev/null
+++ b/packages/editor-ui/src/rbac/middleware/custom.ts
@@ -0,0 +1,14 @@
+import type { CustomMiddlewareOptions, RouterMiddleware } from '@/types/router';
+import { VIEWS } from '@/constants';
+
+export const customMiddleware: RouterMiddleware<CustomMiddlewareOptions> = async (
+	to,
+	from,
+	next,
+	isValid,
+) => {
+	const valid = isValid({ to, from, next });
+	if (!valid) {
+		return next({ name: VIEWS.HOMEPAGE });
+	}
+};
diff --git a/packages/editor-ui/src/rbac/middleware/defaultUser.ts b/packages/editor-ui/src/rbac/middleware/defaultUser.ts
new file mode 100644
index 0000000000000..bab12869f9928
--- /dev/null
+++ b/packages/editor-ui/src/rbac/middleware/defaultUser.ts
@@ -0,0 +1,15 @@
+import type { RouterMiddleware } from '@/types/router';
+import { VIEWS } from '@/constants';
+import type { DefaultUserMiddlewareOptions } from '@/types/rbac';
+import { isDefaultUser } from '@/rbac/checks';
+
+export const defaultUserMiddleware: RouterMiddleware<DefaultUserMiddlewareOptions> = async (
+	to,
+	from,
+	next,
+) => {
+	const valid = isDefaultUser();
+	if (!valid) {
+		return next({ name: VIEWS.HOMEPAGE });
+	}
+};
diff --git a/packages/editor-ui/src/rbac/middleware/enterprise.ts b/packages/editor-ui/src/rbac/middleware/enterprise.ts
new file mode 100644
index 0000000000000..88f09a8557dc9
--- /dev/null
+++ b/packages/editor-ui/src/rbac/middleware/enterprise.ts
@@ -0,0 +1,16 @@
+import type { RouterMiddleware } from '@/types/router';
+import { VIEWS } from '@/constants';
+import type { EnterprisePermissionOptions } from '@/types/rbac';
+import { isEnterpriseFeatureEnabled } from '@/rbac/checks';
+
+export const enterpriseMiddleware: RouterMiddleware<EnterprisePermissionOptions> = async (
+	to,
+	from,
+	next,
+	options,
+) => {
+	const valid = isEnterpriseFeatureEnabled(options);
+	if (!valid) {
+		return next({ name: VIEWS.HOMEPAGE });
+	}
+};
diff --git a/packages/editor-ui/src/rbac/middleware/guest.ts b/packages/editor-ui/src/rbac/middleware/guest.ts
new file mode 100644
index 0000000000000..05095469f6f86
--- /dev/null
+++ b/packages/editor-ui/src/rbac/middleware/guest.ts
@@ -0,0 +1,16 @@
+import type { RouterMiddleware } from '@/types/router';
+import { VIEWS } from '@/constants';
+import type { GuestPermissionOptions } from '@/types/rbac';
+import { isGuest } from '@/rbac/checks';
+
+export const guestMiddleware: RouterMiddleware<GuestPermissionOptions> = async (to, from, next) => {
+	const valid = isGuest();
+	if (!valid) {
+		const redirect = to.query.redirect as string;
+		if (redirect && (redirect.startsWith('/') || redirect.startsWith(window.location.origin))) {
+			return next(redirect);
+		}
+
+		return next({ name: VIEWS.HOMEPAGE });
+	}
+};
diff --git a/packages/editor-ui/src/rbac/middleware/rbac.ts b/packages/editor-ui/src/rbac/middleware/rbac.ts
new file mode 100644
index 0000000000000..e3c25ec433628
--- /dev/null
+++ b/packages/editor-ui/src/rbac/middleware/rbac.ts
@@ -0,0 +1,25 @@
+import type { RouterMiddleware } from '@/types/router';
+import { VIEWS } from '@/constants';
+import {
+	inferProjectIdFromRoute,
+	inferResourceIdFromRoute,
+	inferResourceTypeFromRoute,
+} from '@/utils/rbacUtils';
+import type { RBACPermissionOptions } from '@/types/rbac';
+import { hasScope } from '@/rbac/checks';
+
+export const rbacMiddleware: RouterMiddleware<RBACPermissionOptions> = async (
+	to,
+	from,
+	next,
+	{ scope, options },
+) => {
+	const projectId = inferProjectIdFromRoute(to);
+	const resourceType = inferResourceTypeFromRoute(to);
+	const resourceId = resourceType ? inferResourceIdFromRoute(to) : undefined;
+
+	const valid = hasScope({ scope, projectId, resourceType, resourceId, options });
+	if (!valid) {
+		return next({ name: VIEWS.HOMEPAGE });
+	}
+};
diff --git a/packages/editor-ui/src/rbac/middleware/role.ts b/packages/editor-ui/src/rbac/middleware/role.ts
new file mode 100644
index 0000000000000..b4614aa54786a
--- /dev/null
+++ b/packages/editor-ui/src/rbac/middleware/role.ts
@@ -0,0 +1,16 @@
+import type { RouterMiddleware } from '@/types/router';
+import type { RolePermissionOptions } from '@/types/rbac';
+import { VIEWS } from '@/constants';
+import { hasRole } from '@/rbac/checks';
+
+export const roleMiddleware: RouterMiddleware<RolePermissionOptions> = async (
+	to,
+	from,
+	next,
+	checkRoles,
+) => {
+	const valid = hasRole(checkRoles);
+	if (!valid) {
+		return next({ name: VIEWS.HOMEPAGE });
+	}
+};
diff --git a/packages/editor-ui/src/rbac/permissions.ts b/packages/editor-ui/src/rbac/permissions.ts
new file mode 100644
index 0000000000000..3ceb244287334
--- /dev/null
+++ b/packages/editor-ui/src/rbac/permissions.ts
@@ -0,0 +1,42 @@
+import {
+	hasRole,
+	hasScope,
+	isAuthenticated,
+	isDefaultUser,
+	isInstanceOwner,
+	isEnterpriseFeatureEnabled,
+	isGuest,
+	isValid,
+} from '@/rbac/checks';
+import type { PermissionType, PermissionTypeOptions, RBACPermissionCheck } from '@/types/rbac';
+
+type Permissions = {
+	[key in PermissionType]: RBACPermissionCheck<PermissionTypeOptions[key]>;
+};
+
+export const permissions: Permissions = {
+	authenticated: isAuthenticated,
+	custom: isValid,
+	defaultUser: isDefaultUser,
+	instanceOwner: isInstanceOwner,
+	enterprise: isEnterpriseFeatureEnabled,
+	guest: isGuest,
+	rbac: hasScope,
+	role: hasRole,
+};
+
+export function hasPermission(
+	permissionNames: PermissionType[],
+	options?: Partial<PermissionTypeOptions>,
+) {
+	let valid = true;
+
+	for (const permissionName of permissionNames) {
+		const permissionOptions = options?.[permissionName] ?? {};
+		const permissionFn = permissions[permissionName] as RBACPermissionCheck<unknown>;
+
+		valid = valid && permissionFn(permissionOptions);
+	}
+
+	return valid;
+}
diff --git a/packages/editor-ui/src/router.ts b/packages/editor-ui/src/router.ts
index 2d7920a06b518..6eb16baa79036 100644
--- a/packages/editor-ui/src/router.ts
+++ b/packages/editor-ui/src/router.ts
@@ -1,74 +1,73 @@
-import Vue from 'vue';
+import type {
+	NavigationGuardNext,
+	RouteLocation,
+	RouteRecordRaw,
+	RouteLocationRaw,
+	RouteLocationNormalized,
+} from 'vue-router';
+import { createRouter, createWebHistory, isNavigationFailure } from 'vue-router';
+import { useExternalHooks } from '@/composables/useExternalHooks';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useTemplatesStore } from '@/stores/templates.store';
+import { useUIStore } from '@/stores/ui.store';
+import { useSSOStore } from '@/stores/sso.store';
+import { EnterpriseEditionFeature, VIEWS, EDITABLE_CANVAS_VIEWS } from '@/constants';
+import { useTelemetry } from '@/composables/useTelemetry';
+import { middleware } from '@/rbac/middleware';
+import type { RouteConfig, RouterMiddleware } from '@/types/router';
+import { initializeCore } from '@/init';
+import { tryToParseNumber } from '@/utils/typesUtils';
 
-import ChangePasswordView from './views/ChangePasswordView.vue';
-import ErrorView from './views/ErrorView.vue';
-import ForgotMyPasswordView from './views/ForgotMyPasswordView.vue';
-import MainHeader from '@/components/MainHeader/MainHeader.vue';
-import MainSidebar from '@/components/MainSidebar.vue';
-import NodeView from '@/views/NodeView.vue';
-import WorkflowExecutionsList from '@/components/ExecutionsView/ExecutionsList.vue';
-import ExecutionsLandingPage from '@/components/ExecutionsView/ExecutionsLandingPage.vue';
-import ExecutionPreview from '@/components/ExecutionsView/ExecutionPreview.vue';
-import SettingsView from './views/SettingsView.vue';
-import SettingsLdapView from './views/SettingsLdapView.vue';
-import SettingsPersonalView from './views/SettingsPersonalView.vue';
-import SettingsUsersView from './views/SettingsUsersView.vue';
-import SettingsCommunityNodesView from './views/SettingsCommunityNodesView.vue';
-import SettingsApiView from './views/SettingsApiView.vue';
-import SettingsLogStreamingView from './views/SettingsLogStreamingView.vue';
-import SettingsFakeDoorView from './views/SettingsFakeDoorView.vue';
-import SetupView from './views/SetupView.vue';
-import SigninView from './views/SigninView.vue';
-import SignupView from './views/SignupView.vue';
-import type { Route } from 'vue-router';
-import Router from 'vue-router';
+const ChangePasswordView = async () => await import('./views/ChangePasswordView.vue');
+const ErrorView = async () => await import('./views/ErrorView.vue');
+const ForgotMyPasswordView = async () => await import('./views/ForgotMyPasswordView.vue');
+const MainHeader = async () => await import('@/components/MainHeader/MainHeader.vue');
+const MainSidebar = async () => await import('@/components/MainSidebar.vue');
+const NodeView = async () => await import('@/views/NodeView.vue');
+const WorkflowExecutionsView = async () => await import('@/views/WorkflowExecutionsView.vue');
+const WorkflowExecutionsLandingPage = async () =>
+	await import('@/components/executions/workflow/WorkflowExecutionsLandingPage.vue');
+const WorkflowExecutionsPreview = async () =>
+	await import('@/components/executions/workflow/WorkflowExecutionsPreview.vue');
+const SettingsView = async () => await import('./views/SettingsView.vue');
+const SettingsLdapView = async () => await import('./views/SettingsLdapView.vue');
+const SettingsPersonalView = async () => await import('./views/SettingsPersonalView.vue');
+const SettingsUsersView = async () => await import('./views/SettingsUsersView.vue');
+const SettingsCommunityNodesView = async () =>
+	await import('./views/SettingsCommunityNodesView.vue');
+const SettingsApiView = async () => await import('./views/SettingsApiView.vue');
+const SettingsLogStreamingView = async () => await import('./views/SettingsLogStreamingView.vue');
+const SettingsFakeDoorView = async () => await import('./views/SettingsFakeDoorView.vue');
+const SetupView = async () => await import('./views/SetupView.vue');
+const SigninView = async () => await import('./views/SigninView.vue');
+const SignupView = async () => await import('./views/SignupView.vue');
+const TemplatesCollectionView = async () => await import('@/views/TemplatesCollectionView.vue');
+const TemplatesWorkflowView = async () => await import('@/views/TemplatesWorkflowView.vue');
+const SetupWorkflowFromTemplateView = async () =>
+	await import('@/views/SetupWorkflowFromTemplateView/SetupWorkflowFromTemplateView.vue');
+const TemplatesSearchView = async () => await import('@/views/TemplatesSearchView.vue');
+const CredentialsView = async () => await import('@/views/CredentialsView.vue');
+const ExecutionsView = async () => await import('@/views/ExecutionsView.vue');
+const WorkflowsView = async () => await import('@/views/WorkflowsView.vue');
+const VariablesView = async () => await import('@/views/VariablesView.vue');
+const TestSuiteNodeView = async () => await import('@/views/TestSuiteNodeView.vue');
+const TestSuitesView = async () => await import('@/views/TestSuitesView.vue');
+const TestSuiteView = async () => await import('@/views/TestSuiteView.vue');
+const SettingsUsageAndPlan = async () => await import('./views/SettingsUsageAndPlan.vue');
+const SettingsSso = async () => await import('./views/SettingsSso.vue');
+const SignoutView = async () => await import('@/views/SignoutView.vue');
+const SamlOnboarding = async () => await import('@/views/SamlOnboarding.vue');
+const SettingsSourceControl = async () => await import('./views/SettingsSourceControl.vue');
+const SettingsExternalSecrets = async () => await import('./views/SettingsExternalSecrets.vue');
+const WorkerView = async () => await import('./views/WorkerView.vue');
+const WorkflowHistory = async () => await import('@/views/WorkflowHistory.vue');
+const WorkflowOnboardingView = async () => await import('@/views/WorkflowOnboardingView.vue');
 
-import TemplatesCollectionView from '@/views/TemplatesCollectionView.vue';
-import TemplatesWorkflowView from '@/views/TemplatesWorkflowView.vue';
-import TemplatesSearchView from '@/views/TemplatesSearchView.vue';
-import CredentialsView from '@/views/CredentialsView.vue';
-import ExecutionsView from '@/views/ExecutionsView.vue';
-import WorkflowsView from '@/views/WorkflowsView.vue';
-import VariablesView from '@/views/VariablesView.vue';
-import type { IPermissions } from './Interface';
-import { LOGIN_STATUS, ROLE } from '@/utils';
-import type { RouteConfigSingleView } from 'vue-router/types/router';
-import { TEMPLATE_EXPERIMENT, VIEWS } from './constants';
-import { useSettingsStore } from './stores/settings';
-import { useTemplatesStore } from './stores/templates';
-import { useSSOStore } from './stores/sso';
-import SettingsUsageAndPlanVue from './views/SettingsUsageAndPlan.vue';
-import SettingsSso from './views/SettingsSso.vue';
-import SignoutView from '@/views/SignoutView.vue';
-import SamlOnboarding from '@/views/SamlOnboarding.vue';
-import SettingsVersionControl from './views/SettingsVersionControl.vue';
-import { usePostHog } from './stores/posthog';
-
-Vue.use(Router);
-
-interface IRouteConfig extends RouteConfigSingleView {
-	meta: {
-		nodeView?: boolean;
-		templatesEnabled?: boolean;
-		getRedirect?: () => { name: string } | false;
-		permissions: IPermissions;
-		telemetry?: {
-			disabled?: true;
-			getProperties: (route: Route) => object;
-		};
-		scrollOffset?: number;
-	};
-}
-
-function getTemplatesRedirect() {
+function getTemplatesRedirect(defaultRedirect: VIEWS[keyof VIEWS]) {
 	const settingsStore = useSettingsStore();
-	const posthog = usePostHog();
 	const isTemplatesEnabled: boolean = settingsStore.isTemplatesEnabled;
-	if (
-		!posthog.isVariantEnabled(TEMPLATE_EXPERIMENT.name, TEMPLATE_EXPERIMENT.variant) &&
-		!isTemplatesEnabled
-	) {
-		return { name: VIEWS.NOT_FOUND };
+	if (!isTemplatesEnabled) {
+		return { name: defaultRedirect || VIEWS.NOT_FOUND };
 	}
 
 	return false;
@@ -78,15 +77,11 @@ export const routes = [
 	{
 		path: '/',
 		name: VIEWS.HOMEPAGE,
+		redirect: () => {
+			return { name: VIEWS.WORKFLOWS };
+		},
 		meta: {
-			getRedirect() {
-				return { name: VIEWS.WORKFLOWS };
-			},
-			permissions: {
-				allow: {
-					loginStatus: [LOGIN_STATUS.LoggedIn],
-				},
-			},
+			middleware: ['authenticated'],
 		},
 	},
 	{
@@ -99,7 +94,7 @@ export const routes = [
 		meta: {
 			templatesEnabled: true,
 			telemetry: {
-				getProperties(route: Route) {
+				getProperties(route: RouteLocation) {
 					const templatesStore = useTemplatesStore();
 					return {
 						collection_id: route.params.id,
@@ -108,13 +103,12 @@ export const routes = [
 				},
 			},
 			getRedirect: getTemplatesRedirect,
-			permissions: {
-				allow: {
-					loginStatus: [LOGIN_STATUS.LoggedIn],
-				},
-			},
+			middleware: ['authenticated'],
 		},
 	},
+	// Following two routes are kept in-app:
+	// Single workflow view, used when a custom template host is set
+	// Also, reachable directly from this URL
 	{
 		path: '/templates/:id',
 		name: VIEWS.TEMPLATE,
@@ -126,19 +120,42 @@ export const routes = [
 			templatesEnabled: true,
 			getRedirect: getTemplatesRedirect,
 			telemetry: {
-				getProperties(route: Route) {
+				getProperties(route: RouteLocation) {
 					const templatesStore = useTemplatesStore();
 					return {
-						template_id: route.params.id,
+						template_id: tryToParseNumber(
+							Array.isArray(route.params.id) ? route.params.id[0] : route.params.id,
+						),
 						wf_template_repo_session_id: templatesStore.currentSessionId,
 					};
 				},
 			},
-			permissions: {
-				allow: {
-					loginStatus: [LOGIN_STATUS.LoggedIn],
+			middleware: ['authenticated'],
+		},
+	},
+	// Template setup view, this is the landing view for website users
+	{
+		path: '/templates/:id/setup',
+		name: VIEWS.TEMPLATE_SETUP,
+		components: {
+			default: SetupWorkflowFromTemplateView,
+			sidebar: MainSidebar,
+		},
+		meta: {
+			templatesEnabled: true,
+			getRedirect: getTemplatesRedirect,
+			telemetry: {
+				getProperties(route: RouteLocation) {
+					const templatesStore = useTemplatesStore();
+					return {
+						template_id: tryToParseNumber(
+							Array.isArray(route.params.id) ? route.params.id[0] : route.params.id,
+						),
+						wf_template_repo_session_id: templatesStore.currentSessionId,
+					};
 				},
 			},
+			middleware: ['authenticated'],
 		},
 	},
 	{
@@ -154,7 +171,7 @@ export const routes = [
 			// Templates view remembers it's scroll position on back
 			scrollOffset: 0,
 			telemetry: {
-				getProperties(route: Route) {
+				getProperties(route: RouteLocation) {
 					const templatesStore = useTemplatesStore();
 					return {
 						wf_template_repo_session_id: templatesStore.currentSessionId,
@@ -164,11 +181,15 @@ export const routes = [
 			setScrollPosition(pos: number) {
 				this.scrollOffset = pos;
 			},
-			permissions: {
-				allow: {
-					loginStatus: [LOGIN_STATUS.LoggedIn],
-				},
-			},
+			middleware: ['authenticated'],
+		},
+		beforeEnter: (_to, _from, next) => {
+			const templatesStore = useTemplatesStore();
+			if (!templatesStore.hasCustomTemplatesHost) {
+				window.location.href = templatesStore.websiteTemplateRepositoryURL;
+			} else {
+				next();
+			}
 		},
 	},
 	{
@@ -179,11 +200,7 @@ export const routes = [
 			sidebar: MainSidebar,
 		},
 		meta: {
-			permissions: {
-				allow: {
-					loginStatus: [LOGIN_STATUS.LoggedIn],
-				},
-			},
+			middleware: ['authenticated'],
 		},
 	},
 	{
@@ -193,13 +210,7 @@ export const routes = [
 			default: VariablesView,
 			sidebar: MainSidebar,
 		},
-		meta: {
-			permissions: {
-				allow: {
-					loginStatus: [LOGIN_STATUS.LoggedIn],
-				},
-			},
-		},
+		meta: { middleware: ['authenticated'] },
 	},
 	{
 		path: '/executions',
@@ -209,17 +220,9 @@ export const routes = [
 			sidebar: MainSidebar,
 		},
 		meta: {
-			permissions: {
-				allow: {
-					loginStatus: [LOGIN_STATUS.LoggedIn],
-				},
-			},
+			middleware: ['authenticated'],
 		},
 	},
-	{
-		path: '/workflow',
-		redirect: '/workflow/new',
-	},
 	{
 		path: '/workflows',
 		name: VIEWS.WORKFLOWS,
@@ -228,16 +231,12 @@ export const routes = [
 			sidebar: MainSidebar,
 		},
 		meta: {
-			permissions: {
-				allow: {
-					loginStatus: [LOGIN_STATUS.LoggedIn],
-				},
-			},
+			middleware: ['authenticated'],
 		},
 	},
 	{
-		path: '/workflow/new',
-		name: VIEWS.NEW_WORKFLOW,
+		path: '/workflow/:name/debug/:executionId',
+		name: VIEWS.EXECUTION_DEBUG,
 		components: {
 			default: NodeView,
 			header: MainHeader,
@@ -245,26 +244,11 @@ export const routes = [
 		},
 		meta: {
 			nodeView: true,
-			permissions: {
-				allow: {
-					loginStatus: [LOGIN_STATUS.LoggedIn],
-				},
-			},
-		},
-	},
-	{
-		path: '/workflow/:name',
-		name: VIEWS.WORKFLOW,
-		components: {
-			default: NodeView,
-			header: MainHeader,
-			sidebar: MainSidebar,
-		},
-		meta: {
-			nodeView: true,
-			permissions: {
-				allow: {
-					loginStatus: [LOGIN_STATUS.LoggedIn],
+			keepWorkflowAlive: true,
+			middleware: ['authenticated', 'enterprise'],
+			middlewareOptions: {
+				enterprise: {
+					feature: [EnterpriseEditionFeature.DebugInEditor],
 				},
 			},
 		},
@@ -273,61 +257,51 @@ export const routes = [
 		path: '/workflow/:name/executions',
 		name: VIEWS.WORKFLOW_EXECUTIONS,
 		components: {
-			default: WorkflowExecutionsList,
+			default: WorkflowExecutionsView,
 			header: MainHeader,
 			sidebar: MainSidebar,
 		},
 		meta: {
 			keepWorkflowAlive: true,
-			permissions: {
-				allow: {
-					loginStatus: [LOGIN_STATUS.LoggedIn],
-				},
-			},
+			middleware: ['authenticated'],
 		},
 		children: [
 			{
 				path: '',
 				name: VIEWS.EXECUTION_HOME,
 				components: {
-					executionPreview: ExecutionsLandingPage,
+					executionPreview: WorkflowExecutionsLandingPage,
 				},
 				meta: {
 					keepWorkflowAlive: true,
-					permissions: {
-						allow: {
-							loginStatus: [LOGIN_STATUS.LoggedIn],
-						},
-					},
+					middleware: ['authenticated'],
 				},
 			},
 			{
 				path: ':executionId',
 				name: VIEWS.EXECUTION_PREVIEW,
 				components: {
-					executionPreview: ExecutionPreview,
+					executionPreview: WorkflowExecutionsPreview,
 				},
 				meta: {
 					keepWorkflowAlive: true,
-					permissions: {
-						allow: {
-							loginStatus: [LOGIN_STATUS.LoggedIn],
-						},
-					},
+					middleware: ['authenticated'],
 				},
 			},
 		],
 	},
 	{
-		path: '/workflows/demo',
-		name: VIEWS.DEMO,
+		path: '/workflow/:workflowId/history/:versionId?',
+		name: VIEWS.WORKFLOW_HISTORY,
 		components: {
-			default: NodeView,
+			default: WorkflowHistory,
+			sidebar: MainSidebar,
 		},
 		meta: {
-			permissions: {
-				allow: {
-					loginStatus: [LOGIN_STATUS.LoggedIn],
+			middleware: ['authenticated', 'enterprise'],
+			middlewareOptions: {
+				enterprise: {
+					feature: [EnterpriseEditionFeature.WorkflowHistory],
 				},
 			},
 		},
@@ -342,14 +316,76 @@ export const routes = [
 		},
 		meta: {
 			templatesEnabled: true,
+			keepWorkflowAlive: true,
 			getRedirect: getTemplatesRedirect,
-			permissions: {
-				allow: {
-					loginStatus: [LOGIN_STATUS.LoggedIn],
+			middleware: ['authenticated'],
+		},
+	},
+	{
+		path: '/workflows/onboarding/:id',
+		name: VIEWS.WORKFLOW_ONBOARDING,
+		components: {
+			default: WorkflowOnboardingView,
+			header: MainHeader,
+			sidebar: MainSidebar,
+		},
+		meta: {
+			templatesEnabled: true,
+			keepWorkflowAlive: true,
+			getRedirect: () => getTemplatesRedirect(VIEWS.NEW_WORKFLOW),
+			middleware: ['authenticated'],
+		},
+	},
+	{
+		path: '/workflow/new',
+		name: VIEWS.NEW_WORKFLOW,
+		components: {
+			default: NodeView,
+			header: MainHeader,
+			sidebar: MainSidebar,
+		},
+		meta: {
+			nodeView: true,
+			keepWorkflowAlive: true,
+			middleware: ['authenticated'],
+		},
+	},
+	{
+		path: '/workflows/demo',
+		name: VIEWS.DEMO,
+		components: {
+			default: NodeView,
+		},
+		meta: {
+			middleware: ['authenticated'],
+			middlewareOptions: {
+				authenticated: {
+					bypass: () => {
+						const settingsStore = useSettingsStore();
+						return settingsStore.isPreviewMode;
+					},
 				},
 			},
 		},
 	},
+	{
+		path: '/workflow/:name',
+		name: VIEWS.WORKFLOW,
+		components: {
+			default: NodeView,
+			header: MainHeader,
+			sidebar: MainSidebar,
+		},
+		meta: {
+			nodeView: true,
+			keepWorkflowAlive: true,
+			middleware: ['authenticated'],
+		},
+	},
+	{
+		path: '/workflow',
+		redirect: '/workflow/new',
+	},
 	{
 		path: '/signin',
 		name: VIEWS.SIGNIN,
@@ -360,11 +396,7 @@ export const routes = [
 			telemetry: {
 				pageCategory: 'auth',
 			},
-			permissions: {
-				allow: {
-					loginStatus: [LOGIN_STATUS.LoggedOut],
-				},
-			},
+			middleware: ['guest'],
 		},
 	},
 	{
@@ -377,11 +409,7 @@ export const routes = [
 			telemetry: {
 				pageCategory: 'auth',
 			},
-			permissions: {
-				allow: {
-					loginStatus: [LOGIN_STATUS.LoggedOut],
-				},
-			},
+			middleware: ['guest'],
 		},
 	},
 	{
@@ -394,11 +422,7 @@ export const routes = [
 			telemetry: {
 				pageCategory: 'auth',
 			},
-			permissions: {
-				allow: {
-					loginStatus: [LOGIN_STATUS.LoggedIn],
-				},
-			},
+			middleware: ['authenticated'],
 		},
 	},
 	{
@@ -408,20 +432,10 @@ export const routes = [
 			default: SetupView,
 		},
 		meta: {
+			middleware: ['defaultUser'],
 			telemetry: {
 				pageCategory: 'auth',
 			},
-			permissions: {
-				allow: {
-					role: [ROLE.Default],
-				},
-				deny: {
-					shouldDeny: () => {
-						const settingsStore = useSettingsStore();
-						return settingsStore.isUserManagementEnabled === false;
-					},
-				},
-			},
 		},
 	},
 	{
@@ -431,14 +445,10 @@ export const routes = [
 			default: ForgotMyPasswordView,
 		},
 		meta: {
+			middleware: ['guest'],
 			telemetry: {
 				pageCategory: 'auth',
 			},
-			permissions: {
-				allow: {
-					loginStatus: [LOGIN_STATUS.LoggedOut],
-				},
-			},
 		},
 	},
 	{
@@ -448,14 +458,10 @@ export const routes = [
 			default: ChangePasswordView,
 		},
 		meta: {
+			middleware: ['guest'],
 			telemetry: {
 				pageCategory: 'auth',
 			},
-			permissions: {
-				allow: {
-					loginStatus: [LOGIN_STATUS.LoggedOut],
-				},
-			},
 		},
 	},
 	{
@@ -467,31 +473,24 @@ export const routes = [
 				path: 'usage',
 				name: VIEWS.USAGE,
 				components: {
-					settingsView: SettingsUsageAndPlanVue,
+					settingsView: SettingsUsageAndPlan,
 				},
 				meta: {
+					middleware: ['authenticated', 'custom'],
+					middlewareOptions: {
+						custom: () => {
+							const settingsStore = useSettingsStore();
+							return !settingsStore.settings.hideUsagePage;
+						},
+					},
 					telemetry: {
 						pageCategory: 'settings',
-						getProperties(route: Route) {
+						getProperties(route: RouteLocation) {
 							return {
 								feature: 'usage',
 							};
 						},
 					},
-					permissions: {
-						allow: {
-							loginStatus: [LOGIN_STATUS.LoggedIn],
-						},
-						deny: {
-							shouldDeny: () => {
-								const settingsStore = useSettingsStore();
-								return (
-									settingsStore.settings.hideUsagePage === true ||
-									settingsStore.settings.deployment?.type === 'cloud'
-								);
-							},
-						},
-					},
 				},
 			},
 			{
@@ -501,22 +500,15 @@ export const routes = [
 					settingsView: SettingsPersonalView,
 				},
 				meta: {
+					middleware: ['authenticated'],
 					telemetry: {
 						pageCategory: 'settings',
-						getProperties(route: Route) {
+						getProperties(route: RouteLocation) {
 							return {
 								feature: 'personal',
 							};
 						},
 					},
-					permissions: {
-						allow: {
-							loginStatus: [LOGIN_STATUS.LoggedIn],
-						},
-						deny: {
-							role: [ROLE.Default],
-						},
-					},
 				},
 			},
 			{
@@ -526,29 +518,20 @@ export const routes = [
 					settingsView: SettingsUsersView,
 				},
 				meta: {
+					middleware: ['authenticated', 'rbac'],
+					middlewareOptions: {
+						rbac: {
+							scope: ['user:create', 'user:update'],
+						},
+					},
 					telemetry: {
 						pageCategory: 'settings',
-						getProperties(route: Route) {
+						getProperties(route: RouteLocation) {
 							return {
 								feature: 'users',
 							};
 						},
 					},
-					permissions: {
-						allow: {
-							role: [ROLE.Default, ROLE.Owner],
-						},
-						deny: {
-							shouldDeny: () => {
-								const settingsStore = useSettingsStore();
-
-								return (
-									settingsStore.isUserManagementEnabled === false &&
-									!(settingsStore.isCloudDeployment || settingsStore.isDesktopDeployment)
-								);
-							},
-						},
-					},
 				},
 			},
 			{
@@ -558,48 +541,59 @@ export const routes = [
 					settingsView: SettingsApiView,
 				},
 				meta: {
+					middleware: ['authenticated'],
 					telemetry: {
 						pageCategory: 'settings',
-						getProperties(route: Route) {
+						getProperties(route: RouteLocation) {
 							return {
 								feature: 'api',
 							};
 						},
 					},
-					permissions: {
-						allow: {
-							loginStatus: [LOGIN_STATUS.LoggedIn],
-						},
-						deny: {
-							shouldDeny: () => {
-								const settingsStore = useSettingsStore();
-								return settingsStore.isPublicApiEnabled === false;
-							},
-						},
-					},
 				},
 			},
 			{
-				path: 'version-control',
-				name: VIEWS.VERSION_CONTROL,
+				path: 'environments',
+				name: VIEWS.SOURCE_CONTROL,
 				components: {
-					settingsView: SettingsVersionControl,
+					settingsView: SettingsSourceControl,
 				},
 				meta: {
+					middleware: ['authenticated', 'rbac'],
+					middlewareOptions: {
+						rbac: {
+							scope: 'sourceControl:manage',
+						},
+					},
 					telemetry: {
 						pageCategory: 'settings',
-						getProperties(route: Route) {
+						getProperties(route: RouteLocation) {
 							return {
-								feature: 'vc',
+								feature: 'environments',
 							};
 						},
 					},
-					permissions: {
-						allow: {
-							role: [ROLE.Owner],
+				},
+			},
+			{
+				path: 'external-secrets',
+				name: VIEWS.EXTERNAL_SECRETS_SETTINGS,
+				components: {
+					settingsView: SettingsExternalSecrets,
+				},
+				meta: {
+					middleware: ['authenticated', 'rbac'],
+					middlewareOptions: {
+						rbac: {
+							scope: ['externalSecretsProvider:list', 'externalSecretsProvider:update'],
 						},
-						deny: {
-							shouldDeny: () => !window.localStorage.getItem('version-control'),
+					},
+					telemetry: {
+						pageCategory: 'settings',
+						getProperties(route: RouteLocation) {
+							return {
+								feature: 'external-secrets',
+							};
 						},
 					},
 				},
@@ -611,25 +605,24 @@ export const routes = [
 					settingsView: SettingsSso,
 				},
 				meta: {
+					middleware: ['authenticated', 'rbac', 'custom'],
+					middlewareOptions: {
+						custom: () => {
+							const settingsStore = useSettingsStore();
+							return !settingsStore.isDesktopDeployment;
+						},
+						rbac: {
+							scope: 'saml:manage',
+						},
+					},
 					telemetry: {
 						pageCategory: 'settings',
-						getProperties(route: Route) {
+						getProperties(route: RouteLocation) {
 							return {
 								feature: 'sso',
 							};
 						},
 					},
-					permissions: {
-						allow: {
-							role: [ROLE.Owner],
-						},
-						deny: {
-							shouldDeny: () => {
-								const settingsStore = useSettingsStore();
-								return settingsStore.isCloudDeployment || settingsStore.isDesktopDeployment;
-							},
-						},
-					},
 				},
 			},
 			{
@@ -639,17 +632,25 @@ export const routes = [
 					settingsView: SettingsLogStreamingView,
 				},
 				meta: {
+					middleware: ['authenticated', 'rbac'],
+					middlewareOptions: {
+						rbac: {
+							scope: 'logStreaming:manage',
+						},
+					},
 					telemetry: {
 						pageCategory: 'settings',
 					},
-					permissions: {
-						allow: {
-							role: [ROLE.Default, ROLE.Owner],
-						},
-						deny: {
-							role: [ROLE.Member],
-						},
-					},
+				},
+			},
+			{
+				path: 'workers',
+				name: VIEWS.WORKER_VIEW,
+				components: {
+					settingsView: WorkerView,
+				},
+				meta: {
+					middleware: ['authenticated'],
 				},
 			},
 			{
@@ -659,20 +660,19 @@ export const routes = [
 					settingsView: SettingsCommunityNodesView,
 				},
 				meta: {
-					telemetry: {
-						pageCategory: 'settings',
-					},
-					permissions: {
-						allow: {
-							role: [ROLE.Default, ROLE.Owner],
+					middleware: ['authenticated', 'rbac', 'custom'],
+					middlewareOptions: {
+						rbac: {
+							scope: ['communityPackage:list', 'communityPackage:update'],
 						},
-						deny: {
-							shouldDeny: () => {
-								const settingsStore = useSettingsStore();
-								return settingsStore.isCommunityNodesFeatureEnabled === false;
-							},
+						custom: () => {
+							const settingsStore = useSettingsStore();
+							return settingsStore.isCommunityNodesFeatureEnabled;
 						},
 					},
+					telemetry: {
+						pageCategory: 'settings',
+					},
 				},
 			},
 			{
@@ -682,19 +682,15 @@ export const routes = [
 					settingsView: SettingsFakeDoorView,
 				},
 				meta: {
+					middleware: ['authenticated'],
 					telemetry: {
 						pageCategory: 'settings',
-						getProperties(route: Route) {
+						getProperties(route: RouteLocation) {
 							return {
-								feature: route.params['featureId'],
+								feature: route.params.featureId,
 							};
 						},
 					},
-					permissions: {
-						allow: {
-							loginStatus: [LOGIN_STATUS.LoggedIn],
-						},
-					},
 				},
 			},
 			{
@@ -704,14 +700,68 @@ export const routes = [
 					settingsView: SettingsLdapView,
 				},
 				meta: {
-					permissions: {
-						allow: {
-							role: [ROLE.Default, ROLE.Owner],
+					middleware: ['authenticated', 'rbac'],
+					middlewareOptions: {
+						rbac: {
+							scope: 'ldap:manage',
+						},
+					},
+				},
+			},
+			{
+				path: 'test-suites',
+				name: VIEWS.TEST_SUITES,
+				components: {
+					settingsView: TestSuitesView,
+				},
+				meta: {
+					telemetry: {
+						pageCategory: 'settings',
+					},
+					meta: {
+						middleware: ['authenticated'],
+					},
+				},
+			},
+			{
+				path: 'test-suites/:workflow',
+				name: VIEWS.TEST_SUITE,
+				components: {
+					settingsView: TestSuiteView,
+				},
+				meta: {
+					telemetry: {
+						pageCategory: 'settings',
+						getProperties(route: RouteLocation) {
+							return {
+								workflow: route.params['workflow'],
+							};
 						},
-						deny: {
-							role: [ROLE.Member],
+					},
+					meta: {
+						middleware: ['authenticated'],
+					},
+				},
+			},
+			{
+				path: 'test-suites/:workflow/:test',
+				name: VIEWS.TEST_SUITE_NODES,
+				components: {
+					settingsView: TestSuiteNodeView,
+				},
+				meta: {
+					telemetry: {
+						pageCategory: 'settings',
+						getProperties(route: RouteLocation) {
+							return {
+								workflow: route.params['workflow'],
+								test: route.params['test'],
+							};
 						},
 					},
+					meta: {
+						middleware: ['authenticated'],
+					},
 				},
 			},
 		],
@@ -723,29 +773,25 @@ export const routes = [
 			default: SamlOnboarding,
 		},
 		meta: {
+			middleware: ['authenticated', 'custom'],
+			middlewareOptions: {
+				custom: () => {
+					const settingsStore = useSettingsStore();
+					const ssoStore = useSSOStore();
+					return (
+						ssoStore.isEnterpriseSamlEnabled &&
+						!settingsStore.isCloudDeployment &&
+						!settingsStore.isDesktopDeployment
+					);
+				},
+			},
 			telemetry: {
 				pageCategory: 'auth',
 			},
-			permissions: {
-				allow: {
-					loginStatus: [LOGIN_STATUS.LoggedIn],
-				},
-				deny: {
-					shouldDeny: () => {
-						const settingsStore = useSettingsStore();
-						const ssoStore = useSSOStore();
-						return (
-							!ssoStore.isEnterpriseSamlEnabled ||
-							settingsStore.isCloudDeployment ||
-							settingsStore.isDesktopDeployment
-						);
-					},
-				},
-			},
 		},
 	},
 	{
-		path: '*',
+		path: '/:pathMatch(.*)*',
 		name: VIEWS.NOT_FOUND,
 		component: ErrorView,
 		props: {
@@ -759,27 +805,119 @@ export const routes = [
 			telemetry: {
 				disabled: true,
 			},
-			permissions: {
-				allow: {
-					// TODO: Once custom permissions are merged, this needs to be updated with index validation
-					loginStatus: [LOGIN_STATUS.LoggedIn, LOGIN_STATUS.LoggedOut],
-				},
-			},
 		},
 	},
-] as IRouteConfig[];
+] as Array<RouteRecordRaw & RouteConfig>;
+
+function withCanvasReadOnlyMeta(route: RouteRecordRaw) {
+	if (!route.meta) {
+		route.meta = {};
+	}
+	route.meta.readOnlyCanvas = !EDITABLE_CANVAS_VIEWS.includes((route?.name ?? '') as VIEWS);
+
+	if (route.children) {
+		route.children = route.children.map(withCanvasReadOnlyMeta);
+	}
+
+	return route;
+}
 
-const router = new Router({
-	mode: 'history',
-	base: import.meta.env.DEV ? '/' : window.BASE_PATH ?? '/',
-	scrollBehavior(to, from, savedPosition) {
+const router = createRouter({
+	history: createWebHistory(import.meta.env.DEV ? '/' : window.BASE_PATH ?? '/'),
+	scrollBehavior(to: RouteLocationNormalized & RouteConfig, from, savedPosition) {
 		// saved position == null means the page is NOT visited from history (back button)
-		if (savedPosition === null && to.name === VIEWS.TEMPLATES && to.meta) {
+		if (savedPosition === null && to.name === VIEWS.TEMPLATES && to.meta?.setScrollPosition) {
 			// for templates view, reset scroll position in this case
 			to.meta.setScrollPosition(0);
 		}
 	},
-	routes,
+	routes: routes.map(withCanvasReadOnlyMeta),
+});
+
+router.beforeEach(async (to: RouteLocationNormalized & RouteConfig, from, next) => {
+	try {
+		/**
+		 * Initialize application core
+		 * This step executes before first route is loaded and is required for permission checks
+		 */
+
+		await initializeCore();
+
+		/**
+		 * Redirect to setup page. User should be redirected to this only once
+		 */
+
+		const settingsStore = useSettingsStore();
+		if (settingsStore.showSetupPage) {
+			if (to.name === VIEWS.SETUP) {
+				return next();
+			}
+
+			return next({ name: VIEWS.SETUP });
+		}
+
+		/**
+		 * Verify user permissions for current route
+		 */
+
+		const routeMiddleware = to.meta?.middleware ?? [];
+		const routeMiddlewareOptions = to.meta?.middlewareOptions ?? {};
+		for (const middlewareName of routeMiddleware) {
+			let nextCalled = false;
+			const middlewareNext = ((location: RouteLocationRaw): void => {
+				next(location);
+				nextCalled = true;
+			}) as NavigationGuardNext;
+
+			const middlewareOptions = routeMiddlewareOptions[middlewareName];
+			const middlewareFn = middleware[middlewareName] as RouterMiddleware<unknown>;
+			await middlewareFn(to, from, middlewareNext, middlewareOptions);
+
+			if (nextCalled) {
+				return;
+			}
+		}
+
+		return next();
+	} catch (failure) {
+		if (isNavigationFailure(failure)) {
+			console.log(failure);
+		} else {
+			console.error(failure);
+		}
+	}
+});
+
+router.afterEach((to, from) => {
+	try {
+		const telemetry = useTelemetry();
+		const uiStore = useUIStore();
+		const templatesStore = useTemplatesStore();
+
+		/**
+		 * Run external hooks
+		 */
+
+		void useExternalHooks().run('main.routeChange', { from, to });
+
+		/**
+		 * Track current view for telemetry
+		 */
+
+		uiStore.currentView = (to.name as string) ?? '';
+		if (to.meta?.templatesEnabled) {
+			templatesStore.setSessionId();
+		} else {
+			templatesStore.resetSessionId(); // reset telemetry session id when user leaves template pages
+		}
+		telemetry.page(to);
+	} catch (failure) {
+		if (isNavigationFailure(failure)) {
+			console.log(failure);
+		} else {
+			console.error(failure);
+		}
+	}
 });
 
 export default router;
diff --git a/packages/editor-ui/src/shims-vue.d.ts b/packages/editor-ui/src/shims-vue.d.ts
index 84072c1301a6e..6d9f9c73096bd 100644
--- a/packages/editor-ui/src/shims-vue.d.ts
+++ b/packages/editor-ui/src/shims-vue.d.ts
@@ -1,13 +1,22 @@
-import Vue from 'vue';
-import 'n8n-design-system/shims-element-ui';
+import type { I18nClass } from '@/plugins/i18n';
+import type { Route } from 'vue-router';
+import type { Telemetry } from '@/plugins/telemetry';
 
-declare module '*.vue' {
-	import Vue from 'vue';
-	export default Vue;
-}
+declare module 'vue' {
+	interface ComponentCustomOptions {
+		beforeRouteEnter?(to: Route, from: Route, next: () => void): void;
+		beforeRouteLeave?(to: Route, from: Route, next: () => void): void;
+		beforeRouteUpdate?(to: Route, from: Route, next: () => void): void;
+	}
 
-declare module 'vue/types/vue' {
-	interface Vue {
+	interface ComponentCustomProperties {
 		$style: Record<string, string>;
+		$locale: I18nClass;
+		$telemetry: Telemetry;
 	}
 }
+
+/**
+ * @docs https://vuejs.org/guide/typescript/options-api.html#augmenting-global-properties
+ */
+export {};
diff --git a/packages/editor-ui/src/shims.d.ts b/packages/editor-ui/src/shims.d.ts
index c239427b96965..b4da29d5927aa 100644
--- a/packages/editor-ui/src/shims.d.ts
+++ b/packages/editor-ui/src/shims.d.ts
@@ -1,6 +1,6 @@
-import Vue, { VNode } from 'vue';
-import type { Store } from 'pinia';
-import type { IDataObject } from 'n8n-workflow';
+import { VNode, ComponentPublicInstance } from 'vue';
+import { PartialDeep } from 'type-fest';
+import { ExternalHooks } from '@/types/externalHooks';
 
 declare module 'markdown-it-link-attributes';
 declare module 'markdown-it-emoji';
@@ -13,22 +13,19 @@ declare global {
 			PROD: boolean;
 			NODE_ENV: 'development' | 'production';
 			VUE_APP_URL_BASE_API: string;
-			MODE: string;
+			VUE_APP_MAX_PINNED_DATA_SIZE: string;
 		};
 	}
 
 	interface Window {
 		BASE_PATH: string;
 		REST_ENDPOINT: string;
-		n8nExternalHooks?: Record<
-			string,
-			Record<string, Array<(store: Store, metadata?: IDataObject) => Promise<void>>>
-		>;
+		n8nExternalHooks?: PartialDeep<ExternalHooks>;
 	}
 
 	namespace JSX {
 		interface Element extends VNode {}
-		interface ElementClass extends Vue {}
+		interface ElementClass extends ComponentPublicInstance {}
 		interface IntrinsicElements {
 			[elem: string]: any;
 		}
diff --git a/packages/editor-ui/src/stores/__tests__/credentials.spec.ts b/packages/editor-ui/src/stores/__tests__/credentials.spec.ts
index 96539a2dc7ac0..1ced5a9a73ac2 100644
--- a/packages/editor-ui/src/stores/__tests__/credentials.spec.ts
+++ b/packages/editor-ui/src/stores/__tests__/credentials.spec.ts
@@ -1,7 +1,7 @@
 import { afterAll, beforeAll } from 'vitest';
 import { setActivePinia, createPinia } from 'pinia';
 import { setupServer } from '@/__tests__/server';
-import { useCredentialsStore } from '@/stores/credentials';
+import { useCredentialsStore } from '@/stores/credentials.store';
 
 describe('store', () => {
 	let server: ReturnType<typeof setupServer>;
diff --git a/packages/editor-ui/src/stores/__tests__/environments.spec.ts b/packages/editor-ui/src/stores/__tests__/environments.spec.ts
index c6fcd61b83a80..123254ff75680 100644
--- a/packages/editor-ui/src/stores/__tests__/environments.spec.ts
+++ b/packages/editor-ui/src/stores/__tests__/environments.spec.ts
@@ -1,10 +1,10 @@
 import { afterAll, beforeAll } from 'vitest';
 import { setActivePinia, createPinia } from 'pinia';
 import { setupServer } from '@/__tests__/server';
-import { useEnvironmentsStore } from '@/stores/environments.ee';
+import { useEnvironmentsStore } from '@/stores/environments.ee.store';
 import type { EnvironmentVariable } from '@/Interface';
 
-describe('store', () => {
+describe('environments.store', () => {
 	let server: ReturnType<typeof setupServer>;
 	const seedRecordsCount = 3;
 
diff --git a/packages/editor-ui/src/stores/__tests__/posthog.test.ts b/packages/editor-ui/src/stores/__tests__/posthog.test.ts
index b7054b232fb3f..c007ab0d7ca51 100644
--- a/packages/editor-ui/src/stores/__tests__/posthog.test.ts
+++ b/packages/editor-ui/src/stores/__tests__/posthog.test.ts
@@ -1,10 +1,13 @@
 import { createPinia, setActivePinia } from 'pinia';
-import { usePostHog } from '@/stores/posthog';
-import { useUsersStore } from '@/stores/users';
-import { useSettingsStore } from '@/stores/settings';
-import { useRootStore } from '@/stores/n8nRootStore';
-import { useTelemetryStore } from '@/stores/telemetry';
+import { usePostHog } from '@/stores/posthog.store';
+import { useUsersStore } from '@/stores/users.store';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import { useTelemetryStore } from '@/stores/telemetry.store';
 import type { IN8nUISettings } from 'n8n-workflow';
+import { LOCAL_STORAGE_EXPERIMENT_OVERRIDES } from '@/constants';
+import { nextTick } from 'vue';
+import { defaultSettings } from '../../__tests__/defaults';
 
 const DEFAULT_POSTHOG_SETTINGS: IN8nUISettings['posthog'] = {
 	enabled: true,
@@ -19,6 +22,7 @@ const CURRENT_INSTANCE_ID = '456';
 
 function setSettings(overrides?: Partial<IN8nUISettings>) {
 	useSettingsStore().setSettings({
+		...defaultSettings,
 		posthog: DEFAULT_POSTHOG_SETTINGS,
 		instanceId: CURRENT_INSTANCE_ID,
 		...overrides,
@@ -55,7 +59,6 @@ function setup() {
 
 	vi.spyOn(window.posthog, 'init');
 	vi.spyOn(window.posthog, 'identify');
-	vi.spyOn(window.Storage.prototype, 'setItem');
 	vi.spyOn(telemetryStore, 'track');
 }
 
@@ -117,7 +120,7 @@ describe('Posthog store', () => {
 			});
 		});
 
-		it('sets override feature flags', () => {
+		it('sets override feature flags', async () => {
 			const TEST = 'test';
 			const flags = {
 				[TEST]: 'variant',
@@ -126,17 +129,17 @@ describe('Posthog store', () => {
 			posthog.init(flags);
 
 			window.featureFlags?.override(TEST, 'override');
+			await nextTick();
 
 			expect(posthog.getVariant('test')).toEqual('override');
 			expect(window.posthog?.init).toHaveBeenCalled();
-			expect(window.localStorage.setItem).toHaveBeenCalledWith(
-				'N8N_EXPERIMENT_OVERRIDES',
+			expect(window.localStorage.getItem(LOCAL_STORAGE_EXPERIMENT_OVERRIDES)).toEqual(
 				JSON.stringify({ test: 'override' }),
 			);
 
 			window.featureFlags?.override('other_test', 'override');
-			expect(window.localStorage.setItem).toHaveBeenCalledWith(
-				'N8N_EXPERIMENT_OVERRIDES',
+			await nextTick();
+			expect(window.localStorage.getItem(LOCAL_STORAGE_EXPERIMENT_OVERRIDES)).toEqual(
 				JSON.stringify({ test: 'override', other_test: 'override' }),
 			);
 		});
diff --git a/packages/editor-ui/src/stores/__tests__/rbac.store.test.ts b/packages/editor-ui/src/stores/__tests__/rbac.store.test.ts
new file mode 100644
index 0000000000000..b0e06c643e011
--- /dev/null
+++ b/packages/editor-ui/src/stores/__tests__/rbac.store.test.ts
@@ -0,0 +1,152 @@
+import { createPinia, setActivePinia } from 'pinia';
+import { useRBACStore } from '@/stores/rbac.store';
+import type { Scope } from '@n8n/permissions';
+import { hasScope } from '@n8n/permissions';
+
+vi.mock('@n8n/permissions', async () => {
+	// eslint-disable-next-line @typescript-eslint/consistent-type-imports
+	const { hasScope } = await vi.importActual<typeof import('@n8n/permissions')>('@n8n/permissions');
+	return {
+		hasScope: vi.fn().mockImplementation(hasScope),
+	};
+});
+
+describe('RBAC store', () => {
+	beforeEach(() => {
+		setActivePinia(createPinia());
+	});
+
+	describe('addGlobalScope()', () => {
+		it('should add global scope', () => {
+			const newScope = 'example:list' as Scope;
+			const rbacStore = useRBACStore();
+			rbacStore.addGlobalScope(newScope);
+			expect(rbacStore.globalScopes).toContain(newScope);
+		});
+
+		it('should not add global scope if it already exists', () => {
+			const newScope = 'example:list' as Scope;
+			const rbacStore = useRBACStore();
+			rbacStore.addGlobalScope(newScope);
+			rbacStore.addGlobalScope(newScope);
+			expect(rbacStore.globalScopes.filter((scope) => scope === newScope)).toHaveLength(1);
+		});
+	});
+
+	describe('addProjectScope()', () => {
+		it('should add project scope', () => {
+			const newScope = 'example:list' as Scope;
+			const rbacStore = useRBACStore();
+			rbacStore.addProjectScope(newScope, { projectId: '1' });
+			expect(rbacStore.scopesByProjectId['1']).toContain(newScope);
+		});
+
+		it('should not add project scope if it already exists', () => {
+			const newScope = 'example:list' as Scope;
+			const rbacStore = useRBACStore();
+			rbacStore.addProjectScope(newScope, { projectId: '1' });
+			rbacStore.addProjectScope(newScope, { projectId: '1' });
+			expect(rbacStore.scopesByProjectId['1'].filter((scope) => scope === newScope)).toHaveLength(
+				1,
+			);
+		});
+	});
+
+	describe('addResourceScope()', () => {
+		it('should add resource scope', () => {
+			const newScope = 'example:list' as Scope;
+			const rbacStore = useRBACStore();
+			rbacStore.addResourceScope(newScope, { resourceId: '1', resourceType: 'variable' });
+			expect(rbacStore.scopesByResourceId.variable['1']).toContain(newScope);
+		});
+
+		it('should not add resource scope if it already exists', () => {
+			const newScope = 'example:list' as Scope;
+			const rbacStore = useRBACStore();
+			rbacStore.addResourceScope(newScope, { resourceId: '1', resourceType: 'variable' });
+			rbacStore.addResourceScope(newScope, { resourceId: '1', resourceType: 'variable' });
+			expect(
+				rbacStore.scopesByResourceId.variable['1'].filter((scope) => scope === newScope),
+			).toHaveLength(1);
+		});
+	});
+
+	describe('hasScope()', () => {
+		it('evaluates global scope correctly', () => {
+			const newScope = 'example:list' as Scope;
+			const store = useRBACStore();
+			store.addGlobalScope(newScope);
+
+			const result = store.hasScope(newScope, {});
+			expect(result).toBe(true);
+			expect(vi.mocked(hasScope)).toHaveBeenCalledWith(
+				newScope,
+				{
+					global: expect.arrayContaining([newScope]),
+					project: [],
+					resource: [],
+				},
+				undefined,
+			);
+		});
+
+		it('evaluates project scope correctly', () => {
+			const newScope = 'example:list' as Scope;
+			const store = useRBACStore();
+			store.addProjectScope(newScope, { projectId: '1' });
+
+			const result = store.hasScope(newScope, { projectId: '1' });
+			expect(result).toBe(true);
+			expect(vi.mocked(hasScope)).toHaveBeenCalledWith(
+				newScope,
+				{
+					global: expect.any(Array),
+					project: expect.arrayContaining([newScope]),
+					resource: [],
+				},
+				undefined,
+			);
+		});
+
+		it('evaluates resource scope correctly', () => {
+			const newScope = 'example:list' as Scope;
+			const store = useRBACStore();
+			store.addResourceScope(newScope, { resourceId: '1', resourceType: 'variable' });
+
+			const result = store.hasScope(newScope, { resourceId: '1', resourceType: 'variable' });
+			expect(result).toBe(true);
+			expect(vi.mocked(hasScope)).toHaveBeenCalledWith(
+				newScope,
+				{
+					global: expect.any(Array),
+					project: [],
+					resource: expect.arrayContaining([newScope]),
+				},
+				undefined,
+			);
+		});
+
+		it('evaluates project and resource scope correctly', () => {
+			const newScope = 'example:list' as Scope;
+			const store = useRBACStore();
+			store.addProjectScope(newScope, { projectId: '1' });
+			store.addResourceScope(newScope, { resourceId: '1', resourceType: 'variable' });
+
+			const result = store.hasScope(newScope, {
+				projectId: '1',
+				resourceId: '1',
+				resourceType: 'variable',
+			});
+			expect(result).toBe(true);
+			expect(vi.mocked(hasScope)).toHaveBeenCalledWith(
+				newScope,
+				{
+					global: expect.any(Array),
+					project: expect.arrayContaining([newScope]),
+					resource: expect.arrayContaining([newScope]),
+				},
+				undefined,
+			);
+		});
+	});
+});
diff --git a/packages/editor-ui/src/stores/__tests__/sso.test.ts b/packages/editor-ui/src/stores/__tests__/sso.test.ts
index d07cf3747ef8f..b21d5aeb1f5ac 100644
--- a/packages/editor-ui/src/stores/__tests__/sso.test.ts
+++ b/packages/editor-ui/src/stores/__tests__/sso.test.ts
@@ -1,6 +1,6 @@
 import { createPinia, setActivePinia } from 'pinia';
-import { useSettingsStore } from '@/stores/settings';
-import { useSSOStore } from '@/stores/sso';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useSSOStore } from '@/stores/sso.store';
 import { merge } from 'lodash-es';
 import { SETTINGS_STORE_DEFAULT_STATE } from '@/__tests__/utils';
 import type { IN8nUISettings } from 'n8n-workflow';
diff --git a/packages/editor-ui/src/stores/__tests__/ui.test.ts b/packages/editor-ui/src/stores/__tests__/ui.test.ts
index 8b076252168dd..092d66842a459 100644
--- a/packages/editor-ui/src/stores/__tests__/ui.test.ts
+++ b/packages/editor-ui/src/stores/__tests__/ui.test.ts
@@ -1,39 +1,109 @@
 import { createPinia, setActivePinia } from 'pinia';
-import { useUIStore } from '@/stores/ui';
-import { useSettingsStore } from '@/stores/settings';
+import { useUIStore } from '@/stores/ui.store';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useUsersStore } from '@/stores/users.store';
 import { merge } from 'lodash-es';
 import { SETTINGS_STORE_DEFAULT_STATE } from '@/__tests__/utils';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import { useCloudPlanStore } from '@/stores/cloudPlan.store';
+import * as cloudPlanApi from '@/api/cloudPlans';
+import {
+	getTrialExpiredUserResponse,
+	getTrialingUserResponse,
+	getUserCloudInfo,
+	getNotTrialingUserResponse,
+} from './utils/cloudStoreUtils';
+import type { IRole } from '@/Interface';
+import { ROLE } from '@/constants';
 
 let uiStore: ReturnType<typeof useUIStore>;
 let settingsStore: ReturnType<typeof useSettingsStore>;
+let rootStore: ReturnType<typeof useRootStore>;
+let cloudPlanStore: ReturnType<typeof useCloudPlanStore>;
+
+function setUser(role: IRole) {
+	useUsersStore().addUsers([
+		{
+			id: '1',
+			isPending: false,
+			role,
+		},
+	]);
+
+	useUsersStore().currentUserId = '1';
+}
+
+function setupOwnerAndCloudDeployment() {
+	setUser(ROLE.Owner);
+	settingsStore.setSettings(
+		merge({}, SETTINGS_STORE_DEFAULT_STATE.settings, {
+			n8nMetadata: {
+				userId: '1',
+			},
+			deployment: { type: 'cloud' },
+		}),
+	);
+}
 
 describe('UI store', () => {
+	let mockedCloudStore;
+
 	beforeEach(() => {
 		setActivePinia(createPinia());
 		uiStore = useUIStore();
 		settingsStore = useSettingsStore();
+		rootStore = useRootStore();
+		cloudPlanStore = useCloudPlanStore();
+
+		mockedCloudStore = vi.spyOn(cloudPlanStore, 'getAutoLoginCode');
+		mockedCloudStore.mockImplementationOnce(async () => ({
+			code: '123',
+		}));
+
+		global.window = Object.create(window);
+
+		const url = 'https://test.app.n8n.cloud';
+
+		Object.defineProperty(window, 'location', {
+			value: {
+				href: url,
+			},
+			writable: true,
+		});
 	});
 
 	test.each([
 		[
 			'default',
 			'production',
-			'https://subscription.n8n.io?instanceid=123abc&version=0.223.0&source=test_source',
+			ROLE.Owner,
+			'https://n8n.io/pricing?utm_campaign=utm-test-campaign&source=test_source',
 		],
 		[
 			'default',
 			'development',
-			'https://staging-subscription.n8n.io?instanceid=123abc&version=0.223.0&source=test_source',
+			ROLE.Owner,
+			'https://n8n.io/pricing?utm_campaign=utm-test-campaign&source=test_source',
 		],
 		[
-			'desktop_win',
+			'cloud',
 			'production',
-			'https://n8n.io/pricing/?utm_source=n8n-internal&utm_medium=desktop&utm_campaign=utm-test-campaign',
+			ROLE.Owner,
+			`https://app.n8n.cloud/login?code=123&returnPath=${encodeURIComponent(
+				'/account/change-plan',
+			)}&utm_campaign=utm-test-campaign&source=test_source`,
+		],
+		[
+			'cloud',
+			'production',
+			ROLE.Member,
+			'https://n8n.io/pricing?utm_campaign=utm-test-campaign&source=test_source',
 		],
-		['cloud', 'production', 'https://app.n8n.cloud/account/change-plan'],
 	])(
-		'"upgradeLinkUrl" should generate the correct URL for "%s" deployment and "%s" license environment',
-		(type, environment, expectation) => {
+		'"upgradeLinkUrl" should generate the correct URL for "%s" deployment and "%s" license environment and user role "%s"',
+		async (type, environment, role, expectation) => {
+			setUser(role as IRole);
+
 			settingsStore.setSettings(
 				merge({}, SETTINGS_STORE_DEFAULT_STATE.settings, {
 					deployment: {
@@ -47,7 +117,99 @@ describe('UI store', () => {
 				}),
 			);
 
-			expect(uiStore.upgradeLinkUrl('test_source', 'utm-test-campaign')).toBe(expectation);
+			const updateLinkUrl = await uiStore.upgradeLinkUrl('test_source', 'utm-test-campaign', type);
+
+			expect(updateLinkUrl).toBe(expectation);
 		},
 	);
+
+	it('should add non-production license banner to stack based on enterprise settings', () => {
+		settingsStore.setSettings(
+			merge({}, SETTINGS_STORE_DEFAULT_STATE.settings, {
+				enterprise: {
+					showNonProdBanner: true,
+				},
+			}),
+		);
+		expect(uiStore.bannerStack).toContain('NON_PRODUCTION_LICENSE');
+	});
+
+	it("should add V1 banner to stack if it's not dismissed", () => {
+		settingsStore.setSettings(
+			merge({}, SETTINGS_STORE_DEFAULT_STATE.settings, {
+				versionCli: '1.0.0',
+			}),
+		);
+		expect(uiStore.bannerStack).toContain('V1');
+	});
+
+	it("should not add V1 banner to stack if it's dismissed", () => {
+		settingsStore.setSettings(
+			merge({}, SETTINGS_STORE_DEFAULT_STATE.settings, {
+				versionCli: '1.0.0',
+				banners: {
+					dismissed: ['V1'],
+				},
+			}),
+		);
+		expect(uiStore.bannerStack).not.toContain('V1');
+	});
+
+	it('should add trial banner to the the stack', async () => {
+		const fetchCloudSpy = vi
+			.spyOn(cloudPlanApi, 'getCurrentPlan')
+			.mockResolvedValue(getTrialingUserResponse());
+		const fetchUserCloudAccountSpy = vi
+			.spyOn(cloudPlanApi, 'getCloudUserInfo')
+			.mockResolvedValue(getUserCloudInfo(true));
+		const getCurrentUsageSpy = vi
+			.spyOn(cloudPlanApi, 'getCurrentUsage')
+			.mockResolvedValue({ executions: 1000, activeWorkflows: 100 });
+		setupOwnerAndCloudDeployment();
+		await cloudPlanStore.checkForCloudPlanData();
+		await cloudPlanStore.fetchUserCloudAccount();
+		expect(fetchCloudSpy).toHaveBeenCalled();
+		expect(fetchUserCloudAccountSpy).toHaveBeenCalled();
+		expect(getCurrentUsageSpy).toHaveBeenCalled();
+		expect(uiStore.bannerStack).toContain('TRIAL');
+		// There should be no email confirmation banner for trialing users
+		expect(uiStore.bannerStack).not.toContain('EMAIL_CONFIRMATION');
+	});
+
+	it('should add trial over banner to the the stack', async () => {
+		const fetchCloudSpy = vi
+			.spyOn(cloudPlanApi, 'getCurrentPlan')
+			.mockResolvedValue(getTrialExpiredUserResponse());
+		const fetchUserCloudAccountSpy = vi
+			.spyOn(cloudPlanApi, 'getCloudUserInfo')
+			.mockResolvedValue(getUserCloudInfo(true));
+		setupOwnerAndCloudDeployment();
+		const getCurrentUsageSpy = vi
+			.spyOn(cloudPlanApi, 'getCurrentUsage')
+			.mockResolvedValue({ executions: 1000, activeWorkflows: 100 });
+		setupOwnerAndCloudDeployment();
+		await cloudPlanStore.checkForCloudPlanData();
+		await cloudPlanStore.fetchUserCloudAccount();
+		expect(fetchCloudSpy).toHaveBeenCalled();
+		expect(fetchUserCloudAccountSpy).toHaveBeenCalled();
+		expect(getCurrentUsageSpy).toHaveBeenCalled();
+		expect(uiStore.bannerStack).toContain('TRIAL_OVER');
+		// There should be no email confirmation banner for trialing users
+		expect(uiStore.bannerStack).not.toContain('EMAIL_CONFIRMATION');
+	});
+
+	it('should add email confirmation banner to the the stack', async () => {
+		const fetchCloudSpy = vi
+			.spyOn(cloudPlanApi, 'getCurrentPlan')
+			.mockResolvedValue(getNotTrialingUserResponse());
+		const fetchUserCloudAccountSpy = vi
+			.spyOn(cloudPlanApi, 'getCloudUserInfo')
+			.mockResolvedValue(getUserCloudInfo(false));
+		setupOwnerAndCloudDeployment();
+		await cloudPlanStore.checkForCloudPlanData();
+		await cloudPlanStore.fetchUserCloudAccount();
+		expect(fetchCloudSpy).toHaveBeenCalled();
+		expect(fetchUserCloudAccountSpy).toHaveBeenCalled();
+		expect(uiStore.bannerStack).toContain('EMAIL_CONFIRMATION');
+	});
 });
diff --git a/packages/editor-ui/src/stores/__tests__/usage.test.ts b/packages/editor-ui/src/stores/__tests__/usage.test.ts
index ea51ca7a1cd1c..9a2dbc419d9f4 100644
--- a/packages/editor-ui/src/stores/__tests__/usage.test.ts
+++ b/packages/editor-ui/src/stores/__tests__/usage.test.ts
@@ -1,5 +1,5 @@
 import { createPinia, setActivePinia } from 'pinia';
-import { useUsageStore } from '@/stores/usage';
+import { useUsageStore } from '@/stores/usage.store';
 
 describe('Usage and plan store', () => {
 	beforeEach(() => {
diff --git a/packages/editor-ui/src/stores/__tests__/utils/cloudStoreUtils.ts b/packages/editor-ui/src/stores/__tests__/utils/cloudStoreUtils.ts
new file mode 100644
index 0000000000000..a74e7db78e82f
--- /dev/null
+++ b/packages/editor-ui/src/stores/__tests__/utils/cloudStoreUtils.ts
@@ -0,0 +1,50 @@
+import type { Cloud } from '@/Interface';
+
+// Mocks cloud plan API responses with different trial expiration dates
+function getUserPlanData(trialExpirationDate: Date, isTrial = true): Cloud.PlanData {
+	return {
+		planId: 0,
+		monthlyExecutionsLimit: 1000,
+		activeWorkflowsLimit: 10,
+		credentialsLimit: 100,
+		isActive: true,
+		displayName: 'Trial',
+		metadata: {
+			group: isTrial ? 'trial' : 'opt-in',
+			slug: 'trial-1',
+			trial: {
+				gracePeriod: 3,
+				length: 7,
+			},
+			version: 'v1',
+		},
+		expirationDate: trialExpirationDate.toISOString(),
+	};
+}
+
+// Mocks cloud user API responses with different confirmed states
+export function getUserCloudInfo(confirmed: boolean): Cloud.UserAccount {
+	return {
+		confirmed,
+		email: 'test@test.com',
+		username: 'test',
+	};
+}
+
+export function getTrialingUserResponse(): Cloud.PlanData {
+	const dateInThePast = new Date();
+	dateInThePast.setDate(dateInThePast.getDate() + 3);
+	return getUserPlanData(dateInThePast);
+}
+
+export function getTrialExpiredUserResponse(): Cloud.PlanData {
+	const dateInThePast = new Date();
+	dateInThePast.setDate(dateInThePast.getDate() - 3);
+	return getUserPlanData(dateInThePast);
+}
+
+export function getNotTrialingUserResponse(): Cloud.PlanData {
+	const inThreeDays = new Date();
+	inThreeDays.setDate(inThreeDays.getDate() + 3);
+	return getUserPlanData(inThreeDays, false);
+}
diff --git a/packages/editor-ui/src/stores/__tests__/utils/workflowHistoryTestUtils.ts b/packages/editor-ui/src/stores/__tests__/utils/workflowHistoryTestUtils.ts
new file mode 100644
index 0000000000000..7e62e20cb188e
--- /dev/null
+++ b/packages/editor-ui/src/stores/__tests__/utils/workflowHistoryTestUtils.ts
@@ -0,0 +1,18 @@
+import { faker } from '@faker-js/faker';
+import type { WorkflowHistory, WorkflowVersion } from '@/types/workflowHistory';
+
+export const workflowHistoryDataFactory: () => WorkflowHistory = () => ({
+	versionId: faker.string.nanoid(),
+	createdAt: faker.date.past().toDateString(),
+	updatedAt: faker.date.past().toDateString(),
+	authors: Array.from({ length: faker.number.int({ min: 2, max: 5 }) }, faker.person.fullName).join(
+		', ',
+	),
+});
+
+export const workflowVersionDataFactory: () => WorkflowVersion = () => ({
+	...workflowHistoryDataFactory(),
+	workflowId: faker.string.nanoid(),
+	connections: {},
+	nodes: [],
+});
diff --git a/packages/editor-ui/src/stores/__tests__/workflowHistory.store.test.ts b/packages/editor-ui/src/stores/__tests__/workflowHistory.store.test.ts
new file mode 100644
index 0000000000000..e4b254f47847d
--- /dev/null
+++ b/packages/editor-ui/src/stores/__tests__/workflowHistory.store.test.ts
@@ -0,0 +1,34 @@
+import { createPinia, setActivePinia } from 'pinia';
+import type { IN8nUISettings } from 'n8n-workflow';
+import { useWorkflowHistoryStore } from '@/stores/workflowHistory.store';
+import { useSettingsStore } from '@/stores/settings.store';
+
+describe('Workflow history store', () => {
+	beforeEach(() => {
+		setActivePinia(createPinia());
+	});
+
+	test.each([
+		[true, 1, 1],
+		[true, 2, 2],
+		[false, 1, 2],
+		[false, 2, 1],
+		[false, -1, 2],
+		[false, 2, -1],
+	])(
+		'should set `shouldUpgrade` to %s when pruneTime is %s and licensePruneTime is %s',
+		(shouldUpgrade, pruneTime, licensePruneTime) => {
+			const workflowHistoryStore = useWorkflowHistoryStore();
+			const settingsStore = useSettingsStore();
+
+			settingsStore.settings = {
+				workflowHistory: {
+					pruneTime,
+					licensePruneTime,
+				},
+			} as IN8nUISettings;
+
+			expect(workflowHistoryStore.shouldUpgrade).toBe(shouldUpgrade);
+		},
+	);
+});
diff --git a/packages/editor-ui/src/stores/ai.store.ts b/packages/editor-ui/src/stores/ai.store.ts
new file mode 100644
index 0000000000000..bee7490e68295
--- /dev/null
+++ b/packages/editor-ui/src/stores/ai.store.ts
@@ -0,0 +1,67 @@
+import { defineStore } from 'pinia';
+import * as aiApi from '@/api/ai';
+import type { GenerateCurlPayload } from '@/api/ai';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import { useSettingsStore } from '@/stores/settings.store';
+import { computed, reactive, ref } from 'vue';
+import type { Ref } from 'vue';
+import type { AIAssistantConnectionInfo, XYPosition } from '@/Interface';
+import { usePostHog } from './posthog.store';
+import { AI_ASSISTANT_EXPERIMENT } from '@/constants';
+
+const CURRENT_POPUP_HEIGHT = 94;
+
+/**
+ * Calculates the position for the next step popup based on the specified element
+ * so they are aligned vertically.
+ */
+const getPopupCenterPosition = (relativeElement: HTMLElement) => {
+	const bounds = relativeElement.getBoundingClientRect();
+	const rectMiddle = bounds.top + bounds.height / 2;
+	const x = bounds.left + bounds.width + 22;
+	const y = rectMiddle - CURRENT_POPUP_HEIGHT / 2;
+	return [x, y] as XYPosition;
+};
+
+export const useAIStore = defineStore('ai', () => {
+	const rootStore = useRootStore();
+	const settingsStore = useSettingsStore();
+	const posthogStore = usePostHog();
+
+	const assistantChatOpen = ref(false);
+	const nextStepPopupConfig = reactive({
+		open: false,
+		title: '',
+		position: [0, 0] as XYPosition,
+	});
+	const latestConnectionInfo: Ref<AIAssistantConnectionInfo | null> = ref(null);
+	const isGenerateCurlEnabled = computed(() => settingsStore.settings.ai.features.generateCurl);
+	const isAssistantExperimentEnabled = computed(
+		() => posthogStore.getVariant(AI_ASSISTANT_EXPERIMENT.name) === AI_ASSISTANT_EXPERIMENT.variant,
+	);
+
+	function openNextStepPopup(title: string, relativeElement: HTMLElement) {
+		nextStepPopupConfig.open = true;
+		nextStepPopupConfig.title = title;
+		nextStepPopupConfig.position = getPopupCenterPosition(relativeElement);
+	}
+
+	function closeNextStepPopup() {
+		nextStepPopupConfig.open = false;
+	}
+
+	async function generateCurl(payload: GenerateCurlPayload) {
+		return await aiApi.generateCurl(rootStore.getRestApiContext, payload);
+	}
+
+	return {
+		assistantChatOpen,
+		nextStepPopupConfig,
+		openNextStepPopup,
+		closeNextStepPopup,
+		latestConnectionInfo,
+		generateCurl,
+		isGenerateCurlEnabled,
+		isAssistantExperimentEnabled,
+	};
+});
diff --git a/packages/editor-ui/src/stores/auditLogs.store.ts b/packages/editor-ui/src/stores/auditLogs.store.ts
new file mode 100644
index 0000000000000..12c42dcfd079b
--- /dev/null
+++ b/packages/editor-ui/src/stores/auditLogs.store.ts
@@ -0,0 +1,16 @@
+import { computed } from 'vue';
+import { defineStore } from 'pinia';
+import { EnterpriseEditionFeature } from '@/constants';
+import { useSettingsStore } from '@/stores/settings.store';
+
+export const useAuditLogsStore = defineStore('auditLogs', () => {
+	const settingsStore = useSettingsStore();
+
+	const isEnterpriseAuditLogsFeatureEnabled = computed(() =>
+		settingsStore.isEnterpriseFeatureEnabled(EnterpriseEditionFeature.AuditLogs),
+	);
+
+	return {
+		isEnterpriseAuditLogsFeatureEnabled,
+	};
+});
diff --git a/packages/editor-ui/src/stores/canvas.store.ts b/packages/editor-ui/src/stores/canvas.store.ts
new file mode 100644
index 0000000000000..b5f57fc42c3e0
--- /dev/null
+++ b/packages/editor-ui/src/stores/canvas.store.ts
@@ -0,0 +1,315 @@
+import { computed, ref, watch } from 'vue';
+import { defineStore } from 'pinia';
+import { v4 as uuid } from 'uuid';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import { useUIStore } from '@/stores/ui.store';
+import { useHistoryStore } from '@/stores/history.store';
+import { useSourceControlStore } from '@/stores/sourceControl.store';
+import type { INodeUi, XYPosition } from '@/Interface';
+import {
+	applyScale,
+	getScaleFromWheelEventDelta,
+	normalizeWheelEventDelta,
+	scaleBigger,
+	scaleReset,
+	scaleSmaller,
+} from '@/utils/canvasUtils';
+import { START_NODE_TYPE } from '@/constants';
+import type {
+	BeforeStartEventParams,
+	BrowserJsPlumbInstance,
+	DragStopEventParams,
+} from '@jsplumb/browser-ui';
+import { newInstance } from '@jsplumb/browser-ui';
+import type { Connection } from '@jsplumb/core';
+import { MoveNodeCommand } from '@/models/history';
+import {
+	DEFAULT_PLACEHOLDER_TRIGGER_BUTTON,
+	getMidCanvasPosition,
+	getNewNodePosition,
+	getZoomToFit,
+	PLACEHOLDER_TRIGGER_NODE_SIZE,
+	CONNECTOR_FLOWCHART_TYPE,
+	GRID_SIZE,
+	CONNECTOR_PAINT_STYLE_DEFAULT,
+	CONNECTOR_PAINT_STYLE_PRIMARY,
+	CONNECTOR_ARROW_OVERLAYS,
+	getMousePosition,
+	SIDEBAR_WIDTH,
+	SIDEBAR_WIDTH_EXPANDED,
+} from '@/utils/nodeViewUtils';
+import type { PointXY } from '@jsplumb/util';
+import { useLoadingService } from '@/composables/useLoadingService';
+
+export const useCanvasStore = defineStore('canvas', () => {
+	const workflowStore = useWorkflowsStore();
+	const nodeTypesStore = useNodeTypesStore();
+	const uiStore = useUIStore();
+	const historyStore = useHistoryStore();
+	const sourceControlStore = useSourceControlStore();
+	const loadingService = useLoadingService();
+
+	const jsPlumbInstanceRef = ref<BrowserJsPlumbInstance>();
+	const isDragging = ref<boolean>(false);
+	const lastSelectedConnection = ref<Connection | null>(null);
+	const newNodeInsertPosition = ref<XYPosition | null>(null);
+
+	const nodes = computed<INodeUi[]>(() => workflowStore.allNodes);
+	const triggerNodes = computed<INodeUi[]>(() =>
+		nodes.value.filter(
+			(node) => node.type === START_NODE_TYPE || nodeTypesStore.isTriggerNode(node.type),
+		),
+	);
+	const isDemo = ref<boolean>(false);
+	const nodeViewScale = ref<number>(1);
+	const canvasAddButtonPosition = ref<XYPosition>([1, 1]);
+	const readOnlyEnv = computed(() => sourceControlStore.preferences.branchReadOnly);
+
+	watch(readOnlyEnv, (readOnly) => {
+		if (jsPlumbInstanceRef.value) {
+			jsPlumbInstanceRef.value.elementsDraggable = !readOnly;
+		}
+	});
+
+	const setRecenteredCanvasAddButtonPosition = (offset?: XYPosition) => {
+		const position = getMidCanvasPosition(nodeViewScale.value, offset ?? [0, 0]);
+
+		position[0] -= PLACEHOLDER_TRIGGER_NODE_SIZE / 2;
+		position[1] -= PLACEHOLDER_TRIGGER_NODE_SIZE / 2;
+
+		canvasAddButtonPosition.value = getNewNodePosition(nodes.value, position);
+	};
+
+	const getPlaceholderTriggerNodeUI = (): INodeUi => {
+		setRecenteredCanvasAddButtonPosition();
+
+		return {
+			id: uuid(),
+			...DEFAULT_PLACEHOLDER_TRIGGER_BUTTON,
+			position: canvasAddButtonPosition.value,
+		};
+	};
+
+	const getNodesWithPlaceholderNode = (): INodeUi[] =>
+		triggerNodes.value.length > 0 ? nodes.value : [getPlaceholderTriggerNodeUI(), ...nodes.value];
+
+	const canvasPositionFromPagePosition = (position: XYPosition): XYPosition => {
+		const sidebarWidth = isDemo.value
+			? 0
+			: uiStore.sidebarMenuCollapsed
+				? SIDEBAR_WIDTH
+				: SIDEBAR_WIDTH_EXPANDED;
+
+		const relativeX = position[0] - sidebarWidth;
+		const relativeY = isDemo.value
+			? position[1]
+			: position[1] - uiStore.bannersHeight - uiStore.headerHeight;
+
+		return [relativeX, relativeY];
+	};
+
+	const setZoomLevel = (zoomLevel: number, offset: XYPosition) => {
+		nodeViewScale.value = zoomLevel;
+		jsPlumbInstanceRef.value?.setZoom(zoomLevel);
+		uiStore.nodeViewOffsetPosition = offset;
+	};
+
+	const resetZoom = () => {
+		const { scale, offset } = scaleReset({
+			scale: nodeViewScale.value,
+			offset: uiStore.nodeViewOffsetPosition,
+			origin: canvasPositionFromPagePosition([window.innerWidth / 2, window.innerHeight / 2]),
+		});
+		setZoomLevel(scale, offset);
+	};
+
+	const zoomIn = () => {
+		const { scale, offset } = scaleBigger({
+			scale: nodeViewScale.value,
+			offset: uiStore.nodeViewOffsetPosition,
+			origin: canvasPositionFromPagePosition([window.innerWidth / 2, window.innerHeight / 2]),
+		});
+		setZoomLevel(scale, offset);
+	};
+
+	const zoomOut = () => {
+		const { scale, offset } = scaleSmaller({
+			scale: nodeViewScale.value,
+			offset: uiStore.nodeViewOffsetPosition,
+			origin: canvasPositionFromPagePosition([window.innerWidth / 2, window.innerHeight / 2]),
+		});
+		setZoomLevel(scale, offset);
+	};
+
+	const zoomToFit = () => {
+		const nodes = getNodesWithPlaceholderNode();
+		if (!nodes.length) {
+			// some unknown workflow executions
+			return;
+		}
+		const { zoomLevel, offset } = getZoomToFit(nodes, !isDemo.value);
+		setZoomLevel(zoomLevel, offset);
+	};
+
+	const wheelMoveWorkflow = (deltaX: number, deltaY: number, shiftKeyPressed = false) => {
+		const offsetPosition = uiStore.nodeViewOffsetPosition;
+		const nodeViewOffsetPositionX = offsetPosition[0] - (shiftKeyPressed ? deltaY : deltaX);
+		const nodeViewOffsetPositionY = offsetPosition[1] - (shiftKeyPressed ? deltaX : deltaY);
+		uiStore.nodeViewOffsetPosition = [nodeViewOffsetPositionX, nodeViewOffsetPositionY];
+	};
+
+	const wheelScroll = (e: WheelEvent) => {
+		// Prevent browser back/forward gesture, default pinch to zoom etc.
+		e.preventDefault();
+
+		const { deltaX, deltaY } = normalizeWheelEventDelta(e);
+
+		if (e.ctrlKey || e.metaKey) {
+			const scaleFactor = getScaleFromWheelEventDelta(deltaY);
+			const { scale, offset } = applyScale(scaleFactor)({
+				scale: nodeViewScale.value,
+				offset: uiStore.nodeViewOffsetPosition,
+				origin: canvasPositionFromPagePosition(getMousePosition(e)),
+			});
+			setZoomLevel(scale, offset);
+			return;
+		}
+		wheelMoveWorkflow(deltaX, deltaY, e.shiftKey);
+	};
+
+	function initInstance(container: Element) {
+		// Make sure to clean-up previous instance if it exists
+		if (jsPlumbInstanceRef.value) {
+			jsPlumbInstanceRef.value.destroy();
+			jsPlumbInstanceRef.value.reset();
+			jsPlumbInstanceRef.value = undefined;
+		}
+
+		jsPlumbInstanceRef.value = newInstance({
+			container,
+			connector: CONNECTOR_FLOWCHART_TYPE,
+			resizeObserver: false,
+			endpoint: {
+				type: 'Dot',
+				options: { radius: 5 },
+			},
+			paintStyle: CONNECTOR_PAINT_STYLE_DEFAULT,
+			hoverPaintStyle: CONNECTOR_PAINT_STYLE_PRIMARY,
+			connectionOverlays: CONNECTOR_ARROW_OVERLAYS,
+			elementsDraggable: !readOnlyEnv.value,
+			dragOptions: {
+				cursor: 'pointer',
+				grid: { w: GRID_SIZE, h: GRID_SIZE },
+				start: (params: BeforeStartEventParams) => {
+					const draggedNode = params.drag.getDragElement();
+					const nodeName = draggedNode.getAttribute('data-name');
+					if (!nodeName) return;
+					isDragging.value = true;
+
+					const isSelected = uiStore.isNodeSelected(nodeName);
+
+					if (params.e && !isSelected) {
+						// Only the node which gets dragged directly gets an event, for all others it is
+						// undefined. So check if the currently dragged node is selected and if not clear
+						// the drag-selection.
+						jsPlumbInstanceRef.value?.clearDragSelection();
+						uiStore.resetSelectedNodes();
+					}
+
+					uiStore.addActiveAction('dragActive');
+					return true;
+				},
+				stop: (params: DragStopEventParams) => {
+					const draggedNode = params.drag.getDragElement();
+					const nodeName = draggedNode.getAttribute('data-name');
+					if (!nodeName) return;
+					const nodeData = workflowStore.getNodeByName(nodeName);
+					isDragging.value = false;
+					if (uiStore.isActionActive('dragActive') && nodeData) {
+						const moveNodes = uiStore.getSelectedNodes.slice();
+						const selectedNodeNames = moveNodes.map((node: INodeUi) => node.name);
+						if (!selectedNodeNames.includes(nodeData.name)) {
+							// If the current node is not in selected add it to the nodes which
+							// got moved manually
+							moveNodes.push(nodeData);
+						}
+
+						if (moveNodes.length > 1) {
+							historyStore.startRecordingUndo();
+						}
+						// This does for some reason just get called once for the node that got clicked
+						// even though "start" and "drag" gets called for all. So lets do for now
+						// some dirty DOM query to get the new positions till I have more time to
+						// create a proper solution
+						let newNodePosition: XYPosition;
+						moveNodes.forEach((node: INodeUi) => {
+							const element = document.getElementById(node.id);
+							if (element === null) {
+								return;
+							}
+
+							newNodePosition = [
+								parseInt(element.style.left.slice(0, -2), 10),
+								parseInt(element.style.top.slice(0, -2), 10),
+							];
+
+							const updateInformation = {
+								name: node.name,
+								properties: {
+									position: newNodePosition,
+								},
+							};
+							const oldPosition = node.position;
+							if (oldPosition[0] !== newNodePosition[0] || oldPosition[1] !== newNodePosition[1]) {
+								historyStore.pushCommandToUndo(
+									new MoveNodeCommand(node.name, oldPosition, newNodePosition),
+								);
+								workflowStore.updateNodeProperties(updateInformation);
+							}
+						});
+						if (moveNodes.length > 1) {
+							historyStore.stopRecordingUndo();
+						}
+						if (uiStore.isActionActive('dragActive')) {
+							uiStore.removeActiveAction('dragActive');
+						}
+					}
+				},
+				filter: '.node-description, .node-description .node-name, .node-description .node-subtitle',
+			},
+		});
+		jsPlumbInstanceRef.value?.setDragConstrainFunction((pos: PointXY) => {
+			const isReadOnly = uiStore.isReadOnlyView;
+			if (isReadOnly) {
+				// Do not allow to move nodes in readOnly mode
+				return null;
+			}
+			return pos;
+		});
+	}
+
+	const jsPlumbInstance = computed(() => jsPlumbInstanceRef.value as BrowserJsPlumbInstance);
+	return {
+		isDemo,
+		nodeViewScale,
+		canvasAddButtonPosition,
+		lastSelectedConnection,
+		newNodeInsertPosition,
+		jsPlumbInstance,
+		isLoading: loadingService.isLoading,
+		startLoading: loadingService.startLoading,
+		setLoadingText: loadingService.setLoadingText,
+		stopLoading: loadingService.stopLoading,
+		setRecenteredCanvasAddButtonPosition,
+		getNodesWithPlaceholderNode,
+		canvasPositionFromPagePosition,
+		setZoomLevel,
+		resetZoom,
+		zoomIn,
+		zoomOut,
+		zoomToFit,
+		wheelScroll,
+		initInstance,
+	};
+});
diff --git a/packages/editor-ui/src/stores/canvas.ts b/packages/editor-ui/src/stores/canvas.ts
deleted file mode 100644
index 8643c9261610b..0000000000000
--- a/packages/editor-ui/src/stores/canvas.ts
+++ /dev/null
@@ -1,275 +0,0 @@
-import { computed, ref } from 'vue';
-import { defineStore } from 'pinia';
-import { v4 as uuid } from 'uuid';
-import normalizeWheel from 'normalize-wheel';
-import { useWorkflowsStore } from '@/stores/workflows';
-import { useNodeTypesStore } from '@/stores/nodeTypes';
-import { useUIStore } from '@/stores/ui';
-import { useHistoryStore } from '@/stores/history';
-import type { INodeUi, XYPosition } from '@/Interface';
-import { scaleBigger, scaleReset, scaleSmaller } from '@/utils';
-import { START_NODE_TYPE } from '@/constants';
-import type {
-	BeforeStartEventParams,
-	BrowserJsPlumbInstance,
-	DragStopEventParams,
-} from '@jsplumb/browser-ui';
-import { newInstance } from '@jsplumb/browser-ui';
-import { N8nPlusEndpointHandler } from '@/plugins/endpoints/N8nPlusEndpointType';
-import * as N8nPlusEndpointRenderer from '@/plugins/endpoints/N8nPlusEndpointRenderer';
-import { N8nConnector } from '@/plugins/connectors/N8nCustomConnector';
-import type { Connection } from '@jsplumb/core';
-import { EndpointFactory, Connectors } from '@jsplumb/core';
-import { MoveNodeCommand } from '@/models/history';
-import {
-	DEFAULT_PLACEHOLDER_TRIGGER_BUTTON,
-	getMidCanvasPosition,
-	getNewNodePosition,
-	getZoomToFit,
-	PLACEHOLDER_TRIGGER_NODE_SIZE,
-	CONNECTOR_FLOWCHART_TYPE,
-	GRID_SIZE,
-	CONNECTOR_PAINT_STYLE_DEFAULT,
-	CONNECTOR_PAINT_STYLE_PRIMARY,
-	CONNECTOR_ARROW_OVERLAYS,
-} from '@/utils/nodeViewUtils';
-import type { PointXY } from '@jsplumb/util';
-
-export const useCanvasStore = defineStore('canvas', () => {
-	const workflowStore = useWorkflowsStore();
-	const nodeTypesStore = useNodeTypesStore();
-	const uiStore = useUIStore();
-	const historyStore = useHistoryStore();
-
-	const jsPlumbInstanceRef = ref<BrowserJsPlumbInstance>();
-	const isDragging = ref<boolean>(false);
-	const lastSelectedConnection = ref<Connection | null>(null);
-	const newNodeInsertPosition = ref<XYPosition | null>(null);
-
-	const nodes = computed<INodeUi[]>(() => workflowStore.allNodes);
-	const triggerNodes = computed<INodeUi[]>(() =>
-		nodes.value.filter(
-			(node) => node.type === START_NODE_TYPE || nodeTypesStore.isTriggerNode(node.type),
-		),
-	);
-	const isDemo = ref<boolean>(false);
-	const nodeViewScale = ref<number>(1);
-	const canvasAddButtonPosition = ref<XYPosition>([1, 1]);
-
-	Connectors.register(N8nConnector.type, N8nConnector);
-	N8nPlusEndpointRenderer.register();
-	EndpointFactory.registerHandler(N8nPlusEndpointHandler);
-
-	const setRecenteredCanvasAddButtonPosition = (offset?: XYPosition) => {
-		const position = getMidCanvasPosition(nodeViewScale.value, offset || [0, 0]);
-
-		position[0] -= PLACEHOLDER_TRIGGER_NODE_SIZE / 2;
-		position[1] -= PLACEHOLDER_TRIGGER_NODE_SIZE / 2;
-
-		canvasAddButtonPosition.value = getNewNodePosition(nodes.value, position);
-	};
-
-	const getPlaceholderTriggerNodeUI = (): INodeUi => {
-		setRecenteredCanvasAddButtonPosition();
-
-		return {
-			id: uuid(),
-			...DEFAULT_PLACEHOLDER_TRIGGER_BUTTON,
-			position: canvasAddButtonPosition.value,
-		};
-	};
-
-	const getNodesWithPlaceholderNode = (): INodeUi[] =>
-		triggerNodes.value.length > 0 ? nodes.value : [getPlaceholderTriggerNodeUI(), ...nodes.value];
-
-	const setZoomLevel = (zoomLevel: number, offset: XYPosition) => {
-		nodeViewScale.value = zoomLevel;
-		jsPlumbInstanceRef.value?.setZoom(zoomLevel);
-		uiStore.nodeViewOffsetPosition = offset;
-	};
-
-	const resetZoom = () => {
-		const { scale, offset } = scaleReset({
-			scale: nodeViewScale.value,
-			offset: uiStore.nodeViewOffsetPosition,
-		});
-		setZoomLevel(scale, offset);
-	};
-
-	const zoomIn = () => {
-		const { scale, offset } = scaleBigger({
-			scale: nodeViewScale.value,
-			offset: uiStore.nodeViewOffsetPosition,
-		});
-		setZoomLevel(scale, offset);
-	};
-
-	const zoomOut = () => {
-		const { scale, offset } = scaleSmaller({
-			scale: nodeViewScale.value,
-			offset: uiStore.nodeViewOffsetPosition,
-		});
-		setZoomLevel(scale, offset);
-	};
-
-	const zoomToFit = () => {
-		const nodes = getNodesWithPlaceholderNode();
-		if (!nodes.length) {
-			// some unknown workflow executions
-			return;
-		}
-		const { zoomLevel, offset } = getZoomToFit(nodes, !isDemo.value);
-		setZoomLevel(zoomLevel, offset);
-	};
-
-	const wheelMoveWorkflow = (e: WheelEvent) => {
-		const normalized = normalizeWheel(e);
-		const offsetPosition = uiStore.nodeViewOffsetPosition;
-		const nodeViewOffsetPositionX =
-			offsetPosition[0] - (e.shiftKey ? normalized.pixelY : normalized.pixelX);
-		const nodeViewOffsetPositionY =
-			offsetPosition[1] - (e.shiftKey ? normalized.pixelX : normalized.pixelY);
-		uiStore.nodeViewOffsetPosition = [nodeViewOffsetPositionX, nodeViewOffsetPositionY];
-	};
-
-	const wheelScroll = (e: WheelEvent) => {
-		//* Control + scroll zoom
-		if (e.ctrlKey) {
-			if (e.deltaY > 0) {
-				zoomOut();
-			} else {
-				zoomIn();
-			}
-
-			e.preventDefault();
-			return;
-		}
-		wheelMoveWorkflow(e);
-	};
-
-	function initInstance(container: Element) {
-		// Make sure to clean-up previous instance if it exists
-		if (jsPlumbInstanceRef.value) {
-			jsPlumbInstanceRef.value.destroy();
-			jsPlumbInstanceRef.value.reset();
-			jsPlumbInstanceRef.value = undefined;
-		}
-
-		jsPlumbInstanceRef.value = newInstance({
-			container,
-			connector: CONNECTOR_FLOWCHART_TYPE,
-			resizeObserver: false,
-			endpoint: {
-				type: 'Dot',
-				options: { radius: 5 },
-			},
-			paintStyle: CONNECTOR_PAINT_STYLE_DEFAULT,
-			hoverPaintStyle: CONNECTOR_PAINT_STYLE_PRIMARY,
-			connectionOverlays: CONNECTOR_ARROW_OVERLAYS,
-			dragOptions: {
-				cursor: 'pointer',
-				grid: { w: GRID_SIZE, h: GRID_SIZE },
-				start: (params: BeforeStartEventParams) => {
-					const draggedNode = params.drag.getDragElement();
-					const nodeName = draggedNode.getAttribute('data-name');
-					if (!nodeName) return;
-					isDragging.value = true;
-
-					const isSelected = uiStore.isNodeSelected(nodeName);
-
-					if (params.e && !isSelected) {
-						// Only the node which gets dragged directly gets an event, for all others it is
-						// undefined. So check if the currently dragged node is selected and if not clear
-						// the drag-selection.
-						jsPlumbInstanceRef.value?.clearDragSelection();
-						uiStore.resetSelectedNodes();
-					}
-
-					uiStore.addActiveAction('dragActive');
-					return true;
-				},
-				stop: (params: DragStopEventParams) => {
-					const draggedNode = params.drag.getDragElement();
-					const nodeName = draggedNode.getAttribute('data-name');
-					if (!nodeName) return;
-					const nodeData = workflowStore.getNodeByName(nodeName);
-					isDragging.value = false;
-					if (uiStore.isActionActive('dragActive') && nodeData) {
-						const moveNodes = uiStore.getSelectedNodes.slice();
-						const selectedNodeNames = moveNodes.map((node: INodeUi) => node.name);
-						if (!selectedNodeNames.includes(nodeData.name)) {
-							// If the current node is not in selected add it to the nodes which
-							// got moved manually
-							moveNodes.push(nodeData);
-						}
-
-						if (moveNodes.length > 1) {
-							historyStore.startRecordingUndo();
-						}
-						// This does for some reason just get called once for the node that got clicked
-						// even though "start" and "drag" gets called for all. So lets do for now
-						// some dirty DOM query to get the new positions till I have more time to
-						// create a proper solution
-						let newNodePosition: XYPosition;
-						moveNodes.forEach((node: INodeUi) => {
-							const element = document.getElementById(node.id);
-							if (element === null) {
-								return;
-							}
-
-							newNodePosition = [
-								parseInt(element.style.left!.slice(0, -2), 10),
-								parseInt(element.style.top!.slice(0, -2), 10),
-							];
-
-							const updateInformation = {
-								name: node.name,
-								properties: {
-									position: newNodePosition,
-								},
-							};
-							const oldPosition = node.position;
-							if (oldPosition[0] !== newNodePosition[0] || oldPosition[1] !== newNodePosition[1]) {
-								historyStore.pushCommandToUndo(
-									new MoveNodeCommand(node.name, oldPosition, newNodePosition),
-								);
-								workflowStore.updateNodeProperties(updateInformation);
-							}
-						});
-						if (moveNodes.length > 1) {
-							historyStore.stopRecordingUndo();
-						}
-					}
-				},
-				filter: '.node-description, .node-description .node-name, .node-description .node-subtitle',
-			},
-		});
-		jsPlumbInstanceRef.value?.setDragConstrainFunction((pos: PointXY) => {
-			const isReadOnly = uiStore.isReadOnlyView;
-			if (isReadOnly) {
-				// Do not allow to move nodes in readOnly mode
-				return null;
-			}
-			return pos;
-		});
-	}
-
-	const jsPlumbInstance = computed(() => jsPlumbInstanceRef.value as BrowserJsPlumbInstance);
-	return {
-		isDemo,
-		nodeViewScale,
-		canvasAddButtonPosition,
-		lastSelectedConnection,
-		newNodeInsertPosition,
-		jsPlumbInstance,
-		setRecenteredCanvasAddButtonPosition,
-		getNodesWithPlaceholderNode,
-		setZoomLevel,
-		resetZoom,
-		zoomIn,
-		zoomOut,
-		zoomToFit,
-		wheelScroll,
-		initInstance,
-	};
-});
diff --git a/packages/editor-ui/src/stores/cloudPlan.store.ts b/packages/editor-ui/src/stores/cloudPlan.store.ts
new file mode 100644
index 0000000000000..d564896afc856
--- /dev/null
+++ b/packages/editor-ui/src/stores/cloudPlan.store.ts
@@ -0,0 +1,224 @@
+import { computed, reactive } from 'vue';
+import { defineStore } from 'pinia';
+import type { CloudPlanState } from '@/Interface';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useUIStore } from '@/stores/ui.store';
+import { useUsersStore } from '@/stores/users.store';
+import {
+	getAdminPanelLoginCode,
+	getCurrentPlan,
+	getCurrentUsage,
+	fetchSuggestedTemplates,
+} from '@/api/cloudPlans';
+import { DateTime } from 'luxon';
+import { CLOUD_TRIAL_CHECK_INTERVAL, SUGGESTED_TEMPLATES_FLAG, STORES } from '@/constants';
+import { hasPermission } from '@/rbac/permissions';
+
+const DEFAULT_STATE: CloudPlanState = {
+	initialized: false,
+	data: null,
+	usage: null,
+	loadingPlan: false,
+};
+
+export const useCloudPlanStore = defineStore(STORES.CLOUD_PLAN, () => {
+	const rootStore = useRootStore();
+	const settingsStore = useSettingsStore();
+	const usersStore = useUsersStore();
+
+	const state = reactive<CloudPlanState>(DEFAULT_STATE);
+
+	const setData = (data: CloudPlanState['data']) => {
+		state.data = data;
+	};
+
+	const setUsage = (data: CloudPlanState['usage']) => {
+		state.usage = data;
+	};
+
+	const reset = () => {
+		state.data = null;
+		state.usage = null;
+	};
+
+	const userIsTrialing = computed(() => state.data?.metadata?.group === 'trial');
+
+	const currentPlanData = computed(() => state.data);
+
+	const currentUsageData = computed(() => state.usage);
+
+	const trialExpired = computed(
+		() =>
+			state.data?.metadata?.group === 'trial' &&
+			DateTime.now().toMillis() >= DateTime.fromISO(state.data?.expirationDate).toMillis(),
+	);
+
+	const allExecutionsUsed = computed(() => {
+		if (!state.usage?.executions || !state.data?.monthlyExecutionsLimit) return false;
+		return state.usage?.executions >= state.data?.monthlyExecutionsLimit;
+	});
+
+	const hasCloudPlan = computed(() => {
+		const cloudUserId = settingsStore.settings.n8nMetadata?.userId;
+		return hasPermission(['instanceOwner']) && settingsStore.isCloudDeployment && cloudUserId;
+	});
+
+	const getUserCloudAccount = async () => {
+		if (!hasCloudPlan.value) throw new Error('User does not have a cloud plan');
+		try {
+			await usersStore.fetchUserCloudAccount();
+			if (!usersStore.currentUserCloudInfo?.confirmed && !userIsTrialing.value) {
+				useUIStore().pushBannerToStack('EMAIL_CONFIRMATION');
+			}
+		} catch (error) {
+			throw new Error(error.message);
+		}
+	};
+
+	const getAutoLoginCode = async (): Promise<{ code: string }> => {
+		return await getAdminPanelLoginCode(rootStore.getRestApiContext);
+	};
+
+	const getOwnerCurrentPlan = async () => {
+		if (!hasCloudPlan.value) throw new Error('User does not have a cloud plan');
+		state.loadingPlan = true;
+		let plan;
+		try {
+			plan = await getCurrentPlan(rootStore.getRestApiContext);
+			state.data = plan;
+			state.loadingPlan = false;
+
+			if (userIsTrialing.value) {
+				if (trialExpired.value) {
+					useUIStore().pushBannerToStack('TRIAL_OVER');
+				} else {
+					useUIStore().pushBannerToStack('TRIAL');
+				}
+			}
+		} catch (error) {
+			state.loadingPlan = false;
+			throw new Error(error);
+		}
+
+		return plan;
+	};
+
+	const getInstanceCurrentUsage = async () => {
+		const usage = await getCurrentUsage({ baseUrl: rootStore.getBaseUrl, pushRef: '' });
+		state.usage = usage;
+		return usage;
+	};
+
+	const usageLeft = computed(() => {
+		if (!state.data || !state.usage) return { workflowsLeft: -1, executionsLeft: -1 };
+
+		return {
+			workflowsLeft: state.data.activeWorkflowsLimit - state.usage.activeWorkflows,
+			executionsLeft: state.data.monthlyExecutionsLimit - state.usage.executions,
+		};
+	});
+
+	const trialDaysLeft = computed(() => {
+		if (!state.data?.expirationDate) return -1;
+
+		const differenceInMs = new Date().valueOf() - new Date(state.data.expirationDate).valueOf();
+
+		const differenceInDays = Math.floor(differenceInMs / (1000 * 60 * 60 * 24));
+
+		return Math.ceil(differenceInDays);
+	});
+
+	const startPollingInstanceUsageData = () => {
+		const interval = setInterval(async () => {
+			try {
+				await getInstanceCurrentUsage();
+				if (trialExpired.value || allExecutionsUsed.value) {
+					clearTimeout(interval);
+					return;
+				}
+			} catch {}
+		}, CLOUD_TRIAL_CHECK_INTERVAL);
+	};
+
+	const checkForCloudPlanData = async (): Promise<void> => {
+		try {
+			await getOwnerCurrentPlan();
+			if (!userIsTrialing.value) return;
+			await getInstanceCurrentUsage();
+			startPollingInstanceUsageData();
+		} catch (e) {
+			throw new Error(e.message);
+		}
+	};
+
+	const fetchUserCloudAccount = async () => {
+		try {
+			await getUserCloudAccount();
+		} catch (e) {
+			throw new Error(e.message);
+		}
+	};
+
+	const redirectToDashboard = async () => {
+		const adminPanelHost = new URL(window.location.href).host.split('.').slice(1).join('.');
+		const { code } = await getAutoLoginCode();
+		window.location.href = `https://${adminPanelHost}/login?code=${code}`;
+	};
+
+	const loadSuggestedTemplates = async () => {
+		try {
+			const additionalTemplates = await fetchSuggestedTemplates(rootStore.getRestApiContext);
+			if (additionalTemplates.sections && additionalTemplates.sections.length > 0) {
+				useUIStore().setSuggestedTemplates(additionalTemplates);
+			}
+		} catch (error) {
+			console.warn('Error checking for lead enrichment templates:', error);
+		}
+	};
+
+	const initialize = async () => {
+		if (state.initialized) {
+			return;
+		}
+
+		try {
+			await checkForCloudPlanData();
+		} catch (error) {
+			console.warn('Error checking for cloud plan data:', error);
+		}
+
+		try {
+			await fetchUserCloudAccount();
+		} catch (error) {
+			console.warn('Error fetching user cloud account:', error);
+		}
+
+		const localStorageFlag = localStorage.getItem(SUGGESTED_TEMPLATES_FLAG);
+		// Don't show if users already opted in
+		if (localStorageFlag !== 'false' && hasPermission(['instanceOwner'])) {
+			await loadSuggestedTemplates();
+		}
+
+		state.initialized = true;
+	};
+
+	return {
+		state,
+		initialize,
+		getOwnerCurrentPlan,
+		getInstanceCurrentUsage,
+		usageLeft,
+		trialDaysLeft,
+		userIsTrialing,
+		currentPlanData,
+		currentUsageData,
+		trialExpired,
+		allExecutionsUsed,
+		reset,
+		checkForCloudPlanData,
+		fetchUserCloudAccount,
+		getAutoLoginCode,
+		redirectToDashboard,
+	};
+});
diff --git a/packages/editor-ui/src/stores/collaboration.store.ts b/packages/editor-ui/src/stores/collaboration.store.ts
new file mode 100644
index 0000000000000..208d5fa5884f4
--- /dev/null
+++ b/packages/editor-ui/src/stores/collaboration.store.ts
@@ -0,0 +1,64 @@
+import { defineStore } from 'pinia';
+import { computed, ref } from 'vue';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { usePushConnectionStore } from '@/stores/pushConnection.store';
+import { STORES } from '@/constants';
+import type { IUser } from '@/Interface';
+
+type ActiveUsersForWorkflows = {
+	[workflowId: string]: Array<{ user: IUser; lastSeen: string }>;
+};
+
+export const useCollaborationStore = defineStore(STORES.COLLABORATION, () => {
+	const pushStore = usePushConnectionStore();
+	const workflowStore = useWorkflowsStore();
+
+	const usersForWorkflows = ref<ActiveUsersForWorkflows>({});
+	const pushStoreEventListenerRemovalFn = ref<(() => void) | null>(null);
+
+	const getUsersForCurrentWorkflow = computed(() => {
+		return usersForWorkflows.value[workflowStore.workflowId] ?? [];
+	});
+
+	function initialize() {
+		pushStoreEventListenerRemovalFn.value = pushStore.addEventListener((event) => {
+			if (event.type === 'activeWorkflowUsersChanged') {
+				const activeWorkflowId = workflowStore.workflowId;
+				if (event.data.workflowId === activeWorkflowId) {
+					usersForWorkflows.value[activeWorkflowId] = event.data.activeUsers;
+				}
+			}
+		});
+	}
+
+	function terminate() {
+		if (typeof pushStoreEventListenerRemovalFn.value === 'function') {
+			pushStoreEventListenerRemovalFn.value();
+		}
+	}
+
+	function workflowUsersUpdated(data: ActiveUsersForWorkflows) {
+		usersForWorkflows.value = data;
+	}
+
+	function notifyWorkflowOpened(workflowId: string) {
+		pushStore.send({
+			type: 'workflowOpened',
+			workflowId,
+		});
+	}
+
+	function notifyWorkflowClosed(workflowId: string) {
+		pushStore.send({ type: 'workflowClosed', workflowId });
+	}
+
+	return {
+		usersForWorkflows,
+		initialize,
+		terminate,
+		notifyWorkflowOpened,
+		notifyWorkflowClosed,
+		workflowUsersUpdated,
+		getUsersForCurrentWorkflow,
+	};
+});
diff --git a/packages/editor-ui/src/stores/communityNodes.store.ts b/packages/editor-ui/src/stores/communityNodes.store.ts
new file mode 100644
index 0000000000000..f746a903aeee0
--- /dev/null
+++ b/packages/editor-ui/src/stores/communityNodes.store.ts
@@ -0,0 +1,95 @@
+import {
+	getInstalledCommunityNodes,
+	installNewPackage,
+	uninstallPackage,
+	updatePackage,
+} from '@/api/communityNodes';
+import { getAvailableCommunityPackageCount } from '@/api/settings';
+import { defineStore } from 'pinia';
+import { useRootStore } from './n8nRoot.store';
+import type { PublicInstalledPackage } from 'n8n-workflow';
+import type { CommunityNodesState, CommunityPackageMap } from '@/Interface';
+import { STORES } from '@/constants';
+
+const LOADER_DELAY = 300;
+
+export const useCommunityNodesStore = defineStore(STORES.COMMUNITY_NODES, {
+	state: (): CommunityNodesState => ({
+		// -1 means that package count has not been fetched yet
+		availablePackageCount: -1,
+		installedPackages: {},
+	}),
+	getters: {
+		getInstalledPackages(): PublicInstalledPackage[] {
+			return Object.values(this.installedPackages).sort((a, b) =>
+				a.packageName.localeCompare(b.packageName),
+			);
+		},
+		getInstalledPackageByName() {
+			return (name: string): PublicInstalledPackage => this.installedPackages[name];
+		},
+	},
+	actions: {
+		async fetchAvailableCommunityPackageCount(): Promise<void> {
+			if (this.availablePackageCount === -1) {
+				this.availablePackageCount = await getAvailableCommunityPackageCount();
+			}
+		},
+		async fetchInstalledPackages(): Promise<void> {
+			const rootStore = useRootStore();
+			const installedPackages = await getInstalledCommunityNodes(rootStore.getRestApiContext);
+			this.setInstalledPackages(installedPackages);
+			const timeout = installedPackages.length > 0 ? 0 : LOADER_DELAY;
+			setTimeout(() => {
+				return;
+			}, timeout);
+		},
+		async installPackage(packageName: string): Promise<void> {
+			try {
+				const rootStore = useRootStore();
+				await installNewPackage(rootStore.getRestApiContext, packageName);
+				await this.fetchInstalledPackages();
+			} catch (error) {
+				throw error;
+			}
+		},
+		async uninstallPackage(packageName: string): Promise<void> {
+			try {
+				const rootStore = useRootStore();
+				await uninstallPackage(rootStore.getRestApiContext, packageName);
+				this.removePackageByName(packageName);
+			} catch (error) {
+				throw error;
+			}
+		},
+		async updatePackage(packageName: string): Promise<void> {
+			try {
+				const rootStore = useRootStore();
+				const packageToUpdate: PublicInstalledPackage = this.getInstalledPackageByName(packageName);
+				const updatedPackage: PublicInstalledPackage = await updatePackage(
+					rootStore.getRestApiContext,
+					packageToUpdate.packageName,
+				);
+				this.updatePackageObject(updatedPackage);
+			} catch (error) {
+				throw error;
+			}
+		},
+		setInstalledPackages(packages: PublicInstalledPackage[]) {
+			this.installedPackages = packages.reduce(
+				(packageMap: CommunityPackageMap, pack: PublicInstalledPackage) => {
+					packageMap[pack.packageName] = pack;
+					return packageMap;
+				},
+				{},
+			);
+		},
+		removePackageByName(name: string): void {
+			const { [name]: removedPackage, ...remainingPackages } = this.installedPackages;
+			this.installedPackages = remainingPackages;
+		},
+		updatePackageObject(newPackage: PublicInstalledPackage) {
+			this.installedPackages[newPackage.packageName] = newPackage;
+		},
+	},
+});
diff --git a/packages/editor-ui/src/stores/communityNodes.ts b/packages/editor-ui/src/stores/communityNodes.ts
deleted file mode 100644
index e8702b3ad8714..0000000000000
--- a/packages/editor-ui/src/stores/communityNodes.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-import {
-	getInstalledCommunityNodes,
-	installNewPackage,
-	uninstallPackage,
-	updatePackage,
-} from '@/api/communityNodes';
-import { getAvailableCommunityPackageCount } from '@/api/settings';
-import { defineStore } from 'pinia';
-import { useRootStore } from './n8nRootStore';
-import type { PublicInstalledPackage } from 'n8n-workflow';
-import Vue from 'vue';
-import type { CommunityNodesState, CommunityPackageMap } from '@/Interface';
-import { STORES } from '@/constants';
-
-const LOADER_DELAY = 300;
-
-export const useCommunityNodesStore = defineStore(STORES.COMMUNITY_NODES, {
-	state: (): CommunityNodesState => ({
-		// -1 means that package count has not been fetched yet
-		availablePackageCount: -1,
-		installedPackages: {},
-	}),
-	getters: {
-		getInstalledPackages(): PublicInstalledPackage[] {
-			return Object.values(this.installedPackages).sort((a, b) =>
-				a.packageName.localeCompare(b.packageName),
-			);
-		},
-		getInstalledPackageByName() {
-			return (name: string): PublicInstalledPackage => this.installedPackages[name];
-		},
-	},
-	actions: {
-		async fetchAvailableCommunityPackageCount(): Promise<void> {
-			if (this.availablePackageCount === -1) {
-				this.availablePackageCount = await getAvailableCommunityPackageCount();
-			}
-		},
-		async fetchInstalledPackages(): Promise<void> {
-			const rootStore = useRootStore();
-			const installedPackages = await getInstalledCommunityNodes(rootStore.getRestApiContext);
-			this.setInstalledPackages(installedPackages);
-			const timeout = installedPackages.length > 0 ? 0 : LOADER_DELAY;
-			setTimeout(() => {
-				return;
-			}, timeout);
-		},
-		async installPackage(packageName: string): Promise<void> {
-			try {
-				const rootStore = useRootStore();
-				await installNewPackage(rootStore.getRestApiContext, packageName);
-				await this.fetchInstalledPackages();
-			} catch (error) {
-				throw error;
-			}
-		},
-		async uninstallPackage(packageName: string): Promise<void> {
-			try {
-				const rootStore = useRootStore();
-				await uninstallPackage(rootStore.getRestApiContext, packageName);
-				this.removePackageByName(packageName);
-			} catch (error) {
-				throw error;
-			}
-		},
-		async updatePackage(packageName: string): Promise<void> {
-			try {
-				const rootStore = useRootStore();
-				const packageToUpdate: PublicInstalledPackage = this.getInstalledPackageByName(packageName);
-				const updatedPackage: PublicInstalledPackage = await updatePackage(
-					rootStore.getRestApiContext,
-					packageToUpdate.packageName,
-				);
-				this.updatePackageObject(updatedPackage);
-			} catch (error) {
-				throw error;
-			}
-		},
-		setInstalledPackages(packages: PublicInstalledPackage[]) {
-			this.installedPackages = packages.reduce(
-				(packageMap: CommunityPackageMap, pack: PublicInstalledPackage) => {
-					packageMap[pack.packageName] = pack;
-					return packageMap;
-				},
-				{},
-			);
-		},
-		removePackageByName(name: string): void {
-			Vue.delete(this.installedPackages, name);
-		},
-		updatePackageObject(newPackage: PublicInstalledPackage) {
-			this.installedPackages[newPackage.packageName] = newPackage;
-		},
-	},
-});
diff --git a/packages/editor-ui/src/stores/credentials.store.ts b/packages/editor-ui/src/stores/credentials.store.ts
new file mode 100644
index 0000000000000..47c0757e31dfc
--- /dev/null
+++ b/packages/editor-ui/src/stores/credentials.store.ts
@@ -0,0 +1,444 @@
+import type {
+	INodeUi,
+	IUsedCredential,
+	ICredentialMap,
+	ICredentialsDecryptedResponse,
+	ICredentialsResponse,
+	ICredentialsState,
+	ICredentialTypeMap,
+} from '@/Interface';
+import {
+	createNewCredential,
+	deleteCredential,
+	getAllCredentials,
+	getCredentialData,
+	getCredentialsNewName,
+	getCredentialTypes,
+	oAuth1CredentialAuthorize,
+	oAuth2CredentialAuthorize,
+	testCredential,
+	updateCredential,
+} from '@/api/credentials';
+import { setCredentialSharedWith } from '@/api/credentials.ee';
+import { makeRestApiRequest } from '@/utils/apiUtils';
+import { getAppNameFromCredType } from '@/utils/nodeTypesUtils';
+import { EnterpriseEditionFeature, STORES } from '@/constants';
+import { i18n } from '@/plugins/i18n';
+import type {
+	ICredentialsDecrypted,
+	ICredentialType,
+	INodeCredentialTestResult,
+	INodeTypeDescription,
+	IUser,
+} from 'n8n-workflow';
+import { defineStore } from 'pinia';
+import { useRootStore } from './n8nRoot.store';
+import { useNodeTypesStore } from './nodeTypes.store';
+import { useSettingsStore } from './settings.store';
+import { useUsersStore } from './users.store';
+
+const DEFAULT_CREDENTIAL_NAME = 'Unnamed credential';
+const DEFAULT_CREDENTIAL_POSTFIX = 'account';
+const TYPES_WITH_DEFAULT_NAME = ['httpBasicAuth', 'oAuth2Api', 'httpDigestAuth', 'oAuth1Api'];
+
+export type CredentialsStore = ReturnType<typeof useCredentialsStore>;
+
+export const useCredentialsStore = defineStore(STORES.CREDENTIALS, {
+	state: (): ICredentialsState => ({
+		credentialTypes: {},
+		credentials: {},
+	}),
+	getters: {
+		credentialTypesById(): Record<ICredentialType['name'], ICredentialType> {
+			return this.credentialTypes;
+		},
+		allCredentialTypes(): ICredentialType[] {
+			return Object.values(this.credentialTypes).sort((a, b) =>
+				a.displayName.localeCompare(b.displayName),
+			);
+		},
+		allCredentials(): ICredentialsResponse[] {
+			return Object.values(this.credentials).sort((a, b) => a.name.localeCompare(b.name));
+		},
+		allCredentialsByType(): { [type: string]: ICredentialsResponse[] } {
+			const credentials = this.allCredentials;
+			const types = this.allCredentialTypes;
+
+			return types.reduce(
+				(accu: { [type: string]: ICredentialsResponse[] }, type: ICredentialType) => {
+					accu[type.name] = credentials.filter(
+						(cred: ICredentialsResponse) => cred.type === type.name,
+					);
+
+					return accu;
+				},
+				{},
+			);
+		},
+		allUsableCredentialsForNode() {
+			return (node: INodeUi): ICredentialsResponse[] => {
+				let credentials: ICredentialsResponse[] = [];
+				const nodeType = useNodeTypesStore().getNodeType(node.type, node.typeVersion);
+				if (nodeType?.credentials) {
+					nodeType.credentials.forEach((cred) => {
+						credentials = credentials.concat(this.allUsableCredentialsByType[cred.name]);
+					});
+				}
+				return credentials.sort((a, b) => {
+					const aDate = new Date(a.updatedAt);
+					const bDate = new Date(b.updatedAt);
+					return aDate.getTime() - bDate.getTime();
+				});
+			};
+		},
+		allUsableCredentialsByType(): { [type: string]: ICredentialsResponse[] } {
+			const credentials = this.allCredentials;
+			const types = this.allCredentialTypes;
+			const usersStore = useUsersStore();
+
+			return types.reduce(
+				(accu: { [type: string]: ICredentialsResponse[] }, type: ICredentialType) => {
+					accu[type.name] = credentials.filter((cred: ICredentialsResponse) => {
+						return cred.type === type.name && usersStore.isResourceAccessible(cred);
+					});
+
+					return accu;
+				},
+				{},
+			);
+		},
+		getCredentialTypeByName() {
+			return (type: string): ICredentialType | undefined => this.credentialTypes[type];
+		},
+		getCredentialById() {
+			return (id: string): ICredentialsResponse => this.credentials[id];
+		},
+		getCredentialByIdAndType() {
+			return (id: string, type: string): ICredentialsResponse | undefined => {
+				const credential = this.credentials[id];
+				return !credential || credential.type !== type ? undefined : credential;
+			};
+		},
+		getCredentialsByType() {
+			return (credentialType: string): ICredentialsResponse[] => {
+				return this.allCredentialsByType[credentialType] || [];
+			};
+		},
+		getUsableCredentialByType() {
+			return (credentialType: string): ICredentialsResponse[] => {
+				return this.allUsableCredentialsByType[credentialType] || [];
+			};
+		},
+		getNodesWithAccess() {
+			return (credentialTypeName: string) => {
+				const nodeTypesStore = useNodeTypesStore();
+				const allNodeTypes: INodeTypeDescription[] = nodeTypesStore.allNodeTypes;
+
+				return allNodeTypes.filter((nodeType: INodeTypeDescription) => {
+					if (!nodeType.credentials) {
+						return false;
+					}
+
+					for (const credentialTypeDescription of nodeType.credentials) {
+						if (credentialTypeDescription.name === credentialTypeName) {
+							return true;
+						}
+					}
+
+					return false;
+				});
+			};
+		},
+		getScopesByCredentialType() {
+			return (credentialTypeName: string) => {
+				const credentialType = this.getCredentialTypeByName(credentialTypeName);
+				if (!credentialType) {
+					return [];
+				}
+
+				const scopeProperty = credentialType.properties.find((p) => p.name === 'scope');
+
+				if (
+					!scopeProperty ||
+					!scopeProperty.default ||
+					typeof scopeProperty.default !== 'string' ||
+					scopeProperty.default === ''
+				) {
+					return [];
+				}
+
+				let { default: scopeDefault } = scopeProperty;
+
+				// disregard expressions for display
+				scopeDefault = scopeDefault.replace(/^=/, '').replace(/\{\{.*\}\}/, '');
+
+				if (/ /.test(scopeDefault)) return scopeDefault.split(' ');
+
+				if (/,/.test(scopeDefault)) return scopeDefault.split(',');
+
+				return [scopeDefault];
+			};
+		},
+		getCredentialOwnerName() {
+			return (credential: ICredentialsResponse | IUsedCredential | undefined): string => {
+				return credential?.ownedBy?.firstName
+					? `${credential.ownedBy.firstName} ${credential.ownedBy.lastName} (${credential.ownedBy.email})`
+					: i18n.baseText('credentialEdit.credentialSharing.info.sharee.fallback');
+			};
+		},
+		getCredentialOwnerNameById() {
+			return (credentialId: string): string => {
+				const credential = this.getCredentialById(credentialId);
+
+				return this.getCredentialOwnerName(credential);
+			};
+		},
+		httpOnlyCredentialTypes(): ICredentialType[] {
+			return this.allCredentialTypes.filter((credentialType) => credentialType.httpRequestNode);
+		},
+	},
+	actions: {
+		setCredentialTypes(credentialTypes: ICredentialType[]): void {
+			this.credentialTypes = credentialTypes.reduce(
+				(accu: ICredentialTypeMap, cred: ICredentialType) => {
+					accu[cred.name] = cred;
+
+					return accu;
+				},
+				{},
+			);
+		},
+		setCredentials(credentials: ICredentialsResponse[]): void {
+			this.credentials = credentials.reduce((accu: ICredentialMap, cred: ICredentialsResponse) => {
+				if (cred.id) {
+					accu[cred.id] = cred;
+				}
+				return accu;
+			}, {});
+		},
+		addCredentials(credentials: ICredentialsResponse[]): void {
+			credentials.forEach((cred: ICredentialsResponse) => {
+				if (cred.id) {
+					this.credentials[cred.id] = { ...this.credentials[cred.id], ...cred };
+				}
+			});
+		},
+		upsertCredential(credential: ICredentialsResponse): void {
+			if (credential.id) {
+				this.credentials = {
+					...this.credentials,
+					[credential.id]: {
+						...this.credentials[credential.id],
+						...credential,
+					},
+				};
+			}
+		},
+		enableOAuthCredential(credential: ICredentialsResponse): void {
+			// enable oauth event to track change between modals
+		},
+		async fetchCredentialTypes(forceFetch: boolean): Promise<void> {
+			if (this.allCredentialTypes.length > 0 && !forceFetch) {
+				return;
+			}
+			const rootStore = useRootStore();
+			const credentialTypes = await getCredentialTypes(rootStore.getBaseUrl);
+			this.setCredentialTypes(credentialTypes);
+		},
+		async fetchAllCredentials(): Promise<ICredentialsResponse[]> {
+			const rootStore = useRootStore();
+			const credentials = await getAllCredentials(rootStore.getRestApiContext);
+			this.setCredentials(credentials);
+			return credentials;
+		},
+		async getCredentialData({
+			id,
+		}: {
+			id: string;
+		}): Promise<ICredentialsResponse | ICredentialsDecryptedResponse | undefined> {
+			const rootStore = useRootStore();
+			return await getCredentialData(rootStore.getRestApiContext, id);
+		},
+		async createNewCredential(data: ICredentialsDecrypted): Promise<ICredentialsResponse> {
+			const rootStore = useRootStore();
+			const settingsStore = useSettingsStore();
+			const credential = await createNewCredential(rootStore.getRestApiContext, data);
+
+			if (settingsStore.isEnterpriseFeatureEnabled(EnterpriseEditionFeature.Sharing)) {
+				this.upsertCredential(credential);
+
+				if (data.ownedBy) {
+					this.setCredentialOwnedBy({
+						credentialId: credential.id,
+						ownedBy: data.ownedBy,
+					});
+
+					const usersStore = useUsersStore();
+					if (data.sharedWith && data.ownedBy.id === usersStore.currentUserId) {
+						await this.setCredentialSharedWith({
+							credentialId: credential.id,
+							sharedWith: data.sharedWith,
+						});
+					}
+				}
+			} else {
+				this.upsertCredential(credential);
+			}
+			return credential;
+		},
+		async updateCredential(params: {
+			data: ICredentialsDecrypted;
+			id: string;
+		}): Promise<ICredentialsResponse> {
+			const { id, data } = params;
+			const rootStore = useRootStore();
+			const settingsStore = useSettingsStore();
+			const credential = await updateCredential(rootStore.getRestApiContext, id, data);
+
+			if (settingsStore.isEnterpriseFeatureEnabled(EnterpriseEditionFeature.Sharing)) {
+				this.upsertCredential(credential);
+
+				if (data.ownedBy) {
+					this.setCredentialOwnedBy({
+						credentialId: credential.id,
+						ownedBy: data.ownedBy,
+					});
+				}
+			} else {
+				this.upsertCredential(credential);
+			}
+
+			return credential;
+		},
+		async deleteCredential({ id }: { id: string }) {
+			const rootStore = useRootStore();
+			const deleted = await deleteCredential(rootStore.getRestApiContext, id);
+			if (deleted) {
+				const { [id]: deletedCredential, ...rest } = this.credentials;
+				this.credentials = rest;
+			}
+		},
+		async oAuth2Authorize(data: ICredentialsResponse): Promise<string> {
+			const rootStore = useRootStore();
+			return await oAuth2CredentialAuthorize(rootStore.getRestApiContext, data);
+		},
+		async oAuth1Authorize(data: ICredentialsResponse): Promise<string> {
+			const rootStore = useRootStore();
+			return await oAuth1CredentialAuthorize(rootStore.getRestApiContext, data);
+		},
+		async testCredential(data: ICredentialsDecrypted): Promise<INodeCredentialTestResult> {
+			const rootStore = useRootStore();
+			return await testCredential(rootStore.getRestApiContext, { credentials: data });
+		},
+		async getNewCredentialName(params: { credentialTypeName: string }): Promise<string> {
+			try {
+				const { credentialTypeName } = params;
+				let newName = DEFAULT_CREDENTIAL_NAME;
+				if (!TYPES_WITH_DEFAULT_NAME.includes(credentialTypeName)) {
+					const cred = this.getCredentialTypeByName(credentialTypeName);
+					newName = cred ? getAppNameFromCredType(cred.displayName) : '';
+					newName =
+						newName.length > 0
+							? `${newName} ${DEFAULT_CREDENTIAL_POSTFIX}`
+							: DEFAULT_CREDENTIAL_NAME;
+				}
+				const rootStore = useRootStore();
+				const res = await getCredentialsNewName(rootStore.getRestApiContext, newName);
+				return res.name;
+			} catch (e) {
+				return DEFAULT_CREDENTIAL_NAME;
+			}
+		},
+
+		// Enterprise edition actions
+		setCredentialOwnedBy(payload: { credentialId: string; ownedBy: Partial<IUser> }) {
+			this.credentials[payload.credentialId] = {
+				...this.credentials[payload.credentialId],
+				ownedBy: payload.ownedBy,
+			};
+		},
+		async setCredentialSharedWith(payload: {
+			sharedWith: IUser[];
+			credentialId: string;
+		}): Promise<ICredentialsResponse> {
+			if (useSettingsStore().isEnterpriseFeatureEnabled(EnterpriseEditionFeature.Sharing)) {
+				await setCredentialSharedWith(useRootStore().getRestApiContext, payload.credentialId, {
+					shareWithIds: payload.sharedWith.map((sharee) => sharee.id),
+				});
+
+				this.credentials[payload.credentialId] = {
+					...this.credentials[payload.credentialId],
+					sharedWith: payload.sharedWith,
+				};
+			}
+			return this.credentials[payload.credentialId];
+		},
+		addCredentialSharee(payload: { credentialId: string; sharee: Partial<IUser> }): void {
+			this.credentials[payload.credentialId] = {
+				...this.credentials[payload.credentialId],
+				sharedWith: (this.credentials[payload.credentialId].sharedWith || []).concat([
+					payload.sharee,
+				]),
+			};
+		},
+		removeCredentialSharee(payload: { credentialId: string; sharee: Partial<IUser> }): void {
+			this.credentials[payload.credentialId] = {
+				...this.credentials[payload.credentialId],
+				sharedWith: (this.credentials[payload.credentialId].sharedWith || []).filter(
+					(sharee) => sharee.id !== payload.sharee.id,
+				),
+			};
+		},
+
+		async getCredentialTranslation(credentialType: string): Promise<object> {
+			const rootStore = useRootStore();
+			return await makeRestApiRequest(
+				rootStore.getRestApiContext,
+				'GET',
+				'/credential-translation',
+				{
+					credentialType,
+				},
+			);
+		},
+	},
+});
+
+/**
+ * Helper function for listening to credential changes in the store
+ */
+export const listenForCredentialChanges = (opts: {
+	store: CredentialsStore;
+	onCredentialCreated?: (credential: ICredentialsResponse) => void;
+	onCredentialUpdated?: (credential: ICredentialsResponse) => void;
+	onCredentialDeleted?: (credentialId: string) => void;
+}) => {
+	const { store, onCredentialCreated, onCredentialDeleted, onCredentialUpdated } = opts;
+	const listeningForActions = ['createNewCredential', 'updateCredential', 'deleteCredential'];
+
+	return store.$onAction((result) => {
+		const { name, after, args } = result;
+		after(async (returnValue) => {
+			if (!listeningForActions.includes(name)) {
+				return;
+			}
+
+			switch (name) {
+				case 'createNewCredential':
+					const createdCredential = returnValue as ICredentialsResponse;
+					onCredentialCreated?.(createdCredential);
+					break;
+
+				case 'updateCredential':
+					const updatedCredential = returnValue as ICredentialsResponse;
+					onCredentialUpdated?.(updatedCredential);
+					break;
+
+				case 'deleteCredential':
+					const credentialId = args[0].id;
+					onCredentialDeleted?.(credentialId);
+					break;
+			}
+		});
+	});
+};
diff --git a/packages/editor-ui/src/stores/credentials.ts b/packages/editor-ui/src/stores/credentials.ts
deleted file mode 100644
index d96fc2063ee87..0000000000000
--- a/packages/editor-ui/src/stores/credentials.ts
+++ /dev/null
@@ -1,390 +0,0 @@
-import type { INodeUi, IUsedCredential } from './../Interface';
-import {
-	createNewCredential,
-	deleteCredential,
-	getAllCredentials,
-	getCredentialData,
-	getCredentialsNewName,
-	getCredentialTypes,
-	oAuth1CredentialAuthorize,
-	oAuth2CredentialAuthorize,
-	testCredential,
-	updateCredential,
-} from '@/api/credentials';
-import { setCredentialSharedWith } from '@/api/credentials.ee';
-import { getAppNameFromCredType, makeRestApiRequest } from '@/utils';
-import { EnterpriseEditionFeature, STORES } from '@/constants';
-import type {
-	ICredentialMap,
-	ICredentialsDecryptedResponse,
-	ICredentialsResponse,
-	ICredentialsState,
-	ICredentialTypeMap,
-} from '@/Interface';
-import { i18n } from '@/plugins/i18n';
-import type {
-	ICredentialsDecrypted,
-	ICredentialType,
-	INodeCredentialTestResult,
-	INodeProperties,
-	INodeTypeDescription,
-	IUser,
-} from 'n8n-workflow';
-import { defineStore } from 'pinia';
-import Vue from 'vue';
-import { useRootStore } from './n8nRootStore';
-import { useNodeTypesStore } from './nodeTypes';
-import { useSettingsStore } from './settings';
-import { useUsersStore } from './users';
-
-const DEFAULT_CREDENTIAL_NAME = 'Unnamed credential';
-const DEFAULT_CREDENTIAL_POSTFIX = 'account';
-const TYPES_WITH_DEFAULT_NAME = ['httpBasicAuth', 'oAuth2Api', 'httpDigestAuth', 'oAuth1Api'];
-
-export const useCredentialsStore = defineStore(STORES.CREDENTIALS, {
-	state: (): ICredentialsState => ({
-		credentialTypes: {},
-		credentials: {},
-	}),
-	getters: {
-		credentialTypesById(): Record<ICredentialType['name'], ICredentialType> {
-			return this.credentialTypes;
-		},
-		allCredentialTypes(): ICredentialType[] {
-			return Object.values(this.credentialTypes).sort((a, b) =>
-				a.displayName.localeCompare(b.displayName),
-			);
-		},
-		allCredentials(): ICredentialsResponse[] {
-			return Object.values(this.credentials).sort((a, b) => a.name.localeCompare(b.name));
-		},
-		allCredentialsByType(): { [type: string]: ICredentialsResponse[] } {
-			const credentials = this.allCredentials;
-			const types = this.allCredentialTypes;
-
-			return types.reduce(
-				(accu: { [type: string]: ICredentialsResponse[] }, type: ICredentialType) => {
-					accu[type.name] = credentials.filter(
-						(cred: ICredentialsResponse) => cred.type === type.name,
-					);
-
-					return accu;
-				},
-				{},
-			);
-		},
-		allUsableCredentialsForNode() {
-			return (node: INodeUi): ICredentialsResponse[] => {
-				let credentials: ICredentialsResponse[] = [];
-				const nodeType = useNodeTypesStore().getNodeType(node.type, node.typeVersion);
-				if (nodeType && nodeType.credentials) {
-					nodeType.credentials.forEach((cred) => {
-						credentials = credentials.concat(this.allUsableCredentialsByType[cred.name]);
-					});
-				}
-				return credentials.sort((a, b) => {
-					const aDate = new Date(a.updatedAt);
-					const bDate = new Date(b.updatedAt);
-					return aDate.getTime() - bDate.getTime();
-				});
-			};
-		},
-		allUsableCredentialsByType(): { [type: string]: ICredentialsResponse[] } {
-			const credentials = this.allCredentials;
-			const types = this.allCredentialTypes;
-			const usersStore = useUsersStore();
-
-			return types.reduce(
-				(accu: { [type: string]: ICredentialsResponse[] }, type: ICredentialType) => {
-					accu[type.name] = credentials.filter((cred: ICredentialsResponse) => {
-						return cred.type === type.name && usersStore.isResourceAccessible(cred);
-					});
-
-					return accu;
-				},
-				{},
-			);
-		},
-		getCredentialTypeByName() {
-			return (type: string): ICredentialType => this.credentialTypes[type];
-		},
-		getCredentialById() {
-			return (id: string): ICredentialsResponse => this.credentials[id];
-		},
-		getCredentialByIdAndType() {
-			return (id: string, type: string): ICredentialsResponse | undefined => {
-				const credential = this.credentials[id];
-				return !credential || credential.type !== type ? undefined : credential;
-			};
-		},
-		getCredentialsByType() {
-			return (credentialType: string): ICredentialsResponse[] => {
-				return this.allCredentialsByType[credentialType] || [];
-			};
-		},
-		getUsableCredentialByType() {
-			return (credentialType: string): ICredentialsResponse[] => {
-				return this.allUsableCredentialsByType[credentialType] || [];
-			};
-		},
-		getNodesWithAccess() {
-			return (credentialTypeName: string) => {
-				const nodeTypesStore = useNodeTypesStore();
-				const allLatestNodeTypes: INodeTypeDescription[] = nodeTypesStore.allLatestNodeTypes;
-
-				return allLatestNodeTypes.filter((nodeType: INodeTypeDescription) => {
-					if (!nodeType.credentials) {
-						return false;
-					}
-
-					for (const credentialTypeDescription of nodeType.credentials) {
-						if (credentialTypeDescription.name === credentialTypeName) {
-							return true;
-						}
-					}
-
-					return false;
-				});
-			};
-		},
-		getScopesByCredentialType() {
-			return (credentialTypeName: string) => {
-				const credentialType = this.getCredentialTypeByName(credentialTypeName) as {
-					properties: INodeProperties[];
-				};
-
-				const scopeProperty = credentialType.properties.find((p) => p.name === 'scope');
-
-				if (
-					!scopeProperty ||
-					!scopeProperty.default ||
-					typeof scopeProperty.default !== 'string' ||
-					scopeProperty.default === ''
-				) {
-					return [];
-				}
-
-				let { default: scopeDefault } = scopeProperty;
-
-				// disregard expressions for display
-				scopeDefault = scopeDefault.replace(/^=/, '').replace(/\{\{.*\}\}/, '');
-
-				if (/ /.test(scopeDefault)) return scopeDefault.split(' ');
-
-				if (/,/.test(scopeDefault)) return scopeDefault.split(',');
-
-				return [scopeDefault];
-			};
-		},
-		getCredentialOwnerName() {
-			return (credential: ICredentialsResponse | IUsedCredential | undefined): string => {
-				return credential?.ownedBy?.firstName
-					? `${credential.ownedBy.firstName} ${credential.ownedBy.lastName} (${credential.ownedBy.email})`
-					: i18n.baseText('credentialEdit.credentialSharing.info.sharee.fallback');
-			};
-		},
-		getCredentialOwnerNameById() {
-			return (credentialId: string): string => {
-				const credential = this.getCredentialById(credentialId);
-
-				return this.getCredentialOwnerName(credential);
-			};
-		},
-	},
-	actions: {
-		setCredentialTypes(credentialTypes: ICredentialType[]): void {
-			this.credentialTypes = credentialTypes.reduce(
-				(accu: ICredentialTypeMap, cred: ICredentialType) => {
-					accu[cred.name] = cred;
-
-					return accu;
-				},
-				{},
-			);
-		},
-		setCredentials(credentials: ICredentialsResponse[]): void {
-			this.credentials = credentials.reduce((accu: ICredentialMap, cred: ICredentialsResponse) => {
-				if (cred.id) {
-					accu[cred.id] = cred;
-				}
-				return accu;
-			}, {});
-		},
-		addCredentials(credentials: ICredentialsResponse[]): void {
-			credentials.forEach((cred: ICredentialsResponse) => {
-				if (cred.id) {
-					this.credentials[cred.id] = { ...this.credentials[cred.id], ...cred };
-				}
-			});
-		},
-		upsertCredential(credential: ICredentialsResponse): void {
-			if (credential.id) {
-				Vue.set(this.credentials, credential.id, {
-					...this.credentials[credential.id],
-					...credential,
-				});
-			}
-		},
-		enableOAuthCredential(credential: ICredentialsResponse): void {
-			// enable oauth event to track change between modals
-		},
-		async fetchCredentialTypes(forceFetch: boolean): Promise<void> {
-			if (this.allCredentialTypes.length > 0 && forceFetch !== true) {
-				return;
-			}
-			const rootStore = useRootStore();
-			const credentialTypes = await getCredentialTypes(rootStore.getBaseUrl);
-			this.setCredentialTypes(credentialTypes);
-		},
-		async fetchAllCredentials(): Promise<ICredentialsResponse[]> {
-			const rootStore = useRootStore();
-			const credentials = await getAllCredentials(rootStore.getRestApiContext);
-			this.setCredentials(credentials);
-			return credentials;
-		},
-		async getCredentialData({
-			id,
-		}: {
-			id: string;
-		}): Promise<ICredentialsResponse | ICredentialsDecryptedResponse | undefined> {
-			const rootStore = useRootStore();
-			return await getCredentialData(rootStore.getRestApiContext, id);
-		},
-		async createNewCredential(data: ICredentialsDecrypted): Promise<ICredentialsResponse> {
-			const rootStore = useRootStore();
-			const settingsStore = useSettingsStore();
-			const credential = await createNewCredential(rootStore.getRestApiContext, data);
-
-			if (settingsStore.isEnterpriseFeatureEnabled(EnterpriseEditionFeature.Sharing)) {
-				this.upsertCredential(credential);
-
-				if (data.ownedBy) {
-					this.setCredentialOwnedBy({
-						credentialId: credential.id,
-						ownedBy: data.ownedBy,
-					});
-
-					const usersStore = useUsersStore();
-					if (data.sharedWith && data.ownedBy.id === usersStore.currentUserId) {
-						this.setCredentialSharedWith({
-							credentialId: credential.id,
-							sharedWith: data.sharedWith,
-						});
-					}
-				}
-			} else {
-				this.upsertCredential(credential);
-			}
-			return credential;
-		},
-		async updateCredential(params: {
-			data: ICredentialsDecrypted;
-			id: string;
-		}): Promise<ICredentialsResponse> {
-			const { id, data } = params;
-			const rootStore = useRootStore();
-			const settingsStore = useSettingsStore();
-			const credential = await updateCredential(rootStore.getRestApiContext, id, data);
-
-			if (settingsStore.isEnterpriseFeatureEnabled(EnterpriseEditionFeature.Sharing)) {
-				this.upsertCredential(credential);
-
-				if (data.ownedBy) {
-					this.setCredentialOwnedBy({
-						credentialId: credential.id,
-						ownedBy: data.ownedBy,
-					});
-
-					const usersStore = useUsersStore();
-					if (data.sharedWith && data.ownedBy.id === usersStore.currentUserId) {
-						this.setCredentialSharedWith({
-							credentialId: credential.id,
-							sharedWith: data.sharedWith,
-						});
-					}
-				}
-			} else {
-				this.upsertCredential(credential);
-			}
-
-			return credential;
-		},
-		async deleteCredential({ id }: { id: string }) {
-			const rootStore = useRootStore();
-			const deleted = await deleteCredential(rootStore.getRestApiContext, id);
-			if (deleted) {
-				Vue.delete(this.credentials, id);
-			}
-		},
-		async oAuth2Authorize(data: ICredentialsResponse): Promise<string> {
-			const rootStore = useRootStore();
-			return oAuth2CredentialAuthorize(rootStore.getRestApiContext, data);
-		},
-		async oAuth1Authorize(data: ICredentialsResponse): Promise<string> {
-			const rootStore = useRootStore();
-			return oAuth1CredentialAuthorize(rootStore.getRestApiContext, data);
-		},
-		async testCredential(data: ICredentialsDecrypted): Promise<INodeCredentialTestResult> {
-			const rootStore = useRootStore();
-			return testCredential(rootStore.getRestApiContext, { credentials: data });
-		},
-		async getNewCredentialName(params: { credentialTypeName: string }): Promise<string> {
-			try {
-				const { credentialTypeName } = params;
-				let newName = DEFAULT_CREDENTIAL_NAME;
-				if (!TYPES_WITH_DEFAULT_NAME.includes(credentialTypeName)) {
-					const { displayName } = this.getCredentialTypeByName(credentialTypeName);
-					newName = getAppNameFromCredType(displayName);
-					newName =
-						newName.length > 0
-							? `${newName} ${DEFAULT_CREDENTIAL_POSTFIX}`
-							: DEFAULT_CREDENTIAL_NAME;
-				}
-				const rootStore = useRootStore();
-				const res = await getCredentialsNewName(rootStore.getRestApiContext, newName);
-				return res.name;
-			} catch (e) {
-				return DEFAULT_CREDENTIAL_NAME;
-			}
-		},
-
-		// Enterprise edition actions
-		setCredentialOwnedBy(payload: { credentialId: string; ownedBy: Partial<IUser> }) {
-			Vue.set(this.credentials[payload.credentialId], 'ownedBy', payload.ownedBy);
-		},
-		async setCredentialSharedWith(payload: { sharedWith: IUser[]; credentialId: string }) {
-			if (useSettingsStore().isEnterpriseFeatureEnabled(EnterpriseEditionFeature.Sharing)) {
-				await setCredentialSharedWith(useRootStore().getRestApiContext, payload.credentialId, {
-					shareWithIds: payload.sharedWith.map((sharee) => sharee.id),
-				});
-				Vue.set(this.credentials[payload.credentialId], 'sharedWith', payload.sharedWith);
-			}
-		},
-		addCredentialSharee(payload: { credentialId: string; sharee: Partial<IUser> }): void {
-			Vue.set(
-				this.credentials[payload.credentialId],
-				'sharedWith',
-				(this.credentials[payload.credentialId].sharedWith || []).concat([payload.sharee]),
-			);
-		},
-		removeCredentialSharee(payload: { credentialId: string; sharee: Partial<IUser> }): void {
-			Vue.set(
-				this.credentials[payload.credentialId],
-				'sharedWith',
-				(this.credentials[payload.credentialId].sharedWith || []).filter(
-					(sharee) => sharee.id !== payload.sharee.id,
-				),
-			);
-		},
-
-		async getCredentialTranslation(credentialType: string): Promise<object> {
-			const rootStore = useRootStore();
-			return await makeRestApiRequest(
-				rootStore.getRestApiContext,
-				'GET',
-				'/credential-translation',
-				{ credentialType },
-			);
-		},
-	},
-});
diff --git a/packages/editor-ui/src/stores/environments.ee.store.ts b/packages/editor-ui/src/stores/environments.ee.store.ts
new file mode 100644
index 0000000000000..bfd8b1d0014bb
--- /dev/null
+++ b/packages/editor-ui/src/stores/environments.ee.store.ts
@@ -0,0 +1,73 @@
+import { defineStore } from 'pinia';
+import { computed, ref } from 'vue';
+import type { EnvironmentVariable } from '@/Interface';
+import * as environmentsApi from '@/api/environments.ee';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import { ExpressionError } from 'n8n-workflow';
+
+export const useEnvironmentsStore = defineStore('environments', () => {
+	const rootStore = useRootStore();
+
+	const variables = ref<EnvironmentVariable[]>([]);
+
+	async function fetchAllVariables() {
+		const data = await environmentsApi.getVariables(rootStore.getRestApiContext);
+
+		variables.value = data;
+
+		return data;
+	}
+
+	async function createVariable(variable: Omit<EnvironmentVariable, 'id'>) {
+		const data = await environmentsApi.createVariable(rootStore.getRestApiContext, variable);
+
+		variables.value.unshift(data);
+
+		return data;
+	}
+
+	async function updateVariable(variable: EnvironmentVariable) {
+		const data = await environmentsApi.updateVariable(rootStore.getRestApiContext, variable);
+
+		variables.value = variables.value.map((v) => (v.id === data.id ? data : v));
+
+		return data;
+	}
+
+	async function deleteVariable(variable: EnvironmentVariable) {
+		const data = await environmentsApi.deleteVariable(rootStore.getRestApiContext, {
+			id: variable.id,
+		});
+
+		variables.value = variables.value.filter((v) => v.id !== variable.id);
+
+		return data;
+	}
+
+	const variablesAsObject = computed(() => {
+		const asObject = variables.value.reduce<Record<string, string | boolean | number>>(
+			(acc, variable) => {
+				acc[variable.key] = variable.value;
+				return acc;
+			},
+			{},
+		);
+
+		return new Proxy(asObject, {
+			set() {
+				throw new ExpressionError('Cannot assign values to variables at runtime');
+			},
+		});
+	});
+
+	return {
+		variables,
+		variablesAsObject,
+		fetchAllVariables,
+		createVariable,
+		updateVariable,
+		deleteVariable,
+	};
+});
+
+export default useEnvironmentsStore;
diff --git a/packages/editor-ui/src/stores/environments.ee.ts b/packages/editor-ui/src/stores/environments.ee.ts
deleted file mode 100644
index d5c78e28212cf..0000000000000
--- a/packages/editor-ui/src/stores/environments.ee.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-import { defineStore } from 'pinia';
-import { useSettingsStore } from '@/stores/settings';
-import { computed, ref } from 'vue';
-import type { EnvironmentVariable } from '@/Interface';
-import * as environmentsApi from '@/api/environments.ee';
-import { useRootStore } from '@/stores/n8nRootStore';
-import { createVariable } from '@/api/environments.ee';
-
-export const useEnvironmentsStore = defineStore('environments', () => {
-	const rootStore = useRootStore();
-
-	const variables = ref<EnvironmentVariable[]>([]);
-
-	async function fetchAllVariables() {
-		const data = await environmentsApi.getVariables(rootStore.getRestApiContext);
-
-		variables.value = data;
-
-		return data;
-	}
-
-	async function createVariable(variable: Omit<EnvironmentVariable, 'id'>) {
-		const data = await environmentsApi.createVariable(rootStore.getRestApiContext, variable);
-
-		variables.value.unshift(data);
-
-		return data;
-	}
-
-	async function updateVariable(variable: EnvironmentVariable) {
-		const data = await environmentsApi.updateVariable(rootStore.getRestApiContext, variable);
-
-		variables.value = variables.value.map((v) => (v.id === data.id ? data : v));
-
-		return data;
-	}
-
-	async function deleteVariable(variable: EnvironmentVariable) {
-		const data = await environmentsApi.deleteVariable(rootStore.getRestApiContext, {
-			id: variable.id,
-		});
-
-		variables.value = variables.value.filter((v) => v.id !== variable.id);
-
-		return data;
-	}
-
-	const variablesAsObject = computed(() =>
-		variables.value.reduce<Record<string, string | boolean | number>>((acc, variable) => {
-			acc[variable.key] = variable.value;
-			return acc;
-		}, {}),
-	);
-
-	return {
-		variables,
-		variablesAsObject,
-		fetchAllVariables,
-		createVariable,
-		updateVariable,
-		deleteVariable,
-	};
-});
-
-export default useEnvironmentsStore;
diff --git a/packages/editor-ui/src/stores/executions.store.ts b/packages/editor-ui/src/stores/executions.store.ts
new file mode 100644
index 0000000000000..95b4247f53dcf
--- /dev/null
+++ b/packages/editor-ui/src/stores/executions.store.ts
@@ -0,0 +1,294 @@
+import { defineStore } from 'pinia';
+import { computed, ref } from 'vue';
+import type { ExecutionStatus, IDataObject, ExecutionSummary } from 'n8n-workflow';
+import type {
+	ExecutionFilterType,
+	ExecutionsQueryFilter,
+	IExecutionDeleteFilter,
+	IExecutionFlattedResponse,
+	IExecutionResponse,
+	IExecutionsListResponse,
+	IExecutionsStopData,
+} from '@/Interface';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import { makeRestApiRequest, unflattenExecutionData } from '@/utils/apiUtils';
+import { executionFilterToQueryFilter, getDefaultExecutionFilters } from '@/utils/executionUtils';
+
+export const useExecutionsStore = defineStore('executions', () => {
+	const rootStore = useRootStore();
+
+	const loading = ref(false);
+	const itemsPerPage = ref(10);
+
+	const activeExecution = ref<ExecutionSummary | null>(null);
+
+	const filters = ref<ExecutionFilterType>(getDefaultExecutionFilters());
+	const executionsFilters = computed<ExecutionsQueryFilter>(() =>
+		executionFilterToQueryFilter(filters.value),
+	);
+	const currentExecutionsFilters = computed<Partial<ExecutionFilterType>>(() => ({
+		...(filters.value.workflowId !== 'all' ? { workflowId: filters.value.workflowId } : {}),
+	}));
+
+	const autoRefresh = ref(true);
+	const autoRefreshTimeout = ref<NodeJS.Timeout | null>(null);
+	const autoRefreshDelay = ref(4 * 1000); // Refresh data every 4 secs
+
+	const executionsById = ref<Record<string, ExecutionSummary>>({});
+	const executionsCount = ref(0);
+	const executionsCountEstimated = ref(false);
+	const executions = computed(() => {
+		const data = Object.values(executionsById.value);
+
+		data.sort((a, b) => {
+			return new Date(b.startedAt).getTime() - new Date(a.startedAt).getTime();
+		});
+
+		return data;
+	});
+
+	const executionsByWorkflowId = computed(() =>
+		executions.value.reduce<Record<string, ExecutionSummary[]>>((acc, execution) => {
+			if (!acc[execution.workflowId]) {
+				acc[execution.workflowId] = [];
+			}
+			acc[execution.workflowId].push(execution);
+			return acc;
+		}, {}),
+	);
+
+	const currentExecutionsById = ref<Record<string, ExecutionSummary>>({});
+	const currentExecutions = computed(() => {
+		const data = Object.values(currentExecutionsById.value);
+
+		data.sort((a, b) => {
+			return new Date(b.startedAt).getTime() - new Date(a.startedAt).getTime();
+		});
+
+		return data;
+	});
+
+	const currentExecutionsByWorkflowId = computed(() =>
+		currentExecutions.value.reduce<Record<string, ExecutionSummary[]>>((acc, execution) => {
+			if (!acc[execution.workflowId]) {
+				acc[execution.workflowId] = [];
+			}
+			acc[execution.workflowId].push(execution);
+			return acc;
+		}, {}),
+	);
+
+	const allExecutions = computed(() => [...currentExecutions.value, ...executions.value]);
+
+	function addExecution(execution: ExecutionSummary) {
+		executionsById.value[execution.id] = {
+			...execution,
+			status: execution.status ?? getExecutionStatus(execution),
+			mode: execution.mode,
+		};
+	}
+
+	function addCurrentExecution(execution: ExecutionSummary) {
+		currentExecutionsById.value[execution.id] = {
+			...execution,
+			status: execution.status ?? getExecutionStatus(execution),
+			mode: execution.mode,
+		};
+	}
+
+	function removeExecution(id: string) {
+		const { [id]: _, ...rest } = executionsById.value;
+		executionsById.value = rest;
+	}
+
+	function setFilters(value: ExecutionFilterType) {
+		filters.value = value;
+	}
+
+	async function initialize(workflowId?: string) {
+		if (workflowId) {
+			filters.value.workflowId = workflowId;
+		}
+		await fetchExecutions();
+		await startAutoRefreshInterval(workflowId);
+	}
+
+	function getExecutionStatus(execution: ExecutionSummary): ExecutionStatus {
+		if (execution.status) {
+			return execution.status;
+		} else {
+			if (execution.waitTill) {
+				return 'waiting';
+			} else if (execution.stoppedAt === undefined) {
+				return 'running';
+			} else if (execution.finished) {
+				return 'success';
+			} else if (execution.stoppedAt !== null) {
+				return 'error';
+			} else {
+				return 'unknown';
+			}
+		}
+	}
+
+	async function fetchExecutions(
+		filter = executionsFilters.value,
+		lastId?: string,
+		firstId?: string,
+	) {
+		loading.value = true;
+		try {
+			const data = await makeRestApiRequest<IExecutionsListResponse>(
+				rootStore.getRestApiContext,
+				'GET',
+				'/executions',
+				{
+					...(filter ? { filter } : {}),
+					...(firstId ? { firstId } : {}),
+					...(lastId ? { lastId } : {}),
+					limit: itemsPerPage.value,
+				},
+			);
+
+			currentExecutionsById.value = {};
+			data.results.forEach((execution) => {
+				if (['new', 'running'].includes(execution.status as string)) {
+					addCurrentExecution(execution);
+				} else {
+					addExecution(execution);
+				}
+			});
+
+			executionsCount.value = data.count;
+			executionsCountEstimated.value = data.estimated;
+		} catch (e) {
+			throw e;
+		} finally {
+			loading.value = false;
+		}
+	}
+
+	async function fetchExecution(id: string): Promise<IExecutionResponse | undefined> {
+		const response = await makeRestApiRequest<IExecutionFlattedResponse>(
+			rootStore.getRestApiContext,
+			'GET',
+			`/executions/${id}`,
+		);
+
+		return response ? unflattenExecutionData(response) : undefined;
+	}
+
+	async function loadAutoRefresh(workflowId?: string): Promise<void> {
+		const autoRefreshExecutionFilters = {
+			...executionsFilters.value,
+			...(workflowId ? { workflowId } : {}),
+		};
+
+		autoRefreshTimeout.value = setTimeout(async () => {
+			if (autoRefresh.value) {
+				await fetchExecutions(autoRefreshExecutionFilters);
+				void startAutoRefreshInterval(workflowId);
+			}
+		}, autoRefreshDelay.value);
+	}
+
+	async function startAutoRefreshInterval(workflowId?: string) {
+		stopAutoRefreshInterval();
+		await loadAutoRefresh(workflowId);
+	}
+
+	function stopAutoRefreshInterval() {
+		if (autoRefreshTimeout.value) {
+			clearTimeout(autoRefreshTimeout.value);
+			autoRefreshTimeout.value = null;
+		}
+	}
+
+	async function stopCurrentExecution(executionId: string): Promise<IExecutionsStopData> {
+		return await makeRestApiRequest(
+			rootStore.getRestApiContext,
+			'POST',
+			`/executions/${executionId}/stop`,
+		);
+	}
+
+	async function retryExecution(id: string, loadWorkflow?: boolean): Promise<boolean> {
+		return await makeRestApiRequest(
+			rootStore.getRestApiContext,
+			'POST',
+			`/executions/${id}/retry`,
+			loadWorkflow
+				? {
+						loadWorkflow: true,
+					}
+				: undefined,
+		);
+	}
+
+	async function deleteExecutions(sendData: IExecutionDeleteFilter): Promise<void> {
+		await makeRestApiRequest(
+			rootStore.getRestApiContext,
+			'POST',
+			'/executions/delete',
+			sendData as unknown as IDataObject,
+		);
+
+		if (sendData.ids) {
+			sendData.ids.forEach(removeExecution);
+		}
+
+		if (sendData.deleteBefore) {
+			const deleteBefore = new Date(sendData.deleteBefore);
+			allExecutions.value.forEach((execution) => {
+				if (new Date(execution.startedAt) < deleteBefore) {
+					removeExecution(execution.id);
+				}
+			});
+		}
+	}
+
+	function resetData() {
+		executionsById.value = {};
+		currentExecutionsById.value = {};
+		executionsCount.value = 0;
+		executionsCountEstimated.value = false;
+	}
+
+	function reset() {
+		itemsPerPage.value = 10;
+		filters.value = getDefaultExecutionFilters();
+		autoRefresh.value = true;
+		resetData();
+		stopAutoRefreshInterval();
+	}
+
+	return {
+		loading,
+		executionsById,
+		executions,
+		executionsCount,
+		executionsCountEstimated,
+		executionsByWorkflowId,
+		currentExecutions,
+		currentExecutionsByWorkflowId,
+		activeExecution,
+		fetchExecutions,
+		fetchExecution,
+		getExecutionStatus,
+		autoRefresh,
+		autoRefreshTimeout,
+		startAutoRefreshInterval,
+		stopAutoRefreshInterval,
+		initialize,
+		filters,
+		setFilters,
+		executionsFilters,
+		currentExecutionsFilters,
+		allExecutions,
+		stopCurrentExecution,
+		retryExecution,
+		deleteExecutions,
+		resetData,
+		reset,
+	};
+});
diff --git a/packages/editor-ui/src/stores/externalSecrets.ee.store.ts b/packages/editor-ui/src/stores/externalSecrets.ee.store.ts
new file mode 100644
index 0000000000000..981c8c931de22
--- /dev/null
+++ b/packages/editor-ui/src/stores/externalSecrets.ee.store.ts
@@ -0,0 +1,165 @@
+import { computed, reactive } from 'vue';
+import { defineStore } from 'pinia';
+import { EnterpriseEditionFeature } from '@/constants';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import { useSettingsStore } from '@/stores/settings.store';
+import * as externalSecretsApi from '@/api/externalSecrets.ee';
+import { connectProvider } from '@/api/externalSecrets.ee';
+import { useRBACStore } from '@/stores/rbac.store';
+import type { ExternalSecretsProvider } from '@/Interface';
+
+export const useExternalSecretsStore = defineStore('externalSecrets', () => {
+	const rootStore = useRootStore();
+	const settingsStore = useSettingsStore();
+	const rbacStore = useRBACStore();
+
+	const state = reactive({
+		providers: [] as ExternalSecretsProvider[],
+		secrets: {} as Record<string, string[]>,
+		connectionState: {} as Record<string, ExternalSecretsProvider['state']>,
+	});
+
+	const isEnterpriseExternalSecretsEnabled = computed(() =>
+		settingsStore.isEnterpriseFeatureEnabled(EnterpriseEditionFeature.ExternalSecrets),
+	);
+
+	const secrets = computed(() => state.secrets);
+	const providers = computed(() => state.providers);
+	const connectionState = computed(() => state.connectionState);
+
+	const secretsAsObject = computed(() => {
+		return Object.keys(secrets.value).reduce<Record<string, Record<string, object | string>>>(
+			(providerAcc, provider) => {
+				providerAcc[provider] = secrets.value[provider]?.reduce<Record<string, object | string>>(
+					(secretAcc, secret) => {
+						const splitSecret = secret.split('.');
+						if (splitSecret.length === 1) {
+							secretAcc[secret] = '*********';
+							return secretAcc;
+						}
+						const obj = secretAcc[splitSecret[0]] ?? {};
+						let acc = obj;
+						for (let i = 1; i < splitSecret.length; i++) {
+							const key = splitSecret[i] as keyof typeof acc;
+							// Actual value key
+							if (i === splitSecret.length - 1) {
+								const key = splitSecret[i] as keyof typeof acc;
+								acc[key] = '*********' as (typeof acc)[typeof key];
+								continue;
+							}
+							if (Object.keys(acc) && !acc[key]) {
+								acc[key] = {} as (typeof acc)[typeof key];
+							}
+							acc = acc[key];
+						}
+						secretAcc[splitSecret[0]] = obj;
+						return secretAcc;
+					},
+					{},
+				);
+
+				return providerAcc;
+			},
+			{},
+		);
+	});
+
+	async function fetchAllSecrets() {
+		if (rbacStore.hasScope('externalSecret:list')) {
+			try {
+				state.secrets = await externalSecretsApi.getExternalSecrets(rootStore.getRestApiContext);
+			} catch (error) {
+				state.secrets = {};
+			}
+		}
+	}
+
+	async function reloadProvider(id: string) {
+		const { updated } = await externalSecretsApi.reloadProvider(rootStore.getRestApiContext, id);
+		if (updated) {
+			await fetchAllSecrets();
+		}
+
+		return updated;
+	}
+
+	async function getProviders() {
+		state.providers = await externalSecretsApi.getExternalSecretsProviders(
+			rootStore.getRestApiContext,
+		);
+	}
+
+	async function testProviderConnection(id: string, data: ExternalSecretsProvider['data']) {
+		return await externalSecretsApi.testExternalSecretsProviderConnection(
+			rootStore.getRestApiContext,
+			id,
+			data,
+		);
+	}
+
+	async function getProvider(id: string) {
+		const provider = await externalSecretsApi.getExternalSecretsProvider(
+			rootStore.getRestApiContext,
+			id,
+		);
+
+		const existingProviderIndex = state.providers.findIndex((p) => p.name === id);
+		if (existingProviderIndex !== -1) {
+			state.providers.splice(existingProviderIndex, 1, provider);
+		} else {
+			state.providers.push(provider);
+		}
+
+		return provider;
+	}
+
+	function updateStoredProvider(id: string, data: Partial<ExternalSecretsProvider>) {
+		const providerIndex = state.providers.findIndex((p) => p.name === id);
+		state.providers = [
+			...state.providers.slice(0, providerIndex),
+			{
+				...state.providers[providerIndex],
+				...data,
+				data: {
+					...state.providers[providerIndex].data,
+					...data.data,
+				},
+			},
+			...state.providers.slice(providerIndex + 1),
+		];
+	}
+
+	async function updateProviderConnected(id: string, value: boolean) {
+		await connectProvider(rootStore.getRestApiContext, id, value);
+		await fetchAllSecrets();
+		updateStoredProvider(id, { connected: value, state: value ? 'connected' : 'initializing' });
+	}
+
+	async function updateProvider(id: string, { data }: Partial<ExternalSecretsProvider>) {
+		await externalSecretsApi.updateProvider(rootStore.getRestApiContext, id, data);
+		await fetchAllSecrets();
+		updateStoredProvider(id, { data });
+	}
+
+	function setConnectionState(id: string, connectionState: ExternalSecretsProvider['state']) {
+		state.connectionState[id] = connectionState;
+	}
+
+	return {
+		state,
+		providers,
+		secrets,
+		connectionState,
+		secretsAsObject,
+		isEnterpriseExternalSecretsEnabled,
+		fetchAllSecrets,
+		getProvider,
+		getProviders,
+		testProviderConnection,
+		updateProvider,
+		updateStoredProvider,
+		updateProviderConnected,
+		reloadProvider,
+		setConnectionState,
+	};
+});
diff --git a/packages/editor-ui/src/stores/history.store.ts b/packages/editor-ui/src/stores/history.store.ts
new file mode 100644
index 0000000000000..d4bd04227e6b8
--- /dev/null
+++ b/packages/editor-ui/src/stores/history.store.ts
@@ -0,0 +1,89 @@
+import type { Command, Undoable } from '@/models/history';
+import { BulkCommand } from '@/models/history';
+import { STORES } from '@/constants';
+import type { HistoryState } from '@/Interface';
+import { defineStore } from 'pinia';
+
+const STACK_LIMIT = 100;
+
+export const useHistoryStore = defineStore(STORES.HISTORY, {
+	state: (): HistoryState => ({
+		undoStack: [],
+		redoStack: [],
+		currentBulkAction: null,
+		bulkInProgress: false,
+	}),
+	actions: {
+		popUndoableToUndo(): Undoable | undefined {
+			if (this.undoStack.length > 0) {
+				return this.undoStack.pop();
+			}
+
+			return undefined;
+		},
+		pushCommandToUndo(undoable: Command, clearRedo = true): void {
+			if (!this.bulkInProgress) {
+				if (this.currentBulkAction) {
+					const alreadyIn =
+						this.currentBulkAction.commands.find((c) => c.isEqualTo(undoable)) !== undefined;
+					if (!alreadyIn) {
+						this.currentBulkAction.commands.push(undoable);
+					}
+				} else {
+					this.undoStack.push(undoable);
+				}
+				this.checkUndoStackLimit();
+				if (clearRedo) {
+					this.clearRedoStack();
+				}
+			}
+		},
+		pushBulkCommandToUndo(undoable: BulkCommand, clearRedo = true): void {
+			this.undoStack.push(undoable);
+			this.checkUndoStackLimit();
+			if (clearRedo) {
+				this.clearRedoStack();
+			}
+		},
+		checkUndoStackLimit() {
+			if (this.undoStack.length > STACK_LIMIT) {
+				this.undoStack.shift();
+			}
+		},
+		checkRedoStackLimit() {
+			if (this.redoStack.length > STACK_LIMIT) {
+				this.redoStack.shift();
+			}
+		},
+		clearUndoStack() {
+			this.undoStack = [];
+		},
+		clearRedoStack() {
+			this.redoStack = [];
+		},
+		reset() {
+			this.clearRedoStack();
+			this.clearUndoStack();
+		},
+		popUndoableToRedo(): Undoable | undefined {
+			if (this.redoStack.length > 0) {
+				return this.redoStack.pop();
+			}
+			return undefined;
+		},
+		pushUndoableToRedo(undoable: Undoable): void {
+			this.redoStack.push(undoable);
+			this.checkRedoStackLimit();
+		},
+		startRecordingUndo() {
+			this.currentBulkAction = new BulkCommand([]);
+		},
+		stopRecordingUndo() {
+			if (this.currentBulkAction && this.currentBulkAction.commands.length > 0) {
+				this.undoStack.push(this.currentBulkAction);
+				this.checkUndoStackLimit();
+			}
+			this.currentBulkAction = null;
+		},
+	},
+});
diff --git a/packages/editor-ui/src/stores/history.ts b/packages/editor-ui/src/stores/history.ts
deleted file mode 100644
index db5095607d6eb..0000000000000
--- a/packages/editor-ui/src/stores/history.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-import { AddConnectionCommand, COMMANDS, RemoveConnectionCommand } from './../models/history';
-import type { Command, Undoable } from '@/models/history';
-import { BulkCommand, MoveNodeCommand } from '@/models/history';
-import { STORES } from '@/constants';
-import type { HistoryState } from '@/Interface';
-import { defineStore } from 'pinia';
-
-const STACK_LIMIT = 100;
-
-export const useHistoryStore = defineStore(STORES.HISTORY, {
-	state: (): HistoryState => ({
-		undoStack: [],
-		redoStack: [],
-		currentBulkAction: null,
-		bulkInProgress: false,
-	}),
-	actions: {
-		popUndoableToUndo(): Undoable | undefined {
-			if (this.undoStack.length > 0) {
-				return this.undoStack.pop();
-			}
-
-			return undefined;
-		},
-		pushCommandToUndo(undoable: Command, clearRedo = true): void {
-			if (!this.bulkInProgress) {
-				if (this.currentBulkAction) {
-					const alreadyIn =
-						this.currentBulkAction.commands.find((c) => c.isEqualTo(undoable)) !== undefined;
-					if (!alreadyIn) {
-						this.currentBulkAction.commands.push(undoable);
-					}
-				} else {
-					this.undoStack.push(undoable);
-				}
-				this.checkUndoStackLimit();
-				if (clearRedo) {
-					this.clearRedoStack();
-				}
-			}
-		},
-		pushBulkCommandToUndo(undoable: BulkCommand, clearRedo = true): void {
-			this.undoStack.push(undoable);
-			this.checkUndoStackLimit();
-			if (clearRedo) {
-				this.clearRedoStack();
-			}
-		},
-		checkUndoStackLimit() {
-			if (this.undoStack.length > STACK_LIMIT) {
-				this.undoStack.shift();
-			}
-		},
-		checkRedoStackLimit() {
-			if (this.redoStack.length > STACK_LIMIT) {
-				this.redoStack.shift();
-			}
-		},
-		clearUndoStack() {
-			this.undoStack = [];
-		},
-		clearRedoStack() {
-			this.redoStack = [];
-		},
-		reset() {
-			this.clearRedoStack();
-			this.clearUndoStack();
-		},
-		popUndoableToRedo(): Undoable | undefined {
-			if (this.redoStack.length > 0) {
-				return this.redoStack.pop();
-			}
-			return undefined;
-		},
-		pushUndoableToRedo(undoable: Undoable): void {
-			this.redoStack.push(undoable);
-			this.checkRedoStackLimit();
-		},
-		startRecordingUndo() {
-			this.currentBulkAction = new BulkCommand([]);
-		},
-		stopRecordingUndo() {
-			if (this.currentBulkAction && this.currentBulkAction.commands.length > 0) {
-				this.undoStack.push(this.currentBulkAction);
-				this.checkUndoStackLimit();
-			}
-			this.currentBulkAction = null;
-		},
-	},
-});
diff --git a/packages/editor-ui/src/stores/index.ts b/packages/editor-ui/src/stores/index.ts
deleted file mode 100644
index 927ff1ae2961f..0000000000000
--- a/packages/editor-ui/src/stores/index.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-export * from './canvas';
-export * from './communityNodes';
-export * from './credentials';
-export * from './environments.ee';
-export * from './history';
-export * from './logStreamingStore';
-export * from './n8nRootStore';
-export * from './ndv';
-export * from './nodeCreator';
-export * from './nodeTypes';
-export * from './posthog';
-export * from './segment';
-export * from './settings';
-export * from './tags';
-export * from './telemetry';
-export * from './templates';
-export * from './ui';
-export * from './usage';
-export * from './users';
-export * from './versions';
-export * from './webhooks';
-export * from './workflows.ee';
-export * from './workflows';
diff --git a/packages/editor-ui/src/stores/logStreaming.store.ts b/packages/editor-ui/src/stores/logStreaming.store.ts
new file mode 100644
index 0000000000000..6c7656d76871f
--- /dev/null
+++ b/packages/editor-ui/src/stores/logStreaming.store.ts
@@ -0,0 +1,290 @@
+import type { MessageEventBusDestinationOptions } from 'n8n-workflow';
+import { defineStore } from 'pinia';
+import {
+	deleteDestinationFromDb,
+	getDestinationsFromBackend,
+	getEventNamesFromBackend,
+	saveDestinationToDb,
+	sendTestMessageToDestination,
+} from '../api/eventbus.ee';
+import { useRootStore } from './n8nRoot.store';
+
+export interface EventSelectionItem {
+	selected: boolean;
+	indeterminate: boolean;
+	name: string;
+	label: string;
+}
+
+interface EventSelectionGroup extends EventSelectionItem {
+	children: EventSelectionItem[];
+}
+
+interface DestinationStoreItem {
+	destination: MessageEventBusDestinationOptions;
+	selectedEvents: Set<string>;
+	eventGroups: EventSelectionGroup[];
+	isNew: boolean;
+}
+
+export interface DestinationSettingsStore {
+	[key: string]: DestinationStoreItem;
+}
+
+export const useLogStreamingStore = defineStore('logStreaming', {
+	state: () => ({
+		items: {} as DestinationSettingsStore,
+		eventNames: new Set<string>(),
+	}),
+	getters: {},
+	actions: {
+		addDestination(destination: MessageEventBusDestinationOptions) {
+			if (destination.id && this.items[destination.id]) {
+				this.items[destination.id].destination = destination;
+			} else {
+				this.setSelectionAndBuildItems(destination);
+			}
+		},
+		getDestination(destinationId: string): MessageEventBusDestinationOptions | undefined {
+			if (this.items[destinationId]) {
+				return this.items[destinationId].destination;
+			} else {
+				return;
+			}
+		},
+		getAllDestinations(): MessageEventBusDestinationOptions[] {
+			const destinations: MessageEventBusDestinationOptions[] = [];
+			for (const key of Object.keys(this.items)) {
+				destinations.push(this.items[key].destination);
+			}
+			return destinations;
+		},
+		updateDestination(destination: MessageEventBusDestinationOptions) {
+			if (destination.id && this.items[destination.id]) {
+				this.$patch((state) => {
+					if (destination.id && this.items[destination.id]) {
+						state.items[destination.id].destination = destination;
+					}
+					// to trigger refresh
+					state.items = { ...state.items };
+				});
+			}
+		},
+		removeDestination(destinationId: string) {
+			if (!destinationId) return;
+			delete this.items[destinationId];
+			if (this.items[destinationId]) {
+				this.$patch({
+					items: {
+						...this.items,
+					},
+				});
+			}
+		},
+		clearDestinations() {
+			this.items = {};
+		},
+		addEventName(name: string) {
+			this.eventNames.add(name);
+		},
+		removeEventName(name: string) {
+			this.eventNames.delete(name);
+		},
+		clearEventNames() {
+			this.eventNames.clear();
+		},
+		addSelectedEvent(id: string, name: string) {
+			this.items[id]?.selectedEvents?.add(name);
+			this.setSelectedInGroup(id, name, true);
+		},
+		removeSelectedEvent(id: string, name: string) {
+			this.items[id]?.selectedEvents?.delete(name);
+			this.setSelectedInGroup(id, name, false);
+		},
+		getSelectedEvents(destinationId: string): string[] {
+			const selectedEvents: string[] = [];
+			if (this.items[destinationId]) {
+				for (const group of this.items[destinationId].eventGroups) {
+					if (group.selected) {
+						selectedEvents.push(group.name);
+					}
+					for (const event of group.children) {
+						if (event.selected) {
+							selectedEvents.push(event.name);
+						}
+					}
+				}
+			}
+			return selectedEvents;
+		},
+		setSelectedInGroup(destinationId: string, name: string, isSelected: boolean) {
+			if (this.items[destinationId]) {
+				const groupName = eventGroupFromEventName(name);
+				const groupIndex = this.items[destinationId].eventGroups.findIndex(
+					(e) => e.name === groupName,
+				);
+				if (groupIndex > -1) {
+					if (groupName === name) {
+						this.$patch((state) => {
+							state.items[destinationId].eventGroups[groupIndex].selected = isSelected;
+						});
+					} else {
+						const eventIndex = this.items[destinationId].eventGroups[groupIndex].children.findIndex(
+							(e) => e.name === name,
+						);
+						if (eventIndex > -1) {
+							this.$patch((state) => {
+								state.items[destinationId].eventGroups[groupIndex].children[eventIndex].selected =
+									isSelected;
+								if (isSelected) {
+									state.items[destinationId].eventGroups[groupIndex].indeterminate = isSelected;
+								} else {
+									let anySelected = false;
+									for (
+										let i = 0;
+										i < state.items[destinationId].eventGroups[groupIndex].children.length;
+										i++
+									) {
+										anySelected =
+											anySelected ||
+											state.items[destinationId].eventGroups[groupIndex].children[i].selected;
+									}
+									state.items[destinationId].eventGroups[groupIndex].indeterminate = anySelected;
+								}
+							});
+						}
+					}
+				}
+			}
+		},
+		removeDestinationItemTree(id: string) {
+			delete this.items[id];
+		},
+		clearDestinationItemTrees() {
+			this.items = {} as DestinationSettingsStore;
+		},
+		setSelectionAndBuildItems(destination: MessageEventBusDestinationOptions) {
+			if (destination.id) {
+				if (!this.items[destination.id]) {
+					this.items[destination.id] = {
+						destination,
+						selectedEvents: new Set<string>(),
+						eventGroups: [],
+						isNew: false,
+					} as DestinationStoreItem;
+				}
+				this.items[destination.id]?.selectedEvents?.clear();
+				if (destination.subscribedEvents) {
+					for (const eventName of destination.subscribedEvents) {
+						this.items[destination.id]?.selectedEvents?.add(eventName);
+					}
+				}
+				this.items[destination.id].eventGroups = eventGroupsFromStringList(
+					this.eventNames,
+					this.items[destination.id]?.selectedEvents,
+				);
+			}
+		},
+		async saveDestination(destination: MessageEventBusDestinationOptions): Promise<boolean> {
+			if (destination.id) {
+				const rootStore = useRootStore();
+				const selectedEvents = this.getSelectedEvents(destination.id);
+				try {
+					await saveDestinationToDb(rootStore.getRestApiContext, destination, selectedEvents);
+					this.updateDestination(destination);
+					return true;
+				} catch (e) {
+					return false;
+				}
+			}
+			return false;
+		},
+		async sendTestMessage(destination: MessageEventBusDestinationOptions) {
+			if (destination.id) {
+				const rootStore = useRootStore();
+				const testResult = await sendTestMessageToDestination(
+					rootStore.getRestApiContext,
+					destination,
+				);
+				return testResult;
+			}
+			return false;
+		},
+		async fetchEventNames(): Promise<string[]> {
+			const rootStore = useRootStore();
+			return await getEventNamesFromBackend(rootStore.getRestApiContext);
+		},
+		async fetchDestinations(): Promise<MessageEventBusDestinationOptions[]> {
+			const rootStore = useRootStore();
+			return await getDestinationsFromBackend(rootStore.getRestApiContext);
+		},
+		async deleteDestination(destinationId: string) {
+			const rootStore = useRootStore();
+			await deleteDestinationFromDb(rootStore.getRestApiContext, destinationId);
+			this.removeDestination(destinationId);
+		},
+	},
+});
+
+export function eventGroupFromEventName(eventName: string): string | undefined {
+	const matches = eventName.match(/^[\w\s]+\.[\w\s]+/);
+	if (matches && matches?.length > 0) {
+		return matches[0];
+	}
+	return undefined;
+}
+
+function prettifyEventName(label: string, group = ''): string {
+	label = label.replace(group + '.', '');
+	if (label.length > 0) {
+		label = label[0].toUpperCase() + label.substring(1);
+		label = label.replaceAll('.', ' ');
+	}
+	return label;
+}
+
+export function eventGroupsFromStringList(
+	dottedList: Set<string>,
+	selectionList: Set<string> = new Set(),
+) {
+	const result = [] as EventSelectionGroup[];
+	const eventNameArray = Array.from(dottedList.values());
+
+	const groups: Set<string> = new Set<string>();
+
+	// since a Set returns iteration items on the order they were added, we can make sure workflow and nodes come first
+	groups.add('n8n.workflow');
+	groups.add('n8n.node');
+
+	for (const eventName of eventNameArray) {
+		const matches = eventName.match(/^[\w\s]+\.[\w\s]+/);
+		if (matches && matches?.length > 0) {
+			groups.add(matches[0]);
+		}
+	}
+
+	for (const group of groups) {
+		const collection: EventSelectionGroup = {
+			children: [],
+			label: group,
+			name: group,
+			selected: selectionList.has(group),
+			indeterminate: false,
+		};
+		const eventsOfGroup = eventNameArray.filter((e) => e.startsWith(group));
+		for (const event of eventsOfGroup) {
+			if (!collection.selected && selectionList.has(event)) {
+				collection.indeterminate = true;
+			}
+			const subCollection: EventSelectionItem = {
+				label: prettifyEventName(event, group),
+				name: event,
+				selected: selectionList.has(event),
+				indeterminate: false,
+			};
+			collection.children.push(subCollection);
+		}
+		result.push(collection);
+	}
+	return result;
+}
diff --git a/packages/editor-ui/src/stores/logStreamingStore.ts b/packages/editor-ui/src/stores/logStreamingStore.ts
deleted file mode 100644
index e1b3a33661072..0000000000000
--- a/packages/editor-ui/src/stores/logStreamingStore.ts
+++ /dev/null
@@ -1,291 +0,0 @@
-import type { MessageEventBusDestinationOptions } from 'n8n-workflow';
-import { deepCopy } from 'n8n-workflow';
-import { defineStore } from 'pinia';
-import {
-	deleteDestinationFromDb,
-	getDestinationsFromBackend,
-	getEventNamesFromBackend,
-	saveDestinationToDb,
-	sendTestMessageToDestination,
-} from '../api/eventbus.ee';
-import { useRootStore } from './n8nRootStore';
-
-export interface EventSelectionItem {
-	selected: boolean;
-	indeterminate: boolean;
-	name: string;
-	label: string;
-}
-
-interface EventSelectionGroup extends EventSelectionItem {
-	children: EventSelectionItem[];
-}
-
-interface DestinationStoreItem {
-	destination: MessageEventBusDestinationOptions;
-	selectedEvents: Set<string>;
-	eventGroups: EventSelectionGroup[];
-	isNew: boolean;
-}
-
-export interface DestinationSettingsStore {
-	[key: string]: DestinationStoreItem;
-}
-
-export const useLogStreamingStore = defineStore('logStreaming', {
-	state: () => ({
-		items: {} as DestinationSettingsStore,
-		eventNames: new Set<string>(),
-	}),
-	getters: {},
-	actions: {
-		addDestination(destination: MessageEventBusDestinationOptions) {
-			if (destination.id && destination.id in this.items) {
-				this.items[destination.id].destination = destination;
-			} else {
-				this.setSelectionAndBuildItems(destination);
-			}
-		},
-		getDestination(destinationId: string): MessageEventBusDestinationOptions | undefined {
-			if (destinationId in this.items) {
-				return this.items[destinationId].destination;
-			} else {
-				return;
-			}
-		},
-		getAllDestinations(): MessageEventBusDestinationOptions[] {
-			const destinations: MessageEventBusDestinationOptions[] = [];
-			for (const key of Object.keys(this.items)) {
-				destinations.push(this.items[key].destination);
-			}
-			return destinations;
-		},
-		updateDestination(destination: MessageEventBusDestinationOptions) {
-			if (destination.id && destination.id in this.items) {
-				this.$patch((state) => {
-					if (destination.id && destination.id in this.items) {
-						state.items[destination.id].destination = destination;
-					}
-					// to trigger refresh
-					state.items = deepCopy(state.items);
-				});
-			}
-		},
-		removeDestination(destinationId: string) {
-			if (!destinationId) return;
-			delete this.items[destinationId];
-			if (destinationId in this.items) {
-				this.$patch({
-					items: {
-						...this.items,
-					},
-				});
-			}
-		},
-		clearDestinations() {
-			this.items = {};
-		},
-		addEventName(name: string) {
-			this.eventNames.add(name);
-		},
-		removeEventName(name: string) {
-			this.eventNames.delete(name);
-		},
-		clearEventNames() {
-			this.eventNames.clear();
-		},
-		addSelectedEvent(id: string, name: string) {
-			this.items[id]?.selectedEvents?.add(name);
-			this.setSelectedInGroup(id, name, true);
-		},
-		removeSelectedEvent(id: string, name: string) {
-			this.items[id]?.selectedEvents?.delete(name);
-			this.setSelectedInGroup(id, name, false);
-		},
-		getSelectedEvents(destinationId: string): string[] {
-			const selectedEvents: string[] = [];
-			if (destinationId in this.items) {
-				for (const group of this.items[destinationId].eventGroups) {
-					if (group.selected) {
-						selectedEvents.push(group.name);
-					}
-					for (const event of group.children) {
-						if (event.selected) {
-							selectedEvents.push(event.name);
-						}
-					}
-				}
-			}
-			return selectedEvents;
-		},
-		setSelectedInGroup(destinationId: string, name: string, isSelected: boolean) {
-			if (destinationId in this.items) {
-				const groupName = eventGroupFromEventName(name);
-				const groupIndex = this.items[destinationId].eventGroups.findIndex(
-					(e) => e.name === groupName,
-				);
-				if (groupIndex > -1) {
-					if (groupName === name) {
-						this.$patch((state) => {
-							state.items[destinationId].eventGroups[groupIndex].selected = isSelected;
-						});
-					} else {
-						const eventIndex = this.items[destinationId].eventGroups[groupIndex].children.findIndex(
-							(e) => e.name === name,
-						);
-						if (eventIndex > -1) {
-							this.$patch((state) => {
-								state.items[destinationId].eventGroups[groupIndex].children[eventIndex].selected =
-									isSelected;
-								if (isSelected) {
-									state.items[destinationId].eventGroups[groupIndex].indeterminate = isSelected;
-								} else {
-									let anySelected = false;
-									for (
-										let i = 0;
-										i < state.items[destinationId].eventGroups[groupIndex].children.length;
-										i++
-									) {
-										anySelected =
-											anySelected ||
-											state.items[destinationId].eventGroups[groupIndex].children[i].selected;
-									}
-									state.items[destinationId].eventGroups[groupIndex].indeterminate = anySelected;
-								}
-							});
-						}
-					}
-				}
-			}
-		},
-		removeDestinationItemTree(id: string) {
-			delete this.items[id];
-		},
-		clearDestinationItemTrees() {
-			this.items = {} as DestinationSettingsStore;
-		},
-		setSelectionAndBuildItems(destination: MessageEventBusDestinationOptions) {
-			if (destination.id) {
-				if (!(destination.id in this.items)) {
-					this.items[destination.id] = {
-						destination,
-						selectedEvents: new Set<string>(),
-						eventGroups: [],
-						isNew: false,
-					} as DestinationStoreItem;
-				}
-				this.items[destination.id]?.selectedEvents?.clear();
-				if (destination.subscribedEvents) {
-					for (const eventName of destination.subscribedEvents) {
-						this.items[destination.id]?.selectedEvents?.add(eventName);
-					}
-				}
-				this.items[destination.id].eventGroups = eventGroupsFromStringList(
-					this.eventNames,
-					this.items[destination.id]?.selectedEvents,
-				);
-			}
-		},
-		async saveDestination(destination: MessageEventBusDestinationOptions): Promise<boolean> {
-			if (destination.id) {
-				const rootStore = useRootStore();
-				const selectedEvents = this.getSelectedEvents(destination.id);
-				try {
-					await saveDestinationToDb(rootStore.getRestApiContext, destination, selectedEvents);
-					this.updateDestination(destination);
-					return true;
-				} catch (e) {
-					return false;
-				}
-			}
-			return false;
-		},
-		async sendTestMessage(destination: MessageEventBusDestinationOptions) {
-			if (destination.id) {
-				const rootStore = useRootStore();
-				const testResult = await sendTestMessageToDestination(
-					rootStore.getRestApiContext,
-					destination,
-				);
-				return testResult;
-			}
-			return false;
-		},
-		async fetchEventNames(): Promise<string[]> {
-			const rootStore = useRootStore();
-			return getEventNamesFromBackend(rootStore.getRestApiContext);
-		},
-		async fetchDestinations(): Promise<MessageEventBusDestinationOptions[]> {
-			const rootStore = useRootStore();
-			return getDestinationsFromBackend(rootStore.getRestApiContext);
-		},
-		async deleteDestination(destinationId: string) {
-			const rootStore = useRootStore();
-			await deleteDestinationFromDb(rootStore.getRestApiContext, destinationId);
-			this.removeDestination(destinationId);
-		},
-	},
-});
-
-export function eventGroupFromEventName(eventName: string): string | undefined {
-	const matches = eventName.match(/^[\w\s]+\.[\w\s]+/);
-	if (matches && matches?.length > 0) {
-		return matches[0];
-	}
-	return undefined;
-}
-
-function prettifyEventName(label: string, group = ''): string {
-	label = label.replace(group + '.', '');
-	if (label.length > 0) {
-		label = label[0].toUpperCase() + label.substring(1);
-		label = label.replaceAll('.', ' ');
-	}
-	return label;
-}
-
-export function eventGroupsFromStringList(
-	dottedList: Set<string>,
-	selectionList: Set<string> = new Set(),
-) {
-	const result = [] as EventSelectionGroup[];
-	const eventNameArray = Array.from(dottedList.values());
-
-	const groups: Set<string> = new Set<string>();
-
-	// since a Set returns iteration items on the order they were added, we can make sure workflow and nodes come first
-	groups.add('n8n.workflow');
-	groups.add('n8n.node');
-
-	for (const eventName of eventNameArray) {
-		const matches = eventName.match(/^[\w\s]+\.[\w\s]+/);
-		if (matches && matches?.length > 0) {
-			groups.add(matches[0]);
-		}
-	}
-
-	for (const group of groups) {
-		const collection: EventSelectionGroup = {
-			children: [],
-			label: group,
-			name: group,
-			selected: selectionList.has(group),
-			indeterminate: false,
-		};
-		const eventsOfGroup = eventNameArray.filter((e) => e.startsWith(group));
-		for (const event of eventsOfGroup) {
-			if (!collection.selected && selectionList.has(event)) {
-				collection.indeterminate = true;
-			}
-			const subCollection: EventSelectionItem = {
-				label: prettifyEventName(event, group),
-				name: event,
-				selected: selectionList.has(event),
-				indeterminate: false,
-			};
-			collection.children.push(subCollection);
-		}
-		result.push(collection);
-	}
-	return result;
-}
diff --git a/packages/editor-ui/src/stores/n8nRoot.store.ts b/packages/editor-ui/src/stores/n8nRoot.store.ts
new file mode 100644
index 0000000000000..56eeace066075
--- /dev/null
+++ b/packages/editor-ui/src/stores/n8nRoot.store.ts
@@ -0,0 +1,136 @@
+import { CLOUD_BASE_URL_PRODUCTION, CLOUD_BASE_URL_STAGING, STORES } from '@/constants';
+import type { IRestApiContext, RootState } from '@/Interface';
+import { setGlobalState, type IDataObject } from 'n8n-workflow';
+import { defineStore } from 'pinia';
+
+const { VUE_APP_URL_BASE_API } = import.meta.env;
+
+export const useRootStore = defineStore(STORES.ROOT, {
+	state: (): RootState => ({
+		baseUrl: VUE_APP_URL_BASE_API ?? window.BASE_PATH,
+		restEndpoint:
+			!window.REST_ENDPOINT || window.REST_ENDPOINT === '{{REST_ENDPOINT}}'
+				? 'rest'
+				: window.REST_ENDPOINT,
+		defaultLocale: 'en',
+		endpointForm: 'form',
+		endpointFormTest: 'form-test',
+		endpointFormWaiting: 'form-waiting',
+		endpointWebhook: 'webhook',
+		endpointWebhookTest: 'webhook-test',
+		pushConnectionActive: true,
+		timezone: 'America/New_York',
+		executionTimeout: -1,
+		maxExecutionTimeout: Number.MAX_SAFE_INTEGER,
+		versionCli: '0.0.0',
+		oauthCallbackUrls: {},
+		n8nMetadata: {},
+		pushRef: Math.random().toString(36).substring(2, 15),
+		urlBaseWebhook: 'http://localhost:5678/',
+		urlBaseEditor: 'http://localhost:5678',
+		isNpmAvailable: false,
+		instanceId: '',
+		binaryDataMode: 'default',
+	}),
+	getters: {
+		getBaseUrl(): string {
+			return this.baseUrl;
+		},
+
+		getFormUrl(): string {
+			return `${this.urlBaseWebhook}${this.endpointForm}`;
+		},
+
+		getFormTestUrl(): string {
+			return `${this.urlBaseEditor}${this.endpointFormTest}`;
+		},
+
+		getFormWaitingUrl(): string {
+			return `${this.baseUrl}${this.endpointFormWaiting}`;
+		},
+
+		getWebhookUrl(): string {
+			return `${this.urlBaseWebhook}${this.endpointWebhook}`;
+		},
+
+		getWebhookTestUrl(): string {
+			return `${this.urlBaseEditor}${this.endpointWebhookTest}`;
+		},
+
+		getRestUrl(): string {
+			return `${this.baseUrl}${this.restEndpoint}`;
+		},
+
+		getRestCloudApiContext(): IRestApiContext {
+			return {
+				baseUrl: window.location.host.includes('stage-app.n8n.cloud')
+					? CLOUD_BASE_URL_STAGING
+					: CLOUD_BASE_URL_PRODUCTION,
+				pushRef: '',
+			};
+		},
+
+		getRestApiContext(): IRestApiContext {
+			return {
+				baseUrl: this.getRestUrl,
+				pushRef: this.pushRef,
+			};
+		},
+	},
+	actions: {
+		setUrlBaseWebhook(urlBaseWebhook: string): void {
+			const url = urlBaseWebhook.endsWith('/') ? urlBaseWebhook : `${urlBaseWebhook}/`;
+			this.urlBaseWebhook = url;
+		},
+		setUrlBaseEditor(urlBaseEditor: string): void {
+			const url = urlBaseEditor.endsWith('/') ? urlBaseEditor : `${urlBaseEditor}/`;
+			this.urlBaseEditor = url;
+		},
+		setEndpointForm(endpointForm: string): void {
+			this.endpointForm = endpointForm;
+		},
+		setEndpointFormTest(endpointFormTest: string): void {
+			this.endpointFormTest = endpointFormTest;
+		},
+		setEndpointFormWaiting(endpointFormWaiting: string): void {
+			this.endpointFormWaiting = endpointFormWaiting;
+		},
+		setEndpointWebhook(endpointWebhook: string): void {
+			this.endpointWebhook = endpointWebhook;
+		},
+		setEndpointWebhookTest(endpointWebhookTest: string): void {
+			this.endpointWebhookTest = endpointWebhookTest;
+		},
+		setTimezone(timezone: string): void {
+			this.timezone = timezone;
+			setGlobalState({ defaultTimezone: timezone });
+		},
+		setExecutionTimeout(executionTimeout: number): void {
+			this.executionTimeout = executionTimeout;
+		},
+		setMaxExecutionTimeout(maxExecutionTimeout: number): void {
+			this.maxExecutionTimeout = maxExecutionTimeout;
+		},
+		setVersionCli(version: string): void {
+			this.versionCli = version;
+		},
+		setInstanceId(instanceId: string): void {
+			this.instanceId = instanceId;
+		},
+		setOauthCallbackUrls(urls: IDataObject): void {
+			this.oauthCallbackUrls = urls;
+		},
+		setN8nMetadata(metadata: IDataObject): void {
+			this.n8nMetadata = metadata as RootState['n8nMetadata'];
+		},
+		setDefaultLocale(locale: string): void {
+			this.defaultLocale = locale;
+		},
+		setIsNpmAvailable(isNpmAvailable: boolean): void {
+			this.isNpmAvailable = isNpmAvailable;
+		},
+		setBinaryDataMode(binaryDataMode: string): void {
+			this.binaryDataMode = binaryDataMode;
+		},
+	},
+});
diff --git a/packages/editor-ui/src/stores/n8nRootStore.ts b/packages/editor-ui/src/stores/n8nRootStore.ts
deleted file mode 100644
index 8f071afe6fdff..0000000000000
--- a/packages/editor-ui/src/stores/n8nRootStore.ts
+++ /dev/null
@@ -1,110 +0,0 @@
-import { STORES } from '@/constants';
-import type { IRestApiContext, RootState } from '@/Interface';
-import type { IDataObject } from 'n8n-workflow';
-import { defineStore } from 'pinia';
-import Vue from 'vue';
-import { useNodeTypesStore } from './nodeTypes';
-
-const { VUE_APP_URL_BASE_API } = import.meta.env;
-
-export const useRootStore = defineStore(STORES.ROOT, {
-	state: (): RootState => ({
-		baseUrl:
-			VUE_APP_URL_BASE_API ?? (window.BASE_PATH === '/{{BASE_PATH}}/' ? '/' : window.BASE_PATH),
-		restEndpoint:
-			!window.REST_ENDPOINT || window.REST_ENDPOINT === '{{REST_ENDPOINT}}'
-				? 'rest'
-				: window.REST_ENDPOINT,
-		defaultLocale: 'en',
-		endpointWebhook: 'webhook',
-		endpointWebhookTest: 'webhook-test',
-		pushConnectionActive: true,
-		timezone: 'America/New_York',
-		executionTimeout: -1,
-		maxExecutionTimeout: Number.MAX_SAFE_INTEGER,
-		versionCli: '0.0.0',
-		oauthCallbackUrls: {},
-		n8nMetadata: {},
-		sessionId: Math.random().toString(36).substring(2, 15),
-		urlBaseWebhook: 'http://localhost:5678/',
-		urlBaseEditor: 'http://localhost:5678',
-		isNpmAvailable: false,
-		instanceId: '',
-	}),
-	getters: {
-		getBaseUrl(): string {
-			return this.baseUrl;
-		},
-
-		getWebhookUrl(): string {
-			return `${this.urlBaseWebhook}${this.endpointWebhook}`;
-		},
-
-		getWebhookTestUrl(): string {
-			return `${this.urlBaseEditor}${this.endpointWebhookTest}`;
-		},
-
-		getRestUrl(): string {
-			return `${this.baseUrl}${this.restEndpoint}`;
-		},
-
-		getRestApiContext(): IRestApiContext {
-			return {
-				baseUrl: this.getRestUrl,
-				sessionId: this.sessionId,
-			};
-		},
-		/**
-		 * Getter for node default names ending with a number: `'S3'`, `'Magento 2'`, etc.
-		 */
-		nativelyNumberSuffixedDefaults: (): string[] => {
-			return useNodeTypesStore().allNodeTypes.reduce<string[]>((acc, cur) => {
-				if (/\d$/.test(cur.defaults.name as string)) acc.push(cur.defaults.name as string);
-				return acc;
-			}, []);
-		},
-	},
-	actions: {
-		setUrlBaseWebhook(urlBaseWebhook: string): void {
-			const url = urlBaseWebhook.endsWith('/') ? urlBaseWebhook : `${urlBaseWebhook}/`;
-			Vue.set(this, 'urlBaseWebhook', url);
-		},
-		setUrlBaseEditor(urlBaseEditor: string): void {
-			const url = urlBaseEditor.endsWith('/') ? urlBaseEditor : `${urlBaseEditor}/`;
-			Vue.set(this, 'urlBaseEditor', url);
-		},
-		setEndpointWebhook(endpointWebhook: string): void {
-			Vue.set(this, 'endpointWebhook', endpointWebhook);
-		},
-		setEndpointWebhookTest(endpointWebhookTest: string): void {
-			Vue.set(this, 'endpointWebhookTest', endpointWebhookTest);
-		},
-		setTimezone(timezone: string): void {
-			Vue.set(this, 'timezone', timezone);
-		},
-		setExecutionTimeout(executionTimeout: number): void {
-			Vue.set(this, 'executionTimeout', executionTimeout);
-		},
-		setMaxExecutionTimeout(maxExecutionTimeout: number): void {
-			Vue.set(this, 'maxExecutionTimeout', maxExecutionTimeout);
-		},
-		setVersionCli(version: string): void {
-			Vue.set(this, 'versionCli', version);
-		},
-		setInstanceId(instanceId: string): void {
-			Vue.set(this, 'instanceId', instanceId);
-		},
-		setOauthCallbackUrls(urls: IDataObject): void {
-			Vue.set(this, 'oauthCallbackUrls', urls);
-		},
-		setN8nMetadata(metadata: IDataObject): void {
-			Vue.set(this, 'n8nMetadata', metadata);
-		},
-		setDefaultLocale(locale: string): void {
-			Vue.set(this, 'defaultLocale', locale);
-		},
-		setIsNpmAvailable(isNpmAvailable: boolean): void {
-			Vue.set(this, 'isNpmAvailable', isNpmAvailable);
-		},
-	},
-});
diff --git a/packages/editor-ui/src/stores/ndv.store.ts b/packages/editor-ui/src/stores/ndv.store.ts
new file mode 100644
index 0000000000000..b2e7e315b370a
--- /dev/null
+++ b/packages/editor-ui/src/stores/ndv.store.ts
@@ -0,0 +1,280 @@
+import type {
+	INodeUi,
+	IRunDataDisplayMode,
+	NDVState,
+	NodePanelType,
+	TargetItem,
+	XYPosition,
+} from '@/Interface';
+import { useStorage } from '@/composables/useStorage';
+import {
+	LOCAL_STORAGE_AUTOCOMPLETE_IS_ONBOARDED,
+	LOCAL_STORAGE_MAPPING_IS_ONBOARDED,
+	STORES,
+} from '@/constants';
+import type { INodeExecutionData, INodeIssues } from 'n8n-workflow';
+import { NodeConnectionType } from 'n8n-workflow';
+import { defineStore } from 'pinia';
+import { v4 as uuid } from 'uuid';
+import { useWorkflowsStore } from './workflows.store';
+
+export const useNDVStore = defineStore(STORES.NDV, {
+	state: (): NDVState => ({
+		activeNodeName: null,
+		mainPanelDimensions: {},
+		pushRef: '',
+		input: {
+			displayMode: 'schema',
+			nodeName: undefined,
+			run: undefined,
+			branch: undefined,
+			data: {
+				isEmpty: true,
+			},
+		},
+		output: {
+			displayMode: 'table',
+			branch: undefined,
+			data: {
+				isEmpty: true,
+			},
+			editMode: {
+				enabled: false,
+				value: '',
+			},
+		},
+		focusedMappableInput: '',
+		focusedInputPath: '',
+		mappingTelemetry: {},
+		hoveringItem: null,
+		draggable: {
+			isDragging: false,
+			type: '',
+			data: '',
+			dimensions: null,
+			activeTarget: null,
+		},
+		isMappingOnboarded: useStorage(LOCAL_STORAGE_MAPPING_IS_ONBOARDED).value === 'true',
+		isAutocompleteOnboarded: useStorage(LOCAL_STORAGE_AUTOCOMPLETE_IS_ONBOARDED).value === 'true',
+		highlightDraggables: false,
+	}),
+	getters: {
+		activeNode(): INodeUi | null {
+			const workflowsStore = useWorkflowsStore();
+			return workflowsStore.getNodeByName(this.activeNodeName || '');
+		},
+		ndvInputData(): INodeExecutionData[] {
+			const workflowsStore = useWorkflowsStore();
+			const executionData = workflowsStore.getWorkflowExecution;
+			const inputNodeName: string | undefined = this.input.nodeName;
+			const inputRunIndex: number = this.input.run ?? 0;
+			const inputBranchIndex: number = this.input.branch ?? 0;
+
+			if (
+				!executionData ||
+				!inputNodeName ||
+				inputRunIndex === undefined ||
+				inputBranchIndex === undefined
+			) {
+				return [];
+			}
+
+			return executionData.data?.resultData?.runData?.[inputNodeName]?.[inputRunIndex]?.data
+				?.main?.[inputBranchIndex];
+		},
+		hasInputData(): boolean {
+			const data = this.ndvInputData;
+			const pinData =
+				this.ndvInputNodeName && useWorkflowsStore().pinDataByNodeName(this.ndvInputNodeName);
+			return !!(data && data.length > 0) || !!(pinData && pinData.length > 0);
+		},
+		getPanelDisplayMode() {
+			return (panel: NodePanelType) => this[panel].displayMode;
+		},
+		inputPanelDisplayMode(): IRunDataDisplayMode {
+			return this.input.displayMode;
+		},
+		outputPanelDisplayMode(): IRunDataDisplayMode {
+			return this.output.displayMode;
+		},
+		isDraggableDragging(): boolean {
+			return this.draggable.isDragging;
+		},
+		draggableType(): string {
+			return this.draggable.type;
+		},
+		draggableData(): string {
+			return this.draggable.data;
+		},
+		canDraggableDrop(): boolean {
+			return this.draggable.activeTarget !== null;
+		},
+		outputPanelEditMode(): NDVState['output']['editMode'] {
+			return this.output.editMode;
+		},
+		getMainPanelDimensions() {
+			return (panelType: string) => {
+				const defaults = { relativeRight: 1, relativeLeft: 1, relativeWidth: 1 };
+				return { ...defaults, ...this.mainPanelDimensions[panelType] };
+			};
+		},
+		draggableStickyPos(): XYPosition | null {
+			return this.draggable.activeTarget?.stickyPosition ?? null;
+		},
+		ndvInputNodeName(): string | undefined {
+			return this.input.nodeName;
+		},
+		ndvInputRunIndex(): number | undefined {
+			return this.input.run;
+		},
+		ndvInputBranchIndex(): number | undefined {
+			return this.input.branch;
+		},
+		isNDVDataEmpty() {
+			return (panel: 'input' | 'output'): boolean => this[panel].data.isEmpty;
+		},
+		isInputParentOfActiveNode(): boolean {
+			const inputNodeName = this.ndvInputNodeName;
+			if (!this.activeNode || !inputNodeName) {
+				return false;
+			}
+			const workflow = useWorkflowsStore().getCurrentWorkflow();
+			const parentNodes = workflow.getParentNodes(this.activeNode.name, NodeConnectionType.Main, 1);
+			return parentNodes.includes(inputNodeName);
+		},
+		hoveringItemNumber(): number {
+			return (this.hoveringItem?.itemIndex ?? 0) + 1;
+		},
+		getHoveringItem(): TargetItem | null {
+			if (this.isInputParentOfActiveNode) {
+				return this.hoveringItem;
+			}
+
+			return null;
+		},
+		isNDVOpen(): boolean {
+			return this.activeNodeName !== null;
+		},
+	},
+	actions: {
+		setActiveNodeName(nodeName: string | null): void {
+			this.activeNodeName = nodeName;
+		},
+		setInputNodeName(nodeName: string | undefined): void {
+			this.input = {
+				...this.input,
+				nodeName,
+			};
+		},
+		setInputRunIndex(run?: number): void {
+			this.input = {
+				...this.input,
+				run,
+			};
+		},
+		setMainPanelDimensions(params: {
+			panelType: string;
+			dimensions: { relativeLeft?: number; relativeRight?: number; relativeWidth?: number };
+		}): void {
+			this.mainPanelDimensions = {
+				...this.mainPanelDimensions,
+				[params.panelType]: {
+					...this.mainPanelDimensions[params.panelType],
+					...params.dimensions,
+				},
+			};
+		},
+		setNDVPushRef(): void {
+			this.pushRef = `ndv-${uuid()}`;
+		},
+		resetNDVPushRef(): void {
+			this.pushRef = '';
+		},
+		setPanelDisplayMode(params: { pane: NodePanelType; mode: IRunDataDisplayMode }): void {
+			this[params.pane].displayMode = params.mode;
+		},
+		setOutputPanelEditModeEnabled(isEnabled: boolean): void {
+			this.output.editMode.enabled = isEnabled;
+		},
+		setOutputPanelEditModeValue(payload: string): void {
+			this.output.editMode.value = payload;
+		},
+		setMappableNDVInputFocus(paramName: string): void {
+			this.focusedMappableInput = paramName;
+		},
+		draggableStartDragging({
+			type,
+			data,
+			dimensions,
+		}: {
+			type: string;
+			data: string;
+			dimensions: DOMRect | null;
+		}): void {
+			this.draggable = {
+				isDragging: true,
+				type,
+				data,
+				dimensions,
+				activeTarget: null,
+			};
+		},
+		draggableStopDragging(): void {
+			this.draggable = {
+				isDragging: false,
+				type: '',
+				data: '',
+				activeTarget: null,
+			};
+		},
+		setDraggableTarget(target: NDVState['draggable']['activeTarget']): void {
+			this.draggable.activeTarget = target;
+		},
+		setMappingTelemetry(telemetry: { [key: string]: string | number | boolean }): void {
+			this.mappingTelemetry = { ...this.mappingTelemetry, ...telemetry };
+		},
+		resetMappingTelemetry(): void {
+			this.mappingTelemetry = {};
+		},
+		setHoveringItem(item: null | NDVState['hoveringItem']): void {
+			this.hoveringItem = item;
+		},
+		setNDVBranchIndex(e: { pane: 'input' | 'output'; branchIndex: number }): void {
+			this[e.pane].branch = e.branchIndex;
+		},
+		setNDVPanelDataIsEmpty(payload: { panel: 'input' | 'output'; isEmpty: boolean }): void {
+			this[payload.panel].data.isEmpty = payload.isEmpty;
+		},
+		setMappingOnboarded() {
+			this.isMappingOnboarded = true;
+			useStorage(LOCAL_STORAGE_MAPPING_IS_ONBOARDED).value = 'true';
+		},
+		setAutocompleteOnboarded() {
+			this.isAutocompleteOnboarded = true;
+			useStorage(LOCAL_STORAGE_AUTOCOMPLETE_IS_ONBOARDED).value = 'true';
+		},
+		setHighlightDraggables(highlight: boolean) {
+			this.highlightDraggables = highlight;
+		},
+		updateNodeParameterIssues(issues: INodeIssues): void {
+			const workflowsStore = useWorkflowsStore();
+			const activeNode = workflowsStore.getNodeByName(this.activeNodeName || '');
+
+			if (activeNode) {
+				const nodeIndex = workflowsStore.workflow.nodes.findIndex((node) => {
+					return node.name === activeNode.name;
+				});
+
+				workflowsStore.updateNodeAtIndex(nodeIndex, {
+					issues: {
+						...activeNode.issues,
+						...issues,
+					},
+				});
+			}
+		},
+		setFocusedInputPath(path: string) {
+			this.focusedInputPath = path;
+		},
+	},
+});
diff --git a/packages/editor-ui/src/stores/ndv.ts b/packages/editor-ui/src/stores/ndv.ts
deleted file mode 100644
index 937c8b07b620f..0000000000000
--- a/packages/editor-ui/src/stores/ndv.ts
+++ /dev/null
@@ -1,210 +0,0 @@
-import { LOCAL_STORAGE_MAPPING_IS_ONBOARDED, STORES } from '@/constants';
-import type {
-	INodeUi,
-	IRunDataDisplayMode,
-	NDVState,
-	NodePanelType,
-	XYPosition,
-} from '@/Interface';
-import type { IRunData } from 'n8n-workflow';
-import { defineStore } from 'pinia';
-import Vue from 'vue';
-import { useWorkflowsStore } from './workflows';
-
-export const useNDVStore = defineStore(STORES.NDV, {
-	state: (): NDVState => ({
-		activeNodeName: null,
-		mainPanelDimensions: {},
-		sessionId: '',
-		input: {
-			displayMode: 'schema',
-			nodeName: undefined,
-			run: undefined,
-			branch: undefined,
-			data: {
-				isEmpty: true,
-			},
-		},
-		output: {
-			displayMode: 'table',
-			branch: undefined,
-			data: {
-				isEmpty: true,
-			},
-			editMode: {
-				enabled: false,
-				value: '',
-			},
-		},
-		focusedMappableInput: '',
-		mappingTelemetry: {},
-		hoveringItem: null,
-		draggable: {
-			isDragging: false,
-			type: '',
-			data: '',
-			canDrop: false,
-			stickyPosition: null,
-		},
-		isMappingOnboarded: window.localStorage.getItem(LOCAL_STORAGE_MAPPING_IS_ONBOARDED) === 'true',
-	}),
-	getters: {
-		activeNode(): INodeUi | null {
-			const workflowsStore = useWorkflowsStore();
-			return workflowsStore.getNodeByName(this.activeNodeName || '');
-		},
-		ndvInputData(): IRunData[] {
-			const workflowsStore = useWorkflowsStore();
-			const executionData = workflowsStore.getWorkflowExecution;
-			const inputNodeName: string | undefined = this.input.nodeName;
-			const inputRunIndex: number = this.input.run ?? 0;
-			const inputBranchIndex: number = this.input.branch ?? 0;
-
-			if (
-				!executionData ||
-				!inputNodeName ||
-				inputRunIndex === undefined ||
-				inputBranchIndex === undefined
-			) {
-				return [];
-			}
-
-			return executionData.data?.resultData?.runData?.[inputNodeName]?.[inputRunIndex]?.data
-				?.main?.[inputBranchIndex];
-		},
-		getPanelDisplayMode() {
-			return (panel: NodePanelType) => this[panel].displayMode;
-		},
-		inputPanelDisplayMode(): IRunDataDisplayMode {
-			return this.input.displayMode;
-		},
-		outputPanelDisplayMode(): IRunDataDisplayMode {
-			return this.output.displayMode;
-		},
-		isDraggableDragging(): boolean {
-			return this.draggable.isDragging;
-		},
-		draggableType(): string {
-			return this.draggable.type;
-		},
-		draggableData(): string {
-			return this.draggable.data;
-		},
-		canDraggableDrop(): boolean {
-			return this.draggable.canDrop;
-		},
-		outputPanelEditMode(): NDVState['output']['editMode'] {
-			return this.output.editMode;
-		},
-		getMainPanelDimensions() {
-			return (panelType: string) => {
-				const defaults = { relativeRight: 1, relativeLeft: 1, relativeWidth: 1 };
-				return { ...defaults, ...this.mainPanelDimensions[panelType] };
-			};
-		},
-		draggableStickyPos(): XYPosition | null {
-			return this.draggable.stickyPosition;
-		},
-		ndvInputNodeName(): string | undefined {
-			return this.input.nodeName;
-		},
-		ndvInputRunIndex(): number | undefined {
-			return this.input.run;
-		},
-		ndvInputBranchIndex(): number | undefined {
-			return this.input.branch;
-		},
-		isDNVDataEmpty() {
-			return (panel: 'input' | 'output'): boolean => this[panel].data.isEmpty;
-		},
-		isInputParentOfActiveNode(): boolean {
-			const inputNodeName = this.ndvInputNodeName;
-			if (!this.activeNode || !inputNodeName) {
-				return false;
-			}
-			const workflow = useWorkflowsStore().getCurrentWorkflow();
-			const parentNodes = workflow.getParentNodes(this.activeNode.name, 'main', 1);
-			return parentNodes.includes(inputNodeName);
-		},
-	},
-	actions: {
-		setInputNodeName(name: string | undefined): void {
-			Vue.set(this.input, 'nodeName', name);
-		},
-		setInputRunIndex(run?: string): void {
-			Vue.set(this.input, 'run', run);
-		},
-		setMainPanelDimensions(params: {
-			panelType: string;
-			dimensions: { relativeLeft?: number; relativeRight?: number; relativeWidth?: number };
-		}): void {
-			Vue.set(this.mainPanelDimensions, params.panelType, {
-				...this.mainPanelDimensions[params.panelType],
-				...params.dimensions,
-			});
-		},
-		setNDVSessionId(): void {
-			Vue.set(this, 'sessionId', `ndv-${Math.random().toString(36).slice(-8)}`);
-		},
-		resetNDVSessionId(): void {
-			Vue.set(this, 'sessionId', '');
-		},
-		setPanelDisplayMode(params: { pane: NodePanelType; mode: IRunDataDisplayMode }): void {
-			Vue.set(this[params.pane], 'displayMode', params.mode);
-		},
-		setOutputPanelEditModeEnabled(isEnabled: boolean): void {
-			Vue.set(this.output.editMode, 'enabled', isEnabled);
-		},
-		setOutputPanelEditModeValue(payload: string): void {
-			Vue.set(this.output.editMode, 'value', payload);
-		},
-		setMappableNDVInputFocus(paramName: string): void {
-			Vue.set(this, 'focusedMappableInput', paramName);
-		},
-		draggableStartDragging({ type, data }: { type: string; data: string }): void {
-			this.draggable = {
-				isDragging: true,
-				type,
-				data,
-				canDrop: false,
-				stickyPosition: null,
-			};
-		},
-		draggableStopDragging(): void {
-			this.draggable = {
-				isDragging: false,
-				type: '',
-				data: '',
-				canDrop: false,
-				stickyPosition: null,
-			};
-		},
-		setDraggableStickyPos(position: XYPosition | null): void {
-			Vue.set(this.draggable, 'stickyPosition', position);
-		},
-		setDraggableCanDrop(canDrop: boolean): void {
-			Vue.set(this.draggable, 'canDrop', canDrop);
-		},
-		setMappingTelemetry(telemetry: { [key: string]: string | number | boolean }): void {
-			this.mappingTelemetry = { ...this.mappingTelemetry, ...telemetry };
-		},
-		resetMappingTelemetry(): void {
-			this.mappingTelemetry = {};
-		},
-		setHoveringItem(item: null | NDVState['hoveringItem']): void {
-			Vue.set(this, 'hoveringItem', item);
-		},
-		setNDVBranchIndex(e: { pane: 'input' | 'output'; branchIndex: number }): void {
-			Vue.set(this[e.pane], 'branch', e.branchIndex);
-		},
-		setNDVPanelDataIsEmpty(payload: { panel: 'input' | 'output'; isEmpty: boolean }): void {
-			Vue.set(this[payload.panel].data, 'isEmpty', payload.isEmpty);
-		},
-		disableMappingHint(store = true) {
-			this.isMappingOnboarded = true;
-			if (store) {
-				window.localStorage.setItem(LOCAL_STORAGE_MAPPING_IS_ONBOARDED, 'true');
-			}
-		},
-	},
-});
diff --git a/packages/editor-ui/src/stores/nodeCreator.store.ts b/packages/editor-ui/src/stores/nodeCreator.store.ts
new file mode 100644
index 0000000000000..0939edc0d463c
--- /dev/null
+++ b/packages/editor-ui/src/stores/nodeCreator.store.ts
@@ -0,0 +1,58 @@
+import { defineStore } from 'pinia';
+import { STORES, TRIGGER_NODE_CREATOR_VIEW } from '@/constants';
+import type {
+	NodeFilterType,
+	NodeCreatorOpenSource,
+	SimplifiedNodeType,
+	ActionsRecord,
+} from '@/Interface';
+
+import { computed, ref } from 'vue';
+import { transformNodeType } from '@/components/Node/NodeCreator/utils';
+
+export const useNodeCreatorStore = defineStore(STORES.NODE_CREATOR, () => {
+	const selectedView = ref<NodeFilterType>(TRIGGER_NODE_CREATOR_VIEW);
+	const mergedNodes = ref<SimplifiedNodeType[]>([]);
+	const actions = ref<ActionsRecord<typeof mergedNodes.value>>({});
+
+	const showScrim = ref(false);
+	const openSource = ref<NodeCreatorOpenSource>('');
+
+	const allNodeCreatorNodes = computed(() =>
+		Object.values(mergedNodes.value).map((i) => transformNodeType(i)),
+	);
+
+	function setMergeNodes(nodes: SimplifiedNodeType[]) {
+		mergedNodes.value = nodes;
+	}
+
+	function setActions(nodes: ActionsRecord<typeof mergedNodes.value>) {
+		actions.value = nodes;
+	}
+
+	function setShowScrim(isVisible: boolean) {
+		showScrim.value = isVisible;
+	}
+
+	function setSelectedView(view: NodeFilterType) {
+		selectedView.value = view;
+	}
+
+	function setOpenSource(view: NodeCreatorOpenSource) {
+		openSource.value = view;
+	}
+
+	return {
+		openSource,
+		selectedView,
+		showScrim,
+		mergedNodes,
+		actions,
+		setShowScrim,
+		setSelectedView,
+		setOpenSource,
+		setActions,
+		setMergeNodes,
+		allNodeCreatorNodes,
+	};
+});
diff --git a/packages/editor-ui/src/stores/nodeCreator.ts b/packages/editor-ui/src/stores/nodeCreator.ts
deleted file mode 100644
index 23ce3f4eef4b9..0000000000000
--- a/packages/editor-ui/src/stores/nodeCreator.ts
+++ /dev/null
@@ -1,402 +0,0 @@
-import { startCase } from 'lodash-es';
-import { defineStore } from 'pinia';
-import type {
-	INodePropertyCollection,
-	INodePropertyOptions,
-	IDataObject,
-	INodeProperties,
-	INodeTypeDescription,
-	INodeParameters,
-	INodeActionTypeDescription,
-} from 'n8n-workflow';
-import { deepCopy } from 'n8n-workflow';
-import {
-	STORES,
-	MANUAL_TRIGGER_NODE_TYPE,
-	CORE_NODES_CATEGORY,
-	TRIGGER_NODE_FILTER,
-	STICKY_NODE_TYPE,
-	NODE_CREATOR_OPEN_SOURCES,
-} from '@/constants';
-import { useNodeTypesStore } from '@/stores/nodeTypes';
-import { useWorkflowsStore } from './workflows';
-import { CUSTOM_API_CALL_KEY } from '@/constants';
-import type { INodeCreatorState, INodeFilterType, IUpdateInformation } from '@/Interface';
-import { i18n } from '@/plugins/i18n';
-import type { Telemetry } from '@/plugins/telemetry';
-import { runExternalHook } from '@/utils';
-import { useWebhooksStore } from '@/stores/webhooks';
-
-const PLACEHOLDER_RECOMMENDED_ACTION_KEY = 'placeholder_recommended';
-
-const customNodeActionsParsers: {
-	[key: string]: (
-		matchedProperty: INodeProperties,
-		nodeTypeDescription: INodeTypeDescription,
-	) => INodeActionTypeDescription[] | undefined;
-} = {
-	['n8n-nodes-base.hubspotTrigger']: (matchedProperty, nodeTypeDescription) => {
-		const collection = matchedProperty?.options?.[0] as INodePropertyCollection;
-
-		return (collection?.values[0]?.options as INodePropertyOptions[])?.map(
-			(categoryItem): INodeActionTypeDescription => ({
-				...getNodeTypeBase(
-					nodeTypeDescription,
-					i18n.baseText('nodeCreator.actionsCategory.triggers'),
-				),
-				actionKey: categoryItem.value as string,
-				displayName: i18n.baseText('nodeCreator.actionsCategory.onEvent', {
-					interpolate: { event: startCase(categoryItem.name) },
-				}),
-				description: categoryItem.description || '',
-				displayOptions: matchedProperty.displayOptions,
-				values: { eventsUi: { eventValues: [{ name: categoryItem.value }] } },
-			}),
-		);
-	},
-};
-
-function filterActions(actions: INodeActionTypeDescription[]) {
-	// Do not show single action nodes
-	if (actions.length <= 1) return [];
-	return actions.filter(
-		(action: INodeActionTypeDescription, _: number, arr: INodeActionTypeDescription[]) => {
-			const isApiCall = action.actionKey === CUSTOM_API_CALL_KEY;
-			if (isApiCall) return false;
-
-			const isPlaceholderTriggerAction = action.actionKey === PLACEHOLDER_RECOMMENDED_ACTION_KEY;
-			return !isPlaceholderTriggerAction || (isPlaceholderTriggerAction && arr.length > 1);
-		},
-	);
-}
-
-function getNodeTypeBase(nodeTypeDescription: INodeTypeDescription, category: string) {
-	return {
-		name: nodeTypeDescription.name,
-		group: ['trigger'],
-		codex: {
-			categories: [category],
-			subcategories: {
-				[nodeTypeDescription.displayName]: [category],
-			},
-		},
-		iconUrl: nodeTypeDescription.iconUrl,
-		icon: nodeTypeDescription.icon,
-		version: [1],
-		defaults: {
-			...nodeTypeDescription.defaults,
-		},
-		inputs: [],
-		outputs: [],
-		properties: [],
-	};
-}
-
-function operationsCategory(
-	nodeTypeDescription: INodeTypeDescription,
-): INodeActionTypeDescription[] {
-	if (!!nodeTypeDescription.properties.find((property) => property.name === 'resource')) return [];
-
-	const matchedProperty = nodeTypeDescription.properties.find(
-		(property) => property.name?.toLowerCase() === 'operation',
-	);
-
-	if (!matchedProperty || !matchedProperty.options) return [];
-
-	const filteredOutItems = (matchedProperty.options as INodePropertyOptions[]).filter(
-		(categoryItem: INodePropertyOptions) => !['*', '', ' '].includes(categoryItem.name),
-	);
-
-	const items = filteredOutItems.map((item: INodePropertyOptions) => ({
-		...getNodeTypeBase(nodeTypeDescription, i18n.baseText('nodeCreator.actionsCategory.actions')),
-		actionKey: item.value as string,
-		displayName: item.action ?? startCase(item.name),
-		description: item.description ?? '',
-		displayOptions: matchedProperty.displayOptions,
-		values: {
-			[matchedProperty.name]: matchedProperty.type === 'multiOptions' ? [item.value] : item.value,
-		},
-	}));
-
-	// Do not return empty category
-	if (items.length === 0) return [];
-
-	return items;
-}
-
-function triggersCategory(nodeTypeDescription: INodeTypeDescription): INodeActionTypeDescription[] {
-	const matchingKeys = ['event', 'events', 'trigger on'];
-	const isTrigger = nodeTypeDescription.displayName?.toLowerCase().includes('trigger');
-	const matchedProperty = nodeTypeDescription.properties.find((property) =>
-		matchingKeys.includes(property.displayName?.toLowerCase()),
-	);
-
-	if (!isTrigger) return [];
-
-	// Inject placeholder action if no events are available
-	// so user is able to add node to the canvas from the actions panel
-	if (!matchedProperty || !matchedProperty.options) {
-		return [
-			{
-				...getNodeTypeBase(
-					nodeTypeDescription,
-					i18n.baseText('nodeCreator.actionsCategory.triggers'),
-				),
-				actionKey: PLACEHOLDER_RECOMMENDED_ACTION_KEY,
-				displayName: i18n.baseText('nodeCreator.actionsCategory.onNewEvent', {
-					interpolate: { event: nodeTypeDescription.displayName.replace('Trigger', '').trimEnd() },
-				}),
-				description: '',
-			},
-		];
-	}
-
-	const filteredOutItems = (matchedProperty.options as INodePropertyOptions[]).filter(
-		(categoryItem: INodePropertyOptions) => !['*', '', ' '].includes(categoryItem.name),
-	);
-
-	const customParsedItem = customNodeActionsParsers[nodeTypeDescription.name]?.(
-		matchedProperty,
-		nodeTypeDescription,
-	);
-
-	const items =
-		customParsedItem ??
-		filteredOutItems.map((categoryItem: INodePropertyOptions) => ({
-			...getNodeTypeBase(
-				nodeTypeDescription,
-				i18n.baseText('nodeCreator.actionsCategory.triggers'),
-			),
-			actionKey: categoryItem.value as string,
-			displayName:
-				categoryItem.action ??
-				i18n.baseText('nodeCreator.actionsCategory.onEvent', {
-					interpolate: { event: startCase(categoryItem.name) },
-				}),
-			description: categoryItem.description || '',
-			displayOptions: matchedProperty.displayOptions,
-			values: {
-				[matchedProperty.name]:
-					matchedProperty.type === 'multiOptions' ? [categoryItem.value] : categoryItem.value,
-			},
-		}));
-
-	return items;
-}
-
-function resourceCategories(
-	nodeTypeDescription: INodeTypeDescription,
-): INodeActionTypeDescription[] {
-	const transformedNodes: INodeActionTypeDescription[] = [];
-	const matchedProperties = nodeTypeDescription.properties.filter(
-		(property) => property.displayName?.toLowerCase() === 'resource',
-	);
-
-	matchedProperties.forEach((property) => {
-		((property.options as INodePropertyOptions[]) || [])
-			.filter((option) => option.value !== CUSTOM_API_CALL_KEY)
-			.forEach((resourceOption, i, options) => {
-				const isSingleResource = options.length === 1;
-
-				// Match operations for the resource by checking if displayOptions matches or contains the resource name
-				const operations = nodeTypeDescription.properties.find(
-					(operation) =>
-						operation.name === 'operation' &&
-						(operation.displayOptions?.show?.resource?.includes(resourceOption.value) ||
-							isSingleResource),
-				);
-
-				if (!operations?.options) return;
-
-				const items = ((operations.options as INodePropertyOptions[]) || []).map(
-					(operationOption) => {
-						const displayName =
-							operationOption.action ?? `${resourceOption.name} ${startCase(operationOption.name)}`;
-
-						// We need to manually populate displayOptions as they are not present in the node description
-						// if the resource has only one option
-						const displayOptions = isSingleResource
-							? { show: { resource: [(options as INodePropertyOptions[])[0]?.value] } }
-							: operations?.displayOptions;
-
-						return {
-							...getNodeTypeBase(nodeTypeDescription, resourceOption.name),
-							actionKey: operationOption.value as string,
-							description: operationOption?.description ?? '',
-							displayOptions,
-							values: {
-								operation:
-									operations?.type === 'multiOptions'
-										? [operationOption.value]
-										: operationOption.value,
-							},
-							displayName,
-							group: ['trigger'],
-						};
-					},
-				);
-
-				transformedNodes.push(...items);
-			});
-	});
-
-	return transformedNodes;
-}
-
-export const useNodeCreatorStore = defineStore(STORES.NODE_CREATOR, {
-	state: (): INodeCreatorState => ({
-		itemsFilter: '',
-		showScrim: false,
-		selectedView: TRIGGER_NODE_FILTER,
-		rootViewHistory: [],
-		openSource: '',
-	}),
-	actions: {
-		setShowScrim(isVisible: boolean) {
-			this.showScrim = isVisible;
-		},
-		setSelectedView(selectedNodeType: INodeFilterType) {
-			this.selectedView = selectedNodeType;
-			if (!this.rootViewHistory.includes(selectedNodeType)) {
-				this.rootViewHistory.push(selectedNodeType);
-			}
-		},
-		closeCurrentView() {
-			this.rootViewHistory.pop();
-			this.selectedView = this.rootViewHistory[this.rootViewHistory.length - 1];
-		},
-		resetRootViewHistory() {
-			this.rootViewHistory = [];
-		},
-		setFilter(search: string) {
-			this.itemsFilter = search;
-		},
-		setAddedNodeActionParameters(action: IUpdateInformation, telemetry?: Telemetry, track = true) {
-			const { $onAction: onWorkflowStoreAction } = useWorkflowsStore();
-			const storeWatcher = onWorkflowStoreAction(
-				({ name, after, store: { setLastNodeParameters }, args }) => {
-					if (name !== 'addNode' || args[0].type !== action.key) return;
-					after(() => {
-						setLastNodeParameters(action);
-						if (track) this.trackActionSelected(action, telemetry);
-						storeWatcher();
-					});
-				},
-			);
-
-			return storeWatcher;
-		},
-		trackActionSelected(action: IUpdateInformation, telemetry?: Telemetry) {
-			const payload = {
-				node_type: action.key,
-				action: action.name,
-				resource: (action.value as INodeParameters).resource || '',
-			};
-			runExternalHook('nodeCreateList.addAction', useWebhooksStore(), payload);
-			telemetry?.trackNodesPanel('nodeCreateList.addAction', payload);
-		},
-	},
-	getters: {
-		visibleNodesWithActions(): INodeTypeDescription[] {
-			const nodes = deepCopy(useNodeTypesStore().visibleNodeTypes);
-			const nodesWithActions = nodes.map((node) => {
-				node.actions = [
-					...triggersCategory(node),
-					...operationsCategory(node),
-					...resourceCategories(node),
-				];
-
-				return node;
-			});
-			return nodesWithActions;
-		},
-		mergedAppNodes(): INodeTypeDescription[] {
-			const triggers = this.visibleNodesWithActions.filter((node) =>
-				node.group.includes('trigger'),
-			);
-			const apps = this.visibleNodesWithActions
-				.filter((node) => !node.group.includes('trigger'))
-				.map((node) => {
-					const newNode = deepCopy(node);
-					newNode.actions = newNode.actions || [];
-					return newNode;
-				});
-
-			triggers.forEach((node) => {
-				const normalizedName = node.name.toLowerCase().replace('trigger', '');
-				const app = apps.find((node) => node.name.toLowerCase() === normalizedName);
-				const newNode = deepCopy(node);
-				if (app && app.actions?.length) {
-					// merge triggers into regular nodes that match
-					app?.actions?.push(...(newNode.actions || []));
-					app.description = newNode.description; // default to trigger description
-				} else {
-					newNode.actions = newNode.actions || [];
-					apps.push(newNode);
-				}
-			});
-
-			const filteredNodes = apps.map((node) => ({
-				...node,
-				actions: filterActions(node.actions || []),
-			}));
-
-			return filteredNodes;
-		},
-		getNodeTypesWithManualTrigger:
-			() =>
-			(nodeType?: string): string[] => {
-				if (!nodeType) return [];
-
-				const { workflowTriggerNodes } = useWorkflowsStore();
-				const isTrigger = useNodeTypesStore().isTriggerNode(nodeType);
-				const workflowContainsTrigger = workflowTriggerNodes.length > 0;
-				const isTriggerPanel = useNodeCreatorStore().selectedView === TRIGGER_NODE_FILTER;
-				const isStickyNode = nodeType === STICKY_NODE_TYPE;
-				const singleNodeOpenSources = [
-					NODE_CREATOR_OPEN_SOURCES.PLUS_ENDPOINT,
-					NODE_CREATOR_OPEN_SOURCES.NODE_CONNECTION_ACTION,
-					NODE_CREATOR_OPEN_SOURCES.NODE_CONNECTION_DROP,
-				];
-
-				// If the node creator was opened from the plus endpoint, node connection action, or node connection drop
-				// then we do not want to append the manual trigger
-				const isSingleNodeOpenSource = singleNodeOpenSources.includes(
-					useNodeCreatorStore().openSource,
-				);
-
-				const shouldAppendManualTrigger =
-					!isSingleNodeOpenSource &&
-					!isTrigger &&
-					!workflowContainsTrigger &&
-					isTriggerPanel &&
-					!isStickyNode;
-
-				const nodeTypes = shouldAppendManualTrigger
-					? [MANUAL_TRIGGER_NODE_TYPE, nodeType]
-					: [nodeType];
-
-				return nodeTypes;
-			},
-
-		getActionData:
-			() =>
-			(actionItem: INodeActionTypeDescription): IUpdateInformation => {
-				const displayOptions = actionItem.displayOptions;
-
-				const displayConditions = Object.keys(displayOptions?.show || {}).reduce(
-					(acc: IDataObject, showCondition: string) => {
-						acc[showCondition] = displayOptions?.show?.[showCondition]?.[0];
-						return acc;
-					},
-					{},
-				);
-
-				return {
-					name: actionItem.displayName,
-					key: actionItem.name as string,
-					value: { ...actionItem.values, ...displayConditions } as INodeParameters,
-				};
-			},
-	},
-});
diff --git a/packages/editor-ui/src/stores/nodeTypes.store.ts b/packages/editor-ui/src/stores/nodeTypes.store.ts
new file mode 100644
index 0000000000000..a23596bfceb0f
--- /dev/null
+++ b/packages/editor-ui/src/stores/nodeTypes.store.ts
@@ -0,0 +1,297 @@
+import {
+	getNodeParameterOptions,
+	getNodesInformation,
+	getNodeTranslationHeaders,
+	getNodeTypes,
+	getResourceLocatorResults,
+	getResourceMapperFields,
+} from '@/api/nodeTypes';
+import { HTTP_REQUEST_NODE_TYPE, STORES, CREDENTIAL_ONLY_HTTP_NODE_VERSION } from '@/constants';
+import type { INodeTypesState, DynamicNodeParameters } from '@/Interface';
+import { addHeaders, addNodeTranslation } from '@/plugins/i18n';
+import { omit } from '@/utils/typesUtils';
+import type {
+	ConnectionTypes,
+	INode,
+	INodeListSearchResult,
+	INodeOutputConfiguration,
+	INodePropertyOptions,
+	INodeTypeDescription,
+	INodeTypeNameVersion,
+	ResourceMapperFields,
+	Workflow,
+} from 'n8n-workflow';
+import { NodeConnectionType, NodeHelpers } from 'n8n-workflow';
+import { defineStore } from 'pinia';
+import { useCredentialsStore } from './credentials.store';
+import { useRootStore } from './n8nRoot.store';
+import {
+	getCredentialOnlyNodeType,
+	getCredentialTypeName,
+	isCredentialOnlyNodeType,
+} from '@/utils/credentialOnlyNodes';
+import { groupNodeTypesByNameAndType } from '@/utils/nodeTypes/nodeTypeTransforms';
+
+export type NodeTypesStore = ReturnType<typeof useNodeTypesStore>;
+
+export const useNodeTypesStore = defineStore(STORES.NODE_TYPES, {
+	state: (): INodeTypesState => ({
+		nodeTypes: {},
+	}),
+	getters: {
+		allNodeTypes(): INodeTypeDescription[] {
+			return Object.values(this.nodeTypes).reduce<INodeTypeDescription[]>(
+				(allNodeTypes, nodeType) => {
+					const versionNumbers = Object.keys(nodeType).map(Number);
+					const allNodeVersions = versionNumbers.map((version) => nodeType[version]);
+
+					return [...allNodeTypes, ...allNodeVersions];
+				},
+				[],
+			);
+		},
+		allLatestNodeTypes(): INodeTypeDescription[] {
+			return Object.values(this.nodeTypes).reduce<INodeTypeDescription[]>(
+				(allLatestNodeTypes, nodeVersions) => {
+					const versionNumbers = Object.keys(nodeVersions).map(Number);
+					const latestNodeVersion = nodeVersions[Math.max(...versionNumbers)];
+
+					if (!latestNodeVersion) return allLatestNodeTypes;
+
+					return [...allLatestNodeTypes, latestNodeVersion];
+				},
+				[],
+			);
+		},
+		getNodeType() {
+			return (nodeTypeName: string, version?: number): INodeTypeDescription | null => {
+				if (isCredentialOnlyNodeType(nodeTypeName)) {
+					return this.getCredentialOnlyNodeType(nodeTypeName, version);
+				}
+
+				const nodeVersions = this.nodeTypes[nodeTypeName];
+
+				if (!nodeVersions) return null;
+
+				const versionNumbers = Object.keys(nodeVersions).map(Number);
+				const nodeType = nodeVersions[version ?? Math.max(...versionNumbers)];
+				return nodeType ?? null;
+			};
+		},
+		getNodeVersions() {
+			return (nodeTypeName: string): number[] => {
+				return Object.keys(this.nodeTypes[nodeTypeName] ?? {}).map(Number);
+			};
+		},
+		getCredentialOnlyNodeType() {
+			return (nodeTypeName: string, version?: number): INodeTypeDescription | null => {
+				const credentialName = getCredentialTypeName(nodeTypeName);
+				const httpNode = this.getNodeType(
+					HTTP_REQUEST_NODE_TYPE,
+					version ?? CREDENTIAL_ONLY_HTTP_NODE_VERSION,
+				);
+				const credential = useCredentialsStore().getCredentialTypeByName(credentialName);
+				return getCredentialOnlyNodeType(httpNode, credential) ?? null;
+			};
+		},
+		isConfigNode() {
+			return (workflow: Workflow, node: INode, nodeTypeName: string): boolean => {
+				if (!workflow.nodes[node.name]) {
+					return false;
+				}
+				const nodeType = this.getNodeType(nodeTypeName);
+				if (!nodeType) {
+					return false;
+				}
+				const outputs = NodeHelpers.getNodeOutputs(workflow, node, nodeType);
+				const outputTypes = NodeHelpers.getConnectionTypes(outputs);
+
+				return outputTypes
+					? outputTypes.filter((output) => output !== NodeConnectionType.Main).length > 0
+					: false;
+			};
+		},
+		isConfigurableNode() {
+			return (workflow: Workflow, node: INode, nodeTypeName: string): boolean => {
+				const nodeType = this.getNodeType(nodeTypeName);
+				if (nodeType === null) {
+					return false;
+				}
+				const inputs = NodeHelpers.getNodeInputs(workflow, node, nodeType);
+				const inputTypes = NodeHelpers.getConnectionTypes(inputs);
+
+				return inputTypes
+					? inputTypes.filter((input) => input !== NodeConnectionType.Main).length > 0
+					: false;
+			};
+		},
+		isTriggerNode() {
+			return (nodeTypeName: string) => {
+				const nodeType = this.getNodeType(nodeTypeName);
+				return !!(nodeType && nodeType.group.includes('trigger'));
+			};
+		},
+		isCoreNodeType() {
+			return (nodeType: INodeTypeDescription) => {
+				return nodeType.codex?.categories?.includes('Core Nodes');
+			};
+		},
+		visibleNodeTypes(): INodeTypeDescription[] {
+			return this.allLatestNodeTypes.filter((nodeType: INodeTypeDescription) => !nodeType.hidden);
+		},
+		/**
+		 * Getter for node default names ending with a number: `'S3'`, `'Magento 2'`, etc.
+		 */
+		nativelyNumberSuffixedDefaults(): string[] {
+			return this.allNodeTypes.reduce<string[]>((acc, cur) => {
+				if (/\d$/.test(cur.defaults.name as string)) acc.push(cur.defaults.name as string);
+				return acc;
+			}, []);
+		},
+		visibleNodeTypesByOutputConnectionTypeNames(): { [key: string]: string[] } {
+			const nodesByOutputType = this.visibleNodeTypes.reduce(
+				(acc, node) => {
+					const outputTypes = node.outputs;
+					if (Array.isArray(outputTypes)) {
+						outputTypes.forEach((value: ConnectionTypes | INodeOutputConfiguration) => {
+							const outputType = typeof value === 'string' ? value : value.type;
+							if (!acc[outputType]) {
+								acc[outputType] = [];
+							}
+							acc[outputType].push(node.name);
+						});
+					} else {
+						// If outputs is not an array, it must be a string expression
+						// in which case we'll try to match all possible non-main output types that are supported
+						const connectorTypes: ConnectionTypes[] = [
+							NodeConnectionType.AiVectorStore,
+							NodeConnectionType.AiChain,
+							NodeConnectionType.AiDocument,
+							NodeConnectionType.AiEmbedding,
+							NodeConnectionType.AiLanguageModel,
+							NodeConnectionType.AiMemory,
+							NodeConnectionType.AiOutputParser,
+							NodeConnectionType.AiTextSplitter,
+							NodeConnectionType.AiTool,
+						];
+						connectorTypes.forEach((outputType: ConnectionTypes) => {
+							if (outputTypes.includes(outputType)) {
+								acc[outputType] = acc[outputType] || [];
+								acc[outputType].push(node.name);
+							}
+						});
+					}
+
+					return acc;
+				},
+				{} as { [key: string]: string[] },
+			);
+
+			return nodesByOutputType;
+		},
+		visibleNodeTypesByInputConnectionTypeNames(): { [key: string]: string[] } {
+			const nodesByOutputType = this.visibleNodeTypes.reduce(
+				(acc, node) => {
+					const inputTypes = node.inputs;
+					if (Array.isArray(inputTypes)) {
+						inputTypes.forEach((value: ConnectionTypes | INodeOutputConfiguration) => {
+							const outputType = typeof value === 'string' ? value : value.type;
+							if (!acc[outputType]) {
+								acc[outputType] = [];
+							}
+							acc[outputType].push(node.name);
+						});
+					}
+
+					return acc;
+				},
+				{} as { [key: string]: string[] },
+			);
+
+			return nodesByOutputType;
+		},
+	},
+	actions: {
+		setNodeTypes(newNodeTypes: INodeTypeDescription[] = []): void {
+			const nodeTypes = groupNodeTypesByNameAndType(newNodeTypes);
+			this.nodeTypes = {
+				...this.nodeTypes,
+				...nodeTypes,
+			};
+		},
+		removeNodeTypes(nodeTypesToRemove: INodeTypeDescription[]): void {
+			this.nodeTypes = nodeTypesToRemove.reduce(
+				(oldNodes, newNodeType) => omit(newNodeType.name, oldNodes),
+				this.nodeTypes,
+			);
+		},
+		async getNodesInformation(
+			nodeInfos: INodeTypeNameVersion[],
+			replace = true,
+		): Promise<INodeTypeDescription[]> {
+			const rootStore = useRootStore();
+			const nodesInformation = await getNodesInformation(rootStore.getRestApiContext, nodeInfos);
+
+			nodesInformation.forEach((nodeInformation) => {
+				if (nodeInformation.translation) {
+					const nodeType = nodeInformation.name.replace('n8n-nodes-base.', '');
+
+					addNodeTranslation({ [nodeType]: nodeInformation.translation }, rootStore.defaultLocale);
+				}
+			});
+			if (replace) this.setNodeTypes(nodesInformation);
+
+			return nodesInformation;
+		},
+		async getFullNodesProperties(nodesToBeFetched: INodeTypeNameVersion[]): Promise<void> {
+			const credentialsStore = useCredentialsStore();
+			await credentialsStore.fetchCredentialTypes(true);
+			await this.getNodesInformation(nodesToBeFetched);
+		},
+		async getNodeTypes(): Promise<void> {
+			const rootStore = useRootStore();
+			const nodeTypes = await getNodeTypes(rootStore.getBaseUrl);
+			if (nodeTypes.length) {
+				this.setNodeTypes(nodeTypes);
+			}
+		},
+		/**
+		 * Loads node types if they haven't been loaded yet
+		 */
+		async loadNodeTypesIfNotLoaded(): Promise<void> {
+			if (Object.keys(this.nodeTypes).length === 0) {
+				await this.getNodeTypes();
+			}
+		},
+		async getNodeTranslationHeaders(): Promise<void> {
+			const rootStore = useRootStore();
+			const headers = await getNodeTranslationHeaders(rootStore.getRestApiContext);
+
+			if (headers) {
+				addHeaders(headers, rootStore.defaultLocale);
+			}
+		},
+		async getNodeParameterOptions(
+			sendData: DynamicNodeParameters.OptionsRequest,
+		): Promise<INodePropertyOptions[]> {
+			const rootStore = useRootStore();
+			return await getNodeParameterOptions(rootStore.getRestApiContext, sendData);
+		},
+		async getResourceLocatorResults(
+			sendData: DynamicNodeParameters.ResourceLocatorResultsRequest,
+		): Promise<INodeListSearchResult> {
+			const rootStore = useRootStore();
+			return await getResourceLocatorResults(rootStore.getRestApiContext, sendData);
+		},
+		async getResourceMapperFields(
+			sendData: DynamicNodeParameters.ResourceMapperFieldsRequest,
+		): Promise<ResourceMapperFields | null> {
+			const rootStore = useRootStore();
+			try {
+				return await getResourceMapperFields(rootStore.getRestApiContext, sendData);
+			} catch (error) {
+				return null;
+			}
+		},
+	},
+});
diff --git a/packages/editor-ui/src/stores/nodeTypes.ts b/packages/editor-ui/src/stores/nodeTypes.ts
deleted file mode 100644
index ff6259e79ae97..0000000000000
--- a/packages/editor-ui/src/stores/nodeTypes.ts
+++ /dev/null
@@ -1,197 +0,0 @@
-import {
-	getNodeParameterOptions,
-	getNodesInformation,
-	getNodeTranslationHeaders,
-	getNodeTypes,
-	getResourceLocatorResults,
-} from '@/api/nodeTypes';
-import { DEFAULT_NODETYPE_VERSION, STORES } from '@/constants';
-import type {
-	ICategoriesWithNodes,
-	INodeCreateElement,
-	INodeTypesState,
-	IResourceLocatorReqParams,
-} from '@/Interface';
-import { addHeaders, addNodeTranslation } from '@/plugins/i18n';
-import { omit, getCategoriesWithNodes, getCategorizedList } from '@/utils';
-import type {
-	ILoadOptions,
-	INodeCredentials,
-	INodeListSearchResult,
-	INodeParameters,
-	INodePropertyOptions,
-	INodeTypeDescription,
-	INodeTypeNameVersion,
-} from 'n8n-workflow';
-import { defineStore } from 'pinia';
-import Vue from 'vue';
-import { useCredentialsStore } from './credentials';
-import { useRootStore } from './n8nRootStore';
-import { useUsersStore } from './users';
-import { useNodeCreatorStore } from './nodeCreator';
-function getNodeVersions(nodeType: INodeTypeDescription) {
-	return Array.isArray(nodeType.version) ? nodeType.version : [nodeType.version];
-}
-
-export const useNodeTypesStore = defineStore(STORES.NODE_TYPES, {
-	state: (): INodeTypesState => ({
-		nodeTypes: {},
-	}),
-	getters: {
-		allNodeTypes(): INodeTypeDescription[] {
-			return Object.values(this.nodeTypes).reduce<INodeTypeDescription[]>(
-				(allNodeTypes, nodeType) => {
-					const versionNumbers = Object.keys(nodeType).map(Number);
-					const allNodeVersions = versionNumbers.map((version) => nodeType[version]);
-
-					return [...allNodeTypes, ...allNodeVersions];
-				},
-				[],
-			);
-		},
-		allLatestNodeTypes(): INodeTypeDescription[] {
-			return Object.values(this.nodeTypes).reduce<INodeTypeDescription[]>(
-				(allLatestNodeTypes, nodeVersions) => {
-					const versionNumbers = Object.keys(nodeVersions).map(Number);
-					const latestNodeVersion = nodeVersions[Math.max(...versionNumbers)];
-
-					if (!latestNodeVersion) return allLatestNodeTypes;
-
-					return [...allLatestNodeTypes, latestNodeVersion];
-				},
-				[],
-			);
-		},
-		getNodeType() {
-			return (nodeTypeName: string, version?: number): INodeTypeDescription | null => {
-				const nodeVersions = this.nodeTypes[nodeTypeName];
-
-				if (!nodeVersions) return null;
-
-				const versionNumbers = Object.keys(nodeVersions).map(Number);
-				const nodeType = nodeVersions[version || Math.max(...versionNumbers)];
-
-				return nodeType || null;
-			};
-		},
-		isTriggerNode() {
-			return (nodeTypeName: string) => {
-				const nodeType = this.getNodeType(nodeTypeName);
-				return !!(nodeType && nodeType.group.includes('trigger'));
-			};
-		},
-		isCoreNodeType() {
-			return (nodeType: INodeTypeDescription) => {
-				return nodeType.codex?.categories?.includes('Core Nodes');
-			};
-		},
-		visibleNodeTypes(): INodeTypeDescription[] {
-			return this.allLatestNodeTypes.filter((nodeType: INodeTypeDescription) => !nodeType.hidden);
-		},
-		categoriesWithNodes(): ICategoriesWithNodes {
-			const usersStore = useUsersStore();
-			return getCategoriesWithNodes(this.visibleNodeTypes, usersStore.personalizedNodeTypes);
-		},
-		categorizedItems(): INodeCreateElement[] {
-			return getCategorizedList(this.categoriesWithNodes);
-		},
-	},
-	actions: {
-		setNodeTypes(newNodeTypes: INodeTypeDescription[] = []): void {
-			const nodeTypes = newNodeTypes.reduce<Record<string, Record<string, INodeTypeDescription>>>(
-				(acc, newNodeType) => {
-					const newNodeVersions = getNodeVersions(newNodeType);
-
-					if (newNodeVersions.length === 0) {
-						const singleVersion = { [DEFAULT_NODETYPE_VERSION]: newNodeType };
-
-						acc[newNodeType.name] = singleVersion;
-						return acc;
-					}
-
-					for (const version of newNodeVersions) {
-						// Node exists with the same name
-						if (acc[newNodeType.name]) {
-							acc[newNodeType.name][version] = Object.assign(
-								acc[newNodeType.name][version] ?? {},
-								newNodeType,
-							);
-						} else {
-							acc[newNodeType.name] = Object.assign(acc[newNodeType.name] ?? {}, {
-								[version]: newNodeType,
-							});
-						}
-					}
-
-					return acc;
-				},
-				{ ...this.nodeTypes },
-			);
-			Vue.set(this, 'nodeTypes', nodeTypes);
-
-			// Trigger compute of mergedAppNodes getter so it's ready when user opens the node creator
-			useNodeCreatorStore().mergedAppNodes;
-		},
-		removeNodeTypes(nodeTypesToRemove: INodeTypeDescription[]): void {
-			this.nodeTypes = nodeTypesToRemove.reduce(
-				(oldNodes, newNodeType) => omit(newNodeType.name, oldNodes),
-				this.nodeTypes,
-			);
-		},
-		async getNodesInformation(
-			nodeInfos: INodeTypeNameVersion[],
-			replace = true,
-		): Promise<INodeTypeDescription[]> {
-			const rootStore = useRootStore();
-			const nodesInformation = await getNodesInformation(rootStore.getRestApiContext, nodeInfos);
-
-			nodesInformation.forEach((nodeInformation) => {
-				if (nodeInformation.translation) {
-					const nodeType = nodeInformation.name.replace('n8n-nodes-base.', '');
-
-					addNodeTranslation({ [nodeType]: nodeInformation.translation }, rootStore.defaultLocale);
-				}
-			});
-			if (replace) this.setNodeTypes(nodesInformation);
-
-			return nodesInformation;
-		},
-		async getFullNodesProperties(nodesToBeFetched: INodeTypeNameVersion[]): Promise<void> {
-			const credentialsStore = useCredentialsStore();
-			credentialsStore.fetchCredentialTypes(true);
-			await this.getNodesInformation(nodesToBeFetched);
-		},
-		async getNodeTypes(): Promise<void> {
-			const rootStore = useRootStore();
-			const nodeTypes = await getNodeTypes(rootStore.getBaseUrl);
-			if (nodeTypes.length) {
-				this.setNodeTypes(nodeTypes);
-			}
-		},
-		async getNodeTranslationHeaders(): Promise<void> {
-			const rootStore = useRootStore();
-			const headers = await getNodeTranslationHeaders(rootStore.getRestApiContext);
-
-			if (headers) {
-				addHeaders(headers, rootStore.defaultLocale);
-			}
-		},
-		async getNodeParameterOptions(sendData: {
-			nodeTypeAndVersion: INodeTypeNameVersion;
-			path: string;
-			methodName?: string;
-			loadOptions?: ILoadOptions;
-			currentNodeParameters: INodeParameters;
-			credentials?: INodeCredentials;
-		}): Promise<INodePropertyOptions[]> {
-			const rootStore = useRootStore();
-			return getNodeParameterOptions(rootStore.getRestApiContext, sendData);
-		},
-		async getResourceLocatorResults(
-			sendData: IResourceLocatorReqParams,
-		): Promise<INodeListSearchResult> {
-			const rootStore = useRootStore();
-			return getResourceLocatorResults(rootStore.getRestApiContext, sendData);
-		},
-	},
-});
diff --git a/packages/editor-ui/src/stores/orchestration.store.ts b/packages/editor-ui/src/stores/orchestration.store.ts
new file mode 100644
index 0000000000000..ae4abe0114692
--- /dev/null
+++ b/packages/editor-ui/src/stores/orchestration.store.ts
@@ -0,0 +1,80 @@
+import { defineStore } from 'pinia';
+import type { IPushDataWorkerStatusPayload } from '../Interface';
+import { useRootStore } from './n8nRoot.store';
+import { sendGetWorkerStatus } from '../api/orchestration';
+
+export const WORKER_HISTORY_LENGTH = 100;
+const STALE_SECONDS = 120 * 1000;
+
+export interface IOrchestrationStoreState {
+	initialStatusReceived: boolean;
+	workers: { [id: string]: IPushDataWorkerStatusPayload };
+	workersHistory: {
+		[id: string]: IWorkerHistoryItem[];
+	};
+	workersLastUpdated: { [id: string]: number };
+	statusInterval: NodeJS.Timer | null;
+}
+
+export interface IWorkerHistoryItem {
+	timestamp: number;
+	data: IPushDataWorkerStatusPayload;
+}
+
+export const useOrchestrationStore = defineStore('orchestrationManager', {
+	state: (): IOrchestrationStoreState => ({
+		initialStatusReceived: false,
+		workers: {},
+		workersHistory: {},
+		workersLastUpdated: {},
+		statusInterval: null,
+	}),
+	actions: {
+		updateWorkerStatus(data: IPushDataWorkerStatusPayload) {
+			this.workers[data.workerId] = data;
+			if (!this.workersHistory[data.workerId]) {
+				this.workersHistory[data.workerId] = [];
+			}
+			this.workersHistory[data.workerId].push({ data, timestamp: Date.now() });
+			if (this.workersHistory[data.workerId].length > WORKER_HISTORY_LENGTH) {
+				this.workersHistory[data.workerId].shift();
+			}
+			this.workersLastUpdated[data.workerId] = Date.now();
+
+			this.initialStatusReceived = true;
+		},
+		removeStaleWorkers() {
+			for (const id in this.workersLastUpdated) {
+				if (this.workersLastUpdated[id] + STALE_SECONDS < Date.now()) {
+					delete this.workers[id];
+					delete this.workersHistory[id];
+					delete this.workersLastUpdated[id];
+				}
+			}
+		},
+		startWorkerStatusPolling() {
+			const rootStore = useRootStore();
+			if (!this.statusInterval) {
+				this.statusInterval = setInterval(async () => {
+					await sendGetWorkerStatus(rootStore.getRestApiContext);
+					this.removeStaleWorkers();
+				}, 1000);
+			}
+		},
+		stopWorkerStatusPolling() {
+			if (this.statusInterval) {
+				clearInterval(this.statusInterval);
+				this.statusInterval = null;
+			}
+		},
+		getWorkerLastUpdated(workerId: string): number {
+			return this.workersLastUpdated[workerId] ?? 0;
+		},
+		getWorkerStatus(workerId: string): IPushDataWorkerStatusPayload | undefined {
+			return this.workers[workerId];
+		},
+		getWorkerStatusHistory(workerId: string): IWorkerHistoryItem[] {
+			return this.workersHistory[workerId] ?? [];
+		},
+	},
+});
diff --git a/packages/editor-ui/src/stores/posthog.store.ts b/packages/editor-ui/src/stores/posthog.store.ts
new file mode 100644
index 0000000000000..8596c142c163d
--- /dev/null
+++ b/packages/editor-ui/src/stores/posthog.store.ts
@@ -0,0 +1,194 @@
+import type { Ref } from 'vue';
+import { ref } from 'vue';
+import { defineStore } from 'pinia';
+import { useStorage } from '@/composables/useStorage';
+import { useUsersStore } from '@/stores/users.store';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import { useSettingsStore } from '@/stores/settings.store';
+import type { FeatureFlags, IDataObject } from 'n8n-workflow';
+import { EXPERIMENTS_TO_TRACK, LOCAL_STORAGE_EXPERIMENT_OVERRIDES } from '@/constants';
+import { useTelemetryStore } from './telemetry.store';
+import { useDebounce } from '@/composables/useDebounce';
+
+const EVENTS = {
+	IS_PART_OF_EXPERIMENT: 'User is part of experiment',
+};
+
+export type PosthogStore = ReturnType<typeof usePostHog>;
+
+export const usePostHog = defineStore('posthog', () => {
+	const usersStore = useUsersStore();
+	const settingsStore = useSettingsStore();
+	const telemetryStore = useTelemetryStore();
+	const rootStore = useRootStore();
+	const { debounce } = useDebounce();
+
+	const featureFlags: Ref<FeatureFlags | null> = ref(null);
+	const trackedDemoExp: Ref<FeatureFlags> = ref({});
+
+	const overrides: Ref<Record<string, string | boolean>> = ref({});
+
+	const reset = () => {
+		window.posthog?.reset?.();
+		featureFlags.value = null;
+		trackedDemoExp.value = {};
+	};
+
+	const getVariant = (experiment: keyof FeatureFlags): FeatureFlags[keyof FeatureFlags] => {
+		return overrides.value[experiment] ?? featureFlags.value?.[experiment];
+	};
+
+	const isVariantEnabled = (experiment: string, variant: string) => {
+		return getVariant(experiment) === variant;
+	};
+
+	/**
+	 * Checks if the given feature flag is enabled. Should only be used for boolean flags
+	 */
+	const isFeatureEnabled = (experiment: keyof FeatureFlags) => {
+		return getVariant(experiment) === true;
+	};
+
+	if (!window.featureFlags) {
+		// for testing
+		const cachedOverrides = useStorage(LOCAL_STORAGE_EXPERIMENT_OVERRIDES).value;
+		if (cachedOverrides) {
+			try {
+				console.log('Overriding feature flags', cachedOverrides);
+				const parsedOverrides = JSON.parse(cachedOverrides);
+				if (typeof parsedOverrides === 'object') {
+					overrides.value = JSON.parse(cachedOverrides);
+				}
+			} catch (e) {
+				console.log('Could not override experiment', e);
+			}
+		}
+
+		window.featureFlags = {
+			// since features are evaluated serverside, regular posthog mechanism to override clientside does not work
+			override: (name: string, value: string | boolean) => {
+				overrides.value[name] = value;
+				try {
+					useStorage(LOCAL_STORAGE_EXPERIMENT_OVERRIDES).value = JSON.stringify(overrides.value);
+				} catch (e) {}
+			},
+
+			getVariant,
+			getAll: () => featureFlags.value ?? {},
+		};
+	}
+
+	const identify = () => {
+		const instanceId = rootStore.instanceId;
+		const user = usersStore.currentUser;
+		const traits: Record<string, string | number> = { instance_id: instanceId };
+
+		if (user && typeof user.createdAt === 'string') {
+			traits.created_at_timestamp = new Date(user.createdAt).getTime();
+		}
+
+		// For PostHog, main ID _cannot_ be `undefined` as done for RudderStack.
+		const id = user ? `${instanceId}#${user.id}` : instanceId;
+		window.posthog?.identify?.(id, traits);
+	};
+
+	const trackExperiment = (featFlags: FeatureFlags, name: string) => {
+		const variant = featFlags[name];
+		if (!variant || trackedDemoExp.value[name] === variant) {
+			return;
+		}
+
+		telemetryStore.track(EVENTS.IS_PART_OF_EXPERIMENT, {
+			name,
+			variant,
+		});
+
+		trackedDemoExp.value[name] = variant;
+	};
+
+	const trackExperiments = (featFlags: FeatureFlags) => {
+		EXPERIMENTS_TO_TRACK.forEach((name) => trackExperiment(featFlags, name));
+	};
+	const trackExperimentsDebounced = debounce(trackExperiments, {
+		debounceTime: 2000,
+	});
+
+	const init = (evaluatedFeatureFlags?: FeatureFlags) => {
+		if (!window.posthog) {
+			return;
+		}
+
+		const config = settingsStore.settings.posthog;
+		if (!config.enabled) {
+			return;
+		}
+
+		const userId = usersStore.currentUserId;
+		if (!userId) {
+			return;
+		}
+
+		const instanceId = rootStore.instanceId;
+		const distinctId = `${instanceId}#${userId}`;
+
+		const options: Parameters<typeof window.posthog.init>[1] = {
+			api_host: config.apiHost,
+			autocapture: config.autocapture,
+			disable_session_recording: config.disableSessionRecording,
+			debug: config.debug,
+			session_recording: {
+				maskAllInputs: false,
+			},
+		};
+
+		window.posthog?.init(config.apiKey, options);
+		identify();
+
+		if (evaluatedFeatureFlags && Object.keys(evaluatedFeatureFlags).length) {
+			featureFlags.value = evaluatedFeatureFlags;
+			options.bootstrap = {
+				distinctId,
+				featureFlags: evaluatedFeatureFlags,
+			};
+
+			// does not need to be debounced really, but tracking does not fire without delay on page load
+			trackExperimentsDebounced(featureFlags.value);
+		} else {
+			// depend on client side evaluation if serverside evaluation fails
+			window.posthog?.onFeatureFlags?.((keys: string[], map: FeatureFlags) => {
+				featureFlags.value = map;
+
+				// must be debounced because it is called multiple times by posthog
+				trackExperimentsDebounced(featureFlags.value);
+			});
+		}
+	};
+
+	const capture = (event: string, properties: IDataObject) => {
+		if (typeof window.posthog?.capture === 'function') {
+			window.posthog.capture(event, properties);
+		}
+	};
+
+	const setMetadata = (metadata: IDataObject, target: 'user' | 'events') => {
+		if (typeof window.posthog?.people?.set !== 'function') return;
+		if (typeof window.posthog?.register !== 'function') return;
+
+		if (target === 'user') {
+			window.posthog?.people?.set(metadata);
+		} else if (target === 'events') {
+			window.posthog?.register(metadata);
+		}
+	};
+
+	return {
+		init,
+		isFeatureEnabled,
+		isVariantEnabled,
+		getVariant,
+		reset,
+		identify,
+		capture,
+		setMetadata,
+	};
+});
diff --git a/packages/editor-ui/src/stores/posthog.ts b/packages/editor-ui/src/stores/posthog.ts
deleted file mode 100644
index 1e627eb287b5b..0000000000000
--- a/packages/editor-ui/src/stores/posthog.ts
+++ /dev/null
@@ -1,183 +0,0 @@
-import type { Ref } from 'vue';
-import { ref } from 'vue';
-import { defineStore } from 'pinia';
-import { useUsersStore } from '@/stores/users';
-import { useRootStore } from '@/stores/n8nRootStore';
-import { useSettingsStore } from '@/stores/settings';
-import type { FeatureFlags } from 'n8n-workflow';
-import {
-	EXPERIMENTS_TO_TRACK,
-	LOCAL_STORAGE_EXPERIMENT_OVERRIDES,
-	TEMPLATE_EXPERIMENT,
-} from '@/constants';
-import { useTelemetryStore } from './telemetry';
-import { debounce } from 'lodash-es';
-
-const EVENTS = {
-	IS_PART_OF_EXPERIMENT: 'User is part of experiment',
-};
-
-export const usePostHog = defineStore('posthog', () => {
-	const usersStore = useUsersStore();
-	const settingsStore = useSettingsStore();
-	const telemetryStore = useTelemetryStore();
-	const rootStore = useRootStore();
-
-	const featureFlags: Ref<FeatureFlags | null> = ref(null);
-	const trackedDemoExp: Ref<FeatureFlags> = ref({});
-
-	const overrides: Ref<Record<string, string | boolean>> = ref({});
-
-	const reset = () => {
-		window.posthog?.reset?.();
-		featureFlags.value = null;
-		trackedDemoExp.value = {};
-	};
-
-	const getVariant = (experiment: keyof FeatureFlags): FeatureFlags[keyof FeatureFlags] => {
-		return featureFlags.value?.[experiment];
-	};
-
-	const isVariantEnabled = (experiment: string, variant: string) => {
-		return getVariant(experiment) === variant;
-	};
-
-	if (!window.featureFlags) {
-		// for testing
-		const cachedOverrdies = localStorage.getItem(LOCAL_STORAGE_EXPERIMENT_OVERRIDES);
-		if (cachedOverrdies) {
-			try {
-				console.log('Overriding feature flags', cachedOverrdies);
-				overrides.value = JSON.parse(cachedOverrdies);
-			} catch (e) {
-				console.log('Could not override experiment', e);
-			}
-		}
-
-		window.featureFlags = {
-			// since features are evaluated serverside, regular posthog mechanism to override clientside does not work
-			override: (name: string, value: string | boolean) => {
-				overrides.value[name] = value;
-				featureFlags.value = {
-					...featureFlags.value,
-					[name]: value,
-				};
-				try {
-					localStorage.setItem(LOCAL_STORAGE_EXPERIMENT_OVERRIDES, JSON.stringify(overrides.value));
-				} catch (e) {}
-			},
-
-			getVariant,
-			getAll: () => featureFlags.value || {},
-		};
-	}
-
-	const identify = () => {
-		const instanceId = rootStore.instanceId;
-		const user = usersStore.currentUser;
-		const traits: Record<string, string | number> = { instance_id: instanceId };
-
-		if (user && typeof user.createdAt === 'string') {
-			traits.created_at_timestamp = new Date(user.createdAt).getTime();
-		}
-
-		// For PostHog, main ID _cannot_ be `undefined` as done for RudderStack.
-		const id = user ? `${instanceId}#${user.id}` : instanceId;
-		window.posthog?.identify?.(id, traits);
-	};
-
-	const addExperimentOverrides = () => {
-		featureFlags.value = {
-			...featureFlags.value,
-			...overrides.value,
-		};
-	};
-
-	const init = (evaluatedFeatureFlags?: FeatureFlags) => {
-		if (!window.posthog) {
-			return;
-		}
-
-		const config = settingsStore.settings.posthog;
-		if (!config.enabled) {
-			return;
-		}
-
-		const userId = usersStore.currentUserId;
-		if (!userId) {
-			return;
-		}
-
-		const instanceId = rootStore.instanceId;
-		const distinctId = `${instanceId}#${userId}`;
-
-		const options: Parameters<typeof window.posthog.init>[1] = {
-			api_host: config.apiHost,
-			autocapture: config.autocapture,
-			disable_session_recording: config.disableSessionRecording,
-			debug: config.debug,
-		};
-
-		window.posthog?.init(config.apiKey, options);
-		identify();
-
-		if (evaluatedFeatureFlags && Object.keys(evaluatedFeatureFlags).length) {
-			featureFlags.value = evaluatedFeatureFlags;
-			options.bootstrap = {
-				distinctId,
-				featureFlags: evaluatedFeatureFlags,
-			};
-
-			// does not need to be debounced really, but tracking does not fire without delay on page load
-			addExperimentOverrides();
-			trackExperimentsDebounced(featureFlags.value);
-			evaluateExperiments(featureFlags.value);
-		} else {
-			// depend on client side evaluation if serverside evaluation fails
-			window.posthog?.onFeatureFlags?.((keys: string[], map: FeatureFlags) => {
-				featureFlags.value = map;
-				addExperimentOverrides();
-
-				// must be debounced because it is called multiple times by posthog
-				trackExperimentsDebounced(featureFlags.value);
-				evaluateExperimentsDebounced(featureFlags.value);
-			});
-		}
-	};
-
-	const evaluateExperiments = (featureFlags: FeatureFlags) => {
-		Object.keys(featureFlags).forEach((name) => {
-			const variant = featureFlags[name];
-			if (name === TEMPLATE_EXPERIMENT.name && variant === TEMPLATE_EXPERIMENT.variant) {
-				settingsStore.disableTemplates();
-			}
-		});
-	};
-	const evaluateExperimentsDebounced = debounce(evaluateExperiments, 2000);
-
-	const trackExperiments = (featureFlags: FeatureFlags) => {
-		EXPERIMENTS_TO_TRACK.forEach((name) => trackExperiment(featureFlags, name));
-	};
-	const trackExperimentsDebounced = debounce(trackExperiments, 2000);
-
-	const trackExperiment = (featureFlags: FeatureFlags, name: string) => {
-		const variant = featureFlags[name];
-		if (!variant || trackedDemoExp.value[name] === variant) {
-			return;
-		}
-
-		telemetryStore.track(EVENTS.IS_PART_OF_EXPERIMENT, {
-			name,
-			variant,
-		});
-
-		trackedDemoExp.value[name] = variant;
-	};
-
-	return {
-		init,
-		isVariantEnabled,
-		getVariant,
-		reset,
-	};
-});
diff --git a/packages/editor-ui/src/stores/pushConnection.store.ts b/packages/editor-ui/src/stores/pushConnection.store.ts
new file mode 100644
index 0000000000000..1b5a3ab71bcfa
--- /dev/null
+++ b/packages/editor-ui/src/stores/pushConnection.store.ts
@@ -0,0 +1,163 @@
+import { defineStore } from 'pinia';
+import { STORES, TIME } from '@/constants';
+import { ref, computed } from 'vue';
+import { useSettingsStore } from './settings.store';
+import { useRootStore } from './n8nRoot.store';
+import type { IPushData } from '../Interface';
+
+export interface PushState {
+	pushRef: string;
+	pushSource: WebSocket | EventSource | null;
+	reconnectTimeout: NodeJS.Timeout | null;
+	retryTimeout: NodeJS.Timeout | null;
+	pushMessageQueue: Array<{ event: Event; retriesLeft: number }>;
+	connectRetries: number;
+	lostConnection: boolean;
+	outgoingQueue: unknown[];
+	isConnectionOpen: boolean;
+}
+
+export type OnPushMessageHandler = (event: IPushData) => void;
+
+/**
+ * Store for managing a push connection to the server
+ */
+export const usePushConnectionStore = defineStore(STORES.PUSH, () => {
+	const rootStore = useRootStore();
+	const settingsStore = useSettingsStore();
+
+	const pushRef = computed(() => rootStore.pushRef);
+	const pushSource = ref<WebSocket | EventSource | null>(null);
+	const reconnectTimeout = ref<NodeJS.Timeout | null>(null);
+	const connectRetries = ref(0);
+	const lostConnection = ref(false);
+	const outgoingQueue = ref<unknown[]>([]);
+	const isConnectionOpen = ref(false);
+
+	const onMessageReceivedHandlers = ref<OnPushMessageHandler[]>([]);
+
+	const addEventListener = (handler: OnPushMessageHandler) => {
+		onMessageReceivedHandlers.value.push(handler);
+		return () => {
+			const index = onMessageReceivedHandlers.value.indexOf(handler);
+			if (index !== -1) {
+				onMessageReceivedHandlers.value.splice(index, 1);
+			}
+		};
+	};
+
+	function onConnectionError() {
+		pushDisconnect();
+		connectRetries.value++;
+		reconnectTimeout.value = setTimeout(
+			attemptReconnect,
+			Math.min(connectRetries.value * 2000, 8 * TIME.SECOND), // maximum 8 seconds backoff
+		);
+	}
+
+	/**
+	 * Close connection to server
+	 */
+	function pushDisconnect() {
+		if (pushSource.value !== null) {
+			pushSource.value.removeEventListener('error', onConnectionError);
+			pushSource.value.removeEventListener('close', onConnectionError);
+			pushSource.value.removeEventListener('message', pushMessageReceived);
+			if (pushSource.value.readyState < 2) pushSource.value.close();
+			pushSource.value = null;
+		}
+
+		isConnectionOpen.value = false;
+	}
+
+	/**
+	 * Connect to server to receive data via a WebSocket or EventSource
+	 */
+	function pushConnect() {
+		// always close the previous connection so that we do not end up with multiple connections
+		pushDisconnect();
+
+		if (reconnectTimeout.value) {
+			clearTimeout(reconnectTimeout.value);
+			reconnectTimeout.value = null;
+		}
+
+		const useWebSockets = settingsStore.pushBackend === 'websocket';
+
+		const { getRestUrl: restUrl } = rootStore;
+		const url = `/push?pushRef=${pushRef.value}`;
+
+		if (useWebSockets) {
+			const { protocol, host } = window.location;
+			const baseUrl = restUrl.startsWith('http')
+				? restUrl.replace(/^http/, 'ws')
+				: `${protocol === 'https:' ? 'wss' : 'ws'}://${host + restUrl}`;
+			pushSource.value = new WebSocket(`${baseUrl}${url}`);
+		} else {
+			pushSource.value = new EventSource(`${restUrl}${url}`, { withCredentials: true });
+		}
+
+		pushSource.value.addEventListener('open', onConnectionSuccess, false);
+		pushSource.value.addEventListener('message', pushMessageReceived, false);
+		pushSource.value.addEventListener(useWebSockets ? 'close' : 'error', onConnectionError, false);
+	}
+
+	function attemptReconnect() {
+		pushConnect();
+	}
+
+	function serializeAndSend(message: unknown) {
+		if (pushSource.value && 'send' in pushSource.value) {
+			pushSource.value.send(JSON.stringify(message));
+		}
+	}
+
+	function onConnectionSuccess() {
+		isConnectionOpen.value = true;
+		connectRetries.value = 0;
+		lostConnection.value = false;
+		rootStore.pushConnectionActive = true;
+		pushSource.value?.removeEventListener('open', onConnectionSuccess);
+
+		if (outgoingQueue.value.length) {
+			for (const message of outgoingQueue.value) {
+				serializeAndSend(message);
+			}
+			outgoingQueue.value = [];
+		}
+	}
+
+	function send(message: unknown) {
+		if (!isConnectionOpen.value) {
+			outgoingQueue.value.push(message);
+			return;
+		}
+		serializeAndSend(message);
+	}
+
+	/**
+	 * Process a newly received message
+	 */
+	async function pushMessageReceived(event: Event) {
+		let receivedData: IPushData;
+		try {
+			// @ts-ignore
+			receivedData = JSON.parse(event.data);
+		} catch (error) {
+			return;
+		}
+
+		onMessageReceivedHandlers.value.forEach((handler) => handler(receivedData));
+	}
+
+	return {
+		pushRef,
+		pushSource,
+		isConnectionOpen,
+		onMessageReceivedHandlers,
+		addEventListener,
+		pushConnect,
+		pushDisconnect,
+		send,
+	};
+});
diff --git a/packages/editor-ui/src/stores/rbac.store.ts b/packages/editor-ui/src/stores/rbac.store.ts
new file mode 100644
index 0000000000000..fbcb6b80b6fa2
--- /dev/null
+++ b/packages/editor-ui/src/stores/rbac.store.ts
@@ -0,0 +1,113 @@
+import { defineStore } from 'pinia';
+import { hasScope as genericHasScope } from '@n8n/permissions';
+import type { ScopeOptions, Scope, Resource } from '@n8n/permissions';
+import { ref } from 'vue';
+import { STORES } from '@/constants';
+import type { IRole } from '@/Interface';
+
+export const useRBACStore = defineStore(STORES.RBAC, () => {
+	const globalRoles = ref<IRole[]>([]);
+	const rolesByProjectId = ref<Record<string, string[]>>({});
+
+	const globalScopes = ref<Scope[]>([]);
+	const scopesByProjectId = ref<Record<string, Scope[]>>({});
+	const scopesByResourceId = ref<Record<Resource, Record<string, Scope[]>>>({
+		workflow: {},
+		tag: {},
+		user: {},
+		credential: {},
+		variable: {},
+		sourceControl: {},
+		externalSecretsStore: {},
+	});
+
+	function addGlobalRole(role: IRole) {
+		if (!globalRoles.value.includes(role)) {
+			globalRoles.value.push(role);
+		}
+	}
+
+	function hasRole(role: IRole) {
+		return globalRoles.value.includes(role);
+	}
+
+	function addGlobalScope(scope: Scope) {
+		if (!globalScopes.value.includes(scope)) {
+			globalScopes.value.push(scope);
+		}
+	}
+
+	function setGlobalScopes(scopes: Scope[]) {
+		globalScopes.value = scopes;
+	}
+
+	function addProjectScope(
+		scope: Scope,
+		context: {
+			projectId: string;
+		},
+	) {
+		if (!scopesByProjectId.value[context.projectId]) {
+			scopesByProjectId.value[context.projectId] = [];
+		}
+
+		if (!scopesByProjectId.value[context.projectId].includes(scope)) {
+			scopesByProjectId.value[context.projectId].push(scope);
+		}
+	}
+
+	function addResourceScope(
+		scope: Scope,
+		context: {
+			resourceType: Resource;
+			resourceId: string;
+		},
+	) {
+		const scopesByResourceType = scopesByResourceId.value[context.resourceType];
+		if (!scopesByResourceType[context.resourceId]) {
+			scopesByResourceType[context.resourceId] = [];
+		}
+
+		if (!scopesByResourceType[context.resourceId].includes(scope)) {
+			scopesByResourceType[context.resourceId].push(scope);
+		}
+	}
+
+	function hasScope(
+		scope: Scope | Scope[],
+		context?: {
+			resourceType?: Resource;
+			resourceId?: string;
+			projectId?: string;
+		},
+		options?: ScopeOptions,
+	): boolean {
+		return genericHasScope(
+			scope,
+			{
+				global: globalScopes.value,
+				project: context?.projectId ? scopesByProjectId.value[context.projectId] : [],
+				resource:
+					context?.resourceType && context?.resourceId
+						? scopesByResourceId.value[context.resourceType][context.resourceId]
+						: [],
+			},
+			options,
+		);
+	}
+
+	return {
+		globalRoles,
+		rolesByProjectId,
+		globalScopes,
+		scopesByProjectId,
+		scopesByResourceId,
+		addGlobalRole,
+		hasRole,
+		addGlobalScope,
+		setGlobalScopes,
+		addProjectScope,
+		addResourceScope,
+		hasScope,
+	};
+});
diff --git a/packages/editor-ui/src/stores/segment.store.ts b/packages/editor-ui/src/stores/segment.store.ts
new file mode 100644
index 0000000000000..9e0159685c3fb
--- /dev/null
+++ b/packages/editor-ui/src/stores/segment.store.ts
@@ -0,0 +1,143 @@
+import {
+	CODE_NODE_TYPE,
+	HTTP_REQUEST_NODE_TYPE,
+	MANUAL_TRIGGER_NODE_TYPE,
+	SCHEDULE_TRIGGER_NODE_TYPE,
+	SET_NODE_TYPE,
+	WEBHOOK_NODE_TYPE,
+} from '@/constants';
+import { defineStore } from 'pinia';
+
+import { useSettingsStore } from '@/stores/settings.store';
+import type { INodeTypeDescription, IRun, ITelemetryTrackProperties } from 'n8n-workflow';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import { useUsersStore } from '@/stores/users.store';
+
+const EVENTS = {
+	ADDED_MANUAL_TRIGGER: 'User added manual trigger',
+	ADDED_SCHEDULE_TRIGGER: 'User added schedule trigger',
+	ADDED_DATA_TRIGGER: 'User added data trigger',
+	RECEIEVED_MULTIPLE_DATA_ITEMS: 'User received multiple data items',
+	EXECUTED_MANUAL_TRIGGER: 'User executed manual trigger successfully',
+	EXECUTED_SCHEDULE_TRIGGER: 'User executed schedule trigger successfully',
+	EXECUTED_DATA_NODE_TRIGGER: 'User executed data node successfully',
+	MAPPED_DATA: 'User mapped data',
+};
+
+export const useSegment = defineStore('segment', () => {
+	const nodeTypesStore = useNodeTypesStore();
+	const workflowsStore = useWorkflowsStore();
+	const settingsStore = useSettingsStore();
+	const usersStore = useUsersStore();
+
+	const track = (eventName: string, properties?: ITelemetryTrackProperties) => {
+		if (settingsStore.telemetry.enabled) {
+			window.analytics?.track(eventName, properties);
+		}
+	};
+
+	const page = (category: string, name: string, properties?: ITelemetryTrackProperties) => {
+		if (settingsStore.telemetry.enabled) {
+			window.analytics?.page(category, name, properties);
+		}
+	};
+
+	const identify = () => {
+		const userId = usersStore.currentUserId;
+
+		if (settingsStore.telemetry.enabled && userId) {
+			window.analytics?.identify(userId);
+		}
+	};
+
+	const trackAddedTrigger = (nodeTypeName: string) => {
+		if (!nodeTypesStore.isTriggerNode(nodeTypeName)) {
+			return;
+		}
+
+		if (nodeTypeName === MANUAL_TRIGGER_NODE_TYPE) {
+			track(EVENTS.ADDED_MANUAL_TRIGGER);
+		} else if (nodeTypeName === SCHEDULE_TRIGGER_NODE_TYPE) {
+			track(EVENTS.ADDED_SCHEDULE_TRIGGER);
+		} else {
+			track(EVENTS.ADDED_DATA_TRIGGER);
+		}
+	};
+
+	const trackSuccessfulWorkflowExecution = (runData: IRun) => {
+		const dataNodeTypes: Set<string> = new Set<string>();
+		const multipleOutputNodes: Set<string> = new Set<string>();
+		let hasManualTrigger = false;
+		let hasScheduleTrigger = false;
+		for (const nodeName of Object.keys(runData.data.resultData.runData)) {
+			const nodeRunData = runData.data.resultData.runData[nodeName];
+			const node = workflowsStore.getNodeByName(nodeName);
+			const nodeTypeName = node ? node.type : 'unknown';
+			if (
+				nodeRunData[0].data?.main &&
+				nodeRunData[0].data.main.some((out) => out && out?.length > 1)
+			) {
+				multipleOutputNodes.add(nodeTypeName);
+			}
+			if (node && !node.disabled) {
+				const nodeType = nodeTypesStore.getNodeType(node.type, node.typeVersion);
+				if (isDataNodeType(nodeType)) {
+					dataNodeTypes.add(nodeTypeName);
+				}
+				if (isManualTriggerNode(nodeType)) {
+					hasManualTrigger = true;
+				}
+				if (isScheduleTriggerNode(nodeType)) {
+					hasScheduleTrigger = true;
+				}
+			}
+		}
+		if (multipleOutputNodes.size > 0) {
+			track(EVENTS.RECEIEVED_MULTIPLE_DATA_ITEMS, {
+				nodeTypes: Array.from(multipleOutputNodes),
+			});
+		}
+		if (dataNodeTypes.size > 0) {
+			track(EVENTS.EXECUTED_DATA_NODE_TRIGGER, {
+				nodeTypes: Array.from(dataNodeTypes),
+			});
+		}
+		if (hasManualTrigger) {
+			track(EVENTS.EXECUTED_MANUAL_TRIGGER);
+		}
+		if (hasScheduleTrigger) {
+			track(EVENTS.EXECUTED_SCHEDULE_TRIGGER);
+		}
+	};
+
+	const isManualTriggerNode = (nodeType: INodeTypeDescription | null): boolean => {
+		return !!nodeType && nodeType.name === MANUAL_TRIGGER_NODE_TYPE;
+	};
+
+	const isScheduleTriggerNode = (nodeType: INodeTypeDescription | null): boolean => {
+		return !!nodeType && nodeType.name === SCHEDULE_TRIGGER_NODE_TYPE;
+	};
+
+	const isDataNodeType = (nodeType: INodeTypeDescription | null): boolean => {
+		if (!nodeType) {
+			return false;
+		}
+		const includeCoreNodes = [
+			HTTP_REQUEST_NODE_TYPE,
+			CODE_NODE_TYPE,
+			SET_NODE_TYPE,
+			WEBHOOK_NODE_TYPE,
+		];
+		return !nodeTypesStore.isCoreNodeType(nodeType) || includeCoreNodes.includes(nodeType.name);
+	};
+
+	return {
+		track,
+		trackAddedTrigger,
+		trackSuccessfulWorkflowExecution,
+		identify,
+		page,
+		EVENTS,
+	};
+});
diff --git a/packages/editor-ui/src/stores/segment.ts b/packages/editor-ui/src/stores/segment.ts
deleted file mode 100644
index 2191dd58bcc97..0000000000000
--- a/packages/editor-ui/src/stores/segment.ts
+++ /dev/null
@@ -1,129 +0,0 @@
-import {
-	CODE_NODE_TYPE,
-	HTTP_REQUEST_NODE_TYPE,
-	MANUAL_TRIGGER_NODE_TYPE,
-	SCHEDULE_TRIGGER_NODE_TYPE,
-	SET_NODE_TYPE,
-	WEBHOOK_NODE_TYPE,
-} from '@/constants';
-import { defineStore } from 'pinia';
-import { useSettingsStore } from '@/stores/settings';
-import type { INodeTypeDescription, IRun, ITelemetryTrackProperties } from 'n8n-workflow';
-import { useWorkflowsStore } from '@/stores/workflows';
-import { useNodeTypesStore } from '@/stores/nodeTypes';
-
-const EVENTS = {
-	ADDED_MANUAL_TRIGGER: 'User added manual trigger',
-	ADDED_SCHEDULE_TRIGGER: 'User added schedule trigger',
-	ADDED_DATA_TRIGGER: 'User added data trigger',
-	RECEIEVED_MULTIPLE_DATA_ITEMS: 'User received multiple data items',
-	EXECUTED_MANUAL_TRIGGER: 'User executed manual trigger successfully',
-	EXECUTED_SCHEDULE_TRIGGER: 'User executed schedule trigger successfully',
-	EXECUTED_DATA_NODE_TRIGGER: 'User executed data node successfully',
-	MAPPED_DATA: 'User mapped data',
-};
-
-export const useSegment = defineStore('segment', () => {
-	const nodeTypesStore = useNodeTypesStore();
-	const workflowsStore = useWorkflowsStore();
-	const settingsStore = useSettingsStore();
-
-	const track = (eventName: string, properties?: ITelemetryTrackProperties) => {
-		if (settingsStore.telemetry.enabled) {
-			window.analytics?.track(eventName, properties);
-		}
-	};
-
-	const showAppCuesChecklist = () => {
-		const isInIframe = window.location !== window.parent.location;
-		if (isInIframe) {
-			return;
-		}
-	};
-
-	const trackAddedTrigger = (nodeTypeName: string) => {
-		if (!nodeTypesStore.isTriggerNode(nodeTypeName)) {
-			return;
-		}
-
-		if (nodeTypeName === MANUAL_TRIGGER_NODE_TYPE) {
-			track(EVENTS.ADDED_MANUAL_TRIGGER);
-		} else if (nodeTypeName === SCHEDULE_TRIGGER_NODE_TYPE) {
-			track(EVENTS.ADDED_SCHEDULE_TRIGGER);
-		} else {
-			track(EVENTS.ADDED_DATA_TRIGGER);
-		}
-	};
-
-	const trackSuccessfulWorkflowExecution = (runData: IRun) => {
-		const dataNodeTypes: Set<string> = new Set<string>();
-		const multipleOutputNodes: Set<string> = new Set<string>();
-		let hasManualTrigger = false;
-		let hasScheduleTrigger = false;
-		for (const nodeName of Object.keys(runData.data.resultData.runData)) {
-			const nodeRunData = runData.data.resultData.runData[nodeName];
-			const node = workflowsStore.getNodeByName(nodeName);
-			const nodeTypeName = node ? node.type : 'unknown';
-			if (nodeRunData[0].data && nodeRunData[0].data.main.some((out) => out && out?.length > 1)) {
-				multipleOutputNodes.add(nodeTypeName);
-			}
-			if (node && !node.disabled) {
-				const nodeType = nodeTypesStore.getNodeType(node.type, node.typeVersion);
-				if (isDataNodeType(nodeType)) {
-					dataNodeTypes.add(nodeTypeName);
-				}
-				if (isManualTriggerNode(nodeType)) {
-					hasManualTrigger = true;
-				}
-				if (isScheduleTriggerNode(nodeType)) {
-					hasScheduleTrigger = true;
-				}
-			}
-		}
-		if (multipleOutputNodes.size > 0) {
-			track(EVENTS.RECEIEVED_MULTIPLE_DATA_ITEMS, {
-				nodeTypes: Array.from(multipleOutputNodes),
-			});
-		}
-		if (dataNodeTypes.size > 0) {
-			track(EVENTS.EXECUTED_DATA_NODE_TRIGGER, {
-				nodeTypes: Array.from(dataNodeTypes),
-			});
-		}
-		if (hasManualTrigger) {
-			track(EVENTS.EXECUTED_MANUAL_TRIGGER);
-		}
-		if (hasScheduleTrigger) {
-			track(EVENTS.EXECUTED_SCHEDULE_TRIGGER);
-		}
-	};
-
-	const isManualTriggerNode = (nodeType: INodeTypeDescription | null): boolean => {
-		return !!nodeType && nodeType.name === MANUAL_TRIGGER_NODE_TYPE;
-	};
-
-	const isScheduleTriggerNode = (nodeType: INodeTypeDescription | null): boolean => {
-		return !!nodeType && nodeType.name === SCHEDULE_TRIGGER_NODE_TYPE;
-	};
-
-	const isDataNodeType = (nodeType: INodeTypeDescription | null): boolean => {
-		if (!nodeType) {
-			return false;
-		}
-		const includeCoreNodes = [
-			HTTP_REQUEST_NODE_TYPE,
-			CODE_NODE_TYPE,
-			SET_NODE_TYPE,
-			WEBHOOK_NODE_TYPE,
-		];
-		return !nodeTypesStore.isCoreNodeType(nodeType) || includeCoreNodes.includes(nodeType.name);
-	};
-
-	return {
-		showAppCuesChecklist,
-		track,
-		trackAddedTrigger,
-		trackSuccessfulWorkflowExecution,
-		EVENTS,
-	};
-});
diff --git a/packages/editor-ui/src/stores/settings.store.ts b/packages/editor-ui/src/stores/settings.store.ts
new file mode 100644
index 0000000000000..0028a9a920954
--- /dev/null
+++ b/packages/editor-ui/src/stores/settings.store.ts
@@ -0,0 +1,416 @@
+import { createApiKey, deleteApiKey, getApiKey } from '@/api/api-keys';
+import {
+	getLdapConfig,
+	getLdapSynchronizations,
+	runLdapSync,
+	testLdapConnection,
+	updateLdapConfig,
+} from '@/api/ldap';
+import { getPromptsData, getSettings, submitContactInfo, submitValueSurvey } from '@/api/settings';
+import { testHealthEndpoint } from '@/api/templates';
+import type { EnterpriseEditionFeature } from '@/constants';
+import {
+	CONTACT_PROMPT_MODAL_KEY,
+	STORES,
+	VALUE_SURVEY_MODAL_KEY,
+	INSECURE_CONNECTION_WARNING,
+} from '@/constants';
+import type {
+	ILdapConfig,
+	IN8nPromptResponse,
+	IN8nPrompts,
+	IN8nValueSurveyData,
+	ISettingsState,
+} from '@/Interface';
+import { UserManagementAuthenticationMethod } from '@/Interface';
+import type {
+	IDataObject,
+	LogLevel,
+	IN8nUISettings,
+	ITelemetrySettings,
+	WorkflowSettings,
+} from 'n8n-workflow';
+import { ExpressionEvaluatorProxy } from 'n8n-workflow';
+import { defineStore } from 'pinia';
+import { useRootStore } from './n8nRoot.store';
+import { useUIStore } from './ui.store';
+import { useUsersStore } from './users.store';
+import { useVersionsStore } from './versions.store';
+import { makeRestApiRequest } from '@/utils/apiUtils';
+import { useTitleChange } from '@/composables/useTitleChange';
+import { useToast } from '@/composables/useToast';
+import { i18n } from '@/plugins/i18n';
+
+export const useSettingsStore = defineStore(STORES.SETTINGS, {
+	state: (): ISettingsState => ({
+		initialized: false,
+		settings: {} as IN8nUISettings,
+		promptsData: {} as IN8nPrompts,
+		userManagement: {
+			quota: -1,
+			showSetupOnFirstLoad: false,
+			smtpSetup: false,
+			authenticationMethod: UserManagementAuthenticationMethod.Email,
+		},
+		templatesEndpointHealthy: false,
+		api: {
+			enabled: false,
+			latestVersion: 0,
+			path: '/',
+			swaggerUi: {
+				enabled: false,
+			},
+		},
+		ldap: {
+			loginLabel: '',
+			loginEnabled: false,
+		},
+		saml: {
+			loginLabel: '',
+			loginEnabled: false,
+		},
+		mfa: {
+			enabled: false,
+		},
+		onboardingCallPromptEnabled: false,
+		saveDataErrorExecution: 'all',
+		saveDataSuccessExecution: 'all',
+		saveManualExecutions: false,
+	}),
+	getters: {
+		isEnterpriseFeatureEnabled() {
+			return (feature: EnterpriseEditionFeature): boolean => this.settings.enterprise?.[feature];
+		},
+		versionCli(): string {
+			return this.settings.versionCli;
+		},
+		isPublicApiEnabled(): boolean {
+			return this.api.enabled;
+		},
+		isSwaggerUIEnabled(): boolean {
+			return this.api.swaggerUi.enabled;
+		},
+		isPreviewMode(): boolean {
+			return this.settings.previewMode;
+		},
+		publicApiLatestVersion(): number {
+			return this.api.latestVersion;
+		},
+		publicApiPath(): string {
+			return this.api.path;
+		},
+		isLdapLoginEnabled(): boolean {
+			return this.ldap.loginEnabled;
+		},
+		ldapLoginLabel(): string {
+			return this.ldap.loginLabel;
+		},
+		isSamlLoginEnabled(): boolean {
+			return this.saml.loginEnabled;
+		},
+		samlLoginLabel(): string {
+			return this.saml.loginLabel;
+		},
+		showSetupPage(): boolean {
+			return this.userManagement.showSetupOnFirstLoad === true;
+		},
+		deploymentType(): string {
+			return this.settings.deployment?.type || 'default';
+		},
+		isDesktopDeployment(): boolean {
+			if (!this.settings.deployment) {
+				return false;
+			}
+			return this.settings.deployment?.type.startsWith('desktop_');
+		},
+		isCloudDeployment(): boolean {
+			return this.settings.deployment?.type === 'cloud';
+		},
+		isSmtpSetup(): boolean {
+			return this.userManagement.smtpSetup;
+		},
+		isPersonalizationSurveyEnabled(): boolean {
+			return (
+				this.settings.telemetry &&
+				this.settings.telemetry.enabled &&
+				this.settings.personalizationSurveyEnabled
+			);
+		},
+		telemetry(): ITelemetrySettings {
+			return this.settings.telemetry;
+		},
+		logLevel(): LogLevel {
+			return this.settings.logLevel;
+		},
+		isTelemetryEnabled(): boolean {
+			return this.settings.telemetry && this.settings.telemetry.enabled;
+		},
+		isMfaFeatureEnabled(): boolean {
+			return this.settings?.mfa?.enabled;
+		},
+		areTagsEnabled(): boolean {
+			return this.settings.workflowTagsDisabled !== undefined
+				? !this.settings.workflowTagsDisabled
+				: true;
+		},
+		isHiringBannerEnabled(): boolean {
+			return this.settings.hiringBannerEnabled;
+		},
+		isTemplatesEnabled(): boolean {
+			return Boolean(this.settings.templates && this.settings.templates.enabled);
+		},
+		isTemplatesEndpointReachable(): boolean {
+			return this.templatesEndpointHealthy;
+		},
+		templatesHost(): string {
+			return this.settings.templates.host;
+		},
+		pushBackend(): IN8nUISettings['pushBackend'] {
+			return this.settings.pushBackend;
+		},
+		isCommunityNodesFeatureEnabled(): boolean {
+			return this.settings.communityNodesEnabled;
+		},
+		isNpmAvailable(): boolean {
+			return this.settings.isNpmAvailable;
+		},
+		allowedModules(): { builtIn?: string[]; external?: string[] } {
+			return this.settings.allowedModules;
+		},
+		isQueueModeEnabled(): boolean {
+			return this.settings.executionMode === 'queue';
+		},
+		isWorkerViewAvailable(): boolean {
+			return !!this.settings.enterprise?.workerView;
+		},
+		workflowCallerPolicyDefaultOption(): WorkflowSettings.CallerPolicy {
+			return this.settings.workflowCallerPolicyDefaultOption;
+		},
+		isDefaultAuthenticationSaml(): boolean {
+			return this.userManagement.authenticationMethod === UserManagementAuthenticationMethod.Saml;
+		},
+		permanentlyDismissedBanners(): string[] {
+			return this.settings.banners?.dismissed ?? [];
+		},
+		isBelowUserQuota(): boolean {
+			const userStore = useUsersStore();
+			return (
+				this.userManagement.quota === -1 || this.userManagement.quota > userStore.allUsers.length
+			);
+		},
+		isDevRelease(): boolean {
+			return this.settings.releaseChannel === 'dev';
+		},
+	},
+	actions: {
+		async initialize() {
+			if (this.initialized) {
+				return;
+			}
+
+			const { showToast } = useToast();
+			try {
+				await this.getSettings();
+
+				ExpressionEvaluatorProxy.setEvaluator(this.settings.expressions.evaluator);
+
+				// Re-compute title since settings are now available
+				useTitleChange().titleReset();
+
+				this.initialized = true;
+			} catch (e) {
+				showToast({
+					title: i18n.baseText('startupError'),
+					message: i18n.baseText('startupError.message'),
+					type: 'error',
+					duration: 0,
+					dangerouslyUseHTMLString: true,
+				});
+
+				throw e;
+			}
+		},
+		setSettings(settings: IN8nUISettings): void {
+			this.settings = settings;
+			this.userManagement = settings.userManagement;
+			if (this.userManagement) {
+				this.userManagement.showSetupOnFirstLoad = !!settings.userManagement.showSetupOnFirstLoad;
+			}
+			this.api = settings.publicApi;
+			this.onboardingCallPromptEnabled = settings.onboardingCallPromptEnabled;
+			if (settings.sso?.ldap) {
+				this.ldap.loginEnabled = settings.sso.ldap.loginEnabled;
+				this.ldap.loginLabel = settings.sso.ldap.loginLabel;
+			}
+			if (settings.sso?.saml) {
+				this.saml.loginEnabled = settings.sso.saml.loginEnabled;
+				this.saml.loginLabel = settings.sso.saml.loginLabel;
+			}
+			if (settings.enterprise?.showNonProdBanner) {
+				useUIStore().pushBannerToStack('NON_PRODUCTION_LICENSE');
+			}
+			if (settings.versionCli) {
+				useRootStore().setVersionCli(settings.versionCli);
+			}
+
+			if (
+				settings.authCookie.secure &&
+				location.protocol === 'http:' &&
+				!['localhost', '127.0.0.1'].includes(location.hostname)
+			) {
+				document.write(INSECURE_CONNECTION_WARNING);
+				return;
+			}
+
+			const isV1BannerDismissedPermanently = (settings.banners?.dismissed || []).includes('V1');
+			if (!isV1BannerDismissedPermanently && useRootStore().versionCli.startsWith('1.')) {
+				useUIStore().pushBannerToStack('V1');
+			}
+		},
+		async getSettings(): Promise<void> {
+			const rootStore = useRootStore();
+			const settings = await getSettings(rootStore.getRestApiContext);
+
+			this.setSettings(settings);
+			this.settings.communityNodesEnabled = settings.communityNodesEnabled;
+			this.setAllowedModules(settings.allowedModules as { builtIn?: string; external?: string });
+			this.setSaveDataErrorExecution(settings.saveDataErrorExecution);
+			this.setSaveDataSuccessExecution(settings.saveDataSuccessExecution);
+			this.setSaveManualExecutions(settings.saveManualExecutions);
+
+			rootStore.setUrlBaseWebhook(settings.urlBaseWebhook);
+			rootStore.setUrlBaseEditor(settings.urlBaseEditor);
+			rootStore.setEndpointForm(settings.endpointForm);
+			rootStore.setEndpointFormTest(settings.endpointFormTest);
+			rootStore.setEndpointFormWaiting(settings.endpointFormWaiting);
+			rootStore.setEndpointWebhook(settings.endpointWebhook);
+			rootStore.setEndpointWebhookTest(settings.endpointWebhookTest);
+			rootStore.setTimezone(settings.timezone);
+			rootStore.setExecutionTimeout(settings.executionTimeout);
+			rootStore.setMaxExecutionTimeout(settings.maxExecutionTimeout);
+			rootStore.setVersionCli(settings.versionCli);
+			rootStore.setInstanceId(settings.instanceId);
+			rootStore.setOauthCallbackUrls(settings.oauthCallbackUrls);
+			rootStore.setN8nMetadata(settings.n8nMetadata || {});
+			rootStore.setDefaultLocale(settings.defaultLocale);
+			rootStore.setIsNpmAvailable(settings.isNpmAvailable);
+			rootStore.setBinaryDataMode(settings.binaryDataMode);
+
+			useVersionsStore().setVersionNotificationSettings(settings.versionNotifications);
+		},
+		stopShowingSetupPage(): void {
+			this.userManagement.showSetupOnFirstLoad = false;
+		},
+		disableTemplates(): void {
+			this.settings = {
+				...this.settings,
+				templates: {
+					...this.settings.templates,
+					enabled: false,
+				},
+			};
+		},
+		setPromptsData(promptsData: IN8nPrompts): void {
+			this.promptsData = promptsData;
+		},
+		setAllowedModules(allowedModules: { builtIn?: string[]; external?: string[] }): void {
+			this.settings.allowedModules = allowedModules;
+		},
+		async fetchPromptsData(): Promise<void> {
+			if (!this.isTelemetryEnabled) {
+				return;
+			}
+
+			const uiStore = useUIStore();
+			const usersStore = useUsersStore();
+			const promptsData: IN8nPrompts = await getPromptsData(
+				this.settings.instanceId,
+				usersStore.currentUserId || '',
+			);
+
+			if (promptsData && promptsData.showContactPrompt) {
+				uiStore.openModal(CONTACT_PROMPT_MODAL_KEY);
+			} else if (promptsData && promptsData.showValueSurvey) {
+				uiStore.openModal(VALUE_SURVEY_MODAL_KEY);
+			}
+
+			this.setPromptsData(promptsData);
+		},
+		async submitContactInfo(email: string): Promise<IN8nPromptResponse | undefined> {
+			try {
+				const usersStore = useUsersStore();
+				return await submitContactInfo(
+					this.settings.instanceId,
+					usersStore.currentUserId || '',
+					email,
+				);
+			} catch (error) {
+				return;
+			}
+		},
+		async submitValueSurvey(params: IN8nValueSurveyData): Promise<IN8nPromptResponse | undefined> {
+			try {
+				const usersStore = useUsersStore();
+				return await submitValueSurvey(
+					this.settings.instanceId,
+					usersStore.currentUserId || '',
+					params,
+				);
+			} catch (error) {
+				return;
+			}
+		},
+		async testTemplatesEndpoint(): Promise<void> {
+			const timeout = new Promise((_, reject) => setTimeout(() => reject(), 2000));
+			await Promise.race([testHealthEndpoint(this.templatesHost), timeout]);
+			this.templatesEndpointHealthy = true;
+		},
+		async getApiKey(): Promise<string | null> {
+			const rootStore = useRootStore();
+			const { apiKey } = await getApiKey(rootStore.getRestApiContext);
+			return apiKey;
+		},
+		async createApiKey(): Promise<string | null> {
+			const rootStore = useRootStore();
+			const { apiKey } = await createApiKey(rootStore.getRestApiContext);
+			return apiKey;
+		},
+		async deleteApiKey(): Promise<void> {
+			const rootStore = useRootStore();
+			await deleteApiKey(rootStore.getRestApiContext);
+		},
+		async getLdapConfig() {
+			const rootStore = useRootStore();
+			return await getLdapConfig(rootStore.getRestApiContext);
+		},
+		async getLdapSynchronizations(pagination: { page: number }) {
+			const rootStore = useRootStore();
+			return await getLdapSynchronizations(rootStore.getRestApiContext, pagination);
+		},
+		async testLdapConnection() {
+			const rootStore = useRootStore();
+			return await testLdapConnection(rootStore.getRestApiContext);
+		},
+		async updateLdapConfig(ldapConfig: ILdapConfig) {
+			const rootStore = useRootStore();
+			return await updateLdapConfig(rootStore.getRestApiContext, ldapConfig);
+		},
+		async runLdapSync(data: IDataObject) {
+			const rootStore = useRootStore();
+			return await runLdapSync(rootStore.getRestApiContext, data);
+		},
+		setSaveDataErrorExecution(newValue: string) {
+			this.saveDataErrorExecution = newValue;
+		},
+		setSaveDataSuccessExecution(newValue: string) {
+			this.saveDataSuccessExecution = newValue;
+		},
+		setSaveManualExecutions(saveManualExecutions: boolean) {
+			this.saveManualExecutions = saveManualExecutions;
+		},
+		async getTimezones(): Promise<IDataObject> {
+			const rootStore = useRootStore();
+			return await makeRestApiRequest(rootStore.getRestApiContext, 'GET', '/options/timezones');
+		},
+	},
+});
diff --git a/packages/editor-ui/src/stores/settings.ts b/packages/editor-ui/src/stores/settings.ts
deleted file mode 100644
index 0a42e79827084..0000000000000
--- a/packages/editor-ui/src/stores/settings.ts
+++ /dev/null
@@ -1,347 +0,0 @@
-import { createApiKey, deleteApiKey, getApiKey } from '@/api/api-keys';
-import {
-	getLdapConfig,
-	getLdapSynchronizations,
-	runLdapSync,
-	testLdapConnection,
-	updateLdapConfig,
-} from '@/api/ldap';
-import { getPromptsData, getSettings, submitContactInfo, submitValueSurvey } from '@/api/settings';
-import { testHealthEndpoint } from '@/api/templates';
-import type { EnterpriseEditionFeature } from '@/constants';
-import { CONTACT_PROMPT_MODAL_KEY, STORES, VALUE_SURVEY_MODAL_KEY } from '@/constants';
-import type {
-	ILdapConfig,
-	IN8nPromptResponse,
-	IN8nPrompts,
-	IN8nValueSurveyData,
-	ISettingsState,
-} from '@/Interface';
-import { UserManagementAuthenticationMethod } from '@/Interface';
-import type {
-	IDataObject,
-	ILogLevel,
-	IN8nUISettings,
-	ITelemetrySettings,
-	WorkflowSettings,
-} from 'n8n-workflow';
-import { defineStore } from 'pinia';
-import Vue from 'vue';
-import { useRootStore } from './n8nRootStore';
-import { useUIStore } from './ui';
-import { useUsersStore } from './users';
-import { useVersionsStore } from './versions';
-import { makeRestApiRequest } from '@/utils';
-
-export const useSettingsStore = defineStore(STORES.SETTINGS, {
-	state: (): ISettingsState => ({
-		settings: {} as IN8nUISettings,
-		promptsData: {} as IN8nPrompts,
-		userManagement: {
-			enabled: false,
-			showSetupOnFirstLoad: false,
-			smtpSetup: false,
-			authenticationMethod: UserManagementAuthenticationMethod.Email,
-		},
-		templatesEndpointHealthy: false,
-		api: {
-			enabled: false,
-			latestVersion: 0,
-			path: '/',
-			swaggerUi: {
-				enabled: false,
-			},
-		},
-		ldap: {
-			loginLabel: '',
-			loginEnabled: false,
-		},
-		saml: {
-			loginLabel: '',
-			loginEnabled: false,
-		},
-		onboardingCallPromptEnabled: false,
-		saveDataErrorExecution: 'all',
-		saveDataSuccessExecution: 'all',
-		saveManualExecutions: false,
-	}),
-	getters: {
-		isEnterpriseFeatureEnabled() {
-			return (feature: EnterpriseEditionFeature): boolean => this.settings.enterprise[feature];
-		},
-		versionCli(): string {
-			return this.settings.versionCli;
-		},
-		isUserManagementEnabled(): boolean {
-			return this.userManagement.enabled;
-		},
-		isPublicApiEnabled(): boolean {
-			return this.api.enabled;
-		},
-		isSwaggerUIEnabled(): boolean {
-			return this.api.swaggerUi.enabled;
-		},
-		publicApiLatestVersion(): number {
-			return this.api.latestVersion;
-		},
-		publicApiPath(): string {
-			return this.api.path;
-		},
-		isLdapLoginEnabled(): boolean {
-			return this.ldap.loginEnabled;
-		},
-		ldapLoginLabel(): string {
-			return this.ldap.loginLabel;
-		},
-		isSamlLoginEnabled(): boolean {
-			return this.saml.loginEnabled;
-		},
-		samlLoginLabel(): string {
-			return this.saml.loginLabel;
-		},
-		showSetupPage(): boolean {
-			return this.userManagement.showSetupOnFirstLoad === true;
-		},
-		deploymentType(): string {
-			return this.settings.deployment?.type || 'default';
-		},
-		isDesktopDeployment(): boolean {
-			if (!this.settings.deployment) {
-				return false;
-			}
-			return this.settings.deployment?.type.startsWith('desktop_');
-		},
-		isCloudDeployment(): boolean {
-			if (!this.settings.deployment) {
-				return false;
-			}
-			return this.settings.deployment.type === 'cloud';
-		},
-		isSmtpSetup(): boolean {
-			return this.userManagement.smtpSetup;
-		},
-		isPersonalizationSurveyEnabled(): boolean {
-			return (
-				this.settings.telemetry &&
-				this.settings.telemetry.enabled &&
-				this.settings.personalizationSurveyEnabled
-			);
-		},
-		isUserActivationSurveyEnabled(): boolean {
-			return (
-				this.settings.telemetry &&
-				this.settings.telemetry.enabled &&
-				this.settings.userActivationSurveyEnabled
-			);
-		},
-		telemetry(): ITelemetrySettings {
-			return this.settings.telemetry;
-		},
-		logLevel(): ILogLevel {
-			return this.settings.logLevel;
-		},
-		isTelemetryEnabled(): boolean {
-			return this.settings.telemetry && this.settings.telemetry.enabled;
-		},
-		areTagsEnabled(): boolean {
-			return this.settings.workflowTagsDisabled !== undefined
-				? !this.settings.workflowTagsDisabled
-				: true;
-		},
-		isHiringBannerEnabled(): boolean {
-			return this.settings.hiringBannerEnabled;
-		},
-		isTemplatesEnabled(): boolean {
-			return Boolean(this.settings.templates && this.settings.templates.enabled);
-		},
-		isTemplatesEndpointReachable(): boolean {
-			return this.templatesEndpointHealthy;
-		},
-		templatesHost(): string {
-			return this.settings.templates.host;
-		},
-		pushBackend(): IN8nUISettings['pushBackend'] {
-			return this.settings.pushBackend;
-		},
-		isCommunityNodesFeatureEnabled(): boolean {
-			return this.settings.communityNodesEnabled;
-		},
-		isNpmAvailable(): boolean {
-			return this.settings.isNpmAvailable;
-		},
-		allowedModules(): { builtIn?: string[]; external?: string[] } {
-			return this.settings.allowedModules;
-		},
-		isQueueModeEnabled(): boolean {
-			return this.settings.executionMode === 'queue';
-		},
-		workflowCallerPolicyDefaultOption(): WorkflowSettings.CallerPolicy {
-			return this.settings.workflowCallerPolicyDefaultOption;
-		},
-		isDefaultAuthenticationSaml(): boolean {
-			return this.userManagement.authenticationMethod === UserManagementAuthenticationMethod.Saml;
-		},
-	},
-	actions: {
-		setSettings(settings: IN8nUISettings): void {
-			this.settings = settings;
-			this.userManagement = settings.userManagement;
-			if (this.userManagement) {
-				this.userManagement.showSetupOnFirstLoad = !!settings.userManagement.showSetupOnFirstLoad;
-			}
-			this.api = settings.publicApi;
-			this.onboardingCallPromptEnabled = settings.onboardingCallPromptEnabled;
-			if (settings.sso?.ldap) {
-				this.ldap.loginEnabled = settings.sso.ldap.loginEnabled;
-				this.ldap.loginLabel = settings.sso.ldap.loginLabel;
-			}
-			if (settings.sso?.saml) {
-				this.saml.loginEnabled = settings.sso.saml.loginEnabled;
-				this.saml.loginLabel = settings.sso.saml.loginLabel;
-			}
-		},
-		async getSettings(): Promise<void> {
-			const rootStore = useRootStore();
-			const settings = await getSettings(rootStore.getRestApiContext);
-
-			this.setSettings(settings);
-			this.settings.communityNodesEnabled = settings.communityNodesEnabled;
-			this.setAllowedModules(
-				settings.allowedModules as { builtIn?: string | string[]; external?: string },
-			);
-			this.setSaveDataErrorExecution(settings.saveDataErrorExecution);
-			this.setSaveDataSuccessExecution(settings.saveDataSuccessExecution);
-			this.setSaveManualExecutions(settings.saveManualExecutions);
-
-			rootStore.setUrlBaseWebhook(settings.urlBaseWebhook);
-			rootStore.setUrlBaseEditor(settings.urlBaseEditor);
-			rootStore.setEndpointWebhook(settings.endpointWebhook);
-			rootStore.setEndpointWebhookTest(settings.endpointWebhookTest);
-			rootStore.setTimezone(settings.timezone);
-			rootStore.setExecutionTimeout(settings.executionTimeout);
-			rootStore.setMaxExecutionTimeout(settings.maxExecutionTimeout);
-			rootStore.setVersionCli(settings.versionCli);
-			rootStore.setInstanceId(settings.instanceId);
-			rootStore.setOauthCallbackUrls(settings.oauthCallbackUrls);
-			rootStore.setN8nMetadata(settings.n8nMetadata || {});
-			rootStore.setDefaultLocale(settings.defaultLocale);
-			rootStore.setIsNpmAvailable(settings.isNpmAvailable);
-			useVersionsStore().setVersionNotificationSettings(settings.versionNotifications);
-		},
-		stopShowingSetupPage(): void {
-			Vue.set(this.userManagement, 'showSetupOnFirstLoad', false);
-		},
-		disableTemplates(): void {
-			Vue.set(this.settings.templates, 'enabled', false);
-		},
-		setPromptsData(promptsData: IN8nPrompts): void {
-			Vue.set(this, 'promptsData', promptsData);
-		},
-		setAllowedModules(allowedModules: { builtIn?: string | string[]; external?: string }): void {
-			this.settings.allowedModules = {
-				...(allowedModules.builtIn && {
-					builtIn: Array.isArray(allowedModules.builtIn)
-						? allowedModules.builtIn
-						: allowedModules.builtIn.split(','),
-				}),
-				...(allowedModules.external && { external: allowedModules.external.split(',') }),
-			};
-		},
-		async fetchPromptsData(): Promise<void> {
-			if (!this.isTelemetryEnabled) {
-				return;
-			}
-
-			const uiStore = useUIStore();
-			const usersStore = useUsersStore();
-			const promptsData: IN8nPrompts = await getPromptsData(
-				this.settings.instanceId,
-				usersStore.currentUserId || '',
-			);
-
-			if (promptsData && promptsData.showContactPrompt) {
-				uiStore.openModal(CONTACT_PROMPT_MODAL_KEY);
-			} else if (promptsData && promptsData.showValueSurvey) {
-				uiStore.openModal(VALUE_SURVEY_MODAL_KEY);
-			}
-
-			this.setPromptsData(promptsData);
-		},
-		async submitContactInfo(email: string): Promise<IN8nPromptResponse | undefined> {
-			try {
-				const usersStore = useUsersStore();
-				return await submitContactInfo(
-					this.settings.instanceId,
-					usersStore.currentUserId || '',
-					email,
-				);
-			} catch (error) {
-				return;
-			}
-		},
-		async submitValueSurvey(params: IN8nValueSurveyData): Promise<IN8nPromptResponse | undefined> {
-			try {
-				const usersStore = useUsersStore();
-				return await submitValueSurvey(
-					this.settings.instanceId,
-					usersStore.currentUserId || '',
-					params,
-				);
-			} catch (error) {
-				return;
-			}
-		},
-		async testTemplatesEndpoint(): Promise<void> {
-			const timeout = new Promise((_, reject) => setTimeout(() => reject(), 2000));
-			await Promise.race([testHealthEndpoint(this.templatesHost), timeout]);
-			this.templatesEndpointHealthy = true;
-		},
-		async getApiKey(): Promise<string | null> {
-			const rootStore = useRootStore();
-			const { apiKey } = await getApiKey(rootStore.getRestApiContext);
-			return apiKey;
-		},
-		async createApiKey(): Promise<string | null> {
-			const rootStore = useRootStore();
-			const { apiKey } = await createApiKey(rootStore.getRestApiContext);
-			return apiKey;
-		},
-		async deleteApiKey(): Promise<void> {
-			const rootStore = useRootStore();
-			await deleteApiKey(rootStore.getRestApiContext);
-		},
-		async getLdapConfig() {
-			const rootStore = useRootStore();
-			return await getLdapConfig(rootStore.getRestApiContext);
-		},
-		async getLdapSynchronizations(pagination: { page: number }) {
-			const rootStore = useRootStore();
-			return await getLdapSynchronizations(rootStore.getRestApiContext, pagination);
-		},
-		async testLdapConnection() {
-			const rootStore = useRootStore();
-			return await testLdapConnection(rootStore.getRestApiContext);
-		},
-		async updateLdapConfig(ldapConfig: ILdapConfig) {
-			const rootStore = useRootStore();
-			return await updateLdapConfig(rootStore.getRestApiContext, ldapConfig);
-		},
-		async runLdapSync(data: IDataObject) {
-			const rootStore = useRootStore();
-			return await runLdapSync(rootStore.getRestApiContext, data);
-		},
-		setSaveDataErrorExecution(newValue: string) {
-			Vue.set(this, 'saveDataErrorExecution', newValue);
-		},
-		setSaveDataSuccessExecution(newValue: string) {
-			Vue.set(this, 'saveDataSuccessExecution', newValue);
-		},
-		setSaveManualExecutions(saveManualExecutions: boolean) {
-			Vue.set(this, 'saveManualExecutions', saveManualExecutions);
-		},
-		async getTimezones(): Promise<IDataObject> {
-			const rootStore = useRootStore();
-			return makeRestApiRequest(rootStore.getRestApiContext, 'GET', '/options/timezones');
-		},
-	},
-});
diff --git a/packages/editor-ui/src/stores/sourceControl.store.ts b/packages/editor-ui/src/stores/sourceControl.store.ts
new file mode 100644
index 0000000000000..6e6bb74a1ee65
--- /dev/null
+++ b/packages/editor-ui/src/stores/sourceControl.store.ts
@@ -0,0 +1,130 @@
+import { computed, reactive } from 'vue';
+import { defineStore } from 'pinia';
+import { EnterpriseEditionFeature } from '@/constants';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import * as vcApi from '@/api/sourceControl';
+import type { SourceControlPreferences, SshKeyTypes } from '@/Interface';
+import type { TupleToUnion } from '@/utils/typeHelpers';
+
+export const useSourceControlStore = defineStore('sourceControl', () => {
+	const rootStore = useRootStore();
+	const settingsStore = useSettingsStore();
+
+	const isEnterpriseSourceControlEnabled = computed(() =>
+		settingsStore.isEnterpriseFeatureEnabled(EnterpriseEditionFeature.SourceControl),
+	);
+
+	const sshKeyTypes: SshKeyTypes = ['ed25519', 'rsa'];
+	const sshKeyTypesWithLabel = reactive(
+		sshKeyTypes.map((value) => ({ value, label: value.toUpperCase() })),
+	);
+
+	const preferences = reactive<SourceControlPreferences>({
+		branchName: '',
+		branches: [],
+		repositoryUrl: '',
+		branchReadOnly: false,
+		branchColor: '#5296D6',
+		connected: false,
+		publicKey: '',
+		keyGeneratorType: 'ed25519',
+	});
+
+	const state = reactive<{
+		commitMessage: string;
+	}>({
+		commitMessage: 'commit message',
+	});
+
+	const pushWorkfolder = async (data: {
+		commitMessage: string;
+		fileNames?: Array<{
+			conflict: boolean;
+			file: string;
+			id: string;
+			location: string;
+			name: string;
+			status: string;
+			type: string;
+			updatedAt?: string | undefined;
+		}>;
+		force: boolean;
+	}) => {
+		state.commitMessage = data.commitMessage;
+		await vcApi.pushWorkfolder(rootStore.getRestApiContext, {
+			force: data.force,
+			message: data.commitMessage,
+			...(data.fileNames ? { fileNames: data.fileNames } : {}),
+		});
+	};
+
+	const pullWorkfolder = async (force: boolean) => {
+		return await vcApi.pullWorkfolder(rootStore.getRestApiContext, { force });
+	};
+
+	const setPreferences = (data: Partial<SourceControlPreferences>) => {
+		Object.assign(preferences, data);
+	};
+
+	const makePreferencesAction =
+		(action: typeof vcApi.savePreferences) =>
+		async (preferences: Partial<SourceControlPreferences>) => {
+			const data = await action(rootStore.getRestApiContext, preferences);
+			setPreferences(data);
+		};
+
+	const getBranches = async () => {
+		const data = await vcApi.getBranches(rootStore.getRestApiContext);
+		setPreferences(data);
+	};
+
+	const getPreferences = async () => {
+		const data = await vcApi.getPreferences(rootStore.getRestApiContext);
+		setPreferences(data);
+	};
+
+	const savePreferences = makePreferencesAction(vcApi.savePreferences);
+
+	const updatePreferences = makePreferencesAction(vcApi.updatePreferences);
+
+	const disconnect = async (keepKeyPair: boolean) => {
+		await vcApi.disconnect(rootStore.getRestApiContext, keepKeyPair);
+		setPreferences({ connected: false, branches: [] });
+	};
+
+	const generateKeyPair = async (keyGeneratorType?: TupleToUnion<SshKeyTypes>) => {
+		await vcApi.generateKeyPair(rootStore.getRestApiContext, keyGeneratorType);
+		const data = await vcApi.getPreferences(rootStore.getRestApiContext); // To be removed once the API is updated
+
+		preferences.publicKey = data.publicKey;
+
+		return { publicKey: data.publicKey };
+	};
+
+	const getStatus = async () => {
+		return await vcApi.getStatus(rootStore.getRestApiContext);
+	};
+
+	const getAggregatedStatus = async () => {
+		return await vcApi.getAggregatedStatus(rootStore.getRestApiContext);
+	};
+
+	return {
+		isEnterpriseSourceControlEnabled,
+		state,
+		preferences,
+		pushWorkfolder,
+		pullWorkfolder,
+		getPreferences,
+		setPreferences,
+		generateKeyPair,
+		getBranches,
+		savePreferences,
+		updatePreferences,
+		disconnect,
+		getStatus,
+		getAggregatedStatus,
+		sshKeyTypesWithLabel,
+	};
+});
diff --git a/packages/editor-ui/src/stores/sso.store.ts b/packages/editor-ui/src/stores/sso.store.ts
new file mode 100644
index 0000000000000..3585a36d7d602
--- /dev/null
+++ b/packages/editor-ui/src/stores/sso.store.ts
@@ -0,0 +1,96 @@
+import { computed, reactive } from 'vue';
+import { defineStore } from 'pinia';
+import { EnterpriseEditionFeature } from '@/constants';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import { useSettingsStore } from '@/stores/settings.store';
+import * as ssoApi from '@/api/sso';
+import type { SamlPreferences, SamlPreferencesExtractedData } from '@/Interface';
+import { updateCurrentUser } from '@/api/users';
+import { useUsersStore } from '@/stores/users.store';
+
+export const useSSOStore = defineStore('sso', () => {
+	const rootStore = useRootStore();
+	const settingsStore = useSettingsStore();
+	const usersStore = useUsersStore();
+
+	const state = reactive({
+		loading: false,
+		samlConfig: undefined as (SamlPreferences & SamlPreferencesExtractedData) | undefined,
+	});
+
+	const isLoading = computed(() => state.loading);
+
+	const samlConfig = computed(() => state.samlConfig);
+
+	const setLoading = (loading: boolean) => {
+		state.loading = loading;
+	};
+
+	const isSamlLoginEnabled = computed({
+		get: () => settingsStore.isSamlLoginEnabled,
+		set: (value: boolean) => {
+			settingsStore.setSettings({
+				...settingsStore.settings,
+				sso: {
+					...settingsStore.settings.sso,
+					saml: {
+						...settingsStore.settings.sso.saml,
+						loginEnabled: value,
+					},
+				},
+			});
+			void toggleLoginEnabled(value);
+		},
+	});
+	const isEnterpriseSamlEnabled = computed(() =>
+		settingsStore.isEnterpriseFeatureEnabled(EnterpriseEditionFeature.Saml),
+	);
+	const isDefaultAuthenticationSaml = computed(() => settingsStore.isDefaultAuthenticationSaml);
+	const showSsoLoginButton = computed(
+		() =>
+			isSamlLoginEnabled.value &&
+			isEnterpriseSamlEnabled.value &&
+			isDefaultAuthenticationSaml.value,
+	);
+
+	const getSSORedirectUrl = async () => await ssoApi.initSSO(rootStore.getRestApiContext);
+
+	const toggleLoginEnabled = async (enabled: boolean) =>
+		await ssoApi.toggleSamlConfig(rootStore.getRestApiContext, { loginEnabled: enabled });
+
+	const getSamlMetadata = async () => await ssoApi.getSamlMetadata(rootStore.getRestApiContext);
+	const getSamlConfig = async () => {
+		const samlConfig = await ssoApi.getSamlConfig(rootStore.getRestApiContext);
+		state.samlConfig = samlConfig;
+		return samlConfig;
+	};
+	const saveSamlConfig = async (config: SamlPreferences) =>
+		await ssoApi.saveSamlConfig(rootStore.getRestApiContext, config);
+	const testSamlConfig = async () => await ssoApi.testSamlConfig(rootStore.getRestApiContext);
+
+	const updateUser = async (params: { firstName: string; lastName: string }) =>
+		await updateCurrentUser(rootStore.getRestApiContext, {
+			id: usersStore.currentUser!.id,
+			email: usersStore.currentUser!.email!,
+			...params,
+		});
+
+	const userData = computed(() => usersStore.currentUser);
+
+	return {
+		isLoading,
+		setLoading,
+		isSamlLoginEnabled,
+		isEnterpriseSamlEnabled,
+		isDefaultAuthenticationSaml,
+		showSsoLoginButton,
+		samlConfig,
+		getSSORedirectUrl,
+		getSamlMetadata,
+		getSamlConfig,
+		saveSamlConfig,
+		testSamlConfig,
+		updateUser,
+		userData,
+	};
+});
diff --git a/packages/editor-ui/src/stores/sso.ts b/packages/editor-ui/src/stores/sso.ts
deleted file mode 100644
index 93fb389772d68..0000000000000
--- a/packages/editor-ui/src/stores/sso.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-import { computed, reactive, ref } from 'vue';
-import { defineStore } from 'pinia';
-import { EnterpriseEditionFeature } from '@/constants';
-import { useRootStore } from '@/stores/n8nRootStore';
-import { useSettingsStore } from '@/stores/settings';
-import * as ssoApi from '@/api/sso';
-import type { SamlPreferences } from '@/Interface';
-import { updateCurrentUser } from '@/api/users';
-import { useUsersStore } from '@/stores/users';
-
-export const useSSOStore = defineStore('sso', () => {
-	const rootStore = useRootStore();
-	const settingsStore = useSettingsStore();
-	const usersStore = useUsersStore();
-
-	const state = reactive({
-		loading: false,
-	});
-
-	const isLoading = computed(() => state.loading);
-
-	const setLoading = (loading: boolean) => {
-		state.loading = loading;
-	};
-
-	const isSamlLoginEnabled = computed({
-		get: () => settingsStore.isSamlLoginEnabled,
-		set: (value: boolean) => {
-			settingsStore.setSettings({
-				...settingsStore.settings,
-				sso: {
-					...settingsStore.settings.sso,
-					saml: {
-						...settingsStore.settings.sso.saml,
-						loginEnabled: value,
-					},
-				},
-			});
-			toggleLoginEnabled(value);
-		},
-	});
-	const isEnterpriseSamlEnabled = computed(() =>
-		settingsStore.isEnterpriseFeatureEnabled(EnterpriseEditionFeature.Saml),
-	);
-	const isDefaultAuthenticationSaml = computed(() => settingsStore.isDefaultAuthenticationSaml);
-	const showSsoLoginButton = computed(
-		() =>
-			isSamlLoginEnabled.value &&
-			isEnterpriseSamlEnabled.value &&
-			isDefaultAuthenticationSaml.value,
-	);
-
-	const getSSORedirectUrl = () => ssoApi.initSSO(rootStore.getRestApiContext);
-
-	const toggleLoginEnabled = (enabled: boolean) =>
-		ssoApi.toggleSamlConfig(rootStore.getRestApiContext, { loginEnabled: enabled });
-
-	const getSamlMetadata = () => ssoApi.getSamlMetadata(rootStore.getRestApiContext);
-	const getSamlConfig = () => ssoApi.getSamlConfig(rootStore.getRestApiContext);
-	const saveSamlConfig = (config: SamlPreferences) =>
-		ssoApi.saveSamlConfig(rootStore.getRestApiContext, config);
-	const testSamlConfig = () => ssoApi.testSamlConfig(rootStore.getRestApiContext);
-
-	const updateUser = async (params: { firstName: string; lastName: string }) =>
-		updateCurrentUser(rootStore.getRestApiContext, {
-			id: usersStore.currentUser!.id,
-			email: usersStore.currentUser!.email!,
-			...params,
-		});
-
-	const userData = computed(() => usersStore.currentUser);
-
-	return {
-		isLoading,
-		setLoading,
-		isSamlLoginEnabled,
-		isEnterpriseSamlEnabled,
-		isDefaultAuthenticationSaml,
-		showSsoLoginButton,
-		getSSORedirectUrl,
-		getSamlMetadata,
-		getSamlConfig,
-		saveSamlConfig,
-		testSamlConfig,
-		updateUser,
-		userData,
-	};
-});
diff --git a/packages/editor-ui/src/stores/tags.store.ts b/packages/editor-ui/src/stores/tags.store.ts
new file mode 100644
index 0000000000000..fbd08420cac41
--- /dev/null
+++ b/packages/editor-ui/src/stores/tags.store.ts
@@ -0,0 +1,105 @@
+import { createTag, deleteTag, getTags, updateTag } from '@/api/tags';
+import { STORES } from '@/constants';
+import type { ITag, ITagsState } from '@/Interface';
+import { defineStore } from 'pinia';
+import { useRootStore } from './n8nRoot.store';
+import { useWorkflowsStore } from './workflows.store';
+
+export const useTagsStore = defineStore(STORES.TAGS, {
+	state: (): ITagsState => ({
+		tags: {},
+		loading: false,
+		fetchedAll: false,
+		fetchedUsageCount: false,
+	}),
+	getters: {
+		allTags(): ITag[] {
+			return Object.values(this.tags).sort((a, b) => a.name.localeCompare(b.name));
+		},
+		isLoading(): boolean {
+			return this.loading;
+		},
+		hasTags(): boolean {
+			return Object.keys(this.tags).length > 0;
+		},
+		getTagById() {
+			return (id: string) => this.tags[id];
+		},
+	},
+	actions: {
+		setAllTags(tags: ITag[]): void {
+			this.tags = tags.reduce((accu: { [id: string]: ITag }, tag: ITag) => {
+				accu[tag.id] = tag;
+
+				return accu;
+			}, {});
+			this.fetchedAll = true;
+		},
+		upsertTags(tags: ITag[]): void {
+			tags.forEach((tag) => {
+				const tagId = tag.id;
+				const currentTag = this.tags[tagId];
+				if (currentTag) {
+					const newTag = {
+						...currentTag,
+						...tag,
+					};
+					this.tags = {
+						...this.tags,
+						[tagId]: newTag,
+					};
+				} else {
+					this.tags = {
+						...this.tags,
+						[tagId]: tag,
+					};
+				}
+			});
+		},
+		deleteTag(id: string): void {
+			const { [id]: deleted, ...rest } = this.tags;
+			this.tags = rest;
+		},
+
+		async fetchAll(params?: { force?: boolean; withUsageCount?: boolean }): Promise<ITag[]> {
+			const { force = false, withUsageCount = false } = params || {};
+			if (!force && this.fetchedAll && this.fetchedUsageCount === withUsageCount) {
+				return Object.values(this.tags);
+			}
+
+			this.loading = true;
+			const rootStore = useRootStore();
+			const tags = await getTags(rootStore.getRestApiContext, Boolean(withUsageCount));
+			this.setAllTags(tags);
+			this.loading = false;
+
+			return tags;
+		},
+		async create(name: string): Promise<ITag> {
+			const rootStore = useRootStore();
+			const tag = await createTag(rootStore.getRestApiContext, { name });
+			this.upsertTags([tag]);
+
+			return tag;
+		},
+		async rename({ id, name }: { id: string; name: string }) {
+			const rootStore = useRootStore();
+			const tag = await updateTag(rootStore.getRestApiContext, id, { name });
+			this.upsertTags([tag]);
+
+			return tag;
+		},
+		async delete(id: string) {
+			const rootStore = useRootStore();
+			const deleted = await deleteTag(rootStore.getRestApiContext, id);
+
+			if (deleted) {
+				this.deleteTag(id);
+				const workflowsStore = useWorkflowsStore();
+				workflowsStore.removeWorkflowTagId(id);
+			}
+
+			return deleted;
+		},
+	},
+});
diff --git a/packages/editor-ui/src/stores/tags.ts b/packages/editor-ui/src/stores/tags.ts
deleted file mode 100644
index 70e37bc5f0a3d..0000000000000
--- a/packages/editor-ui/src/stores/tags.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-import { createTag, deleteTag, getTags, updateTag } from '@/api/tags';
-import { STORES } from '@/constants';
-import type { ITag, ITagsState } from '@/Interface';
-import { defineStore } from 'pinia';
-import Vue from 'vue';
-import { useRootStore } from './n8nRootStore';
-import { useWorkflowsStore } from './workflows';
-
-export const useTagsStore = defineStore(STORES.TAGS, {
-	state: (): ITagsState => ({
-		tags: {},
-		loading: false,
-		fetchedAll: false,
-		fetchedUsageCount: false,
-	}),
-	getters: {
-		allTags(): ITag[] {
-			return Object.values(this.tags).sort((a, b) => a.name.localeCompare(b.name));
-		},
-		isLoading(): boolean {
-			return this.loading;
-		},
-		hasTags(): boolean {
-			return Object.keys(this.tags).length > 0;
-		},
-		getTagById() {
-			return (id: string) => this.tags[id];
-		},
-	},
-	actions: {
-		setAllTags(tags: ITag[]): void {
-			this.tags = tags.reduce((accu: { [id: string]: ITag }, tag: ITag) => {
-				accu[tag.id] = tag;
-
-				return accu;
-			}, {});
-			this.fetchedAll = true;
-		},
-		upsertTags(tags: ITag[]): void {
-			tags.forEach((tag) => {
-				const tagId = tag.id;
-				const currentTag = this.tags[tagId];
-				if (currentTag) {
-					const newTag = {
-						...currentTag,
-						...tag,
-					};
-					Vue.set(this.tags, tagId, newTag);
-				} else {
-					Vue.set(this.tags, tagId, tag);
-				}
-			});
-		},
-		deleteTag(id: string): void {
-			Vue.delete(this.tags, id);
-		},
-
-		async fetchAll(params?: { force?: boolean; withUsageCount?: boolean }): Promise<ITag[]> {
-			const { force = false, withUsageCount = false } = params || {};
-			if (!force && this.fetchedAll && this.fetchedUsageCount === withUsageCount) {
-				return Object.values(this.tags);
-			}
-
-			this.loading = true;
-			const rootStore = useRootStore();
-			const tags = await getTags(rootStore.getRestApiContext, Boolean(withUsageCount));
-			this.setAllTags(tags);
-			this.loading = false;
-
-			return tags;
-		},
-		async create(name: string): Promise<ITag> {
-			const rootStore = useRootStore();
-			const tag = await createTag(rootStore.getRestApiContext, { name });
-			this.upsertTags([tag]);
-
-			return tag;
-		},
-		async rename({ id, name }: { id: string; name: string }) {
-			const rootStore = useRootStore();
-			const tag = await updateTag(rootStore.getRestApiContext, id, { name });
-			this.upsertTags([tag]);
-
-			return tag;
-		},
-		async delete(id: string) {
-			const rootStore = useRootStore();
-			const deleted = await deleteTag(rootStore.getRestApiContext, id);
-
-			if (deleted) {
-				this.deleteTag(id);
-				const workflowsStore = useWorkflowsStore();
-				workflowsStore.removeWorkflowTagId(id);
-			}
-
-			return deleted;
-		},
-	},
-});
diff --git a/packages/editor-ui/src/stores/telemetry.ts b/packages/editor-ui/src/stores/telemetry.store.ts
similarity index 100%
rename from packages/editor-ui/src/stores/telemetry.ts
rename to packages/editor-ui/src/stores/telemetry.store.ts
diff --git a/packages/editor-ui/src/stores/templates.store.ts b/packages/editor-ui/src/stores/templates.store.ts
new file mode 100644
index 0000000000000..97fbdfabecd69
--- /dev/null
+++ b/packages/editor-ui/src/stores/templates.store.ts
@@ -0,0 +1,414 @@
+import { defineStore } from 'pinia';
+import { STORES, TEMPLATES_URLS } from '@/constants';
+import type {
+	INodeUi,
+	ITemplatesCategory,
+	ITemplatesCollection,
+	ITemplatesCollectionFull,
+	ITemplatesQuery,
+	ITemplateState,
+	ITemplatesWorkflow,
+	ITemplatesWorkflowFull,
+	IWorkflowTemplate,
+} from '@/Interface';
+import { useSettingsStore } from './settings.store';
+import {
+	getCategories,
+	getCollectionById,
+	getCollections,
+	getTemplateById,
+	getWorkflows,
+	getWorkflowTemplate,
+} from '@/api/templates';
+import { getFixedNodesList } from '@/utils/nodeViewUtils';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import { useUsersStore } from './users.store';
+import { useWorkflowsStore } from './workflows.store';
+
+const TEMPLATES_PAGE_SIZE = 20;
+
+function getSearchKey(query: ITemplatesQuery): string {
+	return JSON.stringify([query.search || '', [...query.categories].sort()]);
+}
+
+export type TemplatesStore = ReturnType<typeof useTemplatesStore>;
+
+export const useTemplatesStore = defineStore(STORES.TEMPLATES, {
+	state: (): ITemplateState => ({
+		categories: [],
+		collections: {},
+		workflows: {},
+		collectionSearches: {},
+		workflowSearches: {},
+		currentSessionId: '',
+		previousSessionId: '',
+		currentN8nPath: `${window.location.protocol}//${window.location.host}${window.BASE_PATH}`,
+	}),
+	getters: {
+		allCategories(): ITemplatesCategory[] {
+			return Object.values(this.categories).sort((a: ITemplatesCategory, b: ITemplatesCategory) =>
+				a.name > b.name ? 1 : -1,
+			);
+		},
+		getTemplateById() {
+			return (id: string): null | ITemplatesWorkflow => this.workflows[id];
+		},
+		getFullTemplateById() {
+			return (id: string): null | ITemplatesWorkflowFull => {
+				const template = this.workflows[id];
+				return template && 'full' in template && template.full ? template : null;
+			};
+		},
+		getCollectionById() {
+			return (id: string): null | ITemplatesCollection => this.collections[id];
+		},
+		getCategoryById() {
+			return (id: string): null | ITemplatesCategory => this.categories[id];
+		},
+		getSearchedCollections() {
+			return (query: ITemplatesQuery) => {
+				const searchKey = getSearchKey(query);
+				const search = this.collectionSearches[searchKey];
+				if (!search) {
+					return null;
+				}
+
+				return search.collectionIds.map((collectionId: string) => this.collections[collectionId]);
+			};
+		},
+		getSearchedWorkflows() {
+			return (query: ITemplatesQuery) => {
+				const searchKey = getSearchKey(query);
+				const search = this.workflowSearches[searchKey];
+				if (!search) {
+					return null;
+				}
+
+				return search.workflowIds.map((workflowId: string) => this.workflows[workflowId]);
+			};
+		},
+		getSearchedWorkflowsTotal() {
+			return (query: ITemplatesQuery) => {
+				const searchKey = getSearchKey(query);
+				const search = this.workflowSearches[searchKey];
+
+				return search ? search.totalWorkflows : 0;
+			};
+		},
+		isSearchLoadingMore() {
+			return (query: ITemplatesQuery) => {
+				const searchKey = getSearchKey(query);
+				const search = this.workflowSearches[searchKey];
+
+				return Boolean(search && search.loadingMore);
+			};
+		},
+		isSearchFinished() {
+			return (query: ITemplatesQuery) => {
+				const searchKey = getSearchKey(query);
+				const search = this.workflowSearches[searchKey];
+
+				return Boolean(
+					search && !search.loadingMore && search.totalWorkflows === search.workflowIds.length,
+				);
+			};
+		},
+		hasCustomTemplatesHost(): boolean {
+			const settingsStore = useSettingsStore();
+			return settingsStore.templatesHost !== TEMPLATES_URLS.DEFAULT_API_HOST;
+		},
+		/**
+		 * Constructs URLSearchParams object based on the default parameters for the template repository
+		 * and provided additional parameters
+		 */
+		websiteTemplateRepositoryParameters() {
+			const rootStore = useRootStore();
+			const userStore = useUsersStore();
+			const workflowsStore = useWorkflowsStore();
+			const defaultParameters: Record<string, string> = {
+				...TEMPLATES_URLS.UTM_QUERY,
+				utm_instance: this.currentN8nPath,
+				utm_n8n_version: rootStore.versionCli,
+				utm_awc: String(workflowsStore.activeWorkflows.length),
+			};
+			const userRole: string | undefined =
+				userStore.currentUserCloudInfo?.role ?? userStore.currentUser?.role;
+			if (userRole) {
+				defaultParameters.utm_user_role = userRole;
+			}
+			return (additionalParameters: Record<string, string> = {}) => {
+				return new URLSearchParams({
+					...defaultParameters,
+					...additionalParameters,
+				});
+			};
+		},
+		/**
+		 * Construct the URL for the template repository on the website
+		 * @returns {string}
+		 */
+		websiteTemplateRepositoryURL(): string {
+			return `${
+				TEMPLATES_URLS.BASE_WEBSITE_URL
+			}?${this.websiteTemplateRepositoryParameters().toString()}`;
+		},
+		/**
+		 * Construct the URL for the template category page on the website for a given category id
+		 */
+		getWebsiteCategoryURL() {
+			return (id: string) => {
+				return `${TEMPLATES_URLS.BASE_WEBSITE_URL}/?${this.websiteTemplateRepositoryParameters({
+					categories: id,
+				}).toString()}`;
+			};
+		},
+	},
+	actions: {
+		addCategories(categories: ITemplatesCategory[]): void {
+			categories.forEach((category: ITemplatesCategory) => {
+				this.categories = {
+					...this.categories,
+					[category.id]: category,
+				};
+			});
+		},
+		addCollections(collections: Array<ITemplatesCollection | ITemplatesCollectionFull>): void {
+			collections.forEach((collection) => {
+				const workflows = (collection.workflows || []).map((workflow) => ({ id: workflow.id }));
+				const cachedCollection = this.collections[collection.id] || {};
+
+				this.collections = {
+					...this.collections,
+					[collection.id]: {
+						...cachedCollection,
+						...collection,
+						workflows,
+					},
+				};
+			});
+		},
+		addWorkflows(workflows: Array<ITemplatesWorkflow | ITemplatesWorkflowFull>): void {
+			workflows.forEach((workflow: ITemplatesWorkflow) => {
+				const cachedWorkflow = this.workflows[workflow.id] || {};
+
+				this.workflows = {
+					...this.workflows,
+					[workflow.id]: {
+						...cachedWorkflow,
+						...workflow,
+					},
+				};
+			});
+		},
+		addCollectionSearch(data: {
+			collections: ITemplatesCollection[];
+			query: ITemplatesQuery;
+		}): void {
+			const collectionIds = data.collections.map((collection) => String(collection.id));
+			const searchKey = getSearchKey(data.query);
+
+			this.collectionSearches = {
+				...this.collectionSearches,
+				[searchKey]: {
+					collectionIds,
+				},
+			};
+		},
+		addWorkflowsSearch(data: {
+			totalWorkflows: number;
+			workflows: ITemplatesWorkflow[];
+			query: ITemplatesQuery;
+		}): void {
+			const workflowIds = data.workflows.map((workflow) => workflow.id);
+			const searchKey = getSearchKey(data.query);
+			const cachedResults = this.workflowSearches[searchKey];
+			if (!cachedResults) {
+				this.workflowSearches = {
+					...this.workflowSearches,
+					[searchKey]: {
+						workflowIds: workflowIds as unknown as string[],
+						totalWorkflows: data.totalWorkflows,
+						categories: this.categories,
+					},
+				};
+
+				return;
+			}
+
+			this.workflowSearches = {
+				...this.workflowSearches,
+				[searchKey]: {
+					workflowIds: [...cachedResults.workflowIds, ...workflowIds] as string[],
+					totalWorkflows: data.totalWorkflows,
+					categories: this.categories,
+				},
+			};
+		},
+		setWorkflowSearchLoading(query: ITemplatesQuery): void {
+			const searchKey = getSearchKey(query);
+			const cachedResults = this.workflowSearches[searchKey];
+			if (!cachedResults) {
+				return;
+			}
+
+			this.workflowSearches[searchKey] = {
+				...this.workflowSearches[searchKey],
+				loadingMore: true,
+			};
+		},
+		setWorkflowSearchLoaded(query: ITemplatesQuery): void {
+			const searchKey = getSearchKey(query);
+			const cachedResults = this.workflowSearches[searchKey];
+			if (!cachedResults) {
+				return;
+			}
+
+			this.workflowSearches[searchKey] = {
+				...this.workflowSearches[searchKey],
+				loadingMore: false,
+			};
+		},
+		resetSessionId(): void {
+			this.previousSessionId = this.currentSessionId;
+			this.currentSessionId = '';
+		},
+		setSessionId(): void {
+			if (!this.currentSessionId) {
+				this.currentSessionId = `templates-${Date.now()}`;
+			}
+		},
+		async fetchTemplateById(templateId: string): Promise<ITemplatesWorkflowFull> {
+			const settingsStore = useSettingsStore();
+			const apiEndpoint: string = settingsStore.templatesHost;
+			const versionCli: string = settingsStore.versionCli;
+			const response = await getTemplateById(apiEndpoint, templateId, {
+				'n8n-version': versionCli,
+			});
+
+			const template: ITemplatesWorkflowFull = {
+				...response.workflow,
+				full: true,
+			};
+			this.addWorkflows([template]);
+
+			return template;
+		},
+		async fetchCollectionById(collectionId: string): Promise<ITemplatesCollection | null> {
+			const settingsStore = useSettingsStore();
+			const apiEndpoint: string = settingsStore.templatesHost;
+			const versionCli: string = settingsStore.versionCli;
+			const response = await getCollectionById(apiEndpoint, collectionId, {
+				'n8n-version': versionCli,
+			});
+			const collection: ITemplatesCollectionFull = {
+				...response.collection,
+				full: true,
+			};
+
+			this.addCollections([collection]);
+			this.addWorkflows(response.collection.workflows);
+			return this.getCollectionById(collectionId);
+		},
+		async getCategories(): Promise<ITemplatesCategory[]> {
+			const cachedCategories = this.allCategories;
+			if (cachedCategories.length) {
+				return cachedCategories;
+			}
+			const settingsStore = useSettingsStore();
+			const apiEndpoint: string = settingsStore.templatesHost;
+			const versionCli: string = settingsStore.versionCli;
+			const response = await getCategories(apiEndpoint, { 'n8n-version': versionCli });
+			const categories = response.categories;
+
+			this.addCategories(categories);
+			return categories;
+		},
+		async getCollections(query: ITemplatesQuery): Promise<ITemplatesCollection[]> {
+			const cachedResults = this.getSearchedCollections(query);
+			if (cachedResults) {
+				return cachedResults;
+			}
+
+			const settingsStore = useSettingsStore();
+			const apiEndpoint: string = settingsStore.templatesHost;
+			const versionCli: string = settingsStore.versionCli;
+			const response = await getCollections(apiEndpoint, query, { 'n8n-version': versionCli });
+			const collections = response.collections;
+
+			this.addCollections(collections);
+			this.addCollectionSearch({ query, collections });
+			collections.forEach((collection) =>
+				this.addWorkflows(collection.workflows as ITemplatesWorkflowFull[]),
+			);
+
+			return collections;
+		},
+		async getWorkflows(query: ITemplatesQuery): Promise<ITemplatesWorkflow[]> {
+			const cachedResults = this.getSearchedWorkflows(query);
+			if (cachedResults) {
+				this.categories = this.workflowSearches[getSearchKey(query)].categories ?? [];
+				return cachedResults;
+			}
+
+			const settingsStore = useSettingsStore();
+			const apiEndpoint: string = settingsStore.templatesHost;
+			const versionCli: string = settingsStore.versionCli;
+
+			const payload = await getWorkflows(
+				apiEndpoint,
+				{ ...query, page: 1, limit: TEMPLATES_PAGE_SIZE },
+				{ 'n8n-version': versionCli },
+			);
+
+			this.addWorkflows(payload.workflows);
+			this.addWorkflowsSearch({ ...payload, query });
+			return this.getSearchedWorkflows(query) || [];
+		},
+		async getMoreWorkflows(query: ITemplatesQuery): Promise<ITemplatesWorkflow[]> {
+			if (this.isSearchLoadingMore(query) && !this.isSearchFinished(query)) {
+				return [];
+			}
+			const cachedResults = this.getSearchedWorkflows(query) || [];
+			const settingsStore = useSettingsStore();
+			const apiEndpoint: string = settingsStore.templatesHost;
+
+			this.setWorkflowSearchLoading(query);
+			try {
+				const payload = await getWorkflows(apiEndpoint, {
+					...query,
+					page: cachedResults.length / TEMPLATES_PAGE_SIZE + 1,
+					limit: TEMPLATES_PAGE_SIZE,
+				});
+
+				this.setWorkflowSearchLoaded(query);
+				this.addWorkflows(payload.workflows);
+				this.addWorkflowsSearch({ ...payload, query });
+
+				return this.getSearchedWorkflows(query) || [];
+			} catch (e) {
+				this.setWorkflowSearchLoaded(query);
+				throw e;
+			}
+		},
+		async getWorkflowTemplate(templateId: string): Promise<IWorkflowTemplate> {
+			const settingsStore = useSettingsStore();
+			const apiEndpoint: string = settingsStore.templatesHost;
+			const versionCli: string = settingsStore.versionCli;
+			return await getWorkflowTemplate(apiEndpoint, templateId, { 'n8n-version': versionCli });
+		},
+
+		async getFixedWorkflowTemplate(templateId: string): Promise<IWorkflowTemplate | undefined> {
+			const template = await this.getWorkflowTemplate(templateId);
+			if (template?.workflow?.nodes) {
+				template.workflow.nodes = getFixedNodesList(template.workflow.nodes) as INodeUi[];
+				template.workflow.nodes?.forEach((node) => {
+					if (node.credentials) {
+						delete node.credentials;
+					}
+				});
+			}
+
+			return template;
+		},
+	},
+});
diff --git a/packages/editor-ui/src/stores/templates.ts b/packages/editor-ui/src/stores/templates.ts
deleted file mode 100644
index 694a5ca284879..0000000000000
--- a/packages/editor-ui/src/stores/templates.ts
+++ /dev/null
@@ -1,310 +0,0 @@
-import { defineStore } from 'pinia';
-import { STORES } from '@/constants';
-import type {
-	ITemplatesCategory,
-	ITemplatesCollection,
-	ITemplatesCollectionFull,
-	ITemplatesQuery,
-	ITemplateState,
-	ITemplatesWorkflow,
-	ITemplatesWorkflowFull,
-	IWorkflowTemplate,
-} from '@/Interface';
-import Vue from 'vue';
-import { useSettingsStore } from './settings';
-import {
-	getCategories,
-	getCollectionById,
-	getCollections,
-	getTemplateById,
-	getWorkflows,
-	getWorkflowTemplate,
-} from '@/api/templates';
-
-const TEMPLATES_PAGE_SIZE = 10;
-
-function getSearchKey(query: ITemplatesQuery): string {
-	return JSON.stringify([query.search || '', [...query.categories].sort()]);
-}
-
-export const useTemplatesStore = defineStore(STORES.TEMPLATES, {
-	state: (): ITemplateState => ({
-		categories: {},
-		collections: {},
-		workflows: {},
-		collectionSearches: {},
-		workflowSearches: {},
-		currentSessionId: '',
-		previousSessionId: '',
-	}),
-	getters: {
-		allCategories(): ITemplatesCategory[] {
-			return Object.values(this.categories).sort((a: ITemplatesCategory, b: ITemplatesCategory) =>
-				a.name > b.name ? 1 : -1,
-			);
-		},
-		getTemplateById() {
-			return (id: string): null | ITemplatesWorkflow => this.workflows[id];
-		},
-		getCollectionById() {
-			return (id: string): null | ITemplatesCollection => this.collections[id];
-		},
-		getCategoryById() {
-			return (id: string): null | ITemplatesCategory => this.categories[id];
-		},
-		getSearchedCollections() {
-			return (query: ITemplatesQuery) => {
-				const searchKey = getSearchKey(query);
-				const search = this.collectionSearches[searchKey];
-				if (!search) {
-					return null;
-				}
-
-				return search.collectionIds.map((collectionId: string) => this.collections[collectionId]);
-			};
-		},
-		getSearchedWorkflows() {
-			return (query: ITemplatesQuery) => {
-				const searchKey = getSearchKey(query);
-				const search = this.workflowSearches[searchKey];
-				if (!search) {
-					return null;
-				}
-
-				return search.workflowIds.map((workflowId: string) => this.workflows[workflowId]);
-			};
-		},
-		getSearchedWorkflowsTotal() {
-			return (query: ITemplatesQuery) => {
-				const searchKey = getSearchKey(query);
-				const search = this.workflowSearches[searchKey];
-
-				return search ? search.totalWorkflows : 0;
-			};
-		},
-		isSearchLoadingMore() {
-			return (query: ITemplatesQuery) => {
-				const searchKey = getSearchKey(query);
-				const search = this.workflowSearches[searchKey];
-
-				return Boolean(search && search.loadingMore);
-			};
-		},
-		isSearchFinished() {
-			return (query: ITemplatesQuery) => {
-				const searchKey = getSearchKey(query);
-				const search = this.workflowSearches[searchKey];
-
-				return Boolean(
-					search && !search.loadingMore && search.totalWorkflows === search.workflowIds.length,
-				);
-			};
-		},
-	},
-	actions: {
-		addCategories(categories: ITemplatesCategory[]): void {
-			categories.forEach((category: ITemplatesCategory) => {
-				Vue.set(this.categories, category.id, category);
-			});
-		},
-		addCollections(collections: Array<ITemplatesCollection | ITemplatesCollectionFull>): void {
-			collections.forEach((collection) => {
-				const workflows = (collection.workflows || []).map((workflow) => ({ id: workflow.id }));
-				const cachedCollection = this.collections[collection.id] || {};
-				Vue.set(this.collections, collection.id, {
-					...cachedCollection,
-					...collection,
-					workflows,
-				});
-			});
-		},
-		addWorkflows(workflows: Array<ITemplatesWorkflow | ITemplatesWorkflowFull>): void {
-			workflows.forEach((workflow: ITemplatesWorkflow) => {
-				const cachedWorkflow = this.workflows[workflow.id] || {};
-				Vue.set(this.workflows, workflow.id, {
-					...cachedWorkflow,
-					...workflow,
-				});
-			});
-		},
-		addCollectionSearch(data: {
-			collections: ITemplatesCollection[];
-			query: ITemplatesQuery;
-		}): void {
-			const collectionIds = data.collections.map((collection) => collection.id);
-			const searchKey = getSearchKey(data.query);
-			Vue.set(this.collectionSearches, searchKey, {
-				collectionIds,
-			});
-		},
-		addWorkflowsSearch(data: {
-			totalWorkflows: number;
-			workflows: ITemplatesWorkflow[];
-			query: ITemplatesQuery;
-		}): void {
-			const workflowIds = data.workflows.map((workflow) => workflow.id);
-			const searchKey = getSearchKey(data.query);
-			const cachedResults = this.workflowSearches[searchKey];
-			if (!cachedResults) {
-				Vue.set(this.workflowSearches, searchKey, {
-					workflowIds,
-					totalWorkflows: data.totalWorkflows,
-				});
-
-				return;
-			}
-
-			Vue.set(this.workflowSearches, searchKey, {
-				workflowIds: [...cachedResults.workflowIds, ...workflowIds],
-				totalWorkflows: data.totalWorkflows,
-			});
-		},
-		setWorkflowSearchLoading(query: ITemplatesQuery): void {
-			const searchKey = getSearchKey(query);
-			const cachedResults = this.workflowSearches[searchKey];
-			if (!cachedResults) {
-				return;
-			}
-
-			Vue.set(this.workflowSearches[searchKey], 'loadingMore', true);
-		},
-		setWorkflowSearchLoaded(query: ITemplatesQuery): void {
-			const searchKey = getSearchKey(query);
-			const cachedResults = this.workflowSearches[searchKey];
-			if (!cachedResults) {
-				return;
-			}
-
-			Vue.set(this.workflowSearches[searchKey], 'loadingMore', false);
-		},
-		resetSessionId(): void {
-			this.previousSessionId = this.currentSessionId;
-			this.currentSessionId = '';
-		},
-		setSessionId(): void {
-			if (!this.currentSessionId) {
-				this.currentSessionId = `templates-${Date.now()}`;
-			}
-		},
-		async fetchTemplateById(
-			templateId: string,
-		): Promise<ITemplatesWorkflow | ITemplatesWorkflowFull> {
-			const settingsStore = useSettingsStore();
-			const apiEndpoint: string = settingsStore.templatesHost;
-			const versionCli: string = settingsStore.versionCli;
-			const response = await getTemplateById(apiEndpoint, templateId, {
-				'n8n-version': versionCli,
-			});
-
-			const template: ITemplatesWorkflowFull = {
-				...response.workflow,
-				full: true,
-			};
-			this.addWorkflows([template]);
-
-			return template;
-		},
-		async fetchCollectionById(collectionId: string): Promise<ITemplatesCollection | null> {
-			const settingsStore = useSettingsStore();
-			const apiEndpoint: string = settingsStore.templatesHost;
-			const versionCli: string = settingsStore.versionCli;
-			const response = await getCollectionById(apiEndpoint, collectionId, {
-				'n8n-version': versionCli,
-			});
-			const collection: ITemplatesCollectionFull = {
-				...response.collection,
-				full: true,
-			};
-
-			this.addCollections([collection]);
-			this.addWorkflows(response.collection.workflows);
-			return this.getCollectionById(collectionId);
-		},
-		async getCategories(): Promise<ITemplatesCategory[]> {
-			const cachedCategories = this.allCategories;
-			if (cachedCategories.length) {
-				return cachedCategories;
-			}
-			const settingsStore = useSettingsStore();
-			const apiEndpoint: string = settingsStore.templatesHost;
-			const versionCli: string = settingsStore.versionCli;
-			const response = await getCategories(apiEndpoint, { 'n8n-version': versionCli });
-			const categories = response.categories;
-
-			this.addCategories(categories);
-			return categories;
-		},
-		async getCollections(query: ITemplatesQuery): Promise<ITemplatesCollection[]> {
-			const cachedResults = this.getSearchedCollections(query);
-			if (cachedResults) {
-				return cachedResults;
-			}
-
-			const settingsStore = useSettingsStore();
-			const apiEndpoint: string = settingsStore.templatesHost;
-			const versionCli: string = settingsStore.versionCli;
-			const response = await getCollections(apiEndpoint, query, { 'n8n-version': versionCli });
-			const collections = response.collections;
-
-			this.addCollections(collections);
-			this.addCollectionSearch({ query, collections });
-			collections.forEach((collection) =>
-				this.addWorkflows(collection.workflows as ITemplatesWorkflowFull[]),
-			);
-
-			return collections;
-		},
-		async getWorkflows(query: ITemplatesQuery): Promise<ITemplatesWorkflow[]> {
-			const cachedResults = this.getSearchedWorkflows(query);
-			if (cachedResults) {
-				return cachedResults;
-			}
-
-			const settingsStore = useSettingsStore();
-			const apiEndpoint: string = settingsStore.templatesHost;
-			const versionCli: string = settingsStore.versionCli;
-
-			const payload = await getWorkflows(
-				apiEndpoint,
-				{ ...query, skip: 0, limit: TEMPLATES_PAGE_SIZE },
-				{ 'n8n-version': versionCli },
-			);
-
-			this.addWorkflows(payload.workflows);
-			this.addWorkflowsSearch({ ...payload, query });
-			return this.getSearchedWorkflows(query) || [];
-		},
-		async getMoreWorkflows(query: ITemplatesQuery): Promise<ITemplatesWorkflow[]> {
-			if (this.isSearchLoadingMore(query) && !this.isSearchFinished(query)) {
-				return [];
-			}
-			const cachedResults = this.getSearchedWorkflows(query) || [];
-			const settingsStore = useSettingsStore();
-			const apiEndpoint: string = settingsStore.templatesHost;
-
-			this.setWorkflowSearchLoading(query);
-			try {
-				const payload = await getWorkflows(apiEndpoint, {
-					...query,
-					skip: cachedResults.length,
-					limit: TEMPLATES_PAGE_SIZE,
-				});
-
-				this.setWorkflowSearchLoaded(query);
-				this.addWorkflows(payload.workflows);
-				this.addWorkflowsSearch({ ...payload, query });
-
-				return this.getSearchedWorkflows(query) || [];
-			} catch (e) {
-				this.setWorkflowSearchLoaded(query);
-				throw e;
-			}
-		},
-		async getWorkflowTemplate(templateId: string): Promise<IWorkflowTemplate> {
-			const settingsStore = useSettingsStore();
-			const apiEndpoint: string = settingsStore.templatesHost;
-			const versionCli: string = settingsStore.versionCli;
-			return await getWorkflowTemplate(apiEndpoint, templateId, { 'n8n-version': versionCli });
-		},
-	},
-});
diff --git a/packages/editor-ui/src/stores/ui.store.ts b/packages/editor-ui/src/stores/ui.store.ts
new file mode 100644
index 0000000000000..e0b3dd2652e0f
--- /dev/null
+++ b/packages/editor-ui/src/stores/ui.store.ts
@@ -0,0 +1,684 @@
+import {
+	applyForOnboardingCall,
+	fetchNextOnboardingPrompt,
+	submitEmailOnSignup,
+} from '@/api/workflow-webhooks';
+import {
+	ABOUT_MODAL_KEY,
+	CHAT_EMBED_MODAL_KEY,
+	CHANGE_PASSWORD_MODAL_KEY,
+	COMMUNITY_PACKAGE_CONFIRM_MODAL_KEY,
+	COMMUNITY_PACKAGE_INSTALL_MODAL_KEY,
+	COMMUNITY_PACKAGE_MANAGE_ACTIONS,
+	CONTACT_PROMPT_MODAL_KEY,
+	CREDENTIAL_EDIT_MODAL_KEY,
+	CREDENTIAL_SELECT_MODAL_KEY,
+	DELETE_USER_MODAL_KEY,
+	DUPLICATE_MODAL_KEY,
+	FAKE_DOOR_FEATURES,
+	IMPORT_CURL_MODAL_KEY,
+	INVITE_USER_MODAL_KEY,
+	LOG_STREAM_MODAL_KEY,
+	MFA_SETUP_MODAL_KEY,
+	ONBOARDING_CALL_SIGNUP_MODAL_KEY,
+	PERSONALIZATION_MODAL_KEY,
+	STORES,
+	TAGS_MANAGER_MODAL_KEY,
+	VALUE_SURVEY_MODAL_KEY,
+	VERSIONS_MODAL_KEY,
+	VIEWS,
+	WORKFLOW_ACTIVE_MODAL_KEY,
+	WORKFLOW_LM_CHAT_MODAL_KEY,
+	WORKFLOW_SETTINGS_MODAL_KEY,
+	WORKFLOW_SHARE_MODAL_KEY,
+	EXTERNAL_SECRETS_PROVIDER_MODAL_KEY,
+	SOURCE_CONTROL_PUSH_MODAL_KEY,
+	SOURCE_CONTROL_PULL_MODAL_KEY,
+	DEBUG_PAYWALL_MODAL_KEY,
+	N8N_PRICING_PAGE_URL,
+	WORKFLOW_HISTORY_VERSION_RESTORE,
+	SUGGESTED_TEMPLATES_PREVIEW_MODAL_KEY,
+	SETUP_CREDENTIALS_MODAL_KEY,
+	GENERATE_CURL_MODAL_KEY,
+	ADD_TEST_SUITE_MODAL_KEY,
+	EDIT_TEST_SUITE_MODAL_KEY,
+} from '@/constants';
+import type {
+	CloudUpdateLinkSourceType,
+	CurlToJSONResponse,
+	IFakeDoorLocation,
+	INodeUi,
+	IOnboardingCallPrompt,
+	UIState,
+	UTMCampaign,
+	XYPosition,
+	Modals,
+	NewCredentialsModal,
+	ThemeOption,
+	AppliedThemeOption,
+	SuggestedTemplates,
+	NotificationOptions,
+	ModalState,
+} from '@/Interface';
+import { defineStore } from 'pinia';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import { getCurlToJson } from '@/api/curlHelper';
+import { useCloudPlanStore } from '@/stores/cloudPlan.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useSettingsStore } from '@/stores/settings.store';
+import { hasPermission } from '@/rbac/permissions';
+import { useTelemetryStore } from '@/stores/telemetry.store';
+import { useUsersStore } from '@/stores/users.store';
+import { dismissBannerPermanently } from '@/api/ui';
+import type { BannerName } from 'n8n-workflow';
+import {
+	addThemeToBody,
+	getPreferredTheme,
+	getThemeOverride,
+	isValidTheme,
+	updateTheme,
+} from './ui.utils';
+
+let savedTheme: ThemeOption = 'system';
+try {
+	const value = getThemeOverride();
+	if (isValidTheme(value)) {
+		savedTheme = value;
+		addThemeToBody(value);
+	}
+} catch (e) {}
+
+export type UiStore = ReturnType<typeof useUIStore>;
+
+export const useUIStore = defineStore(STORES.UI, {
+	state: (): UIState => ({
+		activeActions: [],
+		activeCredentialType: null,
+		theme: savedTheme,
+		modals: {
+			...Object.fromEntries(
+				[
+					ABOUT_MODAL_KEY,
+					CHAT_EMBED_MODAL_KEY,
+					CHANGE_PASSWORD_MODAL_KEY,
+					CONTACT_PROMPT_MODAL_KEY,
+					CREDENTIAL_SELECT_MODAL_KEY,
+					DUPLICATE_MODAL_KEY,
+					ONBOARDING_CALL_SIGNUP_MODAL_KEY,
+					PERSONALIZATION_MODAL_KEY,
+					INVITE_USER_MODAL_KEY,
+					TAGS_MANAGER_MODAL_KEY,
+					VALUE_SURVEY_MODAL_KEY,
+					VERSIONS_MODAL_KEY,
+					WORKFLOW_LM_CHAT_MODAL_KEY,
+					WORKFLOW_SETTINGS_MODAL_KEY,
+					WORKFLOW_SHARE_MODAL_KEY,
+					WORKFLOW_ACTIVE_MODAL_KEY,
+					COMMUNITY_PACKAGE_INSTALL_MODAL_KEY,
+					MFA_SETUP_MODAL_KEY,
+					SOURCE_CONTROL_PUSH_MODAL_KEY,
+					SOURCE_CONTROL_PULL_MODAL_KEY,
+					EXTERNAL_SECRETS_PROVIDER_MODAL_KEY,
+					DEBUG_PAYWALL_MODAL_KEY,
+					WORKFLOW_HISTORY_VERSION_RESTORE,
+					SUGGESTED_TEMPLATES_PREVIEW_MODAL_KEY,
+					SETUP_CREDENTIALS_MODAL_KEY,
+					ADD_TEST_SUITE_MODAL_KEY,
+					EDIT_TEST_SUITE_MODAL_KEY,
+				].map((modalKey) => [modalKey, { open: false }]),
+			),
+			[DELETE_USER_MODAL_KEY]: {
+				open: false,
+				activeId: null,
+			},
+			[COMMUNITY_PACKAGE_CONFIRM_MODAL_KEY]: {
+				open: false,
+				mode: '',
+				activeId: null,
+			},
+			[ADD_TEST_SUITE_MODAL_KEY]: {
+				open: false,
+			},
+			[EDIT_TEST_SUITE_MODAL_KEY]: {
+				open: false,
+			},
+			[IMPORT_CURL_MODAL_KEY]: {
+				open: false,
+				data: {
+					curlCommand: '',
+				},
+			},
+			[GENERATE_CURL_MODAL_KEY]: {
+				open: false,
+				data: {
+					service: '',
+					request: '',
+				},
+			},
+			[LOG_STREAM_MODAL_KEY]: {
+				open: false,
+				data: undefined,
+			},
+			[CREDENTIAL_EDIT_MODAL_KEY]: {
+				open: false,
+				mode: '',
+				activeId: null,
+				showAuthSelector: false,
+			} as ModalState,
+		},
+		modalStack: [],
+		sidebarMenuCollapsed: true,
+		isPageLoading: true,
+		currentView: '',
+		mainPanelPosition: 0.5,
+		fakeDoorFeatures: [
+			{
+				id: FAKE_DOOR_FEATURES.SSO,
+				featureName: 'fakeDoor.settings.sso.name',
+				icon: 'key',
+				actionBoxTitle: 'fakeDoor.settings.sso.actionBox.title',
+				actionBoxDescription: 'fakeDoor.settings.sso.actionBox.description',
+				linkURL: 'https://n8n-community.typeform.com/to/l7QOrERN#f=sso',
+				uiLocations: ['settings/users'],
+			},
+		],
+		draggable: {
+			isDragging: false,
+			type: '',
+			data: '',
+			canDrop: false,
+			stickyPosition: null,
+		},
+		stateIsDirty: false,
+		lastSelectedNode: null,
+		lastSelectedNodeOutputIndex: null,
+		lastSelectedNodeEndpointUuid: null,
+		nodeViewOffsetPosition: [0, 0],
+		nodeViewMoveInProgress: false,
+		selectedNodes: [],
+		nodeViewInitialized: false,
+		addFirstStepOnLoad: false,
+		bannersHeight: 0,
+		bannerStack: [],
+		suggestedTemplates: undefined,
+		// Notifications that should show when a view is initialized
+		// This enables us to set a queue of notifications form outside (another component)
+		// and then show them when the view is initialized
+		pendingNotificationsForViews: {},
+	}),
+	getters: {
+		appliedTheme(): AppliedThemeOption {
+			return this.theme === 'system' ? getPreferredTheme() : this.theme;
+		},
+		logo(): string {
+			const { releaseChannel } = useSettingsStore().settings;
+			const suffix = this.appliedTheme === 'dark' ? '-dark.svg' : '.svg';
+			return `static/logo/${
+				releaseChannel === 'stable' ? 'expanded' : `channel/${releaseChannel}`
+			}${suffix}`;
+		},
+		contextBasedTranslationKeys() {
+			const settingsStore = useSettingsStore();
+			const deploymentType = settingsStore.deploymentType;
+
+			let contextKey = '';
+			if (deploymentType === 'cloud') {
+				contextKey = '.cloud';
+			} else if (deploymentType === 'desktop_mac' || deploymentType === 'desktop_win') {
+				contextKey = '.desktop';
+			}
+
+			return {
+				feature: {
+					unavailable: {
+						title: `contextual.feature.unavailable.title${contextKey}`,
+					},
+				},
+				credentials: {
+					sharing: {
+						unavailable: {
+							title: `contextual.credentials.sharing.unavailable.title${contextKey}`,
+							description: `contextual.credentials.sharing.unavailable.description${contextKey}`,
+							action: `contextual.credentials.sharing.unavailable.action${contextKey}`,
+							button: `contextual.credentials.sharing.unavailable.button${contextKey}`,
+						},
+					},
+				},
+				workflows: {
+					sharing: {
+						title: 'contextual.workflows.sharing.title',
+						unavailable: {
+							title: `contextual.workflows.sharing.unavailable.title${contextKey}`,
+							description: {
+								modal: `contextual.workflows.sharing.unavailable.description.modal${contextKey}`,
+								tooltip: `contextual.workflows.sharing.unavailable.description.tooltip${contextKey}`,
+							},
+							action: `contextual.workflows.sharing.unavailable.action${contextKey}`,
+							button: `contextual.workflows.sharing.unavailable.button${contextKey}`,
+						},
+					},
+				},
+				variables: {
+					unavailable: {
+						title: `contextual.variables.unavailable.title${contextKey}`,
+						description: 'contextual.variables.unavailable.description',
+						action: `contextual.variables.unavailable.action${contextKey}`,
+						button: `contextual.variables.unavailable.button${contextKey}`,
+					},
+				},
+				users: {
+					settings: {
+						unavailable: {
+							title: `contextual.users.settings.unavailable.title${contextKey}`,
+							description: `contextual.users.settings.unavailable.description${contextKey}`,
+							button: `contextual.users.settings.unavailable.button${contextKey}`,
+						},
+					},
+				},
+			};
+		},
+		getLastSelectedNode(): INodeUi | null {
+			const workflowsStore = useWorkflowsStore();
+			if (this.lastSelectedNode) {
+				return workflowsStore.getNodeByName(this.lastSelectedNode);
+			}
+			return null;
+		},
+		areExpressionsDisabled(): boolean {
+			return this.currentView === VIEWS.DEMO;
+		},
+		isVersionsOpen(): boolean {
+			return this.modals[VERSIONS_MODAL_KEY].open;
+		},
+		isModalOpen() {
+			return (name: string) => this.modals[name].open;
+		},
+		isModalActive() {
+			return (name: string) => this.modalStack.length > 0 && name === this.modalStack[0];
+		},
+		getModalActiveId() {
+			return (name: string) => this.modals[name].activeId;
+		},
+		getModalMode() {
+			return (name: string) => this.modals[name].mode;
+		},
+		getModalData() {
+			return (name: string) => this.modals[name].data;
+		},
+		getFakeDoorByLocation() {
+			return (location: IFakeDoorLocation) =>
+				this.fakeDoorFeatures.filter((fakeDoor) => fakeDoor.uiLocations.includes(location));
+		},
+		getFakeDoorById() {
+			return (id: string) =>
+				this.fakeDoorFeatures.find((fakeDoor) => fakeDoor.id.toString() === id);
+		},
+		isReadOnlyView(): boolean {
+			return ![VIEWS.WORKFLOW, VIEWS.NEW_WORKFLOW, VIEWS.EXECUTION_DEBUG].includes(
+				this.currentView as VIEWS,
+			);
+		},
+		isNodeView(): boolean {
+			return [
+				VIEWS.NEW_WORKFLOW.toString(),
+				VIEWS.WORKFLOW.toString(),
+				VIEWS.WORKFLOW_EXECUTIONS.toString(),
+			].includes(this.currentView);
+		},
+		isActionActive() {
+			return (action: string) => this.activeActions.includes(action);
+		},
+		getSelectedNodes(): INodeUi[] {
+			const seen = new Set();
+			return this.selectedNodes.filter((node: INodeUi) => {
+				// dedupe for instances when same node is selected in different ways
+				if (!seen.has(node.id)) {
+					seen.add(node.id);
+					return true;
+				}
+				return false;
+			});
+		},
+		isNodeSelected() {
+			return (nodeName: string): boolean => {
+				let index;
+				for (index in this.selectedNodes) {
+					if (this.selectedNodes[index].name === nodeName) {
+						return true;
+					}
+				}
+				return false;
+			};
+		},
+		upgradeLinkUrl() {
+			return async (source: string, utm_campaign: string, deploymentType: string) => {
+				let linkUrl = '';
+
+				const searchParams = new URLSearchParams();
+
+				if (deploymentType === 'cloud' && hasPermission(['instanceOwner'])) {
+					const adminPanelHost = new URL(window.location.href).host.split('.').slice(1).join('.');
+					const { code } = await useCloudPlanStore().getAutoLoginCode();
+					linkUrl = `https://${adminPanelHost}/login`;
+					searchParams.set('code', code);
+					searchParams.set('returnPath', '/account/change-plan');
+				} else {
+					linkUrl = N8N_PRICING_PAGE_URL;
+				}
+
+				if (utm_campaign) {
+					searchParams.set('utm_campaign', utm_campaign);
+				}
+
+				if (source) {
+					searchParams.set('source', source);
+				}
+				return `${linkUrl}?${searchParams.toString()}`;
+			};
+		},
+		headerHeight() {
+			const style = getComputedStyle(document.body);
+			return Number(style.getPropertyValue('--header-height'));
+		},
+		isAnyModalOpen(): boolean {
+			return this.modalStack.length > 0;
+		},
+	},
+	actions: {
+		setTheme(theme: ThemeOption): void {
+			this.theme = theme;
+			updateTheme(theme);
+		},
+		setMode(name: keyof Modals, mode: string): void {
+			this.modals[name] = {
+				...this.modals[name],
+				mode,
+			};
+		},
+		setActiveId(name: keyof Modals, activeId: string): void {
+			this.modals[name] = {
+				...this.modals[name],
+				activeId,
+			};
+		},
+		setShowAuthSelector(name: keyof Modals, showAuthSelector: boolean) {
+			this.modals[name] = {
+				...this.modals[name],
+				showAuthSelector,
+			} as NewCredentialsModal;
+		},
+		setModalData(payload: { name: keyof Modals; data: Record<string, unknown> }) {
+			this.modals[payload.name] = {
+				...this.modals[payload.name],
+				data: payload.data,
+			};
+		},
+		openModal(name: keyof Modals): void {
+			this.modals[name] = {
+				...this.modals[name],
+				open: true,
+			};
+			this.modalStack = [name].concat(this.modalStack) as string[];
+		},
+		openModalWithData(payload: { name: keyof Modals; data: Record<string, unknown> }): void {
+			this.setModalData(payload);
+			this.openModal(payload.name);
+		},
+		closeModal(name: keyof Modals): void {
+			this.modals[name] = {
+				...this.modals[name],
+				open: false,
+			};
+			this.modalStack = this.modalStack.filter((openModalName: string) => {
+				return name !== openModalName;
+			});
+		},
+		draggableStartDragging(type: string, data: string): void {
+			this.draggable = {
+				isDragging: true,
+				type,
+				data,
+				canDrop: false,
+				stickyPosition: null,
+			};
+		},
+		draggableStopDragging(): void {
+			this.draggable = {
+				isDragging: false,
+				type: '',
+				data: '',
+				canDrop: false,
+				stickyPosition: null,
+			};
+		},
+		setDraggableStickyPos(position: XYPosition): void {
+			this.draggable = {
+				...this.draggable,
+				stickyPosition: position,
+			};
+		},
+		setDraggableCanDrop(canDrop: boolean): void {
+			this.draggable = {
+				...this.draggable,
+				canDrop,
+			};
+		},
+		openDeleteUserModal(id: string): void {
+			this.setActiveId(DELETE_USER_MODAL_KEY, id);
+			this.openModal(DELETE_USER_MODAL_KEY);
+		},
+		openExistingCredential(id: string): void {
+			this.setActiveId(CREDENTIAL_EDIT_MODAL_KEY, id);
+			this.setMode(CREDENTIAL_EDIT_MODAL_KEY, 'edit');
+			this.openModal(CREDENTIAL_EDIT_MODAL_KEY);
+		},
+		openNewCredential(type: string, showAuthOptions = false): void {
+			this.setActiveId(CREDENTIAL_EDIT_MODAL_KEY, type);
+			this.setShowAuthSelector(CREDENTIAL_EDIT_MODAL_KEY, showAuthOptions);
+			this.setMode(CREDENTIAL_EDIT_MODAL_KEY, 'new');
+			this.openModal(CREDENTIAL_EDIT_MODAL_KEY);
+		},
+		async getNextOnboardingPrompt(): Promise<IOnboardingCallPrompt | null> {
+			const rootStore = useRootStore();
+			const instanceId = rootStore.instanceId;
+			const { currentUser } = useUsersStore();
+			if (currentUser) {
+				return await fetchNextOnboardingPrompt(instanceId, currentUser);
+			}
+			return null;
+		},
+		async applyForOnboardingCall(email: string): Promise<string | null> {
+			const rootStore = useRootStore();
+			const instanceId = rootStore.instanceId;
+			const { currentUser } = useUsersStore();
+			if (currentUser) {
+				return await applyForOnboardingCall(instanceId, currentUser, email);
+			}
+			return null;
+		},
+		async submitContactEmail(email: string, agree: boolean): Promise<string | null> {
+			const rootStore = useRootStore();
+			const instanceId = rootStore.instanceId;
+			const { currentUser } = useUsersStore();
+			if (currentUser) {
+				return await submitEmailOnSignup(
+					instanceId,
+					currentUser,
+					email ?? currentUser?.email,
+					agree,
+				);
+			}
+			return null;
+		},
+		openCommunityPackageUninstallConfirmModal(packageName: string) {
+			this.setActiveId(COMMUNITY_PACKAGE_CONFIRM_MODAL_KEY, packageName);
+			this.setMode(COMMUNITY_PACKAGE_CONFIRM_MODAL_KEY, COMMUNITY_PACKAGE_MANAGE_ACTIONS.UNINSTALL);
+			this.openModal(COMMUNITY_PACKAGE_CONFIRM_MODAL_KEY);
+		},
+		openCommunityPackageUpdateConfirmModal(packageName: string) {
+			this.setActiveId(COMMUNITY_PACKAGE_CONFIRM_MODAL_KEY, packageName);
+			this.setMode(COMMUNITY_PACKAGE_CONFIRM_MODAL_KEY, COMMUNITY_PACKAGE_MANAGE_ACTIONS.UPDATE);
+			this.openModal(COMMUNITY_PACKAGE_CONFIRM_MODAL_KEY);
+		},
+		addActiveAction(action: string): void {
+			if (!this.activeActions.includes(action)) {
+				this.activeActions.push(action);
+			}
+		},
+		removeActiveAction(action: string): void {
+			const actionIndex = this.activeActions.indexOf(action);
+			if (actionIndex !== -1) {
+				this.activeActions.splice(actionIndex, 1);
+			}
+		},
+		addSelectedNode(node: INodeUi): void {
+			const isAlreadySelected = this.selectedNodes.some((n) => n.name === node.name);
+			if (!isAlreadySelected) {
+				this.selectedNodes.push(node);
+			}
+		},
+		removeNodeFromSelection(node: INodeUi): void {
+			let index;
+			for (index in this.selectedNodes) {
+				if (this.selectedNodes[index].name === node.name) {
+					this.selectedNodes.splice(parseInt(index, 10), 1);
+					break;
+				}
+			}
+		},
+		resetSelectedNodes(): void {
+			this.selectedNodes = [];
+		},
+		setCurlCommand(payload: { name: string; command: string }): void {
+			this.modals[payload.name] = {
+				...this.modals[payload.name],
+				curlCommand: payload.command,
+			};
+		},
+		toggleSidebarMenuCollapse(): void {
+			this.sidebarMenuCollapsed = !this.sidebarMenuCollapsed;
+		},
+		async getCurlToJson(curlCommand: string): Promise<CurlToJSONResponse> {
+			const rootStore = useRootStore();
+			const parameters = await getCurlToJson(rootStore.getRestApiContext, curlCommand);
+
+			// Normalize placeholder values
+			if (parameters['parameters.url']) {
+				parameters['parameters.url'] = parameters['parameters.url']
+					.replaceAll('%7B', '{')
+					.replaceAll('%7D', '}');
+			}
+
+			return parameters;
+		},
+		async goToUpgrade(
+			source: CloudUpdateLinkSourceType,
+			utm_campaign: UTMCampaign,
+			mode: 'open' | 'redirect' = 'open',
+		): Promise<void> {
+			const { usageLeft, trialDaysLeft, userIsTrialing } = useCloudPlanStore();
+			const { executionsLeft, workflowsLeft } = usageLeft;
+			const deploymentType = useSettingsStore().deploymentType;
+
+			useTelemetryStore().track('User clicked upgrade CTA', {
+				source,
+				isTrial: userIsTrialing,
+				deploymentType,
+				trialDaysLeft,
+				executionsLeft,
+				workflowsLeft,
+			});
+
+			const upgradeLink = await this.upgradeLinkUrl(source, utm_campaign, deploymentType);
+
+			if (mode === 'open') {
+				window.open(upgradeLink, '_blank');
+			} else {
+				location.href = upgradeLink;
+			}
+		},
+		async dismissBanner(
+			name: BannerName,
+			type: 'temporary' | 'permanent' = 'temporary',
+		): Promise<void> {
+			if (type === 'permanent') {
+				await dismissBannerPermanently(useRootStore().getRestApiContext, {
+					bannerName: name,
+					dismissedBanners: useSettingsStore().permanentlyDismissedBanners,
+				});
+				this.removeBannerFromStack(name);
+				return;
+			}
+			this.removeBannerFromStack(name);
+		},
+		updateBannersHeight(newHeight: number): void {
+			this.bannersHeight = newHeight;
+		},
+		pushBannerToStack(name: BannerName) {
+			if (this.bannerStack.includes(name)) return;
+			this.bannerStack.push(name);
+		},
+		removeBannerFromStack(name: BannerName) {
+			this.bannerStack = this.bannerStack.filter((bannerName) => bannerName !== name);
+		},
+		clearBannerStack() {
+			this.bannerStack = [];
+		},
+		setSuggestedTemplates(templates: SuggestedTemplates) {
+			this.suggestedTemplates = templates;
+		},
+		deleteSuggestedTemplates() {
+			this.suggestedTemplates = undefined;
+		},
+		getNotificationsForView(view: VIEWS): NotificationOptions[] {
+			return this.pendingNotificationsForViews[view] ?? [];
+		},
+		setNotificationsForView(view: VIEWS, notifications: NotificationOptions[]) {
+			this.pendingNotificationsForViews[view] = notifications;
+		},
+		deleteNotificationsForView(view: VIEWS) {
+			delete this.pendingNotificationsForViews[view];
+		},
+	},
+});
+
+/**
+ * Helper function for listening to credential changes in the store
+ */
+export const listenForModalChanges = (opts: {
+	store: UiStore;
+	onModalOpened?: (name: keyof Modals) => void;
+	onModalClosed?: (name: keyof Modals) => void;
+}) => {
+	const { store, onModalClosed, onModalOpened } = opts;
+	const listeningForActions = ['openModal', 'openModalWithData', 'closeModal'];
+
+	return store.$onAction((result) => {
+		const { name, after, args } = result;
+		after(async () => {
+			if (!listeningForActions.includes(name)) {
+				return;
+			}
+
+			switch (name) {
+				case 'openModal': {
+					const modalName = args[0];
+					onModalOpened?.(modalName);
+					break;
+				}
+
+				case 'openModalWithData': {
+					const { name: modalName } = args[0] ?? {};
+					onModalOpened?.(modalName);
+					break;
+				}
+
+				case 'closeModal': {
+					const modalName = args[0];
+					onModalClosed?.(modalName);
+					break;
+				}
+			}
+		});
+	});
+};
diff --git a/packages/editor-ui/src/stores/ui.ts b/packages/editor-ui/src/stores/ui.ts
deleted file mode 100644
index cc9ce72dccca3..0000000000000
--- a/packages/editor-ui/src/stores/ui.ts
+++ /dev/null
@@ -1,486 +0,0 @@
-import {
-	applyForOnboardingCall,
-	fetchNextOnboardingPrompt,
-	submitEmailOnSignup,
-} from '@/api/workflow-webhooks';
-import {
-	ABOUT_MODAL_KEY,
-	ASK_AI_MODAL_KEY,
-	CHANGE_PASSWORD_MODAL_KEY,
-	COMMUNITY_PACKAGE_CONFIRM_MODAL_KEY,
-	COMMUNITY_PACKAGE_INSTALL_MODAL_KEY,
-	COMMUNITY_PACKAGE_MANAGE_ACTIONS,
-	CONTACT_PROMPT_MODAL_KEY,
-	CREDENTIAL_EDIT_MODAL_KEY,
-	CREDENTIAL_SELECT_MODAL_KEY,
-	DELETE_USER_MODAL_KEY,
-	DUPLICATE_MODAL_KEY,
-	EXECUTIONS_MODAL_KEY,
-	FAKE_DOOR_FEATURES,
-	IMPORT_CURL_MODAL_KEY,
-	INVITE_USER_MODAL_KEY,
-	LOG_STREAM_MODAL_KEY,
-	ONBOARDING_CALL_SIGNUP_MODAL_KEY,
-	PERSONALIZATION_MODAL_KEY,
-	STORES,
-	TAGS_MANAGER_MODAL_KEY,
-	VALUE_SURVEY_MODAL_KEY,
-	VERSIONS_MODAL_KEY,
-	VIEWS,
-	WORKFLOW_ACTIVE_MODAL_KEY,
-	WORKFLOW_SETTINGS_MODAL_KEY,
-	WORKFLOW_SHARE_MODAL_KEY,
-	USER_ACTIVATION_SURVEY_MODAL,
-} from '@/constants';
-import type {
-	CurlToJSONResponse,
-	IFakeDoorLocation,
-	IMenuItem,
-	INodeUi,
-	IOnboardingCallPrompt,
-	IUser,
-	UIState,
-	XYPosition,
-} from '@/Interface';
-import Vue from 'vue';
-import { defineStore } from 'pinia';
-import { useRootStore } from './n8nRootStore';
-import { getCurlToJson } from '@/api/curlHelper';
-import { useWorkflowsStore } from './workflows';
-import { useSettingsStore } from './settings';
-import { useUsageStore } from './usage';
-import type { BaseTextKey } from '@/plugins/i18n';
-import { i18n as locale } from '@/plugins/i18n';
-
-export const useUIStore = defineStore(STORES.UI, {
-	state: (): UIState => ({
-		activeActions: [],
-		activeCredentialType: null,
-		modals: {
-			[ABOUT_MODAL_KEY]: {
-				open: false,
-			},
-			[ASK_AI_MODAL_KEY]: {
-				open: false,
-			},
-			[CHANGE_PASSWORD_MODAL_KEY]: {
-				open: false,
-			},
-			[CONTACT_PROMPT_MODAL_KEY]: {
-				open: false,
-			},
-			[CREDENTIAL_SELECT_MODAL_KEY]: {
-				open: false,
-			},
-			[DELETE_USER_MODAL_KEY]: {
-				open: false,
-				activeId: null,
-			},
-			[DUPLICATE_MODAL_KEY]: {
-				open: false,
-			},
-			[ONBOARDING_CALL_SIGNUP_MODAL_KEY]: {
-				open: false,
-			},
-			[PERSONALIZATION_MODAL_KEY]: {
-				open: false,
-			},
-			[INVITE_USER_MODAL_KEY]: {
-				open: false,
-			},
-			[TAGS_MANAGER_MODAL_KEY]: {
-				open: false,
-			},
-			[VALUE_SURVEY_MODAL_KEY]: {
-				open: false,
-			},
-			[VERSIONS_MODAL_KEY]: {
-				open: false,
-			},
-			[WORKFLOW_SETTINGS_MODAL_KEY]: {
-				open: false,
-			},
-			[EXECUTIONS_MODAL_KEY]: {
-				open: false,
-			},
-			[WORKFLOW_SHARE_MODAL_KEY]: {
-				open: false,
-			},
-			[WORKFLOW_ACTIVE_MODAL_KEY]: {
-				open: false,
-			},
-			[COMMUNITY_PACKAGE_INSTALL_MODAL_KEY]: {
-				open: false,
-			},
-			[COMMUNITY_PACKAGE_CONFIRM_MODAL_KEY]: {
-				open: false,
-				mode: '',
-				activeId: null,
-			},
-			[IMPORT_CURL_MODAL_KEY]: {
-				open: false,
-				curlCommand: '',
-				httpNodeParameters: '',
-			},
-			[LOG_STREAM_MODAL_KEY]: {
-				open: false,
-				data: undefined,
-			},
-			[CREDENTIAL_EDIT_MODAL_KEY]: {
-				open: false,
-				mode: '',
-				activeId: null,
-				showAuthSelector: false,
-			},
-			[USER_ACTIVATION_SURVEY_MODAL]: {
-				open: false,
-			},
-		},
-		modalStack: [],
-		sidebarMenuCollapsed: true,
-		isPageLoading: true,
-		currentView: '',
-		mainPanelPosition: 0.5,
-		fakeDoorFeatures: [
-			{
-				id: FAKE_DOOR_FEATURES.ENVIRONMENTS,
-				featureName: 'fakeDoor.settings.environments.name',
-				icon: 'server',
-				infoText: 'fakeDoor.settings.environments.infoText',
-				actionBoxTitle: 'fakeDoor.settings.environments.actionBox.title',
-				actionBoxDescription: 'fakeDoor.settings.environments.actionBox.description',
-				linkURL: 'https://n8n-community.typeform.com/to/l7QOrERN#f=environments',
-				uiLocations: ['settings'],
-			},
-			{
-				id: FAKE_DOOR_FEATURES.SSO,
-				featureName: 'fakeDoor.settings.sso.name',
-				icon: 'key',
-				actionBoxTitle: 'fakeDoor.settings.sso.actionBox.title',
-				actionBoxDescription: 'fakeDoor.settings.sso.actionBox.description',
-				linkURL: 'https://n8n-community.typeform.com/to/l7QOrERN#f=sso',
-				uiLocations: ['settings/users'],
-			},
-		],
-		draggable: {
-			isDragging: false,
-			type: '',
-			data: '',
-			canDrop: false,
-			stickyPosition: null,
-		},
-		stateIsDirty: false,
-		lastSelectedNode: null,
-		lastSelectedNodeOutputIndex: null,
-		nodeViewOffsetPosition: [0, 0],
-		nodeViewMoveInProgress: false,
-		selectedNodes: [],
-		sidebarMenuItems: [],
-		nodeViewInitialized: false,
-		addFirstStepOnLoad: false,
-		executionSidebarAutoRefresh: true,
-	}),
-	getters: {
-		contextBasedTranslationKeys() {
-			const settingsStore = useSettingsStore();
-			const deploymentType = settingsStore.deploymentType;
-
-			let contextKey = '';
-			if (deploymentType === 'cloud') {
-				contextKey = '.cloud';
-			} else if (deploymentType === 'desktop_mac' || deploymentType === 'desktop_win') {
-				contextKey = '.desktop';
-			}
-
-			return {
-				upgradeLinkUrl: `contextual.upgradeLinkUrl${contextKey}`,
-				credentials: {
-					sharing: {
-						unavailable: {
-							title: `contextual.credentials.sharing.unavailable.title${contextKey}`,
-							description: `contextual.credentials.sharing.unavailable.description${contextKey}`,
-							action: `contextual.credentials.sharing.unavailable.action${contextKey}`,
-							button: `contextual.credentials.sharing.unavailable.button${contextKey}`,
-						},
-					},
-				},
-				workflows: {
-					sharing: {
-						title: 'contextual.workflows.sharing.title',
-						unavailable: {
-							title: `contextual.workflows.sharing.unavailable.title${contextKey}`,
-							description: {
-								modal: `contextual.workflows.sharing.unavailable.description.modal${contextKey}`,
-								tooltip: `contextual.workflows.sharing.unavailable.description.tooltip${contextKey}`,
-							},
-							action: `contextual.workflows.sharing.unavailable.action${contextKey}`,
-							button: `contextual.workflows.sharing.unavailable.button${contextKey}`,
-						},
-					},
-				},
-				variables: {
-					unavailable: {
-						title: `contextual.variables.unavailable.title${contextKey}`,
-						description: 'contextual.variables.unavailable.description',
-						action: `contextual.variables.unavailable.action${contextKey}`,
-						button: `contextual.variables.unavailable.button${contextKey}`,
-					},
-				},
-				users: {
-					settings: {
-						unavailable: {
-							title: `contextual.users.settings.unavailable.title${contextKey}`,
-							description: `contextual.users.settings.unavailable.description${contextKey}`,
-							button: `contextual.users.settings.unavailable.button${contextKey}`,
-						},
-					},
-				},
-			};
-		},
-		getLastSelectedNode(): INodeUi | null {
-			const workflowsStore = useWorkflowsStore();
-			if (this.lastSelectedNode) {
-				return workflowsStore.getNodeByName(this.lastSelectedNode);
-			}
-			return null;
-		},
-		getCurlCommand(): string | undefined {
-			return this.modals[IMPORT_CURL_MODAL_KEY].curlCommand;
-		},
-		getHttpNodeParameters(): string | undefined {
-			return this.modals[IMPORT_CURL_MODAL_KEY].httpNodeParameters;
-		},
-		areExpressionsDisabled(): boolean {
-			return this.currentView === VIEWS.DEMO;
-		},
-		isVersionsOpen(): boolean {
-			return this.modals[VERSIONS_MODAL_KEY].open;
-		},
-		isModalOpen() {
-			return (name: string) => this.modals[name].open;
-		},
-		isModalActive() {
-			return (name: string) => this.modalStack.length > 0 && name === this.modalStack[0];
-		},
-		getModalActiveId() {
-			return (name: string) => this.modals[name].activeId;
-		},
-		getModalMode() {
-			return (name: string) => this.modals[name].mode;
-		},
-		getModalData() {
-			return (name: string) => this.modals[name].data;
-		},
-		getFakeDoorByLocation() {
-			return (location: IFakeDoorLocation) =>
-				this.fakeDoorFeatures.filter((fakeDoor) => fakeDoor.uiLocations.includes(location));
-		},
-		getFakeDoorById() {
-			return (id: string) =>
-				this.fakeDoorFeatures.find((fakeDoor) => fakeDoor.id.toString() === id);
-		},
-		isReadOnlyView(): boolean {
-			return ![VIEWS.WORKFLOW, VIEWS.NEW_WORKFLOW].includes(this.currentView as VIEWS);
-		},
-		isNodeView(): boolean {
-			return [
-				VIEWS.NEW_WORKFLOW.toString(),
-				VIEWS.WORKFLOW.toString(),
-				VIEWS.WORKFLOW_EXECUTIONS.toString(),
-			].includes(this.currentView);
-		},
-		isActionActive() {
-			return (action: string) => this.activeActions.includes(action);
-		},
-		getSelectedNodes(): INodeUi[] {
-			const seen = new Set();
-			return this.selectedNodes.filter((node: INodeUi) => {
-				// dedupe for instances when same node is selected in different ways
-				if (!seen.has(node.id)) {
-					seen.add(node.id);
-					return true;
-				}
-				return false;
-			});
-		},
-		isNodeSelected() {
-			return (nodeName: string): boolean => {
-				let index;
-				for (index in this.selectedNodes) {
-					if (this.selectedNodes[index].name === nodeName) {
-						return true;
-					}
-				}
-				return false;
-			};
-		},
-		upgradeLinkUrl() {
-			return (source: string, utm_campaign: string): string => {
-				const usageStore = useUsageStore();
-				const linkUrlTranslationKey = this.contextBasedTranslationKeys
-					.upgradeLinkUrl as BaseTextKey;
-				let linkUrl = locale.baseText(linkUrlTranslationKey);
-
-				if (linkUrlTranslationKey.endsWith('.upgradeLinkUrl')) {
-					linkUrl = `${usageStore.viewPlansUrl}&source=${source}`;
-				} else if (linkUrlTranslationKey.endsWith('.desktop')) {
-					linkUrl = `${linkUrl}&utm_campaign=${utm_campaign || source}`;
-				}
-
-				return linkUrl;
-			};
-		},
-	},
-	actions: {
-		setMode(name: string, mode: string): void {
-			Vue.set(this.modals[name], 'mode', mode);
-		},
-		setActiveId(name: string, id: string): void {
-			Vue.set(this.modals[name], 'activeId', id);
-		},
-		setShowAuthSelector(name: string, show: boolean) {
-			Vue.set(this.modals[name], 'showAuthSelector', show);
-		},
-		setModalData(payload: { name: string; data: Record<string, unknown> }) {
-			Vue.set(this.modals[payload.name], 'data', payload.data);
-		},
-		openModal(name: string): void {
-			Vue.set(this.modals[name], 'open', true);
-			this.modalStack = [name].concat(this.modalStack);
-		},
-		openModalWithData(payload: { name: string; data: Record<string, unknown> }): void {
-			this.setModalData(payload);
-			this.openModal(payload.name);
-		},
-		closeModal(name: string): void {
-			Vue.set(this.modals[name], 'open', false);
-			this.modalStack = this.modalStack.filter((openModalName: string) => {
-				return name !== openModalName;
-			});
-		},
-		closeAllModals(): void {
-			Object.keys(this.modals).forEach((name: string) => {
-				if (this.modals[name].open) {
-					Vue.set(this.modals[name], 'open', false);
-				}
-			});
-			this.modalStack = [];
-		},
-		draggableStartDragging(type: string, data: string): void {
-			this.draggable = {
-				isDragging: true,
-				type,
-				data,
-				canDrop: false,
-				stickyPosition: null,
-			};
-		},
-		draggableStopDragging(): void {
-			this.draggable = {
-				isDragging: false,
-				type: '',
-				data: '',
-				canDrop: false,
-				stickyPosition: null,
-			};
-		},
-		setDraggableStickyPos(position: XYPosition): void {
-			Vue.set(this.draggable, 'stickyPosition', position);
-		},
-		setDraggableCanDrop(canDrop: boolean): void {
-			Vue.set(this.draggable, 'canDrop', canDrop);
-		},
-		openDeleteUserModal(id: string): void {
-			this.setActiveId(DELETE_USER_MODAL_KEY, id);
-			this.openModal(DELETE_USER_MODAL_KEY);
-		},
-		openExistingCredential(id: string): void {
-			this.setActiveId(CREDENTIAL_EDIT_MODAL_KEY, id);
-			this.setMode(CREDENTIAL_EDIT_MODAL_KEY, 'edit');
-			this.openModal(CREDENTIAL_EDIT_MODAL_KEY);
-		},
-		openNewCredential(type: string, showAuthOptions = false): void {
-			this.setActiveId(CREDENTIAL_EDIT_MODAL_KEY, type);
-			this.setShowAuthSelector(CREDENTIAL_EDIT_MODAL_KEY, showAuthOptions);
-			this.setMode(CREDENTIAL_EDIT_MODAL_KEY, 'new');
-			this.openModal(CREDENTIAL_EDIT_MODAL_KEY);
-		},
-		async getNextOnboardingPrompt(): Promise<IOnboardingCallPrompt> {
-			const rootStore = useRootStore();
-			const instanceId = rootStore.instanceId;
-			// TODO: current USER
-			const currentUser = {} as IUser;
-			return await fetchNextOnboardingPrompt(instanceId, currentUser);
-		},
-		async applyForOnboardingCall(email: string): Promise<string> {
-			const rootStore = useRootStore();
-			const instanceId = rootStore.instanceId;
-			// TODO: current USER
-			const currentUser = {} as IUser;
-			return await applyForOnboardingCall(instanceId, currentUser, email);
-		},
-		async submitContactEmail(email: string, agree: boolean): Promise<string> {
-			const rootStore = useRootStore();
-			const instanceId = rootStore.instanceId;
-			// TODO: current USER
-			const currentUser = {} as IUser;
-			return await submitEmailOnSignup(instanceId, currentUser, email || currentUser.email, agree);
-		},
-		openCommunityPackageUninstallConfirmModal(packageName: string) {
-			this.setActiveId(COMMUNITY_PACKAGE_CONFIRM_MODAL_KEY, packageName);
-			this.setMode(COMMUNITY_PACKAGE_CONFIRM_MODAL_KEY, COMMUNITY_PACKAGE_MANAGE_ACTIONS.UNINSTALL);
-			this.openModal(COMMUNITY_PACKAGE_CONFIRM_MODAL_KEY);
-		},
-		openCommunityPackageUpdateConfirmModal(packageName: string) {
-			this.setActiveId(COMMUNITY_PACKAGE_CONFIRM_MODAL_KEY, packageName);
-			this.setMode(COMMUNITY_PACKAGE_CONFIRM_MODAL_KEY, COMMUNITY_PACKAGE_MANAGE_ACTIONS.UPDATE);
-			this.openModal(COMMUNITY_PACKAGE_CONFIRM_MODAL_KEY);
-		},
-		addActiveAction(action: string): void {
-			if (!this.activeActions.includes(action)) {
-				this.activeActions.push(action);
-			}
-		},
-		removeActiveAction(action: string): void {
-			const actionIndex = this.activeActions.indexOf(action);
-			if (actionIndex !== -1) {
-				this.activeActions.splice(actionIndex, 1);
-			}
-		},
-		addSelectedNode(node: INodeUi): void {
-			this.selectedNodes.push(node);
-		},
-		removeNodeFromSelection(node: INodeUi): void {
-			let index;
-			for (index in this.selectedNodes) {
-				if (this.selectedNodes[index].name === node.name) {
-					this.selectedNodes.splice(parseInt(index, 10), 1);
-					break;
-				}
-			}
-		},
-		resetSelectedNodes(): void {
-			Vue.set(this, 'selectedNodes', []);
-		},
-		addSidebarMenuItems(menuItems: IMenuItem[]) {
-			const updated = this.sidebarMenuItems.concat(menuItems);
-			Vue.set(this, 'sidebarMenuItems', updated);
-		},
-		setCurlCommand(payload: { name: string; command: string }): void {
-			Vue.set(this.modals[payload.name], 'curlCommand', payload.command);
-		},
-		setHttpNodeParameters(payload: { name: string; parameters: string }): void {
-			Vue.set(this.modals[payload.name], 'httpNodeParameters', payload.parameters);
-		},
-		toggleSidebarMenuCollapse(): void {
-			this.sidebarMenuCollapsed = !this.sidebarMenuCollapsed;
-		},
-		async getCurlToJson(curlCommand: string): Promise<CurlToJSONResponse> {
-			const rootStore = useRootStore();
-			return await getCurlToJson(rootStore.getRestApiContext, curlCommand);
-		},
-		goToUpgrade(source: string, utm_campaign: string): void {
-			window.open(this.upgradeLinkUrl(source, utm_campaign), '_blank');
-		},
-	},
-});
diff --git a/packages/editor-ui/src/stores/ui.utils.ts b/packages/editor-ui/src/stores/ui.utils.ts
new file mode 100644
index 0000000000000..9245bc549affd
--- /dev/null
+++ b/packages/editor-ui/src/stores/ui.utils.ts
@@ -0,0 +1,39 @@
+import type { AppliedThemeOption, ThemeOption } from '@/Interface';
+import { useStorage } from '@/composables/useStorage';
+import { LOCAL_STORAGE_THEME } from '@/constants';
+
+const themeRef = useStorage(LOCAL_STORAGE_THEME);
+
+export function addThemeToBody(theme: AppliedThemeOption) {
+	window.document.body.setAttribute('data-theme', theme);
+}
+
+export function isValidTheme(theme: string | null): theme is AppliedThemeOption {
+	return !!theme && ['light', 'dark'].includes(theme);
+}
+
+// query param allows overriding theme for demo view in preview iframe without flickering
+export function getThemeOverride() {
+	return getQueryParam('theme') || themeRef.value;
+}
+
+function getQueryParam(paramName: string): string | null {
+	return new URLSearchParams(window.location.search).get(paramName);
+}
+
+export function updateTheme(theme: ThemeOption) {
+	if (theme === 'system') {
+		window.document.body.removeAttribute('data-theme');
+		themeRef.value = null;
+	} else {
+		addThemeToBody(theme);
+		themeRef.value = theme;
+	}
+}
+
+export function getPreferredTheme(): AppliedThemeOption {
+	const isDarkMode =
+		!!window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)')?.matches;
+
+	return isDarkMode ? 'dark' : 'light';
+}
diff --git a/packages/editor-ui/src/stores/usage.store.ts b/packages/editor-ui/src/stores/usage.store.ts
new file mode 100644
index 0000000000000..2f9251a846905
--- /dev/null
+++ b/packages/editor-ui/src/stores/usage.store.ts
@@ -0,0 +1,141 @@
+import { computed, reactive } from 'vue';
+import { defineStore } from 'pinia';
+import type { UsageState } from '@/Interface';
+import { activateLicenseKey, getLicense, renewLicense, requestLicenseTrial } from '@/api/usage';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useUsersStore } from '@/stores/users.store';
+
+export type UsageTelemetry = {
+	instance_id: string;
+	action: 'view_plans' | 'manage_plan' | 'add_activation_key' | 'desktop_view_plans';
+	plan_name_current: string;
+	usage: number;
+	quota: number;
+};
+
+const DEFAULT_PLAN_NAME = 'Community';
+const DEFAULT_STATE: UsageState = {
+	loading: true,
+	data: {
+		usage: {
+			executions: {
+				limit: -1,
+				value: 0,
+				warningThreshold: 0.8,
+			},
+		},
+		license: {
+			planId: '',
+			planName: DEFAULT_PLAN_NAME,
+		},
+	},
+};
+
+export const useUsageStore = defineStore('usage', () => {
+	const rootStore = useRootStore();
+	const settingsStore = useSettingsStore();
+	const usersStore = useUsersStore();
+
+	const state = reactive<UsageState>(DEFAULT_STATE);
+
+	const planName = computed(() => state.data.license.planName || DEFAULT_PLAN_NAME);
+	const planId = computed(() => state.data.license.planId);
+	const executionLimit = computed(() => state.data.usage.executions.limit);
+	const executionCount = computed(() => state.data.usage.executions.value);
+	const executionPercentage = computed(() => (executionCount.value / executionLimit.value) * 100);
+	const instanceId = computed(() => settingsStore.settings.instanceId);
+	const managementToken = computed(() => state.data.managementToken);
+	const appVersion = computed(() => settingsStore.settings.versionCli);
+	const commonSubscriptionAppUrlQueryParams = computed(
+		() => `instanceid=${instanceId.value}&version=${appVersion.value}`,
+	);
+	const subscriptionAppUrl = computed(() =>
+		settingsStore.settings.license.environment === 'production'
+			? 'https://subscription.n8n.io'
+			: 'https://staging-subscription.n8n.io',
+	);
+
+	const setLoading = (loading: boolean) => {
+		state.loading = loading;
+	};
+
+	const setData = (data: UsageState['data']) => {
+		state.data = data;
+	};
+
+	const getLicenseInfo = async () => {
+		const data = await getLicense(rootStore.getRestApiContext);
+		setData(data);
+	};
+
+	const activateLicense = async (activationKey: string) => {
+		const data = await activateLicenseKey(rootStore.getRestApiContext, { activationKey });
+		setData(data);
+		await settingsStore.getSettings();
+	};
+
+	const refreshLicenseManagementToken = async () => {
+		try {
+			const data = await renewLicense(rootStore.getRestApiContext);
+			setData(data);
+		} catch (error) {
+			await getLicenseInfo();
+		}
+	};
+
+	const requestEnterpriseLicenseTrial = async () => {
+		if (!usersStore.currentUser) {
+			throw new Error('User is not logged in');
+		}
+
+		const data = await requestLicenseTrial({
+			licenseType: 'enterprise',
+			firstName: usersStore.currentUser.firstName ?? '',
+			lastName: usersStore.currentUser.lastName ?? '',
+			email: usersStore.currentUser.email ?? '',
+			instanceUrl: window.location.origin,
+		});
+
+		return data;
+	};
+
+	return {
+		setLoading,
+		getLicenseInfo,
+		setData,
+		activateLicense,
+		refreshLicenseManagementToken,
+		requestEnterpriseLicenseTrial,
+		planName,
+		planId,
+		executionLimit,
+		executionCount,
+		executionPercentage,
+		instanceId,
+		managementToken,
+		appVersion,
+		isCloseToLimit: computed(() =>
+			state.data.usage.executions.limit < 0
+				? false
+				: executionCount.value / executionLimit.value >=
+					state.data.usage.executions.warningThreshold,
+		),
+		viewPlansUrl: computed(
+			() => `${subscriptionAppUrl.value}?${commonSubscriptionAppUrlQueryParams.value}`,
+		),
+		managePlanUrl: computed(
+			() =>
+				`${subscriptionAppUrl.value}/manage?token=${managementToken.value}&${commonSubscriptionAppUrlQueryParams.value}`,
+		),
+		isLoading: computed(() => state.loading),
+		telemetryPayload: computed<UsageTelemetry>(() => ({
+			instance_id: instanceId.value,
+			action: 'view_plans',
+			plan_name_current: planName.value,
+			usage: executionCount.value,
+			quota: executionLimit.value,
+		})),
+		isDesktop: computed(() => settingsStore.isDesktopDeployment),
+	};
+});
diff --git a/packages/editor-ui/src/stores/usage.ts b/packages/editor-ui/src/stores/usage.ts
deleted file mode 100644
index 49df9cb2f1bda..0000000000000
--- a/packages/editor-ui/src/stores/usage.ts
+++ /dev/null
@@ -1,125 +0,0 @@
-import { computed, reactive } from 'vue';
-import { defineStore } from 'pinia';
-import type { UsageState } from '@/Interface';
-import { activateLicenseKey, getLicense, renewLicense } from '@/api/usage';
-import { useRootStore } from '@/stores/n8nRootStore';
-import { useSettingsStore } from '@/stores/settings';
-import { useUsersStore } from '@/stores/users';
-
-export type UsageTelemetry = {
-	instance_id: string;
-	action: 'view_plans' | 'manage_plan' | 'add_activation_key' | 'desktop_view_plans';
-	plan_name_current: string;
-	usage: number;
-	quota: number;
-};
-
-const DEFAULT_PLAN_NAME = 'Community';
-const DEFAULT_STATE: UsageState = {
-	loading: true,
-	data: {
-		usage: {
-			executions: {
-				limit: -1,
-				value: 0,
-				warningThreshold: 0.8,
-			},
-		},
-		license: {
-			planId: '',
-			planName: DEFAULT_PLAN_NAME,
-		},
-	},
-};
-
-export const useUsageStore = defineStore('usage', () => {
-	const rootStore = useRootStore();
-	const settingsStore = useSettingsStore();
-	const usersStore = useUsersStore();
-
-	const state = reactive<UsageState>(DEFAULT_STATE);
-
-	const planName = computed(() => state.data.license.planName || DEFAULT_PLAN_NAME);
-	const planId = computed(() => state.data.license.planId);
-	const executionLimit = computed(() => state.data.usage.executions.limit);
-	const executionCount = computed(() => state.data.usage.executions.value);
-	const executionPercentage = computed(() => (executionCount.value / executionLimit.value) * 100);
-	const instanceId = computed(() => settingsStore.settings.instanceId);
-	const managementToken = computed(() => state.data.managementToken);
-	const appVersion = computed(() => settingsStore.settings.versionCli);
-	const commonSubscriptionAppUrlQueryParams = computed(
-		() => `instanceid=${instanceId.value}&version=${appVersion.value}`,
-	);
-	const subscriptionAppUrl = computed(() =>
-		settingsStore.settings.license.environment === 'production'
-			? 'https://subscription.n8n.io'
-			: 'https://staging-subscription.n8n.io',
-	);
-
-	const setLoading = (loading: boolean) => {
-		state.loading = loading;
-	};
-
-	const setData = (data: UsageState['data']) => {
-		state.data = data;
-	};
-
-	const getLicenseInfo = async () => {
-		const data = await getLicense(rootStore.getRestApiContext);
-		setData(data);
-	};
-
-	const activateLicense = async (activationKey: string) => {
-		const data = await activateLicenseKey(rootStore.getRestApiContext, { activationKey });
-		setData(data);
-		await settingsStore.getSettings();
-	};
-
-	const refreshLicenseManagementToken = async () => {
-		try {
-			const data = await renewLicense(rootStore.getRestApiContext);
-			setData(data);
-		} catch (error) {
-			getLicenseInfo();
-		}
-	};
-
-	return {
-		setLoading,
-		getLicenseInfo,
-		setData,
-		activateLicense,
-		refreshLicenseManagementToken,
-		planName,
-		planId,
-		executionLimit,
-		executionCount,
-		executionPercentage,
-		instanceId,
-		managementToken,
-		appVersion,
-		isCloseToLimit: computed(() =>
-			state.data.usage.executions.limit < 0
-				? false
-				: executionCount.value / executionLimit.value >=
-				  state.data.usage.executions.warningThreshold,
-		),
-		viewPlansUrl: computed(
-			() => `${subscriptionAppUrl.value}?${commonSubscriptionAppUrlQueryParams.value}`,
-		),
-		managePlanUrl: computed(
-			() =>
-				`${subscriptionAppUrl.value}/manage?token=${managementToken.value}&${commonSubscriptionAppUrlQueryParams.value}`,
-		),
-		canUserActivateLicense: computed(() => usersStore.canUserActivateLicense),
-		isLoading: computed(() => state.loading),
-		telemetryPayload: computed<UsageTelemetry>(() => ({
-			instance_id: instanceId.value,
-			action: 'view_plans',
-			plan_name_current: planName.value,
-			usage: executionCount.value,
-			quota: executionLimit.value,
-		})),
-		isDesktop: computed(() => settingsStore.isDesktopDeployment),
-	};
-});
diff --git a/packages/editor-ui/src/stores/users.store.ts b/packages/editor-ui/src/stores/users.store.ts
new file mode 100644
index 0000000000000..10894fe1a6e8a
--- /dev/null
+++ b/packages/editor-ui/src/stores/users.store.ts
@@ -0,0 +1,397 @@
+import type { UpdateGlobalRolePayload } from '@/api/users';
+import {
+	changePassword,
+	deleteUser,
+	getPasswordResetLink,
+	getUsers,
+	login,
+	loginCurrentUser,
+	logout,
+	sendForgotPasswordEmail,
+	setupOwner,
+	submitPersonalizationSurvey,
+	updateCurrentUser,
+	updateCurrentUserPassword,
+	updateCurrentUserSettings,
+	updateOtherUserSettings,
+	validatePasswordToken,
+	validateSignupToken,
+	updateGlobalRole,
+	generateOTPSecret,
+} from '@/api/users';
+import { PERSONALIZATION_MODAL_KEY, STORES, ROLE } from '@/constants';
+import type {
+	Cloud,
+	ICredentialsResponse,
+	IInviteResponse,
+	IPersonalizationLatestVersion,
+	IRole,
+	IUser,
+	IUserResponse,
+	IUsersState,
+	CurrentUserResponse,
+	InvitableRoleName,
+} from '@/Interface';
+import { getCredentialPermissions } from '@/permissions';
+import { getPersonalizedNodeTypes } from '@/utils/userUtils';
+import { defineStore } from 'pinia';
+import { useRootStore } from './n8nRoot.store';
+import { usePostHog } from './posthog.store';
+import { useSettingsStore } from './settings.store';
+import { useUIStore } from './ui.store';
+import { useCloudPlanStore } from './cloudPlan.store';
+import { disableMfa, enableMfa, getMfaQR, verifyMfaToken } from '@/api/mfa';
+import { confirmEmail, getCloudUserInfo } from '@/api/cloudPlans';
+import { useRBACStore } from '@/stores/rbac.store';
+import type { Scope } from '@n8n/permissions';
+import { inviteUsers, acceptInvitation } from '@/api/invitation';
+
+const isPendingUser = (user: IUserResponse | null) => !!user?.isPending;
+const isInstanceOwner = (user: IUserResponse | null) => user?.role === ROLE.Owner;
+const isDefaultUser = (user: IUserResponse | null) => isInstanceOwner(user) && isPendingUser(user);
+
+export const useUsersStore = defineStore(STORES.USERS, {
+	state: (): IUsersState => ({
+		initialized: false,
+		currentUserId: null,
+		users: {},
+		currentUserCloudInfo: null,
+	}),
+	getters: {
+		allUsers(): IUser[] {
+			return Object.values(this.users);
+		},
+		userActivated(): boolean {
+			return Boolean(this.currentUser?.settings?.userActivated);
+		},
+		currentUser(): IUser | null {
+			return this.currentUserId ? this.users[this.currentUserId] : null;
+		},
+		isDefaultUser(): boolean {
+			return isDefaultUser(this.currentUser);
+		},
+		isInstanceOwner(): boolean {
+			return isInstanceOwner(this.currentUser);
+		},
+		mfaEnabled(): boolean {
+			return this.currentUser?.mfaEnabled ?? false;
+		},
+		getUserById(state) {
+			return (userId: string): IUser | null => state.users[userId];
+		},
+		globalRoleName(): IRole {
+			return this.currentUser?.role ?? 'default';
+		},
+		personalizedNodeTypes(): string[] {
+			const user = this.currentUser;
+			if (!user) {
+				return [];
+			}
+
+			const answers = user.personalizationAnswers;
+			if (!answers) {
+				return [];
+			}
+			return getPersonalizedNodeTypes(answers);
+		},
+		isResourceAccessible() {
+			return (resource: ICredentialsResponse): boolean => {
+				const permissions = getCredentialPermissions(this.currentUser, resource);
+
+				return permissions.use;
+			};
+		},
+	},
+	actions: {
+		async initialize() {
+			if (this.initialized) {
+				return;
+			}
+
+			try {
+				await this.loginWithCookie();
+				this.initialized = true;
+			} catch (e) {}
+		},
+		setCurrentUser(user: CurrentUserResponse) {
+			this.addUsers([user]);
+			this.currentUserId = user.id;
+
+			const defaultScopes: Scope[] = [];
+			useRBACStore().setGlobalScopes(user.globalScopes || defaultScopes);
+			usePostHog().init(user.featureFlags);
+		},
+		unsetCurrentUser() {
+			this.currentUserId = null;
+			this.currentUserCloudInfo = null;
+			useRBACStore().setGlobalScopes([]);
+		},
+		addUsers(users: IUserResponse[]) {
+			users.forEach((userResponse: IUserResponse) => {
+				const prevUser = this.users[userResponse.id] || {};
+				const updatedUser = {
+					...prevUser,
+					...userResponse,
+				};
+				const user: IUser = {
+					...updatedUser,
+					fullName: userResponse.firstName
+						? `${updatedUser.firstName} ${updatedUser.lastName || ''}`
+						: undefined,
+					isDefaultUser: isDefaultUser(updatedUser),
+					isPendingUser: isPendingUser(updatedUser),
+				};
+
+				this.users = {
+					...this.users,
+					[user.id]: user,
+				};
+			});
+		},
+		deleteUserById(userId: string): void {
+			const { [userId]: _, ...users } = this.users;
+			this.users = users;
+		},
+		setPersonalizationAnswers(answers: IPersonalizationLatestVersion): void {
+			if (!this.currentUser) {
+				return;
+			}
+
+			this.users = {
+				...this.users,
+				[this.currentUser.id]: {
+					...this.currentUser,
+					personalizationAnswers: answers,
+				},
+			};
+		},
+		async loginWithCookie(): Promise<void> {
+			const rootStore = useRootStore();
+			const user = await loginCurrentUser(rootStore.getRestApiContext);
+			if (!user) {
+				return;
+			}
+
+			this.setCurrentUser(user);
+		},
+		async loginWithCreds(params: {
+			email: string;
+			password: string;
+			mfaToken?: string;
+			mfaRecoveryCode?: string;
+			otp?: string;
+		}): Promise<void> {
+			const rootStore = useRootStore();
+			const user = await login(rootStore.getRestApiContext, params);
+			if (!user) {
+				return;
+			}
+
+			this.setCurrentUser(user);
+		},
+		async logout(): Promise<void> {
+			const rootStore = useRootStore();
+			await logout(rootStore.getRestApiContext);
+			this.unsetCurrentUser();
+			useCloudPlanStore().reset();
+			usePostHog().reset();
+			useUIStore().clearBannerStack();
+		},
+		async createOwner(params: {
+			firstName: string;
+			lastName: string;
+			email: string;
+			password: string;
+			otpSecret: string;
+			otp: string;
+		}): Promise<void> {
+			const rootStore = useRootStore();
+			const user = await setupOwner(rootStore.getRestApiContext, params);
+			const settingsStore = useSettingsStore();
+			if (user) {
+				this.setCurrentUser(user);
+				settingsStore.stopShowingSetupPage();
+			}
+		},
+		async validateSignupToken(params: {
+			inviteeId: string;
+			inviterId: string;
+		}): Promise<{ inviter: { firstName: string; lastName: string } }> {
+			const rootStore = useRootStore();
+			return await validateSignupToken(rootStore.getRestApiContext, params);
+		},
+		async acceptInvitation(params: {
+			inviteeId: string;
+			inviterId: string;
+			firstName: string;
+			lastName: string;
+			password: string;
+		}): Promise<void> {
+			const rootStore = useRootStore();
+			const user = await acceptInvitation(rootStore.getRestApiContext, params);
+			if (user) {
+				this.setCurrentUser(user);
+			}
+		},
+		async sendForgotPasswordEmail(params: { email: string }): Promise<void> {
+			const rootStore = useRootStore();
+			await sendForgotPasswordEmail(rootStore.getRestApiContext, params);
+		},
+		async validatePasswordToken(params: { token: string }): Promise<void> {
+			const rootStore = useRootStore();
+			await validatePasswordToken(rootStore.getRestApiContext, params);
+		},
+		async changePassword(params: {
+			token: string;
+			password: string;
+			mfaToken?: string;
+		}): Promise<void> {
+			const rootStore = useRootStore();
+			await changePassword(rootStore.getRestApiContext, params);
+		},
+		async updateUser(params: {
+			id: string;
+			firstName: string;
+			lastName: string;
+			email: string;
+		}): Promise<void> {
+			const rootStore = useRootStore();
+			const user = await updateCurrentUser(rootStore.getRestApiContext, params);
+			this.addUsers([user]);
+		},
+		async updateUserSettings(settings: IUserResponse['settings']): Promise<void> {
+			const rootStore = useRootStore();
+			const updatedSettings = await updateCurrentUserSettings(
+				rootStore.getRestApiContext,
+				settings,
+			);
+			if (this.currentUser) {
+				this.currentUser.settings = updatedSettings;
+				this.addUsers([this.currentUser]);
+			}
+		},
+		async updateOtherUserSettings(
+			userId: string,
+			settings: IUserResponse['settings'],
+		): Promise<void> {
+			const rootStore = useRootStore();
+			const updatedSettings = await updateOtherUserSettings(
+				rootStore.getRestApiContext,
+				userId,
+				settings,
+			);
+			this.users[userId].settings = updatedSettings;
+			this.addUsers([this.users[userId]]);
+		},
+		async updateCurrentUserPassword({
+			password,
+			currentPassword,
+		}: {
+			password: string;
+			currentPassword: string;
+		}): Promise<void> {
+			const rootStore = useRootStore();
+			await updateCurrentUserPassword(rootStore.getRestApiContext, {
+				newPassword: password,
+				currentPassword,
+			});
+		},
+		async deleteUser(params: { id: string; transferId?: string }): Promise<void> {
+			const rootStore = useRootStore();
+			await deleteUser(rootStore.getRestApiContext, params);
+			this.deleteUserById(params.id);
+		},
+		async fetchUsers(): Promise<void> {
+			const rootStore = useRootStore();
+			const users = await getUsers(rootStore.getRestApiContext);
+			this.addUsers(users);
+		},
+		async inviteUsers(
+			params: Array<{ email: string; role: InvitableRoleName }>,
+		): Promise<IInviteResponse[]> {
+			const rootStore = useRootStore();
+			const users = await inviteUsers(rootStore.getRestApiContext, params);
+			this.addUsers(
+				users.map(({ user }, index) => ({
+					isPending: true,
+					globalRole: { name: params[index].role },
+					...user,
+				})),
+			);
+			return users;
+		},
+		async reinviteUser({ email, role }: { email: string; role: InvitableRoleName }): Promise<void> {
+			const rootStore = useRootStore();
+			const invitationResponse = await inviteUsers(rootStore.getRestApiContext, [{ email, role }]);
+			if (!invitationResponse[0].user.emailSent) {
+				throw Error(invitationResponse[0].error);
+			}
+		},
+		async getUserPasswordResetLink(params: { id: string }): Promise<{ link: string }> {
+			const rootStore = useRootStore();
+			return await getPasswordResetLink(rootStore.getRestApiContext, params);
+		},
+		async submitPersonalizationSurvey(results: IPersonalizationLatestVersion): Promise<void> {
+			const rootStore = useRootStore();
+			await submitPersonalizationSurvey(rootStore.getRestApiContext, results);
+			this.setPersonalizationAnswers(results);
+		},
+		async showPersonalizationSurvey(): Promise<void> {
+			const settingsStore = useSettingsStore();
+			const surveyEnabled = settingsStore.isPersonalizationSurveyEnabled;
+			const currentUser = this.currentUser;
+			if (surveyEnabled && currentUser && !currentUser.personalizationAnswers) {
+				const uiStore = useUIStore();
+				uiStore.openModal(PERSONALIZATION_MODAL_KEY);
+			}
+		},
+		async getMfaQR(): Promise<{ qrCode: string; secret: string; recoveryCodes: string[] }> {
+			const rootStore = useRootStore();
+			return await getMfaQR(rootStore.getRestApiContext);
+		},
+		async verifyMfaToken(data: { token: string }): Promise<void> {
+			const rootStore = useRootStore();
+			return await verifyMfaToken(rootStore.getRestApiContext, data);
+		},
+		async enableMfa(data: { token: string }) {
+			const rootStore = useRootStore();
+			const usersStore = useUsersStore();
+			await enableMfa(rootStore.getRestApiContext, data);
+			const currentUser = usersStore.currentUser;
+			if (currentUser) {
+				currentUser.mfaEnabled = true;
+			}
+		},
+		async disabledMfa() {
+			const rootStore = useRootStore();
+			const usersStore = useUsersStore();
+			await disableMfa(rootStore.getRestApiContext);
+			const currentUser = usersStore.currentUser;
+			if (currentUser) {
+				currentUser.mfaEnabled = false;
+			}
+		},
+		async fetchUserCloudAccount() {
+			let cloudUser: Cloud.UserAccount | null = null;
+			try {
+				cloudUser = await getCloudUserInfo(useRootStore().getRestApiContext);
+				this.currentUserCloudInfo = cloudUser;
+			} catch (error) {
+				throw new Error(error);
+			}
+		},
+		async confirmEmail() {
+			await confirmEmail(useRootStore().getRestApiContext);
+		},
+		async generateOTPSecret() {
+			const rootStore = useRootStore();
+			return await generateOTPSecret(rootStore.getRestApiContext);
+		},
+
+		async updateGlobalRole({ id, newRoleName }: UpdateGlobalRolePayload) {
+			const rootStore = useRootStore();
+			await updateGlobalRole(rootStore.getRestApiContext, { id, newRoleName });
+			await this.fetchUsers();
+		},
+	},
+});
diff --git a/packages/editor-ui/src/stores/users.ts b/packages/editor-ui/src/stores/users.ts
deleted file mode 100644
index 698b4ffccb628..0000000000000
--- a/packages/editor-ui/src/stores/users.ts
+++ /dev/null
@@ -1,338 +0,0 @@
-import {
-	changePassword,
-	deleteUser,
-	getInviteLink,
-	getUsers,
-	inviteUsers,
-	login,
-	loginCurrentUser,
-	logout,
-	preOwnerSetup,
-	reinvite,
-	sendForgotPasswordEmail,
-	setupOwner,
-	generateOTPSecret,
-	signup,
-	skipOwnerSetup,
-	submitPersonalizationSurvey,
-	updateCurrentUser,
-	updateCurrentUserPassword,
-	updateCurrentUserSettings,
-	validatePasswordToken,
-	validateSignupToken,
-} from '@/api/users';
-import {
-	PERSONALIZATION_MODAL_KEY,
-	USER_ACTIVATION_SURVEY_MODAL,
-	STORES,
-	LOCAL_STORAGE_ACTIVE_MODAL,
-} from '@/constants';
-import type {
-	ICredentialsResponse,
-	IInviteResponse,
-	IPersonalizationLatestVersion,
-	IRole,
-	IUser,
-	IUserResponse,
-	IUsersState,
-} from '@/Interface';
-import { getCredentialPermissions } from '@/permissions';
-import { getPersonalizedNodeTypes, isAuthorized, PERMISSIONS, ROLE } from '@/utils';
-import { defineStore } from 'pinia';
-import Vue from 'vue';
-import { useRootStore } from './n8nRootStore';
-import { usePostHog } from './posthog';
-import { useSettingsStore } from './settings';
-import { useUIStore } from './ui';
-
-const isDefaultUser = (user: IUserResponse | null) =>
-	Boolean(user && user.isPending && user.globalRole && user.globalRole.name === ROLE.Owner);
-
-const isPendingUser = (user: IUserResponse | null) => Boolean(user && user.isPending);
-
-const isInstanceOwner = (user: IUserResponse | null) =>
-	Boolean(user?.globalRole?.name === ROLE.Owner);
-
-export const useUsersStore = defineStore(STORES.USERS, {
-	state: (): IUsersState => ({
-		currentUserId: null,
-		users: {},
-	}),
-	getters: {
-		allUsers(): IUser[] {
-			return Object.values(this.users);
-		},
-		userActivated(): boolean {
-			return Boolean(this.currentUser?.settings?.userActivated);
-		},
-		currentUser(): IUser | null {
-			return this.currentUserId ? this.users[this.currentUserId] : null;
-		},
-		isDefaultUser(): boolean {
-			return isDefaultUser(this.currentUser);
-		},
-		isInstanceOwner(): boolean {
-			return isInstanceOwner(this.currentUser);
-		},
-		getUserById(state) {
-			return (userId: string): IUser | null => state.users[userId];
-		},
-		globalRoleName(): IRole {
-			return this.currentUser?.globalRole?.name ?? 'default';
-		},
-		canUserDeleteTags(): boolean {
-			return isAuthorized(PERMISSIONS.TAGS.CAN_DELETE_TAGS, this.currentUser);
-		},
-		canUserActivateLicense(): boolean {
-			return isAuthorized(PERMISSIONS.USAGE.CAN_ACTIVATE_LICENSE, this.currentUser);
-		},
-		canUserAccessSidebarUserInfo() {
-			if (this.currentUser) {
-				const currentUser: IUser = this.currentUser;
-				return isAuthorized(PERMISSIONS.PRIMARY_MENU.CAN_ACCESS_USER_INFO, currentUser);
-			}
-			return false;
-		},
-		showUMSetupWarning() {
-			if (this.currentUser) {
-				const currentUser: IUser = this.currentUser;
-				return isAuthorized(PERMISSIONS.USER_SETTINGS.VIEW_UM_SETUP_WARNING, currentUser);
-			}
-			return false;
-		},
-		personalizedNodeTypes(): string[] {
-			const user = this.currentUser as IUser | null;
-			if (!user) {
-				return [];
-			}
-
-			const answers = user.personalizationAnswers;
-			if (!answers) {
-				return [];
-			}
-			return getPersonalizedNodeTypes(answers);
-		},
-		isResourceAccessible() {
-			return (resource: ICredentialsResponse): boolean => {
-				const permissions = getCredentialPermissions(this.currentUser, resource);
-
-				return permissions.use;
-			};
-		},
-	},
-	actions: {
-		addUsers(users: IUserResponse[]) {
-			users.forEach((userResponse: IUserResponse) => {
-				const prevUser = this.users[userResponse.id] || {};
-				const updatedUser = {
-					...prevUser,
-					...userResponse,
-				};
-				const user: IUser = {
-					...updatedUser,
-					fullName: userResponse.firstName
-						? `${updatedUser.firstName} ${updatedUser.lastName || ''}`
-						: undefined,
-					isDefaultUser: isDefaultUser(updatedUser),
-					isPendingUser: isPendingUser(updatedUser),
-					isOwner: updatedUser.globalRole?.name === ROLE.Owner,
-				};
-				Vue.set(this.users, user.id, user);
-			});
-		},
-		deleteUserById(userId: string): void {
-			Vue.delete(this.users, userId);
-		},
-		setPersonalizationAnswers(answers: IPersonalizationLatestVersion): void {
-			if (!this.currentUser) {
-				return;
-			}
-			Vue.set(this.currentUser, 'personalizationAnswers', answers);
-		},
-		async loginWithCookie(): Promise<void> {
-			const rootStore = useRootStore();
-			const user = await loginCurrentUser(rootStore.getRestApiContext);
-			if (!user) {
-				return;
-			}
-
-			this.addUsers([user]);
-			this.currentUserId = user.id;
-
-			usePostHog().init(user.featureFlags);
-		},
-		async loginWithCreds(params: { email: string; password: string }): Promise<void> {
-			const rootStore = useRootStore();
-			const user = await login(rootStore.getRestApiContext, params);
-			if (!user) {
-				return;
-			}
-
-			this.addUsers([user]);
-			this.currentUserId = user.id;
-
-			usePostHog().init(user.featureFlags);
-		},
-		async logout(): Promise<void> {
-			const rootStore = useRootStore();
-			await logout(rootStore.getRestApiContext);
-			this.currentUserId = null;
-			usePostHog().reset();
-		},
-		async preOwnerSetup() {
-			return preOwnerSetup(useRootStore().getRestApiContext);
-		},
-		async generateOTPSecret() {
-			const rootStore = useRootStore();
-			return generateOTPSecret(rootStore.getRestApiContext);
-		},
-		async createOwner(params: {
-			firstName: string;
-			lastName: string;
-			email: string;
-			password: string;
-			otp: string;
-			otpSecret: string;
-		}): Promise<void> {
-			const rootStore = useRootStore();
-			const user = await setupOwner(rootStore.getRestApiContext, params);
-			const settingsStore = useSettingsStore();
-			if (user) {
-				this.addUsers([user]);
-				this.currentUserId = user.id;
-				settingsStore.stopShowingSetupPage();
-			}
-		},
-		async validateSignupToken(params: {
-			inviteeId: string;
-			inviterId: string;
-		}): Promise<{ inviter: { firstName: string; lastName: string } }> {
-			const rootStore = useRootStore();
-			return await validateSignupToken(rootStore.getRestApiContext, params);
-		},
-		async signup(params: {
-			inviteeId: string;
-			inviterId: string;
-			firstName: string;
-			lastName: string;
-			password: string;
-			otp: string;
-			otpSecret: string;
-		}): Promise<void> {
-			const rootStore = useRootStore();
-			const user = await signup(rootStore.getRestApiContext, params);
-			if (user) {
-				this.addUsers([user]);
-				this.currentUserId = user.id;
-			}
-
-			usePostHog().init(user.featureFlags);
-		},
-		async sendForgotPasswordEmail(params: { email: string }): Promise<void> {
-			const rootStore = useRootStore();
-			await sendForgotPasswordEmail(rootStore.getRestApiContext, params);
-		},
-		async validatePasswordToken(params: { token: string; userId: string }): Promise<void> {
-			const rootStore = useRootStore();
-			await validatePasswordToken(rootStore.getRestApiContext, params);
-		},
-		async changePassword(params: {
-			token: string;
-			password: string;
-			userId: string;
-		}): Promise<void> {
-			const rootStore = useRootStore();
-			await changePassword(rootStore.getRestApiContext, params);
-		},
-		async updateUser(params: {
-			id: string;
-			firstName: string;
-			lastName: string;
-			email: string;
-		}): Promise<void> {
-			const rootStore = useRootStore();
-			const user = await updateCurrentUser(rootStore.getRestApiContext, params);
-			this.addUsers([user]);
-		},
-		async updateUserSettings(settings: IUserResponse['settings']): Promise<void> {
-			const rootStore = useRootStore();
-			const updatedSettings = await updateCurrentUserSettings(
-				rootStore.getRestApiContext,
-				settings,
-			);
-			if (this.currentUser) {
-				this.currentUser.settings = updatedSettings;
-				this.addUsers([this.currentUser]);
-			}
-		},
-		async updateCurrentUserPassword({
-			password,
-			currentPassword,
-		}: {
-			password: string;
-			currentPassword: string;
-		}): Promise<void> {
-			const rootStore = useRootStore();
-			await updateCurrentUserPassword(rootStore.getRestApiContext, {
-				newPassword: password,
-				currentPassword,
-			});
-		},
-		async deleteUser(params: { id: string; transferId?: string }): Promise<void> {
-			const rootStore = useRootStore();
-			await deleteUser(rootStore.getRestApiContext, params);
-			this.deleteUserById(params.id);
-		},
-		async fetchUsers(): Promise<void> {
-			const rootStore = useRootStore();
-			const users = await getUsers(rootStore.getRestApiContext);
-			this.addUsers(users);
-		},
-		async inviteUsers(params: Array<{ email: string }>): Promise<IInviteResponse[]> {
-			const rootStore = useRootStore();
-			const users = await inviteUsers(rootStore.getRestApiContext, params);
-			this.addUsers(users.map(({ user }) => ({ isPending: true, ...user })));
-			return users;
-		},
-		async reinviteUser(params: { id: string }): Promise<void> {
-			const rootStore = useRootStore();
-			await reinvite(rootStore.getRestApiContext, params);
-		},
-		async getUserInviteLink(params: { id: string }): Promise<{ link: string }> {
-			const rootStore = useRootStore();
-			return await getInviteLink(rootStore.getRestApiContext, params);
-		},
-		async submitPersonalizationSurvey(results: IPersonalizationLatestVersion): Promise<void> {
-			const rootStore = useRootStore();
-			await submitPersonalizationSurvey(rootStore.getRestApiContext, results);
-			this.setPersonalizationAnswers(results);
-		},
-		async showPersonalizationSurvey(): Promise<void> {
-			const settingsStore = useSettingsStore();
-			const surveyEnabled = settingsStore.isPersonalizationSurveyEnabled;
-			const currentUser = this.currentUser;
-			if (surveyEnabled && currentUser && !currentUser.personalizationAnswers) {
-				const uiStore = useUIStore();
-				uiStore.openModal(PERSONALIZATION_MODAL_KEY);
-			}
-		},
-		async showUserActivationSurveyModal() {
-			const settingsStore = useSettingsStore();
-			if (settingsStore.isUserActivationSurveyEnabled) {
-				const currentUser = this.currentUser;
-				if (currentUser?.settings?.showUserActivationSurvey) {
-					const uiStore = useUIStore();
-					uiStore.openModal(USER_ACTIVATION_SURVEY_MODAL);
-				}
-			}
-		},
-		async skipOwnerSetup(): Promise<void> {
-			try {
-				const rootStore = useRootStore();
-				const settingsStore = useSettingsStore();
-				settingsStore.stopShowingSetupPage();
-				await skipOwnerSetup(rootStore.getRestApiContext);
-			} catch (error) {}
-		},
-	},
-});
diff --git a/packages/editor-ui/src/stores/versionControl.ts b/packages/editor-ui/src/stores/versionControl.ts
deleted file mode 100644
index 315d20445570a..0000000000000
--- a/packages/editor-ui/src/stores/versionControl.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { computed } from 'vue';
-import { defineStore } from 'pinia';
-import { EnterpriseEditionFeature } from '@/constants';
-import { useSettingsStore } from '@/stores/settings';
-
-export const useVersionControlStore = defineStore('versionControl', () => {
-	const settingsStore = useSettingsStore();
-
-	const isEnterpriseVersionControlEnabled = computed(() =>
-		settingsStore.isEnterpriseFeatureEnabled(EnterpriseEditionFeature.VersionControl),
-	);
-
-	return {
-		isEnterpriseVersionControlEnabled,
-	};
-});
diff --git a/packages/editor-ui/src/stores/versions.store.ts b/packages/editor-ui/src/stores/versions.store.ts
new file mode 100644
index 0000000000000..5b96f106a79ea
--- /dev/null
+++ b/packages/editor-ui/src/stores/versions.store.ts
@@ -0,0 +1,86 @@
+import { getNextVersions } from '@/api/versions';
+import { STORES, VERSIONS_MODAL_KEY } from '@/constants';
+import type { IVersion, IVersionNotificationSettings, IVersionsState } from '@/Interface';
+import { defineStore } from 'pinia';
+import { useRootStore } from './n8nRoot.store';
+import { useToast } from '@/composables/useToast';
+import { useUIStore } from '@/stores/ui.store';
+
+export const useVersionsStore = defineStore(STORES.VERSIONS, {
+	state: (): IVersionsState => ({
+		versionNotificationSettings: {
+			enabled: false,
+			endpoint: '',
+			infoUrl: '',
+		},
+		nextVersions: [],
+		currentVersion: undefined,
+	}),
+	getters: {
+		hasVersionUpdates(): boolean {
+			return this.nextVersions.length > 0;
+		},
+		areNotificationsEnabled(): boolean {
+			return this.versionNotificationSettings.enabled;
+		},
+		infoUrl(): string {
+			return this.versionNotificationSettings.infoUrl;
+		},
+	},
+	actions: {
+		setVersions({ versions, currentVersion }: { versions: IVersion[]; currentVersion: string }) {
+			this.nextVersions = versions.filter((version) => version.name !== currentVersion);
+			this.currentVersion = versions.find((version) => version.name === currentVersion);
+		},
+		setVersionNotificationSettings(settings: IVersionNotificationSettings) {
+			this.versionNotificationSettings = settings;
+		},
+		async fetchVersions() {
+			try {
+				const { enabled, endpoint } = this.versionNotificationSettings;
+				if (enabled && endpoint) {
+					const rootStore = useRootStore();
+					const currentVersion = rootStore.versionCli;
+					const instanceId = rootStore.instanceId;
+					const versions = await getNextVersions(endpoint, currentVersion, instanceId);
+					this.setVersions({ versions, currentVersion });
+				}
+			} catch (e) {}
+		},
+		async checkForNewVersions() {
+			const enabled = this.areNotificationsEnabled;
+			if (!enabled) {
+				return;
+			}
+
+			const { showToast } = useToast();
+			const uiStore = useUIStore();
+
+			await this.fetchVersions();
+
+			const currentVersion = this.currentVersion;
+			const nextVersions = this.nextVersions;
+
+			if (currentVersion && currentVersion.hasSecurityIssue && nextVersions.length) {
+				const fixVersion = currentVersion.securityIssueFixVersion;
+				let message = 'Please update to latest version.';
+				if (fixVersion) {
+					message = `Please update to version ${fixVersion} or higher.`;
+				}
+
+				message = `${message} <a class="primary-color">More info</a>`;
+				showToast({
+					title: 'Critical update available',
+					message,
+					onClick: () => {
+						uiStore.openModal(VERSIONS_MODAL_KEY);
+					},
+					closeOnClick: true,
+					customClass: 'clickable',
+					type: 'warning',
+					duration: 0,
+				});
+			}
+		},
+	},
+});
diff --git a/packages/editor-ui/src/stores/versions.ts b/packages/editor-ui/src/stores/versions.ts
deleted file mode 100644
index 6642e71dad498..0000000000000
--- a/packages/editor-ui/src/stores/versions.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import { getNextVersions } from '@/api/versions';
-import { STORES } from '@/constants';
-import type { IVersion, IVersionNotificationSettings, IVersionsState } from '@/Interface';
-import { defineStore } from 'pinia';
-import { useRootStore } from './n8nRootStore';
-
-export const useVersionsStore = defineStore(STORES.VERSIONS, {
-	state: (): IVersionsState => ({
-		versionNotificationSettings: {
-			enabled: false,
-			endpoint: '',
-			infoUrl: '',
-		},
-		nextVersions: [],
-		currentVersion: undefined,
-	}),
-	getters: {
-		hasVersionUpdates(): boolean {
-			return this.nextVersions.length > 0;
-		},
-		areNotificationsEnabled(): boolean {
-			return this.versionNotificationSettings.enabled;
-		},
-		infoUrl(): string {
-			return this.versionNotificationSettings.infoUrl;
-		},
-	},
-	actions: {
-		setVersions({ versions, currentVersion }: { versions: IVersion[]; currentVersion: string }) {
-			this.nextVersions = versions.filter((version) => version.name !== currentVersion);
-			this.currentVersion = versions.find((version) => version.name === currentVersion);
-		},
-		setVersionNotificationSettings(settings: IVersionNotificationSettings) {
-			this.versionNotificationSettings = settings;
-		},
-		async fetchVersions() {
-			try {
-				const { enabled, endpoint } = this.versionNotificationSettings;
-				if (enabled && endpoint) {
-					const rootStore = useRootStore();
-					const currentVersion = rootStore.versionCli;
-					const instanceId = rootStore.instanceId;
-					const versions = await getNextVersions(endpoint, currentVersion, instanceId);
-					this.setVersions({ versions, currentVersion });
-				}
-			} catch (e) {}
-		},
-	},
-});
diff --git a/packages/editor-ui/src/stores/webhooks.store.ts b/packages/editor-ui/src/stores/webhooks.store.ts
new file mode 100644
index 0000000000000..25fcd688035dc
--- /dev/null
+++ b/packages/editor-ui/src/stores/webhooks.store.ts
@@ -0,0 +1,19 @@
+import { STORES } from '@/constants';
+import { defineStore } from 'pinia';
+import { useRootStore } from './n8nRoot.store';
+import { useNDVStore } from './ndv.store';
+import { useUIStore } from './ui.store';
+import { useUsersStore } from './users.store';
+import { useWorkflowsStore } from './workflows.store';
+import { useSettingsStore } from './settings.store';
+
+export const useWebhooksStore = defineStore(STORES.WEBHOOKS, () => {
+	return {
+		...useRootStore(),
+		...useWorkflowsStore(),
+		...useUIStore(),
+		...useUsersStore(),
+		...useNDVStore(),
+		...useSettingsStore(),
+	};
+});
diff --git a/packages/editor-ui/src/stores/webhooks.ts b/packages/editor-ui/src/stores/webhooks.ts
deleted file mode 100644
index 1aee8ed27773a..0000000000000
--- a/packages/editor-ui/src/stores/webhooks.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-import { STORES } from '@/constants';
-import type { IFakeDoor, INodeUi, IRootState, NestedRecord } from '@/Interface';
-import type { IMenuItem } from 'n8n-design-system';
-import type { IWorkflowSettings } from 'n8n-workflow';
-import { defineStore } from 'pinia';
-import { useRootStore } from './n8nRootStore';
-import { useNDVStore } from './ndv';
-import { useSettingsStore } from './settings';
-import { useUIStore } from './ui';
-import { useUsersStore } from './users';
-import { useWorkflowsStore } from './workflows';
-
-export const useWebhooksStore = defineStore(STORES.WEBHOOKS, {
-	getters: {
-		globalRoleName(): string {
-			return useUsersStore().globalRoleName;
-		},
-		getContextBasedTranslationKeys() {
-			return useUIStore().contextBasedTranslationKeys;
-		},
-		getFakeDoorFeatures() {
-			return useUIStore().fakeDoorFeatures;
-		},
-		isUserManagementEnabled() {
-			return useSettingsStore().isUserManagementEnabled;
-		},
-		getFakeDoorItems(): IFakeDoor[] {
-			return useUIStore().fakeDoorFeatures;
-		},
-		n8nMetadata(): IRootState['n8nMetadata'] {
-			return useRootStore().n8nMetadata;
-		},
-		instanceId(): string {
-			return useRootStore().instanceId;
-		},
-		workflowId(): string {
-			return useWorkflowsStore().workflowId;
-		},
-		workflowName(): string {
-			return useWorkflowsStore().workflowName;
-		},
-		activeNode(): INodeUi | null {
-			return useNDVStore().activeNode;
-		},
-		workflowSettings(): IWorkflowSettings {
-			return useWorkflowsStore().workflowSettings;
-		},
-		activeExecutionId(): string {
-			return useWorkflowsStore().activeExecutionId || '';
-		},
-		nodeByName:
-			(state: IRootState) =>
-			(nodeName: string): INodeUi | null => {
-				return useWorkflowsStore().getNodeByName(nodeName);
-			},
-		allNodes(): INodeUi[] {
-			return useWorkflowsStore().allNodes;
-		},
-	},
-	actions: {
-		addSidebarMenuItems(menuItems: IMenuItem[]) {
-			const uiStore = useUIStore();
-			const updated = uiStore.sidebarMenuItems.concat(menuItems);
-			uiStore.sidebarMenuItems = updated;
-		},
-		setFakeDoorFeatures(fakeDoors: IFakeDoor[]): void {
-			useUIStore().fakeDoorFeatures = fakeDoors;
-		},
-		setContextBasedTranslationKeys(translations: NestedRecord<string>): void {
-			useUIStore().contextBasedTranslationKeys = translations;
-		},
-	},
-});
diff --git a/packages/editor-ui/src/stores/workflowHistory.store.ts b/packages/editor-ui/src/stores/workflowHistory.store.ts
new file mode 100644
index 0000000000000..745806d565899
--- /dev/null
+++ b/packages/editor-ui/src/stores/workflowHistory.store.ts
@@ -0,0 +1,113 @@
+import { computed } from 'vue';
+import { defineStore } from 'pinia';
+import { saveAs } from 'file-saver';
+import type { IWorkflowDataUpdate, IWorkflowDb } from '@/Interface';
+import type {
+	WorkflowHistory,
+	WorkflowVersion,
+	WorkflowHistoryRequestParams,
+	WorkflowVersionId,
+} from '@/types/workflowHistory';
+import * as whApi from '@/api/workflowHistory';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { getNewWorkflow } from '@/api/workflows';
+
+export const useWorkflowHistoryStore = defineStore('workflowHistory', () => {
+	const rootStore = useRootStore();
+	const settingsStore = useSettingsStore();
+	const workflowsStore = useWorkflowsStore();
+
+	const licensePruneTime = computed(() => settingsStore.settings.workflowHistory.licensePruneTime);
+	const pruneTime = computed(() => settingsStore.settings.workflowHistory.pruneTime);
+	const evaluatedPruneTime = computed(() => Math.min(pruneTime.value, licensePruneTime.value));
+	const shouldUpgrade = computed(
+		() => licensePruneTime.value !== -1 && licensePruneTime.value === pruneTime.value,
+	);
+
+	const getWorkflowHistory = async (
+		workflowId: string,
+		queryParams: WorkflowHistoryRequestParams,
+	): Promise<WorkflowHistory[]> =>
+		await whApi.getWorkflowHistory(rootStore.getRestApiContext, workflowId, queryParams);
+
+	const getWorkflowVersion = async (
+		workflowId: string,
+		versionId: string,
+	): Promise<WorkflowVersion> =>
+		await whApi.getWorkflowVersion(rootStore.getRestApiContext, workflowId, versionId);
+
+	const downloadVersion = async (
+		workflowId: string,
+		workflowVersionId: WorkflowVersionId,
+		data: { formattedCreatedAt: string },
+	) => {
+		const [workflow, workflowVersion] = await Promise.all([
+			workflowsStore.fetchWorkflow(workflowId),
+			getWorkflowVersion(workflowId, workflowVersionId),
+		]);
+		const { connections, nodes } = workflowVersion;
+		const blob = new Blob([JSON.stringify({ ...workflow, nodes, connections }, null, 2)], {
+			type: 'application/json;charset=utf-8',
+		});
+		saveAs(blob, `${workflow.name}(${data.formattedCreatedAt}).json`);
+	};
+
+	const cloneIntoNewWorkflow = async (
+		workflowId: string,
+		workflowVersionId: string,
+		data: { formattedCreatedAt: string },
+	): Promise<IWorkflowDb> => {
+		const [workflow, workflowVersion] = await Promise.all([
+			workflowsStore.fetchWorkflow(workflowId),
+			getWorkflowVersion(workflowId, workflowVersionId),
+		]);
+		const { connections, nodes } = workflowVersion;
+		const { name } = workflow;
+		const newWorkflow = await getNewWorkflow(
+			rootStore.getRestApiContext,
+			`${name} (${data.formattedCreatedAt})`,
+		);
+		const newWorkflowData: IWorkflowDataUpdate = {
+			nodes,
+			connections,
+			name: newWorkflow.name,
+		};
+		return await workflowsStore.createNewWorkflow(newWorkflowData);
+	};
+
+	const restoreWorkflow = async (
+		workflowId: string,
+		workflowVersionId: string,
+		shouldDeactivate: boolean,
+	): Promise<IWorkflowDb> => {
+		const workflowVersion = await getWorkflowVersion(workflowId, workflowVersionId);
+		const { connections, nodes } = workflowVersion;
+		const updateData: IWorkflowDataUpdate = { connections, nodes };
+
+		if (shouldDeactivate) {
+			updateData.active = false;
+		}
+
+		return await workflowsStore
+			.updateWorkflow(workflowId, updateData, true)
+			.catch(async (error) => {
+				if (error.httpStatusCode === 400 && error.message.includes('can not be activated')) {
+					return await workflowsStore.fetchWorkflow(workflowId);
+				} else {
+					throw new Error(error);
+				}
+			});
+	};
+
+	return {
+		getWorkflowHistory,
+		getWorkflowVersion,
+		downloadVersion,
+		cloneIntoNewWorkflow,
+		restoreWorkflow,
+		evaluatedPruneTime,
+		shouldUpgrade,
+	};
+});
diff --git a/packages/editor-ui/src/stores/workflows.ee.store.ts b/packages/editor-ui/src/stores/workflows.ee.store.ts
new file mode 100644
index 0000000000000..c4db192b8a32a
--- /dev/null
+++ b/packages/editor-ui/src/stores/workflows.ee.store.ts
@@ -0,0 +1,93 @@
+import type { IUser } from '../Interface';
+import { setWorkflowSharedWith } from '@/api/workflows.ee';
+import { EnterpriseEditionFeature, STORES } from '@/constants';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import { useSettingsStore } from '@/stores/settings.store';
+import { defineStore } from 'pinia';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { i18n } from '@/plugins/i18n';
+
+export const useWorkflowsEEStore = defineStore(STORES.WORKFLOWS_EE, {
+	state() {
+		return {};
+	},
+	getters: {
+		getWorkflowOwnerName() {
+			return (
+				workflowId: string,
+				fallback = i18n.baseText('workflows.shareModal.info.sharee.fallback'),
+			): string => {
+				const workflow = useWorkflowsStore().getWorkflowById(workflowId);
+				return workflow?.ownedBy?.firstName
+					? `${workflow.ownedBy.firstName} ${workflow.ownedBy.lastName} (${workflow.ownedBy.email})`
+					: fallback;
+			};
+		},
+	},
+	actions: {
+		setWorkflowOwnedBy(payload: { workflowId: string; ownedBy: Partial<IUser> }): void {
+			const workflowsStore = useWorkflowsStore();
+
+			workflowsStore.workflowsById[payload.workflowId] = {
+				...workflowsStore.workflowsById[payload.workflowId],
+				ownedBy: payload.ownedBy,
+			};
+			workflowsStore.workflow = {
+				...workflowsStore.workflow,
+				ownedBy: payload.ownedBy,
+			};
+		},
+		setWorkflowSharedWith(payload: {
+			workflowId: string;
+			sharedWith: Array<Partial<IUser>>;
+		}): void {
+			const workflowsStore = useWorkflowsStore();
+
+			workflowsStore.workflowsById[payload.workflowId] = {
+				...workflowsStore.workflowsById[payload.workflowId],
+				sharedWith: payload.sharedWith,
+			};
+			workflowsStore.workflow = {
+				...workflowsStore.workflow,
+				sharedWith: payload.sharedWith,
+			};
+		},
+		addWorkflowSharee(payload: { workflowId: string; sharee: Partial<IUser> }): void {
+			const workflowsStore = useWorkflowsStore();
+
+			workflowsStore.workflowsById[payload.workflowId] = {
+				...workflowsStore.workflowsById[payload.workflowId],
+				sharedWith: (workflowsStore.workflowsById[payload.workflowId].sharedWith || []).concat([
+					payload.sharee,
+				]),
+			};
+		},
+		removeWorkflowSharee(payload: { workflowId: string; sharee: Partial<IUser> }): void {
+			const workflowsStore = useWorkflowsStore();
+
+			workflowsStore.workflowsById[payload.workflowId] = {
+				...workflowsStore.workflowsById[payload.workflowId],
+				sharedWith: (workflowsStore.workflowsById[payload.workflowId].sharedWith || []).filter(
+					(sharee) => sharee.id !== payload.sharee.id,
+				),
+			};
+		},
+		async saveWorkflowSharedWith(payload: {
+			sharedWith: Array<Partial<IUser>>;
+			workflowId: string;
+		}): Promise<void> {
+			const rootStore = useRootStore();
+			const settingsStore = useSettingsStore();
+
+			if (settingsStore.isEnterpriseFeatureEnabled(EnterpriseEditionFeature.Sharing)) {
+				await setWorkflowSharedWith(rootStore.getRestApiContext, payload.workflowId, {
+					shareWithIds: payload.sharedWith.map((sharee) => sharee.id as string),
+				});
+
+				this.setWorkflowSharedWith(payload);
+			}
+		},
+	},
+});
+
+export default useWorkflowsEEStore;
diff --git a/packages/editor-ui/src/stores/workflows.ee.ts b/packages/editor-ui/src/stores/workflows.ee.ts
deleted file mode 100644
index 0f9fcb83b971b..0000000000000
--- a/packages/editor-ui/src/stores/workflows.ee.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-import Vue from 'vue';
-import type { IUser } from '../Interface';
-import { setWorkflowSharedWith } from '@/api/workflows.ee';
-import { EnterpriseEditionFeature, STORES } from '@/constants';
-import { useRootStore } from '@/stores/n8nRootStore';
-import { useSettingsStore } from '@/stores/settings';
-import { defineStore } from 'pinia';
-import { useWorkflowsStore } from '@/stores/workflows';
-import { i18n } from '@/plugins/i18n';
-
-export const useWorkflowsEEStore = defineStore(STORES.WORKFLOWS_EE, {
-	state() {
-		return {};
-	},
-	getters: {
-		getWorkflowOwnerName() {
-			return (
-				workflowId: string,
-				fallback = i18n.baseText('workflows.shareModal.info.sharee.fallback'),
-			): string => {
-				const workflow = useWorkflowsStore().getWorkflowById(workflowId);
-				return workflow && workflow.ownedBy && workflow.ownedBy.firstName
-					? `${workflow.ownedBy.firstName} ${workflow.ownedBy.lastName} (${workflow.ownedBy.email})`
-					: fallback;
-			};
-		},
-	},
-	actions: {
-		setWorkflowOwnedBy(payload: { workflowId: string; ownedBy: Partial<IUser> }): void {
-			const workflowsStore = useWorkflowsStore();
-
-			Vue.set(workflowsStore.workflowsById[payload.workflowId], 'ownedBy', payload.ownedBy);
-			Vue.set(workflowsStore.workflow, 'ownedBy', payload.ownedBy);
-		},
-		setWorkflowSharedWith(payload: {
-			workflowId: string;
-			sharedWith: Array<Partial<IUser>>;
-		}): void {
-			const workflowsStore = useWorkflowsStore();
-
-			Vue.set(workflowsStore.workflowsById[payload.workflowId], 'sharedWith', payload.sharedWith);
-			Vue.set(workflowsStore.workflow, 'sharedWith', payload.sharedWith);
-		},
-		addWorkflowSharee(payload: { workflowId: string; sharee: Partial<IUser> }): void {
-			const workflowsStore = useWorkflowsStore();
-
-			Vue.set(
-				workflowsStore.workflowsById[payload.workflowId],
-				'sharedWith',
-				(workflowsStore.workflowsById[payload.workflowId].sharedWith || []).concat([
-					payload.sharee,
-				]),
-			);
-		},
-		removeWorkflowSharee(payload: { workflowId: string; sharee: Partial<IUser> }): void {
-			const workflowsStore = useWorkflowsStore();
-
-			Vue.set(
-				workflowsStore.workflowsById[payload.workflowId],
-				'sharedWith',
-				(workflowsStore.workflowsById[payload.workflowId].sharedWith || []).filter(
-					(sharee) => sharee.id !== payload.sharee.id,
-				),
-			);
-		},
-		async saveWorkflowSharedWith(payload: {
-			sharedWith: Array<Partial<IUser>>;
-			workflowId: string;
-		}): Promise<void> {
-			const rootStore = useRootStore();
-			const settingsStore = useSettingsStore();
-
-			if (settingsStore.isEnterpriseFeatureEnabled(EnterpriseEditionFeature.Sharing)) {
-				await setWorkflowSharedWith(rootStore.getRestApiContext, payload.workflowId, {
-					shareWithIds: payload.sharedWith.map((sharee) => sharee.id as string),
-				});
-
-				this.setWorkflowSharedWith(payload);
-			}
-		},
-	},
-});
-
-export default useWorkflowsEEStore;
diff --git a/packages/editor-ui/src/stores/workflows.store.spec.ts b/packages/editor-ui/src/stores/workflows.store.spec.ts
new file mode 100644
index 0000000000000..6e5abfb1fdb70
--- /dev/null
+++ b/packages/editor-ui/src/stores/workflows.store.spec.ts
@@ -0,0 +1,444 @@
+import { setActivePinia, createPinia } from 'pinia';
+import * as workflowsApi from '@/api/workflows';
+import {
+	DUPLICATE_POSTFFIX,
+	MAX_WORKFLOW_NAME_LENGTH,
+	PLACEHOLDER_EMPTY_WORKFLOW_ID,
+} from '@/constants';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import type { IExecutionResponse, INodeUi, IWorkflowDb, IWorkflowSettings } from '@/Interface';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import type { ExecutionSummary, IConnection, INodeExecutionData } from 'n8n-workflow';
+import { stringSizeInBytes } from '@/utils/typesUtils';
+import { dataPinningEventBus } from '@/event-bus';
+import { useUIStore } from '@/stores/ui.store';
+
+vi.mock('@/api/workflows', () => ({
+	getWorkflows: vi.fn(),
+	getWorkflow: vi.fn(),
+	getNewWorkflow: vi.fn(),
+}));
+
+vi.mock('@/stores/nodeTypes.store', () => ({
+	useNodeTypesStore: vi.fn(() => ({
+		getNodeType: vi.fn(),
+	})),
+}));
+
+describe('useWorkflowsStore', () => {
+	let workflowsStore: ReturnType<typeof useWorkflowsStore>;
+	let uiStore: ReturnType<typeof useUIStore>;
+
+	beforeEach(() => {
+		setActivePinia(createPinia());
+		workflowsStore = useWorkflowsStore();
+		uiStore = useUIStore();
+	});
+
+	it('should initialize with default state', () => {
+		expect(workflowsStore.workflow.name).toBe('');
+		expect(workflowsStore.workflow.id).toBe(PLACEHOLDER_EMPTY_WORKFLOW_ID);
+	});
+
+	describe('allWorkflows', () => {
+		it('should return sorted workflows by name', () => {
+			workflowsStore.setWorkflows([
+				{ id: '3', name: 'Zeta' },
+				{ id: '1', name: 'Alpha' },
+				{ id: '2', name: 'Beta' },
+			] as IWorkflowDb[]);
+
+			const allWorkflows = workflowsStore.allWorkflows;
+			expect(allWorkflows[0].name).toBe('Alpha');
+			expect(allWorkflows[1].name).toBe('Beta');
+			expect(allWorkflows[2].name).toBe('Zeta');
+		});
+
+		it('should return empty array when no workflows are set', () => {
+			workflowsStore.setWorkflows([]);
+
+			const allWorkflows = workflowsStore.allWorkflows;
+			expect(allWorkflows).toEqual([]);
+		});
+	});
+
+	describe('isNewWorkflow', () => {
+		it('should return true for a new workflow', () => {
+			expect(workflowsStore.isNewWorkflow).toBe(true);
+		});
+
+		it('should return false for an existing workflow', () => {
+			workflowsStore.setWorkflowId('123');
+			expect(workflowsStore.isNewWorkflow).toBe(false);
+		});
+	});
+
+	describe('workflowTriggerNodes', () => {
+		it('should return only nodes that are triggers', () => {
+			vi.mocked(useNodeTypesStore).mockReturnValueOnce({
+				getNodeType: vi.fn(() => ({
+					group: ['trigger'],
+				})),
+			} as unknown as ReturnType<typeof useNodeTypesStore>);
+
+			workflowsStore.workflow.nodes = [
+				{ type: 'triggerNode', typeVersion: '1' },
+				{ type: 'nonTriggerNode', typeVersion: '1' },
+			] as unknown as IWorkflowDb['nodes'];
+
+			expect(workflowsStore.workflowTriggerNodes).toHaveLength(1);
+			expect(workflowsStore.workflowTriggerNodes[0].type).toBe('triggerNode');
+		});
+
+		it('should return empty array when no nodes are triggers', () => {
+			workflowsStore.workflow.nodes = [
+				{ type: 'nonTriggerNode1', typeVersion: '1' },
+				{ type: 'nonTriggerNode2', typeVersion: '1' },
+			] as unknown as IWorkflowDb['nodes'];
+
+			expect(workflowsStore.workflowTriggerNodes).toHaveLength(0);
+		});
+	});
+
+	describe('currentWorkflowHasWebhookNode', () => {
+		it('should return true when a node has a webhookId', () => {
+			workflowsStore.workflow.nodes = [
+				{ name: 'Node1', webhookId: 'webhook1' },
+				{ name: 'Node2' },
+			] as unknown as IWorkflowDb['nodes'];
+
+			const hasWebhookNode = workflowsStore.currentWorkflowHasWebhookNode;
+			expect(hasWebhookNode).toBe(true);
+		});
+
+		it('should return false when no nodes have a webhookId', () => {
+			workflowsStore.workflow.nodes = [
+				{ name: 'Node1' },
+				{ name: 'Node2' },
+			] as unknown as IWorkflowDb['nodes'];
+
+			const hasWebhookNode = workflowsStore.currentWorkflowHasWebhookNode;
+			expect(hasWebhookNode).toBe(false);
+		});
+
+		it('should return false when there are no nodes', () => {
+			workflowsStore.workflow.nodes = [];
+
+			const hasWebhookNode = workflowsStore.currentWorkflowHasWebhookNode;
+			expect(hasWebhookNode).toBe(false);
+		});
+	});
+
+	describe('getWorkflowRunData', () => {
+		it('should return null when no execution data is present', () => {
+			workflowsStore.workflowExecutionData = null;
+
+			const runData = workflowsStore.getWorkflowRunData;
+			expect(runData).toBeNull();
+		});
+
+		it('should return null when execution data does not contain resultData', () => {
+			workflowsStore.workflowExecutionData = { data: {} } as IExecutionResponse;
+
+			const runData = workflowsStore.getWorkflowRunData;
+			expect(runData).toBeNull();
+		});
+
+		it('should return runData when execution data contains resultData', () => {
+			const expectedRunData = { node1: [{}, {}], node2: [{}] };
+			workflowsStore.workflowExecutionData = {
+				data: { resultData: { runData: expectedRunData } },
+			} as unknown as IExecutionResponse;
+
+			const runData = workflowsStore.getWorkflowRunData;
+			expect(runData).toEqual(expectedRunData);
+		});
+	});
+
+	describe('nodesIssuesExist', () => {
+		it('should return true when a node has issues', () => {
+			workflowsStore.workflow.nodes = [
+				{ name: 'Node1', issues: { error: ['Error message'] } },
+				{ name: 'Node2' },
+			] as unknown as IWorkflowDb['nodes'];
+
+			const hasIssues = workflowsStore.nodesIssuesExist;
+			expect(hasIssues).toBe(true);
+		});
+
+		it('should return false when no nodes have issues', () => {
+			workflowsStore.workflow.nodes = [
+				{ name: 'Node1' },
+				{ name: 'Node2' },
+			] as unknown as IWorkflowDb['nodes'];
+
+			const hasIssues = workflowsStore.nodesIssuesExist;
+			expect(hasIssues).toBe(false);
+		});
+
+		it('should return false when there are no nodes', () => {
+			workflowsStore.workflow.nodes = [];
+
+			const hasIssues = workflowsStore.nodesIssuesExist;
+			expect(hasIssues).toBe(false);
+		});
+	});
+
+	describe('shouldReplaceInputDataWithPinData', () => {
+		it('should return true when no active workflow execution', () => {
+			workflowsStore.activeWorkflowExecution = null;
+
+			expect(workflowsStore.shouldReplaceInputDataWithPinData).toBe(true);
+		});
+
+		it('should return true when active workflow execution mode is manual', () => {
+			workflowsStore.activeWorkflowExecution = { mode: 'manual' } as unknown as ExecutionSummary;
+
+			expect(workflowsStore.shouldReplaceInputDataWithPinData).toBe(true);
+		});
+
+		it('should return false when active workflow execution mode is not manual', () => {
+			workflowsStore.activeWorkflowExecution = { mode: 'automatic' } as unknown as ExecutionSummary;
+
+			expect(workflowsStore.shouldReplaceInputDataWithPinData).toBe(false);
+		});
+	});
+
+	describe('getWorkflowResultDataByNodeName()', () => {
+		it('should return null when no workflow run data is present', () => {
+			workflowsStore.workflowExecutionData = null;
+
+			const resultData = workflowsStore.getWorkflowResultDataByNodeName('Node1');
+			expect(resultData).toBeNull();
+		});
+
+		it('should return null when node name is not present in workflow run data', () => {
+			workflowsStore.workflowExecutionData = {
+				data: { resultData: { runData: {} } },
+			} as unknown as IExecutionResponse;
+
+			const resultData = workflowsStore.getWorkflowResultDataByNodeName('Node1');
+			expect(resultData).toBeNull();
+		});
+
+		it('should return result data when node name is present in workflow run data', () => {
+			const expectedData = [{}, {}];
+			workflowsStore.workflowExecutionData = {
+				data: { resultData: { runData: { Node1: expectedData } } },
+			} as unknown as IExecutionResponse;
+
+			const resultData = workflowsStore.getWorkflowResultDataByNodeName('Node1');
+			expect(resultData).toEqual(expectedData);
+		});
+	});
+
+	describe('isNodeInOutgoingNodeConnections()', () => {
+		it('should return false when no outgoing connections from root node', () => {
+			workflowsStore.workflow.connections = {};
+
+			const result = workflowsStore.isNodeInOutgoingNodeConnections('RootNode', 'SearchNode');
+			expect(result).toBe(false);
+		});
+
+		it('should return true when search node is directly connected to root node', () => {
+			workflowsStore.workflow.connections = {
+				RootNode: { main: [[{ node: 'SearchNode' } as IConnection]] },
+			};
+
+			const result = workflowsStore.isNodeInOutgoingNodeConnections('RootNode', 'SearchNode');
+			expect(result).toBe(true);
+		});
+
+		it('should return true when search node is indirectly connected to root node', () => {
+			workflowsStore.workflow.connections = {
+				RootNode: { main: [[{ node: 'IntermediateNode' } as IConnection]] },
+				IntermediateNode: { main: [[{ node: 'SearchNode' } as IConnection]] },
+			};
+
+			const result = workflowsStore.isNodeInOutgoingNodeConnections('RootNode', 'SearchNode');
+			expect(result).toBe(true);
+		});
+
+		it('should return false when search node is not connected to root node', () => {
+			workflowsStore.workflow.connections = {
+				RootNode: { main: [[{ node: 'IntermediateNode' } as IConnection]] },
+				IntermediateNode: { main: [[{ node: 'AnotherNode' } as IConnection]] },
+			};
+
+			const result = workflowsStore.isNodeInOutgoingNodeConnections('RootNode', 'SearchNode');
+			expect(result).toBe(false);
+		});
+	});
+
+	describe('getPinDataSize()', () => {
+		it('returns zero when pinData is empty', () => {
+			const pinData = {};
+			const result = workflowsStore.getPinDataSize(pinData);
+			expect(result).toBe(0);
+		});
+
+		it('returns correct size when pinData contains string values', () => {
+			const pinData = {
+				key1: 'value1',
+				key2: 'value2',
+			} as Record<string, string | INodeExecutionData[]>;
+			const result = workflowsStore.getPinDataSize(pinData);
+			expect(result).toBe(stringSizeInBytes(pinData.key1) + stringSizeInBytes(pinData.key2));
+		});
+
+		it('returns correct size when pinData contains array values', () => {
+			const pinData = {
+				key1: [{ parameters: 'value1', data: null }],
+				key2: [{ parameters: 'value2', data: null }],
+			} as unknown as Record<string, string | INodeExecutionData[]>;
+			const result = workflowsStore.getPinDataSize(pinData);
+			expect(result).toBe(stringSizeInBytes(pinData.key1) + stringSizeInBytes(pinData.key2));
+		});
+
+		it('returns correct size when pinData contains mixed string and array values', () => {
+			const pinData = {
+				key1: 'value1',
+				key2: [{ parameters: 'value2', data: null }],
+			} as unknown as Record<string, string | INodeExecutionData[]>;
+			const result = workflowsStore.getPinDataSize(pinData);
+			expect(result).toBe(stringSizeInBytes(pinData.key1) + stringSizeInBytes(pinData.key2));
+		});
+	});
+
+	describe('fetchAllWorkflows()', () => {
+		it('should fetch workflows successfully', async () => {
+			const mockWorkflows = [{ id: '1', name: 'Test Workflow' }] as IWorkflowDb[];
+			vi.mocked(workflowsApi).getWorkflows.mockResolvedValue(mockWorkflows);
+
+			await workflowsStore.fetchAllWorkflows();
+
+			expect(workflowsApi.getWorkflows).toHaveBeenCalled();
+			expect(Object.values(workflowsStore.workflowsById)).toEqual(mockWorkflows);
+		});
+	});
+
+	describe('setWorkflowName()', () => {
+		it('should set the workflow name correctly', () => {
+			workflowsStore.setWorkflowName({ newName: 'New Workflow Name', setStateDirty: false });
+			expect(workflowsStore.workflow.name).toBe('New Workflow Name');
+		});
+	});
+
+	describe('setWorkflowActive()', () => {
+		it('should set workflow as active when it is not already active', () => {
+			workflowsStore.workflowsById = { '1': { active: false } as IWorkflowDb };
+			workflowsStore.workflow.id = '1';
+
+			workflowsStore.setWorkflowActive('1');
+
+			expect(workflowsStore.activeWorkflows).toContain('1');
+			expect(workflowsStore.workflowsById['1'].active).toBe(true);
+			expect(workflowsStore.workflow.active).toBe(true);
+		});
+
+		it('should not modify active workflows when workflow is already active', () => {
+			workflowsStore.activeWorkflows = ['1'];
+			workflowsStore.workflowsById = { '1': { active: true } as IWorkflowDb };
+			workflowsStore.workflow.id = '1';
+
+			workflowsStore.setWorkflowActive('1');
+
+			expect(workflowsStore.activeWorkflows).toEqual(['1']);
+			expect(workflowsStore.workflowsById['1'].active).toBe(true);
+			expect(workflowsStore.workflow.active).toBe(true);
+		});
+	});
+
+	describe('setWorkflowInactive()', () => {
+		it('should set workflow as inactive when it exists', () => {
+			workflowsStore.activeWorkflows = ['1', '2'];
+			workflowsStore.workflowsById = { '1': { active: true } as IWorkflowDb };
+			workflowsStore.setWorkflowInactive('1');
+			expect(workflowsStore.workflowsById['1'].active).toBe(false);
+			expect(workflowsStore.activeWorkflows).toEqual(['2']);
+		});
+
+		it('should not modify active workflows when workflow is not active', () => {
+			workflowsStore.workflowsById = { '2': { active: true } as IWorkflowDb };
+			workflowsStore.activeWorkflows = ['2'];
+			workflowsStore.setWorkflowInactive('1');
+			expect(workflowsStore.activeWorkflows).toEqual(['2']);
+			expect(workflowsStore.workflowsById['2'].active).toBe(true);
+		});
+
+		it('should set current workflow as inactive when it is the target', () => {
+			workflowsStore.workflow.id = '1';
+			workflowsStore.workflow.active = true;
+			workflowsStore.setWorkflowInactive('1');
+			expect(workflowsStore.workflow.active).toBe(false);
+		});
+	});
+
+	describe('getDuplicateCurrentWorkflowName()', () => {
+		it('should return the same name if appending postfix exceeds max length', async () => {
+			const longName = 'a'.repeat(MAX_WORKFLOW_NAME_LENGTH - DUPLICATE_POSTFFIX.length + 1);
+			const newName = await workflowsStore.getDuplicateCurrentWorkflowName(longName);
+			expect(newName).toBe(longName);
+		});
+
+		it('should append postfix to the name if it does not exceed max length', async () => {
+			const name = 'TestWorkflow';
+			const expectedName = `${name}${DUPLICATE_POSTFFIX}`;
+			vi.mocked(workflowsApi).getNewWorkflow.mockResolvedValue({
+				name: expectedName,
+				onboardingFlowEnabled: false,
+				settings: {} as IWorkflowSettings,
+			});
+			const newName = await workflowsStore.getDuplicateCurrentWorkflowName(name);
+			expect(newName).toBe(expectedName);
+		});
+
+		it('should handle API failure gracefully', async () => {
+			const name = 'TestWorkflow';
+			const expectedName = `${name}${DUPLICATE_POSTFFIX}`;
+			vi.mocked(workflowsApi).getNewWorkflow.mockRejectedValue(new Error('API Error'));
+			const newName = await workflowsStore.getDuplicateCurrentWorkflowName(name);
+			expect(newName).toBe(expectedName);
+		});
+	});
+
+	describe('pinData', () => {
+		it('should create pinData object if it does not exist', async () => {
+			workflowsStore.workflow.pinData = undefined;
+			const node = { name: 'TestNode' } as INodeUi;
+			const data = [{ json: 'testData' }] as unknown as INodeExecutionData[];
+			workflowsStore.pinData({ node, data });
+			expect(workflowsStore.workflow.pinData).toBeDefined();
+		});
+
+		it('should convert data to array if it is not', async () => {
+			const node = { name: 'TestNode' } as INodeUi;
+			const data = { json: 'testData' } as unknown as INodeExecutionData;
+			workflowsStore.pinData({ node, data: data as unknown as INodeExecutionData[] });
+			expect(Array.isArray(workflowsStore.workflow.pinData?.[node.name])).toBe(true);
+		});
+
+		it('should store pinData correctly', async () => {
+			const node = { name: 'TestNode' } as INodeUi;
+			const data = [{ json: 'testData' }] as unknown as INodeExecutionData[];
+			workflowsStore.pinData({ node, data });
+			expect(workflowsStore.workflow.pinData?.[node.name]).toEqual(data);
+		});
+
+		it('should emit pin-data event', async () => {
+			const node = { name: 'TestNode' } as INodeUi;
+			const data = [{ json: 'testData' }] as unknown as INodeExecutionData[];
+			const emitSpy = vi.spyOn(dataPinningEventBus, 'emit');
+			workflowsStore.pinData({ node, data });
+			expect(emitSpy).toHaveBeenCalledWith('pin-data', { [node.name]: data });
+		});
+
+		it('should set stateIsDirty to true', async () => {
+			uiStore.stateIsDirty = false;
+			const node = { name: 'TestNode' } as INodeUi;
+			const data = [{ json: 'testData' }] as unknown as INodeExecutionData[];
+			workflowsStore.pinData({ node, data });
+			expect(uiStore.stateIsDirty).toBe(true);
+		});
+	});
+});
diff --git a/packages/editor-ui/src/stores/workflows.store.ts b/packages/editor-ui/src/stores/workflows.store.ts
new file mode 100644
index 0000000000000..09b3ed4d08b1c
--- /dev/null
+++ b/packages/editor-ui/src/stores/workflows.store.ts
@@ -0,0 +1,1658 @@
+import {
+	CHAT_TRIGGER_NODE_TYPE,
+	DEFAULT_NEW_WORKFLOW_NAME,
+	DUPLICATE_POSTFFIX,
+	EnterpriseEditionFeature,
+	ERROR_TRIGGER_NODE_TYPE,
+	MAX_WORKFLOW_NAME_LENGTH,
+	PLACEHOLDER_EMPTY_WORKFLOW_ID,
+	START_NODE_TYPE,
+	STORES,
+} from '@/constants';
+import type {
+	ExecutionsQueryFilter,
+	IExecutionPushResponse,
+	IExecutionResponse,
+	IExecutionsCurrentSummaryExtended,
+	IExecutionsListResponse,
+	INewWorkflowData,
+	INodeMetadata,
+	INodeUi,
+	INodeUpdatePropertiesInformation,
+	IPushDataExecutionFinished,
+	IPushDataNodeExecuteAfter,
+	IPushDataUnsavedExecutionFinished,
+	IStartRunData,
+	IUpdateInformation,
+	IUsedCredential,
+	IUser,
+	IWorkflowDataUpdate,
+	IWorkflowDb,
+	IWorkflowsMap,
+	NodeMetadataMap,
+	WorkflowMetadata,
+	IExecutionFlattedResponse,
+	NodeOutputDb,
+	NodeOutputDbMap,
+	TestSuiteDb,
+	TestSuiteDbMap,
+} from '@/Interface';
+import { defineStore } from 'pinia';
+import type {
+	IAbstractEventMessage,
+	IConnection,
+	IConnections,
+	IDataObject,
+	ExecutionSummary,
+	INode,
+	INodeConnections,
+	INodeCredentials,
+	INodeCredentialsDetails,
+	INodeExecutionData,
+	INodeIssueData,
+	INodeIssueObjectProperty,
+	INodeParameters,
+	INodeTypes,
+	IPinData,
+	IRun,
+	IRunData,
+	IRunExecutionData,
+	ITaskData,
+	IWorkflowSettings,
+	INodeType,
+} from 'n8n-workflow';
+import { deepCopy, NodeHelpers, Workflow } from 'n8n-workflow';
+import { findLast } from 'lodash-es';
+
+import { useRootStore } from '@/stores/n8nRoot.store';
+import * as workflowsApi from '@/api/workflows';
+import { useUIStore } from '@/stores/ui.store';
+import { dataPinningEventBus } from '@/event-bus';
+import { isObject } from '@/utils/objectUtils';
+import { getPairedItemsMapping } from '@/utils/pairedItemUtils';
+import { isJsonKeyObject, isEmpty, stringSizeInBytes } from '@/utils/typesUtils';
+import { makeRestApiRequest, unflattenExecutionData, ResponseError } from '@/utils/apiUtils';
+import { useNDVStore } from '@/stores/ndv.store';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import { useUsersStore } from '@/stores/users.store';
+import { useSettingsStore } from '@/stores/settings.store';
+import { getCredentialOnlyNodeTypeName } from '@/utils/credentialOnlyNodes';
+import { i18n } from '@/plugins/i18n';
+import { computed, ref } from 'vue';
+
+const defaults: Omit<IWorkflowDb, 'id'> & { settings: NonNullable<IWorkflowDb['settings']> } = {
+	name: '',
+	active: false,
+	createdAt: -1,
+	updatedAt: -1,
+	connections: {},
+	nodes: [],
+	settings: {
+		executionOrder: 'v1',
+	},
+	tags: [],
+	pinData: {},
+	versionId: '',
+	usedCredentials: [],
+};
+
+const createEmptyWorkflow = (): IWorkflowDb => ({
+	id: PLACEHOLDER_EMPTY_WORKFLOW_ID,
+	...defaults,
+});
+
+let cachedWorkflowKey: string | null = '';
+let cachedWorkflow: Workflow | null = null;
+
+export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
+	const workflow = ref<IWorkflowDb>(createEmptyWorkflow());
+	const usedCredentials = ref<Record<string, IUsedCredential>>({});
+
+	const activeWorkflows = ref<string[]>([]);
+	const activeExecutions = ref<IExecutionsCurrentSummaryExtended[]>([]);
+	const activeWorkflowExecution = ref<ExecutionSummary | null>(null);
+	const currentWorkflowExecutions = ref<ExecutionSummary[]>([]);
+	const finishedExecutionsCount = ref(0);
+	const workflowExecutionData = ref<IExecutionResponse | null>(null);
+	const workflowExecutionPairedItemMappings = ref<Record<string, Set<string>>>({});
+	const activeExecutionId = ref<string | null>(null);
+	const testSuitesById = ref<Record<string, TestSuiteDb>>({});
+	const nodeOutputsById = ref<Record<string, NodeOutputDb>>({});
+	const subWorkflowExecutionError = ref<Error | null>(null);
+	const executionWaitingForWebhook = ref(false);
+	const executingNode = ref<string[]>([]);
+	const workflowsById = ref<Record<string, IWorkflowDb>>({});
+	const nodeMetadata = ref<NodeMetadataMap>({});
+	const isInDebugMode = ref(false);
+	const chatMessages = ref<string[]>([]);
+
+	const workflowName = computed(() => workflow.value.name);
+
+	const workflowId = computed(() => workflow.value.id);
+
+	const workflowVersionId = computed(() => workflow.value.versionId);
+
+	const workflowSettings = computed(() => workflow.value.settings ?? { ...defaults.settings });
+
+	const workflowTags = computed(() => workflow.value.tags as string[]);
+
+	const allWorkflows = computed(() =>
+		Object.values(workflowsById.value).sort((a, b) => a.name.localeCompare(b.name)),
+	);
+
+	const allTestSuites = computed(() =>
+		Object.values(testSuitesById.value).sort((a, b) => a.name.localeCompare(b.name)),
+	);
+
+	const isNewWorkflow = computed(() => workflow.value.id === PLACEHOLDER_EMPTY_WORKFLOW_ID);
+
+	const isWorkflowActive = computed(() => workflow.value.active);
+
+	const workflowTriggerNodes = computed(() =>
+		workflow.value.nodes.filter((node: INodeUi) => {
+			const nodeTypesStore = useNodeTypesStore();
+			const nodeType = nodeTypesStore.getNodeType(node.type, node.typeVersion);
+			return nodeType && nodeType.group.includes('trigger');
+		}),
+	);
+
+	const currentWorkflowHasWebhookNode = computed(
+		() => !!workflow.value.nodes.find((node: INodeUi) => !!node.webhookId),
+	);
+
+	const getWorkflowRunData = computed<IRunData | null>(() => {
+		if (!workflowExecutionData.value?.data?.resultData) {
+			return null;
+		}
+
+		return workflowExecutionData.value.data.resultData.runData;
+	});
+
+	const allConnections = computed(() => workflow.value.connections);
+
+	const allNodes = computed<INodeUi[]>(() => workflow.value.nodes);
+
+	// Names of all nodes currently on canvas.
+	const canvasNames = computed(() => new Set(allNodes.value.map((n) => n.name)));
+
+	const nodesByName = computed(() => {
+		return workflow.value.nodes.reduce<Record<string, INodeUi>>((acc, node) => {
+			acc[node.name] = node;
+			return acc;
+		}, {});
+	});
+
+	const nodesIssuesExist = computed(() => {
+		for (const node of workflow.value.nodes) {
+			if (node.issues === undefined || Object.keys(node.issues).length === 0) {
+				continue;
+			}
+
+			return true;
+		}
+
+		return false;
+	});
+
+	const pinnedWorkflowData = computed(() => workflow.value.pinData);
+
+	const shouldReplaceInputDataWithPinData = computed(() => {
+		return !activeWorkflowExecution.value || activeWorkflowExecution.value.mode === 'manual';
+	});
+
+	const executedNode = computed(() => workflowExecutionData.value?.executedNode);
+
+	const getAllLoadedFinishedExecutions = computed(() => {
+		return currentWorkflowExecutions.value.filter(
+			(ex) => ex.finished === true || ex.stoppedAt !== undefined,
+		);
+	});
+
+	const getWorkflowExecution = computed(() => workflowExecutionData.value);
+
+	const getTotalFinishedExecutionsCount = computed(() => finishedExecutionsCount.value);
+
+	const getPastChatMessages = computed(() => Array.from(new Set(chatMessages.value)));
+
+	function getWorkflowResultDataByNodeName(nodeName: string): ITaskData[] | null {
+		if (getWorkflowRunData.value === null) {
+			return null;
+		}
+		if (!getWorkflowRunData.value.hasOwnProperty(nodeName)) {
+			return null;
+		}
+		return getWorkflowRunData.value[nodeName];
+	}
+
+	function outgoingConnectionsByNodeName(nodeName: string): INodeConnections {
+		if (workflow.value.connections.hasOwnProperty(nodeName)) {
+			return workflow.value.connections[nodeName] as unknown as INodeConnections;
+		}
+		return {};
+	}
+
+	function nodeHasOutputConnection(nodeName: string): boolean {
+		return workflow.value.connections.hasOwnProperty(nodeName);
+	}
+
+	function isNodeInOutgoingNodeConnections(rootNodeName: string, searchNodeName: string): boolean {
+		const firstNodeConnections = outgoingConnectionsByNodeName(rootNodeName);
+		if (!firstNodeConnections?.main?.[0]) return false;
+
+		const connections = firstNodeConnections.main[0];
+		if (connections.some((node) => node.node === searchNodeName)) return true;
+
+		return connections.some((node) => isNodeInOutgoingNodeConnections(node.node, searchNodeName));
+	}
+
+	function getWorkflowById(id: string): IWorkflowDb {
+		return workflowsById.value[id];
+	}
+
+	function getNodeByName(nodeName: string): INodeUi | null {
+		return nodesByName.value[nodeName] || null;
+	}
+
+	function getNodeById(nodeId: string): INodeUi | undefined {
+		return workflow.value.nodes.find((node) => node.id === nodeId);
+	}
+
+	function getParametersLastUpdate(nodeName: string): number | undefined {
+		return nodeMetadata.value[nodeName]?.parametersLastUpdatedAt;
+	}
+
+	function isNodePristine(nodeName: string): boolean {
+		return nodeMetadata.value[nodeName] === undefined || nodeMetadata.value[nodeName].pristine;
+	}
+
+	function isNodeExecuting(nodeName: string): boolean {
+		return executingNode.value.includes(nodeName);
+	}
+
+	function getExecutionDataById(id: string): ExecutionSummary | undefined {
+		return currentWorkflowExecutions.value.find((execution) => execution.id === id);
+	}
+
+	function getPinDataSize(pinData: Record<string, string | INodeExecutionData[]> = {}): number {
+		return Object.values(pinData).reduce<number>((acc, value) => {
+			return acc + stringSizeInBytes(value);
+		}, 0);
+	}
+
+	async function fetchWorkflowTestSuites(workflowId: string): Promise<TestSuiteDb[]> {
+		const rootStore = useRootStore();
+		const testSuites = await workflowsApi.getTestSuite(rootStore.getRestApiContext, workflowId);
+		setTestSuites(testSuites);
+		return testSuites;
+	}
+
+	async function addWorkflowTestSuite(
+		workflowId: string,
+		description: string,
+	): Promise<TestSuiteDb[]> {
+		const rootStore = useRootStore();
+		const payload = { workflowId, description };
+		const testSuites = await workflowsApi.postTestSuite(rootStore.getRestApiContext, payload);
+		setTestSuites(testSuites);
+		return testSuites;
+	}
+
+	async function fetchWorkflowNodeOutput(id: string): Promise<NodeOutputDb[]> {
+		const rootStore = useRootStore();
+		const nodeOutputs = await makeRestApiRequest<NodeOutputDb[]>(
+			rootStore.getRestApiContext,
+			'GET',
+			`/workflow-tests/nodes-output/${id}`,
+		);
+		setNodeOutputs(nodeOutputs);
+		return nodeOutputs;
+	}
+
+	async function createWorkflowTestSuite(payload: Omit<NodeOutputDb, 'id'>) {
+		const rootStore = useRootStore();
+		const nodeOutputs = await workflowsApi.createTestSuite(rootStore.getRestApiContext, payload);
+		setNodeOutputs(nodeOutputs);
+		return nodeOutputs;
+	}
+
+	async function updateWorkflowTestSuite(payload: NodeOutputDb) {
+		const rootStore = useRootStore();
+		const nodeOutputs = await workflowsApi.patchTestSuite(rootStore.getRestApiContext, payload);
+		setNodeOutputs(nodeOutputs);
+		return nodeOutputs;
+	}
+
+	function getNodeTypes(): INodeTypes {
+		const nodeTypes: INodeTypes = {
+			nodeTypes: {},
+			init: async (): Promise<void> => {},
+			getByNameAndVersion: (nodeType: string, version?: number): INodeType | undefined => {
+				const nodeTypeDescription = useNodeTypesStore().getNodeType(nodeType, version);
+
+				if (nodeTypeDescription === null) {
+					return undefined;
+				}
+
+				return {
+					description: nodeTypeDescription,
+					// As we do not have the trigger/poll functions available in the frontend
+					// we use the information available to figure out what are trigger nodes
+					// @ts-ignore
+					trigger:
+						(![ERROR_TRIGGER_NODE_TYPE, START_NODE_TYPE].includes(nodeType) &&
+							nodeTypeDescription.inputs.length === 0 &&
+							!nodeTypeDescription.webhooks) ||
+						undefined,
+				};
+			},
+		} as unknown as INodeTypes;
+
+		return nodeTypes;
+	}
+
+	// Returns a shallow copy of the nodes which means that all the data on the lower
+	// levels still only gets referenced but the top level object is a different one.
+	// This has the advantage that it is very fast and does not cause problems with vuex
+	// when the workflow replaces the node-parameters.
+	function getNodes(): INodeUi[] {
+		return workflow.value.nodes.map((node) => ({ ...node }));
+	}
+
+	function setTestSuites(testSuites: TestSuiteDb[]): void {
+		testSuitesById.value = testSuites.reduce<TestSuiteDbMap>((acc, testSuite: TestSuiteDb) => {
+			if (testSuite.id) {
+				acc[testSuite.id] = testSuite;
+			}
+			return acc;
+		}, {});
+	}
+
+	function setNodeOutputs(nodeOutputs: NodeOutputDb[]): void {
+		nodeOutputsById.value = nodeOutputs.reduce<NodeOutputDbMap>((acc, nodeOutput: NodeOutputDb) => {
+			if (nodeOutput.nodeId) {
+				if (nodeOutput.errorMessage) {
+					nodeOutput.data = null;
+				}
+				acc[nodeOutput.nodeId] = nodeOutput;
+			}
+			return acc;
+		}, {});
+	}
+
+	function resetWorkflowTestSuites(): void {
+		testSuitesById.value = {};
+	}
+
+	function getWorkflow(nodes: INodeUi[], connections: IConnections, copyData?: boolean): Workflow {
+		const nodeTypes = getNodeTypes();
+		let cachedWorkflowId: string | undefined = workflowId.value;
+		if (cachedWorkflowId && cachedWorkflowId === PLACEHOLDER_EMPTY_WORKFLOW_ID) {
+			cachedWorkflowId = undefined;
+		}
+
+		cachedWorkflow = new Workflow({
+			id: cachedWorkflowId,
+			name: workflowName.value,
+			nodes: copyData ? deepCopy(nodes) : nodes,
+			connections: copyData ? deepCopy(connections) : connections,
+			active: false,
+			nodeTypes,
+			settings: workflowSettings.value,
+			// @ts-ignore
+			pinData: pinnedWorkflowData.value,
+		});
+
+		return cachedWorkflow;
+	}
+
+	function getCurrentWorkflow(copyData?: boolean): Workflow {
+		const nodes = getNodes();
+		const connections = allConnections.value;
+		const cacheKey = JSON.stringify({ nodes, connections });
+		if (!copyData && cachedWorkflow && cacheKey === cachedWorkflowKey) {
+			return cachedWorkflow;
+		}
+		cachedWorkflowKey = cacheKey;
+
+		return getWorkflow(nodes, connections, copyData);
+	}
+
+	async function getWorkflowFromUrl(url: string): Promise<IWorkflowDb> {
+		const rootStore = useRootStore();
+		return await makeRestApiRequest(rootStore.getRestApiContext, 'GET', '/workflows/from-url', {
+			url,
+		});
+	}
+
+	async function getActivationError(id: string): Promise<string | undefined> {
+		const rootStore = useRootStore();
+		return await makeRestApiRequest(
+			rootStore.getRestApiContext,
+			'GET',
+			`/active-workflows/error/${id}`,
+		);
+	}
+
+	async function fetchAllWorkflows(): Promise<IWorkflowDb[]> {
+		const rootStore = useRootStore();
+		const workflows = await workflowsApi.getWorkflows(rootStore.getRestApiContext);
+		setWorkflows(workflows);
+		return workflows;
+	}
+
+	async function fetchWorkflow(id: string): Promise<IWorkflowDb> {
+		const rootStore = useRootStore();
+		const workflow = await workflowsApi.getWorkflow(rootStore.getRestApiContext, id);
+		addWorkflow(workflow);
+		return workflow;
+	}
+
+	async function getNewWorkflowData(name?: string): Promise<INewWorkflowData> {
+		let workflowData = {
+			name: '',
+			onboardingFlowEnabled: false,
+			settings: { ...defaults.settings },
+		};
+		try {
+			const rootStore = useRootStore();
+			workflowData = await workflowsApi.getNewWorkflow(rootStore.getRestApiContext, name);
+		} catch (e) {
+			// in case of error, default to original name
+			workflowData.name = name || DEFAULT_NEW_WORKFLOW_NAME;
+		}
+		setWorkflowName({ newName: workflowData.name, setStateDirty: false });
+		return workflowData;
+	}
+
+	function resetWorkflow() {
+		const usersStore = useUsersStore();
+		const settingsStore = useSettingsStore();
+		workflow.value = createEmptyWorkflow();
+		if (settingsStore.isEnterpriseFeatureEnabled(EnterpriseEditionFeature.Sharing)) {
+			workflow.value = {
+				...workflow.value,
+				ownedBy: usersStore.currentUser as IUser,
+			};
+		}
+	}
+
+	function resetState() {
+		removeAllConnections({ setStateDirty: false });
+		removeAllNodes({ setStateDirty: false, removePinData: true });
+
+		setWorkflowExecutionData(null);
+		resetAllNodesIssues();
+
+		setActive(defaults.active);
+		setWorkflowId(PLACEHOLDER_EMPTY_WORKFLOW_ID);
+		setWorkflowName({ newName: '', setStateDirty: false });
+		setWorkflowSettings({ ...defaults.settings });
+		setWorkflowTagIds([]);
+
+		activeExecutionId.value = null;
+		executingNode.value.length = 0;
+		executionWaitingForWebhook.value = false;
+	}
+
+	function addExecutingNode(nodeName: string) {
+		executingNode.value.push(nodeName);
+	}
+
+	function removeExecutingNode(nodeName: string) {
+		executingNode.value = executingNode.value.filter((name) => name !== nodeName);
+	}
+
+	function setWorkflowId(id: string) {
+		workflow.value.id = id === 'new' ? PLACEHOLDER_EMPTY_WORKFLOW_ID : id;
+	}
+
+	function setUsedCredentials(data: IUsedCredential[]) {
+		workflow.value.usedCredentials = data;
+		usedCredentials.value = data.reduce<{ [name: string]: IUsedCredential }>((accu, credential) => {
+			accu[credential.id] = credential;
+			return accu;
+		}, {});
+	}
+
+	function setWorkflowName(data: { newName: string; setStateDirty: boolean }) {
+		if (data.setStateDirty) {
+			const uiStore = useUIStore();
+			uiStore.stateIsDirty = true;
+		}
+		workflow.value.name = data.newName;
+
+		if (
+			workflow.value.id !== PLACEHOLDER_EMPTY_WORKFLOW_ID &&
+			workflowsById.value[workflow.value.id]
+		) {
+			workflowsById.value[workflow.value.id].name = data.newName;
+		}
+	}
+
+	function setWorkflowVersionId(versionId: string) {
+		workflow.value.versionId = versionId;
+	}
+
+	// replace invalid credentials in workflow
+	function replaceInvalidWorkflowCredentials(data: {
+		credentials: INodeCredentialsDetails;
+		invalid: INodeCredentialsDetails;
+		type: string;
+	}) {
+		workflow.value.nodes.forEach((node: INodeUi) => {
+			const nodeCredentials: INodeCredentials | undefined = (node as unknown as INode).credentials;
+			if (!nodeCredentials?.[data.type]) {
+				return;
+			}
+
+			const nodeCredentialDetails: INodeCredentialsDetails | string = nodeCredentials[data.type];
+
+			if (
+				typeof nodeCredentialDetails === 'string' &&
+				nodeCredentialDetails === data.invalid.name
+			) {
+				(node.credentials as INodeCredentials)[data.type] = data.credentials;
+				return;
+			}
+
+			if (nodeCredentialDetails.id === null) {
+				if (nodeCredentialDetails.name === data.invalid.name) {
+					(node.credentials as INodeCredentials)[data.type] = data.credentials;
+				}
+				return;
+			}
+
+			if (nodeCredentialDetails.id === data.invalid.id) {
+				(node.credentials as INodeCredentials)[data.type] = data.credentials;
+			}
+		});
+	}
+
+	function setWorkflows(workflows: IWorkflowDb[]) {
+		workflowsById.value = workflows.reduce<IWorkflowsMap>((acc, workflow: IWorkflowDb) => {
+			if (workflow.id) {
+				acc[workflow.id] = workflow;
+			}
+			return acc;
+		}, {});
+	}
+
+	async function deleteWorkflow(id: string) {
+		const rootStore = useRootStore();
+		await makeRestApiRequest(rootStore.getRestApiContext, 'DELETE', `/workflows/${id}`);
+		const { [id]: deletedWorkflow, ...workflows } = workflowsById.value;
+		workflowsById.value = workflows;
+	}
+
+	function addWorkflow(workflow: IWorkflowDb) {
+		workflowsById.value = {
+			...workflowsById.value,
+			[workflow.id]: {
+				...workflowsById.value[workflow.id],
+				...deepCopy(workflow),
+			},
+		};
+	}
+
+	function setWorkflowActive(targetWorkflowId: string) {
+		const uiStore = useUIStore();
+		uiStore.stateIsDirty = false;
+		const index = activeWorkflows.value.indexOf(targetWorkflowId);
+		if (index === -1) {
+			activeWorkflows.value.push(targetWorkflowId);
+		}
+		if (workflowsById.value[targetWorkflowId]) {
+			workflowsById.value[targetWorkflowId].active = true;
+		}
+		if (targetWorkflowId === workflow.value.id) {
+			setActive(true);
+		}
+	}
+
+	function setWorkflowInactive(targetWorkflowId: string) {
+		const index = activeWorkflows.value.indexOf(targetWorkflowId);
+		if (index !== -1) {
+			activeWorkflows.value.splice(index, 1);
+		}
+		if (workflowsById.value[targetWorkflowId]) {
+			workflowsById.value[targetWorkflowId].active = false;
+		}
+		if (targetWorkflowId === workflow.value.id) {
+			setActive(false);
+		}
+	}
+
+	async function fetchActiveWorkflows(): Promise<string[]> {
+		const rootStore = useRootStore();
+		const data = await workflowsApi.getActiveWorkflows(rootStore.getRestApiContext);
+		activeWorkflows.value = data;
+		return data;
+	}
+
+	function setActive(active: boolean) {
+		workflow.value.active = active;
+	}
+
+	async function getDuplicateCurrentWorkflowName(currentWorkflowName: string): Promise<string> {
+		if (
+			currentWorkflowName &&
+			currentWorkflowName.length + DUPLICATE_POSTFFIX.length >= MAX_WORKFLOW_NAME_LENGTH
+		) {
+			return currentWorkflowName;
+		}
+
+		let newName = `${currentWorkflowName}${DUPLICATE_POSTFFIX}`;
+		try {
+			const rootStore = useRootStore();
+			const newWorkflow = await workflowsApi.getNewWorkflow(rootStore.getRestApiContext, newName);
+			newName = newWorkflow.name;
+		} catch (e) {}
+		return newName;
+	}
+
+	function setWorkflowExecutionData(workflowResultData: IExecutionResponse | null) {
+		workflowExecutionData.value = workflowResultData;
+		workflowExecutionPairedItemMappings.value = getPairedItemsMapping(workflowResultData);
+	}
+
+	function setWorkflowExecutionRunData(workflowResultData: IRunExecutionData) {
+		if (workflowExecutionData.value) {
+			workflowExecutionData.value = {
+				...workflowExecutionData.value,
+				data: workflowResultData,
+			};
+		}
+	}
+
+	function setWorkflowSettings(workflowSettings: IWorkflowSettings) {
+		workflow.value = {
+			...workflow.value,
+			settings: workflowSettings as IWorkflowDb['settings'],
+		};
+	}
+
+	function setWorkflowPinData(pinData: IPinData) {
+		workflow.value = {
+			...workflow.value,
+			pinData: pinData || {},
+		};
+
+		dataPinningEventBus.emit('pin-data', pinData || {});
+	}
+
+	function setWorkflowTagIds(tags: string[]) {
+		workflow.value = {
+			...workflow.value,
+			tags,
+		};
+	}
+
+	function addWorkflowTagIds(tags: string[]) {
+		workflow.value = {
+			...workflow.value,
+			tags: [...new Set([...(workflow.value.tags ?? []), ...tags])] as IWorkflowDb['tags'],
+		};
+	}
+
+	function removeWorkflowTagId(tagId: string) {
+		const tags = workflow.value.tags as string[];
+		const updated = tags.filter((id: string) => id !== tagId);
+		workflow.value = {
+			...workflow.value,
+			tags: updated as IWorkflowDb['tags'],
+		};
+	}
+
+	function setWorkflowMetadata(metadata: WorkflowMetadata | undefined): void {
+		workflow.value.meta = metadata;
+	}
+
+	function addToWorkflowMetadata(data: Partial<WorkflowMetadata>): void {
+		workflow.value.meta = {
+			...workflow.value.meta,
+			...data,
+		};
+	}
+
+	function setWorkflow(value: IWorkflowDb): void {
+		workflow.value = {
+			...value,
+			...(!value.hasOwnProperty('active') ? { active: false } : {}),
+			...(!value.hasOwnProperty('connections') ? { connections: {} } : {}),
+			...(!value.hasOwnProperty('createdAt') ? { createdAt: -1 } : {}),
+			...(!value.hasOwnProperty('updatedAt') ? { updatedAt: -1 } : {}),
+			...(!value.hasOwnProperty('id') ? { id: PLACEHOLDER_EMPTY_WORKFLOW_ID } : {}),
+			...(!value.hasOwnProperty('nodes') ? { nodes: [] } : {}),
+			...(!value.hasOwnProperty('settings') ? { settings: { ...defaults.settings } } : {}),
+		};
+	}
+
+	function pinData(payload: { node: INodeUi; data: INodeExecutionData[] }): void {
+		if (!workflow.value.pinData) {
+			workflow.value = { ...workflow.value, pinData: {} };
+		}
+
+		if (!Array.isArray(payload.data)) {
+			payload.data = [payload.data];
+		}
+
+		const storedPinData = payload.data.map((item) =>
+			isJsonKeyObject(item) ? { json: item.json } : { json: item },
+		);
+
+		workflow.value = {
+			...workflow.value,
+			pinData: {
+				...workflow.value.pinData,
+				[payload.node.name]: storedPinData,
+			},
+		};
+
+		const uiStore = useUIStore();
+		uiStore.stateIsDirty = true;
+
+		dataPinningEventBus.emit('pin-data', { [payload.node.name]: storedPinData });
+	}
+
+	function unpinData(payload: { node: INodeUi }): void {
+		if (!workflow.value.pinData) {
+			workflow.value = { ...workflow.value, pinData: {} };
+		}
+
+		const { [payload.node.name]: _, ...pinData } = workflow.value.pinData as IPinData;
+		workflow.value = {
+			...workflow.value,
+			pinData,
+		};
+
+		const uiStore = useUIStore();
+		uiStore.stateIsDirty = true;
+
+		dataPinningEventBus.emit('unpin-data', { [payload.node.name]: undefined });
+	}
+
+	function addConnection(data: { connection: IConnection[] }): void {
+		if (data.connection.length !== 2) {
+			// All connections need two entries
+			// TODO: Check if there is an error or whatever that is supposed to be returned
+			return;
+		}
+
+		const sourceData: IConnection = data.connection[0];
+		const destinationData: IConnection = data.connection[1];
+
+		// Check if source node and type exist already and if not add them
+		if (!workflow.value.connections.hasOwnProperty(sourceData.node)) {
+			workflow.value = {
+				...workflow.value,
+				connections: {
+					...workflow.value.connections,
+					[sourceData.node]: {},
+				},
+			};
+		}
+
+		if (!workflow.value.connections[sourceData.node].hasOwnProperty(sourceData.type)) {
+			workflow.value = {
+				...workflow.value,
+				connections: {
+					...workflow.value.connections,
+					[sourceData.node]: {
+						...workflow.value.connections[sourceData.node],
+						[sourceData.type]: [],
+					},
+				},
+			};
+		}
+
+		if (
+			workflow.value.connections[sourceData.node][sourceData.type].length <
+			sourceData.index + 1
+		) {
+			for (
+				let i = workflow.value.connections[sourceData.node][sourceData.type].length;
+				i <= sourceData.index;
+				i++
+			) {
+				workflow.value.connections[sourceData.node][sourceData.type].push([]);
+			}
+		}
+
+		// Check if the same connection exists already
+		const checkProperties = ['index', 'node', 'type'] as Array<keyof IConnection>;
+		let propertyName: keyof IConnection;
+		let connectionExists = false;
+
+		connectionLoop: for (const existingConnection of workflow.value.connections[sourceData.node][
+			sourceData.type
+		][sourceData.index]) {
+			for (propertyName of checkProperties) {
+				if (existingConnection[propertyName] !== destinationData[propertyName]) {
+					continue connectionLoop;
+				}
+			}
+			connectionExists = true;
+			break;
+		}
+
+		// Add the new connection if it does not exist already
+		if (!connectionExists) {
+			workflow.value.connections[sourceData.node][sourceData.type][sourceData.index].push(
+				destinationData,
+			);
+		}
+	}
+
+	function removeConnection(data: { connection: IConnection[] }): void {
+		const sourceData = data.connection[0];
+		const destinationData = data.connection[1];
+
+		if (!workflow.value.connections.hasOwnProperty(sourceData.node)) {
+			return;
+		}
+
+		if (!workflow.value.connections[sourceData.node].hasOwnProperty(sourceData.type)) {
+			return;
+		}
+
+		if (
+			workflow.value.connections[sourceData.node][sourceData.type].length <
+			sourceData.index + 1
+		) {
+			return;
+		}
+
+		const uiStore = useUIStore();
+		uiStore.stateIsDirty = true;
+
+		const connections =
+			workflow.value.connections[sourceData.node][sourceData.type][sourceData.index];
+		for (const index in connections) {
+			if (
+				connections[index].node === destinationData.node &&
+				connections[index].type === destinationData.type &&
+				connections[index].index === destinationData.index
+			) {
+				// Found the connection to remove
+				connections.splice(parseInt(index, 10), 1);
+			}
+		}
+	}
+
+	function removeAllConnections(data: { setStateDirty: boolean }): void {
+		if (data && data.setStateDirty) {
+			const uiStore = useUIStore();
+			uiStore.stateIsDirty = true;
+		}
+
+		workflow.value.connections = {};
+	}
+
+	function removeAllNodeConnection(
+		node: INodeUi,
+		{ preserveInputConnections = false, preserveOutputConnections = false } = {},
+	): void {
+		const uiStore = useUIStore();
+		uiStore.stateIsDirty = true;
+
+		// Remove all source connections
+		if (!preserveOutputConnections && workflow.value.connections.hasOwnProperty(node.name)) {
+			delete workflow.value.connections[node.name];
+		}
+
+		// Remove all destination connections
+		if (preserveInputConnections) return;
+
+		const indexesToRemove = [];
+		let sourceNode: string,
+			type: string,
+			sourceIndex: string,
+			connectionIndex: string,
+			connectionData: IConnection;
+
+		for (sourceNode of Object.keys(workflow.value.connections)) {
+			for (type of Object.keys(workflow.value.connections[sourceNode])) {
+				for (sourceIndex of Object.keys(workflow.value.connections[sourceNode][type])) {
+					indexesToRemove.length = 0;
+					for (connectionIndex of Object.keys(
+						workflow.value.connections[sourceNode][type][parseInt(sourceIndex, 10)],
+					)) {
+						connectionData =
+							workflow.value.connections[sourceNode][type][parseInt(sourceIndex, 10)][
+								parseInt(connectionIndex, 10)
+							];
+						if (connectionData.node === node.name) {
+							indexesToRemove.push(connectionIndex);
+						}
+					}
+					indexesToRemove.forEach((index) => {
+						workflow.value.connections[sourceNode][type][parseInt(sourceIndex, 10)].splice(
+							parseInt(index, 10),
+							1,
+						);
+					});
+				}
+			}
+		}
+	}
+
+	function renameNodeSelectedAndExecution(nameData: { old: string; new: string }): void {
+		const uiStore = useUIStore();
+		uiStore.stateIsDirty = true;
+
+		// If node has any WorkflowResultData rename also that one that the data
+		// does still get displayed also after node got renamed
+		if (
+			workflowExecutionData.value?.data &&
+			workflowExecutionData.value.data.resultData.runData.hasOwnProperty(nameData.old)
+		) {
+			workflowExecutionData.value.data.resultData.runData[nameData.new] =
+				workflowExecutionData.value.data.resultData.runData[nameData.old];
+			delete workflowExecutionData.value.data.resultData.runData[nameData.old];
+		}
+
+		// In case the renamed node was last selected set it also there with the new name
+		if (uiStore.lastSelectedNode === nameData.old) {
+			uiStore.lastSelectedNode = nameData.new;
+		}
+
+		const { [nameData.old]: removed, ...rest } = nodeMetadata.value;
+		nodeMetadata.value = { ...rest, [nameData.new]: nodeMetadata.value[nameData.old] };
+
+		if (workflow.value.pinData && workflow.value.pinData.hasOwnProperty(nameData.old)) {
+			const { [nameData.old]: renamed, ...restPinData } = workflow.value.pinData;
+			workflow.value = {
+				...workflow.value,
+				pinData: {
+					...restPinData,
+					[nameData.new]: renamed,
+				},
+			};
+		}
+	}
+
+	function resetAllNodesIssues(): boolean {
+		workflow.value.nodes.forEach((node) => {
+			node.issues = undefined;
+		});
+		return true;
+	}
+
+	function updateNodeAtIndex(nodeIndex: number, nodeData: Partial<INodeUi>): void {
+		if (nodeIndex !== -1) {
+			const node = workflow.value.nodes[nodeIndex];
+			workflow.value = {
+				...workflow.value,
+				nodes: [
+					...workflow.value.nodes.slice(0, nodeIndex),
+					{ ...node, ...nodeData },
+					...workflow.value.nodes.slice(nodeIndex + 1),
+				],
+			};
+		}
+	}
+
+	function setNodeIssue(nodeIssueData: INodeIssueData): boolean {
+		const nodeIndex = workflow.value.nodes.findIndex((node) => {
+			return node.name === nodeIssueData.node;
+		});
+		if (nodeIndex === -1) {
+			return false;
+		}
+
+		const node = workflow.value.nodes[nodeIndex];
+
+		if (nodeIssueData.value === null) {
+			// Remove the value if one exists
+			if (node.issues?.[nodeIssueData.type] === undefined) {
+				// No values for type exist so nothing has to get removed
+				return true;
+			}
+
+			const { [nodeIssueData.type]: removedNodeIssue, ...remainingNodeIssues } = node.issues;
+			updateNodeAtIndex(nodeIndex, {
+				issues: remainingNodeIssues,
+			});
+		} else {
+			if (node.issues === undefined) {
+				updateNodeAtIndex(nodeIndex, {
+					issues: {},
+				});
+			}
+
+			updateNodeAtIndex(nodeIndex, {
+				issues: {
+					...node.issues,
+					[nodeIssueData.type]: nodeIssueData.value as INodeIssueObjectProperty,
+				},
+			});
+		}
+		return true;
+	}
+
+	function addNode(nodeData: INodeUi): void {
+		if (!nodeData.hasOwnProperty('name')) {
+			// All nodes have to have a name
+			// TODO: Check if there is an error or whatever that is supposed to be returned
+			return;
+		}
+
+		if (nodeData.extendsCredential) {
+			nodeData.type = getCredentialOnlyNodeTypeName(nodeData.extendsCredential);
+		}
+
+		workflow.value.nodes.push(nodeData);
+		// Init node metadata
+		if (!nodeMetadata.value[nodeData.name]) {
+			nodeMetadata.value = { ...nodeMetadata.value, [nodeData.name]: {} as INodeMetadata };
+		}
+	}
+
+	function removeNode(node: INodeUi): void {
+		const uiStore = useUIStore();
+		const { [node.name]: removedNodeMetadata, ...remainingNodeMetadata } = nodeMetadata.value;
+		nodeMetadata.value = remainingNodeMetadata;
+
+		if (workflow.value.pinData && workflow.value.pinData.hasOwnProperty(node.name)) {
+			const { [node.name]: removedPinData, ...remainingPinData } = workflow.value.pinData;
+			workflow.value = {
+				...workflow.value,
+				pinData: remainingPinData,
+			};
+		}
+
+		for (let i = 0; i < workflow.value.nodes.length; i++) {
+			if (workflow.value.nodes[i].name === node.name) {
+				workflow.value = {
+					...workflow.value,
+					nodes: [...workflow.value.nodes.slice(0, i), ...workflow.value.nodes.slice(i + 1)],
+				};
+
+				uiStore.stateIsDirty = true;
+				return;
+			}
+		}
+	}
+
+	function removeAllNodes(data: { setStateDirty: boolean; removePinData: boolean }): void {
+		if (data.setStateDirty) {
+			const uiStore = useUIStore();
+			uiStore.stateIsDirty = true;
+		}
+
+		if (data.removePinData) {
+			workflow.value = {
+				...workflow.value,
+				pinData: {},
+			};
+		}
+
+		workflow.value.nodes.splice(0, workflow.value.nodes.length);
+		nodeMetadata.value = {};
+	}
+
+	function updateNodeProperties(updateInformation: INodeUpdatePropertiesInformation): void {
+		// Find the node that should be updated
+		const nodeIndex = workflow.value.nodes.findIndex((node) => {
+			return node.name === updateInformation.name;
+		});
+
+		if (nodeIndex !== -1) {
+			for (const key of Object.keys(updateInformation.properties)) {
+				const uiStore = useUIStore();
+				uiStore.stateIsDirty = true;
+
+				updateNodeAtIndex(nodeIndex, {
+					[key]: updateInformation.properties[key],
+				});
+			}
+		}
+	}
+
+	function setNodeValue(updateInformation: IUpdateInformation): void {
+		// Find the node that should be updated
+		const nodeIndex = workflow.value.nodes.findIndex((node) => {
+			return node.name === updateInformation.name;
+		});
+
+		if (nodeIndex === -1 || !updateInformation.key) {
+			throw new Error(
+				`Node with the name "${updateInformation.name}" could not be found to set parameter.`,
+			);
+		}
+
+		const uiStore = useUIStore();
+		uiStore.stateIsDirty = true;
+
+		updateNodeAtIndex(nodeIndex, {
+			[updateInformation.key]: updateInformation.value,
+		});
+	}
+
+	function setNodeParameters(updateInformation: IUpdateInformation, append?: boolean): void {
+		// Find the node that should be updated
+		const nodeIndex = workflow.value.nodes.findIndex((node) => {
+			return node.name === updateInformation.name;
+		});
+
+		if (nodeIndex === -1) {
+			throw new Error(
+				`Node with the name "${updateInformation.name}" could not be found to set parameter.`,
+			);
+		}
+
+		const node = workflow.value.nodes[nodeIndex];
+
+		const uiStore = useUIStore();
+		uiStore.stateIsDirty = true;
+		const newParameters =
+			!!append && isObject(updateInformation.value)
+				? { ...node.parameters, ...updateInformation.value }
+				: updateInformation.value;
+
+		updateNodeAtIndex(nodeIndex, {
+			parameters: newParameters as INodeParameters,
+		});
+
+		nodeMetadata.value = {
+			...nodeMetadata.value,
+			[node.name]: {
+				...nodeMetadata.value[node.name],
+				parametersLastUpdatedAt: Date.now(),
+			},
+		} as NodeMetadataMap;
+	}
+
+	function setLastNodeParameters(updateInformation: IUpdateInformation): void {
+		const latestNode = findLast(
+			workflow.value.nodes,
+			(node) => node.type === updateInformation.key,
+		) as INodeUi;
+		const nodeType = useNodeTypesStore().getNodeType(latestNode.type);
+		if (!nodeType) return;
+
+		const nodeParams = NodeHelpers.getNodeParameters(
+			nodeType.properties,
+			updateInformation.value as INodeParameters,
+			true,
+			false,
+			latestNode,
+		);
+
+		if (latestNode) {
+			setNodeParameters({ value: nodeParams, name: latestNode.name }, true);
+		}
+	}
+
+	function addNodeExecutionData(pushData: IPushDataNodeExecuteAfter): void {
+		if (!workflowExecutionData.value?.data) {
+			throw new Error('The "workflowExecutionData" is not initialized!');
+		}
+
+		if (workflowExecutionData.value.data.resultData.runData[pushData.nodeName] === undefined) {
+			workflowExecutionData.value = {
+				...workflowExecutionData.value,
+				data: {
+					...workflowExecutionData.value.data,
+					resultData: {
+						...workflowExecutionData.value.data.resultData,
+						runData: {
+							...workflowExecutionData.value.data.resultData.runData,
+							[pushData.nodeName]: [],
+						},
+					},
+				},
+			};
+		}
+		workflowExecutionData.value.data!.resultData.runData[pushData.nodeName].push(pushData.data);
+	}
+
+	function clearNodeExecutionData(nodeName: string): void {
+		if (!workflowExecutionData.value?.data) {
+			return;
+		}
+
+		const { [nodeName]: removedRunData, ...remainingRunData } =
+			workflowExecutionData.value.data.resultData.runData;
+		workflowExecutionData.value = {
+			...workflowExecutionData.value,
+			data: {
+				...workflowExecutionData.value.data,
+				resultData: {
+					...workflowExecutionData.value.data.resultData,
+					runData: remainingRunData,
+				},
+			},
+		};
+	}
+
+	function pinDataByNodeName(nodeName: string): INodeExecutionData[] | undefined {
+		if (!workflow.value.pinData?.[nodeName]) return undefined;
+
+		return workflow.value.pinData[nodeName].map((item) => item.json) as INodeExecutionData[];
+	}
+
+	function activeNode(): INodeUi | null {
+		// kept here for FE hooks
+		const ndvStore = useNDVStore();
+		return ndvStore.activeNode;
+	}
+
+	function addActiveExecution(newActiveExecution: IExecutionsCurrentSummaryExtended): void {
+		// Check if the execution exists already
+		const activeExecution = activeExecutions.value.find((execution) => {
+			return execution.id === newActiveExecution.id;
+		});
+
+		if (activeExecution !== undefined) {
+			// Exists already so no need to add it again
+			if (activeExecution.workflowName === undefined) {
+				activeExecution.workflowName = newActiveExecution.workflowName;
+			}
+			return;
+		}
+
+		activeExecutions.value.unshift(newActiveExecution);
+		activeExecutionId.value = newActiveExecution.id;
+	}
+
+	function finishActiveExecution(
+		finishedActiveExecution: IPushDataExecutionFinished | IPushDataUnsavedExecutionFinished,
+	): void {
+		// Find the execution to set to finished
+		const activeExecutionIndex = activeExecutions.value.findIndex((execution) => {
+			return execution.id === finishedActiveExecution.executionId;
+		});
+
+		if (activeExecutionIndex === -1) {
+			// The execution could not be found
+			return;
+		}
+
+		const activeExecution = activeExecutions.value[activeExecutionIndex];
+
+		activeExecutions.value = [
+			...activeExecutions.value.slice(0, activeExecutionIndex),
+			{
+				...activeExecution,
+				...(finishedActiveExecution.executionId !== undefined
+					? { id: finishedActiveExecution.executionId }
+					: {}),
+				finished: finishedActiveExecution.data.finished,
+				stoppedAt: finishedActiveExecution.data.stoppedAt,
+			},
+			...activeExecutions.value.slice(activeExecutionIndex + 1),
+		];
+
+		if (finishedActiveExecution.data && (finishedActiveExecution.data as IRun).data) {
+			setWorkflowExecutionRunData((finishedActiveExecution.data as IRun).data);
+		}
+	}
+
+	function setActiveExecutions(newActiveExecutions: IExecutionsCurrentSummaryExtended[]): void {
+		activeExecutions.value = newActiveExecutions;
+	}
+
+	// TODO: For sure needs some kind of default filter like last day, with max 10 results, ...
+	async function getPastExecutions(
+		filter: IDataObject,
+		limit: number,
+		lastId?: string,
+		firstId?: string,
+	): Promise<IExecutionsListResponse> {
+		let sendData = {};
+		if (filter) {
+			sendData = {
+				filter,
+				firstId,
+				lastId,
+				limit,
+			};
+		}
+		const rootStore = useRootStore();
+		return await makeRestApiRequest(rootStore.getRestApiContext, 'GET', '/executions', sendData);
+	}
+
+	async function getActiveExecutions(
+		filter: IDataObject,
+	): Promise<IExecutionsCurrentSummaryExtended[]> {
+		let sendData = {};
+		if (filter) {
+			sendData = {
+				filter,
+			};
+		}
+		const rootStore = useRootStore();
+		const output = await makeRestApiRequest<{ results: IExecutionsCurrentSummaryExtended[] }>(
+			rootStore.getRestApiContext,
+			'GET',
+			'/executions',
+			sendData,
+		);
+
+		return output.results;
+	}
+
+	async function getExecution(id: string): Promise<IExecutionResponse | undefined> {
+		const rootStore = useRootStore();
+		const response = await makeRestApiRequest<IExecutionFlattedResponse | undefined>(
+			rootStore.getRestApiContext,
+			'GET',
+			`/executions/${id}`,
+		);
+
+		return response && unflattenExecutionData(response);
+	}
+
+	async function createNewWorkflow(sendData: IWorkflowDataUpdate): Promise<IWorkflowDb> {
+		// make sure that the new ones are not active
+		sendData.active = false;
+
+		const rootStore = useRootStore();
+		return await makeRestApiRequest(
+			rootStore.getRestApiContext,
+			'POST',
+			'/workflows',
+			sendData as unknown as IDataObject,
+		);
+	}
+
+	async function updateWorkflow(
+		id: string,
+		data: IWorkflowDataUpdate,
+		forceSave = false,
+	): Promise<IWorkflowDb> {
+		const rootStore = useRootStore();
+
+		if (data.settings === null) {
+			data.settings = undefined;
+		}
+
+		return await makeRestApiRequest(
+			rootStore.getRestApiContext,
+			'PATCH',
+			`/workflows/${id}${forceSave ? '?forceSave=true' : ''}`,
+			data as unknown as IDataObject,
+		);
+	}
+
+	async function runWorkflow(startRunData: IStartRunData): Promise<IExecutionPushResponse> {
+		const rootStore = useRootStore();
+
+		if (startRunData.workflowData.settings === null) {
+			startRunData.workflowData.settings = undefined;
+		}
+
+		try {
+			return await makeRestApiRequest(
+				rootStore.getRestApiContext,
+				'POST',
+				'/workflows/run',
+				startRunData as unknown as IDataObject,
+			);
+		} catch (error) {
+			if (error.response?.status === 413) {
+				throw new ResponseError(i18n.baseText('workflowRun.showError.payloadTooLarge'), {
+					errorCode: 413,
+					httpStatusCode: 413,
+				});
+			}
+			throw error;
+		}
+	}
+
+	async function removeTestWebhook(targetWorkflowId: string): Promise<boolean> {
+		const rootStore = useRootStore();
+		return await makeRestApiRequest(
+			rootStore.getRestApiContext,
+			'DELETE',
+			`/test-webhook/${targetWorkflowId}`,
+		);
+	}
+
+	async function loadCurrentWorkflowExecutions(
+		requestFilter: ExecutionsQueryFilter,
+	): Promise<ExecutionSummary[]> {
+		let retrievedActiveExecutions: IExecutionsCurrentSummaryExtended[] = [];
+
+		if (!requestFilter.workflowId) {
+			return [];
+		}
+
+		try {
+			const rootStore = useRootStore();
+			if ((!requestFilter.status || !requestFilter.finished) && isEmpty(requestFilter.metadata)) {
+				retrievedActiveExecutions = await workflowsApi.getActiveExecutions(
+					rootStore.getRestApiContext,
+					{
+						workflowId: requestFilter.workflowId,
+					},
+				);
+			}
+			const retrievedFinishedExecutions = await workflowsApi.getExecutions(
+				rootStore.getRestApiContext,
+				requestFilter,
+			);
+			finishedExecutionsCount.value = retrievedFinishedExecutions.count;
+			return [...retrievedActiveExecutions, ...(retrievedFinishedExecutions.results || [])];
+		} catch (error) {
+			throw error;
+		}
+	}
+
+	async function fetchExecutionDataById(executionId: string): Promise<IExecutionResponse | null> {
+		const rootStore = useRootStore();
+		return await workflowsApi.getExecutionData(rootStore.getRestApiContext, executionId);
+	}
+
+	function deleteExecution(execution: ExecutionSummary): void {
+		currentWorkflowExecutions.value.splice(currentWorkflowExecutions.value.indexOf(execution), 1);
+	}
+
+	function addToCurrentExecutions(executions: ExecutionSummary[]): void {
+		executions.forEach((execution) => {
+			const exists = currentWorkflowExecutions.value.find((ex) => ex.id === execution.id);
+			if (!exists && execution.workflowId === workflowId.value) {
+				currentWorkflowExecutions.value.push(execution);
+			}
+		});
+	}
+
+	async function getExecutionEvents(id: string): Promise<IAbstractEventMessage[]> {
+		const rootStore = useRootStore();
+		return await makeRestApiRequest(
+			rootStore.getRestApiContext,
+			'GET',
+			`/eventbus/execution/${id}`,
+		);
+	}
+
+	function getBinaryUrl(
+		binaryDataId: string,
+		action: 'view' | 'download',
+		fileName: string,
+		mimeType: string,
+	): string {
+		const rootStore = useRootStore();
+		let restUrl = rootStore.getRestUrl;
+		if (restUrl.startsWith('/')) restUrl = window.location.origin + restUrl;
+		const url = new URL(`${restUrl}/binary-data`);
+		url.searchParams.append('id', binaryDataId);
+		url.searchParams.append('action', action);
+		if (fileName) url.searchParams.append('fileName', fileName);
+		if (mimeType) url.searchParams.append('mimeType', mimeType);
+		return url.toString();
+	}
+
+	function setNodePristine(nodeName: string, isPristine: boolean): void {
+		nodeMetadata.value = {
+			...nodeMetadata.value,
+			[nodeName]: {
+				...nodeMetadata.value[nodeName],
+				pristine: isPristine,
+			},
+		};
+	}
+
+	function resetChatMessages(): void {
+		chatMessages.value = [];
+	}
+
+	function appendChatMessage(message: string): void {
+		chatMessages.value.push(message);
+	}
+
+	function checkIfNodeHasChatParent(nodeName: string): boolean {
+		const workflow = getCurrentWorkflow();
+		const parents = workflow.getParentNodes(nodeName, 'main');
+
+		const matchedChatNode = parents.find((parent) => {
+			const parentNodeType = getNodeByName(parent)?.type;
+
+			return parentNodeType === CHAT_TRIGGER_NODE_TYPE;
+		});
+
+		return !!matchedChatNode;
+	}
+
+	return {
+		workflow,
+		usedCredentials,
+		activeWorkflows,
+		activeExecutions,
+		activeWorkflowExecution,
+		currentWorkflowExecutions,
+		finishedExecutionsCount,
+		workflowExecutionData,
+		workflowExecutionPairedItemMappings,
+		activeExecutionId,
+		subWorkflowExecutionError,
+		executionWaitingForWebhook,
+		executingNode,
+		workflowsById,
+		nodeMetadata,
+		isInDebugMode,
+		chatMessages,
+		workflowName,
+		workflowId,
+		workflowVersionId,
+		workflowSettings,
+		workflowTags,
+		allWorkflows,
+		isNewWorkflow,
+		isWorkflowActive,
+		workflowTriggerNodes,
+		currentWorkflowHasWebhookNode,
+		getWorkflowRunData,
+		getWorkflowResultDataByNodeName,
+		allConnections,
+		allNodes,
+		canvasNames,
+		nodesByName,
+		nodesIssuesExist,
+		pinnedWorkflowData,
+		shouldReplaceInputDataWithPinData,
+		executedNode,
+		getAllLoadedFinishedExecutions,
+		getWorkflowExecution,
+		getTotalFinishedExecutionsCount,
+		getPastChatMessages,
+		allTestSuites,
+		testSuitesById,
+		nodeOutputsById,
+		outgoingConnectionsByNodeName,
+		nodeHasOutputConnection,
+		isNodeInOutgoingNodeConnections,
+		getWorkflowById,
+		getNodeByName,
+		getNodeById,
+		getParametersLastUpdate,
+		isNodePristine,
+		isNodeExecuting,
+		getExecutionDataById,
+		getPinDataSize,
+		getNodeTypes,
+		getNodes,
+		getWorkflow,
+		getCurrentWorkflow,
+		getWorkflowFromUrl,
+		getActivationError,
+		fetchAllWorkflows,
+		fetchWorkflow,
+		getNewWorkflowData,
+		resetWorkflow,
+		resetState,
+		addExecutingNode,
+		removeExecutingNode,
+		setWorkflowId,
+		setUsedCredentials,
+		setWorkflowName,
+		setWorkflowVersionId,
+		replaceInvalidWorkflowCredentials,
+		setWorkflows,
+		deleteWorkflow,
+		addWorkflow,
+		setWorkflowActive,
+		setWorkflowInactive,
+		fetchActiveWorkflows,
+		setActive,
+		getDuplicateCurrentWorkflowName,
+		setWorkflowExecutionData,
+		setWorkflowExecutionRunData,
+		setWorkflowSettings,
+		setWorkflowPinData,
+		setWorkflowTagIds,
+		addWorkflowTagIds,
+		removeWorkflowTagId,
+		setWorkflowMetadata,
+		addToWorkflowMetadata,
+		setWorkflow,
+		pinData,
+		unpinData,
+		addConnection,
+		removeConnection,
+		removeAllConnections,
+		removeAllNodeConnection,
+		renameNodeSelectedAndExecution,
+		resetAllNodesIssues,
+		updateNodeAtIndex,
+		setNodeIssue,
+		addNode,
+		removeNode,
+		removeAllNodes,
+		updateNodeProperties,
+		setNodeValue,
+		setNodeParameters,
+		setLastNodeParameters,
+		addNodeExecutionData,
+		clearNodeExecutionData,
+		pinDataByNodeName,
+		activeNode,
+		addActiveExecution,
+		finishActiveExecution,
+		setActiveExecutions,
+		getPastExecutions,
+		getActiveExecutions,
+		getExecution,
+		createNewWorkflow,
+		updateWorkflow,
+		runWorkflow,
+		removeTestWebhook,
+		loadCurrentWorkflowExecutions,
+		fetchExecutionDataById,
+		deleteExecution,
+		addToCurrentExecutions,
+		getExecutionEvents,
+		getBinaryUrl,
+		setNodePristine,
+		resetChatMessages,
+		appendChatMessage,
+		checkIfNodeHasChatParent,
+		fetchWorkflowTestSuites,
+		addWorkflowTestSuite,
+		fetchWorkflowNodeOutput,
+		createWorkflowTestSuite,
+		updateWorkflowTestSuite,
+		resetWorkflowTestSuites,
+	};
+});
diff --git a/packages/editor-ui/src/stores/workflows.ts b/packages/editor-ui/src/stores/workflows.ts
deleted file mode 100644
index c1aef4c6010b8..0000000000000
--- a/packages/editor-ui/src/stores/workflows.ts
+++ /dev/null
@@ -1,1256 +0,0 @@
-import {
-	DEFAULT_NEW_WORKFLOW_NAME,
-	DUPLICATE_POSTFFIX,
-	EnterpriseEditionFeature,
-	ERROR_TRIGGER_NODE_TYPE,
-	MAX_WORKFLOW_NAME_LENGTH,
-	PLACEHOLDER_EMPTY_WORKFLOW_ID,
-	START_NODE_TYPE,
-	STORES,
-} from '@/constants';
-import type {
-	ExecutionsQueryFilter,
-	IActivationError,
-	IExecutionDeleteFilter,
-	IExecutionPushResponse,
-	IExecutionResponse,
-	IExecutionsCurrentSummaryExtended,
-	IExecutionsListResponse,
-	IExecutionsStopData,
-	INewWorkflowData,
-	INodeUi,
-	INodeUpdatePropertiesInformation,
-	IPushDataExecutionFinished,
-	IPushDataNodeExecuteAfter,
-	IPushDataUnsavedExecutionFinished,
-	IStartRunData,
-	IUpdateInformation,
-	IUsedCredential,
-	IWorkflowDataUpdate,
-	IWorkflowDb,
-	IWorkflowsMap,
-	WorkflowsState,
-} from '@/Interface';
-import { defineStore } from 'pinia';
-import type {
-	IAbstractEventMessage,
-	IConnection,
-	IConnections,
-	IDataObject,
-	IExecutionsSummary,
-	INode,
-	INodeConnections,
-	INodeCredentials,
-	INodeCredentialsDetails,
-	INodeExecutionData,
-	INodeIssueData,
-	INodeParameters,
-	INodeTypeData,
-	INodeTypes,
-	IPinData,
-	IRun,
-	IRunData,
-	IRunExecutionData,
-	ITaskData,
-	IWorkflowSettings,
-} from 'n8n-workflow';
-import { deepCopy, NodeHelpers, Workflow } from 'n8n-workflow';
-import Vue from 'vue';
-
-import { useRootStore } from './n8nRootStore';
-import {
-	getActiveWorkflows,
-	getCurrentExecutions,
-	getExecutionData,
-	getExecutions,
-	getNewWorkflow,
-	getWorkflow,
-	getWorkflows,
-} from '@/api/workflows';
-import { useUIStore } from './ui';
-import { dataPinningEventBus } from '@/event-bus';
-import {
-	isJsonKeyObject,
-	getPairedItemsMapping,
-	stringSizeInBytes,
-	isObjectLiteral,
-	isEmpty,
-	makeRestApiRequest,
-	unflattenExecutionData,
-} from '@/utils';
-import { useNDVStore } from './ndv';
-import { useNodeTypesStore } from './nodeTypes';
-import { useWorkflowsEEStore } from '@/stores/workflows.ee';
-import { useUsersStore } from '@/stores/users';
-import { useSettingsStore } from '@/stores/settings';
-
-const createEmptyWorkflow = (): IWorkflowDb => ({
-	id: PLACEHOLDER_EMPTY_WORKFLOW_ID,
-	name: '',
-	active: false,
-	createdAt: -1,
-	updatedAt: -1,
-	connections: {},
-	nodes: [],
-	settings: {},
-	tags: [],
-	pinData: {},
-	versionId: '',
-	usedCredentials: [],
-});
-
-let cachedWorkflowKey: string | null = '';
-let cachedWorkflow: Workflow | null = null;
-
-export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, {
-	state: (): WorkflowsState => ({
-		workflow: createEmptyWorkflow(),
-		usedCredentials: {},
-		activeWorkflows: [],
-		activeExecutions: [],
-		currentWorkflowExecutions: [],
-		activeWorkflowExecution: null,
-		finishedExecutionsCount: 0,
-		workflowExecutionData: null,
-		workflowExecutionPairedItemMappings: {},
-		workflowsById: {},
-		subWorkflowExecutionError: null,
-		activeExecutionId: null,
-		executingNode: null,
-		executionWaitingForWebhook: false,
-		nodeMetadata: {},
-	}),
-	getters: {
-		// Workflow getters
-		workflowName(): string {
-			return this.workflow.name;
-		},
-		workflowId(): string {
-			return this.workflow.id;
-		},
-		workflowVersionId(): string | undefined {
-			return this.workflow.versionId;
-		},
-		workflowSettings(): IWorkflowSettings {
-			if (this.workflow.settings === undefined) {
-				return {};
-			}
-			return this.workflow.settings;
-		},
-		workflowTags(): string[] {
-			return this.workflow.tags as string[];
-		},
-		allWorkflows(): IWorkflowDb[] {
-			return Object.values(this.workflowsById).sort((a, b) => a.name.localeCompare(b.name));
-		},
-		isNewWorkflow(): boolean {
-			return this.workflow.id === PLACEHOLDER_EMPTY_WORKFLOW_ID;
-		},
-		isWorkflowActive(): boolean {
-			return this.workflow.active;
-		},
-		workflowTriggerNodes(): INodeUi[] {
-			return this.workflow.nodes.filter((node: INodeUi) => {
-				const nodeTypesStore = useNodeTypesStore();
-				const nodeType = nodeTypesStore.getNodeType(
-					node.type as string,
-					node.typeVersion as number,
-				);
-				return nodeType && nodeType.group.includes('trigger');
-			});
-		},
-		currentWorkflowHasWebhookNode(): boolean {
-			return !!this.workflow.nodes.find((node: INodeUi) => !!node.webhookId);
-		},
-		getWorkflowRunData(): IRunData | null {
-			if (
-				!this.workflowExecutionData ||
-				!this.workflowExecutionData.data ||
-				!this.workflowExecutionData.data.resultData
-			) {
-				return null;
-			}
-			return this.workflowExecutionData.data.resultData.runData;
-		},
-		getWorkflowResultDataByNodeName() {
-			return (nodeName: string): ITaskData[] | null => {
-				const workflowRunData = this.getWorkflowRunData;
-
-				if (workflowRunData === null) {
-					return null;
-				}
-				if (!workflowRunData.hasOwnProperty(nodeName)) {
-					return null;
-				}
-				return workflowRunData[nodeName];
-			};
-		},
-		getWorkflowById() {
-			return (id: string): IWorkflowDb => this.workflowsById[id];
-		},
-
-		// Node getters
-		allConnections(): IConnections {
-			return this.workflow.connections;
-		},
-		outgoingConnectionsByNodeName() {
-			return (nodeName: string): INodeConnections => {
-				if (this.workflow.connections.hasOwnProperty(nodeName)) {
-					return this.workflow.connections[nodeName];
-				}
-				return {};
-			};
-		},
-		allNodes(): INodeUi[] {
-			return this.workflow.nodes;
-		},
-		nodesByName(): { [name: string]: INodeUi } {
-			return this.workflow.nodes.reduce((accu: { [name: string]: INodeUi }, node) => {
-				accu[node.name] = node;
-				return accu;
-			}, {});
-		},
-		getNodeByName() {
-			return (nodeName: string): INodeUi | null => this.nodesByName[nodeName] || null;
-		},
-		getNodeById() {
-			return (nodeId: string): INodeUi | undefined =>
-				this.workflow.nodes.find((node: INodeUi) => {
-					return node.id === nodeId;
-				});
-		},
-		nodesIssuesExist(): boolean {
-			for (const node of this.workflow.nodes) {
-				if (node.issues === undefined || Object.keys(node.issues).length === 0) {
-					continue;
-				}
-				return true;
-			}
-			return false;
-		},
-		getPinData(): IPinData | undefined {
-			return this.workflow.pinData;
-		},
-		pinDataSize(): number {
-			const ndvStore = useNDVStore();
-			const activeNode = ndvStore.activeNodeName;
-			return this.workflow.nodes.reduce((acc, node) => {
-				if (typeof node.pinData !== 'undefined' && node.name !== activeNode) {
-					acc += stringSizeInBytes(node.pinData);
-				}
-
-				return acc;
-			}, 0);
-		},
-		executedNode(): string | undefined {
-			return this.workflowExecutionData ? this.workflowExecutionData.executedNode : undefined;
-		},
-		getParametersLastUpdate(): (name: string) => number | undefined {
-			return (nodeName: string) =>
-				this.nodeMetadata[nodeName] && this.nodeMetadata[nodeName].parametersLastUpdatedAt;
-		},
-
-		isNodePristine(): (name: string) => boolean {
-			return (nodeName: string) =>
-				this.nodeMetadata[nodeName] === undefined || this.nodeMetadata[nodeName].pristine === true;
-		},
-		// Executions getters
-		getExecutionDataById(): (id: string) => IExecutionsSummary | undefined {
-			return (id: string): IExecutionsSummary | undefined =>
-				this.currentWorkflowExecutions.find((execution) => execution.id === id);
-		},
-		getAllLoadedFinishedExecutions(): IExecutionsSummary[] {
-			return this.currentWorkflowExecutions.filter(
-				(ex) => ex.finished === true || ex.stoppedAt !== undefined,
-			);
-		},
-		getWorkflowExecution(): IExecutionResponse | null {
-			return this.workflowExecutionData;
-		},
-		getTotalFinishedExecutionsCount(): number {
-			return this.finishedExecutionsCount;
-		},
-	},
-	actions: {
-		getNodeTypes(): INodeTypes {
-			const nodeTypes: INodeTypes = {
-				nodeTypes: {},
-				init: async (nodeTypes?: INodeTypeData): Promise<void> => {},
-				// @ts-ignore
-				getByNameAndVersion: (nodeType: string, version?: number): INodeType | undefined => {
-					const nodeTypeDescription = useNodeTypesStore().getNodeType(nodeType, version);
-
-					if (nodeTypeDescription === null) {
-						return undefined;
-					}
-
-					return {
-						description: nodeTypeDescription,
-						// As we do not have the trigger/poll functions available in the frontend
-						// we use the information available to figure out what are trigger nodes
-						// @ts-ignore
-						trigger:
-							(![ERROR_TRIGGER_NODE_TYPE, START_NODE_TYPE].includes(nodeType) &&
-								nodeTypeDescription.inputs.length === 0 &&
-								!nodeTypeDescription.webhooks) ||
-							undefined,
-					};
-				},
-			};
-
-			return nodeTypes;
-		},
-
-		// Returns a shallow copy of the nodes which means that all the data on the lower
-		// levels still only gets referenced but the top level object is a different one.
-		// This has the advantage that it is very fast and does not cause problems with vuex
-		// when the workflow replaces the node-parameters.
-		getNodes(): INodeUi[] {
-			const nodes = useWorkflowsStore().allNodes;
-			const returnNodes: INodeUi[] = [];
-
-			for (const node of nodes) {
-				returnNodes.push(Object.assign({}, node));
-			}
-
-			return returnNodes;
-		},
-
-		// Returns a workflow instance.
-		getWorkflow(nodes: INodeUi[], connections: IConnections, copyData?: boolean): Workflow {
-			const nodeTypes = this.getNodeTypes();
-			let workflowId: string | undefined = useWorkflowsStore().workflowId;
-			if (workflowId && workflowId === PLACEHOLDER_EMPTY_WORKFLOW_ID) {
-				workflowId = undefined;
-			}
-
-			const workflowName = useWorkflowsStore().workflowName;
-
-			cachedWorkflow = new Workflow({
-				id: workflowId,
-				name: workflowName,
-				nodes: copyData ? deepCopy(nodes) : nodes,
-				connections: copyData ? deepCopy(connections) : connections,
-				active: false,
-				nodeTypes,
-				settings: useWorkflowsStore().workflowSettings,
-				// @ts-ignore
-				pinData: useWorkflowsStore().getPinData,
-			});
-
-			return cachedWorkflow;
-		},
-
-		getCurrentWorkflow(copyData?: boolean): Workflow {
-			const nodes = this.getNodes();
-			const connections = this.allConnections;
-			const cacheKey = JSON.stringify({ nodes, connections });
-			if (!copyData && cachedWorkflow && cacheKey === cachedWorkflowKey) {
-				return cachedWorkflow;
-			}
-			cachedWorkflowKey = cacheKey;
-
-			return this.getWorkflow(nodes, connections, copyData);
-		},
-
-		// Returns a workflow from a given URL
-		async getWorkflowFromUrl(url: string): Promise<IWorkflowDb> {
-			const rootStore = useRootStore();
-			return await makeRestApiRequest(rootStore.getRestApiContext, 'GET', '/workflows/from-url', {
-				url,
-			});
-		},
-
-		async getActivationError(id: string): Promise<IActivationError | undefined> {
-			const rootStore = useRootStore();
-			return makeRestApiRequest(rootStore.getRestApiContext, 'GET', `/active/error/${id}`);
-		},
-
-		async fetchAllWorkflows(): Promise<IWorkflowDb[]> {
-			const rootStore = useRootStore();
-			const workflows = await getWorkflows(rootStore.getRestApiContext);
-			this.setWorkflows(workflows);
-			return workflows;
-		},
-
-		async fetchWorkflow(id: string): Promise<IWorkflowDb> {
-			const rootStore = useRootStore();
-			const workflow = await getWorkflow(rootStore.getRestApiContext, id);
-			this.addWorkflow(workflow);
-			return workflow;
-		},
-
-		async getNewWorkflowData(name?: string): Promise<INewWorkflowData> {
-			const workflowsEEStore = useWorkflowsEEStore();
-
-			let workflowData = {
-				name: '',
-				onboardingFlowEnabled: false,
-			};
-			try {
-				const rootStore = useRootStore();
-				workflowData = await getNewWorkflow(rootStore.getRestApiContext, name);
-			} catch (e) {
-				// in case of error, default to original name
-				workflowData.name = name || DEFAULT_NEW_WORKFLOW_NAME;
-			}
-
-			this.setWorkflowName({ newName: workflowData.name, setStateDirty: false });
-
-			return workflowData;
-		},
-
-		resetWorkflow() {
-			const usersStore = useUsersStore();
-			const settingsStore = useSettingsStore();
-
-			this.workflow = createEmptyWorkflow();
-
-			if (settingsStore.isEnterpriseFeatureEnabled(EnterpriseEditionFeature.Sharing)) {
-				Vue.set(this.workflow, 'ownedBy', usersStore.currentUser);
-			}
-		},
-
-		setWorkflowId(id: string): void {
-			this.workflow.id = id === 'new' ? PLACEHOLDER_EMPTY_WORKFLOW_ID : id;
-		},
-
-		setUsedCredentials(data: IUsedCredential[]) {
-			this.workflow.usedCredentials = data;
-			this.usedCredentials = data.reduce<{ [name: string]: IUsedCredential }>(
-				(accu, credential) => {
-					accu[credential.id!] = credential;
-					return accu;
-				},
-				{},
-			);
-		},
-
-		setWorkflowName(data: { newName: string; setStateDirty: boolean }): void {
-			if (data.setStateDirty) {
-				const uiStore = useUIStore();
-				uiStore.stateIsDirty = true;
-			}
-			this.workflow.name = data.newName;
-
-			if (
-				this.workflow.id !== PLACEHOLDER_EMPTY_WORKFLOW_ID &&
-				this.workflowsById[this.workflow.id]
-			) {
-				this.workflowsById[this.workflow.id].name = data.newName;
-			}
-		},
-
-		setWorkflowVersionId(versionId: string): void {
-			this.workflow.versionId = versionId;
-		},
-
-		// replace invalid credentials in workflow
-		replaceInvalidWorkflowCredentials(data: {
-			credentials: INodeCredentialsDetails;
-			invalid: INodeCredentialsDetails;
-			type: string;
-		}): void {
-			this.workflow.nodes.forEach((node: INodeUi) => {
-				const nodeCredentials: INodeCredentials | undefined = (node as unknown as INode)
-					.credentials;
-
-				if (!nodeCredentials || !nodeCredentials[data.type]) {
-					return;
-				}
-
-				const nodeCredentialDetails: INodeCredentialsDetails | string = nodeCredentials[data.type];
-
-				if (
-					typeof nodeCredentialDetails === 'string' &&
-					nodeCredentialDetails === data.invalid.name
-				) {
-					(node.credentials as INodeCredentials)[data.type] = data.credentials;
-					return;
-				}
-
-				if (nodeCredentialDetails.id === null) {
-					if (nodeCredentialDetails.name === data.invalid.name) {
-						(node.credentials as INodeCredentials)[data.type] = data.credentials;
-					}
-					return;
-				}
-
-				if (nodeCredentialDetails.id === data.invalid.id) {
-					(node.credentials as INodeCredentials)[data.type] = data.credentials;
-				}
-			});
-		},
-
-		setWorkflows(workflows: IWorkflowDb[]): void {
-			this.workflowsById = workflows.reduce<IWorkflowsMap>((acc, workflow: IWorkflowDb) => {
-				if (workflow.id) {
-					acc[workflow.id] = workflow;
-				}
-
-				return acc;
-			}, {});
-		},
-
-		async deleteWorkflow(id: string): Promise<void> {
-			const rootStore = useRootStore();
-			await makeRestApiRequest(rootStore.getRestApiContext, 'DELETE', `/workflows/${id}`);
-			const { [id]: deletedWorkflow, ...workflows } = this.workflowsById;
-			this.workflowsById = workflows;
-		},
-
-		addWorkflow(workflow: IWorkflowDb): void {
-			Vue.set(this.workflowsById, workflow.id, {
-				...this.workflowsById[workflow.id],
-				...deepCopy(workflow),
-			});
-		},
-
-		setWorkflowActive(workflowId: string): void {
-			const uiStore = useUIStore();
-			uiStore.stateIsDirty = false;
-			const index = this.activeWorkflows.indexOf(workflowId);
-			if (index === -1) {
-				this.activeWorkflows.push(workflowId);
-			}
-			if (this.workflowsById[workflowId]) {
-				this.workflowsById[workflowId].active = true;
-			}
-		},
-
-		setWorkflowInactive(workflowId: string): void {
-			const index = this.activeWorkflows.indexOf(workflowId);
-			if (index !== -1) {
-				this.activeWorkflows.splice(index, 1);
-			}
-			if (this.workflowsById[workflowId]) {
-				this.workflowsById[workflowId].active = false;
-			}
-		},
-
-		async fetchActiveWorkflows(): Promise<string[]> {
-			const rootStore = useRootStore();
-			const activeWorkflows = await getActiveWorkflows(rootStore.getRestApiContext);
-			this.activeWorkflows = activeWorkflows;
-			return activeWorkflows;
-		},
-
-		setActive(newActive: boolean): void {
-			this.workflow.active = newActive;
-		},
-
-		async getDuplicateCurrentWorkflowName(currentWorkflowName: string): Promise<string> {
-			if (
-				currentWorkflowName &&
-				currentWorkflowName.length + DUPLICATE_POSTFFIX.length >= MAX_WORKFLOW_NAME_LENGTH
-			) {
-				return currentWorkflowName;
-			}
-
-			let newName = `${currentWorkflowName}${DUPLICATE_POSTFFIX}`;
-			try {
-				const rootStore = useRootStore();
-				const newWorkflow = await getNewWorkflow(rootStore.getRestApiContext, newName);
-				newName = newWorkflow.name;
-			} catch (e) {}
-			return newName;
-		},
-
-		// Node actions
-		setWorkflowExecutionData(workflowResultData: IExecutionResponse | null): void {
-			this.workflowExecutionData = workflowResultData;
-			this.workflowExecutionPairedItemMappings = getPairedItemsMapping(this.workflowExecutionData);
-		},
-
-		setWorkflowExecutionRunData(workflowResultData: IRunExecutionData): void {
-			if (this.workflowExecutionData) this.workflowExecutionData.data = workflowResultData;
-		},
-
-		setWorkflowSettings(workflowSettings: IWorkflowSettings): void {
-			Vue.set(this.workflow, 'settings', workflowSettings);
-		},
-
-		setWorkflowPinData(pinData: IPinData): void {
-			Vue.set(this.workflow, 'pinData', pinData || {});
-			dataPinningEventBus.emit('pin-data', pinData || {});
-		},
-
-		setWorkflowTagIds(tags: string[]): void {
-			Vue.set(this.workflow, 'tags', tags);
-		},
-
-		addWorkflowTagIds(tags: string[]): void {
-			Vue.set(this.workflow, 'tags', [...new Set([...(this.workflow.tags || []), ...tags])]);
-		},
-
-		removeWorkflowTagId(tagId: string): void {
-			const tags = this.workflow.tags as string[];
-			const updated = tags.filter((id: string) => id !== tagId);
-			Vue.set(this.workflow, 'tags', updated);
-		},
-
-		setWorkflow(workflow: IWorkflowDb): void {
-			Vue.set(this, 'workflow', workflow);
-
-			if (!this.workflow.hasOwnProperty('active')) {
-				Vue.set(this.workflow, 'active', false);
-			}
-			if (!this.workflow.hasOwnProperty('connections')) {
-				Vue.set(this.workflow, 'connections', {});
-			}
-			if (!this.workflow.hasOwnProperty('createdAt')) {
-				Vue.set(this.workflow, 'createdAt', -1);
-			}
-			if (!this.workflow.hasOwnProperty('updatedAt')) {
-				Vue.set(this.workflow, 'updatedAt', -1);
-			}
-			if (!this.workflow.hasOwnProperty('id')) {
-				Vue.set(this.workflow, 'id', PLACEHOLDER_EMPTY_WORKFLOW_ID);
-			}
-			if (!this.workflow.hasOwnProperty('nodes')) {
-				Vue.set(this.workflow, 'nodes', []);
-			}
-			if (!this.workflow.hasOwnProperty('settings')) {
-				Vue.set(this.workflow, 'settings', {});
-			}
-		},
-
-		pinData(payload: { node: INodeUi; data: INodeExecutionData[] }): void {
-			if (!this.workflow.pinData) {
-				Vue.set(this.workflow, 'pinData', {});
-			}
-
-			if (!Array.isArray(payload.data)) {
-				payload.data = [payload.data];
-			}
-
-			const storedPinData = payload.data.map((item) =>
-				isJsonKeyObject(item) ? item : { json: item },
-			);
-
-			Vue.set(this.workflow.pinData!, payload.node.name, storedPinData);
-
-			const uiStore = useUIStore();
-			uiStore.stateIsDirty = true;
-
-			dataPinningEventBus.emit('pin-data', { [payload.node.name]: storedPinData });
-		},
-
-		unpinData(payload: { node: INodeUi }): void {
-			if (!this.workflow.pinData) {
-				Vue.set(this.workflow, 'pinData', {});
-			}
-
-			Vue.set(this.workflow.pinData!, payload.node.name, undefined);
-			delete this.workflow.pinData![payload.node.name];
-
-			const uiStore = useUIStore();
-			uiStore.stateIsDirty = true;
-
-			dataPinningEventBus.emit('unpin-data', { [payload.node.name]: undefined });
-		},
-
-		addConnection(data: { connection: IConnection[] }): void {
-			if (data.connection.length !== 2) {
-				// All connections need two entries
-				// TODO: Check if there is an error or whatever that is supposed to be returned
-				return;
-			}
-			const sourceData: IConnection = data.connection[0];
-			const destinationData: IConnection = data.connection[1];
-
-			// Check if source node and type exist already and if not add them
-			if (!this.workflow.connections.hasOwnProperty(sourceData.node)) {
-				Vue.set(this.workflow.connections, sourceData.node, {});
-			}
-			if (!this.workflow.connections[sourceData.node].hasOwnProperty(sourceData.type)) {
-				Vue.set(this.workflow.connections[sourceData.node], sourceData.type, []);
-			}
-			if (
-				this.workflow.connections[sourceData.node][sourceData.type].length <
-				sourceData.index + 1
-			) {
-				for (
-					let i = this.workflow.connections[sourceData.node][sourceData.type].length;
-					i <= sourceData.index;
-					i++
-				) {
-					this.workflow.connections[sourceData.node][sourceData.type].push([]);
-				}
-			}
-
-			// Check if the same connection exists already
-			const checkProperties = ['index', 'node', 'type'];
-			let propertyName: string;
-			let connectionExists = false;
-			connectionLoop: for (const existingConnection of this.workflow.connections[sourceData.node][
-				sourceData.type
-			][sourceData.index]) {
-				for (propertyName of checkProperties) {
-					if (
-						// eslint-disable-next-line @typescript-eslint/no-explicit-any
-						(existingConnection as any)[propertyName] !== (destinationData as any)[propertyName]
-					) {
-						continue connectionLoop;
-					}
-				}
-				connectionExists = true;
-				break;
-			}
-			// Add the new connection if it does not exist already
-			if (connectionExists === false) {
-				this.workflow.connections[sourceData.node][sourceData.type][sourceData.index].push(
-					destinationData,
-				);
-			}
-		},
-
-		removeConnection(data: { connection: IConnection[] }): void {
-			const sourceData = data.connection[0];
-			const destinationData = data.connection[1];
-
-			if (!this.workflow.connections.hasOwnProperty(sourceData.node)) {
-				return;
-			}
-			if (!this.workflow.connections[sourceData.node].hasOwnProperty(sourceData.type)) {
-				return;
-			}
-			if (
-				this.workflow.connections[sourceData.node][sourceData.type].length <
-				sourceData.index + 1
-			) {
-				return;
-			}
-			const uiStore = useUIStore();
-			uiStore.stateIsDirty = true;
-
-			const connections =
-				this.workflow.connections[sourceData.node][sourceData.type][sourceData.index];
-			for (const index in connections) {
-				if (
-					connections[index].node === destinationData.node &&
-					connections[index].type === destinationData.type &&
-					connections[index].index === destinationData.index
-				) {
-					// Found the connection to remove
-					connections.splice(parseInt(index, 10), 1);
-				}
-			}
-		},
-
-		removeAllConnections(data: { setStateDirty: boolean }): void {
-			if (data && data.setStateDirty) {
-				const uiStore = useUIStore();
-				uiStore.stateIsDirty = true;
-			}
-			this.workflow.connections = {};
-		},
-
-		removeAllNodeConnection(node: INodeUi): void {
-			const uiStore = useUIStore();
-			uiStore.stateIsDirty = true;
-			// Remove all source connections
-			if (this.workflow.connections.hasOwnProperty(node.name)) {
-				delete this.workflow.connections[node.name];
-			}
-
-			// Remove all destination connections
-			const indexesToRemove = [];
-			let sourceNode: string,
-				type: string,
-				sourceIndex: string,
-				connectionIndex: string,
-				connectionData: IConnection;
-			for (sourceNode of Object.keys(this.workflow.connections)) {
-				for (type of Object.keys(this.workflow.connections[sourceNode])) {
-					for (sourceIndex of Object.keys(this.workflow.connections[sourceNode][type])) {
-						indexesToRemove.length = 0;
-						for (connectionIndex of Object.keys(
-							this.workflow.connections[sourceNode][type][parseInt(sourceIndex, 10)],
-						)) {
-							connectionData =
-								this.workflow.connections[sourceNode][type][parseInt(sourceIndex, 10)][
-									parseInt(connectionIndex, 10)
-								];
-							if (connectionData.node === node.name) {
-								indexesToRemove.push(connectionIndex);
-							}
-						}
-
-						indexesToRemove.forEach((index) => {
-							this.workflow.connections[sourceNode][type][parseInt(sourceIndex, 10)].splice(
-								parseInt(index, 10),
-								1,
-							);
-						});
-					}
-				}
-			}
-		},
-
-		renameNodeSelectedAndExecution(nameData: { old: string; new: string }): void {
-			const uiStore = useUIStore();
-			uiStore.stateIsDirty = true;
-			// If node has any WorkflowResultData rename also that one that the data
-			// does still get displayed also after node got renamed
-			if (
-				this.workflowExecutionData !== null &&
-				this.workflowExecutionData.data &&
-				this.workflowExecutionData.data.resultData.runData.hasOwnProperty(nameData.old)
-			) {
-				this.workflowExecutionData.data.resultData.runData[nameData.new] =
-					this.workflowExecutionData.data.resultData.runData[nameData.old];
-				delete this.workflowExecutionData.data.resultData.runData[nameData.old];
-			}
-
-			// In case the renamed node was last selected set it also there with the new name
-			if (uiStore.lastSelectedNode === nameData.old) {
-				uiStore.lastSelectedNode = nameData.new;
-			}
-
-			Vue.set(this.nodeMetadata, nameData.new, this.nodeMetadata[nameData.old]);
-			Vue.delete(this.nodeMetadata, nameData.old);
-
-			if (this.workflow.pinData && this.workflow.pinData.hasOwnProperty(nameData.old)) {
-				Vue.set(this.workflow.pinData, nameData.new, this.workflow.pinData[nameData.old]);
-				Vue.delete(this.workflow.pinData, nameData.old);
-			}
-
-			this.workflowExecutionPairedItemMappings = getPairedItemsMapping(this.workflowExecutionData);
-		},
-
-		resetAllNodesIssues(): boolean {
-			this.workflow.nodes.forEach((node) => {
-				node.issues = undefined;
-			});
-			return true;
-		},
-
-		setNodeIssue(nodeIssueData: INodeIssueData): boolean {
-			const node = this.workflow.nodes.find((node) => {
-				return node.name === nodeIssueData.node;
-			});
-			if (!node) {
-				return false;
-			}
-			if (nodeIssueData.value === null) {
-				// Remove the value if one exists
-				if (node.issues === undefined || node.issues[nodeIssueData.type] === undefined) {
-					// No values for type exist so nothing has to get removed
-					return true;
-				}
-
-				// @ts-ignore
-				Vue.delete(node.issues, nodeIssueData.type);
-			} else {
-				if (node.issues === undefined) {
-					Vue.set(node, 'issues', {});
-				}
-				// Set/Overwrite the value
-				Vue.set(node.issues!, nodeIssueData.type, nodeIssueData.value);
-			}
-			return true;
-		},
-
-		addNode(nodeData: INodeUi): void {
-			if (!nodeData.hasOwnProperty('name')) {
-				// All nodes have to have a name
-				// TODO: Check if there is an error or whatever that is supposed to be returned
-				return;
-			}
-
-			this.workflow.nodes.push(nodeData);
-			// Init node metadata
-			if (!this.nodeMetadata[nodeData.name]) {
-				Vue.set(this.nodeMetadata, nodeData.name, {});
-			}
-		},
-
-		removeNode(node: INodeUi): void {
-			Vue.delete(this.nodeMetadata, node.name);
-
-			if (this.workflow.pinData && this.workflow.pinData.hasOwnProperty(node.name)) {
-				Vue.delete(this.workflow.pinData, node.name);
-			}
-
-			for (let i = 0; i < this.workflow.nodes.length; i++) {
-				if (this.workflow.nodes[i].name === node.name) {
-					this.workflow.nodes.splice(i, 1);
-					const uiStore = useUIStore();
-					uiStore.stateIsDirty = true;
-					return;
-				}
-			}
-		},
-
-		removeAllNodes(data: { setStateDirty: boolean; removePinData: boolean }): void {
-			if (data.setStateDirty) {
-				const uiStore = useUIStore();
-				uiStore.stateIsDirty = true;
-			}
-
-			if (data.removePinData) {
-				Vue.set(this.workflow, 'pinData', {});
-			}
-
-			this.workflow.nodes.splice(0, this.workflow.nodes.length);
-			this.nodeMetadata = {};
-		},
-
-		updateNodeProperties(updateInformation: INodeUpdatePropertiesInformation): void {
-			// Find the node that should be updated
-			const node = this.workflow.nodes.find((node) => {
-				return node.name === updateInformation.name;
-			});
-
-			if (node) {
-				for (const key of Object.keys(updateInformation.properties)) {
-					const uiStore = useUIStore();
-					uiStore.stateIsDirty = true;
-					Vue.set(node, key, updateInformation.properties[key]);
-				}
-			}
-		},
-
-		setNodeValue(updateInformation: IUpdateInformation): void {
-			// Find the node that should be updated
-			const node = this.workflow.nodes.find((node) => {
-				return node.name === updateInformation.name;
-			});
-
-			if (node === undefined || node === null || !updateInformation.key) {
-				throw new Error(
-					`Node with the name "${updateInformation.name}" could not be found to set parameter.`,
-				);
-			}
-
-			const uiStore = useUIStore();
-			uiStore.stateIsDirty = true;
-			Vue.set(node, updateInformation.key, updateInformation.value);
-		},
-
-		setNodeParameters(updateInformation: IUpdateInformation, append?: boolean): void {
-			// Find the node that should be updated
-			const node = this.workflow.nodes.find((node) => {
-				return node.name === updateInformation.name;
-			});
-
-			if (node === undefined || node === null) {
-				throw new Error(
-					`Node with the name "${updateInformation.name}" could not be found to set parameter.`,
-				);
-			}
-
-			const uiStore = useUIStore();
-			uiStore.stateIsDirty = true;
-			const newParameters =
-				!!append && isObjectLiteral(updateInformation.value)
-					? { ...node.parameters, ...updateInformation.value }
-					: updateInformation.value;
-
-			Vue.set(node, 'parameters', newParameters);
-
-			if (!this.nodeMetadata[node.name]) {
-				Vue.set(this.nodeMetadata, node.name, {});
-			}
-
-			Vue.set(this.nodeMetadata[node.name], 'parametersLastUpdatedAt', Date.now());
-		},
-
-		setLastNodeParameters(updateInformation: IUpdateInformation) {
-			const latestNode = this.workflow.nodes.findLast(
-				(node) => node.type === updateInformation.key,
-			) as INodeUi;
-			const nodeType = useNodeTypesStore().getNodeType(latestNode.type);
-			if (!nodeType) return;
-
-			const nodeParams = NodeHelpers.getNodeParameters(
-				nodeType.properties,
-				updateInformation.value as INodeParameters,
-				true,
-				false,
-				latestNode,
-			);
-
-			if (latestNode) this.setNodeParameters({ value: nodeParams, name: latestNode.name }, true);
-		},
-
-		addNodeExecutionData(pushData: IPushDataNodeExecuteAfter): void {
-			if (this.workflowExecutionData === null || !this.workflowExecutionData.data) {
-				throw new Error('The "workflowExecutionData" is not initialized!');
-			}
-			if (this.workflowExecutionData.data.resultData.runData[pushData.nodeName] === undefined) {
-				Vue.set(this.workflowExecutionData.data.resultData.runData, pushData.nodeName, []);
-			}
-			this.workflowExecutionData.data.resultData.runData[pushData.nodeName].push(pushData.data);
-			this.workflowExecutionPairedItemMappings = getPairedItemsMapping(this.workflowExecutionData);
-		},
-		clearNodeExecutionData(nodeName: string): void {
-			if (this.workflowExecutionData === null || !this.workflowExecutionData.data) {
-				return;
-			}
-			Vue.delete(this.workflowExecutionData.data.resultData.runData, nodeName);
-		},
-
-		pinDataByNodeName(nodeName: string): INodeExecutionData[] | undefined {
-			if (!this.workflow.pinData || !this.workflow.pinData[nodeName]) return undefined;
-			return this.workflow.pinData[nodeName].map((item) => item.json) as INodeExecutionData[];
-		},
-
-		activeNode(): INodeUi | null {
-			// kept here for FE hooks
-			const ndvStore = useNDVStore();
-			return ndvStore.activeNode;
-		},
-
-		// Executions actions
-
-		addActiveExecution(newActiveExecution: IExecutionsCurrentSummaryExtended): void {
-			// Check if the execution exists already
-			const activeExecution = this.activeExecutions.find((execution) => {
-				return execution.id === newActiveExecution.id;
-			});
-
-			if (activeExecution !== undefined) {
-				// Exists already so no need to add it again
-				if (activeExecution.workflowName === undefined) {
-					activeExecution.workflowName = newActiveExecution.workflowName;
-				}
-				return;
-			}
-			this.activeExecutions.unshift(newActiveExecution);
-		},
-		finishActiveExecution(
-			finishedActiveExecution: IPushDataExecutionFinished | IPushDataUnsavedExecutionFinished,
-		): void {
-			// Find the execution to set to finished
-			const activeExecution = this.activeExecutions.find((execution) => {
-				return execution.id === finishedActiveExecution.executionId;
-			});
-
-			if (activeExecution === undefined) {
-				// The execution could not be found
-				return;
-			}
-
-			if (finishedActiveExecution.executionId !== undefined) {
-				Vue.set(activeExecution, 'id', finishedActiveExecution.executionId);
-			}
-
-			Vue.set(activeExecution, 'finished', finishedActiveExecution.data.finished);
-			Vue.set(activeExecution, 'stoppedAt', finishedActiveExecution.data.stoppedAt);
-			if (finishedActiveExecution.data && (finishedActiveExecution.data as IRun).data) {
-				this.setWorkflowExecutionRunData((finishedActiveExecution.data as IRun).data);
-			}
-		},
-
-		setActiveExecutions(newActiveExecutions: IExecutionsCurrentSummaryExtended[]): void {
-			Vue.set(this, 'activeExecutions', newActiveExecutions);
-		},
-
-		async retryExecution(id: string, loadWorkflow?: boolean): Promise<boolean> {
-			let sendData;
-			if (loadWorkflow === true) {
-				sendData = {
-					loadWorkflow: true,
-				};
-			}
-			const rootStore = useRootStore();
-			return await makeRestApiRequest(
-				rootStore.getRestApiContext,
-				'POST',
-				`/executions/${id}/retry`,
-				sendData,
-			);
-		},
-
-		// Deletes executions
-		async deleteExecutions(sendData: IExecutionDeleteFilter): Promise<void> {
-			const rootStore = useRootStore();
-			return await makeRestApiRequest(
-				rootStore.getRestApiContext,
-				'POST',
-				'/executions/delete',
-				sendData as unknown as IDataObject,
-			);
-		},
-
-		// TODO: For sure needs some kind of default filter like last day, with max 10 results, ...
-		async getPastExecutions(
-			filter: IDataObject,
-			limit: number,
-			lastId?: string,
-			firstId?: string,
-		): Promise<IExecutionsListResponse> {
-			let sendData = {};
-			if (filter) {
-				sendData = {
-					filter,
-					firstId,
-					lastId,
-					limit,
-				};
-			}
-			const rootStore = useRootStore();
-			return makeRestApiRequest(rootStore.getRestApiContext, 'GET', '/executions', sendData);
-		},
-
-		async getCurrentExecutions(filter: IDataObject): Promise<IExecutionsCurrentSummaryExtended[]> {
-			let sendData = {};
-			if (filter) {
-				sendData = {
-					filter,
-				};
-			}
-			const rootStore = useRootStore();
-			return await makeRestApiRequest(
-				rootStore.getRestApiContext,
-				'GET',
-				'/executions-current',
-				sendData,
-			);
-		},
-
-		async getExecution(id: string): Promise<IExecutionResponse | undefined> {
-			const rootStore = useRootStore();
-			const response = await makeRestApiRequest(
-				rootStore.getRestApiContext,
-				'GET',
-				`/executions/${id}`,
-			);
-			return response && unflattenExecutionData(response);
-		},
-
-		// Creates a new workflow
-		async createNewWorkflow(sendData: IWorkflowDataUpdate): Promise<IWorkflowDb> {
-			const rootStore = useRootStore();
-			return makeRestApiRequest(
-				rootStore.getRestApiContext,
-				'POST',
-				'/workflows',
-				sendData as unknown as IDataObject,
-			);
-		},
-
-		// Updates an existing workflow
-		async updateWorkflow(
-			id: string,
-			data: IWorkflowDataUpdate,
-			forceSave = false,
-		): Promise<IWorkflowDb> {
-			const rootStore = useRootStore();
-			let response;
-			let error;
-			try {
-				response = await makeRestApiRequest(
-					rootStore.getRestApiContext,
-					'PATCH',
-					`/workflows/${id}${forceSave ? '?forceSave=true' : ''}`,
-					data as unknown as IDataObject,
-				);
-			} catch (err) {
-				error = err;
-			}
-
-			const logData = {
-				request: data,
-				response: response || error,
-				workflowId: id,
-				status: response ? 'successful' : 'failed',
-			};
-
-			await makeRestApiRequest(rootStore.getRestApiContext, 'POST', '/save-request-log', logData);
-			if (error) throw error;
-			return response;
-		},
-
-		async runWorkflow(startRunData: IStartRunData): Promise<IExecutionPushResponse> {
-			const rootStore = useRootStore();
-			return await makeRestApiRequest(
-				rootStore.getRestApiContext,
-				'POST',
-				'/workflows/run',
-				startRunData as unknown as IDataObject,
-			);
-		},
-
-		async removeTestWebhook(workflowId: string): Promise<boolean> {
-			const rootStore = useRootStore();
-			return await makeRestApiRequest(
-				rootStore.getRestApiContext,
-				'DELETE',
-				`/test-webhook/${workflowId}`,
-			);
-		},
-
-		async stopCurrentExecution(executionId: string): Promise<IExecutionsStopData> {
-			const rootStore = useRootStore();
-			return await makeRestApiRequest(
-				rootStore.getRestApiContext,
-				'POST',
-				`/executions-current/${executionId}/stop`,
-			);
-		},
-
-		async loadCurrentWorkflowExecutions(
-			requestFilter: ExecutionsQueryFilter,
-		): Promise<IExecutionsSummary[]> {
-			let activeExecutions = [];
-
-			if (!requestFilter.workflowId) {
-				return [];
-			}
-			try {
-				const rootStore = useRootStore();
-				if ((!requestFilter.status || !requestFilter.finished) && isEmpty(requestFilter.metadata)) {
-					activeExecutions = await getCurrentExecutions(rootStore.getRestApiContext, {
-						workflowId: requestFilter.workflowId,
-					});
-				}
-				const finishedExecutions = await getExecutions(rootStore.getRestApiContext, requestFilter);
-				this.finishedExecutionsCount = finishedExecutions.count;
-				return [...activeExecutions, ...(finishedExecutions.results || [])];
-			} catch (error) {
-				throw error;
-			}
-		},
-
-		async fetchExecutionDataById(executionId: string): Promise<IExecutionResponse | null> {
-			const rootStore = useRootStore();
-			return await getExecutionData(rootStore.getRestApiContext, executionId);
-		},
-
-		deleteExecution(execution: IExecutionsSummary): void {
-			this.currentWorkflowExecutions.splice(this.currentWorkflowExecutions.indexOf(execution), 1);
-		},
-
-		addToCurrentExecutions(executions: IExecutionsSummary[]): void {
-			executions.forEach((execution) => {
-				const exists = this.currentWorkflowExecutions.find((ex) => ex.id === execution.id);
-				if (!exists && execution.workflowId === this.workflowId) {
-					this.currentWorkflowExecutions.push(execution);
-				}
-			});
-		},
-		// Returns all the available timezones
-		async getExecutionEvents(id: string): Promise<IAbstractEventMessage[]> {
-			const rootStore = useRootStore();
-			return makeRestApiRequest(rootStore.getRestApiContext, 'GET', '/eventbus/execution/' + id);
-		},
-		// Binary data
-		async getBinaryUrl(dataPath, mode, fileName, mimeType): string {
-			const rootStore = useRootStore();
-			let restUrl = rootStore.getRestUrl;
-			if (restUrl.startsWith('/')) restUrl = window.location.origin + restUrl;
-			const url = new URL(`${restUrl}/data/${dataPath}`);
-			url.searchParams.append('mode', mode);
-			if (fileName) url.searchParams.append('fileName', fileName);
-			if (mimeType) url.searchParams.append('mimeType', mimeType);
-			return url.toString();
-		},
-
-		setNodePristine(nodeName: string, isPristine: boolean): void {
-			Vue.set(this.nodeMetadata[nodeName], 'pristine', isPristine);
-		},
-	},
-});
diff --git a/packages/editor-ui/src/styles/_animations.scss b/packages/editor-ui/src/styles/_animations.scss
new file mode 100644
index 0000000000000..796540228d145
--- /dev/null
+++ b/packages/editor-ui/src/styles/_animations.scss
@@ -0,0 +1,15 @@
+.executions-list-move,
+.executions-list-enter-active,
+.executions-list-leave-active {
+	transition: all 1.5s cubic-bezier(0.19, 1, 0.22, 1);
+}
+
+.executions-list-enter-from,
+.executions-list-leave-to {
+	opacity: 0;
+	transform: translateX(-100px);
+}
+
+.executions-list-leave-active {
+	position: absolute;
+}
diff --git a/packages/editor-ui/src/styles/css-animation-helpers.scss b/packages/editor-ui/src/styles/_variables.scss
similarity index 100%
rename from packages/editor-ui/src/styles/css-animation-helpers.scss
rename to packages/editor-ui/src/styles/_variables.scss
diff --git a/packages/editor-ui/src/styles/autocomplete-theme.scss b/packages/editor-ui/src/styles/autocomplete-theme.scss
deleted file mode 100644
index f67c42975936e..0000000000000
--- a/packages/editor-ui/src/styles/autocomplete-theme.scss
+++ /dev/null
@@ -1,66 +0,0 @@
-.cm-tooltip-autocomplete:after {
-	display: block;
-	content: 'n8n supports all JavaScript functions, including those not listed.';
-	padding: var(--spacing-2xs) var(--spacing-s);
-	border-top: 1px solid var(--color-foreground-dark);
-}
-
-// Custom autocomplete item type icons
-// 1. Native and n8n extension functions:
-.cm-completionIcon-extension-function, .cm-completionIcon-native-function {
-	&::after {
-		content: 'ƒ';
-	}
-}
-
-.cm-tooltip-autocomplete {
-	background-color: var(--color-background-xlight) !important;
-
-	.cm-tooltip {
-		white-space: nowrap;
-		overflow: hidden;
-		text-overflow: ellipsis;
-	}
-
-	li .cm-completionLabel {
-		color: var(--color-success);
-	}
-}
-
-.ͼ2 .cm-tooltip-autocomplete ul li[aria-selected] .cm-completionLabel {
-	color: var(--color-text-xlight) !important;
-	font-weight: 600;
-}
-
-.autocomplete-info-container {
-	display: flex;
-	flex-direction: column;
-	padding: var(--spacing-4xs) 0;
-}
-
-.cm-completionInfo {
-	background-color: var(--color-background-xlight) !important;
-
-	.autocomplete-info-header {
-		color: var(--color-text-dark);
-		line-height: var(--font-line-height-compact);
-		margin-bottom: var(--spacing-2xs);
-	}
-
-	.autocomplete-info-name {
-		color: var(--color-success);
-		font-weight: var(--font-weight-bold);
-	}
-
-	.autocomplete-info-description {
-		code {
-			background-color: var(--color-background-base);
-			padding: 0 2px;
-		}
-		p {
-			line-height: var(--font-line-height-compact);
-			margin-top: 0;
-			margin-bottom: var(--spacing-4xs);
-		}
-	}
-}
diff --git a/packages/editor-ui/src/styles/index.scss b/packages/editor-ui/src/styles/index.scss
new file mode 100644
index 0000000000000..65126a8b4d747
--- /dev/null
+++ b/packages/editor-ui/src/styles/index.scss
@@ -0,0 +1,3 @@
+@import 'variables';
+@import 'plugins';
+@import 'animations';
diff --git a/packages/editor-ui/src/styles/plugins/_codemirror.scss b/packages/editor-ui/src/styles/plugins/_codemirror.scss
new file mode 100644
index 0000000000000..c1eb3a1031390
--- /dev/null
+++ b/packages/editor-ui/src/styles/plugins/_codemirror.scss
@@ -0,0 +1,119 @@
+.cm-tooltip-autocomplete:after {
+	padding: var(--spacing-2xs) var(--spacing-s);
+	border-top: 1px solid var(--color-foreground-dark);
+}
+
+.code-node-editor .cm-tooltip-autocomplete:after {
+	display: block;
+	content: 'n8n supports all JavaScript functions, including those not listed.';
+}
+
+.ͼ2 .cm-tooltip-autocomplete {
+	background-color: var(--color-background-xlight) !important;
+	box-shadow: var(--box-shadow-light);
+	border: none;
+
+	.cm-tooltip {
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+
+	> ul[role='listbox'] {
+		font-family: var(--font-family-monospace);
+		max-height: min(220px, 50vh);
+		width: min(260px, 50vw);
+		min-width: 100%;
+		max-width: none;
+		border: var(--border-base);
+		border-radius: var(--border-radius-base);
+
+		li[role='option'] {
+			color: var(--color-text-base);
+			display: flex;
+			line-height: var(--font-line-height-xloose);
+			justify-content: space-between;
+			align-items: center;
+			padding: var(--spacing-5xs) var(--spacing-2xs);
+			gap: var(--spacing-2xs);
+			scroll-padding: 40px;
+			scroll-margin: 40px;
+		}
+
+		li .cm-completionLabel {
+			font-size: var(--font-size-2xs);
+			overflow: hidden;
+			text-overflow: ellipsis;
+		}
+
+		li .cm-completionDetail {
+			color: var(--color-text-light);
+			font-size: var(--font-size-3xs);
+			margin-left: 0;
+			font-style: normal;
+		}
+
+		li[aria-selected] {
+			background-color: var(--color-background-base);
+			color: var(--color-autocomplete-item-selected);
+		}
+
+		> .cm-section-header {
+			padding: var(--spacing-4xs) var(--spacing-3xs);
+			border-bottom: 1px solid var(--color-autocomplete-section-header-border);
+			background-color: var(--color-background-xlight);
+			position: sticky;
+			top: 0;
+		}
+
+		> .cm-section-header:not(:first-child) {
+			margin-top: var(--spacing-2xs);
+		}
+
+		.cm-section-title {
+			color: var(--color-text-dark);
+			font-family: var(--font-family);
+			font-weight: var(--font-weight-bold);
+			font-size: var(--font-size-3xs);
+			text-transform: uppercase;
+			padding: var(--spacing-5xs) var(--spacing-4xs);
+		}
+	}
+}
+
+.autocomplete-info-container {
+	display: flex;
+	flex-direction: column;
+	padding: var(--spacing-4xs) 0;
+}
+
+.ͼ2 .cm-completionInfo {
+	background-color: var(--color-background-xlight);
+	border: var(--border-base);
+	margin-left: var(--spacing-5xs);
+	border-radius: var(--border-radius-base);
+	line-height: var(--font-line-height-loose);
+
+	.autocomplete-info-header {
+		color: var(--color-text-base);
+		font-size: var(--font-size-2xs);
+		font-family: var(--font-family-monospace);
+		line-height: var(--font-line-height-compact);
+		margin-bottom: var(--spacing-2xs);
+	}
+
+	.autocomplete-info-name {
+		color: var(--color-autocomplete-item-selected);
+	}
+
+	.autocomplete-info-description {
+		code {
+			background-color: var(--color-background-base);
+			padding: 0 2px;
+		}
+		p {
+			line-height: var(--font-line-height-compact);
+			margin-top: 0;
+			margin-bottom: var(--spacing-4xs);
+		}
+	}
+}
diff --git a/packages/editor-ui/src/styles/plugins/index.scss b/packages/editor-ui/src/styles/plugins/index.scss
new file mode 100644
index 0000000000000..fda7b1823cfc8
--- /dev/null
+++ b/packages/editor-ui/src/styles/plugins/index.scss
@@ -0,0 +1 @@
+@import "codemirror";
diff --git a/packages/editor-ui/src/types/expressions.ts b/packages/editor-ui/src/types/expressions.ts
index d1a9168e3353b..24450ba46e43c 100644
--- a/packages/editor-ui/src/types/expressions.ts
+++ b/packages/editor-ui/src/types/expressions.ts
@@ -8,12 +8,14 @@ export type Plaintext = { kind: 'plaintext'; plaintext: string } & Range;
 
 export type Html = Plaintext; // for n8n parser, functionally identical to plaintext
 
+export type ResolvableState = 'valid' | 'invalid' | 'pending';
+
 export type Resolvable = {
 	kind: 'resolvable';
 	resolvable: string;
 	resolved: unknown;
-	error: boolean;
-	fullError: Error | null;
+	state: ResolvableState;
+	error: Error | null;
 } & Range;
 
 export type Resolved = Resolvable;
@@ -21,6 +23,6 @@ export type Resolved = Resolvable;
 export namespace ColoringStateEffect {
 	export type Value = {
 		kind?: 'plaintext' | 'resolvable';
-		error?: boolean;
+		state?: ResolvableState;
 	} & Range;
 }
diff --git a/packages/editor-ui/src/types/externalHooks.ts b/packages/editor-ui/src/types/externalHooks.ts
new file mode 100644
index 0000000000000..d5e066cb0e65a
--- /dev/null
+++ b/packages/editor-ui/src/types/externalHooks.ts
@@ -0,0 +1,292 @@
+import type { N8nInput } from 'n8n-design-system';
+import type {
+	IConnections,
+	INodeParameters,
+	INodeProperties,
+	INodeTypeDescription,
+	ITelemetryTrackProperties,
+	INodeParameterResourceLocator,
+	NodeParameterValue,
+	ResourceMapperValue,
+} from 'n8n-workflow';
+import type { RouteLocation } from 'vue-router';
+import type {
+	AuthenticationModalEventData,
+	ExecutionFinishedEventData,
+	ExecutionStartedEventData,
+	ExpressionEditorEventsData,
+	InsertedItemFromExpEditorEventData,
+	NodeRemovedEventData,
+	NodeTypeChangedEventData,
+	OutputModeChangedEventData,
+	UpdatedWorkflowSettingsEventData,
+	UserSavedCredentialsEventData,
+} from '@/hooks/segment';
+import type {
+	INodeCreateElement,
+	INodeUi,
+	INodeUpdatePropertiesInformation,
+	IPersonalizationLatestVersion,
+	IWorkflowDb,
+	NodeFilterType,
+} from '@/Interface';
+import type { ComponentPublicInstance } from 'vue/dist/vue';
+import type { useWebhooksStore } from '@/stores/webhooks.store';
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export interface ExternalHooksMethod<T = any, R = void> {
+	(store: ReturnType<typeof useWebhooksStore>, metadata: T): R | Promise<R>;
+}
+
+export interface ExternalHooksGenericContext {
+	[key: string]: ExternalHooksMethod[];
+}
+
+export interface ExternalHooks {
+	parameterInput: {
+		mount: Array<
+			ExternalHooksMethod<{
+				inputFieldRef?: InstanceType<typeof N8nInput>;
+				parameter?: INodeProperties;
+			}>
+		>;
+		modeSwitch: Array<ExternalHooksMethod<ITelemetryTrackProperties>>;
+		updated: Array<ExternalHooksMethod<{ remoteParameterOptions: NodeListOf<Element> }>>;
+	};
+	nodeCreatorSearchBar: {
+		mount: Array<ExternalHooksMethod<{ inputRef: HTMLElement | null }>>;
+	};
+	app: {
+		mount: Array<ExternalHooksMethod<{}>>;
+	};
+	nodeView: {
+		mount: Array<ExternalHooksMethod<{}>>;
+		createNodeActiveChanged: Array<
+			ExternalHooksMethod<{
+				source?: string;
+				mode: string;
+				createNodeActive: boolean;
+			}>
+		>;
+		addNodeButton: Array<ExternalHooksMethod<{ nodeTypeName: string }>>;
+		onRunNode: Array<ExternalHooksMethod<ITelemetryTrackProperties>>;
+		onRunWorkflow: Array<ExternalHooksMethod<ITelemetryTrackProperties>>;
+	};
+	main: {
+		routeChange: Array<ExternalHooksMethod<{ to: RouteLocation; from: RouteLocation }>>;
+	};
+	credential: {
+		saved: Array<ExternalHooksMethod<UserSavedCredentialsEventData>>;
+	};
+	copyInput: {
+		mounted: Array<ExternalHooksMethod<{ copyInputValueRef: HTMLElement }>>;
+	};
+	credentialsEdit: {
+		credentialTypeChanged: Array<
+			ExternalHooksMethod<{
+				newValue: string;
+				setCredentialType: string;
+				credentialType: string;
+				editCredentials: string;
+			}>
+		>;
+		credentialModalOpened: Array<
+			ExternalHooksMethod<{
+				activeNode: INodeUi | null;
+				isEditingCredential: boolean;
+				credentialType: string | null;
+			}>
+		>;
+	};
+	credentialsList: {
+		mounted: Array<ExternalHooksMethod<{ tableRef: ComponentPublicInstance }>>;
+		dialogVisibleChanged: Array<ExternalHooksMethod<{ dialogVisible: boolean }>>;
+	};
+	credentialsSelectModal: {
+		openCredentialType: Array<ExternalHooksMethod<ITelemetryTrackProperties>>;
+	};
+	credentialEdit: {
+		saveCredential: Array<ExternalHooksMethod<ITelemetryTrackProperties>>;
+	};
+	workflowSettings: {
+		dialogVisibleChanged: Array<ExternalHooksMethod<{ dialogVisible: boolean }>>;
+		saveSettings: Array<ExternalHooksMethod<UpdatedWorkflowSettingsEventData>>;
+	};
+	dataDisplay: {
+		onDocumentationUrlClick: Array<
+			ExternalHooksMethod<{
+				nodeType: INodeTypeDescription;
+				documentationUrl: string;
+			}>
+		>;
+		nodeTypeChanged: Array<ExternalHooksMethod<NodeTypeChangedEventData>>;
+		nodeEditingFinished: Array<ExternalHooksMethod<{}>>;
+	};
+	executionsList: {
+		created: Array<
+			ExternalHooksMethod<{ filtersRef: HTMLElement; tableRef: ComponentPublicInstance }>
+		>;
+		openDialog: Array<ExternalHooksMethod<{}>>;
+	};
+	showMessage: {
+		showError: Array<
+			ExternalHooksMethod<{ title: string; message?: string; errorMessage: string }>
+		>;
+	};
+	expressionEdit: {
+		itemSelected: Array<ExternalHooksMethod<InsertedItemFromExpEditorEventData>>;
+		dialogVisibleChanged: Array<ExternalHooksMethod<ExpressionEditorEventsData>>;
+		closeDialog: Array<ExternalHooksMethod<ITelemetryTrackProperties>>;
+		mounted: Array<
+			ExternalHooksMethod<{
+				expressionInputRef: HTMLElement;
+				expressionOutputRef: HTMLElement;
+			}>
+		>;
+	};
+	nodeSettings: {
+		valueChanged: Array<ExternalHooksMethod<AuthenticationModalEventData>>;
+		credentialSelected: Array<
+			ExternalHooksMethod<{
+				updateInformation: INodeUpdatePropertiesInformation;
+			}>
+		>;
+	};
+	workflowRun: {
+		runWorkflow: Array<ExternalHooksMethod<ExecutionStartedEventData>>;
+		runError: Array<ExternalHooksMethod<{ errorMessages: string[]; nodeName: string | undefined }>>;
+	};
+	runData: {
+		updated: Array<ExternalHooksMethod<{ elements: HTMLElement[] }>>;
+		onTogglePinData: Array<ExternalHooksMethod<ITelemetryTrackProperties>>;
+		onDataPinningSuccess: Array<ExternalHooksMethod<ITelemetryTrackProperties>>;
+		displayModeChanged: Array<ExternalHooksMethod<OutputModeChangedEventData>>;
+	};
+	pushConnection: {
+		executionFinished: Array<ExternalHooksMethod<ExecutionFinishedEventData>>;
+	};
+	node: {
+		deleteNode: Array<ExternalHooksMethod<NodeRemovedEventData>>;
+	};
+	nodeExecuteButton: {
+		onClick: Array<ExternalHooksMethod<ITelemetryTrackProperties>>;
+	};
+	workflow: {
+		activeChange: Array<ExternalHooksMethod<{ active: boolean; workflowId: string }>>;
+		activeChangeCurrent: Array<ExternalHooksMethod<{ workflowId: string; active: boolean }>>;
+		afterUpdate: Array<ExternalHooksMethod<{ workflowData: IWorkflowDb }>>;
+		open: Array<ExternalHooksMethod<{ workflowId: string; workflowName: string }>>;
+	};
+	execution: {
+		open: Array<
+			ExternalHooksMethod<{ workflowId: string; workflowName: string; executionId: string }>
+		>;
+	};
+	userInfo: {
+		mounted: Array<ExternalHooksMethod<{ userInfoRef: HTMLElement }>>;
+	};
+	variableSelectorItem: {
+		mounted: Array<ExternalHooksMethod<{ variableSelectorItemRef: HTMLElement }>>;
+	};
+	mainSidebar: {
+		mounted: Array<ExternalHooksMethod<{ userRef: Element }>>;
+	};
+	nodeCreateList: {
+		destroyed: Array<ExternalHooksMethod<{}>>;
+		addAction: Array<
+			ExternalHooksMethod<{
+				node_type?: string;
+				action: string;
+				resource:
+					| string
+					| number
+					| true
+					| INodeParameters
+					| INodeParameterResourceLocator
+					| NodeParameterValue[]
+					| INodeParameters[]
+					| INodeParameterResourceLocator[]
+					| ResourceMapperValue[];
+			}>
+		>;
+		selectedTypeChanged: Array<ExternalHooksMethod<{ oldValue: string; newValue: string }>>;
+		filteredNodeTypesComputed: Array<
+			ExternalHooksMethod<{
+				nodeFilter: string;
+				result: INodeCreateElement[];
+				selectedType: NodeFilterType;
+			}>
+		>;
+		nodeFilterChanged: Array<
+			ExternalHooksMethod<{
+				oldValue: string;
+				newValue: string;
+				selectedType: NodeFilterType;
+				filteredNodes: INodeCreateElement[];
+			}>
+		>;
+		onActionsCustmAPIClicked: Array<ExternalHooksMethod<{ app_identifier?: string }>>;
+		onViewActions: Array<ExternalHooksMethod<ITelemetryTrackProperties>>;
+	};
+	personalizationModal: {
+		onSubmit: Array<ExternalHooksMethod<IPersonalizationLatestVersion>>;
+	};
+	settingsPersonalView: {
+		mounted: Array<ExternalHooksMethod<{ userRef: HTMLElement }>>;
+	};
+	workflowOpen: {
+		mounted: Array<ExternalHooksMethod<{ tableRef: ComponentPublicInstance }>>;
+	};
+	workflowActivate: {
+		updateWorkflowActivation: Array<ExternalHooksMethod<ITelemetryTrackProperties>>;
+	};
+	runDataTable: {
+		onDragEnd: Array<ExternalHooksMethod<ITelemetryTrackProperties>>;
+	};
+	runDataJson: {
+		onDragEnd: Array<ExternalHooksMethod<ITelemetryTrackProperties>>;
+	};
+	sticky: {
+		mounted: Array<ExternalHooksMethod<{ stickyRef: HTMLElement }>>;
+	};
+	telemetry: {
+		currentUserIdChanged: Array<ExternalHooksMethod<{}>>;
+	};
+	settingsCommunityNodesView: {
+		openInstallModal: Array<ExternalHooksMethod<ITelemetryTrackProperties>>;
+	};
+	templatesWorkflowView: {
+		openWorkflow: Array<ExternalHooksMethod<ITelemetryTrackProperties>>;
+	};
+	templatesCollectionView: {
+		onUseWorkflow: Array<ExternalHooksMethod<ITelemetryTrackProperties>>;
+	};
+	template: {
+		requested: Array<ExternalHooksMethod<{ templateId: string }>>;
+		open: Array<
+			ExternalHooksMethod<{
+				templateId: string;
+				templateName: string;
+				workflow: { nodes: INodeUi[]; connections: IConnections };
+			}>
+		>;
+	};
+}
+
+export type ExternalHooksKey = {
+	[K in keyof ExternalHooks]: `${K}.${Extract<keyof ExternalHooks[K], string>}`;
+}[keyof ExternalHooks];
+
+type ExtractHookMethodArray<P extends keyof ExternalHooks, S extends keyof ExternalHooks[P]> =
+	ExternalHooks[P][S] extends Array<infer U> ? U : never;
+
+type ExtractHookMethodFunction<T> = T extends ExternalHooksMethod ? T : never;
+
+export type ExtractExternalHooksMethodPayloadFromKey<T extends ExternalHooksKey> =
+	T extends `${infer P}.${infer S}`
+		? P extends keyof ExternalHooks
+			? S extends keyof ExternalHooks[P]
+				? Parameters<ExtractHookMethodFunction<ExtractHookMethodArray<P, S>>>[1]
+				: never
+			: never
+		: never;
diff --git a/packages/editor-ui/src/types/index.ts b/packages/editor-ui/src/types/index.ts
new file mode 100644
index 0000000000000..322e345887251
--- /dev/null
+++ b/packages/editor-ui/src/types/index.ts
@@ -0,0 +1,2 @@
+export * from './externalHooks';
+export * from './pushConnection';
diff --git a/packages/editor-ui/src/types/pushConnection.ts b/packages/editor-ui/src/types/pushConnection.ts
new file mode 100644
index 0000000000000..ae8e54419f3dc
--- /dev/null
+++ b/packages/editor-ui/src/types/pushConnection.ts
@@ -0,0 +1,6 @@
+import type { IPushData } from '@/Interface';
+
+export type PushMessageQueueItem = {
+	message: IPushData;
+	retriesLeft: number;
+};
diff --git a/packages/editor-ui/src/types/rbac.ts b/packages/editor-ui/src/types/rbac.ts
new file mode 100644
index 0000000000000..97c5f56bfb499
--- /dev/null
+++ b/packages/editor-ui/src/types/rbac.ts
@@ -0,0 +1,47 @@
+import type { EnterpriseEditionFeature } from '@/constants';
+import type { Resource, ScopeOptions, Scope } from '@n8n/permissions';
+import type { IRole } from '@/Interface';
+
+export type AuthenticatedPermissionOptions = {
+	bypass?: () => boolean;
+};
+export type CustomPermissionOptions<C = {}> = RBACPermissionCheck<C>;
+export type DefaultUserMiddlewareOptions = {};
+export type InstanceOwnerMiddlewareOptions = {};
+export type EnterprisePermissionOptions = {
+	feature?: EnterpriseEditionFeature | EnterpriseEditionFeature[];
+	mode?: 'oneOf' | 'allOf';
+};
+export type GuestPermissionOptions = {};
+export type RBACPermissionOptions = {
+	scope?: Scope | Scope[];
+	projectId?: string;
+	resourceType?: Resource;
+	resourceId?: string;
+	options?: ScopeOptions;
+};
+export type RolePermissionOptions = IRole[];
+
+export type PermissionType =
+	| 'authenticated'
+	| 'custom'
+	| 'defaultUser'
+	| 'instanceOwner'
+	| 'enterprise'
+	| 'guest'
+	| 'rbac'
+	| 'role';
+export type PermissionTypeOptions = {
+	authenticated: AuthenticatedPermissionOptions;
+	custom: CustomPermissionOptions;
+	defaultUser: DefaultUserMiddlewareOptions;
+	instanceOwner: InstanceOwnerMiddlewareOptions;
+	enterprise: EnterprisePermissionOptions;
+	guest: GuestPermissionOptions;
+	rbac: RBACPermissionOptions;
+	role: RolePermissionOptions;
+};
+
+export interface RBACPermissionCheck<Options> {
+	(options?: Options): boolean;
+}
diff --git a/packages/editor-ui/src/types/router.ts b/packages/editor-ui/src/types/router.ts
new file mode 100644
index 0000000000000..ddbffeb2f5dc2
--- /dev/null
+++ b/packages/editor-ui/src/types/router.ts
@@ -0,0 +1,62 @@
+import type {
+	NavigationGuardNext,
+	NavigationGuardWithThis,
+	RouteLocationNormalized,
+	RouteLocation,
+} from 'vue-router';
+import type { IPermissions } from '@/Interface';
+import type {
+	AuthenticatedPermissionOptions,
+	CustomPermissionOptions,
+	EnterprisePermissionOptions,
+	GuestPermissionOptions,
+	RBACPermissionOptions,
+	RolePermissionOptions,
+	PermissionType,
+	DefaultUserMiddlewareOptions,
+} from '@/types/rbac';
+
+export type RouterMiddlewareType = PermissionType;
+export type CustomMiddlewareOptions = CustomPermissionOptions<{
+	to: RouteLocationNormalized;
+	from: RouteLocationNormalized;
+	next: NavigationGuardNext;
+}>;
+export type MiddlewareOptions = {
+	authenticated: AuthenticatedPermissionOptions;
+	custom: CustomMiddlewareOptions;
+	defaultUser: DefaultUserMiddlewareOptions;
+	enterprise: EnterprisePermissionOptions;
+	guest: GuestPermissionOptions;
+	rbac: RBACPermissionOptions;
+	role: RolePermissionOptions;
+};
+
+export interface RouteConfig {
+	meta: {
+		nodeView?: boolean;
+		templatesEnabled?: boolean;
+		getRedirect?: () => { name: string } | false;
+		permissions?: IPermissions;
+		middleware?: RouterMiddlewareType[];
+		middlewareOptions?: Partial<MiddlewareOptions>;
+		telemetry?: {
+			disabled?: true;
+			getProperties: (route: RouteLocation) => object;
+		};
+		scrollOffset?: number;
+		setScrollPosition?: (position: number) => void;
+		readOnlyCanvas?: boolean;
+	};
+}
+
+export type RouterMiddlewareReturnType = ReturnType<NavigationGuardWithThis<undefined>>;
+
+export interface RouterMiddleware<RouterMiddlewareOptions = {}> {
+	(
+		to: RouteLocationNormalized,
+		from: RouteLocationNormalized,
+		next: NavigationGuardNext,
+		options: RouterMiddlewareOptions,
+	): RouterMiddlewareReturnType;
+}
diff --git a/packages/editor-ui/src/types/workflowHistory.ts b/packages/editor-ui/src/types/workflowHistory.ts
new file mode 100644
index 0000000000000..0c66987156589
--- /dev/null
+++ b/packages/editor-ui/src/types/workflowHistory.ts
@@ -0,0 +1,21 @@
+import type { IConnections } from 'n8n-workflow';
+import type { INodeUi } from '@/Interface';
+
+export type WorkflowHistory = {
+	versionId: string;
+	authors: string;
+	createdAt: string;
+	updatedAt: string;
+};
+
+export type WorkflowVersionId = WorkflowHistory['versionId'];
+
+export type WorkflowVersion = WorkflowHistory & {
+	workflowId: string;
+	nodes: INodeUi[];
+	connections: IConnections;
+};
+
+export type WorkflowHistoryActionTypes = ['restore', 'clone', 'open', 'download'];
+
+export type WorkflowHistoryRequestParams = { take: number; skip?: number };
diff --git a/packages/editor-ui/src/utils/__tests__/expressions.test.ts b/packages/editor-ui/src/utils/__tests__/expressions.test.ts
new file mode 100644
index 0000000000000..5817a6a35bc74
--- /dev/null
+++ b/packages/editor-ui/src/utils/__tests__/expressions.test.ts
@@ -0,0 +1,34 @@
+import { ExpressionError } from 'n8n-workflow';
+import { stringifyExpressionResult } from '../expressions';
+
+describe('stringifyExpressionResult()', () => {
+	it('should return empty string for non-critical errors', () => {
+		expect(
+			stringifyExpressionResult({
+				ok: false,
+				error: new ExpressionError('error message', { type: 'no_execution_data' }),
+			}),
+		).toEqual('');
+	});
+
+	it('should return an error message for critical errors', () => {
+		expect(
+			stringifyExpressionResult({
+				ok: false,
+				error: new ExpressionError('error message', { type: 'no_input_connection' }),
+			}),
+		).toEqual('[ERROR: No input connected]');
+	});
+
+	it('should return empty string when result is null', () => {
+		expect(stringifyExpressionResult({ ok: true, result: null })).toEqual('');
+	});
+
+	it('should return [empty] message when result is empty string', () => {
+		expect(stringifyExpressionResult({ ok: true, result: '' })).toEqual('[empty]');
+	});
+
+	it('should return the result when it is a string', () => {
+		expect(stringifyExpressionResult({ ok: true, result: 'foo' })).toEqual('foo');
+	});
+});
diff --git a/packages/editor-ui/src/utils/__tests__/mappingUtils.test.ts b/packages/editor-ui/src/utils/__tests__/mappingUtils.test.ts
index 51862efecab61..8dfc75ba1ba83 100644
--- a/packages/editor-ui/src/utils/__tests__/mappingUtils.test.ts
+++ b/packages/editor-ui/src/utils/__tests__/mappingUtils.test.ts
@@ -1,5 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
-import { getMappedResult, getMappedExpression } from '../mappingUtils';
+import { getMappedResult, getMappedExpression, escapeMappingString } from '../mappingUtils';
 
 const RLC_PARAM: INodeProperties = {
 	displayName: 'Base',
@@ -68,10 +68,6 @@ const JSON_PARAM: INodeProperties = {
 	displayName: 'JSON Payload',
 	name: 'payloadJson',
 	type: 'json',
-	typeOptions: {
-		alwaysOpenEditWindow: true,
-		editor: 'code',
-	},
 	default: '',
 };
 
@@ -207,7 +203,7 @@ describe('Mapping Utils', () => {
 				path: ['sample', 'path'],
 			};
 			const result = getMappedExpression(input);
-			expect(result).toBe('{{ $node.nodeName.json.sample.path }}');
+			expect(result).toBe("{{ $('nodeName').item.json.sample.path }}");
 		});
 
 		it('should generate a mapped expression with mixed array path', () => {
@@ -217,22 +213,22 @@ describe('Mapping Utils', () => {
 				path: ['sample', 0, 'path'],
 			};
 			const result = getMappedExpression(input);
-			expect(result).toBe('{{ $node.nodeName.json.sample[0].path }}');
+			expect(result).toBe("{{ $('nodeName').item.json.sample[0].path }}");
 		});
 
-		it('should generate a mapped expression with special characters in array path', () => {
+		it('should generate a mapped expression with invalid identifier names in array path', () => {
 			const input = {
 				nodeName: 'nodeName',
 				distanceFromActive: 2,
-				path: ['sample', 'path with-space', 'path-with-hyphen'],
+				path: ['sample', 'path with-space', 'path-with-hyphen', '2iStartWithANumber'],
 			};
 			const result = getMappedExpression(input);
 			expect(result).toBe(
-				"{{ $node.nodeName.json.sample['path with-space']['path-with-hyphen'] }}",
+				"{{ $('nodeName').item.json.sample['path with-space']['path-with-hyphen']['2iStartWithANumber'] }}",
 			);
 		});
 
-		it('should handle paths with special characters', () => {
+		it('should handle paths with invalid identifier names', () => {
 			const input = {
 				nodeName: 'nodeName',
 				distanceFromActive: 2,
@@ -247,11 +243,12 @@ describe('Mapping Utils', () => {
 					'test,',
 					'test:',
 					'path.',
+					'2iStartWithANumber',
 				],
 			};
 			const result = getMappedExpression(input);
 			expect(result).toBe(
-				"{{ $node.nodeName.json.sample['\"Execute\"']['`Execute`']['\\'Execute\\'']['[Execute]']['{Execute}']['execute?']['test,']['test:']['path.'] }}",
+				"{{ $('nodeName').item.json.sample['\"Execute\"']['`Execute`']['\\'Execute\\'']['[Execute]']['{Execute}']['execute?']['test,']['test:']['path.']['2iStartWithANumber'] }}",
 			);
 		});
 
@@ -277,4 +274,12 @@ describe('Mapping Utils', () => {
 			);
 		});
 	});
+	describe('escapeMappingString', () => {
+		test.each([
+			{ input: 'Normal node name (here)', output: 'Normal node name (here)' },
+			{ input: "'Should es'ape quotes here'", output: "\\'Should es\\'ape quotes here\\'" },
+		])('should escape "$input" to "$output"', ({ input, output }) => {
+			expect(escapeMappingString(input)).toEqual(output);
+		});
+	});
 });
diff --git a/packages/editor-ui/src/utils/__tests__/objectUtils.test.ts b/packages/editor-ui/src/utils/__tests__/objectUtils.test.ts
new file mode 100644
index 0000000000000..0dd51f5e80183
--- /dev/null
+++ b/packages/editor-ui/src/utils/__tests__/objectUtils.test.ts
@@ -0,0 +1,98 @@
+import { isObjectOrArray, isObject, searchInObject } from '@/utils/objectUtils';
+
+const testData = [1, '', true, null, undefined, new Date(), () => {}].map((value) => [
+	value,
+	typeof value,
+]);
+
+describe('objectUtils', () => {
+	describe('isObjectOrArray', () => {
+		it('should return true for objects', () => {
+			assert(isObjectOrArray({}));
+		});
+
+		it('should return true for arrays', () => {
+			assert(isObjectOrArray([]));
+		});
+
+		test.each(testData)('should return false for %j (type %s)', (value) => {
+			assert(!isObjectOrArray(value));
+		});
+	});
+
+	describe('isObject', () => {
+		it('should return true for objects', () => {
+			assert(isObject({}));
+		});
+
+		it('should return false for arrays', () => {
+			assert(!isObject([]));
+		});
+
+		test.each(testData)('should return false for %j (type %s)', (value) => {
+			assert(!isObject(value));
+		});
+	});
+
+	describe('searchInObject', () => {
+		it('should return true if the search string is found in the object', () => {
+			assert(searchInObject({ a: 'b' }, 'b'));
+		});
+
+		it('should return false if the search string is not found in the object', () => {
+			assert(!searchInObject({ a: 'b' }, 'c'));
+		});
+
+		it('should return true if the search string is not found in the object as a key', () => {
+			assert(searchInObject({ a: 'b' }, 'a'));
+		});
+
+		it('should return true if the search string is found in a nested object', () => {
+			assert(searchInObject({ a: { b: 'c' } }, 'c'));
+		});
+
+		it('should return true if the search string is found in a nested object as a key', () => {
+			assert(searchInObject({ a: { b: 'c' } }, 'b'));
+		});
+
+		it('should return true if the search string is found in an array', () => {
+			assert(searchInObject(['a', 'b'], 'a'));
+		});
+
+		it('should return true if the search string is found in a nested array', () => {
+			assert(searchInObject(['a', ['b', 'c']], 'c'));
+		});
+
+		it('should return false if the search string is not found in an array', () => {
+			assert(!searchInObject(['a', 'b'], 'c'));
+		});
+
+		it('should return false if the search string is not found in a nested array', () => {
+			assert(!searchInObject(['a', ['b', 'c']], 'd'));
+		});
+
+		it('should return true if the search string is found in a nested object in an array', () => {
+			assert(searchInObject([{ a: 'b' }], 'b'));
+		});
+
+		it('should return true if the search string is found in a nested array in an object', () => {
+			assert(searchInObject({ a: ['b', 'c'] }, 'c'));
+		});
+
+		it('should return false if the search string is not found in a nested object in an array', () => {
+			assert(!searchInObject([{ a: 'b' }], 'c'));
+		});
+
+		it('should return false if the search string is not found in a nested array in an object', () => {
+			assert(!searchInObject({ a: ['b', 'c'] }, 'd'));
+		});
+
+		it('should return true if the search string is found in an object as a key in a nested array', () => {
+			assert(searchInObject({ a: ['b', { c: 'd' }] }, 'c'));
+		});
+
+		it('should return true if the search string is found in an object in a nested array', () => {
+			assert(searchInObject({ a: ['b', { c: 'd' }] }, 'd'));
+		});
+	});
+});
diff --git a/packages/editor-ui/src/utils/__tests__/pairedItemUtils.test.ts b/packages/editor-ui/src/utils/__tests__/pairedItemUtils.test.ts
new file mode 100644
index 0000000000000..12074d941f575
--- /dev/null
+++ b/packages/editor-ui/src/utils/__tests__/pairedItemUtils.test.ts
@@ -0,0 +1,400 @@
+import type { IExecutionResponse, TargetItem } from '@/Interface';
+import {
+	getPairedItemId,
+	getSourceItems,
+	getPairedItemsMapping,
+	MAX_ITEM_COUNT_FOR_PAIRING,
+} from '../pairedItemUtils';
+
+const MOCK_EXECUTION: Partial<IExecutionResponse> = {
+	data: {
+		startData: {},
+		resultData: {
+			runData: {
+				'When clicking "Test workflow"': [
+					{
+						startTime: 1706027170005,
+						executionTime: 0,
+						source: [],
+						executionStatus: 'success',
+						data: { main: [[{ json: {}, pairedItem: { item: 0 } }]] },
+					},
+				],
+				DebugHelper: [
+					{
+						startTime: 1706027170005,
+						executionTime: 1,
+						source: [{ previousNode: 'When clicking "Test workflow"' }],
+						executionStatus: 'success',
+						data: {
+							main: [
+								[
+									{
+										json: {
+											uid: '54563b92-e4d9-425d-826d-9fe471196a28',
+											email: 'Jon_Ebert@yahoo.com',
+											firstname: 'April',
+											lastname: 'Aufderhar',
+											password: '+xziPGNy',
+										},
+										pairedItem: { item: 0 },
+									},
+									{
+										json: {
+											uid: '3d3ee69e-f013-478c-8f5b-7723f508c02b',
+											email: 'Jeffery_Wehner@yahoo.com',
+											firstname: 'Amelia',
+											lastname: 'Mante',
+											password: '2DJR~2owf',
+										},
+										pairedItem: { item: 0 },
+									},
+								],
+							],
+						},
+					},
+				],
+				If: [
+					{
+						startTime: 1706027170006,
+						executionTime: 1,
+						source: [{ previousNode: 'DebugHelper' }],
+						executionStatus: 'success',
+						data: {
+							main: [
+								[
+									{
+										json: {
+											uid: '54563b92-e4d9-425d-826d-9fe471196a28',
+											email: 'Jon_Ebert@yahoo.com',
+											firstname: 'April',
+											lastname: 'Aufderhar',
+											password: '+xziPGNy',
+										},
+										pairedItem: { item: 0 },
+									},
+								],
+								[
+									{
+										json: {
+											uid: '3d3ee69e-f013-478c-8f5b-7723f508c02b',
+											email: 'Jeffery_Wehner@yahoo.com',
+											firstname: 'Amelia',
+											lastname: 'Mante',
+											password: '2DJR~2owf',
+										},
+										pairedItem: { item: 1 },
+									},
+								],
+							],
+						},
+					},
+				],
+				'Edit Fields': [
+					{
+						startTime: 1706027170008,
+						executionTime: 0,
+						source: [{ previousNode: 'If', previousNodeOutput: 1 }],
+						executionStatus: 'success',
+						data: {
+							main: [
+								[
+									{
+										json: {
+											uid: '3d3ee69e-f013-478c-8f5b-7723f508c02b',
+											email: 'Jeffery_Wehner@yahoo.com',
+											firstname: 'Amelia',
+											lastname: 'Mante',
+											password: '2DJR~2owf',
+										},
+										pairedItem: { item: 0 },
+									},
+								],
+							],
+						},
+					},
+					{
+						startTime: 1706027170009,
+						executionTime: 0,
+						source: [{ previousNode: 'If' }],
+						executionStatus: 'success',
+						data: {
+							main: [
+								[
+									{
+										json: {
+											uid: '54563b92-e4d9-425d-826d-9fe471196a28',
+											email: 'Jon_Ebert@yahoo.com',
+											firstname: 'April',
+											lastname: 'Aufderhar',
+											password: '+xziPGNy',
+										},
+										pairedItem: { item: 0 },
+									},
+								],
+							],
+						},
+					},
+				],
+				'Edit Fields1': [
+					{
+						startTime: 1706027170008,
+						executionTime: 0,
+						source: [{ previousNode: 'Edit Fields' }],
+						executionStatus: 'success',
+						data: {
+							main: [
+								[
+									{
+										json: {
+											uid: '3d3ee69e-f013-478c-8f5b-7723f508c02b',
+											email: 'Jeffery_Wehner@yahoo.com',
+											firstname: 'Amelia',
+											lastname: 'Mante',
+											password: '2DJR~2owf',
+										},
+										pairedItem: { item: 0 },
+									},
+								],
+							],
+						},
+					},
+					{
+						startTime: 1706027170010,
+						executionTime: 0,
+						source: [{ previousNode: 'Edit Fields', previousNodeRun: 1 }],
+						executionStatus: 'success',
+						data: {
+							main: [
+								[
+									{
+										json: {
+											uid: '54563b92-e4d9-425d-826d-9fe471196a28',
+											email: 'Jon_Ebert@yahoo.com',
+											firstname: 'April',
+											lastname: 'Aufderhar',
+											password: '+xziPGNy',
+										},
+										pairedItem: { item: 0 },
+									},
+								],
+							],
+						},
+					},
+				],
+			},
+			pinData: {},
+			lastNodeExecuted: 'Edit Fields1',
+		},
+		executionData: {
+			contextData: {},
+			nodeExecutionStack: [],
+			metadata: {},
+			waitingExecution: {},
+			waitingExecutionSource: {},
+		},
+	},
+	mode: 'manual',
+	startedAt: new Date('2024-01-23T16:26:10.003Z'),
+	stoppedAt: new Date('2024-01-23T16:26:10.011Z'),
+	status: 'success',
+	finished: true,
+};
+
+describe('pairedItemUtils', () => {
+	describe('getPairedItemId', () => {
+		it('should return the correct paired item ID', () => {
+			const node = 'myNode';
+			const run = 1;
+			const output = 2;
+			const item = 3;
+			const expectedPairedItemId = 'myNode_r1_o2_i3';
+
+			const pairedItemId = getPairedItemId(node, run, output, item);
+
+			expect(pairedItemId).toEqual(expectedPairedItemId);
+		});
+	});
+
+	describe('getSourceItems', () => {
+		it('should return the source items for the given target item', () => {
+			const target: TargetItem = { nodeName: 'If', runIndex: 0, outputIndex: 0, itemIndex: 0 };
+			const expected: TargetItem[] = [
+				{ nodeName: 'DebugHelper', runIndex: 0, itemIndex: 0, outputIndex: 0 },
+			];
+
+			const actual = getSourceItems(MOCK_EXECUTION, target);
+			expect(actual).toEqual(expected);
+		});
+
+		it('should return the source items for the given target item across outputs', () => {
+			const target: TargetItem = { nodeName: 'If', runIndex: 0, outputIndex: 1, itemIndex: 0 };
+			const expected: TargetItem[] = [
+				{ nodeName: 'DebugHelper', runIndex: 0, itemIndex: 1, outputIndex: 0 },
+			];
+
+			const actual = getSourceItems(MOCK_EXECUTION, target);
+			expect(actual).toEqual(expected);
+		});
+
+		it('should return the source items for the given target item across runs', () => {
+			const target: TargetItem = {
+				nodeName: 'Edit Fields1',
+				runIndex: 1,
+				outputIndex: 0,
+				itemIndex: 0,
+			};
+			const expected: TargetItem[] = [
+				{ nodeName: 'Edit Fields', runIndex: 1, itemIndex: 0, outputIndex: 0 },
+			];
+
+			const actual = getSourceItems(MOCK_EXECUTION, target);
+			expect(actual).toEqual(expected);
+		});
+	});
+
+	describe('getPairedItemsMapping', () => {
+		it('should return the mapping of paired items', () => {
+			const actual = getPairedItemsMapping(MOCK_EXECUTION);
+			const expected = {
+				DebugHelper_r0_o0_i0: new Set([
+					'When clicking "Test workflow"_r0_o0_i0',
+					'If_r0_o0_i0',
+					'Edit Fields_r1_o0_i0',
+					'Edit Fields1_r1_o0_i0',
+				]),
+				DebugHelper_r0_o0_i1: new Set([
+					'When clicking "Test workflow"_r0_o0_i0',
+					'If_r0_o1_i0',
+					'Edit Fields_r0_o0_i0',
+					'Edit Fields1_r0_o0_i0',
+				]),
+				'Edit Fields1_r0_o0_i0': new Set([
+					'When clicking "Test workflow"_r0_o0_i0',
+					'DebugHelper_r0_o0_i1',
+					'If_r0_o1_i0',
+					'Edit Fields_r0_o0_i0',
+				]),
+				'Edit Fields1_r1_o0_i0': new Set([
+					'When clicking "Test workflow"_r0_o0_i0',
+					'DebugHelper_r0_o0_i0',
+					'If_r0_o0_i0',
+					'Edit Fields_r1_o0_i0',
+				]),
+				'Edit Fields_r0_o0_i0': new Set([
+					'When clicking "Test workflow"_r0_o0_i0',
+					'DebugHelper_r0_o0_i1',
+					'If_r0_o1_i0',
+					'Edit Fields1_r0_o0_i0',
+				]),
+				'Edit Fields_r1_o0_i0': new Set([
+					'When clicking "Test workflow"_r0_o0_i0',
+					'DebugHelper_r0_o0_i0',
+					'If_r0_o0_i0',
+					'Edit Fields1_r1_o0_i0',
+				]),
+				If_r0_o0_i0: new Set([
+					'When clicking "Test workflow"_r0_o0_i0',
+					'DebugHelper_r0_o0_i0',
+					'Edit Fields_r1_o0_i0',
+					'Edit Fields1_r1_o0_i0',
+				]),
+				If_r0_o1_i0: new Set([
+					'When clicking "Test workflow"_r0_o0_i0',
+					'DebugHelper_r0_o0_i1',
+					'Edit Fields_r0_o0_i0',
+					'Edit Fields1_r0_o0_i0',
+				]),
+				'When clicking "Test workflow"_r0_o0_i0': new Set([
+					'DebugHelper_r0_o0_i0',
+					'DebugHelper_r0_o0_i1',
+					'If_r0_o0_i0',
+					'If_r0_o1_i0',
+					'Edit Fields_r0_o0_i0',
+					'Edit Fields_r1_o0_i0',
+					'Edit Fields1_r0_o0_i0',
+					'Edit Fields1_r1_o0_i0',
+				]),
+			};
+			expect(actual).toEqual(expected);
+		});
+
+		it('should skip mapping if execution has more than max items overall', () => {
+			const mockExecution: Partial<IExecutionResponse> = {
+				data: {
+					startData: {},
+					resultData: {
+						runData: {
+							Start: [
+								{
+									startTime: 1706027170005,
+									executionTime: 0,
+									source: [],
+									executionStatus: 'success',
+									data: {
+										main: [[]],
+									},
+								},
+							],
+							DebugHelper: [
+								{
+									startTime: 1706027170005,
+									executionTime: 1,
+									source: [{ previousNode: 'Start' }],
+									executionStatus: 'success',
+									data: {
+										main: [[]],
+									},
+								},
+							],
+						},
+						pinData: {},
+						lastNodeExecuted: 'DebugHelper',
+					},
+					executionData: {
+						contextData: {},
+						nodeExecutionStack: [],
+						metadata: {},
+						waitingExecution: {},
+						waitingExecutionSource: {},
+					},
+				},
+				mode: 'manual',
+				startedAt: new Date('2024-01-23T16:26:10.003Z'),
+				stoppedAt: new Date('2024-01-23T16:26:10.011Z'),
+				status: 'success',
+				finished: true,
+			};
+
+			for (let i = 0; i < MAX_ITEM_COUNT_FOR_PAIRING / 2; i++) {
+				mockExecution.data?.resultData.runData.Start[0].data?.main[0]?.push({
+					json: {},
+					pairedItem: { item: 0 },
+				});
+			}
+
+			for (let i = 0; i < MAX_ITEM_COUNT_FOR_PAIRING / 2; i++) {
+				mockExecution.data?.resultData.runData.DebugHelper[0]?.data?.main[0]?.push({
+					json: {
+						uid: '3d3ee69e-f013-478c-8f5b-7723f508c02b',
+						email: 'Jeffery_Wehner@yahoo.com',
+						firstname: 'Amelia',
+						lastname: 'Mante',
+						password: '2DJR~2owf',
+					},
+					pairedItem: { item: 0 },
+				});
+			}
+
+			const actual = getPairedItemsMapping(mockExecution);
+			expect(Object.keys(actual).length).toEqual(MAX_ITEM_COUNT_FOR_PAIRING / 2 + 1);
+
+			mockExecution.data?.resultData.runData.Start[0].data?.main?.[0]?.push({
+				json: {},
+				pairedItem: { item: 0 },
+			});
+
+			expect(getPairedItemsMapping(mockExecution)).toEqual({});
+		});
+	});
+});
diff --git a/packages/editor-ui/src/utils/__tests__/rbacUtils.test.ts b/packages/editor-ui/src/utils/__tests__/rbacUtils.test.ts
new file mode 100644
index 0000000000000..a6612e8b50994
--- /dev/null
+++ b/packages/editor-ui/src/utils/__tests__/rbacUtils.test.ts
@@ -0,0 +1,65 @@
+import type { RouteLocationNormalized } from 'vue-router';
+import {
+	inferProjectIdFromRoute,
+	inferResourceTypeFromRoute,
+	inferResourceIdFromRoute,
+} from '../rbacUtils';
+
+describe('rbacUtils', () => {
+	describe('inferProjectIdFromRoute()', () => {
+		it('should infer project ID from route correctly', () => {
+			const route = { path: '/dashboard/projects/123/settings' } as RouteLocationNormalized;
+			const projectId = inferProjectIdFromRoute(route);
+			expect(projectId).toBe('123');
+		});
+
+		it('should return undefined for project ID if not found', () => {
+			const route = { path: '/dashboard/settings' } as RouteLocationNormalized;
+			const projectId = inferProjectIdFromRoute(route);
+			expect(projectId).toBeUndefined();
+		});
+	});
+
+	describe('inferResourceTypeFromRoute()', () => {
+		it.each([
+			['/workflows', 'workflow'],
+			['/workflows/123', 'workflow'],
+			['/workflows/123/settings', 'workflow'],
+			['/credentials', 'credential'],
+			['/variables', 'variable'],
+			['/users', 'user'],
+			['/source-control', 'sourceControl'],
+			['/external-secrets', 'externalSecretsStore'],
+		])('should infer resource type from %s correctly to %s', (path, type) => {
+			const route = { path } as RouteLocationNormalized;
+			const resourceType = inferResourceTypeFromRoute(route);
+			expect(resourceType).toBe(type);
+		});
+
+		it('should return undefined for resource type if not found', () => {
+			const route = { path: '/dashboard/settings' } as RouteLocationNormalized;
+			const resourceType = inferResourceTypeFromRoute(route);
+			expect(resourceType).toBeUndefined();
+		});
+	});
+
+	describe('inferResourceIdFromRoute()', () => {
+		it('should infer resource ID from params.id', () => {
+			const route = { params: { id: 'abc123' } } as RouteLocationNormalized;
+			const resourceId = inferResourceIdFromRoute(route);
+			expect(resourceId).toBe('abc123');
+		});
+
+		it('should infer resource ID from params.name if id is not present', () => {
+			const route = { params: { name: 'my-resource' } } as RouteLocationNormalized;
+			const resourceId = inferResourceIdFromRoute(route);
+			expect(resourceId).toBe('my-resource');
+		});
+
+		it('should return undefined for resource ID if neither id nor name is present', () => {
+			const route = { params: {} } as RouteLocationNormalized;
+			const resourceId = inferResourceIdFromRoute(route);
+			expect(resourceId).toBeUndefined();
+		});
+	});
+});
diff --git a/packages/editor-ui/src/utils/__tests__/sourceControlUtils.test.ts b/packages/editor-ui/src/utils/__tests__/sourceControlUtils.test.ts
new file mode 100644
index 0000000000000..ef7141fcd9865
--- /dev/null
+++ b/packages/editor-ui/src/utils/__tests__/sourceControlUtils.test.ts
@@ -0,0 +1,56 @@
+import type { SourceControlStatus } from '@/Interface';
+import { beforeEach } from 'vitest';
+import { aggregateSourceControlFiles } from '@/utils/sourceControlUtils';
+
+describe('sourceControlUtils', () => {
+	describe('aggregateSourceControlFiles()', () => {
+		let status: SourceControlStatus;
+
+		beforeEach(() => {
+			status = {
+				ahead: 0,
+				behind: 0,
+				conflicted: [],
+				created: [],
+				current: 'main',
+				deleted: [],
+				detached: false,
+				files: [],
+				modified: [],
+				not_added: [],
+				renamed: [],
+				staged: [],
+				tracking: null,
+			};
+		});
+
+		it('should be empty array if no files', () => {
+			expect(aggregateSourceControlFiles(status)).toEqual([]);
+		});
+
+		it('should contain list of conflicted, created, deleted, modified, and renamed files', () => {
+			status.files = [
+				{ path: 'conflicted.json', index: 'A', working_dir: '' },
+				{ path: 'created.json', index: 'A', working_dir: '' },
+				{ path: 'deleted.json', index: 'A', working_dir: '' },
+				{ path: 'modified.json', index: 'A', working_dir: '' },
+				{ path: 'renamed.json', index: 'A', working_dir: '' },
+			];
+
+			status.conflicted.push('conflicted.json');
+			status.created.push('created.json');
+			status.deleted.push('deleted.json');
+			status.modified.push('modified.json');
+			status.renamed.push('renamed.json');
+			status.staged = status.files.map((file) => file.path);
+
+			expect(aggregateSourceControlFiles(status)).toEqual([
+				{ path: 'conflicted.json', status: 'conflicted', staged: true },
+				{ path: 'created.json', status: 'created', staged: true },
+				{ path: 'deleted.json', status: 'deleted', staged: true },
+				{ path: 'modified.json', status: 'modified', staged: true },
+				{ path: 'renamed.json', status: 'renamed', staged: true },
+			]);
+		});
+	});
+});
diff --git a/packages/editor-ui/src/utils/__tests__/typesUtils.test.ts b/packages/editor-ui/src/utils/__tests__/typesUtils.test.ts
index d914146b0d3cb..a9070dbe842da 100644
--- a/packages/editor-ui/src/utils/__tests__/typesUtils.test.ts
+++ b/packages/editor-ui/src/utils/__tests__/typesUtils.test.ts
@@ -1,6 +1,4 @@
-import jp from 'jsonpath';
-import { isEmpty, intersection, getSchema, isValidDate } from '@/utils';
-import type { Schema } from '@/Interface';
+import { isEmpty, intersection, isValidDate } from '@/utils/typesUtils';
 
 describe('Types Utils', () => {
 	describe('isEmpty', () => {
@@ -43,355 +41,6 @@ describe('Types Utils', () => {
 		});
 	});
 
-	describe('getSchema', () => {
-		test.each([
-			[, { type: 'undefined', value: 'undefined', path: '' }],
-			[undefined, { type: 'undefined', value: 'undefined', path: '' }],
-			[null, { type: 'null', value: '[null]', path: '' }],
-			['John', { type: 'string', value: 'John', path: '' }],
-			['123', { type: 'string', value: '123', path: '' }],
-			[123, { type: 'number', value: '123', path: '' }],
-			[true, { type: 'boolean', value: 'true', path: '' }],
-			[false, { type: 'boolean', value: 'false', path: '' }],
-			[() => {}, { type: 'function', value: '', path: '' }],
-			[{}, { type: 'object', value: [], path: '' }],
-			[[], { type: 'array', value: [], path: '' }],
-			[
-				new Date('2022-11-22T00:00:00.000Z'),
-				{ type: 'string', value: '2022-11-22T00:00:00.000Z', path: '' },
-			],
-			[Symbol('x'), { type: 'symbol', value: 'Symbol(x)', path: '' }],
-			[1n, { type: 'bigint', value: '1', path: '' }],
-			[
-				['John', 1, true],
-				{
-					type: 'array',
-					value: [
-						{ type: 'string', value: 'John', key: '0', path: '[0]' },
-						{ type: 'number', value: '1', key: '1', path: '[1]' },
-						{ type: 'boolean', value: 'true', key: '2', path: '[2]' },
-					],
-					path: '',
-				},
-			],
-			[
-				{ people: ['Joe', 'John'] },
-				{
-					type: 'object',
-					value: [
-						{
-							type: 'array',
-							key: 'people',
-							value: [
-								{ type: 'string', value: 'Joe', key: '0', path: '.people[0]' },
-								{ type: 'string', value: 'John', key: '1', path: '.people[1]' },
-							],
-							path: '.people',
-						},
-					],
-					path: '',
-				},
-			],
-			[
-				{ 'with space': [], 'with.dot': 'test' },
-				{
-					type: 'object',
-					value: [
-						{
-							type: 'array',
-							key: 'with space',
-							value: [],
-							path: "['with space']",
-						},
-						{
-							type: 'string',
-							key: 'with.dot',
-							value: 'test',
-							path: "['with.dot']",
-						},
-					],
-					path: '',
-				},
-			],
-			[
-				[
-					{ name: 'John', age: 22 },
-					{ name: 'Joe', age: 33 },
-				],
-				{
-					type: 'array',
-					value: [
-						{
-							type: 'object',
-							key: '0',
-							value: [
-								{ type: 'string', key: 'name', value: 'John', path: '[0].name' },
-								{ type: 'number', key: 'age', value: '22', path: '[0].age' },
-							],
-							path: '[0]',
-						},
-						{
-							type: 'object',
-							key: '1',
-							value: [
-								{ type: 'string', key: 'name', value: 'Joe', path: '[1].name' },
-								{ type: 'number', key: 'age', value: '33', path: '[1].age' },
-							],
-							path: '[1]',
-						},
-					],
-					path: '',
-				},
-			],
-			[
-				[
-					{ name: 'John', age: 22, hobbies: ['surfing', 'traveling'] },
-					{ name: 'Joe', age: 33, hobbies: ['skateboarding', 'gaming'] },
-				],
-				{
-					type: 'array',
-					value: [
-						{
-							type: 'object',
-							key: '0',
-							value: [
-								{ type: 'string', key: 'name', value: 'John', path: '[0].name' },
-								{ type: 'number', key: 'age', value: '22', path: '[0].age' },
-								{
-									type: 'array',
-									key: 'hobbies',
-									value: [
-										{ type: 'string', key: '0', value: 'surfing', path: '[0].hobbies[0]' },
-										{ type: 'string', key: '1', value: 'traveling', path: '[0].hobbies[1]' },
-									],
-									path: '[0].hobbies',
-								},
-							],
-							path: '[0]',
-						},
-						{
-							type: 'object',
-							key: '1',
-							value: [
-								{ type: 'string', key: 'name', value: 'Joe', path: '[1].name' },
-								{ type: 'number', key: 'age', value: '33', path: '[1].age' },
-								{
-									type: 'array',
-									key: 'hobbies',
-									value: [
-										{ type: 'string', key: '0', value: 'skateboarding', path: '[1].hobbies[0]' },
-										{ type: 'string', key: '1', value: 'gaming', path: '[1].hobbies[1]' },
-									],
-									path: '[1].hobbies',
-								},
-							],
-							path: '[1]',
-						},
-					],
-					path: '',
-				},
-			],
-			[[], { type: 'array', value: [], path: '' }],
-			[
-				[[1, 2]],
-				{
-					type: 'array',
-					value: [
-						{
-							type: 'array',
-							key: '0',
-							value: [
-								{ type: 'number', key: '0', value: '1', path: '[0][0]' },
-								{ type: 'number', key: '1', value: '2', path: '[0][1]' },
-							],
-							path: '[0]',
-						},
-					],
-					path: '',
-				},
-			],
-			[
-				[
-					[
-						{ name: 'John', age: 22 },
-						{ name: 'Joe', age: 33 },
-					],
-				],
-				{
-					type: 'array',
-					value: [
-						{
-							type: 'array',
-							key: '0',
-							value: [
-								{
-									type: 'object',
-									key: '0',
-									value: [
-										{ type: 'string', key: 'name', value: 'John', path: '[0][0].name' },
-										{ type: 'number', key: 'age', value: '22', path: '[0][0].age' },
-									],
-									path: '[0][0]',
-								},
-								{
-									type: 'object',
-									key: '1',
-									value: [
-										{ type: 'string', key: 'name', value: 'Joe', path: '[0][1].name' },
-										{ type: 'number', key: 'age', value: '33', path: '[0][1].age' },
-									],
-									path: '[0][1]',
-								},
-							],
-							path: '[0]',
-						},
-					],
-					path: '',
-				},
-			],
-			[
-				[
-					{
-						dates: [
-							[new Date('2022-11-22T00:00:00.000Z'), new Date('2022-11-23T00:00:00.000Z')],
-							[new Date('2022-12-22T00:00:00.000Z'), new Date('2022-12-23T00:00:00.000Z')],
-						],
-					},
-				],
-				{
-					type: 'array',
-					value: [
-						{
-							type: 'object',
-							key: '0',
-							value: [
-								{
-									type: 'array',
-									key: 'dates',
-									value: [
-										{
-											type: 'array',
-											key: '0',
-											value: [
-												{
-													type: 'string',
-													key: '0',
-													value: '2022-11-22T00:00:00.000Z',
-													path: '[0].dates[0][0]',
-												},
-												{
-													type: 'string',
-													key: '1',
-													value: '2022-11-23T00:00:00.000Z',
-													path: '[0].dates[0][1]',
-												},
-											],
-											path: '[0].dates[0]',
-										},
-										{
-											type: 'array',
-											key: '1',
-											value: [
-												{
-													type: 'string',
-													key: '0',
-													value: '2022-12-22T00:00:00.000Z',
-													path: '[0].dates[1][0]',
-												},
-												{
-													type: 'string',
-													key: '1',
-													value: '2022-12-23T00:00:00.000Z',
-													path: '[0].dates[1][1]',
-												},
-											],
-											path: '[0].dates[1]',
-										},
-									],
-									path: '[0].dates',
-								},
-							],
-							path: '[0]',
-						},
-					],
-					path: '',
-				},
-			],
-		])('should return the correct json schema for %s', (input, schema) => {
-			expect(getSchema(input)).toEqual(schema);
-		});
-
-		it('should return the correct data when using the generated json path on an object', () => {
-			const input = { people: ['Joe', 'John'] };
-			const schema = getSchema(input) as Schema;
-			const pathData = jp.query(
-				input,
-				`$${((schema.value as Schema[])[0].value as Schema[])[0].path}`,
-			);
-			expect(pathData).toEqual(['Joe']);
-		});
-
-		it('should return the correct data when using the generated json path on a list', () => {
-			const input = [
-				{ name: 'John', age: 22, hobbies: ['surfing', 'traveling'] },
-				{ name: 'Joe', age: 33, hobbies: ['skateboarding', 'gaming'] },
-			];
-			const schema = getSchema(input) as Schema;
-			const pathData = jp.query(
-				input,
-				`$${(((schema.value as Schema[])[0].value as Schema[])[2].value as Schema[])[1].path}`,
-			);
-			expect(pathData).toEqual(['traveling']);
-		});
-
-		it('should return the correct data when using the generated json path on a list of list', () => {
-			const input = [[1, 2]];
-			const schema = getSchema(input) as Schema;
-			const pathData = jp.query(
-				input,
-				`$${((schema.value as Schema[])[0].value as Schema[])[1].path}`,
-			);
-			expect(pathData).toEqual([2]);
-		});
-
-		it('should return the correct data when using the generated json path on a list of list of objects', () => {
-			const input = [
-				[
-					{ name: 'John', age: 22 },
-					{ name: 'Joe', age: 33 },
-				],
-			];
-			const schema = getSchema(input) as Schema;
-			const pathData = jp.query(
-				input,
-				`$${(((schema.value as Schema[])[0].value as Schema[])[1].value as Schema[])[1].path}`,
-			);
-			expect(pathData).toEqual([33]);
-		});
-
-		it('should return the correct data when using the generated json path on a list of objects with a list of date tuples', () => {
-			const input = [
-				{
-					dates: [
-						[new Date('2022-11-22T00:00:00.000Z'), new Date('2022-11-23T00:00:00.000Z')],
-						[new Date('2022-12-22T00:00:00.000Z'), new Date('2022-12-23T00:00:00.000Z')],
-					],
-				},
-			];
-			const schema = getSchema(input) as Schema;
-			const pathData = jp.query(
-				input,
-				`$${
-					(
-						(((schema.value as Schema[])[0].value as Schema[])[0].value as Schema[])[0]
-							.value as Schema[]
-					)[0].path
-				}`,
-			);
-			expect(pathData).toEqual([new Date('2022-11-22T00:00:00.000Z')]);
-		});
-	});
-
 	describe('dateTests', () => {
 		test.each([
 			'04-08-2021',
diff --git a/packages/editor-ui/src/utils/__tests__/userUtils.test.ts b/packages/editor-ui/src/utils/__tests__/userUtils.test.ts
deleted file mode 100644
index b5ed96815724d..0000000000000
--- a/packages/editor-ui/src/utils/__tests__/userUtils.test.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import { beforeAll } from 'vitest';
-import { setActivePinia, createPinia } from 'pinia';
-import { merge } from 'lodash-es';
-import { isAuthorized } from '@/utils';
-import { useSettingsStore } from '@/stores/settings';
-import { useSSOStore } from '@/stores/sso';
-import type { IUser } from '@/Interface';
-import { routes } from '@/router';
-import { VIEWS } from '@/constants';
-import { SETTINGS_STORE_DEFAULT_STATE } from '@/__tests__/utils';
-import type { IN8nUISettings } from 'n8n-workflow';
-
-const DEFAULT_SETTINGS: IN8nUISettings = SETTINGS_STORE_DEFAULT_STATE.settings;
-
-const DEFAULT_USER: IUser = {
-	id: '1',
-	isPending: false,
-	isDefaultUser: true,
-	isOwner: false,
-	isPendingUser: false,
-	globalRole: {
-		name: 'default',
-		id: '1',
-		createdAt: new Date(),
-	},
-};
-
-describe('userUtils', () => {
-	let settingsStore: ReturnType<typeof useSettingsStore>;
-	let ssoStore: ReturnType<typeof useSSOStore>;
-
-	describe('isAuthorized', () => {
-		beforeAll(() => {
-			setActivePinia(createPinia());
-			settingsStore = useSettingsStore();
-			ssoStore = useSSOStore();
-		});
-
-		it('should check SSO settings route permissions', () => {
-			const ssoSettingsPermissions = routes
-				.find((route) => route.path.startsWith('/settings'))
-				?.children?.find((route) => route.name === VIEWS.SSO_SETTINGS)?.meta?.permissions;
-
-			const user: IUser = merge({}, DEFAULT_USER, {
-				isDefaultUser: false,
-				isOwner: true,
-				globalRole: {
-					id: '1',
-					name: 'owner',
-					createdAt: new Date(),
-				},
-			});
-
-			settingsStore.setSettings(merge({}, DEFAULT_SETTINGS, { enterprise: { saml: true } }));
-
-			expect(isAuthorized(ssoSettingsPermissions, user)).toBe(true);
-		});
-	});
-});
diff --git a/packages/editor-ui/src/utils/apiUtils.ts b/packages/editor-ui/src/utils/apiUtils.ts
index 6d7b809036366..b0f43dce5010a 100644
--- a/packages/editor-ui/src/utils/apiUtils.ts
+++ b/packages/editor-ui/src/utils/apiUtils.ts
@@ -1,17 +1,19 @@
-import type { AxiosRequestConfig, Method } from 'axios';
+import type { AxiosRequestConfig, Method, RawAxiosRequestHeaders } from 'axios';
 import axios from 'axios';
 import type { IDataObject } from 'n8n-workflow';
-import type {
-	IExecutionFlattedResponse,
-	IExecutionResponse,
-	IRestApiContext,
-	IWorkflowDb,
-} from '@/Interface';
+import type { IExecutionFlattedResponse, IExecutionResponse, IRestApiContext } from '@/Interface';
 import { parse } from 'flatted';
 
+const BROWSER_ID_STORAGE_KEY = 'n8n-browserId';
+let browserId = localStorage.getItem(BROWSER_ID_STORAGE_KEY);
+if (!browserId && 'randomUUID' in crypto) {
+	browserId = crypto.randomUUID();
+	localStorage.setItem(BROWSER_ID_STORAGE_KEY, browserId);
+}
+
 export const NO_NETWORK_ERROR_CODE = 999;
 
-class ResponseError extends Error {
+export class ResponseError extends Error {
 	// The HTTP status code of response
 	httpStatusCode?: number;
 
@@ -48,27 +50,51 @@ class ResponseError extends Error {
 	}
 }
 
-async function request(config: {
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const legacyParamSerializer = (params: Record<string, any>) =>
+	Object.keys(params)
+		.filter((key) => params[key] !== undefined)
+		.map((key) => {
+			if (Array.isArray(params[key])) {
+				return params[key].map((v) => `${key}[]=${encodeURIComponent(v)}`).join('&');
+			}
+			if (typeof params[key] === 'object') {
+				params[key] = JSON.stringify(params[key]);
+			}
+			return `${key}=${encodeURIComponent(params[key])}`;
+		})
+		.join('&');
+
+export async function request(config: {
 	method: Method;
 	baseURL: string;
 	endpoint: string;
-	headers?: IDataObject;
-	data?: IDataObject;
+	headers?: RawAxiosRequestHeaders;
+	data?: IDataObject | IDataObject[];
+	withCredentials?: boolean;
 }) {
 	const { method, baseURL, endpoint, headers, data } = config;
 	const options: AxiosRequestConfig = {
 		method,
 		url: endpoint,
 		baseURL,
-		headers,
+		headers: headers ?? {},
 	};
-	if (import.meta.env.NODE_ENV !== 'production' && !baseURL.includes('api.n8n.io')) {
-		options.withCredentials = true;
+	if (baseURL.startsWith('/') && browserId) {
+		options.headers!['browser-id'] = browserId;
+	}
+	if (
+		import.meta.env.NODE_ENV !== 'production' &&
+		!baseURL.includes('api.n8n.io') &&
+		!baseURL.includes('n8n.cloud')
+	) {
+		options.withCredentials = options.withCredentials ?? true;
 	}
 	if (['POST', 'PATCH', 'PUT'].includes(method)) {
 		options.data = data;
-	} else {
+	} else if (data) {
 		options.params = data;
+		options.paramsSerializer = legacyParamSerializer;
 	}
 
 	try {
@@ -76,7 +102,7 @@ async function request(config: {
 		return response.data;
 	} catch (error) {
 		if (error.message === 'Network Error') {
-			throw new ResponseError('API-Server can not be reached. It is probably down.', {
+			throw new ResponseError("Can't connect to n8n.", {
 				errorCode: NO_NETWORK_ERROR_CODE,
 			});
 		}
@@ -99,29 +125,29 @@ async function request(config: {
 	}
 }
 
-export async function makeRestApiRequest(
+export async function makeRestApiRequest<T>(
 	context: IRestApiContext,
 	method: Method,
 	endpoint: string,
-	data?: IDataObject,
+	data?: IDataObject | IDataObject[],
 ) {
 	const response = await request({
 		method,
 		baseURL: context.baseUrl,
 		endpoint,
-		headers: { sessionid: context.sessionId },
+		headers: { 'push-ref': context.pushRef },
 		data,
 	});
 
 	// @ts-ignore all cli rest api endpoints return data wrapped in `data` key
-	return response.data;
+	return response.data as T;
 }
 
 export async function get(
 	baseURL: string,
 	endpoint: string,
 	params?: IDataObject,
-	headers?: IDataObject,
+	headers?: RawAxiosRequestHeaders,
 ) {
 	return await request({ method: 'GET', baseURL, endpoint, headers, data: params });
 }
@@ -130,7 +156,7 @@ export async function post(
 	baseURL: string,
 	endpoint: string,
 	params?: IDataObject,
-	headers?: IDataObject,
+	headers?: RawAxiosRequestHeaders,
 ) {
 	return await request({ method: 'POST', baseURL, endpoint, headers, data: params });
 }
@@ -146,7 +172,7 @@ export function unflattenExecutionData(
 	// Unflatten the data
 	const returnData: IExecutionResponse = {
 		...fullExecutionData,
-		workflowData: fullExecutionData.workflowData as IWorkflowDb,
+		workflowData: fullExecutionData.workflowData,
 		data: parse(fullExecutionData.data),
 	};
 
diff --git a/packages/editor-ui/src/utils/assert.ts b/packages/editor-ui/src/utils/assert.ts
new file mode 100644
index 0000000000000..436632414165a
--- /dev/null
+++ b/packages/editor-ui/src/utils/assert.ts
@@ -0,0 +1,8 @@
+/**
+ * Asserts given condition
+ */
+export function assert(condition: unknown, message?: string): asserts condition {
+	if (!condition) {
+		throw new Error(message ?? 'Assertion failed');
+	}
+}
diff --git a/packages/editor-ui/src/utils/canvasUtils.ts b/packages/editor-ui/src/utils/canvasUtils.ts
index 5996802a8880c..3d619a17d7154 100644
--- a/packages/editor-ui/src/utils/canvasUtils.ts
+++ b/packages/editor-ui/src/utils/canvasUtils.ts
@@ -1,6 +1,6 @@
 import { MAIN_HEADER_TABS, VIEWS } from '@/constants';
 import type { IZoomConfig } from '@/Interface';
-import { useWorkflowsStore } from '@/stores/workflows';
+import { useWorkflowsStore } from '@/stores/workflows.store';
 import type { ConnectionDetachedParams } from '@jsplumb/core';
 import type { IConnection } from 'n8n-workflow';
 import type { Route } from 'vue-router';
@@ -10,69 +10,46 @@ import type { Route } from 'vue-router';
 	and components used to display workflow in node view.
 	These are general-purpose functions that are exported
 	with this module and should be used by importing from
-	'@/utils'.
+	'@/utils/canvasUtils'.
 */
 
-export const scaleSmaller = ({ scale, offset: [xOffset, yOffset] }: IZoomConfig): IZoomConfig => {
-	scale /= 1.25;
-	xOffset /= 1.25;
-	yOffset /= 1.25;
-	xOffset += window.innerWidth / 10;
-	yOffset += window.innerHeight / 10;
+const SCALE_CHANGE_FACTOR = 1.25;
+const MIN_SCALE = 0.2;
+const MAX_SCALE = 5;
+const SCROLL_ZOOM_SPEED = 0.01;
+const MAX_WHEEL_DELTA = 32;
 
-	return {
-		scale,
-		offset: [xOffset, yOffset],
-	};
-};
-
-export const scaleBigger = ({ scale, offset: [xOffset, yOffset] }: IZoomConfig): IZoomConfig => {
-	scale *= 1.25;
-	xOffset -= window.innerWidth / 10;
-	yOffset -= window.innerHeight / 10;
-	xOffset *= 1.25;
-	yOffset *= 1.25;
-
-	return {
-		scale,
-		offset: [xOffset, yOffset],
-	};
+const clamp = (min: number, max: number) => (num: number) => {
+	return Math.max(min, Math.min(max, num));
 };
 
-export const scaleReset = (config: IZoomConfig): IZoomConfig => {
-	if (config.scale > 1) {
-		// zoomed in
-		while (config.scale > 1) {
-			config = scaleSmaller(config);
-		}
-	} else {
-		while (config.scale < 1) {
-			config = scaleBigger(config);
-		}
-	}
+const clampScale = clamp(MIN_SCALE, MAX_SCALE);
 
-	config.scale = 1;
+export const applyScale =
+	(scale: number) =>
+	({ scale: initialScale, offset: [xOffset, yOffset], origin }: IZoomConfig): IZoomConfig => {
+		const newScale = clampScale(initialScale * scale);
+		const scaleChange = newScale / initialScale;
 
-	return config;
-};
+		const xOrigin = origin?.[0] ?? window.innerWidth / 2;
+		const yOrigin = origin?.[1] ?? window.innerHeight / 2;
 
-export const closestNumberDivisibleBy = (inputNumber: number, divisibleBy: number): number => {
-	const quotient = Math.ceil(inputNumber / divisibleBy);
+		// Calculate the new offsets based on the zoom origin
+		xOffset = xOrigin - scaleChange * (xOrigin - xOffset);
+		yOffset = yOrigin - scaleChange * (yOrigin - yOffset);
 
-	// 1st possible closest number
-	const inputNumber1 = divisibleBy * quotient;
+		return {
+			scale: newScale,
+			offset: [xOffset, yOffset],
+		};
+	};
 
-	// 2nd possible closest number
-	const inputNumber2 =
-		inputNumber * divisibleBy > 0 ? divisibleBy * (quotient + 1) : divisibleBy * (quotient - 1);
+export const scaleBigger = applyScale(SCALE_CHANGE_FACTOR);
 
-	// if true, then inputNumber1 is the required closest number
-	if (Math.abs(inputNumber - inputNumber1) < Math.abs(inputNumber - inputNumber2)) {
-		return inputNumber1;
-	}
+export const scaleSmaller = applyScale(1 / SCALE_CHANGE_FACTOR);
 
-	// else inputNumber2 is the required closest number
-	return inputNumber2;
+export const scaleReset = (config: IZoomConfig): IZoomConfig => {
+	return applyScale(1 / config.scale)(config);
 };
 
 export const getNodeViewTab = (route: Route): string | null => {
@@ -112,3 +89,24 @@ export const getConnectionInfo = (
 	}
 	return null;
 };
+
+const clampWheelDelta = clamp(-MAX_WHEEL_DELTA, MAX_WHEEL_DELTA);
+
+export const normalizeWheelEventDelta = (event: WheelEvent): { deltaX: number; deltaY: number } => {
+	const factorByMode: Record<number, number> = {
+		[WheelEvent.DOM_DELTA_PIXEL]: 1,
+		[WheelEvent.DOM_DELTA_LINE]: 8,
+		[WheelEvent.DOM_DELTA_PAGE]: 24,
+	};
+
+	const factor = factorByMode[event.deltaMode] ?? 1;
+
+	return {
+		deltaX: clampWheelDelta(event.deltaX * factor),
+		deltaY: clampWheelDelta(event.deltaY * factor),
+	};
+};
+
+export const getScaleFromWheelEventDelta = (delta: number): number => {
+	return Math.pow(2, -delta * SCROLL_ZOOM_SPEED);
+};
diff --git a/packages/editor-ui/src/utils/credentialOnlyNodes.ts b/packages/editor-ui/src/utils/credentialOnlyNodes.ts
new file mode 100644
index 0000000000000..a765d496da5f8
--- /dev/null
+++ b/packages/editor-ui/src/utils/credentialOnlyNodes.ts
@@ -0,0 +1,90 @@
+import { deepCopy, type ICredentialType, type INodeTypeDescription } from 'n8n-workflow';
+import { CREDENTIAL_ONLY_NODE_PREFIX } from '../constants';
+import { i18n } from '@/plugins/i18n';
+
+export function isCredentialOnlyNodeType(nodeTypeName: string): boolean {
+	return nodeTypeName?.startsWith(CREDENTIAL_ONLY_NODE_PREFIX) ?? false;
+}
+
+export function getCredentialTypeName(nodeTypeName: string): string {
+	return nodeTypeName.split('.')[1];
+}
+
+export function getCredentialOnlyNodeTypeName(credentialTypeName: string): string {
+	return `${CREDENTIAL_ONLY_NODE_PREFIX}.${credentialTypeName}`;
+}
+
+export function getCredentialOnlyNodeType(
+	httpNode?: INodeTypeDescription | null,
+	credentialType?: ICredentialType,
+): INodeTypeDescription | undefined {
+	const { httpRequestNode } = credentialType ?? {};
+	if (!httpNode || !credentialType || !httpRequestNode) return undefined;
+
+	const { docsUrl, name: displayName } = httpRequestNode;
+
+	const credentialOnlyNode = deepCopy(httpNode);
+
+	const httpIcon = httpNode.iconUrl;
+
+	credentialOnlyNode.name = getCredentialOnlyNodeTypeName(credentialType.name);
+	credentialOnlyNode.extendsCredential = credentialType.name;
+	credentialOnlyNode.displayName = displayName ?? credentialType.displayName;
+	credentialOnlyNode.description = 'HTTP request';
+	credentialOnlyNode.defaults.name = `${displayName} HTTP Request`;
+	credentialOnlyNode.codex = {
+		...credentialOnlyNode.codex,
+		alias: [],
+		categories: [],
+		subcategories: {},
+	};
+
+	credentialOnlyNode.credentials = [{ name: credentialType.name, required: true }];
+
+	if (credentialType.icon ?? credentialType.iconUrl) {
+		credentialOnlyNode.icon = credentialType.icon;
+		credentialOnlyNode.iconUrl = credentialType.iconUrl;
+		credentialOnlyNode.badgeIconUrl = httpIcon;
+	} else {
+		credentialOnlyNode.iconUrl = httpIcon;
+	}
+
+	credentialOnlyNode.properties = httpNode.properties.map((prop) => {
+		switch (prop.name) {
+			case 'authentication':
+				return { ...prop, type: 'hidden', default: 'predefinedCredentialType' };
+			case 'nodeCredentialType':
+				return { ...prop, type: 'hidden', default: credentialType.name };
+			case 'url':
+				const properties = { ...prop };
+				if ('apiBaseUrl' in httpRequestNode) {
+					const { apiBaseUrl } = httpRequestNode;
+					properties.default = apiBaseUrl;
+					properties.placeholder = apiBaseUrl ? `e.g. ${apiBaseUrl}` : prop.placeholder;
+				} else {
+					properties.placeholder = httpRequestNode.apiBaseUrlPlaceholder;
+				}
+				return properties;
+			default:
+				return prop;
+		}
+	});
+
+	credentialOnlyNode.properties.splice(1, 0, {
+		type: 'notice',
+		displayName: i18n.baseText('ndv.httpRequest.credentialOnly.docsNotice', {
+			interpolate: { nodeName: displayName, docsUrl },
+		}),
+		name: 'httpVariantWarning',
+		default: '',
+	});
+
+	credentialOnlyNode.properties.splice(4, 0, {
+		type: 'credentials',
+		displayName: '',
+		name: '',
+		default: '',
+	});
+
+	return credentialOnlyNode;
+}
diff --git a/packages/editor-ui/src/utils/executionUtils.ts b/packages/editor-ui/src/utils/executionUtils.ts
index 06a64b60d6a7a..db75c5687a540 100644
--- a/packages/editor-ui/src/utils/executionUtils.ts
+++ b/packages/editor-ui/src/utils/executionUtils.ts
@@ -2,16 +2,21 @@ import type { ExecutionStatus, IDataObject } from 'n8n-workflow';
 import type { ExecutionFilterType, ExecutionsQueryFilter } from '@/Interface';
 import { isEmpty } from '@/utils/typesUtils';
 
+export function getDefaultExecutionFilters(): ExecutionFilterType {
+	return {
+		workflowId: 'all',
+		status: 'all',
+		startDate: '',
+		endDate: '',
+		tags: [],
+		metadata: [],
+	};
+}
+
 export const executionFilterToQueryFilter = (
-	filter: ExecutionFilterType,
+	filter: Partial<ExecutionFilterType>,
 ): ExecutionsQueryFilter => {
 	const queryFilter: IDataObject = {};
-	if (filter.status === 'waiting') {
-		queryFilter.waitTill = true;
-	} else if (filter.status !== 'all') {
-		queryFilter.finished = filter.status === 'success';
-	}
-
 	if (filter.workflowId !== 'all') {
 		queryFilter.workflowId = filter.workflowId;
 	}
@@ -37,14 +42,36 @@ export const executionFilterToQueryFilter = (
 			queryFilter.status = ['waiting'];
 			break;
 		case 'error':
-			queryFilter.status = ['failed', 'crashed'];
+			queryFilter.status = ['crashed', 'error'];
 			break;
 		case 'success':
 			queryFilter.status = ['success'];
 			break;
 		case 'running':
-			queryFilter.status = ['running'];
+			queryFilter.status = ['running', 'new'];
+			break;
+		case 'canceled':
+			queryFilter.status = ['canceled'];
 			break;
 	}
 	return queryFilter;
 };
+
+export const openPopUpWindow = (
+	url: string,
+	options?: { width?: number; height?: number; alwaysInNewTab?: boolean },
+) => {
+	const windowWidth = window.innerWidth;
+	const smallScreen = windowWidth <= 800;
+	if (options?.alwaysInNewTab || smallScreen) {
+		window.open(url, '_blank');
+	} else {
+		const height = options?.width || 700;
+		const width = options?.height || 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`;
+
+		window.open(url, '_blank', features);
+	}
+};
diff --git a/packages/editor-ui/src/utils/expressions.ts b/packages/editor-ui/src/utils/expressions.ts
new file mode 100644
index 0000000000000..dbab832fd670c
--- /dev/null
+++ b/packages/editor-ui/src/utils/expressions.ts
@@ -0,0 +1,132 @@
+import type { ResolvableState } from '@/types/expressions';
+import { ExpressionError, ExpressionParser, type Result } from 'n8n-workflow';
+import { i18n } from '@/plugins/i18n';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+
+export const isExpression = (expr: unknown) => {
+	if (typeof expr !== 'string') return false;
+	return expr.startsWith('=');
+};
+
+export const isEmptyExpression = (expr: string) => {
+	return /\{\{\s*\}\}/.test(expr);
+};
+
+export const removeExpressionPrefix = (expr: string) => {
+	return expr.startsWith('=') ? expr.slice(1) : expr;
+};
+
+export const isTestableExpression = (expr: string) => {
+	return ExpressionParser.splitExpression(expr).every((c) => {
+		if (c.type === 'text') {
+			return true;
+		}
+		return /\$secrets(\.[a-zA-Z0-9_]+)+$/.test(c.text.trim());
+	});
+};
+
+export const isNoExecDataExpressionError = (error: unknown): error is ExpressionError => {
+	return error instanceof ExpressionError && error.context.type === 'no_execution_data';
+};
+
+export const isNoNodeExecDataExpressionError = (error: unknown): error is ExpressionError => {
+	return error instanceof ExpressionError && error.context.type === 'no_node_execution_data';
+};
+
+export const isPairedItemIntermediateNodesError = (error: unknown): error is ExpressionError => {
+	return (
+		error instanceof ExpressionError && error.context.type === 'paired_item_intermediate_nodes'
+	);
+};
+
+export const isPairedItemNoConnectionError = (error: unknown): error is ExpressionError => {
+	return error instanceof ExpressionError && error.context.type === 'paired_item_no_connection';
+};
+
+export const isInvalidPairedItemError = (error: unknown): error is ExpressionError => {
+	return error instanceof ExpressionError && error.context.type === 'paired_item_invalid_info';
+};
+
+export const isNoPairedItemError = (error: unknown): error is ExpressionError => {
+	return error instanceof ExpressionError && error.context.type === 'paired_item_no_info';
+};
+
+export const isNoInputConnectionError = (error: unknown): error is ExpressionError => {
+	return error instanceof ExpressionError && error.context.type === 'no_input_connection';
+};
+
+export const isAnyPairedItemError = (error: unknown): error is ExpressionError => {
+	return error instanceof ExpressionError && error.context.functionality === 'pairedItem';
+};
+
+export const getResolvableState = (error: unknown, ignoreError = false): ResolvableState => {
+	if (!error) return 'valid';
+
+	if (
+		isNoExecDataExpressionError(error) ||
+		isNoNodeExecDataExpressionError(error) ||
+		isPairedItemIntermediateNodesError(error) ||
+		ignoreError
+	) {
+		return 'pending';
+	}
+
+	return 'invalid';
+};
+
+export const getExpressionErrorMessage = (error: Error): string => {
+	if (isNoExecDataExpressionError(error) || isPairedItemIntermediateNodesError(error)) {
+		return i18n.baseText('expressionModalInput.noExecutionData');
+	}
+
+	if (isNoNodeExecDataExpressionError(error)) {
+		const nodeCause = error.context.nodeCause as string;
+		return i18n.baseText('expressionModalInput.noNodeExecutionData', {
+			interpolate: { node: nodeCause },
+		});
+	}
+	if (isNoInputConnectionError(error)) {
+		return i18n.baseText('expressionModalInput.noInputConnection');
+	}
+
+	if (isPairedItemNoConnectionError(error)) {
+		return i18n.baseText('expressionModalInput.pairedItemConnectionError');
+	}
+
+	if (isInvalidPairedItemError(error) || isNoPairedItemError(error)) {
+		const nodeCause = error.context.nodeCause as string;
+		const isPinned = !!useWorkflowsStore().pinDataByNodeName(nodeCause);
+
+		if (isPinned) {
+			return i18n.baseText('expressionModalInput.pairedItemInvalidPinnedError', {
+				interpolate: { node: nodeCause },
+			});
+		}
+	}
+
+	if (isAnyPairedItemError(error)) {
+		return i18n.baseText('expressionModalInput.pairedItemError');
+	}
+
+	return error.message;
+};
+
+export const stringifyExpressionResult = (result: Result<unknown, Error>): string => {
+	if (!result.ok) {
+		if (getResolvableState(result.error) !== 'invalid') {
+			return '';
+		}
+
+		return `[${i18n.baseText('parameterInput.error')}: ${getExpressionErrorMessage(result.error)}]`;
+	}
+
+	if (result.result === null) {
+		return '';
+	}
+
+	if (typeof result.result === 'string' && result.result.length === 0) {
+		return i18n.baseText('parameterInput.emptyString');
+	}
+
+	return typeof result.result === 'string' ? result.result : JSON.stringify(result.result);
+};
diff --git a/packages/editor-ui/src/utils/externalHooks.ts b/packages/editor-ui/src/utils/externalHooks.ts
deleted file mode 100644
index 2cb48bc76988d..0000000000000
--- a/packages/editor-ui/src/utils/externalHooks.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import type { IDataObject } from 'n8n-workflow';
-import type { Store } from 'pinia';
-
-export async function runExternalHook(eventName: string, store: Store, metadata?: IDataObject) {
-	if (!window.n8nExternalHooks) {
-		return;
-	}
-
-	const [resource, operator] = eventName.split('.');
-
-	if (window.n8nExternalHooks[resource]?.[operator]) {
-		const hookMethods = window.n8nExternalHooks[resource][operator];
-
-		for (const hookMethod of hookMethods) {
-			await hookMethod(store, metadata);
-		}
-	}
-}
diff --git a/packages/editor-ui/src/utils/formatters/dateFormatter.ts b/packages/editor-ui/src/utils/formatters/dateFormatter.ts
new file mode 100644
index 0000000000000..30580f8bcab8b
--- /dev/null
+++ b/packages/editor-ui/src/utils/formatters/dateFormatter.ts
@@ -0,0 +1,24 @@
+import dateformat from 'dateformat';
+
+export const convertToDisplayDateComponents = (
+	fullDate: Date | string | number,
+): { date: string; time: string } => {
+	const mask = `d mmm${
+		new Date(fullDate).getFullYear() === new Date().getFullYear() ? '' : ', yyyy'
+	}#HH:MM:ss`;
+	const formattedDate = dateformat(fullDate, mask);
+	const [date, time] = formattedDate.split('#');
+	return { date, time };
+};
+
+export function convertToDisplayDate(fullDate: Date | string | number): {
+	date: string;
+	time: string;
+} {
+	const mask = `d mmm${
+		new Date(fullDate).getFullYear() === new Date().getFullYear() ? '' : ', yyyy'
+	}#HH:MM:ss`;
+	const formattedDate = dateformat(fullDate, mask);
+	const [date, time] = formattedDate.split('#');
+	return { date, time };
+}
diff --git a/packages/editor-ui/src/utils/formatters/listFormatter.ts b/packages/editor-ui/src/utils/formatters/listFormatter.ts
new file mode 100644
index 0000000000000..bc6619fe46ee0
--- /dev/null
+++ b/packages/editor-ui/src/utils/formatters/listFormatter.ts
@@ -0,0 +1,33 @@
+import type { I18nClass } from '@/plugins/i18n';
+
+/**
+ * Formats a list of items into a string. Each item is formatted using
+ * the given function and the are separated by a comma except for the last
+ * item which is separated by "and".
+ *
+ * @example
+ * formatList(['a', 'b', 'c'], {
+ *   formatFn: (x) => `"${x}"`
+ *   i18n
+ * });
+ * // => '"a", "b" and "c"'
+ */
+export const formatList = <T>(
+	list: T[],
+	opts: {
+		formatFn: (item: T) => string;
+		i18n: I18nClass;
+	},
+) => {
+	const { i18n, formatFn } = opts;
+	if (list.length === 0) {
+		return '';
+	}
+	if (list.length === 1) {
+		return formatFn(list[0]);
+	}
+
+	const allButLast = list.slice(0, -1);
+	const last = list[list.length - 1];
+	return `${allButLast.map(formatFn).join(', ')} ${i18n.baseText('generic.and')} ${formatFn(last)}`;
+};
diff --git a/packages/editor-ui/src/utils/htmlUtils.ts b/packages/editor-ui/src/utils/htmlUtils.ts
index 45ea9fcc1d780..f8b8f40f90891 100644
--- a/packages/editor-ui/src/utils/htmlUtils.ts
+++ b/packages/editor-ui/src/utils/htmlUtils.ts
@@ -1,13 +1,11 @@
 import xss, { friendlyAttrValue } from 'xss';
+import { ALLOWED_HTML_ATTRIBUTES, ALLOWED_HTML_TAGS } from '@/constants';
 
 /*
 	Constants and utility functions that help in HTML, CSS and DOM manipulation
 */
 
 export function sanitizeHtml(dirtyHtml: string) {
-	const allowedAttributes = ['href', 'name', 'target', 'title', 'class', 'id'];
-	const allowedTags = ['p', 'strong', 'b', 'code', 'a', 'br', 'i', 'em', 'small'];
-
 	const sanitizedHtml = xss(dirtyHtml, {
 		onTagAttr: (tag, name, value) => {
 			if (tag === 'img' && name === 'src') {
@@ -19,8 +17,7 @@ export function sanitizeHtml(dirtyHtml: string) {
 				}
 			}
 
-			// Allow `allowedAttributes` and all `data-*` attributes
-			if (allowedAttributes.includes(name) || name.startsWith('data-')) {
+			if (ALLOWED_HTML_ATTRIBUTES.includes(name) || name.startsWith('data-')) {
 				return `${name}="${friendlyAttrValue(value)}"`;
 			}
 
@@ -28,7 +25,7 @@ export function sanitizeHtml(dirtyHtml: string) {
 			// Return nothing, means keep the default handling measure
 		},
 		onTag: (tag) => {
-			if (!allowedTags.includes(tag)) return '';
+			if (!ALLOWED_HTML_TAGS.includes(tag)) return '';
 			return;
 		},
 	});
@@ -36,11 +33,6 @@ export function sanitizeHtml(dirtyHtml: string) {
 	return sanitizedHtml;
 }
 
-export function getStyleTokenValue(name: string): string {
-	const style = getComputedStyle(document.body);
-	return style.getPropertyValue(name);
-}
-
 export function setPageTitle(title: string) {
 	window.document.title = title;
 }
@@ -63,3 +55,11 @@ export function isChildOf(parent: Element, child: Element): boolean {
 export const capitalizeFirstLetter = (text: string): string => {
 	return text.charAt(0).toUpperCase() + text.slice(1);
 };
+
+export const getBannerRowHeight = async (): Promise<number> => {
+	return await new Promise((resolve) => {
+		setTimeout(() => {
+			resolve(document.getElementById('banners')?.clientHeight ?? 0);
+		}, 0);
+	});
+};
diff --git a/packages/editor-ui/src/utils/index.ts b/packages/editor-ui/src/utils/index.ts
deleted file mode 100644
index f5b1bdb5c1ad6..0000000000000
--- a/packages/editor-ui/src/utils/index.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-export * from './apiUtils';
-export * from './canvasUtils';
-export * from './externalHooks';
-export * from './htmlUtils';
-export * from './nodeTypesUtils';
-export * from './sortUtils';
-export * from './pairedItemUtils';
-export * from './typeGuards';
-export * from './typesUtils';
-export * from './userUtils';
diff --git a/packages/editor-ui/src/utils/mappingUtils.ts b/packages/editor-ui/src/utils/mappingUtils.ts
index 47adeffdec228..b743f2265d474 100644
--- a/packages/editor-ui/src/utils/mappingUtils.ts
+++ b/packages/editor-ui/src/utils/mappingUtils.ts
@@ -1,23 +1,30 @@
 import type { INodeProperties, NodeParameterValueType } from 'n8n-workflow';
 import { isResourceLocatorValue } from 'n8n-workflow';
 
+const validJsIdNameRegex = /^[a-zA-Z_$][a-zA-Z0-9_$]*$/;
+
+function isValidJsIdentifierName(name: string | number): boolean {
+	return validJsIdNameRegex.test(name.toString());
+}
+
 export function generatePath(root: string, path: Array<string | number>): string {
 	return path.reduce((accu: string, part: string | number) => {
 		if (typeof part === 'number') {
 			return `${accu}[${part}]`;
 		}
 
-		const special = ['-', ' ', '.', "'", '"', '`', '[', ']', '{', '}', '(', ')', ':', ',', '?'];
-		const hasSpecial = !!special.find((s) => part.includes(s));
-		if (hasSpecial) {
-			const escaped = part.replaceAll("'", "\\'");
-			return `${accu}['${escaped}']`;
+		if (!isValidJsIdentifierName(part)) {
+			return `${accu}['${escapeMappingString(part)}']`;
 		}
 
 		return `${accu}.${part}`;
 	}, root);
 }
 
+export function escapeMappingString(str: string): string {
+	return str.replace(/\'/g, "\\'");
+}
+
 export function getMappedExpression({
 	nodeName,
 	distanceFromActive,
@@ -27,7 +34,10 @@ export function getMappedExpression({
 	distanceFromActive: number;
 	path: Array<string | number> | string;
 }) {
-	const root = distanceFromActive === 1 ? '$json' : generatePath('$node', [nodeName, 'json']);
+	const root =
+		distanceFromActive === 1
+			? '$json'
+			: generatePath(`$('${escapeMappingString(nodeName)}')`, ['item', 'json']);
 
 	if (typeof path === 'string') {
 		return `{{ ${root}${path} }}`;
diff --git a/packages/editor-ui/src/utils/nodeTypes/nodeTypeTransforms.ts b/packages/editor-ui/src/utils/nodeTypes/nodeTypeTransforms.ts
new file mode 100644
index 0000000000000..c3a6dbbe4a1c5
--- /dev/null
+++ b/packages/editor-ui/src/utils/nodeTypes/nodeTypeTransforms.ts
@@ -0,0 +1,60 @@
+import { type INodeTypeDescription } from 'n8n-workflow';
+import type { NodeTypesByTypeNameAndVersion } from '@/Interface';
+import { DEFAULT_NODETYPE_VERSION } from '@/constants';
+import type { NodeTypesStore } from '@/stores/nodeTypes.store';
+
+export type NodeTypeProvider = Pick<NodeTypesStore, 'getNodeType'>;
+
+export function getNodeVersions(nodeType: INodeTypeDescription) {
+	return Array.isArray(nodeType.version) ? nodeType.version : [nodeType.version];
+}
+
+/**
+ * Groups given node types by their name and version
+ *
+ * @example
+ * const nodeTypes = [
+ * 	{ name: 'twitter', version: '1', ... },
+ * 	{ name: 'twitter', version: '2', ... },
+ * ]
+ *
+ * const groupedNodeTypes = groupNodeTypesByNameAndType(nodeTypes);
+ * // {
+ * // 	twitter: {
+ * // 		1: { name: 'twitter', version: '1', ... },
+ * // 		2: { name: 'twitter', version: '2', ... },
+ * // 	}
+ * // }
+ */
+export function groupNodeTypesByNameAndType(
+	nodeTypes: INodeTypeDescription[],
+): NodeTypesByTypeNameAndVersion {
+	const groupedNodeTypes = nodeTypes.reduce<NodeTypesByTypeNameAndVersion>((groups, nodeType) => {
+		const newNodeVersions = getNodeVersions(nodeType);
+
+		if (newNodeVersions.length === 0) {
+			const singleVersion = { [DEFAULT_NODETYPE_VERSION]: nodeType };
+
+			groups[nodeType.name] = singleVersion;
+			return groups;
+		}
+
+		for (const version of newNodeVersions) {
+			// Node exists with the same name
+			if (groups[nodeType.name]) {
+				groups[nodeType.name][version] = Object.assign(
+					groups[nodeType.name][version] ?? {},
+					nodeType,
+				);
+			} else {
+				groups[nodeType.name] = Object.assign(groups[nodeType.name] ?? {}, {
+					[version]: nodeType,
+				});
+			}
+		}
+
+		return groups;
+	}, {});
+
+	return groupedNodeTypes;
+}
diff --git a/packages/editor-ui/src/utils/nodeTypesUtils.ts b/packages/editor-ui/src/utils/nodeTypesUtils.ts
index 0068601616a55..bad9b9c371699 100644
--- a/packages/editor-ui/src/utils/nodeTypesUtils.ts
+++ b/packages/editor-ui/src/utils/nodeTypesUtils.ts
@@ -1,44 +1,33 @@
-import { MAIN_AUTH_FIELD_NAME, NODE_RESOURCE_FIELD_NAME } from './../constants';
-import { useWorkflowsStore } from '@/stores/workflows';
-import { useNodeTypesStore } from './../stores/nodeTypes';
-import type { INodeCredentialDescription } from './../../../workflow/src/Interfaces';
+import type {
+	INodeCredentialDescription,
+	IDataObject,
+	INodeExecutionData,
+	INodeProperties,
+	INodeTypeDescription,
+	NodeParameterValueType,
+	INodePropertyOptions,
+	INodePropertyCollection,
+	ResourceMapperField,
+} from 'n8n-workflow';
 import {
+	MAIN_AUTH_FIELD_NAME,
 	CORE_NODES_CATEGORY,
-	CUSTOM_NODES_CATEGORY,
-	SUBCATEGORY_DESCRIPTIONS,
-	UNCATEGORIZED_CATEGORY,
-	UNCATEGORIZED_SUBCATEGORY,
-	PERSONALIZED_CATEGORY,
 	NON_ACTIVATABLE_TRIGGER_NODE_TYPES,
 	TEMPLATES_NODES_FILTER,
-	REGULAR_NODE_FILTER,
-	TRIGGER_NODE_FILTER,
-	ALL_NODE_FILTER,
 	MAPPING_PARAMS,
 } from '@/constants';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import type {
-	INodeCreateElement,
-	ICategoriesWithNodes,
 	INodeUi,
 	ITemplatesNode,
-	INodeItemProps,
 	NodeAuthenticationOption,
 	INodeUpdatePropertiesInformation,
 } from '@/Interface';
-import type {
-	IDataObject,
-	INodeExecutionData,
-	INodeProperties,
-	INodeTypeDescription,
-	INodeActionTypeDescription,
-	NodeParameterValueType,
-	INodePropertyOptions,
-	INodePropertyCollection,
-} from 'n8n-workflow';
-import { isResourceLocatorValue, isJsonKeyObject } from '@/utils';
-import { useCredentialsStore } from '@/stores/credentials';
+import { isResourceLocatorValue } from '@/utils/typeGuards';
+import { isJsonKeyObject } from '@/utils/typesUtils';
+import { useCredentialsStore } from '@/stores/credentials.store';
 import { i18n as locale } from '@/plugins/i18n';
-import { useSettingsStore } from '@/stores/settings';
 
 /*
 	Constants and utility functions mainly used to get information about
@@ -47,159 +36,8 @@ import { useSettingsStore } from '@/stores/settings';
 
 const CRED_KEYWORDS_TO_FILTER = ['API', 'OAuth1', 'OAuth2'];
 const NODE_KEYWORDS_TO_FILTER = ['Trigger'];
-const COMMUNITY_PACKAGE_NAME_REGEX = /(@\w+\/)?n8n-nodes-(?!base\b)\b\w+/g;
-
-const addNodeToCategory = (
-	accu: ICategoriesWithNodes,
-	nodeType: INodeTypeDescription | INodeActionTypeDescription,
-	category: string,
-	subcategory: string,
-) => {
-	if (!accu[category]) {
-		accu[category] = {};
-	}
-	if (!accu[category][subcategory]) {
-		accu[category][subcategory] = {
-			triggerCount: 0,
-			regularCount: 0,
-			nodes: [],
-		};
-	}
-	const isTrigger = nodeType.group.includes('trigger');
-	if (isTrigger) {
-		accu[category][subcategory].triggerCount++;
-	}
-	if (!isTrigger) {
-		accu[category][subcategory].regularCount++;
-	}
-	accu[category][subcategory].nodes.push({
-		type: nodeType.actionKey ? 'action' : 'node',
-		key: `${nodeType.name}`,
-		category,
-		properties: {
-			nodeType,
-			subcategory,
-		},
-		includedByTrigger: isTrigger,
-		includedByRegular: !isTrigger,
-	});
-};
-
-export const getCategoriesWithNodes = (
-	nodeTypes: INodeTypeDescription[],
-	uncategorizedSubcategory = UNCATEGORIZED_SUBCATEGORY,
-): ICategoriesWithNodes => {
-	const sorted = [...nodeTypes].sort((a: INodeTypeDescription, b: INodeTypeDescription) =>
-		a.displayName > b.displayName ? 1 : -1,
-	);
-	const result = sorted.reduce((accu: ICategoriesWithNodes, nodeType: INodeTypeDescription) => {
-		if (!nodeType.codex || !nodeType.codex.categories) {
-			addNodeToCategory(accu, nodeType, UNCATEGORIZED_CATEGORY, uncategorizedSubcategory);
-			return accu;
-		}
-
-		nodeType.codex.categories.forEach((_category: string) => {
-			const category = _category.trim();
-			const subcategories = nodeType?.codex?.subcategories?.[category] ?? null;
-
-			if (subcategories === null || subcategories.length === 0) {
-				addNodeToCategory(accu, nodeType, category, uncategorizedSubcategory);
-				return;
-			}
-
-			subcategories.forEach((subcategory) => {
-				addNodeToCategory(accu, nodeType, category, subcategory);
-			});
-		});
-		return accu;
-	}, {});
-	return result;
-};
-
-const getCategories = (categoriesWithNodes: ICategoriesWithNodes): string[] => {
-	const excludeFromSort = [
-		CORE_NODES_CATEGORY,
-		CUSTOM_NODES_CATEGORY,
-		UNCATEGORIZED_CATEGORY,
-		PERSONALIZED_CATEGORY,
-	];
-	const categories = Object.keys(categoriesWithNodes);
-	const sorted = categories.filter((category: string) => !excludeFromSort.includes(category));
-	sorted.sort();
-
-	return [
-		CORE_NODES_CATEGORY,
-		CUSTOM_NODES_CATEGORY,
-		PERSONALIZED_CATEGORY,
-		...sorted,
-		UNCATEGORIZED_CATEGORY,
-	];
-};
-
-export const getCategorizedList = (
-	categoriesWithNodes: ICategoriesWithNodes,
-	categoryIsExpanded = false,
-): INodeCreateElement[] => {
-	const categories = getCategories(categoriesWithNodes);
-
-	const result = categories.reduce((accu: INodeCreateElement[], category: string) => {
-		if (!categoriesWithNodes[category]) {
-			return accu;
-		}
-
-		const categoryEl: INodeCreateElement = {
-			type: 'category',
-			key: category,
-			properties: {
-				category,
-				name: category,
-				expanded: categoryIsExpanded,
-			},
-		};
-
-		const subcategories = Object.keys(categoriesWithNodes[category]);
-		if (subcategories.length === 1) {
-			const subcategory = categoriesWithNodes[category][subcategories[0]];
-			if (subcategory.triggerCount > 0) {
-				categoryEl.includedByTrigger = subcategory.triggerCount > 0;
-			}
-			if (subcategory.regularCount > 0) {
-				categoryEl.includedByRegular = subcategory.regularCount > 0;
-			}
-			return [...accu, categoryEl, ...subcategory.nodes];
-		}
-
-		subcategories.sort();
-		const subcategorized = subcategories.reduce(
-			(accu: INodeCreateElement[], subcategory: string) => {
-				const subcategoryEl: INodeCreateElement = {
-					type: 'subcategory',
-					key: `${category}_${subcategory}`,
-					properties: {
-						subcategory,
-						description: SUBCATEGORY_DESCRIPTIONS[category][subcategory],
-					},
-					includedByTrigger: categoriesWithNodes[category][subcategory].triggerCount > 0,
-					includedByRegular: categoriesWithNodes[category][subcategory].regularCount > 0,
-				};
-
-				if (subcategoryEl.includedByTrigger) {
-					categoryEl.includedByTrigger = true;
-				}
-				if (subcategoryEl.includedByRegular) {
-					categoryEl.includedByRegular = true;
-				}
-
-				accu.push(subcategoryEl);
-				return accu;
-			},
-			[],
-		);
-
-		return [...accu, categoryEl, ...subcategorized];
-	}, []);
-	return result;
-};
+const COMMUNITY_PACKAGE_NAME_REGEX = /^(?!@n8n\/)(@\w+\/)?n8n-nodes-(?!base\b)\b\w+/g;
+const RESOURCE_MAPPER_FIELD_NAME_REGEX = /value\[\"(.+)\"\]/;
 
 export function getAppNameFromCredType(name: string) {
 	return name
@@ -272,35 +110,6 @@ export const executionDataToJson = (inputData: INodeExecutionData[]): IDataObjec
 		[],
 	);
 
-export const matchesSelectType = (el: INodeCreateElement, selectedView: string) => {
-	if (selectedView === REGULAR_NODE_FILTER && el.includedByRegular) {
-		return true;
-	}
-	if (selectedView === TRIGGER_NODE_FILTER && el.includedByTrigger) {
-		return true;
-	}
-
-	return selectedView === ALL_NODE_FILTER;
-};
-
-const matchesAlias = (nodeType: INodeTypeDescription, filter: string): boolean => {
-	if (!nodeType.codex || !nodeType.codex.alias) {
-		return false;
-	}
-
-	return nodeType.codex.alias.reduce((accu: boolean, alias: string) => {
-		return accu || alias.toLowerCase().indexOf(filter) > -1;
-	}, false);
-};
-
-export const matchesNodeType = (el: INodeCreateElement, filter: string) => {
-	const nodeType = (el.properties as INodeItemProps).nodeType;
-
-	return (
-		nodeType.displayName.toLowerCase().indexOf(filter) !== -1 || matchesAlias(nodeType, filter)
-	);
-};
-
 export const hasOnlyListMode = (parameter: INodeProperties): boolean => {
 	return (
 		parameter.modes !== undefined &&
@@ -315,7 +124,7 @@ export const isRequiredCredential = (
 	nodeType: INodeTypeDescription | null,
 	credential: INodeCredentialDescription,
 ): boolean => {
-	if (!credential.displayOptions || !credential.displayOptions.show) {
+	if (!credential.displayOptions?.show) {
 		return true;
 	}
 	const mainAuthField = getMainAuthField(nodeType);
@@ -356,7 +165,7 @@ const findAlternativeAuthField = (
 ): INodeProperties | null => {
 	const dependentAuthFieldValues: { [fieldName: string]: string[] } = {};
 	nodeType.credentials?.forEach((cred) => {
-		if (cred.displayOptions && cred.displayOptions.show) {
+		if (cred.displayOptions?.show) {
 			for (const fieldName in cred.displayOptions.show) {
 				dependentAuthFieldValues[fieldName] = (dependentAuthFieldValues[fieldName] || []).concat(
 					(cred.displayOptions.show[fieldName] || []).map((val) => (val ? val.toString() : '')),
@@ -404,7 +213,7 @@ export const getNodeAuthOptions = (
 					const cred = getNodeCredentialForSelectedAuthType(nodeType, option.value);
 					if (cred) {
 						hasOverrides =
-							useCredentialsStore().getCredentialTypeByName(cred.name).__overwrittenProperties !==
+							useCredentialsStore().getCredentialTypeByName(cred.name)?.__overwrittenProperties !==
 							undefined;
 					}
 					return {
@@ -484,11 +293,7 @@ export const isAuthRelatedParameter = (
 ): boolean => {
 	let isRelated = false;
 	authFields.forEach((prop) => {
-		if (
-			prop.displayOptions &&
-			prop.displayOptions.show &&
-			parameter.name in prop.displayOptions.show
-		) {
+		if (prop.displayOptions?.show && parameter.name in prop.displayOptions.show) {
 			isRelated = true;
 			return;
 		}
@@ -501,9 +306,9 @@ export const getNodeAuthFields = (
 	nodeVersion?: number,
 ): INodeProperties[] => {
 	const authFields: INodeProperties[] = [];
-	if (nodeType && nodeType.credentials && nodeType.credentials.length > 0) {
+	if (nodeType?.credentials && nodeType.credentials.length > 0) {
 		nodeType.credentials.forEach((cred) => {
-			if (cred.displayOptions && cred.displayOptions.show) {
+			if (cred.displayOptions?.show) {
 				Object.keys(cred.displayOptions.show).forEach((option) => {
 					const nodeFieldsForName = nodeType.properties.filter((prop) => prop.name === option);
 					if (nodeFieldsForName) {
@@ -538,12 +343,7 @@ export const getCredentialsRelatedFields = (
 	credentialType: INodeCredentialDescription | null,
 ): INodeProperties[] => {
 	let fields: INodeProperties[] = [];
-	if (
-		nodeType &&
-		credentialType &&
-		credentialType.displayOptions &&
-		credentialType.displayOptions.show
-	) {
+	if (nodeType && credentialType?.displayOptions?.show) {
 		Object.keys(credentialType.displayOptions.show).forEach((option) => {
 			fields = fields.concat(nodeType.properties.filter((prop) => prop.name === option));
 		});
@@ -577,7 +377,7 @@ export const isNodeParameterRequired = (
 	nodeType: INodeTypeDescription,
 	parameter: INodeProperties,
 ): boolean => {
-	if (!parameter.displayOptions || !parameter.displayOptions.show) {
+	if (!parameter.displayOptions?.show) {
 		return true;
 	}
 	// If parameter itself contains 'none'?
@@ -594,3 +394,35 @@ export const isNodeParameterRequired = (
 	});
 	return true;
 };
+
+export const parseResourceMapperFieldName = (fullName: string) => {
+	const match = fullName.match(RESOURCE_MAPPER_FIELD_NAME_REGEX);
+	const fieldName = match ? match.pop() : fullName;
+
+	return fieldName;
+};
+
+export const fieldCannotBeDeleted = (
+	field: INodeProperties | ResourceMapperField,
+	showMatchingColumnsSelector: boolean,
+	resourceMapperMode = '',
+	matchingFields: string[] = [],
+): boolean => {
+	const fieldIdentifier = 'id' in field ? field.id : field.name;
+	return (
+		(resourceMapperMode === 'add' && field.required === true) ||
+		isMatchingField(fieldIdentifier, matchingFields, showMatchingColumnsSelector)
+	);
+};
+
+export const isMatchingField = (
+	field: string,
+	matchingFields: string[],
+	showMatchingColumnsSelector: boolean,
+): boolean => {
+	const fieldName = parseResourceMapperFieldName(field);
+	if (fieldName) {
+		return showMatchingColumnsSelector && (matchingFields || []).includes(fieldName);
+	}
+	return false;
+};
diff --git a/packages/editor-ui/src/utils/nodeViewUtils.ts b/packages/editor-ui/src/utils/nodeViewUtils.ts
index 5398c8aade97e..bafa67891200b 100644
--- a/packages/editor-ui/src/utils/nodeViewUtils.ts
+++ b/packages/editor-ui/src/utils/nodeViewUtils.ts
@@ -1,21 +1,21 @@
-import { getStyleTokenValue } from '@/utils/htmlUtils';
-import { isNumber } from '@/utils';
-import { NODE_OUTPUT_DEFAULT_KEY, STICKY_NODE_TYPE, QUICKSTART_NOTE_NAME } from '@/constants';
+import { isNumber } from '@/utils/typeGuards';
+import { NODE_OUTPUT_DEFAULT_KEY, STICKY_NODE_TYPE } from '@/constants';
 import type { EndpointStyle, IBounds, INodeUi, XYPosition } from '@/Interface';
 import type { ArrayAnchorSpec, ConnectorSpec, OverlaySpec, PaintStyle } from '@jsplumb/common';
 import type { Endpoint, Connection } from '@jsplumb/core';
-import { ConnectionEstablishedParams } from '@jsplumb/core';
 import { N8nConnector } from '@/plugins/connectors/N8nCustomConnector';
-import { closestNumberDivisibleBy } from '@/utils';
 import type {
+	ConnectionTypes,
 	IConnection,
-	INode,
 	ITaskData,
 	INodeExecutionData,
 	NodeInputConnections,
 	INodeTypeDescription,
 } from 'n8n-workflow';
+import { NodeConnectionType } from 'n8n-workflow';
+import type { BrowserJsPlumbInstance } from '@jsplumb/browser-ui';
 import { EVENT_CONNECTION_MOUSEOUT, EVENT_CONNECTION_MOUSEOVER } from '@jsplumb/browser-ui';
+import { useUIStore } from '@/stores/ui.store';
 
 /*
 	Canvas constants and functions.
@@ -74,12 +74,11 @@ export const CONNECTOR_FLOWCHART_TYPE: ConnectorSpec = {
 		loopbackMinimum: LOOPBACK_MINIMUM, // minimum length before flowchart loops around
 		getEndpointOffset(endpoint: Endpoint) {
 			const indexOffset = 10; // stub offset between different endpoints of same node
-			const index = endpoint && endpoint.__meta ? endpoint.__meta.index : 0;
-			const totalEndpoints = endpoint && endpoint.__meta ? endpoint.__meta.totalEndpoints : 0;
+			const index = endpoint?.__meta ? endpoint.__meta.index : 0;
+			const totalEndpoints = endpoint?.__meta ? endpoint.__meta.totalEndpoints : 0;
 
 			const outputOverlay = getOverlay(endpoint, OVERLAY_OUTPUT_NAME_LABEL);
-			const labelOffset =
-				outputOverlay && outputOverlay.label && outputOverlay.label.length > 1 ? 10 : 0;
+			const labelOffset = outputOverlay?.label && outputOverlay.label.length > 1 ? 10 : 0;
 			const outputsOffset = totalEndpoints > 3 ? 24 : 0; // avoid intersecting plus
 
 			return index * indexOffset + labelOffset + outputsOffset;
@@ -88,7 +87,7 @@ export const CONNECTOR_FLOWCHART_TYPE: ConnectorSpec = {
 };
 
 export const CONNECTOR_PAINT_STYLE_DEFAULT: PaintStyle = {
-	stroke: getStyleTokenValue('--color-foreground-dark'),
+	stroke: 'var(--color-foreground-dark)',
 	strokeWidth: 2,
 	outlineWidth: 12,
 	outlineStroke: 'transparent',
@@ -96,12 +95,70 @@ export const CONNECTOR_PAINT_STYLE_DEFAULT: PaintStyle = {
 
 export const CONNECTOR_PAINT_STYLE_PULL: PaintStyle = {
 	...CONNECTOR_PAINT_STYLE_DEFAULT,
-	stroke: getStyleTokenValue('--color-foreground-xdark'),
+	stroke: 'var(--color-foreground-xdark)',
 };
 
 export const CONNECTOR_PAINT_STYLE_PRIMARY = {
 	...CONNECTOR_PAINT_STYLE_DEFAULT,
-	stroke: getStyleTokenValue('--color-primary'),
+	stroke: 'var(--color-primary)',
+};
+
+export const CONNECTOR_PAINT_STYLE_DATA: PaintStyle = {
+	...CONNECTOR_PAINT_STYLE_DEFAULT,
+	...{
+		dashstyle: '5 3',
+	},
+	stroke: 'var(--color-foreground-dark)',
+};
+
+export const getConnectorColor = (type: ConnectionTypes, category?: string): string => {
+	if (category === 'error') {
+		return '--color-node-error-output-text-color';
+	}
+
+	if (type === NodeConnectionType.Main) {
+		return '--node-type-main-color';
+	}
+
+	return '--node-type-supplemental-connector-color';
+};
+
+export const getConnectorPaintStylePull = (connection: Connection): PaintStyle => {
+	const connectorColor = getConnectorColor(
+		connection.parameters.type as ConnectionTypes,
+		connection.parameters.category,
+	);
+	const additionalStyles: PaintStyle = {};
+	if (connection.parameters.type !== NodeConnectionType.Main) {
+		additionalStyles.dashstyle = '5 3';
+	}
+	return {
+		...CONNECTOR_PAINT_STYLE_PULL,
+		...(connectorColor ? { stroke: `var(${connectorColor})` } : {}),
+		...additionalStyles,
+	};
+};
+
+export const getConnectorPaintStyleDefault = (connection: Connection): PaintStyle => {
+	const connectorColor = getConnectorColor(
+		connection.parameters.type as ConnectionTypes,
+		connection.parameters.category,
+	);
+	return {
+		...CONNECTOR_PAINT_STYLE_DEFAULT,
+		...(connectorColor ? { stroke: `var(${connectorColor})` } : {}),
+	};
+};
+
+export const getConnectorPaintStyleData = (
+	connection: Connection,
+	category?: string,
+): PaintStyle => {
+	const connectorColor = getConnectorColor(connection.parameters.type as ConnectionTypes, category);
+	return {
+		...CONNECTOR_PAINT_STYLE_DATA,
+		...(connectorColor ? { stroke: `var(${connectorColor})` } : {}),
+	};
 };
 
 export const CONNECTOR_ARROW_OVERLAYS: OverlaySpec[] = [
@@ -129,69 +186,107 @@ export const CONNECTOR_ARROW_OVERLAYS: OverlaySpec[] = [
 	},
 ];
 
-export const ANCHOR_POSITIONS: {
-	[key: string]: {
-		[key: number]: ArrayAnchorSpec[];
-	};
-} = {
-	input: {
-		1: [[0.01, 0.5, -1, 0]],
-		2: [
-			[0.01, 0.3, -1, 0],
-			[0.01, 0.7, -1, 0],
-		],
-		3: [
-			[0.01, 0.25, -1, 0],
-			[0.01, 0.5, -1, 0],
-			[0.01, 0.75, -1, 0],
-		],
-		4: [
-			[0.01, 0.2, -1, 0],
-			[0.01, 0.4, -1, 0],
-			[0.01, 0.6, -1, 0],
-			[0.01, 0.8, -1, 0],
-		],
-	},
-	output: {
-		1: [[0.99, 0.5, 1, 0]],
-		2: [
-			[0.99, 0.3, 1, 0],
-			[0.99, 0.7, 1, 0],
-		],
-		3: [
-			[0.99, 0.25, 1, 0],
-			[0.99, 0.5, 1, 0],
-			[0.99, 0.75, 1, 0],
-		],
-		4: [
-			[0.99, 0.2, 1, 0],
-			[0.99, 0.4, 1, 0],
-			[0.99, 0.6, 1, 0],
-			[0.99, 0.8, 1, 0],
-		],
-	},
+export const getAnchorPosition = (
+	connectionType: ConnectionTypes,
+	type: 'input' | 'output',
+	amount: number,
+	spacerIndexes: number[] = [],
+): ArrayAnchorSpec[] => {
+	if (connectionType === NodeConnectionType.Main) {
+		const anchors: ArrayAnchorSpec[] = [];
+		const x = type === 'input' ? 0.01 : 0.99;
+		const ox = type === 'input' ? -1 : 1;
+		const oy = 0;
+		const stepSize = 1 / (amount + 1); // +1 to not touch the node boundaries
+
+		for (let i = 1; i <= amount; i++) {
+			const y = stepSize * i; // Multiply by index to set position
+			anchors.push([x, y, ox, oy]);
+		}
+
+		return anchors;
+	}
+
+	const y = type === 'input' ? 0.99 : 0.01;
+	const oy = type === 'input' ? 1 : -1;
+	const ox = 0;
+
+	const spacedAmount = amount + spacerIndexes.length;
+	const returnPositions: ArrayAnchorSpec[] = [];
+	for (let i = 0; i < spacedAmount; i++) {
+		const stepSize = 1 / (spacedAmount + 1);
+		let x = stepSize * i;
+		x += stepSize;
+
+		if (spacerIndexes.includes(i)) {
+			continue;
+		}
+
+		returnPositions.push([x, y, ox, oy]);
+	}
+
+	return returnPositions;
+};
+
+export const getScope = (type?: string) => {
+	if (!type || type === NodeConnectionType.Main) {
+		return undefined;
+	}
+	return type;
+};
+
+export const getEndpointScope = (endpointType: ConnectionTypes): string | undefined => {
+	if (Object.values(NodeConnectionType).includes(endpointType)) {
+		return getScope(endpointType);
+	}
+
+	return undefined;
 };
 
 export const getInputEndpointStyle = (
 	nodeTypeData: INodeTypeDescription,
 	color: string,
-): EndpointStyle => ({
-	width: 8,
-	height: nodeTypeData && nodeTypeData.outputs.length > 2 ? 18 : 20,
-	fill: getStyleTokenValue(color),
-	stroke: getStyleTokenValue(color),
-	lineWidth: 0,
-});
+	connectionType: ConnectionTypes = NodeConnectionType.Main,
+): EndpointStyle => {
+	let width = 8;
+	let height = nodeTypeData && nodeTypeData.outputs.length > 2 ? 18 : 20;
+
+	if (connectionType !== NodeConnectionType.Main) {
+		const temp = width;
+		width = height;
+		height = temp;
+	}
+
+	return {
+		width,
+		height,
+		fill: `var(${color})`,
+		stroke: `var(${color})`,
+		lineWidth: 0,
+	};
+};
 
-export const getInputNameOverlay = (labelText: string): OverlaySpec => ({
+export const getInputNameOverlay = (
+	labelText: string,
+	inputName: string,
+	required?: boolean,
+): OverlaySpec => ({
 	type: 'Custom',
 	options: {
 		id: OVERLAY_INPUT_NAME_LABEL,
 		visible: true,
+		location: [-1, -1],
 		create: (component: Endpoint) => {
 			const label = document.createElement('div');
 			label.innerHTML = labelText;
+			if (required) {
+				label.innerHTML += ' <strong style="color: var(--color-primary)">*</strong>';
+			}
 			label.classList.add('node-input-endpoint-label');
+			label.classList.add(`node-connection-type-${inputName ?? 'main'}`);
+			if (inputName !== NodeConnectionType.Main) {
+				label.classList.add('node-input-endpoint-label--data');
+			}
 			return label;
 		},
 	},
@@ -202,19 +297,34 @@ export const getOutputEndpointStyle = (
 	color: string,
 ): PaintStyle => ({
 	strokeWidth: nodeTypeData && nodeTypeData.outputs.length > 2 ? 7 : 9,
-	fill: getStyleTokenValue(color),
+	fill: `var(${color})`,
 	outlineStroke: 'none',
 });
 
-export const getOutputNameOverlay = (labelText: string): OverlaySpec => ({
+export const getOutputNameOverlay = (
+	labelText: string,
+	outputName: ConnectionTypes,
+	category?: string,
+): OverlaySpec => ({
 	type: 'Custom',
 	options: {
 		id: OVERLAY_OUTPUT_NAME_LABEL,
 		visible: true,
-		create: (component: Endpoint) => {
+		create: (ep: Endpoint) => {
 			const label = document.createElement('div');
 			label.innerHTML = labelText;
 			label.classList.add('node-output-endpoint-label');
+
+			if (ep?.__meta?.endpointLabelLength) {
+				label.setAttribute('data-endpoint-label-length', ep?.__meta?.endpointLabelLength);
+			}
+			label.classList.add(`node-connection-type-${getScope(outputName) ?? 'main'}`);
+			if (outputName !== NodeConnectionType.Main) {
+				label.classList.add('node-output-endpoint-label--data');
+			}
+			if (category) {
+				label.classList.add(`node-connection-category-${category}`);
+			}
 			return label;
 		},
 	},
@@ -226,14 +336,14 @@ export const addOverlays = (connection: Connection, overlays: OverlaySpec[]) =>
 	});
 };
 
-export const getLeftmostTopNode = (nodes: INodeUi[]): INodeUi => {
+export const getLeftmostTopNode = <T extends { position: XYPosition }>(nodes: T[]): T => {
 	return nodes.reduce((leftmostTop, node) => {
 		if (node.position[0] > leftmostTop.position[0] || node.position[1] > leftmostTop.position[1]) {
 			return leftmostTop;
 		}
 
 		return node;
-	});
+	}, nodes[0]);
 };
 
 export const getWorkflowCorners = (nodes: INodeUi[]): IBounds => {
@@ -297,7 +407,7 @@ export const hideOverlay = (item: Connection | Endpoint, overlayId: string) => {
 };
 
 export const showOrHideMidpointArrow = (connection: Connection) => {
-	if (!connection || !connection.endpoints || connection.endpoints.length !== 2) {
+	if (!connection?.endpoints || connection.endpoints.length !== 2) {
 		return;
 	}
 	const hasItemsLabel = !!getOverlay(connection, OVERLAY_RUN_ITEMS_ID);
@@ -318,6 +428,7 @@ export const showOrHideMidpointArrow = (connection: Connection) => {
 
 	const arrow = getOverlay(connection, OVERLAY_MIDPOINT_ARROW_ID);
 	const isArrowVisible =
+		connection.parameters.type === NodeConnectionType.Main &&
 		isBackwards &&
 		isTooLong &&
 		!isActionsOverlayHovered &&
@@ -370,7 +481,7 @@ export const showOrHideItemsLabel = (connection: Connection) => {
 	const isHidden = diffX < MIN_X_TO_SHOW_OUTPUT_LABEL && diffY < MIN_Y_TO_SHOW_OUTPUT_LABEL;
 
 	overlay.setVisible(!isHidden);
-	const innerElement = overlay.canvas && overlay.canvas.querySelector('span');
+	const innerElement = overlay.canvas?.querySelector('span');
 	if (innerElement) {
 		if (diffY === 0 || isLoopingBackwards(connection)) {
 			innerElement.classList.add('floating');
@@ -402,6 +513,25 @@ const canUsePosition = (position1: XYPosition, position2: XYPosition) => {
 	return true;
 };
 
+const closestNumberDivisibleBy = (inputNumber: number, divisibleBy: number): number => {
+	const quotient = Math.ceil(inputNumber / divisibleBy);
+
+	// 1st possible closest number
+	const inputNumber1 = divisibleBy * quotient;
+
+	// 2nd possible closest number
+	const inputNumber2 =
+		inputNumber * divisibleBy > 0 ? divisibleBy * (quotient + 1) : divisibleBy * (quotient - 1);
+
+	// if true, then inputNumber1 is the required closest number
+	if (Math.abs(inputNumber - inputNumber1) < Math.abs(inputNumber - inputNumber2)) {
+		return inputNumber1;
+	}
+
+	// else inputNumber2 is the required closest number
+	return inputNumber2;
+};
+
 export const getNewNodePosition = (
 	nodes: INodeUi[],
 	newPosition: XYPosition,
@@ -428,30 +558,20 @@ export const getNewNodePosition = (
 			}
 		}
 
-		if (conflictFound === true) {
+		if (conflictFound) {
 			targetPosition[0] += movePosition[0];
 			targetPosition[1] += movePosition[1];
 		}
-	} while (conflictFound === true);
+	} while (conflictFound);
 
 	return targetPosition;
 };
 
 export const getMousePosition = (e: MouseEvent | TouchEvent): XYPosition => {
 	// @ts-ignore
-	const x =
-		e.pageX !== undefined
-			? e.pageX
-			: e.touches && e.touches[0] && e.touches[0].pageX
-			? e.touches[0].pageX
-			: 0;
+	const x = e.pageX !== undefined ? e.pageX : e.touches?.[0]?.pageX ? e.touches[0].pageX : 0;
 	// @ts-ignore
-	const y =
-		e.pageY !== undefined
-			? e.pageY
-			: e.touches && e.touches[0] && e.touches[0].pageY
-			? e.touches[0].pageY
-			: 0;
+	const y = e.pageY !== undefined ? e.pageY : e.touches?.[0]?.pageY ? e.touches[0].pageY : 0;
 
 	return [x, y];
 };
@@ -483,7 +603,7 @@ export const getBackgroundStyles = (
 	if (executionPreview) {
 		return {
 			'background-image':
-				'linear-gradient(135deg, #f9f9fb 25%, #ffffff 25%, #ffffff 50%, #f9f9fb 50%, #f9f9fb 75%, #ffffff 75%, #ffffff 100%)',
+				'linear-gradient(135deg, var(--color-canvas-read-only-line) 25%, var(--color-canvas-background) 25%, var(--color-canvas-background) 50%, var(--color-canvas-read-only-line) 50%, var(--color-canvas-read-only-line) 75%, var(--color-canvas-background) 75%, var(--color-canvas-background) 100%)',
 			'background-size': `${squareSize}px ${squareSize}px`,
 			'background-position': `left ${offsetPosition[0]}px top ${offsetPosition[1]}px`,
 		};
@@ -494,10 +614,9 @@ export const getBackgroundStyles = (
 		'background-position': `left ${offsetPosition[0]}px top ${offsetPosition[1]}px`,
 	};
 	if (squareSize > 10.5) {
-		const dotColor = getStyleTokenValue('--color-canvas-dot');
 		return {
 			...styles,
-			'background-image': `radial-gradient(circle at ${dotPosition}px ${dotPosition}px, ${dotColor} ${dotSize}px, transparent 0)`,
+			'background-image': `radial-gradient(circle at ${dotPosition}px ${dotPosition}px, var(--color-canvas-dot) ${dotSize}px, transparent 0)`,
 		};
 	}
 
@@ -527,7 +646,11 @@ export const showConnectionActions = (connection: Connection) => {
 	});
 };
 
-export const getOutputSummary = (data: ITaskData[], nodeConnections: NodeInputConnections) => {
+export const getOutputSummary = (
+	data: ITaskData[],
+	nodeConnections: NodeInputConnections,
+	connectionType: ConnectionTypes,
+) => {
 	const outputMap: {
 		[sourceOutputIndex: string]: {
 			[targetNodeName: string]: {
@@ -541,11 +664,11 @@ export const getOutputSummary = (data: ITaskData[], nodeConnections: NodeInputCo
 	} = {};
 
 	data.forEach((run: ITaskData) => {
-		if (!run.data || !run.data.main) {
+		if (!run?.data?.[connectionType]) {
 			return;
 		}
 
-		run.data.main.forEach((output: INodeExecutionData[] | null, i: number) => {
+		run.data[connectionType].forEach((output: INodeExecutionData[] | null, i: number) => {
 			const sourceOutputIndex = i;
 
 			// executionData that was recovered by recoverEvents in the CLI will have an isArtificialRecoveredEventItem property
@@ -614,7 +737,7 @@ export const resetConnection = (connection: Connection) => {
 	connection.removeOverlay(OVERLAY_RUN_ITEMS_ID);
 	connection.removeClass('success');
 	showOrHideMidpointArrow(connection);
-	connection.setPaintStyle(CONNECTOR_PAINT_STYLE_DEFAULT);
+	connection.setPaintStyle(getConnectorPaintStyleDefault(connection));
 };
 
 export const recoveredConnection = (connection: Connection) => {
@@ -633,32 +756,40 @@ export const getRunItemsLabel = (output: { total: number; iterations: number }):
 
 export const addConnectionOutputSuccess = (
 	connection: Connection,
-	output: { total: number; iterations: number },
+	output: { total: number; iterations: number; classNames?: string[] },
 ) => {
-	connection.addClass('success');
+	const classNames: string[] = ['success'];
+
+	if (output.classNames) {
+		classNames.push(...output.classNames);
+	}
+
+	connection.addClass(classNames.join(' '));
 	if (getOverlay(connection, OVERLAY_RUN_ITEMS_ID)) {
 		connection.removeOverlay(OVERLAY_RUN_ITEMS_ID);
 	}
 
-	const overlay = connection.addOverlay({
-		type: 'Custom',
-		options: {
-			id: OVERLAY_RUN_ITEMS_ID,
-			create() {
-				const container = document.createElement('div');
-				const span = document.createElement('span');
-
-				container.classList.add('connection-run-items-label');
-				span.classList.add('floating');
-				span.innerHTML = getRunItemsLabel(output);
-				container.appendChild(span);
-				return container;
+	if (connection.parameters.type === NodeConnectionType.Main) {
+		const overlay = connection.addOverlay({
+			type: 'Custom',
+			options: {
+				id: OVERLAY_RUN_ITEMS_ID,
+				create() {
+					const container = document.createElement('div');
+					const span = document.createElement('span');
+
+					container.classList.add(...['connection-run-items-label', ...classNames]);
+					span.classList.add('floating');
+					span.innerHTML = getRunItemsLabel(output);
+					container.appendChild(span);
+					return container;
+				},
+				location: 0.5,
 			},
-			location: 0.5,
-		},
-	});
+		});
+		overlay.setVisible(true);
+	}
 
-	overlay.setVisible(true);
 	showOrHideItemsLabel(connection);
 	showOrHideMidpointArrow(connection);
 
@@ -667,6 +798,27 @@ export const addConnectionOutputSuccess = (
 	});
 };
 
+export const addClassesToOverlays = ({
+	connection,
+	overlayIds,
+	classNames,
+	includeConnector,
+}: {
+	connection: Connection;
+	overlayIds: string[];
+	classNames: string[];
+	includeConnector?: boolean;
+}) => {
+	overlayIds.forEach((overlayId) => {
+		const overlay = getOverlay(connection, overlayId);
+
+		overlay?.canvas?.classList.add(...classNames);
+		if (includeConnector) {
+			connection.connector.canvas?.classList.add(...classNames);
+		}
+	});
+};
+
 const getContentDimensions = (): { editorWidth: number; editorHeight: number } => {
 	let contentWidth = window.innerWidth;
 	let contentHeight = window.innerHeight;
@@ -690,6 +842,7 @@ export const getZoomToFit = (
 	const { minX, minY, maxX, maxY } = getWorkflowCorners(nodes);
 	const { editorWidth, editorHeight } = getContentDimensions();
 	const footerHeight = addFooterPadding ? 200 : 100;
+	const uiStore = useUIStore();
 
 	const PADDING = NODE_SIZE * 4;
 
@@ -705,7 +858,10 @@ export const getZoomToFit = (
 	xOffset += (editorWidth - (maxX - minX) * zoomLevel) / 2; // add padding to center workflow
 
 	let yOffset = minY * -1 * zoomLevel; // find top right corner
-	yOffset += (editorHeight - (maxY - minY + footerHeight) * zoomLevel) / 2; // add padding to center workflow
+	yOffset +=
+		(editorHeight -
+			(maxY - minY + footerHeight - uiStore.headerHeight + uiStore.bannersHeight) * zoomLevel) /
+		2; // add padding to center workflow
 
 	return {
 		zoomLevel,
@@ -731,7 +887,7 @@ export const showPullConnectionState = (connection: Connection) => {
 	if (connection?.connector) {
 		const connector = connection.connector as N8nConnector;
 		connector.resetTargetEndpoint();
-		connection.setPaintStyle(CONNECTOR_PAINT_STYLE_PULL);
+		connection.setPaintStyle(getConnectorPaintStylePull(connection));
 		showOverlay(connection, OVERLAY_DROP_NODE_ID);
 	}
 };
@@ -740,7 +896,7 @@ export const resetConnectionAfterPull = (connection: Connection) => {
 	if (connection?.connector) {
 		const connector = connection.connector as N8nConnector;
 		connector.resetTargetEndpoint();
-		connection.setPaintStyle(CONNECTOR_PAINT_STYLE_DEFAULT);
+		connection.setPaintStyle(getConnectorPaintStyleDefault(connection));
 	}
 };
 
@@ -751,6 +907,23 @@ export const resetInputLabelPosition = (targetEndpoint: Connection | Endpoint) =
 	}
 };
 
+export const hideOutputNameLabel = (sourceEndpoint: Connection | Endpoint) => {
+	hideOverlay(sourceEndpoint, OVERLAY_OUTPUT_NAME_LABEL);
+};
+
+export const showOutputNameLabel = (
+	sourceEndpoint: Connection | Endpoint,
+	connection: Connection,
+) => {
+	const outputNameOverlay = getOverlay(sourceEndpoint, OVERLAY_OUTPUT_NAME_LABEL);
+	if (outputNameOverlay) {
+		outputNameOverlay.setVisible(true);
+		(connection.endpoints || []).forEach((endpoint) => {
+			connection.instance.repaint(endpoint.element);
+		});
+	}
+};
+
 export const moveBackInputLabelPosition = (targetEndpoint: Endpoint) => {
 	const inputNameOverlay = getOverlay(targetEndpoint, OVERLAY_INPUT_NAME_LABEL);
 	if (inputNameOverlay) {
@@ -784,16 +957,12 @@ export const addConnectionActionsOverlay = (
 			id: OVERLAY_CONNECTION_ACTIONS_ID,
 			create: (component: Connection) => {
 				const div = document.createElement('div');
-				const addButton = document.createElement('button');
 				const deleteButton = document.createElement('button');
 
 				div.classList.add(OVERLAY_CONNECTION_ACTIONS_ID);
 				addConnectionTestData(component.source, component.target, div);
-				addButton.classList.add('add');
-				deleteButton.classList.add('delete');
-				addButton.innerHTML = getIcon('plus');
+
 				deleteButton.innerHTML = getIcon('trash');
-				addButton.addEventListener('click', () => onAdd());
 				deleteButton.addEventListener('click', () => onDelete());
 				// We have to manually trigger connection mouse events because the overlay
 				// is not part of the connection element
@@ -803,7 +972,18 @@ export const addConnectionActionsOverlay = (
 				div.addEventListener('mouseover', () =>
 					connection.instance.fire(EVENT_CONNECTION_MOUSEOVER, component),
 				);
-				div.appendChild(addButton);
+
+				if (connection.parameters.type === NodeConnectionType.Main) {
+					const addButton = document.createElement('button');
+					addButton.classList.add('add');
+					addButton.innerHTML = getIcon('plus');
+					addButton.addEventListener('click', () => onAdd());
+					div.appendChild(addButton);
+					deleteButton.classList.add('delete');
+				} else {
+					deleteButton.classList.add('delete-single');
+				}
+
 				div.appendChild(deleteButton);
 				return div;
 			},
@@ -813,26 +993,154 @@ export const addConnectionActionsOverlay = (
 	overlay.setVisible(false);
 };
 
-export const getOutputEndpointUUID = (nodeId: string, outputIndex: number) => {
-	return `${nodeId}${OUTPUT_UUID_KEY}${outputIndex}`;
+export const getOutputEndpointUUID = (
+	nodeId: string,
+	connectionType: ConnectionTypes,
+	outputIndex: number,
+) => {
+	return `${nodeId}${OUTPUT_UUID_KEY}${getScope(connectionType) || ''}${outputIndex}`;
 };
 
-export const getInputEndpointUUID = (nodeId: string, inputIndex: number) => {
-	return `${nodeId}${INPUT_UUID_KEY}${inputIndex}`;
+export const getInputEndpointUUID = (
+	nodeId: string,
+	connectionType: ConnectionTypes,
+	inputIndex: number,
+) => {
+	return `${nodeId}${INPUT_UUID_KEY}${getScope(connectionType) || ''}${inputIndex}`;
 };
 
-export const getFixedNodesList = (workflowNodes: INode[]) => {
+export const getFixedNodesList = <T extends { position: XYPosition }>(workflowNodes: T[]): T[] => {
 	const nodes = [...workflowNodes];
 
-	const leftmostTop = getLeftmostTopNode(nodes);
+	if (nodes.length) {
+		const leftmostTop = getLeftmostTopNode(nodes);
 
-	const diffX = DEFAULT_START_POSITION_X - leftmostTop.position[0];
-	const diffY = DEFAULT_START_POSITION_Y - leftmostTop.position[1];
+		const diffX = DEFAULT_START_POSITION_X - leftmostTop.position[0];
+		const diffY = DEFAULT_START_POSITION_Y - leftmostTop.position[1];
 
-	nodes.map((node) => {
-		node.position[0] += diffX + NODE_SIZE * 2;
-		node.position[1] += diffY;
-	});
+		nodes.forEach((node) => {
+			node.position[0] += diffX + NODE_SIZE * 2;
+			node.position[1] += diffY;
+		});
+	}
 
 	return nodes;
 };
+
+/**
+ * Calculates the intersecting distances of the mouse event coordinates with the given element's boundaries,
+ * adjusted by the specified offset.
+ *
+ * @param {Element} element - The DOM element to check against.
+ * @param {MouseEvent | TouchEvent} mouseEvent - The mouse or touch event with the coordinates.
+ * @param {number} offset - Offset to adjust the element's boundaries.
+ * @returns { {x: number | null, y: number | null} | null } Object containing intersecting distances along x and y axes or null if no intersection.
+ */
+export function calculateElementIntersection(
+	element: Element,
+	mouseEvent: MouseEvent | TouchEvent,
+	offset: number,
+): { x: number | null; y: number | null } | null {
+	const { top, left, right, bottom } = element.getBoundingClientRect();
+	const [x, y] = getMousePosition(mouseEvent);
+
+	let intersectX: number | null = null;
+	let intersectY: number | null = null;
+
+	if (x >= left - offset && x <= right + offset) {
+		intersectX = Math.min(x - (left - offset), right + offset - x);
+	}
+	if (y >= top - offset && y <= bottom + offset) {
+		intersectY = Math.min(y - (top - offset), bottom + offset - y);
+	}
+
+	if (intersectX === null && intersectY === null) return null;
+
+	return { x: intersectX, y: intersectY };
+}
+
+/**
+ * Checks if the mouse event coordinates intersect with the given element's boundaries,
+ * adjusted by the specified offset.
+ *
+ * @param {Element} element - The DOM element to check against.
+ * @param {MouseEvent | TouchEvent} mouseEvent - The mouse or touch event with the coordinates.
+ * @param {number} offset - Offset to adjust the element's boundaries.
+ * @returns {boolean} True if the mouse coordinates intersect with the element.
+ */
+export function isElementIntersection(
+	element: Element,
+	mouseEvent: MouseEvent | TouchEvent,
+	offset: number,
+): boolean {
+	const intersection = calculateElementIntersection(element, mouseEvent, offset);
+
+	if (intersection === null) {
+		return false;
+	}
+
+	const isWithinVerticalBounds = intersection.y !== null;
+	const isWithinHorizontalBounds = intersection.x !== null;
+
+	return isWithinVerticalBounds && isWithinHorizontalBounds;
+}
+
+export const getJSPlumbEndpoints = (
+	node: INodeUi | null,
+	instance: BrowserJsPlumbInstance,
+): Endpoint[] => {
+	const nodeEl = instance.getManagedElement(node?.id);
+
+	const endpoints = instance?.getEndpoints(nodeEl);
+	return endpoints;
+};
+
+export const getPlusEndpoint = (
+	node: INodeUi | null,
+	outputIndex: number,
+	instance: BrowserJsPlumbInstance,
+): Endpoint | undefined => {
+	const endpoints = getJSPlumbEndpoints(node, instance);
+	return endpoints.find(
+		(endpoint: Endpoint) =>
+			// @ts-ignore
+			endpoint.endpoint.type === 'N8nPlus' && endpoint?.__meta?.index === outputIndex,
+	);
+};
+
+export const getJSPlumbConnection = (
+	sourceNode: INodeUi | null,
+	sourceOutputIndex: number,
+	targetNode: INodeUi | null,
+	targetInputIndex: number,
+	connectionType: ConnectionTypes,
+	sourceNodeType: INodeTypeDescription | null,
+	instance: BrowserJsPlumbInstance,
+): Connection | undefined => {
+	if (!sourceNode || !targetNode) {
+		return;
+	}
+
+	const sourceId = sourceNode.id;
+	const targetId = targetNode.id;
+
+	const sourceEndpoint = getOutputEndpointUUID(sourceId, connectionType, sourceOutputIndex);
+	const targetEndpoint = getInputEndpointUUID(targetId, connectionType, targetInputIndex);
+
+	const sourceNodeOutput = sourceNodeType?.outputs?.[sourceOutputIndex] || NodeConnectionType.Main;
+	const sourceNodeOutputName =
+		typeof sourceNodeOutput === 'string' ? sourceNodeOutput : sourceNodeOutput.name;
+	const scope = getEndpointScope(sourceNodeOutputName);
+
+	// @ts-ignore
+	const connections = instance?.getConnections({
+		scope,
+		source: sourceId,
+		target: targetId,
+	}) as Connection[];
+
+	return connections.find((connection: Connection) => {
+		const uuids = connection.getUuids();
+		return uuids[0] === sourceEndpoint && uuids[1] === targetEndpoint;
+	});
+};
diff --git a/packages/editor-ui/src/utils/nodes/nodeTransforms.ts b/packages/editor-ui/src/utils/nodes/nodeTransforms.ts
new file mode 100644
index 0000000000000..664895ba8c941
--- /dev/null
+++ b/packages/editor-ui/src/utils/nodes/nodeTransforms.ts
@@ -0,0 +1,73 @@
+import type { INodeUi } from '@/Interface';
+import type { NodeTypeProvider } from '@/utils/nodeTypes/nodeTypeTransforms';
+import type { INodeCredentialDescription } from 'n8n-workflow';
+import { NodeHelpers } from 'n8n-workflow';
+
+/**
+ * Returns the credentials that are displayable for the given node.
+ */
+export function getNodeTypeDisplayableCredentials(
+	nodeTypeProvider: NodeTypeProvider,
+	node: Pick<INodeUi, 'parameters' | 'type' | 'typeVersion'>,
+): INodeCredentialDescription[] {
+	const nodeType = nodeTypeProvider.getNodeType(node.type, node.typeVersion);
+	if (!nodeType?.credentials) {
+		return [];
+	}
+
+	const nodeTypeCreds = nodeType.credentials;
+
+	// We must populate the node's parameters with the default values
+	// before we can check which credentials are available, because
+	// credentials can have conditional requirements that depend on
+	// node parameters.
+	const nodeParameters =
+		NodeHelpers.getNodeParameters(nodeType.properties, node.parameters, true, false, node) ??
+		node.parameters;
+
+	const displayableCredentials = nodeTypeCreds.filter((credentialTypeDescription) => {
+		return NodeHelpers.displayParameter(nodeParameters, credentialTypeDescription, node);
+	});
+
+	return displayableCredentials;
+}
+
+/**
+ * Checks if the given node has credentials that can be filled.
+ */
+export function doesNodeHaveCredentialsToFill(
+	nodeTypeProvider: NodeTypeProvider,
+	node: Pick<INodeUi, 'parameters' | 'type' | 'typeVersion'>,
+): boolean {
+	const requiredCredentials = getNodeTypeDisplayableCredentials(nodeTypeProvider, node);
+
+	return requiredCredentials.length > 0;
+}
+
+/**
+ * Does node has the given credential filled
+ *
+ * @param credentialName E.g. "telegramApi"
+ */
+export function hasNodeCredentialFilled(
+	node: Pick<INodeUi, 'credentials'>,
+	credentialName: string,
+): boolean {
+	if (!node.credentials) {
+		return false;
+	}
+
+	return !!node.credentials[credentialName];
+}
+
+/**
+ * Checks if the given node has all credentials filled.
+ */
+export function doesNodeHaveAllCredentialsFilled(
+	nodeTypeProvider: NodeTypeProvider,
+	node: Pick<INodeUi, 'parameters' | 'type' | 'typeVersion' | 'credentials'>,
+): boolean {
+	const requiredCredentials = getNodeTypeDisplayableCredentials(nodeTypeProvider, node);
+
+	return requiredCredentials.every((cred) => hasNodeCredentialFilled(node, cred.name));
+}
diff --git a/packages/editor-ui/src/utils/objectUtils.ts b/packages/editor-ui/src/utils/objectUtils.ts
new file mode 100644
index 0000000000000..d29bd158661b2
--- /dev/null
+++ b/packages/editor-ui/src/utils/objectUtils.ts
@@ -0,0 +1,20 @@
+type ObjectOrArray = Record<string, unknown> | unknown[];
+
+export function isDateObject(maybeDate: unknown): maybeDate is Date {
+	return maybeDate instanceof Date;
+}
+
+export function isObjectOrArray(maybeObject: unknown): maybeObject is ObjectOrArray {
+	return typeof maybeObject === 'object' && maybeObject !== null && !isDateObject(maybeObject);
+}
+
+export function isObject(maybeObject: unknown): maybeObject is Record<string, unknown> {
+	return isObjectOrArray(maybeObject) && !Array.isArray(maybeObject);
+}
+
+export const searchInObject = (obj: ObjectOrArray, searchString: string): boolean =>
+	(Array.isArray(obj) ? obj : Object.entries(obj)).some((entry) =>
+		isObjectOrArray(entry)
+			? searchInObject(entry, searchString)
+			: entry?.toString().toLowerCase().includes(searchString.toLowerCase()),
+	);
diff --git a/packages/editor-ui/src/utils/pairedItemUtils.ts b/packages/editor-ui/src/utils/pairedItemUtils.ts
index 0f5c0fc95ad94..786e46fe45693 100644
--- a/packages/editor-ui/src/utils/pairedItemUtils.ts
+++ b/packages/editor-ui/src/utils/pairedItemUtils.ts
@@ -1,6 +1,8 @@
 import type { IPairedItemData, IRunData, ITaskData } from 'n8n-workflow';
-import type { IExecutionResponse, TargetItem } from '../Interface';
-import { isNotNull } from '@/utils';
+import type { IExecutionResponse, TargetItem } from '@/Interface';
+import { isNotNull } from '@/utils/typeGuards';
+
+export const MAX_ITEM_COUNT_FOR_PAIRING = 1000;
 
 /*
 	Utility functions that provide shared functionalities used to add paired item support to nodes
@@ -10,7 +12,10 @@ export function getPairedItemId(node: string, run: number, output: number, item:
 	return `${node}_r${run}_o${output}_i${item}`;
 }
 
-export function getSourceItems(data: IExecutionResponse, target: TargetItem): TargetItem[] {
+export function getSourceItems(
+	data: Partial<IExecutionResponse>,
+	target: TargetItem,
+): TargetItem[] {
 	if (!data?.data?.resultData?.runData) {
 		return [];
 	}
@@ -23,15 +28,15 @@ export function getSourceItems(data: IExecutionResponse, target: TargetItem): Ta
 	}
 
 	const item = taskData?.data?.main?.[target.outputIndex]?.[target.itemIndex];
-	if (!item || item.pairedItem === undefined) {
+	if (item?.pairedItem === undefined) {
 		return [];
 	}
 
 	const pairedItem: IPairedItemData[] = Array.isArray(item.pairedItem)
 		? item.pairedItem
 		: typeof item.pairedItem === 'object'
-		? [item.pairedItem]
-		: [{ item: item.pairedItem }];
+			? [item.pairedItem]
+			: [{ item: item.pairedItem }];
 	const sourceItems = pairedItem.map((item) => {
 		const input = item.input || 0;
 		return {
@@ -165,16 +170,42 @@ function getMapping(paths: { [item: string]: string[][] }): { [item: string]: Se
 	return mapping;
 }
 
-export function getPairedItemsMapping(executionResponse: IExecutionResponse | null): {
+function getItemsCount(runData: IRunData) {
+	let itemsCount = 0;
+
+	for (const node in runData) {
+		for (const taskData of runData[node]) {
+			const data = taskData.data;
+			if (!data) continue;
+
+			for (const connectionType in data) {
+				const runsCount = data[connectionType].reduce((sum: number, run) => {
+					return run ? sum + run.length : sum;
+				}, 0);
+
+				itemsCount += runsCount;
+			}
+		}
+	}
+
+	return itemsCount;
+}
+
+export function getPairedItemsMapping(executionResponse: Partial<IExecutionResponse> | null): {
 	[itemId: string]: Set<string>;
 } {
 	if (!executionResponse?.data?.resultData?.runData) {
 		return {};
 	}
 
-	const seen = new Set<string>();
 	const runData = executionResponse.data.resultData.runData;
 
+	const itemsCount = getItemsCount(runData);
+	if (itemsCount > MAX_ITEM_COUNT_FOR_PAIRING) {
+		return {};
+	}
+
+	const seen = new Set<string>();
 	const pinned = new Set(Object.keys(executionResponse.data.resultData.pinData || {}));
 
 	const paths: { [item: string]: string[][] } = {};
diff --git a/packages/editor-ui/src/utils/rbacUtils.ts b/packages/editor-ui/src/utils/rbacUtils.ts
new file mode 100644
index 0000000000000..2608127992f93
--- /dev/null
+++ b/packages/editor-ui/src/utils/rbacUtils.ts
@@ -0,0 +1,32 @@
+import type { RouteLocationNormalized } from 'vue-router';
+import type { Resource } from '@n8n/permissions';
+
+export function inferProjectIdFromRoute(to: RouteLocationNormalized): string {
+	const routeParts = to.path.split('/');
+	const projectsIndex = routeParts.indexOf('projects');
+	const projectIdIndex = projectsIndex !== -1 ? projectsIndex + 1 : -1;
+
+	return routeParts[projectIdIndex];
+}
+
+export function inferResourceTypeFromRoute(to: RouteLocationNormalized): Resource | undefined {
+	const routeParts = to.path.split('/');
+	const routeMap = {
+		workflow: 'workflows',
+		credential: 'credentials',
+		user: 'users',
+		variable: 'variables',
+		sourceControl: 'source-control',
+		externalSecretsStore: 'external-secrets',
+	};
+
+	for (const resource of Object.keys(routeMap) as Array<keyof typeof routeMap>) {
+		if (routeParts.includes(routeMap[resource])) {
+			return resource;
+		}
+	}
+}
+
+export function inferResourceIdFromRoute(to: RouteLocationNormalized): string | undefined {
+	return (to.params.id as string | undefined) ?? (to.params.name as string | undefined);
+}
diff --git a/packages/editor-ui/src/utils/sortUtils.ts b/packages/editor-ui/src/utils/sortUtils.ts
index edea740f04caf..7dbc780634ae6 100644
--- a/packages/editor-ui/src/utils/sortUtils.ts
+++ b/packages/editor-ui/src/utils/sortUtils.ts
@@ -4,12 +4,12 @@
 
 // based on https://github.com/forrestthewoods/lib_fts/blob/master/code/fts_fuzzy_match.js
 
-const SEQUENTIAL_BONUS = 30; // bonus for adjacent matches
+const SEQUENTIAL_BONUS = 60; // bonus for adjacent matches
 const SEPARATOR_BONUS = 30; // bonus if match occurs after a separator
 const CAMEL_BONUS = 30; // bonus if match is uppercase and prev is lower
 const FIRST_LETTER_BONUS = 15; // bonus if the first letter is matched
 
-const LEADING_LETTER_PENALTY = -15; // penalty applied for every letter in str before the first match
+const LEADING_LETTER_PENALTY = -20; // penalty applied for every letter in str before the first match
 const MAX_LEADING_LETTER_PENALTY = -200; // maximum penalty for leading letters
 const UNMATCHED_LETTER_PENALTY = -5;
 
@@ -202,11 +202,12 @@ function getValue<T extends object>(obj: T, prop: string): unknown {
 	}
 
 	const segments = prop.split('.');
-	// eslint-disable-next-line @typescript-eslint/no-explicit-any
-	let result: any = obj;
+
+	let result = obj;
 	let i = 0;
 	while (result && i < segments.length) {
-		result = result[segments[i]];
+		const key = segments[i] as keyof T;
+		result = result[key] as T;
 		i++;
 	}
 	return result;
diff --git a/packages/editor-ui/src/utils/sourceControlUtils.ts b/packages/editor-ui/src/utils/sourceControlUtils.ts
new file mode 100644
index 0000000000000..fc336eddb0436
--- /dev/null
+++ b/packages/editor-ui/src/utils/sourceControlUtils.ts
@@ -0,0 +1,27 @@
+import type { SourceControlAggregatedFile, SourceControlStatus } from '@/Interface';
+
+export function aggregateSourceControlFiles(sourceControlStatus: SourceControlStatus) {
+	return sourceControlStatus.files.reduce<SourceControlAggregatedFile[]>((acc, file) => {
+		const staged = sourceControlStatus.staged.includes(file.path);
+
+		let status = '';
+		(
+			['conflicted', 'created', 'deleted', 'modified', 'renamed'] as Array<
+				keyof SourceControlStatus
+			>
+		).forEach((key) => {
+			const filesForStatus = sourceControlStatus[key] as string[];
+			if (filesForStatus.includes(file.path)) {
+				status = key;
+			}
+		});
+
+		acc.push({
+			path: file.path,
+			status,
+			staged,
+		});
+
+		return acc;
+	}, []);
+}
diff --git a/packages/editor-ui/src/utils/telemetryUtils.ts b/packages/editor-ui/src/utils/telemetryUtils.ts
index 9c0faaf4dbbc5..b7d1e5cadb47e 100644
--- a/packages/editor-ui/src/utils/telemetryUtils.ts
+++ b/packages/editor-ui/src/utils/telemetryUtils.ts
@@ -1,4 +1,4 @@
-import { hasExpressionMapping } from '@/utils';
+import { hasExpressionMapping } from '@/utils/nodeTypesUtils';
 
 import type { Resolvable, Segment } from '@/types/expressions';
 
@@ -6,7 +6,7 @@ export function createExpressionTelemetryPayload(
 	segments: Segment[],
 	value: string,
 	workflowId: string,
-	sessionId: string,
+	pushRef: string,
 	activeNodeType: string,
 	eventSource = 'ndv',
 ) {
@@ -17,7 +17,7 @@ export function createExpressionTelemetryPayload(
 		empty_expression: value === '=' || value === '={{}}' || !value,
 		workflow_id: workflowId,
 		source: eventSource,
-		session_id: sessionId,
+		push_ref: pushRef,
 		is_transforming_data: resolvables.some((r) => isTransformingData(r.resolvable)),
 		has_parameter: value.includes('$parameter'),
 		has_mapping: hasExpressionMapping(value),
diff --git a/packages/editor-ui/src/utils/templates/__tests__/templateActions.test.ts b/packages/editor-ui/src/utils/templates/__tests__/templateActions.test.ts
new file mode 100644
index 0000000000000..6c48ca8683798
--- /dev/null
+++ b/packages/editor-ui/src/utils/templates/__tests__/templateActions.test.ts
@@ -0,0 +1,149 @@
+import { VIEWS } from '@/constants';
+import { Telemetry } from '@/plugins/telemetry';
+import type { NodeTypesStore } from '@/stores/nodeTypes.store';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import type { PosthogStore } from '@/stores/posthog.store';
+import { usePostHog } from '@/stores/posthog.store';
+import type { TemplatesStore } from '@/stores/templates.store';
+import { useTemplatesStore } from '@/stores/templates.store';
+import { useTemplateWorkflow } from '@/utils/templates/templateActions';
+import {
+	nodeTypeRespondToWebhookV1,
+	nodeTypeShopifyTriggerV1,
+	nodeTypeTelegramV1,
+	nodeTypeTwitterV1,
+	nodeTypeWebhookV1,
+	nodeTypeWebhookV1_1,
+	nodeTypesSet,
+} from '@/utils/testData/nodeTypeTestData';
+import {
+	fullCreateApiEndpointTemplate,
+	fullShopifyTelegramTwitterTemplate,
+} from '@/utils/testData/templateTestData';
+import { createTestingPinia } from '@pinia/testing';
+import { setActivePinia } from 'pinia';
+import { vi } from 'vitest';
+import type { Router } from 'vue-router';
+
+describe('templateActions', () => {
+	describe('useTemplateWorkflow', () => {
+		const telemetry = new Telemetry();
+		const externalHooks = {
+			run: vi.fn(),
+		};
+		const router: Router = {
+			push: vi.fn(),
+			resolve: vi.fn(),
+		} as unknown as Router;
+		let nodeTypesStore: NodeTypesStore;
+		let posthogStore: PosthogStore;
+		let templatesStore: TemplatesStore;
+
+		beforeEach(() => {
+			vi.resetAllMocks();
+			setActivePinia(
+				createTestingPinia({
+					stubActions: false,
+				}),
+			);
+
+			vi.spyOn(telemetry, 'track').mockImplementation(() => {});
+			nodeTypesStore = useNodeTypesStore();
+			posthogStore = usePostHog();
+			templatesStore = useTemplatesStore();
+		});
+
+		describe('When feature flag is disabled', () => {
+			const templateId = '1';
+
+			beforeEach(async () => {
+				posthogStore.isFeatureEnabled = vi.fn().mockReturnValue(false);
+
+				await useTemplateWorkflow({
+					externalHooks,
+					posthogStore,
+					nodeTypesStore,
+					telemetry,
+					templateId,
+					templatesStore,
+					router,
+					source: 'workflow',
+				});
+			});
+
+			it('should navigate to correct url', async () => {
+				expect(router.push).toHaveBeenCalledWith({
+					name: VIEWS.TEMPLATE_IMPORT,
+					params: { id: templateId },
+				});
+			});
+		});
+
+		describe('When feature flag is enabled and template has nodes requiring credentials', () => {
+			const templateId = fullShopifyTelegramTwitterTemplate.id.toString();
+
+			beforeEach(async () => {
+				posthogStore.isFeatureEnabled = vi.fn().mockReturnValue(true);
+				templatesStore.addWorkflows([fullShopifyTelegramTwitterTemplate]);
+				nodeTypesStore.setNodeTypes([
+					nodeTypeTelegramV1,
+					nodeTypeTwitterV1,
+					nodeTypeShopifyTriggerV1,
+				]);
+				vi.spyOn(nodeTypesStore, 'loadNodeTypesIfNotLoaded').mockResolvedValue();
+
+				await useTemplateWorkflow({
+					externalHooks,
+					posthogStore,
+					nodeTypesStore,
+					telemetry,
+					templateId,
+					templatesStore,
+					router,
+					source: 'workflow',
+				});
+			});
+
+			it('should navigate to correct url', async () => {
+				expect(router.push).toHaveBeenCalledWith({
+					name: VIEWS.TEMPLATE_SETUP,
+					params: { id: templateId },
+				});
+			});
+		});
+
+		describe("When feature flag is enabled and template doesn't have nodes requiring credentials", () => {
+			const templateId = fullCreateApiEndpointTemplate.id.toString();
+
+			beforeEach(async () => {
+				posthogStore.isFeatureEnabled = vi.fn().mockReturnValue(true);
+				templatesStore.addWorkflows([fullCreateApiEndpointTemplate]);
+				nodeTypesStore.setNodeTypes([
+					nodeTypeWebhookV1,
+					nodeTypeWebhookV1_1,
+					nodeTypeRespondToWebhookV1,
+					...Object.values(nodeTypesSet),
+				]);
+				vi.spyOn(nodeTypesStore, 'loadNodeTypesIfNotLoaded').mockResolvedValue();
+
+				await useTemplateWorkflow({
+					externalHooks,
+					posthogStore,
+					nodeTypesStore,
+					telemetry,
+					templateId,
+					templatesStore,
+					router,
+					source: 'workflow',
+				});
+			});
+
+			it('should navigate to correct url', async () => {
+				expect(router.push).toHaveBeenCalledWith({
+					name: VIEWS.TEMPLATE_IMPORT,
+					params: { id: templateId },
+				});
+			});
+		});
+	});
+});
diff --git a/packages/editor-ui/src/utils/templates/__tests__/templateTransforms.test.ts b/packages/editor-ui/src/utils/templates/__tests__/templateTransforms.test.ts
new file mode 100644
index 0000000000000..d91bb9b66f1fe
--- /dev/null
+++ b/packages/editor-ui/src/utils/templates/__tests__/templateTransforms.test.ts
@@ -0,0 +1,61 @@
+import {
+	keyFromCredentialTypeAndName,
+	replaceAllTemplateNodeCredentials,
+} from '@/utils/templates/templateTransforms';
+import { newWorkflowTemplateNode } from '@/utils/testData/templateTestData';
+
+describe('templateTransforms', () => {
+	describe('replaceAllTemplateNodeCredentials', () => {
+		it('should replace credentials of nodes that have credentials', () => {
+			const nodeTypeProvider = {
+				getNodeType: vitest.fn(),
+			};
+			const node = newWorkflowTemplateNode({
+				type: 'n8n-nodes-base.twitter',
+				credentials: {
+					twitterOAuth1Api: 'old1',
+				},
+			});
+
+			const toReplaceWith = {
+				[keyFromCredentialTypeAndName('twitterOAuth1Api', 'old1')]: {
+					id: 'new1',
+					name: 'Twitter creds',
+				},
+			};
+
+			const [replacedNode] = replaceAllTemplateNodeCredentials(
+				nodeTypeProvider,
+				[node],
+				toReplaceWith,
+			);
+
+			expect(replacedNode.credentials).toEqual({
+				twitterOAuth1Api: { id: 'new1', name: 'Twitter creds' },
+			});
+		});
+
+		it('should not replace credentials of nodes that do not have credentials', () => {
+			const nodeTypeProvider = {
+				getNodeType: vitest.fn(),
+			};
+			const node = newWorkflowTemplateNode({
+				type: 'n8n-nodes-base.twitter',
+			});
+			const toReplaceWith = {
+				[keyFromCredentialTypeAndName('twitterOAuth1Api', 'old1')]: {
+					id: 'new1',
+					name: 'Twitter creds',
+				},
+			};
+
+			const [replacedNode] = replaceAllTemplateNodeCredentials(
+				nodeTypeProvider,
+				[node],
+				toReplaceWith,
+			);
+
+			expect(replacedNode.credentials).toBeUndefined();
+		});
+	});
+});
diff --git a/packages/editor-ui/src/utils/templates/templateActions.ts b/packages/editor-ui/src/utils/templates/templateActions.ts
new file mode 100644
index 0000000000000..513dbe87dd149
--- /dev/null
+++ b/packages/editor-ui/src/utils/templates/templateActions.ts
@@ -0,0 +1,177 @@
+import type {
+	INodeUi,
+	ITemplatesWorkflowFull,
+	IWorkflowData,
+	IWorkflowTemplate,
+} from '@/Interface';
+import { getNewWorkflow } from '@/api/workflows';
+import { TEMPLATE_CREDENTIAL_SETUP_EXPERIMENT, VIEWS } from '@/constants';
+import type { useRootStore } from '@/stores/n8nRoot.store';
+import type { PosthogStore } from '@/stores/posthog.store';
+import type { useWorkflowsStore } from '@/stores/workflows.store';
+import { getFixedNodesList } from '@/utils/nodeViewUtils';
+import type { NodeTypeProvider } from '@/utils/nodeTypes/nodeTypeTransforms';
+import type { TemplateCredentialKey } from '@/utils/templates/templateTransforms';
+import { replaceAllTemplateNodeCredentials } from '@/utils/templates/templateTransforms';
+import type { INodeCredentialsDetails } from 'n8n-workflow';
+import type { RouteLocationRaw, Router } from 'vue-router';
+import type { TemplatesStore } from '@/stores/templates.store';
+import type { NodeTypesStore } from '@/stores/nodeTypes.store';
+import type { Telemetry } from '@/plugins/telemetry';
+import type { useExternalHooks } from '@/composables/useExternalHooks';
+import { assert } from '@/utils/assert';
+import { doesNodeHaveCredentialsToFill } from '@/utils/nodes/nodeTransforms';
+import { tryToParseNumber } from '@/utils/typesUtils';
+
+type ExternalHooks = ReturnType<typeof useExternalHooks>;
+
+/**
+ * Creates a new workflow from a template
+ */
+export async function createWorkflowFromTemplate(opts: {
+	template: IWorkflowTemplate;
+	credentialOverrides: Record<TemplateCredentialKey, INodeCredentialsDetails>;
+	rootStore: ReturnType<typeof useRootStore>;
+	workflowsStore: ReturnType<typeof useWorkflowsStore>;
+	nodeTypeProvider: NodeTypeProvider;
+}) {
+	const { credentialOverrides, nodeTypeProvider, rootStore, template, workflowsStore } = opts;
+
+	const workflowData = await getNewWorkflow(rootStore.getRestApiContext, template.name);
+	const nodesWithCreds = replaceAllTemplateNodeCredentials(
+		nodeTypeProvider,
+		template.workflow.nodes,
+		credentialOverrides,
+	);
+	const nodes = getFixedNodesList(nodesWithCreds) as INodeUi[];
+	const connections = template.workflow.connections;
+
+	const workflowToCreate: IWorkflowData = {
+		name: workflowData.name,
+		nodes,
+		connections,
+		active: false,
+		meta: {
+			templateId: template.id.toString(),
+		},
+		// Ignored: pinData, settings, tags, versionId
+	};
+
+	const createdWorkflow = await workflowsStore.createNewWorkflow(workflowToCreate);
+
+	return createdWorkflow;
+}
+
+/**
+ * Opens the template credential setup view
+ */
+async function openTemplateCredentialSetup(opts: {
+	templateId: string;
+	router: Router;
+	inNewBrowserTab?: boolean;
+	telemetry: Telemetry;
+	source: string;
+}) {
+	const { router, templateId, inNewBrowserTab = false, telemetry, source } = opts;
+
+	telemetry.track('User opened cred setup', { source }, { withPostHog: true });
+
+	const routeLocation: RouteLocationRaw = {
+		name: VIEWS.TEMPLATE_SETUP,
+		params: { id: templateId },
+	};
+
+	if (inNewBrowserTab) {
+		const route = router.resolve(routeLocation);
+		window.open(route.href, '_blank');
+	} else {
+		await router.push(routeLocation);
+	}
+}
+
+/**
+ * Opens the given template's workflow on NodeView. Fires necessary
+ * telemetry events.
+ */
+async function openTemplateWorkflowOnNodeView(opts: {
+	externalHooks: ExternalHooks;
+	templateId: string;
+	templatesStore: TemplatesStore;
+	router: Router;
+	inNewBrowserTab?: boolean;
+}) {
+	const { externalHooks, templateId, templatesStore, inNewBrowserTab, router } = opts;
+	const routeLocation: RouteLocationRaw = {
+		name: VIEWS.TEMPLATE_IMPORT,
+		params: { id: templateId },
+	};
+	const telemetryPayload = {
+		source: 'workflow',
+		template_id: tryToParseNumber(templateId),
+		wf_template_repo_session_id: templatesStore.currentSessionId,
+	};
+
+	await externalHooks.run('templatesWorkflowView.openWorkflow', telemetryPayload);
+
+	if (inNewBrowserTab) {
+		const route = router.resolve(routeLocation);
+		window.open(route.href, '_blank');
+	} else {
+		await router.push(routeLocation);
+	}
+}
+
+function hasTemplateCredentials(
+	nodeTypeProvider: NodeTypeProvider,
+	template: ITemplatesWorkflowFull,
+) {
+	return template.workflow.nodes.some((node) =>
+		doesNodeHaveCredentialsToFill(nodeTypeProvider, node),
+	);
+}
+
+async function getFullTemplate(templatesStore: TemplatesStore, templateId: string) {
+	const template = templatesStore.getFullTemplateById(templateId);
+	if (template) {
+		return template;
+	}
+
+	await templatesStore.fetchTemplateById(templateId);
+	return templatesStore.getFullTemplateById(templateId);
+}
+
+/**
+ * Uses the given template by opening the template workflow on NodeView
+ * or the template credential setup view. Fires necessary telemetry events.
+ */
+export async function useTemplateWorkflow(opts: {
+	externalHooks: ExternalHooks;
+	nodeTypesStore: NodeTypesStore;
+	posthogStore: PosthogStore;
+	templateId: string;
+	templatesStore: TemplatesStore;
+	router: Router;
+	inNewBrowserTab?: boolean;
+	telemetry: Telemetry;
+	source: string;
+}) {
+	const { nodeTypesStore, posthogStore, templateId, templatesStore } = opts;
+
+	const openCredentialSetup = posthogStore.isFeatureEnabled(TEMPLATE_CREDENTIAL_SETUP_EXPERIMENT);
+	if (!openCredentialSetup) {
+		await openTemplateWorkflowOnNodeView(opts);
+		return;
+	}
+
+	const [template] = await Promise.all([
+		getFullTemplate(templatesStore, templateId),
+		nodeTypesStore.loadNodeTypesIfNotLoaded(),
+	]);
+	assert(template);
+
+	if (hasTemplateCredentials(nodeTypesStore, template)) {
+		await openTemplateCredentialSetup(opts);
+	} else {
+		await openTemplateWorkflowOnNodeView(opts);
+	}
+}
diff --git a/packages/editor-ui/src/utils/templates/templateTransforms.ts b/packages/editor-ui/src/utils/templates/templateTransforms.ts
new file mode 100644
index 0000000000000..a1eba68c67151
--- /dev/null
+++ b/packages/editor-ui/src/utils/templates/templateTransforms.ts
@@ -0,0 +1,135 @@
+import type { IWorkflowTemplateNode, IWorkflowTemplateNodeCredentials } from '@/Interface';
+import type { NodeTypeProvider } from '@/utils/nodeTypes/nodeTypeTransforms';
+import { getNodeTypeDisplayableCredentials } from '@/utils/nodes/nodeTransforms';
+import type { NormalizedTemplateNodeCredentials } from '@/utils/templates/templateTypes';
+import type {
+	INodeCredentialDescription,
+	INodeCredentials,
+	INodeCredentialsDetails,
+} from 'n8n-workflow';
+
+export type IWorkflowTemplateNodeWithCredentials = IWorkflowTemplateNode &
+	Required<Pick<IWorkflowTemplateNode, 'credentials'>>;
+
+const credentialKeySymbol = Symbol('credentialKey');
+
+/**
+ * A key that uniquely identifies a credential in a template node.
+ * It encodes the credential type name and the credential name.
+ * Uses a symbol typing trick to get nominal typing.
+ * Use `keyFromCredentialTypeAndName` to create a key.
+ */
+export type TemplateCredentialKey = string & { [credentialKeySymbol]: never };
+
+export type TemplateNodeWithRequiredCredential = {
+	node: IWorkflowTemplateNode;
+	requiredCredentials: INodeCredentialDescription[];
+};
+
+/**
+ * Forms a key from credential type name and credential name
+ */
+export const keyFromCredentialTypeAndName = (
+	credentialTypeName: string,
+	credentialName: string,
+): TemplateCredentialKey => `${credentialTypeName}-${credentialName}` as TemplateCredentialKey;
+
+/**
+ * Normalizes the credentials of a template node. Templates created with
+ * different versions of n8n may have different credential formats.
+ */
+export const normalizeTemplateNodeCredentials = (
+	credentials?: IWorkflowTemplateNodeCredentials,
+): NormalizedTemplateNodeCredentials => {
+	if (!credentials) {
+		return {};
+	}
+
+	return Object.fromEntries(
+		Object.entries(credentials).map(([key, value]) => {
+			return typeof value === 'string' ? [key, value] : [key, value.name];
+		}),
+	);
+};
+
+/**
+ * Replaces the credentials of a node with the given replacements
+ *
+ * @example
+ * const nodeCredentials = { twitterOAuth1Api: "twitter" };
+ * const toReplaceByKey = { 'twitterOAuth1Api-twitter': {
+ *   id: "BrEOZ5Cje6VYh9Pc",
+ *   name: "X OAuth account"
+ * }};
+ * replaceTemplateNodeCredentials(nodeCredentials, toReplaceByKey);
+ * // => { twitterOAuth1Api: { id: "BrEOZ5Cje6VYh9Pc", name: "X OAuth account" } }
+ */
+export const getReplacedTemplateNodeCredentials = (
+	nodeCredentials: IWorkflowTemplateNodeCredentials | undefined,
+	toReplaceByKey: Record<TemplateCredentialKey, INodeCredentialsDetails>,
+) => {
+	if (!nodeCredentials) {
+		return undefined;
+	}
+
+	const replacedNodeCredentials: INodeCredentials = {};
+	const normalizedCredentials = normalizeTemplateNodeCredentials(nodeCredentials);
+	for (const credentialType in normalizedCredentials) {
+		const credentialNameInTemplate = normalizedCredentials[credentialType];
+		const key = keyFromCredentialTypeAndName(credentialType, credentialNameInTemplate);
+		const toReplaceWith = toReplaceByKey[key];
+		if (toReplaceWith) {
+			replacedNodeCredentials[credentialType] = toReplaceWith;
+		}
+	}
+
+	return replacedNodeCredentials;
+};
+
+/**
+ * Returns credentials for the given node that are missing from it
+ * but are present in the given replacements
+ */
+export const getMissingTemplateNodeCredentials = (
+	nodeTypeProvider: NodeTypeProvider,
+	node: IWorkflowTemplateNode,
+	replacementsByKey: Record<TemplateCredentialKey, INodeCredentialsDetails>,
+): INodeCredentials => {
+	const nodeCredentialsToAdd: INodeCredentials = {};
+	const usableCredentials = getNodeTypeDisplayableCredentials(nodeTypeProvider, node);
+
+	for (const usableCred of usableCredentials) {
+		const credentialKey = keyFromCredentialTypeAndName(usableCred.name, '');
+
+		if (replacementsByKey[credentialKey]) {
+			nodeCredentialsToAdd[usableCred.name] = replacementsByKey[credentialKey];
+		}
+	}
+
+	return nodeCredentialsToAdd;
+};
+
+/**
+ * Replaces the credentials of all template workflow nodes with the given
+ * replacements
+ */
+export const replaceAllTemplateNodeCredentials = (
+	nodeTypeProvider: NodeTypeProvider,
+	nodes: IWorkflowTemplateNode[],
+	toReplaceWith: Record<TemplateCredentialKey, INodeCredentialsDetails>,
+) => {
+	return nodes.map((node) => {
+		const replacedCredentials = getReplacedTemplateNodeCredentials(node.credentials, toReplaceWith);
+		const newCredentials = getMissingTemplateNodeCredentials(nodeTypeProvider, node, toReplaceWith);
+
+		const credentials = {
+			...replacedCredentials,
+			...newCredentials,
+		};
+
+		return {
+			...node,
+			credentials: Object.keys(credentials).length > 0 ? credentials : undefined,
+		};
+	});
+};
diff --git a/packages/editor-ui/src/utils/templates/templateTypes.ts b/packages/editor-ui/src/utils/templates/templateTypes.ts
new file mode 100644
index 0000000000000..97484580db7f9
--- /dev/null
+++ b/packages/editor-ui/src/utils/templates/templateTypes.ts
@@ -0,0 +1,9 @@
+/**
+ * The credentials of a node in a template workflow. Map from credential
+ * type name to credential name.
+ * @example
+ * {
+ *  twitterOAuth1Api: "Twitter credentials"
+ * }
+ */
+export type NormalizedTemplateNodeCredentials = Record<string, string>;
diff --git a/packages/editor-ui/src/utils/testData/credentialTypeTestData.ts b/packages/editor-ui/src/utils/testData/credentialTypeTestData.ts
new file mode 100644
index 0000000000000..b49301a856cb6
--- /dev/null
+++ b/packages/editor-ui/src/utils/testData/credentialTypeTestData.ts
@@ -0,0 +1,36 @@
+/**
+ * Credential type test data
+ */
+import type { ICredentialType } from 'n8n-workflow';
+
+export const newCredentialType = (name: string): ICredentialType => ({
+	name,
+	displayName: name,
+	documentationUrl: name,
+	properties: [],
+});
+
+export const credentialTypeTelegram = {
+	name: 'telegramApi',
+	displayName: 'Telegram API',
+	documentationUrl: 'telegram',
+	properties: [
+		{
+			displayName: 'Access Token',
+			name: 'accessToken',
+			type: 'string',
+			typeOptions: {
+				password: true,
+			},
+			default: '',
+			description:
+				'Chat with the <a href="https://telegram.me/botfather">bot father</a> to obtain the access token',
+		},
+	],
+	test: {
+		request: {
+			baseURL: '=https://api.telegram.org/bot{{$credentials.accessToken}}',
+			url: '/getMe',
+		},
+	},
+} satisfies ICredentialType;
diff --git a/packages/editor-ui/src/utils/testData/nodeTypeTestData.ts b/packages/editor-ui/src/utils/testData/nodeTypeTestData.ts
new file mode 100644
index 0000000000000..bd0b4ae440f88
--- /dev/null
+++ b/packages/editor-ui/src/utils/testData/nodeTypeTestData.ts
@@ -0,0 +1,6592 @@
+import type { INodeTypeDescription } from 'n8n-workflow';
+
+export const nodeTypeTwitterV1 = {
+	displayName: 'X (Formerly Twitter)',
+	name: 'n8n-nodes-base.twitter',
+	group: ['output'],
+	subtitle: '={{$parameter["operation"] + ":" + $parameter["resource"]}}',
+	description: 'Consume Twitter API',
+	defaultVersion: 2,
+	version: 1,
+	defaults: { name: 'Twitter' },
+	inputs: ['main'],
+	outputs: ['main'],
+	credentials: [{ name: 'twitterOAuth1Api', required: true }],
+	properties: [
+		{
+			displayName: 'Resource',
+			name: 'resource',
+			type: 'options',
+			noDataExpression: true,
+			options: [
+				{ name: 'Direct Message', value: 'directMessage' },
+				{ name: 'Tweet', value: 'tweet' },
+			],
+			default: 'tweet',
+		},
+		{
+			displayName: 'Operation',
+			name: 'operation',
+			type: 'options',
+			noDataExpression: true,
+			displayOptions: { show: { resource: ['directMessage'] } },
+			options: [
+				{
+					name: 'Create',
+					value: 'create',
+					description: 'Create a direct message',
+					action: 'Create a direct message',
+				},
+			],
+			default: 'create',
+		},
+		{
+			displayName: 'User ID',
+			name: 'userId',
+			type: 'string',
+			required: true,
+			default: '',
+			displayOptions: { show: { operation: ['create'], resource: ['directMessage'] } },
+			description: 'The ID of the user who should receive the direct message',
+		},
+		{
+			displayName: 'Text',
+			name: 'text',
+			type: 'string',
+			required: true,
+			default: '',
+			displayOptions: { show: { operation: ['create'], resource: ['directMessage'] } },
+			description:
+				'The text of your Direct Message. URL encode as necessary. Max length of 10,000 characters.',
+		},
+		{
+			displayName: 'Additional Fields',
+			name: 'additionalFields',
+			type: 'collection',
+			placeholder: 'Add Field',
+			default: {},
+			displayOptions: { show: { operation: ['create'], resource: ['directMessage'] } },
+			options: [
+				{
+					displayName: 'Attachment',
+					name: 'attachment',
+					type: 'string',
+					default: 'data',
+					description:
+						'Name of the binary property which contain data that should be added to the direct message as attachment',
+				},
+			],
+		},
+		{
+			displayName: 'Operation',
+			name: 'operation',
+			type: 'options',
+			noDataExpression: true,
+			displayOptions: { show: { resource: ['tweet'] } },
+			options: [
+				{
+					name: 'Create',
+					value: 'create',
+					description: 'Create or reply a tweet',
+					action: 'Create a tweet',
+				},
+				{
+					name: 'Delete',
+					value: 'delete',
+					description: 'Delete a tweet',
+					action: 'Delete a tweet',
+				},
+				{ name: 'Like', value: 'like', description: 'Like a tweet', action: 'Like a tweet' },
+				{
+					name: 'Retweet',
+					value: 'retweet',
+					description: 'Retweet a tweet',
+					action: 'Retweet a tweet',
+				},
+				{
+					name: 'Search',
+					value: 'search',
+					description: 'Search tweets',
+					action: 'Search for tweets',
+				},
+			],
+			default: 'create',
+		},
+		{
+			displayName: 'Text',
+			name: 'text',
+			type: 'string',
+			required: true,
+			default: '',
+			displayOptions: { show: { operation: ['create'], resource: ['tweet'] } },
+			description:
+				'The text of the status update. URL encode as necessary. t.co link wrapping will affect character counts.',
+		},
+		{
+			displayName: 'Additional Fields',
+			name: 'additionalFields',
+			type: 'collection',
+			placeholder: 'Add Field',
+			default: {},
+			displayOptions: { show: { operation: ['create'], resource: ['tweet'] } },
+			options: [
+				{
+					displayName: 'Attachments',
+					name: 'attachments',
+					type: 'string',
+					default: 'data',
+					description:
+						'Name of the binary properties which contain data which should be added to tweet as attachment. Multiple ones can be comma-separated.',
+				},
+				{
+					displayName: 'Display Coordinates',
+					name: 'displayCoordinates',
+					type: 'boolean',
+					default: false,
+					description:
+						'Whether or not to put a pin on the exact coordinates a Tweet has been sent from',
+				},
+				{
+					displayName: 'In Reply to Tweet',
+					name: 'inReplyToStatusId',
+					type: 'string',
+					default: '',
+					description: 'The ID of an existing status that the update is in reply to',
+				},
+				{
+					displayName: 'Location',
+					name: 'locationFieldsUi',
+					type: 'fixedCollection',
+					placeholder: 'Add Location',
+					default: {},
+					description: 'Subscriber location information.n',
+					options: [
+						{
+							name: 'locationFieldsValues',
+							displayName: 'Location',
+							values: [
+								{
+									displayName: 'Latitude',
+									name: 'latitude',
+									type: 'string',
+									required: true,
+									description: 'The location latitude',
+									default: '',
+								},
+								{
+									displayName: 'Longitude',
+									name: 'longitude',
+									type: 'string',
+									required: true,
+									description: 'The location longitude',
+									default: '',
+								},
+							],
+						},
+					],
+				},
+				{
+					displayName: 'Possibly Sensitive',
+					name: 'possiblySensitive',
+					type: 'boolean',
+					default: false,
+					description:
+						'Whether you are uploading Tweet media that might be considered sensitive content such as nudity, or medical procedures',
+				},
+			],
+		},
+		{
+			displayName: 'Tweet ID',
+			name: 'tweetId',
+			type: 'string',
+			required: true,
+			default: '',
+			displayOptions: { show: { operation: ['delete'], resource: ['tweet'] } },
+			description: 'The ID of the tweet to delete',
+		},
+		{
+			displayName: 'Search Text',
+			name: 'searchText',
+			type: 'string',
+			required: true,
+			default: '',
+			displayOptions: { show: { operation: ['search'], resource: ['tweet'] } },
+			description:
+				'A UTF-8, URL-encoded search query of 500 characters maximum, including operators. Queries may additionally be limited by complexity. Check the searching examples <a href="https://developer.twitter.com/en/docs/tweets/search/guides/standard-operators">here</a>.',
+		},
+		{
+			displayName: 'Return All',
+			name: 'returnAll',
+			type: 'boolean',
+			displayOptions: { show: { operation: ['search'], resource: ['tweet'] } },
+			default: false,
+			description: 'Whether to return all results or only up to a given limit',
+		},
+		{
+			displayName: 'Limit',
+			name: 'limit',
+			type: 'number',
+			displayOptions: {
+				show: { operation: ['search'], resource: ['tweet'], returnAll: [false] },
+			},
+			typeOptions: { minValue: 1 },
+			default: 50,
+			description: 'Max number of results to return',
+		},
+		{
+			displayName: 'Additional Fields',
+			name: 'additionalFields',
+			type: 'collection',
+			placeholder: 'Add Field',
+			default: {},
+			displayOptions: { show: { operation: ['search'], resource: ['tweet'] } },
+			options: [
+				{
+					displayName: 'Include Entities',
+					name: 'includeEntities',
+					type: 'boolean',
+					default: false,
+					description: 'Whether the entities node will be included',
+				},
+				{
+					displayName: 'Language Name or ID',
+					name: 'lang',
+					type: 'options',
+					typeOptions: { loadOptionsMethod: 'getLanguages' },
+					default: '',
+					description:
+						'Restricts tweets to the given language, given by an ISO 639-1 code. Language detection is best-effort. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+				},
+				{
+					displayName: 'Location',
+					name: 'locationFieldsUi',
+					type: 'fixedCollection',
+					placeholder: 'Add Location',
+					default: {},
+					description: 'Subscriber location information.n',
+					options: [
+						{
+							name: 'locationFieldsValues',
+							displayName: 'Location',
+							values: [
+								{
+									displayName: 'Latitude',
+									name: 'latitude',
+									type: 'string',
+									required: true,
+									description: 'The location latitude',
+									default: '',
+								},
+								{
+									displayName: 'Longitude',
+									name: 'longitude',
+									type: 'string',
+									required: true,
+									description: 'The location longitude',
+									default: '',
+								},
+								{
+									displayName: 'Radius',
+									name: 'radius',
+									type: 'options',
+									options: [
+										{ name: 'Milles', value: 'mi' },
+										{ name: 'Kilometers', value: 'km' },
+									],
+									required: true,
+									description:
+										'Returns tweets by users located within a given radius of the given latitude/longitude',
+									default: '',
+								},
+								{
+									displayName: 'Distance',
+									name: 'distance',
+									type: 'number',
+									typeOptions: { minValue: 0 },
+									required: true,
+									default: '',
+								},
+							],
+						},
+					],
+				},
+				{
+					displayName: 'Result Type',
+					name: 'resultType',
+					type: 'options',
+					options: [
+						{
+							name: 'Mixed',
+							value: 'mixed',
+							description: 'Include both popular and real time results in the response',
+						},
+						{
+							name: 'Recent',
+							value: 'recent',
+							description: 'Return only the most recent results in the response',
+						},
+						{
+							name: 'Popular',
+							value: 'popular',
+							description: 'Return only the most popular results in the response',
+						},
+					],
+					default: 'mixed',
+					description: 'Specifies what type of search results you would prefer to receive',
+				},
+				{
+					displayName: 'Tweet Mode',
+					name: 'tweetMode',
+					type: 'options',
+					options: [
+						{ name: 'Compatibility', value: 'compat' },
+						{ name: 'Extended', value: 'extended' },
+					],
+					default: 'compat',
+					description:
+						'When the extended mode is selected, the response contains the entire untruncated text of the Tweet',
+				},
+				{
+					displayName: 'Until',
+					name: 'until',
+					type: 'dateTime',
+					default: '',
+					description: 'Returns tweets created before the given date',
+				},
+			],
+		},
+		{
+			displayName: 'Tweet ID',
+			name: 'tweetId',
+			type: 'string',
+			required: true,
+			default: '',
+			displayOptions: { show: { operation: ['like'], resource: ['tweet'] } },
+			description: 'The ID of the tweet',
+		},
+		{
+			displayName: 'Additional Fields',
+			name: 'additionalFields',
+			type: 'collection',
+			placeholder: 'Add Field',
+			default: {},
+			displayOptions: { show: { operation: ['like'], resource: ['tweet'] } },
+			options: [
+				{
+					displayName: 'Include Entities',
+					name: 'includeEntities',
+					type: 'boolean',
+					default: false,
+					description: 'Whether the entities will be omitted',
+				},
+			],
+		},
+		{
+			displayName: 'Tweet ID',
+			name: 'tweetId',
+			type: 'string',
+			required: true,
+			default: '',
+			displayOptions: { show: { operation: ['retweet'], resource: ['tweet'] } },
+			description: 'The ID of the tweet',
+		},
+		{
+			displayName: 'Additional Fields',
+			name: 'additionalFields',
+			type: 'collection',
+			placeholder: 'Add Field',
+			default: {},
+			displayOptions: { show: { operation: ['retweet'], resource: ['tweet'] } },
+			options: [
+				{
+					displayName: 'Trim User',
+					name: 'trimUser',
+					type: 'boolean',
+					default: false,
+					description:
+						'Whether each tweet returned in a timeline will include a user object including only the status authors numerical ID',
+				},
+			],
+		},
+	],
+	iconUrl: 'icons/n8n-nodes-base/dist/nodes/Twitter/x.svg',
+	codex: {
+		categories: ['Marketing'],
+		resources: {
+			primaryDocumentation: [
+				{ url: 'https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.twitter/' },
+			],
+			credentialDocumentation: [{ url: 'https://docs.n8n.io/credentials/twitter' }],
+		},
+		alias: ['Tweet', 'Twitter', 'X', 'X API'],
+	},
+} satisfies INodeTypeDescription;
+
+export const nodeTypeTwitterV2 = {
+	displayName: 'X (Formerly Twitter)',
+	name: 'n8n-nodes-base.twitter',
+	group: ['output'],
+	subtitle: '={{$parameter["operation"] + ":" + $parameter["resource"]}}',
+	description: 'Post, like, and search tweets, send messages, search users, and add users to lists',
+	defaultVersion: 2,
+	version: 2,
+	defaults: { name: 'X' },
+	inputs: ['main'],
+	outputs: ['main'],
+	credentials: [{ name: 'twitterOAuth2Api', required: true }],
+	properties: [
+		{
+			displayName: 'Resource',
+			name: 'resource',
+			type: 'options',
+			noDataExpression: true,
+			options: [
+				{
+					name: 'Direct Message',
+					value: 'directMessage',
+					description: 'Send a direct message to a user',
+				},
+				{ name: 'List', value: 'list', description: 'Add a user to a list' },
+				{ name: 'Tweet', value: 'tweet', description: 'Create, like, search, or delete a tweet' },
+				{ name: 'User', value: 'user', description: 'Search users by username' },
+				{ name: 'Custom API Call', value: '__CUSTOM_API_CALL__' },
+			],
+			default: 'tweet',
+		},
+		{
+			displayName: 'Operation',
+			name: 'operation',
+			type: 'options',
+			noDataExpression: true,
+			displayOptions: { show: { resource: ['directMessage'] } },
+			options: [
+				{
+					name: 'Create',
+					value: 'create',
+					description: 'Send a direct message to a user',
+					action: 'Create Direct Message',
+				},
+				{ name: 'Custom API Call', value: '__CUSTOM_API_CALL__' },
+			],
+			default: 'create',
+		},
+		{
+			displayName: 'User',
+			name: 'user',
+			type: 'resourceLocator',
+			default: { mode: 'username', value: '' },
+			required: true,
+			description: 'The user you want to send the message to',
+			displayOptions: { show: { operation: ['create'], resource: ['directMessage'] } },
+			modes: [
+				{
+					displayName: 'By Username',
+					name: 'username',
+					type: 'string',
+					validation: [],
+					placeholder: 'e.g. n8n',
+					url: '',
+				},
+				{
+					displayName: 'By ID',
+					name: 'id',
+					type: 'string',
+					validation: [],
+					placeholder: 'e.g. 1068479892537384960',
+					url: '',
+				},
+			],
+		},
+		{
+			displayName: 'Text',
+			name: 'text',
+			type: 'string',
+			required: true,
+			default: '',
+			typeOptions: { rows: 2 },
+			displayOptions: { show: { operation: ['create'], resource: ['directMessage'] } },
+			description:
+				'The text of the direct message. URL encoding is required. Max length of 10,000 characters.',
+		},
+		{
+			displayName: 'Additional Fields',
+			name: 'additionalFields',
+			type: 'collection',
+			placeholder: 'Add Field',
+			default: {},
+			displayOptions: { show: { operation: ['create'], resource: ['directMessage'] } },
+			options: [
+				{
+					displayName: 'Attachment ID',
+					name: 'attachments',
+					type: 'string',
+					default: '',
+					placeholder: '1664279886239010824',
+					description: 'The attachment ID to associate with the message',
+				},
+			],
+		},
+		{
+			displayName: 'Operation',
+			name: 'operation',
+			type: 'options',
+			noDataExpression: true,
+			displayOptions: { show: { resource: ['list'] } },
+			options: [
+				{
+					name: 'Add Member',
+					value: 'add',
+					description: 'Add a member to a list',
+					action: 'Add Member to List',
+				},
+				{ name: 'Custom API Call', value: '__CUSTOM_API_CALL__' },
+			],
+			default: 'add',
+		},
+		{
+			displayName: 'List',
+			name: 'list',
+			type: 'resourceLocator',
+			default: { mode: 'id', value: '' },
+			required: true,
+			description: 'The list you want to add the user to',
+			displayOptions: { show: { operation: ['add'], resource: ['list'] } },
+			modes: [
+				{
+					displayName: 'By ID',
+					name: 'id',
+					type: 'string',
+					validation: [],
+					placeholder: 'e.g. 99923132',
+					url: '',
+				},
+				{
+					displayName: 'By URL',
+					name: 'url',
+					type: 'string',
+					validation: [],
+					placeholder: 'e.g. https://twitter.com/i/lists/99923132',
+					url: '',
+				},
+			],
+		},
+		{
+			displayName: 'User',
+			name: 'user',
+			type: 'resourceLocator',
+			default: { mode: 'username', value: '' },
+			required: true,
+			description: 'The user you want to add to the list',
+			displayOptions: { show: { operation: ['add'], resource: ['list'] } },
+			modes: [
+				{
+					displayName: 'By Username',
+					name: 'username',
+					type: 'string',
+					validation: [],
+					placeholder: 'e.g. n8n',
+					url: '',
+				},
+				{
+					displayName: 'By ID',
+					name: 'id',
+					type: 'string',
+					validation: [],
+					placeholder: 'e.g. 1068479892537384960',
+					url: '',
+				},
+			],
+		},
+		{
+			displayName: 'Operation',
+			name: 'operation',
+			type: 'options',
+			noDataExpression: true,
+			displayOptions: { show: { resource: ['tweet'] } },
+			options: [
+				{
+					name: 'Create',
+					value: 'create',
+					description: 'Create, quote, or reply to a tweet',
+					action: 'Create Tweet',
+				},
+				{
+					name: 'Delete',
+					value: 'delete',
+					description: 'Delete a tweet',
+					action: 'Delete Tweet',
+				},
+				{ name: 'Like', value: 'like', description: 'Like a tweet', action: 'Like Tweet' },
+				{
+					name: 'Retweet',
+					value: 'retweet',
+					description: 'Retweet a tweet',
+					action: 'Retweet Tweet',
+				},
+				{
+					name: 'Search',
+					value: 'search',
+					description: 'Search for tweets from the last seven days',
+					action: 'Search Tweets',
+				},
+				{ name: 'Custom API Call', value: '__CUSTOM_API_CALL__' },
+			],
+			default: 'create',
+		},
+		{
+			displayName: 'Text',
+			name: 'text',
+			type: 'string',
+			typeOptions: { rows: 2 },
+			default: '',
+			required: true,
+			displayOptions: { show: { operation: ['create'], resource: ['tweet'] } },
+			description:
+				'The text of the status update. URLs must be encoded. Links wrapped with the t.co shortener will affect character count',
+		},
+		{
+			displayName: 'Options',
+			name: 'additionalFields',
+			type: 'collection',
+			placeholder: 'Add Field',
+			default: {},
+			displayOptions: { show: { operation: ['create'], resource: ['tweet'] } },
+			options: [
+				{
+					displayName: 'Location ID',
+					name: 'location',
+					type: 'string',
+					placeholder: '4e696bef7e24d378',
+					default: '',
+					description: 'Location information for the tweet',
+				},
+				{
+					displayName: 'Media ID',
+					name: 'attachments',
+					type: 'string',
+					default: '',
+					placeholder: '1664279886239010824',
+					description: 'The attachment ID to associate with the message',
+				},
+				{
+					displayName: 'Quote a Tweet',
+					name: 'inQuoteToStatusId',
+					type: 'resourceLocator',
+					default: { mode: 'id', value: '' },
+					description: 'The tweet being quoted',
+					modes: [
+						{
+							displayName: 'By ID',
+							name: 'id',
+							type: 'string',
+							validation: [],
+							placeholder: 'e.g. 1187836157394112513',
+							url: '',
+						},
+						{
+							displayName: 'By URL',
+							name: 'url',
+							type: 'string',
+							validation: [],
+							placeholder: 'e.g. https://twitter.com/n8n_io/status/1187836157394112513',
+							url: '',
+						},
+					],
+				},
+				{
+					displayName: 'Reply to Tweet',
+					name: 'inReplyToStatusId',
+					type: 'resourceLocator',
+					default: { mode: 'id', value: '' },
+					description: 'The tweet being replied to',
+					modes: [
+						{
+							displayName: 'By ID',
+							name: 'id',
+							type: 'string',
+							validation: [],
+							placeholder: 'e.g. 1187836157394112513',
+							url: '',
+						},
+						{
+							displayName: 'By URL',
+							name: 'url',
+							type: 'string',
+							validation: [],
+							placeholder: 'e.g. https://twitter.com/n8n_io/status/1187836157394112513',
+							url: '',
+						},
+					],
+				},
+			],
+		},
+		{
+			displayName: 'Locations are not supported due to Twitter V2 API limitations',
+			name: 'noticeLocation',
+			type: 'notice',
+			displayOptions: { show: { '/additionalFields.location': [''] } },
+			default: '',
+		},
+		{
+			displayName: 'Attachements are not supported due to Twitter V2 API limitations',
+			name: 'noticeAttachments',
+			type: 'notice',
+			displayOptions: { show: { '/additionalFields.attachments': [''] } },
+			default: '',
+		},
+		{
+			displayName: 'Tweet',
+			name: 'tweetDeleteId',
+			type: 'resourceLocator',
+			default: { mode: 'id', value: '' },
+			required: true,
+			description: 'The tweet to delete',
+			displayOptions: { show: { resource: ['tweet'], operation: ['delete'] } },
+			modes: [
+				{
+					displayName: 'By ID',
+					name: 'id',
+					type: 'string',
+					validation: [],
+					placeholder: 'e.g. 1187836157394112513',
+					url: '',
+				},
+				{
+					displayName: 'By URL',
+					name: 'url',
+					type: 'string',
+					validation: [],
+					placeholder: 'e.g. https://twitter.com/n8n_io/status/1187836157394112513',
+					url: '',
+				},
+			],
+		},
+		{
+			displayName: 'Tweet',
+			name: 'tweetId',
+			type: 'resourceLocator',
+			default: { mode: 'id', value: '' },
+			required: true,
+			description: 'The tweet to like',
+			displayOptions: { show: { operation: ['like'], resource: ['tweet'] } },
+			modes: [
+				{
+					displayName: 'By ID',
+					name: 'id',
+					type: 'string',
+					validation: [],
+					placeholder: 'e.g. 1187836157394112513',
+					url: '',
+				},
+				{
+					displayName: 'By URL',
+					name: 'url',
+					type: 'string',
+					validation: [],
+					placeholder: 'e.g. https://twitter.com/n8n_io/status/1187836157394112513',
+					url: '',
+				},
+			],
+		},
+		{
+			displayName: 'Search Term',
+			name: 'searchText',
+			type: 'string',
+			required: true,
+			default: '',
+			placeholder: 'e.g. automation',
+			displayOptions: { show: { operation: ['search'], resource: ['tweet'] } },
+			description:
+				'A UTF-8, URL-encoded search query of 500 characters maximum, including operators. Queries may additionally be limited by complexity. Check the searching examples <a href="https://developer.twitter.com/en/docs/tweets/search/guides/standard-operators">here</a>.',
+		},
+		{
+			displayName: 'Return All',
+			name: 'returnAll',
+			type: 'boolean',
+			default: false,
+			description: 'Whether to return all results or only up to a given limit',
+			displayOptions: { show: { resource: ['tweet'], operation: ['search'] } },
+		},
+		{
+			displayName: 'Limit',
+			name: 'limit',
+			type: 'number',
+			default: 50,
+			description: 'Max number of results to return',
+			typeOptions: { minValue: 1 },
+			displayOptions: {
+				show: { resource: ['tweet'], operation: ['search'], returnAll: [false] },
+			},
+		},
+		{
+			displayName: 'Options',
+			name: 'additionalFields',
+			type: 'collection',
+			placeholder: 'Add Field',
+			default: {},
+			displayOptions: { show: { operation: ['search'], resource: ['tweet'] } },
+			options: [
+				{
+					displayName: 'Sort Order',
+					name: 'sortOrder',
+					type: 'options',
+					options: [
+						{ name: 'Recent', value: 'recency' },
+						{ name: 'Relevant', value: 'relevancy' },
+					],
+					description: 'The order in which to return results',
+					default: 'recency',
+				},
+				{
+					displayName: 'After',
+					name: 'startTime',
+					type: 'dateTime',
+					default: '',
+					description:
+						"Tweets before this date will not be returned. This date must be within the last 7 days if you don't have Academic Research access.",
+				},
+				{
+					displayName: 'Before',
+					name: 'endTime',
+					type: 'dateTime',
+					default: '',
+					description:
+						"Tweets after this date will not be returned. This date must be within the last 7 days if you don't have Academic Research access.",
+				},
+				{
+					displayName: 'Tweet Fields',
+					name: 'tweetFieldsObject',
+					type: 'multiOptions',
+					options: [
+						{ name: 'Attachments', value: 'attachments' },
+						{ name: 'Author ID', value: 'author_id' },
+						{ name: 'Context Annotations', value: 'context_annotations' },
+						{ name: 'Conversation ID', value: 'conversation_id' },
+						{ name: 'Created At', value: 'created_at' },
+						{ name: 'Edit Controls', value: 'edit_controls' },
+						{ name: 'Entities', value: 'entities' },
+						{ name: 'Geo', value: 'geo' },
+						{ name: 'ID', value: 'id' },
+						{ name: 'In Reply To User ID', value: 'in_reply_to_user_id' },
+						{ name: 'Lang', value: 'lang' },
+						{ name: 'Non Public Metrics', value: 'non_public_metrics' },
+						{ name: 'Public Metrics', value: 'public_metrics' },
+						{ name: 'Organic Metrics', value: 'organic_metrics' },
+						{ name: 'Promoted Metrics', value: 'promoted_metrics' },
+						{ name: 'Possibly Sensitive', value: 'possibly_sensitive' },
+						{ name: 'Referenced Tweets', value: 'referenced_tweets' },
+						{ name: 'Reply Settings', value: 'reply_settings' },
+						{ name: 'Source', value: 'source' },
+						{ name: 'Text', value: 'text' },
+						{ name: 'Withheld', value: 'withheld' },
+					],
+					default: [],
+					description:
+						'The fields to add to each returned tweet object. Default fields are: ID, text, edit_history_tweet_ids.',
+				},
+			],
+		},
+		{
+			displayName: 'Tweet',
+			name: 'tweetId',
+			type: 'resourceLocator',
+			default: { mode: 'id', value: '' },
+			required: true,
+			description: 'The tweet to retweet',
+			displayOptions: { show: { operation: ['retweet'], resource: ['tweet'] } },
+			modes: [
+				{
+					displayName: 'By ID',
+					name: 'id',
+					type: 'string',
+					validation: [],
+					placeholder: 'e.g. 1187836157394112513',
+					url: '',
+				},
+				{
+					displayName: 'By URL',
+					name: 'url',
+					type: 'string',
+					validation: [],
+					placeholder: 'e.g. https://twitter.com/n8n_io/status/1187836157394112513',
+					url: '',
+				},
+			],
+		},
+		{
+			displayName: 'Operation',
+			name: 'operation',
+			type: 'options',
+			noDataExpression: true,
+			displayOptions: { show: { resource: ['user'] } },
+			options: [
+				{
+					name: 'Get',
+					value: 'searchUser',
+					description: 'Retrieve a user by username',
+					action: 'Get User',
+				},
+				{ name: 'Custom API Call', value: '__CUSTOM_API_CALL__' },
+			],
+			default: 'searchUser',
+		},
+		{
+			displayName: 'User',
+			name: 'user',
+			type: 'resourceLocator',
+			default: { mode: 'username', value: '' },
+			required: true,
+			description: 'The user you want to search',
+			displayOptions: {
+				show: { operation: ['searchUser'], resource: ['user'] },
+				hide: { me: [true] },
+			},
+			modes: [
+				{
+					displayName: 'By Username',
+					name: 'username',
+					type: 'string',
+					validation: [],
+					placeholder: 'e.g. n8n',
+					url: '',
+				},
+				{
+					displayName: 'By ID',
+					name: 'id',
+					type: 'string',
+					validation: [],
+					placeholder: 'e.g. 1068479892537384960',
+					url: '',
+				},
+			],
+		},
+		{
+			displayName: 'Me',
+			name: 'me',
+			type: 'boolean',
+			displayOptions: { show: { operation: ['searchUser'], resource: ['user'] } },
+			default: false,
+			description: 'Whether you want to search the authenticated user',
+		},
+	],
+	iconUrl: 'icons/n8n-nodes-base/dist/nodes/Twitter/x.svg',
+	codex: {
+		categories: ['Marketing'],
+		resources: {
+			primaryDocumentation: [
+				{ url: 'https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.twitter/' },
+			],
+			credentialDocumentation: [{ url: 'https://docs.n8n.io/credentials/twitter' }],
+		},
+		alias: ['Tweet', 'Twitter', 'X', 'X API'],
+	},
+} satisfies INodeTypeDescription;
+
+export const nodeTypeReadImapV1 = {
+	displayName: 'Email Trigger (IMAP)',
+	name: 'n8n-nodes-base.emailReadImap',
+	icon: 'fa:inbox',
+	group: ['trigger'],
+	description: 'Triggers the workflow when a new email is received',
+	defaultVersion: 2,
+	version: 1,
+	eventTriggerDescription: 'Waiting for you to receive an email',
+	defaults: { name: 'Email Trigger (IMAP)', color: '#44AA22' },
+	triggerPanel: {
+		header: '',
+		executionsHelp: {
+			inactive:
+				"<b>While building your workflow</b>, click the 'listen' button, then send an email to make an event happen. This will trigger an execution, which will show up in this editor.<br /> <br /><b>Once you're happy with your workflow</b>, <a data-key='activate'>activate</a> it. Then every time an email is received, the workflow will execute. These executions will show up in the <a data-key='executions'>executions list</a>, but not in the editor.",
+			active:
+				"<b>While building your workflow</b>, click the 'listen' button, then send an email to make an event happen. This will trigger an execution, which will show up in this editor.<br /> <br /><b>Your workflow will also execute automatically</b>, since it's activated. Every time an email is received, this node will trigger an execution. These executions will show up in the <a data-key='executions'>executions list</a>, but not in the editor.",
+		},
+		activationHint:
+			"Once you’ve finished building your workflow, <a data-key='activate'>activate</a> it to have it also listen continuously (you just won’t see those executions here).",
+	},
+	inputs: [],
+	outputs: ['main'],
+	credentials: [{ name: 'imap', required: true, testedBy: 'imapConnectionTest' }],
+	properties: [
+		{ displayName: 'Mailbox Name', name: 'mailbox', type: 'string', default: 'INBOX' },
+		{
+			displayName: 'Action',
+			name: 'postProcessAction',
+			type: 'options',
+			options: [
+				{ name: 'Mark as Read', value: 'read' },
+				{ name: 'Nothing', value: 'nothing' },
+			],
+			default: 'read',
+			description:
+				'What to do after the email has been received. If "nothing" gets selected it will be processed multiple times.',
+		},
+		{
+			displayName: 'Download Attachments',
+			name: 'downloadAttachments',
+			type: 'boolean',
+			default: false,
+			displayOptions: { show: { format: ['simple'] } },
+			description:
+				'Whether attachments of emails should be downloaded. Only set if needed as it increases processing.',
+		},
+		{
+			displayName: 'Format',
+			name: 'format',
+			type: 'options',
+			options: [
+				{
+					name: 'RAW',
+					value: 'raw',
+					description:
+						'Returns the full email message data with body content in the raw field as a base64url encoded string; the payload field is not used',
+				},
+				{
+					name: 'Resolved',
+					value: 'resolved',
+					description:
+						'Returns the full email with all data resolved and attachments saved as binary data',
+				},
+				{
+					name: 'Simple',
+					value: 'simple',
+					description:
+						'Returns the full email; do not use if you wish to gather inline attachments',
+				},
+			],
+			default: 'simple',
+			description: 'The format to return the message in',
+		},
+		{
+			displayName: 'Property Prefix Name',
+			name: 'dataPropertyAttachmentsPrefixName',
+			type: 'string',
+			default: 'attachment_',
+			displayOptions: { show: { format: ['resolved'] } },
+			description:
+				'Prefix for name of the binary property to which to write the attachments. An index starting with 0 will be added. So if name is "attachment_" the first attachment is saved to "attachment_0"',
+		},
+		{
+			displayName: 'Property Prefix Name',
+			name: 'dataPropertyAttachmentsPrefixName',
+			type: 'string',
+			default: 'attachment_',
+			displayOptions: { show: { format: ['simple'], downloadAttachments: [true] } },
+			description:
+				'Prefix for name of the binary property to which to write the attachments. An index starting with 0 will be added. So if name is "attachment_" the first attachment is saved to "attachment_0"',
+		},
+		{
+			displayName: 'Options',
+			name: 'options',
+			type: 'collection',
+			placeholder: 'Add Option',
+			default: {},
+			options: [
+				{
+					displayName: 'Custom Email Rules',
+					name: 'customEmailConfig',
+					type: 'string',
+					default: '["UNSEEN"]',
+					description:
+						'Custom email fetching rules. See <a href="https://github.com/mscdex/node-imap">node-imap</a>\'s search function for more details.',
+				},
+				{
+					displayName: 'Ignore SSL Issues',
+					name: 'allowUnauthorizedCerts',
+					type: 'boolean',
+					default: false,
+					description: 'Whether to connect even if SSL certificate validation is not possible',
+				},
+				{
+					displayName: 'Force Reconnect',
+					name: 'forceReconnect',
+					type: 'number',
+					default: 60,
+					description: 'Sets an interval (in minutes) to force a reconnection',
+				},
+			],
+		},
+	],
+	codex: {
+		categories: ['Communication', 'Core Nodes'],
+		subcategories: { 'Core Nodes': ['Other Trigger Nodes'] },
+		resources: {
+			primaryDocumentation: [
+				{
+					url: 'https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.emailimap/',
+				},
+			],
+			credentialDocumentation: [{ url: 'https://docs.n8n.io/credentials/imap' }],
+		},
+	},
+} satisfies INodeTypeDescription;
+
+export const nodeTypeReadImapV2 = {
+	displayName: 'Email Trigger (IMAP)',
+	name: 'n8n-nodes-base.emailReadImap',
+	icon: 'fa:inbox',
+	group: ['trigger'],
+	description: 'Triggers the workflow when a new email is received',
+	defaultVersion: 2,
+	version: 2,
+	eventTriggerDescription: 'Waiting for you to receive an email',
+	defaults: { name: 'Email Trigger (IMAP)', color: '#44AA22' },
+	triggerPanel: {
+		header: '',
+		executionsHelp: {
+			inactive:
+				"<b>While building your workflow</b>, click the 'listen' button, then send an email to make an event happen. This will trigger an execution, which will show up in this editor.<br /> <br /><b>Once you're happy with your workflow</b>, <a data-key='activate'>activate</a> it. Then every time an email is received, the workflow will execute. These executions will show up in the <a data-key='executions'>executions list</a>, but not in the editor.",
+			active:
+				"<b>While building your workflow</b>, click the 'listen' button, then send an email to make an event happen. This will trigger an execution, which will show up in this editor.<br /> <br /><b>Your workflow will also execute automatically</b>, since it's activated. Every time an email is received, this node will trigger an execution. These executions will show up in the <a data-key='executions'>executions list</a>, but not in the editor.",
+		},
+		activationHint:
+			"Once you’ve finished building your workflow, <a data-key='activate'>activate</a> it to have it also listen continuously (you just won’t see those executions here).",
+	},
+	inputs: [],
+	outputs: ['main'],
+	credentials: [{ name: 'imap', required: true, testedBy: 'imapConnectionTest' }],
+	properties: [
+		{ displayName: 'Mailbox Name', name: 'mailbox', type: 'string', default: 'INBOX' },
+		{
+			displayName: 'Action',
+			name: 'postProcessAction',
+			type: 'options',
+			options: [
+				{ name: 'Mark as Read', value: 'read' },
+				{ name: 'Nothing', value: 'nothing' },
+			],
+			default: 'read',
+			description:
+				'What to do after the email has been received. If "nothing" gets selected it will be processed multiple times.',
+		},
+		{
+			displayName: 'Download Attachments',
+			name: 'downloadAttachments',
+			type: 'boolean',
+			default: false,
+			displayOptions: { show: { format: ['simple'] } },
+			description:
+				'Whether attachments of emails should be downloaded. Only set if needed as it increases processing.',
+		},
+		{
+			displayName: 'Format',
+			name: 'format',
+			type: 'options',
+			options: [
+				{
+					name: 'RAW',
+					value: 'raw',
+					description:
+						'Returns the full email message data with body content in the raw field as a base64url encoded string; the payload field is not used',
+				},
+				{
+					name: 'Resolved',
+					value: 'resolved',
+					description:
+						'Returns the full email with all data resolved and attachments saved as binary data',
+				},
+				{
+					name: 'Simple',
+					value: 'simple',
+					description:
+						'Returns the full email; do not use if you wish to gather inline attachments',
+				},
+			],
+			default: 'simple',
+			description: 'The format to return the message in',
+		},
+		{
+			displayName: 'Property Prefix Name',
+			name: 'dataPropertyAttachmentsPrefixName',
+			type: 'string',
+			default: 'attachment_',
+			displayOptions: { show: { format: ['resolved'] } },
+			description:
+				'Prefix for name of the binary property to which to write the attachments. An index starting with 0 will be added. So if name is "attachment_" the first attachment is saved to "attachment_0"',
+		},
+		{
+			displayName: 'Property Prefix Name',
+			name: 'dataPropertyAttachmentsPrefixName',
+			type: 'string',
+			default: 'attachment_',
+			displayOptions: { show: { format: ['simple'], downloadAttachments: [true] } },
+			description:
+				'Prefix for name of the binary property to which to write the attachments. An index starting with 0 will be added. So if name is "attachment_" the first attachment is saved to "attachment_0"',
+		},
+		{
+			displayName: 'Options',
+			name: 'options',
+			type: 'collection',
+			placeholder: 'Add Option',
+			default: {},
+			options: [
+				{
+					displayName: 'Custom Email Rules',
+					name: 'customEmailConfig',
+					type: 'string',
+					default: '["UNSEEN"]',
+					description:
+						'Custom email fetching rules. See <a href="https://github.com/mscdex/node-imap">node-imap</a>\'s search function for more details.',
+				},
+				{
+					displayName: 'Force Reconnect Every Minutes',
+					name: 'forceReconnect',
+					type: 'number',
+					default: 60,
+					description: 'Sets an interval (in minutes) to force a reconnection',
+				},
+			],
+		},
+	],
+	codex: {
+		categories: ['Communication', 'Core Nodes'],
+		subcategories: { 'Core Nodes': ['Other Trigger Nodes'] },
+		resources: {
+			primaryDocumentation: [
+				{
+					url: 'https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.emailimap/',
+				},
+			],
+			credentialDocumentation: [{ url: 'https://docs.n8n.io/credentials/imap' }],
+		},
+	},
+} satisfies INodeTypeDescription;
+
+export const nodeTypeNextCloudV1 = {
+	displayName: 'Nextcloud',
+	name: 'n8n-nodes-base.nextCloud',
+	group: ['input'],
+	version: 1,
+	subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+	description: 'Access data on Nextcloud',
+	defaults: { name: 'Nextcloud' },
+	inputs: ['main'],
+	outputs: ['main'],
+	credentials: [
+		{
+			name: 'nextCloudApi',
+			required: true,
+			displayOptions: { show: { authentication: ['accessToken'] } },
+		},
+		{
+			name: 'nextCloudOAuth2Api',
+			required: true,
+			displayOptions: { show: { authentication: ['oAuth2'] } },
+		},
+	],
+	properties: [
+		{
+			displayName: 'Authentication',
+			name: 'authentication',
+			type: 'options',
+			options: [
+				{ name: 'Access Token', value: 'accessToken' },
+				{ name: 'OAuth2', value: 'oAuth2' },
+			],
+			default: 'accessToken',
+		},
+		{
+			displayName: 'Resource',
+			name: 'resource',
+			type: 'options',
+			noDataExpression: true,
+			options: [
+				{ name: 'File', value: 'file' },
+				{ name: 'Folder', value: 'folder' },
+				{ name: 'User', value: 'user' },
+				{ name: 'Custom API Call', value: '__CUSTOM_API_CALL__' },
+			],
+			default: 'file',
+		},
+		{
+			displayName: 'Operation',
+			name: 'operation',
+			type: 'options',
+			noDataExpression: true,
+			displayOptions: { show: { resource: ['file'] } },
+			options: [
+				{ name: 'Copy', value: 'copy', description: 'Copy a file', action: 'Copy a file' },
+				{
+					name: 'Delete',
+					value: 'delete',
+					description: 'Delete a file',
+					action: 'Delete a file',
+				},
+				{
+					name: 'Download',
+					value: 'download',
+					description: 'Download a file',
+					action: 'Download a file',
+				},
+				{ name: 'Move', value: 'move', description: 'Move a file', action: 'Move a file' },
+				{ name: 'Share', value: 'share', description: 'Share a file', action: 'Share a file' },
+				{
+					name: 'Upload',
+					value: 'upload',
+					description: 'Upload a file',
+					action: 'Upload a file',
+				},
+				{ name: 'Custom API Call', value: '__CUSTOM_API_CALL__' },
+			],
+			default: 'upload',
+		},
+		{
+			displayName: 'Operation',
+			name: 'operation',
+			type: 'options',
+			noDataExpression: true,
+			displayOptions: { show: { resource: ['folder'] } },
+			options: [
+				{ name: 'Copy', value: 'copy', description: 'Copy a folder', action: 'Copy a folder' },
+				{
+					name: 'Create',
+					value: 'create',
+					description: 'Create a folder',
+					action: 'Create a folder',
+				},
+				{
+					name: 'Delete',
+					value: 'delete',
+					description: 'Delete a folder',
+					action: 'Delete a folder',
+				},
+				{
+					name: 'List',
+					value: 'list',
+					description: 'Return the contents of a given folder',
+					action: 'List a folder',
+				},
+				{ name: 'Move', value: 'move', description: 'Move a folder', action: 'Move a folder' },
+				{
+					name: 'Share',
+					value: 'share',
+					description: 'Share a folder',
+					action: 'Share a folder',
+				},
+				{ name: 'Custom API Call', value: '__CUSTOM_API_CALL__' },
+			],
+			default: 'create',
+		},
+		{
+			displayName: 'Operation',
+			name: 'operation',
+			type: 'options',
+			noDataExpression: true,
+			displayOptions: { show: { resource: ['user'] } },
+			options: [
+				{
+					name: 'Create',
+					value: 'create',
+					description: 'Invite a user to a NextCloud organization',
+					action: 'Create a user',
+				},
+				{
+					name: 'Delete',
+					value: 'delete',
+					description: 'Delete a user',
+					action: 'Delete a user',
+				},
+				{
+					name: 'Get',
+					value: 'get',
+					description: 'Retrieve information about a single user',
+					action: 'Get a user',
+				},
+				{
+					name: 'Get Many',
+					value: 'getAll',
+					description: 'Retrieve a list of users',
+					action: 'Get many users',
+				},
+				{
+					name: 'Update',
+					value: 'update',
+					description: 'Edit attributes related to a user',
+					action: 'Update a user',
+				},
+				{ name: 'Custom API Call', value: '__CUSTOM_API_CALL__' },
+			],
+			default: 'create',
+		},
+		{
+			displayName: 'From Path',
+			name: 'path',
+			type: 'string',
+			default: '',
+			required: true,
+			displayOptions: { show: { operation: ['copy'], resource: ['file', 'folder'] } },
+			placeholder: '/invoices/original.txt',
+			description: 'The path of file or folder to copy. The path should start with "/".',
+		},
+		{
+			displayName: 'To Path',
+			name: 'toPath',
+			type: 'string',
+			default: '',
+			required: true,
+			displayOptions: { show: { operation: ['copy'], resource: ['file', 'folder'] } },
+			placeholder: '/invoices/copy.txt',
+			description: 'The destination path of file or folder. The path should start with "/".',
+		},
+		{
+			displayName: 'Delete Path',
+			name: 'path',
+			type: 'string',
+			default: '',
+			required: true,
+			displayOptions: { show: { operation: ['delete'], resource: ['file', 'folder'] } },
+			placeholder: '/invoices/2019/invoice_1.pdf',
+			description:
+				'The path to delete. Can be a single file or a whole folder. The path should start with "/".',
+		},
+		{
+			displayName: 'From Path',
+			name: 'path',
+			type: 'string',
+			default: '',
+			required: true,
+			displayOptions: { show: { operation: ['move'], resource: ['file', 'folder'] } },
+			placeholder: '/invoices/old_name.txt',
+			description: 'The path of file or folder to move. The path should start with "/".',
+		},
+		{
+			displayName: 'To Path',
+			name: 'toPath',
+			type: 'string',
+			default: '',
+			required: true,
+			displayOptions: { show: { operation: ['move'], resource: ['file', 'folder'] } },
+			placeholder: '/invoices/new_name.txt',
+			description: 'The new path of file or folder. The path should start with "/".',
+		},
+		{
+			displayName: 'File Path',
+			name: 'path',
+			type: 'string',
+			default: '',
+			required: true,
+			displayOptions: { show: { operation: ['download'], resource: ['file'] } },
+			placeholder: '/invoices/2019/invoice_1.pdf',
+			description:
+				'The file path of the file to download. Has to contain the full path. The path should start with "/".',
+		},
+		{
+			displayName: 'Binary Property',
+			name: 'binaryPropertyName',
+			type: 'string',
+			default: 'data',
+			required: true,
+			displayOptions: { show: { operation: ['download'], resource: ['file'] } },
+			description: 'Name of the binary property to which to write the data of the read file',
+		},
+		{
+			displayName: 'File Path',
+			name: 'path',
+			type: 'string',
+			default: '',
+			required: true,
+			displayOptions: { show: { operation: ['upload'], resource: ['file'] } },
+			placeholder: '/invoices/2019/invoice_1.pdf',
+			description:
+				'The absolute file path of the file to upload. Has to contain the full path. The parent folder has to exist. Existing files get overwritten.',
+		},
+		{
+			displayName: 'Binary Data',
+			name: 'binaryDataUpload',
+			type: 'boolean',
+			default: false,
+			required: true,
+			displayOptions: { show: { operation: ['upload'], resource: ['file'] } },
+		},
+		{
+			displayName: 'File Content',
+			name: 'fileContent',
+			type: 'string',
+			default: '',
+			displayOptions: {
+				show: { binaryDataUpload: [false], operation: ['upload'], resource: ['file'] },
+			},
+			placeholder: '',
+			description: 'The text content of the file to upload',
+		},
+		{
+			displayName: 'Binary Property',
+			name: 'binaryPropertyName',
+			type: 'string',
+			default: 'data',
+			required: true,
+			displayOptions: {
+				show: { binaryDataUpload: [true], operation: ['upload'], resource: ['file'] },
+			},
+			placeholder: '',
+			description:
+				'Name of the binary property which contains the data for the file to be uploaded',
+		},
+		{
+			displayName: 'File Path',
+			name: 'path',
+			type: 'string',
+			default: '',
+			required: true,
+			displayOptions: { show: { operation: ['share'], resource: ['file', 'folder'] } },
+			placeholder: '/invoices/2019/invoice_1.pdf',
+			description:
+				'The file path of the file to share. Has to contain the full path. The path should start with "/".',
+		},
+		{
+			displayName: 'Share Type',
+			name: 'shareType',
+			type: 'options',
+			displayOptions: { show: { operation: ['share'], resource: ['file', 'folder'] } },
+			options: [
+				{ name: 'Circle', value: 7 },
+				{ name: 'Email', value: 4 },
+				{ name: 'Group', value: 1 },
+				{ name: 'Public Link', value: 3 },
+				{ name: 'User', value: 0 },
+			],
+			default: 0,
+			description: 'The share permissions to set',
+		},
+		{
+			displayName: 'Circle ID',
+			name: 'circleId',
+			type: 'string',
+			displayOptions: {
+				show: { resource: ['file', 'folder'], operation: ['share'], shareType: [7] },
+			},
+			default: '',
+			description: 'The ID of the circle to share with',
+		},
+		{
+			displayName: 'Email',
+			name: 'email',
+			type: 'string',
+			placeholder: 'name@email.com',
+			displayOptions: {
+				show: { resource: ['file', 'folder'], operation: ['share'], shareType: [4] },
+			},
+			default: '',
+			description: 'The Email address to share with',
+		},
+		{
+			displayName: 'Group ID',
+			name: 'groupId',
+			type: 'string',
+			displayOptions: {
+				show: { resource: ['file', 'folder'], operation: ['share'], shareType: [1] },
+			},
+			default: '',
+			description: 'The ID of the group to share with',
+		},
+		{
+			displayName: 'User',
+			name: 'user',
+			type: 'string',
+			displayOptions: {
+				show: { resource: ['file', 'folder'], operation: ['share'], shareType: [0] },
+			},
+			default: '',
+			description: 'The user to share with',
+		},
+		{
+			displayName: 'Options',
+			name: 'options',
+			type: 'collection',
+			placeholder: 'Add Option',
+			default: {},
+			displayOptions: { show: { resource: ['file', 'folder'], operation: ['share'] } },
+			options: [
+				{
+					displayName: 'Password',
+					name: 'password',
+					type: 'string',
+					typeOptions: { password: true },
+					displayOptions: {
+						show: { '/resource': ['file', 'folder'], '/operation': ['share'], '/shareType': [3] },
+					},
+					default: '',
+					description: 'Optional search string',
+				},
+				{
+					displayName: 'Permissions',
+					name: 'permissions',
+					type: 'options',
+					options: [
+						{ name: 'All', value: 31 },
+						{ name: 'Create', value: 4 },
+						{ name: 'Delete', value: 8 },
+						{ name: 'Read', value: 1 },
+						{ name: 'Update', value: 2 },
+					],
+					default: 1,
+					description: 'The share permissions to set',
+				},
+			],
+		},
+		{
+			displayName: 'Folder',
+			name: 'path',
+			type: 'string',
+			default: '',
+			required: true,
+			displayOptions: { show: { operation: ['create'], resource: ['folder'] } },
+			placeholder: '/invoices/2019',
+			description:
+				'The folder to create. The parent folder has to exist. The path should start with "/".',
+		},
+		{
+			displayName: 'Folder Path',
+			name: 'path',
+			type: 'string',
+			default: '',
+			displayOptions: { show: { operation: ['list'], resource: ['folder'] } },
+			placeholder: '/invoices/2019/',
+			description: 'The path of which to list the content. The path should start with "/".',
+		},
+		{
+			displayName: 'Username',
+			name: 'userId',
+			type: 'string',
+			default: '',
+			required: true,
+			displayOptions: { show: { resource: ['user'], operation: ['create'] } },
+			placeholder: 'john',
+			description: 'Username the user will have',
+		},
+		{
+			displayName: 'Email',
+			name: 'email',
+			type: 'string',
+			default: '',
+			required: true,
+			displayOptions: { show: { resource: ['user'], operation: ['create'] } },
+			placeholder: 'john@email.com',
+			description: 'The email of the user to invite',
+		},
+		{
+			displayName: 'Additional Fields',
+			name: 'additionalFields',
+			type: 'collection',
+			placeholder: 'Add Field',
+			default: {},
+			displayOptions: { show: { resource: ['user'], operation: ['create'] } },
+			options: [
+				{
+					displayName: 'Display Name',
+					name: 'displayName',
+					type: 'string',
+					default: '',
+					description: 'The display name of the user to invite',
+				},
+			],
+		},
+		{
+			displayName: 'Username',
+			name: 'userId',
+			type: 'string',
+			default: '',
+			required: true,
+			displayOptions: { show: { resource: ['user'], operation: ['delete', 'get', 'update'] } },
+			placeholder: 'john',
+			description: 'Username the user will have',
+		},
+		{
+			displayName: 'Return All',
+			name: 'returnAll',
+			type: 'boolean',
+			displayOptions: { show: { resource: ['user'], 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: ['user'], operation: ['getAll'], returnAll: [false] } },
+			typeOptions: { minValue: 1, maxValue: 100 },
+			default: 50,
+			description: 'Max number of results to return',
+		},
+		{
+			displayName: 'Options',
+			name: 'options',
+			type: 'collection',
+			placeholder: 'Add Option',
+			default: {},
+			displayOptions: { show: { resource: ['user'], operation: ['getAll'] } },
+			options: [
+				{
+					displayName: 'Search',
+					name: 'search',
+					type: 'string',
+					default: '',
+					description: 'Optional search string',
+				},
+				{
+					displayName: 'Offset',
+					name: 'offset',
+					type: 'number',
+					default: '',
+					description: 'Optional offset value',
+				},
+			],
+		},
+		{
+			displayName: 'Update Fields',
+			name: 'updateFields',
+			type: 'fixedCollection',
+			typeOptions: { multipleValues: false },
+			placeholder: 'Add Option',
+			default: {},
+			displayOptions: { show: { resource: ['user'], operation: ['update'] } },
+			options: [
+				{
+					displayName: 'Fields',
+					name: 'field',
+					values: [
+						{
+							displayName: 'Key',
+							name: 'key',
+							type: 'options',
+							default: 'email',
+							options: [
+								{
+									name: 'Address',
+									value: 'address',
+									description: 'The new address for the user',
+								},
+								{
+									name: 'Display Name',
+									value: 'displayname',
+									description: 'The new display name for the user',
+								},
+								{ name: 'Email', value: 'email', description: 'The new email for the user' },
+								{
+									name: 'Password',
+									value: 'password',
+									description: 'The new password for the user',
+								},
+								{
+									name: 'Twitter',
+									value: 'twitter',
+									description: 'The new twitter handle for the user',
+								},
+								{
+									name: 'Website',
+									value: 'website',
+									description: 'The new website for the user',
+								},
+							],
+							description: 'Key of the updated attribute',
+						},
+						{
+							displayName: 'Value',
+							name: 'value',
+							type: 'string',
+							default: '',
+							description: 'Value of the updated attribute',
+						},
+					],
+				},
+			],
+		},
+	],
+	codex: {
+		categories: ['Data & Storage'],
+		resources: {
+			primaryDocumentation: [
+				{ url: 'https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.nextcloud/' },
+			],
+			credentialDocumentation: [{ url: 'https://docs.n8n.io/credentials/nextCloud' }],
+		},
+	},
+	iconUrl: 'icons/n8n-nodes-base/dist/nodes/NextCloud/nextcloud.svg',
+} satisfies INodeTypeDescription;
+
+export const nodeTypeTelegramV1 = {
+	displayName: 'Telegram',
+	name: 'n8n-nodes-base.telegram',
+	group: ['output'],
+	version: [1, 1.1],
+	subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+	description: 'Sends data to Telegram',
+	defaults: { name: 'Telegram' },
+	inputs: ['main'],
+	outputs: ['main'],
+	credentials: [{ name: 'telegramApi', required: true }],
+	properties: [
+		{
+			displayName: 'Resource',
+			name: 'resource',
+			type: 'options',
+			noDataExpression: true,
+			options: [
+				{ name: 'Chat', value: 'chat' },
+				{ name: 'Callback', value: 'callback' },
+				{ name: 'File', value: 'file' },
+				{ name: 'Message', value: 'message' },
+			],
+			default: 'message',
+		},
+		{
+			displayName: 'Operation',
+			name: 'operation',
+			type: 'options',
+			noDataExpression: true,
+			displayOptions: { show: { resource: ['chat'] } },
+			options: [
+				{
+					name: 'Get',
+					value: 'get',
+					description: 'Get up to date information about a chat',
+					action: 'Get a chat',
+				},
+				{
+					name: 'Get Administrators',
+					value: 'administrators',
+					description: 'Get the Administrators of a chat',
+					action: 'Get all administrators in a chat',
+				},
+				{
+					name: 'Get Member',
+					value: 'member',
+					description: 'Get the member of a chat',
+					action: 'Get a member in a chat',
+				},
+				{
+					name: 'Leave',
+					value: 'leave',
+					description: 'Leave a group, supergroup or channel',
+					action: 'Leave a chat',
+				},
+				{
+					name: 'Set Description',
+					value: 'setDescription',
+					description: 'Set the description of a chat',
+					action: 'Set description on a chat',
+				},
+				{
+					name: 'Set Title',
+					value: 'setTitle',
+					description: 'Set the title of a chat',
+					action: 'Set a title on a chat',
+				},
+			],
+			default: 'get',
+		},
+		{
+			displayName: 'Operation',
+			name: 'operation',
+			type: 'options',
+			noDataExpression: true,
+			displayOptions: { show: { resource: ['callback'] } },
+			options: [
+				{
+					name: 'Answer Query',
+					value: 'answerQuery',
+					description: 'Send answer to callback query sent from inline keyboard',
+					action: 'Answer Query a callback',
+				},
+				{
+					name: 'Answer Inline Query',
+					value: 'answerInlineQuery',
+					description: 'Send answer to callback query sent from inline bot',
+					action: 'Answer an inline query callback',
+				},
+			],
+			default: 'answerQuery',
+		},
+		{
+			displayName: 'Operation',
+			name: 'operation',
+			type: 'options',
+			noDataExpression: true,
+			displayOptions: { show: { resource: ['file'] } },
+			options: [{ name: 'Get', value: 'get', description: 'Get a file', action: 'Get a file' }],
+			default: 'get',
+		},
+		{
+			displayName: 'Operation',
+			name: 'operation',
+			type: 'options',
+			noDataExpression: true,
+			displayOptions: { show: { resource: ['message'] } },
+			options: [
+				{
+					name: 'Delete Chat Message',
+					value: 'deleteMessage',
+					description: 'Delete a chat message',
+					action: 'Delete a chat message',
+				},
+				{
+					name: 'Edit Message Text',
+					value: 'editMessageText',
+					description: 'Edit a text message',
+					action: 'Edit a test message',
+				},
+				{
+					name: 'Pin Chat Message',
+					value: 'pinChatMessage',
+					description: 'Pin a chat message',
+					action: 'Pin a chat message',
+				},
+				{
+					name: 'Send Animation',
+					value: 'sendAnimation',
+					description: 'Send an animated file',
+					action: 'Send an animated file',
+				},
+				{
+					name: 'Send Audio',
+					value: 'sendAudio',
+					description: 'Send a audio file',
+					action: 'Send an audio file',
+				},
+				{
+					name: 'Send Chat Action',
+					value: 'sendChatAction',
+					description: 'Send a chat action',
+					action: 'Send a chat action',
+				},
+				{
+					name: 'Send Document',
+					value: 'sendDocument',
+					description: 'Send a document',
+					action: 'Send a document',
+				},
+				{
+					name: 'Send Location',
+					value: 'sendLocation',
+					description: 'Send a location',
+					action: 'Send a location',
+				},
+				{
+					name: 'Send Media Group',
+					value: 'sendMediaGroup',
+					description: 'Send group of photos or videos to album',
+					action: 'Send a media group message',
+				},
+				{
+					name: 'Send Message',
+					value: 'sendMessage',
+					description: 'Send a text message',
+					action: 'Send a text message',
+				},
+				{
+					name: 'Send Photo',
+					value: 'sendPhoto',
+					description: 'Send a photo',
+					action: 'Send a photo message',
+				},
+				{
+					name: 'Send Sticker',
+					value: 'sendSticker',
+					description: 'Send a sticker',
+					action: 'Send a sticker',
+				},
+				{
+					name: 'Send Video',
+					value: 'sendVideo',
+					description: 'Send a video',
+					action: 'Send a video',
+				},
+				{
+					name: 'Unpin Chat Message',
+					value: 'unpinChatMessage',
+					description: 'Unpin a chat message',
+					action: 'Unpin a chat message',
+				},
+			],
+			default: 'sendMessage',
+		},
+		{
+			displayName: 'Chat ID',
+			name: 'chatId',
+			type: 'string',
+			default: '',
+			displayOptions: {
+				show: {
+					operation: [
+						'administrators',
+						'deleteMessage',
+						'get',
+						'leave',
+						'member',
+						'pinChatMessage',
+						'setDescription',
+						'setTitle',
+						'sendAnimation',
+						'sendAudio',
+						'sendChatAction',
+						'sendDocument',
+						'sendLocation',
+						'sendMessage',
+						'sendMediaGroup',
+						'sendPhoto',
+						'sendSticker',
+						'sendVideo',
+						'unpinChatMessage',
+					],
+					resource: ['chat', 'message'],
+				},
+			},
+			required: true,
+			description:
+				'Unique identifier for the target chat or username of the target channel (in the format @channelusername)',
+		},
+		{
+			displayName: 'Message ID',
+			name: 'messageId',
+			type: 'string',
+			default: '',
+			displayOptions: { show: { operation: ['deleteMessage'], resource: ['message'] } },
+			required: true,
+			description: 'Unique identifier of the message to delete',
+		},
+		{
+			displayName: 'Message ID',
+			name: 'messageId',
+			type: 'string',
+			default: '',
+			displayOptions: {
+				show: { operation: ['pinChatMessage', 'unpinChatMessage'], resource: ['message'] },
+			},
+			required: true,
+			description: 'Unique identifier of the message to pin or unpin',
+		},
+		{
+			displayName: 'Additional Fields',
+			name: 'additionalFields',
+			type: 'collection',
+			placeholder: 'Add Field',
+			displayOptions: { show: { operation: ['pinChatMessage'], resource: ['message'] } },
+			default: {},
+			options: [
+				{
+					displayName: 'Disable Notification',
+					name: 'disable_notification',
+					type: 'boolean',
+					default: false,
+					description:
+						'Whether to send a notification to all chat members about the new pinned message',
+				},
+			],
+		},
+		{
+			displayName: 'User ID',
+			name: 'userId',
+			type: 'string',
+			default: '',
+			displayOptions: { show: { operation: ['member'], resource: ['chat'] } },
+			required: true,
+			description: 'Unique identifier of the target user',
+		},
+		{
+			displayName: 'Description',
+			name: 'description',
+			type: 'string',
+			default: '',
+			displayOptions: { show: { operation: ['setDescription'], resource: ['chat'] } },
+			required: true,
+			description: 'New chat description, 0-255 characters',
+		},
+		{
+			displayName: 'Title',
+			name: 'title',
+			type: 'string',
+			default: '',
+			displayOptions: { show: { operation: ['setTitle'], resource: ['chat'] } },
+			required: true,
+			description: 'New chat title, 1-255 characters',
+		},
+		{
+			displayName: 'Query ID',
+			name: 'queryId',
+			type: 'string',
+			default: '',
+			displayOptions: { show: { operation: ['answerQuery'], resource: ['callback'] } },
+			required: true,
+			description: 'Unique identifier for the query to be answered',
+		},
+		{
+			displayName: 'Additional Fields',
+			name: 'additionalFields',
+			type: 'collection',
+			placeholder: 'Add Field',
+			displayOptions: { show: { operation: ['answerQuery'], resource: ['callback'] } },
+			default: {},
+			options: [
+				{
+					displayName: 'Cache Time',
+					name: 'cache_time',
+					type: 'number',
+					typeOptions: { minValue: 0 },
+					default: 0,
+					description:
+						'The maximum amount of time in seconds that the result of the callback query may be cached client-side',
+				},
+				{
+					displayName: 'Show Alert',
+					name: 'show_alert',
+					type: 'boolean',
+					default: false,
+					description:
+						'Whether an alert will be shown by the client instead of a notification at the top of the chat screen',
+				},
+				{
+					displayName: 'Text',
+					name: 'text',
+					type: 'string',
+					default: '',
+					description:
+						'Text of the notification. If not specified, nothing will be shown to the user, 0-200 characters.',
+				},
+				{
+					displayName: 'URL',
+					name: 'url',
+					type: 'string',
+					default: '',
+					description: "URL that will be opened by the user's client",
+				},
+			],
+		},
+		{
+			displayName: 'Query ID',
+			name: 'queryId',
+			type: 'string',
+			default: '',
+			displayOptions: { show: { operation: ['answerInlineQuery'], resource: ['callback'] } },
+			required: true,
+			description: 'Unique identifier for the answered query',
+		},
+		{
+			displayName: 'Results',
+			name: 'results',
+			type: 'string',
+			default: '',
+			displayOptions: { show: { operation: ['answerInlineQuery'], resource: ['callback'] } },
+			required: true,
+			description: 'A JSON-serialized array of results for the inline query',
+		},
+		{
+			displayName: 'Additional Fields',
+			name: 'additionalFields',
+			type: 'collection',
+			placeholder: 'Add Field',
+			displayOptions: { show: { operation: ['answerInlineQuery'], resource: ['callback'] } },
+			default: {},
+			options: [
+				{
+					displayName: 'Cache Time',
+					name: 'cache_time',
+					type: 'number',
+					typeOptions: { minValue: 0 },
+					default: 0,
+					description:
+						'The maximum amount of time in seconds that the result of the callback query may be cached client-side',
+				},
+				{
+					displayName: 'Show Alert',
+					name: 'show_alert',
+					type: 'boolean',
+					default: false,
+					description:
+						'Whether an alert will be shown by the client instead of a notification at the top of the chat screen',
+				},
+				{
+					displayName: 'Text',
+					name: 'text',
+					type: 'string',
+					default: '',
+					description:
+						'Text of the notification. If not specified, nothing will be shown to the user, 0-200 characters.',
+				},
+				{
+					displayName: 'URL',
+					name: 'url',
+					type: 'string',
+					default: '',
+					description: "URL that will be opened by the user's client",
+				},
+			],
+		},
+		{
+			displayName: 'File ID',
+			name: 'fileId',
+			type: 'string',
+			default: '',
+			displayOptions: { show: { operation: ['get'], resource: ['file'] } },
+			required: true,
+			description: 'The ID of the file',
+		},
+		{
+			displayName: 'Download',
+			name: 'download',
+			type: 'boolean',
+			displayOptions: { show: { operation: ['get'], resource: ['file'] } },
+			default: true,
+			description: 'Whether to download the file',
+		},
+		{
+			displayName: 'Message Type',
+			name: 'messageType',
+			type: 'options',
+			displayOptions: { show: { operation: ['editMessageText'], resource: ['message'] } },
+			options: [
+				{ name: 'Inline Message', value: 'inlineMessage' },
+				{ name: 'Message', value: 'message' },
+			],
+			default: 'message',
+			description: 'The type of the message to edit',
+		},
+		{
+			displayName: 'Chat ID',
+			name: 'chatId',
+			type: 'string',
+			default: '',
+			displayOptions: {
+				show: { messageType: ['message'], operation: ['editMessageText'], resource: ['message'] },
+			},
+			required: true,
+			description:
+				'Unique identifier for the target chat or username of the target channel (in the format @channelusername). To find your chat ID ask @get_id_bot.',
+		},
+		{
+			displayName: 'Binary Data',
+			name: 'binaryData',
+			type: 'boolean',
+			default: false,
+			required: true,
+			displayOptions: {
+				show: {
+					operation: [
+						'sendAnimation',
+						'sendAudio',
+						'sendDocument',
+						'sendPhoto',
+						'sendVideo',
+						'sendSticker',
+					],
+					resource: ['message'],
+				},
+			},
+			description: 'Whether the data to upload should be taken from binary field',
+		},
+		{
+			displayName: 'Binary Property',
+			name: 'binaryPropertyName',
+			type: 'string',
+			default: 'data',
+			required: true,
+			displayOptions: {
+				show: {
+					operation: [
+						'sendAnimation',
+						'sendAudio',
+						'sendDocument',
+						'sendPhoto',
+						'sendVideo',
+						'sendSticker',
+					],
+					resource: ['message'],
+					binaryData: [true],
+				},
+			},
+			placeholder: '',
+			description: 'Name of the binary property that contains the data to upload',
+		},
+		{
+			displayName: 'Message ID',
+			name: 'messageId',
+			type: 'string',
+			default: '',
+			displayOptions: {
+				show: { messageType: ['message'], operation: ['editMessageText'], resource: ['message'] },
+			},
+			required: true,
+			description: 'Unique identifier of the message to edit',
+		},
+		{
+			displayName: 'Inline Message ID',
+			name: 'inlineMessageId',
+			type: 'string',
+			default: '',
+			displayOptions: {
+				show: {
+					messageType: ['inlineMessage'],
+					operation: ['editMessageText'],
+					resource: ['message'],
+				},
+			},
+			required: true,
+			description: 'Unique identifier of the inline message to edit',
+		},
+		{
+			displayName: 'Reply Markup',
+			name: 'replyMarkup',
+			displayOptions: { show: { operation: ['editMessageText'], resource: ['message'] } },
+			type: 'options',
+			options: [
+				{ name: 'None', value: 'none' },
+				{ name: 'Inline Keyboard', value: 'inlineKeyboard' },
+			],
+			default: 'none',
+			description: 'Additional interface options',
+		},
+		{
+			displayName: 'Animation',
+			name: 'file',
+			type: 'string',
+			default: '',
+			displayOptions: {
+				show: { operation: ['sendAnimation'], resource: ['message'], binaryData: [false] },
+			},
+			description:
+				'Animation to send. Pass a file_id to send an animation that exists on the Telegram servers (recommended), an HTTP URL for Telegram to get an animation from the Internet.',
+		},
+		{
+			displayName: 'Audio',
+			name: 'file',
+			type: 'string',
+			default: '',
+			displayOptions: {
+				show: { operation: ['sendAudio'], resource: ['message'], binaryData: [false] },
+			},
+			description:
+				'Audio file to send. Pass a file_id to send a file that exists on the Telegram servers (recommended), an HTTP URL for Telegram to get a file from the Internet.',
+		},
+		{
+			displayName: 'Action',
+			name: 'action',
+			type: 'options',
+			displayOptions: { show: { operation: ['sendChatAction'], resource: ['message'] } },
+			options: [
+				{ name: 'Find Location', value: 'find_location', action: 'Find location' },
+				{ name: 'Record Audio', value: 'record_audio', action: 'Record audio' },
+				{ name: 'Record Video', value: 'record_video', action: 'Record video' },
+				{ name: 'Record Video Note', value: 'record_video_note', action: 'Record video note' },
+				{ name: 'Typing', value: 'typing', action: 'Typing a message' },
+				{ name: 'Upload Audio', value: 'upload_audio', action: 'Upload audio' },
+				{ name: 'Upload Document', value: 'upload_document', action: 'Upload document' },
+				{ name: 'Upload Photo', value: 'upload_photo', action: 'Upload photo' },
+				{ name: 'Upload Video', value: 'upload_video', action: 'Upload video' },
+				{ name: 'Upload Video Note', value: 'upload_video_note', action: 'Upload video note' },
+			],
+			default: 'typing',
+			description:
+				'Type of action to broadcast. Choose one, depending on what the user is about to receive. The status is set for 5 seconds or less (when a message arrives from your bot).',
+		},
+		{
+			displayName: 'Document',
+			name: 'file',
+			type: 'string',
+			default: '',
+			displayOptions: {
+				show: { operation: ['sendDocument'], resource: ['message'], binaryData: [false] },
+			},
+			description:
+				'Document to send. Pass a file_id to send a file that exists on the Telegram servers (recommended), an HTTP URL for Telegram to get a file from the Internet.',
+		},
+		{
+			displayName: 'Latitude',
+			name: 'latitude',
+			type: 'number',
+			default: 0,
+			typeOptions: { numberPrecision: 10, minValue: -90, maxValue: 90 },
+			displayOptions: { show: { operation: ['sendLocation'], resource: ['message'] } },
+			description: 'Location latitude',
+		},
+		{
+			displayName: 'Longitude',
+			name: 'longitude',
+			type: 'number',
+			typeOptions: { numberPrecision: 10, minValue: -180, maxValue: 180 },
+			default: 0,
+			displayOptions: { show: { operation: ['sendLocation'], resource: ['message'] } },
+			description: 'Location longitude',
+		},
+		{
+			displayName: 'Media',
+			name: 'media',
+			type: 'fixedCollection',
+			displayOptions: { show: { operation: ['sendMediaGroup'], resource: ['message'] } },
+			description: 'The media to add',
+			placeholder: 'Add Media',
+			typeOptions: { multipleValues: true },
+			default: {},
+			options: [
+				{
+					displayName: 'Media',
+					name: 'media',
+					values: [
+						{
+							displayName: 'Type',
+							name: 'type',
+							type: 'options',
+							options: [
+								{ name: 'Photo', value: 'photo' },
+								{ name: 'Video', value: 'video' },
+							],
+							default: 'photo',
+							description: 'The type of the media to add',
+						},
+						{
+							displayName: 'Media File',
+							name: 'media',
+							type: 'string',
+							default: '',
+							description:
+								'Media to send. Pass a file_id to send a file that exists on the Telegram servers (recommended) or pass an HTTP URL for Telegram to get a file from the Internet.',
+						},
+						{
+							displayName: 'Additional Fields',
+							name: 'additionalFields',
+							type: 'collection',
+							placeholder: 'Add Field',
+							default: {},
+							options: [
+								{
+									displayName: 'Caption',
+									name: 'caption',
+									type: 'string',
+									default: '',
+									description: 'Caption text to set, 0-1024 characters',
+								},
+								{
+									displayName: 'Parse Mode',
+									name: 'parse_mode',
+									type: 'options',
+									options: [
+										{ name: 'Markdown (Legacy)', value: 'Markdown' },
+										{ name: 'MarkdownV2', value: 'MarkdownV2' },
+										{ name: 'HTML', value: 'HTML' },
+									],
+									default: 'HTML',
+									description: 'How to parse the text',
+								},
+							],
+						},
+					],
+				},
+			],
+		},
+		{
+			displayName: 'Text',
+			name: 'text',
+			type: 'string',
+			required: true,
+			default: '',
+			displayOptions: {
+				show: { operation: ['editMessageText', 'sendMessage'], resource: ['message'] },
+			},
+			description: 'Text of the message to be sent',
+		},
+		{
+			displayName: 'Photo',
+			name: 'file',
+			type: 'string',
+			default: '',
+			displayOptions: {
+				show: { operation: ['sendPhoto'], resource: ['message'], binaryData: [false] },
+			},
+			description:
+				'Photo to send. Pass a file_id to send a photo that exists on the Telegram servers (recommended), an HTTP URL for Telegram to get a photo from the Internet.',
+		},
+		{
+			displayName: 'Sticker',
+			name: 'file',
+			type: 'string',
+			default: '',
+			displayOptions: {
+				show: { operation: ['sendSticker'], resource: ['message'], binaryData: [false] },
+			},
+			description:
+				'Sticker to send. Pass a file_id to send a file that exists on the Telegram servers (recommended), an HTTP URL for Telegram to get a .webp file from the Internet.',
+		},
+		{
+			displayName: 'Video',
+			name: 'file',
+			type: 'string',
+			default: '',
+			displayOptions: {
+				show: { operation: ['sendVideo'], resource: ['message'], binaryData: [false] },
+			},
+			description:
+				'Video file to send. Pass a file_id to send a file that exists on the Telegram servers (recommended), an HTTP URL for Telegram to get a file from the Internet.',
+		},
+		{
+			displayName: 'Reply Markup',
+			name: 'replyMarkup',
+			displayOptions: {
+				show: {
+					operation: [
+						'sendAnimation',
+						'sendDocument',
+						'sendMessage',
+						'sendPhoto',
+						'sendSticker',
+						'sendVideo',
+						'sendAudio',
+						'sendLocation',
+					],
+					resource: ['message'],
+				},
+			},
+			type: 'options',
+			options: [
+				{ name: 'Force Reply', value: 'forceReply' },
+				{ name: 'Inline Keyboard', value: 'inlineKeyboard' },
+				{ name: 'None', value: 'none' },
+				{ name: 'Reply Keyboard', value: 'replyKeyboard' },
+				{ name: 'Reply Keyboard Remove', value: 'replyKeyboardRemove' },
+			],
+			default: 'none',
+			description: 'Additional interface options',
+		},
+		{
+			displayName: 'Force Reply',
+			name: 'forceReply',
+			type: 'collection',
+			placeholder: 'Add Field',
+			displayOptions: { show: { replyMarkup: ['forceReply'], resource: ['message'] } },
+			default: {},
+			options: [
+				{
+					displayName: 'Force Reply',
+					name: 'force_reply',
+					type: 'boolean',
+					default: false,
+					description:
+						'Whether to show reply interface to the user, as if they manually selected the bot‘s message and tapped ’Reply',
+				},
+				{
+					displayName: 'Selective',
+					name: 'selective',
+					type: 'boolean',
+					default: false,
+					description: 'Whether to force reply from specific users only',
+				},
+			],
+		},
+		{
+			displayName: 'Inline Keyboard',
+			name: 'inlineKeyboard',
+			placeholder: 'Add Keyboard Row',
+			description: 'Adds an inline keyboard that appears right next to the message it belongs to',
+			type: 'fixedCollection',
+			typeOptions: { multipleValues: true },
+			displayOptions: { show: { replyMarkup: ['inlineKeyboard'], resource: ['message'] } },
+			default: {},
+			options: [
+				{
+					displayName: 'Rows',
+					name: 'rows',
+					values: [
+						{
+							displayName: 'Row',
+							name: 'row',
+							type: 'fixedCollection',
+							description: 'The value to set',
+							placeholder: 'Add Button',
+							typeOptions: { multipleValues: true },
+							default: {},
+							options: [
+								{
+									displayName: 'Buttons',
+									name: 'buttons',
+									values: [
+										{
+											displayName: 'Text',
+											name: 'text',
+											type: 'string',
+											default: '',
+											description: 'Label text on the button',
+										},
+										{
+											displayName: 'Additional Fields',
+											name: 'additionalFields',
+											type: 'collection',
+											placeholder: 'Add Field',
+											default: {},
+											options: [
+												{
+													displayName: 'Callback Data',
+													name: 'callback_data',
+													type: 'string',
+													default: '',
+													description:
+														'Data to be sent in a callback query to the bot when button is pressed, 1-64 bytes',
+												},
+												{
+													displayName: 'Pay',
+													name: 'pay',
+													type: 'boolean',
+													default: false,
+													description: 'Whether to send a Pay button',
+												},
+												{
+													displayName: 'Switch Inline Query Current Chat',
+													name: 'switch_inline_query_current_chat',
+													type: 'string',
+													default: '',
+													description:
+														"If set, pressing the button will insert the bot‘s username and the specified inline query in the current chat's input field.Can be empty, in which case only the bot’s username will be inserted",
+												},
+												{
+													displayName: 'Switch Inline Query',
+													name: 'switch_inline_query',
+													type: 'string',
+													default: '',
+													description:
+														'If set, pressing the button will prompt the user to select one of their chats, open that chat and insert the bot‘s username and the specified inline query in the input field. Can be empty, in which case just the bot’s username will be inserted.',
+												},
+												{
+													displayName: 'URL',
+													name: 'url',
+													type: 'string',
+													default: '',
+													description: 'HTTP or tg:// URL to be opened when button is pressed',
+												},
+											],
+										},
+									],
+								},
+							],
+						},
+					],
+				},
+			],
+		},
+		{
+			displayName: 'Reply Keyboard',
+			name: 'replyKeyboard',
+			placeholder: 'Add Reply Keyboard Row',
+			description: 'Adds a custom keyboard with reply options',
+			type: 'fixedCollection',
+			typeOptions: { multipleValues: true },
+			displayOptions: { show: { replyMarkup: ['replyKeyboard'] } },
+			default: {},
+			options: [
+				{
+					displayName: 'Rows',
+					name: 'rows',
+					values: [
+						{
+							displayName: 'Row',
+							name: 'row',
+							type: 'fixedCollection',
+							description: 'The value to set',
+							placeholder: 'Add Button',
+							typeOptions: { multipleValues: true },
+							default: {},
+							options: [
+								{
+									displayName: 'Buttons',
+									name: 'buttons',
+									values: [
+										{
+											displayName: 'Text',
+											name: 'text',
+											type: 'string',
+											default: '',
+											description:
+												'Text of the button. If none of the optional fields are used, it will be sent as a message when the button is pressed.',
+										},
+										{
+											displayName: 'Additional Fields',
+											name: 'additionalFields',
+											type: 'collection',
+											placeholder: 'Add Field',
+											default: {},
+											options: [
+												{
+													displayName: 'Request Contact',
+													name: 'request_contact',
+													type: 'boolean',
+													default: false,
+													description:
+														"Whether the user's phone number will be sent as a contact when the button is pressed.Available in private chats only",
+												},
+												{
+													displayName: 'Request Location',
+													name: 'request_location',
+													type: 'boolean',
+													default: false,
+													description: "Whether the user's request_location",
+												},
+											],
+										},
+									],
+								},
+							],
+						},
+					],
+				},
+			],
+		},
+		{
+			displayName: 'Reply Keyboard Options',
+			name: 'replyKeyboardOptions',
+			type: 'collection',
+			placeholder: 'Add Option',
+			displayOptions: { show: { replyMarkup: ['replyKeyboard'] } },
+			default: {},
+			options: [
+				{
+					displayName: 'Resize Keyboard',
+					name: 'resize_keyboard',
+					type: 'boolean',
+					default: false,
+					description:
+						'Whether to request clients to resize the keyboard vertically for optimal fit',
+				},
+				{
+					displayName: 'One Time Keyboard',
+					name: 'one_time_keyboard',
+					type: 'boolean',
+					default: false,
+					description: "Whether to request clients to hide the keyboard as soon as it's been used",
+				},
+				{
+					displayName: 'Selective',
+					name: 'selective',
+					type: 'boolean',
+					default: false,
+					description: 'Whether to show the keyboard to specific users only',
+				},
+			],
+		},
+		{
+			displayName: 'Reply Keyboard Remove',
+			name: 'replyKeyboardRemove',
+			type: 'collection',
+			placeholder: 'Add Field',
+			displayOptions: { show: { replyMarkup: ['replyKeyboardRemove'] } },
+			default: {},
+			options: [
+				{
+					displayName: 'Remove Keyboard',
+					name: 'remove_keyboard',
+					type: 'boolean',
+					default: false,
+					description: 'Whether to request clients to remove the custom keyboard',
+				},
+				{
+					displayName: 'Selective',
+					name: 'selective',
+					type: 'boolean',
+					default: false,
+					description: 'Whether to force reply from specific users only',
+				},
+			],
+		},
+		{
+			displayName: 'Additional Fields',
+			name: 'additionalFields',
+			type: 'collection',
+			placeholder: 'Add Field',
+			displayOptions: {
+				show: {
+					operation: [
+						'editMessageText',
+						'sendAnimation',
+						'sendAudio',
+						'sendDocument',
+						'sendLocation',
+						'sendMessage',
+						'sendMediaGroup',
+						'sendPhoto',
+						'sendSticker',
+						'sendVideo',
+					],
+					resource: ['message'],
+				},
+			},
+			default: {},
+			options: [
+				{
+					displayName: 'Append n8n Attribution',
+					name: 'appendAttribution',
+					type: 'boolean',
+					default: true,
+					description:
+						'Whether to include the phrase “This message was sent automatically with n8n” to the end of the message',
+					displayOptions: { show: { '/operation': ['sendMessage'] } },
+				},
+				{
+					displayName: 'Caption',
+					name: 'caption',
+					type: 'string',
+					displayOptions: {
+						show: {
+							'/operation': [
+								'sendAnimation',
+								'sendAudio',
+								'sendDocument',
+								'sendPhoto',
+								'sendVideo',
+							],
+						},
+					},
+					default: '',
+					description: 'Caption text to set, 0-1024 characters',
+				},
+				{
+					displayName: 'Disable Notification',
+					name: 'disable_notification',
+					type: 'boolean',
+					default: false,
+					displayOptions: { hide: { '/operation': ['editMessageText'] } },
+					description:
+						'Whether to send the message silently. Users will receive a notification with no sound.',
+				},
+				{
+					displayName: 'Disable WebPage Preview',
+					name: 'disable_web_page_preview',
+					type: 'boolean',
+					displayOptions: { show: { '/operation': ['editMessageText', 'sendMessage'] } },
+					default: false,
+					description: 'Whether to disable link previews for links in this message',
+				},
+				{
+					displayName: 'Duration',
+					name: 'duration',
+					type: 'number',
+					typeOptions: { minValue: 0 },
+					displayOptions: { show: { '/operation': ['sendAnimation', 'sendAudio', 'sendVideo'] } },
+					default: 0,
+					description: 'Duration of clip in seconds',
+				},
+				{
+					displayName: 'File Name',
+					name: 'fileName',
+					type: 'string',
+					default: '',
+					displayOptions: {
+						show: {
+							'/operation': [
+								'sendAnimation',
+								'sendAudio',
+								'sendDocument',
+								'sendPhoto',
+								'sendVideo',
+								'sendSticker',
+							],
+							'/resource': ['message'],
+							'/binaryData': [true],
+						},
+					},
+					placeholder: 'image.jpeg',
+				},
+				{
+					displayName: 'Height',
+					name: 'height',
+					type: 'number',
+					typeOptions: { minValue: 0 },
+					displayOptions: { show: { '/operation': ['sendAnimation', 'sendVideo'] } },
+					default: 0,
+					description: 'Height of the video',
+				},
+				{
+					displayName: 'Parse Mode',
+					name: 'parse_mode',
+					type: 'options',
+					options: [
+						{ name: 'Markdown (Legacy)', value: 'Markdown' },
+						{ name: 'MarkdownV2', value: 'MarkdownV2' },
+						{ name: 'HTML', value: 'HTML' },
+					],
+					displayOptions: {
+						show: {
+							'/operation': [
+								'editMessageText',
+								'sendAnimation',
+								'sendAudio',
+								'sendMessage',
+								'sendPhoto',
+								'sendVideo',
+								'sendDocument',
+							],
+						},
+					},
+					default: 'HTML',
+					description: 'How to parse the text',
+				},
+				{
+					displayName: 'Performer',
+					name: 'performer',
+					type: 'string',
+					displayOptions: { show: { '/operation': ['sendAudio'] } },
+					default: '',
+					description: 'Name of the performer',
+				},
+				{
+					displayName: 'Reply To Message ID',
+					name: 'reply_to_message_id',
+					type: 'number',
+					displayOptions: { hide: { '/operation': ['editMessageText'] } },
+					default: 0,
+					description: 'If the message is a reply, ID of the original message',
+				},
+				{
+					displayName: 'Message Thread ID',
+					name: 'message_thread_id',
+					type: 'number',
+					displayOptions: {
+						show: {
+							'/operation': [
+								'sendAnimation',
+								'sendAudio',
+								'sendChatAction',
+								'sendDocument',
+								'sendLocation',
+								'sendMediaGroup',
+								'sendMessage',
+								'sendPhoto',
+								'sendSticker',
+								'sendVideo',
+							],
+						},
+					},
+					default: 0,
+					description: 'The unique identifier of the forum topic',
+				},
+				{
+					displayName: 'Title',
+					name: 'title',
+					type: 'string',
+					displayOptions: { show: { '/operation': ['sendAudio'] } },
+					default: '',
+					description: 'Title of the track',
+				},
+				{
+					displayName: 'Thumbnail',
+					name: 'thumb',
+					type: 'string',
+					displayOptions: {
+						show: { '/operation': ['sendAnimation', 'sendAudio', 'sendDocument', 'sendVideo'] },
+					},
+					default: '',
+					description:
+						'Thumbnail of the file sent; can be ignored if thumbnail generation for the file is supported server-side. The thumbnail should be in JPEG format and less than 200 kB in size. A thumbnail‘s width and height should not exceed 320.',
+				},
+				{
+					displayName: 'Width',
+					name: 'width',
+					type: 'number',
+					typeOptions: { minValue: 0 },
+					displayOptions: { show: { '/operation': ['sendAnimation', 'sendVideo'] } },
+					default: 0,
+					description: 'Width of the video',
+				},
+			],
+		},
+	],
+	codex: {
+		categories: ['Communication'],
+		resources: {
+			primaryDocumentation: [
+				{ url: 'https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.telegram/' },
+			],
+			credentialDocumentation: [{ url: 'https://docs.n8n.io/credentials/telegram' }],
+		},
+	},
+	iconUrl: 'icons/n8n-nodes-base/dist/nodes/Telegram/telegram.svg',
+} satisfies INodeTypeDescription;
+
+export const nodeTypeTelegramV1_1 = {
+	displayName: 'Telegram',
+	name: 'n8n-nodes-base.telegram',
+	group: ['output'],
+	version: [1, 1.1],
+	subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+	description: 'Sends data to Telegram',
+	defaults: { name: 'Telegram' },
+	inputs: ['main'],
+	outputs: ['main'],
+	credentials: [{ name: 'telegramApi', required: true }],
+	properties: [
+		{
+			displayName: 'Resource',
+			name: 'resource',
+			type: 'options',
+			noDataExpression: true,
+			options: [
+				{ name: 'Chat', value: 'chat' },
+				{ name: 'Callback', value: 'callback' },
+				{ name: 'File', value: 'file' },
+				{ name: 'Message', value: 'message' },
+			],
+			default: 'message',
+		},
+		{
+			displayName: 'Operation',
+			name: 'operation',
+			type: 'options',
+			noDataExpression: true,
+			displayOptions: { show: { resource: ['chat'] } },
+			options: [
+				{
+					name: 'Get',
+					value: 'get',
+					description: 'Get up to date information about a chat',
+					action: 'Get a chat',
+				},
+				{
+					name: 'Get Administrators',
+					value: 'administrators',
+					description: 'Get the Administrators of a chat',
+					action: 'Get all administrators in a chat',
+				},
+				{
+					name: 'Get Member',
+					value: 'member',
+					description: 'Get the member of a chat',
+					action: 'Get a member in a chat',
+				},
+				{
+					name: 'Leave',
+					value: 'leave',
+					description: 'Leave a group, supergroup or channel',
+					action: 'Leave a chat',
+				},
+				{
+					name: 'Set Description',
+					value: 'setDescription',
+					description: 'Set the description of a chat',
+					action: 'Set description on a chat',
+				},
+				{
+					name: 'Set Title',
+					value: 'setTitle',
+					description: 'Set the title of a chat',
+					action: 'Set a title on a chat',
+				},
+			],
+			default: 'get',
+		},
+		{
+			displayName: 'Operation',
+			name: 'operation',
+			type: 'options',
+			noDataExpression: true,
+			displayOptions: { show: { resource: ['callback'] } },
+			options: [
+				{
+					name: 'Answer Query',
+					value: 'answerQuery',
+					description: 'Send answer to callback query sent from inline keyboard',
+					action: 'Answer Query a callback',
+				},
+				{
+					name: 'Answer Inline Query',
+					value: 'answerInlineQuery',
+					description: 'Send answer to callback query sent from inline bot',
+					action: 'Answer an inline query callback',
+				},
+			],
+			default: 'answerQuery',
+		},
+		{
+			displayName: 'Operation',
+			name: 'operation',
+			type: 'options',
+			noDataExpression: true,
+			displayOptions: { show: { resource: ['file'] } },
+			options: [{ name: 'Get', value: 'get', description: 'Get a file', action: 'Get a file' }],
+			default: 'get',
+		},
+		{
+			displayName: 'Operation',
+			name: 'operation',
+			type: 'options',
+			noDataExpression: true,
+			displayOptions: { show: { resource: ['message'] } },
+			options: [
+				{
+					name: 'Delete Chat Message',
+					value: 'deleteMessage',
+					description: 'Delete a chat message',
+					action: 'Delete a chat message',
+				},
+				{
+					name: 'Edit Message Text',
+					value: 'editMessageText',
+					description: 'Edit a text message',
+					action: 'Edit a test message',
+				},
+				{
+					name: 'Pin Chat Message',
+					value: 'pinChatMessage',
+					description: 'Pin a chat message',
+					action: 'Pin a chat message',
+				},
+				{
+					name: 'Send Animation',
+					value: 'sendAnimation',
+					description: 'Send an animated file',
+					action: 'Send an animated file',
+				},
+				{
+					name: 'Send Audio',
+					value: 'sendAudio',
+					description: 'Send a audio file',
+					action: 'Send an audio file',
+				},
+				{
+					name: 'Send Chat Action',
+					value: 'sendChatAction',
+					description: 'Send a chat action',
+					action: 'Send a chat action',
+				},
+				{
+					name: 'Send Document',
+					value: 'sendDocument',
+					description: 'Send a document',
+					action: 'Send a document',
+				},
+				{
+					name: 'Send Location',
+					value: 'sendLocation',
+					description: 'Send a location',
+					action: 'Send a location',
+				},
+				{
+					name: 'Send Media Group',
+					value: 'sendMediaGroup',
+					description: 'Send group of photos or videos to album',
+					action: 'Send a media group message',
+				},
+				{
+					name: 'Send Message',
+					value: 'sendMessage',
+					description: 'Send a text message',
+					action: 'Send a text message',
+				},
+				{
+					name: 'Send Photo',
+					value: 'sendPhoto',
+					description: 'Send a photo',
+					action: 'Send a photo message',
+				},
+				{
+					name: 'Send Sticker',
+					value: 'sendSticker',
+					description: 'Send a sticker',
+					action: 'Send a sticker',
+				},
+				{
+					name: 'Send Video',
+					value: 'sendVideo',
+					description: 'Send a video',
+					action: 'Send a video',
+				},
+				{
+					name: 'Unpin Chat Message',
+					value: 'unpinChatMessage',
+					description: 'Unpin a chat message',
+					action: 'Unpin a chat message',
+				},
+			],
+			default: 'sendMessage',
+		},
+		{
+			displayName: 'Chat ID',
+			name: 'chatId',
+			type: 'string',
+			default: '',
+			displayOptions: {
+				show: {
+					operation: [
+						'administrators',
+						'deleteMessage',
+						'get',
+						'leave',
+						'member',
+						'pinChatMessage',
+						'setDescription',
+						'setTitle',
+						'sendAnimation',
+						'sendAudio',
+						'sendChatAction',
+						'sendDocument',
+						'sendLocation',
+						'sendMessage',
+						'sendMediaGroup',
+						'sendPhoto',
+						'sendSticker',
+						'sendVideo',
+						'unpinChatMessage',
+					],
+					resource: ['chat', 'message'],
+				},
+			},
+			required: true,
+			description:
+				'Unique identifier for the target chat or username of the target channel (in the format @channelusername)',
+		},
+		{
+			displayName: 'Message ID',
+			name: 'messageId',
+			type: 'string',
+			default: '',
+			displayOptions: { show: { operation: ['deleteMessage'], resource: ['message'] } },
+			required: true,
+			description: 'Unique identifier of the message to delete',
+		},
+		{
+			displayName: 'Message ID',
+			name: 'messageId',
+			type: 'string',
+			default: '',
+			displayOptions: {
+				show: { operation: ['pinChatMessage', 'unpinChatMessage'], resource: ['message'] },
+			},
+			required: true,
+			description: 'Unique identifier of the message to pin or unpin',
+		},
+		{
+			displayName: 'Additional Fields',
+			name: 'additionalFields',
+			type: 'collection',
+			placeholder: 'Add Field',
+			displayOptions: { show: { operation: ['pinChatMessage'], resource: ['message'] } },
+			default: {},
+			options: [
+				{
+					displayName: 'Disable Notification',
+					name: 'disable_notification',
+					type: 'boolean',
+					default: false,
+					description:
+						'Whether to send a notification to all chat members about the new pinned message',
+				},
+			],
+		},
+		{
+			displayName: 'User ID',
+			name: 'userId',
+			type: 'string',
+			default: '',
+			displayOptions: { show: { operation: ['member'], resource: ['chat'] } },
+			required: true,
+			description: 'Unique identifier of the target user',
+		},
+		{
+			displayName: 'Description',
+			name: 'description',
+			type: 'string',
+			default: '',
+			displayOptions: { show: { operation: ['setDescription'], resource: ['chat'] } },
+			required: true,
+			description: 'New chat description, 0-255 characters',
+		},
+		{
+			displayName: 'Title',
+			name: 'title',
+			type: 'string',
+			default: '',
+			displayOptions: { show: { operation: ['setTitle'], resource: ['chat'] } },
+			required: true,
+			description: 'New chat title, 1-255 characters',
+		},
+		{
+			displayName: 'Query ID',
+			name: 'queryId',
+			type: 'string',
+			default: '',
+			displayOptions: { show: { operation: ['answerQuery'], resource: ['callback'] } },
+			required: true,
+			description: 'Unique identifier for the query to be answered',
+		},
+		{
+			displayName: 'Additional Fields',
+			name: 'additionalFields',
+			type: 'collection',
+			placeholder: 'Add Field',
+			displayOptions: { show: { operation: ['answerQuery'], resource: ['callback'] } },
+			default: {},
+			options: [
+				{
+					displayName: 'Cache Time',
+					name: 'cache_time',
+					type: 'number',
+					typeOptions: { minValue: 0 },
+					default: 0,
+					description:
+						'The maximum amount of time in seconds that the result of the callback query may be cached client-side',
+				},
+				{
+					displayName: 'Show Alert',
+					name: 'show_alert',
+					type: 'boolean',
+					default: false,
+					description:
+						'Whether an alert will be shown by the client instead of a notification at the top of the chat screen',
+				},
+				{
+					displayName: 'Text',
+					name: 'text',
+					type: 'string',
+					default: '',
+					description:
+						'Text of the notification. If not specified, nothing will be shown to the user, 0-200 characters.',
+				},
+				{
+					displayName: 'URL',
+					name: 'url',
+					type: 'string',
+					default: '',
+					description: "URL that will be opened by the user's client",
+				},
+			],
+		},
+		{
+			displayName: 'Query ID',
+			name: 'queryId',
+			type: 'string',
+			default: '',
+			displayOptions: { show: { operation: ['answerInlineQuery'], resource: ['callback'] } },
+			required: true,
+			description: 'Unique identifier for the answered query',
+		},
+		{
+			displayName: 'Results',
+			name: 'results',
+			type: 'string',
+			default: '',
+			displayOptions: { show: { operation: ['answerInlineQuery'], resource: ['callback'] } },
+			required: true,
+			description: 'A JSON-serialized array of results for the inline query',
+		},
+		{
+			displayName: 'Additional Fields',
+			name: 'additionalFields',
+			type: 'collection',
+			placeholder: 'Add Field',
+			displayOptions: { show: { operation: ['answerInlineQuery'], resource: ['callback'] } },
+			default: {},
+			options: [
+				{
+					displayName: 'Cache Time',
+					name: 'cache_time',
+					type: 'number',
+					typeOptions: { minValue: 0 },
+					default: 0,
+					description:
+						'The maximum amount of time in seconds that the result of the callback query may be cached client-side',
+				},
+				{
+					displayName: 'Show Alert',
+					name: 'show_alert',
+					type: 'boolean',
+					default: false,
+					description:
+						'Whether an alert will be shown by the client instead of a notification at the top of the chat screen',
+				},
+				{
+					displayName: 'Text',
+					name: 'text',
+					type: 'string',
+					default: '',
+					description:
+						'Text of the notification. If not specified, nothing will be shown to the user, 0-200 characters.',
+				},
+				{
+					displayName: 'URL',
+					name: 'url',
+					type: 'string',
+					default: '',
+					description: "URL that will be opened by the user's client",
+				},
+			],
+		},
+		{
+			displayName: 'File ID',
+			name: 'fileId',
+			type: 'string',
+			default: '',
+			displayOptions: { show: { operation: ['get'], resource: ['file'] } },
+			required: true,
+			description: 'The ID of the file',
+		},
+		{
+			displayName: 'Download',
+			name: 'download',
+			type: 'boolean',
+			displayOptions: { show: { operation: ['get'], resource: ['file'] } },
+			default: true,
+			description: 'Whether to download the file',
+		},
+		{
+			displayName: 'Message Type',
+			name: 'messageType',
+			type: 'options',
+			displayOptions: { show: { operation: ['editMessageText'], resource: ['message'] } },
+			options: [
+				{ name: 'Inline Message', value: 'inlineMessage' },
+				{ name: 'Message', value: 'message' },
+			],
+			default: 'message',
+			description: 'The type of the message to edit',
+		},
+		{
+			displayName: 'Chat ID',
+			name: 'chatId',
+			type: 'string',
+			default: '',
+			displayOptions: {
+				show: { messageType: ['message'], operation: ['editMessageText'], resource: ['message'] },
+			},
+			required: true,
+			description:
+				'Unique identifier for the target chat or username of the target channel (in the format @channelusername). To find your chat ID ask @get_id_bot.',
+		},
+		{
+			displayName: 'Binary Data',
+			name: 'binaryData',
+			type: 'boolean',
+			default: false,
+			required: true,
+			displayOptions: {
+				show: {
+					operation: [
+						'sendAnimation',
+						'sendAudio',
+						'sendDocument',
+						'sendPhoto',
+						'sendVideo',
+						'sendSticker',
+					],
+					resource: ['message'],
+				},
+			},
+			description: 'Whether the data to upload should be taken from binary field',
+		},
+		{
+			displayName: 'Binary Property',
+			name: 'binaryPropertyName',
+			type: 'string',
+			default: 'data',
+			required: true,
+			displayOptions: {
+				show: {
+					operation: [
+						'sendAnimation',
+						'sendAudio',
+						'sendDocument',
+						'sendPhoto',
+						'sendVideo',
+						'sendSticker',
+					],
+					resource: ['message'],
+					binaryData: [true],
+				},
+			},
+			placeholder: '',
+			description: 'Name of the binary property that contains the data to upload',
+		},
+		{
+			displayName: 'Message ID',
+			name: 'messageId',
+			type: 'string',
+			default: '',
+			displayOptions: {
+				show: { messageType: ['message'], operation: ['editMessageText'], resource: ['message'] },
+			},
+			required: true,
+			description: 'Unique identifier of the message to edit',
+		},
+		{
+			displayName: 'Inline Message ID',
+			name: 'inlineMessageId',
+			type: 'string',
+			default: '',
+			displayOptions: {
+				show: {
+					messageType: ['inlineMessage'],
+					operation: ['editMessageText'],
+					resource: ['message'],
+				},
+			},
+			required: true,
+			description: 'Unique identifier of the inline message to edit',
+		},
+		{
+			displayName: 'Reply Markup',
+			name: 'replyMarkup',
+			displayOptions: { show: { operation: ['editMessageText'], resource: ['message'] } },
+			type: 'options',
+			options: [
+				{ name: 'None', value: 'none' },
+				{ name: 'Inline Keyboard', value: 'inlineKeyboard' },
+			],
+			default: 'none',
+			description: 'Additional interface options',
+		},
+		{
+			displayName: 'Animation',
+			name: 'file',
+			type: 'string',
+			default: '',
+			displayOptions: {
+				show: { operation: ['sendAnimation'], resource: ['message'], binaryData: [false] },
+			},
+			description:
+				'Animation to send. Pass a file_id to send an animation that exists on the Telegram servers (recommended), an HTTP URL for Telegram to get an animation from the Internet.',
+		},
+		{
+			displayName: 'Audio',
+			name: 'file',
+			type: 'string',
+			default: '',
+			displayOptions: {
+				show: { operation: ['sendAudio'], resource: ['message'], binaryData: [false] },
+			},
+			description:
+				'Audio file to send. Pass a file_id to send a file that exists on the Telegram servers (recommended), an HTTP URL for Telegram to get a file from the Internet.',
+		},
+		{
+			displayName: 'Action',
+			name: 'action',
+			type: 'options',
+			displayOptions: { show: { operation: ['sendChatAction'], resource: ['message'] } },
+			options: [
+				{ name: 'Find Location', value: 'find_location', action: 'Find location' },
+				{ name: 'Record Audio', value: 'record_audio', action: 'Record audio' },
+				{ name: 'Record Video', value: 'record_video', action: 'Record video' },
+				{ name: 'Record Video Note', value: 'record_video_note', action: 'Record video note' },
+				{ name: 'Typing', value: 'typing', action: 'Typing a message' },
+				{ name: 'Upload Audio', value: 'upload_audio', action: 'Upload audio' },
+				{ name: 'Upload Document', value: 'upload_document', action: 'Upload document' },
+				{ name: 'Upload Photo', value: 'upload_photo', action: 'Upload photo' },
+				{ name: 'Upload Video', value: 'upload_video', action: 'Upload video' },
+				{ name: 'Upload Video Note', value: 'upload_video_note', action: 'Upload video note' },
+			],
+			default: 'typing',
+			description:
+				'Type of action to broadcast. Choose one, depending on what the user is about to receive. The status is set for 5 seconds or less (when a message arrives from your bot).',
+		},
+		{
+			displayName: 'Document',
+			name: 'file',
+			type: 'string',
+			default: '',
+			displayOptions: {
+				show: { operation: ['sendDocument'], resource: ['message'], binaryData: [false] },
+			},
+			description:
+				'Document to send. Pass a file_id to send a file that exists on the Telegram servers (recommended), an HTTP URL for Telegram to get a file from the Internet.',
+		},
+		{
+			displayName: 'Latitude',
+			name: 'latitude',
+			type: 'number',
+			default: 0,
+			typeOptions: { numberPrecision: 10, minValue: -90, maxValue: 90 },
+			displayOptions: { show: { operation: ['sendLocation'], resource: ['message'] } },
+			description: 'Location latitude',
+		},
+		{
+			displayName: 'Longitude',
+			name: 'longitude',
+			type: 'number',
+			typeOptions: { numberPrecision: 10, minValue: -180, maxValue: 180 },
+			default: 0,
+			displayOptions: { show: { operation: ['sendLocation'], resource: ['message'] } },
+			description: 'Location longitude',
+		},
+		{
+			displayName: 'Media',
+			name: 'media',
+			type: 'fixedCollection',
+			displayOptions: { show: { operation: ['sendMediaGroup'], resource: ['message'] } },
+			description: 'The media to add',
+			placeholder: 'Add Media',
+			typeOptions: { multipleValues: true },
+			default: {},
+			options: [
+				{
+					displayName: 'Media',
+					name: 'media',
+					values: [
+						{
+							displayName: 'Type',
+							name: 'type',
+							type: 'options',
+							options: [
+								{ name: 'Photo', value: 'photo' },
+								{ name: 'Video', value: 'video' },
+							],
+							default: 'photo',
+							description: 'The type of the media to add',
+						},
+						{
+							displayName: 'Media File',
+							name: 'media',
+							type: 'string',
+							default: '',
+							description:
+								'Media to send. Pass a file_id to send a file that exists on the Telegram servers (recommended) or pass an HTTP URL for Telegram to get a file from the Internet.',
+						},
+						{
+							displayName: 'Additional Fields',
+							name: 'additionalFields',
+							type: 'collection',
+							placeholder: 'Add Field',
+							default: {},
+							options: [
+								{
+									displayName: 'Caption',
+									name: 'caption',
+									type: 'string',
+									default: '',
+									description: 'Caption text to set, 0-1024 characters',
+								},
+								{
+									displayName: 'Parse Mode',
+									name: 'parse_mode',
+									type: 'options',
+									options: [
+										{ name: 'Markdown (Legacy)', value: 'Markdown' },
+										{ name: 'MarkdownV2', value: 'MarkdownV2' },
+										{ name: 'HTML', value: 'HTML' },
+									],
+									default: 'HTML',
+									description: 'How to parse the text',
+								},
+							],
+						},
+					],
+				},
+			],
+		},
+		{
+			displayName: 'Text',
+			name: 'text',
+			type: 'string',
+			required: true,
+			default: '',
+			displayOptions: {
+				show: { operation: ['editMessageText', 'sendMessage'], resource: ['message'] },
+			},
+			description: 'Text of the message to be sent',
+		},
+		{
+			displayName: 'Photo',
+			name: 'file',
+			type: 'string',
+			default: '',
+			displayOptions: {
+				show: { operation: ['sendPhoto'], resource: ['message'], binaryData: [false] },
+			},
+			description:
+				'Photo to send. Pass a file_id to send a photo that exists on the Telegram servers (recommended), an HTTP URL for Telegram to get a photo from the Internet.',
+		},
+		{
+			displayName: 'Sticker',
+			name: 'file',
+			type: 'string',
+			default: '',
+			displayOptions: {
+				show: { operation: ['sendSticker'], resource: ['message'], binaryData: [false] },
+			},
+			description:
+				'Sticker to send. Pass a file_id to send a file that exists on the Telegram servers (recommended), an HTTP URL for Telegram to get a .webp file from the Internet.',
+		},
+		{
+			displayName: 'Video',
+			name: 'file',
+			type: 'string',
+			default: '',
+			displayOptions: {
+				show: { operation: ['sendVideo'], resource: ['message'], binaryData: [false] },
+			},
+			description:
+				'Video file to send. Pass a file_id to send a file that exists on the Telegram servers (recommended), an HTTP URL for Telegram to get a file from the Internet.',
+		},
+		{
+			displayName: 'Reply Markup',
+			name: 'replyMarkup',
+			displayOptions: {
+				show: {
+					operation: [
+						'sendAnimation',
+						'sendDocument',
+						'sendMessage',
+						'sendPhoto',
+						'sendSticker',
+						'sendVideo',
+						'sendAudio',
+						'sendLocation',
+					],
+					resource: ['message'],
+				},
+			},
+			type: 'options',
+			options: [
+				{ name: 'Force Reply', value: 'forceReply' },
+				{ name: 'Inline Keyboard', value: 'inlineKeyboard' },
+				{ name: 'None', value: 'none' },
+				{ name: 'Reply Keyboard', value: 'replyKeyboard' },
+				{ name: 'Reply Keyboard Remove', value: 'replyKeyboardRemove' },
+			],
+			default: 'none',
+			description: 'Additional interface options',
+		},
+		{
+			displayName: 'Force Reply',
+			name: 'forceReply',
+			type: 'collection',
+			placeholder: 'Add Field',
+			displayOptions: { show: { replyMarkup: ['forceReply'], resource: ['message'] } },
+			default: {},
+			options: [
+				{
+					displayName: 'Force Reply',
+					name: 'force_reply',
+					type: 'boolean',
+					default: false,
+					description:
+						'Whether to show reply interface to the user, as if they manually selected the bot‘s message and tapped ’Reply',
+				},
+				{
+					displayName: 'Selective',
+					name: 'selective',
+					type: 'boolean',
+					default: false,
+					description: 'Whether to force reply from specific users only',
+				},
+			],
+		},
+		{
+			displayName: 'Inline Keyboard',
+			name: 'inlineKeyboard',
+			placeholder: 'Add Keyboard Row',
+			description: 'Adds an inline keyboard that appears right next to the message it belongs to',
+			type: 'fixedCollection',
+			typeOptions: { multipleValues: true },
+			displayOptions: { show: { replyMarkup: ['inlineKeyboard'], resource: ['message'] } },
+			default: {},
+			options: [
+				{
+					displayName: 'Rows',
+					name: 'rows',
+					values: [
+						{
+							displayName: 'Row',
+							name: 'row',
+							type: 'fixedCollection',
+							description: 'The value to set',
+							placeholder: 'Add Button',
+							typeOptions: { multipleValues: true },
+							default: {},
+							options: [
+								{
+									displayName: 'Buttons',
+									name: 'buttons',
+									values: [
+										{
+											displayName: 'Text',
+											name: 'text',
+											type: 'string',
+											default: '',
+											description: 'Label text on the button',
+										},
+										{
+											displayName: 'Additional Fields',
+											name: 'additionalFields',
+											type: 'collection',
+											placeholder: 'Add Field',
+											default: {},
+											options: [
+												{
+													displayName: 'Callback Data',
+													name: 'callback_data',
+													type: 'string',
+													default: '',
+													description:
+														'Data to be sent in a callback query to the bot when button is pressed, 1-64 bytes',
+												},
+												{
+													displayName: 'Pay',
+													name: 'pay',
+													type: 'boolean',
+													default: false,
+													description: 'Whether to send a Pay button',
+												},
+												{
+													displayName: 'Switch Inline Query Current Chat',
+													name: 'switch_inline_query_current_chat',
+													type: 'string',
+													default: '',
+													description:
+														"If set, pressing the button will insert the bot‘s username and the specified inline query in the current chat's input field.Can be empty, in which case only the bot’s username will be inserted",
+												},
+												{
+													displayName: 'Switch Inline Query',
+													name: 'switch_inline_query',
+													type: 'string',
+													default: '',
+													description:
+														'If set, pressing the button will prompt the user to select one of their chats, open that chat and insert the bot‘s username and the specified inline query in the input field. Can be empty, in which case just the bot’s username will be inserted.',
+												},
+												{
+													displayName: 'URL',
+													name: 'url',
+													type: 'string',
+													default: '',
+													description: 'HTTP or tg:// URL to be opened when button is pressed',
+												},
+											],
+										},
+									],
+								},
+							],
+						},
+					],
+				},
+			],
+		},
+		{
+			displayName: 'Reply Keyboard',
+			name: 'replyKeyboard',
+			placeholder: 'Add Reply Keyboard Row',
+			description: 'Adds a custom keyboard with reply options',
+			type: 'fixedCollection',
+			typeOptions: { multipleValues: true },
+			displayOptions: { show: { replyMarkup: ['replyKeyboard'] } },
+			default: {},
+			options: [
+				{
+					displayName: 'Rows',
+					name: 'rows',
+					values: [
+						{
+							displayName: 'Row',
+							name: 'row',
+							type: 'fixedCollection',
+							description: 'The value to set',
+							placeholder: 'Add Button',
+							typeOptions: { multipleValues: true },
+							default: {},
+							options: [
+								{
+									displayName: 'Buttons',
+									name: 'buttons',
+									values: [
+										{
+											displayName: 'Text',
+											name: 'text',
+											type: 'string',
+											default: '',
+											description:
+												'Text of the button. If none of the optional fields are used, it will be sent as a message when the button is pressed.',
+										},
+										{
+											displayName: 'Additional Fields',
+											name: 'additionalFields',
+											type: 'collection',
+											placeholder: 'Add Field',
+											default: {},
+											options: [
+												{
+													displayName: 'Request Contact',
+													name: 'request_contact',
+													type: 'boolean',
+													default: false,
+													description:
+														"Whether the user's phone number will be sent as a contact when the button is pressed.Available in private chats only",
+												},
+												{
+													displayName: 'Request Location',
+													name: 'request_location',
+													type: 'boolean',
+													default: false,
+													description: "Whether the user's request_location",
+												},
+											],
+										},
+									],
+								},
+							],
+						},
+					],
+				},
+			],
+		},
+		{
+			displayName: 'Reply Keyboard Options',
+			name: 'replyKeyboardOptions',
+			type: 'collection',
+			placeholder: 'Add Option',
+			displayOptions: { show: { replyMarkup: ['replyKeyboard'] } },
+			default: {},
+			options: [
+				{
+					displayName: 'Resize Keyboard',
+					name: 'resize_keyboard',
+					type: 'boolean',
+					default: false,
+					description:
+						'Whether to request clients to resize the keyboard vertically for optimal fit',
+				},
+				{
+					displayName: 'One Time Keyboard',
+					name: 'one_time_keyboard',
+					type: 'boolean',
+					default: false,
+					description: "Whether to request clients to hide the keyboard as soon as it's been used",
+				},
+				{
+					displayName: 'Selective',
+					name: 'selective',
+					type: 'boolean',
+					default: false,
+					description: 'Whether to show the keyboard to specific users only',
+				},
+			],
+		},
+		{
+			displayName: 'Reply Keyboard Remove',
+			name: 'replyKeyboardRemove',
+			type: 'collection',
+			placeholder: 'Add Field',
+			displayOptions: { show: { replyMarkup: ['replyKeyboardRemove'] } },
+			default: {},
+			options: [
+				{
+					displayName: 'Remove Keyboard',
+					name: 'remove_keyboard',
+					type: 'boolean',
+					default: false,
+					description: 'Whether to request clients to remove the custom keyboard',
+				},
+				{
+					displayName: 'Selective',
+					name: 'selective',
+					type: 'boolean',
+					default: false,
+					description: 'Whether to force reply from specific users only',
+				},
+			],
+		},
+		{
+			displayName: 'Additional Fields',
+			name: 'additionalFields',
+			type: 'collection',
+			placeholder: 'Add Field',
+			displayOptions: {
+				show: {
+					operation: [
+						'editMessageText',
+						'sendAnimation',
+						'sendAudio',
+						'sendDocument',
+						'sendLocation',
+						'sendMessage',
+						'sendMediaGroup',
+						'sendPhoto',
+						'sendSticker',
+						'sendVideo',
+					],
+					resource: ['message'],
+				},
+			},
+			default: {},
+			options: [
+				{
+					displayName: 'Append n8n Attribution',
+					name: 'appendAttribution',
+					type: 'boolean',
+					default: true,
+					description:
+						'Whether to include the phrase “This message was sent automatically with n8n” to the end of the message',
+					displayOptions: { show: { '/operation': ['sendMessage'] } },
+				},
+				{
+					displayName: 'Caption',
+					name: 'caption',
+					type: 'string',
+					displayOptions: {
+						show: {
+							'/operation': [
+								'sendAnimation',
+								'sendAudio',
+								'sendDocument',
+								'sendPhoto',
+								'sendVideo',
+							],
+						},
+					},
+					default: '',
+					description: 'Caption text to set, 0-1024 characters',
+				},
+				{
+					displayName: 'Disable Notification',
+					name: 'disable_notification',
+					type: 'boolean',
+					default: false,
+					displayOptions: { hide: { '/operation': ['editMessageText'] } },
+					description:
+						'Whether to send the message silently. Users will receive a notification with no sound.',
+				},
+				{
+					displayName: 'Disable WebPage Preview',
+					name: 'disable_web_page_preview',
+					type: 'boolean',
+					displayOptions: { show: { '/operation': ['editMessageText', 'sendMessage'] } },
+					default: false,
+					description: 'Whether to disable link previews for links in this message',
+				},
+				{
+					displayName: 'Duration',
+					name: 'duration',
+					type: 'number',
+					typeOptions: { minValue: 0 },
+					displayOptions: { show: { '/operation': ['sendAnimation', 'sendAudio', 'sendVideo'] } },
+					default: 0,
+					description: 'Duration of clip in seconds',
+				},
+				{
+					displayName: 'File Name',
+					name: 'fileName',
+					type: 'string',
+					default: '',
+					displayOptions: {
+						show: {
+							'/operation': [
+								'sendAnimation',
+								'sendAudio',
+								'sendDocument',
+								'sendPhoto',
+								'sendVideo',
+								'sendSticker',
+							],
+							'/resource': ['message'],
+							'/binaryData': [true],
+						},
+					},
+					placeholder: 'image.jpeg',
+				},
+				{
+					displayName: 'Height',
+					name: 'height',
+					type: 'number',
+					typeOptions: { minValue: 0 },
+					displayOptions: { show: { '/operation': ['sendAnimation', 'sendVideo'] } },
+					default: 0,
+					description: 'Height of the video',
+				},
+				{
+					displayName: 'Parse Mode',
+					name: 'parse_mode',
+					type: 'options',
+					options: [
+						{ name: 'Markdown (Legacy)', value: 'Markdown' },
+						{ name: 'MarkdownV2', value: 'MarkdownV2' },
+						{ name: 'HTML', value: 'HTML' },
+					],
+					displayOptions: {
+						show: {
+							'/operation': [
+								'editMessageText',
+								'sendAnimation',
+								'sendAudio',
+								'sendMessage',
+								'sendPhoto',
+								'sendVideo',
+								'sendDocument',
+							],
+						},
+					},
+					default: 'HTML',
+					description: 'How to parse the text',
+				},
+				{
+					displayName: 'Performer',
+					name: 'performer',
+					type: 'string',
+					displayOptions: { show: { '/operation': ['sendAudio'] } },
+					default: '',
+					description: 'Name of the performer',
+				},
+				{
+					displayName: 'Reply To Message ID',
+					name: 'reply_to_message_id',
+					type: 'number',
+					displayOptions: { hide: { '/operation': ['editMessageText'] } },
+					default: 0,
+					description: 'If the message is a reply, ID of the original message',
+				},
+				{
+					displayName: 'Message Thread ID',
+					name: 'message_thread_id',
+					type: 'number',
+					displayOptions: {
+						show: {
+							'/operation': [
+								'sendAnimation',
+								'sendAudio',
+								'sendChatAction',
+								'sendDocument',
+								'sendLocation',
+								'sendMediaGroup',
+								'sendMessage',
+								'sendPhoto',
+								'sendSticker',
+								'sendVideo',
+							],
+						},
+					},
+					default: 0,
+					description: 'The unique identifier of the forum topic',
+				},
+				{
+					displayName: 'Title',
+					name: 'title',
+					type: 'string',
+					displayOptions: { show: { '/operation': ['sendAudio'] } },
+					default: '',
+					description: 'Title of the track',
+				},
+				{
+					displayName: 'Thumbnail',
+					name: 'thumb',
+					type: 'string',
+					displayOptions: {
+						show: { '/operation': ['sendAnimation', 'sendAudio', 'sendDocument', 'sendVideo'] },
+					},
+					default: '',
+					description:
+						'Thumbnail of the file sent; can be ignored if thumbnail generation for the file is supported server-side. The thumbnail should be in JPEG format and less than 200 kB in size. A thumbnail‘s width and height should not exceed 320.',
+				},
+				{
+					displayName: 'Width',
+					name: 'width',
+					type: 'number',
+					typeOptions: { minValue: 0 },
+					displayOptions: { show: { '/operation': ['sendAnimation', 'sendVideo'] } },
+					default: 0,
+					description: 'Width of the video',
+				},
+			],
+		},
+	],
+	codex: {
+		categories: ['Communication'],
+		resources: {
+			primaryDocumentation: [
+				{ url: 'https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.telegram/' },
+			],
+			credentialDocumentation: [{ url: 'https://docs.n8n.io/credentials/telegram' }],
+		},
+	},
+	iconUrl: 'icons/n8n-nodes-base/dist/nodes/Telegram/telegram.svg',
+} satisfies INodeTypeDescription;
+
+export const nodeTypeShopifyTriggerV1 = {
+	displayName: 'Shopify Trigger',
+	name: 'n8n-nodes-base.shopifyTrigger',
+	group: ['trigger'],
+	version: 1,
+	subtitle: '={{$parameter["event"]}}',
+	description: 'Handle Shopify events via webhooks',
+	defaults: { name: 'Shopify Trigger' },
+	inputs: [],
+	outputs: ['main'],
+	credentials: [
+		{
+			name: 'shopifyApi',
+			required: true,
+			displayOptions: { show: { authentication: ['apiKey'] } },
+		},
+		{
+			name: 'shopifyAccessTokenApi',
+			required: true,
+			displayOptions: { show: { authentication: ['accessToken'] } },
+		},
+		{
+			name: 'shopifyOAuth2Api',
+			required: true,
+			displayOptions: { show: { authentication: ['oAuth2'] } },
+		},
+	],
+	webhooks: [{ name: 'default', httpMethod: 'POST', responseMode: 'onReceived', path: 'webhook' }],
+	properties: [
+		{
+			displayName: 'Authentication',
+			name: 'authentication',
+			type: 'options',
+			options: [
+				{ name: 'Access Token', value: 'accessToken' },
+				{ name: 'OAuth2', value: 'oAuth2' },
+				{ name: 'API Key', value: 'apiKey' },
+			],
+			default: 'apiKey',
+		},
+		{
+			displayName: 'Trigger On',
+			name: 'topic',
+			type: 'options',
+			default: '',
+			options: [
+				{ name: 'App Uninstalled', value: 'app/uninstalled' },
+				{ name: 'Cart Created', value: 'carts/create' },
+				{ name: 'Cart Updated', value: 'carts/update' },
+				{ name: 'Checkout Created', value: 'checkouts/create' },
+				{ name: 'Checkout Delete', value: 'checkouts/delete' },
+				{ name: 'Checkout Update', value: 'checkouts/update' },
+				{ name: 'Collection Created', value: 'collections/create' },
+				{ name: 'Collection Deleted', value: 'collections/delete' },
+				{ name: 'Collection Listings Added', value: 'collection_listings/add' },
+				{ name: 'Collection Listings Removed', value: 'collection_listings/remove' },
+				{ name: 'Collection Listings Updated', value: 'collection_listings/update' },
+				{ name: 'Collection Updated', value: 'collections/update' },
+				{ name: 'Customer Created', value: 'customers/create' },
+				{ name: 'Customer Deleted', value: 'customers/delete' },
+				{ name: 'Customer Disabled', value: 'customers/disable' },
+				{ name: 'Customer Enabled', value: 'customers/enable' },
+				{ name: 'Customer Groups Created', value: 'customer_groups/create' },
+				{ name: 'Customer Groups Deleted', value: 'customer_groups/delete' },
+				{ name: 'Customer Groups Updated', value: 'customer_groups/update' },
+				{ name: 'Customer Updated', value: 'customers/update' },
+				{ name: 'Draft Orders Created', value: 'draft_orders/create' },
+				{ name: 'Draft Orders Deleted', value: 'draft_orders/delete' },
+				{ name: 'Draft Orders Updated', value: 'draft_orders/update' },
+				{ name: 'Fulfillment Created', value: 'fulfillments/create' },
+				{ name: 'Fulfillment Events Created', value: 'fulfillment_events/create' },
+				{ name: 'Fulfillment Events Deleted', value: 'fulfillment_events/delete' },
+				{ name: 'Fulfillment Updated', value: 'fulfillments/update' },
+				{ name: 'Inventory Items Created', value: 'inventory_items/create' },
+				{ name: 'Inventory Items Deleted', value: 'inventory_items/delete' },
+				{ name: 'Inventory Items Updated', value: 'inventory_items/update' },
+				{ name: 'Inventory Levels Connected', value: 'inventory_levels/connect' },
+				{ name: 'Inventory Levels Disconnected', value: 'inventory_levels/disconnect' },
+				{ name: 'Inventory Levels Updated', value: 'inventory_levels/update' },
+				{ name: 'Locale Created', value: 'locales/create' },
+				{ name: 'Locale Updated', value: 'locales/update' },
+				{ name: 'Location Created', value: 'locations/create' },
+				{ name: 'Location Deleted', value: 'locations/delete' },
+				{ name: 'Location Updated', value: 'locations/update' },
+				{ name: 'Order Cancelled', value: 'orders/cancelled' },
+				{ name: 'Order Created', value: 'orders/create' },
+				{ name: 'Order Fulfilled', value: 'orders/fulfilled' },
+				{ name: 'Order Paid', value: 'orders/paid' },
+				{ name: 'Order Partially Fulfilled', value: 'orders/partially_fulfilled' },
+				{ name: 'Order Transactions Created', value: 'order_transactions/create' },
+				{ name: 'Order Updated', value: 'orders/updated' },
+				{ name: 'Orders Deleted', value: 'orders/delete' },
+				{ name: 'Product Created', value: 'products/create' },
+				{ name: 'Product Deleted', value: 'products/delete' },
+				{ name: 'Product Listings Added', value: 'product_listings/add' },
+				{ name: 'Product Listings Removed', value: 'product_listings/remove' },
+				{ name: 'Product Listings Updated', value: 'product_listings/update' },
+				{ name: 'Product Updated', value: 'products/update' },
+				{ name: 'Refund Created', value: 'refunds/create' },
+				{ name: 'Shop Updated', value: 'shop/update' },
+				{ name: 'Tender Transactions Created', value: 'tender_transactions/create' },
+				{ name: 'Theme Created', value: 'themes/create' },
+				{ name: 'Theme Deleted', value: 'themes/delete' },
+				{ name: 'Theme Published', value: 'themes/publish' },
+				{ name: 'Theme Updated', value: 'themes/update' },
+			],
+		},
+	],
+	codex: {
+		categories: ['Sales'],
+		resources: {
+			primaryDocumentation: [
+				{
+					url: 'https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.shopifytrigger/',
+				},
+			],
+			credentialDocumentation: [{ url: 'https://docs.n8n.io/credentials/shopify' }],
+		},
+	},
+	iconUrl: 'icons/n8n-nodes-base/dist/nodes/Shopify/shopify.svg',
+} satisfies INodeTypeDescription;
+
+export const nodeTypeHttpRequestV1 = {
+	displayName: 'HTTP Request',
+	name: 'n8n-nodes-base.httpRequest',
+	group: ['output'],
+	subtitle: '={{$parameter["requestMethod"] + ": " + $parameter["url"]}}',
+	description: 'Makes an HTTP request and returns the response data',
+	defaultVersion: 4.1,
+	version: 1,
+	defaults: { name: 'HTTP Request', color: '#2200DD' },
+	inputs: ['main'],
+	outputs: ['main'],
+	credentials: [
+		{
+			name: 'httpBasicAuth',
+			required: true,
+			displayOptions: { show: { authentication: ['basicAuth'] } },
+		},
+		{
+			name: 'httpDigestAuth',
+			required: true,
+			displayOptions: { show: { authentication: ['digestAuth'] } },
+		},
+		{
+			name: 'httpHeaderAuth',
+			required: true,
+			displayOptions: { show: { authentication: ['headerAuth'] } },
+		},
+		{
+			name: 'httpQueryAuth',
+			required: true,
+			displayOptions: { show: { authentication: ['queryAuth'] } },
+		},
+		{
+			name: 'oAuth1Api',
+			required: true,
+			displayOptions: { show: { authentication: ['oAuth1'] } },
+		},
+		{
+			name: 'oAuth2Api',
+			required: true,
+			displayOptions: { show: { authentication: ['oAuth2'] } },
+		},
+	],
+	properties: [
+		{
+			displayName: 'Authentication',
+			name: 'authentication',
+			type: 'options',
+			options: [
+				{ name: 'Basic Auth', value: 'basicAuth' },
+				{ name: 'Digest Auth', value: 'digestAuth' },
+				{ name: 'Header Auth', value: 'headerAuth' },
+				{ name: 'None', value: 'none' },
+				{ name: 'OAuth1', value: 'oAuth1' },
+				{ name: 'OAuth2', value: 'oAuth2' },
+				{ name: 'Query Auth', value: 'queryAuth' },
+			],
+			default: 'none',
+			description: 'The way to authenticate',
+		},
+		{
+			displayName: 'Request Method',
+			name: 'requestMethod',
+			type: 'options',
+			options: [
+				{ name: 'DELETE', value: 'DELETE' },
+				{ name: 'GET', value: 'GET' },
+				{ name: 'HEAD', value: 'HEAD' },
+				{ name: 'OPTIONS', value: 'OPTIONS' },
+				{ name: 'PATCH', value: 'PATCH' },
+				{ name: 'POST', value: 'POST' },
+				{ name: 'PUT', value: 'PUT' },
+			],
+			default: 'GET',
+			description: 'The request method to use',
+		},
+		{
+			displayName: 'URL',
+			name: 'url',
+			type: 'string',
+			default: '',
+			placeholder: 'http://example.com/index.html',
+			description: 'The URL to make the request to',
+			required: true,
+		},
+		{
+			displayName: 'Ignore SSL Issues',
+			name: 'allowUnauthorizedCerts',
+			type: 'boolean',
+			default: false,
+			description:
+				'Whether to download the response even if SSL certificate validation is not possible',
+		},
+		{
+			displayName: 'Response Format',
+			name: 'responseFormat',
+			type: 'options',
+			options: [
+				{ name: 'File', value: 'file' },
+				{ name: 'JSON', value: 'json' },
+				{ name: 'String', value: 'string' },
+			],
+			default: 'json',
+			description: 'The format in which the data gets returned from the URL',
+		},
+		{
+			displayName: 'Property Name',
+			name: 'dataPropertyName',
+			type: 'string',
+			default: 'data',
+			required: true,
+			displayOptions: { show: { responseFormat: ['string'] } },
+			description: 'Name of the property to which to write the response data',
+		},
+		{
+			displayName: 'Binary Property',
+			name: 'dataPropertyName',
+			type: 'string',
+			default: 'data',
+			required: true,
+			displayOptions: { show: { responseFormat: ['file'] } },
+			description: 'Name of the binary property to which to write the data of the read file',
+		},
+		{
+			displayName: 'JSON/RAW Parameters',
+			name: 'jsonParameters',
+			type: 'boolean',
+			default: false,
+			description:
+				'Whether the query and/or body parameter should be set via the value-key pair UI or JSON/RAW',
+		},
+		{
+			displayName: 'Options',
+			name: 'options',
+			type: 'collection',
+			placeholder: 'Add Option',
+			default: {},
+			options: [
+				{
+					displayName: 'Batch Interval',
+					name: 'batchInterval',
+					type: 'number',
+					typeOptions: { minValue: 0 },
+					default: 1000,
+					description: 'Time (in milliseconds) between each batch of requests. 0 for disabled.',
+				},
+				{
+					displayName: 'Batch Size',
+					name: 'batchSize',
+					type: 'number',
+					typeOptions: { minValue: -1 },
+					default: 50,
+					description:
+						'Input will be split in batches to throttle requests. -1 for disabled. 0 will be treated as 1.',
+				},
+				{
+					displayName: 'Body Content Type',
+					name: 'bodyContentType',
+					type: 'options',
+					displayOptions: { show: { '/requestMethod': ['PATCH', 'POST', 'PUT'] } },
+					options: [
+						{ name: 'JSON', value: 'json' },
+						{ name: 'RAW/Custom', value: 'raw' },
+						{ name: 'Form-Data Multipart', value: 'multipart-form-data' },
+						{ name: 'Form Urlencoded', value: 'form-urlencoded' },
+					],
+					default: 'json',
+					description: 'Content-Type to use to send body parameters',
+				},
+				{
+					displayName: 'Full Response',
+					name: 'fullResponse',
+					type: 'boolean',
+					default: false,
+					description: 'Whether to return the full response data instead of only the body',
+				},
+				{
+					displayName: 'Follow All Redirects',
+					name: 'followAllRedirects',
+					type: 'boolean',
+					default: false,
+					description: 'Whether to follow non-GET HTTP 3xx redirects',
+				},
+				{
+					displayName: 'Follow GET Redirect',
+					name: 'followRedirect',
+					type: 'boolean',
+					default: true,
+					description: 'Whether to follow GET HTTP 3xx redirects',
+				},
+				{
+					displayName: 'Ignore Response Code',
+					name: 'ignoreResponseCode',
+					type: 'boolean',
+					default: false,
+					description: 'Whether to succeeds also when status code is not 2xx',
+				},
+				{
+					displayName: 'MIME Type',
+					name: 'bodyContentCustomMimeType',
+					type: 'string',
+					default: '',
+					placeholder: 'text/xml',
+					description: 'Specify the mime type for raw/custom body type',
+					displayOptions: { show: { '/requestMethod': ['PATCH', 'POST', 'PUT'] } },
+				},
+				{
+					displayName: 'Proxy',
+					name: 'proxy',
+					type: 'string',
+					default: '',
+					placeholder: 'http://myproxy:3128',
+					description: 'HTTP proxy to use',
+				},
+				{
+					displayName: 'Split Into Items',
+					name: 'splitIntoItems',
+					type: 'boolean',
+					default: false,
+					description: 'Whether to output each element of an array as own item',
+					displayOptions: { show: { '/responseFormat': ['json'] } },
+				},
+				{
+					displayName: 'Timeout',
+					name: 'timeout',
+					type: 'number',
+					typeOptions: { minValue: 1 },
+					default: 10000,
+					description:
+						'Time in ms to wait for the server to send response headers (and start the response body) before aborting the request',
+				},
+				{
+					displayName: 'Use Querystring',
+					name: 'useQueryString',
+					type: 'boolean',
+					default: false,
+					description:
+						'Whether you need arrays to be serialized as foo=bar&foo=baz instead of the default foo[0]=bar&foo[1]=baz',
+				},
+			],
+		},
+		{
+			displayName: 'Send Binary Data',
+			name: 'sendBinaryData',
+			type: 'boolean',
+			displayOptions: {
+				show: { jsonParameters: [true], requestMethod: ['PATCH', 'POST', 'PUT'] },
+			},
+			default: false,
+			description: 'Whether binary data should be send as body',
+		},
+		{
+			displayName: 'Binary Property',
+			name: 'binaryPropertyName',
+			type: 'string',
+			required: true,
+			default: 'data',
+			displayOptions: {
+				hide: { sendBinaryData: [false] },
+				show: { jsonParameters: [true], requestMethod: ['PATCH', 'POST', 'PUT'] },
+			},
+			description:
+				'Name of the binary property which contains the data for the file to be uploaded. For Form-Data Multipart, they can be provided in the format: <code>"sendKey1:binaryProperty1,sendKey2:binaryProperty2</code>',
+		},
+		{
+			displayName: 'Body Parameters',
+			name: 'bodyParametersJson',
+			type: 'json',
+			displayOptions: {
+				hide: { sendBinaryData: [true] },
+				show: { jsonParameters: [true], requestMethod: ['PATCH', 'POST', 'PUT', 'DELETE'] },
+			},
+			default: '',
+			description: 'Body parameters as JSON or RAW',
+		},
+		{
+			displayName: 'Body Parameters',
+			name: 'bodyParametersUi',
+			placeholder: 'Add Parameter',
+			type: 'fixedCollection',
+			typeOptions: { multipleValues: true },
+			displayOptions: {
+				show: { jsonParameters: [false], requestMethod: ['PATCH', 'POST', 'PUT', 'DELETE'] },
+			},
+			description: 'The body parameter to send',
+			default: {},
+			options: [
+				{
+					name: 'parameter',
+					displayName: 'Parameter',
+					values: [
+						{
+							displayName: 'Name',
+							name: 'name',
+							type: 'string',
+							default: '',
+							description: 'Name of the parameter',
+						},
+						{
+							displayName: 'Value',
+							name: 'value',
+							type: 'string',
+							default: '',
+							description: 'Value of the parameter',
+						},
+					],
+				},
+			],
+		},
+		{
+			displayName: 'Headers',
+			name: 'headerParametersJson',
+			type: 'json',
+			displayOptions: { show: { jsonParameters: [true] } },
+			default: '',
+			description: 'Header parameters as JSON or RAW',
+		},
+		{
+			displayName: 'Headers',
+			name: 'headerParametersUi',
+			placeholder: 'Add Header',
+			type: 'fixedCollection',
+			typeOptions: { multipleValues: true },
+			displayOptions: { show: { jsonParameters: [false] } },
+			description: 'The headers to send',
+			default: {},
+			options: [
+				{
+					name: 'parameter',
+					displayName: 'Header',
+					values: [
+						{
+							displayName: 'Name',
+							name: 'name',
+							type: 'string',
+							default: '',
+							description: 'Name of the header',
+						},
+						{
+							displayName: 'Value',
+							name: 'value',
+							type: 'string',
+							default: '',
+							description: 'Value to set for the header',
+						},
+					],
+				},
+			],
+		},
+		{
+			displayName: 'Query Parameters',
+			name: 'queryParametersJson',
+			type: 'json',
+			displayOptions: { show: { jsonParameters: [true] } },
+			default: '',
+			description: 'Query parameters as JSON (flat object)',
+		},
+		{
+			displayName: 'Query Parameters',
+			name: 'queryParametersUi',
+			placeholder: 'Add Parameter',
+			type: 'fixedCollection',
+			typeOptions: { multipleValues: true },
+			displayOptions: { show: { jsonParameters: [false] } },
+			description: 'The query parameter to send',
+			default: {},
+			options: [
+				{
+					name: 'parameter',
+					displayName: 'Parameter',
+					values: [
+						{
+							displayName: 'Name',
+							name: 'name',
+							type: 'string',
+							default: '',
+							description: 'Name of the parameter',
+						},
+						{
+							displayName: 'Value',
+							name: 'value',
+							type: 'string',
+							default: '',
+							description: 'Value of the parameter',
+						},
+					],
+				},
+			],
+		},
+		{
+			displayName:
+				"You can view the raw requests this node makes in your browser's developer console",
+			name: 'infoMessage',
+			type: 'notice',
+			default: '',
+		},
+	],
+	iconUrl: 'icons/n8n-nodes-base/dist/nodes/HttpRequest/httprequest.svg',
+	codex: {
+		categories: ['Development', 'Core Nodes'],
+		subcategories: { 'Core Nodes': ['Helpers'] },
+		resources: {
+			primaryDocumentation: [
+				{
+					url: 'https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.httprequest/',
+				},
+			],
+		},
+		alias: ['API', 'Request', 'URL', 'Build', 'cURL'],
+	},
+} satisfies INodeTypeDescription;
+
+export const nodeTypeRespondToWebhookV1 = {
+	displayName: 'Respond to Webhook',
+	name: 'n8n-nodes-base.respondToWebhook',
+	group: ['transform'],
+	version: 1,
+	description: 'Returns data for Webhook',
+	defaults: { name: 'Respond to Webhook' },
+	inputs: ['main'],
+	outputs: ['main'],
+	credentials: [],
+	properties: [
+		{
+			displayName:
+				'Verify that the "Webhook" node\'s "Respond" parameter is set to "Using Respond to Webhook Node". <a href="https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.respondtowebhook/" target="_blank">More details',
+			name: 'generalNotice',
+			type: 'notice',
+			default: '',
+		},
+		{
+			displayName: 'Respond With',
+			name: 'respondWith',
+			type: 'options',
+			options: [
+				{
+					name: 'All Incoming Items',
+					value: 'allIncomingItems',
+					description: 'Respond with all input JSON items',
+				},
+				{
+					name: 'Binary File',
+					value: 'binary',
+					description: 'Respond with incoming file binary data',
+				},
+				{
+					name: 'First Incoming Item',
+					value: 'firstIncomingItem',
+					description: 'Respond with the first input JSON item',
+				},
+				{ name: 'JSON', value: 'json', description: 'Respond with a custom JSON body' },
+				{ name: 'No Data', value: 'noData', description: 'Respond with an empty body' },
+				{
+					name: 'Redirect',
+					value: 'redirect',
+					description: 'Respond with a redirect to a given URL',
+				},
+				{ name: 'Text', value: 'text', description: 'Respond with a simple text message body' },
+			],
+			default: 'firstIncomingItem',
+			description: 'The data that should be returned',
+		},
+		{
+			displayName:
+				'When using expressions, note that this node will only run for the first item in the input data',
+			name: 'webhookNotice',
+			type: 'notice',
+			displayOptions: { show: { respondWith: ['json', 'text'] } },
+			default: '',
+		},
+		{
+			displayName: 'Redirect URL',
+			name: 'redirectURL',
+			type: 'string',
+			required: true,
+			displayOptions: { show: { respondWith: ['redirect'] } },
+			default: '',
+			placeholder: 'e.g. http://www.n8n.io',
+			description: 'The URL to redirect to',
+			validateType: 'url',
+		},
+		{
+			displayName: 'Response Body',
+			name: 'responseBody',
+			type: 'json',
+			displayOptions: { show: { respondWith: ['json'] } },
+			default: '{\n  "myField": "value"\n}',
+			typeOptions: { rows: 4 },
+			description: 'The HTTP response JSON data',
+		},
+		{
+			displayName: 'Response Body',
+			name: 'responseBody',
+			type: 'string',
+			displayOptions: { show: { respondWith: ['text'] } },
+			typeOptions: { rows: 2 },
+			default: '',
+			placeholder: 'e.g. Workflow completed',
+			description: 'The HTTP response text data',
+		},
+		{
+			displayName: 'Response Data Source',
+			name: 'responseDataSource',
+			type: 'options',
+			displayOptions: { show: { respondWith: ['binary'] } },
+			options: [
+				{
+					name: 'Choose Automatically From Input',
+					value: 'automatically',
+					description: 'Use if input data will contain a single piece of binary data',
+				},
+				{
+					name: 'Specify Myself',
+					value: 'set',
+					description: 'Enter the name of the input field the binary data will be in',
+				},
+			],
+			default: 'automatically',
+		},
+		{
+			displayName: 'Input Field Name',
+			name: 'inputFieldName',
+			type: 'string',
+			required: true,
+			default: 'data',
+			displayOptions: { show: { respondWith: ['binary'], responseDataSource: ['set'] } },
+			description: 'The name of the node input field with the binary data',
+		},
+		{
+			displayName: 'Options',
+			name: 'options',
+			type: 'collection',
+			placeholder: 'Add Option',
+			default: {},
+			options: [
+				{
+					displayName: 'Response Code',
+					name: 'responseCode',
+					type: 'number',
+					typeOptions: { minValue: 100, maxValue: 599 },
+					default: 200,
+					description: 'The HTTP response code to return. Defaults to 200.',
+				},
+				{
+					displayName: 'Response Headers',
+					name: 'responseHeaders',
+					placeholder: 'Add Response Header',
+					description: 'Add headers to the webhook response',
+					type: 'fixedCollection',
+					typeOptions: { multipleValues: true },
+					default: {},
+					options: [
+						{
+							name: 'entries',
+							displayName: 'Entries',
+							values: [
+								{
+									displayName: 'Name',
+									name: 'name',
+									type: 'string',
+									default: '',
+									description: 'Name of the header',
+								},
+								{
+									displayName: 'Value',
+									name: 'value',
+									type: 'string',
+									default: '',
+									description: 'Value of the header',
+								},
+							],
+						},
+					],
+				},
+				{
+					displayName: 'Put Response in Field',
+					name: 'responseKey',
+					type: 'string',
+					displayOptions: { show: { '/respondWith': ['allIncomingItems', 'firstIncomingItem'] } },
+					default: '',
+					description: 'The name of the response field to put all items in',
+					placeholder: 'e.g. data',
+				},
+			],
+		},
+	],
+	codex: {
+		categories: ['Core Nodes', 'Utility'],
+		subcategories: { 'Core Nodes': ['Helpers'] },
+		resources: {
+			primaryDocumentation: [
+				{
+					url: 'https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.respondtowebhook/',
+				},
+			],
+		},
+	},
+	iconUrl: 'icons/n8n-nodes-base/dist/nodes/RespondToWebhook/webhook.svg',
+} satisfies INodeTypeDescription;
+
+export const nodeTypeWebhookV1 = {
+	displayName: 'Webhook',
+	name: 'n8n-nodes-base.webhook',
+	group: ['trigger'],
+	version: [1, 1.1],
+	description: 'Starts the workflow when a webhook is called',
+	eventTriggerDescription: 'Waiting for you to call the Test URL',
+	activationMessage: 'You can now make calls to your production webhook URL.',
+	defaults: { name: 'Webhook' },
+	supportsCORS: true,
+	triggerPanel: {
+		header: '',
+		executionsHelp: {
+			inactive:
+				'Webhooks have two modes: test and production. <br /> <br /> <b>Use test mode while you build your workflow</b>. Click the \'listen\' button, then make a request to the test URL. The executions will show up in the editor.<br /> <br /> <b>Use production mode to run your workflow automatically</b>. <a data-key="activate">Activate</a> the workflow, then make requests to the production URL. These executions will show up in the executions list, but not in the editor.',
+			active:
+				'Webhooks have two modes: test and production. <br /> <br /> <b>Use test mode while you build your workflow</b>. Click the \'listen\' button, then make a request to the test URL. The executions will show up in the editor.<br /> <br /> <b>Use production mode to run your workflow automatically</b>. Since the workflow is activated, you can make requests to the production URL. These executions will show up in the <a data-key="executions">executions list</a>, but not in the editor.',
+		},
+		activationHint:
+			'Once you’ve finished building your workflow, run it without having to click this button by using the production webhook URL.',
+	},
+	inputs: [],
+	outputs: ['main'],
+	credentials: [
+		{
+			name: 'httpBasicAuth',
+			required: true,
+			displayOptions: { show: { authentication: ['basicAuth'] } },
+		},
+		{
+			name: 'httpHeaderAuth',
+			required: true,
+			displayOptions: { show: { authentication: ['headerAuth'] } },
+		},
+	],
+	webhooks: [
+		{
+			name: 'default',
+			httpMethod: '={{$parameter["httpMethod"] || "GET"}}',
+			isFullPath: true,
+			responseCode: '={{$parameter["responseCode"]}}',
+			responseMode: '={{$parameter["responseMode"]}}',
+			responseData:
+				'={{$parameter["responseData"] || ($parameter.options.noResponseBody ? "noData" : undefined) }}',
+			responseBinaryPropertyName: '={{$parameter["responseBinaryPropertyName"]}}',
+			responseContentType: '={{$parameter["options"]["responseContentType"]}}',
+			responsePropertyName: '={{$parameter["options"]["responsePropertyName"]}}',
+			responseHeaders: '={{$parameter["options"]["responseHeaders"]}}',
+			path: '={{$parameter["path"]}}',
+		},
+	],
+	properties: [
+		{
+			displayName: 'Authentication',
+			name: 'authentication',
+			type: 'options',
+			options: [
+				{ name: 'Basic Auth', value: 'basicAuth' },
+				{ name: 'Header Auth', value: 'headerAuth' },
+				{ name: 'None', value: 'none' },
+			],
+			default: 'none',
+			description: 'The way to authenticate',
+		},
+		{
+			displayName: 'HTTP Method',
+			name: 'httpMethod',
+			type: 'options',
+			options: [
+				{ name: 'DELETE', value: 'DELETE' },
+				{ name: 'GET', value: 'GET' },
+				{ name: 'HEAD', value: 'HEAD' },
+				{ name: 'PATCH', value: 'PATCH' },
+				{ name: 'POST', value: 'POST' },
+				{ name: 'PUT', value: 'PUT' },
+			],
+			default: 'GET',
+			description: 'The HTTP method to listen to',
+		},
+		{
+			displayName: 'Path',
+			name: 'path',
+			type: 'string',
+			default: '',
+			placeholder: 'webhook',
+			required: true,
+			description: 'The path to listen to',
+		},
+		{
+			displayName: 'Respond',
+			name: 'responseMode',
+			type: 'options',
+			options: [
+				{
+					name: 'Immediately',
+					value: 'onReceived',
+					description: 'As soon as this node executes',
+				},
+				{
+					name: 'When Last Node Finishes',
+					value: 'lastNode',
+					description: 'Returns data of the last-executed node',
+				},
+				{
+					name: "Using 'Respond to Webhook' Node",
+					value: 'responseNode',
+					description: 'Response defined in that node',
+				},
+			],
+			default: 'onReceived',
+			description: 'When and how to respond to the webhook',
+		},
+		{
+			displayName:
+				'Insert a \'Respond to Webhook\' node to control when and how you respond. <a href="https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.respondtowebhook/" target="_blank">More details</a>',
+			name: 'webhookNotice',
+			type: 'notice',
+			displayOptions: { show: { responseMode: ['responseNode'] } },
+			default: '',
+		},
+		{
+			displayName: 'Response Code',
+			name: 'responseCode',
+			type: 'number',
+			displayOptions: { hide: { responseMode: ['responseNode'] } },
+			typeOptions: { minValue: 100, maxValue: 599 },
+			default: 200,
+			description: 'The HTTP Response code to return',
+		},
+		{
+			displayName: 'Response Data',
+			name: 'responseData',
+			type: 'options',
+			displayOptions: { show: { responseMode: ['lastNode'] } },
+			options: [
+				{
+					name: 'All Entries',
+					value: 'allEntries',
+					description: 'Returns all the entries of the last node. Always returns an array.',
+				},
+				{
+					name: 'First Entry JSON',
+					value: 'firstEntryJson',
+					description:
+						'Returns the JSON data of the first entry of the last node. Always returns a JSON object.',
+				},
+				{
+					name: 'First Entry Binary',
+					value: 'firstEntryBinary',
+					description:
+						'Returns the binary data of the first entry of the last node. Always returns a binary file.',
+				},
+				{ name: 'No Response Body', value: 'noData', description: 'Returns without a body' },
+			],
+			default: 'firstEntryJson',
+			description:
+				'What data should be returned. If it should return all items as an array or only the first item as object.',
+		},
+		{
+			displayName: 'Property Name',
+			name: 'responseBinaryPropertyName',
+			type: 'string',
+			required: true,
+			default: 'data',
+			displayOptions: { show: { responseData: ['firstEntryBinary'] } },
+			description: 'Name of the binary property to return',
+		},
+		{
+			displayName: 'Options',
+			name: 'options',
+			type: 'collection',
+			placeholder: 'Add Option',
+			default: {},
+			options: [
+				{
+					displayName: 'Binary Data',
+					name: 'binaryData',
+					type: 'boolean',
+					displayOptions: { show: { '/httpMethod': ['PATCH', 'PUT', 'POST'], '@version': [1] } },
+					default: false,
+					description: 'Whether the webhook will receive binary data',
+				},
+				{
+					displayName: 'Binary Property',
+					name: 'binaryPropertyName',
+					type: 'string',
+					default: 'data',
+					displayOptions: { show: { binaryData: [true], '@version': [1] } },
+					description:
+						'Name of the binary property to write the data of the received file to. If the data gets received via "Form-Data Multipart" it will be the prefix and a number starting with 0 will be attached to it.',
+				},
+				{
+					displayName: 'Binary Property',
+					name: 'binaryPropertyName',
+					type: 'string',
+					default: 'data',
+					displayOptions: { hide: { '@version': [1] } },
+					description:
+						'Name of the binary property to write the data of the received file to, only relevant if binary data is received',
+				},
+				{
+					displayName: 'Ignore Bots',
+					name: 'ignoreBots',
+					type: 'boolean',
+					default: false,
+					description: 'Whether to ignore requests from bots like link previewers and web crawlers',
+				},
+				{
+					displayName: 'No Response Body',
+					name: 'noResponseBody',
+					type: 'boolean',
+					default: false,
+					description: 'Whether to send any body in the response',
+					displayOptions: {
+						hide: { rawBody: [true] },
+						show: { '/responseMode': ['onReceived'] },
+					},
+				},
+				{
+					displayName: 'Raw Body',
+					name: 'rawBody',
+					type: 'boolean',
+					displayOptions: {
+						show: { '@version': [1] },
+						hide: { binaryData: [true], noResponseBody: [true] },
+					},
+					default: false,
+					description: 'Raw body (binary)',
+				},
+				{
+					displayName: 'Raw Body',
+					name: 'rawBody',
+					type: 'boolean',
+					displayOptions: { hide: { noResponseBody: [true], '@version': [1] } },
+					default: false,
+					description: 'Whether to return the raw body',
+				},
+				{
+					displayName: 'Response Data',
+					name: 'responseData',
+					type: 'string',
+					displayOptions: {
+						show: { '/responseMode': ['onReceived'] },
+						hide: { noResponseBody: [true] },
+					},
+					default: '',
+					placeholder: 'success',
+					description: 'Custom response data to send',
+				},
+				{
+					displayName: 'Response Content-Type',
+					name: 'responseContentType',
+					type: 'string',
+					displayOptions: {
+						show: { '/responseData': ['firstEntryJson'], '/responseMode': ['lastNode'] },
+					},
+					default: '',
+					placeholder: 'application/xml',
+					description:
+						'Set a custom content-type to return if another one as the "application/json" should be returned',
+				},
+				{
+					displayName: 'Response Headers',
+					name: 'responseHeaders',
+					placeholder: 'Add Response Header',
+					description: 'Add headers to the webhook response',
+					type: 'fixedCollection',
+					typeOptions: { multipleValues: true },
+					default: {},
+					options: [
+						{
+							name: 'entries',
+							displayName: 'Entries',
+							values: [
+								{
+									displayName: 'Name',
+									name: 'name',
+									type: 'string',
+									default: '',
+									description: 'Name of the header',
+								},
+								{
+									displayName: 'Value',
+									name: 'value',
+									type: 'string',
+									default: '',
+									description: 'Value of the header',
+								},
+							],
+						},
+					],
+				},
+				{
+					displayName: 'Property Name',
+					name: 'responsePropertyName',
+					type: 'string',
+					displayOptions: {
+						show: { '/responseData': ['firstEntryJson'], '/responseMode': ['lastNode'] },
+					},
+					default: 'data',
+					description: 'Name of the property to return the data of instead of the whole JSON',
+				},
+				{
+					displayName: 'Allowed Origins (CORS)',
+					name: 'allowedOrigins',
+					type: 'string',
+					default: '*',
+					description:
+						'The origin(s) to allow cross-origin non-preflight requests from in a browser',
+				},
+			],
+		},
+	],
+	codex: {
+		categories: ['Development', 'Core Nodes'],
+		subcategories: { 'Core Nodes': ['Helpers'] },
+		resources: {
+			primaryDocumentation: [
+				{ url: 'https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.webhook/' },
+			],
+		},
+		alias: ['HTTP', 'API', 'Build', 'WH'],
+	},
+	iconUrl: 'icons/n8n-nodes-base/dist/nodes/Webhook/webhook.svg',
+} satisfies INodeTypeDescription;
+
+export const nodeTypeWebhookV1_1 = {
+	displayName: 'Webhook',
+	name: 'n8n-nodes-base.webhook',
+	group: ['trigger'],
+	version: [1, 1.1],
+	description: 'Starts the workflow when a webhook is called',
+	eventTriggerDescription: 'Waiting for you to call the Test URL',
+	activationMessage: 'You can now make calls to your production webhook URL.',
+	defaults: { name: 'Webhook' },
+	supportsCORS: true,
+	triggerPanel: {
+		header: '',
+		executionsHelp: {
+			inactive:
+				'Webhooks have two modes: test and production. <br /> <br /> <b>Use test mode while you build your workflow</b>. Click the \'listen\' button, then make a request to the test URL. The executions will show up in the editor.<br /> <br /> <b>Use production mode to run your workflow automatically</b>. <a data-key="activate">Activate</a> the workflow, then make requests to the production URL. These executions will show up in the executions list, but not in the editor.',
+			active:
+				'Webhooks have two modes: test and production. <br /> <br /> <b>Use test mode while you build your workflow</b>. Click the \'listen\' button, then make a request to the test URL. The executions will show up in the editor.<br /> <br /> <b>Use production mode to run your workflow automatically</b>. Since the workflow is activated, you can make requests to the production URL. These executions will show up in the <a data-key="executions">executions list</a>, but not in the editor.',
+		},
+		activationHint:
+			'Once you’ve finished building your workflow, run it without having to click this button by using the production webhook URL.',
+	},
+	inputs: [],
+	outputs: ['main'],
+	credentials: [
+		{
+			name: 'httpBasicAuth',
+			required: true,
+			displayOptions: { show: { authentication: ['basicAuth'] } },
+		},
+		{
+			name: 'httpHeaderAuth',
+			required: true,
+			displayOptions: { show: { authentication: ['headerAuth'] } },
+		},
+	],
+	webhooks: [
+		{
+			name: 'default',
+			httpMethod: '={{$parameter["httpMethod"] || "GET"}}',
+			isFullPath: true,
+			responseCode: '={{$parameter["responseCode"]}}',
+			responseMode: '={{$parameter["responseMode"]}}',
+			responseData:
+				'={{$parameter["responseData"] || ($parameter.options.noResponseBody ? "noData" : undefined) }}',
+			responseBinaryPropertyName: '={{$parameter["responseBinaryPropertyName"]}}',
+			responseContentType: '={{$parameter["options"]["responseContentType"]}}',
+			responsePropertyName: '={{$parameter["options"]["responsePropertyName"]}}',
+			responseHeaders: '={{$parameter["options"]["responseHeaders"]}}',
+			path: '={{$parameter["path"]}}',
+		},
+	],
+	properties: [
+		{
+			displayName: 'Authentication',
+			name: 'authentication',
+			type: 'options',
+			options: [
+				{ name: 'Basic Auth', value: 'basicAuth' },
+				{ name: 'Header Auth', value: 'headerAuth' },
+				{ name: 'None', value: 'none' },
+			],
+			default: 'none',
+			description: 'The way to authenticate',
+		},
+		{
+			displayName: 'HTTP Method',
+			name: 'httpMethod',
+			type: 'options',
+			options: [
+				{ name: 'DELETE', value: 'DELETE' },
+				{ name: 'GET', value: 'GET' },
+				{ name: 'HEAD', value: 'HEAD' },
+				{ name: 'PATCH', value: 'PATCH' },
+				{ name: 'POST', value: 'POST' },
+				{ name: 'PUT', value: 'PUT' },
+			],
+			default: 'GET',
+			description: 'The HTTP method to listen to',
+		},
+		{
+			displayName: 'Path',
+			name: 'path',
+			type: 'string',
+			default: '',
+			placeholder: 'webhook',
+			required: true,
+			description: 'The path to listen to',
+		},
+		{
+			displayName: 'Respond',
+			name: 'responseMode',
+			type: 'options',
+			options: [
+				{
+					name: 'Immediately',
+					value: 'onReceived',
+					description: 'As soon as this node executes',
+				},
+				{
+					name: 'When Last Node Finishes',
+					value: 'lastNode',
+					description: 'Returns data of the last-executed node',
+				},
+				{
+					name: "Using 'Respond to Webhook' Node",
+					value: 'responseNode',
+					description: 'Response defined in that node',
+				},
+			],
+			default: 'onReceived',
+			description: 'When and how to respond to the webhook',
+		},
+		{
+			displayName:
+				'Insert a \'Respond to Webhook\' node to control when and how you respond. <a href="https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.respondtowebhook/" target="_blank">More details</a>',
+			name: 'webhookNotice',
+			type: 'notice',
+			displayOptions: { show: { responseMode: ['responseNode'] } },
+			default: '',
+		},
+		{
+			displayName: 'Response Code',
+			name: 'responseCode',
+			type: 'number',
+			displayOptions: { hide: { responseMode: ['responseNode'] } },
+			typeOptions: { minValue: 100, maxValue: 599 },
+			default: 200,
+			description: 'The HTTP Response code to return',
+		},
+		{
+			displayName: 'Response Data',
+			name: 'responseData',
+			type: 'options',
+			displayOptions: { show: { responseMode: ['lastNode'] } },
+			options: [
+				{
+					name: 'All Entries',
+					value: 'allEntries',
+					description: 'Returns all the entries of the last node. Always returns an array.',
+				},
+				{
+					name: 'First Entry JSON',
+					value: 'firstEntryJson',
+					description:
+						'Returns the JSON data of the first entry of the last node. Always returns a JSON object.',
+				},
+				{
+					name: 'First Entry Binary',
+					value: 'firstEntryBinary',
+					description:
+						'Returns the binary data of the first entry of the last node. Always returns a binary file.',
+				},
+				{ name: 'No Response Body', value: 'noData', description: 'Returns without a body' },
+			],
+			default: 'firstEntryJson',
+			description:
+				'What data should be returned. If it should return all items as an array or only the first item as object.',
+		},
+		{
+			displayName: 'Property Name',
+			name: 'responseBinaryPropertyName',
+			type: 'string',
+			required: true,
+			default: 'data',
+			displayOptions: { show: { responseData: ['firstEntryBinary'] } },
+			description: 'Name of the binary property to return',
+		},
+		{
+			displayName: 'Options',
+			name: 'options',
+			type: 'collection',
+			placeholder: 'Add Option',
+			default: {},
+			options: [
+				{
+					displayName: 'Binary Data',
+					name: 'binaryData',
+					type: 'boolean',
+					displayOptions: { show: { '/httpMethod': ['PATCH', 'PUT', 'POST'], '@version': [1] } },
+					default: false,
+					description: 'Whether the webhook will receive binary data',
+				},
+				{
+					displayName: 'Binary Property',
+					name: 'binaryPropertyName',
+					type: 'string',
+					default: 'data',
+					displayOptions: { show: { binaryData: [true], '@version': [1] } },
+					description:
+						'Name of the binary property to write the data of the received file to. If the data gets received via "Form-Data Multipart" it will be the prefix and a number starting with 0 will be attached to it.',
+				},
+				{
+					displayName: 'Binary Property',
+					name: 'binaryPropertyName',
+					type: 'string',
+					default: 'data',
+					displayOptions: { hide: { '@version': [1] } },
+					description:
+						'Name of the binary property to write the data of the received file to, only relevant if binary data is received',
+				},
+				{
+					displayName: 'Ignore Bots',
+					name: 'ignoreBots',
+					type: 'boolean',
+					default: false,
+					description: 'Whether to ignore requests from bots like link previewers and web crawlers',
+				},
+				{
+					displayName: 'No Response Body',
+					name: 'noResponseBody',
+					type: 'boolean',
+					default: false,
+					description: 'Whether to send any body in the response',
+					displayOptions: {
+						hide: { rawBody: [true] },
+						show: { '/responseMode': ['onReceived'] },
+					},
+				},
+				{
+					displayName: 'Raw Body',
+					name: 'rawBody',
+					type: 'boolean',
+					displayOptions: {
+						show: { '@version': [1] },
+						hide: { binaryData: [true], noResponseBody: [true] },
+					},
+					default: false,
+					description: 'Raw body (binary)',
+				},
+				{
+					displayName: 'Raw Body',
+					name: 'rawBody',
+					type: 'boolean',
+					displayOptions: { hide: { noResponseBody: [true], '@version': [1] } },
+					default: false,
+					description: 'Whether to return the raw body',
+				},
+				{
+					displayName: 'Response Data',
+					name: 'responseData',
+					type: 'string',
+					displayOptions: {
+						show: { '/responseMode': ['onReceived'] },
+						hide: { noResponseBody: [true] },
+					},
+					default: '',
+					placeholder: 'success',
+					description: 'Custom response data to send',
+				},
+				{
+					displayName: 'Response Content-Type',
+					name: 'responseContentType',
+					type: 'string',
+					displayOptions: {
+						show: { '/responseData': ['firstEntryJson'], '/responseMode': ['lastNode'] },
+					},
+					default: '',
+					placeholder: 'application/xml',
+					description:
+						'Set a custom content-type to return if another one as the "application/json" should be returned',
+				},
+				{
+					displayName: 'Response Headers',
+					name: 'responseHeaders',
+					placeholder: 'Add Response Header',
+					description: 'Add headers to the webhook response',
+					type: 'fixedCollection',
+					typeOptions: { multipleValues: true },
+					default: {},
+					options: [
+						{
+							name: 'entries',
+							displayName: 'Entries',
+							values: [
+								{
+									displayName: 'Name',
+									name: 'name',
+									type: 'string',
+									default: '',
+									description: 'Name of the header',
+								},
+								{
+									displayName: 'Value',
+									name: 'value',
+									type: 'string',
+									default: '',
+									description: 'Value of the header',
+								},
+							],
+						},
+					],
+				},
+				{
+					displayName: 'Property Name',
+					name: 'responsePropertyName',
+					type: 'string',
+					displayOptions: {
+						show: { '/responseData': ['firstEntryJson'], '/responseMode': ['lastNode'] },
+					},
+					default: 'data',
+					description: 'Name of the property to return the data of instead of the whole JSON',
+				},
+				{
+					displayName: 'Allowed Origins (CORS)',
+					name: 'allowedOrigins',
+					type: 'string',
+					default: '*',
+					description:
+						'The origin(s) to allow cross-origin non-preflight requests from in a browser',
+				},
+			],
+		},
+	],
+	codex: {
+		categories: ['Development', 'Core Nodes'],
+		subcategories: { 'Core Nodes': ['Helpers'] },
+		resources: {
+			primaryDocumentation: [
+				{ url: 'https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.webhook/' },
+			],
+		},
+		alias: ['HTTP', 'API', 'Build', 'WH'],
+	},
+	iconUrl: 'icons/n8n-nodes-base/dist/nodes/Webhook/webhook.svg',
+} satisfies INodeTypeDescription;
+
+export const nodeTypesSet = {
+	'1': {
+		displayName: 'Set',
+		name: 'n8n-nodes-base.set',
+		icon: 'fa:pen',
+		group: ['input'],
+		description: 'Sets values on items and optionally remove other values',
+		defaultVersion: 3.2,
+		version: [1, 2],
+		defaults: { name: 'Set', color: '#0000FF' },
+		inputs: ['main'],
+		outputs: ['main'],
+		properties: [
+			{
+				displayName: 'Keep Only Set',
+				name: 'keepOnlySet',
+				type: 'boolean',
+				default: false,
+				description:
+					'Whether only the values set on this node should be kept and all others removed',
+			},
+			{
+				displayName: 'Values to Set',
+				name: 'values',
+				placeholder: 'Add Value',
+				type: 'fixedCollection',
+				typeOptions: { multipleValues: true, sortable: true },
+				description: 'The value to set',
+				default: {},
+				options: [
+					{
+						name: 'boolean',
+						displayName: 'Boolean',
+						values: [
+							{
+								displayName: 'Name',
+								name: 'name',
+								type: 'string',
+								requiresDataPath: 'single',
+								default: 'propertyName',
+								description:
+									'Name of the property to write data to. Supports dot-notation. Example: "data.person[0].name"',
+							},
+							{
+								displayName: 'Value',
+								name: 'value',
+								type: 'boolean',
+								default: false,
+								description: 'The boolean value to write in the property',
+							},
+						],
+					},
+					{
+						name: 'number',
+						displayName: 'Number',
+						values: [
+							{
+								displayName: 'Name',
+								name: 'name',
+								type: 'string',
+								default: 'propertyName',
+								requiresDataPath: 'single',
+								description:
+									'Name of the property to write data to. Supports dot-notation. Example: "data.person[0].name"',
+							},
+							{
+								displayName: 'Value',
+								name: 'value',
+								type: 'number',
+								default: 0,
+								description: 'The number value to write in the property',
+							},
+						],
+					},
+					{
+						name: 'string',
+						displayName: 'String',
+						values: [
+							{
+								displayName: 'Name',
+								name: 'name',
+								type: 'string',
+								default: 'propertyName',
+								requiresDataPath: 'single',
+								description:
+									'Name of the property to write data to. Supports dot-notation. Example: "data.person[0].name"',
+							},
+							{
+								displayName: 'Value',
+								name: 'value',
+								type: 'string',
+								default: '',
+								description: 'The string value to write in the property',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Options',
+				name: 'options',
+				type: 'collection',
+				placeholder: 'Add Option',
+				default: {},
+				options: [
+					{
+						displayName: 'Dot Notation',
+						name: 'dotNotation',
+						type: 'boolean',
+						default: true,
+						description:
+							'<p>By default, dot-notation is used in property names. This means that "a.b" will set the property "b" underneath "a" so { "a": { "b": value} }.<p></p>If that is not intended this can be deactivated, it will then set { "a.b": value } instead.</p>.',
+					},
+				],
+			},
+		],
+		codex: {
+			categories: ['Core Nodes'],
+			subcategories: { 'Core Nodes': ['Data Transformation'] },
+			resources: {
+				primaryDocumentation: [
+					{ url: 'https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.set/' },
+				],
+			},
+			alias: ['Set', 'JSON', 'Filter', 'Transform', 'Map'],
+		},
+	},
+	'2': {
+		displayName: 'Set',
+		name: 'n8n-nodes-base.set',
+		icon: 'fa:pen',
+		group: ['input'],
+		description: 'Sets values on items and optionally remove other values',
+		defaultVersion: 3.2,
+		version: [1, 2],
+		defaults: { name: 'Set', color: '#0000FF' },
+		inputs: ['main'],
+		outputs: ['main'],
+		properties: [
+			{
+				displayName: 'Keep Only Set',
+				name: 'keepOnlySet',
+				type: 'boolean',
+				default: false,
+				description:
+					'Whether only the values set on this node should be kept and all others removed',
+			},
+			{
+				displayName: 'Values to Set',
+				name: 'values',
+				placeholder: 'Add Value',
+				type: 'fixedCollection',
+				typeOptions: { multipleValues: true, sortable: true },
+				description: 'The value to set',
+				default: {},
+				options: [
+					{
+						name: 'boolean',
+						displayName: 'Boolean',
+						values: [
+							{
+								displayName: 'Name',
+								name: 'name',
+								type: 'string',
+								requiresDataPath: 'single',
+								default: 'propertyName',
+								description:
+									'Name of the property to write data to. Supports dot-notation. Example: "data.person[0].name"',
+							},
+							{
+								displayName: 'Value',
+								name: 'value',
+								type: 'boolean',
+								default: false,
+								description: 'The boolean value to write in the property',
+							},
+						],
+					},
+					{
+						name: 'number',
+						displayName: 'Number',
+						values: [
+							{
+								displayName: 'Name',
+								name: 'name',
+								type: 'string',
+								default: 'propertyName',
+								requiresDataPath: 'single',
+								description:
+									'Name of the property to write data to. Supports dot-notation. Example: "data.person[0].name"',
+							},
+							{
+								displayName: 'Value',
+								name: 'value',
+								type: 'number',
+								default: 0,
+								description: 'The number value to write in the property',
+							},
+						],
+					},
+					{
+						name: 'string',
+						displayName: 'String',
+						values: [
+							{
+								displayName: 'Name',
+								name: 'name',
+								type: 'string',
+								default: 'propertyName',
+								requiresDataPath: 'single',
+								description:
+									'Name of the property to write data to. Supports dot-notation. Example: "data.person[0].name"',
+							},
+							{
+								displayName: 'Value',
+								name: 'value',
+								type: 'string',
+								default: '',
+								description: 'The string value to write in the property',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Options',
+				name: 'options',
+				type: 'collection',
+				placeholder: 'Add Option',
+				default: {},
+				options: [
+					{
+						displayName: 'Dot Notation',
+						name: 'dotNotation',
+						type: 'boolean',
+						default: true,
+						description:
+							'<p>By default, dot-notation is used in property names. This means that "a.b" will set the property "b" underneath "a" so { "a": { "b": value} }.<p></p>If that is not intended this can be deactivated, it will then set { "a.b": value } instead.</p>.',
+					},
+				],
+			},
+		],
+		codex: {
+			categories: ['Core Nodes'],
+			subcategories: { 'Core Nodes': ['Data Transformation'] },
+			resources: {
+				primaryDocumentation: [
+					{ url: 'https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.set/' },
+				],
+			},
+			alias: ['Set', 'JSON', 'Filter', 'Transform', 'Map'],
+		},
+	},
+	'3': {
+		displayName: 'Edit Fields (Set)',
+		name: 'n8n-nodes-base.set',
+		icon: 'fa:pen',
+		group: ['input'],
+		description: 'Modify, add, or remove item fields',
+		defaultVersion: 3.2,
+		version: [3, 3.1, 3.2],
+		subtitle: '={{$parameter["mode"]}}',
+		defaults: { name: 'Edit Fields', color: '#0000FF' },
+		inputs: ['main'],
+		outputs: ['main'],
+		properties: [
+			{
+				displayName: 'Mode',
+				name: 'mode',
+				type: 'options',
+				noDataExpression: true,
+				options: [
+					{
+						name: 'Manual Mapping',
+						value: 'manual',
+						description: 'Edit item fields one by one',
+						action: 'Edit item fields one by one',
+					},
+					{
+						name: 'JSON Output',
+						value: 'raw',
+						description: 'Customize item output with JSON',
+						action: 'Customize item output with JSON',
+					},
+				],
+				default: 'manual',
+			},
+			{
+				displayName: 'Duplicate Item',
+				name: 'duplicateItem',
+				type: 'boolean',
+				default: false,
+				isNodeSetting: true,
+			},
+			{
+				displayName: 'Duplicate Item Count',
+				name: 'duplicateCount',
+				type: 'number',
+				default: 0,
+				typeOptions: { minValue: 0 },
+				description:
+					'How many times the item should be duplicated, mainly used for testing and debugging',
+				isNodeSetting: true,
+				displayOptions: { show: { duplicateItem: [true] } },
+			},
+			{
+				displayName:
+					'Item duplication is set in the node settings. This option will be ignored when the workflow runs automatically.',
+				name: 'duplicateWarning',
+				type: 'notice',
+				default: '',
+				displayOptions: { show: { duplicateItem: [true] } },
+			},
+			{
+				displayName: 'JSON Output',
+				name: 'jsonOutput',
+				type: 'json',
+				typeOptions: { rows: 5 },
+				default: '{\n  "my_field_1": "value",\n  "my_field_2": 1\n}',
+				validateType: 'object',
+				ignoreValidationDuringExecution: true,
+				displayOptions: { show: { mode: ['raw'] } },
+			},
+			{
+				displayName: 'Fields to Set',
+				name: 'fields',
+				placeholder: 'Add Field',
+				type: 'fixedCollection',
+				description: 'Edit existing fields or add new ones to modify the output data',
+				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',
+								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,
+							},
+						],
+					},
+				],
+				displayOptions: { show: { mode: ['manual'] } },
+			},
+			{
+				displayName: 'Include in Output',
+				name: 'include',
+				type: 'options',
+				description: 'How to select the fields you want to include in your output items',
+				default: 'all',
+				options: [
+					{
+						name: 'All Input Fields',
+						value: 'all',
+						description: 'Also include all unchanged fields from the input',
+					},
+					{
+						name: 'No Input Fields',
+						value: 'none',
+						description: 'Include only the fields specified above',
+					},
+					{
+						name: 'Selected Input Fields',
+						value: 'selected',
+						description: 'Also include the fields listed in the parameter “Fields to Include”',
+					},
+					{
+						name: 'All Input Fields Except',
+						value: 'except',
+						description: 'Exclude the fields listed in the parameter “Fields to Exclude”',
+					},
+				],
+			},
+			{
+				displayName: 'Fields to Include',
+				name: 'includeFields',
+				type: 'string',
+				default: '',
+				placeholder: 'e.g. fieldToInclude1,fieldToInclude2',
+				description:
+					'Comma-separated list of the field names you want to include in the output. You can drag the selected fields from the input panel.',
+				requiresDataPath: 'multiple',
+				displayOptions: { show: { include: ['selected'] } },
+			},
+			{
+				displayName: 'Fields to Exclude',
+				name: 'excludeFields',
+				type: 'string',
+				default: '',
+				placeholder: 'e.g. fieldToExclude1,fieldToExclude2',
+				description:
+					'Comma-separated list of the field names you want to exclude from the output. You can drag the selected fields from the input panel.',
+				requiresDataPath: 'multiple',
+				displayOptions: { show: { include: ['except'] } },
+			},
+			{
+				displayName: 'Options',
+				name: 'options',
+				type: 'collection',
+				placeholder: 'Add Option',
+				default: {},
+				options: [
+					{
+						displayName: 'Include Binary Data',
+						name: 'includeBinary',
+						type: 'boolean',
+						default: true,
+						description: 'Whether binary data should be included if present in the input item',
+					},
+					{
+						displayName: 'Ignore Type Conversion Errors',
+						name: 'ignoreConversionErrors',
+						type: 'boolean',
+						default: false,
+						description:
+							'Whether to ignore field type errors and apply a less strict type conversion',
+						displayOptions: { show: { '/mode': ['manual'] } },
+					},
+					{
+						displayName: 'Support Dot Notation',
+						name: 'dotNotation',
+						type: 'boolean',
+						default: true,
+						description:
+							'By default, dot-notation is used in property names. This means that "a.b" will set the property "b" underneath "a" so { "a": { "b": value} }. If that is not intended this can be deactivated, it will then set { "a.b": value } instead.',
+					},
+				],
+			},
+		],
+		codex: {
+			categories: ['Core Nodes'],
+			subcategories: { 'Core Nodes': ['Data Transformation'] },
+			resources: {
+				primaryDocumentation: [
+					{ url: 'https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.set/' },
+				],
+			},
+			alias: ['Set', 'JSON', 'Filter', 'Transform', 'Map'],
+		},
+	},
+	'3.1': {
+		displayName: 'Edit Fields (Set)',
+		name: 'n8n-nodes-base.set',
+		icon: 'fa:pen',
+		group: ['input'],
+		description: 'Modify, add, or remove item fields',
+		defaultVersion: 3.2,
+		version: [3, 3.1, 3.2],
+		subtitle: '={{$parameter["mode"]}}',
+		defaults: { name: 'Edit Fields', color: '#0000FF' },
+		inputs: ['main'],
+		outputs: ['main'],
+		properties: [
+			{
+				displayName: 'Mode',
+				name: 'mode',
+				type: 'options',
+				noDataExpression: true,
+				options: [
+					{
+						name: 'Manual Mapping',
+						value: 'manual',
+						description: 'Edit item fields one by one',
+						action: 'Edit item fields one by one',
+					},
+					{
+						name: 'JSON Output',
+						value: 'raw',
+						description: 'Customize item output with JSON',
+						action: 'Customize item output with JSON',
+					},
+				],
+				default: 'manual',
+			},
+			{
+				displayName: 'Duplicate Item',
+				name: 'duplicateItem',
+				type: 'boolean',
+				default: false,
+				isNodeSetting: true,
+			},
+			{
+				displayName: 'Duplicate Item Count',
+				name: 'duplicateCount',
+				type: 'number',
+				default: 0,
+				typeOptions: { minValue: 0 },
+				description:
+					'How many times the item should be duplicated, mainly used for testing and debugging',
+				isNodeSetting: true,
+				displayOptions: { show: { duplicateItem: [true] } },
+			},
+			{
+				displayName:
+					'Item duplication is set in the node settings. This option will be ignored when the workflow runs automatically.',
+				name: 'duplicateWarning',
+				type: 'notice',
+				default: '',
+				displayOptions: { show: { duplicateItem: [true] } },
+			},
+			{
+				displayName: 'JSON Output',
+				name: 'jsonOutput',
+				type: 'json',
+				typeOptions: { rows: 5 },
+				default: '{\n  "my_field_1": "value",\n  "my_field_2": 1\n}',
+				validateType: 'object',
+				ignoreValidationDuringExecution: true,
+				displayOptions: { show: { mode: ['raw'] } },
+			},
+			{
+				displayName: 'Fields to Set',
+				name: 'fields',
+				placeholder: 'Add Field',
+				type: 'fixedCollection',
+				description: 'Edit existing fields or add new ones to modify the output data',
+				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',
+								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,
+							},
+						],
+					},
+				],
+				displayOptions: { show: { mode: ['manual'] } },
+			},
+			{
+				displayName: 'Include in Output',
+				name: 'include',
+				type: 'options',
+				description: 'How to select the fields you want to include in your output items',
+				default: 'all',
+				options: [
+					{
+						name: 'All Input Fields',
+						value: 'all',
+						description: 'Also include all unchanged fields from the input',
+					},
+					{
+						name: 'No Input Fields',
+						value: 'none',
+						description: 'Include only the fields specified above',
+					},
+					{
+						name: 'Selected Input Fields',
+						value: 'selected',
+						description: 'Also include the fields listed in the parameter “Fields to Include”',
+					},
+					{
+						name: 'All Input Fields Except',
+						value: 'except',
+						description: 'Exclude the fields listed in the parameter “Fields to Exclude”',
+					},
+				],
+			},
+			{
+				displayName: 'Fields to Include',
+				name: 'includeFields',
+				type: 'string',
+				default: '',
+				placeholder: 'e.g. fieldToInclude1,fieldToInclude2',
+				description:
+					'Comma-separated list of the field names you want to include in the output. You can drag the selected fields from the input panel.',
+				requiresDataPath: 'multiple',
+				displayOptions: { show: { include: ['selected'] } },
+			},
+			{
+				displayName: 'Fields to Exclude',
+				name: 'excludeFields',
+				type: 'string',
+				default: '',
+				placeholder: 'e.g. fieldToExclude1,fieldToExclude2',
+				description:
+					'Comma-separated list of the field names you want to exclude from the output. You can drag the selected fields from the input panel.',
+				requiresDataPath: 'multiple',
+				displayOptions: { show: { include: ['except'] } },
+			},
+			{
+				displayName: 'Options',
+				name: 'options',
+				type: 'collection',
+				placeholder: 'Add Option',
+				default: {},
+				options: [
+					{
+						displayName: 'Include Binary Data',
+						name: 'includeBinary',
+						type: 'boolean',
+						default: true,
+						description: 'Whether binary data should be included if present in the input item',
+					},
+					{
+						displayName: 'Ignore Type Conversion Errors',
+						name: 'ignoreConversionErrors',
+						type: 'boolean',
+						default: false,
+						description:
+							'Whether to ignore field type errors and apply a less strict type conversion',
+						displayOptions: { show: { '/mode': ['manual'] } },
+					},
+					{
+						displayName: 'Support Dot Notation',
+						name: 'dotNotation',
+						type: 'boolean',
+						default: true,
+						description:
+							'By default, dot-notation is used in property names. This means that "a.b" will set the property "b" underneath "a" so { "a": { "b": value} }. If that is not intended this can be deactivated, it will then set { "a.b": value } instead.',
+					},
+				],
+			},
+		],
+		codex: {
+			categories: ['Core Nodes'],
+			subcategories: { 'Core Nodes': ['Data Transformation'] },
+			resources: {
+				primaryDocumentation: [
+					{ url: 'https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.set/' },
+				],
+			},
+			alias: ['Set', 'JSON', 'Filter', 'Transform', 'Map'],
+		},
+	},
+	'3.2': {
+		displayName: 'Edit Fields (Set)',
+		name: 'n8n-nodes-base.set',
+		icon: 'fa:pen',
+		group: ['input'],
+		description: 'Modify, add, or remove item fields',
+		defaultVersion: 3.2,
+		version: [3, 3.1, 3.2],
+		subtitle: '={{$parameter["mode"]}}',
+		defaults: { name: 'Edit Fields', color: '#0000FF' },
+		inputs: ['main'],
+		outputs: ['main'],
+		properties: [
+			{
+				displayName: 'Mode',
+				name: 'mode',
+				type: 'options',
+				noDataExpression: true,
+				options: [
+					{
+						name: 'Manual Mapping',
+						value: 'manual',
+						description: 'Edit item fields one by one',
+						action: 'Edit item fields one by one',
+					},
+					{
+						name: 'JSON Output',
+						value: 'raw',
+						description: 'Customize item output with JSON',
+						action: 'Customize item output with JSON',
+					},
+				],
+				default: 'manual',
+			},
+			{
+				displayName: 'Duplicate Item',
+				name: 'duplicateItem',
+				type: 'boolean',
+				default: false,
+				isNodeSetting: true,
+			},
+			{
+				displayName: 'Duplicate Item Count',
+				name: 'duplicateCount',
+				type: 'number',
+				default: 0,
+				typeOptions: { minValue: 0 },
+				description:
+					'How many times the item should be duplicated, mainly used for testing and debugging',
+				isNodeSetting: true,
+				displayOptions: { show: { duplicateItem: [true] } },
+			},
+			{
+				displayName:
+					'Item duplication is set in the node settings. This option will be ignored when the workflow runs automatically.',
+				name: 'duplicateWarning',
+				type: 'notice',
+				default: '',
+				displayOptions: { show: { duplicateItem: [true] } },
+			},
+			{
+				displayName: 'JSON Output',
+				name: 'jsonOutput',
+				type: 'json',
+				typeOptions: { rows: 5 },
+				default: '{\n  "my_field_1": "value",\n  "my_field_2": 1\n}',
+				validateType: 'object',
+				ignoreValidationDuringExecution: true,
+				displayOptions: { show: { mode: ['raw'] } },
+			},
+			{
+				displayName: 'Fields to Set',
+				name: 'fields',
+				placeholder: 'Add Field',
+				type: 'fixedCollection',
+				description: 'Edit existing fields or add new ones to modify the output data',
+				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',
+								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,
+							},
+						],
+					},
+				],
+				displayOptions: { show: { mode: ['manual'] } },
+			},
+			{
+				displayName: 'Include in Output',
+				name: 'include',
+				type: 'options',
+				description: 'How to select the fields you want to include in your output items',
+				default: 'all',
+				options: [
+					{
+						name: 'All Input Fields',
+						value: 'all',
+						description: 'Also include all unchanged fields from the input',
+					},
+					{
+						name: 'No Input Fields',
+						value: 'none',
+						description: 'Include only the fields specified above',
+					},
+					{
+						name: 'Selected Input Fields',
+						value: 'selected',
+						description: 'Also include the fields listed in the parameter “Fields to Include”',
+					},
+					{
+						name: 'All Input Fields Except',
+						value: 'except',
+						description: 'Exclude the fields listed in the parameter “Fields to Exclude”',
+					},
+				],
+			},
+			{
+				displayName: 'Fields to Include',
+				name: 'includeFields',
+				type: 'string',
+				default: '',
+				placeholder: 'e.g. fieldToInclude1,fieldToInclude2',
+				description:
+					'Comma-separated list of the field names you want to include in the output. You can drag the selected fields from the input panel.',
+				requiresDataPath: 'multiple',
+				displayOptions: { show: { include: ['selected'] } },
+			},
+			{
+				displayName: 'Fields to Exclude',
+				name: 'excludeFields',
+				type: 'string',
+				default: '',
+				placeholder: 'e.g. fieldToExclude1,fieldToExclude2',
+				description:
+					'Comma-separated list of the field names you want to exclude from the output. You can drag the selected fields from the input panel.',
+				requiresDataPath: 'multiple',
+				displayOptions: { show: { include: ['except'] } },
+			},
+			{
+				displayName: 'Options',
+				name: 'options',
+				type: 'collection',
+				placeholder: 'Add Option',
+				default: {},
+				options: [
+					{
+						displayName: 'Include Binary Data',
+						name: 'includeBinary',
+						type: 'boolean',
+						default: true,
+						description: 'Whether binary data should be included if present in the input item',
+					},
+					{
+						displayName: 'Ignore Type Conversion Errors',
+						name: 'ignoreConversionErrors',
+						type: 'boolean',
+						default: false,
+						description:
+							'Whether to ignore field type errors and apply a less strict type conversion',
+						displayOptions: { show: { '/mode': ['manual'] } },
+					},
+					{
+						displayName: 'Support Dot Notation',
+						name: 'dotNotation',
+						type: 'boolean',
+						default: true,
+						description:
+							'By default, dot-notation is used in property names. This means that "a.b" will set the property "b" underneath "a" so { "a": { "b": value} }. If that is not intended this can be deactivated, it will then set { "a.b": value } instead.',
+					},
+				],
+			},
+		],
+		codex: {
+			categories: ['Core Nodes'],
+			subcategories: { 'Core Nodes': ['Data Transformation'] },
+			resources: {
+				primaryDocumentation: [
+					{ url: 'https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.set/' },
+				],
+			},
+			alias: ['Set', 'JSON', 'Filter', 'Transform', 'Map'],
+		},
+	},
+} satisfies { [version: string]: INodeTypeDescription };
diff --git a/packages/editor-ui/src/utils/testData/templateTestData.ts b/packages/editor-ui/src/utils/testData/templateTestData.ts
new file mode 100644
index 0000000000000..6a1e156063756
--- /dev/null
+++ b/packages/editor-ui/src/utils/testData/templateTestData.ts
@@ -0,0 +1,437 @@
+// eslint-disable-next-line import/no-extraneous-dependencies
+import { faker } from '@faker-js/faker/locale/en';
+import type { ITemplatesWorkflowFull, IWorkflowTemplateNode } from '@/Interface';
+
+export const newWorkflowTemplateNode = ({
+	type,
+	...optionalOpts
+}: Pick<IWorkflowTemplateNode, 'type'> &
+	Partial<IWorkflowTemplateNode>): IWorkflowTemplateNode => ({
+	type,
+	name: faker.commerce.productName(),
+	position: [0, 0],
+	parameters: {},
+	typeVersion: 1,
+	...optionalOpts,
+});
+
+export const fullShopifyTelegramTwitterTemplate = {
+	full: true,
+	id: 1205,
+	name: 'Promote new Shopify products on Twitter and Telegram',
+	totalViews: 485,
+	createdAt: '2021-08-24T10:40:50.007Z',
+	description:
+		'This workflow automatically promotes your new Shopify products on Twitter and Telegram. This workflow is also featured in the blog post [*6 e-commerce workflows to power up your Shopify store*](https://n8n.io/blog/no-code-ecommerce-workflow-automations/#promote-your-new-products-on-social-media).\n\n## Prerequisites\n\n- A Shopify account and [credentials](https://docs.n8n.io/integrations/credentials/shopify/)\n- A Twitter account and [credentials](https://docs.n8n.io/integrations/credentials/twitter/)\n- A Telegram account and [credentials](https://docs.n8n.io/integrations/credentials/telegram/) for the channel you want to send messages to.\n\n## Nodes\n\n- [Shopify Trigger node](https://docs.n8n.io/integrations/trigger-nodes/n8n-nodes-base.shopifytrigger/) triggers the workflow when you create a new product in Shopify.\n- [Twitter node](https://docs.n8n.io/integrations/nodes/n8n-nodes-base.twitter/) posts a tweet with the text "Hey there, my design is now on a new product! Visit my {shop name} to get this cool {product title} (and check out more {product type})".\n- [Telegram node](https://docs.n8n.io/integrations/nodes/n8n-nodes-base.telegram/) posts a message with the same text as above in a Telegram channel.',
+	workflow: {
+		nodes: [
+			{
+				name: 'Twitter',
+				type: 'n8n-nodes-base.twitter',
+				position: [720, -220],
+				parameters: {
+					text: '=Hey there, my design is now on a new product ✨\nVisit my {{$json["vendor"]}} shop to get this cool{{$json["title"]}} (and check out more {{$json["product_type"]}}) 🛍️',
+					additionalFields: {},
+				},
+				credentials: {
+					twitterOAuth1Api: 'twitter',
+				},
+				typeVersion: 1,
+			},
+			{
+				name: 'Telegram',
+				type: 'n8n-nodes-base.telegram',
+				position: [720, -20],
+				parameters: {
+					text: '=Hey there, my design is now on a new product!\nVisit my {{$json["vendor"]}} shop to get this cool{{$json["title"]}} (and check out more {{$json["product_type"]}})',
+					chatId: '123456',
+					additionalFields: {},
+				},
+				credentials: {
+					telegramApi: 'telegram_habot',
+				},
+				typeVersion: 1,
+			},
+			{
+				name: 'product created',
+				type: 'n8n-nodes-base.shopifyTrigger',
+				position: [540, -110],
+				webhookId: '2a7e0e50-8f09-4a2b-bf54-a849a6ac4fe0',
+				parameters: {
+					topic: 'products/create',
+				},
+				credentials: {
+					shopifyApi: 'shopify_nodeqa',
+				},
+				typeVersion: 1,
+			},
+		],
+		connections: {
+			'product created': {
+				main: [
+					[
+						{
+							node: 'Twitter',
+							type: 'main',
+							index: 0,
+						},
+						{
+							node: 'Telegram',
+							type: 'main',
+							index: 0,
+						},
+					],
+				],
+			},
+		},
+	},
+	workflowInfo: {
+		nodeCount: 3,
+		nodeTypes: {
+			'n8n-nodes-base.twitter': {
+				count: 1,
+			},
+			'n8n-nodes-base.telegram': {
+				count: 1,
+			},
+			'n8n-nodes-base.shopifyTrigger': {
+				count: 1,
+			},
+		},
+	},
+	user: {
+		username: 'lorenanda',
+	},
+	nodes: [
+		{
+			id: 49,
+			icon: 'file:telegram.svg',
+			name: 'n8n-nodes-base.telegram',
+			defaults: {
+				name: 'Telegram',
+			},
+			iconData: {
+				type: 'file',
+				fileBuffer:
+					'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgNjYgNjYiIGZpbGw9IiNmZmYiIGZpbGwtcnVsZT0iZXZlbm9kZCIgc3Ryb2tlPSIjMDAwIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiPjx1c2UgeGxpbms6aHJlZj0iI2EiIHg9Ii41IiB5PSIuNSIvPjxzeW1ib2wgaWQ9ImEiIG92ZXJmbG93PSJ2aXNpYmxlIj48ZyBzdHJva2U9Im5vbmUiIGZpbGwtcnVsZT0ibm9uemVybyI+PHBhdGggZD0iTTAgMzJjMCAxNy42NzMgMTQuMzI3IDMyIDMyIDMyczMyLTE0LjMyNyAzMi0zMlM0OS42NzMgMCAzMiAwIDAgMTQuMzI3IDAgMzIiIGZpbGw9IiMzN2FlZTIiLz48cGF0aCBkPSJNMjEuNjYxIDM0LjMzOGwzLjc5NyAxMC41MDhzLjQ3NS45ODMuOTgzLjk4MyA4LjA2OC03Ljg2NCA4LjA2OC03Ljg2NGw4LjQwNy0xNi4yMzctMjEuMTE5IDkuODk4eiIgZmlsbD0iI2M4ZGFlYSIvPjxwYXRoIGQ9Ik0yNi42OTUgMzcuMDM0bC0uNzI5IDcuNzQ2cy0uMzA1IDIuMzczIDIuMDY4IDBsNC42NDQtNC4yMDMiIGZpbGw9IiNhOWM2ZDgiLz48cGF0aCBkPSJNMjEuNzMgMzQuNzEybC03LjgwOS0yLjU0NXMtLjkzMi0uMzc4LS42MzMtMS4yMzdjLjA2Mi0uMTc3LjE4Ni0uMzI4LjU1OS0uNTg4IDEuNzMxLTEuMjA2IDMyLjAyOC0xMi4wOTYgMzIuMDI4LTEyLjA5NnMuODU2LS4yODggMS4zNjEtLjA5N2MuMjMxLjA4OC4zNzguMTg3LjUwMy41NDguMDQ1LjEzMi4wNzEuNDExLjA2OC42ODktLjAwMy4yMDEtLjAyNy4zODYtLjA0NS42NzgtLjE4NCAyLjk3OC01LjcwNiAyNS4xOTgtNS43MDYgMjUuMTk4cy0uMzMgMS4zLTEuNTE0IDEuMzQ1Yy0uNDMyLjAxNi0uOTU2LS4wNzEtMS41ODItLjYxLTIuMzIzLTEuOTk4LTEwLjM1Mi03LjM5NC0xMi4xMjYtOC41OGEuMzQuMzQgMCAwMS0uMTQ2LS4yMzljLS4wMjUtLjEyNS4xMDgtLjI4LjEwOC0uMjhzMTMuOTgtMTIuNDI3IDE0LjM1Mi0xMy43MzFjLjAyOS0uMTAxLS4wNzktLjE1MS0uMjI2LS4xMDctLjkyOS4zNDItMTcuMDI1IDEwLjUwNi0xOC44MDEgMTEuNjI5LS4xMDQuMDY2LS4zOTUuMDIzLS4zOTUuMDIzIi8+PC9nPjwvc3ltYm9sPjwvc3ZnPg==',
+			},
+			categories: [
+				{
+					id: 6,
+					name: 'Communication',
+				},
+			],
+			displayName: 'Telegram',
+			typeVersion: 1,
+		},
+		{
+			id: 107,
+			icon: 'file:shopify.svg',
+			name: 'n8n-nodes-base.shopifyTrigger',
+			defaults: {
+				name: 'Shopify Trigger',
+			},
+			iconData: {
+				type: 'file',
+				fileBuffer:
+					'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgNTggNjYiIGZpbGw9IiNmZmYiIGZpbGwtcnVsZT0iZXZlbm9kZCIgc3Ryb2tlPSIjMDAwIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiPjx1c2UgeGxpbms6aHJlZj0iI2EiIHg9Ii41IiB5PSIuNSIvPjxzeW1ib2wgaWQ9ImEiIG92ZXJmbG93PSJ2aXNpYmxlIj48ZyBzdHJva2U9Im5vbmUiIGZpbGwtcnVsZT0ibm9uemVybyI+PHBhdGggZD0iTTQ5LjI1NSAxMi40ODRhLjYzMy42MzMgMCAwMC0uNTY0LS41MjdjLS4yMjUtLjAzNy01LjE3LS4zNzYtNS4xNy0uMzc2bC0zLjc3LTMuNzdjLS4zNC0uMzc2LTEuMDkyLS4yNjYtMS4zNzYtLjE4OC0uMDM3IDAtLjc1Mi4yMjUtMS45MjIuNjA1LTEuMTM3LTMuMy0zLjE1LTYuMzA2LTYuNjk2LTYuMzA2aC0uMzAzQzI4LjQzOC42MDUgMjcuMTk0IDAgMjYuMTQ0IDBjLTguMjU2LjAzNy0xMi4yIDEwLjMzMy0xMy40MzQgMTUuNTk0bC01Ljc3IDEuNzdjLTEuNzcuNTY0LTEuODM1LjYwNS0yLjA3MyAyLjI5M0wwIDU3LjE3NSAzNi40NjggNjRsMTkuNzYzLTQuMjZjMC0uMDM3LTYuOTQtNDYuODk3LTYuOTc2LTQ3LjI1NXpNMzQuNDMxIDguODZjLS45MTcuMzAzLTEuOTYzLjYwNS0zLjEuOTQ1di0uNjhhMTUuMDMgMTUuMDMgMCAwMC0uNzUyLTQuOTk5YzEuODQ4LjI4NCAzLjEgMi4zNTcgMy44NDMgNC43MzN6bS02LjA2OC00LjI5OGMuNjAzIDEuNzc4Ljg4MyAzLjY1LjgyNiA1LjUyN3YuMzRsLTYuMzc1IDEuOTYzYzEuMjQ4LTQuNjYgMy41NS02Ljk2MiA1LjU1LTcuODN6bS0yLjQ1LTIuMjkzYTEuOTQgMS45NCAwIDAxMS4wNTUuMzM5Yy0yLjY2IDEuMjM4LTUuNDcyIDQuMzY2LTYuNjc4IDEwLjYyN2wtNS4wNDUgMS41NDZDMTYuNjY4IDEwLjAzIDE5Ljk4OCAyLjI2IDI1LjkxIDIuMjZ6IiBmaWxsPSIjOTViZjQ3Ii8+PHBhdGggZD0iTTQ4LjY5MSAxMS45NTdjLS4yMjUtLjAzNy01LjE3LS4zNzYtNS4xNy0uMzc2bC0zLjc3LTMuNzdhLjc1My43NTMgMCAwMC0uNTI3LS4yMjVMMzYuNDcyIDY0bDE5Ljc2My00LjI2LTYuOTgtNDcuMjE4YS42OC42OCAwIDAwLS41NjQtLjU2NHoiIGZpbGw9IiM1ZThlM2UiLz48cGF0aCBkPSJNMjkuNzU4IDIyLjlsLTIuNDU0IDcuMjQyYTExLjM2IDExLjM2IDAgMDAtNC43NTItMS4xMzNjLTMuODQ4IDAtNC4wMzYgMi40MTItNC4wMzYgMy4wMTggMCAzLjI5OCA4LjYzNiA0LjU2NCA4LjYzNiAxMi4zMzMgMCA2LjEtMy44ODUgMTAuMDMtOS4xIDEwLjAzLTYuMjYgMC05LjQ2Ny0zLjg4NS05LjQ2Ny0zLjg4NWwxLjY2NS01LjU1czMuMjggMi44MyA2LjA3MyAyLjgzYTIuNDcgMi40NyAwIDAwMi41NjQtMi40OWMwLTQuMzQtNy4xLTQuNTI3LTcuMS0xMS42MTggMC01Ljk2MiA0LjI5OC0xMS43NyAxMi45MzQtMTEuNzcgMy4zOTQuMDUgNS4wMTggMSA1LjAxOCAxeiIvPjwvZz48L3N5bWJvbD48L3N2Zz4=',
+			},
+			categories: [
+				{
+					id: 2,
+					name: 'Sales',
+				},
+			],
+			displayName: 'Shopify Trigger',
+			typeVersion: 1,
+		},
+		{
+			id: 325,
+			icon: 'file:x.svg',
+			name: 'n8n-nodes-base.twitter',
+			defaults: {
+				name: 'X',
+			},
+			iconData: {
+				type: 'file',
+				fileBuffer:
+					'data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgMjQgMjQiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PHBhdGggZD0iTTE4LjI0NCAyLjI1aDMuMzA4bC03LjIyNyA4LjI2IDguNTAyIDExLjI0SDE2LjE3bC01LjIxNC02LjgxN0w0Ljk5IDIxLjc1SDEuNjhsNy43My04LjgzNUwxLjI1NCAyLjI1SDguMDhsNC43MTMgNi4yMzF6bS0xLjE2MSAxNy41MmgxLjgzM0w3LjA4NCA0LjEyNkg1LjExN3oiPjwvcGF0aD48L3N2Zz4K',
+			},
+			categories: [
+				{
+					id: 1,
+					name: 'Marketing & Content',
+				},
+			],
+			displayName: 'X (Formerly Twitter)',
+			typeVersion: 2,
+		},
+	],
+	categories: [
+		{
+			id: 2,
+			name: 'Sales',
+		},
+		{
+			id: 19,
+			name: 'Marketing & Growth',
+		},
+	],
+	image: [
+		{
+			id: 527,
+			url: 'https://n8niostorageaccount.blob.core.windows.net/n8nio-strapi-blobs-prod/assets/89a078b208fe4c6181902608b1cd1332.png',
+		},
+	],
+} satisfies ITemplatesWorkflowFull;
+
+export const fullSaveEmailAttachmentsToNextCloudTemplate = {
+	id: 1344,
+	name: 'Save email attachments to Nextcloud',
+	totalViews: 649,
+	createdAt: '2021-11-29T13:59:16.771Z',
+	description:
+		'This workflow will take all emails you put into a certain folder, upload any attachements to Nextcloud, and mark the emails as read (configurable).\n\nAttachements will be saved with automatically generated filenames:\n`2021-01-01_From-Sender-Name_Filename-of-attachement.pdf`\n\nInstructions:\n1. **Allow lodash to be used in n8n** (or rewrite the code...)\n  `NODE_FUNCTION_ALLOW_EXTERNAL=lodash` (environment variable)\n2. Import workflow\n3. Set credentials for Email & Nextcloud nodes\n4. Configure to use correct folder / custom filters\n5. Activate\n\nCustom filter examples:\n- Only unread emails:\n  `Custom Email Config` = `["UNSEEN"]`\n- Filter emails by \'to\' address:\n  `Custom Email Config` = `[["TO", "example+invoices@posteo.de"]]`',
+	workflow: {
+		nodes: [
+			{
+				name: 'IMAP Email',
+				type: 'n8n-nodes-base.emailReadImap',
+				position: [240, 420],
+				parameters: {
+					format: 'resolved',
+					mailbox: 'Invoices',
+					options: { customEmailConfig: '["ALL"]' },
+				},
+				typeVersion: 1,
+			},
+			{
+				name: 'Nextcloud',
+				type: 'n8n-nodes-base.nextCloud',
+				position: [940, 420],
+				parameters: {
+					path: '=Documents/Invoices/{{$json["date"]}}_{{$json["from"]}}_{{$binary.file.fileName}}',
+					binaryDataUpload: true,
+					binaryPropertyName: 'file',
+				},
+				typeVersion: 1,
+			},
+			{
+				name: 'Map each attachment',
+				type: 'n8n-nodes-base.function',
+				position: [620, 420],
+				parameters: {
+					functionCode:
+						"const _ = require('lodash')\n\nconst sanitize = str => _.chain(str)\n  .replace(/[^A-Za-z0-9&.-]/g, '-') // sanitise via whitelist of characters\n  .replace(/-(?=-)/g, '') // remove repeated dashes - https://regexr.com/6ag8h\n  .trim('-') // trim any leading/trailing dashes\n  .truncate({\n    length: 60,\n    omission: '-' // when the string ends with '-', you'll know it was truncated\n  })\n  .value()\n\nconst result = _.flatMap(items.map(item => {\n  //console.log({item})\n\n  // Maps each attachment to a separate item\n  return _.values(item.binary).map(file => {\n    console.log(\"Saving attachement:\", file.fileName, 'from:', ...item.json.from.value)\n    \n    // sanitize filename but exclude extension\n    const filename_parts = file.fileName.split('.')\n    const ext = _.slice(filename_parts, filename_parts.length-1)\n    const filename_main = _.join(_.dropRight(filename_parts), '.')\n    file.fileName = sanitize(filename_main) + '.' + ext\n    \n    return {\n      json: {\n        from: sanitize(item.json.from.value[0].name),\n        date: sanitize(new Date(item.json.date).toISOString().split(\"T\")[0]) // get date part \"2020-01-01\"\n      }, \n      binary: { file }\n    }\n  })\n}))\n\n//console.log(result)\nreturn result",
+				},
+				typeVersion: 1,
+			},
+		],
+		connections: {
+			'IMAP Email': { main: [[{ node: 'Map each attachment', type: 'main', index: 0 }]] },
+			'Map each attachment': { main: [[{ node: 'Nextcloud', type: 'main', index: 0 }]] },
+		},
+	},
+	workflowInfo: {
+		nodeCount: 3,
+		nodeTypes: {
+			'n8n-nodes-base.function': { count: 1 },
+			'n8n-nodes-base.nextCloud': { count: 1 },
+			'n8n-nodes-base.emailReadImap': { count: 1 },
+		},
+	},
+	user: { username: 'tennox' },
+	nodes: [
+		{
+			id: 10,
+			icon: 'fa:inbox',
+			name: 'n8n-nodes-base.emailReadImap',
+			defaults: { name: 'Email Trigger (IMAP)', color: '#44AA22' },
+			iconData: { icon: 'inbox', type: 'icon' },
+			categories: [
+				{ id: 6, name: 'Communication' },
+				{ id: 9, name: 'Core Nodes' },
+			],
+			displayName: 'Email Trigger (IMAP)',
+			typeVersion: 2,
+		},
+		{
+			id: 14,
+			icon: 'fa:code',
+			name: 'n8n-nodes-base.function',
+			defaults: { name: 'Function', color: '#FF9922' },
+			iconData: { icon: 'code', type: 'icon' },
+			categories: [
+				{ id: 5, name: 'Development' },
+				{ id: 9, name: 'Core Nodes' },
+			],
+			displayName: 'Function',
+			typeVersion: 1,
+		},
+		{
+			id: 25,
+			icon: 'file:nextcloud.svg',
+			name: 'n8n-nodes-base.nextCloud',
+			defaults: { name: 'Nextcloud' },
+			iconData: {
+				type: 'file',
+				fileBuffer:
+					'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgNzYgNTEiIGZpbGw9IiNmZmYiIGZpbGwtcnVsZT0iZXZlbm9kZCIgc3Ryb2tlPSIjMDAwIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiPjx1c2UgeGxpbms6aHJlZj0iI0EiIHg9Ii41IiB5PSIuNSIvPjxzeW1ib2wgaWQ9IkEiIG92ZXJmbG93PSJ2aXNpYmxlIj48cGF0aCBkPSJNMzcuNTMzIDBjLTcuNzcgMC0xNC4zNTUgNS4yNjgtMTYuMzk2IDEyLjM3OS0xLjc3OC0zLjgxOS01LjU5Ny02LjQ1My0xMC4wNzUtNi40NTNDNS4wMDQgNS45MjYgMCAxMC45MzEgMCAxNy4wNTRhMTEuMTYgMTEuMTYgMCAwIDAgMTEuMTI4IDExLjEyOGM0LjQxMiAwIDguMjk3LTIuNjM0IDEwLjA3NS02LjQ1M2ExNi45OSAxNi45OSAwIDAgMCAxNi4zMyAxMi4zNzljNy43MDQgMCAxNC4yODktNS4yMDIgMTYuMzk2LTEyLjI0OCAxLjc3OCAzLjY4NyA1LjU5NyA2LjI1NiA5Ljk0MyA2LjI1NkExMS4xNiAxMS4xNiAwIDAgMCA3NSAxNi45ODljMC02LjEyNC01LjAwNC0xMS4wNjItMTEuMTI4LTExLjA2Mi00LjM0NiAwLTguMTY1IDIuNTY4LTkuOTQzIDYuMjU2QzUxLjgyMiA1LjIwMiA0NS4zMDMgMCAzNy41MzMgMHptMCA2LjUxOWExMC40OCAxMC40OCAwIDAgMSAxMC41MzUgMTAuNTM2QTEwLjQ4IDEwLjQ4IDAgMCAxIDM3LjUzMyAyNy41OWExMC40OCAxMC40OCAwIDAgMS0xMC41MzYtMTAuNTM1QTEwLjQ4IDEwLjQ4IDAgMCAxIDM3LjUzMyA2LjUxOXptLTI2LjQwNSA1LjkyNmE0LjU4IDQuNTggMCAwIDEgNC42MDkgNC42MDkgNC41OCA0LjU4IDAgMCAxLTQuNjA5IDQuNjA5IDQuNTggNC41OCAwIDAgMS00LjYwOS00LjYwOSA0LjU4IDQuNTggMCAwIDEgNC42MDktNC42MDl6bTUyLjc0NCAwYTQuNTggNC41OCAwIDAgMSA0LjYwOSA0LjYwOSA0LjYwOSA0LjYwOSAwIDEgMS05LjIxOCAwYy4wNjYtMi41NjggMi4wNDEtNC42MDkgNC42MDktNC42MDl6TTE5LjE3NiA0MS45NTdjMS44MjcgMCAyLjg1IDEuMzAxIDIuODUgMy4yNTIgMCAuMTg2LS4xNTUuMzQxLS4zNDEuMzQxSDE2Ljc2Yy4wMzEgMS43MzQgMS4yMzkgMi43MjYgMi42MzMgMi43MjZhMi44OSAyLjg5IDAgMCAwIDEuNzk2LS42MTljLjE4Ni0uMTI0LjM0MS0uMDkzLjQzNC4wOTNsLjA5My4xNTVjLjA5My4xNTUuMDYyLjMxLS4wOTMuNDM0YTMuODQgMy44NCAwIDAgMS0yLjI2MS43NDNjLTIuMDEzIDAtMy41NjItMS40NTYtMy41NjItMy41NjIuMDMxLTIuMjMgMS41MTgtMy41NjIgMy4zNzYtMy41NjJ6bTEuODg5IDIuOTExYy0uMDYyLTEuNDI1LS45MjktMi4xMzctMS45Mi0yLjEzNy0xLjE0NiAwLTIuMTM3Ljc0My0yLjM1NCAyLjEzN2g0LjI3NHptMTAuMjUzLTEuOTJ2LS43NzQtMS42MTFjMC0uMjE3LjEyNC0uMzQxLjM0MS0uMzQxaC4yNDhjLjIxNyAwIC4zMS4xMjQuMzEuMzQxdjEuNjExaDEuMzk0Yy4yMTcgMCAuMzQxLjEyNC4zNDEuMzQxdi4wOTNjMCAuMjE3LS4xMjQuMzEtLjM0MS4zMWgtMS4zOTR2My40MDdjMCAxLjU4Ljk2IDEuNzY2IDEuNDg3IDEuNzk2LjI3OS4wMzEuMzcyLjA5My4zNzIuMzQxdi4xODZjMCAuMjE3LS4wOTMuMzEtLjM3Mi4zMS0xLjQ4NyAwLTIuMzg1LS44OTgtMi4zODUtMi41MDl2LTMuNXptNy4wOTMtLjk5MWMxLjE3NyAwIDEuOTIuNDk2IDIuMjYxLjc3NC4xNTUuMTI0LjE4Ni4yNzkuMDMxLjQ2NWwtLjA5My4xNTVjLS4xMjQuMTg2LS4yNzkuMTg2LS40NjUuMDYyLS4zMS0uMjE3LS44OTgtLjYxOS0xLjcwMy0uNjE5LTEuNDg3IDAtMi42NjQgMS4xMTUtMi42NjQgMi43NTcgMCAxLjYxMSAxLjE3NyAyLjcyNiAyLjY2NCAyLjcyNi45NiAwIDEuNjExLS40MzQgMS45Mi0uNzEyLjE4Ni0uMTI0LjMxLS4wOTMuNDM0LjA5M2wuMDkzLjEyNGMuMDkzLjE4Ni4wNjIuMzEtLjA5My40NjVhMy44MSAzLjgxIDAgMCAxLTIuNDE2Ljg2N2MtMi4wMTMgMC0zLjU2Mi0xLjQ1Ni0zLjU2Mi0zLjU2Mi4wMzEtMi4xMDYgMS41OC0zLjU5MyAzLjU5My0zLjU5M3ptNC4xMTktMi4xOTljMC0uMjE3LS4xMjQtLjM0MS4wOTMtLjM0MWguMjQ4Yy4yMTcgMCAuNTU4LjEyNC41NTguMzQxdjcuNDAzYzAgLjg2Ny40MDMuOTYuNzEyLjk5MS4xNTUgMCAuMjc5LjA5My4yNzkuMzF2LjIxN2MwIC4yMTctLjA5My4zNDEtLjM0MS4zNDEtLjU1NyAwLTEuNTQ5LS4xODYtMS41NDktMS42NzN2LTcuNTg5em02LjM1IDIuMTk5YzEuOTgyIDAgMy41OTMgMS41MTggMy41OTMgMy41MzEgMCAyLjA0NC0xLjYxMSAzLjU5My0zLjU5MyAzLjU5M3MtMy41OTMtMS41NDktMy41OTMtMy41OTNjMC0yLjAxMyAxLjYxMS0zLjUzMSAzLjU5My0zLjUzMXptMCA2LjMxOWMxLjQ1NiAwIDIuNjMzLTEuMTc3IDIuNjMzLTIuNzg4IDAtMS41NDktMS4xNzctMi42OTUtMi42MzMtMi42OTVhMi42NyAyLjY3IDAgMCAwLTIuNjY0IDIuNjk1Yy4wMzEgMS41OCAxLjIwOCAyLjc4OCAyLjY2NCAyLjc4OHptMTUuNDU2LTYuMzE5YTIuNDUgMi40NSAwIDAgMSAyLjIzIDEuMzYzaC4wMzFzLS4wMzEtLjIxNy0uMDMxLS41MjZ2LTMuMDY2YzAtLjIxNy0uMDkzLS4zNDEuMTI0LS4zNDFoLjI0OGMuMjE3IDAgLjU1OC4xMjQuNTU4LjM0MXY4LjgyN2MwIC4yMTctLjA5My4zNDEtLjMxLjM0MWgtLjIxN2MtLjIxNyAwLS4zNDEtLjA5My0uMzQxLS4zMXYtLjUyN2MwLS4yNDguMDYyLS40MzQuMDYyLS40MzRoLS4wMzFzLS41ODkgMS40MjUtMi4zNTQgMS40MjVjLTEuODI3IDAtMi45NzMtMS40NTYtMi45NzMtMy41NjItLjA2Mi0yLjEwNiAxLjIwOC0zLjUzMSAzLjAwNC0zLjUzMWgwem0uMDMxIDYuMzE5YzEuMTQ2IDAgMi4xOTktLjgwNSAyLjE5OS0yLjc1NyAwLTEuMzk0LS43MTItMi43MjYtMi4xNjgtMi43MjYtMS4yMDggMC0yLjE5OS45OTEtMi4xOTkgMi43MjYuMDMxIDEuNjczLjg5OCAyLjc1NyAyLjE2OCAyLjc1N3ptLTU2LjU1OC42NWguMjQ4Yy4yMTcgMCAuMzQxLS4xMjQuMzQxLS4zNDF2LTYuNjI4YzAtMS4wNTMgMS4xNDYtMS43OTYgMi40NDctMS43OTZzMi40NDcuNzQzIDIuNDQ3IDEuNzk2djYuNjU5YzAgLjIxNy4xMjQuMzQxLjM0MS4zNDFoLjI0OGMuMjE3IDAgLjMxLS4xMjQuMzEtLjM0MXYtNi43MjFjMC0xLjc2Ni0xLjc2NS0yLjYzMy0zLjM3Ni0yLjYzM2gwIDAgMCAwYy0xLjU0OSAwLTMuMzE0Ljg2Ny0zLjMxNCAyLjYzM3Y2LjY5YzAgLjIxNy4wOTMuMzQxLjMxLjM0MXptNTEuNjk1LTYuODE0aC0uMjQ4Yy0uMjE3IDAtLjM0MS4xMjQtLjM0MS4zNDF2My43NDhjMCAxLjA1My0uNjgxIDIuMDEzLTIuMDEzIDIuMDEzLTEuMzAxIDAtMi4wMTMtLjk2LTIuMDEzLTIuMDEzdi0zLjc0OGMwLS4yMTctLjEyNC0uMzQxLS4zNDEtLjM0MUg1NC4zYy0uMjE3IDAtLjMxLjEyNC0uMzEuMzQxdjMuOTk2YzAgMS43NjUgMS4zMDEgMi42MzMgMi45MTIgMi42MzNoMCAwIDAgMGMxLjYxMSAwIDIuOTExLS44NjcgMi45MTEtMi42MzN2LTMuOTk2Yy4wMzEtLjIxNy0uMDkzLS4zNDEtLjMxLS4zNDFoMHptLTMwLjY2NC0uMDMxYy0uMDYyIDAtLjE1NS4wNjItLjIxNy4xNTVsLTEuMjM5IDEuNDg3LS45MjkgMS4xMTUtMS40MjUtMS43MDQtLjc3NC0uOTI5Yy0uMDYyLS4wOTMtLjE1NS0uMTI0LS4yMTctLjEyNHMtLjE1NS4wMzEtLjI0OC4wOTNsLS4xODYuMTU1Yy0uMTU1LjEyNC0uMTU1LjI3OS0uMDMxLjQ2NWwxLjIzOSAxLjQ4NyAxLjA1MyAxLjIzOS0xLjUxOCAxLjgyN2gwbC0uNzc0LjkyOWMtLjEyNC4xNTUtLjEyNC4zNDEuMDMxLjQ5NmwuMTg2LjE1NWMuMTU1LjEyNC4zMS4wOTMuNDY1LS4wNjJsMS4yMzktMS40ODcuOTI5LTEuMTE1IDEuNDI1IDEuNzA0aDBsLjc3NC45MjljLjEyNC4xNTUuMzEuMTg2LjQ2NS4wMzFsLjE4Ni0uMTU1Yy4xNTUtLjEyNC4xNTUtLjI3OS4wMzEtLjQ2NWwtMS4yMzktMS40ODctMS4wNTMtMS4yMzkgMS41MTgtMS44MjdoMGwuNzc0LS45MjljLjEyNC0uMTU1LjEyNC0uMzQxLS4wMzEtLjQ5NWwtLjE4Ni0uMTg2Yy0uMDkzLS4wNjItLjE1NS0uMDkzLS4yNDgtLjA2MmgweiIgZmlsbD0iIzAwODJjOSIgZmlsbC1ydWxlPSJub256ZXJvIiBzdHJva2U9Im5vbmUiLz48L3N5bWJvbD48L3N2Zz4=',
+			},
+			categories: [{ id: 3, name: 'Data & Storage' }],
+			displayName: 'Nextcloud',
+			typeVersion: 1,
+		},
+	],
+	categories: [
+		{ id: 2, name: 'Sales' },
+		{ id: 8, name: 'Finance & Accounting' },
+	],
+	image: [],
+	full: true,
+} satisfies ITemplatesWorkflowFull;
+
+/** Template that doesn't contain nodes requiring credentials */
+export const fullCreateApiEndpointTemplate = {
+	id: 1750,
+	name: 'Creating an API endpoint',
+	views: 13265,
+	recentViews: 9899,
+	totalViews: 13265,
+	createdAt: '2022-07-06T14:45:19.659Z',
+	description:
+		'**Task:**\nCreate a simple API endpoint using the Webhook and Respond to Webhook nodes\n\n**Why:**\nYou can prototype or replace a backend process with a single workflow\n\n**Main use cases:**\nReplace backend logic with a workflow',
+	workflow: {
+		meta: { instanceId: '8c8c5237b8e37b006a7adce87f4369350c58e41f3ca9de16196d3197f69eabcd' },
+		nodes: [
+			{
+				id: 'f80aceed-b676-42aa-bf25-f7a44408b1bc',
+				name: 'Webhook',
+				type: 'n8n-nodes-base.webhook',
+				position: [375, 115],
+				webhookId: '6f7b288e-1efe-4504-a6fd-660931327269',
+				parameters: {
+					path: '6f7b288e-1efe-4504-a6fd-660931327269',
+					options: {},
+					responseMode: 'responseNode',
+				},
+				typeVersion: 1,
+			},
+			{
+				id: '3b9ec913-0bbe-4906-bf8e-da352b556655',
+				name: 'Note1',
+				type: 'n8n-nodes-base.stickyNote',
+				position: [355, -25],
+				parameters: {
+					width: 600,
+					height: 280,
+					content:
+						'## Create a simple API endpoint\n\nIn this workflow we show how to create a simple API endpoint with `Webhook` and `Respond to Webhook` nodes\n\n',
+				},
+				typeVersion: 1,
+			},
+			{
+				id: '9c36dae5-0700-450c-9739-e9f3eff31bfe',
+				name: 'Respond to Webhook',
+				type: 'n8n-nodes-base.respondToWebhook',
+				position: [815, 115],
+				parameters: {
+					options: {},
+					respondWith: 'text',
+					responseBody:
+						'=The URL of the Google search query for the term "{{$node["Webhook"].json["query"]["first_name"]}} {{$node["Webhook"].json["query"]["last_name"]}}" is: {{$json["product"]}}',
+				},
+				typeVersion: 1,
+			},
+			{
+				id: '5a228fcb-78b9-4a28-95d2-d7c9fdf1d4ea',
+				name: 'Create URL string',
+				type: 'n8n-nodes-base.set',
+				position: [595, 115],
+				parameters: {
+					values: {
+						string: [
+							{
+								name: 'product',
+								value:
+									'=https://www.google.com/search?q={{$json["query"]["first_name"]}}+{{$json["query"]["last_name"]}}',
+							},
+						],
+					},
+					options: {},
+					keepOnlySet: true,
+				},
+				typeVersion: 1,
+			},
+			{
+				id: 'e7971820-45a8-4dc8-ba4c-b3220d65307a',
+				name: 'Note3',
+				type: 'n8n-nodes-base.stickyNote',
+				position: [355, 275],
+				parameters: {
+					width: 600,
+					height: 220,
+					content:
+						'### How to use it\n1. Execute the workflow so that the webhook starts listening\n2. Make a test request by pasting, **in a new browser tab**, the test URL from the `Webhook` node and appending the following test at the end `?first_name=bob&last_name=dylan`\n\nYou will receive the following output in the new tab `The URL of the Google search query for the term "bob dylan" is: https://www.google.com/search?q=bob+dylan`\n\n',
+				},
+				typeVersion: 1,
+			},
+		],
+		connections: {
+			Webhook: { main: [[{ node: 'Create URL string', type: 'main', index: 0 }]] },
+			'Create URL string': { main: [[{ node: 'Respond to Webhook', type: 'main', index: 0 }]] },
+		},
+	},
+	lastUpdatedBy: 1,
+	workflowInfo: null,
+	user: { username: 'jon-n8n' },
+	nodes: [
+		{
+			id: 38,
+			icon: 'fa:pen',
+			name: 'n8n-nodes-base.set',
+			defaults: { name: 'Edit Fields', color: '#0000FF' },
+			iconData: { icon: 'pen', type: 'icon' },
+			categories: [{ id: 9, name: 'Core Nodes' }],
+			displayName: 'Edit Fields (Set)',
+			typeVersion: 3,
+		},
+		{
+			id: 47,
+			icon: 'file:webhook.svg',
+			name: 'n8n-nodes-base.webhook',
+			defaults: { name: 'Webhook' },
+			iconData: {
+				type: 'file',
+				fileBuffer:
+					'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciICB2aWV3Qm94PSIwIDAgNDggNDgiIHdpZHRoPSI0OHB4IiBoZWlnaHQ9IjQ4cHgiPjxwYXRoIGZpbGw9IiMzNzQ3NGYiIGQ9Ik0zNSwzN2MtMi4yLDAtNC0xLjgtNC00czEuOC00LDQtNHM0LDEuOCw0LDRTMzcuMiwzNywzNSwzN3oiLz48cGF0aCBmaWxsPSIjMzc0NzRmIiBkPSJNMzUsNDNjLTMsMC01LjktMS40LTcuOC0zLjdsMy4xLTIuNWMxLjEsMS40LDIuOSwyLjMsNC43LDIuM2MzLjMsMCw2LTIuNyw2LTZzLTIuNy02LTYtNiBjLTEsMC0yLDAuMy0yLjksMC43bC0xLjcsMUwyMy4zLDE2bDMuNS0xLjlsNS4zLDkuNGMxLTAuMywyLTAuNSwzLTAuNWM1LjUsMCwxMCw0LjUsMTAsMTBTNDAuNSw0MywzNSw0M3oiLz48cGF0aCBmaWxsPSIjMzc0NzRmIiBkPSJNMTQsNDNDOC41LDQzLDQsMzguNSw0LDMzYzAtNC42LDMuMS04LjUsNy41LTkuN2wxLDMuOUM5LjksMjcuOSw4LDMwLjMsOCwzM2MwLDMuMywyLjcsNiw2LDYgczYtMi43LDYtNnYtMmgxNXY0SDIzLjhDMjIuOSwzOS42LDE4LjgsNDMsMTQsNDN6Ii8+PHBhdGggZmlsbD0iI2U5MWU2MyIgZD0iTTE0LDM3Yy0yLjIsMC00LTEuOC00LTRzMS44LTQsNC00czQsMS44LDQsNFMxNi4yLDM3LDE0LDM3eiIvPjxwYXRoIGZpbGw9IiMzNzQ3NGYiIGQ9Ik0yNSwxOWMtMi4yLDAtNC0xLjgtNC00czEuOC00LDQtNHM0LDEuOCw0LDRTMjcuMiwxOSwyNSwxOXoiLz48cGF0aCBmaWxsPSIjZTkxZTYzIiBkPSJNMTUuNywzNEwxMi4zLDMybDUuOS05LjdjLTItMS45LTMuMi00LjUtMy4yLTcuM2MwLTUuNSw0LjUtMTAsMTAtMTBjNS41LDAsMTAsNC41LDEwLDEwIGMwLDAuOS0wLjEsMS43LTAuMywyLjVsLTMuOS0xYzAuMS0wLjUsMC4yLTEsMC4yLTEuNWMwLTMuMy0yLjctNi02LTZzLTYsMi43LTYsNmMwLDIuMSwxLjEsNCwyLjksNS4xbDEuNywxTDE1LjcsMzR6Ii8+PC9zdmc+Cg==',
+			},
+			categories: [
+				{ id: 5, name: 'Development' },
+				{ id: 9, name: 'Core Nodes' },
+			],
+			displayName: 'Webhook',
+			typeVersion: 1,
+		},
+		{
+			id: 535,
+			icon: 'file:webhook.svg',
+			name: 'n8n-nodes-base.respondToWebhook',
+			defaults: { name: 'Respond to Webhook' },
+			iconData: {
+				type: 'file',
+				fileBuffer:
+					'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciICB2aWV3Qm94PSIwIDAgNDggNDgiIHdpZHRoPSI0OHB4IiBoZWlnaHQ9IjQ4cHgiPjxwYXRoIGZpbGw9IiMzNzQ3NGYiIGQ9Ik0zNSwzN2MtMi4yLDAtNC0xLjgtNC00czEuOC00LDQtNHM0LDEuOCw0LDRTMzcuMiwzNywzNSwzN3oiLz48cGF0aCBmaWxsPSIjMzc0NzRmIiBkPSJNMzUsNDNjLTMsMC01LjktMS40LTcuOC0zLjdsMy4xLTIuNWMxLjEsMS40LDIuOSwyLjMsNC43LDIuM2MzLjMsMCw2LTIuNyw2LTZzLTIuNy02LTYtNiBjLTEsMC0yLDAuMy0yLjksMC43bC0xLjcsMUwyMy4zLDE2bDMuNS0xLjlsNS4zLDkuNGMxLTAuMywyLTAuNSwzLTAuNWM1LjUsMCwxMCw0LjUsMTAsMTBTNDAuNSw0MywzNSw0M3oiLz48cGF0aCBmaWxsPSIjMzc0NzRmIiBkPSJNMTQsNDNDOC41LDQzLDQsMzguNSw0LDMzYzAtNC42LDMuMS04LjUsNy41LTkuN2wxLDMuOUM5LjksMjcuOSw4LDMwLjMsOCwzM2MwLDMuMywyLjcsNiw2LDYgczYtMi43LDYtNnYtMmgxNXY0SDIzLjhDMjIuOSwzOS42LDE4LjgsNDMsMTQsNDN6Ii8+PHBhdGggZmlsbD0iI2U5MWU2MyIgZD0iTTE0LDM3Yy0yLjIsMC00LTEuOC00LTRzMS44LTQsNC00czQsMS44LDQsNFMxNi4yLDM3LDE0LDM3eiIvPjxwYXRoIGZpbGw9IiMzNzQ3NGYiIGQ9Ik0yNSwxOWMtMi4yLDAtNC0xLjgtNC00czEuOC00LDQtNHM0LDEuOCw0LDRTMjcuMiwxOSwyNSwxOXoiLz48cGF0aCBmaWxsPSIjZTkxZTYzIiBkPSJNMTUuNywzNEwxMi4zLDMybDUuOS05LjdjLTItMS45LTMuMi00LjUtMy4yLTcuM2MwLTUuNSw0LjUtMTAsMTAtMTBjNS41LDAsMTAsNC41LDEwLDEwIGMwLDAuOS0wLjEsMS43LTAuMywyLjVsLTMuOS0xYzAuMS0wLjUsMC4yLTEsMC4yLTEuNWMwLTMuMy0yLjctNi02LTZzLTYsMi43LTYsNmMwLDIuMSwxLjEsNCwyLjksNS4xbDEuNywxTDE1LjcsMzR6Ii8+PC9zdmc+Cg==',
+			},
+			categories: [
+				{ id: 7, name: 'Utility' },
+				{ id: 9, name: 'Core Nodes' },
+			],
+			displayName: 'Respond to Webhook',
+			typeVersion: 1,
+		},
+	],
+	categories: [{ id: 20, name: 'Building Blocks' }],
+	image: [],
+	full: true,
+} satisfies ITemplatesWorkflowFull;
diff --git a/packages/editor-ui/src/utils/typeGuards.ts b/packages/editor-ui/src/utils/typeGuards.ts
index e38edb441fa7b..73fd54ab19041 100644
--- a/packages/editor-ui/src/utils/typeGuards.ts
+++ b/packages/editor-ui/src/utils/typeGuards.ts
@@ -35,3 +35,11 @@ export function isNumber(value: unknown): value is number {
 export const isCredentialModalState = (value: unknown): value is NewCredentialsModal => {
 	return typeof value === 'object' && value !== null && 'showAuthSelector' in value;
 };
+
+export const isResourceMapperValue = (value: unknown): value is string | number | boolean => {
+	return ['string', 'number', 'boolean'].includes(typeof value);
+};
+
+export const isJSPlumbEndpointElement = (element: Node): element is HTMLElement => {
+	return 'jtk' in element && 'endpoint' in (element.jtk as object);
+};
diff --git a/packages/editor-ui/src/utils/typeHelpers.ts b/packages/editor-ui/src/utils/typeHelpers.ts
index ce7e0b412773a..a655884737a08 100644
--- a/packages/editor-ui/src/utils/typeHelpers.ts
+++ b/packages/editor-ui/src/utils/typeHelpers.ts
@@ -1 +1,2 @@
 export type PartialBy<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>;
+export type TupleToUnion<T extends readonly unknown[]> = T[number];
diff --git a/packages/editor-ui/src/utils/typesUtils.ts b/packages/editor-ui/src/utils/typesUtils.ts
index f3d158977c392..4fdf68b4c6a2c 100644
--- a/packages/editor-ui/src/utils/typesUtils.ts
+++ b/packages/editor-ui/src/utils/typesUtils.ts
@@ -1,11 +1,7 @@
 import dateformat from 'dateformat';
 import type { IDataObject } from 'n8n-workflow';
 import { jsonParse } from 'n8n-workflow';
-import type { Schema, Optional, Primitives } from '@/Interface';
-import { isObj } from '@/utils/typeGuards';
-import { generatePath } from '@/utils/mappingUtils';
-import { DateTime } from 'luxon';
-import { useWorkflowsStore } from '@/stores/workflows';
+import { isObject } from '@/utils/objectUtils';
 
 /*
 	Constants and utility functions than can be used to manipulate different data types and objects
@@ -15,15 +11,11 @@ const SI_SYMBOL = ['', 'k', 'M', 'G', 'T', 'P', 'E'];
 
 export const omit = (keyToOmit: string, { [keyToOmit]: _, ...remainder }) => remainder;
 
-export function isObjectLiteral(maybeObject: unknown): maybeObject is { [key: string]: string } {
-	return typeof maybeObject === 'object' && maybeObject !== null && !Array.isArray(maybeObject);
-}
-
 export function isJsonKeyObject(item: unknown): item is {
 	json: unknown;
 	[otherKeys: string]: unknown;
 } {
-	if (!isObjectLiteral(item)) return false;
+	if (!isObject(item)) return false;
 
 	return Object.keys(item).includes('json');
 }
@@ -31,11 +23,10 @@ export function isJsonKeyObject(item: unknown): item is {
 export const isEmpty = (value?: unknown): boolean => {
 	if (!value && value !== 0) return true;
 	if (Array.isArray(value)) {
-		if (!value.length) return true;
-		return value.every(isEmpty);
+		return !value.length || value.every(isEmpty);
 	}
 	if (typeof value === 'object') {
-		return Object.values(value).every(isEmpty);
+		return !Object.keys(value).length || Object.values(value).every(isEmpty);
 	}
 	return false;
 };
@@ -165,40 +156,11 @@ export const isValidDate = (input: string | number | Date): boolean => {
 export const getObjectKeys = <T extends object, K extends keyof T>(o: T): K[] =>
 	Object.keys(o) as K[];
 
-export const getSchema = (input: Optional<Primitives | object>, path = ''): Schema => {
-	let schema: Schema = { type: 'undefined', value: 'undefined', path };
-	switch (typeof input) {
-		case 'object':
-			if (input === null) {
-				schema = { type: 'null', value: '[null]', path };
-			} else if (input instanceof Date) {
-				schema = { type: 'string', value: input.toISOString(), path };
-			} else if (Array.isArray(input)) {
-				schema = {
-					type: 'array',
-					value: input.map((item, index) => ({
-						key: index.toString(),
-						...getSchema(item, `${path}[${index}]`),
-					})),
-					path,
-				};
-			} else if (isObj(input)) {
-				schema = {
-					type: 'object',
-					value: Object.entries(input).map(([k, v]) => ({
-						key: k,
-						...getSchema(v, generatePath(path, [k])),
-					})),
-					path,
-				};
-			}
-			break;
-		case 'function':
-			schema = { type: 'function', value: '', path };
-			break;
-		default:
-			schema = { type: typeof input, value: String(input), path };
-	}
-
-	return schema;
+/**
+ * Converts a string to a number if possible. If not it returns the original string.
+ * For a string to be converted to a number it has to contain only digits.
+ * @param value The value to convert to a number
+ */
+export const tryToParseNumber = (value: string): number | string => {
+	return isNaN(+value) ? value : +value;
 };
diff --git a/packages/editor-ui/src/utils/userUtils.ts b/packages/editor-ui/src/utils/userUtils.ts
index b9797f0a19911..5646c004e7009 100644
--- a/packages/editor-ui/src/utils/userUtils.ts
+++ b/packages/editor-ui/src/utils/userUtils.ts
@@ -59,9 +59,9 @@ import {
 	BAMBOO_HR_NODE_TYPE,
 	GOOGLE_SHEETS_NODE_TYPE,
 	CODE_NODE_TYPE,
+	ROLE,
 } from '@/constants';
 import type {
-	IPermissions,
 	IPersonalizationSurveyAnswersV1,
 	IPersonalizationSurveyAnswersV2,
 	IPersonalizationSurveyAnswersV3,
@@ -69,8 +69,6 @@ import type {
 	IPersonalizationSurveyVersions,
 	IUser,
 	ILogInStatus,
-	IRole,
-	IUserPermissions,
 } from '@/Interface';
 
 /*
@@ -86,99 +84,12 @@ function isPersonalizationSurveyV2OrLater(
 	return 'version' in data;
 }
 
-export const ROLE: { Owner: IRole; Member: IRole; Default: IRole } = {
-	Owner: 'owner',
-	Member: 'member',
-	Default: 'default', // default user with no email when setting up instance
-};
-
 export const LOGIN_STATUS: { LoggedIn: ILogInStatus; LoggedOut: ILogInStatus } = {
 	LoggedIn: 'LoggedIn', // Can be owner or member or default user
 	LoggedOut: 'LoggedOut', // Can only be logged out if UM has been setup
 };
 
-export const PERMISSIONS: IUserPermissions = {
-	TAGS: {
-		CAN_DELETE_TAGS: {
-			allow: {
-				role: [ROLE.Owner, ROLE.Default],
-			},
-		},
-	},
-	PRIMARY_MENU: {
-		CAN_ACCESS_USER_INFO: {
-			allow: {
-				loginStatus: [LOGIN_STATUS.LoggedIn],
-			},
-			deny: {
-				role: [ROLE.Default],
-			},
-		},
-	},
-	USER_SETTINGS: {
-		VIEW_UM_SETUP_WARNING: {
-			allow: {
-				role: [ROLE.Default],
-			},
-		},
-	},
-	USAGE: {
-		CAN_ACTIVATE_LICENSE: {
-			allow: {
-				role: [ROLE.Owner, ROLE.Default],
-			},
-		},
-	},
-};
-
-/**
- * To be authorized, user must pass all deny rules and pass any of the allow rules.
- *
- */
-export const isAuthorized = (permissions: IPermissions, currentUser: IUser | null): boolean => {
-	const loginStatus = currentUser ? LOGIN_STATUS.LoggedIn : LOGIN_STATUS.LoggedOut;
-	// big AND block
-	// if any of these are false, block user
-	if (permissions.deny) {
-		if (permissions.deny.shouldDeny && permissions.deny.shouldDeny()) {
-			return false;
-		}
-
-		if (permissions.deny.loginStatus && permissions.deny.loginStatus.includes(loginStatus)) {
-			return false;
-		}
-
-		if (currentUser?.globalRole?.name) {
-			const role = currentUser.isDefaultUser ? ROLE.Default : currentUser.globalRole.name;
-			if (permissions.deny.role && permissions.deny.role.includes(role)) {
-				return false;
-			}
-		} else if (permissions.deny.role) {
-			return false;
-		}
-	}
-
-	// big OR block
-	// if any of these are true, allow user
-	if (permissions.allow) {
-		if (permissions.allow.shouldAllow && permissions.allow.shouldAllow()) {
-			return true;
-		}
-
-		if (permissions.allow.loginStatus && permissions.allow.loginStatus.includes(loginStatus)) {
-			return true;
-		}
-
-		if (currentUser?.globalRole?.name) {
-			const role = currentUser.isDefaultUser ? ROLE.Default : currentUser.globalRole.name;
-			if (permissions.allow.role && permissions.allow.role.includes(role)) {
-				return true;
-			}
-		}
-	}
-
-	return false;
-};
+export const isUserGlobalOwner = (user: IUser): boolean => user.role === ROLE.Owner;
 
 export function getPersonalizedNodeTypes(
 	answers:
@@ -228,7 +139,7 @@ function getPersonalizationSurveyV2OrLater(
 
 	let codingSkill = null;
 	if (CODING_SKILL_KEY in answers && answers[CODING_SKILL_KEY]) {
-		codingSkill = parseInt(answers[CODING_SKILL_KEY] as string, 10);
+		codingSkill = parseInt(answers[CODING_SKILL_KEY], 10);
 		codingSkill = isNaN(codingSkill) ? 0 : codingSkill;
 	}
 
@@ -369,7 +280,7 @@ function getPersonalizationSurveyV1(answers: IPersonalizationSurveyAnswersV1) {
 
 	let codingSkill = null;
 	if (answers[CODING_SKILL_KEY]) {
-		codingSkill = parseInt(answers[CODING_SKILL_KEY] as string, 10);
+		codingSkill = parseInt(answers[CODING_SKILL_KEY], 10);
 		codingSkill = isNaN(codingSkill) ? 0 : codingSkill;
 	}
 
diff --git a/packages/editor-ui/src/utils/workerUtils.ts b/packages/editor-ui/src/utils/workerUtils.ts
new file mode 100644
index 0000000000000..d7891ff062979
--- /dev/null
+++ b/packages/editor-ui/src/utils/workerUtils.ts
@@ -0,0 +1,11 @@
+export function averageWorkerLoadFromLoads(loads: number[]): number {
+	return loads.reduce((prev, curr) => prev + curr, 0) / loads.length;
+}
+
+export function averageWorkerLoadFromLoadsAsString(loads: number[]): string {
+	return averageWorkerLoadFromLoads(loads).toFixed(2);
+}
+
+export function memAsGb(mem: number): number {
+	return mem / 1024 / 1024 / 1024;
+}
diff --git a/packages/editor-ui/src/v3-infinite-loading.d.ts b/packages/editor-ui/src/v3-infinite-loading.d.ts
new file mode 100644
index 0000000000000..1fa589586f950
--- /dev/null
+++ b/packages/editor-ui/src/v3-infinite-loading.d.ts
@@ -0,0 +1,16 @@
+declare module 'v3-infinite-loading' {
+	import { Plugin, DefineComponent } from 'vue';
+
+	interface InfiniteLoadingProps {
+		target: string;
+	}
+
+	export interface Events {
+		infinite: (state: { loaded: () => void; complete: () => void }) => void;
+	}
+
+	const InfiniteLoading: DefineComponent<InfiniteLoadingProps, {}, {}, {}, {}, {}, {}, Events> &
+		Plugin;
+
+	export default InfiniteLoading;
+}
diff --git a/packages/editor-ui/src/views/AuthView.vue b/packages/editor-ui/src/views/AuthView.vue
index 7316a26de2018..a8094e0e98da1 100644
--- a/packages/editor-ui/src/views/AuthView.vue
+++ b/packages/editor-ui/src/views/AuthView.vue
@@ -10,11 +10,20 @@
 			<n8n-form-box
 				v-bind="form"
 				data-test-id="auth-form"
-				:buttonLoading="formLoading"
-				@secondaryClick="onSecondaryClick"
+				:button-loading="formLoading"
+				@secondary-click="onSecondaryClick"
 				@submit="onSubmit"
-				@input="onInput"
+				@update="onUpdate"
 			>
+				<template v-if="showAdditional">
+					<div :class="$style.otp">
+						<p :class="$style.otpLabel">Secret:</p>
+						<p :class="$style.otp32">{{ otpSecretBase32 }}</p>
+						<div :class="$style.otpQR">
+							<img :src="otpSecretAuthUrl" />
+						</div>
+					</div>
+				</template>
 				<SSOLogin v-if="withSso" />
 				<template #additional>
 					<slot />
@@ -49,10 +58,20 @@ export default defineComponent({
 			type: Boolean,
 			default: false,
 		},
+		showAdditional: {
+			type: Boolean,
+			default: false,
+		},
+		otpSecretBase32: {
+			type: String,
+		},
+		otpSecretAuthUrl: {
+			type: String,
+		},
 	},
 	methods: {
-		onInput(e: { name: string; value: string }) {
-			this.$emit('input', e);
+		onUpdate(e: { name: string; value: string }) {
+			this.$emit('update', e);
 		},
 		onSubmit(values: { [key: string]: string }) {
 			this.$emit('submit', values);
@@ -93,6 +112,23 @@ body {
 .formContainer {
 	padding-bottom: var(--spacing-xl);
 }
+
+.otp {
+	margin-bottom: 10px;
+}
+
+.otpLabel {
+	font-size: var(--font-size-xs);
+	font-weight: 600;
+}
+
+.otp32 {
+	font-size: var(--font-size-2xs);
+}
+
+.otpQR {
+	text-align: center;
+}
 </style>
 
 <style lang="scss">
diff --git a/packages/editor-ui/src/views/CanvasAddButton.vue b/packages/editor-ui/src/views/CanvasAddButton.vue
index 5fa33c79c41fb..05590a9573cf5 100644
--- a/packages/editor-ui/src/views/CanvasAddButton.vue
+++ b/packages/editor-ui/src/views/CanvasAddButton.vue
@@ -1,23 +1,22 @@
 <template>
 	<div
+		ref="container"
 		:class="$style.canvasAddButton"
 		:style="containerCssVars"
-		ref="container"
 		data-test-id="canvas-add-button"
 	>
 		<n8n-tooltip
 			placement="top"
-			:value="showTooltip"
-			manual
+			:visible="showTooltip"
 			:disabled="nodeCreatorStore.showScrim"
 			:popper-class="$style.tooltip"
-			:open-delay="700"
+			:show-after="700"
 		>
-			<button :class="$style.button" @click="$emit('click')" data-test-id="canvas-plus-button">
+			<button :class="$style.button" data-test-id="canvas-plus-button" @click="$emit('click')">
 				<font-awesome-icon icon="plus" size="lg" />
 			</button>
 			<template #content>
-				<p v-text="$locale.baseText('nodeView.canvasAddButton.addATriggerNodeBeforeExecuting')" />
+				{{ $locale.baseText('nodeView.canvasAddButton.addATriggerNodeBeforeExecuting') }}
 			</template>
 		</n8n-tooltip>
 		<p :class="$style.label" v-text="$locale.baseText('nodeView.canvasAddButton.addFirstStep')" />
@@ -27,7 +26,7 @@
 <script setup lang="ts">
 import { computed } from 'vue';
 import type { XYPosition } from '@/Interface';
-import { useNodeCreatorStore } from '@/stores/nodeCreator';
+import { useNodeCreatorStore } from '@/stores/nodeCreator.store';
 
 export interface Props {
 	showTooltip: boolean;
@@ -55,7 +54,7 @@ const containerCssVars = computed(() => ({
 	top: var(--trigger-placeholder-top-position);
 	left: var(--trigger-placeholder-left-position);
 	// We have to increase z-index to make sure it's higher than selecting box in NodeView
-	// otherwise the clics wouldn't register
+	// otherwise the clicks wouldn't register
 	z-index: 101;
 
 	&:hover .button svg path {
@@ -82,10 +81,6 @@ const containerCssVars = computed(() => ({
 	}
 }
 
-:root .tooltip {
-	max-width: 180px;
-}
-
 .label {
 	width: max-content;
 	font-weight: var(--font-weight-bold);
diff --git a/packages/editor-ui/src/views/ChangePasswordView.vue b/packages/editor-ui/src/views/ChangePasswordView.vue
index e88df40ca4467..a7598a4697938 100644
--- a/packages/editor-ui/src/views/ChangePasswordView.vue
+++ b/packages/editor-ui/src/views/ChangePasswordView.vue
@@ -2,27 +2,32 @@
 	<AuthView
 		v-if="config"
 		:form="config"
-		:formLoading="loading"
+		:form-loading="loading"
 		@submit="onSubmit"
-		@input="onInput"
+		@update="onInput"
 	/>
 </template>
 
 <script lang="ts">
-import AuthView from './AuthView.vue';
-import { showMessage } from '@/mixins/showMessage';
+import AuthView from '@/views/AuthView.vue';
+import { useToast } from '@/composables/useToast';
 
-import mixins from 'vue-typed-mixins';
+import { defineComponent } from 'vue';
 import type { IFormBoxConfig } from '@/Interface';
-import { VIEWS } from '@/constants';
+import { MFA_AUTHENTICATION_TOKEN_INPUT_MAX_LENGTH, VIEWS } from '@/constants';
 import { mapStores } from 'pinia';
-import { useUsersStore } from '@/stores/users';
+import { useUsersStore } from '@/stores/users.store';
 
-export default mixins(showMessage).extend({
+export default defineComponent({
 	name: 'ChangePasswordView',
 	components: {
 		AuthView,
 	},
+	setup() {
+		return {
+			...useToast(),
+		};
+	},
 	data() {
 		return {
 			password: '',
@@ -34,7 +39,7 @@ export default mixins(showMessage).extend({
 		...mapStores(useUsersStore),
 	},
 	async mounted() {
-		this.config = {
+		const form: IFormBoxConfig = {
 			title: this.$locale.baseText('auth.changePassword'),
 			buttonText: this.$locale.baseText('auth.changePassword'),
 			redirectText: this.$locale.baseText('auth.signin'),
@@ -70,28 +75,36 @@ export default mixins(showMessage).extend({
 				},
 			],
 		};
-		const token =
-			!this.$route.query.token || typeof this.$route.query.token !== 'string'
-				? null
-				: this.$route.query.token;
-		const userId =
-			!this.$route.query.userId || typeof this.$route.query.userId !== 'string'
-				? null
-				: this.$route.query.userId;
+
+		const token = this.getResetToken();
+		const mfaEnabled = this.getMfaEnabled();
+
+		if (mfaEnabled) {
+			form.inputs.push({
+				name: 'mfaToken',
+				initialValue: '',
+				properties: {
+					required: true,
+					label: this.$locale.baseText('mfa.code.input.label'),
+					placeholder: this.$locale.baseText('mfa.code.input.placeholder'),
+					maxlength: MFA_AUTHENTICATION_TOKEN_INPUT_MAX_LENGTH,
+					capitalize: true,
+					validateOnBlur: true,
+				},
+			});
+		}
+
+		this.config = form;
+
 		try {
 			if (!token) {
 				throw new Error(this.$locale.baseText('auth.changePassword.missingTokenError'));
 			}
-			if (!userId) {
-				throw new Error(this.$locale.baseText('auth.changePassword.missingUserIdError'));
-			}
 
-			await this.usersStore.validatePasswordToken({ token, userId });
+			await this.usersStore.validatePasswordToken({ token });
 		} catch (e) {
-			this.$showMessage({
-				title: this.$locale.baseText('auth.changePassword.tokenValidationError'),
-				type: 'error',
-			});
+			this.showError(e, this.$locale.baseText('auth.changePassword.tokenValidationError'));
+			void this.$router.replace({ name: VIEWS.SIGNIN });
 		}
 	},
 	methods: {
@@ -113,22 +126,30 @@ export default mixins(showMessage).extend({
 				this.password = e.value;
 			}
 		},
-		async onSubmit() {
+		getResetToken() {
+			return !this.$route.query.token || typeof this.$route.query.token !== 'string'
+				? null
+				: this.$route.query.token;
+		},
+		getMfaEnabled() {
+			if (!this.$route.query.mfaEnabled) return null;
+			return this.$route.query.mfaEnabled === 'true' ? true : false;
+		},
+		async onSubmit(values: { mfaToken: string }) {
 			try {
 				this.loading = true;
-				const token =
-					!this.$route.query.token || typeof this.$route.query.token !== 'string'
-						? null
-						: this.$route.query.token;
-				const userId =
-					!this.$route.query.userId || typeof this.$route.query.userId !== 'string'
-						? null
-						: this.$route.query.userId;
+				const token = this.getResetToken();
+
+				if (token) {
+					const changePasswordParameters = {
+						token,
+						password: this.password,
+						...(values.mfaToken && { mfaToken: values.mfaToken }),
+					};
 
-				if (token && userId) {
-					await this.usersStore.changePassword({ token, userId, password: this.password });
+					await this.usersStore.changePassword(changePasswordParameters);
 
-					this.$showMessage({
+					this.showMessage({
 						type: 'success',
 						title: this.$locale.baseText('auth.changePassword.passwordUpdated'),
 						message: this.$locale.baseText('auth.changePassword.passwordUpdatedMessage'),
@@ -136,13 +157,13 @@ export default mixins(showMessage).extend({
 
 					await this.$router.push({ name: VIEWS.SIGNIN });
 				} else {
-					this.$showError(
+					this.showError(
 						new Error(this.$locale.baseText('auth.validation.missingParameters')),
 						this.$locale.baseText('auth.changePassword.error'),
 					);
 				}
 			} catch (error) {
-				this.$showError(error, this.$locale.baseText('auth.changePassword.error'));
+				this.showError(error, this.$locale.baseText('auth.changePassword.error'));
 			}
 			this.loading = false;
 		},
diff --git a/packages/editor-ui/src/views/CredentialsView.vue b/packages/editor-ui/src/views/CredentialsView.vue
index f05c52942a689..11a4b2ba0857c 100644
--- a/packages/editor-ui/src/views/CredentialsView.vue
+++ b/packages/editor-ui/src/views/CredentialsView.vue
@@ -1,5 +1,5 @@
 <template>
-	<resources-list-layout
+	<ResourcesListLayout
 		ref="layout"
 		resource-key="credentials"
 		:resources="allCredentials"
@@ -11,7 +11,7 @@
 		@update:filters="filters = $event"
 	>
 		<template #default="{ data }">
-			<credential-card data-test-id="resources-list-item" class="mb-2xs" :data="data" />
+			<CredentialCard data-test-id="resources-list-item" class="mb-2xs" :data="data" />
 		</template>
 		<template #filters="{ setKeyValue }">
 			<div class="mb-s">
@@ -23,13 +23,13 @@
 					class="mb-3xs"
 				/>
 				<n8n-select
-					:value="filters.type"
+					ref="typeInput"
+					:model-value="filters.type"
 					size="medium"
 					multiple
 					filterable
-					ref="typeInput"
 					:class="$style['type-input']"
-					@input="setKeyValue('type', $event)"
+					@update:model-value="setKeyValue('type', $event)"
 				>
 					<n8n-option
 						v-for="credentialType in allCredentialTypes"
@@ -40,46 +40,34 @@
 				</n8n-select>
 			</div>
 		</template>
-	</resources-list-layout>
+	</ResourcesListLayout>
 </template>
 
 <script lang="ts">
-import { showMessage } from '@/mixins/showMessage';
 import type { ICredentialsResponse, ICredentialTypeMap } from '@/Interface';
-import { IUser } from '@/Interface';
-import mixins from 'vue-typed-mixins';
+import { defineComponent } from 'vue';
 
-import SettingsView from './SettingsView.vue';
 import ResourcesListLayout from '@/components/layouts/ResourcesListLayout.vue';
-import PageViewLayout from '@/components/layouts/PageViewLayout.vue';
-import PageViewLayoutList from '@/components/layouts/PageViewLayoutList.vue';
 import CredentialCard from '@/components/CredentialCard.vue';
 import type { ICredentialType } from 'n8n-workflow';
-import TemplateCard from '@/components/TemplateCard.vue';
-import { debounceHelper } from '@/mixins/debounce';
-import ResourceOwnershipSelect from '@/components/forms/ResourceOwnershipSelect.ee.vue';
-import ResourceFiltersDropdown from '@/components/forms/ResourceFiltersDropdown.vue';
-import { CREDENTIAL_SELECT_MODAL_KEY } from '@/constants';
-import type Vue from 'vue';
+import { CREDENTIAL_SELECT_MODAL_KEY, EnterpriseEditionFeature } from '@/constants';
 import { mapStores } from 'pinia';
-import { useUIStore } from '@/stores/ui';
-import { useUsersStore } from '@/stores/users';
-import { useNodeTypesStore } from '@/stores/nodeTypes';
-import { useCredentialsStore } from '@/stores/credentials';
+import { useUIStore } from '@/stores/ui.store';
+import { useUsersStore } from '@/stores/users.store';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import { useCredentialsStore } from '@/stores/credentials.store';
+import { useExternalSecretsStore } from '@/stores/externalSecrets.ee.store';
+import { useSourceControlStore } from '@/stores/sourceControl.store';
+import useEnvironmentsStore from '@/stores/environments.ee.store';
+import { useSettingsStore } from '@/stores/settings.store';
 
-type IResourcesListLayoutInstance = Vue & { sendFiltersTelemetry: (source: string) => void };
+type IResourcesListLayoutInstance = InstanceType<typeof ResourcesListLayout>;
 
-export default mixins(showMessage, debounceHelper).extend({
-	name: 'SettingsPersonalView',
+export default defineComponent({
+	name: 'CredentialsView',
 	components: {
 		ResourcesListLayout,
-		TemplateCard,
-		PageViewLayout,
-		PageViewLayoutList,
-		SettingsView,
 		CredentialCard,
-		ResourceOwnershipSelect,
-		ResourceFiltersDropdown,
 	},
 	data() {
 		return {
@@ -89,10 +77,18 @@ export default mixins(showMessage, debounceHelper).extend({
 				sharedWith: '',
 				type: '',
 			},
+			sourceControlStoreUnsubscribe: () => {},
 		};
 	},
 	computed: {
-		...mapStores(useCredentialsStore, useNodeTypesStore, useUIStore, useUsersStore),
+		...mapStores(
+			useCredentialsStore,
+			useNodeTypesStore,
+			useUIStore,
+			useUsersStore,
+			useSourceControlStore,
+			useExternalSecretsStore,
+		),
 		allCredentials(): ICredentialsResponse[] {
 			return this.credentialsStore.allCredentials;
 		},
@@ -103,6 +99,23 @@ export default mixins(showMessage, debounceHelper).extend({
 			return this.credentialsStore.credentialTypesById;
 		},
 	},
+	watch: {
+		'filters.type'() {
+			this.sendFiltersTelemetry('type');
+		},
+	},
+	mounted() {
+		this.sourceControlStoreUnsubscribe = this.sourceControlStore.$onAction(({ name, after }) => {
+			if (name === 'pullWorkfolder' && after) {
+				after(() => {
+					void this.initialize();
+				});
+			}
+		});
+	},
+	beforeUnmount() {
+		this.sourceControlStoreUnsubscribe();
+	},
 	methods: {
 		addCredential() {
 			this.uiStore.openModal(CREDENTIAL_SELECT_MODAL_KEY);
@@ -112,18 +125,21 @@ export default mixins(showMessage, debounceHelper).extend({
 			});
 		},
 		async initialize() {
+			const isVarsEnabled = useSettingsStore().isEnterpriseFeatureEnabled(
+				EnterpriseEditionFeature.Variables,
+			);
+
 			const loadPromises = [
 				this.credentialsStore.fetchAllCredentials(),
 				this.credentialsStore.fetchCredentialTypes(false),
+				this.externalSecretsStore.fetchAllSecrets(),
+				this.nodeTypesStore.loadNodeTypesIfNotLoaded(),
+				isVarsEnabled ? useEnvironmentsStore().fetchAllVariables() : Promise.resolve(), // for expression resolution
 			];
 
-			if (this.nodeTypesStore.allNodeTypes.length === 0) {
-				loadPromises.push(this.nodeTypesStore.getNodeTypes());
-			}
-
 			await Promise.all(loadPromises);
 
-			this.usersStore.fetchUsers(); // Can be loaded in the background, used for filtering
+			await this.usersStore.fetchUsers(); // Can be loaded in the background, used for filtering
 		},
 		onFilter(
 			resource: ICredentialsResponse,
@@ -151,11 +167,6 @@ export default mixins(showMessage, debounceHelper).extend({
 			(this.$refs.layout as IResourcesListLayoutInstance).sendFiltersTelemetry(source);
 		},
 	},
-	watch: {
-		'filters.type'() {
-			this.sendFiltersTelemetry('type');
-		},
-	},
 });
 </script>
 
diff --git a/packages/editor-ui/src/views/ErrorView.vue b/packages/editor-ui/src/views/ErrorView.vue
index 80a337d73ab86..8266d2bcc051f 100644
--- a/packages/editor-ui/src/views/ErrorView.vue
+++ b/packages/editor-ui/src/views/ErrorView.vue
@@ -8,7 +8,7 @@
 				</n8n-heading>
 			</div>
 			<div>
-				<n8n-text size="large" v-if="errorCode">
+				<n8n-text v-if="errorCode" size="large">
 					{{ errorCode }} {{ $locale.baseText('error') }}
 				</n8n-text>
 			</div>
@@ -39,7 +39,7 @@ export default defineComponent({
 	},
 	methods: {
 		onButtonClick() {
-			this.$router.push({ name: this.redirectPage });
+			void this.$router.push({ name: this.redirectPage });
 		},
 	},
 });
diff --git a/packages/editor-ui/src/views/ExecutionsView.vue b/packages/editor-ui/src/views/ExecutionsView.vue
index 4530be2933e23..10a91a66da14e 100644
--- a/packages/editor-ui/src/views/ExecutionsView.vue
+++ b/packages/editor-ui/src/views/ExecutionsView.vue
@@ -1,15 +1,91 @@
-<template>
-	<ExecutionsList />
-</template>
+<script lang="ts" setup>
+import { onBeforeMount, onBeforeUnmount, onMounted, ref } from 'vue';
+import GlobalExecutionsList from '@/components/executions/global/GlobalExecutionsList.vue';
+import { setPageTitle } from '@/utils/htmlUtils';
+import { useI18n } from '@/composables/useI18n';
+import { useTelemetry } from '@/composables/useTelemetry';
+import { useExternalHooks } from '@/composables/useExternalHooks';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useExecutionsStore } from '@/stores/executions.store';
+import { useToast } from '@/composables/useToast';
+import { storeToRefs } from 'pinia';
+import type { ExecutionFilterType } from '@/Interface';
+
+const i18n = useI18n();
+const telemetry = useTelemetry();
+const externalHooks = useExternalHooks();
+const workflowsStore = useWorkflowsStore();
+const executionsStore = useExecutionsStore();
+
+const toast = useToast();
+
+const animationsEnabled = ref(false);
+
+const { executionsCount, executionsCountEstimated, filters, allExecutions } =
+	storeToRefs(executionsStore);
+
+onBeforeMount(async () => {
+	await loadWorkflows();
+
+	void externalHooks.run('executionsList.openDialog');
+	telemetry.track('User opened Executions log', {
+		workflow_id: workflowsStore.workflowId,
+	});
+});
 
-<script lang="ts">
-import { defineComponent } from 'vue';
-import ExecutionsList from '@/components/ExecutionsList.vue';
+onMounted(async () => {
+	setPageTitle(`n8n - ${i18n.baseText('executionsList.workflowExecutions')}`);
+	document.addEventListener('visibilitychange', onDocumentVisibilityChange);
 
-export default defineComponent({
-	name: 'ExecutionsView',
-	components: {
-		ExecutionsList,
-	},
+	await executionsStore.initialize();
 });
+
+onBeforeUnmount(() => {
+	executionsStore.reset();
+	document.removeEventListener('visibilitychange', onDocumentVisibilityChange);
+});
+
+async function loadWorkflows() {
+	try {
+		await workflowsStore.fetchAllWorkflows();
+	} catch (error) {
+		toast.showError(error, i18n.baseText('executionsList.showError.loadWorkflows.title'));
+	}
+}
+
+function onDocumentVisibilityChange() {
+	if (document.visibilityState === 'hidden') {
+		executionsStore.stopAutoRefreshInterval();
+	} else {
+		void executionsStore.startAutoRefreshInterval();
+	}
+}
+
+async function onRefreshData() {
+	try {
+		await executionsStore.fetchExecutions();
+	} catch (error) {
+		toast.showError(error, i18n.baseText('executionsList.showError.refreshData.title'));
+	}
+}
+
+async function onUpdateFilters(newFilters: ExecutionFilterType) {
+	executionsStore.reset();
+	executionsStore.setFilters(newFilters);
+	await executionsStore.initialize();
+}
+
+async function onExecutionStop() {
+	await onRefreshData();
+}
 </script>
+<template>
+	<GlobalExecutionsList
+		:executions="allExecutions"
+		:filters="filters"
+		:total="executionsCount"
+		:estimated-total="executionsCountEstimated"
+		@execution:stop="onExecutionStop"
+		@update:filters="onUpdateFilters"
+	/>
+</template>
diff --git a/packages/editor-ui/src/views/ForgotMyPasswordView.vue b/packages/editor-ui/src/views/ForgotMyPasswordView.vue
index 4ae66a0200470..b04ef8e7609be 100644
--- a/packages/editor-ui/src/views/ForgotMyPasswordView.vue
+++ b/packages/editor-ui/src/views/ForgotMyPasswordView.vue
@@ -1,22 +1,27 @@
 <template>
-	<AuthView :form="formConfig" :formLoading="loading" @submit="onSubmit" />
+	<AuthView :form="formConfig" :form-loading="loading" @submit="onSubmit" />
 </template>
 
 <script lang="ts">
 import AuthView from './AuthView.vue';
-import { showMessage } from '@/mixins/showMessage';
+import { useToast } from '@/composables/useToast';
 
-import mixins from 'vue-typed-mixins';
+import { defineComponent } from 'vue';
 import type { IFormBoxConfig } from '@/Interface';
 import { mapStores } from 'pinia';
-import { useSettingsStore } from '@/stores/settings';
-import { useUsersStore } from '@/stores/users';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useUsersStore } from '@/stores/users.store';
 
-export default mixins(showMessage).extend({
+export default defineComponent({
 	name: 'ForgotMyPasswordView',
 	components: {
 		AuthView,
 	},
+	setup() {
+		return {
+			...useToast(),
+		};
+	},
 	data() {
 		return {
 			loading: false,
@@ -74,7 +79,7 @@ export default mixins(showMessage).extend({
 				this.loading = true;
 				await this.usersStore.sendForgotPasswordEmail(values);
 
-				this.$showMessage({
+				this.showMessage({
 					type: 'success',
 					title: this.$locale.baseText('forgotPassword.recoveryEmailSent'),
 					message: this.$locale.baseText('forgotPassword.emailSentIfExists', {
@@ -83,14 +88,20 @@ export default mixins(showMessage).extend({
 				});
 			} catch (error) {
 				let message = this.$locale.baseText('forgotPassword.smtpErrorContactAdministrator');
-				if (error.httpStatusCode === 422) {
-					message = this.$locale.baseText(error.message);
+				if (error.httpStatusCode) {
+					const { httpStatusCode: status } = error;
+					if (status === 429) {
+						message = this.$locale.baseText('forgotPassword.tooManyRequests');
+					} else if (error.httpStatusCode === 422) {
+						message = this.$locale.baseText(error.message);
+					}
+
+					this.showMessage({
+						type: 'error',
+						title: this.$locale.baseText('forgotPassword.sendingEmailError'),
+						message,
+					});
 				}
-				this.$showMessage({
-					type: 'error',
-					title: this.$locale.baseText('forgotPassword.sendingEmailError'),
-					message,
-				});
 			}
 			this.loading = false;
 		},
diff --git a/packages/editor-ui/src/views/MfaView.vue b/packages/editor-ui/src/views/MfaView.vue
new file mode 100644
index 0000000000000..ccd2e23bd73cd
--- /dev/null
+++ b/packages/editor-ui/src/views/MfaView.vue
@@ -0,0 +1,240 @@
+<template>
+	<div :class="$style.container">
+		<div :class="$style.logoContainer">
+			<Logo />
+		</div>
+		<n8n-card>
+			<div :class="$style.headerContainer">
+				<n8n-heading size="xlarge" color="text-dark">{{
+					showRecoveryCodeForm
+						? $locale.baseText('mfa.recovery.modal.title')
+						: $locale.baseText('mfa.code.modal.title')
+				}}</n8n-heading>
+			</div>
+			<div :class="[$style.formContainer, reportError ? $style.formError : '']">
+				<n8n-form-inputs
+					v-if="formInputs"
+					data-test-id="mfa-login-form"
+					:inputs="formInputs"
+					:event-bus="formBus"
+					@input="onInput"
+					@submit="onSubmit"
+				/>
+				<div :class="$style.infoBox">
+					<n8n-text
+						v-if="!showRecoveryCodeForm && !reportError"
+						size="small"
+						color="text-base"
+						:bold="false"
+						>{{ $locale.baseText('mfa.code.input.info') }}
+						<a data-test-id="mfa-enter-recovery-code-button" @click="onRecoveryCodeClick">{{
+							$locale.baseText('mfa.code.input.info.action')
+						}}</a></n8n-text
+					>
+					<n8n-text v-if="reportError" color="danger" size="small"
+						>{{ formError }}
+						<a
+							v-if="!showRecoveryCodeForm"
+							:class="$style.recoveryCodeLink"
+							@click="onRecoveryCodeClick"
+						>
+							{{ $locale.baseText('mfa.recovery.input.info.action') }}</a
+						>
+					</n8n-text>
+				</div>
+			</div>
+			<div>
+				<n8n-button
+					float="right"
+					:loading="verifyingMfaToken"
+					:label="
+						showRecoveryCodeForm
+							? $locale.baseText('mfa.recovery.button.verify')
+							: $locale.baseText('mfa.code.button.continue')
+					"
+					size="large"
+					:disabled="!hasAnyChanges"
+					@click="onSaveClick"
+				/>
+				<n8n-button
+					float="left"
+					:label="$locale.baseText('mfa.button.back')"
+					size="large"
+					type="tertiary"
+					@click="onBackClick"
+				/>
+			</div>
+		</n8n-card>
+	</div>
+</template>
+
+<script lang="ts">
+import type { IFormInputs } from '@/Interface';
+import Logo from '../components/Logo.vue';
+import {
+	MFA_AUTHENTICATION_RECOVERY_CODE_INPUT_MAX_LENGTH,
+	MFA_AUTHENTICATION_TOKEN_INPUT_MAX_LENGTH,
+} from '@/constants';
+import { useUsersStore } from '@/stores/users.store';
+import { mapStores } from 'pinia';
+import { mfaEventBus } from '@/event-bus';
+import { defineComponent } from 'vue';
+import { useToast } from '@/composables/useToast';
+
+export const FORM = {
+	MFA_TOKEN: 'MFA_TOKEN',
+	MFA_RECOVERY_CODE: 'MFA_RECOVERY_CODE',
+} as const;
+
+export default defineComponent({
+	name: 'MfaView',
+	components: {
+		Logo,
+	},
+	props: {
+		reportError: Boolean,
+	},
+	setup() {
+		return {
+			...useToast(),
+		};
+	},
+	data() {
+		return {
+			hasAnyChanges: false,
+			formBus: mfaEventBus,
+			formInputs: null as null | IFormInputs,
+			showRecoveryCodeForm: false,
+			verifyingMfaToken: false,
+			formError: '',
+		};
+	},
+	async mounted() {
+		this.formInputs = [this.mfaTokenFieldWithDefaults()];
+	},
+	computed: {
+		...mapStores(useUsersStore),
+	},
+	methods: {
+		onRecoveryCodeClick() {
+			this.formError = '';
+			this.showRecoveryCodeForm = true;
+			this.hasAnyChanges = false;
+			this.formInputs = [this.mfaRecoveryCodeFieldWithDefaults()];
+			this.$emit('onFormChanged', FORM.MFA_RECOVERY_CODE);
+		},
+		onBackClick() {
+			if (!this.showRecoveryCodeForm) {
+				this.$emit('onBackClick', FORM.MFA_TOKEN);
+				return;
+			}
+
+			this.showRecoveryCodeForm = false;
+			this.hasAnyChanges = true;
+			this.formInputs = [this.mfaTokenFieldWithDefaults()];
+			this.$emit('onBackClick', FORM.MFA_RECOVERY_CODE);
+		},
+		onInput({ target: { value, name } }: { target: { value: string; name: string } }) {
+			const isSubmittingMfaToken = name === 'token';
+			const inputValidLength = isSubmittingMfaToken
+				? MFA_AUTHENTICATION_TOKEN_INPUT_MAX_LENGTH
+				: MFA_AUTHENTICATION_RECOVERY_CODE_INPUT_MAX_LENGTH;
+
+			if (value.length !== inputValidLength) {
+				this.hasAnyChanges = false;
+				return;
+			}
+
+			this.verifyingMfaToken = true;
+			this.hasAnyChanges = true;
+
+			this.onSubmit({ token: value, recoveryCode: value })
+				.catch(() => {})
+				.finally(() => (this.verifyingMfaToken = false));
+		},
+		async onSubmit(form: { token: string; recoveryCode: string }) {
+			this.formError = !this.showRecoveryCodeForm
+				? this.$locale.baseText('mfa.code.invalid')
+				: this.$locale.baseText('mfa.recovery.invalid');
+			this.$emit('submit', form);
+		},
+		onSaveClick() {
+			this.formBus.emit('submit');
+		},
+		mfaTokenFieldWithDefaults() {
+			return this.formField(
+				'token',
+				this.$locale.baseText('mfa.code.input.label'),
+				this.$locale.baseText('mfa.code.input.placeholder'),
+				MFA_AUTHENTICATION_TOKEN_INPUT_MAX_LENGTH,
+			);
+		},
+		mfaRecoveryCodeFieldWithDefaults() {
+			return this.formField(
+				'recoveryCode',
+				this.$locale.baseText('mfa.recovery.input.label'),
+				this.$locale.baseText('mfa.recovery.input.placeholder'),
+				MFA_AUTHENTICATION_RECOVERY_CODE_INPUT_MAX_LENGTH,
+			);
+		},
+		formField(name: string, label: string, placeholder: string, maxlength: number, focus = true) {
+			return {
+				name,
+				initialValue: '',
+				properties: {
+					label,
+					placeholder,
+					maxlength,
+					capitalize: true,
+					validateOnBlur: false,
+					focusInitially: focus,
+				},
+			};
+		},
+	},
+});
+</script>
+
+<style lang="scss" module>
+body {
+	background-color: var(--color-background-light);
+}
+
+.container {
+	display: flex;
+	align-items: center;
+	flex-direction: column;
+	padding-top: var(--spacing-2xl);
+
+	> * {
+		margin-bottom: var(--spacing-l);
+		width: 352px;
+	}
+}
+
+.logoContainer {
+	display: flex;
+	justify-content: center;
+}
+
+.formContainer {
+	padding-bottom: var(--spacing-xl);
+}
+
+.headerContainer {
+	text-align: center;
+	margin-bottom: var(--spacing-xl);
+}
+
+.formError input {
+	border-color: var(--color-danger);
+}
+
+.recoveryCodeLink {
+	text-decoration: underline;
+}
+
+.infoBox {
+	padding-top: var(--spacing-4xs);
+}
+</style>
diff --git a/packages/editor-ui/src/views/NodeView.vue b/packages/editor-ui/src/views/NodeView.vue
index 8a131c24f8d91..c654ef379ef38 100644
--- a/packages/editor-ui/src/views/NodeView.vue
+++ b/packages/editor-ui/src/views/NodeView.vue
@@ -1,21 +1,23 @@
 <template>
-	<div :class="$style['content']">
+	<div ref="nodeViewRootRef" :class="$style['content']">
 		<div
-			class="node-view-root do-not-select"
 			id="node-view-root"
+			class="node-view-root do-not-select"
 			data-test-id="node-view-root"
 			@dragover="onDragOver"
 			@drop="onDrop"
 		>
 			<div
+				v-touch:tap="touchTap"
 				class="node-view-wrapper"
 				:class="workflowClasses"
+				data-test-id="node-view-wrapper"
 				@touchstart="mouseDown"
 				@touchend="mouseUp"
-				@touchmove="mouseMoveNodeWorkflow"
+				@touchmove="canvasPanning.onMouseMove"
 				@mousedown="mouseDown"
-				v-touch:tap="touchTap"
 				@mouseup="mouseUp"
+				@contextmenu="contextMenu.open"
 				@wheel="canvasStore.wheelScroll"
 			>
 				<div
@@ -26,101 +28,134 @@
 				/>
 				<div
 					id="node-view"
+					ref="nodeViewRef"
 					class="node-view"
 					:style="workflowStyle"
-					ref="nodeView"
 					data-test-id="node-view"
 				>
-					<canvas-add-button
-						:style="canvasAddButtonStyle"
-						@click="showTriggerCreator(NODE_CREATOR_OPEN_SOURCES.TRIGGER_PLACEHOLDER_BUTTON)"
+					<CanvasAddButton
 						v-show="showCanvasAddButton"
-						:showTooltip="!containsTrigger && showTriggerMissingTooltip"
-						:position="canvasStore.canvasAddButtonPosition"
 						ref="canvasAddButton"
-						@hook:mounted="canvasStore.setRecenteredCanvasAddButtonPosition"
+						:style="canvasAddButtonStyle"
+						:show-tooltip="!containsTrigger && showTriggerMissingTooltip"
+						:position="canvasStore.canvasAddButtonPosition"
 						data-test-id="canvas-add-button"
+						@click="onCanvasAddButtonCLick"
+						@hook:mounted="canvasStore.setRecenteredCanvasAddButtonPosition"
+					/>
+					<Node
+						v-for="nodeData in nodesToRender"
+						:key="`${nodeData.id}_node`"
+						:name="nodeData.name"
+						:is-read-only="isReadOnlyRoute || readOnlyEnv"
+						:instance="instance"
+						:is-active="!!activeNode && activeNode.name === nodeData.name"
+						:hide-actions="pullConnActive"
+						:is-production-execution-preview="isProductionExecutionPreview"
+						:workflow="currentWorkflowObject"
+						:disable-pointer-events="!canOpenNDV"
+						:hide-node-issues="hideNodeIssues"
+						@deselect-all-nodes="deselectAllNodes"
+						@deselect-node="nodeDeselectedByName"
+						@node-selected="nodeSelectedByName"
+						@run-workflow="onRunNode"
+						@moved="onNodeMoved"
+						@run="onNodeRun"
+						@remove-node="(name) => removeNode(name, true)"
+						@toggle-disable-node="(node) => toggleActivationNodes([node])"
+					>
+						<template #custom-tooltip>
+							<span
+								v-text="$locale.baseText('nodeView.placeholderNode.addTriggerNodeBeforeExecuting')"
+							/>
+						</template>
+					</Node>
+					<Sticky
+						v-for="stickyData in stickiesToRender"
+						:key="`${stickyData.id}_sticky`"
+						:name="stickyData.name"
+						:workflow="currentWorkflowObject"
+						:is-read-only="isReadOnlyRoute || readOnlyEnv"
+						:instance="instance"
+						:is-active="!!activeNode && activeNode.name === stickyData.name"
+						:node-view-scale="nodeViewScale"
+						:grid-size="GRID_SIZE"
+						:hide-actions="pullConnActive"
+						@deselect-all-nodes="deselectAllNodes"
+						@deselect-node="nodeDeselectedByName"
+						@node-selected="nodeSelectedByName"
+						@remove-node="(name) => removeNode(name, true)"
 					/>
-					<template v-for="nodeData in nodes">
-						<node
-							v-if="nodeData.type !== STICKY_NODE_TYPE"
-							@duplicateNode="duplicateNode"
-							@deselectAllNodes="deselectAllNodes"
-							@deselectNode="nodeDeselectedByName"
-							@nodeSelected="nodeSelectedByName"
-							@removeNode="(name) => removeNode(name, true)"
-							@runWorkflow="onRunNode"
-							@moved="onNodeMoved"
-							@run="onNodeRun"
-							:key="`${nodeData.id}_node`"
-							:name="nodeData.name"
-							:isReadOnly="isReadOnly"
-							:instance="instance"
-							:isActive="!!activeNode && activeNode.name === nodeData.name"
-							:hideActions="pullConnActive"
-							:isProductionExecutionPreview="isProductionExecutionPreview"
-						>
-							<template #custom-tooltip>
-								<span
-									v-text="
-										$locale.baseText('nodeView.placeholderNode.addTriggerNodeBeforeExecuting')
-									"
-								/>
-							</template>
-						</node>
-						<sticky
-							v-else
-							@deselectAllNodes="deselectAllNodes"
-							@deselectNode="nodeDeselectedByName"
-							@nodeSelected="nodeSelectedByName"
-							@removeNode="(name) => removeNode(name, true)"
-							:key="`${nodeData.id}_sticky`"
-							:name="nodeData.name"
-							:isReadOnly="isReadOnly"
-							:instance="instance"
-							:isActive="!!activeNode && activeNode.name === nodeData.name"
-							:nodeViewScale="nodeViewScale"
-							:gridSize="GRID_SIZE"
-							:hideActions="pullConnActive"
-						/>
-					</template>
 				</div>
 			</div>
-			<node-details-view
-				:readOnly="isReadOnly"
+			<NodeDetailsView
+				:read-only="isReadOnlyRoute || readOnlyEnv"
 				:renaming="renamingActive"
-				:isProductionExecutionPreview="isProductionExecutionPreview"
-				@valueChanged="valueChanged"
-				@stopExecution="stopExecution"
-				@saveKeyboardShortcut="onSaveKeyboardShortcut"
+				:is-production-execution-preview="isProductionExecutionPreview"
+				@redraw-node="redrawNode"
+				@switch-selected-node="onSwitchSelectedNode"
+				@open-connection-node-creator="onOpenConnectionNodeCreator"
+				@value-changed="valueChanged"
+				@stop-execution="stopExecution"
+				@save-keyboard-shortcut="onSaveKeyboardShortcut"
 			/>
-			<node-creation
-				v-if="!isReadOnly"
-				:create-node-active="createNodeActive"
-				:node-view-scale="nodeViewScale"
-				@toggleNodeCreator="onToggleNodeCreator"
-				@addNode="onAddNode"
-			/>
-			<canvas-controls />
-			<div class="workflow-execute-wrapper" v-if="!isReadOnly">
+			<Suspense>
+				<div :class="$style.setupCredentialsButtonWrapper">
+					<SetupWorkflowCredentialsButton />
+				</div>
+			</Suspense>
+			<Suspense>
+				<NodeCreation
+					v-if="!isReadOnlyRoute && !readOnlyEnv"
+					:create-node-active="createNodeActive"
+					:node-view-scale="nodeViewScale"
+					@toggle-node-creator="onToggleNodeCreator"
+					@add-nodes="onAddNodes"
+				/>
+			</Suspense>
+			<Suspense>
+				<CanvasControls />
+			</Suspense>
+			<Suspense>
+				<ContextMenu @action="onContextMenuAction" />
+			</Suspense>
+			<Suspense>
+				<NextStepPopup v-show="isNextStepPopupVisible" @option-selected="onNextStepSelected" />
+			</Suspense>
+			<div v-if="!isReadOnlyRoute && !readOnlyEnv" class="workflow-execute-wrapper">
 				<span
+					v-if="!isManualChatOnly"
 					@mouseenter="showTriggerMissingToltip(true)"
 					@mouseleave="showTriggerMissingToltip(false)"
 					@click="onRunContainerClick"
 				>
-					<n8n-button
-						@click.stop="onRunWorkflow"
-						:loading="workflowRunning"
+					<KeyboardShortcutTooltip
 						:label="runButtonText"
-						:title="$locale.baseText('nodeView.executesTheWorkflowFromATriggerNode')"
-						size="large"
-						icon="play-circle"
-						type="primary"
-						:disabled="isExecutionDisabled"
-						data-test-id="execute-workflow-button"
-					/>
+						:shortcut="{ metaKey: true, keys: ['↵'] }"
+					>
+						<n8n-button
+							:loading="workflowRunning"
+							:label="runButtonText"
+							size="large"
+							icon="flask"
+							type="primary"
+							:disabled="isExecutionDisabled"
+							data-test-id="execute-workflow-button"
+							@click.stop="onRunWorkflow"
+						/>
+					</KeyboardShortcutTooltip>
 				</span>
 
+				<n8n-button
+					v-if="containsChatNodes"
+					label="Chat"
+					size="large"
+					icon="comment"
+					type="primary"
+					data-test-id="workflow-chat-button"
+					@click.stop="onOpenChat"
+				/>
+
 				<n8n-icon-button
 					v-if="workflowRunning === true && !executionWaitingForWebhook"
 					icon="stop"
@@ -133,8 +168,8 @@
 							: $locale.baseText('nodeView.stopCurrentExecution')
 					"
 					:loading="stopExecutionInProgress"
-					@click.stop="stopExecution"
 					data-test-id="stop-execution-button"
+					@click.stop="stopExecution"
 				/>
 
 				<n8n-icon-button
@@ -144,17 +179,23 @@
 					size="large"
 					:title="$locale.baseText('nodeView.stopWaitingForWebhookCall')"
 					type="secondary"
-					@click.stop="stopWaitingForWebhook"
 					data-test-id="stop-execution-waiting-for-webhook-button"
+					@click.stop="stopWaitingForWebhook"
 				/>
 
 				<n8n-icon-button
-					v-if="!isReadOnly && workflowExecution && !workflowRunning && !allTriggersDisabled"
+					v-if="
+						!isReadOnlyRoute &&
+						!readOnlyEnv &&
+						workflowExecution &&
+						!workflowRunning &&
+						!allTriggersDisabled
+					"
 					:title="$locale.baseText('nodeView.deletesTheCurrentExecutionData')"
 					icon="trash"
 					size="large"
-					@click.stop="clearExecutionData"
 					data-test-id="clear-execution-data-button"
+					@click.stop="clearExecutionData"
 				/>
 			</div>
 		</div>
@@ -162,8 +203,8 @@
 </template>
 
 <script lang="ts">
-import Vue from 'vue';
-import { mapStores } from 'pinia';
+import { defineAsyncComponent, defineComponent, nextTick, ref } from 'vue';
+import { mapStores, storeToRefs } from 'pinia';
 
 import type {
 	Endpoint,
@@ -172,6 +213,7 @@ import type {
 	BeforeDropParams,
 	ConnectionDetachedParams,
 	ConnectionMovedParams,
+	ComponentParameters,
 } from '@jsplumb/core';
 import {
 	EVENT_CONNECTION,
@@ -179,15 +221,14 @@ import {
 	EVENT_CONNECTION_MOVED,
 	INTERCEPT_BEFORE_DROP,
 } from '@jsplumb/core';
-import type { MessageBoxInputData } from 'element-ui/types/message-box';
+import type { MessageBoxInputData, ElNotification } from 'element-plus';
 
 import {
 	FIRST_ONBOARDING_PROMPT_TIMEOUT,
 	MAIN_HEADER_TABS,
 	MODAL_CANCEL,
 	MODAL_CLOSE,
-	MODAL_CONFIRMED,
-	NODE_OUTPUT_DEFAULT_KEY,
+	MODAL_CONFIRM,
 	ONBOARDING_CALL_SIGNUP_MODAL_KEY,
 	ONBOARDING_PROMPT_TIMEBOX,
 	PLACEHOLDER_EMPTY_WORKFLOW_ID,
@@ -196,52 +237,69 @@ import {
 	STICKY_NODE_TYPE,
 	VIEWS,
 	WEBHOOK_NODE_TYPE,
-	TRIGGER_NODE_FILTER,
+	FORM_TRIGGER_NODE_TYPE,
+	TRIGGER_NODE_CREATOR_VIEW,
 	EnterpriseEditionFeature,
-	ASSUMPTION_EXPERIMENT,
-	REGULAR_NODE_FILTER,
-	MANUAL_TRIGGER_NODE_TYPE,
+	REGULAR_NODE_CREATOR_VIEW,
 	NODE_CREATOR_OPEN_SOURCES,
+	CHAT_TRIGGER_NODE_TYPE,
+	MANUAL_CHAT_TRIGGER_NODE_TYPE,
+	WORKFLOW_LM_CHAT_MODAL_KEY,
+	AI_NODE_CREATOR_VIEW,
+	DRAG_EVENT_DATA_KEY,
+	UPDATE_WEBHOOK_ID_NODE_TYPES,
+	TIME,
+	AI_ASSISTANT_LOCAL_STORAGE_KEY,
 } from '@/constants';
-import { copyPaste } from '@/mixins/copyPaste';
-import { externalHooks } from '@/mixins/externalHooks';
-import { genericHelpers } from '@/mixins/genericHelpers';
-import { moveNodeWorkflow } from '@/mixins/moveNodeWorkflow';
+
 import useGlobalLinkActions from '@/composables/useGlobalLinkActions';
+import { useNodeHelpers } from '@/composables/useNodeHelpers';
 import useCanvasMouseSelect from '@/composables/useCanvasMouseSelect';
-import { showMessage } from '@/mixins/showMessage';
+import { useExecutionDebugging } from '@/composables/useExecutionDebugging';
 import { useTitleChange } from '@/composables/useTitleChange';
-
-import { workflowHelpers } from '@/mixins/workflowHelpers';
-import { workflowRun } from '@/mixins/workflowRun';
+import { useDataSchema } from '@/composables/useDataSchema';
+import { type ContextMenuAction, useContextMenu } from '@/composables/useContextMenu';
+import { useUniqueNodeName } from '@/composables/useUniqueNodeName';
+import { useI18n } from '@/composables/useI18n';
+import { useMessage } from '@/composables/useMessage';
+import { useToast } from '@/composables/useToast';
 
 import NodeDetailsView from '@/components/NodeDetailsView.vue';
+import ContextMenu from '@/components/ContextMenu/ContextMenu.vue';
 import Node from '@/components/Node.vue';
-import NodeSettings from '@/components/NodeSettings.vue';
 import Sticky from '@/components/Sticky.vue';
 import CanvasAddButton from './CanvasAddButton.vue';
-import mixins from 'vue-typed-mixins';
+import KeyboardShortcutTooltip from '@/components/KeyboardShortcutTooltip.vue';
+import NextStepPopup from '@/components/AIAssistantChat/NextStepPopup.vue';
 import { v4 as uuid } from 'uuid';
 import type {
 	IConnection,
 	IConnections,
 	IDataObject,
-	IExecutionsSummary,
+	ExecutionSummary,
 	INode,
 	INodeConnections,
 	INodeCredentialsDetails,
-	INodeIssues,
+	INodeInputConfiguration,
 	INodeTypeDescription,
 	INodeTypeNameVersion,
 	IPinData,
-	IRun,
 	ITaskData,
 	ITelemetryTrackProperties,
 	IWorkflowBase,
 	Workflow,
+	ConnectionTypes,
+	INodeOutputConfiguration,
+} from 'n8n-workflow';
+import {
+	deepCopy,
+	jsonParse,
+	NodeConnectionType,
+	NodeHelpers,
+	TelemetryHelpers,
 } from 'n8n-workflow';
-import { deepCopy, NodeHelpers, TelemetryHelpers } from 'n8n-workflow';
 import type {
+	NewConnectionInfo,
 	ICredentialsResponse,
 	IExecutionResponse,
 	IWorkflowDb,
@@ -250,7 +308,6 @@ import type {
 	IUpdateInformation,
 	IWorkflowDataUpdate,
 	XYPosition,
-	IPushDataExecutionFinished,
 	ITag,
 	INewWorkflowData,
 	IWorkflowTemplate,
@@ -258,29 +315,35 @@ import type {
 	IUser,
 	INodeUpdatePropertiesInformation,
 	NodeCreatorOpenSource,
+	AddedNodesAndConnections,
+	ToggleNodeCreatorOptions,
+	AIAssistantConnectionInfo,
 } from '@/Interface';
 
-import { debounceHelper } from '@/mixins/debounce';
-import { useUIStore } from '@/stores/ui';
-import { useSettingsStore } from '@/stores/settings';
-import { useUsersStore } from '@/stores/users';
-import type { Route, RawLocation } from 'vue-router';
+import { type Route, type RawLocation, useRouter } from 'vue-router';
 import { dataPinningEventBus, nodeViewEventBus } from '@/event-bus';
-import { useWorkflowsStore } from '@/stores/workflows';
-import { useRootStore } from '@/stores/n8nRootStore';
-import { useNDVStore } from '@/stores/ndv';
-import { useSegment } from '@/stores/segment';
-import { useTemplatesStore } from '@/stores/templates';
-import { useNodeTypesStore } from '@/stores/nodeTypes';
-import { useCredentialsStore } from '@/stores/credentials';
-import { useTagsStore } from '@/stores/tags';
-import { useNodeCreatorStore } from '@/stores/nodeCreator';
-import { useCanvasStore } from '@/stores/canvas';
-import { useWorkflowsEEStore } from '@/stores/workflows.ee';
-import { useEnvironmentsStore } from '@/stores';
+import { useCanvasStore } from '@/stores/canvas.store';
+import { useCollaborationStore } from '@/stores/collaboration.store';
+import { useCredentialsStore } from '@/stores/credentials.store';
+import { useEnvironmentsStore } from '@/stores/environments.ee.store';
+import { useExternalSecretsStore } from '@/stores/externalSecrets.ee.store';
+import { useHistoryStore } from '@/stores/history.store';
+import { useNDVStore } from '@/stores/ndv.store';
+import { useNodeCreatorStore } from '@/stores/nodeCreator.store';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import { usePushConnectionStore } from '@/stores/pushConnection.store';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import { useSegment } from '@/stores/segment.store';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useTagsStore } from '@/stores/tags.store';
+import { useTemplatesStore } from '@/stores/templates.store';
+import { useUIStore } from '@/stores/ui.store';
+import { useUsersStore } from '@/stores/users.store';
+import { useWorkflowsEEStore } from '@/stores/workflows.ee.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
 import * as NodeViewUtils from '@/utils/nodeViewUtils';
-import { getAccountAge, getConnectionInfo, getNodeViewTab } from '@/utils';
-import { useHistoryStore } from '@/stores/history';
+import { getAccountAge } from '@/utils/userUtils';
+import { getConnectionInfo, getNodeViewTab } from '@/utils/canvasUtils';
 import {
 	AddConnectionCommand,
 	AddNodeCommand,
@@ -301,62 +364,184 @@ import {
 	EVENT_CONNECTION_MOUSEOVER,
 	ready,
 } from '@jsplumb/browser-ui';
-import type { N8nPlusEndpoint } from '@/plugins/endpoints/N8nPlusEndpointType';
+import type { N8nPlusEndpoint } from '@/plugins/jsplumb/N8nPlusEndpointType';
 import {
 	N8nPlusEndpointType,
 	EVENT_PLUS_ENDPOINT_CLICK,
-} from '@/plugins/endpoints/N8nPlusEndpointType';
+} from '@/plugins/jsplumb/N8nPlusEndpointType';
+import type { N8nAddInputEndpoint } from '@/plugins/jsplumb/N8nAddInputEndpointType';
+import {
+	EVENT_ADD_INPUT_ENDPOINT_CLICK,
+	N8nAddInputEndpointType,
+} from '@/plugins/jsplumb/N8nAddInputEndpointType';
+import { sourceControlEventBus } from '@/event-bus/source-control';
+import { getConnectorPaintStyleData, OVERLAY_ENDPOINT_ARROW_ID } from '@/utils/nodeViewUtils';
+import { useViewStacks } from '@/components/Node/NodeCreator/composables/useViewStacks';
+import { useExternalHooks } from '@/composables/useExternalHooks';
+import { useClipboard } from '@/composables/useClipboard';
+import { usePinnedData } from '@/composables/usePinnedData';
+import { useSourceControlStore } from '@/stores/sourceControl.store';
+import { useDeviceSupport } from 'n8n-design-system';
+import { useDebounce } from '@/composables/useDebounce';
+import { useExecutionsStore } from '@/stores/executions.store';
+import { useCanvasPanning } from '@/composables/useCanvasPanning';
+import { tryToParseNumber } from '@/utils/typesUtils';
+import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
+import { useRunWorkflow } from '@/composables/useRunWorkflow';
+import { useAIStore } from '@/stores/ai.store';
+import { useStorage } from '@/composables/useStorage';
+import { isJSPlumbEndpointElement } from '@/utils/typeGuards';
 
 interface AddNodeOptions {
 	position?: XYPosition;
 	dragAndDrop?: boolean;
+	name?: string;
 }
 
-const NodeCreator = () => import('@/components/Node/NodeCreator/NodeCreator.vue');
-const NodeCreation = () => import('@/components/Node/NodeCreation.vue');
-const CanvasControls = () => import('@/components/CanvasControls.vue');
-
-export default mixins(
-	copyPaste,
-	externalHooks,
-	genericHelpers,
-	moveNodeWorkflow,
-	showMessage,
-	workflowHelpers,
-	workflowRun,
-	debounceHelper,
-).extend({
+const NodeCreation = defineAsyncComponent(
+	async () => await import('@/components/Node/NodeCreation.vue'),
+);
+const CanvasControls = defineAsyncComponent(
+	async () => await import('@/components/CanvasControls.vue'),
+);
+const SetupWorkflowCredentialsButton = defineAsyncComponent(
+	async () =>
+		await import('@/components/SetupWorkflowCredentialsButton/SetupWorkflowCredentialsButton.vue'),
+);
+
+export default defineComponent({
 	name: 'NodeView',
 	components: {
 		NodeDetailsView,
 		Node,
-		NodeCreator,
-		NodeSettings,
 		Sticky,
 		CanvasAddButton,
+		KeyboardShortcutTooltip,
 		NodeCreation,
 		CanvasControls,
+		ContextMenu,
+		SetupWorkflowCredentialsButton,
+		NextStepPopup,
+	},
+	async beforeRouteLeave(to, from, next) {
+		if (
+			getNodeViewTab(to) === MAIN_HEADER_TABS.EXECUTIONS ||
+			from.name === VIEWS.TEMPLATE_IMPORT ||
+			(getNodeViewTab(to) === MAIN_HEADER_TABS.WORKFLOW && from.name === VIEWS.EXECUTION_DEBUG)
+		) {
+			next();
+			return;
+		}
+		if (this.uiStore.stateIsDirty && !this.readOnlyEnv) {
+			const confirmModal = await this.confirm(
+				this.$locale.baseText('generic.unsavedWork.confirmMessage.message'),
+				{
+					title: this.$locale.baseText('generic.unsavedWork.confirmMessage.headline'),
+					type: 'warning',
+					confirmButtonText: this.$locale.baseText(
+						'generic.unsavedWork.confirmMessage.confirmButtonText',
+					),
+					cancelButtonText: this.$locale.baseText(
+						'generic.unsavedWork.confirmMessage.cancelButtonText',
+					),
+					showClose: true,
+				},
+			);
+			if (confirmModal === MODAL_CONFIRM) {
+				// Make sure workflow id is empty when leaving the editor
+				this.workflowsStore.setWorkflowId(PLACEHOLDER_EMPTY_WORKFLOW_ID);
+				const saved = await this.workflowHelpers.saveCurrentWorkflow({}, false);
+				if (saved) {
+					await this.settingsStore.fetchPromptsData();
+				}
+				this.uiStore.stateIsDirty = false;
+
+				if (from.name === VIEWS.NEW_WORKFLOW) {
+					// Replace the current route with the new workflow route
+					// before navigating to the new route when saving new workflow.
+					await this.$router.replace(
+						{ name: VIEWS.WORKFLOW, params: { name: this.currentWorkflow } },
+						() => {
+							// We can't use next() here since vue-router
+							// would prevent the navigation with an error
+							void this.$router.push(to as RawLocation);
+						},
+					);
+				} else {
+					this.collaborationStore.notifyWorkflowClosed(this.currentWorkflow);
+					next();
+				}
+			} else if (confirmModal === MODAL_CANCEL) {
+				this.collaborationStore.notifyWorkflowClosed(this.currentWorkflow);
+				this.workflowsStore.setWorkflowId(PLACEHOLDER_EMPTY_WORKFLOW_ID);
+				this.resetWorkspace();
+				this.uiStore.stateIsDirty = false;
+				next();
+			}
+		} else {
+			this.collaborationStore.notifyWorkflowClosed(this.currentWorkflow);
+			next();
+		}
 	},
 	setup() {
+		const nodeViewRootRef = ref(null);
+		const nodeViewRef = ref(null);
+		const onMouseMoveEnd = ref(null);
+		const router = useRouter();
+
+		const ndvStore = useNDVStore();
+		const externalHooks = useExternalHooks();
+		const locale = useI18n();
+		const contextMenu = useContextMenu();
+		const dataSchema = useDataSchema();
+		const nodeHelpers = useNodeHelpers();
+		const clipboard = useClipboard();
+		const { activeNode } = storeToRefs(ndvStore);
+		const pinnedData = usePinnedData(activeNode);
+		const deviceSupport = useDeviceSupport();
+		const { callDebounced } = useDebounce();
+		const canvasPanning = useCanvasPanning(nodeViewRootRef, { onMouseMoveEnd });
+		const workflowHelpers = useWorkflowHelpers({ router });
+		const { runWorkflow, stopCurrentExecution } = useRunWorkflow({ router });
+
 		return {
+			locale,
+			contextMenu,
+			dataSchema,
+			nodeHelpers,
+			externalHooks,
+			clipboard,
+			pinnedData,
+			deviceSupport,
+			canvasPanning,
+			nodeViewRootRef,
+			nodeViewRef,
+			onMouseMoveEnd,
+			workflowHelpers,
+			runWorkflow,
+			stopCurrentExecution,
+			callDebounced,
 			...useCanvasMouseSelect(),
 			...useGlobalLinkActions(),
 			...useTitleChange(),
+			...useToast(),
+			...useMessage(),
+			...useUniqueNodeName(),
+			...useExecutionDebugging(),
 		};
 	},
-	errorCaptured: (err, vm, info) => {
-		console.error('errorCaptured'); // eslint-disable-line no-console
-		console.error(err); // eslint-disable-line no-console
-	},
 	watch: {
 		// Listen to route changes and load the workflow accordingly
-		$route(to: Route, from: Route) {
+		async $route(to: Route, from: Route) {
+			this.readOnlyEnvRouteCheck();
+
 			const currentTab = getNodeViewTab(to);
 			const nodeViewNotInitialized = !this.uiStore.nodeViewInitialized;
 			let workflowChanged =
 				from.params.name !== to.params.name &&
 				// Both 'new' and __EMPTY__ are new workflow names, so ignore them when detecting if wf changed
 				!(from.params.name === 'new' && this.currentWorkflow === PLACEHOLDER_EMPTY_WORKFLOW_ID) &&
+				!(from.name === VIEWS.NEW_WORKFLOW) &&
 				// Also ignore if workflow id changes when saving new workflow
 				to.params.action !== 'workflowSave';
 			const isOpeningTemplate = to.name === VIEWS.TEMPLATE_IMPORT;
@@ -364,20 +549,19 @@ export default mixins(
 			// When entering this tab:
 			if (currentTab === MAIN_HEADER_TABS.WORKFLOW || isOpeningTemplate) {
 				if (workflowChanged || nodeViewNotInitialized || isOpeningTemplate) {
-					this.startLoading();
+					this.canvasStore.startLoading();
 					if (nodeViewNotInitialized) {
 						const previousDirtyState = this.uiStore.stateIsDirty;
 						this.resetWorkspace();
 						this.uiStore.stateIsDirty = previousDirtyState;
 					}
-					this.loadCredentials();
-					this.initView().then(() => {
-						this.stopLoading();
-						if (this.blankRedirect) {
-							this.blankRedirect = false;
-						}
-					});
+					await Promise.all([this.loadCredentials(), this.initView()]);
+					this.canvasStore.stopLoading();
+					if (this.blankRedirect) {
+						this.blankRedirect = false;
+					}
 				}
+				await this.checkAndInitDebugMode();
 			}
 			// Also, when landing on executions tab, check if workflow data is changed
 			if (currentTab === MAIN_HEADER_TABS.EXECUTIONS) {
@@ -400,76 +584,15 @@ export default mixins(
 				this.canvasStore.setRecenteredCanvasAddButtonPosition(this.getNodeViewOffsetPosition);
 		},
 		nodeViewScale(newScale) {
-			const elementRef = this.$refs.nodeView as HTMLDivElement | undefined;
+			const elementRef = this.nodeViewRef as HTMLDivElement | undefined;
 			if (elementRef) {
 				elementRef.style.transform = `scale(${newScale})`;
 			}
 		},
 	},
-	async beforeRouteLeave(to, from, next) {
-		if (getNodeViewTab(to) === MAIN_HEADER_TABS.EXECUTIONS || from.name === VIEWS.TEMPLATE_IMPORT) {
-			next();
-			return;
-		}
-		if (this.uiStore.stateIsDirty) {
-			const confirmModal = await this.confirmModal(
-				this.$locale.baseText('generic.unsavedWork.confirmMessage.message'),
-				this.$locale.baseText('generic.unsavedWork.confirmMessage.headline'),
-				'warning',
-				this.$locale.baseText('generic.unsavedWork.confirmMessage.confirmButtonText'),
-				this.$locale.baseText('generic.unsavedWork.confirmMessage.cancelButtonText'),
-				true,
-				{
-					showCancelButton: true,
-					beforeClose: async (action, _nouse, done) => {
-						if (action !== 'confirm') {
-							return done();
-						}
-						let currentId = undefined;
-						if (this.currentWorkflowId !== PLACEHOLDER_EMPTY_WORKFLOW_ID) {
-							currentId = this.currentWorkflowId;
-						} else if (this.$route.params.name && this.$route.params.name !== 'new') {
-							currentId = this.$route.params.name;
-						}
-						const saved = await this.saveCurrentWorkflow({
-							id: currentId,
-							name: this.workflowName,
-							tags: this.currentWorkflowTagIds,
-						});
-						if (!saved) return;
-
-						await this.settingsStore.fetchPromptsData();
-
-						this.uiStore.stateIsDirty = false;
-
-						if (from.name === VIEWS.NEW_WORKFLOW) {
-							// Replace the current route with the new workflow route
-							// before navigating to the new route when saving new workflow.
-							this.$router.replace(
-								{ name: VIEWS.WORKFLOW, params: { name: this.currentWorkflow } },
-								() => {
-									// We can't use next() here since vue-router
-									// would prevent the navigation with an error
-									this.$router.push(to as RawLocation);
-								},
-							);
-							done();
-						} else {
-							next();
-							done();
-						}
-					},
-				},
-			);
-			if (confirmModal === MODAL_CANCEL) {
-				this.workflowsStore.setWorkflowId(PLACEHOLDER_EMPTY_WORKFLOW_ID);
-				this.resetWorkspace();
-				this.uiStore.stateIsDirty = false;
-				next();
-			}
-		} else {
-			next();
-		}
+	errorCaptured: (err, vm, info) => {
+		console.error('errorCaptured');
+		console.error(err);
 	},
 	computed: {
 		...mapStores(
@@ -489,19 +612,19 @@ export default mixins(
 			useEnvironmentsStore,
 			useWorkflowsEEStore,
 			useHistoryStore,
+			useExternalSecretsStore,
+			useCollaborationStore,
+			usePushConnectionStore,
+			useSourceControlStore,
+			useExecutionsStore,
+			useAIStore,
 		),
 		nativelyNumberSuffixedDefaults(): string[] {
-			return this.rootStore.nativelyNumberSuffixedDefaults;
+			return this.nodeTypesStore.nativelyNumberSuffixedDefaults;
 		},
 		currentUser(): IUser | null {
 			return this.usersStore.currentUser;
 		},
-		defaultLocale(): string {
-			return this.rootStore.defaultLocale;
-		},
-		isEnglishLocale(): boolean {
-			return this.defaultLocale === 'en';
-		},
 		activeNode(): INodeUi | null {
 			return this.ndvStore.activeNode;
 		},
@@ -512,7 +635,7 @@ export default mixins(
 			return this.$route.name === VIEWS.DEMO;
 		},
 		showCanvasAddButton(): boolean {
-			return this.loadingService === null && !this.containsTrigger && !this.isDemo;
+			return !this.isLoading && !this.containsTrigger && !this.isDemo && !this.readOnlyEnv;
 		},
 		lastSelectedNode(): INodeUi | null {
 			return this.uiStore.getLastSelectedNode;
@@ -520,6 +643,12 @@ export default mixins(
 		nodes(): INodeUi[] {
 			return this.workflowsStore.allNodes;
 		},
+		nodesToRender(): INodeUi[] {
+			return this.workflowsStore.allNodes.filter((node) => node.type !== STICKY_NODE_TYPE);
+		},
+		stickiesToRender(): INodeUi[] {
+			return this.workflowsStore.allNodes.filter((node) => node.type === STICKY_NODE_TYPE);
+		},
 		runButtonText(): string {
 			if (!this.workflowRunning) {
 				return this.$locale.baseText('nodeView.runButtonText.executeWorkflow');
@@ -553,7 +682,7 @@ export default mixins(
 		workflowClasses() {
 			const returnClasses = [];
 			if (this.ctrlKeyPressed || this.moveCanvasKeyPressed) {
-				if (this.uiStore.nodeViewMoveInProgress === true) {
+				if (this.uiStore.nodeViewMoveInProgress) {
 					returnClasses.push('move-in-process');
 				} else {
 					returnClasses.push('move-active');
@@ -563,6 +692,15 @@ export default mixins(
 				// Makes sure that nothing gets selected while select or move is active
 				returnClasses.push('do-not-select');
 			}
+
+			if (this.connectionDragScope.type) {
+				returnClasses.push('connection-drag-scope-active');
+				returnClasses.push(`connection-drag-scope-active-type-${this.connectionDragScope.type}`);
+				returnClasses.push(
+					`connection-drag-scope-active-connection-${this.connectionDragScope.connection}`,
+				);
+			}
+
 			return returnClasses;
 		},
 		workflowExecution(): IExecutionResponse | null {
@@ -589,7 +727,26 @@ export default mixins(
 		containsTrigger(): boolean {
 			return this.triggerNodes.length > 0;
 		},
+		containsChatNodes(): boolean {
+			return (
+				!this.executionWaitingForWebhook &&
+				!!this.nodes.find(
+					(node) =>
+						[MANUAL_CHAT_TRIGGER_NODE_TYPE, CHAT_TRIGGER_NODE_TYPE].includes(node.type) &&
+						node.disabled !== true,
+				)
+			);
+		},
+		isManualChatOnly(): boolean {
+			return this.containsChatNodes && this.triggerNodes.length === 1;
+		},
 		isExecutionDisabled(): boolean {
+			if (
+				this.containsChatNodes &&
+				this.triggerNodes.every((node) => node.disabled || node.type === CHAT_TRIGGER_NODE_TYPE)
+			) {
+				return true;
+			}
 			return !this.containsTrigger || this.allTriggersDisabled;
 		},
 		getNodeViewOffsetPosition(): XYPosition {
@@ -601,6 +758,28 @@ export default mixins(
 		instance(): BrowserJsPlumbInstance {
 			return this.canvasStore.jsPlumbInstance;
 		},
+		isLoading(): boolean {
+			return this.canvasStore.isLoading;
+		},
+		currentWorkflowObject(): Workflow {
+			return this.workflowsStore.getCurrentWorkflow();
+		},
+		readOnlyEnv(): boolean {
+			return this.sourceControlStore.preferences.branchReadOnly;
+		},
+		isReadOnlyRoute() {
+			return this.$route?.meta?.readOnlyCanvas === true;
+		},
+		isNextStepPopupVisible(): boolean {
+			return this.aiStore.nextStepPopupConfig.open;
+		},
+		shouldShowNextStepDialog(): boolean {
+			const userHasSeenAIAssistantExperiment =
+				useStorage(AI_ASSISTANT_LOCAL_STORAGE_KEY).value === 'true';
+			const experimentEnabled = this.aiStore.isAssistantExperimentEnabled;
+			const isCloudDeployment = this.settingsStore.isCloudDeployment;
+			return isCloudDeployment && experimentEnabled && !userHasSeenAIAssistantExperiment;
+		},
 	},
 	data() {
 		return {
@@ -616,31 +795,301 @@ export default mixins(
 			pullConnActiveNodeName: null as string | null,
 			pullConnActive: false,
 			dropPrevented: false,
+			connectionDragScope: {
+				type: null,
+				connection: null,
+			} as { type: string | null; connection: 'source' | 'target' | null },
 			renamingActive: false,
 			showStickyButton: false,
 			isExecutionPreview: false,
 			showTriggerMissingTooltip: false,
 			workflowData: null as INewWorkflowData | null,
 			activeConnection: null as null | Connection,
+			isInsertingNodes: false,
 			isProductionExecutionPreview: false,
 			enterTimer: undefined as undefined | ReturnType<typeof setTimeout>,
 			exitTimer: undefined as undefined | ReturnType<typeof setTimeout>,
+			readOnlyNotification: null as null | typeof ElNotification,
 			// jsplumb automatically deletes all loose connections which is in turn recorded
 			// in undo history as a user action.
 			// This should prevent automatically removed connections from populating undo stack
 			suspendRecordingDetachedConnections: false,
 			NODE_CREATOR_OPEN_SOURCES,
+			eventsAttached: false,
+			unloadTimeout: undefined as undefined | ReturnType<typeof setTimeout>,
+			canOpenNDV: true,
+			hideNodeIssues: false,
 		};
 	},
-	beforeDestroy() {
+	async mounted() {
+		// To be refactored (unref) when migrating to composition API
+		this.onMouseMoveEnd = this.mouseUp;
+
 		this.resetWorkspace();
+		this.canvasStore.initInstance(this.nodeViewRef as HTMLElement);
+		this.titleReset();
+
+		window.addEventListener('message', this.onPostMessageReceived);
+
+		this.clipboard.onPaste.value = this.onClipboardPasteEvent;
+
+		this.canvasStore.startLoading();
+
+		const loadPromises = (() => {
+			if (this.settingsStore.isPreviewMode && this.isDemo) return [];
+			const promises = [
+				this.loadActiveWorkflows(),
+				this.loadCredentials(),
+				this.loadCredentialTypes(),
+			];
+			if (this.settingsStore.isEnterpriseFeatureEnabled(EnterpriseEditionFeature.Variables)) {
+				promises.push(this.loadVariables());
+			}
+			if (this.settingsStore.isEnterpriseFeatureEnabled(EnterpriseEditionFeature.ExternalSecrets)) {
+				promises.push(this.loadSecrets());
+			}
+			return promises;
+		})();
+
+		if (this.nodeTypesStore.allNodeTypes.length === 0) {
+			loadPromises.push(this.loadNodeTypes());
+		}
+
+		try {
+			await Promise.all(loadPromises);
+		} catch (error) {
+			this.showError(
+				error,
+				this.$locale.baseText('nodeView.showError.mounted1.title'),
+				this.$locale.baseText('nodeView.showError.mounted1.message') + ':',
+			);
+			return;
+		}
+
+		ready(async () => {
+			try {
+				try {
+					this.bindCanvasEvents();
+				} catch {} // This will break if mounted after jsplumb has been initiated from executions preview, so continue if it breaks
+				await this.initView();
+				if (window.parent) {
+					window.parent.postMessage(
+						JSON.stringify({ command: 'n8nReady', version: this.rootStore.versionCli }),
+						'*',
+					);
+				}
+			} catch (error) {
+				this.showError(
+					error,
+					this.$locale.baseText('nodeView.showError.mounted2.title'),
+					this.$locale.baseText('nodeView.showError.mounted2.message') + ':',
+				);
+			}
+			this.canvasStore.stopLoading();
+
+			setTimeout(() => {
+				void this.usersStore.showPersonalizationSurvey();
+				this.addPinDataConnections(this.workflowsStore.pinnedWorkflowData || ({} as IPinData));
+			}, 0);
+		});
+
+		// TODO: This currently breaks since front-end hooks are still not updated to work with pinia store
+		void this.externalHooks.run('nodeView.mount').catch((e) => {});
+
+		if (
+			this.currentUser?.personalizationAnswers !== null &&
+			this.settingsStore.onboardingCallPromptEnabled &&
+			this.currentUser &&
+			getAccountAge(this.currentUser) <= ONBOARDING_PROMPT_TIMEBOX
+		) {
+			const onboardingResponse = await this.uiStore.getNextOnboardingPrompt();
+			const promptTimeout =
+				onboardingResponse?.toast_sequence_number === 1 ? FIRST_ONBOARDING_PROMPT_TIMEOUT : 1000;
+
+			if (onboardingResponse?.title && onboardingResponse?.description) {
+				setTimeout(async () => {
+					this.showToast({
+						type: 'info',
+						title: onboardingResponse.title,
+						message: onboardingResponse.description,
+						duration: 0,
+						customClass: 'clickable',
+						closeOnClick: true,
+						onClick: () => {
+							this.$telemetry.track('user clicked onboarding toast', {
+								seq_num: onboardingResponse.toast_sequence_number,
+								title: onboardingResponse.title,
+								description: onboardingResponse.description,
+							});
+							this.uiStore.openModal(ONBOARDING_CALL_SIGNUP_MODAL_KEY);
+						},
+					});
+				}, promptTimeout);
+			}
+		}
+
+		sourceControlEventBus.on('pull', this.onSourceControlPull);
+
+		this.registerCustomAction({
+			key: 'openNodeDetail',
+			action: ({ node }: { node: string }) => {
+				this.nodeSelectedByName(node, true);
+			},
+		});
+
+		this.registerCustomAction({
+			key: 'openSelectiveNodeCreator',
+			action: this.openSelectiveNodeCreator,
+		});
+
+		this.readOnlyEnvRouteCheck();
+		this.canvasStore.isDemo = this.isDemo;
+	},
+	activated() {
+		const openSideMenu = this.uiStore.addFirstStepOnLoad;
+		if (openSideMenu) {
+			this.showTriggerCreator(NODE_CREATOR_OPEN_SOURCES.TRIGGER_PLACEHOLDER_BUTTON);
+		}
+		this.uiStore.addFirstStepOnLoad = false;
+		this.bindCanvasEvents();
+		document.addEventListener('keydown', this.keyDown);
+		document.addEventListener('keyup', this.keyUp);
+		window.addEventListener('message', this.onPostMessageReceived);
+		window.addEventListener('pageshow', this.onPageShow);
+
+		nodeViewEventBus.on('newWorkflow', this.newWorkflow);
+		nodeViewEventBus.on('importWorkflowData', this.onImportWorkflowDataEvent);
+		nodeViewEventBus.on('importWorkflowUrl', this.onImportWorkflowUrlEvent);
+		nodeViewEventBus.on('openChat', this.onOpenChat);
+		historyBus.on('nodeMove', this.onMoveNode);
+		historyBus.on('revertAddNode', this.onRevertAddNode);
+		historyBus.on('revertRemoveNode', this.onRevertRemoveNode);
+		historyBus.on('revertAddConnection', this.onRevertAddConnection);
+		historyBus.on('revertRemoveConnection', this.onRevertRemoveConnection);
+		historyBus.on('revertRenameNode', this.onRevertNameChange);
+		historyBus.on('enableNodeToggle', this.onRevertEnableToggle);
+
+		dataPinningEventBus.on('pin-data', this.addPinDataConnections);
+		dataPinningEventBus.on('unpin-data', this.removePinDataConnections);
+		nodeViewEventBus.on('saveWorkflow', this.saveCurrentWorkflowExternal);
+
+		this.canvasStore.isDemo = this.isDemo;
+	},
+	deactivated() {
+		this.unbindCanvasEvents();
+		document.removeEventListener('keydown', this.keyDown);
+		document.removeEventListener('keyup', this.keyUp);
+		window.removeEventListener('message', this.onPostMessageReceived);
+		window.removeEventListener('beforeunload', this.onBeforeUnload);
+		window.removeEventListener('pageshow', this.onPageShow);
+
+		nodeViewEventBus.off('newWorkflow', this.newWorkflow);
+		nodeViewEventBus.off('importWorkflowData', this.onImportWorkflowDataEvent);
+		nodeViewEventBus.off('importWorkflowUrl', this.onImportWorkflowUrlEvent);
+		nodeViewEventBus.off('openChat', this.onOpenChat);
+		historyBus.off('nodeMove', this.onMoveNode);
+		historyBus.off('revertAddNode', this.onRevertAddNode);
+		historyBus.off('revertRemoveNode', this.onRevertRemoveNode);
+		historyBus.off('revertAddConnection', this.onRevertAddConnection);
+		historyBus.off('revertRemoveConnection', this.onRevertRemoveConnection);
+		historyBus.off('revertRenameNode', this.onRevertNameChange);
+		historyBus.off('enableNodeToggle', this.onRevertEnableToggle);
+
+		dataPinningEventBus.off('pin-data', this.addPinDataConnections);
+		dataPinningEventBus.off('unpin-data', this.removePinDataConnections);
+		nodeViewEventBus.off('saveWorkflow', this.saveCurrentWorkflowExternal);
+	},
+	beforeMount() {
+		if (!this.isDemo) {
+			this.pushStore.pushConnect();
+		}
+		this.collaborationStore.initialize();
+	},
+	beforeUnmount() {
 		// Make sure the event listeners get removed again else we
 		// could add up with them registered multiple times
 		document.removeEventListener('keydown', this.keyDown);
 		document.removeEventListener('keyup', this.keyUp);
 		this.unregisterCustomAction('showNodeCreator');
+		this.unregisterCustomAction('openNodeDetail');
+		this.unregisterCustomAction('openSelectiveNodeCreator');
+
+		if (!this.isDemo) {
+			this.pushStore.pushDisconnect();
+		}
+		this.collaborationStore.terminate();
+
+		this.resetWorkspace();
+		this.instance.unbind();
+		this.instance.destroy();
+		this.uiStore.stateIsDirty = false;
+		this.workflowsStore.resetChatMessages();
+		window.removeEventListener('message', this.onPostMessageReceived);
+		nodeViewEventBus.off('newWorkflow', this.newWorkflow);
+		nodeViewEventBus.off('importWorkflowData', this.onImportWorkflowDataEvent);
+		nodeViewEventBus.off('importWorkflowUrl', this.onImportWorkflowUrlEvent);
+		this.workflowsStore.setWorkflowId(PLACEHOLDER_EMPTY_WORKFLOW_ID);
+		sourceControlEventBus.off('pull', this.onSourceControlPull);
 	},
 	methods: {
+		async openSelectiveNodeCreator({
+			connectiontype,
+			node,
+			creatorview,
+		}: {
+			connectiontype: ConnectionTypes;
+			node: string;
+			creatorview?: string;
+		}) {
+			const nodeName = node ?? this.ndvStore.activeNodeName;
+			const nodeData = nodeName ? this.workflowsStore.getNodeByName(nodeName) : null;
+
+			this.ndvStore.activeNodeName = null;
+			await this.redrawNode(node);
+			// Wait for UI to update
+			setTimeout(() => {
+				if (creatorview) {
+					this.onToggleNodeCreator({
+						createNodeActive: true,
+						nodeCreatorView: creatorview,
+					});
+				} else if (connectiontype && nodeData) {
+					this.insertNodeAfterSelected({
+						index: 0,
+						endpointUuid: `${nodeData.id}-input${connectiontype}0`,
+						eventSource: NODE_CREATOR_OPEN_SOURCES.NOTICE_ERROR_MESSAGE,
+						outputType: connectiontype,
+						sourceId: nodeData.id,
+					});
+				}
+			});
+		},
+		editAllowedCheck(): boolean {
+			if (this.readOnlyNotification?.visible) {
+				return;
+			}
+			if (this.isReadOnlyRoute || this.readOnlyEnv) {
+				this.readOnlyNotification = this.showMessage({
+					title: this.$locale.baseText(
+						this.readOnlyEnv
+							? `readOnlyEnv.showMessage.${this.isReadOnlyRoute ? 'executions' : 'workflows'}.title`
+							: 'readOnly.showMessage.executions.title',
+					),
+					message: this.$locale.baseText(
+						this.readOnlyEnv
+							? `readOnlyEnv.showMessage.${
+									this.isReadOnlyRoute ? 'executions' : 'workflows'
+								}.message`
+							: 'readOnly.showMessage.executions.message',
+					),
+					type: 'info',
+					dangerouslyUseHTMLString: true,
+				});
+
+				return false;
+			}
+			return true;
+		},
 		showTriggerMissingToltip(isVisible: boolean) {
 			this.showTriggerMissingTooltip = isVisible;
 		},
@@ -650,25 +1099,73 @@ export default mixins(
 				node_type: node ? node.type : null,
 				workflow_id: this.workflowsStore.workflowId,
 				source: 'canvas',
+				push_ref: this.ndvStore.pushRef,
 			};
 			this.$telemetry.track('User clicked execute node button', telemetryPayload);
-			this.$externalHooks().run('nodeView.onRunNode', telemetryPayload);
-			this.runWorkflow(nodeName, source);
+			void this.externalHooks.run('nodeView.onRunNode', telemetryPayload);
+			void this.runWorkflow({ destinationNode: nodeName, source });
+		},
+		async onOpenChat() {
+			const telemetryPayload = {
+				workflow_id: this.workflowsStore.workflowId,
+			};
+			this.$telemetry.track('User clicked chat open button', telemetryPayload);
+			void this.externalHooks.run('nodeView.onOpenChat', telemetryPayload);
+			this.uiStore.openModal(WORKFLOW_LM_CHAT_MODAL_KEY);
 		},
 		async onRunWorkflow() {
-			this.getWorkflowDataToSave().then((workflowData) => {
+			void this.workflowHelpers.getWorkflowDataToSave().then((workflowData) => {
 				const telemetryPayload = {
 					workflow_id: this.workflowsStore.workflowId,
 					node_graph_string: JSON.stringify(
-						TelemetryHelpers.generateNodesGraph(workflowData as IWorkflowBase, this.getNodeTypes())
-							.nodeGraph,
+						TelemetryHelpers.generateNodesGraph(
+							workflowData as IWorkflowBase,
+							this.workflowHelpers.getNodeTypes(),
+							{ isCloudDeployment: this.settingsStore.isCloudDeployment },
+						).nodeGraph,
 					),
 				};
 				this.$telemetry.track('User clicked execute workflow button', telemetryPayload);
-				this.$externalHooks().run('nodeView.onRunWorkflow', telemetryPayload);
+				void this.externalHooks.run('nodeView.onRunWorkflow', telemetryPayload);
 			});
 
-			await this.runWorkflow();
+			await this.runWorkflow({});
+			this.refreshEndpointsErrorsState();
+		},
+		resetEndpointsErrors() {
+			const allEndpoints = Object.values(this.instance.getManagedElements()).flatMap(
+				(el) => el.endpoints,
+			);
+
+			allEndpoints
+				.filter((endpoint) => endpoint?.endpoint.type === N8nAddInputEndpointType)
+				.forEach((endpoint) => {
+					const n8nAddInputEndpoint = endpoint?.endpoint as N8nAddInputEndpoint;
+					if (n8nAddInputEndpoint && (endpoint?.connections ?? []).length > 0) {
+						n8nAddInputEndpoint.resetError();
+					}
+				});
+		},
+		refreshEndpointsErrorsState() {
+			const nodeIssues = this.workflowsStore.allNodes.filter((n) => n.issues);
+			// Set input color to red if there are issues
+			this.resetEndpointsErrors();
+			nodeIssues.forEach((node) => {
+				const managedNode = this.instance.getManagedElement(node.id);
+				const endpoints = this.instance.getEndpoints(managedNode);
+
+				Object.keys(node?.issues?.input ?? {}).forEach((connectionType) => {
+					const inputEndpointsWithIssues = endpoints.filter(
+						(e) => e._defaultType.scope === connectionType,
+					);
+					inputEndpointsWithIssues.forEach((endpoint) => {
+						const n8nAddInputEndpoint = endpoint?.endpoint as N8nAddInputEndpoint;
+						if (n8nAddInputEndpoint) {
+							n8nAddInputEndpoint.setError();
+						}
+					});
+				});
+			});
 		},
 		onRunContainerClick() {
 			if (this.containsTrigger && !this.allTriggersDisabled) return;
@@ -678,10 +1175,13 @@ export default mixins(
 					? this.$locale.baseText('nodeView.addOrEnableTriggerNode')
 					: this.$locale.baseText('nodeView.addATriggerNodeFirst');
 
-			this.registerCustomAction('showNodeCreator', () =>
-				this.showTriggerCreator(NODE_CREATOR_OPEN_SOURCES.NO_TRIGGER_EXECUTION_TOOLTIP),
-			);
-			const notice = this.$showMessage({
+			this.registerCustomAction({
+				key: 'showNodeCreator',
+				action: () =>
+					this.showTriggerCreator(NODE_CREATOR_OPEN_SOURCES.NO_TRIGGER_EXECUTION_TOOLTIP),
+			});
+
+			const notice = this.showMessage({
 				type: 'info',
 				title: this.$locale.baseText('nodeView.cantExecuteNoTrigger'),
 				message,
@@ -691,87 +1191,25 @@ export default mixins(
 						// Close the creator panel if user clicked on the link
 						if (this.createNodeActive) notice.close();
 					}, 0),
+				dangerouslyUseHTMLString: true,
 			});
 		},
 		clearExecutionData() {
 			this.workflowsStore.workflowExecutionData = null;
-			this.updateNodesExecutionIssues();
-		},
-		translateName(type: string, originalName: string) {
-			return this.$locale.headerText({
-				key: `headers.${this.$locale.shortNodeType(type)}.displayName`,
-				fallback: originalName,
-			});
+			this.nodeHelpers.updateNodesExecutionIssues();
 		},
-		getUniqueNodeName({
-			originalName,
-			additionalUsedNames = [],
-			type = '',
-		}: {
-			originalName: string;
-			additionalUsedNames?: string[];
-			type?: string;
-		}) {
-			const allNodeNamesOnCanvas = this.workflowsStore.allNodes.map((n: INodeUi) => n.name);
-			originalName = this.isEnglishLocale ? originalName : this.translateName(type, originalName);
-
-			if (
-				!allNodeNamesOnCanvas.includes(originalName) &&
-				!additionalUsedNames.includes(originalName)
-			) {
-				return originalName; // already unique
-			}
-
-			let natives: string[] = this.nativelyNumberSuffixedDefaults;
-			natives = this.isEnglishLocale
-				? natives
-				: natives.map((name) => {
-						const type = name.toLowerCase().replace('_', '');
-						return this.translateName(type, name);
-				  });
-
-			const found = natives.find((n) => originalName.startsWith(n));
-
-			let ignore, baseName, nameIndex, uniqueName;
-			let index = 1;
-
-			if (found) {
-				// name natively ends with number
-				nameIndex = originalName.split(found).pop();
-				if (nameIndex) {
-					index = parseInt(nameIndex, 10);
-				}
-				baseName = uniqueName = found;
-			} else {
-				const nameMatch = originalName.match(/(.*\D+)(\d*)/);
-
-				if (nameMatch === null) {
-					// name is only a number
-					index = parseInt(originalName, 10);
-					baseName = '';
-					uniqueName = baseName + index;
-				} else {
-					// name is string or string/number combination
-					[ignore, baseName, nameIndex] = nameMatch;
-					if (nameIndex !== '') {
-						index = parseInt(nameIndex, 10);
-					}
-					uniqueName = baseName;
+		async onSaveKeyboardShortcut(e: KeyboardEvent) {
+			let saved = await this.workflowHelpers.saveCurrentWorkflow();
+			if (saved) {
+				await this.settingsStore.fetchPromptsData();
+
+				if (this.$route.name === VIEWS.EXECUTION_DEBUG) {
+					await this.$router.replace({
+						name: VIEWS.WORKFLOW,
+						params: { name: this.currentWorkflow },
+					});
 				}
 			}
-
-			while (
-				allNodeNamesOnCanvas.includes(uniqueName) ||
-				additionalUsedNames.includes(uniqueName)
-			) {
-				uniqueName = baseName + index++;
-			}
-
-			return uniqueName;
-		},
-		async onSaveKeyboardShortcut(e: KeyboardEvent) {
-			let saved = await this.saveCurrentWorkflow();
-			if (saved) await this.settingsStore.fetchPromptsData();
 			if (this.activeNode) {
 				// If NDV is open, save will not work from editable input fields
 				// so don't show success message if this is true
@@ -781,27 +1219,54 @@ export default mixins(
 					saved = true;
 				}
 				if (saved) {
-					this.$showMessage({
+					this.showMessage({
 						title: this.$locale.baseText('generic.workflowSaved'),
 						type: 'success',
 					});
 				}
 			}
 		},
+		async onCanvasAddButtonCLick(event: PointerEvent) {
+			if (event) {
+				if (this.shouldShowNextStepDialog) {
+					const newNodeButton = (event.target as HTMLElement).closest('button');
+					if (newNodeButton) {
+						this.aiStore.latestConnectionInfo = null;
+						this.aiStore.openNextStepPopup(
+							this.$locale.baseText('nextStepPopup.title.firstStep'),
+							newNodeButton,
+						);
+					}
+					return;
+				}
+				this.showTriggerCreator(NODE_CREATOR_OPEN_SOURCES.TRIGGER_PLACEHOLDER_BUTTON);
+				return;
+			}
+		},
+		onNextStepSelected(action: string) {
+			if (action === 'choose') {
+				const lastConnectionInfo = this.aiStore.latestConnectionInfo as NewConnectionInfo;
+				if (lastConnectionInfo === null) {
+					this.showTriggerCreator(NODE_CREATOR_OPEN_SOURCES.TRIGGER_PLACEHOLDER_BUTTON);
+				} else {
+					this.insertNodeAfterSelected(lastConnectionInfo);
+				}
+			}
+		},
 		showTriggerCreator(source: NodeCreatorOpenSource) {
 			if (this.createNodeActive) return;
-			this.nodeCreatorStore.setSelectedView(TRIGGER_NODE_FILTER);
+			this.nodeCreatorStore.setSelectedView(TRIGGER_NODE_CREATOR_VIEW);
 			this.nodeCreatorStore.setShowScrim(true);
 			this.onToggleNodeCreator({ source, createNodeActive: true });
 		},
 		async openExecution(executionId: string) {
-			this.startLoading();
+			this.canvasStore.startLoading();
 			this.resetWorkspace();
 			let data: IExecutionResponse | undefined;
 			try {
 				data = await this.workflowsStore.getExecution(executionId);
 			} catch (error) {
-				this.$showError(error, this.$locale.baseText('nodeView.showError.openExecution.title'));
+				this.showError(error, this.$locale.baseText('nodeView.showError.openExecution.title'));
 				return;
 			}
 			if (data === undefined) {
@@ -817,15 +1282,32 @@ export default mixins(
 				this.workflowsStore.setWorkflowPinData(data.workflowData.pinData);
 			}
 
+			if (data.workflowData.ownedBy) {
+				this.workflowsEEStore.setWorkflowOwnedBy({
+					workflowId: data.workflowData.id,
+					ownedBy: data.workflowData.ownedBy,
+				});
+			}
+
+			if (data.workflowData.sharedWith) {
+				this.workflowsEEStore.setWorkflowSharedWith({
+					workflowId: data.workflowData.id,
+					sharedWith: data.workflowData.sharedWith,
+				});
+			}
+
+			if (data.workflowData.usedCredentials) {
+				this.workflowsStore.setUsedCredentials(data.workflowData.usedCredentials);
+			}
+
 			await this.addNodes(
 				deepCopy(data.workflowData.nodes),
 				deepCopy(data.workflowData.connections),
 			);
-			this.$nextTick(() => {
-				this.canvasStore.zoomToFit();
-				this.uiStore.stateIsDirty = false;
-			});
-			this.$externalHooks().run('execution.open', {
+			await this.$nextTick();
+			this.canvasStore.zoomToFit();
+			this.uiStore.stateIsDirty = false;
+			void this.externalHooks.run('execution.open', {
 				workflowId: data.workflowData.id,
 				workflowName: data.workflowData.name,
 				executionId,
@@ -853,13 +1335,18 @@ export default mixins(
 
 				if (!nodeErrorFound && data.data.resultData.error.stack) {
 					// Display some more information for now in console to make debugging easier
-					// TODO: Improve this in the future by displaying in UI
-					console.error(`Execution ${executionId} error:`); // eslint-disable-line no-console
-					console.error(data.data.resultData.error.stack); // eslint-disable-line no-console
+					console.error(`Execution ${executionId} error:`);
+					console.error(data.data.resultData.error.stack);
+					this.showMessage({
+						title: this.$locale.baseText('nodeView.showError.workflowError'),
+						message: data.data.resultData.error.message,
+						type: 'error',
+						duration: 0,
+					});
 				}
 			}
-			if ((data as IExecutionsSummary).waitTill) {
-				this.$showMessage({
+			if ((data as ExecutionSummary).waitTill) {
+				this.showMessage({
 					title: this.$locale.baseText('nodeView.thisExecutionHasntFinishedYet'),
 					message: `<a data-action="reload">${this.$locale.baseText(
 						'nodeView.refresh',
@@ -872,7 +1359,7 @@ export default mixins(
 					duration: 0,
 				});
 			}
-			this.stopLoading();
+			this.canvasStore.stopLoading();
 		},
 		async importWorkflowExact(data: { workflow: IWorkflowDataUpdate }) {
 			if (!data.workflow.nodes || !data.workflow.connections) {
@@ -886,23 +1373,21 @@ export default mixins(
 			if (data.workflow.pinData) {
 				this.workflowsStore.setWorkflowPinData(data.workflow.pinData);
 			}
-
-			this.$nextTick(() => {
-				this.canvasStore.zoomToFit();
-			});
+			await this.$nextTick();
+			this.canvasStore.zoomToFit();
 		},
 		async openWorkflowTemplate(templateId: string) {
-			this.startLoading();
-			this.setLoadingText(this.$locale.baseText('nodeView.loadingTemplate'));
+			this.canvasStore.startLoading();
+			this.canvasStore.setLoadingText(this.$locale.baseText('nodeView.loadingTemplate'));
 			this.resetWorkspace();
 
 			this.workflowsStore.currentWorkflowExecutions = [];
-			this.workflowsStore.activeWorkflowExecution = null;
+			this.executionsStore.activeExecution = null;
 
 			let data: IWorkflowTemplate | undefined;
 			try {
-				this.$externalHooks().run('template.requested', { templateId });
-				data = await this.templatesStore.getWorkflowTemplate(templateId);
+				void this.externalHooks.run('template.requested', { templateId });
+				data = await this.templatesStore.getFixedWorkflowTemplate(templateId);
 
 				if (!data) {
 					throw new Error(
@@ -912,34 +1397,44 @@ export default mixins(
 					);
 				}
 			} catch (error) {
-				this.$showError(error, this.$locale.baseText('nodeView.couldntImportWorkflow'));
-				this.$router.replace({ name: VIEWS.NEW_WORKFLOW });
+				this.showError(error, this.$locale.baseText('nodeView.couldntImportWorkflow'));
+				await this.$router.replace({ name: VIEWS.NEW_WORKFLOW });
 				return;
 			}
 
-			data.workflow.nodes = NodeViewUtils.getFixedNodesList(data.workflow.nodes) as INodeUi[];
+			this.$telemetry.track(
+				'User inserted workflow template',
+				{
+					source: 'workflow',
+					template_id: tryToParseNumber(templateId),
+					wf_template_repo_session_id: this.templatesStore.previousSessionId,
+				},
+				{
+					withPostHog: true,
+				},
+			);
 
 			this.blankRedirect = true;
-			this.$router.replace({ name: VIEWS.NEW_WORKFLOW, query: { templateId } });
+			await this.$router.replace({ name: VIEWS.NEW_WORKFLOW, query: { templateId } });
 
 			await this.addNodes(data.workflow.nodes, data.workflow.connections);
 			this.workflowData = (await this.workflowsStore.getNewWorkflowData(data.name)) || {};
-			this.$nextTick(() => {
-				this.canvasStore.zoomToFit();
-				this.uiStore.stateIsDirty = true;
-			});
+			this.workflowsStore.addToWorkflowMetadata({ templateId });
+			await this.$nextTick();
+			this.canvasStore.zoomToFit();
+			this.uiStore.stateIsDirty = true;
 
-			this.$externalHooks().run('template.open', {
+			void this.externalHooks.run('template.open', {
 				templateId,
 				templateName: data.name,
 				workflow: data.workflow,
 			});
-			this.stopLoading();
+			this.canvasStore.stopLoading();
 		},
 		async openWorkflow(workflow: IWorkflowDb) {
-			this.startLoading();
+			this.canvasStore.startLoading();
 
-			const selectedExecution = this.workflowsStore.activeWorkflowExecution;
+			const selectedExecution = this.executionsStore.activeExecution;
 
 			this.resetWorkspace();
 
@@ -950,6 +1445,7 @@ export default mixins(
 			this.workflowsStore.setWorkflowSettings(workflow.settings || {});
 			this.workflowsStore.setWorkflowPinData(workflow.pinData || {});
 			this.workflowsStore.setWorkflowVersionId(workflow.versionId);
+			this.workflowsStore.setWorkflowMetadata(workflow.meta);
 
 			if (workflow.ownedBy) {
 				this.workflowsEEStore.setWorkflowOwnedBy({
@@ -980,20 +1476,21 @@ export default mixins(
 				this.uiStore.stateIsDirty = false;
 			}
 			this.canvasStore.zoomToFit();
-			this.$externalHooks().run('workflow.open', {
+			void this.externalHooks.run('workflow.open', {
 				workflowId: workflow.id,
 				workflowName: workflow.name,
 			});
 			if (selectedExecution?.workflowId !== workflow.id) {
-				this.workflowsStore.activeWorkflowExecution = null;
+				this.executionsStore.activeExecution = null;
 				this.workflowsStore.currentWorkflowExecutions = [];
 			} else {
-				this.workflowsStore.activeWorkflowExecution = selectedExecution;
+				this.executionsStore.activeExecution = selectedExecution;
 			}
-			this.stopLoading();
+			this.canvasStore.stopLoading();
+			this.collaborationStore.notifyWorkflowOpened(workflow.id);
 		},
 		touchTap(e: MouseEvent | TouchEvent) {
-			if (this.isTouchDevice) {
+			if (this.deviceSupport.isTouchDevice) {
 				this.mouseDown(e);
 			}
 		},
@@ -1001,11 +1498,12 @@ export default mixins(
 			// Save the location of the mouse click
 			this.lastClickPosition = this.getMousePositionWithinNodeView(e);
 			if (e instanceof MouseEvent && e.button === 1) {
+				this.aiStore.closeNextStepPopup();
 				this.moveCanvasKeyPressed = true;
 			}
 
 			this.mouseDownMouseSelect(e as MouseEvent, this.moveCanvasKeyPressed);
-			this.mouseDownMoveWorkflow(e as MouseEvent, this.moveCanvasKeyPressed);
+			this.canvasPanning.onMouseDown(e as MouseEvent, this.moveCanvasKeyPressed);
 
 			// Hide the node-creator
 			this.createNodeActive = false;
@@ -1015,10 +1513,10 @@ export default mixins(
 				this.moveCanvasKeyPressed = false;
 			}
 			this.mouseUpMouseSelect(e);
-			this.mouseUpMoveWorkflow(e);
+			this.canvasPanning.onMouseUp(e);
 		},
 		keyUp(e: KeyboardEvent) {
-			if (e.key === this.controlKeyCode) {
+			if (e.key === this.deviceSupport.controlKeyCode) {
 				this.ctrlKeyPressed = false;
 			}
 			if (e.key === ' ') {
@@ -1026,15 +1524,24 @@ export default mixins(
 			}
 		},
 		async keyDown(e: KeyboardEvent) {
-			if (e.key === 's' && this.isCtrlKeyPressed(e)) {
+			this.contextMenu.close();
+			this.aiStore.closeNextStepPopup();
+
+			const ctrlModifier = this.deviceSupport.isCtrlKeyPressed(e) && !e.shiftKey && !e.altKey;
+			const shiftModifier = e.shiftKey && !e.altKey && !this.deviceSupport.isCtrlKeyPressed(e);
+			const ctrlAltModifier = this.deviceSupport.isCtrlKeyPressed(e) && e.altKey && !e.shiftKey;
+			const noModifierKeys = !this.deviceSupport.isCtrlKeyPressed(e) && !e.shiftKey && !e.altKey;
+			const readOnly = this.isReadOnlyRoute || this.readOnlyEnv;
+
+			if (e.key === 's' && ctrlModifier && !readOnly) {
 				e.stopPropagation();
 				e.preventDefault();
 
-				if (this.isReadOnly) {
+				if (this.isReadOnlyRoute || this.readOnlyEnv) {
 					return;
 				}
 
-				this.callDebounced('onSaveKeyboardShortcut', { debounceTime: 1000 }, e);
+				void this.callDebounced(this.onSaveKeyboardShortcut, { debounceTime: 1000 }, e);
 
 				return;
 			}
@@ -1059,10 +1566,10 @@ export default mixins(
 				return;
 			}
 
-			if (e.key === 'Escape') {
+			if (e.key === 'Escape' && noModifierKeys) {
 				this.createNodeActive = false;
 				if (this.activeNode) {
-					this.$externalHooks().run('dataDisplay.nodeEditingFinished');
+					void this.externalHooks.run('dataDisplay.nodeEditingFinished');
 					this.ndvStore.activeNodeName = null;
 				}
 
@@ -1074,42 +1581,64 @@ export default mixins(
 				return;
 			}
 
-			if (e.key === 'd') {
-				this.callDebounced('deactivateSelectedNode', { debounceTime: 350 });
-			} else if (e.key === 'Delete' || e.key === 'Backspace') {
+			const selectedNodes = this.uiStore.getSelectedNodes
+				.map((node) => node && this.workflowsStore.getNodeByName(node.name))
+				.filter((node) => !!node) as INode[];
+
+			if (e.key === 'd' && noModifierKeys && !readOnly) {
+				void this.callDebounced(this.toggleActivationNodes, { debounceTime: 350 }, selectedNodes);
+			} else if (e.key === 'd' && ctrlModifier && !readOnly) {
+				if (selectedNodes.length > 0) {
+					e.preventDefault();
+					void this.duplicateNodes(selectedNodes);
+				}
+			} else if (e.key === 'p' && noModifierKeys && !readOnly) {
+				if (selectedNodes.length > 0) {
+					e.preventDefault();
+					this.togglePinNodes(selectedNodes, 'keyboard-shortcut');
+				}
+			} else if ((e.key === 'Delete' || e.key === 'Backspace') && noModifierKeys && !readOnly) {
 				e.stopPropagation();
 				e.preventDefault();
 
-				this.callDebounced('deleteSelectedNodes', { debounceTime: 500 });
-			} else if (e.key === 'Tab') {
+				void this.callDebounced(this.deleteNodes, { debounceTime: 500 }, selectedNodes);
+			} else if (e.key === 'Tab' && noModifierKeys && !readOnly) {
 				this.onToggleNodeCreator({
 					source: NODE_CREATOR_OPEN_SOURCES.TAB,
-					createNodeActive: !this.createNodeActive && !this.isReadOnly,
+					createNodeActive: !this.createNodeActive && !this.isReadOnlyRoute && !this.readOnlyEnv,
 				});
-			} else if (e.key === this.controlKeyCode) {
+			} else if (e.key === 'Enter' && ctrlModifier && !readOnly) {
+				void this.onRunWorkflow();
+			} else if (e.key === 'S' && shiftModifier && !readOnly) {
+				void this.onAddNodes({ nodes: [{ type: STICKY_NODE_TYPE }], connections: [] });
+			} else if (e.key === this.deviceSupport.controlKeyCode) {
 				this.ctrlKeyPressed = true;
 			} else if (e.key === ' ') {
 				this.moveCanvasKeyPressed = true;
-			} else if (e.key === 'F2' && !this.isReadOnly) {
+			} else if (e.key === 'F2' && noModifierKeys && !readOnly) {
 				const lastSelectedNode = this.lastSelectedNode;
 				if (lastSelectedNode !== null && lastSelectedNode.type !== STICKY_NODE_TYPE) {
-					this.callDebounced('renameNodePrompt', { debounceTime: 1500 }, lastSelectedNode.name);
+					void this.callDebounced(
+						this.renameNodePrompt,
+						{ debounceTime: 1500 },
+						lastSelectedNode.name,
+					);
 				}
-			} else if (e.key === 'a' && this.isCtrlKeyPressed(e) === true) {
+			} else if (e.key === 'a' && ctrlModifier) {
 				// Select all nodes
 				e.stopPropagation();
 				e.preventDefault();
 
-				this.callDebounced('selectAllNodes', { debounceTime: 1000 });
-			} else if (e.key === 'c' && this.isCtrlKeyPressed(e)) {
-				this.callDebounced('copySelectedNodes', { debounceTime: 1000 });
-			} else if (e.key === 'x' && this.isCtrlKeyPressed(e)) {
+				void this.callDebounced(this.selectAllNodes, { debounceTime: 1000 });
+			} else if (e.key === 'c' && ctrlModifier) {
+				void this.callDebounced(this.copyNodes, { debounceTime: 1000 }, selectedNodes);
+			} else if (e.key === 'x' && ctrlModifier && !readOnly) {
 				// Cut nodes
 				e.stopPropagation();
 				e.preventDefault();
 
-				this.callDebounced('cutSelectedNodes', { debounceTime: 1000 });
-			} else if (e.key === 'n' && this.isCtrlKeyPressed(e) && e.altKey) {
+				void this.callDebounced(this.cutNodes, { debounceTime: 1000 }, selectedNodes);
+			} else if (e.key === 'n' && ctrlAltModifier) {
 				// Create a new workflow
 				e.stopPropagation();
 				e.preventDefault();
@@ -1118,32 +1647,37 @@ export default mixins(
 				}
 
 				if (this.$router.currentRoute.name === VIEWS.NEW_WORKFLOW) {
-					this.$root.$emit('newWorkflow');
+					nodeViewEventBus.emit('newWorkflow');
 				} else {
-					this.$router.push({ name: VIEWS.NEW_WORKFLOW });
+					void this.$router.push({ name: VIEWS.NEW_WORKFLOW });
 				}
 
-				this.$showMessage({
+				this.showMessage({
 					title: this.$locale.baseText('nodeView.showMessage.keyDown.title'),
 					type: 'success',
 				});
-			} else if (e.key === 'Enter') {
+			} else if (e.key === 'Enter' && noModifierKeys) {
 				// Activate the last selected node
 				const lastSelectedNode = this.lastSelectedNode;
 
 				if (lastSelectedNode !== null) {
-					if (lastSelectedNode.type === STICKY_NODE_TYPE && this.isReadOnly) {
+					if (
+						lastSelectedNode.type === STICKY_NODE_TYPE &&
+						(this.isReadOnlyRoute || this.readOnlyEnv)
+					) {
 						return;
 					}
 					this.ndvStore.activeNodeName = lastSelectedNode.name;
 				}
-			} else if (e.key === 'ArrowRight' && e.shiftKey) {
+			} else if (e.key === 'ArrowRight' && shiftModifier) {
 				// Select all downstream nodes
 				e.stopPropagation();
 				e.preventDefault();
 
-				this.callDebounced('selectDownstreamNodes', { debounceTime: 1000 });
-			} else if (e.key === 'ArrowRight') {
+				void this.callDebounced(this.selectDownstreamNodes, {
+					debounceTime: 1000,
+				});
+			} else if (e.key === 'ArrowRight' && noModifierKeys) {
 				// Set child node active
 				const lastSelectedNode = this.lastSelectedNode;
 				if (lastSelectedNode === null) {
@@ -1158,27 +1692,29 @@ export default mixins(
 					return;
 				}
 
-				this.callDebounced(
-					'nodeSelectedByName',
+				void this.callDebounced(
+					this.nodeSelectedByName,
 					{ debounceTime: 100 },
 					connections.main[0][0].node,
 					false,
 					true,
 				);
-			} else if (e.key === 'ArrowLeft' && e.shiftKey) {
+			} else if (e.key === 'ArrowLeft' && shiftModifier) {
 				// Select all downstream nodes
 				e.stopPropagation();
 				e.preventDefault();
 
-				this.callDebounced('selectUpstreamNodes', { debounceTime: 1000 });
-			} else if (e.key === 'ArrowLeft') {
+				void this.callDebounced(this.selectUpstreamNodes, {
+					debounceTime: 1000,
+				});
+			} else if (e.key === 'ArrowLeft' && noModifierKeys) {
 				// Set parent node active
 				const lastSelectedNode = this.lastSelectedNode;
 				if (lastSelectedNode === null) {
 					return;
 				}
 
-				const workflow = this.getCurrentWorkflow();
+				const workflow = this.workflowHelpers.getCurrentWorkflow();
 
 				if (!workflow.connectionsByDestinationNode.hasOwnProperty(lastSelectedNode.name)) {
 					return;
@@ -1190,14 +1726,14 @@ export default mixins(
 					return;
 				}
 
-				this.callDebounced(
-					'nodeSelectedByName',
+				void this.callDebounced(
+					this.nodeSelectedByName,
 					{ debounceTime: 100 },
 					connections.main[0][0].node,
 					false,
 					true,
 				);
-			} else if (['ArrowUp', 'ArrowDown'].includes(e.key)) {
+			} else if (['ArrowUp', 'ArrowDown'].includes(e.key) && noModifierKeys) {
 				// Set sibling node as active
 
 				// Check first if it has a parent node
@@ -1206,7 +1742,7 @@ export default mixins(
 					return;
 				}
 
-				const workflow = this.getCurrentWorkflow();
+				const workflow = this.workflowHelpers.getCurrentWorkflow();
 
 				if (!workflow.connectionsByDestinationNode.hasOwnProperty(lastSelectedNode.name)) {
 					return;
@@ -1262,8 +1798,8 @@ export default mixins(
 				}
 
 				if (nextSelectNode !== null) {
-					this.callDebounced(
-						'nodeSelectedByName',
+					void this.callDebounced(
+						this.nodeSelectedByName,
 						{ debounceTime: 100 },
 						nextSelectNode,
 						false,
@@ -1273,23 +1809,47 @@ export default mixins(
 			}
 		},
 
-		deactivateSelectedNode() {
+		toggleActivationNodes(nodes: INode[]) {
 			if (!this.editAllowedCheck()) {
 				return;
 			}
-			this.disableNodes(this.uiStore.getSelectedNodes, true);
+
+			this.nodeHelpers.disableNodes(nodes, true);
 		},
 
-		deleteSelectedNodes() {
+		togglePinNodes(nodes: INode[], source: 'keyboard-shortcut' | 'context-menu') {
+			if (!this.editAllowedCheck()) {
+				return;
+			}
+
+			this.historyStore.startRecordingUndo();
+
+			const nextStatePinned = nodes.some(
+				(node) => !this.workflowsStore.pinDataByNodeName(node.name),
+			);
+
+			for (const node of nodes) {
+				const pinnedDataForNode = usePinnedData(node);
+				if (nextStatePinned) {
+					const dataToPin = this.dataSchema.getInputDataWithPinned(node);
+					if (dataToPin.length !== 0) {
+						pinnedDataForNode.setData(dataToPin, source);
+					}
+				} else {
+					pinnedDataForNode.unsetData(source);
+				}
+			}
+
+			this.historyStore.stopRecordingUndo();
+		},
+
+		deleteNodes(nodes: INode[]) {
 			// Copy "selectedNodes" as the nodes get deleted out of selection
 			// when they get deleted and if we would use original it would mess
 			// with the index and would so not delete all nodes
-			const nodesToDelete: string[] = this.uiStore.getSelectedNodes.map((node: INodeUi) => {
-				return node.name;
-			});
 			this.historyStore.startRecordingUndo();
-			nodesToDelete.forEach((nodeName: string) => {
-				this.removeNode(nodeName, true, false);
+			nodes.forEach((node) => {
+				this.removeNode(node.name, true, false);
 			});
 			setTimeout(() => {
 				this.historyStore.stopRecordingUndo();
@@ -1311,8 +1871,14 @@ export default mixins(
 			this.deselectAllNodes();
 
 			// Get all upstream nodes and select them
-			const workflow = this.getCurrentWorkflow();
-			for (const nodeName of workflow.getParentNodes(lastSelectedNode.name)) {
+			const workflow = this.workflowHelpers.getCurrentWorkflow();
+
+			const checkNodes = this.workflowHelpers.getConnectedNodes(
+				'upstream',
+				workflow,
+				lastSelectedNode.name,
+			);
+			for (const nodeName of checkNodes) {
 				this.nodeSelectedByName(nodeName);
 			}
 
@@ -1328,8 +1894,14 @@ export default mixins(
 			this.deselectAllNodes();
 
 			// Get all downstream nodes and select them
-			const workflow = this.getCurrentWorkflow();
-			for (const nodeName of workflow.getChildNodes(lastSelectedNode.name)) {
+			const workflow = this.workflowHelpers.getCurrentWorkflow();
+
+			const checkNodes = this.workflowHelpers.getConnectedNodes(
+				'downstream',
+				workflow,
+				lastSelectedNode.name,
+			);
+			for (const nodeName of checkNodes) {
 				this.nodeSelectedByName(nodeName);
 			}
 
@@ -1339,10 +1911,16 @@ export default mixins(
 
 		pushDownstreamNodes(sourceNodeName: string, margin: number, recordHistory = false) {
 			const sourceNode = this.workflowsStore.nodesByName[sourceNodeName];
-			const workflow = this.getCurrentWorkflow();
-			const childNodes = workflow.getChildNodes(sourceNodeName);
-			for (const nodeName of childNodes) {
-				const node = this.workflowsStore.nodesByName[nodeName] as INodeUi;
+
+			const workflow = this.workflowHelpers.getCurrentWorkflow();
+
+			const checkNodes = this.workflowHelpers.getConnectedNodes(
+				'downstream',
+				workflow,
+				sourceNodeName,
+			);
+			for (const nodeName of checkNodes) {
+				const node = this.workflowsStore.nodesByName[nodeName];
 				const oldPosition = node.position;
 
 				if (node.position[0] < sourceNode.position[0]) {
@@ -1360,45 +1938,46 @@ export default mixins(
 				this.onNodeMoved(node);
 
 				if (
-					(recordHistory && oldPosition[0] !== node.position[0]) ||
-					oldPosition[1] !== node.position[1]
+					(recordHistory && oldPosition[0] !== updateInformation.properties.position[0]) ||
+					oldPosition[1] !== updateInformation.properties.position[1]
 				) {
 					this.historyStore.pushCommandToUndo(
-						new MoveNodeCommand(nodeName, oldPosition, node.position, this),
+						new MoveNodeCommand(nodeName, oldPosition, updateInformation.properties.position),
 						recordHistory,
 					);
 				}
 			}
 		},
 
-		cutSelectedNodes() {
-			const deleteCopiedNodes = !this.isReadOnly;
-			this.copySelectedNodes(deleteCopiedNodes);
+		cutNodes(nodes: INode[]) {
+			const deleteCopiedNodes = !this.isReadOnlyRoute && !this.readOnlyEnv;
+			this.copyNodes(nodes, deleteCopiedNodes);
 			if (deleteCopiedNodes) {
-				this.deleteSelectedNodes();
+				this.deleteNodes(nodes);
 			}
 		},
 
-		copySelectedNodes(isCut: boolean) {
-			this.getSelectedNodesToSave().then((data) => {
+		copyNodes(nodes: INode[], isCut = false) {
+			void this.getNodesToSave(nodes).then((data) => {
 				const workflowToCopy: IWorkflowToShare = {
 					meta: {
+						...(this.workflowsStore.workflow.meta ?? {}),
 						instanceId: this.rootStore.instanceId,
 					},
 					...data,
 				};
 
-				this.removeForeignCredentialsFromWorkflow(
+				this.workflowHelpers.removeForeignCredentialsFromWorkflow(
 					workflowToCopy,
 					this.credentialsStore.allCredentials,
 				);
 
 				const nodeData = JSON.stringify(workflowToCopy, null, 2);
 
-				this.copyToClipboard(nodeData);
+				void this.clipboard.copy(nodeData);
 				if (data.nodes.length > 0) {
 					if (!isCut) {
-						this.$showMessage({
+						this.showMessage({
 							title: 'Copied!',
 							message: '',
 							type: 'success',
@@ -1419,11 +1998,7 @@ export default mixins(
 
 			try {
 				this.stopExecutionInProgress = true;
-				await this.workflowsStore.stopCurrentExecution(executionId);
-				this.$showMessage({
-					title: this.$locale.baseText('nodeView.showMessage.stopExecutionTry.title'),
-					type: 'success',
-				});
+				await this.executionsStore.stopCurrentExecution(executionId);
 			} catch (error) {
 				// Execution stop might fail when the execution has already finished. Let's treat this here.
 				const execution = await this.workflowsStore.getExecution(executionId);
@@ -1435,11 +2010,11 @@ export default mixins(
 						executionId,
 						data: { finished: true, stoppedAt: new Date() },
 					});
-					this.workflowsStore.executingNode = null;
+					this.workflowsStore.executingNode.length = 0;
 					this.uiStore.removeActiveAction('workflowRunning');
 
 					this.titleSet(this.workflowsStore.workflowName, 'IDLE');
-					this.$showMessage({
+					this.showMessage({
 						title: this.$locale.baseText('nodeView.showMessage.stopExecutionCatch.unsaved.title'),
 						message: this.$locale.baseText(
 							'nodeView.showMessage.stopExecutionCatch.unsaved.message',
@@ -1463,26 +2038,28 @@ export default mixins(
 					} as IPushDataExecutionFinished;
 					this.workflowsStore.finishActiveExecution(pushData);
 					this.titleSet(execution.workflowData.name, 'IDLE');
-					this.workflowsStore.executingNode = null;
+					this.workflowsStore.executingNode.length = 0;
 					this.workflowsStore.setWorkflowExecutionData(executedData as IExecutionResponse);
 					this.uiStore.removeActiveAction('workflowRunning');
-					this.$showMessage({
+					this.showMessage({
 						title: this.$locale.baseText('nodeView.showMessage.stopExecutionCatch.title'),
 						message: this.$locale.baseText('nodeView.showMessage.stopExecutionCatch.message'),
 						type: 'success',
 					});
 				} else {
-					this.$showError(error, this.$locale.baseText('nodeView.showError.stopExecution.title'));
+					this.showError(error, this.$locale.baseText('nodeView.showError.stopExecution.title'));
 				}
 			}
 			this.stopExecutionInProgress = false;
-
-			this.getWorkflowDataToSave().then((workflowData) => {
+			void this.workflowHelpers.getWorkflowDataToSave().then((workflowData) => {
 				const trackProps = {
 					workflow_id: this.workflowsStore.workflowId,
 					node_graph_string: JSON.stringify(
-						TelemetryHelpers.generateNodesGraph(workflowData as IWorkflowBase, this.getNodeTypes())
-							.nodeGraph,
+						TelemetryHelpers.generateNodesGraph(
+							workflowData as IWorkflowBase,
+							this.workflowHelpers.getNodeTypes(),
+							{ isCloudDeployment: this.settingsStore.isCloudDeployment },
+						).nodeGraph,
 					),
 				};
 
@@ -1494,7 +2071,7 @@ export default mixins(
 			try {
 				await this.workflowsStore.removeTestWebhook(this.workflowsStore.workflowId);
 			} catch (error) {
-				this.$showError(
+				this.showError(
 					error,
 					this.$locale.baseText('nodeView.showError.stopWaitingForWebhook.title'),
 				);
@@ -1504,11 +2081,15 @@ export default mixins(
 		/**
 		 * This method gets called when data got pasted into the window
 		 */
-		async receivedCopyPasteData(plainTextData: string): Promise<void> {
+		async onClipboardPasteEvent(plainTextData: string): Promise<void> {
+			if (this.readOnlyEnv) {
+				return;
+			}
+
 			const currentTab = getNodeViewTab(this.$route);
 			if (currentTab === MAIN_HEADER_TABS.WORKFLOW) {
 				let workflowData: IWorkflowDataUpdate | undefined;
-				if (this.editAllowedCheck() === false) {
+				if (!this.editAllowedCheck()) {
 					return;
 				}
 				// Check if it is an URL which could contain workflow data
@@ -1519,19 +2100,24 @@ export default mixins(
 						return;
 					}
 
-					const importConfirm = await this.confirmMessage(
-						this.$locale.baseText('nodeView.confirmMessage.receivedCopyPasteData.message', {
+					const importConfirm = await this.confirm(
+						this.$locale.baseText('nodeView.confirmMessage.onClipboardPasteEvent.message', {
 							interpolate: { plainTextData },
 						}),
-						this.$locale.baseText('nodeView.confirmMessage.receivedCopyPasteData.headline'),
-						'warning',
-						this.$locale.baseText(
-							'nodeView.confirmMessage.receivedCopyPasteData.confirmButtonText',
-						),
-						this.$locale.baseText('nodeView.confirmMessage.receivedCopyPasteData.cancelButtonText'),
+						this.$locale.baseText('nodeView.confirmMessage.onClipboardPasteEvent.headline'),
+						{
+							type: 'warning',
+							confirmButtonText: this.$locale.baseText(
+								'nodeView.confirmMessage.onClipboardPasteEvent.confirmButtonText',
+							),
+							cancelButtonText: this.$locale.baseText(
+								'nodeView.confirmMessage.onClipboardPasteEvent.cancelButtonText',
+							),
+							dangerouslyUseHTMLString: true,
+						},
 					);
 
-					if (!importConfirm) {
+					if (importConfirm !== MODAL_CONFIRM) {
 						return;
 					}
 
@@ -1554,7 +2140,7 @@ export default mixins(
 					}
 				}
 
-				return this.importWorkflowData(workflowData!, 'paste', false);
+				return await this.importWorkflowData(workflowData!, 'paste', false);
 			}
 		},
 
@@ -1563,18 +2149,18 @@ export default mixins(
 		async getWorkflowDataFromUrl(url: string): Promise<IWorkflowDataUpdate | undefined> {
 			let workflowData: IWorkflowDataUpdate;
 
-			this.startLoading();
+			this.canvasStore.startLoading();
 			try {
 				workflowData = await this.workflowsStore.getWorkflowFromUrl(url);
 			} catch (error) {
-				this.stopLoading();
-				this.$showError(
+				this.canvasStore.stopLoading();
+				this.showError(
 					error,
 					this.$locale.baseText('nodeView.showError.getWorkflowDataFromUrl.title'),
 				);
 				return;
 			}
-			this.stopLoading();
+			this.canvasStore.stopLoading();
 
 			return workflowData;
 		},
@@ -1585,7 +2171,6 @@ export default mixins(
 			source: string,
 			importTags = true,
 		): Promise<void> {
-			// eslint-disable-line @typescript-eslint/default-param-last
 			// If it is JSON check if it looks on the first look like data we can use
 			if (!workflowData.hasOwnProperty('nodes') || !workflowData.hasOwnProperty('connections')) {
 				return;
@@ -1594,8 +2179,18 @@ export default mixins(
 			try {
 				const nodeIdMap: { [prev: string]: string } = {};
 				if (workflowData.nodes) {
-					// set all new ids when pasting/importing workflows
 					workflowData.nodes.forEach((node: INode) => {
+						//generate new webhookId if workflow already contains a node with the same webhookId
+						if (node.webhookId && UPDATE_WEBHOOK_ID_NODE_TYPES.includes(node.type)) {
+							const isDuplicate = Object.values(
+								this.workflowHelpers.getCurrentWorkflow().nodes,
+							).some((n) => n.webhookId === node.webhookId);
+							if (isDuplicate) {
+								node.webhookId = uuid();
+							}
+						}
+
+						// set all new ids when pasting/importing workflows
 						if (node.id) {
 							const newId = uuid();
 							nodeIdMap[newId] = node.id;
@@ -1606,22 +2201,34 @@ export default mixins(
 					});
 				}
 
+				this.removeUnknownCredentials(workflowData);
+
 				const currInstanceId = this.rootStore.instanceId;
 
 				const nodeGraph = JSON.stringify(
-					TelemetryHelpers.generateNodesGraph(workflowData as IWorkflowBase, this.getNodeTypes(), {
-						nodeIdMap,
-						sourceInstanceId:
-							workflowData.meta && workflowData.meta.instanceId !== currInstanceId
-								? workflowData.meta.instanceId
-								: '',
-					}).nodeGraph,
+					TelemetryHelpers.generateNodesGraph(
+						workflowData as IWorkflowBase,
+						this.workflowHelpers.getNodeTypes(),
+						{
+							nodeIdMap,
+							sourceInstanceId:
+								workflowData.meta && workflowData.meta.instanceId !== currInstanceId
+									? workflowData.meta.instanceId
+									: '',
+							isCloudDeployment: this.settingsStore.isCloudDeployment,
+						},
+					).nodeGraph,
 				);
 				if (source === 'paste') {
 					this.$telemetry.track('User pasted nodes', {
 						workflow_id: this.workflowsStore.workflowId,
 						node_graph_string: nodeGraph,
 					});
+				} else if (source === 'duplicate') {
+					this.$telemetry.track('User duplicated nodes', {
+						workflow_id: this.workflowsStore.workflowId,
+						node_graph_string: nodeGraph,
+					});
 				} else {
 					this.$telemetry.track('User imported workflow', {
 						source,
@@ -1637,7 +2244,7 @@ export default mixins(
 				// Fix the node position as it could be totally offscreen
 				// and the pasted nodes would so not be directly visible to
 				// the user
-				this.updateNodePositions(
+				this.workflowHelpers.updateNodePositions(
 					workflowData,
 					NodeViewUtils.getNewNodePosition(this.nodes, this.lastClickPosition),
 				);
@@ -1650,10 +2257,6 @@ export default mixins(
 					});
 				});
 
-				if (workflowData.pinData) {
-					this.workflowsStore.setWorkflowPinData(workflowData.pinData);
-				}
-
 				const tagsEnabled = this.settingsStore.areTagsEnabled;
 				if (importTags && tagsEnabled && Array.isArray(workflowData.tags)) {
 					const allTags = await this.tagsStore.fetchAll();
@@ -1684,44 +2287,51 @@ export default mixins(
 					}, []);
 
 					this.workflowsStore.addWorkflowTagIds(tagIds);
+					setTimeout(() => {
+						this.addPinDataConnections(this.workflowsStore.pinnedWorkflowData || ({} as IPinData));
+					});
 				}
 			} catch (error) {
-				this.$showError(
-					error,
-					this.$locale.baseText('nodeView.showError.importWorkflowData.title'),
-				);
+				this.showError(error, this.$locale.baseText('nodeView.showError.importWorkflowData.title'));
+			}
+		},
+
+		removeUnknownCredentials(workflow: IWorkflowToShare) {
+			if (!workflow?.nodes) return;
+
+			for (const node of workflow.nodes) {
+				if (!node.credentials) continue;
+
+				for (const [name, credential] of Object.entries(node.credentials)) {
+					if (credential.id === null) continue;
+
+					if (!this.credentialsStore.getCredentialById(credential.id)) {
+						delete node.credentials[name];
+					}
+				}
 			}
 		},
+
 		onDragOver(event: DragEvent) {
 			event.preventDefault();
 		},
 
-		onDrop(event: DragEvent) {
+		async onDrop(event: DragEvent) {
 			if (!event.dataTransfer) {
 				return;
 			}
 
-			const nodeTypeNames = event.dataTransfer.getData('nodeTypeName').split(',');
-
-			if (nodeTypeNames) {
+			const dropData = jsonParse<AddedNodesAndConnections>(
+				event.dataTransfer.getData(DRAG_EVENT_DATA_KEY),
+			);
+			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 nodesToAdd = nodeTypeNames.map((nodeTypeName: string, index: number) => {
-					return {
-						nodeTypeName,
-						position: [
-							// If adding more than one node, offset the X position
-							mousePosition[0] -
-								NodeViewUtils.NODE_SIZE / 2 +
-								NodeViewUtils.NODE_SIZE * index * 2 +
-								NodeViewUtils.GRID_SIZE,
-							mousePosition[1] - NodeViewUtils.NODE_SIZE / 2,
-						] as XYPosition,
-						dragAndDrop: true,
-					};
-				});
-
-				this.onAddNode(nodesToAdd, true);
+				await this.onAddNodes(dropData, true, insertNodePosition);
 				this.createNodeActive = false;
 			}
 		},
@@ -1743,6 +2353,7 @@ export default mixins(
 				this.nodeSelected(node);
 				this.uiStore.lastSelectedNode = node.name;
 				this.uiStore.lastSelectedNodeOutputIndex = null;
+				this.uiStore.lastSelectedNodeEndpointUuid = null;
 				this.canvasStore.lastSelectedConnection = null;
 				this.canvasStore.newNodeInsertPosition = null;
 
@@ -1753,7 +2364,7 @@ export default mixins(
 		},
 		showMaxNodeTypeError(nodeTypeData: INodeTypeDescription) {
 			const maxNodes = nodeTypeData.maxNodes;
-			this.$showMessage({
+			this.showMessage({
 				title: this.$locale.baseText('nodeView.showMessage.showMaxNodeTypeError.title'),
 				message: this.$locale.baseText('nodeView.showMessage.showMaxNodeTypeError.message', {
 					adjustToNumber: maxNodes,
@@ -1764,23 +2375,30 @@ export default mixins(
 			});
 		},
 
-		async getNewNodeWithDefaultCredential(nodeTypeData: INodeTypeDescription) {
+		async getNewNodeWithDefaultCredential(
+			nodeTypeData: INodeTypeDescription,
+			overrides: Partial<INodeUi>,
+		) {
+			let nodeVersion = nodeTypeData.defaultVersion;
+
+			if (nodeVersion === undefined) {
+				nodeVersion = Array.isArray(nodeTypeData.version)
+					? nodeTypeData.version.slice(-1)[0]
+					: nodeTypeData.version;
+			}
+
 			const newNodeData: INodeUi = {
 				id: uuid(),
-				name: nodeTypeData.defaults.name as string,
+				name: overrides.name ?? (nodeTypeData.defaults.name as string),
 				type: nodeTypeData.name,
-				typeVersion: Array.isArray(nodeTypeData.version)
-					? nodeTypeData.version.slice(-1)[0]
-					: nodeTypeData.version,
+				typeVersion: nodeVersion,
 				position: [0, 0],
 				parameters: {},
 			};
 
-			const credentialPerType =
-				nodeTypeData.credentials &&
-				nodeTypeData.credentials
-					.map((type) => this.credentialsStore.getUsableCredentialByType(type.name))
-					.flat();
+			const credentialPerType = nodeTypeData.credentials
+				?.map((type) => this.credentialsStore.getUsableCredentialByType(type.name))
+				.flat();
 
 			if (credentialPerType && credentialPerType.length === 1) {
 				const defaultCredential = credentialPerType[0];
@@ -1817,10 +2435,7 @@ export default mixins(
 						return newNodeData;
 					}
 
-					if (
-						Object.keys(authDisplayOptions).length === 1 &&
-						authDisplayOptions['authentication']
-					) {
+					if (Object.keys(authDisplayOptions).length === 1 && authDisplayOptions.authentication) {
 						// ignore complex case when there's multiple dependencies
 						newNodeData.credentials = credentials;
 
@@ -1857,7 +2472,7 @@ export default mixins(
 				this.nodeTypesStore.getNodeType(nodeTypeName);
 
 			if (nodeTypeData === null) {
-				this.$showMessage({
+				this.showMessage({
 					title: this.$locale.baseText('nodeView.showMessage.addNodeButton.title'),
 					message: this.$locale.baseText('nodeView.showMessage.addNodeButton.message', {
 						interpolate: { nodeTypeName },
@@ -1869,13 +2484,15 @@ export default mixins(
 
 			if (
 				nodeTypeData.maxNodes !== undefined &&
-				this.getNodeTypeCount(nodeTypeName) >= nodeTypeData.maxNodes
+				this.workflowHelpers.getNodeTypeCount(nodeTypeName) >= nodeTypeData.maxNodes
 			) {
 				this.showMaxNodeTypeError(nodeTypeData);
 				return;
 			}
 
-			const newNodeData = await this.getNewNodeWithDefaultCredential(nodeTypeData);
+			const newNodeData = await this.getNewNodeWithDefaultCredential(nodeTypeData, {
+				name: options.name,
+			});
 
 			// when pulling new connection from node or injecting into a connection
 			const lastSelectedNode = this.lastSelectedNode;
@@ -1908,35 +2525,107 @@ export default mixins(
 					this.canvasStore.newNodeInsertPosition = null;
 				} else {
 					let yOffset = 0;
+					const workflow = this.workflowHelpers.getCurrentWorkflow();
 
 					if (lastSelectedConnection) {
 						const sourceNodeType = this.nodeTypesStore.getNodeType(
 							lastSelectedNode.type,
 							lastSelectedNode.typeVersion,
 						);
-						const offsets = [
-							[-100, 100],
-							[-140, 0, 140],
-							[-240, -100, 100, 240],
-						];
-						if (sourceNodeType && sourceNodeType.outputs.length > 1) {
-							const offset = offsets[sourceNodeType.outputs.length - 2];
-							const sourceOutputIndex = lastSelectedConnection.__meta
-								? lastSelectedConnection.__meta.sourceOutputIndex
-								: 0;
-							yOffset = offset[sourceOutputIndex];
+
+						if (sourceNodeType) {
+							const offsets = [
+								[-100, 100],
+								[-140, 0, 140],
+								[-240, -100, 100, 240],
+							];
+
+							const sourceNodeOutputs = NodeHelpers.getNodeOutputs(
+								workflow,
+								lastSelectedNode,
+								sourceNodeType,
+							);
+							const sourceNodeOutputTypes = NodeHelpers.getConnectionTypes(sourceNodeOutputs);
+
+							const sourceNodeOutputMainOutputs = sourceNodeOutputTypes.filter(
+								(output) => output === NodeConnectionType.Main,
+							);
+
+							if (sourceNodeOutputMainOutputs.length > 1) {
+								const offset = offsets[sourceNodeOutputMainOutputs.length - 2];
+								const sourceOutputIndex = lastSelectedConnection.__meta
+									? lastSelectedConnection.__meta.sourceOutputIndex
+									: 0;
+								yOffset = offset[sourceOutputIndex];
+							}
 						}
 					}
 
-					// If a node is active then add the new node directly after the current one
-					newNodeData.position = NodeViewUtils.getNewNodePosition(
-						this.nodes,
-						[
-							lastSelectedNode.position[0] + NodeViewUtils.PUSH_NODES_OFFSET,
-							lastSelectedNode.position[1] + yOffset,
-						],
-						[100, 0],
+					let outputs: Array<ConnectionTypes | INodeOutputConfiguration> = [];
+					try {
+						// It fails when the outputs are an expression. As those nodes have
+						// normally no outputs by default and the only reason we need the
+						// outputs here is to calculate the position, it is fine to assume
+						// that they have no outputs and are so treated as a regular node
+						// with only "main" outputs.
+						outputs = NodeHelpers.getNodeOutputs(workflow, newNodeData, nodeTypeData);
+					} catch (e) {}
+					const outputTypes = NodeHelpers.getConnectionTypes(outputs);
+					const lastSelectedNodeType = this.nodeTypesStore.getNodeType(
+						lastSelectedNode.type,
+						lastSelectedNode.typeVersion,
 					);
+
+					// If node has only scoped outputs, position it below the last selected node
+					if (
+						outputTypes.length > 0 &&
+						outputTypes.every((outputName) => outputName !== NodeConnectionType.Main)
+					) {
+						const lastSelectedNodeWorkflow = workflow.getNode(lastSelectedNode.name);
+						const lastSelectedInputs = NodeHelpers.getNodeInputs(
+							workflow,
+							lastSelectedNodeWorkflow,
+							lastSelectedNodeType,
+						);
+						const lastSelectedInputTypes = NodeHelpers.getConnectionTypes(lastSelectedInputs);
+
+						const scopedConnectionIndex = (lastSelectedInputTypes || [])
+							.filter((input) => input !== NodeConnectionType.Main)
+							.findIndex((inputType) => outputs[0] === inputType);
+
+						newNodeData.position = NodeViewUtils.getNewNodePosition(
+							this.nodes,
+							[
+								lastSelectedNode.position[0] +
+									(NodeViewUtils.NODE_SIZE /
+										(Math.max(lastSelectedNodeType?.inputs?.length ?? 1), 1)) *
+										scopedConnectionIndex,
+								lastSelectedNode.position[1] + NodeViewUtils.PUSH_NODES_OFFSET,
+							],
+							[100, 0],
+						);
+					} else {
+						// Has only main outputs or no outputs at all
+						const inputs = NodeHelpers.getNodeInputs(
+							workflow,
+							lastSelectedNode,
+							lastSelectedNodeType,
+						);
+						const inputsTypes = NodeHelpers.getConnectionTypes(inputs);
+
+						let pushOffset = NodeViewUtils.PUSH_NODES_OFFSET;
+						if (!!inputsTypes.find((input) => input !== NodeConnectionType.Main)) {
+							// If the node has scoped inputs, push it down a bit more
+							pushOffset += 150;
+						}
+
+						// If a node is active then add the new node directly after the current one
+						newNodeData.position = NodeViewUtils.getNewNodePosition(
+							this.nodes,
+							[lastSelectedNode.position[0] + pushOffset, lastSelectedNode.position[1] + yOffset],
+							[100, 0],
+						);
+					}
 				}
 			} else {
 				// If added node is a trigger and it's the first one added to the canvas
@@ -1945,18 +2634,16 @@ export default mixins(
 					this.nodeTypesStore.isTriggerNode(nodeTypeName) && !this.containsTrigger
 						? this.canvasStore.canvasAddButtonPosition
 						: // If no node is active find a free spot
-						  (this.lastClickPosition as XYPosition);
+							(this.lastClickPosition as XYPosition);
 
 				newNodeData.position = NodeViewUtils.getNewNodePosition(this.nodes, position);
 			}
 
-			// Check if node-name is unique else find one that is
-			newNodeData.name = this.getUniqueNodeName({
-				originalName: newNodeData.name,
-				type: newNodeData.type,
-			});
+			const localizedName = this.locale.localizeNodeName(newNodeData.name, newNodeData.type);
+
+			newNodeData.name = this.uniqueNodeName(localizedName);
 
-			if (nodeTypeData.webhooks && nodeTypeData.webhooks.length) {
+			if (nodeTypeData.webhooks?.length) {
 				newNodeData.webhookId = uuid();
 			}
 
@@ -1970,10 +2657,11 @@ export default mixins(
 					workflow_id: this.workflowsStore.workflowId,
 				});
 			} else {
-				this.$externalHooks().run('nodeView.addNodeButton', { nodeTypeName });
+				void this.externalHooks.run('nodeView.addNodeButton', { nodeTypeName });
 				useSegment().trackAddedTrigger(nodeTypeName);
 				const trackProperties: ITelemetryTrackProperties = {
 					node_type: nodeTypeName,
+					node_version: newNodeData.typeVersion,
 					is_auto_add: isAutoAdd,
 					workflow_id: this.workflowsStore.workflowId,
 					drag_and_drop: options.dragAndDrop,
@@ -2005,10 +2693,10 @@ export default mixins(
 			sourceNodeOutputIndex: number,
 			targetNodeName: string,
 			targetNodeOuputIndex: number,
+			type: ConnectionTypes,
 		): IConnection | undefined {
-			const nodeConnections = (
-				this.workflowsStore.outgoingConnectionsByNodeName(sourceNodeName) as INodeConnections
-			).main;
+			const nodeConnections =
+				this.workflowsStore.outgoingConnectionsByNodeName(sourceNodeName)[type];
 			if (nodeConnections) {
 				const connections: IConnection[] | null = nodeConnections[sourceNodeOutputIndex];
 
@@ -2026,16 +2714,29 @@ export default mixins(
 			sourceNodeName: string,
 			sourceNodeOutputIndex: number,
 			targetNodeName: string,
-			targetNodeOuputIndex: number,
+			targetNodeOutputIndex: number,
+			type: ConnectionTypes,
 		) {
 			this.uiStore.stateIsDirty = true;
 
+			const sourceNode = this.workflowsStore.getNodeByName(sourceNodeName);
+			const targetNode = this.workflowsStore.getNodeByName(targetNodeName);
+
+			if (
+				sourceNode &&
+				targetNode &&
+				!this.checkNodeConnectionAllowed(sourceNode, targetNode, type)
+			) {
+				return;
+			}
+
 			if (
 				this.getConnection(
 					sourceNodeName,
 					sourceNodeOutputIndex,
 					targetNodeName,
-					targetNodeOuputIndex,
+					targetNodeOutputIndex,
+					type,
 				)
 			) {
 				return;
@@ -2044,13 +2745,13 @@ export default mixins(
 			const connectionData = [
 				{
 					node: sourceNodeName,
-					type: 'main',
+					type,
 					index: sourceNodeOutputIndex,
 				},
 				{
 					node: targetNodeName,
-					type: 'main',
-					index: targetNodeOuputIndex,
+					type,
+					index: targetNodeOutputIndex,
 				},
 			] as [IConnection, IConnection];
 
@@ -2067,9 +2768,10 @@ export default mixins(
 				return;
 			}
 
-			const lastSelectedConnection = this.canvasStore.lastSelectedConnection;
 			const lastSelectedNode = this.lastSelectedNode;
 			const lastSelectedNodeOutputIndex = this.uiStore.lastSelectedNodeOutputIndex;
+			const lastSelectedNodeEndpointUuid = this.uiStore.lastSelectedNodeEndpointUuid;
+			const lastSelectedConnection = this.canvasStore.lastSelectedConnection;
 
 			this.historyStore.startRecordingUndo();
 
@@ -2085,30 +2787,97 @@ export default mixins(
 			}
 
 			const outputIndex = lastSelectedNodeOutputIndex || 0;
+			const targetEndpoint = lastSelectedNodeEndpointUuid || '';
+
+			// Handle connection of scoped_endpoint types
+			if (lastSelectedNodeEndpointUuid && !isAutoAdd) {
+				const lastSelectedEndpoint = this.instance.getEndpoint(lastSelectedNodeEndpointUuid);
+				if (
+					lastSelectedEndpoint &&
+					this.checkNodeConnectionAllowed(
+						lastSelectedNode,
+						newNodeData,
+						lastSelectedEndpoint.scope as NodeConnectionType,
+					)
+				) {
+					const connectionType = lastSelectedEndpoint.scope as ConnectionTypes;
+					const newNodeElement = this.instance.getManagedElement(newNodeData.id);
+					const newNodeConnections = this.instance.getEndpoints(newNodeElement);
+					const viableConnection = newNodeConnections.find((conn) => {
+						return (
+							conn.scope === connectionType &&
+							lastSelectedEndpoint.parameters.connection !== conn.parameters.connection
+						);
+					});
 
+					this.instance?.connect({
+						uuids: [targetEndpoint, viableConnection?.uuid || ''],
+						detachable: !this.isReadOnlyRoute && !this.readOnlyEnv,
+					});
+					this.historyStore.stopRecordingUndo();
+					return;
+				}
+			}
 			// If a node is last selected then connect between the active and its child ones
-			if (lastSelectedNode) {
-				await Vue.nextTick();
+			if (lastSelectedNode && !isAutoAdd) {
+				await this.$nextTick();
+
+				if (lastSelectedConnection?.__meta) {
+					this.__deleteJSPlumbConnection(lastSelectedConnection, trackHistory);
+
+					const targetNodeName = lastSelectedConnection.__meta.targetNodeName;
+					const targetOutputIndex = lastSelectedConnection.__meta.targetOutputIndex;
+					this.connectTwoNodes(
+						newNodeData.name,
+						0,
+						targetNodeName,
+						targetOutputIndex,
+						NodeConnectionType.Main,
+					);
+				}
+
+				// Connect active node to the newly created one
+				this.connectTwoNodes(
+					lastSelectedNode.name,
+					outputIndex,
+					newNodeData.name,
+					0,
+					NodeConnectionType.Main,
+				);
+			}
+			this.historyStore.stopRecordingUndo();
+		},
+		getNodeCreatorFilter(nodeName: string, outputType?: NodeConnectionType) {
+			let filter;
+			const workflow = this.workflowHelpers.getCurrentWorkflow();
+			const workflowNode = workflow.getNode(nodeName);
+			if (!workflowNode) return { nodes: [] };
+
+			const nodeType = this.nodeTypesStore.getNodeType(
+				workflowNode?.type,
+				workflowNode.typeVersion,
+			);
+			if (nodeType) {
+				const inputs = NodeHelpers.getNodeInputs(workflow, workflowNode, nodeType);
+
+				const filterFound = inputs.filter((input) => {
+					if (typeof input === 'string' || input.type !== outputType || !input.filter) {
+						// No filters defined or wrong connection type
+						return false;
+					}
 
-				if (lastSelectedConnection && lastSelectedConnection.__meta) {
-					this.__deleteJSPlumbConnection(lastSelectedConnection, trackHistory);
+					return true;
+				}) as INodeInputConfiguration[];
 
-					const targetNodeName = lastSelectedConnection.__meta.targetNodeName;
-					const targetOutputIndex = lastSelectedConnection.__meta.targetOutputIndex;
-					this.connectTwoNodes(newNodeData.name, 0, targetNodeName, targetOutputIndex);
+				if (filterFound.length) {
+					filter = filterFound[0].filter;
 				}
-
-				// Connect active node to the newly created one
-				this.connectTwoNodes(lastSelectedNode.name, outputIndex, newNodeData.name, 0);
 			}
-			this.historyStore.stopRecordingUndo();
+
+			return filter;
 		},
-		insertNodeAfterSelected(info: {
-			sourceId: string;
-			index: number;
-			eventSource: NodeCreatorOpenSource;
-			connection?: Connection;
-		}) {
+		insertNodeAfterSelected(info: NewConnectionInfo) {
+			const type = info.outputType ?? NodeConnectionType.Main;
 			// Get the node and set it as active that new nodes
 			// which get created get automatically connected
 			// to it.
@@ -2118,6 +2887,8 @@ export default mixins(
 			}
 
 			this.uiStore.lastSelectedNode = sourceNode.name;
+			this.uiStore.lastSelectedNodeEndpointUuid =
+				info.endpointUuid ?? info.connection?.target.jtk?.endpoint.uuid;
 			this.uiStore.lastSelectedNodeOutputIndex = info.index;
 			this.canvasStore.newNodeInsertPosition = null;
 
@@ -2128,48 +2899,197 @@ export default mixins(
 			this.onToggleNodeCreator({
 				source: info.eventSource,
 				createNodeActive: true,
+				nodeCreatorView: info.nodeCreatorView,
 			});
+
+			// TODO: The animation is a bit glitchy because we're updating view stack immediately
+			// after the node creator is opened
+			const isOutput = info.connection?.endpoints[0].parameters.connection === 'source';
+			const isScopedConnection =
+				type !== NodeConnectionType.Main && Object.values(NodeConnectionType).includes(type);
+
+			if (isScopedConnection) {
+				useViewStacks()
+					.gotoCompatibleConnectionView(
+						type,
+						isOutput,
+						this.getNodeCreatorFilter(sourceNode.name, type),
+					)
+					.catch((e) => {});
+			}
 		},
-		onEventConnectionAbort(connection: Connection) {
+		async onEventConnectionAbort(connection: Connection) {
 			try {
 				if (this.dropPrevented) {
 					this.dropPrevented = false;
 					return;
 				}
-
 				if (this.pullConnActiveNodeName) {
 					const sourceNode = this.workflowsStore.getNodeById(connection.parameters.nodeId);
+					const connectionType = connection.parameters.type ?? NodeConnectionType.Main;
+					const overrideTargetEndpoint = connection?.connector
+						?.overrideTargetEndpoint as Endpoint | null;
+
 					if (sourceNode) {
-						const sourceNodeName = sourceNode.name;
+						const isTarget = connection.parameters.connection === 'target';
+						const sourceNodeName = isTarget ? this.pullConnActiveNodeName : sourceNode.name;
+						const targetNodeName = isTarget ? sourceNode.name : this.pullConnActiveNodeName;
 						const outputIndex = connection.parameters.index;
-
-						this.connectTwoNodes(sourceNodeName, outputIndex, this.pullConnActiveNodeName, 0);
+						NodeViewUtils.resetConnectionAfterPull(connection);
+						await this.$nextTick();
+
+						this.connectTwoNodes(
+							sourceNodeName,
+							outputIndex,
+							targetNodeName,
+							overrideTargetEndpoint?.parameters?.index ?? 0,
+							connectionType,
+						);
 						this.pullConnActiveNodeName = null;
-						this.dropPrevented = true;
+						this.dropPrevented = false;
 					}
 					return;
 				}
-
-				this.insertNodeAfterSelected({
-					sourceId: connection.parameters.nodeId,
-					index: connection.parameters.index,
-					eventSource: NODE_CREATOR_OPEN_SOURCES.NODE_CONNECTION_DROP,
+				// When connection is aborted, we want to show the 'Next step' popup
+				const endpointId = `${connection.parameters.nodeId}-output${connection.parameters.index}`;
+				const endpoint = connection.instance.getEndpoint(endpointId);
+				// First, show node creator if endpoint is not a plus endpoint
+				// or if the AI Assistant experiment doesn't need to be shown to user
+				if (!endpoint?.endpoint?.canvas || !this.shouldShowNextStepDialog) {
+					this.insertNodeAfterSelected({
+						sourceId: connection.parameters.nodeId,
+						index: connection.parameters.index,
+						eventSource: NODE_CREATOR_OPEN_SOURCES.NODE_CONNECTION_DROP,
+						connection,
+						outputType: connection.parameters.type,
+					});
+					return;
+				}
+				// Else render the popup
+				const endpointElement: HTMLElement = endpoint.endpoint.canvas;
+				// Use observer to trigger the popup once the endpoint is rendered back again
+				// after connection drag is aborted (so we can get it's position and dimensions)
+				const observer = new MutationObserver((mutations) => {
+					// Find the mutation in which the current endpoint becomes visible again
+					const endpointMutation = mutations.find((mutation) => {
+						const target = mutation.target;
+						return (
+							isJSPlumbEndpointElement(target) &&
+							target.jtk.endpoint.uuid === endpoint.uuid &&
+							target.style.display === 'block'
+						);
+					});
+					if (endpointMutation) {
+						// When found, display the popup
+						const newConnectionInfo: AIAssistantConnectionInfo = {
+							sourceId: connection.parameters.nodeId,
+							index: connection.parameters.index,
+							eventSource: NODE_CREATOR_OPEN_SOURCES.NODE_CONNECTION_DROP,
+							outputType: connection.parameters.type,
+							endpointUuid: endpoint.uuid,
+							stepName: endpoint.__meta.nodeName,
+						};
+						this.aiStore.latestConnectionInfo = newConnectionInfo;
+						this.aiStore.openNextStepPopup(
+							this.$locale.baseText('nextStepPopup.title.nextStep'),
+							endpointElement,
+						);
+						observer.disconnect();
+						return;
+					}
+				});
+				observer.observe(this.$refs.nodeViewRef as HTMLElement, {
+					attributes: true,
+					attributeFilter: ['style'],
+					subtree: true,
 				});
 			} catch (e) {
-				console.error(e); // eslint-disable-line no-console
+				console.error(e);
+			}
+		},
+		checkNodeConnectionAllowed(
+			sourceNode: INodeUi,
+			targetNode: INodeUi,
+			targetInfoType: NodeConnectionType,
+		): boolean {
+			const targetNodeType = this.nodeTypesStore.getNodeType(
+				targetNode.type,
+				targetNode.typeVersion,
+			);
+
+			if (targetNodeType?.inputs?.length) {
+				const workflow = this.workflowHelpers.getCurrentWorkflow();
+				const workflowNode = workflow.getNode(targetNode.name);
+				let inputs: Array<ConnectionTypes | INodeInputConfiguration> = [];
+				if (targetNodeType) {
+					inputs = NodeHelpers.getNodeInputs(workflow, workflowNode, targetNodeType);
+				}
+
+				for (const input of inputs || []) {
+					if (typeof input === 'string' || input.type !== targetInfoType || !input.filter) {
+						// No filters defined or wrong connection type
+						continue;
+					}
+
+					if (input.filter.nodes.length) {
+						if (!input.filter.nodes.includes(sourceNode.type)) {
+							this.dropPrevented = true;
+							this.showToast({
+								title: this.$locale.baseText('nodeView.showError.nodeNodeCompatible.title'),
+								message: this.$locale.baseText('nodeView.showError.nodeNodeCompatible.message', {
+									interpolate: { sourceNodeName: sourceNode.name, targetNodeName: targetNode.name },
+								}),
+								type: 'error',
+								duration: 5000,
+							});
+							return false;
+						}
+					}
+				}
 			}
+			return true;
 		},
 		onInterceptBeforeDrop(info: BeforeDropParams) {
 			try {
-				const sourceInfo = info.connection.endpoints[0].parameters;
-				const targetInfo = info.dropEndpoint.parameters;
+				let sourceInfo: ComponentParameters;
+				let targetInfo: ComponentParameters;
+				if (info.connection.endpoints[0].parameters.connection === 'target') {
+					sourceInfo = info.dropEndpoint.parameters;
+					targetInfo = info.connection.endpoints[0].parameters;
+				} else {
+					sourceInfo = info.connection.endpoints[0].parameters;
+					targetInfo = info.dropEndpoint.parameters;
+				}
+
+				if (
+					sourceInfo.type !== targetInfo.type ||
+					sourceInfo.connection === targetInfo.connection
+				) {
+					this.dropPrevented = true;
+					return false;
+				}
+
+				const sourceNode = this.workflowsStore.getNodeById(sourceInfo.nodeId);
+				const targetNode = this.workflowsStore.getNodeById(targetInfo.nodeId);
+
+				const sourceNodeName = sourceNode?.name || '';
+				const targetNodeName = targetNode?.name || '';
 
-				const sourceNodeName = this.workflowsStore.getNodeById(sourceInfo.nodeId)?.name || '';
-				const targetNodeName = this.workflowsStore.getNodeById(targetInfo.nodeId)?.name || '';
+				if (sourceNode && targetNode) {
+					if (!this.checkNodeConnectionAllowed(sourceNode, targetNode, targetInfo.type)) {
+						return false;
+					}
+				}
 
 				// check for duplicates
 				if (
-					this.getConnection(sourceNodeName, sourceInfo.index, targetNodeName, targetInfo.index)
+					this.getConnection(
+						sourceNodeName,
+						sourceInfo.index,
+						targetNodeName,
+						targetInfo.index,
+						sourceInfo.type,
+					)
 				) {
 					this.dropPrevented = true;
 					this.pullConnActiveNodeName = null;
@@ -2178,12 +3098,20 @@ export default mixins(
 
 				return true;
 			} catch (e) {
-				console.error(e); // eslint-disable-line no-console
+				console.error(e);
 				return true;
 			}
 		},
 		onEventConnection(info: ConnectionEstablishedParams) {
 			try {
+				if (info.sourceEndpoint.parameters.connection === 'target') {
+					// Allow that not "main" connections can also be dragged the other way around
+					// so switch them around if necessary
+					const tempEndpoint = info.sourceEndpoint;
+					info.sourceEndpoint = info.targetEndpoint;
+					info.targetEndpoint = tempEndpoint;
+				}
+
 				const sourceInfo = info.sourceEndpoint.parameters;
 				const targetInfo = info.targetEndpoint.parameters;
 
@@ -2217,11 +3145,9 @@ export default mixins(
 
 				this.dropPrevented = true;
 				this.workflowsStore.addConnection({ connection: connectionData });
-				this.uiStore.stateIsDirty = true;
-				if (!this.suspendRecordingDetachedConnections) {
-					this.historyStore.pushCommandToUndo(new AddConnectionCommand(connectionData));
-				}
-				if (!this.isReadOnly) {
+
+				if (!this.isReadOnlyRoute && !this.readOnlyEnv) {
+					NodeViewUtils.hideOutputNameLabel(info.sourceEndpoint);
 					NodeViewUtils.addConnectionActionsOverlay(
 						info.connection,
 						() => {
@@ -2237,21 +3163,63 @@ export default mixins(
 							});
 						},
 					);
-					setTimeout(() => {
-						NodeViewUtils.addConnectionTestData(
-							info.source,
-							info.target,
-							'canvas' in info.connection.connector
-								? (info.connection.connector.canvas as HTMLElement)
-								: undefined,
+
+					const endpointArrow = NodeViewUtils.getOverlay(
+						info.connection,
+						OVERLAY_ENDPOINT_ARROW_ID,
+					);
+					if (sourceInfo.type !== NodeConnectionType.Main) {
+						// Not "main" connections get a different connection style
+						info.connection.setPaintStyle(
+							getConnectorPaintStyleData(info.connection, info.sourceEndpoint.parameters.category),
 						);
-					}, 0);
+						endpointArrow?.setVisible(false);
+					}
+				}
+				this.dropPrevented = false;
+				if (!this.isLoading) {
+					this.uiStore.stateIsDirty = true;
+					if (!this.suspendRecordingDetachedConnections) {
+						this.historyStore.pushCommandToUndo(new AddConnectionCommand(connectionData));
+					}
+					// When we add multiple nodes, this event could be fired hundreds of times for large workflows.
+					// And because the updateNodesInputIssues() method is quite expensive, we only call it if not in insert mode
+					if (!this.isInsertingNodes) {
+						this.nodeHelpers.updateNodesInputIssues();
+						this.resetEndpointsErrors();
+						setTimeout(() => {
+							NodeViewUtils.addConnectionTestData(
+								info.source,
+								info.target,
+								info.connection?.connector?.hasOwnProperty('canvas')
+									? (info.connection.connector.canvas as HTMLElement)
+									: undefined,
+							);
+						}, 0);
+					}
 				}
 			} catch (e) {
-				console.error(e); // eslint-disable-line no-console
+				console.error(e);
 			}
 		},
+		addConectionsTestData() {
+			this.instance.connections.forEach((connection) => {
+				NodeViewUtils.addConnectionTestData(
+					connection.source,
+					connection.target,
+					connection?.connector?.hasOwnProperty('canvas')
+						? (connection?.connector.canvas as HTMLElement)
+						: undefined,
+				);
+			});
+		},
 		onDragMove() {
+			const totalNodes = this.nodes.length;
+			void this.callDebounced(this.updateConnectionsOverlays, {
+				debounceTime: totalNodes > 20 ? 200 : 0,
+			});
+		},
+		updateConnectionsOverlays() {
 			this.instance?.connections.forEach((connection) => {
 				NodeViewUtils.showOrHideItemsLabel(connection);
 				NodeViewUtils.showOrHideMidpointArrow(connection);
@@ -2262,6 +3230,11 @@ export default mixins(
 				});
 			});
 		},
+		isConnectionActive(connection: Connection | null) {
+			if (!connection?.id || !this.activeConnection?.id) return false;
+
+			return this.activeConnection?.id === connection.id;
+		},
 		onConnectionMouseOver(connection: Connection) {
 			try {
 				if (this.exitTimer !== undefined) {
@@ -2270,16 +3243,20 @@ export default mixins(
 				}
 
 				if (
-					this.isReadOnly ||
-					this.enterTimer ||
-					!connection ||
-					connection === this.activeConnection
+					// eslint-disable-next-line no-constant-binary-expression
+					this.isReadOnlyRoute ??
+					this.readOnlyEnv ??
+					this.enterTimer ??
+					!connection ??
+					this.isConnectionActive(connection)
 				)
 					return;
 
-				if (this.activeConnection) NodeViewUtils.hideConnectionActions(this.activeConnection);
-
 				this.enterTimer = setTimeout(() => {
+					// If there is already an active connection then hide it first
+					if (this.activeConnection && !this.isConnectionActive(connection)) {
+						NodeViewUtils.hideConnectionActions(this.activeConnection);
+					}
 					this.enterTimer = undefined;
 					if (connection) {
 						NodeViewUtils.showConnectionActions(connection);
@@ -2287,7 +3264,7 @@ export default mixins(
 					}
 				}, 150);
 			} catch (e) {
-				console.error(e); // eslint-disable-line no-console
+				console.error(e);
 			}
 		},
 		onConnectionMouseOut(connection: Connection) {
@@ -2299,18 +3276,25 @@ export default mixins(
 					this.enterTimer = undefined;
 				}
 
-				if (this.isReadOnly || !connection || this.activeConnection?.id !== connection.id) return;
+				if (
+					// eslint-disable-next-line no-constant-binary-expression
+					this.isReadOnlyRoute ??
+					this.readOnlyEnv ??
+					!connection ??
+					!this.isConnectionActive(connection)
+				)
+					return;
 
 				this.exitTimer = setTimeout(() => {
 					this.exitTimer = undefined;
 
-					if (connection && this.activeConnection === connection) {
+					if (connection && this.isConnectionActive(connection)) {
 						NodeViewUtils.hideConnectionActions(this.activeConnection);
 						this.activeConnection = null;
 					}
 				}, 500);
 			} catch (e) {
-				console.error(e); // eslint-disable-line no-console
+				console.error(e);
 			}
 		},
 		onConnectionMoved(info: ConnectionMovedParams) {
@@ -2339,7 +3323,7 @@ export default mixins(
 
 				this.__removeConnection(connectionInfo, false);
 			} catch (e) {
-				console.error(e); // eslint-disable-line no-console
+				console.error(e);
 			}
 		},
 		onEndpointMouseOver(endpoint: Endpoint, mouse) {
@@ -2355,8 +3339,17 @@ export default mixins(
 		},
 		async onConnectionDetached(info: ConnectionDetachedParams) {
 			try {
+				if (info.sourceEndpoint.parameters.connection === 'target') {
+					// Allow that not "main" connections can also be dragged the other way around
+					const tempEndpoint = info.sourceEndpoint;
+					info.sourceEndpoint = info.targetEndpoint;
+					info.targetEndpoint = tempEndpoint;
+				}
+
 				const connectionInfo: [IConnection, IConnection] | null = getConnectionInfo(info);
 				NodeViewUtils.resetInputLabelPosition(info.targetEndpoint);
+				NodeViewUtils.showOutputNameLabel(info.sourceEndpoint, info.connection);
+
 				info.connection.removeOverlays();
 				this.__removeConnectionByConnectionInfo(info, false, false);
 
@@ -2366,11 +3359,19 @@ export default mixins(
 					const sourceNode = this.workflowsStore.getNodeById(info.connection.parameters.nodeId);
 					const sourceNodeName = sourceNode.name;
 					const outputIndex = info.connection.parameters.index;
+					const overrideTargetEndpoint = info.connection.connector
+						.overrideTargetEndpoint as Endpoint | null;
 
 					if (connectionInfo) {
 						this.historyStore.pushCommandToUndo(new RemoveConnectionCommand(connectionInfo));
 					}
-					this.connectTwoNodes(sourceNodeName, outputIndex, this.pullConnActiveNodeName, 0);
+					this.connectTwoNodes(
+						sourceNodeName,
+						outputIndex,
+						this.pullConnActiveNodeName,
+						overrideTargetEndpoint?.parameters?.index ?? 0,
+						NodeConnectionType.Main,
+					);
 					this.pullConnActiveNodeName = null;
 					await this.$nextTick();
 					this.historyStore.stopRecordingUndo();
@@ -2384,8 +3385,10 @@ export default mixins(
 					const removeCommand = new RemoveConnectionCommand(connectionInfo, this);
 					this.historyStore.pushCommandToUndo(removeCommand);
 				}
+
+				void this.nodeHelpers.updateNodesInputIssues();
 			} catch (e) {
-				console.error(e); // eslint-disable-line no-console
+				console.error(e);
 			}
 		},
 		onConnectionDrag(connection: Connection) {
@@ -2396,49 +3399,86 @@ export default mixins(
 				this.pullConnActiveNodeName = null;
 				this.pullConnActive = true;
 				this.canvasStore.newNodeInsertPosition = null;
+				NodeViewUtils.hideConnectionActions(connection);
 				NodeViewUtils.resetConnection(connection);
 
-				const nodes = [...document.querySelectorAll('.node-wrapper')];
+				const scope = connection.scope as ConnectionTypes;
+				const scopedEndpoints = Array.from(
+					document.querySelectorAll(`[data-jtk-scope-${scope}=true]`),
+				);
+				const connectionType = connection.parameters.connection;
+				const requiredType = connectionType === 'source' ? 'target' : 'source';
+
+				const filteredEndpoints = scopedEndpoints.filter((el) => {
+					const endpoint = el.jtk.endpoint as Endpoint;
+					if (!endpoint) return false;
+
+					// Prevent snapping(but not connecting) to the same node
+					const isSameNode = endpoint.parameters.nodeId === connection.parameters.nodeId;
+					const endpointType = endpoint.parameters.connection;
+
+					return !isSameNode && endpointType === requiredType;
+				});
 
 				const onMouseMove = (e: MouseEvent | TouchEvent) => {
 					if (!connection) {
 						return;
 					}
 
-					const element = document.querySelector('.jtk-endpoint.jtk-drag-hover');
-					if (element) {
-						const endpoint = element.jtk.endpoint;
-						NodeViewUtils.showDropConnectionState(connection, endpoint);
-						return;
-					}
+					const intersectingEndpoints = filteredEndpoints
+						.filter((element: Element) => {
+							const endpoint = element.jtk.endpoint as Endpoint;
+
+							if (element.classList.contains('jtk-floating-endpoint')) {
+								return false;
+							}
+							const isEndpointIntersect = NodeViewUtils.isElementIntersection(element, e, 50);
+							const isNodeElementIntersect = NodeViewUtils.isElementIntersection(
+								endpoint.element,
+								e,
+								30,
+							);
+
+							if (isEndpointIntersect || isNodeElementIntersect) {
+								const node = this.workflowsStore.getNodeById(endpoint.parameters.nodeId);
+
+								if (node) {
+									const nodeType = this.nodeTypesStore.getNodeType(node.type, node.typeVersion);
+
+									if (!nodeType) return false;
 
-					const inputMargin = 24;
-					const intersecting = nodes.find((element: Element) => {
-						const { top, left, right, bottom } = element.getBoundingClientRect();
-						const [x, y] = NodeViewUtils.getMousePosition(e);
-						if (top <= y && bottom >= y && left - inputMargin <= x && right >= x) {
-							const nodeName = (element as HTMLElement).dataset['name'] as string;
-							const node = this.workflowsStore.getNodeByName(nodeName) as INodeUi | null;
-							if (node) {
-								const nodeType = this.nodeTypesStore.getNodeType(node.type, node.typeVersion);
-								if (nodeType && nodeType.inputs && nodeType.inputs.length === 1) {
-									this.pullConnActiveNodeName = node.name;
-									const endpointUUID = this.getInputEndpointUUID(nodeName, 0);
-									if (endpointUUID) {
-										const endpoint = this.instance?.getEndpoint(endpointUUID);
-
-										NodeViewUtils.showDropConnectionState(connection, endpoint);
-
-										return true;
-									}
+									return true;
 								}
 							}
-						}
 
-						return false;
-					});
+							return false;
+						})
+						.sort((a, b) => {
+							const aEndpointIntersect = NodeViewUtils.calculateElementIntersection(a, e, 50);
+							const bEndpointIntersect = NodeViewUtils.calculateElementIntersection(b, e, 50);
+
+							// If both intersections are null, treat them as equal
+							if (!aEndpointIntersect?.y && !bEndpointIntersect?.y) {
+								return 0;
+							}
+
+							// If one intersection is null, sort the non-null one first
+							if (!aEndpointIntersect?.y) return 1;
+							if (!bEndpointIntersect?.y) return -1;
+
+							// Otherwise, sort by ascending Y distance
+							return bEndpointIntersect.y - aEndpointIntersect.y;
+						});
 
-					if (!intersecting) {
+					if (intersectingEndpoints.length > 0) {
+						const intersectingEndpoint = intersectingEndpoints[0];
+						const endpoint = intersectingEndpoint.jtk.endpoint as Endpoint;
+						const node = this.workflowsStore.getNodeById(endpoint.parameters.nodeId);
+
+						this.pullConnActiveNodeName = node?.name ?? null;
+
+						NodeViewUtils.showDropConnectionState(connection, endpoint);
+					} else {
 						NodeViewUtils.showPullConnectionState(connection);
 						this.pullConnActiveNodeName = null;
 					}
@@ -2450,14 +3490,24 @@ export default mixins(
 					NodeViewUtils.resetConnectionAfterPull(connection);
 					window.removeEventListener('mousemove', onMouseMove);
 					window.removeEventListener('mouseup', onMouseUp);
+
+					this.connectionDragScope = {
+						type: null,
+						connection: null,
+					};
 				};
 
 				window.addEventListener('mousemove', onMouseMove);
 				window.addEventListener('touchmove', onMouseMove);
 				window.addEventListener('mouseup', onMouseUp);
 				window.addEventListener('touchend', onMouseMove);
+
+				this.connectionDragScope = {
+					type: connection.parameters.type,
+					connection: connection.parameters.connection,
+				};
 			} catch (e) {
-				console.error(e); // eslint-disable-line no-console
+				console.error(e);
 			}
 		},
 		onConnectionDragAbortDetached(connection: Connection) {
@@ -2467,15 +3517,47 @@ export default mixins(
 				.forEach((endpoint) => setTimeout(() => endpoint.instance.revalidate(endpoint.element), 0));
 		},
 		onPlusEndpointClick(endpoint: Endpoint) {
-			if (endpoint && endpoint.__meta) {
+			if (this.shouldShowNextStepDialog) {
+				if (endpoint?.__meta) {
+					this.aiStore.latestConnectionInfo = {
+						sourceId: endpoint.__meta.nodeId,
+						index: endpoint.__meta.index,
+						eventSource: NODE_CREATOR_OPEN_SOURCES.PLUS_ENDPOINT,
+						outputType: endpoint.scope as NodeConnectionType,
+						endpointUuid: endpoint.uuid,
+						stepName: endpoint.__meta.nodeName,
+					};
+					const endpointElement = endpoint.endpoint.canvas;
+					this.aiStore.openNextStepPopup(
+						this.$locale.baseText('nextStepPopup.title.nextStep'),
+						endpointElement,
+					);
+				}
+			} else {
 				this.insertNodeAfterSelected({
 					sourceId: endpoint.__meta.nodeId,
 					index: endpoint.__meta.index,
 					eventSource: NODE_CREATOR_OPEN_SOURCES.PLUS_ENDPOINT,
+					outputType: endpoint.scope as ConnectionTypes,
+					endpointUuid: endpoint.uuid,
+					stepName: endpoint.__meta.nodeName,
+				});
+			}
+		},
+		onAddInputEndpointClick(endpoint: Endpoint) {
+			if (endpoint?.__meta) {
+				this.insertNodeAfterSelected({
+					sourceId: endpoint.__meta.nodeId,
+					index: endpoint.__meta.index,
+					eventSource: NODE_CREATOR_OPEN_SOURCES.ADD_INPUT_ENDPOINT,
+					nodeCreatorView: AI_NODE_CREATOR_VIEW,
+					outputType: endpoint.scope as ConnectionTypes,
+					endpointUuid: endpoint.uuid,
 				});
 			}
 		},
 		bindCanvasEvents() {
+			if (this.eventsAttached) return;
 			this.instance.bind(EVENT_CONNECTION_ABORT, this.onEventConnectionAbort);
 
 			this.instance.bind(INTERCEPT_BEFORE_DROP, this.onInterceptBeforeDrop);
@@ -2496,6 +3578,9 @@ export default mixins(
 				this.onConnectionDragAbortDetached,
 			);
 			this.instance.bind(EVENT_PLUS_ENDPOINT_CLICK, this.onPlusEndpointClick);
+			this.instance.bind(EVENT_ADD_INPUT_ENDPOINT_CLICK, this.onAddInputEndpointClick);
+
+			this.eventsAttached = true;
 		},
 		unbindCanvasEvents() {
 			this.instance.unbind(EVENT_CONNECTION_ABORT, this.onEventConnectionAbort);
@@ -2518,50 +3603,66 @@ export default mixins(
 			this.instance.unbind(EVENT_CONNECTION_ABORT, this.onConnectionDragAbortDetached);
 			this.instance.unbind(EVENT_CONNECTION_DETACHED, this.onConnectionDragAbortDetached);
 			this.instance.unbind(EVENT_PLUS_ENDPOINT_CLICK, this.onPlusEndpointClick);
-
-			// Get all the endpoints and unbind the events
-			const elements = this.instance.getManagedElements();
-			for (const element of Object.values(elements)) {
-				const endpoints = element.endpoints;
-				for (const endpoint of endpoints || []) {
-					const endpointInstance = endpoint?.endpoint;
-					if (endpointInstance && endpointInstance.type === N8nPlusEndpointType) {
-						(endpointInstance as N8nPlusEndpoint).unbindEvents();
+			this.instance.unbind(EVENT_ADD_INPUT_ENDPOINT_CLICK, this.onAddInputEndpointClick);
+			this.eventsAttached = false;
+		},
+		unbindEndpointEventListeners(bind = true) {
+			if (this.instance) {
+				// Get all the endpoints and unbind the events
+				const elements = this.instance.getManagedElements();
+				for (const element of Object.values(elements)) {
+					const endpoints = element.endpoints;
+					for (const endpoint of endpoints || []) {
+						const endpointInstance = endpoint?.endpoint;
+						if (endpointInstance && endpointInstance.type === N8nPlusEndpointType) {
+							(endpointInstance as N8nPlusEndpoint).unbindEvents();
+						}
 					}
 				}
 			}
+
+			this.eventsAttached = false;
 		},
-		onBeforeUnload(e) {
+		onBeforeUnload(e: BeforeUnloadEvent) {
 			if (this.isDemo || window.preventNodeViewBeforeUnload) {
 				return;
 			} else if (this.uiStore.stateIsDirty) {
-				const confirmationMessage = this.$locale.baseText(
-					'nodeView.itLooksLikeYouHaveBeenEditingSomething',
-				);
-				(e || window.event).returnValue = confirmationMessage; //Gecko + IE
-				return confirmationMessage; //Gecko + Webkit, Safari, Chrome etc.
+				// A bit hacky solution to detecting users leaving the page after prompt:
+				// 1. Notify that workflow is closed straight away
+				this.collaborationStore.notifyWorkflowClosed(this.workflowsStore.workflowId);
+				// 2. If user decided to stay on the page we notify that the workflow is opened again
+				this.unloadTimeout = setTimeout(() => {
+					this.collaborationStore.notifyWorkflowOpened(this.workflowsStore.workflowId);
+				}, 5 * TIME.SECOND);
+				e.returnValue = true; //Gecko + IE
+				return true; //Gecko + Webkit, Safari, Chrome etc.
 			} else {
-				this.startLoading(this.$locale.baseText('nodeView.redirecting'));
+				this.canvasStore.startLoading(this.$locale.baseText('nodeView.redirecting'));
+				this.collaborationStore.notifyWorkflowClosed(this.workflowsStore.workflowId);
 				return;
 			}
 		},
+		onUnload() {
+			// This will fire if users decides to leave the page after prompted
+			// Clear the interval to prevent the notification from being sent
+			clearTimeout(this.unloadTimeout);
+		},
 		async newWorkflow(): Promise<void> {
-			this.startLoading();
+			this.canvasStore.startLoading();
 			this.resetWorkspace();
 			this.workflowData = await this.workflowsStore.getNewWorkflowData();
 			this.workflowsStore.currentWorkflowExecutions = [];
-			this.workflowsStore.activeWorkflowExecution = null;
+			this.executionsStore.activeExecution = null;
 
 			this.uiStore.stateIsDirty = false;
 			this.canvasStore.setZoomLevel(1, [0, 0]);
-			this.tryToAddWelcomeSticky();
+			await this.tryToAddWelcomeSticky();
 			this.uiStore.nodeViewInitialized = true;
 			this.historyStore.reset();
-			this.workflowsStore.activeWorkflowExecution = null;
-			this.stopLoading();
+			this.executionsStore.activeExecution = null;
+			this.canvasStore.stopLoading();
 		},
 		async tryToAddWelcomeSticky(): Promise<void> {
-			const newWorkflow = this.workflowData;
 			this.canvasStore.zoomToFit();
 		},
 		async initView(): Promise<void> {
@@ -2577,18 +3678,23 @@ export default mixins(
 				const templateId = this.$route.params.id;
 				await this.openWorkflowTemplate(templateId);
 			} else {
-				const result = this.uiStore.stateIsDirty;
-				if (result) {
-					const confirmModal = await this.confirmModal(
+				if (this.uiStore.stateIsDirty && !this.readOnlyEnv) {
+					const confirmModal = await this.confirm(
 						this.$locale.baseText('generic.unsavedWork.confirmMessage.message'),
-						this.$locale.baseText('generic.unsavedWork.confirmMessage.headline'),
-						'warning',
-						this.$locale.baseText('generic.unsavedWork.confirmMessage.confirmButtonText'),
-						this.$locale.baseText('generic.unsavedWork.confirmMessage.cancelButtonText'),
-						true,
+						{
+							title: this.$locale.baseText('generic.unsavedWork.confirmMessage.headline'),
+							type: 'warning',
+							confirmButtonText: this.$locale.baseText(
+								'generic.unsavedWork.confirmMessage.confirmButtonText',
+							),
+							cancelButtonText: this.$locale.baseText(
+								'generic.unsavedWork.confirmMessage.cancelButtonText',
+							),
+							showClose: true,
+						},
 					);
-					if (confirmModal === MODAL_CONFIRMED) {
-						const saved = await this.saveCurrentWorkflow();
+					if (confirmModal === MODAL_CONFIRM) {
+						const saved = await this.workflowHelpers.saveCurrentWorkflow();
 						if (saved) await this.settingsStore.fetchPromptsData();
 					} else if (confirmModal === MODAL_CLOSE) {
 						return;
@@ -2604,17 +3710,29 @@ export default mixins(
 					try {
 						workflow = await this.workflowsStore.fetchWorkflow(workflowId);
 					} catch (error) {
-						this.$showError(error, this.$locale.baseText('openWorkflow.workflowNotFoundError'));
+						this.showError(error, this.$locale.baseText('openWorkflow.workflowNotFoundError'));
 
-						this.$router.push({
+						void this.$router.push({
 							name: VIEWS.NEW_WORKFLOW,
 						});
 					}
 
 					if (workflow) {
 						this.titleSet(workflow.name, 'IDLE');
-						// Open existing workflow
 						await this.openWorkflow(workflow);
+						await this.checkAndInitDebugMode();
+
+						if (workflow.meta?.onboardingId) {
+							this.$telemetry.track(
+								`User opened workflow from onboarding template with ID ${workflow.meta.onboardingId}`,
+								{
+									workflow_id: workflow.id,
+								},
+								{
+									withPostHog: true,
+								},
+							);
+						}
 					}
 				} else if (this.$route.meta?.nodeView === true) {
 					// Create new workflow
@@ -2627,26 +3745,42 @@ export default mixins(
 			document.addEventListener('keyup', this.keyUp);
 
 			window.addEventListener('beforeunload', this.onBeforeUnload);
-		},
-		getOutputEndpointUUID(nodeName: string, index: number): string | null {
+			window.addEventListener('unload', this.onUnload);
+			// Once view is initialized, pick up all toast notifications
+			// waiting in the store and display them
+			this.showNotificationForViews([VIEWS.WORKFLOW, VIEWS.NEW_WORKFLOW]);
+		},
+		getOutputEndpointUUID(
+			nodeName: string,
+			connectionType: ConnectionTypes,
+			index: number,
+		): string | null {
 			const node = this.workflowsStore.getNodeByName(nodeName);
 			if (!node) {
 				return null;
 			}
 
-			return NodeViewUtils.getOutputEndpointUUID(node.id, index);
+			return NodeViewUtils.getOutputEndpointUUID(node.id, connectionType, index);
 		},
-		getInputEndpointUUID(nodeName: string, index: number) {
+		getInputEndpointUUID(nodeName: string, connectionType: ConnectionTypes, index: number) {
 			const node = this.workflowsStore.getNodeByName(nodeName);
 			if (!node) {
 				return null;
 			}
 
-			return NodeViewUtils.getInputEndpointUUID(node.id, index);
+			return NodeViewUtils.getInputEndpointUUID(node.id, connectionType, index);
 		},
 		__addConnection(connection: [IConnection, IConnection]) {
-			const outputUuid = this.getOutputEndpointUUID(connection[0].node, connection[0].index);
-			const inputUuid = this.getInputEndpointUUID(connection[1].node, connection[1].index);
+			const outputUuid = this.getOutputEndpointUUID(
+				connection[0].node,
+				connection[0].type as ConnectionTypes,
+				connection[0].index,
+			);
+			const inputUuid = this.getInputEndpointUUID(
+				connection[1].node,
+				connection[1].type as ConnectionTypes,
+				connection[1].index,
+			);
 			if (!outputUuid || !inputUuid) {
 				return;
 			}
@@ -2655,11 +3789,11 @@ export default mixins(
 			// Create connections in DOM
 			this.instance?.connect({
 				uuids: uuid,
-				detachable: !this.isReadOnly,
+				detachable: !this.isReadOnlyRoute && !this.readOnlyEnv,
 			});
 
 			setTimeout(() => {
-				this.addPinDataConnections(this.workflowsStore.pinData);
+				this.addPinDataConnections(this.workflowsStore.pinnedWorkflowData || ({} as IPinData));
 			});
 		},
 		__removeConnection(connection: [IConnection, IConnection], removeVisualConnection = false) {
@@ -2670,7 +3804,19 @@ export default mixins(
 				if (!sourceNode || !targetNode) {
 					return;
 				}
+
+				const sourceNodeType = this.nodeTypesStore.getNodeType(
+					sourceNode.type,
+					sourceNode.typeVersion,
+				);
+				const sourceNodeOutput =
+					sourceNodeType?.outputs?.[connection[0].index] || NodeConnectionType.Main;
+				const sourceNodeOutputName =
+					typeof sourceNodeOutput === 'string' ? sourceNodeOutput : sourceNodeOutput.name;
+				const scope = NodeViewUtils.getEndpointScope(sourceNodeOutputName);
+
 				const connections = this.instance?.getConnections({
+					scope,
 					source: sourceNode.id,
 					target: targetNode.id,
 				});
@@ -2704,12 +3850,12 @@ export default mixins(
 					{
 						index: connection.__meta?.sourceOutputIndex,
 						node: connection.__meta.sourceNodeName,
-						type: 'main',
+						type: NodeConnectionType.Main,
 					},
 					{
 						index: connection.__meta?.targetOutputIndex,
 						node: connection.__meta.targetNodeName,
-						type: 'main',
+						type: NodeConnectionType.Main,
 					},
 				];
 				const removeCommand = new RemoveConnectionCommand(connectionData, this);
@@ -2728,130 +3874,13 @@ export default mixins(
 				this.workflowsStore.removeConnection({ connection: connectionInfo });
 			}
 		},
-		async duplicateNode(nodeName: string) {
+		async duplicateNodes(nodes: INode[]): Promise<void> {
 			if (!this.editAllowedCheck()) {
 				return;
 			}
-			const node = this.workflowsStore.getNodeByName(nodeName);
-
-			if (node) {
-				const nodeTypeData = this.nodeTypesStore.getNodeType(node.type, node.typeVersion);
-
-				if (
-					nodeTypeData &&
-					nodeTypeData.maxNodes !== undefined &&
-					this.getNodeTypeCount(node.type) >= nodeTypeData.maxNodes
-				) {
-					this.showMaxNodeTypeError(nodeTypeData);
-					return;
-				}
-
-				// Deep copy the data so that data on lower levels of the node-properties do
-				// not share objects
-				const newNodeData = deepCopy(this.getNodeDataToSave(node));
-				newNodeData.id = uuid();
-
-				// Check if node-name is unique else find one that is
-				newNodeData.name = this.getUniqueNodeName({
-					originalName: newNodeData.name,
-					type: newNodeData.type,
-				});
-
-				newNodeData.position = NodeViewUtils.getNewNodePosition(
-					this.nodes,
-					[node.position[0], node.position[1] + 140],
-					[0, 140],
-				);
-
-				if (newNodeData.webhookId) {
-					// Make sure that the node gets a new unique webhook-ID
-					newNodeData.webhookId = uuid();
-				}
-
-				if (
-					newNodeData.credentials &&
-					this.settingsStore.isEnterpriseFeatureEnabled(EnterpriseEditionFeature.Sharing)
-				) {
-					const usedCredentials = this.workflowsStore.usedCredentials;
-					newNodeData.credentials = Object.fromEntries(
-						Object.entries(newNodeData.credentials).filter(([_, credential]) => {
-							return (
-								credential.id &&
-								(!usedCredentials[credential.id] ||
-									usedCredentials[credential.id]?.currentUserHasAccess)
-							);
-						}),
-					);
-				}
-
-				await this.addNodes([newNodeData], [], true);
-
-				const pinData = this.workflowsStore.pinDataByNodeName(nodeName);
-				if (pinData) {
-					this.workflowsStore.pinData({
-						node: newNodeData,
-						data: pinData,
-					});
-				}
-
-				this.uiStore.stateIsDirty = true;
-
-				// Automatically deselect all nodes and select the current one and also active
-				// current node
-				this.deselectAllNodes();
-				setTimeout(() => {
-					this.nodeSelectedByName(newNodeData.name, false);
-				});
-
-				this.$telemetry.track('User duplicated node', {
-					node_type: node.type,
-					workflow_id: this.workflowsStore.workflowId,
-				});
-			}
-		},
-		getJSPlumbConnection(
-			sourceNodeName: string,
-			sourceOutputIndex: number,
-			targetNodeName: string,
-			targetInputIndex: number,
-		): Connection | undefined {
-			const sourceNode = this.workflowsStore.getNodeByName(sourceNodeName);
-			const targetNode = this.workflowsStore.getNodeByName(targetNodeName);
-			if (!sourceNode || !targetNode) {
-				return;
-			}
-
-			const sourceId = sourceNode.id;
-			const targetId = targetNode.id;
-
-			const sourceEndpoint = NodeViewUtils.getOutputEndpointUUID(sourceId, sourceOutputIndex);
-			const targetEndpoint = NodeViewUtils.getInputEndpointUUID(targetId, targetInputIndex);
-
-			// @ts-ignore
-			const connections = this.instance?.getConnections({
-				source: sourceId,
-				target: targetId,
-			}) as Connection[];
-
-			return connections.find((connection: Connection) => {
-				const uuids = connection.getUuids();
-				return uuids[0] === sourceEndpoint && uuids[1] === targetEndpoint;
-			});
-		},
-		getJSPlumbEndpoints(nodeName: string): Endpoint[] {
-			const node = this.workflowsStore.getNodeByName(nodeName);
-			const nodeEl = this.instance.getManagedElement(node?.id);
 
-			const endpoints = this.instance?.getEndpoints(nodeEl);
-			return endpoints;
-		},
-		getPlusEndpoint(nodeName: string, outputIndex: number): Endpoint | undefined {
-			const endpoints = this.getJSPlumbEndpoints(nodeName);
-			return endpoints.find(
-				(endpoint: Endpoint) =>
-					// @ts-ignore
-					endpoint.endpoint.type === 'N8nPlus' && endpoint?.__meta?.index === outputIndex,
-			);
+			const workflowData = deepCopy(await this.getNodesToSave(nodes));
+			await this.importWorkflowData(workflowData, 'duplicate', false);
 		},
 		getIncomingOutgoingConnections(nodeName: string): {
 			incoming: Connection[];
@@ -2894,9 +3923,24 @@ export default mixins(
 			data: ITaskData[] | null;
 			waiting: boolean;
 		}) {
-			const pinData = this.workflowsStore.getPinData;
+			const pinData = this.workflowsStore.pinnedWorkflowData;
 
-			if (pinData && pinData[name]) return;
+			if (pinData?.[name]) {
+				const { outgoing } = this.getIncomingOutgoingConnections(name);
+
+				outgoing.forEach((connection: Connection) => {
+					if (connection.__meta?.sourceNodeName === name) {
+						const hasRun = this.workflowsStore.getWorkflowResultDataByNodeName(name) !== null;
+						NodeViewUtils.addClassesToOverlays({
+							connection,
+							overlayIds: [NodeViewUtils.OVERLAY_RUN_ITEMS_ID],
+							classNames: hasRun ? ['has-run'] : [],
+							includeConnector: true,
+						});
+					}
+				});
+				return;
+			}
 
 			const sourceNodeName = name;
 			const sourceNode = this.workflowsStore.getNodeByName(sourceNodeName);
@@ -2910,7 +3954,7 @@ export default mixins(
 				outgoing.forEach((connection: Connection) => {
 					NodeViewUtils.resetConnection(connection);
 				});
-				const endpoints = this.getJSPlumbEndpoints(sourceNodeName);
+				const endpoints = NodeViewUtils.getJSPlumbEndpoints(sourceNode, this.instance);
 				endpoints.forEach((endpoint: Endpoint) => {
 					if (endpoint.endpoint.type === 'N8nPlus') {
 						(endpoint.endpoint as N8nPlusEndpoint).clearSuccessOutput();
@@ -2920,54 +3964,7 @@ export default mixins(
 				return;
 			}
 
-			const nodeConnections =
-				this.workflowsStore.outgoingConnectionsByNodeName(sourceNodeName).main;
-			const outputMap = NodeViewUtils.getOutputSummary(data, nodeConnections || []);
-
-			Object.keys(outputMap).forEach((sourceOutputIndex: string) => {
-				Object.keys(outputMap[sourceOutputIndex]).forEach((targetNodeName: string) => {
-					Object.keys(outputMap[sourceOutputIndex][targetNodeName]).forEach(
-						(targetInputIndex: string) => {
-							if (targetNodeName) {
-								const connection = this.getJSPlumbConnection(
-									sourceNodeName,
-									parseInt(sourceOutputIndex, 10),
-									targetNodeName,
-									parseInt(targetInputIndex, 10),
-								);
-
-								if (connection) {
-									const output = outputMap[sourceOutputIndex][targetNodeName][targetInputIndex];
-
-									if (output.isArtificialRecoveredEventItem) {
-										NodeViewUtils.recoveredConnection(connection);
-									} else if ((!output || !output.total) && !output.isArtificialRecoveredEventItem) {
-										NodeViewUtils.resetConnection(connection);
-									} else {
-										NodeViewUtils.addConnectionOutputSuccess(connection, output);
-									}
-								}
-							}
-
-							const endpoint = this.getPlusEndpoint(
-								sourceNodeName,
-								parseInt(sourceOutputIndex, 10),
-							);
-							if (endpoint && endpoint.endpoint) {
-								const output = outputMap[sourceOutputIndex][NODE_OUTPUT_DEFAULT_KEY][0];
-
-								if (output && output.total > 0) {
-									(endpoint.endpoint as N8nPlusEndpoint).setSuccessOutput(
-										NodeViewUtils.getRunItemsLabel(output),
-									);
-								} else {
-									(endpoint.endpoint as N8nPlusEndpoint).clearSuccessOutput();
-								}
-							}
-						},
-					);
-				});
-			});
+			this.nodeHelpers.setSuccessOutput(data, sourceNode);
 		},
 		removeNode(nodeName: string, trackHistory = false, trackBulk = true) {
 			if (!this.editAllowedCheck()) {
@@ -3012,7 +4009,7 @@ export default mixins(
 					is_welcome_note: node.name === QUICKSTART_NOTE_NAME,
 				});
 			} else {
-				this.$externalHooks().run('node.deleteNode', { node });
+				void this.externalHooks.run('node.deleteNode', { node });
 				this.$telemetry.track('User deleted node', {
 					node_type: node.type,
 					workflow_id: this.workflowsStore.workflowId,
@@ -3022,7 +4019,17 @@ export default mixins(
 			let waitForNewConnection = false;
 			// connect nodes before/after deleted node
 			const nodeType = this.nodeTypesStore.getNodeType(node.type, node.typeVersion);
-			if (nodeType && nodeType.outputs.length === 1 && nodeType.inputs.length === 1) {
+
+			const workflow = this.workflowHelpers.getCurrentWorkflow();
+			const workflowNode = workflow.getNode(node.name);
+			let inputs: Array<ConnectionTypes | INodeInputConfiguration> = [];
+			let outputs: Array<ConnectionTypes | INodeOutputConfiguration> = [];
+			if (nodeType) {
+				inputs = NodeHelpers.getNodeInputs(workflow, workflowNode, nodeType);
+				outputs = NodeHelpers.getNodeOutputs(workflow, workflowNode, nodeType);
+			}
+
+			if (outputs.length === 1 && inputs.length === 1) {
 				const { incoming, outgoing } = this.getIncomingOutgoingConnections(node.name);
 				if (incoming.length === 1 && outgoing.length === 1) {
 					const conn1 = incoming[0];
@@ -3040,6 +4047,7 @@ export default mixins(
 								sourceNodeOutputIndex,
 								targetNodeName,
 								targetNodeOuputIndex,
+								NodeConnectionType.Main,
 							);
 
 							if (waitForNewConnection) {
@@ -3051,7 +4059,7 @@ export default mixins(
 				}
 			}
 
-			setTimeout(() => {
+			void nextTick(() => {
 				// Suspend drawing
 				this.instance?.setSuspendDrawing(true);
 				(this.instance?.endpointsByElement[node.id] || [])
@@ -3073,7 +4081,8 @@ export default mixins(
 				if (trackHistory) {
 					this.historyStore.pushCommandToUndo(new RemoveNodeCommand(node));
 				}
-			}, 0); // allow other events to finish like drag stop
+			}); // allow other events to finish like drag stop
+
 			if (trackHistory && trackBulk) {
 				const recordingTimeout = waitForNewConnection ? 100 : 0;
 				setTimeout(() => {
@@ -3081,16 +4090,33 @@ export default mixins(
 				}, recordingTimeout);
 			}
 		},
+		async onSwitchSelectedNode(nodeName: string) {
+			this.nodeSelectedByName(nodeName, true, true);
+		},
+		async onOpenConnectionNodeCreator(node: string, connectionType: ConnectionTypes) {
+			await this.openSelectiveNodeCreator({
+				connectiontype: connectionType,
+				node,
+			});
+		},
+		async redrawNode(nodeName: string) {
+			// TODO: Improve later
+			// For now we redraw the node by simply renaming it. Can for sure be
+			// done better later but should be fine for now.
+			const tempName = 'x____XXXX____x';
+			await this.renameNode(nodeName, tempName);
+			await this.renameNode(tempName, nodeName);
+		},
 		valueChanged(parameterData: IUpdateInformation) {
 			if (parameterData.name === 'name' && parameterData.oldValue) {
 				// The name changed so we have to take care that
 				// the connections get changed.
-				this.renameNode(parameterData.oldValue as string, parameterData.value as string);
+				void this.renameNode(parameterData.oldValue as string, parameterData.value as string);
 			}
 		},
 		async renameNodePrompt(currentName: string) {
 			try {
-				const promptResponsePromise = this.$prompt(
+				const promptResponsePromise = this.prompt(
 					this.$locale.baseText('nodeView.prompt.newName') + ':',
 					this.$locale.baseText('nodeView.prompt.renameNode') + `: ${currentName}`,
 					{
@@ -3103,7 +4129,7 @@ export default mixins(
 				);
 
 				// Wait till it had time to display
-				await Vue.nextTick();
+				await this.$nextTick();
 
 				// Get the input and select the text in it
 				const nameInput = document.querySelector('.rename-prompt .el-input__inner') as
@@ -3116,7 +4142,9 @@ export default mixins(
 
 				const promptResponse = (await promptResponsePromise) as MessageBoxInputData;
 
-				this.renameNode(currentName, promptResponse.value, true);
+				if (promptResponse?.action !== MODAL_CONFIRM) return;
+
+				await this.renameNode(currentName, promptResponse.value, true);
 			} catch (e) {}
 		},
 		async renameNode(currentName: string, newName: string, trackHistory = false) {
@@ -3129,19 +4157,16 @@ export default mixins(
 				this.historyStore.startRecordingUndo();
 			}
 
-			const activeNodeName = this.activeNode && this.activeNode.name;
+			const activeNodeName = this.activeNode?.name;
 			const isActive = activeNodeName === currentName;
 			if (isActive) {
 				this.renamingActive = true;
 			}
 
-			// Check if node-name is unique else find one that is
-			newName = this.getUniqueNodeName({
-				originalName: newName,
-			});
+			newName = this.uniqueNodeName(newName);
 
 			// Rename the node and update the connections
-			const workflow = this.getCurrentWorkflow(true);
+			const workflow = this.workflowHelpers.getCurrentWorkflow(true);
 			workflow.renameNode(currentName, newName);
 
 			if (trackHistory) {
@@ -3158,7 +4183,7 @@ export default mixins(
 			this.workflowsStore.removeAllNodes({ removePinData: false, setStateDirty: true });
 
 			// Wait a tick that the old nodes had time to get removed
-			await Vue.nextTick();
+			await this.$nextTick();
 
 			// Add the new updated nodes
 			await this.addNodes(Object.values(workflow.nodes), workflow.connectionsBySourceNode, false);
@@ -3243,10 +4268,10 @@ export default mixins(
 			);
 		},
 		async addNodes(nodes: INodeUi[], connections?: IConnections, trackHistory = false) {
-			if (!nodes || !nodes.length) {
+			if (!nodes?.length) {
 				return;
 			}
-
+			this.isInsertingNodes = true;
 			// Before proceeding we must check if all nodes contain the `properties` attribute.
 			// Nodes are loaded without this information so we must make sure that all nodes
 			// being added have this information.
@@ -3256,7 +4281,6 @@ export default mixins(
 
 			// Add the node to the node-list
 			let nodeType: INodeTypeDescription | null;
-			let foundNodeIssues: INodeIssues | null;
 			nodes.forEach((node) => {
 				if (!node.id) {
 					node.id = uuid();
@@ -3289,75 +4313,80 @@ export default mixins(
 						console.error(
 							this.$locale.baseText('nodeView.thereWasAProblemLoadingTheNodeParametersOfNode') +
 								`: "${node.name}"`,
-						); // eslint-disable-line no-console
-						console.error(e); // eslint-disable-line no-console
+						);
+						console.error(e);
 					}
 					node.parameters = nodeParameters !== null ? nodeParameters : {};
 
 					// if it's a webhook and the path is empty set the UUID as the default path
-					if (node.type === WEBHOOK_NODE_TYPE && node.parameters.path === '') {
+					if (
+						[WEBHOOK_NODE_TYPE, FORM_TRIGGER_NODE_TYPE].includes(node.type) &&
+						node.parameters.path === ''
+					) {
 						node.parameters.path = node.webhookId as string;
 					}
 				}
 
 				// check and match credentials, apply new format if old is used
 				this.matchCredentials(node);
-
-				foundNodeIssues = this.getNodeIssues(nodeType, node);
-
-				if (foundNodeIssues !== null) {
-					node.issues = foundNodeIssues;
-				}
-
 				this.workflowsStore.addNode(node);
 				if (trackHistory) {
 					this.historyStore.pushCommandToUndo(new AddNodeCommand(node));
 				}
 			});
 
-			// Wait for the node to be rendered
-			await Vue.nextTick();
+			// Wait for the nodes to be rendered
+			await this.$nextTick();
 
-			// Suspend drawing
 			this.instance?.setSuspendDrawing(true);
 
-			// Load the connections
-			if (connections !== undefined) {
-				let connectionData;
-				for (const sourceNode of Object.keys(connections)) {
-					for (const type of Object.keys(connections[sourceNode])) {
-						for (
-							let sourceIndex = 0;
-							sourceIndex < connections[sourceNode][type].length;
-							sourceIndex++
-						) {
-							const outwardConnections = connections[sourceNode][type][sourceIndex];
-							if (!outwardConnections) {
-								continue;
-							}
+			if (connections) {
+				await this.addConnections(connections);
+			}
+			// Add the node issues at the end as the node-connections are required
+			this.nodeHelpers.refreshNodeIssues();
+			this.nodeHelpers.updateNodesInputIssues();
+			this.resetEndpointsErrors();
+			this.isInsertingNodes = false;
+
+			// Now it can draw again
+			this.instance?.setSuspendDrawing(false, true);
+		},
+		async addConnections(connections: IConnections) {
+			const batchedConnectionData: Array<[IConnection, IConnection]> = [];
+
+			for (const sourceNode in connections) {
+				for (const type in connections[sourceNode]) {
+					connections[sourceNode][type].forEach((outwardConnections, sourceIndex) => {
+						if (outwardConnections) {
 							outwardConnections.forEach((targetData) => {
-								connectionData = [
-									{
-										node: sourceNode,
-										type,
-										index: sourceIndex,
-									},
-									{
-										node: targetData.node,
-										type: targetData.type,
-										index: targetData.index,
-									},
-								] as [IConnection, IConnection];
-
-								this.__addConnection(connectionData);
+								batchedConnectionData.push([
+									{ node: sourceNode, type, index: sourceIndex },
+									{ node: targetData.node, type: targetData.type, index: targetData.index },
+								]);
 							});
 						}
-					}
+					});
 				}
 			}
-			// Now it can draw again
-			this.instance?.setSuspendDrawing(false, true);
+
+			// Process the connections in batches
+			await this.processConnectionBatch(batchedConnectionData);
+			setTimeout(this.addConectionsTestData, 0);
+		},
+
+		async processConnectionBatch(batchedConnectionData: Array<[IConnection, IConnection]>) {
+			const batchSize = 100;
+
+			for (let i = 0; i < batchedConnectionData.length; i += batchSize) {
+				const batch = batchedConnectionData.slice(i, i + batchSize);
+
+				batch.forEach((connectionData) => {
+					this.__addConnection(connectionData);
+				});
+			}
 		},
+
 		async addNodesToWorkflow(data: IWorkflowDataUpdate): Promise<IWorkflowDataUpdate> {
 			// Because nodes with the same name maybe already exist, it could
 			// be needed that they have to be renamed. Also could it be possible
@@ -3377,7 +4406,7 @@ export default mixins(
 
 			// Get how many of the nodes of the types which have
 			// a max limit set already exist
-			const nodeTypesCount = this.getNodeTypesMaxCount();
+			const nodeTypesCount = this.workflowHelpers.getNodeTypesMaxCount();
 
 			let oldName: string;
 			let newName: string;
@@ -3405,11 +4434,10 @@ export default mixins(
 				}
 
 				oldName = node.name;
-				newName = this.getUniqueNodeName({
-					originalName: node.name,
-					additionalUsedNames: newNodeNames,
-					type: node.type,
-				});
+
+				const localized = this.locale.localizeNodeName(node.name, node.type);
+
+				newName = this.uniqueNodeName(localized, newNodeNames);
 
 				newNodeNames.push(newName);
 				nodeNameTable[oldName] = newName;
@@ -3463,7 +4491,7 @@ export default mixins(
 
 			// Create a workflow with the new nodes and connections that we can use
 			// the rename method
-			const tempWorkflow: Workflow = this.getWorkflow(createNodes, newConnections);
+			const tempWorkflow: Workflow = this.workflowHelpers.getWorkflow(createNodes, newConnections);
 
 			// Rename all the nodes of which the name changed
 			for (oldName in nodeNameTable) {
@@ -3474,6 +4502,30 @@ export default mixins(
 				tempWorkflow.renameNode(oldName, nodeNameTable[oldName]);
 			}
 
+			if (data.pinData) {
+				let pinDataSuccess = true;
+				for (const nodeName of Object.keys(data.pinData)) {
+					// Pin data limit reached
+					if (!pinDataSuccess) {
+						this.showError(
+							new Error(this.$locale.baseText('ndv.pinData.error.tooLarge.description')),
+							this.$locale.baseText('ndv.pinData.error.tooLarge.title'),
+						);
+						continue;
+					}
+
+					const node = tempWorkflow.nodes[nodeNameTable[nodeName]];
+					try {
+						const pinnedDataForNode = usePinnedData(node);
+						pinnedDataForNode.setData(data.pinData[nodeName], 'add-nodes');
+						pinDataSuccess = true;
+					} catch (error) {
+						pinDataSuccess = false;
+						console.error(error);
+					}
+				}
+			}
+
 			// Add the nodes with the changed node names, expressions and connections
 			this.historyStore.startRecordingUndo();
 			await this.addNodes(
@@ -3491,21 +4543,43 @@ export default mixins(
 				connections: tempWorkflow.connectionsBySourceNode,
 			};
 		},
-		async getSelectedNodesToSave(): Promise<IWorkflowData> {
+		async getNodesToSave(nodes: INode[]): Promise<IWorkflowData> {
 			const data: IWorkflowData = {
 				nodes: [],
 				connections: {},
+				pinData: {},
 			};
 
 			// Get data of all the selected noes
 			let nodeData;
 			const exportNodeNames: string[] = [];
 
-			for (const node of this.uiStore.getSelectedNodes) {
-				nodeData = this.getNodeDataToSave(node);
+			for (const node of nodes) {
+				nodeData = this.workflowHelpers.getNodeDataToSave(node);
 				exportNodeNames.push(node.name);
 
 				data.nodes.push(nodeData);
+
+				const pinDataForNode = this.workflowsStore.pinDataByNodeName(node.name);
+				if (pinDataForNode) {
+					data.pinData![node.name] = pinDataForNode;
+				}
+
+				if (
+					nodeData.credentials &&
+					this.settingsStore.isEnterpriseFeatureEnabled(EnterpriseEditionFeature.Sharing)
+				) {
+					const usedCredentials = this.workflowsStore.usedCredentials;
+					nodeData.credentials = Object.fromEntries(
+						Object.entries(nodeData.credentials).filter(([_, credential]) => {
+							return (
+								credential.id &&
+								(!usedCredentials[credential.id] ||
+									usedCredentials[credential.id]?.currentUserHasAccess)
+							);
+						}),
+					);
+				}
 			}
 
 			// Get only connections of exported nodes and ignore all other ones
@@ -3560,35 +4634,19 @@ export default mixins(
 
 			this.onToggleNodeCreator({ createNodeActive: false });
 			this.nodeCreatorStore.setShowScrim(false);
+			this.canvasStore.resetZoom();
 
 			// Reset nodes
+			this.unbindEndpointEventListeners();
 			this.deleteEveryEndpoint();
 
+			// Make sure that if there is a waiting test-webhook that it gets removed
 			if (this.executionWaitingForWebhook) {
-				// Make sure that if there is a waiting test-webhook that
-				// it gets removed
-				this.restApi()
-					.removeTestWebhook(this.workflowsStore.workflowId)
-					.catch(() => {
-						// Ignore all errors
-					});
+				try {
+					void this.workflowsStore.removeTestWebhook(this.workflowsStore.workflowId);
+				} catch (error) {}
 			}
-			this.workflowsStore.removeAllConnections({ setStateDirty: false });
-			this.workflowsStore.removeAllNodes({ setStateDirty: false, removePinData: true });
-
-			// Reset workflow execution data
-			this.workflowsStore.setWorkflowExecutionData(null);
-			this.workflowsStore.resetAllNodesIssues();
-
-			this.workflowsStore.setActive(false);
-			this.workflowsStore.setWorkflowId(PLACEHOLDER_EMPTY_WORKFLOW_ID);
-			this.workflowsStore.setWorkflowName({ newName: '', setStateDirty: false });
-			this.workflowsStore.setWorkflowSettings({});
-			this.workflowsStore.setWorkflowTagIds([]);
-
-			this.workflowsStore.activeExecutionId = null;
-			this.workflowsStore.executingNode = null;
-			this.workflowsStore.executionWaitingForWebhook = false;
+			this.workflowsStore.resetState();
 			this.uiStore.removeActiveAction('workflowRunning');
 
 			this.uiStore.resetSelectedNodes();
@@ -3611,6 +4669,9 @@ export default mixins(
 		async loadVariables(): Promise<void> {
 			await this.environmentsStore.fetchAllVariables();
 		},
+		async loadSecrets(): Promise<void> {
+			await this.externalSecretsStore.fetchAllSecrets();
+		},
 		async loadNodesProperties(nodeInfos: INodeTypeNameVersion[]): Promise<void> {
 			const allNodes: INodeTypeDescription[] = this.nodeTypesStore.allNodeTypes;
 
@@ -3630,17 +4691,22 @@ export default mixins(
 
 			if (nodesToBeFetched.length > 0) {
 				// Only call API if node information is actually missing
-				this.startLoading();
+				this.canvasStore.startLoading();
 				await this.nodeTypesStore.getNodesInformation(nodesToBeFetched);
-				this.stopLoading();
+				this.canvasStore.stopLoading();
 			}
 		},
 		async onPostMessageReceived(message: MessageEvent) {
+			if (!message || typeof message.data !== 'string' || !message.data?.includes?.('"command"')) {
+				return;
+			}
 			try {
 				const json = JSON.parse(message.data);
 				if (json && json.command === 'openWorkflow') {
 					try {
 						await this.importWorkflowExact(json);
+						this.canOpenNDV = json.canOpenNDV ?? true;
+						this.hideNodeIssues = json.hideNodeIssues ?? false;
 						this.isExecutionPreview = false;
 					} catch (e) {
 						if (window.top) {
@@ -3652,7 +4718,7 @@ export default mixins(
 								'*',
 							);
 						}
-						this.$showMessage({
+						this.showMessage({
 							title: this.$locale.baseText('openWorkflow.workflowImportError'),
 							message: (e as Error).message,
 							type: 'error',
@@ -3665,6 +4731,8 @@ export default mixins(
 						this.isProductionExecutionPreview = json.executionMode !== 'manual';
 
 						await this.openExecution(json.executionId);
+						this.canOpenNDV = json.canOpenNDV ?? true;
+						this.hideNodeIssues = json.hideNodeIssues ?? false;
 						this.isExecutionPreview = true;
 					} catch (e) {
 						if (window.top) {
@@ -3676,12 +4744,14 @@ export default mixins(
 								'*',
 							);
 						}
-						this.$showMessage({
+						this.showMessage({
 							title: this.$locale.baseText('nodeView.showError.openExecution.title'),
 							message: (e as Error).message,
 							type: 'error',
 						});
 					}
+				} else if (json?.command === 'setActiveExecution') {
+					this.executionsStore.activeExecution = json.execution;
 				}
 			} catch (e) {}
 		},
@@ -3701,6 +4771,13 @@ export default mixins(
 					return;
 				}
 
+				const hasRun = this.workflowsStore.getWorkflowResultDataByNodeName(nodeName) !== null;
+				const classNames = ['pinned'];
+
+				if (hasRun) {
+					classNames.push('has-run');
+				}
+
 				// @ts-ignore
 				const connections = this.instance?.getConnections({
 					source: node.id,
@@ -3710,6 +4787,7 @@ export default mixins(
 					NodeViewUtils.addConnectionOutputSuccess(connection, {
 						total: pinData[nodeName].length,
 						iterations: 0,
+						classNames,
 					});
 				});
 			});
@@ -3731,27 +4809,34 @@ export default mixins(
 				this.instance.setSuspendDrawing(false, true);
 			});
 		},
-		onToggleNodeCreator({
-			source,
-			createNodeActive,
-		}: {
-			source?: NodeCreatorOpenSource;
-			createNodeActive: boolean;
-		}) {
+		onToggleNodeCreator({ source, createNodeActive, nodeCreatorView }: ToggleNodeCreatorOptions) {
 			if (createNodeActive === this.createNodeActive) return;
 
+			if (!nodeCreatorView) {
+				nodeCreatorView = this.containsTrigger
+					? REGULAR_NODE_CREATOR_VIEW
+					: TRIGGER_NODE_CREATOR_VIEW;
+			}
+
 			// Default to the trigger tab in node creator if there's no trigger node yet
-			this.nodeCreatorStore.setSelectedView(
-				this.containsTrigger ? REGULAR_NODE_FILTER : TRIGGER_NODE_FILTER,
-			);
+			this.nodeCreatorStore.setSelectedView(nodeCreatorView);
 
 			this.createNodeActive = createNodeActive;
 
-			const mode =
-				this.nodeCreatorStore.selectedView === TRIGGER_NODE_FILTER ? 'trigger' : 'regular';
+			let mode;
+			switch (this.nodeCreatorStore.selectedView) {
+				case AI_NODE_CREATOR_VIEW:
+					mode = 'ai';
+					break;
+				case REGULAR_NODE_CREATOR_VIEW:
+					mode = 'regular';
+					break;
+				default:
+					mode = 'regular';
+			}
 
-			this.nodeCreatorStore.openSource = source || '';
-			this.$externalHooks().run('nodeView.createNodeActiveChanged', {
+			if (createNodeActive) this.nodeCreatorStore.setOpenSource(source);
+			void this.externalHooks.run('nodeView.createNodeActiveChanged', {
 				source,
 				mode,
 				createNodeActive,
@@ -3763,49 +4848,64 @@ export default mixins(
 				workflow_id: this.workflowsStore.workflowId,
 			});
 		},
-		onAddNode(
-			nodeTypes: Array<{ nodeTypeName: string; position: XYPosition }>,
-			dragAndDrop: boolean,
+		async onAddNodes(
+			{ nodes, connections }: AddedNodesAndConnections,
+			dragAndDrop = false,
+			position?: XYPosition,
 		) {
-			nodeTypes.forEach(({ nodeTypeName, position }, index) => {
-				const isManualTrigger = nodeTypeName === MANUAL_TRIGGER_NODE_TYPE;
-				const openNDV = !isManualTrigger && (nodeTypes.length === 1 || index > 0);
-				this.addNode(
-					nodeTypeName,
-					{ position, dragAndDrop },
-					openNDV,
+			let currentPosition = position;
+			for (const { type, isAutoAdd, name, openDetail, position: nodePosition } of nodes) {
+				await this.addNode(
+					type,
+					{ position: nodePosition ?? currentPosition, dragAndDrop, name },
+					openDetail ?? false,
 					true,
-					nodeTypes.length > 1 && index < 1,
+					isAutoAdd,
 				);
-				if (index === 0) return;
-				// If there's more than one node, we want to connect them
-				// this has to be done in mutation subscriber to make sure both nodes already
-				// exist
-				const actionWatcher = this.workflowsStore.$onAction(({ name, after, args }) => {
-					if (name === 'addNode' && args[0].type === nodeTypeName) {
-						after(() => {
-							const lastAddedNode = this.nodes[this.nodes.length - 1];
-							const previouslyAddedNode = this.nodes[this.nodes.length - 2];
-
-							this.$nextTick(() =>
-								this.connectTwoNodes(previouslyAddedNode.name, 0, lastAddedNode.name, 0),
-							);
 
-							// Position the added node to the right side of the previously added one
-							lastAddedNode.position = [
-								previouslyAddedNode.position[0] +
-									NodeViewUtils.NODE_SIZE * 2 +
-									NodeViewUtils.GRID_SIZE,
-								previouslyAddedNode.position[1],
-							];
-							actionWatcher();
-						});
-					}
+				const lastAddedNode = this.nodes[this.nodes.length - 1];
+				currentPosition = [
+					lastAddedNode.position[0] + NodeViewUtils.NODE_SIZE * 2 + NodeViewUtils.GRID_SIZE,
+					lastAddedNode.position[1],
+				];
+			}
+
+			const newNodesOffset = this.nodes.length - nodes.length;
+			for (const { from, to } of connections) {
+				const fromNode = this.nodes[newNodesOffset + from.nodeIndex];
+				const toNode = this.nodes[newNodesOffset + to.nodeIndex];
+
+				this.connectTwoNodes(
+					fromNode.name,
+					from.outputIndex ?? 0,
+					toNode.name,
+					to.inputIndex ?? 0,
+					NodeConnectionType.Main,
+				);
+			}
+
+			const lastAddedNode = this.nodes[this.nodes.length - 1];
+			const workflow = this.workflowHelpers.getCurrentWorkflow();
+			const lastNodeInputs = workflow.getParentNodesByDepth(lastAddedNode.name, 1);
+
+			// If the last added node has multiple inputs, move them down
+			if (lastNodeInputs.length > 1) {
+				lastNodeInputs.slice(1).forEach((node, index) => {
+					const nodeUi = this.workflowsStore.getNodeByName(node.name);
+					if (!nodeUi) return;
+
+					this.onMoveNode({
+						nodeName: nodeUi.name,
+						position: [nodeUi.position[0], nodeUi.position[1] + 100 * (index + 1)],
+					});
 				});
-			});
+			}
+
+			this.addPinDataConnections(this.workflowsStore.pinnedWorkflowData || ({} as IPinData));
 		},
+
 		async saveCurrentWorkflowExternal(callback: () => void) {
-			await this.saveCurrentWorkflow();
+			await this.workflowHelpers.saveCurrentWorkflow();
 			callback?.();
 		},
 		setSuspendRecordingDetachedConnections(suspend: boolean) {
@@ -3850,162 +4950,101 @@ export default mixins(
 		onRevertEnableToggle({ nodeName, isDisabled }: { nodeName: string; isDisabled: boolean }) {
 			const node = this.workflowsStore.getNodeByName(nodeName);
 			if (node) {
-				this.disableNodes([node]);
+				this.nodeHelpers.disableNodes([node]);
 			}
 		},
-	},
-	async mounted() {
-		this.resetWorkspace();
-		this.canvasStore.initInstance(this.$refs.nodeView as HTMLElement);
-		this.titleReset();
-		window.addEventListener('message', this.onPostMessageReceived);
-
-		this.startLoading();
-		const loadPromises = [
-			this.loadActiveWorkflows(),
-			this.loadCredentials(),
-			this.loadCredentialTypes(),
-		];
-		this.loadVariables();
-
-		if (this.nodeTypesStore.allNodeTypes.length === 0) {
-			loadPromises.push(this.loadNodeTypes());
-		}
+		onPageShow(e: PageTransitionEvent) {
+			// Page was restored from the bfcache (back-forward cache)
+			if (e.persisted) {
+				this.canvasStore.stopLoading();
+			}
+		},
+		readOnlyEnvRouteCheck() {
+			if (
+				this.readOnlyEnv &&
+				[VIEWS.NEW_WORKFLOW, VIEWS.TEMPLATE_IMPORT].includes(this.$route.name)
+			) {
+				void this.$nextTick(async () => {
+					this.resetWorkspace();
+					this.uiStore.stateIsDirty = false;
 
-		try {
-			await Promise.all(loadPromises);
-		} catch (error) {
-			this.$showError(
-				error,
-				this.$locale.baseText('nodeView.showError.mounted1.title'),
-				this.$locale.baseText('nodeView.showError.mounted1.message') + ':',
-			);
-			return;
-		}
-		ready(async () => {
-			try {
-				try {
-					this.bindCanvasEvents();
-				} catch {} // This will break if mounted after jsplumb has been initiated from executions preview, so continue if it breaks
-				await this.initView();
-				if (window.parent) {
-					window.parent.postMessage(
-						JSON.stringify({ command: 'n8nReady', version: this.rootStore.versionCli }),
-						'*',
-					);
+					await this.$router.replace({ name: VIEWS.WORKFLOWS });
+				});
+			}
+		},
+		async checkAndInitDebugMode() {
+			if (this.$route.name === VIEWS.EXECUTION_DEBUG) {
+				this.titleSet(this.workflowName, 'DEBUG');
+				if (!this.workflowsStore.isInDebugMode) {
+					await this.applyExecutionData(this.$route.params.executionId as string);
+					this.workflowsStore.isInDebugMode = true;
 				}
-			} catch (error) {
-				this.$showError(
-					error,
-					this.$locale.baseText('nodeView.showError.mounted2.title'),
-					this.$locale.baseText('nodeView.showError.mounted2.message') + ':',
-				);
 			}
-			this.stopLoading();
-
-			setTimeout(() => {
-				this.usersStore.showPersonalizationSurvey();
-				this.addPinDataConnections(this.workflowsStore.getPinData || ({} as IPinData));
-			}, 0);
-		});
-
-		// TODO: This currently breaks since front-end hooks are still not updated to work with pinia store
-		this.$externalHooks()
-			.run('nodeView.mount')
-			.catch((e) => {});
-
-		if (
-			this.currentUser?.personalizationAnswers !== null &&
-			this.settingsStore.onboardingCallPromptEnabled &&
-			this.currentUser &&
-			getAccountAge(this.currentUser) <= ONBOARDING_PROMPT_TIMEBOX
-		) {
-			const onboardingResponse = await this.uiStore.getNextOnboardingPrompt();
-			const promptTimeout =
-				onboardingResponse.toast_sequence_number === 1 ? FIRST_ONBOARDING_PROMPT_TIMEOUT : 1000;
-
-			if (onboardingResponse.title && onboardingResponse.description) {
-				setTimeout(async () => {
-					this.$showToast({
-						type: 'info',
-						title: onboardingResponse.title,
-						message: onboardingResponse.description,
-						duration: 0,
-						customClass: 'clickable',
-						closeOnClick: true,
-						onClick: () => {
-							this.$telemetry.track('user clicked onboarding toast', {
-								seq_num: onboardingResponse.toast_sequence_number,
-								title: onboardingResponse.title,
-								description: onboardingResponse.description,
-							});
-							this.uiStore.openModal(ONBOARDING_CALL_SIGNUP_MODAL_KEY);
-						},
+		},
+		onContextMenuAction(action: ContextMenuAction, nodes: INode[]): void {
+			switch (action) {
+				case 'copy':
+					this.copyNodes(nodes);
+					break;
+				case 'delete':
+					this.deleteNodes(nodes);
+					break;
+				case 'duplicate':
+					void this.duplicateNodes(nodes);
+					break;
+				case 'execute':
+					this.onRunNode(nodes[0].name, 'NodeView.onContextMenuAction');
+					break;
+				case 'open':
+					this.ndvStore.activeNodeName = nodes[0].name;
+					break;
+				case 'rename':
+					void this.renameNodePrompt(nodes[0].name);
+					break;
+				case 'toggle_activation':
+					this.toggleActivationNodes(nodes);
+					break;
+				case 'toggle_pin':
+					this.togglePinNodes(nodes, 'context-menu');
+					break;
+				case 'add_node':
+					this.onToggleNodeCreator({
+						source: NODE_CREATOR_OPEN_SOURCES.CONTEXT_MENU,
+						createNodeActive: !this.isReadOnlyRoute && !this.readOnlyEnv,
 					});
-				}, promptTimeout);
+					break;
+				case 'add_sticky':
+					void this.onAddNodes({ nodes: [{ type: STICKY_NODE_TYPE }], connections: [] });
+					break;
+				case 'select_all':
+					this.selectAllNodes();
+					break;
+				case 'deselect_all':
+					this.deselectAllNodes();
+					break;
 			}
-		}
+		},
 	},
-	activated() {
-		const openSideMenu = this.uiStore.addFirstStepOnLoad;
-		if (openSideMenu) {
-			this.showTriggerCreator(NODE_CREATOR_OPEN_SOURCES.TRIGGER_PLACEHOLDER_BUTTON);
+	async onSourceControlPull() {
+		let workflowId = null as string | null;
+		if (this.$route.params.name) {
+			workflowId = this.$route.params.name;
 		}
-		this.uiStore.addFirstStepOnLoad = false;
-		this.bindCanvasEvents();
-		document.addEventListener('keydown', this.keyDown);
-		document.addEventListener('keyup', this.keyUp);
-		window.addEventListener('message', this.onPostMessageReceived);
-
-		this.$root.$on('newWorkflow', this.newWorkflow);
-		this.$root.$on('importWorkflowData', this.onImportWorkflowDataEvent);
-		this.$root.$on('importWorkflowUrl', this.onImportWorkflowUrlEvent);
-		historyBus.on('nodeMove', this.onMoveNode);
-		historyBus.on('revertAddNode', this.onRevertAddNode);
-		historyBus.on('revertRemoveNode', this.onRevertRemoveNode);
-		historyBus.on('revertAddConnection', this.onRevertAddConnection);
-		historyBus.on('revertRemoveConnection', this.onRevertRemoveConnection);
-		historyBus.on('revertRenameNode', this.onRevertNameChange);
-		historyBus.on('enableNodeToggle', this.onRevertEnableToggle);
-
-		dataPinningEventBus.on('pin-data', this.addPinDataConnections);
-		dataPinningEventBus.on('unpin-data', this.removePinDataConnections);
-		nodeViewEventBus.on('saveWorkflow', this.saveCurrentWorkflowExternal);
-
-		this.canvasStore.isDemo = this.isDemo;
-	},
-	deactivated() {
-		this.unbindCanvasEvents();
-		document.removeEventListener('keydown', this.keyDown);
-		document.removeEventListener('keyup', this.keyUp);
-		window.removeEventListener('message', this.onPostMessageReceived);
-		window.removeEventListener('beforeunload', this.onBeforeUnload);
-
-		this.$root.$off('newWorkflow', this.newWorkflow);
-		this.$root.$off('importWorkflowData', this.onImportWorkflowDataEvent);
-		this.$root.$off('importWorkflowUrl', this.onImportWorkflowUrlEvent);
-		historyBus.off('nodeMove', this.onMoveNode);
-		historyBus.off('revertAddNode', this.onRevertAddNode);
-		historyBus.off('revertRemoveNode', this.onRevertRemoveNode);
-		historyBus.off('revertAddConnection', this.onRevertAddConnection);
-		historyBus.off('revertRemoveConnection', this.onRevertRemoveConnection);
-		historyBus.off('revertRenameNode', this.onRevertNameChange);
-		historyBus.off('enableNodeToggle', this.onRevertEnableToggle);
 
-		dataPinningEventBus.off('pin-data', this.addPinDataConnections);
-		dataPinningEventBus.off('unpin-data', this.removePinDataConnections);
-		nodeViewEventBus.off('saveWorkflow', this.saveCurrentWorkflowExternal);
-	},
-	destroyed() {
-		this.resetWorkspace();
-		this.instance.unbind();
-		this.instance.destroy();
-		this.uiStore.stateIsDirty = false;
-		window.removeEventListener('message', this.onPostMessageReceived);
-		this.$root.$off('newWorkflow', this.newWorkflow);
-		this.$root.$off('importWorkflowData', this.onImportWorkflowDataEvent);
-		this.$root.$off('importWorkflowUrl', this.onImportWorkflowUrlEvent);
-		this.workflowsStore.setWorkflowId(PLACEHOLDER_EMPTY_WORKFLOW_ID);
+		try {
+			await Promise.all([this.loadCredentials(), this.loadVariables(), this.tagsStore.fetchAll()]);
+
+			if (workflowId !== null && !this.uiStore.stateIsDirty) {
+				const workflow: IWorkflowDb | undefined =
+					await this.workflowsStore.fetchWorkflow(workflowId);
+				if (workflow) {
+					this.titleSet(workflow.name, 'IDLE');
+					await this.openWorkflow(workflow);
+				}
+			}
+		} catch (error) {
+			console.error(error);
+		}
 	},
 });
 </script>
@@ -4062,7 +5101,7 @@ export default mixins(
 	align-items: center;
 	left: 50%;
 	transform: translateX(-50%);
-	bottom: 110px;
+	bottom: var(--spacing-l);
 	width: auto;
 
 	@media (max-width: $breakpoint-2xs) {
@@ -4094,6 +5133,86 @@ export default mixins(
 </style>
 
 <style lang="scss">
+.node-view-wrapper {
+	--drag-scope-active-disabled-color: var(--color-foreground-dark);
+
+	&.connection-drag-scope-active {
+		@each $node-type in $supplemental-node-types {
+			// Grey out incompatible node type endpoints
+			&:not(.connection-drag-scope-active-type-#{$node-type}) {
+				.diamond-output-endpoint,
+				.jtk-connector,
+				.add-input-endpoint {
+					--node-type-#{$node-type}-color: var(--drag-scope-active-disabled-color);
+				}
+
+				.node-input-endpoint-label,
+				.node-output-endpoint-label {
+					--node-type-#{$node-type}-color: var(--drag-scope-active-disabled-color);
+				}
+			}
+
+			&.connection-drag-scope-active-type-#{$node-type} {
+				// Dragging input
+				&.connection-drag-scope-active-connection-target {
+					// Apply style to compatible output endpoints
+					.diamond-output-endpoint[data-jtk-scope-#{$node-type}='true'] {
+						transform: scale(1.5) rotate(45deg);
+					}
+
+					.add-input-endpoint[data-jtk-scope-#{$node-type}='true'] {
+						// Apply style to dragged compatible input endpoint
+						&.jtk-dragging {
+							.add-input-endpoint-default {
+								transform: translate(-5px, -5px) scale(1.5);
+							}
+						}
+
+						// Apply style to non-dragged compatible input endpoints
+						&:not(.jtk-dragging) {
+							--node-type-#{$node-type}-color: var(--drag-scope-active-disabled-color);
+						}
+					}
+
+					.node-input-endpoint-label {
+						&:not(.jtk-dragging) {
+							--node-type-#{$node-type}-color: var(--drag-scope-active-disabled-color);
+						}
+					}
+				}
+
+				// Dragging output
+				&.connection-drag-scope-active-connection-source {
+					// Apply style to dragged compatible output endpoint
+					.diamond-output-endpoint[data-jtk-scope-#{$node-type}='true'] {
+						&.jtk-dragging {
+							transform: scale(1.5) rotate(45deg);
+						}
+
+						// Apply style to non-dragged compatible input endpoints
+						&:not(.jtk-dragging) {
+							--node-type-#{$node-type}-color: var(--drag-scope-active-disabled-color);
+						}
+					}
+
+					// Apply style to compatible output endpoints
+					.add-input-endpoint[data-jtk-scope-#{$node-type}='true'] {
+						.add-input-endpoint-default {
+							transform: translate(-5px, -5px) scale(1.5);
+						}
+					}
+
+					.node-output-endpoint-label {
+						&:not(.jtk-dragging) {
+							--node-type-#{$node-type}-color: var(--drag-scope-active-disabled-color);
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
 .drop-add-node-label {
 	color: var(--color-text-dark);
 	font-weight: 600;
@@ -4131,6 +5250,10 @@ export default mixins(
 			left: 4px;
 		}
 
+		&.delete-single {
+			left: -12px;
+		}
+
 		svg {
 			pointer-events: none;
 			font-size: var(--font-size-2xs);
@@ -4179,4 +5302,44 @@ export default mixins(
 		transform: translate3d(4px, 0, 0);
 	}
 }
+
+.setupCredentialsButtonWrapper {
+	position: absolute;
+	left: var(--spacing-l);
+	top: var(--spacing-l);
+}
+</style>
+
+<style lang="scss" scoped>
+@mixin applyColorToConnection($partialSelector, $cssColorVarName, $labelCssColorVarName) {
+	.jtk-connector#{$partialSelector}:not(.jtk-hover) {
+		path:not(.jtk-connector-outline) {
+			stroke: var(#{$cssColorVarName});
+		}
+		path[jtk-overlay-id='reverse-arrow'],
+		path[jtk-overlay-id='endpoint-arrow'],
+		path[jtk-overlay-id='midpoint-arrow'] {
+			fill: var(#{$cssColorVarName});
+		}
+	}
+
+	.connection-run-items-label#{$partialSelector} {
+		color: var(#{$labelCssColorVarName});
+	}
+}
+
+:deep(.node-view) {
+	@include applyColorToConnection('.success', '--color-success-light', '--color-success');
+	@include applyColorToConnection(
+		'.success.pinned',
+		'--color-foreground-xdark',
+		'--color-foreground-xdark'
+	);
+	@include applyColorToConnection(
+		'.success.pinned.has-run',
+		'--color-secondary',
+		'--color-secondary'
+	);
+}
 </style>
+, IRun, IPushDataExecutionFinished
diff --git a/packages/editor-ui/src/views/SamlOnboarding.vue b/packages/editor-ui/src/views/SamlOnboarding.vue
index a57fd8cbc0f22..e003d5e457901 100644
--- a/packages/editor-ui/src/views/SamlOnboarding.vue
+++ b/packages/editor-ui/src/views/SamlOnboarding.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup>
 import { reactive, ref } from 'vue';
-import { useRouter } from 'vue-router/composables';
-import { Notification } from 'element-ui';
+import { useRouter } from 'vue-router';
+import { ElNotification as Notification } from 'element-plus';
 import type { IFormBoxConfig } from 'n8n-design-system';
 import AuthView from '@/views/AuthView.vue';
 import { i18n as locale } from '@/plugins/i18n';
-import { useSSOStore } from '@/stores/sso';
+import { useSSOStore } from '@/stores/sso.store';
 import { VIEWS } from '@/constants';
 
 const router = useRouter();
@@ -57,5 +57,5 @@ const onSubmit = async (values: { firstName: string; lastName: string }) => {
 </script>
 
 <template>
-	<AuthView :form="FORM_CONFIG" :formLoading="loading" @submit="onSubmit" />
+	<AuthView :form="FORM_CONFIG" :form-loading="loading" @submit="onSubmit" />
 </template>
diff --git a/packages/editor-ui/src/views/SettingsApiView.vue b/packages/editor-ui/src/views/SettingsApiView.vue
index 6321440d3b0c9..a039562013668 100644
--- a/packages/editor-ui/src/views/SettingsApiView.vue
+++ b/packages/editor-ui/src/views/SettingsApiView.vue
@@ -12,7 +12,7 @@
 		<div v-if="apiKey">
 			<p class="mb-s">
 				<n8n-info-tip :bold="false">
-					<i18n path="settings.api.view.info" tag="span">
+					<i18n-t keypath="settings.api.view.info" tag="span">
 						<template #apiAction>
 							<a
 								href="https://docs.n8n.io/api"
@@ -27,21 +27,22 @@
 								v-text="$locale.baseText('settings.api.view.info.webhook')"
 							/>
 						</template>
-					</i18n>
+					</i18n-t>
 				</n8n-info-tip>
 			</p>
 			<n8n-card class="mb-4xs" :class="$style.card">
 				<span :class="$style.delete">
-					<n8n-link @click="showDeleteModal" :bold="true">
+					<n8n-link :bold="true" @click="showDeleteModal">
 						{{ $locale.baseText('generic.delete') }}
 					</n8n-link>
 				</span>
-				<div class="ph-no-capture">
+				<div>
 					<CopyInput
 						:label="$locale.baseText('settings.api.view.myKey')"
 						:value="apiKey"
 						:copy-button-text="$locale.baseText('generic.clickToCopy')"
 						:toast-title="$locale.baseText('settings.api.view.copy.toast')"
+						:redact-value="true"
 						@copy="onCopy"
 					/>
 				</div>
@@ -52,7 +53,8 @@
 						$locale.baseText(`settings.api.view.${swaggerUIEnabled ? 'tryapi' : 'more-details'}`)
 					}}
 				</n8n-text>
-				<n8n-link :to="apiDocsURL" :newWindow="true" size="small">
+				{{ ' ' }}
+				<n8n-link :to="apiDocsURL" :new-window="true" size="small">
 					{{
 						$locale.baseText(
 							`settings.api.view.${swaggerUIEnabled ? 'apiPlayground' : 'external-docs'}`,
@@ -62,35 +64,53 @@
 			</div>
 		</div>
 		<n8n-action-box
-			v-else-if="mounted"
-			:buttonText="
+			v-else-if="!isPublicApiEnabled && isTrialing"
+			data-test-id="public-api-upgrade-cta"
+			:heading="$locale.baseText('settings.api.trial.upgradePlan.title')"
+			:description="$locale.baseText('settings.api.trial.upgradePlan.description')"
+			:button-text="$locale.baseText('settings.api.trial.upgradePlan.cta')"
+			@click:button="onUpgrade"
+		/>
+		<n8n-action-box
+			v-else-if="mounted && !isLoadingCloudPlans"
+			:button-text="
 				$locale.baseText(
 					loading ? 'settings.api.create.button.loading' : 'settings.api.create.button',
 				)
 			"
 			:description="$locale.baseText('settings.api.create.description')"
-			@click="createApiKey"
+			@click:button="createApiKey"
 		/>
 	</div>
 </template>
 
 <script lang="ts">
-import { showMessage } from '@/mixins/showMessage';
+import { defineComponent } from 'vue';
 import type { IUser } from '@/Interface';
-import mixins from 'vue-typed-mixins';
+import { useToast } from '@/composables/useToast';
+import { useMessage } from '@/composables/useMessage';
 
 import CopyInput from '@/components/CopyInput.vue';
 import { mapStores } from 'pinia';
-import { useSettingsStore } from '@/stores/settings';
-import { useRootStore } from '@/stores/n8nRootStore';
-import { useUsersStore } from '@/stores/users';
-import { DOCS_DOMAIN } from '@/constants';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import { useUIStore } from '@/stores/ui.store';
+import { useUsersStore } from '@/stores/users.store';
+import { useCloudPlanStore } from '@/stores/cloudPlan.store';
+import { DOCS_DOMAIN, MODAL_CONFIRM } from '@/constants';
 
-export default mixins(showMessage).extend({
+export default defineComponent({
 	name: 'SettingsApiView',
 	components: {
 		CopyInput,
 	},
+	setup() {
+		return {
+			...useToast(),
+			...useMessage(),
+			...useUIStore(),
+		};
+	},
 	data() {
 		return {
 			loading: false,
@@ -101,7 +121,9 @@ export default mixins(showMessage).extend({
 		};
 	},
 	mounted() {
-		this.getApiKey();
+		if (!this.isPublicApiEnabled) return;
+
+		void this.getApiKey();
 		const baseUrl = this.rootStore.baseUrl;
 		const apiPath = this.settingsStore.publicApiPath;
 		const latestVersion = this.settingsStore.publicApiLatestVersion;
@@ -111,29 +133,42 @@ export default mixins(showMessage).extend({
 			: `https://${DOCS_DOMAIN}/api/api-reference/`;
 	},
 	computed: {
-		...mapStores(useRootStore, useSettingsStore, useUsersStore),
+		...mapStores(useRootStore, useSettingsStore, useUsersStore, useCloudPlanStore, useUIStore),
 		currentUser(): IUser | null {
 			return this.usersStore.currentUser;
 		},
+		isTrialing(): boolean {
+			return this.cloudPlanStore.userIsTrialing;
+		},
+		isLoadingCloudPlans(): boolean {
+			return this.cloudPlanStore.state.loadingPlan;
+		},
+		isPublicApiEnabled(): boolean {
+			return this.settingsStore.isPublicApiEnabled;
+		},
 	},
 	methods: {
+		onUpgrade() {
+			void this.uiStore.goToUpgrade('settings-n8n-api', 'upgrade-api', 'redirect');
+		},
 		async showDeleteModal() {
-			const confirmed = await this.confirmMessage(
+			const confirmed = await this.confirm(
 				this.$locale.baseText('settings.api.delete.description'),
 				this.$locale.baseText('settings.api.delete.title'),
-				null,
-				this.$locale.baseText('settings.api.delete.button'),
-				this.$locale.baseText('generic.cancel'),
+				{
+					confirmButtonText: this.$locale.baseText('settings.api.delete.button'),
+					cancelButtonText: this.$locale.baseText('generic.cancel'),
+				},
 			);
-			if (confirmed) {
-				this.deleteApiKey();
+			if (confirmed === MODAL_CONFIRM) {
+				await this.deleteApiKey();
 			}
 		},
 		async getApiKey() {
 			try {
 				this.apiKey = (await this.settingsStore.getApiKey()) || '';
 			} catch (error) {
-				this.$showError(error, this.$locale.baseText('settings.api.view.error'));
+				this.showError(error, this.$locale.baseText('settings.api.view.error'));
 			} finally {
 				this.mounted = true;
 			}
@@ -144,7 +179,7 @@ export default mixins(showMessage).extend({
 			try {
 				this.apiKey = (await this.settingsStore.createApiKey()) || '';
 			} catch (error) {
-				this.$showError(error, this.$locale.baseText('settings.api.create.error'));
+				this.showError(error, this.$locale.baseText('settings.api.create.error'));
 			} finally {
 				this.loading = false;
 				this.$telemetry.track('User clicked create API key button');
@@ -153,13 +188,13 @@ export default mixins(showMessage).extend({
 		async deleteApiKey() {
 			try {
 				await this.settingsStore.deleteApiKey();
-				this.$showMessage({
+				this.showMessage({
 					title: this.$locale.baseText('settings.api.delete.toast'),
 					type: 'success',
 				});
 				this.apiKey = '';
 			} catch (error) {
-				this.$showError(error, this.$locale.baseText('settings.api.delete.error'));
+				this.showError(error, this.$locale.baseText('settings.api.delete.error'));
 			} finally {
 				this.$telemetry.track('User clicked delete API key button');
 			}
diff --git a/packages/editor-ui/src/views/SettingsCommunityNodesView.vue b/packages/editor-ui/src/views/SettingsCommunityNodesView.vue
index 694b8cccc1c26..e2dc01491a136 100644
--- a/packages/editor-ui/src/views/SettingsCommunityNodesView.vue
+++ b/packages/editor-ui/src/views/SettingsCommunityNodesView.vue
@@ -17,16 +17,16 @@
 			<n8n-action-box
 				:heading="$locale.baseText('settings.communityNodes.empty.title')"
 				:description="getEmptyStateDescription"
-				:calloutText="actionBoxConfig.calloutText"
-				:calloutTheme="actionBoxConfig.calloutTheme"
+				:callout-text="actionBoxConfig.calloutText"
+				:callout-theme="actionBoxConfig.calloutTheme"
 			/>
 		</div>
-		<div :class="$style.cardsContainer" v-else-if="loading">
-			<community-package-card
+		<div v-else-if="loading" :class="$style.cardsContainer">
+			<CommunityPackageCard
 				v-for="n in 2"
 				:key="'index-' + n"
 				:loading="true"
-			></community-package-card>
+			></CommunityPackageCard>
 		</div>
 		<div
 			v-else-if="communityNodesStore.getInstalledPackages.length === 0"
@@ -35,18 +35,18 @@
 			<n8n-action-box
 				:heading="$locale.baseText('settings.communityNodes.empty.title')"
 				:description="getEmptyStateDescription"
-				:buttonText="getEmptyStateButtonText"
-				:calloutText="actionBoxConfig.calloutText"
-				:calloutTheme="actionBoxConfig.calloutTheme"
-				@click="onClickEmptyStateButton"
+				:button-text="getEmptyStateButtonText"
+				:callout-text="actionBoxConfig.calloutText"
+				:callout-theme="actionBoxConfig.calloutTheme"
+				@click:button="onClickEmptyStateButton"
 			/>
 		</div>
-		<div :class="$style.cardsContainer" v-else>
-			<community-package-card
+		<div v-else :class="$style.cardsContainer">
+			<CommunityPackageCard
 				v-for="communityPackage in communityNodesStore.getInstalledPackages"
 				:key="communityPackage.packageName"
-				:communityPackage="communityPackage"
-			></community-package-card>
+				:community-package="communityPackage"
+			></CommunityPackageCard>
 		</div>
 	</div>
 </template>
@@ -55,38 +55,54 @@
 import {
 	COMMUNITY_PACKAGE_INSTALL_MODAL_KEY,
 	COMMUNITY_NODES_INSTALLATION_DOCS_URL,
+	COMMUNITY_NODES_MANUAL_INSTALLATION_DOCS_URL,
 	COMMUNITY_NODES_NPM_INSTALLATION_URL,
 } from '@/constants';
 import CommunityPackageCard from '@/components/CommunityPackageCard.vue';
-import { showMessage } from '@/mixins/showMessage';
-import { pushConnection } from '@/mixins/pushConnection';
-import mixins from 'vue-typed-mixins';
+import { useToast } from '@/composables/useToast';
 import type { PublicInstalledPackage } from 'n8n-workflow';
 
-import { useCommunityNodesStore } from '@/stores/communityNodes';
-import { useUIStore } from '@/stores/ui';
+import { useCommunityNodesStore } from '@/stores/communityNodes.store';
+import { useUIStore } from '@/stores/ui.store';
 import { mapStores } from 'pinia';
-import { useSettingsStore } from '@/stores/settings';
-import { BaseTextKey } from '@/plugins/i18n';
+import { useSettingsStore } from '@/stores/settings.store';
+import { defineComponent } from 'vue';
+import { useExternalHooks } from '@/composables/useExternalHooks';
+import { useRouter } from 'vue-router';
+import { usePushConnection } from '@/composables/usePushConnection';
+import { usePushConnectionStore } from '@/stores/pushConnection.store';
 
 const PACKAGE_COUNT_THRESHOLD = 31;
 
-export default mixins(showMessage, pushConnection).extend({
+export default defineComponent({
 	name: 'SettingsCommunityNodesView',
 	components: {
 		CommunityPackageCard,
 	},
+	setup() {
+		const router = useRouter();
+		const pushConnection = usePushConnection({ router });
+		const externalHooks = useExternalHooks();
+
+		return {
+			externalHooks,
+			...useToast(),
+			pushConnection,
+		};
+	},
 	data() {
 		return {
 			loading: false,
 		};
 	},
-	async mounted() {
+	beforeMount() {
+		this.pushConnection.initialize();
 		// The push connection is needed here to receive `reloadNodeType` and `removeNodeType` events when community nodes are installed, updated, or removed.
-		this.pushConnect();
-
+		this.pushStore.pushConnect();
+	},
+	async mounted() {
 		try {
-			this.$data.loading = true;
+			this.loading = true;
 			await this.communityNodesStore.fetchInstalledPackages();
 
 			const installedPackages: PublicInstalledPackage[] =
@@ -114,25 +130,26 @@ export default mixins(showMessage, pushConnection).extend({
 				number_of_updates_available: packagesToUpdate.length,
 			});
 		} catch (error) {
-			this.$showError(
+			this.showError(
 				error,
 				this.$locale.baseText('settings.communityNodes.fetchError.title'),
 				this.$locale.baseText('settings.communityNodes.fetchError.message'),
 			);
 		} finally {
-			this.$data.loading = false;
+			this.loading = false;
 		}
 		try {
 			await this.communityNodesStore.fetchAvailableCommunityPackageCount();
 		} finally {
-			this.$data.loading = false;
+			this.loading = false;
 		}
 	},
-	beforeDestroy() {
-		this.pushDisconnect();
+	beforeUnmount() {
+		this.pushStore.pushDisconnect();
+		this.pushConnection.terminate();
 	},
 	computed: {
-		...mapStores(useCommunityNodesStore, useSettingsStore, useUIStore),
+		...mapStores(useCommunityNodesStore, useSettingsStore, useUIStore, usePushConnectionStore),
 		getEmptyStateDescription(): string {
 			const packageCount = this.communityNodesStore.availablePackageCount;
 
@@ -145,13 +162,13 @@ export default mixins(showMessage, pushConnection).extend({
 						interpolate: {
 							docURL: COMMUNITY_NODES_INSTALLATION_DOCS_URL,
 						},
-				  })
+					})
 				: this.$locale.baseText('settings.communityNodes.empty.description', {
 						interpolate: {
 							docURL: COMMUNITY_NODES_INSTALLATION_DOCS_URL,
 							count: (Math.floor(packageCount / 10) * 10).toString(),
 						},
-				  });
+					});
 		},
 		getEmptyStateButtonText(): string {
 			if (this.settingsStore.isDesktopDeployment) {
@@ -183,7 +200,7 @@ export default mixins(showMessage, pushConnection).extend({
 			if (this.settingsStore.isQueueModeEnabled) {
 				return {
 					calloutText: this.$locale.baseText('settings.communityNodes.queueMode.warning', {
-						interpolate: { docURL: COMMUNITY_NODES_INSTALLATION_DOCS_URL },
+						interpolate: { docURL: COMMUNITY_NODES_MANUAL_INSTALLATION_DOCS_URL },
 					}),
 					calloutTheme: 'warning',
 					hideButton: true,
@@ -206,18 +223,15 @@ export default mixins(showMessage, pushConnection).extend({
 			this.openInstallModal();
 		},
 		goToUpgrade(): void {
-			const linkUrl = `${this.$locale.baseText(
-				'contextual.upgradeLinkUrl.desktop',
-			)}&utm_campaign=upgrade-community-nodes&selfHosted=true`;
-
-			window.open(linkUrl, '_blank');
+			void this.uiStore.goToUpgrade('community-nodes', 'upgrade-community-nodes');
 		},
 		openInstallModal(): void {
 			const telemetryPayload = {
 				is_empty_state: this.communityNodesStore.getInstalledPackages.length === 0,
 			};
 			this.$telemetry.track('user clicked cnr install button', telemetryPayload);
-			this.$externalHooks().run('settingsCommunityNodesView.openInstallModal', telemetryPayload);
+
+			void this.externalHooks.run('settingsCommunityNodesView.openInstallModal', telemetryPayload);
 			this.uiStore.openModal(COMMUNITY_PACKAGE_INSTALL_MODAL_KEY);
 		},
 	},
diff --git a/packages/editor-ui/src/views/SettingsExternalSecrets.vue b/packages/editor-ui/src/views/SettingsExternalSecrets.vue
new file mode 100644
index 0000000000000..a8fe89fb6c561
--- /dev/null
+++ b/packages/editor-ui/src/views/SettingsExternalSecrets.vue
@@ -0,0 +1,76 @@
+<script lang="ts" setup>
+import { useUIStore } from '@/stores/ui.store';
+import { useI18n } from '@/composables/useI18n';
+import { useToast } from '@/composables/useToast';
+import { useExternalSecretsStore } from '@/stores/externalSecrets.ee.store';
+import { computed, onMounted } from 'vue';
+import ExternalSecretsProviderCard from '@/components/ExternalSecretsProviderCard.ee.vue';
+import type { ExternalSecretsProvider } from '@/Interface';
+
+const i18n = useI18n();
+const uiStore = useUIStore();
+const externalSecretsStore = useExternalSecretsStore();
+const toast = useToast();
+
+const sortedProviders = computed(() => {
+	return ([...externalSecretsStore.providers] as ExternalSecretsProvider[]).sort((a, b) => {
+		return b.name.localeCompare(a.name);
+	});
+});
+
+onMounted(() => {
+	if (!externalSecretsStore.isEnterpriseExternalSecretsEnabled) return;
+	try {
+		void externalSecretsStore.fetchAllSecrets();
+		void externalSecretsStore.getProviders();
+	} catch (error) {
+		toast.showError(error, i18n.baseText('error'));
+	}
+});
+
+function goToUpgrade() {
+	void uiStore.goToUpgrade('external-secrets', 'upgrade-external-secrets');
+}
+</script>
+
+<template>
+	<div class="pb-3xl">
+		<n8n-heading size="2xlarge">{{ i18n.baseText('settings.externalSecrets.title') }}</n8n-heading>
+		<div
+			v-if="externalSecretsStore.isEnterpriseExternalSecretsEnabled"
+			data-test-id="external-secrets-content-licensed"
+		>
+			<n8n-callout theme="secondary" class="mt-2xl mb-l">
+				{{ i18n.baseText('settings.externalSecrets.info') }}
+				<a :href="i18n.baseText('settings.externalSecrets.docs')" target="_blank">
+					{{ i18n.baseText('settings.externalSecrets.info.link') }}
+				</a>
+			</n8n-callout>
+			<ExternalSecretsProviderCard
+				v-for="provider in sortedProviders"
+				:key="provider.name"
+				:provider="provider"
+			/>
+		</div>
+		<n8n-action-box
+			v-else
+			class="mt-2xl mb-l"
+			data-test-id="external-secrets-content-unlicensed"
+			:button-text="i18n.baseText('settings.externalSecrets.actionBox.buttonText')"
+			@click="goToUpgrade"
+		>
+			<template #heading>
+				<span>{{ i18n.baseText('settings.externalSecrets.actionBox.title') }}</span>
+			</template>
+			<template #description>
+				<i18n-t keypath="settings.externalSecrets.actionBox.description">
+					<template #link>
+						<a :href="i18n.baseText('settings.externalSecrets.docs')" target="_blank">
+							{{ i18n.baseText('settings.externalSecrets.actionBox.description.link') }}
+						</a>
+					</template>
+				</i18n-t>
+			</template>
+		</n8n-action-box>
+	</div>
+</template>
diff --git a/packages/editor-ui/src/views/SettingsFakeDoorView.vue b/packages/editor-ui/src/views/SettingsFakeDoorView.vue
index 2a15637b8a630..b1b089b01b31c 100644
--- a/packages/editor-ui/src/views/SettingsFakeDoorView.vue
+++ b/packages/editor-ui/src/views/SettingsFakeDoorView.vue
@@ -1,5 +1,5 @@
 <template>
-	<feature-coming-soon :featureId="featureId" showTitle />
+	<FeatureComingSoon :feature-id="featureId" show-title />
 </template>
 
 <script lang="ts">
@@ -7,7 +7,7 @@ import type { IFakeDoor } from '@/Interface';
 import { defineComponent } from 'vue';
 import FeatureComingSoon from '@/components/FeatureComingSoon.vue';
 import { mapStores } from 'pinia';
-import { useUIStore } from '@/stores/ui';
+import { useUIStore } from '@/stores/ui.store';
 
 export default defineComponent({
 	name: 'SettingsFakeDoorView',
diff --git a/packages/editor-ui/src/views/SettingsLdapView.vue b/packages/editor-ui/src/views/SettingsLdapView.vue
index 7f94ddcfacccb..0fd348ab038c4 100644
--- a/packages/editor-ui/src/views/SettingsLdapView.vue
+++ b/packages/editor-ui/src/views/SettingsLdapView.vue
@@ -6,13 +6,13 @@
 			</n8n-heading>
 		</div>
 
-		<n8n-info-tip type="note" theme="info-light" tooltipPlacement="right" class="mb-l">
+		<n8n-info-tip type="note" theme="info" tooltip-placement="right" class="mb-l">
 			{{ $locale.baseText('settings.ldap.note') }}
 		</n8n-info-tip>
 		<n8n-action-box
 			:description="$locale.baseText('settings.ldap.disabled.description')"
-			:buttonText="$locale.baseText('settings.ldap.disabled.buttonText')"
-			@click="goToUpgrade"
+			:button-text="$locale.baseText('settings.ldap.disabled.buttonText')"
+			@click:button="goToUpgrade"
 		>
 			<template #heading>
 				<span>{{ $locale.baseText('settings.ldap.disabled.title') }}</span>
@@ -28,9 +28,7 @@
 			</div>
 			<div :class="$style.docsInfoTip">
 				<n8n-info-tip theme="info" type="note">
-					<template>
-						<span v-html="$locale.baseText('settings.ldap.infoTip')"></span>
-					</template>
+					<span v-html="$locale.baseText('settings.ldap.infoTip')"></span>
 				</n8n-info-tip>
 			</div>
 			<div :class="$style.settingsForm">
@@ -38,10 +36,10 @@
 					v-if="formInputs"
 					ref="ldapConfigForm"
 					:inputs="formInputs"
-					:eventBus="formBus"
-					:columnView="true"
-					verticalSpacing="l"
-					@input="onInput"
+					:event-bus="formBus"
+					:column-view="true"
+					vertical-spacing="l"
+					@update="onInput"
 					@ready="onReadyToSubmit"
 					@submit="onSubmit"
 				/>
@@ -73,52 +71,49 @@
 				$locale.baseText('settings.ldap.section.synchronization.title')
 			}}</n8n-heading>
 			<div :class="$style.syncTable">
-				<el-table
+				<ElTable
+					:key="tableKey"
 					v-loading="loadingTable"
 					:border="true"
 					:stripe="true"
 					:data="dataTable"
 					:cell-style="cellClassStyle"
 					style="width: 100%"
-					height="250"
-					:key="tableKey"
+					max-height="250"
 				>
-					<el-table-column
+					<ElTableColumn
 						prop="status"
 						:label="$locale.baseText('settings.ldap.synchronizationTable.column.status')"
 					>
-					</el-table-column>
-					<el-table-column
+					</ElTableColumn>
+					<ElTableColumn
 						prop="endedAt"
 						:label="$locale.baseText('settings.ldap.synchronizationTable.column.endedAt')"
 					>
-					</el-table-column>
-					<el-table-column
+					</ElTableColumn>
+					<ElTableColumn
 						prop="runMode"
 						:label="$locale.baseText('settings.ldap.synchronizationTable.column.runMode')"
 					>
-					</el-table-column>
-					<el-table-column
+					</ElTableColumn>
+					<ElTableColumn
 						prop="runTime"
 						:label="$locale.baseText('settings.ldap.synchronizationTable.column.runTime')"
 					>
-					</el-table-column>
-					<el-table-column
+					</ElTableColumn>
+					<ElTableColumn
 						prop="details"
 						:label="$locale.baseText('settings.ldap.synchronizationTable.column.details')"
 					>
-					</el-table-column>
+					</ElTableColumn>
 					<template #empty>{{
 						$locale.baseText('settings.ldap.synchronizationTable.empty.message')
 					}}</template>
 					<template #append>
-						<infinite-loading
-							@infinite="getLdapSynchronizations"
-							force-use-infinite-wrapper=".el-table__body-wrapper"
-						>
-						</infinite-loading>
+						<InfiniteLoading target=".el-table__body-wrapper" @infinite="getLdapSynchronizations">
+						</InfiniteLoading>
 					</template>
-				</el-table>
+				</ElTable>
 			</div>
 			<div class="pb-3xl">
 				<n8n-button
@@ -143,8 +138,12 @@
 </template>
 
 <script lang="ts">
-import { convertToDisplayDate } from '@/utils';
-import { showMessage } from '@/mixins/showMessage';
+import type { CSSProperties } from 'vue';
+import { defineComponent } from 'vue';
+import { capitalizeFirstLetter } from '@/utils/htmlUtils';
+import { convertToDisplayDate } from '@/utils/typesUtils';
+import { useToast } from '@/composables/useToast';
+import { useMessage } from '@/composables/useMessage';
 import type {
 	ILdapConfig,
 	ILdapSyncData,
@@ -153,22 +152,20 @@ import type {
 	IFormInputs,
 	IUser,
 } from '@/Interface';
-import mixins from 'vue-typed-mixins';
+import { MODAL_CONFIRM } from '@/constants';
 
 import humanizeDuration from 'humanize-duration';
-import type { rowCallbackParams, cellCallbackParams } from 'element-ui/types/table';
-import { capitalizeFirstLetter } from '@/utils';
-import InfiniteLoading from 'vue-infinite-loading';
+import { ElTable, ElTableColumn } from 'element-plus';
+import type { Events } from 'v3-infinite-loading';
+import InfiniteLoading from 'v3-infinite-loading';
 import { mapStores } from 'pinia';
-import { useUsersStore } from '@/stores/users';
-import { useSettingsStore } from '@/stores/settings';
-import { useUIStore } from '@/stores';
-import { createEventBus } from '@/event-bus';
-import type { N8nFormInputs } from 'n8n-design-system';
+import { useUsersStore } from '@/stores/users.store';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useUIStore } from '@/stores/ui.store';
+import { createEventBus } from 'n8n-design-system/utils';
+import type { TableColumnCtx } from 'element-plus';
 
-type N8nFormInputsRef = InstanceType<typeof N8nFormInputs>;
-
-type tableRow = {
+type TableRow = {
 	status: string;
 	startAt: string;
 	endedAt: string;
@@ -176,14 +173,50 @@ type tableRow = {
 	runMode: string;
 };
 
-type rowType = rowCallbackParams & tableRow;
+type LDAPConfigForm = {
+	loginEnabled: boolean;
+	loginLabel: string;
+	serverAddress: string;
+	allowUnauthorizedCerts: boolean;
+	port: number;
+	connectionSecurity: string;
+	baseDn: string;
+	bindingType: 'admin' | 'anonymous';
+	adminDn: string;
+	adminPassword: string;
+	email: string;
+	firstName: string;
+	lastName: string;
+	loginId: string;
+	ldapId: string;
+	userFilter: string;
+	synchronizationEnabled: boolean;
+	synchronizationInterval: string;
+	pageSize: string;
+	searchTimeout: string;
+};
 
-type cellType = cellCallbackParams & { property: keyof tableRow };
+type CellClassStyleMethodParams<T> = {
+	data: {
+		row: T;
+		rowIndex: number;
+		column: TableColumnCtx<T>;
+		columnIndex: number;
+	};
+};
 
-export default mixins(showMessage).extend({
+export default defineComponent({
 	name: 'SettingsLdapView',
 	components: {
 		InfiniteLoading,
+		ElTable,
+		ElTableColumn,
+	},
+	setup() {
+		return {
+			...useToast(),
+			...useMessage(),
+		};
 	},
 	data() {
 		return {
@@ -203,24 +236,25 @@ export default mixins(showMessage).extend({
 			syncEnabled: false,
 		};
 	},
-	async mounted() {
-		if (!this.isLDAPFeatureEnabled) return;
-		await this.getLdapConfig();
-	},
 	computed: {
 		...mapStores(useUsersStore, useSettingsStore, useUIStore),
 		currentUser(): null | IUser {
 			return this.usersStore.currentUser;
 		},
 		isLDAPFeatureEnabled(): boolean {
-			return this.settingsStore.settings.enterprise.ldap === true;
+			return this.settingsStore.settings.enterprise.ldap;
 		},
 	},
+	async mounted() {
+		if (!this.isLDAPFeatureEnabled) return;
+		await this.getLdapConfig();
+	},
 	methods: {
 		goToUpgrade() {
-			this.uiStore.goToUpgrade('ldap', 'upgrade-ldap');
+			void this.uiStore.goToUpgrade('ldap', 'upgrade-ldap');
 		},
-		cellClassStyle({ row, column }: { row: rowType; column: cellType }) {
+		cellClassStyle({ data }: CellClassStyleMethodParams<TableRow>): CSSProperties {
+			const { row, column } = data;
 			if (column.property === 'status') {
 				if (row.status === 'Success') {
 					return { color: 'green' };
@@ -268,7 +302,8 @@ export default mixins(showMessage).extend({
 		async onSubmit(): Promise<void> {
 			// We want to save all form values (incl. the hidden onces), so we are using
 			// `values` data prop of the `FormInputs` child component since they are all preserved there
-			const formInputsRef = this.$refs.ldapConfigForm as N8nFormInputsRef | undefined;
+			const formInputsRef = this.$refs.ldapConfigForm as { values: LDAPConfigForm };
+
 			if (!this.hasAnyChanges || !formInputsRef) {
 				return;
 			}
@@ -300,14 +335,21 @@ export default mixins(showMessage).extend({
 			let saveForm = true;
 
 			try {
-				if (this.adConfig.loginEnabled === true && newConfiguration.loginEnabled === false) {
-					saveForm = await this.confirmMessage(
+				if (this.adConfig.loginEnabled && !newConfiguration.loginEnabled) {
+					const confirmAction = await this.confirm(
 						this.$locale.baseText('settings.ldap.confirmMessage.beforeSaveForm.message'),
 						this.$locale.baseText('settings.ldap.confirmMessage.beforeSaveForm.headline'),
-						null,
-						this.$locale.baseText('settings.ldap.confirmMessage.beforeSaveForm.cancelButtonText'),
-						this.$locale.baseText('settings.ldap.confirmMessage.beforeSaveForm.confirmButtonText'),
+						{
+							cancelButtonText: this.$locale.baseText(
+								'settings.ldap.confirmMessage.beforeSaveForm.cancelButtonText',
+							),
+							confirmButtonText: this.$locale.baseText(
+								'settings.ldap.confirmMessage.beforeSaveForm.confirmButtonText',
+							),
+						},
 					);
+
+					saveForm = confirmAction === MODAL_CONFIRM;
 				}
 
 				if (!saveForm) {
@@ -315,13 +357,13 @@ export default mixins(showMessage).extend({
 				}
 
 				this.adConfig = await this.settingsStore.updateLdapConfig(newConfiguration);
-				this.$showToast({
+				this.showToast({
 					title: this.$locale.baseText('settings.ldap.updateConfiguration'),
 					message: '',
 					type: 'success',
 				});
 			} catch (error) {
-				this.$showError(error, this.$locale.baseText('settings.ldap.configurationError'));
+				this.showError(error, this.$locale.baseText('settings.ldap.configurationError'));
 			} finally {
 				if (saveForm) {
 					this.hasAnyChanges = false;
@@ -335,13 +377,13 @@ export default mixins(showMessage).extend({
 			this.loadingTestConnection = true;
 			try {
 				await this.settingsStore.testLdapConnection();
-				this.$showToast({
+				this.showToast({
 					title: this.$locale.baseText('settings.ldap.connectionTest'),
 					message: this.$locale.baseText('settings.ldap.toast.connection.success'),
 					type: 'success',
 				});
 			} catch (error) {
-				this.$showToast({
+				this.showToast({
 					title: this.$locale.baseText('settings.ldap.connectionTestError'),
 					message: error.message,
 					type: 'error',
@@ -354,13 +396,13 @@ export default mixins(showMessage).extend({
 			this.loadingDryRun = true;
 			try {
 				await this.settingsStore.runLdapSync({ type: 'dry' });
-				this.$showToast({
+				this.showToast({
 					title: this.$locale.baseText('settings.ldap.runSync.title'),
 					message: this.$locale.baseText('settings.ldap.toast.sync.success'),
 					type: 'success',
 				});
 			} catch (error) {
-				this.$showError(error, this.$locale.baseText('settings.ldap.synchronizationError'));
+				this.showError(error, this.$locale.baseText('settings.ldap.synchronizationError'));
 			} finally {
 				this.loadingDryRun = false;
 				await this.reloadLdapSynchronizations();
@@ -370,13 +412,13 @@ export default mixins(showMessage).extend({
 			this.loadingLiveRun = true;
 			try {
 				await this.settingsStore.runLdapSync({ type: 'live' });
-				this.$showToast({
+				this.showToast({
 					title: this.$locale.baseText('settings.ldap.runSync.title'),
 					message: this.$locale.baseText('settings.ldap.toast.sync.success'),
 					type: 'success',
 				});
 			} catch (error) {
-				this.$showError(error, this.$locale.baseText('settings.ldap.synchronizationError'));
+				this.showError(error, this.$locale.baseText('settings.ldap.synchronizationError'));
 			} finally {
 				this.loadingLiveRun = false;
 				await this.reloadLdapSynchronizations();
@@ -388,11 +430,11 @@ export default mixins(showMessage).extend({
 				this.loginEnabled = this.adConfig.loginEnabled;
 				this.syncEnabled = this.adConfig.synchronizationEnabled;
 				const whenLoginEnabled: IFormInput['shouldDisplay'] = (values) =>
-					values['loginEnabled'] === true;
+					values.loginEnabled === true;
 				const whenSyncAndLoginEnabled: IFormInput['shouldDisplay'] = (values) =>
-					values['synchronizationEnabled'] === true && values['loginEnabled'] === true;
+					values.synchronizationEnabled === true && values.loginEnabled === true;
 				const whenAdminBindingAndLoginEnabled: IFormInput['shouldDisplay'] = (values) =>
-					values['bindingType'] === 'admin' && values['loginEnabled'] === true;
+					values.bindingType === 'admin' && values.loginEnabled === true;
 				this.formInputs = [
 					{
 						name: 'loginEnabled',
@@ -473,7 +515,7 @@ export default mixins(showMessage).extend({
 							required: false,
 						},
 						shouldDisplay(values): boolean {
-							return values['connectionSecurity'] !== 'none' && values['loginEnabled'] === true;
+							return values.connectionSecurity !== 'none' && values.loginEnabled === true;
 						},
 					},
 					{
@@ -669,10 +711,10 @@ export default mixins(showMessage).extend({
 					},
 				];
 			} catch (error) {
-				this.$showError(error, this.$locale.baseText('settings.ldap.configurationError'));
+				this.showError(error, this.$locale.baseText('settings.ldap.configurationError'));
 			}
 		},
-		async getLdapSynchronizations(state: any) {
+		async getLdapSynchronizations(state: Parameters<Events['infinite']>[0]) {
 			try {
 				this.loadingTable = true;
 				const data = await this.settingsStore.getLdapSynchronizations({
@@ -688,7 +730,7 @@ export default mixins(showMessage).extend({
 				}
 				this.loadingTable = false;
 			} catch (error) {
-				this.$showError(error, this.$locale.baseText('settings.ldap.synchronizationError'));
+				this.showError(error, this.$locale.baseText('settings.ldap.synchronizationError'));
 			}
 		},
 		async reloadLdapSynchronizations() {
@@ -697,7 +739,7 @@ export default mixins(showMessage).extend({
 				this.tableKey += 1;
 				this.dataTable = [];
 			} catch (error) {
-				this.$showError(error, this.$locale.baseText('settings.ldap.synchronizationError'));
+				this.showError(error, this.$locale.baseText('settings.ldap.synchronizationError'));
 			}
 		},
 	},
diff --git a/packages/editor-ui/src/views/SettingsLogStreamingView.vue b/packages/editor-ui/src/views/SettingsLogStreamingView.vue
index afdf934f4ecfb..94f622ba82a54 100644
--- a/packages/editor-ui/src/views/SettingsLogStreamingView.vue
+++ b/packages/editor-ui/src/views/SettingsLogStreamingView.vue
@@ -14,60 +14,54 @@
 		<template v-if="isLicensed">
 			<div class="mb-l">
 				<n8n-info-tip theme="info" type="note">
-					<template>
-						<span v-html="$locale.baseText('settings.log-streaming.infoText')"></span>
-					</template>
+					<span v-html="$locale.baseText('settings.log-streaming.infoText')"></span>
 				</n8n-info-tip>
 			</div>
 			<template v-if="storeHasItems()">
 				<el-row
-					:gutter="10"
 					v-for="item in sortedItemKeysByLabel"
 					:key="item.key"
+					:gutter="10"
 					:class="$style.destinationItem"
 				>
 					<el-col v-if="logStreamingStore.items[item.key]?.destination">
-						<event-destination-card
+						<EventDestinationCard
 							:destination="logStreamingStore.items[item.key]?.destination"
-							:eventBus="eventBus"
-							:isInstanceOwner="isInstanceOwner"
+							:event-bus="eventBus"
+							:readonly="!canManageLogStreaming"
 							@remove="onRemove(logStreamingStore.items[item.key]?.destination?.id)"
 							@edit="onEdit(logStreamingStore.items[item.key]?.destination?.id)"
 						/>
 					</el-col>
 				</el-row>
 				<div class="mt-m text-right">
-					<n8n-button v-if="isInstanceOwner" size="large" @click="addDestination">
+					<n8n-button v-if="canManageLogStreaming" size="large" @click="addDestination">
 						{{ $locale.baseText(`settings.log-streaming.add`) }}
 					</n8n-button>
 				</div>
 			</template>
-			<template v-else>
-				<div data-test-id="action-box-licensed">
-					<n8n-action-box
-						:buttonText="$locale.baseText(`settings.log-streaming.add`)"
-						@click="addDestination"
-					>
-						<template #heading>
-							<span v-html="$locale.baseText(`settings.log-streaming.addFirstTitle`)" />
-						</template>
-					</n8n-action-box>
-				</div>
-			</template>
+			<div v-else data-test-id="action-box-licensed">
+				<n8n-action-box
+					:button-text="$locale.baseText(`settings.log-streaming.add`)"
+					@click:button="addDestination"
+				>
+					<template #heading>
+						<span v-html="$locale.baseText(`settings.log-streaming.addFirstTitle`)" />
+					</template>
+				</n8n-action-box>
+			</div>
 		</template>
 		<template v-else>
 			<div v-if="$locale.baseText('settings.log-streaming.infoText')" class="mb-l">
 				<n8n-info-tip theme="info" type="note">
-					<template>
-						<span v-html="$locale.baseText('settings.log-streaming.infoText')"></span>
-					</template>
+					<span v-html="$locale.baseText('settings.log-streaming.infoText')"></span>
 				</n8n-info-tip>
 			</div>
 			<div data-test-id="action-box-unlicensed">
 				<n8n-action-box
 					:description="$locale.baseText('settings.log-streaming.actionBox.description')"
-					:buttonText="$locale.baseText('settings.log-streaming.actionBox.button')"
-					@click="goToUpgrade"
+					:button-text="$locale.baseText('settings.log-streaming.actionBox.button')"
+					@click:button="goToUpgrade"
 				>
 					<template #heading>
 						<span v-html="$locale.baseText('settings.log-streaming.actionBox.title')" />
@@ -79,42 +73,38 @@
 </template>
 
 <script lang="ts">
-import { v4 as uuid } from 'uuid';
+import { defineComponent, nextTick } from 'vue';
 import { mapStores } from 'pinia';
-import mixins from 'vue-typed-mixins';
-import { useWorkflowsStore } from '../stores/workflows';
-import { useUsersStore } from '../stores/users';
-import { useCredentialsStore } from '../stores/credentials';
-import { useLogStreamingStore } from '../stores/logStreamingStore';
-import { useSettingsStore } from '../stores/settings';
-import { useUIStore } from '../stores/ui';
-import { LOG_STREAM_MODAL_KEY, EnterpriseEditionFeature } from '../constants';
+import { v4 as uuid } from 'uuid';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { hasPermission } from '@/rbac/permissions';
+import { useCredentialsStore } from '@/stores/credentials.store';
+import { useLogStreamingStore } from '@/stores/logStreaming.store';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useUIStore } from '@/stores/ui.store';
+import { LOG_STREAM_MODAL_KEY, EnterpriseEditionFeature } from '@/constants';
 import type { MessageEventBusDestinationOptions } from 'n8n-workflow';
 import { deepCopy, defaultMessageEventBusDestinationOptions } from 'n8n-workflow';
-import PageViewLayout from '@/components/layouts/PageViewLayout.vue';
 import EventDestinationCard from '@/components/SettingsLogStreaming/EventDestinationCard.ee.vue';
-import { createEventBus } from '@/event-bus';
+import { createEventBus } from 'n8n-design-system/utils';
 
-export default mixins().extend({
+export default defineComponent({
 	name: 'SettingsLogStreamingView',
-	props: {},
 	components: {
-		PageViewLayout,
 		EventDestinationCard,
 	},
+	props: {},
 	data() {
 		return {
 			eventBus: createEventBus(),
 			destinations: Array<MessageEventBusDestinationOptions>,
 			disableLicense: false,
 			allDestinations: [] as MessageEventBusDestinationOptions[],
-			isInstanceOwner: false,
 		};
 	},
 	async mounted() {
 		if (!this.isLicensed) return;
 
-		this.isInstanceOwner = this.usersStore.currentUser?.globalRole?.name === 'owner';
 		// Prepare credentialsStore so modals can pick up credentials
 		await this.credentialsStore.fetchCredentialTypes(false);
 		await this.credentialsStore.fetchAllCredentials();
@@ -138,7 +128,7 @@ export default mixins().extend({
 		// listen to modal closing and remove nodes from store
 		this.eventBus.on('closing', this.onBusClosing);
 	},
-	destroyed() {
+	beforeUnmount() {
 		this.eventBus.off('destinationWasSaved', this.onDestinationWasSaved);
 		this.eventBus.off('remove', this.onRemove);
 		this.eventBus.off('closing', this.onBusClosing);
@@ -149,7 +139,6 @@ export default mixins().extend({
 			useLogStreamingStore,
 			useWorkflowsStore,
 			useUIStore,
-			useUsersStore,
 			useCredentialsStore,
 		),
 		sortedItemKeysByLabel() {
@@ -163,9 +152,12 @@ export default mixins().extend({
 			return process.env.NODE_ENV;
 		},
 		isLicensed(): boolean {
-			if (this.disableLicense === true) return false;
+			if (this.disableLicense) return false;
 			return this.settingsStore.isEnterpriseFeatureEnabled(EnterpriseEditionFeature.LogStreaming);
 		},
+		canManageLogStreaming(): boolean {
+			return hasPermission(['rbac'], { rbac: { scope: 'logStreaming:manage' } });
+		},
 	},
 	methods: {
 		onDestinationWasSaved() {
@@ -196,7 +188,7 @@ export default mixins().extend({
 			this.$forceUpdate();
 		},
 		goToUpgrade() {
-			this.uiStore.goToUpgrade('log-streaming', 'upgrade-log-streaming');
+			void this.uiStore.goToUpgrade('log-streaming', 'upgrade-log-streaming');
 		},
 		storeHasItems(): boolean {
 			return this.logStreamingStore.items && Object.keys(this.logStreamingStore.items).length > 0;
@@ -205,6 +197,7 @@ export default mixins().extend({
 			const newDestination = deepCopy(defaultMessageEventBusDestinationOptions);
 			newDestination.id = uuid();
 			this.logStreamingStore.addDestination(newDestination);
+			await nextTick();
 			this.uiStore.openModalWithData({
 				name: LOG_STREAM_MODAL_KEY,
 				data: {
diff --git a/packages/editor-ui/src/views/SettingsPersonalView.vue b/packages/editor-ui/src/views/SettingsPersonalView.vue
index edc5671d0cced..d2248b39d8179 100644
--- a/packages/editor-ui/src/views/SettingsPersonalView.vue
+++ b/packages/editor-ui/src/views/SettingsPersonalView.vue
@@ -2,52 +2,110 @@
 	<div :class="$style.container" data-test-id="personal-settings-container">
 		<div :class="$style.header">
 			<n8n-heading size="2xlarge">{{
-				$locale.baseText('settings.personal.personalSettings')
+				i18n.baseText('settings.personal.personalSettings')
 			}}</n8n-heading>
-			<div class="ph-no-capture" :class="$style.user">
+			<div :class="$style.user">
 				<span :class="$style.username" data-test-id="current-user-name">
 					<n8n-text color="text-light">{{ currentUser.fullName }}</n8n-text>
 				</span>
 				<n8n-avatar
-					:firstName="currentUser.firstName"
-					:lastName="currentUser.lastName"
+					:first-name="currentUser.firstName"
+					:last-name="currentUser.lastName"
 					size="large"
 				/>
 			</div>
 		</div>
 		<div>
-			<div :class="$style.sectionHeader">
+			<div class="mb-s">
 				<n8n-heading size="large">{{
-					$locale.baseText('settings.personal.basicInformation')
+					i18n.baseText('settings.personal.basicInformation')
 				}}</n8n-heading>
 			</div>
 			<div data-test-id="personal-data-form">
 				<n8n-form-inputs
 					v-if="formInputs"
 					:inputs="formInputs"
-					:eventBus="formBus"
-					@input="onInput"
+					:event-bus="formBus"
+					@update="onInput"
 					@ready="onReadyToSubmit"
 					@submit="onSubmit"
 				/>
 			</div>
 		</div>
-		<div v-if="!signInWithLdap">
-			<div :class="$style.sectionHeader">
-				<n8n-heading size="large">{{ $locale.baseText('settings.personal.security') }}</n8n-heading>
+		<div v-if="isPersonalSecurityEnabled">
+			<div class="mb-s">
+				<n8n-heading size="large">{{ i18n.baseText('settings.personal.security') }}</n8n-heading>
 			</div>
-			<div>
-				<n8n-input-label :label="$locale.baseText('auth.password')">
-					<n8n-link @click="openPasswordModal" data-test-id="change-password-link">{{
-						$locale.baseText('auth.changePassword')
+			<div class="mb-s">
+				<n8n-input-label :label="i18n.baseText('auth.password')">
+					<n8n-link data-test-id="change-password-link" @click="openPasswordModal">{{
+						i18n.baseText('auth.changePassword')
 					}}</n8n-link>
 				</n8n-input-label>
 			</div>
+			<div v-if="isMfaFeatureEnabled" data-test-id="mfa-section">
+				<div class="mb-xs">
+					<n8n-input-label :label="$locale.baseText('settings.personal.mfa.section.title')" />
+					<n8n-text :bold="false" :class="$style.infoText">
+						{{
+							mfaDisabled
+								? $locale.baseText('settings.personal.mfa.button.disabled.infobox')
+								: $locale.baseText('settings.personal.mfa.button.enabled.infobox')
+						}}
+						<n8n-link :to="mfaDocsUrl" size="small" :bold="true">
+							{{ $locale.baseText('generic.learnMore') }}
+						</n8n-link>
+					</n8n-text>
+				</div>
+				<n8n-button
+					v-if="mfaDisabled"
+					:class="$style.button"
+					type="tertiary"
+					:label="$locale.baseText('settings.personal.mfa.button.enabled')"
+					data-test-id="enable-mfa-button"
+					@click="onMfaEnableClick"
+				/>
+				<n8n-button
+					v-else
+					:class="$style.disableMfaButton"
+					type="tertiary"
+					:label="$locale.baseText('settings.personal.mfa.button.disabled')"
+					data-test-id="disable-mfa-button"
+					@click="onMfaDisableClick"
+				/>
+			</div>
+		</div>
+		<div>
+			<div class="mb-s">
+				<n8n-heading size="large">{{
+					i18n.baseText('settings.personal.personalisation')
+				}}</n8n-heading>
+			</div>
+			<div>
+				<n8n-input-label :label="i18n.baseText('settings.personal.theme')">
+					<n8n-select
+						:class="$style.themeSelect"
+						data-test-id="theme-select"
+						size="small"
+						:model-value="currentTheme"
+						filterable
+						@update:model-value="selectTheme"
+					>
+						<n8n-option
+							v-for="item in themeOptions"
+							:key="item.name"
+							:label="$t(item.label)"
+							:value="item.name"
+						>
+						</n8n-option>
+					</n8n-select>
+				</n8n-input-label>
+			</div>
 		</div>
 		<div>
 			<n8n-button
 				float="right"
-				:label="$locale.baseText('settings.personal.save')"
+				:label="i18n.baseText('settings.personal.save')"
 				size="large"
 				:disabled="!hasAnyChanges || !readyToSubmit"
 				data-test-id="save-settings-button"
@@ -58,24 +116,48 @@
 </template>
 
 <script lang="ts">
-import { showMessage } from '@/mixins/showMessage';
-import { CHANGE_PASSWORD_MODAL_KEY, SignInType } from '@/constants';
-import type { IFormInputs, IUser } from '@/Interface';
-import { useUIStore } from '@/stores/ui';
-import { useUsersStore } from '@/stores/users';
-import { useSettingsStore } from '@/stores/settings';
+import { useI18n } from '@/composables/useI18n';
+import { useToast } from '@/composables/useToast';
+import type { IFormInputs, IUser, ThemeOption } from '@/Interface';
+import { CHANGE_PASSWORD_MODAL_KEY, MFA_DOCS_URL, MFA_SETUP_MODAL_KEY } from '@/constants';
+import { useUIStore } from '@/stores/ui.store';
+import { useUsersStore } from '@/stores/users.store';
+import { useSettingsStore } from '@/stores/settings.store';
 import { mapStores } from 'pinia';
-import mixins from 'vue-typed-mixins';
-import { createEventBus } from '@/event-bus';
+import { defineComponent } from 'vue';
+import { createEventBus } from 'n8n-design-system/utils';
 
-export default mixins(showMessage).extend({
+export default defineComponent({
 	name: 'SettingsPersonalView',
+	setup() {
+		const i18n = useI18n();
+
+		return {
+			i18n,
+			...useToast(),
+		};
+	},
 	data() {
 		return {
 			hasAnyChanges: false,
 			formInputs: null as null | IFormInputs,
 			formBus: createEventBus(),
 			readyToSubmit: false,
+			mfaDocsUrl: MFA_DOCS_URL,
+			themeOptions: [
+				{
+					name: 'system',
+					label: 'settings.personal.theme.systemDefault',
+				},
+				{
+					name: 'light',
+					label: 'settings.personal.theme.light',
+				},
+				{
+					name: 'dark',
+					label: 'settings.personal.theme.dark',
+				},
+			] as Array<{ name: ThemeOption; label: string }>,
 		};
 	},
 	mounted() {
@@ -84,37 +166,37 @@ export default mixins(showMessage).extend({
 				name: 'firstName',
 				initialValue: this.currentUser?.firstName,
 				properties: {
-					label: this.$locale.baseText('auth.firstName'),
+					label: this.i18n.baseText('auth.firstName'),
 					maxlength: 32,
 					required: true,
 					autocomplete: 'given-name',
 					capitalize: true,
-					disabled: this.isLDAPFeatureEnabled && this.signInWithLdap,
+					disabled: this.isExternalAuthEnabled,
 				},
 			},
 			{
 				name: 'lastName',
 				initialValue: this.currentUser?.lastName,
 				properties: {
-					label: this.$locale.baseText('auth.lastName'),
+					label: this.i18n.baseText('auth.lastName'),
 					maxlength: 32,
 					required: true,
 					autocomplete: 'family-name',
 					capitalize: true,
-					disabled: this.isLDAPFeatureEnabled && this.signInWithLdap,
+					disabled: this.isExternalAuthEnabled,
 				},
 			},
 			{
 				name: 'email',
 				initialValue: this.currentUser?.email,
 				properties: {
-					label: this.$locale.baseText('auth.email'),
+					label: this.i18n.baseText('auth.email'),
 					type: 'email',
 					required: true,
 					validationRules: [{ name: 'VALID_EMAIL' }],
 					autocomplete: 'email',
 					capitalize: true,
-					disabled: this.isLDAPFeatureEnabled && this.signInWithLdap,
+					disabled: !this.isPersonalSecurityEnabled,
 				},
 			},
 		];
@@ -124,14 +206,30 @@ export default mixins(showMessage).extend({
 		currentUser(): IUser | null {
 			return this.usersStore.currentUser;
 		},
-		signInWithLdap(): boolean {
-			return this.currentUser?.signInType === 'ldap';
+		isExternalAuthEnabled(): boolean {
+			const isLdapEnabled =
+				this.settingsStore.settings.enterprise.ldap && this.currentUser?.signInType === 'ldap';
+			const isSamlEnabled =
+				this.settingsStore.isSamlLoginEnabled && this.settingsStore.isDefaultAuthenticationSaml;
+			return isLdapEnabled || isSamlEnabled;
+		},
+		isPersonalSecurityEnabled(): boolean {
+			return this.usersStore.isInstanceOwner || !this.isExternalAuthEnabled;
 		},
-		isLDAPFeatureEnabled(): boolean {
-			return this.settingsStore.settings.enterprise.ldap === true;
+		mfaDisabled(): boolean {
+			return !this.usersStore.mfaEnabled;
+		},
+		isMfaFeatureEnabled(): boolean {
+			return this.settingsStore.isMfaFeatureEnabled;
+		},
+		currentTheme(): ThemeOption {
+			return this.uiStore.theme;
 		},
 	},
 	methods: {
+		selectTheme(theme: ThemeOption) {
+			this.uiStore.setTheme(theme);
+		},
 		onInput() {
 			this.hasAnyChanges = true;
 		},
@@ -149,14 +247,14 @@ export default mixins(showMessage).extend({
 					lastName: form.lastName,
 					email: form.email,
 				});
-				this.$showToast({
-					title: this.$locale.baseText('settings.personal.personalSettingsUpdated'),
+				this.showToast({
+					title: this.i18n.baseText('settings.personal.personalSettingsUpdated'),
 					message: '',
 					type: 'success',
 				});
 				this.hasAnyChanges = false;
 			} catch (e) {
-				this.$showError(e, this.$locale.baseText('settings.personal.personalSettingsUpdatedError'));
+				this.showError(e, this.i18n.baseText('settings.personal.personalSettingsUpdatedError'));
 			}
 		},
 		onSaveClick() {
@@ -165,6 +263,25 @@ export default mixins(showMessage).extend({
 		openPasswordModal() {
 			this.uiStore.openModal(CHANGE_PASSWORD_MODAL_KEY);
 		},
+		onMfaEnableClick() {
+			this.uiStore.openModal(MFA_SETUP_MODAL_KEY);
+		},
+		async onMfaDisableClick() {
+			try {
+				await this.usersStore.disabledMfa();
+				this.showToast({
+					title: this.$locale.baseText('settings.personal.mfa.toast.disabledMfa.title'),
+					message: this.$locale.baseText('settings.personal.mfa.toast.disabledMfa.message'),
+					type: 'success',
+					duration: 0,
+				});
+			} catch (e) {
+				this.showError(
+					e,
+					this.$locale.baseText('settings.personal.mfa.toast.disabledMfa.error.message'),
+				);
+			}
+		},
 	},
 });
 </script>
@@ -181,7 +298,6 @@ export default mixins(showMessage).extend({
 	display: flex;
 	align-items: center;
 	white-space: nowrap;
-
 	*:first-child {
 		flex-grow: 1;
 	}
@@ -207,7 +323,26 @@ export default mixins(showMessage).extend({
 	}
 }
 
-.sectionHeader {
-	margin-bottom: var(--spacing-s);
+.disableMfaButton {
+	--button-color: var(--color-danger);
+	> span {
+		font-weight: var(--font-weight-bold);
+	}
+}
+
+.button {
+	font-size: var(--spacing-xs);
+	> span {
+		font-weight: var(--font-weight-bold);
+	}
+}
+
+.infoText {
+	font-size: var(--font-size-2xs);
+	color: var(--color-text-light);
+}
+
+.themeSelect {
+	max-width: 50%;
 }
 </style>
diff --git a/packages/editor-ui/src/views/SettingsSourceControl.vue b/packages/editor-ui/src/views/SettingsSourceControl.vue
new file mode 100644
index 0000000000000..89d0156407e2f
--- /dev/null
+++ b/packages/editor-ui/src/views/SettingsSourceControl.vue
@@ -0,0 +1,485 @@
+<script lang="ts" setup>
+import { computed, reactive, ref, onMounted } from 'vue';
+import type { Rule, RuleGroup } from 'n8n-design-system/types';
+import { MODAL_CONFIRM } from '@/constants';
+import { useSourceControlStore } from '@/stores/sourceControl.store';
+import { useUIStore } from '@/stores/ui.store';
+import { useToast } from '@/composables/useToast';
+import { useLoadingService } from '@/composables/useLoadingService';
+import { useI18n } from '@/composables/useI18n';
+import { useMessage } from '@/composables/useMessage';
+import CopyInput from '@/components/CopyInput.vue';
+import type { TupleToUnion } from '@/utils/typeHelpers';
+import type { SshKeyTypes } from '@/Interface';
+
+const locale = useI18n();
+const sourceControlStore = useSourceControlStore();
+const uiStore = useUIStore();
+const toast = useToast();
+const message = useMessage();
+const loadingService = useLoadingService();
+
+const isConnected = ref(false);
+const branchNameOptions = computed(() =>
+	sourceControlStore.preferences.branches.map((branch) => ({
+		value: branch,
+		label: branch,
+	})),
+);
+
+const onConnect = async () => {
+	loadingService.startLoading();
+	loadingService.setLoadingText(locale.baseText('settings.sourceControl.loading.connecting'));
+	try {
+		await sourceControlStore.savePreferences({
+			repositoryUrl: sourceControlStore.preferences.repositoryUrl,
+		});
+		await sourceControlStore.getBranches();
+		isConnected.value = true;
+		toast.showMessage({
+			title: locale.baseText('settings.sourceControl.toast.connected.title'),
+			message: locale.baseText('settings.sourceControl.toast.connected.message'),
+			type: 'success',
+		});
+	} catch (error) {
+		toast.showError(error, locale.baseText('settings.sourceControl.toast.connected.error'));
+	}
+	loadingService.stopLoading();
+};
+
+const onDisconnect = async () => {
+	try {
+		const confirmation = await message.confirm(
+			locale.baseText('settings.sourceControl.modals.disconnect.message'),
+			locale.baseText('settings.sourceControl.modals.disconnect.title'),
+			{
+				confirmButtonText: locale.baseText('settings.sourceControl.modals.disconnect.confirm'),
+				cancelButtonText: locale.baseText('settings.sourceControl.modals.disconnect.cancel'),
+			},
+		);
+
+		if (confirmation === MODAL_CONFIRM) {
+			loadingService.startLoading();
+			await sourceControlStore.disconnect(true);
+			isConnected.value = false;
+			toast.showMessage({
+				title: locale.baseText('settings.sourceControl.toast.disconnected.title'),
+				message: locale.baseText('settings.sourceControl.toast.disconnected.message'),
+				type: 'success',
+			});
+		}
+	} catch (error) {
+		toast.showError(error, locale.baseText('settings.sourceControl.toast.disconnected.error'));
+	}
+	loadingService.stopLoading();
+};
+
+const onSave = async () => {
+	loadingService.startLoading();
+	try {
+		await sourceControlStore.updatePreferences({
+			branchName: sourceControlStore.preferences.branchName,
+			branchReadOnly: sourceControlStore.preferences.branchReadOnly,
+			branchColor: sourceControlStore.preferences.branchColor,
+		});
+		toast.showMessage({
+			title: locale.baseText('settings.sourceControl.saved.title'),
+			type: 'success',
+		});
+	} catch (error) {
+		toast.showError(error, 'Error setting branch');
+	}
+	loadingService.stopLoading();
+};
+
+const onSelect = async (b: string) => {
+	if (b === sourceControlStore.preferences.branchName) {
+		return;
+	}
+	sourceControlStore.preferences.branchName = b;
+};
+
+const goToUpgrade = () => {
+	void uiStore.goToUpgrade('source-control', 'upgrade-source-control');
+};
+
+const initialize = async () => {
+	await sourceControlStore.getPreferences();
+	if (sourceControlStore.preferences.connected) {
+		isConnected.value = true;
+		void sourceControlStore.getBranches();
+	}
+};
+
+onMounted(async () => {
+	if (!sourceControlStore.isEnterpriseSourceControlEnabled) return;
+	await initialize();
+});
+
+const formValidationStatus = reactive<Record<string, boolean>>({
+	repoUrl: false,
+	keyGeneratorType: false,
+});
+
+function onValidate(key: string, value: boolean) {
+	formValidationStatus[key] = value;
+}
+
+const repoUrlValidationRules: Array<Rule | RuleGroup> = [
+	{ name: 'REQUIRED' },
+	{
+		name: 'MATCH_REGEX',
+		config: {
+			regex:
+				/^(ssh:\/\/)?git@(?:\[[0-9a-fA-F:]+\]|(?:[a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+)(?::[0-9]+)*:(?:v[0-9]+\/)?[a-zA-Z0-9_.\-\/]+(\.git)?(?:\/[a-zA-Z0-9_.\-\/]+)*$/,
+			message: locale.baseText('settings.sourceControl.repoUrlInvalid'),
+		},
+	},
+];
+
+const keyGeneratorTypeValidationRules: Array<Rule | RuleGroup> = [{ name: 'REQUIRED' }];
+
+const validForConnection = computed(() => formValidationStatus.repoUrl);
+const branchNameValidationRules: Array<Rule | RuleGroup> = [{ name: 'REQUIRED' }];
+
+async function refreshSshKey() {
+	try {
+		const confirmation = await message.confirm(
+			locale.baseText('settings.sourceControl.modals.refreshSshKey.message'),
+			locale.baseText('settings.sourceControl.modals.refreshSshKey.title'),
+			{
+				confirmButtonText: locale.baseText('settings.sourceControl.modals.refreshSshKey.confirm'),
+				cancelButtonText: locale.baseText('settings.sourceControl.modals.refreshSshKey.cancel'),
+			},
+		);
+
+		if (confirmation === MODAL_CONFIRM) {
+			await sourceControlStore.generateKeyPair(sourceControlStore.preferences.keyGeneratorType);
+			toast.showMessage({
+				title: locale.baseText('settings.sourceControl.refreshSshKey.successful.title'),
+				type: 'success',
+			});
+		}
+	} catch (error) {
+		toast.showError(error, locale.baseText('settings.sourceControl.refreshSshKey.error.title'));
+	}
+}
+
+const refreshBranches = async () => {
+	try {
+		await sourceControlStore.getBranches();
+		toast.showMessage({
+			title: locale.baseText('settings.sourceControl.refreshBranches.success'),
+			type: 'success',
+		});
+	} catch (error) {
+		toast.showError(error, locale.baseText('settings.sourceControl.refreshBranches.error'));
+	}
+};
+
+const onSelectSshKeyType = async (sshKeyType: TupleToUnion<SshKeyTypes>) => {
+	if (sshKeyType === sourceControlStore.preferences.keyGeneratorType) {
+		return;
+	}
+	sourceControlStore.preferences.keyGeneratorType = sshKeyType;
+};
+</script>
+
+<template>
+	<div>
+		<n8n-heading size="2xlarge" tag="h1">{{
+			locale.baseText('settings.sourceControl.title')
+		}}</n8n-heading>
+		<div
+			v-if="sourceControlStore.isEnterpriseSourceControlEnabled"
+			data-test-id="source-control-content-licensed"
+		>
+			<n8n-callout theme="secondary" icon="info-circle" class="mt-2xl mb-l">
+				<i18n-t keypath="settings.sourceControl.description" tag="span">
+					<template #link>
+						<a :href="locale.baseText('settings.sourceControl.docs.url')" target="_blank">
+							{{ locale.baseText('settings.sourceControl.description.link') }}
+						</a>
+					</template>
+				</i18n-t>
+			</n8n-callout>
+			<n8n-heading size="xlarge" tag="h2" class="mb-s">{{
+				locale.baseText('settings.sourceControl.gitConfig')
+			}}</n8n-heading>
+			<div :class="$style.group">
+				<label for="repoUrl">{{ locale.baseText('settings.sourceControl.repoUrl') }}</label>
+				<div :class="$style.groupFlex">
+					<n8n-form-input
+						id="repoUrl"
+						v-model="sourceControlStore.preferences.repositoryUrl"
+						label
+						class="ml-0"
+						name="repoUrl"
+						validate-on-blur
+						:validation-rules="repoUrlValidationRules"
+						:disabled="isConnected"
+						:placeholder="locale.baseText('settings.sourceControl.repoUrlPlaceholder')"
+						@validate="(value) => onValidate('repoUrl', value)"
+					/>
+					<n8n-button
+						v-if="isConnected"
+						:class="$style.disconnectButton"
+						type="tertiary"
+						size="large"
+						icon="trash"
+						data-test-id="source-control-disconnect-button"
+						@click="onDisconnect"
+						>{{ locale.baseText('settings.sourceControl.button.disconnect') }}</n8n-button
+					>
+				</div>
+			</div>
+			<div v-if="sourceControlStore.preferences.publicKey" :class="$style.group">
+				<label>{{ locale.baseText('settings.sourceControl.sshKey') }}</label>
+				<div :class="{ [$style.sshInput]: !isConnected }">
+					<n8n-form-input
+						v-if="!isConnected"
+						id="keyGeneratorType"
+						:class="$style.sshKeyTypeSelect"
+						label
+						type="select"
+						name="keyGeneratorType"
+						data-test-id="source-control-ssh-key-type-select"
+						validate-on-blur
+						:validation-rules="keyGeneratorTypeValidationRules"
+						:options="sourceControlStore.sshKeyTypesWithLabel"
+						:model-value="sourceControlStore.preferences.keyGeneratorType"
+						@validate="(value) => onValidate('keyGeneratorType', value)"
+						@update:model-value="onSelectSshKeyType"
+					/>
+					<CopyInput
+						:class="$style.copyInput"
+						collapse
+						size="medium"
+						:value="sourceControlStore.preferences.publicKey"
+						:copy-button-text="locale.baseText('generic.clickToCopy')"
+					/>
+					<n8n-button
+						v-if="!isConnected"
+						size="large"
+						type="tertiary"
+						icon="sync"
+						data-test-id="source-control-refresh-ssh-key-button"
+						@click="refreshSshKey"
+					>
+						{{ locale.baseText('settings.sourceControl.refreshSshKey') }}
+					</n8n-button>
+				</div>
+				<n8n-notice type="info" class="mt-s">
+					<i18n-t keypath="settings.sourceControl.sshKeyDescription" tag="span">
+						<template #link>
+							<a
+								:href="locale.baseText('settings.sourceControl.docs.setup.ssh.url')"
+								target="_blank"
+								>{{ locale.baseText('settings.sourceControl.sshKeyDescriptionLink') }}</a
+							>
+						</template>
+					</i18n-t>
+				</n8n-notice>
+			</div>
+			<n8n-button
+				v-if="!isConnected"
+				size="large"
+				:disabled="!validForConnection"
+				:class="$style.connect"
+				data-test-id="source-control-connect-button"
+				@click="onConnect"
+				>{{ locale.baseText('settings.sourceControl.button.connect') }}</n8n-button
+			>
+			<div v-if="isConnected" data-test-id="source-control-connected-content">
+				<div :class="$style.group">
+					<hr />
+					<n8n-heading size="xlarge" tag="h2" class="mb-s">{{
+						locale.baseText('settings.sourceControl.instanceSettings')
+					}}</n8n-heading>
+					<label>{{ locale.baseText('settings.sourceControl.branches') }}</label>
+					<div :class="$style.branchSelection">
+						<n8n-form-input
+							id="branchName"
+							label
+							type="select"
+							name="branchName"
+							class="mb-s"
+							data-test-id="source-control-branch-select"
+							validate-on-blur
+							:validation-rules="branchNameValidationRules"
+							:options="branchNameOptions"
+							:model-value="sourceControlStore.preferences.branchName"
+							@validate="(value) => onValidate('branchName', value)"
+							@update:model-value="onSelect"
+						/>
+						<n8n-tooltip placement="top">
+							<template #content>
+								<span>
+									{{ locale.baseText('settings.sourceControl.refreshBranches.tooltip') }}
+								</span>
+							</template>
+							<n8n-button
+								size="small"
+								type="tertiary"
+								icon="sync"
+								square
+								:class="$style.refreshBranches"
+								data-test-id="source-control-refresh-branches-button"
+								@click="refreshBranches"
+							/>
+						</n8n-tooltip>
+					</div>
+					<n8n-checkbox
+						v-model="sourceControlStore.preferences.branchReadOnly"
+						:class="$style.readOnly"
+					>
+						<i18n-t keypath="settings.sourceControl.protected" tag="span">
+							<template #bold>
+								<strong>{{ locale.baseText('settings.sourceControl.protected.bold') }}</strong>
+							</template>
+						</i18n-t>
+					</n8n-checkbox>
+				</div>
+				<div :class="$style.group">
+					<label>{{ locale.baseText('settings.sourceControl.color') }}</label>
+					<div>
+						<n8n-color-picker v-model="sourceControlStore.preferences.branchColor" size="small" />
+					</div>
+				</div>
+				<div :class="[$style.group, 'pt-s']">
+					<n8n-button
+						size="large"
+						:disabled="!sourceControlStore.preferences.branchName"
+						data-test-id="source-control-save-settings-button"
+						@click="onSave"
+						>{{ locale.baseText('settings.sourceControl.button.save') }}</n8n-button
+					>
+				</div>
+			</div>
+		</div>
+		<n8n-action-box
+			v-else
+			data-test-id="source-control-content-unlicensed"
+			:class="$style.actionBox"
+			:description="locale.baseText('settings.sourceControl.actionBox.description')"
+			:button-text="locale.baseText('settings.sourceControl.actionBox.buttonText')"
+			@click:button="goToUpgrade"
+		>
+			<template #heading>
+				<span>{{ locale.baseText('settings.sourceControl.actionBox.title') }}</span>
+			</template>
+			<template #description>
+				{{ locale.baseText('settings.sourceControl.actionBox.description') }}
+				<a :href="locale.baseText('settings.sourceControl.docs.url')" target="_blank">
+					{{ locale.baseText('settings.sourceControl.actionBox.description.link') }}
+				</a>
+			</template>
+		</n8n-action-box>
+	</div>
+</template>
+
+<style lang="scss" module>
+.group {
+	padding: 0 0 var(--spacing-s);
+	width: 100%;
+	display: block;
+
+	hr {
+		margin: 0 0 var(--spacing-xl);
+		border: 1px solid var(--color-foreground-light);
+	}
+
+	label {
+		display: inline-block;
+		padding: 0 0 var(--spacing-2xs);
+		font-size: var(--font-size-s);
+	}
+
+	small {
+		display: inline-block;
+		padding: var(--spacing-2xs) 0 0;
+		font-size: var(--font-size-2xs);
+		color: var(--color-text-light);
+	}
+}
+
+.readOnly {
+	span {
+		font-size: var(--font-size-s) !important;
+	}
+}
+
+.groupFlex {
+	display: flex;
+	align-items: flex-start;
+
+	> div {
+		flex: 1;
+
+		&:last-child {
+			margin-left: var(--spacing-2xs);
+		}
+	}
+
+	input {
+		width: 100%;
+	}
+}
+
+.connect {
+	margin: calc(var(--spacing-2xs) * -1) 0 var(--spacing-2xs);
+}
+
+.disconnectButton {
+	margin: 0 0 0 var(--spacing-2xs);
+	height: 40px;
+}
+
+.actionBox {
+	margin: var(--spacing-2xl) 0 0;
+}
+
+.sshInput {
+	width: 100%;
+	display: flex;
+	align-items: center;
+
+	> div {
+		flex: 1 1 auto;
+	}
+
+	> button {
+		height: 42px;
+	}
+
+	.copyInput {
+		margin: 0 var(--spacing-2xs);
+	}
+}
+
+.sshKeyTypeSelect {
+	min-width: 120px;
+}
+
+.copyInput {
+	overflow: auto;
+}
+
+.branchSelection {
+	display: flex;
+
+	> div:first-child {
+		flex: 1;
+
+		input {
+			height: 36px;
+		}
+	}
+
+	button.refreshBranches {
+		height: 36px;
+		width: 36px;
+		margin-left: var(--spacing-xs);
+	}
+}
+</style>
diff --git a/packages/editor-ui/src/views/SettingsSso.vue b/packages/editor-ui/src/views/SettingsSso.vue
index 0b9af1285caaf..674499944fba5 100644
--- a/packages/editor-ui/src/views/SettingsSso.vue
+++ b/packages/editor-ui/src/views/SettingsSso.vue
@@ -1,87 +1,163 @@
 <script lang="ts" setup>
-import { computed, ref, onBeforeMount } from 'vue';
-import { Notification } from 'element-ui';
-import { useSSOStore } from '@/stores/sso';
-import { useUIStore } from '@/stores/ui';
-import { i18n as locale } from '@/plugins/i18n';
+import { computed, ref, onMounted } from 'vue';
+import { useSSOStore } from '@/stores/sso.store';
+import { useUIStore } from '@/stores/ui.store';
 import CopyInput from '@/components/CopyInput.vue';
+import { useI18n } from '@/composables/useI18n';
+import { useMessage } from '@/composables/useMessage';
+import { useToast } from '@/composables/useToast';
+import { useTelemetry } from '@/composables/useTelemetry';
+import { useRootStore } from '@/stores/n8nRoot.store';
 
+const IdentityProviderSettingsType = {
+	URL: 'url',
+	XML: 'xml',
+};
+
+const i18n = useI18n();
+const telemetry = useTelemetry();
+const rootStore = useRootStore();
 const ssoStore = useSSOStore();
 const uiStore = useUIStore();
+const message = useMessage();
+const toast = useToast();
 
 const ssoActivatedLabel = computed(() =>
 	ssoStore.isSamlLoginEnabled
-		? locale.baseText('settings.sso.activated')
-		: locale.baseText('settings.sso.deactivated'),
+		? i18n.baseText('settings.sso.activated')
+		: i18n.baseText('settings.sso.deactivated'),
 );
 const ssoSettingsSaved = ref(false);
-const metadata = ref();
+
 const redirectUrl = ref();
 const entityId = ref();
 
+const ipsOptions = ref([
+	{
+		label: i18n.baseText('settings.sso.settings.ips.options.url'),
+		value: IdentityProviderSettingsType.URL,
+	},
+	{
+		label: i18n.baseText('settings.sso.settings.ips.options.xml'),
+		value: IdentityProviderSettingsType.XML,
+	},
+]);
+const ipsType = ref(IdentityProviderSettingsType.URL);
+
+const metadataUrl = ref();
+const metadata = ref();
+
+const isSaveEnabled = computed(() => {
+	if (ipsType.value === IdentityProviderSettingsType.URL) {
+		return !!metadataUrl.value && metadataUrl.value !== ssoStore.samlConfig?.metadataUrl;
+	} else if (ipsType.value === IdentityProviderSettingsType.XML) {
+		return !!metadata.value && metadata.value !== ssoStore.samlConfig?.metadata;
+	}
+	return false;
+});
+
+const isTestEnabled = computed(() => {
+	if (ipsType.value === IdentityProviderSettingsType.URL) {
+		return !!metadataUrl.value && ssoSettingsSaved.value;
+	} else if (ipsType.value === IdentityProviderSettingsType.XML) {
+		return !!metadata.value && ssoSettingsSaved.value;
+	}
+	return false;
+});
+
 const getSamlConfig = async () => {
 	const config = await ssoStore.getSamlConfig();
+
 	entityId.value = config?.entityID;
 	redirectUrl.value = config?.returnUrl;
+
+	if (config?.metadataUrl) {
+		ipsType.value = IdentityProviderSettingsType.URL;
+	} else if (config?.metadata) {
+		ipsType.value = IdentityProviderSettingsType.XML;
+	}
+
 	metadata.value = config?.metadata;
+	metadataUrl.value = config?.metadataUrl;
 	ssoSettingsSaved.value = !!config?.metadata;
 };
 
 const onSave = async () => {
 	try {
-		await ssoStore.saveSamlConfig({ metadata: metadata.value });
-		await getSamlConfig();
-	} catch (error) {
-		Notification.error({
-			title: 'Error',
-			message: error.message,
-			position: 'bottom-right',
+		const config =
+			ipsType.value === IdentityProviderSettingsType.URL
+				? { metadataUrl: metadataUrl.value }
+				: { metadata: metadata.value };
+		await ssoStore.saveSamlConfig(config);
+
+		if (!ssoStore.isSamlLoginEnabled) {
+			const answer = await message.confirm(
+				i18n.baseText('settings.sso.settings.save.activate.message'),
+				i18n.baseText('settings.sso.settings.save.activate.title'),
+				{
+					confirmButtonText: i18n.baseText('settings.sso.settings.save.activate.test'),
+					cancelButtonText: i18n.baseText('settings.sso.settings.save.activate.cancel'),
+				},
+			);
+
+			if (answer === 'confirm') {
+				await onTest();
+			}
+		}
+
+		telemetry.track('User updated single sign on settings', {
+			instance_id: rootStore.instanceId,
+			identity_provider: ipsType.value === 'url' ? 'metadata' : 'xml',
+			is_active: ssoStore.isSamlLoginEnabled,
 		});
+	} catch (error) {
+		toast.showError(error, i18n.baseText('settings.sso.settings.save.error'));
+		return;
+	} finally {
+		await getSamlConfig();
 	}
 };
 
 const onTest = async () => {
 	try {
 		const url = await ssoStore.testSamlConfig();
-		window.open(url, '_blank');
+
+		if (typeof window !== 'undefined') {
+			window.open(url, '_blank');
+		}
 	} catch (error) {
-		Notification.error({
-			title: 'Error',
-			message: error.message,
-			position: 'bottom-right',
-		});
+		toast.showError(error, 'error');
 	}
 };
 
 const goToUpgrade = () => {
-	uiStore.goToUpgrade('sso', 'upgrade-sso');
+	void uiStore.goToUpgrade('sso', 'upgrade-sso');
 };
 
-onBeforeMount(async () => {
+onMounted(async () => {
 	if (!ssoStore.isEnterpriseSamlEnabled) {
 		return;
 	}
 	try {
 		await getSamlConfig();
 	} catch (error) {
-		Notification.error({
-			title: 'Error',
-			message: error.message,
-			position: 'bottom-right',
-		});
+		toast.showError(error, 'error');
 	}
 });
 </script>
 
 <template>
-	<div>
-		<n8n-heading size="2xlarge">{{ locale.baseText('settings.sso.title') }}</n8n-heading>
+	<div class="pb-3xl">
+		<n8n-heading size="2xlarge">{{ i18n.baseText('settings.sso.title') }}</n8n-heading>
 		<div :class="$style.top">
-			<n8n-heading size="medium">{{ locale.baseText('settings.sso.subtitle') }}</n8n-heading>
-			<n8n-tooltip v-if="ssoStore.isEnterpriseSamlEnabled" :disabled="ssoStore.isSamlLoginEnabled">
+			<n8n-heading size="xlarge">{{ i18n.baseText('settings.sso.subtitle') }}</n8n-heading>
+			<n8n-tooltip
+				v-if="ssoStore.isEnterpriseSamlEnabled"
+				:disabled="ssoStore.isSamlLoginEnabled || ssoSettingsSaved"
+			>
 				<template #content>
 					<span>
-						{{ locale.baseText('settings.sso.activation.tooltip') }}
+						{{ i18n.baseText('settings.sso.activation.tooltip') }}
 					</span>
 				</template>
 				<el-switch
@@ -93,62 +169,78 @@ onBeforeMount(async () => {
 			</n8n-tooltip>
 		</div>
 		<n8n-info-tip>
-			<i18n path="settings.sso.info">
-				<template #link>
-					<a href="https://docs.n8n.io/user-management/saml/" target="_blank">
-						{{ locale.baseText('settings.sso.info.link') }}
-					</a>
-				</template>
-			</i18n>
+			{{ i18n.baseText('settings.sso.info') }}
+			<a href="https://docs.n8n.io/user-management/saml/" target="_blank">
+				{{ i18n.baseText('settings.sso.info.link') }}
+			</a>
 		</n8n-info-tip>
 		<div v-if="ssoStore.isEnterpriseSamlEnabled" data-test-id="sso-content-licensed">
 			<div :class="$style.group">
-				<label>{{ locale.baseText('settings.sso.settings.redirectUrl.label') }}</label>
+				<label>{{ i18n.baseText('settings.sso.settings.redirectUrl.label') }}</label>
 				<CopyInput
 					:value="redirectUrl"
-					:copy-button-text="locale.baseText('generic.clickToCopy')"
-					:toast-title="locale.baseText('settings.sso.settings.redirectUrl.copied')"
+					:copy-button-text="i18n.baseText('generic.clickToCopy')"
+					:toast-title="i18n.baseText('settings.sso.settings.redirectUrl.copied')"
 				/>
-				<small>{{ locale.baseText('settings.sso.settings.redirectUrl.help') }}</small>
+				<small>{{ i18n.baseText('settings.sso.settings.redirectUrl.help') }}</small>
 			</div>
 			<div :class="$style.group">
-				<label>{{ locale.baseText('settings.sso.settings.entityId.label') }}</label>
+				<label>{{ i18n.baseText('settings.sso.settings.entityId.label') }}</label>
 				<CopyInput
 					:value="entityId"
-					:copy-button-text="locale.baseText('generic.clickToCopy')"
-					:toast-title="locale.baseText('settings.sso.settings.entityId.copied')"
+					:copy-button-text="i18n.baseText('generic.clickToCopy')"
+					:toast-title="i18n.baseText('settings.sso.settings.entityId.copied')"
 				/>
-				<small>{{ locale.baseText('settings.sso.settings.entityId.help') }}</small>
+				<small>{{ i18n.baseText('settings.sso.settings.entityId.help') }}</small>
 			</div>
 			<div :class="$style.group">
-				<label>{{ locale.baseText('settings.sso.settings.ips.label') }}</label>
-				<n8n-input v-model="metadata" type="textarea" name="metadata" />
-				<small>{{ locale.baseText('settings.sso.settings.ips.help') }}</small>
+				<label>{{ i18n.baseText('settings.sso.settings.ips.label') }}</label>
+				<div class="mt-2xs mb-s">
+					<n8n-radio-buttons v-model="ipsType" :options="ipsOptions" />
+				</div>
+				<div v-show="ipsType === IdentityProviderSettingsType.URL">
+					<n8n-input
+						v-model="metadataUrl"
+						type="text"
+						name="metadataUrl"
+						size="large"
+						:placeholder="i18n.baseText('settings.sso.settings.ips.url.placeholder')"
+					/>
+					<small>{{ i18n.baseText('settings.sso.settings.ips.url.help') }}</small>
+				</div>
+				<div v-show="ipsType === IdentityProviderSettingsType.XML">
+					<n8n-input v-model="metadata" type="textarea" name="metadata" :rows="4" />
+					<small>{{ i18n.baseText('settings.sso.settings.ips.xml.help') }}</small>
+				</div>
 			</div>
 			<div :class="$style.buttons">
+				<n8n-button :disabled="!isSaveEnabled" size="large" data-test-id="sso-save" @click="onSave">
+					{{ i18n.baseText('settings.sso.settings.save') }}
+				</n8n-button>
 				<n8n-button
-					:disabled="!ssoSettingsSaved"
+					:disabled="!isTestEnabled"
+					size="large"
 					type="tertiary"
-					@click="onTest"
 					data-test-id="sso-test"
+					@click="onTest"
 				>
-					{{ locale.baseText('settings.sso.settings.test') }}
-				</n8n-button>
-				<n8n-button :disabled="!metadata" @click="onSave" data-test-id="sso-save">
-					{{ locale.baseText('settings.sso.settings.save') }}
+					{{ i18n.baseText('settings.sso.settings.test') }}
 				</n8n-button>
 			</div>
+			<footer :class="$style.footer">
+				{{ i18n.baseText('settings.sso.settings.footer.hint') }}
+			</footer>
 		</div>
 		<n8n-action-box
 			v-else
 			data-test-id="sso-content-unlicensed"
 			:class="$style.actionBox"
-			:description="locale.baseText('settings.sso.actionBox.description')"
-			:buttonText="locale.baseText('settings.sso.actionBox.buttonText')"
-			@click="goToUpgrade"
+			:description="i18n.baseText('settings.sso.actionBox.description')"
+			:button-text="i18n.baseText('settings.sso.actionBox.buttonText')"
+			@click:button="goToUpgrade"
 		>
 			<template #heading>
-				<span>{{ locale.baseText('settings.sso.actionBox.title') }}</span>
+				<span>{{ i18n.baseText('settings.sso.actionBox.title') }}</span>
 			</template>
 		</n8n-action-box>
 	</div>
@@ -173,7 +265,7 @@ onBeforeMount(async () => {
 .buttons {
 	display: flex;
 	justify-content: flex-start;
-	padding: var(--spacing-2xl) 0 var(--spacing-3xl);
+	padding: var(--spacing-2xl) 0 var(--spacing-2xs);
 
 	button {
 		margin: 0 var(--spacing-s) 0 0;
@@ -183,7 +275,7 @@ onBeforeMount(async () => {
 .group {
 	padding: var(--spacing-xl) 0 0;
 
-	label {
+	> label {
 		display: inline-block;
 		font-size: var(--font-size-s);
 		font-weight: var(--font-weight-bold);
@@ -201,4 +293,9 @@ onBeforeMount(async () => {
 .actionBox {
 	margin: var(--spacing-2xl) 0 0;
 }
+
+.footer {
+	color: var(--color-text-base);
+	font-size: var(--font-size-2xs);
+}
 </style>
diff --git a/packages/editor-ui/src/views/SettingsUsageAndPlan.vue b/packages/editor-ui/src/views/SettingsUsageAndPlan.vue
index 5623e48fa4c4f..2495d1fd29550 100644
--- a/packages/editor-ui/src/views/SettingsUsageAndPlan.vue
+++ b/packages/editor-ui/src/views/SettingsUsageAndPlan.vue
@@ -1,16 +1,20 @@
 <script lang="ts" setup>
 import { computed, onMounted, ref } from 'vue';
-import { useRoute, useRouter } from 'vue-router/composables';
-import { Notification } from 'element-ui';
-import type { UsageTelemetry } from '@/stores/usage';
-import { useUsageStore } from '@/stores/usage';
+import { useRoute, useRouter } from 'vue-router';
+import type { UsageTelemetry } from '@/stores/usage.store';
+import { useUsageStore } from '@/stores/usage.store';
 import { telemetry } from '@/plugins/telemetry';
 import { i18n as locale } from '@/plugins/i18n';
+import { useUIStore } from '@/stores/ui.store';
 import { N8N_PRICING_PAGE_URL } from '@/constants';
+import { useToast } from '@/composables/useToast';
+import { hasPermission } from '@/rbac/permissions';
 
 const usageStore = useUsageStore();
 const route = useRoute();
 const router = useRouter();
+const uiStore = useUIStore();
+const toast = useToast();
 
 const queryParamCallback = ref<string>(
 	`callback=${encodeURIComponent(`${window.location.origin}${window.location.pathname}`)}`,
@@ -23,8 +27,13 @@ const activationKeyModal = ref(false);
 const activationKey = ref('');
 const activationKeyInput = ref<HTMLInputElement | null>(null);
 
+const canUserActivateLicense = computed(() =>
+	hasPermission(['rbac'], { rbac: { scope: 'license:manage' } }),
+);
+
 const showActivationSuccess = () => {
-	Notification.success({
+	toast.showMessage({
+		type: 'success',
 		title: locale.baseText('settings.usageAndPlan.license.activation.success.title'),
 		message: locale.baseText('settings.usageAndPlan.license.activation.success.message', {
 			interpolate: {
@@ -34,16 +43,15 @@ const showActivationSuccess = () => {
 					: locale.baseText('settings.usageAndPlan.edition'),
 			},
 		}),
-		position: 'bottom-right',
 	});
 };
 
 const showActivationError = (error: Error) => {
-	Notification.error({
-		title: locale.baseText('settings.usageAndPlan.license.activation.error.title'),
-		message: error.message,
-		position: 'bottom-right',
-	});
+	toast.showError(
+		error,
+		locale.baseText('settings.usageAndPlan.license.activation.error.title'),
+		error.message,
+	);
 };
 
 const onLicenseActivation = async () => {
@@ -74,7 +82,7 @@ onMounted(async () => {
 		}
 	}
 	try {
-		if (!route.query.key && usageStore.canUserActivateLicense) {
+		if (!route.query.key && canUserActivateLicense.value) {
 			await usageStore.refreshLicenseManagementToken();
 		} else {
 			await usageStore.getLicenseInfo();
@@ -84,11 +92,7 @@ onMounted(async () => {
 		if (!error.name) {
 			error.name = locale.baseText('settings.usageAndPlan.error');
 		}
-		Notification.error({
-			title: error.name,
-			message: error.message,
-			position: 'bottom-right',
-		});
+		toast.showError(error, error.name, error.message);
 	}
 });
 
@@ -104,6 +108,7 @@ const onAddActivationKey = () => {
 };
 
 const onViewPlans = () => {
+	void uiStore.goToUpgrade('usage_page', 'open');
 	sendUsageTelemetry('view_plans');
 };
 
@@ -126,19 +131,19 @@ const openPricingPage = () => {
 </script>
 
 <template>
-	<div>
+	<div class="settings-usage-and-plan">
 		<n8n-heading size="2xlarge">{{ locale.baseText('settings.usageAndPlan.title') }}</n8n-heading>
 		<n8n-action-box
 			v-if="usageStore.isDesktop"
 			:class="$style.actionBox"
 			:heading="locale.baseText('settings.usageAndPlan.desktop.title')"
 			:description="locale.baseText('settings.usageAndPlan.desktop.description')"
-			:buttonText="locale.baseText('settings.usageAndPlan.button.plans')"
-			@click="openPricingPage"
+			:button-text="locale.baseText('settings.usageAndPlan.button.plans')"
+			@click:button="openPricingPage"
 		/>
 		<div v-if="!usageStore.isDesktop && !usageStore.isLoading">
 			<n8n-heading :class="$style.title" size="large">
-				<i18n path="settings.usageAndPlan.description">
+				<i18n-t keypath="settings.usageAndPlan.description" tag="span">
 					<template #name>{{ usageStore.planName }}</template>
 					<template #type>
 						<span v-if="usageStore.planId">{{
@@ -146,7 +151,7 @@ const openPricingPage = () => {
 						}}</span>
 						<span v-else>{{ locale.baseText('settings.usageAndPlan.edition') }}</span>
 					</template>
-				</i18n>
+				</i18n-t>
 			</n8n-heading>
 
 			<div :class="$style.quota">
@@ -160,7 +165,11 @@ const openPricingPage = () => {
 							:style="{ width: `${usageStore.executionPercentage}%` }"
 						></span>
 					</span>
-					<i18n :class="$style.count" path="settings.usageAndPlan.activeWorkflows.count">
+					<i18n-t
+						tag="span"
+						:class="$style.count"
+						keypath="settings.usageAndPlan.activeWorkflows.count"
+					>
 						<template #count>{{ usageStore.executionCount }}</template>
 						<template #limit>
 							<span v-if="usageStore.executionLimit < 0">{{
@@ -168,7 +177,7 @@ const openPricingPage = () => {
 							}}</span>
 							<span v-else>{{ usageStore.executionLimit }}</span>
 						</template>
-					</i18n>
+					</i18n-t>
 				</div>
 			</div>
 
@@ -178,20 +187,20 @@ const openPricingPage = () => {
 
 			<div :class="$style.buttons">
 				<n8n-button
+					v-if="canUserActivateLicense"
 					:class="$style.buttonTertiary"
-					@click="onAddActivationKey"
-					v-if="usageStore.canUserActivateLicense"
 					type="tertiary"
 					size="large"
+					@click="onAddActivationKey"
 				>
-					<strong>{{ locale.baseText('settings.usageAndPlan.button.activation') }}</strong>
+					<span>{{ locale.baseText('settings.usageAndPlan.button.activation') }}</span>
 				</n8n-button>
-				<n8n-button v-if="usageStore.managementToken" @click="onManagePlan" size="large">
+				<n8n-button v-if="usageStore.managementToken" size="large" @click="onManagePlan">
 					<a :href="managePlanUrl" target="_blank">{{
 						locale.baseText('settings.usageAndPlan.button.manage')
 					}}</a>
 				</n8n-button>
-				<n8n-button v-else @click="onViewPlans" size="large">
+				<n8n-button v-else size="large" @click.prevent="onViewPlans">
 					<a :href="viewPlansUrl" target="_blank">{{
 						locale.baseText('settings.usageAndPlan.button.plans')
 					}}</a>
@@ -199,26 +208,26 @@ const openPricingPage = () => {
 			</div>
 
 			<el-dialog
+				v-model="activationKeyModal"
 				width="480px"
 				top="0"
+				:title="locale.baseText('settings.usageAndPlan.dialog.activation.title')"
+				:modal-class="$style.center"
 				@closed="onDialogClosed"
 				@opened="onDialogOpened"
-				:visible.sync="activationKeyModal"
-				:title="locale.baseText('settings.usageAndPlan.dialog.activation.title')"
 			>
 				<template #default>
 					<n8n-input
 						ref="activationKeyInput"
 						v-model="activationKey"
-						size="medium"
 						:placeholder="locale.baseText('settings.usageAndPlan.dialog.activation.label')"
 					/>
 				</template>
 				<template #footer>
-					<n8n-button @click="activationKeyModal = false" size="medium" type="secondary">
+					<n8n-button type="secondary" @click="activationKeyModal = false">
 						{{ locale.baseText('settings.usageAndPlan.dialog.activation.cancel') }}
 					</n8n-button>
-					<n8n-button @click="onLicenseActivation" size="medium">
+					<n8n-button @click="onLicenseActivation">
 						{{ locale.baseText('settings.usageAndPlan.dialog.activation.activate') }}
 					</n8n-button>
 				</template>
@@ -228,7 +237,11 @@ const openPricingPage = () => {
 </template>
 
 <style lang="scss" module>
-@import '@/styles/css-animation-helpers.scss';
+@import '@/styles/variables';
+
+.center > div {
+	justify-content: center;
+}
 
 .actionBox {
 	margin: var(--spacing-2xl) 0 0;
@@ -254,7 +267,7 @@ const openPricingPage = () => {
 	margin: 0 0 var(--spacing-xs);
 	background: var(--color-background-xlight);
 	border-radius: var(--border-radius-large);
-	border: 1px solid var(--color-light-grey);
+	border: 1px solid var(--color-foreground-base);
 	white-space: nowrap;
 
 	.count {
@@ -311,27 +324,22 @@ div[class*='info'] > span > span:last-child {
 	line-height: 1.4;
 	padding: 0 0 0 var(--spacing-4xs);
 }
-
-.buttonTertiary {
-	&,
-	&:hover {
-		background: transparent;
-	}
-}
 </style>
 
 <style lang="scss" scoped>
-:deep(.el-dialog__wrapper) {
-	display: flex;
-	align-items: center;
-	justify-content: center;
-
-	.el-dialog {
-		margin: 0;
-
-		.el-dialog__footer {
-			button {
-				margin-left: var(--spacing-xs);
+.settings-usage-and-plan {
+	:deep(.el-dialog__wrapper) {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+
+		.el-dialog {
+			margin: 0;
+
+			.el-dialog__footer {
+				button {
+					margin-left: var(--spacing-xs);
+				}
 			}
 		}
 	}
diff --git a/packages/editor-ui/src/views/SettingsUsersView.vue b/packages/editor-ui/src/views/SettingsUsersView.vue
index 1a0f995328230..876368bc24685 100644
--- a/packages/editor-ui/src/views/SettingsUsersView.vue
+++ b/packages/editor-ui/src/views/SettingsUsersView.vue
@@ -2,24 +2,24 @@
 	<div :class="$style.container">
 		<div>
 			<n8n-heading size="2xlarge">{{ $locale.baseText('settings.users') }}</n8n-heading>
-			<div :class="$style.buttonContainer" v-if="!usersStore.showUMSetupWarning">
+			<div v-if="!showUMSetupWarning" :class="$style.buttonContainer">
 				<n8n-tooltip :disabled="!ssoStore.isSamlLoginEnabled">
 					<template #content>
 						<span> {{ $locale.baseText('settings.users.invite.tooltip') }} </span>
 					</template>
 					<div>
 						<n8n-button
-							:disabled="ssoStore.isSamlLoginEnabled"
+							:disabled="ssoStore.isSamlLoginEnabled || !settingsStore.isBelowUserQuota"
 							:label="$locale.baseText('settings.users.invite')"
-							@click="onInvite"
 							size="large"
 							data-test-id="settings-users-invite-button"
+							@click="onInvite"
 						/>
 					</div>
 				</n8n-tooltip>
 			</div>
 		</div>
-		<div v-if="!settingsStore.isUserManagementEnabled" :class="$style.setupInfoContainer">
+		<div v-if="!settingsStore.isBelowUserQuota" :class="$style.setupInfoContainer">
 			<n8n-action-box
 				:heading="
 					$locale.baseText(uiStore.contextBasedTranslationKeys.users.settings.unavailable.title)
@@ -29,58 +29,89 @@
 						uiStore.contextBasedTranslationKeys.users.settings.unavailable.description,
 					)
 				"
-				:buttonText="
+				:button-text="
 					$locale.baseText(uiStore.contextBasedTranslationKeys.users.settings.unavailable.button)
 				"
-				@click="goToUpgrade"
+				@click:button="goToUpgrade"
 			/>
 		</div>
-		<div v-else-if="usersStore.showUMSetupWarning" :class="$style.setupInfoContainer">
-			<n8n-action-box
-				:heading="$locale.baseText('settings.users.setupToInviteUsers')"
-				:buttonText="$locale.baseText('settings.users.setupMyAccount')"
-				:description="`${
-					isSharingEnabled ? '' : $locale.baseText('settings.users.setupToInviteUsersInfo')
-				}`"
-				@click="redirectToSetup"
-			/>
-		</div>
-		<div :class="$style.usersContainer" v-else>
+		<n8n-notice v-if="!isAdvancedPermissionsEnabled">
+			<i18n-t keypath="settings.users.advancedPermissions.warning">
+				<template #link>
+					<n8n-link size="small" @click="goToUpgradeAdvancedPermissions">
+						{{ $locale.baseText('settings.users.advancedPermissions.warning.link') }}
+					</n8n-link>
+				</template>
+			</i18n-t>
+		</n8n-notice>
+		<!-- If there's more than 1 user it means the account quota was more than 1 in the past. So we need to allow instance owner to be able to delete users and transfer workflows.
+		-->
+		<div
+			v-if="settingsStore.isBelowUserQuota || usersStore.allUsers.length > 1"
+			:class="$style.usersContainer"
+		>
 			<n8n-users-list
 				:actions="usersListActions"
 				:users="usersStore.allUsers"
-				:currentUserId="usersStore.currentUserId"
+				:current-user-id="usersStore.currentUserId"
+				:is-saml-login-enabled="ssoStore.isSamlLoginEnabled"
 				@delete="onDelete"
 				@reinvite="onReinvite"
-				@copyInviteLink="onCopyInviteLink"
-			/>
+				@copy-invite-link="onCopyInviteLink"
+				@copy-password-reset-link="onCopyPasswordResetLink"
+				@allow-s-s-o-manual-login="onAllowSSOManualLogin"
+				@disallow-s-s-o-manual-login="onDisallowSSOManualLogin"
+			>
+				<template #actions="{ user }">
+					<n8n-select
+						v-if="user.id !== usersStore.currentUserId"
+						:model-value="user?.role || 'global:member'"
+						:disabled="!canUpdateRole"
+						data-test-id="user-role-select"
+						@update:model-value="onRoleChange(user, $event)"
+					>
+						<n8n-option
+							v-for="role in userRoles"
+							:key="role.value"
+							:value="role.value"
+							:label="role.label"
+							:disabled="role.disabled"
+						/>
+					</n8n-select>
+				</template>
+			</n8n-users-list>
 		</div>
 	</div>
 </template>
 
 <script lang="ts">
-import { EnterpriseEditionFeature, INVITE_USER_MODAL_KEY, VIEWS } from '@/constants';
-
-import PageAlert from '../components/PageAlert.vue';
-import type { IUser, IUserListAction } from '@/Interface';
-import mixins from 'vue-typed-mixins';
-import { showMessage } from '@/mixins/showMessage';
-import { copyPaste } from '@/mixins/copyPaste';
+import { defineComponent } from 'vue';
 import { mapStores } from 'pinia';
-import { useUIStore } from '@/stores/ui';
-import { useSettingsStore } from '@/stores/settings';
-import { useUsersStore } from '@/stores/users';
-import { BaseTextKey } from '@/plugins/i18n';
-import { useUsageStore } from '@/stores/usage';
-import { useSSOStore } from '@/stores/sso';
+import { EnterpriseEditionFeature, INVITE_USER_MODAL_KEY, VIEWS, ROLE } from '@/constants';
+
+import type { IUser, IUserListAction, InvitableRoleName } from '@/Interface';
+import { useToast } from '@/composables/useToast';
+import { useUIStore } from '@/stores/ui.store';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useUsersStore } from '@/stores/users.store';
+import { useUsageStore } from '@/stores/usage.store';
+import { useSSOStore } from '@/stores/sso.store';
+import { hasPermission } from '@/rbac/permissions';
+import { useClipboard } from '@/composables/useClipboard';
+import type { UpdateGlobalRolePayload } from '@/api/users';
 
-export default mixins(showMessage, copyPaste).extend({
+export default defineComponent({
 	name: 'SettingsUsersView',
-	components: {
-		PageAlert,
+	setup() {
+		const clipboard = useClipboard();
+
+		return {
+			clipboard,
+			...useToast(),
+		};
 	},
 	async mounted() {
-		if (!this.usersStore.showUMSetupWarning) {
+		if (!this.showUMSetupWarning) {
 			await this.usersStore.fetchUsers();
 		}
 	},
@@ -89,70 +120,174 @@ export default mixins(showMessage, copyPaste).extend({
 		isSharingEnabled() {
 			return this.settingsStore.isEnterpriseFeatureEnabled(EnterpriseEditionFeature.Sharing);
 		},
+		showUMSetupWarning() {
+			return hasPermission(['defaultUser']);
+		},
 		usersListActions(): IUserListAction[] {
 			return [
 				{
 					label: this.$locale.baseText('settings.users.actions.copyInviteLink'),
 					value: 'copyInviteLink',
-					guard: (user) => !user.firstName && !!user.inviteAcceptUrl,
+					guard: (user) =>
+						this.settingsStore.isBelowUserQuota && !user.firstName && !!user.inviteAcceptUrl,
 				},
 				{
 					label: this.$locale.baseText('settings.users.actions.reinvite'),
 					value: 'reinvite',
-					guard: (user) => !user.firstName && this.settingsStore.isSmtpSetup,
+					guard: (user) =>
+						this.settingsStore.isBelowUserQuota &&
+						!user.firstName &&
+						this.settingsStore.isSmtpSetup,
 				},
 				{
 					label: this.$locale.baseText('settings.users.actions.delete'),
 					value: 'delete',
+					guard: (user) =>
+						hasPermission(['rbac'], { rbac: { scope: 'user:delete' } }) &&
+						user.id !== this.usersStore.currentUserId,
+				},
+				{
+					label: this.$locale.baseText('settings.users.actions.copyPasswordResetLink'),
+					value: 'copyPasswordResetLink',
+					guard: (user) =>
+						hasPermission(['rbac'], { rbac: { scope: 'user:resetPassword' } }) &&
+						this.settingsStore.isBelowUserQuota &&
+						!user.isPendingUser &&
+						user.id !== this.usersStore.currentUserId,
+				},
+				{
+					label: this.$locale.baseText('settings.users.actions.allowSSOManualLogin'),
+					value: 'allowSSOManualLogin',
+					guard: (user) =>
+						this.settingsStore.isSamlLoginEnabled && !user.settings?.allowSSOManualLogin,
+				},
+				{
+					label: this.$locale.baseText('settings.users.actions.disallowSSOManualLogin'),
+					value: 'disallowSSOManualLogin',
+					guard: (user) =>
+						this.settingsStore.isSamlLoginEnabled && user.settings?.allowSSOManualLogin === true,
+				},
+			];
+		},
+		isAdvancedPermissionsEnabled(): boolean {
+			return this.settingsStore.isEnterpriseFeatureEnabled(
+				EnterpriseEditionFeature.AdvancedPermissions,
+			);
+		},
+		userRoles(): Array<{ value: IRole; label: string; disabled?: boolean }> {
+			return [
+				{
+					value: ROLE.Member,
+					label: this.$locale.baseText('auth.roles.member'),
+				},
+				{
+					value: ROLE.Admin,
+					label: this.$locale.baseText('auth.roles.admin'),
+					disabled: !this.isAdvancedPermissionsEnabled,
 				},
 			];
 		},
+		canUpdateRole(): boolean {
+			return hasPermission(['rbac'], { rbac: { scope: ['user:update', 'user:changeRole'] } });
+		},
 	},
 	methods: {
 		redirectToSetup() {
-			this.$router.push({ name: VIEWS.SETUP });
+			void this.$router.push({ name: VIEWS.SETUP });
 		},
 		onInvite() {
 			this.uiStore.openModal(INVITE_USER_MODAL_KEY);
 		},
 		async onDelete(userId: string) {
-			const user = this.usersStore.getUserById(userId) as IUser | null;
+			const user = this.usersStore.getUserById(userId);
 			if (user) {
 				this.uiStore.openDeleteUserModal(userId);
 			}
 		},
 		async onReinvite(userId: string) {
-			const user = this.usersStore.getUserById(userId) as IUser | null;
-			if (user) {
+			const user = this.usersStore.getUserById(userId);
+			if (user?.email && user?.role) {
+				if (!['global:admin', 'global:member'].includes(user.role)) {
+					throw new Error('Invalid role name on reinvite');
+				}
 				try {
-					await this.usersStore.reinviteUser({ id: user.id });
-
-					this.$showToast({
+					await this.usersStore.reinviteUser({
+						email: user.email,
+						role: user.role as InvitableRoleName,
+					});
+					this.showToast({
 						type: 'success',
 						title: this.$locale.baseText('settings.users.inviteResent'),
 						message: this.$locale.baseText('settings.users.emailSentTo', {
-							interpolate: { email: user.email || '' },
+							interpolate: { email: user.email ?? '' },
 						}),
 					});
 				} catch (e) {
-					this.$showError(e, this.$locale.baseText('settings.users.userReinviteError'));
+					this.showError(e, this.$locale.baseText('settings.users.userReinviteError'));
 				}
 			}
 		},
 		async onCopyInviteLink(userId: string) {
-			const user = this.usersStore.getUserById(userId) as IUser | null;
+			const user = this.usersStore.getUserById(userId);
 			if (user?.inviteAcceptUrl) {
-				this.copyToClipboard(user.inviteAcceptUrl);
+				void this.clipboard.copy(user.inviteAcceptUrl);
 
-				this.$showToast({
+				this.showToast({
 					type: 'success',
 					title: this.$locale.baseText('settings.users.inviteUrlCreated'),
 					message: this.$locale.baseText('settings.users.inviteUrlCreated.message'),
 				});
 			}
 		},
+		async onCopyPasswordResetLink(userId: string) {
+			const user = this.usersStore.getUserById(userId);
+			if (user) {
+				const url = await this.usersStore.getUserPasswordResetLink(user);
+				void this.clipboard.copy(url.link);
+
+				this.showToast({
+					type: 'success',
+					title: this.$locale.baseText('settings.users.passwordResetUrlCreated'),
+					message: this.$locale.baseText('settings.users.passwordResetUrlCreated.message'),
+				});
+			}
+		},
+		async onAllowSSOManualLogin(userId: string) {
+			const user = this.usersStore.getUserById(userId);
+			if (user) {
+				if (!user.settings) {
+					user.settings = {};
+				}
+				user.settings.allowSSOManualLogin = true;
+				await this.usersStore.updateOtherUserSettings(userId, user.settings);
+
+				this.showToast({
+					type: 'success',
+					title: this.$locale.baseText('settings.users.allowSSOManualLogin'),
+					message: this.$locale.baseText('settings.users.allowSSOManualLogin.message'),
+				});
+			}
+		},
+		async onDisallowSSOManualLogin(userId: string) {
+			const user = this.usersStore.getUserById(userId);
+			if (user?.settings) {
+				user.settings.allowSSOManualLogin = false;
+				await this.usersStore.updateOtherUserSettings(userId, user.settings);
+				this.showToast({
+					type: 'success',
+					title: this.$locale.baseText('settings.users.disallowSSOManualLogin'),
+					message: this.$locale.baseText('settings.users.disallowSSOManualLogin.message'),
+				});
+			}
+		},
 		goToUpgrade() {
-			this.uiStore.goToUpgrade('users', 'upgrade-users');
+			void this.uiStore.goToUpgrade('settings-users', 'upgrade-users');
+		},
+		goToUpgradeAdvancedPermissions() {
+			void this.uiStore.goToUpgrade('settings-users', 'upgrade-advanced-permissions');
+		},
+		async onRoleChange(user: IUser, newRoleName: UpdateGlobalRolePayload['newRoleName']) {
+			await this.usersStore.updateGlobalRole({ id: user.id, newRoleName });
 		},
 	},
 });
@@ -181,7 +316,7 @@ export default mixins(showMessage, copyPaste).extend({
 }
 
 .setupInfoContainer {
-	max-width: 728px;
+	max-width: 1280px;
 }
 
 .alert {
diff --git a/packages/editor-ui/src/views/SettingsVersionControl.vue b/packages/editor-ui/src/views/SettingsVersionControl.vue
deleted file mode 100644
index 4c6906c6a5741..0000000000000
--- a/packages/editor-ui/src/views/SettingsVersionControl.vue
+++ /dev/null
@@ -1,40 +0,0 @@
-<script lang="ts" setup>
-import { i18n as locale } from '@/plugins/i18n';
-import { useVersionControlStore } from '@/stores/versionControl';
-import { useUIStore } from '@/stores/ui';
-
-const versionControlStore = useVersionControlStore();
-const uiStore = useUIStore();
-
-const goToUpgrade = () => {
-	uiStore.goToUpgrade('version-control', 'upgrade-version-control');
-};
-</script>
-
-<template>
-	<div>
-		<n8n-heading size="2xlarge">{{ locale.baseText('settings.versionControl.title') }}</n8n-heading>
-		<div
-			v-if="versionControlStore.isEnterpriseVersionControlEnabled"
-			data-test-id="version-control-content-licensed"
-		></div>
-		<n8n-action-box
-			v-else
-			data-test-id="version-control-content-unlicensed"
-			:class="$style.actionBox"
-			:description="locale.baseText('settings.versionControl.actionBox.description')"
-			:buttonText="locale.baseText('settings.versionControl.actionBox.buttonText')"
-			@click="goToUpgrade"
-		>
-			<template #heading>
-				<span>{{ locale.baseText('settings.versionControl.actionBox.title') }}</span>
-			</template>
-		</n8n-action-box>
-	</div>
-</template>
-
-<style lang="scss" module>
-.actionBox {
-	margin: var(--spacing-2xl) 0 0;
-}
-</style>
diff --git a/packages/editor-ui/src/views/SettingsView.vue b/packages/editor-ui/src/views/SettingsView.vue
index 37adbe9c609fc..288935619e9e0 100644
--- a/packages/editor-ui/src/views/SettingsView.vue
+++ b/packages/editor-ui/src/views/SettingsView.vue
@@ -37,7 +37,9 @@ const SettingsView = defineComponent({
 	},
 	methods: {
 		onReturn() {
-			this.$router.push(this.previousRoute ? this.previousRoute.path : { name: VIEWS.HOMEPAGE });
+			void this.$router.push(
+				this.previousRoute ? this.previousRoute.path : { name: VIEWS.HOMEPAGE },
+			);
 		},
 	},
 });
@@ -65,7 +67,7 @@ export default SettingsView;
 .content {
 	height: 100%;
 	width: 100%;
-	max-width: 800px;
+	max-width: 1280px;
 	padding: 0 var(--spacing-2xl);
 }
 </style>
diff --git a/packages/editor-ui/src/views/SetupView.vue b/packages/editor-ui/src/views/SetupView.vue
index 7b525accdb6b6..98e1403005563 100644
--- a/packages/editor-ui/src/views/SetupView.vue
+++ b/packages/editor-ui/src/views/SetupView.vue
@@ -1,58 +1,38 @@
 <template>
 	<AuthView
 		:form="FORM_CONFIG"
-		:formLoading="loading"
+		:form-loading="loading"
+		:show-additional="true"
+		:otp-secret-auth-url="otpSecretAuthURL"
+		:otp-secret-base32="otpSecretBase32"
 		data-test-id="setup-form"
 		@submit="onSubmit"
-		@secondaryClick="showSkipConfirmation"
 	>
-		<div :class="$style.otp">
-			<p :class="$style.otpLabel">Secret:</p>
-			<p :class="$style.otp32">{{ otpSecretBase32 }}</p>
-			<div :class="$style.otpQR">
-				<img :src="otpSecretAuthURL" />
-			</div>
-		</div>
 	</AuthView>
 </template>
 
 <script lang="ts">
 import AuthView from './AuthView.vue';
-import { showMessage } from '@/mixins/showMessage';
+import { defineComponent } from 'vue';
 
-import mixins from 'vue-typed-mixins';
+import { useToast } from '@/composables/useToast';
 import QRCode from 'qrcode';
 import type { IFormBoxConfig } from '@/Interface';
 import { VIEWS } from '@/constants';
 import { mapStores } from 'pinia';
-import { useUIStore } from '@/stores/ui';
-import { useSettingsStore } from '@/stores/settings';
-import { useUsersStore } from '@/stores/users';
-import { useCredentialsStore } from '@/stores/credentials';
+import { useUIStore } from '@/stores/ui.store';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useUsersStore } from '@/stores/users.store';
 
-export default mixins(showMessage).extend({
+export default defineComponent({
 	name: 'SetupView',
 	components: {
 		AuthView,
 	},
-	async mounted() {
-		const [{ credentials, workflows }, { base32, otpauth_url }] = await Promise.all([
-			this.usersStore.preOwnerSetup(),
-			this.usersStore.generateOTPSecret(),
-		]);
-
-		this.credentialsCount = credentials;
-		this.workflowsCount = workflows;
-		this.otpSecretBase32 = base32;
-		QRCode.toDataURL(otpauth_url, (_err, dataUrl) => {
-			this.otpSecretAuthURL = dataUrl;
-		});
-	},
 	data() {
 		const FORM_CONFIG: IFormBoxConfig = {
 			title: this.$locale.baseText('auth.setup.setupOwner'),
 			buttonText: this.$locale.baseText('auth.setup.next'),
-			secondaryButtonText: this.$locale.baseText('auth.setup.skipSetupTemporarily'),
 			inputs: [
 				{
 					name: 'email',
@@ -119,60 +99,26 @@ export default mixins(showMessage).extend({
 		return {
 			FORM_CONFIG,
 			loading: false,
-			workflowsCount: 0,
-			credentialsCount: 0,
 			otpSecretBase32: '',
 			otpSecretAuthURL: '',
 		};
 	},
 	computed: {
-		...mapStores(useCredentialsStore, useSettingsStore, useUIStore, useUsersStore),
+		...mapStores(useSettingsStore, useUIStore, useUsersStore),
 	},
-	methods: {
-		async confirmSetupOrGoBack(): Promise<boolean> {
-			if (this.workflowsCount === 0 && this.credentialsCount === 0) {
-				return true;
-			}
-
-			const workflows =
-				this.workflowsCount > 0
-					? this.$locale.baseText('auth.setup.setupConfirmation.existingWorkflows', {
-							adjustToNumber: this.workflowsCount,
-					  })
-					: '';
-
-			const credentials =
-				this.credentialsCount > 0
-					? this.$locale.baseText('auth.setup.setupConfirmation.credentials', {
-							adjustToNumber: this.credentialsCount,
-					  })
-					: '';
+	async mounted() {
+		const { base32, otpauth_url } = await this.usersStore.generateOTPSecret();
 
-			const entities =
-				workflows && credentials
-					? this.$locale.baseText('auth.setup.setupConfirmation.concatEntities', {
-							interpolate: { workflows, credentials },
-					  })
-					: workflows || credentials;
-			return await this.confirmMessage(
-				this.$locale.baseText('auth.setup.confirmOwnerSetupMessage', {
-					interpolate: {
-						entities,
-					},
-				}),
-				this.$locale.baseText('auth.setup.confirmOwnerSetup'),
-				null,
-				this.$locale.baseText('auth.setup.createAccount'),
-				this.$locale.baseText('auth.setup.goBack'),
-			);
-		},
+		this.otpSecretBase32 = base32;
+		QRCode.toDataURL(otpauth_url, (_err, dataUrl) => {
+			this.otpSecretAuthURL = dataUrl;
+		});
+		console.log('this.otpSecretAuthURL');
+		console.log(this.otpSecretAuthURL);
+	},
+	methods: {
 		async onSubmit(values: { [key: string]: string | boolean }) {
 			try {
-				const confirmSetup = await this.confirmSetupOrGoBack();
-				if (!confirmSetup) {
-					return;
-				}
-
 				const forceRedirectedHere = this.settingsStore.showSetupPage;
 				this.loading = true;
 
@@ -202,28 +148,10 @@ export default mixins(showMessage).extend({
 					await this.$router.push({ name: VIEWS.USERS_SETTINGS });
 				}
 			} catch (error) {
-				this.$showError(error, this.$locale.baseText('auth.setup.settingUpOwnerError'));
+				this.showError(error, this.$locale.baseText('auth.setup.settingUpOwnerError'));
 			}
 			this.loading = false;
 		},
-		async showSkipConfirmation() {
-			const skip = await this.confirmMessage(
-				this.$locale.baseText('auth.setup.ownerAccountBenefits'),
-				this.$locale.baseText('auth.setup.skipOwnerSetupQuestion'),
-				null,
-				this.$locale.baseText('auth.setup.skipSetup'),
-				this.$locale.baseText('auth.setup.goBack'),
-			);
-			if (skip) {
-				this.onSkip();
-			}
-		},
-		onSkip() {
-			this.usersStore.skipOwnerSetup();
-			this.$router.push({
-				name: VIEWS.NEW_WORKFLOW,
-			});
-		},
 	},
 });
 </script>
diff --git a/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/AppsRequiringCredsNotice.vue b/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/AppsRequiringCredsNotice.vue
new file mode 100644
index 0000000000000..a640b49f9da50
--- /dev/null
+++ b/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/AppsRequiringCredsNotice.vue
@@ -0,0 +1,40 @@
+<script setup lang="ts">
+import { computed } from 'vue';
+import N8nNotice from 'n8n-design-system/components/N8nNotice';
+import { formatList } from '@/utils/formatters/listFormatter';
+import { useI18n } from '@/composables/useI18n';
+import type {
+	AppCredentials,
+	BaseNode,
+} from '@/views/SetupWorkflowFromTemplateView/useCredentialSetupState';
+
+const i18n = useI18n();
+
+const props = defineProps<{
+	appCredentials: Array<AppCredentials<BaseNode>>;
+}>();
+
+const formatApp = (app: AppCredentials<BaseNode>) =>
+	`<b>${app.credentials.length}x ${app.appName}</b>`;
+
+const appNodeCounts = computed(() => {
+	return formatList(props.appCredentials, {
+		formatFn: formatApp,
+		i18n,
+	});
+});
+</script>
+
+<template>
+	<N8nNotice :class="$style.notice" theme="info">
+		<i18n-t tag="span" keypath="templateSetup.instructions" scope="global">
+			<span v-html="appNodeCounts" />
+		</i18n-t>
+	</N8nNotice>
+</template>
+
+<style lang="scss" module>
+.notice {
+	margin-top: 0;
+}
+</style>
diff --git a/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/IconSuccess.vue b/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/IconSuccess.vue
new file mode 100644
index 0000000000000..59e5c01481587
--- /dev/null
+++ b/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/IconSuccess.vue
@@ -0,0 +1,9 @@
+<template>
+	<i class="el-icon-success" />
+</template>
+
+<style lang="scss" scoped>
+i {
+	color: var(--prim-color-alt-a);
+}
+</style>
diff --git a/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/SetupTemplateFormStep.vue b/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/SetupTemplateFormStep.vue
new file mode 100644
index 0000000000000..bac25e13bade5
--- /dev/null
+++ b/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/SetupTemplateFormStep.vue
@@ -0,0 +1,183 @@
+<script setup lang="ts">
+import type { PropType } from 'vue';
+import { computed } from 'vue';
+import N8nHeading from 'n8n-design-system/components/N8nHeading';
+import NodeIcon from '@/components/NodeIcon.vue';
+import CredentialPicker from '@/components/CredentialPicker/CredentialPicker.vue';
+import IconSuccess from './IconSuccess.vue';
+import { getAppNameFromNodeName } from '@/utils/nodeTypesUtils';
+import { formatList } from '@/utils/formatters/listFormatter';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import type {
+	BaseNode,
+	CredentialUsages,
+} from '@/views/SetupWorkflowFromTemplateView/useCredentialSetupState';
+import { useI18n } from '@/composables/useI18n';
+import { useTelemetry } from '@/composables/useTelemetry';
+import type { TemplateCredentialKey } from '@/utils/templates/templateTransforms';
+
+// Props
+const props = defineProps({
+	order: {
+		type: Number,
+		required: true,
+	},
+	credentials: {
+		type: Object as PropType<CredentialUsages>,
+		required: true,
+	},
+	selectedCredentialId: {
+		type: String,
+		required: false,
+		default: null,
+	},
+});
+
+const emit = defineEmits<{
+	(
+		e: 'credentialSelected',
+		event: { credentialUsageKey: TemplateCredentialKey; credentialId: string },
+	): void;
+	(e: 'credentialDeselected', event: { credentialUsageKey: TemplateCredentialKey }): void;
+}>();
+
+// Stores
+const nodeTypesStore = useNodeTypesStore();
+const i18n = useI18n();
+const telemetry = useTelemetry();
+
+//#region Computed
+
+const node = computed(() => props.credentials.usedBy[0]);
+
+const nodeType = computed(() =>
+	nodeTypesStore.getNodeType(node.value.type, node.value.typeVersion),
+);
+
+const appName = computed(() =>
+	nodeType.value ? getAppNameFromNodeName(nodeType.value.displayName) : node.value.type,
+);
+
+const nodeNames = computed(() => {
+	const formatNodeName = (nodeToFormat: BaseNode) => `<b>${nodeToFormat.name}</b>`;
+	return formatList(props.credentials.usedBy, {
+		formatFn: formatNodeName,
+		i18n,
+	});
+});
+
+//#endregion Computed
+
+//#region Methods
+
+const onCredentialModalOpened = () => {
+	telemetry.track(
+		'User opened Credential modal',
+		{
+			source: 'cred_setup',
+			credentialType: props.credentials.credentialType,
+			new_credential: !props.selectedCredentialId,
+		},
+		{
+			withPostHog: true,
+		},
+	);
+};
+
+//#endregion Methods
+</script>
+
+<template>
+	<li :class="$style.container" data-test-id="setup-credentials-form-step">
+		<N8nHeading tag="h2" size="large">
+			<div v-if="nodeType" :class="$style.heading" data-test-id="credential-step-heading">
+				<span :class="$style.headingOrder">{{ order }}.</span>
+				<span :class="$style.headingIcon"><NodeIcon :node-type="nodeType" /></span>
+				{{ appName }}
+			</div>
+		</N8nHeading>
+
+		<p :class="$style.description" data-test-id="credential-step-description">
+			<i18n-t
+				tag="span"
+				keypath="templateSetup.credential.description"
+				:plural="credentials.usedBy.length"
+				scope="global"
+			>
+				<span v-html="nodeNames" />
+			</i18n-t>
+		</p>
+
+		<div :class="$style.credentials">
+			<CredentialPicker
+				:class="$style.credentialPicker"
+				:app-name="appName"
+				:credential-type="props.credentials.credentialType"
+				:selected-credential-id="selectedCredentialId"
+				@credential-selected="
+					emit('credentialSelected', {
+						credentialUsageKey: $props.credentials.key,
+						credentialId: $event,
+					})
+				"
+				@credential-deselected="
+					emit('credentialDeselected', { credentialUsageKey: $props.credentials.key })
+				"
+				@credential-modal-opened="onCredentialModalOpened"
+			/>
+
+			<IconSuccess
+				:class="{
+					[$style.credentialOk]: true,
+					[$style.invisible]: !selectedCredentialId,
+				}"
+			/>
+		</div>
+	</li>
+</template>
+
+<style lang="scss" module>
+.container {
+	list-style: none;
+}
+
+.heading {
+	display: flex;
+	align-items: center;
+	margin-bottom: var(--spacing-2xs);
+}
+
+.headingOrder {
+	font-weight: var(--font-weight-bold);
+	margin-right: var(--spacing-xs);
+}
+
+.headingIcon {
+	margin-right: var(--spacing-2xs);
+}
+
+.description {
+	margin-bottom: var(--spacing-l);
+	font-size: var(--font-size-s);
+	color: var(--color-text-base);
+}
+
+.credentials {
+	max-width: 400px;
+	display: flex;
+	align-items: center;
+}
+
+.credentialPicker {
+	flex: 1;
+}
+
+.credentialOk {
+	margin-left: var(--spacing-2xs);
+	font-size: 24px;
+}
+
+.invisible {
+	visibility: hidden;
+}
+</style>
diff --git a/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/SetupWorkflowFromTemplateView.vue b/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/SetupWorkflowFromTemplateView.vue
new file mode 100644
index 0000000000000..1869070eb4b93
--- /dev/null
+++ b/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/SetupWorkflowFromTemplateView.vue
@@ -0,0 +1,206 @@
+<script setup lang="ts">
+import { computed, onBeforeMount, onMounted, watch } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+import { useSetupTemplateStore } from './setupTemplate.store';
+import N8nHeading from 'n8n-design-system/components/N8nHeading';
+import N8nLink from 'n8n-design-system/components/N8nLink';
+import AppsRequiringCredsNotice from './AppsRequiringCredsNotice.vue';
+import SetupTemplateFormStep from './SetupTemplateFormStep.vue';
+import TemplatesView from '../TemplatesView.vue';
+import { TEMPLATE_CREDENTIAL_SETUP_EXPERIMENT, VIEWS } from '@/constants';
+import { useI18n } from '@/composables/useI18n';
+import { usePostHog } from '@/stores/posthog.store';
+
+// Store
+const setupTemplateStore = useSetupTemplateStore();
+const i18n = useI18n();
+const posthogStore = usePostHog();
+
+// Router
+const route = useRoute();
+const router = useRouter();
+
+//#region Computed
+
+const templateId = computed(() =>
+	Array.isArray(route.params.id) ? route.params.id[0] : route.params.id,
+);
+const title = computed(() => setupTemplateStore.template?.name ?? 'unknown');
+const isReady = computed(() => !setupTemplateStore.isLoading);
+
+const skipSetupUrl = computed(() => {
+	const resolvedRoute = router.resolve({
+		name: VIEWS.TEMPLATE_IMPORT,
+		params: { id: templateId.value },
+	});
+	return resolvedRoute.fullPath;
+});
+
+//#endregion Computed
+
+//#region Watchers
+
+watch(templateId, async (newTemplateId) => {
+	setupTemplateStore.setTemplateId(newTemplateId);
+	await setupTemplateStore.loadTemplateIfNeeded();
+});
+
+//#endregion Watchers
+
+//#region Methods
+
+const onSkipSetup = async (event: MouseEvent) => {
+	event.preventDefault();
+
+	await setupTemplateStore.skipSetup({
+		router,
+	});
+};
+
+const skipIfTemplateHasNoCreds = async () => {
+	const isTemplateLoaded = !!setupTemplateStore.template;
+	if (!isTemplateLoaded) {
+		return false;
+	}
+
+	if (setupTemplateStore.credentialUsages.length === 0) {
+		await setupTemplateStore.skipSetup({
+			router,
+		});
+		return true;
+	}
+
+	return false;
+};
+
+//#endregion Methods
+
+//#region Lifecycle hooks
+
+setupTemplateStore.setTemplateId(templateId.value);
+
+onBeforeMount(async () => {
+	if (!posthogStore.isFeatureEnabled(TEMPLATE_CREDENTIAL_SETUP_EXPERIMENT)) {
+		void router.replace({
+			name: VIEWS.TEMPLATE_IMPORT,
+			params: { id: templateId.value },
+		});
+	}
+});
+
+onMounted(async () => {
+	await setupTemplateStore.init();
+	await skipIfTemplateHasNoCreds();
+});
+
+//#endregion Lifecycle hooks
+</script>
+
+<template>
+	<TemplatesView :go-back-enabled="true">
+		<template #header>
+			<N8nHeading v-if="isReady" tag="h1" size="2xlarge"
+				>{{ i18n.baseText('templateSetup.title', { interpolate: { name: title } }) }}
+			</N8nHeading>
+			<n8n-loading v-else variant="h1" />
+		</template>
+
+		<template #content>
+			<div :class="$style.grid">
+				<div :class="$style.notice" data-test-id="info-callout">
+					<AppsRequiringCredsNotice
+						v-if="isReady"
+						:app-credentials="setupTemplateStore.appCredentials"
+					/>
+					<n8n-loading v-else variant="p" />
+				</div>
+
+				<div>
+					<ol v-if="isReady" :class="$style.appCredentialsContainer">
+						<SetupTemplateFormStep
+							v-for="(credentials, index) in setupTemplateStore.credentialUsages"
+							:key="credentials.key"
+							:class="$style.appCredential"
+							:order="index + 1"
+							:credentials="credentials"
+							:selected-credential-id="
+								setupTemplateStore.selectedCredentialIdByKey[credentials.key]
+							"
+							@credential-selected="
+								setupTemplateStore.setSelectedCredentialId(
+									$event.credentialUsageKey,
+									$event.credentialId,
+								)
+							"
+							@credential-deselected="
+								setupTemplateStore.unsetSelectedCredential($event.credentialUsageKey)
+							"
+						/>
+					</ol>
+					<div v-else :class="$style.appCredentialsContainer">
+						<n8n-loading :class="$style.appCredential" variant="p" :rows="3" />
+						<n8n-loading :class="$style.appCredential" variant="p" :rows="3" />
+					</div>
+				</div>
+
+				<div :class="$style.actions">
+					<N8nLink :href="skipSetupUrl" :new-window="false" @click="onSkipSetup($event)">{{
+						i18n.baseText('templateSetup.skip')
+					}}</N8nLink>
+
+					<n8n-tooltip
+						v-if="isReady"
+						:content="i18n.baseText('templateSetup.continue.button.fillRemaining')"
+						:disabled="setupTemplateStore.numFilledCredentials > 0"
+					>
+						<n8n-button
+							size="large"
+							:label="i18n.baseText('templateSetup.continue.button')"
+							:disabled="
+								setupTemplateStore.isSaving || setupTemplateStore.numFilledCredentials === 0
+							"
+							data-test-id="continue-button"
+							@click="setupTemplateStore.createWorkflow({ router })"
+						/>
+					</n8n-tooltip>
+					<div v-else>
+						<n8n-loading variant="button" />
+					</div>
+				</div>
+			</div>
+		</template>
+	</TemplatesView>
+</template>
+
+<style lang="scss" module>
+.grid {
+	margin: 0 auto;
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	max-width: 768px;
+}
+
+.notice {
+	margin-bottom: var(--spacing-2xl);
+}
+
+.appCredentialsContainer {
+	display: flex;
+	flex-direction: column;
+	gap: var(--spacing-2xl);
+}
+
+.appCredential:not(:last-of-type) {
+	padding-bottom: var(--spacing-2xl);
+	border-bottom: 1px solid var(--color-foreground-light);
+}
+
+.actions {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	margin-top: var(--spacing-3xl);
+	margin-bottom: var(--spacing-3xl);
+}
+</style>
diff --git a/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/__tests__/setupTemplate.store.test.ts b/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/__tests__/setupTemplate.store.test.ts
new file mode 100644
index 0000000000000..dd6f18d4d378d
--- /dev/null
+++ b/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/__tests__/setupTemplate.store.test.ts
@@ -0,0 +1,199 @@
+import { useTemplatesStore } from '@/stores/templates.store';
+import { keyFromCredentialTypeAndName } from '@/utils/templates/templateTransforms';
+import { useSetupTemplateStore } from '@/views/SetupWorkflowFromTemplateView/setupTemplate.store';
+import { setActivePinia } from 'pinia';
+import * as testData from './setupTemplate.store.testData';
+import { createTestingPinia } from '@pinia/testing';
+import { useCredentialsStore } from '@/stores/credentials.store';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+
+describe('SetupWorkflowFromTemplateView store', () => {
+	describe('setInitialCredentialsSelection', () => {
+		beforeEach(() => {
+			setActivePinia(
+				createTestingPinia({
+					stubActions: false,
+				}),
+			);
+
+			const credentialsStore = useCredentialsStore();
+			credentialsStore.setCredentialTypes([testData.credentialTypeTelegram]);
+			const templatesStore = useTemplatesStore();
+			templatesStore.addWorkflows([testData.fullShopifyTelegramTwitterTemplate]);
+			const nodeTypesStore = useNodeTypesStore();
+			nodeTypesStore.setNodeTypes([
+				testData.nodeTypeTelegramV1,
+				testData.nodeTypeTwitterV1,
+				testData.nodeTypeShopifyTriggerV1,
+				testData.nodeTypeHttpRequestV1,
+			]);
+			const setupTemplateStore = useSetupTemplateStore();
+			setupTemplateStore.setTemplateId(testData.fullShopifyTelegramTwitterTemplate.id.toString());
+		});
+
+		it("should select no credentials when there isn't any available", () => {
+			// Setup
+			const setupTemplateStore = useSetupTemplateStore();
+
+			// Execute
+			setupTemplateStore.setInitialCredentialSelection();
+
+			expect(setupTemplateStore.selectedCredentialIdByKey).toEqual({});
+		});
+
+		it("should select credential when there's only one", () => {
+			// Setup
+			const credentialsStore = useCredentialsStore();
+			credentialsStore.setCredentials([testData.credentialsTelegram1]);
+
+			const setupTemplateStore = useSetupTemplateStore();
+
+			// Execute
+			setupTemplateStore.setInitialCredentialSelection();
+
+			expect(setupTemplateStore.selectedCredentialIdByKey).toEqual({
+				[keyFromCredentialTypeAndName('telegramApi', 'telegram_habot')]: 'YaSKdvEcT1TSFrrr1',
+			});
+		});
+
+		it('should select no credentials when there are more than 1 available', () => {
+			// Setup
+			const credentialsStore = useCredentialsStore();
+			credentialsStore.setCredentials([
+				testData.credentialsTelegram1,
+				testData.credentialsTelegram2,
+			]);
+
+			const setupTemplateStore = useSetupTemplateStore();
+
+			// Execute
+			setupTemplateStore.setInitialCredentialSelection();
+
+			expect(setupTemplateStore.selectedCredentialIdByKey).toEqual({});
+		});
+
+		test.each([
+			['httpBasicAuth', 'basicAuth'],
+			['httpCustomAuth', 'basicAuth'],
+			['httpDigestAuth', 'digestAuth'],
+			['httpHeaderAuth', 'headerAuth'],
+			['oAuth1Api', 'oAuth1'],
+			['oAuth2Api', 'oAuth2'],
+			['httpQueryAuth', 'queryAuth'],
+		])('should not auto-select credentials for %s', (credentialType, auth) => {
+			// Setup
+			const credentialsStore = useCredentialsStore();
+			credentialsStore.setCredentialTypes([testData.newCredentialType(credentialType)]);
+			credentialsStore.setCredentials([
+				testData.newCredential({
+					name: `${credentialType}Credential`,
+					type: credentialType,
+				}),
+			]);
+
+			const templatesStore = useTemplatesStore();
+			const workflow = testData.newFullOneNodeTemplate({
+				name: 'Test',
+				type: 'n8n-nodes-base.httpRequest',
+				typeVersion: 1,
+				credentials: {
+					[credentialType]: 'Test',
+				},
+				parameters: {
+					authentication: auth,
+				},
+				position: [250, 300],
+			});
+			templatesStore.addWorkflows([workflow]);
+
+			const setupTemplateStore = useSetupTemplateStore();
+			setupTemplateStore.setTemplateId(workflow.id.toString());
+
+			// Execute
+			setupTemplateStore.setInitialCredentialSelection();
+
+			expect(setupTemplateStore.credentialUsages.length).toBe(1);
+			expect(setupTemplateStore.selectedCredentialIdByKey).toEqual({});
+		});
+	});
+
+	describe("With template that has nodes requiring credentials but workflow doesn't have them", () => {
+		beforeEach(() => {
+			setActivePinia(
+				createTestingPinia({
+					stubActions: false,
+				}),
+			);
+
+			// Setup
+			const credentialsStore = useCredentialsStore();
+			credentialsStore.setCredentialTypes([testData.credentialTypeTelegram]);
+			const templatesStore = useTemplatesStore();
+			templatesStore.addWorkflows([testData.fullSaveEmailAttachmentsToNextCloudTemplate]);
+			const nodeTypesStore = useNodeTypesStore();
+			nodeTypesStore.setNodeTypes([
+				testData.nodeTypeReadImapV1,
+				testData.nodeTypeReadImapV2,
+				testData.nodeTypeNextCloudV1,
+			]);
+			const setupTemplateStore = useSetupTemplateStore();
+			setupTemplateStore.setTemplateId(
+				testData.fullSaveEmailAttachmentsToNextCloudTemplate.id.toString(),
+			);
+		});
+
+		const templateImapNode = testData.fullSaveEmailAttachmentsToNextCloudTemplate.workflow.nodes[0];
+		const templateNextcloudNode =
+			testData.fullSaveEmailAttachmentsToNextCloudTemplate.workflow.nodes[1];
+
+		it('should return correct credential usages', () => {
+			const setupTemplateStore = useSetupTemplateStore();
+			expect(setupTemplateStore.credentialUsages).toEqual([
+				{
+					credentialName: '',
+					credentialType: 'imap',
+					key: 'imap-',
+					nodeTypeName: 'n8n-nodes-base.emailReadImap',
+					usedBy: [templateImapNode],
+				},
+				{
+					credentialName: '',
+					credentialType: 'nextCloudApi',
+					key: 'nextCloudApi-',
+					nodeTypeName: 'n8n-nodes-base.nextCloud',
+					usedBy: [templateNextcloudNode],
+				},
+			]);
+		});
+
+		it('should return correct app credentials', () => {
+			const setupTemplateStore = useSetupTemplateStore();
+			expect(setupTemplateStore.appCredentials).toEqual([
+				{
+					appName: 'Email (IMAP)',
+					credentials: [
+						{
+							credentialName: '',
+							credentialType: 'imap',
+							key: 'imap-',
+							nodeTypeName: 'n8n-nodes-base.emailReadImap',
+							usedBy: [templateImapNode],
+						},
+					],
+				},
+				{
+					appName: 'Nextcloud',
+					credentials: [
+						{
+							credentialName: '',
+							credentialType: 'nextCloudApi',
+							key: 'nextCloudApi-',
+							nodeTypeName: 'n8n-nodes-base.nextCloud',
+							usedBy: [templateNextcloudNode],
+						},
+					],
+				},
+			]);
+		});
+	});
+});
diff --git a/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/__tests__/setupTemplate.store.testData.ts b/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/__tests__/setupTemplate.store.testData.ts
new file mode 100644
index 0000000000000..0696ed2b7c1fb
--- /dev/null
+++ b/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/__tests__/setupTemplate.store.testData.ts
@@ -0,0 +1,104 @@
+import { faker } from '@faker-js/faker/locale/en';
+import type {
+	ICredentialsResponse,
+	ITemplatesWorkflowFull,
+	IWorkflowTemplateNode,
+} from '@/Interface';
+
+export const newFullOneNodeTemplate = (node: IWorkflowTemplateNode): ITemplatesWorkflowFull => ({
+	full: true,
+	id: faker.number.int(),
+	name: faker.commerce.productName(),
+	totalViews: 1,
+	createdAt: '2021-08-24T10:40:50.007Z',
+	description: faker.lorem.paragraph(),
+	workflow: {
+		nodes: [node],
+		connections: {},
+	},
+	nodes: [
+		{
+			defaults: {},
+			displayName: faker.commerce.productName(),
+			icon: 'file:telegram.svg',
+			iconData: {
+				fileBuffer: '',
+				type: 'file',
+			},
+			id: faker.number.int(),
+			name: node.type,
+		},
+	],
+	image: [],
+	categories: [],
+	user: {
+		username: faker.internet.userName(),
+	},
+	workflowInfo: {
+		nodeCount: 1,
+		nodeTypes: {
+			[node.type]: {
+				count: 1,
+			},
+		},
+	},
+});
+
+export const newCredential = (
+	opts: Pick<ICredentialsResponse, 'type'> & Partial<ICredentialsResponse>,
+): ICredentialsResponse => ({
+	createdAt: faker.date.past().toISOString(),
+	updatedAt: faker.date.past().toISOString(),
+	id: faker.string.alphanumeric({ length: 16 }),
+	name: faker.commerce.productName(),
+	...opts,
+});
+
+export const credentialsTelegram1: ICredentialsResponse = {
+	createdAt: '2023-11-23T14:26:07.969Z',
+	updatedAt: '2023-11-23T14:26:07.964Z',
+	id: 'YaSKdvEcT1TSFrrr1',
+	name: 'Telegram account',
+	type: 'telegramApi',
+	ownedBy: {
+		id: '713ef3e7-9e65-4b0a-893c-8a653cbb2c4f',
+		email: 'user@n8n.io',
+		firstName: 'Player',
+		lastName: 'One',
+	},
+	sharedWith: [],
+};
+
+export const credentialsTelegram2: ICredentialsResponse = {
+	createdAt: '2023-11-23T14:26:07.969Z',
+	updatedAt: '2023-11-23T14:26:07.964Z',
+	id: 'YaSKdvEcT1TSFrrr2',
+	name: 'Telegram account',
+	type: 'telegramApi',
+	ownedBy: {
+		id: '713ef3e7-9e65-4b0a-893c-8a653cbb2c4f',
+		email: 'user@n8n.io',
+		firstName: 'Player',
+		lastName: 'One',
+	},
+	sharedWith: [],
+};
+
+export {
+	fullSaveEmailAttachmentsToNextCloudTemplate,
+	fullShopifyTelegramTwitterTemplate,
+} from '@/utils/testData/templateTestData';
+
+export { credentialTypeTelegram, newCredentialType } from '@/utils/testData/credentialTypeTestData';
+
+export {
+	nodeTypeHttpRequestV1,
+	nodeTypeNextCloudV1,
+	nodeTypeReadImapV1,
+	nodeTypeReadImapV2,
+	nodeTypeShopifyTriggerV1,
+	nodeTypeTelegramV1,
+	nodeTypeTelegramV1_1,
+	nodeTypeTwitterV1,
+	nodeTypeTwitterV2,
+} from '@/utils/testData/nodeTypeTestData';
diff --git a/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/__tests__/useCredentialSetupState.test.ts b/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/__tests__/useCredentialSetupState.test.ts
new file mode 100644
index 0000000000000..96c9162b9bf27
--- /dev/null
+++ b/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/__tests__/useCredentialSetupState.test.ts
@@ -0,0 +1,141 @@
+import { keyFromCredentialTypeAndName } from '@/utils/templates/templateTransforms';
+import type { IWorkflowTemplateNodeWithCredentials } from '@/utils/templates/templateTransforms';
+import type { CredentialUsages } from '@/views/SetupWorkflowFromTemplateView/useCredentialSetupState';
+import {
+	getAppCredentials,
+	groupNodeCredentialsByKey,
+} from '@/views/SetupWorkflowFromTemplateView/useCredentialSetupState';
+import * as testData from './setupTemplate.store.testData';
+import { newWorkflowTemplateNode } from '@/utils/testData/templateTestData';
+
+const objToMap = <TKey extends string, T>(obj: Record<TKey, T>) => {
+	return new Map(Object.entries(obj)) as Map<TKey, T>;
+};
+
+describe('useCredentialSetupState', () => {
+	const nodesByName = {
+		Twitter: {
+			name: 'Twitter',
+			type: 'n8n-nodes-base.twitter',
+			position: [720, -220],
+			parameters: {
+				text: '=Hey there, my design is now on a new product ✨\nVisit my {{$json["vendor"]}} shop to get this cool{{$json["title"]}} (and check out more {{$json["product_type"]}}) 🛍️',
+				additionalFields: {},
+			},
+			credentials: {
+				twitterOAuth1Api: 'twitter',
+			},
+			typeVersion: 1,
+		},
+	} satisfies Record<string, IWorkflowTemplateNodeWithCredentials>;
+
+	describe('groupNodeCredentialsByTypeAndName', () => {
+		it('returns an empty array if there are no nodes', () => {
+			expect(groupNodeCredentialsByKey([])).toEqual(new Map());
+		});
+
+		it('returns credentials grouped by type and name', () => {
+			expect(
+				groupNodeCredentialsByKey([
+					{
+						node: nodesByName.Twitter,
+						requiredCredentials: testData.nodeTypeTwitterV1.credentials,
+					},
+				]),
+			).toEqual(
+				objToMap({
+					'twitterOAuth1Api-twitter': {
+						key: 'twitterOAuth1Api-twitter',
+						credentialName: 'twitter',
+						credentialType: 'twitterOAuth1Api',
+						nodeTypeName: 'n8n-nodes-base.twitter',
+						usedBy: [nodesByName.Twitter],
+					},
+				}),
+			);
+		});
+
+		it('returns credentials grouped when the credential names are the same', () => {
+			const [node1, node2] = [
+				newWorkflowTemplateNode({
+					type: 'n8n-nodes-base.twitter',
+					credentials: {
+						twitterOAuth1Api: 'credential',
+					},
+				}) as IWorkflowTemplateNodeWithCredentials,
+				newWorkflowTemplateNode({
+					type: 'n8n-nodes-base.telegram',
+					credentials: {
+						telegramApi: 'credential',
+					},
+				}) as IWorkflowTemplateNodeWithCredentials,
+			];
+
+			expect(
+				groupNodeCredentialsByKey([
+					{
+						node: node1,
+						requiredCredentials: testData.nodeTypeTwitterV1.credentials,
+					},
+					{
+						node: node2,
+						requiredCredentials: testData.nodeTypeTelegramV1.credentials,
+					},
+				]),
+			).toEqual(
+				objToMap({
+					'twitterOAuth1Api-credential': {
+						key: 'twitterOAuth1Api-credential',
+						credentialName: 'credential',
+						credentialType: 'twitterOAuth1Api',
+						nodeTypeName: 'n8n-nodes-base.twitter',
+						usedBy: [node1],
+					},
+					'telegramApi-credential': {
+						key: 'telegramApi-credential',
+						credentialName: 'credential',
+						credentialType: 'telegramApi',
+						nodeTypeName: 'n8n-nodes-base.telegram',
+						usedBy: [node2],
+					},
+				}),
+			);
+		});
+	});
+
+	describe('getAppCredentials', () => {
+		it('returns an empty array if there are no nodes', () => {
+			const appNameByNodeTypeName = () => 'Twitter';
+			expect(getAppCredentials([], appNameByNodeTypeName)).toEqual([]);
+		});
+
+		it('returns an array of apps requiring credentials', () => {
+			const credentialUsages: CredentialUsages[] = [
+				{
+					key: keyFromCredentialTypeAndName('twitterOAuth1Api', 'twitter'),
+					credentialName: 'twitter',
+					credentialType: 'twitterOAuth1Api',
+					nodeTypeName: 'n8n-nodes-base.twitter',
+					usedBy: [nodesByName.Twitter],
+				},
+			];
+
+			const appNameByNodeTypeName = () => 'Twitter';
+
+			expect(getAppCredentials(credentialUsages, appNameByNodeTypeName)).toEqual([
+				{
+					appName: 'Twitter',
+					credentials: [
+						{
+							key: 'twitterOAuth1Api-twitter',
+							credentialName: 'twitter',
+							credentialType: 'twitterOAuth1Api',
+							nodeTypeName: 'n8n-nodes-base.twitter',
+							usedBy: [nodesByName.Twitter],
+						},
+					],
+				},
+			]);
+		});
+	});
+});
diff --git a/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/setupTemplate.store.ts b/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/setupTemplate.store.ts
new file mode 100644
index 0000000000000..a5c8050e054d3
--- /dev/null
+++ b/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/setupTemplate.store.ts
@@ -0,0 +1,248 @@
+import { defineStore } from 'pinia';
+import { computed, ref } from 'vue';
+import type { Router } from 'vue-router';
+import { useCredentialsStore } from '@/stores/credentials.store';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import { useTemplatesStore } from '@/stores/templates.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import type { INodeTypeDescription } from 'n8n-workflow';
+import type { INodeUi } from '@/Interface';
+import { VIEWS } from '@/constants';
+import { createWorkflowFromTemplate } from '@/utils/templates/templateActions';
+import { useExternalHooks } from '@/composables/useExternalHooks';
+import { useTelemetry } from '@/composables/useTelemetry';
+import { useCredentialSetupState } from '@/views/SetupWorkflowFromTemplateView/useCredentialSetupState';
+import { tryToParseNumber } from '@/utils/typesUtils';
+
+export type NodeAndType = {
+	node: INodeUi;
+	nodeType: INodeTypeDescription;
+};
+
+export type RequiredCredentials = {
+	node: INodeUi;
+	credentialName: string;
+	credentialType: string;
+};
+
+export type AppCredentialCount = {
+	appName: string;
+	count: number;
+};
+
+/**
+ * Store for managing the state of the SetupWorkflowFromTemplateView
+ */
+export const useSetupTemplateStore = defineStore('setupTemplate', () => {
+	//#region State
+
+	const templateId = ref<string>('');
+	const isLoading = ref(true);
+	const isSaving = ref(false);
+
+	//#endregion State
+
+	const templatesStore = useTemplatesStore();
+	const nodeTypesStore = useNodeTypesStore();
+	const credentialsStore = useCredentialsStore();
+	const rootStore = useRootStore();
+	const workflowsStore = useWorkflowsStore();
+
+	//#region Getters
+
+	const template = computed(() => {
+		return templateId.value ? templatesStore.getFullTemplateById(templateId.value) : null;
+	});
+
+	const templateNodes = computed(() => {
+		return template.value?.workflow.nodes ?? [];
+	});
+
+	const {
+		appCredentials,
+		credentialOverrides,
+		credentialUsages,
+		credentialsByKey,
+		nodesRequiringCredentialsSorted,
+		numFilledCredentials,
+		selectedCredentialIdByKey,
+		setSelectedCredentialId,
+		unsetSelectedCredential,
+	} = useCredentialSetupState(templateNodes);
+
+	//#endregion Getters
+
+	//#region Actions
+
+	const setTemplateId = (id: string) => {
+		templateId.value = id;
+	};
+
+	const ignoredAutoFillCredentialTypes = new Set([
+		'httpBasicAuth',
+		'httpCustomAuth',
+		'httpDigestAuth',
+		'httpHeaderAuth',
+		'oAuth1Api',
+		'oAuth2Api',
+		'httpQueryAuth',
+	]);
+
+	/**
+	 * Selects initial credentials for the template. Credentials
+	 * need to be loaded before this.
+	 */
+	const setInitialCredentialSelection = () => {
+		for (const credUsage of credentialUsages.value) {
+			if (ignoredAutoFillCredentialTypes.has(credUsage.credentialType)) {
+				continue;
+			}
+
+			const availableCreds = credentialsStore.getCredentialsByType(credUsage.credentialType);
+
+			if (availableCreds.length === 1) {
+				selectedCredentialIdByKey.value[credUsage.key] = availableCreds[0].id;
+			}
+		}
+	};
+
+	/**
+	 * Loads the template if it hasn't been loaded yet.
+	 */
+	const loadTemplateIfNeeded = async () => {
+		if (!!template.value || !templateId.value) {
+			return;
+		}
+
+		await templatesStore.fetchTemplateById(templateId.value);
+
+		setInitialCredentialSelection();
+	};
+
+	/**
+	 * Initializes the store for a specific template.
+	 */
+	const init = async () => {
+		isLoading.value = true;
+		try {
+			selectedCredentialIdByKey.value = {};
+
+			await Promise.all([
+				credentialsStore.fetchAllCredentials(),
+				credentialsStore.fetchCredentialTypes(false),
+				nodeTypesStore.loadNodeTypesIfNotLoaded(),
+				loadTemplateIfNeeded(),
+			]);
+
+			setInitialCredentialSelection();
+		} finally {
+			isLoading.value = false;
+		}
+	};
+
+	/**
+	 * Skips the setup and goes directly to the workflow view.
+	 */
+	const skipSetup = async ({ router }: { router: Router }) => {
+		const externalHooks = useExternalHooks();
+		const telemetry = useTelemetry();
+
+		await externalHooks.run('templatesWorkflowView.openWorkflow', {
+			source: 'workflow',
+			template_id: templateId.value,
+			wf_template_repo_session_id: templatesStore.currentSessionId,
+		});
+
+		telemetry.track('User closed cred setup', {
+			completed: false,
+			creds_filled: 0,
+			creds_needed: credentialUsages.value.length,
+			workflow_id: null,
+		});
+
+		// Replace the URL so back button doesn't come back to this setup view
+		await router.replace({
+			name: VIEWS.TEMPLATE_IMPORT,
+			params: { id: templateId.value },
+		});
+	};
+
+	/**
+	 * Creates a workflow from the template and navigates to the workflow view.
+	 */
+	const createWorkflow = async (opts: { router: Router }) => {
+		const { router } = opts;
+		const telemetry = useTelemetry();
+
+		if (!template.value) {
+			return;
+		}
+
+		try {
+			isSaving.value = true;
+
+			const createdWorkflow = await createWorkflowFromTemplate({
+				template: template.value,
+				credentialOverrides: credentialOverrides.value,
+				rootStore,
+				workflowsStore,
+				nodeTypeProvider: nodeTypesStore,
+			});
+
+			telemetry.track('User closed cred setup', {
+				completed: true,
+				creds_filled: numFilledCredentials.value,
+				creds_needed: credentialUsages.value.length,
+				workflow_id: createdWorkflow.id,
+			});
+
+			telemetry.track(
+				'User inserted workflow template',
+				{
+					source: 'workflow',
+					template_id: tryToParseNumber(templateId.value),
+					wf_template_repo_session_id: templatesStore.currentSessionId,
+				},
+				{ withPostHog: true },
+			);
+
+			telemetry.track('User saved new workflow from template', {
+				template_id: tryToParseNumber(templateId.value),
+				workflow_id: createdWorkflow.id,
+				wf_template_repo_session_id: templatesStore.currentSessionId,
+			});
+
+			// Replace the URL so back button doesn't come back to this setup view
+			await router.replace({
+				name: VIEWS.WORKFLOW,
+				params: { name: createdWorkflow.id },
+			});
+		} finally {
+			isSaving.value = false;
+		}
+	};
+
+	//#endregion Actions
+
+	return {
+		credentialsByKey,
+		isLoading,
+		isSaving,
+		appCredentials,
+		nodesRequiringCredentialsSorted,
+		template,
+		credentialUsages,
+		selectedCredentialIdByKey,
+		credentialOverrides,
+		numFilledCredentials,
+		createWorkflow,
+		skipSetup,
+		init,
+		loadTemplateIfNeeded,
+		setInitialCredentialSelection,
+		setTemplateId,
+		setSelectedCredentialId,
+		unsetSelectedCredential,
+	};
+});
diff --git a/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/useCredentialSetupState.ts b/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/useCredentialSetupState.ts
new file mode 100644
index 0000000000000..2bf9de517f6af
--- /dev/null
+++ b/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/useCredentialSetupState.ts
@@ -0,0 +1,231 @@
+import type { Ref } from 'vue';
+import { computed, ref } from 'vue';
+import type { ICredentialsResponse, INodeUi } from '@/Interface';
+import { useCredentialsStore } from '@/stores/credentials.store';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import { getAppNameFromNodeName } from '@/utils/nodeTypesUtils';
+import type { TemplateCredentialKey } from '@/utils/templates/templateTransforms';
+import {
+	keyFromCredentialTypeAndName,
+	normalizeTemplateNodeCredentials,
+} from '@/utils/templates/templateTransforms';
+import type { INodeCredentialDescription, INodeCredentialsDetails } from 'n8n-workflow';
+import type { NodeTypeProvider } from '@/utils/nodeTypes/nodeTypeTransforms';
+import { getNodeTypeDisplayableCredentials } from '@/utils/nodes/nodeTransforms';
+import sortBy from 'lodash-es/sortBy';
+
+//#region Types
+
+export type NodeCredentials = {
+	[key: string]: string | INodeCredentialsDetails;
+};
+
+/**
+ * Node that can either be in a workflow or in a template workflow. These
+ * have a bit different shape and this type is used to represent both.
+ */
+export type BaseNode = Pick<
+	INodeUi,
+	'name' | 'parameters' | 'position' | 'type' | 'typeVersion'
+> & {
+	credentials?: NodeCredentials;
+};
+
+export type NodeWithCredentials<TNode extends BaseNode> = TNode & {
+	credentials: NodeCredentials;
+};
+
+export type NodeWithRequiredCredential<TNode extends BaseNode> = {
+	node: TNode;
+	requiredCredentials: INodeCredentialDescription[];
+};
+
+export type CredentialUsages<TNode extends BaseNode = BaseNode> = {
+	/**
+	 * Key is a combination of the credential name and the credential type name,
+	 * e.g. "twitter-twitterOAuth1Api"
+	 */
+	key: TemplateCredentialKey;
+	credentialName: string;
+	credentialType: string;
+	nodeTypeName: string;
+	usedBy: TNode[];
+};
+
+export type AppCredentials<TNode extends BaseNode> = {
+	appName: string;
+	credentials: Array<CredentialUsages<TNode>>;
+};
+
+//#endregion Types
+
+//#region Getters
+
+/**
+ * Returns the nodes in the template that require credentials
+ * and the required credentials for each node.
+ */
+export const getNodesRequiringCredentials = <TNode extends BaseNode>(
+	nodeTypeProvider: NodeTypeProvider,
+	nodes: TNode[],
+): Array<NodeWithRequiredCredential<TNode>> => {
+	const nodesWithCredentials: Array<NodeWithRequiredCredential<TNode>> = nodes
+		.map((node) => ({
+			node,
+			requiredCredentials: getNodeTypeDisplayableCredentials(nodeTypeProvider, node),
+		}))
+		.filter(({ requiredCredentials }) => requiredCredentials.length > 0);
+
+	return nodesWithCredentials;
+};
+
+export const groupNodeCredentialsByKey = <TNode extends BaseNode>(
+	nodeWithRequiredCredentials: Array<NodeWithRequiredCredential<TNode>>,
+) => {
+	const credentialsByTypeName = new Map<TemplateCredentialKey, CredentialUsages<TNode>>();
+
+	for (const { node, requiredCredentials } of nodeWithRequiredCredentials) {
+		const normalizedNodeCreds = node.credentials
+			? normalizeTemplateNodeCredentials(node.credentials)
+			: {};
+
+		for (const credentialDescription of requiredCredentials) {
+			const credentialType = credentialDescription.name;
+			const nodeCredentialName = normalizedNodeCreds[credentialDescription.name] ?? '';
+			const key = keyFromCredentialTypeAndName(credentialType, nodeCredentialName);
+
+			let credentialUsages = credentialsByTypeName.get(key);
+			if (!credentialUsages) {
+				credentialUsages = {
+					key,
+					nodeTypeName: node.type,
+					credentialName: nodeCredentialName,
+					credentialType,
+					usedBy: [],
+				};
+				credentialsByTypeName.set(key, credentialUsages);
+			}
+
+			credentialUsages.usedBy.push(node);
+		}
+	}
+
+	return credentialsByTypeName;
+};
+
+export const getAppCredentials = <TNode extends BaseNode>(
+	credentialUsages: Array<CredentialUsages<TNode>>,
+	getAppNameByNodeType: (nodeTypeName: string, version?: number) => string,
+) => {
+	const credentialsByAppName = new Map<string, AppCredentials<TNode>>();
+
+	for (const credentialUsage of credentialUsages) {
+		const nodeTypeName = credentialUsage.nodeTypeName;
+
+		const appName = getAppNameByNodeType(nodeTypeName) ?? nodeTypeName;
+		const appCredentials = credentialsByAppName.get(appName);
+		if (appCredentials) {
+			appCredentials.credentials.push(credentialUsage);
+		} else {
+			credentialsByAppName.set(appName, {
+				appName,
+				credentials: [credentialUsage],
+			});
+		}
+	}
+
+	return Array.from(credentialsByAppName.values());
+};
+
+//#endregion Getters
+
+export const useCredentialSetupState = <TNode extends BaseNode>(nodes: Ref<TNode[]>) => {
+	/**
+	 * Credentials user has selected from the UI. Map from credential
+	 * name in the template to the credential ID.
+	 */
+	const selectedCredentialIdByKey = ref<
+		Record<CredentialUsages<TNode>['key'], ICredentialsResponse['id']>
+	>({});
+
+	const nodeTypesStore = useNodeTypesStore();
+	const credentialsStore = useCredentialsStore();
+
+	const appNameByNodeType = (nodeTypeName: string, version?: number) => {
+		const nodeType = nodeTypesStore.getNodeType(nodeTypeName, version);
+
+		return nodeType ? getAppNameFromNodeName(nodeType.displayName) : nodeTypeName;
+	};
+
+	//#region Computed
+
+	const nodesRequiringCredentialsSorted = computed(() => {
+		const nodesWithCredentials = nodes.value
+			? getNodesRequiringCredentials(nodeTypesStore, nodes.value)
+			: [];
+
+		// Order by the X coordinate of the node
+		return sortBy(nodesWithCredentials, ({ node }) => node.position[0]);
+	});
+
+	const credentialsByKey = computed(() => {
+		return groupNodeCredentialsByKey(nodesRequiringCredentialsSorted.value);
+	});
+
+	const credentialUsages = computed(() => {
+		return Array.from(credentialsByKey.value.values());
+	});
+
+	const appCredentials = computed(() => {
+		return getAppCredentials(credentialUsages.value, appNameByNodeType);
+	});
+
+	const credentialOverrides = computed(() => {
+		const overrides: Record<TemplateCredentialKey, INodeCredentialsDetails> = {};
+
+		for (const [key, credentialId] of Object.entries(selectedCredentialIdByKey.value)) {
+			const credential = credentialsStore.getCredentialById(credentialId);
+			if (!credential) {
+				continue;
+			}
+
+			// Object.entries fails to give the more accurate key type
+			overrides[key as TemplateCredentialKey] = {
+				id: credentialId,
+				name: credential.name,
+			};
+		}
+
+		return overrides;
+	});
+
+	const numFilledCredentials = computed(() => {
+		return Object.keys(selectedCredentialIdByKey.value).length;
+	});
+
+	//#endregion Computed
+
+	//#region Actions
+
+	const setSelectedCredentialId = (credentialKey: TemplateCredentialKey, credentialId: string) => {
+		selectedCredentialIdByKey.value[credentialKey] = credentialId;
+	};
+
+	const unsetSelectedCredential = (credentialKey: TemplateCredentialKey) => {
+		delete selectedCredentialIdByKey.value[credentialKey];
+	};
+
+	//#endregion Actions
+
+	return {
+		appCredentials,
+		credentialOverrides,
+		credentialUsages,
+		credentialsByKey,
+		nodesRequiringCredentialsSorted,
+		numFilledCredentials,
+		selectedCredentialIdByKey,
+		setSelectedCredentialId,
+		unsetSelectedCredential,
+	};
+};
diff --git a/packages/editor-ui/src/views/SigninView.vue b/packages/editor-ui/src/views/SigninView.vue
index 3471093dde453..3bb2413246669 100644
--- a/packages/editor-ui/src/views/SigninView.vue
+++ b/packages/editor-ui/src/views/SigninView.vue
@@ -1,37 +1,62 @@
 <template>
-	<AuthView
-		:form="FORM_CONFIG"
-		:formLoading="loading"
-		:with-sso="true"
-		data-test-id="signin-form"
-		@submit="onSubmit"
-	/>
+	<div>
+		<AuthView
+			v-if="!showMfaView"
+			:form="FORM_CONFIG"
+			:form-loading="loading"
+			:with-sso="true"
+			data-test-id="signin-form"
+			@submit="onEmailPasswordSubmitted"
+		/>
+		<MfaView
+			v-if="showMfaView"
+			:report-error="reportError"
+			@submit="onMFASubmitted"
+			@on-back-click="onBackClick"
+			@on-form-changed="onFormChanged"
+		/>
+	</div>
 </template>
 
 <script lang="ts">
+import { defineComponent } from 'vue';
 import AuthView from './AuthView.vue';
-import { showMessage } from '@/mixins/showMessage';
-
-import mixins from 'vue-typed-mixins';
+import MfaView, { FORM } from './MfaView.vue';
+import { useToast } from '@/composables/useToast';
 import type { IFormBoxConfig } from '@/Interface';
-import { VIEWS } from '@/constants';
+import { MFA_AUTHENTICATION_REQUIRED_ERROR_CODE, VIEWS } from '@/constants';
 import { mapStores } from 'pinia';
-import { useUsersStore } from '@/stores/users';
-import { useSettingsStore } from '@/stores/settings';
+import { useUsersStore } from '@/stores/users.store';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useCloudPlanStore } from '@/stores/cloudPlan.store';
+import { useUIStore } from '@/stores/ui.store';
 
-export default mixins(showMessage).extend({
+export default defineComponent({
 	name: 'SigninView',
 	components: {
 		AuthView,
+		MfaView,
+	},
+	setup() {
+		return {
+			...useToast(),
+		};
 	},
 	data() {
 		return {
 			FORM_CONFIG: {} as IFormBoxConfig,
 			loading: false,
+			showMfaView: false,
+			email: '',
+			password: '',
+			reportError: false,
 		};
 	},
 	computed: {
-		...mapStores(useUsersStore, useSettingsStore),
+		...mapStores(useUsersStore, useSettingsStore, useUIStore, useCloudPlanStore),
+		userHasMfaEnabled() {
+			return !!this.usersStore.currentUser?.mfaEnabled;
+		},
 	},
 	mounted() {
 		let emailLabel = this.$locale.baseText('auth.email');
@@ -82,34 +107,128 @@ export default mixins(showMessage).extend({
 			],
 		};
 
-		if (!this.settingsStore.isDesktopDeployment || this.settingsStore.isUserManagementEnabled) {
+		if (!this.settingsStore.isDesktopDeployment) {
 			this.FORM_CONFIG.redirectLink = '/forgot-password';
 		}
 	},
 	methods: {
-		async onSubmit(values: { [key: string]: string }) {
+		async onMFASubmitted(form: { token?: string; recoveryCode?: string }) {
+			await this.login({
+				email: this.email,
+				password: this.password,
+				token: form.token,
+				recoveryCode: form.recoveryCode,
+			});
+		},
+		async onEmailPasswordSubmitted(form: { email: string; password: string; otp?: string }) {
+			await this.login(form);
+		},
+		isRedirectSafe() {
+			const redirect = this.getRedirectQueryParameter();
+			return redirect.startsWith('/') || redirect.startsWith(window.location.origin);
+		},
+		getRedirectQueryParameter() {
+			let redirect = '';
+			if (typeof this.$route.query?.redirect === 'string') {
+				redirect = decodeURIComponent(this.$route.query?.redirect);
+			}
+			return redirect;
+		},
+		async login(form: {
+			email: string;
+			password: string;
+			token?: string;
+			recoveryCode?: string;
+			otp?: string;
+		}) {
 			try {
 				this.loading = true;
-				await this.usersStore.loginWithCreds(values as { email: string; password: string });
-				this.clearAllStickyNotifications();
+				await this.usersStore.loginWithCreds({
+					email: form.email,
+					password: form.password,
+					mfaToken: form.token,
+					mfaRecoveryCode: form.recoveryCode,
+					otp: form.otp,
+				});
 				this.loading = false;
+				if (this.settingsStore.isCloudDeployment) {
+					try {
+						await this.cloudPlanStore.checkForCloudPlanData();
+					} catch (error) {
+						console.warn('Failed to check for cloud plan data', error);
+					}
+				}
+				await this.settingsStore.getSettings();
+				this.clearAllStickyNotifications();
+				this.checkRecoveryCodesLeft();
 
-				if (typeof this.$route.query.redirect === 'string') {
-					const redirect = decodeURIComponent(this.$route.query.redirect);
-					if (redirect.startsWith('/')) {
-						// protect against phishing
-						this.$router.push(redirect);
+				this.$telemetry.track('User attempted to login', {
+					result: this.showMfaView ? 'mfa_success' : 'success',
+				});
 
+				if (this.isRedirectSafe()) {
+					const redirect = this.getRedirectQueryParameter();
+					if (redirect.startsWith('http')) {
+						window.location.href = redirect;
 						return;
 					}
+
+					void this.$router.push(redirect);
+					return;
 				}
 
-				this.$router.push({ name: VIEWS.HOMEPAGE });
+				await this.$router.push({ name: VIEWS.HOMEPAGE });
 			} catch (error) {
-				this.$showError(error, this.$locale.baseText('auth.signin.error'));
+				if (error.errorCode === MFA_AUTHENTICATION_REQUIRED_ERROR_CODE) {
+					this.showMfaView = true;
+					this.cacheCredentials(form);
+					return;
+				}
+
+				this.$telemetry.track('User attempted to login', {
+					result: this.showMfaView ? 'mfa_token_rejected' : 'credentials_error',
+				});
+
+				if (!this.showMfaView) {
+					this.showError(error, this.$locale.baseText('auth.signin.error'));
+					this.loading = false;
+					return;
+				}
+
+				this.reportError = true;
+			}
+		},
+		onBackClick(fromForm: string) {
+			this.reportError = false;
+			if (fromForm === FORM.MFA_TOKEN) {
+				this.showMfaView = false;
 				this.loading = false;
 			}
 		},
+		onFormChanged(toForm: string) {
+			if (toForm === FORM.MFA_RECOVERY_CODE) {
+				this.reportError = false;
+			}
+		},
+		cacheCredentials(form: { email: string; password: string }) {
+			this.email = form.email;
+			this.password = form.password;
+		},
+		checkRecoveryCodesLeft() {
+			if (this.usersStore.currentUser) {
+				const { hasRecoveryCodesLeft, mfaEnabled } = this.usersStore.currentUser;
+
+				if (mfaEnabled && !hasRecoveryCodesLeft) {
+					this.showToast({
+						title: this.$locale.baseText('settings.mfa.toast.noRecoveryCodeLeft.title'),
+						message: this.$locale.baseText('settings.mfa.toast.noRecoveryCodeLeft.message'),
+						type: 'info',
+						duration: 0,
+						dangerouslyUseHTMLString: true,
+					});
+				}
+			}
+		},
 	},
 });
 </script>
diff --git a/packages/editor-ui/src/views/SignoutView.vue b/packages/editor-ui/src/views/SignoutView.vue
index e867e9849be5a..02dcc6aa349c5 100644
--- a/packages/editor-ui/src/views/SignoutView.vue
+++ b/packages/editor-ui/src/views/SignoutView.vue
@@ -1,28 +1,33 @@
 <script lang="ts">
 import { VIEWS } from '@/constants';
 import { mapStores } from 'pinia';
-import { useUsersStore } from '@/stores/users';
-import mixins from 'vue-typed-mixins';
-import { showMessage } from '@/mixins/showMessage';
+import { useUsersStore } from '@/stores/users.store';
+import { defineComponent } from 'vue';
+import { useToast } from '@/composables/useToast';
 
-export default mixins(showMessage).extend({
+export default defineComponent({
 	name: 'SignoutView',
+	setup() {
+		return {
+			...useToast(),
+		};
+	},
 	computed: {
 		...mapStores(useUsersStore),
 	},
+	mounted() {
+		void this.logout();
+	},
 	methods: {
 		async logout() {
 			try {
 				await this.usersStore.logout();
-				this.$router.replace({ name: VIEWS.SIGNIN });
+				void this.$router.replace({ name: VIEWS.SIGNIN });
 			} catch (e) {
-				this.$showError(e, this.$locale.baseText('auth.signout.error'));
+				this.showError(e, this.$locale.baseText('auth.signout.error'));
 			}
 		},
 	},
-	mounted() {
-		this.logout();
-	},
 });
 </script>
 
diff --git a/packages/editor-ui/src/views/SignupView.vue b/packages/editor-ui/src/views/SignupView.vue
index e6a689266bbe3..c391cbf8533fc 100644
--- a/packages/editor-ui/src/views/SignupView.vue
+++ b/packages/editor-ui/src/views/SignupView.vue
@@ -1,32 +1,37 @@
 <template>
-	<AuthView :form="FORM_CONFIG" :formLoading="loading" :subtitle="inviteMessage" @submit="onSubmit">
-		<div :class="$style.otp">
-			<p :class="$style.otpLabel">Secret:</p>
-			<p :class="$style.otp32">{{ otpSecretBase32 }}</p>
-			<div :class="$style.otpQR">
-				<img :src="otpSecretAuthURL" />
-			</div>
-		</div>
-	</AuthView>
+	<AuthView
+		:form="FORM_CONFIG"
+		:form-loading="loading"
+		:show-additional="true"
+		:otp-secret-auth-url="otpSecretAuthURL"
+		:otp-secret-base32="otpSecretBase32"
+		:subtitle="inviteMessage"
+		@submit="onSubmit"
+	/>
 </template>
 
 <script lang="ts">
-import AuthView from './AuthView.vue';
-import { showMessage } from '@/mixins/showMessage';
+import AuthView from '@/views/AuthView.vue';
+import { useToast } from '@/composables/useToast';
 
-import mixins from 'vue-typed-mixins';
+import { defineComponent } from 'vue';
 import QRCode from 'qrcode';
 import type { IFormBoxConfig } from '@/Interface';
 import { VIEWS } from '@/constants';
 import { mapStores } from 'pinia';
-import { useUIStore } from '@/stores/ui';
-import { useUsersStore } from '@/stores/users';
+import { useUIStore } from '@/stores/ui.store';
+import { useUsersStore } from '@/stores/users.store';
 
-export default mixins(showMessage).extend({
+export default defineComponent({
 	name: 'SignupView',
 	components: {
 		AuthView,
 	},
+	setup() {
+		return {
+			...useToast(),
+		};
+	},
 	data() {
 		const FORM_CONFIG: IFormBoxConfig = {
 			title: this.$locale.baseText('auth.signup.setupYourAccount'),
@@ -93,14 +98,8 @@ export default mixins(showMessage).extend({
 		};
 	},
 	async mounted() {
-		const inviterId =
-			!this.$route.query.inviterId || typeof this.$route.query.inviterId !== 'string'
-				? null
-				: this.$route.query.inviterId;
-		const inviteeId =
-			!this.$route.query.inviteeId || typeof this.$route.query.inviteeId !== 'string'
-				? null
-				: this.$route.query.inviteeId;
+		const inviterId = this.getQueryParameter('inviterId');
+		const inviteeId = this.getQueryParameter('inviteeId');
 
 		try {
 			if (!inviterId || !inviteeId) {
@@ -112,8 +111,8 @@ export default mixins(showMessage).extend({
 			const invite = await this.usersStore.validateSignupToken({ inviteeId, inviterId });
 			this.inviter = invite.inviter as { firstName: string; lastName: string };
 		} catch (e) {
-			this.$showError(e, this.$locale.baseText('auth.signup.tokenValidationError'));
-			this.$router.replace({ name: VIEWS.SIGNIN });
+			this.showError(e, this.$locale.baseText('auth.signup.tokenValidationError'));
+			void this.$router.replace({ name: VIEWS.SIGNIN });
 		}
 
 		const { base32, otpauth_url } = await this.usersStore.generateOTPSecret();
@@ -138,8 +137,8 @@ export default mixins(showMessage).extend({
 	methods: {
 		async onSubmit(values: { [key: string]: string | boolean }) {
 			if (!this.inviterId || !this.inviteeId) {
-				this.$showError(
-					new Error(this.$locale.baseText('auth.changePassword.tokenValidationError')),
+				this.showError(
+					new Error(this.$locale.baseText('auth.signup.tokenValidationError')),
 					this.$locale.baseText('auth.signup.setupYourAccountError'),
 				);
 				return;
@@ -147,7 +146,7 @@ export default mixins(showMessage).extend({
 
 			try {
 				this.loading = true;
-				await this.usersStore.signup({
+				await this.usersStore.acceptInvitation({
 					...values,
 					inviterId: this.inviterId,
 					inviteeId: this.inviteeId,
@@ -170,10 +169,15 @@ export default mixins(showMessage).extend({
 
 				await this.$router.push({ name: VIEWS.NEW_WORKFLOW });
 			} catch (error) {
-				this.$showError(error, this.$locale.baseText('auth.signup.setupYourAccountError'));
+				this.showError(error, this.$locale.baseText('auth.signup.setupYourAccountError'));
 			}
 			this.loading = false;
 		},
+		getQueryParameter(key: 'inviterId' | 'inviteeId'): string | null {
+			return !this.$route.query[key] || typeof this.$route.query[key] !== 'string'
+				? null
+				: (this.$route.query[key] as string);
+		},
 	},
 });
 </script>
diff --git a/packages/editor-ui/src/views/TemplatesCollectionView.vue b/packages/editor-ui/src/views/TemplatesCollectionView.vue
index 720a7929b4ff6..1dfad1a9bb673 100644
--- a/packages/editor-ui/src/views/TemplatesCollectionView.vue
+++ b/packages/editor-ui/src/views/TemplatesCollectionView.vue
@@ -1,5 +1,5 @@
 <template>
-	<TemplatesView :goBackEnabled="true">
+	<TemplatesView :go-back-enabled="true">
 		<template #header>
 			<div v-if="!notFoundError" :class="$style.wrapper">
 				<div :class="$style.title">
@@ -12,7 +12,7 @@
 					<n8n-loading :loading="!collection || !collection.name" :rows="2" variant="h1" />
 				</div>
 			</div>
-			<div :class="$style.notFound" v-else>
+			<div v-else :class="$style.notFound">
 				<n8n-text color="text-base">{{
 					$locale.baseText('templates.collectionsNotFound')
 				}}</n8n-text>
@@ -21,7 +21,7 @@
 		<template v-if="!notFoundError" #content>
 			<div :class="$style.wrapper">
 				<div :class="$style.mainContent">
-					<div :class="$style.markdown" v-if="loading || (collection && collection.description)">
+					<div v-if="loading || (collection && collection.description)" :class="$style.markdown">
 						<n8n-markdown
 							:content="collection && collection.description"
 							:images="collection && collection.image"
@@ -33,8 +33,8 @@
 						:loading="loading"
 						:use-workflow-button="true"
 						:workflows="loading ? [] : collectionWorkflows"
-						@useWorkflow="onUseWorkflow"
-						@openTemplate="onOpenTemplate"
+						@use-workflow="onUseWorkflow"
+						@open-template="onOpenTemplate"
 					/>
 				</div>
 				<div :class="$style.details">
@@ -50,11 +50,13 @@
 </template>
 
 <script lang="ts">
+import { defineComponent } from 'vue';
+import { mapStores } from 'pinia';
+
 import TemplateDetails from '@/components/TemplateDetails.vue';
 import TemplateList from '@/components/TemplateList.vue';
 import TemplatesView from './TemplatesView.vue';
 
-import { workflowHelpers } from '@/mixins/workflowHelpers';
 import type {
 	ITemplatesCollection,
 	ITemplatesCollectionFull,
@@ -62,26 +64,37 @@ import type {
 	ITemplatesWorkflowFull,
 } from '@/Interface';
 
-import mixins from 'vue-typed-mixins';
-import { setPageTitle } from '@/utils';
+import { setPageTitle } from '@/utils/htmlUtils';
 import { VIEWS } from '@/constants';
-import { mapStores } from 'pinia';
-import { useTemplatesStore } from '@/stores/templates';
+import { useTemplatesStore } from '@/stores/templates.store';
+import { usePostHog } from '@/stores/posthog.store';
+import { useTemplateWorkflow } from '@/utils/templates/templateActions';
+import { useExternalHooks } from '@/composables/useExternalHooks';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 
-export default mixins(workflowHelpers).extend({
+export default defineComponent({
 	name: 'TemplatesCollectionView',
 	components: {
 		TemplateDetails,
 		TemplateList,
 		TemplatesView,
 	},
+	setup() {
+		const externalHooks = useExternalHooks();
+
+		return {
+			externalHooks,
+		};
+	},
 	computed: {
-		...mapStores(useTemplatesStore),
-		collection(): null | ITemplatesCollectionFull {
+		...mapStores(useTemplatesStore, usePostHog),
+		collection(): ITemplatesCollectionFull | null {
 			return this.templatesStore.getCollectionById(this.collectionId);
 		},
 		collectionId(): string {
-			return this.$route.params.id;
+			return Array.isArray(this.$route.params.id)
+				? this.$route.params.id[0]
+				: this.$route.params.id;
 		},
 		collectionWorkflows(): Array<ITemplatesWorkflow | ITemplatesWorkflowFull | null> | null {
 			if (!this.collection) {
@@ -98,6 +111,30 @@ export default mixins(workflowHelpers).extend({
 			notFoundError: false,
 		};
 	},
+	watch: {
+		collection(collection: ITemplatesCollection) {
+			if (collection) {
+				setPageTitle(`n8n - Template collection: ${collection.name}`);
+			} else {
+				setPageTitle('n8n - Templates');
+			}
+		},
+	},
+	async mounted() {
+		this.scrollToTop();
+
+		if (this.collection && this.collection.full) {
+			this.loading = false;
+			return;
+		}
+
+		try {
+			await this.templatesStore.fetchCollectionById(this.collectionId);
+		} catch (e) {
+			this.notFoundError = true;
+		}
+		this.loading = false;
+	},
 	methods: {
 		scrollToTop() {
 			setTimeout(() => {
@@ -113,16 +150,18 @@ export default mixins(workflowHelpers).extend({
 		onOpenTemplate({ event, id }: { event: MouseEvent; id: string }) {
 			this.navigateTo(event, VIEWS.TEMPLATE, id);
 		},
-		onUseWorkflow({ event, id }: { event: MouseEvent; id: string }) {
-			const telemetryPayload = {
-				template_id: id,
-				wf_template_repo_session_id: this.workflowsStore.currentSessionId,
-				source: 'collection',
-			};
-			this.$externalHooks().run('templatesCollectionView.onUseWorkflow', telemetryPayload);
-			this.$telemetry.track('User inserted workflow template', telemetryPayload);
-
-			this.navigateTo(event, VIEWS.TEMPLATE_IMPORT, id);
+		async onUseWorkflow({ event, id }: { event: MouseEvent; id: string }) {
+			await useTemplateWorkflow({
+				posthogStore: this.posthogStore,
+				router: this.$router,
+				templateId: id,
+				inNewBrowserTab: event.metaKey || event.ctrlKey,
+				templatesStore: useTemplatesStore(),
+				externalHooks: this.externalHooks,
+				nodeTypesStore: useNodeTypesStore(),
+				telemetry: this.$telemetry,
+				source: 'template_list',
+			});
 		},
 		navigateTo(e: MouseEvent, page: string, id: string) {
 			if (e.metaKey || e.ctrlKey) {
@@ -130,34 +169,10 @@ export default mixins(workflowHelpers).extend({
 				window.open(route.href, '_blank');
 				return;
 			} else {
-				this.$router.push({ name: page, params: { id } });
-			}
-		},
-	},
-	watch: {
-		collection(collection: ITemplatesCollection) {
-			if (collection) {
-				setPageTitle(`n8n - Template collection: ${collection.name}`);
-			} else {
-				setPageTitle('n8n - Templates');
+				void this.$router.push({ name: page, params: { id } });
 			}
 		},
 	},
-	async mounted() {
-		this.scrollToTop();
-
-		if (this.collection && (this.collection as ITemplatesCollectionFull).full) {
-			this.loading = false;
-			return;
-		}
-
-		try {
-			await this.templatesStore.fetchCollectionById(this.collectionId);
-		} catch (e) {
-			this.notFoundError = true;
-		}
-		this.loading = false;
-	},
 });
 </script>
 
diff --git a/packages/editor-ui/src/views/TemplatesSearchView.vue b/packages/editor-ui/src/views/TemplatesSearchView.vue
index 6a4670af49d4f..8e0a5b77f80ae 100644
--- a/packages/editor-ui/src/views/TemplatesSearchView.vue
+++ b/packages/editor-ui/src/views/TemplatesSearchView.vue
@@ -10,8 +10,11 @@
 				<div :class="$style.button">
 					<n8n-button
 						size="large"
-						:label="$locale.baseText('templates.newButton')"
-						@click="openNewWorkflow"
+						type="secondary"
+						element="a"
+						:href="creatorHubUrl"
+						:label="$locale.baseText('templates.shareWorkflow')"
+						target="_blank"
 					/>
 				</div>
 			</div>
@@ -21,47 +24,51 @@
 				<div :class="$style.filters">
 					<TemplateFilters
 						:categories="templatesStore.allCategories"
-						:sortOnPopulate="areCategoriesPrepopulated"
-						:loading="loadingCategories"
+						:sort-on-populate="areCategoriesPrepopulated"
 						:selected="categories"
+						:loading="loadingCategories"
 						@clear="onCategoryUnselected"
-						@clearAll="onCategoriesCleared"
+						@clear-all="onCategoriesCleared"
 						@select="onCategorySelected"
 					/>
 				</div>
 				<div :class="$style.search">
 					<n8n-input
-						:value="search"
+						:model-value="search"
 						:placeholder="$locale.baseText('templates.searchPlaceholder')"
-						@input="onSearchInput"
-						@blur="trackSearch"
 						clearable
+						data-test-id="template-search-input"
+						@update:model-value="onSearchInput"
+						@blur="trackSearch"
 					>
 						<template #prefix>
 							<font-awesome-icon icon="search" />
 						</template>
 					</n8n-input>
-					<div :class="$style.carouselContainer" v-show="collections.length || loadingCollections">
+					<div v-show="collections.length || loadingCollections" :class="$style.carouselContainer">
 						<div :class="$style.header">
 							<n8n-heading :bold="true" size="medium" color="text-light">
 								{{ $locale.baseText('templates.collections') }}
-								<span v-if="!loadingCollections" v-text="`(${collections.length})`" />
+								<span
+									v-if="!loadingCollections"
+									data-test-id="collection-count-label"
+									v-text="`(${collections.length})`"
+								/>
 							</n8n-heading>
 						</div>
-
-						<CollectionsCarousel
+						<TemplatesInfoCarousel
 							:collections="collections"
 							:loading="loadingCollections"
-							@openCollection="onOpenCollection"
+							@open-collection="onOpenCollection"
 						/>
 					</div>
 					<TemplateList
 						:infinite-scroll-enabled="true"
 						:loading="loadingWorkflows"
-						:total-workflows="totalWorkflows"
 						:workflows="workflows"
-						@loadMore="onLoadMore"
-						@openTemplate="onOpenTemplate"
+						:total-count="totalWorkflows"
+						@load-more="onLoadMore"
+						@open-template="onOpenTemplate"
 					/>
 					<div v-if="endOfSearchMessage" :class="$style.endText">
 						<n8n-text size="medium" color="text-base">
@@ -75,28 +82,29 @@
 </template>
 
 <script lang="ts">
-import CollectionsCarousel from '@/components/CollectionsCarousel.vue';
+import { defineComponent } from 'vue';
+import { mapStores } from 'pinia';
+import TemplatesInfoCarousel from '@/components/TemplatesInfoCarousel.vue';
 import TemplateFilters from '@/components/TemplateFilters.vue';
 import TemplateList from '@/components/TemplateList.vue';
-import TemplatesView from './TemplatesView.vue';
+import TemplatesView from '@/views/TemplatesView.vue';
 
-import { genericHelpers } from '@/mixins/genericHelpers';
 import type {
 	ITemplatesCollection,
 	ITemplatesWorkflow,
 	ITemplatesQuery,
 	ITemplatesCategory,
 } from '@/Interface';
-import mixins from 'vue-typed-mixins';
 import type { IDataObject } from 'n8n-workflow';
-import { setPageTitle } from '@/utils';
-import { VIEWS } from '@/constants';
-import { debounceHelper } from '@/mixins/debounce';
-import { mapStores } from 'pinia';
-import { useSettingsStore } from '@/stores/settings';
-import { useUsersStore } from '@/stores/users';
-import { useTemplatesStore } from '@/stores/templates';
-import { useUIStore } from '@/stores/ui';
+import { setPageTitle } from '@/utils/htmlUtils';
+import { CREATOR_HUB_URL, VIEWS } from '@/constants';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useUsersStore } from '@/stores/users.store';
+import { useTemplatesStore } from '@/stores/templates.store';
+import { useUIStore } from '@/stores/ui.store';
+import { useToast } from '@/composables/useToast';
+import { usePostHog } from '@/stores/posthog.store';
+import { useDebounce } from '@/composables/useDebounce';
 
 interface ISearchEvent {
 	search_string: string;
@@ -106,18 +114,26 @@ interface ISearchEvent {
 	wf_template_repo_session_id: string;
 }
 
-export default mixins(genericHelpers, debounceHelper).extend({
+export default defineComponent({
 	name: 'TemplatesSearchView',
 	components: {
-		CollectionsCarousel,
+		TemplatesInfoCarousel,
 		TemplateFilters,
 		TemplateList,
 		TemplatesView,
 	},
+	setup() {
+		const { callDebounced } = useDebounce();
+
+		return {
+			callDebounced,
+			...useToast(),
+		};
+	},
 	data() {
 		return {
 			areCategoriesPrepopulated: false,
-			categories: [] as number[],
+			categories: [] as ITemplatesCategory[],
 			loading: true,
 			loadingCategories: true,
 			loadingCollections: true,
@@ -125,26 +141,24 @@ export default mixins(genericHelpers, debounceHelper).extend({
 			search: '',
 			searchEventToTrack: null as null | ISearchEvent,
 			errorLoadingWorkflows: false,
+			creatorHubUrl: CREATOR_HUB_URL as string,
 		};
 	},
 	computed: {
-		...mapStores(useSettingsStore, useTemplatesStore, useUIStore, useUsersStore),
+		...mapStores(useSettingsStore, useTemplatesStore, useUIStore, useUsersStore, usePostHog),
 		totalWorkflows(): number {
-			return this.templatesStore.getSearchedWorkflowsTotal(this.query);
+			return this.templatesStore.getSearchedWorkflowsTotal(this.createQueryObject('name'));
 		},
 		workflows(): ITemplatesWorkflow[] {
-			return this.templatesStore.getSearchedWorkflows(this.query) || [];
+			return this.templatesStore.getSearchedWorkflows(this.createQueryObject('name')) ?? [];
 		},
 		collections(): ITemplatesCollection[] {
-			return this.templatesStore.getSearchedCollections(this.query) || [];
+			return this.templatesStore.getSearchedCollections(this.createQueryObject('id')) ?? [];
 		},
 		endOfSearchMessage(): string | null {
 			if (this.loadingWorkflows) {
 				return null;
 			}
-			if (this.workflows.length && this.workflows.length >= this.totalWorkflows) {
-				return this.$locale.baseText('templates.endResult');
-			}
 			if (
 				!this.loadingCollections &&
 				this.workflows.length === 0 &&
@@ -158,12 +172,6 @@ export default mixins(genericHelpers, debounceHelper).extend({
 
 			return null;
 		},
-		query(): ITemplatesQuery {
-			return {
-				categories: this.categories,
-				search: this.search,
-			};
-		},
 		nothingFound(): boolean {
 			return (
 				!this.loadingWorkflows &&
@@ -173,7 +181,57 @@ export default mixins(genericHelpers, debounceHelper).extend({
 			);
 		},
 	},
+	watch: {
+		workflows(newWorkflows) {
+			if (newWorkflows.length === 0) {
+				this.scrollTo(0);
+			}
+		},
+	},
+	async mounted() {
+		setPageTitle('n8n - Templates');
+		await this.loadCategories();
+		void this.loadWorkflowsAndCollections(true);
+		void this.usersStore.showPersonalizationSurvey();
+
+		this.restoreSearchFromRoute();
+
+		setTimeout(() => {
+			// Check if there is scroll position saved in route and scroll to it
+			if (this.$route.meta && this.$route.meta.scrollOffset > 0) {
+				this.scrollTo(this.$route.meta.scrollOffset, 'auto');
+			}
+		}, 100);
+	},
 	methods: {
+		createQueryObject(categoryId: 'name' | 'id'): ITemplatesQuery {
+			// We are using category names for template search and ids for collection search
+			return {
+				categories: this.categories.map((category) =>
+					categoryId === 'name' ? category.name : String(category.id),
+				),
+				search: this.search,
+			};
+		},
+		restoreSearchFromRoute() {
+			let updateSearch = false;
+			if (this.$route.query.search && typeof this.$route.query.search === 'string') {
+				this.search = this.$route.query.search;
+				updateSearch = true;
+			}
+			if (typeof this.$route.query.categories === 'string' && this.$route.query.categories.length) {
+				const categoriesFromURL = this.$route.query.categories.split(',');
+				this.categories = this.templatesStore.allCategories.filter((category) =>
+					categoriesFromURL.includes(category.id.toString()),
+				);
+				updateSearch = true;
+			}
+			if (updateSearch) {
+				this.updateSearch();
+				this.trackCategories();
+				this.areCategoriesPrepopulated = true;
+			}
+		},
 		onOpenCollection({ event, id }: { event: MouseEvent; id: string }) {
 			this.navigateTo(event, VIEWS.COLLECTION, id);
 		},
@@ -186,12 +244,12 @@ export default mixins(genericHelpers, debounceHelper).extend({
 				window.open(route.href, '_blank');
 				return;
 			} else {
-				this.$router.push({ name: page, params: { id } });
+				void this.$router.push({ name: page, params: { id } });
 			}
 		},
 		updateSearch() {
-			this.updateQueryParam(this.search, this.categories.join(','));
-			this.loadWorkflowsAndCollections(false);
+			this.updateQueryParam(this.search, this.categories.map((category) => category.id).join(','));
+			void this.loadWorkflowsAndCollections(false);
 		},
 		updateSearchTracking(search: string, categories: number[]) {
 			if (!search) {
@@ -220,27 +278,26 @@ export default mixins(genericHelpers, debounceHelper).extend({
 				this.searchEventToTrack = null;
 			}
 		},
-		openNewWorkflow() {
-			this.uiStore.nodeViewInitialized = false;
-			this.$router.push({ name: VIEWS.NEW_WORKFLOW });
-		},
 		onSearchInput(search: string) {
 			this.loadingWorkflows = true;
 			this.loadingCollections = true;
 			this.search = search;
-			this.callDebounced('updateSearch', { debounceTime: 500, trailing: true });
+			void this.callDebounced(this.updateSearch, {
+				debounceTime: 500,
+				trailing: true,
+			});
 
 			if (search.length === 0) {
 				this.trackSearch();
 			}
 		},
-		onCategorySelected(selected: number) {
+		onCategorySelected(selected: ITemplatesCategory) {
 			this.categories = this.categories.concat(selected);
 			this.updateSearch();
 			this.trackCategories();
 		},
-		onCategoryUnselected(selected: number) {
-			this.categories = this.categories.filter((id) => id !== selected);
+		onCategoryUnselected(selected: ITemplatesCategory) {
+			this.categories = this.categories.filter((category) => category.id !== selected.id);
 			this.updateSearch();
 			this.trackCategories();
 		},
@@ -252,9 +309,7 @@ export default mixins(genericHelpers, debounceHelper).extend({
 			if (this.categories.length) {
 				this.$telemetry.track('User changed template filters', {
 					search_string: this.search,
-					categories_applied: this.categories.map((categoryId: number) =>
-						this.templatesStore.getCollectionById(categoryId.toString()),
-					),
+					categories_applied: this.categories,
 					wf_template_repo_session_id: this.templatesStore.currentSessionId,
 				});
 			}
@@ -274,7 +329,7 @@ export default mixins(genericHelpers, debounceHelper).extend({
 				delete query.search;
 			}
 
-			this.$router.replace({ query });
+			void this.$router.replace({ query });
 		},
 		async onLoadMore() {
 			if (this.workflows.length >= this.totalWorkflows) {
@@ -283,11 +338,11 @@ export default mixins(genericHelpers, debounceHelper).extend({
 			try {
 				this.loadingWorkflows = true;
 				await this.templatesStore.getMoreWorkflows({
-					categories: this.categories,
+					categories: this.categories.map((category) => category.name),
 					search: this.search,
 				});
 			} catch (e) {
-				this.$showMessage({
+				this.showMessage({
 					title: 'Error',
 					message: 'Could not load more workflows',
 					type: 'error',
@@ -306,7 +361,7 @@ export default mixins(genericHelpers, debounceHelper).extend({
 			try {
 				this.loadingCollections = true;
 				await this.templatesStore.getCollections({
-					categories: this.categories,
+					categories: this.categories.map((category) => String(category.id)),
 					search: this.search,
 				});
 			} catch (e) {}
@@ -318,7 +373,7 @@ export default mixins(genericHelpers, debounceHelper).extend({
 				this.loadingWorkflows = true;
 				await this.templatesStore.getWorkflows({
 					search: this.search,
-					categories: this.categories,
+					categories: this.categories.map((category) => category.name),
 				});
 				this.errorLoadingWorkflows = false;
 			} catch (e) {
@@ -332,7 +387,10 @@ export default mixins(genericHelpers, debounceHelper).extend({
 			const categories = [...this.categories];
 			await Promise.all([this.loadWorkflows(), this.loadCollections()]);
 			if (!initialLoad) {
-				this.updateSearchTracking(search, categories);
+				this.updateSearchTracking(
+					search,
+					categories.map((category) => category.id),
+				);
 			}
 		},
 		scrollTo(position: number, behavior: ScrollBehavior = 'smooth') {
@@ -347,20 +405,12 @@ export default mixins(genericHelpers, debounceHelper).extend({
 			}, 0);
 		},
 	},
-	watch: {
-		workflows(newWorkflows) {
-			if (newWorkflows.length === 0) {
-				this.scrollTo(0);
-			}
-		},
-	},
 	beforeRouteLeave(to, from, next) {
 		const contentArea = document.getElementById('content');
 		if (contentArea) {
 			// When leaving this page, store current scroll position in route data
 			if (
-				this.$route.meta &&
-				this.$route.meta.setScrollPosition &&
+				this.$route.meta?.setScrollPosition &&
 				typeof this.$route.meta.setScrollPosition === 'function'
 			) {
 				this.$route.meta.setScrollPosition(contentArea.scrollTop);
@@ -370,31 +420,6 @@ export default mixins(genericHelpers, debounceHelper).extend({
 		this.trackSearch();
 		next();
 	},
-	async mounted() {
-		setPageTitle('n8n - Templates');
-		this.loadCategories();
-		this.loadWorkflowsAndCollections(true);
-		this.usersStore.showPersonalizationSurvey();
-
-		setTimeout(() => {
-			// Check if there is scroll position saved in route and scroll to it
-			if (this.$route.meta && this.$route.meta.scrollOffset > 0) {
-				this.scrollTo(this.$route.meta.scrollOffset, 'auto');
-			}
-		}, 100);
-	},
-	async created() {
-		if (this.$route.query.search && typeof this.$route.query.search === 'string') {
-			this.search = this.$route.query.search;
-		}
-
-		if (typeof this.$route.query.categories === 'string' && this.$route.query.categories.length) {
-			this.categories = this.$route.query.categories
-				.split(',')
-				.map((categoryId) => parseInt(categoryId, 10));
-			this.areCategoriesPrepopulated = true;
-		}
-	},
 });
 </script>
 
@@ -416,11 +441,11 @@ export default mixins(genericHelpers, debounceHelper).extend({
 .filters {
 	width: 200px;
 	margin-bottom: var(--spacing-xl);
+	margin-right: var(--spacing-2xl);
 }
 
 .search {
 	width: 100%;
-	padding-left: var(--spacing-2xl);
 
 	> * {
 		margin-bottom: var(--spacing-l);
diff --git a/packages/editor-ui/src/views/TemplatesView.vue b/packages/editor-ui/src/views/TemplatesView.vue
index 2b5d8a48b14de..d1efe2c900ac7 100644
--- a/packages/editor-ui/src/views/TemplatesView.vue
+++ b/packages/editor-ui/src/views/TemplatesView.vue
@@ -2,7 +2,7 @@
 	<div :class="$style.template">
 		<div :class="$style.container">
 			<div :class="$style.header">
-				<div :class="$style.goBack" v-if="goBackEnabled">
+				<div v-if="goBackEnabled" :class="$style.goBack">
 					<GoBackButton />
 				</div>
 				<slot name="header"></slot>
diff --git a/packages/editor-ui/src/views/TemplatesWorkflowView.vue b/packages/editor-ui/src/views/TemplatesWorkflowView.vue
index 47139550d23c9..d66a81c75a10f 100644
--- a/packages/editor-ui/src/views/TemplatesWorkflowView.vue
+++ b/packages/editor-ui/src/views/TemplatesWorkflowView.vue
@@ -1,5 +1,5 @@
 <template>
-	<TemplatesView :goBackEnabled="true">
+	<TemplatesView :go-back-enabled="true">
 		<template #header>
 			<div v-if="!notFoundError" :class="$style.wrapper">
 				<div :class="$style.title">
@@ -14,14 +14,15 @@
 				<div :class="$style.button">
 					<n8n-button
 						v-if="template"
+						data-test-id="use-template-button"
 						:label="$locale.baseText('template.buttons.useThisWorkflowButton')"
 						size="large"
-						@click="openWorkflow(template.id, $event)"
+						@click="openTemplateSetup(templateId, $event)"
 					/>
 					<n8n-loading :loading="!template" :rows="1" variant="button" />
 				</div>
 			</div>
-			<div :class="$style.notFound" v-else>
+			<div v-else :class="$style.notFound">
 				<n8n-text color="text-base">{{ $locale.baseText('templates.workflowsNotFound') }}</n8n-text>
 			</div>
 		</template>
@@ -35,7 +36,7 @@
 				/>
 			</div>
 			<div :class="$style.content">
-				<div :class="$style.markdown">
+				<div :class="$style.markdown" data-test-id="template-description">
 					<n8n-markdown
 						:content="template && template.description"
 						:images="template && template.image"
@@ -55,32 +56,44 @@
 </template>
 
 <script lang="ts">
+import { defineComponent } from 'vue';
+import { mapStores } from 'pinia';
+
 import TemplateDetails from '@/components/TemplateDetails.vue';
 import TemplatesView from './TemplatesView.vue';
 import WorkflowPreview from '@/components/WorkflowPreview.vue';
 
-import type { ITemplatesWorkflow, ITemplatesWorkflowFull } from '@/Interface';
-import { workflowHelpers } from '@/mixins/workflowHelpers';
-import mixins from 'vue-typed-mixins';
-import { setPageTitle } from '@/utils';
-import { VIEWS } from '@/constants';
-import { mapStores } from 'pinia';
-import { useTemplatesStore } from '@/stores/templates';
+import type { ITemplatesWorkflowFull } from '@/Interface';
+import { setPageTitle } from '@/utils/htmlUtils';
+import { useTemplatesStore } from '@/stores/templates.store';
+import { usePostHog } from '@/stores/posthog.store';
+import { useTemplateWorkflow } from '@/utils/templates/templateActions';
+import { useExternalHooks } from '@/composables/useExternalHooks';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 
-export default mixins(workflowHelpers).extend({
+export default defineComponent({
 	name: 'TemplatesWorkflowView',
 	components: {
 		TemplateDetails,
 		TemplatesView,
 		WorkflowPreview,
 	},
+	setup() {
+		const externalHooks = useExternalHooks();
+
+		return {
+			externalHooks,
+		};
+	},
 	computed: {
-		...mapStores(useTemplatesStore),
-		template(): ITemplatesWorkflow | ITemplatesWorkflowFull {
-			return this.templatesStore.getTemplateById(this.templateId);
+		...mapStores(useTemplatesStore, usePostHog),
+		template(): ITemplatesWorkflowFull | null {
+			return this.templatesStore.getFullTemplateById(this.templateId);
 		},
 		templateId() {
-			return this.$route.params.id;
+			return Array.isArray(this.$route.params.id)
+				? this.$route.params.id[0]
+				: this.$route.params.id;
 		},
 	},
 	data() {
@@ -90,38 +103,6 @@ export default mixins(workflowHelpers).extend({
 			notFoundError: false,
 		};
 	},
-	methods: {
-		openWorkflow(id: string, e: PointerEvent) {
-			const telemetryPayload = {
-				source: 'workflow',
-				template_id: id,
-				wf_template_repo_session_id: this.templatesStore.currentSessionId,
-			};
-
-			this.$externalHooks().run('templatesWorkflowView.openWorkflow', telemetryPayload);
-			this.$telemetry.track('User inserted workflow template', telemetryPayload);
-
-			if (e.metaKey || e.ctrlKey) {
-				const route = this.$router.resolve({ name: VIEWS.TEMPLATE_IMPORT, params: { id } });
-				window.open(route.href, '_blank');
-				return;
-			} else {
-				this.$router.push({ name: VIEWS.TEMPLATE_IMPORT, params: { id } });
-			}
-		},
-		onHidePreview() {
-			this.showPreview = false;
-		},
-		scrollToTop() {
-			const contentArea = document.getElementById('content');
-
-			if (contentArea) {
-				contentArea.scrollTo({
-					top: 0,
-				});
-			}
-		},
-	},
 	watch: {
 		template(template: ITemplatesWorkflowFull) {
 			if (template) {
@@ -134,7 +115,7 @@ export default mixins(workflowHelpers).extend({
 	async mounted() {
 		this.scrollToTop();
 
-		if (this.template && (this.template as ITemplatesWorkflowFull).full) {
+		if (this.template && this.template.full) {
 			this.loading = false;
 			return;
 		}
@@ -147,6 +128,33 @@ export default mixins(workflowHelpers).extend({
 
 		this.loading = false;
 	},
+	methods: {
+		async openTemplateSetup(id: string, e: PointerEvent) {
+			await useTemplateWorkflow({
+				posthogStore: this.posthogStore,
+				router: this.$router,
+				templateId: id,
+				inNewBrowserTab: e.metaKey || e.ctrlKey,
+				externalHooks: this.externalHooks,
+				nodeTypesStore: useNodeTypesStore(),
+				telemetry: this.$telemetry,
+				templatesStore: useTemplatesStore(),
+				source: 'template_preview',
+			});
+		},
+		onHidePreview() {
+			this.showPreview = false;
+		},
+		scrollToTop() {
+			const contentArea = document.getElementById('content');
+
+			if (contentArea) {
+				contentArea.scrollTo({
+					top: 0,
+				});
+			}
+		},
+	},
 });
 </script>
 
diff --git a/packages/editor-ui/src/views/TestSuiteNodeView.vue b/packages/editor-ui/src/views/TestSuiteNodeView.vue
new file mode 100644
index 0000000000000..4993f0c28d274
--- /dev/null
+++ b/packages/editor-ui/src/views/TestSuiteNodeView.vue
@@ -0,0 +1,82 @@
+<template>
+	<TestsListNodeLayout
+		ref="layout"
+		:work-flow-nodes="currentWorkFlow?.nodes"
+		:initialize="initialize"
+		:current-test-suite-name="currentTestSuite?.name || ''"
+		:current-test-suite-description="currentTestSuite?.description || ''"
+	>
+		<template #default="{ data }">
+			<TestSuiteNodeCard class="mb-2xs" :data="data" />
+		</template>
+	</TestsListNodeLayout>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import TestsListNodeLayout from '../components/TestsListNodeLayout.vue';
+import TestSuiteNodeCard from '@/components/TestSuiteNodeCard.vue';
+import type { IWorkflowDb, TestSuiteDb } from '@/Interface';
+import { mapStores } from 'pinia';
+import { useUIStore } from '@/stores/ui.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+
+export default defineComponent({
+	name: 'TestSuiteNodeView',
+	components: {
+		TestsListNodeLayout,
+		TestSuiteNodeCard,
+	},
+	data() {
+		return {};
+	},
+	computed: {
+		...mapStores(useUIStore, useWorkflowsStore),
+		currentWorkFlow(): IWorkflowDb | null {
+			return this.workflowsStore.workflowsById[this.$route.params.workflow] || null;
+		},
+		currentTestSuite(): TestSuiteDb | null {
+			return this.workflowsStore.testSuitesById[this.$route.params.test] || null;
+		},
+		testSuites(): TestSuiteDb[] {
+			return this.workflowsStore.allTestSuites;
+		},
+	},
+	methods: {
+		async initialize() {
+			await this.workflowsStore.fetchWorkflow(this.$route.params.workflow);
+			await this.workflowsStore.fetchWorkflowTestSuites(this.$route.params.workflow);
+			await this.workflowsStore.fetchWorkflowNodeOutput(this.$route.params.test);
+		},
+	},
+});
+</script>
+
+<style lang="scss" module>
+.actionsContainer {
+	display: flex;
+	justify-content: center;
+}
+.emptyStateCard {
+	width: 192px;
+	text-align: center;
+	display: inline-flex;
+	height: 230px;
+	& + & {
+		margin-left: var(--spacing-s);
+	}
+	&:hover {
+		svg {
+			color: var(--color-primary);
+		}
+	}
+}
+.emptyStateCardIcon {
+	font-size: 48px;
+	svg {
+		width: 48px !important;
+		color: var(--color-foreground-dark);
+		transition: color 0.3s ease;
+	}
+}
+</style>
diff --git a/packages/editor-ui/src/views/TestSuiteView.vue b/packages/editor-ui/src/views/TestSuiteView.vue
new file mode 100644
index 0000000000000..e909c9be5f956
--- /dev/null
+++ b/packages/editor-ui/src/views/TestSuiteView.vue
@@ -0,0 +1,128 @@
+<template>
+	<TestsListLayout
+		ref="layout"
+		:test-suites="testSuites"
+		:initialize="initialize"
+		:current-work-flow-name="currentWorkFlow?.name || ''"
+		@click:add="addTestSuite"
+	>
+		<template #default="{ data, updateItemSize }">
+			<TestSuiteCard
+				data-test-id="resources-list-item"
+				class="mb-2xs"
+				:data="data"
+				:is-test-card="true"
+				@expand:tags="updateItemSize(data)"
+			/>
+		</template>
+		<template #empty>
+			<div class="text-center mt-s">
+				<n8n-text size="large" color="text-base">
+					{{ $locale.baseText('testSuites.workflows.tests.empty.description') }}
+				</n8n-text>
+			</div>
+		</template>
+	</TestsListLayout>
+</template>
+
+<script lang="ts">
+import TestsListLayout from '@/components/TestsListLayout.vue';
+import TestSuiteCard from '@/components/TestSuiteCard.vue';
+import type { IWorkflowDb, TestSuiteDb } from '@/Interface';
+import { mapStores } from 'pinia';
+import { useUIStore } from '@/stores/ui.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { ADD_TEST_SUITE_MODAL_KEY } from '@/constants';
+
+const StatusFilter = {
+	ACTIVE: true,
+	DEACTIVATED: false,
+	ALL: '',
+};
+
+export default {
+	name: 'TestSuitesView',
+	components: {
+		TestsListLayout,
+		TestSuiteCard,
+	},
+	data() {
+		return {};
+	},
+	computed: {
+		...mapStores(useUIStore, useWorkflowsStore),
+		currentWorkFlow(): IWorkflowDb | null {
+			return this.workflowsStore.workflowsById[this.$route.params.workflow as string] || null;
+		},
+		testSuites(): TestSuiteDb[] {
+			return this.workflowsStore.allTestSuites;
+		},
+		hasActiveWorkflows(): boolean {
+			return !!this.workflowsStore.activeWorkflows.length;
+		},
+		statusFilterOptions(): Array<{ label: string; value: string | boolean }> {
+			return [
+				{
+					label: this.$locale.baseText('workflows.filters.status.all'),
+					value: StatusFilter.ALL,
+				},
+				{
+					label: this.$locale.baseText('workflows.filters.status.active'),
+					value: StatusFilter.ACTIVE,
+				},
+				{
+					label: this.$locale.baseText('workflows.filters.status.deactivated'),
+					value: StatusFilter.DEACTIVATED,
+				},
+			];
+		},
+	},
+	mounted() {
+		this.workflowsStore.resetWorkflowTestSuites();
+	},
+	methods: {
+		async initialize() {
+			await this.workflowsStore.fetchWorkflow(this.$route.params.workflow as string);
+			await this.workflowsStore.fetchWorkflowTestSuites(this.$route.params.workflow as string);
+		},
+		addTestSuite() {
+			this.openAddTestModal();
+		},
+		openAddTestModal(): void {
+			this.uiStore.openModalWithData({
+				name: ADD_TEST_SUITE_MODAL_KEY,
+				data: { workflow: this.$route.params.workflow },
+			});
+		},
+	},
+};
+</script>
+
+<style lang="scss" module>
+.actionsContainer {
+	display: flex;
+	justify-content: center;
+}
+.emptyStateCard {
+	width: 192px;
+	text-align: center;
+	display: inline-flex;
+	height: 230px;
+	& + & {
+		margin-left: var(--spacing-s);
+	}
+	&:hover {
+		svg {
+			color: var(--color-primary);
+		}
+	}
+}
+.emptyStateCardIcon {
+	font-size: 48px;
+	svg {
+		width: 48px !important;
+		color: var(--color-foreground-dark);
+		transition: color 0.3s ease;
+	}
+}
+</style>
diff --git a/packages/editor-ui/src/views/TestSuitesView.vue b/packages/editor-ui/src/views/TestSuitesView.vue
new file mode 100644
index 0000000000000..7692d4f718e52
--- /dev/null
+++ b/packages/editor-ui/src/views/TestSuitesView.vue
@@ -0,0 +1,162 @@
+<template>
+	<WorkflowsListLayout
+		ref="layout"
+		resource-key="workflows"
+		:resources="allWorkflows"
+		:filters="filters"
+		:additional-filters-handler="onFilter"
+		:initialize="initialize"
+		@update:filters="filters = $event"
+	>
+		<template #default="{ data, updateItemSize }">
+			<TestSuiteCard
+				data-test-id="resources-list-item"
+				class="mb-2xs"
+				:data="data"
+				@expand:tags="updateItemSize(data)"
+			/>
+		</template>
+		<template #empty>
+			<div class="text-center mt-s">
+				<n8n-text size="large" color="text-base">
+					{{ $locale.baseText('testSuites.workflows.empty.description') }}
+				</n8n-text>
+			</div>
+		</template>
+		<template #filters="{ setKeyValue }">
+			<div class="mb-s">
+				<n8n-input-label
+					:label="$locale.baseText('workflows.filters.status')"
+					:bold="false"
+					size="small"
+					color="text-base"
+					class="mb-3xs"
+				/>
+				<n8n-select :value="filters.status" size="medium" @input="setKeyValue('status', $event)">
+					<n8n-option
+						v-for="option in statusFilterOptions"
+						:key="option.label"
+						:label="option.label"
+						:value="option.value"
+					/>
+				</n8n-select>
+			</div>
+		</template>
+	</WorkflowsListLayout>
+</template>
+
+<script lang="ts">
+// eslint-disable-next-line import/no-unresolved
+import WorkflowsListLayout from '../components/WorkflowsListLayout.vue';
+import TestSuiteCard from '@/components/TestSuiteCard.vue';
+import type { IWorkflowDb } from '@/Interface';
+import { mapStores } from 'pinia';
+import { useUIStore } from '@/stores/ui.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+
+const StatusFilter = {
+	ACTIVE: true,
+	DEACTIVATED: false,
+	ALL: '',
+};
+
+export default {
+	name: 'TestSuitesView',
+	components: {
+		WorkflowsListLayout,
+		TestSuiteCard,
+	},
+	data() {
+		return {
+			filters: {
+				search: '',
+				ownedBy: '',
+				sharedWith: '',
+				status: StatusFilter.ALL,
+				tags: [] as string[],
+			},
+		};
+	},
+	computed: {
+		...mapStores(useUIStore, useWorkflowsStore),
+		allWorkflows(): IWorkflowDb[] {
+			return this.workflowsStore.allWorkflows;
+		},
+		hasActiveWorkflows(): boolean {
+			return !!this.workflowsStore.activeWorkflows.length;
+		},
+		statusFilterOptions(): Array<{ label: string; value: string | boolean }> {
+			return [
+				{
+					label: this.$locale.baseText('workflows.filters.status.all'),
+					value: StatusFilter.ALL,
+				},
+				{
+					label: this.$locale.baseText('workflows.filters.status.active'),
+					value: StatusFilter.ACTIVE,
+				},
+				{
+					label: this.$locale.baseText('workflows.filters.status.deactivated'),
+					value: StatusFilter.DEACTIVATED,
+				},
+			];
+		},
+	},
+	watch: {
+		'filters.tags'() {
+			this.sendFiltersTelemetry('tags');
+		},
+	},
+	mounted() {},
+	methods: {
+		async initialize() {
+			await Promise.all([
+				this.workflowsStore.fetchAllWorkflows(),
+				this.workflowsStore.fetchActiveWorkflows(),
+			]);
+		},
+		onFilter(
+			resource: IWorkflowDb,
+			filters: { tags: string[]; search: string; status: string | boolean },
+			matches: boolean,
+		): boolean {
+			if (filters.status !== '') {
+				matches = matches && resource.active === filters.status;
+			}
+			return matches;
+		},
+		sendFiltersTelemetry(source: string) {
+			(this.$refs.layout as unknown).sendFiltersTelemetry(source);
+		},
+	},
+};
+</script>
+
+<style lang="scss" module>
+.actionsContainer {
+	display: flex;
+	justify-content: center;
+}
+.emptyStateCard {
+	width: 192px;
+	text-align: center;
+	display: inline-flex;
+	height: 230px;
+	& + & {
+		margin-left: var(--spacing-s);
+	}
+	&:hover {
+		svg {
+			color: var(--color-primary);
+		}
+	}
+}
+.emptyStateCardIcon {
+	font-size: 48px;
+	svg {
+		width: 48px !important;
+		color: var(--color-foreground-dark);
+		transition: color 0.3s ease;
+	}
+}
+</style>
diff --git a/packages/editor-ui/src/views/VariablesView.vue b/packages/editor-ui/src/views/VariablesView.vue
index d3dd983858c76..478ce29c969a3 100644
--- a/packages/editor-ui/src/views/VariablesView.vue
+++ b/packages/editor-ui/src/views/VariablesView.vue
@@ -1,12 +1,19 @@
 <script lang="ts" setup>
-import { computed, ref } from 'vue';
-import { useEnvironmentsStore, useUIStore, useSettingsStore, useUsersStore } from '@/stores';
-import { useI18n, useTelemetry, useToast, useUpgradeLink, useMessage } from '@/composables';
+import { computed, ref, onBeforeMount, onBeforeUnmount } from 'vue';
+import { useEnvironmentsStore } from '@/stores/environments.ee.store';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useSourceControlStore } from '@/stores/sourceControl.store';
+import { useUIStore } from '@/stores/ui.store';
+import { useUsersStore } from '@/stores/users.store';
+import { useI18n } from '@/composables/useI18n';
+import { useTelemetry } from '@/composables/useTelemetry';
+import { useToast } from '@/composables/useToast';
+import { useMessage } from '@/composables/useMessage';
 
 import ResourcesListLayout from '@/components/layouts/ResourcesListLayout.vue';
 import VariablesRow from '@/components/VariablesRow.vue';
 
-import { EnterpriseEditionFeature } from '@/constants';
+import { EnterpriseEditionFeature, MODAL_CONFIRM } from '@/constants';
 import type {
 	DatatableColumn,
 	EnvironmentVariable,
@@ -22,6 +29,8 @@ const uiStore = useUIStore();
 const telemetry = useTelemetry();
 const i18n = useI18n();
 const message = useMessage();
+const sourceControlStore = useSourceControlStore();
+let sourceControlStoreUnsubscribe = () => {};
 
 const layoutRef = ref<InstanceType<typeof ResourcesListLayout> | null>(null);
 
@@ -65,15 +74,11 @@ const datatableColumns = computed<DatatableColumn[]>(() => [
 					path: 'actions',
 					label: '',
 				},
-		  ]
+			]
 		: []),
 ]);
 
 const contextBasedTranslationKeys = computed(() => uiStore.contextBasedTranslationKeys);
-const { upgradeLinkUrl } = useUpgradeLink({
-	default: '&source=variables',
-	desktop: '&utm_campaign=upgrade-variables',
-});
 
 const newlyAddedVariableIds = ref<number[]>([]);
 
@@ -111,6 +116,7 @@ function resetNewVariablesList() {
 }
 
 async function initialize() {
+	if (!isFeatureEnabled.value) return;
 	await environmentsStore.fetchAllVariables();
 
 	allVariables.value = [...environmentsStore.variables];
@@ -153,9 +159,8 @@ async function saveVariable(data: EnvironmentVariable | TemporaryEnvironmentVari
 			newlyAddedVariableIds.value.unshift(updatedVariable.id);
 		} else {
 			updatedVariable = await environmentsStore.updateVariable(data as EnvironmentVariable);
-			allVariables.value = allVariables.value.map((variable) =>
-				variable.id === data.id ? updatedVariable : variable,
-			);
+			allVariables.value = allVariables.value.filter((variable) => variable.id !== data.id);
+			allVariables.value.push(updatedVariable);
 			toggleEditing(updatedVariable);
 		}
 	} catch (error) {
@@ -180,7 +185,7 @@ function cancelEditing(data: EnvironmentVariable | TemporaryEnvironmentVariable)
 
 async function deleteVariable(data: EnvironmentVariable) {
 	try {
-		await message.confirm(
+		const confirmed = await message.confirm(
 			i18n.baseText('variables.modals.deleteConfirm.message', { interpolate: { name: data.key } }),
 			i18n.baseText('variables.modals.deleteConfirm.title'),
 			{
@@ -188,11 +193,11 @@ async function deleteVariable(data: EnvironmentVariable) {
 				cancelButtonText: i18n.baseText('variables.modals.deleteConfirm.cancelButton'),
 			},
 		);
-	} catch (e) {
-		return;
-	}
 
-	try {
+		if (confirmed !== MODAL_CONFIRM) {
+			return;
+		}
+
 		await environmentsStore.deleteVariable(data);
 		allVariables.value = allVariables.value.filter((variable) => variable.id !== data.id);
 	} catch (error) {
@@ -201,26 +206,41 @@ async function deleteVariable(data: EnvironmentVariable) {
 }
 
 function goToUpgrade() {
-	window.open(upgradeLinkUrl.value, '_blank');
+	void uiStore.goToUpgrade('variables', 'upgrade-variables');
 }
 
 function displayName(resource: EnvironmentVariable) {
 	return resource.key;
 }
+
+onBeforeMount(() => {
+	sourceControlStoreUnsubscribe = sourceControlStore.$onAction(({ name, after }) => {
+		if (name === 'pullWorkfolder' && after) {
+			after(() => {
+				void initialize();
+			});
+		}
+	});
+});
+
+onBeforeUnmount(() => {
+	sourceControlStoreUnsubscribe();
+});
 </script>
 
 <template>
 	<ResourcesListLayout
 		ref="layoutRef"
+		class="variables-view"
 		resource-key="variables"
 		:disabled="!isFeatureEnabled"
 		:resources="allVariables"
 		:initialize="initialize"
 		:shareable="false"
-		:displayName="displayName"
-		:sortFns="sortFns"
-		:sortOptions="['nameAsc', 'nameDesc']"
-		:showFiltersDropdown="false"
+		:display-name="displayName"
+		:sort-fns="sortFns"
+		:sort-options="['nameAsc', 'nameDesc']"
+		:show-filters-dropdown="false"
 		type="datatable"
 		:type-props="{ columns: datatableColumns }"
 		@sort="resetNewVariablesList"
@@ -233,8 +253,8 @@ function displayName(resource: EnvironmentVariable) {
 						size="large"
 						block
 						:disabled="!canCreateVariables"
-						@click="addTemporaryVariable"
 						data-test-id="resources-list-add"
+						@click="addTemporaryVariable"
 					>
 						{{ $locale.baseText(`variables.add`) }}
 					</n8n-button>
@@ -256,21 +276,34 @@ function displayName(resource: EnvironmentVariable) {
 				:description="
 					$locale.baseText(contextBasedTranslationKeys.variables.unavailable.description)
 				"
-				:buttonText="$locale.baseText(contextBasedTranslationKeys.variables.unavailable.button)"
-				buttonType="secondary"
-				@click="goToUpgrade"
+				:button-text="$locale.baseText(contextBasedTranslationKeys.variables.unavailable.button)"
+				button-type="secondary"
+				@click:button="goToUpgrade"
 			/>
 		</template>
-		<template v-if="!isFeatureEnabled" #empty>
+		<template v-if="!isFeatureEnabled || (isFeatureEnabled && !canCreateVariables)" #empty>
 			<n8n-action-box
+				v-if="!isFeatureEnabled"
 				data-test-id="unavailable-resources-list"
 				emoji="👋"
 				:heading="$locale.baseText(contextBasedTranslationKeys.variables.unavailable.title)"
 				:description="
 					$locale.baseText(contextBasedTranslationKeys.variables.unavailable.description)
 				"
-				:buttonText="$locale.baseText(contextBasedTranslationKeys.variables.unavailable.button)"
-				buttonType="secondary"
+				:button-text="$locale.baseText(contextBasedTranslationKeys.variables.unavailable.button)"
+				button-type="secondary"
+				@click:button="goToUpgrade"
+			/>
+			<n8n-action-box
+				v-else-if="!canCreateVariables"
+				data-test-id="cannot-create-variables"
+				emoji="👋"
+				:heading="
+					$locale.baseText('variables.empty.notAllowedToCreate.heading', {
+						interpolate: { name: usersStore.currentUser.firstName },
+					})
+				"
+				:description="$locale.baseText('variables.empty.notAllowedToCreate.description')"
 				@click="goToUpgrade"
 			/>
 		</template>
@@ -301,43 +334,45 @@ function displayName(resource: EnvironmentVariable) {
 <style lang="scss" scoped>
 @use 'n8n-design-system/css/common/var.scss';
 
-:deep(.datatable) {
-	table {
-		table-layout: fixed;
-	}
-
-	th,
-	td {
-		width: 25%;
-
-		@media screen and (max-width: var.$md) {
-			width: 33.33%;
+.variables-view {
+	:deep(.datatable) {
+		table {
+			table-layout: fixed;
 		}
 
-		&.variables-value-column,
-		&.variables-key-column,
-		&.variables-usage-column {
-			> div {
-				width: 100%;
-
-				> span {
-					max-width: 100%;
-					overflow: hidden;
-					text-overflow: ellipsis;
-					white-space: nowrap;
-					height: 18px;
-				}
+		th,
+		td {
+			width: 25%;
+
+			@media screen and (max-width: var.$md) {
+				width: 33.33%;
+			}
 
+			&.variables-value-column,
+			&.variables-key-column,
+			&.variables-usage-column {
 				> div {
 					width: 100%;
+
+					> span {
+						max-width: 100%;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						white-space: nowrap;
+						height: 18px;
+					}
+
+					> div {
+						width: 100%;
+					}
 				}
 			}
 		}
-	}
 
-	.variables-usage-column {
-		@media screen and (max-width: var.$md) {
-			display: none;
+		.variables-usage-column {
+			@media screen and (max-width: var.$md) {
+				display: none;
+			}
 		}
 	}
 }
diff --git a/packages/editor-ui/src/views/WorkerView.vue b/packages/editor-ui/src/views/WorkerView.vue
new file mode 100644
index 0000000000000..966f1e50a85b0
--- /dev/null
+++ b/packages/editor-ui/src/views/WorkerView.vue
@@ -0,0 +1,43 @@
+<template>
+	<WorkerList
+		v-if="settingsStore.isQueueModeEnabled && settingsStore.isWorkerViewAvailable"
+		data-test-id="worker-view-licensed"
+	/>
+	<n8n-action-box
+		v-else
+		data-test-id="worker-view-unlicensed"
+		:class="$style.actionBox"
+		:description="$locale.baseText('workerList.actionBox.description')"
+		:button-text="$locale.baseText('workerList.actionBox.buttonText')"
+		@click:button="goToUpgrade"
+	>
+		<template #heading>
+			<span>{{ $locale.baseText('workerList.actionBox.title') }}</span>
+		</template>
+		<template #description>
+			{{ $locale.baseText('workerList.actionBox.description') }}
+			<a :href="$locale.baseText('workerList.docs.url')" target="_blank">
+				{{ $locale.baseText('workerList.actionBox.description.link') }}
+			</a>
+		</template>
+	</n8n-action-box>
+</template>
+
+<script setup lang="ts">
+import WorkerList from '@/components/WorkerList.ee.vue';
+import { useUIStore } from '@/stores/ui.store';
+import { useSettingsStore } from '@/stores/settings.store';
+
+const settingsStore = useSettingsStore();
+const uiStore = useUIStore();
+
+const goToUpgrade = () => {
+	void uiStore.goToUpgrade('worker-view', 'upgrade-worker-view');
+};
+</script>
+
+<style module lang="scss">
+.actionBox {
+	margin: var(--spacing-2xl) 0 0;
+}
+</style>
diff --git a/packages/editor-ui/src/views/WorkflowExecutionsView.vue b/packages/editor-ui/src/views/WorkflowExecutionsView.vue
new file mode 100644
index 0000000000000..460705d9f0e45
--- /dev/null
+++ b/packages/editor-ui/src/views/WorkflowExecutionsView.vue
@@ -0,0 +1,327 @@
+<script lang="ts" setup>
+import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue';
+import WorkflowExecutionsList from '@/components/executions/workflow/WorkflowExecutionsList.vue';
+import { useExecutionsStore } from '@/stores/executions.store';
+import { useI18n } from '@/composables/useI18n';
+import type { ExecutionFilterType, IWorkflowDb } from '@/Interface';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import { NO_NETWORK_ERROR_CODE } from '@/utils/apiUtils';
+import { useToast } from '@/composables/useToast';
+import { VIEWS } from '@/constants';
+import { useRoute, useRouter } from 'vue-router';
+import type { ExecutionSummary } from 'n8n-workflow';
+import { useDebounce } from '@/composables/useDebounce';
+import { storeToRefs } from 'pinia';
+import { useTelemetry } from '@/composables/useTelemetry';
+
+const executionsStore = useExecutionsStore();
+const workflowsStore = useWorkflowsStore();
+const nodeTypesStore = useNodeTypesStore();
+const i18n = useI18n();
+const telemetry = useTelemetry();
+const route = useRoute();
+const router = useRouter();
+const toast = useToast();
+const { callDebounced } = useDebounce();
+
+const { filters } = storeToRefs(executionsStore);
+
+const loading = ref(false);
+const loadingMore = ref(false);
+
+const workflow = ref<IWorkflowDb | undefined>();
+
+const workflowId = computed(() => {
+	return (route.params.name as string) || workflowsStore.workflowId;
+});
+
+const executionId = computed(() => route.params.executionId as string);
+
+const executions = computed(() => [
+	...(executionsStore.currentExecutionsByWorkflowId[workflowId.value] ?? []),
+	...(executionsStore.executionsByWorkflowId[workflowId.value] ?? []),
+]);
+
+const execution = computed(() => {
+	return executions.value.find((e) => e.id === executionId.value) ?? currentExecution.value;
+});
+
+const currentExecution = ref<ExecutionSummary | undefined>();
+
+watch(
+	() => workflowId.value,
+	async () => {
+		await fetchWorkflow();
+	},
+);
+
+watch(
+	() => executionId.value,
+	async () => {
+		await fetchExecution();
+	},
+);
+
+onMounted(async () => {
+	await nodeTypesStore.loadNodeTypesIfNotLoaded();
+	await Promise.all([
+		nodeTypesStore.loadNodeTypesIfNotLoaded(),
+		fetchWorkflow(),
+		executionsStore.initialize(workflowId.value),
+	]);
+	await fetchExecution();
+	await initializeRoute();
+	document.addEventListener('visibilitychange', onDocumentVisibilityChange);
+});
+
+onBeforeUnmount(() => {
+	executionsStore.reset();
+	document.removeEventListener('visibilitychange', onDocumentVisibilityChange);
+});
+
+async function fetchExecution() {
+	if (!executionId.value) {
+		return;
+	}
+
+	try {
+		currentExecution.value = (await executionsStore.fetchExecution(
+			executionId.value,
+		)) as ExecutionSummary;
+		executionsStore.activeExecution = currentExecution.value;
+	} catch (error) {
+		toast.showError(error, i18n.baseText('nodeView.showError.openExecution.title'));
+	}
+}
+
+function onDocumentVisibilityChange() {
+	if (document.visibilityState === 'hidden') {
+		executionsStore.stopAutoRefreshInterval();
+	} else {
+		void executionsStore.startAutoRefreshInterval(workflowId.value);
+	}
+}
+
+async function initializeRoute() {
+	if (route.name === VIEWS.EXECUTION_HOME && executions.value.length > 0 && workflow.value) {
+		await router
+			.push({
+				name: VIEWS.EXECUTION_PREVIEW,
+				params: { name: workflow.value.id, executionId: executions.value[0].id },
+			})
+			.catch(() => {});
+	}
+}
+
+async function fetchWorkflow() {
+	let data: IWorkflowDb | undefined;
+	try {
+		// @TODO Retrieve from store if exists
+		data = await workflowsStore.fetchWorkflow(workflowId.value);
+	} catch (error) {
+		toast.showError(error, i18n.baseText('nodeView.showError.openWorkflow.title'));
+		return;
+	}
+
+	if (!data) {
+		throw new Error(
+			i18n.baseText('nodeView.workflowWithIdCouldNotBeFound', {
+				interpolate: { workflowId: workflowId.value },
+			}),
+		);
+	}
+
+	workflow.value = data;
+}
+
+async function onAutoRefreshToggle(value: boolean) {
+	if (value) {
+		await executionsStore.startAutoRefreshInterval(workflowId.value);
+	} else {
+		executionsStore.stopAutoRefreshInterval();
+	}
+}
+
+async function onRefreshData() {
+	if (!workflowId.value) {
+		return;
+	}
+
+	try {
+		await executionsStore.fetchExecutions({
+			...executionsStore.executionsFilters,
+			workflowId: workflowId.value,
+		});
+	} catch (error) {
+		if (error.errorCode === NO_NETWORK_ERROR_CODE) {
+			toast.showMessage(
+				{
+					title: i18n.baseText('executionsList.showError.refreshData.title'),
+					message: error.message,
+					type: 'error',
+					duration: 3500,
+				},
+				false,
+			);
+		} else {
+			toast.showError(error, i18n.baseText('executionsList.showError.refreshData.title'));
+		}
+	}
+}
+
+async function onUpdateFilters(newFilters: ExecutionFilterType) {
+	executionsStore.reset();
+	executionsStore.setFilters(newFilters);
+	await executionsStore.initialize(workflowId.value);
+}
+
+async function onExecutionStop(id: string) {
+	try {
+		await executionsStore.stopCurrentExecution(id);
+
+		toast.showMessage({
+			title: i18n.baseText('executionsList.showMessage.stopExecution.title'),
+			message: i18n.baseText('executionsList.showMessage.stopExecution.message', {
+				interpolate: { activeExecutionId: id },
+			}),
+			type: 'success',
+		});
+
+		await onRefreshData();
+	} catch (error) {
+		toast.showError(error, i18n.baseText('executionsList.showError.stopExecution.title'));
+	}
+}
+
+async function onExecutionDelete(id: string) {
+	loading.value = true;
+	try {
+		const executionIndex = executions.value.findIndex((e: ExecutionSummary) => e.id === id);
+
+		const nextExecution =
+			executions.value[executionIndex + 1] ||
+			executions.value[executionIndex - 1] ||
+			executions.value[0];
+
+		await executionsStore.deleteExecutions({
+			ids: [id],
+		});
+
+		if (workflow.value) {
+			if (executions.value.length > 0) {
+				await router
+					.replace({
+						name: VIEWS.EXECUTION_PREVIEW,
+						params: { name: workflow.value.id, executionId: nextExecution.id },
+					})
+					.catch(() => {});
+			} else {
+				// If there are no executions left, show empty state
+				await router.replace({
+					name: VIEWS.EXECUTION_HOME,
+					params: { name: workflow.value.id },
+				});
+			}
+		}
+	} catch (error) {
+		loading.value = false;
+		toast.showError(error, i18n.baseText('executionsList.showError.handleDeleteSelected.title'));
+		return;
+	}
+	loading.value = false;
+
+	toast.showMessage({
+		title: i18n.baseText('executionsList.showMessage.handleDeleteSelected.title'),
+		type: 'success',
+	});
+}
+
+async function onExecutionRetry(payload: { id: string; loadWorkflow: boolean }) {
+	toast.showMessage({
+		title: i18n.baseText('executionDetails.runningMessage'),
+		type: 'info',
+		duration: 2000,
+	});
+
+	await retryExecution(payload);
+	await onRefreshData();
+
+	telemetry.track('User clicked retry execution button', {
+		workflow_id: workflow.value?.id,
+		execution_id: payload.id,
+		retry_type: payload.loadWorkflow ? 'current' : 'original',
+	});
+}
+
+async function retryExecution(payload: { id: string; loadWorkflow: boolean }) {
+	try {
+		const retrySuccessful = await executionsStore.retryExecution(payload.id, payload.loadWorkflow);
+
+		if (retrySuccessful) {
+			toast.showMessage({
+				title: i18n.baseText('executionsList.showMessage.retrySuccessfulTrue.title'),
+				type: 'success',
+			});
+		} else {
+			toast.showMessage({
+				title: i18n.baseText('executionsList.showMessage.retrySuccessfulFalse.title'),
+				type: 'error',
+			});
+		}
+	} catch (error) {
+		toast.showError(error, i18n.baseText('executionsList.showError.retryExecution.title'));
+	}
+}
+
+async function onLoadMore(): Promise<void> {
+	if (!loadingMore.value) {
+		await callDebounced(loadMore, { debounceTime: 1000 });
+	}
+}
+
+async function loadMore(): Promise<void> {
+	if (
+		!!executionsStore.executionsFilters.status?.includes('running') ||
+		executions.value.length >= executionsStore.executionsCount
+	) {
+		return;
+	}
+
+	loadingMore.value = true;
+
+	let lastId: string | undefined;
+	if (executions.value.length !== 0) {
+		const lastItem = executions.value.slice(-1)[0];
+		lastId = lastItem.id;
+	}
+
+	try {
+		await executionsStore.fetchExecutions(executionsStore.executionsFilters, lastId);
+	} catch (error) {
+		loadingMore.value = false;
+		toast.showError(error, i18n.baseText('executionsList.showError.loadMore.title'));
+		return;
+	}
+
+	loadingMore.value = false;
+}
+</script>
+<template>
+	<WorkflowExecutionsList
+		v-if="workflow"
+		:executions="executions"
+		:execution="execution"
+		:filters="filters"
+		:workflow="workflow"
+		:loading="loading"
+		:loading-more="loadingMore"
+		@execution:stop="onExecutionStop"
+		@execution:delete="onExecutionDelete"
+		@execution:retry="onExecutionRetry"
+		@update:filters="onUpdateFilters"
+		@update:auto-refresh="onAutoRefreshToggle"
+		@load-more="onLoadMore"
+		@reload="onRefreshData"
+	/>
+</template>
diff --git a/packages/editor-ui/src/views/WorkflowHistory.vue b/packages/editor-ui/src/views/WorkflowHistory.vue
new file mode 100644
index 0000000000000..bdff2e88c5cac
--- /dev/null
+++ b/packages/editor-ui/src/views/WorkflowHistory.vue
@@ -0,0 +1,410 @@
+<script setup lang="ts">
+import { onBeforeMount, ref, watchEffect, computed, h } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+import type { IWorkflowDb, UserAction } from '@/Interface';
+import { VIEWS, WORKFLOW_HISTORY_VERSION_RESTORE } from '@/constants';
+import { useI18n } from '@/composables/useI18n';
+import { useToast } from '@/composables/useToast';
+import type {
+	WorkflowHistoryActionTypes,
+	WorkflowVersionId,
+	WorkflowHistoryRequestParams,
+	WorkflowHistory,
+	WorkflowVersion,
+} from '@/types/workflowHistory';
+import WorkflowHistoryList from '@/components/WorkflowHistory/WorkflowHistoryList.vue';
+import WorkflowHistoryContent from '@/components/WorkflowHistory/WorkflowHistoryContent.vue';
+import { useWorkflowHistoryStore } from '@/stores/workflowHistory.store';
+import { useUIStore } from '@/stores/ui.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { telemetry } from '@/plugins/telemetry';
+import { useRootStore } from '@/stores/n8nRoot.store';
+
+type WorkflowHistoryActionRecord = {
+	[K in Uppercase<WorkflowHistoryActionTypes[number]>]: Lowercase<K>;
+};
+
+const enum WorkflowHistoryVersionRestoreModalActions {
+	restore = 'restore',
+	deactivateAndRestore = 'deactivateAndRestore',
+	cancel = 'cancel',
+}
+
+const workflowHistoryActionTypes: WorkflowHistoryActionTypes = [
+	'restore',
+	'clone',
+	'open',
+	'download',
+];
+const WORKFLOW_HISTORY_ACTIONS = workflowHistoryActionTypes.reduce(
+	(record, key) => ({ ...record, [key.toUpperCase()]: key }),
+	{} as WorkflowHistoryActionRecord,
+);
+
+const route = useRoute();
+const router = useRouter();
+const i18n = useI18n();
+const toast = useToast();
+const workflowHistoryStore = useWorkflowHistoryStore();
+const uiStore = useUIStore();
+const workflowsStore = useWorkflowsStore();
+
+const canRender = ref(true);
+const isListLoading = ref(true);
+const requestNumberOfItems = ref(20);
+const lastReceivedItemsLength = ref(0);
+const editorRoute = computed(() => ({
+	name: VIEWS.WORKFLOW,
+	params: {
+		name: route.params.workflowId,
+	},
+}));
+const activeWorkflow = ref<IWorkflowDb | null>(null);
+const workflowHistory = ref<WorkflowHistory[]>([]);
+const activeWorkflowVersion = ref<WorkflowVersion | null>(null);
+const actions = computed<UserAction[]>(() =>
+	workflowHistoryActionTypes.map((value) => ({
+		label: i18n.baseText(`workflowHistory.item.actions.${value}`),
+		disabled: false,
+		value,
+	})),
+);
+
+const isFirstItemShown = computed(
+	() => workflowHistory.value[0]?.versionId === route.params.versionId,
+);
+const evaluatedPruneTime = computed(() => Math.floor(workflowHistoryStore.evaluatedPruneTime / 24));
+
+const sendTelemetry = (event: string) => {
+	telemetry.track(event, {
+		instance_id: useRootStore().instanceId,
+		workflow_id: route.params.workflowId,
+	});
+};
+
+const loadMore = async (queryParams: WorkflowHistoryRequestParams) => {
+	const history = await workflowHistoryStore.getWorkflowHistory(
+		route.params.workflowId,
+		queryParams,
+	);
+	lastReceivedItemsLength.value = history.length;
+	workflowHistory.value = workflowHistory.value.concat(history);
+};
+
+onBeforeMount(async () => {
+	sendTelemetry('User opened workflow history');
+	try {
+		const [workflow] = await Promise.all([
+			workflowsStore.fetchWorkflow(route.params.workflowId),
+			loadMore({ take: requestNumberOfItems.value }),
+		]);
+		activeWorkflow.value = workflow;
+		isListLoading.value = false;
+
+		if (!route.params.versionId && workflowHistory.value.length) {
+			await router.replace({
+				name: VIEWS.WORKFLOW_HISTORY,
+				params: {
+					workflowId: route.params.workflowId,
+					versionId: workflowHistory.value[0].versionId,
+				},
+			});
+		}
+	} catch (error) {
+		canRender.value = false;
+		toast.showError(error, i18n.baseText('workflowHistory.title'));
+	}
+});
+
+const openInNewTab = (id: WorkflowVersionId) => {
+	const { href } = router.resolve({
+		name: VIEWS.WORKFLOW_HISTORY,
+		params: {
+			workflowId: route.params.workflowId,
+			versionId: id,
+		},
+	});
+	window.open(href, '_blank');
+};
+
+const openRestorationModal = async (
+	isWorkflowActivated: boolean,
+	formattedCreatedAt: string,
+): Promise<WorkflowHistoryVersionRestoreModalActions> => {
+	return await new Promise((resolve, reject) => {
+		const buttons = [
+			{
+				text: i18n.baseText('workflowHistory.action.restore.modal.button.cancel'),
+				type: 'tertiary',
+				action: () => {
+					resolve(WorkflowHistoryVersionRestoreModalActions.cancel);
+				},
+			},
+		];
+
+		if (isWorkflowActivated) {
+			buttons.push({
+				text: i18n.baseText('workflowHistory.action.restore.modal.button.deactivateAndRestore'),
+				type: 'tertiary',
+				action: () => {
+					resolve(WorkflowHistoryVersionRestoreModalActions.deactivateAndRestore);
+				},
+			});
+		}
+
+		buttons.push({
+			text: i18n.baseText('workflowHistory.action.restore.modal.button.restore'),
+			type: 'primary',
+			action: () => {
+				resolve(WorkflowHistoryVersionRestoreModalActions.restore);
+			},
+		});
+
+		try {
+			uiStore.openModalWithData({
+				name: WORKFLOW_HISTORY_VERSION_RESTORE,
+				data: {
+					beforeClose: () => {
+						resolve(WorkflowHistoryVersionRestoreModalActions.cancel);
+					},
+					isWorkflowActivated,
+					formattedCreatedAt,
+					buttons,
+				},
+			});
+		} catch (error) {
+			reject(error);
+		}
+	});
+};
+
+const cloneWorkflowVersion = async (
+	id: WorkflowVersionId,
+	data: { formattedCreatedAt: string },
+) => {
+	const clonedWorkflow = await workflowHistoryStore.cloneIntoNewWorkflow(
+		route.params.workflowId,
+		id,
+		data,
+	);
+	const { href } = router.resolve({
+		name: VIEWS.WORKFLOW,
+		params: {
+			name: clonedWorkflow.id,
+		},
+	});
+
+	toast.showMessage({
+		title: i18n.baseText('workflowHistory.action.clone.success.title'),
+		message: h(
+			'a',
+			{ href, target: '_blank' },
+			i18n.baseText('workflowHistory.action.clone.success.message'),
+		),
+		type: 'success',
+		duration: 10000,
+	});
+};
+
+const restoreWorkflowVersion = async (
+	id: WorkflowVersionId,
+	data: { formattedCreatedAt: string },
+) => {
+	const workflow = await workflowsStore.fetchWorkflow(route.params.workflowId);
+	const modalAction = await openRestorationModal(workflow.active, data.formattedCreatedAt);
+	if (modalAction === WorkflowHistoryVersionRestoreModalActions.cancel) {
+		return;
+	}
+	activeWorkflow.value = await workflowHistoryStore.restoreWorkflow(
+		route.params.workflowId,
+		id,
+		modalAction === WorkflowHistoryVersionRestoreModalActions.deactivateAndRestore,
+	);
+	const history = await workflowHistoryStore.getWorkflowHistory(route.params.workflowId, {
+		take: 1,
+	});
+	workflowHistory.value = history.concat(workflowHistory.value);
+	toast.showMessage({
+		title: i18n.baseText('workflowHistory.action.restore.success.title'),
+		type: 'success',
+	});
+};
+
+const onAction = async ({
+	action,
+	id,
+	data,
+}: {
+	action: WorkflowHistoryActionTypes[number];
+	id: WorkflowVersionId;
+	data: { formattedCreatedAt: string };
+}) => {
+	try {
+		switch (action) {
+			case WORKFLOW_HISTORY_ACTIONS.OPEN:
+				openInNewTab(id);
+				sendTelemetry('User opened version in new tab');
+				break;
+			case WORKFLOW_HISTORY_ACTIONS.DOWNLOAD:
+				await workflowHistoryStore.downloadVersion(route.params.workflowId, id, data);
+				sendTelemetry('User downloaded version');
+				break;
+			case WORKFLOW_HISTORY_ACTIONS.CLONE:
+				await cloneWorkflowVersion(id, data);
+				sendTelemetry('User cloned version');
+				break;
+			case WORKFLOW_HISTORY_ACTIONS.RESTORE:
+				await restoreWorkflowVersion(id, data);
+				sendTelemetry('User restored version');
+				break;
+		}
+	} catch (error) {
+		toast.showError(
+			error,
+			i18n.baseText('workflowHistory.action.error.title', {
+				interpolate: {
+					action: i18n.baseText(`workflowHistory.item.actions.${action}`).toLowerCase(),
+				},
+			}),
+		);
+	}
+};
+
+const onPreview = async ({ event, id }: { event: MouseEvent; id: WorkflowVersionId }) => {
+	if (event.metaKey || event.ctrlKey) {
+		openInNewTab(id);
+		sendTelemetry('User opened version in new tab');
+	} else {
+		await router.push({
+			name: VIEWS.WORKFLOW_HISTORY,
+			params: {
+				workflowId: route.params.workflowId,
+				versionId: id,
+			},
+		});
+	}
+};
+
+const onUpgrade = () => {
+	void uiStore.goToUpgrade('workflow-history', 'upgrade-workflow-history');
+};
+
+watchEffect(async () => {
+	if (!route.params.versionId) {
+		return;
+	}
+	try {
+		activeWorkflowVersion.value = await workflowHistoryStore.getWorkflowVersion(
+			route.params.workflowId,
+			route.params.versionId,
+		);
+		sendTelemetry('User selected version');
+	} catch (error) {
+		toast.showError(
+			new Error(`${error.message} "${route.params.versionId}"&nbsp;`),
+			i18n.baseText('workflowHistory.title'),
+		);
+	}
+
+	try {
+		activeWorkflow.value = await workflowsStore.fetchWorkflow(route.params.workflowId);
+	} catch (error) {
+		canRender.value = false;
+		toast.showError(error, i18n.baseText('workflowHistory.title'));
+	}
+});
+</script>
+<template>
+	<div :class="$style.view">
+		<n8n-heading :class="$style.header" tag="h2" size="medium">
+			{{ activeWorkflow?.name }}
+		</n8n-heading>
+		<div :class="$style.corner">
+			<n8n-heading tag="h2" size="medium" bold>
+				{{ i18n.baseText('workflowHistory.title') }}
+			</n8n-heading>
+			<router-link :to="editorRoute" data-test-id="workflow-history-close-button">
+				<n8n-button type="tertiary" icon="times" size="small" text square />
+			</router-link>
+		</div>
+		<div :class="$style.listComponentWrapper">
+			<WorkflowHistoryList
+				v-if="canRender"
+				:items="workflowHistory"
+				:last-received-items-length="lastReceivedItemsLength"
+				:active-item="activeWorkflowVersion"
+				:actions="actions"
+				:request-number-of-items="requestNumberOfItems"
+				:should-upgrade="workflowHistoryStore.shouldUpgrade"
+				:evaluated-prune-time="evaluatedPruneTime"
+				:is-list-loading="isListLoading"
+				@action="onAction"
+				@preview="onPreview"
+				@load-more="loadMore"
+				@upgrade="onUpgrade"
+			/>
+		</div>
+		<div :class="$style.contentComponentWrapper">
+			<WorkflowHistoryContent
+				v-if="canRender"
+				:workflow="activeWorkflow"
+				:workflow-version="activeWorkflowVersion"
+				:actions="actions"
+				:is-list-loading="isListLoading"
+				:is-first-item-shown="isFirstItemShown"
+				@action="onAction"
+			/>
+		</div>
+	</div>
+</template>
+<style module lang="scss">
+.view {
+	position: relative;
+	display: grid;
+	width: 100%;
+	grid-template-areas: 'header corner' 'content list';
+	grid-template-columns: auto 330px;
+	grid-template-rows: 65px auto;
+	background-color: var(--color-background-xlight);
+}
+
+.header {
+	grid-area: header;
+	display: flex;
+	align-items: center;
+	padding: 0 var(--spacing-l);
+	border-bottom: var(--border-width-base) var(--border-style-base) var(--color-foreground-base);
+}
+
+.corner {
+	grid-area: corner;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	padding: 0 var(--spacing-3xs) 0 var(--spacing-s);
+	background-color: var(--color-background-lighter);
+	border-bottom: var(--border-width-base) var(--border-style-base) var(--color-foreground-base);
+	border-left: var(--border-width-base) var(--border-style-base) var(--color-foreground-base);
+}
+
+.contentComponentWrapper {
+	grid-area: content;
+	position: relative;
+}
+
+.listComponentWrapper {
+	grid-area: list;
+	position: relative;
+
+	&::before {
+		content: '';
+		display: block;
+		position: absolute;
+		top: 0;
+		bottom: 0;
+		left: 0;
+		width: var(--border-width-base);
+		background-color: var(--color-foreground-base);
+	}
+}
+</style>
diff --git a/packages/editor-ui/src/views/WorkflowOnboardingView.vue b/packages/editor-ui/src/views/WorkflowOnboardingView.vue
new file mode 100644
index 0000000000000..813123e757b0a
--- /dev/null
+++ b/packages/editor-ui/src/views/WorkflowOnboardingView.vue
@@ -0,0 +1,70 @@
+<script setup lang="ts">
+import { useLoadingService } from '@/composables/useLoadingService';
+import { useI18n } from '@/composables/useI18n';
+import { VIEWS } from '@/constants';
+import { useTemplatesStore } from '@/stores/templates.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { onMounted } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+
+const loadingService = useLoadingService();
+const templateStore = useTemplatesStore();
+const workfowStore = useWorkflowsStore();
+const router = useRouter();
+const route = useRoute();
+const i18n = useI18n();
+
+const openWorkflowTemplate = async (templateId: string) => {
+	try {
+		loadingService.startLoading();
+		const template = await templateStore.getFixedWorkflowTemplate(templateId);
+		if (!template) {
+			throw new Error();
+		}
+
+		const name: string = i18n.baseText('onboarding.title', {
+			interpolate: { name: template.name },
+		});
+
+		const workflow = await workfowStore.createNewWorkflow({
+			name,
+			connections: template.workflow.connections,
+			nodes: template.workflow.nodes,
+			pinData: template.workflow.pinData,
+			settings: template.workflow.settings,
+			meta: {
+				onboardingId: templateId,
+			},
+		});
+
+		await router.replace({
+			name: VIEWS.WORKFLOW,
+			params: { name: workflow.id },
+			query: { onboardingId: templateId },
+		});
+
+		loadingService.stopLoading();
+	} catch (e) {
+		await router.replace({ name: VIEWS.NEW_WORKFLOW });
+		loadingService.stopLoading();
+
+		throw new Error(`Could not load onboarding template ${templateId}`); // sentry reporing
+	}
+};
+
+onMounted(async () => {
+	const templateId = route.params.id;
+	if (!templateId || typeof templateId !== 'string') {
+		await router.replace({ name: VIEWS.NEW_WORKFLOW });
+		return;
+	}
+
+	await openWorkflowTemplate(templateId);
+});
+</script>
+
+<template>
+	<div></div>
+</template>
+
+<style lang="scss" module></style>
diff --git a/packages/editor-ui/src/views/WorkflowsView.vue b/packages/editor-ui/src/views/WorkflowsView.vue
index 34716ed45958c..f49da46efd20f 100644
--- a/packages/editor-ui/src/views/WorkflowsView.vue
+++ b/packages/editor-ui/src/views/WorkflowsView.vue
@@ -1,57 +1,122 @@
 <template>
-	<resources-list-layout
+	<ResourcesListLayout
 		ref="layout"
 		resource-key="workflows"
 		:resources="allWorkflows"
 		:filters="filters"
 		:additional-filters-handler="onFilter"
+		:type-props="{ itemSize: 80 }"
 		:show-aside="allWorkflows.length > 0"
 		:shareable="isShareable"
 		:initialize="initialize"
+		:disabled="readOnlyEnv"
 		@click:add="addWorkflow"
-		@update:filters="filters = $event"
+		@update:filters="onFiltersUpdated"
 	>
+		<template #add-button="{ disabled }">
+			<n8n-tooltip :disabled="!readOnlyEnv">
+				<div>
+					<n8n-button
+						size="large"
+						block
+						:disabled="disabled"
+						data-test-id="resources-list-add"
+						@click="addWorkflow"
+					>
+						{{ $locale.baseText(`workflows.add`) }}
+					</n8n-button>
+				</div>
+				<template #content>
+					<i18n-t tag="span" keypath="mainSidebar.workflows.readOnlyEnv.tooltip">
+						<template #link>
+							<a target="_blank" href="https://docs.n8n.io/source-control-environments/">
+								{{ $locale.baseText('mainSidebar.workflows.readOnlyEnv.tooltip.link') }}
+							</a>
+						</template>
+					</i18n-t>
+				</template>
+			</n8n-tooltip>
+		</template>
 		<template #default="{ data, updateItemSize }">
-			<workflow-card
+			<WorkflowCard
 				data-test-id="resources-list-item"
 				class="mb-2xs"
 				:data="data"
+				:read-only="readOnlyEnv"
 				@expand:tags="updateItemSize(data)"
 				@click:tag="onClickTag"
 			/>
 		</template>
+		<template #postListContent>
+			<SuggestedTemplatesSection
+				v-for="(section, key) in suggestedTemplates?.sections"
+				:key="key"
+				:section="section"
+				:title="
+					$locale.baseText('suggestedTemplates.sectionTitle', {
+						interpolate: { sectionName: section.name.toLocaleLowerCase() },
+					})
+				"
+			/>
+		</template>
 		<template #empty>
-			<div class="text-center mt-s">
-				<n8n-heading tag="h2" size="xlarge" class="mb-2xs">
-					{{
-						$locale.baseText(
-							currentUser.firstName
-								? 'workflows.empty.heading'
-								: 'workflows.empty.heading.userNotSetup',
-							{ interpolate: { name: currentUser.firstName } },
-						)
-					}}
-				</n8n-heading>
-				<n8n-text size="large" color="text-base">
-					{{ $locale.baseText('workflows.empty.description') }}
-				</n8n-text>
-			</div>
-			<div :class="['text-center', 'mt-2xl', $style.actionsContainer]">
-				<n8n-card
-					:class="$style.emptyStateCard"
-					hoverable
-					@click="addWorkflow"
-					data-test-id="new-workflow-card"
-				>
-					<n8n-icon :class="$style.emptyStateCardIcon" icon="file" />
-					<n8n-text size="large" class="mt-xs" color="text-base">
-						{{ $locale.baseText('workflows.empty.startFromScratch') }}
+			<SuggestedTemplatesPage v-if="suggestedTemplates" />
+			<div v-else>
+				<div class="text-center mt-s">
+					<n8n-heading tag="h2" size="xlarge" class="mb-2xs">
+						{{
+							$locale.baseText(
+								currentUser.firstName
+									? 'workflows.empty.heading'
+									: 'workflows.empty.heading.userNotSetup',
+								{ interpolate: { name: currentUser.firstName } },
+							)
+						}}
+					</n8n-heading>
+					<n8n-text size="large" color="text-base">
+						{{
+							$locale.baseText(
+								readOnlyEnv
+									? 'workflows.empty.description.readOnlyEnv'
+									: 'workflows.empty.description',
+							)
+						}}
 					</n8n-text>
-				</n8n-card>
+				</div>
+				<div v-if="!readOnlyEnv" :class="['text-center', 'mt-2xl', $style.actionsContainer]">
+					<a
+						v-if="isSalesUser"
+						:href="getTemplateRepositoryURL()"
+						:class="$style.emptyStateCard"
+						target="_blank"
+					>
+						<n8n-card
+							hoverable
+							data-test-id="browse-sales-templates-card"
+							@click="trackCategoryLinkClick('Sales')"
+						>
+							<n8n-icon :class="$style.emptyStateCardIcon" icon="box-open" />
+							<n8n-text size="large" class="mt-xs" color="text-base">
+								{{ $locale.baseText('workflows.empty.browseTemplates') }}
+							</n8n-text>
+						</n8n-card>
+					</a>
+					<n8n-card
+						:class="$style.emptyStateCard"
+						hoverable
+						data-test-id="new-workflow-card"
+						@click="addWorkflow"
+					>
+						<n8n-icon :class="$style.emptyStateCardIcon" icon="file" />
+						<n8n-text size="large" class="mt-xs" color="text-base">
+							{{ $locale.baseText('workflows.empty.startFromScratch') }}
+						</n8n-text>
+					</n8n-card>
+				</div>
 			</div>
 		</template>
 		<template #filters="{ setKeyValue }">
-			<div class="mb-s" v-if="settingsStore.areTagsEnabled">
+			<div v-if="settingsStore.areTagsEnabled" class="mb-s">
 				<n8n-input-label
 					:label="$locale.baseText('workflows.filters.tags')"
 					:bold="false"
@@ -61,9 +126,9 @@
 				/>
 				<TagsDropdown
 					:placeholder="$locale.baseText('workflowOpen.filterWorkflows')"
-					:currentTagIds="filters.tags"
-					:createEnabled="false"
-					@update="setKeyValue('tags', $event)"
+					:model-value="filters.tags"
+					:create-enabled="false"
+					@update:model-value="setKeyValue('tags', $event)"
 				/>
 			</div>
 			<div class="mb-s">
@@ -74,44 +139,53 @@
 					color="text-base"
 					class="mb-3xs"
 				/>
-				<n8n-select :value="filters.status" @input="setKeyValue('status', $event)" size="medium">
+				<n8n-select
+					data-test-id="status-dropdown"
+					:model-value="filters.status"
+					@update:model-value="setKeyValue('status', $event)"
+				>
 					<n8n-option
 						v-for="option in statusFilterOptions"
 						:key="option.label"
 						:label="option.label"
 						:value="option.value"
+						data-test-id="status"
 					>
 					</n8n-option>
 				</n8n-select>
 			</div>
 		</template>
-	</resources-list-layout>
+	</ResourcesListLayout>
 </template>
 
 <script lang="ts">
-import { showMessage } from '@/mixins/showMessage';
-import mixins from 'vue-typed-mixins';
-
-import SettingsView from './SettingsView.vue';
+import { defineComponent } from 'vue';
 import ResourcesListLayout from '@/components/layouts/ResourcesListLayout.vue';
-import PageViewLayout from '@/components/layouts/PageViewLayout.vue';
-import PageViewLayoutList from '@/components/layouts/PageViewLayoutList.vue';
 import WorkflowCard from '@/components/WorkflowCard.vue';
-import TemplateCard from '@/components/TemplateCard.vue';
-import { EnterpriseEditionFeature, ASSUMPTION_EXPERIMENT, VIEWS } from '@/constants';
-import { debounceHelper } from '@/mixins/debounce';
-import type Vue from 'vue';
+import { EnterpriseEditionFeature, VIEWS } from '@/constants';
 import type { ITag, IUser, IWorkflowDb } from '@/Interface';
 import TagsDropdown from '@/components/TagsDropdown.vue';
+import SuggestedTemplatesPage from '@/components/SuggestedTemplates/SuggestedTemplatesPage.vue';
+import SuggestedTemplatesSection from '@/components/SuggestedTemplates/SuggestedTemplatesSection.vue';
 import { mapStores } from 'pinia';
-import { useUIStore } from '@/stores/ui';
-import { useSettingsStore } from '@/stores/settings';
-import { useUsersStore } from '@/stores/users';
-import { useWorkflowsStore } from '@/stores/workflows';
-import { useCredentialsStore } from '@/stores/credentials';
-import { usePostHog } from '@/stores/posthog';
+import { useUIStore } from '@/stores/ui.store';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useUsersStore } from '@/stores/users.store';
+import { useTemplatesStore } from '@/stores/templates.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useCredentialsStore } from '@/stores/credentials.store';
+import { useSourceControlStore } from '@/stores/sourceControl.store';
+import { useTagsStore } from '@/stores/tags.store';
+
+type IResourcesListLayoutInstance = InstanceType<typeof ResourcesListLayout>;
 
-type IResourcesListLayoutInstance = Vue & { sendFiltersTelemetry: (source: string) => void };
+interface Filters {
+	search: string;
+	ownedBy: string;
+	sharedWith: string;
+	status: string | boolean;
+	tags: string[];
+}
 
 const StatusFilter = {
 	ACTIVE: true,
@@ -119,16 +193,14 @@ const StatusFilter = {
 	ALL: '',
 };
 
-const WorkflowsView = mixins(showMessage, debounceHelper).extend({
+const WorkflowsView = defineComponent({
 	name: 'WorkflowsView',
 	components: {
 		ResourcesListLayout,
-		TemplateCard,
-		PageViewLayout,
-		PageViewLayoutList,
-		SettingsView,
 		WorkflowCard,
 		TagsDropdown,
+		SuggestedTemplatesPage,
+		SuggestedTemplatesSection,
 	},
 	data() {
 		return {
@@ -136,9 +208,10 @@ const WorkflowsView = mixins(showMessage, debounceHelper).extend({
 				search: '',
 				ownedBy: '',
 				sharedWith: '',
-				status: StatusFilter.ALL,
+				status: StatusFilter.ALL as string | boolean,
 				tags: [] as string[],
 			},
+			sourceControlStoreUnsubscribe: () => {},
 		};
 	},
 	computed: {
@@ -148,7 +221,14 @@ const WorkflowsView = mixins(showMessage, debounceHelper).extend({
 			useUsersStore,
 			useWorkflowsStore,
 			useCredentialsStore,
+			useSourceControlStore,
+			useTagsStore,
+			useTemplatesStore,
+			useUsersStore,
 		),
+		readOnlyEnv(): boolean {
+			return this.sourceControlStore.preferences.branchReadOnly;
+		},
 		currentUser(): IUser {
 			return this.usersStore.currentUser || ({} as IUser);
 		},
@@ -158,9 +238,6 @@ const WorkflowsView = mixins(showMessage, debounceHelper).extend({
 		isShareable(): boolean {
 			return this.settingsStore.isEnterpriseFeatureEnabled(EnterpriseEditionFeature.Sharing);
 		},
-		hasActiveWorkflows(): boolean {
-			return !!this.workflowsStore.activeWorkflows.length;
-		},
 		statusFilterOptions(): Array<{ label: string; value: string | boolean }> {
 			return [
 				{
@@ -177,24 +254,72 @@ const WorkflowsView = mixins(showMessage, debounceHelper).extend({
 				},
 			];
 		},
+		suggestedTemplates() {
+			return this.uiStore.suggestedTemplates;
+		},
+		userRole() {
+			const userRole: string | undefined =
+				this.usersStore.currentUserCloudInfo?.role ??
+				this.usersStore.currentUser?.personalizationAnswers?.role;
+			return userRole;
+		},
+		isSalesUser() {
+			if (!this.userRole) {
+				return false;
+			}
+			return ['Sales', 'sales-and-marketing'].includes(this.userRole);
+		},
+	},
+	watch: {
+		'filters.tags'() {
+			this.sendFiltersTelemetry('tags');
+		},
+	},
+	mounted() {
+		this.setFiltersFromQueryString();
+
+		void this.usersStore.showPersonalizationSurvey();
+
+		this.sourceControlStoreUnsubscribe = this.sourceControlStore.$onAction(({ name, after }) => {
+			if (name === 'pullWorkfolder' && after) {
+				after(() => {
+					void this.initialize();
+				});
+			}
+		});
+	},
+	beforeUnmount() {
+		this.sourceControlStoreUnsubscribe();
 	},
 	methods: {
+		onFiltersUpdated(filters: Filters) {
+			this.filters = filters;
+			this.saveFiltersOnQueryString();
+		},
 		addWorkflow() {
 			this.uiStore.nodeViewInitialized = false;
-			this.$router.push({ name: VIEWS.NEW_WORKFLOW });
+			void this.$router.push({ name: VIEWS.NEW_WORKFLOW });
 
 			this.$telemetry.track('User clicked add workflow button', {
 				source: 'Workflows list',
 			});
 		},
+		getTemplateRepositoryURL() {
+			return this.templatesStore.websiteTemplateRepositoryURL;
+		},
+		trackCategoryLinkClick(category: string) {
+			this.$telemetry.track(`User clicked Browse ${category} Templates`, {
+				role: this.usersStore.currentUserCloudInfo?.role,
+				active_workflow_count: this.workflowsStore.activeWorkflows.length,
+			});
+		},
 		async initialize() {
 			await Promise.all([
 				this.usersStore.fetchUsers(),
 				this.workflowsStore.fetchAllWorkflows(),
 				this.workflowsStore.fetchActiveWorkflows(),
+				this.credentialsStore.fetchAllCredentials(),
 			]);
-
-			this.credentialsStore.fetchAllCredentials();
 		},
 		onClickTag(tagId: string, event: PointerEvent) {
 			if (!this.filters.tags.includes(tagId)) {
@@ -227,14 +352,76 @@ const WorkflowsView = mixins(showMessage, debounceHelper).extend({
 		sendFiltersTelemetry(source: string) {
 			(this.$refs.layout as IResourcesListLayoutInstance).sendFiltersTelemetry(source);
 		},
-	},
-	watch: {
-		'filters.tags'() {
-			this.sendFiltersTelemetry('tags');
+		saveFiltersOnQueryString() {
+			const query: { [key: string]: string } = {};
+
+			if (this.filters.search) {
+				query.search = this.filters.search;
+			}
+
+			if (typeof this.filters.status !== 'string') {
+				query.status = this.filters.status.toString();
+			}
+
+			if (this.filters.tags.length) {
+				query.tags = this.filters.tags.join(',');
+			}
+
+			if (this.filters.ownedBy) {
+				query.ownedBy = this.filters.ownedBy;
+			}
+
+			if (this.filters.sharedWith) {
+				query.sharedWith = this.filters.sharedWith;
+			}
+
+			void this.$router.replace({
+				query: Object.keys(query).length ? query : undefined,
+			});
+		},
+		isValidUserId(userId: string) {
+			return Object.keys(this.usersStore.users).includes(userId);
+		},
+		setFiltersFromQueryString() {
+			const { tags, status, search, ownedBy, sharedWith } = this.$route.query;
+
+			const filtersToApply: { [key: string]: string | string[] | boolean } = {};
+
+			if (ownedBy && typeof ownedBy === 'string' && this.isValidUserId(ownedBy)) {
+				filtersToApply.ownedBy = ownedBy;
+			}
+
+			if (sharedWith && typeof sharedWith === 'string' && this.isValidUserId(sharedWith)) {
+				filtersToApply.sharedWith = sharedWith;
+			}
+
+			if (search && typeof search === 'string') {
+				filtersToApply.search = search;
+			}
+
+			if (tags && typeof tags === 'string') {
+				const currentTags = this.tagsStore.allTags.map((tag) => tag.id);
+				const savedTags = tags.split(',').filter((tag) => currentTags.includes(tag));
+				if (savedTags.length) {
+					filtersToApply.tags = savedTags;
+				}
+			}
+
+			if (
+				status &&
+				typeof status === 'string' &&
+				[StatusFilter.ACTIVE.toString(), StatusFilter.DEACTIVATED.toString()].includes(status)
+			) {
+				filtersToApply.status = status === 'true';
+			}
+
+			if (Object.keys(filtersToApply).length) {
+				this.filters = {
+					...this.filters,
+					...filtersToApply,
+				};
+			}
 		},
-	},
-	mounted() {
-		this.usersStore.showPersonalizationSurvey();
 	},
 });
 
diff --git a/packages/editor-ui/src/views/__tests__/AuthView.test.ts b/packages/editor-ui/src/views/__tests__/AuthView.test.ts
index 2b23ed4c088e8..e776e86942c3c 100644
--- a/packages/editor-ui/src/views/__tests__/AuthView.test.ts
+++ b/packages/editor-ui/src/views/__tests__/AuthView.test.ts
@@ -1,27 +1,17 @@
-import { PiniaVuePlugin } from 'pinia';
-import { render } from '@testing-library/vue';
 import { createTestingPinia } from '@pinia/testing';
-import { merge } from 'lodash-es';
 import AuthView from '@/views/AuthView.vue';
+import { createComponentRenderer } from '@/__tests__/render';
 
-const renderComponent = (renderOptions: Parameters<typeof render>[1] = {}) =>
-	render(
-		AuthView,
-		merge(
-			{
-				pinia: createTestingPinia(),
-				stubs: {
-					SSOLogin: {
-						template: '<div data-test-id="sso-login"></div>',
-					},
-				},
+const renderComponent = createComponentRenderer(AuthView, {
+	pinia: createTestingPinia(),
+	global: {
+		stubs: {
+			SSOLogin: {
+				template: '<div data-test-id="sso-login"></div>',
 			},
-			renderOptions,
-		),
-		(vue) => {
-			vue.use(PiniaVuePlugin);
 		},
-	);
+	},
+});
 
 describe('AuthView', () => {
 	it('should render with subtitle', () => {
diff --git a/packages/editor-ui/src/views/__tests__/SamlOnboarding.test.ts b/packages/editor-ui/src/views/__tests__/SamlOnboarding.test.ts
index 3cb5b30153244..148a11083e145 100644
--- a/packages/editor-ui/src/views/__tests__/SamlOnboarding.test.ts
+++ b/packages/editor-ui/src/views/__tests__/SamlOnboarding.test.ts
@@ -1,21 +1,20 @@
-import { PiniaVuePlugin } from 'pinia';
-import { render } from '@testing-library/vue';
 import userEvent from '@testing-library/user-event';
-import { useRouter } from 'vue-router/composables';
+import { useRouter } from 'vue-router';
 import { createTestingPinia } from '@pinia/testing';
 import { merge } from 'lodash-es';
 import SamlOnboarding from '@/views/SamlOnboarding.vue';
-import { useSSOStore } from '@/stores/sso';
+import { useSSOStore } from '@/stores/sso.store';
 import { STORES } from '@/constants';
 import { SETTINGS_STORE_DEFAULT_STATE, waitAllPromises } from '@/__tests__/utils';
-import { i18nInstance } from '@/plugins/i18n';
+import { createComponentRenderer } from '@/__tests__/render';
 
-vi.mock('vue-router/composables', () => {
+vi.mock('vue-router', () => {
 	const push = vi.fn();
 	return {
 		useRouter: () => ({
 			push,
 		}),
+		RouterLink: vi.fn(),
 	};
 });
 
@@ -23,20 +22,7 @@ let pinia: ReturnType<typeof createTestingPinia>;
 let ssoStore: ReturnType<typeof useSSOStore>;
 let router: ReturnType<typeof useRouter>;
 
-const renderComponent = (renderOptions: Parameters<typeof render>[1] = {}) =>
-	render(
-		SamlOnboarding,
-		merge(
-			{
-				pinia,
-				i18n: i18nInstance,
-			},
-			renderOptions,
-		),
-		(vue) => {
-			vue.use(PiniaVuePlugin);
-		},
-	);
+const renderComponent = createComponentRenderer(SamlOnboarding);
 
 describe('SamlOnboarding', () => {
 	beforeEach(() => {
@@ -61,7 +47,7 @@ describe('SamlOnboarding', () => {
 			isPending: false,
 		});
 
-		const { getByRole, getAllByRole } = renderComponent();
+		const { getByRole, getAllByRole } = renderComponent({ pinia });
 
 		const inputs = getAllByRole('textbox');
 		const submit = getByRole('button');
diff --git a/packages/editor-ui/src/views/__tests__/SettingsExternalSecrets.test.ts b/packages/editor-ui/src/views/__tests__/SettingsExternalSecrets.test.ts
new file mode 100644
index 0000000000000..d7359a0b5de14
--- /dev/null
+++ b/packages/editor-ui/src/views/__tests__/SettingsExternalSecrets.test.ts
@@ -0,0 +1,60 @@
+import { createTestingPinia } from '@pinia/testing';
+import { merge } from 'lodash-es';
+import { EnterpriseEditionFeature, STORES } from '@/constants';
+import { SETTINGS_STORE_DEFAULT_STATE } from '@/__tests__/utils';
+import SettingsExternalSecrets from '@/views/SettingsExternalSecrets.vue';
+import { useExternalSecretsStore } from '@/stores/externalSecrets.ee.store';
+import { createComponentRenderer } from '@/__tests__/render';
+import { useSettingsStore } from '@/stores/settings.store';
+import { setupServer } from '@/__tests__/server';
+
+let pinia: ReturnType<typeof createTestingPinia>;
+let externalSecretsStore: ReturnType<typeof useExternalSecretsStore>;
+let settingsStore: ReturnType<typeof useSettingsStore>;
+let server: ReturnType<typeof setupServer>;
+
+const renderComponent = createComponentRenderer(SettingsExternalSecrets);
+
+describe('SettingsExternalSecrets', () => {
+	beforeAll(() => {
+		server = setupServer();
+	});
+
+	beforeEach(async () => {
+		pinia = createTestingPinia({
+			initialState: {
+				[STORES.SETTINGS]: {
+					settings: merge({}, SETTINGS_STORE_DEFAULT_STATE.settings),
+				},
+			},
+		});
+		externalSecretsStore = useExternalSecretsStore(pinia);
+		settingsStore = useSettingsStore();
+
+		await settingsStore.getSettings();
+	});
+
+	afterEach(() => {
+		vi.clearAllMocks();
+	});
+
+	afterAll(() => {
+		server.shutdown();
+	});
+
+	it('should render paywall state when there is no license', () => {
+		const { getByTestId, queryByTestId } = renderComponent({ pinia });
+
+		expect(queryByTestId('external-secrets-content-licensed')).not.toBeInTheDocument();
+		expect(getByTestId('external-secrets-content-unlicensed')).toBeInTheDocument();
+	});
+
+	it('should render licensed content', () => {
+		settingsStore.settings.enterprise[EnterpriseEditionFeature.ExternalSecrets] = true;
+
+		const { getByTestId, queryByTestId } = renderComponent({ pinia });
+
+		expect(getByTestId('external-secrets-content-licensed')).toBeInTheDocument();
+		expect(queryByTestId('external-secrets-content-unlicensed')).not.toBeInTheDocument();
+	});
+});
diff --git a/packages/editor-ui/src/views/__tests__/SettingsPersonalView.test.ts b/packages/editor-ui/src/views/__tests__/SettingsPersonalView.test.ts
new file mode 100644
index 0000000000000..7236800010e07
--- /dev/null
+++ b/packages/editor-ui/src/views/__tests__/SettingsPersonalView.test.ts
@@ -0,0 +1,93 @@
+import { createPinia } from 'pinia';
+import { waitAllPromises } from '@/__tests__/utils';
+import SettingsPersonalView from '@/views/SettingsPersonalView.vue';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useUsersStore } from '@/stores/users.store';
+import { createComponentRenderer } from '@/__tests__/render';
+import { setupServer } from '@/__tests__/server';
+import { ROLE } from '@/constants';
+
+let pinia: ReturnType<typeof createPinia>;
+let settingsStore: ReturnType<typeof useSettingsStore>;
+let usersStore: ReturnType<typeof useUsersStore>;
+let server: ReturnType<typeof setupServer>;
+
+const renderComponent = createComponentRenderer(SettingsPersonalView);
+
+const currentUser = {
+	id: '1',
+	firstName: 'John',
+	lastName: 'Doe',
+	email: 'joh.doe@example.com',
+	createdAt: Date().toString(),
+	role: ROLE.Owner,
+	isDefaultUser: false,
+	isPendingUser: false,
+	isPending: false,
+	hasRecoveryCodesLeft: false,
+	mfaEnabled: false,
+};
+
+describe('SettingsPersonalView', () => {
+	beforeAll(() => {
+		server = setupServer();
+	});
+
+	beforeEach(async () => {
+		pinia = createPinia();
+
+		settingsStore = useSettingsStore(pinia);
+		usersStore = useUsersStore(pinia);
+
+		usersStore.users[currentUser.id] = currentUser;
+		usersStore.currentUserId = currentUser.id;
+
+		await settingsStore.getSettings();
+	});
+
+	afterAll(() => {
+		server.shutdown();
+	});
+
+	it('should enable email and pw change', async () => {
+		const { getByTestId, getAllByRole } = renderComponent({ pinia });
+		await waitAllPromises();
+
+		expect(getAllByRole('textbox').find((el) => el.getAttribute('type') === 'email')).toBeEnabled();
+		expect(getByTestId('change-password-link')).toBeInTheDocument();
+	});
+
+	describe('when external auth is enabled, email and password change', () => {
+		beforeEach(() => {
+			vi.spyOn(settingsStore, 'isSamlLoginEnabled', 'get').mockReturnValue(true);
+			vi.spyOn(settingsStore, 'isDefaultAuthenticationSaml', 'get').mockReturnValue(true);
+			vi.spyOn(settingsStore, 'isMfaFeatureEnabled', 'get').mockReturnValue(true);
+		});
+
+		it('should not be disabled for the instance owner', async () => {
+			vi.spyOn(usersStore, 'isInstanceOwner', 'get').mockReturnValue(true);
+
+			const { queryByTestId, getAllByRole } = renderComponent({ pinia });
+			await waitAllPromises();
+
+			expect(
+				getAllByRole('textbox').find((el) => el.getAttribute('type') === 'email'),
+			).toBeEnabled();
+			expect(queryByTestId('change-password-link')).toBeInTheDocument();
+			expect(queryByTestId('mfa-section')).toBeInTheDocument();
+		});
+
+		it('should be disabled for members', async () => {
+			vi.spyOn(usersStore, 'isInstanceOwner', 'get').mockReturnValue(false);
+
+			const { queryByTestId, getAllByRole } = renderComponent({ pinia });
+			await waitAllPromises();
+
+			expect(
+				getAllByRole('textbox').find((el) => el.getAttribute('type') === 'email'),
+			).toBeDisabled();
+			expect(queryByTestId('change-password-link')).not.toBeInTheDocument();
+			expect(queryByTestId('mfa-section')).not.toBeInTheDocument();
+		});
+	});
+});
diff --git a/packages/editor-ui/src/views/__tests__/SettingsSourceControl.test.ts b/packages/editor-ui/src/views/__tests__/SettingsSourceControl.test.ts
new file mode 100644
index 0000000000000..163e81c28439f
--- /dev/null
+++ b/packages/editor-ui/src/views/__tests__/SettingsSourceControl.test.ts
@@ -0,0 +1,198 @@
+import { vi } from 'vitest';
+import { screen, waitFor, within } from '@testing-library/vue';
+import userEvent from '@testing-library/user-event';
+import { createPinia, setActivePinia } from 'pinia';
+import { setupServer } from '@/__tests__/server';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useSourceControlStore } from '@/stores/sourceControl.store';
+import SettingsSourceControl from '@/views/SettingsSourceControl.vue';
+import { createComponentRenderer } from '@/__tests__/render';
+import { EnterpriseEditionFeature } from '@/constants';
+import { nextTick } from 'vue';
+
+let pinia: ReturnType<typeof createPinia>;
+let server: ReturnType<typeof setupServer>;
+let settingsStore: ReturnType<typeof useSettingsStore>;
+let sourceControlStore: ReturnType<typeof useSourceControlStore>;
+
+const renderComponent = createComponentRenderer(SettingsSourceControl);
+
+describe('SettingsSourceControl', () => {
+	beforeAll(() => {
+		server = setupServer();
+	});
+
+	beforeEach(async () => {
+		pinia = createPinia();
+		setActivePinia(pinia);
+		settingsStore = useSettingsStore();
+		sourceControlStore = useSourceControlStore();
+
+		await settingsStore.getSettings();
+	});
+
+	afterEach(() => {
+		vi.clearAllMocks();
+	});
+
+	afterAll(() => {
+		server.shutdown();
+	});
+
+	it('should render paywall state when there is no license', async () => {
+		settingsStore.settings.enterprise[EnterpriseEditionFeature.SourceControl] = false;
+		await nextTick();
+
+		const { getByTestId, queryByTestId } = renderComponent({
+			pinia,
+		});
+
+		expect(queryByTestId('source-control-content-licensed')).not.toBeInTheDocument();
+		expect(getByTestId('source-control-content-unlicensed')).toBeInTheDocument();
+	});
+
+	it('should render licensed content', async () => {
+		settingsStore.settings.enterprise[EnterpriseEditionFeature.SourceControl] = true;
+		await nextTick();
+
+		const { getByTestId, queryByTestId } = renderComponent({
+			pinia,
+		});
+
+		expect(getByTestId('source-control-content-licensed')).toBeInTheDocument();
+		expect(queryByTestId('source-control-content-unlicensed')).not.toBeInTheDocument();
+		expect(queryByTestId('source-control-connected-content')).not.toBeInTheDocument();
+	});
+
+	it('should render user flow happy path', async () => {
+		settingsStore.settings.enterprise[EnterpriseEditionFeature.SourceControl] = true;
+		await nextTick();
+
+		const updatePreferencesSpy = vi.spyOn(sourceControlStore, 'updatePreferences');
+		const generateKeyPairSpy = vi.spyOn(sourceControlStore, 'generateKeyPair');
+
+		const { container, getByTestId, getByText, queryByTestId, getByRole } = renderComponent({
+			pinia,
+			global: {
+				stubs: ['teleport'],
+			},
+		});
+
+		await waitFor(() => expect(sourceControlStore.preferences.publicKey).not.toEqual(''));
+
+		const connectButton = getByTestId('source-control-connect-button');
+		expect(connectButton).toBeDisabled();
+
+		const repoUrlInput = container.querySelector('input[name="repoUrl"]')!;
+
+		await userEvent.click(repoUrlInput);
+		await userEvent.type(repoUrlInput, 'git@github');
+		await userEvent.tab();
+		expect(connectButton).toBeDisabled();
+
+		await userEvent.click(repoUrlInput);
+		await userEvent.type(repoUrlInput, '.com:john/n8n-data.git');
+		await userEvent.tab();
+
+		await waitFor(() => expect(connectButton).toBeEnabled());
+		expect(queryByTestId('source-control-save-settings-button')).not.toBeInTheDocument();
+
+		await userEvent.click(connectButton);
+		await waitFor(() => expect(getByTestId('source-control-connected-content')).toBeVisible());
+
+		const saveSettingsButton = getByTestId('source-control-save-settings-button');
+		expect(saveSettingsButton).toBeInTheDocument();
+		expect(saveSettingsButton).toBeDisabled();
+
+		const branchSelect = getByTestId('source-control-branch-select');
+		await userEvent.click(within(branchSelect).getByRole('textbox'));
+
+		await waitFor(() => expect(getByText('main')).toBeVisible());
+		await userEvent.click(getByText('main'));
+
+		await waitFor(() => expect(saveSettingsButton).toBeEnabled());
+		await userEvent.click(saveSettingsButton);
+
+		expect(updatePreferencesSpy).toHaveBeenCalledWith({
+			branchName: 'main',
+			branchReadOnly: false,
+			branchColor: '#1d6acb',
+		});
+		await waitFor(() => expect(screen.getByText('Settings successfully saved')).toBeVisible());
+
+		await userEvent.click(getByTestId('source-control-disconnect-button'));
+		const disconnectDialog = getByRole('dialog');
+		await waitFor(() => expect(disconnectDialog).toBeVisible());
+
+		await userEvent.click(within(disconnectDialog).getAllByRole('button')[1]);
+		await waitFor(() => expect(disconnectDialog).not.toBeVisible());
+		await waitFor(() =>
+			expect(queryByTestId('source-control-connected-content')).not.toBeInTheDocument(),
+		);
+
+		const sshKeyTypeSelect = getByTestId('source-control-ssh-key-type-select');
+		const refreshSshKeyButton = getByTestId('source-control-refresh-ssh-key-button');
+		await waitFor(() => {
+			expect(sshKeyTypeSelect).toBeVisible();
+			expect(refreshSshKeyButton).toBeVisible();
+		});
+
+		await userEvent.click(within(sshKeyTypeSelect).getByRole('textbox'));
+		await waitFor(() => expect(getByText('RSA')).toBeVisible());
+		await userEvent.click(getByText('RSA'));
+		await userEvent.click(refreshSshKeyButton);
+
+		const refreshSshKeyDialog = getByRole('dialog');
+		await waitFor(() => expect(refreshSshKeyDialog).toBeVisible());
+		await userEvent.click(within(refreshSshKeyDialog).getAllByRole('button')[1]);
+		await waitFor(() => expect(refreshSshKeyDialog).not.toBeVisible());
+
+		expect(generateKeyPairSpy).toHaveBeenCalledWith('rsa');
+	}, 10000);
+
+	describe('should test repo URLs', () => {
+		beforeEach(() => {
+			settingsStore.settings.enterprise[EnterpriseEditionFeature.SourceControl] = true;
+		});
+
+		test.each([
+			['git@github.com:user/repository.git', true],
+			['git@github.enterprise.com:org-name/repo-name.git', true],
+			['git@192.168.1.101:2222:user/repo.git', true],
+			['git@github.com:user/repo.git/path/to/subdir', true],
+			// The opening bracket in curly braces makes sure it is not treated as a special character by the 'user-event' library
+			['git@{[}2001:db8:100:f101:210:a4ff:fee3:9566]:user/repo.git', true],
+			['git@github.com:org/suborg/repo.git', true],
+			['git@github.com:user-name/repo-name.git', true],
+			['git@github.com:user_name/repo_name.git', true],
+			['git@github.com:user/repository', true],
+			['git@github.enterprise.com:org-name/repo-name', true],
+			['git@192.168.1.101:2222:user/repo', true],
+			['git@ssh.dev.azure.com:v3/User/repo/directory', true],
+			['ssh://git@mydomain.example:2224/gitolite-admin', true],
+			['http://github.com/user/repository', false],
+			['https://github.com/user/repository', false],
+		])('%s', async (url: string, isValid: boolean) => {
+			await nextTick();
+			const { container, queryByText } = renderComponent({
+				pinia,
+			});
+
+			await waitFor(() => expect(sourceControlStore.preferences.publicKey).not.toEqual(''));
+
+			const repoUrlInput = container.querySelector('input[name="repoUrl"]')!;
+
+			await userEvent.click(repoUrlInput);
+			await userEvent.type(repoUrlInput, url);
+			await userEvent.tab();
+
+			const inputError = expect(queryByText('The Git repository URL is not valid'));
+
+			if (isValid) {
+				inputError.not.toBeInTheDocument();
+			} else {
+				inputError.toBeInTheDocument();
+			}
+		});
+	});
+});
diff --git a/packages/editor-ui/src/views/__tests__/SettingsSso.test.ts b/packages/editor-ui/src/views/__tests__/SettingsSso.test.ts
index 20c64a8f7fefc..2e20da824fea8 100644
--- a/packages/editor-ui/src/views/__tests__/SettingsSso.test.ts
+++ b/packages/editor-ui/src/views/__tests__/SettingsSso.test.ts
@@ -1,90 +1,106 @@
-import { PiniaVuePlugin } from 'pinia';
-import { render } from '@testing-library/vue';
-import userEvent from '@testing-library/user-event';
-import { createTestingPinia } from '@pinia/testing';
-import { merge } from 'lodash-es';
-import { faker } from '@faker-js/faker';
+import { createPinia, setActivePinia } from 'pinia';
 import SettingsSso from '@/views/SettingsSso.vue';
-import { useSSOStore } from '@/stores/sso';
-import { STORES } from '@/constants';
-import { SETTINGS_STORE_DEFAULT_STATE, waitAllPromises } from '@/__tests__/utils';
-import { i18nInstance } from '@/plugins/i18n';
-import type { SamlPreferences, SamlPreferencesExtractedData } from '@/Interface';
 
-let pinia: ReturnType<typeof createTestingPinia>;
+import { retry } from '@/__tests__/utils';
+import { setupServer } from '@/__tests__/server';
+import { afterAll, beforeAll } from 'vitest';
+import { useSettingsStore } from '@/stores/settings.store';
+import userEvent from '@testing-library/user-event';
+import { useSSOStore } from '@/stores/sso.store';
+import { createComponentRenderer } from '@/__tests__/render';
+import { EnterpriseEditionFeature } from '@/constants';
+import { nextTick } from 'vue';
+
+let pinia: ReturnType<typeof createPinia>;
 let ssoStore: ReturnType<typeof useSSOStore>;
+let settingsStore: ReturnType<typeof useSettingsStore>;
+let server: ReturnType<typeof setupServer>;
 
-const samlConfig: SamlPreferences & SamlPreferencesExtractedData = {
-	metadata: '<?xml version="1.0"?>',
-	entityID: faker.internet.url(),
-	returnUrl: faker.internet.url(),
-};
-
-const renderComponent = (renderOptions: Parameters<typeof render>[1] = {}) =>
-	render(
-		SettingsSso,
-		merge(
-			{
-				pinia,
-				i18n: i18nInstance,
-			},
-			renderOptions,
-		),
-		(vue) => {
-			vue.use(PiniaVuePlugin);
-		},
-	);
+const renderComponent = createComponentRenderer(SettingsSso);
 
 describe('SettingsSso', () => {
-	beforeEach(() => {
-		pinia = createTestingPinia({
-			initialState: {
-				[STORES.SETTINGS]: {
-					settings: merge({}, SETTINGS_STORE_DEFAULT_STATE.settings),
-				},
-			},
-		});
-		ssoStore = useSSOStore(pinia);
+	beforeAll(() => {
+		server = setupServer();
+	});
+
+	beforeEach(async () => {
+		window.open = vi.fn();
+
+		pinia = createPinia();
+		setActivePinia(pinia);
+
+		ssoStore = useSSOStore();
+		settingsStore = useSettingsStore();
+
+		await settingsStore.getSettings();
 	});
 
 	afterEach(() => {
 		vi.clearAllMocks();
 	});
 
+	afterAll(() => {
+		server.shutdown();
+	});
+
 	it('should render paywall state when there is no license', () => {
-		const { getByTestId, queryByTestId, queryByRole } = renderComponent();
+		const { getByTestId, queryByTestId, queryByRole } = renderComponent({
+			pinia,
+		});
 
 		expect(queryByRole('checkbox')).not.toBeInTheDocument();
 		expect(queryByTestId('sso-content-licensed')).not.toBeInTheDocument();
 		expect(getByTestId('sso-content-unlicensed')).toBeInTheDocument();
 	});
 
-	it('should render licensed content', () => {
-		vi.spyOn(ssoStore, 'isEnterpriseSamlEnabled', 'get').mockReturnValue(true);
+	it('should render licensed content', async () => {
+		settingsStore.settings.enterprise[EnterpriseEditionFeature.Saml] = true;
+		await nextTick();
 
-		const { getByTestId, queryByTestId, getByRole } = renderComponent();
+		const { getByTestId, queryByTestId, getByRole } = renderComponent({
+			pinia,
+		});
 
-		expect(getByRole('checkbox')).toBeInTheDocument();
+		expect(getByRole('switch')).toBeInTheDocument();
 		expect(getByTestId('sso-content-licensed')).toBeInTheDocument();
 		expect(queryByTestId('sso-content-unlicensed')).not.toBeInTheDocument();
 	});
 
 	it('should enable activation checkbox and test button if data is already saved', async () => {
-		vi.spyOn(ssoStore, 'isEnterpriseSamlEnabled', 'get').mockReturnValue(true);
-		vi.spyOn(ssoStore, 'getSamlConfig').mockResolvedValue(samlConfig);
+		await ssoStore.getSamlConfig();
+		settingsStore.settings.enterprise[EnterpriseEditionFeature.Saml] = true;
+		await nextTick();
+
+		const { container, getByTestId, getByRole } = renderComponent({
+			pinia,
+		});
 
-		const { getByRole, getByTestId } = renderComponent();
-		await waitAllPromises();
+		const xmlRadioButton = getByTestId('radio-button-xml');
+		await userEvent.click(xmlRadioButton);
 
-		expect(getByRole('checkbox')).toBeEnabled();
+		await retry(() =>
+			expect(container.querySelector('textarea[name="metadata"]')).toHaveValue(
+				'<?xml version="1.0"?>',
+			),
+		);
+
+		expect(getByRole('switch')).toBeEnabled();
 		expect(getByTestId('sso-test')).toBeEnabled();
 	});
 
 	it('should enable activation checkbox after data is saved', async () => {
-		vi.spyOn(ssoStore, 'isEnterpriseSamlEnabled', 'get').mockReturnValue(true);
+		await ssoStore.saveSamlConfig({ metadata: '' });
+
+		settingsStore.settings.enterprise[EnterpriseEditionFeature.Saml] = true;
+		await nextTick();
 
-		const { getByRole, getAllByRole, getByTestId } = renderComponent();
-		const checkbox = getByRole('checkbox');
+		const saveSpy = vi.spyOn(ssoStore, 'saveSamlConfig');
+		const getSpy = vi.spyOn(ssoStore, 'getSamlConfig');
+
+		const { container, getByRole, getByTestId } = renderComponent({
+			pinia,
+		});
+		const checkbox = getByRole('switch');
 		const btnSave = getByTestId('sso-save');
 		const btnTest = getByTestId('sso-test');
 
@@ -93,8 +109,12 @@ describe('SettingsSso', () => {
 			expect(el).toBeDisabled();
 		});
 
+		const xmlRadioButton = getByTestId('radio-button-xml');
+		await userEvent.click(xmlRadioButton);
+
+		await retry(() => expect(container.querySelector('textarea[name="metadata"]')).toBeVisible());
 		await userEvent.type(
-			getAllByRole('textbox').find((el) => el.getAttribute('name') === 'metadata')!,
+			container.querySelector('textarea[name="metadata"]')!,
 			'<?xml version="1.0"?>',
 		);
 
@@ -102,14 +122,9 @@ describe('SettingsSso', () => {
 		expect(btnTest).toBeDisabled();
 		expect(btnSave).toBeEnabled();
 
-		const saveSpy = vi.spyOn(ssoStore, 'saveSamlConfig');
-		const getSpy = vi.spyOn(ssoStore, 'getSamlConfig').mockResolvedValue(samlConfig);
 		await userEvent.click(btnSave);
 
 		expect(saveSpy).toHaveBeenCalled();
 		expect(getSpy).toHaveBeenCalled();
-		expect(checkbox).toBeEnabled();
-		expect(btnTest).toBeEnabled();
-		expect(btnSave).toBeEnabled();
 	});
 });
diff --git a/packages/editor-ui/src/views/__tests__/SettingsVersionControl.test.ts b/packages/editor-ui/src/views/__tests__/SettingsVersionControl.test.ts
deleted file mode 100644
index c3bec841cc9ce..0000000000000
--- a/packages/editor-ui/src/views/__tests__/SettingsVersionControl.test.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import { PiniaVuePlugin } from 'pinia';
-import { render } from '@testing-library/vue';
-import { createTestingPinia } from '@pinia/testing';
-import { merge } from 'lodash-es';
-import { STORES } from '@/constants';
-import { SETTINGS_STORE_DEFAULT_STATE } from '@/__tests__/utils';
-import { i18n } from '@/plugins/i18n';
-import SettingsVersionControl from '@/views/SettingsVersionControl.vue';
-import { useVersionControlStore } from '@/stores/versionControl';
-
-let pinia: ReturnType<typeof createTestingPinia>;
-let versionControlStore: ReturnType<typeof useVersionControlStore>;
-
-const renderComponent = (renderOptions: Parameters<typeof render>[1] = {}) =>
-	render(
-		SettingsVersionControl,
-		merge(
-			{
-				pinia,
-				i18n,
-			},
-			renderOptions,
-		),
-		(vue) => {
-			vue.use(PiniaVuePlugin);
-		},
-	);
-
-describe('SettingsSso', () => {
-	beforeEach(() => {
-		pinia = createTestingPinia({
-			initialState: {
-				[STORES.SETTINGS]: {
-					settings: merge({}, SETTINGS_STORE_DEFAULT_STATE.settings),
-				},
-			},
-		});
-		versionControlStore = useVersionControlStore(pinia);
-	});
-
-	afterEach(() => {
-		vi.clearAllMocks();
-	});
-
-	it('should render paywall state when there is no license', () => {
-		const { getByTestId, queryByTestId } = renderComponent();
-
-		expect(queryByTestId('version-control-content-licensed')).not.toBeInTheDocument();
-		expect(getByTestId('version-control-content-unlicensed')).toBeInTheDocument();
-	});
-
-	it('should render licensed content', () => {
-		vi.spyOn(versionControlStore, 'isEnterpriseVersionControlEnabled', 'get').mockReturnValue(true);
-
-		const { getByTestId, queryByTestId } = renderComponent();
-
-		expect(getByTestId('version-control-content-licensed')).toBeInTheDocument();
-		expect(queryByTestId('version-control-content-unlicensed')).not.toBeInTheDocument();
-	});
-});
diff --git a/packages/editor-ui/src/views/__tests__/VariablesView.spec.ts b/packages/editor-ui/src/views/__tests__/VariablesView.spec.ts
index 34ecee0a79590..f9088cf68cb8c 100644
--- a/packages/editor-ui/src/views/__tests__/VariablesView.spec.ts
+++ b/packages/editor-ui/src/views/__tests__/VariablesView.spec.ts
@@ -1,14 +1,22 @@
 import { afterAll, beforeAll } from 'vitest';
 import { setActivePinia, createPinia } from 'pinia';
+import { waitFor } from '@testing-library/vue';
 import { setupServer } from '@/__tests__/server';
-import { render } from '@testing-library/vue';
 import VariablesView from '@/views/VariablesView.vue';
-import { useSettingsStore, useUsersStore } from '@/stores';
-import { renderComponent } from '@/__tests__/utils';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useUsersStore } from '@/stores/users.store';
+import { useRBACStore } from '@/stores/rbac.store';
+import { createComponentRenderer } from '@/__tests__/render';
+import { EnterpriseEditionFeature } from '@/constants';
 
-describe('store', () => {
+describe('VariablesView', () => {
 	let server: ReturnType<typeof setupServer>;
 	let pinia: ReturnType<typeof createPinia>;
+	let settingsStore: ReturnType<typeof useSettingsStore>;
+	let usersStore: ReturnType<typeof useUsersStore>;
+	let rbacStore: ReturnType<typeof useRBACStore>;
+
+	const renderComponent = createComponentRenderer(VariablesView);
 
 	beforeAll(() => {
 		server = setupServer();
@@ -18,9 +26,12 @@ describe('store', () => {
 		pinia = createPinia();
 		setActivePinia(pinia);
 
-		await useSettingsStore().getSettings();
-		await useUsersStore().fetchUsers();
-		await useUsersStore().loginWithCookie();
+		settingsStore = useSettingsStore();
+		usersStore = useUsersStore();
+		rbacStore = useRBACStore();
+		await settingsStore.getSettings();
+		await usersStore.fetchUsers();
+		await usersStore.loginWithCookie();
 	});
 
 	afterAll(() => {
@@ -28,25 +39,84 @@ describe('store', () => {
 	});
 
 	it('should render loading state', () => {
-		const wrapper = renderComponent(VariablesView, { pinia });
+		const wrapper = renderComponent({ pinia });
 
 		expect(wrapper.container.querySelectorAll('.n8n-loading')).toHaveLength(3);
 	});
 
-	it('should render empty state', async () => {
-		const wrapper = renderComponent(VariablesView, { pinia });
+	describe('should render empty state', () => {
+		it('when feature is disabled and logged in user is not owner', async () => {
+			settingsStore.settings.enterprise[EnterpriseEditionFeature.Variables] = false;
+			rbacStore.setGlobalScopes(['variable:read', 'variable:list']);
+
+			const { queryByTestId } = renderComponent({ pinia });
+
+			await waitFor(() => {
+				expect(queryByTestId('empty-resources-list')).not.toBeInTheDocument();
+				expect(queryByTestId('unavailable-resources-list')).toBeVisible();
+				expect(queryByTestId('cannot-create-variables')).not.toBeInTheDocument();
+			});
+		});
+
+		it('when feature is disabled and logged in user is owner', async () => {
+			settingsStore.settings.enterprise[EnterpriseEditionFeature.Variables] = false;
+			rbacStore.setGlobalScopes([
+				'variable:create',
+				'variable:read',
+				'variable:update',
+				'variable:delete',
+				'variable:list',
+			]);
+
+			const { queryByTestId } = renderComponent({ pinia });
+
+			await waitFor(() => {
+				expect(queryByTestId('empty-resources-list')).not.toBeInTheDocument();
+				expect(queryByTestId('unavailable-resources-list')).toBeVisible();
+				expect(queryByTestId('cannot-create-variables')).not.toBeInTheDocument();
+			});
+		});
+
+		it('when feature is enabled and logged in user is owner', async () => {
+			settingsStore.settings.enterprise[EnterpriseEditionFeature.Variables] = true;
+			rbacStore.setGlobalScopes([
+				'variable:create',
+				'variable:read',
+				'variable:update',
+				'variable:delete',
+				'variable:list',
+			]);
+
+			const { queryByTestId } = renderComponent({ pinia });
+
+			await waitFor(() => {
+				expect(queryByTestId('empty-resources-list')).not.toBeInTheDocument();
+				expect(queryByTestId('unavailable-resources-list')).not.toBeInTheDocument();
+				expect(queryByTestId('cannot-create-variables')).not.toBeInTheDocument();
+			});
+		});
+
+		it('when feature is enabled and logged in user is not owner', async () => {
+			settingsStore.settings.enterprise[EnterpriseEditionFeature.Variables] = true;
+			rbacStore.setGlobalScopes(['variable:read', 'variable:list']);
+
+			const { queryByTestId } = renderComponent({ pinia });
 
-		await wrapper.findByTestId('empty-resources-list');
-		expect(wrapper.getByTestId('empty-resources-list')).toBeVisible();
+			await waitFor(() => {
+				expect(queryByTestId('empty-resources-list')).not.toBeInTheDocument();
+				expect(queryByTestId('unavailable-resources-list')).not.toBeInTheDocument();
+				expect(queryByTestId('cannot-create-variables')).toBeVisible();
+			});
+		});
 	});
 
 	it('should render variable entries', async () => {
 		server.createList('variable', 3);
 
-		const wrapper = renderComponent(VariablesView, { pinia });
+		const wrapper = renderComponent({ pinia });
 
-		await wrapper.findByTestId('resources-table');
-		expect(wrapper.getByTestId('resources-table')).toBeVisible();
+		const table = await wrapper.findByTestId('resources-table');
+		expect(table).toBeVisible();
 		expect(wrapper.container.querySelectorAll('tr')).toHaveLength(4);
 	});
 });
diff --git a/packages/editor-ui/src/views/__tests__/WorkflowHistory.test.ts b/packages/editor-ui/src/views/__tests__/WorkflowHistory.test.ts
new file mode 100644
index 0000000000000..a0f9fa2bdeb32
--- /dev/null
+++ b/packages/editor-ui/src/views/__tests__/WorkflowHistory.test.ts
@@ -0,0 +1,232 @@
+import type { SpyInstance } from 'vitest';
+import { createTestingPinia } from '@pinia/testing';
+import { waitFor, within } from '@testing-library/vue';
+import userEvent from '@testing-library/user-event';
+import { defineComponent } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+import { faker } from '@faker-js/faker';
+import { createComponentRenderer } from '@/__tests__/render';
+import { SETTINGS_STORE_DEFAULT_STATE } from '@/__tests__/utils';
+import WorkflowHistoryPage from '@/views/WorkflowHistory.vue';
+import { useWorkflowHistoryStore } from '@/stores/workflowHistory.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { STORES, VIEWS } from '@/constants';
+import {
+	workflowHistoryDataFactory,
+	workflowVersionDataFactory,
+} from '@/stores/__tests__/utils/workflowHistoryTestUtils';
+import type { WorkflowVersion } from '@/types/workflowHistory';
+import type { IWorkflowDb } from '@/Interface';
+import { telemetry } from '@/plugins/telemetry';
+
+vi.mock('vue-router', () => {
+	const params = {};
+	const push = vi.fn();
+	const replace = vi.fn();
+	const resolve = vi.fn().mockImplementation(() => ({ href: '' }));
+	return {
+		useRoute: () => ({
+			params,
+		}),
+		useRouter: () => ({
+			push,
+			replace,
+			resolve,
+		}),
+		RouterLink: vi.fn(),
+	};
+});
+
+const workflowId = faker.string.nanoid();
+const historyData = Array.from({ length: 5 }, workflowHistoryDataFactory);
+const versionData: WorkflowVersion = {
+	...workflowVersionDataFactory(),
+	...historyData[0],
+};
+const versionId = faker.string.nanoid();
+
+const renderComponent = createComponentRenderer(WorkflowHistoryPage, {
+	global: {
+		stubs: {
+			'workflow-history-content': true,
+			'workflow-history-list': defineComponent({
+				props: {
+					id: {
+						type: String,
+						default: versionId,
+					},
+				},
+				template: `<div>
+						<button data-test-id="stub-preview-button" @click="event => $emit('preview', {id, event})" />
+						<button data-test-id="stub-open-button" @click="() => $emit('action', { action: 'open', id })" />
+						<button data-test-id="stub-clone-button" @click="() => $emit('action', { action: 'clone', id })" />
+						<button data-test-id="stub-download-button" @click="() => $emit('action', { action: 'download', id })" />
+					</div>`,
+			}),
+		},
+	},
+});
+
+let pinia: ReturnType<typeof createTestingPinia>;
+let router: ReturnType<typeof useRouter>;
+let route: ReturnType<typeof useRoute>;
+let workflowHistoryStore: ReturnType<typeof useWorkflowHistoryStore>;
+let workflowsStore: ReturnType<typeof useWorkflowsStore>;
+let windowOpenSpy: SpyInstance;
+
+describe('WorkflowHistory', () => {
+	beforeEach(() => {
+		pinia = createTestingPinia({
+			initialState: {
+				[STORES.SETTINGS]: SETTINGS_STORE_DEFAULT_STATE,
+			},
+		});
+		workflowHistoryStore = useWorkflowHistoryStore();
+		workflowsStore = useWorkflowsStore();
+		route = useRoute();
+		router = useRouter();
+
+		vi.spyOn(workflowsStore, 'fetchWorkflow').mockResolvedValue({} as IWorkflowDb);
+		vi.spyOn(workflowHistoryStore, 'getWorkflowHistory').mockResolvedValue(historyData);
+		vi.spyOn(workflowHistoryStore, 'getWorkflowVersion').mockResolvedValue(versionData);
+		vi.spyOn(telemetry, 'track').mockImplementation(() => {});
+		windowOpenSpy = vi.spyOn(window, 'open').mockImplementation(() => null);
+	});
+
+	afterEach(() => {
+		vi.clearAllMocks();
+	});
+
+	it('should replace url path to contain /:versionId', async () => {
+		route.params.workflowId = workflowId;
+
+		renderComponent({ pinia });
+
+		await waitFor(() => {
+			expect(router.replace).toHaveBeenCalledWith({
+				name: VIEWS.WORKFLOW_HISTORY,
+				params: { workflowId, versionId: versionData.versionId },
+			});
+			expect(telemetry.track).toHaveBeenCalledWith('User opened workflow history', {
+				instance_id: '',
+				workflow_id: workflowId,
+			});
+		});
+	});
+
+	it('should load version data if path contains /:versionId', async () => {
+		const getWorkflowVersionSpy = vi.spyOn(workflowHistoryStore, 'getWorkflowVersion');
+
+		route.params.workflowId = workflowId;
+		route.params.versionId = versionData.versionId;
+
+		renderComponent({ pinia });
+
+		expect(getWorkflowVersionSpy).toHaveBeenCalledWith(workflowId, versionData.versionId);
+		await waitFor(() => {
+			expect(router.replace).not.toHaveBeenCalled();
+			expect(telemetry.track).toHaveBeenCalledWith('User selected version', {
+				instance_id: '',
+				workflow_id: workflowId,
+			});
+		});
+	});
+
+	it('should change path on preview', async () => {
+		route.params.workflowId = workflowId;
+
+		const { getByTestId } = renderComponent({ pinia });
+
+		await userEvent.click(getByTestId('stub-preview-button'));
+
+		await waitFor(() => {
+			expect(router.push).toHaveBeenCalledWith({
+				name: VIEWS.WORKFLOW_HISTORY,
+				params: { workflowId, versionId },
+			});
+			expect(telemetry.track).toHaveBeenCalledWith('User selected version', {
+				instance_id: '',
+				workflow_id: workflowId,
+			});
+		});
+	});
+
+	it('should open preview in new tab if open action is dispatched', async () => {
+		route.params.workflowId = workflowId;
+		const { getByTestId } = renderComponent({ pinia });
+
+		await userEvent.click(getByTestId('stub-open-button'));
+
+		await waitFor(() => {
+			expect(router.resolve).toHaveBeenCalledWith({
+				name: VIEWS.WORKFLOW_HISTORY,
+				params: { workflowId, versionId },
+			});
+			expect(telemetry.track).toHaveBeenCalledWith('User opened version in new tab', {
+				instance_id: '',
+				workflow_id: workflowId,
+			});
+		});
+		expect(windowOpenSpy).toHaveBeenCalled();
+	});
+
+	it('should open preview in new tab if meta key used', async () => {
+		route.params.workflowId = workflowId;
+		const { getByTestId } = renderComponent({ pinia });
+
+		const user = userEvent.setup();
+
+		await user.keyboard('[ControlLeft>]');
+		await user.click(getByTestId('stub-preview-button'));
+
+		await waitFor(() => {
+			expect(router.resolve).toHaveBeenCalledWith({
+				name: VIEWS.WORKFLOW_HISTORY,
+				params: { workflowId, versionId },
+			});
+			expect(telemetry.track).toHaveBeenCalledWith('User opened version in new tab', {
+				instance_id: '',
+				workflow_id: workflowId,
+			});
+		});
+		expect(windowOpenSpy).toHaveBeenCalled();
+	});
+
+	it('should clone workflow from version data', async () => {
+		route.params.workflowId = workflowId;
+		const newWorkflowId = faker.string.nanoid();
+		vi.spyOn(workflowHistoryStore, 'cloneIntoNewWorkflow').mockResolvedValue({
+			id: newWorkflowId,
+		} as IWorkflowDb);
+
+		const { getByTestId, getByRole } = renderComponent({ pinia });
+		await userEvent.click(getByTestId('stub-clone-button'));
+
+		await waitFor(() => {
+			expect(router.resolve).toHaveBeenCalledWith({
+				name: VIEWS.WORKFLOW,
+				params: { name: newWorkflowId },
+			});
+			expect(telemetry.track).toHaveBeenCalledWith('User cloned version', {
+				instance_id: '',
+				workflow_id: workflowId,
+			});
+		});
+
+		expect(within(getByRole('alert')).getByRole('link')).toBeInTheDocument();
+	});
+
+	it('should download workflow version', async () => {
+		route.params.workflowId = workflowId;
+
+		const { getByTestId } = renderComponent({ pinia });
+		await userEvent.click(getByTestId('stub-download-button'));
+
+		await waitFor(() => {
+			expect(telemetry.track).toHaveBeenCalledWith('User downloaded version', {
+				instance_id: '',
+				workflow_id: workflowId,
+			});
+		});
+	});
+});
diff --git a/packages/editor-ui/src/views/__tests__/WorkflowsView.test.ts b/packages/editor-ui/src/views/__tests__/WorkflowsView.test.ts
new file mode 100644
index 0000000000000..9adbd8c637238
--- /dev/null
+++ b/packages/editor-ui/src/views/__tests__/WorkflowsView.test.ts
@@ -0,0 +1,99 @@
+import { afterAll, beforeAll } from 'vitest';
+import { setActivePinia, createPinia } from 'pinia';
+import { waitFor } from '@testing-library/vue';
+import userEvent from '@testing-library/user-event';
+import { setupServer } from '@/__tests__/server';
+import WorkflowsView from '@/views/WorkflowsView.vue';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useUsersStore } from '@/stores/users.store';
+import { createComponentRenderer } from '@/__tests__/render';
+
+const originalOffsetHeight = Object.getOwnPropertyDescriptor(
+	HTMLElement.prototype,
+	'offsetHeight',
+) as PropertyDescriptor;
+
+describe('WorkflowsView', () => {
+	let server: ReturnType<typeof setupServer>;
+	let pinia: ReturnType<typeof createPinia>;
+	let settingsStore: ReturnType<typeof useSettingsStore>;
+	let usersStore: ReturnType<typeof useUsersStore>;
+
+	const renderComponent = createComponentRenderer(WorkflowsView, {
+		global: {
+			mocks: {
+				$route: {
+					query: {},
+				},
+				$router: {
+					replace: vi.fn(),
+				},
+			},
+		},
+	});
+
+	beforeAll(() => {
+		Object.defineProperties(HTMLElement.prototype, {
+			offsetHeight: {
+				get() {
+					return this.getAttribute('data-test-id') === 'resources-list' ? 1000 : 100;
+				},
+			},
+		});
+
+		server = setupServer();
+	});
+
+	afterAll(() => {
+		Object.defineProperty(HTMLElement.prototype, 'offsetHeight', originalOffsetHeight);
+	});
+
+	beforeEach(async () => {
+		pinia = createPinia();
+		setActivePinia(pinia);
+
+		settingsStore = useSettingsStore();
+		usersStore = useUsersStore();
+		await settingsStore.getSettings();
+		await usersStore.fetchUsers();
+		await usersStore.loginWithCookie();
+	});
+
+	afterAll(() => {
+		server.shutdown();
+	});
+
+	it('should filter workflows by tags', async () => {
+		const { container, getByTestId, getAllByTestId, queryByTestId } = renderComponent({
+			pinia,
+		});
+
+		expect(container.querySelectorAll('.n8n-loading')).toHaveLength(3);
+		expect(queryByTestId('resources-list')).not.toBeInTheDocument();
+
+		await waitFor(() => {
+			expect(container.querySelectorAll('.n8n-loading')).toHaveLength(0);
+			// There are 5 workflows defined in server fixtures
+			expect(getAllByTestId('resources-list-item')).toHaveLength(5);
+		});
+
+		await userEvent.click(
+			getAllByTestId('resources-list-item')[0].querySelector('.n8n-tag') as HTMLElement,
+		);
+		await waitFor(() => {
+			expect(getAllByTestId('resources-list-item').length).toBeLessThan(5);
+		});
+
+		await userEvent.click(getByTestId('workflows-filter-reset'));
+		await waitFor(() => {
+			expect(getAllByTestId('resources-list-item')).toHaveLength(5);
+		});
+
+		await userEvent.click(
+			getAllByTestId('resources-list-item')[3].querySelector('.n8n-tag') as HTMLElement,
+		);
+		await waitFor(() => {
+			expect(getAllByTestId('resources-list-item').length).toBeLessThan(5);
+		});
+	});
+});
diff --git a/packages/editor-ui/src/vue-agile.d.ts b/packages/editor-ui/src/vue-agile.d.ts
deleted file mode 100644
index 23b389c3ebe71..0000000000000
--- a/packages/editor-ui/src/vue-agile.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-declare module 'vue-agile';
diff --git a/packages/editor-ui/tsconfig.json b/packages/editor-ui/tsconfig.json
index fd6a19a4cb211..39cf47b586e5c 100644
--- a/packages/editor-ui/tsconfig.json
+++ b/packages/editor-ui/tsconfig.json
@@ -5,7 +5,6 @@
 		"outDir": "dist",
 		"target": "esnext",
 		"module": "esnext",
-		"skipLibCheck": true,
 		"allowJs": true,
 		"importHelpers": true,
 		"incremental": false,
@@ -15,12 +14,14 @@
 		"types": ["vitest/globals"],
 		"paths": {
 			"@/*": ["src/*"],
-			"n8n-design-system/*": ["../design-system/src/*"]
+			"n8n-design-system/*": ["../design-system/src/*"],
+			"@n8n/chat/*": ["../@n8n/chat/src/*"]
 		},
 		"lib": ["esnext", "dom", "dom.iterable", "scripthost"],
 		// TODO: remove all options below this line
 		"noUnusedLocals": false,
-		"useUnknownInCatchVariables": false
+		"useUnknownInCatchVariables": false,
+		"experimentalDecorators": true
 	},
 	"include": ["src/**/*.ts", "src/**/*.vue"]
 }
diff --git a/packages/editor-ui/vite.config.mts b/packages/editor-ui/vite.config.mts
new file mode 100644
index 0000000000000..b1556d8c08da7
--- /dev/null
+++ b/packages/editor-ui/vite.config.mts
@@ -0,0 +1,136 @@
+import vue from '@vitejs/plugin-vue';
+import { resolve } from 'path';
+import { defineConfig, mergeConfig } from 'vite';
+import { sentryVitePlugin } from '@sentry/vite-plugin';
+import checker from 'vite-plugin-checker';
+
+import packageJSON from './package.json';
+import { vitestConfig } from '../design-system/vite.config.mts';
+import icons from 'unplugin-icons/vite';
+
+const vendorChunks = ['vue', 'vue-router'];
+const n8nChunks = ['n8n-workflow', 'n8n-design-system', '@n8n/chat'];
+const ignoreChunks = [
+	'@fontsource/open-sans',
+	'@vueuse/components',
+	// TODO: remove this. It's currently required by xml2js in NodeErrors
+	'stream-browserify',
+	'vue-markdown-render',
+];
+
+const isScopedPackageToIgnore = (str: string) => /@codemirror\//.test(str);
+
+function renderChunks() {
+	const { dependencies } = packageJSON;
+	const chunks: Record<string, string[]> = {};
+
+	Object.keys(dependencies).forEach((key) => {
+		if ([...vendorChunks, ...n8nChunks, ...ignoreChunks].includes(key)) {
+			return;
+		}
+
+		if (isScopedPackageToIgnore(key)) return;
+
+		chunks[key] = [key];
+	});
+
+	return chunks;
+}
+
+const publicPath = process.env.VUE_APP_PUBLIC_PATH || '/';
+
+const { NODE_ENV } = process.env;
+
+const alias = [
+	{ find: '@', replacement: resolve(__dirname, 'src') },
+	{ find: 'stream', replacement: 'stream-browserify' },
+	{
+		find: /^n8n-design-system$/,
+		replacement: resolve(__dirname, '..', 'design-system', 'src', 'main.ts'),
+	},
+	{
+		find: /^n8n-design-system\//,
+		replacement: resolve(__dirname, '..', 'design-system', 'src') + '/',
+	},
+	{
+		find: /^@n8n\/chat$/,
+		replacement: resolve(__dirname, '..', '@n8n', 'chat', 'src', 'index.ts'),
+	},
+	{
+		find: /^@n8n\/chat\//,
+		replacement: resolve(__dirname, '..', '@n8n', 'chat', 'src') + '/',
+	},
+	...['orderBy', 'camelCase', 'cloneDeep', 'startCase'].map((name) => ({
+		find: new RegExp(`^lodash.${name}$`, 'i'),
+		replacement: `lodash-es/${name}`,
+	})),
+	{
+		find: /^lodash\.(.+)$/,
+		replacement: 'lodash-es/$1',
+	},
+];
+
+const plugins = [
+	icons({
+		compiler: 'vue3',
+	}),
+	vue(),
+];
+if (process.env.ENABLE_TYPE_CHECKING === 'true') {
+	plugins.push(checker({ vueTsc: true }));
+}
+
+const { SENTRY_AUTH_TOKEN: authToken, RELEASE: release } = process.env;
+if (release && authToken) {
+	plugins.push(
+		sentryVitePlugin({
+			org: 'n8nio',
+			project: 'instance-frontend',
+			// Specify the directory containing build artifacts
+			include: './dist',
+			// Auth tokens can be obtained from https://sentry.io/settings/account/api/auth-tokens/
+			// and needs the `project:releases` and `org:read` scopes
+			authToken,
+			telemetry: false,
+			release,
+		}),
+	);
+}
+
+export default mergeConfig(
+	defineConfig({
+		define: {
+			// This causes test to fail but is required for actually running it
+			// ...(NODE_ENV !== 'test' ? { 'global': 'globalThis' } : {}),
+			...(NODE_ENV === 'development' ? { 'process.env': {} } : {}),
+			BASE_PATH: `'${publicPath}'`,
+		},
+		plugins,
+		resolve: { alias },
+		base: publicPath,
+		envPrefix: 'VUE_APP',
+		css: {
+			preprocessorOptions: {
+				scss: {
+					additionalData: '\n@use "@/n8n-theme-variables.scss" as *;\n',
+				},
+			},
+		},
+		build: {
+			assetsInlineLimit: 0,
+			minify: !!release,
+			sourcemap: !!release,
+			rollupOptions: {
+				treeshake: !!release,
+				output: {
+					manualChunks: {
+						vendor: vendorChunks,
+						n8n: n8nChunks,
+						...renderChunks(),
+					},
+				},
+			},
+		},
+	}),
+	vitestConfig,
+);
diff --git a/packages/editor-ui/vite.config.mts.timestamp-1716781355599-2c7fab1866d63.mjs b/packages/editor-ui/vite.config.mts.timestamp-1716781355599-2c7fab1866d63.mjs
new file mode 100644
index 0000000000000..b00fc717d49ee
--- /dev/null
+++ b/packages/editor-ui/vite.config.mts.timestamp-1716781355599-2c7fab1866d63.mjs
@@ -0,0 +1,302 @@
+// vite.config.mts
+import vue2 from "file:///C:/Users/HP/Desktop/fix/latest/n8n-fork/node_modules/.pnpm/@vitejs+plugin-vue@5.0.4_vite@5.1.6_vue@3.4.21/node_modules/@vitejs/plugin-vue/dist/index.mjs";
+import { resolve as resolve2 } from "path";
+import { defineConfig as defineConfig2, mergeConfig as mergeConfig2 } from "file:///C:/Users/HP/Desktop/fix/latest/n8n-fork/node_modules/.pnpm/vite@5.1.6_sass@1.64.1/node_modules/vite/dist/node/index.js";
+import { sentryVitePlugin } from "file:///C:/Users/HP/Desktop/fix/latest/n8n-fork/node_modules/.pnpm/@sentry+vite-plugin@2.5.0/node_modules/@sentry/vite-plugin/dist/esm/index.mjs";
+import checker2 from "file:///C:/Users/HP/Desktop/fix/latest/n8n-fork/node_modules/.pnpm/vite-plugin-checker@0.6.4_patch_hash=emhml6hz55p6dz7xjncbjppjdm_typescript@5.4.2_vite@5.1.6_vue-tsc@2.0.6/node_modules/vite-plugin-checker/dist/esm/main.js";
+
+// package.json
+var package_default = {
+  name: "n8n-editor-ui",
+  version: "1.41.0",
+  description: "Workflow Editor UI for n8n",
+  license: "SEE LICENSE IN LICENSE.md",
+  homepage: "https://n8n.io",
+  author: {
+    name: "Jan Oberhauser",
+    email: "jan@n8n.io"
+  },
+  main: "index.js",
+  repository: {
+    type: "git",
+    url: "git+https://github.com/n8n-io/n8n.git"
+  },
+  scripts: {
+    clean: "rimraf dist .turbo",
+    build: 'cross-env VUE_APP_PUBLIC_PATH="/{{BASE_PATH}}/" NODE_OPTIONS="--max-old-space-size=8192" vite build',
+    typecheck: "vue-tsc --noEmit",
+    dev: "pnpm serve",
+    lint: "eslint src --ext .js,.ts,.vue --quiet",
+    lintfix: "eslint src --ext .js,.ts,.vue --fix",
+    format: "prettier --write . --ignore-path ../../.prettierignore",
+    serve: "cross-env VUE_APP_URL_BASE_API=http://localhost:5678/ vite --host 0.0.0.0 --port 8080 dev",
+    test: "vitest run",
+    "test:dev": "vitest"
+  },
+  dependencies: {
+    "@codemirror/autocomplete": "^6.11.1",
+    "@codemirror/commands": "^6.3.2",
+    "@codemirror/lang-javascript": "^6.2.1",
+    "@codemirror/lang-json": "^6.0.1",
+    "@codemirror/lang-python": "^6.1.3",
+    "@codemirror/language": "^6.9.3",
+    "@codemirror/lint": "^6.4.2",
+    "@codemirror/state": "^6.3.3",
+    "@codemirror/view": "^6.22.3",
+    "@fontsource/open-sans": "^4.5.0",
+    "@jsplumb/browser-ui": "^5.13.2",
+    "@jsplumb/common": "^5.13.2",
+    "@jsplumb/connector-bezier": "^5.13.2",
+    "@jsplumb/core": "^5.13.2",
+    "@jsplumb/util": "^5.13.2",
+    "@lezer/common": "^1.0.4",
+    "@n8n/chat": "workspace:*",
+    "@n8n/codemirror-lang-sql": "^1.0.2",
+    "@n8n/permissions": "workspace:*",
+    "@vueuse/components": "^10.5.0",
+    "@vueuse/core": "^10.5.0",
+    axios: "1.6.7",
+    "chart.js": "^4.4.0",
+    "codemirror-lang-html-n8n": "^1.0.0",
+    "codemirror-lang-n8n-expression": "^0.3.0",
+    dateformat: "^3.0.3",
+    "email-providers": "^2.0.1",
+    "esprima-next": "5.8.4",
+    "fast-json-stable-stringify": "^2.1.0",
+    "file-saver": "^2.0.2",
+    flatted: "^3.2.4",
+    "humanize-duration": "^3.27.2",
+    jsonpath: "^1.1.1",
+    "lodash-es": "^4.17.21",
+    luxon: "^3.3.0",
+    "n8n-design-system": "workspace:*",
+    "n8n-workflow": "workspace:*",
+    pinia: "^2.1.6",
+    prettier: "^3.1.0",
+    "qrcode.vue": "^3.3.4",
+    "stream-browserify": "^3.0.0",
+    "timeago.js": "^4.0.2",
+    uuid: "^8.3.2",
+    "v3-infinite-loading": "^1.2.2",
+    vue: "^3.4.21",
+    "vue-agile": "^2.0.0",
+    "vue-chartjs": "^5.2.0",
+    "vue-i18n": "^9.2.2",
+    "vue-json-pretty": "2.2.4",
+    "vue-markdown-render": "^2.0.1",
+    "vue-router": "^4.2.2",
+    "vue3-touch-events": "^4.1.3",
+    xss: "^1.0.14"
+  },
+  devDependencies: {
+    "@faker-js/faker": "^8.0.2",
+    "@pinia/testing": "^0.1.3",
+    "@sentry/vite-plugin": "^2.5.0",
+    "@types/dateformat": "^3.0.0",
+    "@types/file-saver": "^2.0.1",
+    "@types/humanize-duration": "^3.27.1",
+    "@types/jsonpath": "^0.2.0",
+    "@types/lodash-es": "^4.17.6",
+    "@types/luxon": "^3.2.0",
+    "@types/qrcode": "^1.5.0",
+    "@types/swagger-ui": "^3.52.0",
+    "@types/uuid": "^8.3.2",
+    miragejs: "^0.1.48",
+    "unplugin-icons": "^0.17.0"
+  },
+  peerDependencies: {
+    "@fortawesome/fontawesome-svg-core": "*",
+    "@fortawesome/free-regular-svg-icons": "*",
+    "@fortawesome/free-solid-svg-icons": "*",
+    "@fortawesome/vue-fontawesome": "*"
+  }
+};
+
+// ../design-system/vite.config.mts
+import vue from "file:///C:/Users/HP/Desktop/fix/latest/n8n-fork/node_modules/.pnpm/@vitejs+plugin-vue@5.0.4_vite@5.1.6_vue@3.4.21/node_modules/@vitejs/plugin-vue/dist/index.mjs";
+import { resolve } from "path";
+import { defineConfig, mergeConfig } from "file:///C:/Users/HP/Desktop/fix/latest/n8n-fork/node_modules/.pnpm/vite@5.1.6_sass@1.64.1/node_modules/vite/dist/node/index.js";
+import checker from "file:///C:/Users/HP/Desktop/fix/latest/n8n-fork/node_modules/.pnpm/vite-plugin-checker@0.6.4_patch_hash=emhml6hz55p6dz7xjncbjppjdm_typescript@5.4.2_vite@5.1.6_vue-tsc@2.0.6/node_modules/vite-plugin-checker/dist/esm/main.js";
+import { defineConfig as defineVitestConfig } from "file:///C:/Users/HP/Desktop/fix/latest/n8n-fork/node_modules/.pnpm/vitest@1.3.1/node_modules/vitest/dist/config.js";
+var __vite_injected_original_dirname = "C:\\Users\\HP\\Desktop\\fix\\latest\\n8n-fork\\packages\\design-system";
+var vitestConfig = defineVitestConfig({
+  test: {
+    silent: true,
+    globals: true,
+    environment: "jsdom",
+    setupFiles: ["./src/__tests__/setup.ts"],
+    ...process.env.COVERAGE_ENABLED === "true" ? {
+      coverage: {
+        enabled: true,
+        provider: "v8",
+        reporter: process.env.CI === "true" ? "cobertura" : "text-summary",
+        all: true
+      }
+    } : {},
+    css: {
+      modules: {
+        classNameStrategy: "non-scoped"
+      }
+    }
+  }
+});
+var plugins = [vue()];
+if (process.env.ENABLE_TYPE_CHECKING === "true") {
+  plugins.push(checker({ vueTsc: true }));
+}
+var vite_config_default = mergeConfig(
+  defineConfig({
+    plugins,
+    resolve: {
+      alias: {
+        "@": resolve(__vite_injected_original_dirname, "src"),
+        "n8n-design-system": resolve(__vite_injected_original_dirname, "src"),
+        lodash: "lodash-es"
+      }
+    },
+    build: {
+      lib: {
+        entry: resolve(__vite_injected_original_dirname, "src", "main.ts"),
+        name: "N8nDesignSystem",
+        fileName: (format) => `n8n-design-system.${format}.js`
+      },
+      rollupOptions: {
+        // make sure to externalize deps that shouldn't be bundled
+        // into your library
+        external: ["vue"],
+        output: {
+          exports: "named",
+          // Provide global variables to use in the UMD build
+          // for externalized deps
+          globals: {
+            vue: "Vue"
+          }
+        }
+      }
+    }
+  }),
+  vitestConfig
+);
+
+// vite.config.mts
+import icons from "file:///C:/Users/HP/Desktop/fix/latest/n8n-fork/node_modules/.pnpm/unplugin-icons@0.17.4/node_modules/unplugin-icons/dist/vite.mjs";
+var __vite_injected_original_dirname2 = "C:\\Users\\HP\\Desktop\\fix\\latest\\n8n-fork\\packages\\editor-ui";
+var vendorChunks = ["vue", "vue-router"];
+var n8nChunks = ["n8n-workflow", "n8n-design-system", "@n8n/chat"];
+var ignoreChunks = [
+  "@fontsource/open-sans",
+  "@vueuse/components",
+  // TODO: remove this. It's currently required by xml2js in NodeErrors
+  "stream-browserify",
+  "vue-markdown-render"
+];
+var isScopedPackageToIgnore = (str) => /@codemirror\//.test(str);
+function renderChunks() {
+  const { dependencies } = package_default;
+  const chunks = {};
+  Object.keys(dependencies).forEach((key) => {
+    if ([...vendorChunks, ...n8nChunks, ...ignoreChunks].includes(key)) {
+      return;
+    }
+    if (isScopedPackageToIgnore(key))
+      return;
+    chunks[key] = [key];
+  });
+  return chunks;
+}
+var publicPath = process.env.VUE_APP_PUBLIC_PATH || "/";
+var { NODE_ENV } = process.env;
+var alias = [
+  { find: "@", replacement: resolve2(__vite_injected_original_dirname2, "src") },
+  { find: "stream", replacement: "stream-browserify" },
+  {
+    find: /^n8n-design-system$/,
+    replacement: resolve2(__vite_injected_original_dirname2, "..", "design-system", "src", "main.ts")
+  },
+  {
+    find: /^n8n-design-system\//,
+    replacement: resolve2(__vite_injected_original_dirname2, "..", "design-system", "src") + "/"
+  },
+  {
+    find: /^@n8n\/chat$/,
+    replacement: resolve2(__vite_injected_original_dirname2, "..", "@n8n", "chat", "src", "index.ts")
+  },
+  {
+    find: /^@n8n\/chat\//,
+    replacement: resolve2(__vite_injected_original_dirname2, "..", "@n8n", "chat", "src") + "/"
+  },
+  ...["orderBy", "camelCase", "cloneDeep", "startCase"].map((name) => ({
+    find: new RegExp(`^lodash.${name}$`, "i"),
+    replacement: `lodash-es/${name}`
+  })),
+  {
+    find: /^lodash\.(.+)$/,
+    replacement: "lodash-es/$1"
+  }
+];
+var plugins2 = [
+  icons({
+    compiler: "vue3"
+  }),
+  vue2()
+];
+if (process.env.ENABLE_TYPE_CHECKING === "true") {
+  plugins2.push(checker2({ vueTsc: true }));
+}
+var { SENTRY_AUTH_TOKEN: authToken, RELEASE: release } = process.env;
+if (release && authToken) {
+  plugins2.push(
+    sentryVitePlugin({
+      org: "n8nio",
+      project: "instance-frontend",
+      // Specify the directory containing build artifacts
+      include: "./dist",
+      // Auth tokens can be obtained from https://sentry.io/settings/account/api/auth-tokens/
+      // and needs the `project:releases` and `org:read` scopes
+      authToken,
+      telemetry: false,
+      release
+    })
+  );
+}
+var vite_config_default2 = mergeConfig2(
+  defineConfig2({
+    define: {
+      // This causes test to fail but is required for actually running it
+      // ...(NODE_ENV !== 'test' ? { 'global': 'globalThis' } : {}),
+      ...NODE_ENV === "development" ? { "process.env": {} } : {},
+      BASE_PATH: `'${publicPath}'`
+    },
+    plugins: plugins2,
+    resolve: { alias },
+    base: publicPath,
+    envPrefix: "VUE_APP",
+    css: {
+      preprocessorOptions: {
+        scss: {
+          additionalData: '\n@use "@/n8n-theme-variables.scss" as *;\n'
+        }
+      }
+    },
+    build: {
+      assetsInlineLimit: 0,
+      minify: !!release,
+      sourcemap: !!release,
+      rollupOptions: {
+        treeshake: !!release,
+        output: {
+          manualChunks: {
+            vendor: vendorChunks,
+            n8n: n8nChunks,
+            ...renderChunks()
+          }
+        }
+      }
+    }
+  }),
+  vitestConfig
+);
+export {
+  vite_config_default2 as default
+};
+//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["vite.config.mts", "package.json", "../design-system/vite.config.mts"],
  "sourcesContent": ["const __vite_injected_original_dirname = \"C:\\\\Users\\\\HP\\\\Desktop\\\\fix\\\\latest\\\\n8n-fork\\\\packages\\\\editor-ui\";const __vite_injected_original_filename = \"C:\\\\Users\\\\HP\\\\Desktop\\\\fix\\\\latest\\\\n8n-fork\\\\packages\\\\editor-ui\\\\vite.config.mts\";const __vite_injected_original_import_meta_url = \"file:///C:/Users/HP/Desktop/fix/latest/n8n-fork/packages/editor-ui/vite.config.mts\";import vue from '@vitejs/plugin-vue';\r\nimport { resolve } from 'path';\r\nimport { defineConfig, mergeConfig } from 'vite';\r\nimport { sentryVitePlugin } from '@sentry/vite-plugin';\r\nimport checker from 'vite-plugin-checker';\r\n\r\nimport packageJSON from './package.json';\r\nimport { vitestConfig } from '../design-system/vite.config.mts';\r\nimport icons from 'unplugin-icons/vite';\r\n\r\nconst vendorChunks = ['vue', 'vue-router'];\r\nconst n8nChunks = ['n8n-workflow', 'n8n-design-system', '@n8n/chat'];\r\nconst ignoreChunks = [\r\n\t'@fontsource/open-sans',\r\n\t'@vueuse/components',\r\n\t// TODO: remove this. It's currently required by xml2js in NodeErrors\r\n\t'stream-browserify',\r\n\t'vue-markdown-render',\r\n];\r\n\r\nconst isScopedPackageToIgnore = (str: string) => /@codemirror\\//.test(str);\r\n\r\nfunction renderChunks() {\r\n\tconst { dependencies } = packageJSON;\r\n\tconst chunks: Record<string, string[]> = {};\r\n\r\n\tObject.keys(dependencies).forEach((key) => {\r\n\t\tif ([...vendorChunks, ...n8nChunks, ...ignoreChunks].includes(key)) {\r\n\t\t\treturn;\r\n\t\t}\r\n\r\n\t\tif (isScopedPackageToIgnore(key)) return;\r\n\r\n\t\tchunks[key] = [key];\r\n\t});\r\n\r\n\treturn chunks;\r\n}\r\n\r\nconst publicPath = process.env.VUE_APP_PUBLIC_PATH || '/';\r\n\r\nconst { NODE_ENV } = process.env;\r\n\r\nconst alias = [\r\n\t{ find: '@', replacement: resolve(__dirname, 'src') },\r\n\t{ find: 'stream', replacement: 'stream-browserify' },\r\n\t{\r\n\t\tfind: /^n8n-design-system$/,\r\n\t\treplacement: resolve(__dirname, '..', 'design-system', 'src', 'main.ts'),\r\n\t},\r\n\t{\r\n\t\tfind: /^n8n-design-system\\//,\r\n\t\treplacement: resolve(__dirname, '..', 'design-system', 'src') + '/',\r\n\t},\r\n\t{\r\n\t\tfind: /^@n8n\\/chat$/,\r\n\t\treplacement: resolve(__dirname, '..', '@n8n', 'chat', 'src', 'index.ts'),\r\n\t},\r\n\t{\r\n\t\tfind: /^@n8n\\/chat\\//,\r\n\t\treplacement: resolve(__dirname, '..', '@n8n', 'chat', 'src') + '/',\r\n\t},\r\n\t...['orderBy', 'camelCase', 'cloneDeep', 'startCase'].map((name) => ({\r\n\t\tfind: new RegExp(`^lodash.${name}$`, 'i'),\r\n\t\treplacement: `lodash-es/${name}`,\r\n\t})),\r\n\t{\r\n\t\tfind: /^lodash\\.(.+)$/,\r\n\t\treplacement: 'lodash-es/$1',\r\n\t},\r\n];\r\n\r\nconst plugins = [\r\n\ticons({\r\n\t\tcompiler: 'vue3',\r\n\t}),\r\n\tvue(),\r\n];\r\nif (process.env.ENABLE_TYPE_CHECKING === 'true') {\r\n\tplugins.push(checker({ vueTsc: true }));\r\n}\r\n\r\nconst { SENTRY_AUTH_TOKEN: authToken, RELEASE: release } = process.env;\r\nif (release && authToken) {\r\n\tplugins.push(\r\n\t\tsentryVitePlugin({\r\n\t\t\torg: 'n8nio',\r\n\t\t\tproject: 'instance-frontend',\r\n\t\t\t// Specify the directory containing build artifacts\r\n\t\t\tinclude: './dist',\r\n\t\t\t// Auth tokens can be obtained from https://sentry.io/settings/account/api/auth-tokens/\r\n\t\t\t// and needs the `project:releases` and `org:read` scopes\r\n\t\t\tauthToken,\r\n\t\t\ttelemetry: false,\r\n\t\t\trelease,\r\n\t\t}),\r\n\t);\r\n}\r\n\r\nexport default mergeConfig(\r\n\tdefineConfig({\r\n\t\tdefine: {\r\n\t\t\t// This causes test to fail but is required for actually running it\r\n\t\t\t// ...(NODE_ENV !== 'test' ? { 'global': 'globalThis' } : {}),\r\n\t\t\t...(NODE_ENV === 'development' ? { 'process.env': {} } : {}),\r\n\t\t\tBASE_PATH: `'${publicPath}'`,\r\n\t\t},\r\n\t\tplugins,\r\n\t\tresolve: { alias },\r\n\t\tbase: publicPath,\r\n\t\tenvPrefix: 'VUE_APP',\r\n\t\tcss: {\r\n\t\t\tpreprocessorOptions: {\r\n\t\t\t\tscss: {\r\n\t\t\t\t\tadditionalData: '\\n@use \"@/n8n-theme-variables.scss\" as *;\\n',\r\n\t\t\t\t},\r\n\t\t\t},\r\n\t\t},\r\n\t\tbuild: {\r\n\t\t\tassetsInlineLimit: 0,\r\n\t\t\tminify: !!release,\r\n\t\t\tsourcemap: !!release,\r\n\t\t\trollupOptions: {\r\n\t\t\t\ttreeshake: !!release,\r\n\t\t\t\toutput: {\r\n\t\t\t\t\tmanualChunks: {\r\n\t\t\t\t\t\tvendor: vendorChunks,\r\n\t\t\t\t\t\tn8n: n8nChunks,\r\n\t\t\t\t\t\t...renderChunks(),\r\n\t\t\t\t\t},\r\n\t\t\t\t},\r\n\t\t\t},\r\n\t\t},\r\n\t}),\r\n\tvitestConfig,\r\n);\r\n", "{\r\n  \"name\": \"n8n-editor-ui\",\r\n  \"version\": \"1.41.0\",\r\n  \"description\": \"Workflow Editor UI for n8n\",\r\n  \"license\": \"SEE LICENSE IN LICENSE.md\",\r\n  \"homepage\": \"https://n8n.io\",\r\n  \"author\": {\r\n    \"name\": \"Jan Oberhauser\",\r\n    \"email\": \"jan@n8n.io\"\r\n  },\r\n  \"main\": \"index.js\",\r\n  \"repository\": {\r\n    \"type\": \"git\",\r\n    \"url\": \"git+https://github.com/n8n-io/n8n.git\"\r\n  },\r\n  \"scripts\": {\r\n    \"clean\": \"rimraf dist .turbo\",\r\n    \"build\": \"cross-env VUE_APP_PUBLIC_PATH=\\\"/{{BASE_PATH}}/\\\" NODE_OPTIONS=\\\"--max-old-space-size=8192\\\" vite build\",\r\n    \"typecheck\": \"vue-tsc --noEmit\",\r\n    \"dev\": \"pnpm serve\",\r\n    \"lint\": \"eslint src --ext .js,.ts,.vue --quiet\",\r\n    \"lintfix\": \"eslint src --ext .js,.ts,.vue --fix\",\r\n    \"format\": \"prettier --write . --ignore-path ../../.prettierignore\",\r\n    \"serve\": \"cross-env VUE_APP_URL_BASE_API=http://localhost:5678/ vite --host 0.0.0.0 --port 8080 dev\",\r\n    \"test\": \"vitest run\",\r\n    \"test:dev\": \"vitest\"\r\n  },\r\n  \"dependencies\": {\r\n    \"@codemirror/autocomplete\": \"^6.11.1\",\r\n    \"@codemirror/commands\": \"^6.3.2\",\r\n    \"@codemirror/lang-javascript\": \"^6.2.1\",\r\n    \"@codemirror/lang-json\": \"^6.0.1\",\r\n    \"@codemirror/lang-python\": \"^6.1.3\",\r\n    \"@codemirror/language\": \"^6.9.3\",\r\n    \"@codemirror/lint\": \"^6.4.2\",\r\n    \"@codemirror/state\": \"^6.3.3\",\r\n    \"@codemirror/view\": \"^6.22.3\",\r\n    \"@fontsource/open-sans\": \"^4.5.0\",\r\n    \"@jsplumb/browser-ui\": \"^5.13.2\",\r\n    \"@jsplumb/common\": \"^5.13.2\",\r\n    \"@jsplumb/connector-bezier\": \"^5.13.2\",\r\n    \"@jsplumb/core\": \"^5.13.2\",\r\n    \"@jsplumb/util\": \"^5.13.2\",\r\n    \"@lezer/common\": \"^1.0.4\",\r\n    \"@n8n/chat\": \"workspace:*\",\r\n    \"@n8n/codemirror-lang-sql\": \"^1.0.2\",\r\n    \"@n8n/permissions\": \"workspace:*\",\r\n    \"@vueuse/components\": \"^10.5.0\",\r\n    \"@vueuse/core\": \"^10.5.0\",\r\n    \"axios\": \"1.6.7\",\r\n    \"chart.js\": \"^4.4.0\",\r\n    \"codemirror-lang-html-n8n\": \"^1.0.0\",\r\n    \"codemirror-lang-n8n-expression\": \"^0.3.0\",\r\n    \"dateformat\": \"^3.0.3\",\r\n    \"email-providers\": \"^2.0.1\",\r\n    \"esprima-next\": \"5.8.4\",\r\n    \"fast-json-stable-stringify\": \"^2.1.0\",\r\n    \"file-saver\": \"^2.0.2\",\r\n    \"flatted\": \"^3.2.4\",\r\n    \"humanize-duration\": \"^3.27.2\",\r\n    \"jsonpath\": \"^1.1.1\",\r\n    \"lodash-es\": \"^4.17.21\",\r\n    \"luxon\": \"^3.3.0\",\r\n    \"n8n-design-system\": \"workspace:*\",\r\n    \"n8n-workflow\": \"workspace:*\",\r\n    \"pinia\": \"^2.1.6\",\r\n    \"prettier\": \"^3.1.0\",\r\n    \"qrcode.vue\": \"^3.3.4\",\r\n    \"stream-browserify\": \"^3.0.0\",\r\n    \"timeago.js\": \"^4.0.2\",\r\n    \"uuid\": \"^8.3.2\",\r\n    \"v3-infinite-loading\": \"^1.2.2\",\r\n    \"vue\": \"^3.4.21\",\r\n    \"vue-agile\": \"^2.0.0\",\r\n    \"vue-chartjs\": \"^5.2.0\",\r\n    \"vue-i18n\": \"^9.2.2\",\r\n    \"vue-json-pretty\": \"2.2.4\",\r\n    \"vue-markdown-render\": \"^2.0.1\",\r\n    \"vue-router\": \"^4.2.2\",\r\n    \"vue3-touch-events\": \"^4.1.3\",\r\n    \"xss\": \"^1.0.14\"\r\n  },\r\n  \"devDependencies\": {\r\n    \"@faker-js/faker\": \"^8.0.2\",\r\n    \"@pinia/testing\": \"^0.1.3\",\r\n    \"@sentry/vite-plugin\": \"^2.5.0\",\r\n    \"@types/dateformat\": \"^3.0.0\",\r\n    \"@types/file-saver\": \"^2.0.1\",\r\n    \"@types/humanize-duration\": \"^3.27.1\",\r\n    \"@types/jsonpath\": \"^0.2.0\",\r\n    \"@types/lodash-es\": \"^4.17.6\",\r\n    \"@types/luxon\": \"^3.2.0\",\r\n    \"@types/qrcode\": \"^1.5.0\",\r\n    \"@types/swagger-ui\": \"^3.52.0\",\r\n    \"@types/uuid\": \"^8.3.2\",\r\n    \"miragejs\": \"^0.1.48\",\r\n    \"unplugin-icons\": \"^0.17.0\"\r\n  },\r\n  \"peerDependencies\": {\r\n    \"@fortawesome/fontawesome-svg-core\": \"*\",\r\n    \"@fortawesome/free-regular-svg-icons\": \"*\",\r\n    \"@fortawesome/free-solid-svg-icons\": \"*\",\r\n    \"@fortawesome/vue-fontawesome\": \"*\"\r\n  }\r\n}\r\n", "const __vite_injected_original_dirname = \"C:\\\\Users\\\\HP\\\\Desktop\\\\fix\\\\latest\\\\n8n-fork\\\\packages\\\\design-system\";const __vite_injected_original_filename = \"C:\\\\Users\\\\HP\\\\Desktop\\\\fix\\\\latest\\\\n8n-fork\\\\packages\\\\design-system\\\\vite.config.mts\";const __vite_injected_original_import_meta_url = \"file:///C:/Users/HP/Desktop/fix/latest/n8n-fork/packages/design-system/vite.config.mts\";import vue from '@vitejs/plugin-vue';\r\nimport { resolve } from 'path';\r\nimport { defineConfig, mergeConfig } from 'vite';\r\nimport checker from 'vite-plugin-checker';\r\nimport { type UserConfig } from 'vitest';\r\nimport { defineConfig as defineVitestConfig } from 'vitest/config';\r\n\r\nexport const vitestConfig = defineVitestConfig({\r\n\ttest: {\r\n\t\tsilent: true,\r\n\t\tglobals: true,\r\n\t\tenvironment: 'jsdom',\r\n\t\tsetupFiles: ['./src/__tests__/setup.ts'],\r\n\t\t...(process.env.COVERAGE_ENABLED === 'true'\r\n\t\t\t? {\r\n\t\t\t\t\tcoverage: {\r\n\t\t\t\t\t\tenabled: true,\r\n\t\t\t\t\t\tprovider: 'v8',\r\n\t\t\t\t\t\treporter: process.env.CI === 'true' ? 'cobertura' : 'text-summary',\r\n\t\t\t\t\t\tall: true,\r\n\t\t\t\t\t},\r\n\t\t\t  }\r\n\t\t\t: {}),\r\n\t\tcss: {\r\n\t\t\tmodules: {\r\n\t\t\t\tclassNameStrategy: 'non-scoped',\r\n\t\t\t},\r\n\t\t},\r\n\t},\r\n}) as UserConfig;\r\n\r\nconst plugins = [vue()];\r\nif (process.env.ENABLE_TYPE_CHECKING === 'true') {\r\n\tplugins.push(checker({ vueTsc: true }));\r\n}\r\n\r\nexport default mergeConfig(\r\n\tdefineConfig({\r\n\t\tplugins,\r\n\t\tresolve: {\r\n\t\t\talias: {\r\n\t\t\t\t'@': resolve(__dirname, 'src'),\r\n\t\t\t\t'n8n-design-system': resolve(__dirname, 'src'),\r\n\t\t\t\tlodash: 'lodash-es',\r\n\t\t\t},\r\n\t\t},\r\n\t\tbuild: {\r\n\t\t\tlib: {\r\n\t\t\t\tentry: resolve(__dirname, 'src', 'main.ts'),\r\n\t\t\t\tname: 'N8nDesignSystem',\r\n\t\t\t\tfileName: (format) => `n8n-design-system.${format}.js`,\r\n\t\t\t},\r\n\t\t\trollupOptions: {\r\n\t\t\t\t// make sure to externalize deps that shouldn't be bundled\r\n\t\t\t\t// into your library\r\n\t\t\t\texternal: ['vue'],\r\n\t\t\t\toutput: {\r\n\t\t\t\t\texports: 'named',\r\n\t\t\t\t\t// Provide global variables to use in the UMD build\r\n\t\t\t\t\t// for externalized deps\r\n\t\t\t\t\tglobals: {\r\n\t\t\t\t\t\tvue: 'Vue',\r\n\t\t\t\t\t},\r\n\t\t\t\t},\r\n\t\t\t},\r\n\t\t},\r\n\t}),\r\n\tvitestConfig,\r\n);\r\n"],
  "mappings": ";AAAoX,OAAOA,UAAS;AACpY,SAAS,WAAAC,gBAAe;AACxB,SAAS,gBAAAC,eAAc,eAAAC,oBAAmB;AAC1C,SAAS,wBAAwB;AACjC,OAAOC,cAAa;;;ACJpB;AAAA,EACE,MAAQ;AAAA,EACR,SAAW;AAAA,EACX,aAAe;AAAA,EACf,SAAW;AAAA,EACX,UAAY;AAAA,EACZ,QAAU;AAAA,IACR,MAAQ;AAAA,IACR,OAAS;AAAA,EACX;AAAA,EACA,MAAQ;AAAA,EACR,YAAc;AAAA,IACZ,MAAQ;AAAA,IACR,KAAO;AAAA,EACT;AAAA,EACA,SAAW;AAAA,IACT,OAAS;AAAA,IACT,OAAS;AAAA,IACT,WAAa;AAAA,IACb,KAAO;AAAA,IACP,MAAQ;AAAA,IACR,SAAW;AAAA,IACX,QAAU;AAAA,IACV,OAAS;AAAA,IACT,MAAQ;AAAA,IACR,YAAY;AAAA,EACd;AAAA,EACA,cAAgB;AAAA,IACd,4BAA4B;AAAA,IAC5B,wBAAwB;AAAA,IACxB,+BAA+B;AAAA,IAC/B,yBAAyB;AAAA,IACzB,2BAA2B;AAAA,IAC3B,wBAAwB;AAAA,IACxB,oBAAoB;AAAA,IACpB,qBAAqB;AAAA,IACrB,oBAAoB;AAAA,IACpB,yBAAyB;AAAA,IACzB,uBAAuB;AAAA,IACvB,mBAAmB;AAAA,IACnB,6BAA6B;AAAA,IAC7B,iBAAiB;AAAA,IACjB,iBAAiB;AAAA,IACjB,iBAAiB;AAAA,IACjB,aAAa;AAAA,IACb,4BAA4B;AAAA,IAC5B,oBAAoB;AAAA,IACpB,sBAAsB;AAAA,IACtB,gBAAgB;AAAA,IAChB,OAAS;AAAA,IACT,YAAY;AAAA,IACZ,4BAA4B;AAAA,IAC5B,kCAAkC;AAAA,IAClC,YAAc;AAAA,IACd,mBAAmB;AAAA,IACnB,gBAAgB;AAAA,IAChB,8BAA8B;AAAA,IAC9B,cAAc;AAAA,IACd,SAAW;AAAA,IACX,qBAAqB;AAAA,IACrB,UAAY;AAAA,IACZ,aAAa;AAAA,IACb,OAAS;AAAA,IACT,qBAAqB;AAAA,IACrB,gBAAgB;AAAA,IAChB,OAAS;AAAA,IACT,UAAY;AAAA,IACZ,cAAc;AAAA,IACd,qBAAqB;AAAA,IACrB,cAAc;AAAA,IACd,MAAQ;AAAA,IACR,uBAAuB;AAAA,IACvB,KAAO;AAAA,IACP,aAAa;AAAA,IACb,eAAe;AAAA,IACf,YAAY;AAAA,IACZ,mBAAmB;AAAA,IACnB,uBAAuB;AAAA,IACvB,cAAc;AAAA,IACd,qBAAqB;AAAA,IACrB,KAAO;AAAA,EACT;AAAA,EACA,iBAAmB;AAAA,IACjB,mBAAmB;AAAA,IACnB,kBAAkB;AAAA,IAClB,uBAAuB;AAAA,IACvB,qBAAqB;AAAA,IACrB,qBAAqB;AAAA,IACrB,4BAA4B;AAAA,IAC5B,mBAAmB;AAAA,IACnB,oBAAoB;AAAA,IACpB,gBAAgB;AAAA,IAChB,iBAAiB;AAAA,IACjB,qBAAqB;AAAA,IACrB,eAAe;AAAA,IACf,UAAY;AAAA,IACZ,kBAAkB;AAAA,EACpB;AAAA,EACA,kBAAoB;AAAA,IAClB,qCAAqC;AAAA,IACrC,uCAAuC;AAAA,IACvC,qCAAqC;AAAA,IACrC,gCAAgC;AAAA,EAClC;AACF;;;ACxGgY,OAAO,SAAS;AAChZ,SAAS,eAAe;AACxB,SAAS,cAAc,mBAAmB;AAC1C,OAAO,aAAa;AAEpB,SAAS,gBAAgB,0BAA0B;AALnD,IAAM,mCAAmC;AAOlC,IAAM,eAAe,mBAAmB;AAAA,EAC9C,MAAM;AAAA,IACL,QAAQ;AAAA,IACR,SAAS;AAAA,IACT,aAAa;AAAA,IACb,YAAY,CAAC,0BAA0B;AAAA,IACvC,GAAI,QAAQ,IAAI,qBAAqB,SAClC;AAAA,MACA,UAAU;AAAA,QACT,SAAS;AAAA,QACT,UAAU;AAAA,QACV,UAAU,QAAQ,IAAI,OAAO,SAAS,cAAc;AAAA,QACpD,KAAK;AAAA,MACN;AAAA,IACA,IACA,CAAC;AAAA,IACJ,KAAK;AAAA,MACJ,SAAS;AAAA,QACR,mBAAmB;AAAA,MACpB;AAAA,IACD;AAAA,EACD;AACD,CAAC;AAED,IAAM,UAAU,CAAC,IAAI,CAAC;AACtB,IAAI,QAAQ,IAAI,yBAAyB,QAAQ;AAChD,UAAQ,KAAK,QAAQ,EAAE,QAAQ,KAAK,CAAC,CAAC;AACvC;AAEA,IAAO,sBAAQ;AAAA,EACd,aAAa;AAAA,IACZ;AAAA,IACA,SAAS;AAAA,MACR,OAAO;AAAA,QACN,KAAK,QAAQ,kCAAW,KAAK;AAAA,QAC7B,qBAAqB,QAAQ,kCAAW,KAAK;AAAA,QAC7C,QAAQ;AAAA,MACT;AAAA,IACD;AAAA,IACA,OAAO;AAAA,MACN,KAAK;AAAA,QACJ,OAAO,QAAQ,kCAAW,OAAO,SAAS;AAAA,QAC1C,MAAM;AAAA,QACN,UAAU,CAAC,WAAW,qBAAqB,MAAM;AAAA,MAClD;AAAA,MACA,eAAe;AAAA;AAAA;AAAA,QAGd,UAAU,CAAC,KAAK;AAAA,QAChB,QAAQ;AAAA,UACP,SAAS;AAAA;AAAA;AAAA,UAGT,SAAS;AAAA,YACR,KAAK;AAAA,UACN;AAAA,QACD;AAAA,MACD;AAAA,IACD;AAAA,EACD,CAAC;AAAA,EACD;AACD;;;AF5DA,OAAO,WAAW;AARlB,IAAMC,oCAAmC;AAUzC,IAAM,eAAe,CAAC,OAAO,YAAY;AACzC,IAAM,YAAY,CAAC,gBAAgB,qBAAqB,WAAW;AACnE,IAAM,eAAe;AAAA,EACpB;AAAA,EACA;AAAA;AAAA,EAEA;AAAA,EACA;AACD;AAEA,IAAM,0BAA0B,CAAC,QAAgB,gBAAgB,KAAK,GAAG;AAEzE,SAAS,eAAe;AACvB,QAAM,EAAE,aAAa,IAAI;AACzB,QAAM,SAAmC,CAAC;AAE1C,SAAO,KAAK,YAAY,EAAE,QAAQ,CAAC,QAAQ;AAC1C,QAAI,CAAC,GAAG,cAAc,GAAG,WAAW,GAAG,YAAY,EAAE,SAAS,GAAG,GAAG;AACnE;AAAA,IACD;AAEA,QAAI,wBAAwB,GAAG;AAAG;AAElC,WAAO,GAAG,IAAI,CAAC,GAAG;AAAA,EACnB,CAAC;AAED,SAAO;AACR;AAEA,IAAM,aAAa,QAAQ,IAAI,uBAAuB;AAEtD,IAAM,EAAE,SAAS,IAAI,QAAQ;AAE7B,IAAM,QAAQ;AAAA,EACb,EAAE,MAAM,KAAK,aAAaC,SAAQC,mCAAW,KAAK,EAAE;AAAA,EACpD,EAAE,MAAM,UAAU,aAAa,oBAAoB;AAAA,EACnD;AAAA,IACC,MAAM;AAAA,IACN,aAAaD,SAAQC,mCAAW,MAAM,iBAAiB,OAAO,SAAS;AAAA,EACxE;AAAA,EACA;AAAA,IACC,MAAM;AAAA,IACN,aAAaD,SAAQC,mCAAW,MAAM,iBAAiB,KAAK,IAAI;AAAA,EACjE;AAAA,EACA;AAAA,IACC,MAAM;AAAA,IACN,aAAaD,SAAQC,mCAAW,MAAM,QAAQ,QAAQ,OAAO,UAAU;AAAA,EACxE;AAAA,EACA;AAAA,IACC,MAAM;AAAA,IACN,aAAaD,SAAQC,mCAAW,MAAM,QAAQ,QAAQ,KAAK,IAAI;AAAA,EAChE;AAAA,EACA,GAAG,CAAC,WAAW,aAAa,aAAa,WAAW,EAAE,IAAI,CAAC,UAAU;AAAA,IACpE,MAAM,IAAI,OAAO,WAAW,IAAI,KAAK,GAAG;AAAA,IACxC,aAAa,aAAa,IAAI;AAAA,EAC/B,EAAE;AAAA,EACF;AAAA,IACC,MAAM;AAAA,IACN,aAAa;AAAA,EACd;AACD;AAEA,IAAMC,WAAU;AAAA,EACf,MAAM;AAAA,IACL,UAAU;AAAA,EACX,CAAC;AAAA,EACDC,KAAI;AACL;AACA,IAAI,QAAQ,IAAI,yBAAyB,QAAQ;AAChD,EAAAD,SAAQ,KAAKE,SAAQ,EAAE,QAAQ,KAAK,CAAC,CAAC;AACvC;AAEA,IAAM,EAAE,mBAAmB,WAAW,SAAS,QAAQ,IAAI,QAAQ;AACnE,IAAI,WAAW,WAAW;AACzB,EAAAF,SAAQ;AAAA,IACP,iBAAiB;AAAA,MAChB,KAAK;AAAA,MACL,SAAS;AAAA;AAAA,MAET,SAAS;AAAA;AAAA;AAAA,MAGT;AAAA,MACA,WAAW;AAAA,MACX;AAAA,IACD,CAAC;AAAA,EACF;AACD;AAEA,IAAOG,uBAAQC;AAAA,EACdC,cAAa;AAAA,IACZ,QAAQ;AAAA;AAAA;AAAA,MAGP,GAAI,aAAa,gBAAgB,EAAE,eAAe,CAAC,EAAE,IAAI,CAAC;AAAA,MAC1D,WAAW,IAAI,UAAU;AAAA,IAC1B;AAAA,IACA,SAAAL;AAAA,IACA,SAAS,EAAE,MAAM;AAAA,IACjB,MAAM;AAAA,IACN,WAAW;AAAA,IACX,KAAK;AAAA,MACJ,qBAAqB;AAAA,QACpB,MAAM;AAAA,UACL,gBAAgB;AAAA,QACjB;AAAA,MACD;AAAA,IACD;AAAA,IACA,OAAO;AAAA,MACN,mBAAmB;AAAA,MACnB,QAAQ,CAAC,CAAC;AAAA,MACV,WAAW,CAAC,CAAC;AAAA,MACb,eAAe;AAAA,QACd,WAAW,CAAC,CAAC;AAAA,QACb,QAAQ;AAAA,UACP,cAAc;AAAA,YACb,QAAQ;AAAA,YACR,KAAK;AAAA,YACL,GAAG,aAAa;AAAA,UACjB;AAAA,QACD;AAAA,MACD;AAAA,IACD;AAAA,EACD,CAAC;AAAA,EACD;AACD;",
  "names": ["vue", "resolve", "defineConfig", "mergeConfig", "checker", "__vite_injected_original_dirname", "resolve", "__vite_injected_original_dirname", "plugins", "vue", "checker", "vite_config_default", "mergeConfig", "defineConfig"]
}

diff --git a/packages/editor-ui/vite.config.ts b/packages/editor-ui/vite.config.ts
deleted file mode 100644
index f942d9ffdb733..0000000000000
--- a/packages/editor-ui/vite.config.ts
+++ /dev/null
@@ -1,168 +0,0 @@
-import vue from '@vitejs/plugin-vue2';
-import legacy from '@vitejs/plugin-legacy';
-import monacoEditorPlugin from 'vite-plugin-monaco-editor';
-import path, { resolve } from 'path';
-import { defineConfig, mergeConfig } from 'vite';
-import { defineConfig as defineVitestConfig } from 'vitest/config';
-import { sentryVitePlugin } from '@sentry/vite-plugin';
-import yaml from '@modyfi/vite-plugin-yaml';
-
-import packageJSON from './package.json';
-
-const { coverageReporters } = require('../../jest.config.js');
-
-const vendorChunks = ['vue', 'vue-router'];
-const n8nChunks = ['n8n-workflow', 'n8n-design-system'];
-const ignoreChunks = [
-	'vue2-boring-avatars',
-	'vue-template-compiler',
-	'jquery',
-	'@fontsource/open-sans',
-	'normalize-wheel',
-	'stream-browserify',
-];
-
-const isScopedPackageToIgnore = (str: string) => /@codemirror\//.test(str);
-
-function renderChunks() {
-	const { dependencies } = packageJSON;
-	const chunks: Record<string, string[]> = {};
-
-	Object.keys(dependencies).forEach((key) => {
-		if ([...vendorChunks, ...n8nChunks, ...ignoreChunks].includes(key)) {
-			return;
-		}
-
-		if (isScopedPackageToIgnore(key)) return;
-
-		chunks[key] = [key];
-	});
-
-	return chunks;
-}
-
-const publicPath = process.env.VUE_APP_PUBLIC_PATH || '/';
-
-const { NODE_ENV } = process.env;
-
-const alias = [
-	{ find: '@', replacement: resolve(__dirname, 'src') },
-	{ find: 'stream', replacement: 'stream-browserify' },
-	{
-		find: /^n8n-design-system\//,
-		replacement: resolve(__dirname, '..', 'design-system', 'src') + '/',
-	},
-	...['orderBy', 'camelCase', 'cloneDeep', 'isEqual', 'startCase'].map((name) => ({
-		find: new RegExp(`^lodash.${name}$`, 'i'),
-		replacement: require.resolve(`lodash-es/${name}`),
-	})),
-	{
-		find: /^lodash\.(.+)$/,
-		replacement: 'lodash-es/$1',
-	},
-	{
-		find: 'vue2-boring-avatars',
-		replacement: require.resolve('vue2-boring-avatars'),
-	},
-	{
-		find: /element-ui\/(packages|lib)\/button$/,
-		replacement: path.resolve(
-			__dirname,
-			'..',
-			'design-system/src/components/N8nButton/overrides/ElButton.ts',
-		),
-	},
-];
-
-// https://github.com/vitest-dev/vitest/discussions/1806
-if (NODE_ENV === 'test') {
-	alias.push({
-		find: /^monaco-editor$/,
-		replacement: __dirname + '/node_modules/monaco-editor/esm/vs/editor/editor.api',
-	});
-}
-
-const plugins = [
-	vue(),
-	legacy({
-		targets: ['>1%', 'last 3 versions', 'not dead'],
-	}),
-	monacoEditorPlugin({
-		publicPath: 'assets/monaco-editor',
-		customDistPath: (root: string, buildOutDir: string, base: string) =>
-			`${root}/${buildOutDir}/assets/monaco-editor`,
-	}),
-	yaml(),
-];
-
-const { SENTRY_AUTH_TOKEN: authToken, RELEASE: release } = process.env;
-if (release && authToken) {
-	plugins.push(
-		sentryVitePlugin({
-			org: 'n8nio',
-			project: 'instance-frontend',
-			// Specify the directory containing build artifacts
-			include: './dist',
-			// Auth tokens can be obtained from https://sentry.io/settings/account/api/auth-tokens/
-			// and needs the `project:releases` and `org:read` scopes
-			authToken,
-			telemetry: false,
-			release,
-		}),
-	);
-}
-
-export default mergeConfig(
-	defineConfig({
-		define: {
-			// This causes test to fail but is required for actually running it
-			...(NODE_ENV !== 'test' ? { global: 'globalThis' } : {}),
-			...(NODE_ENV === 'development' ? { process: { env: {} } } : {}),
-			BASE_PATH: `'${publicPath}'`,
-		},
-		plugins,
-		resolve: { alias },
-		base: publicPath,
-		envPrefix: 'VUE_APP',
-		css: {
-			preprocessorOptions: {
-				scss: {
-					additionalData: '\n@use "@/n8n-theme-variables.scss" as *;\n',
-				},
-			},
-		},
-		build: {
-			assetsInlineLimit: 0,
-			minify: !!release,
-			sourcemap: !!release,
-			rollupOptions: {
-				treeshake: !!release,
-				output: {
-					manualChunks: {
-						vendor: vendorChunks,
-						n8n: n8nChunks,
-						...renderChunks(),
-					},
-				},
-			},
-		},
-	}),
-	defineVitestConfig({
-		test: {
-			globals: true,
-			environment: 'jsdom',
-			setupFiles: ['./src/__tests__/setup.ts'],
-			coverage: {
-				provider: 'c8',
-				reporter: coverageReporters,
-				include: ['src/**/*.ts'],
-				all: true,
-			},
-			css: {
-				modules: {
-					classNameStrategy: 'non-scoped',
-				},
-			},
-		},
-	}),
-);
diff --git a/packages/node-dev/.eslintrc.js b/packages/node-dev/.eslintrc.js
index 228cb3e921520..cb1447036624f 100644
--- a/packages/node-dev/.eslintrc.js
+++ b/packages/node-dev/.eslintrc.js
@@ -1,4 +1,4 @@
-const { sharedOptions } = require('@n8n_io/eslint-config/shared');
+const sharedOptions = require('@n8n_io/eslint-config/shared');
 
 /**
  * @type {import('@types/eslint').ESLint.ConfigData}
@@ -12,5 +12,6 @@ module.exports = {
 	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/LICENSE.md b/packages/node-dev/LICENSE.md
index c1d74239754fd..aab68b6d9301b 100644
--- a/packages/node-dev/LICENSE.md
+++ b/packages/node-dev/LICENSE.md
@@ -3,8 +3,9 @@
 Portions of this software are licensed as follows:
 
 - Content of branches other than the main branch (i.e. "master") are not licensed.
-- All source code files that contain ".ee." in their filename are licensed under the
-  "n8n Enterprise License" defined in "LICENSE_EE.md".
+- Source code files that contain ".ee." in their filename are NOT licensed under the Sustainable Use License.
+  To use source code files that contain ".ee." in their filename you must hold a valid n8n Enterprise License
+  specifically allowing you access to such source code files and as defined in "LICENSE_EE.md".
 - All third party components incorporated into the n8n Software are licensed under the original license
   provided by the owner of the applicable component.
 - Content outside of the above mentioned files or restrictions is available under the "Sustainable Use
diff --git a/packages/node-dev/README.md b/packages/node-dev/README.md
index b27af6537dcf5..d650716a0a284 100644
--- a/packages/node-dev/README.md
+++ b/packages/node-dev/README.md
@@ -48,21 +48,21 @@ all the basics.
 
 A n8n node is a JavaScript file (normally written in TypeScript) which describes
 some basic information (like name, description, ...) and also at least one method.
-Depending on which method got implemented defines if it is a a regular-, trigger-
+Depending on which method gets implemented defines if it is a regular-, trigger-
 or webhook-node.
 
 A simple regular node which:
 
 - defines one node property
-- sets its value do all items it receives
+- sets its value to all items it receives
 
 would look like this:
 
 File named: `MyNode.node.ts`
 
 ```TypeScript
-import { IExecuteFunctions } from 'n8n-core';
 import {
+	IExecuteFunctions,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
@@ -114,41 +114,38 @@ export class MyNode implements INodeType {
 			item.json['myString'] = myString;
 		}
 
-		return this.prepareOutputData(items);
+		return [items];
 
 	}
 }
 ```
 
 The "description" property has to be set on all nodes because it contains all
-the base information. Additionally do all nodes have to have exactly one of the
+the base information. Additionally all nodes have to have exactly one of the
 following methods defined which contains the actual logic:
 
 **Regular node**
 
-Method get called when the workflow gets executed
+Method is called when the workflow gets executed
 
 - `execute`: Executed once no matter how many items
-- `executeSingle`: Executed once for every item
 
-By default always `execute` should be used especially when creating a
-third-party integration. The reason for that is that it is way more flexible
-and allows to, for example, return a different amount of items than it received
-as input. This is very important when a node should query data like _return
-all users_. In that case, does the node normally just receive one input-item
-but returns as many as users exist. So in doubt always `execute` should be
-used!
+By default, `execute` should always be used, especially when creating a
+third-party integration. The reason for this is that it provides much more
+flexibility and allows, for example, returning a different number of items than
+it received as input. This becomes crucial when a node needs to query data such as _return
+all users_. In such cases, the node typically receives only one input item but returns as
+many items as there are users. Therefore, when in doubt, it is recommended to use `execute`!
 
 **Trigger node**
 
-Method gets called once when the workflow gets activated. It can then trigger
-workflow runs which data it provides by itself.
+Method is called once when the workflow gets activated. It can then trigger workflow runs and provide the necessary data by itself.
 
 - `trigger`
 
 **Webhook node**
 
-Method gets called when webhook gets called.
+Method is called when webhook gets called.
 
 - `webhook`
 
@@ -157,12 +154,11 @@ Method gets called when webhook gets called.
 Property overview
 
 - **description** [required]: Describes the node like its name, properties, hooks, ... see `Node Type Description` bellow.
-- **execute** [optional]: Method get called when the workflow gets executed (once).
-- **executeSingle** [optional]: Method get called when the workflow gets executed (once for every item).
+- **execute** [optional]: Method is called when the workflow gets executed (once).
 - **hooks** [optional]: The hook methods.
 - **methods** [optional]: Additional methods. Currently only "loadOptions" exists which allows loading options for parameters from external services
-- **trigger** [optional]: Method gets called once when the workflow gets activated.
-- **webhook** [optional]: Method gets called when webhook gets called.
+- **trigger** [optional]: Method is called once when the workflow gets activated.
+- **webhook** [optional]: Method is called when webhook gets called.
 - **webhookMethods** [optional]: Methods to setup webhooks on external services.
 
 ### Node Type Description
@@ -175,15 +171,15 @@ The following properties can be set in the node description:
 - **description** [required]: Description to display users in Editor UI
 - **group** [required]: Node group for example "transform" or "trigger"
 - **hooks** [optional]: Methods to execute at different points in time like when the workflow gets activated or deactivated
-- **icon** [optional]: Icon to display (can be an icon or a font awsome icon)
+- **icon** [optional]: Icon to display (can be an icon or a font awesome icon)
 - **inputs** [required]: Types of inputs the node has (currently only "main" exists) and the amount
 - **outputs** [required]: Types of outputs the node has (currently only "main" exists) and the amount
-- **outputNames** [optional]: In case a node has multiple outputs names can be set that users know what data to expect
-- **maxNodes** [optional]: If not an unlimited amount of nodes of that type can exist in a workflow the max-amount can be specified
+- **outputNames** [optional]: In case a node has multiple outputs, names can be set that users know what data to expect
+- **maxNodes** [optional]: If an unlimited number of nodes of that type cannot exist in a workflow, the max-amount can be specified
 - **name** [required]: Name of the node (for n8n to use internally, in camelCase)
 - **properties** [required]: Properties which get displayed in the Editor UI and can be set by the user
 - **subtitle** [optional]: Text which should be displayed underneath the name of the node in the Editor UI (can be an expression)
-- **version** [required]: Version of the node. Currently always "1" (integer). For future usage, does not get used yet.
+- **version** [required]: Version of the node. Currently always "1" (integer). For future usage, does not get used yet
 - **webhooks** [optional]: Webhooks the node should listen to
 
 ### Node Properties
@@ -203,23 +199,23 @@ The following properties can be set in the node properties:
 
 ### Node Property Options
 
-The following properties can be set in the node property options.
+The following properties can be set in the node property options:
 
 All properties are optional. However, most only work when the node-property is of a specfic type.
 
-- **alwaysOpenEditWindow** [type: json]: If set then the "Editor Window" will always open when the user tries to edit the field. Helpful if long text is typically used in the property.
+- **alwaysOpenEditWindow** [type: json]: If set then the "Editor Window" will always open when the user tries to edit the field. Helpful if long text is typically used in the property
 - **loadOptionsMethod** [type: options]: Method to use to load options from an external service
 - **maxValue** [type: number]: Maximum value of the number
 - **minValue** [type: number]: Minimum value of the number
 - **multipleValues** [type: all]: If set the property gets turned into an Array and the user can add multiple values
-- **multipleValueButtonText** [type: all]: Custom text for add button in case "multipleValues" got set
-- **numberPrecision** [type: number]: The precision of the number. By default it is "0" and will so only allow integers.
-- **password** [type: string]: If a password field should be displayed (normally only used by credentials because all node data is not encrypted and get saved in clear-text)
+- **multipleValueButtonText** [type: all]: Custom text for add button in case "multipleValues" were set
+- **numberPrecision** [type: number]: The precision of the number. By default, it is "0" and will only allow integers
+- **password** [type: string]: If a password field should be displayed (normally only used by credentials because all node data is not encrypted and gets saved in clear-text)
 - **rows** [type: string]: Number of rows the input field should have. By default it is "1"
 
 ## License
 
-n8n is [fair-code](http://faircode.io) distributed under the [**Sustainable Use License**](https://github.com/n8n-io/n8n/blob/master/packages/cli/LICENSE.md).
+n8n is [fair-code](https://faircode.io) distributed under the [**Sustainable Use License**](https://github.com/n8n-io/n8n/blob/master/packages/cli/LICENSE.md).
 
 Proprietary licenses are available for enterprise customers. [Get in touch](mailto:license@n8n.io)
 
diff --git a/packages/node-dev/bin/n8n-node-dev b/packages/node-dev/bin/n8n-node-dev
index 4c25030d482d3..9635b5c0355cf 100755
--- a/packages/node-dev/bin/n8n-node-dev
+++ b/packages/node-dev/bin/n8n-node-dev
@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 
-require('@oclif/command').run()
-.then(require('@oclif/command/flush'))
-.catch(require('@oclif/errors/handle'));
+(async () => {
+	const oclif = await import('@oclif/core');
+	await oclif.execute({});
+})();
diff --git a/packages/node-dev/commands/build.ts b/packages/node-dev/commands/build.ts
index 8c9f10020dcc1..5a78bf27ca11e 100644
--- a/packages/node-dev/commands/build.ts
+++ b/packages/node-dev/commands/build.ts
@@ -1,5 +1,6 @@
-import { UserSettings } from 'n8n-core';
-import { Command, flags } from '@oclif/command';
+import { Container } from 'typedi';
+import { Command, Flags } from '@oclif/core';
+import { InstanceSettings } from 'n8n-core';
 
 import type { IBuildOptions } from '../src';
 import { buildFiles } from '../src';
@@ -14,21 +15,21 @@ export class Build extends Command {
 	];
 
 	static flags = {
-		help: flags.help({ char: 'h' }),
-		destination: flags.string({
+		help: Flags.help({ char: 'h' }),
+		destination: Flags.string({
 			char: 'd',
-			description: `The path to copy the compiles files to [default: ${UserSettings.getUserN8nFolderCustomExtensionPath()}]`,
+			description: `The path to copy the compiled files to [default: ${
+				Container.get(InstanceSettings).customExtensionDir
+			}]`,
 		}),
-		watch: flags.boolean({
+		watch: Flags.boolean({
 			description:
 				'Starts in watch mode and automatically builds and copies file whenever they change',
 		}),
 	};
 
-	// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 	async run() {
-		// eslint-disable-next-line @typescript-eslint/no-shadow
-		const { flags } = this.parse(Build);
+		const { flags } = await this.parse(Build);
 
 		this.log('\nBuild credentials and nodes');
 		this.log('=========================');
@@ -47,10 +48,10 @@ export class Build extends Command {
 
 			this.log(`The nodes got built and saved into the following folder:\n${outputDirectory}`);
 		} catch (error) {
-			// eslint-disable-next-line @typescript-eslint/restrict-template-expressions, @typescript-eslint/no-unsafe-member-access
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 			this.log(`\nGOT ERROR: "${error.message}"`);
 			this.log('====================================');
-			// eslint-disable-next-line @typescript-eslint/restrict-template-expressions, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-argument
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-argument
 			this.log(error.stack);
 		}
 	}
diff --git a/packages/node-dev/commands/new.ts b/packages/node-dev/commands/new.ts
index e83cf86e522a5..0912578936c99 100644
--- a/packages/node-dev/commands/new.ts
+++ b/packages/node-dev/commands/new.ts
@@ -2,25 +2,19 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
+import { Command } from '@oclif/core';
 import * as changeCase from 'change-case';
-import * as fs from 'fs';
+import { access } from 'fs/promises';
 import * as inquirer from 'inquirer';
-import { Command } from '@oclif/command';
 import { join } from 'path';
 
 import { createTemplate } from '../src';
 
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const { promisify } = require('util');
-
-const fsAccess = promisify(fs.access);
-
 export class New extends Command {
 	static description = 'Create new credentials/node';
 
 	static examples = ['$ n8n-node-dev new'];
 
-	// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 	async run() {
 		try {
 			this.log('\nCreate new credentials/node');
@@ -105,7 +99,7 @@ export class New extends Command {
 			// node file
 			const destinationFilePath = join(
 				process.cwd(),
-				// eslint-disable-next-line @typescript-eslint/restrict-template-expressions, @typescript-eslint/no-unsafe-member-access
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 				`${changeCase.pascalCase(nodeName)}.${typeAnswers.type.toLowerCase()}.ts`,
 			);
 
@@ -114,7 +108,7 @@ export class New extends Command {
 			// Check if node with the same name already exists in target folder
 			// to not overwrite it by accident
 			try {
-				await fsAccess(destinationFilePath);
+				await access(destinationFilePath);
 
 				// File does already exist. So ask if it should be overwritten.
 				const overwriteQuestion: inquirer.QuestionCollection = [
@@ -152,10 +146,10 @@ export class New extends Command {
 
 			this.log(`Node got created: ${destinationFilePath}`);
 		} catch (error) {
-			// eslint-disable-next-line @typescript-eslint/restrict-template-expressions, @typescript-eslint/no-unsafe-member-access
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 			this.log(`\nGOT ERROR: "${error.message}"`);
 			this.log('====================================');
-			// eslint-disable-next-line @typescript-eslint/restrict-template-expressions, @typescript-eslint/no-unsafe-member-access
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 			this.log(error.stack);
 		}
 	}
diff --git a/packages/node-dev/package.json b/packages/node-dev/package.json
index 2e392f9068aec..9dd0e48ea8642 100644
--- a/packages/node-dev/package.json
+++ b/packages/node-dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-node-dev",
-  "version": "0.103.0",
+  "version": "1.41.0",
   "description": "CLI to simplify n8n credentials/node development",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",
@@ -24,10 +24,9 @@
     "build": "tsc --noEmit",
     "build-node-dev": "tsc",
     "format": "prettier --write . --ignore-path ../../.prettierignore",
-    "lint": "eslint --quiet .",
+    "lint": "eslint . --quiet",
     "lintfix": "eslint . --fix",
-    "postpack": "rm -f oclif.manifest.json",
-    "prepack": "echo \"Building project...\" && rm -rf dist && tsc -b && oclif-dev manifest",
+    "prepack": "echo \"Building project...\" && rm -rf dist && tsc -b",
     "watch": "tsc --watch"
   },
   "bin": {
@@ -43,27 +42,20 @@
     "bin",
     "dist",
     "templates",
-    "oclif.manifest.json",
     "src/tsconfig-build.json"
   ],
   "devDependencies": {
-    "@oclif/dev-cli": "^1.22.2",
-    "@types/express": "^4.17.6",
-    "@types/inquirer": "^6.5.0",
-    "@types/tmp": "^0.2.0",
-    "@types/vorpal": "^1.11.0"
+    "@types/inquirer": "^6.5.0"
   },
   "dependencies": {
-    "@oclif/command": "^1.5.18",
-    "@oclif/errors": "^1.2.2",
+    "@oclif/core": "3.18.1",
     "change-case": "^4.1.1",
     "fast-glob": "^3.2.5",
     "inquirer": "^7.0.1",
     "n8n-core": "workspace:*",
     "n8n-workflow": "workspace:*",
-    "oauth-1.0a": "^2.2.6",
     "replace-in-file": "^6.0.0",
-    "request": "^2.88.2",
-    "tmp-promise": "^3.0.2"
+    "tmp-promise": "^3.0.3",
+    "typedi": "^0.10.0"
   }
 }
diff --git a/packages/node-dev/src/Build.ts b/packages/node-dev/src/Build.ts
index 096d4b6c06b4b..f600ca5297155 100644
--- a/packages/node-dev/src/Build.ts
+++ b/packages/node-dev/src/Build.ts
@@ -4,10 +4,11 @@ import glob from 'fast-glob';
 import { spawn } from 'child_process';
 import { copyFile, mkdir, readFile, writeFile } from 'fs/promises';
 import { join, dirname, resolve as resolvePath } from 'path';
+import { Container } from 'typedi';
 import { file as tmpFile } from 'tmp-promise';
 
 import { jsonParse } from 'n8n-workflow';
-import { UserSettings } from 'n8n-core';
+import { InstanceSettings } from 'n8n-core';
 import type { IBuildOptions } from './Interfaces';
 
 /**
@@ -15,19 +16,19 @@ import type { IBuildOptions } from './Interfaces';
  * directory:
  * https://github.com/Microsoft/TypeScript/issues/25430
  */
-// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
+
 export async function createCustomTsconfig() {
 	// Get path to simple tsconfig file which should be used for build
 	const tsconfigPath = join(dirname(require.resolve('n8n-node-dev/src')), 'tsconfig-build.json');
 
 	// Read the tsconfig file
 	const tsConfigString = await readFile(tsconfigPath, { encoding: 'utf8' });
-	// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+
 	const tsConfig = jsonParse<{ include: string[] }>(tsConfigString);
 
 	// Set absolute include paths
 	const newIncludeFiles = [];
-	// eslint-disable-next-line no-restricted-syntax
+
 	for (const includeFile of tsConfig.include) {
 		newIncludeFiles.push(join(process.cwd(), includeFile));
 	}
@@ -49,7 +50,7 @@ export async function createCustomTsconfig() {
  * @param {IBuildOptions} [options] Options to overwrite default behavior
  */
 export async function buildFiles({
-	destinationFolder = UserSettings.getUserN8nFolderCustomExtensionPath(),
+	destinationFolder = Container.get(InstanceSettings).customExtensionDir,
 	watch,
 }: IBuildOptions): Promise<string> {
 	const tscPath = join(dirname(require.resolve('typescript')), 'tsc');
@@ -101,7 +102,6 @@ export async function buildFiles({
 		let errorMessage = error.message;
 
 		if (error.stdout !== undefined) {
-			// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
 			errorMessage = `${errorMessage}\nGot following output:\n${error.stdout}`;
 		}
 
diff --git a/packages/node-dev/src/Create.ts b/packages/node-dev/src/Create.ts
index b24fd7a5bda18..fffa2f66fc5ed 100644
--- a/packages/node-dev/src/Create.ts
+++ b/packages/node-dev/src/Create.ts
@@ -1,13 +1,7 @@
-import * as fs from 'fs';
+import { copyFile } from 'fs/promises';
 import type { ReplaceInFileConfig } from 'replace-in-file';
 import { replaceInFile } from 'replace-in-file';
 
-// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-var-requires
-const { promisify } = require('util');
-
-// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call
-const fsCopyFile = promisify(fs.copyFile);
-
 /**
  * Creates a new credentials or node
  *
@@ -22,7 +16,7 @@ export async function createTemplate(
 ): Promise<void> {
 	// Copy the file to then replace the values in it
 	// eslint-disable-next-line @typescript-eslint/no-unsafe-call
-	await fsCopyFile(sourceFilePath, destinationFilePath);
+	await copyFile(sourceFilePath, destinationFilePath);
 
 	// Replace the variables in the template file
 	const options: ReplaceInFileConfig = {
diff --git a/packages/node-dev/templates/execute/simple.ts b/packages/node-dev/templates/execute/simple.ts
index e48bb62a89d1f..82975677ed0a2 100644
--- a/packages/node-dev/templates/execute/simple.ts
+++ b/packages/node-dev/templates/execute/simple.ts
@@ -48,6 +48,6 @@ export class ClassNameReplace implements INodeType {
 			item.json.myString = myString;
 		}
 
-		return this.prepareOutputData(items);
+		return [items];
 	}
 }
diff --git a/packages/node-dev/tsconfig.json b/packages/node-dev/tsconfig.json
index 3d6b4f8517f8b..b3826a84e4384 100644
--- a/packages/node-dev/tsconfig.json
+++ b/packages/node-dev/tsconfig.json
@@ -1,11 +1,10 @@
 {
-	"extends": "../../tsconfig.json",
+	"extends": ["../../tsconfig.json", "../../tsconfig.backend.json"],
 	"compilerOptions": {
 		"outDir": "dist",
-		"types": ["node"],
 		"preserveSymlinks": true,
+		"tsBuildInfoFile": "dist/build.tsbuildinfo",
 		// TODO: remove all options below this line
-		"noUnusedLocals": false,
 		"useUnknownInCatchVariables": false
 	},
 	"include": ["commands/**/*.ts", "src/**/*.ts"]
diff --git a/packages/nodes-base/.eslintrc.js b/packages/nodes-base/.eslintrc.js
index a3cf1ef0fc6f5..4cd5e580a9541 100644
--- a/packages/nodes-base/.eslintrc.js
+++ b/packages/nodes-base/.eslintrc.js
@@ -1,4 +1,4 @@
-const { sharedOptions } = require('@n8n_io/eslint-config/shared');
+const sharedOptions = require('@n8n_io/eslint-config/shared');
 
 /**
  * @type {import('@types/eslint').ESLint.ConfigData}
@@ -12,25 +12,30 @@ module.exports = {
 
 	rules: {
 		// TODO: remove all the following rules
-		eqeqeq: 'off',
-		'id-denylist': 'off',
-		'import/extensions': 'off',
-		'import/order': 'off',
-		'prefer-spread': 'off',
-		'import/no-extraneous-dependencies': 'off',
+		eqeqeq: 'warn',
+		'id-denylist': 'warn',
+		'import/extensions': 'warn',
+		'import/order': 'warn',
+		'prefer-spread': 'warn',
+		'import/no-extraneous-dependencies': 'warn',
 
 		'@typescript-eslint/naming-convention': ['error', { selector: 'memberLike', format: null }],
-		'@typescript-eslint/no-explicit-any': 'off', //812 warnings, better to fix in separate PR
-		'@typescript-eslint/no-non-null-assertion': 'off', //665 errors, better to fix in separate PR
-		'@typescript-eslint/no-unsafe-assignment': 'off', //7084 problems, better to fix in separate PR
-		'@typescript-eslint/no-unsafe-call': 'off', //541 errors, better to fix in separate PR
-		'@typescript-eslint/no-unsafe-member-access': 'off', //4591 errors, better to fix in separate PR
-		'@typescript-eslint/no-unsafe-return': 'off', //438 errors, better to fix in separate PR
+		'@typescript-eslint/no-explicit-any': 'warn', //812 warnings, better to fix in separate PR
+		'@typescript-eslint/no-non-null-assertion': 'warn', //665 errors, better to fix in separate PR
+		'@typescript-eslint/no-unsafe-assignment': 'warn', //7084 problems, better to fix in separate PR
+		'@typescript-eslint/no-unsafe-call': 'warn', //541 errors, better to fix in separate PR
+		'@typescript-eslint/no-unsafe-member-access': 'warn', //4591 errors, better to fix in separate PR
+		'@typescript-eslint/no-unsafe-return': 'warn', //438 errors, better to fix in separate PR
 		'@typescript-eslint/no-unused-expressions': ['error', { allowTernary: true }],
-		'@typescript-eslint/restrict-template-expressions': 'off', //1152 errors, better to fix in separate PR
-		'@typescript-eslint/unbound-method': 'off',
+		'@typescript-eslint/restrict-template-expressions': 'warn', //1152 errors, better to fix in separate PR
+		'@typescript-eslint/unbound-method': 'warn',
 		'@typescript-eslint/ban-ts-comment': ['warn', { 'ts-ignore': true }],
-		'@typescript-eslint/prefer-nullish-coalescing': 'off',
+		'@typescript-eslint/prefer-nullish-coalescing': 'warn',
+		'@typescript-eslint/no-base-to-string': 'warn',
+		'@typescript-eslint/no-redundant-type-constituents': 'warn',
+		'@typescript-eslint/no-unsafe-argument': 'warn',
+		'@typescript-eslint/prefer-optional-chain': 'warn',
+		'@typescript-eslint/restrict-plus-operands': 'warn',
 	},
 
 	overrides: [
@@ -41,10 +46,12 @@ module.exports = {
 				'n8n-nodes-base/cred-class-field-authenticate-type-assertion': 'error',
 				'n8n-nodes-base/cred-class-field-display-name-missing-oauth2': 'error',
 				'n8n-nodes-base/cred-class-field-display-name-miscased': 'error',
+				'n8n-nodes-base/cred-class-field-documentation-url-missing': 'error',
 				'n8n-nodes-base/cred-class-field-name-missing-oauth2': 'error',
 				'n8n-nodes-base/cred-class-field-name-unsuffixed': 'error',
 				'n8n-nodes-base/cred-class-field-name-uppercase-first-char': 'error',
-				'n8n-nodes-base/cred-class-field-unobscured-sensitive-input': 'error',
+				'n8n-nodes-base/cred-class-field-properties-assertion': 'error',
+				'n8n-nodes-base/cred-class-field-type-options-password-missing': 'error',
 				'n8n-nodes-base/cred-class-name-missing-oauth2-suffix': 'error',
 				'n8n-nodes-base/cred-class-name-unsuffixed': 'error',
 				'n8n-nodes-base/cred-filename-against-convention': 'error',
@@ -140,7 +147,13 @@ module.exports = {
 				'n8n-nodes-base/node-param-resource-with-plural-option': 'error',
 				'n8n-nodes-base/node-param-resource-without-no-data-expression': 'error',
 				'n8n-nodes-base/node-param-type-options-missing-from-limit': 'error',
-				'n8n-nodes-base/node-param-type-options-missing-from-password': 'error',
+				'n8n-nodes-base/node-param-type-options-password-missing': 'error',
+			},
+		},
+		{
+			files: ['**/*.test.ts', '**/test/**/*.ts'],
+			rules: {
+				'import/no-extraneous-dependencies': 'off',
 			},
 		},
 	],
diff --git a/packages/nodes-base/LICENSE.md b/packages/nodes-base/LICENSE.md
index c1d74239754fd..aab68b6d9301b 100644
--- a/packages/nodes-base/LICENSE.md
+++ b/packages/nodes-base/LICENSE.md
@@ -3,8 +3,9 @@
 Portions of this software are licensed as follows:
 
 - Content of branches other than the main branch (i.e. "master") are not licensed.
-- All source code files that contain ".ee." in their filename are licensed under the
-  "n8n Enterprise License" defined in "LICENSE_EE.md".
+- Source code files that contain ".ee." in their filename are NOT licensed under the Sustainable Use License.
+  To use source code files that contain ".ee." in their filename you must hold a valid n8n Enterprise License
+  specifically allowing you access to such source code files and as defined in "LICENSE_EE.md".
 - All third party components incorporated into the n8n Software are licensed under the original license
   provided by the owner of the applicable component.
 - Content outside of the above mentioned files or restrictions is available under the "Sustainable Use
diff --git a/packages/nodes-base/README.md b/packages/nodes-base/README.md
index 34d84751b01f8..3dc74130378f4 100644
--- a/packages/nodes-base/README.md
+++ b/packages/nodes-base/README.md
@@ -10,7 +10,7 @@ npm install n8n-nodes-base -g
 
 ## License
 
-n8n is [fair-code](http://faircode.io) distributed under the [**Sustainable Use License**](https://github.com/n8n-io/n8n/blob/master/packages/cli/LICENSE.md).
+n8n is [fair-code](https://faircode.io) distributed under the [**Sustainable Use License**](https://github.com/n8n-io/n8n/blob/master/packages/cli/LICENSE.md).
 
 Proprietary licenses are available for enterprise customers. [Get in touch](mailto:license@n8n.io)
 
diff --git a/packages/nodes-base/credentials/AWS.svg b/packages/nodes-base/credentials/AWS.svg
deleted file mode 100644
index 61722af9d1339..0000000000000
--- a/packages/nodes-base/credentials/AWS.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 333334 199332" shape-rendering="geometricPrecision" text-rendering="geometricPrecision" image-rendering="optimizeQuality" fill-rule="evenodd" clip-rule="evenodd"><defs><style>.fil1{fill:#f90}</style></defs><g id="Layer_x0020_1"><g id="amazon-web-services-2.svg"><path d="M93937 72393c0 4102 443 7428 1219 9867 887 2439 1996 5100 3548 7982 554 887 776 1774 776 2550 0 1109-665 2217-2106 3326l-6985 4656c-998 665-1995 998-2882 998-1109 0-2217-554-3326-1552-1552-1663-2882-3437-3991-5211-1109-1885-2217-3991-3437-6541-8648 10200-19512 15299-32594 15299-9312 0-16740-2661-22172-7982-5432-5322-8204-12417-8204-21286 0-9424 3326-17073 10089-22838s15743-8647 27161-8647c3769 0 7650 332 11752 887 4102 554 8315 1441 12749 2439v-8093c0-8426-1774-14301-5211-17738-3548-3437-9534-5100-18071-5100-3880 0-7871 443-11973 1441s-8093 2217-11973 3769c-1774 776-3104 1219-3880 1441s-1330 332-1774 332c-1552 0-2328-1109-2328-3437v-5432c0-1774 222-3104 776-3880s1552-1552 3104-2328c3880-1996 8537-3659 13969-4989C43606 885 49370 220 55468 220c13193 0 22838 2993 29046 8980 6098 5987 9202 15077 9202 27272v35920h222zM48926 89244c3659 0 7428-665 11419-1995s7539-3769 10532-7095c1774-2106 3104-4435 3770-7095 665-2661 1108-5876 1108-9645v-4656c-3215-776-6652-1441-10199-1885-3548-443-6984-665-10421-665-7428 0-12860 1441-16519 4435-3659 2993-5432 7206-5432 12749 0 5211 1330 9091 4102 11751 2661 2772 6541 4102 11641 4102zm89023 11973c-1996 0-3326-332-4213-1109-887-665-1663-2217-2328-4324l-26053-85697c-665-2217-998-3658-998-4434 0-1774 887-2772 2661-2772h10865c2106 0 3548 333 4324 1109 887 665 1552 2217 2217 4324l18625 73391 17295-73391c554-2217 1219-3659 2106-4324s2439-1109 4435-1109h8869c2106 0 3548 333 4435 1109 887 665 1663 2217 2106 4324l17516 74278 19180-74278c665-2217 1441-3659 2217-4324 887-665 2328-1109 4324-1109h10310c1774 0 2772 887 2772 2772 0 554-111 1109-222 1774s-333 1552-776 2772l-26718 85697c-665 2217-1441 3658-2328 4324-887 665-2328 1109-4213 1109h-9534c-2107 0-3548-333-4435-1109s-1663-2217-2106-4435l-17184-71507-17073 71396c-554 2217-1220 3658-2107 4434s-2439 1109-4434 1109h-9534zm142459 2993c-5765 0-11530-665-17073-1995s-9867-2772-12749-4435c-1774-998-2993-2106-3437-3104-443-998-665-2106-665-3104v-5654c0-2328 887-3437 2550-3437 665 0 1330 111 1995 333s1663 665 2772 1109c3769 1663 7871 2993 12195 3880 4435 887 8758 1330 13193 1330 6984 0 12417-1220 16186-3659s5765-5987 5765-10532c0-3104-998-5654-2993-7760-1996-2107-5765-3991-11197-5765l-16075-4989c-8093-2550-14080-6319-17738-11308-3658-4878-5543-10310-5543-16075 0-4656 998-8758 2993-12306s4656-6652 7982-9091c3326-2550 7095-4434 11530-5765S279190-2 284068-2c2439 0 4989 111 7428 443 2550 333 4878 776 7206 1219 2217 554 4324 1109 6319 1774s3548 1330 4656 1996c1552 887 2661 1774 3326 2771 665 887 998 2107 998 3659v5211c0 2328-887 3548-2550 3548-887 0-2328-444-4213-1331-6319-2882-13415-4324-21286-4324-6319 0-11308 998-14745 3104s-5211 5321-5211 9867c0 3104 1109 5765 3326 7871s6319 4213 12195 6097l15743 4989c7982 2550 13747 6098 17184 10643s5100 9756 5100 15521c0 4767-998 9091-2882 12860-1996 3770-4656 7095-8093 9756-3437 2771-7539 4767-12306 6208-4989 1552-10199 2328-15854 2328z" fill="#252f3e"/><path class="fil1" d="M301362 158091c-36474 26940-89467 41241-135031 41241-63858 0-121395-23614-164854-62859-3437-3104-332-7317 3770-4878 47006 27272 104988 43791 164964 43791 40465 0 84921-8426 125830-25721 6097-2772 11308 3991 5321 8426z"/><path class="fil1" d="M316550 140796c-4656-5987-30820-2883-42682-1441-3548 443-4102-2661-887-4989 20842-14634 55099-10421 59090-5543 3991 4989-1109 39246-20620 55653-2993 2550-5876 1220-4545-2106 4435-10976 14301-35698 9645-41574z"/></g></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/credentials/AirtableApi.credentials.ts b/packages/nodes-base/credentials/AirtableApi.credentials.ts
index 09eee15b4cb70..26832901a1b66 100644
--- a/packages/nodes-base/credentials/AirtableApi.credentials.ts
+++ b/packages/nodes-base/credentials/AirtableApi.credentials.ts
@@ -8,6 +8,13 @@ export class AirtableApi implements ICredentialType {
 	documentationUrl = 'airtable';
 
 	properties: INodeProperties[] = [
+		{
+			displayName:
+				"This type of connection (API Key) was deprecated and can't be used anymore. Please create a new credential of type 'Access Token' instead.",
+			name: 'deprecated',
+			type: 'notice',
+			default: '',
+		},
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
diff --git a/packages/nodes-base/credentials/AirtableOAuth2Api.credentials.ts b/packages/nodes-base/credentials/AirtableOAuth2Api.credentials.ts
new file mode 100644
index 0000000000000..65a2bcce48830
--- /dev/null
+++ b/packages/nodes-base/credentials/AirtableOAuth2Api.credentials.ts
@@ -0,0 +1,52 @@
+import type { ICredentialType, INodeProperties } from 'n8n-workflow';
+
+const scopes = ['schema.bases:read', 'data.records:read', 'data.records:write'];
+
+export class AirtableOAuth2Api implements ICredentialType {
+	name = 'airtableOAuth2Api';
+
+	extends = ['oAuth2Api'];
+
+	displayName = 'Airtable OAuth2 API';
+
+	documentationUrl = 'airtable';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'Grant Type',
+			name: 'grantType',
+			type: 'hidden',
+			default: 'pkce',
+		},
+		{
+			displayName: 'Authorization URL',
+			name: 'authUrl',
+			type: 'hidden',
+			default: 'https://airtable.com/oauth2/v1/authorize',
+		},
+		{
+			displayName: 'Access Token URL',
+			name: 'accessTokenUrl',
+			type: 'hidden',
+			default: 'https://airtable.com/oauth2/v1/token',
+		},
+		{
+			displayName: 'Scope',
+			name: 'scope',
+			type: 'hidden',
+			default: `${scopes.join(' ')}`,
+		},
+		{
+			displayName: 'Auth URI Query Parameters',
+			name: 'authQueryParameters',
+			type: 'hidden',
+			default: '',
+		},
+		{
+			displayName: 'Authentication',
+			name: 'authentication',
+			type: 'hidden',
+			default: 'header',
+		},
+	];
+}
diff --git a/packages/nodes-base/credentials/AirtableTokenApi.credentials.ts b/packages/nodes-base/credentials/AirtableTokenApi.credentials.ts
new file mode 100644
index 0000000000000..31030e41a18fb
--- /dev/null
+++ b/packages/nodes-base/credentials/AirtableTokenApi.credentials.ts
@@ -0,0 +1,49 @@
+import type {
+	IAuthenticateGeneric,
+	ICredentialTestRequest,
+	ICredentialType,
+	INodeProperties,
+} from 'n8n-workflow';
+
+export class AirtableTokenApi implements ICredentialType {
+	name = 'airtableTokenApi';
+
+	displayName = 'Airtable Personal Access Token API';
+
+	documentationUrl = 'airtable';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'Access Token',
+			name: 'accessToken',
+			type: 'string',
+			typeOptions: { password: true },
+			default: '',
+		},
+		{
+			displayName: `Make sure you enabled the following scopes for your token:<br>
+				<code>data.records:read</code><br>
+				<code>data.records:write</code><br>
+				<code>schema.bases:read</code><br>
+				`,
+			name: 'notice',
+			type: 'notice',
+			default: '',
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				Authorization: '=Bearer {{$credentials.accessToken}}',
+			},
+		},
+	};
+
+	test: ICredentialTestRequest = {
+		request: {
+			baseURL: 'https://api.airtable.com/v0/meta/whoami',
+		},
+	};
+}
diff --git a/packages/nodes-base/credentials/AlienVaultApi.credentials.ts b/packages/nodes-base/credentials/AlienVaultApi.credentials.ts
new file mode 100644
index 0000000000000..aa5aeb238f669
--- /dev/null
+++ b/packages/nodes-base/credentials/AlienVaultApi.credentials.ts
@@ -0,0 +1,49 @@
+import type {
+	IAuthenticateGeneric,
+	ICredentialTestRequest,
+	ICredentialType,
+	INodeProperties,
+} from 'n8n-workflow';
+
+export class AlienVaultApi implements ICredentialType {
+	name = 'alienVaultApi';
+
+	displayName = 'AlienVault API';
+
+	documentationUrl = 'alienvault';
+
+	icon = 'file:icons/AlienVault.png';
+
+	httpRequestNode = {
+		name: 'AlienVault',
+		docsUrl: 'https://otx.alienvault.com/api',
+		apiBaseUrl: 'https://otx.alienvault.com/api/v1/',
+	};
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'OTX Key',
+			name: 'accessToken',
+			type: 'string',
+			typeOptions: { password: true },
+			required: true,
+			default: '',
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				'X-OTX-API-KEY': '={{$credentials.accessToken}}',
+			},
+		},
+	};
+
+	test: ICredentialTestRequest = {
+		request: {
+			baseURL: 'https://otx.alienvault.com',
+			url: '/api/v1/user/me',
+		},
+	};
+}
diff --git a/packages/nodes-base/credentials/Amqp.credentials.ts b/packages/nodes-base/credentials/Amqp.credentials.ts
index 7f0487f839c1e..1b20baf38eb4d 100644
--- a/packages/nodes-base/credentials/Amqp.credentials.ts
+++ b/packages/nodes-base/credentials/Amqp.credentials.ts
@@ -40,7 +40,7 @@ export class Amqp implements ICredentialType {
 			name: 'transportType',
 			type: 'string',
 			default: '',
-			description: 'Optional Transport Type to use',
+			description: 'Optional Transport Type to use. Either tcp or tls.',
 		},
 	];
 }
diff --git a/packages/nodes-base/credentials/Auth0ManagementApi.credentials.ts b/packages/nodes-base/credentials/Auth0ManagementApi.credentials.ts
new file mode 100644
index 0000000000000..c824b7188e0cb
--- /dev/null
+++ b/packages/nodes-base/credentials/Auth0ManagementApi.credentials.ts
@@ -0,0 +1,94 @@
+import type {
+	IAuthenticateGeneric,
+	ICredentialDataDecryptedObject,
+	ICredentialTestRequest,
+	ICredentialType,
+	IHttpRequestHelper,
+	INodeProperties,
+} from 'n8n-workflow';
+
+export class Auth0ManagementApi implements ICredentialType {
+	name = 'auth0ManagementApi';
+
+	displayName = 'Auth0 Management API';
+
+	documentationUrl = 'auth0management';
+
+	icon = 'file:icons/Auth0.svg';
+
+	httpRequestNode = {
+		name: 'Auth0',
+		docsUrl: 'https://auth0.com/docs/api/management/v2',
+		apiBaseUrlPlaceholder: 'https://your-tenant.auth0.com/api/v2/users/',
+	};
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'Session Token',
+			name: 'sessionToken',
+			type: 'hidden',
+			typeOptions: {
+				expirable: true,
+				password: true,
+			},
+			default: '',
+		},
+		{
+			displayName: 'Auth0 Domain',
+			name: 'domain',
+			type: 'string',
+			required: true,
+			default: 'your-domain.eu.auth0.com',
+		},
+		{
+			displayName: 'Client ID',
+			name: 'clientId',
+			type: 'string',
+			required: true,
+			default: '',
+		},
+		{
+			displayName: 'Client Secret',
+			name: 'clientSecret',
+			type: 'string',
+			typeOptions: {
+				password: true,
+			},
+			required: true,
+			default: '',
+		},
+	];
+
+	async preAuthentication(this: IHttpRequestHelper, credentials: ICredentialDataDecryptedObject) {
+		const { access_token } = (await this.helpers.httpRequest({
+			method: 'POST',
+			url: `https://${credentials.domain}/oauth/token`,
+			body: {
+				client_id: credentials.clientId,
+				client_secret: credentials.clientSecret,
+				audience: `https://${credentials.domain}/api/v2/`,
+				grant_type: 'client_credentials',
+			},
+			headers: {
+				'Content-Type': 'application/json',
+			},
+		})) as { access_token: string };
+		return { sessionToken: access_token };
+	}
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				Authorization: '=Bearer {{$credentials.sessionToken}}',
+			},
+		},
+	};
+
+	test: ICredentialTestRequest = {
+		request: {
+			baseURL: '=https://{{$credentials.domain}}',
+			url: '/api/v2/clients',
+		},
+	};
+}
diff --git a/packages/nodes-base/credentials/AutomizyApi.credentials.ts b/packages/nodes-base/credentials/AutomizyApi.credentials.ts
index 19633dc324ec7..3d1d663217dca 100644
--- a/packages/nodes-base/credentials/AutomizyApi.credentials.ts
+++ b/packages/nodes-base/credentials/AutomizyApi.credentials.ts
@@ -12,6 +12,7 @@ export class AutomizyApi implements ICredentialType {
 			displayName: 'API Token',
 			name: 'apiToken',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/Aws.credentials.ts b/packages/nodes-base/credentials/Aws.credentials.ts
index 336ee68df3859..3b52e47d23b3a 100644
--- a/packages/nodes-base/credentials/Aws.credentials.ts
+++ b/packages/nodes-base/credentials/Aws.credentials.ts
@@ -8,8 +8,9 @@ import type {
 	IDataObject,
 	IHttpRequestOptions,
 	INodeProperties,
+	IRequestOptions,
 } from 'n8n-workflow';
-import type { OptionsWithUri } from 'request';
+import { isObjectEmpty } from 'n8n-workflow';
 
 export const regions = [
 	{
@@ -133,7 +134,7 @@ export class Aws implements ICredentialType {
 
 	documentationUrl = 'aws';
 
-	icon = 'file:AWS.svg';
+	icon = 'file:icons/AWS.svg';
 
 	properties: INodeProperties[] = [
 		{
@@ -164,7 +165,6 @@ export class Aws implements ICredentialType {
 		{
 			displayName: 'Temporary Security Credentials',
 			name: 'temporaryCredentials',
-			// eslint-disable-next-line n8n-nodes-base/node-param-description-boolean-without-whether
 			description: 'Support for temporary credentials from AWS STS',
 			type: 'boolean',
 			default: false,
@@ -284,19 +284,24 @@ export class Aws implements ICredentialType {
 		let path = requestOptions.qs?.path;
 		const method = requestOptions.method;
 		let body = requestOptions.body;
+
 		let region = credentials.region;
-		let query = requestOptions.qs?.query as IDataObject;
+		if (requestOptions.qs?._region) {
+			region = requestOptions.qs._region as string;
+			delete requestOptions.qs._region;
+		}
 
-		// ! Workaround as we still use the OptionsWithUri interface which uses uri instead of url
+		let query = requestOptions.qs?.query as IDataObject;
+		// ! Workaround as we still use the IRequestOptions interface which uses uri instead of url
 		// ! To change when we replace the interface with IHttpRequestOptions
-		const requestWithUri = requestOptions as unknown as OptionsWithUri;
+		const requestWithUri = requestOptions as unknown as IRequestOptions;
 		if (requestWithUri.uri) {
-			requestOptions.url = requestWithUri.uri as string;
+			requestOptions.url = requestWithUri.uri;
 			endpoint = new URL(requestOptions.url);
 			if (service === 'sts') {
 				try {
 					if (requestWithUri.qs?.Action !== 'GetCallerIdentity') {
-						query = requestWithUri.qs;
+						query = requestWithUri.qs as IDataObject;
 					} else {
 						endpoint.searchParams.set('Action', 'GetCallerIdentity');
 						endpoint.searchParams.set('Version', '2011-06-15');
@@ -325,10 +330,10 @@ export class Aws implements ICredentialType {
 				} else if (service === 'sqs' && credentials.sqsEndpoint) {
 					endpointString = credentials.sqsEndpoint as string;
 				} else if (service) {
-					endpointString = `https://${service}.${credentials.region}.amazonaws.com`;
+					endpointString = `https://${service}.${region}.amazonaws.com`;
 				}
 				endpoint = new URL(
-					endpointString!.replace('{region}', credentials.region as string) + (path as string),
+					endpointString!.replace('{region}', region as string) + (path as string),
 				);
 			} else {
 				// If no endpoint is set, we try to decompose the path and use the default endpoint
@@ -353,7 +358,7 @@ export class Aws implements ICredentialType {
 			});
 		}
 
-		if (body && Object.keys(body).length === 0) {
+		if (body && typeof body === 'object' && isObjectEmpty(body)) {
 			body = '';
 		}
 
diff --git a/packages/nodes-base/credentials/BeeminderApi.credentials.ts b/packages/nodes-base/credentials/BeeminderApi.credentials.ts
index 66a15b844acbb..dcdfb0b4e2064 100644
--- a/packages/nodes-base/credentials/BeeminderApi.credentials.ts
+++ b/packages/nodes-base/credentials/BeeminderApi.credentials.ts
@@ -23,6 +23,7 @@ export class BeeminderApi implements ICredentialType {
 			displayName: 'Auth Token',
 			name: 'authToken',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/BitbucketApi.credentials.ts b/packages/nodes-base/credentials/BitbucketApi.credentials.ts
index fce7165dc3c3c..bc5cb0ad76a9d 100644
--- a/packages/nodes-base/credentials/BitbucketApi.credentials.ts
+++ b/packages/nodes-base/credentials/BitbucketApi.credentials.ts
@@ -18,6 +18,7 @@ export class BitbucketApi implements ICredentialType {
 			displayName: 'App Password',
 			name: 'appPassword',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/BitwardenApi.credentials.ts b/packages/nodes-base/credentials/BitwardenApi.credentials.ts
index 249f81c4e2628..f63e00230d5f7 100644
--- a/packages/nodes-base/credentials/BitwardenApi.credentials.ts
+++ b/packages/nodes-base/credentials/BitwardenApi.credentials.ts
@@ -20,6 +20,7 @@ export class BitwardenApi implements ICredentialType {
 			displayName: 'Client Secret',
 			name: 'clientSecret',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 		},
 		{
diff --git a/packages/nodes-base/credentials/BrevoApi.credentials.ts b/packages/nodes-base/credentials/BrevoApi.credentials.ts
new file mode 100644
index 0000000000000..2690f3207d6cc
--- /dev/null
+++ b/packages/nodes-base/credentials/BrevoApi.credentials.ts
@@ -0,0 +1,41 @@
+import type {
+	IAuthenticateGeneric,
+	ICredentialTestRequest,
+	ICredentialType,
+	INodeProperties,
+} from 'n8n-workflow';
+
+export class BrevoApi implements ICredentialType {
+	// keep sendinblue name for backward compatibility
+	name = 'sendInBlueApi';
+
+	displayName = 'Brevo';
+
+	documentationUrl = 'brevo';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'API Key',
+			name: 'apiKey',
+			type: 'string',
+			typeOptions: { password: true },
+			default: '',
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				'api-key': '={{$credentials.apiKey}}',
+			},
+		},
+	};
+
+	test: ICredentialTestRequest = {
+		request: {
+			baseURL: 'https://api.brevo.com/v3',
+			url: '/account',
+		},
+	};
+}
diff --git a/packages/nodes-base/credentials/BubbleApi.credentials.ts b/packages/nodes-base/credentials/BubbleApi.credentials.ts
index 43dbc2c58ced2..e065d72790504 100644
--- a/packages/nodes-base/credentials/BubbleApi.credentials.ts
+++ b/packages/nodes-base/credentials/BubbleApi.credentials.ts
@@ -12,6 +12,7 @@ export class BubbleApi implements ICredentialType {
 			displayName: 'API Token',
 			name: 'apiToken',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 		},
 		{
diff --git a/packages/nodes-base/credentials/CarbonBlackApi.credentials.ts b/packages/nodes-base/credentials/CarbonBlackApi.credentials.ts
new file mode 100644
index 0000000000000..48c5f5650ab3e
--- /dev/null
+++ b/packages/nodes-base/credentials/CarbonBlackApi.credentials.ts
@@ -0,0 +1,51 @@
+import type { IAuthenticateGeneric, ICredentialType, INodeProperties } from 'n8n-workflow';
+
+export class CarbonBlackApi implements ICredentialType {
+	name = 'carbonBlackApi';
+
+	displayName = 'Carbon Black API';
+
+	icon = 'file:icons/vmware.svg';
+
+	documentationUrl = 'carbonblack';
+
+	httpRequestNode = {
+		name: 'Carbon Black',
+		docsUrl: 'https://developer.carbonblack.com/reference',
+		apiBaseUrl: '',
+	};
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'URL',
+			name: 'apiUrl',
+			type: 'string',
+			placeholder: 'https://defense.conferdeploy.net/',
+			default: '',
+		},
+		{
+			displayName: 'Access Token',
+			name: 'accessToken',
+			type: 'string',
+			typeOptions: { password: true },
+			required: true,
+			default: '',
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				'X-Auth-Token': '={{$credentials.accessToken}}',
+			},
+		},
+	};
+
+	// test: ICredentialTestRequest = {
+	// 	request: {
+	// 		baseURL: '={{$credentials.apiUrl}}',
+	// 		url: 'integrationServices/v3/auditlogs',
+	// 	},
+	// };
+}
diff --git a/packages/nodes-base/credentials/CiscoMerakiApi.credentials.ts b/packages/nodes-base/credentials/CiscoMerakiApi.credentials.ts
new file mode 100644
index 0000000000000..e02519b64df84
--- /dev/null
+++ b/packages/nodes-base/credentials/CiscoMerakiApi.credentials.ts
@@ -0,0 +1,44 @@
+import type { IAuthenticateGeneric, ICredentialType, INodeProperties } from 'n8n-workflow';
+
+export class CiscoMerakiApi implements ICredentialType {
+	name = 'ciscoMerakiApi';
+
+	displayName = 'Cisco Meraki API';
+
+	documentationUrl = 'ciscomeraki';
+
+	icon = 'file:icons/Cisco.svg';
+
+	httpRequestNode = {
+		name: 'Cisco Meraki',
+		docsUrl: 'https://developer.cisco.com/meraki/api/',
+		apiBaseUrl: 'https://api.meraki.com/api/v1/',
+	};
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'API Key',
+			name: 'apiKey',
+			type: 'string',
+			typeOptions: { password: true },
+			required: true,
+			default: '',
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				'X-Cisco-Meraki-API-Key': '={{$credentials.apiKey}}',
+			},
+		},
+	};
+
+	// test: ICredentialTestRequest = {
+	// 	request: {
+	// 		baseURL: 'https://api.meraki.com/api/v1',
+	// 		url: '/organizations',
+	// 	},
+	// };
+}
diff --git a/packages/nodes-base/credentials/CiscoSecureEndpointApi.credentials.ts b/packages/nodes-base/credentials/CiscoSecureEndpointApi.credentials.ts
new file mode 100644
index 0000000000000..81a3a6fb70279
--- /dev/null
+++ b/packages/nodes-base/credentials/CiscoSecureEndpointApi.credentials.ts
@@ -0,0 +1,123 @@
+import type {
+	ICredentialDataDecryptedObject,
+	ICredentialTestRequest,
+	ICredentialType,
+	IHttpRequestOptions,
+	INodeProperties,
+} from 'n8n-workflow';
+
+import axios from 'axios';
+
+export class CiscoSecureEndpointApi implements ICredentialType {
+	name = 'ciscoSecureEndpointApi';
+
+	displayName = 'Cisco Secure Endpoint (AMP) API';
+
+	documentationUrl = 'ciscosecureendpoint';
+
+	icon = 'file:icons/Cisco.svg';
+
+	httpRequestNode = {
+		name: 'Cisco Secure Endpoint',
+		docsUrl: 'https://developer.cisco.com/docs/secure-endpoint/',
+		apiBaseUrl: '',
+	};
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'Region',
+			name: 'region',
+			type: 'options',
+			options: [
+				{
+					name: 'Asia Pacific, Japan, and China',
+					value: 'apjc.amp',
+				},
+				{
+					name: 'Europe',
+					value: 'eu.amp',
+				},
+				{
+					name: 'North America',
+					value: 'amp',
+				},
+			],
+			default: 'amp',
+		},
+		{
+			displayName: 'Client ID',
+			name: 'clientId',
+			type: 'string',
+			default: '',
+			required: true,
+		},
+		{
+			displayName: 'Client Secret',
+			name: 'clientSecret',
+			type: 'string',
+			typeOptions: {
+				password: true,
+			},
+			default: '',
+			required: true,
+		},
+	];
+
+	async authenticate(
+		credentials: ICredentialDataDecryptedObject,
+		requestOptions: IHttpRequestOptions,
+	): Promise<IHttpRequestOptions> {
+		const clientId = credentials.clientId as string;
+		const clientSecret = credentials.clientSecret as string;
+		const region = credentials.region as string;
+
+		const secureXToken = await axios({
+			headers: {
+				'Content-Type': 'application/x-www-form-urlencoded',
+				Accept: 'application/json',
+			},
+			auth: {
+				username: clientId,
+				password: clientSecret,
+			},
+			method: 'POST',
+			data: new URLSearchParams({
+				grant_type: 'client_credentials',
+			}).toString(),
+			url: `https://visibility.${region}.cisco.com/iroh/oauth2/token`,
+		});
+
+		const secureEndpointToken = await axios({
+			headers: {
+				'Content-Type': 'application/x-www-form-urlencoded',
+				Accept: 'application/json',
+				Authorization: `Bearer ${secureXToken.data.access_token}`,
+			},
+			method: 'POST',
+			data: new URLSearchParams({
+				grant_type: 'client_credentials',
+			}).toString(),
+			url: `https://api.${region}.cisco.com/v3/access_tokens`,
+		});
+
+		const requestOptionsWithAuth: IHttpRequestOptions = {
+			...requestOptions,
+			headers: {
+				...requestOptions.headers,
+				Authorization: `Bearer ${secureEndpointToken.data.access_token}`,
+			},
+		};
+
+		return requestOptionsWithAuth;
+	}
+
+	test: ICredentialTestRequest = {
+		request: {
+			baseURL: '=https://api.{{$credentials.region}}.cisco.com',
+			url: '/v3/organizations',
+			qs: {
+				size: 10,
+			},
+		},
+	};
+}
diff --git a/packages/nodes-base/credentials/CiscoUmbrellaApi.credentials.ts b/packages/nodes-base/credentials/CiscoUmbrellaApi.credentials.ts
new file mode 100644
index 0000000000000..2a3120ab4033e
--- /dev/null
+++ b/packages/nodes-base/credentials/CiscoUmbrellaApi.credentials.ts
@@ -0,0 +1,89 @@
+import type {
+	IAuthenticateGeneric,
+	ICredentialDataDecryptedObject,
+	ICredentialTestRequest,
+	ICredentialType,
+	IHttpRequestHelper,
+	INodeProperties,
+} from 'n8n-workflow';
+
+export class CiscoUmbrellaApi implements ICredentialType {
+	name = 'ciscoUmbrellaApi';
+
+	displayName = 'Cisco Umbrella API';
+
+	documentationUrl = 'ciscoumbrella';
+
+	icon = 'file:icons/Cisco.svg';
+
+	httpRequestNode = {
+		name: 'Cisco Umbrella',
+		docsUrl: 'https://developer.cisco.com/docs/cloud-security/',
+		apiBaseUrl: 'https://api.umbrella.com/',
+	};
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'Session Token',
+			name: 'sessionToken',
+			type: 'hidden',
+
+			typeOptions: {
+				expirable: true,
+			},
+			default: '',
+		},
+		{
+			displayName: 'API Key',
+			name: 'apiKey',
+			type: 'string',
+			typeOptions: { password: true },
+			required: true,
+			default: '',
+		},
+		{
+			displayName: 'Secret',
+			name: 'secret',
+			type: 'string',
+			typeOptions: {
+				password: true,
+			},
+			required: true,
+			default: '',
+		},
+	];
+
+	async preAuthentication(this: IHttpRequestHelper, credentials: ICredentialDataDecryptedObject) {
+		const url = 'https://api.umbrella.com';
+		const { access_token } = (await this.helpers.httpRequest({
+			method: 'POST',
+			url: `${
+				url.endsWith('/') ? url.slice(0, -1) : url
+			}/auth/v2/token?grant_type=client_credentials`,
+			auth: {
+				username: credentials.apiKey as string,
+				password: credentials.secret as string,
+			},
+			headers: {
+				'Content-Type': 'x-www-form-urlencoded',
+			},
+		})) as { access_token: string };
+		return { sessionToken: access_token };
+	}
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				Authorization: '=Bearer {{$credentials.sessionToken}}',
+			},
+		},
+	};
+
+	test: ICredentialTestRequest = {
+		request: {
+			baseURL: 'https://api.umbrella.com',
+			url: '/users',
+		},
+	};
+}
diff --git a/packages/nodes-base/credentials/CiscoWebexOAuth2Api.credentials.ts b/packages/nodes-base/credentials/CiscoWebexOAuth2Api.credentials.ts
index aa2b9ed6c5afa..3784f7f6aa063 100644
--- a/packages/nodes-base/credentials/CiscoWebexOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/CiscoWebexOAuth2Api.credentials.ts
@@ -9,6 +9,8 @@ export class CiscoWebexOAuth2Api implements ICredentialType {
 
 	documentationUrl = 'ciscowebex';
 
+	icon = 'file:icons/Cisco.svg';
+
 	properties: INodeProperties[] = [
 		{
 			displayName: 'Grant Type',
diff --git a/packages/nodes-base/credentials/CloudflareApi.credentials.ts b/packages/nodes-base/credentials/CloudflareApi.credentials.ts
index 172d89e18e51d..f360e46ac54c5 100644
--- a/packages/nodes-base/credentials/CloudflareApi.credentials.ts
+++ b/packages/nodes-base/credentials/CloudflareApi.credentials.ts
@@ -17,6 +17,7 @@ export class CloudflareApi implements ICredentialType {
 			displayName: 'API Token',
 			name: 'apiToken',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/ContentfulApi.credentials.ts b/packages/nodes-base/credentials/ContentfulApi.credentials.ts
index 9ca5456c469b8..12a01b35d2091 100644
--- a/packages/nodes-base/credentials/ContentfulApi.credentials.ts
+++ b/packages/nodes-base/credentials/ContentfulApi.credentials.ts
@@ -4,7 +4,7 @@ import type { ICredentialType, INodeProperties } from 'n8n-workflow';
 export class ContentfulApi implements ICredentialType {
 	name = 'contentfulApi';
 
-	displayName = 'Contenful API';
+	displayName = 'Contentful API';
 
 	documentationUrl = 'contentful';
 
@@ -21,6 +21,7 @@ export class ContentfulApi implements ICredentialType {
 			displayName: 'Content Delivery API Access Token',
 			name: 'ContentDeliveryaccessToken',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 			description:
 				'Access token that has access to the space. Can be left empty if only Delivery API should be used.',
@@ -29,6 +30,7 @@ export class ContentfulApi implements ICredentialType {
 			displayName: 'Content Preview API Access Token',
 			name: 'ContentPreviewaccessToken',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 			description:
 				'Access token that has access to the space. Can be left empty if only Preview API should be used.',
diff --git a/packages/nodes-base/credentials/CortexApi.credentials.ts b/packages/nodes-base/credentials/CortexApi.credentials.ts
index c890739e8a406..b2070cbc55d47 100644
--- a/packages/nodes-base/credentials/CortexApi.credentials.ts
+++ b/packages/nodes-base/credentials/CortexApi.credentials.ts
@@ -17,6 +17,7 @@ export class CortexApi implements ICredentialType {
 			displayName: 'API Key',
 			name: 'cortexApiKey',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 		},
 		{
diff --git a/packages/nodes-base/credentials/CrowdDevApi.credentials.ts b/packages/nodes-base/credentials/CrowdDevApi.credentials.ts
new file mode 100644
index 0000000000000..640b3c09ff3ba
--- /dev/null
+++ b/packages/nodes-base/credentials/CrowdDevApi.credentials.ts
@@ -0,0 +1,72 @@
+import type {
+	IAuthenticateGeneric,
+	ICredentialTestRequest,
+	ICredentialType,
+	INodeProperties,
+} from 'n8n-workflow';
+
+export class CrowdDevApi implements ICredentialType {
+	name = 'crowdDevApi';
+
+	displayName = 'crowd.dev API';
+
+	documentationUrl = 'crowddev';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'URL',
+			name: 'url',
+			type: 'string',
+			default: 'https://app.crowd.dev',
+		},
+		{
+			displayName: 'Tenant ID',
+			name: 'tenantId',
+			type: 'string',
+			default: '',
+		},
+		{
+			displayName: 'Token',
+			name: 'token',
+			type: 'string',
+			typeOptions: {
+				password: true,
+			},
+			default: '',
+		},
+		{
+			displayName: 'Ignore SSL Issues',
+			name: 'allowUnauthorizedCerts',
+			type: 'boolean',
+			description: 'Whether to connect even if SSL certificate validation is not possible',
+			default: false,
+		},
+	];
+
+	// This allows the credential to be used by other parts of n8n
+	// stating how this credential is injected as part of the request
+	// An example is the Http Request node that can make generic calls
+	// reusing this credential
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				Authorization: '={{"Bearer " + $credentials.token}}',
+			},
+		},
+	};
+
+	// The block below tells how this credential can be tested
+	test: ICredentialTestRequest = {
+		request: {
+			method: 'POST',
+			baseURL: '={{$credentials.url.replace(/\\/$/, "") + "/api/tenant/" + $credentials.tenantId}}',
+			url: '/member/query',
+			skipSslCertificateValidation: '={{ $credentials.allowUnauthorizedCerts }}',
+			body: {
+				limit: 1,
+				offset: 0,
+			},
+		},
+	};
+}
diff --git a/packages/nodes-base/credentials/CrowdStrikeOAuth2Api.credentials.ts b/packages/nodes-base/credentials/CrowdStrikeOAuth2Api.credentials.ts
new file mode 100644
index 0000000000000..ccf20224477a2
--- /dev/null
+++ b/packages/nodes-base/credentials/CrowdStrikeOAuth2Api.credentials.ts
@@ -0,0 +1,93 @@
+import type {
+	IAuthenticateGeneric,
+	ICredentialDataDecryptedObject,
+	ICredentialTestRequest,
+	ICredentialType,
+	IHttpRequestHelper,
+	INodeProperties,
+} from 'n8n-workflow';
+
+export class CrowdStrikeOAuth2Api implements ICredentialType {
+	name = 'crowdStrikeOAuth2Api';
+
+	displayName = 'CrowdStrike OAuth2 API';
+
+	documentationUrl = 'crowdstrike';
+
+	icon = 'file:icons/CrowdStrike.svg';
+
+	httpRequestNode = {
+		name: 'CrowdStrike',
+		docsUrl: 'https://developer.crowdstrike.com/',
+		apiBaseUrl: '',
+	};
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'Session Token',
+			name: 'sessionToken',
+			type: 'hidden',
+
+			typeOptions: {
+				expirable: true,
+			},
+			default: '',
+		},
+		{
+			displayName: 'URL',
+			name: 'url',
+			type: 'string',
+			required: true,
+			default: '',
+		},
+		{
+			displayName: 'Client ID',
+			name: 'clientId',
+			type: 'string',
+			required: true,
+			default: '',
+		},
+		{
+			displayName: 'Client Secret',
+			name: 'clientSecret',
+			type: 'string',
+			typeOptions: {
+				password: true,
+			},
+			required: true,
+			default: '',
+		},
+	];
+
+	async preAuthentication(this: IHttpRequestHelper, credentials: ICredentialDataDecryptedObject) {
+		const url = credentials.url as string;
+		const { access_token } = (await this.helpers.httpRequest({
+			method: 'POST',
+			url: `${url.endsWith('/') ? url.slice(0, -1) : url}/oauth2/token`,
+			body: {
+				client_id: credentials.clientId,
+				client_secret: credentials.clientSecret,
+			},
+			headers: {
+				'Content-Type': 'application/x-www-form-urlencoded',
+			},
+		})) as { access_token: string };
+		return { sessionToken: access_token };
+	}
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				Authorization: '=Bearer {{$credentials.sessionToken}}',
+			},
+		},
+	};
+
+	test: ICredentialTestRequest = {
+		request: {
+			baseURL: '={{$credentials?.url}}',
+			url: 'user-management/queries/users/v1',
+		},
+	};
+}
diff --git a/packages/nodes-base/credentials/CustomerIoApi.credentials.ts b/packages/nodes-base/credentials/CustomerIoApi.credentials.ts
index 8a814df368700..abec2b2348407 100644
--- a/packages/nodes-base/credentials/CustomerIoApi.credentials.ts
+++ b/packages/nodes-base/credentials/CustomerIoApi.credentials.ts
@@ -1,3 +1,4 @@
+import { ApplicationError } from 'n8n-workflow';
 import type {
 	ICredentialDataDecryptedObject,
 	ICredentialType,
@@ -17,6 +18,7 @@ export class CustomerIoApi implements ICredentialType {
 			displayName: 'Tracking API Key',
 			name: 'trackingApiKey',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 			description: 'Required for tracking API',
 			required: true,
@@ -37,7 +39,7 @@ export class CustomerIoApi implements ICredentialType {
 			],
 			default: 'track.customer.io',
 			description: 'Should be set based on your account region',
-			hint: 'The region will be omited when being used with the HTTP node',
+			hint: 'The region will be omitted when being used with the HTTP node',
 			required: true,
 		},
 		{
@@ -51,6 +53,7 @@ export class CustomerIoApi implements ICredentialType {
 			displayName: 'App API Key',
 			name: 'appApiKey',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 			description: 'Required for App API',
 		},
@@ -74,7 +77,7 @@ export class CustomerIoApi implements ICredentialType {
 				Authorization: `Bearer ${credentials.appApiKey as string}`,
 			});
 		} else {
-			throw new Error('Unknown way of authenticating');
+			throw new ApplicationError('Unknown way of authenticating', { level: 'warning' });
 		}
 
 		return requestOptions;
diff --git a/packages/nodes-base/credentials/DemioApi.credentials.ts b/packages/nodes-base/credentials/DemioApi.credentials.ts
index b8d88e153e6d2..e8257255306b9 100644
--- a/packages/nodes-base/credentials/DemioApi.credentials.ts
+++ b/packages/nodes-base/credentials/DemioApi.credentials.ts
@@ -19,6 +19,7 @@ export class DemioApi implements ICredentialType {
 			displayName: 'API Secret',
 			name: 'apiSecret',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/DiscordBotApi.credentials.ts b/packages/nodes-base/credentials/DiscordBotApi.credentials.ts
new file mode 100644
index 0000000000000..464ae963ed688
--- /dev/null
+++ b/packages/nodes-base/credentials/DiscordBotApi.credentials.ts
@@ -0,0 +1,43 @@
+import type {
+	IAuthenticateGeneric,
+	ICredentialTestRequest,
+	ICredentialType,
+	INodeProperties,
+} from 'n8n-workflow';
+
+export class DiscordBotApi implements ICredentialType {
+	name = 'discordBotApi';
+
+	displayName = 'Discord Bot API';
+
+	documentationUrl = 'discord';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'Bot Token',
+			name: 'botToken',
+			type: 'string',
+			default: '',
+			required: true,
+			typeOptions: {
+				password: true,
+			},
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				Authorization: '=Bot {{$credentials.botToken}}',
+			},
+		},
+	};
+
+	test: ICredentialTestRequest = {
+		request: {
+			baseURL: 'https://discord.com/api/v10/',
+			url: '/users/@me/guilds',
+		},
+	};
+}
diff --git a/packages/nodes-base/credentials/DiscordOAuth2Api.credentials.ts b/packages/nodes-base/credentials/DiscordOAuth2Api.credentials.ts
new file mode 100644
index 0000000000000..d0a026507e1b0
--- /dev/null
+++ b/packages/nodes-base/credentials/DiscordOAuth2Api.credentials.ts
@@ -0,0 +1,56 @@
+import type { ICredentialType, INodeProperties } from 'n8n-workflow';
+
+export class DiscordOAuth2Api implements ICredentialType {
+	name = 'discordOAuth2Api';
+
+	extends = ['oAuth2Api'];
+
+	displayName = 'Discord OAuth2 API';
+
+	documentationUrl = 'discord';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'Bot Token',
+			name: 'botToken',
+			type: 'string',
+			default: '',
+			typeOptions: {
+				password: true,
+			},
+		},
+		{
+			displayName: 'Grant Type',
+			name: 'grantType',
+			type: 'hidden',
+			default: 'authorizationCode',
+		},
+		{
+			displayName: 'Authorization URL',
+			name: 'authUrl',
+			type: 'hidden',
+			default: 'https://discord.com/api/oauth2/authorize',
+			required: true,
+		},
+		{
+			displayName: 'Access Token URL',
+			name: 'accessTokenUrl',
+			type: 'hidden',
+			default: 'https://discord.com/api/oauth2/token',
+			required: true,
+		},
+		{
+			displayName: 'Scope',
+			name: 'scope',
+			type: 'hidden',
+			default: 'identify guilds guilds.join bot',
+			required: true,
+		},
+		{
+			displayName: 'Auth URI Query Parameters',
+			name: 'authQueryParameters',
+			type: 'hidden',
+			default: 'permissions=1642758929655',
+		},
+	];
+}
diff --git a/packages/nodes-base/credentials/DiscordWebhookApi.credentials.ts b/packages/nodes-base/credentials/DiscordWebhookApi.credentials.ts
new file mode 100644
index 0000000000000..b0fcc51f230fd
--- /dev/null
+++ b/packages/nodes-base/credentials/DiscordWebhookApi.credentials.ts
@@ -0,0 +1,23 @@
+import type { ICredentialType, INodeProperties } from 'n8n-workflow';
+
+export class DiscordWebhookApi implements ICredentialType {
+	name = 'discordWebhookApi';
+
+	displayName = 'Discord Webhook';
+
+	documentationUrl = 'discord';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'Webhook URL',
+			name: 'webhookUri',
+			type: 'string',
+			required: true,
+			default: '',
+			placeholder: 'https://discord.com/api/webhooks/ID/TOKEN',
+			typeOptions: {
+				password: true,
+			},
+		},
+	];
+}
diff --git a/packages/nodes-base/credentials/DropcontactApi.credentials.ts b/packages/nodes-base/credentials/DropcontactApi.credentials.ts
index 71258d8b70a37..bba3f0fbf7501 100644
--- a/packages/nodes-base/credentials/DropcontactApi.credentials.ts
+++ b/packages/nodes-base/credentials/DropcontactApi.credentials.ts
@@ -2,7 +2,7 @@ import type {
 	IAuthenticateGeneric,
 	ICredentialTestRequest,
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class DropcontactApi implements ICredentialType {
@@ -12,11 +12,12 @@ export class DropcontactApi implements ICredentialType {
 
 	documentationUrl = 'dropcontact';
 
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/ERPNextApi.credentials.ts b/packages/nodes-base/credentials/ERPNextApi.credentials.ts
index 0824533a86e0d..c35a748aaa84c 100644
--- a/packages/nodes-base/credentials/ERPNextApi.credentials.ts
+++ b/packages/nodes-base/credentials/ERPNextApi.credentials.ts
@@ -24,6 +24,7 @@ export class ERPNextApi implements ICredentialType {
 			displayName: 'API Secret',
 			name: 'apiSecret',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 		},
 		{
@@ -56,6 +57,28 @@ export class ERPNextApi implements ICredentialType {
 				},
 			},
 		},
+		{
+			displayName: 'Domain',
+			name: 'domain',
+			type: 'options',
+			default: 'erpnext.com',
+			options: [
+				{
+					name: 'erpnext.com',
+					value: 'erpnext.com',
+				},
+				{
+					name: 'frappe.cloud',
+					value: 'frappe.cloud',
+				},
+			],
+			description: 'Domain for your cloud hosted ERPNext instance.',
+			displayOptions: {
+				show: {
+					environment: ['cloudHosted'],
+				},
+			},
+		},
 		{
 			displayName: 'Domain',
 			name: 'domain',
@@ -90,9 +113,19 @@ export class ERPNextApi implements ICredentialType {
 	test: ICredentialTestRequest = {
 		request: {
 			baseURL:
-				'={{$credentials.environment === "cloudHosted" ? "https://" + $credentials.subdomain + ".erpnext.com" : $credentials.domain}}',
-			url: '/api/resource/Doctype',
+				'={{$credentials.environment === "cloudHosted" ? "https://" + $credentials.subdomain + "." + $credentials.domain : $credentials.domain}}',
+			url: '/api/method/frappe.auth.get_logged_user',
 			skipSslCertificateValidation: '={{ $credentials.allowUnauthorizedCerts }}',
 		},
+		rules: [
+			{
+				type: 'responseSuccessBody',
+				properties: {
+					key: 'message',
+					value: undefined,
+					message: 'Unable to authenticate, Check the credentials and the url',
+				},
+			},
+		],
 	};
 }
diff --git a/packages/nodes-base/credentials/F5BigIpApi.credentials.ts b/packages/nodes-base/credentials/F5BigIpApi.credentials.ts
new file mode 100644
index 0000000000000..a3204ae8b2235
--- /dev/null
+++ b/packages/nodes-base/credentials/F5BigIpApi.credentials.ts
@@ -0,0 +1,45 @@
+import type { IAuthenticateGeneric, ICredentialType, INodeProperties } from 'n8n-workflow';
+
+export class F5BigIpApi implements ICredentialType {
+	name = 'f5BigIpApi';
+
+	displayName = 'F5 Big-IP API';
+
+	documentationUrl = 'f5bigip';
+
+	icon = 'file:icons/F5.svg';
+
+	httpRequestNode = {
+		name: 'F5 Big-IP',
+		docsUrl: 'https://clouddocs.f5.com/api/',
+		apiBaseUrl: '',
+	};
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'Username',
+			name: 'username',
+			type: 'string',
+			default: '',
+			required: true,
+		},
+		{
+			displayName: 'Password',
+			name: 'password',
+			type: 'string',
+			typeOptions: { password: true },
+			default: '',
+			required: true,
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			auth: {
+				username: '={{$credentials.username}}',
+				password: '={{$credentials.password}}',
+			},
+		},
+	};
+}
diff --git a/packages/nodes-base/credentials/FacebookGraphAppApi.credentials.ts b/packages/nodes-base/credentials/FacebookGraphAppApi.credentials.ts
index eea1c6431f468..ac8816d339d99 100644
--- a/packages/nodes-base/credentials/FacebookGraphAppApi.credentials.ts
+++ b/packages/nodes-base/credentials/FacebookGraphAppApi.credentials.ts
@@ -14,6 +14,7 @@ export class FacebookGraphAppApi implements ICredentialType {
 			displayName: 'App Secret',
 			name: 'appSecret',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 			description:
 				'(Optional) When the app secret is set the node will verify this signature to validate the integrity and origin of the payload',
diff --git a/packages/nodes-base/credentials/FacebookLeadAdsOAuth2Api.credentials.ts b/packages/nodes-base/credentials/FacebookLeadAdsOAuth2Api.credentials.ts
new file mode 100644
index 0000000000000..a21dece4068dc
--- /dev/null
+++ b/packages/nodes-base/credentials/FacebookLeadAdsOAuth2Api.credentials.ts
@@ -0,0 +1,53 @@
+import type { ICredentialType, INodeProperties } from 'n8n-workflow';
+
+export class FacebookLeadAdsOAuth2Api implements ICredentialType {
+	name = 'facebookLeadAdsOAuth2Api';
+
+	extends = ['oAuth2Api'];
+
+	displayName = 'Facebook Lead Ads OAuth2 API';
+
+	documentationUrl = 'facebookleadads';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'Grant Type',
+			name: 'grantType',
+			type: 'hidden',
+			default: 'authorizationCode',
+		},
+		{
+			displayName: 'Authorization URL',
+			name: 'authUrl',
+			type: 'hidden',
+			default: 'https://www.facebook.com/v17.0/dialog/oauth',
+			required: true,
+		},
+		{
+			displayName: 'Access Token URL',
+			name: 'accessTokenUrl',
+			type: 'hidden',
+			default: 'https://graph.facebook.com/v17.0/oauth/access_token',
+			required: true,
+		},
+		{
+			displayName: 'Scope',
+			name: 'scope',
+			type: 'hidden',
+			default:
+				'leads_retrieval pages_show_list pages_manage_metadata pages_manage_ads business_management',
+		},
+		{
+			displayName: 'Auth URI Query Parameters',
+			name: 'authQueryParameters',
+			type: 'hidden',
+			default: '',
+		},
+		{
+			displayName: 'Authentication',
+			name: 'authentication',
+			type: 'hidden',
+			default: 'header',
+		},
+	];
+}
diff --git a/packages/nodes-base/credentials/FortiGateApi.credentials.ts b/packages/nodes-base/credentials/FortiGateApi.credentials.ts
new file mode 100644
index 0000000000000..30655d651ff88
--- /dev/null
+++ b/packages/nodes-base/credentials/FortiGateApi.credentials.ts
@@ -0,0 +1,38 @@
+import type { IAuthenticateGeneric, ICredentialType, INodeProperties } from 'n8n-workflow';
+
+export class FortiGateApi implements ICredentialType {
+	name = 'fortiGateApi';
+
+	displayName = 'Fortinet FortiGate API';
+
+	documentationUrl = 'fortigate';
+
+	icon = 'file:icons/Fortinet.svg';
+
+	httpRequestNode = {
+		name: 'Fortinet FortiGate',
+		docsUrl:
+			'https://docs.fortinet.com/document/fortigate/7.4.1/administration-guide/940602/using-apis',
+		apiBaseUrl: '',
+	};
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'Access Token',
+			name: 'accessToken',
+			type: 'string',
+			typeOptions: { password: true },
+			default: '',
+			required: true,
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			qs: {
+				access_token: '={{$credentials.accessToken}}',
+			},
+		},
+	};
+}
diff --git a/packages/nodes-base/credentials/Google.svg b/packages/nodes-base/credentials/Google.svg
deleted file mode 100644
index b518c52704e6d..0000000000000
--- a/packages/nodes-base/credentials/Google.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 48 48"><defs><path id="a" d="M44.5 20H24v8.5h11.8C34.7 33.9 30.1 37 24 37c-7.2 0-13-5.8-13-13s5.8-13 13-13c3.1 0 5.9 1.1 8.1 2.9l6.4-6.4C34.6 4.1 29.6 2 24 2 11.8 2 2 11.8 2 24s9.8 22 22 22c11 0 21-8 21-22 0-1.3-.2-2.7-.5-4z"/></defs><clipPath id="b"><use xlink:href="#a" overflow="visible"/></clipPath><path clip-path="url(#b)" fill="#FBBC05" d="M0 37V11l17 13z"/><path clip-path="url(#b)" fill="#EA4335" d="M0 11l17 13 7-6.1L48 14V0H0z"/><path clip-path="url(#b)" fill="#34A853" d="M0 37l30-23 7.9 1L48 0v48H0z"/><path clip-path="url(#b)" fill="#4285F4" d="M48 48L17 24l-4-3 35-10z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/credentials/GoogleAdsOAuth2Api.credentials.ts b/packages/nodes-base/credentials/GoogleAdsOAuth2Api.credentials.ts
index d03a3a021a6fb..103e6603953ca 100644
--- a/packages/nodes-base/credentials/GoogleAdsOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/GoogleAdsOAuth2Api.credentials.ts
@@ -16,6 +16,7 @@ export class GoogleAdsOAuth2Api implements ICredentialType {
 			displayName: 'Developer Token',
 			name: 'developerToken',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 			required: true,
 		},
diff --git a/packages/nodes-base/credentials/GoogleApi.credentials.ts b/packages/nodes-base/credentials/GoogleApi.credentials.ts
index 2ecf1ec67c73e..90db20c9df9bb 100644
--- a/packages/nodes-base/credentials/GoogleApi.credentials.ts
+++ b/packages/nodes-base/credentials/GoogleApi.credentials.ts
@@ -20,7 +20,7 @@ export class GoogleApi implements ICredentialType {
 
 	documentationUrl = 'google/service-account';
 
-	icon = 'file:Google.svg';
+	icon = 'file:icons/Google.svg';
 
 	properties: INodeProperties[] = [
 		{
diff --git a/packages/nodes-base/credentials/GoogleDriveOAuth2Api.credentials.ts b/packages/nodes-base/credentials/GoogleDriveOAuth2Api.credentials.ts
index 1f48245e56f64..a5b5312705d9d 100644
--- a/packages/nodes-base/credentials/GoogleDriveOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/GoogleDriveOAuth2Api.credentials.ts
@@ -22,5 +22,12 @@ export class GoogleDriveOAuth2Api implements ICredentialType {
 			type: 'hidden',
 			default: scopes.join(' '),
 		},
+		{
+			displayName:
+				'Make sure that you have enabled the Google Drive API in the Google Cloud Console. <a href="https://docs.n8n.io/integrations/builtin/credentials/google/oauth-generic/#scopes" target="_blank">More info</a>.',
+			name: 'notice',
+			type: 'notice',
+			default: '',
+		},
 	];
 }
diff --git a/packages/nodes-base/credentials/GoogleOAuth2Api.credentials.ts b/packages/nodes-base/credentials/GoogleOAuth2Api.credentials.ts
index a99877e331d0e..821bf6e770ab3 100644
--- a/packages/nodes-base/credentials/GoogleOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/GoogleOAuth2Api.credentials.ts
@@ -9,7 +9,7 @@ export class GoogleOAuth2Api implements ICredentialType {
 
 	documentationUrl = 'google/oauth-generic';
 
-	icon = 'file:Google.svg';
+	icon = 'file:icons/Google.svg';
 
 	properties: INodeProperties[] = [
 		{
diff --git a/packages/nodes-base/credentials/GoogleSheetsOAuth2Api.credentials.ts b/packages/nodes-base/credentials/GoogleSheetsOAuth2Api.credentials.ts
index 1744613a59e84..a80b5c761623a 100644
--- a/packages/nodes-base/credentials/GoogleSheetsOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/GoogleSheetsOAuth2Api.credentials.ts
@@ -28,6 +28,9 @@ export class GoogleSheetsOAuth2Api implements ICredentialType {
 			name: 'notice',
 			type: 'notice',
 			default: '',
+			displayOptions: {
+				hideOnCloud: true,
+			},
 		},
 	];
 }
diff --git a/packages/nodes-base/credentials/GoogleSheetsTriggerOAuth2Api.credentials.ts b/packages/nodes-base/credentials/GoogleSheetsTriggerOAuth2Api.credentials.ts
index b5ee15101f197..f5d83423edd53 100644
--- a/packages/nodes-base/credentials/GoogleSheetsTriggerOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/GoogleSheetsTriggerOAuth2Api.credentials.ts
@@ -29,6 +29,9 @@ export class GoogleSheetsTriggerOAuth2Api implements ICredentialType {
 			name: 'notice',
 			type: 'notice',
 			default: '',
+			displayOptions: {
+				hideOnCloud: true,
+			},
 		},
 	];
 }
diff --git a/packages/nodes-base/credentials/GotifyApi.credentials.ts b/packages/nodes-base/credentials/GotifyApi.credentials.ts
index 2edd236f9bf89..6d86c0872dfc3 100644
--- a/packages/nodes-base/credentials/GotifyApi.credentials.ts
+++ b/packages/nodes-base/credentials/GotifyApi.credentials.ts
@@ -12,6 +12,9 @@ export class GotifyApi implements ICredentialType {
 			displayName: 'App API Token',
 			name: 'appApiToken',
 			type: 'string',
+			typeOptions: {
+				password: true,
+			},
 			default: '',
 			description: '(Optional) Needed for message creation',
 		},
@@ -19,6 +22,9 @@ export class GotifyApi implements ICredentialType {
 			displayName: 'Client API Token',
 			name: 'clientApiToken',
 			type: 'string',
+			typeOptions: {
+				password: true,
+			},
 			default: '',
 			description: '(Optional) Needed for everything (delete, getAll) but message creation',
 		},
@@ -29,5 +35,12 @@ export class GotifyApi implements ICredentialType {
 			default: '',
 			description: 'The URL of the Gotify host',
 		},
+		{
+			displayName: 'Ignore SSL Issues',
+			name: 'ignoreSSLIssues',
+			type: 'boolean',
+			default: false,
+			description: 'Whether to connect even if SSL certificate validation is not possible',
+		},
 	];
 }
diff --git a/packages/nodes-base/credentials/HaloPSAApi.credentials.ts b/packages/nodes-base/credentials/HaloPSAApi.credentials.ts
index 204e64379288b..45039c3de8530 100644
--- a/packages/nodes-base/credentials/HaloPSAApi.credentials.ts
+++ b/packages/nodes-base/credentials/HaloPSAApi.credentials.ts
@@ -51,6 +51,7 @@ export class HaloPSAApi implements ICredentialType {
 			displayName: 'Client Secret',
 			name: 'client_secret',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 			required: true,
 			description: 'Must be your application client secret',
diff --git a/packages/nodes-base/credentials/HighLevelApi.credentials.ts b/packages/nodes-base/credentials/HighLevelApi.credentials.ts
index c10b83fc88141..08505fbb2371f 100644
--- a/packages/nodes-base/credentials/HighLevelApi.credentials.ts
+++ b/packages/nodes-base/credentials/HighLevelApi.credentials.ts
@@ -2,7 +2,7 @@ import type {
 	IAuthenticateGeneric,
 	ICredentialTestRequest,
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class HighLevelApi implements ICredentialType {
@@ -12,11 +12,12 @@ export class HighLevelApi implements ICredentialType {
 
 	documentationUrl = 'highLevel';
 
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/HttpCustomAuth.credentials.ts b/packages/nodes-base/credentials/HttpCustomAuth.credentials.ts
new file mode 100644
index 0000000000000..405d7b7cdf3ee
--- /dev/null
+++ b/packages/nodes-base/credentials/HttpCustomAuth.credentials.ts
@@ -0,0 +1,28 @@
+/* eslint-disable n8n-nodes-base/cred-class-field-name-unsuffixed */
+/* eslint-disable n8n-nodes-base/cred-class-name-unsuffixed */
+import type { ICredentialType, INodeProperties } from 'n8n-workflow';
+
+export class HttpCustomAuth implements ICredentialType {
+	name = 'httpCustomAuth';
+
+	displayName = 'Custom Auth';
+
+	documentationUrl = 'httpRequest';
+
+	genericAuth = true;
+
+	icon = 'node:n8n-nodes-base.httpRequest';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'JSON',
+			name: 'json',
+			type: 'json',
+			required: true,
+			description: 'Use json to specify authentication values for headers, body and qs.',
+			placeholder:
+				'{ "headers": { "key" : "value" }, "body": { "key": "value" }, "qs": { "key": "value" } }',
+			default: '',
+		},
+	];
+}
diff --git a/packages/nodes-base/credentials/HttpSslAuth.credentials.ts b/packages/nodes-base/credentials/HttpSslAuth.credentials.ts
new file mode 100644
index 0000000000000..06be6d4dd74e5
--- /dev/null
+++ b/packages/nodes-base/credentials/HttpSslAuth.credentials.ts
@@ -0,0 +1,54 @@
+/* eslint-disable n8n-nodes-base/cred-class-name-unsuffixed */
+/* eslint-disable n8n-nodes-base/cred-class-field-name-unsuffixed */
+import type { ICredentialType, INodeProperties } from 'n8n-workflow';
+
+export class HttpSslAuth implements ICredentialType {
+	name = 'httpSslAuth';
+
+	displayName = 'SSL Certificates';
+
+	documentationUrl = 'httpRequest';
+
+	icon = 'node:n8n-nodes-base.httpRequest';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'CA',
+			name: 'ca',
+			type: 'string',
+			description: 'Certificate Authority certificate',
+			typeOptions: {
+				password: true,
+			},
+			default: '',
+		},
+		{
+			displayName: 'Certificate',
+			name: 'cert',
+			type: 'string',
+			typeOptions: {
+				password: true,
+			},
+			default: '',
+		},
+		{
+			displayName: 'Private Key',
+			name: 'key',
+			type: 'string',
+			typeOptions: {
+				password: true,
+			},
+			default: '',
+		},
+		{
+			displayName: 'Passphrase',
+			name: 'passphrase',
+			type: 'string',
+			description: 'Optional passphrase for the private key, if the private key is encrypted',
+			typeOptions: {
+				password: true,
+			},
+			default: '',
+		},
+	];
+}
diff --git a/packages/nodes-base/credentials/HubspotAppToken.credentials.ts b/packages/nodes-base/credentials/HubspotAppToken.credentials.ts
index a34f8139bfcf1..7e7d910db284e 100644
--- a/packages/nodes-base/credentials/HubspotAppToken.credentials.ts
+++ b/packages/nodes-base/credentials/HubspotAppToken.credentials.ts
@@ -17,6 +17,7 @@ export class HubspotAppToken implements ICredentialType {
 			displayName: 'APP Token',
 			name: 'appToken',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/HubspotOAuth2Api.credentials.ts b/packages/nodes-base/credentials/HubspotOAuth2Api.credentials.ts
index 971cc8b1895d3..2158078536e75 100644
--- a/packages/nodes-base/credentials/HubspotOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/HubspotOAuth2Api.credentials.ts
@@ -1,16 +1,17 @@
 import type { ICredentialType, INodeProperties } from 'n8n-workflow';
 
 const scopes = [
-	'crm.schemas.deals.read',
-	'crm.objects.owners.read',
+	'crm.lists.write',
+	'crm.objects.contacts.read',
 	'crm.objects.contacts.write',
-	'crm.objects.companies.write',
 	'crm.objects.companies.read',
+	'crm.objects.companies.write',
 	'crm.objects.deals.read',
-	'crm.schemas.contacts.read',
 	'crm.objects.deals.write',
-	'crm.objects.contacts.read',
+	'crm.objects.owners.read',
 	'crm.schemas.companies.read',
+	'crm.schemas.contacts.read',
+	'crm.schemas.deals.read',
 	'forms',
 	'tickets',
 ];
diff --git a/packages/nodes-base/credentials/HybridAnalysisApi.credentials.ts b/packages/nodes-base/credentials/HybridAnalysisApi.credentials.ts
new file mode 100644
index 0000000000000..a7c06463dad98
--- /dev/null
+++ b/packages/nodes-base/credentials/HybridAnalysisApi.credentials.ts
@@ -0,0 +1,37 @@
+import type { IAuthenticateGeneric, ICredentialType, INodeProperties } from 'n8n-workflow';
+
+export class HybridAnalysisApi implements ICredentialType {
+	name = 'hybridAnalysisApi';
+
+	displayName = 'Hybrid Analysis API';
+
+	documentationUrl = 'hybridanalysis';
+
+	icon = 'file:icons/Hybrid.png';
+
+	httpRequestNode = {
+		name: 'Hybrid Analysis',
+		docsUrl: 'https://www.hybrid-analysis.com/docs/api/v2',
+		apiBaseUrl: 'https://www.hybrid-analysis.com/api/',
+	};
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'API Key',
+			name: 'apiKey',
+			type: 'string',
+			typeOptions: { password: true },
+			required: true,
+			default: '',
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				'api-key': '={{$credentials.apiKey}}',
+			},
+		},
+	};
+}
diff --git a/packages/nodes-base/credentials/ImpervaWafApi.credentials.ts b/packages/nodes-base/credentials/ImpervaWafApi.credentials.ts
new file mode 100644
index 0000000000000..2046f428a400f
--- /dev/null
+++ b/packages/nodes-base/credentials/ImpervaWafApi.credentials.ts
@@ -0,0 +1,45 @@
+import type { IAuthenticateGeneric, ICredentialType, INodeProperties } from 'n8n-workflow';
+
+export class ImpervaWafApi implements ICredentialType {
+	name = 'impervaWafApi';
+
+	displayName = 'Imperva WAF API';
+
+	documentationUrl = 'impervawaf';
+
+	icon = 'file:icons/Imperva.svg';
+
+	httpRequestNode = {
+		name: 'Imperva WAF',
+		docsUrl: 'https://docs.imperva.com/bundle/api-docs',
+		apiBaseUrl: 'https://api.imperva.com/',
+	};
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'API ID',
+			name: 'apiID',
+			type: 'string',
+			default: '',
+			required: true,
+		},
+		{
+			displayName: 'API Key',
+			name: 'apiKey',
+			type: 'string',
+			typeOptions: { password: true },
+			default: '',
+			required: true,
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				'x-API-Id': '={{$credentials.apiID}}',
+				'x-API-Key': '={{$credentials.apiKey}}',
+			},
+		},
+	};
+}
diff --git a/packages/nodes-base/credentials/InvoiceNinjaApi.credentials.ts b/packages/nodes-base/credentials/InvoiceNinjaApi.credentials.ts
index dfc6b77b58286..2ffed3949a34a 100644
--- a/packages/nodes-base/credentials/InvoiceNinjaApi.credentials.ts
+++ b/packages/nodes-base/credentials/InvoiceNinjaApi.credentials.ts
@@ -25,12 +25,14 @@ export class InvoiceNinjaApi implements ICredentialType {
 			displayName: 'API Token',
 			name: 'apiToken',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 		},
 		{
 			displayName: 'Secret',
 			name: 'secret',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 			hint: 'This is optional, enter only if you did set a secret in your app and only if you are using v5',
 		},
diff --git a/packages/nodes-base/credentials/JiraSoftwareCloudApi.credentials.ts b/packages/nodes-base/credentials/JiraSoftwareCloudApi.credentials.ts
index d183e873d33b3..915f068bd52bc 100644
--- a/packages/nodes-base/credentials/JiraSoftwareCloudApi.credentials.ts
+++ b/packages/nodes-base/credentials/JiraSoftwareCloudApi.credentials.ts
@@ -24,6 +24,7 @@ export class JiraSoftwareCloudApi implements ICredentialType {
 			displayName: 'API Token',
 			name: 'apiToken',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 		},
 		{
diff --git a/packages/nodes-base/credentials/JotFormApi.credentials.ts b/packages/nodes-base/credentials/JotFormApi.credentials.ts
index 83e865443d995..4993229a00225 100644
--- a/packages/nodes-base/credentials/JotFormApi.credentials.ts
+++ b/packages/nodes-base/credentials/JotFormApi.credentials.ts
@@ -28,6 +28,10 @@ export class JotFormApi implements ICredentialType {
 					name: 'eu-api.jotform.com',
 					value: 'eu-api.jotform.com',
 				},
+				{
+					name: 'hipaa-api.jotform.com',
+					value: 'hipaa-api.jotform.com',
+				},
 			],
 			default: 'api.jotform.com',
 			description:
diff --git a/packages/nodes-base/credentials/JwtAuth.credentials.ts b/packages/nodes-base/credentials/JwtAuth.credentials.ts
new file mode 100644
index 0000000000000..5dbf5ec7a1d2e
--- /dev/null
+++ b/packages/nodes-base/credentials/JwtAuth.credentials.ts
@@ -0,0 +1,137 @@
+import type { ICredentialType, INodeProperties, INodePropertyOptions } from 'n8n-workflow';
+
+const algorithms: INodePropertyOptions[] = [
+	{
+		name: 'HS256',
+		value: 'HS256',
+	},
+	{
+		name: 'HS384',
+		value: 'HS384',
+	},
+	{
+		name: 'HS512',
+		value: 'HS512',
+	},
+	{
+		name: 'RS256',
+		value: 'RS256',
+	},
+	{
+		name: 'RS384',
+		value: 'RS384',
+	},
+	{
+		name: 'RS512',
+		value: 'RS512',
+	},
+	{
+		name: 'ES256',
+		value: 'ES256',
+	},
+	{
+		name: 'ES384',
+		value: 'ES384',
+	},
+	{
+		name: 'ES512',
+		value: 'ES512',
+	},
+	{
+		name: 'PS256',
+		value: 'PS256',
+	},
+	{
+		name: 'PS384',
+		value: 'PS384',
+	},
+	{
+		name: 'PS512',
+		value: 'PS512',
+	},
+	{
+		name: 'none',
+		value: 'none',
+	},
+];
+
+// eslint-disable-next-line n8n-nodes-base/cred-class-name-unsuffixed
+export class JwtAuth implements ICredentialType {
+	// eslint-disable-next-line n8n-nodes-base/cred-class-field-name-unsuffixed
+	name = 'jwtAuth';
+
+	displayName = 'JWT Auth';
+
+	documentationUrl = 'jwt';
+
+	icon = 'file:icons/jwt.svg';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'Key Type',
+			name: 'keyType',
+			type: 'options',
+			description: 'Choose either the secret passphrase or PEM encoded public keys',
+			options: [
+				{
+					name: 'Passphrase',
+					value: 'passphrase',
+				},
+				{
+					name: 'PEM Key',
+					value: 'pemKey',
+				},
+			],
+			default: 'passphrase',
+		},
+		{
+			displayName: 'Secret',
+			name: 'secret',
+			type: 'string',
+			typeOptions: {
+				password: true,
+			},
+			default: '',
+			displayOptions: {
+				show: {
+					keyType: ['passphrase'],
+				},
+			},
+		},
+		{
+			displayName: 'Private Key',
+			name: 'privateKey',
+			type: 'string',
+			typeOptions: {
+				password: true,
+			},
+			displayOptions: {
+				show: {
+					keyType: ['pemKey'],
+				},
+			},
+			default: '',
+		},
+		{
+			displayName: 'Public Key',
+			name: 'publicKey',
+			type: 'string',
+			typeOptions: {
+				password: true,
+			},
+			displayOptions: {
+				show: {
+					keyType: ['pemKey'],
+				},
+			},
+			default: '',
+		},
+		{
+			displayName: 'Algorithm',
+			name: 'algorithm',
+			type: 'options',
+			default: 'HS256',
+			options: algorithms,
+		},
+	];
+}
diff --git a/packages/nodes-base/credentials/KibanaApi.credentials.ts b/packages/nodes-base/credentials/KibanaApi.credentials.ts
new file mode 100644
index 0000000000000..432b53cb4e66a
--- /dev/null
+++ b/packages/nodes-base/credentials/KibanaApi.credentials.ts
@@ -0,0 +1,68 @@
+import type {
+	IAuthenticateGeneric,
+	ICredentialTestRequest,
+	ICredentialType,
+	INodeProperties,
+} from 'n8n-workflow';
+
+export class KibanaApi implements ICredentialType {
+	name = 'kibanaApi';
+
+	displayName = 'Kibana API';
+
+	documentationUrl = 'kibana';
+
+	icon = 'file:icons/Kibana.svg';
+
+	httpRequestNode = {
+		name: 'Kibana',
+		docsUrl: 'https://www.elastic.co/guide/en/kibana/current/api.html',
+		apiBaseUrl: '',
+	};
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'URL',
+			name: 'url',
+			type: 'string',
+			required: true,
+			default: '',
+			placeholder: 'http://localhost:5601',
+		},
+		{
+			displayName: 'Username',
+			name: 'username',
+			type: 'string',
+			required: true,
+			default: '',
+		},
+		{
+			displayName: 'Password',
+			name: 'password',
+			type: 'string',
+			typeOptions: { password: true },
+			required: true,
+			default: '',
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				'kbn-xsrf': true,
+			},
+			auth: {
+				username: '={{$credentials.username}}',
+				password: '={{$credentials.password}}',
+			},
+		},
+	};
+
+	test: ICredentialTestRequest = {
+		request: {
+			baseURL: '={{$credentials.url}}',
+			url: '/api/features',
+		},
+	};
+}
diff --git a/packages/nodes-base/credentials/KitemakerApi.credentials.ts b/packages/nodes-base/credentials/KitemakerApi.credentials.ts
index 729dc8bf8b710..5ce01650fb0f1 100644
--- a/packages/nodes-base/credentials/KitemakerApi.credentials.ts
+++ b/packages/nodes-base/credentials/KitemakerApi.credentials.ts
@@ -12,6 +12,7 @@ export class KitemakerApi implements ICredentialType {
 			displayName: 'Personal Access Token',
 			name: 'personalAccessToken',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/KoBoToolboxApi.credentials.ts b/packages/nodes-base/credentials/KoBoToolboxApi.credentials.ts
index 894c0acd26154..ab02e2821be5c 100644
--- a/packages/nodes-base/credentials/KoBoToolboxApi.credentials.ts
+++ b/packages/nodes-base/credentials/KoBoToolboxApi.credentials.ts
@@ -2,7 +2,7 @@ import type {
 	IAuthenticateGeneric,
 	ICredentialTestRequest,
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class KoBoToolboxApi implements ICredentialType {
@@ -13,17 +13,18 @@ export class KoBoToolboxApi implements ICredentialType {
 	// See https://support.kobotoolbox.org/api.html
 	documentationUrl = 'koBoToolbox';
 
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Root URL',
 			name: 'URL',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: 'https://kf.kobotoolbox.org/',
 		},
 		{
 			displayName: 'API Token',
 			name: 'token',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 			hint: 'You can get your API token at https://[api-root]/token/?format=json (for a logged in user)',
 		},
diff --git a/packages/nodes-base/credentials/Ldap.credentials.ts b/packages/nodes-base/credentials/Ldap.credentials.ts
new file mode 100644
index 0000000000000..374e53e4c9810
--- /dev/null
+++ b/packages/nodes-base/credentials/Ldap.credentials.ts
@@ -0,0 +1,99 @@
+import type { ICredentialType, INodeProperties } from 'n8n-workflow';
+
+// eslint-disable-next-line n8n-nodes-base/cred-class-name-unsuffixed
+export class Ldap implements ICredentialType {
+	// eslint-disable-next-line n8n-nodes-base/cred-class-field-name-unsuffixed
+	name = 'ldap';
+
+	displayName = 'LDAP';
+
+	documentationUrl = 'ldap';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'LDAP Server Address',
+			name: 'hostname',
+			type: 'string',
+			default: '',
+			required: true,
+			description: 'IP or domain of the LDAP server',
+		},
+		{
+			displayName: 'LDAP Server Port',
+			name: 'port',
+			type: 'string',
+			default: '389',
+			description: 'Port used to connect to the LDAP server',
+		},
+		{
+			displayName: 'Binding DN',
+			name: 'bindDN',
+			type: 'string',
+			default: '',
+			description: 'Distinguished Name of the user to connect as',
+		},
+		{
+			displayName: 'Binding Password',
+			name: 'bindPassword',
+			type: 'string',
+			typeOptions: {
+				password: true,
+			},
+			default: '',
+			description: 'Password of the user provided in the Binding DN field above',
+		},
+		{
+			displayName: 'Connection Security',
+			name: 'connectionSecurity',
+			type: 'options',
+			default: 'none',
+			options: [
+				{
+					name: 'None',
+					value: 'none',
+				},
+				{
+					name: 'TLS',
+					value: 'tls',
+				},
+				{
+					name: 'STARTTLS',
+					value: 'startTls',
+				},
+			],
+		},
+		{
+			displayName: 'Ignore SSL/TLS Issues',
+			name: 'allowUnauthorizedCerts',
+			type: 'boolean',
+			description: 'Whether to connect even if SSL/TLS certificate validation is not possible',
+			default: false,
+			displayOptions: {
+				hide: {
+					connectionSecurity: ['none'],
+				},
+			},
+		},
+		{
+			displayName: 'CA Certificate',
+			name: 'caCertificate',
+			typeOptions: {
+				alwaysOpenEditWindow: true,
+			},
+			displayOptions: {
+				hide: {
+					connectionSecurity: ['none'],
+				},
+			},
+			type: 'string',
+			default: '',
+		},
+		{
+			displayName: 'Timeout',
+			description: 'Optional connection timeout in seconds',
+			name: 'timeout',
+			type: 'number',
+			default: 300,
+		},
+	];
+}
diff --git a/packages/nodes-base/credentials/LinearOAuth2Api.credentials.ts b/packages/nodes-base/credentials/LinearOAuth2Api.credentials.ts
new file mode 100644
index 0000000000000..b1e22ddfd9d31
--- /dev/null
+++ b/packages/nodes-base/credentials/LinearOAuth2Api.credentials.ts
@@ -0,0 +1,73 @@
+import type { ICredentialType, INodeProperties } from 'n8n-workflow';
+
+const scopes = ['read', 'write', 'issues:create', 'comments:create'];
+
+export class LinearOAuth2Api implements ICredentialType {
+	name = 'linearOAuth2Api';
+
+	extends = ['oAuth2Api'];
+
+	displayName = 'Linear OAuth2 API';
+
+	documentationUrl = 'linear';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'Grant Type',
+			name: 'grantType',
+			type: 'hidden',
+			default: 'authorizationCode',
+		},
+		{
+			displayName: 'Authorization URL',
+			name: 'authUrl',
+			type: 'hidden',
+			default: 'https://linear.app/oauth/authorize',
+			required: true,
+		},
+		{
+			displayName: 'Access Token URL',
+			name: 'accessTokenUrl',
+			type: 'hidden',
+			default: 'https://api.linear.app/oauth/token',
+			required: true,
+		},
+		{
+			displayName: 'Actor',
+			name: 'actor',
+			type: 'options',
+			options: [
+				{
+					name: 'User',
+					value: 'user',
+					description: 'Resources are created as the user who authorized the application',
+				},
+				{
+					name: 'Application',
+					value: 'application',
+					description: 'Resources are created as the application',
+				},
+			],
+			default: 'user',
+		},
+		{
+			displayName: 'Scope',
+			name: 'scope',
+			type: 'hidden',
+			default: scopes.join(' '),
+			required: true,
+		},
+		{
+			displayName: 'Auth URI Query Parameters',
+			name: 'authQueryParameters',
+			type: 'hidden',
+			default: '={{"actor="+$self["actor"]}}',
+		},
+		{
+			displayName: 'Authentication',
+			name: 'authentication',
+			type: 'hidden',
+			default: 'body',
+		},
+	];
+}
diff --git a/packages/nodes-base/credentials/LinkedInCommunityManagementOAuth2Api.credentials.ts b/packages/nodes-base/credentials/LinkedInCommunityManagementOAuth2Api.credentials.ts
new file mode 100644
index 0000000000000..1c64bcfe1a733
--- /dev/null
+++ b/packages/nodes-base/credentials/LinkedInCommunityManagementOAuth2Api.credentials.ts
@@ -0,0 +1,54 @@
+import type { ICredentialType, INodeProperties } from 'n8n-workflow';
+
+const scopes = ['w_member_social', 'w_organization_social', 'r_basicprofile'];
+
+export class LinkedInCommunityManagementOAuth2Api implements ICredentialType {
+	name = 'linkedInCommunityManagementOAuth2Api';
+
+	extends = ['oAuth2Api'];
+
+	displayName = 'LinkedIn Community Management OAuth2 API';
+
+	documentationUrl = 'linkedIn';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'Grant Type',
+			name: 'grantType',
+			type: 'hidden',
+			default: 'authorizationCode',
+		},
+		{
+			displayName: 'Authorization URL',
+			name: 'authUrl',
+			type: 'hidden',
+			default: 'https://www.linkedin.com/oauth/v2/authorization',
+			required: true,
+		},
+		{
+			displayName: 'Access Token URL',
+			name: 'accessTokenUrl',
+			type: 'hidden',
+			default: 'https://www.linkedin.com/oauth/v2/accessToken',
+			required: true,
+		},
+		{
+			displayName: 'Scope',
+			name: 'scope',
+			type: 'hidden',
+			default: scopes.join(' '),
+		},
+		{
+			displayName: 'Auth URI Query Parameters',
+			name: 'authQueryParameters',
+			type: 'hidden',
+			default: '',
+		},
+		{
+			displayName: 'Authentication',
+			name: 'authentication',
+			type: 'hidden',
+			default: 'body',
+		},
+	];
+}
diff --git a/packages/nodes-base/credentials/LinkedInOAuth2Api.credentials.ts b/packages/nodes-base/credentials/LinkedInOAuth2Api.credentials.ts
index c87c2999baf15..6f186fabd82a0 100644
--- a/packages/nodes-base/credentials/LinkedInOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/LinkedInOAuth2Api.credentials.ts
@@ -42,7 +42,7 @@ export class LinkedInOAuth2Api implements ICredentialType {
 			name: 'scope',
 			type: 'hidden',
 			default:
-				'=r_liteprofile,r_emailaddress,w_member_social{{$self["organizationSupport"] === true ? ",w_organization_social":""}}',
+				'=w_member_social{{$self["organizationSupport"] === true ? ",w_organization_social": $self["legacy"] === true ? ",r_liteprofile,r_emailaddress" : ",profile,email,openid"}}',
 			description:
 				'Standard scopes for posting on behalf of a user or organization. See <a href="https://docs.microsoft.com/en-us/linkedin/marketing/getting-started#available-permissions"> this resource </a>.',
 		},
@@ -58,5 +58,12 @@ export class LinkedInOAuth2Api implements ICredentialType {
 			type: 'hidden',
 			default: 'body',
 		},
+		{
+			displayName: 'Legacy',
+			name: 'legacy',
+			type: 'boolean',
+			default: true,
+			description: 'Whether to use the legacy API',
+		},
 	];
 }
diff --git a/packages/nodes-base/credentials/LoneScaleApi.credentials.ts b/packages/nodes-base/credentials/LoneScaleApi.credentials.ts
new file mode 100644
index 0000000000000..cf9417502b6a7
--- /dev/null
+++ b/packages/nodes-base/credentials/LoneScaleApi.credentials.ts
@@ -0,0 +1,40 @@
+import type {
+	IAuthenticateGeneric,
+	ICredentialTestRequest,
+	ICredentialType,
+	INodeProperties,
+} from 'n8n-workflow';
+
+export class LoneScaleApi implements ICredentialType {
+	name = 'loneScaleApi';
+
+	displayName = 'LoneScale API';
+
+	documentationUrl = 'lonescale';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'API Key',
+			name: 'apiKey',
+			type: 'string',
+			typeOptions: { password: true },
+			default: '',
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				Authorization: '={{$credentials.apiKey}}',
+			},
+		},
+	};
+
+	test: ICredentialTestRequest = {
+		request: {
+			baseURL: 'https://public-api.lonescale.com',
+			url: '/users',
+		},
+	};
+}
diff --git a/packages/nodes-base/credentials/MailjetEmailApi.credentials.ts b/packages/nodes-base/credentials/MailjetEmailApi.credentials.ts
index 44721af91f1e2..ca75cb54cf8ed 100644
--- a/packages/nodes-base/credentials/MailjetEmailApi.credentials.ts
+++ b/packages/nodes-base/credentials/MailjetEmailApi.credentials.ts
@@ -24,6 +24,7 @@ export class MailjetEmailApi implements ICredentialType {
 			displayName: 'Secret Key',
 			name: 'secretKey',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 		},
 		{
diff --git a/packages/nodes-base/credentials/MailjetSmsApi.credentials.ts b/packages/nodes-base/credentials/MailjetSmsApi.credentials.ts
index 555bbf49d8af8..cdfeabb9aa31c 100644
--- a/packages/nodes-base/credentials/MailjetSmsApi.credentials.ts
+++ b/packages/nodes-base/credentials/MailjetSmsApi.credentials.ts
@@ -17,6 +17,7 @@ export class MailjetSmsApi implements ICredentialType {
 			displayName: 'Token',
 			name: 'token',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/MattermostApi.credentials.ts b/packages/nodes-base/credentials/MattermostApi.credentials.ts
index afddc454fc7e1..51a5d657ede60 100644
--- a/packages/nodes-base/credentials/MattermostApi.credentials.ts
+++ b/packages/nodes-base/credentials/MattermostApi.credentials.ts
@@ -46,7 +46,7 @@ export class MattermostApi implements ICredentialType {
 
 	test: ICredentialTestRequest = {
 		request: {
-			baseURL: '={{$credentials.baseUrl}}/api/v4',
+			baseURL: '={{$credentials.baseUrl.replace(/\\/$/, "")}}/api/v4',
 			url: '/users',
 			skipSslCertificateValidation: '={{$credentials?.allowUnauthorizedCerts}}',
 		},
diff --git a/packages/nodes-base/credentials/MediumOAuth2Api.credentials.ts b/packages/nodes-base/credentials/MediumOAuth2Api.credentials.ts
index d043ebf99c7d8..5975200db5a3d 100644
--- a/packages/nodes-base/credentials/MediumOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/MediumOAuth2Api.credentials.ts
@@ -47,6 +47,7 @@ export class MediumOAuth2Api implements ICredentialType {
 			displayName: 'Client Secret',
 			name: 'clientSecret',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 			required: true,
 		},
diff --git a/packages/nodes-base/credentials/MessageBirdApi.credentials.ts b/packages/nodes-base/credentials/MessageBirdApi.credentials.ts
index 45cea5a93f54b..c933dc3ceabb8 100644
--- a/packages/nodes-base/credentials/MessageBirdApi.credentials.ts
+++ b/packages/nodes-base/credentials/MessageBirdApi.credentials.ts
@@ -12,6 +12,7 @@ export class MessageBirdApi implements ICredentialType {
 			displayName: 'API Key',
 			name: 'accessKey',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/MetabaseApi.credentials.ts b/packages/nodes-base/credentials/MetabaseApi.credentials.ts
index 3e741abfae020..618abb52e06c9 100644
--- a/packages/nodes-base/credentials/MetabaseApi.credentials.ts
+++ b/packages/nodes-base/credentials/MetabaseApi.credentials.ts
@@ -19,6 +19,7 @@ export class MetabaseApi implements ICredentialType {
 			displayName: 'Session Token',
 			name: 'sessionToken',
 			type: 'hidden',
+
 			typeOptions: {
 				expirable: true,
 			},
diff --git a/packages/nodes-base/credentials/MicrosoftEntraOAuth2Api.credentials.ts b/packages/nodes-base/credentials/MicrosoftEntraOAuth2Api.credentials.ts
new file mode 100644
index 0000000000000..14a46dd7621f4
--- /dev/null
+++ b/packages/nodes-base/credentials/MicrosoftEntraOAuth2Api.credentials.ts
@@ -0,0 +1,23 @@
+import type { ICredentialType, INodeProperties } from 'n8n-workflow';
+
+export class MicrosoftEntraOAuth2Api implements ICredentialType {
+	name = 'microsoftEntraOAuth2Api';
+
+	displayName = 'Microsoft Entra ID (Azure Active Directory) API';
+
+	extends = ['microsoftOAuth2Api'];
+
+	icon = 'file:icons/Azure.svg';
+
+	documentationUrl = 'microsoftentra';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'Scope',
+			name: 'scope',
+			type: 'hidden',
+			default:
+				'openid offline_access AccessReview.ReadWrite.All Directory.ReadWrite.All NetworkAccessPolicy.ReadWrite.All DelegatedAdminRelationship.ReadWrite.All EntitlementManagement.ReadWrite.All',
+		},
+	];
+}
diff --git a/packages/nodes-base/credentials/MicrosoftOAuth2Api.credentials.ts b/packages/nodes-base/credentials/MicrosoftOAuth2Api.credentials.ts
index 1dcdf116d9684..58425dbe3946d 100644
--- a/packages/nodes-base/credentials/MicrosoftOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/MicrosoftOAuth2Api.credentials.ts
@@ -5,7 +5,7 @@ export class MicrosoftOAuth2Api implements ICredentialType {
 
 	extends = ['oAuth2Api'];
 
-	icon = 'file:Microsoft.svg';
+	icon = 'file:icons/Microsoft.svg';
 
 	displayName = 'Microsoft OAuth2 API';
 
diff --git a/packages/nodes-base/credentials/MicrosoftOutlookOAuth2Api.credentials.ts b/packages/nodes-base/credentials/MicrosoftOutlookOAuth2Api.credentials.ts
index 74b179020b446..fb8d979e73b92 100644
--- a/packages/nodes-base/credentials/MicrosoftOutlookOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/MicrosoftOutlookOAuth2Api.credentials.ts
@@ -1,5 +1,20 @@
 import type { ICredentialType, INodeProperties } from 'n8n-workflow';
 
+const scopes = [
+	'openid',
+	'offline_access',
+	'Contacts.Read',
+	'Contacts.ReadWrite',
+	'Calendars.Read',
+	'Calendars.Read.Shared',
+	'Calendars.ReadWrite',
+	'Mail.ReadWrite',
+	'Mail.ReadWrite.Shared',
+	'Mail.Send',
+	'Mail.Send.Shared',
+	'MailboxSettings.Read',
+];
+
 export class MicrosoftOutlookOAuth2Api implements ICredentialType {
 	name = 'microsoftOutlookOAuth2Api';
 
@@ -15,8 +30,7 @@ export class MicrosoftOutlookOAuth2Api implements ICredentialType {
 			displayName: 'Scope',
 			name: 'scope',
 			type: 'hidden',
-			default:
-				'openid offline_access Mail.ReadWrite Mail.ReadWrite.Shared Mail.Send Mail.Send.Shared MailboxSettings.Read',
+			default: scopes.join(' '),
 		},
 		{
 			displayName: 'Use Shared Mailbox',
diff --git a/packages/nodes-base/credentials/MispApi.credentials.ts b/packages/nodes-base/credentials/MispApi.credentials.ts
index 8067aaf712d6b..c9a43cd36d207 100644
--- a/packages/nodes-base/credentials/MispApi.credentials.ts
+++ b/packages/nodes-base/credentials/MispApi.credentials.ts
@@ -1,4 +1,9 @@
-import type { ICredentialType, INodeProperties } from 'n8n-workflow';
+import type {
+	IAuthenticateGeneric,
+	ICredentialTestRequest,
+	ICredentialType,
+	INodeProperties,
+} from 'n8n-workflow';
 
 export class MispApi implements ICredentialType {
 	name = 'mispApi';
@@ -29,4 +34,21 @@ export class MispApi implements ICredentialType {
 			default: false,
 		},
 	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				Authorization: '={{$credentials.apiKey}}',
+			},
+		},
+	};
+
+	test: ICredentialTestRequest = {
+		request: {
+			baseURL: '={{$credentials.baseUrl.replace(new RegExp("/$"), "")}}',
+			url: '/tags',
+			skipSslCertificateValidation: '={{$credentials.allowUnauthorizedCerts}}',
+		},
+	};
 }
diff --git a/packages/nodes-base/credentials/MistApi.credentials.ts b/packages/nodes-base/credentials/MistApi.credentials.ts
new file mode 100644
index 0000000000000..d74fe8a64bcba
--- /dev/null
+++ b/packages/nodes-base/credentials/MistApi.credentials.ts
@@ -0,0 +1,66 @@
+import type {
+	IAuthenticateGeneric,
+	ICredentialTestRequest,
+	ICredentialType,
+	INodeProperties,
+} from 'n8n-workflow';
+
+export class MistApi implements ICredentialType {
+	name = 'mistApi';
+
+	displayName = 'Mist API';
+
+	icon = 'file:icons/Mist.svg';
+
+	documentationUrl = 'mist';
+
+	httpRequestNode = {
+		name: 'Mist',
+		docsUrl: 'https://www.mist.com/documentation/mist-api-introduction/',
+		apiBaseUrl: '',
+	};
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'API Token',
+			name: 'token',
+			type: 'string',
+			typeOptions: { password: true },
+			required: true,
+			default: '',
+		},
+		{
+			displayName: 'Region',
+			name: 'region',
+			type: 'options',
+			options: [
+				{
+					name: 'Europe',
+					value: 'eu',
+				},
+				{
+					name: 'Global',
+					value: 'global',
+				},
+			],
+			default: 'eu',
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				Authorization: '=Token {{$credentials.token}}',
+			},
+		},
+	};
+
+	test: ICredentialTestRequest = {
+		request: {
+			baseURL: '=https://api{{$credentials.region === "eu" ? ".eu" : ""}}.mist.com',
+			url: '/api/v1/self',
+			method: 'GET',
+		},
+	};
+}
diff --git a/packages/nodes-base/credentials/MoceanApi.credentials.ts b/packages/nodes-base/credentials/MoceanApi.credentials.ts
index 1f320352b5ab9..51a82b1494114 100644
--- a/packages/nodes-base/credentials/MoceanApi.credentials.ts
+++ b/packages/nodes-base/credentials/MoceanApi.credentials.ts
@@ -15,12 +15,14 @@ export class MoceanApi implements ICredentialType {
 			displayName: 'API Key',
 			name: 'mocean-api-key',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 		},
 		{
 			displayName: 'API Secret',
 			name: 'mocean-api-secret',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/MondayComApi.credentials.ts b/packages/nodes-base/credentials/MondayComApi.credentials.ts
index bc3a6751ffd73..d82677b090828 100644
--- a/packages/nodes-base/credentials/MondayComApi.credentials.ts
+++ b/packages/nodes-base/credentials/MondayComApi.credentials.ts
@@ -1,4 +1,9 @@
-import type { ICredentialType, INodeProperties } from 'n8n-workflow';
+import type {
+	IAuthenticateGeneric,
+	ICredentialTestRequest,
+	ICredentialType,
+	INodeProperties,
+} from 'n8n-workflow';
 
 export class MondayComApi implements ICredentialType {
 	name = 'mondayComApi';
@@ -12,7 +17,31 @@ export class MondayComApi implements ICredentialType {
 			displayName: 'Token V2',
 			name: 'apiToken',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 		},
 	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				Authorization: '=Bearer {{$credentials.apiToken}}',
+			},
+		},
+	};
+
+	test: ICredentialTestRequest = {
+		request: {
+			headers: {
+				'API-Version': '2023-10',
+				'Content-Type': 'application/json',
+			},
+			baseURL: 'https://api.monday.com/v2',
+			method: 'POST',
+			body: JSON.stringify({
+				query: 'query { me { name }}',
+			}),
+		},
+	};
 }
diff --git a/packages/nodes-base/credentials/MongoDb.credentials.ts b/packages/nodes-base/credentials/MongoDb.credentials.ts
index f018e67b59932..495e9ed5b83f2 100644
--- a/packages/nodes-base/credentials/MongoDb.credentials.ts
+++ b/packages/nodes-base/credentials/MongoDb.credentials.ts
@@ -96,5 +96,67 @@ export class MongoDb implements ICredentialType {
 			},
 			default: 27017,
 		},
+		{
+			displayName: 'Use TLS',
+			name: 'tls',
+			type: 'boolean',
+			default: false,
+		},
+		{
+			displayName: 'CA Certificate',
+			name: 'ca',
+			type: 'string',
+			typeOptions: {
+				password: true,
+			},
+			displayOptions: {
+				show: {
+					tls: [true],
+				},
+			},
+			default: '',
+		},
+		{
+			displayName: 'Public Client Certificate',
+			name: 'cert',
+			type: 'string',
+			typeOptions: {
+				password: true,
+			},
+			displayOptions: {
+				show: {
+					tls: [true],
+				},
+			},
+			default: '',
+		},
+		{
+			displayName: 'Private Client Key',
+			name: 'key',
+			type: 'string',
+			typeOptions: {
+				password: true,
+			},
+			displayOptions: {
+				show: {
+					tls: [true],
+				},
+			},
+			default: '',
+		},
+		{
+			displayName: 'Passphrase',
+			name: 'passphrase',
+			type: 'string',
+			typeOptions: {
+				password: true,
+			},
+			displayOptions: {
+				show: {
+					tls: [true],
+				},
+			},
+			default: '',
+		},
 	];
 }
diff --git a/packages/nodes-base/credentials/MonicaCrmApi.credentials.ts b/packages/nodes-base/credentials/MonicaCrmApi.credentials.ts
index 826a229d8e2f6..d8c64cd7cd0c2 100644
--- a/packages/nodes-base/credentials/MonicaCrmApi.credentials.ts
+++ b/packages/nodes-base/credentials/MonicaCrmApi.credentials.ts
@@ -40,6 +40,7 @@ export class MonicaCrmApi implements ICredentialType {
 			displayName: 'API Token',
 			name: 'apiToken',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/Msg91Api.credentials.ts b/packages/nodes-base/credentials/Msg91Api.credentials.ts
index d4edb89c534e3..1ee0421823148 100644
--- a/packages/nodes-base/credentials/Msg91Api.credentials.ts
+++ b/packages/nodes-base/credentials/Msg91Api.credentials.ts
@@ -13,6 +13,7 @@ export class Msg91Api implements ICredentialType {
 			displayName: 'Authentication Key',
 			name: 'authkey',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/NasaApi.credentials.ts b/packages/nodes-base/credentials/NasaApi.credentials.ts
index ae33e84387045..daed00c71514a 100644
--- a/packages/nodes-base/credentials/NasaApi.credentials.ts
+++ b/packages/nodes-base/credentials/NasaApi.credentials.ts
@@ -12,6 +12,7 @@ export class NasaApi implements ICredentialType {
 			displayName: 'API Key',
 			name: 'api_key',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/NetlifyApi.credentials.ts b/packages/nodes-base/credentials/NetlifyApi.credentials.ts
index 4544eb37f42c5..1c67a6843f92d 100644
--- a/packages/nodes-base/credentials/NetlifyApi.credentials.ts
+++ b/packages/nodes-base/credentials/NetlifyApi.credentials.ts
@@ -1,4 +1,4 @@
-import type { ICredentialType, NodePropertyTypes } from 'n8n-workflow';
+import type { ICredentialType, INodeProperties } from 'n8n-workflow';
 
 export class NetlifyApi implements ICredentialType {
 	name = 'netlifyApi';
@@ -7,11 +7,12 @@ export class NetlifyApi implements ICredentialType {
 
 	documentationUrl = 'netlify';
 
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Access Token',
 			name: 'accessToken',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/NocoDb.credentials.ts b/packages/nodes-base/credentials/NocoDb.credentials.ts
index cfc865180568b..4cb2123abce2c 100644
--- a/packages/nodes-base/credentials/NocoDb.credentials.ts
+++ b/packages/nodes-base/credentials/NocoDb.credentials.ts
@@ -12,6 +12,7 @@ export class NocoDb implements ICredentialType {
 			displayName: 'User Token',
 			name: 'apiToken',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 		},
 		{
diff --git a/packages/nodes-base/credentials/NocoDbApiToken.credentials.ts b/packages/nodes-base/credentials/NocoDbApiToken.credentials.ts
index 45ad53bcab122..f1ef443692cc7 100644
--- a/packages/nodes-base/credentials/NocoDbApiToken.credentials.ts
+++ b/packages/nodes-base/credentials/NocoDbApiToken.credentials.ts
@@ -17,6 +17,7 @@ export class NocoDbApiToken implements ICredentialType {
 			displayName: 'API Token',
 			name: 'apiToken',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 		},
 		{
diff --git a/packages/nodes-base/credentials/NotionApi.credentials.ts b/packages/nodes-base/credentials/NotionApi.credentials.ts
index c21db0040f8ce..4aa3e72003dac 100644
--- a/packages/nodes-base/credentials/NotionApi.credentials.ts
+++ b/packages/nodes-base/credentials/NotionApi.credentials.ts
@@ -15,7 +15,7 @@ export class NotionApi implements ICredentialType {
 
 	properties: INodeProperties[] = [
 		{
-			displayName: 'API Key',
+			displayName: 'Internal Integration Secret',
 			name: 'apiKey',
 			type: 'string',
 			typeOptions: { password: true },
diff --git a/packages/nodes-base/credentials/NpmApi.credentials.ts b/packages/nodes-base/credentials/NpmApi.credentials.ts
new file mode 100644
index 0000000000000..8b6c825b69c7e
--- /dev/null
+++ b/packages/nodes-base/credentials/NpmApi.credentials.ts
@@ -0,0 +1,46 @@
+import type {
+	IAuthenticateGeneric,
+	ICredentialTestRequest,
+	ICredentialType,
+	INodeProperties,
+} from 'n8n-workflow';
+
+export class NpmApi implements ICredentialType {
+	name = 'npmApi';
+
+	displayName = 'Npm API';
+
+	documentationUrl = 'npm';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'Access Token',
+			name: 'accessToken',
+			type: 'string',
+			typeOptions: { password: true },
+			default: '',
+		},
+		{
+			displayName: 'Registry Url',
+			name: 'registryUrl',
+			type: 'string',
+			default: 'https://registry.npmjs.org',
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				Authorization: '=Bearer {{$credentials.accessToken}}',
+			},
+		},
+	};
+
+	test: ICredentialTestRequest = {
+		request: {
+			baseURL: '={{$credentials.registryUrl}}',
+			url: '/-/whoami',
+		},
+	};
+}
diff --git a/packages/nodes-base/credentials/OAuth1Api.credentials.ts b/packages/nodes-base/credentials/OAuth1Api.credentials.ts
index 30e08bc6f9dea..4782a4eb350d7 100644
--- a/packages/nodes-base/credentials/OAuth1Api.credentials.ts
+++ b/packages/nodes-base/credentials/OAuth1Api.credentials.ts
@@ -28,6 +28,7 @@ export class OAuth1Api implements ICredentialType {
 			displayName: 'Consumer Key',
 			name: 'consumerKey',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 			required: true,
 		},
@@ -35,6 +36,7 @@ export class OAuth1Api implements ICredentialType {
 			displayName: 'Consumer Secret',
 			name: 'consumerSecret',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 			required: true,
 		},
diff --git a/packages/nodes-base/credentials/OAuth2Api.credentials.ts b/packages/nodes-base/credentials/OAuth2Api.credentials.ts
index d818ea3b67b7d..ed61e2d639353 100644
--- a/packages/nodes-base/credentials/OAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/OAuth2Api.credentials.ts
@@ -23,6 +23,10 @@ export class OAuth2Api implements ICredentialType {
 					name: 'Client Credentials',
 					value: 'clientCredentials',
 				},
+				{
+					name: 'PKCE',
+					value: 'pkce',
+				},
 			],
 			default: 'authorizationCode',
 		},
@@ -32,7 +36,7 @@ export class OAuth2Api implements ICredentialType {
 			type: 'string',
 			displayOptions: {
 				show: {
-					grantType: ['authorizationCode'],
+					grantType: ['authorizationCode', 'pkce'],
 				},
 			},
 			default: '',
@@ -74,7 +78,7 @@ export class OAuth2Api implements ICredentialType {
 			type: 'string',
 			displayOptions: {
 				show: {
-					grantType: ['authorizationCode'],
+					grantType: ['authorizationCode', 'pkce'],
 				},
 			},
 			default: '',
@@ -100,5 +104,12 @@ export class OAuth2Api implements ICredentialType {
 			],
 			default: 'header',
 		},
+		{
+			displayName: 'Ignore SSL Issues',
+			name: 'ignoreSSLIssues',
+			type: 'boolean',
+			default: false,
+			doNotInherit: true,
+		},
 	];
 }
diff --git a/packages/nodes-base/credentials/OdooApi.credentials.ts b/packages/nodes-base/credentials/OdooApi.credentials.ts
index ac760a86a5194..89c2f7ed9146e 100644
--- a/packages/nodes-base/credentials/OdooApi.credentials.ts
+++ b/packages/nodes-base/credentials/OdooApi.credentials.ts
@@ -1,4 +1,4 @@
-import type { ICredentialType, INodeProperties, NodePropertyTypes } from 'n8n-workflow';
+import type { ICredentialType, INodeProperties } from 'n8n-workflow';
 
 export class OdooApi implements ICredentialType {
 	name = 'odooApi';
@@ -11,7 +11,7 @@ export class OdooApi implements ICredentialType {
 		{
 			displayName: 'Site URL',
 			name: 'url',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			placeholder: 'https://my-organization.odoo.com',
 			required: true,
@@ -19,7 +19,7 @@ export class OdooApi implements ICredentialType {
 		{
 			displayName: 'Username',
 			name: 'username',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			placeholder: 'user@email.com',
 			required: true,
@@ -27,7 +27,7 @@ export class OdooApi implements ICredentialType {
 		{
 			displayName: 'Password or API Key',
 			name: 'password',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			typeOptions: {
 				password: true,
@@ -37,7 +37,7 @@ export class OdooApi implements ICredentialType {
 		{
 			displayName: 'Database Name',
 			name: 'db',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/OktaApi.credentials.ts b/packages/nodes-base/credentials/OktaApi.credentials.ts
new file mode 100644
index 0000000000000..fdbeb2defc8e6
--- /dev/null
+++ b/packages/nodes-base/credentials/OktaApi.credentials.ts
@@ -0,0 +1,57 @@
+import type {
+	IAuthenticateGeneric,
+	ICredentialTestRequest,
+	ICredentialType,
+	INodeProperties,
+} from 'n8n-workflow';
+
+export class OktaApi implements ICredentialType {
+	name = 'oktaApi';
+
+	displayName = 'Okta API';
+
+	documentationUrl = 'okta';
+
+	icon = 'file:icons/Okta.svg';
+
+	httpRequestNode = {
+		name: 'Okta',
+		docsUrl: 'https://developer.okta.com/docs/reference/',
+		apiBaseUrl: '',
+	};
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'URL',
+			name: 'url',
+			type: 'string',
+			required: true,
+			default: '',
+			placeholder: 'https://dev-123456.okta.com',
+		},
+		{
+			displayName: 'SSWS Access Token',
+			name: 'accessToken',
+			type: 'string',
+			typeOptions: { password: true },
+			required: true,
+			default: '',
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				Authorization: '=SSWS {{$credentials.accessToken}}',
+			},
+		},
+	};
+
+	test: ICredentialTestRequest = {
+		request: {
+			baseURL: '={{$credentials.url}}',
+			url: '/api/v1/api-tokens',
+		},
+	};
+}
diff --git a/packages/nodes-base/credentials/OneSimpleApi.credentials.ts b/packages/nodes-base/credentials/OneSimpleApi.credentials.ts
index 611a9cdd248fa..5f95fc865df89 100644
--- a/packages/nodes-base/credentials/OneSimpleApi.credentials.ts
+++ b/packages/nodes-base/credentials/OneSimpleApi.credentials.ts
@@ -12,6 +12,7 @@ export class OneSimpleApi implements ICredentialType {
 			displayName: 'API Token',
 			name: 'apiToken',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/OnfleetApi.credentials.ts b/packages/nodes-base/credentials/OnfleetApi.credentials.ts
index 2305fc1bda33e..944dc358da1ce 100644
--- a/packages/nodes-base/credentials/OnfleetApi.credentials.ts
+++ b/packages/nodes-base/credentials/OnfleetApi.credentials.ts
@@ -1,4 +1,4 @@
-import type { ICredentialType, NodePropertyTypes } from 'n8n-workflow';
+import type { ICredentialType, INodeProperties } from 'n8n-workflow';
 
 export class OnfleetApi implements ICredentialType {
 	name = 'onfleetApi';
@@ -7,11 +7,12 @@ export class OnfleetApi implements ICredentialType {
 
 	documentationUrl = 'onfleet';
 
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/OpenAiApi.credentials.ts b/packages/nodes-base/credentials/OpenAiApi.credentials.ts
index f4604587553aa..b97ae856f9509 100644
--- a/packages/nodes-base/credentials/OpenAiApi.credentials.ts
+++ b/packages/nodes-base/credentials/OpenAiApi.credentials.ts
@@ -22,10 +22,11 @@ export class OpenAiApi implements ICredentialType {
 			default: '',
 		},
 		{
-			displayName: 'Organization ID',
+			displayName: 'Organization ID (optional)',
 			name: 'organizationId',
 			type: 'string',
 			default: '',
+			hint: 'Only required if you belong to multiple organisations',
 			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.",
 		},
diff --git a/packages/nodes-base/credentials/OpenCTIApi.credentials.ts b/packages/nodes-base/credentials/OpenCTIApi.credentials.ts
new file mode 100644
index 0000000000000..dde51838ed0a3
--- /dev/null
+++ b/packages/nodes-base/credentials/OpenCTIApi.credentials.ts
@@ -0,0 +1,37 @@
+import type { IAuthenticateGeneric, ICredentialType, INodeProperties } from 'n8n-workflow';
+
+export class OpenCTIApi implements ICredentialType {
+	name = 'openCtiApi';
+
+	displayName = 'OpenCTI API';
+
+	documentationUrl = 'opencti';
+
+	icon = 'file:icons/OpenCTI.png';
+
+	httpRequestNode = {
+		name: 'OpenCTI',
+		docsUrl: 'https://docs.opencti.io/latest/deployment/integrations/?h=api#graphql-api',
+		apiBaseUrl: '',
+	};
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'API Key',
+			name: 'apiKey',
+			type: 'string',
+			typeOptions: { password: true },
+			default: '',
+			required: true,
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				Authorization: '=Bearer {{$credentials.apiKey}}',
+			},
+		},
+	};
+}
diff --git a/packages/nodes-base/credentials/PagerDutyApi.credentials.ts b/packages/nodes-base/credentials/PagerDutyApi.credentials.ts
index 97f577c7fd553..6c02f47528ca2 100644
--- a/packages/nodes-base/credentials/PagerDutyApi.credentials.ts
+++ b/packages/nodes-base/credentials/PagerDutyApi.credentials.ts
@@ -12,6 +12,7 @@ export class PagerDutyApi implements ICredentialType {
 			displayName: 'API Token',
 			name: 'apiToken',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/PayPalApi.credentials.ts b/packages/nodes-base/credentials/PayPalApi.credentials.ts
index d8e5d96d942cc..afafb7ae39ccf 100644
--- a/packages/nodes-base/credentials/PayPalApi.credentials.ts
+++ b/packages/nodes-base/credentials/PayPalApi.credentials.ts
@@ -18,6 +18,7 @@ export class PayPalApi implements ICredentialType {
 			displayName: 'Secret',
 			name: 'secret',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 		},
 		{
diff --git a/packages/nodes-base/credentials/PipedriveApi.credentials.ts b/packages/nodes-base/credentials/PipedriveApi.credentials.ts
index c45cac89823b6..f194eed352454 100644
--- a/packages/nodes-base/credentials/PipedriveApi.credentials.ts
+++ b/packages/nodes-base/credentials/PipedriveApi.credentials.ts
@@ -12,6 +12,7 @@ export class PipedriveApi implements ICredentialType {
 			displayName: 'API Token',
 			name: 'apiToken',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/PlivoApi.credentials.ts b/packages/nodes-base/credentials/PlivoApi.credentials.ts
index fe36db999664a..73e2172b255c3 100644
--- a/packages/nodes-base/credentials/PlivoApi.credentials.ts
+++ b/packages/nodes-base/credentials/PlivoApi.credentials.ts
@@ -18,6 +18,7 @@ export class PlivoApi implements ICredentialType {
 			displayName: 'Auth Token',
 			name: 'authToken',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/PostmarkApi.credentials.ts b/packages/nodes-base/credentials/PostmarkApi.credentials.ts
index ca3d0a2d7ee5b..8f83e0dff0965 100644
--- a/packages/nodes-base/credentials/PostmarkApi.credentials.ts
+++ b/packages/nodes-base/credentials/PostmarkApi.credentials.ts
@@ -17,6 +17,7 @@ export class PostmarkApi implements ICredentialType {
 			displayName: 'Server API Token',
 			name: 'serverToken',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/QRadarApi.credentials.ts b/packages/nodes-base/credentials/QRadarApi.credentials.ts
new file mode 100644
index 0000000000000..5da8eaab3765e
--- /dev/null
+++ b/packages/nodes-base/credentials/QRadarApi.credentials.ts
@@ -0,0 +1,37 @@
+import type { IAuthenticateGeneric, ICredentialType, INodeProperties } from 'n8n-workflow';
+
+export class QRadarApi implements ICredentialType {
+	name = 'qRadarApi';
+
+	displayName = 'QRadar API';
+
+	icon = 'file:icons/IBM.svg';
+
+	documentationUrl = 'qradar';
+
+	httpRequestNode = {
+		name: 'QRadar',
+		docsUrl: 'https://www.ibm.com/docs/en/qradar-common',
+		apiBaseUrl: '',
+	};
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'API Key',
+			name: 'apiKey',
+			type: 'string',
+			typeOptions: { password: true },
+			required: true,
+			default: '',
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				SEC: '={{$credentials.apiKey}}',
+			},
+		},
+	};
+}
diff --git a/packages/nodes-base/credentials/QualysApi.credentials.ts b/packages/nodes-base/credentials/QualysApi.credentials.ts
new file mode 100644
index 0000000000000..5f54b9dc5382b
--- /dev/null
+++ b/packages/nodes-base/credentials/QualysApi.credentials.ts
@@ -0,0 +1,62 @@
+import type { IAuthenticateGeneric, ICredentialType, INodeProperties } from 'n8n-workflow';
+
+export class QualysApi implements ICredentialType {
+	name = 'qualysApi';
+
+	displayName = 'Qualys API';
+
+	icon = 'file:icons/Qualys.svg';
+
+	documentationUrl = 'qualys';
+
+	httpRequestNode = {
+		name: 'Qualys',
+		docsUrl: 'https://qualysguard.qg2.apps.qualys.com/qwebhelp/fo_portal/api_doc/index.htm',
+		apiBaseUrl: 'https://qualysapi.qualys.com/api/',
+	};
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'Username',
+			name: 'username',
+			type: 'string',
+			default: '',
+			required: true,
+		},
+		{
+			displayName: 'Password',
+			name: 'password',
+			type: 'string',
+			typeOptions: { password: true },
+			default: '',
+			required: true,
+		},
+		{
+			displayName: 'Requested With',
+			name: 'requestedWith',
+			type: 'string',
+			default: 'n8n application',
+			description: 'User description, like a user agent',
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				'X-Requested-With': '={{$credentials.requestedWith}}',
+			},
+			auth: {
+				username: '={{$credentials.username}}',
+				password: '={{$credentials.password}}',
+			},
+		},
+	};
+
+	// test: ICredentialTestRequest = {
+	// 	request: {
+	// 		baseURL: 'https://qualysapi.qualys.com',
+	// 		url: '/api/2.0/fo/asset/host/?action=list',
+	// 	},
+	// };
+}
diff --git a/packages/nodes-base/credentials/QuickBaseApi.credentials.ts b/packages/nodes-base/credentials/QuickBaseApi.credentials.ts
index bb3935ae7e011..dce594712c84b 100644
--- a/packages/nodes-base/credentials/QuickBaseApi.credentials.ts
+++ b/packages/nodes-base/credentials/QuickBaseApi.credentials.ts
@@ -20,6 +20,7 @@ export class QuickBaseApi implements ICredentialType {
 			displayName: 'User Token',
 			name: 'userToken',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 			required: true,
 		},
diff --git a/packages/nodes-base/credentials/RecordedFutureApi.credentials.ts b/packages/nodes-base/credentials/RecordedFutureApi.credentials.ts
new file mode 100644
index 0000000000000..2a19b4a8ebab6
--- /dev/null
+++ b/packages/nodes-base/credentials/RecordedFutureApi.credentials.ts
@@ -0,0 +1,44 @@
+import type { IAuthenticateGeneric, ICredentialType, INodeProperties } from 'n8n-workflow';
+
+export class RecordedFutureApi implements ICredentialType {
+	name = 'recordedFutureApi';
+
+	displayName = 'Recorded Future API';
+
+	documentationUrl = 'recordedfuture';
+
+	icon = 'file:icons/RecordedFuture.svg';
+
+	httpRequestNode = {
+		name: 'Recorded Future',
+		docsUrl: 'https://api.recordedfuture.com',
+		apiBaseUrl: 'https://api.recordedfuture.com/v2/',
+	};
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'Access Token',
+			name: 'apiKey',
+			type: 'string',
+			typeOptions: { password: true },
+			required: true,
+			default: '',
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				'X-RFToken': '={{$credentials.accessToken}}',
+			},
+		},
+	};
+
+	// test: ICredentialTestRequest = {
+	// 	request: {
+	// 		baseURL: 'https://api.recordedfuture.com/v2',
+	// 		url: '/alert/search?limit=1',
+	// 	},
+	// };
+}
diff --git a/packages/nodes-base/credentials/Redis.credentials.ts b/packages/nodes-base/credentials/Redis.credentials.ts
index 2833ca24e1a5a..194c2f59e3acf 100644
--- a/packages/nodes-base/credentials/Redis.credentials.ts
+++ b/packages/nodes-base/credentials/Redis.credentials.ts
@@ -35,5 +35,11 @@ export class Redis implements ICredentialType {
 			type: 'number',
 			default: 0,
 		},
+		{
+			displayName: 'SSL',
+			name: 'ssl',
+			type: 'boolean',
+			default: false,
+		},
 	];
 }
diff --git a/packages/nodes-base/credentials/RocketchatApi.credentials.ts b/packages/nodes-base/credentials/RocketchatApi.credentials.ts
index 231445a24beac..0774ab9a85a90 100644
--- a/packages/nodes-base/credentials/RocketchatApi.credentials.ts
+++ b/packages/nodes-base/credentials/RocketchatApi.credentials.ts
@@ -23,6 +23,7 @@ export class RocketchatApi implements ICredentialType {
 			displayName: 'Auth Key',
 			name: 'authKey',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 		},
 		{
diff --git a/packages/nodes-base/credentials/RundeckApi.credentials.ts b/packages/nodes-base/credentials/RundeckApi.credentials.ts
index 78b855f62a85c..b8dd30de3132e 100644
--- a/packages/nodes-base/credentials/RundeckApi.credentials.ts
+++ b/packages/nodes-base/credentials/RundeckApi.credentials.ts
@@ -24,6 +24,7 @@ export class RundeckApi implements ICredentialType {
 			displayName: 'Token',
 			name: 'token',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/S3.credentials.ts b/packages/nodes-base/credentials/S3.credentials.ts
index 54050a0310b4a..11e6ad157f5dc 100644
--- a/packages/nodes-base/credentials/S3.credentials.ts
+++ b/packages/nodes-base/credentials/S3.credentials.ts
@@ -41,5 +41,12 @@ export class S3 implements ICredentialType {
 			type: 'boolean',
 			default: false,
 		},
+		{
+			displayName: 'Ignore SSL Issues',
+			name: 'ignoreSSLIssues',
+			type: 'boolean',
+			default: false,
+			description: 'Whether to connect even if SSL certificate validation is not possible',
+		},
 	];
 }
diff --git a/packages/nodes-base/credentials/SalesmateApi.credentials.ts b/packages/nodes-base/credentials/SalesmateApi.credentials.ts
index 6b99cb5058471..d8d2825fbde07 100644
--- a/packages/nodes-base/credentials/SalesmateApi.credentials.ts
+++ b/packages/nodes-base/credentials/SalesmateApi.credentials.ts
@@ -12,6 +12,7 @@ export class SalesmateApi implements ICredentialType {
 			displayName: 'Session Token',
 			name: 'sessionToken',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 		},
 		{
diff --git a/packages/nodes-base/credentials/SeaTableApi.credentials.ts b/packages/nodes-base/credentials/SeaTableApi.credentials.ts
index ba468a0384101..1481548510ceb 100644
--- a/packages/nodes-base/credentials/SeaTableApi.credentials.ts
+++ b/packages/nodes-base/credentials/SeaTableApi.credentials.ts
@@ -52,6 +52,7 @@ export class SeaTableApi implements ICredentialType {
 			displayName: 'API Token (of a Base)',
 			name: 'token',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 		},
 		{
diff --git a/packages/nodes-base/credentials/SegmentApi.credentials.ts b/packages/nodes-base/credentials/SegmentApi.credentials.ts
index d9b5a7fb70ab9..6a4e1c67c0b6a 100644
--- a/packages/nodes-base/credentials/SegmentApi.credentials.ts
+++ b/packages/nodes-base/credentials/SegmentApi.credentials.ts
@@ -17,6 +17,7 @@ export class SegmentApi implements ICredentialType {
 			displayName: 'Write Key',
 			name: 'writekey',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/SekoiaApi.credentials.ts b/packages/nodes-base/credentials/SekoiaApi.credentials.ts
new file mode 100644
index 0000000000000..e9bee6dbcda64
--- /dev/null
+++ b/packages/nodes-base/credentials/SekoiaApi.credentials.ts
@@ -0,0 +1,37 @@
+import type { IAuthenticateGeneric, ICredentialType, INodeProperties } from 'n8n-workflow';
+
+export class SekoiaApi implements ICredentialType {
+	name = 'sekoiaApi';
+
+	displayName = 'Sekoia API';
+
+	icon = 'file:icons/Sekoia.svg';
+
+	documentationUrl = 'sekoia';
+
+	httpRequestNode = {
+		name: 'Sekoia',
+		docsUrl: 'https://docs.sekoia.io/cti/features/integrations/api/',
+		apiBaseUrl: 'https://api.sekoia.io/',
+	};
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'API Key',
+			name: 'apiKey',
+			type: 'string',
+			typeOptions: { password: true },
+			required: true,
+			default: '',
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				Authorization: '=Bearer {{$credentials.apiKey}}',
+			},
+		},
+	};
+}
diff --git a/packages/nodes-base/credentials/SendInBlueApi.credentials.ts b/packages/nodes-base/credentials/SendInBlueApi.credentials.ts
deleted file mode 100644
index f4fed2a413707..0000000000000
--- a/packages/nodes-base/credentials/SendInBlueApi.credentials.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import type {
-	IAuthenticateGeneric,
-	ICredentialTestRequest,
-	ICredentialType,
-	INodeProperties,
-} from 'n8n-workflow';
-
-export class SendInBlueApi implements ICredentialType {
-	name = 'sendInBlueApi';
-
-	displayName = 'SendInBlue';
-
-	documentationUrl = 'sendinblue';
-
-	properties: INodeProperties[] = [
-		{
-			displayName: 'API Key',
-			name: 'apiKey',
-			type: 'string',
-			typeOptions: { password: true },
-			default: '',
-		},
-	];
-
-	authenticate: IAuthenticateGeneric = {
-		type: 'generic',
-		properties: {
-			headers: {
-				'api-key': '={{$credentials.apiKey}}',
-			},
-		},
-	};
-
-	test: ICredentialTestRequest = {
-		request: {
-			baseURL: 'https://api.sendinblue.com/v3',
-			url: '/account',
-		},
-	};
-}
diff --git a/packages/nodes-base/credentials/SentryIoApi.credentials.ts b/packages/nodes-base/credentials/SentryIoApi.credentials.ts
index a4c8e4da0f2ac..eb144cfa259e2 100644
--- a/packages/nodes-base/credentials/SentryIoApi.credentials.ts
+++ b/packages/nodes-base/credentials/SentryIoApi.credentials.ts
@@ -12,6 +12,7 @@ export class SentryIoApi implements ICredentialType {
 			displayName: 'Token',
 			name: 'token',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/SentryIoServerApi.credentials.ts b/packages/nodes-base/credentials/SentryIoServerApi.credentials.ts
index 823086b627325..d8dab2e7d1904 100644
--- a/packages/nodes-base/credentials/SentryIoServerApi.credentials.ts
+++ b/packages/nodes-base/credentials/SentryIoServerApi.credentials.ts
@@ -12,6 +12,7 @@ export class SentryIoServerApi implements ICredentialType {
 			displayName: 'Token',
 			name: 'token',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 		},
 		{
diff --git a/packages/nodes-base/credentials/Sftp.credentials.ts b/packages/nodes-base/credentials/Sftp.credentials.ts
index 645dab0e325e5..3238097d6d7e6 100644
--- a/packages/nodes-base/credentials/Sftp.credentials.ts
+++ b/packages/nodes-base/credentials/Sftp.credentials.ts
@@ -42,6 +42,7 @@ export class Sftp implements ICredentialType {
 			displayName: 'Private Key',
 			name: 'privateKey',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 			description:
 				'String that contains a private key for either key-based or hostbased user authentication (OpenSSH format)',
diff --git a/packages/nodes-base/credentials/ShopifyAccessTokenApi.credentials.ts b/packages/nodes-base/credentials/ShopifyAccessTokenApi.credentials.ts
index 57493279844dc..3d47202ca2dbe 100644
--- a/packages/nodes-base/credentials/ShopifyAccessTokenApi.credentials.ts
+++ b/packages/nodes-base/credentials/ShopifyAccessTokenApi.credentials.ts
@@ -34,6 +34,7 @@ export class ShopifyAccessTokenApi implements ICredentialType {
 			name: 'appSecretKey',
 			required: true,
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 			description: 'Secret key needed to verify the webhook when using Shopify Trigger node',
 		},
diff --git a/packages/nodes-base/credentials/ShopifyApi.credentials.ts b/packages/nodes-base/credentials/ShopifyApi.credentials.ts
index 93ef009304e97..aa01dbf01dd12 100644
--- a/packages/nodes-base/credentials/ShopifyApi.credentials.ts
+++ b/packages/nodes-base/credentials/ShopifyApi.credentials.ts
@@ -43,6 +43,7 @@ export class ShopifyApi implements ICredentialType {
 			displayName: 'Shared Secret',
 			name: 'sharedSecret',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/ShufflerApi.credentials.ts b/packages/nodes-base/credentials/ShufflerApi.credentials.ts
new file mode 100644
index 0000000000000..ce5995df6bb6b
--- /dev/null
+++ b/packages/nodes-base/credentials/ShufflerApi.credentials.ts
@@ -0,0 +1,50 @@
+import type {
+	IAuthenticateGeneric,
+	ICredentialTestRequest,
+	ICredentialType,
+	INodeProperties,
+} from 'n8n-workflow';
+
+export class ShufflerApi implements ICredentialType {
+	name = 'shufflerApi';
+
+	displayName = 'Shuffler API';
+
+	icon = 'file:icons/Shuffler.svg';
+
+	documentationUrl = 'shuffler';
+
+	httpRequestNode = {
+		name: 'Shuffler',
+		docsUrl: 'https://shuffler.io/docs/API',
+		apiBaseUrl: 'https://shuffler.io/api/v1/',
+	};
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'API Key',
+			name: 'apiKey',
+			type: 'string',
+			typeOptions: { password: true },
+			required: true,
+			default: '',
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				Authorization: '=Bearer {{$credentials.apiKey}}',
+			},
+		},
+	};
+
+	test: ICredentialTestRequest = {
+		request: {
+			baseURL: 'https://shuffler.io/api',
+			url: '/v1/users/getusers',
+			method: 'GET',
+		},
+	};
+}
diff --git a/packages/nodes-base/credentials/Signl4Api.credentials.ts b/packages/nodes-base/credentials/Signl4Api.credentials.ts
index 97a95a430ebf3..c3c38d9afd4f2 100644
--- a/packages/nodes-base/credentials/Signl4Api.credentials.ts
+++ b/packages/nodes-base/credentials/Signl4Api.credentials.ts
@@ -12,6 +12,7 @@ export class Signl4Api implements ICredentialType {
 			displayName: 'Team Secret',
 			name: 'teamSecret',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 			description: 'The team secret is the last part of your SIGNL4 webhook URL',
 		},
diff --git a/packages/nodes-base/credentials/Sms77Api.credentials.ts b/packages/nodes-base/credentials/Sms77Api.credentials.ts
index bdb67885eae74..ceccd56b0186b 100644
--- a/packages/nodes-base/credentials/Sms77Api.credentials.ts
+++ b/packages/nodes-base/credentials/Sms77Api.credentials.ts
@@ -8,7 +8,8 @@ import type {
 export class Sms77Api implements ICredentialType {
 	name = 'sms77Api';
 
-	displayName = 'Sms77 API';
+	// eslint-disable-next-line n8n-nodes-base/cred-class-field-display-name-miscased
+	displayName = 'seven API';
 
 	documentationUrl = 'sms77';
 
@@ -33,8 +34,21 @@ export class Sms77Api implements ICredentialType {
 
 	test: ICredentialTestRequest = {
 		request: {
-			baseURL: 'https://gateway.sms77.io/api',
-			url: '/balance',
+			baseURL: 'https://gateway.seven.io/api',
+			url: '/hooks',
+			qs: {
+				action: 'read',
+			},
 		},
+		rules: [
+			{
+				type: 'responseSuccessBody',
+				properties: {
+					key: 'success',
+					message: 'Invalid API Key',
+					value: undefined,
+				},
+			},
+		],
 	};
 }
diff --git a/packages/nodes-base/credentials/Smtp.credentials.ts b/packages/nodes-base/credentials/Smtp.credentials.ts
index 8c0e58f3c32d9..28817bdc88c03 100644
--- a/packages/nodes-base/credentials/Smtp.credentials.ts
+++ b/packages/nodes-base/credentials/Smtp.credentials.ts
@@ -41,5 +41,13 @@ export class Smtp implements ICredentialType {
 			type: 'boolean',
 			default: true,
 		},
+		{
+			displayName: 'Client Host Name',
+			name: 'hostName',
+			type: 'string',
+			default: '',
+			placeholder: '',
+			description: 'The hostname of the client, used for identifying to the server',
+		},
 	];
 }
diff --git a/packages/nodes-base/credentials/SplunkApi.credentials.ts b/packages/nodes-base/credentials/SplunkApi.credentials.ts
index ef5f0e4077729..b963eb61e14f0 100644
--- a/packages/nodes-base/credentials/SplunkApi.credentials.ts
+++ b/packages/nodes-base/credentials/SplunkApi.credentials.ts
@@ -12,6 +12,7 @@ export class SplunkApi implements ICredentialType {
 			displayName: 'Auth Token',
 			name: 'authToken',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 		},
 		{
diff --git a/packages/nodes-base/credentials/SshPrivateKey.credentials.ts b/packages/nodes-base/credentials/SshPrivateKey.credentials.ts
index 11b166619c74b..6fdc8c2e96107 100644
--- a/packages/nodes-base/credentials/SshPrivateKey.credentials.ts
+++ b/packages/nodes-base/credentials/SshPrivateKey.credentials.ts
@@ -45,6 +45,7 @@ export class SshPrivateKey implements ICredentialType {
 			type: 'string',
 			default: '',
 			description: 'Passphase used to create the key, if no passphase was used leave empty',
+			typeOptions: { password: true },
 		},
 	];
 }
diff --git a/packages/nodes-base/credentials/StrapiApi.credentials.ts b/packages/nodes-base/credentials/StrapiApi.credentials.ts
index 55b1383e78f42..1c8ef696324e5 100644
--- a/packages/nodes-base/credentials/StrapiApi.credentials.ts
+++ b/packages/nodes-base/credentials/StrapiApi.credentials.ts
@@ -8,6 +8,12 @@ export class StrapiApi implements ICredentialType {
 	documentationUrl = 'strapi';
 
 	properties: INodeProperties[] = [
+		{
+			displayName: 'Make sure you are using a user account not an admin account',
+			name: 'notice',
+			type: 'notice',
+			default: '',
+		},
 		{
 			displayName: 'Email',
 			name: 'email',
diff --git a/packages/nodes-base/credentials/StrapiTokenApi.credentials.ts b/packages/nodes-base/credentials/StrapiTokenApi.credentials.ts
new file mode 100644
index 0000000000000..07b689884be20
--- /dev/null
+++ b/packages/nodes-base/credentials/StrapiTokenApi.credentials.ts
@@ -0,0 +1,77 @@
+import type {
+	IAuthenticateGeneric,
+	ICredentialTestRequest,
+	ICredentialType,
+	INodeProperties,
+} from 'n8n-workflow';
+
+export class StrapiTokenApi implements ICredentialType {
+	name = 'strapiTokenApi';
+
+	displayName = 'Strapi API Token';
+
+	documentationUrl = 'strapi';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'API Token',
+			name: 'apiToken',
+			type: 'string',
+			typeOptions: { password: true },
+			default: '',
+		},
+		{
+			displayName: 'URL',
+			name: 'url',
+			type: 'string',
+			default: '',
+			placeholder: 'https://api.example.com',
+		},
+		{
+			displayName: 'API Version',
+			name: 'apiVersion',
+			default: 'v3',
+			type: 'options',
+			description: 'The version of api to be used',
+			options: [
+				{
+					name: 'Version 4',
+					value: 'v4',
+					description: 'API version supported by Strapi 4',
+				},
+				{
+					name: 'Version 3',
+					value: 'v3',
+					description: 'API version supported by Strapi 3',
+				},
+			],
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				Authorization: '=Bearer {{$credentials.apiToken}}',
+			},
+		},
+	};
+
+	test: ICredentialTestRequest = {
+		request: {
+			baseURL: '={{$credentials.url}}',
+			url: '={{$credentials.apiVersion === "v3" ? "/users/count" : "/api/users/count"}}',
+			ignoreHttpStatusErrors: true,
+		},
+		rules: [
+			{
+				type: 'responseSuccessBody',
+				properties: {
+					key: 'error.name',
+					value: 'UnauthorizedError',
+					message: 'Invalid API token',
+				},
+			},
+		],
+	};
+}
diff --git a/packages/nodes-base/credentials/StripeApi.credentials.ts b/packages/nodes-base/credentials/StripeApi.credentials.ts
index 27d14eddcbc98..68bd4bb7f4412 100644
--- a/packages/nodes-base/credentials/StripeApi.credentials.ts
+++ b/packages/nodes-base/credentials/StripeApi.credentials.ts
@@ -17,6 +17,7 @@ export class StripeApi implements ICredentialType {
 			displayName: 'Secret Key',
 			name: 'secretKey',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/SupabaseApi.credentials.ts b/packages/nodes-base/credentials/SupabaseApi.credentials.ts
index e75bcd0211c2a..e565261b63f5c 100644
--- a/packages/nodes-base/credentials/SupabaseApi.credentials.ts
+++ b/packages/nodes-base/credentials/SupabaseApi.credentials.ts
@@ -25,6 +25,9 @@ export class SupabaseApi implements ICredentialType {
 			name: 'serviceRole',
 			type: 'string',
 			default: '',
+			typeOptions: {
+				password: true,
+			},
 		},
 	];
 
diff --git a/packages/nodes-base/credentials/SurveyMonkeyApi.credentials.ts b/packages/nodes-base/credentials/SurveyMonkeyApi.credentials.ts
index 79d0d99052d69..e0e40eca4d7b5 100644
--- a/packages/nodes-base/credentials/SurveyMonkeyApi.credentials.ts
+++ b/packages/nodes-base/credentials/SurveyMonkeyApi.credentials.ts
@@ -34,6 +34,7 @@ export class SurveyMonkeyApi implements ICredentialType {
 			displayName: 'Client Secret',
 			name: 'clientSecret',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/TheHiveApi.credentials.ts b/packages/nodes-base/credentials/TheHiveApi.credentials.ts
index 033b11d9cc205..694cc479676f1 100644
--- a/packages/nodes-base/credentials/TheHiveApi.credentials.ts
+++ b/packages/nodes-base/credentials/TheHiveApi.credentials.ts
@@ -17,6 +17,7 @@ export class TheHiveApi implements ICredentialType {
 			displayName: 'API Key',
 			name: 'ApiKey',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 		},
 		{
@@ -35,14 +36,15 @@ export class TheHiveApi implements ICredentialType {
 			description: 'The version of api to be used',
 			options: [
 				{
-					name: 'Version 1',
+					name: 'TheHive 4+ (api v1)',
 					value: 'v1',
-					description: 'API version supported by TheHive 4',
+					description:
+						'API version with TheHive 4 support, also works with TheHive 5 but not all features are supported',
 				},
 				{
-					name: 'Version 0',
+					name: 'TheHive 3 (api v0)',
 					value: '',
-					description: 'API version supported by TheHive 3',
+					description: 'API version with TheHive 3 support',
 				},
 			],
 		},
diff --git a/packages/nodes-base/credentials/TheHiveProjectApi.credentials.ts b/packages/nodes-base/credentials/TheHiveProjectApi.credentials.ts
new file mode 100644
index 0000000000000..65ced26842ee4
--- /dev/null
+++ b/packages/nodes-base/credentials/TheHiveProjectApi.credentials.ts
@@ -0,0 +1,57 @@
+import type {
+	IAuthenticateGeneric,
+	ICredentialTestRequest,
+	ICredentialType,
+	INodeProperties,
+} from 'n8n-workflow';
+
+export class TheHiveProjectApi implements ICredentialType {
+	name = 'theHiveProjectApi';
+
+	displayName = 'The Hive 5 API';
+
+	documentationUrl = 'theHive';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'API Key',
+			name: 'ApiKey',
+			type: 'string',
+			default: '',
+			typeOptions: {
+				password: true,
+			},
+		},
+		{
+			displayName: 'URL',
+			name: 'url',
+			default: '',
+			type: 'string',
+			description: 'The URL of TheHive instance',
+			placeholder: 'https://localhost:9000',
+		},
+		{
+			displayName: 'Ignore SSL Issues',
+			name: 'allowUnauthorizedCerts',
+			type: 'boolean',
+			description: 'Whether to connect even if SSL certificate validation is not possible',
+			default: false,
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				Authorization: '=Bearer {{$credentials?.ApiKey}}',
+			},
+		},
+	};
+
+	test: ICredentialTestRequest = {
+		request: {
+			baseURL: '={{$credentials?.url}}',
+			url: '/api/case',
+		},
+	};
+}
diff --git a/packages/nodes-base/credentials/TravisCiApi.credentials.ts b/packages/nodes-base/credentials/TravisCiApi.credentials.ts
index 916760275f65d..3a41e063c7ac4 100644
--- a/packages/nodes-base/credentials/TravisCiApi.credentials.ts
+++ b/packages/nodes-base/credentials/TravisCiApi.credentials.ts
@@ -12,6 +12,7 @@ export class TravisCiApi implements ICredentialType {
 			displayName: 'API Token',
 			name: 'apiToken',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/TrellixEpoApi.credentials.ts b/packages/nodes-base/credentials/TrellixEpoApi.credentials.ts
new file mode 100644
index 0000000000000..c4fbab9bdfe78
--- /dev/null
+++ b/packages/nodes-base/credentials/TrellixEpoApi.credentials.ts
@@ -0,0 +1,45 @@
+import type { IAuthenticateGeneric, ICredentialType, INodeProperties } from 'n8n-workflow';
+
+export class TrellixEpoApi implements ICredentialType {
+	name = 'trellixEpoApi';
+
+	displayName = 'Trellix (McAfee) ePolicy Orchestrator API';
+
+	documentationUrl = 'trellixepo';
+
+	icon = 'file:icons/Trellix.svg';
+
+	httpRequestNode = {
+		name: 'Trellix (McAfee) ePolicy Orchestrator',
+		docsUrl: 'https://docs.trellix.com/en/bundle/epolicy-orchestrator-web-api-reference-guide',
+		apiBaseUrl: '',
+	};
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'Username',
+			name: 'username',
+			type: 'string',
+			default: '',
+			required: true,
+		},
+		{
+			displayName: 'Password',
+			name: 'password',
+			type: 'string',
+			typeOptions: { password: true },
+			default: '',
+			required: true,
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			auth: {
+				username: '={{$credentials.username}}',
+				password: '={{$credentials.password}}',
+			},
+		},
+	};
+}
diff --git a/packages/nodes-base/credentials/TrelloApi.credentials.ts b/packages/nodes-base/credentials/TrelloApi.credentials.ts
index 2690d0f5bba84..1623eaa1ac327 100644
--- a/packages/nodes-base/credentials/TrelloApi.credentials.ts
+++ b/packages/nodes-base/credentials/TrelloApi.credentials.ts
@@ -26,6 +26,7 @@ export class TrelloApi implements ICredentialType {
 			displayName: 'API Token',
 			name: 'apiToken',
 			type: 'string',
+			typeOptions: { password: true },
 			required: true,
 			default: '',
 		},
@@ -33,6 +34,7 @@ export class TrelloApi implements ICredentialType {
 			displayName: 'OAuth Secret',
 			name: 'oauthSecret',
 			type: 'hidden',
+			typeOptions: { password: true },
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/TwakeCloudApi.credentials.ts b/packages/nodes-base/credentials/TwakeCloudApi.credentials.ts
index 961d9c70047ec..730b83c49d3af 100644
--- a/packages/nodes-base/credentials/TwakeCloudApi.credentials.ts
+++ b/packages/nodes-base/credentials/TwakeCloudApi.credentials.ts
@@ -17,6 +17,7 @@ export class TwakeCloudApi implements ICredentialType {
 			displayName: 'Workspace Key',
 			name: 'workspaceKey',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/TwakeServerApi.credentials.ts b/packages/nodes-base/credentials/TwakeServerApi.credentials.ts
index 97cd9888f6f46..2738465069d7b 100644
--- a/packages/nodes-base/credentials/TwakeServerApi.credentials.ts
+++ b/packages/nodes-base/credentials/TwakeServerApi.credentials.ts
@@ -5,8 +5,16 @@ export class TwakeServerApi implements ICredentialType {
 
 	displayName = 'Twake Server API';
 
+	icon = 'file:icons/Twake.png';
+
 	documentationUrl = 'twake';
 
+	httpRequestNode = {
+		name: 'Twake Server',
+		docsUrl: 'https://doc.twake.app/developers-api/home',
+		apiBaseUrl: '',
+	};
+
 	properties: INodeProperties[] = [
 		{
 			displayName: 'Host URL',
@@ -24,6 +32,7 @@ export class TwakeServerApi implements ICredentialType {
 			displayName: 'Private API Key',
 			name: 'privateApiKey',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/TwilioApi.credentials.ts b/packages/nodes-base/credentials/TwilioApi.credentials.ts
index f2d884607ae0f..002172c045ec5 100644
--- a/packages/nodes-base/credentials/TwilioApi.credentials.ts
+++ b/packages/nodes-base/credentials/TwilioApi.credentials.ts
@@ -34,6 +34,7 @@ export class TwilioApi implements ICredentialType {
 			displayName: 'Auth Token',
 			name: 'authToken',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 			displayOptions: {
 				show: {
@@ -45,6 +46,7 @@ export class TwilioApi implements ICredentialType {
 			displayName: 'API Key SID',
 			name: 'apiKeySid',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 			displayOptions: {
 				show: {
diff --git a/packages/nodes-base/credentials/TwitterOAuth1Api.credentials.ts b/packages/nodes-base/credentials/TwitterOAuth1Api.credentials.ts
index 5a576c89c7803..218e312be7be7 100644
--- a/packages/nodes-base/credentials/TwitterOAuth1Api.credentials.ts
+++ b/packages/nodes-base/credentials/TwitterOAuth1Api.credentials.ts
@@ -5,7 +5,7 @@ export class TwitterOAuth1Api implements ICredentialType {
 
 	extends = ['oAuth1Api'];
 
-	displayName = 'Twitter OAuth API';
+	displayName = 'X OAuth API';
 
 	documentationUrl = 'twitter';
 
@@ -34,5 +34,12 @@ export class TwitterOAuth1Api implements ICredentialType {
 			type: 'hidden',
 			default: 'HMAC-SHA1',
 		},
+		{
+			displayName:
+				'Some operations requires a Basic or a Pro API for more informations see <a href="https://developer.twitter.com/en/products/twitter-api" target="_blank">X API Docs</a>',
+			name: 'apiPermissioms',
+			type: 'notice',
+			default: '',
+		},
 	];
 }
diff --git a/packages/nodes-base/credentials/TwitterOAuth2Api.credentials.ts b/packages/nodes-base/credentials/TwitterOAuth2Api.credentials.ts
new file mode 100644
index 0000000000000..5850d1409de13
--- /dev/null
+++ b/packages/nodes-base/credentials/TwitterOAuth2Api.credentials.ts
@@ -0,0 +1,73 @@
+import type { ICredentialType, INodeProperties } from 'n8n-workflow';
+
+const scopes = [
+	'tweet.read',
+	'users.read',
+	'tweet.write',
+	'tweet.moderate.write',
+	'users.read',
+	'follows.read',
+	'follows.write',
+	'offline.access',
+	'like.read',
+	'like.write',
+	'dm.write',
+	'dm.read',
+	'list.read',
+	'list.write',
+];
+export class TwitterOAuth2Api implements ICredentialType {
+	name = 'twitterOAuth2Api';
+
+	extends = ['oAuth2Api'];
+
+	displayName = 'X OAuth2 API';
+
+	documentationUrl = 'twitter';
+
+	properties: INodeProperties[] = [
+		{
+			displayName:
+				'Some operations requires a Basic or a Pro API for more informations see <a href="https://developer.twitter.com/en/products/twitter-api" target="_blank">X API Docs</a>',
+			name: 'apiPermissioms',
+			type: 'notice',
+			default: '',
+		},
+		{
+			displayName: 'Grant Type',
+			name: 'grantType',
+			type: 'hidden',
+			default: 'pkce',
+		},
+		{
+			displayName: 'Authorization URL',
+			name: 'authUrl',
+			type: 'hidden',
+			default: 'https://twitter.com/i/oauth2/authorize',
+		},
+		{
+			displayName: 'Access Token URL',
+			name: 'accessTokenUrl',
+			type: 'hidden',
+			default: 'https://api.twitter.com/2/oauth2/token',
+		},
+		{
+			displayName: 'Scope',
+			name: 'scope',
+			type: 'hidden',
+			default: `${scopes.join(' ')}`,
+		},
+		{
+			displayName: 'Auth URI Query Parameters',
+			name: 'authQueryParameters',
+			type: 'hidden',
+			default: '',
+		},
+		{
+			displayName: 'Authentication',
+			name: 'authentication',
+			type: 'hidden',
+			default: 'header',
+		},
+	];
+}
diff --git a/packages/nodes-base/credentials/VenafiTlsProtectCloudApi.credentials.ts b/packages/nodes-base/credentials/VenafiTlsProtectCloudApi.credentials.ts
index b8a6a487183c0..c200acd8f767a 100644
--- a/packages/nodes-base/credentials/VenafiTlsProtectCloudApi.credentials.ts
+++ b/packages/nodes-base/credentials/VenafiTlsProtectCloudApi.credentials.ts
@@ -2,7 +2,7 @@ import type {
 	IAuthenticateGeneric,
 	ICredentialTestRequest,
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class VenafiTlsProtectCloudApi implements ICredentialType {
@@ -12,11 +12,28 @@ export class VenafiTlsProtectCloudApi implements ICredentialType {
 
 	documentationUrl = 'venafitlsprotectcloud';
 
-	properties = [
+	properties: INodeProperties[] = [
+		{
+			displayName: 'Region',
+			name: 'region',
+			type: 'options',
+			options: [
+				{
+					name: 'US',
+					value: 'cloud',
+				},
+				{
+					name: 'EU',
+					value: 'eu',
+				},
+			],
+			default: 'cloud',
+		},
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 		},
 	];
@@ -32,7 +49,7 @@ export class VenafiTlsProtectCloudApi implements ICredentialType {
 
 	test: ICredentialTestRequest = {
 		request: {
-			baseURL: 'https://api.venafi.cloud',
+			baseURL: '=https://api.venafi.{{$credentials.region ?? "cloud"}}',
 			url: '/v1/preferences',
 		},
 	};
diff --git a/packages/nodes-base/credentials/VenafiTlsProtectDatacenterApi.credentials.ts b/packages/nodes-base/credentials/VenafiTlsProtectDatacenterApi.credentials.ts
index 0153628bceacd..b685cf7a45a4b 100644
--- a/packages/nodes-base/credentials/VenafiTlsProtectDatacenterApi.credentials.ts
+++ b/packages/nodes-base/credentials/VenafiTlsProtectDatacenterApi.credentials.ts
@@ -53,6 +53,7 @@ export class VenafiTlsProtectDatacenterApi implements ICredentialType {
 			displayName: 'Access Token',
 			name: 'token',
 			type: 'hidden',
+
 			typeOptions: {
 				expirable: true,
 			},
diff --git a/packages/nodes-base/credentials/VeroApi.credentials.ts b/packages/nodes-base/credentials/VeroApi.credentials.ts
index 9b390196da7e9..b9a86d5948b23 100644
--- a/packages/nodes-base/credentials/VeroApi.credentials.ts
+++ b/packages/nodes-base/credentials/VeroApi.credentials.ts
@@ -12,6 +12,7 @@ export class VeroApi implements ICredentialType {
 			displayName: 'Auth Token',
 			name: 'authToken',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/VirusTotalApi.credentials.ts b/packages/nodes-base/credentials/VirusTotalApi.credentials.ts
new file mode 100644
index 0000000000000..3a69d520f9ade
--- /dev/null
+++ b/packages/nodes-base/credentials/VirusTotalApi.credentials.ts
@@ -0,0 +1,49 @@
+import type {
+	IAuthenticateGeneric,
+	ICredentialTestRequest,
+	ICredentialType,
+	INodeProperties,
+} from 'n8n-workflow';
+
+export class VirusTotalApi implements ICredentialType {
+	name = 'virusTotalApi';
+
+	displayName = 'VirusTotal API';
+
+	documentationUrl = 'virustotal';
+
+	icon = 'file:icons/VirusTotal.svg';
+
+	httpRequestNode = {
+		name: 'VirusTotal',
+		docsUrl: 'https://developers.virustotal.com/reference/overview',
+		apiBaseUrl: 'https://www.virustotal.com/api/v3/',
+	};
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'API Token',
+			name: 'accessToken',
+			type: 'string',
+			typeOptions: { password: true },
+			required: true,
+			default: '',
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				'x-apikey': '={{$credentials.accessToken}}',
+			},
+		},
+	};
+
+	test: ICredentialTestRequest = {
+		request: {
+			baseURL: 'https://www.virustotal.com/api/v3',
+			url: '/popular_threat_categories',
+		},
+	};
+}
diff --git a/packages/nodes-base/credentials/VonageApi.credentials.ts b/packages/nodes-base/credentials/VonageApi.credentials.ts
index 5638a58f3d2a1..13a4f06c05044 100644
--- a/packages/nodes-base/credentials/VonageApi.credentials.ts
+++ b/packages/nodes-base/credentials/VonageApi.credentials.ts
@@ -19,6 +19,7 @@ export class VonageApi implements ICredentialType {
 			displayName: 'API Secret',
 			name: 'apiSecret',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/WekanApi.credentials.ts b/packages/nodes-base/credentials/WekanApi.credentials.ts
index 4745827f3c07a..cac69cdb063e7 100644
--- a/packages/nodes-base/credentials/WekanApi.credentials.ts
+++ b/packages/nodes-base/credentials/WekanApi.credentials.ts
@@ -41,6 +41,7 @@ export class WekanApi implements ICredentialType {
 			displayName: 'Session Token',
 			name: 'token',
 			type: 'hidden',
+
 			typeOptions: {
 				expirable: true,
 			},
diff --git a/packages/nodes-base/credentials/WhatsAppTriggerApi.credentials.ts b/packages/nodes-base/credentials/WhatsAppTriggerApi.credentials.ts
new file mode 100644
index 0000000000000..d339b36a2be48
--- /dev/null
+++ b/packages/nodes-base/credentials/WhatsAppTriggerApi.credentials.ts
@@ -0,0 +1,41 @@
+import type { ICredentialTestRequest, ICredentialType, INodeProperties } from 'n8n-workflow';
+
+export class WhatsAppTriggerApi implements ICredentialType {
+	name = 'whatsAppTriggerApi';
+
+	displayName = 'WhatsApp API';
+
+	documentationUrl = 'whatsApp';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'Client ID',
+			name: 'clientId',
+			type: 'string',
+			default: '',
+			required: true,
+		},
+		{
+			displayName: 'Client Secret',
+			name: 'clientSecret',
+			type: 'string',
+			typeOptions: {
+				password: true,
+			},
+			default: '',
+			required: true,
+		},
+	];
+
+	test: ICredentialTestRequest = {
+		request: {
+			method: 'POST',
+			baseURL: 'https://graph.facebook.com/v19.0/oauth/access_token',
+			body: {
+				client_id: '={{$credentials.clientId}}',
+				client_secret: '={{$credentials.clientSecret}}',
+				grant_type: 'client_credentials',
+			},
+		},
+	};
+}
diff --git a/packages/nodes-base/credentials/WiseApi.credentials.ts b/packages/nodes-base/credentials/WiseApi.credentials.ts
index b9e3a09665e22..314af1e3a5518 100644
--- a/packages/nodes-base/credentials/WiseApi.credentials.ts
+++ b/packages/nodes-base/credentials/WiseApi.credentials.ts
@@ -12,6 +12,7 @@ export class WiseApi implements ICredentialType {
 			displayName: 'API Token',
 			name: 'apiToken',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 		},
 		{
@@ -34,6 +35,7 @@ export class WiseApi implements ICredentialType {
 			displayName: 'Private Key (Optional)',
 			name: 'privateKey',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 			description:
 				'Optional private key used for Strong Customer Authentication (SCA). Only needed to retrieve statements, and execute transfers.',
diff --git a/packages/nodes-base/credentials/WooCommerceApi.credentials.ts b/packages/nodes-base/credentials/WooCommerceApi.credentials.ts
index 0362c3f95448b..4a8352b01ca5e 100644
--- a/packages/nodes-base/credentials/WooCommerceApi.credentials.ts
+++ b/packages/nodes-base/credentials/WooCommerceApi.credentials.ts
@@ -18,12 +18,14 @@ export class WooCommerceApi implements ICredentialType {
 			displayName: 'Consumer Key',
 			name: 'consumerKey',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 		},
 		{
 			displayName: 'Consumer Secret',
 			name: 'consumerSecret',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 		},
 		{
diff --git a/packages/nodes-base/credentials/WordpressApi.credentials.ts b/packages/nodes-base/credentials/WordpressApi.credentials.ts
index 39fa85504e9d7..01f476188481e 100644
--- a/packages/nodes-base/credentials/WordpressApi.credentials.ts
+++ b/packages/nodes-base/credentials/WordpressApi.credentials.ts
@@ -35,6 +35,13 @@ export class WordpressApi implements ICredentialType {
 			default: '',
 			placeholder: 'https://example.com',
 		},
+		{
+			displayName: 'Ignore SSL Issues',
+			name: 'allowUnauthorizedCerts',
+			type: 'boolean',
+			description: 'Whether to connect even if SSL certificate validation is not possible',
+			default: false,
+		},
 	];
 
 	authenticate: IAuthenticateGeneric = {
@@ -52,6 +59,7 @@ export class WordpressApi implements ICredentialType {
 			baseURL: '={{$credentials?.url}}/wp-json/wp/v2',
 			url: '/users',
 			method: 'GET',
+			skipSslCertificateValidation: '={{$credentials.allowUnauthorizedCerts}}',
 		},
 	};
 }
diff --git a/packages/nodes-base/credentials/ZendeskApi.credentials.ts b/packages/nodes-base/credentials/ZendeskApi.credentials.ts
index e08ca52cc5720..fe052b23bf9f9 100644
--- a/packages/nodes-base/credentials/ZendeskApi.credentials.ts
+++ b/packages/nodes-base/credentials/ZendeskApi.credentials.ts
@@ -34,6 +34,9 @@ export class ZendeskApi implements ICredentialType {
 			name: 'apiToken',
 			type: 'string',
 			default: '',
+			typeOptions: {
+				password: true,
+			},
 		},
 	];
 
diff --git a/packages/nodes-base/credentials/ZendeskOAuth2Api.credentials.ts b/packages/nodes-base/credentials/ZendeskOAuth2Api.credentials.ts
index e4e56f37d25c4..788d401f15089 100644
--- a/packages/nodes-base/credentials/ZendeskOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/ZendeskOAuth2Api.credentials.ts
@@ -54,6 +54,7 @@ export class ZendeskOAuth2Api implements ICredentialType {
 			displayName: 'Client Secret',
 			name: 'clientSecret',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 			required: true,
 		},
diff --git a/packages/nodes-base/credentials/ZscalerZiaApi.credentials.ts b/packages/nodes-base/credentials/ZscalerZiaApi.credentials.ts
new file mode 100644
index 0000000000000..bd3260442b643
--- /dev/null
+++ b/packages/nodes-base/credentials/ZscalerZiaApi.credentials.ts
@@ -0,0 +1,146 @@
+import { ApplicationError } from 'n8n-workflow';
+import type {
+	IAuthenticateGeneric,
+	ICredentialDataDecryptedObject,
+	ICredentialTestRequest,
+	ICredentialType,
+	IHttpRequestHelper,
+	INodeProperties,
+} from 'n8n-workflow';
+
+export class ZscalerZiaApi implements ICredentialType {
+	name = 'zscalerZiaApi';
+
+	displayName = 'Zscaler ZIA API';
+
+	documentationUrl = 'zscalerzia';
+
+	icon = 'file:icons/Zscaler.svg';
+
+	httpRequestNode = {
+		name: 'Zscaler ZIA',
+		docsUrl: 'https://help.zscaler.com/zia/getting-started-zia-api',
+		apiBaseUrl: '',
+	};
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'Cookie',
+			name: 'cookie',
+			type: 'hidden',
+			typeOptions: {
+				expirable: true,
+			},
+			default: '',
+		},
+		{
+			displayName: 'Base URL',
+			name: 'baseUrl',
+			type: 'string',
+			default: '',
+			placeholder: 'e.g. zsapi.zscalerthree.net',
+			required: true,
+		},
+		{
+			displayName: 'Username',
+			name: 'username',
+			type: 'string',
+			default: '',
+			required: true,
+		},
+		{
+			displayName: 'Password',
+			name: 'password',
+			type: 'string',
+			typeOptions: { password: true },
+			default: '',
+			required: true,
+		},
+		{
+			displayName: 'Api Key',
+			name: 'apiKey',
+			type: 'string',
+			typeOptions: {
+				password: true,
+			},
+			default: '',
+			required: true,
+		},
+	];
+
+	async preAuthentication(this: IHttpRequestHelper, credentials: ICredentialDataDecryptedObject) {
+		const { baseUrl, username, password, apiKey } = credentials;
+
+		const url = (baseUrl as string).endsWith('/')
+			? (baseUrl as string).slice(0, -1)
+			: (baseUrl as string);
+
+		const now = Date.now().toString();
+
+		const obfuscate = (key: string, timestamp: string) => {
+			const high = timestamp.substring(timestamp.length - 6);
+			let low = (parseInt(high) >> 1).toString();
+
+			let obfuscatedApiKey = '';
+			while (low.length < 6) {
+				low = '0' + low;
+			}
+
+			for (let i = 0; i < high.length; i++) {
+				obfuscatedApiKey += key.charAt(parseInt(high.charAt(i)));
+			}
+			for (let j = 0; j < low.length; j++) {
+				obfuscatedApiKey += key.charAt(parseInt(low.charAt(j)) + 2);
+			}
+
+			return obfuscatedApiKey;
+		};
+
+		const response = await this.helpers.httpRequest({
+			method: 'POST',
+			baseURL: `https://${url}`,
+			url: '/api/v1/authenticatedSession',
+			headers: {
+				'Content-Type': 'application/json',
+				'Cache-Control': 'no-cache',
+			},
+			body: {
+				apiKey: obfuscate(apiKey as string, now),
+				username,
+				password,
+				timestamp: now,
+			},
+			returnFullResponse: true,
+		});
+
+		const headers = response.headers;
+
+		const cookie = (headers['set-cookie'] as string[])
+			?.find((entrt) => entrt.includes('JSESSIONID'))
+			?.split(';')
+			?.find((entry) => entry.includes('JSESSIONID'));
+
+		if (!cookie) {
+			throw new ApplicationError('No cookie returned. Please check your credentials.', {
+				level: 'warning',
+			});
+		}
+
+		return { cookie };
+	}
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				Cookie: '={{$credentials.cookie}}',
+			},
+		},
+	};
+
+	test: ICredentialTestRequest = {
+		request: {
+			url: '=https://{{$credentials.baseUrl}}/api/v1/authSettings/exemptedUrls',
+		},
+	};
+}
diff --git a/packages/nodes-base/credentials/icons/AWS.svg b/packages/nodes-base/credentials/icons/AWS.svg
new file mode 100644
index 0000000000000..760c2530f4568
--- /dev/null
+++ b/packages/nodes-base/credentials/icons/AWS.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" image-rendering="optimizeQuality" shape-rendering="geometricPrecision" text-rendering="geometricPrecision" viewBox="0 0 333334 199332"><defs><style>.fil1{fill:#f90}</style></defs><g id="Layer_x0020_1"><g id="amazon-web-services-2.svg"><path fill="#252f3e" d="M93937 72393c0 4102 443 7428 1219 9867 887 2439 1996 5100 3548 7982 554 887 776 1774 776 2550 0 1109-665 2217-2106 3326l-6985 4656c-998 665-1995 998-2882 998-1109 0-2217-554-3326-1552-1552-1663-2882-3437-3991-5211-1109-1885-2217-3991-3437-6541-8648 10200-19512 15299-32594 15299-9312 0-16740-2661-22172-7982-5432-5322-8204-12417-8204-21286 0-9424 3326-17073 10089-22838s15743-8647 27161-8647c3769 0 7650 332 11752 887 4102 554 8315 1441 12749 2439v-8093c0-8426-1774-14301-5211-17738-3548-3437-9534-5100-18071-5100-3880 0-7871 443-11973 1441s-8093 2217-11973 3769c-1774 776-3104 1219-3880 1441s-1330 332-1774 332c-1552 0-2328-1109-2328-3437v-5432c0-1774 222-3104 776-3880s1552-1552 3104-2328c3880-1996 8537-3659 13969-4989C43606 885 49370 220 55468 220c13193 0 22838 2993 29046 8980 6098 5987 9202 15077 9202 27272v35920h222zM48926 89244c3659 0 7428-665 11419-1995s7539-3769 10532-7095c1774-2106 3104-4435 3770-7095 665-2661 1108-5876 1108-9645v-4656c-3215-776-6652-1441-10199-1885-3548-443-6984-665-10421-665-7428 0-12860 1441-16519 4435-3659 2993-5432 7206-5432 12749 0 5211 1330 9091 4102 11751 2661 2772 6541 4102 11641 4102zm89023 11973c-1996 0-3326-332-4213-1109-887-665-1663-2217-2328-4324l-26053-85697c-665-2217-998-3658-998-4434 0-1774 887-2772 2661-2772h10865c2106 0 3548 333 4324 1109 887 665 1552 2217 2217 4324l18625 73391 17295-73391c554-2217 1219-3659 2106-4324s2439-1109 4435-1109h8869c2106 0 3548 333 4435 1109 887 665 1663 2217 2106 4324l17516 74278 19180-74278c665-2217 1441-3659 2217-4324 887-665 2328-1109 4324-1109h10310c1774 0 2772 887 2772 2772 0 554-111 1109-222 1774s-333 1552-776 2772l-26718 85697c-665 2217-1441 3658-2328 4324-887 665-2328 1109-4213 1109h-9534c-2107 0-3548-333-4435-1109s-1663-2217-2106-4435l-17184-71507-17073 71396c-554 2217-1220 3658-2107 4434s-2439 1109-4434 1109h-9534zm142459 2993c-5765 0-11530-665-17073-1995s-9867-2772-12749-4435c-1774-998-2993-2106-3437-3104-443-998-665-2106-665-3104v-5654c0-2328 887-3437 2550-3437q997.5 0 1995 333c997.5 333 1663 665 2772 1109 3769 1663 7871 2993 12195 3880 4435 887 8758 1330 13193 1330 6984 0 12417-1220 16186-3659s5765-5987 5765-10532c0-3104-998-5654-2993-7760-1996-2107-5765-3991-11197-5765l-16075-4989c-8093-2550-14080-6319-17738-11308-3658-4878-5543-10310-5543-16075 0-4656 998-8758 2993-12306s4656-6652 7982-9091c3326-2550 7095-4434 11530-5765S279190-2 284068-2c2439 0 4989 111 7428 443 2550 333 4878 776 7206 1219 2217 554 4324 1109 6319 1774s3548 1330 4656 1996c1552 887 2661 1774 3326 2771 665 887 998 2107 998 3659v5211c0 2328-887 3548-2550 3548-887 0-2328-444-4213-1331-6319-2882-13415-4324-21286-4324-6319 0-11308 998-14745 3104s-5211 5321-5211 9867c0 3104 1109 5765 3326 7871s6319 4213 12195 6097l15743 4989c7982 2550 13747 6098 17184 10643s5100 9756 5100 15521c0 4767-998 9091-2882 12860-1996 3770-4656 7095-8093 9756-3437 2771-7539 4767-12306 6208-4989 1552-10199 2328-15854 2328z"/><path d="M301362 158091c-36474 26940-89467 41241-135031 41241-63858 0-121395-23614-164854-62859-3437-3104-332-7317 3770-4878 47006 27272 104988 43791 164964 43791 40465 0 84921-8426 125830-25721 6097-2772 11308 3991 5321 8426" class="fil1"/><path d="M316550 140796c-4656-5987-30820-2883-42682-1441-3548 443-4102-2661-887-4989 20842-14634 55099-10421 59090-5543 3991 4989-1109 39246-20620 55653-2993 2550-5876 1220-4545-2106 4435-10976 14301-35698 9645-41574z" class="fil1"/></g></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/credentials/icons/AlienVault.png b/packages/nodes-base/credentials/icons/AlienVault.png
new file mode 100644
index 0000000000000..c3982d6bf2ed7
Binary files /dev/null and b/packages/nodes-base/credentials/icons/AlienVault.png differ
diff --git a/packages/nodes-base/credentials/icons/Auth0.svg b/packages/nodes-base/credentials/icons/Auth0.svg
new file mode 100644
index 0000000000000..75ee017e1a036
--- /dev/null
+++ b/packages/nodes-base/credentials/icons/Auth0.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32"><path d="M29.307 9.932 26.161 0H5.796L2.692 9.932c-1.802 5.75.042 12.271 5.089 16.021L16.01 32l8.208-6.068c5.005-3.75 6.911-10.25 5.089-16.021l-8.214 6.104 3.12 9.938-8.208-6.13-8.208 6.104 3.141-9.911-8.25-6.063 10.177-.063 3.146-9.891 3.141 9.87z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/credentials/icons/Azure.svg b/packages/nodes-base/credentials/icons/Azure.svg
new file mode 100644
index 0000000000000..bbbc6c33b3bcd
--- /dev/null
+++ b/packages/nodes-base/credentials/icons/Azure.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="242" preserveAspectRatio="xMidYMid"><defs><linearGradient id="a" x1="58.972%" x2="37.191%" y1="7.411%" y2="103.762%"><stop offset="0%" stop-color="#114A8B"/><stop offset="100%" stop-color="#0669BC"/></linearGradient><linearGradient id="b" x1="59.719%" x2="52.691%" y1="52.313%" y2="54.864%"><stop offset="0%" stop-opacity=".3"/><stop offset="7.1%" stop-opacity=".2"/><stop offset="32.1%" stop-opacity=".1"/><stop offset="62.3%" stop-opacity=".05"/><stop offset="100%" stop-opacity="0"/></linearGradient><linearGradient id="c" x1="37.279%" x2="62.473%" y1="4.6%" y2="99.979%"><stop offset="0%" stop-color="#3CCBF4"/><stop offset="100%" stop-color="#2892DF"/></linearGradient></defs><path fill="url(#a)" d="M85.343.003h75.753L82.457 233a12.08 12.08 0 0 1-11.442 8.216H12.06A12.06 12.06 0 0 1 .633 225.303L73.898 8.219A12.08 12.08 0 0 1 85.343 0z"/><path fill="#0078D4" d="M195.423 156.282H75.297a5.56 5.56 0 0 0-3.796 9.627l77.19 72.047a12.14 12.14 0 0 0 8.28 3.26h68.02z"/><path fill="url(#b)" d="M85.343.003a11.98 11.98 0 0 0-11.471 8.376L.723 225.105a12.045 12.045 0 0 0 11.37 16.112h60.475a12.93 12.93 0 0 0 9.921-8.437l14.588-42.991 52.105 48.6a12.33 12.33 0 0 0 7.757 2.828h67.766l-29.721-84.935-86.643.02L161.37.003z"/><path fill="url(#c)" d="M182.098 8.207A12.06 12.06 0 0 0 170.67.003H86.245c5.175 0 9.773 3.301 11.428 8.204L170.94 225.3a12.062 12.062 0 0 1-11.428 15.92h84.429a12.062 12.062 0 0 0 11.425-15.92z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/credentials/icons/Cisco.svg b/packages/nodes-base/credentials/icons/Cisco.svg
new file mode 100644
index 0000000000000..66a600af2cedf
--- /dev/null
+++ b/packages/nodes-base/credentials/icons/Cisco.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="216" height="114" fill="#049fd9"><path d="M106.48 76.238c-.282-.077-4.621-1.196-9.232-1.196-8.73 0-13.986 4.714-13.986 11.734 0 6.214 4.397 9.313 9.674 10.98.585.193 1.447.463 2.021.653 2.349.739 4.224 1.837 4.224 3.739 0 2.127-2.167 3.504-6.878 3.504-4.14 0-8.109-1.184-8.945-1.395v8.637c.466.099 5.183 1.025 10.222 1.025 7.248 0 15.539-3.167 15.539-12.595 0-4.573-2.8-8.783-8.947-10.737l-2.613-.832c-1.559-.492-4.342-1.289-4.342-3.574 0-1.805 2.062-3.076 5.859-3.076 3.276 0 7.263 1.101 7.404 1.145zm80.041 18.243c0 5.461-4.183 9.879-9.796 9.879-5.619 0-9.791-4.418-9.791-9.879 0-5.45 4.172-9.87 9.791-9.87 5.613 0 9.796 4.42 9.796 9.87m-9.796-19.427c-11.544 0-19.823 8.707-19.823 19.427 0 10.737 8.279 19.438 19.823 19.438 11.543 0 19.834-8.701 19.834-19.438 0-10.72-8.291-19.427-19.834-19.427M70.561 113.251h-9.472V75.719h9.472"/><path id="a" d="M48.07 76.399c-.89-.264-4.18-1.345-8.636-1.345-11.526 0-19.987 8.218-19.987 19.427 0 12.093 9.34 19.438 19.987 19.438 4.23 0 7.459-1.002 8.636-1.336v-10.075c-.407.226-3.503 1.992-7.957 1.992-6.31 0-10.38-4.441-10.38-10.019 0-5.748 4.246-10.011 10.38-10.011 4.53 0 7.576 1.805 7.957 2.004"/><use xlink:href="#a" transform="translate(98.86)"/><g id="c"><path id="b" d="M61.061 4.759c0-2.587-2.113-4.685-4.703-4.685-2.589 0-4.702 2.098-4.702 4.685v49.84a4.7 4.7 0 0 0 4.702 4.699 4.7 4.7 0 0 0 4.703-4.699zM35.232 22.451c0-2.586-2.112-4.687-4.702-4.687s-4.702 2.101-4.702 4.687v22.785a4.7 4.7 0 0 0 4.702 4.699 4.7 4.7 0 0 0 4.702-4.699zM9.404 35.383c0-2.587-2.112-4.684-4.702-4.684C2.115 30.699 0 32.796 0 35.383v9.853a4.703 4.703 0 0 0 9.404 0"/><use xlink:href="#b" transform="matrix(-1 0 0 1 112.717 0)"/></g><use xlink:href="#c" transform="matrix(-1 0 0 1 216 0)"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/credentials/icons/CrowdStrike.svg b/packages/nodes-base/credentials/icons/CrowdStrike.svg
new file mode 100644
index 0000000000000..8db5558b7bd33
--- /dev/null
+++ b/packages/nodes-base/credentials/icons/CrowdStrike.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="2500" height="1675" viewBox="-0.3 3.8 900.3 599.8"><g fill="#da1b1b"><path d="M59 5.5C59 7.2 71.6 32.7 73.1 34c.3.3 1.6 2.3 2.9 4.5s3.5 5.1 4.7 6.5c1.3 1.4 2.3 2.8 2.3 3.1s.9 1.7 2.1 3c1.1 1.3 4.4 5.1 7.2 8.4 12.9 15 31.5 32.4 51.2 47.8.6.4 2.1 1.6 3.4 2.7s2.7 2 3 2 1.8 1 3.1 2.2c3.6 3.2 7.2 5.7 26.1 18.3 17.5 11.6 17.8 11.9 24.9 16.1 2.5 1.5 5.1 3.4 5.8 4.1s1.8 1.3 2.3 1.3c.7 0 10.8 5.7 15.9 9 .8.6 2.6 1.6 4 2.2 3.6 1.8 23.6 13.9 29.5 17.9 17 11.4 38.5 30.9 45 40.6 2.7 4.1 4.5 5.4 4.5 3.2 0-1.3-4.1-8.8-5.7-10.7-.7-.7-1.3-1.8-1.3-2.3 0-1.1-6-10.9-7.8-12.8-.7-.8-2.1-2.6-3-4-2.7-4.1-6-7.8-16.2-18.1-12.3-12.2-13.7-13.3-31-26.2-8-5.9-14.9-11.1-15.5-11.6-.5-.4-2.8-1.9-5-3.2s-4.2-2.7-4.5-3-2.3-1.7-4.5-3-8.5-5.3-14-8.9c-11.1-7.3-13-8.5-16.2-10.2-1.3-.7-2.3-1.6-2.3-2.1 0-.4-.5-.8-1-.8-.6 0-3-1.4-5.3-3.1-3.9-2.8-15.9-11.3-20-14.1-1.1-.7-2.8-2.1-3.9-3.1-1.2-.9-2.4-1.7-2.7-1.7s-1.7-1-3.1-2.3c-1.4-1.2-5.3-4.4-8.7-7s-6.8-5.3-7.5-6-3.8-3.2-6.8-5.6C112.1 57 68.1 14.8 63.7 8.3 61.8 5.5 59 3.8 59 5.5"/><path d="M152.8 23.6c-.8.8.3 4.4 1.3 4.4.5 0 .9.5.9 1.2 0 1.5 7.2 15.9 8.8 17.6.6.7 1.2 1.7 1.2 2.2 0 1.3 8.6 13.7 12.8 18.4 10 11.2 28.2 28.1 35.2 32.7 1.4.9 3.9 2.9 5.5 4.3 1.7 1.5 4.8 3.9 7 5.4s4.9 3.5 5.9 4.4c1.1 1 3.8 3 6 4.5 2.3 1.6 5 3.6 6 4.5 1.1 1 3.8 3 6 4.5 2.3 1.5 4.3 3 4.6 3.3s3.7 3 7.5 6c3.9 3 7.5 5.9 8.1 6.5.6.5 4.6 4.1 8.9 8 14.6 13.1 25.8 25.3 32.6 35.5 6.6 10 9.2 14.4 15.1 25.8 3.1 6.2 7.7 14.4 10 18.3 2.4 3.9 5.4 8.9 6.7 11.2s3 4.8 3.8 5.5c.7.7 1.3 1.8 1.3 2.3s.5 1.5 1 2.2c.6.7 5.3 7.7 10.6 15.7 16.9 25.6 40.1 46 62.9 55.1 10.8 4.3 33.4 6 63 4.7 20.6-.8 44.2-.2 48.3 1.3 1.3.5 4.2.9 6.5.9 2.3.1 6 .7 8.2 1.5s4.9 1.5 6 1.5 3.3.7 4.9 1.5c1.5.8 3.5 1.5 4.3 1.5 1.6 0 7.1 2.4 19.8 8.6 18.3 9.1 33.1 19.9 48.7 35.6 10.4 10.5 10.8 10.8 11.4 8.2.8-3.1-.2-13.7-1.5-16.1-.5-1-2-4.1-3.3-6.8-2.5-5.6-7.2-12.3-14.2-20.4-2.7-3.3-4.6-6.5-4.6-7.9 0-4.1-3.9-10.5-8.5-13.9-5.8-4.3-23.6-13.3-26.3-13.3-.5 0-2.3-.7-3.8-1.5-1.6-.8-3.7-1.5-4.7-1.5-.9 0-2.5-.4-3.5-.9-.9-.5-5.1-1.9-9.2-3.1-13.7-4.1-22.5-7.2-25.6-9.1-3.3-2-6.4-7.2-6.4-10.7 0-2.6 3.8-14.4 5-15.6.6-.6 1-1.7 1-2.5 0-.9.6-2.8 1.4-4.3.8-1.4 1.9-5.8 2.6-9.7 3.3-19.4-7.2-31.8-41-48.7-4.5-2.2-12.7-5.9-16.5-7.5-1.1-.4-4.1-1.7-6.7-2.8-2.6-1.2-5.4-2.1-6.2-2.1s-1.8-.5-2.1-1c-.3-.6-1.3-1-2.2-1-.8 0-2.9-.6-4.6-1.4-1.8-.8-10.4-3.8-19.2-6.6-8.8-2.9-16.7-5.6-17.6-6-.9-.5-3.4-1.2-5.5-1.6-2.2-.3-4.3-1-4.9-1.4-.5-.4-2.6-1.1-4.5-1.4-1.9-.4-4.4-1.1-5.5-1.6-1.1-.4-4-1.3-6.5-2-2.5-.6-6.3-1.6-8.5-2.1-2.2-.6-4.9-1.5-6-1.9-1.1-.5-3.6-1.2-5.5-1.6-1.9-.3-4.1-1-5-1.4-.8-.4-4.9-1.8-9-3s-8.2-2.5-9-2.9c-.9-.5-3.1-1.2-5-1.6s-3.9-1-4.5-1.4c-.5-.4-4.4-1.8-8.5-3.1-4.1-1.2-7.9-2.6-8.5-3-.5-.4-3.9-1.7-7.5-3s-6.9-2.7-7.4-3.2c-.6-.4-1.6-.8-2.4-.8-2 0-11.4-4.3-35.2-15.9-16.7-8.2-32.1-16.6-35.5-19.3-.5-.4-4.6-3.1-9-6s-8.4-5.6-9-6c-.5-.4-5.2-3.9-10.4-7.8-18.1-13.5-44.4-38.8-55.5-53.5-2.1-2.8-3.9-5.1-4-5.3-.2-.1-.5.1-.8.4m447.2 303c10.2 3.4 13.5 6 15.9 12.1 2.4 5.9-1.6 7.3-6.5 2.2-1.6-1.7-4.5-4-6.4-5.2s-4.1-2.7-4.8-3.4-1.9-1.3-2.7-1.3c-1.3 0-2.5-2.1-2.5-4.6 0-1.8 1.4-1.8 7 .2M81 86.6c0 1.1 8.5 17.9 10 19.7.6.7 2.7 3.4 4.7 6.2 7.3 9.8 18.7 21.5 33.9 34.5 3.8 3.3 14.2 11.1 17.5 13.2 1.4.9 3.2 2.3 4 3 .8.8 3.2 2.5 5.4 3.8s4.2 2.7 4.5 3c.6.8 30.1 18.3 39.5 23.5 7.4 4.2 15.4 8.2 43.5 21.9 16.5 8.1 19.6 9.7 31.7 17 9.1 5.5 23.7 16.9 31 24.2 4.1 4.1 7.6 7.4 7.8 7.4.3 0-.1-1.1-.7-2.5s-1.5-2.5-2-2.5c-.4 0-.8-.6-.8-1.3 0-.8-.9-2.5-2-3.8s-2.3-2.9-2.7-3.4c-7.3-9.6-13.3-15.4-31.7-31-2.5-2.2-19-13.4-26.7-18.2-6.1-3.9-18.4-10.8-30.9-17.5-3-1.7-5.9-3.4-6.5-3.8-.9-.7-5.2-3-19.5-10.8-9-4.8-31.8-18.9-35.5-21.9-.5-.5-2.8-2-5-3.3s-4.4-2.8-5-3.2c-.5-.4-5.9-4.4-12-8.9-6-4.5-11.2-8.5-11.5-8.8-.3-.4-2.7-2.4-5.5-4.5-5.6-4.2-12.8-10.8-26.2-24-5.1-5-9.3-8.6-9.3-8m113.6 179.1c-1 1 15.8 16.6 26.9 24.9 5.5 4.1 10.5 7.8 11 8.2 2.6 2 11.6 7.2 12.4 7.2.5 0 1.6.6 2.3 1.2.7.7 2.9 2 4.8 3 13.3 6.3 19 8.8 20.4 8.8.8 0 1.7.4 2 .8.8 1.3 32.3 11.2 35.8 11.2 1 0 2.6.4 3.6 1 .9.5 3.7 1.4 6.2 1.9 8.7 1.9 13.5 3.1 15.5 4 1.1.5 5.4 1.9 9.5 3.2s7.9 2.6 8.5 3.1c.5.4 1.5.8 2.3.8s2.8.6 4.5 1.4c16.4 7.1 20.8 8.8 21.4 8.3.3-.4-.7-1.7-2.3-2.9-2.5-2-6.9-5.9-16.4-14.8-1.5-1.4-4.2-3.8-6-5.4-5-4.3-26-19.9-30.5-22.6-2.2-1.3-4.2-2.7-4.5-3-.3-.4-1.2-1-2-1.4s-4.2-2.2-7.5-4.1c-6.2-3.6-18.9-9.9-26-12.9-2.2-.9-4.7-2.1-5.5-2.5-.9-.5-3-1.2-4.8-1.5-1.7-.4-3.4-1.2-3.7-1.7-.4-.5-1.6-.9-2.8-.9-2.2.1-2.2.1-.2 1.2 1.1.6 2.2 1.4 2.5 1.8.3.3 2.5 1.8 5 3.3 5.3 3.1 15 11.7 15 13.3 0 .6-.7 1.7-1.5 2.4-1.2 1-4.1.9-14.5-.4-7.2-.9-14.1-2.1-15.3-2.6-1.2-.4-4.7-1.6-7.7-2.5-15.6-4.7-47-22.1-56.1-31-.9-.8-1.9-1.2-2.3-.8"/><path d="M365.5 317.3c18.7 17.2 66.6 66.1 69.6 70.9 1.2 1.8-.2 3.8-2.5 3.8-1.1-.1-3.9-.9-6.1-2s-4.3-1.9-4.7-2c-1.3 0-11.2-6.3-13.8-8.7-3-2.8-4.6-3-2.8-.4 2.9 4.2 17.4 18.5 26.5 26.3 4.1 3.5 15 11 18.7 12.8 6 3 6.6 3.5 6.6 5.4 0 1.7-.5 1.8-5.5 1.2-3-.3-5.5-.3-5.5.2 0 .7 5.9 3.6 13 6.3 5.2 2.1 19.7 1.8 23.8-.4 1.8-1 4.3-1.7 5.4-1.5 2.2.3 2.4.6 5.5 7.3 3.8 8.2 12.6 19.5 15.1 19.5.5 0 1.5.6 2.1 1.4 1.2 1.4 14.9 5.1 15.7 4.3.3-.3-1.6-2.1-4.1-4.1-7-5.3-10.4-10.3-10.5-15.2 0-5.3 2.2-9.6 6.8-13.2 6.7-5.1 10.8-6.5 20.6-6.6 8 0 9.6.2 13.1 2.4 2.2 1.3 4.6 3.1 5.3 4 1.9 2.3 5.2 9.9 5.2 12.1 0 3.4 1.9 2 2.6-1.9 1.4-7.6 1-15.8-.9-18-2.7-3-10-4.9-21.2-5.7-19.1-1.2-28.8-4.4-37.4-12.2-8.9-8-8.5-8.9 4.2-9.5 9-.5 16.7-2.1 23.2-4.8 1.1-.5 4.3-1.9 7-3 2.8-1.2 8.6-3.9 13-6 16.8-8 27.1-10.4 44.3-10.4 12.5 0 15.8-.7 11.2-2.1-1.1-.3-2-1.1-2-1.6s-.4-.9-.9-.9c-.8 0-9.4-5.2-12.7-7.7-1.5-1.2-7.1-4.2-14.9-8-3.8-1.9-7.8-3.9-8.7-4.4-1-.5-2.2-.9-2.7-.9s-2.2-.5-3.8-1.2c-4.1-1.7-10.8-3.6-18.8-5.5-10.2-2.4-48.5-2.3-65.5 0-25.3 3.5-29.7 3.9-41.5 3.4-12.1-.5-16.5-1.3-28.5-4.9-7.3-2.2-8.6-2.7-15.1-5.7-2.5-1.1-4.9-2.1-5.2-2.1-.4 0-3.6-1.8-7.2-4s-6.8-4-7-4c-.5 0-8.9-5.7-14.1-9.7-6.8-5.1-4.3-1.7 5.1 7M29.4 523.9c-5.8 1.5-12.9 5.5-17.6 9.9C7.3 538 2 547 2 550.4c0 .8-.4 1.8-1 2.1-1.2.8-1.3 19.2-.1 19.9.4.3 1.1 2.1 1.4 4 1.5 9.1 13.7 21.7 24.2 24.9 6.1 1.9 21 2.3 22 .7.3-.5 1.5-1 2.6-1 4 0 15.9-7.3 15.9-9.7 0-2-1.9-1.6-5.4 1-1.7 1.3-4.7 3.1-6.6 4-4 1.9-15.8 4.7-17.4 4.2-.6-.2-3.6-.9-6.7-1.5-13.8-2.7-24.7-14.9-26.9-30-2.2-15.6 3.8-29.8 15.8-37.4 4.5-2.8 13.7-5.6 18.5-5.6 5.3 0 15.6 2.9 19.9 5.6 3.9 2.5 6.8 3.1 6.8 1.4 0-1.3-7-5.7-12.2-7.5-5.1-1.8-19-2.8-23.4-1.6m177.1-.3c-12.9 3.4-22.8 10.9-27.9 21.4-.9 1.9-2.3 6.7-3.2 10.6-1.3 6.4-1.3 8 .1 14.5.9 4.1 2.5 9.4 3.7 11.8 4 8.2 16.9 19.1 22.8 19.1 1 0 2.2.4 2.5 1 .8 1.3 17.2 1.3 18 0 .3-.6 1.5-1 2.6-1 6 0 19.7-11.4 23.3-19.3 4.6-10 5.5-20.1 2.7-30.5-1.4-5.1-2.5-7.3-7.1-13.2-5.1-6.6-5.5-6.9-18.3-13.2-2.1-1-16.3-1.9-19.2-1.2m16.3 4c10.7 3.1 18.7 10.1 23.8 20.9 1.5 3.1 1.9 6.2 1.9 14.5 0 9.5-.3 11.1-2.8 16.1-3.2 6.4-10.5 14.2-15.8 16.9-2 1.1-6.5 2.6-10.1 3.4-5.8 1.3-7.1 1.3-12.4 0-3.2-.8-7.4-2.2-9.3-3.1-5.3-2.4-13.4-11.1-16.6-17.8-2.6-5.4-2.9-7-2.9-16 0-9.4.2-10.3 3.3-16 1.8-3.3 4.3-7.1 5.4-8.3 4.1-4.4 11.3-9.1 15.6-10.1 2.3-.5 4.5-1.2 4.8-1.5 1.2-1.2 9.6-.6 15.1 1m277.6-2.3c-2.8 1.4-6 3.7-7.2 5.3s-2.6 3.4-3.1 4c-1.5 1.8-2.3 9.1-1.6 13.5.8 4.7 6.6 11.2 12.5 14.1 1.9.9 7 3.3 11.3 5.3s8.6 4.4 9.5 5.3c2.9 2.9 5.2 7 5.2 9.2 0 1.9-2.2 6.2-4.5 8.6-1.9 2-7.8 4.4-10.9 4.4-5.2 0-15.6-4.4-17.7-7.4-1.1-1.4-3.4-.1-5.8 3.2l-2.1 3 4.9 3.1c2.7 1.6 6.5 3.3 8.5 3.7 2 .3 3.9 1 4.2 1.5.7 1.2 15.1 1.2 15.9 0 .3-.5 1.8-1.2 3.4-1.6 5.3-1.2 11.4-8.3 12.6-14.9 2-10.3-2.9-18.3-14.3-23.6-15-7.1-17.2-8.3-20.6-11.6-4-3.9-4.4-6.4-2-11.2 2.3-4.7 6.9-7.5 13.1-8 4.5-.4 6.3 0 11.9 2.8 3.6 1.7 6.7 3 6.8 2.8.2-.1 1.1-1.7 1.9-3.4 1.5-2.9 1.5-3.3-.1-4.6-4.1-3.5-8.9-5-17.7-5.5-8-.4-9.6-.1-14.1 2m-399.6-.6c-1.7.4-1.8 3.1-1.8 38.4 0 35.2.1 38 1.7 37.7 1.5-.3 1.6-1.9 1.4-16-.2-14.8-.1-15.7 1.8-16.7 2.1-1.2 18.5-1.4 21.3-.3.9.4 2.9 2.9 4.4 5.7 3.4 6.2 9.5 17.6 12.5 23.2 2.2 4.2 5.9 6 5.9 2.8 0-.8-.4-1.5-.9-1.5s-1.4-1.2-2-2.8c-.6-1.5-3.1-6.3-5.6-10.7s-5-9.2-5.6-10.8c-.6-1.5-1.5-2.7-2-2.7s-.9-1.1-.9-2.5c0-1.8.7-2.8 2.4-3.5 7.3-2.7 12-10.5 12-20 0-5.3-.5-7.3-2.6-10.5-3.4-5.4-5.9-7.5-10.5-8.8-3.9-1.1-28.4-1.9-31.5-1m34.4 6.6c6 4.6 8.2 11.3 6.2 18.9-1.5 6-6.4 11.4-11.7 12.9-4.8 1.4-25 1.2-26.5-.3-1.7-1.7-1.7-31.9 0-33.6.8-.8 5.5-1.2 14.4-1.2h13.2zm184.9-3.2c-1.1 2.2-2.2 5.4-2.6 7.2-.3 1.8-1 4.1-1.5 5.2-.4 1.1-1.3 4-2 6.5-.6 2.5-1.7 6.7-2.5 9.5-3.1 11-4.7 17.2-5.7 21.5-.5 2.5-1.4 4.9-1.9 5.4-.5.6-.9 2-.9 3.2 0 1.3-.5 3.5-1.1 5.1l-1.1 2.8-2.4-2.8c-1.3-1.5-2.4-4-2.4-5.5s-.5-4.3-1.1-6.2-1.7-6-2.4-9c-.8-3-2.1-8.2-3-11.5-1.6-6-3.5-13.5-5.9-23-.7-2.8-1.6-5.8-1.9-6.8-.4-.9-.9-2.4-1.2-3.2-.7-2.4-2.5-1.7-2.5.9 0 1.3.9 5.2 2 8.6s2 7.1 2 8.1c0 1.1.4 2.7 1 3.7.5.9 1.4 3.9 2 6.7 2.6 11.2 3.5 15 4.1 16 .4.5.9 2.8 1.3 5s1.1 5.3 1.6 7c.6 1.6 2 6.5 3.2 10.7 1.6 5.7 2.6 7.8 3.8 7.8 2.5 0 4.7-3 5.5-7.5.4-2.2 1-4.5 1.5-5 .4-.6 1.2-3 1.8-5.5s1.7-7 2.6-10c.8-3 2-7.5 2.6-10s1.5-5.2 1.9-6c.5-.9 1.2-3.6 1.6-6s1.1-5.1 1.6-6c.4-.8 1.1-3.6 1.4-6.2.7-5.3 1.6-6.4 4.2-4.9 1.1.6 2.2 3.2 2.9 7.3 1.3 7.1 3.2 14.3 4.4 17.3.5 1.1 1.4 4 2 6.5s1.8 7 2.6 10c.9 3 2 7.3 2.5 9.5s1.4 4.9 1.9 6c.6 1.1 1.3 3.8 1.8 6 .7 3.5 1.2 4 3.8 4.3 2.8.3 3 0 4.1-4.5.6-2.6 1.9-7.4 2.7-10.5.9-3.2 2.3-8.3 3.1-11.3 1.5-5.4 2.9-10.6 6.1-22.3.8-3.1 2-7.7 2.5-10.2s1.4-5.2 1.9-6.1c1.5-2.8 2.3-10.9 1.1-10.9-1.7 0-4.2 7.1-7.2 21-.6 2.5-1.4 5.4-1.9 6.5s-1.3 4-1.9 6.5c-.5 2.5-1.7 7-2.5 10s-2.1 8-2.9 11c-2.2 8.5-4.1 13.5-5.1 13.5s-3.2-5.5-5.3-13.5c-.8-3-2-7.8-2.8-10.5-.7-2.8-1.9-7-2.5-9.5s-1.5-5.4-2-6.5c-.8-2-2.3-7.5-4.2-15.5-.6-2.5-1.4-5-1.8-5.5-.4-.6-1.1-2.4-1.4-4.2-1.1-4.8-3.3-4.9-5.5-.2m81.2-3.4-2.3.4v76.1l19.3-.4c17.7-.4 19.5-.6 23.7-2.7 4.7-2.5 15-12.3 15-14.4 0-.7.8-2.6 1.7-4.2 1.4-2.4 1.7-5.6 1.7-16 .1-15.2-1.2-19.2-9.1-27.6-5.5-5.9-10.4-8.5-19.3-10.5-6-1.3-25.3-1.7-30.7-.7m35.2 5.2c12.7 4.5 21.5 18 21.5 33.1s-8.2 28.3-20.7 33.3c-6 2.4-29.6 3.7-33.1 1.8-2.2-1.2-2.2-1.3-2.2-34.4 0-24.6.3-33.6 1.2-34.5.8-.8 5.5-1.2 14.5-1.2 10.6 0 14.5.4 18.8 1.9m118.3-2.9c-.2 1.6 0 3.4.6 4s6.2 1 13.2 1c10.2 0 12.3.3 12.8 1.6.3.9.6 16.4.6 34.5v33l4.6-.3 4.6-.3-.1-33c-.1-18.2.2-33.5.7-34.2.5-.8 4.9-1.3 13.7-1.5l13-.3v-7l-31.6-.3-31.7-.2zm88 34.7c-.2 24.4.1 38.1.7 38.5s2.7.8 4.8.8h3.7v-13.6c0-7.4.5-14.4 1-15.5.9-1.6 2.2-1.9 9-1.9h7.9l2.6 3.7c1.4 2.1 2.5 4.3 2.5 4.9 0 .7.3 1.4.8 1.6.4.1 2.6 4.1 5 8.8 6 11.9 6.1 12 11.6 12 2.5 0 4.6-.4 4.6-1 0-.5-1.4-3.3-3.1-6.2s-3.4-6-3.9-6.8-2.5-4.6-4.5-8.5c-2-3.8-4.1-7.3-4.7-7.6-1.2-.8-.1-4.9 1.3-4.9.5 0 2.6-1.6 4.8-3.5 4.1-3.7 7.1-10.7 7.1-16.6 0-4.9-3.2-12.7-6.5-15.8-5.4-5-10.3-6.1-28.3-6.1H643zm34-28c4.8 2.8 7.2 7.2 7.2 13.3 0 6.4-2.5 10.8-7.8 13.6-4.6 2.5-21.7 2.8-23.2.4-1.1-1.6-1.3-23.1-.4-26.8.6-2.1 1.1-2.2 10.9-2.2 7.9 0 11 .4 13.3 1.7m49.9-9c-.4.3-.7 17.7-.7 38.5V601h10v-77h-4.3c-2.4 0-4.7.3-5 .7m44.3-.2V600c0 1 4.9 1.4 7.2.5 1-.4 1.2-3.9 1-16.6-.2-11.4 0-16.4.9-17.5 1.2-1.5 10.5-2 12.5-.6 1.3.9 10.4 15.9 10.4 17.2 0 .5.6 1.5 1.3 2.2.8.7 2 2.5 2.8 4 .8 1.4 2.5 4.7 3.8 7.2 2.4 4.5 2.6 4.6 7.2 4.6 5.2 0 6.7-1.1 4.5-3.2-.7-.8-1.7-2.4-2-3.6-.4-1.2-1.1-2.2-1.6-2.2-.4 0-1.3-1.2-1.9-2.8-.7-1.5-1.7-3.6-2.4-4.7s-3.4-5.8-6.2-10.3c-8.7-14.4-8.5-12-1.9-23 3.2-5.3 6.1-9.9 6.6-10 .4-.2.8-.9.8-1.5s2-4.1 4.5-7.8 4.5-7 4.5-7.3-2.1-.6-4.8-.6c-3.5 0-5.2.5-6.5 2-.9 1.1-1.7 2.3-1.7 2.6 0 1.1-7.3 12.9-8.2 13.2-.4.2-.8.9-.8 1.5 0 .7-1.8 4-4 7.4l-3.9 6.3h-5.5c-9.1 0-8.6.9-8.6-17.1V524h-4c-2.2 0-4 .2-4 .5m81 38V601h48v-7h-18.3c-12.9 0-18.7-.4-19.5-1.2s-1.2-5-1.2-12.4c0-14.9-.4-14.5 15.3-14.3 11.5.1 12.1 0 12.9-2 1.7-4.6.5-5.1-13.3-5.1-11.7 0-12.9-.2-13.9-1.9-1.2-2.3-1.4-22-.2-23.8.6-.9 5.6-1.3 17.2-1.5l16.5-.3.3-3.8.3-3.7H852z"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/credentials/icons/F5.svg b/packages/nodes-base/credentials/icons/F5.svg
new file mode 100644
index 0000000000000..f693eb822c197
--- /dev/null
+++ b/packages/nodes-base/credentials/icons/F5.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="100" height="100" viewBox="0 0 1000 1000"><defs><style>.svg-red{fill:#e4002b}.svg-white{fill:#fff}</style></defs><g id="F5Logo"><path d="M940.4 894.5a30.9 30.9 0 0 1 9.4 23 32.4 32.4 0 0 1-55.4 23 32 32 0 0 1-9.4-23 32.5 32.5 0 0 1 32.4-32.6 30.9 30.9 0 0 1 23 9.6m3.8-3.7a36.6 36.6 0 0 0-26.8-11 37.7 37.7 0 1 0 26.8 64.3 37.7 37.7 0 0 0 0-53.4ZM923 915.7a18.8 18.8 0 0 1-7 .9h-6.5v-15h6.3c4 0 7 .5 8.7 1.5s2.8 3.1 2.8 6a6.4 6.4 0 0 1-4.3 6.5Zm-20.8 22.2h7.3v-16.2h5.8c3.8 0 6.6.4 8.1 1.3 2.6 1.6 3.9 4.7 3.9 9.5v3.3l.1 1.3a3 3 0 0 1 .1.5c0 .2.1.3.2.3h6.8l-.2-.4a4.4 4.4 0 0 1-.4-2.1v-6.1a11.5 11.5 0 0 0-2.4-6.5c-1.5-2.2-3.9-3.5-7.1-4.1a17 17 0 0 0 6-2c2.7-1.8 4-4.6 4-8.2 0-5.2-2-8.7-6.4-10.5-2.4-1-6.1-1.5-11.3-1.5h-14.5Z" class="svg-red"/><path d="M958.6 620.3c2.7-53.3-7.2-110.8-53.6-162.8-47.7-51.4-128.2-95-293.7-105.2 8.6-26.8 16.1-51.4 24-76.5 99 3.5 187.1 10.6 262 20.3 6-26.8 9.2-53 15.3-78.4q-11.4-16.7-24.2-32.4c-35.6-4.2-71.2-13-109.4-18a1995 1995 0 0 0-164.4-14.1 85384 85384 0 0 0-130.1 390.5C730.7 565 825.5 631.4 820 725c-5 50.6-51.1 96.5-112 102-72.2 4.9-105.3-24.4-127-56.4a9595 9595 0 0 1-58.7-89c-5.5-9.2-12.8-3.2-19.4 3.2a9738 9738 0 0 1-43.9 42.3c-9.4 8.2-7.3 15.3-4 22.2a8042 8042 0 0 0 39.6 91.8c21.5 13.2 122.9 31.2 198.7 25.6A336.7 336.7 0 0 0 862 802.5c52.5-40.7 90.7-95.5 96.6-182.2" class="svg-white"/><path d="M97.3 796.3q14.2 19.3 30.2 37.1a2114 2114 0 0 0 302 29.2l-1-34.5c-67.9-3.8-99.1-14.2-104.5-27.6-4.6-10.7-5.4-26.7-6.3-42.4a5199 5199 0 0 1-5-330.5c38-.7 75.8-1 115.5-1.5 19.2-8.7 37.3-17.4 56.5-26l.1-39.3c-58.8.2-114.6 1.2-170.6 2.8 1.6-47.7 3.5-91.6 6.3-134.5 2-28.2 21.5-48.8 41.6-50.4 32.3-1.3 61.2 11.6 89.3 24 15.4 7.5 30.7 15 46.5 23 7.6 2 16.6 3.8 22-2.7 9.4-11.2 18.3-21.5 27.5-32.3 5-7.4 2.9-11.6.8-14.3a2834 2834 0 0 0-58.2-44.6c-11.8-8-30.5-9.7-49-9.7-7.3 0-14.6.2-21.5.4-18.9 1-43 4-82.4 13.7-88.8 23.9-195.4 85.8-206.7 187a1982 1982 0 0 0-3.7 49.9c-25.1 2-48 3.9-69.5 6a1557 1557 0 0 0-3.5 57.6c21.8-1.3 44.6-2.5 70-3.6-3.8 106.2-.3 212.1 9.7 310.3 1.7 14.9 3.3 29.7 1.4 39.2-1.6 9.1-16.3 13.9-37.5 13.7" class="svg-white"/><path d="M912.7 217.7c-6.2 25.3-9.4 51.6-15.3 78.4-75-9.7-163-16.8-262-20.3-8 25-15.5 49.7-24 76.5 165.5 10.2 246 53.8 293.7 105.2 46.4 52 56.2 109.5 53.5 162.8-6 86.7-44.1 141.5-96.6 182.1-53 40-117.3 59.8-168.7 64.2-75.7 5.6-177-12.4-198.6-25.6a7418 7418 0 0 1-39.6-91.8c-3.3-6.9-5.4-14 4-22.2a9738 9738 0 0 0 43.9-42.3c6.6-6.4 13.9-12.4 19.4-3.2 20.4 31.4 39.5 60.3 58.6 89 21.7 32 54.8 61.3 127.2 56.4 60.7-5.4 107-51.4 111.9-102 5.3-93.6-89.4-160-335.7-181.3C531.7 401 577.8 263 614.6 153.3c58.5 2.7 112.6 7.5 164.4 14.2 38.2 4.8 73.8 13.7 109.4 17.8A500 500 0 0 0 0 500a497.6 497.6 0 0 0 97.3 296.3c21.2.2 35.9-4.6 37.5-13.7 1.9-9.6.3-24.3-1.4-39.2-10-98.2-13.5-204.1-9.8-310.3a4430 4430 0 0 0-70 3.6c1-19.7 2-38.3 3.6-57.6 21.6-2.1 44.4-4 69.5-6 1-17 2.2-33.3 3.7-49.8C141.7 222 248.3 160 337.1 136.2a435.4 435.4 0 0 1 82.4-13.6c6.9-.3 14.2-.5 21.6-.5 18.4 0 37 1.7 48.9 9.7 19.2 14.4 38 28.7 58.2 44.6 2 2.7 4.2 7-.8 14.3L520 223c-5.4 6.5-14.4 4.8-22 2.8-15.8-8.1-31-15.6-46.5-23-28-12.5-57-25.4-89.3-24-20.1 1.5-39.6 22.1-41.6 50.3-2.8 42.9-4.7 86.8-6.3 134.5 56-1.6 111.8-2.6 170.7-2.9l-.1 39.4c-19.2 8.6-37.3 17.3-56.6 26-39.7.5-77.5.8-115.5 1.5a5178 5178 0 0 0 5 330.5c1 15.7 1.8 31.7 6.3 42.3 5.4 13.5 36.6 23.8 104.6 27.7l1 34.4a2112.6 2112.6 0 0 1-302-29A500 500 0 0 0 1000 500a497.6 497.6 0 0 0-87.3-282.4ZM127.5 833.4" class="svg-red"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/credentials/icons/Fortinet.svg b/packages/nodes-base/credentials/icons/Fortinet.svg
new file mode 100644
index 0000000000000..9b0e4aadc2d28
--- /dev/null
+++ b/packages/nodes-base/credentials/icons/Fortinet.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="1537" height="1101" version="1.2"><path fill-rule="evenodd" d="M.2 408.6h434.5v285.8H.2zM554.9 2.3h426.8v285.8H554.9zm0 811h426.8v285.8H554.9zm545.4-404.7h436v285.8h-436zM434.7 2.3v287.3H.2v-32.4C17.2 127.4 88 25.4 178.9 2.3zm1.6 811v285.8H168.2C81.9 1071.3 15.7 972.4.3 848.8v-35.5zm1100-526.8h-436V.7h257.3c90.9 24.7 161.8 126.7 178.7 254.9zm-436 814.1V814.9h436v35.5c-16.9 123.6-83.2 220.9-167.9 250.2z" style="fill:#ee3124"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/credentials/icons/Google.svg b/packages/nodes-base/credentials/icons/Google.svg
new file mode 100644
index 0000000000000..38f3c22592e39
--- /dev/null
+++ b/packages/nodes-base/credentials/icons/Google.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 48 48"><defs><path id="a" d="M44.5 20H24v8.5h11.8C34.7 33.9 30.1 37 24 37c-7.2 0-13-5.8-13-13s5.8-13 13-13c3.1 0 5.9 1.1 8.1 2.9l6.4-6.4C34.6 4.1 29.6 2 24 2 11.8 2 2 11.8 2 24s9.8 22 22 22c11 0 21-8 21-22 0-1.3-.2-2.7-.5-4"/></defs><clipPath id="b"><use xlink:href="#a" overflow="visible"/></clipPath><path fill="#FBBC05" d="M0 37V11l17 13z" clip-path="url(#b)"/><path fill="#EA4335" d="m0 11 17 13 7-6.1L48 14V0H0z" clip-path="url(#b)"/><path fill="#34A853" d="m0 37 30-23 7.9 1L48 0v48H0z" clip-path="url(#b)"/><path fill="#4285F4" d="M48 48 17 24l-4-3 35-10z" clip-path="url(#b)"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/credentials/icons/Hybrid.png b/packages/nodes-base/credentials/icons/Hybrid.png
new file mode 100644
index 0000000000000..f7d4695e4b7af
Binary files /dev/null and b/packages/nodes-base/credentials/icons/Hybrid.png differ
diff --git a/packages/nodes-base/credentials/icons/IBM.svg b/packages/nodes-base/credentials/icons/IBM.svg
new file mode 100644
index 0000000000000..0e5ac9ec259ed
--- /dev/null
+++ b/packages/nodes-base/credentials/icons/IBM.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="1000" height="401.149"><path fill="#1F70C1" d="M0 373.217h194.433v27.833H0zm0-53.387h194.433v27.931H0zm55.468-53.289h83.399v27.932H55.468zm0-53.288h83.399v27.932H55.468zm0-53.289h83.399v27.932H55.468zm0-53.387h83.399v27.932H55.468zM0 53.288h194.433V81.22H0zM0 0h194.433v27.932H0zm222.167 347.761h299.029a99.2 99.2 0 0 0 11.094-27.932H222.167zM497.92 213.253H277.734v27.932h243.463c-6.34-10.698-14.165-20.107-23.277-27.932m-220.186-53.289v27.932H497.92c9.311-7.825 17.135-17.235 23.277-27.932zM521.197 53.288h-299.03V81.22H532.29c-2.575-9.905-6.339-19.314-11.093-27.932M429.279 0H222.167v27.932h278.526A105.15 105.15 0 0 0 429.279 0M277.734 106.577h83.3v27.932h-83.3zm166.699 27.932h87.163c2.476-8.914 3.764-18.324 3.764-27.932h-90.927zM277.734 266.541h83.3v27.932h-83.3zm166.699 0v27.932h90.927c0-9.608-1.288-19.017-3.764-27.932zM222.167 400.852l207.112.297c27.734 0 52.793-10.697 71.513-27.932H222.167zm333.4-27.635h138.866v27.833H555.567zm0-53.387h138.866v27.931H555.567zm55.467-53.289h83.399v27.932h-83.399zm0-53.288h83.399v27.932h-83.399zM733.063 53.288H555.567V81.22H742.67zM714.639 0H555.567v27.932h168.68zm146.395 373.217H1000v27.833H861.034zm0-53.387H1000v27.931H861.034zm0-53.289h83.399v27.932h-83.399zm0-53.288h83.399v27.932h-83.399zm0-25.357h83.399v-27.932H785.559l-7.825 22.584-7.825-22.584H611.034v27.932h83.399v-25.654l8.816 25.654h148.97l8.815-25.654zm83.399-81.319H803.982l-9.608 27.932h150.059zM840.927 0l-9.608 27.932H1000V0zm-63.193 400.852 9.607-27.635h-19.215zm-18.423-53.091h36.846l9.905-27.931h-56.557zm-18.721-53.288h74.287l9.806-27.932h-93.899zm-18.621-53.288h111.628l9.509-27.932H712.361zM611.034 134.509h150.059l-9.607-27.932H611.034zM812.896 81.22H1000V53.288H822.405z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/credentials/icons/Imperva.svg b/packages/nodes-base/credentials/icons/Imperva.svg
new file mode 100644
index 0000000000000..f8521cb9be7a9
--- /dev/null
+++ b/packages/nodes-base/credentials/icons/Imperva.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="500" height="500"><path d="M26.463.803c3.4 0 5.5 2.4 5.5 6.2v10.9h-4.6v-9.9c0-1.8-.8-3-2.4-3-1.2 0-2.3.8-2.6 2.2v10.8h-4.7v-9.9c0-1.8-.8-3-2.4-3-1.2 0-2.3.8-2.6 2.2v10.8h-4.6v-17h4.6v1.4c.8-1 2.4-1.8 4.2-1.8 2 0 3.6.9 4.5 2.1 1.1-1.1 2.7-2 5.1-2m-21.5 17.1h-4.6v-16.8h4.6Z" style="fill:#235ae6;fill-opacity:1" transform="translate(14.32 159.549)scale(14.58168)"/><path d="M4.963-5.697h-4.6v4.6h4.6Z" style="fill:#000;fill-opacity:1" transform="translate(14.32 159.549)scale(14.58168)"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/credentials/icons/Kibana.svg b/packages/nodes-base/credentials/icons/Kibana.svg
new file mode 100644
index 0000000000000..6f80f7e66d7c9
--- /dev/null
+++ b/packages/nodes-base/credentials/icons/Kibana.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="328" preserveAspectRatio="xMidYMid"><path fill="#F04E98" d="M256 0H0v294.79z"/><path fill="#343741" d="M0 122.88v171.91l122.194-140.71C85.862 134.277 44.288 122.88 0 122.88"/><path fill="#00BFB3" d="M148.59 170.54 23.2 314.945l-11.069 12.738h238.736C237.77 263.13 200.302 207.496 148.59 170.54"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/credentials/Microsoft.svg b/packages/nodes-base/credentials/icons/Microsoft.svg
similarity index 100%
rename from packages/nodes-base/credentials/Microsoft.svg
rename to packages/nodes-base/credentials/icons/Microsoft.svg
diff --git a/packages/nodes-base/credentials/icons/Mist.svg b/packages/nodes-base/credentials/icons/Mist.svg
new file mode 100644
index 0000000000000..e52b2447136b5
--- /dev/null
+++ b/packages/nodes-base/credentials/icons/Mist.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="490" height="490" viewBox="0 0 129.646 129.646"><g transform="translate(-162.276 -145.042)scale(1.74896)"><rect width="11.223" height="11.133" x="115.572" y="122.463" ry="1.257" style="fill:#1963ae;fill-opacity:1;stroke-width:.264583"/><rect width="11.223" height="11.133" x="133.731" y="122.463" ry="1.257" style="fill:#1963ae;fill-opacity:1;stroke-width:.264583"/><rect width="11.223" height="11.133" x="151.059" y="122.463" ry="1.257" style="fill:#1963ae;fill-opacity:1;stroke-width:.264583"/><rect width="11.223" height="11.133" x="151.059" y="106.033" ry="1.257" style="fill:#1963ae;fill-opacity:1;stroke-width:.264583"/><rect width="11.223" height="11.133" x="133.731" y="106.033" ry="1.257" style="fill:#1963ae;fill-opacity:1;stroke-width:.264583"/><rect width="11.223" height="11.133" x="151.059" y="89.962" ry="1.257" style="fill:#1963ae;fill-opacity:1;stroke-width:.264583"/><rect width="11.223" height="11.133" x="97.414" y="138.893" ry="1.257" style="fill:#1963ae;fill-opacity:1;stroke-width:.264583"/><rect width="11.223" height="11.133" x="115.572" y="138.893" ry="1.257" style="fill:#1963ae;fill-opacity:1;stroke-width:.264583"/><rect width="11.223" height="11.133" x="133.731" y="138.893" ry="1.257" style="fill:#1963ae;fill-opacity:1;stroke-width:.264583"/><rect width="11.223" height="11.133" x="151.059" y="138.893" ry="1.257" style="fill:#1963ae;fill-opacity:1;stroke-width:.264583"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/credentials/icons/Okta.svg b/packages/nodes-base/credentials/icons/Okta.svg
new file mode 100644
index 0000000000000..a7f2ff4ca8703
--- /dev/null
+++ b/packages/nodes-base/credentials/icons/Okta.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" preserveAspectRatio="xMidYMid"><path d="m140.844 1.778-5.266 64.853a66 66 0 0 0-7.542-.427c-3.203 0-6.334.214-9.393.712l-2.99-31.432a1.72 1.72 0 0 1 1.709-1.848h5.337l-2.562-31.787C120.066.853 120.848 0 121.774 0h17.434c.996 0 1.779.853 1.636 1.849zm-43.976 3.2c-.285-.925-1.281-1.494-2.206-1.138L78.295 9.813c-.925.356-1.352 1.423-.925 2.276l13.307 29.013-5.052 1.85c-.926.355-1.352 1.421-.926 2.275l13.592 28.515a61 61 0 0 1 15.868-6.044L96.94 4.978zM56.734 23.04l37.643 53.049c-4.768 3.129-9.108 6.827-12.809 11.093L59.011 64.996a1.72 1.72 0 0 1 .071-2.49l4.127-3.413L40.794 36.41c-.711-.711-.64-1.849.142-2.489l13.307-11.164c.783-.64 1.85-.498 2.42.284zM25.139 53.76c-.783-.569-1.921-.284-2.42.569l-8.68 15.075c-.499.854-.143 1.92.71 2.347L43.64 85.404l-2.704 4.623c-.498.853-.142 1.99.783 2.346l28.749 13.156a60.2 60.2 0 0 1 8.254-14.791zM3.862 94.72c.143-.996 1.139-1.564 2.064-1.351l62.976 16.427a62.3 62.3 0 0 0-2.704 16.782l-31.524-2.56a1.642 1.642 0 0 1-1.494-1.991l.925-5.263-31.808-2.986c-.996-.071-1.637-.996-1.495-1.991l2.99-17.138zm-2.348 42.524c-.996.072-1.637.996-1.494 1.992l3.06 17.137c.142.996 1.138 1.565 2.063 1.351l30.883-8.035.925 5.262c.143.996 1.139 1.565 2.064 1.351l30.456-8.39c-1.779-5.263-2.917-10.88-3.202-16.64l-64.826 5.972zM11.62 182.33c-.498-.853-.143-1.92.711-2.347l58.778-27.875c2.206 5.262 5.195 10.169 8.753 14.577L54.1 185.031c-.783.569-1.921.356-2.42-.498l-2.704-4.693-26.257 18.133c-.783.57-1.922.285-2.42-.569l-8.752-15.075zm71.23-12.231L37.094 216.39c-.712.711-.64 1.849.142 2.489l13.378 11.164c.783.64 1.85.498 2.42-.284l18.501-26.027 4.127 3.485c.783.64 1.922.498 2.49-.356l17.933-26.026c-4.839-2.987-9.322-6.614-13.165-10.738zm-9.037 74.31c-.925-.355-1.352-1.421-.925-2.275L100 182.97c4.98 2.56 10.389 4.48 16.01 5.547l-7.97 30.577c-.213.925-1.28 1.494-2.205 1.138l-5.052-1.849-8.468 30.791c-.285.925-1.281 1.494-2.206 1.138l-16.367-5.973zm46.68-55.11-5.265 64.853c-.071.996.711 1.849 1.637 1.849h17.434c.996 0 1.779-.853 1.636-1.849l-2.561-31.787h5.336a1.72 1.72 0 0 0 1.708-1.848l-2.988-31.432c-3.06.498-6.191.712-9.393.712-2.562 0-5.053-.143-7.543-.498m62.763-175.574c.427-.924 0-1.92-.925-2.275l-16.366-5.973c-.926-.356-1.922.213-2.206 1.137l-8.468 30.791-5.053-1.848c-.925-.356-1.921.213-2.206 1.137l-7.97 30.578c5.693 1.138 11.03 3.058 16.011 5.547zm35.722 25.814L173.222 85.83a62 62 0 0 0-13.165-10.738l17.933-26.026c.569-.783 1.707-.996 2.49-.356l4.127 3.485 18.502-26.027c.57-.782 1.708-.925 2.42-.285l13.377 11.165c.783.64.783 1.778.143 2.489zm24.764 36.409c.925-.427 1.21-1.494.711-2.347L235.7 58.524c-.498-.853-1.637-1.066-2.42-.568l-26.257 18.133-2.704-4.622c-.499-.854-1.637-1.138-2.42-.498l-25.76 18.347c3.558 4.408 6.476 9.315 8.753 14.577l58.778-27.875zm9.25 23.609 2.99 17.137c.142.996-.499 1.85-1.495 1.991l-64.826 6.045c-.285-5.831-1.424-11.378-3.203-16.64l30.457-8.391c.925-.285 1.921.355 2.063 1.35l.925 5.263 30.884-8.035c.925-.214 1.92.355 2.063 1.35zm-2.917 62.933c.925.213 1.921-.356 2.064-1.351L255.126 144c.143-.996-.498-1.849-1.494-1.991l-31.808-2.987.925-5.262c.142-.996-.498-1.849-1.495-1.991l-31.523-2.56a62.3 62.3 0 0 1-2.704 16.782l62.976 16.427zM233.28 201.6c-.498.853-1.636 1.067-2.419.569l-53.583-36.978a60.2 60.2 0 0 0 8.254-14.791l28.749 13.156c.925.426 1.28 1.493.783 2.346l-2.704 4.622 28.89 13.654c.854.426 1.21 1.493.712 2.346zm-71.657-21.831 37.643 53.049c.57.782 1.708.924 2.42.284l13.306-11.164c.783-.64.783-1.778.143-2.49l-22.415-22.684 4.127-3.413c.783-.64.783-1.778.07-2.489l-22.557-22.186c-3.771 4.266-8.04 8.035-12.808 11.093zm-.356 72.249c-.925.355-1.921-.214-2.206-1.138l-17.22-62.72a61 61 0 0 0 15.868-6.044l13.592 28.515c.426.925 0 1.991-.926 2.276l-5.052 1.849 13.307 29.013c.427.924 0 1.92-.925 2.275l-16.367 5.974z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/credentials/icons/OpenCTI.png b/packages/nodes-base/credentials/icons/OpenCTI.png
new file mode 100644
index 0000000000000..0a85e2ff10d86
Binary files /dev/null and b/packages/nodes-base/credentials/icons/OpenCTI.png differ
diff --git a/packages/nodes-base/credentials/icons/Qualys.svg b/packages/nodes-base/credentials/icons/Qualys.svg
new file mode 100644
index 0000000000000..4e6f36e88303f
--- /dev/null
+++ b/packages/nodes-base/credentials/icons/Qualys.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="1271" height="1512" version="1.2"><path d="M634.9 0c413.6 0 621.5 221.1 621.5 221.1s23.8 163.7 8.6 493.3c-22.9 497.9-629.9 796.9-630 797 0 0-607-299.1-629.9-797-15.2-329.6 8.6-493.3 8.6-493.3S221.4 0 634.9 0" style="fill:#ed2e26"/><path d="M556 997.1c100.4 52.7 250.3 91.2 408.6 111.6-26.3 39.2-96.6 106.2-137.7 128.9-189.5-31.1-356-96.7-469.9-195-121.7-105.2-186.1-242.4-186.1-396.9-.4-123.3 48.3-241.6 135.4-329 87.1-87.3 205.4-136.4 328.7-136.4 123.4 0 241.7 49.1 328.8 136.4 87 87.4 135.7 205.7 135.3 329 0 34.2-3.9 68.2-11.6 101.5-7.8 33.3-19.3 65.6-34.4 96.2-15.1 30.7-33.6 59.5-55.3 85.9-21.6 26.5-46.2 50.4-73.3 71.2-74.2-6.8-151.8-27.8-187-47.9 90.6-57.8 208.2-170.2 208.2-306.9 0-40.8-8.1-81.1-23.7-118.8-15.7-37.6-38.6-71.8-67.4-100.6-28.8-28.9-63.1-51.7-100.7-67.4-37.7-15.6-78.1-23.6-118.9-23.7-171.1 0-310.4 143.2-310.4 319.3 0 146.8 77.9 262.1 231.4 342.6" style="fill:#fff"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/credentials/icons/RecordedFuture.svg b/packages/nodes-base/credentials/icons/RecordedFuture.svg
new file mode 100644
index 0000000000000..6e8e317fc3691
--- /dev/null
+++ b/packages/nodes-base/credentials/icons/RecordedFuture.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="500" height="500" viewBox="0 0 132.292 132.292"><path d="M66.135 8.34c-3.958-.001-7.198 3.774-7.167 7.14.098 10.542 0 17.702.097 26.403.038 3.365 3.208 7.14 7.166 7.14s7.165-3.774 7.167-7.14c.007-10.653-.153-16.587-.096-26.403.02-3.366-3.209-7.141-7.167-7.14M40.107 23.262c-3.958 0-7.199 3.774-7.167 7.14.098 10.543 0 62.784.097 71.485.038 3.366 3.208 7.14 7.166 7.141 3.958 0 7.165-3.775 7.167-7.14.007-10.653-.153-61.67-.096-71.486.02-3.366-3.209-7.14-7.167-7.14m52.055 0c-3.958 0-7.199 3.775-7.167 7.14.098 10.543 0 62.784.097 71.485.038 3.366 3.208 7.14 7.166 7.141 3.958 0 7.165-3.775 7.167-7.14.006-10.653-.153-61.67-.096-71.486.02-3.365-3.208-7.14-7.166-7.14zM14.128 57.057a9.09 9.09 0 0 0-9.088 9.089 9.09 9.09 0 0 0 9.088 9.088 9.09 9.09 0 0 0 9.088-9.088 9.09 9.09 0 0 0-9.088-9.089m52.055 0a9.09 9.09 0 0 0-9.088 9.089 9.09 9.09 0 0 0 9.088 9.088 9.09 9.09 0 0 0 9.088-9.088 9.09 9.09 0 0 0-9.088-9.089m51.98 0a9.09 9.09 0 0 0-9.088 9.089 9.09 9.09 0 0 0 9.089 9.088 9.09 9.09 0 0 0 9.088-9.088 9.09 9.09 0 0 0-9.088-9.089M66.136 83.268c-3.958 0-7.198 3.775-7.167 7.141.098 10.543 0 17.702.097 26.403.038 3.365 3.208 7.14 7.166 7.14s7.165-3.774 7.167-7.14c.007-10.652-.153-16.586-.096-26.403.02-3.366-3.209-7.14-7.167-7.14" style="fill:#000;fill-opacity:1;stroke-width:.556055"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/credentials/icons/Sekoia.svg b/packages/nodes-base/credentials/icons/Sekoia.svg
new file mode 100644
index 0000000000000..a60aa68d6aad0
--- /dev/null
+++ b/packages/nodes-base/credentials/icons/Sekoia.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="500" height="500" fill="none"><path fill="#0a083b" fill-rule="evenodd" d="M250.055 25A225 225 0 0 0 29.317 293.862a225 225 0 0 0 176.767 176.81 225 225 0 0 0 230.993-95.663A225 225 0 0 0 475 250 225.223 225.223 0 0 0 250.055 25m0 408.67a183.723 183.723 0 0 1-129.894-313.658 183.72 183.72 0 0 1 200.24-39.791A183.72 183.72 0 0 1 433.78 250a183.89 183.89 0 0 1-183.725 183.835zm-11.38-268.74a100 100 0 0 1 126.267 12.437 100.004 100.004 0 0 1 12.436 126.268 100.01 100.01 0 0 1-102.656 42.522 100 100 0 0 1-78.569-78.57 100 100 0 0 1 5.69-57.778 100 100 0 0 1 36.832-44.879m22.977 131.906a58.64 58.64 0 0 0 32.58 9.884 58.695 58.695 0 0 0 58.641-58.642 58.641 58.641 0 1 0-91.222 48.759M128.847 167.308h44.23V330.77h-44.23z" clip-rule="evenodd" style="stroke-width:1.125"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/credentials/icons/Shuffler.svg b/packages/nodes-base/credentials/icons/Shuffler.svg
new file mode 100644
index 0000000000000..3b9e38c30a18f
--- /dev/null
+++ b/packages/nodes-base/credentials/icons/Shuffler.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="22" height="22" fill="none"><path fill="#FF8444" d="M0 0v13.391h4.4V4.465H22V0zm17.6 8.609v8.926H0V22h22V8.609z"/><path fill="#FF8444" d="M13.392 8.609H8.609v4.782h4.783z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/credentials/icons/Trellix.svg b/packages/nodes-base/credentials/icons/Trellix.svg
new file mode 100644
index 0000000000000..f29fab8980b02
--- /dev/null
+++ b/packages/nodes-base/credentials/icons/Trellix.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 260.12 218.23"><defs><linearGradient id="a" x1="0" x2="260.12" y1="107.61" y2="107.61" gradientUnits="userSpaceOnUse"><stop offset=".07" stop-color="#3600ff"/><stop offset=".12" stop-color="#2e17ff"/><stop offset=".25" stop-color="#1a54ff"/><stop offset=".36" stop-color="#0c7fff"/><stop offset=".45" stop-color="#039aff"/><stop offset=".5" stop-color="#00a5ff"/><stop offset="1" stop-color="#00d300"/></linearGradient></defs><path d="M91.97 215.22H0L168.15 0h91.97z" style="fill:url(#a)"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/credentials/icons/Twake.png b/packages/nodes-base/credentials/icons/Twake.png
new file mode 100644
index 0000000000000..3afce345b12ce
Binary files /dev/null and b/packages/nodes-base/credentials/icons/Twake.png differ
diff --git a/packages/nodes-base/credentials/icons/VirusTotal.svg b/packages/nodes-base/credentials/icons/VirusTotal.svg
new file mode 100644
index 0000000000000..3a19c2937b870
--- /dev/null
+++ b/packages/nodes-base/credentials/icons/VirusTotal.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="165.097 116 268.436 236.784"><path fill="#3b61ff" d="M286.982 234.392 165.097 352.784h268.436V116H165.097zm122.007 94.714H221.852l100.41-95.305-97.71-94.12h184.437z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/credentials/icons/Wazuh.png b/packages/nodes-base/credentials/icons/Wazuh.png
new file mode 100644
index 0000000000000..1254166bab570
Binary files /dev/null and b/packages/nodes-base/credentials/icons/Wazuh.png differ
diff --git a/packages/nodes-base/credentials/icons/Zscaler.svg b/packages/nodes-base/credentials/icons/Zscaler.svg
new file mode 100644
index 0000000000000..97469741f50a9
--- /dev/null
+++ b/packages/nodes-base/credentials/icons/Zscaler.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="1570" height="974" version="1.2"><path fill-rule="evenodd" d="M1566.1 496.2c25.3 155.6-109.7 243.2-246.6 253.3-87.1 179.3-394.3 300.2-660 169.8-113.2 17.2-176.3-11.3-224.4-65.6C532 728.4 826.7 503 1186.7 619.6c192.4 62 242.3-84 193.9-138.7-181.4-206-591-20.6-605.5-5.1 160.8-246.4 736.2-315.4 791 20.4m-551.3-283c.9 0-130.9-47-315 32.6q-2.8-1-5.5-2.1-2.8-1.1-5.5-2.2-2.8-1.2-5.5-2.5t-5.3-2.6c177.2-117.7 332.4-167.7 465.4-148.3-80.6-92.4-466.9-160.5-688.3 61.5C181.5 95.7-10.1 327.7.8 539.6c10.9 211.8 242.1 344.1 373.8 308q1.1-.1 2.3-.2h4.7l2.4.2c29.4-139.9 148.2-465.7 630.8-634.4" style="fill:#236bf5"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/credentials/icons/jwt.svg b/packages/nodes-base/credentials/icons/jwt.svg
new file mode 100644
index 0000000000000..f29c89d2bdd77
--- /dev/null
+++ b/packages/nodes-base/credentials/icons/jwt.svg
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="200px"
+   height="200px"
+   viewBox="0 0 200 200"
+   version="1.1"
+   id="svg10"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <!-- Generator: Sketch 3.3.2 (12043) - http://www.bohemiancoding.com/sketch -->
+  <title
+     id="title1">Group</title>
+  <desc
+     id="desc1">Created with Sketch.</desc>
+  <defs
+     id="defs1">
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter11"
+       x="-0.18346753"
+       y="-0.076523014"
+       width="1.3669351"
+       height="1.153046">
+      <feGaussianBlur
+         stdDeviation="1.2230926"
+         id="feGaussianBlur11" />
+    </filter>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter12"
+       x="-0.18346753"
+       y="-0.076523014"
+       width="1.3669351"
+       height="1.153046">
+      <feGaussianBlur
+         stdDeviation="1.2230926"
+         id="feGaussianBlur12" />
+    </filter>
+  </defs>
+  <g
+     id="layer1" />
+  <g
+     transform="translate(57.626456,48.948311)"
+     id="Shape-6">
+    <g
+       id="g12"
+       transform="matrix(1.8791546,0,0,1.8791546,-51.584186,-42.862227)">
+      <path
+         d="M 42.223544,27.435493 V -0.303311 H 58.223226 V 27.435493 L 50.223385,38.05668 Z"
+         fill="#ffffff"
+         id="path11"
+         style="fill:#ececec;stroke-width:1.04876;filter:url(#filter12)" />
+      <path
+         d="M 57.5,26.9 V 0 h -15 V 26.9 L 50,37.2 Z"
+         fill="#ffffff"
+         id="path1-7" />
+      <path
+         d="M 42.223544,72.517876 V 100.25668 H 58.223226 V 72.517876 L 50.223385,61.896689 Z"
+         fill="#ffffff"
+         id="path10"
+         style="fill:#ececec;stroke-width:1.04876;filter:url(#filter11)" />
+      <path
+         d="m 42.623319,73.156936 v 26.900004 h 15 V 73.156936 l -7.5,-10.3 z"
+         fill="#ffffff"
+         id="path2-5" />
+      <path
+         d="M 57.5,73.1 73.3,94.9 85.5,86 69.6,64.3 57.5,60.3 Z"
+         fill="#00f2e6"
+         id="path3-3" />
+      <path
+         d="M 42.5,26.9 26.7,5.1 14.5,14 l 15.9,21.7 12.1,4 z"
+         fill="#00f2e6"
+         id="path4-5" />
+      <path
+         d="M 30.4,35.7 4.8,27.4 0.1,41.7 25.7,50 37.9,46.1 Z"
+         fill="#00b9f1"
+         id="path5-6" />
+      <path
+         d="M 62.1,53.9 69.6,64.3 95.2,72.6 99.9,58.3 74.3,50 Z"
+         fill="#00b9f1"
+         id="path6-2" />
+      <path
+         d="M 74.3,50 99.9,41.7 95.2,27.4 69.6,35.7 62.1,46.1 Z"
+         fill="#d63aff"
+         id="path7-9" />
+      <path
+         d="M 25.7,50 0.1,58.3 4.8,72.6 30.4,64.3 37.9,53.9 Z"
+         fill="#d63aff"
+         id="path8-1" />
+      <path
+         d="M 30.4,64.3 14.5,86 26.7,94.9 42.5,73.1 V 60.3 Z"
+         fill="#fb015b"
+         id="path9-2" />
+      <path
+         d="M 69.6,35.7 85.5,14 73.3,5.1 57.5,26.9 v 12.8 z"
+         fill="#fb015b"
+         id="path10-7" />
+    </g>
+  </g>
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:title>Group</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+</svg>
diff --git a/packages/nodes-base/credentials/icons/vmware.svg b/packages/nodes-base/credentials/icons/vmware.svg
new file mode 100644
index 0000000000000..20b525da40d86
--- /dev/null
+++ b/packages/nodes-base/credentials/icons/vmware.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="800" height="800" viewBox="0 0 32 32"><path d="M32 16.77v-2.933c0-2.482-2.482-3.835-4.512-3.835a6.75 6.75 0 0 0-3.836 1.579 5.07 5.07 0 0 0-3.61-1.58 5.94 5.94 0 0 0-3.835 1.58 3.82 3.82 0 0 0-3.384-1.58 3.49 3.49 0 0 0-3.341 1.822l-2.976 6.752L3.2 11.001a1.67 1.67 0 0 0-2.188-.866 1.67 1.67 0 0 0-.86 2.235l4.097 8.912s.677 1.58 2.03 1.58a1.91 1.91 0 0 0 2.031-1.128c.312-.47 2.681-5.45 4.108-8.47a.568.568 0 0 1 1.081.244v7.487a1.846 1.846 0 0 0 1.685 1.863 1.805 1.805 0 0 0 1.925-1.801v-6.205a1.918 1.918 0 0 1 3.835 0v6.205a1.805 1.805 0 0 0 3.61 0v-6.205a1.918 1.918 0 0 1 3.836 0v6.205a1.805 1.805 0 0 0 3.61 0Z"/><path d="M0 0h32v32H0z" data-name="&lt;Transparent Rectangle&gt;" style="fill:none"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/gulpfile.js b/packages/nodes-base/gulpfile.js
deleted file mode 100644
index 312fc4d465f0b..0000000000000
--- a/packages/nodes-base/gulpfile.js
+++ /dev/null
@@ -1,111 +0,0 @@
-const {
-	existsSync,
-	promises: { writeFile },
-} = require('fs');
-const path = require('path');
-const { task, src, dest } = require('gulp');
-
-const ALLOWED_HEADER_KEYS = ['displayName', 'description'];
-const PURPLE_ANSI_COLOR_CODE = 35;
-
-task('build:icons', copyIcons);
-
-function copyIcons() {
-	src('nodes/**/*.{png,svg}').pipe(dest('dist/nodes'));
-
-	return src('credentials/**/*.{png,svg}').pipe(dest('dist/credentials'));
-}
-
-task('build:translations', writeHeaders);
-
-/**
- * Write node translation headers to single file at `/dist/nodes/headers.js`.
- */
-function writeHeaders(done) {
-	const { N8N_DEFAULT_LOCALE: locale } = process.env;
-
-	log(`Default locale set to: ${colorize(PURPLE_ANSI_COLOR_CODE, locale || 'en')}`);
-
-	if (!locale || locale === 'en') {
-		log('No translation required - Skipping translations build...');
-		return done();
-	}
-
-	const nodeTranslationPaths = getNodeTranslationPaths();
-	const headers = getHeaders(nodeTranslationPaths);
-	const headersDistPath = path.join(__dirname, 'dist', 'nodes', 'headers.js');
-
-	writeDistFile(headers, headersDistPath);
-
-	log('Headers file written to:');
-	log(headersDistPath, { bulletpoint: true });
-
-	done();
-}
-
-function getNodeTranslationPaths() {
-	const nodeDistPaths = require('./package.json').n8n.nodes;
-	const { N8N_DEFAULT_LOCALE: locale } = process.env;
-
-	return nodeDistPaths.reduce((acc, cur) => {
-		const nodeTranslationPath = path.join(
-			__dirname,
-			cur.split('/').slice(1, -1).join('/'),
-			'translations',
-			locale,
-			toTranslationFile(cur),
-		);
-
-		if (existsSync(nodeTranslationPath)) {
-			acc.push(nodeTranslationPath);
-		}
-
-		return acc;
-	}, []);
-}
-
-function getHeaders(nodeTranslationPaths) {
-	return nodeTranslationPaths.reduce((acc, cur) => {
-		const { header } = require(cur);
-		const nodeType = cur.split('/').pop().replace('.json', '');
-
-		if (isValidHeader(header, ALLOWED_HEADER_KEYS)) {
-			acc[nodeType] = header;
-		}
-
-		return acc;
-	}, {});
-}
-
-// ----------------------------------
-//             helpers
-// ----------------------------------
-
-function toTranslationFile(distPath) {
-	const raw = distPath.split('/').pop().replace('.node', '') + 'on';
-	return raw.charAt(0).toLowerCase() + raw.slice(1);
-}
-
-function isValidHeader(header, allowedHeaderKeys) {
-	if (!header) return false;
-
-	const headerKeys = Object.keys(header);
-
-	return headerKeys.length > 0 && headerKeys.every((key) => allowedHeaderKeys.includes(key));
-}
-
-function writeDistFile(data, distPath) {
-	writeFile(distPath, `module.exports = ${JSON.stringify(data, null, 2)}`);
-}
-
-const log = (string, { bulletpoint } = { bulletpoint: false }) => {
-	if (bulletpoint) {
-		process.stdout.write(colorize(PURPLE_ANSI_COLOR_CODE, `- ${string}\n`));
-		return;
-	}
-
-	process.stdout.write(`${string}\n`);
-};
-
-const colorize = (ansiColorCode, string) =>
-	['\033[', ansiColorCode, 'm', string, '\033[0m'].join('');
diff --git a/packages/nodes-base/jest.config.js b/packages/nodes-base/jest.config.js
index 54696ffb30b28..61e5f7302dff3 100644
--- a/packages/nodes-base/jest.config.js
+++ b/packages/nodes-base/jest.config.js
@@ -2,4 +2,5 @@
 module.exports = {
 	...require('../../jest.config'),
 	collectCoverageFrom: ['credentials/**/*.ts', 'nodes/**/*.ts', 'utils/**/*.ts'],
+	setupFilesAfterEnv: ['jest-expect-message', '<rootDir>/test/setup.ts'],
 };
diff --git a/packages/nodes-base/nodes/ActionNetwork/ActionNetwork.node.json b/packages/nodes-base/nodes/ActionNetwork/ActionNetwork.node.json
index b377551d6f985..12a6e0274b7b4 100644
--- a/packages/nodes-base/nodes/ActionNetwork/ActionNetwork.node.json
+++ b/packages/nodes-base/nodes/ActionNetwork/ActionNetwork.node.json
@@ -2,7 +2,7 @@
 	"node": "n8n-nodes-base.actionNetwork",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Sales", "Marketing & Content"],
+	"categories": ["Sales", "Marketing"],
 	"resources": {
 		"credentialDocumentation": [
 			{
diff --git a/packages/nodes-base/nodes/ActionNetwork/GenericFunctions.ts b/packages/nodes-base/nodes/ActionNetwork/GenericFunctions.ts
index ac4f481d75e35..a9545ffe80487 100644
--- a/packages/nodes-base/nodes/ActionNetwork/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/ActionNetwork/GenericFunctions.ts
@@ -1,9 +1,13 @@
-import type { IDataObject, IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-workflow';
-
-import type { OptionsWithUri } from 'request';
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	IHttpRequestMethods,
+	ILoadOptionsFunctions,
+	IRequestOptions,
+} from 'n8n-workflow';
 
-import flow from 'lodash.flow';
-import omit from 'lodash.omit';
+import flow from 'lodash/flow';
+import omit from 'lodash/omit';
 
 import type {
 	AllFieldsUi,
@@ -17,12 +21,12 @@ import type {
 
 export async function actionNetworkApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject = {},
 	qs: IDataObject = {},
 ) {
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		method,
 		body,
 		qs,
@@ -38,7 +42,7 @@ export async function actionNetworkApiRequest(
 		delete options.qs;
 	}
 
-	return this.helpers.requestWithAuthentication.call(this, 'actionNetworkApi', options);
+	return await this.helpers.requestWithAuthentication.call(this, 'actionNetworkApi', options);
 }
 
 /**
@@ -59,7 +63,7 @@ const toItemsKey = (endpoint: string) => {
 
 export async function handleListing(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject = {},
 	qs: IDataObject = {},
@@ -77,7 +81,13 @@ export async function handleListing(
 	const itemsKey = toItemsKey(endpoint);
 
 	do {
-		responseData = await actionNetworkApiRequest.call(this, method, endpoint, body, qs);
+		responseData = await actionNetworkApiRequest.call(
+			this,
+			method as IHttpRequestMethods,
+			endpoint,
+			body,
+			qs,
+		);
 		const items = responseData._embedded[itemsKey];
 		returnData.push(...(items as IDataObject[]));
 
@@ -218,7 +228,7 @@ export const adjustEventPayload = adjustLocation;
 // ----------------------------------------
 
 async function loadResource(this: ILoadOptionsFunctions, resource: string) {
-	return handleListing.call(this, 'GET', `/${resource}`, {}, {}, { returnAll: true });
+	return await handleListing.call(this, 'GET', `/${resource}`, {}, {}, { returnAll: true });
 }
 
 export const resourceLoaders = {
diff --git a/packages/nodes-base/nodes/ActionNetwork/actionNetwork.svg b/packages/nodes-base/nodes/ActionNetwork/actionNetwork.svg
index acf96bb6ebf48..d2a2022e5f59b 100644
--- a/packages/nodes-base/nodes/ActionNetwork/actionNetwork.svg
+++ b/packages/nodes-base/nodes/ActionNetwork/actionNetwork.svg
@@ -1 +1 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 1 79.89 75.96"><defs><style>.cls-1{fill:#9dd3ed;}</style></defs><title>actionnetwork</title><circle class="cls-1" cx="40.42" cy="5.43" r="5.43"/><path class="cls-1" d="M26.32,15.92c9.94-2.11,15.06,5.25,16.52,11.47.92,3.93,4.28,3.87,6.58,2.73S56,28.48,53,21.23c-1.82-4.41-4.14-8.44-8.26-11.08A6.42,6.42,0,0,1,34.66,8.3a6.88,6.88,0,0,1-.44-1.14c-8.85.1-14.7,8-16.45,13.26a18.85,18.85,0,0,1,8.55-4.5"/><circle class="cls-1" cx="5.43" cy="29.87" r="5.43"/><path class="cls-1" d="M11.23,46.45c1-10.11,9.51-12.8,15.88-12.33,4,.29,5-2.93,4.57-5.47s.4-6.78-7.41-6.1C19.52,23,15,24,11.23,27.12a6.37,6.37,0,0,1,.34,4.67,6.62,6.62,0,0,1-.93,1.86,6.39,6.39,0,0,1-4.19,2.57,6.31,6.31,0,0,1-1.22.08C2.68,44.78,8.52,52.73,13,56a18.92,18.92,0,0,1-1.75-9.51"/><circle class="cls-1" cx="18.08" cy="70.13" r="5.43"/><path class="cls-1" d="M35.65,69.73c-9.33-4-9.25-13-6.83-18.91,1.52-3.74-1.25-5.64-3.79-6S18.7,42.31,16.94,50c-1.07,4.64-1.51,9.27.32,13.81a6.44,6.44,0,0,1,4.55,1.12,6.47,6.47,0,0,1,2.63,6.24,7.55,7.55,0,0,1-.3,1.18c7.27,5,16.64,2,21.09-1.3a18.8,18.8,0,0,1-9.58-1.27"/><circle class="cls-1" cx="60.58" cy="70.53" r="5.43"/><path class="cls-1" d="M65.83,53.76c-6.81,7.55-15.28,4.6-20.11.42-3-2.64-5.74-.62-6.93,1.66S34.42,61,41.1,65.16c4.06,2.5,8.3,4.4,13.19,4.11a6.43,6.43,0,0,1,2.51-4,6.76,6.76,0,0,1,1.86-.93,6.38,6.38,0,0,1,4.9.44,5.94,5.94,0,0,1,1,.66c7.1-5.28,7.17-15.14,5.52-20.4a18.91,18.91,0,0,1-4.27,8.67"/><circle class="cls-1" cx="74.46" cy="30.68" r="5.43"/><path class="cls-1" d="M60.13,20.51c5.08,8.81-.34,16-5.8,19.25C50.87,41.85,52,45,53.76,46.87s3.6,5.76,9.57.68c3.64-3.08,6.75-6.54,8-11.27A6.42,6.42,0,0,1,70,26.09a6.21,6.21,0,0,1,.94-.77c-2.83-8.39-12.19-11.49-17.69-11.55a18.94,18.94,0,0,1,6.92,6.74"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" data-name="Layer 1" viewBox="0 1 79.89 75.96"><defs><style>.cls-1{fill:#9dd3ed}</style></defs><circle cx="40.42" cy="5.43" r="5.43" class="cls-1"/><path d="M26.32 15.92c9.94-2.11 15.06 5.25 16.52 11.47.92 3.93 4.28 3.87 6.58 2.73S56 28.48 53 21.23c-1.82-4.41-4.14-8.44-8.26-11.08A6.42 6.42 0 0 1 34.66 8.3a7 7 0 0 1-.44-1.14c-8.85.1-14.7 8-16.45 13.26a18.85 18.85 0 0 1 8.55-4.5" class="cls-1"/><circle cx="5.43" cy="29.87" r="5.43" class="cls-1"/><path d="M11.23 46.45c1-10.11 9.51-12.8 15.88-12.33 4 .29 5-2.93 4.57-5.47s.4-6.78-7.41-6.1C19.52 23 15 24 11.23 27.12a6.37 6.37 0 0 1 .34 4.67 6.6 6.6 0 0 1-.93 1.86 6.4 6.4 0 0 1-4.19 2.57 6.3 6.3 0 0 1-1.22.08C2.68 44.78 8.52 52.73 13 56a18.9 18.9 0 0 1-1.75-9.51" class="cls-1"/><circle cx="18.08" cy="70.13" r="5.43" class="cls-1"/><path d="M35.65 69.73c-9.33-4-9.25-13-6.83-18.91 1.52-3.74-1.25-5.64-3.79-6S18.7 42.31 16.94 50c-1.07 4.64-1.51 9.27.32 13.81a6.44 6.44 0 0 1 4.55 1.12 6.47 6.47 0 0 1 2.63 6.24 7.6 7.6 0 0 1-.3 1.18c7.27 5 16.64 2 21.09-1.3a18.8 18.8 0 0 1-9.58-1.27" class="cls-1"/><circle cx="60.58" cy="70.53" r="5.43" class="cls-1"/><path d="M65.83 53.76c-6.81 7.55-15.28 4.6-20.11.42-3-2.64-5.74-.62-6.93 1.66S34.42 61 41.1 65.16c4.06 2.5 8.3 4.4 13.19 4.11a6.43 6.43 0 0 1 2.51-4 6.8 6.8 0 0 1 1.86-.93 6.38 6.38 0 0 1 4.9.44 6 6 0 0 1 1 .66c7.1-5.28 7.17-15.14 5.52-20.4a18.9 18.9 0 0 1-4.27 8.67" class="cls-1"/><circle cx="74.46" cy="30.68" r="5.43" class="cls-1"/><path d="M60.13 20.51c5.08 8.81-.34 16-5.8 19.25-3.46 2.09-2.33 5.24-.57 7.11s3.6 5.76 9.57.68c3.64-3.08 6.75-6.54 8-11.27A6.42 6.42 0 0 1 70 26.09a6 6 0 0 1 .94-.77c-2.83-8.39-12.19-11.49-17.69-11.55a18.94 18.94 0 0 1 6.92 6.74" class="cls-1"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/ActionNetwork/types.d.ts b/packages/nodes-base/nodes/ActionNetwork/types.d.ts
deleted file mode 100644
index 26188ccff8359..0000000000000
--- a/packages/nodes-base/nodes/ActionNetwork/types.d.ts
+++ /dev/null
@@ -1,106 +0,0 @@
-import type { INodeProperties } from 'n8n-workflow';
-
-export type LanguageOptions = INodeProperties['options'];
-
-export type Resource =
-	| 'attendance'
-	| 'event'
-	| 'person'
-	| 'personTag'
-	| 'petition'
-	| 'signature'
-	| 'tag';
-
-export type Operation = 'create' | 'delete' | 'get' | 'getAll' | 'update' | 'add' | 'remove';
-
-// @ts-ignore
-export type LanguageCodes = (typeof LanguageOptions)[number]['value'];
-
-// ----------------------------------------
-//              UI fields
-// ----------------------------------------
-
-export type AllFieldsUi = {
-	email_addresses: EmailAddressUi;
-	postal_addresses: PostalAddressesUi;
-	phone_numbers: PhoneNumberUi;
-	languages_spoken: LanguageCodes;
-	target: string;
-	location: LocationUi;
-};
-
-export type EmailAddressUi = {
-	email_addresses_fields: EmailAddressField;
-};
-
-export type EmailAddressField = {
-	primary: boolean;
-	address: string;
-	status: EmailStatus;
-};
-
-type BaseStatus = 'subscribed' | 'unsubscribed' | 'bouncing' | 'previous bounce';
-
-type EmailStatus = BaseStatus | 'spam complaint' | 'previous spam complaint';
-
-type PhoneNumberUi = {
-	phone_numbers_fields: PhoneNumberField[];
-};
-
-export type PhoneNumberField = {
-	primary: boolean;
-	number: string;
-	status: BaseStatus;
-};
-
-type PostalAddressesUi = {
-	postal_addresses_fields: PostalAddressField[];
-};
-
-type LocationUi = {
-	postal_addresses_fields: PostalAddressField;
-};
-
-export type PostalAddressField = {
-	primary: boolean;
-	address_lines: string;
-	locality: string;
-	region: string;
-	postal_code: string;
-	country: string;
-	language: LanguageCodes;
-	location: { location_fields: LatitudeLongitude };
-};
-
-type LatitudeLongitude = {
-	latitude: string;
-	longitude: string;
-};
-
-export type FieldWithPrimaryField = EmailAddressField | PhoneNumberField | PostalAddressField;
-
-// ----------------------------------------
-//                 responses
-// ----------------------------------------
-
-export type LinksFieldContainer = { _links: { self: { href: string } } };
-
-export type Response = JsonObject & LinksFieldContainer;
-
-export type PersonResponse = Response & {
-	identifiers: string[];
-	email_addresses: EmailAddressField[];
-	phone_numbers: PhoneNumberField[];
-	postal_addresses: PostalAddressField[];
-	languages_spoken: LanguageCodes[];
-};
-
-export type PetitionResponse = Response & { _embedded: { 'osdi:creator': PersonResponse } };
-
-// ----------------------------------------
-//                 utils
-// ----------------------------------------
-
-export type JsonValue = string | number | boolean | null | JsonObject | JsonValue[];
-
-export type JsonObject = { [key: string]: JsonValue };
diff --git a/packages/nodes-base/nodes/ActionNetwork/types.ts b/packages/nodes-base/nodes/ActionNetwork/types.ts
new file mode 100644
index 0000000000000..d758727a57072
--- /dev/null
+++ b/packages/nodes-base/nodes/ActionNetwork/types.ts
@@ -0,0 +1,106 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+export type LanguageOptions = INodeProperties['options'];
+
+export type Resource =
+	| 'attendance'
+	| 'event'
+	| 'person'
+	| 'personTag'
+	| 'petition'
+	| 'signature'
+	| 'tag';
+
+export type Operation = 'create' | 'delete' | 'get' | 'getAll' | 'update' | 'add' | 'remove';
+
+// @ts-ignore
+export type LanguageCodes = LanguageOptions[number]['value'];
+
+// ----------------------------------------
+//              UI fields
+// ----------------------------------------
+
+export type AllFieldsUi = {
+	email_addresses: EmailAddressUi;
+	postal_addresses: PostalAddressesUi;
+	phone_numbers: PhoneNumberUi;
+	languages_spoken: LanguageCodes;
+	target: string;
+	location: LocationUi;
+};
+
+export type EmailAddressUi = {
+	email_addresses_fields: EmailAddressField;
+};
+
+export type EmailAddressField = {
+	primary: boolean;
+	address: string;
+	status: EmailStatus;
+};
+
+type BaseStatus = 'subscribed' | 'unsubscribed' | 'bouncing' | 'previous bounce';
+
+type EmailStatus = BaseStatus | 'spam complaint' | 'previous spam complaint';
+
+type PhoneNumberUi = {
+	phone_numbers_fields: PhoneNumberField[];
+};
+
+export type PhoneNumberField = {
+	primary: boolean;
+	number: string;
+	status: BaseStatus;
+};
+
+type PostalAddressesUi = {
+	postal_addresses_fields: PostalAddressField[];
+};
+
+type LocationUi = {
+	postal_addresses_fields: PostalAddressField;
+};
+
+export type PostalAddressField = {
+	primary: boolean;
+	address_lines: string;
+	locality: string;
+	region: string;
+	postal_code: string;
+	country: string;
+	language: LanguageCodes;
+	location: { location_fields: LatitudeLongitude };
+};
+
+type LatitudeLongitude = {
+	latitude: string;
+	longitude: string;
+};
+
+export type FieldWithPrimaryField = EmailAddressField | PhoneNumberField | PostalAddressField;
+
+// ----------------------------------------
+//                 responses
+// ----------------------------------------
+
+export type LinksFieldContainer = { _links: { self: { href: string } } };
+
+export type Response = JsonObject & LinksFieldContainer;
+
+export type PersonResponse = Response & {
+	identifiers: string[];
+	email_addresses: EmailAddressField[];
+	phone_numbers: PhoneNumberField[];
+	postal_addresses: PostalAddressField[];
+	languages_spoken: LanguageCodes[];
+};
+
+export type PetitionResponse = Response & { _embedded: { 'osdi:creator': PersonResponse } };
+
+// ----------------------------------------
+//                 utils
+// ----------------------------------------
+
+export type JsonValue = string | number | boolean | null | JsonObject | JsonValue[];
+
+export type JsonObject = { [key: string]: JsonValue };
diff --git a/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaign.node.json b/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaign.node.json
index 8f4c445fc930e..9c23a4d48fc35 100644
--- a/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaign.node.json
+++ b/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaign.node.json
@@ -3,7 +3,7 @@
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
 	"details": "ActiveCampaign is a cloud software platform that allows customer experience automation, which combines email marketing, marketing automation, sales automation, and CRM categories. Use this node when you want to interact with your ActiveCampaign account.",
-	"categories": ["Marketing & Content"],
+	"categories": ["Marketing"],
 	"resources": {
 		"credentialDocumentation": [
 			{
diff --git a/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaign.node.ts b/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaign.node.ts
index 8c5a9b6d78d4c..cc931d2feceed 100644
--- a/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaign.node.ts
+++ b/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaign.node.ts
@@ -6,6 +6,7 @@ import type {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
@@ -56,7 +57,7 @@ function addAdditionalFields(body: IDataObject, additionalFields: IDataObject) {
 			key === 'customProperties' &&
 			(additionalFields.customProperties as IDataObject).property !== undefined
 		) {
-			for (const customProperty of (additionalFields.customProperties as IDataObject)!
+			for (const customProperty of (additionalFields.customProperties as IDataObject)
 				.property! as CustomProperty[]) {
 				body[customProperty.name] = customProperty.value;
 			}
@@ -285,13 +286,15 @@ export class ActiveCampaign implements INodeType {
 			// select them easily
 			async getTags(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
 				const returnData: INodePropertyOptions[] = [];
-				const { tags } = await activeCampaignApiRequest.call(
+				const tags = await activeCampaignApiRequestAllItems.call(
 					this,
 					'GET',
 					'/api/3/tags',
 					{},
 					{ limit: 100 },
+					'tags',
 				);
+
 				for (const tag of tags) {
 					returnData.push({
 						name: tag.tag,
@@ -315,7 +318,7 @@ export class ActiveCampaign implements INodeType {
 		// For Query string
 		let qs: IDataObject;
 
-		let requestMethod: string;
+		let requestMethod: IHttpRequestMethods;
 		let endpoint: string;
 		let returnAll = false;
 		let dataKey: string | undefined;
@@ -1199,6 +1202,6 @@ export class ActiveCampaign implements INodeType {
 			}
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaignTrigger.node.json b/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaignTrigger.node.json
index f8e91a50662d3..45431054e64db 100644
--- a/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaignTrigger.node.json
+++ b/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaignTrigger.node.json
@@ -2,7 +2,7 @@
 	"node": "n8n-nodes-base.activeCampaignTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Marketing & Content"],
+	"categories": ["Marketing"],
 	"resources": {
 		"credentialDocumentation": [
 			{
diff --git a/packages/nodes-base/nodes/ActiveCampaign/GenericFunctions.ts b/packages/nodes-base/nodes/ActiveCampaign/GenericFunctions.ts
index 5350d7d17b6a4..8aa041c3d4a7e 100644
--- a/packages/nodes-base/nodes/ActiveCampaign/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/ActiveCampaign/GenericFunctions.ts
@@ -5,11 +5,11 @@ import type {
 	ILoadOptionsFunctions,
 	INodeProperties,
 	JsonObject,
+	IRequestOptions,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import type { OptionsWithUri } from 'request';
-
 export interface IProduct {
 	fields: {
 		item?: object[];
@@ -22,7 +22,7 @@ export interface IProduct {
  */
 export async function activeCampaignApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject,
 	query?: IDataObject,
@@ -34,7 +34,7 @@ export async function activeCampaignApiRequest(
 		query = {};
 	}
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {},
 		method,
 		qs: query,
@@ -75,7 +75,7 @@ export async function activeCampaignApiRequest(
  */
 export async function activeCampaignApiRequestAllItems(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject,
 	query?: IDataObject,
diff --git a/packages/nodes-base/nodes/AcuityScheduling/GenericFunctions.ts b/packages/nodes-base/nodes/AcuityScheduling/GenericFunctions.ts
index 46722dad9b053..ae68762998b78 100644
--- a/packages/nodes-base/nodes/AcuityScheduling/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/AcuityScheduling/GenericFunctions.ts
@@ -1,23 +1,18 @@
-import type { OptionsWithUri } from 'request';
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
+	IRequestOptions,
 	IWebhookFunctions,
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function acuitySchedulingApiRequest(
-	this:
-		| IHookFunctions
-		| IExecuteFunctions
-		| IExecuteSingleFunctions
-		| ILoadOptionsFunctions
-		| IWebhookFunctions,
-	method: string,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 	body: any = {},
 	qs: IDataObject = {},
@@ -26,7 +21,7 @@ export async function acuitySchedulingApiRequest(
 ): Promise<any> {
 	const authenticationMethod = this.getNodeParameter('authentication', 0);
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			'Content-Type': 'application/json',
 		},
diff --git a/packages/nodes-base/nodes/AcuityScheduling/acuityScheduling.png b/packages/nodes-base/nodes/AcuityScheduling/acuityScheduling.png
index 16f2cccbf0d52..2d04789f1bccc 100644
Binary files a/packages/nodes-base/nodes/AcuityScheduling/acuityScheduling.png and b/packages/nodes-base/nodes/AcuityScheduling/acuityScheduling.png differ
diff --git a/packages/nodes-base/nodes/Adalo/adalo.svg b/packages/nodes-base/nodes/Adalo/adalo.svg
index 2f1ff40fcd3c1..0f3f01fcebdf2 100644
--- a/packages/nodes-base/nodes/Adalo/adalo.svg
+++ b/packages/nodes-base/nodes/Adalo/adalo.svg
@@ -1,14 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="438px" height="438px" style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g><path style="opacity:0.999" fill="#09a595" d="M 199.5,-0.5 C 205.833,-0.5 212.167,-0.5 218.5,-0.5C 218.5,6.83333 218.5,14.1667 218.5,21.5C 134.502,25.3789 74.3355,65.0456 38,140.5C 14.1595,201.337 17.9928,260.337 49.5,317.5C 42.5393,320.647 35.8727,324.313 29.5,328.5C 12.4851,300.122 2.48507,269.455 -0.5,236.5C -0.5,224.5 -0.5,212.5 -0.5,200.5C 9.13611,119.029 50.1361,59.1953 122.5,21C 147.118,9.59915 172.784,2.43248 199.5,-0.5 Z"/></g>
-<g><path style="opacity:0.999" fill="#ea4c2e" d="M 218.5,-0.5 C 224.5,-0.5 230.5,-0.5 236.5,-0.5C 323.23,10.0683 384.73,55.0683 421,134.5C 430.416,158.096 435.916,182.429 437.5,207.5C 437.5,214.5 437.5,221.5 437.5,228.5C 435.714,263.192 426.047,295.525 408.5,325.5C 401.549,321.863 394.882,317.863 388.5,313.5C 413.242,265.758 419.075,215.758 406,163.5C 383.782,95.6155 338.615,50.7822 270.5,29C 253.247,24.8432 235.914,22.3432 218.5,21.5C 218.5,14.1667 218.5,6.83333 218.5,-0.5 Z"/></g>
-<g><path style="opacity:1" fill="#fefefe" d="M 218.5,21.5 C 235.914,22.3432 253.247,24.8432 270.5,29C 338.615,50.7822 383.782,95.6155 406,163.5C 419.075,215.758 413.242,265.758 388.5,313.5C 349.147,377.699 291.48,410.699 215.5,412.5C 143.597,409.23 88.2633,377.564 49.5,317.5C 17.9928,260.337 14.1595,201.337 38,140.5C 74.3355,65.0456 134.502,25.3789 218.5,21.5 Z"/></g>
-<g><path style="opacity:1" fill="#343434" d="M 321.5,72.5 C 323.225,72.8425 323.725,73.8425 323,75.5C 319.373,81.9204 315.873,88.4204 312.5,95C 316.039,101.913 319.706,108.746 323.5,115.5C 322.277,116.614 320.944,116.781 319.5,116C 313.621,112.561 307.621,109.395 301.5,106.5C 295.129,109.57 288.795,112.736 282.5,116C 281.365,116.749 280.365,116.583 279.5,115.5C 282.992,108.684 286.325,101.851 289.5,95C 286.325,88.1488 282.992,81.3155 279.5,74.5C 280.365,73.4173 281.365,73.2506 282.5,74C 288.416,77.5421 294.583,80.7087 301,83.5C 308.277,80.448 315.111,76.7813 321.5,72.5 Z"/></g>
-<g><path style="opacity:1" fill="#3b3b3b" d="M 226.5,80.5 C 229.392,82.7311 231.726,85.5644 233.5,89C 237.871,89.1725 242.204,89.6725 246.5,90.5C 243.5,92.5 240.5,94.5 237.5,96.5C 236.833,100.833 236.167,105.167 235.5,109.5C 233.289,106.244 230.955,103.078 228.5,100C 224.5,99.6667 220.5,99.3333 216.5,99C 219.36,96.6397 222.36,94.473 225.5,92.5C 226.491,88.5546 226.824,84.5546 226.5,80.5 Z"/></g>
-<g><path style="opacity:1" fill="#323232" d="M 215.5,188.5 C 209.759,179.359 204.259,170.026 199,160.5C 198.503,157.854 198.336,155.187 198.5,152.5C 202.36,141.567 210.027,137.4 221.5,140C 224.266,141.467 226.766,143.3 229,145.5C 263.333,202.167 297.667,258.833 332,315.5C 333.521,331.312 326.354,338.479 310.5,337C 307.098,335.6 304.264,333.433 302,330.5C 273.338,283.018 244.505,235.684 215.5,188.5 Z"/></g>
-<g><path style="opacity:1" fill="#373737" d="M 295.5,149.5 C 298.608,152.328 301.275,155.662 303.5,159.5C 308.132,160.328 312.798,160.828 317.5,161C 313.912,163.377 310.412,165.877 307,168.5C 306.828,172.871 306.328,177.204 305.5,181.5C 303.167,178.167 300.833,174.833 298.5,171.5C 294.204,170.672 289.871,170.172 285.5,170C 288.36,167.64 291.36,165.473 294.5,163.5C 295.493,158.88 295.827,154.214 295.5,149.5 Z"/></g>
-<g><path style="opacity:1" fill="#bbbbbb" d="M 198.5,152.5 C 198.336,155.187 198.503,157.854 199,160.5C 204.259,170.026 209.759,179.359 215.5,188.5C 186.53,235.662 157.697,282.995 129,330.5C 122.315,337.854 114.482,339.354 105.5,335C 98.9153,329.643 96.7486,322.809 99,314.5C 131.941,260.269 165.108,206.269 198.5,152.5 Z"/></g>
-<g><path style="opacity:1" fill="#333333" d="M 210.5,257.5 C 227.101,255.945 236.767,263.278 239.5,279.5C 237.449,297.376 227.449,304.876 209.5,302C 196.276,295.348 191.776,284.848 196,270.5C 199.785,264.875 204.618,260.542 210.5,257.5 Z"/></g>
-<g><path style="opacity:0.999" fill="#f5b915" d="M 388.5,313.5 C 394.882,317.863 401.549,321.863 408.5,325.5C 384.936,367.891 350.936,399.058 306.5,419C 279.86,430.359 252.193,436.525 223.5,437.5C 219.833,437.5 216.167,437.5 212.5,437.5C 138.71,433.357 80.21,401.357 37,341.5C 33.9711,337.438 31.4711,333.105 29.5,328.5C 35.8727,324.313 42.5393,320.647 49.5,317.5C 88.2633,377.564 143.597,409.23 215.5,412.5C 291.48,410.699 349.147,377.699 388.5,313.5 Z"/></g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="438" height="438" style="shape-rendering:geometricPrecision;text-rendering:geometricPrecision;image-rendering:optimizeQuality;fill-rule:evenodd;clip-rule:evenodd"><path fill="#09a595" d="M199.5-.5h19v22Q92.504 27.319 38 140.5q-35.76 91.255 11.5 177a145.6 145.6 0 0 0-20 11q-25.522-42.567-30-92v-36Q13.954 78.293 122.5 21q36.926-17.101 77-21.5" style="opacity:.999"/><path fill="#ea4c2e" d="M218.5-.5h18q130.095 15.852 184.5 135 14.124 35.394 16.5 73v21q-2.68 52.038-29 97a198 198 0 0 1-20-12q37.113-71.613 17.5-150Q372.673 61.674 270.5 29q-25.88-6.236-52-7.5z" style="opacity:.999"/><path fill="#fefefe" d="M218.5 21.5q26.12 1.264 52 7.5Q372.673 61.674 406 163.5q19.613 78.387-17.5 150-59.03 96.298-173 99-107.855-4.904-166-95-47.26-85.745-11.5-177 54.503-113.181 180.5-119" style="opacity:1"/><path fill="#343434" d="M321.5 72.5q2.588.514 1.5 3A547 547 0 0 0 312.5 95a602 602 0 0 0 11 20.5q-1.834 1.671-4 .5a233 233 0 0 0-18-9.5 725 725 0 0 0-19 9.5q-1.702 1.124-3-.5a578 578 0 0 0 10-20.5 577 577 0 0 0-10-20.5q1.298-1.625 3-.5a161 161 0 0 0 18.5 9.5q10.916-4.578 20.5-11" style="opacity:1"/><path fill="#3b3b3b" d="M226.5 80.5q4.338 3.346 7 8.5 6.556.258 13 1.5l-9 6-2 13a154 154 0 0 0-7-9.5l-12-1a86 86 0 0 1 9-6.5 36.9 36.9 0 0 0 1-12" style="opacity:1"/><path fill="#323232" d="M215.5 188.5a577 577 0 0 1-16.5-28 32.5 32.5 0 0 1-.5-8q5.79-16.4 23-12.5a32 32 0 0 1 7.5 5.5l103 170q2.281 23.718-21.5 21.5-5.103-2.1-8.5-6.5a20572 20572 0 0 0-86.5-142" style="opacity:1"/><path fill="#373737" d="M295.5 149.5q4.662 4.243 8 10 6.947 1.242 14 1.5a184 184 0 0 0-10.5 7.5 86.6 86.6 0 0 1-1.5 13l-7-10a86.6 86.6 0 0 0-13-1.5 86 86 0 0 1 9-6.5 49.9 49.9 0 0 0 1-14" style="opacity:1"/><path fill="#bbb" d="M198.5 152.5a32.5 32.5 0 0 0 .5 8 577 577 0 0 0 16.5 28 22390 22390 0 0 0-86.5 142q-10.027 11.031-23.5 4.5-9.877-8.036-6.5-20.5a19243 19243 0 0 1 99.5-162" style="opacity:1"/><path fill="#333" d="M210.5 257.5q24.901-2.333 29 22-3.077 26.814-30 22.5-19.836-9.978-13.5-31.5 5.677-8.437 14.5-13" style="opacity:1"/><path fill="#f5b915" d="M388.5 313.5a198 198 0 0 0 20 12q-35.346 63.587-102 93.5-39.96 17.038-83 18.5h-11q-110.685-6.214-175.5-96a63.5 63.5 0 0 1-7.5-13 145.6 145.6 0 0 1 20-11q58.145 90.096 166 95 113.97-2.702 173-99" style="opacity:.999"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Adalo/types.d.ts b/packages/nodes-base/nodes/Adalo/types.ts
similarity index 100%
rename from packages/nodes-base/nodes/Adalo/types.d.ts
rename to packages/nodes-base/nodes/Adalo/types.ts
diff --git a/packages/nodes-base/nodes/Affinity/Affinity.node.ts b/packages/nodes-base/nodes/Affinity/Affinity.node.ts
index 4cabe419b4a36..21c8eb123aded 100644
--- a/packages/nodes-base/nodes/Affinity/Affinity.node.ts
+++ b/packages/nodes-base/nodes/Affinity/Affinity.node.ts
@@ -432,6 +432,6 @@ export class Affinity implements INodeType {
 			}
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Affinity/GenericFunctions.ts b/packages/nodes-base/nodes/Affinity/GenericFunctions.ts
index 15bcf5480fe8a..54ece184d5930 100644
--- a/packages/nodes-base/nodes/Affinity/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Affinity/GenericFunctions.ts
@@ -1,5 +1,3 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -7,12 +5,14 @@ import type {
 	IHookFunctions,
 	IWebhookFunctions,
 	JsonObject,
+	IRequestOptions,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { BINARY_ENCODING, NodeApiError } from 'n8n-workflow';
 
 export async function affinityApiRequest(
 	this: IExecuteFunctions | IWebhookFunctions | IHookFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 	body: any = {},
 	query: IDataObject = {},
@@ -25,7 +25,7 @@ export async function affinityApiRequest(
 
 	const endpoint = 'https://api.affinity.co';
 
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		headers: {
 			'Content-Type': 'application/json',
 			Authorization: `Basic ${Buffer.from(apiKey).toString(BINARY_ENCODING)}`,
@@ -53,7 +53,7 @@ export async function affinityApiRequest(
 export async function affinityApiRequestAllItems(
 	this: IHookFunctions | ILoadOptionsFunctions | IExecuteFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 	body: any = {},
 	query: IDataObject = {},
diff --git a/packages/nodes-base/nodes/Affinity/PersonDescription.ts b/packages/nodes-base/nodes/Affinity/PersonDescription.ts
index 99c520339ad17..95ef90b4af42d 100644
--- a/packages/nodes-base/nodes/Affinity/PersonDescription.ts
+++ b/packages/nodes-base/nodes/Affinity/PersonDescription.ts
@@ -52,7 +52,7 @@ export const personFields: INodeProperties[] = [
 	/*                                person:create                               */
 	/* -------------------------------------------------------------------------- */
 	{
-		displayName: 'Fist Name',
+		displayName: 'First Name',
 		name: 'firstName',
 		type: 'string',
 		required: true,
@@ -154,7 +154,7 @@ export const personFields: INodeProperties[] = [
 		},
 		options: [
 			{
-				displayName: 'Fist Name',
+				displayName: 'First Name',
 				name: 'firstName',
 				type: 'string',
 				default: '',
diff --git a/packages/nodes-base/nodes/AgileCrm/AgileCrm.node.json b/packages/nodes-base/nodes/AgileCrm/AgileCrm.node.json
index 39534955413e5..3bfaf0f16f5fa 100644
--- a/packages/nodes-base/nodes/AgileCrm/AgileCrm.node.json
+++ b/packages/nodes-base/nodes/AgileCrm/AgileCrm.node.json
@@ -2,7 +2,7 @@
 	"node": "n8n-nodes-base.agileCrm",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Marketing & Content", "Sales"],
+	"categories": ["Marketing", "Sales"],
 	"resources": {
 		"credentialDocumentation": [
 			{
diff --git a/packages/nodes-base/nodes/AgileCrm/AgileCrm.node.ts b/packages/nodes-base/nodes/AgileCrm/AgileCrm.node.ts
index 0730efd29b78e..27fc4689f17e2 100644
--- a/packages/nodes-base/nodes/AgileCrm/AgileCrm.node.ts
+++ b/packages/nodes-base/nodes/AgileCrm/AgileCrm.node.ts
@@ -190,7 +190,6 @@ export class AgileCrm implements INodeType {
 					}
 
 					if (simple) {
-						// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
 						responseData = simplifyResponse(responseData);
 					}
 				} else if (operation === 'create') {
@@ -299,12 +298,16 @@ export class AgileCrm implements INodeType {
 								} as IDataObject);
 							}
 
-							if (additionalFields.address) {
-								properties.push({
-									type: 'SYSTEM',
-									name: 'address',
-									value: additionalFields.address as string,
-								} as IDataObject);
+							if (additionalFields.addressOptions) {
+								//@ts-ignore
+								additionalFields.addressOptions.addressProperties.map((property) => {
+									properties.push({
+										type: 'SYSTEM',
+										subtype: property.subtype as string,
+										name: 'address',
+										value: property.address as string,
+									} as IDataObject);
+								});
 							}
 
 							if (additionalFields.phone) {
@@ -314,6 +317,14 @@ export class AgileCrm implements INodeType {
 									value: additionalFields.phone as string,
 								} as IDataObject);
 							}
+
+							if (additionalFields.name) {
+								properties.push({
+									type: 'SYSTEM',
+									name: 'name',
+									value: additionalFields.name as string,
+								} as IDataObject);
+							}
 						}
 
 						if (additionalFields.websiteOptions) {
@@ -322,7 +333,7 @@ export class AgileCrm implements INodeType {
 								properties.push({
 									type: 'SYSTEM',
 									subtype: property.subtype as string,
-									name: 'webiste',
+									name: 'website',
 									value: property.url as string,
 								} as IDataObject);
 							});
@@ -451,12 +462,16 @@ export class AgileCrm implements INodeType {
 								} as IDataObject);
 							}
 
-							if (additionalFields.address) {
-								properties.push({
-									type: 'SYSTEM',
-									name: 'address',
-									value: additionalFields.address as string,
-								} as IDataObject);
+							if (additionalFields.addressOptions) {
+								//@ts-ignore
+								additionalFields.addressOptions.addressProperties.map((property) => {
+									properties.push({
+										type: 'SYSTEM',
+										subtype: property.subtype as string,
+										name: 'address',
+										value: property.address as string,
+									} as IDataObject);
+								});
 							}
 
 							if (additionalFields.phone) {
@@ -474,11 +489,18 @@ export class AgileCrm implements INodeType {
 								properties.push({
 									type: 'SYSTEM',
 									subtype: property.subtype as string,
-									name: 'webiste',
+									name: 'website',
 									value: property.url as string,
 								} as IDataObject);
 							});
 						}
+						if (additionalFields.name) {
+							properties.push({
+								type: 'SYSTEM',
+								name: 'name',
+								value: additionalFields.name as string,
+							} as IDataObject);
+						}
 						if (additionalFields.customProperties) {
 							//@ts-ignore
 							additionalFields.customProperties.customProperty.map((property) => {
diff --git a/packages/nodes-base/nodes/AgileCrm/CompanyDescription.ts b/packages/nodes-base/nodes/AgileCrm/CompanyDescription.ts
index dc30e3e00d8c5..97ac7aa72ae76 100644
--- a/packages/nodes-base/nodes/AgileCrm/CompanyDescription.ts
+++ b/packages/nodes-base/nodes/AgileCrm/CompanyDescription.ts
@@ -379,11 +379,47 @@ export const companyFields: INodeProperties[] = [
 		options: [
 			{
 				displayName: 'Address',
-				name: 'email',
-				type: 'string',
-				placeholder: 'name@email.com',
-				default: '',
+				name: 'addressOptions',
+				type: 'fixedCollection',
+				default: {},
 				description: 'Company address',
+				typeOptions: {
+					multipleValues: true,
+				},
+				options: [
+					{
+						displayName: 'Address Properties',
+						name: 'addressProperties',
+						values: [
+							{
+								displayName: 'Type',
+								name: 'subtype',
+								type: 'options',
+								required: true,
+								default: '',
+								description: 'Type of address',
+								options: [
+									{
+										name: 'Postal',
+										value: 'postal',
+									},
+									{
+										name: 'Office',
+										value: 'office',
+									},
+								],
+							},
+							{
+								displayName: 'Address',
+								name: 'address',
+								type: 'string',
+								required: true,
+								default: '',
+								description: 'Full address',
+							},
+						],
+					},
+				],
 			},
 			{
 				displayName: 'Email',
@@ -655,11 +691,47 @@ export const companyFields: INodeProperties[] = [
 		options: [
 			{
 				displayName: 'Address',
-				name: 'email',
-				type: 'string',
-				placeholder: 'name@email.com',
-				default: '',
+				name: 'addressOptions',
+				type: 'fixedCollection',
+				default: {},
 				description: 'Company address',
+				typeOptions: {
+					multipleValues: true,
+				},
+				options: [
+					{
+						displayName: 'Address Properties',
+						name: 'addressProperties',
+						values: [
+							{
+								displayName: 'Type',
+								name: 'subtype',
+								type: 'options',
+								required: true,
+								default: '',
+								description: 'Type of address',
+								options: [
+									{
+										name: 'Postal',
+										value: 'postal',
+									},
+									{
+										name: 'Office',
+										value: 'office',
+									},
+								],
+							},
+							{
+								displayName: 'Address',
+								name: 'address',
+								type: 'string',
+								required: true,
+								default: '',
+								description: 'Full address',
+							},
+						],
+					},
+				],
 			},
 			{
 				displayName: 'Email',
diff --git a/packages/nodes-base/nodes/AgileCrm/GenericFunctions.ts b/packages/nodes-base/nodes/AgileCrm/GenericFunctions.ts
index 3fb6345f2f2d2..69b725adf2ba4 100644
--- a/packages/nodes-base/nodes/AgileCrm/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/AgileCrm/GenericFunctions.ts
@@ -1,12 +1,11 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	JsonObject,
+	IRequestOptions,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
@@ -15,8 +14,8 @@ import type { IContactUpdate } from './ContactInterface';
 import type { IFilterRules, ISearchConditions } from './FilterInterface';
 
 export async function agileCrmApiRequest(
-	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: any = {},
 	query: IDataObject = {},
@@ -24,7 +23,7 @@ export async function agileCrmApiRequest(
 	sendAsForm?: boolean,
 ): Promise<any> {
 	const credentials = await this.getCredentials('agileCrmApi');
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		method,
 		headers: {
 			Accept: 'application/json',
@@ -57,7 +56,7 @@ export async function agileCrmApiRequest(
 
 export async function agileCrmApiRequestAllItems(
 	this: IHookFunctions | ILoadOptionsFunctions | IExecuteFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 	body: any = {},
 	query: IDataObject = {},
@@ -95,8 +94,8 @@ export async function agileCrmApiRequestAllItems(
 }
 
 export async function agileCrmApiRequestUpdate(
-	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method = 'PUT',
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods = 'PUT',
 	endpoint?: string,
 	body: any = {},
 	_query: IDataObject = {},
@@ -104,7 +103,7 @@ export async function agileCrmApiRequestUpdate(
 ): Promise<any> {
 	const credentials = await this.getCredentials('agileCrmApi');
 	const baseUri = `https://${credentials.subdomain}.agilecrm.com/dev/`;
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		method,
 		headers: {
 			Accept: 'application/json',
diff --git a/packages/nodes-base/nodes/Airtable/Airtable.node.ts b/packages/nodes-base/nodes/Airtable/Airtable.node.ts
index eb8d499b32022..5c3d15d0d9261 100644
--- a/packages/nodes-base/nodes/Airtable/Airtable.node.ts
+++ b/packages/nodes-base/nodes/Airtable/Airtable.node.ts
@@ -1,812 +1,25 @@
-import type {
-	IExecuteFunctions,
-	IDataObject,
-	INodeExecutionData,
-	INodeType,
-	INodeTypeDescription,
-} from 'n8n-workflow';
-import { NodeOperationError } from 'n8n-workflow';
-
-import type { IRecord } from './GenericFunctions';
-import { apiRequest, apiRequestAllItems, downloadRecordAttachments } from './GenericFunctions';
-
-export class Airtable implements INodeType {
-	description: INodeTypeDescription = {
-		displayName: 'Airtable',
-		name: 'airtable',
-		icon: 'file:airtable.svg',
-		group: ['input'],
-		version: 1,
-		description: 'Read, update, write and delete data from Airtable',
-		defaults: {
-			name: 'Airtable',
-		},
-		inputs: ['main'],
-		outputs: ['main'],
-		credentials: [
-			{
-				name: 'airtableApi',
-				required: true,
-			},
-		],
-		properties: [
-			{
-				displayName: 'Operation',
-				name: 'operation',
-				type: 'options',
-				noDataExpression: true,
-				options: [
-					{
-						name: 'Append',
-						value: 'append',
-						description: 'Append the data to a table',
-						action: 'Append data to a table',
-					},
-					{
-						name: 'Delete',
-						value: 'delete',
-						description: 'Delete data from a table',
-						action: 'Delete data from a table',
-					},
-					{
-						name: 'List',
-						value: 'list',
-						description: 'List data from a table',
-						action: 'List data from a table',
-					},
-					{
-						name: 'Read',
-						value: 'read',
-						description: 'Read data from a table',
-						action: 'Read data from a table',
-					},
-					{
-						name: 'Update',
-						value: 'update',
-						description: 'Update data in a table',
-						action: 'Update data in a table',
-					},
-				],
-				default: 'read',
-			},
-
-			// ----------------------------------
-			//         All
-			// ----------------------------------
-
-			{
-				displayName: 'Base',
-				name: 'application',
-				type: 'resourceLocator',
-				default: { mode: 'url', value: '' },
-				required: true,
-				description: 'The Airtable Base in which to operate on',
-				modes: [
-					{
-						displayName: 'By URL',
-						name: 'url',
-						type: 'string',
-						placeholder: 'https://airtable.com/app12DiScdfes/tblAAAAAAAAAAAAA/viwHdfasdfeieg5p',
-						validation: [
-							{
-								type: 'regex',
-								properties: {
-									regex: 'https://airtable.com/([a-zA-Z0-9]{2,})/.*',
-									errorMessage: 'Not a valid Airtable Base URL',
-								},
-							},
-						],
-						extractValue: {
-							type: 'regex',
-							regex: 'https://airtable.com/([a-zA-Z0-9]{2,})',
-						},
-					},
-					{
-						displayName: 'ID',
-						name: 'id',
-						type: 'string',
-						validation: [
-							{
-								type: 'regex',
-								properties: {
-									regex: '[a-zA-Z0-9]{2,}',
-									errorMessage: 'Not a valid Airtable Base ID',
-								},
-							},
-						],
-						placeholder: 'appD3dfaeidke',
-						url: '=https://airtable.com/{{$value}}',
-					},
-				],
-			},
-			{
-				displayName: 'Table',
-				name: 'table',
-				type: 'resourceLocator',
-				default: { mode: 'url', value: '' },
-				required: true,
-				modes: [
-					{
-						displayName: 'By URL',
-						name: 'url',
-						type: 'string',
-						placeholder: 'https://airtable.com/app12DiScdfes/tblAAAAAAAAAAAAA/viwHdfasdfeieg5p',
-						validation: [
-							{
-								type: 'regex',
-								properties: {
-									regex: 'https://airtable.com/[a-zA-Z0-9]{2,}/([a-zA-Z0-9]{2,})/.*',
-									errorMessage: 'Not a valid Airtable Table URL',
-								},
-							},
-						],
-						extractValue: {
-							type: 'regex',
-							regex: 'https://airtable.com/[a-zA-Z0-9]{2,}/([a-zA-Z0-9]{2,})',
-						},
-					},
-					{
-						displayName: 'ID',
-						name: 'id',
-						type: 'string',
-						validation: [
-							{
-								type: 'regex',
-								properties: {
-									regex: '[a-zA-Z0-9]{2,}',
-									errorMessage: 'Not a valid Airtable Table ID',
-								},
-							},
-						],
-						placeholder: 'tbl3dirwqeidke',
-					},
-				],
-			},
-
-			// ----------------------------------
-			//         append
-			// ----------------------------------
-			{
-				displayName: 'Add All Fields',
-				name: 'addAllFields',
-				type: 'boolean',
-				displayOptions: {
-					show: {
-						operation: ['append'],
-					},
-				},
-				default: true,
-				description: 'Whether all fields should be sent to Airtable or only specific ones',
-			},
-			{
-				displayName: 'Fields',
-				name: 'fields',
-				type: 'string',
-				typeOptions: {
-					multipleValues: true,
-					multipleValueButtonText: 'Add Field',
-				},
-				requiresDataPath: 'single',
-				displayOptions: {
-					show: {
-						addAllFields: [false],
-						operation: ['append'],
-					},
-				},
-				default: [],
-				placeholder: 'Name',
-				required: true,
-				description: 'The name of fields for which data should be sent to Airtable',
-			},
-
-			// ----------------------------------
-			//         delete
-			// ----------------------------------
-			{
-				displayName: 'ID',
-				name: 'id',
-				type: 'string',
-				displayOptions: {
-					show: {
-						operation: ['delete'],
-					},
-				},
-				default: '',
-				required: true,
-				description: 'ID of the record to delete',
-			},
-
-			// ----------------------------------
-			//         list
-			// ----------------------------------
-			{
-				displayName: 'Return All',
-				name: 'returnAll',
-				type: 'boolean',
-				displayOptions: {
-					show: {
-						operation: ['list'],
-					},
-				},
-				default: true,
-				description: 'Whether to return all results or only up to a given limit',
-			},
-			{
-				displayName: 'Limit',
-				name: 'limit',
-				type: 'number',
-				displayOptions: {
-					show: {
-						operation: ['list'],
-						returnAll: [false],
-					},
-				},
-				typeOptions: {
-					minValue: 1,
-					maxValue: 100,
-				},
-				default: 100,
-				description: 'Max number of results to return',
-			},
-			{
-				displayName: 'Download Attachments',
-				name: 'downloadAttachments',
-				type: 'boolean',
-				displayOptions: {
-					show: {
-						operation: ['list'],
-					},
-				},
-				default: false,
-				description: "Whether the attachment fields define in 'Download Fields' will be downloaded",
-			},
-			{
-				displayName: 'Download Fields',
-				name: 'downloadFieldNames',
-				type: 'string',
-				required: true,
-				requiresDataPath: 'multiple',
-				displayOptions: {
-					show: {
-						operation: ['list'],
-						downloadAttachments: [true],
-					},
-				},
-				default: '',
-				description:
-					"Name of the fields of type 'attachment' that should be downloaded. Multiple ones can be defined separated by comma. Case sensitive and cannot include spaces after a comma.",
-			},
-			{
-				displayName: 'Additional Options',
-				name: 'additionalOptions',
-				type: 'collection',
-				displayOptions: {
-					show: {
-						operation: ['list'],
-					},
-				},
-				default: {},
-				description: 'Additional options which decide which records should be returned',
-				placeholder: 'Add Option',
-				options: [
-					{
-						displayName: 'Fields',
-						name: 'fields',
-						type: 'string',
-						requiresDataPath: 'single',
-						typeOptions: {
-							multipleValues: true,
-							multipleValueButtonText: 'Add Field',
-						},
-						default: [],
-						placeholder: 'Name',
-						description:
-							'Only data for fields whose names are in this list will be included in the records',
-					},
-					{
-						displayName: 'Filter By Formula',
-						name: 'filterByFormula',
-						type: 'string',
-						default: '',
-						placeholder: "NOT({Name} = '')",
-						description:
-							'A formula used to filter records. The formula will be evaluated for each record, and if the result is not 0, false, "", NaN, [], or #Error! the record will be included in the response.',
-					},
-					{
-						displayName: 'Sort',
-						name: 'sort',
-						placeholder: 'Add Sort Rule',
-						description: 'Defines how the returned records should be ordered',
-						type: 'fixedCollection',
-						typeOptions: {
-							multipleValues: true,
-						},
-						default: {},
-						options: [
-							{
-								name: 'property',
-								displayName: 'Property',
-								values: [
-									{
-										displayName: 'Field',
-										name: 'field',
-										type: 'string',
-										default: '',
-										description: 'Name of the field to sort on',
-									},
-									{
-										displayName: 'Direction',
-										name: 'direction',
-										type: 'options',
-										options: [
-											{
-												name: 'ASC',
-												value: 'asc',
-												description: 'Sort in ascending order (small -> large)',
-											},
-											{
-												name: 'DESC',
-												value: 'desc',
-												description: 'Sort in descending order (large -> small)',
-											},
-										],
-										default: 'asc',
-										description: 'The sort direction',
-									},
-								],
-							},
-						],
-					},
-					{
-						displayName: 'View',
-						name: 'view',
-						type: 'string',
-						default: '',
-						placeholder: 'All Stories',
-						description:
-							'The name or ID of a view in the Stories table. If set, only the records in that view will be returned. The records will be sorted according to the order of the view.',
-					},
-				],
-			},
-
-			// ----------------------------------
-			//         read
-			// ----------------------------------
-			{
-				displayName: 'ID',
-				name: 'id',
-				type: 'string',
-				displayOptions: {
-					show: {
-						operation: ['read'],
-					},
-				},
-				default: '',
-				required: true,
-				description: 'ID of the record to return',
-			},
-
-			// ----------------------------------
-			//         update
-			// ----------------------------------
-			{
-				displayName: 'ID',
-				name: 'id',
-				type: 'string',
-				displayOptions: {
-					show: {
-						operation: ['update'],
-					},
-				},
-				default: '',
-				required: true,
-				description: 'ID of the record to update',
-			},
-			{
-				displayName: 'Update All Fields',
-				name: 'updateAllFields',
-				type: 'boolean',
-				displayOptions: {
-					show: {
-						operation: ['update'],
-					},
-				},
-				default: true,
-				description: 'Whether all fields should be sent to Airtable or only specific ones',
-			},
-			{
-				displayName: 'Fields',
-				name: 'fields',
-				type: 'string',
-				typeOptions: {
-					multipleValues: true,
-					multipleValueButtonText: 'Add Field',
-				},
-				requiresDataPath: 'single',
-				displayOptions: {
-					show: {
-						updateAllFields: [false],
-						operation: ['update'],
-					},
-				},
-				default: [],
-				placeholder: 'Name',
-				required: true,
-				description: 'The name of fields for which data should be sent to Airtable',
-			},
-
-			// ----------------------------------
-			//         append + delete + update
-			// ----------------------------------
-			{
-				displayName: 'Options',
-				name: 'options',
-				type: 'collection',
-				placeholder: 'Add Option',
-				displayOptions: {
-					show: {
-						operation: ['append', 'delete', 'update'],
-					},
-				},
-				default: {},
-				options: [
-					{
-						displayName: 'Bulk Size',
-						name: 'bulkSize',
-						type: 'number',
-						typeOptions: {
-							minValue: 1,
-							maxValue: 10,
-						},
-						default: 10,
-						description: 'Number of records to process at once',
-					},
-					{
-						displayName: 'Ignore Fields',
-						name: 'ignoreFields',
-						type: 'string',
-						requiresDataPath: 'multiple',
-						displayOptions: {
-							show: {
-								'/operation': ['update'],
-								'/updateAllFields': [true],
-							},
-						},
-						default: '',
-						description: 'Comma-separated list of fields to ignore',
-					},
-					{
-						displayName: 'Typecast',
-						name: 'typecast',
-						type: 'boolean',
-						displayOptions: {
-							show: {
-								'/operation': ['append', 'update'],
-							},
-						},
-						default: false,
-						description:
-							'Whether the Airtable API should attempt mapping of string values for linked records & select options',
-					},
-				],
-			},
-		],
-	};
-
-	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
-		const items = this.getInputData();
-		const returnData: INodeExecutionData[] = [];
-		let responseData;
-
-		const operation = this.getNodeParameter('operation', 0);
-
-		const application = this.getNodeParameter('application', 0, undefined, {
-			extractValue: true,
-		}) as string;
-
-		const table = encodeURI(
-			this.getNodeParameter('table', 0, undefined, {
-				extractValue: true,
-			}) as string,
-		);
-
-		let returnAll = false;
-		let endpoint = '';
-		let requestMethod = '';
-
-		const body: IDataObject = {};
-		const qs: IDataObject = {};
-
-		if (operation === 'append') {
-			// ----------------------------------
-			//         append
-			// ----------------------------------
-
-			requestMethod = 'POST';
-			endpoint = `${application}/${table}`;
-
-			let addAllFields: boolean;
-			let fields: string[];
-			let options: IDataObject;
-
-			const rows: IDataObject[] = [];
-			let bulkSize = 10;
-
-			for (let i = 0; i < items.length; i++) {
-				try {
-					addAllFields = this.getNodeParameter('addAllFields', i) as boolean;
-					options = this.getNodeParameter('options', i, {});
-					bulkSize = (options.bulkSize as number) || bulkSize;
-
-					const row: IDataObject = {};
-
-					if (addAllFields) {
-						// Add all the fields the item has
-						row.fields = { ...items[i].json };
-						delete (row.fields as any).id;
-					} else {
-						// Add only the specified fields
-						row.fields = {} as IDataObject;
-
-						fields = this.getNodeParameter('fields', i, []) as string[];
-
-						for (const fieldName of fields) {
-							// @ts-ignore
-							row.fields[fieldName] = items[i].json[fieldName];
-						}
-					}
-
-					rows.push(row);
-
-					if (rows.length === bulkSize || i === items.length - 1) {
-						if (options.typecast === true) {
-							body.typecast = true;
-						}
-
-						body.records = rows;
-
-						responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
-						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData.records as IDataObject[]),
-							{ itemData: { item: i } },
-						);
-						returnData.push(...executionData);
-						// empty rows
-						rows.length = 0;
-					}
-				} catch (error) {
-					if (this.continueOnFail()) {
-						returnData.push({ json: { error: error.message } });
-						continue;
-					}
-					throw error;
-				}
-			}
-		} else if (operation === 'delete') {
-			requestMethod = 'DELETE';
-
-			const rows: string[] = [];
-			const options = this.getNodeParameter('options', 0, {});
-			const bulkSize = (options.bulkSize as number) || 10;
-
-			for (let i = 0; i < items.length; i++) {
-				try {
-					const id = this.getNodeParameter('id', i) as string;
-
-					rows.push(id);
-
-					if (rows.length === bulkSize || i === items.length - 1) {
-						endpoint = `${application}/${table}`;
-
-						// Make one request after another. This is slower but makes
-						// sure that we do not run into the rate limit they have in
-						// place and so block for 30 seconds. Later some global
-						// functionality in core should make it easy to make requests
-						// according to specific rules like not more than 5 requests
-						// per seconds.
-						qs.records = rows;
-
-						responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
-
-						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData.records as IDataObject[]),
-							{ itemData: { item: i } },
-						);
-
-						returnData.push(...executionData);
-						// empty rows
-						rows.length = 0;
-					}
-				} catch (error) {
-					if (this.continueOnFail()) {
-						returnData.push({ json: { error: error.message } });
-						continue;
-					}
-					throw error;
-				}
-			}
-		} else if (operation === 'list') {
-			// ----------------------------------
-			//         list
-			// ----------------------------------
-			try {
-				requestMethod = 'GET';
-				endpoint = `${application}/${table}`;
-
-				returnAll = this.getNodeParameter('returnAll', 0);
-
-				const downloadAttachments = this.getNodeParameter('downloadAttachments', 0);
-
-				const additionalOptions = this.getNodeParameter('additionalOptions', 0, {}) as IDataObject;
-
-				for (const key of Object.keys(additionalOptions)) {
-					if (key === 'sort' && (additionalOptions.sort as IDataObject).property !== undefined) {
-						qs[key] = (additionalOptions[key] as IDataObject).property;
-					} else {
-						qs[key] = additionalOptions[key];
-					}
-				}
-
-				if (returnAll) {
-					responseData = await apiRequestAllItems.call(this, requestMethod, endpoint, body, qs);
-				} else {
-					qs.maxRecords = this.getNodeParameter('limit', 0);
-					responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
-				}
-
-				returnData.push.apply(returnData, responseData.records as INodeExecutionData[]);
-
-				if (downloadAttachments === true) {
-					const downloadFieldNames = (
-						this.getNodeParameter('downloadFieldNames', 0) as string
-					).split(',');
-					const data = await downloadRecordAttachments.call(
-						this,
-						responseData.records as IRecord[],
-						downloadFieldNames,
-					);
-					return [data];
-				}
-
-				// We can return from here
-				return [
-					this.helpers.constructExecutionMetaData(this.helpers.returnJsonArray(returnData), {
-						itemData: { item: 0 },
-					}),
-				];
-			} catch (error) {
-				if (this.continueOnFail()) {
-					returnData.push({ json: { error: error.message } });
-				} else {
-					throw error;
-				}
-			}
-		} else if (operation === 'read') {
-			// ----------------------------------
-			//         read
-			// ----------------------------------
-
-			requestMethod = 'GET';
-
-			let id: string;
-			for (let i = 0; i < items.length; i++) {
-				id = this.getNodeParameter('id', i) as string;
-
-				endpoint = `${application}/${table}/${id}`;
-
-				// Make one request after another. This is slower but makes
-				// sure that we do not run into the rate limit they have in
-				// place and so block for 30 seconds. Later some global
-				// functionality in core should make it easy to make requests
-				// according to specific rules like not more than 5 requests
-				// per seconds.
-				try {
-					responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
-
-					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData as IDataObject[]),
-						{ itemData: { item: i } },
-					);
-
-					returnData.push(...executionData);
-				} catch (error) {
-					if (this.continueOnFail()) {
-						returnData.push({ json: { error: error.message } });
-						continue;
-					}
-					throw error;
-				}
-			}
-		} else if (operation === 'update') {
-			// ----------------------------------
-			//         update
-			// ----------------------------------
-
-			requestMethod = 'PATCH';
-
-			let updateAllFields: boolean;
-			let fields: string[];
-			let options: IDataObject;
-
-			const rows: IDataObject[] = [];
-			let bulkSize = 10;
-
-			for (let i = 0; i < items.length; i++) {
-				try {
-					updateAllFields = this.getNodeParameter('updateAllFields', i) as boolean;
-					options = this.getNodeParameter('options', i, {});
-					bulkSize = (options.bulkSize as number) || bulkSize;
-
-					const row: IDataObject = {};
-					row.fields = {} as IDataObject;
-
-					if (updateAllFields) {
-						// Update all the fields the item has
-						row.fields = { ...items[i].json };
-						// remove id field
-						delete (row.fields as any).id;
-
-						if (options.ignoreFields && options.ignoreFields !== '') {
-							const ignoreFields = (options.ignoreFields as string)
-								.split(',')
-								.map((field) => field.trim())
-								.filter((field) => !!field);
-							if (ignoreFields.length) {
-								// From: https://stackoverflow.com/questions/17781472/how-to-get-a-subset-of-a-javascript-objects-properties
-								row.fields = Object.entries(items[i].json)
-									.filter(([key]) => !ignoreFields.includes(key))
-									.reduce((obj, [key, val]) => Object.assign(obj, { [key]: val }), {});
-							}
-						}
-					} else {
-						fields = this.getNodeParameter('fields', i, []) as string[];
-
-						for (const fieldName of fields) {
-							// @ts-ignore
-							row.fields[fieldName] = items[i].json[fieldName];
-						}
-					}
-
-					row.id = this.getNodeParameter('id', i) as string;
-
-					rows.push(row);
-
-					if (rows.length === bulkSize || i === items.length - 1) {
-						endpoint = `${application}/${table}`;
-
-						// Make one request after another. This is slower but makes
-						// sure that we do not run into the rate limit they have in
-						// place and so block for 30 seconds. Later some global
-						// functionality in core should make it easy to make requests
-						// according to specific rules like not more than 5 requests
-						// per seconds.
-
-						const data = { records: rows, typecast: options.typecast ? true : false };
-
-						responseData = await apiRequest.call(this, requestMethod, endpoint, data, qs);
-
-						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData.records as IDataObject[]),
-							{ itemData: { item: i } },
-						);
-
-						returnData.push(...executionData);
-
-						// empty rows
-						rows.length = 0;
-					}
-				} catch (error) {
-					if (this.continueOnFail()) {
-						returnData.push({ json: { error: error.message } });
-						continue;
-					}
-					throw error;
-				}
-			}
-		} else {
-			throw new NodeOperationError(this.getNode(), `The operation "${operation}" is not known!`);
-		}
-
-		return this.prepareOutputData(returnData);
+import type { INodeTypeBaseDescription, IVersionedNodeType } from 'n8n-workflow';
+import { VersionedNodeType } from 'n8n-workflow';
+
+import { AirtableV1 } from './v1/AirtableV1.node';
+import { AirtableV2 } from './v2/AirtableV2.node';
+
+export class Airtable extends VersionedNodeType {
+	constructor() {
+		const baseDescription: INodeTypeBaseDescription = {
+			displayName: 'Airtable',
+			name: 'airtable',
+			icon: 'file:airtable.svg',
+			group: ['input'],
+			description: 'Read, update, write and delete data from Airtable',
+			defaultVersion: 2,
+		};
+
+		const nodeVersions: IVersionedNodeType['nodeVersions'] = {
+			1: new AirtableV1(baseDescription),
+			2: new AirtableV2(baseDescription),
+		};
+
+		super(nodeVersions, baseDescription);
 	}
 }
diff --git a/packages/nodes-base/nodes/Airtable/AirtableTrigger.node.ts b/packages/nodes-base/nodes/Airtable/AirtableTrigger.node.ts
index b54ae8f8da0f4..6031ae754e547 100644
--- a/packages/nodes-base/nodes/Airtable/AirtableTrigger.node.ts
+++ b/packages/nodes-base/nodes/Airtable/AirtableTrigger.node.ts
@@ -7,10 +7,9 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import type { IRecord } from './GenericFunctions';
-import { apiRequestAllItems, downloadRecordAttachments } from './GenericFunctions';
-
-import moment from 'moment';
+import moment from 'moment-timezone';
+import type { IRecord } from './v1/GenericFunctions';
+import { apiRequestAllItems, downloadRecordAttachments } from './v1/GenericFunctions';
 
 export class AirtableTrigger implements INodeType {
 	description: INodeTypeDescription = {
@@ -28,12 +27,55 @@ export class AirtableTrigger implements INodeType {
 			{
 				name: 'airtableApi',
 				required: true,
+				displayOptions: {
+					show: {
+						authentication: ['airtableApi'],
+					},
+				},
+			},
+			{
+				name: 'airtableTokenApi',
+				required: true,
+				displayOptions: {
+					show: {
+						authentication: ['airtableTokenApi'],
+					},
+				},
+			},
+			{
+				name: 'airtableOAuth2Api',
+				required: true,
+				displayOptions: {
+					show: {
+						authentication: ['airtableOAuth2Api'],
+					},
+				},
 			},
 		],
 		polling: true,
 		inputs: [],
 		outputs: ['main'],
 		properties: [
+			{
+				displayName: 'Authentication',
+				name: 'authentication',
+				type: 'options',
+				options: [
+					{
+						name: 'API Key',
+						value: 'airtableApi',
+					},
+					{
+						name: 'Access Token',
+						value: 'airtableTokenApi',
+					},
+					{
+						name: 'OAuth2',
+						value: 'airtableOAuth2Api',
+					},
+				],
+				default: 'airtableApi',
+			},
 			{
 				displayName: 'Base',
 				name: 'baseId',
@@ -192,19 +234,14 @@ export class AirtableTrigger implements INodeType {
 
 	async poll(this: IPollFunctions): Promise<INodeExecutionData[][] | null> {
 		const downloadAttachments = this.getNodeParameter('downloadAttachments', 0) as boolean;
-
 		const webhookData = this.getWorkflowStaticData('node');
-
-		const qs: IDataObject = {};
-
 		const additionalFields = this.getNodeParameter('additionalFields') as IDataObject;
-
 		const base = this.getNodeParameter('baseId', '', { extractValue: true }) as string;
-
 		const table = this.getNodeParameter('tableId', '', { extractValue: true }) as string;
-
 		const triggerField = this.getNodeParameter('triggerField') as string;
 
+		const qs: IDataObject = {};
+
 		const endpoint = `${base}/${table}`;
 
 		const now = moment().utc().format();
diff --git a/packages/nodes-base/nodes/Airtable/GenericFunctions.ts b/packages/nodes-base/nodes/Airtable/GenericFunctions.ts
deleted file mode 100644
index 80e769e18a22b..0000000000000
--- a/packages/nodes-base/nodes/Airtable/GenericFunctions.ts
+++ /dev/null
@@ -1,129 +0,0 @@
-import type { OptionsWithUri } from 'request';
-
-import type {
-	IBinaryKeyData,
-	IDataObject,
-	IExecuteFunctions,
-	IPollFunctions,
-	ILoadOptionsFunctions,
-	INodeExecutionData,
-} from 'n8n-workflow';
-
-interface IAttachment {
-	url: string;
-	filename: string;
-	type: string;
-}
-
-export interface IRecord {
-	fields: {
-		[key: string]: string | IAttachment[];
-	};
-}
-
-/**
- * Make an API request to Airtable
- *
- */
-export async function apiRequest(
-	this: IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions,
-	method: string,
-	endpoint: string,
-	body: object,
-	query?: IDataObject,
-	uri?: string,
-	option: IDataObject = {},
-): Promise<any> {
-	query = query || {};
-
-	// For some reason for some endpoints the bearer auth does not work
-	// and it returns 404 like for the /meta request. So we always send
-	// it as query string.
-	// query.api_key = credentials.apiKey;
-
-	const options: OptionsWithUri = {
-		headers: {},
-		method,
-		body,
-		qs: query,
-		uri: uri || `https://api.airtable.com/v0/${endpoint}`,
-		useQuerystring: false,
-		json: true,
-	};
-
-	if (Object.keys(option).length !== 0) {
-		Object.assign(options, option);
-	}
-
-	if (Object.keys(body).length === 0) {
-		delete options.body;
-	}
-
-	return this.helpers.requestWithAuthentication.call(this, 'airtableApi', options);
-}
-
-/**
- * Make an API request to paginated Airtable endpoint
- * and return all results
- *
- * @param {(IExecuteFunctions | IExecuteFunctions)} this
- */
-export async function apiRequestAllItems(
-	this: IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions,
-	method: string,
-	endpoint: string,
-	body: IDataObject,
-	query?: IDataObject,
-): Promise<any> {
-	if (query === undefined) {
-		query = {};
-	}
-	query.pageSize = 100;
-
-	const returnData: IDataObject[] = [];
-
-	let responseData;
-
-	do {
-		responseData = await apiRequest.call(this, method, endpoint, body, query);
-		returnData.push.apply(returnData, responseData.records as IDataObject[]);
-
-		query.offset = responseData.offset;
-	} while (responseData.offset !== undefined);
-
-	return {
-		records: returnData,
-	};
-}
-
-export async function downloadRecordAttachments(
-	this: IExecuteFunctions | IPollFunctions,
-	records: IRecord[],
-	fieldNames: string[],
-): Promise<INodeExecutionData[]> {
-	const elements: INodeExecutionData[] = [];
-	for (const record of records) {
-		const element: INodeExecutionData = { json: {}, binary: {} };
-		element.json = record as unknown as IDataObject;
-		for (const fieldName of fieldNames) {
-			if (record.fields[fieldName] !== undefined) {
-				for (const [index, attachment] of (record.fields[fieldName] as IAttachment[]).entries()) {
-					const file = await apiRequest.call(this, 'GET', '', {}, {}, attachment.url, {
-						json: false,
-						encoding: null,
-					});
-					element.binary![`${fieldName}_${index}`] = await this.helpers.prepareBinaryData(
-						Buffer.from(file as string),
-						attachment.filename,
-						attachment.type,
-					);
-				}
-			}
-		}
-		if (Object.keys(element.binary as IBinaryKeyData).length === 0) {
-			delete element.binary;
-		}
-		elements.push(element);
-	}
-	return elements;
-}
diff --git a/packages/nodes-base/nodes/Airtable/airtable.svg b/packages/nodes-base/nodes/Airtable/airtable.svg
index 0235854a9b067..5dfcb5696fef4 100644
--- a/packages/nodes-base/nodes/Airtable/airtable.svg
+++ b/packages/nodes-base/nodes/Airtable/airtable.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 200 170"><path d="M89 4.8L16.2 34.9c-4.1 1.7-4 7.4.1 9.1l73.2 29c6.4 2.6 13.6 2.6 20 0l73.2-29c4.1-1.6 4.1-7.4.1-9.1l-73-30.1C103.2 2 95.7 2 89 4.8" fill="#fcb400"/><path d="M105.9 88.9v72.5c0 3.4 3.5 5.8 6.7 4.5l81.6-31.7c1.9-.7 3.1-2.5 3.1-4.5V57.2c0-3.4-3.5-5.8-6.7-4.5L109 84.3c-1.9.8-3.1 2.6-3.1 4.6" fill="#18bfff"/><path d="M86.9 92.6l-24.2 11.7-2.5 1.2L9.1 130c-3.2 1.6-7.4-.8-7.4-4.4V57.5c0-1.3.7-2.4 1.6-3.3.4-.4.8-.7 1.2-.9 1.2-.7 3-.9 4.4-.3l77.5 30.7c4 1.5 4.3 7.1.5 8.9" fill="#f82b60"/><path d="M86.9 92.6l-24.2 11.7-59.4-50c.4-.4.8-.7 1.2-.9 1.2-.7 3-.9 4.4-.3l77.5 30.7c4 1.4 4.3 7 .5 8.8" fill="#ba1e45"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 200 170"><path fill="#fcb400" d="M89 4.8 16.2 34.9c-4.1 1.7-4 7.4.1 9.1l73.2 29c6.4 2.6 13.6 2.6 20 0l73.2-29c4.1-1.6 4.1-7.4.1-9.1l-73-30.1C103.2 2 95.7 2 89 4.8"/><path fill="#18bfff" d="M105.9 88.9v72.5c0 3.4 3.5 5.8 6.7 4.5l81.6-31.7c1.9-.7 3.1-2.5 3.1-4.5V57.2c0-3.4-3.5-5.8-6.7-4.5L109 84.3c-1.9.8-3.1 2.6-3.1 4.6"/><path fill="#f82b60" d="m86.9 92.6-24.2 11.7-2.5 1.2L9.1 130c-3.2 1.6-7.4-.8-7.4-4.4V57.5c0-1.3.7-2.4 1.6-3.3q.6-.6 1.2-.9c1.2-.7 3-.9 4.4-.3l77.5 30.7c4 1.5 4.3 7.1.5 8.9"/><path fill="#ba1e45" d="m86.9 92.6-24.2 11.7-59.4-50q.6-.6 1.2-.9c1.2-.7 3-.9 4.4-.3l77.5 30.7c4 1.4 4.3 7 .5 8.8"/></svg>
\ No newline at end of file
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
new file mode 100644
index 0000000000000..f535def3cb065
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/test/v2/node/base/getMany.test.ts
@@ -0,0 +1,124 @@
+import nock from 'nock';
+
+import * as getMany from '../../../../v2/actions/base/getMany.operation';
+
+import * as transport from '../../../../v2/transport';
+import { createMockExecuteFunction } from '../helpers';
+
+const bases = [
+	{
+		id: 'appXXX',
+		name: 'base 1',
+		permissionLevel: 'create',
+	},
+	{
+		id: 'appYYY',
+		name: 'base 2',
+		permissionLevel: 'edit',
+	},
+	{
+		id: 'appZZZ',
+		name: 'base 3',
+		permissionLevel: 'create',
+	},
+];
+
+jest.mock('../../../../v2/transport', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		apiRequest: jest.fn(async function () {
+			return { bases };
+		}),
+	};
+});
+
+describe('Test AirtableV2, base => getMany', () => {
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	it('should return all bases', async () => {
+		const nodeParameters = {
+			resource: 'base',
+			returnAll: true,
+			options: {},
+		};
+
+		const response = await getMany.execute.call(createMockExecuteFunction(nodeParameters));
+
+		expect(transport.apiRequest).toHaveBeenCalledWith('GET', 'meta/bases');
+
+		expect(response).toEqual([
+			{
+				json: {
+					id: 'appXXX',
+					name: 'base 1',
+					permissionLevel: 'create',
+				},
+				pairedItem: [
+					{
+						item: 0,
+					},
+				],
+			},
+			{
+				json: {
+					id: 'appYYY',
+					name: 'base 2',
+					permissionLevel: 'edit',
+				},
+				pairedItem: [
+					{
+						item: 0,
+					},
+				],
+			},
+			{
+				json: {
+					id: 'appZZZ',
+					name: 'base 3',
+					permissionLevel: 'create',
+				},
+				pairedItem: [
+					{
+						item: 0,
+					},
+				],
+			},
+		]);
+	});
+
+	it('should return one base with edit permission', async () => {
+		const nodeParameters = {
+			resource: 'base',
+			returnAll: false,
+			limit: 2,
+			options: { permissionLevel: ['edit'] },
+		};
+
+		const response = await getMany.execute.call(createMockExecuteFunction(nodeParameters));
+
+		expect(transport.apiRequest).toHaveBeenCalledWith('GET', 'meta/bases');
+
+		expect(response).toEqual([
+			{
+				json: {
+					id: 'appYYY',
+					name: 'base 2',
+					permissionLevel: 'edit',
+				},
+				pairedItem: [
+					{
+						item: 0,
+					},
+				],
+			},
+		]);
+	});
+});
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
new file mode 100644
index 0000000000000..df3b8ed930470
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/test/v2/node/base/getSchema.test.ts
@@ -0,0 +1,48 @@
+import nock from 'nock';
+
+import * as getSchema from '../../../../v2/actions/base/getSchema.operation';
+
+import * as transport from '../../../../v2/transport';
+import { createMockExecuteFunction } from '../helpers';
+
+jest.mock('../../../../v2/transport', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		apiRequest: jest.fn(async function () {
+			return {};
+		}),
+	};
+});
+
+describe('Test AirtableV2, base => getSchema', () => {
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	it('should return all bases', async () => {
+		const nodeParameters = {
+			resource: 'base',
+			operation: 'getSchema',
+			base: {
+				value: 'appYobase',
+			},
+		};
+
+		const items = [
+			{
+				json: {},
+			},
+		];
+
+		await getSchema.execute.call(createMockExecuteFunction(nodeParameters), items);
+
+		expect(transport.apiRequest).toBeCalledTimes(1);
+		expect(transport.apiRequest).toHaveBeenCalledWith('GET', 'meta/bases/appYobase/tables');
+	});
+});
diff --git a/packages/nodes-base/nodes/Airtable/test/v2/node/helpers.ts b/packages/nodes-base/nodes/Airtable/test/v2/node/helpers.ts
new file mode 100644
index 0000000000000..1edd17cd16aa0
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/test/v2/node/helpers.ts
@@ -0,0 +1,38 @@
+import type { IDataObject, IExecuteFunctions, IGetNodeParameterOptions, INode } from 'n8n-workflow';
+
+import { get } from 'lodash';
+import { constructExecutionMetaData } from 'n8n-core';
+
+export const node: INode = {
+	id: '11',
+	name: 'Airtable node',
+	typeVersion: 2,
+	type: 'n8n-nodes-base.airtable',
+	position: [42, 42],
+	parameters: {
+		operation: 'create',
+	},
+};
+
+export const createMockExecuteFunction = (nodeParameters: IDataObject) => {
+	const fakeExecuteFunction = {
+		getInputData() {
+			return [{ json: {} }];
+		},
+		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: () => false,
+	} as unknown as IExecuteFunctions;
+	return fakeExecuteFunction;
+};
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
new file mode 100644
index 0000000000000..1b17b25ea7711
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/test/v2/node/record/create.test.ts
@@ -0,0 +1,171 @@
+import nock from 'nock';
+
+import * as create from '../../../../v2/actions/record/create.operation';
+
+import * as transport from '../../../../v2/transport';
+import { createMockExecuteFunction } from '../helpers';
+
+jest.mock('../../../../v2/transport', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		apiRequest: jest.fn(async function () {
+			return {};
+		}),
+	};
+});
+
+describe('Test AirtableV2, create operation', () => {
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	afterEach(() => {
+		jest.restoreAllMocks();
+	});
+
+	it('should create a record, autoMapInputData', async () => {
+		const nodeParameters = {
+			operation: 'create',
+			columns: {
+				mappingMode: 'autoMapInputData',
+				value: {
+					bar: 'bar 1',
+					foo: 'foo 1',
+					spam: 'eggs',
+				},
+				matchingColumns: [],
+				schema: [
+					{
+						id: 'foo',
+						displayName: 'foo',
+						required: false,
+						defaultMatch: false,
+						display: true,
+						type: 'string',
+					},
+					{
+						id: 'bar',
+						displayName: 'bar',
+						required: false,
+						defaultMatch: false,
+						display: true,
+						type: 'string',
+					},
+					{
+						id: 'spam',
+						displayName: 'spam',
+						required: false,
+						defaultMatch: false,
+						display: true,
+						type: 'string',
+					},
+				],
+			},
+			options: {
+				typecast: true,
+				ignoreFields: 'spam',
+			},
+		};
+
+		const items = [
+			{
+				json: {
+					foo: 'foo 1',
+					spam: 'eggs',
+					bar: 'bar 1',
+				},
+			},
+			{
+				json: {
+					foo: 'foo 2',
+					spam: 'eggs',
+					bar: 'bar 2',
+				},
+			},
+		];
+
+		await create.execute.call(
+			createMockExecuteFunction(nodeParameters),
+			items,
+			'appYoLbase',
+			'tblltable',
+		);
+
+		expect(transport.apiRequest).toHaveBeenCalledTimes(2);
+		expect(transport.apiRequest).toHaveBeenCalledWith('POST', 'appYoLbase/tblltable', {
+			fields: {
+				foo: 'foo 1',
+				bar: 'bar 1',
+			},
+			typecast: true,
+		});
+		expect(transport.apiRequest).toHaveBeenCalledWith('POST', 'appYoLbase/tblltable', {
+			fields: {
+				foo: 'foo 2',
+				bar: 'bar 2',
+			},
+			typecast: true,
+		});
+	});
+
+	it('should create a record, defineBelow', async () => {
+		const nodeParameters = {
+			operation: 'create',
+			columns: {
+				mappingMode: 'defineBelow',
+				value: {
+					bar: 'bar 1',
+					foo: 'foo 1',
+				},
+				matchingColumns: [],
+				schema: [
+					{
+						id: 'foo',
+						displayName: 'foo',
+						required: false,
+						defaultMatch: false,
+						display: true,
+						type: 'string',
+					},
+					{
+						id: 'bar',
+						displayName: 'bar',
+						required: false,
+						defaultMatch: false,
+						display: true,
+						type: 'string',
+					},
+				],
+			},
+			options: {},
+		};
+
+		const items = [
+			{
+				json: {},
+			},
+		];
+
+		await create.execute.call(
+			createMockExecuteFunction(nodeParameters),
+			items,
+			'appYoLbase',
+			'tblltable',
+		);
+
+		expect(transport.apiRequest).toHaveBeenCalledTimes(1);
+		expect(transport.apiRequest).toHaveBeenCalledWith('POST', 'appYoLbase/tblltable', {
+			fields: {
+				foo: 'foo 1',
+				bar: 'bar 1',
+			},
+			typecast: false,
+		});
+	});
+});
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
new file mode 100644
index 0000000000000..2ea8b11d75ca5
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/test/v2/node/record/deleteRecord.test.ts
@@ -0,0 +1,54 @@
+import nock from 'nock';
+
+import * as deleteRecord from '../../../../v2/actions/record/deleteRecord.operation';
+
+import * as transport from '../../../../v2/transport';
+import { createMockExecuteFunction } from '../helpers';
+
+jest.mock('../../../../v2/transport', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		apiRequest: jest.fn(async function () {
+			return {};
+		}),
+	};
+});
+
+describe('Test AirtableV2, deleteRecord operation', () => {
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	afterEach(() => {
+		jest.restoreAllMocks();
+	});
+
+	it('should delete a record', async () => {
+		const nodeParameters = {
+			operation: 'deleteRecord',
+			id: 'recXXX',
+		};
+
+		const items = [
+			{
+				json: {},
+			},
+		];
+
+		await deleteRecord.execute.call(
+			createMockExecuteFunction(nodeParameters),
+			items,
+			'appYoLbase',
+			'tblltable',
+		);
+
+		expect(transport.apiRequest).toHaveBeenCalledTimes(1);
+		expect(transport.apiRequest).toHaveBeenCalledWith('DELETE', 'appYoLbase/tblltable/recXXX');
+	});
+});
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
new file mode 100644
index 0000000000000..3d8c709abd450
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/test/v2/node/record/get.test.ts
@@ -0,0 +1,76 @@
+import nock from 'nock';
+
+import * as get from '../../../../v2/actions/record/get.operation';
+
+import * as transport from '../../../../v2/transport';
+import { createMockExecuteFunction } from '../helpers';
+
+jest.mock('../../../../v2/transport', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		apiRequest: jest.fn(async function (method: string) {
+			if (method === 'GET') {
+				return {
+					id: 'recXXX',
+					fields: {
+						foo: 'foo 1',
+						bar: 'bar 1',
+					},
+				};
+			}
+		}),
+	};
+});
+
+describe('Test AirtableV2, create operation', () => {
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	afterEach(() => {
+		jest.restoreAllMocks();
+	});
+
+	it('should create a record, autoMapInputData', async () => {
+		const nodeParameters = {
+			operation: 'get',
+			id: 'recXXX',
+			options: {},
+		};
+
+		const items = [
+			{
+				json: {},
+			},
+		];
+
+		const responce = await get.execute.call(
+			createMockExecuteFunction(nodeParameters),
+			items,
+			'appYoLbase',
+			'tblltable',
+		);
+
+		expect(transport.apiRequest).toHaveBeenCalledTimes(1);
+		expect(transport.apiRequest).toHaveBeenCalledWith('GET', 'appYoLbase/tblltable/recXXX');
+
+		expect(responce).toEqual([
+			{
+				json: {
+					id: 'recXXX',
+					foo: 'foo 1',
+					bar: 'bar 1',
+				},
+				pairedItem: {
+					item: 0,
+				},
+			},
+		]);
+	});
+});
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
new file mode 100644
index 0000000000000..83e2bab61bf7d
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/test/v2/node/record/search.test.ts
@@ -0,0 +1,164 @@
+import nock from 'nock';
+
+import * as search from '../../../../v2/actions/record/search.operation';
+
+import * as transport from '../../../../v2/transport';
+import { createMockExecuteFunction } from '../helpers';
+
+jest.mock('../../../../v2/transport', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		apiRequest: jest.fn(async function (method: string) {
+			if (method === 'GET') {
+				return {
+					records: [
+						{
+							id: 'recYYY',
+							fields: {
+								foo: 'foo 2',
+								bar: 'bar 2',
+							},
+						},
+					],
+				};
+			}
+		}),
+		apiRequestAllItems: jest.fn(async function (method: string) {
+			if (method === 'GET') {
+				return {
+					records: [
+						{
+							id: 'recYYY',
+							fields: {
+								foo: 'foo 2',
+								bar: 'bar 2',
+							},
+						},
+						{
+							id: 'recXXX',
+							fields: {
+								foo: 'foo 1',
+								bar: 'bar 1',
+							},
+						},
+					],
+				};
+			}
+		}),
+	};
+});
+
+describe('Test AirtableV2, search operation', () => {
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	it('should return all records', async () => {
+		const nodeParameters = {
+			operation: 'search',
+			filterByFormula: 'foo',
+			returnAll: true,
+			options: {
+				fields: ['foo', 'bar'],
+				view: {
+					value: 'viwView',
+					mode: 'list',
+				},
+			},
+			sort: {
+				property: [
+					{
+						field: 'bar',
+						direction: 'desc',
+					},
+				],
+			},
+		};
+
+		const items = [
+			{
+				json: {},
+			},
+		];
+
+		const result = await search.execute.call(
+			createMockExecuteFunction(nodeParameters),
+			items,
+			'appYoLbase',
+			'tblltable',
+		);
+
+		expect(transport.apiRequestAllItems).toHaveBeenCalledTimes(1);
+		expect(transport.apiRequestAllItems).toHaveBeenCalledWith(
+			'GET',
+			'appYoLbase/tblltable',
+			{},
+			{
+				fields: ['foo', 'bar'],
+				filterByFormula: 'foo',
+				sort: [{ direction: 'desc', field: 'bar' }],
+				view: 'viwView',
+			},
+		);
+
+		expect(result).toHaveLength(2);
+		expect(result[0]).toEqual({
+			json: { id: 'recYYY', foo: 'foo 2', bar: 'bar 2' },
+			pairedItem: [
+				{
+					item: 0,
+				},
+			],
+		});
+	});
+
+	it('should return all records', async () => {
+		const nodeParameters = {
+			operation: 'search',
+			filterByFormula: 'foo',
+			returnAll: false,
+			limit: 1,
+			options: {
+				fields: ['foo', 'bar'],
+			},
+			sort: {},
+		};
+
+		const items = [
+			{
+				json: {},
+			},
+		];
+
+		const result = await search.execute.call(
+			createMockExecuteFunction(nodeParameters),
+			items,
+			'appYoLbase',
+			'tblltable',
+		);
+
+		expect(transport.apiRequest).toHaveBeenCalledTimes(1);
+		expect(transport.apiRequest).toHaveBeenCalledWith(
+			'GET',
+			'appYoLbase/tblltable',
+			{},
+			{ fields: ['foo', 'bar'], filterByFormula: 'foo', maxRecords: 1 },
+		);
+
+		expect(result).toHaveLength(1);
+		expect(result[0]).toEqual({
+			json: { id: 'recYYY', foo: 'foo 2', bar: 'bar 2' },
+			pairedItem: [
+				{
+					item: 0,
+				},
+			],
+		});
+	});
+});
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
new file mode 100644
index 0000000000000..afe736c914441
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/test/v2/node/record/update.test.ts
@@ -0,0 +1,120 @@
+import nock from 'nock';
+
+import * as update from '../../../../v2/actions/record/update.operation';
+
+import * as transport from '../../../../v2/transport';
+import { createMockExecuteFunction } from '../helpers';
+
+jest.mock('../../../../v2/transport', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		apiRequest: jest.fn(async function () {
+			return {};
+		}),
+		batchUpdate: jest.fn(async function () {
+			return {};
+		}),
+		apiRequestAllItems: jest.fn(async function (method: string) {
+			if (method === 'GET') {
+				return {
+					records: [
+						{
+							id: 'recYYY',
+							fields: {
+								foo: 'foo 2',
+								bar: 'bar 2',
+							},
+						},
+						{
+							id: 'recXXX',
+							fields: {
+								foo: 'foo 1',
+								bar: 'bar 1',
+							},
+						},
+					],
+				};
+			}
+		}),
+	};
+});
+
+describe('Test AirtableV2, update operation', () => {
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	it('should update a record by id, autoMapInputData', async () => {
+		const nodeParameters = {
+			operation: 'update',
+			columns: {
+				mappingMode: 'autoMapInputData',
+				matchingColumns: ['id'],
+			},
+			options: {},
+		};
+
+		const items = [
+			{
+				json: {
+					id: 'recXXX',
+					foo: 'foo 1',
+					bar: 'bar 1',
+				},
+			},
+		];
+
+		await update.execute.call(
+			createMockExecuteFunction(nodeParameters),
+			items,
+			'appYoLbase',
+			'tblltable',
+		);
+
+		expect(transport.batchUpdate).toHaveBeenCalledWith(
+			'appYoLbase/tblltable',
+			{ typecast: false },
+			[{ fields: { bar: 'bar 1', foo: 'foo 1' }, id: 'recXXX' }],
+		);
+	});
+
+	it('should update a record by field name, autoMapInputData', async () => {
+		const nodeParameters = {
+			operation: 'update',
+			columns: {
+				mappingMode: 'autoMapInputData',
+				matchingColumns: ['foo'],
+			},
+			options: {},
+		};
+
+		const items = [
+			{
+				json: {
+					id: 'recXXX',
+					foo: 'foo 1',
+					bar: 'bar 1',
+				},
+			},
+		];
+
+		await update.execute.call(
+			createMockExecuteFunction(nodeParameters),
+			items,
+			'appYoLbase',
+			'tblltable',
+		);
+
+		expect(transport.batchUpdate).toHaveBeenCalledWith(
+			'appYoLbase/tblltable',
+			{ typecast: false },
+			[{ fields: { bar: 'bar 1', foo: 'foo 1', id: 'recXXX' }, id: 'recXXX' }],
+		);
+	});
+});
diff --git a/packages/nodes-base/nodes/Airtable/test/v2/utils.test.ts b/packages/nodes-base/nodes/Airtable/test/v2/utils.test.ts
new file mode 100644
index 0000000000000..e8028cd7c2e4a
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/test/v2/utils.test.ts
@@ -0,0 +1,125 @@
+import { findMatches, removeIgnored } from '../../v2/helpers/utils';
+
+describe('test AirtableV2, removeIgnored', () => {
+	it('should remove ignored fields', () => {
+		const data = {
+			foo: 'foo',
+			baz: 'baz',
+			spam: 'spam',
+		};
+
+		const ignore = 'baz,spam';
+
+		const result = removeIgnored(data, ignore);
+
+		expect(result).toEqual({
+			foo: 'foo',
+		});
+	});
+	it('should return the same data if ignore field does not present', () => {
+		const data = {
+			foo: 'foo',
+		};
+
+		const ignore = 'bar';
+
+		const result = removeIgnored(data, ignore);
+
+		expect(result).toEqual(data);
+	});
+	it('should return the same data if empty string', () => {
+		const data = {
+			foo: 'foo',
+		};
+
+		const ignore = '';
+
+		const result = removeIgnored(data, ignore);
+
+		expect(result).toEqual(data);
+	});
+});
+
+describe('test AirtableV2, findMatches', () => {
+	it('should find match', () => {
+		const data = [
+			{
+				fields: {
+					id: 'rec123',
+					data: 'data 1',
+				},
+			},
+			{
+				fields: {
+					id: 'rec456',
+					data: 'data 2',
+				},
+			},
+		];
+
+		const key = 'id';
+
+		const result = findMatches(data, [key], {
+			id: 'rec123',
+			data: 'data 1',
+		});
+
+		expect(result).toEqual([
+			{
+				fields: {
+					id: 'rec123',
+					data: 'data 1',
+				},
+			},
+		]);
+	});
+	it('should find all matches', () => {
+		const data = [
+			{
+				fields: {
+					id: 'rec123',
+					data: 'data 1',
+				},
+			},
+			{
+				fields: {
+					id: 'rec456',
+					data: 'data 2',
+				},
+			},
+			{
+				fields: {
+					id: 'rec123',
+					data: 'data 3',
+				},
+			},
+		];
+
+		const key = 'id';
+
+		const result = findMatches(
+			data,
+			[key],
+			{
+				id: 'rec123',
+				data: 'data 1',
+			},
+			true,
+		);
+
+		expect(result).toEqual([
+			{
+				fields: {
+					id: 'rec123',
+					data: 'data 1',
+				},
+			},
+			{
+				fields: {
+					id: 'rec123',
+					data: 'data 3',
+				},
+			},
+		]);
+	});
+});
diff --git a/packages/nodes-base/nodes/Airtable/v1/AirtableV1.node.ts b/packages/nodes-base/nodes/Airtable/v1/AirtableV1.node.ts
new file mode 100644
index 0000000000000..22517772d88ae
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/v1/AirtableV1.node.ts
@@ -0,0 +1,896 @@
+/* eslint-disable n8n-nodes-base/node-filename-against-convention */
+import type {
+	IExecuteFunctions,
+	IDataObject,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+	INodeTypeBaseDescription,
+	IHttpRequestMethods,
+} from 'n8n-workflow';
+import { 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';
+
+const versionDescription: INodeTypeDescription = {
+	displayName: 'Airtable',
+	name: 'airtable',
+	icon: 'file:airtable.svg',
+	group: ['input'],
+	version: 1,
+	description: 'Read, update, write and delete data from Airtable',
+	defaults: {
+		name: 'Airtable',
+	},
+	inputs: ['main'],
+	outputs: ['main'],
+	credentials: [
+		{
+			name: 'airtableApi',
+			required: true,
+			displayOptions: {
+				show: {
+					authentication: ['airtableApi'],
+				},
+			},
+		},
+		{
+			name: 'airtableTokenApi',
+			required: true,
+			displayOptions: {
+				show: {
+					authentication: ['airtableTokenApi'],
+				},
+			},
+		},
+		{
+			name: 'airtableOAuth2Api',
+			required: true,
+			displayOptions: {
+				show: {
+					authentication: ['airtableOAuth2Api'],
+				},
+			},
+		},
+	],
+	properties: [
+		{
+			displayName: 'Authentication',
+			name: 'authentication',
+			type: 'options',
+			options: [
+				{
+					name: 'Access Token',
+					value: 'airtableTokenApi',
+				},
+				{
+					name: 'OAuth2',
+					value: 'airtableOAuth2Api',
+				},
+				{
+					name: 'API Key (Deprecated)',
+					value: 'airtableApi',
+				},
+			],
+			default: 'airtableApi',
+		},
+		oldVersionNotice,
+		{
+			displayName:
+				"This type of connection (API Key) was deprecated and can't be used anymore. Please create a new credential of type 'Access Token' instead.",
+			name: 'deprecated',
+			type: 'notice',
+			default: '',
+			displayOptions: {
+				show: {
+					authentication: ['airtableApi'],
+				},
+			},
+		},
+		{
+			displayName: 'Operation',
+			name: 'operation',
+			type: 'options',
+			noDataExpression: true,
+			options: [
+				{
+					name: 'Append',
+					value: 'append',
+					description: 'Append the data to a table',
+					action: 'Append data to a table',
+				},
+				{
+					name: 'Delete',
+					value: 'delete',
+					description: 'Delete data from a table',
+					action: 'Delete data from a table',
+				},
+				{
+					name: 'List',
+					value: 'list',
+					description: 'List data from a table',
+					action: 'List data from a table',
+				},
+				{
+					name: 'Read',
+					value: 'read',
+					description: 'Read data from a table',
+					action: 'Read data from a table',
+				},
+				{
+					name: 'Update',
+					value: 'update',
+					description: 'Update data in a table',
+					action: 'Update data in a table',
+				},
+			],
+			default: 'read',
+		},
+
+		// ----------------------------------
+		//         All
+		// ----------------------------------
+
+		{
+			displayName: 'Base',
+			name: 'application',
+			type: 'resourceLocator',
+			default: { mode: 'url', value: '' },
+			required: true,
+			description: 'The Airtable Base in which to operate on',
+			modes: [
+				{
+					displayName: 'By URL',
+					name: 'url',
+					type: 'string',
+					placeholder: 'https://airtable.com/app12DiScdfes/tblAAAAAAAAAAAAA/viwHdfasdfeieg5p',
+					validation: [
+						{
+							type: 'regex',
+							properties: {
+								regex: 'https://airtable.com/([a-zA-Z0-9]{2,})/.*',
+								errorMessage: 'Not a valid Airtable Base URL',
+							},
+						},
+					],
+					extractValue: {
+						type: 'regex',
+						regex: 'https://airtable.com/([a-zA-Z0-9]{2,})',
+					},
+				},
+				{
+					displayName: 'ID',
+					name: 'id',
+					type: 'string',
+					validation: [
+						{
+							type: 'regex',
+							properties: {
+								regex: '[a-zA-Z0-9]{2,}',
+								errorMessage: 'Not a valid Airtable Base ID',
+							},
+						},
+					],
+					placeholder: 'appD3dfaeidke',
+					url: '=https://airtable.com/{{$value}}',
+				},
+			],
+		},
+		{
+			displayName: 'Table',
+			name: 'table',
+			type: 'resourceLocator',
+			default: { mode: 'url', value: '' },
+			required: true,
+			modes: [
+				{
+					displayName: 'By URL',
+					name: 'url',
+					type: 'string',
+					placeholder: 'https://airtable.com/app12DiScdfes/tblAAAAAAAAAAAAA/viwHdfasdfeieg5p',
+					validation: [
+						{
+							type: 'regex',
+							properties: {
+								regex: 'https://airtable.com/[a-zA-Z0-9]{2,}/([a-zA-Z0-9]{2,})/.*',
+								errorMessage: 'Not a valid Airtable Table URL',
+							},
+						},
+					],
+					extractValue: {
+						type: 'regex',
+						regex: 'https://airtable.com/[a-zA-Z0-9]{2,}/([a-zA-Z0-9]{2,})',
+					},
+				},
+				{
+					displayName: 'ID',
+					name: 'id',
+					type: 'string',
+					validation: [
+						{
+							type: 'regex',
+							properties: {
+								regex: '[a-zA-Z0-9]{2,}',
+								errorMessage: 'Not a valid Airtable Table ID',
+							},
+						},
+					],
+					placeholder: 'tbl3dirwqeidke',
+				},
+			],
+		},
+
+		// ----------------------------------
+		//         append
+		// ----------------------------------
+		{
+			displayName: 'Add All Fields',
+			name: 'addAllFields',
+			type: 'boolean',
+			displayOptions: {
+				show: {
+					operation: ['append'],
+				},
+			},
+			default: true,
+			description: 'Whether all fields should be sent to Airtable or only specific ones',
+		},
+		{
+			displayName: 'Fields',
+			name: 'fields',
+			type: 'string',
+			typeOptions: {
+				multipleValues: true,
+				multipleValueButtonText: 'Add Field',
+			},
+			requiresDataPath: 'single',
+			displayOptions: {
+				show: {
+					addAllFields: [false],
+					operation: ['append'],
+				},
+			},
+			default: [],
+			placeholder: 'Name',
+			required: true,
+			description: 'The name of fields for which data should be sent to Airtable',
+		},
+
+		// ----------------------------------
+		//         delete
+		// ----------------------------------
+		{
+			displayName: 'ID',
+			name: 'id',
+			type: 'string',
+			displayOptions: {
+				show: {
+					operation: ['delete'],
+				},
+			},
+			default: '',
+			required: true,
+			description: 'ID of the record to delete',
+		},
+
+		// ----------------------------------
+		//         list
+		// ----------------------------------
+		{
+			displayName: 'Return All',
+			name: 'returnAll',
+			type: 'boolean',
+			displayOptions: {
+				show: {
+					operation: ['list'],
+				},
+			},
+			default: true,
+			description: 'Whether to return all results or only up to a given limit',
+		},
+		{
+			displayName: 'Limit',
+			name: 'limit',
+			type: 'number',
+			displayOptions: {
+				show: {
+					operation: ['list'],
+					returnAll: [false],
+				},
+			},
+			typeOptions: {
+				minValue: 1,
+				maxValue: 100,
+			},
+			default: 100,
+			description: 'Max number of results to return',
+		},
+		{
+			displayName: 'Download Attachments',
+			name: 'downloadAttachments',
+			type: 'boolean',
+			displayOptions: {
+				show: {
+					operation: ['list'],
+				},
+			},
+			default: false,
+			description: "Whether the attachment fields define in 'Download Fields' will be downloaded",
+		},
+		{
+			displayName: 'Download Fields',
+			name: 'downloadFieldNames',
+			type: 'string',
+			required: true,
+			requiresDataPath: 'multiple',
+			displayOptions: {
+				show: {
+					operation: ['list'],
+					downloadAttachments: [true],
+				},
+			},
+			default: '',
+			description:
+				"Name of the fields of type 'attachment' that should be downloaded. Multiple ones can be defined separated by comma. Case sensitive and cannot include spaces after a comma.",
+		},
+		{
+			displayName: 'Additional Options',
+			name: 'additionalOptions',
+			type: 'collection',
+			displayOptions: {
+				show: {
+					operation: ['list'],
+				},
+			},
+			default: {},
+			description: 'Additional options which decide which records should be returned',
+			placeholder: 'Add Option',
+			options: [
+				{
+					displayName: 'Fields',
+					name: 'fields',
+					type: 'string',
+					requiresDataPath: 'single',
+					typeOptions: {
+						multipleValues: true,
+						multipleValueButtonText: 'Add Field',
+					},
+					default: [],
+					placeholder: 'Name',
+					description:
+						'Only data for fields whose names are in this list will be included in the records',
+				},
+				{
+					displayName: 'Filter By Formula',
+					name: 'filterByFormula',
+					type: 'string',
+					default: '',
+					placeholder: "NOT({Name} = '')",
+					description:
+						'A formula used to filter records. The formula will be evaluated for each record, and if the result is not 0, false, "", NaN, [], or #Error! the record will be included in the response.',
+				},
+				{
+					displayName: 'Sort',
+					name: 'sort',
+					placeholder: 'Add Sort Rule',
+					description: 'Defines how the returned records should be ordered',
+					type: 'fixedCollection',
+					typeOptions: {
+						multipleValues: true,
+					},
+					default: {},
+					options: [
+						{
+							name: 'property',
+							displayName: 'Property',
+							values: [
+								{
+									displayName: 'Field',
+									name: 'field',
+									type: 'string',
+									default: '',
+									description: 'Name of the field to sort on',
+								},
+								{
+									displayName: 'Direction',
+									name: 'direction',
+									type: 'options',
+									options: [
+										{
+											name: 'ASC',
+											value: 'asc',
+											description: 'Sort in ascending order (small -> large)',
+										},
+										{
+											name: 'DESC',
+											value: 'desc',
+											description: 'Sort in descending order (large -> small)',
+										},
+									],
+									default: 'asc',
+									description: 'The sort direction',
+								},
+							],
+						},
+					],
+				},
+				{
+					displayName: 'View',
+					name: 'view',
+					type: 'string',
+					default: '',
+					placeholder: 'All Stories',
+					description:
+						'The name or ID of a view in the Stories table. If set, only the records in that view will be returned. The records will be sorted according to the order of the view.',
+				},
+			],
+		},
+
+		// ----------------------------------
+		//         read
+		// ----------------------------------
+		{
+			displayName: 'ID',
+			name: 'id',
+			type: 'string',
+			displayOptions: {
+				show: {
+					operation: ['read'],
+				},
+			},
+			default: '',
+			required: true,
+			description: 'ID of the record to return',
+		},
+
+		// ----------------------------------
+		//         update
+		// ----------------------------------
+		{
+			displayName: 'ID',
+			name: 'id',
+			type: 'string',
+			displayOptions: {
+				show: {
+					operation: ['update'],
+				},
+			},
+			default: '',
+			required: true,
+			description: 'ID of the record to update',
+		},
+		{
+			displayName: 'Update All Fields',
+			name: 'updateAllFields',
+			type: 'boolean',
+			displayOptions: {
+				show: {
+					operation: ['update'],
+				},
+			},
+			default: true,
+			description: 'Whether all fields should be sent to Airtable or only specific ones',
+		},
+		{
+			displayName: 'Fields',
+			name: 'fields',
+			type: 'string',
+			typeOptions: {
+				multipleValues: true,
+				multipleValueButtonText: 'Add Field',
+			},
+			requiresDataPath: 'single',
+			displayOptions: {
+				show: {
+					updateAllFields: [false],
+					operation: ['update'],
+				},
+			},
+			default: [],
+			placeholder: 'Name',
+			required: true,
+			description: 'The name of fields for which data should be sent to Airtable',
+		},
+
+		// ----------------------------------
+		//         append + delete + update
+		// ----------------------------------
+		{
+			displayName: 'Options',
+			name: 'options',
+			type: 'collection',
+			placeholder: 'Add Option',
+			displayOptions: {
+				show: {
+					operation: ['append', 'delete', 'update'],
+				},
+			},
+			default: {},
+			options: [
+				{
+					displayName: 'Bulk Size',
+					name: 'bulkSize',
+					type: 'number',
+					typeOptions: {
+						minValue: 1,
+						maxValue: 10,
+					},
+					default: 10,
+					description: 'Number of records to process at once',
+				},
+				{
+					displayName: 'Ignore Fields',
+					name: 'ignoreFields',
+					type: 'string',
+					requiresDataPath: 'multiple',
+					displayOptions: {
+						show: {
+							'/operation': ['update'],
+							'/updateAllFields': [true],
+						},
+					},
+					default: '',
+					description: 'Comma-separated list of fields to ignore',
+				},
+				{
+					displayName: 'Typecast',
+					name: 'typecast',
+					type: 'boolean',
+					displayOptions: {
+						show: {
+							'/operation': ['append', 'update'],
+						},
+					},
+					default: false,
+					description:
+						'Whether the Airtable API should attempt mapping of string values for linked records & select options',
+				},
+			],
+		},
+	],
+};
+
+export class AirtableV1 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			...versionDescription,
+		};
+	}
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const authentication = this.getNodeParameter('authentication', 0);
+		if (authentication === 'airtableApi') {
+			throw new NodeOperationError(
+				this.getNode(),
+				'The API Key connection was deprecated by Airtable, please use Access Token or OAuth2 instead.',
+			);
+		}
+		const items = this.getInputData();
+		const returnData: INodeExecutionData[] = [];
+		let responseData;
+
+		const operation = this.getNodeParameter('operation', 0);
+
+		const application = this.getNodeParameter('application', 0, undefined, {
+			extractValue: true,
+		}) as string;
+
+		const table = encodeURI(
+			this.getNodeParameter('table', 0, undefined, {
+				extractValue: true,
+			}) as string,
+		);
+
+		let returnAll = false;
+		let endpoint = '';
+		let requestMethod: IHttpRequestMethods;
+
+		const body: IDataObject = {};
+		const qs: IDataObject = {};
+
+		if (operation === 'append') {
+			// ----------------------------------
+			//         append
+			// ----------------------------------
+
+			requestMethod = 'POST';
+			endpoint = `${application}/${table}`;
+
+			let addAllFields: boolean;
+			let fields: string[];
+			let options: IDataObject;
+
+			const rows: IDataObject[] = [];
+			let bulkSize = 10;
+
+			for (let i = 0; i < items.length; i++) {
+				try {
+					addAllFields = this.getNodeParameter('addAllFields', i) as boolean;
+					options = this.getNodeParameter('options', i, {});
+					bulkSize = (options.bulkSize as number) || bulkSize;
+
+					const row: IDataObject = {};
+
+					if (addAllFields) {
+						// Add all the fields the item has
+						row.fields = { ...items[i].json };
+						delete (row.fields as any).id;
+					} else {
+						// Add only the specified fields
+						const rowFields: IDataObject = {};
+
+						fields = this.getNodeParameter('fields', i, []) as string[];
+
+						for (const fieldName of fields) {
+							rowFields[fieldName] = items[i].json[fieldName];
+						}
+
+						row.fields = rowFields;
+					}
+
+					rows.push(row);
+
+					if (rows.length === bulkSize || i === items.length - 1) {
+						if (options.typecast === true) {
+							body.typecast = true;
+						}
+
+						body.records = rows;
+
+						responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(responseData.records as IDataObject[]),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
+						// empty rows
+						rows.length = 0;
+					}
+				} catch (error) {
+					if (this.continueOnFail()) {
+						returnData.push({ json: { error: error.message } });
+						continue;
+					}
+					throw error;
+				}
+			}
+		} else if (operation === 'delete') {
+			requestMethod = 'DELETE';
+
+			const rows: string[] = [];
+			const options = this.getNodeParameter('options', 0, {});
+			const bulkSize = (options.bulkSize as number) || 10;
+
+			for (let i = 0; i < items.length; i++) {
+				try {
+					const id = this.getNodeParameter('id', i) as string;
+
+					rows.push(id);
+
+					if (rows.length === bulkSize || i === items.length - 1) {
+						endpoint = `${application}/${table}`;
+
+						// Make one request after another. This is slower but makes
+						// sure that we do not run into the rate limit they have in
+						// place and so block for 30 seconds. Later some global
+						// functionality in core should make it easy to make requests
+						// according to specific rules like not more than 5 requests
+						// per seconds.
+						qs.records = rows;
+
+						responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
+
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(responseData.records as IDataObject[]),
+							{ itemData: { item: i } },
+						);
+
+						returnData.push(...executionData);
+						// empty rows
+						rows.length = 0;
+					}
+				} catch (error) {
+					if (this.continueOnFail()) {
+						returnData.push({ json: { error: error.message } });
+						continue;
+					}
+					throw error;
+				}
+			}
+		} else if (operation === 'list') {
+			// ----------------------------------
+			//         list
+			// ----------------------------------
+			try {
+				requestMethod = 'GET';
+				endpoint = `${application}/${table}`;
+
+				returnAll = this.getNodeParameter('returnAll', 0);
+
+				const downloadAttachments = this.getNodeParameter('downloadAttachments', 0);
+
+				const additionalOptions = this.getNodeParameter('additionalOptions', 0, {}) as IDataObject;
+
+				for (const key of Object.keys(additionalOptions)) {
+					if (key === 'sort' && (additionalOptions.sort as IDataObject).property !== undefined) {
+						qs[key] = (additionalOptions[key] as IDataObject).property;
+					} else {
+						qs[key] = additionalOptions[key];
+					}
+				}
+
+				if (returnAll) {
+					responseData = await apiRequestAllItems.call(this, requestMethod, endpoint, body, qs);
+				} else {
+					qs.maxRecords = this.getNodeParameter('limit', 0);
+					responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
+				}
+
+				returnData.push.apply(returnData, responseData.records as INodeExecutionData[]);
+
+				if (downloadAttachments === true) {
+					const downloadFieldNames = (
+						this.getNodeParameter('downloadFieldNames', 0) as string
+					).split(',');
+					const pairedItem = generatePairedItemData(items.length);
+					const data = await downloadRecordAttachments.call(
+						this,
+						responseData.records as IRecord[],
+						downloadFieldNames,
+						pairedItem,
+					);
+					return [data];
+				}
+
+				// We can return from here
+				const itemData = generatePairedItemData(items.length);
+
+				return [
+					this.helpers.constructExecutionMetaData(this.helpers.returnJsonArray(returnData), {
+						itemData,
+					}),
+				];
+			} catch (error) {
+				if (this.continueOnFail()) {
+					returnData.push({ json: { error: error.message } });
+				} else {
+					throw error;
+				}
+			}
+		} else if (operation === 'read') {
+			// ----------------------------------
+			//         read
+			// ----------------------------------
+
+			requestMethod = 'GET';
+
+			let id: string;
+			for (let i = 0; i < items.length; i++) {
+				id = this.getNodeParameter('id', i) as string;
+
+				endpoint = `${application}/${table}/${id}`;
+
+				// Make one request after another. This is slower but makes
+				// sure that we do not run into the rate limit they have in
+				// place and so block for 30 seconds. Later some global
+				// functionality in core should make it easy to make requests
+				// according to specific rules like not more than 5 requests
+				// per seconds.
+				try {
+					responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
+
+					const executionData = this.helpers.constructExecutionMetaData(
+						this.helpers.returnJsonArray(responseData as IDataObject[]),
+						{ itemData: { item: i } },
+					);
+
+					returnData.push(...executionData);
+				} catch (error) {
+					if (this.continueOnFail()) {
+						returnData.push({ json: { error: error.message } });
+						continue;
+					}
+					throw error;
+				}
+			}
+		} else if (operation === 'update') {
+			// ----------------------------------
+			//         update
+			// ----------------------------------
+
+			requestMethod = 'PATCH';
+
+			let updateAllFields: boolean;
+			let fields: string[];
+			let options: IDataObject;
+
+			const rows: IDataObject[] = [];
+			let bulkSize = 10;
+
+			for (let i = 0; i < items.length; i++) {
+				try {
+					updateAllFields = this.getNodeParameter('updateAllFields', i) as boolean;
+					options = this.getNodeParameter('options', i, {});
+					bulkSize = (options.bulkSize as number) || bulkSize;
+
+					const row: IDataObject = {};
+					row.fields = {} as IDataObject;
+
+					if (updateAllFields) {
+						// Update all the fields the item has
+						row.fields = { ...items[i].json };
+						// remove id field
+						delete (row.fields as any).id;
+
+						if (options.ignoreFields && options.ignoreFields !== '') {
+							const ignoreFields = (options.ignoreFields as string)
+								.split(',')
+								.map((field) => field.trim())
+								.filter((field) => !!field);
+							if (ignoreFields.length) {
+								// From: https://stackoverflow.com/questions/17781472/how-to-get-a-subset-of-a-javascript-objects-properties
+								row.fields = Object.entries(items[i].json)
+									.filter(([key]) => !ignoreFields.includes(key))
+									.reduce((obj, [key, val]) => Object.assign(obj, { [key]: val }), {});
+							}
+						}
+					} else {
+						fields = this.getNodeParameter('fields', i, []) as string[];
+
+						const rowFields: IDataObject = {};
+						for (const fieldName of fields) {
+							rowFields[fieldName] = items[i].json[fieldName];
+						}
+
+						row.fields = rowFields;
+					}
+
+					row.id = this.getNodeParameter('id', i) as string;
+
+					rows.push(row);
+
+					if (rows.length === bulkSize || i === items.length - 1) {
+						endpoint = `${application}/${table}`;
+
+						// Make one request after another. This is slower but makes
+						// sure that we do not run into the rate limit they have in
+						// place and so block for 30 seconds. Later some global
+						// functionality in core should make it easy to make requests
+						// according to specific rules like not more than 5 requests
+						// per seconds.
+
+						const data = { records: rows, typecast: options.typecast ? true : false };
+
+						responseData = await apiRequest.call(this, requestMethod, endpoint, data, qs);
+
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(responseData.records as IDataObject[]),
+							{ itemData: { item: i } },
+						);
+
+						returnData.push(...executionData);
+
+						// empty rows
+						rows.length = 0;
+					}
+				} catch (error) {
+					if (this.continueOnFail()) {
+						returnData.push({ json: { error: error.message } });
+						continue;
+					}
+					throw error;
+				}
+			}
+		} else {
+			throw new NodeOperationError(this.getNode(), `The operation "${operation}" is not known!`);
+		}
+
+		return [returnData];
+	}
+}
diff --git a/packages/nodes-base/nodes/Airtable/v1/GenericFunctions.ts b/packages/nodes-base/nodes/Airtable/v1/GenericFunctions.ts
new file mode 100644
index 0000000000000..c4e7c4f3d314a
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/v1/GenericFunctions.ts
@@ -0,0 +1,134 @@
+import type {
+	IBinaryKeyData,
+	IDataObject,
+	IExecuteFunctions,
+	IPollFunctions,
+	ILoadOptionsFunctions,
+	INodeExecutionData,
+	IPairedItemData,
+	IRequestOptions,
+	IHttpRequestMethods,
+} from 'n8n-workflow';
+
+interface IAttachment {
+	url: string;
+	filename: string;
+	type: string;
+}
+
+export interface IRecord {
+	fields: {
+		[key: string]: string | IAttachment[];
+	};
+}
+
+/**
+ * Make an API request to Airtable
+ *
+ */
+export async function apiRequest(
+	this: IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions,
+	method: IHttpRequestMethods,
+	endpoint: string,
+	body: object,
+	query?: IDataObject,
+	uri?: string,
+	option: IDataObject = {},
+): Promise<any> {
+	query = query || {};
+
+	// For some reason for some endpoints the bearer auth does not work
+	// and it returns 404 like for the /meta request. So we always send
+	// it as query string.
+	// query.api_key = credentials.apiKey;
+
+	const options: IRequestOptions = {
+		headers: {},
+		method,
+		body,
+		qs: query,
+		uri: uri || `https://api.airtable.com/v0/${endpoint}`,
+		useQuerystring: false,
+		json: true,
+	};
+
+	if (Object.keys(option).length !== 0) {
+		Object.assign(options, option);
+	}
+
+	if (Object.keys(body).length === 0) {
+		delete options.body;
+	}
+	const authenticationMethod = this.getNodeParameter('authentication', 0) as string;
+	return await this.helpers.requestWithAuthentication.call(this, authenticationMethod, options);
+}
+
+/**
+ * Make an API request to paginated Airtable endpoint
+ * and return all results
+ *
+ * @param {(IExecuteFunctions | IExecuteFunctions)} this
+ */
+export async function apiRequestAllItems(
+	this: IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions,
+	method: IHttpRequestMethods,
+	endpoint: string,
+	body: IDataObject,
+	query?: IDataObject,
+): Promise<any> {
+	if (query === undefined) {
+		query = {};
+	}
+	query.pageSize = 100;
+
+	const returnData: IDataObject[] = [];
+
+	let responseData;
+
+	do {
+		responseData = await apiRequest.call(this, method, endpoint, body, query);
+		returnData.push.apply(returnData, responseData.records as IDataObject[]);
+
+		query.offset = responseData.offset;
+	} while (responseData.offset !== undefined);
+
+	return {
+		records: returnData,
+	};
+}
+
+export async function downloadRecordAttachments(
+	this: IExecuteFunctions | IPollFunctions,
+	records: IRecord[],
+	fieldNames: string[],
+	pairedItem?: IPairedItemData[],
+): Promise<INodeExecutionData[]> {
+	const elements: INodeExecutionData[] = [];
+	for (const record of records) {
+		const element: INodeExecutionData = { json: {}, binary: {} };
+		if (pairedItem) {
+			element.pairedItem = pairedItem;
+		}
+		element.json = record as unknown as IDataObject;
+		for (const fieldName of fieldNames) {
+			if (record.fields[fieldName] !== undefined) {
+				for (const [index, attachment] of (record.fields[fieldName] as IAttachment[]).entries()) {
+					const file = await apiRequest.call(this, 'GET', '', {}, {}, attachment.url, {
+						json: false,
+						encoding: null,
+					});
+					element.binary![`${fieldName}_${index}`] = await this.helpers.prepareBinaryData(
+						Buffer.from(file as string),
+						attachment.filename,
+						attachment.type,
+					);
+				}
+			}
+		}
+		if (Object.keys(element.binary as IBinaryKeyData).length === 0) {
+			delete element.binary;
+		}
+		elements.push(element);
+	}
+	return elements;
+}
diff --git a/packages/nodes-base/nodes/Airtable/v2/AirtableV2.node.ts b/packages/nodes-base/nodes/Airtable/v2/AirtableV2.node.ts
new file mode 100644
index 0000000000000..1fe3e9d0c51d1
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/v2/AirtableV2.node.ts
@@ -0,0 +1,31 @@
+import type {
+	IExecuteFunctions,
+	INodeType,
+	INodeTypeDescription,
+	INodeTypeBaseDescription,
+} from 'n8n-workflow';
+
+import { versionDescription } from './actions/versionDescription';
+import { router } from './actions/router';
+import { listSearch, loadOptions, resourceMapping } from './methods';
+
+export class AirtableV2 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			...versionDescription,
+		};
+	}
+
+	methods = {
+		listSearch,
+		loadOptions,
+		resourceMapping,
+	};
+
+	async execute(this: IExecuteFunctions) {
+		return await router.call(this);
+	}
+}
diff --git a/packages/nodes-base/nodes/Airtable/v2/actions/base/Base.resource.ts b/packages/nodes-base/nodes/Airtable/v2/actions/base/Base.resource.ts
new file mode 100644
index 0000000000000..11de16a87eaa6
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/v2/actions/base/Base.resource.ts
@@ -0,0 +1,37 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+import * as getMany from './getMany.operation';
+import * as getSchema from './getSchema.operation';
+
+export { getMany, getSchema };
+
+export const description: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		options: [
+			{
+				name: 'Get Many',
+				value: 'getMany',
+				description: 'List all the bases',
+				action: 'Get many bases',
+			},
+			{
+				name: 'Get Schema',
+				value: 'getSchema',
+				description: 'Get the schema of the tables in a base',
+				action: 'Get base schema',
+			},
+		],
+		default: 'getMany',
+		displayOptions: {
+			show: {
+				resource: ['base'],
+			},
+		},
+	},
+	...getMany.description,
+	...getSchema.description,
+];
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
new file mode 100644
index 0000000000000..a0ab51ac58f9e
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/v2/actions/base/getMany.operation.ts
@@ -0,0 +1,121 @@
+import type {
+	IDataObject,
+	INodeExecutionData,
+	INodeProperties,
+	IExecuteFunctions,
+} from 'n8n-workflow';
+import {
+	generatePairedItemData,
+	updateDisplayOptions,
+	wrapData,
+} from '../../../../../utils/utilities';
+import { apiRequest } from '../../transport';
+
+const properties: INodeProperties[] = [
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		default: true,
+		description: 'Whether to return all results or only up to a given limit',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				returnAll: [false],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 100,
+		},
+		default: 100,
+		description: 'Max number of results to return',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			{
+				displayName: 'Permission Level',
+				name: 'permissionLevel',
+				type: 'multiOptions',
+				options: [
+					{
+						name: 'Comment',
+						value: 'comment',
+					},
+					{
+						name: 'Create',
+						value: 'create',
+					},
+					{
+						name: 'Edit',
+						value: 'edit',
+					},
+					{
+						name: 'None',
+						value: 'none',
+					},
+					{
+						name: 'Read',
+						value: 'read',
+					},
+				],
+				default: [],
+				description: 'Filter the returned bases by one or more permission levels',
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['base'],
+		operation: ['getMany'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions): Promise<INodeExecutionData[]> {
+	const returnAll = this.getNodeParameter('returnAll', 0);
+
+	const endpoint = 'meta/bases';
+	let bases: IDataObject[] = [];
+
+	if (returnAll) {
+		let offset: string | undefined = undefined;
+		do {
+			const responseData = await apiRequest.call(this, 'GET', endpoint);
+			bases.push(...(responseData.bases as IDataObject[]));
+			offset = responseData.offset;
+		} while (offset);
+	} else {
+		const responseData = await apiRequest.call(this, 'GET', endpoint);
+
+		const limit = this.getNodeParameter('limit', 0);
+		if (limit && responseData.bases?.length) {
+			bases = responseData.bases.slice(0, limit);
+		}
+	}
+
+	const permissionLevel = this.getNodeParameter('options.permissionLevel', 0, []) as string[];
+	if (permissionLevel.length) {
+		bases = bases.filter((base) => permissionLevel.includes(base.permissionLevel as string));
+	}
+
+	const itemData = generatePairedItemData(this.getInputData().length);
+
+	const returnData = this.helpers.constructExecutionMetaData(wrapData(bases), {
+		itemData,
+	});
+
+	return returnData;
+}
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
new file mode 100644
index 0000000000000..aa791f7b64877
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/v2/actions/base/getSchema.operation.ts
@@ -0,0 +1,60 @@
+import type {
+	IDataObject,
+	INodeExecutionData,
+	INodeProperties,
+	IExecuteFunctions,
+	NodeApiError,
+} from 'n8n-workflow';
+import { updateDisplayOptions, wrapData } from '../../../../../utils/utilities';
+import { apiRequest } from '../../transport';
+import { baseRLC } from '../common.descriptions';
+import { processAirtableError } from '../../helpers/utils';
+
+const properties: INodeProperties[] = [
+	{
+		...baseRLC,
+		description: 'The Airtable Base to retrieve the schema from',
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['base'],
+		operation: ['getSchema'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	items: INodeExecutionData[],
+): Promise<INodeExecutionData[]> {
+	const returnData: INodeExecutionData[] = [];
+
+	for (let i = 0; i < items.length; i++) {
+		try {
+			const baseId = this.getNodeParameter('base', 0, undefined, {
+				extractValue: true,
+			}) as string;
+
+			const responseData = await apiRequest.call(this, 'GET', `meta/bases/${baseId}/tables`);
+
+			const executionData = this.helpers.constructExecutionMetaData(
+				wrapData(responseData.tables as IDataObject[]),
+				{ itemData: { item: i } },
+			);
+
+			returnData.push(...executionData);
+		} catch (error) {
+			error = processAirtableError(error as NodeApiError, undefined, i);
+			if (this.continueOnFail()) {
+				returnData.push({ json: { error: error.message } });
+				continue;
+			}
+			throw error;
+		}
+	}
+
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/Airtable/v2/actions/common.descriptions.ts b/packages/nodes-base/nodes/Airtable/v2/actions/common.descriptions.ts
new file mode 100644
index 0000000000000..22654c8635e98
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/v2/actions/common.descriptions.ts
@@ -0,0 +1,207 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+export const baseRLC: INodeProperties = {
+	displayName: 'Base',
+	name: 'base',
+	type: 'resourceLocator',
+	default: { mode: 'list', value: '' },
+	required: true,
+	// description: 'The Airtable Base in which to operate on',
+	modes: [
+		{
+			displayName: 'From List',
+			name: 'list',
+			type: 'list',
+			typeOptions: {
+				searchListMethod: 'baseSearch',
+				searchable: true,
+			},
+		},
+		{
+			displayName: 'By URL',
+			name: 'url',
+			type: 'string',
+			placeholder: 'e.g. https://airtable.com/app12DiScdfes/tbl9WvGeEPa6lZyVq/viwHdfasdfeieg5p',
+			validation: [
+				{
+					type: 'regex',
+					properties: {
+						regex: 'https://airtable.com/([a-zA-Z0-9]{2,})/.*',
+						errorMessage: 'Not a valid Airtable Base URL',
+					},
+				},
+			],
+			extractValue: {
+				type: 'regex',
+				regex: 'https://airtable.com/([a-zA-Z0-9]{2,})',
+			},
+		},
+		{
+			displayName: 'ID',
+			name: 'id',
+			type: 'string',
+			validation: [
+				{
+					type: 'regex',
+					properties: {
+						regex: '[a-zA-Z0-9]{2,}',
+						errorMessage: 'Not a valid Airtable Base ID',
+					},
+				},
+			],
+			placeholder: 'e.g. appD3dfaeidke',
+			url: '=https://airtable.com/{{$value}}',
+		},
+	],
+};
+
+export const tableRLC: INodeProperties = {
+	displayName: 'Table',
+	name: 'table',
+	type: 'resourceLocator',
+	default: { mode: 'list', value: '' },
+	required: true,
+	modes: [
+		{
+			displayName: 'From List',
+			name: 'list',
+			type: 'list',
+			typeOptions: {
+				searchListMethod: 'tableSearch',
+				searchable: true,
+			},
+		},
+		{
+			displayName: 'By URL',
+			name: 'url',
+			type: 'string',
+			placeholder: 'https://airtable.com/app12DiScdfes/tblAAAAAAAAAAAAA/viwHdfasdfeieg5p',
+			validation: [
+				{
+					type: 'regex',
+					properties: {
+						regex: 'https://airtable.com/[a-zA-Z0-9]{2,}/([a-zA-Z0-9]{2,})/.*',
+						errorMessage: 'Not a valid Airtable Table URL',
+					},
+				},
+			],
+			extractValue: {
+				type: 'regex',
+				regex: 'https://airtable.com/[a-zA-Z0-9]{2,}/([a-zA-Z0-9]{2,})',
+			},
+		},
+		{
+			displayName: 'ID',
+			name: 'id',
+			type: 'string',
+			validation: [
+				{
+					type: 'regex',
+					properties: {
+						regex: '[a-zA-Z0-9]{2,}',
+						errorMessage: 'Not a valid Airtable Table ID',
+					},
+				},
+			],
+			placeholder: 'tbl3dirwqeidke',
+		},
+	],
+};
+
+export const viewRLC: INodeProperties = {
+	displayName: 'View',
+	name: 'view',
+	type: 'resourceLocator',
+	default: { mode: 'list', value: '' },
+	modes: [
+		{
+			displayName: 'From List',
+			name: 'list',
+			type: 'list',
+			typeOptions: {
+				searchListMethod: 'viewSearch',
+				searchable: true,
+			},
+		},
+		{
+			displayName: 'By URL',
+			name: 'url',
+			type: 'string',
+			placeholder: 'https://airtable.com/app12DiScdfes/tblAAAAAAAAAAAAA/viwHdfasdfeieg5p',
+			validation: [
+				{
+					type: 'regex',
+					properties: {
+						regex: 'https://airtable.com/[a-zA-Z0-9]{2,}/[a-zA-Z0-9]{2,}/([a-zA-Z0-9]{2,})/.*',
+						errorMessage: 'Not a valid Airtable View URL',
+					},
+				},
+			],
+			extractValue: {
+				type: 'regex',
+				regex: 'https://airtable.com/[a-zA-Z0-9]{2,}/[a-zA-Z0-9]{2,}/([a-zA-Z0-9]{2,})',
+			},
+		},
+		{
+			displayName: 'ID',
+			name: 'id',
+			type: 'string',
+			validation: [
+				{
+					type: 'regex',
+					properties: {
+						regex: '[a-zA-Z0-9]{2,}',
+						errorMessage: 'Not a valid Airtable View ID',
+					},
+				},
+			],
+			placeholder: 'viw3dirwqeidke',
+		},
+	],
+};
+
+export const insertUpdateOptions: INodeProperties[] = [
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			{
+				displayName: 'Typecast',
+				name: 'typecast',
+				type: 'boolean',
+				default: false,
+				description:
+					'Whether the Airtable API should attempt mapping of string values for linked records & select options',
+			},
+			{
+				displayName: 'Ignore Fields From Input',
+				name: 'ignoreFields',
+				type: 'string',
+				requiresDataPath: 'multiple',
+				displayOptions: {
+					show: {
+						'/columns.mappingMode': ['autoMapInputData'],
+					},
+				},
+				default: '',
+				description: 'Comma-separated list of fields in input to ignore when updating',
+			},
+			{
+				displayName: 'Update All Matches',
+				name: 'updateAllMatches',
+				type: 'boolean',
+				default: false,
+				description:
+					'Whether to update all records matching the value in the "Column to Match On". If not set, only the first matching record will be updated.',
+				displayOptions: {
+					show: {
+						'/operation': ['update', 'upsert'],
+					},
+				},
+			},
+		],
+	},
+];
diff --git a/packages/nodes-base/nodes/Airtable/v2/actions/node.type.ts b/packages/nodes-base/nodes/Airtable/v2/actions/node.type.ts
new file mode 100644
index 0000000000000..b74b71a64c125
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/v2/actions/node.type.ts
@@ -0,0 +1,9 @@
+import type { AllEntities } from 'n8n-workflow';
+
+type NodeMap = {
+	record: 'create' | 'upsert' | 'deleteRecord' | 'get' | 'search' | 'update';
+	base: 'getMany' | 'getSchema';
+	table: 'create';
+};
+
+export type AirtableType = AllEntities<NodeMap>;
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
new file mode 100644
index 0000000000000..7c526bfa821cf
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/v2/actions/record/Record.resource.ts
@@ -0,0 +1,86 @@
+import type { INodeProperties } from 'n8n-workflow';
+import { baseRLC, tableRLC } from '../common.descriptions';
+
+import * as create from './create.operation';
+import * as deleteRecord from './deleteRecord.operation';
+import * as get from './get.operation';
+import * as search from './search.operation';
+import * as update from './update.operation';
+import * as upsert from './upsert.operation';
+
+export { create, deleteRecord, get, search, update, upsert };
+
+export const description: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a new record in a table',
+				action: 'Create a record',
+			},
+			{
+				name: 'Create or Update',
+				value: 'upsert',
+				description: 'Create a new record, or update the current one if it already exists (upsert)',
+				action: 'Create or update a record',
+			},
+			{
+				name: 'Delete',
+				value: 'deleteRecord',
+				description: 'Delete a record from a table',
+				action: 'Delete a record',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Retrieve a record from a table',
+				action: 'Get a record',
+			},
+			{
+				name: 'Search',
+				value: 'search',
+				description: 'Search for specific records or list all',
+				action: 'Search records',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update a record in a table',
+				action: 'Update record',
+			},
+		],
+		default: 'read',
+		displayOptions: {
+			show: {
+				resource: ['record'],
+			},
+		},
+	},
+	{
+		...baseRLC,
+		displayOptions: {
+			show: {
+				resource: ['record'],
+			},
+		},
+	},
+	{
+		...tableRLC,
+		displayOptions: {
+			show: {
+				resource: ['record'],
+			},
+		},
+	},
+	...create.description,
+	...deleteRecord.description,
+	...get.description,
+	...search.description,
+	...update.description,
+	...upsert.description,
+];
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
new file mode 100644
index 0000000000000..758c3b7a2ffc1
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/v2/actions/record/create.operation.ts
@@ -0,0 +1,99 @@
+import type {
+	IDataObject,
+	INodeExecutionData,
+	INodeProperties,
+	IExecuteFunctions,
+	NodeApiError,
+} from 'n8n-workflow';
+import { updateDisplayOptions, wrapData } from '../../../../../utils/utilities';
+import { apiRequest } from '../../transport';
+import { insertUpdateOptions } from '../common.descriptions';
+import { processAirtableError, removeIgnored } from '../../helpers/utils';
+
+const properties: INodeProperties[] = [
+	{
+		displayName: 'Columns',
+		name: 'columns',
+		type: 'resourceMapper',
+		default: {
+			mappingMode: 'defineBelow',
+			value: null,
+		},
+		noDataExpression: true,
+		required: true,
+		typeOptions: {
+			loadOptionsDependsOn: ['table.value', 'base.value'],
+			resourceMapper: {
+				resourceMapperMethod: 'getColumns',
+				mode: 'add',
+				fieldWords: {
+					singular: 'column',
+					plural: 'columns',
+				},
+				addAllFields: true,
+				multiKeyMatch: true,
+			},
+		},
+	},
+	...insertUpdateOptions,
+];
+
+const displayOptions = {
+	show: {
+		resource: ['record'],
+		operation: ['create'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	items: INodeExecutionData[],
+	base: string,
+	table: string,
+): Promise<INodeExecutionData[]> {
+	const returnData: INodeExecutionData[] = [];
+
+	const endpoint = `${base}/${table}`;
+
+	const dataMode = this.getNodeParameter('columns.mappingMode', 0) as string;
+
+	for (let i = 0; i < items.length; i++) {
+		try {
+			const options = this.getNodeParameter('options', i, {});
+
+			const body: IDataObject = {
+				typecast: options.typecast ? true : false,
+			};
+
+			if (dataMode === 'autoMapInputData') {
+				body.fields = removeIgnored(items[i].json, options.ignoreFields as string);
+			}
+
+			if (dataMode === 'defineBelow') {
+				const fields = this.getNodeParameter('columns.value', i, []) as IDataObject;
+
+				body.fields = fields;
+			}
+
+			const responseData = await apiRequest.call(this, 'POST', endpoint, body);
+
+			const executionData = this.helpers.constructExecutionMetaData(
+				wrapData(responseData as IDataObject[]),
+				{ itemData: { item: i } },
+			);
+
+			returnData.push(...executionData);
+		} catch (error) {
+			error = processAirtableError(error as NodeApiError, undefined, i);
+			if (this.continueOnFail()) {
+				returnData.push({ json: { message: error.message, error } });
+				continue;
+			}
+			throw error;
+		}
+	}
+
+	return returnData;
+}
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
new file mode 100644
index 0000000000000..cbbf12ba3c5cc
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/v2/actions/record/deleteRecord.operation.ts
@@ -0,0 +1,67 @@
+import type {
+	IDataObject,
+	INodeExecutionData,
+	INodeProperties,
+	NodeApiError,
+	IExecuteFunctions,
+} from 'n8n-workflow';
+import { updateDisplayOptions, wrapData } from '../../../../../utils/utilities';
+import { apiRequest } from '../../transport';
+import { processAirtableError } from '../../helpers/utils';
+
+const properties: INodeProperties[] = [
+	{
+		displayName: 'Record ID',
+		name: 'id',
+		type: 'string',
+		default: '',
+		placeholder: 'e.g. recf7EaZp707CEc8g',
+		required: true,
+		// eslint-disable-next-line n8n-nodes-base/node-param-description-miscased-id
+		description:
+			'ID of the record to delete. <a href="https://support.airtable.com/docs/record-id" target="_blank">More info</a>.',
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['record'],
+		operation: ['deleteRecord'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	items: INodeExecutionData[],
+	base: string,
+	table: string,
+): Promise<INodeExecutionData[]> {
+	const returnData: INodeExecutionData[] = [];
+
+	for (let i = 0; i < items.length; i++) {
+		let id;
+		try {
+			id = this.getNodeParameter('id', i) as string;
+
+			const responseData = await apiRequest.call(this, 'DELETE', `${base}/${table}/${id}`);
+
+			const executionData = this.helpers.constructExecutionMetaData(
+				wrapData(responseData as IDataObject[]),
+				{ itemData: { item: i } },
+			);
+
+			returnData.push(...executionData);
+		} catch (error) {
+			error = processAirtableError(error as NodeApiError, id, i);
+			if (this.continueOnFail()) {
+				returnData.push({ json: { error: error.message } });
+				continue;
+			}
+			throw error;
+		}
+	}
+
+	return returnData;
+}
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
new file mode 100644
index 0000000000000..9742382cddad7
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/v2/actions/record/get.operation.ts
@@ -0,0 +1,103 @@
+import type {
+	IDataObject,
+	INodeExecutionData,
+	INodeProperties,
+	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';
+
+const properties: INodeProperties[] = [
+	{
+		displayName: 'Record ID',
+		name: 'id',
+		type: 'string',
+		default: '',
+		placeholder: 'e.g. recf7EaZp707CEc8g',
+		required: true,
+		// eslint-disable-next-line n8n-nodes-base/node-param-description-miscased-id
+		description:
+			'ID of the record to get. <a href="https://support.airtable.com/docs/record-id" target="_blank">More info</a>.',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		default: {},
+		description: 'Additional options which decide which records should be returned',
+		placeholder: 'Add Option',
+		options: [
+			{
+				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-multi-options
+				displayName: 'Download Attachments',
+				name: 'downloadFields',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getAttachmentColumns',
+					loadOptionsDependsOn: ['base.value', 'table.value'],
+				},
+				default: [],
+				// eslint-disable-next-line n8n-nodes-base/node-param-description-wrong-for-dynamic-multi-options
+				description: "The fields of type 'attachment' that should be downloaded",
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['record'],
+		operation: ['get'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	items: INodeExecutionData[],
+	base: string,
+	table: string,
+): Promise<INodeExecutionData[]> {
+	const returnData: INodeExecutionData[] = [];
+
+	for (let i = 0; i < items.length; i++) {
+		let id;
+		try {
+			id = this.getNodeParameter('id', i) as string;
+
+			const responseData = await apiRequest.call(this, 'GET', `${base}/${table}/${id}`);
+
+			const options = this.getNodeParameter('options', 0, {});
+
+			if (options.downloadFields) {
+				const itemWithAttachments = await downloadRecordAttachments.call(
+					this,
+					[responseData] as IRecord[],
+					options.downloadFields as string[],
+				);
+				returnData.push(...itemWithAttachments);
+				continue;
+			}
+
+			const executionData = this.helpers.constructExecutionMetaData(
+				wrapData(flattenOutput(responseData as IDataObject)),
+				{ itemData: { item: i } },
+			);
+
+			returnData.push(...executionData);
+		} catch (error) {
+			error = processAirtableError(error as NodeApiError, id, i);
+			if (this.continueOnFail()) {
+				returnData.push({ json: { error: error.message } });
+				continue;
+			}
+			throw error;
+		}
+	}
+
+	return returnData;
+}
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
new file mode 100644
index 0000000000000..e731f8b170ddd
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/v2/actions/record/search.operation.ts
@@ -0,0 +1,224 @@
+import type {
+	IDataObject,
+	INodeExecutionData,
+	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 { viewRLC } from '../common.descriptions';
+
+const properties: INodeProperties[] = [
+	{
+		displayName: 'Filter By Formula',
+		name: 'filterByFormula',
+		type: 'string',
+		default: '',
+		placeholder: "e.g. NOT({Name} = 'Admin')",
+		hint: 'If empty, all the records will be returned',
+		description:
+			'The formula will be evaluated for each record, and if the result is not 0, false, "", NaN, [], or #Error! the record will be included in the response. <a href="https://support.airtable.com/docs/formula-field-reference" target="_blank">More info</a>.',
+	},
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		default: true,
+		description: 'Whether to return all results or only up to a given limit',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				returnAll: [false],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 100,
+		},
+		default: 100,
+		description: 'Max number of results to return',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		default: {},
+		description: 'Additional options which decide which records should be returned',
+		placeholder: 'Add Option',
+		options: [
+			{
+				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-multi-options
+				displayName: 'Download Attachments',
+				name: 'downloadFields',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getAttachmentColumns',
+					loadOptionsDependsOn: ['base.value', 'table.value'],
+				},
+				default: [],
+				// eslint-disable-next-line n8n-nodes-base/node-param-description-wrong-for-dynamic-multi-options
+				description: "The fields of type 'attachment' that should be downloaded",
+			},
+			{
+				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-multi-options
+				displayName: 'Output Fields',
+				name: 'fields',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getColumns',
+					loadOptionsDependsOn: ['base.value', 'table.value'],
+				},
+				default: [],
+				// eslint-disable-next-line n8n-nodes-base/node-param-description-wrong-for-dynamic-multi-options
+				description: 'The fields you want to include in the output',
+			},
+			viewRLC,
+		],
+	},
+	{
+		displayName: 'Sort',
+		name: 'sort',
+		placeholder: 'Add Sort Rule',
+		description: 'Defines how the returned records should be ordered',
+		type: 'fixedCollection',
+		typeOptions: {
+			multipleValues: true,
+		},
+		default: {},
+		options: [
+			{
+				name: 'property',
+				displayName: 'Property',
+				values: [
+					{
+						// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-options
+						displayName: 'Field',
+						name: 'field',
+						type: 'options',
+						typeOptions: {
+							loadOptionsMethod: 'getColumns',
+							loadOptionsDependsOn: ['base.value', 'table.value'],
+						},
+						default: '',
+						description:
+							'Name of the field to sort on. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+					},
+					{
+						displayName: 'Direction',
+						name: 'direction',
+						type: 'options',
+						options: [
+							{
+								name: 'ASC',
+								value: 'asc',
+								description: 'Sort in ascending order (small -> large)',
+							},
+							{
+								name: 'DESC',
+								value: 'desc',
+								description: 'Sort in descending order (large -> small)',
+							},
+						],
+						default: 'asc',
+						description: 'The sort direction',
+					},
+				],
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['record'],
+		operation: ['search'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	items: INodeExecutionData[],
+	base: string,
+	table: string,
+): Promise<INodeExecutionData[]> {
+	let returnData: INodeExecutionData[] = [];
+
+	const body: IDataObject = {};
+	const qs: IDataObject = {};
+
+	const endpoint = `${base}/${table}`;
+
+	try {
+		const returnAll = this.getNodeParameter('returnAll', 0);
+		const options = this.getNodeParameter('options', 0, {});
+		const sort = this.getNodeParameter('sort', 0, {}) as IDataObject;
+		const filterByFormula = this.getNodeParameter('filterByFormula', 0) as string;
+
+		if (filterByFormula) {
+			qs.filterByFormula = filterByFormula;
+		}
+
+		if (options.fields) {
+			if (typeof options.fields === 'string') {
+				qs.fields = options.fields.split(',').map((field) => field.trim());
+			} else {
+				qs.fields = options.fields as string[];
+			}
+		}
+
+		if (sort.property) {
+			qs.sort = sort.property;
+		}
+
+		if (options.view) {
+			qs.view = (options.view as IDataObject).value as string;
+		}
+
+		let responseData;
+
+		if (returnAll) {
+			responseData = await apiRequestAllItems.call(this, 'GET', endpoint, body, qs);
+		} else {
+			qs.maxRecords = this.getNodeParameter('limit', 0);
+			responseData = await apiRequest.call(this, 'GET', endpoint, body, qs);
+		}
+
+		returnData = responseData.records as INodeExecutionData[];
+
+		if (options.downloadFields) {
+			const pairedItem = generatePairedItemData(items.length);
+			return await downloadRecordAttachments.call(
+				this,
+				responseData.records as IRecord[],
+				options.downloadFields as string[],
+				pairedItem,
+			);
+		}
+
+		returnData = returnData.map((record) => ({
+			json: flattenOutput(record as IDataObject),
+		}));
+
+		const itemData = generatePairedItemData(items.length);
+
+		returnData = this.helpers.constructExecutionMetaData(returnData, {
+			itemData,
+		});
+	} catch (error) {
+		if (this.continueOnFail()) {
+			returnData.push({ json: { message: error.message, error } });
+		} else {
+			throw error;
+		}
+	}
+
+	return returnData;
+}
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
new file mode 100644
index 0000000000000..d2c4172dd53d1
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/v2/actions/record/update.operation.ts
@@ -0,0 +1,150 @@
+import type {
+	IDataObject,
+	INodeExecutionData,
+	INodeProperties,
+	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 { insertUpdateOptions } from '../common.descriptions';
+
+const properties: INodeProperties[] = [
+	{
+		displayName: 'Columns',
+		name: 'columns',
+		type: 'resourceMapper',
+		noDataExpression: true,
+		default: {
+			mappingMode: 'defineBelow',
+			value: null,
+		},
+		required: true,
+		typeOptions: {
+			loadOptionsDependsOn: ['table.value', 'base.value'],
+			resourceMapper: {
+				resourceMapperMethod: 'getColumnsWithRecordId',
+				mode: 'update',
+				fieldWords: {
+					singular: 'column',
+					plural: 'columns',
+				},
+				addAllFields: true,
+				multiKeyMatch: true,
+			},
+		},
+	},
+	...insertUpdateOptions,
+];
+
+const displayOptions = {
+	show: {
+		resource: ['record'],
+		operation: ['update'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	items: INodeExecutionData[],
+	base: string,
+	table: string,
+): Promise<INodeExecutionData[]> {
+	const returnData: INodeExecutionData[] = [];
+
+	const endpoint = `${base}/${table}`;
+
+	const dataMode = this.getNodeParameter('columns.mappingMode', 0) as string;
+
+	const columnsToMatchOn = this.getNodeParameter('columns.matchingColumns', 0) as string[];
+
+	let tableData: UpdateRecord[] = [];
+	if (!columnsToMatchOn.includes('id')) {
+		const response = await apiRequestAllItems.call(
+			this,
+			'GET',
+			endpoint,
+			{},
+			{ fields: columnsToMatchOn },
+		);
+		tableData = response.records as UpdateRecord[];
+	}
+
+	for (let i = 0; i < items.length; i++) {
+		let recordId = '';
+		try {
+			const records: UpdateRecord[] = [];
+			const options = this.getNodeParameter('options', i, {});
+
+			if (dataMode === 'autoMapInputData') {
+				if (columnsToMatchOn.includes('id')) {
+					const { id, ...fields } = items[i].json;
+					recordId = id as string;
+
+					records.push({
+						id: recordId,
+						fields: removeIgnored(fields, options.ignoreFields as string),
+					});
+				} else {
+					const matches = findMatches(
+						tableData,
+						columnsToMatchOn,
+						items[i].json,
+						options.updateAllMatches as boolean,
+					);
+
+					for (const match of matches) {
+						const id = match.id as string;
+						const fields = items[i].json;
+						records.push({ id, fields: removeIgnored(fields, options.ignoreFields as string) });
+					}
+				}
+			}
+
+			if (dataMode === 'defineBelow') {
+				if (columnsToMatchOn.includes('id')) {
+					const { id, ...fields } = this.getNodeParameter('columns.value', i, []) as IDataObject;
+					records.push({ id: id as string, fields });
+				} else {
+					const fields = this.getNodeParameter('columns.value', i, []) as IDataObject;
+
+					const matches = findMatches(
+						tableData,
+						columnsToMatchOn,
+						fields,
+						options.updateAllMatches as boolean,
+					);
+
+					for (const match of matches) {
+						const id = match.id as string;
+						records.push({ id, fields: removeIgnored(fields, columnsToMatchOn) });
+					}
+				}
+			}
+
+			const body: IDataObject = { typecast: options.typecast ? true : false };
+
+			const responseData = await batchUpdate.call(this, endpoint, body, records);
+
+			const executionData = this.helpers.constructExecutionMetaData(
+				wrapData(responseData.records as IDataObject[]),
+				{ itemData: { item: i } },
+			);
+
+			returnData.push(...executionData);
+		} catch (error) {
+			error = processAirtableError(error as NodeApiError, recordId, i);
+			if (this.continueOnFail()) {
+				returnData.push({ json: { message: error.message, error } });
+				continue;
+			}
+			throw error;
+		}
+	}
+
+	return returnData;
+}
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
new file mode 100644
index 0000000000000..e6266480cee97
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/v2/actions/record/upsert.operation.ts
@@ -0,0 +1,160 @@
+import type {
+	IDataObject,
+	INodeExecutionData,
+	INodeProperties,
+	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 { insertUpdateOptions } from '../common.descriptions';
+
+const properties: INodeProperties[] = [
+	{
+		displayName: 'Columns',
+		name: 'columns',
+		type: 'resourceMapper',
+		noDataExpression: true,
+		default: {
+			mappingMode: 'defineBelow',
+			value: null,
+		},
+		required: true,
+		typeOptions: {
+			loadOptionsDependsOn: ['table.value', 'base.value'],
+			resourceMapper: {
+				resourceMapperMethod: 'getColumnsWithRecordId',
+				mode: 'update',
+				fieldWords: {
+					singular: 'column',
+					plural: 'columns',
+				},
+				addAllFields: true,
+				multiKeyMatch: true,
+			},
+		},
+	},
+	...insertUpdateOptions,
+];
+
+const displayOptions = {
+	show: {
+		resource: ['record'],
+		operation: ['upsert'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	items: INodeExecutionData[],
+	base: string,
+	table: string,
+): Promise<INodeExecutionData[]> {
+	const returnData: INodeExecutionData[] = [];
+
+	const endpoint = `${base}/${table}`;
+
+	const dataMode = this.getNodeParameter('columns.mappingMode', 0) as string;
+
+	const columnsToMatchOn = this.getNodeParameter('columns.matchingColumns', 0) as string[];
+
+	for (let i = 0; i < items.length; i++) {
+		try {
+			const records: UpdateRecord[] = [];
+			const options = this.getNodeParameter('options', i, {});
+
+			if (dataMode === 'autoMapInputData') {
+				if (columnsToMatchOn.includes('id')) {
+					const { id, ...fields } = items[i].json;
+
+					records.push({
+						id: id as string,
+						fields: removeIgnored(fields, options.ignoreFields as string),
+					});
+				} else {
+					records.push({ fields: removeIgnored(items[i].json, options.ignoreFields as string) });
+				}
+			}
+
+			if (dataMode === 'defineBelow') {
+				const fields = this.getNodeParameter('columns.value', i, []) as IDataObject;
+
+				if (columnsToMatchOn.includes('id')) {
+					const id = fields.id as string;
+					delete fields.id;
+					records.push({ id, fields });
+				} else {
+					records.push({ fields });
+				}
+			}
+
+			const body: IDataObject = {
+				typecast: options.typecast ? true : false,
+			};
+
+			if (!columnsToMatchOn.includes('id')) {
+				body.performUpsert = { fieldsToMergeOn: columnsToMatchOn };
+			}
+
+			let responseData;
+			try {
+				responseData = await batchUpdate.call(this, endpoint, body, records);
+			} catch (error) {
+				if (error.httpCode === '422' && columnsToMatchOn.includes('id')) {
+					const createBody = {
+						...body,
+						records: records.map(({ fields }) => ({ fields })),
+					};
+					responseData = await apiRequest.call(this, 'POST', endpoint, createBody);
+				} else if (error?.description?.includes('Cannot update more than one record')) {
+					const conditions = columnsToMatchOn
+						.map((column) => `{${column}} = '${records[0].fields[column]}'`)
+						.join(',');
+					const response = await apiRequestAllItems.call(
+						this,
+						'GET',
+						endpoint,
+						{},
+						{
+							fields: columnsToMatchOn,
+							filterByFormula: `AND(${conditions})`,
+						},
+					);
+					const matches = response.records as UpdateRecord[];
+
+					const updateRecords: UpdateRecord[] = [];
+
+					if (options.updateAllMatches) {
+						updateRecords.push(...matches.map(({ id }) => ({ id, fields: records[0].fields })));
+					} else {
+						updateRecords.push({ id: matches[0].id, fields: records[0].fields });
+					}
+
+					responseData = await batchUpdate.call(this, endpoint, body, updateRecords);
+				} else {
+					throw error;
+				}
+			}
+
+			const executionData = this.helpers.constructExecutionMetaData(
+				wrapData(responseData.records as IDataObject[]),
+				{ itemData: { item: i } },
+			);
+
+			returnData.push(...executionData);
+		} catch (error) {
+			error = processAirtableError(error as NodeApiError, undefined, i);
+			if (this.continueOnFail()) {
+				returnData.push({ json: { message: error.message, error } });
+				continue;
+			}
+			throw error;
+		}
+	}
+
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/Airtable/v2/actions/router.ts b/packages/nodes-base/nodes/Airtable/v2/actions/router.ts
new file mode 100644
index 0000000000000..ac1216a680474
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/v2/actions/router.ts
@@ -0,0 +1,59 @@
+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';
+
+export async function router(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+	let returnData: INodeExecutionData[] = [];
+
+	const items = this.getInputData();
+	const resource = this.getNodeParameter<AirtableType>('resource', 0);
+	const operation = this.getNodeParameter('operation', 0);
+
+	const airtableNodeData = {
+		resource,
+		operation,
+	} as AirtableType;
+
+	try {
+		switch (airtableNodeData.resource) {
+			case 'record':
+				const baseId = this.getNodeParameter('base', 0, undefined, {
+					extractValue: true,
+				}) as string;
+
+				const table = encodeURI(
+					this.getNodeParameter('table', 0, undefined, {
+						extractValue: true,
+					}) as string,
+				);
+				returnData = await record[airtableNodeData.operation].execute.call(
+					this,
+					items,
+					baseId,
+					table,
+				);
+				break;
+			case 'base':
+				returnData = await base[airtableNodeData.operation].execute.call(this, items);
+				break;
+			default:
+				throw new NodeOperationError(
+					this.getNode(),
+					`The operation "${operation}" is not supported!`,
+				);
+		}
+	} catch (error) {
+		if (
+			error.description &&
+			(error.description as string).includes('cannot accept the provided value')
+		) {
+			error.description = `${error.description}. Consider using 'Typecast' option`;
+		}
+		throw error;
+	}
+
+	return [returnData];
+}
diff --git a/packages/nodes-base/nodes/Airtable/v2/actions/versionDescription.ts b/packages/nodes-base/nodes/Airtable/v2/actions/versionDescription.ts
new file mode 100644
index 0000000000000..3665469456b4c
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/v2/actions/versionDescription.ts
@@ -0,0 +1,81 @@
+/* eslint-disable n8n-nodes-base/node-filename-against-convention */
+import type { INodeTypeDescription } from 'n8n-workflow';
+
+import * as record from './record/Record.resource';
+import * as base from './base/Base.resource';
+
+export const versionDescription: INodeTypeDescription = {
+	displayName: 'Airtable',
+	name: 'airtable',
+	icon: 'file:airtable.svg',
+	group: ['input'],
+	version: 2,
+	subtitle: '={{ $parameter["operation"] + ": " + $parameter["resource"] }}',
+	description: 'Read, update, write and delete data from Airtable',
+	defaults: {
+		name: 'Airtable',
+	},
+	inputs: ['main'],
+	outputs: ['main'],
+	credentials: [
+		{
+			name: 'airtableTokenApi',
+			required: true,
+			displayOptions: {
+				show: {
+					authentication: ['airtableTokenApi'],
+				},
+			},
+		},
+		{
+			name: 'airtableOAuth2Api',
+			required: true,
+			displayOptions: {
+				show: {
+					authentication: ['airtableOAuth2Api'],
+				},
+			},
+		},
+	],
+	properties: [
+		{
+			displayName: 'Authentication',
+			name: 'authentication',
+			type: 'options',
+			options: [
+				{
+					name: 'Access Token',
+					value: 'airtableTokenApi',
+				},
+				{
+					name: 'OAuth2',
+					value: 'airtableOAuth2Api',
+				},
+			],
+			default: 'airtableTokenApi',
+		},
+		{
+			displayName: 'Resource',
+			name: 'resource',
+			type: 'options',
+			noDataExpression: true,
+			options: [
+				{
+					name: 'Base',
+					value: 'base',
+				},
+				{
+					name: 'Record',
+					value: 'record',
+				},
+				// {
+				// 	name: 'Table',
+				// 	value: 'table',
+				// },
+			],
+			default: 'record',
+		},
+		...record.description,
+		...base.description,
+	],
+};
diff --git a/packages/nodes-base/nodes/Airtable/v2/helpers/interfaces.ts b/packages/nodes-base/nodes/Airtable/v2/helpers/interfaces.ts
new file mode 100644
index 0000000000000..882f8f9212487
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/v2/helpers/interfaces.ts
@@ -0,0 +1,25 @@
+import type { IDataObject } from 'n8n-workflow';
+
+export interface IAttachment {
+	url: string;
+	filename: string;
+	type: string;
+}
+
+export interface IRecord {
+	fields: {
+		[key: string]: string | IAttachment[];
+	};
+}
+
+export type UpdateRecord = {
+	fields: IDataObject;
+	id?: string;
+};
+export type UpdateBody = {
+	records: UpdateRecord[];
+	performUpsert?: {
+		fieldsToMergeOn: string[];
+	};
+	typecast?: boolean;
+};
diff --git a/packages/nodes-base/nodes/Airtable/v2/helpers/utils.ts b/packages/nodes-base/nodes/Airtable/v2/helpers/utils.ts
new file mode 100644
index 0000000000000..0daf33b997d52
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/v2/helpers/utils.ts
@@ -0,0 +1,91 @@
+import { ApplicationError, type IDataObject, type NodeApiError } from 'n8n-workflow';
+import set from 'lodash/set';
+import type { UpdateRecord } from './interfaces';
+
+export function removeIgnored(data: IDataObject, ignore: string | string[]) {
+	if (ignore) {
+		let ignoreFields: string[] = [];
+
+		if (typeof ignore === 'string') {
+			ignoreFields = ignore.split(',').map((field) => field.trim());
+		} else {
+			ignoreFields = ignore;
+		}
+
+		const newData: IDataObject = {};
+
+		for (const field of Object.keys(data)) {
+			if (!ignoreFields.includes(field)) {
+				newData[field] = data[field];
+			}
+		}
+
+		return newData;
+	} else {
+		return data;
+	}
+}
+
+export function findMatches(
+	data: UpdateRecord[],
+	keys: string[],
+	fields: IDataObject,
+	updateAll?: boolean,
+) {
+	if (updateAll) {
+		const matches = data.filter((record) => {
+			for (const key of keys) {
+				if (record.fields[key] !== fields[key]) {
+					return false;
+				}
+			}
+			return true;
+		});
+
+		if (!matches?.length) {
+			throw new ApplicationError('No records match provided keys', { level: 'warning' });
+		}
+
+		return matches;
+	} else {
+		const match = data.find((record) => {
+			for (const key of keys) {
+				if (record.fields[key] !== fields[key]) {
+					return false;
+				}
+			}
+			return true;
+		});
+
+		if (!match) {
+			throw new ApplicationError('Record matching provided keys was not found', {
+				level: 'warning',
+			});
+		}
+
+		return [match];
+	}
+}
+
+export function processAirtableError(error: NodeApiError, id?: string, itemIndex?: number) {
+	if (error.description === 'NOT_FOUND' && id) {
+		error.description = `${id} is not a valid Record ID`;
+	}
+	if (error.description?.includes('You must provide an array of up to 10 record objects') && id) {
+		error.description = `${id} is not a valid Record ID`;
+	}
+
+	if (itemIndex !== undefined) {
+		set(error, 'context.itemIndex', itemIndex);
+	}
+
+	return error;
+}
+
+export const flattenOutput = (record: IDataObject) => {
+	const { fields, ...rest } = record;
+	return {
+		...rest,
+		...(fields as IDataObject),
+	};
+};
diff --git a/packages/nodes-base/nodes/Airtable/v2/methods/index.ts b/packages/nodes-base/nodes/Airtable/v2/methods/index.ts
new file mode 100644
index 0000000000000..9c4a59c911ccc
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/v2/methods/index.ts
@@ -0,0 +1,3 @@
+export * as listSearch from './listSearch';
+export * as loadOptions from './loadOptions';
+export * as resourceMapping from './resourceMapping';
diff --git a/packages/nodes-base/nodes/Airtable/v2/methods/listSearch.ts b/packages/nodes-base/nodes/Airtable/v2/methods/listSearch.ts
new file mode 100644
index 0000000000000..10f2d89c83948
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/v2/methods/listSearch.ts
@@ -0,0 +1,151 @@
+import type {
+	IDataObject,
+	ILoadOptionsFunctions,
+	INodeListSearchItems,
+	INodeListSearchResult,
+} from 'n8n-workflow';
+import { NodeOperationError } from 'n8n-workflow';
+import { apiRequest } from '../transport';
+
+export async function baseSearch(
+	this: ILoadOptionsFunctions,
+	filter?: string,
+	paginationToken?: string,
+): Promise<INodeListSearchResult> {
+	let qs;
+	if (paginationToken) {
+		qs = {
+			offset: paginationToken,
+		};
+	}
+
+	const response = await apiRequest.call(this, 'GET', 'meta/bases', undefined, qs);
+
+	if (filter) {
+		const results: INodeListSearchItems[] = [];
+
+		for (const base of response.bases || []) {
+			if ((base.name as string)?.toLowerCase().includes(filter.toLowerCase())) {
+				results.push({
+					name: base.name as string,
+					value: base.id as string,
+					url: `https://airtable.com/${base.id}`,
+				});
+			}
+		}
+
+		return {
+			results,
+			paginationToken: response.offset,
+		};
+	} else {
+		return {
+			results: (response.bases || []).map((base: IDataObject) => ({
+				name: base.name as string,
+				value: base.id as string,
+				url: `https://airtable.com/${base.id}`,
+			})),
+			paginationToken: response.offset,
+		};
+	}
+}
+
+export async function tableSearch(
+	this: ILoadOptionsFunctions,
+	filter?: string,
+	paginationToken?: string,
+): Promise<INodeListSearchResult> {
+	const baseId = this.getNodeParameter('base', undefined, {
+		extractValue: true,
+	}) as string;
+
+	let qs;
+	if (paginationToken) {
+		qs = {
+			offset: paginationToken,
+		};
+	}
+
+	const response = await apiRequest.call(this, 'GET', `meta/bases/${baseId}/tables`, undefined, qs);
+
+	if (filter) {
+		const results: INodeListSearchItems[] = [];
+
+		for (const table of response.tables || []) {
+			if ((table.name as string)?.toLowerCase().includes(filter.toLowerCase())) {
+				results.push({
+					name: table.name as string,
+					value: table.id as string,
+					url: `https://airtable.com/${baseId}/${table.id}`,
+				});
+			}
+		}
+
+		return {
+			results,
+			paginationToken: response.offset,
+		};
+	} else {
+		return {
+			results: (response.tables || []).map((table: IDataObject) => ({
+				name: table.name as string,
+				value: table.id as string,
+				url: `https://airtable.com/${baseId}/${table.id}`,
+			})),
+			paginationToken: response.offset,
+		};
+	}
+}
+
+export async function viewSearch(
+	this: ILoadOptionsFunctions,
+	filter?: string,
+): Promise<INodeListSearchResult> {
+	const baseId = this.getNodeParameter('base', undefined, {
+		extractValue: true,
+	}) as string;
+
+	const tableId = encodeURI(
+		this.getNodeParameter('table', undefined, {
+			extractValue: true,
+		}) as string,
+	);
+
+	const response = await apiRequest.call(this, 'GET', `meta/bases/${baseId}/tables`);
+
+	const tableData = ((response.tables as IDataObject[]) || []).find((table: IDataObject) => {
+		return table.id === tableId;
+	});
+
+	if (!tableData) {
+		throw new NodeOperationError(this.getNode(), 'Table information could not be found!', {
+			level: 'warning',
+		});
+	}
+
+	if (filter) {
+		const results: INodeListSearchItems[] = [];
+
+		for (const view of (tableData.views as IDataObject[]) || []) {
+			if ((view.name as string)?.toLowerCase().includes(filter.toLowerCase())) {
+				results.push({
+					name: view.name as string,
+					value: view.id as string,
+					url: `https://airtable.com/${baseId}/${tableId}/${view.id}`,
+				});
+			}
+		}
+
+		return {
+			results,
+		};
+	} else {
+		return {
+			results: ((tableData.views as IDataObject[]) || []).map((view) => ({
+				name: view.name as string,
+				value: view.id as string,
+				url: `https://airtable.com/${baseId}/${tableId}/${view.id}`,
+			})),
+		};
+	}
+}
diff --git a/packages/nodes-base/nodes/Airtable/v2/methods/loadOptions.ts b/packages/nodes-base/nodes/Airtable/v2/methods/loadOptions.ts
new file mode 100644
index 0000000000000..79aaabf1ef1a9
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/v2/methods/loadOptions.ts
@@ -0,0 +1,103 @@
+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[]> {
+	const base = this.getNodeParameter('base', undefined, {
+		extractValue: true,
+	}) as string;
+
+	const tableId = encodeURI(
+		this.getNodeParameter('table', undefined, {
+			extractValue: true,
+		}) as string,
+	);
+
+	const response = await apiRequest.call(this, 'GET', `meta/bases/${base}/tables`);
+
+	const tableData = ((response.tables as IDataObject[]) || []).find((table: IDataObject) => {
+		return table.id === tableId;
+	});
+
+	if (!tableData) {
+		throw new NodeOperationError(this.getNode(), 'Table information could not be found!', {
+			level: 'warning',
+		});
+	}
+
+	const result: INodePropertyOptions[] = [];
+
+	for (const field of tableData.fields as IDataObject[]) {
+		result.push({
+			name: field.name as string,
+			value: field.name as string,
+			description: `Type: ${field.type}`,
+		});
+	}
+
+	return result;
+}
+
+export async function getColumnsWithRecordId(
+	this: ILoadOptionsFunctions,
+): Promise<INodePropertyOptions[]> {
+	const returnData = await getColumns.call(this);
+	return [
+		{
+			// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased-id, n8n-nodes-base/node-param-display-name-miscased
+			name: 'id',
+			value: 'id' as string,
+			description: 'Type: primaryFieldId',
+		},
+		...returnData,
+	];
+}
+
+export async function getColumnsWithoutColumnToMatchOn(
+	this: ILoadOptionsFunctions,
+): Promise<INodePropertyOptions[]> {
+	const columnToMatchOn = this.getNodeParameter('columnToMatchOn') as string;
+	const returnData = await getColumns.call(this);
+	return returnData.filter((column) => column.value !== columnToMatchOn);
+}
+
+export async function getAttachmentColumns(
+	this: ILoadOptionsFunctions,
+): Promise<INodePropertyOptions[]> {
+	const base = this.getNodeParameter('base', undefined, {
+		extractValue: true,
+	}) as string;
+
+	const tableId = encodeURI(
+		this.getNodeParameter('table', undefined, {
+			extractValue: true,
+		}) as string,
+	);
+
+	const response = await apiRequest.call(this, 'GET', `meta/bases/${base}/tables`);
+
+	const tableData = ((response.tables as IDataObject[]) || []).find((table: IDataObject) => {
+		return table.id === tableId;
+	});
+
+	if (!tableData) {
+		throw new NodeOperationError(this.getNode(), 'Table information could not be found!', {
+			level: 'warning',
+		});
+	}
+
+	const result: INodePropertyOptions[] = [];
+
+	for (const field of tableData.fields as IDataObject[]) {
+		if (!(field.type as string)?.toLowerCase()?.includes('attachment')) {
+			continue;
+		}
+		result.push({
+			name: field.name as string,
+			value: field.name as string,
+			description: `Type: ${field.type}`,
+		});
+	}
+
+	return result;
+}
diff --git a/packages/nodes-base/nodes/Airtable/v2/methods/resourceMapping.ts b/packages/nodes-base/nodes/Airtable/v2/methods/resourceMapping.ts
new file mode 100644
index 0000000000000..94759adfbd977
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/v2/methods/resourceMapping.ts
@@ -0,0 +1,138 @@
+import type {
+	FieldType,
+	IDataObject,
+	ILoadOptionsFunctions,
+	INodePropertyOptions,
+	ResourceMapperField,
+	ResourceMapperFields,
+} from 'n8n-workflow';
+import { NodeOperationError } from 'n8n-workflow';
+import { apiRequest } from '../transport';
+
+type AirtableSchema = {
+	id: string;
+	name: string;
+	type: string;
+	options?: IDataObject;
+};
+
+type TypesMap = Partial<Record<FieldType, string[]>>;
+
+const airtableReadOnlyFields = [
+	'autoNumber',
+	'button',
+	'count',
+	'createdBy',
+	'createdTime',
+	'formula',
+	'lastModifiedBy',
+	'lastModifiedTime',
+	'lookup',
+	'rollup',
+	'externalSyncSource',
+	'multipleLookupValues',
+	'multipleRecordLinks',
+];
+
+const airtableTypesMap: TypesMap = {
+	string: ['singleLineText', 'multilineText', 'richText', 'email', 'phoneNumber', 'url'],
+	number: ['rating', 'percent', 'number', 'duration', 'currency'],
+	boolean: ['checkbox'],
+	dateTime: ['dateTime', 'date'],
+	time: [],
+	object: [],
+	options: ['singleSelect'],
+	array: ['multipleSelects', 'multipleAttachments'],
+};
+
+function mapForeignType(foreignType: string, typesMap: TypesMap): FieldType {
+	let type: FieldType = 'string';
+
+	for (const nativeType of Object.keys(typesMap)) {
+		const mappedForeignTypes = typesMap[nativeType as FieldType];
+
+		if (mappedForeignTypes?.includes(foreignType)) {
+			type = nativeType as FieldType;
+			break;
+		}
+	}
+
+	return type;
+}
+
+export async function getColumns(this: ILoadOptionsFunctions): Promise<ResourceMapperFields> {
+	const base = this.getNodeParameter('base', undefined, {
+		extractValue: true,
+	}) as string;
+
+	const tableId = encodeURI(
+		this.getNodeParameter('table', undefined, {
+			extractValue: true,
+		}) as string,
+	);
+
+	const response = await apiRequest.call(this, 'GET', `meta/bases/${base}/tables`);
+
+	const tableData = ((response.tables as IDataObject[]) || []).find((table: IDataObject) => {
+		return table.id === tableId;
+	});
+
+	if (!tableData) {
+		throw new NodeOperationError(this.getNode(), 'Table information could not be found!', {
+			level: 'warning',
+		});
+	}
+
+	const fields: ResourceMapperField[] = [];
+
+	const constructOptions = (field: AirtableSchema) => {
+		if (field?.options?.choices) {
+			return (field.options.choices as IDataObject[]).map((choice) => ({
+				name: choice.name,
+				value: choice.name,
+			})) as INodePropertyOptions[];
+		}
+
+		return undefined;
+	};
+
+	for (const field of tableData.fields as AirtableSchema[]) {
+		const type = mapForeignType(field.type, airtableTypesMap);
+		const isReadOnly = airtableReadOnlyFields.includes(field.type);
+		const options = constructOptions(field);
+		fields.push({
+			id: field.name,
+			displayName: field.name,
+			required: false,
+			defaultMatch: false,
+			canBeUsedToMatch: true,
+			display: true,
+			type,
+			options,
+			readOnly: isReadOnly,
+			removed: isReadOnly,
+		});
+	}
+
+	return { fields };
+}
+
+export async function getColumnsWithRecordId(
+	this: ILoadOptionsFunctions,
+): Promise<ResourceMapperFields> {
+	const returnData = await getColumns.call(this);
+	return {
+		fields: [
+			{
+				id: 'id',
+				displayName: 'id',
+				required: false,
+				defaultMatch: true,
+				display: true,
+				type: 'string',
+				readOnly: true,
+			},
+			...returnData.fields,
+		],
+	};
+}
diff --git a/packages/nodes-base/nodes/Airtable/v2/transport/index.ts b/packages/nodes-base/nodes/Airtable/v2/transport/index.ts
new file mode 100644
index 0000000000000..95d2c3c1f85a3
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/v2/transport/index.ts
@@ -0,0 +1,172 @@
+import type {
+	IBinaryKeyData,
+	IDataObject,
+	IExecuteFunctions,
+	IPollFunctions,
+	ILoadOptionsFunctions,
+	INodeExecutionData,
+	IPairedItemData,
+	IHttpRequestMethods,
+	IRequestOptions,
+} from 'n8n-workflow';
+import { ApplicationError } from 'n8n-workflow';
+import type { IAttachment, IRecord } from '../helpers/interfaces';
+import { flattenOutput } from '../helpers/utils';
+
+/**
+ * Make an API request to Airtable
+ *
+ */
+export async function apiRequest(
+	this: IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions,
+	method: IHttpRequestMethods,
+	endpoint: string,
+	body: IDataObject = {},
+	query?: IDataObject,
+	uri?: string,
+	option: IDataObject = {},
+) {
+	query = query || {};
+
+	const options: IRequestOptions = {
+		headers: {},
+		method,
+		body,
+		qs: query,
+		uri: uri || `https://api.airtable.com/v0/${endpoint}`,
+		useQuerystring: false,
+		json: true,
+	};
+
+	if (Object.keys(option).length !== 0) {
+		Object.assign(options, option);
+	}
+
+	if (Object.keys(body).length === 0) {
+		delete options.body;
+	}
+
+	const authenticationMethod = this.getNodeParameter('authentication', 0) as string;
+	return await this.helpers.requestWithAuthentication.call(this, authenticationMethod, options);
+}
+
+/**
+ * Make an API request to paginated Airtable endpoint
+ * and return all results
+ *
+ * @param {(IExecuteFunctions | IExecuteFunctions)} this
+ */
+export async function apiRequestAllItems(
+	this: IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions,
+	method: IHttpRequestMethods,
+	endpoint: string,
+	body?: IDataObject,
+	query?: IDataObject,
+) {
+	if (query === undefined) {
+		query = {};
+	}
+	query.pageSize = 100;
+
+	const returnData: IDataObject[] = [];
+
+	let responseData;
+
+	do {
+		responseData = await apiRequest.call(this, method, endpoint, body, query);
+		returnData.push.apply(returnData, responseData.records as IDataObject[]);
+
+		query.offset = responseData.offset;
+	} while (responseData.offset !== undefined);
+
+	return {
+		records: returnData,
+	};
+}
+
+export async function downloadRecordAttachments(
+	this: IExecuteFunctions | IPollFunctions,
+	records: IRecord[],
+	fieldNames: string | string[],
+	pairedItem?: IPairedItemData[],
+): Promise<INodeExecutionData[]> {
+	if (typeof fieldNames === 'string') {
+		fieldNames = fieldNames.split(',').map((item) => item.trim());
+	}
+	if (!fieldNames.length) {
+		throw new ApplicationError("Specify field to download in 'Download Attachments' option", {
+			level: 'warning',
+		});
+	}
+	const elements: INodeExecutionData[] = [];
+	for (const record of records) {
+		const element: INodeExecutionData = { json: {}, binary: {} };
+		if (pairedItem) {
+			element.pairedItem = pairedItem;
+		}
+		element.json = flattenOutput(record as unknown as IDataObject);
+		for (const fieldName of fieldNames) {
+			if (record.fields[fieldName] !== undefined) {
+				for (const [index, attachment] of (record.fields[fieldName] as IAttachment[]).entries()) {
+					const file = await apiRequest.call(this, 'GET', '', {}, {}, attachment.url, {
+						json: false,
+						encoding: null,
+					});
+					element.binary![`${fieldName}_${index}`] = await this.helpers.prepareBinaryData(
+						Buffer.from(file as string),
+						attachment.filename,
+						attachment.type,
+					);
+				}
+			}
+		}
+		if (Object.keys(element.binary as IBinaryKeyData).length === 0) {
+			delete element.binary;
+		}
+		elements.push(element);
+	}
+	return elements;
+}
+
+export async function batchUpdate(
+	this: IExecuteFunctions | IPollFunctions,
+	endpoint: string,
+	body: IDataObject,
+	updateRecords: IDataObject[],
+) {
+	if (!updateRecords.length) {
+		return { records: [] };
+	}
+
+	let responseData: IDataObject;
+
+	if (updateRecords.length && updateRecords.length <= 10) {
+		const updateBody = {
+			...body,
+			records: updateRecords,
+		};
+
+		responseData = await apiRequest.call(this, 'PATCH', endpoint, updateBody);
+		return responseData;
+	}
+
+	const batchSize = 10;
+	const batches = Math.ceil(updateRecords.length / batchSize);
+	const updatedRecords: IDataObject[] = [];
+
+	for (let j = 0; j < batches; j++) {
+		const batch = updateRecords.slice(j * batchSize, (j + 1) * batchSize);
+
+		const updateBody = {
+			...body,
+			records: batch,
+		};
+
+		const updateResponse = await apiRequest.call(this, 'PATCH', endpoint, updateBody);
+		updatedRecords.push(...((updateResponse.records as IDataObject[]) || []));
+	}
+
+	responseData = { records: updatedRecords };
+
+	return responseData;
+}
diff --git a/packages/nodes-base/nodes/Amqp/Amqp.node.ts b/packages/nodes-base/nodes/Amqp/Amqp.node.ts
index 38746077f27ac..5a7bb808b9f4a 100644
--- a/packages/nodes-base/nodes/Amqp/Amqp.node.ts
+++ b/packages/nodes-base/nodes/Amqp/Amqp.node.ts
@@ -1,4 +1,4 @@
-import type { ContainerOptions, Dictionary, EventContext } from 'rhea';
+import type { Connection, ContainerOptions, Dictionary, EventContext } from 'rhea';
 import { create_container } from 'rhea';
 
 import type {
@@ -7,6 +7,10 @@ import type {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	ICredentialTestFunctions,
+	INodeCredentialTestResult,
+	ICredentialsDecrypted,
+	ICredentialDataDecryptedObject,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
@@ -28,6 +32,7 @@ export class Amqp implements INodeType {
 			{
 				name: 'amqp',
 				required: true,
+				testedBy: 'amqpConnectionTest',
 			},
 		],
 		properties: [
@@ -95,6 +100,52 @@ export class Amqp implements INodeType {
 		],
 	};
 
+	methods = {
+		credentialTest: {
+			async amqpConnectionTest(
+				this: ICredentialTestFunctions,
+				credential: ICredentialsDecrypted,
+			): Promise<INodeCredentialTestResult> {
+				const credentials = credential.data as ICredentialDataDecryptedObject;
+				const connectOptions: ContainerOptions = {
+					reconnect: false,
+					host: credentials.hostname as string,
+					hostname: credentials.hostname as string,
+					port: credentials.port as number,
+					username: credentials.username ? (credentials.username as string) : undefined,
+					password: credentials.password ? (credentials.password as string) : undefined,
+					transport: credentials.transportType ? (credentials.transportType as string) : undefined,
+				};
+
+				let conn: Connection | undefined = undefined;
+				try {
+					const container = create_container();
+					await new Promise<void>((resolve, reject) => {
+						container.on('connection_open', function (_contex: EventContext) {
+							resolve();
+						});
+						container.on('disconnected', function (context: EventContext) {
+							reject(context.error ?? new Error('unknown error'));
+						});
+						conn = container.connect(connectOptions);
+					});
+				} catch (error) {
+					return {
+						status: 'Error',
+						message: (error as Error).message,
+					};
+				} finally {
+					if (conn) (conn as Connection).close();
+				}
+
+				return {
+					status: 'OK',
+					message: 'Connection successful!',
+				};
+			},
+		},
+	};
+
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		try {
 			const credentials = await this.getCredentials('amqp');
diff --git a/packages/nodes-base/nodes/Amqp/AmqpTrigger.node.ts b/packages/nodes-base/nodes/Amqp/AmqpTrigger.node.ts
index d69fa908b6064..e63bb9ad034ce 100644
--- a/packages/nodes-base/nodes/Amqp/AmqpTrigger.node.ts
+++ b/packages/nodes-base/nodes/Amqp/AmqpTrigger.node.ts
@@ -7,6 +7,8 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 	ITriggerResponse,
+	IDeferredPromise,
+	IRun,
 } from 'n8n-workflow';
 import { deepCopy, jsonParse, NodeOperationError } from 'n8n-workflow';
 
@@ -46,16 +48,18 @@ export class AmqpTrigger implements INodeType {
 				name: 'clientname',
 				type: 'string',
 				default: '',
-				placeholder: 'for durable/persistent topic subscriptions, example: "n8n"',
+				placeholder: 'e.g. n8n',
 				description: 'Leave empty for non-durable topic subscriptions or queues',
+				hint: 'for durable/persistent topic subscriptions',
 			},
 			{
 				displayName: 'Subscription',
 				name: 'subscription',
 				type: 'string',
 				default: '',
-				placeholder: 'for durable/persistent topic subscriptions, example: "order-worker"',
+				placeholder: 'e.g. order-worker',
 				description: 'Leave empty for non-durable topic subscriptions or queues',
+				hint: 'for durable/persistent topic subscriptions',
 			},
 			{
 				displayName: 'Options',
@@ -100,6 +104,13 @@ export class AmqpTrigger implements INodeType {
 						default: false,
 						description: 'Whether to return only the body property',
 					},
+					{
+						displayName: 'Parallel Processing',
+						name: 'parallelProcessing',
+						type: 'boolean',
+						default: true,
+						description: 'Whether to process messages in parallel',
+					},
 					{
 						displayName: 'Reconnect',
 						name: 'reconnect',
@@ -133,6 +144,7 @@ export class AmqpTrigger implements INodeType {
 		const clientname = this.getNodeParameter('clientname', '') as string;
 		const subscription = this.getNodeParameter('subscription', '') as string;
 		const options = this.getNodeParameter('options', {}) as IDataObject;
+		const parallelProcessing = this.getNodeParameter('options.parallelProcessing', true) as boolean;
 		const pullMessagesNumber = (options.pullMessagesNumber as number) || 100;
 		const containerId = options.containerId as string;
 		const containerReconnect = (options.reconnect as boolean) || true;
@@ -156,7 +168,7 @@ export class AmqpTrigger implements INodeType {
 			context.receiver?.add_credit(pullMessagesNumber);
 		});
 
-		container.on('message', (context: EventContext) => {
+		container.on('message', async (context: EventContext) => {
 			// No message in the context
 			if (!context.message) {
 				return;
@@ -195,12 +207,24 @@ export class AmqpTrigger implements INodeType {
 				data = data.body;
 			}
 
-			this.emit([this.helpers.returnJsonArray([data as any])]);
+			let responsePromise: IDeferredPromise<IRun> | undefined = undefined;
+			if (!parallelProcessing) {
+				responsePromise = await this.helpers.createDeferredPromise();
+			}
+			if (responsePromise) {
+				this.emit([this.helpers.returnJsonArray([data as any])], undefined, responsePromise);
+				await responsePromise.promise();
+			} else {
+				this.emit([this.helpers.returnJsonArray([data as any])]);
+			}
 
 			if (!context.receiver?.has_credit()) {
-				setTimeout(() => {
-					context.receiver?.add_credit(pullMessagesNumber);
-				}, (options.sleepTime as number) || 10);
+				setTimeout(
+					() => {
+						context.receiver?.add_credit(pullMessagesNumber);
+					},
+					(options.sleepTime as number) || 10,
+				);
 			}
 		});
 
@@ -248,6 +272,10 @@ export class AmqpTrigger implements INodeType {
 		const manualTriggerFunction = async () => {
 			await new Promise((resolve, reject) => {
 				const timeoutHandler = setTimeout(() => {
+					container.removeAllListeners('receiver_open');
+					container.removeAllListeners('message');
+					connection.close();
+
 					reject(
 						new Error(
 							'Aborted, no message received within 30secs. This 30sec timeout is only set for "manually triggered execution". Active Workflows will listen indefinitely.',
diff --git a/packages/nodes-base/nodes/ApiTemplateIo/ApiTemplateIo.node.json b/packages/nodes-base/nodes/ApiTemplateIo/ApiTemplateIo.node.json
index 9b52f2b395c95..e6853ac9ce9e1 100644
--- a/packages/nodes-base/nodes/ApiTemplateIo/ApiTemplateIo.node.json
+++ b/packages/nodes-base/nodes/ApiTemplateIo/ApiTemplateIo.node.json
@@ -2,7 +2,7 @@
 	"node": "n8n-nodes-base.apiTemplateIo",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Marketing & Content"],
+	"categories": ["Marketing"],
 	"resources": {
 		"credentialDocumentation": [
 			{
diff --git a/packages/nodes-base/nodes/ApiTemplateIo/ApiTemplateIo.node.ts b/packages/nodes-base/nodes/ApiTemplateIo/ApiTemplateIo.node.ts
index 41398e4e7aadc..480a0ec0defeb 100644
--- a/packages/nodes-base/nodes/ApiTemplateIo/ApiTemplateIo.node.ts
+++ b/packages/nodes-base/nodes/ApiTemplateIo/ApiTemplateIo.node.ts
@@ -74,7 +74,27 @@ export class ApiTemplateIo implements INodeType {
 				],
 				displayOptions: {
 					show: {
-						resource: ['image', 'pdf'],
+						resource: ['image'],
+					},
+				},
+			},
+			{
+				displayName: 'Operation',
+				name: 'operation',
+				type: 'options',
+				noDataExpression: true,
+				default: 'create',
+				required: true,
+				options: [
+					{
+						name: 'Create',
+						value: 'create',
+						action: 'Create a pdf',
+					},
+				],
+				displayOptions: {
+					show: {
+						resource: ['pdf'],
 					},
 				},
 			},
@@ -161,12 +181,12 @@ export class ApiTemplateIo implements INodeType {
 				description: 'Name of the binary property to which to write the data of the read file',
 			},
 			{
-				displayName: 'Binary Property',
+				displayName: 'Put Output File in Field',
 				name: 'binaryProperty',
 				type: 'string',
 				required: true,
 				default: 'data',
-				description: 'Name of the binary property to which to write to',
+				hint: 'The name of the output binary field to put the file in',
 				displayOptions: {
 					show: {
 						resource: ['pdf', 'image'],
@@ -330,11 +350,11 @@ export class ApiTemplateIo implements INodeType {
 	methods = {
 		loadOptions: {
 			async getImageTemplates(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				return loadResource.call(this, 'image');
+				return await loadResource.call(this, 'image');
 			},
 
 			async getPdfTemplates(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				return loadResource.call(this, 'pdf');
+				return await loadResource.call(this, 'pdf');
 			},
 		},
 	};
@@ -460,7 +480,7 @@ export class ApiTemplateIo implements INodeType {
 				}
 
 				if (download) {
-					return this.prepareOutputData(returnData as unknown as INodeExecutionData[]);
+					return [returnData as unknown as INodeExecutionData[]];
 				}
 			}
 		} else if (resource === 'pdf') {
@@ -549,7 +569,7 @@ export class ApiTemplateIo implements INodeType {
 					}
 				}
 				if (download) {
-					return this.prepareOutputData(returnData as unknown as INodeExecutionData[]);
+					return [returnData as unknown as INodeExecutionData[]];
 				}
 			}
 		}
diff --git a/packages/nodes-base/nodes/ApiTemplateIo/GenericFunctions.ts b/packages/nodes-base/nodes/ApiTemplateIo/GenericFunctions.ts
index a5d90db168671..e099412bca88a 100644
--- a/packages/nodes-base/nodes/ApiTemplateIo/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/ApiTemplateIo/GenericFunctions.ts
@@ -1,16 +1,20 @@
-import type { OptionsWithUri } from 'request';
-
-import type { IExecuteFunctions, ILoadOptionsFunctions, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
+	JsonObject,
+	IRequestOptions,
+	IHttpRequestMethods,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function apiTemplateIoApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	qs = {},
 	body = {},
 ) {
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			'user-agent': 'n8n',
 			Accept: 'application/json',
@@ -74,7 +78,7 @@ export function validateJSON(json: string | object | undefined): any {
 }
 
 export async function downloadImage(this: IExecuteFunctions, url: string) {
-	return this.helpers.request({
+	return await this.helpers.request({
 		uri: url,
 		method: 'GET',
 		json: false,
diff --git a/packages/nodes-base/nodes/ApiTemplateIo/apiTemplateIo.svg b/packages/nodes-base/nodes/ApiTemplateIo/apiTemplateIo.svg
index 4fe3ce87d5bfd..c2b3602dc4ad1 100755
--- a/packages/nodes-base/nodes/ApiTemplateIo/apiTemplateIo.svg
+++ b/packages/nodes-base/nodes/ApiTemplateIo/apiTemplateIo.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="80" height="80" viewBox="0 0 23.167 21.167"><path fill="#91bce5" d="M18.611.504L3.473 11.24l4.597 2.213 1.066 3.883 3.171-2.226 2.802.951z"/><path fill="#1f212b" d="M9.172 17.597a.264.264 0 01-.29-.192l-1.035-3.767-4.488-2.16a.265.265 0 01-.039-.454L18.458.288a.264.264 0 01.41.274l-3.5 15.556a.265.265 0 01-.344.193l-2.674-.908-3.061 2.15a.273.273 0 01-.117.044zm-5.18-6.401l4.193 2.017c.069.034.12.095.14.169l.967 3.52 2.863-2.01a.265.265 0 01.237-.033l2.524.856L18.2 1.119z"/><path fill="#3a84c1" d="M9.339 17.079l.946-2.913L18.642.728 8.226 13.235z"/><path fill="#1f212b" d="M9.356 17.21a.132.132 0 01-.143-.172l.946-2.913a.16.16 0 01.014-.03l7.393-11.888-9.419 11.156a.133.133 0 01-.202-.171L18.54.642a.132.132 0 01.214.156l-8.348 13.424-.941 2.898a.132.132 0 01-.109.09zm-3.215 1.045c-1.168.029-2.303-.373-3.067-1.287-.485-.58-.683-1.574.275-1.705.859-.119 1.229.485 1.48 1.196.804 2.026.16 2.938-1.68 4.272-.144.09.015.296.159.206 1.218-1 1.829-1.466 2.1-2.448.134-1.36-.402-3.091-1.384-3.436-1.12-.382-2.063.516-1.499 1.585.699 1.324 2.23 1.914 3.652 1.878.17-.004.133-.266-.036-.261z"/><path fill="#1f212b" d="M7.235 18.14a14.95 14.95 0 01-.759.09c-.17.017-.133.279.036.262.253-.025.507-.052.758-.09.169-.026.133-.288-.035-.262zm1.194-.504a8.46 8.46 0 01-.865.344c-.162.054-.057.297.104.243a8.37 8.37 0 00.865-.344c.154-.071.05-.315-.104-.243z"/><path d="M12.599 15.22a.131.131 0 01-.07-.01l-2.168-.924a.133.133 0 01.103-.243l2.169.923a.133.133 0 01-.034.253z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="80" height="80" viewBox="0 0 23.167 21.167"><path fill="#91bce5" d="M18.611.504 3.473 11.24l4.597 2.213 1.066 3.883 3.171-2.226 2.802.951z"/><path fill="#1f212b" d="M9.172 17.597a.264.264 0 0 1-.29-.192l-1.035-3.767-4.488-2.16a.265.265 0 0 1-.039-.454L18.458.288a.264.264 0 0 1 .41.274l-3.5 15.556a.265.265 0 0 1-.344.193l-2.674-.908-3.061 2.15a.3.3 0 0 1-.117.044m-5.18-6.401 4.193 2.017c.069.034.12.095.14.169l.967 3.52 2.863-2.01a.27.27 0 0 1 .237-.033l2.524.856L18.2 1.119z"/><path fill="#3a84c1" d="m9.339 17.079.946-2.913L18.642.728 8.226 13.235z"/><path fill="#1f212b" d="M9.356 17.21a.132.132 0 0 1-.143-.172l.946-2.913.014-.03 7.393-11.888-9.419 11.156a.133.133 0 0 1-.202-.171L18.54.642a.132.132 0 0 1 .214.156l-8.348 13.424-.941 2.898a.13.13 0 0 1-.109.09m-3.215 1.045c-1.168.029-2.303-.373-3.067-1.287-.485-.58-.683-1.574.275-1.705.859-.119 1.229.485 1.48 1.196.804 2.026.16 2.938-1.68 4.272-.144.09.015.296.159.206 1.218-1 1.829-1.466 2.1-2.448.134-1.36-.402-3.091-1.384-3.436-1.12-.382-2.063.516-1.499 1.585.699 1.324 2.23 1.914 3.652 1.878.17-.004.133-.266-.036-.261"/><path fill="#1f212b" d="M7.235 18.14a15 15 0 0 1-.759.09c-.17.017-.133.279.036.262.253-.025.507-.052.758-.09.169-.026.133-.288-.035-.262m1.194-.504a9 9 0 0 1-.865.344c-.162.054-.057.297.104.243a8 8 0 0 0 .865-.344c.154-.071.05-.315-.104-.243"/><path d="M12.599 15.22a.13.13 0 0 1-.07-.01l-2.168-.924a.133.133 0 0 1 .103-.243l2.169.923a.133.133 0 0 1-.034.253z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Asana/Asana.node.ts b/packages/nodes-base/nodes/Asana/Asana.node.ts
index 885aa7d4ab4d2..a30897551c442 100644
--- a/packages/nodes-base/nodes/Asana/Asana.node.ts
+++ b/packages/nodes-base/nodes/Asana/Asana.node.ts
@@ -1,7 +1,6 @@
 import type {
 	IExecuteFunctions,
 	IDataObject,
-	IHttpRequestMethods,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
 	INodePropertyOptions,
@@ -11,6 +10,9 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
+import moment from 'moment-timezone';
+
+import { snakeCase } from 'change-case';
 import {
 	asanaApiRequest,
 	asanaApiRequestAllItems,
@@ -19,10 +21,6 @@ import {
 	getWorkspaces,
 } from './GenericFunctions';
 
-import moment from 'moment-timezone';
-
-import { snakeCase } from 'change-case';
-
 export class Asana implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Asana',
@@ -144,7 +142,7 @@ export class Asana implements INodeType {
 					{
 						name: 'Get Many',
 						value: 'getAll',
-						description: 'Get many substasks',
+						description: 'Get many subtasks',
 						action: 'Get many subtasks',
 					},
 				],
@@ -1687,8 +1685,7 @@ export class Asana implements INodeType {
 			// Get all the available projects to display them to user so that they can be
 			// selected easily
 			async getProjects(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const endpoint = '/projects';
-				const responseData = await asanaApiRequest.call(this, 'GET', endpoint, {});
+				const responseData = await asanaApiRequest.call(this, 'GET', '/projects', {});
 
 				if (responseData.data === undefined) {
 					throw new NodeApiError(this.getNode(), responseData as JsonObject, {
@@ -1728,8 +1725,12 @@ export class Asana implements INodeType {
 			// can be selected easily
 			async getSections(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
 				const projectId = this.getNodeParameter('projectId') as string;
-				const endpoint = `/projects/${projectId}/sections`;
-				const responseData = await asanaApiRequest.call(this, 'GET', endpoint, {});
+				const responseData = await asanaApiRequest.call(
+					this,
+					'GET',
+					`/projects/${projectId}/sections`,
+					{},
+				);
 
 				if (responseData.data === undefined) {
 					throw new NodeApiError(this.getNode(), responseData as JsonObject, {
@@ -1781,9 +1782,12 @@ export class Asana implements INodeType {
 					);
 				}
 
-				const endpoint = `/organizations/${workspaceId}/teams`;
-
-				const responseData = await asanaApiRequestAllItems.call(this, 'GET', endpoint, {});
+				const responseData = await asanaApiRequestAllItems.call(
+					this,
+					'GET',
+					`/organizations/${workspaceId}/teams`,
+					{},
+				);
 
 				const returnData: INodePropertyOptions[] = [];
 				for (const teamData of responseData) {
@@ -1815,8 +1819,6 @@ export class Asana implements INodeType {
 			// Get all tags to display them to user so that they can be selected easily
 			// See: https://developers.asana.com/docs/get-multiple-tags
 			async getTags(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const endpoint = '/tags';
-
 				const taskId = this.getNodeParameter('id') as string;
 				let taskData;
 				try {
@@ -1828,7 +1830,7 @@ export class Asana implements INodeType {
 				}
 
 				const workspace = taskData.data.workspace.gid;
-				const responseData = await asanaApiRequest.call(this, 'GET', endpoint, {}, { workspace });
+				const responseData = await asanaApiRequest.call(this, 'GET', '/tags', {}, { workspace });
 
 				if (responseData.data === undefined) {
 					throw new NodeApiError(this.getNode(), responseData as JsonObject, {
@@ -1865,8 +1867,7 @@ export class Asana implements INodeType {
 			// Get all users to display them to user so that they can be selected easily
 			// See: https://developers.asana.com/docs/get-multiple-users
 			async getUsers(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const endpoint = '/users';
-				const responseData = await asanaApiRequest.call(this, 'GET', endpoint, {});
+				const responseData = await asanaApiRequest.call(this, 'GET', '/users', {});
 
 				if (responseData.data === undefined) {
 					throw new NodeApiError(this.getNode(), responseData as JsonObject, {
@@ -1912,9 +1913,6 @@ export class Asana implements INodeType {
 		const resource = this.getNodeParameter('resource', 0);
 		const operation = this.getNodeParameter('operation', 0);
 
-		let endpoint = '';
-		let requestMethod: IHttpRequestMethods = 'GET';
-
 		let body: IDataObject;
 		let qs: IDataObject;
 		let responseData;
@@ -1932,15 +1930,18 @@ export class Asana implements INodeType {
 
 						const taskId = this.getNodeParameter('taskId', i) as string;
 
-						requestMethod = 'POST';
-						endpoint = `/tasks/${taskId}/subtasks`;
-
 						body.name = this.getNodeParameter('name', i) as string;
 
 						const otherProperties = this.getNodeParameter('otherProperties', i) as IDataObject;
 						Object.assign(body, otherProperties);
 
-						responseData = await asanaApiRequest.call(this, requestMethod, endpoint, body, qs);
+						responseData = await asanaApiRequest.call(
+							this,
+							'POST',
+							`/tasks/${taskId}/subtasks`,
+							body,
+							qs,
+						);
 
 						responseData = responseData.data;
 					}
@@ -1955,9 +1956,6 @@ export class Asana implements INodeType {
 
 						const options = this.getNodeParameter('options', i);
 
-						requestMethod = 'GET';
-						endpoint = `/tasks/${taskId}/subtasks`;
-
 						Object.assign(qs, options);
 
 						if (qs.opt_fields) {
@@ -1971,7 +1969,13 @@ export class Asana implements INodeType {
 							}
 						}
 
-						responseData = await asanaApiRequest.call(this, requestMethod, endpoint, body, qs);
+						responseData = await asanaApiRequest.call(
+							this,
+							'GET',
+							`/tasks/${taskId}/subtasks`,
+							body,
+							qs,
+						);
 
 						responseData = responseData.data;
 
@@ -1987,9 +1991,6 @@ export class Asana implements INodeType {
 						//         task:create
 						// ----------------------------------
 
-						requestMethod = 'POST';
-						endpoint = '/tasks';
-
 						body.name = this.getNodeParameter('name', i) as string;
 						// body.notes = this.getNodeParameter('taskNotes', 0) as string;
 						body.workspace = this.getNodeParameter('workspace', i) as string;
@@ -1997,7 +1998,7 @@ export class Asana implements INodeType {
 						const otherProperties = this.getNodeParameter('otherProperties', i) as IDataObject;
 						Object.assign(body, otherProperties);
 
-						responseData = await asanaApiRequest.call(this, requestMethod, endpoint, body, qs);
+						responseData = await asanaApiRequest.call(this, 'POST', '/tasks', body, qs);
 
 						responseData = responseData.data;
 					} else if (operation === 'delete') {
@@ -2005,11 +2006,13 @@ export class Asana implements INodeType {
 						//         task:delete
 						// ----------------------------------
 
-						requestMethod = 'DELETE';
-
-						endpoint = '/tasks/' + (this.getNodeParameter('id', i) as string);
-
-						responseData = await asanaApiRequest.call(this, requestMethod, endpoint, body, qs);
+						responseData = await asanaApiRequest.call(
+							this,
+							'DELETE',
+							`/tasks/${this.getNodeParameter('id', i) as string}`,
+							body,
+							qs,
+						);
 
 						responseData = responseData.data;
 					} else if (operation === 'get') {
@@ -2017,11 +2020,13 @@ export class Asana implements INodeType {
 						//         task:get
 						// ----------------------------------
 
-						requestMethod = 'GET';
-
-						endpoint = '/tasks/' + (this.getNodeParameter('id', i) as string);
-
-						responseData = await asanaApiRequest.call(this, requestMethod, endpoint, body, qs);
+						responseData = await asanaApiRequest.call(
+							this,
+							'GET',
+							`/tasks/${this.getNodeParameter('id', i) as string}`,
+							body,
+							qs,
+						);
 
 						responseData = responseData.data;
 					} else if (operation === 'getAll') {
@@ -2032,9 +2037,6 @@ export class Asana implements INodeType {
 						const filters = this.getNodeParameter('filters', i);
 						const returnAll = this.getNodeParameter('returnAll', i);
 
-						requestMethod = 'GET';
-						endpoint = '/tasks';
-
 						Object.assign(qs, filters);
 
 						if (qs.opt_fields) {
@@ -2057,17 +2059,11 @@ export class Asana implements INodeType {
 						}
 
 						if (returnAll) {
-							responseData = await asanaApiRequestAllItems.call(
-								this,
-								requestMethod,
-								endpoint,
-								body,
-								qs,
-							);
+							responseData = await asanaApiRequestAllItems.call(this, 'GET', '/tasks', body, qs);
 						} else {
 							qs.limit = this.getNodeParameter('limit', i);
 
-							responseData = await asanaApiRequest.call(this, requestMethod, endpoint, body, qs);
+							responseData = await asanaApiRequest.call(this, 'GET', '/tasks', body, qs);
 
 							responseData = responseData.data;
 						}
@@ -2078,15 +2074,17 @@ export class Asana implements INodeType {
 
 						const sectionId = this.getNodeParameter('section', i) as string;
 
-						requestMethod = 'POST';
-
-						endpoint = `/sections/${sectionId}/addTask`;
-
 						body.task = this.getNodeParameter('id', i) as string;
 
 						Object.assign(body);
 
-						responseData = await asanaApiRequest.call(this, requestMethod, endpoint, body, qs);
+						responseData = await asanaApiRequest.call(
+							this,
+							'POST',
+							`/sections/${sectionId}/addTask`,
+							body,
+							qs,
+						);
 
 						responseData = { success: true };
 					} else if (operation === 'update') {
@@ -2094,32 +2092,38 @@ export class Asana implements INodeType {
 						//         task:update
 						// ----------------------------------
 
-						requestMethod = 'PUT';
-						endpoint = '/tasks/' + (this.getNodeParameter('id', i) as string);
-
 						const otherProperties = this.getNodeParameter('otherProperties', i) as IDataObject;
 						Object.assign(body, otherProperties);
 
-						responseData = await asanaApiRequest.call(this, requestMethod, endpoint, body, qs);
+						responseData = await asanaApiRequest.call(
+							this,
+							'PUT',
+							`/tasks/${this.getNodeParameter('id', i) as string}`,
+							body,
+							qs,
+						);
 
 						responseData = responseData.data;
 					} else if (operation === 'search') {
 						// ----------------------------------
-						//         tasksearch
+						//         tasks:search
 						// ----------------------------------
 
 						const workspaceId = this.getNodeParameter('workspace', i) as string;
 
-						requestMethod = 'GET';
-						endpoint = `/workspaces/${workspaceId}/tasks/search`;
-
 						const searchTaskProperties = this.getNodeParameter(
 							'searchTaskProperties',
 							i,
 						) as IDataObject;
 						Object.assign(qs, searchTaskProperties);
 
-						responseData = await asanaApiRequest.call(this, requestMethod, endpoint, body, qs);
+						responseData = await asanaApiRequest.call(
+							this,
+							'GET',
+							`/workspaces/${workspaceId}/tasks/search`,
+							body,
+							qs,
+						);
 
 						responseData = responseData.data;
 					}
@@ -2140,15 +2144,17 @@ export class Asana implements INodeType {
 							body.html_text = this.getNodeParameter('text', i) as string;
 						}
 
-						requestMethod = 'POST';
-
-						endpoint = `/tasks/${taskId}/stories`;
-
 						const additionalFields = this.getNodeParameter('additionalFields', i);
 
 						Object.assign(body, additionalFields);
 
-						responseData = await asanaApiRequest.call(this, requestMethod, endpoint, body, qs);
+						responseData = await asanaApiRequest.call(
+							this,
+							'POST',
+							`/tasks/${taskId}/stories`,
+							body,
+							qs,
+						);
 
 						responseData = responseData.data;
 					}
@@ -2160,11 +2166,13 @@ export class Asana implements INodeType {
 
 						const commentId = this.getNodeParameter('id', i) as string;
 
-						requestMethod = 'DELETE';
-
-						endpoint = `/stories/${commentId}`;
-
-						responseData = await asanaApiRequest.call(this, requestMethod, endpoint, body, qs);
+						responseData = await asanaApiRequest.call(
+							this,
+							'DELETE',
+							`/stories/${commentId}`,
+							body,
+							qs,
+						);
 
 						responseData = { success: true };
 					}
@@ -2177,13 +2185,15 @@ export class Asana implements INodeType {
 
 						const taskId = this.getNodeParameter('id', i) as string;
 
-						requestMethod = 'POST';
-
-						endpoint = `/tasks/${taskId}/addTag`;
-
 						body.tag = this.getNodeParameter('tag', i) as string;
 
-						responseData = await asanaApiRequest.call(this, requestMethod, endpoint, body, qs);
+						responseData = await asanaApiRequest.call(
+							this,
+							'POST',
+							`/tasks/${taskId}/addTag`,
+							body,
+							qs,
+						);
 
 						responseData = { success: true };
 					}
@@ -2195,13 +2205,15 @@ export class Asana implements INodeType {
 
 						const taskId = this.getNodeParameter('id', i) as string;
 
-						requestMethod = 'POST';
-
-						endpoint = `/tasks/${taskId}/removeTag`;
-
 						body.tag = this.getNodeParameter('tag', i) as string;
 
-						responseData = await asanaApiRequest.call(this, requestMethod, endpoint, body, qs);
+						responseData = await asanaApiRequest.call(
+							this,
+							'POST',
+							`/tasks/${taskId}/removeTag`,
+							body,
+							qs,
+						);
 
 						responseData = { success: true };
 					}
@@ -2216,15 +2228,17 @@ export class Asana implements INodeType {
 
 						const additionalFields = this.getNodeParameter('additionalFields', i);
 
-						requestMethod = 'POST';
-
-						endpoint = `/tasks/${taskId}/addProject`;
-
 						body.project = this.getNodeParameter('project', i) as string;
 
 						Object.assign(body, additionalFields);
 
-						responseData = await asanaApiRequest.call(this, requestMethod, endpoint, body, qs);
+						responseData = await asanaApiRequest.call(
+							this,
+							'POST',
+							`/tasks/${taskId}/addProject`,
+							body,
+							qs,
+						);
 
 						responseData = { success: true };
 					}
@@ -2236,13 +2250,15 @@ export class Asana implements INodeType {
 
 						const taskId = this.getNodeParameter('id', i) as string;
 
-						requestMethod = 'POST';
-
-						endpoint = `/tasks/${taskId}/removeProject`;
-
 						body.project = this.getNodeParameter('project', i) as string;
 
-						responseData = await asanaApiRequest.call(this, requestMethod, endpoint, body, qs);
+						responseData = await asanaApiRequest.call(
+							this,
+							'POST',
+							`/tasks/${taskId}/removeProject`,
+							body,
+							qs,
+						);
 
 						responseData = { success: true };
 					}
@@ -2255,10 +2271,7 @@ export class Asana implements INodeType {
 
 						const userId = this.getNodeParameter('userId', i) as string;
 
-						requestMethod = 'GET';
-						endpoint = `/users/${userId}`;
-
-						responseData = await asanaApiRequest.call(this, requestMethod, endpoint, body, qs);
+						responseData = await asanaApiRequest.call(this, 'GET', `/users/${userId}`, body, qs);
 						responseData = responseData.data;
 					} else if (operation === 'getAll') {
 						// ----------------------------------
@@ -2267,10 +2280,13 @@ export class Asana implements INodeType {
 
 						const workspaceId = this.getNodeParameter('workspace', i) as string;
 
-						requestMethod = 'GET';
-						endpoint = `/workspaces/${workspaceId}/users`;
-
-						responseData = await asanaApiRequest.call(this, requestMethod, endpoint, body, qs);
+						responseData = await asanaApiRequest.call(
+							this,
+							'GET',
+							`/workspaces/${workspaceId}/users`,
+							body,
+							qs,
+						);
 						responseData = responseData.data;
 					}
 				}
@@ -2282,10 +2298,6 @@ export class Asana implements INodeType {
 						const additionalFields = this.getNodeParameter('additionalFields', i);
 						const teamId = this.getNodeParameter('team', i);
 
-						// request parameters
-						requestMethod = 'POST';
-						endpoint = `/teams/${teamId}/projects`;
-
 						// required parameters
 						body.name = this.getNodeParameter('name', i);
 						body.workspace = this.getNodeParameter('workspace', i);
@@ -2299,7 +2311,13 @@ export class Asana implements INodeType {
 						if (additionalFields.notes) {
 							qs.notes = additionalFields.notes;
 						}
-						responseData = await asanaApiRequest.call(this, requestMethod, endpoint, body, qs);
+						responseData = await asanaApiRequest.call(
+							this,
+							'POST',
+							`/teams/${teamId}/projects`,
+							body,
+							qs,
+						);
 						responseData = responseData.data;
 					}
 
@@ -2309,11 +2327,7 @@ export class Asana implements INodeType {
 						// ----------------------------------
 						const projectId = this.getNodeParameter('id', i) as string;
 
-						requestMethod = 'DELETE';
-
-						endpoint = `/projects/${projectId}`;
-
-						await asanaApiRequest.call(this, requestMethod, endpoint, body, qs);
+						await asanaApiRequest.call(this, 'DELETE', `/projects/${projectId}`, body, qs);
 
 						responseData = { success: true };
 					}
@@ -2324,11 +2338,13 @@ export class Asana implements INodeType {
 						// ----------------------------------
 						const projectId = this.getNodeParameter('id', i) as string;
 
-						requestMethod = 'GET';
-
-						endpoint = `/projects/${projectId}`;
-
-						responseData = await asanaApiRequest.call(this, requestMethod, endpoint, body, qs);
+						responseData = await asanaApiRequest.call(
+							this,
+							'GET',
+							`/projects/${projectId}`,
+							body,
+							qs,
+						);
 
 						responseData = responseData.data;
 					}
@@ -2341,9 +2357,6 @@ export class Asana implements INodeType {
 						const additionalFields = this.getNodeParameter('additionalFields', i);
 						const returnAll = this.getNodeParameter('returnAll', i);
 
-						requestMethod = 'GET';
-						endpoint = '/projects';
-
 						if (additionalFields.team) {
 							qs.team = additionalFields.team;
 						} else {
@@ -2355,17 +2368,11 @@ export class Asana implements INodeType {
 						}
 
 						if (returnAll) {
-							responseData = await asanaApiRequestAllItems.call(
-								this,
-								requestMethod,
-								endpoint,
-								body,
-								qs,
-							);
+							responseData = await asanaApiRequestAllItems.call(this, 'GET', '/projects', body, qs);
 						} else {
 							qs.limit = this.getNodeParameter('limit', i);
 
-							responseData = await asanaApiRequest.call(this, requestMethod, endpoint, body, qs);
+							responseData = await asanaApiRequest.call(this, 'GET', '/projects', body, qs);
 
 							responseData = responseData.data;
 						}
@@ -2378,10 +2385,6 @@ export class Asana implements INodeType {
 						const projectId = this.getNodeParameter('id', i) as string;
 						const updateFields = this.getNodeParameter('updateFields', i);
 
-						// request parameters
-						requestMethod = 'PUT';
-						endpoint = `/projects/${projectId}`;
-
 						// optional parameters
 						if (updateFields.color) {
 							qs.color = updateFields.color;
@@ -2402,7 +2405,13 @@ export class Asana implements INodeType {
 							body.team = updateFields.team;
 						}
 
-						responseData = await asanaApiRequest.call(this, requestMethod, endpoint, body, qs);
+						responseData = await asanaApiRequest.call(
+							this,
+							'PUT',
+							`/projects/${projectId}`,
+							body,
+							qs,
+						);
 						responseData = responseData.data;
 					}
 				}
diff --git a/packages/nodes-base/nodes/Asana/AsanaTrigger.node.ts b/packages/nodes-base/nodes/Asana/AsanaTrigger.node.ts
index 1da6807a411da..5af631543e8f0 100644
--- a/packages/nodes-base/nodes/Asana/AsanaTrigger.node.ts
+++ b/packages/nodes-base/nodes/Asana/AsanaTrigger.node.ts
@@ -123,9 +123,7 @@ export class AsanaTrigger implements INodeType {
 
 				const workspace = this.getNodeParameter('workspace') as string;
 
-				const endpoint = '/webhooks';
-
-				const { data } = await asanaApiRequest.call(this, 'GET', endpoint, {}, { workspace });
+				const { data } = await asanaApiRequest.call(this, 'GET', '/webhooks', {}, { workspace });
 
 				for (const webhook of data) {
 					if (webhook.resource.gid === resource && webhook.target === webhookUrl) {
@@ -151,14 +149,12 @@ export class AsanaTrigger implements INodeType {
 
 				const resource = this.getNodeParameter('resource') as string;
 
-				const endpoint = '/webhooks';
-
 				const body = {
 					resource,
 					target: webhookUrl,
 				};
 
-				const responseData = await asanaApiRequest.call(this, 'POST', endpoint, body);
+				const responseData = await asanaApiRequest.call(this, 'POST', '/webhooks', body);
 
 				if (responseData.data === undefined || responseData.data.gid === undefined) {
 					// Required data is missing so was not successful
@@ -173,11 +169,10 @@ export class AsanaTrigger implements INodeType {
 				const webhookData = this.getWorkflowStaticData('node');
 
 				if (webhookData.webhookId !== undefined) {
-					const endpoint = `/webhooks/${webhookData.webhookId}`;
 					const body = {};
 
 					try {
-						await asanaApiRequest.call(this, 'DELETE', endpoint, body);
+						await asanaApiRequest.call(this, 'DELETE', `/webhooks/${webhookData.webhookId}`, body);
 					} catch (error) {
 						return false;
 					}
diff --git a/packages/nodes-base/nodes/Asana/GenericFunctions.ts b/packages/nodes-base/nodes/Asana/GenericFunctions.ts
index 4839ceed770d1..2b7c1b9a486bc 100644
--- a/packages/nodes-base/nodes/Asana/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Asana/GenericFunctions.ts
@@ -8,7 +8,7 @@ import type {
 	INodePropertyOptions,
 } from 'n8n-workflow';
 
-import get from 'lodash.get';
+import get from 'lodash/get';
 
 /**
  * Make an API request to Asana
@@ -17,7 +17,7 @@ import get from 'lodash.get';
 export async function asanaApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	method: IHttpRequestMethods,
-	endpoint: string,
+	endpoint: `/${string}`,
 	body: object,
 	query?: IDataObject,
 	uri?: string | undefined,
@@ -27,21 +27,24 @@ export async function asanaApiRequest(
 	const options: IHttpRequestOptions = {
 		headers: {},
 		method,
-		body: { data: body },
+		body: method === 'GET' || method === 'HEAD' || method === 'DELETE' ? null : { data: body },
 		qs: query,
 		url: uri || `https://app.asana.com/api/1.0${endpoint}`,
 		json: true,
 	};
 
+	if (options.body === null) {
+		delete options.body;
+	}
+
 	const credentialType = authenticationMethod === 'accessToken' ? 'asanaApi' : 'asanaOAuth2Api';
-	return this.helpers.requestWithAuthentication.call(this, credentialType, options);
+	return await this.helpers.requestWithAuthentication.call(this, credentialType, options);
 }
 
 export async function asanaApiRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
 	method: IHttpRequestMethods,
-	endpoint: string,
-
+	endpoint: `/${string}`,
 	body: any = {},
 	query: IDataObject = {},
 ): Promise<any> {
diff --git a/packages/nodes-base/nodes/Asana/asana.svg b/packages/nodes-base/nodes/Asana/asana.svg
index 2d5de3183d293..a66d628f010f4 100644
--- a/packages/nodes-base/nodes/Asana/asana.svg
+++ b/packages/nodes-base/nodes/Asana/asana.svg
@@ -1 +1 @@
-<svg width="60" height="60" xmlns="http://www.w3.org/2000/svg"><defs><radialGradient cx="50%" cy="55%" fx="50%" fy="55%" r="72.507%" gradientTransform="matrix(.92404 0 0 1 .038 0)" id="a"><stop stop-color="#FFB900" offset="0%"/><stop stop-color="#F95D8F" offset="60%"/><stop stop-color="#F95353" offset="99.91%"/></radialGradient></defs><path d="M45.594 28.5c-6.994.003-12.664 5.673-12.667 12.667.003 6.995 5.673 12.664 12.667 12.668 6.995-.004 12.664-5.673 12.667-12.668-.003-6.994-5.672-12.664-12.667-12.667zm-32.927.001C5.673 28.505.003 34.174 0 41.17c.003 6.994 5.673 12.664 12.667 12.667 6.995-.003 12.664-5.673 12.668-12.667-.004-6.995-5.673-12.664-12.668-12.668zM41.79 12.667c-.002 6.995-5.671 12.665-12.666 12.67-6.995-.004-12.664-5.674-12.667-12.67C16.46 5.673 22.13.003 29.123 0c6.994.004 12.663 5.673 12.666 12.667z" transform="translate(.732 2.732)" fill="url(#a)" fill-rule="evenodd"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="60" height="60"><defs><radialGradient id="a" cx="50%" cy="55%" r="72.507%" fx="50%" fy="55%" gradientTransform="matrix(.92404 0 0 1 .038 0)"><stop offset="0%" stop-color="#FFB900"/><stop offset="60%" stop-color="#F95D8F"/><stop offset="99.91%" stop-color="#F95353"/></radialGradient></defs><path fill="url(#a)" fill-rule="evenodd" d="M45.594 28.5c-6.994.003-12.664 5.673-12.667 12.667.003 6.995 5.673 12.664 12.667 12.668 6.995-.004 12.664-5.673 12.667-12.668-.003-6.994-5.672-12.664-12.667-12.667m-32.927.001C5.673 28.505.003 34.174 0 41.17c.003 6.994 5.673 12.664 12.667 12.667 6.995-.003 12.664-5.673 12.668-12.667-.004-6.995-5.673-12.664-12.668-12.668zM41.79 12.667c-.002 6.995-5.671 12.665-12.666 12.67-6.995-.004-12.664-5.674-12.667-12.67C16.46 5.673 22.13.003 29.123 0c6.994.004 12.663 5.673 12.666 12.667z" transform="translate(.732 2.732)"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Automizy/Automizy.node.json b/packages/nodes-base/nodes/Automizy/Automizy.node.json
index ff7f1046edc2a..9ff27a12e1e6f 100644
--- a/packages/nodes-base/nodes/Automizy/Automizy.node.json
+++ b/packages/nodes-base/nodes/Automizy/Automizy.node.json
@@ -2,7 +2,7 @@
 	"node": "n8n-nodes-base.automizy",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Communication", "Marketing & Content"],
+	"categories": ["Communication", "Marketing"],
 	"resources": {
 		"credentialDocumentation": [
 			{
diff --git a/packages/nodes-base/nodes/Automizy/Automizy.node.ts b/packages/nodes-base/nodes/Automizy/Automizy.node.ts
index 814c8467ab48e..3e79372109d8a 100644
--- a/packages/nodes-base/nodes/Automizy/Automizy.node.ts
+++ b/packages/nodes-base/nodes/Automizy/Automizy.node.ts
@@ -362,6 +362,6 @@ export class Automizy implements INodeType {
 
 		returnData.push(...(responseData as NodeExecutionWithMetadata[]));
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Automizy/GenericFunctions.ts b/packages/nodes-base/nodes/Automizy/GenericFunctions.ts
index 44b2760a7b3f4..0e92d09333fc0 100644
--- a/packages/nodes-base/nodes/Automizy/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Automizy/GenericFunctions.ts
@@ -1,17 +1,16 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	ILoadOptionsFunctions,
 	IDataObject,
 	JsonObject,
+	IRequestOptions,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function automizyApiRequest(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	path: string,
 
 	body: any = {},
@@ -20,7 +19,7 @@ export async function automizyApiRequest(
 ): Promise<any> {
 	const credentials = (await this.getCredentials('automizyApi')) as IDataObject;
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			Authorization: `Bearer ${credentials.apiToken}`,
 		},
@@ -51,7 +50,7 @@ export async function automizyApiRequest(
 export async function automizyApiRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: any = {},
diff --git a/packages/nodes-base/nodes/Autopilot/Autopilot.node.json b/packages/nodes-base/nodes/Autopilot/Autopilot.node.json
index ebc53d0fa0f16..54dbaa35ac1b0 100644
--- a/packages/nodes-base/nodes/Autopilot/Autopilot.node.json
+++ b/packages/nodes-base/nodes/Autopilot/Autopilot.node.json
@@ -2,7 +2,7 @@
 	"node": "n8n-nodes-base.autopilot",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Marketing & Content"],
+	"categories": ["Marketing"],
 	"resources": {
 		"credentialDocumentation": [
 			{
diff --git a/packages/nodes-base/nodes/Autopilot/Autopilot.node.ts b/packages/nodes-base/nodes/Autopilot/Autopilot.node.ts
index daba7d550636d..fedcd86ebb7d4 100644
--- a/packages/nodes-base/nodes/Autopilot/Autopilot.node.ts
+++ b/packages/nodes-base/nodes/Autopilot/Autopilot.node.ts
@@ -6,6 +6,7 @@ import type {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 
 import { autopilotApiRequest, autopilotApiRequestAllItems } from './GenericFunctions';
@@ -228,7 +229,7 @@ export class Autopilot implements INodeType {
 
 						const contactId = this.getNodeParameter('contactId', i) as string;
 
-						const method: { [key: string]: string } = {
+						const method: { [key: string]: IHttpRequestMethods } = {
 							add: 'POST',
 							remove: 'DELETE',
 							exist: 'GET',
diff --git a/packages/nodes-base/nodes/Autopilot/AutopilotTrigger.node.json b/packages/nodes-base/nodes/Autopilot/AutopilotTrigger.node.json
index c9b17dd32d278..dd9b72ccf19fe 100644
--- a/packages/nodes-base/nodes/Autopilot/AutopilotTrigger.node.json
+++ b/packages/nodes-base/nodes/Autopilot/AutopilotTrigger.node.json
@@ -2,7 +2,7 @@
 	"node": "n8n-nodes-base.autopilotTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Marketing & Content"],
+	"categories": ["Marketing"],
 	"resources": {
 		"credentialDocumentation": [
 			{
diff --git a/packages/nodes-base/nodes/Autopilot/AutopilotTrigger.node.ts b/packages/nodes-base/nodes/Autopilot/AutopilotTrigger.node.ts
index 09e985922d2aa..f86ebf0e3ca8f 100644
--- a/packages/nodes-base/nodes/Autopilot/AutopilotTrigger.node.ts
+++ b/packages/nodes-base/nodes/Autopilot/AutopilotTrigger.node.ts
@@ -7,9 +7,8 @@ import type {
 	IWebhookResponseData,
 } from 'n8n-workflow';
 
-import { autopilotApiRequest } from './GenericFunctions';
-
 import { snakeCase } from 'change-case';
+import { autopilotApiRequest } from './GenericFunctions';
 
 export class AutopilotTrigger implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Autopilot/GenericFunctions.ts b/packages/nodes-base/nodes/Autopilot/GenericFunctions.ts
index 7d448c560f794..f6387d27e9fa5 100644
--- a/packages/nodes-base/nodes/Autopilot/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Autopilot/GenericFunctions.ts
@@ -1,5 +1,3 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IExecuteFunctions,
 	ILoadOptionsFunctions,
@@ -7,14 +5,15 @@ import type {
 	IHookFunctions,
 	IWebhookFunctions,
 	JsonObject,
+	IRequestOptions,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function autopilotApiRequest(
 	this: IExecuteFunctions | IWebhookFunctions | IHookFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
-
 	body: any = {},
 	query: IDataObject = {},
 	uri?: string,
@@ -26,7 +25,7 @@ export async function autopilotApiRequest(
 
 	const endpoint = 'https://api2.autopilothq.com/v1';
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			'Content-Type': 'application/json',
 			autopilotapikey: apiKey,
@@ -54,7 +53,7 @@ export async function autopilotApiRequest(
 export async function autopilotApiRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: any = {},
diff --git a/packages/nodes-base/nodes/Autopilot/autopilot.svg b/packages/nodes-base/nodes/Autopilot/autopilot.svg
index 93e5c925a0669..cfc2f09bc239f 100644
--- a/packages/nodes-base/nodes/Autopilot/autopilot.svg
+++ b/packages/nodes-base/nodes/Autopilot/autopilot.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="38 26 35 35"><circle cx="50" cy="50" r="40" stroke="#18d4b2" stroke-width="3" fill="#18d4b2"/><path fill="#fff" d="M45.4 42.6h19.9l3.4-4.8H42l3.4 4.8zm3.1 8.3h13.1l3.4-4.8H45.4l3.1 4.8zm54-.7"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="38 26 35 35"><circle cx="50" cy="50" r="40" fill="#18d4b2" stroke="#18d4b2" stroke-width="3"/><path fill="#fff" d="M45.4 42.6h19.9l3.4-4.8H42zm3.1 8.3h13.1l3.4-4.8H45.4zm54-.7"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Aws/AwsSnsTrigger.node.ts b/packages/nodes-base/nodes/Aws/AwsSnsTrigger.node.ts
index f38ca25613434..7aa3c25fb1e41 100644
--- a/packages/nodes-base/nodes/Aws/AwsSnsTrigger.node.ts
+++ b/packages/nodes-base/nodes/Aws/AwsSnsTrigger.node.ts
@@ -10,10 +10,9 @@ import type {
 } from 'n8n-workflow';
 import { jsonParse, NodeOperationError } from 'n8n-workflow';
 
+import get from 'lodash/get';
 import { awsApiRequestSOAP } from './GenericFunctions';
 
-import get from 'lodash.get';
-
 export class AwsSnsTrigger implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'AWS SNS Trigger',
diff --git a/packages/nodes-base/nodes/Aws/CertificateManager/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/CertificateManager/GenericFunctions.ts
index 16f2e3c43d744..bff183fcee42e 100644
--- a/packages/nodes-base/nodes/Aws/CertificateManager/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/CertificateManager/GenericFunctions.ts
@@ -1,4 +1,4 @@
-import get from 'lodash.get';
+import get from 'lodash/get';
 
 import type {
 	IDataObject,
@@ -8,13 +8,14 @@ import type {
 	IWebhookFunctions,
 	IHttpRequestOptions,
 	JsonObject,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { jsonParse, NodeApiError } from 'n8n-workflow';
 
 export async function awsApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
 	service: string,
-	method: string,
+	method: IHttpRequestMethods,
 	path: string,
 	body?: string | Buffer,
 	query: IDataObject = {},
@@ -45,7 +46,7 @@ export async function awsApiRequest(
 export async function awsApiRequestREST(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	service: string,
-	method: string,
+	method: IHttpRequestMethods,
 	path: string,
 	body?: string,
 	query: IDataObject = {},
@@ -63,7 +64,7 @@ export async function awsApiRequestAllItems(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	propertyName: string,
 	service: string,
-	method: string,
+	method: IHttpRequestMethods,
 	path: string,
 	body?: string,
 	query: IDataObject = {},
diff --git a/packages/nodes-base/nodes/Aws/CertificateManager/acm.svg b/packages/nodes-base/nodes/Aws/CertificateManager/acm.svg
index 22d4e0e7cb118..31726f71ac220 100644
--- a/packages/nodes-base/nodes/Aws/CertificateManager/acm.svg
+++ b/packages/nodes-base/nodes/Aws/CertificateManager/acm.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 85 85" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#A" x="2.5" y="2.5"/><symbol id="A" overflow="visible"><g stroke="none"><path d="M80 47.005l-40.012 4.962V27.99L80 32.952v14.053z" fill="#759c3e"/><path d="M0 47.005l39.988 4.962V27.99L0 32.952v14.053z" fill="#4b612c"/><path d="M10 0h60v15H10z" fill="#648339"/><path d="M65 20l-48.976.212L10 15h60l-5 5z" fill="#3c4929"/><path d="M10 65h60v15H10z" fill="#648339"/><path d="M65 60H15l-5 5h60l-5-5z" fill="#b7ca9d"/></g></symbol></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round" viewBox="0 0 85 85"><use xlink:href="#a" x="2.5" y="2.5"/><symbol id="a" overflow="visible"><g stroke="none"><path fill="#759c3e" d="m80 47.005-40.012 4.962V27.99L80 32.952z"/><path fill="#4b612c" d="m0 47.005 39.988 4.962V27.99L0 32.952z"/><path fill="#648339" d="M10 0h60v15H10z"/><path fill="#3c4929" d="m65 20-48.976.212L10 15h60z"/><path fill="#648339" d="M10 65h60v15H10z"/><path fill="#b7ca9d" d="M65 60H15l-5 5h60z"/></g></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Aws/Comprehend/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/Comprehend/GenericFunctions.ts
index f8b6bee8b88e0..7f327518a0116 100644
--- a/packages/nodes-base/nodes/Aws/Comprehend/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/Comprehend/GenericFunctions.ts
@@ -6,12 +6,13 @@ import type {
 	ILoadOptionsFunctions,
 	IWebhookFunctions,
 	IHttpRequestOptions,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 
 export async function awsApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
 	service: string,
-	method: string,
+	method: IHttpRequestMethods,
 	path: string,
 	body?: string,
 	headers?: object,
@@ -29,13 +30,13 @@ export async function awsApiRequest(
 		headers,
 		region: credentials?.region as string,
 	} as IHttpRequestOptions;
-	return this.helpers.requestWithAuthentication.call(this, 'aws', requestOptions);
+	return await this.helpers.requestWithAuthentication.call(this, 'aws', requestOptions);
 }
 
 export async function awsApiRequestREST(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	service: string,
-	method: string,
+	method: IHttpRequestMethods,
 	path: string,
 	body?: string,
 	headers?: object,
@@ -51,7 +52,7 @@ export async function awsApiRequestREST(
 export async function awsApiRequestSOAP(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
 	service: string,
-	method: string,
+	method: IHttpRequestMethods,
 	path: string,
 	body?: string,
 	headers?: object,
diff --git a/packages/nodes-base/nodes/Aws/Comprehend/comprehend.svg b/packages/nodes-base/nodes/Aws/Comprehend/comprehend.svg
index 1e421aa9a8b0f..be82ad92dd27d 100644
--- a/packages/nodes-base/nodes/Aws/Comprehend/comprehend.svg
+++ b/packages/nodes-base/nodes/Aws/Comprehend/comprehend.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 75 75"><defs><linearGradient id="a" x1="617.46" y1="-674.53" x2="723.53" y2="-568.46" gradientTransform="rotate(-90 683.5 24.5)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#055f4e"/><stop offset="1" stop-color="#56c0a7"/></linearGradient></defs><path data-name="Turquoise Gradient" d="M0 0h75v75H0z" fill="url(#a)"/><path d="M44.5 34.2v-9.7a1 1 0 00-.29-.71l-11-11a1 1 0 00-.71-.29h-19a1 1 0 00-1 1v43a1 1 0 001 1h30a1 1 0 001-1v-4.44a11.8 11.8 0 01-2-2.3v5.74h-28v-41h17v10a1 1 0 001 1h10v11a11.56 11.56 0 012-2.3zm-11-10.7v-7.59l7.59 7.59zm-10 8h-6v-2h6zm16 0h-14v-2h14zm0 6h-22v-2h22zm15.44 25h-4.88a1 1 0 01-.93-.62l-1.21-3a1 1 0 01.09-.94 1 1 0 01.83-.44h7.32a1 1 0 01.83.44 1 1 0 01.09.94l-1.21 3a1 1 0 01-.93.62zm-4.21-2h3.54l.4-1h-4.34zm11.64-19a10 10 0 00-19.87 1.62 10 10 0 004.28 8.2 3.88 3.88 0 01.72.59v3.59a1 1 0 001 1h8a1 1 0 001-1v-3.6a4.33 4.33 0 01.71-.57 9.92 9.92 0 004.29-8.2 10.19 10.19 0 00-.13-1.65zm-5.32 8.2c-.58.4-1.55 1.07-1.55 2.1v2.7h-2v-7h2v-2h-6v2h2v7h-2v-2.68c0-1-1-1.73-1.58-2.14A8 8 0 1158 37.32a7.89 7.89 0 012.39 4.47 8 8 0 01-3.34 7.91zM28.5 25.5h-11v-2h11zm1 18h-12v-2h12zm10 0h-8v-2h8zm-9 6h-13v-2h13z" data-name="Icon Test" fill="#fff"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 75 75"><defs><linearGradient id="a" x1="617.46" x2="723.53" y1="-674.53" y2="-568.46" gradientTransform="rotate(-90 683.5 24.5)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#055f4e"/><stop offset="1" stop-color="#56c0a7"/></linearGradient></defs><path fill="url(#a)" d="M0 0h75v75H0z" data-name="Turquoise Gradient"/><path fill="#fff" d="M44.5 34.2v-9.7a1 1 0 0 0-.29-.71l-11-11a1 1 0 0 0-.71-.29h-19a1 1 0 0 0-1 1v43a1 1 0 0 0 1 1h30a1 1 0 0 0 1-1v-4.44a11.8 11.8 0 0 1-2-2.3v5.74h-28v-41h17v10a1 1 0 0 0 1 1h10v11a11.6 11.6 0 0 1 2-2.3m-11-10.7v-7.59l7.59 7.59zm-10 8h-6v-2h6zm16 0h-14v-2h14zm0 6h-22v-2h22zm15.44 25h-4.88a1 1 0 0 1-.93-.62l-1.21-3a1 1 0 0 1 .09-.94 1 1 0 0 1 .83-.44h7.32a1 1 0 0 1 .83.44 1 1 0 0 1 .09.94l-1.21 3a1 1 0 0 1-.93.62m-4.21-2h3.54l.4-1h-4.34zm11.64-19a10 10 0 0 0-19.87 1.62 10 10 0 0 0 4.28 8.2 4 4 0 0 1 .72.59v3.59a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1v-3.6a4.3 4.3 0 0 1 .71-.57 9.92 9.92 0 0 0 4.29-8.2 10 10 0 0 0-.13-1.65zm-5.32 8.2c-.58.4-1.55 1.07-1.55 2.1v2.7h-2v-7h2v-2h-6v2h2v7h-2v-2.68c0-1-1-1.73-1.58-2.14A8 8 0 1 1 58 37.32a7.9 7.9 0 0 1 2.39 4.47 8 8 0 0 1-3.34 7.91M28.5 25.5h-11v-2h11zm1 18h-12v-2h12zm10 0h-8v-2h8zm-9 6h-13v-2h13z" data-name="Icon Test"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Aws/DynamoDB/AwsDynamoDB.node.ts b/packages/nodes-base/nodes/Aws/DynamoDB/AwsDynamoDB.node.ts
index 354808befbc44..392f04e0cc241 100644
--- a/packages/nodes-base/nodes/Aws/DynamoDB/AwsDynamoDB.node.ts
+++ b/packages/nodes-base/nodes/Aws/DynamoDB/AwsDynamoDB.node.ts
@@ -411,6 +411,6 @@ export class AwsDynamoDB implements INodeType {
 			}
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Aws/DynamoDB/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/DynamoDB/GenericFunctions.ts
index a44214133ca72..dc79c12dc2353 100644
--- a/packages/nodes-base/nodes/Aws/DynamoDB/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/DynamoDB/GenericFunctions.ts
@@ -6,15 +6,16 @@ import type {
 	IWebhookFunctions,
 	IHttpRequestOptions,
 	INodeExecutionData,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
-import { deepCopy } from 'n8n-workflow';
+import { ApplicationError, deepCopy } from 'n8n-workflow';
 
 import type { IRequestBody } from './types';
 
 export async function awsApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
 	service: string,
-	method: string,
+	method: IHttpRequestMethods,
 	path: string,
 	body?: object | IRequestBody,
 	headers?: object,
@@ -37,28 +38,38 @@ export async function awsApiRequest(
 			(await this.helpers.requestWithAuthentication.call(this, 'aws', requestOptions)) as string,
 		);
 	} catch (error) {
-		const errorMessage =
+		const statusCode = (error.statusCode || error.cause?.statusCode) as number;
+		let errorMessage =
 			error.response?.body?.message || error.response?.body?.Message || error.message;
-		if (error.statusCode === 403) {
+
+		if (statusCode === 403) {
 			if (errorMessage === 'The security token included in the request is invalid.') {
-				throw new Error('The AWS credentials are not valid!');
+				throw new ApplicationError('The AWS credentials are not valid!', { level: 'warning' });
 			} else if (
 				errorMessage.startsWith(
 					'The request signature we calculated does not match the signature you provided',
 				)
 			) {
-				throw new Error('The AWS credentials are not valid!');
+				throw new ApplicationError('The AWS credentials are not valid!', { level: 'warning' });
 			}
 		}
 
-		throw new Error(`AWS error response [${error.statusCode}]: ${errorMessage}`);
+		if (error.cause?.error) {
+			try {
+				errorMessage = JSON.parse(error.cause?.error).message;
+			} catch (ex) {}
+		}
+
+		throw new ApplicationError(`AWS error response [${statusCode}]: ${errorMessage}`, {
+			level: 'warning',
+		});
 	}
 }
 
 export async function awsApiRequestAllItems(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
 	service: string,
-	method: string,
+	method: IHttpRequestMethods,
 	path: string,
 	body?: IRequestBody,
 	headers?: object,
diff --git a/packages/nodes-base/nodes/Aws/DynamoDB/dynamodb.svg b/packages/nodes-base/nodes/Aws/DynamoDB/dynamodb.svg
index a3293dcc7e280..2b4429372aae6 100644
--- a/packages/nodes-base/nodes/Aws/DynamoDB/dynamodb.svg
+++ b/packages/nodes-base/nodes/Aws/DynamoDB/dynamodb.svg
@@ -1,13 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg viewBox="-40 -35 340 340" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMidYMid">
-	<g>
-		<path d="M165.258,288.501 L168.766,288.501 L226.027,259.867 L226.98,258.52 L226.98,29.964 L226.027,28.61 L168.766,0 L165.215,0 L165.258,288.501" fill="#5294CF"/>
-		<path d="M90.741,288.501 L87.184,288.501 L29.972,259.867 L28.811,257.87 L28.222,31.128 L29.972,28.61 L87.184,0 L90.785,0 L90.741,288.501" fill="#1F5B98"/>
-		<path d="M87.285,0 L168.711,0 L168.711,288.501 L87.285,288.501 L87.285,0 Z" fill="#2D72B8"/>
-		<path d="M256,137.769 L254.065,137.34 L226.437,134.764 L226.027,134.968 L168.715,132.676 L87.285,132.676 L29.972,134.968 L29.972,91.264 L29.912,91.296 L29.972,91.168 L87.285,77.888 L168.715,77.888 L226.027,91.168 L247.096,102.367 L247.096,95.167 L256,94.193 L255.078,92.395 L226.886,72.236 L226.027,72.515 L168.715,54.756 L87.285,54.756 L29.972,72.515 L29.972,28.61 L0,63.723 L0,94.389 L0.232,94.221 L8.904,95.167 L8.904,102.515 L0,107.28 L0,137.793 L0.232,137.769 L8.904,137.897 L8.904,150.704 L1.422,150.816 L0,150.68 L0,181.205 L8.904,185.993 L8.904,193.426 L0.373,194.368 L0,194.088 L0,224.749 L29.972,259.867 L29.972,215.966 L87.285,233.725 L168.715,233.725 L226.196,215.914 L226.96,216.249 L254.781,196.387 L256,194.408 L247.096,193.426 L247.096,186.142 L245.929,185.676 L226.886,195.941 L226.196,197.381 L168.715,210.584 L168.715,210.6 L87.285,210.6 L87.285,210.584 L29.972,197.325 L29.972,153.461 L87.285,155.745 L87.285,155.801 L168.715,155.801 L226.027,153.461 L227.332,154.061 L254.111,151.755 L256,150.832 L247.096,150.704 L247.096,137.897 L256,137.769" fill="#1A476F"/>
-		<path d="M226.027,215.966 L226.027,259.867 L256,224.749 L256,194.288 L226.2,215.914 L226.027,215.966" fill="#2D72B8"/>
-		<path d="M226.027,197.421 L226.2,197.381 L256,181.353 L256,150.704 L226.027,153.461 L226.027,197.421" fill="#2D72B8"/>
-		<path d="M226.2,91.208 L226.027,91.168 L226.027,134.968 L256,137.769 L256,107.135 L226.2,91.208" fill="#2D72B8"/>
-		<path d="M226.2,72.687 L256,94.193 L256,63.731 L226.027,28.61 L226.027,72.515 L226.2,72.575 L226.2,72.687" fill="#2D72B8"/>
-	</g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid" viewBox="-40 -35 340 340"><path fill="#5294CF" d="M165.258 288.501h3.508l57.261-28.634.953-1.347V29.964l-.953-1.354L168.766 0h-3.551z"/><path fill="#1F5B98" d="M90.741 288.501h-3.557l-57.212-28.634-1.161-1.997-.589-226.742 1.75-2.518L87.184 0h3.601z"/><path fill="#2D72B8" d="M87.285 0h81.426v288.501H87.285z"/><path fill="#1A476F" d="m256 137.769-1.935-.429-27.628-2.576-.41.204-57.312-2.292h-81.43l-57.313 2.292V91.264l-.06.032.06-.128 57.313-13.28h81.43l57.312 13.28 21.069 11.199v-7.2l8.904-.974-.922-1.798-28.192-20.159-.859.279-57.312-17.759h-81.43L29.972 72.515V28.61L0 63.723v30.666l.232-.168 8.672.946v7.348L0 107.28v30.513l.232-.024 8.672.128v12.807l-7.482.112L0 150.68v30.525l8.904 4.788v7.433l-8.531.942-.373-.28v30.661l29.972 35.118v-43.901l57.313 17.759h81.43l57.481-17.811.764.335 27.821-19.862 1.219-1.979-8.904-.982v-7.284l-1.167-.466-19.043 10.265-.69 1.44-57.481 13.203v.016h-81.43v-.016l-57.313-13.259v-43.864l57.313 2.284v.056h81.43l57.312-2.34 1.305.6 26.779-2.306 1.889-.923-8.904-.128v-12.807z"/><path fill="#2D72B8" d="M226.027 215.966v43.901L256 224.749v-30.461l-29.8 21.626zm0-18.545.173-.04 29.8-16.028v-30.649l-29.973 2.757zm.173-106.213-.173-.04v43.8L256 137.769v-30.634zm0-18.521L256 94.193V63.731L226.027 28.61v43.905l.173.06z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Aws/DynamoDB/types.d.ts b/packages/nodes-base/nodes/Aws/DynamoDB/types.d.ts
deleted file mode 100644
index 201fecbc34ee3..0000000000000
--- a/packages/nodes-base/nodes/Aws/DynamoDB/types.d.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-export interface IRequestBody {
-	[key: string]: string | IAttributeValue | undefined | boolean | object | number;
-	TableName: string;
-	Key?: object;
-	IndexName?: string;
-	ProjectionExpression?: string;
-	KeyConditionExpression?: string;
-	ExpressionAttributeValues?: IAttributeValue;
-	ConsistentRead?: boolean;
-	FilterExpression?: string;
-	Limit?: number;
-	ExclusiveStartKey?: IAttributeValue;
-}
-
-export interface IAttributeValue {
-	[attribute: string]: IAttributeValueValue;
-}
-
-interface IAttributeValueValue {
-	[type: string]: string | string[] | IAttributeValue[];
-}
-
-export interface IAttributeValueUi {
-	attribute: string;
-	type: AttributeValueType;
-	value: string;
-}
-
-export interface IAttributeNameUi {
-	key: string;
-	value: string;
-}
-
-type AttributeValueType =
-	| 'B' // binary
-	| 'BOOL' // boolean
-	| 'BS' // binary set
-	| 'L' // list
-	| 'M' // map
-	| 'N' // number
-	| 'NULL'
-	| 'NS' // number set
-	| 'S' // string
-	| 'SS'; // string set
-
-export type PartitionKey = {
-	details: {
-		name: string;
-		type: string;
-		value: string;
-	};
-};
-
-export const enum EAttributeValueType {
-	S = 'S',
-	SS = 'SS',
-	M = 'M',
-	L = 'L',
-	NS = 'NS',
-	N = 'N',
-	BOOL = 'BOOL',
-	B = 'B',
-	BS = 'BS',
-	NULL = 'NULL',
-}
-
-export interface IExpressionAttributeValue {
-	attribute: string;
-	type: EAttributeValueType;
-	value: string;
-}
-
-export type FieldsUiValues = Array<{
-	fieldId: string;
-	fieldValue: string;
-}>;
-
-export type PutItemUi = {
-	attribute: string;
-	type: 'S' | 'N';
-	value: string;
-};
-
-export type AdjustedPutItem = {
-	[attribute: string]: {
-		[type: string]: string;
-	};
-};
diff --git a/packages/nodes-base/nodes/Aws/DynamoDB/types.ts b/packages/nodes-base/nodes/Aws/DynamoDB/types.ts
new file mode 100644
index 0000000000000..8431e199c0e27
--- /dev/null
+++ b/packages/nodes-base/nodes/Aws/DynamoDB/types.ts
@@ -0,0 +1,88 @@
+export interface IRequestBody {
+	[key: string]: string | IAttributeValue | undefined | boolean | object | number;
+	TableName: string;
+	Key?: object;
+	IndexName?: string;
+	ProjectionExpression?: string;
+	KeyConditionExpression?: string;
+	ExpressionAttributeValues?: IAttributeValue;
+	ConsistentRead?: boolean;
+	FilterExpression?: string;
+	Limit?: number;
+	ExclusiveStartKey?: IAttributeValue;
+}
+
+export interface IAttributeValue {
+	[attribute: string]: IAttributeValueValue;
+}
+
+export interface IAttributeValueValue {
+	[type: string]: string | string[] | IAttributeValue[];
+}
+
+export interface IAttributeValueUi {
+	attribute: string;
+	type: AttributeValueType;
+	value: string;
+}
+
+export interface IAttributeNameUi {
+	key: string;
+	value: string;
+}
+
+export type AttributeValueType =
+	| 'B' // binary
+	| 'BOOL' // boolean
+	| 'BS' // binary set
+	| 'L' // list
+	| 'M' // map
+	| 'N' // number
+	| 'NULL'
+	| 'NS' // number set
+	| 'S' // string
+	| 'SS'; // string set
+
+export type PartitionKey = {
+	details: {
+		name: string;
+		type: string;
+		value: string;
+	};
+};
+
+export const enum EAttributeValueType {
+	S = 'S',
+	SS = 'SS',
+	M = 'M',
+	L = 'L',
+	NS = 'NS',
+	N = 'N',
+	BOOL = 'BOOL',
+	B = 'B',
+	BS = 'BS',
+	NULL = 'NULL',
+}
+
+export interface IExpressionAttributeValue {
+	attribute: string;
+	type: EAttributeValueType;
+	value: string;
+}
+
+export type FieldsUiValues = Array<{
+	fieldId: string;
+	fieldValue: string;
+}>;
+
+export type PutItemUi = {
+	attribute: string;
+	type: 'S' | 'N';
+	value: string;
+};
+
+export type AdjustedPutItem = {
+	[attribute: string]: {
+		[type: string]: string;
+	};
+};
diff --git a/packages/nodes-base/nodes/Aws/DynamoDB/utils.ts b/packages/nodes-base/nodes/Aws/DynamoDB/utils.ts
index a55e9ff46d275..eb7c3f4d4a9a5 100644
--- a/packages/nodes-base/nodes/Aws/DynamoDB/utils.ts
+++ b/packages/nodes-base/nodes/Aws/DynamoDB/utils.ts
@@ -1,5 +1,5 @@
 import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
-import { deepCopy, assert } from 'n8n-workflow';
+import { deepCopy, assert, ApplicationError } from 'n8n-workflow';
 
 import type {
 	AdjustedPutItem,
@@ -98,7 +98,7 @@ export function validateJSON(input: any): object {
 	try {
 		return JSON.parse(input as string);
 	} catch (error) {
-		throw new Error('Items must be a valid JSON');
+		throw new ApplicationError('Items must be a valid JSON', { level: 'warning' });
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Aws/ELB/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/ELB/GenericFunctions.ts
index 013150e2b577d..51a88f61bafb0 100644
--- a/packages/nodes-base/nodes/Aws/ELB/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/ELB/GenericFunctions.ts
@@ -1,4 +1,4 @@
-import get from 'lodash.get';
+import get from 'lodash/get';
 
 import { parseString } from 'xml2js';
 
@@ -10,13 +10,14 @@ import type {
 	IWebhookFunctions,
 	IHttpRequestOptions,
 	JsonObject,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function awsApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
 	service: string,
-	method: string,
+	method: IHttpRequestMethods,
 	path: string,
 	body?: string | Buffer,
 	query: IDataObject = {},
@@ -49,7 +50,7 @@ export async function awsApiRequest(
 export async function awsApiRequestREST(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	service: string,
-	method: string,
+	method: IHttpRequestMethods,
 	path: string,
 	body?: string,
 	query: IDataObject = {},
@@ -78,7 +79,7 @@ export async function awsApiRequestREST(
 export async function awsApiRequestSOAP(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
 	service: string,
-	method: string,
+	method: IHttpRequestMethods,
 	path: string,
 	body?: string | Buffer,
 	query: IDataObject = {},
@@ -115,7 +116,7 @@ export async function awsApiRequestSOAPAllItems(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
 	propertyName: string,
 	service: string,
-	method: string,
+	method: IHttpRequestMethods,
 	path: string,
 	body?: string,
 	query: IDataObject = {},
@@ -142,11 +143,8 @@ export async function awsApiRequestSOAPAllItems(
 			region,
 		);
 
-		if (get(responseData, `${propertyNameArray[0]}.${propertyNameArray[1]}.NextMarker`)) {
-			query.Marker = get(
-				responseData,
-				`${propertyNameArray[0]}.${propertyNameArray[1]}.NextMarker`,
-			);
+		if (get(responseData, [propertyNameArray[0], propertyNameArray[1], 'NextMarker'])) {
+			query.Marker = get(responseData, [propertyNameArray[0], propertyNameArray[1], 'NextMarker']);
 		}
 		if (get(responseData, propertyName)) {
 			if (Array.isArray(get(responseData, propertyName))) {
@@ -156,7 +154,7 @@ export async function awsApiRequestSOAPAllItems(
 			}
 		}
 	} while (
-		get(responseData, `${propertyNameArray[0]}.${propertyNameArray[1]}.NextMarker`) !== undefined
+		get(responseData, [propertyNameArray[0], propertyNameArray[1], 'NextMarker']) !== undefined
 	);
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/Aws/ELB/elb.svg b/packages/nodes-base/nodes/Aws/ELB/elb.svg
index d6bcabcb0d20f..e092562c8627a 100644
--- a/packages/nodes-base/nodes/Aws/ELB/elb.svg
+++ b/packages/nodes-base/nodes/Aws/ELB/elb.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 74.375 85" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><style><![CDATA[.B{fill:#f58536}.C{fill:#9d5025}]]></style><use xlink:href="#A" x="2.188" y="2.5"/><symbol id="A" overflow="visible"><g stroke="none"><path d="M3.511 14.898L0 16.56v46.88l3.511 1.662L17.423 40 3.511 14.898z" class="C"/><path d="M11.694 63.285l-8.183 1.817V14.898l8.183 1.769v46.618z" class="B"/><path d="M7.382 13.061l4.312-2.031L21.899 40 11.694 68.97l-4.312-2.031V13.061z" class="C"/><path d="M21.899 66.239L11.694 68.97V11.03l10.205 2.741v52.468z" class="B"/><path d="M16.499 8.747l5.4-2.556L55.616 40 21.899 73.8l-5.4-2.546V8.747z" class="C"/><path d="M58.357 61.031L21.899 73.8V6.191l36.458 12.614v42.225z" class="B"/><path d="M53.634 33.693l-6.807.418-18.819-1.506L34.99 0l18.645 33.693z" fill="#6b3a19"/><path d="M34.99 31.934V0l-6.982 3.304v29.3l6.982-.67z" class="C"/><path d="M53.635 33.693V8.824L34.99 0v31.934l18.645 1.759z" class="B"/><path d="M53.634 46.094l-6.448-.389-19.179 1.536L34.99 80l18.645-33.907z" fill="#fbbf93"/><path d="M28.008 47.24v29.465L34.99 80V47.842l-6.982-.602z" class="C"/><path d="M34.99 47.842V80l18.645-8.824V46.093L34.99 47.842z" class="B"/><path d="M70 44.558l-4.004-.156-10.38.865 4.394 22.896L70 44.558z" fill="#fbbf93"/><path d="M60.01 45.491v22.672L70 63.431V44.558l-9.99.933z" class="B"/><path d="M70 35.248l-4.004.155-10.38-.875 4.394-22.692L70 35.248z" fill="#6b3a19"/><path d="M70 35.248V16.57l-9.99-4.733v22.459l9.99.952z" class="B"/><path d="M55.616 67.065l4.394 1.098V45.491l-4.394-.224v21.798zm0-54.13l4.394-1.098v22.459l-4.394.233V12.935z" class="C"/></g></symbol></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round" viewBox="0 0 74.375 85"><style>.B{fill:#f58536}.C{fill:#9d5025}</style><use xlink:href="#A" x="2.188" y="2.5"/><symbol id="A" overflow="visible"><g stroke="none"><path d="M3.511 14.898 0 16.56v46.88l3.511 1.662L17.423 40z" class="C"/><path d="m11.694 63.285-8.183 1.817V14.898l8.183 1.769z" class="B"/><path d="m7.382 13.061 4.312-2.031L21.899 40 11.694 68.97l-4.312-2.031z" class="C"/><path d="M21.899 66.239 11.694 68.97V11.03l10.205 2.741z" class="B"/><path d="m16.499 8.747 5.4-2.556L55.616 40 21.899 73.8l-5.4-2.546z" class="C"/><path d="M58.357 61.031 21.899 73.8V6.191l36.458 12.614z" class="B"/><path fill="#6b3a19" d="m53.634 33.693-6.807.418-18.819-1.506L34.99 0l18.645 33.693z"/><path d="M34.99 31.934V0l-6.982 3.304v29.3z" class="C"/><path d="M53.635 33.693V8.824L34.99 0v31.934z" class="B"/><path fill="#fbbf93" d="m53.634 46.094-6.448-.389-19.179 1.536L34.99 80l18.645-33.907z"/><path d="M28.008 47.24v29.465L34.99 80V47.842z" class="C"/><path d="M34.99 47.842V80l18.645-8.824V46.093z" class="B"/><path fill="#fbbf93" d="m70 44.558-4.004-.156-10.38.865 4.394 22.896z"/><path d="M60.01 45.491v22.672L70 63.431V44.558z" class="B"/><path fill="#6b3a19" d="m70 35.248-4.004.155-10.38-.875 4.394-22.692z"/><path d="M70 35.248V16.57l-9.99-4.733v22.459z" class="B"/><path d="m55.616 67.065 4.394 1.098V45.491l-4.394-.224zm0-54.13 4.394-1.098v22.459l-4.394.233z" class="C"/></g></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Aws/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/GenericFunctions.ts
index 7611eaab78601..5c65217e9bce8 100644
--- a/packages/nodes-base/nodes/Aws/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/GenericFunctions.ts
@@ -7,13 +7,14 @@ import type {
 	IWebhookFunctions,
 	IHttpRequestOptions,
 	JsonObject,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function awsApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
 	service: string,
-	method: string,
+	method: IHttpRequestMethods,
 	path: string,
 	body?: string,
 	headers?: object,
@@ -41,7 +42,7 @@ export async function awsApiRequest(
 export async function awsApiRequestREST(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	service: string,
-	method: string,
+	method: IHttpRequestMethods,
 	path: string,
 	body?: string,
 	headers?: object,
@@ -57,7 +58,7 @@ export async function awsApiRequestREST(
 export async function awsApiRequestSOAP(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
 	service: string,
-	method: string,
+	method: IHttpRequestMethods,
 	path: string,
 	body?: string,
 	headers?: object,
diff --git a/packages/nodes-base/nodes/Aws/Rekognition/AwsRekognition.node.ts b/packages/nodes-base/nodes/Aws/Rekognition/AwsRekognition.node.ts
index a5a94fd2026fe..405b26637d200 100644
--- a/packages/nodes-base/nodes/Aws/Rekognition/AwsRekognition.node.ts
+++ b/packages/nodes-base/nodes/Aws/Rekognition/AwsRekognition.node.ts
@@ -90,7 +90,7 @@ export class AwsRekognition implements INodeType {
 				default: 'detectFaces',
 			},
 			{
-				displayName: 'Binary Data',
+				displayName: 'Binary File',
 				name: 'binaryData',
 				type: 'boolean',
 				default: false,
@@ -104,7 +104,7 @@ export class AwsRekognition implements INodeType {
 				description: 'Whether the image to analyze should be taken from binary field',
 			},
 			{
-				displayName: 'Binary Property',
+				displayName: 'Input Binary Field',
 				displayOptions: {
 					show: {
 						operation: ['analyze'],
@@ -115,7 +115,7 @@ export class AwsRekognition implements INodeType {
 				name: 'binaryPropertyName',
 				type: 'string',
 				default: 'data',
-				description: 'Object property name which holds binary data',
+				hint: 'The name of the input binary field containing the file to be written',
 				required: true,
 			},
 			{
@@ -389,64 +389,62 @@ export class AwsRekognition implements INodeType {
 
 						if (type === 'detectText') {
 							action = 'RekognitionService.DetectText';
+						}
+						body.Filters = {};
 
-							body.Filters = {};
-
-							const box =
-								((additionalFields.regionsOfInterestUi as IDataObject)
-									?.regionsOfInterestValues as IDataObject[]) || [];
+						const box =
+							((additionalFields.regionsOfInterestUi as IDataObject)
+								?.regionsOfInterestValues as IDataObject[]) || [];
 
-							if (box.length !== 0) {
-								//@ts-ignore
-								body.Filters.RegionsOfInterest = box.map((entry: IDataObject) => {
-									return { BoundingBox: keysTPascalCase(entry) };
-								});
-							}
+						if (box.length !== 0) {
+							//@ts-ignore
+							body.Filters.RegionsOfInterest = box.map((entry: IDataObject) => {
+								return { BoundingBox: keysTPascalCase(entry) };
+							});
+						}
 
-							const wordFilter = (additionalFields.wordFilterUi as IDataObject) || {};
-							if (Object.keys(wordFilter).length !== 0) {
-								//@ts-ignore
-								body.Filters.WordFilter = keysTPascalCase(wordFilter);
-							}
+						const wordFilter = (additionalFields.wordFilterUi as IDataObject) || {};
+						if (Object.keys(wordFilter).length !== 0) {
+							//@ts-ignore
+							body.Filters.WordFilter = keysTPascalCase(wordFilter);
+						}
 
-							const isBinaryData = this.getNodeParameter('binaryData', i);
-							if (isBinaryData) {
-								const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i);
-								const binaryPropertyData = this.helpers.assertBinaryData(i, binaryPropertyName);
-								Object.assign(body, {
-									Image: {
-										Bytes: binaryPropertyData.data,
-									},
-								});
-							} else {
-								const bucket = this.getNodeParameter('bucket', i) as string;
-								const name = this.getNodeParameter('name', i) as string;
+						const isBinaryData = this.getNodeParameter('binaryData', i);
+						if (isBinaryData) {
+							const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i);
+							const binaryPropertyData = this.helpers.assertBinaryData(i, binaryPropertyName);
+							Object.assign(body, {
+								Image: {
+									Bytes: binaryPropertyData.data,
+								},
+							});
+						} else {
+							const bucket = this.getNodeParameter('bucket', i) as string;
+							const name = this.getNodeParameter('name', i) as string;
 
-								Object.assign(body, {
-									Image: {
-										S3Object: {
-											Bucket: bucket,
-											Name: name,
-										},
+							Object.assign(body, {
+								Image: {
+									S3Object: {
+										Bucket: bucket,
+										Name: name,
 									},
-								});
+								},
+							});
 
-								if (additionalFields.version) {
-									//@ts-ignore
-									body.Image.S3Object.Version = additionalFields.version as string;
-								}
+							if (additionalFields.version) {
+								//@ts-ignore
+								body.Image.S3Object.Version = additionalFields.version as string;
 							}
-
-							responseData = await awsApiRequestREST.call(
-								this,
-								'rekognition',
-								'POST',
-								'',
-								JSON.stringify(body),
-								{},
-								{ 'X-Amz-Target': action, 'Content-Type': 'application/x-amz-json-1.1' },
-							);
 						}
+						responseData = await awsApiRequestREST.call(
+							this,
+							'rekognition',
+							'POST',
+							'',
+							JSON.stringify(body),
+							{},
+							{ 'X-Amz-Target': action, 'Content-Type': 'application/x-amz-json-1.1' },
+						);
 					}
 				}
 
diff --git a/packages/nodes-base/nodes/Aws/Rekognition/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/Rekognition/GenericFunctions.ts
index 748d99a9a6836..b0992162ca537 100644
--- a/packages/nodes-base/nodes/Aws/Rekognition/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/Rekognition/GenericFunctions.ts
@@ -1,4 +1,4 @@
-import get from 'lodash.get';
+import get from 'lodash/get';
 
 import { parseString } from 'xml2js';
 
@@ -9,6 +9,7 @@ import type {
 	ILoadOptionsFunctions,
 	IWebhookFunctions,
 	IHttpRequestOptions,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 
 import { pascalCase } from 'change-case';
@@ -16,7 +17,7 @@ import { pascalCase } from 'change-case';
 export async function awsApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
 	service: string,
-	method: string,
+	method: IHttpRequestMethods,
 	path: string,
 	body?: string | Buffer | IDataObject,
 	_query: IDataObject = {},
@@ -41,13 +42,13 @@ export async function awsApiRequest(
 	if (Object.keys(option).length !== 0) {
 		Object.assign(requestOptions, option);
 	}
-	return this.helpers.requestWithAuthentication.call(this, 'aws', requestOptions);
+	return await this.helpers.requestWithAuthentication.call(this, 'aws', requestOptions);
 }
 
 export async function awsApiRequestREST(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	service: string,
-	method: string,
+	method: IHttpRequestMethods,
 	path: string,
 	body?: string,
 	query: IDataObject = {},
@@ -76,7 +77,7 @@ export async function awsApiRequestREST(
 export async function awsApiRequestSOAP(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
 	service: string,
-	method: string,
+	method: IHttpRequestMethods,
 	path: string,
 	body?: string | Buffer | IDataObject,
 	query: IDataObject = {},
@@ -113,7 +114,7 @@ export async function awsApiRequestSOAPAllItems(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
 	propertyName: string,
 	service: string,
-	method: string,
+	method: IHttpRequestMethods,
 	path: string,
 	body?: string,
 	query: IDataObject = {},
@@ -139,11 +140,11 @@ export async function awsApiRequestSOAPAllItems(
 		);
 
 		//https://forums.aws.amazon.com/thread.jspa?threadID=55746
-		if (get(responseData, `${propertyName.split('.')[0]}.NextContinuationToken`)) {
-			query['continuation-token'] = get(
-				responseData,
-				`${propertyName.split('.')[0]}.NextContinuationToken`,
-			);
+		if (get(responseData, [propertyName.split('.')[0], 'NextContinuationToken'])) {
+			query['continuation-token'] = get(responseData, [
+				propertyName.split('.')[0],
+				'NextContinuationToken',
+			]);
 		}
 		if (get(responseData, propertyName)) {
 			if (Array.isArray(get(responseData, propertyName))) {
@@ -157,8 +158,8 @@ export async function awsApiRequestSOAPAllItems(
 			return returnData;
 		}
 	} while (
-		get(responseData, `${propertyName.split('.')[0]}.IsTruncated`) !== undefined &&
-		get(responseData, `${propertyName.split('.')[0]}.IsTruncated`) !== 'false'
+		get(responseData, [propertyName.split('.')[0], 'IsTruncated']) !== undefined &&
+		get(responseData, [propertyName.split('.')[0], 'IsTruncated']) !== 'false'
 	);
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/Aws/Rekognition/rekognition.svg b/packages/nodes-base/nodes/Aws/Rekognition/rekognition.svg
index 5eeab98fa0b23..e85d00b4e7161 100644
--- a/packages/nodes-base/nodes/Aws/Rekognition/rekognition.svg
+++ b/packages/nodes-base/nodes/Aws/Rekognition/rekognition.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 74.375 85" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x="2.188" y="2.5"/><symbol id="a" overflow="visible"><g stroke="none"><path d="M2.886 52.8L16.8 51.268V28.732L2.886 27.2v25.6z" fill="#5294cf"/><g fill="#19486f"><path d="M67.207 28.898l-6.462 2.43-36.237-5.346L34.99 0l32.217 28.898z"/><path d="M3.504 28.966L35 12.234 45.543 26 16.81 30.224l-13.305-1.26z"/></g><g fill="#205b99"><path d="M35 24L0 30.624V16.556L35 0l17.016 18.478L35 24z"/><path d="M7.008 16.478L0 19.395v44.05l7.008 3.307V16.478z"/></g><path d="M70 16.566L35 0v24l35 6.624v-14.06z" fill="#5294cf"/><g fill="#99bce3"><path d="M1.154 51.26L34.99 80l10.554-26-28.734-4.224L1.154 51.26z"/><path d="M67.64 51.142l-6.493-2.527-36.64 5.405 10.48 25.22 32.65-28.097z"/></g><path d="M67.207 51.103l-13.965-1.327v-19.55L67.207 28.9v22.205zM35 56l15.13-16L35 24 16.356 40 35 56z" fill="#205b99"/><path d="M53.624 40L35 56V24l18.634 16z" fill="#5294cf"/><path d="M0 49.376L35 56l19.21 7.873L35 80 0 63.444V49.376z" fill="#205b99"/><g fill="#5294cf"><path d="M70 63.435L35 80V56l35-6.624v14.06z"/><path d="M62.97 66.75L70 63.434V16.566l-7.03-3.327V66.75z"/></g></g></symbol></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round" viewBox="0 0 74.375 85"><use xlink:href="#a" x="2.188" y="2.5"/><symbol id="a" overflow="visible"><g stroke="none"><path fill="#5294cf" d="M2.886 52.8 16.8 51.268V28.732L2.886 27.2z"/><g fill="#19486f"><path d="m67.207 28.898-6.462 2.43-36.237-5.346L34.99 0z"/><path d="M3.504 28.966 35 12.234 45.543 26 16.81 30.224l-13.305-1.26z"/></g><g fill="#205b99"><path d="M35 24 0 30.624V16.556L35 0l17.016 18.478z"/><path d="M7.008 16.478 0 19.395v44.05l7.008 3.307z"/></g><path fill="#5294cf" d="M70 16.566 35 0v24l35 6.624v-14.06z"/><g fill="#99bce3"><path d="M1.154 51.26 34.99 80l10.554-26-28.734-4.224z"/><path d="m67.64 51.142-6.493-2.527-36.64 5.405 10.48 25.22 32.65-28.097z"/></g><path fill="#205b99" d="m67.207 51.103-13.965-1.327v-19.55L67.207 28.9v22.205zM35 56l15.13-16L35 24 16.356 40z"/><path fill="#5294cf" d="M53.624 40 35 56V24l18.634 16z"/><path fill="#205b99" d="M0 49.376 35 56l19.21 7.873L35 80 0 63.444z"/><g fill="#5294cf"><path d="M70 63.435 35 80V56l35-6.624z"/><path d="M62.97 66.75 70 63.434V16.566l-7.03-3.327z"/></g></g></symbol></svg>
\ No newline at end of file
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
new file mode 100644
index 0000000000000..e9fe6debac0b5
--- /dev/null
+++ b/packages/nodes-base/nodes/Aws/Rekognition/test/AwsRekognition.node.test.ts
@@ -0,0 +1,306 @@
+import nock from 'nock';
+import { getWorkflowFilenames, testWorkflows } from '@test/nodes/Helpers';
+
+const responseLabels = [
+	{
+		LabelModelVersion: '3.0',
+		Labels: [
+			{
+				Aliases: [],
+				Categories: [
+					{
+						Name: 'Food and Beverage',
+					},
+				],
+				Confidence: 99.81004333496094,
+				Instances: [],
+				Name: 'Alcohol',
+				Parents: [
+					{
+						Name: 'Beverage',
+					},
+				],
+			},
+			{
+				Aliases: [
+					{
+						Name: 'Drink',
+					},
+				],
+				Categories: [
+					{
+						Name: 'Food and Beverage',
+					},
+				],
+				Confidence: 99.81004333496094,
+				Instances: [],
+				Name: 'Beverage',
+				Parents: [],
+			},
+			{
+				Aliases: [],
+				Categories: [
+					{
+						Name: 'Food and Beverage',
+					},
+				],
+				Confidence: 99.81004333496094,
+				Instances: [],
+				Name: 'Liquor',
+				Parents: [
+					{
+						Name: 'Alcohol',
+					},
+					{
+						Name: 'Beverage',
+					},
+				],
+			},
+			{
+				Aliases: [],
+				Categories: [
+					{
+						Name: 'Food and Beverage',
+					},
+				],
+				Confidence: 99.75448608398438,
+				Instances: [],
+				Name: 'Red Wine',
+				Parents: [
+					{
+						Name: 'Alcohol',
+					},
+					{
+						Name: 'Beverage',
+					},
+					{
+						Name: 'Liquor',
+					},
+					{
+						Name: 'Wine',
+					},
+				],
+			},
+			{
+				Aliases: [],
+				Categories: [
+					{
+						Name: 'Food and Beverage',
+					},
+				],
+				Confidence: 99.75448608398438,
+				Instances: [],
+				Name: 'Wine',
+				Parents: [
+					{
+						Name: 'Alcohol',
+					},
+					{
+						Name: 'Beverage',
+					},
+					{
+						Name: 'Liquor',
+					},
+				],
+			},
+			{
+				Aliases: [],
+				Categories: [
+					{
+						Name: 'Everyday Objects',
+					},
+				],
+				Confidence: 99.52116394042969,
+				Instances: [],
+				Name: 'Bottle',
+				Parents: [],
+			},
+			{
+				Aliases: [],
+				Categories: [
+					{
+						Name: 'Food and Beverage',
+					},
+				],
+				Confidence: 94.69605255126953,
+				Instances: [],
+				Name: 'Wine Bottle',
+				Parents: [
+					{
+						Name: 'Alcohol',
+					},
+					{
+						Name: 'Beverage',
+					},
+					{
+						Name: 'Bottle',
+					},
+					{
+						Name: 'Liquor',
+					},
+					{
+						Name: 'Wine',
+					},
+				],
+			},
+			{
+				Aliases: [],
+				Categories: [
+					{
+						Name: 'Food and Beverage',
+					},
+				],
+				Confidence: 90.0589370727539,
+				Instances: [],
+				Name: 'Food',
+				Parents: [],
+			},
+			{
+				Aliases: [],
+				Categories: [
+					{
+						Name: 'Food and Beverage',
+					},
+				],
+				Confidence: 90.0589370727539,
+				Instances: [
+					{
+						BoundingBox: {
+							Height: 0.9467026591300964,
+							Left: 0.23295101523399353,
+							Top: 0.02573961764574051,
+							Width: 0.5303559899330139,
+						},
+						Confidence: 90.0589370727539,
+					},
+				],
+				Name: 'Ketchup',
+				Parents: [
+					{
+						Name: 'Food',
+					},
+				],
+			},
+			{
+				Aliases: [],
+				Categories: [
+					{
+						Name: 'Food and Beverage',
+					},
+				],
+				Confidence: 65.56095123291016,
+				Instances: [],
+				Name: 'Beer',
+				Parents: [
+					{
+						Name: 'Alcohol',
+					},
+					{
+						Name: 'Beverage',
+					},
+				],
+			},
+			{
+				Aliases: [],
+				Categories: [
+					{
+						Name: 'Text and Documents',
+					},
+				],
+				Confidence: 61.83842468261719,
+				Instances: [],
+				Name: 'Document',
+				Parents: [
+					{
+						Name: 'Text',
+					},
+				],
+			},
+			{
+				Aliases: [],
+				Categories: [
+					{
+						Name: 'Text and Documents',
+					},
+				],
+				Confidence: 61.83842468261719,
+				Instances: [],
+				Name: 'Id Cards',
+				Parents: [
+					{
+						Name: 'Document',
+					},
+					{
+						Name: 'Text',
+					},
+				],
+			},
+			{
+				Aliases: [],
+				Categories: [
+					{
+						Name: 'Text and Documents',
+					},
+				],
+				Confidence: 61.83842468261719,
+				Instances: [
+					{
+						BoundingBox: {
+							Height: 0.5003108382225037,
+							Left: 0.2603513300418854,
+							Top: 0.2912488579750061,
+							Width: 0.4734913110733032,
+						},
+						Confidence: 61.83842468261719,
+					},
+				],
+				Name: 'Passport',
+				Parents: [
+					{
+						Name: 'Document',
+					},
+					{
+						Name: 'Id Cards',
+					},
+					{
+						Name: 'Text',
+					},
+				],
+			},
+			{
+				Aliases: [],
+				Categories: [
+					{
+						Name: 'Text and Documents',
+					},
+				],
+				Confidence: 61.83842468261719,
+				Instances: [],
+				Name: 'Text',
+				Parents: [],
+			},
+		],
+	},
+];
+
+describe('Test AWS Rekogntion Node', () => {
+	describe('Image Labels Recognition', () => {
+		const workflows = getWorkflowFilenames(__dirname);
+		const baseUrl = 'https://rekognition.eu-central-1.amazonaws.com';
+		let mock: nock.Scope;
+
+		beforeAll(async () => {
+			nock.disableNetConnect();
+			mock = nock(baseUrl);
+		});
+
+		beforeEach(async () => {
+			mock.post('/').reply(200, responseLabels);
+		});
+
+		afterAll(() => {
+			nock.restore();
+		});
+		testWorkflows(workflows);
+	});
+});
diff --git a/packages/nodes-base/nodes/Aws/Rekognition/test/AwsRekognitionTestWorkflow.json b/packages/nodes-base/nodes/Aws/Rekognition/test/AwsRekognitionTestWorkflow.json
new file mode 100644
index 0000000000000..4f11f27a45554
--- /dev/null
+++ b/packages/nodes-base/nodes/Aws/Rekognition/test/AwsRekognitionTestWorkflow.json
@@ -0,0 +1,344 @@
+{
+  "name": "node-37-aws-rekognition-empty-response-data",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "6b79e1a7-8d17-470a-9423-d97042060170",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        40,
+        280
+      ]
+    },
+    {
+      "parameters": {
+        "type": "detectText",
+        "bucket": "test",
+        "name": "test",
+        "additionalFields": {}
+      },
+      "id": "86b957c8-fdec-462e-b55d-40dccf7bc253",
+      "name": "AWS Rekognition",
+      "type": "n8n-nodes-base.awsRekognition",
+      "typeVersion": 1,
+      "position": [
+        500,
+        280
+      ],
+      "credentials": {
+        "aws": {
+          "id": "114",
+          "name": "NodeQA"
+        }
+      }
+    }
+  ],
+  "pinData": {
+    "AWS Rekognition": [
+      {
+        "json": {
+          "LabelModelVersion": "3.0",
+          "Labels": [
+            {
+              "Aliases": [],
+              "Categories": [
+                {
+                  "Name": "Food and Beverage"
+                }
+              ],
+              "Confidence": 99.81004333496094,
+              "Instances": [],
+              "Name": "Alcohol",
+              "Parents": [
+                {
+                  "Name": "Beverage"
+                }
+              ]
+            },
+            {
+              "Aliases": [
+                {
+                  "Name": "Drink"
+                }
+              ],
+              "Categories": [
+                {
+                  "Name": "Food and Beverage"
+                }
+              ],
+              "Confidence": 99.81004333496094,
+              "Instances": [],
+              "Name": "Beverage",
+              "Parents": []
+            },
+            {
+              "Aliases": [],
+              "Categories": [
+                {
+                  "Name": "Food and Beverage"
+                }
+              ],
+              "Confidence": 99.81004333496094,
+              "Instances": [],
+              "Name": "Liquor",
+              "Parents": [
+                {
+                  "Name": "Alcohol"
+                },
+                {
+                  "Name": "Beverage"
+                }
+              ]
+            },
+            {
+              "Aliases": [],
+              "Categories": [
+                {
+                  "Name": "Food and Beverage"
+                }
+              ],
+              "Confidence": 99.75448608398438,
+              "Instances": [],
+              "Name": "Red Wine",
+              "Parents": [
+                {
+                  "Name": "Alcohol"
+                },
+                {
+                  "Name": "Beverage"
+                },
+                {
+                  "Name": "Liquor"
+                },
+                {
+                  "Name": "Wine"
+                }
+              ]
+            },
+            {
+              "Aliases": [],
+              "Categories": [
+                {
+                  "Name": "Food and Beverage"
+                }
+              ],
+              "Confidence": 99.75448608398438,
+              "Instances": [],
+              "Name": "Wine",
+              "Parents": [
+                {
+                  "Name": "Alcohol"
+                },
+                {
+                  "Name": "Beverage"
+                },
+                {
+                  "Name": "Liquor"
+                }
+              ]
+            },
+            {
+              "Aliases": [],
+              "Categories": [
+                {
+                  "Name": "Everyday Objects"
+                }
+              ],
+              "Confidence": 99.52116394042969,
+              "Instances": [],
+              "Name": "Bottle",
+              "Parents": []
+            },
+            {
+              "Aliases": [],
+              "Categories": [
+                {
+                  "Name": "Food and Beverage"
+                }
+              ],
+              "Confidence": 94.69605255126953,
+              "Instances": [],
+              "Name": "Wine Bottle",
+              "Parents": [
+                {
+                  "Name": "Alcohol"
+                },
+                {
+                  "Name": "Beverage"
+                },
+                {
+                  "Name": "Bottle"
+                },
+                {
+                  "Name": "Liquor"
+                },
+                {
+                  "Name": "Wine"
+                }
+              ]
+            },
+            {
+              "Aliases": [],
+              "Categories": [
+                {
+                  "Name": "Food and Beverage"
+                }
+              ],
+              "Confidence": 90.0589370727539,
+              "Instances": [],
+              "Name": "Food",
+              "Parents": []
+            },
+            {
+              "Aliases": [],
+              "Categories": [
+                {
+                  "Name": "Food and Beverage"
+                }
+              ],
+              "Confidence": 90.0589370727539,
+              "Instances": [
+                {
+                  "BoundingBox": {
+                    "Height": 0.9467026591300964,
+                    "Left": 0.23295101523399353,
+                    "Top": 0.02573961764574051,
+                    "Width": 0.5303559899330139
+                  },
+                  "Confidence": 90.0589370727539
+                }
+              ],
+              "Name": "Ketchup",
+              "Parents": [
+                {
+                  "Name": "Food"
+                }
+              ]
+            },
+            {
+              "Aliases": [],
+              "Categories": [
+                {
+                  "Name": "Food and Beverage"
+                }
+              ],
+              "Confidence": 65.56095123291016,
+              "Instances": [],
+              "Name": "Beer",
+              "Parents": [
+                {
+                  "Name": "Alcohol"
+                },
+                {
+                  "Name": "Beverage"
+                }
+              ]
+            },
+            {
+              "Aliases": [],
+              "Categories": [
+                {
+                  "Name": "Text and Documents"
+                }
+              ],
+              "Confidence": 61.83842468261719,
+              "Instances": [],
+              "Name": "Document",
+              "Parents": [
+                {
+                  "Name": "Text"
+                }
+              ]
+            },
+            {
+              "Aliases": [],
+              "Categories": [
+                {
+                  "Name": "Text and Documents"
+                }
+              ],
+              "Confidence": 61.83842468261719,
+              "Instances": [],
+              "Name": "Id Cards",
+              "Parents": [
+                {
+                  "Name": "Document"
+                },
+                {
+                  "Name": "Text"
+                }
+              ]
+            },
+            {
+              "Aliases": [],
+              "Categories": [
+                {
+                  "Name": "Text and Documents"
+                }
+              ],
+              "Confidence": 61.83842468261719,
+              "Instances": [
+                {
+                  "BoundingBox": {
+                    "Height": 0.5003108382225037,
+                    "Left": 0.2603513300418854,
+                    "Top": 0.2912488579750061,
+                    "Width": 0.4734913110733032
+                  },
+                  "Confidence": 61.83842468261719
+                }
+              ],
+              "Name": "Passport",
+              "Parents": [
+                {
+                  "Name": "Document"
+                },
+                {
+                  "Name": "Id Cards"
+                },
+                {
+                  "Name": "Text"
+                }
+              ]
+            },
+            {
+              "Aliases": [],
+              "Categories": [
+                {
+                  "Name": "Text and Documents"
+                }
+              ],
+              "Confidence": 61.83842468261719,
+              "Instances": [],
+              "Name": "Text",
+              "Parents": []
+            }
+          ]
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "AWS Rekognition",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {},
+  "versionId": "26ee97c0-3122-4281-96ac-ad4ded7b4ee5",
+  "id": "55",
+  "meta": {
+    "instanceId": "8e9416f42a954d0a370d988ac3c0f916f44074a6e45189164b1a8559394a7516"
+  },
+  "tags": []
+}
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Aws/S3/AwsS3.node.ts b/packages/nodes-base/nodes/Aws/S3/AwsS3.node.ts
index b39940377e52f..50a4c1738a62d 100644
--- a/packages/nodes-base/nodes/Aws/S3/AwsS3.node.ts
+++ b/packages/nodes-base/nodes/Aws/S3/AwsS3.node.ts
@@ -1,908 +1,27 @@
-import { paramCase, snakeCase } from 'change-case';
-
-import { createHash } from 'crypto';
-
-import { Builder } from 'xml2js';
-
-import type {
-	IDataObject,
-	IExecuteFunctions,
-	INodeExecutionData,
-	INodeType,
-	INodeTypeDescription,
-} from 'n8n-workflow';
-import { NodeOperationError } from 'n8n-workflow';
-
-import { bucketFields, bucketOperations } from './BucketDescription';
-
-import { folderFields, folderOperations } from './FolderDescription';
-
-import { fileFields, fileOperations } from './FileDescription';
-
-import {
-	awsApiRequestREST,
-	awsApiRequestSOAP,
-	awsApiRequestSOAPAllItems,
-} from './GenericFunctions';
-
-export class AwsS3 implements INodeType {
-	description: INodeTypeDescription = {
-		displayName: 'AWS S3',
-		name: 'awsS3',
-		icon: 'file:s3.svg',
-		group: ['output'],
-		version: 1,
-		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Sends data to AWS S3',
-		defaults: {
-			name: 'AWS S3',
-		},
-		inputs: ['main'],
-		outputs: ['main'],
-		credentials: [
-			{
-				name: 'aws',
-				required: true,
-			},
-		],
-		properties: [
-			{
-				displayName: 'Resource',
-				name: 'resource',
-				type: 'options',
-				noDataExpression: true,
-				options: [
-					{
-						name: 'Bucket',
-						value: 'bucket',
-					},
-					{
-						name: 'File',
-						value: 'file',
-					},
-					{
-						name: 'Folder',
-						value: 'folder',
-					},
-				],
-				default: 'file',
-			},
-			// BUCKET
-			...bucketOperations,
-			...bucketFields,
-			// FOLDER
-			...folderOperations,
-			...folderFields,
-			// UPLOAD
-			...fileOperations,
-			...fileFields,
-		],
-	};
-
-	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
-		const items = this.getInputData();
-		const returnData: INodeExecutionData[] = [];
-		const qs: IDataObject = {};
-		let responseData;
-		const resource = this.getNodeParameter('resource', 0);
-		const operation = this.getNodeParameter('operation', 0);
-		for (let i = 0; i < items.length; i++) {
-			const headers: IDataObject = {};
-			try {
-				if (resource === 'bucket') {
-					//https://docs.aws.amazon.com/AmazonS3/latest/API/API_CreateBucket.html
-					if (operation === 'create') {
-						const credentials = await this.getCredentials('aws');
-						const name = this.getNodeParameter('name', i) as string;
-						const additionalFields = this.getNodeParameter('additionalFields', i);
-						if (additionalFields.acl) {
-							headers['x-amz-acl'] = paramCase(additionalFields.acl as string);
-						}
-						if (additionalFields.bucketObjectLockEnabled) {
-							headers['x-amz-bucket-object-lock-enabled'] =
-								additionalFields.bucketObjectLockEnabled as boolean;
-						}
-						if (additionalFields.grantFullControl) {
-							headers['x-amz-grant-full-control'] = '';
-						}
-						if (additionalFields.grantRead) {
-							headers['x-amz-grant-read'] = '';
-						}
-						if (additionalFields.grantReadAcp) {
-							headers['x-amz-grant-read-acp'] = '';
-						}
-						if (additionalFields.grantWrite) {
-							headers['x-amz-grant-write'] = '';
-						}
-						if (additionalFields.grantWriteAcp) {
-							headers['x-amz-grant-write-acp'] = '';
-						}
-						let region = credentials.region as string;
-
-						if (additionalFields.region) {
-							region = additionalFields.region as string;
-						}
-
-						const body: IDataObject = {
-							CreateBucketConfiguration: {
-								$: {
-									xmlns: 'http://s3.amazonaws.com/doc/2006-03-01/',
-								},
-							},
-						};
-						let data = '';
-						// if credentials has the S3 defaul region (us-east-1) the body (XML) does not have to be sent.
-						if (region !== 'us-east-1') {
-							// @ts-ignore
-							body.CreateBucketConfiguration.LocationConstraint = [region];
-							const builder = new Builder();
-							data = builder.buildObject(body);
-						}
-						responseData = await awsApiRequestSOAP.call(
-							this,
-							`${name}.s3`,
-							'PUT',
-							'',
-							data,
-							qs,
-							headers,
-						);
-						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray({ success: true }),
-							{ itemData: { item: i } },
-						);
-						returnData.push(...executionData);
-					}
-
-					// https://docs.aws.amazon.com/AmazonS3/latest/API/API_DeleteBucket.html
-					if (operation === 'delete') {
-						const name = this.getNodeParameter('name', i) as string;
-
-						responseData = await awsApiRequestSOAP.call(
-							this,
-							`${name}.s3`,
-							'DELETE',
-							'',
-							'',
-							{},
-							headers,
-						);
-						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray({ success: true }),
-							{ itemData: { item: i } },
-						);
-						returnData.push(...executionData);
-					}
-
-					//https://docs.aws.amazon.com/AmazonS3/latest/API/API_ListBuckets.html
-					if (operation === 'getAll') {
-						const returnAll = this.getNodeParameter('returnAll', 0);
-						if (returnAll) {
-							responseData = await awsApiRequestSOAPAllItems.call(
-								this,
-								'ListAllMyBucketsResult.Buckets.Bucket',
-								's3',
-								'GET',
-								'',
-							);
-						} else {
-							qs.limit = this.getNodeParameter('limit', 0);
-							responseData = await awsApiRequestSOAPAllItems.call(
-								this,
-								'ListAllMyBucketsResult.Buckets.Bucket',
-								's3',
-								'GET',
-								'',
-								'',
-								qs,
-							);
-							responseData = responseData.slice(0, qs.limit);
-						}
-						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData as IDataObject[]),
-							{ itemData: { item: i } },
-						);
-						returnData.push(...executionData);
-					}
-
-					//https://docs.aws.amazon.com/AmazonS3/latest/API/API_ListObjectsV2.html
-					if (operation === 'search') {
-						const bucketName = this.getNodeParameter('bucketName', i) as string;
-						const returnAll = this.getNodeParameter('returnAll', 0);
-						const additionalFields = this.getNodeParameter('additionalFields', 0);
-
-						if (additionalFields.prefix) {
-							qs.prefix = additionalFields.prefix as string;
-						}
-
-						if (additionalFields.encodingType) {
-							qs['encoding-type'] = additionalFields.encodingType as string;
-						}
-
-						if (additionalFields.delimiter) {
-							qs.delimiter = additionalFields.delimiter as string;
-						}
-
-						if (additionalFields.fetchOwner) {
-							qs['fetch-owner'] = additionalFields.fetchOwner as string;
-						}
-
-						if (additionalFields.startAfter) {
-							qs['start-after'] = additionalFields.startAfter as string;
-						}
-
-						if (additionalFields.requesterPays) {
-							qs['x-amz-request-payer'] = 'requester';
-						}
-
-						qs['list-type'] = 2;
-
-						responseData = await awsApiRequestSOAP.call(this, `${bucketName}.s3`, 'GET', '', '', {
-							location: '',
-						});
-
-						const region = responseData.LocationConstraint._ as string;
-
-						if (returnAll) {
-							responseData = await awsApiRequestSOAPAllItems.call(
-								this,
-								'ListBucketResult.Contents',
-								`${bucketName}.s3`,
-								'GET',
-								'',
-								'',
-								qs,
-								{},
-								{},
-								region,
-							);
-						} else {
-							qs['max-keys'] = this.getNodeParameter('limit', 0);
-							responseData = await awsApiRequestSOAP.call(
-								this,
-								`${bucketName}.s3`,
-								'GET',
-								'',
-								'',
-								qs,
-								{},
-								{},
-								region,
-							);
-							responseData = responseData.ListBucketResult.Contents;
-						}
-						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData as IDataObject[]),
-							{ itemData: { item: i } },
-						);
-						returnData.push(...executionData);
-					}
-				}
-				if (resource === 'folder') {
-					//https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutObject.html
-					if (operation === 'create') {
-						const bucketName = this.getNodeParameter('bucketName', i) as string;
-						const folderName = this.getNodeParameter('folderName', i) as string;
-						const additionalFields = this.getNodeParameter('additionalFields', i);
-						let path = `/${folderName}/`;
-
-						if (additionalFields.requesterPays) {
-							headers['x-amz-request-payer'] = 'requester';
-						}
-						if (additionalFields.parentFolderKey) {
-							path = `/${additionalFields.parentFolderKey}${folderName}/`;
-						}
-						if (additionalFields.storageClass) {
-							headers['x-amz-storage-class'] = snakeCase(
-								additionalFields.storageClass as string,
-							).toUpperCase();
-						}
-						responseData = await awsApiRequestSOAP.call(this, `${bucketName}.s3`, 'GET', '', '', {
-							location: '',
-						});
-
-						const region = responseData.LocationConstraint._;
-
-						responseData = await awsApiRequestSOAP.call(
-							this,
-							`${bucketName}.s3`,
-							'PUT',
-							path,
-							'',
-							qs,
-							headers,
-							{},
-							region as string,
-						);
-						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray({ success: true }),
-							{ itemData: { item: i } },
-						);
-						returnData.push(...executionData);
-					}
-					//https://docs.aws.amazon.com/AmazonS3/latest/API/API_DeleteObjects.html
-					if (operation === 'delete') {
-						const bucketName = this.getNodeParameter('bucketName', i) as string;
-						const folderKey = this.getNodeParameter('folderKey', i) as string;
-
-						responseData = await awsApiRequestSOAP.call(this, `${bucketName}.s3`, 'GET', '', '', {
-							location: '',
-						});
-
-						const region = responseData.LocationConstraint._;
-
-						responseData = await awsApiRequestSOAPAllItems.call(
-							this,
-							'ListBucketResult.Contents',
-							`${bucketName}.s3`,
-							'GET',
-							'/',
-							'',
-							{ 'list-type': 2, prefix: folderKey },
-							{},
-							{},
-							region as string,
-						);
-
-						// folder empty then just delete it
-						if (responseData.length === 0) {
-							responseData = await awsApiRequestSOAP.call(
-								this,
-								`${bucketName}.s3`,
-								'DELETE',
-								`/${folderKey}`,
-								'',
-								qs,
-								{},
-								{},
-								region as string,
-							);
-
-							responseData = { deleted: [{ Key: folderKey }] };
-						} else {
-							// delete everything inside the folder
-							const body: IDataObject = {
-								Delete: {
-									$: {
-										xmlns: 'http://s3.amazonaws.com/doc/2006-03-01/',
-									},
-									Object: [],
-								},
-							};
-
-							for (const childObject of responseData) {
-								//@ts-ignore
-								(body.Delete.Object as IDataObject[]).push({
-									Key: childObject.Key as string,
-								});
-							}
-
-							const builder = new Builder();
-							const data = builder.buildObject(body);
-
-							headers['Content-MD5'] = createHash('md5').update(data).digest('base64');
-
-							headers['Content-Type'] = 'application/xml';
-
-							responseData = await awsApiRequestSOAP.call(
-								this,
-								`${bucketName}.s3`,
-								'POST',
-								'/',
-								data,
-								{ delete: '' },
-								headers,
-								{},
-								region as string,
-							);
-
-							responseData = { deleted: responseData.DeleteResult.Deleted };
-						}
-						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
-							{ itemData: { item: i } },
-						);
-						returnData.push(...executionData);
-					}
-					//https://docs.aws.amazon.com/AmazonS3/latest/API/API_ListObjectsV2.html
-					if (operation === 'getAll') {
-						const bucketName = this.getNodeParameter('bucketName', i) as string;
-						const returnAll = this.getNodeParameter('returnAll', 0);
-						const options = this.getNodeParameter('options', 0);
-
-						if (options.folderKey) {
-							qs.prefix = options.folderKey as string;
-						}
-
-						if (options.fetchOwner) {
-							qs['fetch-owner'] = options.fetchOwner as string;
-						}
-
-						qs['list-type'] = 2;
-
-						responseData = await awsApiRequestSOAP.call(this, `${bucketName}.s3`, 'GET', '', '', {
-							location: '',
-						});
-
-						const region = responseData.LocationConstraint._;
-
-						if (returnAll) {
-							responseData = await awsApiRequestSOAPAllItems.call(
-								this,
-								'ListBucketResult.Contents',
-								`${bucketName}.s3`,
-								'GET',
-								'',
-								'',
-								qs,
-								{},
-								{},
-								region as string,
-							);
-						} else {
-							qs.limit = this.getNodeParameter('limit', 0);
-							responseData = await awsApiRequestSOAPAllItems.call(
-								this,
-								'ListBucketResult.Contents',
-								`${bucketName}.s3`,
-								'GET',
-								'',
-								'',
-								qs,
-								{},
-								{},
-								region as string,
-							);
-						}
-						if (Array.isArray(responseData)) {
-							responseData = responseData.filter(
-								(e: IDataObject) =>
-									(e.Key as string).endsWith('/') && e.Size === '0' && e.Key !== options.folderKey,
-							);
-							if (qs.limit) {
-								responseData = responseData.splice(0, qs.limit as number);
-							}
-							const executionData = this.helpers.constructExecutionMetaData(
-								this.helpers.returnJsonArray(responseData),
-								{ itemData: { item: i } },
-							);
-							returnData.push(...executionData);
-						}
-					}
-				}
-				if (resource === 'file') {
-					//https://docs.aws.amazon.com/AmazonS3/latest/API/API_CopyObject.html
-					if (operation === 'copy') {
-						const sourcePath = this.getNodeParameter('sourcePath', i) as string;
-						const destinationPath = this.getNodeParameter('destinationPath', i) as string;
-						const additionalFields = this.getNodeParameter('additionalFields', i);
-
-						headers['x-amz-copy-source'] = sourcePath;
-
-						if (additionalFields.requesterPays) {
-							headers['x-amz-request-payer'] = 'requester';
-						}
-						if (additionalFields.storageClass) {
-							headers['x-amz-storage-class'] = snakeCase(
-								additionalFields.storageClass as string,
-							).toUpperCase();
-						}
-						if (additionalFields.acl) {
-							headers['x-amz-acl'] = paramCase(additionalFields.acl as string);
-						}
-						if (additionalFields.grantFullControl) {
-							headers['x-amz-grant-full-control'] = '';
-						}
-						if (additionalFields.grantRead) {
-							headers['x-amz-grant-read'] = '';
-						}
-						if (additionalFields.grantReadAcp) {
-							headers['x-amz-grant-read-acp'] = '';
-						}
-						if (additionalFields.grantWriteAcp) {
-							headers['x-amz-grant-write-acp'] = '';
-						}
-						if (additionalFields.lockLegalHold) {
-							headers['x-amz-object-lock-legal-hold'] = (additionalFields.lockLegalHold as boolean)
-								? 'ON'
-								: 'OFF';
-						}
-						if (additionalFields.lockMode) {
-							headers['x-amz-object-lock-mode'] = (
-								additionalFields.lockMode as string
-							).toUpperCase();
-						}
-						if (additionalFields.lockRetainUntilDate) {
-							headers['x-amz-object-lock-retain-until-date'] =
-								additionalFields.lockRetainUntilDate as string;
-						}
-						if (additionalFields.serverSideEncryption) {
-							headers['x-amz-server-side-encryption'] =
-								additionalFields.serverSideEncryption as string;
-						}
-						if (additionalFields.encryptionAwsKmsKeyId) {
-							headers['x-amz-server-side-encryption-aws-kms-key-id'] =
-								additionalFields.encryptionAwsKmsKeyId as string;
-						}
-						if (additionalFields.serverSideEncryptionContext) {
-							headers['x-amz-server-side-encryption-context'] =
-								additionalFields.serverSideEncryptionContext as string;
-						}
-						if (additionalFields.serversideEncryptionCustomerAlgorithm) {
-							headers['x-amz-server-side-encryption-customer-algorithm'] =
-								additionalFields.serversideEncryptionCustomerAlgorithm as string;
-						}
-						if (additionalFields.serversideEncryptionCustomerKey) {
-							headers['x-amz-server-side-encryption-customer-key'] =
-								additionalFields.serversideEncryptionCustomerKey as string;
-						}
-						if (additionalFields.serversideEncryptionCustomerKeyMD5) {
-							headers['x-amz-server-side-encryption-customer-key-MD5'] =
-								additionalFields.serversideEncryptionCustomerKeyMD5 as string;
-						}
-						if (additionalFields.taggingDirective) {
-							headers['x-amz-tagging-directive'] = (
-								additionalFields.taggingDirective as string
-							).toUpperCase();
-						}
-						if (additionalFields.metadataDirective) {
-							headers['x-amz-metadata-directive'] = (
-								additionalFields.metadataDirective as string
-							).toUpperCase();
-						}
-
-						const destinationParts = destinationPath.split('/');
-
-						const bucketName = destinationParts[1];
-
-						const destination = `/${destinationParts.slice(2, destinationParts.length).join('/')}`;
-
-						responseData = await awsApiRequestSOAP.call(this, `${bucketName}.s3`, 'GET', '', '', {
-							location: '',
-						});
-
-						const region = responseData.LocationConstraint._;
-
-						responseData = await awsApiRequestSOAP.call(
-							this,
-							`${bucketName}.s3`,
-							'PUT',
-							destination,
-							'',
-							qs,
-							headers,
-							{},
-							region as string,
-						);
-						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData.CopyObjectResult as IDataObject[]),
-							{ itemData: { item: i } },
-						);
-						returnData.push(...executionData);
-					}
-					//https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetObject.html
-					if (operation === 'download') {
-						const bucketName = this.getNodeParameter('bucketName', i) as string;
-
-						const fileKey = this.getNodeParameter('fileKey', i) as string;
-
-						const fileName = fileKey.split('/')[fileKey.split('/').length - 1];
-
-						if (fileKey.substring(fileKey.length - 1) === '/') {
-							throw new NodeOperationError(
-								this.getNode(),
-								'Downloading a whole directory is not yet supported, please provide a file key',
-							);
-						}
-
-						let region = await awsApiRequestSOAP.call(this, `${bucketName}.s3`, 'GET', '', '', {
-							location: '',
-						});
-
-						region = region.LocationConstraint._;
-
-						const response = await awsApiRequestREST.call(
-							this,
-							`${bucketName}.s3`,
-							'GET',
-							`/${fileKey}`,
-							'',
-							qs,
-							{},
-							{ encoding: null, resolveWithFullResponse: true },
-							region as string,
-						);
-
-						let mimeType: string | undefined;
-						if (response.headers['content-type']) {
-							mimeType = response.headers['content-type'];
-						}
-
-						const newItem: INodeExecutionData = {
-							json: items[i].json,
-							binary: {},
-						};
-
-						if (items[i].binary !== undefined && newItem.binary) {
-							// Create a shallow copy of the binary data so that the old
-							// data references which do not get changed still stay behind
-							// but the incoming data does not get changed.
-							Object.assign(newItem.binary, items[i].binary);
-						}
-
-						items[i] = newItem;
-
-						const dataPropertyNameDownload = this.getNodeParameter('binaryPropertyName', i);
-
-						const data = Buffer.from(response.body as string, 'utf8');
-
-						items[i].binary![dataPropertyNameDownload] = await this.helpers.prepareBinaryData(
-							data as unknown as Buffer,
-							fileName,
-							mimeType,
-						);
-					}
-					//https://docs.aws.amazon.com/AmazonS3/latest/API/API_DeleteObject.html
-					if (operation === 'delete') {
-						const bucketName = this.getNodeParameter('bucketName', i) as string;
-
-						const fileKey = this.getNodeParameter('fileKey', i) as string;
-
-						const options = this.getNodeParameter('options', i);
-
-						if (options.versionId) {
-							qs.versionId = options.versionId as string;
-						}
-
-						responseData = await awsApiRequestSOAP.call(this, `${bucketName}.s3`, 'GET', '', '', {
-							location: '',
-						});
-
-						const region = responseData.LocationConstraint._;
-
-						responseData = await awsApiRequestSOAP.call(
-							this,
-							`${bucketName}.s3`,
-							'DELETE',
-							`/${fileKey}`,
-							'',
-							qs,
-							{},
-							{},
-							region as string,
-						);
-						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray({ success: true }),
-							{ itemData: { item: i } },
-						);
-						returnData.push(...executionData);
-					}
-					//https://docs.aws.amazon.com/AmazonS3/latest/API/API_ListObjectsV2.html
-					if (operation === 'getAll') {
-						const bucketName = this.getNodeParameter('bucketName', i) as string;
-						const returnAll = this.getNodeParameter('returnAll', 0);
-						const options = this.getNodeParameter('options', 0);
-
-						if (options.folderKey) {
-							qs.prefix = options.folderKey as string;
-						}
-
-						if (options.fetchOwner) {
-							qs['fetch-owner'] = options.fetchOwner as string;
-						}
-
-						qs.delimiter = '/';
-
-						qs['list-type'] = 2;
-
-						responseData = await awsApiRequestSOAP.call(this, `${bucketName}.s3`, 'GET', '', '', {
-							location: '',
-						});
-
-						const region = responseData.LocationConstraint._;
-
-						if (returnAll) {
-							responseData = await awsApiRequestSOAPAllItems.call(
-								this,
-								'ListBucketResult.Contents',
-								`${bucketName}.s3`,
-								'GET',
-								'',
-								'',
-								qs,
-								{},
-								{},
-								region as string,
-							);
-						} else {
-							qs.limit = this.getNodeParameter('limit', 0);
-							responseData = await awsApiRequestSOAPAllItems.call(
-								this,
-								'ListBucketResult.Contents',
-								`${bucketName}.s3`,
-								'GET',
-								'',
-								'',
-								qs,
-								{},
-								{},
-								region as string,
-							);
-							responseData = responseData.splice(0, qs.limit);
-						}
-						if (Array.isArray(responseData)) {
-							responseData = responseData.filter(
-								(e: IDataObject) => !(e.Key as string).endsWith('/') && e.Size !== '0',
-							);
-							if (qs.limit) {
-								responseData = responseData.splice(0, qs.limit as number);
-							}
-							const executionData = this.helpers.constructExecutionMetaData(
-								this.helpers.returnJsonArray(responseData),
-								{ itemData: { item: i } },
-							);
-							returnData.push(...executionData);
-						}
-					}
-					//https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutObject.html
-					if (operation === 'upload') {
-						const bucketName = this.getNodeParameter('bucketName', i) as string;
-						const fileName = this.getNodeParameter('fileName', i) as string;
-						const isBinaryData = this.getNodeParameter('binaryData', i);
-						const additionalFields = this.getNodeParameter('additionalFields', i);
-						const tagsValues = (this.getNodeParameter('tagsUi', i) as IDataObject)
-							.tagsValues as IDataObject[];
-						let path = '/';
-						let body;
-
-						if (additionalFields.requesterPays) {
-							headers['x-amz-request-payer'] = 'requester';
-						}
-						if (additionalFields.parentFolderKey) {
-							path = `/${additionalFields.parentFolderKey}/`;
-						}
-						if (additionalFields.storageClass) {
-							headers['x-amz-storage-class'] = snakeCase(
-								additionalFields.storageClass as string,
-							).toUpperCase();
-						}
-						if (additionalFields.acl) {
-							headers['x-amz-acl'] = paramCase(additionalFields.acl as string);
-						}
-						if (additionalFields.grantFullControl) {
-							headers['x-amz-grant-full-control'] = '';
-						}
-						if (additionalFields.grantRead) {
-							headers['x-amz-grant-read'] = '';
-						}
-						if (additionalFields.grantReadAcp) {
-							headers['x-amz-grant-read-acp'] = '';
-						}
-						if (additionalFields.grantWriteAcp) {
-							headers['x-amz-grant-write-acp'] = '';
-						}
-						if (additionalFields.lockLegalHold) {
-							headers['x-amz-object-lock-legal-hold'] = (additionalFields.lockLegalHold as boolean)
-								? 'ON'
-								: 'OFF';
-						}
-						if (additionalFields.lockMode) {
-							headers['x-amz-object-lock-mode'] = (
-								additionalFields.lockMode as string
-							).toUpperCase();
-						}
-						if (additionalFields.lockRetainUntilDate) {
-							headers['x-amz-object-lock-retain-until-date'] =
-								additionalFields.lockRetainUntilDate as string;
-						}
-						if (additionalFields.serverSideEncryption) {
-							headers['x-amz-server-side-encryption'] =
-								additionalFields.serverSideEncryption as string;
-						}
-						if (additionalFields.encryptionAwsKmsKeyId) {
-							headers['x-amz-server-side-encryption-aws-kms-key-id'] =
-								additionalFields.encryptionAwsKmsKeyId as string;
-						}
-						if (additionalFields.serverSideEncryptionContext) {
-							headers['x-amz-server-side-encryption-context'] =
-								additionalFields.serverSideEncryptionContext as string;
-						}
-						if (additionalFields.serversideEncryptionCustomerAlgorithm) {
-							headers['x-amz-server-side-encryption-customer-algorithm'] =
-								additionalFields.serversideEncryptionCustomerAlgorithm as string;
-						}
-						if (additionalFields.serversideEncryptionCustomerKey) {
-							headers['x-amz-server-side-encryption-customer-key'] =
-								additionalFields.serversideEncryptionCustomerKey as string;
-						}
-						if (additionalFields.serversideEncryptionCustomerKeyMD5) {
-							headers['x-amz-server-side-encryption-customer-key-MD5'] =
-								additionalFields.serversideEncryptionCustomerKeyMD5 as string;
-						}
-						if (tagsValues) {
-							const tags: string[] = [];
-							tagsValues.forEach((o: IDataObject) => {
-								tags.push(`${o.key}=${o.value}`);
-							});
-							headers['x-amz-tagging'] = tags.join('&');
-						}
-
-						responseData = await awsApiRequestSOAP.call(this, `${bucketName}.s3`, 'GET', '', '', {
-							location: '',
-						});
-
-						const region = responseData.LocationConstraint._;
-
-						if (isBinaryData) {
-							const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i);
-							const binaryPropertyData = this.helpers.assertBinaryData(i, binaryPropertyName);
-							const binaryDataBuffer = await this.helpers.getBinaryDataBuffer(
-								i,
-								binaryPropertyName,
-							);
-
-							body = binaryDataBuffer;
-
-							headers['Content-Type'] = binaryPropertyData.mimeType;
-
-							headers['Content-MD5'] = createHash('md5').update(body).digest('base64');
-
-							responseData = await awsApiRequestSOAP.call(
-								this,
-								`${bucketName}.s3`,
-								'PUT',
-								`${path}${fileName || binaryPropertyData.fileName}`,
-								body,
-								qs,
-								headers,
-								{},
-								region as string,
-							);
-						} else {
-							const fileContent = this.getNodeParameter('fileContent', i) as string;
-
-							body = Buffer.from(fileContent, 'utf8');
-
-							headers['Content-Type'] = 'text/html';
-
-							headers['Content-MD5'] = createHash('md5').update(fileContent).digest('base64');
-
-							responseData = await awsApiRequestSOAP.call(
-								this,
-								`${bucketName}.s3`,
-								'PUT',
-								`${path}${fileName}`,
-								body,
-								qs,
-								headers,
-								{},
-								region as string,
-							);
-						}
-						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray({ success: true }),
-							{ itemData: { item: i } },
-						);
-						returnData.push(...executionData);
-					}
-				}
-			} catch (error) {
-				if (this.continueOnFail()) {
-					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray({ error: error.message }),
-						{ itemData: { item: i } },
-					);
-					returnData.push(...executionData);
-					continue;
-				}
-				throw error;
-			}
-		}
-		if (resource === 'file' && operation === 'download') {
-			// For file downloads the files get attached to the existing items
-			return this.prepareOutputData(items);
-		} else {
-			return this.prepareOutputData(returnData);
-		}
+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 {
+	constructor() {
+		const baseDescription: INodeTypeBaseDescription = {
+			displayName: 'AwsS3',
+			name: 'awsS3',
+			icon: 'file:s3.svg',
+			group: ['output'],
+			subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+			description: 'Sends data to AWS S3',
+			defaultVersion: 2,
+		};
+
+		const nodeVersions: IVersionedNodeType['nodeVersions'] = {
+			1: new AwsS3V1(baseDescription),
+			2: new AwsS3V2(baseDescription),
+		};
+
+		super(nodeVersions, baseDescription);
 	}
 }
diff --git a/packages/nodes-base/nodes/Aws/S3/FileDescription.ts b/packages/nodes-base/nodes/Aws/S3/FileDescription.ts
deleted file mode 100644
index be5146777efed..0000000000000
--- a/packages/nodes-base/nodes/Aws/S3/FileDescription.ts
+++ /dev/null
@@ -1,841 +0,0 @@
-import type { INodeProperties } from 'n8n-workflow';
-
-export const fileOperations: INodeProperties[] = [
-	{
-		displayName: 'Operation',
-		name: 'operation',
-		type: 'options',
-		noDataExpression: true,
-		displayOptions: {
-			show: {
-				resource: ['file'],
-			},
-		},
-		options: [
-			{
-				name: 'Copy',
-				value: 'copy',
-				description: 'Copy a file',
-				action: 'Copy a file',
-			},
-			{
-				name: 'Delete',
-				value: 'delete',
-				description: 'Delete a file',
-				action: 'Delete a file',
-			},
-			{
-				name: 'Download',
-				value: 'download',
-				description: 'Download a file',
-				action: 'Download a file',
-			},
-			{
-				name: 'Get Many',
-				value: 'getAll',
-				description: 'Get many files',
-				action: 'Get many files',
-			},
-			{
-				name: 'Upload',
-				value: 'upload',
-				description: 'Upload a file',
-				action: 'Upload a file',
-			},
-		],
-		default: 'download',
-	},
-];
-
-export const fileFields: INodeProperties[] = [
-	/* -------------------------------------------------------------------------- */
-	/*                                file:copy                                   */
-	/* -------------------------------------------------------------------------- */
-	{
-		displayName: 'Source Path',
-		name: 'sourcePath',
-		type: 'string',
-		required: true,
-		default: '',
-		placeholder: '/bucket/my-image.jpg',
-		displayOptions: {
-			show: {
-				resource: ['file'],
-				operation: ['copy'],
-			},
-		},
-		description:
-			'The name of the source bucket and key name of the source object, separated by a slash (/)',
-	},
-	{
-		displayName: 'Destination Path',
-		name: 'destinationPath',
-		type: 'string',
-		required: true,
-		default: '',
-		placeholder: '/bucket/my-second-image.jpg',
-		displayOptions: {
-			show: {
-				resource: ['file'],
-				operation: ['copy'],
-			},
-		},
-		description:
-			'The name of the destination bucket and key name of the destination object, separated by a slash (/)',
-	},
-	{
-		displayName: 'Additional Fields',
-		name: 'additionalFields',
-		type: 'collection',
-		placeholder: 'Add Field',
-		displayOptions: {
-			show: {
-				resource: ['file'],
-				operation: ['copy'],
-			},
-		},
-		default: {},
-		options: [
-			{
-				displayName: 'ACL',
-				name: 'acl',
-				type: 'options',
-				options: [
-					{
-						name: 'Authenticated Read',
-						value: 'authenticatedRead',
-					},
-					{
-						name: 'AWS Exec Read',
-						value: 'awsExecRead',
-					},
-					{
-						name: 'Bucket Owner Full Control',
-						value: 'bucketOwnerFullControl',
-					},
-					{
-						name: 'Bucket Owner Read',
-						value: 'bucketOwnerRead',
-					},
-					{
-						name: 'Private',
-						value: 'private',
-					},
-					{
-						name: 'Public Read',
-						value: 'publicRead',
-					},
-					{
-						name: 'Public Read Write',
-						value: 'publicReadWrite',
-					},
-				],
-				default: 'private',
-				description: 'The canned ACL to apply to the object',
-			},
-			{
-				displayName: 'Grant Full Control',
-				name: 'grantFullControl',
-				type: 'boolean',
-				default: false,
-				description:
-					'Whether to give the grantee READ, READ_ACP, and WRITE_ACP permissions on the object',
-			},
-			{
-				displayName: 'Grant Read',
-				name: 'grantRead',
-				type: 'boolean',
-				default: false,
-				description: 'Whether to allow grantee to read the object data and its metadata',
-			},
-			{
-				displayName: 'Grant Read ACP',
-				name: 'grantReadAcp',
-				type: 'boolean',
-				default: false,
-				description: 'Whether to allow grantee to read the object ACL',
-			},
-			{
-				displayName: 'Grant Write ACP',
-				name: 'grantWriteAcp',
-				type: 'boolean',
-				default: false,
-				description: 'Whether to allow grantee to write the ACL for the applicable object',
-			},
-			{
-				displayName: 'Lock Legal Hold',
-				name: 'lockLegalHold',
-				type: 'boolean',
-				default: false,
-				description: 'Whether a legal hold will be applied to this object',
-			},
-			{
-				displayName: 'Lock Mode',
-				name: 'lockMode',
-				type: 'options',
-				options: [
-					{
-						name: 'Governance',
-						value: 'governance',
-					},
-					{
-						name: 'Compliance',
-						value: 'compliance',
-					},
-				],
-				default: '',
-				description: 'The Object Lock mode that you want to apply to this object',
-			},
-			{
-				displayName: 'Lock Retain Until Date',
-				name: 'lockRetainUntilDate',
-				type: 'dateTime',
-				default: '',
-				description: "The date and time when you want this object's Object Lock to expire",
-			},
-			{
-				displayName: 'Metadata Directive',
-				name: 'metadataDirective',
-				type: 'options',
-				options: [
-					{
-						name: 'Copy',
-						value: 'copy',
-					},
-					{
-						name: 'Replace',
-						value: 'replace',
-					},
-				],
-				default: '',
-				description:
-					'Specifies whether the metadata is copied from the source object or replaced with metadata provided in the request',
-			},
-			{
-				displayName: 'Requester Pays',
-				name: 'requesterPays',
-				type: 'boolean',
-				default: false,
-				description:
-					'Whether the requester will pay for requests and data transfer. While Requester Pays is enabled, anonymous access to this bucket is disabled.',
-			},
-			{
-				displayName: 'Server Side Encryption',
-				name: 'serverSideEncryption',
-				type: 'options',
-				options: [
-					{
-						name: 'AES256',
-						value: 'AES256',
-					},
-					{
-						name: 'AWS:KMS',
-						value: 'aws:kms',
-					},
-				],
-				default: '',
-				description:
-					'The server-side encryption algorithm used when storing this object in Amazon S3',
-			},
-			{
-				displayName: 'Server Side Encryption Context',
-				name: 'serverSideEncryptionContext',
-				type: 'string',
-				default: '',
-				description: 'Specifies the AWS KMS Encryption Context to use for object encryption',
-			},
-			{
-				displayName: 'Server Side Encryption AWS KMS Key ID',
-				name: 'encryptionAwsKmsKeyId',
-				type: 'string',
-				default: '',
-				description: 'If x-amz-server-side-encryption is present and has the value of aws:kms',
-			},
-			{
-				displayName: 'Server Side Encryption Customer Algorithm',
-				name: 'serversideEncryptionCustomerAlgorithm',
-				type: 'string',
-				default: '',
-				description:
-					'Specifies the algorithm to use to when encrypting the object (for example, AES256)',
-			},
-			{
-				displayName: 'Server Side Encryption Customer Key',
-				name: 'serversideEncryptionCustomerKey',
-				type: 'string',
-				default: '',
-				description:
-					'Specifies the customer-provided encryption key for Amazon S3 to use in encrypting data',
-			},
-			{
-				displayName: 'Server Side Encryption Customer Key MD5',
-				name: 'serversideEncryptionCustomerKeyMD5',
-				type: 'string',
-				default: '',
-				description: 'Specifies the 128-bit MD5 digest of the encryption key according to RFC 1321',
-			},
-			{
-				displayName: 'Storage Class',
-				name: 'storageClass',
-				type: 'options',
-				options: [
-					{
-						name: 'Deep Archive',
-						value: 'deepArchive',
-					},
-					{
-						name: 'Glacier',
-						value: 'glacier',
-					},
-					{
-						name: 'Intelligent Tiering',
-						value: 'intelligentTiering',
-					},
-					{
-						name: 'One Zone IA',
-						value: 'onezoneIA',
-					},
-					{
-						name: 'Standard',
-						value: 'standard',
-					},
-					{
-						name: 'Standard IA',
-						value: 'standardIA',
-					},
-				],
-				default: 'standard',
-				description: 'Amazon S3 storage classes',
-			},
-			{
-				displayName: 'Tagging Directive',
-				name: 'taggingDirective',
-				type: 'options',
-				options: [
-					{
-						name: 'Copy',
-						value: 'copy',
-					},
-					{
-						name: 'Replace',
-						value: 'replace',
-					},
-				],
-				default: '',
-				description:
-					'Specifies whether the metadata is copied from the source object or replaced with metadata provided in the request',
-			},
-		],
-	},
-	/* -------------------------------------------------------------------------- */
-	/*                                file:upload                                 */
-	/* -------------------------------------------------------------------------- */
-	{
-		displayName: 'Bucket Name',
-		name: 'bucketName',
-		type: 'string',
-		required: true,
-		default: '',
-		displayOptions: {
-			show: {
-				resource: ['file'],
-				operation: ['upload'],
-			},
-		},
-	},
-	{
-		displayName: 'File Name',
-		name: 'fileName',
-		type: 'string',
-		default: '',
-		placeholder: 'hello.txt',
-		required: true,
-		displayOptions: {
-			show: {
-				resource: ['file'],
-				operation: ['upload'],
-				binaryData: [false],
-			},
-		},
-	},
-	{
-		displayName: 'File Name',
-		name: 'fileName',
-		type: 'string',
-		default: '',
-		displayOptions: {
-			show: {
-				resource: ['file'],
-				operation: ['upload'],
-				binaryData: [true],
-			},
-		},
-		description: 'If not set the binary data filename will be used',
-	},
-	{
-		displayName: 'Binary Data',
-		name: 'binaryData',
-		type: 'boolean',
-		default: true,
-		displayOptions: {
-			show: {
-				operation: ['upload'],
-				resource: ['file'],
-			},
-		},
-		description: 'Whether the data to upload should be taken from binary field',
-	},
-	{
-		displayName: 'File Content',
-		name: 'fileContent',
-		type: 'string',
-		default: '',
-		displayOptions: {
-			show: {
-				operation: ['upload'],
-				resource: ['file'],
-				binaryData: [false],
-			},
-		},
-		placeholder: '',
-		description: 'The text content of the file to upload',
-	},
-	{
-		displayName: 'Binary Property',
-		name: 'binaryPropertyName',
-		type: 'string',
-		default: 'data',
-		required: true,
-		displayOptions: {
-			show: {
-				operation: ['upload'],
-				resource: ['file'],
-				binaryData: [true],
-			},
-		},
-		placeholder: '',
-		description: 'Name of the binary property which contains the data for the file to be uploaded',
-	},
-	{
-		displayName: 'Additional Fields',
-		name: 'additionalFields',
-		type: 'collection',
-		placeholder: 'Add Field',
-		displayOptions: {
-			show: {
-				resource: ['file'],
-				operation: ['upload'],
-			},
-		},
-		default: {},
-		options: [
-			{
-				displayName: 'ACL',
-				name: 'acl',
-				type: 'options',
-				options: [
-					{
-						name: 'Authenticated Read',
-						value: 'authenticatedRead',
-					},
-					{
-						name: 'AWS Exec Read',
-						value: 'awsExecRead',
-					},
-					{
-						name: 'Bucket Owner Full Control',
-						value: 'bucketOwnerFullControl',
-					},
-					{
-						name: 'Bucket Owner Read',
-						value: 'bucketOwnerRead',
-					},
-					{
-						name: 'Private',
-						value: 'private',
-					},
-					{
-						name: 'Public Read',
-						value: 'publicRead',
-					},
-					{
-						name: 'Public Read Write',
-						value: 'publicReadWrite',
-					},
-				],
-				default: 'private',
-				description: 'The canned ACL to apply to the object',
-			},
-			{
-				displayName: 'Grant Full Control',
-				name: 'grantFullControl',
-				type: 'boolean',
-				default: false,
-				description:
-					'Whether to give the grantee READ, READ_ACP, and WRITE_ACP permissions on the object',
-			},
-			{
-				displayName: 'Grant Read',
-				name: 'grantRead',
-				type: 'boolean',
-				default: false,
-				description: 'Whether to allow grantee to read the object data and its metadata',
-			},
-			{
-				displayName: 'Grant Read ACP',
-				name: 'grantReadAcp',
-				type: 'boolean',
-				default: false,
-				description: 'Whether to allow grantee to read the object ACL',
-			},
-			{
-				displayName: 'Grant Write ACP',
-				name: 'grantWriteAcp',
-				type: 'boolean',
-				default: false,
-				description: 'Whether to allow grantee to write the ACL for the applicable object',
-			},
-			{
-				displayName: 'Lock Legal Hold',
-				name: 'lockLegalHold',
-				type: 'boolean',
-				default: false,
-				description: 'Whether a legal hold will be applied to this object',
-			},
-			{
-				displayName: 'Lock Mode',
-				name: 'lockMode',
-				type: 'options',
-				options: [
-					{
-						name: 'Governance',
-						value: 'governance',
-					},
-					{
-						name: 'Compliance',
-						value: 'compliance',
-					},
-				],
-				default: '',
-				description: 'The Object Lock mode that you want to apply to this object',
-			},
-			{
-				displayName: 'Lock Retain Until Date',
-				name: 'lockRetainUntilDate',
-				type: 'dateTime',
-				default: '',
-				description: "The date and time when you want this object's Object Lock to expire",
-			},
-			{
-				displayName: 'Parent Folder Key',
-				name: 'parentFolderKey',
-				type: 'string',
-				default: '',
-				description: 'Parent folder you want to create the file in',
-			},
-			{
-				displayName: 'Requester Pays',
-				name: 'requesterPays',
-				type: 'boolean',
-				default: false,
-				description:
-					'Whether the requester will pay for requests and data transfer. While Requester Pays is enabled, anonymous access to this bucket is disabled.',
-			},
-			{
-				displayName: 'Server Side Encryption',
-				name: 'serverSideEncryption',
-				type: 'options',
-				options: [
-					{
-						name: 'AES256',
-						value: 'AES256',
-					},
-					{
-						name: 'AWS:KMS',
-						value: 'aws:kms',
-					},
-				],
-				default: '',
-				description:
-					'The server-side encryption algorithm used when storing this object in Amazon S3',
-			},
-			{
-				displayName: 'Server Side Encryption Context',
-				name: 'serverSideEncryptionContext',
-				type: 'string',
-				default: '',
-				description: 'Specifies the AWS KMS Encryption Context to use for object encryption',
-			},
-			{
-				displayName: 'Server Side Encryption AWS KMS Key ID',
-				name: 'encryptionAwsKmsKeyId',
-				type: 'string',
-				default: '',
-				description: 'If x-amz-server-side-encryption is present and has the value of aws:kms',
-			},
-			{
-				displayName: 'Server Side Encryption Customer Algorithm',
-				name: 'serversideEncryptionCustomerAlgorithm',
-				type: 'string',
-				default: '',
-				description:
-					'Specifies the algorithm to use to when encrypting the object (for example, AES256)',
-			},
-			{
-				displayName: 'Server Side Encryption Customer Key',
-				name: 'serversideEncryptionCustomerKey',
-				type: 'string',
-				default: '',
-				description:
-					'Specifies the customer-provided encryption key for Amazon S3 to use in encrypting data',
-			},
-			{
-				displayName: 'Server Side Encryption Customer Key MD5',
-				name: 'serversideEncryptionCustomerKeyMD5',
-				type: 'string',
-				default: '',
-				description: 'Specifies the 128-bit MD5 digest of the encryption key according to RFC 1321',
-			},
-			{
-				displayName: 'Storage Class',
-				name: 'storageClass',
-				type: 'options',
-				options: [
-					{
-						name: 'Deep Archive',
-						value: 'deepArchive',
-					},
-					{
-						name: 'Glacier',
-						value: 'glacier',
-					},
-					{
-						name: 'Intelligent Tiering',
-						value: 'intelligentTiering',
-					},
-					{
-						name: 'One Zone IA',
-						value: 'onezoneIA',
-					},
-					{
-						name: 'Standard',
-						value: 'standard',
-					},
-					{
-						name: 'Standard IA',
-						value: 'standardIA',
-					},
-				],
-				default: 'standard',
-				description: 'Amazon S3 storage classes',
-			},
-		],
-	},
-	{
-		displayName: 'Tags',
-		name: 'tagsUi',
-		placeholder: 'Add Tag',
-		type: 'fixedCollection',
-		default: {},
-		typeOptions: {
-			multipleValues: true,
-		},
-		displayOptions: {
-			show: {
-				resource: ['file'],
-				operation: ['upload'],
-			},
-		},
-		options: [
-			{
-				name: 'tagsValues',
-				displayName: 'Tag',
-				values: [
-					{
-						displayName: 'Key',
-						name: 'key',
-						type: 'string',
-						default: '',
-					},
-					{
-						displayName: 'Value',
-						name: 'value',
-						type: 'string',
-						default: '',
-					},
-				],
-			},
-		],
-		description: 'Optional extra headers to add to the message (most headers are allowed)',
-	},
-	/* -------------------------------------------------------------------------- */
-	/*                                file:download                               */
-	/* -------------------------------------------------------------------------- */
-	{
-		displayName: 'Bucket Name',
-		name: 'bucketName',
-		type: 'string',
-		required: true,
-		default: '',
-		displayOptions: {
-			show: {
-				resource: ['file'],
-				operation: ['download'],
-			},
-		},
-	},
-	{
-		displayName: 'File Key',
-		name: 'fileKey',
-		type: 'string',
-		required: true,
-		default: '',
-		displayOptions: {
-			show: {
-				resource: ['file'],
-				operation: ['download'],
-			},
-		},
-	},
-	{
-		displayName: 'Binary Property',
-		name: 'binaryPropertyName',
-		type: 'string',
-		required: true,
-		default: 'data',
-		displayOptions: {
-			show: {
-				operation: ['download'],
-				resource: ['file'],
-			},
-		},
-		description: 'Name of the binary property to which to write the data of the read file',
-	},
-	/* -------------------------------------------------------------------------- */
-	/*                                file:delete                                 */
-	/* -------------------------------------------------------------------------- */
-	{
-		displayName: 'Bucket Name',
-		name: 'bucketName',
-		type: 'string',
-		required: true,
-		default: '',
-		displayOptions: {
-			show: {
-				resource: ['file'],
-				operation: ['delete'],
-			},
-		},
-	},
-	{
-		displayName: 'File Key',
-		name: 'fileKey',
-		type: 'string',
-		required: true,
-		default: '',
-		displayOptions: {
-			show: {
-				resource: ['file'],
-				operation: ['delete'],
-			},
-		},
-	},
-	{
-		displayName: 'Options',
-		name: 'options',
-		type: 'collection',
-		placeholder: 'Add Field',
-		default: {},
-		displayOptions: {
-			show: {
-				resource: ['file'],
-				operation: ['delete'],
-			},
-		},
-		options: [
-			{
-				displayName: 'Version ID',
-				name: 'versionId',
-				type: 'string',
-				default: '',
-			},
-		],
-	},
-	/* -------------------------------------------------------------------------- */
-	/*                                 file:getAll                                */
-	/* -------------------------------------------------------------------------- */
-	{
-		displayName: 'Bucket Name',
-		name: 'bucketName',
-		type: 'string',
-		required: true,
-		default: '',
-		displayOptions: {
-			show: {
-				resource: ['file'],
-				operation: ['getAll'],
-			},
-		},
-	},
-	{
-		displayName: 'Return All',
-		name: 'returnAll',
-		type: 'boolean',
-		displayOptions: {
-			show: {
-				operation: ['getAll'],
-				resource: ['file'],
-			},
-		},
-		default: false,
-		description: 'Whether to return all results or only up to a given limit',
-	},
-	{
-		displayName: 'Limit',
-		name: 'limit',
-		type: 'number',
-		displayOptions: {
-			show: {
-				operation: ['getAll'],
-				resource: ['file'],
-				returnAll: [false],
-			},
-		},
-		typeOptions: {
-			minValue: 1,
-			maxValue: 500,
-		},
-		default: 100,
-		description: 'Max number of results to return',
-	},
-	{
-		displayName: 'Options',
-		name: 'options',
-		type: 'collection',
-		placeholder: 'Add Field',
-		default: {},
-		displayOptions: {
-			show: {
-				resource: ['file'],
-				operation: ['getAll'],
-			},
-		},
-		options: [
-			{
-				displayName: 'Fetch Owner',
-				name: 'fetchOwner',
-				type: 'boolean',
-				default: false,
-				// eslint-disable-next-line n8n-nodes-base/node-param-description-boolean-without-whether
-				description:
-					'The owner field is not present in listV2 by default, if you want to return owner field with each key in the result then set the fetch owner field to true',
-			},
-			{
-				displayName: 'Folder Key',
-				name: 'folderKey',
-				type: 'string',
-				default: '',
-			},
-		],
-	},
-];
diff --git a/packages/nodes-base/nodes/Aws/S3/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/S3/GenericFunctions.ts
deleted file mode 100644
index 8646f595780aa..0000000000000
--- a/packages/nodes-base/nodes/Aws/S3/GenericFunctions.ts
+++ /dev/null
@@ -1,163 +0,0 @@
-import get from 'lodash.get';
-
-import { parseString } from 'xml2js';
-
-import type {
-	IDataObject,
-	IExecuteFunctions,
-	IHookFunctions,
-	ILoadOptionsFunctions,
-	IWebhookFunctions,
-	IHttpRequestOptions,
-} from 'n8n-workflow';
-
-export async function awsApiRequest(
-	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
-	service: string,
-	method: string,
-	path: string,
-	body?: string | Buffer,
-	query: IDataObject = {},
-	headers?: object,
-	option: IDataObject = {},
-	_region?: string,
-): Promise<any> {
-	const requestOptions = {
-		qs: {
-			...query,
-			service,
-			path,
-			query,
-		},
-		method,
-		body,
-		url: '',
-		headers,
-		//region: credentials?.region as string,
-	} as IHttpRequestOptions;
-
-	if (Object.keys(option).length !== 0) {
-		Object.assign(requestOptions, option);
-	}
-	return this.helpers.requestWithAuthentication.call(this, 'aws', requestOptions);
-}
-
-export async function awsApiRequestREST(
-	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
-	service: string,
-	method: string,
-	path: string,
-	body?: string,
-	query: IDataObject = {},
-	headers?: object,
-	options: IDataObject = {},
-	region?: string,
-): Promise<any> {
-	const response = await awsApiRequest.call(
-		this,
-		service,
-		method,
-		path,
-		body,
-		query,
-		headers,
-		options,
-		region,
-	);
-	try {
-		return JSON.parse(response as string);
-	} catch (error) {
-		return response;
-	}
-}
-
-export async function awsApiRequestSOAP(
-	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
-	service: string,
-	method: string,
-	path: string,
-	body?: string | Buffer,
-	query: IDataObject = {},
-	headers?: object,
-	option: IDataObject = {},
-	region?: string,
-): Promise<any> {
-	const response = await awsApiRequest.call(
-		this,
-		service,
-		method,
-		path,
-		body,
-		query,
-		headers,
-		option,
-		region,
-	);
-	try {
-		return await new Promise((resolve, reject) => {
-			parseString(response as string, { explicitArray: false }, (err, data) => {
-				if (err) {
-					return reject(err);
-				}
-				resolve(data);
-			});
-		});
-	} catch (error) {
-		return error;
-	}
-}
-
-export async function awsApiRequestSOAPAllItems(
-	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
-	propertyName: string,
-	service: string,
-	method: string,
-	path: string,
-	body?: string,
-	query: IDataObject = {},
-	headers: IDataObject = {},
-	option: IDataObject = {},
-	region?: string,
-): Promise<any> {
-	const returnData: IDataObject[] = [];
-
-	let responseData;
-
-	do {
-		responseData = await awsApiRequestSOAP.call(
-			this,
-			service,
-			method,
-			path,
-			body,
-			query,
-			headers,
-			option,
-			region,
-		);
-
-		//https://forums.aws.amazon.com/thread.jspa?threadID=55746
-		if (get(responseData, `${propertyName.split('.')[0]}.NextContinuationToken`)) {
-			query['continuation-token'] = get(
-				responseData,
-				`${propertyName.split('.')[0]}.NextContinuationToken`,
-			);
-		}
-		if (get(responseData, propertyName)) {
-			if (Array.isArray(get(responseData, propertyName))) {
-				returnData.push.apply(returnData, get(responseData, propertyName) as IDataObject[]);
-			} else {
-				returnData.push(get(responseData, propertyName) as IDataObject);
-			}
-		}
-		const limit = query.limit as number | undefined;
-		if (limit && limit <= returnData.length) {
-			return returnData;
-		}
-	} while (
-		get(responseData, `${propertyName.split('.')[0]}.IsTruncated`) !== undefined &&
-		get(responseData, `${propertyName.split('.')[0]}.IsTruncated`) !== 'false'
-	);
-
-	return returnData;
-}
diff --git a/packages/nodes-base/nodes/Aws/S3/V1/AwsS3V1.node.ts b/packages/nodes-base/nodes/Aws/S3/V1/AwsS3V1.node.ts
new file mode 100644
index 0000000000000..51dffe4366477
--- /dev/null
+++ b/packages/nodes-base/nodes/Aws/S3/V1/AwsS3V1.node.ts
@@ -0,0 +1,914 @@
+/* eslint-disable n8n-nodes-base/node-filename-against-convention */
+import { createHash } from 'crypto';
+import { paramCase, snakeCase } from 'change-case';
+
+import { Builder } from 'xml2js';
+
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeBaseDescription,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+import { NodeOperationError } from 'n8n-workflow';
+
+import { bucketFields, bucketOperations } from './BucketDescription';
+
+import { folderFields, folderOperations } from './FolderDescription';
+
+import { fileFields, fileOperations } from './FileDescription';
+
+import {
+	awsApiRequestREST,
+	awsApiRequestSOAP,
+	awsApiRequestSOAPAllItems,
+} from './GenericFunctions';
+
+export class AwsS3V1 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			displayName: 'AWS S3',
+			name: 'awsS3',
+			icon: 'file:s3.svg',
+			group: ['output'],
+			version: 1,
+			subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+			description: 'Sends data to AWS S3',
+			defaults: {
+				name: 'AWS S3',
+			},
+			inputs: ['main'],
+			outputs: ['main'],
+			credentials: [
+				{
+					name: 'aws',
+					required: true,
+				},
+			],
+			properties: [
+				{
+					displayName: 'Resource',
+					name: 'resource',
+					type: 'options',
+					noDataExpression: true,
+					options: [
+						{
+							name: 'Bucket',
+							value: 'bucket',
+						},
+						{
+							name: 'File',
+							value: 'file',
+						},
+						{
+							name: 'Folder',
+							value: 'folder',
+						},
+					],
+					default: 'file',
+				},
+				// BUCKET
+				...bucketOperations,
+				...bucketFields,
+				// FOLDER
+				...folderOperations,
+				...folderFields,
+				// UPLOAD
+				...fileOperations,
+				...fileFields,
+			],
+		};
+	}
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = this.getInputData();
+		const returnData: INodeExecutionData[] = [];
+		const qs: IDataObject = {};
+		let responseData;
+		const resource = this.getNodeParameter('resource', 0);
+		const operation = this.getNodeParameter('operation', 0);
+		for (let i = 0; i < items.length; i++) {
+			const headers: IDataObject = {};
+			try {
+				if (resource === 'bucket') {
+					//https://docs.aws.amazon.com/AmazonS3/latest/API/API_CreateBucket.html
+					if (operation === 'create') {
+						const credentials = await this.getCredentials('aws');
+						const name = this.getNodeParameter('name', i) as string;
+						const additionalFields = this.getNodeParameter('additionalFields', i);
+						if (additionalFields.acl) {
+							headers['x-amz-acl'] = paramCase(additionalFields.acl as string);
+						}
+						if (additionalFields.bucketObjectLockEnabled) {
+							headers['x-amz-bucket-object-lock-enabled'] =
+								additionalFields.bucketObjectLockEnabled as boolean;
+						}
+						if (additionalFields.grantFullControl) {
+							headers['x-amz-grant-full-control'] = '';
+						}
+						if (additionalFields.grantRead) {
+							headers['x-amz-grant-read'] = '';
+						}
+						if (additionalFields.grantReadAcp) {
+							headers['x-amz-grant-read-acp'] = '';
+						}
+						if (additionalFields.grantWrite) {
+							headers['x-amz-grant-write'] = '';
+						}
+						if (additionalFields.grantWriteAcp) {
+							headers['x-amz-grant-write-acp'] = '';
+						}
+						let region = credentials.region as string;
+
+						if (additionalFields.region) {
+							region = additionalFields.region as string;
+						}
+
+						const body: IDataObject = {
+							CreateBucketConfiguration: {
+								$: {
+									xmlns: 'http://s3.amazonaws.com/doc/2006-03-01/',
+								},
+							},
+						};
+						let data = '';
+						// if credentials has the S3 defaul region (us-east-1) the body (XML) does not have to be sent.
+						if (region !== 'us-east-1') {
+							// @ts-ignore
+							body.CreateBucketConfiguration.LocationConstraint = [region];
+							const builder = new Builder();
+							data = builder.buildObject(body);
+						}
+						responseData = await awsApiRequestSOAP.call(
+							this,
+							`${name}.s3`,
+							'PUT',
+							'',
+							data,
+							qs,
+							headers,
+						);
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray({ success: true }),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
+					}
+
+					// https://docs.aws.amazon.com/AmazonS3/latest/API/API_DeleteBucket.html
+					if (operation === 'delete') {
+						const name = this.getNodeParameter('name', i) as string;
+
+						responseData = await awsApiRequestSOAP.call(
+							this,
+							`${name}.s3`,
+							'DELETE',
+							'',
+							'',
+							{},
+							headers,
+						);
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray({ success: true }),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
+					}
+
+					//https://docs.aws.amazon.com/AmazonS3/latest/API/API_ListBuckets.html
+					if (operation === 'getAll') {
+						const returnAll = this.getNodeParameter('returnAll', 0);
+						if (returnAll) {
+							responseData = await awsApiRequestSOAPAllItems.call(
+								this,
+								'ListAllMyBucketsResult.Buckets.Bucket',
+								's3',
+								'GET',
+								'',
+							);
+						} else {
+							qs.limit = this.getNodeParameter('limit', 0);
+							responseData = await awsApiRequestSOAPAllItems.call(
+								this,
+								'ListAllMyBucketsResult.Buckets.Bucket',
+								's3',
+								'GET',
+								'',
+								'',
+								qs,
+							);
+							responseData = responseData.slice(0, qs.limit);
+						}
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
+					}
+
+					//https://docs.aws.amazon.com/AmazonS3/latest/API/API_ListObjectsV2.html
+					if (operation === 'search') {
+						const bucketName = this.getNodeParameter('bucketName', i) as string;
+						const returnAll = this.getNodeParameter('returnAll', 0);
+						const additionalFields = this.getNodeParameter('additionalFields', 0);
+
+						if (additionalFields.prefix) {
+							qs.prefix = additionalFields.prefix as string;
+						}
+
+						if (additionalFields.encodingType) {
+							qs['encoding-type'] = additionalFields.encodingType as string;
+						}
+
+						if (additionalFields.delimiter) {
+							qs.delimiter = additionalFields.delimiter as string;
+						}
+
+						if (additionalFields.fetchOwner) {
+							qs['fetch-owner'] = additionalFields.fetchOwner as string;
+						}
+
+						if (additionalFields.startAfter) {
+							qs['start-after'] = additionalFields.startAfter as string;
+						}
+
+						if (additionalFields.requesterPays) {
+							qs['x-amz-request-payer'] = 'requester';
+						}
+
+						qs['list-type'] = 2;
+
+						responseData = await awsApiRequestSOAP.call(this, `${bucketName}.s3`, 'GET', '', '', {
+							location: '',
+						});
+
+						const region = responseData.LocationConstraint._ as string;
+
+						if (returnAll) {
+							responseData = await awsApiRequestSOAPAllItems.call(
+								this,
+								'ListBucketResult.Contents',
+								`${bucketName}.s3`,
+								'GET',
+								'',
+								'',
+								qs,
+								{},
+								{},
+								region,
+							);
+						} else {
+							qs['max-keys'] = this.getNodeParameter('limit', 0);
+							responseData = await awsApiRequestSOAP.call(
+								this,
+								`${bucketName}.s3`,
+								'GET',
+								'',
+								'',
+								qs,
+								{},
+								{},
+								region,
+							);
+							responseData = responseData.ListBucketResult.Contents;
+						}
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
+					}
+				}
+				if (resource === 'folder') {
+					//https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutObject.html
+					if (operation === 'create') {
+						const bucketName = this.getNodeParameter('bucketName', i) as string;
+						const folderName = this.getNodeParameter('folderName', i) as string;
+						const additionalFields = this.getNodeParameter('additionalFields', i);
+						let path = `/${folderName}/`;
+
+						if (additionalFields.requesterPays) {
+							headers['x-amz-request-payer'] = 'requester';
+						}
+						if (additionalFields.parentFolderKey) {
+							path = `/${additionalFields.parentFolderKey}${folderName}/`;
+						}
+						if (additionalFields.storageClass) {
+							headers['x-amz-storage-class'] = snakeCase(
+								additionalFields.storageClass as string,
+							).toUpperCase();
+						}
+						responseData = await awsApiRequestSOAP.call(this, `${bucketName}.s3`, 'GET', '', '', {
+							location: '',
+						});
+
+						const region = responseData.LocationConstraint._;
+
+						responseData = await awsApiRequestSOAP.call(
+							this,
+							`${bucketName}.s3`,
+							'PUT',
+							path,
+							'',
+							qs,
+							headers,
+							{},
+							region as string,
+						);
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray({ success: true }),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
+					}
+					//https://docs.aws.amazon.com/AmazonS3/latest/API/API_DeleteObjects.html
+					if (operation === 'delete') {
+						const bucketName = this.getNodeParameter('bucketName', i) as string;
+						const folderKey = this.getNodeParameter('folderKey', i) as string;
+
+						responseData = await awsApiRequestSOAP.call(this, `${bucketName}.s3`, 'GET', '', '', {
+							location: '',
+						});
+
+						const region = responseData.LocationConstraint._;
+
+						responseData = await awsApiRequestSOAPAllItems.call(
+							this,
+							'ListBucketResult.Contents',
+							`${bucketName}.s3`,
+							'GET',
+							'/',
+							'',
+							{ 'list-type': 2, prefix: folderKey },
+							{},
+							{},
+							region as string,
+						);
+
+						// folder empty then just delete it
+						if (responseData.length === 0) {
+							responseData = await awsApiRequestSOAP.call(
+								this,
+								`${bucketName}.s3`,
+								'DELETE',
+								`/${folderKey}`,
+								'',
+								qs,
+								{},
+								{},
+								region as string,
+							);
+
+							responseData = { deleted: [{ Key: folderKey }] };
+						} else {
+							// delete everything inside the folder
+							const body: IDataObject = {
+								Delete: {
+									$: {
+										xmlns: 'http://s3.amazonaws.com/doc/2006-03-01/',
+									},
+									Object: [],
+								},
+							};
+
+							for (const childObject of responseData) {
+								//@ts-ignore
+								(body.Delete.Object as IDataObject[]).push({
+									Key: childObject.Key as string,
+								});
+							}
+
+							const builder = new Builder();
+							const data = builder.buildObject(body);
+
+							headers['Content-MD5'] = createHash('md5').update(data).digest('base64');
+
+							headers['Content-Type'] = 'application/xml';
+
+							responseData = await awsApiRequestSOAP.call(
+								this,
+								`${bucketName}.s3`,
+								'POST',
+								'/',
+								data,
+								{ delete: '' },
+								headers,
+								{},
+								region as string,
+							);
+
+							responseData = { deleted: responseData.DeleteResult.Deleted };
+						}
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(responseData),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
+					}
+					//https://docs.aws.amazon.com/AmazonS3/latest/API/API_ListObjectsV2.html
+					if (operation === 'getAll') {
+						const bucketName = this.getNodeParameter('bucketName', i) as string;
+						const returnAll = this.getNodeParameter('returnAll', 0);
+						const options = this.getNodeParameter('options', 0);
+
+						if (options.folderKey) {
+							qs.prefix = options.folderKey as string;
+						}
+
+						if (options.fetchOwner) {
+							qs['fetch-owner'] = options.fetchOwner as string;
+						}
+
+						qs['list-type'] = 2;
+
+						responseData = await awsApiRequestSOAP.call(this, `${bucketName}.s3`, 'GET', '', '', {
+							location: '',
+						});
+
+						const region = responseData.LocationConstraint._;
+
+						if (returnAll) {
+							responseData = await awsApiRequestSOAPAllItems.call(
+								this,
+								'ListBucketResult.Contents',
+								`${bucketName}.s3`,
+								'GET',
+								'',
+								'',
+								qs,
+								{},
+								{},
+								region as string,
+							);
+						} else {
+							qs.limit = this.getNodeParameter('limit', 0);
+							responseData = await awsApiRequestSOAPAllItems.call(
+								this,
+								'ListBucketResult.Contents',
+								`${bucketName}.s3`,
+								'GET',
+								'',
+								'',
+								qs,
+								{},
+								{},
+								region as string,
+							);
+						}
+						if (Array.isArray(responseData)) {
+							responseData = responseData.filter(
+								(e: IDataObject) =>
+									(e.Key as string).endsWith('/') && e.Size === '0' && e.Key !== options.folderKey,
+							);
+							if (qs.limit) {
+								responseData = responseData.splice(0, qs.limit as number);
+							}
+							const executionData = this.helpers.constructExecutionMetaData(
+								this.helpers.returnJsonArray(responseData),
+								{ itemData: { item: i } },
+							);
+							returnData.push(...executionData);
+						}
+					}
+				}
+				if (resource === 'file') {
+					//https://docs.aws.amazon.com/AmazonS3/latest/API/API_CopyObject.html
+					if (operation === 'copy') {
+						const sourcePath = this.getNodeParameter('sourcePath', i) as string;
+						const destinationPath = this.getNodeParameter('destinationPath', i) as string;
+						const additionalFields = this.getNodeParameter('additionalFields', i);
+
+						headers['x-amz-copy-source'] = sourcePath;
+
+						if (additionalFields.requesterPays) {
+							headers['x-amz-request-payer'] = 'requester';
+						}
+						if (additionalFields.storageClass) {
+							headers['x-amz-storage-class'] = snakeCase(
+								additionalFields.storageClass as string,
+							).toUpperCase();
+						}
+						if (additionalFields.acl) {
+							headers['x-amz-acl'] = paramCase(additionalFields.acl as string);
+						}
+						if (additionalFields.grantFullControl) {
+							headers['x-amz-grant-full-control'] = '';
+						}
+						if (additionalFields.grantRead) {
+							headers['x-amz-grant-read'] = '';
+						}
+						if (additionalFields.grantReadAcp) {
+							headers['x-amz-grant-read-acp'] = '';
+						}
+						if (additionalFields.grantWriteAcp) {
+							headers['x-amz-grant-write-acp'] = '';
+						}
+						if (additionalFields.lockLegalHold) {
+							headers['x-amz-object-lock-legal-hold'] = (additionalFields.lockLegalHold as boolean)
+								? 'ON'
+								: 'OFF';
+						}
+						if (additionalFields.lockMode) {
+							headers['x-amz-object-lock-mode'] = (
+								additionalFields.lockMode as string
+							).toUpperCase();
+						}
+						if (additionalFields.lockRetainUntilDate) {
+							headers['x-amz-object-lock-retain-until-date'] =
+								additionalFields.lockRetainUntilDate as string;
+						}
+						if (additionalFields.serverSideEncryption) {
+							headers['x-amz-server-side-encryption'] =
+								additionalFields.serverSideEncryption as string;
+						}
+						if (additionalFields.encryptionAwsKmsKeyId) {
+							headers['x-amz-server-side-encryption-aws-kms-key-id'] =
+								additionalFields.encryptionAwsKmsKeyId as string;
+						}
+						if (additionalFields.serverSideEncryptionContext) {
+							headers['x-amz-server-side-encryption-context'] =
+								additionalFields.serverSideEncryptionContext as string;
+						}
+						if (additionalFields.serversideEncryptionCustomerAlgorithm) {
+							headers['x-amz-server-side-encryption-customer-algorithm'] =
+								additionalFields.serversideEncryptionCustomerAlgorithm as string;
+						}
+						if (additionalFields.serversideEncryptionCustomerKey) {
+							headers['x-amz-server-side-encryption-customer-key'] =
+								additionalFields.serversideEncryptionCustomerKey as string;
+						}
+						if (additionalFields.serversideEncryptionCustomerKeyMD5) {
+							headers['x-amz-server-side-encryption-customer-key-MD5'] =
+								additionalFields.serversideEncryptionCustomerKeyMD5 as string;
+						}
+						if (additionalFields.taggingDirective) {
+							headers['x-amz-tagging-directive'] = (
+								additionalFields.taggingDirective as string
+							).toUpperCase();
+						}
+						if (additionalFields.metadataDirective) {
+							headers['x-amz-metadata-directive'] = (
+								additionalFields.metadataDirective as string
+							).toUpperCase();
+						}
+
+						const destinationParts = destinationPath.split('/');
+
+						const bucketName = destinationParts[1];
+
+						const destination = `/${destinationParts.slice(2, destinationParts.length).join('/')}`;
+
+						responseData = await awsApiRequestSOAP.call(this, `${bucketName}.s3`, 'GET', '', '', {
+							location: '',
+						});
+
+						const region = responseData.LocationConstraint._;
+
+						responseData = await awsApiRequestSOAP.call(
+							this,
+							`${bucketName}.s3`,
+							'PUT',
+							destination,
+							'',
+							qs,
+							headers,
+							{},
+							region as string,
+						);
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(responseData.CopyObjectResult as IDataObject[]),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
+					}
+					//https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetObject.html
+					if (operation === 'download') {
+						const bucketName = this.getNodeParameter('bucketName', i) as string;
+
+						const fileKey = this.getNodeParameter('fileKey', i) as string;
+
+						const fileName = fileKey.split('/')[fileKey.split('/').length - 1];
+
+						if (fileKey.substring(fileKey.length - 1) === '/') {
+							throw new NodeOperationError(
+								this.getNode(),
+								'Downloading a whole directory is not yet supported, please provide a file key',
+							);
+						}
+
+						let region = await awsApiRequestSOAP.call(this, `${bucketName}.s3`, 'GET', '', '', {
+							location: '',
+						});
+
+						region = region.LocationConstraint._;
+
+						const response = await awsApiRequestREST.call(
+							this,
+							`${bucketName}.s3`,
+							'GET',
+							`/${fileKey}`,
+							'',
+							qs,
+							{},
+							{ encoding: null, resolveWithFullResponse: true },
+							region as string,
+						);
+
+						let mimeType: string | undefined;
+						if (response.headers['content-type']) {
+							mimeType = response.headers['content-type'];
+						}
+
+						const newItem: INodeExecutionData = {
+							json: items[i].json,
+							binary: {},
+						};
+
+						if (items[i].binary !== undefined && newItem.binary) {
+							// Create a shallow copy of the binary data so that the old
+							// data references which do not get changed still stay behind
+							// but the incoming data does not get changed.
+							Object.assign(newItem.binary, items[i].binary);
+						}
+
+						items[i] = newItem;
+
+						const dataPropertyNameDownload = this.getNodeParameter('binaryPropertyName', i);
+
+						const data = Buffer.from(response.body as string, 'utf8');
+
+						items[i].binary![dataPropertyNameDownload] = await this.helpers.prepareBinaryData(
+							data as unknown as Buffer,
+							fileName,
+							mimeType,
+						);
+					}
+					//https://docs.aws.amazon.com/AmazonS3/latest/API/API_DeleteObject.html
+					if (operation === 'delete') {
+						const bucketName = this.getNodeParameter('bucketName', i) as string;
+
+						const fileKey = this.getNodeParameter('fileKey', i) as string;
+
+						const options = this.getNodeParameter('options', i);
+
+						if (options.versionId) {
+							qs.versionId = options.versionId as string;
+						}
+
+						responseData = await awsApiRequestSOAP.call(this, `${bucketName}.s3`, 'GET', '', '', {
+							location: '',
+						});
+
+						const region = responseData.LocationConstraint._;
+
+						responseData = await awsApiRequestSOAP.call(
+							this,
+							`${bucketName}.s3`,
+							'DELETE',
+							`/${fileKey}`,
+							'',
+							qs,
+							{},
+							{},
+							region as string,
+						);
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray({ success: true }),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
+					}
+					//https://docs.aws.amazon.com/AmazonS3/latest/API/API_ListObjectsV2.html
+					if (operation === 'getAll') {
+						const bucketName = this.getNodeParameter('bucketName', i) as string;
+						const returnAll = this.getNodeParameter('returnAll', 0);
+						const options = this.getNodeParameter('options', 0);
+
+						if (options.folderKey) {
+							qs.prefix = options.folderKey as string;
+						}
+
+						if (options.fetchOwner) {
+							qs['fetch-owner'] = options.fetchOwner as string;
+						}
+
+						qs.delimiter = '/';
+
+						qs['list-type'] = 2;
+
+						responseData = await awsApiRequestSOAP.call(this, `${bucketName}.s3`, 'GET', '', '', {
+							location: '',
+						});
+
+						const region = responseData.LocationConstraint._;
+
+						if (returnAll) {
+							responseData = await awsApiRequestSOAPAllItems.call(
+								this,
+								'ListBucketResult.Contents',
+								`${bucketName}.s3`,
+								'GET',
+								'',
+								'',
+								qs,
+								{},
+								{},
+								region as string,
+							);
+						} else {
+							qs.limit = this.getNodeParameter('limit', 0);
+							responseData = await awsApiRequestSOAPAllItems.call(
+								this,
+								'ListBucketResult.Contents',
+								`${bucketName}.s3`,
+								'GET',
+								'',
+								'',
+								qs,
+								{},
+								{},
+								region as string,
+							);
+							responseData = responseData.splice(0, qs.limit);
+						}
+						if (Array.isArray(responseData)) {
+							responseData = responseData.filter(
+								(e: IDataObject) => !(e.Key as string).endsWith('/') && e.Size !== '0',
+							);
+							if (qs.limit) {
+								responseData = responseData.splice(0, qs.limit as number);
+							}
+							const executionData = this.helpers.constructExecutionMetaData(
+								this.helpers.returnJsonArray(responseData),
+								{ itemData: { item: i } },
+							);
+							returnData.push(...executionData);
+						}
+					}
+					//https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutObject.html
+					if (operation === 'upload') {
+						const bucketName = this.getNodeParameter('bucketName', i) as string;
+						const fileName = this.getNodeParameter('fileName', i) as string;
+						const isBinaryData = this.getNodeParameter('binaryData', i);
+						const additionalFields = this.getNodeParameter('additionalFields', i);
+						const tagsValues = (this.getNodeParameter('tagsUi', i) as IDataObject)
+							.tagsValues as IDataObject[];
+						let path = '/';
+						let body;
+
+						if (additionalFields.requesterPays) {
+							headers['x-amz-request-payer'] = 'requester';
+						}
+						if (additionalFields.parentFolderKey) {
+							path = `/${additionalFields.parentFolderKey}/`;
+						}
+						if (additionalFields.storageClass) {
+							headers['x-amz-storage-class'] = snakeCase(
+								additionalFields.storageClass as string,
+							).toUpperCase();
+						}
+						if (additionalFields.acl) {
+							headers['x-amz-acl'] = paramCase(additionalFields.acl as string);
+						}
+						if (additionalFields.grantFullControl) {
+							headers['x-amz-grant-full-control'] = '';
+						}
+						if (additionalFields.grantRead) {
+							headers['x-amz-grant-read'] = '';
+						}
+						if (additionalFields.grantReadAcp) {
+							headers['x-amz-grant-read-acp'] = '';
+						}
+						if (additionalFields.grantWriteAcp) {
+							headers['x-amz-grant-write-acp'] = '';
+						}
+						if (additionalFields.lockLegalHold) {
+							headers['x-amz-object-lock-legal-hold'] = (additionalFields.lockLegalHold as boolean)
+								? 'ON'
+								: 'OFF';
+						}
+						if (additionalFields.lockMode) {
+							headers['x-amz-object-lock-mode'] = (
+								additionalFields.lockMode as string
+							).toUpperCase();
+						}
+						if (additionalFields.lockRetainUntilDate) {
+							headers['x-amz-object-lock-retain-until-date'] =
+								additionalFields.lockRetainUntilDate as string;
+						}
+						if (additionalFields.serverSideEncryption) {
+							headers['x-amz-server-side-encryption'] =
+								additionalFields.serverSideEncryption as string;
+						}
+						if (additionalFields.encryptionAwsKmsKeyId) {
+							headers['x-amz-server-side-encryption-aws-kms-key-id'] =
+								additionalFields.encryptionAwsKmsKeyId as string;
+						}
+						if (additionalFields.serverSideEncryptionContext) {
+							headers['x-amz-server-side-encryption-context'] =
+								additionalFields.serverSideEncryptionContext as string;
+						}
+						if (additionalFields.serversideEncryptionCustomerAlgorithm) {
+							headers['x-amz-server-side-encryption-customer-algorithm'] =
+								additionalFields.serversideEncryptionCustomerAlgorithm as string;
+						}
+						if (additionalFields.serversideEncryptionCustomerKey) {
+							headers['x-amz-server-side-encryption-customer-key'] =
+								additionalFields.serversideEncryptionCustomerKey as string;
+						}
+						if (additionalFields.serversideEncryptionCustomerKeyMD5) {
+							headers['x-amz-server-side-encryption-customer-key-MD5'] =
+								additionalFields.serversideEncryptionCustomerKeyMD5 as string;
+						}
+						if (tagsValues) {
+							const tags: string[] = [];
+							tagsValues.forEach((o: IDataObject) => {
+								tags.push(`${o.key}=${o.value}`);
+							});
+							headers['x-amz-tagging'] = tags.join('&');
+						}
+
+						responseData = await awsApiRequestSOAP.call(this, `${bucketName}.s3`, 'GET', '', '', {
+							location: '',
+						});
+
+						const region = responseData.LocationConstraint._;
+
+						if (isBinaryData) {
+							const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i);
+							const binaryPropertyData = this.helpers.assertBinaryData(i, binaryPropertyName);
+							const binaryDataBuffer = await this.helpers.getBinaryDataBuffer(
+								i,
+								binaryPropertyName,
+							);
+
+							body = binaryDataBuffer;
+
+							headers['Content-Type'] = binaryPropertyData.mimeType;
+
+							headers['Content-MD5'] = createHash('md5').update(body).digest('base64');
+
+							responseData = await awsApiRequestSOAP.call(
+								this,
+								`${bucketName}.s3`,
+								'PUT',
+								`${path}${fileName || binaryPropertyData.fileName}`,
+								body,
+								qs,
+								headers,
+								{},
+								region as string,
+							);
+						} else {
+							const fileContent = this.getNodeParameter('fileContent', i) as string;
+
+							body = Buffer.from(fileContent, 'utf8');
+
+							headers['Content-Type'] = 'text/html';
+
+							headers['Content-MD5'] = createHash('md5').update(fileContent).digest('base64');
+
+							responseData = await awsApiRequestSOAP.call(
+								this,
+								`${bucketName}.s3`,
+								'PUT',
+								`${path}${fileName}`,
+								body,
+								qs,
+								headers,
+								{},
+								region as string,
+							);
+						}
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray({ success: true }),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
+					}
+				}
+			} catch (error) {
+				if (this.continueOnFail()) {
+					const executionData = this.helpers.constructExecutionMetaData(
+						this.helpers.returnJsonArray({ error: error.message }),
+						{ itemData: { item: i } },
+					);
+					returnData.push(...executionData);
+					continue;
+				}
+				throw error;
+			}
+		}
+		if (resource === 'file' && operation === 'download') {
+			// For file downloads the files get attached to the existing items
+			return [items];
+		} else {
+			return [returnData];
+		}
+	}
+}
diff --git a/packages/nodes-base/nodes/Aws/S3/BucketDescription.ts b/packages/nodes-base/nodes/Aws/S3/V1/BucketDescription.ts
similarity index 100%
rename from packages/nodes-base/nodes/Aws/S3/BucketDescription.ts
rename to packages/nodes-base/nodes/Aws/S3/V1/BucketDescription.ts
diff --git a/packages/nodes-base/nodes/Aws/S3/V1/FileDescription.ts b/packages/nodes-base/nodes/Aws/S3/V1/FileDescription.ts
new file mode 100644
index 0000000000000..a6c1cbd6c7a04
--- /dev/null
+++ b/packages/nodes-base/nodes/Aws/S3/V1/FileDescription.ts
@@ -0,0 +1,841 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+export const fileOperations: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				resource: ['file'],
+			},
+		},
+		options: [
+			{
+				name: 'Copy',
+				value: 'copy',
+				description: 'Copy a file',
+				action: 'Copy a file',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a file',
+				action: 'Delete a file',
+			},
+			{
+				name: 'Download',
+				value: 'download',
+				description: 'Download a file',
+				action: 'Download a file',
+			},
+			{
+				name: 'Get Many',
+				value: 'getAll',
+				description: 'Get many files',
+				action: 'Get many files',
+			},
+			{
+				name: 'Upload',
+				value: 'upload',
+				description: 'Upload a file',
+				action: 'Upload a file',
+			},
+		],
+		default: 'download',
+	},
+];
+
+export const fileFields: INodeProperties[] = [
+	/* -------------------------------------------------------------------------- */
+	/*                                file:copy                                   */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Source Path',
+		name: 'sourcePath',
+		type: 'string',
+		required: true,
+		default: '',
+		placeholder: '/bucket/my-image.jpg',
+		displayOptions: {
+			show: {
+				resource: ['file'],
+				operation: ['copy'],
+			},
+		},
+		description:
+			'The name of the source bucket should start with (/) and key name of the source object, separated by a slash (/)',
+	},
+	{
+		displayName: 'Destination Path',
+		name: 'destinationPath',
+		type: 'string',
+		required: true,
+		default: '',
+		placeholder: '/bucket/my-second-image.jpg',
+		displayOptions: {
+			show: {
+				resource: ['file'],
+				operation: ['copy'],
+			},
+		},
+		description:
+			'The name of the destination bucket and key name of the destination object, separated by a slash (/)',
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		displayOptions: {
+			show: {
+				resource: ['file'],
+				operation: ['copy'],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'ACL',
+				name: 'acl',
+				type: 'options',
+				options: [
+					{
+						name: 'Authenticated Read',
+						value: 'authenticatedRead',
+					},
+					{
+						name: 'AWS Exec Read',
+						value: 'awsExecRead',
+					},
+					{
+						name: 'Bucket Owner Full Control',
+						value: 'bucketOwnerFullControl',
+					},
+					{
+						name: 'Bucket Owner Read',
+						value: 'bucketOwnerRead',
+					},
+					{
+						name: 'Private',
+						value: 'private',
+					},
+					{
+						name: 'Public Read',
+						value: 'publicRead',
+					},
+					{
+						name: 'Public Read Write',
+						value: 'publicReadWrite',
+					},
+				],
+				default: 'private',
+				description: 'The canned ACL to apply to the object',
+			},
+			{
+				displayName: 'Grant Full Control',
+				name: 'grantFullControl',
+				type: 'boolean',
+				default: false,
+				description:
+					'Whether to give the grantee READ, READ_ACP, and WRITE_ACP permissions on the object',
+			},
+			{
+				displayName: 'Grant Read',
+				name: 'grantRead',
+				type: 'boolean',
+				default: false,
+				description: 'Whether to allow grantee to read the object data and its metadata',
+			},
+			{
+				displayName: 'Grant Read ACP',
+				name: 'grantReadAcp',
+				type: 'boolean',
+				default: false,
+				description: 'Whether to allow grantee to read the object ACL',
+			},
+			{
+				displayName: 'Grant Write ACP',
+				name: 'grantWriteAcp',
+				type: 'boolean',
+				default: false,
+				description: 'Whether to allow grantee to write the ACL for the applicable object',
+			},
+			{
+				displayName: 'Lock Legal Hold',
+				name: 'lockLegalHold',
+				type: 'boolean',
+				default: false,
+				description: 'Whether a legal hold will be applied to this object',
+			},
+			{
+				displayName: 'Lock Mode',
+				name: 'lockMode',
+				type: 'options',
+				options: [
+					{
+						name: 'Governance',
+						value: 'governance',
+					},
+					{
+						name: 'Compliance',
+						value: 'compliance',
+					},
+				],
+				default: '',
+				description: 'The Object Lock mode that you want to apply to this object',
+			},
+			{
+				displayName: 'Lock Retain Until Date',
+				name: 'lockRetainUntilDate',
+				type: 'dateTime',
+				default: '',
+				description: "The date and time when you want this object's Object Lock to expire",
+			},
+			{
+				displayName: 'Metadata Directive',
+				name: 'metadataDirective',
+				type: 'options',
+				options: [
+					{
+						name: 'Copy',
+						value: 'copy',
+					},
+					{
+						name: 'Replace',
+						value: 'replace',
+					},
+				],
+				default: '',
+				description:
+					'Specifies whether the metadata is copied from the source object or replaced with metadata provided in the request',
+			},
+			{
+				displayName: 'Requester Pays',
+				name: 'requesterPays',
+				type: 'boolean',
+				default: false,
+				description:
+					'Whether the requester will pay for requests and data transfer. While Requester Pays is enabled, anonymous access to this bucket is disabled.',
+			},
+			{
+				displayName: 'Server Side Encryption',
+				name: 'serverSideEncryption',
+				type: 'options',
+				options: [
+					{
+						name: 'AES256',
+						value: 'AES256',
+					},
+					{
+						name: 'AWS:KMS',
+						value: 'aws:kms',
+					},
+				],
+				default: '',
+				description:
+					'The server-side encryption algorithm used when storing this object in Amazon S3',
+			},
+			{
+				displayName: 'Server Side Encryption Context',
+				name: 'serverSideEncryptionContext',
+				type: 'string',
+				default: '',
+				description: 'Specifies the AWS KMS Encryption Context to use for object encryption',
+			},
+			{
+				displayName: 'Server Side Encryption AWS KMS Key ID',
+				name: 'encryptionAwsKmsKeyId',
+				type: 'string',
+				default: '',
+				description: 'If x-amz-server-side-encryption is present and has the value of aws:kms',
+			},
+			{
+				displayName: 'Server Side Encryption Customer Algorithm',
+				name: 'serversideEncryptionCustomerAlgorithm',
+				type: 'string',
+				default: '',
+				description:
+					'Specifies the algorithm to use to when encrypting the object (for example, AES256)',
+			},
+			{
+				displayName: 'Server Side Encryption Customer Key',
+				name: 'serversideEncryptionCustomerKey',
+				type: 'string',
+				default: '',
+				description:
+					'Specifies the customer-provided encryption key for Amazon S3 to use in encrypting data',
+			},
+			{
+				displayName: 'Server Side Encryption Customer Key MD5',
+				name: 'serversideEncryptionCustomerKeyMD5',
+				type: 'string',
+				default: '',
+				description: 'Specifies the 128-bit MD5 digest of the encryption key according to RFC 1321',
+			},
+			{
+				displayName: 'Storage Class',
+				name: 'storageClass',
+				type: 'options',
+				options: [
+					{
+						name: 'Deep Archive',
+						value: 'deepArchive',
+					},
+					{
+						name: 'Glacier',
+						value: 'glacier',
+					},
+					{
+						name: 'Intelligent Tiering',
+						value: 'intelligentTiering',
+					},
+					{
+						name: 'One Zone IA',
+						value: 'onezoneIA',
+					},
+					{
+						name: 'Standard',
+						value: 'standard',
+					},
+					{
+						name: 'Standard IA',
+						value: 'standardIA',
+					},
+				],
+				default: 'standard',
+				description: 'Amazon S3 storage classes',
+			},
+			{
+				displayName: 'Tagging Directive',
+				name: 'taggingDirective',
+				type: 'options',
+				options: [
+					{
+						name: 'Copy',
+						value: 'copy',
+					},
+					{
+						name: 'Replace',
+						value: 'replace',
+					},
+				],
+				default: '',
+				description:
+					'Specifies whether the metadata is copied from the source object or replaced with metadata provided in the request',
+			},
+		],
+	},
+	/* -------------------------------------------------------------------------- */
+	/*                                file:upload                                 */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Bucket Name',
+		name: 'bucketName',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: ['file'],
+				operation: ['upload'],
+			},
+		},
+	},
+	{
+		displayName: 'File Name',
+		name: 'fileName',
+		type: 'string',
+		default: '',
+		placeholder: 'hello.txt',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: ['file'],
+				operation: ['upload'],
+				binaryData: [false],
+			},
+		},
+	},
+	{
+		displayName: 'File Name',
+		name: 'fileName',
+		type: 'string',
+		default: '',
+		displayOptions: {
+			show: {
+				resource: ['file'],
+				operation: ['upload'],
+				binaryData: [true],
+			},
+		},
+		description: 'If not set the binary data filename will be used',
+	},
+	{
+		displayName: 'Binary File',
+		name: 'binaryData',
+		type: 'boolean',
+		default: true,
+		displayOptions: {
+			show: {
+				operation: ['upload'],
+				resource: ['file'],
+			},
+		},
+		description: 'Whether the data to upload should be taken from binary field',
+	},
+	{
+		displayName: 'File Content',
+		name: 'fileContent',
+		type: 'string',
+		default: '',
+		displayOptions: {
+			show: {
+				operation: ['upload'],
+				resource: ['file'],
+				binaryData: [false],
+			},
+		},
+		placeholder: '',
+		description: 'The text content of the file to upload',
+	},
+	{
+		displayName: 'Input Binary Field',
+		name: 'binaryPropertyName',
+		type: 'string',
+		default: 'data',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: ['upload'],
+				resource: ['file'],
+				binaryData: [true],
+			},
+		},
+		placeholder: '',
+		hint: 'The name of the input binary field containing the file to be uploaded',
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		displayOptions: {
+			show: {
+				resource: ['file'],
+				operation: ['upload'],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'ACL',
+				name: 'acl',
+				type: 'options',
+				options: [
+					{
+						name: 'Authenticated Read',
+						value: 'authenticatedRead',
+					},
+					{
+						name: 'AWS Exec Read',
+						value: 'awsExecRead',
+					},
+					{
+						name: 'Bucket Owner Full Control',
+						value: 'bucketOwnerFullControl',
+					},
+					{
+						name: 'Bucket Owner Read',
+						value: 'bucketOwnerRead',
+					},
+					{
+						name: 'Private',
+						value: 'private',
+					},
+					{
+						name: 'Public Read',
+						value: 'publicRead',
+					},
+					{
+						name: 'Public Read Write',
+						value: 'publicReadWrite',
+					},
+				],
+				default: 'private',
+				description: 'The canned ACL to apply to the object',
+			},
+			{
+				displayName: 'Grant Full Control',
+				name: 'grantFullControl',
+				type: 'boolean',
+				default: false,
+				description:
+					'Whether to give the grantee READ, READ_ACP, and WRITE_ACP permissions on the object',
+			},
+			{
+				displayName: 'Grant Read',
+				name: 'grantRead',
+				type: 'boolean',
+				default: false,
+				description: 'Whether to allow grantee to read the object data and its metadata',
+			},
+			{
+				displayName: 'Grant Read ACP',
+				name: 'grantReadAcp',
+				type: 'boolean',
+				default: false,
+				description: 'Whether to allow grantee to read the object ACL',
+			},
+			{
+				displayName: 'Grant Write ACP',
+				name: 'grantWriteAcp',
+				type: 'boolean',
+				default: false,
+				description: 'Whether to allow grantee to write the ACL for the applicable object',
+			},
+			{
+				displayName: 'Lock Legal Hold',
+				name: 'lockLegalHold',
+				type: 'boolean',
+				default: false,
+				description: 'Whether a legal hold will be applied to this object',
+			},
+			{
+				displayName: 'Lock Mode',
+				name: 'lockMode',
+				type: 'options',
+				options: [
+					{
+						name: 'Governance',
+						value: 'governance',
+					},
+					{
+						name: 'Compliance',
+						value: 'compliance',
+					},
+				],
+				default: '',
+				description: 'The Object Lock mode that you want to apply to this object',
+			},
+			{
+				displayName: 'Lock Retain Until Date',
+				name: 'lockRetainUntilDate',
+				type: 'dateTime',
+				default: '',
+				description: "The date and time when you want this object's Object Lock to expire",
+			},
+			{
+				displayName: 'Parent Folder Key',
+				name: 'parentFolderKey',
+				type: 'string',
+				default: '',
+				description: 'Parent folder you want to create the file in',
+			},
+			{
+				displayName: 'Requester Pays',
+				name: 'requesterPays',
+				type: 'boolean',
+				default: false,
+				description:
+					'Whether the requester will pay for requests and data transfer. While Requester Pays is enabled, anonymous access to this bucket is disabled.',
+			},
+			{
+				displayName: 'Server Side Encryption',
+				name: 'serverSideEncryption',
+				type: 'options',
+				options: [
+					{
+						name: 'AES256',
+						value: 'AES256',
+					},
+					{
+						name: 'AWS:KMS',
+						value: 'aws:kms',
+					},
+				],
+				default: '',
+				description:
+					'The server-side encryption algorithm used when storing this object in Amazon S3',
+			},
+			{
+				displayName: 'Server Side Encryption Context',
+				name: 'serverSideEncryptionContext',
+				type: 'string',
+				default: '',
+				description: 'Specifies the AWS KMS Encryption Context to use for object encryption',
+			},
+			{
+				displayName: 'Server Side Encryption AWS KMS Key ID',
+				name: 'encryptionAwsKmsKeyId',
+				type: 'string',
+				default: '',
+				description: 'If x-amz-server-side-encryption is present and has the value of aws:kms',
+			},
+			{
+				displayName: 'Server Side Encryption Customer Algorithm',
+				name: 'serversideEncryptionCustomerAlgorithm',
+				type: 'string',
+				default: '',
+				description:
+					'Specifies the algorithm to use to when encrypting the object (for example, AES256)',
+			},
+			{
+				displayName: 'Server Side Encryption Customer Key',
+				name: 'serversideEncryptionCustomerKey',
+				type: 'string',
+				default: '',
+				description:
+					'Specifies the customer-provided encryption key for Amazon S3 to use in encrypting data',
+			},
+			{
+				displayName: 'Server Side Encryption Customer Key MD5',
+				name: 'serversideEncryptionCustomerKeyMD5',
+				type: 'string',
+				default: '',
+				description: 'Specifies the 128-bit MD5 digest of the encryption key according to RFC 1321',
+			},
+			{
+				displayName: 'Storage Class',
+				name: 'storageClass',
+				type: 'options',
+				options: [
+					{
+						name: 'Deep Archive',
+						value: 'deepArchive',
+					},
+					{
+						name: 'Glacier',
+						value: 'glacier',
+					},
+					{
+						name: 'Intelligent Tiering',
+						value: 'intelligentTiering',
+					},
+					{
+						name: 'One Zone IA',
+						value: 'onezoneIA',
+					},
+					{
+						name: 'Standard',
+						value: 'standard',
+					},
+					{
+						name: 'Standard IA',
+						value: 'standardIA',
+					},
+				],
+				default: 'standard',
+				description: 'Amazon S3 storage classes',
+			},
+		],
+	},
+	{
+		displayName: 'Tags',
+		name: 'tagsUi',
+		placeholder: 'Add Tag',
+		type: 'fixedCollection',
+		default: {},
+		typeOptions: {
+			multipleValues: true,
+		},
+		displayOptions: {
+			show: {
+				resource: ['file'],
+				operation: ['upload'],
+			},
+		},
+		options: [
+			{
+				name: 'tagsValues',
+				displayName: 'Tag',
+				values: [
+					{
+						displayName: 'Key',
+						name: 'key',
+						type: 'string',
+						default: '',
+					},
+					{
+						displayName: 'Value',
+						name: 'value',
+						type: 'string',
+						default: '',
+					},
+				],
+			},
+		],
+		description: 'Optional extra headers to add to the message (most headers are allowed)',
+	},
+	/* -------------------------------------------------------------------------- */
+	/*                                file:download                               */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Bucket Name',
+		name: 'bucketName',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: ['file'],
+				operation: ['download'],
+			},
+		},
+	},
+	{
+		displayName: 'File Key',
+		name: 'fileKey',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: ['file'],
+				operation: ['download'],
+			},
+		},
+	},
+	{
+		displayName: 'Put Output File in Field',
+		name: 'binaryPropertyName',
+		type: 'string',
+		required: true,
+		default: 'data',
+		displayOptions: {
+			show: {
+				operation: ['download'],
+				resource: ['file'],
+			},
+		},
+		hint: 'The name of the output binary field to put the file in',
+	},
+	/* -------------------------------------------------------------------------- */
+	/*                                file:delete                                 */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Bucket Name',
+		name: 'bucketName',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: ['file'],
+				operation: ['delete'],
+			},
+		},
+	},
+	{
+		displayName: 'File Key',
+		name: 'fileKey',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: ['file'],
+				operation: ['delete'],
+			},
+		},
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['file'],
+				operation: ['delete'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Version ID',
+				name: 'versionId',
+				type: 'string',
+				default: '',
+			},
+		],
+	},
+	/* -------------------------------------------------------------------------- */
+	/*                                 file:getAll                                */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Bucket Name',
+		name: 'bucketName',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: ['file'],
+				operation: ['getAll'],
+			},
+		},
+	},
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				operation: ['getAll'],
+				resource: ['file'],
+			},
+		},
+		default: false,
+		description: 'Whether to return all results or only up to a given limit',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				operation: ['getAll'],
+				resource: ['file'],
+				returnAll: [false],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 500,
+		},
+		default: 100,
+		description: 'Max number of results to return',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['file'],
+				operation: ['getAll'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Fetch Owner',
+				name: 'fetchOwner',
+				type: 'boolean',
+				default: false,
+				// eslint-disable-next-line n8n-nodes-base/node-param-description-boolean-without-whether
+				description:
+					'The owner field is not present in listV2 by default, if you want to return owner field with each key in the result then set the fetch owner field to true',
+			},
+			{
+				displayName: 'Folder Key',
+				name: 'folderKey',
+				type: 'string',
+				default: '',
+			},
+		],
+	},
+];
diff --git a/packages/nodes-base/nodes/Aws/S3/FolderDescription.ts b/packages/nodes-base/nodes/Aws/S3/V1/FolderDescription.ts
similarity index 100%
rename from packages/nodes-base/nodes/Aws/S3/FolderDescription.ts
rename to packages/nodes-base/nodes/Aws/S3/V1/FolderDescription.ts
diff --git a/packages/nodes-base/nodes/Aws/S3/V1/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/S3/V1/GenericFunctions.ts
new file mode 100644
index 0000000000000..06700d283df0b
--- /dev/null
+++ b/packages/nodes-base/nodes/Aws/S3/V1/GenericFunctions.ts
@@ -0,0 +1,164 @@
+import get from 'lodash/get';
+
+import { parseString } from 'xml2js';
+
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	IHookFunctions,
+	ILoadOptionsFunctions,
+	IWebhookFunctions,
+	IHttpRequestOptions,
+	IHttpRequestMethods,
+} from 'n8n-workflow';
+
+export async function awsApiRequest(
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
+	service: string,
+	method: IHttpRequestMethods,
+	path: string,
+	body?: string | Buffer,
+	query: IDataObject = {},
+	headers?: object,
+	option: IDataObject = {},
+	_region?: string,
+): Promise<any> {
+	const requestOptions = {
+		qs: {
+			...query,
+			service,
+			path,
+			query,
+		},
+		method,
+		body,
+		url: '',
+		headers,
+		//region: credentials?.region as string,
+	} as IHttpRequestOptions;
+
+	if (Object.keys(option).length !== 0) {
+		Object.assign(requestOptions, option);
+	}
+	return await this.helpers.requestWithAuthentication.call(this, 'aws', requestOptions);
+}
+
+export async function awsApiRequestREST(
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
+	service: string,
+	method: IHttpRequestMethods,
+	path: string,
+	body?: string,
+	query: IDataObject = {},
+	headers?: object,
+	options: IDataObject = {},
+	region?: string,
+): Promise<any> {
+	const response = await awsApiRequest.call(
+		this,
+		service,
+		method,
+		path,
+		body,
+		query,
+		headers,
+		options,
+		region,
+	);
+	try {
+		return JSON.parse(response as string);
+	} catch (error) {
+		return response;
+	}
+}
+
+export async function awsApiRequestSOAP(
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
+	service: string,
+	method: IHttpRequestMethods,
+	path: string,
+	body?: string | Buffer,
+	query: IDataObject = {},
+	headers?: object,
+	option: IDataObject = {},
+	region?: string,
+): Promise<any> {
+	const response = await awsApiRequest.call(
+		this,
+		service,
+		method,
+		path,
+		body,
+		query,
+		headers,
+		option,
+		region,
+	);
+	try {
+		return await new Promise((resolve, reject) => {
+			parseString(response as string, { explicitArray: false }, (err, data) => {
+				if (err) {
+					return reject(err);
+				}
+				resolve(data);
+			});
+		});
+	} catch (error) {
+		return error;
+	}
+}
+
+export async function awsApiRequestSOAPAllItems(
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
+	propertyName: string,
+	service: string,
+	method: IHttpRequestMethods,
+	path: string,
+	body?: string,
+	query: IDataObject = {},
+	headers: IDataObject = {},
+	option: IDataObject = {},
+	region?: string,
+): Promise<any> {
+	const returnData: IDataObject[] = [];
+
+	let responseData;
+
+	do {
+		responseData = await awsApiRequestSOAP.call(
+			this,
+			service,
+			method,
+			path,
+			body,
+			query,
+			headers,
+			option,
+			region,
+		);
+
+		//https://forums.aws.amazon.com/thread.jspa?threadID=55746
+		if (get(responseData, [propertyName.split('.')[0], 'NextContinuationToken'])) {
+			query['continuation-token'] = get(responseData, [
+				propertyName.split('.')[0],
+				'NextContinuationToken',
+			]);
+		}
+		if (get(responseData, propertyName)) {
+			if (Array.isArray(get(responseData, propertyName))) {
+				returnData.push.apply(returnData, get(responseData, propertyName) as IDataObject[]);
+			} else {
+				returnData.push(get(responseData, propertyName) as IDataObject);
+			}
+		}
+		const limit = query.limit as number | undefined;
+		if (limit && limit <= returnData.length) {
+			return returnData;
+		}
+	} while (
+		get(responseData, [propertyName.split('.')[0], 'IsTruncated']) !== undefined &&
+		get(responseData, [propertyName.split('.')[0], 'IsTruncated']) !== 'false'
+	);
+
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/Aws/S3/V2/AwsS3V2.node.ts b/packages/nodes-base/nodes/Aws/S3/V2/AwsS3V2.node.ts
new file mode 100644
index 0000000000000..7f198797de4fb
--- /dev/null
+++ b/packages/nodes-base/nodes/Aws/S3/V2/AwsS3V2.node.ts
@@ -0,0 +1,1078 @@
+/* eslint-disable n8n-nodes-base/node-filename-against-convention */
+import { createHash } from 'crypto';
+import type { Readable } from 'stream';
+import { paramCase, snakeCase } from 'change-case';
+
+import { Builder } from 'xml2js';
+
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeBaseDescription,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+import { NodeOperationError } from 'n8n-workflow';
+
+import { bucketFields, bucketOperations } from './BucketDescription';
+
+import { folderFields, folderOperations } from './FolderDescription';
+
+import { fileFields, fileOperations } from './FileDescription';
+
+import { awsApiRequestREST, awsApiRequestRESTAllItems } from './GenericFunctions';
+
+// Minimum size 5MB for multipart upload in S3
+const UPLOAD_CHUNK_SIZE = 5120 * 1024;
+
+export class AwsS3V2 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			displayName: 'AWS S3',
+			name: 'awsS3',
+			icon: 'file:s3.svg',
+			group: ['output'],
+			version: 2,
+			subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+			description: 'Sends data to AWS S3',
+			defaults: {
+				name: 'AWS S3',
+			},
+			inputs: ['main'],
+			outputs: ['main'],
+			credentials: [
+				{
+					name: 'aws',
+					required: true,
+				},
+			],
+			properties: [
+				{
+					displayName: 'Resource',
+					name: 'resource',
+					type: 'options',
+					noDataExpression: true,
+					options: [
+						{
+							name: 'Bucket',
+							value: 'bucket',
+						},
+						{
+							name: 'File',
+							value: 'file',
+						},
+						{
+							name: 'Folder',
+							value: 'folder',
+						},
+					],
+					default: 'file',
+				},
+				// BUCKET
+				...bucketOperations,
+				...bucketFields,
+				// FOLDER
+				...folderOperations,
+				...folderFields,
+				// UPLOAD
+				...fileOperations,
+				...fileFields,
+			],
+		};
+	}
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = this.getInputData();
+		const returnData: INodeExecutionData[] = [];
+		const qs: IDataObject = {};
+		let responseData;
+		const resource = this.getNodeParameter('resource', 0);
+		const operation = this.getNodeParameter('operation', 0);
+		for (let i = 0; i < items.length; i++) {
+			let headers: IDataObject = {};
+			try {
+				if (resource === 'bucket') {
+					//https://docs.aws.amazon.com/AmazonS3/latest/API/API_CreateBucket.html
+					if (operation === 'create') {
+						const credentials = await this.getCredentials('aws');
+						const name = this.getNodeParameter('name', i) as string;
+						const additionalFields = this.getNodeParameter('additionalFields', i);
+						if (additionalFields.acl) {
+							headers['x-amz-acl'] = paramCase(additionalFields.acl as string);
+						}
+						if (additionalFields.bucketObjectLockEnabled) {
+							headers['x-amz-bucket-object-lock-enabled'] =
+								additionalFields.bucketObjectLockEnabled as boolean;
+						}
+						if (additionalFields.grantFullControl) {
+							headers['x-amz-grant-full-control'] = '';
+						}
+						if (additionalFields.grantRead) {
+							headers['x-amz-grant-read'] = '';
+						}
+						if (additionalFields.grantReadAcp) {
+							headers['x-amz-grant-read-acp'] = '';
+						}
+						if (additionalFields.grantWrite) {
+							headers['x-amz-grant-write'] = '';
+						}
+						if (additionalFields.grantWriteAcp) {
+							headers['x-amz-grant-write-acp'] = '';
+						}
+						let region = credentials.region as string;
+
+						if (additionalFields.region) {
+							region = additionalFields.region as string;
+						}
+
+						const body: IDataObject = {
+							CreateBucketConfiguration: {
+								$: {
+									xmlns: 'http://s3.amazonaws.com/doc/2006-03-01/',
+								},
+							},
+						};
+						let data = '';
+						// if credentials has the S3 defaul region (us-east-1) the body (XML) does not have to be sent.
+						if (region !== 'us-east-1') {
+							// @ts-ignore
+							body.CreateBucketConfiguration.LocationConstraint = [region];
+							const builder = new Builder();
+							data = builder.buildObject(body);
+						}
+						responseData = await awsApiRequestREST.call(
+							this,
+							`${name}.s3`,
+							'PUT',
+							'',
+							data,
+							qs,
+							headers,
+						);
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray({ success: true }),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
+					}
+
+					// https://docs.aws.amazon.com/AmazonS3/latest/API/API_DeleteBucket.html
+					if (operation === 'delete') {
+						const name = this.getNodeParameter('name', i) as string;
+
+						responseData = await awsApiRequestREST.call(
+							this,
+							`${name}.s3`,
+							'DELETE',
+							'',
+							'',
+							{},
+							headers,
+						);
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray({ success: true }),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
+					}
+
+					//https://docs.aws.amazon.com/AmazonS3/latest/API/API_ListBuckets.html
+					if (operation === 'getAll') {
+						const returnAll = this.getNodeParameter('returnAll', 0);
+						if (returnAll) {
+							responseData = await awsApiRequestRESTAllItems.call(
+								this,
+								'ListAllMyBucketsResult.Buckets.Bucket',
+								's3',
+								'GET',
+								'',
+							);
+						} else {
+							qs.limit = this.getNodeParameter('limit', 0);
+							responseData = await awsApiRequestRESTAllItems.call(
+								this,
+								'ListAllMyBucketsResult.Buckets.Bucket',
+								's3',
+								'GET',
+								'',
+								'',
+								qs,
+							);
+							responseData = responseData.slice(0, qs.limit);
+						}
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
+					}
+
+					//https://docs.aws.amazon.com/AmazonS3/latest/API/API_ListObjectsV2.html
+					if (operation === 'search') {
+						const bucketName = this.getNodeParameter('bucketName', i) as string;
+						const servicePath = bucketName.includes('.') ? 's3' : `${bucketName}.s3`;
+						const basePath = bucketName.includes('.') ? `/${bucketName}` : '';
+						const returnAll = this.getNodeParameter('returnAll', 0);
+						const additionalFields = this.getNodeParameter('additionalFields', 0);
+
+						if (additionalFields.prefix) {
+							qs.prefix = additionalFields.prefix as string;
+						}
+
+						if (additionalFields.encodingType) {
+							qs['encoding-type'] = additionalFields.encodingType as string;
+						}
+
+						if (additionalFields.delimiter) {
+							qs.delimiter = additionalFields.delimiter as string;
+						}
+
+						if (additionalFields.fetchOwner) {
+							qs['fetch-owner'] = additionalFields.fetchOwner as string;
+						}
+
+						if (additionalFields.startAfter) {
+							qs['start-after'] = additionalFields.startAfter as string;
+						}
+
+						if (additionalFields.requesterPays) {
+							qs['x-amz-request-payer'] = 'requester';
+						}
+
+						qs['list-type'] = 2;
+						responseData = await awsApiRequestREST.call(this, servicePath, 'GET', basePath, '', {
+							location: '',
+						});
+
+						const region = responseData.LocationConstraint._ as string;
+
+						if (returnAll) {
+							responseData = await awsApiRequestRESTAllItems.call(
+								this,
+								'ListBucketResult.Contents',
+								servicePath,
+								'GET',
+								basePath,
+								'',
+								qs,
+								{},
+								{},
+								region,
+							);
+						} else {
+							qs['max-keys'] = this.getNodeParameter('limit', 0);
+							responseData = await awsApiRequestREST.call(
+								this,
+								servicePath,
+								'GET',
+								basePath,
+								'',
+								qs,
+								{},
+								{},
+								region,
+							);
+							responseData = responseData.ListBucketResult.Contents;
+						}
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
+							{ itemData: { item: i } },
+						);
+
+						returnData.push(...executionData);
+					}
+				}
+				if (resource === 'folder') {
+					//https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutObject.html
+					if (operation === 'create') {
+						const bucketName = this.getNodeParameter('bucketName', i) as string;
+						const servicePath = bucketName.includes('.') ? 's3' : `${bucketName}.s3`;
+						const basePath = bucketName.includes('.') ? `/${bucketName}` : '';
+						const folderName = this.getNodeParameter('folderName', i) as string;
+						const additionalFields = this.getNodeParameter('additionalFields', i);
+						let path = `${basePath}/${folderName}/`;
+
+						if (additionalFields.requesterPays) {
+							headers['x-amz-request-payer'] = 'requester';
+						}
+						if (additionalFields.parentFolderKey) {
+							path = `${basePath}/${additionalFields.parentFolderKey}/${folderName}/`;
+						}
+						if (additionalFields.storageClass) {
+							headers['x-amz-storage-class'] = snakeCase(
+								additionalFields.storageClass as string,
+							).toUpperCase();
+						}
+						responseData = await awsApiRequestREST.call(this, servicePath, 'GET', basePath, '', {
+							location: '',
+						});
+
+						const region = responseData.LocationConstraint._;
+
+						responseData = await awsApiRequestREST.call(
+							this,
+							servicePath,
+							'PUT',
+							path,
+							'',
+							qs,
+							headers,
+							{},
+							region as string,
+						);
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray({ success: true }),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
+					}
+					//https://docs.aws.amazon.com/AmazonS3/latest/API/API_DeleteObjects.html
+					if (operation === 'delete') {
+						const bucketName = this.getNodeParameter('bucketName', i) as string;
+						const servicePath = bucketName.includes('.') ? 's3' : `${bucketName}.s3`;
+						const basePath = bucketName.includes('.') ? `/${bucketName}` : '';
+						const folderKey = this.getNodeParameter('folderKey', i) as string;
+
+						responseData = await awsApiRequestREST.call(this, servicePath, 'GET', basePath, '', {
+							location: '',
+						});
+
+						const region = responseData.LocationConstraint._;
+
+						responseData = await awsApiRequestRESTAllItems.call(
+							this,
+							'ListBucketResult.Contents',
+							servicePath,
+							'GET',
+							basePath,
+							'',
+							{ 'list-type': 2, prefix: folderKey },
+							{},
+							{},
+							region as string,
+						);
+
+						// folder empty then just delete it
+						if (responseData.length === 0) {
+							responseData = await awsApiRequestREST.call(
+								this,
+								servicePath,
+								'DELETE',
+								`${basePath}/${folderKey}`,
+								'',
+								qs,
+								{},
+								{},
+								region as string,
+							);
+
+							responseData = { deleted: [{ Key: folderKey }] };
+						} else {
+							// delete everything inside the folder
+							const body: IDataObject = {
+								Delete: {
+									$: {
+										xmlns: 'http://s3.amazonaws.com/doc/2006-03-01/',
+									},
+									Object: [],
+								},
+							};
+
+							for (const childObject of responseData) {
+								//@ts-ignore
+								(body.Delete.Object as IDataObject[]).push({
+									Key: childObject.Key as string,
+								});
+							}
+
+							const builder = new Builder();
+							const data = builder.buildObject(body);
+
+							headers['Content-MD5'] = createHash('md5').update(data).digest('base64');
+
+							headers['Content-Type'] = 'application/xml';
+
+							responseData = await awsApiRequestREST.call(
+								this,
+								servicePath,
+								'POST',
+								`${basePath}/`,
+								data,
+								{ delete: '' },
+								headers,
+								{},
+								region as string,
+							);
+
+							responseData = { deleted: responseData.DeleteResult.Deleted };
+						}
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(responseData),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
+					}
+					//https://docs.aws.amazon.com/AmazonS3/latest/API/API_ListObjectsV2.html
+					if (operation === 'getAll') {
+						const bucketName = this.getNodeParameter('bucketName', i) as string;
+						const servicePath = bucketName.includes('.') ? 's3' : `${bucketName}.s3`;
+						const basePath = bucketName.includes('.') ? `/${bucketName}` : '';
+						const returnAll = this.getNodeParameter('returnAll', 0);
+						const options = this.getNodeParameter('options', 0);
+
+						if (options.folderKey) {
+							qs.prefix = options.folderKey as string;
+						}
+
+						if (options.fetchOwner) {
+							qs['fetch-owner'] = options.fetchOwner as string;
+						}
+
+						qs['list-type'] = 2;
+
+						responseData = await awsApiRequestREST.call(this, servicePath, 'GET', basePath, '', {
+							location: '',
+						});
+
+						const region = responseData.LocationConstraint._;
+
+						if (returnAll) {
+							responseData = await awsApiRequestRESTAllItems.call(
+								this,
+								'ListBucketResult.Contents',
+								servicePath,
+								'GET',
+								basePath,
+								'',
+								qs,
+								{},
+								{},
+								region as string,
+							);
+						} else {
+							qs.limit = this.getNodeParameter('limit', 0);
+							responseData = await awsApiRequestRESTAllItems.call(
+								this,
+								'ListBucketResult.Contents',
+								servicePath,
+								'GET',
+								basePath,
+								'',
+								qs,
+								{},
+								{},
+								region as string,
+							);
+						}
+						if (Array.isArray(responseData)) {
+							responseData = responseData.filter(
+								(e: IDataObject) =>
+									(e.Key as string).endsWith('/') && e.Size === '0' && e.Key !== options.folderKey,
+							);
+							if (qs.limit) {
+								responseData = responseData.splice(0, qs.limit as number);
+							}
+							const executionData = this.helpers.constructExecutionMetaData(
+								this.helpers.returnJsonArray(responseData),
+								{ itemData: { item: i } },
+							);
+							returnData.push(...executionData);
+						}
+					}
+				}
+				if (resource === 'file') {
+					//https://docs.aws.amazon.com/AmazonS3/latest/API/API_CopyObject.html
+					if (operation === 'copy') {
+						const sourcePath = this.getNodeParameter('sourcePath', i) as string;
+						const destinationPath = this.getNodeParameter('destinationPath', i) as string;
+						const additionalFields = this.getNodeParameter('additionalFields', i);
+
+						headers['x-amz-copy-source'] = sourcePath;
+
+						if (additionalFields.requesterPays) {
+							headers['x-amz-request-payer'] = 'requester';
+						}
+						if (additionalFields.storageClass) {
+							headers['x-amz-storage-class'] = snakeCase(
+								additionalFields.storageClass as string,
+							).toUpperCase();
+						}
+						if (additionalFields.acl) {
+							headers['x-amz-acl'] = paramCase(additionalFields.acl as string);
+						}
+						if (additionalFields.grantFullControl) {
+							headers['x-amz-grant-full-control'] = '';
+						}
+						if (additionalFields.grantRead) {
+							headers['x-amz-grant-read'] = '';
+						}
+						if (additionalFields.grantReadAcp) {
+							headers['x-amz-grant-read-acp'] = '';
+						}
+						if (additionalFields.grantWriteAcp) {
+							headers['x-amz-grant-write-acp'] = '';
+						}
+						if (additionalFields.lockLegalHold) {
+							headers['x-amz-object-lock-legal-hold'] = (additionalFields.lockLegalHold as boolean)
+								? 'ON'
+								: 'OFF';
+						}
+						if (additionalFields.lockMode) {
+							headers['x-amz-object-lock-mode'] = (
+								additionalFields.lockMode as string
+							).toUpperCase();
+						}
+						if (additionalFields.lockRetainUntilDate) {
+							headers['x-amz-object-lock-retain-until-date'] =
+								additionalFields.lockRetainUntilDate as string;
+						}
+						if (additionalFields.serverSideEncryption) {
+							headers['x-amz-server-side-encryption'] =
+								additionalFields.serverSideEncryption as string;
+						}
+						if (additionalFields.encryptionAwsKmsKeyId) {
+							headers['x-amz-server-side-encryption-aws-kms-key-id'] =
+								additionalFields.encryptionAwsKmsKeyId as string;
+						}
+						if (additionalFields.serverSideEncryptionContext) {
+							headers['x-amz-server-side-encryption-context'] =
+								additionalFields.serverSideEncryptionContext as string;
+						}
+						if (additionalFields.serversideEncryptionCustomerAlgorithm) {
+							headers['x-amz-server-side-encryption-customer-algorithm'] =
+								additionalFields.serversideEncryptionCustomerAlgorithm as string;
+						}
+						if (additionalFields.serversideEncryptionCustomerKey) {
+							headers['x-amz-server-side-encryption-customer-key'] =
+								additionalFields.serversideEncryptionCustomerKey as string;
+						}
+						if (additionalFields.serversideEncryptionCustomerKeyMD5) {
+							headers['x-amz-server-side-encryption-customer-key-MD5'] =
+								additionalFields.serversideEncryptionCustomerKeyMD5 as string;
+						}
+						if (additionalFields.taggingDirective) {
+							headers['x-amz-tagging-directive'] = (
+								additionalFields.taggingDirective as string
+							).toUpperCase();
+						}
+						if (additionalFields.metadataDirective) {
+							headers['x-amz-metadata-directive'] = (
+								additionalFields.metadataDirective as string
+							).toUpperCase();
+						}
+
+						const destinationParts = destinationPath.split('/');
+
+						const bucketName = destinationParts[1];
+						const servicePath = bucketName.includes('.') ? 's3' : `${bucketName}.s3`;
+						const basePath = bucketName.includes('.') ? `/${bucketName}` : '';
+
+						const destination = `${basePath}/${destinationParts
+							.slice(2, destinationParts.length)
+							.join('/')}`;
+
+						responseData = await awsApiRequestREST.call(this, servicePath, 'GET', basePath, '', {
+							location: '',
+						});
+
+						const region = responseData.LocationConstraint._;
+
+						responseData = await awsApiRequestREST.call(
+							this,
+							servicePath,
+							'PUT',
+							destination,
+							'',
+							qs,
+							headers,
+							{},
+							region as string,
+						);
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(responseData.CopyObjectResult as IDataObject[]),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
+					}
+					//https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetObject.html
+					if (operation === 'download') {
+						const bucketName = this.getNodeParameter('bucketName', i) as string;
+						const servicePath = bucketName.includes('.') ? 's3' : `${bucketName}.s3`;
+						const basePath = bucketName.includes('.') ? `/${bucketName}` : '';
+
+						const fileKey = this.getNodeParameter('fileKey', i) as string;
+
+						const fileName = fileKey.split('/')[fileKey.split('/').length - 1];
+
+						if (fileKey.substring(fileKey.length - 1) === '/') {
+							throw new NodeOperationError(
+								this.getNode(),
+								'Downloading a whole directory is not yet supported, please provide a file key',
+							);
+						}
+
+						let region = await awsApiRequestREST.call(this, servicePath, 'GET', basePath, '', {
+							location: '',
+						});
+
+						region = region.LocationConstraint._;
+
+						const response = await awsApiRequestREST.call(
+							this,
+							servicePath,
+							'GET',
+							`${basePath}/${fileKey}`,
+							'',
+							qs,
+							{},
+							{ encoding: null, resolveWithFullResponse: true },
+							region as string,
+						);
+
+						let mimeType: string | undefined;
+						if (response.headers['content-type']) {
+							mimeType = response.headers['content-type'];
+						}
+
+						const newItem: INodeExecutionData = {
+							json: items[i].json,
+							binary: {},
+						};
+
+						if (items[i].binary !== undefined && newItem.binary) {
+							// Create a shallow copy of the binary data so that the old
+							// data references which do not get changed still stay behind
+							// but the incoming data does not get changed.
+							Object.assign(newItem.binary, items[i].binary);
+						}
+
+						items[i] = newItem;
+
+						const dataPropertyNameDownload = this.getNodeParameter('binaryPropertyName', i);
+
+						const data = Buffer.from(response.body as string, 'utf8');
+
+						items[i].binary![dataPropertyNameDownload] = await this.helpers.prepareBinaryData(
+							data as unknown as Buffer,
+							fileName,
+							mimeType,
+						);
+					}
+					//https://docs.aws.amazon.com/AmazonS3/latest/API/API_DeleteObject.html
+					if (operation === 'delete') {
+						const bucketName = this.getNodeParameter('bucketName', i) as string;
+						const servicePath = bucketName.includes('.') ? 's3' : `${bucketName}.s3`;
+						const basePath = bucketName.includes('.') ? `/${bucketName}` : '';
+
+						const fileKey = this.getNodeParameter('fileKey', i) as string;
+
+						const options = this.getNodeParameter('options', i);
+
+						if (options.versionId) {
+							qs.versionId = options.versionId as string;
+						}
+
+						responseData = await awsApiRequestREST.call(this, servicePath, 'GET', basePath, '', {
+							location: '',
+						});
+
+						const region = responseData.LocationConstraint._;
+
+						responseData = await awsApiRequestREST.call(
+							this,
+							servicePath,
+							'DELETE',
+							`${basePath}/${fileKey}`,
+							'',
+							qs,
+							{},
+							{},
+							region as string,
+						);
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray({ success: true }),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
+					}
+					//https://docs.aws.amazon.com/AmazonS3/latest/API/API_ListObjectsV2.html
+					if (operation === 'getAll') {
+						const bucketName = this.getNodeParameter('bucketName', i) as string;
+						const servicePath = bucketName.includes('.') ? 's3' : `${bucketName}.s3`;
+						const basePath = bucketName.includes('.') ? `/${bucketName}` : '';
+						const returnAll = this.getNodeParameter('returnAll', 0);
+						const options = this.getNodeParameter('options', 0);
+
+						if (options.folderKey) {
+							qs.prefix = options.folderKey as string;
+						}
+
+						if (options.fetchOwner) {
+							qs['fetch-owner'] = options.fetchOwner as string;
+						}
+
+						qs.delimiter = '/';
+
+						qs['list-type'] = 2;
+
+						responseData = await awsApiRequestREST.call(this, servicePath, 'GET', basePath, '', {
+							location: '',
+						});
+
+						const region = responseData.LocationConstraint._;
+
+						if (returnAll) {
+							responseData = await awsApiRequestRESTAllItems.call(
+								this,
+								'ListBucketResult.Contents',
+								servicePath,
+								'GET',
+								basePath,
+								'',
+								qs,
+								{},
+								{},
+								region as string,
+							);
+						} else {
+							qs.limit = this.getNodeParameter('limit', 0);
+							responseData = await awsApiRequestRESTAllItems.call(
+								this,
+								'ListBucketResult.Contents',
+								servicePath,
+								'GET',
+								basePath,
+								'',
+								qs,
+								{},
+								{},
+								region as string,
+							);
+							responseData = responseData.splice(0, qs.limit);
+						}
+						if (Array.isArray(responseData)) {
+							responseData = responseData.filter(
+								(e: IDataObject) => !(e.Key as string).endsWith('/') && e.Size !== '0',
+							);
+							if (qs.limit) {
+								responseData = responseData.splice(0, qs.limit as number);
+							}
+							const executionData = this.helpers.constructExecutionMetaData(
+								this.helpers.returnJsonArray(responseData),
+								{ itemData: { item: i } },
+							);
+							returnData.push(...executionData);
+						}
+					}
+					//https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutObject.html
+					if (operation === 'upload') {
+						const bucketName = this.getNodeParameter('bucketName', i) as string;
+						const servicePath = bucketName.includes('.') ? 's3' : `${bucketName}.s3`;
+						const basePath = bucketName.includes('.') ? `/${bucketName}` : '';
+						const fileName = this.getNodeParameter('fileName', i) as string;
+						const isBinaryData = this.getNodeParameter('binaryData', i);
+						const additionalFields = this.getNodeParameter('additionalFields', i);
+						const tagsValues = (this.getNodeParameter('tagsUi', i) as IDataObject)
+							.tagsValues as IDataObject[];
+						let path = `${basePath}/${fileName}`;
+						let body;
+
+						const multipartHeaders: IDataObject = {};
+						const neededHeaders: IDataObject = {};
+
+						if (additionalFields.requesterPays) {
+							neededHeaders['x-amz-request-payer'] = 'requester';
+						}
+						if (additionalFields.parentFolderKey) {
+							path = `${basePath}/${additionalFields.parentFolderKey}/${fileName}`;
+						}
+						if (additionalFields.storageClass) {
+							multipartHeaders['x-amz-storage-class'] = snakeCase(
+								additionalFields.storageClass as string,
+							).toUpperCase();
+						}
+
+						if (additionalFields.acl) {
+							multipartHeaders['x-amz-acl'] = paramCase(additionalFields.acl as string);
+						}
+						if (additionalFields.grantFullControl) {
+							multipartHeaders['x-amz-grant-full-control'] = '';
+						}
+						if (additionalFields.grantRead) {
+							multipartHeaders['x-amz-grant-read'] = '';
+						}
+						if (additionalFields.grantReadAcp) {
+							multipartHeaders['x-amz-grant-read-acp'] = '';
+						}
+						if (additionalFields.grantWriteAcp) {
+							multipartHeaders['x-amz-grant-write-acp'] = '';
+						}
+						if (additionalFields.lockLegalHold) {
+							multipartHeaders['x-amz-object-lock-legal-hold'] =
+								(additionalFields.lockLegalHold as boolean) ? 'ON' : 'OFF';
+						}
+						if (additionalFields.lockMode) {
+							multipartHeaders['x-amz-object-lock-mode'] = (
+								additionalFields.lockMode as string
+							).toUpperCase();
+						}
+						if (additionalFields.lockRetainUntilDate) {
+							multipartHeaders['x-amz-object-lock-retain-until-date'] =
+								additionalFields.lockRetainUntilDate as string;
+						}
+						if (additionalFields.serverSideEncryption) {
+							neededHeaders['x-amz-server-side-encryption'] =
+								additionalFields.serverSideEncryption as string;
+						}
+						if (additionalFields.encryptionAwsKmsKeyId) {
+							neededHeaders['x-amz-server-side-encryption-aws-kms-key-id'] =
+								additionalFields.encryptionAwsKmsKeyId as string;
+						}
+						if (additionalFields.serverSideEncryptionContext) {
+							neededHeaders['x-amz-server-side-encryption-context'] =
+								additionalFields.serverSideEncryptionContext as string;
+						}
+						if (additionalFields.serversideEncryptionCustomerAlgorithm) {
+							neededHeaders['x-amz-server-side-encryption-customer-algorithm'] =
+								additionalFields.serversideEncryptionCustomerAlgorithm as string;
+						}
+						if (additionalFields.serversideEncryptionCustomerKey) {
+							neededHeaders['x-amz-server-side-encryption-customer-key'] =
+								additionalFields.serversideEncryptionCustomerKey as string;
+						}
+						if (additionalFields.serversideEncryptionCustomerKeyMD5) {
+							neededHeaders['x-amz-server-side-encryption-customer-key-MD5'] =
+								additionalFields.serversideEncryptionCustomerKeyMD5 as string;
+						}
+						if (tagsValues) {
+							const tags: string[] = [];
+							tagsValues.forEach((o: IDataObject) => {
+								tags.push(`${o.key}=${o.value}`);
+							});
+							multipartHeaders['x-amz-tagging'] = tags.join('&');
+						}
+						// Get the region of the bucket
+						responseData = await awsApiRequestREST.call(this, servicePath, 'GET', basePath, '', {
+							location: '',
+						});
+						const region = responseData.LocationConstraint._;
+
+						if (isBinaryData) {
+							const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i);
+							const binaryPropertyData = this.helpers.assertBinaryData(i, binaryPropertyName);
+							let uploadData: Buffer | Readable;
+							multipartHeaders['Content-Type'] = binaryPropertyData.mimeType;
+							if (binaryPropertyData.id) {
+								uploadData = await this.helpers.getBinaryStream(
+									binaryPropertyData.id,
+									UPLOAD_CHUNK_SIZE,
+								);
+								const createMultiPartUpload = await awsApiRequestREST.call(
+									this,
+									servicePath,
+									'POST',
+									`${path}?uploads`,
+									body,
+									qs,
+									{ ...neededHeaders, ...multipartHeaders },
+									{},
+									region as string,
+								);
+
+								const uploadId = createMultiPartUpload.InitiateMultipartUploadResult.UploadId;
+								let part = 1;
+								for await (const chunk of uploadData) {
+									const chunkBuffer = await this.helpers.binaryToBuffer(chunk as Readable);
+									const listHeaders: IDataObject = {
+										'Content-Length': chunk.length,
+										'Content-MD5': createHash('MD5').update(chunkBuffer).digest('base64'),
+										...neededHeaders,
+									};
+									try {
+										await awsApiRequestREST.call(
+											this,
+											servicePath,
+											'PUT',
+											`${path}?partNumber=${part}&uploadId=${uploadId}`,
+											chunk,
+											qs,
+											listHeaders,
+											{},
+											region as string,
+										);
+										part++;
+									} catch (error) {
+										try {
+											await awsApiRequestREST.call(
+												this,
+												servicePath,
+												'DELETE',
+												`${path}?uploadId=${uploadId}`,
+											);
+										} catch (err) {
+											throw new NodeOperationError(this.getNode(), err as Error);
+										}
+										if (error.response?.status !== 308) throw error;
+									}
+								}
+
+								const listParts = (await awsApiRequestREST.call(
+									this,
+									servicePath,
+									'GET',
+									`${path}?max-parts=${900}&part-number-marker=0&uploadId=${uploadId}`,
+									'',
+									qs,
+									{ ...neededHeaders },
+									{},
+									region as string,
+								)) as {
+									ListPartsResult: {
+										Part:
+											| Array<{
+													ETag: string;
+													PartNumber: number;
+											  }>
+											| {
+													ETag: string;
+													PartNumber: number;
+											  };
+									};
+								};
+								if (!Array.isArray(listParts.ListPartsResult.Part)) {
+									body = {
+										CompleteMultipartUpload: {
+											$: {
+												xmlns: 'http://s3.amazonaws.com/doc/2006-03-01/',
+											},
+											Part: {
+												ETag: listParts.ListPartsResult.Part.ETag,
+												PartNumber: listParts.ListPartsResult.Part.PartNumber,
+											},
+										},
+									};
+								} else {
+									body = {
+										CompleteMultipartUpload: {
+											$: {
+												xmlns: 'http://s3.amazonaws.com/doc/2006-03-01/',
+											},
+											Part: listParts.ListPartsResult.Part.map((Part) => {
+												return {
+													ETag: Part.ETag,
+													PartNumber: Part.PartNumber,
+												};
+											}),
+										},
+									};
+								}
+								const builder = new Builder();
+								const data = builder.buildObject(body);
+								const completeUpload = (await awsApiRequestREST.call(
+									this,
+									servicePath,
+									'POST',
+									`${path}?uploadId=${uploadId}`,
+									data,
+									qs,
+									{
+										...neededHeaders,
+										'Content-MD5': createHash('md5').update(data).digest('base64'),
+										'Content-Type': 'application/xml',
+									},
+									{},
+									region as string,
+								)) as {
+									CompleteMultipartUploadResult: {
+										Location: string;
+										Bucket: string;
+										Key: string;
+										ETag: string;
+									};
+								};
+								responseData = {
+									...completeUpload.CompleteMultipartUploadResult,
+								};
+							} else {
+								const binaryDataBuffer = await this.helpers.getBinaryDataBuffer(
+									i,
+									binaryPropertyName,
+								);
+
+								body = binaryDataBuffer;
+								headers = { ...neededHeaders, ...multipartHeaders };
+								headers['Content-Type'] = binaryPropertyData.mimeType;
+
+								headers['Content-MD5'] = createHash('md5').update(body).digest('base64');
+
+								responseData = await awsApiRequestREST.call(
+									this,
+									servicePath,
+									'PUT',
+									path,
+									body,
+									qs,
+									headers,
+									{},
+									region as string,
+								);
+							}
+							const executionData = this.helpers.constructExecutionMetaData(
+								this.helpers.returnJsonArray(responseData ?? { success: true }),
+								{ itemData: { item: i } },
+							);
+							returnData.push(...executionData);
+						} else {
+							const fileContent = this.getNodeParameter('fileContent', i) as string;
+
+							body = Buffer.from(fileContent, 'utf8');
+
+							headers = { ...neededHeaders, ...multipartHeaders };
+
+							headers['Content-Type'] = 'text/html';
+
+							headers['Content-MD5'] = createHash('md5').update(fileContent).digest('base64');
+
+							responseData = await awsApiRequestREST.call(
+								this,
+								servicePath,
+								'PUT',
+								path,
+								body,
+								qs,
+								{ ...headers },
+								{},
+								region as string,
+							);
+							const executionData = this.helpers.constructExecutionMetaData(
+								this.helpers.returnJsonArray({ success: true }),
+								{ itemData: { item: i } },
+							);
+							returnData.push(...executionData);
+						}
+					}
+				}
+			} catch (error) {
+				if (this.continueOnFail()) {
+					const executionData = this.helpers.constructExecutionMetaData(
+						this.helpers.returnJsonArray({ error: error.message }),
+						{ itemData: { item: i } },
+					);
+					returnData.push(...executionData);
+					continue;
+				}
+				throw error;
+			}
+		}
+		if (resource === 'file' && operation === 'download') {
+			// For file downloads the files get attached to the existing items
+			return [items];
+		} else {
+			return [returnData];
+		}
+	}
+}
diff --git a/packages/nodes-base/nodes/Aws/S3/V2/BucketDescription.ts b/packages/nodes-base/nodes/Aws/S3/V2/BucketDescription.ts
new file mode 100644
index 0000000000000..1fba6ba5074a8
--- /dev/null
+++ b/packages/nodes-base/nodes/Aws/S3/V2/BucketDescription.ts
@@ -0,0 +1,321 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+export const bucketOperations: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				resource: ['bucket'],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a bucket',
+				action: 'Create a bucket',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a bucket',
+				action: 'Delete a bucket',
+			},
+			{
+				name: 'Get Many',
+				value: 'getAll',
+				description: 'Get many buckets',
+				action: 'Get many buckets',
+			},
+			{
+				name: 'Search',
+				value: 'search',
+				description: 'Search within a bucket',
+				action: 'Search a bucket',
+			},
+		],
+		default: 'create',
+	},
+];
+
+export const bucketFields: INodeProperties[] = [
+	/* -------------------------------------------------------------------------- */
+	/*                                bucket:create                               */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Name',
+		name: 'name',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: ['bucket'],
+				operation: ['create'],
+			},
+		},
+		description: 'A succinct description of the nature, symptoms, cause, or effect of the bucket',
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		displayOptions: {
+			show: {
+				resource: ['bucket'],
+				operation: ['create'],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'ACL',
+				name: 'acl',
+				type: 'options',
+				options: [
+					{
+						name: 'Authenticated Read',
+						value: 'authenticatedRead',
+					},
+					{
+						name: 'Private',
+						value: 'Private',
+					},
+					{
+						name: 'Public Read',
+						value: 'publicRead',
+					},
+					{
+						name: 'Public Read Write',
+						value: 'publicReadWrite',
+					},
+				],
+				default: '',
+				description: 'The canned ACL to apply to the bucket',
+			},
+			{
+				displayName: 'Bucket Object Lock Enabled',
+				name: 'bucketObjectLockEnabled',
+				type: 'boolean',
+				default: false,
+				description: 'Whether you want S3 Object Lock to be enabled for the new bucket',
+			},
+			{
+				displayName: 'Grant Full Control',
+				name: 'grantFullControl',
+				type: 'boolean',
+				default: false,
+				description:
+					'Whether to allow grantee the read, write, read ACP, and write ACP permissions on the bucket',
+			},
+			{
+				displayName: 'Grant Read',
+				name: 'grantRead',
+				type: 'boolean',
+				default: false,
+				description: 'Whether to allow grantee to list the objects in the bucket',
+			},
+			{
+				displayName: 'Grant Read ACP',
+				name: 'grantReadAcp',
+				type: 'boolean',
+				default: false,
+				description: 'Whether to allow grantee to read the bucket ACL',
+			},
+			{
+				displayName: 'Grant Write',
+				name: 'grantWrite',
+				type: 'boolean',
+				default: false,
+				description:
+					'Whether to allow grantee to create, overwrite, and delete any object in the bucket',
+			},
+			{
+				displayName: 'Grant Write ACP',
+				name: 'grantWriteAcp',
+				type: 'boolean',
+				default: false,
+				description: 'Whether to allow grantee to write the ACL for the applicable bucket',
+			},
+			{
+				displayName: 'Region',
+				name: 'region',
+				type: 'string',
+				default: '',
+				description:
+					'Region you want to create the bucket in, by default the buckets are created on the region defined on the credentials',
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                bucket:delete                               */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Name',
+		name: 'name',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: ['bucket'],
+				operation: ['delete'],
+			},
+		},
+		description: 'Name of the AWS S3 bucket to delete',
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                 bucket:getAll                              */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				operation: ['getAll'],
+				resource: ['bucket'],
+			},
+		},
+		default: false,
+		description: 'Whether to return all results or only up to a given limit',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				operation: ['getAll'],
+				resource: ['bucket'],
+				returnAll: [false],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 500,
+		},
+		default: 100,
+		description: 'Max number of results to return',
+	},
+	/* -------------------------------------------------------------------------- */
+	/*                                 bucket:search                              */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Bucket Name',
+		name: 'bucketName',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: ['bucket'],
+				operation: ['search'],
+			},
+		},
+	},
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				operation: ['search'],
+				resource: ['bucket'],
+			},
+		},
+		default: false,
+		description: 'Whether to return all results or only up to a given limit',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				operation: ['search'],
+				resource: ['bucket'],
+				returnAll: [false],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 500,
+		},
+		default: 100,
+		description: 'Max number of results to return',
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		displayOptions: {
+			show: {
+				resource: ['bucket'],
+				operation: ['search'],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Delimiter',
+				name: 'delimiter',
+				type: 'string',
+				default: '',
+				description: 'A delimiter is a character you use to group keys',
+			},
+			{
+				displayName: 'Encoding Type',
+				name: 'encodingType',
+				type: 'options',
+				options: [
+					{
+						name: 'URL',
+						value: 'url',
+					},
+				],
+				default: '',
+				description: 'Encoding type used by Amazon S3 to encode object keys in the response',
+			},
+			{
+				displayName: 'Fetch Owner',
+				name: 'fetchOwner',
+				type: 'boolean',
+				default: false,
+				// eslint-disable-next-line n8n-nodes-base/node-param-description-boolean-without-whether
+				description:
+					'The owner field is not present in listV2 by default, if you want to return owner field with each key in the result then set the fetch owner field to true',
+			},
+			{
+				displayName: 'Prefix',
+				name: 'prefix',
+				type: 'string',
+				default: '',
+				description: 'Limits the response to keys that begin with the specified prefix',
+			},
+			{
+				displayName: 'Requester Pays',
+				name: 'requesterPays',
+				type: 'boolean',
+				default: false,
+				description:
+					'Whether the requester will pay for requests and data transfer. While Requester Pays is enabled, anonymous access to this bucket is disabled.',
+			},
+			{
+				displayName: 'Start After',
+				name: 'startAfter',
+				type: 'string',
+				default: '',
+				description:
+					'StartAfter is where you want Amazon S3 to start listing from. Amazon S3 starts listing after this specified key.',
+			},
+		],
+	},
+];
diff --git a/packages/nodes-base/nodes/Aws/S3/V2/FileDescription.ts b/packages/nodes-base/nodes/Aws/S3/V2/FileDescription.ts
new file mode 100644
index 0000000000000..a6c1cbd6c7a04
--- /dev/null
+++ b/packages/nodes-base/nodes/Aws/S3/V2/FileDescription.ts
@@ -0,0 +1,841 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+export const fileOperations: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				resource: ['file'],
+			},
+		},
+		options: [
+			{
+				name: 'Copy',
+				value: 'copy',
+				description: 'Copy a file',
+				action: 'Copy a file',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a file',
+				action: 'Delete a file',
+			},
+			{
+				name: 'Download',
+				value: 'download',
+				description: 'Download a file',
+				action: 'Download a file',
+			},
+			{
+				name: 'Get Many',
+				value: 'getAll',
+				description: 'Get many files',
+				action: 'Get many files',
+			},
+			{
+				name: 'Upload',
+				value: 'upload',
+				description: 'Upload a file',
+				action: 'Upload a file',
+			},
+		],
+		default: 'download',
+	},
+];
+
+export const fileFields: INodeProperties[] = [
+	/* -------------------------------------------------------------------------- */
+	/*                                file:copy                                   */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Source Path',
+		name: 'sourcePath',
+		type: 'string',
+		required: true,
+		default: '',
+		placeholder: '/bucket/my-image.jpg',
+		displayOptions: {
+			show: {
+				resource: ['file'],
+				operation: ['copy'],
+			},
+		},
+		description:
+			'The name of the source bucket should start with (/) and key name of the source object, separated by a slash (/)',
+	},
+	{
+		displayName: 'Destination Path',
+		name: 'destinationPath',
+		type: 'string',
+		required: true,
+		default: '',
+		placeholder: '/bucket/my-second-image.jpg',
+		displayOptions: {
+			show: {
+				resource: ['file'],
+				operation: ['copy'],
+			},
+		},
+		description:
+			'The name of the destination bucket and key name of the destination object, separated by a slash (/)',
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		displayOptions: {
+			show: {
+				resource: ['file'],
+				operation: ['copy'],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'ACL',
+				name: 'acl',
+				type: 'options',
+				options: [
+					{
+						name: 'Authenticated Read',
+						value: 'authenticatedRead',
+					},
+					{
+						name: 'AWS Exec Read',
+						value: 'awsExecRead',
+					},
+					{
+						name: 'Bucket Owner Full Control',
+						value: 'bucketOwnerFullControl',
+					},
+					{
+						name: 'Bucket Owner Read',
+						value: 'bucketOwnerRead',
+					},
+					{
+						name: 'Private',
+						value: 'private',
+					},
+					{
+						name: 'Public Read',
+						value: 'publicRead',
+					},
+					{
+						name: 'Public Read Write',
+						value: 'publicReadWrite',
+					},
+				],
+				default: 'private',
+				description: 'The canned ACL to apply to the object',
+			},
+			{
+				displayName: 'Grant Full Control',
+				name: 'grantFullControl',
+				type: 'boolean',
+				default: false,
+				description:
+					'Whether to give the grantee READ, READ_ACP, and WRITE_ACP permissions on the object',
+			},
+			{
+				displayName: 'Grant Read',
+				name: 'grantRead',
+				type: 'boolean',
+				default: false,
+				description: 'Whether to allow grantee to read the object data and its metadata',
+			},
+			{
+				displayName: 'Grant Read ACP',
+				name: 'grantReadAcp',
+				type: 'boolean',
+				default: false,
+				description: 'Whether to allow grantee to read the object ACL',
+			},
+			{
+				displayName: 'Grant Write ACP',
+				name: 'grantWriteAcp',
+				type: 'boolean',
+				default: false,
+				description: 'Whether to allow grantee to write the ACL for the applicable object',
+			},
+			{
+				displayName: 'Lock Legal Hold',
+				name: 'lockLegalHold',
+				type: 'boolean',
+				default: false,
+				description: 'Whether a legal hold will be applied to this object',
+			},
+			{
+				displayName: 'Lock Mode',
+				name: 'lockMode',
+				type: 'options',
+				options: [
+					{
+						name: 'Governance',
+						value: 'governance',
+					},
+					{
+						name: 'Compliance',
+						value: 'compliance',
+					},
+				],
+				default: '',
+				description: 'The Object Lock mode that you want to apply to this object',
+			},
+			{
+				displayName: 'Lock Retain Until Date',
+				name: 'lockRetainUntilDate',
+				type: 'dateTime',
+				default: '',
+				description: "The date and time when you want this object's Object Lock to expire",
+			},
+			{
+				displayName: 'Metadata Directive',
+				name: 'metadataDirective',
+				type: 'options',
+				options: [
+					{
+						name: 'Copy',
+						value: 'copy',
+					},
+					{
+						name: 'Replace',
+						value: 'replace',
+					},
+				],
+				default: '',
+				description:
+					'Specifies whether the metadata is copied from the source object or replaced with metadata provided in the request',
+			},
+			{
+				displayName: 'Requester Pays',
+				name: 'requesterPays',
+				type: 'boolean',
+				default: false,
+				description:
+					'Whether the requester will pay for requests and data transfer. While Requester Pays is enabled, anonymous access to this bucket is disabled.',
+			},
+			{
+				displayName: 'Server Side Encryption',
+				name: 'serverSideEncryption',
+				type: 'options',
+				options: [
+					{
+						name: 'AES256',
+						value: 'AES256',
+					},
+					{
+						name: 'AWS:KMS',
+						value: 'aws:kms',
+					},
+				],
+				default: '',
+				description:
+					'The server-side encryption algorithm used when storing this object in Amazon S3',
+			},
+			{
+				displayName: 'Server Side Encryption Context',
+				name: 'serverSideEncryptionContext',
+				type: 'string',
+				default: '',
+				description: 'Specifies the AWS KMS Encryption Context to use for object encryption',
+			},
+			{
+				displayName: 'Server Side Encryption AWS KMS Key ID',
+				name: 'encryptionAwsKmsKeyId',
+				type: 'string',
+				default: '',
+				description: 'If x-amz-server-side-encryption is present and has the value of aws:kms',
+			},
+			{
+				displayName: 'Server Side Encryption Customer Algorithm',
+				name: 'serversideEncryptionCustomerAlgorithm',
+				type: 'string',
+				default: '',
+				description:
+					'Specifies the algorithm to use to when encrypting the object (for example, AES256)',
+			},
+			{
+				displayName: 'Server Side Encryption Customer Key',
+				name: 'serversideEncryptionCustomerKey',
+				type: 'string',
+				default: '',
+				description:
+					'Specifies the customer-provided encryption key for Amazon S3 to use in encrypting data',
+			},
+			{
+				displayName: 'Server Side Encryption Customer Key MD5',
+				name: 'serversideEncryptionCustomerKeyMD5',
+				type: 'string',
+				default: '',
+				description: 'Specifies the 128-bit MD5 digest of the encryption key according to RFC 1321',
+			},
+			{
+				displayName: 'Storage Class',
+				name: 'storageClass',
+				type: 'options',
+				options: [
+					{
+						name: 'Deep Archive',
+						value: 'deepArchive',
+					},
+					{
+						name: 'Glacier',
+						value: 'glacier',
+					},
+					{
+						name: 'Intelligent Tiering',
+						value: 'intelligentTiering',
+					},
+					{
+						name: 'One Zone IA',
+						value: 'onezoneIA',
+					},
+					{
+						name: 'Standard',
+						value: 'standard',
+					},
+					{
+						name: 'Standard IA',
+						value: 'standardIA',
+					},
+				],
+				default: 'standard',
+				description: 'Amazon S3 storage classes',
+			},
+			{
+				displayName: 'Tagging Directive',
+				name: 'taggingDirective',
+				type: 'options',
+				options: [
+					{
+						name: 'Copy',
+						value: 'copy',
+					},
+					{
+						name: 'Replace',
+						value: 'replace',
+					},
+				],
+				default: '',
+				description:
+					'Specifies whether the metadata is copied from the source object or replaced with metadata provided in the request',
+			},
+		],
+	},
+	/* -------------------------------------------------------------------------- */
+	/*                                file:upload                                 */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Bucket Name',
+		name: 'bucketName',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: ['file'],
+				operation: ['upload'],
+			},
+		},
+	},
+	{
+		displayName: 'File Name',
+		name: 'fileName',
+		type: 'string',
+		default: '',
+		placeholder: 'hello.txt',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: ['file'],
+				operation: ['upload'],
+				binaryData: [false],
+			},
+		},
+	},
+	{
+		displayName: 'File Name',
+		name: 'fileName',
+		type: 'string',
+		default: '',
+		displayOptions: {
+			show: {
+				resource: ['file'],
+				operation: ['upload'],
+				binaryData: [true],
+			},
+		},
+		description: 'If not set the binary data filename will be used',
+	},
+	{
+		displayName: 'Binary File',
+		name: 'binaryData',
+		type: 'boolean',
+		default: true,
+		displayOptions: {
+			show: {
+				operation: ['upload'],
+				resource: ['file'],
+			},
+		},
+		description: 'Whether the data to upload should be taken from binary field',
+	},
+	{
+		displayName: 'File Content',
+		name: 'fileContent',
+		type: 'string',
+		default: '',
+		displayOptions: {
+			show: {
+				operation: ['upload'],
+				resource: ['file'],
+				binaryData: [false],
+			},
+		},
+		placeholder: '',
+		description: 'The text content of the file to upload',
+	},
+	{
+		displayName: 'Input Binary Field',
+		name: 'binaryPropertyName',
+		type: 'string',
+		default: 'data',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: ['upload'],
+				resource: ['file'],
+				binaryData: [true],
+			},
+		},
+		placeholder: '',
+		hint: 'The name of the input binary field containing the file to be uploaded',
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		displayOptions: {
+			show: {
+				resource: ['file'],
+				operation: ['upload'],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'ACL',
+				name: 'acl',
+				type: 'options',
+				options: [
+					{
+						name: 'Authenticated Read',
+						value: 'authenticatedRead',
+					},
+					{
+						name: 'AWS Exec Read',
+						value: 'awsExecRead',
+					},
+					{
+						name: 'Bucket Owner Full Control',
+						value: 'bucketOwnerFullControl',
+					},
+					{
+						name: 'Bucket Owner Read',
+						value: 'bucketOwnerRead',
+					},
+					{
+						name: 'Private',
+						value: 'private',
+					},
+					{
+						name: 'Public Read',
+						value: 'publicRead',
+					},
+					{
+						name: 'Public Read Write',
+						value: 'publicReadWrite',
+					},
+				],
+				default: 'private',
+				description: 'The canned ACL to apply to the object',
+			},
+			{
+				displayName: 'Grant Full Control',
+				name: 'grantFullControl',
+				type: 'boolean',
+				default: false,
+				description:
+					'Whether to give the grantee READ, READ_ACP, and WRITE_ACP permissions on the object',
+			},
+			{
+				displayName: 'Grant Read',
+				name: 'grantRead',
+				type: 'boolean',
+				default: false,
+				description: 'Whether to allow grantee to read the object data and its metadata',
+			},
+			{
+				displayName: 'Grant Read ACP',
+				name: 'grantReadAcp',
+				type: 'boolean',
+				default: false,
+				description: 'Whether to allow grantee to read the object ACL',
+			},
+			{
+				displayName: 'Grant Write ACP',
+				name: 'grantWriteAcp',
+				type: 'boolean',
+				default: false,
+				description: 'Whether to allow grantee to write the ACL for the applicable object',
+			},
+			{
+				displayName: 'Lock Legal Hold',
+				name: 'lockLegalHold',
+				type: 'boolean',
+				default: false,
+				description: 'Whether a legal hold will be applied to this object',
+			},
+			{
+				displayName: 'Lock Mode',
+				name: 'lockMode',
+				type: 'options',
+				options: [
+					{
+						name: 'Governance',
+						value: 'governance',
+					},
+					{
+						name: 'Compliance',
+						value: 'compliance',
+					},
+				],
+				default: '',
+				description: 'The Object Lock mode that you want to apply to this object',
+			},
+			{
+				displayName: 'Lock Retain Until Date',
+				name: 'lockRetainUntilDate',
+				type: 'dateTime',
+				default: '',
+				description: "The date and time when you want this object's Object Lock to expire",
+			},
+			{
+				displayName: 'Parent Folder Key',
+				name: 'parentFolderKey',
+				type: 'string',
+				default: '',
+				description: 'Parent folder you want to create the file in',
+			},
+			{
+				displayName: 'Requester Pays',
+				name: 'requesterPays',
+				type: 'boolean',
+				default: false,
+				description:
+					'Whether the requester will pay for requests and data transfer. While Requester Pays is enabled, anonymous access to this bucket is disabled.',
+			},
+			{
+				displayName: 'Server Side Encryption',
+				name: 'serverSideEncryption',
+				type: 'options',
+				options: [
+					{
+						name: 'AES256',
+						value: 'AES256',
+					},
+					{
+						name: 'AWS:KMS',
+						value: 'aws:kms',
+					},
+				],
+				default: '',
+				description:
+					'The server-side encryption algorithm used when storing this object in Amazon S3',
+			},
+			{
+				displayName: 'Server Side Encryption Context',
+				name: 'serverSideEncryptionContext',
+				type: 'string',
+				default: '',
+				description: 'Specifies the AWS KMS Encryption Context to use for object encryption',
+			},
+			{
+				displayName: 'Server Side Encryption AWS KMS Key ID',
+				name: 'encryptionAwsKmsKeyId',
+				type: 'string',
+				default: '',
+				description: 'If x-amz-server-side-encryption is present and has the value of aws:kms',
+			},
+			{
+				displayName: 'Server Side Encryption Customer Algorithm',
+				name: 'serversideEncryptionCustomerAlgorithm',
+				type: 'string',
+				default: '',
+				description:
+					'Specifies the algorithm to use to when encrypting the object (for example, AES256)',
+			},
+			{
+				displayName: 'Server Side Encryption Customer Key',
+				name: 'serversideEncryptionCustomerKey',
+				type: 'string',
+				default: '',
+				description:
+					'Specifies the customer-provided encryption key for Amazon S3 to use in encrypting data',
+			},
+			{
+				displayName: 'Server Side Encryption Customer Key MD5',
+				name: 'serversideEncryptionCustomerKeyMD5',
+				type: 'string',
+				default: '',
+				description: 'Specifies the 128-bit MD5 digest of the encryption key according to RFC 1321',
+			},
+			{
+				displayName: 'Storage Class',
+				name: 'storageClass',
+				type: 'options',
+				options: [
+					{
+						name: 'Deep Archive',
+						value: 'deepArchive',
+					},
+					{
+						name: 'Glacier',
+						value: 'glacier',
+					},
+					{
+						name: 'Intelligent Tiering',
+						value: 'intelligentTiering',
+					},
+					{
+						name: 'One Zone IA',
+						value: 'onezoneIA',
+					},
+					{
+						name: 'Standard',
+						value: 'standard',
+					},
+					{
+						name: 'Standard IA',
+						value: 'standardIA',
+					},
+				],
+				default: 'standard',
+				description: 'Amazon S3 storage classes',
+			},
+		],
+	},
+	{
+		displayName: 'Tags',
+		name: 'tagsUi',
+		placeholder: 'Add Tag',
+		type: 'fixedCollection',
+		default: {},
+		typeOptions: {
+			multipleValues: true,
+		},
+		displayOptions: {
+			show: {
+				resource: ['file'],
+				operation: ['upload'],
+			},
+		},
+		options: [
+			{
+				name: 'tagsValues',
+				displayName: 'Tag',
+				values: [
+					{
+						displayName: 'Key',
+						name: 'key',
+						type: 'string',
+						default: '',
+					},
+					{
+						displayName: 'Value',
+						name: 'value',
+						type: 'string',
+						default: '',
+					},
+				],
+			},
+		],
+		description: 'Optional extra headers to add to the message (most headers are allowed)',
+	},
+	/* -------------------------------------------------------------------------- */
+	/*                                file:download                               */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Bucket Name',
+		name: 'bucketName',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: ['file'],
+				operation: ['download'],
+			},
+		},
+	},
+	{
+		displayName: 'File Key',
+		name: 'fileKey',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: ['file'],
+				operation: ['download'],
+			},
+		},
+	},
+	{
+		displayName: 'Put Output File in Field',
+		name: 'binaryPropertyName',
+		type: 'string',
+		required: true,
+		default: 'data',
+		displayOptions: {
+			show: {
+				operation: ['download'],
+				resource: ['file'],
+			},
+		},
+		hint: 'The name of the output binary field to put the file in',
+	},
+	/* -------------------------------------------------------------------------- */
+	/*                                file:delete                                 */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Bucket Name',
+		name: 'bucketName',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: ['file'],
+				operation: ['delete'],
+			},
+		},
+	},
+	{
+		displayName: 'File Key',
+		name: 'fileKey',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: ['file'],
+				operation: ['delete'],
+			},
+		},
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['file'],
+				operation: ['delete'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Version ID',
+				name: 'versionId',
+				type: 'string',
+				default: '',
+			},
+		],
+	},
+	/* -------------------------------------------------------------------------- */
+	/*                                 file:getAll                                */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Bucket Name',
+		name: 'bucketName',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: ['file'],
+				operation: ['getAll'],
+			},
+		},
+	},
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				operation: ['getAll'],
+				resource: ['file'],
+			},
+		},
+		default: false,
+		description: 'Whether to return all results or only up to a given limit',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				operation: ['getAll'],
+				resource: ['file'],
+				returnAll: [false],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 500,
+		},
+		default: 100,
+		description: 'Max number of results to return',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['file'],
+				operation: ['getAll'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Fetch Owner',
+				name: 'fetchOwner',
+				type: 'boolean',
+				default: false,
+				// eslint-disable-next-line n8n-nodes-base/node-param-description-boolean-without-whether
+				description:
+					'The owner field is not present in listV2 by default, if you want to return owner field with each key in the result then set the fetch owner field to true',
+			},
+			{
+				displayName: 'Folder Key',
+				name: 'folderKey',
+				type: 'string',
+				default: '',
+			},
+		],
+	},
+];
diff --git a/packages/nodes-base/nodes/Aws/S3/V2/FolderDescription.ts b/packages/nodes-base/nodes/Aws/S3/V2/FolderDescription.ts
new file mode 100644
index 0000000000000..db7db64ced245
--- /dev/null
+++ b/packages/nodes-base/nodes/Aws/S3/V2/FolderDescription.ts
@@ -0,0 +1,241 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+export const folderOperations: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				resource: ['folder'],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a folder',
+				action: 'Create a folder',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a folder',
+				action: 'Delete a folder',
+			},
+			{
+				name: 'Get Many',
+				value: 'getAll',
+				description: 'Get many folders',
+				action: 'Get many folders',
+			},
+		],
+		default: 'create',
+	},
+];
+
+export const folderFields: INodeProperties[] = [
+	/* -------------------------------------------------------------------------- */
+	/*                                folder:create                               */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Bucket Name',
+		name: 'bucketName',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: ['folder'],
+				operation: ['create'],
+			},
+		},
+	},
+	{
+		displayName: 'Folder Name',
+		name: 'folderName',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: ['folder'],
+				operation: ['create'],
+			},
+		},
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		displayOptions: {
+			show: {
+				resource: ['folder'],
+				operation: ['create'],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Parent Folder Key',
+				name: 'parentFolderKey',
+				type: 'string',
+				default: '',
+				description: 'Parent folder you want to create the folder in',
+			},
+			{
+				displayName: 'Requester Pays',
+				name: 'requesterPays',
+				type: 'boolean',
+				default: false,
+				description:
+					'Whether the requester will pay for requests and data transfer. While Requester Pays is enabled, anonymous access to this bucket is disabled.',
+			},
+			{
+				displayName: 'Storage Class',
+				name: 'storageClass',
+				type: 'options',
+				options: [
+					{
+						name: 'Deep Archive',
+						value: 'deepArchive',
+					},
+					{
+						name: 'Glacier',
+						value: 'glacier',
+					},
+					{
+						name: 'Intelligent Tiering',
+						value: 'intelligentTiering',
+					},
+					{
+						name: 'One Zone IA',
+						value: 'onezoneIA',
+					},
+					{
+						name: 'Reduced Redundancy',
+						value: 'RecudedRedundancy',
+					},
+					{
+						name: 'Standard',
+						value: 'standard',
+					},
+					{
+						name: 'Standard IA',
+						value: 'standardIA',
+					},
+				],
+				default: 'standard',
+				description: 'Amazon S3 storage classes',
+			},
+		],
+	},
+	/* -------------------------------------------------------------------------- */
+	/*                                folder:delete                               */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Bucket Name',
+		name: 'bucketName',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: ['folder'],
+				operation: ['delete'],
+			},
+		},
+	},
+	{
+		displayName: 'Folder Key',
+		name: 'folderKey',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: ['folder'],
+				operation: ['delete'],
+			},
+		},
+	},
+	/* -------------------------------------------------------------------------- */
+	/*                                 folder:getAll                              */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Bucket Name',
+		name: 'bucketName',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: ['folder'],
+				operation: ['getAll'],
+			},
+		},
+	},
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				operation: ['getAll'],
+				resource: ['folder'],
+			},
+		},
+		default: false,
+		description: 'Whether to return all results or only up to a given limit',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				operation: ['getAll'],
+				resource: ['folder'],
+				returnAll: [false],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 500,
+		},
+		default: 100,
+		description: 'Max number of results to return',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['folder'],
+				operation: ['getAll'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Fetch Owner',
+				name: 'fetchOwner',
+				type: 'boolean',
+				default: false,
+				// eslint-disable-next-line n8n-nodes-base/node-param-description-boolean-without-whether
+				description:
+					'The owner field is not present in listV2 by default, if you want to return owner field with each key in the result then set the fetch owner field to true',
+			},
+			{
+				displayName: 'Folder Key',
+				name: 'folderKey',
+				type: 'string',
+				default: '',
+			},
+		],
+	},
+];
diff --git a/packages/nodes-base/nodes/Aws/S3/V2/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/S3/V2/GenericFunctions.ts
new file mode 100644
index 0000000000000..c4e47a8af36eb
--- /dev/null
+++ b/packages/nodes-base/nodes/Aws/S3/V2/GenericFunctions.ts
@@ -0,0 +1,135 @@
+import get from 'lodash/get';
+
+import { parseString } from 'xml2js';
+
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	IHookFunctions,
+	ILoadOptionsFunctions,
+	IWebhookFunctions,
+	IHttpRequestOptions,
+	IHttpRequestMethods,
+} from 'n8n-workflow';
+
+export async function awsApiRequest(
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
+	service: string,
+	method: IHttpRequestMethods,
+	path: string,
+	body?: string | Buffer | any,
+	query: IDataObject = {},
+	headers?: object,
+	option: IDataObject = {},
+	_region?: string,
+): Promise<any> {
+	const requestOptions = {
+		qs: {
+			...query,
+			service,
+			path,
+			query,
+			_region,
+		},
+		method,
+		body,
+		url: '',
+		headers,
+	} as IHttpRequestOptions;
+
+	if (Object.keys(option).length !== 0) {
+		Object.assign(requestOptions, option);
+	}
+	return await this.helpers.requestWithAuthentication.call(this, 'aws', requestOptions);
+}
+
+export async function awsApiRequestREST(
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
+	service: string,
+	method: IHttpRequestMethods,
+	path: string,
+	body?: string | Buffer | any,
+	query: IDataObject = {},
+	headers?: object,
+	options: IDataObject = {},
+	region?: string,
+): Promise<any> {
+	const response = await awsApiRequest.call(
+		this,
+		service,
+		method,
+		path,
+		body,
+		query,
+		headers,
+		options,
+		region,
+	);
+	try {
+		if (response.includes('<?xml version="1.0" encoding="UTF-8"?>')) {
+			return await new Promise((resolve, reject) => {
+				parseString(response as string, { explicitArray: false }, (err, data) => {
+					if (err) {
+						return reject(err);
+					}
+					resolve(data);
+				});
+			});
+		}
+		return JSON.parse(response as string);
+	} catch (error) {
+		return response;
+	}
+}
+
+export async function awsApiRequestRESTAllItems(
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
+	propertyName: string,
+	service: string,
+	method: IHttpRequestMethods,
+	path: string,
+	body?: string,
+	query: IDataObject = {},
+	headers?: object,
+	option: IDataObject = {},
+	region?: string,
+): Promise<any> {
+	const returnData: IDataObject[] = [];
+
+	let responseData;
+	do {
+		responseData = await awsApiRequestREST.call(
+			this,
+			service,
+			method,
+			path,
+			body,
+			query,
+			headers,
+			option,
+			region,
+		);
+		//https://forums.aws.amazon.com/thread.jspa?threadID=55746
+		if (get(responseData, [propertyName.split('.')[0], 'NextContinuationToken'])) {
+			query['continuation-token'] = get(responseData, [
+				propertyName.split('.')[0],
+				'NextContinuationToken',
+			]);
+		}
+		if (get(responseData, propertyName)) {
+			if (Array.isArray(get(responseData, propertyName))) {
+				returnData.push.apply(returnData, get(responseData, propertyName) as IDataObject[]);
+			} else {
+				returnData.push(get(responseData, propertyName) as IDataObject);
+			}
+		}
+		const limit = query.limit as number | undefined;
+		if (limit && limit <= returnData.length) {
+			return returnData;
+		}
+	} while (
+		get(responseData, [propertyName.split('.')[0], 'IsTruncated']) !== undefined &&
+		get(responseData, [propertyName.split('.')[0], 'IsTruncated']) !== 'false'
+	);
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/Aws/S3/s3.svg b/packages/nodes-base/nodes/Aws/S3/s3.svg
index 4d6e49ae0f37b..0b3835fb503ab 100644
--- a/packages/nodes-base/nodes/Aws/S3/s3.svg
+++ b/packages/nodes-base/nodes/Aws/S3/s3.svg
@@ -1 +1 @@
-<svg width="2065" height="2500" viewBox="0 0 256 310" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid"><path d="M20.624 53.686L0 64v181.02l20.624 10.254.124-.149V53.828l-.124-.142" fill="#8C3123"/><path d="M131 229L20.624 255.274V53.686L131 79.387V229" fill="#E05243"/><path d="M81.178 187.866l46.818 5.96.294-.678.263-76.77-.557-.6-46.818 5.874v66.214" fill="#8C3123"/><path d="M127.996 229.295l107.371 26.035.169-.269-.003-201.195-.17-.18-107.367 25.996v149.613" fill="#8C3123"/><path d="M174.827 187.866l-46.831 5.96v-78.048l46.831 5.874v66.214" fill="#E05243"/><path d="M174.827 89.631l-46.831 8.535-46.818-8.535 46.759-12.256 46.89 12.256" fill="#5E1F18"/><path d="M174.827 219.801l-46.831-8.591-46.818 8.591 46.761 13.053 46.888-13.053" fill="#F2B0A9"/><path d="M81.178 89.631l46.818-11.586.379-.117V.313L127.996 0 81.178 23.413v66.218" fill="#8C3123"/><path d="M174.827 89.631l-46.831-11.586V0l46.831 23.413v66.218" fill="#E05243"/><path d="M127.996 309.428l-46.823-23.405v-66.217l46.823 11.582.689.783-.187 75.906-.502 1.351" fill="#8C3123"/><path d="M127.996 309.428l46.827-23.405v-66.217l-46.827 11.582v78.04M235.367 53.686L256 64v181.02l-20.633 10.31V53.686" fill="#E05243"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="2065" height="2500" preserveAspectRatio="xMidYMid" viewBox="0 0 256 310"><path fill="#8C3123" d="M20.624 53.686 0 64v181.02l20.624 10.254.124-.149V53.828z"/><path fill="#E05243" d="M131 229 20.624 255.274V53.686L131 79.387z"/><path fill="#8C3123" d="m81.178 187.866 46.818 5.96.294-.678.263-76.77-.557-.6-46.818 5.874z"/><path fill="#8C3123" d="m127.996 229.295 107.371 26.035.169-.269-.003-201.195-.17-.18-107.367 25.996z"/><path fill="#E05243" d="m174.827 187.866-46.831 5.96v-78.048l46.831 5.874z"/><path fill="#5E1F18" d="m174.827 89.631-46.831 8.535-46.818-8.535 46.759-12.256z"/><path fill="#F2B0A9" d="m174.827 219.801-46.831-8.591-46.818 8.591 46.761 13.053z"/><path fill="#8C3123" d="m81.178 89.631 46.818-11.586.379-.117V.313L127.996 0 81.178 23.413z"/><path fill="#E05243" d="m174.827 89.631-46.831-11.586V0l46.831 23.413z"/><path fill="#8C3123" d="m127.996 309.428-46.823-23.405v-66.217l46.823 11.582.689.783-.187 75.906z"/><path fill="#E05243" d="m127.996 309.428 46.827-23.405v-66.217l-46.827 11.582zM235.367 53.686 256 64v181.02l-20.633 10.31z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Aws/S3/test/V1/AwsS3.file.upload.V1.workflow.json b/packages/nodes-base/nodes/Aws/S3/test/V1/AwsS3.file.upload.V1.workflow.json
new file mode 100644
index 0000000000000..b631ffe255739
--- /dev/null
+++ b/packages/nodes-base/nodes/Aws/S3/test/V1/AwsS3.file.upload.V1.workflow.json
@@ -0,0 +1,97 @@
+{
+	"name": "Test S3 upload",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "8f35d24b-1493-43a4-846f-bacb577bfcb2",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [540, 340]
+		},
+		{
+			"parameters": {
+				"mode": "jsonToBinary",
+				"options": {}
+			},
+			"id": "eae2946a-1a1e-47e9-9fd6-e32119b13ec0",
+			"name": "Move Binary Data",
+			"type": "n8n-nodes-base.moveBinaryData",
+			"typeVersion": 1,
+			"position": [900, 340]
+		},
+		{
+			"parameters": {
+				"operation": "upload",
+				"bucketName": "bucket",
+				"fileName": "binary.json",
+				"additionalFields": {}
+			},
+			"id": "6f21fa3f-ede1-44b1-8182-a2c07152f666",
+			"name": "AWS S3",
+			"type": "n8n-nodes-base.awsS3",
+			"typeVersion": 1,
+			"position": [1080, 340],
+			"credentials": {
+				"aws": {
+					"id": "1",
+					"name": "AWS account"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"jsCode": "return [{ key: \"value\" }];"
+			},
+			"id": "e12f1876-cfd1-47a4-a21b-d478452683bc",
+			"name": "Code",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [720, 340]
+		}
+	],
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Code",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Move Binary Data": {
+			"main": [
+				[
+					{
+						"node": "AWS S3",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code": {
+			"main": [
+				[
+					{
+						"node": "Move Binary Data",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"pinData": {
+		"AWS S3": [
+			{
+				"json": {
+					"success": true
+				}
+			}
+		]
+	}
+}
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
new file mode 100644
index 0000000000000..c13c572ef2758
--- /dev/null
+++ b/packages/nodes-base/nodes/Aws/S3/test/V1/AwsS3.node.test.ts
@@ -0,0 +1,48 @@
+import nock from 'nock';
+import { getWorkflowFilenames, initBinaryDataService, testWorkflows } from '@test/nodes/Helpers';
+
+const workflows = getWorkflowFilenames(__dirname);
+
+describe('Test S3 V1 Node', () => {
+	describe('File Upload', () => {
+		let mock: nock.Scope;
+		const now = 1683028800000;
+
+		beforeAll(async () => {
+			jest.useFakeTimers({ doNotFake: ['nextTick'], now });
+
+			await initBinaryDataService();
+
+			nock.disableNetConnect();
+			mock = nock('https://bucket.s3.eu-central-1.amazonaws.com');
+		});
+
+		beforeEach(async () => {
+			mock.get('/?location').reply(
+				200,
+				`<?xml version="1.0" encoding="UTF-8"?>
+				<LocationConstraint>
+					<LocationConstraint>eu-central-1</LocationConstraint>
+				</LocationConstraint>`,
+				{
+					'content-type': 'application/xml',
+				},
+			);
+
+			mock
+				.put('/binary.json')
+				.matchHeader(
+					'X-Amz-Content-Sha256',
+					'e43abcf3375244839c012f9633f95862d232a95b00d5bc7348b3098b9fed7f32',
+				)
+				.once()
+				.reply(200, { success: true });
+		});
+
+		afterAll(() => {
+			nock.restore();
+		});
+
+		testWorkflows(workflows);
+	});
+});
diff --git a/packages/nodes-base/nodes/Aws/S3/test/V2/AwsS3.file.upload.V2.workflow.json b/packages/nodes-base/nodes/Aws/S3/test/V2/AwsS3.file.upload.V2.workflow.json
new file mode 100644
index 0000000000000..5d88217684631
--- /dev/null
+++ b/packages/nodes-base/nodes/Aws/S3/test/V2/AwsS3.file.upload.V2.workflow.json
@@ -0,0 +1,97 @@
+{
+	"name": "Test S3 upload",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "8f35d24b-1493-43a4-846f-bacb577bfcb2",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [540, 340]
+		},
+		{
+			"parameters": {
+				"mode": "jsonToBinary",
+				"options": {}
+			},
+			"id": "eae2946a-1a1e-47e9-9fd6-e32119b13ec0",
+			"name": "Move Binary Data",
+			"type": "n8n-nodes-base.moveBinaryData",
+			"typeVersion": 1,
+			"position": [900, 340]
+		},
+		{
+			"parameters": {
+				"operation": "upload",
+				"bucketName": "buc.ket",
+				"fileName": "binary.json",
+				"additionalFields": {}
+			},
+			"id": "6f21fa3f-ede1-44b1-8182-a2c07152f666",
+			"name": "AWS S3",
+			"type": "n8n-nodes-base.awsS3",
+			"typeVersion": 2,
+			"position": [1080, 340],
+			"credentials": {
+				"aws": {
+					"id": "1",
+					"name": "AWS account"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"jsCode": "return [{ key: \"value\" }];"
+			},
+			"id": "e12f1876-cfd1-47a4-a21b-d478452683bc",
+			"name": "Code",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [720, 340]
+		}
+	],
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Code",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Move Binary Data": {
+			"main": [
+				[
+					{
+						"node": "AWS S3",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code": {
+			"main": [
+				[
+					{
+						"node": "Move Binary Data",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"pinData": {
+		"AWS S3": [
+			{
+				"json": {
+					"success": true
+				}
+			}
+		]
+	}
+}
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
new file mode 100644
index 0000000000000..7d4da16178d9d
--- /dev/null
+++ b/packages/nodes-base/nodes/Aws/S3/test/V2/AwsS3.node.test.ts
@@ -0,0 +1,48 @@
+import nock from 'nock';
+import { getWorkflowFilenames, initBinaryDataService, testWorkflows } from '@test/nodes/Helpers';
+
+const workflows = getWorkflowFilenames(__dirname);
+
+describe('Test S3 V2 Node', () => {
+	describe('File Upload', () => {
+		let mock: nock.Scope;
+		const now = 1683028800000;
+
+		beforeAll(async () => {
+			jest.useFakeTimers({ doNotFake: ['nextTick'], now });
+
+			await initBinaryDataService();
+
+			nock.disableNetConnect();
+			mock = nock('https://s3.eu-central-1.amazonaws.com/buc.ket');
+		});
+
+		beforeEach(async () => {
+			mock.get('?location').reply(
+				200,
+				`<?xml version="1.0" encoding="UTF-8"?>
+				<LocationConstraint>
+					<LocationConstraint>eu-central-1</LocationConstraint>
+				</LocationConstraint>`,
+				{
+					'content-type': 'application/xml',
+				},
+			);
+
+			mock
+				.put('/binary.json')
+				.matchHeader(
+					'X-Amz-Content-Sha256',
+					'e43abcf3375244839c012f9633f95862d232a95b00d5bc7348b3098b9fed7f32',
+				)
+				.once()
+				.reply(200, { success: true });
+		});
+
+		afterAll(() => {
+			nock.restore();
+		});
+
+		testWorkflows(workflows);
+	});
+});
diff --git a/packages/nodes-base/nodes/Aws/SES/AwsSes.node.ts b/packages/nodes-base/nodes/Aws/SES/AwsSes.node.ts
index 33e5ac1a37c36..656961f8a7dce 100644
--- a/packages/nodes-base/nodes/Aws/SES/AwsSes.node.ts
+++ b/packages/nodes-base/nodes/Aws/SES/AwsSes.node.ts
@@ -1298,6 +1298,6 @@ export class AwsSes implements INodeType {
 			}
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Aws/SES/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/SES/GenericFunctions.ts
index 79fb349d05e09..b71053bd286ab 100644
--- a/packages/nodes-base/nodes/Aws/SES/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/SES/GenericFunctions.ts
@@ -8,15 +8,16 @@ import type {
 	IWebhookFunctions,
 	IHttpRequestOptions,
 	JsonObject,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import get from 'lodash.get';
+import get from 'lodash/get';
 
 export async function awsApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
 	service: string,
-	method: string,
+	method: IHttpRequestMethods,
 	path: string,
 	body?: string,
 	headers?: object,
@@ -45,7 +46,7 @@ export async function awsApiRequest(
 export async function awsApiRequestREST(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	service: string,
-	method: string,
+	method: IHttpRequestMethods,
 	path: string,
 	body?: string,
 	headers?: object,
@@ -61,7 +62,7 @@ export async function awsApiRequestREST(
 export async function awsApiRequestSOAP(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
 	service: string,
-	method: string,
+	method: IHttpRequestMethods,
 	path: string,
 	body?: string,
 	headers?: object,
@@ -85,7 +86,7 @@ export async function awsApiRequestSOAPAllItems(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
 	propertyName: string,
 	service: string,
-	method: string,
+	method: IHttpRequestMethods,
 	path: string,
 	body?: string,
 	query: IDataObject = {},
@@ -102,11 +103,12 @@ export async function awsApiRequestSOAPAllItems(
 	do {
 		responseData = await awsApiRequestSOAP.call(this, service, method, path, body, query);
 
-		if (get(responseData, `${propertyNameArray[0]}.${propertyNameArray[1]}.NextToken`)) {
-			query.NextToken = get(
-				responseData,
-				`${propertyNameArray[0]}.${propertyNameArray[1]}.NextToken`,
-			);
+		if (get(responseData, [propertyNameArray[0], propertyNameArray[1], 'NextToken'])) {
+			query.NextToken = get(responseData, [
+				propertyNameArray[0],
+				propertyNameArray[1],
+				'NextToken',
+			]);
 		}
 		if (get(responseData, propertyName)) {
 			if (Array.isArray(get(responseData, propertyName))) {
@@ -116,7 +118,7 @@ export async function awsApiRequestSOAPAllItems(
 			}
 		}
 	} while (
-		get(responseData, `${propertyNameArray[0]}.${propertyNameArray[1]}.NextToken`) !== undefined
+		get(responseData, [propertyNameArray[0], propertyNameArray[1], 'NextToken']) !== undefined
 	);
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/Aws/SES/ses.svg b/packages/nodes-base/nodes/Aws/SES/ses.svg
index d7224cb0ecbe7..c334382ae480b 100644
--- a/packages/nodes-base/nodes/Aws/SES/ses.svg
+++ b/packages/nodes-base/nodes/Aws/SES/ses.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 74.375 85" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x="2.188" y="2.5"/><symbol id="a" overflow="visible"><g stroke="none"><path d="M16.558 12.75L0 38.591l16.558 25.841 13.227-3.324.654-44.869-13.881-3.489z" fill="#876929"/><path d="M35.049 59.786l-18.491 4.645V12.75l18.491 4.645v42.391z" fill="#d9a741"/><g fill="#876929"><path d="M32.849 21.614L35.05 80 70 62.867l-.01-43.615-8.914 1.448-28.228.913z"/><path d="M46.184 33.149l10.906-.632 10.778-19.164L40.612 0 30.439 4.364l15.745 28.785z"/></g><path d="M40.612 0l27.256 13.353L57.09 32.517 40.612 0z" fill="#d9a741"/><path d="M35.049 5.539L57.09 44.742l3.788 22.595L35.049 80l-10.46-5.131V9.64l10.46-4.101z" fill="#876929"/><path d="M69.991 19.251L70 62.867 35.05 80V5.539l22.041 39.203L69.99 19.251z" fill="#d9a741"/></g></symbol></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round" viewBox="0 0 74.375 85"><use xlink:href="#a" x="2.188" y="2.5"/><symbol id="a" overflow="visible"><g stroke="none"><path fill="#876929" d="M16.558 12.75 0 38.591l16.558 25.841 13.227-3.324.654-44.869z"/><path fill="#d9a741" d="m35.049 59.786-18.491 4.645V12.75l18.491 4.645z"/><g fill="#876929"><path d="M32.849 21.614 35.05 80 70 62.867l-.01-43.615-8.914 1.448-28.228.913z"/><path d="m46.184 33.149 10.906-.632 10.778-19.164L40.612 0 30.439 4.364z"/></g><path fill="#d9a741" d="m40.612 0 27.256 13.353L57.09 32.517z"/><path fill="#876929" d="M35.049 5.539 57.09 44.742l3.788 22.595L35.049 80l-10.46-5.131V9.64z"/><path fill="#d9a741" d="M69.991 19.251 70 62.867 35.05 80V5.539l22.041 39.203L69.99 19.251z"/></g></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Aws/SQS/AwsSqs.node.ts b/packages/nodes-base/nodes/Aws/SQS/AwsSqs.node.ts
index ccb9dd1430bf8..bfd9d7fc1dc99 100644
--- a/packages/nodes-base/nodes/Aws/SQS/AwsSqs.node.ts
+++ b/packages/nodes-base/nodes/Aws/SQS/AwsSqs.node.ts
@@ -1,3 +1,4 @@
+import { URL } from 'url';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -11,11 +12,8 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import { URL } from 'url';
-
-import { awsApiRequestSOAP } from '../GenericFunctions';
-
 import { pascalCase } from 'change-case';
+import { awsApiRequestSOAP } from '../GenericFunctions';
 
 export class AwsSqs implements INodeType {
 	description: INodeTypeDescription = {
@@ -298,10 +296,16 @@ export class AwsSqs implements INodeType {
 				const options = this.getNodeParameter('options', i, {});
 				const sendInputData = this.getNodeParameter('sendInputData', i) as boolean;
 
-				const message = sendInputData
+				let message = sendInputData
 					? JSON.stringify(items[i].json)
-					: (this.getNodeParameter('message', i) as string);
-				params.push(`MessageBody=${message}`);
+					: this.getNodeParameter('message', i);
+
+				// This prevents [object Object] from being sent as message when sending json in an expression
+				if (typeof message === 'object') {
+					message = JSON.stringify(message);
+				}
+
+				params.push(`MessageBody=${encodeURIComponent(message as string)}`);
 
 				if (options.delaySeconds) {
 					params.push(`DelaySeconds=${options.delaySeconds}`);
diff --git a/packages/nodes-base/nodes/Aws/SQS/sqs.svg b/packages/nodes-base/nodes/Aws/SQS/sqs.svg
index e8073a53a05cd..d2d0793ff0002 100644
--- a/packages/nodes-base/nodes/Aws/SQS/sqs.svg
+++ b/packages/nodes-base/nodes/Aws/SQS/sqs.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="-5 0 85 85" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x="2.188" y="2.5"/><symbol id="a" overflow="visible"><g fill="#876929" stroke="none"><path d="M0 25.938L.021 63.44 35 80l34.98-16.56v-9.368l-29.745-3.508.02-21.127L70 25.948V16.57L35 0 0 16.56v9.378z"/><path d="M.021 54.062l34.98 9.942V80L.021 63.44v-9.378z"/><path d="M4.465 65.549L0 63.431V16.56l4.475-2.109-.01 51.098z"/></g><path d="M40.255 50.564l-35.79 4.762.01-30.661 35.78 4.772v21.127zM70 25.948l-35-9.951V0l35 16.57v9.378zm-.02 28.124L35 64.004V80l34.98-16.56v-9.368z" stroke="none" fill="#d9a741"/><path d="M22.109 48.581l12.892 1.526V29.815L22.109 31.36v17.221zM9.125 47.065l8.365.982V31.924l-8.365 1.001v14.14z" stroke="none" fill="#876929"/><path d="M4.475 24.665L35 15.996l35 9.951-29.745 3.489-35.78-4.772z" fill="#624a1e" stroke="none"/><path d="M4.465 55.326L35 64.004l34.98-9.932-29.724-3.508-35.79 4.762z" fill="#fad791" stroke="none"/><path d="M69.98 45.918L35 50.107V29.815l34.98 4.218v11.885z" fill="#d9a741" stroke="none"/></symbol></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round" viewBox="-5 0 85 85"><use xlink:href="#a" x="2.188" y="2.5"/><symbol id="a" overflow="visible"><g fill="#876929" stroke="none"><path d="M0 25.938.021 63.44 35 80l34.98-16.56v-9.368l-29.745-3.508.02-21.127L70 25.948V16.57L35 0 0 16.56z"/><path d="m.021 54.062 34.98 9.942V80L.021 63.44z"/><path d="M4.465 65.549 0 63.431V16.56l4.475-2.109z"/></g><path fill="#d9a741" stroke="none" d="m40.255 50.564-35.79 4.762.01-30.661 35.78 4.772zM70 25.948l-35-9.951V0l35 16.57zm-.02 28.124L35 64.004V80l34.98-16.56z"/><path fill="#876929" stroke="none" d="m22.109 48.581 12.892 1.526V29.815L22.109 31.36zM9.125 47.065l8.365.982V31.924l-8.365 1.001z"/><path fill="#624a1e" stroke="none" d="M4.475 24.665 35 15.996l35 9.951-29.745 3.489z"/><path fill="#fad791" stroke="none" d="M4.465 55.326 35 64.004l34.98-9.932-29.724-3.508z"/><path fill="#d9a741" stroke="none" d="M69.98 45.918 35 50.107V29.815l34.98 4.218z"/></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Aws/Textract/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/Textract/GenericFunctions.ts
index addd787ce7219..663c82b54e3db 100644
--- a/packages/nodes-base/nodes/Aws/Textract/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/Textract/GenericFunctions.ts
@@ -3,8 +3,6 @@ import { URL } from 'url';
 import type { Request } from 'aws4';
 import { sign } from 'aws4';
 
-import type { OptionsWithUri } from 'request';
-
 import { parseString } from 'xml2js';
 
 import type {
@@ -16,6 +14,8 @@ import type {
 	IWebhookFunctions,
 	IHttpRequestOptions,
 	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
@@ -37,7 +37,7 @@ function getEndpointForService(
 export async function awsApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
 	service: string,
-	method: string,
+	method: IHttpRequestMethods,
 	path: string,
 	body?: string,
 	headers?: object,
@@ -77,7 +77,7 @@ export async function awsApiRequest(
 export async function awsApiRequestREST(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	service: string,
-	method: string,
+	method: IHttpRequestMethods,
 	path: string,
 	body?: string,
 	headers?: object,
@@ -93,7 +93,7 @@ export async function awsApiRequestREST(
 export async function awsApiRequestSOAP(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
 	service: string,
-	method: string,
+	method: IHttpRequestMethods,
 	path: string,
 	body?: string,
 	headers?: object,
@@ -165,7 +165,7 @@ export async function validateCredentials(
 
 	sign(signOpts, securityHeaders);
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: signOpts.headers,
 		method: 'POST',
 		uri: endpoint.href,
@@ -174,7 +174,7 @@ export async function validateCredentials(
 
 	const response = await this.helpers.request(options);
 
-	return new Promise((resolve, reject) => {
+	return await new Promise((resolve, reject) => {
 		parseString(response as string, { explicitArray: false }, (err, data) => {
 			if (err) {
 				return reject(err);
diff --git a/packages/nodes-base/nodes/Aws/Textract/textract.svg b/packages/nodes-base/nodes/Aws/Textract/textract.svg
index fa00d88c0119a..e1df075e4f76c 100644
--- a/packages/nodes-base/nodes/Aws/Textract/textract.svg
+++ b/packages/nodes-base/nodes/Aws/Textract/textract.svg
@@ -1,18 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="80px" height="80px" viewBox="0 0 80 80" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 64 (93537) - https://sketch.com -->
-    <title>Icon-Architecture/64/Arch_AWS-Textract_64</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <linearGradient x1="0%" y1="100%" x2="100%" y2="0%" id="linearGradient-1">
-            <stop stop-color="#055F4E" offset="0%"></stop>
-            <stop stop-color="#56C0A7" offset="100%"></stop>
-        </linearGradient>
-    </defs>
-    <g id="Icon-Architecture/64/Arch_AWS-Textract_64" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Icon-Architecture-BG/64/Machine-Learning" fill="url(#linearGradient-1)">
-            <rect id="Rectangle" x="0" y="0" width="80" height="80"></rect>
-        </g>
-        <path d="M22.0624102,50 C24.3763895,53.603 28.4103535,56 33.0003125,56 C40.1672485,56 45.9991964,50.168 45.9991964,43 C45.9991964,35.832 40.1672485,30 33.0003125,30 C27.6033607,30 22.9664021,33.307 21.0024196,38 L23.2143999,38 C25.0393836,34.444 28.7363506,32 33.0003125,32 C39.0652583,32 43.9992143,36.935 43.9992143,43 C43.9992143,49.065 39.0652583,54 33.0003125,54 C29.5913429,54 26.5413702,52.441 24.5213882,50 L22.0624102,50 Z M37.0002768,45 L37.0002768,43 L41.9992321,43 C41.9992321,38.038 37.9622682,34 33.0003125,34 C28.0373568,34 23.9993929,38.038 23.9993929,43 L28.9993482,43 L28.9993482,45 L24.2313908,45 C25.1443826,49.002 28.7253507,52 33.0003125,52 C35.1362934,52 37.0992759,51.249 38.6442621,50 L34.0003036,50 L34.0003036,48 L40.4782457,48 C41.0812403,47.102 41.5202364,46.087 41.7682342,45 L37.0002768,45 Z M21.0024196,48 L23.2143999,48 C22.4434068,46.498 22.0004107,44.801 22.0004107,43 C22.0004107,41.959 22.1554093,40.955 22.4264069,40 L20.3634253,40 C20.1344274,40.965 19.9994286,41.966 19.9994286,43 C19.9994286,44.771 20.3584254,46.46 21.0024196,48 L21.0024196,48 Z M19.7434309,50 L17.0004554,50 L17.0004554,48 L18.8744386,48 C18.5344417,47.04 18.2894438,46.038 18.1494451,45 L15.4144695,45 L16.707458,46.293 L15.2924706,47.707 L12.2924974,44.707 C11.9025009,44.316 11.9025009,43.684 12.2924974,43.293 L15.2924706,40.293 L16.707458,41.707 L15.4144695,43 L18.0004464,43 C18.0004464,41.973 18.1044455,40.97 18.3024437,40 L17.0004554,40 L17.0004554,38 L18.8744386,38 C20.9404202,32.184 26.4833707,28 33.0003125,28 C37.427273,28 41.4002375,29.939 44.148213,33 L59.0000804,33 L59.0000804,35 L45.6661994,35 C47.1351863,37.318 47.9991786,40.058 47.9991786,43 L59.0000804,43 L59.0000804,45 L47.8501799,45 C46.8681887,52.327 40.5912447,58 33.0003125,58 C27.2563638,58 22.2624084,54.752 19.7434309,50 L19.7434309,50 Z M37.0002768,39 C37.0002768,38.448 36.5522808,38 36.0002857,38 L29.9993482,38 C29.4473442,38 28.9993482,38.448 28.9993482,39 L28.9993482,41 L31.0003304,41 L31.0003304,40 L32.0003214,40 L32.0003214,43 L31.0003304,43 L31.0003304,45 L35.0002946,45 L35.0002946,43 L34.0003036,43 L34.0003036,40 L35.0002946,40 L35.0002946,41 L37.0002768,41 L37.0002768,39 Z M49.0001696,40 L59.0000804,40 L59.0000804,38 L49.0001696,38 L49.0001696,40 Z M49.0001696,50 L59.0000804,50 L59.0000804,48 L49.0001696,48 L49.0001696,50 Z M57.0000982,27 L60.5850662,27 L57.0000982,23.414 L57.0000982,27 Z M63.7070383,27.293 C63.8940367,27.48 64.0000357,27.735 64.0000357,28 L64.0000357,63 C64.0000357,63.552 63.5520397,64 63.0000446,64 L32.0003304,64 C31.4473264,64 31.0003304,63.552 31.0003304,63 L31.0003304,59 L33.0003125,59 L33.0003125,62 L62.0000536,62 L62.0000536,29 L56.0001071,29 C55.4471121,29 55.0001161,28.552 55.0001161,28 L55.0001161,22 L33.0003125,22 L33.0003125,27 L31.0003304,27 L31.0003304,21 C31.0003304,20.448 31.4473264,20 32.0003304,20 L56.0001071,20 C56.2651048,20 56.5191025,20.105 56.7071008,20.293 L63.7070383,27.293 Z M68,24.166 L68,61 C68,61.552 67.552004,62 67.0000089,62 L65.0000268,62 L65.0000268,60 L66.0000179,60 L66.0000179,24.612 L58.6170838,18 L36.0002857,18 L36.0002857,19 L34.0003036,19 L34.0003036,17 C34.0003036,16.448 34.4472996,16 35.0003036,16 L59.0000804,16 C59.2460782,16 59.483076,16.091 59.6660744,16.255 L67.666003,23.42 C67.8780011,23.61 68,23.881 68,24.166 L68,24.166 Z" id="Amazon-Textract_Icon_64_Squid" fill="#FFFFFF"></path>
-    </g>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="80" height="80"><defs><linearGradient id="a" x1="0%" x2="100%" y1="100%" y2="0%"><stop offset="0%" stop-color="#055F4E"/><stop offset="100%" stop-color="#56C0A7"/></linearGradient></defs><g fill="none" fill-rule="evenodd"><path fill="url(#a)" d="M0 0h80v80H0z"/><path fill="#FFF" d="M22.062 50c2.314 3.603 6.348 6 10.938 6 7.167 0 13-5.832 13-13s-5.833-13-13-13c-5.397 0-10.034 3.307-11.998 8h2.212c1.825-3.556 5.522-6 9.786-6 6.065 0 11 4.935 11 11s-4.935 11-11 11a10.99 10.99 0 0 1-8.479-4zM37 45v-2h5c0-4.962-4.038-9-9-9-4.963 0-9 4.038-9 9h5v2h-4.77c.913 4.002 4.494 7 8.77 7a8.95 8.95 0 0 0 5.643-2H34v-2h6.478a9 9 0 0 0 1.29-3zm-15.998 3h2.212A10.9 10.9 0 0 1 22 43c0-1.041.155-2.045.426-3h-2.063A13 13 0 0 0 20 43c0 1.771.36 3.46 1.003 5m-1.259 2H17v-2h1.874c-.34-.96-.585-1.962-.725-3h-2.735l1.293 1.293-1.415 1.414-3-3a1 1 0 0 1 0-1.414l3-3 1.415 1.414L15.414 43H18c0-1.027.104-2.03.302-3H17v-2h1.874C20.94 32.184 26.484 28 33 28c4.427 0 8.4 1.939 11.148 5H59v2H45.666A14.9 14.9 0 0 1 48 43h11v2H47.85c-.982 7.327-7.259 13-14.85 13-5.744 0-10.738-3.248-13.257-8M37 39a1 1 0 0 0-1-1h-6a1 1 0 0 0-1 1v2h2v-1h1v3h-1v2h4v-2h-1v-3h1v1h2zm12 1h10v-2H49zm0 10h10v-2H49zm8-23h3.585L57 23.414zm6.707.293c.187.187.293.442.293.707v35a1 1 0 0 1-1 1H32a1 1 0 0 1-1-1v-4h2v3h29V29h-6a1 1 0 0 1-1-1v-6H33v5h-2v-6a1 1 0 0 1 1-1h24a1 1 0 0 1 .707.293zM68 24.166V61a1 1 0 0 1-1 1h-2v-2h1V24.612L58.617 18H36v1h-2v-2a1 1 0 0 1 1-1h24c.246 0 .483.091.666.255l8 7.165c.212.19.334.461.334.746"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Aws/Transcribe/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/Transcribe/GenericFunctions.ts
index c894a5cf536b5..05faeb8a83ec6 100644
--- a/packages/nodes-base/nodes/Aws/Transcribe/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/Transcribe/GenericFunctions.ts
@@ -3,20 +3,20 @@ import { URL } from 'url';
 import type { Request } from 'aws4';
 import { sign } from 'aws4';
 
-import type { OptionsWithUri } from 'request';
-
 import type {
 	ICredentialDataDecryptedObject,
 	IDataObject,
 	IExecuteFunctions,
 	IHookFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
+	IRequestOptions,
 	IWebhookFunctions,
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import get from 'lodash.get';
+import get from 'lodash/get';
 
 function getEndpointForService(
 	service: string,
@@ -36,7 +36,7 @@ function getEndpointForService(
 export async function awsApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
 	service: string,
-	method: string,
+	method: IHttpRequestMethods,
 	path: string,
 	body?: string,
 	headers?: object,
@@ -58,7 +58,7 @@ export async function awsApiRequest(
 
 	sign(signOpts, securityHeaders);
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: signOpts.headers,
 		method,
 		uri: endpoint.href,
@@ -75,7 +75,7 @@ export async function awsApiRequest(
 export async function awsApiRequestREST(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	service: string,
-	method: string,
+	method: IHttpRequestMethods,
 	path: string,
 	body?: string,
 	headers?: object,
@@ -92,7 +92,7 @@ export async function awsApiRequestRESTAllItems(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	propertyName: string,
 	service: string,
-	method: string,
+	method: IHttpRequestMethods,
 	path: string,
 	body?: string,
 	query: IDataObject = {},
@@ -109,11 +109,12 @@ export async function awsApiRequestRESTAllItems(
 	do {
 		responseData = await awsApiRequestREST.call(this, service, method, path, body, query);
 
-		if (get(responseData, `${propertyNameArray[0]}.${propertyNameArray[1]}.NextToken`)) {
-			query.NextToken = get(
-				responseData,
-				`${propertyNameArray[0]}.${propertyNameArray[1]}.NextToken`,
-			);
+		if (get(responseData, [propertyNameArray[0], propertyNameArray[1], 'NextToken'])) {
+			query.NextToken = get(responseData, [
+				propertyNameArray[0],
+				propertyNameArray[1],
+				'NextToken',
+			]);
 		}
 		if (get(responseData, propertyName)) {
 			if (Array.isArray(get(responseData, propertyName))) {
@@ -123,7 +124,7 @@ export async function awsApiRequestRESTAllItems(
 			}
 		}
 	} while (
-		get(responseData, `${propertyNameArray[0]}.${propertyNameArray[1]}.NextToken`) !== undefined
+		get(responseData, [propertyNameArray[0], propertyNameArray[1], 'NextToken']) !== undefined
 	);
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/Aws/Transcribe/transcribe.svg b/packages/nodes-base/nodes/Aws/Transcribe/transcribe.svg
index d055f5e9c7d45..e2cc2da4df765 100644
--- a/packages/nodes-base/nodes/Aws/Transcribe/transcribe.svg
+++ b/packages/nodes-base/nodes/Aws/Transcribe/transcribe.svg
@@ -1 +1 @@
-<svg width="100" height="100" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M100 0H0v100h100V0z" fill="url(#paint0_linear)"/><path d="M18.347 83.333a1.68 1.68 0 01-1.48-2.466l5.6-10.907a20.827 20.827 0 01-2.987-10.773A21.267 21.267 0 0153.52 42.32l-1.6 2.133a18.507 18.507 0 00-26.813 24.72 1.333 1.333 0 01.066 1.334l-4.586 8.933 9.173-4.56a1.334 1.334 0 011.333.067 18.666 18.666 0 0025.214-5.614l2.213 1.48A21.333 21.333 0 0130.307 77.6l-11.2 5.56a1.747 1.747 0 01-.76.173zm34.32-29.16H50V62h2.667v-7.827zm-4-5.453H46v18.667h2.667V48.72zm-4 4H42v10.667h2.667V52.72zm-4-4H38v18.667h2.667V48.72zm-4 2.667H34V64.72h2.667V51.387zm-4-1.334H30v16h2.667v-16zm-4 4H26v9.334h2.667v-9.334zM83.333 68.72V47.387h-2.666v20h-20v2.666H82a1.334 1.334 0 001.333-1.386v.053zm-.4-38.32l-13.44-13.333a1.253 1.253 0 00-.826-.374h-24a1.333 1.333 0 00-1.334 1.334V35.36H46v-16h21.333v12a1.186 1.186 0 001.227 1.333h12.107v6.667h2.666v-8a1.335 1.335 0 00-.4-1.013v.053zM70 30.053v-8.866L78.747 30 70 30.053zm5.333 5.334H62v2.666h13.333v-2.666zM74 40.72H56.667v2.667H74V40.72zM62 27.387H51.333v2.666H62v-2.666zm-2.667 8h-8v2.666h8v-2.666zm-2.666 14.666H54v16h2.667v-16zm4 2.667H58v10.667h2.667V52.72z" fill="#fff"/><defs><linearGradient id="paint0_linear" x1="-20.707" y1="120.707" x2="120.72" y2="-20.72" gradientUnits="userSpaceOnUse"><stop stop-color="#055F4E"/><stop offset="1" stop-color="#56C0A7"/></linearGradient></defs></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="100" height="100" fill="none"><path fill="url(#a)" d="M100 0H0v100h100z"/><path fill="#fff" d="M18.347 83.333a1.68 1.68 0 0 1-1.48-2.466l5.6-10.907a20.83 20.83 0 0 1-2.987-10.773A21.267 21.267 0 0 1 53.52 42.32l-1.6 2.133a18.507 18.507 0 0 0-26.813 24.72 1.33 1.33 0 0 1 .066 1.334l-4.586 8.933 9.173-4.56a1.33 1.33 0 0 1 1.333.067 18.666 18.666 0 0 0 25.214-5.614l2.213 1.48A21.333 21.333 0 0 1 30.307 77.6l-11.2 5.56a1.75 1.75 0 0 1-.76.173m34.32-29.16H50V62h2.667zm-4-5.453H46v18.667h2.667zm-4 4H42v10.667h2.667zm-4-4H38v18.667h2.667zm-4 2.667H34V64.72h2.667zm-4-1.334H30v16h2.667zm-4 4H26v9.334h2.667zM83.333 68.72V47.387h-2.666v20h-20v2.666H82a1.334 1.334 0 0 0 1.333-1.386zm-.4-38.32-13.44-13.333a1.25 1.25 0 0 0-.826-.374h-24a1.333 1.333 0 0 0-1.334 1.334V35.36H46v-16h21.333v12a1.186 1.186 0 0 0 1.227 1.333h12.107v6.667h2.666v-8a1.34 1.34 0 0 0-.4-1.013zM70 30.053v-8.866L78.747 30zm5.333 5.334H62v2.666h13.333zM74 40.72H56.667v2.667H74zM62 27.387H51.333v2.666H62zm-2.667 8h-8v2.666h8zm-2.666 14.666H54v16h2.667zm4 2.667H58v10.667h2.667z"/><defs><linearGradient id="a" x1="-20.707" x2="120.72" y1="120.707" y2="-20.72" gradientUnits="userSpaceOnUse"><stop stop-color="#055F4E"/><stop offset="1" stop-color="#56C0A7"/></linearGradient></defs></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Aws/lambda.svg b/packages/nodes-base/nodes/Aws/lambda.svg
index 729075990fc42..1d7049faa08ef 100644
--- a/packages/nodes-base/nodes/Aws/lambda.svg
+++ b/packages/nodes-base/nodes/Aws/lambda.svg
@@ -1 +1 @@
-<svg height="2500" viewBox="-3.023 -0.22 420.923 433.54" width="2443" xmlns="http://www.w3.org/2000/svg"><path d="M208.45 227.89c-1.59 2.26-2.93 4.12-4.22 6q-30.86 45.42-61.7 90.83-28.69 42.24-57.44 84.43a3.88 3.88 0 01-2.73 1.59q-40.59-.35-81.16-.88c-.3 0-.61-.09-1.2-.18a14.44 14.44 0 01.76-1.65q28.31-43.89 56.62-87.76 25.11-38.88 50.25-77.74 27.86-43.18 55.69-86.42c2.74-4.25 5.59-8.42 8.19-12.75a5.26 5.26 0 00.56-3.83c-5-15.94-10.1-31.84-15.19-47.74-2.18-6.81-4.46-13.58-6.5-20.43-.66-2.2-1.75-2.87-4-2.86-17 .07-33.9.05-50.85.05-3.22 0-3.23 0-3.23-3.18 0-20.84 0-41.68-.06-62.52 0-2.32.76-2.84 2.94-2.84q51.19.09 102.4 0a3.29 3.29 0 013.6 2.43q27 67.91 54 135.77 31.5 79.14 63 158.3c6.52 16.38 13.09 32.75 19.54 49.17.77 2 1.57 2.38 3.59 1.76 17.89-5.53 35.82-10.91 53.7-16.45 2.25-.7 3.07-.23 3.77 2 6.1 19.17 12.32 38.3 18.5 57.45.21.66.37 1.33.62 2.25-1.28.47-2.48 1-3.71 1.34q-61 19.33-121.93 38.68c-1.94.61-2.52-.05-3.17-1.68q-18.61-47.16-37.31-94.28-18.29-46.14-36.6-92.28c-1.83-4.62-3.63-9.26-5.46-13.88-.29-.79-.69-1.48-1.27-2.7z" fill="#fa7e14"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="2443" height="2500" viewBox="-3.023 -0.22 420.923 433.54"><path fill="#fa7e14" d="M208.45 227.89c-1.59 2.26-2.93 4.12-4.22 6q-30.86 45.42-61.7 90.83-28.69 42.24-57.44 84.43a3.88 3.88 0 0 1-2.73 1.59q-40.59-.35-81.16-.88c-.3 0-.61-.09-1.2-.18a14 14 0 0 1 .76-1.65q28.31-43.89 56.62-87.76 25.11-38.88 50.25-77.74 27.86-43.18 55.69-86.42c2.74-4.25 5.59-8.42 8.19-12.75a5.26 5.26 0 0 0 .56-3.83c-5-15.94-10.1-31.84-15.19-47.74-2.18-6.81-4.46-13.58-6.5-20.43-.66-2.2-1.75-2.87-4-2.86-17 .07-33.9.05-50.85.05-3.22 0-3.23 0-3.23-3.18 0-20.84 0-41.68-.06-62.52 0-2.32.76-2.84 2.94-2.84q51.19.09 102.4 0a3.29 3.29 0 0 1 3.6 2.43q27 67.91 54 135.77 31.5 79.14 63 158.3c6.52 16.38 13.09 32.75 19.54 49.17.77 2 1.57 2.38 3.59 1.76 17.89-5.53 35.82-10.91 53.7-16.45 2.25-.7 3.07-.23 3.77 2 6.1 19.17 12.32 38.3 18.5 57.45.21.66.37 1.33.62 2.25-1.28.47-2.48 1-3.71 1.34q-61 19.33-121.93 38.68c-1.94.61-2.52-.05-3.17-1.68q-18.61-47.16-37.31-94.28-18.29-46.14-36.6-92.28c-1.83-4.62-3.63-9.26-5.46-13.88-.29-.79-.69-1.48-1.27-2.7"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Aws/sns.svg b/packages/nodes-base/nodes/Aws/sns.svg
index 3b3d7bac94ca3..a35c6e3249fd3 100644
--- a/packages/nodes-base/nodes/Aws/sns.svg
+++ b/packages/nodes-base/nodes/Aws/sns.svg
@@ -1 +1 @@
-<svg width="2490" height="2500" viewBox="0 0 256 257" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid"><path d="M98.875 232.033l-26.433-7.408-25.001-28.508 31.272-.863 20.162 36.779m-61.125-18.8l-14.875-4.166-14.058-16.034 17.082-2.809 11.851 23.009" fill="#995B80"/><path d="M0 191.017l15.204 3.091 2.207-3.882V58.503l-2.207-2.561L0 64.6v126.417" fill="#7B3F65"/><path d="M73.933 69.708L15.208 55.942v138.166l8.798-.818 13.744 19.943 10.6-22.205 25.583-2.378V69.708" fill="#C17B9D"/><path d="M33.958 198.133l26.063 5.25 1.716-4.045V37.44l-1.716-3.665-26.063 13.208v151.15" fill="#7B3F65"/><path d="M208.734 81.516L60.021 33.775v169.612l17.221-2.216 21.633 30.862 17.126-35.85 92.733-11.933V81.516" fill="#C17B9D"/><path d="M181.833 256.492l-37.566-10.525-35.509-40.5 46.033-.468 27.042 51.493" fill="#995B80"/><path d="M89.591 208.95l38.33 7.417 2.977-2.566V4.117L127.921 0l-38.33 19.158V208.95" fill="#7B3F65"/><path d="M256 64.033L127.925 0v216.367l22.597-4.528 31.311 44.653 26.901-56.309-.017-.002L256 190.708V64.033" fill="#C17B9D"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="2490" height="2500" preserveAspectRatio="xMidYMid" viewBox="0 0 256 257"><path fill="#995B80" d="m98.875 232.033-26.433-7.408-25.001-28.508 31.272-.863zm-61.125-18.8-14.875-4.166-14.058-16.034 17.082-2.809z"/><path fill="#7B3F65" d="m0 191.017 15.204 3.091 2.207-3.882V58.503l-2.207-2.561L0 64.6z"/><path fill="#C17B9D" d="M73.933 69.708 15.208 55.942v138.166l8.798-.818 13.744 19.943 10.6-22.205 25.583-2.378z"/><path fill="#7B3F65" d="m33.958 198.133 26.063 5.25 1.716-4.045V37.44l-1.716-3.665-26.063 13.208z"/><path fill="#C17B9D" d="M208.734 81.516 60.021 33.775v169.612l17.221-2.216 21.633 30.862 17.126-35.85 92.733-11.933z"/><path fill="#995B80" d="m181.833 256.492-37.566-10.525-35.509-40.5 46.033-.468z"/><path fill="#7B3F65" d="m89.591 208.95 38.33 7.417 2.977-2.566V4.117L127.921 0l-38.33 19.158z"/><path fill="#C17B9D" d="M256 64.033 127.925 0v216.367l22.597-4.528 31.311 44.653 26.901-56.309-.017-.002L256 190.708z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/companyReport/get/description.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/companyReport/get/description.ts
index 3c0aa6475354e..e80ae80d99d37 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/companyReport/get/description.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/companyReport/get/description.ts
@@ -89,6 +89,13 @@ export const companyReportGetDescription: INodeProperties[] = [
 				default: true,
 				description: 'Whether to apply the standard duplicate field filtering or not',
 			},
+			{
+				displayName: 'Only Current',
+				name: 'onlyCurrent',
+				type: 'boolean',
+				default: true,
+				description: 'Whether to hide future dated values from the history table fields or not',
+			},
 		],
 	},
 ];
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/companyReport/get/execute.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/companyReport/get/execute.ts
index 62dc60ca28d6f..c7ddc01b64928 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/companyReport/get/execute.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/companyReport/get/execute.ts
@@ -11,9 +11,10 @@ export async function get(this: IExecuteFunctions, index: number) {
 	const reportId = this.getNodeParameter('reportId', index) as string;
 	const format = this.getNodeParameter('format', 0) as string;
 	const fd = this.getNodeParameter('options.fd', index, true) as boolean;
+	const onlyCurrent = this.getNodeParameter('options.onlyCurrent', index, true) as boolean;
 
 	//endpoint
-	const endpoint = `reports/${reportId}/?format=${format}&fd=${fd}`;
+	const endpoint = `reports/${reportId}/?format=${format}&fd=${fd}&onlyCurrent=${onlyCurrent}`;
 
 	if (format === 'JSON') {
 		const responseData = await apiRequest.call(
@@ -66,5 +67,5 @@ export async function get(this: IExecuteFunctions, index: number) {
 		),
 	};
 
-	return this.prepareOutputData(newItem as unknown as INodeExecutionData[]);
+	return [newItem as unknown as INodeExecutionData[]];
 }
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 c255eeaaa2281..ed602347d3467 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/companyReport/index.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/companyReport/index.ts
@@ -1,6 +1,5 @@
-import * as get from './get';
-
 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 04279ea031bb6..9c4dd63f7ec90 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
@@ -44,7 +44,7 @@ export const employeeCreateDescription: EmployeeProperties = [
 		},
 		default: '',
 	},
-	...createEmployeeSharedDescription(true),
+	...(createEmployeeSharedDescription(true) as EmployeeProperties),
 	{
 		displayName: 'Additional Fields',
 		name: 'additionalFields',
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 6dda349bcb131..33c29827761cb 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,10 +1,9 @@
 import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 
-import { apiRequest } from '../../../transport';
-
-import moment from 'moment';
+import moment from 'moment-timezone';
 
 import { capitalCase } from 'change-case';
+import { apiRequest } from '../../../transport';
 
 export async function create(
 	this: IExecuteFunctions,
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 9404f1a99cb7f..9e685756b716e 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/employee/index.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/employee/index.ts
@@ -1,10 +1,9 @@
+import type { INodeProperties } from 'n8n-workflow';
 import * as create from './create';
 import * as get from './get';
 import * as getAll from './getAll';
 import * as update from './update';
 
-import type { INodeProperties } from 'n8n-workflow';
-
 export { create, get, getAll, update };
 
 export const descriptions: INodeProperties[] = [
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 4ad427d5c2bd0..83af844d745c9 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
@@ -30,7 +30,7 @@ export const employeeUpdateDescription: EmployeeProperties = [
 		description:
 			'Whether the employee to create was added to a pay schedule synced with Trax Payroll',
 	},
-	...updateEmployeeSharedDescription(true),
+	...(updateEmployeeSharedDescription(true) as EmployeeProperties),
 	{
 		displayName: 'Update Fields',
 		name: 'updateFields',
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 25c13478e3fce..76d1bdd56207b 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,11 +1,10 @@
 import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import { apiRequest } from '../../../transport';
-
-import moment from 'moment';
+import moment from 'moment-timezone';
 
 import { capitalCase } from 'change-case';
+import { apiRequest } from '../../../transport';
 
 export async function update(
 	this: IExecuteFunctions,
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/download/execute.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/download/execute.ts
index fcb32dc2e58cd..7fd83eca54076 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/download/execute.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/download/execute.ts
@@ -53,5 +53,5 @@ export async function download(this: IExecuteFunctions, index: number) {
 		),
 	};
 
-	return this.prepareOutputData(newItem as unknown as INodeExecutionData[]);
+	return [newItem as unknown as INodeExecutionData[]];
 }
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 0feafeb4a2abb..3853a5e9dd9b9 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/index.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/index.ts
@@ -1,11 +1,10 @@
+import type { INodeProperties } from 'n8n-workflow';
 import * as del from './del';
 import * as download from './download';
 import * as getAll from './getAll';
 import * as update from './update';
 import * as upload from './upload';
 
-import type { INodeProperties } from 'n8n-workflow';
-
 export { del, download, getAll, update, upload };
 
 export const descriptions: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/file/download/execute.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/file/download/execute.ts
index be7b82467612b..08a08d25a1d26 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/file/download/execute.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/file/download/execute.ts
@@ -53,5 +53,5 @@ export async function download(this: IExecuteFunctions, index: number) {
 		),
 	};
 
-	return this.prepareOutputData(newItem as unknown as INodeExecutionData[]);
+	return [newItem as unknown as INodeExecutionData[]];
 }
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 f2c3438f1b9ab..d1f8755377176 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/file/index.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/file/index.ts
@@ -1,11 +1,10 @@
+import type { INodeProperties } from 'n8n-workflow';
 import * as del from './del';
 import * as download from './download';
 import * as getAll from './getAll';
 import * as update from './update';
 import * as upload from './upload';
 
-import type { INodeProperties } from 'n8n-workflow';
-
 export { del, download, getAll, update, upload };
 
 export const descriptions: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/router.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/router.ts
index fe667dfa0a535..9e8cb85a9ed92 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/router.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/router.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-unsafe-argument */
 import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 
 import * as employee from './employee';
diff --git a/packages/nodes-base/nodes/BambooHr/v1/methods/credentialTest.ts b/packages/nodes-base/nodes/BambooHr/v1/methods/credentialTest.ts
index 93b942fb9ef55..5a095aef69de4 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/methods/credentialTest.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/methods/credentialTest.ts
@@ -26,7 +26,7 @@ async function validateCredentials(
 		url: `https://api.bamboohr.com/api/gateway.php/${subdomain}/v1/employees/directory`,
 	};
 
-	return this.helpers.request(options);
+	return await this.helpers.request(options);
 }
 
 export async function bambooHrApiCredentialTest(
diff --git a/packages/nodes-base/nodes/BambooHr/v1/transport/index.ts b/packages/nodes-base/nodes/BambooHr/v1/transport/index.ts
index e20d26a8d7165..1a993e98c9bc9 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/transport/index.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/transport/index.ts
@@ -4,11 +4,10 @@ import type {
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	JsonObject,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import type { OptionsWithUrl } from 'request';
-
 /**
  * Make an API request to Mattermost
  */
@@ -29,7 +28,7 @@ export async function apiRequest(
 	//set-up uri
 	const uri = `https://api.bamboohr.com/api/gateway.php/${subdomain}/v1/${endpoint}`;
 
-	const options: OptionsWithUrl = {
+	const options: IRequestOptions = {
 		method,
 		body,
 		qs: query,
diff --git a/packages/nodes-base/nodes/Bannerbear/Bannerbear.node.json b/packages/nodes-base/nodes/Bannerbear/Bannerbear.node.json
index 8f6c754d19ba5..fe6592cba22ed 100644
--- a/packages/nodes-base/nodes/Bannerbear/Bannerbear.node.json
+++ b/packages/nodes-base/nodes/Bannerbear/Bannerbear.node.json
@@ -2,7 +2,7 @@
 	"node": "n8n-nodes-base.bannerbear",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Marketing & Content"],
+	"categories": ["Marketing"],
 	"resources": {
 		"credentialDocumentation": [
 			{
diff --git a/packages/nodes-base/nodes/Bannerbear/Bannerbear.node.ts b/packages/nodes-base/nodes/Bannerbear/Bannerbear.node.ts
index 49c3a504b432e..975fc600ac293 100644
--- a/packages/nodes-base/nodes/Bannerbear/Bannerbear.node.ts
+++ b/packages/nodes-base/nodes/Bannerbear/Bannerbear.node.ts
@@ -144,7 +144,7 @@ export class Bannerbear implements INodeType {
 
 						const promise = async (uid: string) => {
 							let data: IDataObject = {};
-							return new Promise((resolve, reject) => {
+							return await new Promise((resolve, reject) => {
 								const timeout = setInterval(async () => {
 									data = await bannerbearApiRequest.call(this, 'GET', `/images/${uid}`);
 
diff --git a/packages/nodes-base/nodes/Bannerbear/GenericFunctions.ts b/packages/nodes-base/nodes/Bannerbear/GenericFunctions.ts
index 82874197aab05..0e48b58d83a9f 100644
--- a/packages/nodes-base/nodes/Bannerbear/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Bannerbear/GenericFunctions.ts
@@ -1,5 +1,3 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IExecuteFunctions,
 	ILoadOptionsFunctions,
@@ -7,6 +5,8 @@ import type {
 	IHookFunctions,
 	IWebhookFunctions,
 	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
@@ -14,7 +14,7 @@ import { snakeCase } from 'change-case';
 
 export async function bannerbearApiRequest(
 	this: IExecuteFunctions | IWebhookFunctions | IHookFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -24,7 +24,7 @@ export async function bannerbearApiRequest(
 ): Promise<any> {
 	const credentials = await this.getCredentials('bannerbearApi');
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			Accept: 'application/json',
 			Authorization: `Bearer ${credentials.apiKey}`,
diff --git a/packages/nodes-base/nodes/Baserow/Baserow.node.ts b/packages/nodes-base/nodes/Baserow/Baserow.node.ts
index eb997b4d51d57..41667ebff9d01 100644
--- a/packages/nodes-base/nodes/Baserow/Baserow.node.ts
+++ b/packages/nodes-base/nodes/Baserow/Baserow.node.ts
@@ -341,6 +341,6 @@ export class Baserow implements INodeType {
 			}
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Baserow/GenericFunctions.ts b/packages/nodes-base/nodes/Baserow/GenericFunctions.ts
index d53c4eb532798..8e30c5c1482b6 100644
--- a/packages/nodes-base/nodes/Baserow/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Baserow/GenericFunctions.ts
@@ -1,9 +1,9 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
+	IRequestOptions,
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
@@ -15,7 +15,7 @@ import type { Accumulator, BaserowCredentials, LoadedResource } from './types';
  */
 export async function baserowApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	jwtToken: string,
 	body: IDataObject = {},
@@ -23,7 +23,7 @@ export async function baserowApiRequest(
 ) {
 	const credentials = (await this.getCredentials('baserowApi')) as BaserowCredentials;
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			Authorization: `JWT ${jwtToken}`,
 		},
@@ -54,7 +54,7 @@ export async function baserowApiRequest(
  */
 export async function baserowApiRequestAllItems(
 	this: IExecuteFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	jwtToken: string,
 	body: IDataObject,
@@ -90,7 +90,7 @@ export async function getJwtToken(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
 	{ username, password, host }: BaserowCredentials,
 ) {
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		method: 'POST',
 		body: {
 			username,
@@ -146,7 +146,7 @@ export class TableFieldMapper {
 		jwtToken: string,
 	): Promise<LoadedResource[]> {
 		const endpoint = `/api/database/fields/table/${table}/`;
-		return baserowApiRequest.call(this, 'GET', endpoint, jwtToken);
+		return await baserowApiRequest.call(this, 'GET', endpoint, jwtToken);
 	}
 
 	createMappings(tableFields: LoadedResource[]) {
diff --git a/packages/nodes-base/nodes/Baserow/baserow.svg b/packages/nodes-base/nodes/Baserow/baserow.svg
index a184ad4b99f56..83210dad5dbe4 100644
--- a/packages/nodes-base/nodes/Baserow/baserow.svg
+++ b/packages/nodes-base/nodes/Baserow/baserow.svg
@@ -1,143 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg:svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="60"
-   height="60"
-   viewBox="0 0 60 60.000001"
-   version="1.1"
-   id="svg14"
-   sodipodi:docname="baserow.svg"
-   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
-  <svg:metadata
-     id="metadata20">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </svg:metadata>
-  <svg:defs
-     id="defs18" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1848"
-     inkscape:window-height="1016"
-     id="namedview16"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:zoom="2.5579745"
-     inkscape:cx="-29.906474"
-     inkscape:cy="40.001009"
-     inkscape:window-x="1512"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="Group_163" />
-  <svg:g
-     id="Group_163"
-     data-name="Group 163"
-     transform="translate(-451.976,-540.719)">
-    <svg:g
-       id="Group_162"
-       data-name="Group 162"
-       transform="matrix(1.8935807,0,0,1.8935807,451.976,543.89927)"
-       style="stroke-width:0.52810001">
-      <svg:g
-         id="Group_161"
-         data-name="Group 161"
-         style="stroke-width:0.52810001">
-        <svg:rect
-           id="Rectangle_257"
-           data-name="Rectangle 257"
-           width="21.863001"
-           height="3.9920001"
-           transform="translate(6.654,24.335)"
-           x="0"
-           y="0"
-           style="fill:#566270;stroke-width:0.52810001" />
-        <svg:rect
-           id="Rectangle_258"
-           data-name="Rectangle 258"
-           width="23.955"
-           height="3.9920001"
-           transform="translate(0,18.251)"
-           x="0"
-           y="0"
-           style="fill:#4570a9;stroke-width:0.52810001" />
-        <svg:rect
-           id="Rectangle_259"
-           data-name="Rectangle 259"
-           width="6.4640002"
-           height="3.9920001"
-           transform="translate(25.222,18.251)"
-           x="0"
-           y="0"
-           style="fill:#4570a9;stroke-width:0.52810001" />
-        <svg:rect
-           id="Rectangle_260"
-           data-name="Rectangle 260"
-           width="11.597"
-           height="3.9920001"
-           transform="translate(4.563,12.167)"
-           x="0"
-           y="0"
-           style="fill:#00a2ce;stroke-width:0.52810001" />
-        <svg:rect
-           id="Rectangle_261"
-           data-name="Rectangle 261"
-           width="5.2280002"
-           height="3.9920001"
-           transform="translate(17.728,12.167)"
-           x="0"
-           y="0"
-           style="fill:#00a2ce;stroke-width:0.52810001" />
-        <svg:rect
-           id="Rectangle_262"
-           data-name="Rectangle 262"
-           width="19.392"
-           height="3.9920001"
-           transform="translate(8.365,6.084)"
-           x="0"
-           y="0"
-           style="fill:#6acaff;stroke-width:0.52810001" />
-        <svg:rect
-           id="Rectangle_263"
-           data-name="Rectangle 263"
-           width="16.35"
-           height="3.9920001"
-           transform="translate(7.319)"
-           x="0"
-           y="0"
-           style="fill:#9addff;stroke-width:0.52810001" />
-        <svg:rect
-           id="Rectangle_264"
-           data-name="Rectangle 264"
-           width="5.2280002"
-           height="3.9920001"
-           transform="translate(0.285)"
-           x="0"
-           y="0"
-           style="fill:#9addff;stroke-width:0.52810001" />
-      </svg:g>
-    </svg:g>
-  </svg:g>
-  <script />
-</svg:svg>
+<svg id="Warstwa_1" data-name="Warstwa 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 600 600"><defs><style>.cls-1{fill:#4d68c4;}.cls-2{fill:#5190ef;}.cls-3{fill:#2bc3f1;}</style></defs><title>baserow_logo_glyph</title><rect class="cls-1" y="451.65233" width="374.17383" height="148.34767" rx="32.25562" transform="translate(374.17383 1051.65233) rotate(180)"/><path class="cls-2" d="M32.256,225.82617H567.744A32.256,32.256,0,0,1,600,258.08217v83.83567a32.256,32.256,0,0,1-32.256,32.256H32.25562A32.25562,32.25562,0,0,1,0,341.91821v-83.836A32.256,32.256,0,0,1,32.256,225.82617Z" transform="translate(600 600) rotate(180)"/><rect class="cls-3" x="225.82617" width="374.17383" height="148.34767" rx="32.256" transform="translate(825.82617 148.34767) rotate(180)"/><rect class="cls-1" x="451.65233" y="451.65233" width="148.34767" height="148.34767" rx="32.256" transform="translate(1051.65233 1051.65234) rotate(-180)"/><rect class="cls-3" width="148.34767" height="148.34766" rx="32.256"/></svg>
diff --git a/packages/nodes-base/nodes/Baserow/types.d.ts b/packages/nodes-base/nodes/Baserow/types.ts
similarity index 100%
rename from packages/nodes-base/nodes/Baserow/types.d.ts
rename to packages/nodes-base/nodes/Baserow/types.ts
diff --git a/packages/nodes-base/nodes/Beeminder/Beeminder.node.functions.ts b/packages/nodes-base/nodes/Beeminder/Beeminder.node.functions.ts
index 7e7f294826cff..90e058068aecf 100644
--- a/packages/nodes-base/nodes/Beeminder/Beeminder.node.functions.ts
+++ b/packages/nodes-base/nodes/Beeminder/Beeminder.node.functions.ts
@@ -16,7 +16,7 @@ export async function createDatapoint(
 
 	const endpoint = `/users/${credentials.user}/goals/${data.goalName}/datapoints.json`;
 
-	return beeminderApiRequest.call(this, 'POST', endpoint, data);
+	return await beeminderApiRequest.call(this, 'POST', endpoint, data);
 }
 
 export async function getAllDatapoints(
@@ -28,10 +28,10 @@ export async function getAllDatapoints(
 	const endpoint = `/users/${credentials.user}/goals/${data.goalName}/datapoints.json`;
 
 	if (data.count !== undefined) {
-		return beeminderApiRequest.call(this, 'GET', endpoint, {}, data);
+		return await beeminderApiRequest.call(this, 'GET', endpoint, {}, data);
 	}
 
-	return beeminderApiRequestAllItems.call(this, 'GET', endpoint, {}, data);
+	return await beeminderApiRequestAllItems.call(this, 'GET', endpoint, {}, data);
 }
 
 export async function updateDatapoint(
@@ -42,7 +42,7 @@ export async function updateDatapoint(
 
 	const endpoint = `/users/${credentials.user}/goals/${data.goalName}/datapoints/${data.datapointId}.json`;
 
-	return beeminderApiRequest.call(this, 'PUT', endpoint, data);
+	return await beeminderApiRequest.call(this, 'PUT', endpoint, data);
 }
 
 export async function deleteDatapoint(
@@ -53,5 +53,5 @@ export async function deleteDatapoint(
 
 	const endpoint = `/users/${credentials.user}/goals/${data.goalName}/datapoints/${data.datapointId}.json`;
 
-	return beeminderApiRequest.call(this, 'DELETE', endpoint);
+	return await beeminderApiRequest.call(this, 'DELETE', endpoint);
 }
diff --git a/packages/nodes-base/nodes/Beeminder/Beeminder.node.ts b/packages/nodes-base/nodes/Beeminder/Beeminder.node.ts
index 02ca510a67240..28eb9742c299f 100644
--- a/packages/nodes-base/nodes/Beeminder/Beeminder.node.ts
+++ b/packages/nodes-base/nodes/Beeminder/Beeminder.node.ts
@@ -9,6 +9,7 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
+import moment from 'moment-timezone';
 import {
 	createDatapoint,
 	deleteDatapoint,
@@ -18,8 +19,6 @@ import {
 
 import { beeminderApiRequest } from './GenericFunctions';
 
-import moment from 'moment-timezone';
-
 export class Beeminder implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Beeminder',
@@ -379,6 +378,6 @@ export class Beeminder implements INodeType {
 			}
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Beeminder/GenericFunctions.ts b/packages/nodes-base/nodes/Beeminder/GenericFunctions.ts
index c776b17116ab8..7e2701b701060 100644
--- a/packages/nodes-base/nodes/Beeminder/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Beeminder/GenericFunctions.ts
@@ -1,24 +1,24 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IExecuteFunctions,
 	ILoadOptionsFunctions,
 	IDataObject,
 	IHookFunctions,
 	IWebhookFunctions,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 
 const BEEMINDER_URI = 'https://www.beeminder.com/api/v1';
 
 export async function beeminderApiRequest(
 	this: IExecuteFunctions | IWebhookFunctions | IHookFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: any = {},
 	query: IDataObject = {},
 ): Promise<any> {
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		method,
 		body,
 		qs: query,
@@ -34,12 +34,12 @@ export async function beeminderApiRequest(
 		delete options.qs;
 	}
 
-	return this.helpers.requestWithAuthentication.call(this, 'beeminderApi', options);
+	return await this.helpers.requestWithAuthentication.call(this, 'beeminderApi', options);
 }
 
 export async function beeminderApiRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: any = {},
diff --git a/packages/nodes-base/nodes/Bitbucket/BitbucketTrigger.node.ts b/packages/nodes-base/nodes/Bitbucket/BitbucketTrigger.node.ts
index 82581b77eebb3..e0e6a13778d3c 100644
--- a/packages/nodes-base/nodes/Bitbucket/BitbucketTrigger.node.ts
+++ b/packages/nodes-base/nodes/Bitbucket/BitbucketTrigger.node.ts
@@ -1,5 +1,3 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IHookFunctions,
 	IWebhookFunctions,
@@ -12,6 +10,7 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 	IWebhookResponseData,
+	IRequestOptions,
 } from 'n8n-workflow';
 
 import { bitbucketApiRequest, bitbucketApiRequestAllItems } from './GenericFunctions';
@@ -145,7 +144,7 @@ export class BitbucketTrigger implements INodeType {
 			): Promise<INodeCredentialTestResult> {
 				const credentials = credential.data;
 
-				const options: OptionsWithUri = {
+				const options: IRequestOptions = {
 					method: 'GET',
 					auth: {
 						user: credentials!.username as string,
diff --git a/packages/nodes-base/nodes/Bitbucket/GenericFunctions.ts b/packages/nodes-base/nodes/Bitbucket/GenericFunctions.ts
index 084f209de4a0a..3281757d07acd 100644
--- a/packages/nodes-base/nodes/Bitbucket/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Bitbucket/GenericFunctions.ts
@@ -1,17 +1,17 @@
-import type { OptionsWithUri } from 'request';
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function bitbucketApiRequest(
-	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -20,7 +20,7 @@ export async function bitbucketApiRequest(
 	option: IDataObject = {},
 ): Promise<any> {
 	const credentials = await this.getCredentials('bitbucketApi');
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		method,
 		auth: {
 			user: credentials.username as string,
@@ -50,7 +50,7 @@ export async function bitbucketApiRequest(
 export async function bitbucketApiRequestAllItems(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
diff --git a/packages/nodes-base/nodes/Bitbucket/bitbucket.svg b/packages/nodes-base/nodes/Bitbucket/bitbucket.svg
index 23c660940ce3e..42120a5e7ffef 100644
--- a/packages/nodes-base/nodes/Bitbucket/bitbucket.svg
+++ b/packages/nodes-base/nodes/Bitbucket/bitbucket.svg
@@ -1 +1 @@
-<svg width="48" height="48" xmlns="http://www.w3.org/2000/svg" fill="none"><defs><linearGradient y2=".656" x2=".33" y1="-.17" x1=".762" id="a"><stop stop-color="#0052CC" offset=".18"/><stop stop-color="#2684FF" offset="1"/></linearGradient></defs><path stroke="null" fill="#2684FF" d="M1.721 3.873a1.465 1.465 0 011.129-.509l42.772.007a1.466 1.466 0 011.466 1.7l-6.222 38.193a1.466 1.466 0 01-1.465 1.231H9.555a1.993 1.993 0 01-1.95-1.663L1.386 5.064c-.07-.427.053-.863.336-1.191zm17.8 26.787h9.526l2.308-13.475H16.941l2.58 13.475z" clip-rule="evenodd" fill-rule="evenodd"/><path stroke="null" fill="url(#a)" d="M44.418 18.437h-12.64l-2.12 12.383h-8.755L10.567 43.09c.327.283.745.44 1.178.444H39.18a1.347 1.347 0 001.347-1.132l3.892-23.965z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" fill="none"><defs><linearGradient id="a" x1=".762" x2=".33" y1="-.17" y2=".656"><stop offset=".18" stop-color="#0052CC"/><stop offset="1" stop-color="#2684FF"/></linearGradient></defs><path fill="#2684FF" fill-rule="evenodd" stroke="null" d="M1.721 3.873a1.47 1.47 0 0 1 1.129-.509l42.772.007a1.466 1.466 0 0 1 1.466 1.7l-6.222 38.193a1.466 1.466 0 0 1-1.465 1.231H9.555a1.99 1.99 0 0 1-1.95-1.663L1.386 5.064c-.07-.427.053-.863.336-1.191zm17.8 26.787h9.526l2.308-13.475H16.941z" clip-rule="evenodd"/><path fill="url(#a)" stroke="null" d="M44.418 18.437h-12.64l-2.12 12.383h-8.755L10.567 43.09c.327.283.745.44 1.178.444H39.18a1.35 1.35 0 0 0 1.347-1.132l3.892-23.965z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Bitly/Bitly.node.ts b/packages/nodes-base/nodes/Bitly/Bitly.node.ts
index 87f5cfb9a9649..55e4c6ffb5c11 100644
--- a/packages/nodes-base/nodes/Bitly/Bitly.node.ts
+++ b/packages/nodes-base/nodes/Bitly/Bitly.node.ts
@@ -218,6 +218,6 @@ export class Bitly implements INodeType {
 				throw error;
 			}
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Bitly/GenericFunctions.ts b/packages/nodes-base/nodes/Bitly/GenericFunctions.ts
index e959caac3ae3d..daadfdd508562 100644
--- a/packages/nodes-base/nodes/Bitly/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Bitly/GenericFunctions.ts
@@ -1,18 +1,17 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	JsonObject,
+	IRequestOptions,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function bitlyApiRequest(
-	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -21,7 +20,7 @@ export async function bitlyApiRequest(
 	option: IDataObject = {},
 ): Promise<any> {
 	const authenticationMethod = this.getNodeParameter('authentication', 0) as string;
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		headers: {},
 		method,
 		qs,
@@ -57,7 +56,7 @@ export async function bitlyApiRequest(
 export async function bitlyApiRequestAllItems(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
diff --git a/packages/nodes-base/nodes/Bitly/bitly.svg b/packages/nodes-base/nodes/Bitly/bitly.svg
index 68e50d99fd0da..fbb7029200879 100644
--- a/packages/nodes-base/nodes/Bitly/bitly.svg
+++ b/packages/nodes-base/nodes/Bitly/bitly.svg
@@ -1 +1 @@
-<svg viewBox="0 0 128 128" xmlns="http://www.w3.org/2000/svg"><g clip-rule="evenodd" fill-rule="evenodd"><path fill="none" d="M0 0h128v128H0z"/><path d="M63.708 0C28.443 0 0 28.306 0 65.322c0 19.193 10.266 37.736 24.703 48.877 2.78 2.145 6.091 1.949 7.989.109 1.599-1.55 1.467-5.282-1.507-7.897-11.541-10.149-19.52-25.514-19.52-40.861 0-27.564 24.474-50.756 52.044-50.756 33.558 0 51.503 27.252 51.503 50.351 0 14.114-6.902 31.155-19.361 42.025.019-.049 2.588-5.101 2.588-14.94 0-16.748-10.612-25.821-22.926-25.821-8.914 0-14.251 3.187-17.883 6.158 0-6.822.228-19.563.228-19.563 0-8.409-2.946-15.14-13.213-15.287-5.943-.084-10.353 2.641-13.103 8.803-.991 2.311-.626 4.822 1.333 5.96 1.621.941 4.287.243 5.606-1.517.881-1.1 1.375-1.335 2.141-1.252 1.261.136 1.309 2.168 1.359 3.468.038.998 1.008 15.494.477 52.746 0 10.275 8.059 22.077 27.355 22.077 8.307 0 14.686-2.322 23.953-7.587C107.871 112.398 128 94.62 128 64.55 128 26.977 97.572 0 63.708 0zm6.052 113.602c-7.183.126-12.422-2.183-12.743-8.461-.12-2.356-.082-4.865.033-6.378.695-9.174 7.11-15.774 13.443-17.041 7.876-1.576 13.123 2.026 13.123 12.337-.001 6.968-1.935 19.334-13.856 19.543z" fill="#DD5A2B"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128"><g fill-rule="evenodd" clip-rule="evenodd"><path fill="none" d="M0 0h128v128H0z"/><path fill="#DD5A2B" d="M63.708 0C28.443 0 0 28.306 0 65.322c0 19.193 10.266 37.736 24.703 48.877 2.78 2.145 6.091 1.949 7.989.109 1.599-1.55 1.467-5.282-1.507-7.897-11.541-10.149-19.52-25.514-19.52-40.861 0-27.564 24.474-50.756 52.044-50.756 33.558 0 51.503 27.252 51.503 50.351 0 14.114-6.902 31.155-19.361 42.025.019-.049 2.588-5.101 2.588-14.94 0-16.748-10.612-25.821-22.926-25.821-8.914 0-14.251 3.187-17.883 6.158 0-6.822.228-19.563.228-19.563 0-8.409-2.946-15.14-13.213-15.287-5.943-.084-10.353 2.641-13.103 8.803-.991 2.311-.626 4.822 1.333 5.96 1.621.941 4.287.243 5.606-1.517.881-1.1 1.375-1.335 2.141-1.252 1.261.136 1.309 2.168 1.359 3.468.038.998 1.008 15.494.477 52.746 0 10.275 8.059 22.077 27.355 22.077 8.307 0 14.686-2.322 23.953-7.587C107.871 112.398 128 94.62 128 64.55 128 26.977 97.572 0 63.708 0m6.052 113.602c-7.183.126-12.422-2.183-12.743-8.461-.12-2.356-.082-4.865.033-6.378.695-9.174 7.11-15.774 13.443-17.041 7.876-1.576 13.123 2.026 13.123 12.337-.001 6.968-1.935 19.334-13.856 19.543"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Bitwarden/Bitwarden.node.ts b/packages/nodes-base/nodes/Bitwarden/Bitwarden.node.ts
index 7fb65d9ac41f0..2a7ca106852ba 100644
--- a/packages/nodes-base/nodes/Bitwarden/Bitwarden.node.ts
+++ b/packages/nodes-base/nodes/Bitwarden/Bitwarden.node.ts
@@ -8,6 +8,8 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
+import isEmpty from 'lodash/isEmpty';
+import partialRight from 'lodash/partialRight';
 import {
 	bitwardenApiRequest as tokenlessBitwardenApiRequest,
 	getAccessToken,
@@ -32,9 +34,6 @@ import type {
 } from './descriptions/MemberDescription';
 import { memberFields, memberOperations } from './descriptions/MemberDescription';
 
-import isEmpty from 'lodash.isempty';
-import partialRight from 'lodash.partialright';
-
 export class Bitwarden implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Bitwarden',
@@ -95,11 +94,11 @@ export class Bitwarden implements INodeType {
 	methods = {
 		loadOptions: {
 			async getGroups(this: ILoadOptionsFunctions) {
-				return loadResource.call(this, 'groups');
+				return await loadResource.call(this, 'groups');
 			},
 
 			async getCollections(this: ILoadOptionsFunctions) {
-				return loadResource.call(this, 'collections');
+				return await loadResource.call(this, 'collections');
 			},
 		},
 	};
@@ -568,6 +567,6 @@ export class Bitwarden implements INodeType {
 			}
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Bitwarden/GenericFunctions.ts b/packages/nodes-base/nodes/Bitwarden/GenericFunctions.ts
index e91cba2e32476..0bb12eac99e35 100644
--- a/packages/nodes-base/nodes/Bitwarden/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Bitwarden/GenericFunctions.ts
@@ -1,14 +1,14 @@
 import type {
 	IDataObject,
 	IExecuteFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
 	INodePropertyOptions,
+	IRequestOptions,
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import type { OptionsWithUri } from 'request';
-
 /**
  * Return the access token URL based on the user's environment.
  */
@@ -34,14 +34,14 @@ async function getBaseUrl(this: IExecuteFunctions | ILoadOptionsFunctions) {
  */
 export async function bitwardenApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	qs: IDataObject,
 	body: IDataObject,
 	token: string,
 ): Promise<any> {
 	const baseUrl = await getBaseUrl.call(this);
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			'user-agent': 'n8n',
 			Authorization: `Bearer ${token}`,
@@ -77,7 +77,7 @@ export async function getAccessToken(
 ): Promise<any> {
 	const credentials = await this.getCredentials('bitwardenApi');
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			'Content-Type': 'application/x-www-form-urlencoded',
 		},
@@ -109,7 +109,7 @@ export async function getAccessToken(
 export async function handleGetAll(
 	this: IExecuteFunctions,
 	i: number,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	qs: IDataObject,
 	body: IDataObject,
diff --git a/packages/nodes-base/nodes/Bitwarden/bitwarden.svg b/packages/nodes-base/nodes/Bitwarden/bitwarden.svg
index c53078dd43677..fb1668e9f4d32 100644
--- a/packages/nodes-base/nodes/Bitwarden/bitwarden.svg
+++ b/packages/nodes-base/nodes/Bitwarden/bitwarden.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 55 66" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><path d="M53.333 2.667v32c0 2.388-.465 4.756-1.396 7.103s-2.084 4.43-3.458 6.25-3.015 3.59-4.917 5.312-3.66 3.153-5.272 4.292l-5.04 3.23-3.73 2.062-1.77.834c-.333.166-.695.25-1.083.25a2.4 2.4 0 01-1.083-.25l-1.77-.834-3.73-2.062-5.042-3.23c-1.61-1.14-3.368-2.57-5.27-4.292s-3.54-3.492-4.916-5.312-2.528-3.903-3.46-6.25S0 37.055 0 34.667v-32A2.56 2.56 0 01.791.792 2.56 2.56 0 012.666 0h48c.72 0 1.346.264 1.874.792a2.56 2.56 0 01.792 1.875m-8 32V8H26.666v47.375c3.305-1.75 6.264-3.653 8.875-5.708 6.527-5.11 9.79-10.11 9.79-15" stroke="none" fill="#3c8dbc" fill-rule="nonzero"/></symbol></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round" viewBox="0 0 55 66"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><path fill="#3c8dbc" fill-rule="nonzero" stroke="none" d="M53.333 2.667v32q0 3.582-1.396 7.103c-1.396 3.521-2.084 4.43-3.458 6.25s-3.015 3.59-4.917 5.312-3.66 3.153-5.272 4.292l-5.04 3.23-3.73 2.062-1.77.834q-.5.25-1.083.25a2.4 2.4 0 0 1-1.083-.25l-1.77-.834-3.73-2.062-5.042-3.23q-2.416-1.71-5.27-4.292c-2.854-2.582-3.54-3.492-4.916-5.312s-2.528-3.903-3.46-6.25S0 37.055 0 34.667v-32A2.56 2.56 0 0 1 .791.792 2.56 2.56 0 0 1 2.666 0h48q1.081 0 1.874.792a2.56 2.56 0 0 1 .792 1.875m-8 32V8H26.666v47.375q4.958-2.625 8.875-5.708 9.79-7.665 9.79-15"/></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Box/Box.node.ts b/packages/nodes-base/nodes/Box/Box.node.ts
index b509526ad1cee..44f5fe1aa15f7 100644
--- a/packages/nodes-base/nodes/Box/Box.node.ts
+++ b/packages/nodes-base/nodes/Box/Box.node.ts
@@ -7,16 +7,14 @@ import type {
 } from 'n8n-workflow';
 import { 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 moment from 'moment-timezone';
-
-import { noCase } from 'change-case';
-
 export class Box implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Box',
@@ -526,9 +524,9 @@ export class Box implements INodeType {
 
 		if (resource === 'file' && operation === 'download') {
 			// For file downloads the files get attached to the existing items
-			return this.prepareOutputData(items);
+			return [items];
 		} else {
-			return this.prepareOutputData(returnData);
+			return [returnData];
 		}
 	}
 }
diff --git a/packages/nodes-base/nodes/Box/FileDescription.ts b/packages/nodes-base/nodes/Box/FileDescription.ts
index 896100ffe9160..48c49157409f4 100644
--- a/packages/nodes-base/nodes/Box/FileDescription.ts
+++ b/packages/nodes-base/nodes/Box/FileDescription.ts
@@ -161,7 +161,7 @@ export const fileFields: INodeProperties[] = [
 		default: '',
 	},
 	{
-		displayName: 'Binary Property',
+		displayName: 'Put Output File in Field',
 		name: 'binaryPropertyName',
 		type: 'string',
 		required: true,
@@ -172,7 +172,7 @@ export const fileFields: INodeProperties[] = [
 				resource: ['file'],
 			},
 		},
-		description: 'Name of the binary property to which to write the data of the read file',
+		hint: 'The name of the output binary field to put the file in',
 	},
 
 	/* -------------------------------------------------------------------------- */
@@ -671,7 +671,7 @@ export const fileFields: INodeProperties[] = [
 		description: 'The name the file should be saved as',
 	},
 	{
-		displayName: 'Binary Data',
+		displayName: 'Binary File',
 		name: 'binaryData',
 		type: 'boolean',
 		default: false,
@@ -700,7 +700,7 @@ export const fileFields: INodeProperties[] = [
 		description: 'The text content of the file',
 	},
 	{
-		displayName: 'Binary Property',
+		displayName: 'Input Binary Field',
 		name: 'binaryPropertyName',
 		type: 'string',
 		default: 'data',
@@ -712,7 +712,7 @@ export const fileFields: INodeProperties[] = [
 				resource: ['file'],
 			},
 		},
-		description: 'Name of the binary property which contains the data for the file',
+		hint: 'The name of the input binary field containing the file to be uploaded',
 	},
 	{
 		displayName: 'Parent ID',
diff --git a/packages/nodes-base/nodes/Box/GenericFunctions.ts b/packages/nodes-base/nodes/Box/GenericFunctions.ts
index 1249681399f6e..f768a217656b7 100644
--- a/packages/nodes-base/nodes/Box/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Box/GenericFunctions.ts
@@ -1,19 +1,18 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
 	IOAuth2Options,
+	IRequestOptions,
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function boxApiRequest(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IHookFunctions,
-	method: string,
+	this: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -21,7 +20,7 @@ export async function boxApiRequest(
 	uri?: string,
 	option: IDataObject = {},
 ): Promise<any> {
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		headers: {
 			'Content-Type': 'application/json',
 		},
@@ -52,7 +51,7 @@ export async function boxApiRequest(
 export async function boxApiRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: any = {},
diff --git a/packages/nodes-base/nodes/Brandfetch/Brandfetch.node.ts b/packages/nodes-base/nodes/Brandfetch/Brandfetch.node.ts
index 22259c3cdba58..54b1c9b2d7b4b 100644
--- a/packages/nodes-base/nodes/Brandfetch/Brandfetch.node.ts
+++ b/packages/nodes-base/nodes/Brandfetch/Brandfetch.node.ts
@@ -285,7 +285,7 @@ export class Brandfetch implements INodeType {
 
 		if (operation === 'logo' && this.getNodeParameter('download', 0)) {
 			// For file downloads the files get attached to the existing items
-			return this.prepareOutputData(items);
+			return [items];
 		} else {
 			return [responseData];
 		}
diff --git a/packages/nodes-base/nodes/Brandfetch/GenericFunctions.ts b/packages/nodes-base/nodes/Brandfetch/GenericFunctions.ts
index 15a59c07b340b..6a18a4579fc4b 100644
--- a/packages/nodes-base/nodes/Brandfetch/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Brandfetch/GenericFunctions.ts
@@ -1,18 +1,17 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	JsonObject,
+	IRequestOptions,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function brandfetchApiRequest(
-	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -22,7 +21,7 @@ export async function brandfetchApiRequest(
 ): Promise<any> {
 	try {
 		const credentials = await this.getCredentials('brandfetchApi');
-		let options: OptionsWithUri = {
+		let options: IRequestOptions = {
 			headers: {
 				'x-api-key': credentials.apiKey,
 			},
diff --git a/packages/nodes-base/nodes/SendInBlue/AttributeDescription.ts b/packages/nodes-base/nodes/Brevo/AttributeDescription.ts
similarity index 98%
rename from packages/nodes-base/nodes/SendInBlue/AttributeDescription.ts
rename to packages/nodes-base/nodes/Brevo/AttributeDescription.ts
index 5944ba8fe25be..f51efa0579866 100644
--- a/packages/nodes-base/nodes/SendInBlue/AttributeDescription.ts
+++ b/packages/nodes-base/nodes/Brevo/AttributeDescription.ts
@@ -4,7 +4,7 @@ import type {
 	INodeProperties,
 	JsonObject,
 } from 'n8n-workflow';
-import { SendInBlueNode } from './GenericFunctions';
+import { BrevoNode } from './GenericFunctions';
 
 export const attributeOperations: INodeProperties[] = [
 	{
@@ -43,7 +43,7 @@ export const attributeOperations: INodeProperties[] = [
 								requestOptions: IHttpRequestOptions,
 							): Promise<IHttpRequestOptions> {
 								const selectedCategory = this.getNodeParameter('attributeCategory') as string;
-								const override = SendInBlueNode.INTERCEPTORS.get(selectedCategory);
+								const override = BrevoNode.INTERCEPTORS.get(selectedCategory);
 								if (override) {
 									override.call(this, requestOptions.body! as JsonObject);
 								}
diff --git a/packages/nodes-base/nodes/Brevo/Brevo.node.json b/packages/nodes-base/nodes/Brevo/Brevo.node.json
new file mode 100644
index 0000000000000..8f2b5b7ac867d
--- /dev/null
+++ b/packages/nodes-base/nodes/Brevo/Brevo.node.json
@@ -0,0 +1,19 @@
+{
+	"node": "n8n-nodes-base.brevo",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"categories": ["Marketing", "Communication"],
+	"resources": {
+		"credentialDocumentation": [
+			{
+				"url": "https://docs.n8n.io/credentials/brevo"
+			}
+		],
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.brevo/"
+			}
+		]
+	},
+	"alias": ["sendinblue"]
+}
diff --git a/packages/nodes-base/nodes/Brevo/Brevo.node.ts b/packages/nodes-base/nodes/Brevo/Brevo.node.ts
new file mode 100644
index 0000000000000..f4519c0651595
--- /dev/null
+++ b/packages/nodes-base/nodes/Brevo/Brevo.node.ts
@@ -0,0 +1,69 @@
+/* eslint-disable n8n-nodes-base/node-filename-against-convention */
+import type { INodeType, INodeTypeDescription } from 'n8n-workflow';
+import { attributeFields, attributeOperations } from './AttributeDescription';
+import { contactFields, contactOperations } from './ContactDescription';
+import { emailFields, emailOperations } from './EmailDescription';
+import { senderFields, senderOperations } from './SenderDescrition';
+
+export class Brevo implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Brevo',
+		// keep sendinblue name for backward compatibility
+		name: 'sendInBlue',
+		icon: 'file:brevo.svg',
+		group: ['transform'],
+		version: 1,
+		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+		description: 'Consume Brevo API',
+		defaults: {
+			name: 'Brevo',
+		},
+		inputs: ['main'],
+		outputs: ['main'],
+		credentials: [
+			{
+				name: 'sendInBlueApi',
+				required: true,
+			},
+		],
+		requestDefaults: {
+			baseURL: 'https://api.brevo.com',
+		},
+		properties: [
+			{
+				displayName: 'Resource',
+				name: 'resource',
+				type: 'options',
+				noDataExpression: true,
+				options: [
+					{
+						name: 'Contact',
+						value: 'contact',
+					},
+					{
+						name: 'Contact Attribute',
+						value: 'attribute',
+					},
+					{
+						name: 'Email',
+						value: 'email',
+					},
+					{
+						name: 'Sender',
+						value: 'sender',
+					},
+				],
+				default: 'email',
+			},
+
+			...attributeOperations,
+			...attributeFields,
+			...senderOperations,
+			...senderFields,
+			...contactOperations,
+			...contactFields,
+			...emailOperations,
+			...emailFields,
+		],
+	};
+}
diff --git a/packages/nodes-base/nodes/Brevo/BrevoTrigger.node.json b/packages/nodes-base/nodes/Brevo/BrevoTrigger.node.json
new file mode 100644
index 0000000000000..a4e648ab0015a
--- /dev/null
+++ b/packages/nodes-base/nodes/Brevo/BrevoTrigger.node.json
@@ -0,0 +1,20 @@
+{
+	"node": "n8n-nodes-base.brevoTrigger",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"categories": ["Marketing", "Communication"],
+	"resources": {
+		"credentialDocumentation": [
+			{
+				"url": "https://docs.n8n.io/credentials/brevo"
+			}
+		],
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.brevotrigger/"
+			}
+		],
+		"generic": []
+	},
+	"alias": ["sendinblue"]
+}
diff --git a/packages/nodes-base/nodes/Brevo/BrevoTrigger.node.ts b/packages/nodes-base/nodes/Brevo/BrevoTrigger.node.ts
new file mode 100644
index 0000000000000..299b15fb59e06
--- /dev/null
+++ b/packages/nodes-base/nodes/Brevo/BrevoTrigger.node.ts
@@ -0,0 +1,288 @@
+/* eslint-disable n8n-nodes-base/node-filename-against-convention */
+import type {
+	IHookFunctions,
+	INodeType,
+	INodeTypeDescription,
+	IWebhookFunctions,
+	IWebhookResponseData,
+} from 'n8n-workflow';
+import { BrevoWebhookApi } from './GenericFunctions';
+
+export class BrevoTrigger implements INodeType {
+	description: INodeTypeDescription = {
+		credentials: [
+			{
+				name: 'sendInBlueApi',
+				required: true,
+				displayOptions: {
+					show: {},
+				},
+			},
+		],
+		displayName: 'Brevo Trigger',
+		defaults: {
+			name: 'Brevo Trigger',
+		},
+		description: 'Starts the workflow when Brevo events occur',
+		group: ['trigger'],
+		icon: 'file:brevo.svg',
+		inputs: [],
+		// keep sendinblue name for backward compatibility
+		name: 'sendInBlueTrigger',
+		outputs: ['main'],
+		version: 1,
+		webhooks: [
+			{
+				name: 'default',
+				httpMethod: 'POST',
+				responseMode: 'onReceived',
+				path: 'webhooks',
+			},
+		],
+		properties: [
+			{
+				displayName: 'Resource',
+				default: 'transactional',
+				name: 'type',
+				options: [
+					{ name: 'Inbound', value: 'inbound' },
+					{ name: 'Marketing', value: 'marketing' },
+					{ name: 'Transactional', value: 'transactional' },
+				],
+				required: true,
+				type: 'options',
+			},
+			{
+				displayName: 'Trigger On',
+				displayOptions: {
+					show: {
+						type: ['transactional'],
+					},
+				},
+				name: 'events',
+				placeholder: 'Add Event',
+				options: [
+					{
+						name: 'Email Blocked',
+						value: 'blocked',
+						description: 'Triggers when transactional email is blocked',
+					},
+					{
+						name: 'Email Clicked',
+						value: 'click',
+						description: 'Triggers when transactional email is clicked',
+					},
+					{
+						name: 'Email Deferred',
+						value: 'deferred',
+						description: 'Triggers when transactional email is deferred',
+					},
+					{
+						name: 'Email Delivered',
+						value: 'delivered',
+						description: 'Triggers when transactional email is delivered',
+					},
+					{
+						name: 'Email Hard Bounce',
+						value: 'hardBounce',
+						description: 'Triggers when transactional email is hard bounced',
+					},
+					{
+						name: 'Email Invalid',
+						value: 'invalid',
+						description: 'Triggers when transactional email is invalid',
+					},
+					{
+						name: 'Email Marked Spam',
+						value: 'spam',
+						description: 'Triggers when transactional email is set to spam',
+					},
+					{
+						name: 'Email Opened',
+						value: 'opened',
+						description: 'Triggers when transactional email is opened',
+					},
+					{
+						name: 'Email Sent',
+						value: 'request',
+						description: 'Triggers when transactional email is sent',
+					},
+					{
+						name: 'Email Soft-Bounce',
+						value: 'softBounce',
+						description: 'Triggers when transactional email is soft bounced',
+					},
+					{
+						name: 'Email Unique Open',
+						value: 'uniqueOpened',
+						description: 'Triggers when transactional email is unique opened',
+					},
+					{
+						name: 'Email Unsubscribed',
+						value: 'unsubscribed',
+						description: 'Triggers when transactional email is unsubscribed',
+					},
+				],
+				default: [],
+				required: true,
+				type: 'multiOptions',
+			},
+			{
+				displayName: 'Trigger On',
+				displayOptions: {
+					show: {
+						type: ['marketing'],
+					},
+				},
+				name: 'events',
+				placeholder: 'Add Event',
+				options: [
+					{
+						name: 'Marketing Email Clicked',
+						value: 'click',
+						description: 'Triggers when marketing email is clicked',
+					},
+					{
+						name: 'Marketing Email Delivered',
+						value: 'delivered',
+						description: 'Triggers when marketing email is delivered',
+					},
+					{
+						name: 'Marketing Email Hard Bounce',
+						value: 'hardBounce',
+						description: 'Triggers when marketing email is hard bounced',
+					},
+					{
+						name: 'Marketing Email List Addition',
+						value: 'listAddition',
+						description: 'Triggers when marketing email is clicked',
+					},
+					{
+						name: 'Marketing Email Opened',
+						value: 'opened',
+						description: 'Triggers when marketing email is opened',
+					},
+					{
+						name: 'Marketing Email Soft Bounce',
+						value: 'softBounce',
+						description: 'Triggers when marketing email is soft bounced',
+					},
+					{
+						name: 'Marketing Email Spam',
+						value: 'spam',
+						description: 'Triggers when marketing email is spam',
+					},
+					{
+						name: 'Marketing Email Unsubscribed',
+						value: 'unsubscribed',
+						description: 'Triggers when marketing email is unsubscribed',
+					},
+				],
+				default: [],
+				required: true,
+				type: 'multiOptions',
+			},
+			{
+				displayName: 'Trigger On',
+				displayOptions: {
+					show: {
+						type: ['inbound'],
+					},
+				},
+				name: 'events',
+				placeholder: 'Add Event',
+				options: [
+					{
+						name: 'Inbound Email Processed',
+						value: 'inboundEmailProcessed',
+						description: 'Triggers when inbound email is processed',
+					},
+				],
+				default: [],
+				required: true,
+				type: 'multiOptions',
+			},
+		],
+	};
+
+	webhookMethods = {
+		default: {
+			async checkExists(this: IHookFunctions): Promise<boolean> {
+				const webhookData = this.getWorkflowStaticData('node');
+
+				const webhookUrl = this.getNodeWebhookUrl('default') as string;
+
+				const type = this.getNodeParameter('type') as string;
+
+				const events = this.getNodeParameter('events') as string[];
+
+				try {
+					const { webhooks } = await BrevoWebhookApi.fetchWebhooks(this, type);
+
+					for (const webhook of webhooks) {
+						if (
+							webhook.type === type &&
+							webhook.events.every((event) => events.includes(event)) &&
+							webhookUrl === webhook.url
+						) {
+							webhookData.webhookId = webhook.id;
+							return true;
+						}
+					}
+					// If it did not error then the webhook exists
+					return false;
+				} catch (err) {
+					return false;
+				}
+			},
+			async create(this: IHookFunctions): Promise<boolean> {
+				const webhookData = this.getWorkflowStaticData('node');
+
+				const webhookUrl = this.getNodeWebhookUrl('default') as string;
+
+				const type = this.getNodeParameter('type') as string;
+
+				const events = this.getNodeParameter('events') as string[];
+
+				const responseData = await BrevoWebhookApi.createWebHook(this, type, events, webhookUrl);
+
+				if (responseData?.id === undefined) {
+					// Required data is missing so was not successful
+					return false;
+				}
+
+				webhookData.webhookId = responseData.id;
+
+				return true;
+			},
+			async delete(this: IHookFunctions): Promise<boolean> {
+				const webhookData = this.getWorkflowStaticData('node');
+
+				if (webhookData.webhookId !== undefined) {
+					try {
+						await BrevoWebhookApi.deleteWebhook(this, webhookData.webhookId as string);
+					} catch (error) {
+						return false;
+					}
+
+					// Remove from the static workflow data so that it is clear
+					// that no webhooks are registered anymore
+					delete webhookData.webhookId;
+					delete webhookData.webhookEvents;
+					delete webhookData.hookSecret;
+				}
+
+				return true;
+			},
+		},
+	};
+
+	async webhook(this: IWebhookFunctions): Promise<IWebhookResponseData> {
+		// The data to return and so start the workflow with
+		const bodyData = this.getBodyData();
+
+		return {
+			workflowData: [this.helpers.returnJsonArray(bodyData)],
+		};
+	}
+}
diff --git a/packages/nodes-base/nodes/SendInBlue/ContactDescription.ts b/packages/nodes-base/nodes/Brevo/ContactDescription.ts
similarity index 100%
rename from packages/nodes-base/nodes/SendInBlue/ContactDescription.ts
rename to packages/nodes-base/nodes/Brevo/ContactDescription.ts
diff --git a/packages/nodes-base/nodes/SendInBlue/EmailDescription.ts b/packages/nodes-base/nodes/Brevo/EmailDescription.ts
similarity index 90%
rename from packages/nodes-base/nodes/SendInBlue/EmailDescription.ts
rename to packages/nodes-base/nodes/Brevo/EmailDescription.ts
index 8a1cc400ea5f1..63fda3ab10515 100644
--- a/packages/nodes-base/nodes/SendInBlue/EmailDescription.ts
+++ b/packages/nodes-base/nodes/Brevo/EmailDescription.ts
@@ -1,5 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
-import { SendInBlueNode } from './GenericFunctions';
+import { BrevoNode } from './GenericFunctions';
 
 export const emailOperations: INodeProperties[] = [
 	{
@@ -120,7 +120,7 @@ const sendHtmlEmailFields: INodeProperties[] = [
 		required: true,
 		routing: {
 			send: {
-				preSend: [SendInBlueNode.Validators.validateAndCompileSenderEmail],
+				preSend: [BrevoNode.Validators.validateAndCompileSenderEmail],
 			},
 		},
 	},
@@ -138,7 +138,7 @@ const sendHtmlEmailFields: INodeProperties[] = [
 		required: true,
 		routing: {
 			send: {
-				preSend: [SendInBlueNode.Validators.validateAndCompileReceipientEmails],
+				preSend: [BrevoNode.Validators.validateAndCompileReceipientEmails],
 			},
 		},
 	},
@@ -180,7 +180,7 @@ const sendHtmlEmailFields: INodeProperties[] = [
 				],
 				routing: {
 					send: {
-						preSend: [SendInBlueNode.Validators.validateAndCompileAttachmentsData],
+						preSend: [BrevoNode.Validators.validateAndCompileAttachmentsData],
 					},
 				},
 			},
@@ -206,7 +206,7 @@ const sendHtmlEmailFields: INodeProperties[] = [
 				],
 				routing: {
 					send: {
-						preSend: [SendInBlueNode.Validators.validateAndCompileBCCEmails],
+						preSend: [BrevoNode.Validators.validateAndCompileBCCEmails],
 					},
 				},
 			},
@@ -232,7 +232,7 @@ const sendHtmlEmailFields: INodeProperties[] = [
 				],
 				routing: {
 					send: {
-						preSend: [SendInBlueNode.Validators.validateAndCompileCCEmails],
+						preSend: [BrevoNode.Validators.validateAndCompileCCEmails],
 					},
 				},
 			},
@@ -259,7 +259,7 @@ const sendHtmlEmailFields: INodeProperties[] = [
 				],
 				routing: {
 					send: {
-						preSend: [SendInBlueNode.Validators.validateAndCompileTags],
+						preSend: [BrevoNode.Validators.validateAndCompileTags],
 					},
 				},
 			},
@@ -339,7 +339,7 @@ const sendHtmlTemplateEmailFields: INodeProperties[] = [
 		required: true,
 		routing: {
 			send: {
-				preSend: [SendInBlueNode.Validators.validateAndCompileReceipientEmails],
+				preSend: [BrevoNode.Validators.validateAndCompileReceipientEmails],
 			},
 		},
 	},
@@ -381,7 +381,7 @@ const sendHtmlTemplateEmailFields: INodeProperties[] = [
 				],
 				routing: {
 					send: {
-						preSend: [SendInBlueNode.Validators.validateAndCompileAttachmentsData],
+						preSend: [BrevoNode.Validators.validateAndCompileAttachmentsData],
 					},
 				},
 			},
@@ -408,7 +408,7 @@ const sendHtmlTemplateEmailFields: INodeProperties[] = [
 				],
 				routing: {
 					send: {
-						preSend: [SendInBlueNode.Validators.validateAndCompileTags],
+						preSend: [BrevoNode.Validators.validateAndCompileTags],
 					},
 				},
 			},
@@ -437,7 +437,7 @@ const sendHtmlTemplateEmailFields: INodeProperties[] = [
 				],
 				routing: {
 					send: {
-						preSend: [SendInBlueNode.Validators.validateAndCompileTemplateParameters],
+						preSend: [BrevoNode.Validators.validateAndCompileTemplateParameters],
 					},
 				},
 			},
diff --git a/packages/nodes-base/nodes/Brevo/GenericFunctions.ts b/packages/nodes-base/nodes/Brevo/GenericFunctions.ts
new file mode 100644
index 0000000000000..d43f3e8bfddda
--- /dev/null
+++ b/packages/nodes-base/nodes/Brevo/GenericFunctions.ts
@@ -0,0 +1,376 @@
+import type {
+	IExecuteSingleFunctions,
+	IHookFunctions,
+	IHttpRequestOptions,
+	IRequestOptions,
+	IWebhookFunctions,
+	JsonObject,
+} from 'n8n-workflow';
+import { jsonParse, NodeOperationError } from 'n8n-workflow';
+import MailComposer from 'nodemailer/lib/mail-composer';
+export namespace BrevoNode {
+	type ValidEmailFields = { to: string } | { sender: string } | { cc: string } | { bcc: string };
+	type Address = { address: string; name?: string };
+	type Email = { email: string; name?: string };
+	type ToEmail = { to: Email[] };
+	type SenderEmail = { sender: Email };
+	type CCEmail = { cc: Email[] };
+	type BBCEmail = { bbc: Email[] };
+	type ValidatedEmail = ToEmail | SenderEmail | CCEmail | BBCEmail;
+
+	const enum OVERRIDE_MAP_VALUES {
+		'CATEGORY' = 'category',
+		'NORMAL' = 'boolean',
+		'TRANSACTIONAL' = 'id',
+	}
+
+	const enum OVERRIDE_MAP_TYPE {
+		'CATEGORY' = 'category',
+		'NORMAL' = 'normal',
+		'TRANSACTIONAL' = 'transactional',
+	}
+
+	export const INTERCEPTORS = new Map<string, (body: JsonObject) => void>([
+		[
+			OVERRIDE_MAP_TYPE.CATEGORY,
+			(body: JsonObject) => {
+				body.type = OVERRIDE_MAP_VALUES.CATEGORY;
+			},
+		],
+		[
+			OVERRIDE_MAP_TYPE.NORMAL,
+			(body: JsonObject) => {
+				body.type = OVERRIDE_MAP_VALUES.NORMAL;
+			},
+		],
+		[
+			OVERRIDE_MAP_TYPE.TRANSACTIONAL,
+			(body: JsonObject) => {
+				body.type = OVERRIDE_MAP_VALUES.TRANSACTIONAL;
+			},
+		],
+	]);
+	export namespace Validators {
+		function getFileName(
+			itemIndex: number,
+			mimeType: string,
+			fileExt: string,
+			fileName: string,
+		): string {
+			let ext = fileExt;
+			if (fileExt === undefined) {
+				ext = mimeType.split('/')[1];
+			}
+
+			let name = `${fileName}.${ext}`;
+			if (fileName === undefined) {
+				name = `file-${itemIndex}.${ext}`;
+			}
+			return name;
+		}
+
+		export async function validateAndCompileAttachmentsData(
+			this: IExecuteSingleFunctions,
+			requestOptions: IHttpRequestOptions,
+		): Promise<IHttpRequestOptions> {
+			const dataPropertyList = this.getNodeParameter(
+				'additionalFields.emailAttachments.attachment',
+			) as JsonObject;
+			const { body } = requestOptions;
+
+			const { attachment = [] } = body as { attachment: Array<{ content: string; name: string }> };
+
+			try {
+				const { binaryPropertyName } = dataPropertyList;
+				const dataMappingList = (binaryPropertyName as string).split(',');
+				for (const attachmentDataName of dataMappingList) {
+					const binaryData = this.helpers.assertBinaryData(attachmentDataName);
+					const bufferFromIncomingData = await this.helpers.getBinaryDataBuffer(attachmentDataName);
+
+					const {
+						data: content,
+						mimeType,
+						fileName,
+						fileExtension,
+					} = await this.helpers.prepareBinaryData(bufferFromIncomingData);
+
+					const itemIndex = this.getItemIndex();
+					const name = getFileName(
+						itemIndex,
+						mimeType,
+						fileExtension!,
+						fileName ?? binaryData.fileName!,
+					);
+
+					attachment.push({ content, name });
+				}
+
+				Object.assign(body!, { attachment });
+
+				return requestOptions;
+			} catch (err) {
+				throw new NodeOperationError(this.getNode(), err as Error);
+			}
+		}
+
+		export async function validateAndCompileTags(
+			this: IExecuteSingleFunctions,
+			requestOptions: IHttpRequestOptions,
+		): Promise<IHttpRequestOptions> {
+			const { tag } = this.getNodeParameter('additionalFields.emailTags.tags') as JsonObject;
+			const tags = (tag as string)
+				.split(',')
+				.map((entry) => entry.trim())
+				.filter((entry) => {
+					return entry !== '';
+				});
+			const { body } = requestOptions;
+			Object.assign(body!, { tags });
+			return requestOptions;
+		}
+
+		function formatToEmailName(data: Address): Email {
+			const { address: email, name } = data;
+			const result = { email };
+			if (name !== undefined && name !== '') {
+				Object.assign(result, { name });
+			}
+			return { ...result };
+		}
+
+		function validateEmailStrings(input: ValidEmailFields): ValidatedEmail {
+			const composer = new MailComposer({ ...input });
+			const addressFields = composer.compile().getAddresses();
+
+			const fieldFetcher = new Map<string, () => Email[] | Email>([
+				[
+					'bcc',
+					() => {
+						return (addressFields.bcc as unknown as Address[])?.map(formatToEmailName);
+					},
+				],
+				[
+					'cc',
+					() => {
+						return (addressFields.cc as unknown as Address[])?.map(formatToEmailName);
+					},
+				],
+				[
+					'from',
+					() => {
+						return (addressFields.from as unknown as Address[])?.map(formatToEmailName);
+					},
+				],
+				[
+					'reply-to',
+					() => {
+						return (addressFields['reply-to'] as unknown as Address[])?.map(formatToEmailName);
+					},
+				],
+				[
+					'sender',
+					() => {
+						return (addressFields.sender as unknown as Address[])?.map(formatToEmailName)[0];
+					},
+				],
+				[
+					'to',
+					() => {
+						return (addressFields.to as unknown as Address[])?.map(formatToEmailName);
+					},
+				],
+			]);
+
+			const result: { [key in keyof ValidatedEmail]: Email[] | Email } = {} as ValidatedEmail;
+			Object.keys(input).reduce((obj: { [key: string]: Email[] | Email }, key: string) => {
+				const getter = fieldFetcher.get(key);
+				const value = getter!();
+				obj[key] = value;
+				return obj;
+			}, result);
+
+			return result as ValidatedEmail;
+		}
+
+		export async function validateAndCompileCCEmails(
+			this: IExecuteSingleFunctions,
+			requestOptions: IHttpRequestOptions,
+		): Promise<IHttpRequestOptions> {
+			const ccData = this.getNodeParameter(
+				'additionalFields.receipientsCC.receipientCc',
+			) as JsonObject;
+			const { cc } = ccData;
+			const { body } = requestOptions;
+			const data = validateEmailStrings({ cc: cc as string });
+			Object.assign(body!, data);
+
+			return requestOptions;
+		}
+
+		export async function validateAndCompileBCCEmails(
+			this: IExecuteSingleFunctions,
+			requestOptions: IHttpRequestOptions,
+		): Promise<IHttpRequestOptions> {
+			const bccData = this.getNodeParameter(
+				'additionalFields.receipientsBCC.receipientBcc',
+			) as JsonObject;
+			const { bcc } = bccData;
+			const { body } = requestOptions;
+			const data = validateEmailStrings({ bcc: bcc as string });
+			Object.assign(body!, data);
+
+			return requestOptions;
+		}
+
+		export async function validateAndCompileReceipientEmails(
+			this: IExecuteSingleFunctions,
+			requestOptions: IHttpRequestOptions,
+		): Promise<IHttpRequestOptions> {
+			const to = this.getNodeParameter('receipients') as string;
+			const { body } = requestOptions;
+			const data = validateEmailStrings({ to });
+			Object.assign(body!, data);
+
+			return requestOptions;
+		}
+
+		export async function validateAndCompileSenderEmail(
+			this: IExecuteSingleFunctions,
+			requestOptions: IHttpRequestOptions,
+		): Promise<IHttpRequestOptions> {
+			const sender = this.getNodeParameter('sender') as string;
+			const { body } = requestOptions;
+			const data = validateEmailStrings({ sender });
+			Object.assign(body!, data);
+
+			return requestOptions;
+		}
+
+		export async function validateAndCompileTemplateParameters(
+			this: IExecuteSingleFunctions,
+			requestOptions: IHttpRequestOptions,
+		): Promise<IHttpRequestOptions> {
+			const parameterData = this.getNodeParameter(
+				'additionalFields.templateParameters.parameterValues',
+			);
+			const { body } = requestOptions;
+			const { parameters } = parameterData as JsonObject;
+			const params = (parameters as string)
+				.split(',')
+				.filter((parameter) => {
+					return parameter.split('=').length === 2;
+				})
+				.map((parameter) => {
+					const [key, value] = parameter.split('=');
+					return {
+						[key]: value,
+					};
+				})
+				.reduce((obj, cObj) => {
+					Object.assign(obj, cObj);
+					return obj;
+				}, {});
+
+			Object.assign(body!, { params });
+			return requestOptions;
+		}
+	}
+}
+
+export namespace BrevoWebhookApi {
+	interface WebhookDetails {
+		url: string;
+		id: number;
+		description: string;
+		events: string[];
+		type: string;
+		createdAt: string;
+		modifiedAt: string;
+	}
+
+	interface WebhookId {
+		id: string;
+	}
+
+	interface Webhooks {
+		webhooks: WebhookDetails[];
+	}
+
+	const credentialsName = 'sendInBlueApi';
+	const baseURL = 'https://api.brevo.com/v3';
+	export const supportedAuthMap = new Map<string, (ref: IWebhookFunctions) => Promise<string>>([
+		[
+			'apiKey',
+			async (ref: IWebhookFunctions): Promise<string> => {
+				const credentials = await ref.getCredentials(credentialsName);
+				return credentials.sharedSecret as string;
+			},
+		],
+	]);
+
+	export const fetchWebhooks = async (ref: IHookFunctions, type: string): Promise<Webhooks> => {
+		const endpoint = `${baseURL}/webhooks?type=${type}`;
+
+		const options: IRequestOptions = {
+			method: 'GET',
+			headers: {
+				Accept: 'application/json',
+			},
+			uri: endpoint,
+		};
+
+		const webhooks = (await ref.helpers.requestWithAuthentication.call(
+			ref,
+			credentialsName,
+			options,
+		)) as string;
+
+		return await jsonParse(webhooks);
+	};
+
+	export const createWebHook = async (
+		ref: IHookFunctions,
+		type: string,
+		events: string[],
+		url: string,
+	): Promise<WebhookId> => {
+		const endpoint = `${baseURL}/webhooks`;
+
+		const options: IRequestOptions = {
+			method: 'POST',
+			headers: {
+				Accept: 'application/json',
+			},
+			uri: endpoint,
+			body: {
+				events,
+				type,
+				url,
+			},
+		};
+
+		const webhookId = await ref.helpers.requestWithAuthentication.call(
+			ref,
+			credentialsName,
+			options,
+		);
+
+		return await jsonParse(webhookId as string);
+	};
+
+	export const deleteWebhook = async (ref: IHookFunctions, webhookId: string) => {
+		const endpoint = `${baseURL}/webhooks/${webhookId}`;
+		const body = {};
+
+		const options: IRequestOptions = {
+			method: 'DELETE',
+			headers: {
+				Accept: 'application/json',
+			},
+			uri: endpoint,
+			body,
+		};
+
+		return await ref.helpers.requestWithAuthentication.call(ref, credentialsName, options);
+	};
+}
diff --git a/packages/nodes-base/nodes/SendInBlue/SenderDescrition.ts b/packages/nodes-base/nodes/Brevo/SenderDescrition.ts
similarity index 100%
rename from packages/nodes-base/nodes/SendInBlue/SenderDescrition.ts
rename to packages/nodes-base/nodes/Brevo/SenderDescrition.ts
diff --git a/packages/nodes-base/nodes/Brevo/brevo.svg b/packages/nodes-base/nodes/Brevo/brevo.svg
new file mode 100644
index 0000000000000..9106e736ebce9
--- /dev/null
+++ b/packages/nodes-base/nodes/Brevo/brevo.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" fill="none"><circle cx="24" cy="24" r="24" fill="#0B996E"/><path fill="#fff" d="M31.504 21.81c1.483-1.454 2.179-3.133 2.179-5.175 0-4.22-3.106-7.035-7.787-7.035H14.4v30h9.27C30.718 39.6 36 35.289 36 29.57c0-3.132-1.622-5.945-4.496-7.76m-12.932-8.308h6.86c2.317 0 3.848 1.316 3.848 3.313 0 2.269-1.993 3.994-6.072 5.31-2.781.861-4.032 1.588-4.496 2.451l-.14.002zm4.727 22.196h-4.727v-4.63c0-2.042 1.762-4.039 4.219-4.81 2.179-.727 3.985-1.454 5.516-2.224 2.039 1.181 3.29 3.222 3.29 5.356 0 3.63-3.523 6.308-8.298 6.308"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Bubble/Bubble.node.ts b/packages/nodes-base/nodes/Bubble/Bubble.node.ts
index 4b59dbb15e928..4bc11de82156f 100644
--- a/packages/nodes-base/nodes/Bubble/Bubble.node.ts
+++ b/packages/nodes-base/nodes/Bubble/Bubble.node.ts
@@ -179,6 +179,6 @@ export class Bubble implements INodeType {
 			returnData.push(...executionData);
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Bubble/GenericFunctions.ts b/packages/nodes-base/nodes/Bubble/GenericFunctions.ts
index 3128e91ee9438..46927492e96b6 100644
--- a/packages/nodes-base/nodes/Bubble/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Bubble/GenericFunctions.ts
@@ -4,17 +4,17 @@ import type {
 	IDataObject,
 	ILoadOptionsFunctions,
 	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import type { OptionsWithUri } from 'request';
-
 /**
  * Make an authenticated API request to Bubble.
  */
 export async function bubbleApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject,
 	qs: IDataObject,
@@ -32,7 +32,7 @@ export async function bubbleApiRequest(
 	const rootUrl = hosting === 'bubbleHosted' ? `https://${appName}.bubbleapps.io` : domain;
 	const urlSegment = environment === 'development' ? '/version-test/api/1.1' : '/api/1.1';
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			'user-agent': 'n8n',
 			Authorization: `Bearer ${apiToken}`,
@@ -64,7 +64,7 @@ export async function bubbleApiRequest(
  */
 export async function bubbleApiRequestAllItems(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject,
 	qs: IDataObject,
diff --git a/packages/nodes-base/nodes/Bubble/bubble.svg b/packages/nodes-base/nodes/Bubble/bubble.svg
index 8f68a8b2aa5a6..1c41d3fe7efcd 100644
--- a/packages/nodes-base/nodes/Bubble/bubble.svg
+++ b/packages/nodes-base/nodes/Bubble/bubble.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="-16 -10 85 85" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><path d="M145.432 17.494c-6.051 0-12.034 2.596-16.584 7.719V0h-9.017v42.455c0 13.786 11.174 24.961 24.961 24.961s24.961-11.174 24.961-24.961-10.534-24.961-24.32-24.961zm-.657 40.298a15.34 15.34 0 01-15.337-15.337c0-8.461 6.876-15.337 15.337-15.337a15.34 15.34 0 0115.337 15.337c0 8.461-6.86 15.337-15.337 15.337zm56.562-40.298c-6.051 0-12.034 2.596-16.584 7.719V0h-9.017v42.455c0 13.786 11.174 24.961 24.961 24.961s24.961-11.174 24.961-24.961-10.551-24.961-24.32-24.961zm-.657 40.298a15.34 15.34 0 01-15.337-15.337c0-8.461 6.876-15.337 15.337-15.337a15.34 15.34 0 0115.337 15.337 15.34 15.34 0 01-15.337 15.337zM69.067 46.821V18.843h9.674v27.893c0 7.129 4.129 11.697 11.09 11.697 7.045 0 11.09-4.399 11.09-11.697V18.843h9.758v27.978c0 12.927-7.837 20.579-20.848 20.579-12.674.017-20.764-7.905-20.764-20.579zM243.101 66.27h-9.674V0h9.674v66.27zm54.775-19.972h-37.028c1.416 7.382 6.59 12.404 15.741 12.404 5.36 0 11.882-2.022 16.096-5.107l4.045 7.129c-4.837 3.607-12.489 6.59-20.494 6.59-17.764 0-25.416-12.404-25.416-24.893 0-7.129 2.191-13.011 6.691-17.68 4.483-4.669 10.382-7.045 17.511-7.045 6.775 0 12.405 2.107 16.719 6.421s6.506 10.112 6.506 17.511a39.392 39.392 0 01-.371 4.669zm-37.045-7.921h27.624c-.792-7.483-6.337-12.32-13.466-12.32-7.298 0-12.742 4.938-14.157 12.32zM38.343 17.494c-6.051 0-12.034 2.596-16.584 7.719V0h-9.034v42.455c0 13.786 11.174 24.961 24.961 24.961s24.961-11.174 24.961-24.961-10.534-24.961-24.303-24.961zm-.657 40.298a15.34 15.34 0 01-15.337-15.337c0-8.461 6.876-15.337 15.337-15.337a15.34 15.34 0 0115.337 15.337 15.34 15.34 0 01-15.337 15.337z" fill="#000" fill-rule="nonzero" stroke="none"/><path d="M0 61.231c0-3.417 2.751-6.169 6.169-6.169s6.168 2.751 6.168 6.169S9.586 67.4 6.169 67.4 0 64.648 0 61.231z" fill="#00f" fill-rule="nonzero" stroke="none"/></symbol></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round" viewBox="-16 -10 85 85"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><path fill="#000" fill-rule="nonzero" stroke="none" d="M145.432 17.494c-6.051 0-12.034 2.596-16.584 7.719V0h-9.017v42.455c0 13.786 11.174 24.961 24.961 24.961s24.961-11.174 24.961-24.961-10.534-24.961-24.32-24.961zm-.657 40.298a15.34 15.34 0 0 1-15.337-15.337c0-8.461 6.876-15.337 15.337-15.337a15.34 15.34 0 0 1 15.337 15.337c0 8.461-6.86 15.337-15.337 15.337m56.562-40.298c-6.051 0-12.034 2.596-16.584 7.719V0h-9.017v42.455c0 13.786 11.174 24.961 24.961 24.961s24.961-11.174 24.961-24.961-10.551-24.961-24.32-24.961zm-.657 40.298a15.34 15.34 0 0 1-15.337-15.337c0-8.461 6.876-15.337 15.337-15.337a15.34 15.34 0 0 1 15.337 15.337 15.34 15.34 0 0 1-15.337 15.337M69.067 46.821V18.843h9.674v27.893c0 7.129 4.129 11.697 11.09 11.697 7.045 0 11.09-4.399 11.09-11.697V18.843h9.758v27.978c0 12.927-7.837 20.579-20.848 20.579-12.674.017-20.764-7.905-20.764-20.579M243.101 66.27h-9.674V0h9.674zm54.775-19.972h-37.028c1.416 7.382 6.59 12.404 15.741 12.404 5.36 0 11.882-2.022 16.096-5.107l4.045 7.129c-4.837 3.607-12.489 6.59-20.494 6.59-17.764 0-25.416-12.404-25.416-24.893 0-7.129 2.191-13.011 6.691-17.68 4.483-4.669 10.382-7.045 17.511-7.045 6.775 0 12.405 2.107 16.719 6.421s6.506 10.112 6.506 17.511a39 39 0 0 1-.371 4.669zm-37.045-7.921h27.624c-.792-7.483-6.337-12.32-13.466-12.32-7.298 0-12.742 4.938-14.157 12.32zM38.343 17.494c-6.051 0-12.034 2.596-16.584 7.719V0h-9.034v42.455c0 13.786 11.174 24.961 24.961 24.961s24.961-11.174 24.961-24.961-10.534-24.961-24.303-24.961zm-.657 40.298a15.34 15.34 0 0 1-15.337-15.337c0-8.461 6.876-15.337 15.337-15.337a15.34 15.34 0 0 1 15.337 15.337 15.34 15.34 0 0 1-15.337 15.337"/><path fill="#00f" fill-rule="nonzero" stroke="none" d="M0 61.231c0-3.417 2.751-6.169 6.169-6.169s6.168 2.751 6.168 6.169S9.586 67.4 6.169 67.4 0 64.648 0 61.231"/></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Cal/GenericFunctions.ts b/packages/nodes-base/nodes/Cal/GenericFunctions.ts
index e95eb42cfedfa..d1aecef3640ed 100644
--- a/packages/nodes-base/nodes/Cal/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Cal/GenericFunctions.ts
@@ -37,6 +37,7 @@ export async function calApiRequest(
 	try {
 		return await this.helpers.httpRequestWithAuthentication.call(this, 'calApi', options);
 	} catch (error) {
+		if (error instanceof NodeApiError) throw error;
 		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
diff --git a/packages/nodes-base/nodes/Cal/cal.svg b/packages/nodes-base/nodes/Cal/cal.svg
index c9a78d28e7390..618835733710a 100644
--- a/packages/nodes-base/nodes/Cal/cal.svg
+++ b/packages/nodes-base/nodes/Cal/cal.svg
@@ -1,9 +1 @@
-<svg width="101" height="22" viewBox="0 0 101 22" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10.0582 20.817C4.32115 20.817 0 16.2763 0 10.6704C0 5.04589 4.1005 0.467773 10.0582 0.467773C13.2209 0.467773 15.409 1.43945 17.1191 3.66311L14.3609 5.96151C13.2025 4.72822 11.805 4.11158 10.0582 4.11158C6.17833 4.11158 4.04533 7.08268 4.04533 10.6704C4.04533 14.2582 6.38059 17.1732 10.0582 17.1732C11.7866 17.1732 13.2577 16.5566 14.4161 15.3233L17.1375 17.7151C15.501 19.8453 13.2577 20.817 10.0582 20.817Z" fill="#292929"/>
-<path d="M29.0161 5.88601H32.7304V20.4612H29.0161V18.331C28.2438 19.8446 26.9566 20.8536 24.4927 20.8536C20.5577 20.8536 17.4133 17.4341 17.4133 13.2297C17.4133 9.02528 20.5577 5.60571 24.4927 5.60571C26.9383 5.60571 28.2438 6.61477 29.0161 8.12835V5.88601ZM29.1264 13.2297C29.1264 10.95 27.5634 9.06266 25.0995 9.06266C22.7274 9.06266 21.1828 10.9686 21.1828 13.2297C21.1828 15.4346 22.7274 17.3967 25.0995 17.3967C27.5451 17.3967 29.1264 15.4907 29.1264 13.2297Z" fill="#292929"/>
-<path d="M35.3599 0H39.0742V20.4427H35.3599V0Z" fill="#292929"/>
-<path d="M40.7291 18.5182C40.7291 17.3223 41.6853 16.3132 42.9908 16.3132C44.2964 16.3132 45.2158 17.3223 45.2158 18.5182C45.2158 19.7515 44.278 20.7605 42.9908 20.7605C41.7037 20.7605 40.7291 19.7515 40.7291 18.5182Z" fill="#292929"/>
-<path d="M59.4296 18.1068C58.0505 19.7885 55.9543 20.8536 53.4719 20.8536C49.0404 20.8536 45.7858 17.4341 45.7858 13.2297C45.7858 9.02528 49.0404 5.60571 53.4719 5.60571C55.8623 5.60571 57.9402 6.61477 59.3193 8.20309L56.4508 10.6136C55.7336 9.71667 54.7958 9.04397 53.4719 9.04397C51.0999 9.04397 49.5553 10.95 49.5553 13.211C49.5553 15.472 51.0999 17.378 53.4719 17.378C54.9062 17.378 55.8991 16.6306 56.6346 15.6215L59.4296 18.1068Z" fill="#292929"/>
-<path d="M59.7422 13.2297C59.7422 9.02528 62.9968 5.60571 67.4283 5.60571C71.8598 5.60571 75.1144 9.02528 75.1144 13.2297C75.1144 17.4341 71.8598 20.8536 67.4283 20.8536C62.9968 20.8349 59.7422 17.4341 59.7422 13.2297ZM71.3449 13.2297C71.3449 10.95 69.8003 9.06266 67.4283 9.06266C65.0563 9.04397 63.5117 10.95 63.5117 13.2297C63.5117 15.4907 65.0563 17.3967 67.4283 17.3967C69.8003 17.3967 71.3449 15.4907 71.3449 13.2297Z" fill="#292929"/>
-<path d="M100.232 11.5482V20.4428H96.518V12.4638C96.518 9.94119 95.3412 8.85739 93.576 8.85739C91.921 8.85739 90.7442 9.67958 90.7442 12.4638V20.4428H87.0299V12.4638C87.0299 9.94119 85.8346 8.85739 84.0878 8.85739C82.4329 8.85739 80.9802 9.67958 80.9802 12.4638V20.4428H77.2659V5.8676H80.9802V7.88571C81.7525 6.31607 83.15 5.53125 85.3014 5.53125C87.3425 5.53125 89.0525 6.5403 89.9903 8.24074C90.9281 6.50293 92.3072 5.53125 94.8079 5.53125C97.8603 5.54994 100.232 7.86702 100.232 11.5482Z" fill="#292929"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="101" height="22" fill="none"><path fill="#292929" d="M10.058 20.817C4.321 20.817 0 16.277 0 10.67 0 5.046 4.1.468 10.058.468c3.163 0 5.351.971 7.061 3.195l-2.758 2.299c-1.158-1.234-2.556-1.85-4.303-1.85-3.88 0-6.013 2.97-6.013 6.558s2.336 6.503 6.013 6.503c1.729 0 3.2-.616 4.358-1.85l2.721 2.392c-1.636 2.13-3.88 3.102-7.079 3.102M29.016 5.886h3.714v14.575h-3.714v-2.13c-.772 1.514-2.06 2.523-4.523 2.523-3.935 0-7.08-3.42-7.08-7.624 0-4.205 3.145-7.624 7.08-7.624 2.445 0 3.75 1.009 4.523 2.522zm.11 7.344c0-2.28-1.563-4.167-4.027-4.167-2.372 0-3.916 1.906-3.916 4.167 0 2.205 1.544 4.167 3.916 4.167 2.446 0 4.027-1.906 4.027-4.167M35.36 0h3.714v20.443H35.36zm5.37 18.518c0-1.196.955-2.205 2.26-2.205a2.18 2.18 0 0 1 2.226 2.205c0 1.233-.938 2.242-2.225 2.242a2.23 2.23 0 0 1-2.262-2.242m18.701-.411c-1.38 1.681-3.476 2.747-5.958 2.747-4.432 0-7.686-3.42-7.686-7.624 0-4.205 3.254-7.624 7.686-7.624 2.39 0 4.468 1.009 5.847 2.597l-2.868 2.41c-.717-.896-1.655-1.569-2.98-1.569-2.371 0-3.916 1.906-3.916 4.167s1.545 4.167 3.917 4.167c1.434 0 2.427-.747 3.163-1.757zm.312-4.877c0-4.205 3.255-7.624 7.686-7.624 4.432 0 7.686 3.42 7.686 7.624s-3.254 7.624-7.686 7.624c-4.431-.02-7.686-3.42-7.686-7.624m11.603 0c0-2.28-1.545-4.167-3.917-4.167-2.372-.019-3.916 1.887-3.916 4.167 0 2.26 1.544 4.167 3.916 4.167s3.917-1.906 3.917-4.167m28.887-1.682v8.895h-3.714v-7.98c0-2.522-1.177-3.606-2.942-3.606-1.655 0-2.832.823-2.832 3.607v7.979H87.03v-7.98c0-2.522-1.195-3.606-2.942-3.606-1.655 0-3.108.823-3.108 3.607v7.979h-3.714V5.868h3.714v2.018c.772-1.57 2.17-2.355 4.321-2.355 2.041 0 3.751 1.01 4.69 2.71.937-1.738 2.316-2.71 4.817-2.71 3.052.019 5.424 2.336 5.424 6.017"/></svg>
diff --git a/packages/nodes-base/nodes/Calendly/GenericFunctions.ts b/packages/nodes-base/nodes/Calendly/GenericFunctions.ts
index af6f532623ec3..4befbb5ceed21 100644
--- a/packages/nodes-base/nodes/Calendly/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Calendly/GenericFunctions.ts
@@ -1,5 +1,3 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	ICredentialDataDecryptedObject,
 	ICredentialTestFunctions,
@@ -8,6 +6,8 @@ import type {
 	ILoadOptionsFunctions,
 	IHookFunctions,
 	IWebhookFunctions,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 
 export function getAuthenticationType(data: string): 'accessToken' | 'apiKey' {
@@ -18,7 +18,7 @@ export function getAuthenticationType(data: string): 'accessToken' | 'apiKey' {
 
 export async function calendlyApiRequest(
 	this: IExecuteFunctions | IWebhookFunctions | IHookFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -41,7 +41,7 @@ export async function calendlyApiRequest(
 		endpoint = 'https://calendly.com/api/v1';
 	}
 
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		headers,
 		method,
 		body,
@@ -57,7 +57,7 @@ export async function calendlyApiRequest(
 		delete options.qs;
 	}
 	options = Object.assign({}, options, option);
-	return this.helpers.requestWithAuthentication.call(this, 'calendlyApi', options);
+	return await this.helpers.requestWithAuthentication.call(this, 'calendlyApi', options);
 }
 
 export async function validateCredentials(
@@ -72,7 +72,7 @@ export async function validateCredentials(
 
 	const authenticationType = getAuthenticationType(apiKey);
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		method: 'GET',
 		uri: '',
 		json: true,
@@ -89,5 +89,5 @@ export async function validateCredentials(
 			uri: 'https://calendly.com/api/v1/users/me',
 		});
 	}
-	return this.helpers.request(options);
+	return await this.helpers.request(options);
 }
diff --git a/packages/nodes-base/nodes/Calendly/calendly.svg b/packages/nodes-base/nodes/Calendly/calendly.svg
index 1273f106204a8..195a7461e33b6 100644
--- a/packages/nodes-base/nodes/Calendly/calendly.svg
+++ b/packages/nodes-base/nodes/Calendly/calendly.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 525.8 535.73"><defs><style>.cls-1{fill:none;}.cls-2{fill:#006bff;}.cls-3{fill:#0ae9ef;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Logo_assets" data-name="Logo assets"><g id="Brand_mark" data-name="Brand mark"><path class="cls-1" d="M443.74,337.62l-27.16,47.05a139.52,139.52,0,0,1-120.82,69.75H241.43a139.52,139.52,0,0,1-120.82-69.75L93.45,337.62a139.52,139.52,0,0,1,0-139.51l27.16-47.05A139.53,139.53,0,0,1,241.43,81.3h54.33a139.53,139.53,0,0,1,120.82,69.76l27.16,47.05a139.23,139.23,0,0,1,8.55,17.55c0,.12.09.23.13.35a102.15,102.15,0,0,0,44.33-18.24c0-.14-.08-.28-.13-.43a237.8,237.8,0,0,0-33.29-67.58,240.67,240.67,0,0,0-52-53.48A239.3,239.3,0,0,0,98.65,437.08a239.43,239.43,0,0,0,398-98.69c.05-.15.09-.29.13-.43a102.15,102.15,0,0,0-44.33-18.24c0,.12-.09.23-.13.35A139.23,139.23,0,0,1,443.74,337.62Z"/><path class="cls-2" d="M360.4,347.4c-17,15.09-38.21,33.87-76.78,33.87h-23c-27.88,0-53.23-10.12-71.37-28.49-17.72-17.94-27.48-42.5-27.48-69.16V252.11c0-26.66,9.76-51.22,27.48-69.16,18.14-18.37,43.49-28.49,71.37-28.49h23c38.57,0,59.76,18.78,76.78,33.87,17.65,15.65,32.9,29.16,73.52,29.16a116.05,116.05,0,0,0,18.5-1.48c0-.12-.08-.23-.13-.35a139.23,139.23,0,0,0-8.55-17.55l-27.16-47.05A139.53,139.53,0,0,0,295.76,81.3H241.43a139.53,139.53,0,0,0-120.82,69.76L93.45,198.11a139.52,139.52,0,0,0,0,139.51l27.16,47.05a139.52,139.52,0,0,0,120.82,69.75h54.33a139.52,139.52,0,0,0,120.82-69.75l27.16-47.05a139.23,139.23,0,0,0,8.55-17.55c0-.12.09-.23.13-.35a116.05,116.05,0,0,0-18.5-1.48C393.3,318.24,378.05,331.75,360.4,347.4Z"/><path class="cls-2" d="M283.62,183h-23c-42.42,0-70.3,30.3-70.3,69.09v31.51c0,38.79,27.88,69.09,70.3,69.09h23c61.82,0,57-63,150.3-63a144.19,144.19,0,0,1,26.37,2.41,139.36,139.36,0,0,0,0-48.46,143.32,143.32,0,0,1-26.37,2.42C340.59,246.05,345.44,183,283.62,183Z"/><path class="cls-2" d="M513.91,315.13a130.21,130.21,0,0,0-53.62-23c0,.16-.05.32-.08.47a138.46,138.46,0,0,1-7.79,27.16A102.15,102.15,0,0,1,496.75,338c0,.14-.08.28-.13.43A237.8,237.8,0,0,1,463.33,406a240.67,240.67,0,0,1-52,53.48A239.3,239.3,0,0,1,98.65,98.65a239.43,239.43,0,0,1,398,98.69c.05.15.09.29.13.43A102.15,102.15,0,0,1,452.42,216a139.36,139.36,0,0,1,7.8,27.18c0,.15,0,.3.07.44a129.94,129.94,0,0,0,53.62-23c15.29-11.31,12.33-24.09,10-31.65C490.22,79.52,388.33,0,267.86,0,119.93,0,0,119.93,0,267.86S119.93,535.73,267.86,535.73c120.47,0,222.36-79.52,256-188.94C526.24,339.23,529.2,326.45,513.91,315.13Z"/><path class="cls-3" d="M452.42,216a116.05,116.05,0,0,1-18.5,1.48c-40.62,0-55.87-13.51-73.52-29.16-17-15.09-38.21-33.87-76.78-33.87h-23c-27.88,0-53.23,10.12-71.37,28.49-17.72,17.94-27.48,42.5-27.48,69.16v31.51c0,26.66,9.76,51.22,27.48,69.16,18.14,18.37,43.49,28.49,71.37,28.49h23c38.57,0,59.76-18.78,76.78-33.87,17.65-15.65,32.9-29.16,73.52-29.16a116.05,116.05,0,0,1,18.5,1.48,138.46,138.46,0,0,0,7.79-27.16c0-.15.06-.31.08-.47a144.19,144.19,0,0,0-26.37-2.41c-93.33,0-88.48,63-150.3,63h-23c-42.42,0-70.3-30.3-70.3-69.09V252.11c0-38.79,27.88-69.09,70.3-69.09h23c61.82,0,57,63,150.3,63a143.32,143.32,0,0,0,26.37-2.42c0-.14,0-.29-.07-.44A139.36,139.36,0,0,0,452.42,216Z"/><path class="cls-3" d="M452.42,216a116.05,116.05,0,0,1-18.5,1.48c-40.62,0-55.87-13.51-73.52-29.16-17-15.09-38.21-33.87-76.78-33.87h-23c-27.88,0-53.23,10.12-71.37,28.49-17.72,17.94-27.48,42.5-27.48,69.16v31.51c0,26.66,9.76,51.22,27.48,69.16,18.14,18.37,43.49,28.49,71.37,28.49h23c38.57,0,59.76-18.78,76.78-33.87,17.65-15.65,32.9-29.16,73.52-29.16a116.05,116.05,0,0,1,18.5,1.48,138.46,138.46,0,0,0,7.79-27.16c0-.15.06-.31.08-.47a144.19,144.19,0,0,0-26.37-2.41c-93.33,0-88.48,63-150.3,63h-23c-42.42,0-70.3-30.3-70.3-69.09V252.11c0-38.79,27.88-69.09,70.3-69.09h23c61.82,0,57,63,150.3,63a143.32,143.32,0,0,0,26.37-2.42c0-.14,0-.29-.07-.44A139.36,139.36,0,0,0,452.42,216Z"/></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 525.8 535.73"><defs><style>.cls-2{fill:#006bff}.cls-3{fill:#0ae9ef}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Logo_assets" data-name="Logo assets"><g id="Brand_mark" data-name="Brand mark"><path d="m443.74 337.62-27.16 47.05a139.52 139.52 0 0 1-120.82 69.75h-54.33a139.52 139.52 0 0 1-120.82-69.75l-27.16-47.05a139.52 139.52 0 0 1 0-139.51l27.16-47.05A139.53 139.53 0 0 1 241.43 81.3h54.33a139.53 139.53 0 0 1 120.82 69.76l27.16 47.05a139 139 0 0 1 8.55 17.55c0 .12.09.23.13.35a102.15 102.15 0 0 0 44.33-18.24c0-.14-.08-.28-.13-.43a237.8 237.8 0 0 0-33.29-67.58 240.7 240.7 0 0 0-52-53.48 239.3 239.3 0 0 0-312.68 360.8 239.43 239.43 0 0 0 398-98.69c.05-.15.09-.29.13-.43a102.15 102.15 0 0 0-44.33-18.24c0 .12-.09.23-.13.35a139 139 0 0 1-8.58 17.55" style="fill:none"/><path d="M360.4 347.4c-17 15.09-38.21 33.87-76.78 33.87h-23c-27.88 0-53.23-10.12-71.37-28.49-17.72-17.94-27.48-42.5-27.48-69.16v-31.51c0-26.66 9.76-51.22 27.48-69.16 18.14-18.37 43.49-28.49 71.37-28.49h23c38.57 0 59.76 18.78 76.78 33.87 17.65 15.65 32.9 29.16 73.52 29.16a116 116 0 0 0 18.5-1.48c0-.12-.08-.23-.13-.35a139 139 0 0 0-8.55-17.55l-27.16-47.05A139.53 139.53 0 0 0 295.76 81.3h-54.33a139.53 139.53 0 0 0-120.82 69.76l-27.16 47.05a139.52 139.52 0 0 0 0 139.51l27.16 47.05a139.52 139.52 0 0 0 120.82 69.75h54.33a139.52 139.52 0 0 0 120.82-69.75l27.16-47.05a139 139 0 0 0 8.55-17.55c0-.12.09-.23.13-.35a116 116 0 0 0-18.5-1.48c-40.62 0-55.87 13.51-73.52 29.16" class="cls-2"/><path d="M283.62 183h-23c-42.42 0-70.3 30.3-70.3 69.09v31.51c0 38.79 27.88 69.09 70.3 69.09h23c61.82 0 57-63 150.3-63a144 144 0 0 1 26.37 2.41 139.4 139.4 0 0 0 0-48.46 143.3 143.3 0 0 1-26.37 2.42c-93.33-.01-88.48-63.06-150.3-63.06" class="cls-2"/><path d="M513.91 315.13a130.2 130.2 0 0 0-53.62-23c0 .16-.05.32-.08.47a138.5 138.5 0 0 1-7.79 27.16A102.15 102.15 0 0 1 496.75 338c0 .14-.08.28-.13.43A237.8 237.8 0 0 1 463.33 406a240.7 240.7 0 0 1-52 53.48A239.3 239.3 0 0 1 98.65 98.65a239.43 239.43 0 0 1 398 98.69c.05.15.09.29.13.43A102.15 102.15 0 0 1 452.42 216a139.4 139.4 0 0 1 7.8 27.18c0 .15 0 .3.07.44a129.94 129.94 0 0 0 53.62-23c15.29-11.31 12.33-24.09 10-31.65C490.22 79.52 388.33 0 267.86 0 119.93 0 0 119.93 0 267.86s119.93 267.87 267.86 267.87c120.47 0 222.36-79.52 256-188.94 2.38-7.56 5.34-20.34-9.95-31.66" class="cls-2"/><path d="M452.42 216a116 116 0 0 1-18.5 1.48c-40.62 0-55.87-13.51-73.52-29.16-17-15.09-38.21-33.87-76.78-33.87h-23c-27.88 0-53.23 10.12-71.37 28.49-17.72 17.94-27.48 42.5-27.48 69.16v31.51c0 26.66 9.76 51.22 27.48 69.16 18.14 18.37 43.49 28.49 71.37 28.49h23c38.57 0 59.76-18.78 76.78-33.87 17.65-15.65 32.9-29.16 73.52-29.16a116 116 0 0 1 18.5 1.48 138.5 138.5 0 0 0 7.79-27.16c0-.15.06-.31.08-.47a144 144 0 0 0-26.37-2.41c-93.33 0-88.48 63-150.3 63h-23c-42.42 0-70.3-30.3-70.3-69.09v-31.47c0-38.79 27.88-69.09 70.3-69.09h23c61.82 0 57 63 150.3 63a143.3 143.3 0 0 0 26.37-2.42c0-.14 0-.29-.07-.44a139.4 139.4 0 0 0-7.8-27.16" class="cls-3"/><path d="M452.42 216a116 116 0 0 1-18.5 1.48c-40.62 0-55.87-13.51-73.52-29.16-17-15.09-38.21-33.87-76.78-33.87h-23c-27.88 0-53.23 10.12-71.37 28.49-17.72 17.94-27.48 42.5-27.48 69.16v31.51c0 26.66 9.76 51.22 27.48 69.16 18.14 18.37 43.49 28.49 71.37 28.49h23c38.57 0 59.76-18.78 76.78-33.87 17.65-15.65 32.9-29.16 73.52-29.16a116 116 0 0 1 18.5 1.48 138.5 138.5 0 0 0 7.79-27.16c0-.15.06-.31.08-.47a144 144 0 0 0-26.37-2.41c-93.33 0-88.48 63-150.3 63h-23c-42.42 0-70.3-30.3-70.3-69.09v-31.47c0-38.79 27.88-69.09 70.3-69.09h23c61.82 0 57 63 150.3 63a143.3 143.3 0 0 0 26.37-2.42c0-.14 0-.29-.07-.44a139.4 139.4 0 0 0-7.8-27.16" class="cls-3"/></g></g></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Chargebee/Chargebee.node.ts b/packages/nodes-base/nodes/Chargebee/Chargebee.node.ts
index 781c252bcec67..5db36b4bcbaa0 100644
--- a/packages/nodes-base/nodes/Chargebee/Chargebee.node.ts
+++ b/packages/nodes-base/nodes/Chargebee/Chargebee.node.ts
@@ -6,6 +6,8 @@ import type {
 	INodeTypeDescription,
 	JsonObject,
 	NodeParameterValue,
+	IRequestOptions,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
@@ -281,7 +283,7 @@ export class Chargebee implements INodeType {
 									},
 								],
 								default: 'after',
-								description: 'Operation to decide where the the data should be mapped to',
+								description: 'Operation to decide where the data should be mapped to',
 							},
 							{
 								displayName: 'Date',
@@ -328,7 +330,7 @@ export class Chargebee implements INodeType {
 									},
 								],
 								default: 'gt',
-								description: 'Operation to decide where the the data should be mapped to',
+								description: 'Operation to decide where the data should be mapped to',
 							},
 							{
 								displayName: 'Amount',
@@ -448,7 +450,6 @@ export class Chargebee implements INodeType {
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const items = this.getInputData();
 		const returnData: INodeExecutionData[] = [];
-		let _item: INodeExecutionData;
 
 		const credentials = await this.getCredentials('chargebeeApi');
 
@@ -461,11 +462,10 @@ export class Chargebee implements INodeType {
 
 		for (let i = 0; i < items.length; i++) {
 			try {
-				_item = items[i];
 				const resource = this.getNodeParameter('resource', i);
 				const operation = this.getNodeParameter('operation', i);
 
-				let requestMethod = 'GET';
+				let requestMethod: IHttpRequestMethods = 'GET';
 				let endpoint = '';
 				body = {};
 				qs = {};
@@ -484,7 +484,7 @@ export class Chargebee implements INodeType {
 								key === 'customProperties' &&
 								(properties.customProperties as IDataObject).property !== undefined
 							) {
-								for (const customProperty of (properties.customProperties as IDataObject)!
+								for (const customProperty of (properties.customProperties as IDataObject)
 									.property! as CustomProperty[]) {
 									qs[customProperty.name] = customProperty.value;
 								}
@@ -591,7 +591,7 @@ export class Chargebee implements INodeType {
 						pass: '',
 					},
 					json: true,
-				};
+				} satisfies IRequestOptions;
 
 				let responseData;
 
@@ -635,6 +635,6 @@ export class Chargebee implements INodeType {
 			}
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/CircleCi/CircleCi.node.ts b/packages/nodes-base/nodes/CircleCi/CircleCi.node.ts
index edc4f0dcbcbf5..8d0316fe7e9fc 100644
--- a/packages/nodes-base/nodes/CircleCi/CircleCi.node.ts
+++ b/packages/nodes-base/nodes/CircleCi/CircleCi.node.ts
@@ -149,6 +149,6 @@ export class CircleCi implements INodeType {
 				throw error;
 			}
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/CircleCi/GenericFunctions.ts b/packages/nodes-base/nodes/CircleCi/GenericFunctions.ts
index 3a3f47d2ac16d..370981bebe607 100644
--- a/packages/nodes-base/nodes/CircleCi/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/CircleCi/GenericFunctions.ts
@@ -1,18 +1,17 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	JsonObject,
+	IRequestOptions,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function circleciApiRequest(
-	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -21,7 +20,7 @@ export async function circleciApiRequest(
 	option: IDataObject = {},
 ): Promise<any> {
 	const credentials = await this.getCredentials('circleCiApi');
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		headers: {
 			'Circle-Token': credentials.apiKey,
 			Accept: 'application/json',
@@ -50,7 +49,7 @@ export async function circleciApiRequest(
 export async function circleciApiRequestAllItems(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
diff --git a/packages/nodes-base/nodes/CircleCi/PipelineDescription.ts b/packages/nodes-base/nodes/CircleCi/PipelineDescription.ts
index b19ce24feead4..ce5ec14320280 100644
--- a/packages/nodes-base/nodes/CircleCi/PipelineDescription.ts
+++ b/packages/nodes-base/nodes/CircleCi/PipelineDescription.ts
@@ -60,7 +60,7 @@ export const pipelineFields: INodeProperties[] = [
 			},
 		},
 		default: '',
-		description: 'Version control system',
+		description: 'Source control system',
 	},
 	{
 		displayName: 'Project Slug',
diff --git a/packages/nodes-base/nodes/Cisco/Webex/CiscoWebex.node.ts b/packages/nodes-base/nodes/Cisco/Webex/CiscoWebex.node.ts
index 6ff81b393912d..bfe9dd8646e45 100644
--- a/packages/nodes-base/nodes/Cisco/Webex/CiscoWebex.node.ts
+++ b/packages/nodes-base/nodes/Cisco/Webex/CiscoWebex.node.ts
@@ -8,6 +8,7 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
+import moment from 'moment-timezone';
 import { getAttachments, webexApiRequest, webexApiRequestAllItems } from './GenericFunctions';
 
 import {
@@ -19,8 +20,6 @@ import {
 	messageOperations,
 } from './descriptions';
 
-import moment from 'moment-timezone';
-
 export class CiscoWebex implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Webex by Cisco',
@@ -559,6 +558,6 @@ export class CiscoWebex implements INodeType {
 		// 	}
 		// }
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Cisco/Webex/CiscoWebexTrigger.node.ts b/packages/nodes-base/nodes/Cisco/Webex/CiscoWebexTrigger.node.ts
index 507c9d00ec9dc..2d3db0396ac0e 100644
--- a/packages/nodes-base/nodes/Cisco/Webex/CiscoWebexTrigger.node.ts
+++ b/packages/nodes-base/nodes/Cisco/Webex/CiscoWebexTrigger.node.ts
@@ -1,3 +1,4 @@
+import { createHmac } from 'crypto';
 import type {
 	IHookFunctions,
 	IWebhookFunctions,
@@ -15,8 +16,6 @@ import {
 	webexApiRequestAllItems,
 } from './GenericFunctions';
 
-import { createHmac } from 'crypto';
-
 export class CiscoWebexTrigger implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Webex by Cisco Trigger',
diff --git a/packages/nodes-base/nodes/Cisco/Webex/GenericFunctions.ts b/packages/nodes-base/nodes/Cisco/Webex/GenericFunctions.ts
index 90724978774e8..88d20374308b0 100644
--- a/packages/nodes-base/nodes/Cisco/Webex/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Cisco/Webex/GenericFunctions.ts
@@ -1,24 +1,24 @@
-import type { OptionsWithUri } from 'request';
+import { createHash } from 'crypto';
 
 import type {
 	ICredentialDataDecryptedObject,
 	IDataObject,
 	IExecuteFunctions,
 	IHookFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
 	INodeProperties,
+	IRequestOptions,
 	IWebhookFunctions,
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import upperFirst from 'lodash.upperfirst';
-
-import { createHash } from 'crypto';
+import upperFirst from 'lodash/upperFirst';
 
 export async function webexApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions | IWebhookFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -26,7 +26,7 @@ export async function webexApiRequest(
 	uri?: string,
 	option: IDataObject = {},
 ): Promise<any> {
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		method,
 		body,
 		qs,
@@ -55,7 +55,7 @@ export async function webexApiRequest(
 export async function webexApiRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: any = {},
diff --git a/packages/nodes-base/nodes/Cisco/Webex/descriptions/MeetingDescription.ts b/packages/nodes-base/nodes/Cisco/Webex/descriptions/MeetingDescription.ts
index 5104dbca5cb4f..93d3f07c2fbad 100644
--- a/packages/nodes-base/nodes/Cisco/Webex/descriptions/MeetingDescription.ts
+++ b/packages/nodes-base/nodes/Cisco/Webex/descriptions/MeetingDescription.ts
@@ -167,6 +167,7 @@ export const meetingFields: INodeProperties[] = [
 			{
 				displayName: 'Exclude Password',
 				name: 'excludePassword',
+
 				type: 'boolean',
 				default: false,
 				description: 'Whether or not to exclude password from the meeting email invitation',
@@ -746,6 +747,7 @@ export const meetingFields: INodeProperties[] = [
 			{
 				displayName: 'Exclude Password',
 				name: 'excludePassword',
+
 				type: 'boolean',
 				default: false,
 				description: 'Whether or not to exclude password from the meeting email invitation',
diff --git a/packages/nodes-base/nodes/Cisco/Webex/descriptions/MessageDescription.ts b/packages/nodes-base/nodes/Cisco/Webex/descriptions/MessageDescription.ts
index c9f7fc3e92843..6cf90d50a58f6 100644
--- a/packages/nodes-base/nodes/Cisco/Webex/descriptions/MessageDescription.ts
+++ b/packages/nodes-base/nodes/Cisco/Webex/descriptions/MessageDescription.ts
@@ -327,7 +327,7 @@ export const messageFields: INodeProperties[] = [
 										value: 'url',
 									},
 									{
-										name: 'Binary Data',
+										name: 'Binary File',
 										value: 'binaryData',
 									},
 								],
diff --git a/packages/nodes-base/nodes/Citrix/ADC/GenericFunctions.ts b/packages/nodes-base/nodes/Citrix/ADC/GenericFunctions.ts
index d4b9aad4c75b5..4b9e0ea9b5e28 100644
--- a/packages/nodes-base/nodes/Citrix/ADC/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Citrix/ADC/GenericFunctions.ts
@@ -1,5 +1,3 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IExecuteFunctions,
 	ILoadOptionsFunctions,
@@ -7,12 +5,14 @@ import type {
 	IHookFunctions,
 	IWebhookFunctions,
 	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function citrixADCApiRequest(
 	this: IExecuteFunctions | IWebhookFunctions | IHookFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 	body: IDataObject = {},
 	qs: IDataObject = {},
@@ -21,7 +21,7 @@ export async function citrixADCApiRequest(
 ): Promise<any> {
 	const { url } = (await this.getCredentials('citrixAdcApi')) as { url: string };
 
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		headers: {
 			'Content-Type': 'application/json',
 		},
diff --git a/packages/nodes-base/nodes/Citrix/ADC/citrix.svg b/packages/nodes-base/nodes/Citrix/ADC/citrix.svg
index f91f84b508e92..19e9d9673fcbd 100644
--- a/packages/nodes-base/nodes/Citrix/ADC/citrix.svg
+++ b/packages/nodes-base/nodes/Citrix/ADC/citrix.svg
@@ -1,50 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   version="1.1"
-   id="svg2"
-   xml:space="preserve"
-   width="147"
-   height="147"
-   viewBox="0 0 147 147"
-   sodipodi:docname="citrix.svg"
-   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"><defs
-     id="defs6" /><sodipodi:namedview
-     id="namedview4"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:zoom="2.7846068"
-     inkscape:cx="0"
-     inkscape:cy="68.052696"
-     inkscape:window-width="1920"
-     inkscape:window-height="1009"
-     inkscape:window-x="0"
-     inkscape:window-y="40"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g8" /><g
-     id="g8"
-     inkscape:groupmode="layer"
-     inkscape:label="ink_ext_XXXXXX"
-     transform="matrix(1.3333333,0,0,-1.3333333,-337.63332,148.36666)"><g
-       id="g10"
-       transform="matrix(0.1,0,0,0.1,18.085912,0)"><path
-         d="M 2904.09,362.301 2622.82,33.3789 c -11.12,-14.3594 -25.42,-20.6992 -41.33,-20.6992 -28.6,0 -49.24,22.2617 -49.24,47.6797 0,11.1289 3.17,23.8711 14.3,36.5508 l 293.98,332.1248 -282.85,324.16 c -11.13,12.743 -17.47,23.871 -17.47,38.168 0,25.426 20.64,47.68 50.85,47.68 15.85,0 26.98,-6.398 39.72,-20.703 L 2904.09,497.383 3177.4,818.34 c 12.75,14.305 23.88,20.703 39.73,20.703 30.21,0 50.85,-22.254 50.85,-47.68 0,-14.297 -6.34,-25.425 -17.47,-38.168 L 2967.66,429.035 3261.64,96.9102 c 11.13,-12.6797 14.3,-25.4219 14.3,-36.5508 0,-25.418 -20.64,-47.6797 -49.24,-47.6797 -15.92,0 -30.21,6.3398 -41.34,20.6992 L 2904.09,362.301"
-         style="fill:#100f0d;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path24" /><path
-         d="m 2985.26,1031.59 c 0,-44.824 -36.34,-81.164 -81.17,-81.164 -44.82,0 -81.16,36.34 -81.16,81.164 0,44.82 36.34,81.16 81.16,81.16 44.83,0 81.17,-36.34 81.17,-81.16"
-         style="fill:#100f0d;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path28" /></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="147" height="147"><path d="M2904.09 362.301 2622.82 33.379c-11.12-14.36-25.42-20.7-41.33-20.7-28.6 0-49.24 22.262-49.24 47.68 0 11.13 3.17 23.871 14.3 36.551l293.98 332.125-282.85 324.16c-11.13 12.743-17.47 23.871-17.47 38.168 0 25.426 20.64 47.68 50.85 47.68 15.85 0 26.98-6.398 39.72-20.703l273.31-320.957L3177.4 818.34c12.75 14.305 23.88 20.703 39.73 20.703 30.21 0 50.85-22.254 50.85-47.68 0-14.297-6.34-25.425-17.47-38.168l-282.85-324.16L3261.64 96.91c11.13-12.68 14.3-25.422 14.3-36.55 0-25.419-20.64-47.68-49.24-47.68-15.92 0-30.21 6.34-41.34 20.699zm81.17 669.289c0-44.824-36.34-81.164-81.17-81.164-44.82 0-81.16 36.34-81.16 81.164 0 44.82 36.34 81.16 81.16 81.16 44.83 0 81.17-36.34 81.17-81.16" style="fill:#100f0d;fill-opacity:1;fill-rule:nonzero;stroke:none" transform="matrix(.13333 0 0 -.13333 -313.519 148.367)"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Clearbit/Clearbit.node.ts b/packages/nodes-base/nodes/Clearbit/Clearbit.node.ts
index 8a39ed87f453a..4e5c67073f458 100644
--- a/packages/nodes-base/nodes/Clearbit/Clearbit.node.ts
+++ b/packages/nodes-base/nodes/Clearbit/Clearbit.node.ts
@@ -164,6 +164,6 @@ export class Clearbit implements INodeType {
 				throw error;
 			}
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Clearbit/GenericFunctions.ts b/packages/nodes-base/nodes/Clearbit/GenericFunctions.ts
index f5dcfe34091d2..95a45b65afb2f 100644
--- a/packages/nodes-base/nodes/Clearbit/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Clearbit/GenericFunctions.ts
@@ -1,18 +1,17 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	JsonObject,
+	IRequestOptions,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function clearbitApiRequest(
-	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	api: string,
 	resource: string,
 
@@ -22,7 +21,7 @@ export async function clearbitApiRequest(
 	option: IDataObject = {},
 ): Promise<any> {
 	const credentials = await this.getCredentials('clearbitApi');
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		headers: { Authorization: `Bearer ${credentials.apiKey}` },
 		method,
 		qs,
diff --git a/packages/nodes-base/nodes/Clearbit/clearbit.svg b/packages/nodes-base/nodes/Clearbit/clearbit.svg
index 22f7fd495a6b8..3b9ac84aa5280 100644
--- a/packages/nodes-base/nodes/Clearbit/clearbit.svg
+++ b/packages/nodes-base/nodes/Clearbit/clearbit.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="72" height="72"><defs><linearGradient id="a" x1="50%" x2="100%" y1="0%" y2="100%"><stop offset="0%" stop-color="#DEF2FE"/><stop offset="100%" stop-color="#DBF1FE"/></linearGradient><linearGradient id="b" x1="0%" x2="50%" y1="0%" y2="100%"><stop offset="0%" stop-color="#57BCFD"/><stop offset="100%" stop-color="#51B5FD"/></linearGradient><linearGradient id="c" x1="37.5%" x2="62.5%" y1="0%" y2="100%"><stop offset="0%" stop-color="#1CA7FD"/><stop offset="100%" stop-color="#148CFC"/></linearGradient></defs><g fill="none" fill-rule="evenodd"><path fill="url(#a)" d="M72 36v16.77l-.004.868c-.06 6.035-.75 8.353-2 10.688a13.63 13.63 0 01-5.67 5.67l-.326.171C61.658 71.364 59.16 72 52.77 72H36V36h36z"/><path fill="url(#b)" d="M64.326 2.003a13.63 13.63 0 015.67 5.67l.171.327C71.364 10.342 72 12.84 72 19.23V36H36V0h16.77c6.687 0 9.112.696 11.556 2.003z"/><path fill="url(#c)" d="M36 0v72H19.23l-.868-.004c-6.035-.06-8.353-.75-10.688-2a13.63 13.63 0 01-5.67-5.67L1.832 64C.636 61.658 0 59.16 0 52.77V19.23c0-6.687.696-9.112 2.003-11.556a13.63 13.63 0 015.67-5.67L8 1.832C10.342.636 12.84 0 19.23 0H36z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="72" height="72"><defs><linearGradient id="a" x1="50%" x2="100%" y1="0%" y2="100%"><stop offset="0%" stop-color="#DEF2FE"/><stop offset="100%" stop-color="#DBF1FE"/></linearGradient><linearGradient id="b" x1="0%" x2="50%" y1="0%" y2="100%"><stop offset="0%" stop-color="#57BCFD"/><stop offset="100%" stop-color="#51B5FD"/></linearGradient><linearGradient id="c" x1="37.5%" x2="62.5%" y1="0%" y2="100%"><stop offset="0%" stop-color="#1CA7FD"/><stop offset="100%" stop-color="#148CFC"/></linearGradient></defs><g fill="none" fill-rule="evenodd"><path fill="url(#a)" d="M72 36v16.77l-.004.868c-.06 6.035-.75 8.353-2 10.688a13.63 13.63 0 0 1-5.67 5.67l-.326.171C61.658 71.364 59.16 72 52.77 72H36V36z"/><path fill="url(#b)" d="M64.326 2.003a13.63 13.63 0 0 1 5.67 5.67l.171.327C71.364 10.342 72 12.84 72 19.23V36H36V0h16.77c6.687 0 9.112.696 11.556 2.003"/><path fill="url(#c)" d="M36 0v72H19.23l-.868-.004c-6.035-.06-8.353-.75-10.688-2a13.63 13.63 0 0 1-5.67-5.67L1.832 64C.636 61.658 0 59.16 0 52.77V19.23c0-6.687.696-9.112 2.003-11.556a13.63 13.63 0 0 1 5.67-5.67L8 1.832C10.342.636 12.84 0 19.23 0z"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/ClickUp/ClickUp.node.ts b/packages/nodes-base/nodes/ClickUp/ClickUp.node.ts
index 23d0d894bf60d..71e0431de4e70 100644
--- a/packages/nodes-base/nodes/ClickUp/ClickUp.node.ts
+++ b/packages/nodes-base/nodes/ClickUp/ClickUp.node.ts
@@ -9,6 +9,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
+import moment from 'moment-timezone';
 import { clickupApiRequest, clickupApiRequestAllItems, validateJSON } from './GenericFunctions';
 
 import { checklistFields, checklistOperations } from './ChecklistDescription';
@@ -48,8 +49,6 @@ import type { ITask } from './TaskInterface';
 
 import type { IList } from './ListInterface';
 
-import moment from 'moment-timezone';
-
 export class ClickUp implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'ClickUp',
@@ -744,7 +743,7 @@ export class ClickUp implements INodeType {
 						) {
 							if (
 								additionalFields.stepsStart === undefined ||
-								!additionalFields.stepsEnd === undefined
+								additionalFields.stepsEnd === undefined
 							) {
 								throw new NodeOperationError(
 									this.getNode(),
@@ -1636,6 +1635,6 @@ export class ClickUp implements INodeType {
 				throw error;
 			}
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/ClickUp/ClickUpTrigger.node.ts b/packages/nodes-base/nodes/ClickUp/ClickUpTrigger.node.ts
index bced1d2e5baf0..af6e696a0c7e5 100644
--- a/packages/nodes-base/nodes/ClickUp/ClickUpTrigger.node.ts
+++ b/packages/nodes-base/nodes/ClickUp/ClickUpTrigger.node.ts
@@ -1,3 +1,4 @@
+import { createHmac } from 'crypto';
 import type {
 	IHookFunctions,
 	IWebhookFunctions,
@@ -11,8 +12,6 @@ import type {
 
 import { clickupApiRequest } from './GenericFunctions';
 
-import { createHmac } from 'crypto';
-
 export class ClickUpTrigger implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'ClickUp Trigger',
diff --git a/packages/nodes-base/nodes/ClickUp/GenericFunctions.ts b/packages/nodes-base/nodes/ClickUp/GenericFunctions.ts
index 234f5177f7d4d..21974d6a08293 100644
--- a/packages/nodes-base/nodes/ClickUp/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/ClickUp/GenericFunctions.ts
@@ -1,25 +1,19 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	IWebhookFunctions,
 	IOAuth2Options,
 	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function clickupApiRequest(
-	this:
-		| IHookFunctions
-		| IExecuteFunctions
-		| IExecuteSingleFunctions
-		| ILoadOptionsFunctions
-		| IWebhookFunctions,
-	method: string,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -27,7 +21,7 @@ export async function clickupApiRequest(
 	uri?: string,
 	_option: IDataObject = {},
 ): Promise<any> {
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			'Content-Type': 'application/json',
 		},
@@ -64,7 +58,7 @@ export async function clickupApiRequest(
 export async function clickupApiRequestAllItems(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
diff --git a/packages/nodes-base/nodes/ClickUp/clickup.svg b/packages/nodes-base/nodes/ClickUp/clickup.svg
index 4764b2d9c8a13..7874aaa42bf5c 100644
--- a/packages/nodes-base/nodes/ClickUp/clickup.svg
+++ b/packages/nodes-base/nodes/ClickUp/clickup.svg
@@ -1 +1 @@
-<svg viewBox="-10 0 155 155" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient x1="0%" y1="68.01%" y2="68.01%" id="a"><stop stop-color="#8930FD" offset="0%"/><stop stop-color="#49CCF9" offset="100%"/></linearGradient><linearGradient x1="0%" y1="68.01%" y2="68.01%" id="b"><stop stop-color="#FF02F0" offset="0%"/><stop stop-color="#FFC800" offset="100%"/></linearGradient></defs><g fill="none"><path d="M.4 119.12l23.81-18.24C36.86 117.39 50.3 125 65.26 125c14.88 0 27.94-7.52 40.02-23.9l24.15 17.8C112 142.52 90.34 155 65.26 155c-25 0-46.87-12.4-64.86-35.88z" fill="url(#a)"/><path fill="url(#b)" d="M65.18 39.84L22.8 76.36 3.21 53.64 65.27.16l61.57 53.52-19.68 22.64z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="-10 0 155 155"><defs><linearGradient id="a" x1="0%" y1="68.01%" y2="68.01%"><stop offset="0%" stop-color="#8930FD"/><stop offset="100%" stop-color="#49CCF9"/></linearGradient><linearGradient id="b" x1="0%" y1="68.01%" y2="68.01%"><stop offset="0%" stop-color="#FF02F0"/><stop offset="100%" stop-color="#FFC800"/></linearGradient></defs><g fill="none"><path fill="url(#a)" d="m.4 119.12 23.81-18.24C36.86 117.39 50.3 125 65.26 125c14.88 0 27.94-7.52 40.02-23.9l24.15 17.8C112 142.52 90.34 155 65.26 155c-25 0-46.87-12.4-64.86-35.88"/><path fill="url(#b)" d="M65.18 39.84 22.8 76.36 3.21 53.64 65.27.16l61.57 53.52-19.68 22.64z"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Clockify/Clockify.node.ts b/packages/nodes-base/nodes/Clockify/Clockify.node.ts
index 22a4b734124af..17793feda67be 100644
--- a/packages/nodes-base/nodes/Clockify/Clockify.node.ts
+++ b/packages/nodes-base/nodes/Clockify/Clockify.node.ts
@@ -8,6 +8,7 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
+import moment from 'moment-timezone';
 import { clockifyApiRequest, clockifyApiRequestAllItems } from './GenericFunctions';
 
 import type { IClientDto, IWorkspaceDto } from './WorkpaceInterfaces';
@@ -30,8 +31,6 @@ import { userFields, userOperations } from './UserDescription';
 
 import { workspaceFields, workspaceOperations } from './WorkspaceDescription';
 
-import moment from 'moment-timezone';
-
 export class Clockify implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Clockify',
@@ -848,6 +847,6 @@ export class Clockify implements INodeType {
 			}
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Clockify/GenericFunctions.ts b/packages/nodes-base/nodes/Clockify/GenericFunctions.ts
index dfd82b2835f47..0a5a09bfff76e 100644
--- a/packages/nodes-base/nodes/Clockify/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Clockify/GenericFunctions.ts
@@ -1,15 +1,15 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IExecuteFunctions,
 	ILoadOptionsFunctions,
 	IPollFunctions,
 	IDataObject,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 
 export async function clockifyApiRequest(
 	this: ILoadOptionsFunctions | IPollFunctions | IExecuteFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -19,7 +19,7 @@ export async function clockifyApiRequest(
 ): Promise<any> {
 	const BASE_URL = 'https://api.clockify.me/api/v1';
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			'Content-Type': 'application/json',
 		},
@@ -30,12 +30,12 @@ export async function clockifyApiRequest(
 		json: true,
 		useQuerystring: true,
 	};
-	return this.helpers.requestWithAuthentication.call(this, 'clockifyApi', options);
+	return await this.helpers.requestWithAuthentication.call(this, 'clockifyApi', options);
 }
 
 export async function clockifyApiRequestAllItems(
 	this: IExecuteFunctions | IPollFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: any = {},
diff --git a/packages/nodes-base/nodes/Clockify/TaskDescription.ts b/packages/nodes-base/nodes/Clockify/TaskDescription.ts
index 50ef0f1b549c6..8545a5aa56524 100644
--- a/packages/nodes-base/nodes/Clockify/TaskDescription.ts
+++ b/packages/nodes-base/nodes/Clockify/TaskDescription.ts
@@ -97,7 +97,6 @@ export const taskFields: INodeProperties[] = [
 		default: {},
 		options: [
 			{
-				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-multi-options
 				displayName: 'Assignee Names or IDs',
 				name: 'assigneeIds',
 				type: 'multiOptions',
@@ -277,7 +276,6 @@ export const taskFields: INodeProperties[] = [
 		default: {},
 		options: [
 			{
-				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-multi-options
 				displayName: 'Assignee Names or IDs',
 				name: 'assigneeIds',
 				type: 'multiOptions',
diff --git a/packages/nodes-base/nodes/Clockify/TimeEntryDescription.ts b/packages/nodes-base/nodes/Clockify/TimeEntryDescription.ts
index 0cceac1a4eaa2..342281875dfa4 100644
--- a/packages/nodes-base/nodes/Clockify/TimeEntryDescription.ts
+++ b/packages/nodes-base/nodes/Clockify/TimeEntryDescription.ts
@@ -140,7 +140,6 @@ export const timeEntryFields: INodeProperties[] = [
 				default: '',
 			},
 			{
-				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-multi-options
 				displayName: 'Tag Names or IDs',
 				name: 'tagIds',
 				type: 'multiOptions',
@@ -328,7 +327,6 @@ export const timeEntryFields: INodeProperties[] = [
 				default: '',
 			},
 			{
-				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-multi-options
 				displayName: 'Tag Names or IDs',
 				name: 'tagIds',
 				type: 'multiOptions',
diff --git a/packages/nodes-base/nodes/Clockify/clockify.svg b/packages/nodes-base/nodes/Clockify/clockify.svg
index 3955055df71c5..1750886588623 100644
--- a/packages/nodes-base/nodes/Clockify/clockify.svg
+++ b/packages/nodes-base/nodes/Clockify/clockify.svg
@@ -1 +1 @@
-<svg width="256" height="256" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill="none" d="M14 0h227v256H14z"/><path fill-rule="evenodd" clip-rule="evenodd" d="M165.124 87.99l58.777-58.814 16.825 16.823-58.778 58.815-16.824-16.823zm-23.817 60.105c-11.503 0-20.822-9.36-20.822-20.918 0-11.546 9.319-20.918 20.822-20.918 11.503 0 20.822 9.372 20.822 20.918 0 11.558-9.319 20.918-20.822 20.918zM241 208.845l-16.824 16.835-58.778-58.816 16.825-16.835L241 208.845z" fill="#222"/><path fill-rule="evenodd" clip-rule="evenodd" d="M141.913 217.637c11.848 0 23.136-2.364 33.482-6.567l28.708 28.74C185.692 250.089 164.5 256 141.913 256 71.274 256 14 198.689 14 128.006 14 57.311 71.275 0 141.913 0c22.361 0 43.362 5.767 61.641 15.856l-28.231 28.261c-10.333-4.179-21.585-6.543-33.41-6.543-49.47 0-89.575 40.309-89.575 90.038 0 49.716 40.104 90.025 89.575 90.025z" fill="#03A9F4"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" fill="none"><path d="M14 0h227v256H14z"/><path fill="#222" fill-rule="evenodd" d="m165.124 87.99 58.777-58.814 16.825 16.823-58.778 58.815zm-23.817 60.105c-11.503 0-20.822-9.36-20.822-20.918 0-11.546 9.319-20.918 20.822-20.918s20.822 9.372 20.822 20.918c0 11.558-9.319 20.918-20.822 20.918M241 208.845l-16.824 16.835-58.778-58.816 16.825-16.835z" clip-rule="evenodd"/><path fill="#03A9F4" fill-rule="evenodd" d="M141.913 217.637c11.848 0 23.136-2.364 33.482-6.567l28.708 28.74C185.692 250.089 164.5 256 141.913 256 71.274 256 14 198.689 14 128.006 14 57.311 71.275 0 141.913 0c22.361 0 43.362 5.767 61.641 15.856l-28.231 28.261c-10.333-4.179-21.585-6.543-33.41-6.543-49.47 0-89.575 40.309-89.575 90.038 0 49.716 40.104 90.025 89.575 90.025" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Cloudflare/GenericFunctions.ts b/packages/nodes-base/nodes/Cloudflare/GenericFunctions.ts
index 43424366a2d75..0ad5801325a0c 100644
--- a/packages/nodes-base/nodes/Cloudflare/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Cloudflare/GenericFunctions.ts
@@ -1,25 +1,24 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
 	IPollFunctions,
+	IRequestOptions,
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function cloudflareApiRequest(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IPollFunctions,
-	method: string,
+	this: IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 	body = {},
 	qs: IDataObject = {},
 	uri?: string,
 	headers: IDataObject = {},
 ): Promise<any> {
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		method,
 		body,
 		qs,
@@ -43,7 +42,7 @@ export async function cloudflareApiRequest(
 export async function cloudflareApiRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject = {},
 	query: IDataObject = {},
diff --git a/packages/nodes-base/nodes/Cloudflare/cloudflare.svg b/packages/nodes-base/nodes/Cloudflare/cloudflare.svg
index f50a49651871f..1899a92a5ac28 100644
--- a/packages/nodes-base/nodes/Cloudflare/cloudflare.svg
+++ b/packages/nodes-base/nodes/Cloudflare/cloudflare.svg
@@ -1,4 +1 @@
-<svg width="1024px" height="1024px" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg">
-   <circle cx="512" cy="512" r="512" style="fill:#f38020"/>
-   <path d="M608.2 592.4c3.1-10.8 1.9-20.7-3.3-28.1-4.8-6.7-12.9-10.6-22.6-11.1l-184.7-2.4c-1.1 0-2.2-.6-2.8-1.5-.6-.9-.7-2.1-.4-3.3.6-1.8 2.4-3.2 4.3-3.3l186.4-2.4c22.1-1 46.1-18.9 54.5-40.8l10.6-27.8c.5-1.2.6-2.4.3-3.6-12-54.3-60.5-94.8-118.4-94.8-53.4 0-98.7 34.5-114.9 82.4-10.5-7.8-23.9-12-38.3-10.6-25.7 2.5-46.2 23.1-48.8 48.8-.6 6.6-.1 13.1 1.4 19.1-41.9 1.2-75.3 35.4-75.3 77.6 0 3.7.3 7.5.8 11.2.3 1.8 1.8 3.1 3.6 3.1h340.9c1.9 0 3.8-1.4 4.3-3.3l2.4-9.2zM667 473.7c-1.6 0-3.4 0-5.1.2-1.2 0-2.2.9-2.7 2.1l-7.2 25c-3.1 10.8-2 20.7 3.3 28.1 4.8 6.7 12.9 10.6 22.7 11.1l39.3 2.4c1.2 0 2.3.6 2.8 1.5.6.9.7 2.3.5 3.3-.6 1.8-2.4 3.2-4.4 3.3l-41 2.4c-22.2 1-46 18.9-54.5 40.8l-3 7.6c-.6 1.5.5 3 2.1 3h140.8c1.6 0 3.1-1 3.6-2.7 2.4-8.7 3.7-17.9 3.7-27.3 0-55.5-45.3-100.8-101-100.8" style="fill:#fff"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="1024" height="1024"><circle cx="512" cy="512" r="512" style="fill:#f38020"/><path d="M608.2 592.4c3.1-10.8 1.9-20.7-3.3-28.1-4.8-6.7-12.9-10.6-22.6-11.1l-184.7-2.4c-1.1 0-2.2-.6-2.8-1.5s-.7-2.1-.4-3.3c.6-1.8 2.4-3.2 4.3-3.3l186.4-2.4c22.1-1 46.1-18.9 54.5-40.8l10.6-27.8q.75-1.8.3-3.6c-12-54.3-60.5-94.8-118.4-94.8-53.4 0-98.7 34.5-114.9 82.4-10.5-7.8-23.9-12-38.3-10.6-25.7 2.5-46.2 23.1-48.8 48.8-.6 6.6-.1 13.1 1.4 19.1-41.9 1.2-75.3 35.4-75.3 77.6 0 3.7.3 7.5.8 11.2.3 1.8 1.8 3.1 3.6 3.1h340.9c1.9 0 3.8-1.4 4.3-3.3zM667 473.7c-1.6 0-3.4 0-5.1.2-1.2 0-2.2.9-2.7 2.1l-7.2 25c-3.1 10.8-2 20.7 3.3 28.1 4.8 6.7 12.9 10.6 22.7 11.1l39.3 2.4c1.2 0 2.3.6 2.8 1.5.6.9.7 2.3.5 3.3-.6 1.8-2.4 3.2-4.4 3.3l-41 2.4c-22.2 1-46 18.9-54.5 40.8l-3 7.6c-.6 1.5.5 3 2.1 3h140.8c1.6 0 3.1-1 3.6-2.7 2.4-8.7 3.7-17.9 3.7-27.3 0-55.5-45.3-100.8-101-100.8" style="fill:#fff"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Cockpit/Cockpit.node.json b/packages/nodes-base/nodes/Cockpit/Cockpit.node.json
index a8da4a322c4d8..56fbbc76ec6d8 100644
--- a/packages/nodes-base/nodes/Cockpit/Cockpit.node.json
+++ b/packages/nodes-base/nodes/Cockpit/Cockpit.node.json
@@ -2,7 +2,7 @@
 	"node": "n8n-nodes-base.cockpit",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Marketing & Content", "Development"],
+	"categories": ["Marketing", "Development"],
 	"resources": {
 		"credentialDocumentation": [
 			{
diff --git a/packages/nodes-base/nodes/Cockpit/CollectionFunctions.ts b/packages/nodes-base/nodes/Cockpit/CollectionFunctions.ts
index 20739f3910887..07955905f2dd5 100644
--- a/packages/nodes-base/nodes/Cockpit/CollectionFunctions.ts
+++ b/packages/nodes-base/nodes/Cockpit/CollectionFunctions.ts
@@ -1,15 +1,10 @@
-import type {
-	IExecuteFunctions,
-	IExecuteSingleFunctions,
-	ILoadOptionsFunctions,
-	IDataObject,
-} from 'n8n-workflow';
+import type { IExecuteFunctions, ILoadOptionsFunctions, IDataObject } from 'n8n-workflow';
 import { jsonParse } from 'n8n-workflow';
 import type { ICollection } from './CollectionInterface';
 import { cockpitApiRequest } from './GenericFunctions';
 
 export async function createCollectionEntry(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
+	this: IExecuteFunctions | ILoadOptionsFunctions,
 	resourceName: string,
 	data: IDataObject,
 	id?: string,
@@ -25,11 +20,11 @@ export async function createCollectionEntry(
 		};
 	}
 
-	return cockpitApiRequest.call(this, 'post', `/collections/save/${resourceName}`, body);
+	return await cockpitApiRequest.call(this, 'POST', `/collections/save/${resourceName}`, body);
 }
 
 export async function getAllCollectionEntries(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
+	this: IExecuteFunctions | ILoadOptionsFunctions,
 	resourceName: string,
 	options: IDataObject,
 ): Promise<any> {
@@ -81,11 +76,11 @@ export async function getAllCollectionEntries(
 		body.lang = options.language as string;
 	}
 
-	return cockpitApiRequest.call(this, 'post', `/collections/get/${resourceName}`, body);
+	return await cockpitApiRequest.call(this, 'POST', `/collections/get/${resourceName}`, body);
 }
 
 export async function getAllCollectionNames(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
+	this: IExecuteFunctions | ILoadOptionsFunctions,
 ): Promise<string[]> {
-	return cockpitApiRequest.call(this, 'GET', '/collections/listCollections', {});
+	return await cockpitApiRequest.call(this, 'GET', '/collections/listCollections', {});
 }
diff --git a/packages/nodes-base/nodes/Cockpit/FormFunctions.ts b/packages/nodes-base/nodes/Cockpit/FormFunctions.ts
index 3083912892ec5..1b48287439b68 100644
--- a/packages/nodes-base/nodes/Cockpit/FormFunctions.ts
+++ b/packages/nodes-base/nodes/Cockpit/FormFunctions.ts
@@ -1,14 +1,9 @@
-import type {
-	IExecuteFunctions,
-	IExecuteSingleFunctions,
-	ILoadOptionsFunctions,
-	IDataObject,
-} from 'n8n-workflow';
+import type { IExecuteFunctions, ILoadOptionsFunctions, IDataObject } from 'n8n-workflow';
 import type { IForm } from './FormInterface';
 import { cockpitApiRequest } from './GenericFunctions';
 
 export async function submitForm(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
+	this: IExecuteFunctions | ILoadOptionsFunctions,
 	resourceName: string,
 	form: IDataObject,
 ) {
@@ -16,5 +11,5 @@ export async function submitForm(
 		form,
 	};
 
-	return cockpitApiRequest.call(this, 'post', `/forms/submit/${resourceName}`, body);
+	return await cockpitApiRequest.call(this, 'POST', `/forms/submit/${resourceName}`, body);
 }
diff --git a/packages/nodes-base/nodes/Cockpit/GenericFunctions.ts b/packages/nodes-base/nodes/Cockpit/GenericFunctions.ts
index 16101fb9abfb6..f6b30fb9caac9 100644
--- a/packages/nodes-base/nodes/Cockpit/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Cockpit/GenericFunctions.ts
@@ -1,16 +1,16 @@
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
+	IRequestOptions,
 	JsonObject,
 } from 'n8n-workflow';
 import { jsonParse, NodeApiError } from 'n8n-workflow';
-import type { OptionsWithUri } from 'request';
 
 export async function cockpitApiRequest(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -18,7 +18,7 @@ export async function cockpitApiRequest(
 	option: IDataObject = {},
 ): Promise<any> {
 	const credentials = await this.getCredentials('cockpitApi');
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		headers: {
 			Accept: 'application/json',
 			'Content-Type': 'application/json',
@@ -46,7 +46,7 @@ export async function cockpitApiRequest(
 }
 
 export function createDataFromParameters(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
+	this: IExecuteFunctions | ILoadOptionsFunctions,
 	itemIndex: number,
 ): IDataObject {
 	const dataFieldsAreJson = this.getNodeParameter('jsonDataFields', itemIndex) as boolean;
diff --git a/packages/nodes-base/nodes/Cockpit/SingletonFunctions.ts b/packages/nodes-base/nodes/Cockpit/SingletonFunctions.ts
index 1fcbd8f3c5678..464f1f2bad5bb 100644
--- a/packages/nodes-base/nodes/Cockpit/SingletonFunctions.ts
+++ b/packages/nodes-base/nodes/Cockpit/SingletonFunctions.ts
@@ -1,19 +1,15 @@
-import type {
-	IExecuteFunctions,
-	IExecuteSingleFunctions,
-	ILoadOptionsFunctions,
-} from 'n8n-workflow';
+import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-workflow';
 import { cockpitApiRequest } from './GenericFunctions';
 
 export async function getSingleton(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
+	this: IExecuteFunctions | ILoadOptionsFunctions,
 	resourceName: string,
 ): Promise<any> {
-	return cockpitApiRequest.call(this, 'get', `/singletons/get/${resourceName}`);
+	return await cockpitApiRequest.call(this, 'GET', `/singletons/get/${resourceName}`);
 }
 
 export async function getAllSingletonNames(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
+	this: IExecuteFunctions | ILoadOptionsFunctions,
 ): Promise<string[]> {
-	return cockpitApiRequest.call(this, 'GET', '/singletons/listSingletons', {});
+	return await cockpitApiRequest.call(this, 'GET', '/singletons/listSingletons', {});
 }
diff --git a/packages/nodes-base/nodes/Coda/Coda.node.ts b/packages/nodes-base/nodes/Coda/Coda.node.ts
index ecd308d1e8c37..3a9644bb44a0e 100644
--- a/packages/nodes-base/nodes/Coda/Coda.node.ts
+++ b/packages/nodes-base/nodes/Coda/Coda.node.ts
@@ -359,7 +359,7 @@ export class Coda implements INodeType {
 					}
 				}
 
-				return this.prepareOutputData(returnData);
+				return [returnData];
 			}
 			// https://coda.io/developers/apis/v1beta1#operation/listRows
 			if (operation === 'getAllRows') {
@@ -411,7 +411,6 @@ export class Coda implements INodeType {
 					return [this.helpers.returnJsonArray(responseData as IDataObject[])];
 				} else {
 					for (const item of responseData) {
-						// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
 						returnData.push({
 							id: item.id,
 							...item.values,
@@ -536,7 +535,7 @@ export class Coda implements INodeType {
 						throw error;
 					}
 				}
-				return this.prepareOutputData(returnData);
+				return [returnData];
 			}
 		}
 		if (resource === 'formula') {
@@ -565,7 +564,7 @@ export class Coda implements INodeType {
 						throw error;
 					}
 				}
-				return this.prepareOutputData(returnData);
+				return [returnData];
 			}
 			//https://coda.io/developers/apis/v1beta1#operation/listFormulas
 			if (operation === 'getAll') {
@@ -598,7 +597,7 @@ export class Coda implements INodeType {
 						throw error;
 					}
 				}
-				return this.prepareOutputData(returnData);
+				return [returnData];
 			}
 		}
 		if (resource === 'control') {
@@ -627,7 +626,7 @@ export class Coda implements INodeType {
 						throw error;
 					}
 				}
-				return this.prepareOutputData(returnData);
+				return [returnData];
 			}
 			//https://coda.io/developers/apis/v1beta1#operation/listControls
 			if (operation === 'getAll') {
@@ -660,7 +659,7 @@ export class Coda implements INodeType {
 						throw error;
 					}
 				}
-				return this.prepareOutputData(returnData);
+				return [returnData];
 			}
 		}
 		if (resource === 'view') {
@@ -677,7 +676,7 @@ export class Coda implements INodeType {
 					);
 					returnData.push(...executionData);
 				}
-				return this.prepareOutputData(returnData);
+				return [returnData];
 			}
 			//https://coda.io/developers/apis/v1beta1#operation/listViews
 			if (operation === 'getAll') {
@@ -710,7 +709,7 @@ export class Coda implements INodeType {
 						throw error;
 					}
 				}
-				return this.prepareOutputData(returnData);
+				return [returnData];
 			}
 			if (operation === 'getAllViewRows') {
 				const docId = this.getNodeParameter('docId', 0) as string;
@@ -758,7 +757,6 @@ export class Coda implements INodeType {
 					return [this.helpers.returnJsonArray(responseData as IDataObject[])];
 				} else {
 					for (const item of responseData) {
-						// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
 						returnData.push({
 							id: item.id,
 							...item.values,
@@ -793,7 +791,7 @@ export class Coda implements INodeType {
 						throw error;
 					}
 				}
-				return this.prepareOutputData(returnData);
+				return [returnData];
 			}
 			//https://coda.io/developers/apis/v1beta1#operation/pushViewButton
 			if (operation === 'pushViewButton') {
@@ -822,7 +820,7 @@ export class Coda implements INodeType {
 						throw error;
 					}
 				}
-				return this.prepareOutputData(returnData);
+				return [returnData];
 			}
 			if (operation === 'getAllViewColumns') {
 				for (let i = 0; i < items.length; i++) {
@@ -855,7 +853,7 @@ export class Coda implements INodeType {
 						throw error;
 					}
 				}
-				return this.prepareOutputData(returnData);
+				return [returnData];
 			}
 			//https://coda.io/developers/apis/v1beta1#operation/updateViewRow
 			if (operation === 'updateViewRow') {
diff --git a/packages/nodes-base/nodes/Coda/GenericFunctions.ts b/packages/nodes-base/nodes/Coda/GenericFunctions.ts
index 50c047c8f872c..b889e7dafa063 100644
--- a/packages/nodes-base/nodes/Coda/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Coda/GenericFunctions.ts
@@ -1,16 +1,16 @@
-import type { OptionsWithUri } from 'request';
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
+	IRequestOptions,
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function codaApiRequest(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -20,8 +20,11 @@ export async function codaApiRequest(
 ): Promise<any> {
 	const credentials = await this.getCredentials('codaApi');
 
-	let options: OptionsWithUri = {
-		headers: { Authorization: `Bearer ${credentials.accessToken}` },
+	let options: IRequestOptions = {
+		headers: {
+			Authorization: `Bearer ${credentials.accessToken}`,
+			'User-Agent': 'n8n',
+		},
 		method,
 		qs,
 		body,
@@ -47,7 +50,7 @@ export async function codaApiRequest(
 export async function codaApiRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
diff --git a/packages/nodes-base/nodes/Coda/coda.svg b/packages/nodes-base/nodes/Coda/coda.svg
index 1d3c64f32793d..aeb0b8ec8d553 100644
--- a/packages/nodes-base/nodes/Coda/coda.svg
+++ b/packages/nodes-base/nodes/Coda/coda.svg
@@ -1,11 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.2.1, 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 60 60" style="enable-background:new 0 0 60 60;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#EE5A29;}
-</style>
-<path class="st0" d="M45.2,16.2c3.3,0,6.5,1.3,8.8,3.3c1.5,1.3,3.8,0.2,3.8-1.8V4.7c0-2.5-2.1-4.7-4.7-4.7H6.3
-	C3.7,0,1.6,2.1,1.6,4.7v50.7c0,2.5,2.1,4.6,4.7,4.6h46.8c2.5,0,4.7-2.1,4.7-4.7V42.3c0-2-2.3-3.1-3.8-1.8c-2.4,2.1-5.4,3.3-8.8,3.3
-	c-7.6,0-13.7-6.2-13.7-13.8C31.6,22.4,37.7,16.2,45.2,16.2z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 60 60"><path d="M45.2 16.2c3.3 0 6.5 1.3 8.8 3.3 1.5 1.3 3.8.2 3.8-1.8v-13c0-2.5-2.1-4.7-4.7-4.7H6.3C3.7 0 1.6 2.1 1.6 4.7v50.7c0 2.5 2.1 4.6 4.7 4.6h46.8c2.5 0 4.7-2.1 4.7-4.7v-13c0-2-2.3-3.1-3.8-1.8-2.4 2.1-5.4 3.3-8.8 3.3-7.6 0-13.7-6.2-13.7-13.8.1-7.6 6.2-13.8 13.7-13.8" style="fill:#ee5a29"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Code/Code.node.json b/packages/nodes-base/nodes/Code/Code.node.json
index 3ce876131cf47..57dcb6bc2a268 100644
--- a/packages/nodes-base/nodes/Code/Code.node.json
+++ b/packages/nodes-base/nodes/Code/Code.node.json
@@ -11,8 +11,8 @@
 			}
 		]
 	},
-	"alias": ["cpde", "Javascript", "JS", "Script", "Custom Code", "Function"],
+	"alias": ["cpde", "Javascript", "JS", "Python", "Script", "Custom Code", "Function"],
 	"subcategories": {
-		"Core Nodes": ["Data Transformation"]
+		"Core Nodes": ["Helpers", "Data Transformation"]
 	}
 }
diff --git a/packages/nodes-base/nodes/Code/Code.node.ts b/packages/nodes-base/nodes/Code/Code.node.ts
index a14b6ec73a862..260c52af43869 100644
--- a/packages/nodes-base/nodes/Code/Code.node.ts
+++ b/packages/nodes-base/nodes/Code/Code.node.ts
@@ -1,24 +1,32 @@
 import type {
+	CodeExecutionMode,
+	CodeNodeEditorLanguage,
 	IExecuteFunctions,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { getSandboxContext, Sandbox } from './Sandbox';
+import set from 'lodash/set';
+import { javascriptCodeDescription } from './descriptions/JavascriptCodeDescription';
+import { pythonCodeDescription } from './descriptions/PythonCodeDescription';
+import { JavaScriptSandbox } from './JavaScriptSandbox';
+import { PythonSandbox } from './PythonSandbox';
+import { getSandboxContext } from './Sandbox';
 import { standardizeOutput } from './utils';
-import type { CodeNodeMode } from './utils';
+
+const { CODE_ENABLE_STDOUT } = process.env;
 
 export class Code implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Code',
 		name: 'code',
-		icon: 'fa:code',
+		icon: 'file:code.svg',
 		group: ['transform'],
-		version: 1,
-		description: 'Run custom JavaScript code',
+		version: [1, 2],
+		defaultVersion: 2,
+		description: 'Run custom JavaScript or Python code',
 		defaults: {
 			name: 'Code',
-			color: '#FF9922',
 		},
 		inputs: ['main'],
 		outputs: ['main'],
@@ -44,59 +52,100 @@ export class Code implements INodeType {
 				default: 'runOnceForAllItems',
 			},
 			{
-				displayName: 'JavaScript',
-				name: 'jsCode',
-				typeOptions: {
-					editor: 'codeNodeEditor',
-				},
-				type: 'string',
-				default: '', // set by component
-				description:
-					'JavaScript code to execute.<br><br>Tip: You can use luxon vars like <code>$today</code> for dates and <code>$jmespath</code> for querying JSON structures. <a href="https://docs.n8n.io/nodes/n8n-nodes-base.function">Learn more</a>.',
+				displayName: 'Language',
+				name: 'language',
+				type: 'options',
 				noDataExpression: true,
+				displayOptions: {
+					show: {
+						'@version': [2],
+					},
+				},
+				options: [
+					{
+						name: 'JavaScript',
+						value: 'javaScript',
+					},
+					{
+						name: 'Python (Beta)',
+						value: 'python',
+					},
+				],
+				default: 'javaScript',
 			},
 			{
-				displayName:
-					'Type <code>$</code> for a list of <a target="_blank" href="https://docs.n8n.io/code-examples/methods-variables-reference/">special vars/methods</a>. Debug by using <code>console.log()</code> statements and viewing their output in the browser console.',
-				name: 'notice',
-				type: 'notice',
-				default: '',
+				displayName: 'Language',
+				name: 'language',
+				type: 'hidden',
+				displayOptions: {
+					show: {
+						'@version': [1],
+					},
+				},
+				default: 'javaScript',
 			},
+
+			...javascriptCodeDescription,
+			...pythonCodeDescription,
 		],
 	};
 
 	async execute(this: IExecuteFunctions) {
-		const nodeMode = this.getNodeParameter('mode', 0) as CodeNodeMode;
+		const nodeMode = this.getNodeParameter('mode', 0) as CodeExecutionMode;
 		const workflowMode = this.getMode();
 
+		const node = this.getNode();
+		const language: CodeNodeEditorLanguage =
+			node.typeVersion === 2
+				? (this.getNodeParameter('language', 0) as CodeNodeEditorLanguage)
+				: 'javaScript';
+		const codeParameterName = language === 'python' ? 'pythonCode' : 'jsCode';
+
+		const getSandbox = (index = 0) => {
+			const code = this.getNodeParameter(codeParameterName, index) as string;
+			const context = getSandboxContext.call(this, index);
+			if (nodeMode === 'runOnceForAllItems') {
+				context.items = context.$input.all();
+			} else {
+				context.item = context.$input.item;
+			}
+
+			const Sandbox = language === 'python' ? PythonSandbox : JavaScriptSandbox;
+			const sandbox = new Sandbox(context, code, index, this.helpers);
+			sandbox.on(
+				'output',
+				workflowMode === 'manual'
+					? this.sendMessageToUI
+					: CODE_ENABLE_STDOUT === 'true'
+						? (...args) =>
+								console.log(`[Workflow "${this.getWorkflow().id}"][Node "${node.name}"]`, ...args)
+						: () => {},
+			);
+			return sandbox;
+		};
+
 		// ----------------------------------
 		//        runOnceForAllItems
 		// ----------------------------------
 
 		if (nodeMode === 'runOnceForAllItems') {
-			const jsCodeAllItems = this.getNodeParameter('jsCode', 0) as string;
-
-			const context = getSandboxContext.call(this);
-			context.items = context.$input.all();
-			const sandbox = new Sandbox(context, jsCodeAllItems, workflowMode, this.helpers);
-
-			if (workflowMode === 'manual') {
-				sandbox.on('console.log', this.sendMessageToUI);
-			}
-
-			let result: INodeExecutionData[];
+			const sandbox = getSandbox();
+			let items: INodeExecutionData[];
 			try {
-				result = await sandbox.runCodeAllItems();
+				items = (await sandbox.runCodeAllItems()) as INodeExecutionData[];
 			} catch (error) {
-				if (!this.continueOnFail()) throw error;
-				result = [{ json: { error: error.message } }];
+				if (!this.continueOnFail()) {
+					set(error, 'node', node);
+					throw error;
+				}
+				items = [{ json: { error: error.message } }];
 			}
 
-			for (const item of result) {
+			for (const item of items) {
 				standardizeOutput(item.json);
 			}
 
-			return this.prepareOutputData(result);
+			return [items];
 		}
 
 		// ----------------------------------
@@ -108,22 +157,21 @@ export class Code implements INodeType {
 		const items = this.getInputData();
 
 		for (let index = 0; index < items.length; index++) {
-			const jsCodeEachItem = this.getNodeParameter('jsCode', index) as string;
-
-			const context = getSandboxContext.call(this, index);
-			context.item = context.$input.item;
-			const sandbox = new Sandbox(context, jsCodeEachItem, workflowMode, this.helpers);
-
-			if (workflowMode === 'manual') {
-				sandbox.on('console.log', this.sendMessageToUI);
-			}
-
+			const sandbox = getSandbox(index);
 			let result: INodeExecutionData | undefined;
 			try {
-				result = await sandbox.runCodeEachItem(index);
+				result = await sandbox.runCodeEachItem();
 			} catch (error) {
-				if (!this.continueOnFail()) throw error;
-				returnData.push({ json: { error: error.message } });
+				if (!this.continueOnFail()) {
+					set(error, 'node', node);
+					throw error;
+				}
+				returnData.push({
+					json: { error: error.message },
+					pairedItem: {
+						item: index,
+					},
+				});
 			}
 
 			if (result) {
@@ -135,6 +183,6 @@ export class Code implements INodeType {
 			}
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Code/JavaScriptSandbox.ts b/packages/nodes-base/nodes/Code/JavaScriptSandbox.ts
new file mode 100644
index 0000000000000..6c9401eb56f2d
--- /dev/null
+++ b/packages/nodes-base/nodes/Code/JavaScriptSandbox.ts
@@ -0,0 +1,147 @@
+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';
+
+const { NODE_FUNCTION_ALLOW_BUILTIN: builtIn, NODE_FUNCTION_ALLOW_EXTERNAL: external } =
+	process.env;
+
+export const vmResolver = makeResolverFromLegacyOptions({
+	external: external
+		? {
+				modules: external.split(','),
+				transitive: false,
+			}
+		: false,
+	builtin: builtIn?.split(',') ?? [],
+});
+
+export class JavaScriptSandbox extends Sandbox {
+	private readonly vm: NodeVM;
+
+	constructor(
+		context: SandboxContext,
+		private jsCode: string,
+		itemIndex: number | undefined,
+		helpers: IExecuteFunctions['helpers'],
+		options?: { resolver?: Resolver },
+	) {
+		super(
+			{
+				object: {
+					singular: 'object',
+					plural: 'objects',
+				},
+			},
+			itemIndex,
+			helpers,
+		);
+		this.vm = new NodeVM({
+			console: 'redirect',
+			sandbox: context,
+			require: options?.resolver ?? vmResolver,
+			wasm: false,
+		});
+
+		this.vm.on('console.log', (...args: unknown[]) => this.emit('output', ...args));
+	}
+
+	async runCode(): Promise<unknown> {
+		const script = `module.exports = async function() {${this.jsCode}\n}()`;
+		try {
+			const executionResult = await this.vm.run(script, __dirname);
+			return executionResult;
+		} catch (error) {
+			throw new ExecutionError(error);
+		}
+	}
+
+	async runCodeAllItems(options?: {
+		multiOutput?: boolean;
+	}): Promise<INodeExecutionData[] | INodeExecutionData[][]> {
+		const script = `module.exports = async function() {${this.jsCode}\n}()`;
+
+		let executionResult: INodeExecutionData | INodeExecutionData[] | INodeExecutionData[][];
+
+		try {
+			executionResult = await this.vm.run(script, __dirname);
+		} catch (error) {
+			// anticipate user expecting `items` to pre-exist as in Function Item node
+			if (error.message === 'items is not defined' && !/(let|const|var) items =/.test(script)) {
+				const quoted = error.message.replace('items', '`items`');
+				error.message = (quoted as string) + '. Did you mean `$input.all()`?';
+			}
+
+			throw new ExecutionError(error);
+		}
+
+		if (executionResult === null) return [];
+
+		if (options?.multiOutput === true) {
+			// Check if executionResult is an array of arrays
+			if (!Array.isArray(executionResult) || executionResult.some((item) => !Array.isArray(item))) {
+				throw new ValidationError({
+					message: "The code doesn't return an array of arrays",
+					description:
+						'Please return an array of arrays. One array for the different outputs and one for the different items that get returned.',
+					itemIndex: this.itemIndex,
+				});
+			}
+
+			return executionResult.map((data) => {
+				return this.validateRunCodeAllItems(data);
+			});
+		}
+
+		return this.validateRunCodeAllItems(
+			executionResult as INodeExecutionData | INodeExecutionData[],
+		);
+	}
+
+	async runCodeEachItem(): Promise<INodeExecutionData | undefined> {
+		const script = `module.exports = async function() {${this.jsCode}\n}()`;
+
+		const match = this.jsCode.match(/\$input\.(?<disallowedMethod>first|last|all|itemMatching)/);
+
+		if (match?.groups?.disallowedMethod) {
+			const { disallowedMethod } = match.groups;
+
+			const lineNumber =
+				this.jsCode.split('\n').findIndex((line) => {
+					return line.includes(disallowedMethod) && !line.startsWith('//') && !line.startsWith('*');
+				}) + 1;
+
+			const disallowedMethodFound = lineNumber !== 0;
+
+			if (disallowedMethodFound) {
+				throw new ValidationError({
+					message: `Can't use .${disallowedMethod}() here`,
+					description: "This is only available in 'Run Once for All Items' mode",
+					itemIndex: this.itemIndex,
+					lineNumber,
+				});
+			}
+		}
+
+		let executionResult: INodeExecutionData;
+
+		try {
+			executionResult = await this.vm.run(script, __dirname);
+		} catch (error) {
+			// anticipate user expecting `item` to pre-exist as in Function Item node
+			if (error.message === 'item is not defined' && !/(let|const|var) item =/.test(script)) {
+				const quoted = error.message.replace('item', '`item`');
+				error.message = (quoted as string) + '. Did you mean `$input.item.json`?';
+			}
+
+			throw new ExecutionError(error, this.itemIndex);
+		}
+
+		if (executionResult === null) return;
+
+		return this.validateRunCodeEachItem(executionResult);
+	}
+}
diff --git a/packages/nodes-base/nodes/Code/Pyodide.ts b/packages/nodes-base/nodes/Code/Pyodide.ts
new file mode 100644
index 0000000000000..23bcabbde8e23
--- /dev/null
+++ b/packages/nodes-base/nodes/Code/Pyodide.ts
@@ -0,0 +1,17 @@
+import type { PyodideInterface } from 'pyodide';
+
+let pyodideInstance: PyodideInterface | undefined;
+
+export async function LoadPyodide(packageCacheDir: string): Promise<PyodideInterface> {
+	if (pyodideInstance === undefined) {
+		const { loadPyodide } = await import('pyodide');
+		pyodideInstance = await loadPyodide({ packageCacheDir });
+
+		await pyodideInstance.runPythonAsync(`
+from _pyodide_core import jsproxy_typedict
+from js import Object
+`);
+	}
+
+	return pyodideInstance;
+}
diff --git a/packages/nodes-base/nodes/Code/PythonSandbox.ts b/packages/nodes-base/nodes/Code/PythonSandbox.ts
new file mode 100644
index 0000000000000..fd1ab3f5641f7
--- /dev/null
+++ b/packages/nodes-base/nodes/Code/PythonSandbox.ts
@@ -0,0 +1,107 @@
+import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
+import type { PyDict } from 'pyodide/ffi';
+import { LoadPyodide } from './Pyodide';
+import type { SandboxContext } from './Sandbox';
+import { Sandbox } from './Sandbox';
+
+type PythonSandboxContext = {
+	[K in keyof SandboxContext as K extends `$${infer I}` ? `_${I}` : K]: SandboxContext[K];
+};
+
+type PyodideError = Error & { type: string };
+
+const envAccessBlocked = process.env.N8N_BLOCK_ENV_ACCESS_IN_NODE === 'true';
+
+export class PythonSandbox extends Sandbox {
+	private readonly context: PythonSandboxContext;
+
+	constructor(
+		context: SandboxContext,
+		private pythonCode: string,
+		itemIndex: number | undefined,
+		helpers: IExecuteFunctions['helpers'],
+	) {
+		super(
+			{
+				object: {
+					singular: 'dictionary',
+					plural: 'dictionaries',
+				},
+			},
+			itemIndex,
+			helpers,
+		);
+		// Since python doesn't allow variable names starting with `$`,
+		// rename them to all to start with `_` instead
+		this.context = Object.keys(context).reduce((acc, key) => {
+			acc[key.startsWith('$') ? key.replace(/^\$/, '_') : key] = context[key];
+			return acc;
+		}, {} as PythonSandboxContext);
+	}
+
+	async runCode(): Promise<unknown> {
+		return await this.runCodeInPython<unknown>();
+	}
+
+	async runCodeAllItems() {
+		const executionResult = await this.runCodeInPython<INodeExecutionData[]>();
+		return this.validateRunCodeAllItems(executionResult);
+	}
+
+	async runCodeEachItem() {
+		const executionResult = await this.runCodeInPython<INodeExecutionData>();
+		return this.validateRunCodeEachItem(executionResult);
+	}
+
+	private async runCodeInPython<T>() {
+		const packageCacheDir = this.helpers.getStoragePath();
+		const pyodide = await LoadPyodide(packageCacheDir);
+
+		let executionResult;
+		try {
+			await pyodide.runPythonAsync('jsproxy_typedict[0] = type(Object.new().as_object_map())');
+
+			await pyodide.loadPackagesFromImports(this.pythonCode);
+
+			const dict = pyodide.globals.get('dict');
+			const globalsDict: PyDict = dict();
+			for (const key of Object.keys(this.context)) {
+				if ((key === '_env' && envAccessBlocked) || key === '_node') continue;
+				const value = this.context[key];
+				globalsDict.set(key, value);
+			}
+
+			pyodide.setStdout({ batched: (str) => this.emit('output', str) });
+
+			const runCode = `
+async def __main():
+${this.pythonCode
+	.split('\n')
+	.map((line) => '  ' + line)
+	.join('\n')}
+await __main()`;
+			executionResult = await pyodide.runPythonAsync(runCode, { globals: globalsDict });
+			globalsDict.destroy();
+		} catch (error) {
+			throw this.getPrettyError(error as PyodideError);
+		}
+
+		if (executionResult?.toJs) {
+			return executionResult.toJs({
+				dict_converter: Object.fromEntries,
+				create_proxies: false,
+			}) as T;
+		}
+
+		return executionResult as T;
+	}
+
+	private getPrettyError(error: PyodideError): Error {
+		const errorTypeIndex = error.message.indexOf(error.type);
+		if (errorTypeIndex !== -1) {
+			return new Error(error.message.slice(errorTypeIndex));
+		}
+
+		return error;
+	}
+}
diff --git a/packages/nodes-base/nodes/Code/Sandbox.ts b/packages/nodes-base/nodes/Code/Sandbox.ts
index 9fd9e9fd522df..fb8aeb5ced0ef 100644
--- a/packages/nodes-base/nodes/Code/Sandbox.ts
+++ b/packages/nodes-base/nodes/Code/Sandbox.ts
@@ -1,70 +1,97 @@
-import { NodeVM } from 'vm2';
+import { EventEmitter } from 'events';
+import type { IExecuteFunctions, INodeExecutionData, IWorkflowDataProxyData } from 'n8n-workflow';
 import { ValidationError } from './ValidationError';
-import { ExecutionError } from './ExecutionError';
-import { isObject, REQUIRED_N8N_ITEM_KEYS } from './utils';
-
-import type {
-	IDataObject,
-	IExecuteFunctions,
-	INodeExecutionData,
-	IWorkflowDataProxyData,
-	WorkflowExecuteMode,
-} from 'n8n-workflow';
-
-interface SandboxContext extends IWorkflowDataProxyData {
+import { isObject } from './utils';
+
+interface SandboxTextKeys {
+	object: {
+		singular: string;
+		plural: string;
+	};
+}
+
+export interface SandboxContext extends IWorkflowDataProxyData {
 	$getNodeParameter: IExecuteFunctions['getNodeParameter'];
 	$getWorkflowStaticData: IExecuteFunctions['getWorkflowStaticData'];
 	helpers: IExecuteFunctions['helpers'];
 }
 
-const { NODE_FUNCTION_ALLOW_BUILTIN: builtIn, NODE_FUNCTION_ALLOW_EXTERNAL: external } =
-	process.env;
+export const REQUIRED_N8N_ITEM_KEYS = new Set(['json', 'binary', 'pairedItem', 'error']);
 
-export class Sandbox extends NodeVM {
-	private itemIndex: number | undefined = undefined;
+export function getSandboxContext(this: IExecuteFunctions, index: number): SandboxContext {
+	return {
+		// from NodeExecuteFunctions
+		$getNodeParameter: this.getNodeParameter,
+		$getWorkflowStaticData: this.getWorkflowStaticData,
+		helpers: this.helpers,
+
+		// to bring in all $-prefixed vars and methods from WorkflowDataProxy
+		// $node, $items(), $parameter, $json, $env, etc.
+		...this.getWorkflowDataProxy(index),
+	};
+}
 
+export abstract class Sandbox extends EventEmitter {
 	constructor(
-		context: SandboxContext,
-		private jsCode: string,
-		workflowMode: WorkflowExecuteMode,
-		private helpers: IExecuteFunctions['helpers'],
+		private textKeys: SandboxTextKeys,
+		protected itemIndex: number | undefined,
+		protected helpers: IExecuteFunctions['helpers'],
 	) {
-		super({
-			console: workflowMode === 'manual' ? 'redirect' : 'inherit',
-			sandbox: context,
-			require: {
-				builtin: builtIn ? builtIn.split(',') : [],
-				external: external ? { modules: external.split(','), transitive: false } : false,
-			},
-		});
+		super();
 	}
 
-	async runCodeAllItems(): Promise<INodeExecutionData[]> {
-		const script = `module.exports = async function() {${this.jsCode}\n}()`;
+	abstract runCode(): Promise<unknown>;
 
-		let executionResult: INodeExecutionData | INodeExecutionData[];
+	abstract runCodeAllItems(): Promise<INodeExecutionData[] | INodeExecutionData[][]>;
 
-		try {
-			executionResult = await this.run(script, __dirname);
-		} catch (error) {
-			// anticipate user expecting `items` to pre-exist as in Function Item node
-			if (error.message === 'items is not defined' && !/(let|const|var) items =/.test(script)) {
-				const quoted = error.message.replace('items', '`items`');
-				error.message = (quoted as string) + '. Did you mean `$input.all()`?';
-			}
+	abstract runCodeEachItem(): Promise<INodeExecutionData | undefined>;
 
-			// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-			throw new ExecutionError(error);
+	validateRunCodeEachItem(executionResult: INodeExecutionData | undefined): INodeExecutionData {
+		if (typeof executionResult !== 'object') {
+			throw new ValidationError({
+				message: `Code doesn't return ${this.getTextKey('object', { includeArticle: true })}`,
+				description: `Please return ${this.getTextKey('object', {
+					includeArticle: true,
+				})} representing the output item. ('${executionResult}' was returned instead.)`,
+				itemIndex: this.itemIndex,
+			});
 		}
 
-		if (executionResult === null) return [];
+		if (Array.isArray(executionResult)) {
+			const firstSentence =
+				executionResult.length > 0
+					? `An array of ${typeof executionResult[0]}s was returned.`
+					: 'An empty array was returned.';
+			throw new ValidationError({
+				message: `Code doesn't return a single ${this.getTextKey('object')}`,
+				description: `${firstSentence} If you need to output multiple items, please use the 'Run Once for All Items' mode instead.`,
+				itemIndex: this.itemIndex,
+			});
+		}
 
-		if (executionResult === undefined || typeof executionResult !== 'object') {
+		const [returnData] = this.helpers.normalizeItems([executionResult]);
+
+		this.validateItem(returnData);
+
+		// If at least one top-level key is a supported item key (`json`, `binary`, etc.),
+		// and another top-level key is unrecognized, then the user mis-added a property
+		// directly on the item, when they intended to add it on the `json` property
+		this.validateTopLevelKeys(returnData);
+
+		return returnData;
+	}
+
+	validateRunCodeAllItems(
+		executionResult: INodeExecutionData | INodeExecutionData[] | undefined,
+		itemIndex?: number,
+	): INodeExecutionData[] {
+		if (typeof executionResult !== 'object') {
 			throw new ValidationError({
 				message: "Code doesn't return items properly",
-				description:
-					'Please return an array of objects, one for each item you would like to output',
-				itemIndex: this.itemIndex,
+				description: `Please return an array of ${this.getTextKey('object', {
+					plural: true,
+				})}, one for each item you would like to output.`,
+				itemIndex,
 			});
 		}
 
@@ -77,109 +104,54 @@ export class Sandbox extends NodeVM {
 			 * item keys to be wrapped in `json` when normalizing items below.
 			 */
 			const mustHaveTopLevelN8nKey = executionResult.some((item) =>
-				Object.keys(item as IDataObject).find((key) => REQUIRED_N8N_ITEM_KEYS.has(key)),
+				Object.keys(item).find((key) => REQUIRED_N8N_ITEM_KEYS.has(key)),
 			);
 
-			for (const item of executionResult) {
-				if (mustHaveTopLevelN8nKey) {
+			if (mustHaveTopLevelN8nKey) {
+				for (const item of executionResult) {
 					this.validateTopLevelKeys(item);
 				}
 			}
 		}
 
 		const returnData = this.helpers.normalizeItems(executionResult);
-		returnData.forEach((item) => this.validateResult(item));
+		returnData.forEach((item) => this.validateItem(item));
 		return returnData;
 	}
 
-	async runCodeEachItem(itemIndex: number): Promise<INodeExecutionData | undefined> {
-		this.itemIndex = itemIndex;
-		const script = `module.exports = async function() {${this.jsCode}\n}()`;
-
-		const match = this.jsCode.match(/\$input\.(?<disallowedMethod>first|last|all|itemMatching)/);
-
-		if (match?.groups?.disallowedMethod) {
-			const { disallowedMethod } = match.groups;
-
-			const lineNumber =
-				this.jsCode.split('\n').findIndex((line) => {
-					return line.includes(disallowedMethod) && !line.startsWith('//') && !line.startsWith('*');
-				}) + 1;
-
-			const disallowedMethodFound = lineNumber !== 0;
-
-			if (disallowedMethodFound) {
-				throw new ValidationError({
-					message: `Can't use .${disallowedMethod}() here`,
-					description: "This is only available in 'Run Once for All Items' mode",
-					itemIndex: this.itemIndex,
-					lineNumber,
-				});
-			}
-		}
-
-		let executionResult: INodeExecutionData;
-
-		try {
-			executionResult = await this.run(script, __dirname);
-		} catch (error) {
-			// anticipate user expecting `item` to pre-exist as in Function Item node
-			if (error.message === 'item is not defined' && !/(let|const|var) item =/.test(script)) {
-				const quoted = error.message.replace('item', '`item`');
-				error.message = (quoted as string) + '. Did you mean `$input.item.json`?';
-			}
-
-			// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-			throw new ExecutionError(error, this.itemIndex);
+	private getTextKey(
+		key: keyof SandboxTextKeys,
+		options?: { includeArticle?: boolean; plural?: boolean },
+	) {
+		const response = this.textKeys[key][options?.plural ? 'plural' : 'singular'];
+		if (!options?.includeArticle) {
+			return response;
 		}
-
-		if (executionResult === null) return;
-
-		if (executionResult === undefined || typeof executionResult !== 'object') {
-			throw new ValidationError({
-				message: "Code doesn't return an object",
-				description: `Please return an object representing the output item. ('${executionResult}' was returned instead.)`,
-				itemIndex: this.itemIndex,
-			});
+		if (['a', 'e', 'i', 'o', 'u'].some((value) => response.startsWith(value))) {
+			return `an ${response}`;
 		}
-
-		if (Array.isArray(executionResult)) {
-			const firstSentence =
-				executionResult.length > 0
-					? `An array of ${typeof executionResult[0]}s was returned.`
-					: 'An empty array was returned.';
-
-			throw new ValidationError({
-				message: "Code doesn't return a single object",
-				description: `${firstSentence} If you need to output multiple items, please use the 'Run Once for All Items' mode instead`,
-				itemIndex: this.itemIndex,
-			});
-		}
-
-		const [returnData] = this.helpers.normalizeItems([executionResult]);
-		this.validateResult(returnData);
-
-		// If at least one top-level key is a supported item key (`json`, `binary`, etc.),
-		// and another top-level key is unrecognized, then the user mis-added a property
-		// directly on the item, when they intended to add it on the `json` property
-		this.validateTopLevelKeys(returnData);
-
-		return returnData;
+		return `a ${response}`;
 	}
 
-	private validateResult({ json, binary }: INodeExecutionData) {
+	private validateItem({ json, binary }: INodeExecutionData) {
 		if (json === undefined || !isObject(json)) {
 			throw new ValidationError({
-				message: "A 'json' property isn't an object",
-				description: "In the returned data, every key named 'json' must point to an object",
+				message: `A 'json' property isn't ${this.getTextKey('object', { includeArticle: true })}`,
+				description: `In the returned data, every key named 'json' must point to ${this.getTextKey(
+					'object',
+					{ includeArticle: true },
+				)}.`,
 				itemIndex: this.itemIndex,
 			});
 		}
 
 		if (binary !== undefined && !isObject(binary)) {
 			throw new ValidationError({
-				message: "A 'binary' property isn't an object",
-				description: "In the returned data, every key named 'binary’ must point to an object.",
+				message: `A 'binary' property isn't ${this.getTextKey('object', { includeArticle: true })}`,
+				description: `In the returned data, every key named 'binary’ must point to ${this.getTextKey(
+					'object',
+					{ includeArticle: true },
+				)}.`,
 				itemIndex: this.itemIndex,
 			});
 		}
@@ -196,15 +168,3 @@ export class Sandbox extends NodeVM {
 		});
 	}
 }
-
-export function getSandboxContext(this: IExecuteFunctions, index?: number): SandboxContext {
-	return {
-		// from NodeExecuteFunctions
-		$getNodeParameter: this.getNodeParameter,
-		$getWorkflowStaticData: this.getWorkflowStaticData,
-		helpers: this.helpers,
-
-		// to bring in all $-prefixed vars and methods from WorkflowDataProxy
-		...this.getWorkflowDataProxy(index ?? 0),
-	};
-}
diff --git a/packages/nodes-base/nodes/Code/code.svg b/packages/nodes-base/nodes/Code/code.svg
new file mode 100644
index 0000000000000..6345d8a84c80d
--- /dev/null
+++ b/packages/nodes-base/nodes/Code/code.svg
@@ -0,0 +1,11 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1171_441)">
+<path d="M170.283 48H196.5C203.127 48 208.5 42.6274 208.5 36V12C208.5 5.37258 203.127 0 196.5 0H170.283C126.1 0 90.283 35.8172 90.283 80V176C90.283 206.928 65.2109 232 34.283 232H23C16.3726 232 11 237.372 11 244V268C11 274.627 16.3724 280 22.9996 280L34.283 280C65.2109 280 90.283 305.072 90.283 336V440C90.283 479.764 122.518 512 162.283 512H196.5C203.127 512 208.5 506.627 208.5 500V476C208.5 469.373 203.127 464 196.5 464H162.283C149.028 464 138.283 453.255 138.283 440V336C138.283 309.022 128.011 284.443 111.164 265.961C106.109 260.416 106.109 251.584 111.164 246.039C128.011 227.557 138.283 202.978 138.283 176V80C138.283 62.3269 152.61 48 170.283 48Z" fill="#FF9922"/>
+<path d="M305 36C305 42.6274 310.373 48 317 48H342.979C360.652 48 374.978 62.3269 374.978 80V176C374.978 202.978 385.251 227.557 402.098 246.039C407.153 251.584 407.153 260.416 402.098 265.961C385.251 284.443 374.978 309.022 374.978 336V432C374.978 449.673 360.652 464 342.979 464H317C310.373 464 305 469.373 305 476V500C305 506.627 310.373 512 317 512H342.979C387.161 512 422.978 476.183 422.978 432V336C422.978 305.072 448.051 280 478.979 280H490C496.627 280 502 274.628 502 268V244C502 237.373 496.628 232 490 232L478.979 232C448.051 232 422.978 206.928 422.978 176V80C422.978 35.8172 387.161 0 342.979 0H317C310.373 0 305 5.37258 305 12V36Z" fill="#FF9922"/>
+</g>
+<defs>
+<clipPath id="clip0_1171_441">
+<rect width="512" height="512" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/packages/nodes-base/nodes/Code/descriptions/JavascriptCodeDescription.ts b/packages/nodes-base/nodes/Code/descriptions/JavascriptCodeDescription.ts
new file mode 100644
index 0000000000000..acfb833ce6b41
--- /dev/null
+++ b/packages/nodes-base/nodes/Code/descriptions/JavascriptCodeDescription.ts
@@ -0,0 +1,76 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+const commonDescription: INodeProperties = {
+	displayName: 'JavaScript',
+	name: 'jsCode',
+	type: 'string',
+	typeOptions: {
+		editor: 'codeNodeEditor',
+		editorLanguage: 'javaScript',
+	},
+	default: '',
+	description:
+		'JavaScript code to execute.<br><br>Tip: You can use luxon vars like <code>$today</code> for dates and <code>$jmespath</code> for querying JSON structures. <a href="https://docs.n8n.io/nodes/n8n-nodes-base.function">Learn more</a>.',
+	noDataExpression: true,
+};
+
+const v1Properties: INodeProperties[] = [
+	{
+		...commonDescription,
+		displayOptions: {
+			show: {
+				'@version': [1],
+				mode: ['runOnceForAllItems'],
+			},
+		},
+	},
+	{
+		...commonDescription,
+		displayOptions: {
+			show: {
+				'@version': [1],
+				mode: ['runOnceForEachItem'],
+			},
+		},
+	},
+];
+
+const v2Properties: INodeProperties[] = [
+	{
+		...commonDescription,
+		displayOptions: {
+			show: {
+				'@version': [2],
+				language: ['javaScript'],
+				mode: ['runOnceForAllItems'],
+			},
+		},
+	},
+	{
+		...commonDescription,
+		displayOptions: {
+			show: {
+				'@version': [2],
+				language: ['javaScript'],
+				mode: ['runOnceForEachItem'],
+			},
+		},
+	},
+];
+
+export const javascriptCodeDescription: INodeProperties[] = [
+	...v1Properties,
+	...v2Properties,
+	{
+		displayName:
+			'Type <code>$</code> for a list of <a target="_blank" href="https://docs.n8n.io/code-examples/methods-variables-reference/">special vars/methods</a>. Debug by using <code>console.log()</code> statements and viewing their output in the browser console.',
+		name: 'notice',
+		type: 'notice',
+		displayOptions: {
+			show: {
+				language: ['javaScript'],
+			},
+		},
+		default: '',
+	},
+];
diff --git a/packages/nodes-base/nodes/Code/descriptions/PythonCodeDescription.ts b/packages/nodes-base/nodes/Code/descriptions/PythonCodeDescription.ts
new file mode 100644
index 0000000000000..e3c9d4cb43b01
--- /dev/null
+++ b/packages/nodes-base/nodes/Code/descriptions/PythonCodeDescription.ts
@@ -0,0 +1,48 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+const commonDescription: INodeProperties = {
+	displayName: 'Python',
+	name: 'pythonCode',
+	type: 'string',
+	typeOptions: {
+		editor: 'codeNodeEditor',
+		editorLanguage: 'python',
+	},
+	default: '',
+	description:
+		'Python code to execute.<br><br>Tip: You can use built-in methods and variables like <code>_today</code> for dates and <code>_jmespath</code> for querying JSON structures. <a href="https://docs.n8n.io/code/builtin/">Learn more</a>.',
+	noDataExpression: true,
+};
+
+export const pythonCodeDescription: INodeProperties[] = [
+	{
+		...commonDescription,
+		displayOptions: {
+			show: {
+				language: ['python'],
+				mode: ['runOnceForAllItems'],
+			},
+		},
+	},
+	{
+		...commonDescription,
+		displayOptions: {
+			show: {
+				language: ['python'],
+				mode: ['runOnceForEachItem'],
+			},
+		},
+	},
+	{
+		displayName:
+			'Debug by using <code>print()</code> statements and viewing their output in the browser console.',
+		name: 'notice',
+		type: 'notice',
+		displayOptions: {
+			show: {
+				language: ['python'],
+			},
+		},
+		default: '',
+	},
+];
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 f21b3c42e6e51..2b827877e8e34 100644
--- a/packages/nodes-base/nodes/Code/test/Code.node.test.ts
+++ b/packages/nodes-base/nodes/Code/test/Code.node.test.ts
@@ -1,19 +1,26 @@
 import { anyNumber, mock } from 'jest-mock-extended';
+import { NodeVM } from '@n8n/vm2';
 import type { IExecuteFunctions, IWorkflowDataProxyData } from 'n8n-workflow';
-import { NodeHelpers } from 'n8n-workflow';
+import { ApplicationError, NodeHelpers } from 'n8n-workflow';
 import { normalizeItems } from 'n8n-core';
-import { testWorkflows, getWorkflowFilenames } from '../../../test/nodes/Helpers';
 import { Code } from '../Code.node';
-import { Sandbox } from '../Sandbox';
 import { ValidationError } from '../ValidationError';
+import { testWorkflows, getWorkflowFilenames, initBinaryDataService } from '@test/nodes/Helpers';
 
-const workflows = getWorkflowFilenames(__dirname);
+describe('Test Code Node', () => {
+	const workflows = getWorkflowFilenames(__dirname);
 
-describe('Test Code Node', () => testWorkflows(workflows));
+	beforeAll(async () => {
+		await initBinaryDataService();
+	});
+
+	testWorkflows(workflows);
+});
 
 describe('Code Node unit test', () => {
 	const node = new Code();
 	const thisArg = mock<IExecuteFunctions>({
+		getNode: () => mock(),
 		helpers: { normalizeItems },
 		prepareOutputData: NodeHelpers.prepareOutputData,
 	});
@@ -48,7 +55,7 @@ describe('Code Node unit test', () => {
 
 			Object.entries(tests).forEach(([title, [input, expected]]) =>
 				test(title, async () => {
-					jest.spyOn(Sandbox.prototype, 'run').mockResolvedValueOnce(input);
+					jest.spyOn(NodeVM.prototype, 'run').mockResolvedValueOnce(input);
 
 					const output = await node.execute.call(thisArg);
 					expect(output).toEqual([expected]);
@@ -68,14 +75,14 @@ describe('Code Node unit test', () => {
 
 			Object.entries(tests).forEach(([title, returnData]) =>
 				test(`return error if \`.json\` is ${title}`, async () => {
-					jest.spyOn(Sandbox.prototype, 'run').mockResolvedValueOnce([{ json: returnData }]);
+					jest.spyOn(NodeVM.prototype, 'run').mockResolvedValueOnce([{ json: returnData }]);
 
 					try {
 						await node.execute.call(thisArg);
-						throw new Error("Validation error wasn't thrown");
+						throw new ApplicationError("Validation error wasn't thrown", { level: 'warning' });
 					} catch (error) {
 						expect(error).toBeInstanceOf(ValidationError);
-						expect(error.message).toEqual("A 'json' property isn't an object");
+						expect(error.message).toEqual("A 'json' property isn't an object [item 0]");
 					}
 				}),
 			);
@@ -100,7 +107,7 @@ describe('Code Node unit test', () => {
 
 			Object.entries(tests).forEach(([title, [input, expected]]) =>
 				test(title, async () => {
-					jest.spyOn(Sandbox.prototype, 'run').mockResolvedValueOnce(input);
+					jest.spyOn(NodeVM.prototype, 'run').mockResolvedValueOnce(input);
 
 					const output = await node.execute.call(thisArg);
 					expect(output).toEqual([[{ json: expected?.json, pairedItem: { item: 0 } }]]);
@@ -120,11 +127,11 @@ describe('Code Node unit test', () => {
 
 			Object.entries(tests).forEach(([title, returnData]) =>
 				test(`return error if \`.json\` is ${title}`, async () => {
-					jest.spyOn(Sandbox.prototype, 'run').mockResolvedValueOnce({ json: returnData });
+					jest.spyOn(NodeVM.prototype, 'run').mockResolvedValueOnce({ json: returnData });
 
 					try {
 						await node.execute.call(thisArg);
-						throw new Error("Validation error wasn't thrown");
+						throw new ApplicationError("Validation error wasn't thrown", { level: 'warning' });
 					} catch (error) {
 						expect(error).toBeInstanceOf(ValidationError);
 						expect(error.message).toEqual("A 'json' property isn't an object [item 0]");
diff --git a/packages/nodes-base/nodes/Code/test/Code.workflow.json b/packages/nodes-base/nodes/Code/test/Code.workflow.json
index 02bef9a1648b2..07933b0f824a9 100644
--- a/packages/nodes-base/nodes/Code/test/Code.workflow.json
+++ b/packages/nodes-base/nodes/Code/test/Code.workflow.json
@@ -1,56 +1,64 @@
 {
-	"name": "My workflow 24",
 	"nodes": [
 		{
 			"parameters": {},
-			"id": "3691826c-caf3-4773-b0af-f5fe2eda42bc",
+			"id": "33eede8d-2ab0-42ab-b79a-a069d8549ab0",
 			"name": "When clicking \"Execute Workflow\"",
 			"type": "n8n-nodes-base.manualTrigger",
 			"typeVersion": 1,
-			"position": [
-				-960,
-				600
-			]
+			"position": [-40, 580]
 		},
 		{
 			"parameters": {
 				"jsCode": "return[\n  { value: 1 },\n  { value: 2 },\n]"
 			},
-			"id": "149e8223-20e2-480e-b675-2aeb6a9f9095",
+			"id": "a5913b52-24dc-4f81-bb7f-f90e61dad978",
 			"name": "Sample Data",
 			"type": "n8n-nodes-base.code",
 			"typeVersion": 1,
-			"position": [
-				-720,
-				600
-			]
+			"position": [200, 580]
 		},
 		{
 			"parameters": {
 				"jsCode": "// Loop over input items and add a new field\n// called 'myNewField' to the JSON of each one\nlet sum = 0;\nfor (const item of $input.all()) {\n  sum += item.json.value;\n}\n\nreturn [ {sum} ];"
 			},
-			"id": "2002ec71-fd88-4a5b-b2fe-0071fc5397e4",
+			"id": "c4ad4913-5af3-42bc-a784-69182f1facdd",
 			"name": "Run Once for All Items",
 			"type": "n8n-nodes-base.code",
 			"typeVersion": 1,
-			"position": [
-				-460,
-				480
-			]
+			"position": [460, 320]
+		},
+		{
+			"parameters": {
+				"jsCode": "// Loop over input items and add a new field\n// called 'myNewField' to the JSON of each one\nlet sum = 0;\nfor (const item of items) {\n  sum += item.json.value;\n}\n\nreturn [ {sum} ];"
+			},
+			"id": "34cbd204-4335-4790-92cd-c3df617eee21",
+			"name": "Run Once for All Items (Legacy Syntax)",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [460, 500]
 		},
 		{
 			"parameters": {
 				"mode": "runOnceForEachItem",
 				"jsCode": "// Add a new field called 'myNewField' to the\n// JSON of the item\n$input.item.json.myNewField = $input.item.json.value;\n\nreturn $input.item;"
 			},
-			"id": "9adbeb7a-c711-4ff6-881e-96d5e122c2bc",
+			"id": "f67d29bf-554a-4572-8867-4456182dec24",
 			"name": "Run Once for Each Item",
 			"type": "n8n-nodes-base.code",
 			"typeVersion": 1,
-			"position": [
-				-460,
-				720
-			]
+			"position": [460, 680]
+		},
+		{
+			"parameters": {
+				"mode": "runOnceForEachItem",
+				"jsCode": "// Add a new field called 'myNewField' to the\n// JSON of the item\nitem.json.myNewField = item.json.value;\n\nreturn item;"
+			},
+			"id": "6f4bf149-e84e-4e0d-802a-7eaf7a42b18c",
+			"name": "Run Once for Each Item  (Legacy Syntax)",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [460, 860]
 		}
 	],
 	"pinData": {
@@ -74,6 +82,27 @@
 					"myNewField": 2
 				}
 			}
+		],
+		"Run Once for All Items (Legacy Syntax)": [
+			{
+				"json": {
+					"sum": 3
+				}
+			}
+		],
+		"Run Once for Each Item  (Legacy Syntax)": [
+			{
+				"json": {
+					"value": 1,
+					"myNewField": 1
+				}
+			},
+			{
+				"json": {
+					"value": 2,
+					"myNewField": 2
+				}
+			}
 		]
 	},
 	"connections": {
@@ -100,17 +129,19 @@
 						"node": "Run Once for Each Item",
 						"type": "main",
 						"index": 0
+					},
+					{
+						"node": "Run Once for All Items (Legacy Syntax)",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Run Once for Each Item  (Legacy Syntax)",
+						"type": "main",
+						"index": 0
 					}
 				]
 			]
 		}
-	},
-	"active": false,
-	"settings": {},
-	"versionId": "b0d8ec77-92ab-4fa7-93b1-8a2e3543059d",
-	"id": "181",
-	"meta": {
-		"instanceId": "104a4d08d8897b8bdeb38aaca515021075e0bd8544c983c2bb8c86e6a8e6081c"
-	},
-	"tags": []
-}
\ No newline at end of file
+	}
+}
diff --git a/packages/nodes-base/nodes/Code/utils.ts b/packages/nodes-base/nodes/Code/utils.ts
index 891768f6ffd89..28fa00f829210 100644
--- a/packages/nodes-base/nodes/Code/utils.ts
+++ b/packages/nodes-base/nodes/Code/utils.ts
@@ -36,7 +36,3 @@ export function standardizeOutput(output: IDataObject) {
 	standardizeOutputRecursive(output);
 	return output;
 }
-
-export type CodeNodeMode = 'runOnceForAllItems' | 'runOnceForEachItem';
-
-export const REQUIRED_N8N_ITEM_KEYS = new Set(['json', 'binary', 'pairedItem']);
diff --git a/packages/nodes-base/nodes/CoinGecko/CoinDescription.ts b/packages/nodes-base/nodes/CoinGecko/CoinDescription.ts
index f29c83085273f..58dbb956a1412 100644
--- a/packages/nodes-base/nodes/CoinGecko/CoinDescription.ts
+++ b/packages/nodes-base/nodes/CoinGecko/CoinDescription.ts
@@ -301,7 +301,7 @@ export const coinFields: INodeProperties[] = [
 		name: 'days',
 		required: true,
 		type: 'options',
-		// eslint-disable-next-line n8n-nodes-base/node-param-options-type-unsorted-items
+
 		options: [
 			{
 				name: '1',
diff --git a/packages/nodes-base/nodes/CoinGecko/CoinGecko.node.ts b/packages/nodes-base/nodes/CoinGecko/CoinGecko.node.ts
index 1378bdf2030e2..5bda5ea290dd2 100644
--- a/packages/nodes-base/nodes/CoinGecko/CoinGecko.node.ts
+++ b/packages/nodes-base/nodes/CoinGecko/CoinGecko.node.ts
@@ -8,14 +8,13 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
+import moment from 'moment-timezone';
 import { coinFields, coinOperations } from './CoinDescription';
 
 import { eventFields, eventOperations } from './EventDescription';
 
 import { coinGeckoApiRequest, coinGeckoRequestAllItems } from './GenericFunctions';
 
-import moment from 'moment-timezone';
-
 export class CoinGecko implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'CoinGecko',
@@ -485,6 +484,6 @@ export class CoinGecko implements INodeType {
 			}
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/CoinGecko/GenericFunctions.ts b/packages/nodes-base/nodes/CoinGecko/GenericFunctions.ts
index 4ec589c78db59..141ed62851816 100644
--- a/packages/nodes-base/nodes/CoinGecko/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/CoinGecko/GenericFunctions.ts
@@ -1,17 +1,16 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	ILoadOptionsFunctions,
 	IDataObject,
 	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function coinGeckoApiRequest(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: any = {},
@@ -19,7 +18,7 @@ export async function coinGeckoApiRequest(
 	uri?: string,
 	option: IDataObject = {},
 ): Promise<any> {
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		headers: {
 			Accept: 'application/json',
 			'Content-Type': 'application/json',
@@ -48,7 +47,7 @@ export async function coinGeckoApiRequest(
 export async function coinGeckoRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: any = {},
diff --git a/packages/nodes-base/nodes/CoinGecko/coinGecko.svg b/packages/nodes-base/nodes/CoinGecko/coinGecko.svg
index 13d2c55d87a46..8a8469fdf6885 100644
--- a/packages/nodes-base/nodes/CoinGecko/coinGecko.svg
+++ b/packages/nodes-base/nodes/CoinGecko/coinGecko.svg
@@ -1 +1 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 276 276"><defs><style>.cls-3{fill:#fff}.cls-4{fill:#8bc53f}.cls-6{fill:#58595b}</style></defs><g id="Coin_Gecko_AI" data-name="Coin Gecko AI"><path d="M276 137.39A138 138 0 11137.39 0 138 138 0 01276 137.39z" fill="#8dc63f"/><path d="M265.65 137.44a127.63 127.63 0 11-128.21-127 127.65 127.65 0 01128.21 127z" fill="#f9e988"/><path class="cls-3" d="M140.35 18.66a70.18 70.18 0 0124.53 0 74.75 74.75 0 0123.43 7.85c7.28 4 13.57 9.43 19.83 14.52s12.49 10.3 18.42 16a93.32 93.32 0 0115.71 19 108.28 108.28 0 0111 22.17c5.33 15.66 7.18 32.53 4.52 48.62H257c-2.67-15.95-6.29-31.15-12-45.61A177.51 177.51 0 00235.56 80a209.1 209.1 0 00-12.42-20 72.31 72.31 0 00-16.64-16.8c-6.48-4.62-13.93-7.61-21.14-10.45S171 27 163.48 24.84s-15.16-3.78-23.14-5.35z"/><path class="cls-4" d="M202.74 92.39c-9.26-2.68-18.86-6.48-28.58-10.32-.56-2.44-2.72-5.48-7.09-9.19-6.35-5.51-18.28-5.37-28.59-2.93-11.38-2.68-22.62-3.63-33.41-1-88.25 24.31-38.21 83.62-70.61 143.24 4.61 9.78 54.3 66.84 126.2 51.53 0 0-24.59-59.09 30.9-87.45 45.01-23.09 77.53-65.81 11.18-83.88z"/><path class="cls-3" d="M213.64 131.2a5.35 5.35 0 11-5.38-5.32 5.36 5.36 0 015.38 5.32z"/><path d="M138.48 69.91c6.43.46 29.68 8 35.68 12.12-5-14.5-21.83-16.43-35.68-12.12z" fill="#009345"/><path class="cls-3" d="M144.6 106.58a24.68 24.68 0 11-24.69-24.67 24.68 24.68 0 0124.68 24.66z"/><path class="cls-6" d="M137.28 106.8a17.36 17.36 0 11-17.36-17.36 17.36 17.36 0 0117.36 17.36z"/><path class="cls-4" d="M233.63 142.08c-20 14.09-42.74 24.78-75 24.78-15.1 0-18.16-16-28.14-8.18-5.15 4.06-23.31 13.14-37.72 12.45S55 162 48.49 131.23C45.91 162 44.59 184.65 33 210.62c23 36.83 77.84 65.24 127.62 53-5.31-37.35 27.38-73.93 45.72-92.62 7-7.09 20.3-18.66 27.29-28.91z"/><path class="cls-6" d="M232.85 143c-6.21 5.66-13.6 9.85-21.12 13.55a134.9 134.9 0 01-23.7 8.63c-8.16 2.11-16.67 3.7-25.29 2.92s-17.43-3.71-23.14-10.17l.27-.31c7 4.54 15.08 6.14 23.12 6.37a108.27 108.27 0 0024.3-2 132.71 132.71 0 0023.61-7.3c7.63-3.15 15.18-6.8 21.68-12z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" data-name="Layer 1" viewBox="0 0 276 276"><defs><style>.cls-3{fill:#fff}.cls-4{fill:#8bc53f}.cls-6{fill:#58595b}</style></defs><g id="Coin_Gecko_AI" data-name="Coin Gecko AI"><path fill="#8dc63f" d="M276 137.39A138 138 0 1 1 137.39 0 138 138 0 0 1 276 137.39"/><path fill="#f9e988" d="M265.65 137.44a127.63 127.63 0 1 1-128.21-127 127.65 127.65 0 0 1 128.21 127"/><path d="M140.35 18.66a70.2 70.2 0 0 1 24.53 0 74.8 74.8 0 0 1 23.43 7.85c7.28 4 13.57 9.43 19.83 14.52s12.49 10.3 18.42 16a93.3 93.3 0 0 1 15.71 19 108.3 108.3 0 0 1 11 22.17c5.33 15.66 7.18 32.53 4.52 48.62H257c-2.67-15.95-6.29-31.15-12-45.61A177.5 177.5 0 0 0 235.56 80a209 209 0 0 0-12.42-20 72.3 72.3 0 0 0-16.64-16.8c-6.48-4.62-13.93-7.61-21.14-10.45S171 27 163.48 24.84s-15.16-3.78-23.14-5.35z" class="cls-3"/><path d="M202.74 92.39c-9.26-2.68-18.86-6.48-28.58-10.32-.56-2.44-2.72-5.48-7.09-9.19-6.35-5.51-18.28-5.37-28.59-2.93-11.38-2.68-22.62-3.63-33.41-1-88.25 24.31-38.21 83.62-70.61 143.24 4.61 9.78 54.3 66.84 126.2 51.53 0 0-24.59-59.09 30.9-87.45 45.01-23.09 77.53-65.81 11.18-83.88" class="cls-4"/><path d="M213.64 131.2a5.35 5.35 0 1 1-5.38-5.32 5.36 5.36 0 0 1 5.38 5.32" class="cls-3"/><path fill="#009345" d="M138.48 69.91c6.43.46 29.68 8 35.68 12.12-5-14.5-21.83-16.43-35.68-12.12"/><path d="M144.6 106.58a24.68 24.68 0 1 1-24.69-24.67 24.68 24.68 0 0 1 24.68 24.66z" class="cls-3"/><path d="M137.28 106.8a17.36 17.36 0 1 1-17.36-17.36 17.36 17.36 0 0 1 17.36 17.36" class="cls-6"/><path d="M233.63 142.08c-20 14.09-42.74 24.78-75 24.78-15.1 0-18.16-16-28.14-8.18-5.15 4.06-23.31 13.14-37.72 12.45S55 162 48.49 131.23C45.91 162 44.59 184.65 33 210.62c23 36.83 77.84 65.24 127.62 53-5.31-37.35 27.38-73.93 45.72-92.62 7-7.09 20.3-18.66 27.29-28.91z" class="cls-4"/><path d="M232.85 143c-6.21 5.66-13.6 9.85-21.12 13.55a135 135 0 0 1-23.7 8.63c-8.16 2.11-16.67 3.7-25.29 2.92s-17.43-3.71-23.14-10.17l.27-.31c7 4.54 15.08 6.14 23.12 6.37a108.3 108.3 0 0 0 24.3-2 132.7 132.7 0 0 0 23.61-7.3c7.63-3.15 15.18-6.8 21.68-12z" class="cls-6"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/CompareDatasets/CompareDatasets.node.json b/packages/nodes-base/nodes/CompareDatasets/CompareDatasets.node.json
index 4d821972fb32f..516b8928c6825 100644
--- a/packages/nodes-base/nodes/CompareDatasets/CompareDatasets.node.json
+++ b/packages/nodes-base/nodes/CompareDatasets/CompareDatasets.node.json
@@ -41,7 +41,7 @@
 			}
 		]
 	},
-	"alias": ["Join", "Concatenate", "Compare", "Dataset", "Split"],
+	"alias": ["Join", "Concatenate", "Compare", "Dataset", "Split", "Sync", "Syncing"],
 	"subcategories": {
 		"Core Nodes": ["Flow"]
 	}
diff --git a/packages/nodes-base/nodes/CompareDatasets/CompareDatasets.node.ts b/packages/nodes-base/nodes/CompareDatasets/CompareDatasets.node.ts
index 96aff7586f1d1..332ca2920b28a 100644
--- a/packages/nodes-base/nodes/CompareDatasets/CompareDatasets.node.ts
+++ b/packages/nodes-base/nodes/CompareDatasets/CompareDatasets.node.ts
@@ -5,7 +5,12 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { checkInput, checkMatchFieldsInput, findMatches } from './GenericFunctions';
+import {
+	checkInput,
+	checkInputAndThrowError,
+	checkMatchFieldsInput,
+	findMatches,
+} from './GenericFunctions';
 
 export class CompareDatasets implements INodeType {
 	description: INodeTypeDescription = {
@@ -13,12 +18,13 @@ export class CompareDatasets implements INodeType {
 		name: 'compareDatasets',
 		icon: 'file:compare.svg',
 		group: ['transform'],
-		version: [1, 2, 2.1],
+		version: [1, 2, 2.1, 2.2, 2.3],
 		description: 'Compare two inputs for changes',
 		defaults: { name: 'Compare Datasets' },
 		// eslint-disable-next-line n8n-nodes-base/node-class-description-inputs-wrong-regular-node
 		inputs: ['main', 'main'],
 		inputNames: ['Input A', 'Input B'],
+		requiredInputs: 1,
 		// eslint-disable-next-line n8n-nodes-base/node-class-description-outputs-wrong
 		outputs: ['main', 'main', 'main', 'main'],
 		outputNames: ['In A only', 'Same', 'Different', 'In B only'],
@@ -254,19 +260,26 @@ export class CompareDatasets implements INodeType {
 			options.fuzzyCompare = this.getNodeParameter('fuzzyCompare', 0, false) as boolean;
 		}
 
-		const input1 = checkInput(
-			this.getInputData(0),
-			matchFields.map((pair) => pair.field1),
-			(options.disableDotNotation as boolean) || false,
-			'Input A',
-		);
+		let input1 = this.getInputData(0);
+		let input2 = this.getInputData(1);
+		if (options.nodeVersion < 2.2) {
+			input1 = checkInputAndThrowError(
+				input1,
+				matchFields.map((pair) => pair.field1),
+				(options.disableDotNotation as boolean) || false,
+				'Input A',
+			);
 
-		const input2 = checkInput(
-			this.getInputData(1),
-			matchFields.map((pair) => pair.field2),
-			(options.disableDotNotation as boolean) || false,
-			'Input B',
-		);
+			input2 = checkInputAndThrowError(
+				input2,
+				matchFields.map((pair) => pair.field2),
+				(options.disableDotNotation as boolean) || false,
+				'Input B',
+			);
+		} else {
+			input1 = checkInput(input1);
+			input2 = checkInput(input2);
+		}
 
 		const resolve = this.getNodeParameter('resolve', 0, '') as string;
 		options.resolve = resolve;
diff --git a/packages/nodes-base/nodes/CompareDatasets/GenericFunctions.ts b/packages/nodes-base/nodes/CompareDatasets/GenericFunctions.ts
index 144f52725f19d..f8d707e3ce0c0 100644
--- a/packages/nodes-base/nodes/CompareDatasets/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/CompareDatasets/GenericFunctions.ts
@@ -1,15 +1,15 @@
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
-
-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 { ApplicationError, type IDataObject, type INodeExecutionData } from 'n8n-workflow';
+
+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 { fuzzyCompare } from '../../utils/utilities';
+import set from 'lodash/set';
+import union from 'lodash/union';
+import { fuzzyCompare, preparePairedItemDataArray } from '@utils/utilities';
 
 type PairToMatch = {
 	field1: string;
@@ -102,8 +102,9 @@ function compareItems(
 						skippedFieldsWithDotNotation.length &&
 						(typeof input1 !== 'object' || typeof input2 !== 'object')
 					) {
-						throw new Error(
+						throw new ApplicationError(
 							`The field \'${key}\' in item ${i} is not an object. It is not possible to use dot notation.`,
+							{ level: 'warning' },
 						);
 					}
 
@@ -141,6 +142,10 @@ function compareItems(
 
 	return {
 		json: { keys, same, different, ...(!isEmpty(skipped) && { skipped }) },
+		pairedItem: [
+			...preparePairedItemDataArray(item1.pairedItem),
+			...preparePairedItemDataArray(item2.pairedItem),
+		],
 	} as INodeExecutionData;
 }
 
@@ -166,7 +171,7 @@ function combineItems(
 			entry.json[field] = match.json[field];
 		} else {
 			const value = get(match.json, field) || null;
-			set(entry, `json.${field}`, value);
+			set(entry, ['json', field], value);
 		}
 	});
 
@@ -254,11 +259,8 @@ export function findMatches(
 
 	if (disableDotNotation && skipFields.some((field) => field.includes('.'))) {
 		const fieldToSkip = skipFields.find((field) => field.includes('.'));
-		throw new Error(
-			`Dot notation is disabled, but field to skip comparing '${
-				fieldToSkip as string
-			}' contains dot`,
-		);
+		const msg = `Dot notation is disabled, but field to skip comparing '${fieldToSkip}' contains dot`;
+		throw new ApplicationError(msg, { level: 'warning' });
 	}
 
 	const filteredData = {
@@ -398,23 +400,33 @@ export function findMatches(
 
 export function checkMatchFieldsInput(data: IDataObject[]) {
 	if (data.length === 1 && data[0].field1 === '' && data[0].field2 === '') {
-		throw new Error(
+		throw new ApplicationError(
 			'You need to define at least one pair of fields in "Fields to Match" to match on',
+			{ level: 'warning' },
 		);
 	}
 	for (const [index, pair] of data.entries()) {
 		if (pair.field1 === '' || pair.field2 === '') {
-			throw new Error(
+			throw new ApplicationError(
 				`You need to define both fields in "Fields to Match" for pair ${index + 1},
 				 field 1 = '${pair.field1}'
 				 field 2 = '${pair.field2}'`,
+				{ level: 'warning' },
 			);
 		}
 	}
 	return data as PairToMatch[];
 }
 
-export function checkInput(
+export function checkInput(input: INodeExecutionData[]) {
+	if (!input) return [];
+	if (input.some((item) => isEmpty(item.json))) {
+		input = input.filter((item) => !isEmpty(item.json));
+	}
+	return input;
+}
+
+export function checkInputAndThrowError(
 	input: INodeExecutionData[],
 	fields: string[],
 	disableDotNotation: boolean,
@@ -434,7 +446,10 @@ export function checkInput(
 			return get(entry.json, field, undefined) !== undefined;
 		});
 		if (!isPresent) {
-			throw new Error(`Field '${field}' is not present in any of items in '${inputLabel}'`);
+			throw new ApplicationError(
+				`Field '${field}' is not present in any of items in '${inputLabel}'`,
+				{ level: 'warning' },
+			);
 		}
 	}
 	return input;
diff --git a/packages/nodes-base/nodes/CompareDatasets/compare.svg b/packages/nodes-base/nodes/CompareDatasets/compare.svg
index 652f53f5d7633..1e15d06b9ab8d 100644
--- a/packages/nodes-base/nodes/CompareDatasets/compare.svg
+++ b/packages/nodes-base/nodes/CompareDatasets/compare.svg
@@ -1,5 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="384" height="512" viewBox="0 0 384 512" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <path id="plus" fill="#ed230d" stroke="none" d="M 352 448 L 32 448 C 14.31 448 0 462.309998 0 480 C 0 497.690002 14.31 511.100006 32 511.100006 L 352 511.100006 C 369.690002 511.100006 384 496.790009 384 480 C 384 463.209991 369.700012 448 352 448 Z"/>
-    <path id="minus" fill="#62f730" stroke="none" d="M 48 208 L 160 208 L 160 319.100006 C 160 336.790009 174.309998 350.200012 192 350.200012 C 209.690002 350.200012 224 335.890015 224 319.100006 L 224 208 L 336 208 C 353.690002 208 368 193.679993 368 175.98999 C 368 158.299988 353.690002 144 336 144 L 224 144 L 224 32 C 224 14.309998 209.690002 -0.01001 192 -0.01001 C 174.309998 -0.01001 160 14.329987 160 32.01001 L 160 144.01001 L 48 144.01001 C 30.309999 144.01001 16 158.320007 16 176 C 16 193.679993 30.309999 208 48 208 Z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="384" height="512"><path fill="#ed230d" d="M352 448H32c-17.69 0-32 14.31-32 32s14.31 31.1 32 31.1h320c17.69 0 32-14.31 32-31.1s-14.3-32-32-32"/><path fill="#62f730" d="M48 208h112v111.1c0 17.69 14.31 31.1 32 31.1s32-14.31 32-31.1V208h112c17.69 0 32-14.32 32-32.01S353.69 144 336 144H224V32c0-17.69-14.31-32.01-32-32.01s-32 14.34-32 32.02v112H48c-17.69 0-32 14.31-32 31.99s14.31 32 32 32"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/CompareDatasets/test/node/CompareDatasets.test.ts b/packages/nodes-base/nodes/CompareDatasets/test/node/CompareDatasets.test.ts
index 80c545b795272..36b48febcc8d6 100644
--- a/packages/nodes-base/nodes/CompareDatasets/test/node/CompareDatasets.test.ts
+++ b/packages/nodes-base/nodes/CompareDatasets/test/node/CompareDatasets.test.ts
@@ -1,4 +1,4 @@
-import { testWorkflows, getWorkflowFilenames } from '../../../../test/nodes/Helpers';
+import { testWorkflows, getWorkflowFilenames } from '@test/nodes/Helpers';
 
 const workflows = getWorkflowFilenames(__dirname);
 
diff --git a/packages/nodes-base/nodes/CompareDatasets/test/node/workflow.compareDatasets.forceInputNodeExecution.json b/packages/nodes-base/nodes/CompareDatasets/test/node/workflow.compareDatasets.forceInputNodeExecution.json
new file mode 100644
index 0000000000000..9a07c0e4174ec
--- /dev/null
+++ b/packages/nodes-base/nodes/CompareDatasets/test/node/workflow.compareDatasets.forceInputNodeExecution.json
@@ -0,0 +1,211 @@
+{
+	"name": "My workflow",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "4013708d-2460-44b7-923d-e3cd36eb9287",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [-6660, 8040]
+		},
+		{
+			"parameters": {
+				"jsCode": "return [\n  {\n    json: {\n      number: 0\n    }\n  },\n  {\n    json: {\n      number: 1\n    }\n  },\n  {\n    json: {\n      number: 2\n    }\n  }\n];"
+			},
+			"id": "be417cbe-7a4f-40eb-8a26-fca253a01882",
+			"name": "Code",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [-6240, 8040]
+		},
+		{
+			"parameters": {
+				"mergeByFields": {
+					"values": [
+						{
+							"field1": "number",
+							"field2": "number"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "97d65223-16c9-4d26-b31e-d818e1adbc8a",
+			"name": "Compare Datasets 2.2 - Old",
+			"type": "n8n-nodes-base.compareDatasets",
+			"typeVersion": 2.2,
+			"position": [-5800, 8140]
+		},
+		{
+			"parameters": {
+				"jsCode": "return [\n  {\n    json: {\n      number: 0\n    }\n  },\n  {\n    json: {\n      number: 1,\n      k: 2,\n    }\n  },\n  {\n    json: {\n      number: 10\n    }\n  },\n  {\n    json: {\n      number: 11\n    }\n  },\n  {\n    json: {\n      number: 12\n    }\n  }\n];"
+			},
+			"id": "94580b8b-b698-4c49-98b6-12973b6f4220",
+			"name": "Code1",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [-6240, 8260]
+		},
+		{
+			"parameters": {},
+			"id": "78ec40a4-775d-467b-bacb-805658190b29",
+			"name": "Old - A only",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [-5540, 7920]
+		},
+		{
+			"parameters": {},
+			"id": "eaa4cc93-53c6-4d00-9407-bd5da23e868e",
+			"name": "Old - Same",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [-5540, 8060]
+		},
+		{
+			"parameters": {},
+			"id": "d073db39-1902-411d-80dd-6ea8f42ac33b",
+			"name": "Old - Different",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [-5540, 8200]
+		},
+		{
+			"parameters": {},
+			"id": "29f92258-4869-43c1-9cef-9c281397ccc8",
+			"name": "Old - B only",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [-5540, 8340]
+		}
+	],
+	"pinData": {
+		"Old - A only": [
+			{
+				"json": {
+					"number": 2
+				}
+			}
+		],
+		"Old - Same": [
+			{
+				"json": {
+					"number": 0
+				}
+			}
+		],
+		"Old - Different": [
+			{
+				"json": {
+					"keys": {
+						"number": 1
+					},
+					"same": {
+						"number": 1
+					},
+					"different": {
+						"k": {
+							"inputA": null,
+							"inputB": 2
+						}
+					}
+				}
+			}
+		],
+		"Old - B only": [
+			{
+				"json": {
+					"number": 10
+				}
+			},
+			{
+				"json": {
+					"number": 11
+				}
+			},
+			{
+				"json": {
+					"number": 12
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Code",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code": {
+			"main": [
+				[
+					{
+						"node": "Compare Datasets 2.2 - Old",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code1": {
+			"main": [
+				[
+					{
+						"node": "Compare Datasets 2.2 - Old",
+						"type": "main",
+						"index": 1
+					}
+				]
+			]
+		},
+		"Compare Datasets 2.2 - Old": {
+			"main": [
+				[
+					{
+						"node": "Old - A only",
+						"type": "main",
+						"index": 0
+					}
+				],
+				[
+					{
+						"node": "Old - Same",
+						"type": "main",
+						"index": 0
+					}
+				],
+				[
+					{
+						"node": "Old - Different",
+						"type": "main",
+						"index": 0
+					}
+				],
+				[
+					{
+						"node": "Old - B only",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v0"
+	},
+	"versionId": "49a52ed2-ec4b-44b1-9dbd-c13fac4144f2",
+	"id": "ZpXvXjaKKZihfA2x",
+	"meta": {
+		"instanceId": "021d3c82ba2d3bc090cbf4fc81c9312668bcc34297e022bb3438c5c88a43a5ff"
+	},
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/CompareDatasets/test/node/workflow.update_2_2.json b/packages/nodes-base/nodes/CompareDatasets/test/node/workflow.update_2_2.json
new file mode 100644
index 0000000000000..708614c644e90
--- /dev/null
+++ b/packages/nodes-base/nodes/CompareDatasets/test/node/workflow.update_2_2.json
@@ -0,0 +1,212 @@
+{
+	"name": "do not error on missing keys",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "c7c0cf66-790a-4da7-81c8-ba9e4bbcec9a",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [720, 300]
+		},
+		{
+			"parameters": {
+				"jsCode": "return [\n  {id: 1},\n  {id: 2},\n  {id: 3},\n  {id: 4},\n];"
+			},
+			"id": "cec18624-ced0-4de1-8987-d4b184b136b9",
+			"name": "Code",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [1020, 200]
+		},
+		{
+			"parameters": {
+				"jsCode": "return [\n];"
+			},
+			"id": "754d549c-82ce-4625-ba2b-6f8edcbf715e",
+			"name": "Code1",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [1020, 400]
+		},
+		{
+			"parameters": {
+				"mergeByFields": {
+					"values": [
+						{
+							"field1": "idd",
+							"field2": "idd"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "1b3660a2-a490-4524-a8ac-cd42fa2b340b",
+			"name": "Compare Datasets",
+			"type": "n8n-nodes-base.compareDatasets",
+			"typeVersion": 2.2,
+			"position": [1300, 420]
+		},
+		{
+			"parameters": {
+				"mergeByFields": {
+					"values": [
+						{
+							"field1": "idd",
+							"field2": "idd"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "17e9b83b-828c-41a0-a7ba-e33cc66d37ad",
+			"name": "Any skipped",
+			"type": "n8n-nodes-base.compareDatasets",
+			"typeVersion": 2.1,
+			"position": [1300, 180],
+			"continueOnFail": true
+		},
+		{
+			"parameters": {},
+			"id": "551ed574-607a-4d98-9b06-350df92c805e",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1540, 200]
+		},
+		{
+			"parameters": {},
+			"id": "00e75760-d88e-413c-b276-c759db72411f",
+			"name": "No Operation, do nothing1",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1540, 360]
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"id": 1
+				}
+			},
+			{
+				"json": {
+					"id": 2
+				}
+			},
+			{
+				"json": {
+					"id": 3
+				}
+			},
+			{
+				"json": {
+					"id": 4
+				}
+			}
+		],
+		"No Operation, do nothing1": [
+			{
+				"json": {
+					"id": 1
+				}
+			},
+			{
+				"json": {
+					"id": 2
+				}
+			},
+			{
+				"json": {
+					"id": 3
+				}
+			},
+			{
+				"json": {
+					"id": 4
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Code",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Code1",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code": {
+			"main": [
+				[
+					{
+						"node": "Compare Datasets",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Any skipped",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code1": {
+			"main": [
+				[
+					{
+						"node": "Compare Datasets",
+						"type": "main",
+						"index": 1
+					},
+					{
+						"node": "Any skipped",
+						"type": "main",
+						"index": 1
+					}
+				]
+			]
+		},
+		"Any skipped": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Compare Datasets": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing1",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {},
+	"versionId": "11347bae-96af-4b28-80d7-fe272a165790",
+	"id": "8",
+	"meta": {
+		"instanceId": "6ebec4953fe56f1c009e7c3b107578b375137523af057073c0b5da17350651bd"
+	},
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/CompareDatasets/test/utils/utils.test.ts b/packages/nodes-base/nodes/CompareDatasets/test/utils/utils.test.ts
new file mode 100644
index 0000000000000..6af3b2f294b5b
--- /dev/null
+++ b/packages/nodes-base/nodes/CompareDatasets/test/utils/utils.test.ts
@@ -0,0 +1,32 @@
+import type { INodeExecutionData } from 'n8n-workflow';
+import { checkInput } from '../../GenericFunctions';
+
+describe('Test Compare Datasets Node utils', () => {
+	it('test checkInput', () => {
+		const input1 = [
+			{ json: {} },
+			{
+				json: {
+					name: 'Test',
+					age: 30,
+				},
+			},
+			{
+				json: {
+					name: 'Test2',
+					age: 30,
+				},
+			},
+		];
+
+		expect(checkInput(input1).length).toEqual(2);
+
+		const input2: INodeExecutionData[] = [{ json: {} }];
+
+		expect(checkInput(input2).length).toEqual(0);
+
+		const input3 = undefined;
+
+		expect(checkInput(input3 as unknown as INodeExecutionData[]).length).toEqual(0);
+	});
+});
diff --git a/packages/nodes-base/nodes/Compression/Compression.node.json b/packages/nodes-base/nodes/Compression/Compression.node.json
index 5661d4476013d..c85e4aaf6b75f 100644
--- a/packages/nodes-base/nodes/Compression/Compression.node.json
+++ b/packages/nodes-base/nodes/Compression/Compression.node.json
@@ -11,8 +11,19 @@
 			}
 		]
 	},
-	"alias": ["Zip", "Gzip", "uncompress"],
+	"alias": [
+		"Zip",
+		"Gzip",
+		"uncompress",
+		"compress",
+		"decompress",
+		"archive",
+		"unarchive",
+		"Binary",
+		"Files",
+		"File"
+	],
 	"subcategories": {
-		"Core Nodes": ["Files"]
+		"Core Nodes": ["Files", "Data Transformation"]
 	}
 }
diff --git a/packages/nodes-base/nodes/Compression/Compression.node.ts b/packages/nodes-base/nodes/Compression/Compression.node.ts
index e92d6c97a7142..a26a99657bc9b 100644
--- a/packages/nodes-base/nodes/Compression/Compression.node.ts
+++ b/packages/nodes-base/nodes/Compression/Compression.node.ts
@@ -1,3 +1,4 @@
+import { promisify } from 'util';
 import type {
 	IBinaryKeyData,
 	IExecuteFunctions,
@@ -8,8 +9,6 @@ import type {
 
 import * as fflate from 'fflate';
 
-import { promisify } from 'util';
-
 const gunzip = promisify(fflate.gunzip);
 const gzip = promisify(fflate.gzip);
 const unzip = promisify(fflate.unzip);
@@ -51,8 +50,8 @@ export class Compression implements INodeType {
 		icon: 'fa:file-archive',
 		group: ['transform'],
 		subtitle: '={{$parameter["operation"]}}',
-		version: 1,
-		description: 'Compress and uncompress files',
+		version: [1, 1.1],
+		description: 'Compress and decompress files',
 		defaults: {
 			name: 'Compression',
 			color: '#408000',
@@ -69,28 +68,49 @@ export class Compression implements INodeType {
 					{
 						name: 'Compress',
 						value: 'compress',
+						action: 'Compress file(s)',
+						description: 'Compress files into a zip or gzip archive',
 					},
 					{
 						name: 'Decompress',
 						value: 'decompress',
+						action: 'Decompress file(s)',
+						description: 'Decompress zip or gzip archives',
 					},
 				],
 				default: 'decompress',
 			},
 			{
-				displayName: 'Binary Property',
+				displayName: 'Input Binary Field(s)',
 				name: 'binaryPropertyName',
 				type: 'string',
 				default: 'data',
 				required: true,
 				displayOptions: {
 					show: {
-						operation: ['compress', 'decompress'],
+						operation: ['compress'],
 					},
 				},
-				placeholder: '',
+				placeholder: 'e.g. data,data2,data3',
+				hint: 'The name of the input binary field(s) containing the file(s) to be compressed',
 				description:
-					'Name of the binary property which contains the data for the file(s) to be compress/decompress. Multiple can be used separated by a comma (,).',
+					'To process more than one file, use a comma-separated list of the binary fields names',
+			},
+			{
+				displayName: 'Input Binary Field(s)',
+				name: 'binaryPropertyName',
+				type: 'string',
+				default: 'data',
+				required: true,
+				displayOptions: {
+					show: {
+						operation: ['decompress'],
+					},
+				},
+				placeholder: 'e.g. data',
+				hint: 'The name of the input binary field(s) containing the file(s) to decompress',
+				description:
+					'To process more than one file, use a comma-separated list of the binary fields names',
 			},
 			{
 				displayName: 'Output Format',
@@ -110,16 +130,42 @@ export class Compression implements INodeType {
 				displayOptions: {
 					show: {
 						operation: ['compress'],
+						'@version': [1],
 					},
 				},
-				description: 'Format of the output file',
+				description: 'Format of the output',
+			},
+			{
+				displayName: 'Output Format',
+				name: 'outputFormat',
+				type: 'options',
+				default: 'zip',
+				options: [
+					{
+						name: 'Gzip',
+						value: 'gzip',
+					},
+					{
+						name: 'Zip',
+						value: 'zip',
+					},
+				],
+				displayOptions: {
+					show: {
+						operation: ['compress'],
+					},
+					hide: {
+						'@version': [1],
+					},
+				},
+				description: 'Format of the output',
 			},
 			{
 				displayName: 'File Name',
 				name: 'fileName',
 				type: 'string',
 				default: '',
-				placeholder: 'data.zip',
+				placeholder: 'e.g. data.zip',
 				required: true,
 				displayOptions: {
 					show: {
@@ -127,10 +173,10 @@ export class Compression implements INodeType {
 						outputFormat: ['zip'],
 					},
 				},
-				description: 'Name of the file to be compressed',
+				description: 'Name of the output file',
 			},
 			{
-				displayName: 'Binary Property Output',
+				displayName: 'Put Output File in Field',
 				name: 'binaryPropertyOutput',
 				type: 'string',
 				default: 'data',
@@ -140,12 +186,43 @@ export class Compression implements INodeType {
 						operation: ['compress'],
 					},
 				},
-				placeholder: '',
-				description:
-					'Name of the binary property to which to write the data of the compressed files',
+				hint: 'The name of the output binary field to put the file in',
 			},
 			{
-				displayName: 'Output Prefix',
+				displayName: 'File Name',
+				name: 'fileName',
+				type: 'string',
+				default: '',
+				placeholder: 'e.g. data.txt',
+				displayOptions: {
+					show: {
+						operation: ['compress'],
+						outputFormat: ['gzip'],
+					},
+					hide: {
+						'@version': [1],
+					},
+				},
+				description: 'Name of the output file',
+			},
+			{
+				displayName: 'Put Output File in Field',
+				name: 'binaryPropertyOutput',
+				type: 'string',
+				default: 'data',
+				displayOptions: {
+					show: {
+						outputFormat: ['gzip'],
+						operation: ['compress'],
+					},
+					hide: {
+						'@version': [1],
+					},
+				},
+				hint: 'The name of the output binary field to put the file in',
+			},
+			{
+				displayName: 'Output File Prefix',
 				name: 'outputPrefix',
 				type: 'string',
 				default: 'data',
@@ -154,9 +231,10 @@ export class Compression implements INodeType {
 					show: {
 						operation: ['compress'],
 						outputFormat: ['gzip'],
+						'@version': [1],
 					},
 				},
-				description: 'Prefix use for all gzip compressed files',
+				description: 'Prefix to add to the gzip file',
 			},
 			{
 				displayName: 'Output Prefix',
@@ -169,7 +247,7 @@ export class Compression implements INodeType {
 						operation: ['decompress'],
 					},
 				},
-				description: 'Prefix use for all decompressed files',
+				description: 'Prefix to add to the decompressed files',
 			},
 		],
 	};
@@ -179,6 +257,7 @@ export class Compression implements INodeType {
 		const length = items.length;
 		const returnData: INodeExecutionData[] = [];
 		const operation = this.getNodeParameter('operation', 0);
+		const nodeVersion = this.getNode().typeVersion;
 
 		for (let i = 0; i < length; i++) {
 			try {
@@ -197,7 +276,7 @@ export class Compression implements INodeType {
 						const binaryData = this.helpers.assertBinaryData(i, binaryPropertyName);
 						const binaryDataBuffer = await this.helpers.getBinaryDataBuffer(i, binaryPropertyName);
 
-						if (binaryData.fileExtension === 'zip') {
+						if (binaryData.fileExtension?.toLowerCase() === 'zip') {
 							const files = await unzip(binaryDataBuffer);
 
 							for (const key of Object.keys(files)) {
@@ -213,20 +292,37 @@ export class Compression implements INodeType {
 
 								binaryObject[`${outputPrefix}${zipIndex++}`] = data;
 							}
-						} else if (binaryData.fileExtension === 'gz') {
+						} else if (['gz', 'gzip'].includes(binaryData.fileExtension?.toLowerCase() as string)) {
 							const file = await gunzip(binaryDataBuffer);
 
 							const fileName = binaryData.fileName?.split('.')[0];
+							let fileExtension;
+							let mimeType;
+
+							if (binaryData.fileName?.endsWith('.gz')) {
+								const extractedFileExtension = binaryData.fileName.replace('.gz', '').split('.');
+								if (extractedFileExtension.length > 1) {
+									fileExtension = extractedFileExtension[extractedFileExtension.length - 1];
+									mimeType = mime.lookup(fileExtension) as string;
+								}
+							}
 
 							const propertyName = `${outputPrefix}${index}`;
 
 							binaryObject[propertyName] = await this.helpers.prepareBinaryData(
 								Buffer.from(file.buffer),
 								fileName,
+								mimeType,
 							);
-							const fileExtension = mime.extension(binaryObject[propertyName].mimeType) as string;
+
+							if (!fileExtension) {
+								mimeType = binaryObject[propertyName].mimeType;
+								fileExtension = mime.extension(mimeType) as string;
+							}
+
 							binaryObject[propertyName].fileName = `${fileName}.${fileExtension}`;
 							binaryObject[propertyName].fileExtension = fileExtension;
+							binaryObject[propertyName].mimeType = mimeType as string;
 						}
 					}
 
@@ -240,14 +336,21 @@ export class Compression implements INodeType {
 				}
 
 				if (operation === 'compress') {
-					const binaryPropertyNames = this.getNodeParameter('binaryPropertyName', 0)
+					let binaryPropertyNameIndex = 0;
+					if (nodeVersion > 1) {
+						binaryPropertyNameIndex = i;
+					}
+
+					const binaryPropertyNames = this.getNodeParameter(
+						'binaryPropertyName',
+						binaryPropertyNameIndex,
+					)
 						.split(',')
 						.map((key) => key.trim());
 
 					const outputFormat = this.getNodeParameter('outputFormat', 0) as string;
 
 					const zipData: fflate.Zippable = {};
-
 					const binaryObject: IBinaryKeyData = {};
 
 					for (const [index, binaryPropertyName] of binaryPropertyNames.entries()) {
@@ -262,26 +365,53 @@ export class Compression implements INodeType {
 								},
 							];
 						} else if (outputFormat === 'gzip') {
-							const outputPrefix = this.getNodeParameter('outputPrefix', 0) as string;
+							let outputPrefix;
+							let fileName;
+							let binaryProperty;
+							let filePath;
+
+							if (nodeVersion > 1) {
+								outputPrefix = this.getNodeParameter('binaryPropertyOutput', i, 'data');
+								binaryProperty = `${outputPrefix}${index ? index : ''}`;
+
+								fileName = this.getNodeParameter('fileName', i, '') as string;
+								if (!fileName) {
+									fileName = binaryData.fileName?.split('.')[0];
+								} else {
+									fileName = fileName.replace('.gz', '').replace('.gzip', '');
+								}
 
-							const data = await gzip(binaryDataBuffer);
+								const fileExtension = binaryData.fileExtension
+									? `.${binaryData.fileExtension.toLowerCase()}`
+									: '';
+								filePath = `${fileName}${fileExtension}.gz`;
+							} else {
+								outputPrefix = this.getNodeParameter('outputPrefix', 0) as string;
+								binaryProperty = `${outputPrefix}${index}`;
+								fileName = binaryData.fileName?.split('.')[0];
+								filePath = `${fileName}.gzip`;
+							}
 
-							const fileName = binaryData.fileName?.split('.')[0];
+							const data = await gzip(binaryDataBuffer);
 
-							binaryObject[`${outputPrefix}${index}`] = await this.helpers.prepareBinaryData(
+							binaryObject[binaryProperty] = await this.helpers.prepareBinaryData(
 								Buffer.from(data),
-								`${fileName}.gzip`,
+								filePath,
 							);
 						}
 					}
 
 					if (outputFormat === 'zip') {
-						const fileName = this.getNodeParameter('fileName', 0) as string;
-
-						const binaryPropertyOutput = this.getNodeParameter('binaryPropertyOutput', 0);
-
+						let zipOptionsIndex = 0;
+						if (nodeVersion > 1) {
+							zipOptionsIndex = i;
+						}
+						const fileName = this.getNodeParameter('fileName', zipOptionsIndex) as string;
+						const binaryPropertyOutput = this.getNodeParameter(
+							'binaryPropertyOutput',
+							zipOptionsIndex,
+						);
 						const buffer = await zip(zipData);
-
 						const data = await this.helpers.prepareBinaryData(Buffer.from(buffer), fileName);
 
 						returnData.push({
@@ -321,6 +451,6 @@ export class Compression implements INodeType {
 			}
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
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 f6ad4066aee3e..65833677c740b 100644
--- a/packages/nodes-base/nodes/Compression/test/node/Compression.test.ts
+++ b/packages/nodes-base/nodes/Compression/test/node/Compression.test.ts
@@ -1,22 +1,21 @@
 /* eslint-disable @typescript-eslint/no-loop-func */
-import type { WorkflowTestData } from '../../../../test/nodes/types';
+import path from 'path';
+import os from 'node:os';
 import type { IDataObject } from 'n8n-workflow';
+import type { WorkflowTestData } from '@test/nodes/types';
 
 import {
 	getResultNodeData,
 	setup,
-	initBinaryDataManager,
+	initBinaryDataService,
 	readJsonFileSync,
-} from '../../../../test/nodes/Helpers';
-import { executeWorkflow } from '../../../../test/nodes/ExecuteWorkflow';
-
-import path from 'path';
-import os from 'node:os';
+} from '@test/nodes/Helpers';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 
 if (os.platform() !== 'win32') {
 	describe('Execute Compression Node', () => {
 		beforeEach(async () => {
-			await initBinaryDataManager();
+			await initBinaryDataService();
 		});
 
 		const workflowData = readJsonFileSync('nodes/Compression/test/node/workflow.compression.json');
diff --git a/packages/nodes-base/nodes/Contentful/Contentful.node.json b/packages/nodes-base/nodes/Contentful/Contentful.node.json
index 6b2d37595b4a4..22ea2f5699482 100644
--- a/packages/nodes-base/nodes/Contentful/Contentful.node.json
+++ b/packages/nodes-base/nodes/Contentful/Contentful.node.json
@@ -2,7 +2,7 @@
 	"node": "n8n-nodes-base.contentful",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Marketing & Content", "Development"],
+	"categories": ["Marketing", "Development"],
 	"resources": {
 		"credentialDocumentation": [
 			{
diff --git a/packages/nodes-base/nodes/Contentful/Contentful.node.ts b/packages/nodes-base/nodes/Contentful/Contentful.node.ts
index c49d4b9b674b8..033c06279d888 100644
--- a/packages/nodes-base/nodes/Contentful/Contentful.node.ts
+++ b/packages/nodes-base/nodes/Contentful/Contentful.node.ts
@@ -6,7 +6,7 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
-import { contenfulApiRequestAllItems, contentfulApiRequest } from './GenericFunctions';
+import { contentfulApiRequestAllItems, contentfulApiRequest } from './GenericFunctions';
 
 import * as SpaceDescription from './SpaceDescription';
 import * as ContentTypeDescription from './ContentTypeDescription';
@@ -23,7 +23,7 @@ export class Contentful implements INodeType {
 		icon: 'file:contentful.png',
 		group: ['input'],
 		version: 1,
-		description: 'Consume Contenful API',
+		description: 'Consume Contentful API',
 		defaults: {
 			name: 'Contentful',
 		},
@@ -187,7 +187,7 @@ export class Contentful implements INodeType {
 						}
 
 						if (returnAll) {
-							responseData = await contenfulApiRequestAllItems.call(
+							responseData = await contentfulApiRequestAllItems.call(
 								this,
 								'items',
 								'GET',
@@ -286,7 +286,7 @@ export class Contentful implements INodeType {
 						}
 
 						if (returnAll) {
-							responseData = await contenfulApiRequestAllItems.call(
+							responseData = await contentfulApiRequestAllItems.call(
 								this,
 								'items',
 								'GET',
@@ -335,7 +335,7 @@ export class Contentful implements INodeType {
 						const env = this.getNodeParameter('environmentId', i) as string;
 
 						if (returnAll) {
-							responseData = await contenfulApiRequestAllItems.call(
+							responseData = await contentfulApiRequestAllItems.call(
 								this,
 								'items',
 								'GET',
@@ -370,6 +370,6 @@ export class Contentful implements INodeType {
 				throw error;
 			}
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Contentful/GenericFunctions.ts b/packages/nodes-base/nodes/Contentful/GenericFunctions.ts
index 210876500ca47..270aadc44880d 100644
--- a/packages/nodes-base/nodes/Contentful/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Contentful/GenericFunctions.ts
@@ -1,17 +1,16 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
+	IRequestOptions,
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function contentfulApiRequest(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -23,7 +22,7 @@ export async function contentfulApiRequest(
 	const source = this.getNodeParameter('source', 0) as string;
 	const isPreview = source === 'previewApi';
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		method,
 		qs,
 		body,
@@ -44,10 +43,10 @@ export async function contentfulApiRequest(
 	}
 }
 
-export async function contenfulApiRequestAllItems(
+export async function contentfulApiRequestAllItems(
 	this: ILoadOptionsFunctions | IExecuteFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
diff --git a/packages/nodes-base/nodes/ConvertKit/ConvertKit.node.json b/packages/nodes-base/nodes/ConvertKit/ConvertKit.node.json
index d5f0f61c2c7d6..1a872c0ec00b3 100644
--- a/packages/nodes-base/nodes/ConvertKit/ConvertKit.node.json
+++ b/packages/nodes-base/nodes/ConvertKit/ConvertKit.node.json
@@ -2,7 +2,7 @@
 	"node": "n8n-nodes-base.convertKit",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Marketing & Content", "Sales"],
+	"categories": ["Marketing", "Sales"],
 	"resources": {
 		"credentialDocumentation": [
 			{
diff --git a/packages/nodes-base/nodes/ConvertKit/ConvertKit.node.ts b/packages/nodes-base/nodes/ConvertKit/ConvertKit.node.ts
index 3d3a8902dc1dd..05dcae636e91a 100644
--- a/packages/nodes-base/nodes/ConvertKit/ConvertKit.node.ts
+++ b/packages/nodes-base/nodes/ConvertKit/ConvertKit.node.ts
@@ -492,6 +492,6 @@ export class ConvertKit implements INodeType {
 			}
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/ConvertKit/ConvertKitTrigger.node.json b/packages/nodes-base/nodes/ConvertKit/ConvertKitTrigger.node.json
index 730e6a866d3a5..be7798fc934f0 100644
--- a/packages/nodes-base/nodes/ConvertKit/ConvertKitTrigger.node.json
+++ b/packages/nodes-base/nodes/ConvertKit/ConvertKitTrigger.node.json
@@ -2,7 +2,7 @@
 	"node": "n8n-nodes-base.convertKitTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Marketing & Content", "Sales"],
+	"categories": ["Marketing", "Sales"],
 	"resources": {
 		"credentialDocumentation": [
 			{
diff --git a/packages/nodes-base/nodes/ConvertKit/ConvertKitTrigger.node.ts b/packages/nodes-base/nodes/ConvertKit/ConvertKitTrigger.node.ts
index b37a1bd1473c8..415f4ceef1929 100644
--- a/packages/nodes-base/nodes/ConvertKit/ConvertKitTrigger.node.ts
+++ b/packages/nodes-base/nodes/ConvertKit/ConvertKitTrigger.node.ts
@@ -9,9 +9,8 @@ import type {
 	IWebhookResponseData,
 } from 'n8n-workflow';
 
-import { convertKitApiRequest } from './GenericFunctions';
-
 import { snakeCase } from 'change-case';
+import { convertKitApiRequest } from './GenericFunctions';
 
 export class ConvertKitTrigger implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/ConvertKit/GenericFunctions.ts b/packages/nodes-base/nodes/ConvertKit/GenericFunctions.ts
index acb6cb6a3efdd..68569e4c8694f 100644
--- a/packages/nodes-base/nodes/ConvertKit/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/ConvertKit/GenericFunctions.ts
@@ -1,18 +1,17 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	ILoadOptionsFunctions,
 	IDataObject,
 	IHookFunctions,
 	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function convertKitApiRequest(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IHookFunctions,
-	method: string,
+	this: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: any = {},
@@ -22,7 +21,7 @@ export async function convertKitApiRequest(
 ): Promise<any> {
 	const credentials = await this.getCredentials('convertKitApi');
 
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		headers: {
 			'Content-Type': 'application/json',
 		},
diff --git a/packages/nodes-base/nodes/ConvertKit/convertKit.svg b/packages/nodes-base/nodes/ConvertKit/convertKit.svg
index 59f55f49415c5..bf3e8be4a804b 100644
--- a/packages/nodes-base/nodes/ConvertKit/convertKit.svg
+++ b/packages/nodes-base/nodes/ConvertKit/convertKit.svg
@@ -1 +1 @@
-<svg width="172" height="160" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M82.72 126.316c29.77 0 52.78-22.622 52.78-50.526 0-26.143-21.617-42.106-35.935-42.106-19.945 0-35.93 14.084-38.198 34.988-.418 3.856-3.476 7.09-7.355 7.061-6.423-.046-15.746-.1-21.658-.08-2.555.008-4.669-2.065-4.543-4.618.89-18.123 6.914-35.07 18.402-48.087C58.976 8.488 77.561 0 99.565 0c36.969 0 71.869 33.786 71.869 75.79 0 46.508-38.312 84.21-87.927 84.21-35.384 0-71.021-23.258-83.464-55.775a.702.702 0 01-.03-.377c.165-.962.494-1.841.818-2.707.471-1.258.931-2.488.864-3.906l-.215-4.529a5.523 5.523 0 013.18-5.263l1.798-.842a6.982 6.982 0 003.912-5.075 6.993 6.993 0 016.887-5.736c5.282 0 9.875 3.515 11.59 8.512 8.307 24.212 21.511 42.014 53.873 42.014z" fill="#FB6970"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="172" height="160" fill="none"><path fill="#FB6970" d="M82.72 126.316c29.77 0 52.78-22.622 52.78-50.526 0-26.143-21.617-42.106-35.935-42.106-19.945 0-35.93 14.084-38.198 34.988-.418 3.856-3.476 7.09-7.355 7.061-6.423-.046-15.746-.1-21.658-.08-2.555.008-4.669-2.065-4.543-4.618.89-18.123 6.914-35.07 18.402-48.087C58.976 8.488 77.561 0 99.565 0c36.969 0 71.869 33.786 71.869 75.79 0 46.508-38.312 84.21-87.927 84.21-35.384 0-71.021-23.258-83.464-55.775a.7.7 0 0 1-.03-.377c.165-.962.494-1.841.818-2.707.471-1.258.931-2.488.864-3.906l-.215-4.529a5.52 5.52 0 0 1 3.18-5.263l1.798-.842a6.98 6.98 0 0 0 3.912-5.075 6.99 6.99 0 0 1 6.887-5.736c5.282 0 9.875 3.515 11.59 8.512 8.307 24.212 21.511 42.014 53.873 42.014"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Copper/Copper.node.json b/packages/nodes-base/nodes/Copper/Copper.node.json
index 10ca71a4a6366..4c7e5be4d7233 100644
--- a/packages/nodes-base/nodes/Copper/Copper.node.json
+++ b/packages/nodes-base/nodes/Copper/Copper.node.json
@@ -2,7 +2,7 @@
 	"node": "n8n-nodes-base.copper",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Marketing & Content", "Sales"],
+	"categories": ["Marketing", "Sales"],
 	"resources": {
 		"credentialDocumentation": [
 			{
diff --git a/packages/nodes-base/nodes/Copper/Copper.node.ts b/packages/nodes-base/nodes/Copper/Copper.node.ts
index a193bf4a9f25d..b03cb40b6f838 100644
--- a/packages/nodes-base/nodes/Copper/Copper.node.ts
+++ b/packages/nodes-base/nodes/Copper/Copper.node.ts
@@ -633,6 +633,6 @@ export class Copper implements INodeType {
 			returnData.push(...executionData);
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Copper/GenericFunctions.ts b/packages/nodes-base/nodes/Copper/GenericFunctions.ts
index 1b46cf5709a51..2ffd1ca7cf675 100644
--- a/packages/nodes-base/nodes/Copper/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Copper/GenericFunctions.ts
@@ -1,21 +1,20 @@
 import { createHash } from 'crypto';
 
-import type { OptionsWithUri } from 'request';
-
 import type {
 	ICredentialDataDecryptedObject,
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
+	IRequestOptions,
 	IWebhookFunctions,
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import flow from 'lodash.flow';
-import omit from 'lodash.omit';
+import flow from 'lodash/flow';
+import omit from 'lodash/omit';
 
 import type {
 	AddressFixedCollection,
@@ -28,13 +27,8 @@ import type {
  * Make an authenticated API request to Copper.
  */
 export async function copperApiRequest(
-	this:
-		| IHookFunctions
-		| IExecuteFunctions
-		| IExecuteSingleFunctions
-		| ILoadOptionsFunctions
-		| IWebhookFunctions,
-	method: string,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 	body: IDataObject = {},
 	qs: IDataObject = {},
@@ -43,7 +37,7 @@ export async function copperApiRequest(
 ) {
 	const credentials = (await this.getCredentials('copperApi')) as { apiKey: string; email: string };
 
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		headers: {
 			'X-PW-AccessToken': credentials.apiKey,
 			'X-PW-Application': 'developer_api',
@@ -153,7 +147,7 @@ export const adjustTaskFields = flow(adjustLeadFields, adjustProjectIds);
  */
 export async function copperApiRequestAllItems(
 	this: IHookFunctions | ILoadOptionsFunctions | IExecuteFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 	body: IDataObject = {},
 	qs: IDataObject = {},
@@ -179,7 +173,7 @@ export async function copperApiRequestAllItems(
  */
 export async function handleListing(
 	this: IExecuteFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	qs: IDataObject = {},
 	body: IDataObject = {},
@@ -190,7 +184,7 @@ export async function handleListing(
 	const option = { resolveWithFullResponse: true };
 
 	if (returnAll) {
-		return copperApiRequestAllItems.call(this, method, endpoint, body, qs, uri, option);
+		return await copperApiRequestAllItems.call(this, method, endpoint, body, qs, uri, option);
 	}
 
 	const limit = this.getNodeParameter('limit', 0);
diff --git a/packages/nodes-base/nodes/Copper/copper.svg b/packages/nodes-base/nodes/Copper/copper.svg
index 19c4ac4da40e6..34114d9b916fe 100644
--- a/packages/nodes-base/nodes/Copper/copper.svg
+++ b/packages/nodes-base/nodes/Copper/copper.svg
@@ -1 +1 @@
-<svg version="1.0" xmlns="http://www.w3.org/2000/svg" width="485.333" height="485.333" viewBox="0 0 364 364"><path d="M162 1.5c-21.5 2.6-39.8 8-58.5 17.1-38.6 18.8-67.8 48.2-85.6 85.9-13.3 28.4-19.7 62.8-17 91.2 1.5 15.9 3.7 26.8 9 44.4 3.9 12.8 16.7 37.5 26.4 50.4 6.3 8.5 24.6 27.1 34.2 34.7 11.6 9.3 27.7 18.4 46 26.3 10.9 4.7 34.8 10 51.9 11.6 10.4 1 16.2 1 26.7 0 60.4-5.4 110.7-36.2 142.2-87.1 19.1-31 29.1-72.3 25.8-107.2-1.3-14.8-4.7-31.4-9.1-44.7-15.1-45.8-50.7-85.9-94-105.8-5.2-2.4-10.2-4.8-11-5.2-1.9-1-19.8-6.5-26-8C202.6.3 182.1-1 162 1.5zm58.5 78.3c16 4.4 33 14.3 42 24.4 2.5 2.9 6.6 9.3 9 14.3 9.5 19.6 7.7 38-4.9 50.6-7 7-10.6 8.3-22.6 8.4-9.2 0-11.1-.3-15.3-2.4-6.9-3.6-13.9-11.4-16.6-18.6-3.4-8.9-3.1-17.4 1-31.6 6.5-22.4 3.9-33.9-9.1-40.4-4.2-2.2-14.9-2.5-20.2-.6-8.1 2.7-17.6 13.2-23.4 25.6-6.6 14.3-10.1 34.3-9.1 52.9 1.1 22 6.3 37.1 17.2 50.7 15.4 19 41.2 26.6 69.3 20.3 11.7-2.6 23.2-8.8 34.5-18.7 5.5-4.8 7.2-5.8 9.2-5.3 1.4.4 2.5 1.2 2.5 1.9 0 1.9-8.5 18-13.7 26.2-11.7 18-30.2 34.7-46.8 42-16.7 7.4-39.7 9.9-60.7 6.5-19.9-3.2-40.3-13.6-54.8-28-29.4-29.5-37.2-77.4-19.1-117.4 13.7-30.3 43.3-53.8 77.6-61.6 11.9-2.7 42.7-2.2 54 .8z" fill="#ff2564"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="485.333" height="485.333" version="1.0" viewBox="0 0 364 364"><path fill="#ff2564" d="M162 1.5c-21.5 2.6-39.8 8-58.5 17.1-38.6 18.8-67.8 48.2-85.6 85.9-13.3 28.4-19.7 62.8-17 91.2 1.5 15.9 3.7 26.8 9 44.4 3.9 12.8 16.7 37.5 26.4 50.4 6.3 8.5 24.6 27.1 34.2 34.7 11.6 9.3 27.7 18.4 46 26.3 10.9 4.7 34.8 10 51.9 11.6 10.4 1 16.2 1 26.7 0 60.4-5.4 110.7-36.2 142.2-87.1 19.1-31 29.1-72.3 25.8-107.2-1.3-14.8-4.7-31.4-9.1-44.7-15.1-45.8-50.7-85.9-94-105.8-5.2-2.4-10.2-4.8-11-5.2-1.9-1-19.8-6.5-26-8C202.6.3 182.1-1 162 1.5m58.5 78.3c16 4.4 33 14.3 42 24.4 2.5 2.9 6.6 9.3 9 14.3 9.5 19.6 7.7 38-4.9 50.6-7 7-10.6 8.3-22.6 8.4-9.2 0-11.1-.3-15.3-2.4-6.9-3.6-13.9-11.4-16.6-18.6-3.4-8.9-3.1-17.4 1-31.6 6.5-22.4 3.9-33.9-9.1-40.4-4.2-2.2-14.9-2.5-20.2-.6-8.1 2.7-17.6 13.2-23.4 25.6-6.6 14.3-10.1 34.3-9.1 52.9 1.1 22 6.3 37.1 17.2 50.7 15.4 19 41.2 26.6 69.3 20.3 11.7-2.6 23.2-8.8 34.5-18.7 5.5-4.8 7.2-5.8 9.2-5.3 1.4.4 2.5 1.2 2.5 1.9 0 1.9-8.5 18-13.7 26.2-11.7 18-30.2 34.7-46.8 42-16.7 7.4-39.7 9.9-60.7 6.5-19.9-3.2-40.3-13.6-54.8-28-29.4-29.5-37.2-77.4-19.1-117.4 13.7-30.3 43.3-53.8 77.6-61.6 11.9-2.7 42.7-2.2 54 .8"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Copper/utils/types.d.ts b/packages/nodes-base/nodes/Copper/utils/types.ts
similarity index 100%
rename from packages/nodes-base/nodes/Copper/utils/types.d.ts
rename to packages/nodes-base/nodes/Copper/utils/types.ts
diff --git a/packages/nodes-base/nodes/Cortex/AnalyzerDescriptions.ts b/packages/nodes-base/nodes/Cortex/AnalyzerDescriptions.ts
index f5c78b1579c3a..449f34a593ec4 100644
--- a/packages/nodes-base/nodes/Cortex/AnalyzerDescriptions.ts
+++ b/packages/nodes-base/nodes/Cortex/AnalyzerDescriptions.ts
@@ -89,7 +89,7 @@ export const analyzerFields: INodeProperties[] = [
 		description: 'Enter the observable value',
 	},
 	{
-		displayName: 'Binary Property',
+		displayName: 'Put Output File in Field',
 		name: 'binaryPropertyName',
 		type: 'string',
 		default: 'data',
@@ -101,7 +101,7 @@ export const analyzerFields: INodeProperties[] = [
 				operation: ['execute'],
 			},
 		},
-		description: 'Name of the binary property to which to write the data of the read file',
+		hint: 'The name of the output binary field to put the file in',
 	},
 	{
 		displayName: 'TLP',
diff --git a/packages/nodes-base/nodes/Cortex/Cortex.node.ts b/packages/nodes-base/nodes/Cortex/Cortex.node.ts
index 809467d354086..73b11a9050628 100644
--- a/packages/nodes-base/nodes/Cortex/Cortex.node.ts
+++ b/packages/nodes-base/nodes/Cortex/Cortex.node.ts
@@ -1,7 +1,4 @@
-import { cortexApiRequest, getEntityLabel, prepareParameters, splitTags } from './GenericFunctions';
-
-import { analyzerFields, analyzersOperations } from './AnalyzerDescriptions';
-
+import { createHash } from 'crypto';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -11,19 +8,18 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 } 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 upperFirst from 'lodash.upperfirst';
-
 import type { IJob } from './AnalyzerInterface';
 
-import { createHash } from 'crypto';
-
-import * as changeCase from 'change-case';
-
 export class Cortex implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Cortex',
diff --git a/packages/nodes-base/nodes/Cortex/GenericFunctions.ts b/packages/nodes-base/nodes/Cortex/GenericFunctions.ts
index c13f5f6109dea..45f4105a10fff 100644
--- a/packages/nodes-base/nodes/Cortex/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Cortex/GenericFunctions.ts
@@ -1,18 +1,17 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
+	IRequestOptions,
 } from 'n8n-workflow';
 
-import moment from 'moment';
+import moment from 'moment-timezone';
 
 export async function cortexApiRequest(
-	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -22,7 +21,7 @@ export async function cortexApiRequest(
 ): Promise<any> {
 	const credentials = await this.getCredentials('cortexApi');
 
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		headers: {},
 		method,
 		qs: query,
@@ -40,7 +39,7 @@ export async function cortexApiRequest(
 		delete options.qs;
 	}
 
-	return this.helpers.requestWithAuthentication.call(this, 'cortexApi', options);
+	return await this.helpers.requestWithAuthentication.call(this, 'cortexApi', options);
 }
 
 export function getEntityLabel(entity: IDataObject): string {
diff --git a/packages/nodes-base/nodes/Cortex/ResponderDescription.ts b/packages/nodes-base/nodes/Cortex/ResponderDescription.ts
index 31fb47e35673f..64966847f3b08 100644
--- a/packages/nodes-base/nodes/Cortex/ResponderDescription.ts
+++ b/packages/nodes-base/nodes/Cortex/ResponderDescription.ts
@@ -233,7 +233,7 @@ export const responderFields: INodeProperties[] = [
 								name: 'artifactValues',
 								values: [
 									{
-										displayName: 'Binary Property',
+										displayName: 'Binary Field',
 										name: 'binaryProperty',
 										type: 'string',
 										displayOptions: {
@@ -490,7 +490,7 @@ export const responderFields: INodeProperties[] = [
 				name: 'values',
 				values: [
 					{
-						displayName: 'Binary Property',
+						displayName: 'Input Binary Field',
 						name: 'binaryPropertyName',
 						type: 'string',
 						default: 'data',
@@ -499,7 +499,7 @@ export const responderFields: INodeProperties[] = [
 								dataType: ['file'],
 							},
 						},
-						description: 'Name of the binary property which contains the attachement data',
+						hint: 'The name of the input binary field containing the attachement data',
 					},
 					{
 						displayName: 'Data',
diff --git a/packages/nodes-base/nodes/Cortex/cortex.svg b/packages/nodes-base/nodes/Cortex/cortex.svg
index 35d1d48c2d72a..f3ee5021b48e6 100644
--- a/packages/nodes-base/nodes/Cortex/cortex.svg
+++ b/packages/nodes-base/nodes/Cortex/cortex.svg
@@ -1 +1 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 300 300"><defs><style>.cls-2{fill:#fff}</style></defs><path d="M290 150A140 140 0 11150 10a140 140 0 01140 140" fill="#54c4c4"/><path class="cls-2" d="M231.17 159.29c0-12.87-6.51-14.17-18-15.36-10.18-1.06-21.71-2.25-26.73-16.65a1.9 1.9 0 01.08-1.46 1.93 1.93 0 013.55.2c4.22 12.09 14 13.1 23.5 14.09 4.68.48 10 1 14.12 3.4a1.4 1.4 0 001.45 0 1.39 1.39 0 00.64-1.3c-2.23-25.82-13.16-38.79-21.94-45.12a35.47 35.47 0 00-12.07-5.8 1.39 1.39 0 00-1.56 2 49.56 49.56 0 014 11c2.18 7.91 4.06 14.74 12.62 16.44a1.93 1.93 0 011.51 2.26 1.93 1.93 0 01-1.88 1.55 1.58 1.58 0 01-.38 0c-10.9-2.16-13.28-10.82-15.59-19.23-1.55-5.61-3-10.91-7-14.2-5.61-4.65-15-7.78-23.37-7.78a29.19 29.19 0 00-4.05.27 18.5 18.5 0 00-9.68 4.07 1.41 1.41 0 00-.47 1 1.38 1.38 0 00.37 1 73.85 73.85 0 0111.13 16.84 1.92 1.92 0 01-.85 2.58 2 2 0 01-2.59-.86c-3.87-7.76-8.11-13.86-12.58-18.12-6.31-6-11.94-7.25-15.56-7.25a14.73 14.73 0 00-2.85.27c-5.1 1-8.5 4.35-9.51 7a1.44 1.44 0 00.12 1.23 32.6 32.6 0 012.62 5.94c2.32 6.38 4.51 12.4 15.48 12.91a1.88 1.88 0 011.33.62 1.91 1.91 0 01.5 1.39 1.89 1.89 0 01-2 1.83c-13.53-.62-16.52-8.84-18.91-15.44a25.62 25.62 0 00-2.62-5.75 1 1 0 00-.14-.16 2 2 0 01-.24-.32 1.84 1.84 0 00-.17-.22 5.88 5.88 0 00-4.76-1.9c-4.69 0-8.26 1.47-10.62 4.4a13.45 13.45 0 00-2.12 3.84 2 2 0 00-.07.26 2.16 2.16 0 01-.15.5.87.87 0 00-.07.17 25.75 25.75 0 00-.3 12.29c1.6 7.48 6.24 16.89 19.27 19.25a22.45 22.45 0 003.92.32 70.9 70.9 0 009.77-1 83.59 83.59 0 0112-1.12 33.73 33.73 0 0117 4.21 1.43 1.43 0 001.16.1 1.41 1.41 0 00.83-.81c2.3-5.79 5.74-9.55 8.51-12.57 5.55-6.06 9.56-10.44 3.79-25.68a1.92 1.92 0 01.05-1.47 1.9 1.9 0 011.07-1 2 2 0 012.34 1.05c6.6 17.45 1.43 23.1-4.56 29.65-3 3.23-6.32 6.89-8.31 12.79a1.4 1.4 0 00.51 1.58c13.47 9.74 20.52 13 27.92 13a25.17 25.17 0 002.83-.16 1.93 1.93 0 011.7 3.12 1.88 1.88 0 01-1.29.7 30.3 30.3 0 01-3.33.19c-8.5 0-16.58-3.82-32-15.17a29.36 29.36 0 00-18.21-5.8 79.71 79.71 0 00-11.55 1.1 73.31 73.31 0 01-10.3 1 25.76 25.76 0 01-4.62-.39c-11.8-2.14-19.74-10-22.36-22.22a33.7 33.7 0 01-.69-6.26 1.41 1.41 0 00-2.36-1c-11 10.25-11.68 20.34-11.09 25.44.93 8.21 5.87 14.26 10.27 16a13 13 0 004.89.84 47.14 47.14 0 006.16-.58 61.45 61.45 0 018.46-.72c8.41 0 16.19 2.86 24.51 9a1.92 1.92 0 01.42 2.68 2 2 0 01-2.69.42c-7.63-5.62-14.69-8.23-22.21-8.23a57.85 57.85 0 00-8 .69 50.8 50.8 0 01-6.68.6 16.82 16.82 0 01-6.29-1.1c-5.42-2.14-10.13-8.22-12-15.48a1.4 1.4 0 00-1.2-1.02 1.38 1.38 0 00-1.41.81c-5.25 11.33-2.3 22.75 3 29a19 19 0 0014.9 7.15 26.43 26.43 0 0013-3.8 1.38 1.38 0 00.67-.88 25.77 25.77 0 012.83-7 2 2 0 012.64-.65 1.93 1.93 0 01.65 2.64c-3.74 6.18-4.8 16.88.58 24.55 4.11 5.85 11 8.82 20.56 8.82.83 0 1.68 0 2.55-.07a1.42 1.42 0 001.2-.82A1.37 1.37 0 00134 192c-4.91-6.44.5-13.39 5.74-20.11s10.6-13.6 8.48-21.23a1.92 1.92 0 011.33-2.36 1.94 1.94 0 012.37 1.33c2.64 9.49-3.9 17.88-9.15 24.62-5.94 7.63-9.1 12.15-4.85 16.4a6.77 6.77 0 005 2.35c2.73 0 5.92-1.69 12-5.46 5.24-3.23 12.41-7.66 21.64-10.41a1.41 1.41 0 00.2-2.61 16.22 16.22 0 01-6-4.52c-2.39-3.06-3-6.84-1.91-11.24a2 2 0 012.33-1.39 1.93 1.93 0 011.4 2.34c-.81 3.19-.4 5.86 1.21 7.93 2 2.64 7.28 6 20.7 6.82 2.23 0 4.41 0 6.69.2a54.18 54.18 0 0019.34-3.53 1.4 1.4 0 00.52-2.23c-1.3-1.45-3.14-2.3-5.59-3.35-3.81-1.61-8.54-3.62-9.18-10.19a1.93 1.93 0 011.73-2.11 1.91 1.91 0 012.1 1.73c.41 4.29 3.25 5.5 6.86 7 2.53 1.08 5.68 2.41 7.72 5.3a1.41 1.41 0 002 .28c2.95-2.4 4.45-5.21 4.45-8.34"/><path class="cls-2" d="M200 177.4c-1.1 0-2.15-.09-3.29-.15-17.52.28-29 7.36-37.35 12.52a65.71 65.71 0 01-8.53 4.69 1.4 1.4 0 00-.22 2.47 37.57 37.57 0 004.61 2.42 19.8 19.8 0 005.63 1.44c5 .74 9 1.33 10.77 15.26a1.4 1.4 0 001.39 1.22h9.87a1.4 1.4 0 001.39-1.6c-1.93-13.8-.17-14.81 3.71-17a28 28 0 004.37-2.93c3.83-3.23 7.8-6.56 9-16.75a1.38 1.38 0 00-.33-1.08 1.39 1.39 0 00-1-.48"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" data-name="Layer 1" viewBox="0 0 300 300"><defs><style>.cls-2{fill:#fff}</style></defs><path fill="#54c4c4" d="M290 150A140 140 0 1 1 150 10a140 140 0 0 1 140 140"/><path d="M231.17 159.29c0-12.87-6.51-14.17-18-15.36-10.18-1.06-21.71-2.25-26.73-16.65a1.9 1.9 0 0 1 .08-1.46 1.93 1.93 0 0 1 3.55.2c4.22 12.09 14 13.1 23.5 14.09 4.68.48 10 1 14.12 3.4a1.4 1.4 0 0 0 1.45 0 1.39 1.39 0 0 0 .64-1.3c-2.23-25.82-13.16-38.79-21.94-45.12a35.5 35.5 0 0 0-12.07-5.8 1.39 1.39 0 0 0-1.56 2 49.6 49.6 0 0 1 4 11c2.18 7.91 4.06 14.74 12.62 16.44a1.93 1.93 0 0 1 1.51 2.26 1.93 1.93 0 0 1-1.88 1.55 1.6 1.6 0 0 1-.38 0c-10.9-2.16-13.28-10.82-15.59-19.23-1.55-5.61-3-10.91-7-14.2-5.61-4.65-15-7.78-23.37-7.78a29 29 0 0 0-4.05.27 18.5 18.5 0 0 0-9.68 4.07 1.4 1.4 0 0 0-.47 1 1.38 1.38 0 0 0 .37 1 73.9 73.9 0 0 1 11.13 16.84 1.92 1.92 0 0 1-.85 2.58 2 2 0 0 1-2.59-.86c-3.87-7.76-8.11-13.86-12.58-18.12-6.31-6-11.94-7.25-15.56-7.25a14.7 14.7 0 0 0-2.85.27c-5.1 1-8.5 4.35-9.51 7a1.44 1.44 0 0 0 .12 1.23 32.6 32.6 0 0 1 2.62 5.94c2.32 6.38 4.51 12.4 15.48 12.91a1.88 1.88 0 0 1 1.33.62 1.9 1.9 0 0 1 .5 1.39 1.89 1.89 0 0 1-2 1.83c-13.53-.62-16.52-8.84-18.91-15.44a25.6 25.6 0 0 0-2.62-5.75 1 1 0 0 0-.14-.16 2 2 0 0 1-.24-.32 2 2 0 0 0-.17-.22 5.88 5.88 0 0 0-4.76-1.9c-4.69 0-8.26 1.47-10.62 4.4a13.5 13.5 0 0 0-2.12 3.84 2 2 0 0 0-.07.26 2.2 2.2 0 0 1-.15.5 1 1 0 0 0-.07.17 25.75 25.75 0 0 0-.3 12.29c1.6 7.48 6.24 16.89 19.27 19.25a22.5 22.5 0 0 0 3.92.32 71 71 0 0 0 9.77-1 83.6 83.6 0 0 1 12-1.12 33.73 33.73 0 0 1 17 4.21 1.43 1.43 0 0 0 1.16.1 1.4 1.4 0 0 0 .83-.81c2.3-5.79 5.74-9.55 8.51-12.57 5.55-6.06 9.56-10.44 3.79-25.68a1.92 1.92 0 0 1 .05-1.47 1.9 1.9 0 0 1 1.07-1 2 2 0 0 1 2.34 1.05c6.6 17.45 1.43 23.1-4.56 29.65-3 3.23-6.32 6.89-8.31 12.79a1.4 1.4 0 0 0 .51 1.58c13.47 9.74 20.52 13 27.92 13a25 25 0 0 0 2.83-.16 1.93 1.93 0 0 1 1.7 3.12 1.88 1.88 0 0 1-1.29.7 30 30 0 0 1-3.33.19c-8.5 0-16.58-3.82-32-15.17a29.36 29.36 0 0 0-18.21-5.8 80 80 0 0 0-11.55 1.1 73 73 0 0 1-10.3 1 26 26 0 0 1-4.62-.39c-11.8-2.14-19.74-10-22.36-22.22a33.7 33.7 0 0 1-.69-6.26 1.41 1.41 0 0 0-2.36-1c-11 10.25-11.68 20.34-11.09 25.44.93 8.21 5.87 14.26 10.27 16a13 13 0 0 0 4.89.84 47 47 0 0 0 6.16-.58 61.5 61.5 0 0 1 8.46-.72c8.41 0 16.19 2.86 24.51 9a1.92 1.92 0 0 1 .42 2.68 2 2 0 0 1-2.69.42c-7.63-5.62-14.69-8.23-22.21-8.23a58 58 0 0 0-8 .69 51 51 0 0 1-6.68.6 16.8 16.8 0 0 1-6.29-1.1c-5.42-2.14-10.13-8.22-12-15.48a1.4 1.4 0 0 0-1.2-1.02 1.38 1.38 0 0 0-1.41.81c-5.25 11.33-2.3 22.75 3 29a19 19 0 0 0 14.9 7.15 26.43 26.43 0 0 0 13-3.8 1.38 1.38 0 0 0 .67-.88 25.8 25.8 0 0 1 2.83-7 2 2 0 0 1 2.64-.65 1.93 1.93 0 0 1 .65 2.64c-3.74 6.18-4.8 16.88.58 24.55 4.11 5.85 11 8.82 20.56 8.82.83 0 1.68 0 2.55-.07a1.42 1.42 0 0 0 1.2-.82A1.37 1.37 0 0 0 134 192c-4.91-6.44.5-13.39 5.74-20.11s10.6-13.6 8.48-21.23a1.92 1.92 0 0 1 1.33-2.36 1.94 1.94 0 0 1 2.37 1.33c2.64 9.49-3.9 17.88-9.15 24.62-5.94 7.63-9.1 12.15-4.85 16.4a6.77 6.77 0 0 0 5 2.35c2.73 0 5.92-1.69 12-5.46 5.24-3.23 12.41-7.66 21.64-10.41a1.41 1.41 0 0 0 .2-2.61 16.2 16.2 0 0 1-6-4.52c-2.39-3.06-3-6.84-1.91-11.24a2 2 0 0 1 2.33-1.39 1.93 1.93 0 0 1 1.4 2.34c-.81 3.19-.4 5.86 1.21 7.93 2 2.64 7.28 6 20.7 6.82 2.23 0 4.41 0 6.69.2a54.2 54.2 0 0 0 19.34-3.53 1.4 1.4 0 0 0 .52-2.23c-1.3-1.45-3.14-2.3-5.59-3.35-3.81-1.61-8.54-3.62-9.18-10.19a1.93 1.93 0 0 1 1.73-2.11 1.91 1.91 0 0 1 2.1 1.73c.41 4.29 3.25 5.5 6.86 7 2.53 1.08 5.68 2.41 7.72 5.3a1.41 1.41 0 0 0 2 .28c2.95-2.4 4.45-5.21 4.45-8.34" class="cls-2"/><path d="M200 177.4c-1.1 0-2.15-.09-3.29-.15-17.52.28-29 7.36-37.35 12.52a66 66 0 0 1-8.53 4.69 1.4 1.4 0 0 0-.22 2.47 37.6 37.6 0 0 0 4.61 2.42 19.8 19.8 0 0 0 5.63 1.44c5 .74 9 1.33 10.77 15.26a1.4 1.4 0 0 0 1.39 1.22h9.87a1.4 1.4 0 0 0 1.39-1.6c-1.93-13.8-.17-14.81 3.71-17a28 28 0 0 0 4.37-2.93c3.83-3.23 7.8-6.56 9-16.75a1.38 1.38 0 0 0-.33-1.08 1.4 1.4 0 0 0-1-.48" class="cls-2"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/CrateDb/CrateDb.node.ts b/packages/nodes-base/nodes/CrateDb/CrateDb.node.ts
index a11ff18670bcd..3676d919ef84c 100644
--- a/packages/nodes-base/nodes/CrateDb/CrateDb.node.ts
+++ b/packages/nodes-base/nodes/CrateDb/CrateDb.node.ts
@@ -6,17 +6,16 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
+import pgPromise from 'pg-promise';
 import {
 	generateReturning,
 	getItemCopy,
 	getItemsCopy,
 	pgInsert,
-	pgQuery,
+	pgQueryV2,
 	pgUpdate,
 } from '../Postgres/v1/genericFunctions';
 
-import pgPromise from 'pg-promise';
-
 export class CrateDb implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'CrateDB',
@@ -73,6 +72,12 @@ export class CrateDb implements INodeType {
 				displayName: 'Query',
 				name: 'query',
 				type: 'string',
+				noDataExpression: true,
+				typeOptions: {
+					editor: 'sqlEditor',
+					rows: 5,
+					sqlDialect: 'PostgreSQL',
+				},
 				displayOptions: {
 					show: {
 						operation: ['executeQuery'],
@@ -279,13 +284,9 @@ export class CrateDb implements INodeType {
 			//         executeQuery
 			// ----------------------------------
 
-			const queryResult = await pgQuery(
-				this.getNodeParameter,
-				pgp,
-				db,
-				items,
-				this.continueOnFail(),
-			);
+			const queryResult = await pgQueryV2.call(this, pgp, db, items, this.continueOnFail(), {
+				resolveExpression: true,
+			});
 
 			returnItems = this.helpers.returnJsonArray(queryResult);
 		} else if (operation === 'insert') {
@@ -372,20 +373,20 @@ export class CrateDb implements INodeType {
 							returning,
 					);
 				}
-				const _updateItems = await db.multi(pgp.helpers.concat(queries));
+				await db.multi(pgp.helpers.concat(queries));
 				returnItems = this.helpers.returnJsonArray(getItemsCopy(items, columns));
 			}
 		} else {
-			pgp.end();
+			await db.$pool.end();
 			throw new NodeOperationError(
 				this.getNode(),
 				`The operation "${operation}" is not supported!`,
 			);
 		}
 
-		// Close the connection
-		pgp.end();
+		// shuts down the connection pool associated with the db object to allow the process to finish
+		await db.$pool.end();
 
-		return this.prepareOutputData(returnItems);
+		return [returnItems];
 	}
 }
diff --git a/packages/nodes-base/nodes/Cron/Cron.node.ts b/packages/nodes-base/nodes/Cron/Cron.node.ts
index e84ad5f69d58b..7430e6c07a556 100644
--- a/packages/nodes-base/nodes/Cron/Cron.node.ts
+++ b/packages/nodes-base/nodes/Cron/Cron.node.ts
@@ -31,7 +31,7 @@ export class Cron implements INodeType {
 		properties: [
 			{
 				displayName:
-					'This workflow will run on the schedule you define here once you <a data-key="activate">activate</a> it.<br><br>For testing, you can also trigger it manually: by going back to the canvas and clicking ‘execute workflow’',
+					'This workflow will run on the schedule you define here once you <a data-key="activate">activate</a> it.<br><br>For testing, you can also trigger it manually: by going back to the canvas and clicking \'test workflow\'',
 				name: 'notice',
 				type: 'notice',
 				default: '',
diff --git a/packages/nodes-base/nodes/CrowdDev/CrowdDev.node.json b/packages/nodes-base/nodes/CrowdDev/CrowdDev.node.json
new file mode 100644
index 0000000000000..1ae517e18eb3f
--- /dev/null
+++ b/packages/nodes-base/nodes/CrowdDev/CrowdDev.node.json
@@ -0,0 +1,18 @@
+{
+	"node": "n8n-nodes-base.crowdDev",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"categories": ["Productivity"],
+	"resources": {
+		"credentialDocumentation": [
+			{
+				"url": "https://docs.n8n.io/credentials/crowddev"
+			}
+		],
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.crowddev/"
+			}
+		]
+	}
+}
diff --git a/packages/nodes-base/nodes/CrowdDev/CrowdDev.node.ts b/packages/nodes-base/nodes/CrowdDev/CrowdDev.node.ts
new file mode 100644
index 0000000000000..76cd06d60a569
--- /dev/null
+++ b/packages/nodes-base/nodes/CrowdDev/CrowdDev.node.ts
@@ -0,0 +1,32 @@
+import type { INodeType, INodeTypeDescription } from 'n8n-workflow';
+import { allProperties } from './descriptions';
+
+export class CrowdDev implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'crowd.dev',
+		name: 'crowdDev',
+		icon: 'file:crowdDev.svg',
+		group: ['transform'],
+		version: 1,
+		subtitle: '={{ $parameter["operation"] + ": " + $parameter["resource"] }}',
+		description:
+			'crowd.dev is an open-source suite of community and data tools built to unlock community-led growth for your organization.',
+		defaults: {
+			name: 'crowd.dev',
+		},
+		inputs: ['main'],
+		outputs: ['main'],
+		credentials: [
+			{
+				name: 'crowdDevApi',
+				required: true,
+			},
+		],
+		requestDefaults: {
+			baseURL: '={{$credentials.url}}/api/tenant/{{$credentials.tenantId}}',
+			json: true,
+			skipSslCertificateValidation: '={{ $credentials.allowUnauthorizedCerts }}',
+		},
+		properties: allProperties,
+	};
+}
diff --git a/packages/nodes-base/nodes/CrowdDev/CrowdDevTrigger.node.json b/packages/nodes-base/nodes/CrowdDev/CrowdDevTrigger.node.json
new file mode 100644
index 0000000000000..99afbd25f1036
--- /dev/null
+++ b/packages/nodes-base/nodes/CrowdDev/CrowdDevTrigger.node.json
@@ -0,0 +1,18 @@
+{
+	"node": "n8n-nodes-base.crowdDevTrigger",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"categories": ["Productivity"],
+	"resources": {
+		"credentialDocumentation": [
+			{
+				"url": "https://docs.n8n.io/credentials/crowddev"
+			}
+		],
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.crowddevtrigger/"
+			}
+		]
+	}
+}
diff --git a/packages/nodes-base/nodes/CrowdDev/CrowdDevTrigger.node.ts b/packages/nodes-base/nodes/CrowdDev/CrowdDevTrigger.node.ts
new file mode 100644
index 0000000000000..cf30224b4e55f
--- /dev/null
+++ b/packages/nodes-base/nodes/CrowdDev/CrowdDevTrigger.node.ts
@@ -0,0 +1,185 @@
+import type {
+	IHookFunctions,
+	IWebhookFunctions,
+	INodeType,
+	INodeTypeDescription,
+	IWebhookResponseData,
+	IHttpRequestOptions,
+} from 'n8n-workflow';
+
+interface ICrowdDevCreds {
+	url: string;
+	tenantId: string;
+	token: string;
+	allowUnauthorizedCerts: boolean;
+}
+
+const credsName = 'crowdDevApi';
+
+const getCreds = async (hookFns: IHookFunctions) =>
+	hookFns.getCredentials(credsName) as unknown as ICrowdDevCreds;
+
+const createRequest = (
+	creds: ICrowdDevCreds,
+	opts: Partial<IHttpRequestOptions>,
+): IHttpRequestOptions => {
+	const defaults: IHttpRequestOptions = {
+		baseURL: `${creds.url}/api/tenant/${creds.tenantId}`,
+		url: '',
+		json: true,
+		skipSslCertificateValidation: creds.allowUnauthorizedCerts,
+	};
+	return Object.assign(defaults, opts);
+};
+
+export class CrowdDevTrigger implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'crowd.dev Trigger',
+		name: 'crowdDevTrigger',
+		icon: 'file:crowdDev.svg',
+		group: ['trigger'],
+		version: 1,
+		description: 'Starts the workflow when crowd.dev events occur.',
+		defaults: {
+			name: 'crowd.dev Trigger',
+		},
+		inputs: [],
+		outputs: ['main'],
+		credentials: [
+			{
+				name: 'crowdDevApi',
+				required: true,
+			},
+		],
+		webhooks: [
+			{
+				name: 'default',
+				httpMethod: 'POST',
+				responseMode: 'onReceived',
+				path: 'webhook',
+			},
+		],
+		properties: [
+			{
+				displayName: 'Trigger',
+				name: 'trigger',
+				description: 'What will trigger an automation',
+				type: 'options',
+				required: true,
+				default: 'new_activity',
+				options: [
+					{
+						name: 'New Activity',
+						value: 'new_activity',
+					},
+					{
+						name: 'New Member',
+						value: 'new_member',
+					},
+				],
+			},
+		],
+	};
+
+	webhookMethods = {
+		default: {
+			async checkExists(this: IHookFunctions): Promise<boolean> {
+				const creds = await getCreds(this);
+				const webhookData = this.getWorkflowStaticData('node');
+				const webhookUrl = this.getNodeWebhookUrl('default') as string;
+
+				if (webhookData.webhookId !== undefined) {
+					try {
+						const options = createRequest(creds, {
+							url: `/automation/${webhookData.webhookId}`,
+							method: 'GET',
+						});
+						const data = await this.helpers.httpRequestWithAuthentication.call(
+							this,
+							credsName,
+							options,
+						);
+						if (data.settings.url === webhookUrl) {
+							return true;
+						}
+					} catch (error) {
+						return false;
+					}
+				}
+
+				// If it did not error then the webhook exists
+				return false;
+			},
+
+			async create(this: IHookFunctions): Promise<boolean> {
+				const creds = await getCreds(this);
+				const webhookData = this.getWorkflowStaticData('node');
+				const webhookUrl = this.getNodeWebhookUrl('default') as string;
+				const params = {
+					trigger: this.getNodeParameter('trigger') as string,
+				};
+
+				const options = createRequest(creds, {
+					url: '/automation',
+					method: 'POST',
+					body: {
+						data: {
+							settings: {
+								url: webhookUrl,
+							},
+							type: 'webhook',
+							trigger: params.trigger,
+						},
+					},
+				});
+
+				const responseData = await this.helpers.httpRequestWithAuthentication.call(
+					this,
+					'crowdDevApi',
+					options,
+				);
+				if (responseData === undefined || 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 creds = await getCreds(this);
+				const webhookData = this.getWorkflowStaticData('node');
+
+				if (webhookData.webhookId !== undefined) {
+					try {
+						const options = createRequest(creds, {
+							url: `/automation/${webhookData.webhookId}`,
+							method: 'DELETE',
+						});
+						await this.helpers.httpRequestWithAuthentication.call(this, credsName, options);
+					} catch (error) {
+						return false;
+					}
+
+					// Remove from the static workflow data so that it is clear
+					// that no webhooks are registered anymore
+					delete webhookData.webhookId;
+					delete webhookData.webhookEvents;
+					delete webhookData.hookSecret;
+				}
+
+				return true;
+			},
+		},
+	};
+
+	async webhook(this: IWebhookFunctions): Promise<IWebhookResponseData> {
+		const bodyData = this.getBodyData();
+
+		return {
+			workflowData: [this.helpers.returnJsonArray(bodyData)],
+		};
+	}
+}
diff --git a/packages/nodes-base/nodes/CrowdDev/GenericFunctions.ts b/packages/nodes-base/nodes/CrowdDev/GenericFunctions.ts
new file mode 100644
index 0000000000000..946f4b68e0c1d
--- /dev/null
+++ b/packages/nodes-base/nodes/CrowdDev/GenericFunctions.ts
@@ -0,0 +1,221 @@
+import type { IExecuteSingleFunctions, IHttpRequestOptions } from 'n8n-workflow';
+
+const addOptName = 'additionalOptions';
+
+const getAllParams = (execFns: IExecuteSingleFunctions): Record<string, unknown> => {
+	const params = execFns.getNode().parameters;
+	const keys = Object.keys(params);
+	const paramsWithValues = keys
+		.filter((i) => i !== addOptName)
+		.map((name) => [name, execFns.getNodeParameter(name)]);
+
+	const paramsWithValuesObj = Object.fromEntries(paramsWithValues);
+
+	if (keys.includes(addOptName)) {
+		const additionalOptions = execFns.getNodeParameter(addOptName);
+		return Object.assign(paramsWithValuesObj, additionalOptions);
+	}
+
+	return paramsWithValuesObj;
+};
+
+const formatParams = (
+	obj: Record<string, unknown>,
+	filters?: { [paramName: string]: (value: any) => boolean },
+	mappers?: { [paramName: string]: (value: any) => any },
+) => {
+	return Object.fromEntries(
+		Object.entries(obj)
+			.filter(([name, value]) => !filters || (name in filters ? filters[name](value) : false))
+			.map(([name, value]) =>
+				!mappers || !(name in mappers) ? [name, value] : [name, mappers[name](value)],
+			),
+	);
+};
+
+const objectFromProps = (src: any, props: string[]) => {
+	const result = props.filter((p) => src.hasOwnProperty(p)).map((p) => [p, src[p]]);
+	return Object.fromEntries(result);
+};
+
+const idFn = (i: any) => i;
+
+const keyValueToObj = (arr: any[]) => {
+	const obj: any = {};
+	arr.forEach((item) => {
+		obj[item.key] = item.value;
+	});
+	return obj;
+};
+
+const transformSingleProp = (prop: string) => (values: any) =>
+	(values.itemChoice || []).map((i: any) => i[prop]);
+
+export async function activityPresend(
+	this: IExecuteSingleFunctions,
+	opts: IHttpRequestOptions,
+): Promise<IHttpRequestOptions> {
+	const params = getAllParams(this);
+	const isCreateWithMember = params.operation === 'createWithMember';
+	const isCreateForMember = params.operation === 'createForMember';
+
+	if (isCreateWithMember) {
+		// Move following props into "member" subproperty
+		const memberProps = ['displayName', 'emails', 'joinedAt', 'username'];
+		params.member = objectFromProps(params, memberProps);
+		memberProps.forEach((p) => delete params[p]);
+	}
+	opts.body = formatParams(
+		params,
+		{
+			member: (v) => (isCreateWithMember || isCreateForMember) && v,
+			type: idFn,
+			timestamp: idFn,
+			platform: idFn,
+			title: idFn,
+			body: idFn,
+			channel: idFn,
+			sourceId: idFn,
+			sourceParentId: idFn,
+		},
+		{
+			member: (v) =>
+				typeof v === 'object'
+					? formatParams(
+							v as Record<string, unknown>,
+							{
+								username: (un) => un.itemChoice,
+								displayName: idFn,
+								emails: idFn,
+								joinedAt: idFn,
+							},
+							{
+								username: (un) => keyValueToObj(un.itemChoice as any[]),
+								emails: transformSingleProp('email'),
+							},
+						)
+					: v,
+		},
+	);
+	return opts;
+}
+
+export async function automationPresend(
+	this: IExecuteSingleFunctions,
+	opts: IHttpRequestOptions,
+): Promise<IHttpRequestOptions> {
+	const params = getAllParams(this);
+	opts.body = {
+		data: {
+			settings: {
+				url: params.url,
+			},
+			type: 'webhook',
+			trigger: params.trigger,
+		},
+	};
+	return opts;
+}
+
+export async function memberPresend(
+	this: IExecuteSingleFunctions,
+	opts: IHttpRequestOptions,
+): Promise<IHttpRequestOptions> {
+	const params = getAllParams(this);
+	opts.body = formatParams(
+		params,
+		{
+			platform: idFn,
+			username: idFn,
+			displayName: idFn,
+			emails: (i) => i.itemChoice,
+			joinedAt: idFn,
+			organizations: (i) => i.itemChoice,
+			tags: (i) => i.itemChoice,
+			tasks: (i) => i.itemChoice,
+			notes: (i) => i.itemChoice,
+			activities: (i) => i.itemChoice,
+		},
+		{
+			emails: transformSingleProp('email'),
+			organizations: (i) =>
+				i.itemChoice.map((org: any) =>
+					formatParams(
+						org as Record<string, unknown>,
+						{
+							name: idFn,
+							url: idFn,
+							description: idFn,
+							logo: idFn,
+							employees: idFn,
+							members: (j) => j.itemChoice,
+						},
+						{
+							members: transformSingleProp('member'),
+						},
+					),
+				),
+			tags: transformSingleProp('tag'),
+			tasks: transformSingleProp('task'),
+			notes: transformSingleProp('note'),
+			activities: transformSingleProp('activity'),
+		},
+	);
+	return opts;
+}
+
+export async function notePresend(
+	this: IExecuteSingleFunctions,
+	opts: IHttpRequestOptions,
+): Promise<IHttpRequestOptions> {
+	const params = getAllParams(this);
+	opts.body = {
+		body: params.body,
+	};
+	return opts;
+}
+
+export async function organizationPresend(
+	this: IExecuteSingleFunctions,
+	opts: IHttpRequestOptions,
+): Promise<IHttpRequestOptions> {
+	const params = getAllParams(this);
+	opts.body = formatParams(
+		params,
+		{
+			name: idFn,
+			url: idFn,
+			description: idFn,
+			logo: idFn,
+			employees: idFn,
+			members: (j) => j.itemChoice,
+		},
+		{
+			members: transformSingleProp('member'),
+		},
+	);
+	return opts;
+}
+
+export async function taskPresend(
+	this: IExecuteSingleFunctions,
+	opts: IHttpRequestOptions,
+): Promise<IHttpRequestOptions> {
+	const params = getAllParams(this);
+	opts.body = formatParams(
+		params,
+		{
+			name: idFn,
+			body: idFn,
+			status: idFn,
+			members: (i) => i.itemChoice,
+			activities: (i) => i.itemChoice,
+			assigneess: idFn,
+		},
+		{
+			members: transformSingleProp('member'),
+			activities: transformSingleProp('activity'),
+		},
+	);
+	return opts;
+}
diff --git a/packages/nodes-base/nodes/CrowdDev/crowdDev.svg b/packages/nodes-base/nodes/CrowdDev/crowdDev.svg
new file mode 100644
index 0000000000000..c131b92df97ac
--- /dev/null
+++ b/packages/nodes-base/nodes/CrowdDev/crowdDev.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="131" height="24" fill="none"><path fill="#E94F2E" d="M57.31 1.043a.28.28 0 0 1 .212.216l.58 2.705a.28.28 0 0 1-.226.337l-5.66 1.026a.282.282 0 0 1-.33-.313l.596-4.767a.282.282 0 0 1 .344-.24z"/><path fill="url(#a)" fill-rule="evenodd" d="M88.975 23.642c1.965 0 3.687-.73 4.737-2.02.176-.216.58-.127.61.151l.126 1.212a.28.28 0 0 0 .28.253h2.943a.28.28 0 0 0 .282-.283V.407a.28.28 0 0 0-.282-.282h-3.194a.28.28 0 0 0-.283.282v8.467c0 .283-.407.415-.607.214-1.046-1.057-2.637-1.663-4.394-1.663-.843 0-1.626.114-2.341.328v4.213c.725-.73 1.732-1.154 2.962-1.154 2.64 0 4.35 1.926 4.35 4.69s-1.71 4.66-4.35 4.66c-1.23 0-2.237-.418-2.962-1.14v4.343a8 8 0 0 0 2.123.277m18.861 0c3.873 0 6.614-1.886 7.383-5.04a.273.273 0 0 0-.269-.335h-2.958a.3.3 0 0 0-.277.2c-.497 1.334-1.832 2.068-3.816 2.068-2.418 0-3.832-1.262-4.187-3.759a.275.275 0 0 1 .274-.311l10.962-.03a.283.283 0 0 0 .282-.282v-.868c0-4.784-2.92-7.86-7.518-7.86-4.504 0-7.642 3.324-7.642 8.14 0 4.753 3.2 8.077 7.766 8.077m-.093-13.11c2.165 0 3.594 1.274 3.719 3.228a.27.27 0 0 1-.273.282h-7.09a.273.273 0 0 1-.271-.326c.446-2.087 1.787-3.184 3.915-3.184m17.07 12.532a.28.28 0 0 1-.26.174h-3.348a.28.28 0 0 1-.263-.178l-5.864-14.782a.282.282 0 0 1 .262-.387h3.428c.117 0 .222.073.264.183l2.602 6.87a81 81 0 0 1 1.03 3.04c.09.289.586.29.677.002.277-.878.663-1.947 1.089-3.043l2.725-6.873a.28.28 0 0 1 .263-.179h3.299c.201 0 .338.205.26.391z" clip-rule="evenodd"/><path fill="#140505" d="M0 15.534c0 4.877 3.044 8.108 7.704 8.108 3.888 0 6.81-2.31 7.407-5.71a.273.273 0 0 0-.273-.317h-3.277c-.13 0-.243.09-.28.215-.463 1.542-1.764 2.394-3.577 2.394-2.423 0-3.914-1.801-3.914-4.69s1.615-4.722 4.039-4.722c1.726 0 2.968.827 3.451 2.427.038.124.15.213.28.213h3.254c.168 0 .3-.146.274-.312-.527-3.516-3.34-5.715-7.415-5.715C3.138 7.425 0 10.781 0 15.533M26.68 8.05a.276.276 0 0 0-.215-.272 6.6 6.6 0 0 0-1.463-.166c-1.59 0-2.824.616-3.603 1.602-.181.23-.638.14-.667-.152l-.086-.884a.28.28 0 0 0-.28-.256H17.33a.28.28 0 0 0-.282.283v14.75c0 .156.126.283.282.283h3.226a.28.28 0 0 0 .282-.283v-7.173c0-2.982 1.709-4.442 4.442-4.442h1.116a.28.28 0 0 0 .282-.283zm.216 7.484c0 4.784 3.448 8.076 8.201 8.076s8.201-3.292 8.201-8.076-3.448-8.078-8.2-8.078c-4.754 0-8.202 3.293-8.202 8.078m3.79 0c0-2.796 1.802-4.691 4.411-4.691 2.61 0 4.411 1.895 4.411 4.69s-1.801 4.691-4.41 4.691-4.412-1.895-4.412-4.69m43.298 8.108c1.964 0 3.686-.73 4.736-2.02.176-.216.581-.127.61.151l.126 1.212a.28.28 0 0 0 .28.253h2.943a.28.28 0 0 0 .282-.283V.407a.28.28 0 0 0-.282-.282h-3.194a.28.28 0 0 0-.282.282v8.467c0 .283-.408.415-.607.214-1.047-1.057-2.638-1.663-4.395-1.663-4.629 0-7.425 3.418-7.425 8.202 0 4.753 2.765 8.015 7.208 8.015m.838-3.48c-2.64 0-4.256-1.926-4.256-4.66s1.616-4.69 4.256-4.69 4.35 1.926 4.35 4.69-1.71 4.66-4.35 4.66"/><path fill="#140505" fill-rule="evenodd" d="M44.468 11.299a.282.282 0 0 0-.218.365l3.685 11.378a.28.28 0 0 0 .269.196h3.285c.123 0 .232-.08.27-.196l2.049-6.39a99 99 0 0 0 .847-2.866c.083-.301.599-.29.673.013.182.75.439 1.686.778 2.79l2.05 6.452a.28.28 0 0 0 .27.197h3.133c.12 0 .228-.076.267-.19l5.117-14.782a.282.282 0 0 0-.267-.375h-3.403a.28.28 0 0 0-.27.199l-1.988 6.387a86 86 0 0 0-.696 2.565c-.076.3-.566.296-.64-.004a68 68 0 0 0-.683-2.56L57.007 8.09a.28.28 0 0 0-.27-.199H53.3a.28.28 0 0 0-.269.197l-2.05 6.39c-.32.98-.55 1.728-.747 2.534-.074.302-.541.302-.609-.002a46 46 0 0 0-.632-2.533l-1.087-3.548a.28.28 0 0 0-.32-.195z" clip-rule="evenodd"/><defs><linearGradient id="a" x1="93.499" x2="84.499" y1="15.013" y2="16.013" gradientUnits="userSpaceOnUse"><stop stop-color="#E94F2E"/><stop offset="1" stop-color="#CA2400"/></linearGradient></defs></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/CrowdDev/descriptions/activityFields.ts b/packages/nodes-base/nodes/CrowdDev/descriptions/activityFields.ts
new file mode 100644
index 0000000000000..f7fe7c2050b7b
--- /dev/null
+++ b/packages/nodes-base/nodes/CrowdDev/descriptions/activityFields.ts
@@ -0,0 +1,186 @@
+import type { INodeProperties } from 'n8n-workflow';
+import { activityPresend } from '../GenericFunctions';
+import { emailsField } from './shared';
+import { getAdditionalOptions, mapWith, showFor } from './utils';
+
+const displayOpts = showFor(['activity']);
+
+const displayFor = {
+	resource: displayOpts(),
+	createWithMember: displayOpts(['createWithMember']),
+	createForMember: displayOpts(['createForMember']),
+};
+
+const activityOperations: INodeProperties = {
+	displayName: 'Operation',
+	name: 'operation',
+	type: 'options',
+	displayOptions: displayFor.resource.displayOptions,
+	noDataExpression: true,
+	default: 'createWithMember',
+	options: [
+		{
+			name: 'Create or Update with a Member',
+			value: 'createWithMember',
+			description: 'Create or update an activity with a member',
+			action: 'Create or update an activity with a member',
+			routing: {
+				send: { preSend: [activityPresend] },
+				request: {
+					method: 'POST',
+					url: '/activity/with-member',
+				},
+			},
+		},
+		{
+			name: 'Create',
+			value: 'createForMember',
+			description: 'Create an activity for a member',
+			action: 'Create an activity for a member',
+			routing: {
+				send: { preSend: [activityPresend] },
+				request: {
+					method: 'POST',
+					url: '/activity',
+				},
+			},
+		},
+	],
+};
+
+const createWithMemberFields: INodeProperties[] = [
+	{
+		displayName: 'Username',
+		name: 'username',
+		type: 'fixedCollection',
+		typeOptions: {
+			multipleValues: true,
+		},
+		required: true,
+		default: {},
+		options: [
+			{
+				displayName: 'Item Choice',
+				name: 'itemChoice',
+				values: [
+					{
+						displayName: 'Platform',
+						description: 'Platform name (e.g twitter, github, etc)',
+						name: 'key',
+						type: 'string',
+						required: true,
+						default: '',
+					},
+					{
+						displayName: 'Username',
+						description: 'Username at the specified Platform',
+						name: 'value',
+						type: 'string',
+						required: true,
+						default: '',
+					},
+				],
+			},
+		],
+	},
+	{
+		displayName: 'displayName',
+		name: 'displayName',
+		description: 'UI friendly name of the member',
+		type: 'string',
+		default: '',
+	},
+	emailsField,
+	{
+		displayName: 'Joined At',
+		name: 'joinedAt',
+		description: 'Date of joining the community',
+		type: 'dateTime',
+		default: '',
+	},
+];
+
+const memberIdField: INodeProperties = {
+	displayName: 'Member',
+	name: 'member',
+	description: 'The ID of the member that performed the activity',
+	type: 'string',
+	required: true,
+	default: '',
+};
+
+const createCommonFields: INodeProperties[] = [
+	{
+		displayName: 'Type',
+		name: 'type',
+		description: 'Type of activity',
+		type: 'string',
+		required: true,
+		default: '',
+	},
+	{
+		displayName: 'Timestamp',
+		name: 'timestamp',
+		description: 'Date and time when the activity took place',
+		type: 'dateTime',
+		required: true,
+		default: '',
+	},
+	{
+		displayName: 'Platform',
+		name: 'platform',
+		description: 'Platform on which the activity took place',
+		type: 'string',
+		required: true,
+		default: '',
+	},
+	{
+		displayName: 'Source ID',
+		name: 'sourceId',
+		description: 'The ID of the activity in the platform (e.g. the ID of the message in Discord)',
+		type: 'string',
+		required: true,
+		default: '',
+	},
+];
+
+const additionalOptions: INodeProperties[] = [
+	{
+		displayName: 'Title',
+		name: 'title',
+		description: 'Title of the activity',
+		type: 'string',
+		default: '',
+	},
+	{
+		displayName: 'Body',
+		name: 'body',
+		description: 'Body of the activity',
+		type: 'string',
+		default: '',
+	},
+	{
+		displayName: 'Channel',
+		name: 'channel',
+		description: 'Channel of the activity',
+		type: 'string',
+		default: '',
+	},
+	{
+		displayName: 'Source Parent ID',
+		name: 'sourceParentId',
+		description:
+			'The ID of the parent activity in the platform (e.g. the ID of the parent message in Discord)',
+		type: 'string',
+		default: '',
+	},
+];
+
+const activityFields: INodeProperties[] = [
+	...createWithMemberFields.map(mapWith(displayFor.createWithMember)),
+	Object.assign({}, memberIdField, displayFor.createForMember),
+	...createCommonFields.map(mapWith(displayFor.resource)),
+	Object.assign({}, getAdditionalOptions(additionalOptions), displayFor.resource),
+];
+
+export { activityOperations, activityFields };
diff --git a/packages/nodes-base/nodes/CrowdDev/descriptions/automationFields.ts b/packages/nodes-base/nodes/CrowdDev/descriptions/automationFields.ts
new file mode 100644
index 0000000000000..3607321a64825
--- /dev/null
+++ b/packages/nodes-base/nodes/CrowdDev/descriptions/automationFields.ts
@@ -0,0 +1,129 @@
+import type { INodeProperties } from 'n8n-workflow';
+import { automationPresend } from '../GenericFunctions';
+import { mapWith, showFor } from './utils';
+
+const displayOpts = showFor(['automation']);
+
+const displayFor = {
+	resource: displayOpts(),
+	createOrUpdate: displayOpts(['create', 'update']),
+	id: displayOpts(['destroy', 'find', 'update']),
+};
+
+const automationOperations: INodeProperties = {
+	displayName: 'Operation',
+	name: 'operation',
+	type: 'options',
+	displayOptions: displayFor.resource.displayOptions,
+	noDataExpression: true,
+	default: 'list',
+	options: [
+		{
+			name: 'Create',
+			value: 'create',
+			description: 'Create a new automation for the tenant',
+			action: 'Create a new automation for the tenant',
+			routing: {
+				send: { preSend: [automationPresend] },
+				request: {
+					method: 'POST',
+					url: '/automation',
+				},
+			},
+		},
+		{
+			name: 'Destroy',
+			value: 'destroy',
+			description: 'Destroy an existing automation for the tenant',
+			action: 'Destroy an existing automation for the tenant',
+			routing: {
+				request: {
+					method: 'DELETE',
+					url: '=/automation/{{$parameter["id"]}}',
+				},
+			},
+		},
+		{
+			name: 'Find',
+			value: 'find',
+			description: 'Get an existing automation data for the tenant',
+			action: 'Get an existing automation data for the tenant',
+			routing: {
+				request: {
+					method: 'GET',
+					url: '=/automation/{{$parameter["id"]}}',
+				},
+			},
+		},
+		{
+			name: 'List',
+			value: 'list',
+			description: 'Get all existing automation data for tenant',
+			action: 'Get all existing automation data for tenant',
+			routing: {
+				request: {
+					method: 'GET',
+					url: '/automation',
+				},
+			},
+		},
+		{
+			name: 'Update',
+			value: 'update',
+			description: 'Updates an existing automation for the tenant',
+			action: 'Updates an existing automation for the tenant',
+			routing: {
+				send: { preSend: [automationPresend] },
+				request: {
+					method: 'PUT',
+					url: '=/automation/{{$parameter["id"]}}',
+				},
+			},
+		},
+	],
+};
+
+const idField: INodeProperties = {
+	displayName: 'ID',
+	name: 'id',
+	description: 'The ID of the automation',
+	type: 'string',
+	required: true,
+	default: '',
+};
+
+const commonFields: INodeProperties[] = [
+	{
+		displayName: 'Trigger',
+		name: 'trigger',
+		description: 'What will trigger an automation',
+		type: 'options',
+		required: true,
+		default: 'new_activity',
+		options: [
+			{
+				name: 'New Activity',
+				value: 'new_activity',
+			},
+			{
+				name: 'New Member',
+				value: 'new_member',
+			},
+		],
+	},
+	{
+		displayName: 'URL',
+		name: 'url',
+		description: 'URL to POST webhook data to',
+		type: 'string',
+		required: true,
+		default: '',
+	},
+];
+
+const automationFields: INodeProperties[] = [
+	Object.assign({}, idField, displayFor.id),
+	...commonFields.map(mapWith(displayFor.createOrUpdate)),
+];
+
+export { automationOperations, automationFields };
diff --git a/packages/nodes-base/nodes/CrowdDev/descriptions/index.ts b/packages/nodes-base/nodes/CrowdDev/descriptions/index.ts
new file mode 100644
index 0000000000000..4bc1496287b30
--- /dev/null
+++ b/packages/nodes-base/nodes/CrowdDev/descriptions/index.ts
@@ -0,0 +1,24 @@
+import type { INodeProperties } from 'n8n-workflow';
+import { resources } from './resources';
+import { activityOperations, activityFields } from './activityFields';
+import { memberFields, memberOperations } from './memberFields';
+import { noteFields, noteOperations } from './noteFields';
+import { organizationFields, organizationOperations } from './organizationFields';
+import { taskFields, taskOperations } from './taskFields';
+import { automationFields, automationOperations } from './automationFields';
+
+export const allProperties: INodeProperties[] = [
+	resources,
+	activityOperations,
+	memberOperations,
+	noteOperations,
+	organizationOperations,
+	taskOperations,
+	automationOperations,
+	...activityFields,
+	...memberFields,
+	...noteFields,
+	...organizationFields,
+	...taskFields,
+	...automationFields,
+];
diff --git a/packages/nodes-base/nodes/CrowdDev/descriptions/memberFields.ts b/packages/nodes-base/nodes/CrowdDev/descriptions/memberFields.ts
new file mode 100644
index 0000000000000..08f4548b690d0
--- /dev/null
+++ b/packages/nodes-base/nodes/CrowdDev/descriptions/memberFields.ts
@@ -0,0 +1,275 @@
+import type { INodeProperties } from 'n8n-workflow';
+import { memberPresend } from '../GenericFunctions';
+import { getAdditionalOptions, getId, mapWith, showFor } from './utils';
+import * as shared from './shared';
+
+const displayOpts = showFor(['member']);
+
+const displayFor = {
+	resource: displayOpts(),
+	createOrUpdate: displayOpts(['createOrUpdate', 'update']),
+	id: displayOpts(['delete', 'find', 'update']),
+};
+
+const memberOperations: INodeProperties = {
+	displayName: 'Operation',
+	name: 'operation',
+	type: 'options',
+	displayOptions: displayFor.resource.displayOptions,
+	noDataExpression: true,
+	default: 'find',
+	options: [
+		{
+			name: 'Create or Update',
+			value: 'createOrUpdate',
+			description: 'Create or update a member',
+			action: 'Create or update a member',
+			routing: {
+				send: { preSend: [memberPresend] },
+				request: {
+					method: 'POST',
+					url: '/member',
+				},
+			},
+		},
+		{
+			name: 'Delete',
+			value: 'delete',
+			description: 'Delete a member',
+			action: 'Delete a member',
+			routing: {
+				request: {
+					method: 'DELETE',
+					url: '=/member',
+				},
+			},
+		},
+		{
+			name: 'Find',
+			value: 'find',
+			description: 'Find a member',
+			action: 'Find a member',
+			routing: {
+				request: {
+					method: 'GET',
+					url: '=/member/{{$parameter["id"]}}',
+				},
+			},
+		},
+		{
+			name: 'Update',
+			value: 'update',
+			description: 'Update a member',
+			action: 'Update a member',
+			routing: {
+				send: { preSend: [memberPresend] },
+				request: {
+					method: 'PUT',
+					url: '=/member/{{$parameter["id"]}}',
+				},
+			},
+		},
+	],
+};
+
+const commonFields: INodeProperties[] = [
+	{
+		displayName: 'Platform',
+		name: 'platform',
+		description: 'Platform for which to check member existence',
+		type: 'string',
+		required: true,
+		default: '',
+	},
+	{
+		displayName: 'Username',
+		name: 'username',
+		description: 'Username of the member in platform',
+		type: 'string',
+		required: true,
+		default: '',
+	},
+];
+
+const additionalOptions: INodeProperties[] = [
+	{
+		displayName: 'Display Name',
+		name: 'displayName',
+		description: 'UI friendly name of the member',
+		type: 'string',
+		default: '',
+	},
+	shared.emailsField,
+	{
+		displayName: 'Joined At',
+		name: 'joinedAt',
+		description: 'Date of joining the community',
+		type: 'dateTime',
+		default: '',
+	},
+	{
+		displayName: 'Organizations',
+		name: 'organizations',
+		description:
+			'Organizations associated with the member. Each element in the array is the name of the organization, or an organization object. If the organization does not exist, it will be created.',
+		type: 'fixedCollection',
+		typeOptions: {
+			multipleValues: true,
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Item Choice',
+				name: 'itemChoice',
+				values: [
+					{
+						displayName: 'Name',
+						name: 'name',
+						description: 'The name of the organization',
+						type: 'string',
+						required: true,
+						default: '',
+					},
+					{
+						displayName: 'Url',
+						name: 'url',
+						description: 'The URL of the organization',
+						type: 'string',
+						default: '',
+					},
+					{
+						displayName: 'Description',
+						name: 'description',
+						description: 'A short description of the organization',
+						type: 'string',
+						typeOptions: {
+							rows: 3,
+						},
+						default: '',
+					},
+					{
+						displayName: 'Logo',
+						name: 'logo',
+						description: 'A URL for logo of the organization',
+						type: 'string',
+						default: '',
+					},
+					{
+						displayName: 'Employees',
+						name: 'employees',
+						description: 'The number of employees of the organization',
+						type: 'number',
+						default: '',
+					},
+				],
+			},
+		],
+	},
+	{
+		displayName: 'Tags',
+		name: 'tags',
+		description: 'Tags associated with the member. Each element in the array is the ID of the tag.',
+		type: 'fixedCollection',
+		typeOptions: {
+			multipleValues: true,
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Item Choice',
+				name: 'itemChoice',
+				values: [
+					{
+						displayName: 'Tag',
+						name: 'tag',
+						type: 'string',
+						default: '',
+					},
+				],
+			},
+		],
+	},
+	{
+		displayName: 'Tasks',
+		name: 'tasks',
+		description:
+			'Tasks associated with the member. Each element in the array is the ID of the task.',
+		type: 'fixedCollection',
+		typeOptions: {
+			multipleValues: true,
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Item Choice',
+				name: 'itemChoice',
+				values: [
+					{
+						displayName: 'Task',
+						name: 'task',
+						type: 'string',
+						default: '',
+					},
+				],
+			},
+		],
+	},
+	{
+		displayName: 'Notes',
+		name: 'notes',
+		description:
+			'Notes associated with the member. Each element in the array is the ID of the note.',
+		type: 'fixedCollection',
+		typeOptions: {
+			multipleValues: true,
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Item Choice',
+				name: 'itemChoice',
+				values: [
+					{
+						displayName: 'Note',
+						name: 'note',
+						type: 'string',
+						default: '',
+					},
+				],
+			},
+		],
+	},
+	{
+		displayName: 'Activities',
+		name: 'activities',
+		description:
+			'Activities associated with the member. Each element in the array is the ID of the activity.',
+		type: 'fixedCollection',
+		typeOptions: {
+			multipleValues: true,
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Item Choice',
+				name: 'itemChoice',
+				values: [
+					{
+						displayName: 'Activity',
+						name: 'activity',
+						type: 'string',
+						default: '',
+					},
+				],
+			},
+		],
+	},
+];
+
+const memberFields: INodeProperties[] = [
+	Object.assign(getId(), { description: 'The ID of the member' }, displayFor.id),
+	...commonFields.map(mapWith(displayFor.createOrUpdate)),
+	Object.assign({}, getAdditionalOptions(additionalOptions), displayFor.createOrUpdate),
+];
+
+export { memberOperations, memberFields };
diff --git a/packages/nodes-base/nodes/CrowdDev/descriptions/noteFields.ts b/packages/nodes-base/nodes/CrowdDev/descriptions/noteFields.ts
new file mode 100644
index 0000000000000..7184d88f0bbbe
--- /dev/null
+++ b/packages/nodes-base/nodes/CrowdDev/descriptions/noteFields.ts
@@ -0,0 +1,92 @@
+import type { INodeProperties } from 'n8n-workflow';
+import { notePresend } from '../GenericFunctions';
+import { getId, mapWith, showFor } from './utils';
+
+const displayOpts = showFor(['note']);
+
+const displayFor = {
+	resource: displayOpts(),
+	createOrUpdate: displayOpts(['create', 'update']),
+	id: displayOpts(['delete', 'find', 'update']),
+};
+
+const noteOperations: INodeProperties = {
+	displayName: 'Operation',
+	name: 'operation',
+	type: 'options',
+	displayOptions: displayFor.resource.displayOptions,
+	noDataExpression: true,
+	default: 'find',
+	options: [
+		{
+			name: 'Create',
+			value: 'create',
+			description: 'Create a note',
+			action: 'Create a note',
+			routing: {
+				send: { preSend: [notePresend] },
+				request: {
+					method: 'POST',
+					url: '/note',
+				},
+			},
+		},
+		{
+			name: 'Delete',
+			value: 'delete',
+			description: 'Delete a note',
+			action: 'Delete a note',
+			routing: {
+				request: {
+					method: 'DELETE',
+					url: '=/note',
+				},
+			},
+		},
+		{
+			name: 'Find',
+			value: 'find',
+			description: 'Find a note',
+			action: 'Find a note',
+			routing: {
+				request: {
+					method: 'GET',
+					url: '=/note/{{$parameter["id"]}}',
+				},
+			},
+		},
+		{
+			name: 'Update',
+			value: 'update',
+			description: 'Update a note',
+			action: 'Update a note',
+			routing: {
+				send: { preSend: [notePresend] },
+				request: {
+					method: 'PUT',
+					url: '=/note/{{$parameter["id"]}}',
+				},
+			},
+		},
+	],
+};
+
+const commonFields: INodeProperties[] = [
+	{
+		displayName: 'Body',
+		name: 'body',
+		description: 'The body of the note',
+		type: 'string',
+		typeOptions: {
+			rows: 4,
+		},
+		default: '',
+	},
+];
+
+const noteFields: INodeProperties[] = [
+	Object.assign(getId(), { description: 'The ID of the note' }, displayFor.id),
+	...commonFields.map(mapWith(displayFor.createOrUpdate)),
+];
+
+export { noteOperations, noteFields };
diff --git a/packages/nodes-base/nodes/CrowdDev/descriptions/organizationFields.ts b/packages/nodes-base/nodes/CrowdDev/descriptions/organizationFields.ts
new file mode 100644
index 0000000000000..283c85193ea61
--- /dev/null
+++ b/packages/nodes-base/nodes/CrowdDev/descriptions/organizationFields.ts
@@ -0,0 +1,150 @@
+import type { INodeProperties } from 'n8n-workflow';
+import { organizationPresend } from '../GenericFunctions';
+import { getAdditionalOptions, getId, mapWith, showFor } from './utils';
+
+const displayOpts = showFor(['organization']);
+
+const displayFor = {
+	resource: displayOpts(),
+	createOrUpdate: displayOpts(['create', 'update']),
+	id: displayOpts(['delete', 'find', 'update']),
+};
+
+const organizationOperations: INodeProperties = {
+	displayName: 'Operation',
+	name: 'operation',
+	type: 'options',
+	displayOptions: displayFor.resource.displayOptions,
+	noDataExpression: true,
+	default: 'find',
+	options: [
+		{
+			name: 'Create',
+			value: 'create',
+			description: 'Create an organization',
+			action: 'Create an organization',
+			routing: {
+				send: { preSend: [organizationPresend] },
+				request: {
+					method: 'POST',
+					url: '/organization',
+				},
+			},
+		},
+		{
+			name: 'Delete',
+			value: 'delete',
+			description: 'Delete an organization',
+			action: 'Delete an organization',
+			routing: {
+				request: {
+					method: 'DELETE',
+					url: '=/organization',
+				},
+			},
+		},
+		{
+			name: 'Find',
+			value: 'find',
+			description: 'Find an organization',
+			action: 'Find an organization',
+			routing: {
+				request: {
+					method: 'GET',
+					url: '=/organization/{{$parameter["id"]}}',
+				},
+			},
+		},
+		{
+			name: 'Update',
+			value: 'update',
+			description: 'Update an organization',
+			action: 'Update an organization',
+			routing: {
+				send: { preSend: [organizationPresend] },
+				request: {
+					method: 'PUT',
+					url: '=/organization/{{$parameter["id"]}}',
+				},
+			},
+		},
+	],
+};
+
+const commonFields: INodeProperties[] = [
+	{
+		displayName: 'Name',
+		name: 'name',
+		description: 'The name of the organization',
+		type: 'string',
+		required: true,
+		default: '',
+	},
+];
+
+const additionalOptions: INodeProperties[] = [
+	{
+		displayName: 'Url',
+		name: 'url',
+		description: 'The URL of the organization',
+		type: 'string',
+		default: '',
+	},
+	{
+		displayName: 'Description',
+		name: 'description',
+		description: 'A short description of the organization',
+		type: 'string',
+		typeOptions: {
+			rows: 3,
+		},
+		default: '',
+	},
+	{
+		displayName: 'Logo',
+		name: 'logo',
+		description: 'A URL for logo of the organization',
+		type: 'string',
+		default: '',
+	},
+	{
+		displayName: 'Employees',
+		name: 'employees',
+		description: 'The number of employees of the organization',
+		type: 'number',
+		default: '',
+	},
+	{
+		displayName: 'Members',
+		name: 'members',
+		description:
+			'Members associated with the organization. Each element in the array is the ID of the member.',
+		type: 'fixedCollection',
+		typeOptions: {
+			multipleValues: true,
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Item Choice',
+				name: 'itemChoice',
+				values: [
+					{
+						displayName: 'Member',
+						name: 'member',
+						type: 'string',
+						default: '',
+					},
+				],
+			},
+		],
+	},
+];
+
+const organizationFields: INodeProperties[] = [
+	Object.assign(getId(), { description: 'The ID of the organization' }, displayFor.id),
+	...commonFields.map(mapWith(displayFor.createOrUpdate)),
+	Object.assign({}, getAdditionalOptions(additionalOptions), displayFor.createOrUpdate),
+];
+
+export { organizationOperations, organizationFields };
diff --git a/packages/nodes-base/nodes/CrowdDev/descriptions/resources.ts b/packages/nodes-base/nodes/CrowdDev/descriptions/resources.ts
new file mode 100644
index 0000000000000..430b13cb5641b
--- /dev/null
+++ b/packages/nodes-base/nodes/CrowdDev/descriptions/resources.ts
@@ -0,0 +1,36 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+export const resources: INodeProperties = {
+	displayName: 'Resource',
+	name: 'resource',
+	type: 'options',
+	noDataExpression: true,
+	default: 'activity',
+	placeholder: 'Resourcee',
+	options: [
+		{
+			name: 'Activity',
+			value: 'activity',
+		},
+		{
+			name: 'Automation',
+			value: 'automation',
+		},
+		{
+			name: 'Member',
+			value: 'member',
+		},
+		{
+			name: 'Note',
+			value: 'note',
+		},
+		{
+			name: 'Organization',
+			value: 'organization',
+		},
+		{
+			name: 'Task',
+			value: 'task',
+		},
+	],
+};
diff --git a/packages/nodes-base/nodes/CrowdDev/descriptions/shared.ts b/packages/nodes-base/nodes/CrowdDev/descriptions/shared.ts
new file mode 100644
index 0000000000000..3e0711000b11a
--- /dev/null
+++ b/packages/nodes-base/nodes/CrowdDev/descriptions/shared.ts
@@ -0,0 +1,27 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+export const emailsField: INodeProperties = {
+	displayName: 'Emails',
+	name: 'emails',
+	description: 'Email addresses of the member',
+	type: 'fixedCollection',
+	typeOptions: {
+		multipleValues: true,
+	},
+	default: {},
+	options: [
+		{
+			displayName: 'Item Choice',
+			name: 'itemChoice',
+			values: [
+				{
+					displayName: 'Email',
+					name: 'email',
+					type: 'string',
+					placeholder: 'name@email.com',
+					default: '',
+				},
+			],
+		},
+	],
+};
diff --git a/packages/nodes-base/nodes/CrowdDev/descriptions/taskFields.ts b/packages/nodes-base/nodes/CrowdDev/descriptions/taskFields.ts
new file mode 100644
index 0000000000000..8a39b0031a93b
--- /dev/null
+++ b/packages/nodes-base/nodes/CrowdDev/descriptions/taskFields.ts
@@ -0,0 +1,163 @@
+import type { INodeProperties } from 'n8n-workflow';
+import { taskPresend } from '../GenericFunctions';
+import { getAdditionalOptions, getId, showFor } from './utils';
+
+const displayOpts = showFor(['task']);
+
+const displayFor = {
+	resource: displayOpts(),
+	createOrUpdate: displayOpts(['create', 'update']),
+	id: displayOpts(['delete', 'find', 'update']),
+};
+
+const taskOperations: INodeProperties = {
+	displayName: 'Operation',
+	name: 'operation',
+	type: 'options',
+	displayOptions: displayFor.resource.displayOptions,
+	noDataExpression: true,
+	default: 'find',
+	options: [
+		{
+			name: 'Create',
+			value: 'create',
+			description: 'Create a task',
+			action: 'Create a task',
+			routing: {
+				send: { preSend: [taskPresend] },
+				request: {
+					method: 'POST',
+					url: '/task',
+				},
+			},
+		},
+		{
+			name: 'Delete',
+			value: 'delete',
+			description: 'Delete a task',
+			action: 'Delete a task',
+			routing: {
+				request: {
+					method: 'DELETE',
+					url: '=/task',
+				},
+			},
+		},
+		{
+			name: 'Find',
+			value: 'find',
+			description: 'Find a task',
+			action: 'Find a task',
+			routing: {
+				request: {
+					method: 'GET',
+					url: '=/task/{{$parameter["id"]}}',
+				},
+			},
+		},
+		{
+			name: 'Update',
+			value: 'update',
+			description: 'Update a task',
+			action: 'Update a task',
+			routing: {
+				send: { preSend: [taskPresend] },
+				request: {
+					method: 'PUT',
+					url: '=/task/{{$parameter["id"]}}',
+				},
+			},
+		},
+	],
+};
+
+const additionalOptions: INodeProperties[] = [
+	{
+		displayName: 'Name',
+		name: 'name',
+		description: 'The name of the task',
+		type: 'string',
+		default: '',
+	},
+	{
+		displayName: 'Body',
+		name: 'body',
+		description: 'The body of the task',
+		type: 'string',
+		typeOptions: {
+			rows: 4,
+		},
+		default: '',
+	},
+	{
+		displayName: 'Status',
+		name: 'status',
+		description: 'The status of the task',
+		type: 'string',
+		default: '',
+	},
+	{
+		displayName: 'Members',
+		name: 'members',
+		description:
+			'Members associated with the task. Each element in the array is the ID of the member.',
+		type: 'fixedCollection',
+		typeOptions: {
+			multipleValues: true,
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Item Choice',
+				name: 'itemChoice',
+				values: [
+					{
+						displayName: 'Member',
+						name: 'member',
+						type: 'string',
+						default: '',
+					},
+				],
+			},
+		],
+	},
+	{
+		displayName: 'Activities',
+		name: 'activities',
+		description:
+			'Activities associated with the task. Each element in the array is the ID of the activity.',
+		type: 'fixedCollection',
+		typeOptions: {
+			multipleValues: true,
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Item Choice',
+				name: 'itemChoice',
+				values: [
+					{
+						displayName: 'Activity',
+						name: 'activity',
+						type: 'string',
+						default: '',
+					},
+				],
+			},
+		],
+	},
+	{
+		displayName: 'Assigneess',
+		name: 'assigneess',
+		description: 'Users assigned with the task. Each element in the array is the ID of the user.',
+		type: 'string',
+		default: '',
+	},
+];
+
+const taskFields: INodeProperties[] = [
+	Object.assign(getId(), { description: 'The ID of the task' }, displayFor.id),
+	Object.assign({}, getAdditionalOptions(additionalOptions), displayFor.createOrUpdate),
+];
+
+export { taskOperations, taskFields };
diff --git a/packages/nodes-base/nodes/CrowdDev/descriptions/utils.ts b/packages/nodes-base/nodes/CrowdDev/descriptions/utils.ts
new file mode 100644
index 0000000000000..4feee2c1e7b90
--- /dev/null
+++ b/packages/nodes-base/nodes/CrowdDev/descriptions/utils.ts
@@ -0,0 +1,57 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+export const showFor =
+	(resources: string[]) =>
+	(operations?: string[]): Partial<INodeProperties> => {
+		return operations !== undefined
+			? {
+					displayOptions: {
+						show: {
+							resource: resources,
+							operation: operations,
+						},
+					},
+				}
+			: {
+					displayOptions: {
+						show: {
+							resource: resources,
+						},
+					},
+				};
+	};
+
+export const mapWith =
+	<T>(...objects: Array<Partial<T>>) =>
+	(item: Partial<T>) =>
+		Object.assign({}, item, ...objects);
+
+export const getId = (): INodeProperties => ({
+	displayName: 'ID',
+	name: 'id',
+	type: 'string',
+	required: true,
+	default: '',
+	routing: {
+		send: {
+			type: 'query',
+			property: 'ids[]',
+		},
+	},
+});
+
+export const getAdditionalOptions = (fields: INodeProperties[]): INodeProperties => {
+	return {
+		displayName: 'Additional Options',
+		name: 'additionalOptions',
+		type: 'collection',
+		displayOptions: {
+			show: {
+				operation: ['getAll'],
+			},
+		},
+		default: {},
+		placeholder: 'Add Option',
+		options: fields,
+	};
+};
diff --git a/packages/nodes-base/nodes/Crypto/Crypto.node.json b/packages/nodes-base/nodes/Crypto/Crypto.node.json
index 16a9b7ea5dd02..30e1febb0862f 100644
--- a/packages/nodes-base/nodes/Crypto/Crypto.node.json
+++ b/packages/nodes-base/nodes/Crypto/Crypto.node.json
@@ -20,6 +20,6 @@
 	},
 	"alias": ["Encrypt", "SHA", "Hash"],
 	"subcategories": {
-		"Core Nodes": ["Helpers"]
+		"Core Nodes": ["Data Transformation"]
 	}
 }
diff --git a/packages/nodes-base/nodes/Crypto/Crypto.node.ts b/packages/nodes-base/nodes/Crypto/Crypto.node.ts
index 3da4c6b72bdf2..fc6416349c5a9 100644
--- a/packages/nodes-base/nodes/Crypto/Crypto.node.ts
+++ b/packages/nodes-base/nodes/Crypto/Crypto.node.ts
@@ -1,20 +1,29 @@
-import set from 'lodash.set';
-
+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,
-	ILoadOptionsFunctions,
 	INodeExecutionData,
-	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
 	JsonObject,
 } from 'n8n-workflow';
-import { deepCopy } from 'n8n-workflow';
+import { deepCopy, BINARY_ENCODING } from 'n8n-workflow';
 
-import type { BinaryToTextEncoding } from 'crypto';
-import { createHash, createHmac, createSign, getHashes, randomBytes } from 'crypto';
+const unsupportedAlgorithms = [
+	'RSA-MD4',
+	'RSA-MDC2',
+	'md4',
+	'md4WithRSAEncryption',
+	'mdc2',
+	'mdc2WithRSA',
+];
 
-import { v4 as uuid } from 'uuid';
+const supportedAlgorithms = getHashes()
+	.filter((algorithm) => !unsupportedAlgorithms.includes(algorithm))
+	.map((algorithm) => ({ name: algorithm, value: algorithm }));
 
 export class Crypto implements INodeType {
 	description: INodeTypeDescription = {
@@ -45,15 +54,15 @@ export class Crypto implements INodeType {
 					},
 					{
 						name: 'Hash',
-						description: 'Hash a text in a specified format',
+						description: 'Hash a text or file in a specified format',
 						value: 'hash',
-						action: 'Hash a text in a specified format',
+						action: 'Hash a text or file in a specified format',
 					},
 					{
 						name: 'Hmac',
-						description: 'Hmac a text in a specified format',
+						description: 'Hmac a text or file in a specified format',
 						value: 'hmac',
-						action: 'HMAC a text in a specified format',
+						action: 'HMAC a text or file in a specified format',
 					},
 					{
 						name: 'Sign',
@@ -107,12 +116,40 @@ export class Crypto implements INodeType {
 				description: 'The hash type to use',
 				required: true,
 			},
+			{
+				displayName: 'Binary File',
+				name: 'binaryData',
+				type: 'boolean',
+				default: false,
+				required: true,
+				displayOptions: {
+					show: {
+						action: ['hash', 'hmac'],
+					},
+				},
+				description: 'Whether the data to hashed should be taken from binary field',
+			},
+			{
+				displayName: 'Binary Property Name',
+				name: 'binaryPropertyName',
+				displayOptions: {
+					show: {
+						action: ['hash', 'hmac'],
+						binaryData: [true],
+					},
+				},
+				type: 'string',
+				default: 'data',
+				description: 'Name of the binary property which contains the input data',
+				required: true,
+			},
 			{
 				displayName: 'Value',
 				name: 'value',
 				displayOptions: {
 					show: {
 						action: ['hash'],
+						binaryData: [false],
 					},
 				},
 				type: 'string',
@@ -204,6 +241,7 @@ export class Crypto implements INodeType {
 				displayOptions: {
 					show: {
 						action: ['hmac'],
+						binaryData: [false],
 					},
 				},
 				type: 'string',
@@ -233,6 +271,7 @@ export class Crypto implements INodeType {
 					},
 				},
 				type: 'string',
+				typeOptions: { password: true },
 				default: '',
 				required: true,
 			},
@@ -295,9 +334,7 @@ export class Crypto implements INodeType {
 				type: 'options',
 				description:
 					'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
-				typeOptions: {
-					loadOptionsMethod: 'getHashes',
-				},
+				options: supportedAlgorithms,
 				default: '',
 				required: true,
 			},
@@ -396,26 +433,6 @@ export class Crypto implements INodeType {
 		],
 	};
 
-	methods = {
-		loadOptions: {
-			// Get all the hashes to display them to user so that they can
-			// select them easily
-			async getHashes(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const hashes = getHashes();
-				for (const hash of hashes) {
-					const hashName = hash;
-					const hashId = hash;
-					returnData.push({
-						name: hashName,
-						value: hashId,
-					});
-				}
-				return returnData;
-			},
-		},
-	};
-
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const items = this.getInputData();
 
@@ -430,6 +447,7 @@ export class Crypto implements INodeType {
 				const dataPropertyName = this.getNodeParameter('dataPropertyName', i);
 				const value = this.getNodeParameter('value', i, '') as string;
 				let newValue;
+				let binaryProcessed = false;
 
 				if (action === 'generate') {
 					const encodingType = this.getNodeParameter('encodingType', i);
@@ -449,17 +467,33 @@ export class Crypto implements INodeType {
 						}
 					}
 				}
-				if (action === 'hash') {
-					const type = this.getNodeParameter('type', i) as string;
-					const encoding = this.getNodeParameter('encoding', i) as BinaryToTextEncoding;
-					newValue = createHash(type).update(value).digest(encoding);
-				}
-				if (action === 'hmac') {
+
+				if (action === 'hash' || action === 'hmac') {
 					const type = this.getNodeParameter('type', i) as string;
-					const secret = this.getNodeParameter('secret', i) as string;
 					const encoding = this.getNodeParameter('encoding', i) as BinaryToTextEncoding;
-					newValue = createHmac(type, secret).update(value).digest(encoding);
+					const hashOrHmac =
+						action === 'hash'
+							? createHash(type)
+							: createHmac(type, this.getNodeParameter('secret', i) as string);
+					if (this.getNodeParameter('binaryData', i)) {
+						const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i);
+						const binaryData = this.helpers.assertBinaryData(i, binaryPropertyName);
+						if (binaryData.id) {
+							const binaryStream = await this.helpers.getBinaryStream(binaryData.id);
+							hashOrHmac.setEncoding(encoding);
+							await pipeline(binaryStream, hashOrHmac);
+							newValue = hashOrHmac.read();
+						} else {
+							newValue = hashOrHmac
+								.update(Buffer.from(binaryData.data, BINARY_ENCODING))
+								.digest(encoding);
+						}
+						binaryProcessed = true;
+					} else {
+						newValue = hashOrHmac.update(value).digest(encoding);
+					}
 				}
+
 				if (action === 'sign') {
 					const algorithm = this.getNodeParameter('algorithm', i) as string;
 					const encoding = this.getNodeParameter('encoding', i) as BinaryToTextEncoding;
@@ -489,11 +523,11 @@ export class Crypto implements INodeType {
 					};
 				}
 
-				if (item.binary !== undefined) {
+				if (item.binary !== undefined && !binaryProcessed) {
 					newItem.binary = item.binary;
 				}
 
-				set(newItem, `json.${dataPropertyName}`, newValue);
+				set(newItem, ['json', dataPropertyName], newValue);
 
 				returnData.push(newItem);
 			} catch (error) {
@@ -511,6 +545,6 @@ export class Crypto implements INodeType {
 				throw error;
 			}
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Crypto/test/Crypto.test.ts b/packages/nodes-base/nodes/Crypto/test/Crypto.test.ts
index c0eff05306df5..b321d4e852b67 100644
--- a/packages/nodes-base/nodes/Crypto/test/Crypto.test.ts
+++ b/packages/nodes-base/nodes/Crypto/test/Crypto.test.ts
@@ -1,5 +1,20 @@
-import { testWorkflows, getWorkflowFilenames } from '../../../test/nodes/Helpers';
+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);
 
-describe('Test Crypto Node', () => testWorkflows(workflows));
+describe('Test Crypto Node', () => {
+	jest.mock('fast-glob', () => async () => ['/test/binary.data']);
+	jest.mock('fs/promises');
+	fsPromises.access = async () => {};
+	jest.mock('fs');
+	fs.createReadStream = () => Readable.from(Buffer.from('test')) as fs.ReadStream;
+
+	beforeEach(async () => {
+		await initBinaryDataService();
+	});
+
+	testWorkflows(workflows);
+});
diff --git a/packages/nodes-base/nodes/Crypto/test/CryptoTest.workflow.json b/packages/nodes-base/nodes/Crypto/test/CryptoTest.workflow.json
index 3b044757ab2fa..d3d063a822d67 100644
--- a/packages/nodes-base/nodes/Crypto/test/CryptoTest.workflow.json
+++ b/packages/nodes-base/nodes/Crypto/test/CryptoTest.workflow.json
@@ -1,5 +1,5 @@
 {
-	"name": "review node unit tests",
+	"name": "Crypto Test",
 	"nodes": [
 		{
 			"parameters": {},
@@ -7,58 +7,46 @@
 			"name": "When clicking \"Execute Workflow\"",
 			"type": "n8n-nodes-base.manualTrigger",
 			"typeVersion": 1,
-			"position": [
-				-2640,
-				4140
-			]
+			"position": [-480, 460]
 		},
 		{
 			"parameters": {
-				"value": "=test"
+				"value": "test"
 			},
 			"id": "90831322-8a73-40ac-ae52-84a6504d3d95",
 			"name": "Crypto Hash into Hex",
 			"type": "n8n-nodes-base.crypto",
 			"typeVersion": 1,
-			"position": [
-				-2120,
-				4140
-			]
+			"position": [360, 660]
 		},
 		{
 			"parameters": {
-				"value": "=test"
+				"value": "test"
 			},
 			"id": "9836f128-6798-498e-8752-ba447218ce21",
 			"name": "Crypto Hash into MD5",
 			"type": "n8n-nodes-base.crypto",
 			"typeVersion": 1,
-			"position": [
-				-2120,
-				3980
-			]
+			"position": [360, 500]
 		},
 		{
 			"parameters": {
 				"action": "sign",
-				"value": "=test",
-				"algorithm": "RSA-MD4",
+				"value": "test",
+				"algorithm": "RSA-MD5",
 				"encoding": "base64",
 				"privateKey": "-----BEGIN RSA PRIVATE KEY-----\nMIIBOgIBAAJBAKj34GkxFhD90vcNLYLInFEX6Ppy1tPf9Cnzj4p4WGeKLs1Pt8Qu\nKUpRKfFLfRYC9AIKjbJTWit+CqvjWYzvQwECAwEAAQJAIJLixBy2qpFoS4DSmoEm\no3qGy0t6z09AIJtH+5OeRV1be+N4cDYJKffGzDa88vQENZiRm0GRq6a+HPGQMd2k\nTQIhAKMSvzIBnni7ot/OSie2TmJLY4SwTQAevXysE2RbFDYdAiEBCUEaRQnMnbp7\n9mxDXDf6AU0cN/RPBjb9qSHDcWZHGzUCIG2Es59z8ugGrDY+pxLQnwfotadxd+Uy\nv/Ow5T0q5gIJAiEAyS4RaI9YG8EWx/2w0T67ZUVAw8eOMB6BIUg0Xcu+3okCIBOs\n/5OiPgoTdSy7bcF9IGpSE8ZgGKzgYQVZeN97YE00\n-----END RSA PRIVATE KEY-----"
 			},
 			"id": "4ec3781a-433d-4b68-bc94-3fbe6ed55a0e",
-			"name": "Crypto Sign data with RSA-MDA4",
+			"name": "Crypto Sign data with RSA-MD5",
 			"type": "n8n-nodes-base.crypto",
 			"typeVersion": 1,
-			"position": [
-				-2120,
-				3800
-			]
+			"position": [80, 860]
 		},
 		{
 			"parameters": {
 				"action": "hmac",
-				"value": "=test",
+				"value": "test",
 				"secret": "-----BEGIN RSA PRIVATE KEY-----|MIIBOgIBAAJBAKj34GkxFhD90vcNLYLInFEX6Ppy1tPf9Cnzj4p4WGeKLs1Pt8QuKUpRKfFLfRYC9AIKjbJTWit+CqvjWYzvQwECAwEAAQJAIJLixBy2qpFoS4DSmoEmo3qGy0t6z09AIJtH+5OeRV1be+N4cDYJKffGzDa88vQENZiRm0GRq6a+HPGQMd2kTQIhAKMSvzIBnni7ot/OSie2TmJLY4SwTQAevXysE2RbFDYdAiEBCUEaRQnMnbp79mxDXDf6AU0cN/RPBjb9qSHDcWZHGzUCIG2Es59z8ugGrDY+pxLQnwfotadxd+Uyv/Ow5T0q5gIJAiEAyS4RaI9YG8EWx/2w0T67ZUVAw8eOMB6BIUg0Xcu+3okCIBOs/5OiPgoTdSy7bcF9IGpSE8ZgGKzgYQVZeN97YE00-----END RSA PRIVATE KEY-----",
 				"encoding": "base64"
 			},
@@ -66,10 +54,7 @@
 			"name": "Crypto Hmac data with MD5",
 			"type": "n8n-nodes-base.crypto",
 			"typeVersion": 1,
-			"position": [
-				-2120,
-				3620
-			]
+			"position": [360, 320]
 		},
 		{
 			"parameters": {
@@ -79,10 +64,7 @@
 			"name": "Crypto Generate UUID",
 			"type": "n8n-nodes-base.crypto",
 			"typeVersion": 1,
-			"position": [
-				-2120,
-				4320
-			]
+			"position": [-160, 1060]
 		},
 		{
 			"parameters": {
@@ -100,10 +82,7 @@
 			"name": "IF",
 			"type": "n8n-nodes-base.if",
 			"typeVersion": 1,
-			"position": [
-				-1900,
-				4320
-			]
+			"position": [80, 1060]
 		},
 		{
 			"parameters": {},
@@ -111,10 +90,7 @@
 			"name": "No Operation, do nothing",
 			"type": "n8n-nodes-base.noOp",
 			"typeVersion": 1,
-			"position": [
-				-1680,
-				4300
-			]
+			"position": [420, 1040]
 		},
 		{
 			"parameters": {
@@ -124,17 +100,47 @@
 			"name": "Stop and Error",
 			"type": "n8n-nodes-base.stopAndError",
 			"typeVersion": 1,
-			"position": [
-				-1680,
-				4500
-			]
+			"position": [260, 1180]
+		},
+		{
+			"parameters": {
+				"fileSelector": "/test/binary.data"
+			},
+			"id": "09bbc611-c2ca-4750-94a7-d1bb4fc53a57",
+			"name": "Read Binary Files",
+			"type": "n8n-nodes-base.readBinaryFiles",
+			"typeVersion": 1,
+			"position": [-160, 40]
+		},
+		{
+			"parameters": {
+				"binaryData": true
+			},
+			"id": "9f23080a-402d-4a82-821c-b74388cc9a26",
+			"name": "Crypto Hash Binary Data",
+			"type": "n8n-nodes-base.crypto",
+			"typeVersion": 1,
+			"position": [200, -80]
+		},
+		{
+			"parameters": {
+				"action": "hmac",
+				"binaryData": true,
+				"secret": "-----BEGIN RSA PRIVATE KEY-----|MIIBOgIBAAJBAKj34GkxFhD90vcNLYLInFEX6Ppy1tPf9Cnzj4p4WGeKLs1Pt8QuKUpRKfFLfRYC9AIKjbJTWit+CqvjWYzvQwECAwEAAQJAIJLixBy2qpFoS4DSmoEmo3qGy0t6z09AIJtH+5OeRV1be+N4cDYJKffGzDa88vQENZiRm0GRq6a+HPGQMd2kTQIhAKMSvzIBnni7ot/OSie2TmJLY4SwTQAevXysE2RbFDYdAiEBCUEaRQnMnbp79mxDXDf6AU0cN/RPBjb9qSHDcWZHGzUCIG2Es59z8ugGrDY+pxLQnwfotadxd+Uyv/Ow5T0q5gIJAiEAyS4RaI9YG8EWx/2w0T67ZUVAw8eOMB6BIUg0Xcu+3okCIBOs/5OiPgoTdSy7bcF9IGpSE8ZgGKzgYQVZeN97YE00-----END RSA PRIVATE KEY-----",
+				"encoding": "base64"
+			},
+			"id": "43d5ffa2-9c95-4287-b582-b912071a05c1",
+			"name": "Crypto Hmac Binary Data",
+			"type": "n8n-nodes-base.crypto",
+			"typeVersion": 1,
+			"position": [200, 100]
 		}
 	],
 	"pinData": {
-		"Crypto Sign data with RSA-MDA4": [
+		"Crypto Sign data with RSA-MD5": [
 			{
 				"json": {
-					"data": "SmzCKZlC8g0EnB8cXbRJIdwsN8sDWIxtUEeMvwEJNfrrJynahyNkdIbdcTO/ciwH7aBFN+roa47J8QEYWDc6Dg=="
+					"data": "MVr+iZiOFtHVwO0iKC+CF+QlrZZKcGk7zBvUrWHC1fHBeS6IoWa8B/wrMvazV5H1YR8tbK8baZHD/vUNdfvjiA=="
 				}
 			}
 		],
@@ -158,6 +164,20 @@
 					"data": "BBXLTeT2o/R6oy5H69Yh7w=="
 				}
 			}
+		],
+		"Crypto Hash Binary Data": [
+			{
+				"json": {
+					"data": "098f6bcd4621d373cade4e832627b4f6"
+				}
+			}
+		],
+		"Crypto Hmac Binary Data": [
+			{
+				"json": {
+					"data": "BBXLTeT2o/R6oy5H69Yh7w=="
+				}
+			}
 		]
 	},
 	"connections": {
@@ -175,7 +195,7 @@
 						"index": 0
 					},
 					{
-						"node": "Crypto Sign data with RSA-MDA4",
+						"node": "Crypto Sign data with RSA-MD5",
 						"type": "main",
 						"index": 0
 					},
@@ -188,6 +208,11 @@
 						"node": "Crypto Generate UUID",
 						"type": "main",
 						"index": 0
+					},
+					{
+						"node": "Read Binary Files",
+						"type": "main",
+						"index": 0
 					}
 				]
 			]
@@ -225,6 +250,22 @@
 			"main": [
 				[]
 			]
+		},
+		"Read Binary Files": {
+			"main": [
+				[
+					{
+						"node": "Crypto Hash Binary Data",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Crypto Hmac Binary Data",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
 		}
 	},
 	"active": false,
diff --git a/packages/nodes-base/nodes/CustomerIo/GenericFunctions.ts b/packages/nodes-base/nodes/CustomerIo/GenericFunctions.ts
index 5b7292edb6d24..dd6e356d954e0 100644
--- a/packages/nodes-base/nodes/CustomerIo/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/CustomerIo/GenericFunctions.ts
@@ -7,11 +7,11 @@ import type {
 	IHttpRequestOptions,
 } from 'n8n-workflow';
 
-import get from 'lodash.get';
+import get from 'lodash/get';
 
 export async function customerIoApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: object,
 	baseApi?: string,
@@ -22,7 +22,7 @@ export async function customerIoApiRequest(
 		headers: {
 			'Content-Type': 'application/json',
 		},
-		method: method as IHttpRequestMethods,
+		method,
 		body,
 		url: '',
 		json: true,
@@ -32,19 +32,23 @@ export async function customerIoApiRequest(
 		const region = credentials.region;
 		options.url = `https://${region}/api/v1${endpoint}`;
 	} else if (baseApi === 'api') {
-		options.url = `https://api.customer.io/v1/api${endpoint}`;
+		const region = credentials.region;
+		// Special handling for EU region
+		if (region === 'track-eu.customer.io') {
+			options.url = `https://api-eu.customer.io/v1/api${endpoint}`;
+		} else {
+			options.url = `https://api.customer.io/v1/api${endpoint}`;
+		}
 	} else if (baseApi === 'beta') {
 		options.url = `https://beta-api.customer.io/v1/api${endpoint}`;
 	}
 
-	return this.helpers.requestWithAuthentication.call(this, 'customerIoApi', options);
+	return await this.helpers.requestWithAuthentication.call(this, 'customerIoApi', options);
 }
 
 export function eventExists(currentEvents: string[], webhookEvents: IDataObject) {
 	for (const currentEvent of currentEvents) {
-		if (
-			get(webhookEvents, `${currentEvent.split('.')[0]}.${currentEvent.split('.')[1]}`) !== true
-		) {
+		if (get(webhookEvents, [currentEvent.split('.')[0], currentEvent.split('.')[1]]) !== true) {
 			return false;
 		}
 	}
diff --git a/packages/nodes-base/nodes/CustomerIo/customerio.svg b/packages/nodes-base/nodes/CustomerIo/customerio.svg
index 396806209e450..6230b5741ac9d 100644
--- a/packages/nodes-base/nodes/CustomerIo/customerio.svg
+++ b/packages/nodes-base/nodes/CustomerIo/customerio.svg
@@ -1 +1 @@
-<svg width="256" height="180" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid"><path d="M127.843 102.423a51.21 51.21 0 10-51.21-51.186 51.186 51.186 0 0051.21 51.186z" fill="#FFCD00"/><path d="M128.161 128.016h-.171c-35.127-.009-65.777-23.834-74.453-57.872-2.571-10.238-10.898-18.907-21.454-18.907H0c0 70.686 57.303 127.99 127.99 127.99h.171v-51.211z" fill="#00ECBB"/><path d="M127.843 128.016h.147c35.13 0 65.785-23.829 74.452-57.872 2.597-10.238 10.923-18.907 21.48-18.907h32.082c-.013 70.69-57.323 127.99-128.014 127.99h-.147v-51.211z" fill="#AF64FF"/><path d="M218.509 141.73a127.99 127.99 0 01-181.013 0l36.197-36.197c30 29.98 78.618 29.98 108.618 0l36.198 36.198z" fill="#7131FF"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 104.5 104.5"><g id="Components"><g id="_4f9f4310-b469-4610-a42b-081d434ae1d6_1"><polygon points="78.3999 0 52.2 0 52.2 26.1001 78.3999 52.1997 52.2 78.3999 52.2 104.5 78.3999 104.5 104.5 78.3999 104.5 26.1001 78.3999 0" style="fill:#0b353b; stroke-width:0px;"/><polygon points="39.2 13 26.1001 0 0 0 0 26.1001 13 39.1997 26.1001 52.1997 52.2 26.1001 39.2 13" style="fill:#0b353b; stroke-width:0px;"/><polygon points="13 65.2998 0 78.3999 0 104.5 26.1001 104.5 39.2 91.3999 52.2 78.3999 26.1001 52.1997 13 65.2998" style="fill:#0b353b; stroke-width:0px;"/></g></g></svg>
diff --git a/packages/nodes-base/nodes/DateTime/DateTime.node.json b/packages/nodes-base/nodes/DateTime/DateTime.node.json
index f1d41f281bf5f..8c325f0007af1 100644
--- a/packages/nodes-base/nodes/DateTime/DateTime.node.json
+++ b/packages/nodes-base/nodes/DateTime/DateTime.node.json
@@ -23,6 +23,6 @@
 		]
 	},
 	"subcategories": {
-		"Core Nodes": ["Helpers", "Data Transformation"]
+		"Core Nodes": ["Data Transformation"]
 	}
 }
diff --git a/packages/nodes-base/nodes/DateTime/DateTime.node.ts b/packages/nodes-base/nodes/DateTime/DateTime.node.ts
index 6dc4aa0a68f79..daffa817c0466 100644
--- a/packages/nodes-base/nodes/DateTime/DateTime.node.ts
+++ b/packages/nodes-base/nodes/DateTime/DateTime.node.ts
@@ -1,668 +1,26 @@
-import type {
-	IDataObject,
-	IExecuteFunctions,
-	ILoadOptionsFunctions,
-	INodeExecutionData,
-	INodePropertyOptions,
-	INodeType,
-	INodeTypeDescription,
-} from 'n8n-workflow';
-
-import { deepCopy, NodeOperationError } from 'n8n-workflow';
-
-import set from 'lodash.set';
-
-import moment from 'moment-timezone';
-
-import { DateTime as LuxonDateTime } from 'luxon';
-
-import strftime from 'strftime';
-
-function parseDateByFormat(this: IExecuteFunctions, value: string, fromFormat: string) {
-	const date = moment(value, fromFormat, true);
-	if (moment(date).isValid()) return date;
-
-	throw new NodeOperationError(
-		this.getNode(),
-		'Date input cannot be parsed. Please recheck the value and the "From Format" field.',
-	);
-}
-
-function getIsoValue(this: IExecuteFunctions, value: string) {
-	try {
-		return new Date(value).toISOString(); // may throw due to unpredictable input
-	} catch (error) {
-		throw new NodeOperationError(
-			this.getNode(),
-			'Unrecognized date input. Please specify a format in the "From Format" field.',
-		);
-	}
-}
-
-function parseDateByDefault(this: IExecuteFunctions, value: string) {
-	const isoValue = getIsoValue.call(this, value);
-	if (moment(isoValue).isValid()) return moment(isoValue);
-
-	throw new NodeOperationError(
-		this.getNode(),
-		'Unrecognized date input. Please specify a format in the "From Format" field.',
-	);
-}
-
-export class DateTime implements INodeType {
-	description: INodeTypeDescription = {
-		displayName: 'Date & Time',
-		name: 'dateTime',
-		icon: 'fa:clock',
-		group: ['transform'],
-		version: 1,
-		description: 'Allows you to manipulate date and time values',
-		subtitle: '={{$parameter["action"]}}',
-		defaults: {
-			name: 'Date & Time',
-			color: '#408000',
-		},
-		inputs: ['main'],
-		outputs: ['main'],
-		properties: [
-			{
-				displayName:
-					"More powerful date functionality is available in <a href='https://docs.n8n.io/code-examples/expressions/luxon/' target='_blank'>expressions</a>,</br> e.g. <code>{{ $now.plus(1, 'week') }}</code>",
-				name: 'noticeDateTime',
-				type: 'notice',
-				default: '',
-			},
-			{
-				displayName: 'Action',
-				name: 'action',
-				type: 'options',
-				options: [
-					{
-						name: 'Calculate a Date',
-						description: 'Add or subtract time from a date',
-						value: 'calculate',
-						action: 'Add or subtract time from a date',
-					},
-					{
-						name: 'Format a Date',
-						description: 'Convert a date to a different format',
-						value: 'format',
-						action: 'Convert a date to a different format',
-					},
-					{
-						name: 'Format Date Using Strftime',
-						description: 'Convert a date to a different format using strftime library',
-						value: 'customFormat',
-						action: 'Convert a date to a different format using strftime library',
-					},
-				],
-				default: 'format',
-			},
-			{
-				displayName: 'Value',
-				name: 'value',
-				displayOptions: {
-					show: {
-						action: ['format', 'customFormat'],
-					},
-				},
-				type: 'string',
-				default: '',
-				description: 'The value that should be converted',
-				required: true,
-			},
-			{
-				displayName: 'Property Name',
-				name: 'dataPropertyName',
-				type: 'string',
-				default: 'data',
-				required: true,
-				displayOptions: {
-					show: {
-						action: ['format', 'customFormat'],
-					},
-				},
-				description: 'Name of the property to which to write the converted date',
-			},
-			{
-				displayName: 'Custom Format',
-				name: 'custom',
-				displayOptions: {
-					show: {
-						action: ['format'],
-					},
-				},
-				type: 'boolean',
-				default: false,
-				description: 'Whether a predefined format should be selected or custom format entered',
-			},
-			{
-				displayName: 'To Format',
-				name: 'toFormat',
-				displayOptions: {
-					show: {
-						action: ['format'],
-						custom: [true],
-					},
-				},
-				type: 'string',
-				default: '',
-				placeholder: 'YYYY-MM-DD',
-				description: 'The format to convert the date to',
-			},
-			{
-				displayName: 'To Format',
-				name: 'toFormat',
-				type: 'options',
-				displayOptions: {
-					show: {
-						action: ['format'],
-						custom: [false],
-					},
-				},
-				// eslint-disable-next-line n8n-nodes-base/node-param-options-type-unsorted-items
-				options: [
-					{
-						name: 'MM/DD/YYYY',
-						value: 'MM/DD/YYYY',
-						description: 'Example: 09/04/1986',
-					},
-					{
-						name: 'YYYY/MM/DD',
-						value: 'YYYY/MM/DD',
-						description: 'Example: 1986/04/09',
-					},
-					{
-						name: 'MMMM DD YYYY',
-						value: 'MMMM DD YYYY',
-						description: 'Example: April 09 1986',
-					},
-					{
-						name: 'MM-DD-YYYY',
-						value: 'MM-DD-YYYY',
-						description: 'Example: 09-04-1986',
-					},
-					{
-						name: 'YYYY-MM-DD',
-						value: 'YYYY-MM-DD',
-						description: 'Example: 1986-04-09',
-					},
-					{
-						name: 'Unix Timestamp',
-						value: 'X',
-						description: 'Example: 513388800.879',
-					},
-					{
-						name: 'Unix Ms Timestamp',
-						value: 'x',
-						description: 'Example: 513388800',
-					},
-				],
-				default: 'MM/DD/YYYY',
-				description: 'The format to convert the date to',
-			},
-			{
-				displayName: 'To Format',
-				name: 'toFormat',
-				type: 'options',
-				displayOptions: {
-					show: {
-						action: ['customFormat'],
-					},
-				},
-				// eslint-disable-next-line n8n-nodes-base/node-param-options-type-unsorted-items
-				options: [
-					{
-						// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
-						name: '%A, %B %e, %Y at %l:%M %P %Z',
-						value: '%A, %B %e, %Y at %l:%M %P %Z',
-						description: 'Example: Wednesday, March 13, 2024 at 12:00 pm West Africa Standard Time',
-					},
-				],
-				default: '%A, %B %e, %Y at %l:%M %P %Z',
-				description: 'The format to convert the date to',
-			},
-			{
-				displayName: 'To Timezone Name or ID',
-				name: 'toTimezone',
-				type: 'options',
-				displayOptions: {
-					show: {
-						action: ['customFormat'],
-					},
-				},
-				typeOptions: {
-					loadOptionsMethod: 'getTimezones',
-				},
-				default: 'UTC',
-				description:
-					'The timezone to convert to. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
-			},
-			{
-				displayName: 'Options',
-				name: 'options',
-				displayOptions: {
-					show: {
-						action: ['format'],
-					},
-				},
-				type: 'collection',
-				placeholder: 'Add Option',
-				default: {},
-				options: [
-					{
-						displayName: 'From Format',
-						name: 'fromFormat',
-						type: 'string',
-						default: '',
-						description: 'In case the input format is not recognized you can provide the format',
-					},
-					{
-						displayName: 'From Timezone Name or ID',
-						name: 'fromTimezone',
-						type: 'options',
-						typeOptions: {
-							loadOptionsMethod: 'getTimezones',
-						},
-						default: 'UTC',
-						description:
-							'The timezone to convert from. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
-					},
-					{
-						displayName: 'To Timezone Name or ID',
-						name: 'toTimezone',
-						type: 'options',
-						typeOptions: {
-							loadOptionsMethod: 'getTimezones',
-						},
-						default: 'UTC',
-						description:
-							'The timezone to convert to. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
-					},
-				],
-			},
-			{
-				displayName: 'Date Value',
-				name: 'value',
-				displayOptions: {
-					show: {
-						action: ['calculate'],
-					},
-				},
-				type: 'string',
-				default: '',
-				description: 'The date string or timestamp from which you want to add/subtract time',
-				required: true,
-			},
-			{
-				displayName: 'Operation',
-				name: 'operation',
-				displayOptions: {
-					show: {
-						action: ['calculate'],
-					},
-				},
-				type: 'options',
-				noDataExpression: true,
-				options: [
-					{
-						name: 'Add',
-						value: 'add',
-						description: 'Add time to Date Value',
-						action: 'Add time to Date Value',
-					},
-					{
-						name: 'Subtract',
-						value: 'subtract',
-						description: 'Subtract time from Date Value',
-						action: 'Subtract time from Date Value',
-					},
-				],
-				default: 'add',
-				required: true,
-			},
-			{
-				displayName: 'Duration',
-				name: 'duration',
-				displayOptions: {
-					show: {
-						action: ['calculate'],
-					},
-				},
-				type: 'number',
-				typeOptions: {
-					minValue: 0,
-				},
-				default: 0,
-				required: true,
-				description: 'E.g. enter “10” then select “Days” if you want to add 10 days to Date Value.',
-			},
-			{
-				displayName: 'Time Unit',
-				name: 'timeUnit',
-				description: 'Time unit for Duration parameter above',
-				displayOptions: {
-					show: {
-						action: ['calculate'],
-					},
-				},
-				type: 'options',
-				// eslint-disable-next-line n8n-nodes-base/node-param-options-type-unsorted-items
-				options: [
-					{
-						name: 'Quarters',
-						value: 'quarters',
-					},
-					{
-						name: 'Years',
-						value: 'years',
-					},
-					{
-						name: 'Months',
-						value: 'months',
-					},
-					{
-						name: 'Weeks',
-						value: 'weeks',
-					},
-					{
-						name: 'Days',
-						value: 'days',
-					},
-					{
-						name: 'Hours',
-						value: 'hours',
-					},
-					{
-						name: 'Minutes',
-						value: 'minutes',
-					},
-					{
-						name: 'Seconds',
-						value: 'seconds',
-					},
-					{
-						name: 'Milliseconds',
-						value: 'milliseconds',
-					},
-				],
-				default: 'days',
-				required: true,
-			},
-			{
-				displayName: 'Property Name',
-				name: 'dataPropertyName',
-				type: 'string',
-				default: 'data',
-				required: true,
-				displayOptions: {
-					show: {
-						action: ['calculate'],
-					},
-				},
-				description: 'Name of the output property to which to write the converted date',
-			},
-			{
-				displayName: 'Options',
-				name: 'options',
-				type: 'collection',
-				placeholder: 'Add Option',
-				default: {},
-				displayOptions: {
-					show: {
-						action: ['calculate'],
-					},
-				},
-				options: [
-					{
-						displayName: 'From Format',
-						name: 'fromFormat',
-						type: 'string',
-						default: '',
-						description:
-							'Format for parsing the value as a date. If unrecognized, specify the <a href="https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.datetime/#faqs">format</a> for the value.',
-					},
-				],
-			},
-		],
-	};
-
-	methods = {
-		loadOptions: {
-			// Get all the timezones to display them to user so that they can
-			// select them easily
-			async getTimezones(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				for (const timezone of moment.tz.names()) {
-					const timezoneName = timezone;
-					const timezoneId = timezone;
-					returnData.push({
-						name: timezoneName,
-						value: timezoneId,
-					});
-				}
-				return returnData;
-			},
-		},
-	};
-
-	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
-		const items = this.getInputData();
-		const length = items.length;
-		const returnData: INodeExecutionData[] = [];
-
-		const workflowTimezone = this.getTimezone();
-		let item: INodeExecutionData;
-
-		for (let i = 0; i < length; i++) {
-			try {
-				const action = this.getNodeParameter('action', 0) as string;
-				item = items[i];
-
-				if (action === 'format') {
-					let currentDate = this.getNodeParameter('value', i) as string;
-					const dataPropertyName = this.getNodeParameter('dataPropertyName', i);
-					const toFormat = this.getNodeParameter('toFormat', i) as string;
-					const options = this.getNodeParameter('options', i);
-					let newDate;
-
-					if ((currentDate as unknown as IDataObject) instanceof LuxonDateTime) {
-						currentDate = (currentDate as unknown as LuxonDateTime).toISO();
-					}
-
-					if (currentDate === undefined) {
-						continue;
-					}
-					if (
-						options.fromFormat === undefined &&
-						!moment(currentDate as string | number).isValid()
-					) {
-						throw new NodeOperationError(
-							this.getNode(),
-							'The date input format could not be recognized. Please set the "From Format" field',
-							{ itemIndex: i },
-						);
-					}
-
-					if (Number.isInteger(currentDate as unknown as number)) {
-						newDate = moment.unix(currentDate as unknown as number);
-					} else {
-						if (options.fromTimezone || options.toTimezone) {
-							const fromTimezone = options.fromTimezone || workflowTimezone;
-							if (options.fromFormat) {
-								newDate = moment.tz(
-									currentDate,
-									options.fromFormat as string,
-									fromTimezone as string,
-								);
-							} else {
-								newDate = moment.tz(currentDate, fromTimezone as string);
-							}
-						} else {
-							if (options.fromFormat) {
-								newDate = moment(currentDate, options.fromFormat as string);
-							} else {
-								newDate = moment(currentDate);
-							}
-						}
-					}
-
-					if (options.toTimezone || options.fromTimezone) {
-						// If either a source or a target timezone got defined the
-						// timezone of the date has to be changed. If a target-timezone
-						// is set use it else fall back to workflow timezone.
-						// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-						newDate = newDate.tz((options.toTimezone as string) || workflowTimezone);
-					}
-
-					newDate = newDate.format(toFormat);
-
-					let newItem: INodeExecutionData;
-					if (dataPropertyName.includes('.')) {
-						// Uses dot notation so copy all data
-						newItem = {
-							json: deepCopy(item.json),
-							pairedItem: {
-								item: i,
-							},
-						};
-					} else {
-						// Does not use dot notation so shallow copy is enough
-						newItem = {
-							json: { ...item.json },
-							pairedItem: {
-								item: i,
-							},
-						};
-					}
-
-					if (item.binary !== undefined) {
-						newItem.binary = item.binary;
-					}
-
-					set(newItem, `json.${dataPropertyName}`, newDate);
-
-					returnData.push(newItem);
-				}
-
-				if (action === 'customFormat') {
-					let currentDate = this.getNodeParameter('value', i) as any;
-					const dataPropertyName = this.getNodeParameter('dataPropertyName', i);
-					const toFormat = this.getNodeParameter('toFormat', i) as string;
-					const toTimezone = this.getNodeParameter('toTimezone', i);
-					let newDate;
-
-					if ((currentDate as unknown as IDataObject) instanceof LuxonDateTime) {
-						currentDate = (currentDate as unknown as LuxonDateTime).toISO();
-					}
-
-					if (currentDate === undefined) {
-						continue;
-					}
-
-					if (Number.isInteger(currentDate as number)) {
-						newDate = new Date(currentDate * 1000);
-					} else {
-						newDate = new Date(currentDate as string);
-					}
-
-					const currentTimezone = process.env.TZ;
-
-					if (toTimezone) {
-						process.env.TZ = toTimezone as string;
-					}
-
-					newDate = strftime(toFormat, newDate);
-
-					process.env.TZ = currentTimezone;
-
-					let newItem: INodeExecutionData;
-					if (dataPropertyName.includes('.')) {
-						// Uses dot notation so copy all data
-						newItem = {
-							json: deepCopy(item.json),
-							pairedItem: {
-								item: i,
-							},
-						};
-					} else {
-						// Does not use dot notation so shallow copy is enough
-						newItem = {
-							json: { ...item.json },
-							pairedItem: {
-								item: i,
-							},
-						};
-					}
-
-					if (item.binary !== undefined) {
-						newItem.binary = item.binary;
-					}
-
-					set(newItem, `json.${dataPropertyName}`, newDate);
-
-					returnData.push(newItem);
-				}
-
-				if (action === 'calculate') {
-					const dateValue = this.getNodeParameter('value', i) as string;
-					const operation = this.getNodeParameter('operation', i) as 'add' | 'subtract';
-					const duration = this.getNodeParameter('duration', i) as number;
-					const timeUnit = this.getNodeParameter('timeUnit', i) as moment.DurationInputArg2;
-					const { fromFormat } = this.getNodeParameter('options', i) as { fromFormat?: string };
-					const dataPropertyName = this.getNodeParameter('dataPropertyName', i);
-
-					const newDate = fromFormat
-						? parseDateByFormat.call(this, dateValue, fromFormat)
-						: parseDateByDefault.call(this, dateValue);
-
-					operation === 'add'
-						? newDate.add(duration, timeUnit).utc().format()
-						: newDate.subtract(duration, timeUnit).utc().format();
-
-					let newItem: INodeExecutionData;
-					if (dataPropertyName.includes('.')) {
-						// Uses dot notation so copy all data
-						newItem = {
-							json: deepCopy(item.json),
-							pairedItem: {
-								item: i,
-							},
-						};
-					} else {
-						// Does not use dot notation so shallow copy is enough
-						newItem = {
-							json: { ...item.json },
-							pairedItem: {
-								item: i,
-							},
-						};
-					}
-
-					if (item.binary !== undefined) {
-						newItem.binary = item.binary;
-					}
-
-					set(newItem, `json.${dataPropertyName}`, newDate.toISOString());
-
-					returnData.push(newItem);
-				}
-			} catch (error) {
-				if (this.continueOnFail()) {
-					returnData.push({
-						json: {
-							error: error.message,
-						},
-						pairedItem: {
-							item: i,
-						},
-					});
-					continue;
-				}
-				throw error;
-			}
-		}
-
-		return this.prepareOutputData(returnData);
+import type { INodeTypeBaseDescription, IVersionedNodeType } from 'n8n-workflow';
+import { VersionedNodeType } from 'n8n-workflow';
+
+import { DateTimeV1 } from './V1/DateTimeV1.node';
+import { DateTimeV2 } from './V2/DateTimeV2.node';
+
+export class DateTime extends VersionedNodeType {
+	constructor() {
+		const baseDescription: INodeTypeBaseDescription = {
+			displayName: 'Date & Time',
+			name: 'dateTime',
+			icon: 'fa:clock',
+			group: ['transform'],
+			defaultVersion: 2,
+			description: 'Allows you to manipulate date and time values',
+			subtitle: '={{$parameter["action"]}}',
+		};
+
+		const nodeVersions: IVersionedNodeType['nodeVersions'] = {
+			1: new DateTimeV1(baseDescription),
+			2: new DateTimeV2(baseDescription),
+		};
+
+		super(nodeVersions, baseDescription);
 	}
 }
diff --git a/packages/nodes-base/nodes/DateTime/V1/DateTimeV1.node.ts b/packages/nodes-base/nodes/DateTime/V1/DateTimeV1.node.ts
new file mode 100644
index 0000000000000..2d5f24880b86f
--- /dev/null
+++ b/packages/nodes-base/nodes/DateTime/V1/DateTimeV1.node.ts
@@ -0,0 +1,590 @@
+/* eslint-disable n8n-nodes-base/node-filename-against-convention */
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
+	INodeExecutionData,
+	INodePropertyOptions,
+	INodeType,
+	INodeTypeBaseDescription,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+
+import { deepCopy, 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;
+
+	throw new NodeOperationError(
+		this.getNode(),
+		'Date input cannot be parsed. Please recheck the value and the "From Format" field.',
+	);
+}
+
+function getIsoValue(this: IExecuteFunctions, value: string) {
+	try {
+		return new Date(value).toISOString(); // may throw due to unpredictable input
+	} catch (error) {
+		throw new NodeOperationError(
+			this.getNode(),
+			'Unrecognized date input. Please specify a format in the "From Format" field.',
+		);
+	}
+}
+
+function parseDateByDefault(this: IExecuteFunctions, value: string) {
+	const isoValue = getIsoValue.call(this, value);
+	if (moment(isoValue).isValid()) return moment(isoValue);
+
+	throw new NodeOperationError(
+		this.getNode(),
+		'Unrecognized date input. Please specify a format in the "From Format" field.',
+	);
+}
+
+const versionDescription: INodeTypeDescription = {
+	displayName: 'Date & Time',
+	name: 'dateTime',
+	icon: 'fa:clock',
+	group: ['transform'],
+	version: 1,
+	description: 'Allows you to manipulate date and time values',
+	subtitle: '={{$parameter["action"]}}',
+	defaults: {
+		name: 'Date & Time',
+		color: '#408000',
+	},
+	inputs: ['main'],
+	outputs: ['main'],
+	properties: [
+		{
+			displayName:
+				"More powerful date functionality is available in <a href='https://docs.n8n.io/code-examples/expressions/luxon/' target='_blank'>expressions</a>,</br> e.g. <code>{{ $now.plus(1, 'week') }}</code>",
+			name: 'noticeDateTime',
+			type: 'notice',
+			default: '',
+		},
+		{
+			displayName: 'Action',
+			name: 'action',
+			type: 'options',
+			options: [
+				{
+					name: 'Calculate a Date',
+					description: 'Add or subtract time from a date',
+					value: 'calculate',
+					action: 'Add or subtract time from a date',
+				},
+				{
+					name: 'Format a Date',
+					description: 'Convert a date to a different format',
+					value: 'format',
+					action: 'Convert a date to a different format',
+				},
+			],
+			default: 'format',
+		},
+		{
+			displayName: 'Value',
+			name: 'value',
+			displayOptions: {
+				show: {
+					action: ['format'],
+				},
+			},
+			type: 'string',
+			default: '',
+			description: 'The value that should be converted',
+			required: true,
+		},
+		{
+			displayName: 'Property Name',
+			name: 'dataPropertyName',
+			type: 'string',
+			default: 'data',
+			required: true,
+			displayOptions: {
+				show: {
+					action: ['format'],
+				},
+			},
+			description: 'Name of the property to which to write the converted date',
+		},
+		{
+			displayName: 'Custom Format',
+			name: 'custom',
+			displayOptions: {
+				show: {
+					action: ['format'],
+				},
+			},
+			type: 'boolean',
+			default: false,
+			description: 'Whether a predefined format should be selected or custom format entered',
+		},
+		{
+			displayName: 'To Format',
+			name: 'toFormat',
+			displayOptions: {
+				show: {
+					action: ['format'],
+					custom: [true],
+				},
+			},
+			type: 'string',
+			default: '',
+			placeholder: 'YYYY-MM-DD',
+			description: 'The format to convert the date to',
+		},
+		{
+			displayName: 'To Format',
+			name: 'toFormat',
+			type: 'options',
+			displayOptions: {
+				show: {
+					action: ['format'],
+					custom: [false],
+				},
+			},
+			// eslint-disable-next-line n8n-nodes-base/node-param-options-type-unsorted-items
+			options: [
+				{
+					name: 'MM/DD/YYYY',
+					value: 'MM/DD/YYYY',
+					description: 'Example: 09/04/1986',
+				},
+				{
+					name: 'YYYY/MM/DD',
+					value: 'YYYY/MM/DD',
+					description: 'Example: 1986/04/09',
+				},
+				{
+					name: 'MMMM DD YYYY',
+					value: 'MMMM DD YYYY',
+					description: 'Example: April 09 1986',
+				},
+				{
+					name: 'MM-DD-YYYY',
+					value: 'MM-DD-YYYY',
+					description: 'Example: 09-04-1986',
+				},
+				{
+					name: 'YYYY-MM-DD',
+					value: 'YYYY-MM-DD',
+					description: 'Example: 1986-04-09',
+				},
+				{
+					name: 'Unix Timestamp',
+					value: 'X',
+					description: 'Example: 513388800.879',
+				},
+				{
+					name: 'Unix Ms Timestamp',
+					value: 'x',
+					description: 'Example: 513388800',
+				},
+			],
+			default: 'MM/DD/YYYY',
+			description: 'The format to convert the date to',
+		},
+		{
+			displayName: 'Options',
+			name: 'options',
+			displayOptions: {
+				show: {
+					action: ['format'],
+				},
+			},
+			type: 'collection',
+			placeholder: 'Add Option',
+			default: {},
+			options: [
+				{
+					displayName: 'From Format',
+					name: 'fromFormat',
+					type: 'string',
+					default: '',
+					description: 'In case the input format is not recognized you can provide the format',
+				},
+				{
+					displayName: 'From Timezone Name or ID',
+					name: 'fromTimezone',
+					type: 'options',
+					typeOptions: {
+						loadOptionsMethod: 'getTimezones',
+					},
+					default: 'UTC',
+					description:
+						'The timezone to convert from. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+				},
+				{
+					displayName: 'To Timezone Name or ID',
+					name: 'toTimezone',
+					type: 'options',
+					typeOptions: {
+						loadOptionsMethod: 'getTimezones',
+					},
+					default: 'UTC',
+					description:
+						'The timezone to convert to. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+				},
+			],
+		},
+		{
+			displayName: 'Date Value',
+			name: 'value',
+			displayOptions: {
+				show: {
+					action: ['calculate'],
+				},
+			},
+			type: 'string',
+			default: '',
+			description: 'The date string or timestamp from which you want to add/subtract time',
+			required: true,
+		},
+		{
+			displayName: 'Operation',
+			name: 'operation',
+			displayOptions: {
+				show: {
+					action: ['calculate'],
+				},
+			},
+			type: 'options',
+			noDataExpression: true,
+			options: [
+				{
+					name: 'Add',
+					value: 'add',
+					description: 'Add time to Date Value',
+					action: 'Add time to Date Value',
+				},
+				{
+					name: 'Subtract',
+					value: 'subtract',
+					description: 'Subtract time from Date Value',
+					action: 'Subtract time from Date Value',
+				},
+			],
+			default: 'add',
+			required: true,
+		},
+		{
+			displayName: 'Duration',
+			name: 'duration',
+			displayOptions: {
+				show: {
+					action: ['calculate'],
+				},
+			},
+			type: 'number',
+			typeOptions: {
+				minValue: 0,
+			},
+			default: 0,
+			required: true,
+			description: 'E.g. enter “10” then select “Days” if you want to add 10 days to Date Value.',
+		},
+		{
+			displayName: 'Time Unit',
+			name: 'timeUnit',
+			description: 'Time unit for Duration parameter above',
+			displayOptions: {
+				show: {
+					action: ['calculate'],
+				},
+			},
+			type: 'options',
+			// eslint-disable-next-line n8n-nodes-base/node-param-options-type-unsorted-items
+			options: [
+				{
+					name: 'Quarters',
+					value: 'quarters',
+				},
+				{
+					name: 'Years',
+					value: 'years',
+				},
+				{
+					name: 'Months',
+					value: 'months',
+				},
+				{
+					name: 'Weeks',
+					value: 'weeks',
+				},
+				{
+					name: 'Days',
+					value: 'days',
+				},
+				{
+					name: 'Hours',
+					value: 'hours',
+				},
+				{
+					name: 'Minutes',
+					value: 'minutes',
+				},
+				{
+					name: 'Seconds',
+					value: 'seconds',
+				},
+				{
+					name: 'Milliseconds',
+					value: 'milliseconds',
+				},
+			],
+			default: 'days',
+			required: true,
+		},
+		{
+			displayName: 'Property Name',
+			name: 'dataPropertyName',
+			type: 'string',
+			default: 'data',
+			required: true,
+			displayOptions: {
+				show: {
+					action: ['calculate'],
+				},
+			},
+			description: 'Name of the output property to which to write the converted date',
+		},
+		{
+			displayName: 'Options',
+			name: 'options',
+			type: 'collection',
+			placeholder: 'Add Option',
+			default: {},
+			displayOptions: {
+				show: {
+					action: ['calculate'],
+				},
+			},
+			options: [
+				{
+					displayName: 'From Format',
+					name: 'fromFormat',
+					type: 'string',
+					default: '',
+					description:
+						'Format for parsing the value as a date. If unrecognized, specify the <a href="https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.datetime/#faqs">format</a> for the value.',
+				},
+			],
+		},
+	],
+};
+
+export class DateTimeV1 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			...versionDescription,
+		};
+	}
+
+	methods = {
+		loadOptions: {
+			// Get all the timezones to display them to user so that they can
+			// select them easily
+			async getTimezones(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				for (const timezone of moment.tz.names()) {
+					const timezoneName = timezone;
+					const timezoneId = timezone;
+					returnData.push({
+						name: timezoneName,
+						value: timezoneId,
+					});
+				}
+				return returnData;
+			},
+		},
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = this.getInputData();
+		const length = items.length;
+		const returnData: INodeExecutionData[] = [];
+
+		const workflowTimezone = this.getTimezone();
+		let item: INodeExecutionData;
+
+		for (let i = 0; i < length; i++) {
+			try {
+				const action = this.getNodeParameter('action', 0) as string;
+				item = items[i];
+
+				if (action === 'format') {
+					let currentDate: string | number | LuxonDateTime = this.getNodeParameter(
+						'value',
+						i,
+					) as string;
+					const dataPropertyName = this.getNodeParameter('dataPropertyName', i);
+					const toFormat = this.getNodeParameter('toFormat', i) as string;
+					const options = this.getNodeParameter('options', i);
+					let newDate;
+
+					if ((currentDate as unknown as IDataObject) instanceof LuxonDateTime) {
+						currentDate = (currentDate as unknown as LuxonDateTime).toISO();
+					}
+
+					// Check if the input is a number
+					if (!Number.isNaN(Number(currentDate))) {
+						//input is a number, convert to number in case it is a string
+						currentDate = Number(currentDate);
+						// check if the number is a timestamp in float format and convert to integer
+						if (!Number.isInteger(currentDate)) {
+							currentDate = currentDate * 1000;
+						}
+					}
+
+					if (currentDate === undefined) {
+						continue;
+					}
+					if (options.fromFormat === undefined && !moment(currentDate).isValid()) {
+						throw new NodeOperationError(
+							this.getNode(),
+							'The date input format could not be recognized. Please set the "From Format" field',
+							{ itemIndex: i },
+						);
+					}
+
+					if (Number.isInteger(currentDate)) {
+						const timestampLengthInMilliseconds1990 = 12;
+						// check if the number is a timestamp in seconds or milliseconds and create a moment object accordingly
+						if (currentDate.toString().length < timestampLengthInMilliseconds1990) {
+							newDate = moment.unix(currentDate as number);
+						} else {
+							newDate = moment(currentDate);
+						}
+					} else {
+						if (options.fromTimezone || options.toTimezone) {
+							const fromTimezone = options.fromTimezone || workflowTimezone;
+							if (options.fromFormat) {
+								newDate = moment.tz(
+									currentDate as string,
+									options.fromFormat as string,
+									fromTimezone as string,
+								);
+							} else {
+								newDate = moment.tz(currentDate, fromTimezone as string);
+							}
+						} else {
+							if (options.fromFormat) {
+								newDate = moment(currentDate, options.fromFormat as string);
+							} else {
+								newDate = moment(currentDate);
+							}
+						}
+					}
+
+					if (options.toTimezone || options.fromTimezone) {
+						// If either a source or a target timezone got defined the
+						// timezone of the date has to be changed. If a target-timezone
+						// is set use it else fall back to workflow timezone.
+						newDate = newDate.tz((options.toTimezone as string) || workflowTimezone);
+					}
+
+					newDate = newDate.format(toFormat);
+
+					let newItem: INodeExecutionData;
+					if (dataPropertyName.includes('.')) {
+						// Uses dot notation so copy all data
+						newItem = {
+							json: deepCopy(item.json),
+							pairedItem: {
+								item: i,
+							},
+						};
+					} else {
+						// Does not use dot notation so shallow copy is enough
+						newItem = {
+							json: { ...item.json },
+							pairedItem: {
+								item: i,
+							},
+						};
+					}
+
+					if (item.binary !== undefined) {
+						newItem.binary = item.binary;
+					}
+
+					set(newItem, ['json', dataPropertyName], newDate);
+
+					returnData.push(newItem);
+				}
+
+				if (action === 'calculate') {
+					const dateValue = this.getNodeParameter('value', i) as string;
+					const operation = this.getNodeParameter('operation', i) as 'add' | 'subtract';
+					const duration = this.getNodeParameter('duration', i) as number;
+					const timeUnit = this.getNodeParameter('timeUnit', i) as moment.DurationInputArg2;
+					const { fromFormat } = this.getNodeParameter('options', i) as { fromFormat?: string };
+					const dataPropertyName = this.getNodeParameter('dataPropertyName', i);
+
+					const newDate = fromFormat
+						? parseDateByFormat.call(this, dateValue, fromFormat)
+						: parseDateByDefault.call(this, dateValue);
+
+					operation === 'add'
+						? newDate.add(duration, timeUnit).utc().format()
+						: newDate.subtract(duration, timeUnit).utc().format();
+
+					let newItem: INodeExecutionData;
+					if (dataPropertyName.includes('.')) {
+						// Uses dot notation so copy all data
+						newItem = {
+							json: deepCopy(item.json),
+							pairedItem: {
+								item: i,
+							},
+						};
+					} else {
+						// Does not use dot notation so shallow copy is enough
+						newItem = {
+							json: { ...item.json },
+							pairedItem: {
+								item: i,
+							},
+						};
+					}
+
+					if (item.binary !== undefined) {
+						newItem.binary = item.binary;
+					}
+
+					set(newItem, ['json', dataPropertyName], newDate.toISOString());
+
+					returnData.push(newItem);
+				}
+			} catch (error) {
+				if (this.continueOnFail()) {
+					returnData.push({
+						json: {
+							error: error.message,
+						},
+						pairedItem: {
+							item: i,
+						},
+					});
+					continue;
+				}
+				throw error;
+			}
+		}
+
+		return [returnData];
+	}
+}
diff --git a/packages/nodes-base/nodes/DateTime/V2/AddToDateDescription.ts b/packages/nodes-base/nodes/DateTime/V2/AddToDateDescription.ts
new file mode 100644
index 0000000000000..247eb9d33a025
--- /dev/null
+++ b/packages/nodes-base/nodes/DateTime/V2/AddToDateDescription.ts
@@ -0,0 +1,119 @@
+import type { INodeProperties } from 'n8n-workflow';
+import { includeInputFields } from './common.descriptions';
+
+export const AddToDateDescription: INodeProperties[] = [
+	{
+		displayName:
+			"You can also do this using an expression, e.g. <code>{{your_date.plus(5, 'minutes')}}</code>. <a target='_blank' href='https://docs.n8n.io/code-examples/expressions/luxon/'>More info</a>",
+		name: 'notice',
+		type: 'notice',
+		default: '',
+		displayOptions: {
+			show: {
+				operation: ['addToDate'],
+			},
+		},
+	},
+	{
+		displayName: 'Date to Add To',
+		name: 'magnitude',
+		type: 'string',
+		description: 'The date that you want to change',
+		default: '',
+		displayOptions: {
+			show: {
+				operation: ['addToDate'],
+			},
+		},
+		required: true,
+	},
+	{
+		displayName: 'Time Unit to Add',
+		name: 'timeUnit',
+		description: 'Time unit for Duration parameter below',
+		displayOptions: {
+			show: {
+				operation: ['addToDate'],
+			},
+		},
+		type: 'options',
+		// eslint-disable-next-line n8n-nodes-base/node-param-options-type-unsorted-items
+		options: [
+			{
+				name: 'Years',
+				value: 'years',
+			},
+			{
+				name: 'Quarters',
+				value: 'quarters',
+			},
+			{
+				name: 'Months',
+				value: 'months',
+			},
+			{
+				name: 'Weeks',
+				value: 'weeks',
+			},
+			{
+				name: 'Days',
+				value: 'days',
+			},
+			{
+				name: 'Hours',
+				value: 'hours',
+			},
+			{
+				name: 'Minutes',
+				value: 'minutes',
+			},
+			{
+				name: 'Seconds',
+				value: 'seconds',
+			},
+			{
+				name: 'Milliseconds',
+				value: 'milliseconds',
+			},
+		],
+		default: 'days',
+		required: true,
+	},
+	{
+		displayName: 'Duration',
+		name: 'duration',
+		type: 'number',
+		description: 'The number of time units to add to the date',
+		default: 0,
+		displayOptions: {
+			show: {
+				operation: ['addToDate'],
+			},
+		},
+	},
+	{
+		displayName: 'Output Field Name',
+		name: 'outputFieldName',
+		type: 'string',
+		default: 'newDate',
+		description: 'Name of the field to put the output in',
+		displayOptions: {
+			show: {
+				operation: ['addToDate'],
+			},
+		},
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		displayOptions: {
+			show: {
+				operation: ['addToDate'],
+			},
+		},
+		default: {},
+		options: [includeInputFields],
+	},
+];
diff --git a/packages/nodes-base/nodes/DateTime/V2/CurrentDateDescription.ts b/packages/nodes-base/nodes/DateTime/V2/CurrentDateDescription.ts
new file mode 100644
index 0000000000000..0440f67ba487e
--- /dev/null
+++ b/packages/nodes-base/nodes/DateTime/V2/CurrentDateDescription.ts
@@ -0,0 +1,66 @@
+import type { INodeProperties } from 'n8n-workflow';
+import { includeInputFields } from './common.descriptions';
+
+export const CurrentDateDescription: INodeProperties[] = [
+	{
+		displayName:
+			'You can also refer to the current date in n8n expressions by using <code>{{$now}}</code> or <code>{{$today}}</code>. <a target="_blank" href="https://docs.n8n.io/code-examples/expressions/luxon/">More info</a>',
+		name: 'notice',
+		type: 'notice',
+		default: '',
+		displayOptions: {
+			show: {
+				operation: ['getCurrentDate'],
+			},
+		},
+	},
+	{
+		displayName: 'Include Current Time',
+		name: 'includeTime',
+		type: 'boolean',
+		default: true,
+		// eslint-disable-next-line n8n-nodes-base/node-param-description-boolean-without-whether
+		description: 'When deactivated, the time will be set to midnight',
+		displayOptions: {
+			show: {
+				operation: ['getCurrentDate'],
+			},
+		},
+	},
+	{
+		displayName: 'Output Field Name',
+		name: 'outputFieldName',
+		type: 'string',
+		default: 'currentDate',
+		description: 'Name of the field to put the output in',
+		displayOptions: {
+			show: {
+				operation: ['getCurrentDate'],
+			},
+		},
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		displayOptions: {
+			show: {
+				operation: ['getCurrentDate'],
+			},
+		},
+		default: {},
+		options: [
+			includeInputFields,
+			{
+				displayName: 'Timezone',
+				name: 'timezone',
+				type: 'string',
+				placeholder: 'America/New_York',
+				default: '',
+				description:
+					'The timezone to use. If not set, the timezone of the n8n instance will be used. Use ‘GMT’ for +00:00 timezone.',
+			},
+		],
+	},
+];
diff --git a/packages/nodes-base/nodes/DateTime/V2/CustomFormatDescription.ts b/packages/nodes-base/nodes/DateTime/V2/CustomFormatDescription.ts
new file mode 100644
index 0000000000000..84a17a970a786
--- /dev/null
+++ b/packages/nodes-base/nodes/DateTime/V2/CustomFormatDescription.ts
@@ -0,0 +1,66 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+export const CustomFormatDescription: INodeProperties[] = [
+    {
+        displayName: 'Date to format',
+        name: 'date',
+        displayOptions: {
+            show: {
+                action: ['customFormat'],
+            },
+        },
+        type: 'string',
+        default: '',
+        description: 'The date that should be formatted',
+        required: true,
+    },
+    {
+        displayName: 'To Format',
+        name: 'toFormat',
+        type: 'options',
+        displayOptions: {
+            show: {
+                action: ['customFormat'],
+            },
+        },
+        // eslint-disable-next-line n8n-nodes-base/node-param-options-type-unsorted-items
+        options: [
+            {
+                // eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+                name: '%A, %B %e, %Y at %l:%M %P %Z',
+                value: '%A, %B %e, %Y at %l:%M %P %Z',
+                description: 'Example: Wednesday, March 13, 2024 at 12:00 pm West Africa Standard Time',
+            },
+        ],
+        default: '%A, %B %e, %Y at %l:%M %P %Z',
+        description: 'The format to convert the date to',
+    },
+    {
+        displayName: 'To Timezone Name or ID',
+        name: 'toTimezone',
+        type: 'options',
+        displayOptions: {
+            show: {
+                action: ['customFormat'],
+            },
+        },
+        typeOptions: {
+            loadOptionsMethod: 'getTimezones',
+        },
+        default: 'UTC',
+        description:
+            'The timezone to convert to. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+    },
+	{
+		displayName: 'Output Field Name',
+		name: 'outputFieldName',
+		type: 'string',
+		default: 'currentDate',
+		description: 'Name of the field to put the output in',
+		displayOptions: {
+			show: {
+				operation: ['customFormat'],
+			},
+		},
+	},
+];
diff --git a/packages/nodes-base/nodes/DateTime/V2/DateTimeV2.node.ts b/packages/nodes-base/nodes/DateTime/V2/DateTimeV2.node.ts
new file mode 100644
index 0000000000000..372456f099430
--- /dev/null
+++ b/packages/nodes-base/nodes/DateTime/V2/DateTimeV2.node.ts
@@ -0,0 +1,270 @@
+import type {
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeBaseDescription,
+	INodeTypeDescription,
+	IDataObject,
+} from 'n8n-workflow';
+import { NodeOperationError } from 'n8n-workflow';
+
+import type { DateTimeUnit, DurationUnit } from 'luxon';
+import { DateTime } from 'luxon';
+import strftime from 'strftime';
+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 { ExtractDateDescription } from './ExtractDateDescription';
+import { CustomFormatDescription } from './CustomFormatDescription';
+import { parseDate } from './GenericFunctions';
+
+export class DateTimeV2 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			version: 2,
+			defaults: {
+				name: 'Date & Time',
+				color: '#408000',
+			},
+			inputs: ['main'],
+			outputs: ['main'],
+			description: 'Manipulate date and time values',
+			properties: [
+				{
+					displayName: 'Operation',
+					name: 'operation',
+					type: 'options',
+					noDataExpression: true,
+					options: [
+						{
+							name: 'Add to a Date',
+							value: 'addToDate',
+						},
+						{
+							name: 'Extract Part of a Date',
+							value: 'extractDate',
+						},
+						{
+							name: 'Format a Date',
+							value: 'formatDate',
+						},
+						{
+							name: 'Get Current Date',
+							value: 'getCurrentDate',
+						},
+						{
+							name: 'Get Time Between Dates',
+							value: 'getTimeBetweenDates',
+						},
+						{
+							name: 'Round a Date',
+							value: 'roundDate',
+						},
+						{
+							name: 'Subtract From a Date',
+							value: 'subtractFromDate',
+						},
+						{
+							name: 'Format Date Using Strftime',
+							value: 'customFormat',
+						},
+					],
+					default: 'getCurrentDate',
+				},
+				...CurrentDateDescription,
+				...AddToDateDescription,
+				...SubtractFromDateDescription,
+				...FormatDateDescription,
+				...RoundDateDescription,
+				...GetTimeBetweenDatesDescription,
+				...ExtractDateDescription,
+				...CustomFormatDescription,
+			],
+		};
+	}
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = this.getInputData();
+		const returnData: INodeExecutionData[] = [];
+		const operation = this.getNodeParameter('operation', 0);
+		const workflowTimezone = this.getTimezone();
+		const includeInputFields = this.getNodeParameter(
+			'options.includeInputFields',
+			0,
+			false,
+		) as boolean;
+
+		const copyShallow = (item: INodeExecutionData) => ({
+			json: { ...item.json },
+			binary: item.binary,
+		});
+
+		for (let i = 0; i < items.length; i++) {
+			try {
+				const item: INodeExecutionData = includeInputFields ? copyShallow(items[i]) : { json: {} };
+				item.pairedItem = {
+					item: i,
+				};
+
+				if (operation === 'getCurrentDate') {
+					const includeTime = this.getNodeParameter('includeTime', i) as boolean;
+					const outputFieldName = this.getNodeParameter('outputFieldName', i) as string;
+					const { timezone } = this.getNodeParameter('options', i) as {
+						timezone: string;
+					};
+
+					const newLocal = timezone ? timezone : workflowTimezone;
+					if (DateTime.now().setZone(newLocal).invalidReason === 'unsupported zone') {
+						throw new NodeOperationError(
+							this.getNode(),
+							`The timezone ${newLocal} is not valid. Please check the timezone.`,
+						);
+					}
+
+					if (includeTime) {
+						item.json[outputFieldName] = DateTime.now().setZone(newLocal).toString();
+					} else {
+						item.json[outputFieldName] = DateTime.now().setZone(newLocal).startOf('day').toString();
+					}
+					returnData.push(item);
+				} else if (operation === 'addToDate') {
+					const addToDate = this.getNodeParameter('magnitude', i) as string;
+					const timeUnit = this.getNodeParameter('timeUnit', i) as string;
+					const duration = this.getNodeParameter('duration', i) as number;
+					const outputFieldName = this.getNodeParameter('outputFieldName', i) as string;
+
+					const dateToAdd = parseDate.call(this, addToDate, { timezone: workflowTimezone });
+					const returnedDate = dateToAdd.plus({ [timeUnit]: duration });
+
+					item.json[outputFieldName] = returnedDate.toString();
+					returnData.push(item);
+				} else if (operation === 'subtractFromDate') {
+					const subtractFromDate = this.getNodeParameter('magnitude', i) as string;
+					const timeUnit = this.getNodeParameter('timeUnit', i) as string;
+					const duration = this.getNodeParameter('duration', i) as number;
+					const outputFieldName = this.getNodeParameter('outputFieldName', i) as string;
+
+					const dateToAdd = parseDate.call(this, subtractFromDate, { timezone: workflowTimezone });
+					const returnedDate = dateToAdd.minus({ [timeUnit]: duration });
+
+					item.json[outputFieldName] = returnedDate.toString();
+					returnData.push(item);
+				} else if (operation === 'formatDate') {
+					const date = this.getNodeParameter('date', i) as string;
+					const format = this.getNodeParameter('format', i) as string;
+					const outputFieldName = this.getNodeParameter('outputFieldName', i) as string;
+					const { timezone, fromFormat } = this.getNodeParameter('options', i) as {
+						timezone: boolean;
+						fromFormat: string;
+					};
+
+					if (date === null || date === undefined) {
+						item.json[outputFieldName] = date;
+					} else {
+						const dateLuxon = parseDate.call(this, date, {
+							timezone: timezone ? workflowTimezone : undefined,
+							fromFormat,
+						});
+						if (format === 'custom') {
+							const customFormat = this.getNodeParameter('customFormat', i) as string;
+							item.json[outputFieldName] = dateLuxon.toFormat(customFormat);
+						} else {
+							item.json[outputFieldName] = dateLuxon.toFormat(format);
+						}
+					}
+					returnData.push(item);
+				} else if (operation === 'roundDate') {
+					const date = this.getNodeParameter('date', i) as string;
+					const mode = this.getNodeParameter('mode', i) as string;
+					const outputFieldName = this.getNodeParameter('outputFieldName', i) as string;
+
+					const dateLuxon = parseDate.call(this, date, { timezone: workflowTimezone });
+
+					if (mode === 'roundDown') {
+						const toNearest = this.getNodeParameter('toNearest', i) as string;
+						item.json[outputFieldName] = dateLuxon.startOf(toNearest as DateTimeUnit).toString();
+					} else if (mode === 'roundUp') {
+						const to = this.getNodeParameter('to', i) as string;
+						item.json[outputFieldName] = dateLuxon
+							.plus({ [to]: 1 })
+							.startOf(to as DateTimeUnit)
+							.toString();
+					}
+					returnData.push(item);
+				} else if (operation === 'getTimeBetweenDates') {
+					const startDate = this.getNodeParameter('startDate', i) as string;
+					const endDate = this.getNodeParameter('endDate', i) as string;
+					const unit = this.getNodeParameter('units', i) as DurationUnit[];
+					const outputFieldName = this.getNodeParameter('outputFieldName', i) as string;
+					const { isoString } = this.getNodeParameter('options', i) as {
+						isoString: boolean;
+					};
+
+					const luxonStartDate = parseDate.call(this, startDate, { timezone: workflowTimezone });
+					const luxonEndDate = parseDate.call(this, endDate, { timezone: workflowTimezone });
+					const duration = luxonEndDate.diff(luxonStartDate, unit);
+					if (isoString) {
+						item.json[outputFieldName] = duration.toString();
+					} else {
+						item.json[outputFieldName] = duration.toObject();
+					}
+					returnData.push(item);
+				} else if (operation === 'extractDate') {
+					const date = this.getNodeParameter('date', i) as string | DateTime;
+					const outputFieldName = this.getNodeParameter('outputFieldName', i) as string;
+					const part = this.getNodeParameter('part', i) as keyof DateTime | 'week';
+
+					const parsedDate = parseDate.call(this, date, { timezone: workflowTimezone });
+					const selectedPart = part === 'week' ? parsedDate.weekNumber : parsedDate.get(part);
+					item.json[outputFieldName] = selectedPart;
+					returnData.push(item);
+				} else if (operation === 'customFormat') {
+					let currentDate = this.getNodeParameter('date', i) as string;
+					const toFormat = this.getNodeParameter('toFormat', i) as string;
+					const toTimezone = this.getNodeParameter('toTimezone', i);
+					const outputFieldName = this.getNodeParameter('outputFieldName', i) as string;
+					let newDate;
+
+					if (currentDate === null || currentDate === undefined) {
+						item.json[outputFieldName] = currentDate;
+					} else {
+						if ((currentDate as unknown as IDataObject) instanceof DateTime) {
+							currentDate = (currentDate as unknown as DateTime).toISO();
+						}
+
+						if (Number.isInteger(currentDate as unknown as number)) {
+							newDate = new Date(currentDate as unknown as number * 1000);
+						} else {
+							newDate = new Date(currentDate as string);
+						}
+	
+						const currentTimezone = process.env.TZ;
+	
+						if (toTimezone) {
+							process.env.TZ = toTimezone as string;
+						}
+	
+						newDate = strftime(toFormat, newDate);
+	
+						process.env.TZ = currentTimezone;
+						item.json[outputFieldName] = newDate;
+					}
+					returnData.push(item);
+				}
+			} catch (error) {
+				if (this.continueOnFail()) {
+					returnData.push({ json: { error: error.message } });
+					continue;
+				}
+				throw new NodeOperationError(this.getNode(), error, { itemIndex: i });
+			}
+		}
+		return [returnData];
+	}
+}
diff --git a/packages/nodes-base/nodes/DateTime/V2/ExtractDateDescription.ts b/packages/nodes-base/nodes/DateTime/V2/ExtractDateDescription.ts
new file mode 100644
index 0000000000000..2cda97f00f6e4
--- /dev/null
+++ b/packages/nodes-base/nodes/DateTime/V2/ExtractDateDescription.ts
@@ -0,0 +1,96 @@
+import type { INodeProperties } from 'n8n-workflow';
+import { includeInputFields } from './common.descriptions';
+
+export const ExtractDateDescription: INodeProperties[] = [
+	{
+		displayName:
+			'You can also do this using an expression, e.g. <code>{{ your_date.extract("month") }}}</code>. <a target="_blank" href="https://docs.n8n.io/code-examples/expressions/luxon/">More info</a>',
+		name: 'notice',
+		type: 'notice',
+		default: '',
+		displayOptions: {
+			show: {
+				operation: ['extractDate'],
+			},
+		},
+	},
+	{
+		displayName: 'Date',
+		name: 'date',
+		type: 'string',
+		description: 'The date that you want to round',
+		default: '',
+		displayOptions: {
+			show: {
+				operation: ['extractDate'],
+			},
+		},
+	},
+	{
+		displayName: 'Part',
+		name: 'part',
+		type: 'options',
+		// eslint-disable-next-line n8n-nodes-base/node-param-options-type-unsorted-items
+		options: [
+			{
+				name: 'Year',
+				value: 'year',
+			},
+			{
+				name: 'Month',
+				value: 'month',
+			},
+			{
+				name: 'Week',
+				value: 'week',
+			},
+			{
+				name: 'Day',
+				value: 'day',
+			},
+			{
+				name: 'Hour',
+				value: 'hour',
+			},
+			{
+				name: 'Minute',
+				value: 'minute',
+			},
+			{
+				name: 'Second',
+				value: 'second',
+			},
+		],
+		default: 'month',
+		displayOptions: {
+			show: {
+				operation: ['extractDate'],
+			},
+		},
+	},
+	{
+		displayName: 'Output Field Name',
+		name: 'outputFieldName',
+		type: 'string',
+		default: 'datePart',
+		description: 'Name of the field to put the output in',
+		displayOptions: {
+			show: {
+				operation: ['extractDate'],
+			},
+		},
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		displayOptions: {
+			show: {
+				operation: ['extractDate'],
+			},
+		},
+		default: {},
+		options: [includeInputFields],
+	},
+];
diff --git a/packages/nodes-base/nodes/DateTime/V2/FormatDateDescription.ts b/packages/nodes-base/nodes/DateTime/V2/FormatDateDescription.ts
new file mode 100644
index 0000000000000..18c041b2796b4
--- /dev/null
+++ b/packages/nodes-base/nodes/DateTime/V2/FormatDateDescription.ts
@@ -0,0 +1,141 @@
+import type { INodeProperties } from 'n8n-workflow';
+import { includeInputFields } from './common.descriptions';
+
+export const FormatDateDescription: INodeProperties[] = [
+	{
+		displayName:
+			"You can also do this using an expression, e.g. <code>{{your_date.format('yyyy-MM-dd')}}</code>. <a target='_blank' href='https://docs.n8n.io/code-examples/expressions/luxon/'>More info</a>",
+		name: 'notice',
+		type: 'notice',
+		default: '',
+		displayOptions: {
+			show: {
+				operation: ['formatDate'],
+			},
+		},
+	},
+	{
+		displayName: 'Date',
+		name: 'date',
+		type: 'string',
+		description: 'The date that you want to format',
+		default: '',
+		displayOptions: {
+			show: {
+				operation: ['formatDate'],
+			},
+		},
+	},
+	{
+		displayName: 'Format',
+		name: 'format',
+		type: 'options',
+		displayOptions: {
+			show: {
+				operation: ['formatDate'],
+			},
+		},
+		// eslint-disable-next-line n8n-nodes-base/node-param-options-type-unsorted-items
+		options: [
+			{
+				name: 'Custom Format',
+				value: 'custom',
+			},
+			{
+				name: 'MM/DD/YYYY',
+				value: 'MM/dd/yyyy',
+				description: 'Example: 09/04/1986',
+			},
+			{
+				name: 'YYYY/MM/DD',
+				value: 'yyyy/MM/dd',
+				description: 'Example: 1986/04/09',
+			},
+			{
+				name: 'MMMM DD YYYY',
+				value: 'MMMM dd yyyy',
+				description: 'Example: April 09 1986',
+			},
+			{
+				name: 'MM-DD-YYYY',
+				value: 'MM-dd-yyyy',
+				description: 'Example: 09-04-1986',
+			},
+			{
+				name: 'YYYY-MM-DD',
+				value: 'yyyy-MM-dd',
+				description: 'Example: 1986-04-09',
+			},
+			{
+				name: 'Unix Timestamp',
+				value: 'X',
+				description: 'Example: 1672531200',
+			},
+			{
+				name: 'Unix Ms Timestamp',
+				value: 'x',
+				description: 'Example: 1674691200000',
+			},
+		],
+		default: 'MM/dd/yyyy',
+		description: 'The format to convert the date to',
+	},
+	{
+		displayName: 'Custom Format',
+		name: 'customFormat',
+		type: 'string',
+		displayOptions: {
+			show: {
+				format: ['custom'],
+				operation: ['formatDate'],
+			},
+		},
+		hint: 'List of special tokens <a target="_blank" href="https://moment.github.io/luxon/#/formatting?id=table-of-tokens">More info</a>',
+		default: '',
+		placeholder: 'yyyy-MM-dd',
+	},
+	{
+		displayName: 'Output Field Name',
+		name: 'outputFieldName',
+		type: 'string',
+		default: 'formattedDate',
+		description: 'Name of the field to put the output in',
+		displayOptions: {
+			show: {
+				operation: ['formatDate'],
+			},
+		},
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		displayOptions: {
+			show: {
+				operation: ['formatDate'],
+			},
+		},
+		default: {},
+		options: [
+			includeInputFields,
+			{
+				displayName: 'From Date Format',
+				name: 'fromFormat',
+				type: 'string',
+				default: 'e.g yyyyMMdd',
+				hint: 'Tokens are case sensitive',
+				// eslint-disable-next-line n8n-nodes-base/node-param-description-miscased-id
+				description:
+					'Format in which the input \'Date\' is, it\'s helpful when the format is not recognized automatically. Use those <a href="https://moment.github.io/luxon/#/formatting?id=table-of-tokens&id=table-of-tokens" target="_blank">tokens</a> to define the format.',
+			},
+			{
+				displayName: 'Use Workflow Timezone',
+				name: 'timezone',
+				type: 'boolean',
+				default: false,
+				description: "Whether to use the timezone of the input or the workflow's timezone",
+			},
+		],
+	},
+];
diff --git a/packages/nodes-base/nodes/DateTime/V2/GenericFunctions.ts b/packages/nodes-base/nodes/DateTime/V2/GenericFunctions.ts
new file mode 100644
index 0000000000000..215c0f60d3243
--- /dev/null
+++ b/packages/nodes-base/nodes/DateTime/V2/GenericFunctions.ts
@@ -0,0 +1,58 @@
+import { DateTime } from 'luxon';
+import moment from 'moment-timezone';
+import type { IExecuteFunctions } from 'n8n-workflow';
+import { NodeOperationError } from 'n8n-workflow';
+
+export function parseDate(
+	this: IExecuteFunctions,
+	date: string | number | DateTime,
+	options: Partial<{
+		timezone: string;
+		fromFormat: string;
+	}> = {},
+) {
+	let parsedDate;
+
+	if (date instanceof DateTime) {
+		parsedDate = date;
+	} else {
+		// Check if the input is a number, don't convert to number if fromFormat is set
+		if (!Number.isNaN(Number(date)) && !options.fromFormat) {
+			//input is a number, convert to number in case it is a string formatted number
+			date = Number(date);
+			// check if the number is a timestamp in float format and convert to integer
+			if (!Number.isInteger(date)) {
+				date = date * 1000;
+			}
+		}
+
+		let timezone = options.timezone;
+		if (Number.isInteger(date)) {
+			const timestampLengthInMilliseconds1990 = 12;
+			// check if the number is a timestamp in seconds or milliseconds and create a moment object accordingly
+			if (date.toString().length < timestampLengthInMilliseconds1990) {
+				parsedDate = DateTime.fromSeconds(date as number);
+			} else {
+				parsedDate = DateTime.fromMillis(date as number);
+			}
+		} else {
+			if (!timezone && (date as string).includes('+')) {
+				const offset = (date as string).split('+')[1].slice(0, 2) as unknown as number;
+				timezone = `Etc/GMT-${offset * 1}`;
+			}
+
+			if (options.fromFormat) {
+				parsedDate = DateTime.fromFormat(date as string, options.fromFormat);
+			} else {
+				parsedDate = DateTime.fromISO(moment(date).toISOString());
+			}
+		}
+
+		parsedDate = parsedDate.setZone(timezone || 'Etc/UTC');
+
+		if (parsedDate.invalidReason === 'unparsable') {
+			throw new NodeOperationError(this.getNode(), 'Invalid date format');
+		}
+	}
+	return parsedDate;
+}
diff --git a/packages/nodes-base/nodes/DateTime/V2/GetTimeBetweenDates.ts b/packages/nodes-base/nodes/DateTime/V2/GetTimeBetweenDates.ts
new file mode 100644
index 0000000000000..cb5edf49581c1
--- /dev/null
+++ b/packages/nodes-base/nodes/DateTime/V2/GetTimeBetweenDates.ts
@@ -0,0 +1,107 @@
+import type { INodeProperties } from 'n8n-workflow';
+import { includeInputFields } from './common.descriptions';
+
+export const GetTimeBetweenDatesDescription: INodeProperties[] = [
+	{
+		displayName: 'Start Date',
+		name: 'startDate',
+		type: 'string',
+		default: '',
+		displayOptions: {
+			show: {
+				operation: ['getTimeBetweenDates'],
+			},
+		},
+	},
+	{
+		displayName: 'End Date',
+		name: 'endDate',
+		type: 'string',
+		default: '',
+		displayOptions: {
+			show: {
+				operation: ['getTimeBetweenDates'],
+			},
+		},
+	},
+	{
+		displayName: 'Units',
+		name: 'units',
+		type: 'multiOptions',
+		// eslint-disable-next-line n8n-nodes-base/node-param-multi-options-type-unsorted-items
+		options: [
+			{
+				name: 'Year',
+				value: 'year',
+			},
+			{
+				name: 'Month',
+				value: 'month',
+			},
+			{
+				name: 'Week',
+				value: 'week',
+			},
+			{
+				name: 'Day',
+				value: 'day',
+			},
+			{
+				name: 'Hour',
+				value: 'hour',
+			},
+			{
+				name: 'Minute',
+				value: 'minute',
+			},
+			{
+				name: 'Second',
+				value: 'second',
+			},
+			{
+				name: 'Millisecond',
+				value: 'millisecond',
+			},
+		],
+		displayOptions: {
+			show: {
+				operation: ['getTimeBetweenDates'],
+			},
+		},
+		default: ['day'],
+	},
+	{
+		displayName: 'Output Field Name',
+		name: 'outputFieldName',
+		type: 'string',
+		default: 'timeDifference',
+		description: 'Name of the field to put the output in',
+		displayOptions: {
+			show: {
+				operation: ['getTimeBetweenDates'],
+			},
+		},
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		displayOptions: {
+			show: {
+				operation: ['getTimeBetweenDates'],
+			},
+		},
+		default: {},
+		options: [
+			includeInputFields,
+			{
+				displayName: 'Output as ISO String',
+				name: 'isoString',
+				type: 'boolean',
+				default: false,
+				description: 'Whether to output the date as ISO string or not',
+			},
+		],
+	},
+];
diff --git a/packages/nodes-base/nodes/DateTime/V2/RoundDateDescription.ts b/packages/nodes-base/nodes/DateTime/V2/RoundDateDescription.ts
new file mode 100644
index 0000000000000..4cd4266f58bec
--- /dev/null
+++ b/packages/nodes-base/nodes/DateTime/V2/RoundDateDescription.ts
@@ -0,0 +1,136 @@
+import type { INodeProperties } from 'n8n-workflow';
+import { includeInputFields } from './common.descriptions';
+
+export const RoundDateDescription: INodeProperties[] = [
+	{
+		displayName:
+			"You can also do this using an expression, e.g. <code>{{ your_date.beginningOf('month') }}</code> or <code>{{ your_date.endOfMonth() }}</code>. <a target='_blank' href='https://docs.n8n.io/code-examples/expressions/luxon/'>More info</a>",
+		name: 'notice',
+		type: 'notice',
+		default: '',
+		displayOptions: {
+			show: {
+				operation: ['roundDate'],
+			},
+		},
+	},
+	{
+		displayName: 'Date',
+		name: 'date',
+		type: 'string',
+		description: 'The date that you want to round',
+		default: '',
+		displayOptions: {
+			show: {
+				operation: ['roundDate'],
+			},
+		},
+	},
+	{
+		displayName: 'Mode',
+		name: 'mode',
+		type: 'options',
+		options: [
+			{
+				name: 'Round Down',
+				value: 'roundDown',
+			},
+			{
+				name: 'Round Up',
+				value: 'roundUp',
+			},
+		],
+		default: 'roundDown',
+		displayOptions: {
+			show: {
+				operation: ['roundDate'],
+			},
+		},
+	},
+	{
+		displayName: 'To Nearest',
+		name: 'toNearest',
+		type: 'options',
+		// eslint-disable-next-line n8n-nodes-base/node-param-options-type-unsorted-items
+		options: [
+			{
+				name: 'Year',
+				value: 'year',
+			},
+			{
+				name: 'Month',
+				value: 'month',
+			},
+			{
+				name: 'Week',
+				value: 'week',
+			},
+			{
+				name: 'Day',
+				value: 'day',
+			},
+			{
+				name: 'Hour',
+				value: 'hour',
+			},
+			{
+				name: 'Minute',
+				value: 'minute',
+			},
+			{
+				name: 'Second',
+				value: 'second',
+			},
+		],
+		default: 'month',
+		displayOptions: {
+			show: {
+				operation: ['roundDate'],
+				mode: ['roundDown'],
+			},
+		},
+	},
+	{
+		displayName: 'To',
+		name: 'to',
+		type: 'options',
+		options: [
+			{
+				name: 'End of Month',
+				value: 'month',
+			},
+		],
+		default: 'month',
+		displayOptions: {
+			show: {
+				operation: ['roundDate'],
+				mode: ['roundUp'],
+			},
+		},
+	},
+	{
+		displayName: 'Output Field Name',
+		name: 'outputFieldName',
+		type: 'string',
+		default: 'roundedDate',
+		description: 'Name of the field to put the output in',
+		displayOptions: {
+			show: {
+				operation: ['roundDate'],
+			},
+		},
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		displayOptions: {
+			show: {
+				operation: ['roundDate'],
+			},
+		},
+		default: {},
+		options: [includeInputFields],
+	},
+];
diff --git a/packages/nodes-base/nodes/DateTime/V2/SubtractFromDateDescription.ts b/packages/nodes-base/nodes/DateTime/V2/SubtractFromDateDescription.ts
new file mode 100644
index 0000000000000..acd9604e4418b
--- /dev/null
+++ b/packages/nodes-base/nodes/DateTime/V2/SubtractFromDateDescription.ts
@@ -0,0 +1,119 @@
+import type { INodeProperties } from 'n8n-workflow';
+import { includeInputFields } from './common.descriptions';
+
+export const SubtractFromDateDescription: INodeProperties[] = [
+	{
+		displayName:
+			"You can also do this using an expression, e.g. <code>{{your_date.minus(5, 'minutes')}}</code>. <a target='_blank' href='https://docs.n8n.io/code-examples/expressions/luxon/'>More info</a>",
+		name: 'notice',
+		type: 'notice',
+		default: '',
+		displayOptions: {
+			show: {
+				operation: ['subtractFromDate'],
+			},
+		},
+	},
+	{
+		displayName: 'Date to Subtract From',
+		name: 'magnitude',
+		type: 'string',
+		description: 'The date that you want to change',
+		default: '',
+		displayOptions: {
+			show: {
+				operation: ['subtractFromDate'],
+			},
+		},
+		required: true,
+	},
+	{
+		displayName: 'Time Unit to Subtract',
+		name: 'timeUnit',
+		description: 'Time unit for Duration parameter below',
+		displayOptions: {
+			show: {
+				operation: ['subtractFromDate'],
+			},
+		},
+		type: 'options',
+		// eslint-disable-next-line n8n-nodes-base/node-param-options-type-unsorted-items
+		options: [
+			{
+				name: 'Years',
+				value: 'years',
+			},
+			{
+				name: 'Quarters',
+				value: 'quarters',
+			},
+			{
+				name: 'Months',
+				value: 'months',
+			},
+			{
+				name: 'Weeks',
+				value: 'weeks',
+			},
+			{
+				name: 'Days',
+				value: 'days',
+			},
+			{
+				name: 'Hours',
+				value: 'hours',
+			},
+			{
+				name: 'Minutes',
+				value: 'minutes',
+			},
+			{
+				name: 'Seconds',
+				value: 'seconds',
+			},
+			{
+				name: 'Milliseconds',
+				value: 'milliseconds',
+			},
+		],
+		default: 'days',
+		required: true,
+	},
+	{
+		displayName: 'Duration',
+		name: 'duration',
+		type: 'number',
+		description: 'The number of time units to subtract from the date',
+		default: 0,
+		displayOptions: {
+			show: {
+				operation: ['subtractFromDate'],
+			},
+		},
+	},
+	{
+		displayName: 'Output Field Name',
+		name: 'outputFieldName',
+		type: 'string',
+		default: 'newDate',
+		description: 'Name of the field to put the output in',
+		displayOptions: {
+			show: {
+				operation: ['subtractFromDate'],
+			},
+		},
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		displayOptions: {
+			show: {
+				operation: ['subtractFromDate'],
+			},
+		},
+		default: {},
+		options: [includeInputFields],
+	},
+];
diff --git a/packages/nodes-base/nodes/DateTime/V2/common.descriptions.ts b/packages/nodes-base/nodes/DateTime/V2/common.descriptions.ts
new file mode 100644
index 0000000000000..65b0b98e8d38d
--- /dev/null
+++ b/packages/nodes-base/nodes/DateTime/V2/common.descriptions.ts
@@ -0,0 +1,9 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+export const includeInputFields: INodeProperties = {
+	displayName: 'Include Input Fields',
+	name: 'includeInputFields',
+	type: 'boolean',
+	default: false,
+	description: 'Whether to include all fields of the input item in the output item',
+};
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 98c2b2f1f51cb..60c630d076f4c 100644
--- a/packages/nodes-base/nodes/DateTime/test/node/DateTime.test.ts
+++ b/packages/nodes-base/nodes/DateTime/test/node/DateTime.test.ts
@@ -1,5 +1,5 @@
-import moment from 'moment';
-import { testWorkflows, getWorkflowFilenames } from '../../../../test/nodes/Helpers';
+import moment from 'moment-timezone';
+import { testWorkflows, getWorkflowFilenames } from '@test/nodes/Helpers';
 
 const workflows = getWorkflowFilenames(__dirname);
 
diff --git a/packages/nodes-base/nodes/DateTime/test/node/DateTimeWorkflowV2.json b/packages/nodes-base/nodes/DateTime/test/node/DateTimeWorkflowV2.json
new file mode 100644
index 0000000000000..fceebea6cc527
--- /dev/null
+++ b/packages/nodes-base/nodes/DateTime/test/node/DateTimeWorkflowV2.json
@@ -0,0 +1,260 @@
+{
+	"name": "node-360-quick-overhaul-of-date-and-time-node",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "21ff2e15-375d-4e68-b1ca-d48a110be238",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [-420, 20]
+		},
+		{
+			"parameters": {
+				"operation": "addToDate",
+				"magnitude": "={{ $json.currentDate }}",
+				"duration": 2
+			},
+			"id": "b99986f1-edeb-434c-b7ed-9cc86eaec522",
+			"name": "Add to date",
+			"type": "n8n-nodes-base.dateTime",
+			"typeVersion": 2,
+			"position": [140, 40]
+		},
+		{
+			"parameters": {
+				"operation": "subtractFromDate",
+				"magnitude": "={{ $json.newDate }}",
+				"duration": 2
+			},
+			"id": "aa75a04b-0d42-46ff-87e7-75d4b4f6c7ea",
+			"name": "Subtract date",
+			"type": "n8n-nodes-base.dateTime",
+			"typeVersion": 2,
+			"position": [300, 200]
+		},
+		{
+			"parameters": {
+				"operation": "formatDate",
+				"date": "={{ $json.newDate }}",
+				"format": "yyyy/MM/dd"
+			},
+			"id": "52076d89-bc6d-4253-8ca4-9aad3a058d17",
+			"name": "Format Date",
+			"type": "n8n-nodes-base.dateTime",
+			"typeVersion": 2,
+			"position": [420, 40]
+		},
+		{
+			"parameters": {
+				"operation": "roundDate",
+				"date": "={{ $json.formattedDate }}",
+				"toNearest": "day"
+			},
+			"id": "10016499-c9da-4984-9a5f-2f8c8844fb63",
+			"name": "Round Date",
+			"type": "n8n-nodes-base.dateTime",
+			"typeVersion": 2,
+			"position": [560, 200]
+		},
+		{
+			"parameters": {
+				"operation": "getTimeBetweenDates",
+				"startDate": "={{ $node['Subtract date'].json.newDate }}",
+				"endDate": "={{ $node['Add to date'].json.newDate }}",
+				"units": ["day"]
+			},
+			"id": "f62b6d0b-b13a-4fcd-b4eb-3ec7ea85e80c",
+			"name": "Get between date",
+			"type": "n8n-nodes-base.dateTime",
+			"typeVersion": 2,
+			"position": [660, 40]
+		},
+		{
+			"parameters": {
+				"operation": "extractDate",
+				"date": "={{ $node.Code.json.currentDate }}",
+				"part": "hour",
+				"outputFieldName": "date"
+			},
+			"id": "764e3e08-f71b-4e42-b059-36285076fe10",
+			"name": "Extract Date",
+			"type": "n8n-nodes-base.dateTime",
+			"typeVersion": 2,
+			"position": [780, 220]
+		},
+		{
+			"parameters": {
+				"options": {
+					"fromFormat": ""
+				}
+			},
+			"id": "f0b75198-74a4-4a13-8842-340539f41d80",
+			"name": "V1",
+			"type": "n8n-nodes-base.dateTime",
+			"typeVersion": 1,
+			"position": [0, -180],
+			"disabled": true
+		},
+		{
+			"parameters": {
+				"jsCode": "return {\"currentDate\":\"2023-04-11T13:51:59.965+00:00\"}\n"
+			},
+			"id": "7ba0c2a1-a683-4975-a2ca-70904111a3fc",
+			"name": "Code",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [-140, 140]
+		}
+	],
+	"pinData": {
+		"Code": [
+			{
+				"json": {
+					"currentDate": "2023-04-11T13:51:59.965+00:00"
+				}
+			}
+		],
+		"Add to date": [
+			{
+				"json": {
+					"newDate": "2023-04-13T13:51:59.965+00:00"
+				}
+			}
+		],
+		"Subtract date": [
+			{
+				"json": {
+					"newDate": "2023-04-11T13:51:59.965+00:00"
+				}
+			}
+		],
+		"Format Date": [
+			{
+				"json": {
+					"formattedDate": "2023/04/11"
+				}
+			}
+		],
+		"Round Date": [
+			{
+				"json": {
+					"roundedDate": "2023-04-11T00:00:00.000+00:00"
+				}
+			}
+		],
+		"Get between date": [
+			{
+				"json": {
+					"timeDifference": {
+						"days": 2
+					}
+				}
+			}
+		],
+		"Extract Date": [
+			{
+				"json": {
+					"date": 13
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "V1",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Code",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Add to date": {
+			"main": [
+				[
+					{
+						"node": "Subtract date",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Subtract date": {
+			"main": [
+				[
+					{
+						"node": "Format Date",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Format Date": {
+			"main": [
+				[
+					{
+						"node": "Round Date",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Round Date": {
+			"main": [
+				[
+					{
+						"node": "Get between date",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Get between date": {
+			"main": [
+				[
+					{
+						"node": "Extract Date",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code": {
+			"main": [
+				[
+					{
+						"node": "Add to date",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"saveManualExecutions": false,
+		"callerPolicy": "workflowsFromSameOwner",
+		"timezone": "Etc/GMT",
+		"executionTimeout": -1
+	},
+	"versionId": "c21daa0b-83ae-45f1-b680-d2e57423800b",
+	"id": "48",
+	"meta": {
+		"instanceId": "8e9416f42a954d0a370d988ac3c0f916f44074a6e45189164b1a8559394a7516"
+	},
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/DateTime/test/node/DateTimeWorklfow.test.json b/packages/nodes-base/nodes/DateTime/test/node/DateTimeWorklfow.test.json
index 124fc5b1d30b4..9d1d31723f316 100644
--- a/packages/nodes-base/nodes/DateTime/test/node/DateTimeWorklfow.test.json
+++ b/packages/nodes-base/nodes/DateTime/test/node/DateTimeWorklfow.test.json
@@ -1,331 +1,542 @@
 {
-  "name": "My workflow",
-  "nodes": [
-    {
-      "parameters": {},
-      "id": "bd40f2b1-090e-4cf0-8342-0ebcca1089b4",
-      "name": "When clicking \"Execute Workflow\"",
-      "type": "n8n-nodes-base.manualTrigger",
-      "typeVersion": 1,
-      "position": [
-        40,
-        -320
-      ]
-    },
-    {
-      "parameters": {
-        "action": "calculate",
-        "value": "08/01/2022",
-        "duration": 10,
-        "options": {}
-      },
-      "id": "cadf04c8-5900-414e-bf61-46adbf3687c2",
-      "name": "Calculate Date: Add Day",
-      "type": "n8n-nodes-base.dateTime",
-      "typeVersion": 1,
-      "position": [
-        520,
-        -400
-      ]
-    },
-    {
-      "parameters": {
-        "action": "calculate",
-        "value": "08/01/2022",
-        "duration": 2,
-        "timeUnit": "quarters",
-        "options": {}
-      },
-      "id": "77939e5a-db02-4c85-bf31-b61a017f4f64",
-      "name": "Calculate Date: Substract Quarter",
-      "type": "n8n-nodes-base.dateTime",
-      "typeVersion": 1,
-      "position": [
-        520,
-        -40
-      ]
-    },
-    {
-      "parameters": {
-        "action": "calculate",
-        "value": "08/01/2022",
-        "operation": "subtract",
-        "duration": 2,
-        "options": {}
-      },
-      "id": "6426aa5b-96ad-4516-a346-b9d0ee68b7bd",
-      "name": "Calculate Date: Substract Day",
-      "type": "n8n-nodes-base.dateTime",
-      "typeVersion": 1,
-      "position": [
-        520,
-        -220
-      ]
-    },
-    {
-      "parameters": {
-        "action": "calculate",
-        "value": "08/01/2022",
-        "duration": 2,
-        "timeUnit": "months",
-        "options": {}
-      },
-      "id": "de76ce11-7865-4b15-9829-5ed7d6a287eb",
-      "name": "Calculate Date: Add months",
-      "type": "n8n-nodes-base.dateTime",
-      "typeVersion": 1,
-      "position": [
-        520,
-        140
-      ]
-    },
-    {
-      "parameters": {
-        "action": "calculate",
-        "value": "08/01/2022",
-        "operation": "subtract",
-        "duration": 2,
-        "timeUnit": "months",
-        "options": {}
-      },
-      "id": "ccbe4625-e470-45f8-b494-06ee1ecfb1a5",
-      "name": "Calculate Date: Substract Months",
-      "type": "n8n-nodes-base.dateTime",
-      "typeVersion": 1,
-      "position": [
-        520,
-        300
-      ]
-    },
-    {
-      "parameters": {
-        "value": "08/01/2022",
-        "toFormat": "YYYY/MM/DD",
-        "options": {}
-      },
-      "id": "aed1eed3-db4e-431b-be04-488b47880665",
-      "name": "Calculate Date: Format YYYY/MM/DD",
-      "type": "n8n-nodes-base.dateTime",
-      "typeVersion": 1,
-      "position": [
-        520,
-        480
-      ]
-    },
-    {
-      "parameters": {
-        "value": "08/01/2022",
-        "toFormat": "YYYY/MM/DD",
-        "options": {
-          "fromTimezone": "US/Hawaii"
-        }
-      },
-      "id": "3bc2aa26-bc98-40c0-be8a-75bc0d58601c",
-      "name": "Calculate Date: Format YYYY/MM/DD with Timezone",
-      "type": "n8n-nodes-base.dateTime",
-      "typeVersion": 1,
-      "position": [
-        520,
-        660
-      ]
-    },
-    {
-      "parameters": {
-        "value": "08/01/2022",
-        "toFormat": "YYYY/MM/DD",
-        "options": {
-          "fromTimezone": "US/Hawaii",
-          "toTimezone": "US/Pacific"
-        }
-      },
-      "id": "e2defb6b-e465-4d5f-9d65-d66ab91345f5",
-      "name": "Calculate Date: Format YYYY/MM/DD with Timezone1",
-      "type": "n8n-nodes-base.dateTime",
-      "typeVersion": 1,
-      "position": [
-        520,
-        840
-      ]
-    },
-    {
-      "parameters": {
-        "value": "08/01/2022",
-        "toFormat": "x",
-        "options": {
-          "fromTimezone": "US/Hawaii",
-          "toTimezone": "US/Pacific"
-        }
-      },
-      "id": "cdf19ab4-aa0c-4cad-8264-bd4356928baf",
-      "name": "Calculate Date: Format YYYY/MM/DD with Timezone Unix",
-      "type": "n8n-nodes-base.dateTime",
-      "typeVersion": 1,
-      "position": [
-        40,
-        200
-      ]
-    },
-    {
-      "parameters": {
-        "value": "2022-01-12",
-        "toFormat": "MM-DD-YYYY",
-        "options": {
-          "fromFormat": "YYYY-DD-MM",
-          "fromTimezone": "US/Hawaii",
-          "toTimezone": "US/Pacific"
-        }
-      },
-      "id": "3383f04e-f13d-438b-b1c4-1bc09332401c",
-      "name": "Calculate Date: Format YYYY/MM/DD with Timezone with special zone",
-      "type": "n8n-nodes-base.dateTime",
-      "typeVersion": 1,
-      "position": [
-        40,
-        380
-      ]
-    }
-  ],
-  "pinData": {
-    "Calculate Date: Format YYYY/MM/DD with Timezone Unix": [
-      {
-        "json": {
-          "data": "1659312000000"
-        }
-      }
-    ],
-    "Calculate Date: Format YYYY/MM/DD with Timezone with special zone": [
-      {
-        "json": {
-          "data": "12-01-2022"
-        }
-      }
-    ],
-    "Calculate Date: Add Day": [
-      {
-        "json": {
-          "data": "2022-08-11T00:00:00.000Z"
-        }
-      }
-    ],
-    "Calculate Date: Substract Day": [
-      {
-        "json": {
-          "data": "2022-07-30T00:00:00.000Z"
-        }
-      }
-    ],
-    "Calculate Date: Substract Quarter": [
-      {
-        "json": {
-          "data": "2023-02-01T00:00:00.000Z"
-        }
-      }
-    ],
-    "Calculate Date: Add months": [
-      {
-        "json": {
-          "data": "2022-10-01T00:00:00.000Z"
-        }
-      }
-    ],
-    "Calculate Date: Substract Months": [
-      {
-        "json": {
-          "data": "2022-06-01T00:00:00.000Z"
-        }
-      }
-    ],
-    "Calculate Date: Format YYYY/MM/DD": [
-      {
-        "json": {
-          "data": "2022/08/01"
-        }
-      }
-    ],
-    "Calculate Date: Format YYYY/MM/DD with Timezone": [
-      {
-        "json": {
-          "data": "2022/07/31"
-        }
-      }
-    ],
-    "Calculate Date: Format YYYY/MM/DD with Timezone1": [
-      {
-        "json": {
-          "data": "2022/07/31"
-        }
-      }
-    ]
-  },
-  "connections": {
-    "When clicking \"Execute Workflow\"": {
-      "main": [
-        [
-          {
-            "node": "Calculate Date: Add Day",
-            "type": "main",
-            "index": 0
-          },
-          {
-            "node": "Calculate Date: Substract Day",
-            "type": "main",
-            "index": 0
-          },
-          {
-            "node": "Calculate Date: Substract Quarter",
-            "type": "main",
-            "index": 0
-          },
-          {
-            "node": "Calculate Date: Add months",
-            "type": "main",
-            "index": 0
-          },
-          {
-            "node": "Calculate Date: Substract Months",
-            "type": "main",
-            "index": 0
-          },
-          {
-            "node": "Calculate Date: Format YYYY/MM/DD",
-            "type": "main",
-            "index": 0
-          },
-          {
-            "node": "Calculate Date: Format YYYY/MM/DD with Timezone",
-            "type": "main",
-            "index": 0
-          },
-          {
-            "node": "Calculate Date: Format YYYY/MM/DD with Timezone1",
-            "type": "main",
-            "index": 0
-          },
-          {
-            "node": "Calculate Date: Format YYYY/MM/DD with Timezone Unix",
-            "type": "main",
-            "index": 0
-          },
-          {
-            "node": "Calculate Date: Format YYYY/MM/DD with Timezone with special zone",
-            "type": "main",
-            "index": 0
-          }
-        ]
-      ]
-    }
-  },
-  "active": false,
-  "settings": {
-    "saveManualExecutions": false,
-    "callerPolicy": "workflowsFromSameOwner",
-    "timezone": "America/New_York",
-    "saveExecutionProgress": "DEFAULT"
-  },
-  "versionId": "2737913c-dd04-438a-ba00-b1ee5f734038",
-  "id": "230",
-  "meta": {
-    "instanceId": "27cc9b56542ad45b38725555722c50a1c3fee1670bbb67980558314ee08517c4"
-  },
-  "tags": []
-}
\ No newline at end of file
+	"name": "My workflow 10",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "0b90cdc3-807a-4849-b2e2-a017eb77df17",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [20, 1820]
+		},
+		{
+			"parameters": {
+				"action": "calculate",
+				"value": "08/01/2022",
+				"duration": 10,
+				"options": {}
+			},
+			"id": "4a7807ca-e44c-46b4-9d2c-3424b1883c61",
+			"name": "Calculate Date: Add Day",
+			"type": "n8n-nodes-base.dateTime",
+			"typeVersion": 1,
+			"position": [500, 1740]
+		},
+		{
+			"parameters": {
+				"action": "calculate",
+				"value": "08/01/2022",
+				"duration": 2,
+				"timeUnit": "quarters",
+				"options": {}
+			},
+			"id": "04d26b36-9a31-4fc8-bbf4-4b6d8b9304bb",
+			"name": "Calculate Date: Substract Quarter",
+			"type": "n8n-nodes-base.dateTime",
+			"typeVersion": 1,
+			"position": [500, 2100]
+		},
+		{
+			"parameters": {
+				"action": "calculate",
+				"value": "08/01/2022",
+				"operation": "subtract",
+				"duration": 2,
+				"options": {}
+			},
+			"id": "617145da-26c5-491b-bc58-a10fbb5a1825",
+			"name": "Calculate Date: Substract Day",
+			"type": "n8n-nodes-base.dateTime",
+			"typeVersion": 1,
+			"position": [500, 1920]
+		},
+		{
+			"parameters": {
+				"action": "calculate",
+				"value": "08/01/2022",
+				"duration": 2,
+				"timeUnit": "months",
+				"options": {}
+			},
+			"id": "c7b4967f-3ae4-452b-8d54-aa1623194f2b",
+			"name": "Calculate Date: Add months",
+			"type": "n8n-nodes-base.dateTime",
+			"typeVersion": 1,
+			"position": [500, 2280]
+		},
+		{
+			"parameters": {
+				"action": "calculate",
+				"value": "08/01/2022",
+				"operation": "subtract",
+				"duration": 2,
+				"timeUnit": "months",
+				"options": {}
+			},
+			"id": "a22a536c-bf23-4ff0-a3ad-b3761dfb3add",
+			"name": "Calculate Date: Substract Months",
+			"type": "n8n-nodes-base.dateTime",
+			"typeVersion": 1,
+			"position": [500, 2440]
+		},
+		{
+			"parameters": {
+				"value": "08/01/2022",
+				"toFormat": "YYYY/MM/DD",
+				"options": {}
+			},
+			"id": "3ecc8ea0-9605-4017-b5e0-a9ddde4c1a4a",
+			"name": "Calculate Date: Format YYYY/MM/DD",
+			"type": "n8n-nodes-base.dateTime",
+			"typeVersion": 1,
+			"position": [500, 2620]
+		},
+		{
+			"parameters": {
+				"value": "08/01/2022",
+				"toFormat": "YYYY/MM/DD",
+				"options": {
+					"fromTimezone": "US/Hawaii"
+				}
+			},
+			"id": "c99c7124-c388-4c97-8e6e-8158ba83bddd",
+			"name": "Calculate Date: Format YYYY/MM/DD with Timezone",
+			"type": "n8n-nodes-base.dateTime",
+			"typeVersion": 1,
+			"position": [500, 2800]
+		},
+		{
+			"parameters": {
+				"value": "08/01/2022",
+				"toFormat": "YYYY/MM/DD",
+				"options": {
+					"fromTimezone": "US/Hawaii",
+					"toTimezone": "US/Pacific"
+				}
+			},
+			"id": "40abfde6-66f2-44a9-a16f-3d981178da84",
+			"name": "Calculate Date: Format YYYY/MM/DD with Timezone1",
+			"type": "n8n-nodes-base.dateTime",
+			"typeVersion": 1,
+			"position": [500, 2980]
+		},
+		{
+			"parameters": {
+				"value": "08/01/2022",
+				"toFormat": "x",
+				"options": {
+					"fromTimezone": "US/Hawaii",
+					"toTimezone": "US/Pacific"
+				}
+			},
+			"id": "20ea9e76-d656-406f-8e3d-a51712c2657d",
+			"name": "Calculate Date: Format YYYY/MM/DD with Timezone Unix",
+			"type": "n8n-nodes-base.dateTime",
+			"typeVersion": 1,
+			"position": [20, 2340]
+		},
+		{
+			"parameters": {
+				"value": "2022-01-12",
+				"toFormat": "MM-DD-YYYY",
+				"options": {
+					"fromFormat": "YYYY-DD-MM",
+					"fromTimezone": "US/Hawaii",
+					"toTimezone": "US/Pacific"
+				}
+			},
+			"id": "53ddcd66-3cb5-47bb-bd59-64a70fc599b7",
+			"name": "Calculate Date: Format YYYY/MM/DD with Timezone with special zone",
+			"type": "n8n-nodes-base.dateTime",
+			"typeVersion": 1,
+			"position": [20, 2520]
+		},
+		{
+			"parameters": {
+				"functionCode": "return [\n  {\n    \"Id\": \"18162\",\n    \"Start_time\": 1663801200000,\n    \"End_time\": 1663804800000,\n    \"Room\": \" The Stadium\"\n  },\n  {\n    \"Id\": \"18173\",\n    \"Start_time\": 1663797600000,\n    \"End_time\": 1663801200000,\n    \"Room\": \" The Stadium\"\n  },\n  {\n    \"Id\": \"18178\",\n    \"Start_time\": 1663804800000,\n    \"End_time\": 1663808400000,\n    \"Room\": \" The Stadium\"\n  },\n  {\n    \"Id\": \"18182\",\n    \"Start_time\": 1663801200000,\n    \"End_time\": 1663804800000,\n    \"Room\": \" The Garden\"\n  }\n]"
+			},
+			"id": "0933e36d-43f4-46b5-8c3f-8d397d93a24c",
+			"name": "Mock Data",
+			"type": "n8n-nodes-base.function",
+			"typeVersion": 1,
+			"position": [-140, 1200]
+		},
+		{
+			"parameters": {
+				"value": "1663801200000",
+				"options": {
+					"fromFormat": "x",
+					"toTimezone": "UTC"
+				}
+			},
+			"id": "35eae914-b744-4a0b-a9ac-eab8bd685f02",
+			"name": "Fixed Value",
+			"type": "n8n-nodes-base.dateTime",
+			"typeVersion": 1,
+			"position": [160, 1080]
+		},
+		{
+			"parameters": {
+				"value": "={{parseInt(1663801200000)}}",
+				"options": {
+					"fromFormat": "x",
+					"toTimezone": "UTC"
+				}
+			},
+			"id": "e7d16772-843d-43da-a411-ee46253619e8",
+			"name": "parseInt on fixed",
+			"type": "n8n-nodes-base.dateTime",
+			"typeVersion": 1,
+			"position": [160, 1580]
+		},
+		{
+			"parameters": {
+				"value": "={{ $json[\"Start_time\"] }}",
+				"options": {
+					"fromFormat": "x",
+					"toTimezone": "UTC"
+				}
+			},
+			"id": "daf8a9da-7cab-4bb6-91fd-9a7315ecc61b",
+			"name": "Without toString()",
+			"type": "n8n-nodes-base.dateTime",
+			"typeVersion": 1,
+			"position": [160, 1400]
+		},
+		{
+			"parameters": {
+				"value": "={{ $json[\"Start_time\"].toString() }}",
+				"options": {
+					"fromFormat": "x",
+					"toTimezone": "UTC"
+				}
+			},
+			"id": "bc536546-4968-4b88-acaa-9a02bc013246",
+			"name": "With toString",
+			"type": "n8n-nodes-base.dateTime",
+			"typeVersion": 1,
+			"position": [160, 880]
+		}
+	],
+	"pinData": {
+		"Calculate Date: Format YYYY/MM/DD with Timezone Unix": [
+			{
+				"json": {
+					"data": "1659312000000"
+				}
+			}
+		],
+		"Calculate Date: Format YYYY/MM/DD with Timezone with special zone": [
+			{
+				"json": {
+					"data": "12-01-2022"
+				}
+			}
+		],
+		"Calculate Date: Add Day": [
+			{
+				"json": {
+					"data": "2022-08-11T00:00:00.000Z"
+				}
+			}
+		],
+		"Calculate Date: Substract Day": [
+			{
+				"json": {
+					"data": "2022-07-30T00:00:00.000Z"
+				}
+			}
+		],
+		"Calculate Date: Substract Quarter": [
+			{
+				"json": {
+					"data": "2023-02-01T00:00:00.000Z"
+				}
+			}
+		],
+		"Calculate Date: Add months": [
+			{
+				"json": {
+					"data": "2022-10-01T00:00:00.000Z"
+				}
+			}
+		],
+		"Calculate Date: Substract Months": [
+			{
+				"json": {
+					"data": "2022-06-01T00:00:00.000Z"
+				}
+			}
+		],
+		"Calculate Date: Format YYYY/MM/DD": [
+			{
+				"json": {
+					"data": "2022/08/01"
+				}
+			}
+		],
+		"Calculate Date: Format YYYY/MM/DD with Timezone": [
+			{
+				"json": {
+					"data": "2022/07/31"
+				}
+			}
+		],
+		"Calculate Date: Format YYYY/MM/DD with Timezone1": [
+			{
+				"json": {
+					"data": "2022/07/31"
+				}
+			}
+		],
+		"With toString": [
+			{
+				"json": {
+					"Id": "18162",
+					"Start_time": 1663801200000,
+					"End_time": 1663804800000,
+					"Room": " The Stadium",
+					"data": "09/21/2022"
+				}
+			},
+			{
+				"json": {
+					"Id": "18173",
+					"Start_time": 1663797600000,
+					"End_time": 1663801200000,
+					"Room": " The Stadium",
+					"data": "09/21/2022"
+				}
+			},
+			{
+				"json": {
+					"Id": "18178",
+					"Start_time": 1663804800000,
+					"End_time": 1663808400000,
+					"Room": " The Stadium",
+					"data": "09/22/2022"
+				}
+			},
+			{
+				"json": {
+					"Id": "18182",
+					"Start_time": 1663801200000,
+					"End_time": 1663804800000,
+					"Room": " The Garden",
+					"data": "09/21/2022"
+				}
+			}
+		],
+		"Fixed Value": [
+			{
+				"json": {
+					"Id": "18162",
+					"Start_time": 1663801200000,
+					"End_time": 1663804800000,
+					"Room": " The Stadium",
+					"data": "09/21/2022"
+				}
+			},
+			{
+				"json": {
+					"Id": "18173",
+					"Start_time": 1663797600000,
+					"End_time": 1663801200000,
+					"Room": " The Stadium",
+					"data": "09/21/2022"
+				}
+			},
+			{
+				"json": {
+					"Id": "18178",
+					"Start_time": 1663804800000,
+					"End_time": 1663808400000,
+					"Room": " The Stadium",
+					"data": "09/21/2022"
+				}
+			},
+			{
+				"json": {
+					"Id": "18182",
+					"Start_time": 1663801200000,
+					"End_time": 1663804800000,
+					"Room": " The Garden",
+					"data": "09/21/2022"
+				}
+			}
+		],
+		"Without toString()": [
+			{
+				"json": {
+					"Id": "18162",
+					"Start_time": 1663801200000,
+					"End_time": 1663804800000,
+					"Room": " The Stadium",
+					"data": "09/21/2022"
+				}
+			},
+			{
+				"json": {
+					"Id": "18173",
+					"Start_time": 1663797600000,
+					"End_time": 1663801200000,
+					"Room": " The Stadium",
+					"data": "09/21/2022"
+				}
+			},
+			{
+				"json": {
+					"Id": "18178",
+					"Start_time": 1663804800000,
+					"End_time": 1663808400000,
+					"Room": " The Stadium",
+					"data": "09/22/2022"
+				}
+			},
+			{
+				"json": {
+					"Id": "18182",
+					"Start_time": 1663801200000,
+					"End_time": 1663804800000,
+					"Room": " The Garden",
+					"data": "09/21/2022"
+				}
+			}
+		],
+		"parseInt on fixed": [
+			{
+				"json": {
+					"Id": "18162",
+					"Start_time": 1663801200000,
+					"End_time": 1663804800000,
+					"Room": " The Stadium",
+					"data": "09/21/2022"
+				}
+			},
+			{
+				"json": {
+					"Id": "18173",
+					"Start_time": 1663797600000,
+					"End_time": 1663801200000,
+					"Room": " The Stadium",
+					"data": "09/21/2022"
+				}
+			},
+			{
+				"json": {
+					"Id": "18178",
+					"Start_time": 1663804800000,
+					"End_time": 1663808400000,
+					"Room": " The Stadium",
+					"data": "09/21/2022"
+				}
+			},
+			{
+				"json": {
+					"Id": "18182",
+					"Start_time": 1663801200000,
+					"End_time": 1663804800000,
+					"Room": " The Garden",
+					"data": "09/21/2022"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Calculate Date: Add Day",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Calculate Date: Substract Day",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Calculate Date: Substract Quarter",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Calculate Date: Add months",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Calculate Date: Substract Months",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Calculate Date: Format YYYY/MM/DD",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Calculate Date: Format YYYY/MM/DD with Timezone",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Calculate Date: Format YYYY/MM/DD with Timezone1",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Calculate Date: Format YYYY/MM/DD with Timezone Unix",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Calculate Date: Format YYYY/MM/DD with Timezone with special zone",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Mock Data",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Mock Data": {
+			"main": [
+				[
+					{
+						"node": "With toString",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Without toString()",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Fixed Value",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "parseInt on fixed",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {},
+	"versionId": "8ccd9e22-634a-4fc1-b41b-1a63062557e6",
+	"id": "151",
+	"meta": {
+		"instanceId": "36203ea1ce3cef713fa25999bd9874ae26b9e4c2c3a90a365f2882a154d031d0"
+	},
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/DateTime/test/node/workflow.includeInputFields_v2.json b/packages/nodes-base/nodes/DateTime/test/node/workflow.includeInputFields_v2.json
new file mode 100644
index 0000000000000..a6ee548eef4e8
--- /dev/null
+++ b/packages/nodes-base/nodes/DateTime/test/node/workflow.includeInputFields_v2.json
@@ -0,0 +1,420 @@
+{
+  "name": "My workflow 38",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "f1242de8-11fc-4849-a4a2-c82fa75731a7",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        120,
+        800
+      ]
+    },
+    {
+      "parameters": {
+        "values": {
+          "number": [
+            {
+              "name": "dateMilis",
+              "value": 1682918315906
+            },
+            {
+              "name": "dateMilisFloat",
+              "value": 1682918315.906
+            },
+            {
+              "name": "dateUnix",
+              "value": 1682918315
+            }
+          ],
+          "string": [
+            {
+              "name": "dateMilisStr",
+              "value": "1682918315906"
+            },
+            {
+              "name": "dateMilisFloatStr",
+              "value": "1682918315.906"
+            },
+            {
+              "name": "dateUnixStr",
+              "value": "1682918315"
+            }
+          ]
+        },
+        "options": {}
+      },
+      "id": "7208910f-fd33-42b9-bcf2-14bb0b0d157d",
+      "name": "Set",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 2,
+      "position": [
+        320,
+        800
+      ]
+    },
+    {
+      "parameters": {
+        "operation": "formatDate",
+        "date": "={{ $json.dateMilis }}",
+        "format": "yyyy/MM/dd",
+        "outputFieldName": "data",
+        "options": {}
+      },
+      "id": "fb66a2cc-95b9-4917-999b-847ab61a7938",
+      "name": "Date & Time6",
+      "type": "n8n-nodes-base.dateTime",
+      "typeVersion": 2,
+      "position": [
+        700,
+        360
+      ]
+    },
+    {
+      "parameters": {
+        "operation": "formatDate",
+        "date": "={{ $json.dateMilisFloat }}",
+        "format": "yyyy/MM/dd",
+        "outputFieldName": "data",
+        "options": {}
+      },
+      "id": "b94eb54a-1952-4f33-816a-8ffa47c7bb42",
+      "name": "Date & Time",
+      "type": "n8n-nodes-base.dateTime",
+      "typeVersion": 2,
+      "position": [
+        700,
+        720
+      ]
+    },
+    {
+      "parameters": {
+        "operation": "formatDate",
+        "date": "={{ $json.dateUnix }}",
+        "format": "yyyy/MM/dd",
+        "outputFieldName": "data",
+        "options": {}
+      },
+      "id": "7f0af92d-8064-4af0-8c2c-a21b70f69ac1",
+      "name": "Date & Time1",
+      "type": "n8n-nodes-base.dateTime",
+      "typeVersion": 2,
+      "position": [
+        700,
+        1080
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "1e90549e-f4d4-46a1-bc9b-617befff2319",
+      "name": "No Operation, do nothing",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        900,
+        360
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "ec07d232-e513-4f09-8cb1-e8e4853bcebc",
+      "name": "No Operation, do nothing1",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        900,
+        720
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "f9839c73-ed5e-4ae0-bc1e-5a1914ac8b55",
+      "name": "No Operation, do nothing2",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        900,
+        1080
+      ]
+    },
+    {
+      "parameters": {
+        "operation": "formatDate",
+        "date": "={{ $json.dateMilis }}",
+        "format": "yyyy/MM/dd",
+        "outputFieldName": "data",
+        "options": {
+          "includeInputFields": true
+        }
+      },
+      "id": "bfce6276-2de4-4783-bc7f-d82fab23c2af",
+      "name": "Date & Time7",
+      "type": "n8n-nodes-base.dateTime",
+      "typeVersion": 2,
+      "position": [
+        700,
+        500
+      ]
+    },
+    {
+      "parameters": {
+        "operation": "formatDate",
+        "date": "={{ $json.dateMilisFloat }}",
+        "format": "yyyy/MM/dd",
+        "outputFieldName": "data",
+        "options": {
+          "includeInputFields": true
+        }
+      },
+      "id": "a7aad9c9-20ff-4353-9445-80366fad9431",
+      "name": "Date & Time2",
+      "type": "n8n-nodes-base.dateTime",
+      "typeVersion": 2,
+      "position": [
+        700,
+        860
+      ]
+    },
+    {
+      "parameters": {
+        "operation": "formatDate",
+        "date": "={{ $json.dateUnix }}",
+        "format": "yyyy/MM/dd",
+        "outputFieldName": "data",
+        "options": {
+          "includeInputFields": true
+        }
+      },
+      "id": "3b9e3ad7-0d00-4598-b796-23bb206e75db",
+      "name": "Date & Time3",
+      "type": "n8n-nodes-base.dateTime",
+      "typeVersion": 2,
+      "position": [
+        700,
+        1240
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "8a3cdde0-b1de-46dc-a8c6-74cc174fd4a1",
+      "name": "No Operation, do nothing3",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        900,
+        1240
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "54b4d584-0874-411b-9c98-8194c0928588",
+      "name": "No Operation, do nothing4",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        900,
+        860
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "4a4e7647-6c6e-4a24-9032-829e5f495337",
+      "name": "No Operation, do nothing5",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        900,
+        500
+      ]
+    }
+  ],
+  "pinData": {
+    "No Operation, do nothing2": [
+      {
+        "json": {
+          "data": "2023/05/01"
+        }
+      }
+    ],
+    "No Operation, do nothing1": [
+      {
+        "json": {
+          "data": "2023/05/01"
+        }
+      }
+    ],
+    "No Operation, do nothing": [
+      {
+        "json": {
+          "data": "2023/05/01"
+        }
+      }
+    ],
+    "No Operation, do nothing5": [
+      {
+        "json": {
+          "dateMilis": 1682918315906,
+          "dateMilisFloat": 1682918315.906,
+          "dateUnix": 1682918315,
+          "dateMilisStr": "1682918315906",
+          "dateMilisFloatStr": "1682918315.906",
+          "dateUnixStr": "1682918315",
+          "data": "2023/05/01"
+        }
+      }
+    ],
+    "No Operation, do nothing4": [
+      {
+        "json": {
+          "dateMilis": 1682918315906,
+          "dateMilisFloat": 1682918315.906,
+          "dateUnix": 1682918315,
+          "dateMilisStr": "1682918315906",
+          "dateMilisFloatStr": "1682918315.906",
+          "dateUnixStr": "1682918315",
+          "data": "2023/05/01"
+        }
+      }
+    ],
+    "No Operation, do nothing3": [
+      {
+        "json": {
+          "dateMilis": 1682918315906,
+          "dateMilisFloat": 1682918315.906,
+          "dateUnix": 1682918315,
+          "dateMilisStr": "1682918315906",
+          "dateMilisFloatStr": "1682918315.906",
+          "dateUnixStr": "1682918315",
+          "data": "2023/05/01"
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Set",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Set": {
+      "main": [
+        [
+          {
+            "node": "Date & Time6",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Date & Time",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Date & Time1",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Date & Time7",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Date & Time2",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Date & Time3",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Date & Time6": {
+      "main": [
+        [
+          {
+            "node": "No Operation, do nothing",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Date & Time1": {
+      "main": [
+        [
+          {
+            "node": "No Operation, do nothing2",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Date & Time": {
+      "main": [
+        [
+          {
+            "node": "No Operation, do nothing1",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Date & Time3": {
+      "main": [
+        [
+          {
+            "node": "No Operation, do nothing3",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Date & Time2": {
+      "main": [
+        [
+          {
+            "node": "No Operation, do nothing4",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Date & Time7": {
+      "main": [
+        [
+          {
+            "node": "No Operation, do nothing5",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "419a6926-5d06-4ba5-b261-410e124996de",
+  "id": "hW8KyOyaCN5fGQru",
+  "meta": {
+    "instanceId": "b888bd11cd1ddbb95450babf3e199556799d999b896f650de768b8370ee50363"
+  },
+  "tags": []
+}
diff --git a/packages/nodes-base/nodes/DateTime/test/node/workflow.nullDate_v2.json b/packages/nodes-base/nodes/DateTime/test/node/workflow.nullDate_v2.json
new file mode 100644
index 0000000000000..a1c3a440ca902
--- /dev/null
+++ b/packages/nodes-base/nodes/DateTime/test/node/workflow.nullDate_v2.json
@@ -0,0 +1,93 @@
+{
+    "name": "Null Date",
+    "nodes": [
+      {
+        "parameters": {},
+        "id": "62bb450c-f2e3-41c9-9894-a954d2c5e115",
+        "name": "When clicking \"Execute Workflow\"",
+        "type": "n8n-nodes-base.manualTrigger",
+        "typeVersion": 1,
+        "position": [
+          1600,
+          740
+        ]
+      },
+      {
+        "parameters": {
+          "jsCode": "return {date: null}"
+        },
+        "id": "47e4ce5b-2365-4987-a058-ae21964d135d",
+        "name": "Code",
+        "type": "n8n-nodes-base.code",
+        "typeVersion": 2,
+        "position": [
+          1820,
+          740
+        ]
+      },
+      {
+        "parameters": {
+          "operation": "formatDate",
+          "date": "={{ $json.date }}",
+          "options": {}
+        },
+        "id": "9af21b91-9db6-40cd-98ee-ee969eb0a348",
+        "name": "Date & Time",
+        "type": "n8n-nodes-base.dateTime",
+        "typeVersion": 2,
+        "position": [
+          2040,
+          740
+        ]
+      }
+    ],
+    "pinData": {
+      "Date & Time": [
+        {
+          "json": {
+            "formattedDate": null
+          }
+        }
+      ],
+      "Code": [
+        {
+          "json": {
+            "date": null
+          }
+        }
+      ]
+    },
+    "connections": {
+      "When clicking \"Execute Workflow\"": {
+        "main": [
+          [
+            {
+              "node": "Code",
+              "type": "main",
+              "index": 0
+            }
+          ]
+        ]
+      },
+      "Code": {
+        "main": [
+          [
+            {
+              "node": "Date & Time",
+              "type": "main",
+              "index": 0
+            }
+          ]
+        ]
+      }
+    },
+    "active": false,
+    "settings": {
+      "executionOrder": "v1"
+    },
+    "versionId": "",
+    "meta": {
+      "instanceId": "78577815012af39cf16dad7a787b0898c42fb7514b8a7f99b2136862c2af502c"
+    },
+    "tags": []
+  }
diff --git a/packages/nodes-base/nodes/DateTime/test/node/workflow.timestamp.json b/packages/nodes-base/nodes/DateTime/test/node/workflow.timestamp.json
new file mode 100644
index 0000000000000..6894f699891b8
--- /dev/null
+++ b/packages/nodes-base/nodes/DateTime/test/node/workflow.timestamp.json
@@ -0,0 +1,393 @@
+{
+	"name": "date time",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "7192e181-4384-430d-a25c-25beb0ae6b1f",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [-100, 1040]
+		},
+		{
+			"parameters": {
+				"values": {
+					"number": [
+						{
+							"name": "dateMilis",
+							"value": 1682918315906
+						},
+						{
+							"name": "dateMilisFloat",
+							"value": 1682918315.906
+						},
+						{
+							"name": "dateUnix",
+							"value": 1682918315
+						}
+					],
+					"string": [
+						{
+							"name": "dateMilisStr",
+							"value": "1682918315906"
+						},
+						{
+							"name": "dateMilisFloatStr",
+							"value": "1682918315.906"
+						},
+						{
+							"name": "dateUnixStr",
+							"value": "1682918315"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "dc933b29-a770-43b8-aa20-a8e82b0d034f",
+			"name": "Set",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 2,
+			"position": [60, 1040]
+		},
+		{
+			"parameters": {
+				"value": "={{ $json.dateMilis }}",
+				"options": {}
+			},
+			"id": "2bcbc9d8-af2f-4c44-b47e-80a9462350d0",
+			"name": "Date & Time",
+			"type": "n8n-nodes-base.dateTime",
+			"typeVersion": 1,
+			"position": [360, 560]
+		},
+		{
+			"parameters": {
+				"keepOnlySet": true,
+				"values": {
+					"string": [
+						{
+							"name": "data",
+							"value": "={{ $json.data }}"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "c1b947a8-45c6-4c6a-b4ce-467d57de6d50",
+			"name": "Set1",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 2,
+			"position": [580, 560]
+		},
+		{
+			"parameters": {
+				"value": "={{ $json.dateMilisFloat }}",
+				"options": {}
+			},
+			"id": "a91fc3d9-afb8-4c78-ad0b-2078639708da",
+			"name": "Date & Time1",
+			"type": "n8n-nodes-base.dateTime",
+			"typeVersion": 1,
+			"position": [360, 740]
+		},
+		{
+			"parameters": {
+				"keepOnlySet": true,
+				"values": {
+					"string": [
+						{
+							"name": "data",
+							"value": "={{ $json.data }}"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "370b58aa-555f-4dc7-9c48-564bddfcbe33",
+			"name": "Set2",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 2,
+			"position": [580, 740]
+		},
+		{
+			"parameters": {
+				"value": "={{ $json.dateUnix }}",
+				"options": {}
+			},
+			"id": "91d1e77d-3d25-4e87-9af8-f756ace4abcf",
+			"name": "Date & Time2",
+			"type": "n8n-nodes-base.dateTime",
+			"typeVersion": 1,
+			"position": [360, 940]
+		},
+		{
+			"parameters": {
+				"keepOnlySet": true,
+				"values": {
+					"string": [
+						{
+							"name": "data",
+							"value": "={{ $json.data }}"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "77cdf5fa-641e-46e1-8cb9-00160773b4b2",
+			"name": "Set3",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 2,
+			"position": [580, 940]
+		},
+		{
+			"parameters": {
+				"value": "={{ $json.dateMilisStr }}",
+				"options": {}
+			},
+			"id": "084e7b19-f03e-42a9-b4df-865f2f6610de",
+			"name": "Date & Time3",
+			"type": "n8n-nodes-base.dateTime",
+			"typeVersion": 1,
+			"position": [360, 1120]
+		},
+		{
+			"parameters": {
+				"keepOnlySet": true,
+				"values": {
+					"string": [
+						{
+							"name": "data",
+							"value": "={{ $json.data }}"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "eb46b668-2ebc-47ee-adca-a8f99205ac26",
+			"name": "Set4",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 2,
+			"position": [580, 1120]
+		},
+		{
+			"parameters": {
+				"value": "={{ $json.dateMilisFloatStr }}",
+				"options": {}
+			},
+			"id": "9cb46fb5-e6e4-4fb3-859a-8cd26bebf1c9",
+			"name": "Date & Time4",
+			"type": "n8n-nodes-base.dateTime",
+			"typeVersion": 1,
+			"position": [360, 1300]
+		},
+		{
+			"parameters": {
+				"keepOnlySet": true,
+				"values": {
+					"string": [
+						{
+							"name": "data",
+							"value": "={{ $json.data }}"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "0d09dc35-d572-41f5-984c-30a66184b80a",
+			"name": "Set5",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 2,
+			"position": [580, 1300]
+		},
+		{
+			"parameters": {
+				"value": "={{ $json.dateUnixStr }}",
+				"options": {}
+			},
+			"id": "208e26b1-db01-417b-b21f-fcb8198a1e27",
+			"name": "Date & Time5",
+			"type": "n8n-nodes-base.dateTime",
+			"typeVersion": 1,
+			"position": [360, 1480]
+		},
+		{
+			"parameters": {
+				"keepOnlySet": true,
+				"values": {
+					"string": [
+						{
+							"name": "data",
+							"value": "={{ $json.data }}"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "1076029a-91a7-4121-aadc-e9dde57b3d56",
+			"name": "Set6",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 2,
+			"position": [580, 1480]
+		}
+	],
+	"pinData": {
+		"Set1": [
+			{
+				"json": {
+					"data": "05/01/2023"
+				}
+			}
+		],
+		"Set2": [
+			{
+				"json": {
+					"data": "05/01/2023"
+				}
+			}
+		],
+		"Set4": [
+			{
+				"json": {
+					"data": "05/01/2023"
+				}
+			}
+		],
+		"Set5": [
+			{
+				"json": {
+					"data": "05/01/2023"
+				}
+			}
+		],
+		"Set6": [
+			{
+				"json": {
+					"data": "05/01/2023"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Set",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Set": {
+			"main": [
+				[
+					{
+						"node": "Date & Time",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Date & Time1",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Date & Time2",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Date & Time3",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Date & Time4",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Date & Time5",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Date & Time": {
+			"main": [
+				[
+					{
+						"node": "Set1",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Date & Time1": {
+			"main": [
+				[
+					{
+						"node": "Set2",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Date & Time2": {
+			"main": [
+				[
+					{
+						"node": "Set3",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Date & Time3": {
+			"main": [
+				[
+					{
+						"node": "Set4",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Date & Time4": {
+			"main": [
+				[
+					{
+						"node": "Set5",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Date & Time5": {
+			"main": [
+				[
+					{
+						"node": "Set6",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {},
+	"versionId": "d11f32bd-0d35-4aeb-9b0c-c4cac94f6445",
+	"id": "12",
+	"meta": {
+		"instanceId": "6ebec4953fe56f1c009e7c3b107578b375137523af057073c0b5da17350651bd"
+	},
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/DateTime/test/node/workflow.timestamp_v2.json b/packages/nodes-base/nodes/DateTime/test/node/workflow.timestamp_v2.json
new file mode 100644
index 0000000000000..0ca9ec5e9396c
--- /dev/null
+++ b/packages/nodes-base/nodes/DateTime/test/node/workflow.timestamp_v2.json
@@ -0,0 +1,352 @@
+{
+	"name": "dateTime overhaul",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "4ef93910-a6f8-43e2-bba7-8319ef62f9ee",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [260, 820]
+		},
+		{
+			"parameters": {
+				"values": {
+					"number": [
+						{
+							"name": "dateMilis",
+							"value": 1682918315906
+						},
+						{
+							"name": "dateMilisFloat",
+							"value": 1682918315.906
+						},
+						{
+							"name": "dateUnix",
+							"value": 1682918315
+						}
+					],
+					"string": [
+						{
+							"name": "dateMilisStr",
+							"value": "1682918315906"
+						},
+						{
+							"name": "dateMilisFloatStr",
+							"value": "1682918315.906"
+						},
+						{
+							"name": "dateUnixStr",
+							"value": "1682918315"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "1d9bc8b7-9c8d-40c8-92f2-e94ed50d0ae5",
+			"name": "Set",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 2,
+			"position": [420, 820]
+		},
+		{
+			"parameters": {
+				"operation": "formatDate",
+				"date": "={{ $json.dateMilis }}",
+				"format": "yyyy/MM/dd",
+				"outputFieldName": "data",
+				"additionalFields": {}
+			},
+			"id": "c07b9cbd-4aeb-4267-a1d3-b45ecadbd1cb",
+			"name": "Date & Time6",
+			"type": "n8n-nodes-base.dateTime",
+			"typeVersion": 2,
+			"position": [680, 640]
+		},
+		{
+			"parameters": {
+				"operation": "formatDate",
+				"date": "={{ $json.dateMilisFloat }}",
+				"format": "yyyy/MM/dd",
+				"outputFieldName": "data",
+				"additionalFields": {}
+			},
+			"id": "a5b7bb44-63e2-4b71-ad91-55bac329e3f6",
+			"name": "Date & Time",
+			"type": "n8n-nodes-base.dateTime",
+			"typeVersion": 2,
+			"position": [680, 780]
+		},
+		{
+			"parameters": {
+				"operation": "formatDate",
+				"date": "={{ $json.dateUnix }}",
+				"format": "yyyy/MM/dd",
+				"outputFieldName": "data",
+				"additionalFields": {}
+			},
+			"id": "1306d282-b5f8-4a54-8834-6207ecff65f7",
+			"name": "Date & Time1",
+			"type": "n8n-nodes-base.dateTime",
+			"typeVersion": 2,
+			"position": [680, 940]
+		},
+		{
+			"parameters": {
+				"operation": "formatDate",
+				"date": "={{ $json.dateMilisStr }}",
+				"format": "yyyy/MM/dd",
+				"outputFieldName": "data",
+				"additionalFields": {}
+			},
+			"id": "4823c095-1921-406e-9957-a75521bca1e5",
+			"name": "Date & Time2",
+			"type": "n8n-nodes-base.dateTime",
+			"typeVersion": 2,
+			"position": [680, 1080]
+		},
+		{
+			"parameters": {
+				"operation": "formatDate",
+				"date": "={{ $json.dateMilisFloatStr }}",
+				"format": "yyyy/MM/dd",
+				"outputFieldName": "data",
+				"additionalFields": {}
+			},
+			"id": "d209ac18-9935-4452-825a-42aa90daaaa5",
+			"name": "Date & Time3",
+			"type": "n8n-nodes-base.dateTime",
+			"typeVersion": 2,
+			"position": [680, 1220]
+		},
+		{
+			"parameters": {
+				"operation": "formatDate",
+				"date": "={{ $json.dateUnixStr }}",
+				"format": "yyyy/MM/dd",
+				"outputFieldName": "data",
+				"additionalFields": {}
+			},
+			"id": "b7065dfb-ae7e-4828-a5ea-e9c313302944",
+			"name": "Date & Time4",
+			"type": "n8n-nodes-base.dateTime",
+			"typeVersion": 2,
+			"position": [680, 1380]
+		},
+		{
+			"parameters": {},
+			"id": "5ae1bb29-d19e-4e3d-af11-ccc53ee23bfb",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [900, 640]
+		},
+		{
+			"parameters": {},
+			"id": "8716cc32-d4a6-48d6-af5d-e15646006dd8",
+			"name": "No Operation, do nothing1",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [900, 780]
+		},
+		{
+			"parameters": {},
+			"id": "88f0247d-ecc0-49a2-8bae-4e7b99ae8611",
+			"name": "No Operation, do nothing2",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [900, 920]
+		},
+		{
+			"parameters": {},
+			"id": "99a04c1d-5426-446e-9171-2d12a5b14a13",
+			"name": "No Operation, do nothing3",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [900, 1060]
+		},
+		{
+			"parameters": {},
+			"id": "923e317f-3e7b-4609-883d-c630034bd20c",
+			"name": "No Operation, do nothing4",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [900, 1200]
+		},
+		{
+			"parameters": {},
+			"id": "93745a80-a2b6-414b-bcf0-938f2a2da985",
+			"name": "No Operation, do nothing5",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [900, 1340]
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing5": [
+			{
+				"json": {
+					"data": "2023/05/01"
+				}
+			}
+		],
+		"No Operation, do nothing4": [
+			{
+				"json": {
+					"data": "2023/05/01"
+				}
+			}
+		],
+		"No Operation, do nothing3": [
+			{
+				"json": {
+					"data": "2023/05/01"
+				}
+			}
+		],
+		"No Operation, do nothing2": [
+			{
+				"json": {
+					"data": "2023/05/01"
+				}
+			}
+		],
+		"No Operation, do nothing1": [
+			{
+				"json": {
+					"data": "2023/05/01"
+				}
+			}
+		],
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"data": "2023/05/01"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Set",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Set": {
+			"main": [
+				[
+					{
+						"node": "Date & Time6",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Date & Time",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Date & Time1",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Date & Time2",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Date & Time3",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Date & Time4",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Date & Time6": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Date & Time4": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing5",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Date & Time3": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing4",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Date & Time2": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing3",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Date & Time1": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing2",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Date & Time": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing1",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {},
+	"versionId": "19282890-eff2-40ca-be11-a8fff559c964",
+	"id": "21",
+	"meta": {
+		"instanceId": "6ebec4953fe56f1c009e7c3b107578b375137523af057073c0b5da17350651bd"
+	},
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/DebugHelper/DebugHelper.node.json b/packages/nodes-base/nodes/DebugHelper/DebugHelper.node.json
new file mode 100644
index 0000000000000..0d29880dbfa24
--- /dev/null
+++ b/packages/nodes-base/nodes/DebugHelper/DebugHelper.node.json
@@ -0,0 +1,14 @@
+{
+	"node": "n8n-nodes-base.debughelper",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"categories": ["Development"],
+	"resources": {
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.debughelper/"
+			}
+		]
+	},
+	"alias": ["Mock", "Sample", "Demo", "Test", "Throw error", "OOM", "Out of Memory", "placeholder"]
+}
diff --git a/packages/nodes-base/nodes/DebugHelper/DebugHelper.node.ts b/packages/nodes-base/nodes/DebugHelper/DebugHelper.node.ts
new file mode 100644
index 0000000000000..6d657f66451d3
--- /dev/null
+++ b/packages/nodes-base/nodes/DebugHelper/DebugHelper.node.ts
@@ -0,0 +1,374 @@
+import type {
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+import { ApplicationError, NodeApiError, NodeOperationError } from 'n8n-workflow';
+import { setSeed, array as mfArray } from 'minifaker';
+import {
+	generateCreditCard,
+	generateIPv4,
+	generateIPv6,
+	generateLocation,
+	generateMAC,
+	generateNanoid,
+	generateRandomAddress,
+	generateRandomEmail,
+	generateRandomUser,
+	generateURL,
+	generateUUID,
+	generateVersion,
+} from './randomData';
+import { generateGarbageMemory, runGarbageCollector } from './functions';
+
+export class DebugHelper implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'DebugHelper',
+		name: 'debugHelper',
+		icon: 'file:DebugHelper.svg',
+		group: ['output'],
+		subtitle: '={{$parameter["category"]}}',
+		description: 'Causes problems intentionally and generates useful data for debugging',
+		version: 1,
+		defaults: {
+			name: 'DebugHelper',
+		},
+		inputs: ['main'],
+		outputs: ['main'],
+		credentials: [],
+		properties: [
+			{
+				displayName: 'Category',
+				name: 'category',
+				type: 'options',
+				noDataExpression: true,
+				options: [
+					{
+						name: 'Do Nothing',
+						value: 'doNothing',
+						description: 'Does nothing',
+					},
+					{
+						name: 'Throw Error',
+						value: 'throwError',
+						description: 'Throws an error with the specified type and message',
+					},
+					{
+						name: 'Out Of Memory',
+						value: 'oom',
+						description: 'Generates a large amount of memory to cause an out of memory error',
+					},
+					{
+						name: 'Generate Random Data',
+						value: 'randomData',
+						description: 'Generates random data sets',
+					},
+				],
+				default: 'throwError',
+			},
+			{
+				displayName: 'Error Type',
+				name: 'throwErrorType',
+				type: 'options',
+				noDataExpression: true,
+				options: [
+					{
+						name: 'NodeApiError',
+						value: 'NodeApiError',
+					},
+					{
+						name: 'NodeOperationError',
+						value: 'NodeOperationError',
+					},
+					{
+						name: 'Error',
+						value: 'Error',
+					},
+				],
+				default: 'NodeApiError',
+				displayOptions: {
+					show: {
+						category: ['throwError'],
+					},
+				},
+			},
+			{
+				displayName: 'Error Message',
+				name: 'throwErrorMessage',
+				type: 'string',
+				default: 'Node has thrown an error',
+				description: 'The message to send as part of the error',
+				displayOptions: {
+					show: {
+						category: ['throwError'],
+					},
+				},
+			},
+			{
+				displayName: 'Memory Size to Generate',
+				name: 'memorySizeValue',
+				type: 'number',
+				default: 10,
+				description: 'The approximate amount of memory to generate. Be generous...',
+				displayOptions: {
+					show: {
+						category: ['oom'],
+					},
+				},
+			},
+			{
+				displayName: 'Data Type',
+				name: 'randomDataType',
+				type: 'options',
+				noDataExpression: true,
+				options: [
+					{
+						name: 'Address',
+						value: 'address',
+					},
+					{
+						name: 'Coordinates',
+						value: 'latLong',
+					},
+					{
+						name: 'Credit Card',
+						value: 'creditCard',
+					},
+					{
+						name: 'Email',
+						value: 'email',
+					},
+					{
+						name: 'IPv4',
+						value: 'ipv4',
+					},
+					{
+						name: 'IPv6',
+						value: 'ipv6',
+					},
+					{
+						name: 'MAC',
+						value: 'macAddress',
+					},
+					{
+						name: 'NanoIds',
+						value: 'nanoid',
+					},
+					{
+						name: 'URL',
+						value: 'url',
+					},
+					{
+						name: 'User Data',
+						value: 'user',
+					},
+					{
+						name: 'UUID',
+						value: 'uuid',
+					},
+					{
+						name: 'Version',
+						value: 'semver',
+					},
+				],
+				default: 'user',
+				displayOptions: {
+					show: {
+						category: ['randomData'],
+					},
+				},
+			},
+			{
+				displayName: 'NanoId Alphabet',
+				name: 'nanoidAlphabet',
+				type: 'string',
+				default: '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ',
+				description: 'The alphabet to use for generating the nanoIds',
+				displayOptions: {
+					show: {
+						category: ['randomData'],
+						randomDataType: ['nanoid'],
+					},
+				},
+			},
+			{
+				displayName: 'NanoId Length',
+				name: 'nanoidLength',
+				type: 'string',
+				default: '16',
+				description: 'The length of each nanoIds',
+				displayOptions: {
+					show: {
+						category: ['randomData'],
+						randomDataType: ['nanoid'],
+					},
+				},
+			},
+			{
+				displayName: 'Seed',
+				name: 'randomDataSeed',
+				type: 'string',
+				default: '',
+				placeholder: 'Leave empty for random seed',
+				description:
+					'If set, seed to use for generating the data (same seed will generate the same data)',
+				displayOptions: {
+					show: {
+						category: ['randomData'],
+					},
+				},
+			},
+			{
+				displayName: 'Number of Items to Generate',
+				name: 'randomDataCount',
+				type: 'number',
+				default: 10,
+				description: 'The number of random data items to generate into an array',
+				displayOptions: {
+					show: {
+						category: ['randomData'],
+					},
+				},
+			},
+			{
+				displayName: 'Output as Single Array',
+				name: 'randomDataSingleArray',
+				type: 'boolean',
+				default: false,
+				description: 'Whether to output a single array instead of multiple items',
+				displayOptions: {
+					show: {
+						category: ['randomData'],
+					},
+				},
+			},
+		],
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = this.getInputData();
+		const returnData: INodeExecutionData[] = [];
+		const category = this.getNodeParameter('category', 0) as string;
+
+		for (let i = 0; i < items.length; i++) {
+			try {
+				switch (category) {
+					case 'doNothing':
+						// as it says on the tin...
+						break;
+					case 'throwError':
+						const throwErrorType = this.getNodeParameter('throwErrorType', 0) as string;
+						const throwErrorMessage = this.getNodeParameter('throwErrorMessage', 0) as string;
+						switch (throwErrorType) {
+							case 'NodeApiError':
+								throw new NodeApiError(
+									this.getNode(),
+									{ message: throwErrorMessage },
+									{ message: throwErrorMessage },
+								);
+							case 'NodeOperationError':
+								throw new NodeOperationError(this.getNode(), throwErrorMessage, {
+									message: throwErrorMessage,
+								});
+							case 'Error':
+								// eslint-disable-next-line n8n-nodes-base/node-execute-block-wrong-error-thrown
+								throw new ApplicationError(throwErrorMessage);
+							default:
+								break;
+						}
+					case 'oom':
+						const memorySizeValue = this.getNodeParameter('memorySizeValue', 0) as number;
+						runGarbageCollector();
+						const memUsed = generateGarbageMemory(memorySizeValue);
+						items[i].json = memUsed;
+						returnData.push(items[i]);
+						break;
+					case 'randomData':
+						const randomDataType = this.getNodeParameter('randomDataType', 0) as string;
+						const randomDataCount = this.getNodeParameter('randomDataCount', 0) as number;
+						const randomDataSeed = this.getNodeParameter('randomDataSeed', 0) as string;
+						const randomDataSingleArray = this.getNodeParameter(
+							'randomDataSingleArray',
+							0,
+						) as boolean;
+						const newItem: INodeExecutionData = {
+							json: {},
+							pairedItem: { item: i },
+						};
+						if (randomDataSeed !== '') {
+							setSeed(randomDataSeed);
+						}
+
+						let randomFn: () => any = generateRandomUser;
+						switch (randomDataType) {
+							case 'user':
+								randomFn = generateRandomUser;
+								break;
+							case 'email':
+								randomFn = generateRandomEmail;
+								break;
+							case 'address':
+								randomFn = generateRandomAddress;
+								break;
+							case 'creditCard':
+								randomFn = generateCreditCard;
+								break;
+							case 'uuid':
+								randomFn = generateUUID;
+								break;
+							case 'macAddress':
+								randomFn = generateMAC;
+								break;
+							case 'ipv4':
+								randomFn = generateIPv4;
+								break;
+							case 'ipv6':
+								randomFn = generateIPv6;
+								break;
+							case 'latLong':
+								randomFn = generateLocation;
+								break;
+							case 'semver':
+								randomFn = generateVersion;
+								break;
+							case 'url':
+								randomFn = generateURL;
+								break;
+							case 'nanoid':
+								const nanoidAlphabet = this.getNodeParameter('nanoidAlphabet', 0) as string;
+								const nanoidLength = this.getNodeParameter('nanoidLength', 0) as string;
+								randomFn = () => generateNanoid(nanoidAlphabet, nanoidLength);
+								break;
+						}
+						const generatedItems = mfArray(randomDataCount, randomFn);
+						if (randomDataSingleArray) {
+							newItem.json = { generatedItems };
+							returnData.push(newItem);
+						} else {
+							for (const generatedItem of generatedItems) {
+								returnData.push({
+									json: generatedItem,
+									pairedItem: { item: i },
+								});
+							}
+						}
+						break;
+					default:
+						break;
+				}
+			} 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;
+			}
+		}
+		return [returnData];
+	}
+}
diff --git a/packages/nodes-base/nodes/DebugHelper/DebugHelper.svg b/packages/nodes-base/nodes/DebugHelper/DebugHelper.svg
new file mode 100644
index 0000000000000..b1a62f59e0379
--- /dev/null
+++ b/packages/nodes-base/nodes/DebugHelper/DebugHelper.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="800" height="800" viewBox="0 0 512 512"><path d="M345 167c32.953 0 46.333 40.047 46.333 73v100.333c0 74.375-60.292 134.667-134.667 134.667C182.292 475 122 414.708 122 340.333V240c0-32.953 13.38-73 46.333-73z" style="fill:#f4a026"/><path d="M309 200.333H204.333C185.372 200.333 170 184.961 170 166c0-39.948 32.385-72.333 72.333-72.333H271c39.948 0 72.333 32.385 72.333 72.333 0 18.961-15.372 34.333-34.333 34.333" style="fill:#ca463d"/><path d="M498.667 290.667H404V240c0-1.016.313-2.036.291-3.055C452.4 231.927 480 200.272 480 148.333v-12c0-7.364-5.971-13.333-13.333-13.333s-13.333 5.969-13.333 13.333v12c0 38.399-17.005 58.821-51.885 62.167-6.069-27.025-20.875-50.381-45.537-55.7-3.745-28.54-21.413-52.689-46.115-65.227 10.321-10.501 16.871-24.887 16.871-40.74V37c0-7.364-5.971-13.333-13.333-13.333S300 29.636 300 37v11.833C300 66.203 285.536 80 268.167 80h-23c-17.369 0-31.833-13.797-31.833-31.167V37c0-7.364-5.971-13.333-13.333-13.333S186.667 29.636 186.667 37v11.833c0 15.853 6.549 30.239 16.871 40.741-24.701 12.537-42.453 36.687-46.199 65.227-24.695 5.324-39.465 28.736-45.519 55.808-35.759-2.96-53.153-23.403-53.153-62.276v-12c0-7.364-5.971-13.333-13.333-13.333S32 128.969 32 136.333v12c0 52.415 27.439 84.168 76.375 88.739-.022.976-.375 1.953-.375 2.928v50.667H13.333C5.971 290.667 0 296.636 0 304s5.971 13.333 13.333 13.333H108v23c0 10.628 1.469 20.993 3.608 30.992C60.659 374.777 32 406.773 32 460.333v12c0 7.364 5.971 13.333 13.333 13.333s13.333-5.969 13.333-13.333v-12c0-41.795 20.151-62.291 61.565-62.649 22.451 53.208 75.151 90.649 136.435 90.649 61.276 0 113.971-37.432 136.425-90.629 40.519.784 60.241 21.283 60.241 62.629v12c0 7.364 5.971 13.333 13.333 13.333S480 479.697 480 472.333v-12c0-53.1-28.823-85.013-78.96-88.921 2.151-10.025 2.96-20.421 2.96-31.079v-23h94.667c7.363 0 13.333-5.969 13.333-13.333s-5.971-13.333-13.333-13.333m-256.334-184H271c32.532 0 59 26.468 59 59 0 11.58-9.42 21-21 21H204.333c-11.58 0-21-9.42-21-21 0-32.532 26.468-59 59-59M134.667 340.333V240c0-20.793 6.948-50.531 24.483-58.035 6.627 18.368 24.56 31.368 45.184 31.368h38.333v247.521c-60.334-6.963-108-58.353-108-120.521m134.666 120.674V213.333H309c20.624 0 37.891-13 44.517-31.368 17.535 7.504 23.816 37.241 23.816 58.035v100.333c0 62.627-47.026 114.32-108 120.674"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/DebugHelper/functions.ts b/packages/nodes-base/nodes/DebugHelper/functions.ts
new file mode 100644
index 0000000000000..a740b577b708f
--- /dev/null
+++ b/packages/nodes-base/nodes/DebugHelper/functions.ts
@@ -0,0 +1,30 @@
+import { setFlagsFromString } from 'v8';
+import { runInNewContext } from 'vm';
+
+export const runGarbageCollector = () => {
+	try {
+		setFlagsFromString('--expose_gc');
+		const gc = runInNewContext('gc'); // nocommit
+		gc();
+	} catch (error) {
+		console.log(error);
+	}
+};
+
+export const generateGarbageMemory = (sizeInMB: number, onHeap = true) => {
+	const divider = onHeap ? 8 : 1;
+	const size = Math.max(1, Math.floor((sizeInMB * 1024 * 1024) / divider));
+	if (onHeap) {
+		// arrays are allocated on the heap
+		// size in this case is only an approximation...
+		const array = Array(size);
+		array.fill(0);
+	} else {
+		const array = new Uint8Array(size);
+		array.fill(0);
+	}
+	// const used = process.memoryUsage().heapUsed / 1024 / 1024;
+	// const external = process.memoryUsage().external / 1024 / 1024;
+	// console.log(`heap: ${used} MB / external: ${external} MB`);
+	return { ...process.memoryUsage() };
+};
diff --git a/packages/nodes-base/nodes/DebugHelper/randomData.ts b/packages/nodes-base/nodes/DebugHelper/randomData.ts
new file mode 100644
index 0000000000000..14234e6fb0ef7
--- /dev/null
+++ b/packages/nodes-base/nodes/DebugHelper/randomData.ts
@@ -0,0 +1,101 @@
+import {
+	firstName,
+	lastName,
+	streetAddress,
+	cityName,
+	zipCode,
+	state,
+	country,
+	password,
+	creditCardNumber,
+	creditCardCVV,
+	email,
+	boolean,
+	uuid,
+	nanoId,
+	domainUrl,
+	semver,
+	latLong,
+	macAddress,
+	ip,
+	ipv6,
+	number,
+} from 'minifaker';
+import 'minifaker/locales/en';
+
+export function generateRandomUser() {
+	return {
+		uid: uuid.v4(),
+		email: email(),
+		firstname: firstName(),
+		lastname: lastName(),
+		password: password(),
+	};
+}
+
+export function generateRandomAddress() {
+	return {
+		firstname: firstName(),
+		lastname: lastName(),
+		street: streetAddress(),
+		city: cityName(),
+		zip: zipCode({ format: '#####' }),
+		state: state(),
+		country: country(),
+	};
+}
+
+export function generateRandomEmail() {
+	return {
+		email: email(),
+		confirmed: boolean(),
+	};
+}
+
+export function generateUUID() {
+	return { uuid: uuid.v4() };
+}
+
+export function generateNanoid(customAlphabet: string, length: string) {
+	return { nanoId: nanoId.customAlphabet(customAlphabet, parseInt(length, 10))().toString() };
+}
+
+export function generateCreditCard() {
+	return {
+		type: boolean() ? 'MasterCard' : 'Visa',
+		number: creditCardNumber(),
+		ccv: creditCardCVV(),
+		exp: `${number({ min: 1, max: 12, float: false }).toString().padStart(2, '0')}/${number({
+			min: 1,
+			max: 40,
+			float: false,
+		})
+			.toString()
+			.padStart(2, '0')}`,
+		holder_name: `${firstName()} ${lastName()}`,
+	};
+}
+
+export function generateURL() {
+	return { url: domainUrl() };
+}
+
+export function generateIPv4() {
+	return { ip: ip() };
+}
+
+export function generateIPv6() {
+	return { ipv6: ipv6() };
+}
+
+export function generateMAC() {
+	return { mac: macAddress() };
+}
+
+export function generateLocation() {
+	return { location: latLong() };
+}
+
+export function generateVersion() {
+	return { version: semver() };
+}
diff --git a/packages/nodes-base/nodes/DeepL/GenericFunctions.ts b/packages/nodes-base/nodes/DeepL/GenericFunctions.ts
index 4193e867072d5..649096fc00661 100644
--- a/packages/nodes-base/nodes/DeepL/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/DeepL/GenericFunctions.ts
@@ -1,17 +1,16 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	ILoadOptionsFunctions,
 	IDataObject,
 	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function deepLApiRequest(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 	body: IDataObject = {},
 	qs: IDataObject = {},
@@ -23,7 +22,7 @@ export async function deepLApiRequest(
 
 	const credentials = await this.getCredentials('deepLApi');
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			'Content-Type': 'application/x-www-form-urlencoded',
 		},
diff --git a/packages/nodes-base/nodes/DeepL/deepl.svg b/packages/nodes-base/nodes/DeepL/deepl.svg
index 0738c3c7666f8..889cf28b77717 100644
--- a/packages/nodes-base/nodes/DeepL/deepl.svg
+++ b/packages/nodes-base/nodes/DeepL/deepl.svg
@@ -1 +1 @@
-<svg height="64" width="64" xmlns="http://www.w3.org/2000/svg"><path d="M54.579 12.268L34.204.643a4.781 4.781 0 00-4.5 0L9.329 12.268c-1.375.75-2.25 2.25-2.25 3.875v23.75c0 1.625.875 3.125 2.25 3.875l35.125 20.25V49.643l10.125-5.875c1.375-.75 2.25-2.25 2.25-3.875v-23.75c.125-1.625-.875-3.125-2.25-3.875zm-25.75 26.125c0 2.375-1.875 4.25-4.25 4.25s-4.25-1.875-4.25-4.25 1.875-4.25 4.25-4.25c1.125 0 2 .375 2.75 1l7.5-4.25c.375.875.875 1.75 1.375 2.5l-7.5 4.25c.125.25.125.5.125.75zm13-5.625a4.215 4.215 0 01-4.25-4.25c0-.25 0-.5.125-.75l-10.25-5.875c-.75.625-1.75 1-2.75 1-2.375 0-4.25-1.875-4.25-4.25s1.875-4.25 4.25-4.25 4.25 1.875 4.25 4.25c0 .25 0 .5-.125.75l10.25 5.875c.75-.625 1.75-1.125 2.875-1.125a4.215 4.215 0 014.25 4.25c-.125 2.375-2 4.375-4.375 4.375z" fill="#042b48"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><path fill="#042b48" d="M54.579 12.268 34.204.643a4.78 4.78 0 0 0-4.5 0L9.329 12.268c-1.375.75-2.25 2.25-2.25 3.875v23.75c0 1.625.875 3.125 2.25 3.875l35.125 20.25V49.643l10.125-5.875c1.375-.75 2.25-2.25 2.25-3.875v-23.75c.125-1.625-.875-3.125-2.25-3.875m-25.75 26.125c0 2.375-1.875 4.25-4.25 4.25s-4.25-1.875-4.25-4.25 1.875-4.25 4.25-4.25c1.125 0 2 .375 2.75 1l7.5-4.25c.375.875.875 1.75 1.375 2.5l-7.5 4.25c.125.25.125.5.125.75m13-5.625a4.215 4.215 0 0 1-4.25-4.25c0-.25 0-.5.125-.75l-10.25-5.875c-.75.625-1.75 1-2.75 1-2.375 0-4.25-1.875-4.25-4.25s1.875-4.25 4.25-4.25 4.25 1.875 4.25 4.25c0 .25 0 .5-.125.75l10.25 5.875c.75-.625 1.75-1.125 2.875-1.125a4.215 4.215 0 0 1 4.25 4.25c-.125 2.375-2 4.375-4.375 4.375"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Demio/GenericFunctions.ts b/packages/nodes-base/nodes/Demio/GenericFunctions.ts
index db2e63ed3730c..17c113be7fad8 100644
--- a/packages/nodes-base/nodes/Demio/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Demio/GenericFunctions.ts
@@ -1,18 +1,17 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	JsonObject,
+	IRequestOptions,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function demioApiRequest(
-	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -22,7 +21,7 @@ export async function demioApiRequest(
 ): Promise<any> {
 	try {
 		const credentials = await this.getCredentials('demioApi');
-		let options: OptionsWithUri = {
+		let options: IRequestOptions = {
 			headers: {
 				'Api-Key': credentials.apiKey,
 				'Api-Secret': credentials.apiSecret,
diff --git a/packages/nodes-base/nodes/Demio/demio.svg b/packages/nodes-base/nodes/Demio/demio.svg
index 3698f1e463209..e853de9ce1a81 100644
--- a/packages/nodes-base/nodes/Demio/demio.svg
+++ b/packages/nodes-base/nodes/Demio/demio.svg
@@ -1 +1 @@
-<svg viewBox="45 55 310 310" xmlns="http://www.w3.org/2000/svg"><path d="M186.014 72.737c-5.011.543-9.553 1.267-9.99 1.592-.22.163-2.055.596-4.078.962-3.435.622-16.058 4.437-16.501 4.987-.11.136-1.189.591-2.398 1.011-2.083.723-10.409 4.656-12.987 6.134-3.401 1.951-8.416 5.034-8.591 5.282-.11.155-.65.516-1.199.801-1.337.694-5.62 3.794-8.147 5.895-1.124.935-2.64 2.193-3.37 2.797-2.798 2.315-14.9 14.608-15.474 15.717-.331.641-.763 1.166-.959 1.166-.196 0-.719.584-1.162 1.299-.443.714-1.169 1.687-1.613 2.161-.444.475-1.443 1.856-2.219 3.071-.777 1.214-1.597 2.321-1.823 2.461-.225.139-.761.941-1.19 1.783-.429.841-1.011 1.773-1.293 2.07-.282.298-1.042 1.529-1.689 2.735-.647 1.207-1.571 2.778-2.055 3.49-.484.713-1.213 2.108-1.621 3.1-.408.991-.85 1.804-.982 1.804-.132.001-.737 1.216-1.344 2.699a127.76 127.76 0 01-2.458 5.525c-.744 1.554-1.353 3.086-1.353 3.402 0 .317-.352 1.233-.782 2.036-.431.804-1.251 3.139-1.823 5.189-.572 2.051-1.207 4.088-1.41 4.528-.573 1.236-1.409 4.801-2.157 9.19-.374 2.198-.848 4.356-1.052 4.796-1.77 3.802-3.04 113.303-1.423 122.672 1.257 7.287 4.856 12.927 12.079 18.934 3.185 2.648 8.829 4.7 14.425 5.244 5.107.497 92.915.503 103.422.008 8.183-.386 16.956-1.328 18.382-1.974.439-.199 1.968-.57 3.396-.824 3.535-.628 9.301-2.031 9.791-2.382.219-.157 1.838-.697 3.596-1.198 1.758-.502 3.736-1.155 4.396-1.451.659-.296 2.723-1.095 4.586-1.775 1.863-.681 3.481-1.363 3.596-1.517.115-.154 1.288-.707 2.607-1.228 1.319-.522 2.847-1.232 3.396-1.578.55-.347 2.168-1.222 3.597-1.945 1.428-.724 3.856-2.113 5.394-3.087a287.642 287.642 0 014.896-3.027c1.153-.69 2.097-1.421 2.097-1.625 0-.204.188-.37.417-.37.229 0 1.421-.765 2.649-1.699a141.244 141.244 0 013.079-2.291c.467-.325 2.287-1.832 4.045-3.348 7.841-6.76 14.897-14.283 20.853-22.233.906-1.209 1.979-2.75 2.385-3.425.406-.676 1.625-2.564 2.709-4.196 1.083-1.633 2.49-3.999 3.125-5.26.635-1.26 1.295-2.378 1.466-2.484.171-.106.915-1.592 1.653-3.303.738-1.71 1.455-3.2 1.594-3.31.138-.11.756-1.548 1.373-3.197.616-1.648 1.283-3.205 1.482-3.459.373-.479 2.321-6.36 2.321-7.008 0-.201.35-1.133.777-2.07.427-.938 1.256-4.12 1.841-7.071.585-2.952 1.217-5.726 1.404-6.166 1.588-3.739 2.474-23.654 1.55-34.843-.644-7.801-3.395-22.204-4.792-25.097-.213-.439-.82-2.238-1.349-3.996-.992-3.295-4.181-11.434-4.619-11.788-.136-.11-.561-1.009-.944-1.998-.383-.989-1.003-2.358-1.378-3.041a363.68 363.68 0 01-2.231-4.196c-.852-1.624-1.681-3.043-1.842-3.153-.161-.11-.614-.829-1.005-1.598-.392-.769-1.496-2.5-2.454-3.847-.957-1.347-1.741-2.641-1.741-2.877 0-.236-.241-.573-.536-.749-.295-.175-.875-.859-1.289-1.518-2.571-4.098-14.001-16.5-19.369-21.017-4.082-3.435-6.643-5.456-7.479-5.904a7.471 7.471 0 01-1.463-1.074c-.878-.878-7.699-5.372-8.153-5.372-.206 0-.561-.225-.79-.5-.228-.276-1.644-1.124-3.146-1.885-1.501-.761-2.825-1.515-2.941-1.677-.116-.161-1.555-.862-3.197-1.557-1.642-.694-3.18-1.419-3.417-1.61-.237-.191-1.675-.816-3.196-1.388-1.522-.573-3.716-1.475-4.876-2.006-1.16-.531-2.26-.965-2.443-.965-.184 0-2.123-.602-4.31-1.337-2.188-.735-6.033-1.742-8.546-2.238-2.513-.496-4.929-1.066-5.368-1.266-3.1-1.41-29.712-2.48-38.362-1.543m21.408 46.586c3.502.597 11.586 3.514 13.157 4.747.33.258 1.463.963 2.517 1.565 2.322 1.326 9.521 8.152 10.729 10.173.478.8 1.189 1.814 1.58 2.254 1.463 1.646 4.354 8.1 5.193 11.588.475 1.978 1.065 4.029 1.312 4.556.68 1.459.631 51.261-.052 51.488-.275.092-.499.558-.499 1.035 0 7.229-9.675 22.237-17.172 26.638-.936.549-2.029 1.302-2.429 1.672-.4.371-2.043 1.246-3.65 1.947-1.608.7-3.103 1.41-3.323 1.579-4.574 3.514-23.807 2.909-32.061-1.008-1.614-.766-3.079-1.393-3.257-1.393-.177 0-.648-.36-1.045-.799-.398-.44-.879-.8-1.07-.8-.653 0-3.705-2.197-4.856-3.496-.632-.714-1.401-1.299-1.708-1.299-.307 0-.558-.143-.558-.319 0-.175-.675-1.031-1.499-1.9-2.217-2.34-4.656-5.726-5.899-8.191-.604-1.197-1.228-2.267-1.386-2.377-.415-.288-1.812-4.227-2.409-6.793-.282-1.209-.653-2.291-.825-2.404-1.191-.783-1.617-50.057-.466-53.94 2.851-9.621 2.728-9.294 5.092-13.572.785-1.42 1.556-2.679 1.713-2.797.158-.118.791-.959 1.408-1.869 1.195-1.761 5.312-5.927 8.239-8.335 1.619-1.332 2.477-1.87 6.174-3.872 7.636-4.135 17.759-5.661 27.05-4.078m-14.415 14.587c-3.653.969-5.667 1.685-6.178 2.195-.307.307-.665.558-.795.558-.35 0-3.383 2.047-4.736 3.197-2.173 1.846-5.719 6.641-6.675 9.025-.521 1.3-1.095 2.466-1.277 2.59-1.441.991-2.355 44.928-1.096 52.686 1.478 9.111 9.321 18.2 17.96 20.813 1.648.499 3.429 1.107 3.957 1.353 1.296.602 10.537.585 11.271-.021.306-.253 1.244-.589 2.085-.746 1.998-.373 4.933-1.496 5.786-2.214.373-.313 1.127-.773 1.676-1.023 4.096-1.861 11.189-11.174 11.189-14.689 0-.316.176-.634.392-.708 1.777-.604 1.779-54.279.002-54.279-.162 0-.403-.542-.535-1.205-.328-1.636-2.226-5.588-2.685-5.588-.204 0-.371-.286-.371-.635 0-.966-6.47-7.156-8.342-7.983-.907-.399-1.648-.847-1.648-.995 0-.368-3.153-1.542-5.914-2.202-2.593-.619-11.895-.705-14.066-.129m10.973 27.778c3.089 2.359 3.013 1.807 3.013 21.98v17.86l-1.016 1.734c-2.654 4.528-9.599 4.385-12.05-.249l-.92-1.74v-17.732c0-19.722-.031-19.472 2.646-21.57 2.97-2.329 5.533-2.416 8.327-.283m65.79 55.723c3.829 2.727 4.95 6.8 2.935 10.663-.315.603-.573 1.327-.575 1.609-.006 1.408-3.042 9.02-4.975 12.475-2.169 3.877-3.594 6.142-4.438 7.052-.538.581-.979 1.207-.979 1.391 0 .938-10.79 11.864-14.186 14.365-3.174 2.337-9.438 6.363-9.899 6.363-.202 0-.9.379-1.551.843-.651.464-2.562 1.374-4.246 2.022-1.683.648-3.246 1.328-3.472 1.51-.737.594-10.299 3.283-14.398 4.049-8.227 1.539-22.502 1.399-30.37-.295a413.861 413.861 0 00-3.196-.681 2.975 2.975 0 01-.8-.32c-.219-.134-1.902-.629-3.739-1.102-1.837-.473-3.995-1.191-4.795-1.597-.801-.405-2.714-1.232-4.253-1.836-1.538-.605-3.067-1.319-3.396-1.587-.33-.268-1.67-1.009-2.978-1.646-1.308-.637-2.694-1.466-3.08-1.841-.386-.376-1.429-1.054-2.317-1.507-.889-.453-1.615-.972-1.615-1.154 0-.182-.35-.493-.778-.691-2.639-1.225-11.242-9.9-15.416-15.545-1.305-1.766-5.385-8.435-5.385-8.804 0-.128-.54-1.322-1.201-2.654-5.25-10.582-5.176-17.183.215-19.284 4.739-1.846 8.566.514 10.16 6.265 1.038 3.748 3.212 8.729 5.545 12.707 3.117 5.315 12.606 15.565 14.41 15.565.243 0 .442.172.442.383 0 .211.854.87 1.898 1.465 1.044.595 2.257 1.389 2.697 1.765 1.046.893 8.848 4.654 10.39 5.009.659.151 1.93.601 2.825.999 5.355 2.382 25.756 3.641 33.139 2.045 4.764-1.03 7.6-1.762 7.992-2.062.219-.169 1.388-.622 2.597-1.006 2.622-.833 9.685-4.33 11.426-5.657.68-.519 1.415-.943 1.632-.943.217 0 .92-.534 1.561-1.187.641-.654 1.353-1.193 1.582-1.199.824-.022 9.881-9.227 11.216-11.4.405-.659.861-1.29 1.012-1.402.28-.205 2.506-3.99 3.641-6.19 1.034-2.004 1.896-4.19 1.896-4.809 0-.322.153-.586.34-.586.188 0 .65-1.214 1.029-2.697 1.708-6.693 1.729-6.732 4.647-8.662 2.425-1.605 4.744-1.673 6.811-.201" fill="#00bf6f" fill-rule="evenodd"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="45 55 310 310"><path fill="#00bf6f" fill-rule="evenodd" d="M186.014 72.737c-5.011.543-9.553 1.267-9.99 1.592-.22.163-2.055.596-4.078.962-3.435.622-16.058 4.437-16.501 4.987-.11.136-1.189.591-2.398 1.011-2.083.723-10.409 4.656-12.987 6.134-3.401 1.951-8.416 5.034-8.591 5.282-.11.155-.65.516-1.199.801-1.337.694-5.62 3.794-8.147 5.895-1.124.935-2.64 2.193-3.37 2.797-2.798 2.315-14.9 14.608-15.474 15.717-.331.641-.763 1.166-.959 1.166s-.719.584-1.162 1.299c-.443.714-1.169 1.687-1.613 2.161-.444.475-1.443 1.856-2.219 3.071-.777 1.214-1.597 2.321-1.823 2.461s-.761.941-1.19 1.783c-.429.841-1.011 1.773-1.293 2.07-.282.298-1.042 1.529-1.689 2.735-.647 1.207-1.571 2.778-2.055 3.49s-1.213 2.108-1.621 3.1c-.408.991-.85 1.804-.982 1.804-.132.001-.737 1.216-1.344 2.699a128 128 0 0 1-2.458 5.525c-.744 1.554-1.353 3.086-1.353 3.402s-.352 1.233-.782 2.036c-.431.804-1.251 3.139-1.823 5.189s-1.207 4.088-1.41 4.528c-.573 1.236-1.409 4.801-2.157 9.19-.374 2.198-.848 4.356-1.052 4.796-1.77 3.802-3.04 113.303-1.423 122.672 1.257 7.287 4.856 12.927 12.079 18.934 3.185 2.648 8.829 4.7 14.425 5.244 5.107.497 92.915.503 103.422.008 8.183-.386 16.956-1.328 18.382-1.974.439-.199 1.968-.57 3.396-.824 3.535-.628 9.301-2.031 9.791-2.382.219-.157 1.838-.697 3.596-1.198 1.758-.502 3.736-1.155 4.396-1.451s2.723-1.095 4.586-1.775c1.863-.681 3.481-1.363 3.596-1.517s1.288-.707 2.607-1.228c1.319-.522 2.847-1.232 3.396-1.578.55-.347 2.168-1.222 3.597-1.945s3.856-2.113 5.394-3.087a288 288 0 0 1 4.896-3.027c1.153-.69 2.097-1.421 2.097-1.625s.188-.37.417-.37 1.421-.765 2.649-1.699a141 141 0 0 1 3.079-2.291c.467-.325 2.287-1.832 4.045-3.348 7.841-6.76 14.897-14.283 20.853-22.233.906-1.209 1.979-2.75 2.385-3.425.406-.676 1.625-2.564 2.709-4.196 1.083-1.633 2.49-3.999 3.125-5.26s1.295-2.378 1.466-2.484.915-1.592 1.653-3.303 1.455-3.2 1.594-3.31c.138-.11.756-1.548 1.373-3.197.616-1.648 1.283-3.205 1.482-3.459.373-.479 2.321-6.36 2.321-7.008 0-.201.35-1.133.777-2.07.427-.938 1.256-4.12 1.841-7.071.585-2.952 1.217-5.726 1.404-6.166 1.588-3.739 2.474-23.654 1.55-34.843-.644-7.801-3.395-22.204-4.792-25.097-.213-.439-.82-2.238-1.349-3.996-.992-3.295-4.181-11.434-4.619-11.788-.136-.11-.561-1.009-.944-1.998s-1.003-2.358-1.378-3.041a364 364 0 0 1-2.231-4.196c-.852-1.624-1.681-3.043-1.842-3.153s-.614-.829-1.005-1.598c-.392-.769-1.496-2.5-2.454-3.847-.957-1.347-1.741-2.641-1.741-2.877s-.241-.573-.536-.749c-.295-.175-.875-.859-1.289-1.518-2.571-4.098-14.001-16.5-19.369-21.017-4.082-3.435-6.643-5.456-7.479-5.904a7.5 7.5 0 0 1-1.463-1.074c-.878-.878-7.699-5.372-8.153-5.372-.206 0-.561-.225-.79-.5-.228-.276-1.644-1.124-3.146-1.885-1.501-.761-2.825-1.515-2.941-1.677-.116-.161-1.555-.862-3.197-1.557-1.642-.694-3.18-1.419-3.417-1.61s-1.675-.816-3.196-1.388c-1.522-.573-3.716-1.475-4.876-2.006s-2.26-.965-2.443-.965-2.123-.602-4.31-1.337c-2.188-.735-6.033-1.742-8.546-2.238s-4.929-1.066-5.368-1.266c-3.1-1.41-29.712-2.48-38.362-1.543m21.408 46.586c3.502.597 11.586 3.514 13.157 4.747.33.258 1.463.963 2.517 1.565 2.322 1.326 9.521 8.152 10.729 10.173.478.8 1.189 1.814 1.58 2.254 1.463 1.646 4.354 8.1 5.193 11.588.475 1.978 1.065 4.029 1.312 4.556.68 1.459.631 51.261-.052 51.488-.275.092-.499.558-.499 1.035 0 7.229-9.675 22.237-17.172 26.638-.936.549-2.029 1.302-2.429 1.672-.4.371-2.043 1.246-3.65 1.947-1.608.7-3.103 1.41-3.323 1.579-4.574 3.514-23.807 2.909-32.061-1.008-1.614-.766-3.079-1.393-3.257-1.393s-.648-.36-1.045-.799c-.398-.44-.879-.8-1.07-.8-.653 0-3.705-2.197-4.856-3.496-.632-.714-1.401-1.299-1.708-1.299s-.558-.143-.558-.319c0-.175-.675-1.031-1.499-1.9-2.217-2.34-4.656-5.726-5.899-8.191-.604-1.197-1.228-2.267-1.386-2.377-.415-.288-1.812-4.227-2.409-6.793-.282-1.209-.653-2.291-.825-2.404-1.191-.783-1.617-50.057-.466-53.94 2.851-9.621 2.728-9.294 5.092-13.572.785-1.42 1.556-2.679 1.713-2.797s.791-.959 1.408-1.869c1.195-1.761 5.312-5.927 8.239-8.335 1.619-1.332 2.477-1.87 6.174-3.872 7.636-4.135 17.759-5.661 27.05-4.078m-14.415 14.587c-3.653.969-5.667 1.685-6.178 2.195-.307.307-.665.558-.795.558-.35 0-3.383 2.047-4.736 3.197-2.173 1.846-5.719 6.641-6.675 9.025-.521 1.3-1.095 2.466-1.277 2.59-1.441.991-2.355 44.928-1.096 52.686 1.478 9.111 9.321 18.2 17.96 20.813 1.648.499 3.429 1.107 3.957 1.353 1.296.602 10.537.585 11.271-.021.306-.253 1.244-.589 2.085-.746 1.998-.373 4.933-1.496 5.786-2.214.373-.313 1.127-.773 1.676-1.023 4.096-1.861 11.189-11.174 11.189-14.689 0-.316.176-.634.392-.708 1.777-.604 1.779-54.279.002-54.279-.162 0-.403-.542-.535-1.205-.328-1.636-2.226-5.588-2.685-5.588-.204 0-.371-.286-.371-.635 0-.966-6.47-7.156-8.342-7.983-.907-.399-1.648-.847-1.648-.995 0-.368-3.153-1.542-5.914-2.202-2.593-.619-11.895-.705-14.066-.129m10.973 27.778c3.089 2.359 3.013 1.807 3.013 21.98v17.86l-1.016 1.734c-2.654 4.528-9.599 4.385-12.05-.249l-.92-1.74v-17.732c0-19.722-.031-19.472 2.646-21.57 2.97-2.329 5.533-2.416 8.327-.283m65.79 55.723c3.829 2.727 4.95 6.8 2.935 10.663-.315.603-.573 1.327-.575 1.609-.006 1.408-3.042 9.02-4.975 12.475-2.169 3.877-3.594 6.142-4.438 7.052-.538.581-.979 1.207-.979 1.391 0 .938-10.79 11.864-14.186 14.365-3.174 2.337-9.438 6.363-9.899 6.363-.202 0-.9.379-1.551.843s-2.562 1.374-4.246 2.022c-1.683.648-3.246 1.328-3.472 1.51-.737.594-10.299 3.283-14.398 4.049-8.227 1.539-22.502 1.399-30.37-.295a414 414 0 0 0-3.196-.681 3 3 0 0 1-.8-.32c-.219-.134-1.902-.629-3.739-1.102s-3.995-1.191-4.795-1.597c-.801-.405-2.714-1.232-4.253-1.836-1.538-.605-3.067-1.319-3.396-1.587-.33-.268-1.67-1.009-2.978-1.646s-2.694-1.466-3.08-1.841c-.386-.376-1.429-1.054-2.317-1.507s-1.615-.972-1.615-1.154-.35-.493-.778-.691c-2.639-1.225-11.242-9.9-15.416-15.545-1.305-1.766-5.385-8.435-5.385-8.804 0-.128-.54-1.322-1.201-2.654-5.25-10.582-5.176-17.183.215-19.284 4.739-1.846 8.566.514 10.16 6.265 1.038 3.748 3.212 8.729 5.545 12.707 3.117 5.315 12.606 15.565 14.41 15.565.243 0 .442.172.442.383s.854.87 1.898 1.465 2.257 1.389 2.697 1.765c1.046.893 8.848 4.654 10.39 5.009.659.151 1.93.601 2.825.999 5.355 2.382 25.756 3.641 33.139 2.045 4.764-1.03 7.6-1.762 7.992-2.062.219-.169 1.388-.622 2.597-1.006 2.622-.833 9.685-4.33 11.426-5.657.68-.519 1.415-.943 1.632-.943s.92-.534 1.561-1.187c.641-.654 1.353-1.193 1.582-1.199.824-.022 9.881-9.227 11.216-11.4.405-.659.861-1.29 1.012-1.402.28-.205 2.506-3.99 3.641-6.19 1.034-2.004 1.896-4.19 1.896-4.809 0-.322.153-.586.34-.586s.65-1.214 1.029-2.697c1.708-6.693 1.729-6.732 4.647-8.662 2.425-1.605 4.744-1.673 6.811-.201"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Dhl/GenericFunctions.ts b/packages/nodes-base/nodes/Dhl/GenericFunctions.ts
index d670e8835e521..1a062fb12a3c4 100644
--- a/packages/nodes-base/nodes/Dhl/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Dhl/GenericFunctions.ts
@@ -1,20 +1,19 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	ICredentialDataDecryptedObject,
 	ICredentialTestFunctions,
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
+	IRequestOptions,
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function dhlApiRequest(
-	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	path: string,
 
 	body: any = {},
@@ -24,7 +23,7 @@ export async function dhlApiRequest(
 ): Promise<any> {
 	const credentials = (await this.getCredentials('dhlApi')) as { apiKey: string };
 
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		headers: {
 			'DHL-API-Key': credentials.apiKey,
 		},
@@ -56,7 +55,7 @@ export async function validateCredentials(
 		apiKey: string;
 	};
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			'DHL-API-Key': apiKey,
 		},
@@ -68,5 +67,5 @@ export async function validateCredentials(
 		json: true,
 	};
 
-	return this.helpers.request(options);
+	return await this.helpers.request(options);
 }
diff --git a/packages/nodes-base/nodes/Dhl/dhl.svg b/packages/nodes-base/nodes/Dhl/dhl.svg
index 854e589d3cb99..20cfb917bb170 100644
--- a/packages/nodes-base/nodes/Dhl/dhl.svg
+++ b/packages/nodes-base/nodes/Dhl/dhl.svg
@@ -1,21 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.2.1, 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 60 60" style="enable-background:new 0 0 60 60;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFCC00;}
-	.st1{fill:#D40511;}
-</style>
-<path class="st0" d="M56,60H4c-2.2,0-4-1.8-4-4V4c0-2.2,1.8-4,4-4h52c2.2,0,4,1.8,4,4v52C60,58.2,58.2,60,56,60z"/>
-<g>
-	<g>
-		<g>
-			<path class="st1" d="M16.2,32.3H6v2h8.7L16.2,32.3z M18.9,28.6H6v2h11.4L18.9,28.6z M36.1,27.9c-0.5,0.7-1.3,1.8-1.8,2.5
-				c-0.3,0.3-0.7,1,0.8,1h7.8c0,0,1.3-1.8,2.4-3.2c1.5-2,0.1-6.2-5.2-6.2H19.2l-3.6,4.9h20C36.6,26.9,36.6,27.3,36.1,27.9z M6,38h6
-				l1.5-2H6V38z M40.2,38H54v-2H41.6L40.2,38z M47.1,28.6l-1.5,2H54v-2H47.1z M41.6,33.1h-8.9l-3.4,0c-1.5,0-1.1-0.6-0.8-1
-				c0.5-0.7,1.4-1.8,1.8-2.5c0.5-0.7,0.8-1-0.2-1h-9L14.2,38h17.7C37.1,38,40.3,34.8,41.6,33.1z M42.9,34.3H54v-2h-9.6L42.9,34.3z"
-				/>
-		</g>
-	</g>
-</g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 60 60"><path d="M56 60H4c-2.2 0-4-1.8-4-4V4c0-2.2 1.8-4 4-4h52c2.2 0 4 1.8 4 4v52c0 2.2-1.8 4-4 4" style="fill:#fc0"/><path d="M16.2 32.3H6v2h8.7zm2.7-3.7H6v2h11.4zm17.2-.7c-.5.7-1.3 1.8-1.8 2.5-.3.3-.7 1 .8 1h7.8s1.3-1.8 2.4-3.2c1.5-2 .1-6.2-5.2-6.2H19.2l-3.6 4.9h20c1 0 1 .4.5 1M6 38h6l1.5-2H6zm34.2 0H54v-2H41.6zm6.9-9.4-1.5 2H54v-2zm-5.5 4.5H29.3c-1.5 0-1.1-.6-.8-1 .5-.7 1.4-1.8 1.8-2.5.5-.7.8-1-.2-1h-9L14.2 38h17.7c5.2 0 8.4-3.2 9.7-4.9m1.3 1.2H54v-2h-9.6z" style="fill:#d40511"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Discord/Discord.node.ts b/packages/nodes-base/nodes/Discord/Discord.node.ts
index 282536d3b772f..9a7b950eb8d77 100644
--- a/packages/nodes-base/nodes/Discord/Discord.node.ts
+++ b/packages/nodes-base/nodes/Discord/Discord.node.ts
@@ -1,275 +1,25 @@
-import type {
-	IExecuteFunctions,
-	INodeExecutionData,
-	INodeType,
-	INodeTypeDescription,
-} from 'n8n-workflow';
-import { jsonParse, NodeApiError, NodeOperationError, sleep } from 'n8n-workflow';
-
-import type { DiscordAttachment, DiscordWebhook } from './Interfaces';
-export class Discord implements INodeType {
-	description: INodeTypeDescription = {
-		displayName: 'Discord',
-		name: 'discord',
-		icon: 'file:discord.svg',
-		group: ['output'],
-		version: 1,
-		description: 'Sends data to Discord',
-		defaults: {
-			name: 'Discord',
-		},
-		inputs: ['main'],
-		outputs: ['main'],
-		properties: [
-			{
-				displayName: 'Webhook URL',
-				name: 'webhookUri',
-				type: 'string',
-				required: true,
-				default: '',
-				placeholder: 'https://discord.com/api/webhooks/ID/TOKEN',
-			},
-			{
-				displayName: 'Content',
-				name: 'text',
-				type: 'string',
-				typeOptions: {
-					maxValue: 2000,
-				},
-				default: '',
-				placeholder: 'Hello World!',
-			},
-			{
-				displayName: 'Additional Fields',
-				name: 'options',
-				type: 'collection',
-				placeholder: 'Add Option',
-				default: {},
-				options: [
-					{
-						displayName: 'Allowed Mentions',
-						name: 'allowedMentions',
-						type: 'json',
-						typeOptions: { alwaysOpenEditWindow: true, editor: 'code' },
-						default: '',
-					},
-					{
-						displayName: 'Attachments',
-						name: 'attachments',
-						type: 'json',
-						typeOptions: { alwaysOpenEditWindow: true, editor: 'code' },
-						default: '',
-					},
-					{
-						displayName: 'Avatar URL',
-						name: 'avatarUrl',
-						type: 'string',
-						default: '',
-					},
-					{
-						displayName: 'Components',
-						name: 'components',
-						type: 'json',
-						typeOptions: { alwaysOpenEditWindow: true, editor: 'code' },
-						default: '',
-					},
-					{
-						displayName: 'Embeds',
-						name: 'embeds',
-						type: 'json',
-						typeOptions: { alwaysOpenEditWindow: true, editor: 'code' },
-						default: '',
-					},
-					{
-						displayName: 'Flags',
-						name: 'flags',
-						type: 'number',
-						default: '',
-					},
-					{
-						displayName: 'JSON Payload',
-						name: 'payloadJson',
-						type: 'json',
-						typeOptions: { alwaysOpenEditWindow: true, editor: 'code' },
-						default: '',
-					},
-					{
-						displayName: 'Username',
-						name: 'username',
-						type: 'string',
-						default: '',
-						placeholder: 'User',
-					},
-					{
-						displayName: 'TTS',
-						name: 'tts',
-						type: 'boolean',
-						default: false,
-						description: 'Whether this message be sent as a Text To Speech message',
-					},
-				],
-			},
-		],
-	};
-
-	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
-		const returnData: INodeExecutionData[] = [];
-
-		const webhookUri = this.getNodeParameter('webhookUri', 0, '') as string;
-
-		if (!webhookUri) throw new NodeOperationError(this.getNode(), 'Webhook uri is required.');
-
-		const items = this.getInputData();
-		const length = items.length;
-		for (let i = 0; i < length; i++) {
-			const body: DiscordWebhook = {};
-
-			const iterationWebhookUri = this.getNodeParameter('webhookUri', i) as string;
-			body.content = this.getNodeParameter('text', i) as string;
-			const options = this.getNodeParameter('options', i);
-
-			if (!body.content && !options.embeds) {
-				throw new NodeOperationError(this.getNode(), 'Either content or embeds must be set.', {
-					itemIndex: i,
-				});
-			}
-			if (options.embeds) {
-				try {
-					//@ts-expect-error
-					body.embeds = JSON.parse(options.embeds);
-				} catch (e) {
-					throw new NodeOperationError(this.getNode(), 'Embeds must be valid JSON.', {
-						itemIndex: i,
-					});
-				}
-				if (!Array.isArray(body.embeds)) {
-					throw new NodeOperationError(this.getNode(), 'Embeds must be an array of embeds.', {
-						itemIndex: i,
-					});
-				}
-			}
-			if (options.username) {
-				body.username = options.username as string;
-			}
-
-			if (options.components) {
-				try {
-					//@ts-expect-error
-					body.components = JSON.parse(options.components);
-				} catch (e) {
-					throw new NodeOperationError(this.getNode(), 'Components must be valid JSON.', {
-						itemIndex: i,
-					});
-				}
-			}
-
-			if (options.allowed_mentions) {
-				//@ts-expect-error
-				body.allowed_mentions = jsonParse(options.allowed_mentions);
-			}
-
-			if (options.avatarUrl) {
-				body.avatar_url = options.avatarUrl as string;
-			}
-
-			if (options.flags) {
-				body.flags = options.flags as number;
-			}
-
-			if (options.tts) {
-				body.tts = options.tts as boolean;
-			}
-
-			if (options.payloadJson) {
-				//@ts-expect-error
-				body.payload_json = jsonParse(options.payloadJson);
-			}
-
-			if (options.attachments) {
-				//@ts-expect-error
-				body.attachments = jsonParse(options.attachments as DiscordAttachment[]);
-			}
-
-			//* Not used props, delete them from the payload as Discord won't need them :^
-			if (!body.content) delete body.content;
-			if (!body.username) delete body.username;
-			if (!body.avatar_url) delete body.avatar_url;
-			if (!body.embeds) delete body.embeds;
-			if (!body.allowed_mentions) delete body.allowed_mentions;
-			if (!body.flags) delete body.flags;
-			if (!body.components) delete body.components;
-			if (!body.payload_json) delete body.payload_json;
-			if (!body.attachments) delete body.attachments;
-
-			let requestOptions;
-
-			if (!body.payload_json) {
-				requestOptions = {
-					resolveWithFullResponse: true,
-					method: 'POST',
-					body,
-					uri: iterationWebhookUri,
-					headers: {
-						'content-type': 'application/json; charset=utf-8',
-					},
-					json: true,
-				};
-			} else {
-				requestOptions = {
-					resolveWithFullResponse: true,
-					method: 'POST',
-					body,
-					uri: iterationWebhookUri,
-					headers: {
-						'content-type': 'multipart/form-data; charset=utf-8',
-					},
-				};
-			}
-			let maxTries = 5;
-			let response;
-
-			do {
-				try {
-					response = await this.helpers.request(requestOptions);
-					const resetAfter = response.headers['x-ratelimit-reset-after'] * 1000;
-					const remainingRatelimit = response.headers['x-ratelimit-remaining'];
-
-					// remaining requests 0
-					// https://discord.com/developers/docs/topics/rate-limits
-					if (!+remainingRatelimit) {
-						await sleep(resetAfter ?? 1000);
-					}
-
-					break;
-				} catch (error) {
-					// HTTP/1.1 429 TOO MANY REQUESTS
-					// Await when the current rate limit will reset
-					// https://discord.com/developers/docs/topics/rate-limits
-					if (error.statusCode === 429) {
-						const retryAfter = error.response?.headers['retry-after'] || 1000;
-
-						await sleep(+retryAfter);
-
-						continue;
-					}
-
-					throw error;
-				}
-			} while (--maxTries);
-
-			if (maxTries <= 0) {
-				throw new NodeApiError(this.getNode(), {
-					error: 'Could not send Webhook message. Max amount of rate-limit retries reached.',
-				});
-			}
-
-			const executionData = this.helpers.constructExecutionMetaData(
-				this.helpers.returnJsonArray({ success: true }),
-				{ itemData: { item: i } },
-			);
-			returnData.push(...executionData);
-		}
-
-		return this.prepareOutputData(returnData);
+import type { INodeTypeBaseDescription, IVersionedNodeType } from 'n8n-workflow';
+import { VersionedNodeType } from 'n8n-workflow';
+
+import { DiscordV1 } from './v1/DiscordV1.node';
+import { DiscordV2 } from './v2/DiscordV2.node';
+
+export class Discord extends VersionedNodeType {
+	constructor() {
+		const baseDescription: INodeTypeBaseDescription = {
+			displayName: 'Discord',
+			name: 'discord',
+			icon: 'file:discord.svg',
+			group: ['output'],
+			defaultVersion: 2,
+			description: 'Sends data to Discord',
+		};
+
+		const nodeVersions: IVersionedNodeType['nodeVersions'] = {
+			1: new DiscordV1(baseDescription),
+			2: new DiscordV2(baseDescription),
+		};
+
+		super(nodeVersions, baseDescription);
 	}
 }
diff --git a/packages/nodes-base/nodes/Discord/discord.svg b/packages/nodes-base/nodes/Discord/discord.svg
index 079b54bdd7854..f5e0e691e6dbb 100644
--- a/packages/nodes-base/nodes/Discord/discord.svg
+++ b/packages/nodes-base/nodes/Discord/discord.svg
@@ -1,6 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="256px" height="199px" viewBox="0 0 256 199" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMidYMid">
-    <g>
-        <path d="M216.856339,16.5966031 C200.285002,8.84328665 182.566144,3.2084988 164.041564,0 C161.766523,4.11318106 159.108624,9.64549908 157.276099,14.0464379 C137.583995,11.0849896 118.072967,11.0849896 98.7430163,14.0464379 C96.9108417,9.64549908 94.1925838,4.11318106 91.8971895,0 C73.3526068,3.2084988 55.6133949,8.86399117 39.0420583,16.6376612 C5.61752293,67.146514 -3.4433191,116.400813 1.08711069,164.955721 C23.2560196,181.510915 44.7403634,191.567697 65.8621325,198.148576 C71.0772151,190.971126 75.7283628,183.341335 79.7352139,175.300261 C72.104019,172.400575 64.7949724,168.822202 57.8887866,164.667963 C59.7209612,163.310589 61.5131304,161.891452 63.2445898,160.431257 C105.36741,180.133187 151.134928,180.133187 192.754523,160.431257 C194.506336,161.891452 196.298154,163.310589 198.110326,164.667963 C191.183787,168.842556 183.854737,172.420929 176.223542,175.320965 C180.230393,183.341335 184.861538,190.991831 190.096624,198.16893 C211.238746,191.588051 232.743023,181.531619 254.911949,164.955721 C260.227747,108.668201 245.831087,59.8662432 216.856339,16.5966031 Z M85.4738752,135.09489 C72.8290281,135.09489 62.4592217,123.290155 62.4592217,108.914901 C62.4592217,94.5396472 72.607595,82.7145587 85.4738752,82.7145587 C98.3405064,82.7145587 108.709962,94.5189427 108.488529,108.914901 C108.508531,123.290155 98.3405064,135.09489 85.4738752,135.09489 Z M170.525237,135.09489 C157.88039,135.09489 147.510584,123.290155 147.510584,108.914901 C147.510584,94.5396472 157.658606,82.7145587 170.525237,82.7145587 C183.391518,82.7145587 193.761324,94.5189427 193.539891,108.914901 C193.539891,123.290155 183.391518,135.09489 170.525237,135.09489 Z" fill="#5865F2" fill-rule="nonzero"></path>
-    </g>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="199" preserveAspectRatio="xMidYMid"><path fill="#5865F2" d="M216.856 16.597A208.5 208.5 0 0 0 164.042 0c-2.275 4.113-4.933 9.645-6.766 14.046q-29.538-4.442-58.533 0c-1.832-4.4-4.55-9.933-6.846-14.046a207.8 207.8 0 0 0-52.855 16.638C5.618 67.147-3.443 116.4 1.087 164.956c22.169 16.555 43.653 26.612 64.775 33.193A161 161 0 0 0 79.735 175.3a136.4 136.4 0 0 1-21.846-10.632 109 109 0 0 0 5.356-4.237c42.122 19.702 87.89 19.702 129.51 0a132 132 0 0 0 5.355 4.237 136 136 0 0 1-21.886 10.653c4.006 8.02 8.638 15.67 13.873 22.848 21.142-6.58 42.646-16.637 64.815-33.213 5.316-56.288-9.08-105.09-38.056-148.36M85.474 135.095c-12.645 0-23.015-11.805-23.015-26.18s10.149-26.2 23.015-26.2 23.236 11.804 23.015 26.2c.02 14.375-10.148 26.18-23.015 26.18m85.051 0c-12.645 0-23.014-11.805-23.014-26.18s10.148-26.2 23.014-26.2c12.867 0 23.236 11.804 23.015 26.2 0 14.375-10.148 26.18-23.015 26.18"/></svg>
\ No newline at end of file
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
new file mode 100644
index 0000000000000..cbd0fbb0771dc
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/channel/create.test.ts
@@ -0,0 +1,66 @@
+import type { INodeTypes } from 'n8n-workflow';
+import nock from 'nock';
+import * as transport from '../../../../v2/transport/discord.api';
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+const discordApiRequestSpy = jest.spyOn(transport, 'discordApiRequest');
+
+discordApiRequestSpy.mockImplementation(async (method: string, endpoint) => {
+	if (method === 'POST') {
+		return {
+			id: '1168528323006181417',
+			type: 0,
+			last_message_id: null,
+			flags: 0,
+			guild_id: '1168516062791340136',
+			name: 'third',
+			parent_id: null,
+			rate_limit_per_user: 0,
+			topic: null,
+			position: 3,
+			permission_overwrites: [],
+			nsfw: false,
+		};
+	}
+});
+
+describe('Test DiscordV2, channel => create', () => {
+	const workflows = ['nodes/Discord/test/v2/node/channel/create.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.resetAllMocks();
+	});
+
+	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(discordApiRequestSpy).toHaveBeenCalledTimes(1);
+		expect(discordApiRequestSpy).toHaveBeenCalledWith(
+			'POST',
+			'/guilds/1168516062791340136/channels',
+			{ name: 'third', type: '0' },
+		);
+
+		expect(result.finished).toEqual(true);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/channel/create.workflow.json b/packages/nodes-base/nodes/Discord/test/v2/node/channel/create.workflow.json
new file mode 100644
index 0000000000000..52e95e2abc211
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/channel/create.workflow.json
@@ -0,0 +1,106 @@
+{
+  "name": "discord overhaul tests",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "254a9d9b-43bf-4f6e-a761-d78146a05838",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        -660,
+        560
+      ]
+    },
+    {
+      "parameters": {
+        "guildId": {
+          "__rl": true,
+          "value": "1168516062791340136",
+          "mode": "list",
+          "cachedResultName": "TEST server",
+          "cachedResultUrl": "https://discord.com/channels/1168516062791340136"
+        },
+        "name": "third",
+        "options": {}
+      },
+      "id": "7e638897-0581-42e6-8b89-494908e0ae75",
+      "name": "Bot test",
+      "type": "n8n-nodes-base.discord",
+      "typeVersion": 2,
+      "position": [
+        -420,
+        560
+      ],
+      "credentials": {
+        "discordBotApi": {
+          "id": "KaIz8dqE3Vy1E3iL",
+          "name": "Discord Bot account"
+        }
+      }
+    },
+    {
+      "parameters": {},
+      "id": "10450e91-8642-4b92-af15-9d5ad161b527",
+      "name": "No Operation, do nothing",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        -200,
+        560
+      ]
+    }
+  ],
+  "pinData": {
+    "No Operation, do nothing": [
+      {
+        "json": {
+          "id": "1168528323006181417",
+          "type": 0,
+          "last_message_id": null,
+          "flags": 0,
+          "guild_id": "1168516062791340136",
+          "name": "third",
+          "parent_id": null,
+          "rate_limit_per_user": 0,
+          "topic": null,
+          "position": 3,
+          "permission_overwrites": [],
+          "nsfw": false
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Bot test",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Bot test": {
+      "main": [
+        [
+          {
+            "node": "No Operation, do nothing",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {},
+  "versionId": "df4fbb47-eb25-4564-b9ad-f16931e35665",
+  "id": "4DdFKgGmLX07cXvG",
+  "meta": {
+    "instanceId": "b888bd11cd1ddbb95450babf3e199556799d999b896f650de768b8370ee50363"
+  },
+  "tags": []
+}
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
new file mode 100644
index 0000000000000..75477631a903d
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/channel/deleteChannel.test.ts
@@ -0,0 +1,62 @@
+import type { INodeTypes } from 'n8n-workflow';
+import nock from 'nock';
+import * as transport from '../../../../v2/transport/discord.api';
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+const discordApiRequestSpy = jest.spyOn(transport, 'discordApiRequest');
+
+discordApiRequestSpy.mockImplementation(async (method: string, endpoint) => {
+	if (method === 'DELETE') {
+		return {
+			id: '1168528323006181417',
+			type: 0,
+			last_message_id: null,
+			flags: 0,
+			guild_id: '1168516062791340136',
+			name: 'third',
+			parent_id: null,
+			rate_limit_per_user: 0,
+			topic: null,
+			position: 3,
+			permission_overwrites: [],
+			nsfw: false,
+		};
+	}
+});
+
+describe('Test DiscordV2, channel => deleteChannel', () => {
+	const workflows = ['nodes/Discord/test/v2/node/channel/deleteChannel.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.resetAllMocks();
+	});
+
+	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(discordApiRequestSpy).toHaveBeenCalledTimes(1);
+		expect(discordApiRequestSpy).toHaveBeenCalledWith('DELETE', '/channels/1168528323006181417');
+
+		expect(result.finished).toEqual(true);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/channel/deleteChannel.workflow.json b/packages/nodes-base/nodes/Discord/test/v2/node/channel/deleteChannel.workflow.json
new file mode 100644
index 0000000000000..051f3ff02d6a7
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/channel/deleteChannel.workflow.json
@@ -0,0 +1,112 @@
+{
+  "name": "discord overhaul tests",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "254a9d9b-43bf-4f6e-a761-d78146a05838",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        -660,
+        560
+      ]
+    },
+    {
+      "parameters": {
+        "operation": "deleteChannel",
+        "guildId": {
+          "__rl": true,
+          "value": "1168516062791340136",
+          "mode": "list",
+          "cachedResultName": "TEST server",
+          "cachedResultUrl": "https://discord.com/channels/1168516062791340136"
+        },
+        "channelId": {
+          "__rl": true,
+          "value": "1168528323006181417",
+          "mode": "list",
+          "cachedResultName": "third",
+          "cachedResultUrl": "https://discord.com/channels/1168516062791340136/1168528323006181417"
+        }
+      },
+      "id": "7e638897-0581-42e6-8b89-494908e0ae75",
+      "name": "Bot test",
+      "type": "n8n-nodes-base.discord",
+      "typeVersion": 2,
+      "position": [
+        -420,
+        560
+      ],
+      "credentials": {
+        "discordBotApi": {
+          "id": "KaIz8dqE3Vy1E3iL",
+          "name": "Discord Bot account"
+        }
+      }
+    },
+    {
+      "parameters": {},
+      "id": "10450e91-8642-4b92-af15-9d5ad161b527",
+      "name": "No Operation, do nothing",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        -200,
+        560
+      ]
+    }
+  ],
+  "pinData": {
+    "No Operation, do nothing": [
+      {
+        "json": {
+          "id": "1168528323006181417",
+          "type": 0,
+          "last_message_id": null,
+          "flags": 0,
+          "guild_id": "1168516062791340136",
+          "name": "third",
+          "parent_id": null,
+          "rate_limit_per_user": 0,
+          "topic": null,
+          "position": 3,
+          "permission_overwrites": [],
+          "nsfw": false
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Bot test",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Bot test": {
+      "main": [
+        [
+          {
+            "node": "No Operation, do nothing",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {},
+  "versionId": "f0027d0b-87f7-4a39-bc9c-2838078eed60",
+  "id": "4DdFKgGmLX07cXvG",
+  "meta": {
+    "instanceId": "b888bd11cd1ddbb95450babf3e199556799d999b896f650de768b8370ee50363"
+  },
+  "tags": []
+}
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
new file mode 100644
index 0000000000000..002e570603652
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/channel/get.test.ts
@@ -0,0 +1,111 @@
+import type { INodeTypes, IRequestOptions } from 'n8n-workflow';
+import nock from 'nock';
+import * as transport from '../../../../v2/transport/helpers';
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+const requestApiSpy = jest.spyOn(transport, 'requestApi');
+
+requestApiSpy.mockImplementation(
+	async (options: IRequestOptions, credentialType: string, endpoint: string) => {
+		if (endpoint === '/users/@me/guilds') {
+			return {
+				headers: {},
+				body: [
+					{
+						id: '1168516062791340136',
+					},
+				],
+			};
+		} else {
+			return {
+				headers: {},
+				body: {
+					id: '1168516240332034067',
+					type: 0,
+					last_message_id: null,
+					flags: 0,
+					guild_id: '1168516062791340136',
+					name: 'first',
+					parent_id: '1168516063340789831',
+					rate_limit_per_user: 0,
+					topic: null,
+					position: 1,
+					permission_overwrites: [],
+					nsfw: false,
+				},
+			};
+		}
+	},
+);
+
+describe('Test DiscordV2, channel => get', () => {
+	const workflows = ['nodes/Discord/test/v2/node/channel/get.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.resetAllMocks();
+	});
+
+	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(requestApiSpy).toHaveBeenCalledTimes(3);
+		expect(requestApiSpy).toHaveBeenCalledWith(
+			{
+				body: undefined,
+				headers: {},
+				json: true,
+				method: 'GET',
+				qs: undefined,
+				url: 'https://discord.com/api/v10/users/@me/guilds',
+			},
+			'discordOAuth2Api',
+			'/users/@me/guilds',
+		);
+		expect(requestApiSpy).toHaveBeenCalledWith(
+			{
+				body: undefined,
+				headers: {},
+				json: true,
+				method: 'GET',
+				qs: undefined,
+				url: 'https://discord.com/api/v10/channels/1168516240332034067',
+			},
+			'discordOAuth2Api',
+			'/channels/1168516240332034067',
+		);
+		expect(requestApiSpy).toHaveBeenCalledWith(
+			{
+				body: undefined,
+				headers: {},
+				json: true,
+				method: 'GET',
+				qs: undefined,
+				url: 'https://discord.com/api/v10/channels/1168516240332034067',
+			},
+			'discordOAuth2Api',
+			'/channels/1168516240332034067',
+		);
+
+		expect(result.finished).toEqual(true);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/channel/get.workflow.json b/packages/nodes-base/nodes/Discord/test/v2/node/channel/get.workflow.json
new file mode 100644
index 0000000000000..dd3b1844eb344
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/channel/get.workflow.json
@@ -0,0 +1,113 @@
+{
+  "name": "discord overhaul copy",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "fe1dd916-f466-40c7-9dfa-dfec59219a86",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        -560,
+        780
+      ]
+    },
+    {
+      "parameters": {
+        "authentication": "oAuth2",
+        "operation": "get",
+        "guildId": {
+          "__rl": true,
+          "value": "1168516062791340136",
+          "mode": "list",
+          "cachedResultName": "TEST server",
+          "cachedResultUrl": "https://discord.com/channels/1168516062791340136"
+        },
+        "channelId": {
+          "__rl": true,
+          "value": "1168516240332034067",
+          "mode": "list",
+          "cachedResultName": "first",
+          "cachedResultUrl": "https://discord.com/channels/1168516062791340136/1168516240332034067"
+        }
+      },
+      "id": "09cccc50-10d2-49a1-9b9a-9ba1a11a3657",
+      "name": "OAuth test",
+      "type": "n8n-nodes-base.discord",
+      "typeVersion": 2,
+      "position": [
+        -320,
+        780
+      ],
+      "credentials": {
+        "discordOAuth2Api": {
+          "id": "79",
+          "name": "Discord account"
+        }
+      }
+    },
+    {
+      "parameters": {},
+      "id": "7f367512-810f-4d5d-9020-0f01a47039f7",
+      "name": "No Operation, do nothing",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        -80,
+        780
+      ]
+    }
+  ],
+  "pinData": {
+    "No Operation, do nothing": [
+      {
+        "json": {
+          "id": "1168516240332034067",
+          "type": 0,
+          "last_message_id": null,
+          "flags": 0,
+          "guild_id": "1168516062791340136",
+          "name": "first",
+          "parent_id": "1168516063340789831",
+          "rate_limit_per_user": 0,
+          "topic": null,
+          "position": 1,
+          "permission_overwrites": [],
+          "nsfw": false
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "OAuth test",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "OAuth test": {
+      "main": [
+        [
+          {
+            "node": "No Operation, do nothing",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {},
+  "versionId": "0089557d-57da-45ea-abd1-c7b57691e10a",
+  "id": "m3OrE6gaFHxa5InI",
+  "meta": {
+    "instanceId": "b888bd11cd1ddbb95450babf3e199556799d999b896f650de768b8370ee50363"
+  },
+  "tags": []
+}
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
new file mode 100644
index 0000000000000..41c7cb1b5795f
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/channel/getAll.test.ts
@@ -0,0 +1,141 @@
+import type { INodeTypes } from 'n8n-workflow';
+import nock from 'nock';
+import * as transport from '../../../../v2/transport/discord.api';
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+const discordApiRequestSpy = jest.spyOn(transport, 'discordApiRequest');
+
+discordApiRequestSpy.mockImplementation(async (method: string, endpoint) => {
+	if (method === 'GET') {
+		return [
+			{
+				id: '1168516063340789831',
+				type: 4,
+				flags: 0,
+				guild_id: '1168516062791340136',
+				name: 'Text Channels',
+				parent_id: null,
+				position: 0,
+				permission_overwrites: [],
+			},
+			{
+				id: '1168516063340789832',
+				type: 4,
+				flags: 0,
+				guild_id: '1168516062791340136',
+				name: 'Voice Channels',
+				parent_id: null,
+				position: 0,
+				permission_overwrites: [],
+			},
+			{
+				id: '1168516063340789833',
+				type: 0,
+				last_message_id: '1168518371239792720',
+				flags: 0,
+				guild_id: '1168516062791340136',
+				name: 'general',
+				parent_id: '1168516063340789831',
+				rate_limit_per_user: 0,
+				topic: null,
+				position: 0,
+				permission_overwrites: [],
+				nsfw: false,
+				icon_emoji: {
+					id: null,
+					name: '👋',
+				},
+				theme_color: null,
+			},
+			{
+				id: '1168516063340789834',
+				type: 2,
+				last_message_id: null,
+				flags: 0,
+				guild_id: '1168516062791340136',
+				name: 'General',
+				parent_id: '1168516063340789832',
+				rate_limit_per_user: 0,
+				bitrate: 64000,
+				user_limit: 0,
+				rtc_region: null,
+				position: 0,
+				permission_overwrites: [],
+				nsfw: false,
+				icon_emoji: {
+					id: null,
+					name: '🎙️',
+				},
+				theme_color: null,
+			},
+			{
+				id: '1168516240332034067',
+				type: 0,
+				last_message_id: null,
+				flags: 0,
+				guild_id: '1168516062791340136',
+				name: 'first-channel',
+				parent_id: '1168516063340789831',
+				rate_limit_per_user: 30,
+				topic: 'This is channel topic',
+				position: 3,
+				permission_overwrites: [],
+				nsfw: true,
+			},
+			{
+				id: '1168516269079793766',
+				type: 0,
+				last_message_id: null,
+				flags: 0,
+				guild_id: '1168516062791340136',
+				name: 'second',
+				parent_id: '1168516063340789831',
+				rate_limit_per_user: 0,
+				topic: null,
+				position: 2,
+				permission_overwrites: [],
+				nsfw: false,
+			},
+		];
+	}
+});
+
+describe('Test DiscordV2, channel => getAll', () => {
+	const workflows = ['nodes/Discord/test/v2/node/channel/getAll.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.resetAllMocks();
+	});
+
+	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(discordApiRequestSpy).toHaveBeenCalledTimes(1);
+		expect(discordApiRequestSpy).toHaveBeenCalledWith(
+			'GET',
+			'/guilds/1168516062791340136/channels',
+		);
+
+		expect(result.finished).toEqual(true);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/channel/getAll.workflow.json b/packages/nodes-base/nodes/Discord/test/v2/node/channel/getAll.workflow.json
new file mode 100644
index 0000000000000..02b813627a0f1
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/channel/getAll.workflow.json
@@ -0,0 +1,191 @@
+{
+  "name": "discord overhaul tests",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "254a9d9b-43bf-4f6e-a761-d78146a05838",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        -660,
+        560
+      ]
+    },
+    {
+      "parameters": {
+        "operation": "getAll",
+        "guildId": {
+          "__rl": true,
+          "value": "1168516062791340136",
+          "mode": "list",
+          "cachedResultName": "TEST server",
+          "cachedResultUrl": "https://discord.com/channels/1168516062791340136"
+        },
+        "returnAll": true,
+        "options": {}
+      },
+      "id": "7e638897-0581-42e6-8b89-494908e0ae75",
+      "name": "Bot test",
+      "type": "n8n-nodes-base.discord",
+      "typeVersion": 2,
+      "position": [
+        -420,
+        560
+      ],
+      "credentials": {
+        "discordBotApi": {
+          "id": "KaIz8dqE3Vy1E3iL",
+          "name": "Discord Bot account"
+        }
+      }
+    },
+    {
+      "parameters": {},
+      "id": "10450e91-8642-4b92-af15-9d5ad161b527",
+      "name": "No Operation, do nothing",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        -200,
+        560
+      ]
+    }
+  ],
+  "pinData": {
+    "No Operation, do nothing": [
+      {
+        "json": {
+          "id": "1168516063340789831",
+          "type": 4,
+          "flags": 0,
+          "guild_id": "1168516062791340136",
+          "name": "Text Channels",
+          "parent_id": null,
+          "position": 0,
+          "permission_overwrites": []
+        }
+      },
+      {
+        "json": {
+          "id": "1168516063340789832",
+          "type": 4,
+          "flags": 0,
+          "guild_id": "1168516062791340136",
+          "name": "Voice Channels",
+          "parent_id": null,
+          "position": 0,
+          "permission_overwrites": []
+        }
+      },
+      {
+        "json": {
+          "id": "1168516063340789833",
+          "type": 0,
+          "last_message_id": "1168518371239792720",
+          "flags": 0,
+          "guild_id": "1168516062791340136",
+          "name": "general",
+          "parent_id": "1168516063340789831",
+          "rate_limit_per_user": 0,
+          "topic": null,
+          "position": 0,
+          "permission_overwrites": [],
+          "nsfw": false,
+          "icon_emoji": {
+            "id": null,
+            "name": "👋"
+          },
+          "theme_color": null
+        }
+      },
+      {
+        "json": {
+          "id": "1168516063340789834",
+          "type": 2,
+          "last_message_id": null,
+          "flags": 0,
+          "guild_id": "1168516062791340136",
+          "name": "General",
+          "parent_id": "1168516063340789832",
+          "rate_limit_per_user": 0,
+          "bitrate": 64000,
+          "user_limit": 0,
+          "rtc_region": null,
+          "position": 0,
+          "permission_overwrites": [],
+          "nsfw": false,
+          "icon_emoji": {
+            "id": null,
+            "name": "🎙️"
+          },
+          "theme_color": null
+        }
+      },
+      {
+        "json": {
+          "id": "1168516240332034067",
+          "type": 0,
+          "last_message_id": null,
+          "flags": 0,
+          "guild_id": "1168516062791340136",
+          "name": "first-channel",
+          "parent_id": "1168516063340789831",
+          "rate_limit_per_user": 30,
+          "topic": "This is channel topic",
+          "position": 3,
+          "permission_overwrites": [],
+          "nsfw": true
+        }
+      },
+      {
+        "json": {
+          "id": "1168516269079793766",
+          "type": 0,
+          "last_message_id": null,
+          "flags": 0,
+          "guild_id": "1168516062791340136",
+          "name": "second",
+          "parent_id": "1168516063340789831",
+          "rate_limit_per_user": 0,
+          "topic": null,
+          "position": 2,
+          "permission_overwrites": [],
+          "nsfw": false
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Bot test",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Bot test": {
+      "main": [
+        [
+          {
+            "node": "No Operation, do nothing",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {},
+  "versionId": "905c7383-202e-4391-97a5-e2c579421c17",
+  "id": "4DdFKgGmLX07cXvG",
+  "meta": {
+    "instanceId": "b888bd11cd1ddbb95450babf3e199556799d999b896f650de768b8370ee50363"
+  },
+  "tags": []
+}
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
new file mode 100644
index 0000000000000..bd7e7851c67c8
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/channel/update.test.ts
@@ -0,0 +1,69 @@
+import type { INodeTypes } from 'n8n-workflow';
+import nock from 'nock';
+import * as transport from '../../../../v2/transport/discord.api';
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+const discordApiRequestSpy = jest.spyOn(transport, 'discordApiRequest');
+
+discordApiRequestSpy.mockImplementation(async (method: string, endpoint) => {
+	if (method === 'PATCH') {
+		return {
+			id: '1168516240332034067',
+			type: 0,
+			last_message_id: null,
+			flags: 0,
+			guild_id: '1168516062791340136',
+			name: 'first-channel',
+			parent_id: '1168516063340789831',
+			rate_limit_per_user: 30,
+			topic: 'This is channel topic',
+			position: 3,
+			permission_overwrites: [],
+			nsfw: true,
+		};
+	}
+});
+
+describe('Test DiscordV2, channel => update', () => {
+	const workflows = ['nodes/Discord/test/v2/node/channel/update.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.resetAllMocks();
+	});
+
+	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(discordApiRequestSpy).toHaveBeenCalledTimes(1);
+		expect(discordApiRequestSpy).toHaveBeenCalledWith('PATCH', '/channels/1168516240332034067', {
+			name: 'First Channel',
+			nsfw: true,
+			parent_id: '1168516063340789831',
+			position: 3,
+			rate_limit_per_user: 30,
+			topic: 'This is channel topic',
+		});
+
+		expect(result.finished).toEqual(true);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/channel/update.workflow.json b/packages/nodes-base/nodes/Discord/test/v2/node/channel/update.workflow.json
new file mode 100644
index 0000000000000..149229e37390b
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/channel/update.workflow.json
@@ -0,0 +1,126 @@
+{
+  "name": "discord overhaul tests",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "254a9d9b-43bf-4f6e-a761-d78146a05838",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        -660,
+        560
+      ]
+    },
+    {
+      "parameters": {
+        "operation": "update",
+        "guildId": {
+          "__rl": true,
+          "value": "1168516062791340136",
+          "mode": "list",
+          "cachedResultName": "TEST server",
+          "cachedResultUrl": "https://discord.com/channels/1168516062791340136"
+        },
+        "channelId": {
+          "__rl": true,
+          "value": "1168516240332034067",
+          "mode": "list",
+          "cachedResultName": "first",
+          "cachedResultUrl": "https://discord.com/channels/1168516062791340136/1168516240332034067"
+        },
+        "name": "First Channel",
+        "options": {
+          "nsfw": true,
+          "categoryId": {
+            "__rl": true,
+            "value": "1168516063340789831",
+            "mode": "list",
+            "cachedResultName": "Text Channels",
+            "cachedResultUrl": "https://discord.com/channels/1168516062791340136/1168516063340789831"
+          },
+          "position": 3,
+          "rate_limit_per_user": 30,
+          "topic": "This is channel topic"
+        }
+      },
+      "id": "7e638897-0581-42e6-8b89-494908e0ae75",
+      "name": "Bot test",
+      "type": "n8n-nodes-base.discord",
+      "typeVersion": 2,
+      "position": [
+        -420,
+        560
+      ],
+      "credentials": {
+        "discordBotApi": {
+          "id": "KaIz8dqE3Vy1E3iL",
+          "name": "Discord Bot account"
+        }
+      }
+    },
+    {
+      "parameters": {},
+      "id": "10450e91-8642-4b92-af15-9d5ad161b527",
+      "name": "No Operation, do nothing",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        -200,
+        560
+      ]
+    }
+  ],
+  "pinData": {
+    "No Operation, do nothing": [
+      {
+        "json": {
+          "id": "1168516240332034067",
+          "type": 0,
+          "last_message_id": null,
+          "flags": 0,
+          "guild_id": "1168516062791340136",
+          "name": "first-channel",
+          "parent_id": "1168516063340789831",
+          "rate_limit_per_user": 30,
+          "topic": "This is channel topic",
+          "position": 3,
+          "permission_overwrites": [],
+          "nsfw": true
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Bot test",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Bot test": {
+      "main": [
+        [
+          {
+            "node": "No Operation, do nothing",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {},
+  "versionId": "fc822909-732e-444f-9537-54b7a85a7bd7",
+  "id": "4DdFKgGmLX07cXvG",
+  "meta": {
+    "instanceId": "b888bd11cd1ddbb95450babf3e199556799d999b896f650de768b8370ee50363"
+  },
+  "tags": []
+}
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
new file mode 100644
index 0000000000000..13d8297a70974
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/member/getAll.test.ts
@@ -0,0 +1,90 @@
+import type { INodeTypes } from 'n8n-workflow';
+import nock from 'nock';
+import * as transport from '../../../../v2/transport/discord.api';
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+const discordApiRequestSpy = jest.spyOn(transport, 'discordApiRequest');
+
+discordApiRequestSpy.mockImplementation(async (method: string, endpoint) => {
+	if (method === 'GET') {
+		return [
+			{
+				user: {
+					id: '470936827994570762',
+					username: 'michael',
+					avatar: null,
+					discriminator: '0',
+					public_flags: 0,
+					premium_type: 0,
+					flags: 0,
+					banner: null,
+					accent_color: null,
+					global_name: 'Michael',
+					avatar_decoration_data: null,
+					banner_color: null,
+				},
+				roles: [],
+			},
+			{
+				user: {
+					id: '1070667629972430879',
+					username: 'n8n-node-overhaul',
+					avatar: null,
+					discriminator: '1037',
+					public_flags: 0,
+					premium_type: 0,
+					flags: 0,
+					bot: true,
+					banner: null,
+					accent_color: null,
+					global_name: null,
+					avatar_decoration_data: null,
+					banner_color: null,
+				},
+				roles: ['1168518368526077992'],
+			},
+		];
+	}
+});
+
+describe('Test DiscordV2, member => getAll', () => {
+	const workflows = ['nodes/Discord/test/v2/node/member/getAll.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.resetAllMocks();
+	});
+
+	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(discordApiRequestSpy).toHaveBeenCalledTimes(1);
+		expect(discordApiRequestSpy).toHaveBeenCalledWith(
+			'GET',
+			'/guilds/1168516062791340136/members',
+			undefined,
+			{ limit: 2 },
+		);
+
+		expect(result.finished).toEqual(true);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/member/getAll.workflow.json b/packages/nodes-base/nodes/Discord/test/v2/node/member/getAll.workflow.json
new file mode 100644
index 0000000000000..d2f1bc8b4f89b
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/member/getAll.workflow.json
@@ -0,0 +1,134 @@
+{
+  "name": "discord overhaul tests",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "254a9d9b-43bf-4f6e-a761-d78146a05838",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        -660,
+        560
+      ]
+    },
+    {
+      "parameters": {
+        "resource": "member",
+        "guildId": {
+          "__rl": true,
+          "value": "1168516062791340136",
+          "mode": "list",
+          "cachedResultName": "TEST server",
+          "cachedResultUrl": "https://discord.com/channels/1168516062791340136"
+        },
+        "limit": 2,
+        "options": {
+          "simplify": true
+        }
+      },
+      "id": "7e638897-0581-42e6-8b89-494908e0ae75",
+      "name": "Bot test",
+      "type": "n8n-nodes-base.discord",
+      "typeVersion": 2,
+      "position": [
+        -420,
+        560
+      ],
+      "credentials": {
+        "discordBotApi": {
+          "id": "KaIz8dqE3Vy1E3iL",
+          "name": "Discord Bot account"
+        }
+      }
+    },
+    {
+      "parameters": {},
+      "id": "10450e91-8642-4b92-af15-9d5ad161b527",
+      "name": "No Operation, do nothing",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        -200,
+        560
+      ]
+    }
+  ],
+  "pinData": {
+    "No Operation, do nothing": [
+      {
+        "json": {
+          "user": {
+            "id": "470936827994570762",
+            "username": "michael",
+            "avatar": null,
+            "discriminator": "0",
+            "public_flags": 0,
+            "premium_type": 0,
+            "flags": 0,
+            "banner": null,
+            "accent_color": null,
+            "global_name": "Michael",
+            "avatar_decoration_data": null,
+            "banner_color": null
+          },
+          "roles": []
+        }
+      },
+      {
+        "json": {
+          "user": {
+            "id": "1070667629972430879",
+            "username": "n8n-node-overhaul",
+            "avatar": null,
+            "discriminator": "1037",
+            "public_flags": 0,
+            "premium_type": 0,
+            "flags": 0,
+            "bot": true,
+            "banner": null,
+            "accent_color": null,
+            "global_name": null,
+            "avatar_decoration_data": null,
+            "banner_color": null
+          },
+          "roles": [
+            "1168518368526077992"
+          ]
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Bot test",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Bot test": {
+      "main": [
+        [
+          {
+            "node": "No Operation, do nothing",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {},
+  "versionId": "61375773-2f25-4eae-9ef6-e64e69fc9714",
+  "id": "4DdFKgGmLX07cXvG",
+  "meta": {
+    "instanceId": "b888bd11cd1ddbb95450babf3e199556799d999b896f650de768b8370ee50363"
+  },
+  "tags": []
+}
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
new file mode 100644
index 0000000000000..836c54158d8fa
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/member/roleAdd.test.ts
@@ -0,0 +1,54 @@
+import type { INodeTypes } from 'n8n-workflow';
+import nock from 'nock';
+import * as transport from '../../../../v2/transport/discord.api';
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+const discordApiRequestSpy = jest.spyOn(transport, 'discordApiRequest');
+
+discordApiRequestSpy.mockImplementation(async (method: string, endpoint) => {
+	if (method === 'PUT') {
+		return {
+			success: true,
+		};
+	}
+});
+
+describe('Test DiscordV2, member => roleAdd', () => {
+	const workflows = ['nodes/Discord/test/v2/node/member/roleAdd.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.resetAllMocks();
+	});
+
+	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(discordApiRequestSpy).toHaveBeenCalledTimes(1);
+		expect(discordApiRequestSpy).toHaveBeenCalledWith(
+			'PUT',
+			'/guilds/1168516062791340136/members/470936827994570762/roles/1168772374540320890',
+		);
+
+		expect(result.finished).toEqual(true);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/member/roleAdd.workflow.json b/packages/nodes-base/nodes/Discord/test/v2/node/member/roleAdd.workflow.json
new file mode 100644
index 0000000000000..fe3dd6e02c7f7
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/member/roleAdd.workflow.json
@@ -0,0 +1,104 @@
+{
+  "name": "discord overhaul tests",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "254a9d9b-43bf-4f6e-a761-d78146a05838",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        -660,
+        560
+      ]
+    },
+    {
+      "parameters": {
+        "resource": "member",
+        "operation": "roleAdd",
+        "guildId": {
+          "__rl": true,
+          "value": "1168516062791340136",
+          "mode": "list",
+          "cachedResultName": "TEST server",
+          "cachedResultUrl": "https://discord.com/channels/1168516062791340136"
+        },
+        "userId": {
+          "__rl": true,
+          "value": "470936827994570762",
+          "mode": "list",
+          "cachedResultName": "michael"
+        },
+        "role": [
+          "1168772374540320890"
+        ]
+      },
+      "id": "7e638897-0581-42e6-8b89-494908e0ae75",
+      "name": "Bot test",
+      "type": "n8n-nodes-base.discord",
+      "typeVersion": 2,
+      "position": [
+        -420,
+        560
+      ],
+      "credentials": {
+        "discordBotApi": {
+          "id": "KaIz8dqE3Vy1E3iL",
+          "name": "Discord Bot account"
+        }
+      }
+    },
+    {
+      "parameters": {},
+      "id": "10450e91-8642-4b92-af15-9d5ad161b527",
+      "name": "No Operation, do nothing",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        -200,
+        560
+      ]
+    }
+  ],
+  "pinData": {
+    "No Operation, do nothing": [
+      {
+        "json": {
+          "success": true
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Bot test",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Bot test": {
+      "main": [
+        [
+          {
+            "node": "No Operation, do nothing",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {},
+  "versionId": "ad26d0d9-faf3-4070-8909-8c2b6f0749f9",
+  "id": "4DdFKgGmLX07cXvG",
+  "meta": {
+    "instanceId": "b888bd11cd1ddbb95450babf3e199556799d999b896f650de768b8370ee50363"
+  },
+  "tags": []
+}
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
new file mode 100644
index 0000000000000..e2cb066f13043
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/member/roleRemove.test.ts
@@ -0,0 +1,62 @@
+import type { INodeTypes } from 'n8n-workflow';
+import nock from 'nock';
+import * as transport from '../../../../v2/transport/discord.api';
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+const discordApiRequestSpy = jest.spyOn(transport, 'discordApiRequest');
+
+discordApiRequestSpy.mockImplementation(async (method: string, endpoint) => {
+	if (method === 'DELETE') {
+		return {
+			success: true,
+		};
+	}
+});
+
+describe('Test DiscordV2, member => roleRemove', () => {
+	const workflows = ['nodes/Discord/test/v2/node/member/roleRemove.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.resetAllMocks();
+	});
+
+	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(discordApiRequestSpy).toHaveBeenCalledTimes(3);
+		expect(discordApiRequestSpy).toHaveBeenCalledWith(
+			'DELETE',
+			'/guilds/1168516062791340136/members/470936827994570762/roles/1168773588963299428',
+		);
+		expect(discordApiRequestSpy).toHaveBeenCalledWith(
+			'DELETE',
+			'/guilds/1168516062791340136/members/470936827994570762/roles/1168773645800308756',
+		);
+		expect(discordApiRequestSpy).toHaveBeenCalledWith(
+			'DELETE',
+			'/guilds/1168516062791340136/members/470936827994570762/roles/1168772374540320890',
+		);
+
+		expect(result.finished).toEqual(true);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/member/roleRemove.workflow.json b/packages/nodes-base/nodes/Discord/test/v2/node/member/roleRemove.workflow.json
new file mode 100644
index 0000000000000..980c0d7e7d5d8
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/member/roleRemove.workflow.json
@@ -0,0 +1,106 @@
+{
+  "name": "discord overhaul tests",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "254a9d9b-43bf-4f6e-a761-d78146a05838",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        -660,
+        560
+      ]
+    },
+    {
+      "parameters": {
+        "resource": "member",
+        "operation": "roleRemove",
+        "guildId": {
+          "__rl": true,
+          "value": "1168516062791340136",
+          "mode": "list",
+          "cachedResultName": "TEST server",
+          "cachedResultUrl": "https://discord.com/channels/1168516062791340136"
+        },
+        "userId": {
+          "__rl": true,
+          "value": "470936827994570762",
+          "mode": "list",
+          "cachedResultName": "michael"
+        },
+        "role": [
+          "1168773588963299428",
+          "1168773645800308756",
+          "1168772374540320890"
+        ]
+      },
+      "id": "7e638897-0581-42e6-8b89-494908e0ae75",
+      "name": "Bot test",
+      "type": "n8n-nodes-base.discord",
+      "typeVersion": 2,
+      "position": [
+        -420,
+        560
+      ],
+      "credentials": {
+        "discordBotApi": {
+          "id": "KaIz8dqE3Vy1E3iL",
+          "name": "Discord Bot account"
+        }
+      }
+    },
+    {
+      "parameters": {},
+      "id": "10450e91-8642-4b92-af15-9d5ad161b527",
+      "name": "No Operation, do nothing",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        -200,
+        560
+      ]
+    }
+  ],
+  "pinData": {
+    "No Operation, do nothing": [
+      {
+        "json": {
+          "success": true
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Bot test",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Bot test": {
+      "main": [
+        [
+          {
+            "node": "No Operation, do nothing",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {},
+  "versionId": "e3780e00-5acb-4c2f-8c4f-85a9fb6698c9",
+  "id": "4DdFKgGmLX07cXvG",
+  "meta": {
+    "instanceId": "b888bd11cd1ddbb95450babf3e199556799d999b896f650de768b8370ee50363"
+  },
+  "tags": []
+}
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
new file mode 100644
index 0000000000000..c7810af48fdf4
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/message/deleteMessage.test.ts
@@ -0,0 +1,54 @@
+import type { INodeTypes } from 'n8n-workflow';
+import nock from 'nock';
+import * as transport from '../../../../v2/transport/discord.api';
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+const discordApiRequestSpy = jest.spyOn(transport, 'discordApiRequest');
+
+discordApiRequestSpy.mockImplementation(async (method: string, endpoint) => {
+	if (method === 'DELETE') {
+		return {
+			success: true,
+		};
+	}
+});
+
+describe('Test DiscordV2, message => deleteMessage', () => {
+	const workflows = ['nodes/Discord/test/v2/node/message/deleteMessage.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.resetAllMocks();
+	});
+
+	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(discordApiRequestSpy).toHaveBeenCalledTimes(1);
+		expect(discordApiRequestSpy).toHaveBeenCalledWith(
+			'DELETE',
+			'/channels/1168516240332034067/messages/1168776343194972210',
+		);
+
+		expect(result.finished).toEqual(true);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/message/deleteMessage.workflow.json b/packages/nodes-base/nodes/Discord/test/v2/node/message/deleteMessage.workflow.json
new file mode 100644
index 0000000000000..84cd5870bea24
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/message/deleteMessage.workflow.json
@@ -0,0 +1,103 @@
+{
+  "name": "discord overhaul tests",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "254a9d9b-43bf-4f6e-a761-d78146a05838",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        -660,
+        560
+      ]
+    },
+    {
+      "parameters": {
+        "resource": "message",
+        "operation": "deleteMessage",
+        "guildId": {
+          "__rl": true,
+          "value": "1168516062791340136",
+          "mode": "list",
+          "cachedResultName": "TEST server",
+          "cachedResultUrl": "https://discord.com/channels/1168516062791340136"
+        },
+        "channelId": {
+          "__rl": true,
+          "value": "1168516240332034067",
+          "mode": "list",
+          "cachedResultName": "first-channel",
+          "cachedResultUrl": "https://discord.com/channels/1168516062791340136/1168516240332034067"
+        },
+        "messageId": "1168776343194972210"
+      },
+      "id": "7e638897-0581-42e6-8b89-494908e0ae75",
+      "name": "Bot test",
+      "type": "n8n-nodes-base.discord",
+      "typeVersion": 2,
+      "position": [
+        -420,
+        560
+      ],
+      "credentials": {
+        "discordBotApi": {
+          "id": "KaIz8dqE3Vy1E3iL",
+          "name": "Discord Bot account"
+        }
+      }
+    },
+    {
+      "parameters": {},
+      "id": "10450e91-8642-4b92-af15-9d5ad161b527",
+      "name": "No Operation, do nothing",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        -200,
+        560
+      ]
+    }
+  ],
+  "pinData": {
+    "No Operation, do nothing": [
+      {
+        "json": {
+          "success": true
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Bot test",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Bot test": {
+      "main": [
+        [
+          {
+            "node": "No Operation, do nothing",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {},
+  "versionId": "15dbf56e-707a-4b5c-814c-ecf78d96d87f",
+  "id": "4DdFKgGmLX07cXvG",
+  "meta": {
+    "instanceId": "b888bd11cd1ddbb95450babf3e199556799d999b896f650de768b8370ee50363"
+  },
+  "tags": []
+}
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
new file mode 100644
index 0000000000000..efea97d9420bd
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/message/get.test.ts
@@ -0,0 +1,73 @@
+import type { INodeTypes } from 'n8n-workflow';
+import nock from 'nock';
+import * as transport from '../../../../v2/transport/discord.api';
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+const discordApiRequestSpy = jest.spyOn(transport, 'discordApiRequest');
+
+discordApiRequestSpy.mockImplementation(async (method: string, endpoint) => {
+	if (method === 'GET') {
+		return {
+			id: '1168777380144369718',
+			channel_id: '1168516240332034067',
+			author: {
+				id: '1070667629972430879',
+				username: 'n8n-node-overhaul',
+				avatar: null,
+				discriminator: '1037',
+				public_flags: 0,
+				premium_type: 0,
+				flags: 0,
+				bot: true,
+				banner: null,
+				accent_color: null,
+				global_name: null,
+				avatar_decoration_data: null,
+				banner_color: null,
+			},
+			content: 'msg 3',
+			timestamp: '2023-10-31T05:04:02.260000+00:00',
+			type: 0,
+		};
+	}
+});
+
+describe('Test DiscordV2, message => get', () => {
+	const workflows = ['nodes/Discord/test/v2/node/message/get.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.resetAllMocks();
+	});
+
+	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(discordApiRequestSpy).toHaveBeenCalledTimes(1);
+		expect(discordApiRequestSpy).toHaveBeenCalledWith(
+			'GET',
+			'/channels/1168516240332034067/messages/1168777380144369718',
+		);
+
+		expect(result.finished).toEqual(true);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/message/get.workflow.json b/packages/nodes-base/nodes/Discord/test/v2/node/message/get.workflow.json
new file mode 100644
index 0000000000000..85df4cfdbe42c
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/message/get.workflow.json
@@ -0,0 +1,125 @@
+{
+  "name": "discord overhaul tests",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "254a9d9b-43bf-4f6e-a761-d78146a05838",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        -660,
+        560
+      ]
+    },
+    {
+      "parameters": {
+        "resource": "message",
+        "operation": "get",
+        "guildId": {
+          "__rl": true,
+          "value": "1168516062791340136",
+          "mode": "list",
+          "cachedResultName": "TEST server",
+          "cachedResultUrl": "https://discord.com/channels/1168516062791340136"
+        },
+        "channelId": {
+          "__rl": true,
+          "value": "1168516240332034067",
+          "mode": "list",
+          "cachedResultName": "first-channel",
+          "cachedResultUrl": "https://discord.com/channels/1168516062791340136/1168516240332034067"
+        },
+        "messageId": "1168777380144369718",
+        "options": {
+          "simplify": true
+        }
+      },
+      "id": "7e638897-0581-42e6-8b89-494908e0ae75",
+      "name": "Bot test",
+      "type": "n8n-nodes-base.discord",
+      "typeVersion": 2,
+      "position": [
+        -420,
+        560
+      ],
+      "credentials": {
+        "discordBotApi": {
+          "id": "KaIz8dqE3Vy1E3iL",
+          "name": "Discord Bot account"
+        }
+      }
+    },
+    {
+      "parameters": {},
+      "id": "10450e91-8642-4b92-af15-9d5ad161b527",
+      "name": "No Operation, do nothing",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        -200,
+        560
+      ]
+    }
+  ],
+  "pinData": {
+    "No Operation, do nothing": [
+      {
+        "json": {
+          "id": "1168777380144369718",
+          "channel_id": "1168516240332034067",
+          "author": {
+            "id": "1070667629972430879",
+            "username": "n8n-node-overhaul",
+            "avatar": null,
+            "discriminator": "1037",
+            "public_flags": 0,
+            "premium_type": 0,
+            "flags": 0,
+            "bot": true,
+            "banner": null,
+            "accent_color": null,
+            "global_name": null,
+            "avatar_decoration_data": null,
+            "banner_color": null
+          },
+          "content": "msg 3",
+          "timestamp": "2023-10-31T05:04:02.260000+00:00",
+          "type": 0
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Bot test",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Bot test": {
+      "main": [
+        [
+          {
+            "node": "No Operation, do nothing",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {},
+  "versionId": "876e52a8-2fb3-4efc-9ef0-123807be3806",
+  "id": "4DdFKgGmLX07cXvG",
+  "meta": {
+    "instanceId": "b888bd11cd1ddbb95450babf3e199556799d999b896f650de768b8370ee50363"
+  },
+  "tags": []
+}
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
new file mode 100644
index 0000000000000..70adce6cf0f4d
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/message/getAll.test.ts
@@ -0,0 +1,98 @@
+import type { INodeTypes } from 'n8n-workflow';
+import nock from 'nock';
+import * as transport from '../../../../v2/transport/discord.api';
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+const discordApiRequestSpy = jest.spyOn(transport, 'discordApiRequest');
+
+discordApiRequestSpy.mockImplementation(async (method: string, endpoint) => {
+	if (method === 'GET') {
+		return [
+			{
+				id: '1168784010269433998',
+				type: 0,
+				content: 'msg 4',
+				channel_id: '1168516240332034067',
+				author: {
+					id: '1070667629972430879',
+					username: 'n8n-node-overhaul',
+					avatar: null,
+					discriminator: '1037',
+					public_flags: 0,
+					premium_type: 0,
+					flags: 0,
+					bot: true,
+					banner: null,
+					accent_color: null,
+					global_name: null,
+					avatar_decoration_data: null,
+					banner_color: null,
+				},
+				attachments: [],
+				embeds: [
+					{
+						type: 'rich',
+						title: 'Some Title',
+						description: 'description',
+						color: 2112935,
+						timestamp: '2023-10-30T22:00:00+00:00',
+						author: {
+							name: 'Me',
+						},
+					},
+				],
+				mentions: [],
+				mention_roles: [],
+				pinned: false,
+				mention_everyone: false,
+				tts: false,
+				timestamp: '2023-10-31T05:30:23.005000+00:00',
+				edited_timestamp: null,
+				flags: 0,
+				components: [],
+			},
+		];
+	}
+});
+
+describe('Test DiscordV2, message => getAll', () => {
+	const workflows = ['nodes/Discord/test/v2/node/message/getAll.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.resetAllMocks();
+	});
+
+	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(discordApiRequestSpy).toHaveBeenCalledTimes(1);
+		expect(discordApiRequestSpy).toHaveBeenCalledWith(
+			'GET',
+			'/channels/1168516240332034067/messages',
+			undefined,
+			{ limit: 1 },
+		);
+
+		expect(result.finished).toEqual(true);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/message/getAll.workflow.json b/packages/nodes-base/nodes/Discord/test/v2/node/message/getAll.workflow.json
new file mode 100644
index 0000000000000..212ae762710d2
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/message/getAll.workflow.json
@@ -0,0 +1,144 @@
+{
+  "name": "discord overhaul tests",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "254a9d9b-43bf-4f6e-a761-d78146a05838",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        -660,
+        560
+      ]
+    },
+    {
+      "parameters": {
+        "resource": "message",
+        "operation": "getAll",
+        "guildId": {
+          "__rl": true,
+          "value": "1168516062791340136",
+          "mode": "list",
+          "cachedResultName": "TEST server",
+          "cachedResultUrl": "https://discord.com/channels/1168516062791340136"
+        },
+        "channelId": {
+          "__rl": true,
+          "value": "1168516240332034067",
+          "mode": "list",
+          "cachedResultName": "first-channel",
+          "cachedResultUrl": "https://discord.com/channels/1168516062791340136/1168516240332034067"
+        },
+        "limit": 1,
+        "options": {}
+      },
+      "id": "7e638897-0581-42e6-8b89-494908e0ae75",
+      "name": "Bot test",
+      "type": "n8n-nodes-base.discord",
+      "typeVersion": 2,
+      "position": [
+        -420,
+        560
+      ],
+      "credentials": {
+        "discordBotApi": {
+          "id": "KaIz8dqE3Vy1E3iL",
+          "name": "Discord Bot account"
+        }
+      }
+    },
+    {
+      "parameters": {},
+      "id": "10450e91-8642-4b92-af15-9d5ad161b527",
+      "name": "No Operation, do nothing",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        -200,
+        560
+      ]
+    }
+  ],
+  "pinData": {
+    "No Operation, do nothing": [
+      {
+        "json": {
+          "id": "1168784010269433998",
+          "type": 0,
+          "content": "msg 4",
+          "channel_id": "1168516240332034067",
+          "author": {
+            "id": "1070667629972430879",
+            "username": "n8n-node-overhaul",
+            "avatar": null,
+            "discriminator": "1037",
+            "public_flags": 0,
+            "premium_type": 0,
+            "flags": 0,
+            "bot": true,
+            "banner": null,
+            "accent_color": null,
+            "global_name": null,
+            "avatar_decoration_data": null,
+            "banner_color": null
+          },
+          "attachments": [],
+          "embeds": [
+            {
+              "type": "rich",
+              "title": "Some Title",
+              "description": "description",
+              "color": 2112935,
+              "timestamp": "2023-10-30T22:00:00+00:00",
+              "author": {
+                "name": "Me"
+              }
+            }
+          ],
+          "mentions": [],
+          "mention_roles": [],
+          "pinned": false,
+          "mention_everyone": false,
+          "tts": false,
+          "timestamp": "2023-10-31T05:30:23.005000+00:00",
+          "edited_timestamp": null,
+          "flags": 0,
+          "components": []
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Bot test",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Bot test": {
+      "main": [
+        [
+          {
+            "node": "No Operation, do nothing",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {},
+  "versionId": "fd45b651-cad2-4985-bcee-9c87efeb9af5",
+  "id": "4DdFKgGmLX07cXvG",
+  "meta": {
+    "instanceId": "b888bd11cd1ddbb95450babf3e199556799d999b896f650de768b8370ee50363"
+  },
+  "tags": []
+}
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
new file mode 100644
index 0000000000000..780a3029bfb83
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/message/react.test.ts
@@ -0,0 +1,54 @@
+import type { INodeTypes } from 'n8n-workflow';
+import nock from 'nock';
+import * as transport from '../../../../v2/transport/discord.api';
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+const discordApiRequestSpy = jest.spyOn(transport, 'discordApiRequest');
+
+discordApiRequestSpy.mockImplementation(async (method: string, endpoint) => {
+	if (method === 'PUT') {
+		return {
+			success: true,
+		};
+	}
+});
+
+describe('Test DiscordV2, message => react', () => {
+	const workflows = ['nodes/Discord/test/v2/node/message/react.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.resetAllMocks();
+	});
+
+	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(discordApiRequestSpy).toHaveBeenCalledTimes(1);
+		expect(discordApiRequestSpy).toHaveBeenCalledWith(
+			'PUT',
+			'/channels/1168516240332034067/messages/1168777380144369718/reactions/%F0%9F%98%80/@me',
+		);
+
+		expect(result.finished).toEqual(true);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/message/react.workflow.json b/packages/nodes-base/nodes/Discord/test/v2/node/message/react.workflow.json
new file mode 100644
index 0000000000000..9f27053f6e924
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/message/react.workflow.json
@@ -0,0 +1,104 @@
+{
+  "name": "discord overhaul tests",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "254a9d9b-43bf-4f6e-a761-d78146a05838",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        -660,
+        560
+      ]
+    },
+    {
+      "parameters": {
+        "resource": "message",
+        "operation": "react",
+        "guildId": {
+          "__rl": true,
+          "value": "1168516062791340136",
+          "mode": "list",
+          "cachedResultName": "TEST server",
+          "cachedResultUrl": "https://discord.com/channels/1168516062791340136"
+        },
+        "channelId": {
+          "__rl": true,
+          "value": "1168516240332034067",
+          "mode": "list",
+          "cachedResultName": "first-channel",
+          "cachedResultUrl": "https://discord.com/channels/1168516062791340136/1168516240332034067"
+        },
+        "messageId": "1168777380144369718",
+        "emoji": "😀"
+      },
+      "id": "7e638897-0581-42e6-8b89-494908e0ae75",
+      "name": "Bot test",
+      "type": "n8n-nodes-base.discord",
+      "typeVersion": 2,
+      "position": [
+        -420,
+        560
+      ],
+      "credentials": {
+        "discordBotApi": {
+          "id": "KaIz8dqE3Vy1E3iL",
+          "name": "Discord Bot account"
+        }
+      }
+    },
+    {
+      "parameters": {},
+      "id": "10450e91-8642-4b92-af15-9d5ad161b527",
+      "name": "No Operation, do nothing",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        -200,
+        560
+      ]
+    }
+  ],
+  "pinData": {
+    "No Operation, do nothing": [
+      {
+        "json": {
+          "success": true
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Bot test",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Bot test": {
+      "main": [
+        [
+          {
+            "node": "No Operation, do nothing",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {},
+  "versionId": "cf2de495-fe80-4a98-9d06-c251ea1661ad",
+  "id": "4DdFKgGmLX07cXvG",
+  "meta": {
+    "instanceId": "b888bd11cd1ddbb95450babf3e199556799d999b896f650de768b8370ee50363"
+  },
+  "tags": []
+}
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
new file mode 100644
index 0000000000000..3094cec6e31b1
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/message/send.test.ts
@@ -0,0 +1,107 @@
+import type { INodeTypes } from 'n8n-workflow';
+import nock from 'nock';
+import * as transport from '../../../../v2/transport/discord.api';
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+const discordApiRequestSpy = jest.spyOn(transport, 'discordApiRequest');
+
+discordApiRequestSpy.mockImplementation(async (method: string, endpoint) => {
+	if (method === 'POST') {
+		return {
+			id: '1168784010269433998',
+			type: 0,
+			content: 'msg 4',
+			channel_id: '1168516240332034067',
+			author: {
+				id: '1070667629972430879',
+				username: 'n8n-node-overhaul',
+				avatar: null,
+				discriminator: '1037',
+				public_flags: 0,
+				premium_type: 0,
+				flags: 0,
+				bot: true,
+				banner: null,
+				accent_color: null,
+				global_name: null,
+				avatar_decoration_data: null,
+				banner_color: null,
+			},
+			attachments: [],
+			embeds: [
+				{
+					type: 'rich',
+					title: 'Some Title',
+					description: 'description',
+					color: 2112935,
+					timestamp: '2023-10-30T22:00:00+00:00',
+					author: {
+						name: 'Me',
+					},
+				},
+			],
+			mentions: [],
+			mention_roles: [],
+			pinned: false,
+			mention_everyone: false,
+			tts: false,
+			timestamp: '2023-10-31T05:30:23.005000+00:00',
+			edited_timestamp: null,
+			flags: 0,
+			components: [],
+			referenced_message: null,
+		};
+	}
+});
+
+describe('Test DiscordV2, message => send', () => {
+	const workflows = ['nodes/Discord/test/v2/node/message/send.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.resetAllMocks();
+	});
+
+	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(discordApiRequestSpy).toHaveBeenCalledTimes(1);
+		expect(discordApiRequestSpy).toHaveBeenCalledWith(
+			'POST',
+			'/channels/1168516240332034067/messages',
+			{
+				content: 'msg 4',
+				embeds: [
+					{
+						author: { name: 'Me' },
+						color: 2112935,
+						description: 'description',
+						timestamp: '2023-10-30T22:00:00.000Z',
+						title: 'Some Title',
+					},
+				],
+			},
+		);
+
+		expect(result.finished).toEqual(true);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/message/send.workflow.json b/packages/nodes-base/nodes/Discord/test/v2/node/message/send.workflow.json
new file mode 100644
index 0000000000000..f1ca99ef37452
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/message/send.workflow.json
@@ -0,0 +1,155 @@
+{
+  "name": "discord overhaul tests",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "254a9d9b-43bf-4f6e-a761-d78146a05838",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        -660,
+        560
+      ]
+    },
+    {
+      "parameters": {
+        "resource": "message",
+        "guildId": {
+          "__rl": true,
+          "value": "1168516062791340136",
+          "mode": "list",
+          "cachedResultName": "TEST server",
+          "cachedResultUrl": "https://discord.com/channels/1168516062791340136"
+        },
+        "channelId": {
+          "__rl": true,
+          "value": "1168516240332034067",
+          "mode": "list",
+          "cachedResultName": "first-channel",
+          "cachedResultUrl": "https://discord.com/channels/1168516062791340136/1168516240332034067"
+        },
+        "content": "msg 4",
+        "options": {},
+        "embeds": {
+          "values": [
+            {
+              "description": "description",
+              "author": "Me",
+              "color": "#203DA7",
+              "timestamp": "2023-10-30T22:00:00.000Z",
+              "title": "Some Title"
+            }
+          ]
+        }
+      },
+      "id": "7e638897-0581-42e6-8b89-494908e0ae75",
+      "name": "Bot test",
+      "type": "n8n-nodes-base.discord",
+      "typeVersion": 2,
+      "position": [
+        -420,
+        560
+      ],
+      "credentials": {
+        "discordBotApi": {
+          "id": "KaIz8dqE3Vy1E3iL",
+          "name": "Discord Bot account"
+        }
+      }
+    },
+    {
+      "parameters": {},
+      "id": "10450e91-8642-4b92-af15-9d5ad161b527",
+      "name": "No Operation, do nothing",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        -200,
+        560
+      ]
+    }
+  ],
+  "pinData": {
+    "No Operation, do nothing": [
+      {
+        "json": {
+          "id": "1168784010269433998",
+          "type": 0,
+          "content": "msg 4",
+          "channel_id": "1168516240332034067",
+          "author": {
+            "id": "1070667629972430879",
+            "username": "n8n-node-overhaul",
+            "avatar": null,
+            "discriminator": "1037",
+            "public_flags": 0,
+            "premium_type": 0,
+            "flags": 0,
+            "bot": true,
+            "banner": null,
+            "accent_color": null,
+            "global_name": null,
+            "avatar_decoration_data": null,
+            "banner_color": null
+          },
+          "attachments": [],
+          "embeds": [
+            {
+              "type": "rich",
+              "title": "Some Title",
+              "description": "description",
+              "color": 2112935,
+              "timestamp": "2023-10-30T22:00:00+00:00",
+              "author": {
+                "name": "Me"
+              }
+            }
+          ],
+          "mentions": [],
+          "mention_roles": [],
+          "pinned": false,
+          "mention_everyone": false,
+          "tts": false,
+          "timestamp": "2023-10-31T05:30:23.005000+00:00",
+          "edited_timestamp": null,
+          "flags": 0,
+          "components": [],
+          "referenced_message": null
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Bot test",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Bot test": {
+      "main": [
+        [
+          {
+            "node": "No Operation, do nothing",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {},
+  "versionId": "5b208250-62db-4b00-9e02-53392eb838a9",
+  "id": "4DdFKgGmLX07cXvG",
+  "meta": {
+    "instanceId": "b888bd11cd1ddbb95450babf3e199556799d999b896f650de768b8370ee50363"
+  },
+  "tags": []
+}
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
new file mode 100644
index 0000000000000..e19917d245692
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/webhook/sendLegacy.test.ts
@@ -0,0 +1,104 @@
+import type { INodeTypes } from 'n8n-workflow';
+import nock from 'nock';
+import * as transport from '../../../../v2/transport/discord.api';
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+const discordApiRequestSpy = jest.spyOn(transport, 'discordApiRequest');
+
+discordApiRequestSpy.mockImplementation(async (method: string, endpoint) => {
+	if (method === 'POST') {
+		return {
+			id: '1168768986385747999',
+			type: 0,
+			content: 'TEST Message',
+			channel_id: '1074646335082479626',
+			author: {
+				id: '1153265494955135077',
+				username: 'TEST_USER',
+				avatar: null,
+				discriminator: '0000',
+				public_flags: 0,
+				flags: 0,
+				bot: true,
+				global_name: null,
+			},
+			attachments: [],
+			embeds: [
+				{
+					type: 'rich',
+					description: 'some description',
+					color: 10930459,
+					timestamp: '2023-10-17T21:00:00+00:00',
+					author: {
+						name: 'Michael',
+					},
+				},
+			],
+			mentions: [],
+			mention_roles: [],
+			pinned: false,
+			mention_everyone: false,
+			tts: true,
+			timestamp: '2023-10-31T04:30:41.032000+00:00',
+			edited_timestamp: null,
+			flags: 4096,
+			components: [],
+			webhook_id: '1153265494955135077',
+		};
+	}
+});
+
+describe('Test DiscordV2, webhook => sendLegacy', () => {
+	const workflows = ['nodes/Discord/test/v2/node/webhook/sendLegacy.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.resetAllMocks();
+	});
+
+	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(discordApiRequestSpy).toHaveBeenCalledTimes(1);
+		expect(discordApiRequestSpy).toHaveBeenCalledWith(
+			'POST',
+			'',
+			{
+				content: 'TEST Message',
+				embeds: [
+					{
+						author: { name: 'Michael' },
+						color: 10930459,
+						description: 'some description',
+						timestamp: '2023-10-17T21:00:00.000Z',
+					},
+				],
+				flags: 4096,
+				tts: true,
+				username: 'TEST_USER',
+			},
+			{ wait: true },
+		);
+
+		expect(result.finished).toEqual(true);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/webhook/sendLegacy.workflow.json b/packages/nodes-base/nodes/Discord/test/v2/node/webhook/sendLegacy.workflow.json
new file mode 100644
index 0000000000000..3ae3b9b01b82b
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/webhook/sendLegacy.workflow.json
@@ -0,0 +1,141 @@
+{
+  "name": "discord overhaul tests copy",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "8fb04834-2c97-4f21-9300-0f38b0e82f08",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        -660,
+        560
+      ]
+    },
+    {
+      "parameters": {
+        "authentication": "webhook",
+        "content": "TEST Message",
+        "options": {
+          "flags": [
+            "SUPPRESS_NOTIFICATIONS"
+          ],
+          "tts": true,
+          "username": "TEST_USER",
+          "wait": true
+        },
+        "embeds": {
+          "values": [
+            {
+              "description": "some description",
+              "author": "Michael",
+              "color": "#A6C91B",
+              "timestamp": "2023-10-17T21:00:00.000Z"
+            }
+          ]
+        }
+      },
+      "id": "61f96217-f6b3-4989-be70-77b723e8e169",
+      "name": "Bot test",
+      "type": "n8n-nodes-base.discord",
+      "typeVersion": 2,
+      "position": [
+        -420,
+        560
+      ],
+      "credentials": {
+        "discordWebhookApi": {
+          "id": "86",
+          "name": "Discord account 3"
+        }
+      }
+    },
+    {
+      "parameters": {},
+      "id": "c9c936f7-7dee-40d2-bcf6-255cc9d6d5e8",
+      "name": "No Operation, do nothing",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        -200,
+        560
+      ]
+    }
+  ],
+  "pinData": {
+    "No Operation, do nothing": [
+      {
+        "json": {
+          "id": "1168768986385747999",
+          "type": 0,
+          "content": "TEST Message",
+          "channel_id": "1074646335082479626",
+          "author": {
+            "id": "1153265494955135077",
+            "username": "TEST_USER",
+            "avatar": null,
+            "discriminator": "0000",
+            "public_flags": 0,
+            "flags": 0,
+            "bot": true,
+            "global_name": null
+          },
+          "attachments": [],
+          "embeds": [
+            {
+              "type": "rich",
+              "description": "some description",
+              "color": 10930459,
+              "timestamp": "2023-10-17T21:00:00+00:00",
+              "author": {
+                "name": "Michael"
+              }
+            }
+          ],
+          "mentions": [],
+          "mention_roles": [],
+          "pinned": false,
+          "mention_everyone": false,
+          "tts": true,
+          "timestamp": "2023-10-31T04:30:41.032000+00:00",
+          "edited_timestamp": null,
+          "flags": 4096,
+          "components": [],
+          "webhook_id": "1153265494955135077"
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Bot test",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Bot test": {
+      "main": [
+        [
+          {
+            "node": "No Operation, do nothing",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {},
+  "versionId": "a4deab55-3791-4e57-b879-d804cd839348",
+  "id": "Hpl0rsKs6xAbHVO4",
+  "meta": {
+    "instanceId": "b888bd11cd1ddbb95450babf3e199556799d999b896f650de768b8370ee50363"
+  },
+  "tags": []
+}
diff --git a/packages/nodes-base/nodes/Discord/test/v2/utils.test.ts b/packages/nodes-base/nodes/Discord/test/v2/utils.test.ts
new file mode 100644
index 0000000000000..a54d48eee9fe9
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/test/v2/utils.test.ts
@@ -0,0 +1,160 @@
+import type { IExecuteFunctions, INode } from 'n8n-workflow';
+import {
+	createSimplifyFunction,
+	prepareOptions,
+	prepareEmbeds,
+	checkAccessToGuild,
+	setupChannelGetter,
+} from '../../v2/helpers/utils';
+
+import * as transport from '../../v2//transport/discord.api';
+
+const node: INode = {
+	id: '1',
+	name: 'Discord node',
+	typeVersion: 2,
+	type: 'n8n-nodes-base.discord',
+	position: [60, 760],
+	parameters: {
+		resource: 'channel',
+		operation: 'get',
+	},
+};
+
+describe('Test Discord > createSimplifyFunction', () => {
+	it('should create function', () => {
+		const result = createSimplifyFunction(['message_reference']);
+		expect(result).toBeDefined();
+		expect(typeof result).toBe('function');
+	});
+
+	it('should return object containing only specified fields', () => {
+		const simplify = createSimplifyFunction(['id', 'name']);
+		const data = {
+			id: '123',
+			name: 'test',
+			type: 'test',
+			randomField: 'test',
+		};
+		const result = simplify(data);
+		expect(result).toEqual({
+			id: '123',
+			name: 'test',
+		});
+	});
+});
+
+describe('Test Discord > prepareOptions', () => {
+	it('should return correct flag value', () => {
+		const result = prepareOptions({
+			flags: ['SUPPRESS_EMBEDS', 'SUPPRESS_NOTIFICATIONS'],
+		});
+		expect(result.flags).toBe((1 << 2) + (1 << 12));
+	});
+
+	it('should convert message_reference', () => {
+		const result = prepareOptions(
+			{
+				message_reference: '123456',
+			},
+			'789000',
+		);
+		expect(result.message_reference).toEqual({
+			message_id: '123456',
+			guild_id: '789000',
+		});
+	});
+});
+
+describe('Test Discord > prepareEmbeds', () => {
+	it('should return return empty object removing empty strings', () => {
+		const embeds = [
+			{
+				test1: 'test',
+				test2: 'test',
+				description: 'test',
+			},
+		];
+
+		const executeFunction = {};
+
+		const result = prepareEmbeds.call(executeFunction as unknown as IExecuteFunctions, embeds);
+
+		expect(result).toEqual(embeds);
+	});
+});
+
+describe('Test Discord > checkAccessToGuild', () => {
+	it('should throw error', () => {
+		const guildId = '123456';
+		const guilds = [
+			{
+				id: '789000',
+			},
+		];
+
+		expect(() => {
+			checkAccessToGuild(node, guildId, guilds);
+		}).toThrow('You do not have access to the guild with the id 123456');
+	});
+
+	it('should pass', () => {
+		const guildId = '123456';
+		const guilds = [
+			{
+				id: '123456',
+			},
+			{
+				id: '789000',
+			},
+		];
+
+		expect(() => {
+			checkAccessToGuild(node, guildId, guilds);
+		}).not.toThrow();
+	});
+});
+
+describe('Test Discord > setupChannelGetter & checkAccessToChannel', () => {
+	const discordApiRequestSpy = jest.spyOn(transport, 'discordApiRequest');
+	discordApiRequestSpy.mockImplementation(async (method: string) => {
+		if (method === 'GET') {
+			return {
+				guild_id: '123456',
+			};
+		}
+	});
+
+	afterAll(() => {
+		jest.restoreAllMocks();
+	});
+
+	it('should setup channel getter and get channel id', async () => {
+		const fakeExecuteFunction = (auth: string) => {
+			return {
+				getNodeParameter: (parameter: string) => {
+					if (parameter === 'authentication') return auth;
+					if (parameter === 'channelId') return '42';
+				},
+				getNode: () => node,
+			} as unknown as IExecuteFunctions;
+		};
+
+		const userGuilds = [
+			{
+				id: '789000',
+			},
+		];
+
+		try {
+			const getChannel = await setupChannelGetter.call(fakeExecuteFunction('oAuth2'), userGuilds);
+			await getChannel(0);
+		} catch (error) {
+			expect(error.message).toBe('You do not have access to the guild with the id 123456');
+		}
+
+		const getChannel = await setupChannelGetter.call(fakeExecuteFunction('botToken'), userGuilds);
+		const channelId = await getChannel(0);
+		expect(channelId).toBe('42');
+	});
+});
diff --git a/packages/nodes-base/nodes/Discord/v1/DiscordV1.node.ts b/packages/nodes-base/nodes/Discord/v1/DiscordV1.node.ts
new file mode 100644
index 0000000000000..54dd921797b29
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/v1/DiscordV1.node.ts
@@ -0,0 +1,291 @@
+/* eslint-disable n8n-nodes-base/node-filename-against-convention */
+
+import type {
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeBaseDescription,
+	INodeTypeDescription,
+	IRequestOptions,
+} from 'n8n-workflow';
+import { jsonParse, NodeApiError, NodeOperationError, sleep } from 'n8n-workflow';
+
+import { oldVersionNotice } from '../../../utils/descriptions';
+import type { DiscordAttachment, DiscordWebhook } from './Interfaces';
+
+const versionDescription: INodeTypeDescription = {
+	displayName: 'Discord',
+	name: 'discord',
+	icon: 'file:discord.svg',
+	group: ['output'],
+	version: 1,
+	description: 'Sends data to Discord',
+	defaults: {
+		name: 'Discord',
+	},
+	inputs: ['main'],
+	outputs: ['main'],
+	properties: [
+		oldVersionNotice,
+		{
+			displayName: 'Webhook URL',
+			name: 'webhookUri',
+			type: 'string',
+			required: true,
+			default: '',
+			placeholder: 'https://discord.com/api/webhooks/ID/TOKEN',
+		},
+		{
+			displayName: 'Content',
+			name: 'text',
+			type: 'string',
+			typeOptions: {
+				maxValue: 2000,
+			},
+			default: '',
+			placeholder: 'Hello World!',
+		},
+		{
+			displayName: 'Additional Fields',
+			name: 'options',
+			type: 'collection',
+			placeholder: 'Add Option',
+			default: {},
+			options: [
+				{
+					displayName: 'Allowed Mentions',
+					name: 'allowedMentions',
+					type: 'json',
+					typeOptions: { alwaysOpenEditWindow: true },
+					default: '',
+				},
+				{
+					displayName: 'Attachments',
+					name: 'attachments',
+					type: 'json',
+					typeOptions: { alwaysOpenEditWindow: true },
+					default: '',
+				},
+				{
+					displayName: 'Avatar URL',
+					name: 'avatarUrl',
+					type: 'string',
+					default: '',
+				},
+				{
+					displayName: 'Components',
+					name: 'components',
+					type: 'json',
+					typeOptions: { alwaysOpenEditWindow: true },
+					default: '',
+				},
+				{
+					displayName: 'Embeds',
+					name: 'embeds',
+					type: 'json',
+					typeOptions: { alwaysOpenEditWindow: true },
+					default: '',
+				},
+				{
+					displayName: 'Flags',
+					name: 'flags',
+					type: 'number',
+					default: '',
+				},
+				{
+					displayName: 'JSON Payload',
+					name: 'payloadJson',
+					type: 'json',
+					typeOptions: { alwaysOpenEditWindow: true },
+					default: '',
+				},
+				{
+					displayName: 'Username',
+					name: 'username',
+					type: 'string',
+					default: '',
+					placeholder: 'User',
+				},
+				{
+					displayName: 'TTS',
+					name: 'tts',
+					type: 'boolean',
+					default: false,
+					description: 'Whether this message be sent as a Text To Speech message',
+				},
+			],
+		},
+	],
+};
+
+export class DiscordV1 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			...versionDescription,
+		};
+	}
+
+	async execute(this: IExecuteFunctions) {
+		const returnData: INodeExecutionData[] = [];
+
+		const webhookUri = this.getNodeParameter('webhookUri', 0, '') as string;
+
+		if (!webhookUri) throw new NodeOperationError(this.getNode(), 'Webhook uri is required.');
+
+		const items = this.getInputData();
+		const length = items.length;
+		for (let i = 0; i < length; i++) {
+			const body: DiscordWebhook = {};
+
+			const iterationWebhookUri = this.getNodeParameter('webhookUri', i) as string;
+			body.content = this.getNodeParameter('text', i) as string;
+			const options = this.getNodeParameter('options', i);
+
+			if (!body.content && !options.embeds) {
+				throw new NodeOperationError(this.getNode(), 'Either content or embeds must be set.', {
+					itemIndex: i,
+				});
+			}
+			if (options.embeds) {
+				try {
+					//@ts-expect-error
+					body.embeds = JSON.parse(options.embeds);
+					if (!Array.isArray(body.embeds)) {
+						throw new NodeOperationError(this.getNode(), 'Embeds must be an array of embeds.', {
+							itemIndex: i,
+						});
+					}
+				} catch (e) {
+					throw new NodeOperationError(this.getNode(), 'Embeds must be valid JSON.', {
+						itemIndex: i,
+					});
+				}
+			}
+			if (options.username) {
+				body.username = options.username as string;
+			}
+
+			if (options.components) {
+				try {
+					//@ts-expect-error
+					body.components = JSON.parse(options.components);
+				} catch (e) {
+					throw new NodeOperationError(this.getNode(), 'Components must be valid JSON.', {
+						itemIndex: i,
+					});
+				}
+			}
+
+			if (options.allowed_mentions) {
+				//@ts-expect-error
+				body.allowed_mentions = jsonParse(options.allowed_mentions);
+			}
+
+			if (options.avatarUrl) {
+				body.avatar_url = options.avatarUrl as string;
+			}
+
+			if (options.flags) {
+				body.flags = options.flags as number;
+			}
+
+			if (options.tts) {
+				body.tts = options.tts as boolean;
+			}
+
+			if (options.payloadJson) {
+				//@ts-expect-error
+				body.payload_json = jsonParse(options.payloadJson);
+			}
+
+			if (options.attachments) {
+				//@ts-expect-error
+				body.attachments = jsonParse(options.attachments as DiscordAttachment[]);
+			}
+
+			//* Not used props, delete them from the payload as Discord won't need them :^
+			if (!body.content) delete body.content;
+			if (!body.username) delete body.username;
+			if (!body.avatar_url) delete body.avatar_url;
+			if (!body.embeds) delete body.embeds;
+			if (!body.allowed_mentions) delete body.allowed_mentions;
+			if (!body.flags) delete body.flags;
+			if (!body.components) delete body.components;
+			if (!body.payload_json) delete body.payload_json;
+			if (!body.attachments) delete body.attachments;
+
+			let requestOptions: IRequestOptions;
+
+			if (!body.payload_json) {
+				requestOptions = {
+					resolveWithFullResponse: true,
+					method: 'POST',
+					body,
+					uri: iterationWebhookUri,
+					headers: {
+						'content-type': 'application/json; charset=utf-8',
+					},
+					json: true,
+				};
+			} else {
+				requestOptions = {
+					resolveWithFullResponse: true,
+					method: 'POST',
+					body,
+					uri: iterationWebhookUri,
+					headers: {
+						'content-type': 'multipart/form-data; charset=utf-8',
+					},
+				};
+			}
+			let maxTries = 5;
+			let response;
+
+			do {
+				try {
+					response = await this.helpers.request(requestOptions);
+					const resetAfter = response.headers['x-ratelimit-reset-after'] * 1000;
+					const remainingRatelimit = response.headers['x-ratelimit-remaining'];
+
+					// remaining requests 0
+					// https://discord.com/developers/docs/topics/rate-limits
+					if (!+remainingRatelimit) {
+						await sleep(resetAfter ?? 1000);
+					}
+
+					break;
+				} catch (error) {
+					// HTTP/1.1 429 TOO MANY REQUESTS
+					// Await when the current rate limit will reset
+					// https://discord.com/developers/docs/topics/rate-limits
+					if (error.statusCode === 429) {
+						const retryAfter = error.response?.headers['retry-after'] || 1000;
+
+						await sleep(+retryAfter);
+
+						continue;
+					}
+
+					throw error;
+				}
+			} while (--maxTries);
+
+			if (maxTries <= 0) {
+				throw new NodeApiError(this.getNode(), {
+					error: 'Could not send Webhook message. Max amount of rate-limit retries reached.',
+				});
+			}
+
+			const executionData = this.helpers.constructExecutionMetaData(
+				this.helpers.returnJsonArray({ success: true }),
+				{ itemData: { item: i } },
+			);
+			returnData.push(...executionData);
+		}
+
+		return [returnData];
+	}
+}
diff --git a/packages/nodes-base/nodes/Discord/Interfaces.ts b/packages/nodes-base/nodes/Discord/v1/Interfaces.ts
similarity index 100%
rename from packages/nodes-base/nodes/Discord/Interfaces.ts
rename to packages/nodes-base/nodes/Discord/v1/Interfaces.ts
diff --git a/packages/nodes-base/nodes/Discord/v2/DiscordV2.node.ts b/packages/nodes-base/nodes/Discord/v2/DiscordV2.node.ts
new file mode 100644
index 0000000000000..6e9c433ec856c
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/v2/DiscordV2.node.ts
@@ -0,0 +1,35 @@
+/* eslint-disable n8n-nodes-base/node-filename-against-convention */
+
+import type {
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeBaseDescription,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+
+import { listSearch, loadOptions } from './methods';
+
+import { router } from './actions/router';
+
+import { versionDescription } from './actions/versionDescription';
+
+export class DiscordV2 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			...versionDescription,
+		};
+	}
+
+	methods = {
+		listSearch,
+		loadOptions,
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		return await router.call(this);
+	}
+}
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
new file mode 100644
index 0000000000000..5372fb92b7aeb
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/v2/actions/channel/create.operation.ts
@@ -0,0 +1,206 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+import { updateDisplayOptions } from '../../../../../utils/utilities';
+import { parseDiscordError, prepareErrorData } from '../../helpers/utils';
+import { discordApiRequest } from '../../transport';
+import { categoryRLC } from '../common.description';
+
+const properties: INodeProperties[] = [
+	{
+		displayName: 'Name',
+		name: 'name',
+		type: 'string',
+		default: '',
+		required: true,
+		description: 'The name of the channel',
+		placeholder: 'e.g. new-channel',
+	},
+	{
+		displayName: 'Type',
+		name: 'type',
+		type: 'options',
+		default: '0',
+		required: true,
+		description: 'The type of channel to create',
+		options: [
+			{
+				name: 'Guild Text',
+				value: '0',
+			},
+			{
+				name: 'Guild Voice',
+				value: '2',
+			},
+			{
+				name: 'Guild Category',
+				value: '4',
+			},
+		],
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			{
+				displayName: 'Age-Restricted (NSFW)',
+				name: 'nsfw',
+				type: 'boolean',
+				default: false,
+				description: 'Whether the content of the channel might be nsfw (not safe for work)',
+				displayOptions: {
+					hide: {
+						'/type': ['4'],
+					},
+				},
+			},
+			{
+				displayName: 'Bitrate',
+				name: 'bitrate',
+				type: 'number',
+				default: 8000,
+				placeholder: 'e.g. 8000',
+				typeOptions: {
+					minValue: 8000,
+					maxValue: 96000,
+				},
+				description: 'The bitrate (in bits) of the voice channel',
+				displayOptions: {
+					show: {
+						'/type': ['2'],
+					},
+				},
+			},
+			{
+				...categoryRLC,
+				displayOptions: {
+					hide: {
+						'/type': ['4'],
+					},
+				},
+			},
+			{
+				displayName: 'Position',
+				name: 'position',
+				type: 'number',
+				default: 1,
+			},
+			{
+				displayName: 'Rate Limit Per User',
+				name: 'rate_limit_per_user',
+				type: 'number',
+				default: 0,
+				description: 'Amount of seconds a user has to wait before sending another message',
+				displayOptions: {
+					hide: {
+						'/type': ['4'],
+					},
+				},
+			},
+			{
+				displayName: 'Topic',
+				name: 'topic',
+				type: 'string',
+				default: '',
+				typeOptions: {
+					rows: 2,
+				},
+				description: 'The channel topic description (0-1024 characters)',
+				placeholder: 'e.g. This channel is about…',
+				displayOptions: {
+					hide: {
+						'/type': ['4'],
+					},
+				},
+			},
+			{
+				displayName: 'User Limit',
+				name: 'user_limit',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+					maxValue: 99,
+				},
+				placeholder: 'e.g. 20',
+				description:
+					'The limit for the number of members that can be in the channel (0 refers to no limit)',
+				displayOptions: {
+					show: {
+						'/type': ['2'],
+					},
+				},
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['channel'],
+		operation: ['create'],
+	},
+	hide: {
+		authentication: ['webhook'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	guildId: string,
+): Promise<INodeExecutionData[]> {
+	const returnData: INodeExecutionData[] = [];
+	const items = this.getInputData();
+
+	for (let i = 0; i < items.length; i++) {
+		try {
+			const name = this.getNodeParameter('name', i) as string;
+			const type = this.getNodeParameter('type', i) as string;
+			const options = this.getNodeParameter('options', i);
+
+			if (options.categoryId) {
+				options.parent_id = (options.categoryId as IDataObject).value;
+				delete options.categoryId;
+			}
+
+			const body: IDataObject = {
+				name,
+				type,
+				...options,
+			};
+
+			const response = await discordApiRequest.call(
+				this,
+				'POST',
+				`/guilds/${guildId}/channels`,
+				body,
+			);
+
+			const executionData = this.helpers.constructExecutionMetaData(
+				this.helpers.returnJsonArray(response),
+				{ itemData: { item: i } },
+			);
+
+			returnData.push(...executionData);
+		} catch (error) {
+			const err = parseDiscordError.call(this, error, i);
+
+			if (this.continueOnFail()) {
+				returnData.push(...prepareErrorData.call(this, err, i));
+				continue;
+			}
+
+			throw err;
+		}
+	}
+
+	return returnData;
+}
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
new file mode 100644
index 0000000000000..57c405655f10f
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/v2/actions/channel/deleteChannel.operation.ts
@@ -0,0 +1,61 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+import { updateDisplayOptions } from '../../../../../utils/utilities';
+import { parseDiscordError, prepareErrorData, setupChannelGetter } from '../../helpers/utils';
+import { discordApiRequest } from '../../transport';
+import { channelRLC } from '../common.description';
+
+const properties: INodeProperties[] = [channelRLC];
+
+const displayOptions = {
+	show: {
+		resource: ['channel'],
+		operation: ['deleteChannel'],
+	},
+	hide: {
+		authentication: ['webhook'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	_guildId: string,
+	userGuilds: IDataObject[],
+): Promise<INodeExecutionData[]> {
+	const returnData: INodeExecutionData[] = [];
+	const items = this.getInputData();
+
+	const getChannelId = await setupChannelGetter.call(this, userGuilds);
+
+	for (let i = 0; i < items.length; i++) {
+		try {
+			const channelId = await getChannelId(i);
+
+			const response = await discordApiRequest.call(this, 'DELETE', `/channels/${channelId}`);
+
+			const executionData = this.helpers.constructExecutionMetaData(
+				this.helpers.returnJsonArray(response),
+				{ itemData: { item: i } },
+			);
+
+			returnData.push(...executionData);
+		} catch (error) {
+			const err = parseDiscordError.call(this, error, i);
+
+			if (this.continueOnFail()) {
+				returnData.push(...prepareErrorData.call(this, err, i));
+				continue;
+			}
+
+			throw err;
+		}
+	}
+
+	return returnData;
+}
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
new file mode 100644
index 0000000000000..585b5294d405a
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/v2/actions/channel/get.operation.ts
@@ -0,0 +1,61 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+import { updateDisplayOptions } from '../../../../../utils/utilities';
+import { parseDiscordError, prepareErrorData, setupChannelGetter } from '../../helpers/utils';
+import { discordApiRequest } from '../../transport';
+import { channelRLC } from '../common.description';
+
+const properties: INodeProperties[] = [channelRLC];
+
+const displayOptions = {
+	show: {
+		resource: ['channel'],
+		operation: ['get'],
+	},
+	hide: {
+		authentication: ['webhook'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	_guildId: string,
+	userGuilds: IDataObject[],
+): Promise<INodeExecutionData[]> {
+	const returnData: INodeExecutionData[] = [];
+	const items = this.getInputData();
+
+	const getChannelId = await setupChannelGetter.call(this, userGuilds);
+
+	for (let i = 0; i < items.length; i++) {
+		try {
+			const channelId = await getChannelId(i);
+
+			const response = await discordApiRequest.call(this, 'GET', `/channels/${channelId}`);
+
+			const executionData = this.helpers.constructExecutionMetaData(
+				this.helpers.returnJsonArray(response),
+				{ itemData: { item: i } },
+			);
+
+			returnData.push(...executionData);
+		} catch (error) {
+			const err = parseDiscordError.call(this, error, i);
+
+			if (this.continueOnFail()) {
+				returnData.push(...prepareErrorData.call(this, err, i));
+				continue;
+			}
+
+			throw err;
+		}
+	}
+
+	return returnData;
+}
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
new file mode 100644
index 0000000000000..c71f305b425bc
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/v2/actions/channel/getAll.operation.ts
@@ -0,0 +1,96 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+import { updateDisplayOptions } from '../../../../../utils/utilities';
+import { parseDiscordError, prepareErrorData } from '../../helpers/utils';
+import { discordApiRequest } from '../../transport';
+import { returnAllOrLimit } from '../../../../../utils/descriptions';
+
+const properties: INodeProperties[] = [
+	...returnAllOrLimit,
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			{
+				displayName: 'Filter by Type',
+				name: 'filter',
+				type: 'multiOptions',
+				default: [],
+				options: [
+					{
+						name: 'Guild Text',
+						value: 0,
+					},
+					{
+						name: 'Guild Voice',
+						value: 2,
+					},
+					{
+						name: 'Guild Category',
+						value: 4,
+					},
+				],
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['channel'],
+		operation: ['getAll'],
+	},
+	hide: {
+		authentication: ['webhook'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	guildId: string,
+): Promise<INodeExecutionData[]> {
+	const returnData: INodeExecutionData[] = [];
+
+	try {
+		const returnAll = this.getNodeParameter('returnAll', 0, false);
+		let response = await discordApiRequest.call(this, 'GET', `/guilds/${guildId}/channels`);
+
+		if (!returnAll) {
+			const limit = this.getNodeParameter('limit', 0);
+			response = (response as IDataObject[]).slice(0, limit);
+		}
+
+		const options = this.getNodeParameter('options', 0, {});
+
+		if (options.filter) {
+			const filter = options.filter as number[];
+			response = (response as IDataObject[]).filter((item) => filter.includes(item.type as number));
+		}
+
+		const executionData = this.helpers.constructExecutionMetaData(
+			this.helpers.returnJsonArray(response),
+			{ itemData: { item: 0 } },
+		);
+
+		returnData.push(...executionData);
+	} catch (error) {
+		const err = parseDiscordError.call(this, error);
+
+		if (this.continueOnFail()) {
+			returnData.push(...prepareErrorData.call(this, err, 0));
+		}
+
+		throw err;
+	}
+
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/channel/index.ts b/packages/nodes-base/nodes/Discord/v2/actions/channel/index.ts
new file mode 100644
index 0000000000000..e866e89ac0c42
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/v2/actions/channel/index.ts
@@ -0,0 +1,72 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+import { guildRLC } from '../common.description';
+import * as create from './create.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';
+
+export { create, get, getAll, update, deleteChannel };
+
+export const description: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				resource: ['channel'],
+				authentication: ['botToken', 'oAuth2'],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a new channel',
+				action: 'Create a channel',
+			},
+			{
+				name: 'Delete',
+				value: 'deleteChannel',
+				description: 'Delete a channel',
+				action: 'Delete a channel',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get a channel',
+				action: 'Get a channel',
+			},
+			{
+				name: 'Get Many',
+				value: 'getAll',
+				description: 'Retrieve the channels of a server',
+				action: 'Get many channels',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update a channel',
+				action: 'Update a channel',
+			},
+		],
+		default: 'create',
+	},
+	{
+		...guildRLC,
+		displayOptions: {
+			show: {
+				resource: ['channel'],
+				authentication: ['botToken', 'oAuth2'],
+			},
+		},
+	},
+	...create.description,
+	...deleteChannel.description,
+	...get.description,
+	...getAll.description,
+	...update.description,
+];
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
new file mode 100644
index 0000000000000..0466bd20c3947
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/v2/actions/channel/update.operation.ts
@@ -0,0 +1,153 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+import { updateDisplayOptions } from '../../../../../utils/utilities';
+import { parseDiscordError, prepareErrorData, setupChannelGetter } from '../../helpers/utils';
+import { discordApiRequest } from '../../transport';
+import { categoryRLC, channelRLC } from '../common.description';
+
+const properties: INodeProperties[] = [
+	channelRLC,
+	{
+		displayName: 'Name',
+		name: 'name',
+		type: 'string',
+		default: '',
+		description:
+			"The new name of the channel. Fill this field only if you want to change the channel's name.",
+		placeholder: 'e.g. new-channel-name',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			{
+				displayName: 'Age-Restricted (NSFW)',
+				name: 'nsfw',
+				type: 'boolean',
+				default: false,
+				description: 'Whether the content of the channel might be nsfw (not safe for work)',
+			},
+			{
+				displayName: 'Bitrate',
+				name: 'bitrate',
+				type: 'number',
+				default: 8000,
+				typeOptions: {
+					minValue: 8000,
+					maxValue: 96000,
+				},
+				description: 'The bitrate (in bits) of the voice channel',
+				hint: 'Only applicable to voice channels',
+			},
+			categoryRLC,
+			{
+				displayName: 'Position',
+				name: 'position',
+				type: 'number',
+				default: 1,
+			},
+
+			{
+				displayName: 'Rate Limit Per User',
+				name: 'rate_limit_per_user',
+				type: 'number',
+				default: 0,
+				description: 'Amount of seconds a user has to wait before sending another message',
+			},
+			{
+				displayName: 'Topic',
+				name: 'topic',
+				type: 'string',
+				default: '',
+				typeOptions: {
+					rows: 2,
+				},
+				description: 'The channel topic description (0-1024 characters)',
+				placeholder: 'e.g. This channel is about…',
+			},
+			{
+				displayName: 'User Limit',
+				name: 'user_limit',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+					maxValue: 99,
+				},
+				placeholder: 'e.g. 20',
+				hint: 'Only applicable to voice channels',
+				description:
+					'The limit for the number of members that can be in the channel (0 refers to no limit)',
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['channel'],
+		operation: ['update'],
+	},
+	hide: {
+		authentication: ['webhook'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	_guildId: string,
+	userGuilds: IDataObject[],
+): Promise<INodeExecutionData[]> {
+	const returnData: INodeExecutionData[] = [];
+	const items = this.getInputData();
+
+	const getChannelId = await setupChannelGetter.call(this, userGuilds);
+
+	for (let i = 0; i < items.length; i++) {
+		try {
+			const channelId = await getChannelId(i);
+
+			const name = this.getNodeParameter('name', i) as string;
+			const options = this.getNodeParameter('options', i);
+
+			if (options.categoryId) {
+				options.parent_id = (options.categoryId as IDataObject).value;
+				delete options.categoryId;
+			}
+
+			const body: IDataObject = {
+				name,
+				...options,
+			};
+
+			const response = await discordApiRequest.call(this, 'PATCH', `/channels/${channelId}`, body);
+
+			const executionData = this.helpers.constructExecutionMetaData(
+				this.helpers.returnJsonArray(response),
+				{ itemData: { item: i } },
+			);
+
+			returnData.push(...executionData);
+		} catch (error) {
+			const err = parseDiscordError.call(this, error, i);
+
+			if (this.continueOnFail()) {
+				returnData.push(...prepareErrorData.call(this, err, i));
+				continue;
+			}
+
+			throw err;
+		}
+	}
+
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/common.description.ts b/packages/nodes-base/nodes/Discord/v2/actions/common.description.ts
new file mode 100644
index 0000000000000..a4ce3f4147f76
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/v2/actions/common.description.ts
@@ -0,0 +1,464 @@
+import type { INodeProperties } from 'n8n-workflow';
+import { updateDisplayOptions } from '../../../../utils/utilities';
+
+export const guildRLC: INodeProperties = {
+	displayName: 'Server',
+	name: 'guildId',
+	type: 'resourceLocator',
+	default: { mode: 'list', value: '' },
+	required: true,
+	description: 'Select the server (guild) that your bot is connected to',
+	modes: [
+		{
+			displayName: 'By Name',
+			name: 'list',
+			type: 'list',
+			placeholder: 'e.g. my-server',
+			typeOptions: {
+				searchListMethod: 'guildSearch',
+			},
+		},
+		{
+			displayName: 'By URL',
+			name: 'url',
+			type: 'string',
+			placeholder: 'e.g. https://discord.com/channels/[guild-id]',
+			extractValue: {
+				type: 'regex',
+				regex: 'https:\\/\\/discord.com\\/channels\\/([0-9]+)',
+			},
+			validation: [
+				{
+					type: 'regex',
+					properties: {
+						regex: 'https:\\/\\/discord.com\\/channels\\/([0-9]+)',
+						errorMessage: 'Not a valid Discord Server URL',
+					},
+				},
+			],
+		},
+		{
+			displayName: 'By ID',
+			name: 'id',
+			type: 'string',
+			placeholder: 'e.g. 896347036838936576',
+			validation: [
+				{
+					type: 'regex',
+					properties: {
+						regex: '[0-9]+',
+						errorMessage: 'Not a valid Discord Server ID',
+					},
+				},
+			],
+		},
+	],
+};
+
+export const channelRLC: INodeProperties = {
+	displayName: 'Channel',
+	name: 'channelId',
+	type: 'resourceLocator',
+	default: { mode: 'list', value: '' },
+	required: true,
+	description: 'Select the channel by name, URL, or ID',
+	modes: [
+		{
+			displayName: 'By Name',
+			name: 'list',
+			type: 'list',
+			placeholder: 'e.g. my-channel',
+			typeOptions: {
+				searchListMethod: 'channelSearch',
+			},
+		},
+		{
+			displayName: 'By URL',
+			name: 'url',
+			type: 'string',
+			placeholder: 'e.g. https://discord.com/channels/[guild-id]/[channel-id]',
+			extractValue: {
+				type: 'regex',
+				regex: 'https:\\/\\/discord.com\\/channels\\/[0-9]+\\/([0-9]+)',
+			},
+			validation: [
+				{
+					type: 'regex',
+					properties: {
+						regex: 'https:\\/\\/discord.com\\/channels\\/[0-9]+\\/([0-9]+)',
+						errorMessage: 'Not a valid Discord Channel URL',
+					},
+				},
+			],
+		},
+		{
+			displayName: 'By ID',
+			name: 'id',
+			type: 'string',
+			placeholder: 'e.g. 896347036838936576',
+			validation: [
+				{
+					type: 'regex',
+					properties: {
+						regex: '[0-9]+',
+						errorMessage: 'Not a valid Discord Channel ID',
+					},
+				},
+			],
+		},
+	],
+};
+
+export const textChannelRLC: INodeProperties = {
+	displayName: 'Channel',
+	name: 'channelId',
+	type: 'resourceLocator',
+	default: { mode: 'list', value: '' },
+	required: true,
+	description: 'Select the channel by name, URL, or ID',
+	modes: [
+		{
+			displayName: 'By Name',
+			name: 'list',
+			type: 'list',
+			placeholder: 'e.g. my-channel',
+			typeOptions: {
+				searchListMethod: 'textChannelSearch',
+			},
+		},
+		{
+			displayName: 'By URL',
+			name: 'url',
+			type: 'string',
+			placeholder: 'e.g. https://discord.com/channels/[guild-id]/[channel-id]',
+			extractValue: {
+				type: 'regex',
+				regex: 'https:\\/\\/discord.com\\/channels\\/[0-9]+\\/([0-9]+)',
+			},
+			validation: [
+				{
+					type: 'regex',
+					properties: {
+						regex: 'https:\\/\\/discord.com\\/channels\\/[0-9]+\\/([0-9]+)',
+						errorMessage: 'Not a valid Discord Channel URL',
+					},
+				},
+			],
+		},
+		{
+			displayName: 'By ID',
+			name: 'id',
+			type: 'string',
+			placeholder: 'e.g. 896347036838936576',
+			validation: [
+				{
+					type: 'regex',
+					properties: {
+						regex: '[0-9]+',
+						errorMessage: 'Not a valid Discord Channel ID',
+					},
+				},
+			],
+		},
+	],
+};
+
+export const categoryRLC: INodeProperties = {
+	displayName: 'Parent Category',
+	name: 'categoryId',
+	type: 'resourceLocator',
+	default: { mode: 'list', value: '' },
+	description: 'The parent category where you want the channel to appear',
+	modes: [
+		{
+			displayName: 'By Name',
+			name: 'list',
+			type: 'list',
+			placeholder: 'e.g. my-channel',
+			typeOptions: {
+				searchListMethod: 'categorySearch',
+			},
+		},
+		{
+			displayName: 'By URL',
+			name: 'url',
+			type: 'string',
+			placeholder: 'e.g. https://discord.com/channels/[guild-id]/[channel-id]',
+			extractValue: {
+				type: 'regex',
+				regex: 'https:\\/\\/discord.com\\/channels\\/[0-9]+\\/([0-9]+)',
+			},
+			validation: [
+				{
+					type: 'regex',
+					properties: {
+						regex: 'https:\\/\\/discord.com\\/channels\\/[0-9]+\\/([0-9]+)',
+						errorMessage: 'Not a valid Discord Category URL',
+					},
+				},
+			],
+		},
+		{
+			displayName: 'By ID',
+			name: 'id',
+			type: 'string',
+			placeholder: 'e.g. 896347036838936576',
+			validation: [
+				{
+					type: 'regex',
+					properties: {
+						regex: '[0-9]+',
+						errorMessage: 'Not a valid Discord Category ID',
+					},
+				},
+			],
+		},
+	],
+};
+
+export const userRLC: INodeProperties = {
+	displayName: 'User',
+	name: 'userId',
+	type: 'resourceLocator',
+	default: { mode: 'list', value: '' },
+	description: 'Select the user you want to assign a role to',
+	modes: [
+		{
+			displayName: 'By Name',
+			name: 'list',
+			type: 'list',
+			placeholder: 'e.g. DiscordUser',
+			typeOptions: {
+				searchListMethod: 'userSearch',
+			},
+		},
+		{
+			displayName: 'By ID',
+			name: 'id',
+			type: 'string',
+			placeholder: 'e.g. 786953432728469534',
+			validation: [
+				{
+					type: 'regex',
+					properties: {
+						regex: '[0-9]+',
+						errorMessage: 'Not a valid User ID',
+					},
+				},
+			],
+		},
+	],
+};
+
+export const roleMultiOptions: INodeProperties = {
+	// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-multi-options
+	displayName: 'Role',
+	name: 'role',
+	type: 'multiOptions',
+	typeOptions: {
+		loadOptionsMethod: 'getRoles',
+		loadOptionsDependsOn: ['userId.value', 'guildId.value', 'operation'],
+	},
+	required: true,
+	// eslint-disable-next-line n8n-nodes-base/node-param-description-wrong-for-dynamic-multi-options
+	description: 'Select the roles you want to add to the user',
+	default: [],
+};
+
+export const maxResultsNumber: INodeProperties = {
+	displayName: 'Max Results',
+	name: 'maxResults',
+	type: 'number',
+	typeOptions: {
+		minValue: 1,
+	},
+	default: 50,
+	description: 'Maximum number of results. Too many results may slow down the query.',
+};
+
+export const messageIdString: INodeProperties = {
+	displayName: 'Message ID',
+	name: 'messageId',
+	type: 'string',
+	default: '',
+	required: true,
+	description: 'The ID of the message',
+	placeholder: 'e.g. 1057576506244726804',
+};
+
+export const simplifyBoolean: INodeProperties = {
+	displayName: 'Simplify',
+	name: 'simplify',
+	type: 'boolean',
+	default: true,
+	description: 'Whether to return a simplified version of the response instead of the raw data',
+};
+
+// embeds -----------------------------------------------------------------------------------------
+const embedFields: INodeProperties[] = [
+	{
+		displayName: 'Description',
+		name: 'description',
+		type: 'string',
+		default: '',
+		description: 'The description of embed',
+		placeholder: 'e.g. My description',
+		typeOptions: {
+			rows: 2,
+		},
+	},
+	{
+		displayName: 'Author',
+		name: 'author',
+		type: 'string',
+		default: '',
+		description: 'The name of the author',
+		placeholder: 'e.g. John Doe',
+	},
+	{
+		displayName: 'Color',
+		name: 'color',
+		// eslint-disable-next-line n8n-nodes-base/node-param-color-type-unused
+		type: 'color',
+		default: '',
+		description: 'Color code of the embed',
+		placeholder: 'e.g. 12123432',
+	},
+	{
+		displayName: 'Timestamp',
+		name: 'timestamp',
+		type: 'dateTime',
+		default: '',
+		description: 'The time displayed at the bottom of the embed. Provide in ISO8601 format.',
+		placeholder: 'e.g. 2023-02-08 09:30:26',
+	},
+	{
+		displayName: 'Title',
+		name: 'title',
+		type: 'string',
+		default: '',
+		description: 'The title of embed',
+		placeholder: "e.g. Embed's title",
+	},
+	{
+		displayName: 'URL',
+		name: 'url',
+		type: 'string',
+		default: '',
+		description: 'The URL where you want to link the embed to',
+		placeholder: 'e.g. https://discord.com/',
+	},
+	{
+		displayName: 'URL Image',
+		name: 'image',
+		type: 'string',
+		default: '',
+		description: 'Source URL of image (only supports http(s) and attachments)',
+		placeholder: 'e.g. https://example.com/image.png',
+	},
+	{
+		displayName: 'URL Thumbnail',
+		name: 'thumbnail',
+		type: 'string',
+		default: '',
+		description: 'Source URL of thumbnail (only supports http(s) and attachments)',
+		placeholder: 'e.g. https://example.com/image.png',
+	},
+	{
+		displayName: 'URL Video',
+		name: 'video',
+		type: 'string',
+		default: '',
+		description: 'Source URL of video',
+		placeholder: 'e.g. https://example.com/video.mp4',
+	},
+];
+
+const embedFieldsDescription = updateDisplayOptions(
+	{
+		show: {
+			inputMethod: ['fields'],
+		},
+	},
+	embedFields,
+);
+
+export const embedsFixedCollection: INodeProperties = {
+	displayName: 'Embeds',
+	name: 'embeds',
+	type: 'fixedCollection',
+	placeholder: 'Add Embeds',
+	typeOptions: {
+		multipleValues: true,
+	},
+	default: [],
+	options: [
+		{
+			displayName: 'Values',
+			name: 'values',
+			values: [
+				{
+					displayName: 'Input Method',
+					name: 'inputMethod',
+					type: 'options',
+					options: [
+						{
+							name: 'Enter Fields',
+							value: 'fields',
+						},
+						{
+							name: 'Raw JSON',
+							value: 'json',
+						},
+					],
+					default: 'fields',
+				},
+				{
+					displayName: 'Value',
+					name: 'json',
+					type: 'json',
+					default: '={}',
+					typeOptions: {
+						rows: 2,
+					},
+					displayOptions: {
+						show: {
+							inputMethod: ['json'],
+						},
+					},
+				},
+				...embedFieldsDescription,
+			],
+		},
+	],
+};
+
+// -------------------------------------------------------------------------------------------
+
+export const filesFixedCollection: INodeProperties = {
+	displayName: 'Files',
+	name: 'files',
+	type: 'fixedCollection',
+	placeholder: 'Add Files',
+	typeOptions: {
+		multipleValues: true,
+	},
+	default: [],
+	options: [
+		{
+			displayName: 'Values',
+			name: 'values',
+			values: [
+				{
+					displayName: 'Input Data Field Name',
+					name: 'inputFieldName',
+					type: 'string',
+					default: 'data',
+					description: 'The contents of the file being sent with the message',
+					placeholder: 'e.g. data',
+					hint: 'The name of the input field containing the binary file data to be sent',
+				},
+			],
+		},
+	],
+};
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
new file mode 100644
index 0000000000000..6394997d832d1
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/v2/actions/member/getAll.operation.ts
@@ -0,0 +1,121 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+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,
+	{
+		displayName: 'After',
+		name: 'after',
+		type: 'string',
+		default: '',
+		placeholder: 'e.g. 786953432728469534',
+		description: 'The ID of the user after which to return the members',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [simplifyBoolean],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['member'],
+		operation: ['getAll'],
+	},
+	hide: {
+		authentication: ['webhook'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	guildId: string,
+): Promise<INodeExecutionData[]> {
+	const returnData: INodeExecutionData[] = [];
+
+	const returnAll = this.getNodeParameter('returnAll', 0, false);
+	const after = this.getNodeParameter('after', 0);
+
+	const qs: IDataObject = {};
+
+	if (!returnAll) {
+		const limit = this.getNodeParameter('limit', 0);
+		qs.limit = limit;
+	}
+
+	if (after) {
+		qs.after = after;
+	}
+
+	let response: IDataObject[] = [];
+
+	try {
+		if (!returnAll) {
+			const limit = this.getNodeParameter('limit', 0);
+			qs.limit = limit;
+			response = await discordApiRequest.call(
+				this,
+				'GET',
+				`/guilds/${guildId}/members`,
+				undefined,
+				qs,
+			);
+		} else {
+			let responseData;
+			qs.limit = 100;
+
+			do {
+				responseData = await discordApiRequest.call(
+					this,
+					'GET',
+					`/guilds/${guildId}/members`,
+					undefined,
+					qs,
+				);
+				if (!responseData?.length) break;
+				qs.after = responseData[responseData.length - 1].user.id;
+				response.push(...responseData);
+			} while (responseData.length);
+		}
+
+		const simplify = this.getNodeParameter('options.simplify', 0, false) as boolean;
+
+		if (simplify) {
+			const simplifyResponse = createSimplifyFunction(['user', 'roles', 'permissions']);
+
+			response = response.map(simplifyResponse);
+		}
+
+		const executionData = this.helpers.constructExecutionMetaData(
+			this.helpers.returnJsonArray(response),
+			{ itemData: { item: 0 } },
+		);
+
+		returnData.push(...executionData);
+	} catch (error) {
+		const err = parseDiscordError.call(this, error);
+
+		if (this.continueOnFail()) {
+			returnData.push(...prepareErrorData.call(this, err, 0));
+		}
+
+		throw err;
+	}
+
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/member/index.ts b/packages/nodes-base/nodes/Discord/v2/actions/member/index.ts
new file mode 100644
index 0000000000000..a2260b731c13d
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/v2/actions/member/index.ts
@@ -0,0 +1,56 @@
+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';
+
+export { getAll, roleAdd, roleRemove };
+
+export const description: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				resource: ['member'],
+				authentication: ['botToken', 'oAuth2'],
+			},
+		},
+		options: [
+			{
+				name: 'Get Many',
+				value: 'getAll',
+				description: 'Retrieve the members of a server',
+				action: 'Get many members',
+			},
+			{
+				name: 'Role Add',
+				value: 'roleAdd',
+				description: 'Add a role to a member',
+				action: 'Add a role to a member',
+			},
+			{
+				name: 'Role Remove',
+				value: 'roleRemove',
+				description: 'Remove a role from a member',
+				action: 'Remove a role from a member',
+			},
+		],
+		default: 'getAll',
+	},
+	{
+		...guildRLC,
+		displayOptions: {
+			show: {
+				resource: ['member'],
+				authentication: ['botToken', 'oAuth2'],
+			},
+		},
+	},
+	...getAll.description,
+	...roleAdd.description,
+	...roleRemove.description,
+];
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
new file mode 100644
index 0000000000000..4cd83fe2fd441
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/v2/actions/member/roleAdd.operation.ts
@@ -0,0 +1,63 @@
+import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
+import { updateDisplayOptions } from '../../../../../utils/utilities';
+import { parseDiscordError, prepareErrorData } from '../../helpers/utils';
+import { discordApiRequest } from '../../transport';
+import { roleMultiOptions, userRLC } from '../common.description';
+
+const properties: INodeProperties[] = [userRLC, roleMultiOptions];
+
+const displayOptions = {
+	show: {
+		resource: ['member'],
+		operation: ['roleAdd'],
+	},
+	hide: {
+		authentication: ['webhook'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	guildId: string,
+): Promise<INodeExecutionData[]> {
+	const returnData: INodeExecutionData[] = [];
+	const items = this.getInputData();
+
+	for (let i = 0; i < items.length; i++) {
+		try {
+			const userId = this.getNodeParameter('userId', i, undefined, {
+				extractValue: true,
+			}) as string;
+
+			const roles = this.getNodeParameter('role', i, []) as string[];
+
+			for (const roleId of roles) {
+				await discordApiRequest.call(
+					this,
+					'PUT',
+					`/guilds/${guildId}/members/${userId}/roles/${roleId}`,
+				);
+			}
+
+			const executionData = this.helpers.constructExecutionMetaData(
+				this.helpers.returnJsonArray({ success: true }),
+				{ itemData: { item: i } },
+			);
+
+			returnData.push(...executionData);
+		} catch (error) {
+			const err = parseDiscordError.call(this, error, i);
+
+			if (this.continueOnFail()) {
+				returnData.push(...prepareErrorData.call(this, err, i));
+				continue;
+			}
+
+			throw err;
+		}
+	}
+
+	return returnData;
+}
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
new file mode 100644
index 0000000000000..025975054b8f1
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/v2/actions/member/roleRemove.operation.ts
@@ -0,0 +1,63 @@
+import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
+import { updateDisplayOptions } from '../../../../../utils/utilities';
+import { parseDiscordError, prepareErrorData } from '../../helpers/utils';
+import { discordApiRequest } from '../../transport';
+import { roleMultiOptions, userRLC } from '../common.description';
+
+const properties: INodeProperties[] = [userRLC, roleMultiOptions];
+
+const displayOptions = {
+	show: {
+		resource: ['member'],
+		operation: ['roleRemove'],
+	},
+	hide: {
+		authentication: ['webhook'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	guildId: string,
+): Promise<INodeExecutionData[]> {
+	const returnData: INodeExecutionData[] = [];
+	const items = this.getInputData();
+
+	for (let i = 0; i < items.length; i++) {
+		try {
+			const userId = this.getNodeParameter('userId', i, undefined, {
+				extractValue: true,
+			}) as string;
+
+			const roles = this.getNodeParameter('role', i, []) as string[];
+
+			for (const roleId of roles) {
+				await discordApiRequest.call(
+					this,
+					'DELETE',
+					`/guilds/${guildId}/members/${userId}/roles/${roleId}`,
+				);
+			}
+
+			const executionData = this.helpers.constructExecutionMetaData(
+				this.helpers.returnJsonArray({ success: true }),
+				{ itemData: { item: i } },
+			);
+
+			returnData.push(...executionData);
+		} catch (error) {
+			const err = parseDiscordError.call(this, error, i);
+
+			if (this.continueOnFail()) {
+				returnData.push(...prepareErrorData.call(this, err, i));
+				continue;
+			}
+
+			throw err;
+		}
+	}
+
+	return returnData;
+}
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
new file mode 100644
index 0000000000000..149d9fc9e90ce
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/v2/actions/message/deleteMessage.operation.ts
@@ -0,0 +1,63 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+import { updateDisplayOptions } from '../../../../../utils/utilities';
+import { parseDiscordError, prepareErrorData, setupChannelGetter } from '../../helpers/utils';
+import { discordApiRequest } from '../../transport';
+import { channelRLC, messageIdString } from '../common.description';
+
+const properties: INodeProperties[] = [channelRLC, messageIdString];
+
+const displayOptions = {
+	show: {
+		resource: ['message'],
+		operation: ['deleteMessage'],
+	},
+	hide: {
+		authentication: ['webhook'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	_guildId: string,
+	userGuilds: IDataObject[],
+): Promise<INodeExecutionData[]> {
+	const returnData: INodeExecutionData[] = [];
+	const items = this.getInputData();
+
+	const getChannelId = await setupChannelGetter.call(this, userGuilds);
+
+	for (let i = 0; i < items.length; i++) {
+		try {
+			const channelId = await getChannelId(i);
+
+			const messageId = this.getNodeParameter('messageId', i) as string;
+
+			await discordApiRequest.call(this, 'DELETE', `/channels/${channelId}/messages/${messageId}`);
+
+			const executionData = this.helpers.constructExecutionMetaData(
+				this.helpers.returnJsonArray({ success: true }),
+				{ itemData: { item: i } },
+			);
+
+			returnData.push(...executionData);
+		} catch (error) {
+			const err = parseDiscordError.call(this, error, i);
+
+			if (this.continueOnFail()) {
+				returnData.push(...prepareErrorData.call(this, err, i));
+				continue;
+			}
+
+			throw err;
+		}
+	}
+
+	return returnData;
+}
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
new file mode 100644
index 0000000000000..e7bb9f6a1871e
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/v2/actions/message/get.operation.ts
@@ -0,0 +1,97 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+import { updateDisplayOptions } from '../../../../../utils/utilities';
+import {
+	createSimplifyFunction,
+	parseDiscordError,
+	prepareErrorData,
+	setupChannelGetter,
+} from '../../helpers/utils';
+import { discordApiRequest } from '../../transport';
+import { channelRLC, messageIdString, simplifyBoolean } from '../common.description';
+
+const properties: INodeProperties[] = [
+	channelRLC,
+	messageIdString,
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [simplifyBoolean],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['message'],
+		operation: ['get'],
+	},
+	hide: {
+		authentication: ['webhook'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	_guildId: string,
+	userGuilds: IDataObject[],
+): Promise<INodeExecutionData[]> {
+	const returnData: INodeExecutionData[] = [];
+	const items = this.getInputData();
+	const simplifyResponse = createSimplifyFunction([
+		'id',
+		'channel_id',
+		'author',
+		'content',
+		'timestamp',
+		'type',
+	]);
+
+	const getChannelId = await setupChannelGetter.call(this, userGuilds);
+
+	for (let i = 0; i < items.length; i++) {
+		try {
+			const channelId = await getChannelId(i);
+
+			const messageId = this.getNodeParameter('messageId', i) as string;
+
+			let response = await discordApiRequest.call(
+				this,
+				'GET',
+				`/channels/${channelId}/messages/${messageId}`,
+			);
+
+			const simplify = this.getNodeParameter('options.simplify', i, false) as boolean;
+
+			if (simplify) {
+				response = simplifyResponse(response);
+			}
+
+			const executionData = this.helpers.constructExecutionMetaData(
+				this.helpers.returnJsonArray(response),
+				{ itemData: { item: i } },
+			);
+
+			returnData.push(...executionData);
+		} catch (error) {
+			const err = parseDiscordError.call(this, error, i);
+
+			if (this.continueOnFail()) {
+				returnData.push(...prepareErrorData.call(this, err, i));
+				continue;
+			}
+
+			throw err;
+		}
+	}
+
+	return returnData;
+}
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
new file mode 100644
index 0000000000000..957dcf210407f
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/v2/actions/message/getAll.operation.ts
@@ -0,0 +1,124 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+import { updateDisplayOptions } from '../../../../../utils/utilities';
+import {
+	createSimplifyFunction,
+	parseDiscordError,
+	prepareErrorData,
+	setupChannelGetter,
+} from '../../helpers/utils';
+import { discordApiRequest } from '../../transport';
+import { channelRLC, simplifyBoolean } from '../common.description';
+import { returnAllOrLimit } from '../../../../../utils/descriptions';
+
+const properties: INodeProperties[] = [
+	channelRLC,
+	...returnAllOrLimit,
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [simplifyBoolean],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['message'],
+		operation: ['getAll'],
+	},
+	hide: {
+		authentication: ['webhook'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	_guildId: string,
+	userGuilds: IDataObject[],
+): Promise<INodeExecutionData[]> {
+	const returnData: INodeExecutionData[] = [];
+	const items = this.getInputData();
+	const simplifyResponse = createSimplifyFunction([
+		'id',
+		'channel_id',
+		'author',
+		'content',
+		'timestamp',
+		'type',
+	]);
+
+	const getChannelId = await setupChannelGetter.call(this, userGuilds);
+
+	for (let i = 0; i < items.length; i++) {
+		try {
+			const channelId = await getChannelId(i);
+
+			const returnAll = this.getNodeParameter('returnAll', i, false);
+
+			const qs: IDataObject = {};
+
+			let response: IDataObject[] = [];
+
+			if (!returnAll) {
+				const limit = this.getNodeParameter('limit', 0);
+				qs.limit = limit;
+				response = await discordApiRequest.call(
+					this,
+					'GET',
+					`/channels/${channelId}/messages`,
+					undefined,
+					qs,
+				);
+			} else {
+				let responseData;
+				qs.limit = 100;
+
+				do {
+					responseData = await discordApiRequest.call(
+						this,
+						'GET',
+						`/channels/${channelId}/messages`,
+						undefined,
+						qs,
+					);
+					if (!responseData?.length) break;
+					qs.before = responseData[responseData.length - 1].id;
+					response.push(...responseData);
+				} while (responseData.length);
+			}
+
+			const simplify = this.getNodeParameter('options.simplify', i, false) as boolean;
+
+			if (simplify) {
+				response = response.map(simplifyResponse);
+			}
+
+			const executionData = this.helpers.constructExecutionMetaData(
+				this.helpers.returnJsonArray(response),
+				{ itemData: { item: i } },
+			);
+
+			returnData.push(...executionData);
+		} catch (error) {
+			const err = parseDiscordError.call(this, error, i);
+
+			if (this.continueOnFail()) {
+				returnData.push(...prepareErrorData.call(this, err, i));
+				continue;
+			}
+
+			throw err;
+		}
+	}
+
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/message/index.ts b/packages/nodes-base/nodes/Discord/v2/actions/message/index.ts
new file mode 100644
index 0000000000000..a2fb1955a4b73
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/v2/actions/message/index.ts
@@ -0,0 +1,72 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+import { guildRLC } from '../common.description';
+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';
+
+export { getAll, react, send, deleteMessage, get };
+
+export const description: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				resource: ['message'],
+				authentication: ['botToken', 'oAuth2'],
+			},
+		},
+		options: [
+			{
+				name: 'Delete',
+				value: 'deleteMessage',
+				description: 'Delete a message in a channel',
+				action: 'Delete a message',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get a message in a channel',
+				action: 'Get a message',
+			},
+			{
+				name: 'Get Many',
+				value: 'getAll',
+				description: 'Retrieve the latest messages in a channel',
+				action: 'Get many messages',
+			},
+			{
+				name: 'React with Emoji',
+				value: 'react',
+				description: 'React to a message with an emoji',
+				action: 'React with an emoji to a message',
+			},
+			{
+				name: 'Send',
+				value: 'send',
+				description: 'Send a message to a channel, thread, or member',
+				action: 'Send a message',
+			},
+		],
+		default: 'send',
+	},
+	{
+		...guildRLC,
+		displayOptions: {
+			show: {
+				resource: ['message'],
+				authentication: ['botToken', 'oAuth2'],
+			},
+		},
+	},
+	...getAll.description,
+	...react.description,
+	...send.description,
+	...deleteMessage.description,
+	...get.description,
+];
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
new file mode 100644
index 0000000000000..1041c5626a0e6
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/v2/actions/message/react.operation.ts
@@ -0,0 +1,79 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+import { updateDisplayOptions } from '../../../../../utils/utilities';
+import { parseDiscordError, prepareErrorData, setupChannelGetter } from '../../helpers/utils';
+import { discordApiRequest } from '../../transport';
+import { channelRLC, messageIdString } from '../common.description';
+
+const properties: INodeProperties[] = [
+	channelRLC,
+	messageIdString,
+	{
+		displayName: 'Emoji',
+		name: 'emoji',
+		type: 'string',
+		default: '',
+		required: true,
+		description: 'The emoji you want to react with',
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['message'],
+		operation: ['react'],
+	},
+	hide: {
+		authentication: ['webhook'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	_guildId: string,
+	userGuilds: IDataObject[],
+): Promise<INodeExecutionData[]> {
+	const returnData: INodeExecutionData[] = [];
+	const items = this.getInputData();
+
+	const getChannelId = await setupChannelGetter.call(this, userGuilds);
+
+	for (let i = 0; i < items.length; i++) {
+		try {
+			const channelId = await getChannelId(i);
+
+			const messageId = this.getNodeParameter('messageId', i) as string;
+			const emoji = this.getNodeParameter('emoji', i) as string;
+
+			await discordApiRequest.call(
+				this,
+				'PUT',
+				`/channels/${channelId}/messages/${messageId}/reactions/${encodeURIComponent(emoji)}/@me`,
+			);
+
+			const executionData = this.helpers.constructExecutionMetaData(
+				this.helpers.returnJsonArray({ success: true }),
+				{ itemData: { item: i } },
+			);
+
+			returnData.push(...executionData);
+		} catch (error) {
+			const err = parseDiscordError.call(this, error, i);
+
+			if (this.continueOnFail()) {
+				returnData.push(...prepareErrorData.call(this, err, i));
+				continue;
+			}
+
+			throw err;
+		}
+	}
+
+	return returnData;
+}
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
new file mode 100644
index 0000000000000..7e761614a6928
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/v2/actions/message/send.operation.ts
@@ -0,0 +1,257 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	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 {
+	checkAccessToChannel,
+	parseDiscordError,
+	prepareEmbeds,
+	prepareErrorData,
+	prepareMultiPartForm,
+	prepareOptions,
+} from '../../helpers/utils';
+
+const properties: INodeProperties[] = [
+	{
+		displayName: 'Send To',
+		name: 'sendTo',
+		type: 'options',
+		options: [
+			{
+				name: 'User',
+				value: 'user',
+			},
+			{
+				name: 'Channel',
+				value: 'channel',
+			},
+		],
+		default: 'channel',
+		description: 'Send message to a channel or DM to a user',
+	},
+
+	{
+		...userRLC,
+		displayOptions: {
+			show: {
+				sendTo: ['user'],
+			},
+		},
+	},
+	{
+		...textChannelRLC,
+		displayOptions: {
+			show: {
+				sendTo: ['channel'],
+			},
+		},
+	},
+	{
+		displayName: 'Message',
+		name: 'content',
+		type: 'string',
+		default: '',
+		description: 'The content of the message (up to 2000 characters)',
+		placeholder: 'e.g. My message',
+		typeOptions: {
+			rows: 2,
+		},
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			{
+				displayName: 'Flags',
+				name: 'flags',
+				type: 'multiOptions',
+				default: [],
+				description:
+					'Message flags. <a href="https://discord.com/developers/docs/resources/channel#message-object-message-flags" target="_blank">More info</a>.”.',
+				options: [
+					{
+						name: 'Suppress Embeds',
+						value: 'SUPPRESS_EMBEDS',
+					},
+					{
+						name: 'Suppress Notifications',
+						value: 'SUPPRESS_NOTIFICATIONS',
+					},
+				],
+			},
+			{
+				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+				displayName: 'Message to Reply to',
+				name: 'message_reference',
+				type: 'string',
+				default: '',
+				description: 'Fill this to make your message a reply. Add the message ID.',
+				placeholder: 'e.g. 1059467601836773386',
+			},
+			{
+				displayName: 'Text-to-Speech (TTS)',
+				name: 'tts',
+				type: 'boolean',
+				default: false,
+				description: 'Whether to have a bot reading the message directly in the channel',
+			},
+		],
+	},
+	embedsFixedCollection,
+	filesFixedCollection,
+];
+
+const displayOptions = {
+	show: {
+		resource: ['message'],
+		operation: ['send'],
+	},
+	hide: {
+		authentication: ['webhook'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	guildId: string,
+	userGuilds: IDataObject[],
+): Promise<INodeExecutionData[]> {
+	const returnData: INodeExecutionData[] = [];
+	const items = this.getInputData();
+
+	const isOAuth2 = this.getNodeParameter('authentication', 0) === 'oAuth2';
+
+	for (let i = 0; i < items.length; i++) {
+		const content = this.getNodeParameter('content', i) as string;
+		const options = prepareOptions(this.getNodeParameter('options', i, {}), guildId);
+
+		const embeds = (this.getNodeParameter('embeds', i, undefined) as IDataObject)
+			?.values as IDataObject[];
+		const files = (this.getNodeParameter('files', i, undefined) as IDataObject)
+			?.values as IDataObject[];
+
+		const body: IDataObject = {
+			content,
+			...options,
+		};
+
+		if (embeds) {
+			body.embeds = prepareEmbeds.call(this, embeds);
+		}
+
+		try {
+			const sendTo = this.getNodeParameter('sendTo', i) as string;
+
+			let channelId = '';
+
+			if (sendTo === 'user') {
+				const userId = this.getNodeParameter('userId', i, undefined, {
+					extractValue: true,
+				}) as string;
+
+				if (isOAuth2) {
+					try {
+						await discordApiRequest.call(this, 'GET', `/guilds/${guildId}/members/${userId}`);
+					} catch (error) {
+						if (error instanceof NodeApiError && error.httpCode === '404') {
+							throw new NodeOperationError(
+								this.getNode(),
+								`User with the id ${userId} is not a member of the selected guild`,
+								{
+									itemIndex: i,
+								},
+							);
+						}
+
+						throw new NodeOperationError(this.getNode(), error, {
+							itemIndex: i,
+						});
+					}
+				}
+
+				channelId = (
+					(await discordApiRequest.call(this, 'POST', '/users/@me/channels', {
+						recipient_id: userId,
+					})) as IDataObject
+				).id as string;
+
+				if (!channelId) {
+					throw new NodeOperationError(
+						this.getNode(),
+						'Could not create a channel to send direct message to',
+						{ itemIndex: i },
+					);
+				}
+			}
+
+			if (sendTo === 'channel') {
+				channelId = this.getNodeParameter('channelId', i, undefined, {
+					extractValue: true,
+				}) as string;
+			}
+
+			if (isOAuth2 && sendTo !== 'user') {
+				await checkAccessToChannel.call(this, channelId, userGuilds, i);
+			}
+
+			if (!channelId) {
+				throw new NodeOperationError(this.getNode(), 'Channel ID is required', { itemIndex: i });
+			}
+
+			let response: IDataObject[] = [];
+
+			if (files?.length) {
+				const multiPartBody = await prepareMultiPartForm.call(this, items, files, body, i);
+
+				response = await discordApiMultiPartRequest.call(
+					this,
+					'POST',
+					`/channels/${channelId}/messages`,
+					multiPartBody,
+				);
+			} else {
+				response = await discordApiRequest.call(
+					this,
+					'POST',
+					`/channels/${channelId}/messages`,
+					body,
+				);
+			}
+
+			const executionData = this.helpers.constructExecutionMetaData(
+				this.helpers.returnJsonArray(response),
+				{ itemData: { item: i } },
+			);
+
+			returnData.push(...executionData);
+		} catch (error) {
+			const err = parseDiscordError.call(this, error, i);
+
+			if (this.continueOnFail()) {
+				returnData.push(...prepareErrorData.call(this, err, i));
+				continue;
+			}
+
+			throw err;
+		}
+	}
+
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/node.type.ts b/packages/nodes-base/nodes/Discord/v2/actions/node.type.ts
new file mode 100644
index 0000000000000..c415fe663d2fe
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/v2/actions/node.type.ts
@@ -0,0 +1,10 @@
+import type { AllEntities } from 'n8n-workflow';
+
+type NodeMap = {
+	channel: 'get' | 'getAll' | 'create' | 'update' | 'deleteChannel';
+	message: 'deleteMessage' | 'getAll' | 'get' | 'react' | 'send';
+	member: 'getAll' | 'roleAdd' | 'roleRemove';
+	webhook: 'sendLegacy';
+};
+
+export type Discord = AllEntities<NodeMap>;
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/router.ts b/packages/nodes-base/nodes/Discord/v2/actions/router.ts
new file mode 100644
index 0000000000000..2a65ca6145a60
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/v2/actions/router.ts
@@ -0,0 +1,68 @@
+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 type { Discord } from './node.type';
+
+export async function router(this: IExecuteFunctions) {
+	let returnData: INodeExecutionData[] = [];
+
+	let resource = 'webhook';
+	//resource parameter is hidden when authentication is set to webhook
+	//prevent error when getting resource parameter
+	try {
+		resource = this.getNodeParameter<Discord>('resource', 0);
+	} catch (error) {}
+	const operation = this.getNodeParameter('operation', 0);
+
+	let guildId = '';
+	let userGuilds: IDataObject[] = [];
+
+	if (resource !== 'webhook') {
+		guildId = this.getNodeParameter('guildId', 0, '', {
+			extractValue: true,
+		}) as string;
+
+		const isOAuth2 = this.getNodeParameter('authentication', 0, '') === 'oAuth2';
+
+		if (isOAuth2) {
+			userGuilds = (await discordApiRequest.call(
+				this,
+				'GET',
+				'/users/@me/guilds',
+			)) as IDataObject[];
+
+			checkAccessToGuild(this.getNode(), guildId, userGuilds);
+		}
+	}
+
+	const discord = {
+		resource,
+		operation,
+	} as Discord;
+
+	switch (discord.resource) {
+		case 'channel':
+			returnData = await channel[discord.operation].execute.call(this, guildId, userGuilds);
+			break;
+		case 'message':
+			returnData = await message[discord.operation].execute.call(this, guildId, userGuilds);
+			break;
+		case 'member':
+			returnData = await member[discord.operation].execute.call(this, guildId);
+			break;
+		case 'webhook':
+			returnData = await webhook[discord.operation].execute.call(this);
+			break;
+		default:
+			throw new NodeOperationError(this.getNode(), `The resource "${resource}" is not known`);
+	}
+
+	return [returnData];
+}
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/versionDescription.ts b/packages/nodes-base/nodes/Discord/v2/actions/versionDescription.ts
new file mode 100644
index 0000000000000..beb0572f84c2b
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/v2/actions/versionDescription.ts
@@ -0,0 +1,106 @@
+/* eslint-disable n8n-nodes-base/node-filename-against-convention */
+import type { INodeTypeDescription } from 'n8n-workflow';
+
+import * as message from './message';
+import * as channel from './channel';
+import * as member from './member';
+import * as webhook from './webhook';
+
+export const versionDescription: INodeTypeDescription = {
+	displayName: 'Discord',
+	name: 'discord',
+	icon: 'file:discord.svg',
+	group: ['output'],
+	version: 2,
+	subtitle: '={{ $parameter["operation"] + ": " + $parameter["resource"] }}',
+	description: 'Sends data to Discord',
+	defaults: {
+		name: 'Discord',
+	},
+	inputs: ['main'],
+	outputs: ['main'],
+	credentials: [
+		{
+			name: 'discordBotApi',
+			required: true,
+			displayOptions: {
+				show: {
+					authentication: ['botToken'],
+				},
+			},
+		},
+		{
+			name: 'discordOAuth2Api',
+			required: true,
+			displayOptions: {
+				show: {
+					authentication: ['oAuth2'],
+				},
+			},
+		},
+		{
+			name: 'discordWebhookApi',
+			displayOptions: {
+				show: {
+					authentication: ['webhook'],
+				},
+			},
+		},
+	],
+	properties: [
+		{
+			displayName: 'Connection Type',
+			name: 'authentication',
+			type: 'options',
+			options: [
+				{
+					name: 'Bot Token',
+					value: 'botToken',
+					description: 'Manage messages, channels, and members on a server',
+				},
+				{
+					name: 'OAuth2',
+					value: 'oAuth2',
+					description: "Same features as 'Bot Token' with easier Bot installation",
+				},
+				{
+					name: 'Webhook',
+					value: 'webhook',
+					description: 'Send messages to a specific channel',
+				},
+			],
+			default: 'botToken',
+		},
+		{
+			displayName: 'Resource',
+			name: 'resource',
+			type: 'options',
+			noDataExpression: true,
+			options: [
+				{
+					name: 'Channel',
+					value: 'channel',
+				},
+				{
+					name: 'Message',
+					value: 'message',
+				},
+				{
+					name: 'Member',
+					value: 'member',
+				},
+			],
+			default: 'channel',
+			displayOptions: {
+				hide: {
+					authentication: ['webhook'],
+				},
+			},
+		},
+
+		...message.description,
+		...channel.description,
+		...member.description,
+		...webhook.description,
+	],
+};
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/webhook/index.ts b/packages/nodes-base/nodes/Discord/v2/actions/webhook/index.ts
new file mode 100644
index 0000000000000..0faa42665b0e9
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/v2/actions/webhook/index.ts
@@ -0,0 +1,29 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+import * as sendLegacy from './sendLegacy.operation';
+
+export { sendLegacy };
+
+export const description: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				authentication: ['webhook'],
+			},
+		},
+		options: [
+			{
+				name: 'Send a Message',
+				value: 'sendLegacy',
+				description: 'Send a message to a channel using the webhook',
+				action: 'Send a message',
+			},
+		],
+		default: 'sendLegacy',
+	},
+	...sendLegacy.description,
+];
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
new file mode 100644
index 0000000000000..a26723fc93a27
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/v2/actions/webhook/sendLegacy.operation.ts
@@ -0,0 +1,166 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+import { updateDisplayOptions } from '../../../../../utils/utilities';
+import { discordApiMultiPartRequest, discordApiRequest } from '../../transport';
+
+import {
+	parseDiscordError,
+	prepareEmbeds,
+	prepareErrorData,
+	prepareMultiPartForm,
+	prepareOptions,
+} from '../../helpers/utils';
+
+import { embedsFixedCollection, filesFixedCollection } from '../common.description';
+
+const properties: INodeProperties[] = [
+	{
+		displayName: 'Message',
+		name: 'content',
+		type: 'string',
+		default: '',
+		description: 'The content of the message (up to 2000 characters)',
+		placeholder: 'e.g. My message',
+		typeOptions: {
+			rows: 2,
+		},
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			{
+				displayName: 'Avatar URL',
+				name: 'avatar_url',
+				type: 'string',
+				default: '',
+				description: 'Override the default avatar of the webhook',
+				placeholder: 'e.g. https://example.com/image.png',
+			},
+			{
+				displayName: 'Flags',
+				name: 'flags',
+				type: 'multiOptions',
+				default: [],
+				description:
+					'Message flags. <a href="https://discord.com/developers/docs/resources/channel#message-object-message-flags" target="_blank">More info</a>.”.',
+				options: [
+					{
+						name: 'Suppress Embeds',
+						value: 'SUPPRESS_EMBEDS',
+					},
+					{
+						name: 'Suppress Notifications',
+						value: 'SUPPRESS_NOTIFICATIONS',
+					},
+				],
+			},
+			{
+				displayName: 'Text-to-Speech (TTS)',
+				name: 'tts',
+				type: 'boolean',
+				default: false,
+				description: 'Whether to have a bot reading the message directly in the channel',
+			},
+			{
+				displayName: 'Username',
+				name: 'username',
+				type: 'string',
+				default: '',
+				description: 'Override the default username of the webhook',
+				placeholder: 'e.g. My Username',
+			},
+			{
+				displayName: 'Wait',
+				name: 'wait',
+				type: 'boolean',
+				default: false,
+				description: 'Whether wait for the message to be created before returning its response',
+			},
+		],
+	},
+	embedsFixedCollection,
+	filesFixedCollection,
+];
+
+const displayOptions = {
+	show: {
+		operation: ['sendLegacy'],
+	},
+	hide: {
+		authentication: ['botToken', 'oAuth2'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions): Promise<INodeExecutionData[]> {
+	const returnData: INodeExecutionData[] = [];
+	const items = this.getInputData();
+
+	for (let i = 0; i < items.length; i++) {
+		const content = this.getNodeParameter('content', i) as string;
+		const options = prepareOptions(this.getNodeParameter('options', i, {}));
+
+		const embeds = (this.getNodeParameter('embeds', i, undefined) as IDataObject)
+			?.values as IDataObject[];
+		const files = (this.getNodeParameter('files', i, undefined) as IDataObject)
+			?.values as IDataObject[];
+
+		let qs: IDataObject | undefined = undefined;
+
+		if (options.wait) {
+			qs = {
+				wait: options.wait,
+			};
+
+			delete options.wait;
+		}
+
+		const body: IDataObject = {
+			content,
+			...options,
+		};
+
+		if (embeds) {
+			body.embeds = prepareEmbeds.call(this, embeds);
+		}
+
+		try {
+			let response: IDataObject[] = [];
+
+			if (files?.length) {
+				const multiPartBody = await prepareMultiPartForm.call(this, items, files, body, i);
+
+				response = await discordApiMultiPartRequest.call(this, 'POST', '', multiPartBody);
+			} else {
+				response = await discordApiRequest.call(this, 'POST', '', body, qs);
+			}
+
+			const executionData = this.helpers.constructExecutionMetaData(
+				this.helpers.returnJsonArray(response),
+				{ itemData: { item: i } },
+			);
+
+			returnData.push(...executionData);
+		} catch (error) {
+			const err = parseDiscordError.call(this, error, i);
+
+			if (this.continueOnFail()) {
+				returnData.push(...prepareErrorData.call(this, err, i));
+				continue;
+			}
+
+			throw err;
+		}
+	}
+
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/Discord/v2/helpers/utils.ts b/packages/nodes-base/nodes/Discord/v2/helpers/utils.ts
new file mode 100644
index 0000000000000..b3852f9527a4b
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/v2/helpers/utils.ts
@@ -0,0 +1,286 @@
+import type {
+	IBinaryKeyData,
+	IDataObject,
+	IExecuteFunctions,
+	INode,
+	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';
+
+export const createSimplifyFunction =
+	(includedFields: string[]) =>
+	(item: IDataObject): IDataObject => {
+		const result: IDataObject = {};
+
+		for (const field of includedFields) {
+			if (item[field] === undefined) continue;
+
+			result[field] = item[field];
+		}
+
+		return result;
+	};
+
+export function parseDiscordError(this: IExecuteFunctions, error: any, itemIndex = 0) {
+	let errorData = error.cause.error;
+	const errorOptions: IDataObject = { itemIndex };
+
+	if (!errorData && error.description) {
+		try {
+			const errorString = (error.description as string).split(' - ')[1];
+			if (errorString) {
+				errorData = jsonParse(errorString);
+			}
+		} catch (err) {}
+	}
+
+	if (errorData?.message) {
+		errorOptions.message = errorData.message;
+	}
+
+	if ((error?.message as string)?.toLowerCase()?.includes('bad request') && errorData) {
+		if (errorData?.message) {
+			errorOptions.message = errorData.message;
+		}
+
+		if (errorData?.errors?.embeds) {
+			const embedErrors = errorData.errors.embeds?.[0];
+			const embedErrorsKeys = Object.keys(embedErrors).map((key) => capitalize(key));
+
+			if (embedErrorsKeys.length) {
+				const message =
+					embedErrorsKeys.length === 1
+						? `The parameter ${embedErrorsKeys[0]} is not properly formatted`
+						: `The parameters ${embedErrorsKeys.join(', ')} are not properly formatted`;
+				errorOptions.message = message;
+				errorOptions.description = 'Review the formatting or clear it';
+			}
+
+			return new NodeOperationError(this.getNode(), errorData.errors, errorOptions);
+		}
+
+		if (errorData?.errors?.message_reference) {
+			errorOptions.message = "The message to reply to ID can't be found";
+			errorOptions.description =
+				'Check the "Message to Reply to" parameter and remove it if you don\'t want to reply to an existing message';
+
+			return new NodeOperationError(this.getNode(), errorData.errors, errorOptions);
+		}
+
+		if (errorOptions.message === 'Cannot send an empty message') {
+			errorOptions.description =
+				'Something has to be send to the channel whether it is a message, an embed or a file';
+		}
+	}
+	return new NodeOperationError(this.getNode(), errorData || error, errorOptions);
+}
+
+export function prepareErrorData(this: IExecuteFunctions, error: any, i: number) {
+	let description = error.description;
+
+	try {
+		description = JSON.parse(error.description as string);
+	} catch (err) {}
+
+	return this.helpers.constructExecutionMetaData(
+		this.helpers.returnJsonArray({ error: error.message, description }),
+		{ itemData: { item: i } },
+	);
+}
+
+export function prepareOptions(options: IDataObject, guildId?: string) {
+	if (options.flags) {
+		if ((options.flags as string[]).length === 2) {
+			options.flags = (1 << 2) + (1 << 12);
+		} else if ((options.flags as string[]).includes('SUPPRESS_EMBEDS')) {
+			options.flags = 1 << 2;
+		} else if ((options.flags as string[]).includes('SUPPRESS_NOTIFICATIONS')) {
+			options.flags = 1 << 12;
+		}
+	}
+
+	if (options.message_reference) {
+		options.message_reference = {
+			message_id: options.message_reference,
+			guild_id: guildId,
+		};
+	}
+
+	return options;
+}
+
+export function prepareEmbeds(this: IExecuteFunctions, embeds: IDataObject[]) {
+	return embeds
+		.map((embed) => {
+			let embedReturnData: IDataObject = {};
+
+			if (embed.inputMethod === 'json') {
+				if (typeof embed.json === 'object') {
+					embedReturnData = embed.json as IDataObject;
+				}
+				try {
+					embedReturnData = jsonParse(embed.json as string);
+				} catch (error) {
+					throw new NodeOperationError(this.getNode(), 'Not a valid JSON', error);
+				}
+			} else {
+				delete embed.inputMethod;
+
+				for (const key of Object.keys(embed)) {
+					if (embed[key] !== '') {
+						embedReturnData[key] = embed[key];
+					}
+				}
+			}
+
+			if (embedReturnData.author) {
+				embedReturnData.author = {
+					name: embedReturnData.author,
+				};
+			}
+			if (embedReturnData.color && typeof embedReturnData.color === 'string') {
+				embedReturnData.color = parseInt(embedReturnData.color.replace('#', ''), 16);
+			}
+			if (embedReturnData.video) {
+				embedReturnData.video = {
+					url: embedReturnData.video,
+					width: 1270,
+					height: 720,
+				};
+			}
+			if (embedReturnData.thumbnail) {
+				embedReturnData.thumbnail = {
+					url: embedReturnData.thumbnail,
+				};
+			}
+			if (embedReturnData.image) {
+				embedReturnData.image = {
+					url: embedReturnData.image,
+				};
+			}
+
+			return embedReturnData;
+		})
+		.filter((embed) => !isEmpty(embed));
+}
+
+export async function prepareMultiPartForm(
+	this: IExecuteFunctions,
+	items: INodeExecutionData[],
+	files: IDataObject[],
+	jsonPayload: IDataObject,
+	i: number,
+) {
+	const multiPartBody = new FormData();
+	const attachments: IDataObject[] = [];
+	const filesData: IDataObject[] = [];
+
+	for (const [index, file] of files.entries()) {
+		const binaryData = (items[i].binary as IBinaryKeyData)?.[file.inputFieldName as string];
+
+		if (!binaryData) {
+			throw new NodeOperationError(
+				this.getNode(),
+				`Input item [${i}] does not contain binary data on property ${file.inputFieldName}`,
+			);
+		}
+
+		let filename = binaryData.fileName as string;
+
+		if (!filename.includes('.')) {
+			if (binaryData.fileExtension) {
+				filename += `.${binaryData.fileExtension}`;
+			}
+			if (binaryData.mimeType) {
+				filename += `.${extension(binaryData.mimeType)}`;
+			}
+		}
+
+		attachments.push({
+			id: index,
+			filename,
+		});
+
+		filesData.push({
+			data: await this.helpers.getBinaryDataBuffer(i, file.inputFieldName as string),
+			name: filename,
+			mime: binaryData.mimeType,
+		});
+	}
+
+	multiPartBody.append('payload_json', JSON.stringify({ ...jsonPayload, attachments }), {
+		contentType: 'application/json',
+	});
+
+	for (const [index, binaryData] of filesData.entries()) {
+		multiPartBody.append(`files[${index}]`, binaryData.data, {
+			contentType: binaryData.name as string,
+			filename: binaryData.mime as string,
+		});
+	}
+
+	return multiPartBody;
+}
+
+export function checkAccessToGuild(
+	node: INode,
+	guildId: string,
+	userGuilds: IDataObject[],
+	itemIndex = 0,
+) {
+	if (!userGuilds.some((guild) => guild.id === guildId)) {
+		throw new NodeOperationError(
+			node,
+			`You do not have access to the guild with the id ${guildId}`,
+			{
+				itemIndex,
+				level: 'warning',
+			},
+		);
+	}
+}
+
+export async function checkAccessToChannel(
+	this: IExecuteFunctions,
+	channelId: string,
+	userGuilds: IDataObject[],
+	itemIndex = 0,
+) {
+	let guildId = '';
+
+	try {
+		const channel = await discordApiRequest.call(this, 'GET', `/channels/${channelId}`);
+		guildId = channel.guild_id;
+	} catch (error) {}
+
+	if (!guildId) {
+		throw new NodeOperationError(
+			this.getNode(),
+			`Could not find server for channel with the id ${channelId}`,
+			{
+				itemIndex,
+			},
+		);
+	}
+
+	checkAccessToGuild(this.getNode(), guildId, userGuilds, itemIndex);
+}
+
+export async function setupChannelGetter(this: IExecuteFunctions, userGuilds: IDataObject[]) {
+	const isOAuth2 = this.getNodeParameter('authentication', 0) === 'oAuth2';
+
+	return async (i: number) => {
+		const channelId = this.getNodeParameter('channelId', i, undefined, {
+			extractValue: true,
+		}) as string;
+
+		if (isOAuth2) await checkAccessToChannel.call(this, channelId, userGuilds, i);
+
+		return channelId;
+	};
+}
diff --git a/packages/nodes-base/nodes/Discord/v2/methods/index.ts b/packages/nodes-base/nodes/Discord/v2/methods/index.ts
new file mode 100644
index 0000000000000..073c80a2eacca
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/v2/methods/index.ts
@@ -0,0 +1,2 @@
+export * as listSearch from './listSearch';
+export * as loadOptions from './loadOptions';
diff --git a/packages/nodes-base/nodes/Discord/v2/methods/listSearch.ts b/packages/nodes-base/nodes/Discord/v2/methods/listSearch.ts
new file mode 100644
index 0000000000000..abbec430402e0
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/v2/methods/listSearch.ts
@@ -0,0 +1,164 @@
+import {
+	type IDataObject,
+	type ILoadOptionsFunctions,
+	type INodeListSearchResult,
+} from 'n8n-workflow';
+import { discordApiRequest } from '../transport';
+import { checkAccessToGuild } from '../helpers/utils';
+
+async function getGuildId(this: ILoadOptionsFunctions) {
+	const guildId = this.getNodeParameter('guildId', undefined, {
+		extractValue: true,
+	}) as string;
+
+	const isOAuth2 = this.getNodeParameter('authentication', '') === 'oAuth2';
+
+	if (isOAuth2) {
+		const userGuilds = (await discordApiRequest.call(
+			this,
+			'GET',
+			'/users/@me/guilds',
+		)) as IDataObject[];
+
+		checkAccessToGuild(this.getNode(), guildId, userGuilds);
+	}
+
+	return guildId;
+}
+
+async function checkBotAccessToGuild(this: ILoadOptionsFunctions, guildId: string, botId: string) {
+	try {
+		const members: Array<{ user: { id: string } }> = await discordApiRequest.call(
+			this,
+			'GET',
+			`/guilds/${guildId}/members`,
+			undefined,
+			{ limit: 1000 },
+		);
+
+		return members.some((member) => member.user.id === botId);
+	} catch (error) {}
+
+	return false;
+}
+
+export async function guildSearch(this: ILoadOptionsFunctions): Promise<INodeListSearchResult> {
+	const response = (await discordApiRequest.call(
+		this,
+		'GET',
+		'/users/@me/guilds',
+	)) as IDataObject[];
+
+	let guilds: IDataObject[] = [];
+
+	const isOAuth2 = this.getNodeParameter('authentication', 0) === 'oAuth2';
+
+	if (isOAuth2) {
+		const botId = (await discordApiRequest.call(this, 'GET', '/users/@me')).id as string;
+
+		for (const guild of response) {
+			if (!(await checkBotAccessToGuild.call(this, guild.id as string, botId))) continue;
+			guilds.push(guild);
+		}
+	} else {
+		guilds = response;
+	}
+
+	return {
+		results: guilds.map((guild) => ({
+			name: guild.name as string,
+			value: guild.id as string,
+			url: `https://discord.com/channels/${guild.id}`,
+		})),
+	};
+}
+
+export async function channelSearch(this: ILoadOptionsFunctions): Promise<INodeListSearchResult> {
+	const guildId = await getGuildId.call(this);
+	const response = await discordApiRequest.call(this, 'GET', `/guilds/${guildId}/channels`);
+
+	return {
+		results: (response as IDataObject[])
+			.filter((cannel) => cannel.type !== 4) // Filter out categories
+			.map((channel) => ({
+				name: channel.name as string,
+				value: channel.id as string,
+				url: `https://discord.com/channels/${guildId}/${channel.id}`,
+			})),
+	};
+}
+
+export async function textChannelSearch(
+	this: ILoadOptionsFunctions,
+): Promise<INodeListSearchResult> {
+	const guildId = await getGuildId.call(this);
+
+	const response = await discordApiRequest.call(this, 'GET', `/guilds/${guildId}/channels`);
+
+	return {
+		results: (response as IDataObject[])
+			.filter((cannel) => ![2, 4].includes(cannel.type as number)) // Only text channels
+			.map((channel) => ({
+				name: channel.name as string,
+				value: channel.id as string,
+				url: `https://discord.com/channels/${guildId}/${channel.id}`,
+			})),
+	};
+}
+
+export async function categorySearch(this: ILoadOptionsFunctions): Promise<INodeListSearchResult> {
+	const guildId = await getGuildId.call(this);
+
+	const response = await discordApiRequest.call(this, 'GET', `/guilds/${guildId}/channels`);
+
+	return {
+		results: (response as IDataObject[])
+			.filter((cannel) => cannel.type === 4) // Return only categories
+			.map((channel) => ({
+				name: channel.name as string,
+				value: channel.id as string,
+				url: `https://discord.com/channels/${guildId}/${channel.id}`,
+			})),
+	};
+}
+
+export async function userSearch(
+	this: ILoadOptionsFunctions,
+	_filter?: string,
+	paginationToken?: string,
+): Promise<INodeListSearchResult> {
+	const guildId = await getGuildId.call(this);
+
+	const limit = 100;
+	const qs = { limit, after: paginationToken };
+
+	const response = await discordApiRequest.call(
+		this,
+		'GET',
+		`/guilds/${guildId}/members`,
+		undefined,
+		qs,
+	);
+
+	if (response.length === 0) {
+		return {
+			results: [],
+			paginationToken: undefined,
+		};
+	}
+
+	let lastUserId;
+
+	//less then limit means that there are no more users to return, so leave lastUserId undefined
+	if (!(response.length < limit)) {
+		lastUserId = response[response.length - 1].user.id as string;
+	}
+
+	return {
+		results: (response as Array<{ user: IDataObject }>).map(({ user }) => ({
+			name: user.username as string,
+			value: user.id as string,
+		})),
+		paginationToken: lastUserId,
+	};
+}
diff --git a/packages/nodes-base/nodes/Discord/v2/methods/loadOptions.ts b/packages/nodes-base/nodes/Discord/v2/methods/loadOptions.ts
new file mode 100644
index 0000000000000..ab79a4bd1d84c
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/v2/methods/loadOptions.ts
@@ -0,0 +1,46 @@
+import type { IDataObject, ILoadOptionsFunctions, INodePropertyOptions } from 'n8n-workflow';
+import { discordApiRequest } from '../transport';
+import { checkAccessToGuild } from '../helpers/utils';
+
+export async function getRoles(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+	const guildId = this.getNodeParameter('guildId', undefined, {
+		extractValue: true,
+	}) as string;
+
+	const isOAuth2 = this.getNodeParameter('authentication', '') === 'oAuth2';
+
+	if (isOAuth2) {
+		const userGuilds = (await discordApiRequest.call(
+			this,
+			'GET',
+			'/users/@me/guilds',
+		)) as IDataObject[];
+
+		checkAccessToGuild(this.getNode(), guildId, userGuilds);
+	}
+
+	let response = await discordApiRequest.call(this, 'GET', `/guilds/${guildId}/roles`);
+
+	const operations = this.getNodeParameter('operation') as string;
+
+	if (operations === 'roleRemove') {
+		const userId = this.getNodeParameter('userId', undefined, {
+			extractValue: true,
+		}) as string;
+
+		const userRoles = ((
+			await discordApiRequest.call(this, 'GET', `/guilds/${guildId}/members/${userId}`)
+		).roles || []) as string[];
+
+		response = response.filter((role: IDataObject) => {
+			return userRoles.includes(role.id as string);
+		});
+	}
+
+	return response
+		.filter((role: IDataObject) => role.name !== '@everyone' && !role.managed)
+		.map((role: IDataObject) => ({
+			name: role.name as string,
+			value: role.id as string,
+		}));
+}
diff --git a/packages/nodes-base/nodes/Discord/v2/transport/discord.api.ts b/packages/nodes-base/nodes/Discord/v2/transport/discord.api.ts
new file mode 100644
index 0000000000000..c7a066ef4d2cc
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/v2/transport/discord.api.ts
@@ -0,0 +1,101 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	IHookFunctions,
+	IHttpRequestMethods,
+	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(
+	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
+	endpoint: string,
+	body?: IDataObject,
+	qs?: IDataObject,
+) {
+	const authentication = this.getNodeParameter('authentication', 0, 'webhook') as string;
+	const headers: IDataObject = {};
+
+	const credentialType = getCredentialsType(authentication);
+
+	const options: IRequestOptions = {
+		headers,
+		method,
+		qs,
+		body,
+		url: `https://discord.com/api/v10${endpoint}`,
+		json: true,
+	};
+
+	if (credentialType === 'discordWebhookApi') {
+		const credentials = await this.getCredentials('discordWebhookApi');
+		options.url = credentials.webhookUri as string;
+	}
+
+	try {
+		const response = await requestApi.call(this, options, credentialType, endpoint);
+
+		const resetAfter = Number(response.headers['x-ratelimit-reset-after']);
+		const remaining = Number(response.headers['x-ratelimit-remaining']);
+
+		if (remaining === 0) {
+			await sleep(resetAfter);
+		} else {
+			await sleep(20); //prevent exceeding global rate limit of 50 requests per second
+		}
+
+		return response.body || { success: true };
+	} catch (error) {
+		throw new NodeApiError(this.getNode(), error);
+	}
+}
+
+export async function discordApiMultiPartRequest(
+	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
+	endpoint: string,
+	formData: FormData,
+) {
+	const headers: IDataObject = {
+		'content-type': 'multipart/form-data; charset=utf-8',
+	};
+	const authentication = this.getNodeParameter('authentication', 0, 'webhook') as string;
+
+	const credentialType = getCredentialsType(authentication);
+
+	const options: IRequestOptions = {
+		headers,
+		method,
+		formData,
+		url: `https://discord.com/api/v10${endpoint}`,
+	};
+
+	if (credentialType === 'discordWebhookApi') {
+		const credentials = await this.getCredentials('discordWebhookApi');
+		options.url = credentials.webhookUri as string;
+	}
+
+	try {
+		const response = await requestApi.call(this, options, credentialType, endpoint);
+
+		const resetAfter = Number(response.headers['x-ratelimit-reset-after']);
+		const remaining = Number(response.headers['x-ratelimit-remaining']);
+
+		if (remaining === 0) {
+			await sleep(resetAfter);
+		} else {
+			await sleep(20); //prevent exceeding global rate limit of 50 requests per second
+		}
+
+		return jsonParse<IDataObject[]>(response.body);
+	} catch (error) {
+		throw new NodeApiError(this.getNode(), error);
+	}
+}
diff --git a/packages/nodes-base/nodes/Discord/v2/transport/helpers.ts b/packages/nodes-base/nodes/Discord/v2/transport/helpers.ts
new file mode 100644
index 0000000000000..1baba5214d769
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/v2/transport/helpers.ts
@@ -0,0 +1,46 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	IHookFunctions,
+	ILoadOptionsFunctions,
+	IRequestOptions,
+} from 'n8n-workflow';
+
+export const getCredentialsType = (authentication: string) => {
+	let credentialType = '';
+	switch (authentication) {
+		case 'botToken':
+			credentialType = 'discordBotApi';
+			break;
+		case 'oAuth2':
+			credentialType = 'discordOAuth2Api';
+			break;
+		case 'webhook':
+			credentialType = 'discordWebhookApi';
+			break;
+		default:
+			credentialType = 'discordBotApi';
+	}
+	return credentialType;
+};
+
+export async function requestApi(
+	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
+	options: IRequestOptions,
+	credentialType: string,
+	endpoint: string,
+) {
+	let response;
+	if (credentialType === 'discordOAuth2Api' && endpoint !== '/users/@me/guilds') {
+		const credentials = await this.getCredentials('discordOAuth2Api');
+		(options.headers as IDataObject).Authorization = `Bot ${credentials.botToken}`;
+		response = await this.helpers.request({ ...options, resolveWithFullResponse: true });
+	} else {
+		response = await this.helpers.requestWithAuthentication.call(this, credentialType, {
+			...options,
+			resolveWithFullResponse: true,
+		});
+	}
+	return response;
+}
diff --git a/packages/nodes-base/nodes/Discord/v2/transport/index.ts b/packages/nodes-base/nodes/Discord/v2/transport/index.ts
new file mode 100644
index 0000000000000..0e90e2df3899a
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/v2/transport/index.ts
@@ -0,0 +1,2 @@
+export * from './discord.api';
+export * from './helpers';
diff --git a/packages/nodes-base/nodes/Discourse/Discourse.node.ts b/packages/nodes-base/nodes/Discourse/Discourse.node.ts
index 0a9cab911569b..62e518b599f27 100644
--- a/packages/nodes-base/nodes/Discourse/Discourse.node.ts
+++ b/packages/nodes-base/nodes/Discourse/Discourse.node.ts
@@ -372,6 +372,24 @@ export class Discourse implements INodeType {
 						const returnAll = this.getNodeParameter('returnAll', i);
 						const flag = this.getNodeParameter('flag', i) as boolean;
 
+						const options = this.getNodeParameter('options', i);
+
+						if (options.stats) {
+							qs.stats = options.stats as boolean;
+						}
+
+						if (options.asc) {
+							qs.asc = options.asc as boolean;
+						}
+
+						if (options.showEmails) {
+							qs.show_emails = options.showEmails as boolean;
+						}
+
+						if (options.order) {
+							qs.order = options.order as string;
+						}
+
 						responseData = await discourseApiRequest.call(
 							this,
 							'GET',
@@ -436,6 +454,6 @@ export class Discourse implements INodeType {
 				throw error;
 			}
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Discourse/GenericFunctions.ts b/packages/nodes-base/nodes/Discourse/GenericFunctions.ts
index 64330c7ca9c62..8a66a6296debf 100644
--- a/packages/nodes-base/nodes/Discourse/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Discourse/GenericFunctions.ts
@@ -1,17 +1,16 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	ILoadOptionsFunctions,
 	IDataObject,
 	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function discourseApiRequest(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	path: string,
 
 	body: any = {},
@@ -20,7 +19,7 @@ export async function discourseApiRequest(
 ): Promise<any> {
 	const credentials = (await this.getCredentials('discourseApi')) as { url: string };
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		method,
 		body,
 		qs,
@@ -40,7 +39,7 @@ export async function discourseApiRequest(
 
 export async function discourseApiRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: any = {},
diff --git a/packages/nodes-base/nodes/Discourse/UserDescription.ts b/packages/nodes-base/nodes/Discourse/UserDescription.ts
index cf921a3a1d422..8b750bfd0c2a2 100644
--- a/packages/nodes-base/nodes/Discourse/UserDescription.ts
+++ b/packages/nodes-base/nodes/Discourse/UserDescription.ts
@@ -215,6 +215,10 @@ export const userFields: INodeProperties[] = [
 				name: 'Suspect',
 				value: 'suspect',
 			},
+			{
+				name: 'Suspended',
+				value: 'suspended',
+			},
 		],
 		displayOptions: {
 			show: {
@@ -256,4 +260,93 @@ export const userFields: INodeProperties[] = [
 		default: 50,
 		description: 'Max number of results to return',
 	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['user'],
+				operation: ['getAll'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Ascending',
+				name: 'asc',
+				type: 'boolean',
+				default: true,
+				description: 'Whether to sort ascending',
+			},
+			{
+				displayName: 'Order',
+				name: 'order',
+				type: 'options',
+				options: [
+					{
+						name: 'Created',
+						value: 'created',
+					},
+					{
+						name: 'Days Visited',
+						value: 'days_visited',
+					},
+					{
+						name: 'Email',
+						value: 'email',
+					},
+					{
+						name: 'Last Emailed',
+						value: 'last_emailed',
+					},
+					{
+						name: 'Posts',
+						value: 'posts',
+					},
+					{
+						name: 'Posts Read',
+						value: 'posts_read',
+					},
+					{
+						name: 'Read Time',
+						value: 'read_time',
+					},
+					{
+						name: 'Seen',
+						value: 'seen',
+					},
+					{
+						name: 'Topics Viewed',
+						value: 'topics_viewed',
+					},
+					{
+						name: 'Trust Level',
+						value: 'trust_level',
+					},
+					{
+						name: 'Username',
+						value: 'username',
+					},
+				],
+				default: 'created',
+				description: 'What to order by',
+			},
+			{
+				displayName: 'Show Emails',
+				name: 'showEmails',
+				type: 'boolean',
+				default: false,
+				description: 'Whether to include user email addresses',
+			},
+			{
+				displayName: 'Stats',
+				name: 'stats',
+				type: 'boolean',
+				default: false,
+				description: 'Whether to return user stats',
+			},
+		],
+	},
 ];
diff --git a/packages/nodes-base/nodes/Discourse/discourse.svg b/packages/nodes-base/nodes/Discourse/discourse.svg
index 3bb78593dfc25..0e74b4e015e49 100644
--- a/packages/nodes-base/nodes/Discourse/discourse.svg
+++ b/packages/nodes-base/nodes/Discourse/discourse.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -1 104 106"><g data-name="Layer 2"><g data-name="Layer 3"><path d="M51.87 0C23.71 0 0 22.83 0 51v52.81l51.86-.05c28.16 0 51-23.71 51-51.87S80 0 51.87 0z" fill="#231f20"/><path d="M52.37 19.74a31.62 31.62 0 00-27.79 46.67l-5.72 18.4 20.54-4.64a31.61 31.61 0 1013-60.43z" fill="#fff9ae"/><path d="M77.45 32.12a31.6 31.6 0 01-38.05 48l-20.54 4.7 20.91-2.47a31.6 31.6 0 0037.68-50.23z" fill="#00aeef"/><path d="M71.63 26.29A31.6 31.6 0 0138.8 78l-19.94 6.82 20.54-4.65a31.6 31.6 0 0032.23-53.88z" fill="#00a94f"/><path d="M26.47 67.11a31.61 31.61 0 0151-35 31.61 31.61 0 00-52.89 34.3l-5.72 18.4z" fill="#f15d22"/><path d="M24.58 66.41a31.61 31.61 0 0147.05-40.12 31.61 31.61 0 00-49 39.63l-3.76 18.9z" fill="#e31b23"/></g></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -1 104 106"><g data-name="Layer 2"><g data-name="Layer 3"><path fill="#231f20" d="M51.87 0C23.71 0 0 22.83 0 51v52.81l51.86-.05c28.16 0 51-23.71 51-51.87S80 0 51.87 0"/><path fill="#fff9ae" d="M52.37 19.74a31.62 31.62 0 0 0-27.79 46.67l-5.72 18.4 20.54-4.64a31.61 31.61 0 1 0 13-60.43z"/><path fill="#00aeef" d="M77.45 32.12a31.6 31.6 0 0 1-38.05 48l-20.54 4.7 20.91-2.47a31.6 31.6 0 0 0 37.68-50.23"/><path fill="#00a94f" d="M71.63 26.29A31.6 31.6 0 0 1 38.8 78l-19.94 6.82 20.54-4.65a31.6 31.6 0 0 0 32.23-53.88"/><path fill="#f15d22" d="M26.47 67.11a31.61 31.61 0 0 1 51-35 31.61 31.61 0 0 0-52.89 34.3l-5.72 18.4z"/><path fill="#e31b23" d="M24.58 66.41a31.61 31.61 0 0 1 47.05-40.12 31.61 31.61 0 0 0-49 39.63l-3.76 18.9z"/></g></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Disqus/Disqus.node.ts b/packages/nodes-base/nodes/Disqus/Disqus.node.ts
index 41222d243c8b6..a494eb9392148 100644
--- a/packages/nodes-base/nodes/Disqus/Disqus.node.ts
+++ b/packages/nodes-base/nodes/Disqus/Disqus.node.ts
@@ -4,6 +4,7 @@ import type {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
@@ -576,13 +577,11 @@ export class Disqus implements INodeType {
 		const operation = this.getNodeParameter('operation', 0);
 
 		let endpoint = '';
-		let requestMethod = '';
-		let _body: IDataObject | Buffer;
+		let requestMethod: IHttpRequestMethods;
 		let qs: IDataObject;
 
 		for (let i = 0; i < items.length; i++) {
 			try {
-				_body = {};
 				qs = {};
 
 				if (resource === 'forum') {
@@ -763,6 +762,6 @@ export class Disqus implements INodeType {
 			}
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Disqus/GenericFunctions.ts b/packages/nodes-base/nodes/Disqus/GenericFunctions.ts
index d6471873f5e99..8d03fe04075ef 100644
--- a/packages/nodes-base/nodes/Disqus/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Disqus/GenericFunctions.ts
@@ -1,17 +1,17 @@
-import type { OptionsWithUri } from 'request';
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
+	IRequestOptions,
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function disqusApiRequest(
-	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	qs: IDataObject = {},
 	uri?: string,
 	body: IDataObject = {},
@@ -32,7 +32,7 @@ export async function disqusApiRequest(
 		}
 	}
 
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		method,
 		body,
 		uri: `https://disqus.com/api/3.0/${uri}?${queryStringElements.join('&')}`,
@@ -55,8 +55,8 @@ export async function disqusApiRequest(
  * and return all results
  */
 export async function disqusApiRequestAllItems(
-	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	qs: IDataObject = {},
 	uri?: string,
 	body: IDataObject = {},
diff --git a/packages/nodes-base/nodes/Drift/GenericFunctions.ts b/packages/nodes-base/nodes/Drift/GenericFunctions.ts
index aa738728184b7..44bfb8c2a7e50 100644
--- a/packages/nodes-base/nodes/Drift/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Drift/GenericFunctions.ts
@@ -1,5 +1,3 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IExecuteFunctions,
 	ILoadOptionsFunctions,
@@ -7,12 +5,14 @@ import type {
 	IHookFunctions,
 	IWebhookFunctions,
 	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function driftApiRequest(
 	this: IExecuteFunctions | IWebhookFunctions | IHookFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -20,7 +20,7 @@ export async function driftApiRequest(
 	uri?: string,
 	option: IDataObject = {},
 ): Promise<any> {
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		headers: {},
 		method,
 		body,
diff --git a/packages/nodes-base/nodes/Dropbox/Dropbox.node.ts b/packages/nodes-base/nodes/Dropbox/Dropbox.node.ts
index 6d2e2bae1fa6f..9dd9c1f0cda82 100644
--- a/packages/nodes-base/nodes/Dropbox/Dropbox.node.ts
+++ b/packages/nodes-base/nodes/Dropbox/Dropbox.node.ts
@@ -1,6 +1,7 @@
 import type {
 	IDataObject,
 	IExecuteFunctions,
+	IHttpRequestMethods,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
@@ -312,7 +313,7 @@ export class Dropbox implements INodeType {
 				description: 'The file path of the file to download. Has to contain the full path.',
 			},
 			{
-				displayName: 'Binary Property',
+				displayName: 'Put Output File in Field',
 				name: 'binaryPropertyName',
 				type: 'string',
 				required: true,
@@ -323,7 +324,7 @@ export class Dropbox implements INodeType {
 						resource: ['file'],
 					},
 				},
-				description: 'Name of the binary property to which to write the data of the read file',
+				hint: 'The name of the output binary field to put the file in',
 			},
 
 			// ----------------------------------
@@ -346,7 +347,7 @@ export class Dropbox implements INodeType {
 					'The file path of the file to upload. Has to contain the full path. The parent folder has to exist. Existing files get overwritten.',
 			},
 			{
-				displayName: 'Binary Data',
+				displayName: 'Binary File',
 				name: 'binaryData',
 				type: 'boolean',
 				default: false,
@@ -374,7 +375,7 @@ export class Dropbox implements INodeType {
 				description: 'The text content of the file to upload',
 			},
 			{
-				displayName: 'Binary Property',
+				displayName: 'Input Binary Field',
 				name: 'binaryPropertyName',
 				type: 'string',
 				default: 'data',
@@ -387,8 +388,7 @@ export class Dropbox implements INodeType {
 					},
 				},
 				placeholder: '',
-				description:
-					'Name of the binary property which contains the data for the file to be uploaded',
+				hint: 'The name of the input binary field containing the file to be uploaded',
 			},
 
 			// ----------------------------------
@@ -698,7 +698,7 @@ export class Dropbox implements INodeType {
 		const operation = this.getNodeParameter('operation', 0);
 
 		let endpoint = '';
-		let requestMethod = '';
+		let requestMethod: IHttpRequestMethods = 'GET';
 		let returnAll = false;
 		let property = '';
 		let body: IDataObject | Buffer;
@@ -1017,10 +1017,10 @@ export class Dropbox implements INodeType {
 
 		if (resource === 'file' && operation === 'download') {
 			// For file downloads the files get attached to the existing items
-			return this.prepareOutputData(items);
+			return [items];
 		} else {
 			// For all other ones does the output items get replaced
-			return this.prepareOutputData(returnData);
+			return [returnData];
 		}
 	}
 }
diff --git a/packages/nodes-base/nodes/Dropbox/GenericFunctions.ts b/packages/nodes-base/nodes/Dropbox/GenericFunctions.ts
index 274fdf5276feb..86e9d655699d8 100644
--- a/packages/nodes-base/nodes/Dropbox/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Dropbox/GenericFunctions.ts
@@ -1,6 +1,11 @@
-import type { OptionsWithUri } from 'request';
-
-import type { IDataObject, IExecuteFunctions, IHookFunctions, JsonObject } from 'n8n-workflow';
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	IHookFunctions,
+	IHttpRequestMethods,
+	IRequestOptions,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 /**
@@ -9,14 +14,14 @@ import { NodeApiError } from 'n8n-workflow';
  */
 export async function dropboxApiRequest(
 	this: IHookFunctions | IExecuteFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: object,
 	query: IDataObject = {},
-	headers: object = {},
+	headers: IDataObject = {},
 	option: IDataObject = {},
 ): Promise<any> {
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers,
 		method,
 		qs: query,
@@ -47,7 +52,7 @@ export async function dropboxApiRequest(
 export async function dropboxpiRequestAllItems(
 	this: IExecuteFunctions | IHookFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: any = {},
@@ -85,7 +90,7 @@ export async function dropboxpiRequestAllItems(
 }
 
 export async function getRootDirectory(this: IHookFunctions | IExecuteFunctions) {
-	return dropboxApiRequest.call(
+	return await dropboxApiRequest.call(
 		this,
 		'POST',
 		'https://api.dropboxapi.com/2/users/get_current_account',
diff --git a/packages/nodes-base/nodes/Dropbox/dropbox.svg b/packages/nodes-base/nodes/Dropbox/dropbox.svg
index 9be2f8d406e3a..3399a31c71f53 100644
--- a/packages/nodes-base/nodes/Dropbox/dropbox.svg
+++ b/packages/nodes-base/nodes/Dropbox/dropbox.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 67 62" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x="1" y="1"/><symbol id="a" overflow="visible"><path d="M18.874.02L0 12.18l13.066 10.526L32 11.032m-32 22l18.874 12.4L32 34.422 13.066 22.686M32 34.422l13.188 11.01L64 33.152 50.994 22.686M64 12.28L45.188 0 32 11.01l18.994 11.674M32.06 36.778L18.872 47.726l-5.686-3.69v4.174L32.06 59.522 50.934 48.21v-4.174l-5.686 3.69" stroke="none" fill="#007ee5" fill-rule="nonzero"/></symbol></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round" viewBox="0 0 67 62"><use xlink:href="#a" x="1" y="1"/><symbol id="a" overflow="visible"><path fill="#007ee5" fill-rule="nonzero" stroke="none" d="M18.874.02 0 12.18l13.066 10.526L32 11.032m-32 22 18.874 12.4L32 34.422 13.066 22.686M32 34.422l13.188 11.01L64 33.152 50.994 22.686M64 12.28 45.188 0 32 11.01l18.994 11.674M32.06 36.778 18.872 47.726l-5.686-3.69v4.174L32.06 59.522 50.934 48.21v-4.174l-5.686 3.69"/></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Dropcontact/Dropcontact.node.ts b/packages/nodes-base/nodes/Dropcontact/Dropcontact.node.ts
index 3254325826db3..0eddec8ac99e2 100644
--- a/packages/nodes-base/nodes/Dropcontact/Dropcontact.node.ts
+++ b/packages/nodes-base/nodes/Dropcontact/Dropcontact.node.ts
@@ -294,7 +294,7 @@ export class Dropcontact implements INodeType {
 				if (!simplify) {
 					const waitTime = this.getNodeParameter('options.waitTime', 0, 45) as number;
 
-					const delay = async (ms: any) => new Promise((res) => setTimeout(res, ms * 1000));
+					const delay = async (ms: any) => await new Promise((res) => setTimeout(res, ms * 1000));
 					await delay(waitTime);
 					responseData = await dropcontactApiRequest.call(
 						this,
@@ -370,6 +370,6 @@ export class Dropcontact implements INodeType {
 			}
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Dropcontact/GenericFunction.ts b/packages/nodes-base/nodes/Dropcontact/GenericFunction.ts
index 4e09f3981eeea..98b5516520652 100644
--- a/packages/nodes-base/nodes/Dropcontact/GenericFunction.ts
+++ b/packages/nodes-base/nodes/Dropcontact/GenericFunction.ts
@@ -4,21 +4,21 @@ import type {
 	IDataObject,
 	ILoadOptionsFunctions,
 	IPairedItemData,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 
-import type { OptionsWithUri } from 'request';
-
 /**
  * Make an authenticated API request to Bubble.
  */
 export async function dropcontactApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject,
 	qs: IDataObject,
 ) {
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		method,
 		uri: `https://api.dropcontact.io${endpoint}`,
 		qs,
@@ -34,7 +34,7 @@ export async function dropcontactApiRequest(
 		delete options.qs;
 	}
 
-	return this.helpers.requestWithAuthentication.call(this, 'dropcontactApi', options);
+	return await this.helpers.requestWithAuthentication.call(this, 'dropcontactApi', options);
 }
 
 export function mapPairedItemsFrom<T>(iterable: Iterable<T> | ArrayLike<T>): IPairedItemData[] {
diff --git a/packages/nodes-base/nodes/Dropcontact/dropcontact.svg b/packages/nodes-base/nodes/Dropcontact/dropcontact.svg
index 447973cc55ccd..e92eec238118d 100644
--- a/packages/nodes-base/nodes/Dropcontact/dropcontact.svg
+++ b/packages/nodes-base/nodes/Dropcontact/dropcontact.svg
@@ -1,3 +1 @@
-<svg viewBox="0 0 50 50" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M29.5692 16.219C28.1469 15.5371 26.5535 15.1552 24.8709 15.1552C18.8615 15.1552 13.9899 20.0268 13.9899 26.0362C13.9899 32.0456 18.8615 36.9172 24.8709 36.9172C28.9621 36.9172 32.526 34.6592 34.3843 31.3215L31.7614 29.8643C30.4154 32.2818 27.8341 33.9172 24.8709 33.9172C20.5183 33.9172 16.9899 30.3888 16.9899 26.0362C16.9899 21.6836 20.5183 18.1552 24.8709 18.1552C26.0896 18.1552 27.2437 18.4318 28.2738 18.9257L29.5692 16.219ZM34.7779 1.98444V27.7461H31.669V0.899363C29.5459 0.313171 27.3095 0 25 0C11.1929 0 0 11.1929 0 25C0 38.8071 11.1929 50 25 50C38.8071 50 50 38.8071 50 25C50 14.6626 43.7259 5.7907 34.7779 1.98444Z" fill="#0ABA9F"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 50 50"><path fill="#0ABA9F" fill-rule="evenodd" d="M29.57 16.219a10.8 10.8 0 0 0-4.7-1.064c-6.009 0-10.88 4.872-10.88 10.881s4.871 10.881 10.88 10.881c4.092 0 7.656-2.258 9.514-5.596l-2.623-1.457a7.88 7.88 0 1 1-3.488-10.939zm5.208-14.235v25.762h-3.109V.9C29.546.313 27.309 0 25 0 11.193 0 0 11.193 0 25s11.193 25 25 25 25-11.193 25-25c0-10.337-6.274-19.21-15.222-23.016" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/E2eTest/E2eTest.node.json b/packages/nodes-base/nodes/E2eTest/E2eTest.node.json
new file mode 100644
index 0000000000000..d5e8d3c3a92b3
--- /dev/null
+++ b/packages/nodes-base/nodes/E2eTest/E2eTest.node.json
@@ -0,0 +1,18 @@
+{
+	"node": "n8n-nodes-base.e2eTest",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"details": "The is a test node for e2e testing.",
+	"categories": ["Core Nodes"],
+	"resources": {
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.editimage/"
+			}
+		]
+	},
+	"subcategories": {
+		"Core Nodes": ["Helpers"]
+	},
+	"e2e": true
+}
diff --git a/packages/nodes-base/nodes/E2eTest/E2eTest.node.ts b/packages/nodes-base/nodes/E2eTest/E2eTest.node.ts
new file mode 100644
index 0000000000000..c5de614ec43f8
--- /dev/null
+++ b/packages/nodes-base/nodes/E2eTest/E2eTest.node.ts
@@ -0,0 +1,215 @@
+import type {
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
+	INodeExecutionData,
+	INodeListSearchResult,
+	INodePropertyOptions,
+	INodeType,
+	INodeTypeDescription,
+	ResourceMapperFields,
+} from 'n8n-workflow';
+import { remoteOptions, resourceMapperFields, returnData, searchOptions } from './mock';
+
+export class E2eTest implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'E2E Test',
+		name: 'e2eTest',
+		icon: 'fa:play',
+		group: ['output'],
+		version: 1,
+		subtitle: '={{$parameter["operation"]}}',
+		description: 'Dummy node used for e2e testing',
+		defaults: {
+			name: 'E2E Test',
+		},
+		inputs: ['main'],
+		outputs: ['main'],
+		properties: [
+			{
+				displayName: 'Operation',
+				name: 'operation',
+				type: 'options',
+				noDataExpression: true,
+				options: [
+					{
+						name: 'Remote Options',
+						value: 'remoteOptions',
+					},
+					{
+						name: 'Resource Locator',
+						value: 'resourceLocator',
+					},
+					{
+						name: 'Resource Mapping Component',
+						value: 'resourceMapper',
+					},
+				],
+				default: 'remoteOptions',
+			},
+			{
+				displayName: 'Field ID',
+				name: 'fieldId',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Remote Options Name or ID',
+				name: 'remoteOptions',
+				description:
+					'Remote options to load. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: ['fieldId'],
+					loadOptionsMethod: 'getOptions',
+				},
+				required: true,
+				default: [],
+				displayOptions: {
+					show: {
+						operation: ['remoteOptions'],
+					},
+				},
+			},
+			{
+				displayName: 'Resource Locator',
+				name: 'rlc',
+				type: 'resourceLocator',
+				default: { mode: 'list', value: '' },
+				required: true,
+				displayOptions: {
+					show: {
+						operation: ['resourceLocator'],
+					},
+				},
+				modes: [
+					{
+						displayName: 'From List',
+						name: 'list',
+						type: 'list',
+						typeOptions: {
+							searchListMethod: 'optionsSearch',
+							searchable: true,
+						},
+					},
+					{
+						displayName: 'By URL',
+						name: 'url',
+						type: 'string',
+						placeholder: 'https://example.com/user/a4071e98-7d40-41fb-8911-ce3e7bf94fb2',
+						validation: [
+							{
+								type: 'regex',
+								properties: {
+									regex:
+										'https://example.com/user/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}',
+									errorMessage: 'Not a valid example URL',
+								},
+							},
+						],
+						extractValue: {
+							type: 'regex',
+							regex:
+								'https://example.com/user/([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})',
+						},
+					},
+					{
+						displayName: 'ID',
+						name: 'id',
+						type: 'string',
+						validation: [
+							{
+								type: 'regex',
+								properties: {
+									regex: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}',
+									errorMessage: 'Not a valid UUI',
+								},
+							},
+						],
+						placeholder: 'a4071e98-7d40-41fb-8911-ce3e7bf94fb2',
+					},
+				],
+			},
+			{
+				displayName: 'Resource Mapping Component',
+				name: 'resourceMapper',
+				type: 'resourceMapper',
+				noDataExpression: true,
+				default: {
+					mappingMode: 'defineBelow',
+					value: null,
+				},
+				required: true,
+				typeOptions: {
+					loadOptionsDependsOn: ['fieldId'],
+					resourceMapper: {
+						resourceMapperMethod: 'getMappingColumns',
+						mode: 'upsert',
+						fieldWords: {
+							singular: 'column',
+							plural: 'columns',
+						},
+						addAllFields: true,
+						multiKeyMatch: false,
+					},
+				},
+				displayOptions: {
+					show: {
+						operation: ['resourceMapper'],
+					},
+				},
+			},
+			{
+				displayName: 'Other Non Important Field',
+				name: 'otherField',
+				type: 'string',
+				default: '',
+			},
+		],
+	};
+
+	methods = {
+		loadOptions: {
+			async getOptions(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				return remoteOptions;
+			},
+		},
+		listSearch: {
+			async optionsSearch(
+				this: ILoadOptionsFunctions,
+				filter?: string,
+				paginationToken?: string,
+			): Promise<INodeListSearchResult> {
+				const pageSize = 5;
+				let results = searchOptions;
+				if (filter) {
+					results = results.filter((option) => option.name.includes(filter));
+				}
+
+				const offset = paginationToken ? parseInt(paginationToken, 10) : 0;
+				results = results.slice(offset, offset + pageSize);
+
+				return {
+					results,
+					paginationToken: offset + pageSize,
+				};
+			},
+		},
+		resourceMapping: {
+			async getMappingColumns(this: ILoadOptionsFunctions): Promise<ResourceMapperFields> {
+				return resourceMapperFields;
+			},
+		},
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const operation = this.getNodeParameter('operation', 0);
+		// For resource mapper testing, return actual node values
+		if (operation === 'resourceMapper') {
+			const rmValue = this.getNodeParameter('resourceMapper.value', 0);
+			if (rmValue) {
+				return [[{ json: rmValue as INodeExecutionData }]];
+			}
+		}
+		return [returnData];
+	}
+}
diff --git a/packages/nodes-base/nodes/E2eTest/mock.ts b/packages/nodes-base/nodes/E2eTest/mock.ts
new file mode 100644
index 0000000000000..15422441dc8b6
--- /dev/null
+++ b/packages/nodes-base/nodes/E2eTest/mock.ts
@@ -0,0 +1,73 @@
+import { array, name, uuid } from 'minifaker';
+import 'minifaker/locales/en';
+import type {
+	INodeExecutionData,
+	INodeListSearchResult,
+	INodePropertyOptions,
+	ResourceMapperFields,
+} from 'n8n-workflow';
+
+export const returnData: INodeExecutionData[] = [
+	{
+		json: {
+			id: '23423532',
+			name: 'Hello World',
+		},
+	},
+];
+
+export const remoteOptions: INodePropertyOptions[] = [
+	{
+		name: 'Resource 1',
+		value: 'resource1',
+	},
+	{
+		name: 'Resource 2',
+		value: 'resource2',
+	},
+	{
+		name: 'Resource 3',
+		value: 'resource3',
+	},
+];
+
+export const resourceMapperFields: ResourceMapperFields = {
+	fields: [
+		{
+			id: 'id',
+			displayName: 'ID',
+			defaultMatch: true,
+			canBeUsedToMatch: true,
+			required: true,
+			display: true,
+			type: 'string',
+		},
+		{
+			id: 'name',
+			displayName: 'Name',
+			defaultMatch: false,
+			canBeUsedToMatch: false,
+			required: false,
+			display: true,
+			type: 'string',
+		},
+		{
+			id: 'age',
+			displayName: 'Age',
+			defaultMatch: false,
+			canBeUsedToMatch: false,
+			required: false,
+			display: true,
+			type: 'number',
+		},
+	],
+};
+
+export const searchOptions: INodeListSearchResult['results'] = array(100, () => {
+	const value = uuid.v4();
+	return {
+		name: name(),
+		value,
+		url: 'https://example.com/user/' + value,
+	};
+});
diff --git a/packages/nodes-base/nodes/ERPNext/ERPNext.node.ts b/packages/nodes-base/nodes/ERPNext/ERPNext.node.ts
index 13a5d39d0dd79..c5929abc82cf9 100644
--- a/packages/nodes-base/nodes/ERPNext/ERPNext.node.ts
+++ b/packages/nodes-base/nodes/ERPNext/ERPNext.node.ts
@@ -89,7 +89,6 @@ export class ERPNext implements INodeType {
 
 				docFields.unshift({ name: '*', value: '*' });
 
-				// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
 				return processNames(docFields);
 			},
 			async getDocFields(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
@@ -107,7 +106,6 @@ export class ERPNext implements INodeType {
 					},
 				);
 
-				// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
 				return processNames(docFields);
 			},
 		},
@@ -290,6 +288,6 @@ export class ERPNext implements INodeType {
 			);
 			returnData.push(...executionData);
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/ERPNext/GenericFunctions.ts b/packages/nodes-base/nodes/ERPNext/GenericFunctions.ts
index bb390bb26e03c..427ac764b2326 100644
--- a/packages/nodes-base/nodes/ERPNext/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/ERPNext/GenericFunctions.ts
@@ -1,11 +1,11 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IExecuteFunctions,
 	ILoadOptionsFunctions,
 	IDataObject,
 	IHookFunctions,
 	IWebhookFunctions,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
@@ -13,11 +13,11 @@ import { NodeApiError } from 'n8n-workflow';
  * Return the base API URL based on the user's environment.
  */
 const getBaseUrl = ({ environment, domain, subdomain }: ERPNextApiCredentials) =>
-	environment === 'cloudHosted' ? `https://${subdomain}.erpnext.com` : domain;
+	environment === 'cloudHosted' ? `https://${subdomain}.${domain}` : domain;
 
 export async function erpNextApiRequest(
 	this: IExecuteFunctions | IWebhookFunctions | IHookFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 	body: IDataObject = {},
 	query: IDataObject = {},
@@ -27,7 +27,7 @@ export async function erpNextApiRequest(
 	const credentials = (await this.getCredentials('erpNextApi')) as ERPNextApiCredentials;
 	const baseUrl = getBaseUrl(credentials);
 
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		headers: {
 			Accept: 'application/json',
 			'Content-Type': 'application/json',
@@ -68,7 +68,7 @@ export async function erpNextApiRequest(
 export async function erpNextApiRequestAllItems(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 	body: IDataObject,
 	query: IDataObject = {},
diff --git a/packages/nodes-base/nodes/ERPNext/erpnext.svg b/packages/nodes-base/nodes/ERPNext/erpnext.svg
index 4e61fdc20e212..516ae2b6d7457 100644
--- a/packages/nodes-base/nodes/ERPNext/erpnext.svg
+++ b/packages/nodes-base/nodes/ERPNext/erpnext.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512"><path fill="#7574FF" d="M512 448c0 35.2-28.8 64-64 64H64c-35.2 0-64-28.8-64-64V64C0 28.8 28.8 0 64 0h384c35.2 0 64 28.8 64 64v384z"/><path fill="#FFF" d="M150.483 371.684V141.15c0-15.167 9.534-25.133 23.833-25.133h162.5c13.866 0 20.8 6.933 20.8 18.633v2.6c0 12.133-6.934 18.633-20.8 18.633h-141.7v78.434H304.75c14.3 0 20.8 6.066 20.8 17.767v1.3c0 12.133-6.934 18.633-20.8 18.633H195.117v84.934h144.3c13.867 0 20.367 6.066 20.367 17.767v2.167c0 12.566-6.5 19.5-20.367 19.5h-165.1c-14.3-.001-23.834-9.534-23.834-24.701z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512"><path fill="#7574FF" d="M512 448c0 35.2-28.8 64-64 64H64c-35.2 0-64-28.8-64-64V64C0 28.8 28.8 0 64 0h384c35.2 0 64 28.8 64 64z"/><path fill="#FFF" d="M150.483 371.684V141.15c0-15.167 9.534-25.133 23.833-25.133h162.5c13.866 0 20.8 6.933 20.8 18.633v2.6c0 12.133-6.934 18.633-20.8 18.633h-141.7v78.434H304.75c14.3 0 20.8 6.066 20.8 17.767v1.3c0 12.133-6.934 18.633-20.8 18.633H195.117v84.934h144.3c13.867 0 20.367 6.066 20.367 17.767v2.167c0 12.566-6.5 19.5-20.367 19.5h-165.1c-14.3-.001-23.834-9.534-23.834-24.701"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/ERPNext/utils.ts b/packages/nodes-base/nodes/ERPNext/utils.ts
index 2f31c2b86ac9e..4d066cc449e4c 100644
--- a/packages/nodes-base/nodes/ERPNext/utils.ts
+++ b/packages/nodes-base/nodes/ERPNext/utils.ts
@@ -1,6 +1,6 @@
-import flow from 'lodash.flow';
-import sortBy from 'lodash.sortby';
-import uniqBy from 'lodash.uniqby';
+import flow from 'lodash/flow';
+import sortBy from 'lodash/sortBy';
+import uniqBy from 'lodash/uniqBy';
 
 export type DocumentProperties = {
 	customProperty: Array<{ field: string; value: string }>;
diff --git a/packages/nodes-base/nodes/EditImage/EditImage.node.json b/packages/nodes-base/nodes/EditImage/EditImage.node.json
index ae77de2401572..56219a87a2991 100644
--- a/packages/nodes-base/nodes/EditImage/EditImage.node.json
+++ b/packages/nodes-base/nodes/EditImage/EditImage.node.json
@@ -3,7 +3,7 @@
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
 	"details": "The Edit Image node allows you to manipulate and edit images. Use this node when you want to:\n\n- Blur an image\n- Add a border to an image\n- Create a new image\n- Crop an image\n- Composite an image on top of another\n- Draw on an image\n- Get information about the image\n- Rotate an image\n- Change the size of an image\n- Shear an image along the X or Y axis\n- Add text to the image",
-	"categories": ["Marketing & Content", "Core Nodes"],
+	"categories": ["Marketing", "Core Nodes"],
 	"resources": {
 		"primaryDocumentation": [
 			{
@@ -11,7 +11,8 @@
 			}
 		]
 	},
+	"aliases": ["File", "Binary"],
 	"subcategories": {
-		"Core Nodes": ["Files"]
+		"Core Nodes": ["Files", "Data Transformation"]
 	}
 }
diff --git a/packages/nodes-base/nodes/EditImage/EditImage.node.ts b/packages/nodes-base/nodes/EditImage/EditImage.node.ts
index 52aba1a1cebe9..04b8e3dc9149a 100644
--- a/packages/nodes-base/nodes/EditImage/EditImage.node.ts
+++ b/packages/nodes-base/nodes/EditImage/EditImage.node.ts
@@ -1,3 +1,5 @@
+import { parse as pathParse } from 'path';
+import { writeFile as fsWriteFile } from 'fs/promises';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -11,10 +13,6 @@ import type {
 import { deepCopy } from 'n8n-workflow';
 import gm from 'gm';
 import { file } from 'tmp-promise';
-import { parse as pathParse } from 'path';
-import { writeFile as fsWriteFile } from 'fs';
-import { promisify } from 'util';
-const fsWriteFileAsync = promisify(fsWriteFile);
 import getSystemFonts from 'get-system-fonts';
 
 const nodeOperations: INodePropertyOptions[] = [
@@ -1030,6 +1028,7 @@ export class EditImage implements INodeType {
 					rotate: ['backgroundColor', 'rotate'],
 					shear: ['degreesX', 'degreesY'],
 					text: ['font', 'fontColor', 'fontSize', 'lineLength', 'positionX', 'positionY', 'text'],
+					transparent: ['color'],
 				};
 
 				let operations: IDataObject[] = [];
@@ -1107,7 +1106,6 @@ export class EditImage implements INodeType {
 						const operator = operationData.operator as string;
 
 						const geometryString =
-							// eslint-disable-next-line @typescript-eslint/restrict-plus-operands
 							(positionX >= 0 ? '+' : '') + positionX + (positionY >= 0 ? '+' : '') + positionY;
 
 						const binaryPropertyName = operationData.dataPropertyNameComposite as string;
@@ -1117,9 +1115,9 @@ export class EditImage implements INodeType {
 							binaryPropertyName,
 						);
 
-						const { fd, path, cleanup } = await file();
+						const { path, cleanup } = await file();
 						cleanupFunctions.push(cleanup);
-						await fsWriteFileAsync(fd, binaryDataBuffer);
+						await fsWriteFile(path, binaryDataBuffer);
 
 						if (operations[0].operation === 'create') {
 							// It seems like if the image gets created newly we have to create a new gm instance
@@ -1283,7 +1281,6 @@ export class EditImage implements INodeType {
 					const fileName = newItem.binary![dataPropertyName].fileName;
 					if (fileName?.includes('.')) {
 						newItem.binary![dataPropertyName].fileName =
-							// eslint-disable-next-line @typescript-eslint/restrict-plus-operands
 							fileName.split('.').slice(0, -1).join('.') + '.' + options.format;
 					}
 				}
@@ -1326,6 +1323,6 @@ export class EditImage implements INodeType {
 				throw error;
 			}
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Egoi/Egoi.node.json b/packages/nodes-base/nodes/Egoi/Egoi.node.json
index fa25029bc41d6..fd42328b2834e 100644
--- a/packages/nodes-base/nodes/Egoi/Egoi.node.json
+++ b/packages/nodes-base/nodes/Egoi/Egoi.node.json
@@ -2,7 +2,7 @@
 	"node": "n8n-nodes-base.egoi",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Communication", "Marketing & Content"],
+	"categories": ["Communication", "Marketing"],
 	"resources": {
 		"credentialDocumentation": [
 			{
diff --git a/packages/nodes-base/nodes/Egoi/Egoi.node.ts b/packages/nodes-base/nodes/Egoi/Egoi.node.ts
index 54d36f42c9361..acffe03e97db7 100644
--- a/packages/nodes-base/nodes/Egoi/Egoi.node.ts
+++ b/packages/nodes-base/nodes/Egoi/Egoi.node.ts
@@ -8,12 +8,11 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
+import moment from 'moment-timezone';
 import { egoiApiRequest, egoiApiRequestAllItems, simplify } from './GenericFunctions';
 
 import type { ICreateMemberBody } from './Interfaces';
 
-import moment from 'moment-timezone';
-
 export class Egoi implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'E-goi',
@@ -631,7 +630,6 @@ export class Egoi implements INodeType {
 						}
 
 						if (simple) {
-							// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
 							const data = (await simplify.call(this, [responseData], listId))[0];
 
 							responseData = {
@@ -675,7 +673,6 @@ export class Egoi implements INodeType {
 						}
 
 						if (simple) {
-							// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
 							responseData = await simplify.call(this, responseData, listId);
 						}
 					}
@@ -755,6 +752,6 @@ export class Egoi implements INodeType {
 			);
 			returnData.push(...executionData);
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Egoi/GenericFunctions.ts b/packages/nodes-base/nodes/Egoi/GenericFunctions.ts
index e1abbb2bff441..a20e5e87613d2 100644
--- a/packages/nodes-base/nodes/Egoi/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Egoi/GenericFunctions.ts
@@ -1,12 +1,11 @@
-import type { OptionsWithUrl } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	JsonObject,
+	IRequestOptions,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
@@ -21,8 +20,8 @@ const fieldCache: {
 } = {};
 
 export async function egoiApiRequest(
-	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: any = {},
@@ -31,7 +30,7 @@ export async function egoiApiRequest(
 ): Promise<any> {
 	const credentials = await this.getCredentials('egoiApi');
 
-	const options: OptionsWithUrl = {
+	const options: IRequestOptions = {
 		headers: {
 			accept: 'application/json',
 			Apikey: `${credentials.apiKey}`,
@@ -65,7 +64,7 @@ export async function getFields(this: IExecuteFunctions, listId: string) {
 export async function egoiApiRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: any = {},
diff --git a/packages/nodes-base/nodes/Elastic/ElasticSecurity/ElasticSecurity.node.ts b/packages/nodes-base/nodes/Elastic/ElasticSecurity/ElasticSecurity.node.ts
index 235d6967e7dc3..7602033765c4a 100644
--- a/packages/nodes-base/nodes/Elastic/ElasticSecurity/ElasticSecurity.node.ts
+++ b/packages/nodes-base/nodes/Elastic/ElasticSecurity/ElasticSecurity.node.ts
@@ -9,6 +9,7 @@ import type {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
@@ -39,8 +40,6 @@ import type {
 	ElasticSecurityApiCredentials,
 } from './types';
 
-import type { OptionsWithUri } from 'request';
-
 export class ElasticSecurity implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Elastic Security',
@@ -133,7 +132,7 @@ export class ElasticSecurity implements INodeType {
 
 				const endpoint = '/cases/status';
 
-				const options: OptionsWithUri = {
+				const options: IRequestOptions = {
 					headers: {
 						Authorization: `Basic ${token}`,
 						'kbn-xsrf': true,
@@ -590,6 +589,6 @@ export class ElasticSecurity implements INodeType {
 			}
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Elastic/ElasticSecurity/GenericFunctions.ts b/packages/nodes-base/nodes/Elastic/ElasticSecurity/GenericFunctions.ts
index c1cf82b25b4ea..696170cff1af3 100644
--- a/packages/nodes-base/nodes/Elastic/ElasticSecurity/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Elastic/ElasticSecurity/GenericFunctions.ts
@@ -3,11 +3,11 @@ import type {
 	IDataObject,
 	ILoadOptionsFunctions,
 	JsonObject,
+	IRequestOptions,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
-import type { OptionsWithUri } from 'request';
-
 import type { Connector, ElasticSecurityApiCredentials } from './types';
 
 export function tolerateTrailingSlash(baseUrl: string) {
@@ -16,7 +16,7 @@ export function tolerateTrailingSlash(baseUrl: string) {
 
 export async function elasticSecurityApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject = {},
 	qs: IDataObject = {},
@@ -31,7 +31,7 @@ export async function elasticSecurityApiRequest(
 
 	const token = Buffer.from(`${username}:${password}`).toString('base64');
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			Authorization: `Basic ${token}`,
 			'kbn-xsrf': true,
@@ -64,7 +64,7 @@ export async function elasticSecurityApiRequest(
 
 export async function elasticSecurityApiRequestAllItems(
 	this: IExecuteFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject = {},
 	qs: IDataObject = {},
@@ -89,7 +89,7 @@ export async function elasticSecurityApiRequestAllItems(
 
 export async function handleListing(
 	this: IExecuteFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject = {},
 	qs: IDataObject = {},
@@ -97,7 +97,7 @@ export async function handleListing(
 	const returnAll = this.getNodeParameter('returnAll', 0);
 
 	if (returnAll) {
-		return elasticSecurityApiRequestAllItems.call(this, method, endpoint, body, qs);
+		return await elasticSecurityApiRequestAllItems.call(this, method, endpoint, body, qs);
 	}
 
 	const responseData = await elasticSecurityApiRequestAllItems.call(
diff --git a/packages/nodes-base/nodes/Elastic/ElasticSecurity/descriptions/ConnectorDescription.ts b/packages/nodes-base/nodes/Elastic/ElasticSecurity/descriptions/ConnectorDescription.ts
index 5239af2472462..3c073f7edd012 100644
--- a/packages/nodes-base/nodes/Elastic/ElasticSecurity/descriptions/ConnectorDescription.ts
+++ b/packages/nodes-base/nodes/Elastic/ElasticSecurity/descriptions/ConnectorDescription.ts
@@ -104,6 +104,7 @@ export const connectorFields: INodeProperties[] = [
 		name: 'apiToken',
 		description: 'Jira API token',
 		type: 'string',
+		typeOptions: { password: true },
 		required: true,
 		default: '',
 		displayOptions: {
@@ -165,6 +166,7 @@ export const connectorFields: INodeProperties[] = [
 		name: 'apiKeyId',
 		description: 'IBM Resilient API key ID',
 		type: 'string',
+		typeOptions: { password: true },
 		required: true,
 		default: '',
 		displayOptions: {
@@ -180,6 +182,7 @@ export const connectorFields: INodeProperties[] = [
 		name: 'apiKeySecret',
 		description: 'IBM Resilient API key secret',
 		type: 'string',
+		typeOptions: { password: true },
 		required: true,
 		default: '',
 		displayOptions: {
diff --git a/packages/nodes-base/nodes/Elastic/ElasticSecurity/elasticSecurity.svg b/packages/nodes-base/nodes/Elastic/ElasticSecurity/elasticSecurity.svg
index 307e912c45796..ffe2086bf5230 100644
--- a/packages/nodes-base/nodes/Elastic/ElasticSecurity/elasticSecurity.svg
+++ b/packages/nodes-base/nodes/Elastic/ElasticSecurity/elasticSecurity.svg
@@ -1,11 +1 @@
-<svg width="64px" height="64px" viewBox="2 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 63.1 (92452) - https://sketch.com -->
-    <title>security-logo-color-32px</title>
-    <desc>Created with Sketch.</desc>
-    <g id="security-logo-color-32px" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <rect id="bounding-box" x="0" y="0" width="32" height="32"/>
-        <path d="M9,7.00818271 L9,5.68434189e-14 L29,5.68434189e-14 L29,16.744186 C29,20.6574083 22.621662,23.2210512 19.9845875,24 L19.9845875,7.00818271 L9,7.00818271 Z" id="Shape" fill="#FA744E"/>
-        <path d="M3,20.0727575 L3,10 L17,10 L17,32 C7.66666667,27.9800464 3,24.0042989 3,20.0727575 Z" id="Path" fill="#1DBAB0"/>
-        <path d="M9,10 L17,10 L17,24 C14.0165399,22.8590583 9,20.2435363 9,16.956562 L9,10 Z" id="Path" fill="#343741"/>
-    </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="2 0 32 32"><g fill="none" fill-rule="evenodd"><path d="M0 0h32v32H0z"/><path fill="#FA744E" d="M9 7.008V0h20v16.744c0 3.913-6.378 6.477-9.015 7.256V7.008z"/><path fill="#1DBAB0" d="M3 20.073V10h14v22Q3 25.97 3 20.073"/><path fill="#343741" d="M9 10h8v14c-2.983-1.14-8-3.756-8-7.043z"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Elastic/ElasticSecurity/types.d.ts b/packages/nodes-base/nodes/Elastic/ElasticSecurity/types.ts
similarity index 100%
rename from packages/nodes-base/nodes/Elastic/ElasticSecurity/types.d.ts
rename to packages/nodes-base/nodes/Elastic/ElasticSecurity/types.ts
diff --git a/packages/nodes-base/nodes/Elastic/Elasticsearch/Elasticsearch.node.ts b/packages/nodes-base/nodes/Elastic/Elasticsearch/Elasticsearch.node.ts
index 043dd3a4b50ff..c209b84538bff 100644
--- a/packages/nodes-base/nodes/Elastic/Elasticsearch/Elasticsearch.node.ts
+++ b/packages/nodes-base/nodes/Elastic/Elasticsearch/Elasticsearch.node.ts
@@ -7,14 +7,13 @@ import type {
 } from 'n8n-workflow';
 import { jsonParse } from 'n8n-workflow';
 
+import omit from 'lodash/omit';
 import { elasticsearchApiRequest, elasticsearchApiRequestAllItems } from './GenericFunctions';
 
 import { documentFields, documentOperations, indexFields, indexOperations } from './descriptions';
 
 import type { DocumentGetAllOptions, FieldsUiValues } from './types';
 
-import omit from 'lodash.omit';
-
 export class Elasticsearch implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Elasticsearch',
@@ -349,6 +348,6 @@ export class Elasticsearch implements INodeType {
 			returnData.push(...executionData);
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Elastic/Elasticsearch/GenericFunctions.ts b/packages/nodes-base/nodes/Elastic/Elasticsearch/GenericFunctions.ts
index 56d137a03a551..ed013079f8cc6 100644
--- a/packages/nodes-base/nodes/Elastic/Elasticsearch/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Elastic/Elasticsearch/GenericFunctions.ts
@@ -1,13 +1,17 @@
-import type { OptionsWithUri } from 'request';
-
-import type { IExecuteFunctions, IDataObject, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IDataObject,
+	JsonObject,
+	IRequestOptions,
+	IHttpRequestMethods,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import type { ElasticsearchApiCredentials } from './types';
 
 export async function elasticsearchApiRequest(
 	this: IExecuteFunctions,
-	method: 'GET' | 'PUT' | 'POST' | 'DELETE',
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject = {},
 	qs: IDataObject = {},
@@ -16,7 +20,7 @@ export async function elasticsearchApiRequest(
 		'elasticsearchApi',
 	)) as ElasticsearchApiCredentials;
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		method,
 		body,
 		qs,
diff --git a/packages/nodes-base/nodes/Elastic/Elasticsearch/elasticsearch.svg b/packages/nodes-base/nodes/Elastic/Elasticsearch/elasticsearch.svg
index 7e2fad792c548..c31ebec7f6042 100644
--- a/packages/nodes-base/nodes/Elastic/Elasticsearch/elasticsearch.svg
+++ b/packages/nodes-base/nodes/Elastic/Elasticsearch/elasticsearch.svg
@@ -1,14 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="64px" height="64px" viewBox="6 5 54 54" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 63.1 (92452) - https://sketch.com -->
-    <title>elastic-search-logo-color-64px</title>
-    <desc>Created with Sketch.</desc>
-    <g id="elastic-search-logo-color-64px" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <rect id="bounding-box" x="0" y="0" width="64" height="64"></rect>
-        <g id="group" transform="translate(8.000000, 4.999500)">
-            <path d="M47.7246,9.708 L47.7276,9.702 C42.7746,3.774 35.3286,0 26.9996,0 C16.4006,0 7.2326,6.112 2.8136,15 L38.0056,15 C40.5306,15 42.9886,14.13 44.9206,12.504 C45.9246,11.659 46.8636,10.739 47.7246,9.708" id="Fill-1" fill="#FEC514"></path>
-            <path d="M0,27.0005 C0,29.4225 0.324,31.7675 0.922,34.0005 L34,34.0005 C37.866,34.0005 41,30.8665 41,27.0005 C41,23.1345 37.866,20.0005 34,20.0005 L0.922,20.0005 C0.324,22.2335 0,24.5785 0,27.0005" id="Fill-4" fill="#343741"></path>
-            <path d="M47.7246,44.293 L47.7276,44.299 C42.7746,50.227 35.3286,54.001 26.9996,54.001 C16.4006,54.001 7.2326,47.889 2.8136,39.001 L38.0056,39.001 C40.5306,39.001 42.9886,39.871 44.9206,41.497 C45.9246,42.342 46.8636,43.262 47.7246,44.293" id="Fill-6" fill="#00BFB3"></path>
-        </g>
-    </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="6 5 54 54"><g fill="none" fill-rule="evenodd"><path d="M0 0h64v64H0z"/><path fill="#FEC514" d="m55.725 14.708.003-.007C50.775 8.775 43.328 5 35 5c-10.6 0-19.767 6.11-24.186 15h35.192c2.525 0 4.983-.87 6.915-2.497a22.5 22.5 0 0 0 2.804-2.796"/><path fill="#343741" d="M8 32c0 2.422.324 4.767.922 7H42a7 7 0 1 0 0-14H8.922A27 27 0 0 0 8 32"/><path fill="#00BFB3" d="m55.725 49.293.003.005C50.775 55.226 43.328 59 35 59c-10.6 0-19.767-6.111-24.186-15h35.192c2.525 0 4.983.87 6.915 2.496a22.5 22.5 0 0 1 2.804 2.796"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Elastic/Elasticsearch/types.d.ts b/packages/nodes-base/nodes/Elastic/Elasticsearch/types.ts
similarity index 100%
rename from packages/nodes-base/nodes/Elastic/Elasticsearch/types.d.ts
rename to packages/nodes-base/nodes/Elastic/Elasticsearch/types.ts
diff --git a/packages/nodes-base/nodes/EmailReadImap/EmailReadImap.node.json b/packages/nodes-base/nodes/EmailReadImap/EmailReadImap.node.json
index 321c472398359..ca29d5e78258f 100644
--- a/packages/nodes-base/nodes/EmailReadImap/EmailReadImap.node.json
+++ b/packages/nodes-base/nodes/EmailReadImap/EmailReadImap.node.json
@@ -23,6 +23,6 @@
 		]
 	},
 	"subcategories": {
-		"Core Nodes": ["Helpers", "Other Trigger Nodes"]
+		"Core Nodes": ["Other Trigger Nodes"]
 	}
 }
diff --git a/packages/nodes-base/nodes/EmailReadImap/v1/EmailReadImapV1.node.ts b/packages/nodes-base/nodes/EmailReadImap/v1/EmailReadImapV1.node.ts
index 8d633f4239b2e..8df78cce8c703 100644
--- a/packages/nodes-base/nodes/EmailReadImap/v1/EmailReadImapV1.node.ts
+++ b/packages/nodes-base/nodes/EmailReadImap/v1/EmailReadImapV1.node.ts
@@ -16,13 +16,13 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import type { ImapSimple, ImapSimpleOptions, Message } from 'imap-simple';
-import { connect as imapConnect, getParts } from 'imap-simple';
+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';
+import isEmpty from 'lodash/isEmpty';
+import find from 'lodash/find';
 
 export async function parseRawEmail(
 	this: ITriggerFunctions,
@@ -72,6 +72,17 @@ const versionDescription: INodeTypeDescription = {
 		name: 'Email Trigger (IMAP)',
 		color: '#44AA22',
 	},
+	triggerPanel: {
+		header: '',
+		executionsHelp: {
+			inactive:
+				"<b>While building your workflow</b>, click the 'listen' button, then send an email to make an event happen. This will trigger an execution, which will show up in this editor.<br /> <br /><b>Once you're happy with your workflow</b>, <a data-key='activate'>activate</a> it. Then every time an email is received, the workflow will execute. These executions will show up in the <a data-key='executions'>executions list</a>, but not in the editor.",
+			active:
+				"<b>While building your workflow</b>, click the 'listen' button, then send an email to make an event happen. This will trigger an execution, which will show up in this editor.<br /> <br /><b>Your workflow will also execute automatically</b>, since it's activated. Every time an email is received, this node will trigger an execution. These executions will show up in the <a data-key='executions'>executions list</a>, but not in the editor.",
+		},
+		activationHint:
+			"Once you’ve finished building your workflow, <a data-key='activate'>activate</a> it to have it also listen continuously (you just won’t see those executions here).",
+	},
 	// eslint-disable-next-line n8n-nodes-base/node-class-description-inputs-wrong-regular-node
 	inputs: [],
 	outputs: ['main'],
@@ -230,7 +241,7 @@ export class EmailReadImapV1 implements INodeType {
 						imap: {
 							user: credentials.user as string,
 							password: credentials.password as string,
-							host: credentials.host as string,
+							host: (credentials.host as string).trim(),
 							port: credentials.port as number,
 							tls: credentials.secure as boolean,
 							authTimeout: 20000,
@@ -239,17 +250,14 @@ export class EmailReadImapV1 implements INodeType {
 					const tlsOptions: IDataObject = {};
 
 					if (credentials.secure) {
-						tlsOptions.servername = credentials.host as string;
+						tlsOptions.servername = (credentials.host as string).trim();
 					}
 					if (!isEmpty(tlsOptions)) {
 						config.imap.tlsOptions = tlsOptions;
 					}
-					const conn = imapConnect(config).then(async (entry) => {
-						return entry;
-					});
-					(await conn).getBoxes((_err, _boxes) => {});
+					const connection = await imapConnect(config);
+					await connection.getBoxes();
 				} catch (error) {
-					console.log(error);
 					return {
 						status: 'Error',
 						message: error.message,
@@ -321,8 +329,8 @@ export class EmailReadImapV1 implements INodeType {
 					.getPartData(message, attachmentPart)
 					.then(async (partData) => {
 						// Return it in the format n8n expects
-						return this.helpers.prepareBinaryData(
-							partData as Buffer,
+						return await this.helpers.prepareBinaryData(
+							Buffer.from(partData),
 							attachmentPart.disposition.params.filename as string,
 						);
 					});
@@ -330,7 +338,7 @@ export class EmailReadImapV1 implements INodeType {
 				attachmentPromises.push(attachmentPromise);
 			}
 
-			return Promise.all(attachmentPromises);
+			return await Promise.all(attachmentPromises);
 		};
 
 		// Returns all the new unseen messages
@@ -359,7 +367,7 @@ export class EmailReadImapV1 implements INodeType {
 			const results = await imapConnection.search(searchCriteria, fetchOptions);
 
 			const newEmails: INodeExecutionData[] = [];
-			let newEmail: INodeExecutionData, messageHeader, messageBody;
+			let newEmail: INodeExecutionData;
 			let attachments: IBinaryData[];
 			let propertyName: string;
 
@@ -431,11 +439,9 @@ export class EmailReadImapV1 implements INodeType {
 						},
 					};
 
-					messageHeader = message.parts.filter((part) => {
-						return part.which === 'HEADER';
-					});
+					const messageHeader = message.parts.filter((part) => part.which === 'HEADER');
 
-					messageBody = messageHeader[0].body;
+					const messageBody = messageHeader[0].body as Record<string, string[]>;
 					for (propertyName of Object.keys(messageBody as IDataObject)) {
 						if (messageBody[propertyName].length) {
 							if (topLevelProperties.includes(propertyName)) {
@@ -516,12 +522,12 @@ export class EmailReadImapV1 implements INodeType {
 				imap: {
 					user: credentials.user as string,
 					password: credentials.password as string,
-					host: credentials.host as string,
+					host: (credentials.host as string).trim(),
 					port: credentials.port as number,
 					tls: credentials.secure as boolean,
 					authTimeout: 20000,
 				},
-				onmail: async () => {
+				onMail: async () => {
 					if (connection) {
 						if (staticData.lastMessageUid !== undefined) {
 							searchCriteria.push(['UID', `${staticData.lastMessageUid as number}:*`]);
@@ -568,7 +574,7 @@ export class EmailReadImapV1 implements INodeType {
 			}
 
 			if (credentials.secure) {
-				tlsOptions.servername = credentials.host as string;
+				tlsOptions.servername = (credentials.host as string).trim();
 			}
 
 			if (!isEmpty(tlsOptions)) {
@@ -577,7 +583,7 @@ export class EmailReadImapV1 implements INodeType {
 
 			// Connect to the IMAP server and open the mailbox
 			// that we get informed whenever a new email arrives
-			return imapConnect(config).then(async (conn) => {
+			return await imapConnect(config).then(async (conn) => {
 				conn.on('error', async (error) => {
 					const errorCode = error.code.toUpperCase();
 					if (['ECONNRESET', 'EPIPE'].includes(errorCode as string)) {
@@ -608,12 +614,15 @@ export class EmailReadImapV1 implements INodeType {
 		let reconnectionInterval: NodeJS.Timeout | undefined;
 
 		if (options.forceReconnect !== undefined) {
-			reconnectionInterval = setInterval(async () => {
-				this.logger.verbose('Forcing reconnection of IMAP node.');
-				connection.end();
-				connection = await establishConnection();
-				await connection.openBox(mailbox);
-			}, (options.forceReconnect as number) * 1000 * 60);
+			reconnectionInterval = setInterval(
+				async () => {
+					this.logger.verbose('Forcing reconnection of IMAP node.');
+					connection.end();
+					connection = await establishConnection();
+					await connection.openBox(mailbox);
+				},
+				(options.forceReconnect as number) * 1000 * 60,
+			);
 		}
 
 		// When workflow and so node gets set to inactive close the connectoin
diff --git a/packages/nodes-base/nodes/EmailReadImap/v2/EmailReadImapV2.node.ts b/packages/nodes-base/nodes/EmailReadImap/v2/EmailReadImapV2.node.ts
index 97a985aa3c179..250615fb11719 100644
--- a/packages/nodes-base/nodes/EmailReadImap/v2/EmailReadImapV2.node.ts
+++ b/packages/nodes-base/nodes/EmailReadImap/v2/EmailReadImapV2.node.ts
@@ -12,16 +12,18 @@ import type {
 	INodeTypeBaseDescription,
 	INodeTypeDescription,
 	ITriggerResponse,
+	JsonObject,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import type { ImapSimple, ImapSimpleOptions, Message } from 'imap-simple';
-import { connect as imapConnect, getParts } from 'imap-simple';
+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 isEmpty from 'lodash.isempty';
-import find from 'lodash.find';
 import type { ICredentialsDataImap } from '../../../credentials/Imap.credentials';
 import { isCredentialsDataImap } from '../../../credentials/Imap.credentials';
 
@@ -32,14 +34,14 @@ export async function parseRawEmail(
 ): Promise<INodeExecutionData> {
 	const responseData = await simpleParser(messageEncoded);
 	const headers: IDataObject = {};
+	const additionalData: IDataObject = {};
+
 	for (const header of responseData.headerLines) {
 		headers[header.key] = header.line;
 	}
 
-	// @ts-ignore
-	responseData.headers = headers;
-	// @ts-ignore
-	responseData.headerLines = undefined;
+	additionalData.headers = headers;
+	additionalData.headerLines = undefined;
 
 	const binaryData: IBinaryKeyData = {};
 	if (responseData.attachments) {
@@ -51,12 +53,12 @@ export async function parseRawEmail(
 				attachment.contentType,
 			);
 		}
-		// @ts-ignore
-		responseData.attachments = undefined;
+
+		additionalData.attachments = undefined;
 	}
 
 	return {
-		json: responseData as unknown as IDataObject,
+		json: { ...responseData, ...additionalData },
 		binary: Object.keys(binaryData).length ? binaryData : undefined,
 	} as INodeExecutionData;
 }
@@ -73,6 +75,17 @@ const versionDescription: INodeTypeDescription = {
 		name: 'Email Trigger (IMAP)',
 		color: '#44AA22',
 	},
+	triggerPanel: {
+		header: '',
+		executionsHelp: {
+			inactive:
+				"<b>While building your workflow</b>, click the 'listen' button, then send an email to make an event happen. This will trigger an execution, which will show up in this editor.<br /> <br /><b>Once you're happy with your workflow</b>, <a data-key='activate'>activate</a> it. Then every time an email is received, the workflow will execute. These executions will show up in the <a data-key='executions'>executions list</a>, but not in the editor.",
+			active:
+				"<b>While building your workflow</b>, click the 'listen' button, then send an email to make an event happen. This will trigger an execution, which will show up in this editor.<br /> <br /><b>Your workflow will also execute automatically</b>, since it's activated. Every time an email is received, this node will trigger an execution. These executions will show up in the <a data-key='executions'>executions list</a>, but not in the editor.",
+		},
+		activationHint:
+			"Once you’ve finished building your workflow, <a data-key='activate'>activate</a> it to have it also listen continuously (you just won’t see those executions here).",
+	},
 	// eslint-disable-next-line n8n-nodes-base/node-class-description-inputs-wrong-regular-node
 	inputs: [],
 	outputs: ['main'],
@@ -225,7 +238,7 @@ export class EmailReadImapV2 implements INodeType {
 							imap: {
 								user: credentials.user,
 								password: credentials.password,
-								host: credentials.host,
+								host: credentials.host.trim(),
 								port: credentials.port,
 								tls: credentials.secure,
 								authTimeout: 20000,
@@ -238,7 +251,7 @@ export class EmailReadImapV2 implements INodeType {
 						}
 
 						if (credentials.secure) {
-							tlsOptions.servername = credentials.host;
+							tlsOptions.servername = credentials.host.trim();
 						}
 						if (!isEmpty(tlsOptions)) {
 							config.imap.tlsOptions = tlsOptions;
@@ -249,7 +262,7 @@ export class EmailReadImapV2 implements INodeType {
 					} catch (error) {
 						return {
 							status: 'Error',
-							message: error.message,
+							message: (error as Error).message,
 						};
 					}
 					return {
@@ -285,7 +298,7 @@ export class EmailReadImapV2 implements INodeType {
 
 		// Returns the email text
 
-		const getText = async (parts: any[], message: Message, subtype: string) => {
+		const getText = async (parts: MessagePart[], message: Message, subtype: string) => {
 			if (!message.attributes.struct) {
 				return '';
 			}
@@ -310,7 +323,7 @@ export class EmailReadImapV2 implements INodeType {
 		// Returns the email attachments
 		const getAttachment = async (
 			imapConnection: ImapSimple,
-			parts: any[],
+			parts: MessagePart[],
 			message: Message,
 		): Promise<IBinaryData[]> => {
 			if (!message.attributes.struct) {
@@ -318,9 +331,17 @@ export class EmailReadImapV2 implements INodeType {
 			}
 
 			// Check if the message has attachments and if so get them
-			const attachmentParts = parts.filter((part) => {
-				return part.disposition && part.disposition.type.toUpperCase() === 'ATTACHMENT';
-			});
+			const attachmentParts = parts.filter(
+				(part) => part.disposition?.type?.toUpperCase() === 'ATTACHMENT',
+			);
+
+			const decodeFilename = (filename: string) => {
+				const regex = /=\?([\w-]+)\?Q\?.*\?=/i;
+				if (regex.test(filename)) {
+					return rfc2047.decode(filename);
+				}
+				return filename;
+			};
 
 			const attachmentPromises = [];
 			let attachmentPromise;
@@ -328,17 +349,19 @@ export class EmailReadImapV2 implements INodeType {
 				attachmentPromise = imapConnection
 					.getPartData(message, attachmentPart)
 					.then(async (partData) => {
-						// Return it in the format n8n expects
-						return this.helpers.prepareBinaryData(
-							partData as Buffer,
-							attachmentPart.disposition.params.filename as string,
+						// if filename contains utf-8 encoded characters, decode it
+						const fileName = decodeFilename(
+							((attachmentPart.disposition as IDataObject)?.params as IDataObject)
+								?.filename as string,
 						);
+						// Return it in the format n8n expects
+						return await this.helpers.prepareBinaryData(Buffer.from(partData), fileName);
 					});
 
 				attachmentPromises.push(attachmentPromise);
 			}
 
-			return Promise.all(attachmentPromises);
+			return await Promise.all(attachmentPromises);
 		};
 
 		// Returns all the new unseen messages
@@ -367,7 +390,7 @@ export class EmailReadImapV2 implements INodeType {
 			const results = await imapConnection.search(searchCriteria, fetchOptions);
 
 			const newEmails: INodeExecutionData[] = [];
-			let newEmail: INodeExecutionData, messageHeader, messageBody;
+			let newEmail: INodeExecutionData;
 			let attachments: IBinaryData[];
 			let propertyName: string;
 
@@ -429,7 +452,7 @@ export class EmailReadImapV2 implements INodeType {
 					) {
 						staticData.lastMessageUid = message.attributes.uid;
 					}
-					const parts = getParts(message.attributes.struct!);
+					const parts = getParts(message.attributes.struct as IDataObject[]);
 
 					newEmail = {
 						json: {
@@ -439,12 +462,10 @@ export class EmailReadImapV2 implements INodeType {
 						},
 					};
 
-					messageHeader = message.parts.filter((part) => {
-						return part.which === 'HEADER';
-					});
+					const messageHeader = message.parts.filter((part) => part.which === 'HEADER');
 
-					messageBody = messageHeader[0].body;
-					for (propertyName of Object.keys(messageBody as IDataObject)) {
+					const messageBody = messageHeader[0].body as Record<string, string[]>;
+					for (propertyName of Object.keys(messageBody)) {
 						if (messageBody[propertyName].length) {
 							if (topLevelProperties.includes(propertyName)) {
 								newEmail.json[propertyName] = messageBody[propertyName][0];
@@ -490,7 +511,7 @@ export class EmailReadImapV2 implements INodeType {
 					// Return base64 string
 					newEmail = {
 						json: {
-							raw: part.body,
+							raw: part.body as string,
 						},
 					};
 
@@ -514,7 +535,9 @@ export class EmailReadImapV2 implements INodeType {
 			let searchCriteria = ['UNSEEN'] as Array<string | string[]>;
 			if (options.customEmailConfig !== undefined) {
 				try {
-					searchCriteria = JSON.parse(options.customEmailConfig as string);
+					searchCriteria = JSON.parse(options.customEmailConfig as string) as Array<
+						string | string[]
+					>;
 				} catch (error) {
 					throw new NodeOperationError(this.getNode(), 'Custom email config is not valid JSON.');
 				}
@@ -524,12 +547,12 @@ export class EmailReadImapV2 implements INodeType {
 				imap: {
 					user: credentials.user,
 					password: credentials.password,
-					host: credentials.host,
+					host: credentials.host.trim(),
 					port: credentials.port,
 					tls: credentials.secure,
 					authTimeout: 20000,
 				},
-				onmail: async () => {
+				onMail: async () => {
 					if (connection) {
 						if (staticData.lastMessageUid !== undefined) {
 							searchCriteria.push(['UID', `${staticData.lastMessageUid as number}:*`]);
@@ -557,7 +580,7 @@ export class EmailReadImapV2 implements INodeType {
 							}
 						} catch (error) {
 							this.logger.error('Email Read Imap node encountered an error fetching new emails', {
-								error,
+								error: error as Error,
 							});
 							// Wait with resolving till the returnedPromise got resolved, else n8n will be unhappy
 							// if it receives an error before the workflow got activated
@@ -567,8 +590,8 @@ export class EmailReadImapV2 implements INodeType {
 						}
 					}
 				},
-				onupdate: async (seqno: number, info) => {
-					this.logger.verbose(`Email Read Imap:update ${seqno}`, info as IDataObject);
+				onUpdate: async (seqNo: number, info) => {
+					this.logger.verbose(`Email Read Imap:update ${seqNo}`, info);
 				},
 			};
 
@@ -579,7 +602,7 @@ export class EmailReadImapV2 implements INodeType {
 			}
 
 			if (credentials.secure) {
-				tlsOptions.servername = credentials.host;
+				tlsOptions.servername = credentials.host.trim();
 			}
 
 			if (!isEmpty(tlsOptions)) {
@@ -588,7 +611,7 @@ export class EmailReadImapV2 implements INodeType {
 
 			// Connect to the IMAP server and open the mailbox
 			// that we get informed whenever a new email arrives
-			return imapConnect(config).then(async (conn) => {
+			return await imapConnect(config).then(async (conn) => {
 				conn.on('close', async (_hadError: boolean) => {
 					if (isCurrentlyReconnecting) {
 						this.logger.debug('Email Read Imap: Connected closed for forced reconnecting');
@@ -600,8 +623,10 @@ export class EmailReadImapV2 implements INodeType {
 					}
 				});
 				conn.on('error', async (error) => {
-					const errorCode = error.code.toUpperCase();
-					this.logger.verbose(`IMAP connection experienced an error: (${errorCode})`, { error });
+					const errorCode = ((error as JsonObject).code as string).toUpperCase();
+					this.logger.verbose(`IMAP connection experienced an error: (${errorCode})`, {
+						error: error as Error,
+					});
 					// eslint-disable-next-line @typescript-eslint/no-use-before-define
 					await closeFunction();
 					this.emitError(error as Error);
@@ -616,24 +641,29 @@ export class EmailReadImapV2 implements INodeType {
 
 		let reconnectionInterval: NodeJS.Timeout | undefined;
 
+		const handleReconnect = async () => {
+			this.logger.verbose('Forcing reconnect to IMAP server');
+			try {
+				isCurrentlyReconnecting = true;
+				if (connection.closeBox) await connection.closeBox(false);
+				connection.end();
+				connection = await establishConnection();
+				await connection.openBox(mailbox);
+			} catch (error) {
+				this.logger.error(error as string);
+			} finally {
+				isCurrentlyReconnecting = false;
+			}
+		};
+
 		if (options.forceReconnect !== undefined) {
-			reconnectionInterval = setInterval(async () => {
-				this.logger.verbose('Forcing reconnect to IMAP server');
-				try {
-					isCurrentlyReconnecting = true;
-					if (connection.closeBox) await connection.closeBox(false);
-					connection.end();
-					connection = await establishConnection();
-					await connection.openBox(mailbox);
-				} catch (error) {
-					this.logger.error(error as string);
-				} finally {
-					isCurrentlyReconnecting = false;
-				}
-			}, (options.forceReconnect as number) * 1000 * 60);
+			reconnectionInterval = setInterval(
+				handleReconnect,
+				(options.forceReconnect as number) * 1000 * 60,
+			);
 		}
 
-		// When workflow and so node gets set to inactive close the connectoin
+		// When workflow and so node gets set to inactive close the connection
 		async function closeFunction() {
 			closeFunctionWasCalled = true;
 			if (reconnectionInterval) {
diff --git a/packages/nodes-base/nodes/EmailSend/EmailSend.node.json b/packages/nodes-base/nodes/EmailSend/EmailSend.node.json
index 51a9454610e5f..3f5a2d5a135b2 100644
--- a/packages/nodes-base/nodes/EmailSend/EmailSend.node.json
+++ b/packages/nodes-base/nodes/EmailSend/EmailSend.node.json
@@ -27,8 +27,5 @@
 			}
 		]
 	},
-	"subcategories": {
-		"Core Nodes": ["Helpers"]
-	},
 	"alias": ["SMTP"]
 }
diff --git a/packages/nodes-base/nodes/EmailSend/EmailSend.node.ts b/packages/nodes-base/nodes/EmailSend/EmailSend.node.ts
index e005818fcab84..9f68f84eb002c 100644
--- a/packages/nodes-base/nodes/EmailSend/EmailSend.node.ts
+++ b/packages/nodes-base/nodes/EmailSend/EmailSend.node.ts
@@ -11,13 +11,14 @@ export class EmailSend extends VersionedNodeType {
 			name: 'emailSend',
 			icon: 'fa:envelope',
 			group: ['output'],
-			defaultVersion: 2,
+			defaultVersion: 2.1,
 			description: 'Sends an email using SMTP protocol',
 		};
 
 		const nodeVersions: IVersionedNodeType['nodeVersions'] = {
 			1: new EmailSendV1(baseDescription),
 			2: new EmailSendV2(baseDescription),
+			2.1: new EmailSendV2(baseDescription),
 		};
 
 		super(nodeVersions, baseDescription);
diff --git a/packages/nodes-base/nodes/EmailSend/v1/EmailSendV1.node.ts b/packages/nodes-base/nodes/EmailSend/v1/EmailSendV1.node.ts
index 463052a487698..12a4fa164cb9e 100644
--- a/packages/nodes-base/nodes/EmailSend/v1/EmailSendV1.node.ts
+++ b/packages/nodes-base/nodes/EmailSend/v1/EmailSendV1.node.ts
@@ -241,6 +241,6 @@ export class EmailSendV1 implements INodeType {
 			}
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/EmailSend/v2/EmailSendV2.node.ts b/packages/nodes-base/nodes/EmailSend/v2/EmailSendV2.node.ts
index a7dfc3b638f6d..5c9e653c48625 100644
--- a/packages/nodes-base/nodes/EmailSend/v2/EmailSendV2.node.ts
+++ b/packages/nodes-base/nodes/EmailSend/v2/EmailSendV2.node.ts
@@ -9,13 +9,12 @@ import type {
 
 import * as send from './send.operation';
 
-// eslint-disable-next-line n8n-nodes-base/node-class-description-missing-subtitle
 const versionDescription: INodeTypeDescription = {
 	displayName: 'Send Email',
 	name: 'emailSend',
 	icon: 'fa:envelope',
 	group: ['output'],
-	version: 2,
+	version: [2, 2.1],
 	description: 'Sends an email using SMTP protocol',
 	defaults: {
 		name: 'Send Email',
diff --git a/packages/nodes-base/nodes/EmailSend/v2/send.operation.ts b/packages/nodes-base/nodes/EmailSend/v2/send.operation.ts
index 330aa7c7b7554..8e9623c67d3dc 100644
--- a/packages/nodes-base/nodes/EmailSend/v2/send.operation.ts
+++ b/packages/nodes-base/nodes/EmailSend/v2/send.operation.ts
@@ -3,12 +3,14 @@ import type {
 	IExecuteFunctions,
 	INodeExecutionData,
 	INodeProperties,
+	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 { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	// TODO: Add choice for text as text or html  (maybe also from name)
@@ -49,13 +51,50 @@ const properties: INodeProperties[] = [
 			{
 				name: 'Text',
 				value: 'text',
+				description: 'Send email as plain text',
 			},
 			{
 				name: 'HTML',
 				value: 'html',
+				description: 'Send email as HTML',
+			},
+			{
+				name: 'Both',
+				value: 'both',
+				description: "Send both formats, recipient's client selects version to display",
+			},
+		],
+		default: 'html',
+		displayOptions: {
+			hide: {
+				'@version': [2],
+			},
+		},
+	},
+	{
+		displayName: 'Email Format',
+		name: 'emailFormat',
+		type: 'options',
+		options: [
+			{
+				name: 'Text',
+				value: 'text',
+			},
+			{
+				name: 'HTML',
+				value: 'html',
+			},
+			{
+				name: 'Both',
+				value: 'both',
 			},
 		],
 		default: 'text',
+		displayOptions: {
+			show: {
+				'@version': [2],
+			},
+		},
 	},
 	{
 		displayName: 'Text',
@@ -68,7 +107,7 @@ const properties: INodeProperties[] = [
 		description: 'Plain text message of email',
 		displayOptions: {
 			show: {
-				emailFormat: ['text'],
+				emailFormat: ['text', 'both'],
 			},
 		},
 	},
@@ -83,7 +122,7 @@ const properties: INodeProperties[] = [
 		description: 'HTML text message of email',
 		displayOptions: {
 			show: {
-				emailFormat: ['html'],
+				emailFormat: ['html', 'both'],
 			},
 		},
 	},
@@ -94,13 +133,22 @@ const properties: INodeProperties[] = [
 		placeholder: 'Add Option',
 		default: {},
 		options: [
+			{
+				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+				displayName: 'Append n8n Attribution',
+				name: 'appendAttribution',
+				type: 'boolean',
+				default: true,
+				description:
+					'Whether to include the phrase “This email was sent automatically with n8n” to the end of the email',
+			},
 			{
 				displayName: 'Attachments',
 				name: 'attachments',
 				type: 'string',
 				default: '',
 				description:
-					'Name of the binary properties that contain data to add to email as attachment. Multiple ones can be comma-separated.',
+					'Name of the binary properties that contain data to add to email as attachment. Multiple ones can be comma-separated. Reference embedded images or other content within the body of an email message, e.g. &lt;img src="cid:image_1"&gt;',
 			},
 			{
 				displayName: 'CC Email',
@@ -147,6 +195,7 @@ const displayOptions = {
 export const description = updateDisplayOptions(displayOptions, properties);
 
 type EmailSendOptions = {
+	appendAttribution?: boolean;
 	allowUnauthorizedCerts?: boolean;
 	attachments?: string;
 	ccEmail?: string;
@@ -161,6 +210,10 @@ function configureTransport(credentials: IDataObject, options: EmailSendOptions)
 		secure: credentials.secure as boolean,
 	};
 
+	if (typeof credentials.hostName === 'string' && credentials.hostName) {
+		connectionOptions.name = credentials.hostName;
+	}
+
 	if (credentials.user || credentials.password) {
 		connectionOptions.auth = {
 			user: credentials.user as string,
@@ -179,6 +232,8 @@ function configureTransport(credentials: IDataObject, options: EmailSendOptions)
 
 export async function execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 	const items = this.getInputData();
+	const nodeVersion = this.getNode().typeVersion;
+	const instanceId = this.getInstanceId();
 
 	const returnData: INodeExecutionData[] = [];
 	let item: INodeExecutionData;
@@ -206,14 +261,38 @@ export async function execute(this: IExecuteFunctions): Promise<INodeExecutionDa
 				replyTo: options.replyTo,
 			};
 
-			if (emailFormat === 'text') {
+			if (emailFormat === 'text' || emailFormat === 'both') {
 				mailOptions.text = this.getNodeParameter('text', itemIndex, '');
 			}
 
-			if (emailFormat === 'html') {
+			if (emailFormat === 'html' || emailFormat === 'both') {
 				mailOptions.html = this.getNodeParameter('html', itemIndex, '');
 			}
 
+			let appendAttribution = options.appendAttribution;
+			if (appendAttribution === undefined) {
+				appendAttribution = nodeVersion >= 2.1;
+			}
+
+			if (appendAttribution) {
+				const attributionText = 'This email was sent automatically with ';
+				const link = `https://n8n.io/?utm_source=n8n-internal&utm_medium=powered_by&utm_campaign=${encodeURIComponent(
+					'n8n-nodes-base.emailSend',
+				)}${instanceId ? '_' + instanceId : ''}`;
+				if (emailFormat === 'html' || (emailFormat === 'both' && mailOptions.html)) {
+					mailOptions.html = `
+					${mailOptions.html}
+					<br>
+					<br>
+					---
+					<br>
+					<em>${attributionText}<a href="${link}" target="_blank">n8n</a></em>
+					`;
+				} else {
+					mailOptions.text = `${mailOptions.text}\n\n---\n${attributionText}n8n\n${'https://n8n.io'}`;
+				}
+			}
+
 			if (options.attachments && item.binary) {
 				const attachments = [];
 				const attachmentProperties: string[] = options.attachments
@@ -227,6 +306,7 @@ export async function execute(this: IExecuteFunctions): Promise<INodeExecutionDa
 					attachments.push({
 						filename: binaryData.fileName || 'unknown',
 						content: await this.helpers.getBinaryDataBuffer(itemIndex, propertyName),
+						cid: propertyName,
 					});
 				}
 
@@ -255,9 +335,10 @@ export async function execute(this: IExecuteFunctions): Promise<INodeExecutionDa
 				});
 				continue;
 			}
-			throw error;
+			delete error.cert;
+			throw new NodeApiError(this.getNode(), error as JsonObject);
 		}
 	}
 
-	return this.prepareOutputData(returnData);
+	return [returnData];
 }
diff --git a/packages/nodes-base/nodes/Emelia/Emelia.node.json b/packages/nodes-base/nodes/Emelia/Emelia.node.json
index 83a48c978ff68..955dbff29293d 100644
--- a/packages/nodes-base/nodes/Emelia/Emelia.node.json
+++ b/packages/nodes-base/nodes/Emelia/Emelia.node.json
@@ -2,7 +2,7 @@
 	"node": "n8n-nodes-base.emelia",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Communication", "Marketing & Content"],
+	"categories": ["Communication", "Marketing"],
 	"resources": {
 		"credentialDocumentation": [
 			{
diff --git a/packages/nodes-base/nodes/Emelia/Emelia.node.ts b/packages/nodes-base/nodes/Emelia/Emelia.node.ts
index 4c0e5338c86c8..6c0a84525d05e 100644
--- a/packages/nodes-base/nodes/Emelia/Emelia.node.ts
+++ b/packages/nodes-base/nodes/Emelia/Emelia.node.ts
@@ -7,14 +7,13 @@ import type {
 	INodeTypeDescription,
 } 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 isEmpty from 'lodash.isempty';
-
 export class Emelia implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Emelia',
@@ -69,11 +68,11 @@ export class Emelia implements INodeType {
 
 		loadOptions: {
 			async getCampaigns(this: ILoadOptionsFunctions) {
-				return loadResource.call(this, 'campaign');
+				return await loadResource.call(this, 'campaign');
 			},
 
 			async getContactLists(this: ILoadOptionsFunctions) {
-				return loadResource.call(this, 'contactList');
+				return await loadResource.call(this, 'contactList');
 			},
 		},
 	};
@@ -441,6 +440,6 @@ export class Emelia implements INodeType {
 				throw error;
 			}
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Emelia/EmeliaTrigger.node.json b/packages/nodes-base/nodes/Emelia/EmeliaTrigger.node.json
index 843c0c97e91da..cdc7e83ad6ed7 100644
--- a/packages/nodes-base/nodes/Emelia/EmeliaTrigger.node.json
+++ b/packages/nodes-base/nodes/Emelia/EmeliaTrigger.node.json
@@ -2,7 +2,7 @@
 	"node": "n8n-nodes-base.emeliaTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Communication", "Marketing & Content"],
+	"categories": ["Communication", "Marketing"],
 	"resources": {
 		"credentialDocumentation": [
 			{
diff --git a/packages/nodes-base/nodes/Emelia/GenericFunctions.ts b/packages/nodes-base/nodes/Emelia/GenericFunctions.ts
index ae52f1719bf1b..6ac76d3561fc4 100644
--- a/packages/nodes-base/nodes/Emelia/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Emelia/GenericFunctions.ts
@@ -7,6 +7,9 @@ import type {
 	INodeCredentialTestResult,
 	INodePropertyOptions,
 	JsonObject,
+	IRequestOptions,
+	IHttpRequestMethods,
+	IDataObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
@@ -15,14 +18,14 @@ import { NodeApiError } from 'n8n-workflow';
  */
 export async function emeliaApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: object = {},
-	qs: object = {},
+	qs: IDataObject = {},
 ) {
 	const { apiKey } = (await this.getCredentials('emeliaApi')) as { apiKey: string };
 
-	const options = {
+	const options: IRequestOptions = {
 		headers: {
 			Authorization: apiKey,
 		},
diff --git a/packages/nodes-base/nodes/Emelia/emelia.svg b/packages/nodes-base/nodes/Emelia/emelia.svg
index 3a59dfc009d0d..a8a0515f7f4e8 100644
--- a/packages/nodes-base/nodes/Emelia/emelia.svg
+++ b/packages/nodes-base/nodes/Emelia/emelia.svg
@@ -1 +1 @@
-<svg viewBox="-2 2 45 45" xmlns="http://www.w3.org/2000/svg"><path d="M29.714 6.539H9.078a2.109 2.109 0 00-2.007 2.762l5.484 16.863 4.219-1.817a2.69 2.69 0 01-.024-.34 2.641 2.641 0 111.023 2.081 2416.71 2416.71 0 01-4.415 2.545l5.156 15.852a.865.865 0 001.645 0l11.48-35.293a2.026 2.026 0 00-1.925-2.653z" opacity=".9" fill="#f4b454"/><path d="M37.154 21.261L1.071 12.577a.865.865 0 00-.861 1.4l10.909 12.8 5.656-2.436a2.694 2.694 0 01-.024-.34 2.641 2.641 0 111.023 2.081 2178.15 2178.15 0 01-4.86 2.8l11.291 13.255a2.11 2.11 0 003.4-.264l10.8-17.586a2.026 2.026 0 00-1.251-3.026z" fill="#ef6d4a" opacity=".9"/><path d="M37.636 12.577L1.553 21.261A2.025 2.025 0 00.301 24.29l3.472 5.656 13-5.6a2.689 2.689 0 01-.024-.34 2.641 2.641 0 111.023 2.081c-3.1 1.791-9.073 5.234-12.108 6.94l5.432 8.848a2.11 2.11 0 003.4.264l23.995-28.161a.865.865 0 00-.855-1.401z" fill="#20354c" opacity=".9"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="-2 2 45 45"><path fill="#f4b454" d="M29.714 6.539H9.078a2.11 2.11 0 0 0-2.007 2.762l5.484 16.863 4.219-1.817a3 3 0 0 1-.024-.34 2.641 2.641 0 1 1 1.023 2.081 2417 2417 0 0 1-4.415 2.545l5.156 15.852a.865.865 0 0 0 1.645 0l11.48-35.293a2.026 2.026 0 0 0-1.925-2.653" opacity=".9"/><path fill="#ef6d4a" d="M37.154 21.261 1.071 12.577a.865.865 0 0 0-.861 1.4l10.909 12.8 5.656-2.436a3 3 0 0 1-.024-.34 2.641 2.641 0 1 1 1.023 2.081 2178 2178 0 0 1-4.86 2.8l11.291 13.255a2.11 2.11 0 0 0 3.4-.264l10.8-17.586a2.026 2.026 0 0 0-1.251-3.026" opacity=".9"/><path fill="#20354c" d="M37.636 12.577 1.553 21.261A2.025 2.025 0 0 0 .301 24.29l3.472 5.656 13-5.6a3 3 0 0 1-.024-.34 2.641 2.641 0 1 1 1.023 2.081c-3.1 1.791-9.073 5.234-12.108 6.94l5.432 8.848a2.11 2.11 0 0 0 3.4.264l23.995-28.161a.865.865 0 0 0-.855-1.401" opacity=".9"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/ErrorTrigger/ErrorTrigger.node.json b/packages/nodes-base/nodes/ErrorTrigger/ErrorTrigger.node.json
index 1ea73accf2ab8..63e9c228c18c7 100644
--- a/packages/nodes-base/nodes/ErrorTrigger/ErrorTrigger.node.json
+++ b/packages/nodes-base/nodes/ErrorTrigger/ErrorTrigger.node.json
@@ -19,6 +19,6 @@
 		]
 	},
 	"subcategories": {
-		"Core Nodes": ["Helpers", "Other Trigger Nodes"]
+		"Core Nodes": ["Other Trigger Nodes"]
 	}
 }
diff --git a/packages/nodes-base/nodes/ErrorTrigger/ErrorTrigger.node.ts b/packages/nodes-base/nodes/ErrorTrigger/ErrorTrigger.node.ts
index fe3a71660fb23..21cae5777be54 100644
--- a/packages/nodes-base/nodes/ErrorTrigger/ErrorTrigger.node.ts
+++ b/packages/nodes-base/nodes/ErrorTrigger/ErrorTrigger.node.ts
@@ -74,6 +74,6 @@ export class ErrorTrigger implements INodeType {
 			};
 		}
 
-		return this.prepareOutputData(items);
+		return [items];
 	}
 }
diff --git a/packages/nodes-base/nodes/EsaTwilio/EsaTwilio.node.ts b/packages/nodes-base/nodes/EsaTwilio/EsaTwilio.node.ts
index c303eca51b797..72cd903178d97 100644
--- a/packages/nodes-base/nodes/EsaTwilio/EsaTwilio.node.ts
+++ b/packages/nodes-base/nodes/EsaTwilio/EsaTwilio.node.ts
@@ -5,12 +5,14 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 	ILoadOptionsFunctions,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
 import {
 	escapeXml,
 	findOptedOutChat,
+	getESAApps,
 	getMessagingServices,
 	transformDataToSendSMS,
 	twilioApiRequest,
@@ -131,7 +133,7 @@ export class EsaTwilio implements INodeType {
 					<br />
 				- supported mime types: <a
 						href="https://www.twilio.com/docs/sms/accepted-mime-types">https://www.twilio.com/docs/sms/accepted-mime-types</a>
-				
+
 						<br />
 				- images only restrictions: total size is up to 5MB. Twilio will resize images as necessary for successful
 					delivery based on carrier specifications. Messages with over 5MB of media will not be accepted.
@@ -208,6 +210,19 @@ export class EsaTwilio implements INodeType {
 					},
 				],
 			},
+			{
+				displayName: 'ESA App',
+				name: 'esaApp',
+				type: 'options',
+				required: true,
+				default: process.env.ESA_DEFAULT_APP_KEY ?? '',
+				noDataExpression: true,
+				description: 'The ESA app server through which the email should be sent',
+				options: getESAApps().map((esaApp) => ({
+					name: esaApp.appName,
+					value: esaApp.appKey,
+				})),
+			},
 		],
 	};
 
@@ -231,7 +246,7 @@ export class EsaTwilio implements INodeType {
 		// For Query string
 		let qs: IDataObject;
 
-		let requestMethod: string;
+		let requestMethod: IHttpRequestMethods;
 		let endpoint: string;
 
 		for (let i = 0; i < items.length; i++) {
@@ -403,7 +418,20 @@ export class EsaTwilio implements INodeType {
 					});
 				}
 
-				const responseData = await twilioApiRequest.call(this, requestMethod, endpoint, body, qs);
+				const esaAppKey: string | undefined = this.getNodeParameter('esaApp', i) as string;
+				if (!esaAppKey) {
+					const error = { message: 'esaApp key not found in ESA Twilio node' };
+					throw new NodeOperationError(this.getNode(), error.message, error);
+				}
+
+				const responseData = await twilioApiRequest.call(
+					this,
+					requestMethod,
+					endpoint,
+					body,
+					esaAppKey,
+					qs,
+				);
 
 				returnData.push(responseData as IDataObject);
 			} catch (error) {
diff --git a/packages/nodes-base/nodes/EsaTwilio/GenericFunctions.ts b/packages/nodes-base/nodes/EsaTwilio/GenericFunctions.ts
index bd57ae4a0f990..5a16d17d346c2 100644
--- a/packages/nodes-base/nodes/EsaTwilio/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/EsaTwilio/GenericFunctions.ts
@@ -1,8 +1,12 @@
-import type {
-	IExecuteFunctions,
-	IHookFunctions,
-	IDataObject,
-	ILoadOptionsFunctions,
+import crypto from 'crypto';
+import {
+	type IExecuteFunctions,
+	type IHookFunctions,
+	type IDataObject,
+	type ILoadOptionsFunctions,
+	type IHttpRequestMethods,
+	NodeApiError,
+	ApplicationError,
 } from 'n8n-workflow';
 import sortBy from 'lodash.sortby';
 import axios from 'axios';
@@ -10,7 +14,59 @@ import type { AxiosError } from 'axios';
 
 import type { OptionsWithUri } from 'request';
 import { DEFAULT_MESSAGING_SERVICE_CUSTOM_SID, messagingServiceValue } from './descriptions';
-import type { MessagingService, MessagingServicesResponse } from './types';
+import type { EsaApp, MessagingService, MessagingServicesResponse } from './types';
+
+const generateESAAuthCRMToken = async (
+	options: Required<Pick<EsaApp, 'zohoCrmSecretKey' | 'zohoUserDetails' | 'appName'>>,
+): Promise<{ token: string; tokenForAuthHeader: string }> => {
+	const { zohoCrmSecretKey, zohoUserDetails, appName } = options;
+
+	if (appName.toLowerCase().includes('bmh')) {
+		const timestamp = Date.now();
+		const signatureString = `${timestamp}:${zohoUserDetails.id}`;
+		const createdSignature = crypto
+			.createHmac('sha1', zohoCrmSecretKey)
+			.update(signatureString)
+			.digest('base64');
+
+		const token = Buffer.from(`${createdSignature}:${signatureString}`).toString('base64');
+		return {
+			token,
+			tokenForAuthHeader: `Bearer ${token}`,
+		};
+	}
+
+	const nowTimestamp = Date.now();
+	const data = `${nowTimestamp}|${JSON.stringify(options.zohoUserDetails)}`;
+
+	const signature = crypto.createHmac('sha1', zohoCrmSecretKey).update(data).digest('base64');
+	const signatureWithData = `${signature}|${data}`;
+	const token = Buffer.from(signatureWithData).toString('base64');
+
+	return {
+		token,
+		tokenForAuthHeader: `Bearer ${token}`,
+	};
+};
+
+export const getESAApps = (): EsaApp[] => {
+	let esaApps!: EsaApp[];
+
+	try {
+		const esaAppsString = process.env.ESA_APPS;
+		if (esaAppsString) {
+			esaApps = JSON.parse(esaAppsString) as EsaApp[];
+		}
+	} catch {
+		return [];
+	}
+
+	if (Array.isArray(esaApps)) {
+		return esaApps;
+	}
+
+	return [];
+};
 
 /**
  * Make an API request to Twilio
@@ -18,9 +74,10 @@ import type { MessagingService, MessagingServicesResponse } from './types';
  */
 export async function twilioApiRequest(
 	this: IHookFunctions | IExecuteFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject,
+	esaAppKey: string,
 	query?: IDataObject,
 ): Promise<any> {
 	const credentials = (await this.getCredentials('twilioApi')) as {
@@ -43,7 +100,36 @@ export async function twilioApiRequest(
 		json: true,
 	};
 
-	return this.helpers.requestWithAuthentication.call(this, 'twilioApi', options);
+	const esaApps = getESAApps();
+
+	const esaApp = Array.isArray(esaApps)
+		? esaApps.find((esaApp) => esaApp.appKey === esaAppKey)
+		: null;
+
+	let error = { message: 'esaApp config not found in ESA Twilio node' };
+	if (!esaApp) throw new NodeApiError(this.getNode(), error, error);
+
+	const { zohoCrmSecretKey, zohoUserDetails, appName } = esaApp;
+
+	if (!zohoCrmSecretKey) {
+		error = { message: 'zohoCrmSecretKey not found in esaApp config' };
+		throw new NodeApiError(this.getNode(), error, error);
+	}
+	if (!zohoUserDetails?.id) {
+		error = { message: 'zohoUserDetails.id in esaApp config should be defined' };
+		throw new NodeApiError(this.getNode(), error, error);
+	}
+	const { tokenForAuthHeader } = await generateESAAuthCRMToken({
+		zohoCrmSecretKey,
+		zohoUserDetails,
+		appName,
+	});
+
+	return await axios.post(`${process.env.BASE_URL}/package/sms/message/send-message`, options, {
+		headers: {
+			Authorization: tokenForAuthHeader,
+		},
+	});
 }
 
 const XML_CHAR_MAP: { [key: string]: string } = {
@@ -121,7 +207,7 @@ export async function findAllMessagingServices(
 		return response.data.services;
 	} catch (e) {
 		const error = e as AxiosError;
-		throw new Error(
+		throw new ApplicationError(
 			`Failed to fetch messaging services. ${error.response?.data || error.message}.`,
 		);
 	}
@@ -194,10 +280,10 @@ export function transformDataToSendSMS(
 		fallbackPhone,
 		useFallbackPhone,
 	});
-	body.Body = message;
-	body.MediaUrl = mediaUrls;
-	body.mediaUrl = mediaUrls;
-	body.Media_Url = mediaUrls;
+	body.Body = message || '';
+	if (mediaUrls.length) {
+		body.MediaUrl = mediaUrls;
+	}
 
 	if (toWhatsapp) {
 		body.From = `whatsapp:${body.From}`;
@@ -218,7 +304,7 @@ export async function getMessagingServices(this: ILoadOptionsFunctions) {
 	}));
 
 	return [
-		{ name: 'DEFAULT SMS MESSAGING SERVICE SID', value: DEFAULT_MESSAGING_SERVICE_CUSTOM_SID },
+		{ name: 'DEFAULT SMS MESSAGING SERVICE', value: DEFAULT_MESSAGING_SERVICE_CUSTOM_SID },
 	].concat(sortBy(options, (o) => o.name));
 }
 //
diff --git a/packages/nodes-base/nodes/EsaTwilio/types.d.ts b/packages/nodes-base/nodes/EsaTwilio/types.d.ts
index d8f2e0a40c361..06c6843847c8f 100644
--- a/packages/nodes-base/nodes/EsaTwilio/types.d.ts
+++ b/packages/nodes-base/nodes/EsaTwilio/types.d.ts
@@ -44,3 +44,18 @@ export interface MessagingServicesResponse {
 		key: string;
 	};
 }
+
+export interface EsaApp {
+	appName: string;
+	appKey: string;
+	appBaseUrl: string;
+	sendgridEmail?: string;
+	sendgridApiKey?: string;
+	zohoCrmSecretKey?: string;
+	zohoUserDetails?: {
+		id: string;
+
+		// TODO: other fields might be used by the ESA projects, the likes of 'firstName', 'lastName', 'email', 'phone', 'profile
+		// either pass them in this object or better still dynamically get by the zohoUserId
+	};
+}
diff --git a/packages/nodes-base/nodes/Eventbrite/GenericFunctions.ts b/packages/nodes-base/nodes/Eventbrite/GenericFunctions.ts
index ca4d36417f88d..b2201900d5790 100644
--- a/packages/nodes-base/nodes/Eventbrite/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Eventbrite/GenericFunctions.ts
@@ -1,24 +1,18 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
+	IRequestOptions,
 	IWebhookFunctions,
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function eventbriteApiRequest(
-	this:
-		| IHookFunctions
-		| IExecuteFunctions
-		| IExecuteSingleFunctions
-		| ILoadOptionsFunctions
-		| IWebhookFunctions,
-	method: string,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -26,7 +20,7 @@ export async function eventbriteApiRequest(
 	uri?: string,
 	option: IDataObject = {},
 ): Promise<any> {
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		headers: {},
 		method,
 		qs,
@@ -62,7 +56,7 @@ export async function eventbriteApiRequest(
 export async function eventbriteApiRequestAllItems(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
diff --git a/packages/nodes-base/nodes/ExecuteCommand/ExecuteCommand.node.ts b/packages/nodes-base/nodes/ExecuteCommand/ExecuteCommand.node.ts
index ceb47cf51666f..5250270038c3f 100644
--- a/packages/nodes-base/nodes/ExecuteCommand/ExecuteCommand.node.ts
+++ b/packages/nodes-base/nodes/ExecuteCommand/ExecuteCommand.node.ts
@@ -1,3 +1,4 @@
+import { exec } from 'child_process';
 import type {
 	IExecuteFunctions,
 	INodeExecutionData,
@@ -6,8 +7,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import { exec } from 'child_process';
-
 export interface IExecReturnData {
 	exitCode: number;
 	error?: Error;
@@ -27,7 +26,7 @@ async function execPromise(command: string): Promise<IExecReturnData> {
 		stdout: '',
 	};
 
-	return new Promise((resolve, _reject) => {
+	return await new Promise((resolve, _reject) => {
 		exec(command, { cwd: process.cwd() }, (error, stdout, stderr) => {
 			returnData.stdout = stdout.trim();
 			returnData.stderr = stderr.trim();
@@ -75,6 +74,7 @@ export class ExecuteCommand implements INodeType {
 				default: '',
 				placeholder: 'echo "test"',
 				description: 'The command to execute',
+				required: true,
 			},
 		],
 	};
@@ -126,6 +126,6 @@ export class ExecuteCommand implements INodeType {
 			}
 		}
 
-		return this.prepareOutputData(returnItems);
+		return [returnItems];
 	}
 }
diff --git a/packages/nodes-base/nodes/ExecuteCommand/test/ExecuteCommand.node.test.ts b/packages/nodes-base/nodes/ExecuteCommand/test/ExecuteCommand.node.test.ts
index 28f8018e110f5..bde43182f1327 100644
--- a/packages/nodes-base/nodes/ExecuteCommand/test/ExecuteCommand.node.test.ts
+++ b/packages/nodes-base/nodes/ExecuteCommand/test/ExecuteCommand.node.test.ts
@@ -1,4 +1,4 @@
-import { testWorkflows, getWorkflowFilenames } from '../../../test/nodes/Helpers';
+import { testWorkflows, getWorkflowFilenames } from '@test/nodes/Helpers';
 const workflows = getWorkflowFilenames(__dirname);
 
 describe('Execute Execute Command Node', () => testWorkflows(workflows));
diff --git a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow.node.json b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow.node.json
index 9bb4ffae1e89a..9fc522970319a 100644
--- a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow.node.json
+++ b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow.node.json
@@ -13,6 +13,6 @@
 	},
 	"alias": ["n8n"],
 	"subcategories": {
-		"Core Nodes": ["Helpers"]
+		"Core Nodes": ["Helpers", "Flow"]
 	}
 }
diff --git a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow.node.ts b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow.node.ts
index c2623ce3f4f69..55f8c90338064 100644
--- a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow.node.ts
+++ b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow.node.ts
@@ -1,14 +1,13 @@
-import { readFile as fsReadFile } from 'fs/promises';
-
+import { NodeOperationError } from 'n8n-workflow';
 import type {
 	IExecuteFunctions,
-	IExecuteWorkflowInfo,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
-	IWorkflowBase,
 } from 'n8n-workflow';
-import { NodeOperationError } from 'n8n-workflow';
+
+import { generatePairedItemData } from '../../utils/utilities';
+import { getWorkflowInfo } from './GenericFunctions';
 
 export class ExecuteWorkflow implements INodeType {
 	description: INodeTypeDescription = {
@@ -83,7 +82,9 @@ export class ExecuteWorkflow implements INodeType {
 				},
 				default: '',
 				required: true,
-				description: 'The workflow to execute',
+				hint: 'Can be found in the URL of the workflow',
+				description:
+					"Note on using an expression here: if this node is set to run once with all items, they will all be sent to the <em>same</em> workflow. That workflow's ID will be calculated by evaluating the expression for the <strong>first input item</strong>.",
 			},
 
 			// ----------------------------------
@@ -110,9 +111,8 @@ export class ExecuteWorkflow implements INodeType {
 			{
 				displayName: 'Workflow JSON',
 				name: 'workflowJson',
-				type: 'string',
+				type: 'json',
 				typeOptions: {
-					editor: 'json',
 					rows: 10,
 				},
 				displayOptions: {
@@ -149,69 +149,141 @@ export class ExecuteWorkflow implements INodeType {
 				type: 'notice',
 				default: '',
 			},
+			{
+				displayName: 'Mode',
+				name: 'mode',
+				type: 'options',
+				noDataExpression: true,
+				options: [
+					{
+						// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+						name: 'Run once with all items',
+						value: 'once',
+						description: 'Pass all items into a single execution of the sub-workflow',
+					},
+					{
+						// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+						name: 'Run once for each item',
+						value: 'each',
+						description: 'Call the sub-workflow individually for each item',
+					},
+				],
+				default: 'once',
+			},
+			{
+				displayName: 'Options',
+				name: 'options',
+				type: 'collection',
+				default: {},
+				placeholder: 'Add Option',
+				options: [
+					{
+						displayName: 'Wait For Sub-Workflow Completion',
+						name: 'waitForSubWorkflow',
+						type: 'boolean',
+						default: true,
+						description:
+							'Whether the main workflow should wait for the sub-workflow to complete its execution before proceeding',
+					},
+				],
+			},
 		],
 	};
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
-		const items = this.getInputData();
 		const source = this.getNodeParameter('source', 0) as string;
+		const mode = this.getNodeParameter('mode', 0, false) as string;
+		const items = this.getInputData();
 
-		const workflowInfo: IExecuteWorkflowInfo = {};
-
-		try {
-			if (source === 'database') {
-				// Read workflow from database
-				workflowInfo.id = this.getNodeParameter('workflowId', 0) as string;
-			} else if (source === 'localFile') {
-				// Read workflow from filesystem
-				const workflowPath = this.getNodeParameter('workflowPath', 0) as string;
+		if (mode === 'each') {
+			let returnData: INodeExecutionData[][] = [];
 
-				let workflowJson;
+			for (let i = 0; i < items.length; i++) {
 				try {
-					workflowJson = await fsReadFile(workflowPath, { encoding: 'utf8' });
-				} catch (error) {
-					if (error.code === 'ENOENT') {
-						throw new NodeOperationError(
-							this.getNode(),
-							`The file "${workflowPath}" could not be found.`,
+					const waitForSubWorkflow = this.getNodeParameter(
+						'options.waitForSubWorkflow',
+						i,
+						true,
+					) as boolean;
+					const workflowInfo = await getWorkflowInfo.call(this, source, i);
+
+					if (waitForSubWorkflow) {
+						const workflowResult: INodeExecutionData[][] = await this.executeWorkflow(
+							workflowInfo,
+							[items[i]],
 						);
+
+						for (const [outputIndex, outputData] of workflowResult.entries()) {
+							for (const item of outputData) {
+								item.pairedItem = { item: i };
+							}
+
+							if (returnData[outputIndex] === undefined) {
+								returnData[outputIndex] = [];
+							}
+
+							returnData[outputIndex].push(...outputData);
+						}
+					} else {
+						void this.executeWorkflow(workflowInfo, [items[i]]);
+						returnData = [items];
+					}
+				} catch (error) {
+					if (this.continueOnFail()) {
+						return [[{ json: { error: error.message }, pairedItem: { item: i } }]];
 					}
+					throw new NodeOperationError(this.getNode(), error, {
+						message: `Error executing workflow with item at index ${i}`,
+						description: error.message,
+						itemIndex: i,
+					});
+				}
+			}
 
-					throw error;
+			return returnData;
+		} else {
+			try {
+				const waitForSubWorkflow = this.getNodeParameter(
+					'options.waitForSubWorkflow',
+					0,
+					true,
+				) as boolean;
+				const workflowInfo = await getWorkflowInfo.call(this, source);
+
+				if (!waitForSubWorkflow) {
+					void this.executeWorkflow(workflowInfo, items);
+					return [items];
 				}
 
-				workflowInfo.code = JSON.parse(workflowJson) as IWorkflowBase;
-			} else if (source === 'parameter') {
-				// Read workflow from parameter
-				const workflowJson = this.getNodeParameter('workflowJson', 0) as string;
-				workflowInfo.code = JSON.parse(workflowJson) as IWorkflowBase;
-			} else if (source === 'url') {
-				// Read workflow from url
-				const workflowUrl = this.getNodeParameter('workflowUrl', 0) as string;
-
-				const requestOptions = {
-					headers: {
-						accept: 'application/json,text/*;q=0.99',
-					},
-					method: 'GET',
-					uri: workflowUrl,
-					json: true,
-					gzip: true,
-				};
-
-				const response = await this.helpers.request(requestOptions);
-				workflowInfo.code = response;
-			}
+				const workflowResult: INodeExecutionData[][] = await this.executeWorkflow(
+					workflowInfo,
+					items,
+				);
 
-			const receivedData = await this.executeWorkflow(workflowInfo, items);
+				const fallbackPairedItemData = generatePairedItemData(items.length);
 
-			return receivedData;
-		} catch (error) {
-			if (this.continueOnFail()) {
-				return this.prepareOutputData([{ json: { error: error.message } }]);
-			}
+				for (const output of workflowResult) {
+					const sameLength = output.length === items.length;
+
+					for (const [itemIndex, item] of output.entries()) {
+						if (item.pairedItem) continue;
 
-			throw error;
+						if (sameLength) {
+							item.pairedItem = { item: itemIndex };
+						} else {
+							item.pairedItem = fallbackPairedItemData;
+						}
+					}
+				}
+
+				return workflowResult;
+			} catch (error) {
+				const pairedItem = generatePairedItemData(items.length);
+				if (this.continueOnFail()) {
+					return [[{ json: { error: error.message }, pairedItem }]];
+				}
+				throw error;
+			}
 		}
 	}
 }
diff --git a/packages/nodes-base/nodes/ExecuteWorkflow/GenericFunctions.ts b/packages/nodes-base/nodes/ExecuteWorkflow/GenericFunctions.ts
new file mode 100644
index 0000000000000..9e212eb1940ea
--- /dev/null
+++ b/packages/nodes-base/nodes/ExecuteWorkflow/GenericFunctions.ts
@@ -0,0 +1,53 @@
+import { readFile as fsReadFile } from 'fs/promises';
+import { NodeOperationError, jsonParse } from 'n8n-workflow';
+import type { IExecuteFunctions, IExecuteWorkflowInfo, IRequestOptions } from 'n8n-workflow';
+
+export async function getWorkflowInfo(this: IExecuteFunctions, source: string, itemIndex = 0) {
+	const workflowInfo: IExecuteWorkflowInfo = {};
+
+	if (source === 'database') {
+		// Read workflow from database
+		workflowInfo.id = this.getNodeParameter('workflowId', itemIndex) as string;
+	} else if (source === 'localFile') {
+		// Read workflow from filesystem
+		const workflowPath = this.getNodeParameter('workflowPath', itemIndex) as string;
+
+		let workflowJson;
+		try {
+			workflowJson = await fsReadFile(workflowPath, { encoding: 'utf8' });
+		} catch (error) {
+			if (error.code === 'ENOENT') {
+				throw new NodeOperationError(
+					this.getNode(),
+					`The file "${workflowPath}" could not be found, [item ${itemIndex}]`,
+				);
+			}
+
+			throw error;
+		}
+
+		workflowInfo.code = jsonParse(workflowJson);
+	} else if (source === 'parameter') {
+		// Read workflow from parameter
+		const workflowJson = this.getNodeParameter('workflowJson', itemIndex) as string;
+		workflowInfo.code = jsonParse(workflowJson);
+	} else if (source === 'url') {
+		// Read workflow from url
+		const workflowUrl = this.getNodeParameter('workflowUrl', itemIndex) as string;
+
+		const requestOptions = {
+			headers: {
+				accept: 'application/json,text/*;q=0.99',
+			},
+			method: 'GET',
+			uri: workflowUrl,
+			json: true,
+			gzip: true,
+		} satisfies IRequestOptions;
+
+		const response = await this.helpers.request(requestOptions);
+		workflowInfo.code = response;
+	}
+
+	return workflowInfo;
+}
diff --git a/packages/nodes-base/nodes/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.ts b/packages/nodes-base/nodes/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.ts
index d73f7331e7629..9ddde6e5aad80 100644
--- a/packages/nodes-base/nodes/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.ts
+++ b/packages/nodes-base/nodes/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.ts
@@ -1,9 +1,4 @@
-import type {
-	IExecuteFunctions,
-	INodeExecutionData,
-	INodeType,
-	INodeTypeDescription,
-} from 'n8n-workflow';
+import type { IExecuteFunctions, INodeType, INodeTypeDescription } from 'n8n-workflow';
 
 export class ExecuteWorkflowTrigger implements INodeType {
 	description: INodeTypeDescription = {
@@ -20,7 +15,7 @@ export class ExecuteWorkflowTrigger implements INodeType {
 			name: 'Execute Workflow Trigger',
 			color: '#ff6d5a',
 		},
-		// eslint-disable-next-line n8n-nodes-base/node-class-description-inputs-wrong-regular-node
+
 		inputs: [],
 		outputs: ['main'],
 		properties: [
@@ -49,9 +44,7 @@ export class ExecuteWorkflowTrigger implements INodeType {
 		],
 	};
 
-	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
-		const items = this.getInputData();
-
-		return this.prepareOutputData(items);
+	async execute(this: IExecuteFunctions) {
+		return [this.getInputData()];
 	}
 }
diff --git a/packages/nodes-base/nodes/ExecutionData/ExecutionData.node.json b/packages/nodes-base/nodes/ExecutionData/ExecutionData.node.json
new file mode 100644
index 0000000000000..badc1669873f1
--- /dev/null
+++ b/packages/nodes-base/nodes/ExecutionData/ExecutionData.node.json
@@ -0,0 +1,17 @@
+{
+	"node": "n8n-nodes-base.executionData",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"categories": ["Development", "Core Nodes"],
+	"subcategories": {
+		"Core Nodes": ["Helpers"]
+	},
+	"resources": {
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.executiondata/"
+			}
+		]
+	},
+	"alias": ["Filter", "_Set", "Data"]
+}
diff --git a/packages/nodes-base/nodes/ExecutionData/ExecutionData.node.ts b/packages/nodes-base/nodes/ExecutionData/ExecutionData.node.ts
new file mode 100644
index 0000000000000..0dd3097e13518
--- /dev/null
+++ b/packages/nodes-base/nodes/ExecutionData/ExecutionData.node.ts
@@ -0,0 +1,109 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+
+export class ExecutionData implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Execution Data',
+		name: 'executionData',
+		icon: 'fa:tasks',
+		group: ['input'],
+		version: 1,
+		description: 'Add execution data for search',
+		defaults: {
+			name: 'Execution Data',
+			color: '#29A568',
+		},
+		inputs: ['main'],
+		outputs: ['main'],
+		properties: [
+			{
+				displayName:
+					"Use this node to save fields you want to use later to easily find an execution (e.g. a user ID). You'll be able to search by this data in the 'executions' tab.<br>This feature is available on our Pro and Enterprise plans. <a href='https://n8n.io/pricing/' target='_blank'>More Info</a>.",
+				name: 'notice',
+				type: 'notice',
+				default: '',
+			},
+			{
+				displayName: 'Operation',
+				name: 'operation',
+				type: 'options',
+				default: 'save',
+				noDataExpression: true,
+				options: [
+					{
+						name: 'Save Execution Data for Search',
+						value: 'save',
+						action: 'Save execution data for search',
+					},
+				],
+			},
+			{
+				displayName: 'Data to Save',
+				name: 'dataToSave',
+				placeholder: 'Add Saved Field',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValueButtonText: 'Add Saved Field',
+					multipleValues: true,
+				},
+				displayOptions: {
+					show: {
+						operation: ['save'],
+					},
+				},
+				default: {},
+				options: [
+					{
+						displayName: 'Values',
+						name: 'values',
+						values: [
+							{
+								displayName: 'Key',
+								name: 'key',
+								type: 'string',
+								default: '',
+								placeholder: 'e.g. myKey',
+							},
+							{
+								displayName: 'Value',
+								name: 'value',
+								type: 'string',
+								default: '',
+								placeholder: 'e.g. myValue',
+							},
+						],
+					},
+				],
+			},
+		],
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const context = this.getWorkflowDataProxy(0);
+
+		const items = this.getInputData();
+		const operations = this.getNodeParameter('operation', 0);
+
+		if (operations === 'save') {
+			for (let i = 0; i < items.length; i++) {
+				const dataToSave =
+					((this.getNodeParameter('dataToSave', i, {}) as IDataObject).values as IDataObject[]) ||
+					[];
+
+				const values = dataToSave.reduce((acc, { key, value }) => {
+					acc[key as string] = value;
+					return acc;
+				}, {} as IDataObject);
+
+				context.$execution.customData.setAll(values);
+			}
+		}
+
+		return [items];
+	}
+}
diff --git a/packages/nodes-base/nodes/Facebook/FacebookGraphApi.node.ts b/packages/nodes-base/nodes/Facebook/FacebookGraphApi.node.ts
index b0a76fca0fc05..78b80e6f64f0c 100644
--- a/packages/nodes-base/nodes/Facebook/FacebookGraphApi.node.ts
+++ b/packages/nodes-base/nodes/Facebook/FacebookGraphApi.node.ts
@@ -1,15 +1,15 @@
 import type {
 	IDataObject,
 	IExecuteFunctions,
+	IHttpRequestMethods,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	IRequestOptions,
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
-import type { OptionsWithUri } from 'request';
-
 export class FacebookGraphApi implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Facebook Graph API',
@@ -80,6 +80,14 @@ export class FacebookGraphApi implements INodeType {
 						name: 'Default',
 						value: '',
 					},
+					{
+						name: 'v17.0',
+						value: 'v17.0',
+					},
+					{
+						name: 'v16.0',
+						value: 'v16.0',
+					},
 					{
 						name: 'v15.0',
 						value: 'v15.0',
@@ -176,7 +184,7 @@ export class FacebookGraphApi implements INodeType {
 				description: 'Whether to connect even if SSL certificate validation is not possible',
 			},
 			{
-				displayName: 'Send Binary Data',
+				displayName: 'Send Binary File',
 				name: 'sendBinaryData',
 				type: 'boolean',
 				displayOptions: {
@@ -189,7 +197,7 @@ export class FacebookGraphApi implements INodeType {
 				description: 'Whether binary data should be sent as body',
 			},
 			{
-				displayName: 'Binary Property',
+				displayName: 'Input Binary Field',
 				name: 'binaryPropertyName',
 				type: 'string',
 				default: '',
@@ -202,8 +210,9 @@ export class FacebookGraphApi implements INodeType {
 						httpRequestMethod: ['POST', 'PUT'],
 					},
 				},
+				hint: 'The name of the input binary field containing the file to be uploaded',
 				description:
-					'Name of the binary property which contains the data for the file to be uploaded. For Form-Data Multipart, they can be provided in the format: <code>"sendKey1:binaryProperty1,sendKey2:binaryProperty2</code>',
+					'For Form-Data Multipart, they can be provided in the format: <code>"sendKey1:binaryProperty1,sendKey2:binaryProperty2</code>',
 			},
 			{
 				displayName: 'Options',
@@ -299,7 +308,10 @@ export class FacebookGraphApi implements INodeType {
 			const graphApiCredentials = await this.getCredentials('facebookGraphApi');
 
 			const hostUrl = this.getNodeParameter('hostUrl', itemIndex) as string;
-			const httpRequestMethod = this.getNodeParameter('httpRequestMethod', itemIndex) as string;
+			const httpRequestMethod = this.getNodeParameter(
+				'httpRequestMethod',
+				itemIndex,
+			) as IHttpRequestMethods;
 			let graphApiVersion = this.getNodeParameter('graphApiVersion', itemIndex) as string;
 			const node = this.getNodeParameter('node', itemIndex) as string;
 			const edge = this.getNodeParameter('edge', itemIndex) as string;
@@ -314,7 +326,10 @@ export class FacebookGraphApi implements INodeType {
 				uri = `${uri}/${edge}`;
 			}
 
-			const requestOptions: OptionsWithUri = {
+			const qs: IDataObject = {
+				access_token: graphApiCredentials.accessToken,
+			};
+			const requestOptions: IRequestOptions = {
 				headers: {
 					accept: 'application/json,text/*;q=0.99',
 				},
@@ -322,9 +337,6 @@ export class FacebookGraphApi implements INodeType {
 				uri,
 				json: true,
 				gzip: true,
-				qs: {
-					access_token: graphApiCredentials.accessToken,
-				},
 				rejectUnauthorized: !this.getNodeParameter('allowUnauthorizedCerts', itemIndex, false),
 			};
 
@@ -334,7 +346,7 @@ export class FacebookGraphApi implements INodeType {
 					const fields = options.fields as IDataObject;
 					if (fields.field !== undefined) {
 						const fieldsCsv = (fields.field as IDataObject[]).map((field) => field.name).join(',');
-						requestOptions.qs.fields = fieldsCsv;
+						qs.fields = fieldsCsv;
 					}
 				}
 
@@ -344,11 +356,13 @@ export class FacebookGraphApi implements INodeType {
 
 					if (queryParameters.parameter !== undefined) {
 						for (const queryParameter of queryParameters.parameter as IDataObject[]) {
-							requestOptions.qs[queryParameter.name as string] = queryParameter.value;
+							qs[queryParameter.name as string] = queryParameter.value;
 						}
 					}
 				}
 
+				requestOptions.qs = qs;
+
 				// Add the query parameters defined as a JSON object
 				if (options.queryParametersJson) {
 					let queryParametersJsonObj = {};
@@ -357,7 +371,6 @@ export class FacebookGraphApi implements INodeType {
 					} catch {
 						/* Do nothing, at least for now */
 					}
-					const qs = requestOptions.qs;
 					requestOptions.qs = {
 						...qs,
 						...queryParametersJsonObj,
diff --git a/packages/nodes-base/nodes/Facebook/FacebookTrigger.node.json b/packages/nodes-base/nodes/Facebook/FacebookTrigger.node.json
index 96ada90eefb0a..6b8cc9a40efdb 100644
--- a/packages/nodes-base/nodes/Facebook/FacebookTrigger.node.json
+++ b/packages/nodes-base/nodes/Facebook/FacebookTrigger.node.json
@@ -2,7 +2,7 @@
 	"node": "n8n-nodes-base.facebookTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Marketing & Content"],
+	"categories": ["Marketing"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,5 +14,6 @@
 				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.facebooktrigger/"
 			}
 		]
-	}
+	},
+	"alias": ["FB"]
 }
diff --git a/packages/nodes-base/nodes/Facebook/FacebookTrigger.node.ts b/packages/nodes-base/nodes/Facebook/FacebookTrigger.node.ts
index ee2b28919390f..b337ec1fd83e1 100644
--- a/packages/nodes-base/nodes/Facebook/FacebookTrigger.node.ts
+++ b/packages/nodes-base/nodes/Facebook/FacebookTrigger.node.ts
@@ -1,15 +1,16 @@
+import { createHmac } from 'crypto';
 import type {
-	IHookFunctions,
-	IWebhookFunctions,
 	IDataObject,
+	IHookFunctions,
 	ILoadOptionsFunctions,
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	IWebhookFunctions,
 	IWebhookResponseData,
 	JsonObject,
 } from 'n8n-workflow';
-import { NodeApiError } from 'n8n-workflow';
+import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 import { v4 as uuid } from 'uuid';
 
@@ -17,7 +18,7 @@ import { snakeCase } from 'change-case';
 
 import { facebookApiRequest, getAllFields, getFields } from './GenericFunctions';
 
-import { createHmac } from 'crypto';
+import type { FacebookWebhookSubscription } from './types';
 
 export class FacebookTrigger implements INodeType {
 	description: INodeTypeDescription = {
@@ -62,6 +63,17 @@ export class FacebookTrigger implements INodeType {
 				default: '',
 				description: 'Facebook APP ID',
 			},
+			{
+				displayName: 'To watch Whatsapp business account events use the Whatsapp trigger node',
+				name: 'whatsappBusinessAccountNotice',
+				type: 'notice',
+				default: '',
+				displayOptions: {
+					show: {
+						object: ['whatsappBusinessAccount'],
+					},
+				},
+			},
 			{
 				displayName: 'Object',
 				name: 'object',
@@ -177,18 +189,28 @@ export class FacebookTrigger implements INodeType {
 				const object = this.getNodeParameter('object') as string;
 				const appId = this.getNodeParameter('appId') as string;
 
-				const { data } = await facebookApiRequest.call(this, 'GET', `/${appId}/subscriptions`, {});
+				const { data } = (await facebookApiRequest.call(
+					this,
+					'GET',
+					`/${appId}/subscriptions`,
+					{},
+				)) as { data: FacebookWebhookSubscription[] };
 
-				for (const webhook of data) {
-					if (
-						webhook.target === webhookUrl &&
-						webhook.object === object &&
-						webhook.status === true
-					) {
-						return true;
-					}
+				const subscription = data.find((webhook) => webhook.object === object && webhook.status);
+
+				if (!subscription) {
+					return false;
 				}
-				return false;
+
+				if (subscription.callback_url !== webhookUrl) {
+					throw new NodeOperationError(
+						this.getNode(),
+						`The Facebook App ID ${appId} already has a webhook subscription. Delete it or use another App before executing the trigger. Due to Facebook API limitations, you can have just one trigger per App.`,
+						{ level: 'warning' },
+					);
+				}
+
+				return true;
 			},
 			async create(this: IHookFunctions): Promise<boolean> {
 				const webhookData = this.getWorkflowStaticData('node');
diff --git a/packages/nodes-base/nodes/Facebook/GenericFunctions.ts b/packages/nodes-base/nodes/Facebook/GenericFunctions.ts
index bbad071aa2533..94d36bd1830d4 100644
--- a/packages/nodes-base/nodes/Facebook/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Facebook/GenericFunctions.ts
@@ -1,11 +1,10 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
+	IRequestOptions,
 	IWebhookFunctions,
 	JsonObject,
 } from 'n8n-workflow';
@@ -14,13 +13,8 @@ import { NodeApiError } from 'n8n-workflow';
 import { capitalCase } from 'change-case';
 
 export async function facebookApiRequest(
-	this:
-		| IHookFunctions
-		| IExecuteFunctions
-		| IExecuteSingleFunctions
-		| ILoadOptionsFunctions
-		| IWebhookFunctions,
-	method: string,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -38,7 +32,7 @@ export async function facebookApiRequest(
 
 	qs.access_token = credentials.accessToken;
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			accept: 'application/json,text/*;q=0.99',
 		},
@@ -554,7 +548,6 @@ export function getFields(object: string) {
 		],
 	} as { [key: string]: any };
 
-	// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
 	return [{ name: '*', value: '*' }].concat(data[object] || []).map((fieldObject: IDataObject) => ({
 		...fieldObject,
 		name: fieldObject.value !== '*' ? capitalCase(fieldObject.value as string) : fieldObject.value,
diff --git a/packages/nodes-base/nodes/Facebook/facebook.svg b/packages/nodes-base/nodes/Facebook/facebook.svg
index 14021e35e4940..fe77ac697825d 100644
--- a/packages/nodes-base/nodes/Facebook/facebook.svg
+++ b/packages/nodes-base/nodes/Facebook/facebook.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 60 60"><path d="M59.5 30C59.5 13.71 46.29.5 30 .5S.5 13.71.5 30c0 14.72 10.79 26.93 24.89 29.14V38.53H17.9V30h7.49v-6.5c0-7.39 4.4-11.48 11.14-11.48 3.23 0 6.6.58 6.6.58v7.26h-3.72c-3.66 0-4.81 2.27-4.81 4.61V30h8.18l-1.31 8.53H34.6v20.61C48.71 56.93 59.5 44.72 59.5 30z" fill="#1877f2"/><path d="M41.48 38.53L42.79 30h-8.18v-5.53c0-2.33 1.14-4.61 4.81-4.61h3.72V12.6s-3.38-.58-6.6-.58c-6.74 0-11.14 4.08-11.14 11.48V30h-7.5v8.53h7.49v20.61c1.5.24 3.04.36 4.61.36s3.11-.12 4.61-.36V38.53h6.87z" fill="#fff"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 60 60"><path fill="#1877f2" d="M59.5 30C59.5 13.71 46.29.5 30 .5S.5 13.71.5 30c0 14.72 10.79 26.93 24.89 29.14V38.53H17.9V30h7.49v-6.5c0-7.39 4.4-11.48 11.14-11.48 3.23 0 6.6.58 6.6.58v7.26h-3.72c-3.66 0-4.81 2.27-4.81 4.61V30h8.18l-1.31 8.53H34.6v20.61C48.71 56.93 59.5 44.72 59.5 30"/><path fill="#fff" d="M41.48 38.53 42.79 30h-8.18v-5.53c0-2.33 1.14-4.61 4.81-4.61h3.72V12.6s-3.38-.58-6.6-.58c-6.74 0-11.14 4.08-11.14 11.48V30h-7.5v8.53h7.49v20.61c1.5.24 3.04.36 4.61.36s3.11-.12 4.61-.36V38.53z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Facebook/types.ts b/packages/nodes-base/nodes/Facebook/types.ts
new file mode 100644
index 0000000000000..934ceac179237
--- /dev/null
+++ b/packages/nodes-base/nodes/Facebook/types.ts
@@ -0,0 +1,29 @@
+export interface FacebookEvent {
+	object: string;
+	entry: FacebookPageEventEntry[];
+}
+
+export interface FacebookPageEventEntry {
+	id: string;
+	time: number;
+	changes: [
+		{
+			field: 'leadgen';
+			value: {
+				ad_id: string;
+				form_id: string;
+				leadgen_id: string;
+				created_time: number;
+				page_id: string;
+				adgroup_id: string;
+			};
+		},
+	];
+}
+
+export interface FacebookWebhookSubscription {
+	object: string;
+	callback_url: string;
+	fields: string[];
+	status: boolean;
+}
diff --git a/packages/nodes-base/nodes/FacebookLeadAds/FacebookLeadAdsTrigger.node.json b/packages/nodes-base/nodes/FacebookLeadAds/FacebookLeadAdsTrigger.node.json
new file mode 100644
index 0000000000000..661b382b04922
--- /dev/null
+++ b/packages/nodes-base/nodes/FacebookLeadAds/FacebookLeadAdsTrigger.node.json
@@ -0,0 +1,18 @@
+{
+	"node": "n8n-nodes-base.facebookLeadAdsTrigger",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"categories": ["Marketing"],
+	"resources": {
+		"credentialDocumentation": [
+			{
+				"url": "https://docs.n8n.io/integrations/credentials/facebookleadads/"
+			}
+		],
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.facebookleadadstrigger/"
+			}
+		]
+	}
+}
diff --git a/packages/nodes-base/nodes/FacebookLeadAds/FacebookLeadAdsTrigger.node.ts b/packages/nodes-base/nodes/FacebookLeadAds/FacebookLeadAdsTrigger.node.ts
new file mode 100644
index 0000000000000..e5eb80043ccb3
--- /dev/null
+++ b/packages/nodes-base/nodes/FacebookLeadAds/FacebookLeadAdsTrigger.node.ts
@@ -0,0 +1,312 @@
+import { createHmac } from 'crypto';
+import {
+	NodeOperationError,
+	type IDataObject,
+	type IHookFunctions,
+	type INodeType,
+	type INodeTypeDescription,
+	type IWebhookFunctions,
+	type IWebhookResponseData,
+} from 'n8n-workflow';
+import {
+	appWebhookSubscriptionCreate,
+	appWebhookSubscriptionDelete,
+	appWebhookSubscriptionList,
+	facebookEntityDetail,
+	installAppOnPage,
+} from './GenericFunctions';
+import { listSearch } from './methods';
+import type { FacebookForm, FacebookFormLeadData, FacebookPageEvent } from './types';
+
+export class FacebookLeadAdsTrigger implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Facebook Lead Ads Trigger',
+		name: 'facebookLeadAdsTrigger',
+		icon: 'file:facebook.svg',
+		group: ['trigger'],
+		version: 1,
+		subtitle: '={{$parameter["event"]}}',
+		description: 'Handle Facebook Lead Ads events via webhooks',
+		defaults: {
+			name: 'Facebook Lead Ads Trigger',
+		},
+		inputs: [],
+		outputs: ['main'],
+		credentials: [
+			{
+				name: 'facebookLeadAdsOAuth2Api',
+				required: true,
+			},
+		],
+		webhooks: [
+			{
+				name: 'setup',
+				httpMethod: 'GET',
+				responseMode: 'onReceived',
+				path: 'webhook',
+			},
+			{
+				name: 'default',
+				httpMethod: 'POST',
+				responseMode: 'onReceived',
+				path: 'webhook',
+			},
+		],
+		properties: [
+			{
+				displayName:
+					'Due to Facebook API limitations, you can use just one Facebook Lead Ads trigger for each Facebook App',
+				name: 'facebookLeadAdsNotice',
+				type: 'notice',
+				default: '',
+			},
+			{
+				displayName: 'Event',
+				name: 'event',
+				type: 'options',
+				required: true,
+				default: 'newLead',
+				options: [
+					{
+						name: 'New Lead',
+						value: 'newLead',
+					},
+				],
+			},
+			{
+				displayName: 'Page',
+				name: 'page',
+				type: 'resourceLocator',
+				default: { mode: 'list', value: '' },
+				required: true,
+				description: 'The page linked to the form for retrieving new leads',
+				modes: [
+					{
+						displayName: 'From List',
+						name: 'list',
+						type: 'list',
+						typeOptions: {
+							searchListMethod: 'pageList',
+						},
+					},
+					{
+						displayName: 'By ID',
+						name: 'id',
+						type: 'string',
+						placeholder: '121637951029080',
+					},
+				],
+			},
+			{
+				displayName: 'Form',
+				name: 'form',
+				type: 'resourceLocator',
+				default: { mode: 'list', value: '' },
+				required: true,
+				description: 'The form to monitor for fetching lead details upon submission',
+				modes: [
+					{
+						displayName: 'From List',
+						name: 'list',
+						type: 'list',
+						typeOptions: {
+							searchListMethod: 'formList',
+						},
+					},
+					{
+						displayName: 'By ID',
+						name: 'id',
+						type: 'string',
+						placeholder: '121637951029080',
+					},
+				],
+			},
+			{
+				displayName: 'Options',
+				name: 'options',
+				type: 'collection',
+				placeholder: 'Add Option',
+				default: {},
+				options: [
+					{
+						displayName: 'Simplify Output',
+						name: 'simplifyOutput',
+						type: 'boolean',
+						default: true,
+						description:
+							'Whether to return a simplified version of the webhook event instead of all fields',
+					},
+				],
+			},
+		],
+	};
+
+	methods = {
+		listSearch,
+	};
+
+	webhookMethods = {
+		default: {
+			async checkExists(this: IHookFunctions): Promise<boolean> {
+				const webhookUrl = this.getNodeWebhookUrl('default') as string;
+				const credentials = await this.getCredentials('facebookLeadAdsOAuth2Api');
+				const appId = credentials.clientId as string;
+
+				const webhooks = await appWebhookSubscriptionList.call(this, appId);
+
+				const subscription = webhooks.find(
+					(webhook) =>
+						webhook.object === 'page' &&
+						webhook.fields.find((field) => field.name === 'leadgen') &&
+						webhook.active,
+				);
+
+				if (!subscription) {
+					return false;
+				}
+
+				if (subscription.callback_url !== webhookUrl) {
+					throw new NodeOperationError(
+						this.getNode(),
+						`The Facebook App ID ${appId} already has a webhook subscription. Delete it or use another App before executing the trigger. Due to Facebook API limitations, you can have just one trigger per App.`,
+						{ level: 'warning' },
+					);
+				}
+
+				return true;
+			},
+			async create(this: IHookFunctions): Promise<boolean> {
+				const webhookUrl = this.getNodeWebhookUrl('default') as string;
+				const credentials = await this.getCredentials('facebookLeadAdsOAuth2Api');
+				const appId = credentials.clientId as string;
+				const pageId = this.getNodeParameter('page', '', { extractValue: true }) as string;
+				const verifyToken = this.getNode().id;
+
+				await appWebhookSubscriptionCreate.call(this, appId, {
+					object: 'page',
+					callback_url: webhookUrl,
+					verify_token: verifyToken,
+					fields: ['leadgen'],
+					include_values: true,
+				});
+
+				await installAppOnPage.call(this, pageId, 'leadgen');
+
+				return true;
+			},
+			async delete(this: IHookFunctions): Promise<boolean> {
+				const credentials = await this.getCredentials('facebookLeadAdsOAuth2Api');
+				const appId = credentials.clientId as string;
+
+				await appWebhookSubscriptionDelete.call(this, appId, 'page');
+
+				return true;
+			},
+		},
+	};
+
+	async webhook(this: IWebhookFunctions): Promise<IWebhookResponseData> {
+		const bodyData = this.getBodyData() as unknown as FacebookPageEvent;
+		const query = this.getQueryData() as IDataObject;
+		const res = this.getResponseObject();
+		const req = this.getRequestObject();
+		const headerData = this.getHeaderData() as IDataObject;
+		const credentials = await this.getCredentials('facebookLeadAdsOAuth2Api');
+		const pageId = this.getNodeParameter('page', '', { extractValue: true }) as string;
+		const formId = this.getNodeParameter('form', '', { extractValue: true }) as string;
+
+		// Check if we're getting facebook's challenge request (https://developers.facebook.com/docs/graph-api/webhooks/getting-started)
+		if (this.getWebhookName() === 'setup') {
+			if (query['hub.challenge']) {
+				if (this.getNode().id !== query['hub.verify_token']) {
+					return {};
+				}
+
+				res.status(200).send(query['hub.challenge']).end();
+
+				return { noWebhookResponse: true };
+			}
+		}
+
+		const computedSignature = createHmac('sha256', credentials.clientSecret as string)
+			.update(req.rawBody)
+			.digest('hex');
+		if (headerData['x-hub-signature-256'] !== `sha256=${computedSignature}`) {
+			return {};
+		}
+
+		if (bodyData.object !== 'page') {
+			return {};
+		}
+
+		const events = await Promise.all(
+			bodyData.entry
+				.map((entry) =>
+					entry.changes
+						.filter(
+							(change) =>
+								change.field === 'leadgen' &&
+								change.value.page_id === pageId &&
+								change.value.form_id === formId,
+						)
+						.map((change) => change.value),
+				)
+				.flat()
+				.map(async (event) => {
+					const [lead, form] = await Promise.all([
+						facebookEntityDetail.call(
+							this,
+							event.leadgen_id,
+							'field_data,created_time,ad_id,ad_name,adset_id,adset_name,form_id',
+						) as Promise<FacebookFormLeadData>,
+						facebookEntityDetail.call(
+							this,
+							event.form_id,
+							'id,name,locale,status,page,questions',
+						) as Promise<FacebookForm>,
+					]);
+
+					const simplifyOutput = this.getNodeParameter('options.simplifyOutput', true) as boolean;
+
+					if (simplifyOutput) {
+						return {
+							id: lead.id,
+							data: lead.field_data.reduce(
+								(acc, field) => ({ ...acc, [field.name]: field.values[0] }),
+								{},
+							),
+							form: {
+								id: form.id,
+								name: form.name,
+								locale: form.locale,
+								status: form.status,
+							},
+							ad: { id: lead.ad_id, name: lead.ad_name },
+							adset: { id: lead.adset_id, name: lead.adset_name },
+							page: form.page,
+							created_time: lead.created_time,
+						};
+					}
+
+					return {
+						id: lead.id,
+						field_data: lead.field_data,
+						form,
+						ad: { id: lead.ad_id, name: lead.ad_name },
+						adset: { id: lead.adset_id, name: lead.adset_name },
+						page: form.page,
+						created_time: lead.created_time,
+						event,
+					};
+				}),
+		);
+
+		if (events.length === 0) {
+			return {};
+		}
+
+		return {
+			workflowData: [this.helpers.returnJsonArray(events)],
+		};
+	}
+}
diff --git a/packages/nodes-base/nodes/FacebookLeadAds/GenericFunctions.ts b/packages/nodes-base/nodes/FacebookLeadAds/GenericFunctions.ts
new file mode 100644
index 0000000000000..a60860509641d
--- /dev/null
+++ b/packages/nodes-base/nodes/FacebookLeadAds/GenericFunctions.ts
@@ -0,0 +1,222 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	IHookFunctions,
+	IHttpRequestMethods,
+	ILoadOptionsFunctions,
+	IRequestOptions,
+	IWebhookFunctions,
+	JsonObject,
+} from 'n8n-workflow';
+import { NodeApiError } from 'n8n-workflow';
+import type {
+	CreateFacebookAppWebhookSubscription,
+	FacebookAppWebhookSubscription,
+	FacebookAppWebhookSubscriptionsResponse,
+	FacebookFormListResponse,
+	FacebookPage,
+	FacebookPageListResponse,
+} from './types';
+
+export async function facebookApiRequest(
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
+	method: IHttpRequestMethods,
+	resource: string,
+	body = {},
+	qs: IDataObject = {},
+): Promise<any> {
+	const options: IRequestOptions = {
+		headers: {
+			accept: 'application/json',
+		},
+		method,
+		qs,
+		body,
+		gzip: true,
+		uri: `https://graph.facebook.com/v17.0${resource}`,
+		json: true,
+	};
+
+	try {
+		return await this.helpers.requestOAuth2.call(this, 'facebookLeadAdsOAuth2Api', options);
+	} catch (error) {
+		throw new NodeApiError(this.getNode(), error as JsonObject, {
+			message: error?.error?.error?.message,
+		});
+	}
+}
+
+export async function appAccessTokenRead(
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
+): Promise<{ access_token: string }> {
+	const credentials = await this.getCredentials('facebookLeadAdsOAuth2Api');
+
+	const options: IRequestOptions = {
+		headers: {
+			'content-type': 'application/x-www-form-urlencoded',
+		},
+		method: 'POST',
+		form: {
+			client_id: credentials.clientId,
+			client_secret: credentials.clientSecret,
+			grant_type: 'client_credentials',
+		},
+		uri: credentials.accessTokenUrl as string,
+		json: true,
+	};
+	try {
+		return await this.helpers.request(options);
+	} catch (error) {
+		throw new NodeApiError(this.getNode(), error as JsonObject);
+	}
+}
+
+export async function facebookAppApiRequest(
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
+	method: IHttpRequestMethods,
+	resource: string,
+	body?: { type: 'json'; payload: IDataObject } | { type: 'form'; payload: IDataObject },
+	qs: IDataObject = {},
+): Promise<any> {
+	const tokenResponse = await appAccessTokenRead.call(this);
+	const appAccessToken = tokenResponse.access_token;
+
+	const options: IRequestOptions = {
+		headers: {
+			accept: 'application/json',
+			authorization: `Bearer ${appAccessToken}`,
+		},
+		method,
+		qs,
+		gzip: true,
+		uri: `https://graph.facebook.com/v17.0${resource}`,
+		json: true,
+	};
+
+	if (body?.type === 'json') {
+		options.body = body.payload;
+	} else if (body?.type === 'form') {
+		options.form = body.payload;
+	}
+
+	try {
+		return await this.helpers.request(options);
+	} catch (error) {
+		throw new NodeApiError(this.getNode(), error as JsonObject);
+	}
+}
+
+export async function appWebhookSubscriptionList(
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
+	appId: string,
+): Promise<FacebookAppWebhookSubscription[]> {
+	const response = (await facebookAppApiRequest.call(
+		this,
+		'GET',
+		`/${appId}/subscriptions`,
+	)) as FacebookAppWebhookSubscriptionsResponse;
+	return response.data;
+}
+
+export async function appWebhookSubscriptionCreate(
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
+	appId: string,
+	subscription: CreateFacebookAppWebhookSubscription,
+) {
+	return await facebookAppApiRequest.call(this, 'POST', `/${appId}/subscriptions`, {
+		type: 'form',
+		payload: { ...subscription },
+	});
+}
+
+export async function appWebhookSubscriptionDelete(
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
+	appId: string,
+	object: string,
+) {
+	return await facebookAppApiRequest.call(this, 'DELETE', `/${appId}/subscriptions`, {
+		type: 'form',
+		payload: { object },
+	});
+}
+
+export async function facebookPageList(
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
+	cursor?: string,
+): Promise<FacebookPageListResponse> {
+	const response = (await facebookApiRequest.call(
+		this,
+		'GET',
+		'/me/accounts',
+		{},
+		{ cursor, fields: 'id,name' },
+	)) as FacebookPageListResponse;
+	return response;
+}
+
+export async function facebookEntityDetail(
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
+	entityId: string,
+	fields = 'id,name,access_token',
+): Promise<any> {
+	return await facebookApiRequest.call(this, 'GET', `/${entityId}`, {}, { fields });
+}
+
+export async function facebookPageApiRequest(
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
+	method: IHttpRequestMethods,
+	resource: string,
+	body = {},
+	qs: IDataObject = {},
+): Promise<any> {
+	const pageId = this.getNodeParameter('page', '', { extractValue: true }) as string;
+	const page = (await facebookEntityDetail.call(this, pageId)) as FacebookPage;
+	const pageAccessToken = page.access_token;
+	const options: IRequestOptions = {
+		headers: {
+			accept: 'application/json',
+			authorization: `Bearer ${pageAccessToken}`,
+		},
+		method,
+		qs,
+		body,
+		gzip: true,
+		uri: `https://graph.facebook.com/v17.0${resource}`,
+		json: true,
+	};
+
+	try {
+		return await this.helpers.request.call(this, options);
+	} catch (error) {
+		throw new NodeApiError(this.getNode(), error as JsonObject);
+	}
+}
+
+export async function installAppOnPage(
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
+	pageId: string,
+	fields: string,
+) {
+	return await facebookPageApiRequest.call(
+		this,
+		'POST',
+		`/${pageId}/subscribed_apps`,
+		{},
+		{ subscribed_fields: fields },
+	);
+}
+
+export async function facebookFormList(
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
+	pageId: string,
+	cursor?: string,
+): Promise<FacebookFormListResponse> {
+	const response = (await facebookPageApiRequest.call(
+		this,
+		'GET',
+		`/${pageId}/leadgen_forms`,
+		{},
+		{ cursor, fields: 'id,name' },
+	)) as FacebookFormListResponse;
+	return response;
+}
diff --git a/packages/nodes-base/nodes/FacebookLeadAds/facebook.svg b/packages/nodes-base/nodes/FacebookLeadAds/facebook.svg
new file mode 100644
index 0000000000000..fe77ac697825d
--- /dev/null
+++ b/packages/nodes-base/nodes/FacebookLeadAds/facebook.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 60 60"><path fill="#1877f2" d="M59.5 30C59.5 13.71 46.29.5 30 .5S.5 13.71.5 30c0 14.72 10.79 26.93 24.89 29.14V38.53H17.9V30h7.49v-6.5c0-7.39 4.4-11.48 11.14-11.48 3.23 0 6.6.58 6.6.58v7.26h-3.72c-3.66 0-4.81 2.27-4.81 4.61V30h8.18l-1.31 8.53H34.6v20.61C48.71 56.93 59.5 44.72 59.5 30"/><path fill="#fff" d="M41.48 38.53 42.79 30h-8.18v-5.53c0-2.33 1.14-4.61 4.81-4.61h3.72V12.6s-3.38-.58-6.6-.58c-6.74 0-11.14 4.08-11.14 11.48V30h-7.5v8.53h7.49v20.61c1.5.24 3.04.36 4.61.36s3.11-.12 4.61-.36V38.53z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/FacebookLeadAds/methods/index.ts b/packages/nodes-base/nodes/FacebookLeadAds/methods/index.ts
new file mode 100644
index 0000000000000..c7fb720e474f5
--- /dev/null
+++ b/packages/nodes-base/nodes/FacebookLeadAds/methods/index.ts
@@ -0,0 +1 @@
+export * as listSearch from './listSearch';
diff --git a/packages/nodes-base/nodes/FacebookLeadAds/methods/listSearch.ts b/packages/nodes-base/nodes/FacebookLeadAds/methods/listSearch.ts
new file mode 100644
index 0000000000000..b7d3e64990fd6
--- /dev/null
+++ b/packages/nodes-base/nodes/FacebookLeadAds/methods/listSearch.ts
@@ -0,0 +1,42 @@
+import type { ILoadOptionsFunctions, INodeListSearchResult } from 'n8n-workflow';
+import { facebookFormList, facebookPageList } from '../GenericFunctions';
+
+const filterMatches = (name: string, filter?: string): boolean =>
+	!filter || name?.toLowerCase().includes(filter.toLowerCase());
+
+export async function pageList(
+	this: ILoadOptionsFunctions,
+	filter?: string,
+	paginationToken?: string,
+): Promise<INodeListSearchResult> {
+	const { data: pages, paging } = await facebookPageList.call(this, paginationToken);
+	return {
+		results: pages
+			.filter((page) => filterMatches(page.name, filter))
+			.map((page) => ({
+				name: page.name,
+				value: page.id,
+				url: `https://facebook.com/${page.id}`,
+			})),
+		paginationToken: paging?.cursors?.after,
+	};
+}
+
+export async function formList(
+	this: ILoadOptionsFunctions,
+	filter?: string,
+	paginationToken?: string,
+): Promise<INodeListSearchResult> {
+	const pageId = this.getNodeParameter('page', '', { extractValue: true }) as string;
+
+	const { data: forms, paging } = await facebookFormList.call(this, pageId, paginationToken);
+	return {
+		results: forms
+			.filter((form) => filterMatches(form.name, filter))
+			.map((form) => ({
+				name: form.name,
+				value: form.id,
+			})),
+		paginationToken: paging?.cursors?.after,
+	};
+}
diff --git a/packages/nodes-base/nodes/FacebookLeadAds/types.ts b/packages/nodes-base/nodes/FacebookLeadAds/types.ts
new file mode 100644
index 0000000000000..d1fc6050a33a9
--- /dev/null
+++ b/packages/nodes-base/nodes/FacebookLeadAds/types.ts
@@ -0,0 +1,105 @@
+import type { GenericValue } from 'n8n-workflow';
+
+export type BaseFacebookResponse<TData> = { data: TData };
+export type BasePaginatedFacebookResponse<TData> = BaseFacebookResponse<TData> & {
+	paging: { cursors: { before?: string; after?: string } };
+};
+
+export type FacebookAppWebhookSubscriptionsResponse = BaseFacebookResponse<
+	FacebookAppWebhookSubscription[]
+>;
+
+export interface FacebookAppWebhookSubscription {
+	object: string;
+	callback_url: string;
+	active: boolean;
+	fields: FacebookAppWebhookSubscriptionField[];
+}
+
+export interface FacebookAppWebhookSubscriptionField {
+	name: string;
+	version: string;
+}
+
+export interface CreateFacebookAppWebhookSubscription {
+	object: string;
+	callback_url: string;
+	fields: string[];
+	include_values: boolean;
+	verify_token: string;
+}
+
+export type FacebookPageListResponse = BasePaginatedFacebookResponse<FacebookPage[]>;
+export type FacebookFormListResponse = BasePaginatedFacebookResponse<FacebookForm[]>;
+
+export interface FacebookPage {
+	id: string;
+	name: string;
+	access_token: string;
+	category: string;
+	category_list: FacebookPageCategory[];
+	tasks: string[];
+}
+
+export interface FacebookPageCategory {
+	id: string;
+	name: string;
+}
+
+export interface FacebookFormQuestion {
+	id: string;
+	key: string;
+	label: string;
+	type: string;
+}
+
+export interface FacebookForm {
+	id: string;
+	name: string;
+	locale: string;
+	status: string;
+	page: {
+		id: string;
+		name: string;
+	};
+	questions: FacebookFormQuestion[];
+}
+
+export interface FacebookPageEvent {
+	object: 'page';
+	entry: FacebookPageEventEntry[];
+}
+
+export interface FacebookPageEventEntry {
+	id: string;
+	time: number;
+	changes: [
+		{
+			field: 'leadgen';
+			value: {
+				ad_id: string;
+				form_id: string;
+				leadgen_id: string;
+				created_time: number;
+				page_id: string;
+				adgroup_id: string;
+			};
+		},
+	];
+}
+
+export interface FacebookFormLeadData {
+	id: string;
+	created_time: string;
+	ad_id: string;
+	ad_name: string;
+	adset_id: string;
+	adset_name: string;
+	form_id: string;
+	field_data: [
+		{
+			name: string;
+			values: GenericValue[];
+		},
+	];
+}
diff --git a/packages/nodes-base/nodes/Figma/FigmaTrigger.node.ts b/packages/nodes-base/nodes/Figma/FigmaTrigger.node.ts
index eecb109bf1f91..5e204aa59efc4 100644
--- a/packages/nodes-base/nodes/Figma/FigmaTrigger.node.ts
+++ b/packages/nodes-base/nodes/Figma/FigmaTrigger.node.ts
@@ -1,3 +1,4 @@
+import { randomBytes } from 'crypto';
 import type {
 	IHookFunctions,
 	IWebhookFunctions,
@@ -7,15 +8,11 @@ import type {
 	IWebhookResponseData,
 } from 'n8n-workflow';
 
-import { figmaApiRequest } from './GenericFunctions';
-
 import { snakeCase } from 'change-case';
-
-import { randomBytes } from 'crypto';
+import { figmaApiRequest } from './GenericFunctions';
 
 export class FigmaTrigger implements INodeType {
 	description: INodeTypeDescription = {
-		// eslint-disable-next-line n8n-nodes-base/node-class-description-display-name-unsuffixed-trigger-node
 		displayName: 'Figma Trigger (Beta)',
 		name: 'figmaTrigger',
 		icon: 'file:figma.svg',
diff --git a/packages/nodes-base/nodes/Figma/GenericFunctions.ts b/packages/nodes-base/nodes/Figma/GenericFunctions.ts
index 7af362db76831..cbd56185580eb 100644
--- a/packages/nodes-base/nodes/Figma/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Figma/GenericFunctions.ts
@@ -1,18 +1,17 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	JsonObject,
+	IRequestOptions,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function figmaApiRequest(
-	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -22,7 +21,7 @@ export async function figmaApiRequest(
 ): Promise<any> {
 	const credentials = await this.getCredentials('figmaApi');
 
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		headers: { 'X-FIGMA-TOKEN': credentials.accessToken },
 		method,
 		body,
diff --git a/packages/nodes-base/nodes/Figma/figma.svg b/packages/nodes-base/nodes/Figma/figma.svg
index f1a2faa12dffa..25a5271373c73 100644
--- a/packages/nodes-base/nodes/Figma/figma.svg
+++ b/packages/nodes-base/nodes/Figma/figma.svg
@@ -1 +1 @@
-<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 200 300" width="1667" height="2500"><style type="text/css">.st0{fill:#0acf83}.st1{fill:#a259ff}.st2{fill:#f24e1e}.st3{fill:#ff7262}.st4{fill:#1abcfe}</style><title>Figma.logo</title><desc>Created using Figma</desc><path id="path0_fill" class="st0" d="M50 300c27.6 0 50-22.4 50-50v-50H50c-27.6 0-50 22.4-50 50s22.4 50 50 50z"/><path id="path1_fill" class="st1" d="M0 150c0-27.6 22.4-50 50-50h50v100H50c-27.6 0-50-22.4-50-50z"/><path id="path1_fill_1_" class="st2" d="M0 50C0 22.4 22.4 0 50 0h50v100H50C22.4 100 0 77.6 0 50z"/><path id="path2_fill" class="st3" d="M100 0h50c27.6 0 50 22.4 50 50s-22.4 50-50 50h-50V0z"/><path id="path3_fill" class="st4" d="M200 150c0 27.6-22.4 50-50 50s-50-22.4-50-50 22.4-50 50-50 50 22.4 50 50z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="1667" height="2500" viewBox="0 0 200 300"><path d="M50 300c27.6 0 50-22.4 50-50v-50H50c-27.6 0-50 22.4-50 50s22.4 50 50 50" style="fill:#0acf83"/><path d="M0 150c0-27.6 22.4-50 50-50h50v100H50c-27.6 0-50-22.4-50-50" style="fill:#a259ff"/><path d="M0 50C0 22.4 22.4 0 50 0h50v100H50C22.4 100 0 77.6 0 50" style="fill:#f24e1e"/><path d="M100 0h50c27.6 0 50 22.4 50 50s-22.4 50-50 50h-50z" style="fill:#ff7262"/><path d="M200 150c0 27.6-22.4 50-50 50s-50-22.4-50-50 22.4-50 50-50 50 22.4 50 50" style="fill:#1abcfe"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/FileMaker/FileMaker.node.ts b/packages/nodes-base/nodes/FileMaker/FileMaker.node.ts
index 53ddcc1297334..29352a942546f 100644
--- a/packages/nodes-base/nodes/FileMaker/FileMaker.node.ts
+++ b/packages/nodes-base/nodes/FileMaker/FileMaker.node.ts
@@ -7,10 +7,10 @@ import type {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import type { OptionsWithUri } from 'request';
 import {
 	getFields,
 	getPortals,
@@ -600,15 +600,7 @@ export class FileMaker implements INodeType {
 			// Get all the available topics to display them to user so that they can
 			// select them easily
 			async getLayouts(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				let returnData: INodePropertyOptions[];
-
-				try {
-					returnData = await layoutsApiRequest.call(this);
-				} catch (error) {
-					throw new NodeOperationError(this.getNode(), error as Error);
-				}
-
-				return returnData;
+				return await layoutsApiRequest.call(this);
 			},
 			async getResponseLayouts(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
 				const returnData: INodePropertyOptions[] = [];
@@ -617,12 +609,8 @@ export class FileMaker implements INodeType {
 					value: '',
 				});
 
-				let layouts;
-				try {
-					layouts = await layoutsApiRequest.call(this);
-				} catch (error) {
-					throw new NodeOperationError(this.getNode(), error as Error);
-				}
+				const layouts = await layoutsApiRequest.call(this);
+
 				for (const layout of layouts) {
 					returnData.push({
 						name: layout.name,
@@ -635,12 +623,10 @@ export class FileMaker implements INodeType {
 			async getFields(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
 				const returnData: INodePropertyOptions[] = [];
 
-				let fields;
-				try {
-					fields = await getFields.call(this);
-				} catch (error) {
-					throw new NodeOperationError(this.getNode(), error as Error);
-				}
+				const fields = await getFields.call(this);
+
+				if (!Array.isArray(fields)) return [];
+
 				for (const field of fields) {
 					returnData.push({
 						name: field.name,
@@ -653,12 +639,8 @@ export class FileMaker implements INodeType {
 			async getScripts(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
 				const returnData: INodePropertyOptions[] = [];
 
-				let scripts;
-				try {
-					scripts = await getScripts.call(this);
-				} catch (error) {
-					throw new NodeOperationError(this.getNode(), error as Error);
-				}
+				const scripts = await getScripts.call(this);
+
 				for (const script of scripts) {
 					if (!script.isFolder) {
 						returnData.push({
@@ -673,12 +655,8 @@ export class FileMaker implements INodeType {
 			async getPortals(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
 				const returnData: INodePropertyOptions[] = [];
 
-				let portals;
-				try {
-					portals = await getPortals.call(this);
-				} catch (error) {
-					throw new NodeOperationError(this.getNode(), error as Error);
-				}
+				const portals = await getPortals.call(this);
+
 				Object.keys(portals as IDataObject).forEach((portal) => {
 					returnData.push({
 						name: portal,
@@ -698,13 +676,14 @@ export class FileMaker implements INodeType {
 		const credentials = await this.getCredentials('fileMaker');
 
 		let token;
+
 		try {
 			token = await getToken.call(this);
 		} catch (error) {
-			throw new NodeOperationError(this.getNode(), new Error('Login fail', { cause: error }));
+			throw new NodeOperationError(this.getNode(), error as string);
 		}
 
-		let requestOptions: OptionsWithUri;
+		let requestOptions: IRequestOptions;
 
 		const host = credentials.host as string;
 		const database = credentials.db as string;
@@ -818,21 +797,19 @@ export class FileMaker implements INodeType {
 				try {
 					response = await this.helpers.request(requestOptions);
 				} catch (error) {
-					response = error.response.body;
+					response = error.error;
 				}
 
 				if (typeof response === 'string') {
 					throw new NodeOperationError(
 						this.getNode(),
-						'Response body is not valid JSON. Change "Response Format" to "String"',
+						'DataAPI response body is not valid JSON. Is the DataAPI enabled?',
 						{ itemIndex: i },
 					);
 				}
 				returnData.push({ json: response });
 			}
 		} catch (error) {
-			await logout.call(this, token as string);
-
 			if (error.node) {
 				throw error;
 			}
@@ -843,6 +820,7 @@ export class FileMaker implements INodeType {
 			);
 		}
 
-		return this.prepareOutputData(returnData);
+		await logout.call(this, token as string);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/FileMaker/GenericFunctions.ts b/packages/nodes-base/nodes/FileMaker/GenericFunctions.ts
index bab9888743714..3c3100fa6245a 100644
--- a/packages/nodes-base/nodes/FileMaker/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/FileMaker/GenericFunctions.ts
@@ -1,14 +1,12 @@
 import type {
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	ILoadOptionsFunctions,
 	IDataObject,
 	INodePropertyOptions,
 	JsonObject,
+	IRequestOptions,
 } from 'n8n-workflow';
-import { NodeApiError, NodeOperationError } from 'n8n-workflow';
-
-import type { OptionsWithUri } from 'request';
+import { ApplicationError, NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 interface ScriptsOptions {
 	script?: any;
@@ -30,9 +28,7 @@ interface ScriptObject {
 	folderScriptNames?: LayoutObject[];
 }
 
-export async function getToken(
-	this: ILoadOptionsFunctions | IExecuteFunctions | IExecuteSingleFunctions,
-): Promise<any> {
+export async function getToken(this: ILoadOptionsFunctions | IExecuteFunctions): Promise<any> {
 	const credentials = await this.getCredentials('fileMaker');
 
 	const host = credentials.host as string;
@@ -43,7 +39,7 @@ export async function getToken(
 	const url = `https://${host}/fmi/data/v1/databases/${db}/sessions`;
 
 	// Reset all values
-	const requestOptions: OptionsWithUri = {
+	const requestOptions: IRequestOptions = {
 		uri: url,
 		headers: {},
 		method: 'POST',
@@ -70,13 +66,21 @@ export async function getToken(
 		if (typeof response === 'string') {
 			throw new NodeOperationError(
 				this.getNode(),
-				'Response body is not valid JSON. Change "Response Format" to "String"',
+				'DataAPI response body is not valid JSON. Is the DataAPI enabled?',
 			);
 		}
 
 		return response.response.token;
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error as JsonObject);
+		let message;
+		if (error.statusCode === 502) {
+			message = 'The server is not responding. Is the DataAPI enabled?';
+		} else if (error.error) {
+			message = error.error.messages[0].code + ' - ' + error.error.messages[0].message;
+		} else {
+			message = error.message;
+		}
+		throw new ApplicationError(message, { level: 'warning' });
 	}
 }
 
@@ -100,7 +104,7 @@ function parseLayouts(layouts: LayoutObject[]): INodePropertyOptions[] {
  *
  */
 export async function layoutsApiRequest(
-	this: ILoadOptionsFunctions | IExecuteFunctions | IExecuteSingleFunctions,
+	this: ILoadOptionsFunctions | IExecuteFunctions,
 ): Promise<INodePropertyOptions[]> {
 	const token = await getToken.call(this);
 	const credentials = await this.getCredentials('fileMaker');
@@ -109,7 +113,7 @@ export async function layoutsApiRequest(
 	const db = credentials.db as string;
 
 	const url = `https://${host}/fmi/data/v1/databases/${db}/layouts`;
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			Authorization: `Bearer ${token}`,
 		},
@@ -141,7 +145,7 @@ export async function getFields(this: ILoadOptionsFunctions): Promise<any> {
 	const db = credentials.db as string;
 
 	const url = `https://${host}/fmi/data/v1/databases/${db}/layouts/${layout}`;
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			Authorization: `Bearer ${token}`,
 		},
@@ -172,7 +176,7 @@ export async function getPortals(this: ILoadOptionsFunctions): Promise<any> {
 	const db = credentials.db as string;
 
 	const url = `https://${host}/fmi/data/v1/databases/${db}/layouts/${layout}`;
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			Authorization: `Bearer ${token}`,
 		},
@@ -217,7 +221,7 @@ export async function getScripts(this: ILoadOptionsFunctions): Promise<any> {
 	const db = credentials.db as string;
 
 	const url = `https://${host}/fmi/data/v1/databases/${db}/scripts`;
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			Authorization: `Bearer ${token}`,
 		},
@@ -238,7 +242,7 @@ export async function getScripts(this: ILoadOptionsFunctions): Promise<any> {
 }
 
 export async function logout(
-	this: ILoadOptionsFunctions | IExecuteFunctions | IExecuteSingleFunctions,
+	this: ILoadOptionsFunctions | IExecuteFunctions,
 	token: string,
 ): Promise<any> {
 	const credentials = await this.getCredentials('fileMaker');
@@ -249,7 +253,7 @@ export async function logout(
 	const url = `https://${host}/fmi/data/v1/databases/${db}/sessions/${token}`;
 
 	// Reset all values
-	const requestOptions: OptionsWithUri = {
+	const requestOptions: IRequestOptions = {
 		uri: url,
 		headers: {},
 		method: 'DELETE',
@@ -257,25 +261,8 @@ export async function logout(
 		//rejectUnauthorized: !this.getNodeParameter('allowUnauthorizedCerts', itemIndex, false) as boolean,
 	};
 
-	try {
-		const response = await this.helpers.request(requestOptions);
-
-		if (typeof response === 'string') {
-			throw new NodeOperationError(
-				this.getNode(),
-				'Response body is not valid JSON. Change "Response Format" to "String"',
-			);
-		}
-
-		return response;
-	} catch (error) {
-		const errorMessage = `${error.response.body.messages[0].message}'(' + ${error.response.body.messages[0].message}')'`;
-
-		if (errorMessage !== undefined) {
-			throw new Error(errorMessage);
-		}
-		throw error.response.body;
-	}
+	const response = await this.helpers.request(requestOptions);
+	return response;
 }
 
 export function parseSort(this: IExecuteFunctions, i: number): object | null {
diff --git a/packages/nodes-base/nodes/FileMaker/filemaker.png b/packages/nodes-base/nodes/FileMaker/filemaker.png
index 64664575e437d..a305c06535307 100644
Binary files a/packages/nodes-base/nodes/FileMaker/filemaker.png and b/packages/nodes-base/nodes/FileMaker/filemaker.png differ
diff --git a/packages/nodes-base/nodes/Files/ConvertToFile/ConvertToFile.node.json b/packages/nodes-base/nodes/Files/ConvertToFile/ConvertToFile.node.json
new file mode 100644
index 0000000000000..ec8adf50bc2d5
--- /dev/null
+++ b/packages/nodes-base/nodes/Files/ConvertToFile/ConvertToFile.node.json
@@ -0,0 +1,36 @@
+{
+	"node": "n8n-nodes-base.convertToFile",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"categories": ["Core Nodes"],
+	"resources": {
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.converttofile/"
+			}
+		]
+	},
+	"alias": [
+		"CSV",
+		"Spreadsheet",
+		"Excel",
+		"xls",
+		"xlsx",
+		"ods",
+		"tabular",
+		"encode",
+		"encoding",
+		"Move Binary Data",
+		"Binary",
+		"File",
+		"JSON",
+		"HTML",
+		"ICS",
+		"iCal",
+		"RTF",
+		"64"
+	],
+	"subcategories": {
+		"Core Nodes": ["Files", "Data Transformation"]
+	}
+}
diff --git a/packages/nodes-base/nodes/Files/ConvertToFile/ConvertToFile.node.ts b/packages/nodes-base/nodes/Files/ConvertToFile/ConvertToFile.node.ts
new file mode 100644
index 0000000000000..a89beebb51277
--- /dev/null
+++ b/packages/nodes-base/nodes/Files/ConvertToFile/ConvertToFile.node.ts
@@ -0,0 +1,133 @@
+import type {
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+
+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';
+
+export class ConvertToFile implements INodeType {
+	// eslint-disable-next-line n8n-nodes-base/node-class-description-missing-subtitle
+	description: INodeTypeDescription = {
+		displayName: 'Convert to File',
+		name: 'convertToFile',
+		icon: 'file:convertToFile.svg',
+		group: ['input'],
+		version: [1, 1.1],
+		description: 'Convert JSON data to binary data',
+		defaults: {
+			name: 'Convert to File',
+		},
+		inputs: ['main'],
+		outputs: ['main'],
+		properties: [
+			{
+				displayName: 'Operation',
+				name: 'operation',
+				type: 'options',
+				noDataExpression: true,
+				options: [
+					{
+						name: 'Convert to CSV',
+						value: 'csv',
+						action: 'Convert to CSV',
+						description: 'Transform input data into a CSV file',
+					},
+					{
+						name: 'Convert to HTML',
+						value: 'html',
+						action: 'Convert to HTML',
+						description: 'Transform input data into a table in an HTML file',
+					},
+					{
+						name: 'Convert to ICS',
+						value: 'iCal',
+						action: 'Convert to ICS',
+						description: 'Converts each input item to an ICS event file',
+					},
+					{
+						name: 'Convert to JSON',
+						value: 'toJson',
+						action: 'Convert to JSON',
+						description: 'Transform input data into a single or multiple JSON files',
+					},
+					{
+						name: 'Convert to ODS',
+						value: 'ods',
+						action: 'Convert to ODS',
+						description: 'Transform input data into an ODS file',
+					},
+					{
+						name: 'Convert to RTF',
+						value: 'rtf',
+						action: 'Convert to RTF',
+						description: 'Transform input data into a table in an RTF file',
+					},
+					{
+						name: 'Convert to Text File',
+						value: 'toText',
+						action: 'Convert to text file',
+						description: 'Transform input data string into a file',
+					},
+					{
+						name: 'Convert to XLS',
+						value: 'xls',
+						action: 'Convert to XLS',
+						description: 'Transform input data into an Excel file',
+					},
+					{
+						name: 'Convert to XLSX',
+						value: 'xlsx',
+						action: 'Convert to XLSX',
+						description: 'Transform input data into an Excel file',
+					},
+					{
+						name: 'Move Base64 String to File',
+						value: 'toBinary',
+						action: 'Move base64 string to file',
+						description: 'Convert a base64-encoded string into its original file format',
+					},
+				],
+				default: 'csv',
+			},
+			...spreadsheet.description,
+			...toBinary.description,
+			...toText.description,
+			...toJson.description,
+			...iCall.description,
+		],
+	};
+
+	async execute(this: IExecuteFunctions) {
+		const items = this.getInputData();
+		const operation = this.getNodeParameter('operation', 0);
+		let returnData: INodeExecutionData[] = [];
+
+		if (spreadsheet.operations.includes(operation)) {
+			returnData = await spreadsheet.execute.call(this, items, operation);
+		}
+
+		if (operation === 'toJson') {
+			returnData = await toJson.execute.call(this, items);
+		}
+
+		if (operation === 'toBinary') {
+			returnData = await toBinary.execute.call(this, items);
+		}
+
+		if (operation === 'toText') {
+			returnData = await toText.execute.call(this, items);
+		}
+
+		if (operation === 'iCal') {
+			returnData = await iCall.execute.call(this, items);
+		}
+
+		return [returnData];
+	}
+}
diff --git a/packages/nodes-base/nodes/Files/ConvertToFile/actions/iCall.operation.ts b/packages/nodes-base/nodes/Files/ConvertToFile/actions/iCall.operation.ts
new file mode 100644
index 0000000000000..7fcca69b4cd0e
--- /dev/null
+++ b/packages/nodes-base/nodes/Files/ConvertToFile/actions/iCall.operation.ts
@@ -0,0 +1,20 @@
+import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
+
+import * as createEvent from '../../../ICalendar/createEvent.operation';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
+export const description: INodeProperties[] = updateDisplayOptions(
+	{
+		show: {
+			operation: ['iCal'],
+		},
+	},
+	createEvent.description,
+);
+
+export async function execute(this: IExecuteFunctions, items: INodeExecutionData[]) {
+	const returnData = await createEvent.execute.call(this, items);
+
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/Files/ConvertToFile/actions/spreadsheet.operation.ts b/packages/nodes-base/nodes/Files/ConvertToFile/actions/spreadsheet.operation.ts
new file mode 100644
index 0000000000000..eb0beca2ce95f
--- /dev/null
+++ b/packages/nodes-base/nodes/Files/ConvertToFile/actions/spreadsheet.operation.ts
@@ -0,0 +1,126 @@
+import {
+	NodeOperationError,
+	type IExecuteFunctions,
+	type INodeExecutionData,
+	type INodeProperties,
+} from 'n8n-workflow';
+
+import { generatePairedItemData, updateDisplayOptions } from '@utils/utilities';
+import type { JsonToSpreadsheetBinaryOptions, JsonToSpreadsheetBinaryFormat } from '@utils/binary';
+
+import { convertJsonToSpreadsheetBinary } from '@utils/binary';
+
+export const operations = ['csv', 'html', 'rtf', 'ods', 'xls', 'xlsx'];
+
+export const properties: INodeProperties[] = [
+	{
+		displayName: 'Put Output File in Field',
+		name: 'binaryPropertyName',
+		type: 'string',
+		default: 'data',
+		required: true,
+		placeholder: 'e.g data',
+		hint: 'The name of the output binary field to put the file in',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			{
+				displayName: 'Compression',
+				name: 'compression',
+				type: 'boolean',
+				displayOptions: {
+					show: {
+						'/operation': ['xlsx', 'ods'],
+					},
+				},
+				default: false,
+				description: 'Whether to reduce the output file size',
+			},
+			{
+				displayName: 'File Name',
+				name: 'fileName',
+				type: 'string',
+				default: '',
+				description: 'Name of the output file',
+			},
+			{
+				displayName: 'Header Row',
+				name: 'headerRow',
+				type: 'boolean',
+				default: true,
+				description: 'Whether the first row of the file contains the header names',
+			},
+			{
+				displayName: 'Sheet Name',
+				name: 'sheetName',
+				type: 'string',
+				displayOptions: {
+					show: {
+						'/operation': ['ods', 'xls', 'xlsx'],
+					},
+				},
+				default: 'Sheet',
+				description: 'Name of the sheet to create in the spreadsheet',
+				placeholder: 'e.g. mySheet',
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		operation: operations,
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	items: INodeExecutionData[],
+	operation: string,
+) {
+	let returnData: INodeExecutionData[] = [];
+
+	const pairedItem = generatePairedItemData(items.length);
+	try {
+		const options = this.getNodeParameter('options', 0, {}) as JsonToSpreadsheetBinaryOptions;
+		const binaryPropertyName = this.getNodeParameter('binaryPropertyName', 0, 'data');
+
+		const binaryData = await convertJsonToSpreadsheetBinary.call(
+			this,
+			items,
+			operation as JsonToSpreadsheetBinaryFormat,
+			options,
+			'File',
+		);
+
+		const newItem: INodeExecutionData = {
+			json: {},
+			binary: {
+				[binaryPropertyName]: binaryData,
+			},
+			pairedItem,
+		};
+
+		returnData = [newItem];
+	} catch (error) {
+		if (this.continueOnFail()) {
+			returnData.push({
+				json: {
+					error: error.message,
+				},
+				pairedItem,
+			});
+		} else {
+			throw new NodeOperationError(this.getNode(), error);
+		}
+	}
+
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/Files/ConvertToFile/actions/toBinary.operation.ts b/packages/nodes-base/nodes/Files/ConvertToFile/actions/toBinary.operation.ts
new file mode 100644
index 0000000000000..1a10bc079e12f
--- /dev/null
+++ b/packages/nodes-base/nodes/Files/ConvertToFile/actions/toBinary.operation.ts
@@ -0,0 +1,160 @@
+import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
+
+import { NodeOperationError } from 'n8n-workflow';
+
+import type { JsonToBinaryOptions } from '@utils/binary';
+import { createBinaryFromJson } from '@utils/binary';
+import { encodeDecodeOptions } from '@utils/descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+export const properties: INodeProperties[] = [
+	{
+		displayName: 'Base64 Input Field',
+		name: 'sourceProperty',
+		type: 'string',
+		default: '',
+		required: true,
+		placeholder: 'e.g data',
+		requiresDataPath: 'single',
+		description:
+			"The name of the input field that contains the base64 string to convert to a file. Use dot-notation for deep fields (e.g. 'level1.level2.currentKey').",
+	},
+	{
+		displayName: 'Put Output File in Field',
+		name: 'binaryPropertyName',
+		type: 'string',
+		default: 'data',
+		required: true,
+		placeholder: 'e.g data',
+		hint: 'The name of the output binary field to put the file in',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			{
+				displayName: 'Add Byte Order Mark (BOM)',
+				description:
+					'Whether to add special marker at the start of your text file. This marker helps some programs understand how to read the file correctly.',
+				name: 'addBOM',
+				displayOptions: {
+					show: {
+						encoding: ['utf8', 'cesu8', 'ucs2'],
+					},
+				},
+				type: 'boolean',
+				default: false,
+			},
+			{
+				displayName: 'Data Is Base64',
+				name: 'dataIsBase64',
+				type: 'boolean',
+				default: true,
+				description: 'Whether the data is already base64 encoded',
+				displayOptions: {
+					show: {
+						'@version': [1],
+					},
+				},
+			},
+			{
+				displayName: 'Encoding',
+				name: 'encoding',
+				type: 'options',
+				options: encodeDecodeOptions,
+				default: 'utf8',
+				description: 'Choose the character set to use to encode the data',
+				displayOptions: {
+					hide: {
+						dataIsBase64: [true],
+						'@version': [{ _cnd: { gt: 1 } }],
+					},
+				},
+			},
+			{
+				displayName: 'File Name',
+				name: 'fileName',
+				type: 'string',
+				default: '',
+				placeholder: 'e.g. myFile',
+				description: 'Name of the output file',
+			},
+			{
+				displayName: 'MIME Type',
+				name: 'mimeType',
+				type: 'string',
+				default: '',
+				placeholder: 'e.g text/plain',
+				description:
+					'The MIME type of the output file. <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types/Common_types" target="_blank">Common MIME types</a>.',
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		operation: ['toBinary'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, items: INodeExecutionData[]) {
+	const returnData: INodeExecutionData[] = [];
+
+	const nodeVersion = this.getNode().typeVersion;
+
+	for (let i = 0; i < items.length; i++) {
+		try {
+			const options = this.getNodeParameter('options', i, {});
+			const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i, 'data');
+			const sourceProperty = this.getNodeParameter('sourceProperty', i) as string;
+
+			let dataIsBase64 = true;
+			if (nodeVersion === 1) {
+				dataIsBase64 = options.dataIsBase64 !== false;
+			}
+
+			const jsonToBinaryOptions: JsonToBinaryOptions = {
+				sourceKey: sourceProperty,
+				fileName: options.fileName as string,
+				mimeType: options.mimeType as string,
+				dataIsBase64,
+				encoding: options.encoding as string,
+				addBOM: options.addBOM as boolean,
+				itemIndex: i,
+			};
+
+			const binaryData = await createBinaryFromJson.call(this, items[i].json, jsonToBinaryOptions);
+
+			const newItem: INodeExecutionData = {
+				json: {},
+				binary: {
+					[binaryPropertyName]: binaryData,
+				},
+				pairedItem: { item: i },
+			};
+
+			returnData.push(newItem);
+		} catch (error) {
+			if (this.continueOnFail()) {
+				returnData.push({
+					json: {
+						error: error.message,
+					},
+					pairedItem: {
+						item: i,
+					},
+				});
+				continue;
+			}
+			throw new NodeOperationError(this.getNode(), error, { itemIndex: i });
+		}
+	}
+
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/Files/ConvertToFile/actions/toJson.operation.ts b/packages/nodes-base/nodes/Files/ConvertToFile/actions/toJson.operation.ts
new file mode 100644
index 0000000000000..51b0a23105faf
--- /dev/null
+++ b/packages/nodes-base/nodes/Files/ConvertToFile/actions/toJson.operation.ts
@@ -0,0 +1,174 @@
+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';
+
+export const properties: INodeProperties[] = [
+	{
+		displayName: 'Mode',
+		name: 'mode',
+		type: 'options',
+		noDataExpression: true,
+		options: [
+			{
+				name: 'All Items to One File',
+				value: 'once',
+			},
+			{
+				name: 'Each Item to Separate File',
+				value: 'each',
+			},
+		],
+		default: 'once',
+	},
+	{
+		displayName: 'Put Output File in Field',
+		name: 'binaryPropertyName',
+		type: 'string',
+		default: 'data',
+		required: true,
+		placeholder: 'e.g data',
+		hint: 'The name of the output binary field to put the file in',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			{
+				displayName: 'Add Byte Order Mark (BOM)',
+				name: 'addBOM',
+				type: 'boolean',
+				default: false,
+				description:
+					'Whether to add special marker at the start of your text file. This marker helps some programs understand how to read the file correctly.',
+				displayOptions: {
+					show: {
+						encoding: ['utf8', 'cesu8', 'ucs2'],
+					},
+				},
+			},
+			{
+				displayName: 'Format',
+				name: 'format',
+				type: 'boolean',
+				default: false,
+				description: 'Whether to format the JSON data for easier reading',
+			},
+			{
+				displayName: 'Encoding',
+				name: 'encoding',
+				type: 'options',
+				options: encodeDecodeOptions,
+				default: 'utf8',
+				description: 'Choose the character set to use to encode the data',
+			},
+			{
+				displayName: 'File Name',
+				name: 'fileName',
+				type: 'string',
+				default: '',
+				placeholder: 'e.g. myFile.json',
+				description: 'Name of the output file',
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		operation: ['toJson'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, items: INodeExecutionData[]) {
+	let returnData: INodeExecutionData[] = [];
+
+	const mode = this.getNodeParameter('mode', 0, 'once') as string;
+	if (mode === 'once') {
+		const pairedItem = generatePairedItemData(items.length);
+		try {
+			const options = this.getNodeParameter('options', 0, {});
+			const binaryPropertyName = this.getNodeParameter('binaryPropertyName', 0, 'data');
+
+			const binaryData = await createBinaryFromJson.call(
+				this,
+				items.map((item) => item.json),
+				{
+					fileName: options.fileName as string,
+					mimeType: 'application/json',
+					encoding: options.encoding as string,
+					addBOM: options.addBOM as boolean,
+					format: options.format as boolean,
+				},
+			);
+
+			const newItem: INodeExecutionData = {
+				json: {},
+				binary: {
+					[binaryPropertyName]: binaryData,
+				},
+				pairedItem,
+			};
+
+			returnData = [newItem];
+		} catch (error) {
+			if (this.continueOnFail()) {
+				returnData.push({
+					json: {
+						error: error.message,
+					},
+					pairedItem,
+				});
+			}
+			throw new NodeOperationError(this.getNode(), error);
+		}
+	} else {
+		for (let i = 0; i < items.length; i++) {
+			try {
+				const options = this.getNodeParameter('options', i, {});
+				const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i, 'data');
+
+				const binaryData = await createBinaryFromJson.call(this, items[i].json, {
+					fileName: options.fileName as string,
+					encoding: options.encoding as string,
+					addBOM: options.addBOM as boolean,
+					format: options.format as boolean,
+					mimeType: 'application/json',
+					itemIndex: i,
+				});
+
+				const newItem: INodeExecutionData = {
+					json: {},
+					binary: {
+						[binaryPropertyName]: binaryData,
+					},
+					pairedItem: { item: i },
+				};
+
+				returnData.push(newItem);
+			} catch (error) {
+				if (this.continueOnFail()) {
+					returnData.push({
+						json: {
+							error: error.message,
+						},
+						pairedItem: {
+							item: i,
+						},
+					});
+					continue;
+				}
+				throw new NodeOperationError(this.getNode(), error, { itemIndex: i });
+			}
+		}
+	}
+
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/Files/ConvertToFile/actions/toText.operation.ts b/packages/nodes-base/nodes/Files/ConvertToFile/actions/toText.operation.ts
new file mode 100644
index 0000000000000..438165118b759
--- /dev/null
+++ b/packages/nodes-base/nodes/Files/ConvertToFile/actions/toText.operation.ts
@@ -0,0 +1,126 @@
+import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
+
+import { NodeOperationError } from 'n8n-workflow';
+
+import type { JsonToBinaryOptions } from '@utils/binary';
+import { createBinaryFromJson } from '@utils/binary';
+import { encodeDecodeOptions } from '@utils/descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+export const properties: INodeProperties[] = [
+	{
+		displayName: 'Text Input Field',
+		name: 'sourceProperty',
+		type: 'string',
+		default: '',
+		required: true,
+		placeholder: 'e.g data',
+		requiresDataPath: 'single',
+		description:
+			"The name of the input field that contains a string to convert to a file. Use dot-notation for deep fields (e.g. 'level1.level2.currentKey').",
+	},
+	{
+		displayName: 'Put Output File in Field',
+		name: 'binaryPropertyName',
+		type: 'string',
+		default: 'data',
+		required: true,
+		placeholder: 'e.g data',
+		hint: 'The name of the output binary field to put the file in',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			{
+				displayName: 'Add Byte Order Mark (BOM)',
+				description:
+					'Whether to add special marker at the start of your text file. This marker helps some programs understand how to read the file correctly.',
+				name: 'addBOM',
+				displayOptions: {
+					show: {
+						encoding: ['utf8', 'cesu8', 'ucs2'],
+					},
+				},
+				type: 'boolean',
+				default: false,
+			},
+			{
+				displayName: 'Encoding',
+				name: 'encoding',
+				type: 'options',
+				options: encodeDecodeOptions,
+				default: 'utf8',
+				description: 'Choose the character set to use to encode the data',
+			},
+			{
+				displayName: 'File Name',
+				name: 'fileName',
+				type: 'string',
+				default: '',
+				placeholder: 'e.g. myFile',
+				description: 'Name of the output file',
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		operation: ['toText'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, items: INodeExecutionData[]) {
+	const returnData: INodeExecutionData[] = [];
+
+	for (let i = 0; i < items.length; i++) {
+		try {
+			const options = this.getNodeParameter('options', i, {});
+			const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i, 'data');
+			const sourceProperty = this.getNodeParameter('sourceProperty', i) as string;
+
+			const jsonToBinaryOptions: JsonToBinaryOptions = {
+				sourceKey: sourceProperty,
+				fileName: (options.fileName as string) || 'file.txt',
+				mimeType: 'text/plain',
+				dataIsBase64: false,
+				encoding: options.encoding as string,
+				addBOM: options.addBOM as boolean,
+				itemIndex: i,
+			};
+
+			const binaryData = await createBinaryFromJson.call(this, items[i].json, jsonToBinaryOptions);
+
+			const newItem: INodeExecutionData = {
+				json: {},
+				binary: {
+					[binaryPropertyName]: binaryData,
+				},
+				pairedItem: { item: i },
+			};
+
+			returnData.push(newItem);
+		} catch (error) {
+			if (this.continueOnFail()) {
+				returnData.push({
+					json: {
+						error: error.message,
+					},
+					pairedItem: {
+						item: i,
+					},
+				});
+				continue;
+			}
+			throw new NodeOperationError(this.getNode(), error, { itemIndex: i });
+		}
+	}
+
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/Files/ConvertToFile/convertToFile.svg b/packages/nodes-base/nodes/Files/ConvertToFile/convertToFile.svg
new file mode 100644
index 0000000000000..60ca4a415a137
--- /dev/null
+++ b/packages/nodes-base/nodes/Files/ConvertToFile/convertToFile.svg
@@ -0,0 +1,12 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1147_463)">
+<path d="M170 39.8081C170 33.2867 175.287 28 181.808 28H338.41V189.59C338.41 196.218 343.782 201.59 350.41 201.59H512L512 472.893C512 479.415 506.713 484.701 500.192 484.701H181.808C177.972 484.701 174.564 482.873 172.407 480.039C175.619 477.958 178.665 475.515 181.488 472.708L271.488 383.208C282.057 372.697 288 358.406 288 343.5C288 328.594 282.057 314.303 271.488 303.792L181.488 214.292C177.969 210.793 174.103 207.858 170 205.487V39.8081Z" fill="#2244FF"/>
+<path d="M369.898 34C369.898 30.6863 372.584 28 375.898 28H378.564C381.7 28 384.708 29.2479 386.923 31.4684L508.551 153.386C510.76 155.6 512 158.599 512 161.726L512 164.102C512 167.416 509.314 170.102 506 170.102H375.898C372.584 170.102 369.898 167.416 369.898 164.102V34Z" fill="#2244FF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M125.077 415.982C115.678 425.329 115.636 440.525 124.982 449.923C134.329 459.322 149.525 459.364 158.923 450.018L248.923 360.518C253.453 356.013 256 349.888 256 343.5C256 337.112 253.453 330.987 248.923 326.482L158.923 236.982C149.525 227.636 134.329 227.678 124.982 237.077C115.636 246.475 115.678 261.671 125.077 271.018L173.327 319L12 319C5.37257 319 -4.12516e-06 324.373 -4.41485e-06 331L-5.46392e-06 355C-5.75362e-06 361.627 5.37258 367 12 367L174.333 367L125.077 415.982Z" fill="#2244FF"/>
+</g>
+<defs>
+<clipPath id="clip0_1147_463">
+<rect width="512" height="512" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/packages/nodes-base/nodes/Files/ConvertToFile/test/ConvertToFile.node.test.ts b/packages/nodes-base/nodes/Files/ConvertToFile/test/ConvertToFile.node.test.ts
new file mode 100644
index 0000000000000..ca8993a8f8538
--- /dev/null
+++ b/packages/nodes-base/nodes/Files/ConvertToFile/test/ConvertToFile.node.test.ts
@@ -0,0 +1,5 @@
+import { testWorkflows, getWorkflowFilenames } from '@test/nodes/Helpers';
+
+const workflows = getWorkflowFilenames(__dirname);
+
+describe('Test ConvertToFile Node', () => testWorkflows(workflows));
diff --git a/packages/nodes-base/nodes/Files/ConvertToFile/test/toText.workflow.json b/packages/nodes-base/nodes/Files/ConvertToFile/test/toText.workflow.json
new file mode 100644
index 0000000000000..3a855ccf9aaef
--- /dev/null
+++ b/packages/nodes-base/nodes/Files/ConvertToFile/test/toText.workflow.json
@@ -0,0 +1,357 @@
+{
+  "name": "My workflow 2",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "59f5ae0f-52f7-4bc8-b325-29d2b0d810f8",
+      "name": "When clicking \"Test workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        460,
+        500
+      ]
+    },
+    {
+      "parameters": {
+        "operation": "toText",
+        "sourceProperty": "notes",
+        "options": {}
+      },
+      "id": "add99ca3-7bd3-4561-a654-fac4b8ded285",
+      "name": "Convert to File",
+      "type": "n8n-nodes-base.convertToFile",
+      "typeVersion": 1,
+      "position": [
+        940,
+        400
+      ]
+    },
+    {
+      "parameters": {
+        "operation": "toJson",
+        "options": {
+          "format": true
+        }
+      },
+      "id": "89498c96-f1a0-49ec-890d-79f12c5554e6",
+      "name": "Convert to File1",
+      "type": "n8n-nodes-base.convertToFile",
+      "typeVersion": 1.1,
+      "position": [
+        940,
+        580
+      ]
+    },
+    {
+      "parameters": {
+        "operation": "toBinary",
+        "sourceProperty": "base64",
+        "options": {}
+      },
+      "id": "ae06c883-f2af-4d25-bc64-4f0ecad53c85",
+      "name": "Convert to File2",
+      "type": "n8n-nodes-base.convertToFile",
+      "typeVersion": 1.1,
+      "position": [
+        940,
+        200
+      ]
+    },
+    {
+      "parameters": {
+        "jsCode": "return   {\n    \"id\": \"23423532\",\n    \"name\": \"Jay Gatsby\",\n    \"email\": \"gatsby@west-egg.com\",\n    \"notes\": \"Keeps asking about a green light??\",\n    \"country\": \"US\",\n    \"created\": \"1925-04-10\",\n  \"base64\": \"VGhpcyBpcyBzb21lIHRleHQgZW5jb2RlZCBhcyBiYXNlNjQ=\"\n  }"
+      },
+      "id": "b14b18b0-6570-4376-85cf-f3cc74835e58",
+      "name": "Code",
+      "type": "n8n-nodes-base.code",
+      "typeVersion": 2,
+      "position": [
+        680,
+        500
+      ]
+    },
+    {
+      "parameters": {
+        "operation": "text",
+        "options": {}
+      },
+      "id": "76373e3f-e103-465a-8b15-dd643915c532",
+      "name": "Extract From File",
+      "type": "n8n-nodes-base.extractFromFile",
+      "typeVersion": 1,
+      "position": [
+        1160,
+        200
+      ]
+    },
+    {
+      "parameters": {
+        "operation": "text",
+        "options": {}
+      },
+      "id": "d8ba3980-873d-47d7-ad88-f5ff6c66774c",
+      "name": "Extract From File1",
+      "type": "n8n-nodes-base.extractFromFile",
+      "typeVersion": 1,
+      "position": [
+        1160,
+        400
+      ]
+    },
+    {
+      "parameters": {
+        "operation": "text",
+        "options": {}
+      },
+      "id": "34838f1e-aee5-4b17-a9ec-bd9e09789045",
+      "name": "Extract From File2",
+      "type": "n8n-nodes-base.extractFromFile",
+      "typeVersion": 1,
+      "position": [
+        1160,
+        580
+      ]
+    },
+    {
+      "parameters": {
+        "operation": "toJson",
+        "options": {}
+      },
+      "id": "a6617075-83f4-4157-9d07-7e5df0cbd9b6",
+      "name": "Convert to File3",
+      "type": "n8n-nodes-base.convertToFile",
+      "typeVersion": 1.1,
+      "position": [
+        960,
+        780
+      ]
+    },
+    {
+      "parameters": {
+        "operation": "text",
+        "options": {}
+      },
+      "id": "b2deb5a4-0f7a-4a1f-858f-17235db0b94e",
+      "name": "Extract From File3",
+      "type": "n8n-nodes-base.extractFromFile",
+      "typeVersion": 1,
+      "position": [
+        1160,
+        780
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "11022c53-136b-44a0-af32-faac16e2fa89",
+      "name": "No Operation, do nothing",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        1380,
+        200
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "f5ec42e5-8088-4a93-91ea-3a1cb4997eee",
+      "name": "No Operation, do nothing1",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        1380,
+        400
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "d7106de2-455f-428f-bdfa-fe701136bdfa",
+      "name": "No Operation, do nothing2",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        1380,
+        580
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "14dbc74c-fc0b-4339-88ea-76b3e9534de0",
+      "name": "No Operation, do nothing3",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        1380,
+        780
+      ]
+    }
+  ],
+  "pinData": {
+    "No Operation, do nothing": [
+      {
+        "json": {
+          "data": "This is some text encoded as base64"
+        }
+      }
+    ],
+    "No Operation, do nothing1": [
+      {
+        "json": {
+          "data": "Keeps asking about a green light??"
+        }
+      }
+    ],
+    "No Operation, do nothing2": [
+      {
+        "json": {
+          "data": "[\n  {\n    \"id\": \"23423532\",\n    \"name\": \"Jay Gatsby\",\n    \"email\": \"gatsby@west-egg.com\",\n    \"notes\": \"Keeps asking about a green light??\",\n    \"country\": \"US\",\n    \"created\": \"1925-04-10\",\n    \"base64\": \"VGhpcyBpcyBzb21lIHRleHQgZW5jb2RlZCBhcyBiYXNlNjQ=\"\n  }\n]"
+        }
+      }
+    ],
+    "No Operation, do nothing3": [
+      {
+        "json": {
+          "data": "[{\"id\":\"23423532\",\"name\":\"Jay Gatsby\",\"email\":\"gatsby@west-egg.com\",\"notes\":\"Keeps asking about a green light??\",\"country\":\"US\",\"created\":\"1925-04-10\",\"base64\":\"VGhpcyBpcyBzb21lIHRleHQgZW5jb2RlZCBhcyBiYXNlNjQ=\"}]"
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Test workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Code",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Code": {
+      "main": [
+        [
+          {
+            "node": "Convert to File2",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Convert to File",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Convert to File1",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Convert to File3",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Convert to File2": {
+      "main": [
+        [
+          {
+            "node": "Extract From File",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Convert to File": {
+      "main": [
+        [
+          {
+            "node": "Extract From File1",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Convert to File1": {
+      "main": [
+        [
+          {
+            "node": "Extract From File2",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Convert to File3": {
+      "main": [
+        [
+          {
+            "node": "Extract From File3",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Extract From File": {
+      "main": [
+        [
+          {
+            "node": "No Operation, do nothing",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Extract From File3": {
+      "main": [
+        [
+          {
+            "node": "No Operation, do nothing3",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Extract From File2": {
+      "main": [
+        [
+          {
+            "node": "No Operation, do nothing2",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Extract From File1": {
+      "main": [
+        [
+          {
+            "node": "No Operation, do nothing1",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "6555e00a-2c20-46f2-9a2c-fb368d557035",
+  "meta": {
+    "templateCredsSetupCompleted": true,
+    "instanceId": "be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd"
+  },
+  "id": "RSOCg1c3be66ZqVH",
+  "tags": []
+}
diff --git a/packages/nodes-base/nodes/Files/ExtractFromFile/ExtractFromFile.node.json b/packages/nodes-base/nodes/Files/ExtractFromFile/ExtractFromFile.node.json
new file mode 100644
index 0000000000000..3a2bd8ef8a79e
--- /dev/null
+++ b/packages/nodes-base/nodes/Files/ExtractFromFile/ExtractFromFile.node.json
@@ -0,0 +1,40 @@
+{
+	"node": "n8n-nodes-base.extractFromFile",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"categories": ["Core Nodes"],
+	"resources": {
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.extractfromfile/"
+			}
+		]
+	},
+	"alias": [
+		"CSV",
+		"Spreadsheet",
+		"Excel",
+		"xls",
+		"xlsx",
+		"ods",
+		"tabular",
+		"decode",
+		"decoding",
+		"Move Binary Data",
+		"Binary",
+		"File",
+		"PDF",
+		"JSON",
+		"HTML",
+		"ICS",
+		"iCal",
+		"txt",
+		"Text",
+		"RTF",
+		"XML",
+		"64"
+	],
+	"subcategories": {
+		"Core Nodes": ["Files", "Data Transformation"]
+	}
+}
diff --git a/packages/nodes-base/nodes/Files/ExtractFromFile/ExtractFromFile.node.ts b/packages/nodes-base/nodes/Files/ExtractFromFile/ExtractFromFile.node.ts
new file mode 100644
index 0000000000000..156988eefa3fc
--- /dev/null
+++ b/packages/nodes-base/nodes/Files/ExtractFromFile/ExtractFromFile.node.ts
@@ -0,0 +1,134 @@
+import type {
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+
+import * as spreadsheet from './actions/spreadsheet.operation';
+import * as moveTo from './actions/moveTo.operation';
+import * as pdf from './actions/pdf.operation';
+
+export class ExtractFromFile implements INodeType {
+	// eslint-disable-next-line n8n-nodes-base/node-class-description-missing-subtitle
+	description: INodeTypeDescription = {
+		displayName: 'Extract from File',
+		name: 'extractFromFile',
+		icon: 'file:extractFromFile.svg',
+		group: ['input'],
+		version: 1,
+		description: 'Convert binary data to JSON',
+		defaults: {
+			name: 'Extract from File',
+		},
+		inputs: ['main'],
+		outputs: ['main'],
+		properties: [
+			{
+				displayName: 'Operation',
+				name: 'operation',
+				type: 'options',
+				noDataExpression: true,
+				// eslint-disable-next-line n8n-nodes-base/node-param-options-type-unsorted-items
+				options: [
+					{
+						name: 'Extract From CSV',
+						value: 'csv',
+						action: 'Extract from CSV',
+						description: 'Transform a CSV file into output items',
+					},
+					{
+						name: 'Extract From HTML',
+						value: 'html',
+						action: 'Extract from HTML',
+						description: 'Transform a table in an HTML file into output items',
+					},
+					{
+						name: 'Extract From ICS',
+						value: 'fromIcs',
+						action: 'Extract from ICS',
+						description: 'Transform a ICS file into output items',
+					},
+					{
+						name: 'Extract From JSON',
+						value: 'fromJson',
+						action: 'Extract from JSON',
+						description: 'Transform a JSON file into output items',
+					},
+					{
+						name: 'Extract From ODS',
+						value: 'ods',
+						action: 'Extract from ODS',
+						description: 'Transform an ODS file into output items',
+					},
+					{
+						name: 'Extract From PDF',
+						value: 'pdf',
+						action: 'Extract from PDF',
+						description: 'Extracts the content and metadata from a PDF file',
+					},
+					{
+						name: 'Extract From RTF',
+						value: 'rtf',
+						action: 'Extract from RTF',
+						description: 'Transform a table in an RTF file into output items',
+					},
+					{
+						name: 'Extract From Text File',
+						value: 'text',
+						action: 'Extract from text file',
+						description: 'Extracts the content of a text file',
+					},
+					{
+						name: 'Extract From XML',
+						value: 'xml',
+						action: 'Extract from XML',
+						description: 'Extracts the content of an XML file',
+					},
+					{
+						name: 'Extract From XLS',
+						value: 'xls',
+						action: 'Extract from XLS',
+						description: 'Transform an Excel file into output items',
+					},
+					{
+						name: 'Extract From XLSX',
+						value: 'xlsx',
+						action: 'Extract from XLSX',
+						description: 'Transform an Excel file into output items',
+					},
+					{
+						name: 'Move File to Base64 String',
+						value: 'binaryToPropery',
+						action: 'Move file to base64 string',
+						description: 'Convert a file into a base64-encoded string',
+					},
+				],
+				default: 'csv',
+			},
+			...spreadsheet.description,
+			...moveTo.description,
+			...pdf.description,
+		],
+	};
+
+	async execute(this: IExecuteFunctions) {
+		const items = this.getInputData();
+		const operation = this.getNodeParameter('operation', 0);
+		let returnData: INodeExecutionData[] = [];
+
+		if (spreadsheet.operations.includes(operation)) {
+			returnData = await spreadsheet.execute.call(this, items, 'operation');
+		}
+
+		if (['binaryToPropery', 'fromJson', 'text', 'fromIcs', 'xml'].includes(operation)) {
+			returnData = await moveTo.execute.call(this, items, operation);
+		}
+
+		if (operation === 'pdf') {
+			returnData = await pdf.execute.call(this, items);
+		}
+
+		return [returnData];
+	}
+}
diff --git a/packages/nodes-base/nodes/Files/ExtractFromFile/actions/moveTo.operation.ts b/packages/nodes-base/nodes/Files/ExtractFromFile/actions/moveTo.operation.ts
new file mode 100644
index 0000000000000..52647747d46ae
--- /dev/null
+++ b/packages/nodes-base/nodes/Files/ExtractFromFile/actions/moveTo.operation.ts
@@ -0,0 +1,191 @@
+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';
+
+export const properties: INodeProperties[] = [
+	{
+		displayName: 'Input Binary Field',
+		name: 'binaryPropertyName',
+		type: 'string',
+		default: 'data',
+		required: true,
+		placeholder: 'e.g data',
+		hint: 'The name of the input field containing the file data to be processed',
+	},
+	{
+		displayName: 'Destination Output Field',
+		name: 'destinationKey',
+		type: 'string',
+		default: 'data',
+		required: true,
+		placeholder: 'e.g data',
+		description: 'The name of the output field that will contain the extracted data',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			{
+				displayName: 'File Encoding',
+				name: 'encoding',
+				type: 'options',
+				options: encodeDecodeOptions,
+				default: 'utf8',
+				description: 'Specify the encoding of the file, defaults to UTF-8',
+			},
+			{
+				displayName: 'Strip BOM',
+				name: 'stripBOM',
+				displayOptions: {
+					show: {
+						encoding: ['utf8', 'cesu8', 'ucs2'],
+					},
+				},
+				type: 'boolean',
+				default: true,
+				description:
+					'Whether to strip the BOM (Byte Order Mark) from the file, this could help in an environment where the presence of the BOM is causing issues or inconsistencies',
+			},
+			{
+				displayName: 'Keep Source',
+				name: 'keepSource',
+				type: 'options',
+				default: 'json',
+				options: [
+					{
+						name: 'JSON',
+						value: 'json',
+						description: 'Include JSON data of the input item',
+					},
+					{
+						name: 'Binary',
+						value: 'binary',
+						description: 'Include binary data of the input item',
+					},
+					{
+						name: 'Both',
+						value: 'both',
+						description: 'Include both JSON and binary data of the input item',
+					},
+				],
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		operation: ['binaryToPropery', 'fromJson', 'text', 'fromIcs', 'xml'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	items: INodeExecutionData[],
+	operation: string,
+) {
+	const returnData: INodeExecutionData[] = [];
+
+	for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
+		try {
+			const item = items[itemIndex];
+			const options = this.getNodeParameter('options', itemIndex);
+			const binaryPropertyName = this.getNodeParameter('binaryPropertyName', itemIndex);
+
+			const newItem: INodeExecutionData = {
+				json: {},
+				pairedItem: { item: itemIndex },
+			};
+
+			const value = get(item.binary, binaryPropertyName);
+
+			if (!value) continue;
+
+			const encoding = (options.encoding as string) || 'utf8';
+			const buffer = await this.helpers.getBinaryDataBuffer(itemIndex, binaryPropertyName);
+
+			if (options.keepSource && options.keepSource !== 'binary') {
+				newItem.json = deepCopy(item.json);
+			}
+
+			let convertedValue: string | IDataObject;
+			if (operation !== 'binaryToPropery') {
+				convertedValue = iconv.decode(buffer, encoding, {
+					stripBOM: options.stripBOM as boolean,
+				});
+			} else {
+				convertedValue = Buffer.from(buffer).toString(BINARY_ENCODING);
+			}
+
+			if (operation === 'fromJson') {
+				if (convertedValue === '') {
+					convertedValue = {};
+				} else {
+					convertedValue = jsonParse(convertedValue);
+				}
+			}
+
+			if (operation === 'fromIcs') {
+				convertedValue = icsCalendarToObject(convertedValue as string);
+			}
+
+			const destinationKey = this.getNodeParameter('destinationKey', itemIndex, '') as string;
+			set(newItem.json, destinationKey, convertedValue);
+
+			if (options.keepSource === 'binary' || options.keepSource === 'both') {
+				newItem.binary = item.binary;
+			} else {
+				// this binary data would not be included, but there also might be other binary data
+				// which should be included, copy it over and unset current binary data
+				newItem.binary = deepCopy(item.binary);
+				unset(newItem.binary, binaryPropertyName);
+			}
+
+			returnData.push(newItem);
+		} catch (error) {
+			let errorDescription;
+			if (error.message.includes('Unexpected token')) {
+				error.message = "The file selected in 'Input Binary Field' is not in JSON format";
+				errorDescription =
+					"Try to change the operation or select a JSON file in 'Input Binary Field'";
+			}
+			if (this.continueOnFail()) {
+				returnData.push({
+					json: {
+						error: error.message,
+					},
+					pairedItem: {
+						item: itemIndex,
+					},
+				});
+				continue;
+			}
+			throw new NodeOperationError(this.getNode(), error, {
+				itemIndex,
+				description: errorDescription,
+			});
+		}
+	}
+
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/Files/ExtractFromFile/actions/pdf.operation.ts b/packages/nodes-base/nodes/Files/ExtractFromFile/actions/pdf.operation.ts
new file mode 100644
index 0000000000000..59473851459f2
--- /dev/null
+++ b/packages/nodes-base/nodes/Files/ExtractFromFile/actions/pdf.operation.ts
@@ -0,0 +1,141 @@
+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';
+
+export const properties: INodeProperties[] = [
+	{
+		displayName: 'Input Binary Field',
+		name: 'binaryPropertyName',
+		type: 'string',
+		default: 'data',
+		required: true,
+		placeholder: 'e.g data',
+		hint: 'The name of the input binary field containing the file to be extracted',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			{
+				displayName: 'Join Pages',
+				name: 'joinPages',
+				type: 'boolean',
+				default: true,
+				description:
+					'Whether to join the text from all pages or return an array of text from each page',
+			},
+			{
+				displayName: 'Keep Source',
+				name: 'keepSource',
+				type: 'options',
+				default: 'json',
+				options: [
+					{
+						name: 'JSON',
+						value: 'json',
+						description: 'Include JSON data of the input item',
+					},
+					{
+						name: 'Binary',
+						value: 'binary',
+						description: 'Include binary data of the input item',
+					},
+					{
+						name: 'Both',
+						value: 'both',
+						description: 'Include both JSON and binary data of the input item',
+					},
+				],
+			},
+			{
+				displayName: 'Max Pages',
+				name: 'maxPages',
+				type: 'number',
+				default: 0,
+				description: 'Maximum number of pages to include',
+			},
+			{
+				displayName: 'Password',
+				name: 'password',
+				type: 'string',
+				typeOptions: { password: true },
+				default: '',
+				description: 'Prowide password, if the PDF is encrypted',
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		operation: ['pdf'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, items: INodeExecutionData[]) {
+	const returnData: INodeExecutionData[] = [];
+
+	for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
+		try {
+			const item = items[itemIndex];
+			const options = this.getNodeParameter('options', itemIndex);
+			const binaryPropertyName = this.getNodeParameter('binaryPropertyName', itemIndex);
+
+			const json = await extractDataFromPDF.call(
+				this,
+				binaryPropertyName,
+				options.password as string,
+				options.maxPages as number,
+				options.joinPages as boolean,
+				itemIndex,
+			);
+
+			const newItem: INodeExecutionData = {
+				json: {},
+				pairedItem: { item: itemIndex },
+			};
+
+			if (options.keepSource && options.keepSource !== 'binary') {
+				newItem.json = { ...deepCopy(item.json), ...json };
+			} else {
+				newItem.json = json;
+			}
+
+			if (options.keepSource === 'binary' || options.keepSource === 'both') {
+				newItem.binary = item.binary;
+			} else {
+				// this binary data would not be included, but there also might be other binary data
+				// which should be included, copy it over and unset current binary data
+				newItem.binary = deepCopy(item.binary);
+				unset(newItem.binary, binaryPropertyName);
+			}
+
+			returnData.push(newItem);
+		} catch (error) {
+			if (this.continueOnFail()) {
+				returnData.push({
+					json: {
+						error: error.message,
+					},
+					pairedItem: {
+						item: itemIndex,
+					},
+				});
+				continue;
+			}
+			throw new NodeOperationError(this.getNode(), error, { itemIndex });
+		}
+	}
+
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/Files/ExtractFromFile/actions/spreadsheet.operation.ts b/packages/nodes-base/nodes/Files/ExtractFromFile/actions/spreadsheet.operation.ts
new file mode 100644
index 0000000000000..61530374386af
--- /dev/null
+++ b/packages/nodes-base/nodes/Files/ExtractFromFile/actions/spreadsheet.operation.ts
@@ -0,0 +1,59 @@
+import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
+
+import * as fromFile from '../../../SpreadsheetFile/v2/fromFile.operation';
+
+export const operations = ['csv', 'html', 'rtf', 'ods', 'xls', 'xlsx'];
+
+export const description: INodeProperties[] = fromFile.description
+	.filter((property) => property.name !== 'fileFormat')
+	.map((property) => {
+		const newProperty = { ...property };
+		newProperty.displayOptions = {
+			show: {
+				operation: operations,
+			},
+		};
+
+		if (newProperty.name === 'options') {
+			newProperty.options = (newProperty.options as INodeProperties[]).map((option) => {
+				let newOption = option;
+				if (['delimiter', 'fromLine', 'maxRowCount', 'enableBOM'].includes(option.name)) {
+					newOption = { ...option, displayOptions: { show: { '/operation': ['csv'] } } };
+				}
+				if (option.name === 'sheetName') {
+					newOption = {
+						...option,
+						displayOptions: { show: { '/operation': ['ods', 'xls', 'xlsx'] } },
+						description: 'Name of the sheet to read from in the spreadsheet',
+					};
+				}
+				if (option.name === 'range') {
+					newOption = {
+						...option,
+						displayOptions: { show: { '/operation': ['ods', 'xls', 'xlsx'] } },
+					};
+				}
+				if (['includeEmptyCells', 'headerRow'].includes(option.name)) {
+					newOption = {
+						...option,
+						displayOptions: { show: { '/operation': ['ods', 'xls', 'xlsx', 'csv', 'html'] } },
+					};
+				}
+				return newOption;
+			});
+		}
+		return newProperty;
+	});
+
+export async function execute(
+	this: IExecuteFunctions,
+	items: INodeExecutionData[],
+	fileFormatProperty: string,
+) {
+	const returnData: INodeExecutionData[] = await fromFile.execute.call(
+		this,
+		items,
+		fileFormatProperty,
+	);
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/Files/ExtractFromFile/extractFromFile.svg b/packages/nodes-base/nodes/Files/ExtractFromFile/extractFromFile.svg
new file mode 100644
index 0000000000000..2c235b7a2d9d8
--- /dev/null
+++ b/packages/nodes-base/nodes/Files/ExtractFromFile/extractFromFile.svg
@@ -0,0 +1,5 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 39.8158C0 33.2901 5.28667 28 11.8081 28H168.41V189.704C168.41 196.331 173.782 201.704 180.41 201.704H342L342 287H268C243.699 287 224 306.699 224 331V355C224 379.301 243.699 399 268 399L342 399L342 473.184C342 479.71 336.713 485 330.192 485H11.8081C5.28667 485 0 479.71 0 473.184V39.8158Z" fill="#003355"/>
+<path d="M199.898 34C199.898 30.6863 202.584 28 205.898 28H208.564C211.7 28 214.708 29.2487 216.923 31.4707L338.551 153.468C340.76 155.683 342 158.684 342 161.813L342 164.195C342 167.509 339.314 170.195 336 170.195H205.898C202.584 170.195 199.898 167.509 199.898 164.195V34Z" fill="#003355"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M381.077 415.982C371.678 425.329 371.636 440.525 380.982 449.923C390.329 459.322 405.525 459.364 414.923 450.018L504.923 360.518C509.453 356.013 512 349.888 512 343.5C512 337.112 509.453 330.987 504.923 326.482L414.923 236.982C405.525 227.636 390.329 227.678 380.982 237.077C371.636 246.475 371.678 261.671 381.077 271.018L429.327 319L268 319C261.373 319 256 324.373 256 331L256 355C256 361.627 261.373 367 268 367L430.333 367L381.077 415.982Z" fill="#003355"/>
+</svg>
diff --git a/packages/nodes-base/nodes/Files/ReadWriteFile/ReadWriteFile.node.json b/packages/nodes-base/nodes/Files/ReadWriteFile/ReadWriteFile.node.json
new file mode 100644
index 0000000000000..57bdf62dd7d35
--- /dev/null
+++ b/packages/nodes-base/nodes/Files/ReadWriteFile/ReadWriteFile.node.json
@@ -0,0 +1,17 @@
+{
+	"node": "n8n-nodes-base.readWriteFile",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"categories": ["Core Nodes"],
+	"resources": {
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.filesreadwrite/"
+			}
+		]
+	},
+	"alias": ["Binary", "File", "Text", "Open", "Import", "Save", "Export", "Disk", "Transfer"],
+	"subcategories": {
+		"Core Nodes": ["Files"]
+	}
+}
diff --git a/packages/nodes-base/nodes/Files/ReadWriteFile/ReadWriteFile.node.ts b/packages/nodes-base/nodes/Files/ReadWriteFile/ReadWriteFile.node.ts
new file mode 100644
index 0000000000000..9c4b95d17031e
--- /dev/null
+++ b/packages/nodes-base/nodes/Files/ReadWriteFile/ReadWriteFile.node.ts
@@ -0,0 +1,73 @@
+import type {
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+
+import * as read from './actions/read.operation';
+import * as write from './actions/write.operation';
+
+export class ReadWriteFile implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Read/Write Files from Disk',
+		name: 'readWriteFile',
+		icon: 'file:readWriteFile.svg',
+		group: ['input'],
+		version: 1,
+		description: 'Read or write files from the computer that runs n8n',
+		defaults: {
+			name: 'Read/Write Files from Disk',
+		},
+		inputs: ['main'],
+		outputs: ['main'],
+		properties: [
+			{
+				displayName:
+					'Use this node to read and write files on the same computer running n8n. To handle files between different computers please use other nodes (e.g. FTP, HTTP Request, AWS).',
+				name: 'info',
+				type: 'notice',
+				default: '',
+			},
+			{
+				displayName: 'Operation',
+				name: 'operation',
+				type: 'options',
+				noDataExpression: true,
+				options: [
+					{
+						name: 'Read File(s) From Disk',
+						value: 'read',
+						description: 'Retrieve one or more files from the computer that runs n8n',
+						action: 'Read File(s) From Disk',
+					},
+					{
+						name: 'Write File to Disk',
+						value: 'write',
+						description: 'Create a binary file on the computer that runs n8n',
+						action: 'Write File to Disk',
+					},
+				],
+				default: 'read',
+			},
+			...read.description,
+			...write.description,
+		],
+	};
+
+	async execute(this: IExecuteFunctions) {
+		const operation = this.getNodeParameter('operation', 0, 'read');
+		const items = this.getInputData();
+		let returnData: INodeExecutionData[] = [];
+
+		if (operation === 'read') {
+			returnData = await read.execute.call(this, items);
+		}
+
+		if (operation === 'write') {
+			returnData = await write.execute.call(this, items);
+		}
+
+		return [returnData];
+	}
+}
diff --git a/packages/nodes-base/nodes/Files/ReadWriteFile/actions/read.operation.ts b/packages/nodes-base/nodes/Files/ReadWriteFile/actions/read.operation.ts
new file mode 100644
index 0000000000000..4074f197cb35d
--- /dev/null
+++ b/packages/nodes-base/nodes/Files/ReadWriteFile/actions/read.operation.ts
@@ -0,0 +1,144 @@
+import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
+
+import glob from 'fast-glob';
+import { errorMapper } from '../helpers/utils';
+import { updateDisplayOptions } from '@utils/utilities';
+
+export const properties: INodeProperties[] = [
+	{
+		displayName: 'File(s) Selector',
+		name: 'fileSelector',
+		type: 'string',
+		default: '',
+		required: true,
+		placeholder: 'e.g. /home/user/Pictures/**/*.png',
+		hint: 'Supports patterns, learn more <a href="https://github.com/micromatch/picomatch#basic-globbing" target="_blank">here</a>',
+		description: "Specify a file's path or path pattern to read multiple files",
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			{
+				displayName: 'File Extension',
+				name: 'fileExtension',
+				type: 'string',
+				default: '',
+				placeholder: 'e.g. zip',
+				description: 'Extension of the file in the output binary',
+			},
+			{
+				displayName: 'File Name',
+				name: 'fileName',
+				type: 'string',
+				default: '',
+				placeholder: 'e.g. data.zip',
+				description: 'Name of the file in the output binary',
+			},
+			{
+				displayName: 'Mime Type',
+				name: 'mimeType',
+				type: 'string',
+				default: '',
+				placeholder: 'e.g. application/zip',
+				description: 'Mime type of the file in the output binary',
+			},
+			{
+				displayName: 'Put Output File in Field',
+				name: 'dataPropertyName',
+				type: 'string',
+				default: 'data',
+				placeholder: 'e.g. data',
+				description: "By default 'data' is used",
+				hint: 'The name of the output binary field to put the file in',
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		operation: ['read'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, items: INodeExecutionData[]) {
+	const returnData: INodeExecutionData[] = [];
+	let fileSelector;
+
+	for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
+		try {
+			fileSelector = this.getNodeParameter('fileSelector', itemIndex) as string;
+			const options = this.getNodeParameter('options', itemIndex, {});
+
+			let dataPropertyName = 'data';
+
+			if (options.dataPropertyName) {
+				dataPropertyName = options.dataPropertyName as string;
+			}
+
+			const files = await glob(fileSelector);
+
+			const newItems: INodeExecutionData[] = [];
+			for (const filePath of files) {
+				const stream = await this.helpers.createReadStream(filePath);
+				const binaryData = await this.helpers.prepareBinaryData(stream, filePath);
+
+				if (options.fileName !== undefined) {
+					binaryData.fileName = options.fileName as string;
+				}
+
+				if (options.fileExtension !== undefined) {
+					binaryData.fileExtension = options.fileExtension as string;
+				}
+
+				if (options.mimeType !== undefined) {
+					binaryData.mimeType = options.mimeType as string;
+				}
+
+				newItems.push({
+					binary: {
+						[dataPropertyName]: binaryData,
+					},
+					json: {
+						mimeType: binaryData.mimeType,
+						fileType: binaryData.fileType,
+						fileName: binaryData.fileName,
+						directory: binaryData.directory,
+						fileExtension: binaryData.fileExtension,
+						fileSize: binaryData.fileSize,
+					},
+					pairedItem: {
+						item: itemIndex,
+					},
+				});
+			}
+
+			returnData.push(...newItems);
+		} catch (error) {
+			const nodeOperatioinError = errorMapper.call(this, error, itemIndex, {
+				filePath: fileSelector,
+				operation: 'read',
+			});
+			if (this.continueOnFail()) {
+				returnData.push({
+					json: {
+						error: nodeOperatioinError.message,
+					},
+					pairedItem: {
+						item: itemIndex,
+					},
+				});
+				continue;
+			}
+			throw nodeOperatioinError;
+		}
+	}
+
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/Files/ReadWriteFile/actions/write.operation.ts b/packages/nodes-base/nodes/Files/ReadWriteFile/actions/write.operation.ts
new file mode 100644
index 0000000000000..c03a0272d1ad8
--- /dev/null
+++ b/packages/nodes-base/nodes/Files/ReadWriteFile/actions/write.operation.ts
@@ -0,0 +1,122 @@
+import type { Readable } from 'stream';
+import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
+import { BINARY_ENCODING } from 'n8n-workflow';
+
+import { errorMapper } from '../helpers/utils';
+import { updateDisplayOptions } from '@utils/utilities';
+
+export const properties: INodeProperties[] = [
+	{
+		displayName: 'File Path and Name',
+		name: 'fileName',
+		type: 'string',
+		default: '',
+		required: true,
+		placeholder: 'e.g. /data/example.jpg',
+		description:
+			'Path and name of the file that should be written. Also include the file extension.',
+	},
+	{
+		displayName: 'Input Binary Field',
+		name: 'dataPropertyName',
+		type: 'string',
+		default: 'data',
+		placeholder: 'e.g. data',
+		required: true,
+		hint: 'The name of the input binary field containing the file to be written',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			{
+				displayName: 'Append',
+				name: 'append',
+				type: 'boolean',
+				default: false,
+				description:
+					"Whether to append to an existing file. While it's commonly used with text files, it's not limited to them, however, it wouldn't be applicable for file types that have a specific structure like most binary formats.",
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		operation: ['write'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, items: INodeExecutionData[]) {
+	const returnData: INodeExecutionData[] = [];
+	let fileName;
+
+	let item: INodeExecutionData;
+	for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
+		try {
+			const dataPropertyName = this.getNodeParameter('dataPropertyName', itemIndex);
+			fileName = this.getNodeParameter('fileName', itemIndex) as string;
+			const options = this.getNodeParameter('options', itemIndex, {});
+			const flag: string = options.append ? 'a' : 'w';
+
+			item = items[itemIndex];
+
+			const newItem: INodeExecutionData = {
+				json: {},
+				pairedItem: {
+					item: itemIndex,
+				},
+			};
+			Object.assign(newItem.json, item.json);
+
+			const binaryData = this.helpers.assertBinaryData(itemIndex, dataPropertyName);
+
+			let fileContent: Buffer | Readable;
+			if (binaryData.id) {
+				fileContent = await this.helpers.getBinaryStream(binaryData.id);
+			} else {
+				fileContent = Buffer.from(binaryData.data, BINARY_ENCODING);
+			}
+
+			// Write the file to disk
+			await this.helpers.writeContentToFile(fileName, fileContent, flag);
+
+			if (item.binary !== undefined) {
+				// Create a shallow copy of the binary data so that the old
+				// data references which do not get changed still stay behind
+				// but the incoming data does not get changed.
+				newItem.binary = {};
+				Object.assign(newItem.binary, item.binary);
+			}
+
+			// Add the file name to data
+			newItem.json.fileName = fileName;
+
+			returnData.push(newItem);
+		} catch (error) {
+			const nodeOperatioinError = errorMapper.call(this, error, itemIndex, {
+				filePath: fileName,
+				operation: 'write',
+			});
+			if (this.continueOnFail()) {
+				returnData.push({
+					json: {
+						error: nodeOperatioinError.message,
+					},
+					pairedItem: {
+						item: itemIndex,
+					},
+				});
+				continue;
+			}
+			throw nodeOperatioinError;
+		}
+	}
+
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/Files/ReadWriteFile/helpers/utils.ts b/packages/nodes-base/nodes/Files/ReadWriteFile/helpers/utils.ts
new file mode 100644
index 0000000000000..8ecbb66706f29
--- /dev/null
+++ b/packages/nodes-base/nodes/Files/ReadWriteFile/helpers/utils.ts
@@ -0,0 +1,32 @@
+import type { IDataObject, IExecuteFunctions } from 'n8n-workflow';
+import { NodeOperationError } from 'n8n-workflow';
+
+export function errorMapper(
+	this: IExecuteFunctions,
+	error: Error,
+	itemIndex: number,
+	context?: IDataObject,
+) {
+	let message;
+	let description;
+
+	if (error.message.includes('Cannot create a string longer than')) {
+		message = 'The file is too large';
+		description =
+			'The binary file you are attempting to read exceeds 512MB, which is limit when using default binary data mode, try using the filesystem binary mode. More information <a href="https://docs.n8n.io/hosting/scaling/binary-data/" target="_blank">here</a>.';
+	} else if (error.message.includes('EACCES') && context?.operation === 'read') {
+		const path =
+			((error as unknown as IDataObject).path as string) || (context?.filePath as string);
+		message = `You don't have the permissions to access ${path}`;
+		description =
+			"Verify that the path specified in 'File(s) Selector' is correct, or change the file(s) permissions if needed";
+	} else if (error.message.includes('EACCES') && context?.operation === 'write') {
+		const path =
+			((error as unknown as IDataObject).path as string) || (context?.filePath as string);
+		message = `You don't have the permissions to write the file ${path}`;
+		description =
+			"Specify another destination folder in 'File Path and Name', or change the permissions of the parent folder";
+	}
+
+	return new NodeOperationError(this.getNode(), error, { itemIndex, message, description });
+}
diff --git a/packages/nodes-base/nodes/Files/ReadWriteFile/readWriteFile.svg b/packages/nodes-base/nodes/Files/ReadWriteFile/readWriteFile.svg
new file mode 100644
index 0000000000000..288224b9563e9
--- /dev/null
+++ b/packages/nodes-base/nodes/Files/ReadWriteFile/readWriteFile.svg
@@ -0,0 +1,13 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1141_1547)">
+<path d="M0 12C0 5.37258 5.37258 0 12 0H159V154C159 160.627 164.373 166 171 166H325V242H228.562C210.895 242 194.656 251.705 186.288 267.264L129.203 373.407C125.131 380.978 123 389.44 123 398.037V434H12C5.37257 434 0 428.627 0 422V12Z" fill="#44AA44"/>
+<path d="M325 134V127.401C325 124.223 323.74 121.175 321.495 118.925L206.369 3.52481C204.118 1.2682 201.061 0 197.873 0H191V134H325Z" fill="#44AA44"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M228.563 274C222.674 274 217.261 277.235 214.472 282.421L172.211 361H492.64L444.67 281.717C441.772 276.927 436.58 274 430.981 274H228.563Z" fill="#44AA44"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M155 409C155 400.163 162.163 393 171 393H496C504.837 393 512 400.163 512 409V496C512 504.837 504.837 512 496 512H171C162.163 512 155 504.837 155 496V409ZM397 453C397 466.255 386.255 477 373 477C359.745 477 349 466.255 349 453C349 439.745 359.745 429 373 429C386.255 429 397 439.745 397 453ZM445 477C458.255 477 469 466.255 469 453C469 439.745 458.255 429 445 429C431.745 429 421 439.745 421 453C421 466.255 431.745 477 445 477Z" fill="#44AA44"/>
+</g>
+<defs>
+<clipPath id="clip0_1141_1547">
+<rect width="512" height="512" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/packages/nodes-base/nodes/Files/ReadWriteFile/test/ReadWriteFile.test.ts b/packages/nodes-base/nodes/Files/ReadWriteFile/test/ReadWriteFile.test.ts
new file mode 100644
index 0000000000000..38c8d0057e9c2
--- /dev/null
+++ b/packages/nodes-base/nodes/Files/ReadWriteFile/test/ReadWriteFile.test.ts
@@ -0,0 +1,101 @@
+/* eslint-disable @typescript-eslint/no-loop-func */
+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 () => {
+		await Helpers.initBinaryDataService();
+	});
+
+	const temporaryDir = Helpers.createTemporaryDir();
+	const directory = __dirname.replace(/\\/gi, '/');
+
+	const workflow = Helpers.readJsonFileSync(
+		'nodes/Files/ReadWriteFile/test/ReadWriteFile.workflow.json',
+	);
+
+	const readFileNode = workflow.nodes.find((n: any) => n.name === 'Read from Disk');
+	readFileNode.parameters.fileSelector = `${directory}/image.jpg`;
+
+	const writeFileNode = workflow.nodes.find((n: any) => n.name === 'Write to Disk');
+	writeFileNode.parameters.fileName = `${temporaryDir}/image-written.jpg`;
+
+	const tests: WorkflowTestData[] = [
+		{
+			description: 'nodes/Files/ReadWriteFile/test/ReadWriteFile.workflow.json',
+			input: {
+				workflowData: workflow,
+			},
+			output: {
+				nodeData: {
+					'Read from Disk': [
+						[
+							{
+								json: {
+									directory,
+									fileExtension: 'jpg',
+									fileName: 'image.jpg',
+									fileSize: '1.04 kB',
+									fileType: 'image',
+									mimeType: 'image/jpeg',
+								},
+								binary: {
+									data: {
+										mimeType: 'image/jpeg',
+										fileType: 'image',
+										fileExtension: 'jpg',
+										data: '/9j/4AAQSkZJRgABAQEASABIAAD/4QBmRXhpZgAATU0AKgAAAAgABAEaAAUAAAABAAAAPgEbAAUAAAABAAAARgEoAAMAAAABAAIAAAExAAIAAAAQAAAATgAAAAAAARlJAAAD6AABGUkAAAPocGFpbnQubmV0IDUuMC4xAP/bAEMAIBYYHBgUIBwaHCQiICYwUDQwLCwwYkZKOlB0Znp4cmZwboCQuJyAiK6KbnCg2qKuvsTO0M58muLy4MjwuMrOxv/bAEMBIiQkMCowXjQ0XsaEcITGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxv/AABEIAB8AOwMBEgACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/AOgqgrXF2zNHJ5aKcD3oNPZ23di/VKG82bkuTh1OMgdaAdOSLtZ6G5ut0iSeWoOAKAdO27NCqUN8oQrcHDqccDrQDpyRNPdRwEKcsx7CobIebPLORwThc0inGMF724jagNpxG4OOM1dIDAgjIPBpkqUOxnR2pmh85pW3nJB9KkNi4yqTssZ6rSNXNX0ehHFfusYDLuI7+tXY4I40ChQcdzQRKcL7Fb7PcQO32cqUY5we1XqZPtH11KsFoFDGYK7sckkZxVqgTnJlEQXMBZYGUoTkZ7VeoH7RvcqwWaIh80K7k5JIq1QJzkyhbMtvdSxMdqnlc1amgjmx5i5I70inNSVpFdrmaWRltkBVerHvUW57B2AUNGxyOaC+VW9xXLVrcGbcjrtkXqKZZxvveeTAL9APSgiooq1ty3RTMj//2Q==',
+										directory,
+										fileName: 'image.jpg',
+										fileSize: '1.04 kB',
+									},
+								},
+							},
+						],
+					],
+					'Write to Disk': [
+						[
+							{
+								json: {
+									directory,
+									fileExtension: 'jpg',
+									fileName: writeFileNode.parameters.fileName,
+									fileSize: '1.04 kB',
+									fileType: 'image',
+									mimeType: 'image/jpeg',
+								},
+								binary: {
+									data: {
+										mimeType: 'image/jpeg',
+										fileType: 'image',
+										fileExtension: 'jpg',
+										data: '/9j/4AAQSkZJRgABAQEASABIAAD/4QBmRXhpZgAATU0AKgAAAAgABAEaAAUAAAABAAAAPgEbAAUAAAABAAAARgEoAAMAAAABAAIAAAExAAIAAAAQAAAATgAAAAAAARlJAAAD6AABGUkAAAPocGFpbnQubmV0IDUuMC4xAP/bAEMAIBYYHBgUIBwaHCQiICYwUDQwLCwwYkZKOlB0Znp4cmZwboCQuJyAiK6KbnCg2qKuvsTO0M58muLy4MjwuMrOxv/bAEMBIiQkMCowXjQ0XsaEcITGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxv/AABEIAB8AOwMBEgACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/AOgqgrXF2zNHJ5aKcD3oNPZ23di/VKG82bkuTh1OMgdaAdOSLtZ6G5ut0iSeWoOAKAdO27NCqUN8oQrcHDqccDrQDpyRNPdRwEKcsx7CobIebPLORwThc0inGMF724jagNpxG4OOM1dIDAgjIPBpkqUOxnR2pmh85pW3nJB9KkNi4yqTssZ6rSNXNX0ehHFfusYDLuI7+tXY4I40ChQcdzQRKcL7Fb7PcQO32cqUY5we1XqZPtH11KsFoFDGYK7sckkZxVqgTnJlEQXMBZYGUoTkZ7VeoH7RvcqwWaIh80K7k5JIq1QJzkyhbMtvdSxMdqnlc1amgjmx5i5I70inNSVpFdrmaWRltkBVerHvUW57B2AUNGxyOaC+VW9xXLVrcGbcjrtkXqKZZxvveeTAL9APSgiooq1ty3RTMj//2Q==',
+										directory,
+										fileName: 'image.jpg',
+										fileSize: '1.04 kB',
+									},
+								},
+							},
+						],
+					],
+				},
+			},
+		},
+	];
+
+	const nodeTypes = Helpers.setup(tests);
+
+	for (const testData of tests) {
+		test(testData.description, async () => {
+			const { result } = await executeWorkflow(testData, nodeTypes);
+
+			const resultNodeData = Helpers.getResultNodeData(result, testData);
+			resultNodeData.forEach(({ nodeName, resultData }) => {
+				expect(resultData).toEqual(testData.output.nodeData[nodeName]);
+			});
+
+			expect(result.finished).toEqual(true);
+		});
+	}
+});
diff --git a/packages/nodes-base/nodes/Files/ReadWriteFile/test/ReadWriteFile.workflow.json b/packages/nodes-base/nodes/Files/ReadWriteFile/test/ReadWriteFile.workflow.json
new file mode 100644
index 0000000000000..46fb3bc2a01bd
--- /dev/null
+++ b/packages/nodes-base/nodes/Files/ReadWriteFile/test/ReadWriteFile.workflow.json
@@ -0,0 +1,72 @@
+{
+	"meta": {
+		"instanceId": "104a4d08d8897b8bdeb38aaca515021075e0bd8544c983c2bb8c86e6a8e6081c"
+	},
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "01b8609f-a345-41de-80bf-6d84276b5e7a",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [
+				700,
+				320
+			]
+		},
+		{
+			"parameters": {
+				"fileSelector": "C:/Test/image.jpg",
+				"options": {}
+			},
+			"id": "a1ea0fd0-cc95-4de2-bc58-bc980cb1d97e",
+			"name": "Read from Disk",
+			"type": "n8n-nodes-base.readWriteFile",
+			"typeVersion": 1,
+			"position": [
+				920,
+				320
+			]
+		},
+		{
+			"parameters": {
+				"operation": "write",
+				"fileName": "C:/Test/image-written.jpg",
+				"options": {}
+			},
+			"id": "94abac52-bd10-4b57-85b0-691c70989137",
+			"name": "Write to Disk",
+			"type": "n8n-nodes-base.readWriteFile",
+			"typeVersion": 1,
+			"position": [
+				1140,
+				320
+			]
+		}
+	],
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Read from Disk",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Read from Disk": {
+			"main": [
+				[
+					{
+						"node": "Write to Disk",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"pinData": {}
+}
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Files/ReadWriteFile/test/image.jpg b/packages/nodes-base/nodes/Files/ReadWriteFile/test/image.jpg
new file mode 100644
index 0000000000000..24b60c421ecc1
Binary files /dev/null and b/packages/nodes-base/nodes/Files/ReadWriteFile/test/image.jpg differ
diff --git a/packages/nodes-base/nodes/Files/test/ConvertExtract.test.ts b/packages/nodes-base/nodes/Files/test/ConvertExtract.test.ts
new file mode 100644
index 0000000000000..9ff4604263c7b
--- /dev/null
+++ b/packages/nodes-base/nodes/Files/test/ConvertExtract.test.ts
@@ -0,0 +1,5 @@
+import { testWorkflows, getWorkflowFilenames } from '@test/nodes/Helpers';
+
+const workflows = getWorkflowFilenames(__dirname);
+
+describe('Test Convert to File Node', () => testWorkflows(workflows));
diff --git a/packages/nodes-base/nodes/Files/test/convert_extract.workflow.json b/packages/nodes-base/nodes/Files/test/convert_extract.workflow.json
new file mode 100644
index 0000000000000..ea5c3a274cfde
--- /dev/null
+++ b/packages/nodes-base/nodes/Files/test/convert_extract.workflow.json
@@ -0,0 +1,707 @@
+{
+  "name": "convert to tests",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "35cce987-aa4f-4738-bfcd-b85098948341",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        680,
+        1100
+      ]
+    },
+    {
+      "parameters": {
+        "fields": {
+          "values": [
+            {
+              "name": "row_number",
+              "type": "numberValue",
+              "numberValue": "2"
+            },
+            {
+              "name": "country",
+              "stringValue": "uk"
+            },
+            {
+              "name": "browser",
+              "stringValue": "firefox"
+            },
+            {
+              "name": "session_duration",
+              "type": "numberValue",
+              "numberValue": "1"
+            },
+            {
+              "name": "visits",
+              "type": "numberValue",
+              "numberValue": "1"
+            }
+          ]
+        },
+        "include": "none",
+        "options": {}
+      },
+      "id": "13305747-c966-4f46-90b3-ffff6835b714",
+      "name": "Edit Fields",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.2,
+      "position": [
+        980,
+        880
+      ]
+    },
+    {
+      "parameters": {
+        "options": {}
+      },
+      "id": "b08b269d-0735-4dc4-b5a7-7870f5e115f9",
+      "name": "Convert to File",
+      "type": "n8n-nodes-base.convertToFile",
+      "typeVersion": 1,
+      "position": [
+        1380,
+        420
+      ]
+    },
+    {
+      "parameters": {
+        "operation": "html",
+        "options": {}
+      },
+      "id": "c68c209f-771f-4d25-b832-3d55ee97e6ff",
+      "name": "Convert to File1",
+      "type": "n8n-nodes-base.convertToFile",
+      "typeVersion": 1,
+      "position": [
+        1380,
+        600
+      ]
+    },
+    {
+      "parameters": {
+        "operation": "toJson",
+        "options": {}
+      },
+      "id": "2b6f27ed-a4dc-4a29-905f-f0a921ea6ee7",
+      "name": "Convert to File2",
+      "type": "n8n-nodes-base.convertToFile",
+      "typeVersion": 1,
+      "position": [
+        1380,
+        780
+      ]
+    },
+    {
+      "parameters": {
+        "operation": "toJson",
+        "mode": "each",
+        "options": {}
+      },
+      "id": "cd482d12-7547-4eb6-880b-bd2c31ef06d5",
+      "name": "Convert to File3",
+      "type": "n8n-nodes-base.convertToFile",
+      "typeVersion": 1,
+      "position": [
+        1380,
+        960
+      ]
+    },
+    {
+      "parameters": {
+        "operation": "xlsx",
+        "options": {}
+      },
+      "id": "1fd693e3-4286-49f4-ba45-70584c1d67f7",
+      "name": "Convert to File5",
+      "type": "n8n-nodes-base.convertToFile",
+      "typeVersion": 1,
+      "position": [
+        1380,
+        1140
+      ]
+    },
+    {
+      "parameters": {
+        "options": {}
+      },
+      "id": "636866e9-ca0d-44a3-b27a-90cf33e26485",
+      "name": "Extract From File",
+      "type": "n8n-nodes-base.extractFromFile",
+      "typeVersion": 1,
+      "position": [
+        1600,
+        420
+      ]
+    },
+    {
+      "parameters": {
+        "operation": "html",
+        "options": {}
+      },
+      "id": "5c66b2ea-94b2-4a1b-a34d-acb07fe33e13",
+      "name": "Extract From File1",
+      "type": "n8n-nodes-base.extractFromFile",
+      "typeVersion": 1,
+      "position": [
+        1600,
+        600
+      ]
+    },
+    {
+      "parameters": {
+        "operation": "fromJson",
+        "options": {}
+      },
+      "id": "a03752f0-e3bb-4dd3-9aae-dc4d1471c281",
+      "name": "Extract From File2",
+      "type": "n8n-nodes-base.extractFromFile",
+      "typeVersion": 1,
+      "position": [
+        1600,
+        780
+      ]
+    },
+    {
+      "parameters": {
+        "operation": "fromJson",
+        "options": {}
+      },
+      "id": "eb10c006-60d7-4842-b9e5-a364f42dd1ab",
+      "name": "Extract From File3",
+      "type": "n8n-nodes-base.extractFromFile",
+      "typeVersion": 1,
+      "position": [
+        1600,
+        960
+      ]
+    },
+    {
+      "parameters": {
+        "operation": "xlsx",
+        "options": {}
+      },
+      "id": "64c98172-2a77-4e83-b19b-232899df8113",
+      "name": "Extract From File4",
+      "type": "n8n-nodes-base.extractFromFile",
+      "typeVersion": 1,
+      "position": [
+        1600,
+        1140
+      ]
+    },
+    {
+      "parameters": {
+        "operation": "xls",
+        "options": {}
+      },
+      "id": "edbfd57e-d36b-470d-9e8d-9c7f67c131b4",
+      "name": "Convert to File6",
+      "type": "n8n-nodes-base.convertToFile",
+      "typeVersion": 1,
+      "position": [
+        1380,
+        1320
+      ]
+    },
+    {
+      "parameters": {
+        "operation": "xls",
+        "options": {}
+      },
+      "id": "86713806-8dc6-45ec-a710-e80b839ec193",
+      "name": "Extract From File5",
+      "type": "n8n-nodes-base.extractFromFile",
+      "typeVersion": 1,
+      "position": [
+        1600,
+        1320
+      ]
+    },
+    {
+      "parameters": {
+        "fields": {
+          "values": [
+            {
+              "name": "base64",
+              "stringValue": "VGhpcyBpcyB0ZXh0IGNvbnZlcnRlZCB0byBiYXNlIDY0"
+            }
+          ]
+        },
+        "include": "none",
+        "options": {}
+      },
+      "id": "c205d380-2459-4d16-bb56-f862c53c25de",
+      "name": "Edit Fields1",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.2,
+      "position": [
+        980,
+        1060
+      ]
+    },
+    {
+      "parameters": {
+        "operation": "toBinary",
+        "sourceProperty": "base64",
+        "options": {}
+      },
+      "id": "3f5fe04c-63cf-47d0-a7ca-d427b95a0c52",
+      "name": "Convert to File7",
+      "type": "n8n-nodes-base.convertToFile",
+      "typeVersion": 1,
+      "position": [
+        1380,
+        1880
+      ]
+    },
+    {
+      "parameters": {
+        "operation": "text",
+        "options": {}
+      },
+      "id": "dbb4eae0-f0ee-4453-aed7-7d8322974c94",
+      "name": "Extract From File6",
+      "type": "n8n-nodes-base.extractFromFile",
+      "typeVersion": 1,
+      "position": [
+        1600,
+        1880
+      ]
+    },
+    {
+      "parameters": {
+        "operation": "ods",
+        "options": {}
+      },
+      "id": "e3bf810d-7795-4663-82d1-768f76adc0d9",
+      "name": "Convert to File8",
+      "type": "n8n-nodes-base.convertToFile",
+      "typeVersion": 1,
+      "position": [
+        1380,
+        1520
+      ]
+    },
+    {
+      "parameters": {
+        "operation": "ods",
+        "options": {}
+      },
+      "id": "7713d273-2d51-4e3e-8ac9-9a4e6013c690",
+      "name": "Extract From File7",
+      "type": "n8n-nodes-base.extractFromFile",
+      "typeVersion": 1,
+      "position": [
+        1600,
+        1520
+      ]
+    },
+    {
+      "parameters": {
+        "operation": "rtf",
+        "options": {}
+      },
+      "id": "631b29cb-dcde-42cc-a514-45622923dab6",
+      "name": "Convert to File9",
+      "type": "n8n-nodes-base.convertToFile",
+      "typeVersion": 1,
+      "position": [
+        1380,
+        1700
+      ]
+    },
+    {
+      "parameters": {
+        "operation": "rtf",
+        "options": {}
+      },
+      "id": "168b6586-c89d-4b0e-880e-4ddb8ea7cb2f",
+      "name": "Extract From File8",
+      "type": "n8n-nodes-base.extractFromFile",
+      "typeVersion": 1,
+      "position": [
+        1600,
+        1700
+      ]
+    },
+    {
+      "parameters": {
+        "operation": "iCal",
+        "start": "2024-01-03T00:00:00",
+        "end": "2024-01-04T00:00:00",
+        "allDay": true,
+        "additionalFields": {
+          "description": "event description"
+        }
+      },
+      "id": "2ba4acd9-2677-4b25-9379-48433ac5e9cc",
+      "name": "Convert to File10",
+      "type": "n8n-nodes-base.convertToFile",
+      "typeVersion": 1,
+      "position": [
+        1380,
+        2100
+      ]
+    },
+    {
+      "parameters": {
+        "operation": "fromIcs",
+        "options": {}
+      },
+      "id": "c0179d40-7de0-4e42-a6bf-97c5bb764665",
+      "name": "Extract From File9",
+      "type": "n8n-nodes-base.extractFromFile",
+      "typeVersion": 1,
+      "position": [
+        1600,
+        2100
+      ]
+    },
+    {
+      "parameters": {
+        "fields": {
+          "values": [
+            {
+              "name": "description",
+              "stringValue": "={{ $json.data.events[0].description }}"
+            }
+          ]
+        },
+        "include": "none",
+        "options": {}
+      },
+      "id": "8ee98090-f3b0-41d5-8122-d27e5559738f",
+      "name": "Edit Fields2",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.2,
+      "position": [
+        1820,
+        2100
+      ]
+    }
+  ],
+  "pinData": {
+    "Extract From File": [
+      {
+        "json": {
+          "row_number": "2",
+          "country": "uk",
+          "browser": "firefox",
+          "session_duration": "1",
+          "visits": "1"
+        }
+      }
+    ],
+    "Extract From File1": [
+      {
+        "json": {
+          "row_number": 2,
+          "country": "uk",
+          "browser": "firefox",
+          "session_duration": 1,
+          "visits": 1
+        }
+      }
+    ],
+    "Extract From File2": [
+      {
+        "json": {
+          "data": [
+            {
+              "row_number": 2,
+              "country": "uk",
+              "browser": "firefox",
+              "session_duration": 1,
+              "visits": 1
+            }
+          ]
+        }
+      }
+    ],
+    "Extract From File3": [
+      {
+        "json": {
+          "data": {
+            "row_number": 2,
+            "country": "uk",
+            "browser": "firefox",
+            "session_duration": 1,
+            "visits": 1
+          }
+        }
+      }
+    ],
+    "Extract From File4": [
+      {
+        "json": {
+          "row_number": 2,
+          "country": "uk",
+          "browser": "firefox",
+          "session_duration": 1,
+          "visits": 1
+        }
+      }
+    ],
+    "Extract From File5": [
+      {
+        "json": {
+          "row_number": 2,
+          "country": "uk",
+          "browser": "firefox",
+          "session_duration": 1,
+          "visits": 1
+        }
+      }
+    ],
+    "Extract From File7": [
+      {
+        "json": {
+          "row_number": 2,
+          "country": "uk",
+          "browser": "firefox",
+          "session_duration": 1,
+          "visits": 1
+        }
+      }
+    ],
+    "Extract From File6": [
+      {
+        "json": {
+          "data": "This is text converted to base 64"
+        }
+      }
+    ],
+    "Extract From File8": [
+      {
+        "json": {
+          "row_number": 2,
+          "country": "uk",
+          "browser": "firefox",
+          "session_duration": 1,
+          "visits": 1
+        }
+      }
+    ],
+    "Edit Fields2": [
+      {
+        "json": {
+          "description": "event description"
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Edit Fields",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Edit Fields1",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Convert to File10",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Edit Fields": {
+      "main": [
+        [
+          {
+            "node": "Convert to File",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Convert to File1",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Convert to File2",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Convert to File3",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Convert to File5",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Convert to File6",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Convert to File8",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Convert to File9",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Convert to File": {
+      "main": [
+        [
+          {
+            "node": "Extract From File",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Convert to File1": {
+      "main": [
+        [
+          {
+            "node": "Extract From File1",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Convert to File2": {
+      "main": [
+        [
+          {
+            "node": "Extract From File2",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Convert to File3": {
+      "main": [
+        [
+          {
+            "node": "Extract From File3",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Convert to File5": {
+      "main": [
+        [
+          {
+            "node": "Extract From File4",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Convert to File6": {
+      "main": [
+        [
+          {
+            "node": "Extract From File5",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Convert to File7": {
+      "main": [
+        [
+          {
+            "node": "Extract From File6",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Edit Fields1": {
+      "main": [
+        [
+          {
+            "node": "Convert to File7",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Convert to File8": {
+      "main": [
+        [
+          {
+            "node": "Extract From File7",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Convert to File9": {
+      "main": [
+        [
+          {
+            "node": "Extract From File8",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Convert to File10": {
+      "main": [
+        [
+          {
+            "node": "Extract From File9",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Extract From File9": {
+      "main": [
+        [
+          {
+            "node": "Edit Fields2",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "3287cce3-f02f-45df-9d3b-2f116852c1fb",
+  "meta": {
+    "instanceId": "b888bd11cd1ddbb95450babf3e199556799d999b896f650de768b8370ee50363"
+  },
+  "id": "ZzoOtOee7hxaNcmp",
+  "tags": []
+}
diff --git a/packages/nodes-base/nodes/Filter/Filter.node.json b/packages/nodes-base/nodes/Filter/Filter.node.json
index 28a67f27cb57e..49424f6e4be57 100644
--- a/packages/nodes-base/nodes/Filter/Filter.node.json
+++ b/packages/nodes-base/nodes/Filter/Filter.node.json
@@ -2,7 +2,7 @@
 	"node": "n8n-nodes-base.filter",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"details": "The Filter node can be used to filter items based on a condition. If the condition is met, the item will be passed on to the next node. If the condition is not met, the item will be omited. Conditions can be combined together by AND(meet all conditions), or OR(meet at least one condition).",
+	"details": "The Filter node can be used to filter items based on a condition. If the condition is met, the item will be passed on to the next node. If the condition is not met, the item will be omitted. Conditions can be combined together by AND(meet all conditions), or OR(meet at least one condition).",
 	"categories": ["Core Nodes"],
 	"resources": {
 		"primaryDocumentation": [
@@ -14,6 +14,6 @@
 	},
 	"alias": ["Router", "Filter", "Condition", "Logic", "Boolean", "Branch"],
 	"subcategories": {
-		"Core Nodes": ["Flow"]
+		"Core Nodes": ["Flow", "Data Transformation"]
 	}
 }
diff --git a/packages/nodes-base/nodes/Filter/Filter.node.ts b/packages/nodes-base/nodes/Filter/Filter.node.ts
index bc8b006a659b9..880542c4880d4 100644
--- a/packages/nodes-base/nodes/Filter/Filter.node.ts
+++ b/packages/nodes-base/nodes/Filter/Filter.node.ts
@@ -1,368 +1,24 @@
-import type {
-	IExecuteFunctions,
-	INodeExecutionData,
-	INodeParameters,
-	INodeType,
-	INodeTypeDescription,
-	NodeParameterValue,
-} from 'n8n-workflow';
-
-import { compareOperationFunctions, convertDateTime } from './GenericFunctions';
-
-export class Filter implements INodeType {
-	description: INodeTypeDescription = {
-		displayName: 'Filter',
-		name: 'filter',
-		icon: 'fa:filter',
-		group: ['transform'],
-		version: 1,
-		description: 'Filter out incoming items based on given conditions',
-		defaults: {
-			name: 'Filter',
-			color: '#229eff',
-		},
-		inputs: ['main'],
-		outputs: ['main'],
-		outputNames: ['Kept', 'Discarded'],
-		properties: [
-			{
-				displayName: 'Conditions',
-				name: 'conditions',
-				placeholder: 'Add Condition',
-				type: 'fixedCollection',
-				typeOptions: {
-					multipleValues: true,
-					sortable: true,
-				},
-				description: 'The type of values to compare',
-				default: {},
-				options: [
-					{
-						name: 'boolean',
-						displayName: 'Boolean',
-						values: [
-							{
-								displayName: 'Value 1',
-								name: 'value1',
-								type: 'boolean',
-								default: false,
-								// eslint-disable-next-line n8n-nodes-base/node-param-description-boolean-without-whether
-								description: 'The value to compare with the second one',
-							},
-							// eslint-disable-next-line n8n-nodes-base/node-param-operation-without-no-data-expression
-							{
-								displayName: 'Operation',
-								name: 'operation',
-								type: 'options',
-								options: [
-									{
-										name: 'Equal',
-										value: 'equal',
-									},
-									{
-										name: 'Not Equal',
-										value: 'notEqual',
-									},
-								],
-								default: 'equal',
-								description: 'Operation to decide where the the data should be mapped to',
-							},
-							{
-								displayName: 'Value 2',
-								name: 'value2',
-								type: 'boolean',
-								default: false,
-								// eslint-disable-next-line n8n-nodes-base/node-param-description-boolean-without-whether
-								description: 'The value to compare with the first one',
-							},
-						],
-					},
-					{
-						name: 'dateTime',
-						displayName: 'Date & Time',
-						values: [
-							{
-								displayName: 'Value 1',
-								name: 'value1',
-								type: 'dateTime',
-								default: '',
-								description: 'The value to compare with the second one',
-							},
-							// eslint-disable-next-line n8n-nodes-base/node-param-operation-without-no-data-expression
-							{
-								displayName: 'Operation',
-								name: 'operation',
-								type: 'options',
-								options: [
-									{
-										name: 'Occurred After',
-										value: 'after',
-									},
-									{
-										name: 'Occurred Before',
-										value: 'before',
-									},
-								],
-								default: 'after',
-								description: 'Operation to decide where the the data should be mapped to',
-							},
-							{
-								displayName: 'Value 2',
-								name: 'value2',
-								type: 'dateTime',
-								default: '',
-								description: 'The value to compare with the first one',
-							},
-						],
-					},
-					{
-						name: 'number',
-						displayName: 'Number',
-						values: [
-							{
-								displayName: 'Value 1',
-								name: 'value1',
-								type: 'number',
-								default: 0,
-								description: 'The value to compare with the second one',
-							},
-							{
-								displayName: 'Operation',
-								name: 'operation',
-								type: 'options',
-								noDataExpression: true,
-								// eslint-disable-next-line n8n-nodes-base/node-param-options-type-unsorted-items
-								options: [
-									{
-										name: 'Smaller',
-										value: 'smaller',
-									},
-									{
-										name: 'Smaller or Equal',
-										value: 'smallerEqual',
-									},
-									{
-										name: 'Equal',
-										value: 'equal',
-									},
-									{
-										name: 'Not Equal',
-										value: 'notEqual',
-									},
-									{
-										name: 'Larger',
-										value: 'larger',
-									},
-									{
-										name: 'Larger or Equal',
-										value: 'largerEqual',
-									},
-									{
-										name: 'Is Empty',
-										value: 'isEmpty',
-									},
-									{
-										name: 'Is Not Empty',
-										value: 'isNotEmpty',
-									},
-								],
-								default: 'smaller',
-								description: 'Operation to decide where the the data should be mapped to',
-							},
-							{
-								displayName: 'Value 2',
-								name: 'value2',
-								type: 'number',
-								displayOptions: {
-									hide: {
-										operation: ['isEmpty', 'isNotEmpty'],
-									},
-								},
-								default: 0,
-								description: 'The value to compare with the first one',
-							},
-						],
-					},
-					{
-						name: 'string',
-						displayName: 'String',
-						values: [
-							{
-								displayName: 'Value 1',
-								name: 'value1',
-								type: 'string',
-								default: '',
-								description: 'The value to compare with the second one',
-							},
-							{
-								displayName: 'Operation',
-								name: 'operation',
-								type: 'options',
-								noDataExpression: true,
-								// eslint-disable-next-line n8n-nodes-base/node-param-options-type-unsorted-items
-								options: [
-									{
-										name: 'Contains',
-										value: 'contains',
-									},
-									{
-										name: 'Not Contains',
-										value: 'notContains',
-									},
-									{
-										name: 'Ends With',
-										value: 'endsWith',
-									},
-									{
-										name: 'Not Ends With',
-										value: 'notEndsWith',
-									},
-									{
-										name: 'Equal',
-										value: 'equal',
-									},
-									{
-										name: 'Not Equal',
-										value: 'notEqual',
-									},
-									{
-										name: 'Regex Match',
-										value: 'regex',
-									},
-									{
-										name: 'Regex Not Match',
-										value: 'notRegex',
-									},
-									{
-										name: 'Starts With',
-										value: 'startsWith',
-									},
-									{
-										name: 'Not Starts With',
-										value: 'notStartsWith',
-									},
-									{
-										name: 'Is Empty',
-										value: 'isEmpty',
-									},
-									{
-										name: 'Is Not Empty',
-										value: 'isNotEmpty',
-									},
-								],
-								default: 'equal',
-								description: 'Operation to decide where the the data should be mapped to',
-							},
-							{
-								displayName: 'Value 2',
-								name: 'value2',
-								type: 'string',
-								displayOptions: {
-									hide: {
-										operation: ['isEmpty', 'isNotEmpty', 'regex', 'notRegex'],
-									},
-								},
-								default: '',
-								description: 'The value to compare with the first one',
-							},
-							{
-								displayName: 'Regex',
-								name: 'value2',
-								type: 'string',
-								displayOptions: {
-									show: {
-										operation: ['regex', 'notRegex'],
-									},
-								},
-								default: '',
-								placeholder: '/text/i',
-								description: 'The regex which has to match',
-							},
-						],
-					},
-				],
-			},
-			{
-				displayName: 'Combine Conditions',
-				name: 'combineConditions',
-				type: 'options',
-				options: [
-					{
-						name: 'AND',
-						description: 'Items are passed to the next node only if they meet all the conditions',
-						value: 'AND',
-					},
-					{
-						name: 'OR',
-						description: 'Items are passed to the next node if they meet at least one condition',
-						value: 'OR',
-					},
-				],
-				default: 'AND',
-				description:
-					'How to combine the conditions: AND requires all conditions to be true, OR requires at least one condition to be true',
-			},
-		],
-	};
-
-	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
-		const returnDataTrue: INodeExecutionData[] = [];
-		const returnDataFalse: INodeExecutionData[] = [];
-
-		const items = this.getInputData();
-
-		const dataTypes = ['boolean', 'dateTime', 'number', 'string'];
-
-		itemLoop: for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
-			const item = items[itemIndex];
-
-			const combineConditions = this.getNodeParameter('combineConditions', itemIndex) as string;
-
-			for (const dataType of dataTypes) {
-				const typeConditions = this.getNodeParameter(
-					`conditions.${dataType}`,
-					itemIndex,
-					[],
-				) as INodeParameters[];
-
-				for (const condition of typeConditions) {
-					let value1 = condition.value1 as NodeParameterValue;
-					let value2 = condition.value2 as NodeParameterValue;
-
-					if (dataType === 'dateTime') {
-						const node = this.getNode();
-						value1 = convertDateTime(node, value1);
-						value2 = convertDateTime(node, value2);
-					}
-
-					const compareResult = compareOperationFunctions[condition.operation as string](
-						value1,
-						value2,
-					);
-
-					// If the operation is "OR" it means the item did match one condition no ned to check further
-					if (compareResult && combineConditions === 'OR') {
-						returnDataTrue.push(item);
-						continue itemLoop;
-					}
-
-					// If the operation is "AND" it means the item failed one condition no ned to check further
-					if (!compareResult && combineConditions === 'AND') {
-						returnDataFalse.push(item);
-						continue itemLoop;
-					}
-				}
-			}
-
-			// If the operation is "AND" it means the item did match all conditions
-			if (combineConditions === 'AND') {
-				returnDataTrue.push(item);
-			} else {
-				// If the operation is "OR" it means the the item did not match any condition.
-				returnDataFalse.push(item);
-			}
-		}
-
-		return [returnDataTrue, returnDataFalse];
+import type { INodeTypeBaseDescription, IVersionedNodeType } from 'n8n-workflow';
+import { VersionedNodeType } from 'n8n-workflow';
+
+import { FilterV1 } from './V1/FilterV1.node';
+import { FilterV2 } from './V2/FilterV2.node';
+
+export class Filter extends VersionedNodeType {
+	constructor() {
+		const baseDescription: INodeTypeBaseDescription = {
+			displayName: 'Filter',
+			name: 'filter',
+			icon: 'fa:filter',
+			group: ['transform'],
+			description: 'Remove items matching a condition',
+		};
+
+		const nodeVersions: IVersionedNodeType['nodeVersions'] = {
+			1: new FilterV1(baseDescription),
+			2: new FilterV2(baseDescription),
+		};
+
+		super(nodeVersions, baseDescription);
 	}
 }
diff --git a/packages/nodes-base/nodes/Filter/GenericFunctions.ts b/packages/nodes-base/nodes/Filter/GenericFunctions.ts
deleted file mode 100644
index d25c7b0ecc8d6..0000000000000
--- a/packages/nodes-base/nodes/Filter/GenericFunctions.ts
+++ /dev/null
@@ -1,101 +0,0 @@
-import type { INode, NodeParameterValue } from 'n8n-workflow';
-import { NodeOperationError } from 'n8n-workflow';
-
-import moment from 'moment';
-
-const isDateObject = (value: NodeParameterValue) =>
-	Object.prototype.toString.call(value) === '[object Date]';
-
-const isDateInvalid = (value: NodeParameterValue) => value?.toString() === 'Invalid Date';
-
-export const compareOperationFunctions: {
-	[key: string]: (value1: NodeParameterValue, value2: NodeParameterValue) => boolean;
-} = {
-	after: (value1: NodeParameterValue, value2: NodeParameterValue) => (value1 || 0) > (value2 || 0),
-	before: (value1: NodeParameterValue, value2: NodeParameterValue) => (value1 || 0) < (value2 || 0),
-	contains: (value1: NodeParameterValue, value2: NodeParameterValue) =>
-		(value1 || '').toString().includes((value2 || '').toString()),
-	notContains: (value1: NodeParameterValue, value2: NodeParameterValue) =>
-		!(value1 || '').toString().includes((value2 || '').toString()),
-	endsWith: (value1: NodeParameterValue, value2: NodeParameterValue) =>
-		(value1 as string).endsWith(value2 as string),
-	notEndsWith: (value1: NodeParameterValue, value2: NodeParameterValue) =>
-		!(value1 as string).endsWith(value2 as string),
-	equal: (value1: NodeParameterValue, value2: NodeParameterValue) => value1 === value2,
-	notEqual: (value1: NodeParameterValue, value2: NodeParameterValue) => value1 !== value2,
-	larger: (value1: NodeParameterValue, value2: NodeParameterValue) => (value1 || 0) > (value2 || 0),
-	largerEqual: (value1: NodeParameterValue, value2: NodeParameterValue) =>
-		(value1 || 0) >= (value2 || 0),
-	smaller: (value1: NodeParameterValue, value2: NodeParameterValue) =>
-		(value1 || 0) < (value2 || 0),
-	smallerEqual: (value1: NodeParameterValue, value2: NodeParameterValue) =>
-		(value1 || 0) <= (value2 || 0),
-	startsWith: (value1: NodeParameterValue, value2: NodeParameterValue) =>
-		(value1 as string).startsWith(value2 as string),
-	notStartsWith: (value1: NodeParameterValue, value2: NodeParameterValue) =>
-		!(value1 as string).startsWith(value2 as string),
-	isEmpty: (value1: NodeParameterValue) =>
-		[undefined, null, '', NaN].includes(value1 as string) ||
-		(typeof value1 === 'object' && value1 !== null && !isDateObject(value1)
-			? Object.entries(value1 as string).length === 0
-			: false) ||
-		(isDateObject(value1) && isDateInvalid(value1)),
-	isNotEmpty: (value1: NodeParameterValue) =>
-		!(
-			[undefined, null, '', NaN].includes(value1 as string) ||
-			(typeof value1 === 'object' && value1 !== null && !isDateObject(value1)
-				? Object.entries(value1 as string).length === 0
-				: false) ||
-			(isDateObject(value1) && isDateInvalid(value1))
-		),
-	regex: (value1: NodeParameterValue, value2: NodeParameterValue) => {
-		const regexMatch = (value2 || '').toString().match(new RegExp('^/(.*?)/([gimusy]*)$'));
-
-		let regex: RegExp;
-		if (!regexMatch) {
-			regex = new RegExp((value2 || '').toString());
-		} else if (regexMatch.length === 1) {
-			regex = new RegExp(regexMatch[1]);
-		} else {
-			regex = new RegExp(regexMatch[1], regexMatch[2]);
-		}
-
-		return !!(value1 || '').toString().match(regex);
-	},
-	notRegex: (value1: NodeParameterValue, value2: NodeParameterValue) => {
-		const regexMatch = (value2 || '').toString().match(new RegExp('^/(.*?)/([gimusy]*)$'));
-
-		let regex: RegExp;
-		if (!regexMatch) {
-			regex = new RegExp((value2 || '').toString());
-		} else if (regexMatch.length === 1) {
-			regex = new RegExp(regexMatch[1]);
-		} else {
-			regex = new RegExp(regexMatch[1], regexMatch[2]);
-		}
-
-		return !(value1 || '').toString().match(regex);
-	},
-};
-
-// Converts the input data of a dateTime into a number for easy compare
-export const convertDateTime = (node: INode, value: NodeParameterValue): number => {
-	let returnValue: number | undefined = undefined;
-	if (typeof value === 'string') {
-		returnValue = new Date(value).getTime();
-	} else if (typeof value === 'number') {
-		returnValue = value;
-	}
-	if (moment.isMoment(value)) {
-		returnValue = value.unix();
-	}
-	if ((value as unknown as object) instanceof Date) {
-		returnValue = (value as unknown as Date).getTime();
-	}
-
-	if (returnValue === undefined || isNaN(returnValue)) {
-		throw new NodeOperationError(node, `The value "${value}" is not a valid DateTime.`);
-	}
-
-	return returnValue;
-};
diff --git a/packages/nodes-base/nodes/Filter/V1/FilterV1.node.ts b/packages/nodes-base/nodes/Filter/V1/FilterV1.node.ts
new file mode 100644
index 0000000000000..899a04aa5fa27
--- /dev/null
+++ b/packages/nodes-base/nodes/Filter/V1/FilterV1.node.ts
@@ -0,0 +1,373 @@
+import type {
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeParameters,
+	INodeType,
+	INodeTypeBaseDescription,
+	INodeTypeDescription,
+	NodeParameterValue,
+} from 'n8n-workflow';
+
+import { compareOperationFunctions, convertDateTime } from './GenericFunctions';
+
+export class FilterV1 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			version: 1,
+			defaults: {
+				name: 'Filter',
+				color: '#229eff',
+			},
+			inputs: ['main'],
+			outputs: ['main'],
+			outputNames: ['Kept', 'Discarded'],
+			properties: [
+				{
+					displayName: 'Conditions',
+					name: 'conditions',
+					placeholder: 'Add Condition',
+					type: 'fixedCollection',
+					typeOptions: {
+						multipleValues: true,
+						sortable: true,
+					},
+					description: 'The type of values to compare',
+					default: {},
+					options: [
+						{
+							name: 'boolean',
+							displayName: 'Boolean',
+							values: [
+								{
+									displayName: 'Value 1',
+									name: 'value1',
+									type: 'boolean',
+									default: false,
+									// eslint-disable-next-line n8n-nodes-base/node-param-description-boolean-without-whether
+									description: 'The value to compare with the second one',
+								},
+								// eslint-disable-next-line n8n-nodes-base/node-param-operation-without-no-data-expression
+								{
+									displayName: 'Operation',
+									name: 'operation',
+									type: 'options',
+									options: [
+										{
+											name: 'Equal',
+											value: 'equal',
+										},
+										{
+											name: 'Not Equal',
+											value: 'notEqual',
+										},
+									],
+									default: 'equal',
+									description: 'Operation to decide where the data should be mapped to',
+								},
+								{
+									displayName: 'Value 2',
+									name: 'value2',
+									type: 'boolean',
+									default: false,
+									// eslint-disable-next-line n8n-nodes-base/node-param-description-boolean-without-whether
+									description: 'The value to compare with the first one',
+								},
+							],
+						},
+						{
+							name: 'dateTime',
+							displayName: 'Date & Time',
+							values: [
+								{
+									displayName: 'Value 1',
+									name: 'value1',
+									type: 'dateTime',
+									default: '',
+									description: 'The value to compare with the second one',
+								},
+								// eslint-disable-next-line n8n-nodes-base/node-param-operation-without-no-data-expression
+								{
+									displayName: 'Operation',
+									name: 'operation',
+									type: 'options',
+									options: [
+										{
+											name: 'Occurred After',
+											value: 'after',
+										},
+										{
+											name: 'Occurred Before',
+											value: 'before',
+										},
+									],
+									default: 'after',
+									description: 'Operation to decide where the data should be mapped to',
+								},
+								{
+									displayName: 'Value 2',
+									name: 'value2',
+									type: 'dateTime',
+									default: '',
+									description: 'The value to compare with the first one',
+								},
+							],
+						},
+						{
+							name: 'number',
+							displayName: 'Number',
+							values: [
+								{
+									displayName: 'Value 1',
+									name: 'value1',
+									type: 'number',
+									default: 0,
+									description: 'The value to compare with the second one',
+								},
+								{
+									displayName: 'Operation',
+									name: 'operation',
+									type: 'options',
+									noDataExpression: true,
+									// eslint-disable-next-line n8n-nodes-base/node-param-options-type-unsorted-items
+									options: [
+										{
+											name: 'Smaller',
+											value: 'smaller',
+										},
+										{
+											name: 'Smaller or Equal',
+											value: 'smallerEqual',
+										},
+										{
+											name: 'Equal',
+											value: 'equal',
+										},
+										{
+											name: 'Not Equal',
+											value: 'notEqual',
+										},
+										{
+											name: 'Larger',
+											value: 'larger',
+										},
+										{
+											name: 'Larger or Equal',
+											value: 'largerEqual',
+										},
+										{
+											name: 'Is Empty',
+											value: 'isEmpty',
+										},
+										{
+											name: 'Is Not Empty',
+											value: 'isNotEmpty',
+										},
+									],
+									default: 'smaller',
+									description: 'Operation to decide where the data should be mapped to',
+								},
+								{
+									displayName: 'Value 2',
+									name: 'value2',
+									type: 'number',
+									displayOptions: {
+										hide: {
+											operation: ['isEmpty', 'isNotEmpty'],
+										},
+									},
+									default: 0,
+									description: 'The value to compare with the first one',
+								},
+							],
+						},
+						{
+							name: 'string',
+							displayName: 'String',
+							values: [
+								{
+									displayName: 'Value 1',
+									name: 'value1',
+									type: 'string',
+									default: '',
+									description: 'The value to compare with the second one',
+								},
+								{
+									displayName: 'Operation',
+									name: 'operation',
+									type: 'options',
+									noDataExpression: true,
+									// eslint-disable-next-line n8n-nodes-base/node-param-options-type-unsorted-items
+									options: [
+										{
+											name: 'Contains',
+											value: 'contains',
+										},
+										{
+											name: 'Not Contains',
+											value: 'notContains',
+										},
+										{
+											name: 'Ends With',
+											value: 'endsWith',
+										},
+										{
+											name: 'Not Ends With',
+											value: 'notEndsWith',
+										},
+										{
+											name: 'Equal',
+											value: 'equal',
+										},
+										{
+											name: 'Not Equal',
+											value: 'notEqual',
+										},
+										{
+											name: 'Regex Match',
+											value: 'regex',
+										},
+										{
+											name: 'Regex Not Match',
+											value: 'notRegex',
+										},
+										{
+											name: 'Starts With',
+											value: 'startsWith',
+										},
+										{
+											name: 'Not Starts With',
+											value: 'notStartsWith',
+										},
+										{
+											name: 'Is Empty',
+											value: 'isEmpty',
+										},
+										{
+											name: 'Is Not Empty',
+											value: 'isNotEmpty',
+										},
+									],
+									default: 'equal',
+									description: 'Operation to decide where the data should be mapped to',
+								},
+								{
+									displayName: 'Value 2',
+									name: 'value2',
+									type: 'string',
+									displayOptions: {
+										hide: {
+											operation: ['isEmpty', 'isNotEmpty', 'regex', 'notRegex'],
+										},
+									},
+									default: '',
+									description: 'The value to compare with the first one',
+								},
+								{
+									displayName: 'Regex',
+									name: 'value2',
+									type: 'string',
+									displayOptions: {
+										show: {
+											operation: ['regex', 'notRegex'],
+										},
+									},
+									default: '',
+									placeholder: '/text/i',
+									description: 'The regex which has to match',
+								},
+							],
+						},
+					],
+				},
+				{
+					displayName: 'Combine Conditions',
+					name: 'combineConditions',
+					type: 'options',
+					options: [
+						{
+							name: 'AND',
+							description: 'Items are passed to the next node only if they meet all the conditions',
+							value: 'AND',
+						},
+						{
+							name: 'OR',
+							description: 'Items are passed to the next node if they meet at least one condition',
+							value: 'OR',
+						},
+					],
+					default: 'AND',
+					description:
+						'How to combine the conditions: AND requires all conditions to be true, OR requires at least one condition to be true',
+				},
+			],
+		};
+	}
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const returnDataTrue: INodeExecutionData[] = [];
+		const returnDataFalse: INodeExecutionData[] = [];
+
+		const items = this.getInputData();
+
+		const dataTypes = ['boolean', 'dateTime', 'number', 'string'];
+
+		itemLoop: for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
+			const item = items[itemIndex];
+
+			const combineConditions = this.getNodeParameter('combineConditions', itemIndex) as string;
+
+			for (const dataType of dataTypes) {
+				const typeConditions = this.getNodeParameter(
+					`conditions.${dataType}`,
+					itemIndex,
+					[],
+				) as INodeParameters[];
+
+				for (const condition of typeConditions) {
+					let value1 = condition.value1 as NodeParameterValue;
+					let value2 = condition.value2 as NodeParameterValue;
+
+					if (dataType === 'dateTime') {
+						const node = this.getNode();
+						value1 = convertDateTime(node, value1);
+						value2 = convertDateTime(node, value2);
+					}
+
+					const compareResult = compareOperationFunctions[condition.operation as string](
+						value1,
+						value2,
+					);
+
+					if (item.pairedItem === undefined) {
+						item.pairedItem = [{ item: itemIndex }];
+					}
+
+					// If the operation is "OR" it means the item did match one condition no ned to check further
+					if (compareResult && combineConditions === 'OR') {
+						returnDataTrue.push(item);
+						continue itemLoop;
+					}
+
+					// If the operation is "AND" it means the item failed one condition no ned to check further
+					if (!compareResult && combineConditions === 'AND') {
+						returnDataFalse.push(item);
+						continue itemLoop;
+					}
+				}
+			}
+
+			// If the operation is "AND" it means the item did match all conditions
+			if (combineConditions === 'AND') {
+				returnDataTrue.push(item);
+			} else {
+				// If the operation is "OR" it means the the item did not match any condition.
+				returnDataFalse.push(item);
+			}
+		}
+
+		return [returnDataTrue, returnDataFalse];
+	}
+}
diff --git a/packages/nodes-base/nodes/Filter/V1/GenericFunctions.ts b/packages/nodes-base/nodes/Filter/V1/GenericFunctions.ts
new file mode 100644
index 0000000000000..06288535b1401
--- /dev/null
+++ b/packages/nodes-base/nodes/Filter/V1/GenericFunctions.ts
@@ -0,0 +1,101 @@
+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]';
+
+const isDateInvalid = (value: NodeParameterValue) => value?.toString() === 'Invalid Date';
+
+export const compareOperationFunctions: {
+	[key: string]: (value1: NodeParameterValue, value2: NodeParameterValue) => boolean;
+} = {
+	after: (value1: NodeParameterValue, value2: NodeParameterValue) => (value1 || 0) > (value2 || 0),
+	before: (value1: NodeParameterValue, value2: NodeParameterValue) => (value1 || 0) < (value2 || 0),
+	contains: (value1: NodeParameterValue, value2: NodeParameterValue) =>
+		(value1 || '').toString().includes((value2 || '').toString()),
+	notContains: (value1: NodeParameterValue, value2: NodeParameterValue) =>
+		!(value1 || '').toString().includes((value2 || '').toString()),
+	endsWith: (value1: NodeParameterValue, value2: NodeParameterValue) =>
+		(value1 as string).endsWith(value2 as string),
+	notEndsWith: (value1: NodeParameterValue, value2: NodeParameterValue) =>
+		!(value1 as string).endsWith(value2 as string),
+	equal: (value1: NodeParameterValue, value2: NodeParameterValue) => value1 === value2,
+	notEqual: (value1: NodeParameterValue, value2: NodeParameterValue) => value1 !== value2,
+	larger: (value1: NodeParameterValue, value2: NodeParameterValue) => (value1 || 0) > (value2 || 0),
+	largerEqual: (value1: NodeParameterValue, value2: NodeParameterValue) =>
+		(value1 || 0) >= (value2 || 0),
+	smaller: (value1: NodeParameterValue, value2: NodeParameterValue) =>
+		(value1 || 0) < (value2 || 0),
+	smallerEqual: (value1: NodeParameterValue, value2: NodeParameterValue) =>
+		(value1 || 0) <= (value2 || 0),
+	startsWith: (value1: NodeParameterValue, value2: NodeParameterValue) =>
+		(value1 as string).startsWith(value2 as string),
+	notStartsWith: (value1: NodeParameterValue, value2: NodeParameterValue) =>
+		!(value1 as string).startsWith(value2 as string),
+	isEmpty: (value1: NodeParameterValue) =>
+		[undefined, null, '', NaN].includes(value1 as string) ||
+		(typeof value1 === 'object' && value1 !== null && !isDateObject(value1)
+			? Object.entries(value1 as string).length === 0
+			: false) ||
+		(isDateObject(value1) && isDateInvalid(value1)),
+	isNotEmpty: (value1: NodeParameterValue) =>
+		!(
+			[undefined, null, '', NaN].includes(value1 as string) ||
+			(typeof value1 === 'object' && value1 !== null && !isDateObject(value1)
+				? Object.entries(value1 as string).length === 0
+				: false) ||
+			(isDateObject(value1) && isDateInvalid(value1))
+		),
+	regex: (value1: NodeParameterValue, value2: NodeParameterValue) => {
+		const regexMatch = (value2 || '').toString().match(new RegExp('^/(.*?)/([gimusy]*)$'));
+
+		let regex: RegExp;
+		if (!regexMatch) {
+			regex = new RegExp((value2 || '').toString());
+		} else if (regexMatch.length === 1) {
+			regex = new RegExp(regexMatch[1]);
+		} else {
+			regex = new RegExp(regexMatch[1], regexMatch[2]);
+		}
+
+		return !!(value1 || '').toString().match(regex);
+	},
+	notRegex: (value1: NodeParameterValue, value2: NodeParameterValue) => {
+		const regexMatch = (value2 || '').toString().match(new RegExp('^/(.*?)/([gimusy]*)$'));
+
+		let regex: RegExp;
+		if (!regexMatch) {
+			regex = new RegExp((value2 || '').toString());
+		} else if (regexMatch.length === 1) {
+			regex = new RegExp(regexMatch[1]);
+		} else {
+			regex = new RegExp(regexMatch[1], regexMatch[2]);
+		}
+
+		return !(value1 || '').toString().match(regex);
+	},
+};
+
+// Converts the input data of a dateTime into a number for easy compare
+export const convertDateTime = (node: INode, value: NodeParameterValue): number => {
+	let returnValue: number | undefined = undefined;
+	if (typeof value === 'string') {
+		returnValue = new Date(value).getTime();
+	} else if (typeof value === 'number') {
+		returnValue = value;
+	}
+	if (moment.isMoment(value)) {
+		returnValue = value.unix();
+	}
+	if ((value as unknown as object) instanceof Date) {
+		returnValue = (value as unknown as Date).getTime();
+	}
+
+	if (returnValue === undefined || isNaN(returnValue)) {
+		throw new NodeOperationError(node, `The value "${value}" is not a valid DateTime.`);
+	}
+
+	return returnValue;
+};
diff --git a/packages/nodes-base/nodes/Filter/V2/FilterV2.node.ts b/packages/nodes-base/nodes/Filter/V2/FilterV2.node.ts
new file mode 100644
index 0000000000000..fd6ca40f9824c
--- /dev/null
+++ b/packages/nodes-base/nodes/Filter/V2/FilterV2.node.ts
@@ -0,0 +1,114 @@
+import set from 'lodash/set';
+import type {
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeBaseDescription,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+
+export class FilterV2 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			version: 2,
+			defaults: {
+				name: 'Filter',
+				color: '#229eff',
+			},
+			inputs: ['main'],
+			outputs: ['main'],
+			outputNames: ['Kept', 'Discarded'],
+			parameterPane: 'wide',
+			properties: [
+				{
+					displayName: 'Conditions',
+					name: 'conditions',
+					placeholder: 'Add Condition',
+					type: 'filter',
+					default: {},
+					typeOptions: {
+						filter: {
+							caseSensitive: '={{!$parameter.options.ignoreCase}}',
+							typeValidation: '={{$parameter.options.looseTypeValidation ? "loose" : "strict"}}',
+						},
+					},
+				},
+				{
+					displayName: 'Options',
+					name: 'options',
+					type: 'collection',
+					placeholder: 'Add option',
+					default: {},
+					options: [
+						{
+							displayName: 'Ignore Case',
+							description: 'Whether to ignore letter case when evaluating conditions',
+							name: 'ignoreCase',
+							type: 'boolean',
+							default: true,
+						},
+						{
+							displayName: 'Less Strict Type Validation',
+							description: 'Whether to try casting value types based on the selected operator',
+							name: 'looseTypeValidation',
+							type: 'boolean',
+							default: true,
+						},
+					],
+				},
+			],
+		};
+	}
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const keptItems: INodeExecutionData[] = [];
+		const discardedItems: INodeExecutionData[] = [];
+
+		this.getInputData().forEach((item, itemIndex) => {
+			try {
+				const options = this.getNodeParameter('options', itemIndex) as {
+					ignoreCase?: boolean;
+					looseTypeValidation?: boolean;
+				};
+				let pass = false;
+				try {
+					pass = this.getNodeParameter('conditions', itemIndex, false, {
+						extractValue: true,
+					}) as boolean;
+				} catch (error) {
+					if (!options.looseTypeValidation) {
+						set(
+							error,
+							'description',
+							"Try changing the type of comparison. Alternatively you can enable 'Less Strict Type Validation' in the options.",
+						);
+					}
+					set(error, 'context.itemIndex', itemIndex);
+					set(error, 'node', this.getNode());
+					throw error;
+				}
+
+				if (item.pairedItem === undefined) {
+					item.pairedItem = { item: itemIndex };
+				}
+
+				if (pass) {
+					keptItems.push(item);
+				} else {
+					discardedItems.push(item);
+				}
+			} catch (error) {
+				if (this.continueOnFail()) {
+					discardedItems.push(item);
+				} else {
+					throw error;
+				}
+			}
+		});
+
+		return [keptItems, discardedItems];
+	}
+}
diff --git a/packages/nodes-base/nodes/Filter/test/Filter.node.test.ts b/packages/nodes-base/nodes/Filter/test/Filter.node.test.ts
index 7bb6dfc1c7443..218ced5f517b5 100644
--- a/packages/nodes-base/nodes/Filter/test/Filter.node.test.ts
+++ b/packages/nodes-base/nodes/Filter/test/Filter.node.test.ts
@@ -1,4 +1,4 @@
-import { testWorkflows, getWorkflowFilenames } from '../../../test/nodes/Helpers';
+import { testWorkflows, getWorkflowFilenames } from '@test/nodes/Helpers';
 
 const workflows = getWorkflowFilenames(__dirname);
 
diff --git a/packages/nodes-base/nodes/Filter/test/workflow.json b/packages/nodes-base/nodes/Filter/test/workflow_v1.json
similarity index 100%
rename from packages/nodes-base/nodes/Filter/test/workflow.json
rename to packages/nodes-base/nodes/Filter/test/workflow_v1.json
diff --git a/packages/nodes-base/nodes/Filter/test/workflow_v2.json b/packages/nodes-base/nodes/Filter/test/workflow_v2.json
new file mode 100644
index 0000000000000..d7836473c9c3f
--- /dev/null
+++ b/packages/nodes-base/nodes/Filter/test/workflow_v2.json
@@ -0,0 +1,335 @@
+{
+	"name": "Filter v2",
+	"nodes": [
+	  {
+		"parameters": {
+		  "jsCode": "return [\n  {\n    id: 1,\n    name: 'Adam',\n    subscribed: false,\n    updatedAt: '2011-10-05T14:48:00.000Z',\n    notes: null,\n    email: 'adam@mail.com',\n  },\n  {\n    id: 2,\n    name: 'Victor',\n    subscribed: true,\n    updatedAt: '2020-10-05T14:48:00.000Z',\n    notes: 'some notes',\n    email: 'victor@mail.com',\n  },\n  {\n    id: 3,\n    name: 'Sam',\n    subscribed: true,\n    updatedAt: '2021-10-05T14:48:00.000Z',\n    notes: 'other notes',\n    email: 'sam@mail.com',\n  },  \n];"
+		},
+		"id": "d8f7d6a2-02f5-40f6-83ca-540467f80ad8",
+		"name": "Code",
+		"type": "n8n-nodes-base.code",
+		"typeVersion": 1,
+		"position": [
+		  2480,
+		  1080
+		]
+	  },
+	  {
+		"parameters": {},
+		"id": "e112277f-9c6a-404f-a8f2-9b69fd88db16",
+		"name": "When clicking \"Execute Workflow\"",
+		"type": "n8n-nodes-base.manualTrigger",
+		"typeVersion": 1,
+		"position": [
+		  2320,
+		  1080
+		]
+	  },
+	  {
+		"parameters": {
+		  "conditions": {
+			"options": {
+			  "caseSensitive": true,
+			  "leftValue": "",
+			  "typeValidation": "strict"
+			},
+			"conditions": [
+			  {
+				"id": "b65a0fbd-abdb-4622-8312-c12496444ad3",
+				"leftValue": "={{ $json.subscribed }}",
+				"rightValue": "",
+				"operator": {
+				  "type": "boolean",
+				  "operation": "true",
+				  "singleValue": true
+				}
+			  },
+			  {
+				"id": "adf82766-a27f-450e-84a9-9616c5be5191",
+				"leftValue": "={{ $json.notes }}",
+				"rightValue": "",
+				"operator": {
+				  "type": "string",
+				  "operation": "exists",
+				  "singleValue": true
+				}
+			  }
+			],
+			"combinator": "and"
+		  },
+		  "options": {}
+		},
+		"id": "daaa1445-f279-4edb-b2d6-b6415cb5fb55",
+		"name": "Filter Boolean",
+		"type": "n8n-nodes-base.filter",
+		"typeVersion": 2,
+		"position": [
+		  2700,
+		  800
+		]
+	  },
+	  {
+		"parameters": {
+		  "conditions": {
+			"options": {
+			  "caseSensitive": true,
+			  "leftValue": "",
+			  "typeValidation": "strict"
+			},
+			"conditions": [
+			  {
+				"id": "480a5f38-0e31-44c5-9f61-5c34344d265e",
+				"leftValue": "={{ $json.updatedAt }}",
+				"rightValue": "2018-12-31T22:00:00",
+				"operator": {
+				  "type": "dateTime",
+				  "operation": "after"
+				}
+			  },
+			  {
+				"id": "a9240497-a583-4a6a-97e5-a4197036e04d",
+				"leftValue": "={{ $json.updatedAt }}",
+				"rightValue": "2021-08-03T03:30:08",
+				"operator": {
+				  "type": "dateTime",
+				  "operation": "before"
+				}
+			  }
+			],
+			"combinator": "and"
+		  },
+		  "options": {}
+		},
+		"id": "816b4bac-2213-4057-b50e-1f7f39542476",
+		"name": "Filter Date",
+		"type": "n8n-nodes-base.filter",
+		"typeVersion": 2,
+		"position": [
+		  2700,
+		  960
+		]
+	  },
+	  {
+		"parameters": {
+		  "conditions": {
+			"options": {
+			  "caseSensitive": true,
+			  "leftValue": "",
+			  "typeValidation": "loose"
+			},
+			"conditions": [
+			  {
+				"id": "21265681-4230-4648-ba79-5513b3d9260f",
+				"leftValue": "={{ $json.id }}",
+				"rightValue": 1,
+				"operator": {
+				  "type": "number",
+				  "operation": "gt"
+				}
+			  },
+			  {
+				"id": "b4f736a7-d60d-4acd-abc4-04c324581ccf",
+				"leftValue": "={{ $json.id }}",
+				"rightValue": 3,
+				"operator": {
+				  "type": "number",
+				  "operation": "lte"
+				}
+			  },
+			  {
+				"id": "8b29b1da-8dc3-42b0-9440-7394709e3619",
+				"leftValue": "={{ $json.id }}",
+				"rightValue": "",
+				"operator": {
+				  "type": "string",
+				  "operation": "exists",
+				  "singleValue": true
+				}
+			  }
+			],
+			"combinator": "and"
+		  },
+		  "options": {
+			"looseTypeValidation": true
+		  }
+		},
+		"id": "66fe5d53-2652-4860-8d31-cb033af3a7c3",
+		"name": "Filter Number",
+		"type": "n8n-nodes-base.filter",
+		"typeVersion": 2,
+		"position": [
+		  2700,
+		  1120
+		]
+	  },
+	  {
+		"parameters": {
+		  "conditions": {
+			"options": {
+			  "caseSensitive": false,
+			  "leftValue": "",
+			  "typeValidation": "strict"
+			},
+			"conditions": [
+			  {
+				"id": "dafeb20d-80ae-4bb5-8375-ff61002f1bdd",
+				"leftValue": "={{ $json.name }}",
+				"rightValue": "v",
+				"operator": {
+				  "type": "string",
+				  "operation": "startsWith"
+				}
+			  },
+			  {
+				"id": "8bb39457-005a-427d-9584-6985a05b589d",
+				"leftValue": "={{ $json.name }}",
+				"rightValue": "s",
+				"operator": {
+				  "type": "string",
+				  "operation": "notContains"
+				}
+			  }
+			],
+			"combinator": "or"
+		  },
+		  "options": {
+			"ignoreCase": true
+		  }
+		},
+		"id": "b625a4d4-4bd7-4480-a76a-622d460f4392",
+		"name": "Filter String",
+		"type": "n8n-nodes-base.filter",
+		"typeVersion": 2,
+		"position": [
+		  2700,
+		  1280
+		]
+	  }
+	],
+	"pinData": {
+	  "Filter Boolean": [
+		{
+		  "json": {
+			"id": 2,
+			"name": "Victor",
+			"subscribed": true,
+			"updatedAt": "2020-10-05T14:48:00.000Z",
+			"notes": "some notes",
+			"email": "victor@mail.com"
+		  }
+		},
+		{
+		  "json": {
+			"id": 3,
+			"name": "Sam",
+			"subscribed": true,
+			"updatedAt": "2021-10-05T14:48:00.000Z",
+			"notes": "other notes",
+			"email": "sam@mail.com"
+		  }
+		}
+	  ],
+	  "Filter Date": [
+		{
+		  "json": {
+			"id": 2,
+			"name": "Victor",
+			"subscribed": true,
+			"updatedAt": "2020-10-05T14:48:00.000Z",
+			"notes": "some notes",
+			"email": "victor@mail.com"
+		  }
+		}
+	  ],
+	  "Filter Number": [
+		{
+		  "json": {
+			"id": 2,
+			"name": "Victor",
+			"subscribed": true,
+			"updatedAt": "2020-10-05T14:48:00.000Z",
+			"notes": "some notes",
+			"email": "victor@mail.com"
+		  }
+		},
+		{
+		  "json": {
+			"id": 3,
+			"name": "Sam",
+			"subscribed": true,
+			"updatedAt": "2021-10-05T14:48:00.000Z",
+			"notes": "other notes",
+			"email": "sam@mail.com"
+		  }
+		}
+	  ],
+	  "Filter String": [
+		{
+		  "json": {
+			"id": 1,
+			"name": "Adam",
+			"subscribed": false,
+			"updatedAt": "2011-10-05T14:48:00.000Z",
+			"notes": null,
+			"email": "adam@mail.com"
+		  }
+		},
+		{
+		  "json": {
+			"id": 2,
+			"name": "Victor",
+			"subscribed": true,
+			"updatedAt": "2020-10-05T14:48:00.000Z",
+			"notes": "some notes",
+			"email": "victor@mail.com"
+		  }
+		}
+	  ]
+	},
+	"connections": {
+	  "Code": {
+		"main": [
+		  [
+			{
+			  "node": "Filter Boolean",
+			  "type": "main",
+			  "index": 0
+			},
+			{
+			  "node": "Filter Date",
+			  "type": "main",
+			  "index": 0
+			},
+			{
+			  "node": "Filter Number",
+			  "type": "main",
+			  "index": 0
+			},
+			{
+			  "node": "Filter String",
+			  "type": "main",
+			  "index": 0
+			}
+		  ]
+		]
+	  },
+	  "When clicking \"Execute Workflow\"": {
+		"main": [
+		  [
+			{
+			  "node": "Code",
+			  "type": "main",
+			  "index": 0
+			}
+		  ]
+		]
+	  }
+	},
+	"active": false,
+	"settings": {
+	  "executionOrder": "v1"
+	},
+	"versionId": "1c680397-66f2-4ec1-a8a6-bb60d6d564d7",
+	"id": "0nx3Xwa3s9uIqflV",
+	"tags": []
+  }
diff --git a/packages/nodes-base/nodes/Flow/Flow.node.ts b/packages/nodes-base/nodes/Flow/Flow.node.ts
index 277f527e62f2e..c39a37d7987d4 100644
--- a/packages/nodes-base/nodes/Flow/Flow.node.ts
+++ b/packages/nodes-base/nodes/Flow/Flow.node.ts
@@ -269,6 +269,6 @@ export class Flow implements INodeType {
 			);
 			returnData.push(...executionData);
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Flow/GenericFunctions.ts b/packages/nodes-base/nodes/Flow/GenericFunctions.ts
index 0ea3e23191283..0f304e64150ef 100644
--- a/packages/nodes-base/nodes/Flow/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Flow/GenericFunctions.ts
@@ -1,17 +1,17 @@
-import type { OptionsWithUri } from 'request';
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
+	IRequestOptions,
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function flowApiRequest(
-	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -21,7 +21,7 @@ export async function flowApiRequest(
 ): Promise<any> {
 	const credentials = await this.getCredentials('flowApi');
 
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		headers: { Authorization: `Bearer ${credentials.accessToken}` },
 		method,
 		qs,
@@ -48,7 +48,7 @@ export async function flowApiRequest(
 export async function FlowApiRequestAllItems(
 	this: IHookFunctions | IExecuteFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
diff --git a/packages/nodes-base/nodes/Form/FormTrigger.node.json b/packages/nodes-base/nodes/Form/FormTrigger.node.json
new file mode 100644
index 0000000000000..8fb0763a34595
--- /dev/null
+++ b/packages/nodes-base/nodes/Form/FormTrigger.node.json
@@ -0,0 +1,18 @@
+{
+	"node": "n8n-nodes-base.formTrigger",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"categories": ["Core Nodes"],
+	"alias": ["_Form", "form", "table", "submit", "post"],
+	"resources": {
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.formtrigger/"
+			}
+		],
+		"generic": []
+	},
+	"subcategories": {
+		"Core Nodes": ["Other Trigger Nodes"]
+	}
+}
diff --git a/packages/nodes-base/nodes/Form/FormTrigger.node.ts b/packages/nodes-base/nodes/Form/FormTrigger.node.ts
new file mode 100644
index 0000000000000..d81758abfa126
--- /dev/null
+++ b/packages/nodes-base/nodes/Form/FormTrigger.node.ts
@@ -0,0 +1,24 @@
+import type { INodeTypeBaseDescription, IVersionedNodeType } from 'n8n-workflow';
+import { VersionedNodeType } from 'n8n-workflow';
+import { FormTriggerV1 } from './v1/FormTriggerV1.node';
+import { FormTriggerV2 } from './v2/FormTriggerV2.node';
+
+export class FormTrigger extends VersionedNodeType {
+	constructor() {
+		const baseDescription: INodeTypeBaseDescription = {
+			displayName: 'n8n Form Trigger',
+			name: 'formTrigger',
+			icon: 'file:form.svg',
+			group: ['trigger'],
+			description: 'Runs the flow when an n8n generated webform is submitted',
+			defaultVersion: 2,
+		};
+
+		const nodeVersions: IVersionedNodeType['nodeVersions'] = {
+			1: new FormTriggerV1(baseDescription),
+			2: new FormTriggerV2(baseDescription),
+		};
+
+		super(nodeVersions, baseDescription);
+	}
+}
diff --git a/packages/nodes-base/nodes/Form/common.descriptions.ts b/packages/nodes-base/nodes/Form/common.descriptions.ts
new file mode 100644
index 0000000000000..b986412e0a61f
--- /dev/null
+++ b/packages/nodes-base/nodes/Form/common.descriptions.ts
@@ -0,0 +1,252 @@
+/* eslint-disable n8n-nodes-base/node-filename-against-convention */
+import type { INodeProperties } from 'n8n-workflow';
+
+export const webhookPath: INodeProperties = {
+	displayName: 'Form Path',
+	name: 'path',
+	type: 'string',
+	default: '',
+	placeholder: 'webhook',
+	required: true,
+	description: "The final segment of the form's URL, both for test and production",
+};
+
+export const formTitle: INodeProperties = {
+	displayName: 'Form Title',
+	name: 'formTitle',
+	type: 'string',
+	default: '',
+	placeholder: 'e.g. Contact us',
+	required: true,
+	description: 'Shown at the top of the form',
+};
+
+export const formDescription: INodeProperties = {
+	displayName: 'Form Description',
+	name: 'formDescription',
+	type: 'string',
+	default: '',
+	placeholder: "e.g. We'll get back to you soon",
+	description:
+		'Shown underneath the Form Title. Can be used to prompt the user on how to complete the form.',
+};
+
+export const formFields: INodeProperties = {
+	displayName: 'Form Fields',
+	name: 'formFields',
+	placeholder: 'Add Form Field',
+	type: 'fixedCollection',
+	default: { values: [{ label: '', fieldType: 'text' }] },
+	typeOptions: {
+		multipleValues: true,
+		sortable: true,
+	},
+	options: [
+		{
+			displayName: 'Values',
+			name: 'values',
+			values: [
+				{
+					displayName: 'Field Label',
+					name: 'fieldLabel',
+					type: 'string',
+					default: '',
+					placeholder: 'e.g. What is your name?',
+					description: 'Label appears above the input field',
+					required: true,
+				},
+				{
+					displayName: 'Field Type',
+					name: 'fieldType',
+					type: 'options',
+					default: 'text',
+					description: 'The type of field to add to the form',
+					options: [
+						{
+							name: 'Date',
+							value: 'date',
+						},
+						{
+							name: 'Dropdown List',
+							value: 'dropdown',
+						},
+						{
+							name: 'Number',
+							value: 'number',
+						},
+						{
+							name: 'Password',
+							value: 'password',
+						},
+						{
+							name: 'Text',
+							value: 'text',
+						},
+						{
+							name: 'Textarea',
+							value: 'textarea',
+						},
+					],
+					required: true,
+				},
+				{
+					displayName: 'Field Options',
+					name: 'fieldOptions',
+					placeholder: 'Add Field Option',
+					description: 'List of options that can be selected from the dropdown',
+					type: 'fixedCollection',
+					default: { values: [{ option: '' }] },
+					required: true,
+					displayOptions: {
+						show: {
+							fieldType: ['dropdown'],
+						},
+					},
+					typeOptions: {
+						multipleValues: true,
+						sortable: true,
+					},
+					options: [
+						{
+							displayName: 'Values',
+							name: 'values',
+							values: [
+								{
+									displayName: 'Option',
+									name: 'option',
+									type: 'string',
+									default: '',
+								},
+							],
+						},
+					],
+				},
+				{
+					displayName: 'Multiple Choice',
+					name: 'multiselect',
+					type: 'boolean',
+					default: false,
+					description:
+						'Whether to allow the user to select multiple options from the dropdown list',
+					displayOptions: {
+						show: {
+							fieldType: ['dropdown'],
+						},
+					},
+				},
+				{
+					displayName: 'Required Field',
+					name: 'requiredField',
+					type: 'boolean',
+					default: false,
+					description:
+						'Whether to require the user to enter a value for this field before submitting the form',
+				},
+			],
+		},
+	],
+};
+
+export const formRespondMode: INodeProperties = {
+	displayName: 'Respond When',
+	name: 'responseMode',
+	type: 'options',
+	options: [
+		{
+			name: 'Form Is Submitted',
+			value: 'onReceived',
+			description: 'As soon as this node receives the form submission',
+		},
+		{
+			name: 'Workflow Finishes',
+			value: 'lastNode',
+			description: 'When the last node of the workflow is executed',
+		},
+		{
+			name: "Using 'Respond to Webhook' Node",
+			value: 'responseNode',
+			description: "When the 'Respond to Webhook' node is executed",
+		},
+	],
+	default: 'onReceived',
+	description: 'When to respond to the form submission',
+};
+
+export const formTriggerPanel = {
+	header: 'Pull in a test form submission',
+	executionsHelp: {
+		inactive:
+			"Form Trigger has two modes: test and production. <br /> <br /> <b>Use test mode while you build your workflow</b>. Click the 'Test step' button, then fill out the test form that opens in a popup tab. The executions will show up in the editor.<br /> <br /> <b>Use production mode to run your workflow automatically</b>. <a data-key=\"activate\">Activate</a> the workflow, then make requests to the production URL. Then every time there's a form submission via the Production Form URL, the workflow will execute. These executions will show up in the executions list, but not in the editor.",
+		active:
+			"Form Trigger has two modes: test and production. <br /> <br /> <b>Use test mode while you build your workflow</b>. Click the 'Test step' button, then fill out the test form that opens in a popup tab. The executions will show up in the editor.<br /> <br /> <b>Use production mode to run your workflow automatically</b>. <a data-key=\"activate\">Activate</a> the workflow, then make requests to the production URL. Then every time there's a form submission via the Production Form URL, the workflow will execute. These executions will show up in the executions list, but not in the editor.",
+	},
+	activationHint: {
+		active:
+			"This node will also trigger automatically on new form submissions (but those executions won't show up here).",
+		inactive:
+			'<a data-key="activate">Activate</a> this workflow to have it also run automatically for new form submissions created via the Production URL.',
+	},
+};
+
+export const respondWithOptions: INodeProperties = {
+	displayName: 'Form Response',
+	name: 'respondWithOptions',
+	type: 'fixedCollection',
+	placeholder: 'Add Option',
+	default: { values: { respondWith: 'text' } },
+	options: [
+		{
+			displayName: 'Values',
+			name: 'values',
+			values: [
+				{
+					displayName: 'Respond With',
+					name: 'respondWith',
+					type: 'options',
+					default: 'text',
+					options: [
+						{
+							name: 'Form Submitted Text',
+							value: 'text',
+							description: 'Show a response text to the user',
+						},
+						{
+							name: 'Redirect URL',
+							value: 'redirect',
+							description: 'Redirect the user to a URL',
+						},
+					],
+				},
+				{
+					displayName: 'Text to Show',
+					name: 'formSubmittedText',
+					description:
+						"The text displayed to users after they fill the form. Leave it empty if don't want to show any additional text.",
+					type: 'string',
+					default: 'Your response has been recorded',
+					displayOptions: {
+						show: {
+							respondWith: ['text'],
+						},
+					},
+				},
+				{
+					// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+					displayName: 'URL to Redirect to',
+					name: 'redirectUrl',
+					description:
+						'The URL to redirect users to after they fill the form. Must be a valid URL.',
+					type: 'string',
+					default: '',
+					validateType: 'url',
+					placeholder: 'e.g. http://www.n8n.io',
+					displayOptions: {
+						show: {
+							respondWith: ['redirect'],
+						},
+					},
+				},
+			],
+		},
+	],
+};
diff --git a/packages/nodes-base/nodes/Form/form.svg b/packages/nodes-base/nodes/Form/form.svg
new file mode 100644
index 0000000000000..62c934be264b7
--- /dev/null
+++ b/packages/nodes-base/nodes/Form/form.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="46" height="40" fill="none"><path fill="#00B7BC" fill-rule="evenodd" d="M34.978 37.732a1.56 1.56 0 0 1-1.562 1.563H6.26a1.56 1.56 0 0 1-1.563-1.563V9.607c0-.405.157-.794.438-1.086l6.304-6.531v5.344H8.213a1.172 1.172 0 1 0 0 2.343h4.43a1.17 1.17 0 0 0 1.171-1.171V.232h19.602a1.56 1.56 0 0 1 1.562 1.563v10.327l-2.86 2.86-8.252 8.276a413.006 413.006 0 0 1-1.654 1.662l-.337.337a2 2 0 0 0-.557 1.08L20.3 31.922c-.108.638-.215 1.079.211 1.418.403.32.9.174 1.54.066l5.408-.928a2 2 0 0 0 1.08-.556l6.44-6.429zm-24.03-21.265a1.18 1.18 0 0 0 1.171 1.172h13.163a1.172 1.172 0 1 0 0-2.344H12.119a1.17 1.17 0 0 0-1.172 1.172m7.294 14.766a1.17 1.17 0 0 0-1.172-1.172H12.12a1.172 1.172 0 1 0 0 2.343h4.951a1.17 1.17 0 0 0 1.172-1.172m.86-7.391a1.17 1.17 0 0 0-1.172-1.172h-5.811a1.172 1.172 0 1 0 0 2.343h5.81a1.164 1.164 0 0 0 1.173-1.171" clip-rule="evenodd"/><path fill="#00B7BC" d="m33.532 16.397 4.289-4.289 3.758 3.71 1.617-1.616 2.258 2.257c.218.218.34.513.343.82-.002.311-.125.608-.344.83l-6.804 6.796a1.13 1.13 0 0 1-.828.343 1.15 1.15 0 0 1-.828-.343 1.18 1.18 0 0 1 0-1.657l5.976-5.968-1.312-1.313-1.383 1.414-13.149 13.125-4.617.782.782-4.617.336-.337 2.562 2.555a1.1 1.1 0 0 0 .828.344c.312.005.612-.12.828-.344a1.18 1.18 0 0 0 0-1.656l-2.562-2.562zM44.736 12.24c0 .414-.163.81-.454 1.102l-.922.914-3.852-3.828.93-.93a1.563 1.563 0 0 1 2.203 0l1.64 1.641c.291.293.455.69.455 1.102"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Form/interfaces.ts b/packages/nodes-base/nodes/Form/interfaces.ts
new file mode 100644
index 0000000000000..ece460a7fe3e5
--- /dev/null
+++ b/packages/nodes-base/nodes/Form/interfaces.ts
@@ -0,0 +1,34 @@
+export type FormField = {
+	fieldLabel: string;
+	fieldType: string;
+	requiredField: boolean;
+	fieldOptions?: { values: Array<{ option: string }> };
+	multiselect?: boolean;
+};
+
+export type FormTriggerInput = {
+	isSelect?: boolean;
+	isMultiSelect?: boolean;
+	isTextarea?: boolean;
+	isInput?: boolean;
+	labbel: string;
+	id: string;
+	errorId: string;
+	type?: 'text' | 'number' | 'date';
+	inputRequired: 'form-required' | '';
+	selectOptions?: string[];
+	multiSelectOptions?: Array<{ id: string; label: string }>;
+};
+
+export type FormTriggerData = {
+	testRun: boolean;
+	validForm: boolean;
+	formTitle: string;
+	formDescription?: string;
+	formSubmittedText?: string;
+	redirectUrl?: string;
+	n8nWebsiteLink: string;
+	formFields: FormTriggerInput[];
+	useResponseData?: boolean;
+	appendAttribution?: boolean;
+};
diff --git a/packages/nodes-base/nodes/Form/utils.ts b/packages/nodes-base/nodes/Form/utils.ts
new file mode 100644
index 0000000000000..f5adc84e11cf4
--- /dev/null
+++ b/packages/nodes-base/nodes/Form/utils.ts
@@ -0,0 +1,164 @@
+import { jsonParse, type IDataObject, type IWebhookFunctions } from 'n8n-workflow';
+import type { FormField, FormTriggerData, FormTriggerInput } from './interfaces';
+
+export const prepareFormData = (
+	formTitle: string,
+	formDescription: string,
+	formSubmittedText: string | undefined,
+	redirectUrl: string | undefined,
+	formFields: FormField[],
+	testRun: boolean,
+	instanceId?: string,
+	useResponseData?: boolean,
+	appendAttribution = true,
+) => {
+	const validForm = formFields.length > 0;
+	const utm_campaign = instanceId ? `&utm_campaign=${instanceId}` : '';
+	const n8nWebsiteLink = `https://n8n.io/?utm_source=n8n-internal&utm_medium=form-trigger${utm_campaign}`;
+
+	if (formSubmittedText === undefined) {
+		formSubmittedText = 'Your response has been recorded';
+	}
+
+	const formData: FormTriggerData = {
+		testRun,
+		validForm,
+		formTitle,
+		formDescription,
+		formSubmittedText,
+		n8nWebsiteLink,
+		formFields: [],
+		useResponseData,
+		appendAttribution,
+	};
+
+	if (redirectUrl) {
+		if (!redirectUrl.includes('://')) {
+			redirectUrl = `http://${redirectUrl}`;
+		}
+		formData.redirectUrl = redirectUrl;
+	}
+
+	if (!validForm) {
+		return formData;
+	}
+
+	for (const [index, field] of formFields.entries()) {
+		const { fieldType, requiredField, multiselect } = field;
+
+		const input: IDataObject = {
+			id: `field-${index}`,
+			errorId: `error-field-${index}`,
+			label: field.fieldLabel,
+			inputRequired: requiredField ? 'form-required' : '',
+		};
+
+		if (multiselect) {
+			input.isMultiSelect = true;
+			input.multiSelectOptions =
+				field.fieldOptions?.values.map((e, i) => ({
+					id: `option${i}`,
+					label: e.option,
+				})) ?? [];
+		} else if (fieldType === 'dropdown') {
+			input.isSelect = true;
+			const fieldOptions = field.fieldOptions?.values ?? [];
+			input.selectOptions = fieldOptions.map((e) => e.option);
+		} else if (fieldType === 'textarea') {
+			input.isTextarea = true;
+		} else {
+			input.isInput = true;
+			input.type = fieldType as 'text' | 'number' | 'date';
+		}
+
+		formData.formFields.push(input as FormTriggerInput);
+	}
+
+	return formData;
+};
+
+export async function formWebhook(context: IWebhookFunctions) {
+	const mode = context.getMode() === 'manual' ? 'test' : 'production';
+	const formFields = context.getNodeParameter('formFields.values', []) as FormField[];
+	const method = context.getRequestObject().method;
+
+	//Show the form on GET request
+	if (method === 'GET') {
+		const formTitle = context.getNodeParameter('formTitle', '') as string;
+		const formDescription = context.getNodeParameter('formDescription', '') as string;
+		const instanceId = context.getInstanceId();
+		const responseMode = context.getNodeParameter('responseMode', '') as string;
+		const options = context.getNodeParameter('options', {}) as IDataObject;
+
+		let formSubmittedText;
+		let redirectUrl;
+		let appendAttribution = true;
+
+		if (options.respondWithOptions) {
+			const values = (options.respondWithOptions as IDataObject).values as IDataObject;
+			if (values.respondWith === 'text') {
+				formSubmittedText = values.formSubmittedText as string;
+			}
+			if (values.respondWith === 'redirect') {
+				redirectUrl = values.redirectUrl as string;
+			}
+		} else {
+			formSubmittedText = options.formSubmittedText as string;
+		}
+
+		if (options.appendAttribution === false) {
+			appendAttribution = false;
+		}
+
+		const useResponseData = responseMode === 'responseNode';
+
+		const data = prepareFormData(
+			formTitle,
+			formDescription,
+			formSubmittedText,
+			redirectUrl,
+			formFields,
+			mode === 'test',
+			instanceId,
+			useResponseData,
+			appendAttribution,
+		);
+
+		const res = context.getResponseObject();
+		res.render('form-trigger', data);
+		return {
+			noWebhookResponse: true,
+		};
+	}
+
+	const bodyData = (context.getBodyData().data as IDataObject) ?? {};
+
+	const returnData: IDataObject = {};
+	for (const [index, field] of formFields.entries()) {
+		const key = `field-${index}`;
+		let value = bodyData[key] ?? null;
+
+		if (value === null) returnData[field.fieldLabel] = null;
+
+		if (field.fieldType === 'number') {
+			value = Number(value);
+		}
+		if (field.fieldType === 'text') {
+			value = String(value).trim();
+		}
+		if (field.multiselect && typeof value === 'string') {
+			value = jsonParse(value);
+		}
+
+		returnData[field.fieldLabel] = value;
+	}
+	returnData.submittedAt = new Date().toISOString();
+	returnData.formMode = mode;
+
+	const webhookResponse: IDataObject = { status: 200 };
+
+	return {
+		webhookResponse,
+		workflowData: [context.helpers.returnJsonArray(returnData)],
+	};
+}
diff --git a/packages/nodes-base/nodes/Form/v1/FormTriggerV1.node.ts b/packages/nodes-base/nodes/Form/v1/FormTriggerV1.node.ts
new file mode 100644
index 0000000000000..bf31639bd64fc
--- /dev/null
+++ b/packages/nodes-base/nodes/Form/v1/FormTriggerV1.node.ts
@@ -0,0 +1,98 @@
+/* eslint-disable n8n-nodes-base/node-filename-against-convention */
+import {
+	FORM_TRIGGER_PATH_IDENTIFIER,
+	type INodeType,
+	type INodeTypeBaseDescription,
+	type INodeTypeDescription,
+	type IWebhookFunctions,
+} from 'n8n-workflow';
+
+import {
+	formDescription,
+	formFields,
+	formRespondMode,
+	formTitle,
+	formTriggerPanel,
+	webhookPath,
+} from '../common.descriptions';
+import { formWebhook } from '../utils';
+
+const descriptionV1: INodeTypeDescription = {
+	displayName: 'n8n Form Trigger',
+	name: 'formTrigger',
+	icon: 'file:form.svg',
+	group: ['trigger'],
+	version: 1,
+	description: 'Runs the flow when an n8n generated webform is submitted',
+	defaults: {
+		name: 'n8n Form Trigger',
+	},
+	// eslint-disable-next-line n8n-nodes-base/node-class-description-inputs-wrong-regular-node
+	inputs: [],
+	outputs: ['main'],
+	webhooks: [
+		{
+			name: 'setup',
+			httpMethod: 'GET',
+			responseMode: 'onReceived',
+			isFullPath: true,
+			path: `={{$parameter["path"]}}/${FORM_TRIGGER_PATH_IDENTIFIER}`,
+			ndvHideUrl: true,
+		},
+		{
+			name: 'default',
+			httpMethod: 'POST',
+			responseMode: '={{$parameter["responseMode"]}}',
+			responseData: '={{$parameter["responseMode"] === "lastNode" ? "noData" : undefined}}',
+			isFullPath: true,
+			path: `={{$parameter["path"]}}/${FORM_TRIGGER_PATH_IDENTIFIER}`,
+			ndvHideMethod: true,
+		},
+	],
+	eventTriggerDescription: 'Waiting for you to submit the form',
+	activationMessage: 'You can now make calls to your production Form URL.',
+	triggerPanel: formTriggerPanel,
+	properties: [
+		webhookPath,
+		formTitle,
+		formDescription,
+		formFields,
+		formRespondMode,
+		{
+			displayName: 'Options',
+			name: 'options',
+			type: 'collection',
+			placeholder: 'Add Option',
+			default: {},
+			displayOptions: {
+				hide: {
+					responseMode: ['responseNode'],
+				},
+			},
+			options: [
+				{
+					displayName: 'Form Submitted Text',
+					name: 'formSubmittedText',
+					description: 'The text displayed to users after they filled the form',
+					type: 'string',
+					default: 'Your response has been recorded',
+				},
+			],
+		},
+	],
+};
+
+export class FormTriggerV1 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			...descriptionV1,
+		};
+	}
+
+	async webhook(this: IWebhookFunctions) {
+		return await formWebhook(this);
+	}
+}
diff --git a/packages/nodes-base/nodes/Form/v2/FormTriggerV2.node.ts b/packages/nodes-base/nodes/Form/v2/FormTriggerV2.node.ts
new file mode 100644
index 0000000000000..7ad3edf79d97d
--- /dev/null
+++ b/packages/nodes-base/nodes/Form/v2/FormTriggerV2.node.ts
@@ -0,0 +1,115 @@
+/* eslint-disable n8n-nodes-base/node-filename-against-convention */
+import {
+	type INodeType,
+	type INodeTypeBaseDescription,
+	type INodeTypeDescription,
+	type IWebhookFunctions,
+} from 'n8n-workflow';
+
+import { formWebhook } from '../utils';
+import {
+	formDescription,
+	formFields,
+	formRespondMode,
+	formTitle,
+	formTriggerPanel,
+	respondWithOptions,
+	webhookPath,
+} from '../common.descriptions';
+
+const descriptionV2: INodeTypeDescription = {
+	displayName: 'n8n Form Trigger',
+	name: 'formTrigger',
+	icon: 'file:form.svg',
+	group: ['trigger'],
+	version: 2,
+	description: 'Runs the flow when an n8n generated webform is submitted',
+	defaults: {
+		name: 'n8n Form Trigger',
+	},
+	// eslint-disable-next-line n8n-nodes-base/node-class-description-inputs-wrong-regular-node
+	inputs: [],
+	outputs: ['main'],
+	webhooks: [
+		{
+			name: 'setup',
+			httpMethod: 'GET',
+			responseMode: 'onReceived',
+			isFullPath: true,
+			path: '={{$parameter["path"]}}',
+			ndvHideUrl: true,
+			isForm: true,
+		},
+		{
+			name: 'default',
+			httpMethod: 'POST',
+			responseMode: '={{$parameter["responseMode"]}}',
+			responseData: '={{$parameter["responseMode"] === "lastNode" ? "noData" : undefined}}',
+			isFullPath: true,
+			path: '={{$parameter["path"]}}',
+			ndvHideMethod: true,
+			isForm: true,
+		},
+	],
+	eventTriggerDescription: 'Waiting for you to submit the form',
+	activationMessage: 'You can now make calls to your production Form URL.',
+	triggerPanel: formTriggerPanel,
+	properties: [
+		webhookPath,
+		formTitle,
+		formDescription,
+		formFields,
+		formRespondMode,
+		{
+			displayName:
+				"In the 'Respond to Webhook' node, select 'Respond With JSON' and set the <strong>formSubmittedText</strong> key to display a custom response in the form, or the <strong>redirectURL</strong> key to redirect users to a URL",
+			name: 'formNotice',
+			type: 'notice',
+			displayOptions: {
+				show: { responseMode: ['responseNode'] },
+			},
+			default: '',
+		},
+		{
+			displayName: 'Options',
+			name: 'options',
+			type: 'collection',
+			placeholder: 'Add Option',
+			default: {},
+			options: [
+				{
+					// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+					displayName: 'Append n8n Attribution',
+					name: 'appendAttribution',
+					type: 'boolean',
+					default: true,
+					description:
+						'Whether to include the link “Form automated with n8n” at the bottom of the form',
+				},
+				{
+					...respondWithOptions,
+					displayOptions: {
+						hide: {
+							'/responseMode': ['responseNode'],
+						},
+					},
+				},
+			],
+		},
+	],
+};
+
+export class FormTriggerV2 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			...descriptionV2,
+		};
+	}
+
+	async webhook(this: IWebhookFunctions) {
+		return await formWebhook(this);
+	}
+}
diff --git a/packages/nodes-base/nodes/FormIo/GenericFunctions.ts b/packages/nodes-base/nodes/FormIo/GenericFunctions.ts
index be82c1c9800a4..52dfbf944e323 100644
--- a/packages/nodes-base/nodes/FormIo/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/FormIo/GenericFunctions.ts
@@ -4,8 +4,10 @@ import type {
 	IHookFunctions,
 	IWebhookFunctions,
 	JsonObject,
+	IRequestOptions,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
-import { NodeApiError } from 'n8n-workflow';
+import { ApplicationError, NodeApiError } from 'n8n-workflow';
 
 interface IFormIoCredentials {
 	environment: 'cloudHosted' | ' selfHosted';
@@ -36,14 +38,15 @@ async function getToken(
 		uri: `${base}/user/login`,
 		json: true,
 		resolveWithFullResponse: true,
-	};
+	} satisfies IRequestOptions;
 
 	try {
 		const responseObject = await this.helpers.request(options);
 		return responseObject.headers['x-jwt-token'];
 	} catch (error) {
-		throw new Error(
+		throw new ApplicationError(
 			'Authentication Failed for Form.io. Please provide valid credentails/ endpoint details',
+			{ level: 'warning' },
 		);
 	}
 }
@@ -53,7 +56,7 @@ async function getToken(
  */
 export async function formIoApiRequest(
 	this: IHookFunctions | ILoadOptionsFunctions | IWebhookFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body = {},
 	qs = {},
diff --git a/packages/nodes-base/nodes/FormIo/formio.svg b/packages/nodes-base/nodes/FormIo/formio.svg
index 0887bca61d9f3..99e152bf81775 100644
--- a/packages/nodes-base/nodes/FormIo/formio.svg
+++ b/packages/nodes-base/nodes/FormIo/formio.svg
@@ -1 +1 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 48 48"><title>favicon-3</title><image width="48" height="48" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAMAAABg3Am1AAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAC3FBMVEUAAAAQdbwPdbwPdbwPdbxUsUdUskdUskdUskdVskgQdrwPdbwPdbwPdbwPdbwQdbxUskdUskdUskdUskdVskhVskgUdroQdbwPdbwPdbwPdbwPdbxUskdUskdUskcQdrwPdbwPdbwPdbxUskdUskdUskdUskdUskdWs0kQdrwQdbwPdbwPdbwPdbwQdbxWs0lUskdUskdUskdUskdVskgVeL0RdrwPdbwPdbwPdbwPdbwPdbwQdbxUskdUskdUskdUskdUskdVskkRdrwPdbwPdbwPdbwPdbwPdbwQdbxYskxUskdUskdUskdUskdUskdXs0oSdrwPdbwPdbwPdbwPdbwPdbwQdbwbe75VsklUskdUskdUskdUskdVskgRdrwPdbwPdbwPdbwPdbwQdbxUskdUskdUskdVskhWskkRdrwPdbwPdbwPdbwPdbwQdbxWsklUskdUskdUskdUskdUskcPdbwPdbwPdbwPdbwUd71VskhUskdUskdUskdVskgPdbwPdbwPdbwUeL1VskhUskdUskdUskdUskcPdbwPdbwPdbwQdbxVsklUskdUskdUskdUskdUskdVskgPdbwPdbwPdbwPdbwPdbxUskdUskdUskdUskdUskdUskdUskgTd7wQdbwPdbwPdbwPdbwUeL1VskhUskdUskdVskgPdbwPdbwPdbwPdbwQdbxVs0hUskdUskdUskdUskdUskcQdbwPdbwPdbwPdbwRdrxUskhUskdUskdUskdVskgWeb4QdbwPdbwPdbwPdbwPdbxVskhUskdUskdUskdVskgRdrwPdbwPdbwPdbxUskdUskdUskdUskdWskkPdbwPdbwPdbwPdbxUskdUskdUskdUskcSdr0PdbwPdbwPdbwQdbxUskdUskcQdbwPdbwPdbwPdbwPdbwXeL5UskdUskdUskdVskkQdbwPdbwRdrxUskdUskcPdbxUskf///9ORprqAAAA8XRSTlMAGmZpGwE4d0kKCErK/KkQOt3znicBATin8Oou/n8ZE3Lisz7l/b9HBQZBuvalIgFMz++NIgEflO/+wVAMHXjk2WEMEHDV/eF9GwE5pvW2RAQFQbX6+LA1AQlg1uuKIR2M7M9cDiKI01wKA2DS6YQhBUCv+rAwL+S2QwIPbdipCE/jTgIOifvRFBq+kx4CQ7v4+X0CIefOaxUBL5Lo/M0LBDq9uDcDDGLeGhPY5oEXAjT3sj8HKY7JYgsii8xnEAM8t/ekOA1dy+wcEW9hAhOdwUIEMpnz22PbbxgHVsPZH17xFoLe3GUBoMpRBgYdBCEWUIfmiQAAAAFiS0dE86yxvu4AAAAHdElNRQflBgsXNAUANeC9AAAB60lEQVRIx2NgGAWjgFaAkYmZBcxgZWPn4CSonIubh/cjHz+IKSD4SUhYRBSvcjFxCcmPHz9KSYM47J8+fZIRlJXDo15eQfEjCCiBbVBWAer4pKqmroFDuaaWNi9IuY6uHpivb2CoCtJiZGyCzV2mZuYWIOWWVtY2MDFbO3uQDhkHRycM9c4urm4g9e4enkiiXt4+viAtvn7+ASjKA4OCQ0DKQ8PCI1ANioyKlgFpiYmNQxKNT0gEuyYpOQXTralpMWB3pWdkQkWysnPArsnNy8caGAWFRcVgd5WUQgTKysGuqaiswhXc1TW1YHfV1YO5DWDnNzY1446gltY2kIb2DjCvswscW1LdPTiU9/b1TwCpnzhpMkRgSsJUkA63adNnYFE+c9bsOSDlc+c5zoeJLVi4COws3sVLlqKrX7Z8xSdIfK9EFl7FtBrsrjVr16EoX7+haCNIefGmzVvQTNq6Dewu3u07diIEd+2GpI09e/dhunX/gYNgdx06fAQaXkePHQe75kTsSeyhcep0OcRdZ86CuOfOg8Nm7oWLl3AF99nLV66CdFwDp+/r4LC/cfMWAx5w+85dYJ64dx/EfjD306eH50sZCIBHj588ffYc7KQX9i9fvSaknoHhzdu376Cefv9BlLD6UTAK6AUAHXsSvNupchsAAAAldEVYdGRhdGU6Y3JlYXRlADIwMjEtMDYtMTFUMjM6NTI6MDQrMDA6MDBy76P8AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDIxLTA2LTExVDIzOjUyOjA0KzAwOjAwA7IbQAAAAABJRU5ErkJggg=="/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" data-name="Layer 1" viewBox="0 0 48 48"><image xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAMAAABg3Am1AAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAC3FBMVEUAAAAQdbwPdbwPdbwPdbxUsUdUskdUskdUskdVskgQdrwPdbwPdbwPdbwPdbwQdbxUskdUskdUskdUskdVskhVskgUdroQdbwPdbwPdbwPdbwPdbxUskdUskdUskcQdrwPdbwPdbwPdbxUskdUskdUskdUskdUskdWs0kQdrwQdbwPdbwPdbwPdbwQdbxWs0lUskdUskdUskdUskdVskgVeL0RdrwPdbwPdbwPdbwPdbwPdbwQdbxUskdUskdUskdUskdUskdVskkRdrwPdbwPdbwPdbwPdbwPdbwQdbxYskxUskdUskdUskdUskdUskdXs0oSdrwPdbwPdbwPdbwPdbwPdbwQdbwbe75VsklUskdUskdUskdUskdVskgRdrwPdbwPdbwPdbwPdbwQdbxUskdUskdUskdVskhWskkRdrwPdbwPdbwPdbwPdbwQdbxWsklUskdUskdUskdUskdUskcPdbwPdbwPdbwPdbwUd71VskhUskdUskdUskdVskgPdbwPdbwPdbwUeL1VskhUskdUskdUskdUskcPdbwPdbwPdbwQdbxVsklUskdUskdUskdUskdUskdVskgPdbwPdbwPdbwPdbwPdbxUskdUskdUskdUskdUskdUskdUskgTd7wQdbwPdbwPdbwPdbwUeL1VskhUskdUskdVskgPdbwPdbwPdbwPdbwQdbxVs0hUskdUskdUskdUskdUskcQdbwPdbwPdbwPdbwRdrxUskhUskdUskdUskdVskgWeb4QdbwPdbwPdbwPdbwPdbxVskhUskdUskdUskdVskgRdrwPdbwPdbwPdbxUskdUskdUskdUskdWskkPdbwPdbwPdbwPdbxUskdUskdUskdUskcSdr0PdbwPdbwPdbwQdbxUskdUskcQdbwPdbwPdbwPdbwPdbwXeL5UskdUskdUskdVskkQdbwPdbwRdrxUskdUskcPdbxUskf///9ORprqAAAA8XRSTlMAGmZpGwE4d0kKCErK/KkQOt3znicBATin8Oou/n8ZE3Lisz7l/b9HBQZBuvalIgFMz++NIgEflO/+wVAMHXjk2WEMEHDV/eF9GwE5pvW2RAQFQbX6+LA1AQlg1uuKIR2M7M9cDiKI01wKA2DS6YQhBUCv+rAwL+S2QwIPbdipCE/jTgIOifvRFBq+kx4CQ7v4+X0CIefOaxUBL5Lo/M0LBDq9uDcDDGLeGhPY5oEXAjT3sj8HKY7JYgsii8xnEAM8t/ekOA1dy+wcEW9hAhOdwUIEMpnz22PbbxgHVsPZH17xFoLe3GUBoMpRBgYdBCEWUIfmiQAAAAFiS0dE86yxvu4AAAAHdElNRQflBgsXNAUANeC9AAAB60lEQVRIx2NgGAWjgFaAkYmZBcxgZWPn4CSonIubh/cjHz+IKSD4SUhYRBSvcjFxCcmPHz9KSYM47J8+fZIRlJXDo15eQfEjCCiBbVBWAer4pKqmroFDuaaWNi9IuY6uHpivb2CoCtJiZGyCzV2mZuYWIOWWVtY2MDFbO3uQDhkHRycM9c4urm4g9e4enkiiXt4+viAtvn7+ASjKA4OCQ0DKQ8PCI1ANioyKlgFpiYmNQxKNT0gEuyYpOQXTralpMWB3pWdkQkWysnPArsnNy8caGAWFRcVgd5WUQgTKysGuqaiswhXc1TW1YHfV1YO5DWDnNzY1446gltY2kIb2DjCvswscW1LdPTiU9/b1TwCpnzhpMkRgSsJUkA63adNnYFE+c9bsOSDlc+c5zoeJLVi4COws3sVLlqKrX7Z8xSdIfK9EFl7FtBrsrjVr16EoX7+haCNIefGmzVvQTNq6Dewu3u07diIEd+2GpI09e/dhunX/gYNgdx06fAQaXkePHQe75kTsSeyhcep0OcRdZ86CuOfOg8Nm7oWLl3AF99nLV66CdFwDp+/r4LC/cfMWAx5w+85dYJ64dx/EfjD306eH50sZCIBHj588ffYc7KQX9i9fvSaknoHhzdu376Cefv9BlLD6UTAK6AUAHXsSvNupchsAAAAldEVYdGRhdGU6Y3JlYXRlADIwMjEtMDYtMTFUMjM6NTI6MDQrMDA6MDBy76P8AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDIxLTA2LTExVDIzOjUyOjA0KzAwOjAwA7IbQAAAAABJRU5ErkJggg==" width="48" height="48"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Formstack/GenericFunctions.ts b/packages/nodes-base/nodes/Formstack/GenericFunctions.ts
index de19384130ccc..fe53058349a22 100644
--- a/packages/nodes-base/nodes/Formstack/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Formstack/GenericFunctions.ts
@@ -6,10 +6,10 @@ import type {
 	IWebhookFunctions,
 	INodePropertyOptions,
 	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
-import { NodeApiError } from 'n8n-workflow';
-
-import type { OptionsWithUri } from 'request';
+import { ApplicationError, NodeApiError } from 'n8n-workflow';
 
 export interface IFormstackFieldDefinitionType {
 	id: string;
@@ -51,14 +51,14 @@ export const enum FormstackFieldFormat {
  */
 export async function apiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject = {},
 	query: IDataObject = {},
 ): Promise<any> {
 	const authenticationMethod = this.getNodeParameter('authentication', 0);
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {},
 		method,
 		body,
@@ -93,7 +93,7 @@ export async function apiRequest(
  */
 export async function apiRequestAllItems(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject,
 	dataKey: string,
@@ -136,7 +136,7 @@ export async function getForms(this: ILoadOptionsFunctions): Promise<INodeProper
 	});
 
 	if (responseData.items === undefined) {
-		throw new Error('No data got returned');
+		throw new ApplicationError('No data got returned', { level: 'warning' });
 	}
 	const returnData: INodePropertyOptions[] = [];
 	for (const baseData of responseData.items) {
@@ -160,7 +160,7 @@ export async function getFields(
 	const responseData = await apiRequestAllItems.call(this, 'GET', endpoint, {}, 'fields');
 
 	if (responseData.items === undefined) {
-		throw new Error('No form fields meta data got returned');
+		throw new ApplicationError('No form fields meta data got returned', { level: 'warning' });
 	}
 
 	const fields = responseData.items as IFormstackFieldDefinitionType[];
@@ -185,7 +185,7 @@ export async function getSubmission(
 	const responseData = await apiRequestAllItems.call(this, 'GET', endpoint, {}, 'data');
 
 	if (responseData.items === undefined) {
-		throw new Error('No form fields meta data got returned');
+		throw new ApplicationError('No form fields meta data got returned', { level: 'warning' });
 	}
 
 	return responseData.items as IFormstackSubmissionFieldContainer[];
diff --git a/packages/nodes-base/nodes/Formstack/formstack.svg b/packages/nodes-base/nodes/Formstack/formstack.svg
index 7d6860f60a327..a0acf183ed86e 100644
--- a/packages/nodes-base/nodes/Formstack/formstack.svg
+++ b/packages/nodes-base/nodes/Formstack/formstack.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 65.006 55.006" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#A" x=".503" y=".503"/><symbol id="A" overflow="visible"><g stroke="none"><path d="M50.667 5.333h3.723a1.6 1.6 0 0 1 1.6 1.6V46.38a1.6 1.6 0 0 1-1.6 1.6h-3.723zm8 5.333h3.723a1.6 1.6 0 0 1 1.6 1.6v28.78a1.6 1.6 0 0 1-1.6 1.61h-3.723zM0 1.6C0 .714.714 0 1.6 0h44.8c.886 0 1.6.714 1.6 1.6v50.133c0 .886-.714 1.6-1.6 1.6H1.6c-.886 0-1.6-.714-1.6-1.6z" fill="#21b573" fill-rule="nonzero"/><path d="M11.2 8.533h24.624c.227 0 .428.143.503.357s.007.452-.17.593L11.533 29.182c-.16.128-.379.153-.564.064s-.302-.276-.302-.481V9.056c0-.295.239-.533.533-.533zm-.533 32.024v-8.252c0-.164.075-.319.204-.42l7.173-5.63c.094-.074.21-.114.329-.114h13.036c.234 0 .44.152.509.375s-.015.466-.208.598L11.502 40.996c-.163.112-.375.124-.55.032s-.285-.274-.285-.472zm.228 3.095l7.467-5.203c.163-.114.376-.127.552-.035s.287.274.287.473v5.42c0 .295-.239.533-.533.533H11.17c-.136 0-.267-.054-.364-.15s-.151-.228-.15-.364v-.236c0-.175.085-.338.228-.438z" fill-rule="nonzero"/></g></symbol></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round" viewBox="0 0 65.006 55.006"><use xlink:href="#a" x=".503" y=".503"/><symbol id="a" overflow="visible"><g fill-rule="nonzero" stroke="none"><path fill="#21b573" d="M50.667 5.333h3.723a1.6 1.6 0 0 1 1.6 1.6V46.38a1.6 1.6 0 0 1-1.6 1.6h-3.723zm8 5.333h3.723a1.6 1.6 0 0 1 1.6 1.6v28.78a1.6 1.6 0 0 1-1.6 1.61h-3.723zM0 1.6C0 .714.714 0 1.6 0h44.8c.886 0 1.6.714 1.6 1.6v50.133c0 .886-.714 1.6-1.6 1.6H1.6c-.886 0-1.6-.714-1.6-1.6z"/><path d="M11.2 8.533h24.624a.532.532 0 0 1 .333.95L11.533 29.182a.533.533 0 0 1-.866-.417V9.056c0-.295.239-.533.533-.533zm-.533 32.024v-8.252c0-.164.075-.319.204-.42l7.173-5.63a.53.53 0 0 1 .329-.114h13.036a.532.532 0 0 1 .301.973L11.502 40.996a.533.533 0 0 1-.835-.44zm.228 3.095 7.467-5.203a.533.533 0 0 1 .839.438v5.42a.533.533 0 0 1-.533.533H11.17a.51.51 0 0 1-.514-.514v-.236c0-.175.085-.338.228-.438z"/></g></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Freshdesk/Freshdesk.node.ts b/packages/nodes-base/nodes/Freshdesk/Freshdesk.node.ts
index dbeb8d14d64de..d368fd060e5f2 100644
--- a/packages/nodes-base/nodes/Freshdesk/Freshdesk.node.ts
+++ b/packages/nodes-base/nodes/Freshdesk/Freshdesk.node.ts
@@ -1420,6 +1420,6 @@ export class Freshdesk implements INodeType {
 				throw error;
 			}
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Freshdesk/GenericFunctions.ts b/packages/nodes-base/nodes/Freshdesk/GenericFunctions.ts
index 29663066778d4..59578dfea3e62 100644
--- a/packages/nodes-base/nodes/Freshdesk/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Freshdesk/GenericFunctions.ts
@@ -1,16 +1,16 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
+	IRequestOptions,
 	JsonObject,
 } from 'n8n-workflow';
 import { BINARY_ENCODING, NodeApiError } from 'n8n-workflow';
 
 export async function freshdeskApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -24,7 +24,7 @@ export async function freshdeskApiRequest(
 
 	const endpoint = 'freshdesk.com/api/v2';
 
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		headers: {
 			'Content-Type': 'application/json',
 			Authorization: `${Buffer.from(apiKey).toString(BINARY_ENCODING)}`,
@@ -51,7 +51,7 @@ export async function freshdeskApiRequest(
 
 export async function freshdeskApiRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: any = {},
diff --git a/packages/nodes-base/nodes/Freshservice/Freshservice.node.ts b/packages/nodes-base/nodes/Freshservice/Freshservice.node.ts
index 0f8854b1b85e4..19555200c6aa2 100644
--- a/packages/nodes-base/nodes/Freshservice/Freshservice.node.ts
+++ b/packages/nodes-base/nodes/Freshservice/Freshservice.node.ts
@@ -8,6 +8,7 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
+import { tz } from 'moment-timezone';
 import {
 	adjustAddress,
 	adjustAgentRoles,
@@ -57,8 +58,6 @@ import {
 
 import type { AddressFixedCollection, LoadedResource, LoadedUser, RolesParameter } from './types';
 
-import { tz } from 'moment-timezone';
-
 export class Freshservice implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Freshservice',
@@ -236,7 +235,7 @@ export class Freshservice implements INodeType {
 				fields = fields
 					.concat(...asset_type_fields.map((data) => data.fields))
 					.map((data) => ({ name: data.label, id: data.name }));
-				// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+
 				return toOptions(fields);
 			},
 
@@ -1390,6 +1389,6 @@ export class Freshservice implements INodeType {
 			returnData.push(...executionData);
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Freshservice/GenericFunctions.ts b/packages/nodes-base/nodes/Freshservice/GenericFunctions.ts
index 8cf420fab5b44..558a34c125ab9 100644
--- a/packages/nodes-base/nodes/Freshservice/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Freshservice/GenericFunctions.ts
@@ -4,9 +4,12 @@ import type {
 	IDataObject,
 	ILoadOptionsFunctions,
 	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
+import { omit } from 'lodash';
 import type {
 	AddressFixedCollection,
 	FreshserviceCredentials,
@@ -14,13 +17,9 @@ import type {
 	RolesParameter,
 } from './types';
 
-import type { OptionsWithUri } from 'request';
-
-import omit from 'lodash.omit';
-
 export async function freshserviceApiRequest(
 	this: IExecuteFunctions | IHookFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject = {},
 	qs: IDataObject = {},
@@ -30,7 +29,7 @@ export async function freshserviceApiRequest(
 	)) as FreshserviceCredentials;
 	const encodedApiKey = Buffer.from(`${apiKey}:X`).toString('base64');
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			Authorization: `Basic ${encodedApiKey}`,
 		},
@@ -76,7 +75,7 @@ export async function freshserviceApiRequest(
 
 export async function freshserviceApiRequestAllItems(
 	this: IExecuteFunctions | IHookFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject = {},
 	qs: IDataObject = {},
@@ -99,7 +98,7 @@ export async function freshserviceApiRequestAllItems(
 
 export async function handleListing(
 	this: IExecuteFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject = {},
 	qs: IDataObject = {},
@@ -107,7 +106,7 @@ export async function handleListing(
 	const returnAll = this.getNodeParameter('returnAll', 0);
 
 	if (returnAll) {
-		return freshserviceApiRequestAllItems.call(this, method, endpoint, body, qs);
+		return await freshserviceApiRequestAllItems.call(this, method, endpoint, body, qs);
 	}
 
 	const responseData = await freshserviceApiRequestAllItems.call(this, method, endpoint, body, qs);
diff --git a/packages/nodes-base/nodes/Freshservice/descriptions/AgentDescription.ts b/packages/nodes-base/nodes/Freshservice/descriptions/AgentDescription.ts
index ec00210e97736..9e9f152d3bd06 100644
--- a/packages/nodes-base/nodes/Freshservice/descriptions/AgentDescription.ts
+++ b/packages/nodes-base/nodes/Freshservice/descriptions/AgentDescription.ts
@@ -222,8 +222,7 @@ export const agentFields: INodeProperties[] = [
 				},
 			},
 			{
-				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-multi-options
-				displayName: 'Member of Group Names/IDs',
+				displayName: 'Group Names or IDs',
 				name: 'member_of',
 				type: 'multiOptions',
 				default: [],
@@ -240,7 +239,6 @@ export const agentFields: INodeProperties[] = [
 				default: '',
 			},
 			{
-				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-multi-options
 				displayName: 'Observer of Group Names/IDs',
 				name: 'observer_of',
 				type: 'multiOptions',
@@ -257,7 +255,7 @@ export const agentFields: INodeProperties[] = [
 				type: 'options',
 				description: 'ID of the level of the agent in the Arcade',
 				default: 1,
-				// eslint-disable-next-line n8n-nodes-base/node-param-options-type-unsorted-items
+
 				options: [
 					{
 						name: 'Beginner',
@@ -558,8 +556,7 @@ export const agentFields: INodeProperties[] = [
 				},
 			},
 			{
-				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-multi-options
-				displayName: 'Member of Group Names/IDs',
+				displayName: 'Group Names or IDs',
 				name: 'member_of',
 				type: 'multiOptions',
 				default: [],
@@ -576,7 +573,6 @@ export const agentFields: INodeProperties[] = [
 				default: '',
 			},
 			{
-				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-multi-options
 				displayName: 'Observer of Group Names/IDs',
 				name: 'observer_of',
 				type: 'multiOptions',
@@ -593,7 +589,7 @@ export const agentFields: INodeProperties[] = [
 				type: 'options',
 				description: 'ID of the level of the agent in the Arcade',
 				default: 1,
-				// eslint-disable-next-line n8n-nodes-base/node-param-options-type-unsorted-items
+
 				options: [
 					{
 						name: 'Beginner',
diff --git a/packages/nodes-base/nodes/Freshservice/descriptions/ChangeDescription.ts b/packages/nodes-base/nodes/Freshservice/descriptions/ChangeDescription.ts
index 6de31b1a45af2..5753f861066c8 100644
--- a/packages/nodes-base/nodes/Freshservice/descriptions/ChangeDescription.ts
+++ b/packages/nodes-base/nodes/Freshservice/descriptions/ChangeDescription.ts
@@ -259,7 +259,7 @@ export const changeFields: INodeProperties[] = [
 				name: 'status',
 				type: 'options',
 				default: 1,
-				// eslint-disable-next-line n8n-nodes-base/node-param-options-type-unsorted-items
+
 				options: [
 					{
 						name: 'Open',
@@ -610,7 +610,7 @@ export const changeFields: INodeProperties[] = [
 				name: 'status',
 				type: 'options',
 				default: 1,
-				// eslint-disable-next-line n8n-nodes-base/node-param-options-type-unsorted-items
+
 				options: [
 					{
 						name: 'Open',
diff --git a/packages/nodes-base/nodes/Freshservice/descriptions/ReleaseDescription.ts b/packages/nodes-base/nodes/Freshservice/descriptions/ReleaseDescription.ts
index 9404ba755846a..60de514d0fcd4 100644
--- a/packages/nodes-base/nodes/Freshservice/descriptions/ReleaseDescription.ts
+++ b/packages/nodes-base/nodes/Freshservice/descriptions/ReleaseDescription.ts
@@ -135,7 +135,7 @@ export const releaseFields: INodeProperties[] = [
 				operation: ['create'],
 			},
 		},
-		// eslint-disable-next-line n8n-nodes-base/node-param-options-type-unsorted-items
+
 		options: [
 			{
 				name: 'Open',
@@ -412,7 +412,7 @@ export const releaseFields: INodeProperties[] = [
 				name: 'status',
 				type: 'options',
 				default: 1,
-				// eslint-disable-next-line n8n-nodes-base/node-param-options-type-unsorted-items
+
 				options: [
 					{
 						name: 'Open',
diff --git a/packages/nodes-base/nodes/Freshservice/freshservice.svg b/packages/nodes-base/nodes/Freshservice/freshservice.svg
index f806e022d7ed3..b27ef002282ad 100644
--- a/packages/nodes-base/nodes/Freshservice/freshservice.svg
+++ b/packages/nodes-base/nodes/Freshservice/freshservice.svg
@@ -1,16 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="layer" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
-	 viewBox="20 280 100 100" >
-<style type="text/css">
-	.st0{fill:#4D4D4D;}
-	.st1{fill:#08C7FB;}
-	.st2{fill:#FFFFFF;}
-</style>
-<g>
-	<path class="st1" d="M68.5,376.1L68.5,376.1c-25.9,0-47-21-47-47c0-25.9,21-47,47-47h35.2c6.5,0,11.7,5.3,11.7,11.7v35.2
-		C115.4,355.1,94.4,376.1,68.5,376.1"/>
-	<path class="st2" d="M67.8,352.4c0.6,0.4,1.4,0.3,1.8-0.3l14.8-20.6l3.4-4.8c0.8-1.1,0-2.7-1.4-2.7h-6.6H64.2l5.5-16.6
-		c0.2-0.5,0-1.1-0.5-1.5c-0.6-0.4-1.4-0.3-1.8,0.3l-14.8,20.6l-3.4,4.8c-0.8,1.1,0,2.7,1.4,2.7h6.6h15.7l-5.5,16.6
-		C67.1,351.4,67.3,352,67.8,352.4"/>
-</g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="20 280 100 100"><path d="M68.5 376.1c-25.9 0-47-21-47-47 0-25.9 21-47 47-47h35.2c6.5 0 11.7 5.3 11.7 11.7V329c0 26.1-21 47.1-46.9 47.1" style="fill:#08c7fb"/><path d="M67.8 352.4c.6.4 1.4.3 1.8-.3l14.8-20.6 3.4-4.8c.8-1.1 0-2.7-1.4-2.7H64.2l5.5-16.6c.2-.5 0-1.1-.5-1.5-.6-.4-1.4-.3-1.8.3l-14.8 20.6-3.4 4.8c-.8 1.1 0 2.7 1.4 2.7h22.3l-5.5 16.6c-.3.5-.1 1.1.4 1.5" style="fill:#fff"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Freshservice/types.d.ts b/packages/nodes-base/nodes/Freshservice/types.ts
similarity index 100%
rename from packages/nodes-base/nodes/Freshservice/types.d.ts
rename to packages/nodes-base/nodes/Freshservice/types.ts
diff --git a/packages/nodes-base/nodes/FreshworksCrm/FreshworksCrm.node.json b/packages/nodes-base/nodes/FreshworksCrm/FreshworksCrm.node.json
index 9b5157ab6ebaf..fa66068095a89 100644
--- a/packages/nodes-base/nodes/FreshworksCrm/FreshworksCrm.node.json
+++ b/packages/nodes-base/nodes/FreshworksCrm/FreshworksCrm.node.json
@@ -2,7 +2,7 @@
 	"node": "n8n-nodes-base.freshworksCrm",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Marketing & Content", "Sales"],
+	"categories": ["Marketing", "Sales"],
 	"resources": {
 		"credentialDocumentation": [
 			{
diff --git a/packages/nodes-base/nodes/FreshworksCrm/FreshworksCrm.node.ts b/packages/nodes-base/nodes/FreshworksCrm/FreshworksCrm.node.ts
index 61d9cac506def..6d7b4f4e1bab7 100644
--- a/packages/nodes-base/nodes/FreshworksCrm/FreshworksCrm.node.ts
+++ b/packages/nodes-base/nodes/FreshworksCrm/FreshworksCrm.node.ts
@@ -7,6 +7,7 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
+import { tz } from 'moment-timezone';
 import {
 	adjustAccounts,
 	adjustAttendees,
@@ -38,8 +39,6 @@ import {
 
 import type { FreshworksConfigResponse, LoadedCurrency, LoadedUser, LoadOption } from './types';
 
-import { tz } from 'moment-timezone';
-
 export class FreshworksCrm implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Freshworks CRM',
@@ -140,15 +139,15 @@ export class FreshworksCrm implements INodeType {
 			},
 
 			async getBusinessTypes(this: ILoadOptionsFunctions) {
-				return loadResource.call(this, 'business_types');
+				return await loadResource.call(this, 'business_types');
 			},
 
 			async getCampaigns(this: ILoadOptionsFunctions) {
-				return loadResource.call(this, 'campaigns');
+				return await loadResource.call(this, 'campaigns');
 			},
 
 			async getContactStatuses(this: ILoadOptionsFunctions) {
-				return loadResource.call(this, 'contact_statuses');
+				return await loadResource.call(this, 'contact_statuses');
 			},
 
 			async getContactViews(this: ILoadOptionsFunctions) {
@@ -170,27 +169,27 @@ export class FreshworksCrm implements INodeType {
 			},
 
 			async getDealPaymentStatuses(this: ILoadOptionsFunctions) {
-				return loadResource.call(this, 'deal_payment_statuses');
+				return await loadResource.call(this, 'deal_payment_statuses');
 			},
 
 			async getDealPipelines(this: ILoadOptionsFunctions) {
-				return loadResource.call(this, 'deal_pipelines');
+				return await loadResource.call(this, 'deal_pipelines');
 			},
 
 			async getDealProducts(this: ILoadOptionsFunctions) {
-				return loadResource.call(this, 'deal_products');
+				return await loadResource.call(this, 'deal_products');
 			},
 
 			async getDealReasons(this: ILoadOptionsFunctions) {
-				return loadResource.call(this, 'deal_reasons');
+				return await loadResource.call(this, 'deal_reasons');
 			},
 
 			async getDealStages(this: ILoadOptionsFunctions) {
-				return loadResource.call(this, 'deal_stages');
+				return await loadResource.call(this, 'deal_stages');
 			},
 
 			async getDealTypes(this: ILoadOptionsFunctions) {
-				return loadResource.call(this, 'deal_types');
+				return await loadResource.call(this, 'deal_types');
 			},
 
 			async getDealViews(this: ILoadOptionsFunctions) {
@@ -200,23 +199,23 @@ export class FreshworksCrm implements INodeType {
 			},
 
 			async getIndustryTypes(this: ILoadOptionsFunctions) {
-				return loadResource.call(this, 'industry_types');
+				return await loadResource.call(this, 'industry_types');
 			},
 
 			async getLifecycleStages(this: ILoadOptionsFunctions) {
-				return loadResource.call(this, 'lifecycle_stages');
+				return await loadResource.call(this, 'lifecycle_stages');
 			},
 
 			async getOutcomes(this: ILoadOptionsFunctions) {
-				return loadResource.call(this, 'sales_activity_outcomes');
+				return await loadResource.call(this, 'sales_activity_outcomes');
 			},
 
 			async getSalesActivityTypes(this: ILoadOptionsFunctions) {
-				return loadResource.call(this, 'sales_activity_types');
+				return await loadResource.call(this, 'sales_activity_types');
 			},
 
 			async getTerritories(this: ILoadOptionsFunctions) {
-				return loadResource.call(this, 'territories');
+				return await loadResource.call(this, 'territories');
 			},
 
 			async getUsers(this: ILoadOptionsFunctions) {
@@ -994,6 +993,6 @@ export class FreshworksCrm implements INodeType {
 			returnData.push(...executionData);
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/FreshworksCrm/GenericFunctions.ts b/packages/nodes-base/nodes/FreshworksCrm/GenericFunctions.ts
index 8c737abad1578..5bcdafc5aeccb 100644
--- a/packages/nodes-base/nodes/FreshworksCrm/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/FreshworksCrm/GenericFunctions.ts
@@ -3,11 +3,12 @@ import type {
 	IDataObject,
 	ILoadOptionsFunctions,
 	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
-import type { OptionsWithUri } from 'request';
-
+import omit from 'lodash/omit';
 import type {
 	FreshworksConfigResponse,
 	FreshworksCrmApiCredentials,
@@ -15,18 +16,16 @@ import type {
 	ViewsResponse,
 } from './types';
 
-import omit from 'lodash.omit';
-
 export async function freshworksCrmApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject = {},
 	qs: IDataObject = {},
 ) {
 	const { domain } = (await this.getCredentials('freshworksCrmApi')) as FreshworksCrmApiCredentials;
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		method,
 		body,
 		qs,
@@ -81,7 +80,7 @@ export async function getAllItemsViewId(
 
 export async function freshworksCrmApiRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject = {},
 	qs: IDataObject = {},
@@ -103,7 +102,7 @@ export async function freshworksCrmApiRequestAllItems(
 
 export async function handleListing(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject = {},
 	qs: IDataObject = {},
@@ -111,7 +110,7 @@ export async function handleListing(
 	const returnAll = this.getNodeParameter('returnAll', 0);
 
 	if (returnAll) {
-		return freshworksCrmApiRequestAllItems.call(this, method, endpoint, body, qs);
+		return await freshworksCrmApiRequestAllItems.call(this, method, endpoint, body, qs);
 	}
 
 	const responseData = await freshworksCrmApiRequestAllItems.call(this, method, endpoint, body, qs);
diff --git a/packages/nodes-base/nodes/FreshworksCrm/descriptions/SearchDescription.ts b/packages/nodes-base/nodes/FreshworksCrm/descriptions/SearchDescription.ts
index 675984ff999fb..865b37b9ef4f6 100644
--- a/packages/nodes-base/nodes/FreshworksCrm/descriptions/SearchDescription.ts
+++ b/packages/nodes-base/nodes/FreshworksCrm/descriptions/SearchDescription.ts
@@ -216,7 +216,7 @@ export const searchFields: INodeProperties[] = [
 						value: 'sales_account',
 					},
 				],
-				// eslint-disable-next-line n8n-nodes-base/node-param-description-unneeded-backticks
+
 				description:
 					"Use 'entities' to query against related entities. You can include multiple entities at once, provided the field is available in both entities or else you'd receive an error response.",
 			},
diff --git a/packages/nodes-base/nodes/FreshworksCrm/freshworksCrm.svg b/packages/nodes-base/nodes/FreshworksCrm/freshworksCrm.svg
index 06e0cf9acfed9..15f5fdf8cc378 100644
--- a/packages/nodes-base/nodes/FreshworksCrm/freshworksCrm.svg
+++ b/packages/nodes-base/nodes/FreshworksCrm/freshworksCrm.svg
@@ -1,151 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   version="1.1"
-   id="layer"
-   viewBox="0 0 102.6 102.6"
-   xml:space="preserve"
-   sodipodi:docname="freshworksCrm.svg"
-   width="102.6"
-   height="102.6"
-   inkscape:version="1.1 (c4e8f9e, 2021-05-24)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"><sodipodi:namedview
-   id="namedview156"
-   pagecolor="#ffffff"
-   bordercolor="#666666"
-   borderopacity="1.0"
-   inkscape:pageshadow="2"
-   inkscape:pageopacity="0.0"
-   inkscape:pagecheckerboard="0"
-   showgrid="false"
-   fit-margin-top="0"
-   fit-margin-left="0"
-   fit-margin-right="0"
-   fit-margin-bottom="0"
-   inkscape:zoom="1.7642045"
-   inkscape:cx="166.36393"
-   inkscape:cy="122.15137"
-   inkscape:window-width="1312"
-   inkscape:window-height="847"
-   inkscape:window-x="0"
-   inkscape:window-y="25"
-   inkscape:window-maximized="0"
-   inkscape:current-layer="layer" /><defs
-   id="defs173" />
-<style
-   type="text/css"
-   id="style108">
-	.st0{fill:#4D4D4D;}
-	.st1{fill:#9B65C3;}
-	.st2{fill:#BE63C5;}
-	.st3{fill:#BF63C6;}
-	.st4{fill:#3278B1;}
-	.st5{fill:#3278B2;}
-	.st6{fill:#45A4EC;}
-	.st7{fill:#19BB7D;}
-	.st8{fill:#08C7FB;}
-	.st9{fill:#59F2F6;}
-	.st10{fill:#FFA700;}
-	.st11{fill:#DA3757;}
-	.st12{fill:#D33C4E;}
-	.st13{fill:#EE5A24;}
-	.st14{fill:#8BDF55;}
-	.st15{fill:#25C16F;}
-	.st16{fill:#FFBB00;}
-	.st17{fill:#FFA800;}
-</style>
-<g
-   id="g168"
-   transform="translate(-21.6,-279.3)">
-
-
-
-
-
-
-
-
-
-
-	<path
-   class="st1"
-   d="m 22.2,338.2 c 1.7,11.1 6.9,21.1 14.4,28.6 l 17.5,-17.5 c 0,-17.7 9.2,-34.9 25.6,-44.4 z"
-   id="path130" />
-	<path
-   class="st1"
-   d="m 54.1,349.3 c -8.7,0 -17.5,-2.2 -25.6,-6.9 -2.2,-1.3 -4.3,-2.7 -6.3,-4.3 1.7,11.1 6.9,21.1 14.4,28.6 z"
-   id="path132" />
-	<path
-   class="st2"
-   d="m 54.1,349.3 v 0 l -17.5,17.5 c 7.6,7.6 17.5,12.8 28.6,14.4 L 98.4,323.7 C 89,340.1 71.8,349.3 54.1,349.3"
-   id="path134" />
-	<path
-   class="st3"
-   d="m 61,375 c -4.7,-8.1 -6.9,-16.9 -6.9,-25.6 l -17.5,17.5 c 7.6,7.6 17.5,12.8 28.6,14.4 -1.5,-2 -2.9,-4.1 -4.2,-6.3"
-   id="path136" />
-	<path
-   class="st4"
-   d="M 119.3,282.1 79.8,305 c -16.4,9.5 -35.9,8.8 -51.2,0 -4.4,7.5 -6.9,16.3 -6.9,25.6 0,2.6 0.2,5.1 0.6,7.6 2,1.6 4.1,3 6.3,4.3 8.1,4.7 16.9,6.9 25.6,6.9 l 66.2,-66.2 c -0.4,-0.4 -0.7,-0.8 -1.1,-1.1"
-   id="path138" />
-	<path
-   class="st5"
-   d="m 28.5,342.5 c 8.1,4.7 16.9,6.9 25.6,6.9 0,-17.7 9.2,-34.9 25.6,-44.4 l -57.6,33.2 c 2.1,1.5 4.2,3 6.4,4.3"
-   id="path140" />
-	<path
-   class="st6"
-   d="m 28.5,305 c -4.4,7.5 -6.9,16.3 -6.9,25.6 0,2.6 0.2,5.1 0.6,7.6 L 79.8,305 c -16.5,9.4 -36,8.8 -51.3,0"
-   id="path142" />
-	<path
-   class="st7"
-   d="m 120.4,283.1 c -0.3,-0.3 -0.7,-0.7 -1.1,-1 -0.5,-0.4 -1,-0.8 -1.6,-1.1 -1.9,-1.1 -4.1,-1.7 -6.4,-1.7 H 72.9 c -19,0 -35.5,10.3 -44.4,25.6 15.3,8.8 34.8,9.5 51.2,0 -16.4,9.5 -25.6,26.7 -25.6,44.4 17.7,0 34.9,-9.2 44.4,-25.6 l 22.8,-39.5 c -0.3,-0.4 -0.6,-0.8 -0.9,-1.1"
-   id="path144" />
-	<path
-   class="st8"
-   d="m 79.8,305 39.5,-22.8 c -0.5,-0.4 -1,-0.8 -1.6,-1.1 L 28.5,305 c 15.3,8.8 34.8,9.4 51.3,0"
-   id="path146" />
-	<path
-   class="st9"
-   d="M 111.3,279.3 H 72.9 c -19,0 -35.5,10.3 -44.4,25.6 L 117.7,281 c -1.9,-1 -4,-1.7 -6.4,-1.7"
-   id="path148" />
-	<path
-   class="st10"
-   d="M 54.1,349.3"
-   id="path150" />
-	<path
-   class="st11"
-   d="m 98.5,323.7 22.8,-39.5 c -0.3,-0.4 -0.6,-0.7 -1,-1.1 l -66.2,66.2 c 0,8.7 2.2,17.5 6.9,25.6 1.3,2.2 2.7,4.3 4.3,6.3 2.5,0.4 5,0.6 7.6,0.6 9.3,0 18.1,-2.5 25.6,-6.9 -8.8,-15.3 -9.5,-34.8 0,-51.2"
-   id="path152" />
-	<path
-   class="st12"
-   d="m 54.1,349.3 v 0 c 0,8.7 2.2,17.5 6.9,25.6 1.3,2.2 2.7,4.3 4.3,6.3 L 98.5,323.7 C 89,340.1 71.8,349.3 54.1,349.3"
-   id="path154" />
-	<path
-   class="st13"
-   d="m 98.5,323.7 -33.2,57.6 c 2.5,0.4 5,0.6 7.6,0.6 9.3,0 18.1,-2.5 25.6,-6.9 -8.8,-15.4 -9.5,-34.9 0,-51.3"
-   id="path156" />
-	<path
-   class="st14"
-   d="m 122.4,285.8 c -0.3,-0.6 -0.7,-1.1 -1.1,-1.6 -0.3,-0.4 -0.6,-0.7 -1,-1.1 -0.3,-0.3 -0.7,-0.7 -1.1,-1 L 79.8,305 c -16.4,9.5 -25.6,26.7 -25.6,44.4 17.7,0 34.9,-9.2 44.4,-25.6 -9.5,16.4 -8.8,35.9 0,51.2 15.3,-8.9 25.6,-25.4 25.6,-44.4 v -38.4 c -0.1,-2.4 -0.7,-4.6 -1.8,-6.4"
-   id="path158" />
-	<path
-   class="st15"
-   d="M 119.3,282.1 79.8,305 c -16.4,9.5 -25.6,26.7 -25.6,44.4 l 66.2,-66.2 c -0.4,-0.4 -0.7,-0.8 -1.1,-1.1"
-   id="path160" />
-	<path
-   class="st14"
-   d="m 54.1,349.3 c 17.7,0 34.9,-9.2 44.4,-25.6 l 22.8,-39.5 c -0.3,-0.4 -0.6,-0.7 -1,-1.1 z"
-   id="path162" />
-	<path
-   class="st16"
-   d="m 121.3,284.2 -22.8,39.5 c -9.5,16.4 -8.8,35.9 0,51.2 l 23.9,-89.2 c -0.3,-0.5 -0.7,-1 -1.1,-1.5"
-   id="path164" />
-	<path
-   class="st17"
-   d="m 98.5,375 c 15.3,-8.9 25.6,-25.4 25.6,-44.4 v -38.4 c 0,-2.3 -0.6,-4.5 -1.7,-6.4 z"
-   id="path166" />
-</g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" id="layer" width="102.6" height="102.6" version="1.1"><style id="style108" type="text/css">.st1{fill:#9b65c3}.st14{fill:#8bdf55}</style><g id="g168" transform="translate(-21.6 -279.3)"><path id="path130" d="M22.2 338.2c1.7 11.1 6.9 21.1 14.4 28.6l17.5-17.5c0-17.7 9.2-34.9 25.6-44.4z" class="st1"/><path id="path132" d="M54.1 349.3c-8.7 0-17.5-2.2-25.6-6.9-2.2-1.3-4.3-2.7-6.3-4.3 1.7 11.1 6.9 21.1 14.4 28.6z" class="st1"/><path id="path134" d="m54.1 349.3-17.5 17.5c7.6 7.6 17.5 12.8 28.6 14.4l33.2-57.5c-9.4 16.4-26.6 25.6-44.3 25.6" style="fill:#be63c5"/><path id="path136" d="M61 375c-4.7-8.1-6.9-16.9-6.9-25.6l-17.5 17.5c7.6 7.6 17.5 12.8 28.6 14.4q-2.25-3-4.2-6.3" style="fill:#bf63c6"/><path id="path138" d="M119.3 282.1 79.8 305c-16.4 9.5-35.9 8.8-51.2 0-4.4 7.5-6.9 16.3-6.9 25.6 0 2.6.2 5.1.6 7.6 2 1.6 4.1 3 6.3 4.3 8.1 4.7 16.9 6.9 25.6 6.9l66.2-66.2c-.4-.4-.7-.8-1.1-1.1" style="fill:#3278b1"/><path id="path140" d="M28.5 342.5c8.1 4.7 16.9 6.9 25.6 6.9 0-17.7 9.2-34.9 25.6-44.4l-57.6 33.2c2.1 1.5 4.2 3 6.4 4.3" style="fill:#3278b2"/><path id="path142" d="M28.5 305c-4.4 7.5-6.9 16.3-6.9 25.6 0 2.6.2 5.1.6 7.6L79.8 305c-16.5 9.4-36 8.8-51.3 0" style="fill:#45a4ec"/><path id="path144" d="M120.4 283.1c-.3-.3-.7-.7-1.1-1-.5-.4-1-.8-1.6-1.1-1.9-1.1-4.1-1.7-6.4-1.7H72.9c-19 0-35.5 10.3-44.4 25.6 15.3 8.8 34.8 9.5 51.2 0-16.4 9.5-25.6 26.7-25.6 44.4 17.7 0 34.9-9.2 44.4-25.6l22.8-39.5c-.3-.4-.6-.8-.9-1.1" style="fill:#19bb7d"/><path id="path146" d="m79.8 305 39.5-22.8c-.5-.4-1-.8-1.6-1.1L28.5 305c15.3 8.8 34.8 9.4 51.3 0" style="fill:#08c7fb"/><path id="path148" d="M111.3 279.3H72.9c-19 0-35.5 10.3-44.4 25.6l89.2-23.9c-1.9-1-4-1.7-6.4-1.7" style="fill:#59f2f6"/><path id="path152" d="m98.5 323.7 22.8-39.5c-.3-.4-.6-.7-1-1.1l-66.2 66.2c0 8.7 2.2 17.5 6.9 25.6 1.3 2.2 2.7 4.3 4.3 6.3 2.5.4 5 .6 7.6.6 9.3 0 18.1-2.5 25.6-6.9-8.8-15.3-9.5-34.8 0-51.2" style="fill:#da3757"/><path id="path154" d="M54.1 349.3c0 8.7 2.2 17.5 6.9 25.6 1.3 2.2 2.7 4.3 4.3 6.3l33.2-57.5c-9.5 16.4-26.7 25.6-44.4 25.6" style="fill:#d33c4e"/><path id="path156" d="m98.5 323.7-33.2 57.6c2.5.4 5 .6 7.6.6 9.3 0 18.1-2.5 25.6-6.9-8.8-15.4-9.5-34.9 0-51.3" style="fill:#ee5a24"/><path id="path158" d="M122.4 285.8c-.3-.6-.7-1.1-1.1-1.6-.3-.4-.6-.7-1-1.1-.3-.3-.7-.7-1.1-1L79.8 305c-16.4 9.5-25.6 26.7-25.6 44.4 17.7 0 34.9-9.2 44.4-25.6-9.5 16.4-8.8 35.9 0 51.2 15.3-8.9 25.6-25.4 25.6-44.4v-38.4c-.1-2.4-.7-4.6-1.8-6.4" class="st14"/><path id="path160" d="M119.3 282.1 79.8 305c-16.4 9.5-25.6 26.7-25.6 44.4l66.2-66.2c-.4-.4-.7-.8-1.1-1.1" style="fill:#25c16f"/><path id="path162" d="M54.1 349.3c17.7 0 34.9-9.2 44.4-25.6l22.8-39.5c-.3-.4-.6-.7-1-1.1z" class="st14"/><path id="path164" d="m121.3 284.2-22.8 39.5c-9.5 16.4-8.8 35.9 0 51.2l23.9-89.2c-.3-.5-.7-1-1.1-1.5" style="fill:#fb0"/><path id="path166" d="M98.5 375c15.3-8.9 25.6-25.4 25.6-44.4v-38.4c0-2.3-.6-4.5-1.7-6.4z" style="fill:#ffa800"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/FreshworksCrm/types.d.ts b/packages/nodes-base/nodes/FreshworksCrm/types.ts
similarity index 100%
rename from packages/nodes-base/nodes/FreshworksCrm/types.d.ts
rename to packages/nodes-base/nodes/FreshworksCrm/types.ts
diff --git a/packages/nodes-base/nodes/Ftp/Ftp.node.json b/packages/nodes-base/nodes/Ftp/Ftp.node.json
index 33da5703c2d5c..076aa4f81e7c1 100644
--- a/packages/nodes-base/nodes/Ftp/Ftp.node.json
+++ b/packages/nodes-base/nodes/Ftp/Ftp.node.json
@@ -15,7 +15,7 @@
 			}
 		]
 	},
-	"alias": ["SFTP"],
+	"alias": ["SFTP", "FTP", "Binary", "File", "Transfer"],
 	"subcategories": {
 		"Core Nodes": ["Files"]
 	}
diff --git a/packages/nodes-base/nodes/Ftp/Ftp.node.ts b/packages/nodes-base/nodes/Ftp/Ftp.node.ts
index a50b15f538df9..850c9eae54402 100644
--- a/packages/nodes-base/nodes/Ftp/Ftp.node.ts
+++ b/packages/nodes-base/nodes/Ftp/Ftp.node.ts
@@ -1,3 +1,11 @@
+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 } from 'n8n-workflow';
 import type {
 	ICredentialDataDecryptedObject,
 	ICredentialsDecrypted,
@@ -10,16 +18,7 @@ import type {
 	INodeTypeDescription,
 	JsonObject,
 } from 'n8n-workflow';
-import { BINARY_ENCODING, NodeApiError } from 'n8n-workflow';
-import { createWriteStream } from 'fs';
-import { basename, dirname } from 'path';
-import type { Readable } from 'stream';
-import { pipeline } from 'stream';
-import { promisify } from 'util';
-import { file as tmpFile } from 'tmp-promise';
-
-import ftpClient from 'promise-ftp';
-import sftpClient from 'ssh2-sftp-client';
+import { formatPrivateKey, generatePairedItemData } from '@utils/utilities';
 
 interface ReturnFtpItem {
 	type: string;
@@ -39,8 +38,6 @@ interface ReturnFtpItem {
 	path: string;
 }
 
-const streamPipeline = promisify(pipeline);
-
 async function callRecursiveList(
 	path: string,
 	client: sftpClient | ftpClient,
@@ -64,6 +61,10 @@ async function callRecursiveList(
 
 		// Is directory
 		if (item.type === 'd') {
+			// ignore . and .. to prevent infinite loop
+			if (item.name === '.' || item.name === '..') {
+				return;
+			}
 			pathArray.push(currentPath);
 		}
 
@@ -115,7 +116,7 @@ export class Ftp implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["protocol"] + ": " + $parameter["operation"]}}',
-		description: 'Transfers files via FTP or SFTP',
+		description: 'Transfer files via FTP or SFTP',
 		defaults: {
 			name: 'FTP',
 			color: '#303050',
@@ -218,6 +219,7 @@ export class Ftp implements INodeType {
 				type: 'string',
 				default: '',
 				description: 'The file path of the file to delete. Has to contain the full path.',
+				placeholder: 'e.g. /public/documents/file-to-delete.txt',
 				required: true,
 			},
 
@@ -268,12 +270,12 @@ export class Ftp implements INodeType {
 				name: 'path',
 				type: 'string',
 				default: '',
-				placeholder: '/documents/invoice.txt',
 				description: 'The file path of the file to download. Has to contain the full path.',
+				placeholder: 'e.g. /public/documents/file-to-download.txt',
 				required: true,
 			},
 			{
-				displayName: 'Binary Property',
+				displayName: 'Put Output File in Field',
 				displayOptions: {
 					show: {
 						operation: ['download'],
@@ -282,7 +284,7 @@ export class Ftp implements INodeType {
 				name: 'binaryPropertyName',
 				type: 'string',
 				default: 'data',
-				description: 'Object property name which holds binary data',
+				hint: 'The name of the output binary field to put the file in',
 				required: true,
 			},
 
@@ -299,6 +301,7 @@ export class Ftp implements INodeType {
 				name: 'oldPath',
 				type: 'string',
 				default: '',
+				placeholder: 'e.g. /public/documents/old-file.txt',
 				required: true,
 			},
 			{
@@ -311,6 +314,7 @@ export class Ftp implements INodeType {
 				name: 'newPath',
 				type: 'string',
 				default: '',
+				placeholder: 'e.g. /public/documents/new-file.txt',
 				required: true,
 			},
 			{
@@ -350,10 +354,11 @@ export class Ftp implements INodeType {
 				type: 'string',
 				default: '',
 				description: 'The file path of the file to upload. Has to contain the full path.',
+				placeholder: 'e.g. /public/documents/file-to-upload.txt',
 				required: true,
 			},
 			{
-				displayName: 'Binary Data',
+				displayName: 'Binary File',
 				displayOptions: {
 					show: {
 						operation: ['upload'],
@@ -366,7 +371,7 @@ export class Ftp implements INodeType {
 				description: 'The text content of the file to upload',
 			},
 			{
-				displayName: 'Binary Property',
+				displayName: 'Input Binary Field',
 				displayOptions: {
 					show: {
 						operation: ['upload'],
@@ -376,7 +381,7 @@ export class Ftp implements INodeType {
 				name: 'binaryPropertyName',
 				type: 'string',
 				default: 'data',
-				description: 'Object property name which holds binary data',
+				hint: 'The name of the input binary field containing the file to be written',
 				required: true,
 			},
 			{
@@ -406,6 +411,7 @@ export class Ftp implements INodeType {
 				name: 'path',
 				type: 'string',
 				default: '/',
+				placeholder: 'e.g. /public/folder',
 				description: 'Path of directory to list contents of',
 				required: true,
 			},
@@ -433,8 +439,8 @@ export class Ftp implements INodeType {
 				credential: ICredentialsDecrypted,
 			): Promise<INodeCredentialTestResult> {
 				const credentials = credential.data as ICredentialDataDecryptedObject;
+				const ftp = new ftpClient();
 				try {
-					const ftp = new ftpClient();
 					await ftp.connect({
 						host: credentials.host as string,
 						port: credentials.port as number,
@@ -442,11 +448,13 @@ export class Ftp implements INodeType {
 						password: credentials.password as string,
 					});
 				} catch (error) {
+					await ftp.end();
 					return {
 						status: 'Error',
 						message: error.message,
 					};
 				}
+				await ftp.end();
 				return {
 					status: 'OK',
 					message: 'Connection successful!',
@@ -457,22 +465,33 @@ export class Ftp implements INodeType {
 				credential: ICredentialsDecrypted,
 			): Promise<INodeCredentialTestResult> {
 				const credentials = credential.data as ICredentialDataDecryptedObject;
+				const sftp = new sftpClient();
 				try {
-					const sftp = new sftpClient();
-					await sftp.connect({
-						host: credentials.host as string,
-						port: credentials.port as number,
-						username: credentials.username as string,
-						password: credentials.password as string,
-						privateKey: credentials.privateKey as string | undefined,
-						passphrase: credentials.passphrase as string | undefined,
-					});
+					if (credentials.privateKey) {
+						await sftp.connect({
+							host: credentials.host as string,
+							port: credentials.port as number,
+							username: credentials.username as string,
+							password: (credentials.password as string) || undefined,
+							privateKey: formatPrivateKey(credentials.privateKey as string),
+							passphrase: credentials.passphrase as string | undefined,
+						});
+					} else {
+						await sftp.connect({
+							host: credentials.host as string,
+							port: credentials.port as number,
+							username: credentials.username as string,
+							password: credentials.password as string,
+						});
+					}
 				} catch (error) {
+					await sftp.end();
 					return {
 						status: 'Error',
 						message: error.message,
 					};
 				}
+				await sftp.end();
 				return {
 					status: 'OK',
 					message: 'Connection successful!',
@@ -483,9 +502,7 @@ export class Ftp implements INodeType {
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const items = this.getInputData();
-		// const returnData: IDataObject[] = [];
-		const returnItems: INodeExecutionData[] = [];
-		let responseData;
+		let returnItems: INodeExecutionData[] = [];
 		const operation = this.getNodeParameter('operation', 0);
 
 		let credentials: ICredentialDataDecryptedObject | undefined = undefined;
@@ -496,285 +513,314 @@ export class Ftp implements INodeType {
 		} else {
 			credentials = await this.getCredentials('ftp');
 		}
+		let ftp: ftpClient;
+		let sftp: sftpClient;
+
 		try {
-			let ftp: ftpClient;
-			let sftp: sftpClient;
+			try {
+				if (protocol === 'sftp') {
+					sftp = new sftpClient();
+					if (credentials.privateKey) {
+						await sftp.connect({
+							host: credentials.host as string,
+							port: credentials.port as number,
+							username: credentials.username as string,
+							password: (credentials.password as string) || undefined,
+							privateKey: formatPrivateKey(credentials.privateKey as string),
+							passphrase: credentials.passphrase as string | undefined,
+						});
+					} else {
+						await sftp.connect({
+							host: credentials.host as string,
+							port: credentials.port as number,
+							username: credentials.username as string,
+							password: credentials.password as string,
+						});
+					}
+				} else {
+					ftp = new ftpClient();
+					await ftp.connect({
+						host: credentials.host as string,
+						port: credentials.port as number,
+						user: credentials.username as string,
+						password: credentials.password as string,
+					});
+				}
+			} catch (error) {
+				if (this.continueOnFail()) {
+					const pairedItem = generatePairedItemData(items.length);
 
-			if (protocol === 'sftp') {
-				sftp = new sftpClient();
-				await sftp.connect({
-					host: credentials.host as string,
-					port: credentials.port as number,
-					username: credentials.username as string,
-					password: credentials.password as string,
-					privateKey: credentials.privateKey as string | undefined,
-					passphrase: credentials.passphrase as string | undefined,
-				});
-			} else {
-				ftp = new ftpClient();
-				await ftp.connect({
-					host: credentials.host as string,
-					port: credentials.port as number,
-					user: credentials.username as string,
-					password: credentials.password as string,
-				});
+					return [[{ json: { error: error.message }, pairedItem }]];
+				}
+				throw error;
 			}
 
 			for (let i = 0; i < items.length; i++) {
-				const newItem: INodeExecutionData = {
-					json: items[i].json,
-					binary: {},
-				};
+				try {
+					const newItem: INodeExecutionData = {
+						json: items[i].json,
+						binary: {},
+						pairedItem: items[i].pairedItem,
+					};
 
-				if (items[i].binary !== undefined && newItem.binary) {
-					// Create a shallow copy of the binary data so that the old
-					// data references which do not get changed still stay behind
-					// but the incoming data does not get changed.
-					Object.assign(newItem.binary, items[i].binary);
-				}
+					if (items[i].binary !== undefined && newItem.binary) {
+						// Create a shallow copy of the binary data so that the old
+						// data references which do not get changed still stay behind
+						// but the incoming data does not get changed.
+						Object.assign(newItem.binary, items[i].binary);
+					}
 
-				items[i] = newItem;
+					items[i] = newItem;
 
-				if (protocol === 'sftp') {
-					if (operation === 'list') {
-						const path = this.getNodeParameter('path', i) as string;
+					if (protocol === 'sftp') {
+						if (operation === 'list') {
+							const path = this.getNodeParameter('path', i) as string;
 
-						const recursive = this.getNodeParameter('recursive', i) as boolean;
+							const recursive = this.getNodeParameter('recursive', i) as boolean;
+
+							let responseData: sftpClient.FileInfo[];
+							if (recursive) {
+								responseData = await callRecursiveList(path, sftp!, normalizeSFtpItem);
+							} else {
+								responseData = await sftp!.list(path);
+								responseData.forEach((item) => normalizeSFtpItem(item, path));
+							}
 
-						if (recursive) {
-							responseData = await callRecursiveList(path, sftp!, normalizeSFtpItem);
 							const executionData = this.helpers.constructExecutionMetaData(
 								this.helpers.returnJsonArray(responseData as unknown as IDataObject[]),
 								{ itemData: { item: i } },
 							);
-							returnItems.push.apply(returnItems, executionData);
-						} else {
-							responseData = await sftp!.list(path);
-							responseData.forEach((item) => normalizeSFtpItem(item, path));
+							returnItems = returnItems.concat(executionData);
+						}
+
+						if (operation === 'delete') {
+							const path = this.getNodeParameter('path', i) as string;
+							const options = this.getNodeParameter('options', i);
+
+							if (options.folder === true) {
+								await sftp!.rmdir(path, !!options.recursive);
+							} else {
+								await sftp!.delete(path);
+							}
 							const executionData = this.helpers.constructExecutionMetaData(
-								this.helpers.returnJsonArray(responseData as unknown as IDataObject[]),
+								[{ json: { success: true } }],
 								{ itemData: { item: i } },
 							);
-							returnItems.push.apply(returnItems, executionData);
+							returnItems = returnItems.concat(executionData);
 						}
-					}
-
-					if (operation === 'delete') {
-						const path = this.getNodeParameter('path', i) as string;
-						const options = this.getNodeParameter('options', i);
 
-						if (options.folder === true) {
-							responseData = await sftp!.rmdir(path, !!options.recursive);
-						} else {
-							responseData = await sftp!.delete(path);
-						}
-						const executionData = this.helpers.constructExecutionMetaData(
-							[{ json: { success: true } }],
-							{ itemData: { item: i } },
-						);
-						returnItems.push(...executionData);
-					}
+						if (operation === 'rename') {
+							const oldPath = this.getNodeParameter('oldPath', i) as string;
+							const { createDirectories = false } = this.getNodeParameter('options', i) as {
+								createDirectories: boolean;
+							};
+							const newPath = this.getNodeParameter('newPath', i) as string;
 
-					if (operation === 'rename') {
-						const oldPath = this.getNodeParameter('oldPath', i) as string;
-						const { createDirectories = false } = this.getNodeParameter('options', i) as {
-							createDirectories: boolean;
-						};
-						const newPath = this.getNodeParameter('newPath', i) as string;
+							if (createDirectories) {
+								await recursivelyCreateSftpDirs(sftp!, newPath);
+							}
 
-						if (createDirectories) {
-							await recursivelyCreateSftpDirs(sftp!, newPath);
+							await sftp!.rename(oldPath, newPath);
+							const executionData = this.helpers.constructExecutionMetaData(
+								[{ json: { success: true } }],
+								{ itemData: { item: i } },
+							);
+							returnItems = returnItems.concat(executionData);
 						}
 
-						responseData = await sftp!.rename(oldPath, newPath);
-						const executionData = this.helpers.constructExecutionMetaData(
-							[{ json: { success: true } }],
-							{ itemData: { item: i } },
-						);
-						returnItems.push(...executionData);
-					}
+						if (operation === 'download') {
+							const path = this.getNodeParameter('path', i) as string;
+							const binaryFile = await tmpFile({ prefix: 'n8n-sftp-' });
+							try {
+								await sftp!.get(path, createWriteStream(binaryFile.path));
+
+								const dataPropertyNameDownload = this.getNodeParameter('binaryPropertyName', i);
+								const remoteFilePath = this.getNodeParameter('path', i) as string;
+
+								items[i].binary![dataPropertyNameDownload] = await this.nodeHelpers.copyBinaryFile(
+									binaryFile.path,
+									basename(remoteFilePath),
+								);
+
+								const executionData = this.helpers.constructExecutionMetaData(
+									this.helpers.returnJsonArray(items[i]),
+									{ itemData: { item: i } },
+								);
+								returnItems = returnItems.concat(executionData);
+							} finally {
+								await binaryFile.cleanup();
+							}
+						}
 
-					if (operation === 'download') {
-						const path = this.getNodeParameter('path', i) as string;
-						const binaryFile = await tmpFile({ prefix: 'n8n-sftp-' });
-						try {
-							await sftp!.get(path, createWriteStream(binaryFile.path));
+						if (operation === 'upload') {
+							const remotePath = this.getNodeParameter('path', i) as string;
+							await recursivelyCreateSftpDirs(sftp!, remotePath);
 
-							const dataPropertyNameDownload = this.getNodeParameter('binaryPropertyName', i);
-							const filePathDownload = this.getNodeParameter('path', i) as string;
+							if (this.getNodeParameter('binaryData', i)) {
+								const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i);
+								const binaryData = this.helpers.assertBinaryData(i, binaryPropertyName);
 
-							items[i].binary![dataPropertyNameDownload] = await this.nodeHelpers.copyBinaryFile(
-								binaryFile.path,
-								filePathDownload,
-							);
+								let uploadData: Buffer | Readable;
+								if (binaryData.id) {
+									uploadData = await this.helpers.getBinaryStream(binaryData.id);
+								} else {
+									uploadData = Buffer.from(binaryData.data, BINARY_ENCODING);
+								}
+								await sftp!.put(uploadData, remotePath);
+							} else {
+								// Is text file
+								const buffer = Buffer.from(
+									this.getNodeParameter('fileContent', i) as string,
+									'utf8',
+								);
+								await sftp!.put(buffer, remotePath);
+							}
 
 							const executionData = this.helpers.constructExecutionMetaData(
 								this.helpers.returnJsonArray(items[i]),
 								{ itemData: { item: i } },
 							);
-							returnItems.push(...executionData);
-						} finally {
-							await binaryFile.cleanup();
+							returnItems = returnItems.concat(executionData);
 						}
 					}
 
-					if (operation === 'upload') {
-						const remotePath = this.getNodeParameter('path', i) as string;
-						await recursivelyCreateSftpDirs(sftp!, remotePath);
+					if (protocol === 'ftp') {
+						if (operation === 'list') {
+							const path = this.getNodeParameter('path', i) as string;
 
-						if (this.getNodeParameter('binaryData', i)) {
-							const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i);
-							const binaryData = this.helpers.assertBinaryData(i, binaryPropertyName);
+							const recursive = this.getNodeParameter('recursive', i) as boolean;
 
-							let uploadData: Buffer | Readable;
-							if (binaryData.id) {
-								uploadData = this.helpers.getBinaryStream(binaryData.id);
+							let responseData;
+							if (recursive) {
+								responseData = await callRecursiveList(path, ftp!, normalizeFtpItem);
 							} else {
-								uploadData = Buffer.from(binaryData.data, BINARY_ENCODING);
+								responseData = await ftp!.list(path);
+								responseData.forEach((item) =>
+									normalizeFtpItem(item as ftpClient.ListingElement, path),
+								);
 							}
-							await sftp!.put(uploadData, remotePath);
-						} else {
-							// Is text file
-							const buffer = Buffer.from(this.getNodeParameter('fileContent', i) as string, 'utf8');
-							await sftp!.put(buffer, remotePath);
-						}
-
-						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(items[i]),
-							{ itemData: { item: i } },
-						);
-						returnItems.push(...executionData);
-					}
-				}
 
-				if (protocol === 'ftp') {
-					if (operation === 'list') {
-						const path = this.getNodeParameter('path', i) as string;
-
-						const recursive = this.getNodeParameter('recursive', i) as boolean;
-
-						if (recursive) {
-							responseData = await callRecursiveList(path, ftp!, normalizeFtpItem);
 							const executionData = this.helpers.constructExecutionMetaData(
 								this.helpers.returnJsonArray(responseData as unknown as IDataObject[]),
 								{ itemData: { item: i } },
 							);
-							returnItems.push.apply(returnItems, executionData);
-						} else {
-							responseData = await ftp!.list(path);
-							responseData.forEach((item) =>
-								normalizeFtpItem(item as ftpClient.ListingElement, path),
-							);
+							returnItems = returnItems.concat(executionData);
+						}
+
+						if (operation === 'delete') {
+							const path = this.getNodeParameter('path', i) as string;
+							const options = this.getNodeParameter('options', i);
+
+							if (options.folder === true) {
+								await ftp!.rmdir(path, !!options.recursive);
+							} else {
+								await ftp!.delete(path);
+							}
+
 							const executionData = this.helpers.constructExecutionMetaData(
-								this.helpers.returnJsonArray(responseData as unknown as IDataObject[]),
+								[{ json: { success: true } }],
 								{ itemData: { item: i } },
 							);
-							returnItems.push.apply(returnItems, executionData);
+							returnItems = returnItems.concat(executionData);
 						}
-					}
-
-					if (operation === 'delete') {
-						const path = this.getNodeParameter('path', i) as string;
-						const options = this.getNodeParameter('options', i);
 
-						if (options.folder === true) {
-							responseData = await ftp!.rmdir(path, !!options.recursive);
-						} else {
-							responseData = await ftp!.delete(path);
+						if (operation === 'download') {
+							const path = this.getNodeParameter('path', i) as string;
+							const binaryFile = await tmpFile({ prefix: 'n8n-sftp-' });
+							try {
+								const stream = await ftp!.get(path);
+								await pipeline(stream, createWriteStream(binaryFile.path));
+
+								const dataPropertyNameDownload = this.getNodeParameter('binaryPropertyName', i);
+								const remoteFilePath = this.getNodeParameter('path', i) as string;
+
+								items[i].binary![dataPropertyNameDownload] = await this.nodeHelpers.copyBinaryFile(
+									binaryFile.path,
+									basename(remoteFilePath),
+								);
+
+								const executionData = this.helpers.constructExecutionMetaData(
+									this.helpers.returnJsonArray(items[i]),
+									{ itemData: { item: i } },
+								);
+								returnItems = returnItems.concat(executionData);
+							} finally {
+								await binaryFile.cleanup();
+							}
 						}
-						const executionData = this.helpers.constructExecutionMetaData(
-							[{ json: { success: true } }],
-							{ itemData: { item: i } },
-						);
-						returnItems.push(...executionData);
-					}
-
-					if (operation === 'download') {
-						const path = this.getNodeParameter('path', i) as string;
-						const binaryFile = await tmpFile({ prefix: 'n8n-sftp-' });
-						try {
-							const stream = await ftp!.get(path);
-							await streamPipeline(stream, createWriteStream(binaryFile.path));
 
-							const dataPropertyNameDownload = this.getNodeParameter('binaryPropertyName', i);
-							const filePathDownload = this.getNodeParameter('path', i) as string;
+						if (operation === 'rename') {
+							const oldPath = this.getNodeParameter('oldPath', i) as string;
 
-							items[i].binary![dataPropertyNameDownload] = await this.nodeHelpers.copyBinaryFile(
-								binaryFile.path,
-								filePathDownload,
-							);
+							const newPath = this.getNodeParameter('newPath', i) as string;
 
+							await ftp!.rename(oldPath, newPath);
 							const executionData = this.helpers.constructExecutionMetaData(
-								this.helpers.returnJsonArray(items[i]),
+								[{ json: { success: true } }],
 								{ itemData: { item: i } },
 							);
-							returnItems.push(...executionData);
-						} finally {
-							await binaryFile.cleanup();
+							returnItems = returnItems.concat(executionData);
 						}
-					}
-
-					if (operation === 'rename') {
-						const oldPath = this.getNodeParameter('oldPath', i) as string;
-
-						const newPath = this.getNodeParameter('newPath', i) as string;
 
-						responseData = await ftp!.rename(oldPath, newPath);
-						const executionData = this.helpers.constructExecutionMetaData(
-							[{ json: { success: true } }],
-							{ itemData: { item: i } },
-						);
-						returnItems.push(...executionData);
-					}
-
-					if (operation === 'upload') {
-						const remotePath = this.getNodeParameter('path', i) as string;
-						const fileName = basename(remotePath);
-						const dirPath = remotePath.replace(fileName, '');
+						if (operation === 'upload') {
+							const remotePath = this.getNodeParameter('path', i) as string;
+							const fileName = basename(remotePath);
+							const dirPath = remotePath.replace(fileName, '');
 
-						if (this.getNodeParameter('binaryData', i)) {
-							const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i);
-							const binaryData = this.helpers.assertBinaryData(i, binaryPropertyName);
+							if (this.getNodeParameter('binaryData', i)) {
+								const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i);
+								const binaryData = this.helpers.assertBinaryData(i, binaryPropertyName);
 
-							let uploadData: Buffer | Readable;
-							if (binaryData.id) {
-								uploadData = this.helpers.getBinaryStream(binaryData.id);
-							} else {
-								uploadData = Buffer.from(binaryData.data, BINARY_ENCODING);
-							}
+								let uploadData: Buffer | Readable;
+								if (binaryData.id) {
+									uploadData = await this.helpers.getBinaryStream(binaryData.id);
+								} else {
+									uploadData = Buffer.from(binaryData.data, BINARY_ENCODING);
+								}
 
-							try {
-								await ftp!.put(uploadData, remotePath);
-							} catch (error) {
-								if (error.code === 553) {
-									// Create directory
-									await ftp!.mkdir(dirPath, true);
+								try {
 									await ftp!.put(uploadData, remotePath);
-								} else {
-									throw new NodeApiError(this.getNode(), error as JsonObject);
+								} catch (error) {
+									if (error.code === 553) {
+										// Create directory
+										await ftp!.mkdir(dirPath, true);
+										await ftp!.put(uploadData, remotePath);
+									} else {
+										throw new NodeApiError(this.getNode(), error as JsonObject);
+									}
 								}
-							}
-						} else {
-							// Is text file
-							const buffer = Buffer.from(this.getNodeParameter('fileContent', i) as string, 'utf8');
-							try {
-								await ftp!.put(buffer, remotePath);
-							} catch (error) {
-								if (error.code === 553) {
-									// Create directory
-									await ftp!.mkdir(dirPath, true);
+							} else {
+								// Is text file
+								const buffer = Buffer.from(
+									this.getNodeParameter('fileContent', i) as string,
+									'utf8',
+								);
+								try {
 									await ftp!.put(buffer, remotePath);
-								} else {
-									throw new NodeApiError(this.getNode(), error as JsonObject);
+								} catch (error) {
+									if (error.code === 553) {
+										// Create directory
+										await ftp!.mkdir(dirPath, true);
+										await ftp!.put(buffer, remotePath);
+									} else {
+										throw new NodeApiError(this.getNode(), error as JsonObject);
+									}
 								}
 							}
+							const executionData = this.helpers.constructExecutionMetaData(
+								this.helpers.returnJsonArray(items[i]),
+								{ itemData: { item: i } },
+							);
+							returnItems = returnItems.concat(executionData);
 						}
-						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(items[i]),
-							{ itemData: { item: i } },
-						);
-						returnItems.push(...executionData);
 					}
+				} catch (error) {
+					if (this.continueOnFail()) {
+						returnItems.push({ json: { error: error.message }, pairedItem: { item: i } });
+						continue;
+					}
+
+					throw error;
 				}
 			}
 
@@ -784,12 +830,14 @@ export class Ftp implements INodeType {
 				await ftp!.end();
 			}
 		} catch (error) {
-			if (this.continueOnFail()) {
-				return this.prepareOutputData([{ json: { error: error.message } }]);
+			if (protocol === 'sftp') {
+				await sftp!.end();
+			} else {
+				await ftp!.end();
 			}
-
 			throw error;
 		}
+
 		return [returnItems];
 	}
 }
diff --git a/packages/nodes-base/nodes/Function/Function.node.ts b/packages/nodes-base/nodes/Function/Function.node.ts
index f681676fe7900..75b003a733389 100644
--- a/packages/nodes-base/nodes/Function/Function.node.ts
+++ b/packages/nodes-base/nodes/Function/Function.node.ts
@@ -1,5 +1,5 @@
-import type { NodeVMOptions } from 'vm2';
-import { NodeVM } from 'vm2';
+import type { NodeVMOptions } from '@n8n/vm2';
+import { NodeVM } from '@n8n/vm2';
 import type {
 	IExecuteFunctions,
 	IBinaryKeyData,
@@ -9,6 +9,7 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { deepCopy, NodeOperationError } from 'n8n-workflow';
+import { vmResolver } from '../Code/JavaScriptSandbox';
 
 export class Function implements INodeType {
 	description: INodeTypeDescription = {
@@ -39,7 +40,7 @@ export class Function implements INodeType {
 				typeOptions: {
 					alwaysOpenEditWindow: true,
 					codeAutocomplete: 'function',
-					editor: 'code',
+					editor: 'jsEditor',
 					rows: 10,
 				},
 				type: 'string',
@@ -150,23 +151,9 @@ return items;`,
 		const options: NodeVMOptions = {
 			console: mode === 'manual' ? 'redirect' : 'inherit',
 			sandbox,
-			require: {
-				external: false as boolean | { modules: string[]; transitive: boolean },
-				builtin: [] as string[],
-			},
+			require: vmResolver,
 		};
 
-		if (process.env.NODE_FUNCTION_ALLOW_BUILTIN && typeof options.require === 'object') {
-			options.require.builtin = process.env.NODE_FUNCTION_ALLOW_BUILTIN.split(',');
-		}
-
-		if (process.env.NODE_FUNCTION_ALLOW_EXTERNAL && typeof options.require === 'object') {
-			options.require.external = {
-				modules: process.env.NODE_FUNCTION_ALLOW_EXTERNAL.split(','),
-				transitive: false,
-			};
-		}
-
 		const vm = new NodeVM(options);
 
 		if (mode === 'manual') {
@@ -237,6 +224,6 @@ return items;`,
 			}
 		}
 
-		return this.prepareOutputData(items);
+		return [items];
 	}
 }
diff --git a/packages/nodes-base/nodes/FunctionItem/FunctionItem.node.ts b/packages/nodes-base/nodes/FunctionItem/FunctionItem.node.ts
index e0971f339ed20..348f52aaef543 100644
--- a/packages/nodes-base/nodes/FunctionItem/FunctionItem.node.ts
+++ b/packages/nodes-base/nodes/FunctionItem/FunctionItem.node.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-loop-func */
-import type { NodeVMOptions, VMRequire } from 'vm2';
-import { NodeVM } from 'vm2';
+import type { NodeVMOptions } from '@n8n/vm2';
+import { NodeVM } from '@n8n/vm2';
 import type {
 	IExecuteFunctions,
 	IBinaryKeyData,
@@ -10,6 +10,7 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { deepCopy, NodeOperationError } from 'n8n-workflow';
+import { vmResolver } from '../Code/JavaScriptSandbox';
 
 export class FunctionItem implements INodeType {
 	description: INodeTypeDescription = {
@@ -39,7 +40,7 @@ export class FunctionItem implements INodeType {
 				typeOptions: {
 					alwaysOpenEditWindow: true,
 					codeAutocomplete: 'functionItem',
-					editor: 'code',
+					editor: 'jsEditor',
 					rows: 10,
 				},
 				type: 'string',
@@ -158,24 +159,9 @@ return item;`,
 				const options: NodeVMOptions = {
 					console: mode === 'manual' ? 'redirect' : 'inherit',
 					sandbox,
-					require: {
-						external: false,
-						builtin: [],
-					},
+					require: vmResolver,
 				};
 
-				const vmRequire = options.require as VMRequire;
-				if (process.env.NODE_FUNCTION_ALLOW_BUILTIN) {
-					vmRequire.builtin = process.env.NODE_FUNCTION_ALLOW_BUILTIN.split(',');
-				}
-
-				if (process.env.NODE_FUNCTION_ALLOW_EXTERNAL) {
-					vmRequire.external = {
-						modules: process.env.NODE_FUNCTION_ALLOW_EXTERNAL.split(','),
-						transitive: false,
-					};
-				}
-
 				const vm = new NodeVM(options as unknown as NodeVMOptions);
 
 				if (mode === 'manual') {
@@ -254,6 +240,6 @@ return item;`,
 				throw error;
 			}
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/GetResponse/GenericFunctions.ts b/packages/nodes-base/nodes/GetResponse/GenericFunctions.ts
index cfe90904245a2..1271dea98ca07 100644
--- a/packages/nodes-base/nodes/GetResponse/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/GetResponse/GenericFunctions.ts
@@ -1,10 +1,10 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
 	IHookFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
+	IRequestOptions,
 	IWebhookFunctions,
 	JsonObject,
 } from 'n8n-workflow';
@@ -12,7 +12,7 @@ import { NodeApiError } from 'n8n-workflow';
 
 export async function getresponseApiRequest(
 	this: IWebhookFunctions | IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -22,7 +22,7 @@ export async function getresponseApiRequest(
 ): Promise<any> {
 	const authentication = this.getNodeParameter('authentication', 0, 'apiKey') as string;
 
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		headers: {
 			'Content-Type': 'application/json',
 		},
@@ -51,7 +51,7 @@ export async function getresponseApiRequest(
 
 export async function getResponseApiRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: any = {},
diff --git a/packages/nodes-base/nodes/GetResponse/GetResponse.node.json b/packages/nodes-base/nodes/GetResponse/GetResponse.node.json
index e4853d405bdf7..a3f18af40227c 100644
--- a/packages/nodes-base/nodes/GetResponse/GetResponse.node.json
+++ b/packages/nodes-base/nodes/GetResponse/GetResponse.node.json
@@ -2,7 +2,7 @@
 	"node": "n8n-nodes-base.getResponse",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Communication", "Marketing & Content"],
+	"categories": ["Communication", "Marketing"],
 	"resources": {
 		"credentialDocumentation": [
 			{
diff --git a/packages/nodes-base/nodes/GetResponse/GetResponse.node.ts b/packages/nodes-base/nodes/GetResponse/GetResponse.node.ts
index dae8088bf4dfd..640038c874c30 100644
--- a/packages/nodes-base/nodes/GetResponse/GetResponse.node.ts
+++ b/packages/nodes-base/nodes/GetResponse/GetResponse.node.ts
@@ -8,12 +8,11 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
+import moment from 'moment-timezone';
 import { getresponseApiRequest, getResponseApiRequestAllItems } from './GenericFunctions';
 
 import { contactFields, contactOperations } from './ContactDescription';
 
-import moment from 'moment-timezone';
-
 export class GetResponse implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'GetResponse',
@@ -308,6 +307,6 @@ export class GetResponse implements INodeType {
 				throw error;
 			}
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/GetResponse/GetResponseTrigger.node.json b/packages/nodes-base/nodes/GetResponse/GetResponseTrigger.node.json
index 7b9dfc6a75d6d..0c3ff3a356e44 100644
--- a/packages/nodes-base/nodes/GetResponse/GetResponseTrigger.node.json
+++ b/packages/nodes-base/nodes/GetResponse/GetResponseTrigger.node.json
@@ -2,7 +2,7 @@
 	"node": "n8n-nodes-base.getResponseTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Communication", "Marketing & Content"],
+	"categories": ["Communication", "Marketing"],
 	"resources": {
 		"credentialDocumentation": [
 			{
diff --git a/packages/nodes-base/nodes/Ghost/GenericFunctions.ts b/packages/nodes-base/nodes/Ghost/GenericFunctions.ts
index 602d9cb28a108..ad53a7673c772 100644
--- a/packages/nodes-base/nodes/Ghost/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Ghost/GenericFunctions.ts
@@ -1,16 +1,15 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
+	IRequestOptions,
 } from 'n8n-workflow';
 
 export async function ghostApiRequest(
-	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: any = {},
@@ -33,7 +32,7 @@ export async function ghostApiRequest(
 
 	const credentials = await this.getCredentials(credentialType);
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		method,
 		qs: query,
 		uri: uri || `${credentials.url}/ghost/api/${version}${endpoint}`,
@@ -41,13 +40,13 @@ export async function ghostApiRequest(
 		json: true,
 	};
 
-	return this.helpers.requestWithAuthentication.call(this, credentialType, options);
+	return await this.helpers.requestWithAuthentication.call(this, credentialType, options);
 }
 
 export async function ghostApiRequestAllItems(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: any = {},
diff --git a/packages/nodes-base/nodes/Ghost/Ghost.node.json b/packages/nodes-base/nodes/Ghost/Ghost.node.json
index 919b10268a1d0..539214cccdbcb 100644
--- a/packages/nodes-base/nodes/Ghost/Ghost.node.json
+++ b/packages/nodes-base/nodes/Ghost/Ghost.node.json
@@ -2,7 +2,7 @@
 	"node": "n8n-nodes-base.ghost",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Marketing & Content"],
+	"categories": ["Marketing"],
 	"resources": {
 		"credentialDocumentation": [
 			{
diff --git a/packages/nodes-base/nodes/Ghost/Ghost.node.ts b/packages/nodes-base/nodes/Ghost/Ghost.node.ts
index df9112c225715..51f1d0c5a44c5 100644
--- a/packages/nodes-base/nodes/Ghost/Ghost.node.ts
+++ b/packages/nodes-base/nodes/Ghost/Ghost.node.ts
@@ -9,12 +9,11 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
+import moment from 'moment-timezone';
 import { ghostApiRequest, ghostApiRequestAllItems, validateJSON } from './GenericFunctions';
 
 import { postFields, postOperations } from './PostDescription';
 
-import moment from 'moment-timezone';
-
 export class Ghost implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Ghost',
@@ -195,6 +194,14 @@ export class Ghost implements INodeType {
 							if (contentFormat === 'html') {
 								post.html = content;
 								qs.source = 'html';
+							} else if (contentFormat === 'lexical') {
+								const lexical = validateJSON(content);
+								if (lexical === undefined) {
+									throw new NodeOperationError(this.getNode(), 'Content must be a valid JSON', {
+										itemIndex: i,
+									});
+								}
+								post.lexical = content;
 							} else {
 								const mobileDoc = validateJSON(content);
 								if (mobileDoc === undefined) {
@@ -293,6 +300,15 @@ export class Ghost implements INodeType {
 								post.html = updateFields.content || '';
 								qs.source = 'html';
 								delete updateFields.content;
+							} else if (contentFormat === 'lexical') {
+								const lexical = validateJSON((updateFields.contentJson as string) || undefined);
+								if (lexical === undefined) {
+									throw new NodeOperationError(this.getNode(), 'Content must be a valid JSON', {
+										itemIndex: i,
+									});
+								}
+								post.lexical = updateFields.contentJson;
+								delete updateFields.contentJson;
 							} else {
 								const mobileDoc = validateJSON((updateFields.contentJson as string) || undefined);
 								if (mobileDoc === undefined) {
@@ -359,6 +375,6 @@ export class Ghost implements INodeType {
 			}
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Ghost/PostDescription.ts b/packages/nodes-base/nodes/Ghost/PostDescription.ts
index 8d344e5a50f4d..de01ce27b5798 100644
--- a/packages/nodes-base/nodes/Ghost/PostDescription.ts
+++ b/packages/nodes-base/nodes/Ghost/PostDescription.ts
@@ -114,6 +114,10 @@ export const postFields: INodeProperties[] = [
 				name: 'Mobile Doc',
 				value: 'mobileDoc',
 			},
+			{
+				name: 'Lexical',
+				value: 'lexical',
+			},
 		],
 		default: 'html',
 		description: 'The format of the post',
@@ -150,6 +154,22 @@ export const postFields: INodeProperties[] = [
 		description:
 			'Mobiledoc is the raw JSON format that Ghost uses to store post contents. <a href="https://ghost.org/docs/concepts/posts/#document-storage">Info</a>.',
 	},
+	{
+		displayName: 'Content (JSON)',
+		name: 'content',
+		type: 'json',
+		displayOptions: {
+			show: {
+				source: ['adminApi'],
+				resource: ['post'],
+				operation: ['create'],
+				contentFormat: ['lexical'],
+			},
+		},
+
+		default: '',
+		description: 'Lexical is the JSON format returned by the Ghost Default editor',
+	},
 	{
 		displayName: 'Additional Fields',
 		name: 'additionalFields',
@@ -395,6 +415,10 @@ export const postFields: INodeProperties[] = [
 						name: 'Mobile Doc',
 						value: 'mobiledoc',
 					},
+					{
+						name: 'Lexical',
+						value: 'lexical',
+					},
 				],
 				default: ['mobiledoc'],
 			},
@@ -532,6 +556,10 @@ export const postFields: INodeProperties[] = [
 						name: 'Plaintext',
 						value: 'plaintext',
 					},
+					{
+						name: 'Lexical',
+						value: 'lexical',
+					},
 				],
 				default: ['html'],
 				description:
@@ -593,6 +621,10 @@ export const postFields: INodeProperties[] = [
 						name: 'Mobile Doc',
 						value: 'mobiledoc',
 					},
+					{
+						name: 'Lexical',
+						value: 'lexical',
+					},
 				],
 				default: ['mobiledoc'],
 			},
@@ -636,6 +668,10 @@ export const postFields: INodeProperties[] = [
 				name: 'Mobile Doc',
 				value: 'mobileDoc',
 			},
+			{
+				name: 'Lexical',
+				value: 'lexical',
+			},
 		],
 		default: 'html',
 		description: 'The format of the post',
@@ -707,6 +743,18 @@ export const postFields: INodeProperties[] = [
 				description:
 					'Mobiledoc is the raw JSON format that Ghost uses to store post contents. <a href="https://ghost.org/docs/concepts/posts/#document-storage">Info.</a>.',
 			},
+			{
+				displayName: 'Content (JSON)',
+				name: 'contentJson',
+				type: 'json',
+				displayOptions: {
+					show: {
+						'/contentFormat': ['lexical'],
+					},
+				},
+				default: '',
+				description: 'Lexical is the JSON format returned by the Ghost Default editor',
+			},
 			{
 				displayName: 'Featured',
 				name: 'featured',
diff --git a/packages/nodes-base/nodes/Ghost/ghost.svg b/packages/nodes-base/nodes/Ghost/ghost.svg
index d10051e9007b0..eac8f93da5d77 100644
--- a/packages/nodes-base/nodes/Ghost/ghost.svg
+++ b/packages/nodes-base/nodes/Ghost/ghost.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 151 151" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#A" x=".5" y=".5"/><symbol id="A" overflow="visible"><g fill-rule="nonzero"><path d="M0 22.5C0 10.035 10.035 0 22.5 0h105C139.965 0 150 10.035 150 22.5v105c0 12.465-10.035 22.5-22.5 22.5h-105C10.035 150 0 139.965 0 127.5z" stroke="none" fill="#e8e9eb"/><path d="M29.59 39.258h54.785zm72.07 0h17.871zM29.59 75.293h90.82zm0 35.449h36.035zm54.785 0h36.035z" stroke="#3d515b" stroke-linejoin="miter" fill="#000" stroke-width="17.871"/></g></symbol></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round" viewBox="0 0 151 151"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><g fill-rule="nonzero"><path fill="#e8e9eb" stroke="none" d="M0 22.5A22.45 22.45 0 0 1 22.5 0h105A22.45 22.45 0 0 1 150 22.5v105a22.45 22.45 0 0 1-22.5 22.5h-105A22.45 22.45 0 0 1 0 127.5z"/><path fill="#000" stroke="#3d515b" stroke-linejoin="miter" stroke-width="17.871" d="M29.59 39.258h54.785zm72.07 0h17.871zM29.59 75.293h90.82zm0 35.449h36.035zm54.785 0h36.035z"/></g></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Git/Git.node.ts b/packages/nodes-base/nodes/Git/Git.node.ts
index b4dc39c57efa7..77400698d0dd6 100644
--- a/packages/nodes-base/nodes/Git/Git.node.ts
+++ b/packages/nodes-base/nodes/Git/Git.node.ts
@@ -1,3 +1,5 @@
+import { access, mkdir } from 'fs/promises';
+import { URL } from 'url';
 import type {
 	IExecuteFunctions,
 	INodeExecutionData,
@@ -5,6 +7,8 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
+import type { LogOptions, SimpleGit, SimpleGitOptions } from 'simple-git';
+import simpleGit from 'simple-git';
 import {
 	addConfigFields,
 	addFields,
@@ -15,13 +19,6 @@ import {
 	tagFields,
 } from './descriptions';
 
-import type { LogOptions, SimpleGit, SimpleGitOptions } from 'simple-git';
-import simpleGit from 'simple-git';
-
-import { access, mkdir } from 'fs/promises';
-
-import { URL } from 'url';
-
 export class Git implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Git',
@@ -217,12 +214,9 @@ export class Git implements INodeType {
 		};
 
 		const operation = this.getNodeParameter('operation', 0);
-		let _item: INodeExecutionData;
 		const returnItems: INodeExecutionData[] = [];
 		for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
 			try {
-				_item = items[itemIndex];
-
 				const repositoryPath = this.getNodeParameter('repositoryPath', itemIndex, '') as string;
 				const options = this.getNodeParameter('options', itemIndex, {});
 
@@ -503,6 +497,6 @@ export class Git implements INodeType {
 			}
 		}
 
-		return this.prepareOutputData(returnItems);
+		return [returnItems];
 	}
 }
diff --git a/packages/nodes-base/nodes/Git/git.svg b/packages/nodes-base/nodes/Git/git.svg
index 637e92cea7759..506c3ce5a1e58 100644
--- a/packages/nodes-base/nodes/Git/git.svg
+++ b/packages/nodes-base/nodes/Git/git.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="97" height="97"><path fill="#F05133" d="M92.71 44.408L52.591 4.291a5.918 5.918 0 00-8.369 0l-8.33 8.332L46.459 23.19a7.022 7.022 0 017.229 1.685 7.03 7.03 0 011.67 7.275l10.186 10.185a7.028 7.028 0 017.275 1.671 7.043 7.043 0 01-9.961 9.958 7.043 7.043 0 01-1.531-7.658l-9.5-9.499v24.997a7.042 7.042 0 11-8.096 11.291 7.042 7.042 0 012.307-11.496v-25.23a7.041 7.041 0 01-3.823-9.235L31.798 16.715 4.288 44.222a5.92 5.92 0 000 8.371l40.121 40.118a5.918 5.918 0 008.369 0L92.71 52.779a5.92 5.92 0 000-8.371z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="97" height="97"><path fill="#F05133" d="M92.71 44.408 52.591 4.291a5.92 5.92 0 0 0-8.369 0l-8.33 8.332L46.459 23.19a7.02 7.02 0 0 1 7.229 1.685 7.03 7.03 0 0 1 1.67 7.275l10.186 10.185a7.03 7.03 0 0 1 7.275 1.671 7.043 7.043 0 0 1-9.961 9.958 7.04 7.04 0 0 1-1.531-7.658l-9.5-9.499v24.997a7.042 7.042 0 1 1-8.096 11.291 7.042 7.042 0 0 1 2.307-11.496v-25.23a7.04 7.04 0 0 1-3.823-9.235L31.798 16.715 4.288 44.222a5.92 5.92 0 0 0 0 8.371l40.121 40.118a5.92 5.92 0 0 0 8.369 0L92.71 52.779a5.92 5.92 0 0 0 0-8.371"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Github/GenericFunctions.ts b/packages/nodes-base/nodes/Github/GenericFunctions.ts
index 348647b12d661..a27618b3dbdb2 100644
--- a/packages/nodes-base/nodes/Github/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Github/GenericFunctions.ts
@@ -1,11 +1,11 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IExecuteFunctions,
 	IHookFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
@@ -15,13 +15,13 @@ import { NodeApiError, NodeOperationError } from 'n8n-workflow';
  */
 export async function githubApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: object,
-	query?: object,
+	query?: IDataObject,
 	option: IDataObject = {},
 ): Promise<any> {
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		method,
 		headers: {
 			'User-Agent': 'n8n',
@@ -76,12 +76,13 @@ export async function getFileSha(
 	filePath: string,
 	branch?: string,
 ): Promise<any> {
-	const getBody: IDataObject = {};
+	const query: IDataObject = {};
 	if (branch !== undefined) {
-		getBody.branch = branch;
+		query.ref = branch;
 	}
+
 	const getEndpoint = `/repos/${owner}/${repository}/contents/${encodeURI(filePath)}`;
-	const responseData = await githubApiRequest.call(this, 'GET', getEndpoint, getBody, {});
+	const responseData = await githubApiRequest.call(this, 'GET', getEndpoint, {}, query);
 
 	if (responseData.sha === undefined) {
 		throw new NodeOperationError(this.getNode(), 'Could not get the SHA of the file.');
@@ -91,7 +92,7 @@ export async function getFileSha(
 
 export async function githubApiRequestAllItems(
 	this: IHookFunctions | IExecuteFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: any = {},
diff --git a/packages/nodes-base/nodes/Github/Github.node.ts b/packages/nodes-base/nodes/Github/Github.node.ts
index e74084462bb55..dcfa2ef9a5fc1 100644
--- a/packages/nodes-base/nodes/Github/Github.node.ts
+++ b/packages/nodes-base/nodes/Github/Github.node.ts
@@ -1,15 +1,16 @@
 import type {
 	IDataObject,
 	IExecuteFunctions,
+	IHttpRequestMethods,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
+import { snakeCase } from 'change-case';
 import { getFileSha, githubApiRequest, githubApiRequestAllItems } from './GenericFunctions';
 
-import { snakeCase } from 'change-case';
 import { getRepositories, getUsers } from './SearchFunctions';
 
 export class Github implements INodeType {
@@ -252,6 +253,12 @@ export class Github implements INodeType {
 							'Get the community profile of a repository with metrics, health score, description, license, etc',
 						action: 'Get the profile of a repository',
 					},
+					{
+						name: 'Get Pull Requests',
+						value: 'getPullRequests',
+						description: 'Returns pull requests of a repository',
+						action: 'Get pull requests of a repository',
+					},
 					{
 						name: 'List Popular Paths',
 						value: 'listPopularPaths',
@@ -550,7 +557,7 @@ export class Github implements INodeType {
 			//         file:create/edit
 			// ----------------------------------
 			{
-				displayName: 'Binary Data',
+				displayName: 'Binary File',
 				name: 'binaryData',
 				type: 'boolean',
 				default: false,
@@ -580,7 +587,7 @@ export class Github implements INodeType {
 				description: 'The text content of the file',
 			},
 			{
-				displayName: 'Binary Property',
+				displayName: 'Input Binary Field',
 				name: 'binaryPropertyName',
 				type: 'string',
 				default: 'data',
@@ -593,7 +600,7 @@ export class Github implements INodeType {
 					},
 				},
 				placeholder: '',
-				description: 'Name of the binary property which contains the data for the file',
+				hint: 'The name of the input binary field containing the file to be written',
 			},
 			{
 				displayName: 'Commit Message',
@@ -699,7 +706,7 @@ export class Github implements INodeType {
 					'Whether to set the data of the file as binary property instead of returning the raw API response',
 			},
 			{
-				displayName: 'Binary Property',
+				displayName: 'Put Output File in Field',
 				name: 'binaryPropertyName',
 				type: 'string',
 				default: 'data',
@@ -712,8 +719,7 @@ export class Github implements INodeType {
 					},
 				},
 				placeholder: '',
-				description:
-					'Name of the binary property in which to save the binary data of the received file',
+				hint: 'The name of the output binary field to put the file in',
 			},
 
 			{
@@ -1322,7 +1328,7 @@ export class Github implements INodeType {
 						type: 'string',
 						default: '',
 						description:
-							'Return only issues with the given labels. Multiple lables can be separated by comma.',
+							'Return only issues with the given labels. Multiple labels can be separated by comma.',
 					},
 					{
 						displayName: 'Updated Since',
@@ -1401,6 +1407,130 @@ export class Github implements INodeType {
 				],
 			},
 
+			// ----------------------------------
+			//         repository:getPullRequests
+			// ----------------------------------
+			{
+				displayName: 'Return All',
+				name: 'returnAll',
+				type: 'boolean',
+				displayOptions: {
+					show: {
+						resource: ['repository'],
+						operation: ['getPullRequests'],
+					},
+				},
+				default: false,
+				description: 'Whether to return all results or only up to a given limit',
+			},
+			{
+				displayName: 'Limit',
+				name: 'limit',
+				type: 'number',
+				displayOptions: {
+					show: {
+						resource: ['repository'],
+						operation: ['getPullRequests'],
+						returnAll: [false],
+					},
+				},
+				typeOptions: {
+					minValue: 1,
+					maxValue: 100,
+				},
+				default: 50,
+				description: 'Max number of results to return',
+			},
+			{
+				displayName: 'Filters',
+				name: 'getRepositoryPullRequestsFilters',
+				type: 'collection',
+				typeOptions: {
+					multipleValueButtonText: 'Add Filter',
+				},
+				displayOptions: {
+					show: {
+						operation: ['getPullRequests'],
+						resource: ['repository'],
+					},
+				},
+				default: {},
+				options: [
+					{
+						displayName: 'State',
+						name: 'state',
+						type: 'options',
+						options: [
+							{
+								name: 'All',
+								value: 'all',
+								description: 'Returns pull requests with any state',
+							},
+							{
+								name: 'Closed',
+								value: 'closed',
+								description: 'Return pull requests with "closed" state',
+							},
+							{
+								name: 'Open',
+								value: 'open',
+								description: 'Return pull requests with "open" state',
+							},
+						],
+						default: 'open',
+						description: 'The state to set',
+					},
+					{
+						displayName: 'Sort',
+						name: 'sort',
+						type: 'options',
+						options: [
+							{
+								name: 'Created',
+								value: 'created',
+								description: 'Sort by created date',
+							},
+							{
+								name: 'Updated',
+								value: 'updated',
+								description: 'Sort by updated date',
+							},
+							{
+								name: 'Popularity',
+								value: 'popularity',
+								description: 'Sort by number of comments',
+							},
+							{
+								name: 'Long-Running',
+								value: 'long-running',
+								description:
+									'Sort by date created and will limit the results to pull requests that have been open for more than a month and have had activity within the past month',
+							},
+						],
+						default: 'created',
+						description: 'The order the pull requests should be returned in',
+					},
+					{
+						displayName: 'Direction',
+						name: 'direction',
+						type: 'options',
+						options: [
+							{
+								name: 'Ascending',
+								value: 'asc',
+								description: 'Sort in ascending order',
+							},
+							{
+								name: 'Descending',
+								value: 'desc',
+								description: 'Sort in descending order',
+							},
+						],
+						default: 'desc',
+						description: 'The sort order',
+					},
+				],
+			},
 			// ----------------------------------
 			//         rerview
 			// ----------------------------------
@@ -1734,6 +1864,7 @@ export class Github implements INodeType {
 		const overwriteDataOperationsArray = [
 			'file:list',
 			'repository:getIssues',
+			'repository:getPullRequests',
 			'repository:listPopularPaths',
 			'repository:listReferrers',
 			'user:getRepositories',
@@ -1747,7 +1878,7 @@ export class Github implements INodeType {
 		// For Query string
 		let qs: IDataObject;
 
-		let requestMethod: string;
+		let requestMethod: IHttpRequestMethods;
 		let endpoint: string;
 
 		const operation = this.getNodeParameter('operation', 0);
@@ -2072,6 +2203,22 @@ export class Github implements INodeType {
 
 						returnAll = this.getNodeParameter('returnAll', 0);
 
+						if (!returnAll) {
+							qs.per_page = this.getNodeParameter('limit', 0);
+						}
+					} else if (operation === 'getPullRequests') {
+						// ----------------------------------
+						//         getPullRequests
+						// ----------------------------------
+
+						requestMethod = 'GET';
+
+						qs = this.getNodeParameter('getRepositoryPullRequestsFilters', i) as IDataObject;
+
+						endpoint = `/repos/${owner}/${repository}/pulls`;
+
+						returnAll = this.getNodeParameter('returnAll', 0);
+
 						if (!returnAll) {
 							qs.per_page = this.getNodeParameter('limit', 0);
 						}
@@ -2204,6 +2351,7 @@ export class Github implements INodeType {
 						const newItem: INodeExecutionData = {
 							json: items[i].json,
 							binary: {},
+							pairedItem: items[i].pairedItem,
 						};
 
 						if (items[i].binary !== undefined) {
@@ -2218,9 +2366,8 @@ export class Github implements INodeType {
 							path as string,
 						);
 
-						items[i] = newItem;
-
-						return [items];
+						returnData.push(newItem);
+						continue;
 					}
 				}
 
@@ -2269,7 +2416,7 @@ export class Github implements INodeType {
 			overwriteDataOperationsArray.includes(fullOperation)
 		) {
 			// Return data gets replaced
-			return this.prepareOutputData(returnData);
+			return [returnData];
 		} else {
 			// For all other ones simply return the unchanged items
 			return [items];
diff --git a/packages/nodes-base/nodes/Github/GithubTrigger.node.ts b/packages/nodes-base/nodes/Github/GithubTrigger.node.ts
index 1e009e3948ee5..87de8c2ecce96 100644
--- a/packages/nodes-base/nodes/Github/GithubTrigger.node.ts
+++ b/packages/nodes-base/nodes/Github/GithubTrigger.node.ts
@@ -434,6 +434,23 @@ export class GithubTrigger implements INodeType {
 				default: [],
 				description: 'The events to listen to',
 			},
+			{
+				displayName: 'Options',
+				name: 'options',
+				type: 'collection',
+				placeholder: 'Add Option',
+				default: {},
+				options: [
+					{
+						displayName: 'Insecure SSL',
+						name: 'insecureSSL',
+						type: 'boolean',
+						default: false,
+						description:
+							'Whether the SSL certificate of the n8n host be verified by GitHub when delivering payloads',
+					},
+				],
+			},
 		],
 	};
 
@@ -465,7 +482,7 @@ export class GithubTrigger implements INodeType {
 						return false;
 					}
 
-					// Some error occured
+					// Some error occurred
 					throw error;
 				}
 				// If it did not error then the webhook exists
@@ -488,14 +505,14 @@ export class GithubTrigger implements INodeType {
 				const events = this.getNodeParameter('events', []);
 
 				const endpoint = `/repos/${owner}/${repository}/hooks`;
+				const options = this.getNodeParameter('options') as { insecureSSL: boolean };
 
 				const body = {
 					name: 'web',
 					config: {
 						url: webhookUrl,
 						content_type: 'json',
-						// secret: '...later...',
-						insecure_ssl: '1', // '0' -> not allow inscure ssl | '1' -> allow insercure SSL
+						insecure_ssl: options.insecureSSL ? '1' : '0',
 					},
 					events,
 					active: true,
@@ -529,6 +546,7 @@ export class GithubTrigger implements INodeType {
 						throw new NodeOperationError(
 							this.getNode(),
 							'A webhook with the identical URL probably exists already. Please delete it manually on Github!',
+							{ level: 'warning' },
 						);
 					}
 
@@ -536,6 +554,7 @@ export class GithubTrigger implements INodeType {
 						throw new NodeOperationError(
 							this.getNode(),
 							'Check that the repository exists and that you have permission to create the webhooks this node requires',
+							{ level: 'warning' },
 						);
 					}
 
diff --git a/packages/nodes-base/nodes/Github/github.svg b/packages/nodes-base/nodes/Github/github.svg
index c83db1cbb9b3d..cefbcec946a0d 100644
--- a/packages/nodes-base/nodes/Github/github.svg
+++ b/packages/nodes-base/nodes/Github/github.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 148.744 150.744" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".872" y=".872"/><symbol id="a" overflow="visible"><path d="M73.256 0C32.801 0 0 34.029 0 76.001c0 33.586 20.988 62.069 50.1 72.115 3.663.698 4.999-1.652 4.999-3.656l-.105-14.149c-20.372 4.593-24.677-8.961-24.677-8.961-3.335-8.777-8.133-11.114-8.133-11.114-6.658-4.713.523-4.622.523-4.622 7.355.529 11.227 7.831 11.227 7.831 6.537 11.616 17.151 8.257 21.319 6.309.666-4.901 2.564-8.257 4.65-10.151-16.261-1.919-33.366-8.442-33.366-37.565 0-8.302 2.857-15.075 7.535-20.396-.747-1.929-3.269-9.663.724-20.123 0 0 6.143-2.041 20.145 7.793 5.84-1.692 12.105-2.529 18.314-2.555 6.223.028 12.492.872 18.34 2.564 13.978-9.844 20.128-7.793 20.128-7.793 4.006 10.47 1.483 18.192.733 20.114 4.695 5.32 7.53 12.093 7.53 20.396 0 29.198-17.133 35.627-33.453 37.509 2.639 2.355 4.971 6.977 4.971 14.065l-.098 20.855c0 2.023 1.333 4.388 5.044 3.663 29.091-10.078 50.062-38.561 50.062-72.129C146.512 34.029 113.71 0 73.256 0z" fill="#000" stroke="none"/></symbol></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round" viewBox="0 0 148.744 150.744"><use xlink:href="#a" x=".872" y=".872"/><symbol id="a" overflow="visible"><path fill="#000" stroke="none" d="M73.256 0C32.801 0 0 34.029 0 76.001c0 33.586 20.988 62.069 50.1 72.115 3.663.698 4.999-1.652 4.999-3.656l-.105-14.149c-20.372 4.593-24.677-8.961-24.677-8.961-3.335-8.777-8.133-11.114-8.133-11.114-6.658-4.713.523-4.622.523-4.622 7.355.529 11.227 7.831 11.227 7.831 6.537 11.616 17.151 8.257 21.319 6.309.666-4.901 2.564-8.257 4.65-10.151-16.261-1.919-33.366-8.442-33.366-37.565 0-8.302 2.857-15.075 7.535-20.396-.747-1.929-3.269-9.663.724-20.123 0 0 6.143-2.041 20.145 7.793 5.84-1.692 12.105-2.529 18.314-2.555 6.223.028 12.492.872 18.34 2.564 13.978-9.844 20.128-7.793 20.128-7.793 4.006 10.47 1.483 18.192.733 20.114 4.695 5.32 7.53 12.093 7.53 20.396 0 29.198-17.133 35.627-33.453 37.509 2.639 2.355 4.971 6.977 4.971 14.065l-.098 20.855c0 2.023 1.333 4.388 5.044 3.663 29.091-10.078 50.062-38.561 50.062-72.129C146.512 34.029 113.71 0 73.256 0"/></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Gitlab/GenericFunctions.ts b/packages/nodes-base/nodes/Gitlab/GenericFunctions.ts
index 21c9da8f8d329..c898041b541b8 100644
--- a/packages/nodes-base/nodes/Gitlab/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Gitlab/GenericFunctions.ts
@@ -1,6 +1,12 @@
-import type { IExecuteFunctions, IHookFunctions, IDataObject, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IHookFunctions,
+	IDataObject,
+	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
-import type { OptionsWithUri } from 'request';
 
 /**
  * Make an API request to Gitlab
@@ -8,13 +14,13 @@ import type { OptionsWithUri } from 'request';
  */
 export async function gitlabApiRequest(
 	this: IHookFunctions | IExecuteFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: object,
-	query?: object,
+	query?: IDataObject,
 	option: IDataObject = {},
 ): Promise<any> {
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		method,
 		headers: {},
 		body,
@@ -51,7 +57,7 @@ export async function gitlabApiRequest(
 
 export async function gitlabApiRequestAllItems(
 	this: IHookFunctions | IExecuteFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: any = {},
diff --git a/packages/nodes-base/nodes/Gitlab/Gitlab.node.ts b/packages/nodes-base/nodes/Gitlab/Gitlab.node.ts
index 421c5905cadd3..78d100441440a 100644
--- a/packages/nodes-base/nodes/Gitlab/Gitlab.node.ts
+++ b/packages/nodes-base/nodes/Gitlab/Gitlab.node.ts
@@ -1,6 +1,7 @@
 import type {
 	IDataObject,
 	IExecuteFunctions,
+	IHttpRequestMethods,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
@@ -745,8 +746,8 @@ export class Gitlab implements INodeType {
 				type: 'boolean',
 				displayOptions: {
 					show: {
-						resource: ['release', 'file'],
-						operation: ['getAll', 'list'],
+						resource: ['release', 'file', 'repository'],
+						operation: ['getAll', 'list', 'getIssues'],
 					},
 				},
 				default: false,
@@ -758,8 +759,8 @@ export class Gitlab implements INodeType {
 				type: 'number',
 				displayOptions: {
 					show: {
-						resource: ['release', 'file'],
-						operation: ['getAll', 'list'],
+						resource: ['release', 'file', 'repository'],
+						operation: ['getAll', 'list', 'getIssues'],
 						returnAll: [false],
 					},
 				},
@@ -935,6 +936,13 @@ export class Gitlab implements INodeType {
 						default: '',
 						description: 'Return only issues which were created by a specific user',
 					},
+					{
+						displayName: 'Search',
+						name: 'search',
+						type: 'string',
+						default: '',
+						description: 'Search issues against their title and description',
+					},
 					{
 						displayName: 'Labels',
 						name: 'labels',
@@ -1131,7 +1139,7 @@ export class Gitlab implements INodeType {
 					'Whether to set the data of the file as binary property instead of returning the raw API response',
 			},
 			{
-				displayName: 'Binary Property',
+				displayName: 'Put Output File in Field',
 				name: 'binaryPropertyName',
 				type: 'string',
 				default: 'data',
@@ -1144,8 +1152,7 @@ export class Gitlab implements INodeType {
 					},
 				},
 				placeholder: '',
-				description:
-					'Name of the binary property in which to save the binary data of the received file',
+				hint: 'The name of the output binary field to put the file in',
 			},
 			{
 				displayName: 'Additional Parameters',
@@ -1177,7 +1184,7 @@ export class Gitlab implements INodeType {
 			//         file:create/edit
 			// ----------------------------------
 			{
-				displayName: 'Binary Data',
+				displayName: 'Binary File',
 				name: 'binaryData',
 				type: 'boolean',
 				default: false,
@@ -1207,7 +1214,7 @@ export class Gitlab implements INodeType {
 				description: 'The text content of the file',
 			},
 			{
-				displayName: 'Binary Property',
+				displayName: 'Input Binary Field',
 				name: 'binaryPropertyName',
 				type: 'string',
 				default: 'data',
@@ -1220,7 +1227,7 @@ export class Gitlab implements INodeType {
 					},
 				},
 				placeholder: '',
-				description: 'Name of the binary property which contains the data for the file',
+				hint: 'The name of the input binary field containing the file to be written',
 			},
 			{
 				displayName: 'Commit Message',
@@ -1319,22 +1326,22 @@ export class Gitlab implements INodeType {
 		const items = this.getInputData();
 		const returnData: INodeExecutionData[] = [];
 
-		let _credentials;
+		// let _credentials;
 
-		const authenticationMethod = this.getNodeParameter('authentication', 0);
+		// const authenticationMethod = this.getNodeParameter('authentication', 0);
 
-		try {
-			if (authenticationMethod === 'accessToken') {
-				_credentials = await this.getCredentials('gitlabApi');
-			} else {
-				_credentials = await this.getCredentials('gitlabOAuth2Api');
-			}
-		} catch (error) {
-			if (this.continueOnFail()) {
-				return [this.helpers.returnJsonArray([{ error: error.message }])];
-			}
-			throw new NodeOperationError(this.getNode(), error as Error);
-		}
+		// try {
+		// 	if (authenticationMethod === 'accessToken') {
+		// 		_credentials = await this.getCredentials('gitlabApi');
+		// 	} else {
+		// 		_credentials = await this.getCredentials('gitlabOAuth2Api');
+		// 	}
+		// } catch (error) {
+		// 	if (this.continueOnFail()) {
+		// 		return [this.helpers.returnJsonArray([{ error: error.message }])];
+		// 	}
+		// 	throw new NodeOperationError(this.getNode(), error as Error);
+		// }
 
 		// Operations which overwrite the returned data
 		const overwriteDataOperations = [
@@ -1367,7 +1374,7 @@ export class Gitlab implements INodeType {
 		// For Query string
 		let qs: IDataObject;
 
-		let requestMethod: string;
+		let requestMethod: IHttpRequestMethods;
 		let endpoint: string;
 		let returnAll = false;
 
@@ -1563,6 +1570,12 @@ export class Gitlab implements INodeType {
 
 						qs = this.getNodeParameter('getRepositoryIssuesFilters', i) as IDataObject;
 
+						returnAll = this.getNodeParameter('returnAll', 0);
+
+						if (!returnAll) {
+							qs.per_page = this.getNodeParameter('limit', 0);
+						}
+
 						endpoint = `${baseEndpoint}/issues`;
 					}
 				} else if (resource === 'user') {
@@ -1766,10 +1779,10 @@ export class Gitlab implements INodeType {
 			overwriteDataOperationsArray.includes(fullOperation)
 		) {
 			// Return data gets replaced
-			return this.prepareOutputData(returnData);
+			return [returnData];
 		} else {
 			// For all other ones simply return the unchanged items
-			return this.prepareOutputData(items);
+			return [items];
 		}
 	}
 }
diff --git a/packages/nodes-base/nodes/Gitlab/GitlabTrigger.node.ts b/packages/nodes-base/nodes/Gitlab/GitlabTrigger.node.ts
index 910759349463a..12febc14e5205 100644
--- a/packages/nodes-base/nodes/Gitlab/GitlabTrigger.node.ts
+++ b/packages/nodes-base/nodes/Gitlab/GitlabTrigger.node.ts
@@ -144,7 +144,7 @@ export class GitlabTrigger implements INodeType {
 				default: '',
 				required: true,
 				placeholder: 'n8n-io',
-				description: 'Owner of the repsitory',
+				description: 'Owner of the repository',
 			},
 			{
 				displayName: 'Repository Name',
@@ -153,7 +153,7 @@ export class GitlabTrigger implements INodeType {
 				default: '',
 				required: true,
 				placeholder: 'n8n',
-				description: 'The name of the repsitory',
+				description: 'The name of the repository',
 			},
 			{
 				displayName: 'Events',
@@ -195,7 +195,7 @@ export class GitlabTrigger implements INodeType {
 				try {
 					await gitlabApiRequest.call(this, 'GET', endpoint, {});
 				} catch (error) {
-					if (error.cause.httpCode === '404') {
+					if (error.cause.httpCode === '404' || error.description.includes('404')) {
 						// Webhook does not exist
 						delete webhookData.webhookId;
 						delete webhookData.webhookEvents;
diff --git a/packages/nodes-base/nodes/Gitlab/gitlab.svg b/packages/nodes-base/nodes/Gitlab/gitlab.svg
index 3c9b970288cac..e264c71078048 100644
--- a/packages/nodes-base/nodes/Gitlab/gitlab.svg
+++ b/packages/nodes-base/nodes/Gitlab/gitlab.svg
@@ -1 +1 @@
-<svg width="60" height="60" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round"><path fill="#E24329" d="M30.5 56.967l10.863-33.203H19.637z"/><path fill="#FC6D26" d="M30.5 56.967L19.637 23.764H4.41z"/><path d="M4.41 23.764L1.11 33.86c-.3.92.03 1.928.817 2.496L30.5 56.967 4.41 23.764z" fill="#FCA326"/><path d="M4.41 23.764h15.226L13.093 3.781c-.336-1.029-1.802-1.029-2.139 0L4.411 23.764z" fill="#E24329"/><path fill="#FC6D26" d="M30.5 56.967l10.863-33.203H56.59z"/><path d="M56.59 23.764l3.3 10.086a2.224 2.224 0 01-.817 2.497L30.5 56.967l26.09-33.203z" fill="#FCA326"/><path d="M56.59 23.764H41.362l6.544-19.992c.336-1.03 1.802-1.03 2.139 0l6.543 19.992z" fill="#E24329"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="60" height="60"><g fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round"><path fill="#E24329" d="m30.5 56.967 10.863-33.203H19.637z"/><path fill="#FC6D26" d="M30.5 56.967 19.637 23.764H4.41z"/><path fill="#FCA326" d="M4.41 23.764 1.11 33.86c-.3.92.03 1.928.817 2.496L30.5 56.967z"/><path fill="#E24329" d="M4.41 23.764h15.226L13.093 3.781c-.336-1.029-1.802-1.029-2.139 0z"/><path fill="#FC6D26" d="m30.5 56.967 10.863-33.203H56.59z"/><path fill="#FCA326" d="m56.59 23.764 3.3 10.086a2.22 2.22 0 0 1-.817 2.497L30.5 56.967z"/><path fill="#E24329" d="M56.59 23.764H41.362l6.544-19.992c.336-1.03 1.802-1.03 2.139 0l6.543 19.992z"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/GoToWebinar/GenericFunctions.ts b/packages/nodes-base/nodes/GoToWebinar/GenericFunctions.ts
index 1a56ff146d8b5..414a0e1cbb4ce 100644
--- a/packages/nodes-base/nodes/GoToWebinar/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/GoToWebinar/GenericFunctions.ts
@@ -2,15 +2,15 @@ import type {
 	IDataObject,
 	IExecuteFunctions,
 	IHookFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
 	INodePropertyOptions,
+	IRequestOptions,
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import type { OptionsWithUri } from 'request';
-
-import moment from 'moment';
+import moment from 'moment-timezone';
 
 import * as losslessJSON from 'lossless-json';
 
@@ -27,7 +27,7 @@ function convertLosslessNumber(key: any, value: any) {
  */
 export async function goToWebinarApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	qs: IDataObject,
 	body: IDataObject | IDataObject[],
@@ -36,7 +36,7 @@ export async function goToWebinarApiRequest(
 	const operation = this.getNodeParameter('operation', 0);
 	const resource = this.getNodeParameter('resource', 0);
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			'user-agent': 'n8n',
 			Accept: 'application/json',
@@ -86,7 +86,7 @@ export async function goToWebinarApiRequest(
  */
 export async function goToWebinarApiRequestAllItems(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	query: IDataObject,
 	body: IDataObject,
@@ -139,7 +139,7 @@ export async function handleGetAll(
 		qs.limit = this.getNodeParameter('limit', 0);
 	}
 
-	return goToWebinarApiRequestAllItems.call(this, 'GET', endpoint, qs, body, resource);
+	return await goToWebinarApiRequestAllItems.call(this, 'GET', endpoint, qs, body, resource);
 }
 
 export async function loadWebinars(this: ILoadOptionsFunctions) {
diff --git a/packages/nodes-base/nodes/GoToWebinar/GoToWebinar.node.ts b/packages/nodes-base/nodes/GoToWebinar/GoToWebinar.node.ts
index 4fdfea7bfb8d3..411ffe654254b 100644
--- a/packages/nodes-base/nodes/GoToWebinar/GoToWebinar.node.ts
+++ b/packages/nodes-base/nodes/GoToWebinar/GoToWebinar.node.ts
@@ -9,6 +9,20 @@ import type {
 } from 'n8n-workflow';
 import { 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,
@@ -24,22 +38,6 @@ import {
 	webinarOperations,
 } from './descriptions';
 
-import {
-	goToWebinarApiRequest,
-	goToWebinarApiRequestAllItems,
-	handleGetAll,
-	loadAnswers,
-	loadRegistranMultiChoiceQuestions,
-	loadRegistranSimpleQuestions,
-	loadWebinars,
-	loadWebinarSessions,
-} from './GenericFunctions';
-
-import isEmpty from 'lodash.isempty';
-import omit from 'lodash.omit';
-
-import moment from 'moment-timezone';
-
 export class GoToWebinar implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'GoToWebinar',
@@ -112,13 +110,13 @@ export class GoToWebinar implements INodeType {
 	methods = {
 		loadOptions: {
 			async getWebinars(this: ILoadOptionsFunctions) {
-				return loadWebinars.call(this);
+				return await loadWebinars.call(this);
 			},
 			async getAnswers(this: ILoadOptionsFunctions) {
-				return loadAnswers.call(this);
+				return await loadAnswers.call(this);
 			},
 			async getWebinarSessions(this: ILoadOptionsFunctions) {
-				return loadWebinarSessions.call(this);
+				return await loadWebinarSessions.call(this);
 			},
 			// Get all the timezones to display them to user so that they can
 			// select them easily
@@ -137,12 +135,12 @@ export class GoToWebinar implements INodeType {
 			async getRegistranSimpleQuestions(
 				this: ILoadOptionsFunctions,
 			): Promise<INodePropertyOptions[]> {
-				return loadRegistranSimpleQuestions.call(this);
+				return await loadRegistranSimpleQuestions.call(this);
 			},
 			async getRegistranMultiChoiceQuestions(
 				this: ILoadOptionsFunctions,
 			): Promise<INodePropertyOptions[]> {
-				return loadRegistranMultiChoiceQuestions.call(this);
+				return await loadRegistranMultiChoiceQuestions.call(this);
 			},
 		},
 	};
@@ -652,6 +650,6 @@ export class GoToWebinar implements INodeType {
 			returnData.push(...executionData);
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/GoToWebinar/descriptions/WebinarDescription.ts b/packages/nodes-base/nodes/GoToWebinar/descriptions/WebinarDescription.ts
index 8558ed9364d38..c85fa8eb492f7 100644
--- a/packages/nodes-base/nodes/GoToWebinar/descriptions/WebinarDescription.ts
+++ b/packages/nodes-base/nodes/GoToWebinar/descriptions/WebinarDescription.ts
@@ -145,6 +145,7 @@ export const webinarFields: INodeProperties[] = [
 			{
 				displayName: 'Is Password Protected',
 				name: 'isPasswordProtected',
+
 				type: 'boolean',
 				default: false,
 			},
@@ -154,7 +155,6 @@ export const webinarFields: INodeProperties[] = [
 				type: 'options',
 				description:
 					'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
-				required: true,
 				default: '',
 				placeholder: '2020-12-11T09:00:00Z',
 				typeOptions: {
@@ -406,6 +406,7 @@ export const webinarFields: INodeProperties[] = [
 			{
 				displayName: 'Is Password Protected',
 				name: 'isPasswordProtected',
+
 				type: 'boolean',
 				default: false,
 				description: 'Whether the webinar requires a password for attendees to join',
diff --git a/packages/nodes-base/nodes/GoToWebinar/gotowebinar.svg b/packages/nodes-base/nodes/GoToWebinar/gotowebinar.svg
index 1dc4713b808a0..59cd8b0d04b32 100644
--- a/packages/nodes-base/nodes/GoToWebinar/gotowebinar.svg
+++ b/packages/nodes-base/nodes/GoToWebinar/gotowebinar.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="-3 -2 85 85"><defs><clipPath id="a"><path d="M36.602.102h6.296v.097h-6.296zm-.5.097h7.296v.102h-7.296zM35.5.301H44v.097h-8.5zm-.602.097H44.5V.5h-9.602zm-.5.102h10.704v.102H34.398zm-.5.102H45.5v.097H33.898zm-.296.097h12.296v.102H33.602zM33.3.801h12.898v.097H33.301zm-.3.097h13.5V1H33zM32.7 1h14.1v.102H32.7zm-.4.102h14.802v.097H32.3zm-.3.097h15.398v.102H32zm-.3.102h16.1v.097H31.7zm-.302.097H48V1.5H31.398zM31.2 1.5h17.102v.102H31.199zm-.2.102h17.5v.097H31zm-.2.097h17.9v.102H30.8zm-.198.102h18.296v.097H30.602zm-.301.097h18.8V2h-18.8zM30.1 2h19.2v.102H30.1zm-.203.102h19.704v.097H29.898zm-.199.097H49.8v.102H29.699zm-.199.102H50v.097H29.5zm-.2.097h20.9V2.5H29.3zm-.198.102h21.296v.102H29.102zm-.204.102h21.704v.097H28.898zm-.199.097h22v.102h-22zm-.097.102h22.296v.097H28.602zm-.204.097H51V3H28.398zM28.301 3h22.898v.102H28.301zm-.2.102h23.2v.097H28.1zm-.203.097H51.5v.102H27.898zm-.097.102h23.898v.097H27.801zm-.2.097h24.2V3.5H27.6zM27.5 3.5H52v.102H27.5zm-.2.102h24.802v.097H27.3zm-.1.097h25.1v.102H27.2zm-.2.102h25.5v.097H27zm-.2.097h25.802V4H26.8zM26.7 4h26v.102h-26zm-.098.102h26.296v.097H26.602zm-.102.097H53v.102H26.5zm-.102.102h26.704v.097H26.398zm-.199.097h27V4.5h-27zm-.097.102H53.3v.102H26.1zM26 4.602h27.5v.097H26zm-.102.097h27.704v.102H25.898zm-.199.102h28v.097h-28zm-.097.097H53.8V5H25.6zM25.5 5H54v.102H25.5zm-.102.102h28.704v.097H25.398zm-.097.097h28.898v.102H25.301zm-.2.102h29.2v.097H25.1zM25 5.398h29.398V5.5H25zm-.102.102h29.704v.102H24.898zm-.097.102h29.898v.097H24.801zm-.102.097h30.102v.102H24.699zm-.097.102h30.296v.097H24.602zm-.102.097H55V6H24.5zM24.398 6h30.704v.102H24.398zm-.097.102h30.898v.097H24.301zm-.102.097h31.102v.102H24.199zm-.097.102h31.296v.097H24.102zM24 6.398h31.5V6.5H24zm-.102.102h31.704v.102H23.898zm-.097.102h31.898v.097H23.801zm-.102.097h32v.102h-32zm-.097.102H55.8v.097H23.6zm-.102.097h32.398V7H23.5zM23.398 7H56v.102H23.398zm-.097.102h32.8v.097h-32.8zm-.102.097h33v.102h-33zm-.097.102H56.3v.097H23.1zM23 7.398h33.398V7.5H23zm-.102.102H56.5v.102H22.898zm-.097.102h33.8v.097h-33.8zm0 .097h33.898v.102H22.801zm-.102.102h34.102v.097H22.699zm-.097.097h34.296V8H22.602zM22.5 8h34.398v.102H22.5zm-.102.102H57v.097H22.398zm0 .097h34.704v.102H22.398zm-.097.102h34.898v.097H22.301zm-.102.097h35.102V8.5H22.199zm-.097.102H57.3v.102H22.1zM22 8.602h35.398v.097H22zm0 .097h35.5v.102H22zm-.102.102h35.704v.097H21.898zm-.097.097h35.898V9H21.801zM21.699 9h36v.102h-36zm-.097.102H57.8v.097H21.6zm0 .097h36.296v.102H21.602zm-.102.102H58v.097H21.5zm-.102.097H58V9.5H21.398zm-.097.102h36.8v.102h-36.8zm0 .102h36.898v.097H21.301zm-.102.097h37.102v.102H21.199zm-.097.102h37.296v.097H21.102zm-.801.097h39.3V10h-39.3zm-.7.102h40.797v.102H19.602zm-.703.102H61.2v.097H18.9zm-.699.097h43.403v.102H18.199zm-.398.102h44.3v.097h-44.3zm-.403.097H62.5v.102H17.398zM17 10.5h45.898v.102H17zm-.398.102h46.796v.097H16.602zm-.403.097h47.602v.102H16.199zm-.398.102h48.3v.097h-48.3zm-.403.097h49V11h-49zm-.296.102h49.5v.102h-49.5zm-.204.102h50v.097h-50zm-.296.097h50.597v.102H14.602zm-.204.102h51v.097h-51zm-.296.097h51.597v.102H14.102zm-.301.102H66v.102H13.8zm-.2.102h52.7v.097H13.6zm-.3.097H66.5v.102H13.3zm-.2.102H66.7v.097H13.102zm-.3.097h54.097V12H12.801zm-.2.102h54.5v.102h-54.5zm-.203.102h54.903v.097H12.398zm-.199.097H67.5v.102H12.2zm-.199.102h55.7v.097H12zm-.102.097h56v.102h-56zm-.199.102H68v.102H11.7zm-.199.102h56.7v.097H11.5zm-.2.097h57.098v.102H11.301zm-.198.102h57.5v.097h-57.5zm-.204.097h57.903V13H10.898zm-.097.102H69v.102H10.8zm-.2.102h58.5v.097h-58.5zm-.203.097h58.903v.102H10.398zm-.199.102h59.2v.097h-59.2zm-.097.097H69.5v.102H10.102zm-.204.102H69.7v.102H9.9zm-.097.102h60v.097h-60zm-.102.097H70v.102H9.7zm-.199.102h60.602v.097H9.5zm-.102.097h60.903V14H9.398zM9.2 14h61.2v.102H9.2zm-.097.102h61.5v.097h-61.5zM9 14.199h61.7v.102H9zm-.2.102h62.098v.097H8.801zm-.1.097H71v.102H8.7zm-.2.102h62.602v.102H8.5zm-.102.102H71.2v.097H8.4zm-.097.097h63v.102h-63zm-.2.102H71.5v.097H8.102zM8 14.898h63.602V15H8zM7.898 15H71.7v.102H7.9zm-.097.102h64v.097h-64zm-.102.097h64.2v.102h-64.2zm-.097.102H72v.097H7.602zm-.102.097h64.602v.102H7.5zm-.2.102h65v.102h-65zm-.1.102h65.198v.097H7.2zm-.098.097H72.5v.102H7.102zM7 15.801h65.602v.097H7zm-.102.097H72.7V16H6.9zM6.801 16h66v.102h-66zm-.102.102h66.2v.097h-66.2zm-.097.097H73v.102H6.602zm-.102.102h66.602v.097H6.5zm-.102.097H73.2v.102H6.4zM6.2 16.5h67.102v.102H6.199zm-.097.102h67.296v.097H6.102zm0 .097H73.5v.102H6.102zM6 16.801h67.602v.097H6zm-.102.097H73.7V17H5.9zM5.801 17h67.898v.102H5.801zm-.102.102h68.102v.097H5.699zm-.097.097h68.296v.102H5.602zm-.102.102H74v.097H5.5zm0 .097h68.602v.102H5.5zm-.102.102H74.2v.102H5.4zm-.097.102h69v.097h-69zm-.102.097h69.2v.102h-69.2zm-.097.102H74.5v.097H5.102zM5 17.898h69.602V18H5zM4.898 18h69.704v.102H4.898zm-.097.102h69.898v.097H4.801zm0 .097h70v.102h-70zm-.102.102h70.2v.097h-70.2zm-.097.097h70.296v.102H4.602zM4.5 18.5H75v.102H4.5zm-.102.102h70.704v.097H4.398zm0 .097H75.2v.102H4.4zm-.097.102h70.898v.097H4.301zm-.102.097h71.102V19H4.199zM4.102 19h71.296v.2H4.102zM4 19.2h71.5v.1H4zm-.102.1h71.704v.2H3.898zm-.097.2h71.898v.102H3.801zm-.102.102h72.102v.199H3.699zm-.097.199h72.296v.097H3.602zm-.102.097H76V20H3.5zm0 .102h72.602v.102H3.5zm-.102.102h72.704v.097H3.398zm-.097.097h72.898v.102H3.301zm0 .102h73v.097h-73zm-.102.097h73.102v.102H3.199zm-.097.102h73.296v.2H3.102zM3 20.7h73.5v.1H3zm-.102.1H76.5v.098H2.898zm0 .098h73.704V21H2.898zM2.801 21h73.8v.102h-73.8zm0 .102h73.898v.097H2.801zm-.102.097h74v.102h-74zm0 .102h74.102v.097H2.699zm-.097.097H76.8v.102H2.6zm0 .102h74.296v.102H2.602zm-.102.102H77v.199H2.5zm-.102.199h74.704V22H2.398zM2.301 22h74.898v.2H2.301zm-.102.2h75.102v.198H2.199zm-.097.198h75.296v.204H2.102zM2 22.602h75.5v.199H2zm-.102.199h75.704V23H1.898zM1.801 23h75.8v.102h-75.8zm0 .102h75.898v.097H1.801zm-.102.097h76v.102h-76zm0 .102h76.102v.199H1.699zm-.097.199H77.8v.102H1.6zm0 .102h76.296v.097H1.602zm-.102.097h76.398v.2H1.5zm0 .2H78V24H1.5zM1.398 24H78v.102H1.398zm0 .102h76.704v.199H1.398zm-.097.199h76.8v.097h-76.8zm0 .097h76.898v.102H1.301zm-.102.102h77v.2h-77zm0 .2h77.102v.1H1.199zm-.097.1H78.3v.098H1.1zm0 .098h77.296v.204H1.102zM1 25.102h77.398v.097H1zm0 .097h77.5v.2H1zm-.102.2H78.5v.203H.898zm-.097.203h77.8V26H.802zM.8 26h77.898v.102H.801zm-.102.102h78v.296H.7zm0 .296H78.8v.102H.699zm-.097.102H78.8v.3H.6zm0 .3h78.296v.098H.602zm-.102.098h78.398v.301H.5zm0 .301H79v.2H.5zm-.102.2H79v.203H.398zm0 .203h78.704v.199H.398zm-.097.199h78.8v.398H.302zm-.102.398h78.903v.2H.199zm0 .2h79v.8H.2zm-.097.8H79.3v.903H.1zm0 .903h79.296v.097H.102zM0 30.199h79.398v3.102H0zm0 3.102h79.3v.398H0zm.102.398H79.3V34H.1zm0 .301h79.097v.398H.102zm.097.398h79v.301H.2zm0 .301h78.903V35H.199zM.301 35h78.8v.398H.302zm0 .398H79v.301H.3zm.097.301H79v.403H.398zm0 .403h78.5v.199H.398zM.5 36.3h78.398v.199H.5zm0 .199h78.3v.2H.5zm.102.2H78.8v.1H.6zm0 .1h78.097v.2H.602zm.097.2h78v.2H.7zm0 .2h77.903v.198H.699zm.102.198h77.8v.204H.802zm0 .204H78.5v.097H.8zm.097.097H78.5v.2H.898zm0 .2h77.5v.203H.898zm.102.203h77.398v.199H1zm0 .199h77.3v.097H1zm.102.097H78.3v.301H1.1zm.097.301h77V39h-77zm0 .301h76.903v.102H1.199zm.102.102h76.8v.097h-76.8zm0 .097H78v.102H1.3zm.097.102H78v.199H1.398zm0 .199h76.5v.102h-76.5zm.102.102h76.398v.097H1.5zm0 .097h76.3v.102H1.5zm.102.102H77.8v.2H1.6zm0 .199h76.097v.102H1.602zm.097.102h76v.097h-76zm0 .097h75.903v.102H1.699zm.102.102h75.8v.199h-75.8zm.097.199H77.5v.3H1.898zm.102.3h75.398v.2H2zm.102.2H77.3v.2H2.1zm.097.2h75v.198h-75zm.102.198h74.8v.204h-74.8zm.097.204H77v.097H2.398zm0 .097h74.704v.102H2.398zm-.097.102h74.8v.097h-74.8zm0 .097h74.898v.204H2.301zm-.102.204h75.102v.199H2.199zm-.097.199h75.296v.199H2.102zM2 42.5h75.398v.102H2zm0 .102h75.5v.199H2zm-.102.199h75.704V43H1.898zM1.801 43h75.8v.102h-75.8zm0 .102h75.898v.199H1.801zm-.102.199h76.102v.199H1.699zm-.097.199H77.8v.102H1.6zm0 .102h76.296v.097H1.602zm-.102.097h76.398v.102H1.5zm0 .102H78V44H1.5zM1.398 44H78v.102H1.398zm0 .102h76.704v.097H1.398zm-.097.097h76.8v.102h-76.8zm0 .102h76.898v.3H1.301zm-.102.3h77v.098h-77zm0 .098h77.102v.2H1.199zm-.097.2H78.3V45H1.1zm0 .101h77.296v.2H1.102zM1 45.2h77.398v.1H1zm0 .1h77.5v.302H1zm-.102.302H78.5v.097H.898zm0 .097h77.704v.2H.898zm-.097.2h77.8V46H.802zM.8 46h77.898v.2H.801zm-.102.2h78v.1H.7zm0 .1H78.8v.302H.699zm-.097.302H78.8v.097H.6zm0 .097h78.296v.2H.602zm-.102.2h78.398v.203H.5zm0 .203H79v.296H.5zm-.102.296H79v.301H.398zm0 .301h78.704V48H.398zM.301 48h78.8v.2H.302zm0 .2h78.898v.402H.301zm-.102.402h79v.199H.2zm0 .199h79.102v.3H.199zm-.097.3H79.3v.297H.1zm0 .297h79.296v.801H.102zM0 50.2h79.398v.8H0zm0 .8h79.5v1.898H0zm0 1.898h79.398v.5H0zm.102.5h79.296v.704H.102zm0 .704H79.3v.5H.1zm.097.5h79.102V55H.199zM.2 55h79v.2H.2zm.102.2H79.2v.3H.301zm0 .3h78.8v.2H.302zm.097.2h78.704v.198H.398zm0 .198H79v.204H.398zm.102.204H79v.296H.5zm0 .296h78.398v.204H.5zm.102.204h78.296v.199H.602zm0 .199H78.8V57H.6zM.699 57h78.102v.3H.699zm0 .3h78v.2H.7zm.102.2h77.898v.102H.801zm0 .102h77.8v.097H.802zm.097.097h77.704v.2H.898zm0 .2H78.5V58H.898zM1 58h77.5v.2H1zm0 .2h77.398v.1H1zm.102.1h77.296v.2H1.102zm0 .2H78.3v.102H1.1zm.097.102h77.102v.097H1.199zm0 .097h77v.102h-77zm.102.102h76.898V59H1.301zm0 .199h76.8v.102h-76.8zm.097.102h76.704v.199H1.398zm0 .199H78v.097H1.398zm.102.097H78v.204H1.5zm0 .204h76.398v.097H1.5zm.102.097h76.296v.102H1.602zm0 .102H77.8v.097H1.6zm.097.097h76.102v.204H1.699zm0 .204h76v.097h-76zm.102.097h75.898v.102H1.801zm0 .102h75.8v.097h-75.8zm.097.097h75.704v.102H1.898zm0 .102H77.5v.102H1.898zm.102.102h75.5v.097H2zm0 .097h75.398v.102H2zm.102.102h75.296v.097H2.102zm0 .097H77.3V61H2.1zm.097.102h75.102v.102H2.199zm0 .102h75v.097h-75zm.102.097h74.898v.102H2.301zm0 .102h74.8v.097h-74.8zm.097.097h74.704v.102H2.398zm0 .102H77v.102H2.398zm.102.102H77v.097H2.5zm0 .097h74.398v.102H2.5zm.102.102h74.296v.097H2.602zm0 .097H76.8V62H2.6zm.097.102h74.102v.102H2.699zm0 .102h74v.097h-74zm.102.097h73.898v.102H2.801zm.097.102h73.704v.097H2.898zm0 .097H76.5v.102H2.898zM3 62.5h73.5v.102H3zm0 .102h73.398v.097H3zm.102.097h73.296v.102H3.102zm.097.102h73.102v.097H3.199zm0 .097h73V63h-73zm.102.102h72.898v.102H3.301zm0 .102h72.8v.097h-72.8zm.097.097h72.704v.102H3.398zm.102.102H76v.097H3.5zm0 .097h72.398v.102H3.5zm.102.102h72.296v.102H3.602zm.097.102h72.102v.097H3.699zm.102.097h71.898v.102H3.801zm0 .102h71.8v.097h-71.8zm.097.097h71.704V64H3.898zM4 64h71.5v.102H4zm0 .102h71.398v.097H4zm.102.097h71.296v.102H4.102zm.097.102h71.102v.097H4.199zm.102.097h70.898v.102H4.301zm0 .102h70.8v.102h-70.8zm.097.102h70.704v.097H4.398zm.102.097H75v.102H4.5zm0 .102h70.398v.097H4.5zm.102.097h70.296V65H4.602zm.097.102h70.102v.102H4.699zm.102.102h69.898v.097H4.801zm.097.097h69.704v.102H4.898zm0 .102H74.5v.097H4.898zm.102.097h69.398v.102H5zm.102.102H74.3v.102H5.1zm.097.102h69.102v.097H5.199zm.102.097h68.898v.102H5.301zm.097.102h68.704v.097H5.398zm.102.097H74V66H5.5zm.102.102h68.296v.102H5.602zm.097.102h68.102v.097H5.699zm0 .097h68v.102h-68zm.102.102h67.8v.097h-67.8zm.097.097h67.704v.102H5.898zM6 66.5h67.5v.102H6zm.102.102h67.296v.097H6.102zm.097.097h67.102v.102H6.199zm.102.102h66.898v.097H6.301zm.097.097h66.704V67H6.398zm0 .102H73v.102H6.398zm.204.102h66.296v.097H6.602zm.097.097h66.102v.102H6.699zm.102.102h65.898v.097H6.801zm.097.097h65.704v.102H6.898zM7 67.5h65.5v.102H7zm.102.102h65.296v.097H7.102zm.097.097h65v.102h-65zm.102.102h64.8v.097h-64.8zm.199.097H72V68H7.5zm.102.102h64.296v.102H7.602zm.097.102h64.102v.097H7.699zm.102.097h63.898v.102H7.801zm.097.102h63.704v.097H7.898zm.102.097h63.398v.102H8zm.102.102H71.3v.102H8.1zm.199.102h62.898v.097H8.301zm.097.097h62.704v.102H8.398zm.102.102H71v.097H8.5zm.102.097H70.8V69H8.6zM8.8 69h61.898v.102H8.801zm.097.102H70.5v.097H8.898zm.204.097h61.296v.102H9.102zm.097.102h61v.097h-61zm.2.097h60.703v.102H9.398zm.101.102h60.398v.102H9.5zm.2.102h60.1v.097H9.7zm.1.097h59.802v.102H9.8zm.2.102h59.5v.097H10zm.102.097H69.3V70H10.1zM10.3 70h58.898v.102H10.301zm.097.102H69v.097H10.398zm.204.097h58.296v.102H10.602zm.199.102h57.898v.097H10.801zm.199.097h57.5v.102H11zm.2.102h57.1v.102H11.2zm.198.102h56.704v.097H11.398zm.204.097h56.296v.102H11.602zm.199.102h55.898v.097H11.801zm.199.097h55.5V71H12zm.2.102h55.1v.102H12.2zm.198.102h54.704v.097H12.398zm.204.097h54.296v.102H12.602zm.199.102h53.898v.097H12.801zm.199.097h53.5v.102H13zm.2.102h53v.102h-53zm.3.102H66v.097H13.5zm.3.097h51.9v.102H13.8zm.302.102h51.296v.097H14.102zm.296.097h50.704V72H14.398zm.204.102H64.8v.102H14.6zm.296.102h49.704v.097H14.898zm.301.097H64.3v.102H15.199zm.301.102H64v.097H15.5zm.398.097h47.704v.102H15.898zm.403.102h46.898v.102H16.301zm.398.102H62.8v.097H16.699zm.5.097H62.3v.102H17.199zm.403.102h44.296v.097H17.602zm.398.097h43.5V73H18zm.5.102H61v.102H18.5zm.7.102h41.1v.097H19.2zm.698.097h39.704v.102H19.898zm.903.102h38v.097h-38zm.3.097h37.297v.102H21.102zm.098.102H58.3v.102H21.199zm.102.102h37v.097h-37zm0 .097h36.898v.102H21.301zm.097.102h36.704v.097H21.398zm.102.097H58v.204H21.5zm.102.204h36.296v.097H21.602zm.097.097H57.8v.102H21.699zm.102.102h35.898v.097H21.801zm.097.097H57.7v.102H21.9zm0 .102h35.704v.102H21.898zm.102.102h35.5v.097H22zm.102.097h35.296v.102H22.102zm.097.102H57.3v.097H22.199zm.102.097h35V75h-35zm.097.102H57.2v.102H22.4zm0 .102h34.704v.097H22.398zm.102.097H57v.102H22.5zm.102.102h34.296v.097H22.602zm.097.097h34.2v.102h-34.2zm.102.102h34v.102h-34zm0 .102h33.898v.097H22.801zm.097.097h33.704v.102H22.898zm.102.102h33.5v.097H23zm.102.097h33.296V76H23.102zm.097.102H56.3v.102H23.199zm.102.102h32.898v.097H23.301zm.097.097h32.704v.102H23.398zm.102.102H56v.097H23.5zm.102.097h32.296v.102H23.602zm.097.102H55.8v.102H23.699zm.102.102h31.898v.097H23.801zm.097.097h31.704v.102H23.898zm.102.102h31.5v.097H24zm.102.097h31.296V77H24.102zm.097.102H55.3v.102H24.199zm.102.102h30.898v.097H24.301zm.097.097h30.704v.102H24.398zm.102.102H55v.097H24.5zm.102.097h30.296v.102H24.602zm.097.102H54.8v.102H24.699zm.102.102h29.898v.097H24.801zm.097.097h29.704v.102H24.898zm.102.102h29.5v.097H25zm.2.097h29.198V78H25.2zm.1.102h28.9v.102H25.3zm.098.102h28.704v.097H25.398zm.204.097H54v.102H25.602zm.097.102h28.2v.097h-28.2zm.102.097h27.898v.102H25.801zm.097.102h27.704v.102H25.898zm.204.102H53.5v.097H26.102zm.097.097H53.3v.102H26.199zm.102.102h26.898v.097H26.301zm.199.097h26.602V79H26.5zm.102.102H53v.102H26.602zm.097.102H52.8v.097H26.699zm.102.097h25.898v.102H26.801zm.199.102h25.602v.097H27zm.102.097H52.5v.102H27.102zm.199.102h25v.102h-25zm.097.102h24.704v.097H27.398zm.204.097H52v.102H27.602zm.199.102h24v.097h-24zm.097.097h23.704V80H27.898zm.204.102H51.5v.102H28.102zm.199.102h23v.097h-23zm.097.097h22.704v.102H28.398zm.204.102H51v.097H28.602zm.199.097h22v.102h-22zm.097.102h21.704v.102H28.898zm.204.102H50.5v.097H29.102zm.199.097h21v.102h-21zm.097.102h20.704v.097H29.398zm.301.097h20.2V81h-20.2zm.2.102h19.8v.102H29.9zm.203.102h19.296v.097H30.102zm.199.097h18.898v.102H30.301zm.3.102H49v.097H30.602zm.2.097h18v.102h-18zm.2.102h17.5v.102H31zm.2.102h17.1v.097H31.2zm.3.097h16.602v.102H31.5zm.2.102h16.198v.097H31.7zm.198.097h15.704V82H31.898zM32.2 82h15.102v.102H32.199zm.403.102H47v.097H32.602zm.296.097H46.7v.102H32.9zm.301.102h13.102v.097H33.199zm.403.097H46v.102H33.602zm.296.102H45.7v.102H33.9zm.301.102h11.2v.097H34.2zm.403.097H45v.102H34.602zm.597.102h9.2v.097h-9.2zm.5.097h8.102V83H35.7zm0 0"/></clipPath><clipPath id="b"><path d="M21.125 73.324c-7.77-.644-14.031-3.98-18.07-10.789-4.028-6.789-3.918-13.82-.578-20.8-7.329-14.208 2.5-30.813 18.68-31.79C25.62 3.543 31.827 0 39.746.004c7.866 0 14.042 3.516 18.526 9.894 15.504.602 26.067 16.75 18.692 31.75 3.344 7.004 3.488 14.079-.567 20.91-4.039 6.813-10.324 10.114-18.015 10.77-8.91 13.266-28.207 13.328-37.258-.004zm0 0"/></clipPath><image id="c" width="398" height="208" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAY4AAADQCAIAAACflREYAAAABmJLR0QA/wD/AP+gvaeTAAAF7ElEQVR4nO3da47bRhCFUSpmHsgis8LsMflhYDwQBD2L7Lrd52zAAuaDutguSZe///l3A+jtt9EvAOCxfbuMfgnku4rovzGvgqlcRbV7p6KcqCi3bxddAd3to18AeR4ebh4AedXDqNxV8Rq9UO6ZqNxV8SypUO75qDwA8pg3Kcq9GpVrde55b+/OXRV3vBeVB0Bu+yQMUXHTJ2G4VueaIij3eVTuqvil6mNWHgD5UhWVuyq2zWdBOUBtVO6qVnfEm5SoFndEVO6q1mWSotxxUbmrWtGP0S+A+Rwd1X5xV7WYE4YpSa3mhKhMVQsxTFHutKjcVS3BmxTlTo7KVDU5b1KUGxKVZYVpDXyTEtWsBkZlBXRCJinKDY/KA+BU/Dkp1ySq3VA1h+GH3neamkOrqJq8Y/I+f0LKNYzKXVWwhj2Rrm1UbV8Y9/izUa55VO6qwjTv6SdNZYmIyqfrk0QkRZaUqNxVZfh99AtgPllR2VbvLuXQ+05UzSVG5ePKfWUdekTIjSrx7XV+uT3RVnpU3qp6Se+JhuaIyreAdjFHTz9JqomZojJVjTdTTzQxX1Su1Uf6Y/QLYD6zRmVZYYz5Dr3vRDXE3FFZAT3brIceA60QlQ/WnGqFpDjZIlG5qzrJIj1xpqWicld1uKV6+klUR1swKndVB1qwJ462bFT2qg7x5+gXwHwWj8pX6xVb9tD7TlO1RLWZqgotfuhxBFF98VZVQE+UE9UV1+of0RPlRHWTZYU36ekOUb1HVHdYAX2ZnignqofcVb3gr9EvgPmI6km+Wu9Zzr3nSepJonqeqeox5x7lRPUqK6D3OPTeo6k7RPUe/wN4m54+IaqbRPUJe1XX9EQ5UX3OVPWLT1pVEdUXUVWxV7VtDj0OIKpaq09VDr0jiIpy6y4rOPQoJ6rjrLgC6tA72nJJiep4az0A6ukcoqLcKtfqeqKcqM60xFQ196/ONiQqyk2+Aurco5yohph2qnLoDSQqyk14V+XQo5yohptqqnLoNSEqyk2yV6WnVmZISlTNxG+r64lyomoo+Kv14t9l5xXblKj6ivzTOPQoJ6rmwq7VI99Z1yMqysWsgDr0KCeqIBlTlXMvi6go1/1aXU+Jejclqkh9/2p9XxmxRJWr4wroj9EvgA+1S0pU+XodM71eDVMQ1Ry63FU59GbSoylRTWX8/wDqaT6iotzIvSo9UU5UsxozVelpbqKi3NlfracnyolqBedNVb+d9Q8xnKgod8b/5Dr0KCeq1Ry+AurcW9DRU5WoFnTgA6CeliUqyh1yra4nyolqccVTlZ7YqqcqUbEVroDqiXKi4kvBVKUnroiKch/dVemJcqLipjenquGfR6UzUVHu5b0qPVFOVDz0wra6nignKp701Ffr6YlyouIljy8xJUU5UfGqe9fqeqKcqHjP7RVQPVFOVHxi/HerMx9RUa7LL9YA3GE3GAjQ8deVAa6YqoAA7qqAAKYqIICpCgiwXyzBAO2d/evKAG+wrQ4EcK0OBLACCgQwVQEBLCsAAVyrAwEsKwABrIACAUxVQAB3VUAAUxUQwF0VEMBeFRDAtjoQwLU6EMC1OhDAtToQwFQFBHBXBQSwrAAE2DdPgEB7pioggBVQIICpCghgqgIC+HEtIIC9KiCAB0AggGt1IIAVUCCAqQoI4K4KCGCqAgKYqoAAVkCBAFZAgQC+sBgIYKoCAuybuyqgPVMVEMCyAhDACigQwAMgEMC1OhDAVAUEsAIKBDBVAQHcVQEBTFVAAHtVQADb6kAAUxUQwI9rAQFcqwMBrIACAUxVQAC/WAMEsKwABLCsAAQwVQEBTFVAACugQABTFRDAXRUQwFQFBNgv7qqA9jwAAgE8AAIBTFVAAFMVEMAKKBDAVAUE8NV6QABfWAwEsAIKBDBVAQHcVQEBTFVAAFMVEMC1OhDAAyAQwAMgEMBUBQRwVwUEMFUBAdxVAQF8CQwQwBcWAwH2i7EKaM9UBQRwVwUEMFUBAayAAgE8AAIBPAACAUxVQAB7VUCA/wGXywxEGFvWqgAAAABJRU5ErkJggg=="/></defs><g clip-path="url(#a)"><g clip-path="url(#b)"><use xlink:href="#c" transform="matrix(.2 0 0 -.4 0 83.3)"/></g></g><path d="M39.715 68.582c3.031.012 5.633-1.82 6.605-4.652.946-2.758.012-5.73-2.383-7.598-.488-.379-1.003-.742-1.414-1.2-2.378-2.632-1.156-6.57 2.29-7.425 2.867-.715 5.343 1.25 5.734 4.54.504 4.214 4.226 6.956 8.351 6.144 3.907-.766 6.352-4.774 5.235-8.586-1.137-3.875-5.36-5.871-9.293-4.395-.54.2-1.07.438-1.625.578-1.918.489-3.942-.277-5.04-1.863a4.315 4.315 0 01.016-4.988c1.145-1.621 3.082-2.344 5.04-1.84.64.168 1.25.45 1.878.664 3.196 1.105 6.649-.117 8.32-2.938 1.637-2.757 1.13-6.242-1.214-8.386-2.469-2.262-6.219-2.453-8.942-.438-1.753 1.297-2.523 3.102-2.753 5.238-.258 2.356-1.934 3.973-4.243 4.278-1.847.238-3.87-.945-4.62-2.703-.864-2.028-.231-4.188 1.656-5.668.382-.301.78-.586 1.136-.918 2.848-2.703 2.906-7.04.14-9.723-2.839-2.765-7.495-2.57-10.097.422-2.57 2.95-2.101 7.32 1.028 9.777.558.434 1.132.871 1.585 1.403a4.484 4.484 0 01.375 5.324c-1.05 1.66-3.02 2.445-4.968 1.93-2.532-.668-3.356-2.57-3.715-4.946-.617-4.062-4.473-6.578-8.45-5.62-3.867.925-6.136 4.898-4.933 8.636 1.227 3.816 5.461 5.742 9.262 4.226.617-.242 1.238-.511 1.883-.628 2.636-.493 5.027 1.199 5.46 3.812.391 2.34-1.355 4.785-3.859 4.992-1.21.102-2.523-.308-3.71-.715-3.813-1.316-7.934.649-9.087 4.426-1.144 3.77 1.137 7.684 5.02 8.602a6.91 6.91 0 008.437-5.516c.094-.523.145-1.058.258-1.574.512-2.258 2.637-3.856 4.879-3.688 2.23.164 3.977 1.86 4.168 4.118.168 2.027-.875 3.414-2.441 4.566-2.57 1.887-3.493 4.766-2.543 7.633.933 2.816 3.554 4.687 6.574 4.699zm-13.942-3.168c-7.054 1.2-12.625-.812-16.332-6.93-2.558-4.218-2.886-11.156 2.305-16.808-4.621-5.512-5.715-11.504-1.762-17.82 3.118-4.985 7.711-6.653 15.743-6.09 2.37-6.461 6.945-10.348 13.984-10.36 6.992-.011 11.562 3.801 14.016 10.348 7.48-1.16 13.52 1.043 16.851 8.152 2.672 5.692 1.258 10.977-2.875 15.692 4.711 5.574 5.719 11.586 1.664 17.93-3.105 4.863-7.953 6.609-15.676 5.917-2.328 6.512-6.96 10.371-13.968 10.368-6.957-.008-11.578-3.813-13.95-10.399" fill="#fff"/><path d="M120.39 19.523c-5.902 0-10.628 1.735-14.18 5.207-3.554 3.473-5.327 7.961-5.327 13.47 0 5.476 1.625 9.777 4.875 12.898 3.25 3.12 7.695 4.68 13.336 4.68 5.086 0 9.957-.985 13.379-2.958V35.812H116.94v6.305h7.637v6.227c-1.11.539-3.226.808-5.117.808-3.145 0-5.645-.984-7.492-2.957-1.852-1.972-2.778-4.758-2.778-8.36 0-3.554 1.032-6.394 3.094-8.519 2.063-2.128 4.73-3.191 8.008-3.191 3.91 0 7.836.781 10.543 2.348v-7.41c-2.836-1.028-6.73-1.54-10.445-1.54m29.938 9.555c-4.332 0-7.77 1.188-10.312 3.567-2.54 2.378-3.813 5.671-3.813 9.882 0 4.078 1.227 7.305 3.676 9.684 2.45 2.379 5.816 3.566 10.098 3.566 4.347 0 7.773-1.226 10.273-3.68 2.5-2.452 3.75-5.792 3.75-10.019 0-3.91-1.215-7.055-3.637-9.433-2.425-2.38-5.77-3.567-10.035-3.567m-.101 20.684c-3.98 0-5.97-2.446-5.97-7.336 0-2.336.516-4.14 1.555-5.418 1.036-1.278 2.493-1.914 4.364-1.914 3.832 0 5.746 2.379 5.746 7.133 0 5.023-1.899 7.535-5.695 7.535m44.836-20.684c-4.333 0-7.766 1.188-10.31 3.567-2.542 2.378-3.812 5.671-3.812 9.882 0 4.078 1.223 7.305 3.672 9.684 2.45 2.379 5.817 3.566 10.098 3.566 4.348 0 7.773-1.226 10.273-3.68 2.5-2.452 3.75-5.792 3.75-10.019 0-3.91-1.21-7.055-3.636-9.433-2.426-2.38-5.77-3.567-10.036-3.567m-.097 20.684c-3.985 0-5.973-2.446-5.973-7.336 0-2.336.52-4.14 1.555-5.418 1.039-1.278 2.492-1.914 4.363-1.914 3.832 0 5.746 2.379 5.746 7.133 0 5.023-1.898 7.535-5.691 7.535" fill="#020202"/><path d="M186.813 20.11h-28.489v7.046h9.95v28.012h8.538V27.156h10V20.11m65.848.917h-3.582L241.414 48.2h-.941l-7.77-27.172h-2.226l-8.403 26.989h-.933l-7.965-26.989h-3.707l10.32 33.692h3.395l7.59-26.043h.953l7.585 26.043h3.028l10.32-33.692m9.7 8.695c-6.587 0-11.184 5.406-11.184 13.152 0 7.563 4.5 12.262 11.75 12.262 3.332 0 5.66-1.133 7.203-1.88.14-.066.273-.132.402-.194l.063-2.829c-1.637 1.196-4.184 2.336-7.051 2.336-5.559 0-8.938-3.465-9.035-9.27l-.008-.503h17.555c.05-.434.101-.988.101-1.649 0-1.171-.273-11.425-9.797-11.425m-7.855 10.77l.059-.552c.445-3.937 2.917-7.914 7.437-7.914 1.91 0 3.473.602 4.637 1.79 2.047 2.081 2.152 5.265 2.136 6.19l-.011.485h-14.258m25.598-19.465h-3.489v27.754a115.5 115.5 0 01-.175 5.938h2.917l.118-2.36s2.867 3.258 8.675 3.504c.114.004.223.008.336.008 5.055 0 10.707-4.793 10.707-13.422.028-3.914-.765-7.89-2.968-10.11-1.758-1.769-4.457-3.253-7.036-3.253-6.722 0-9.085 3.996-9.085 3.996V21.027m7.511 32.118c-3.457 0-6.328-2.696-7.297-6.172-.101-.516-.214-1.121-.214-1.743v-4.476c0-.66.12-1.242.218-1.711l.059-.27c.95-3.543 2.785-6.39 7.437-6.39 5.457 0 7.836 3.707 7.836 10.222 0 6.114-3.144 10.54-8.039 10.54m17.145-33.266c-1.356 0-2.336.98-2.336 2.336 0 1.3.957 2.285 2.23 2.285.75 0 1.375-.238 1.813-.691.39-.407.598-.965.574-1.594 0-1.399-.918-2.336-2.281-2.336m1.77 10.355h-3.54V54.72h3.54V30.234m15.73-.839l-1.113.039c-4.047 0-7.172 3.472-7.172 3.472l-.172-3.492h-3.02c.117 1.79.172 4.445.172 6.996v18.31h3.54V39.602c0-.872.12-1.684.327-2.258.758-2.477 3.078-4.98 6.547-4.98 4.035 0 6.254 2.788 6.254 7.855v14.5h3.543V39.703c0-9.617-7.52-10.308-8.906-10.308m21.812.019c-2.89 0-6.222.809-8.148 2.844l-.031 3.926c1.867-1.93 5.293-3.926 7.566-3.926 3.969 0 6.102 1.851 6.102 5.969v1.367l-.72-.004c-9.194 0-14.843 3.156-14.843 8.941 0 3.164 2.36 7.43 6.906 7.43.168 0 .336-.004.508-.016 4.246-.289 6.168-1.133 7.293-2.718.336-.477 1.266-1.532 1.266-1.532l.312 3.024h3.09c-.266-1.867-.324-4.184-.324-5.871v-9.516c0-6.582-3.02-9.918-8.977-9.918m-1.18 23.184c-2.898 0-5.64-1.004-5.64-3.985 0-2.843 2.723-5.93 11.246-5.93h1.164v3.692c0 .492-.101 1.07-.281 1.629-.711 2.117-2.832 4.594-6.488 4.594m24.054-23.246c-4.168 0-5.468 3.03-5.468 3.03h-1.04l-.156-2.402h-2.957c.121 2.024.176 4.297.176 7.278v17.46h3.488v-13.6c0-.806.078-2.497.196-3.134.453-2.472 2.433-5.906 5.746-5.906.203 0 .41.016.625.047 1.007.145 1.863.645 2.445 1v-3.094c-.113-.039-.242-.086-.379-.133-.469-.168-1.348-.484-1.605-.484a9.433 9.433 0 00-1.07-.062" fill="#020202"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="-3 -2 85 85"><defs><clipPath id="a"><path d="M36.602.102h6.296v.097h-6.296zm-.5.097h7.296v.102h-7.296zM35.5.301H44v.097h-8.5zm-.602.097H44.5V.5h-9.602zm-.5.102h10.704v.102H34.398zm-.5.102H45.5v.097H33.898zm-.296.097h12.296v.102H33.602zM33.3.801h12.898v.097H33.301zm-.3.097h13.5V1H33zM32.7 1h14.1v.102H32.7zm-.4.102h14.802v.097H32.3zm-.3.097h15.398v.102H32zm-.3.102h16.1v.097H31.7zm-.302.097H48V1.5H31.398zM31.2 1.5h17.102v.102H31.199zm-.2.102h17.5v.097H31zm-.2.097h17.9v.102H30.8zm-.198.102h18.296v.097H30.602zm-.301.097h18.8V2h-18.8zM30.1 2h19.2v.102H30.1zm-.203.102h19.704v.097H29.898zm-.199.097H49.8v.102H29.699zm-.199.102H50v.097H29.5zm-.2.097h20.9V2.5H29.3zm-.198.102h21.296v.102H29.102zm-.204.102h21.704v.097H28.898zm-.199.097h22v.102h-22zm-.097.102h22.296v.097H28.602zm-.204.097H51V3H28.398zM28.301 3h22.898v.102H28.301zm-.2.102h23.2v.097H28.1zm-.203.097H51.5v.102H27.898zm-.097.102h23.898v.097H27.801zm-.2.097h24.2V3.5H27.6zM27.5 3.5H52v.102H27.5zm-.2.102h24.802v.097H27.3zm-.1.097h25.1v.102H27.2zm-.2.102h25.5v.097H27zm-.2.097h25.802V4H26.8zM26.7 4h26v.102h-26zm-.098.102h26.296v.097H26.602zm-.102.097H53v.102H26.5zm-.102.102h26.704v.097H26.398zm-.199.097h27V4.5h-27zm-.097.102H53.3v.102H26.1zM26 4.602h27.5v.097H26zm-.102.097h27.704v.102H25.898zm-.199.102h28v.097h-28zm-.097.097H53.8V5H25.6zM25.5 5H54v.102H25.5zm-.102.102h28.704v.097H25.398zm-.097.097h28.898v.102H25.301zm-.2.102h29.2v.097H25.1zM25 5.398h29.398V5.5H25zm-.102.102h29.704v.102H24.898zm-.097.102h29.898v.097H24.801zm-.102.097h30.102v.102H24.699zm-.097.102h30.296v.097H24.602zm-.102.097H55V6H24.5zM24.398 6h30.704v.102H24.398zm-.097.102h30.898v.097H24.301zm-.102.097h31.102v.102H24.199zm-.097.102h31.296v.097H24.102zM24 6.398h31.5V6.5H24zm-.102.102h31.704v.102H23.898zm-.097.102h31.898v.097H23.801zm-.102.097h32v.102h-32zm-.097.102H55.8v.097H23.6zm-.102.097h32.398V7H23.5zM23.398 7H56v.102H23.398zm-.097.102h32.8v.097h-32.8zm-.102.097h33v.102h-33zm-.097.102H56.3v.097H23.1zM23 7.398h33.398V7.5H23zm-.102.102H56.5v.102H22.898zm-.097.102h33.8v.097h-33.8zm0 .097h33.898v.102H22.801zm-.102.102h34.102v.097H22.699zm-.097.097h34.296V8H22.602zM22.5 8h34.398v.102H22.5zm-.102.102H57v.097H22.398zm0 .097h34.704v.102H22.398zm-.097.102h34.898v.097H22.301zm-.102.097h35.102V8.5H22.199zm-.097.102H57.3v.102H22.1zM22 8.602h35.398v.097H22zm0 .097h35.5v.102H22zm-.102.102h35.704v.097H21.898zm-.097.097h35.898V9H21.801zM21.699 9h36v.102h-36zm-.097.102H57.8v.097H21.6zm0 .097h36.296v.102H21.602zm-.102.102H58v.097H21.5zm-.102.097H58V9.5H21.398zm-.097.102h36.8v.102h-36.8zm0 .102h36.898v.097H21.301zm-.102.097h37.102v.102H21.199zm-.097.102h37.296v.097H21.102zm-.801.097h39.3V10h-39.3zm-.7.102h40.797v.102H19.602zm-.703.102H61.2v.097H18.9zm-.699.097h43.403v.102H18.199zm-.398.102h44.3v.097h-44.3zm-.403.097H62.5v.102H17.398zM17 10.5h45.898v.102H17zm-.398.102h46.796v.097H16.602zm-.403.097h47.602v.102H16.199zm-.398.102h48.3v.097h-48.3zm-.403.097h49V11h-49zm-.296.102h49.5v.102h-49.5zm-.204.102h50v.097h-50zm-.296.097h50.597v.102H14.602zm-.204.102h51v.097h-51zm-.296.097h51.597v.102H14.102zm-.301.102H66v.102H13.8zm-.2.102h52.7v.097H13.6zm-.3.097H66.5v.102H13.3zm-.2.102H66.7v.097H13.102zm-.3.097h54.097V12H12.801zm-.2.102h54.5v.102h-54.5zm-.203.102h54.903v.097H12.398zm-.199.097H67.5v.102H12.2zm-.199.102h55.7v.097H12zm-.102.097h56v.102h-56zm-.199.102H68v.102H11.7zm-.199.102h56.7v.097H11.5zm-.2.097h57.098v.102H11.301zm-.198.102h57.5v.097h-57.5zm-.204.097h57.903V13H10.898zm-.097.102H69v.102H10.8zm-.2.102h58.5v.097h-58.5zm-.203.097h58.903v.102H10.398zm-.199.102h59.2v.097h-59.2zm-.097.097H69.5v.102H10.102zm-.204.102H69.7v.102H9.9zm-.097.102h60v.097h-60zm-.102.097H70v.102H9.7zm-.199.102h60.602v.097H9.5zm-.102.097h60.903V14H9.398zM9.2 14h61.2v.102H9.2zm-.097.102h61.5v.097h-61.5zM9 14.199h61.7v.102H9zm-.2.102h62.098v.097H8.801zm-.1.097H71v.102H8.7zm-.2.102h62.602v.102H8.5zm-.102.102H71.2v.097H8.4zm-.097.097h63v.102h-63zm-.2.102H71.5v.097H8.102zM8 14.898h63.602V15H8zM7.898 15H71.7v.102H7.9zm-.097.102h64v.097h-64zm-.102.097h64.2v.102h-64.2zm-.097.102H72v.097H7.602zm-.102.097h64.602v.102H7.5zm-.2.102h65v.102h-65zm-.1.102h65.198v.097H7.2zm-.098.097H72.5v.102H7.102zM7 15.801h65.602v.097H7zm-.102.097H72.7V16H6.9zM6.801 16h66v.102h-66zm-.102.102h66.2v.097h-66.2zm-.097.097H73v.102H6.602zm-.102.102h66.602v.097H6.5zm-.102.097H73.2v.102H6.4zM6.2 16.5h67.102v.102H6.199zm-.097.102h67.296v.097H6.102zm0 .097H73.5v.102H6.102zM6 16.801h67.602v.097H6zm-.102.097H73.7V17H5.9zM5.801 17h67.898v.102H5.801zm-.102.102h68.102v.097H5.699zm-.097.097h68.296v.102H5.602zm-.102.102H74v.097H5.5zm0 .097h68.602v.102H5.5zm-.102.102H74.2v.102H5.4zm-.097.102h69v.097h-69zm-.102.097h69.2v.102h-69.2zm-.097.102H74.5v.097H5.102zM5 17.898h69.602V18H5zM4.898 18h69.704v.102H4.898zm-.097.102h69.898v.097H4.801zm0 .097h70v.102h-70zm-.102.102h70.2v.097h-70.2zm-.097.097h70.296v.102H4.602zM4.5 18.5H75v.102H4.5zm-.102.102h70.704v.097H4.398zm0 .097H75.2v.102H4.4zm-.097.102h70.898v.097H4.301zm-.102.097h71.102V19H4.199zM4.102 19h71.296v.2H4.102zM4 19.2h71.5v.1H4zm-.102.1h71.704v.2H3.898zm-.097.2h71.898v.102H3.801zm-.102.102h72.102v.199H3.699zm-.097.199h72.296v.097H3.602zm-.102.097H76V20H3.5zm0 .102h72.602v.102H3.5zm-.102.102h72.704v.097H3.398zm-.097.097h72.898v.102H3.301zm0 .102h73v.097h-73zm-.102.097h73.102v.102H3.199zm-.097.102h73.296v.2H3.102zM3 20.7h73.5v.1H3zm-.102.1H76.5v.098H2.898zm0 .098h73.704V21H2.898zM2.801 21h73.8v.102h-73.8zm0 .102h73.898v.097H2.801zm-.102.097h74v.102h-74zm0 .102h74.102v.097H2.699zm-.097.097H76.8v.102H2.6zm0 .102h74.296v.102H2.602zm-.102.102H77v.199H2.5zm-.102.199h74.704V22H2.398zM2.301 22h74.898v.2H2.301zm-.102.2h75.102v.198H2.199zm-.097.198h75.296v.204H2.102zM2 22.602h75.5v.199H2zm-.102.199h75.704V23H1.898zM1.801 23h75.8v.102h-75.8zm0 .102h75.898v.097H1.801zm-.102.097h76v.102h-76zm0 .102h76.102v.199H1.699zm-.097.199H77.8v.102H1.6zm0 .102h76.296v.097H1.602zm-.102.097h76.398v.2H1.5zm0 .2H78V24H1.5zM1.398 24H78v.102H1.398zm0 .102h76.704v.199H1.398zm-.097.199h76.8v.097h-76.8zm0 .097h76.898v.102H1.301zm-.102.102h77v.2h-77zm0 .2h77.102v.1H1.199zm-.097.1H78.3v.098H1.1zm0 .098h77.296v.204H1.102zM1 25.102h77.398v.097H1zm0 .097h77.5v.2H1zm-.102.2H78.5v.203H.898zm-.097.203h77.8V26H.802zM.8 26h77.898v.102H.801zm-.102.102h78v.296H.7zm0 .296H78.8v.102H.699zm-.097.102H78.8v.3H.6zm0 .3h78.296v.098H.602zm-.102.098h78.398v.301H.5zm0 .301H79v.2H.5zm-.102.2H79v.203H.398zm0 .203h78.704v.199H.398zm-.097.199h78.8v.398H.302zm-.102.398h78.903v.2H.199zm0 .2h79v.8H.2zm-.097.8H79.3v.903H.1zm0 .903h79.296v.097H.102zM0 30.199h79.398v3.102H0zm0 3.102h79.3v.398H0zm.102.398H79.3V34H.1zm0 .301h79.097v.398H.102zm.097.398h79v.301H.2zm0 .301h78.903V35H.199zM.301 35h78.8v.398H.302zm0 .398H79v.301H.3zm.097.301H79v.403H.398zm0 .403h78.5v.199H.398zM.5 36.3h78.398v.199H.5zm0 .199h78.3v.2H.5zm.102.2H78.8v.1H.6zm0 .1h78.097v.2H.602zm.097.2h78v.2H.7zm0 .2h77.903v.198H.699zm.102.198h77.8v.204H.802zm0 .204H78.5v.097H.8zm.097.097H78.5v.2H.898zm0 .2h77.5v.203H.898zm.102.203h77.398v.199H1zm0 .199h77.3v.097H1zm.102.097H78.3v.301H1.1zm.097.301h77V39h-77zm0 .301h76.903v.102H1.199zm.102.102h76.8v.097h-76.8zm0 .097H78v.102H1.3zm.097.102H78v.199H1.398zm0 .199h76.5v.102h-76.5zm.102.102h76.398v.097H1.5zm0 .097h76.3v.102H1.5zm.102.102H77.8v.2H1.6zm0 .199h76.097v.102H1.602zm.097.102h76v.097h-76zm0 .097h75.903v.102H1.699zm.102.102h75.8v.199h-75.8zm.097.199H77.5v.3H1.898zm.102.3h75.398v.2H2zm.102.2H77.3v.2H2.1zm.097.2h75v.198h-75zm.102.198h74.8v.204h-74.8zm.097.204H77v.097H2.398zm0 .097h74.704v.102H2.398zm-.097.102h74.8v.097h-74.8zm0 .097h74.898v.204H2.301zm-.102.204h75.102v.199H2.199zm-.097.199h75.296v.199H2.102zM2 42.5h75.398v.102H2zm0 .102h75.5v.199H2zm-.102.199h75.704V43H1.898zM1.801 43h75.8v.102h-75.8zm0 .102h75.898v.199H1.801zm-.102.199h76.102v.199H1.699zm-.097.199H77.8v.102H1.6zm0 .102h76.296v.097H1.602zm-.102.097h76.398v.102H1.5zm0 .102H78V44H1.5zM1.398 44H78v.102H1.398zm0 .102h76.704v.097H1.398zm-.097.097h76.8v.102h-76.8zm0 .102h76.898v.3H1.301zm-.102.3h77v.098h-77zm0 .098h77.102v.2H1.199zm-.097.2H78.3V45H1.1zm0 .101h77.296v.2H1.102zM1 45.2h77.398v.1H1zm0 .1h77.5v.302H1zm-.102.302H78.5v.097H.898zm0 .097h77.704v.2H.898zm-.097.2h77.8V46H.802zM.8 46h77.898v.2H.801zm-.102.2h78v.1H.7zm0 .1H78.8v.302H.699zm-.097.302H78.8v.097H.6zm0 .097h78.296v.2H.602zm-.102.2h78.398v.203H.5zm0 .203H79v.296H.5zm-.102.296H79v.301H.398zm0 .301h78.704V48H.398zM.301 48h78.8v.2H.302zm0 .2h78.898v.402H.301zm-.102.402h79v.199H.2zm0 .199h79.102v.3H.199zm-.097.3H79.3v.297H.1zm0 .297h79.296v.801H.102zM0 50.2h79.398v.8H0zm0 .8h79.5v1.898H0zm0 1.898h79.398v.5H0zm.102.5h79.296v.704H.102zm0 .704H79.3v.5H.1zm.097.5h79.102V55H.199zM.2 55h79v.2H.2zm.102.2H79.2v.3H.301zm0 .3h78.8v.2H.302zm.097.2h78.704v.198H.398zm0 .198H79v.204H.398zm.102.204H79v.296H.5zm0 .296h78.398v.204H.5zm.102.204h78.296v.199H.602zm0 .199H78.8V57H.6zM.699 57h78.102v.3H.699zm0 .3h78v.2H.7zm.102.2h77.898v.102H.801zm0 .102h77.8v.097H.802zm.097.097h77.704v.2H.898zm0 .2H78.5V58H.898zM1 58h77.5v.2H1zm0 .2h77.398v.1H1zm.102.1h77.296v.2H1.102zm0 .2H78.3v.102H1.1zm.097.102h77.102v.097H1.199zm0 .097h77v.102h-77zm.102.102h76.898V59H1.301zm0 .199h76.8v.102h-76.8zm.097.102h76.704v.199H1.398zm0 .199H78v.097H1.398zm.102.097H78v.204H1.5zm0 .204h76.398v.097H1.5zm.102.097h76.296v.102H1.602zm0 .102H77.8v.097H1.6zm.097.097h76.102v.204H1.699zm0 .204h76v.097h-76zm.102.097h75.898v.102H1.801zm0 .102h75.8v.097h-75.8zm.097.097h75.704v.102H1.898zm0 .102H77.5v.102H1.898zm.102.102h75.5v.097H2zm0 .097h75.398v.102H2zm.102.102h75.296v.097H2.102zm0 .097H77.3V61H2.1zm.097.102h75.102v.102H2.199zm0 .102h75v.097h-75zm.102.097h74.898v.102H2.301zm0 .102h74.8v.097h-74.8zm.097.097h74.704v.102H2.398zm0 .102H77v.102H2.398zm.102.102H77v.097H2.5zm0 .097h74.398v.102H2.5zm.102.102h74.296v.097H2.602zm0 .097H76.8V62H2.6zm.097.102h74.102v.102H2.699zm0 .102h74v.097h-74zm.102.097h73.898v.102H2.801zm.097.102h73.704v.097H2.898zm0 .097H76.5v.102H2.898zM3 62.5h73.5v.102H3zm0 .102h73.398v.097H3zm.102.097h73.296v.102H3.102zm.097.102h73.102v.097H3.199zm0 .097h73V63h-73zm.102.102h72.898v.102H3.301zm0 .102h72.8v.097h-72.8zm.097.097h72.704v.102H3.398zm.102.102H76v.097H3.5zm0 .097h72.398v.102H3.5zm.102.102h72.296v.102H3.602zm.097.102h72.102v.097H3.699zm.102.097h71.898v.102H3.801zm0 .102h71.8v.097h-71.8zm.097.097h71.704V64H3.898zM4 64h71.5v.102H4zm0 .102h71.398v.097H4zm.102.097h71.296v.102H4.102zm.097.102h71.102v.097H4.199zm.102.097h70.898v.102H4.301zm0 .102h70.8v.102h-70.8zm.097.102h70.704v.097H4.398zm.102.097H75v.102H4.5zm0 .102h70.398v.097H4.5zm.102.097h70.296V65H4.602zm.097.102h70.102v.102H4.699zm.102.102h69.898v.097H4.801zm.097.097h69.704v.102H4.898zm0 .102H74.5v.097H4.898zm.102.097h69.398v.102H5zm.102.102H74.3v.102H5.1zm.097.102h69.102v.097H5.199zm.102.097h68.898v.102H5.301zm.097.102h68.704v.097H5.398zm.102.097H74V66H5.5zm.102.102h68.296v.102H5.602zm.097.102h68.102v.097H5.699zm0 .097h68v.102h-68zm.102.102h67.8v.097h-67.8zm.097.097h67.704v.102H5.898zM6 66.5h67.5v.102H6zm.102.102h67.296v.097H6.102zm.097.097h67.102v.102H6.199zm.102.102h66.898v.097H6.301zm.097.097h66.704V67H6.398zm0 .102H73v.102H6.398zm.204.102h66.296v.097H6.602zm.097.097h66.102v.102H6.699zm.102.102h65.898v.097H6.801zm.097.097h65.704v.102H6.898zM7 67.5h65.5v.102H7zm.102.102h65.296v.097H7.102zm.097.097h65v.102h-65zm.102.102h64.8v.097h-64.8zm.199.097H72V68H7.5zm.102.102h64.296v.102H7.602zm.097.102h64.102v.097H7.699zm.102.097h63.898v.102H7.801zm.097.102h63.704v.097H7.898zm.102.097h63.398v.102H8zm.102.102H71.3v.102H8.1zm.199.102h62.898v.097H8.301zm.097.097h62.704v.102H8.398zm.102.102H71v.097H8.5zm.102.097H70.8V69H8.6zM8.8 69h61.898v.102H8.801zm.097.102H70.5v.097H8.898zm.204.097h61.296v.102H9.102zm.097.102h61v.097h-61zm.2.097h60.703v.102H9.398zm.101.102h60.398v.102H9.5zm.2.102h60.1v.097H9.7zm.1.097h59.802v.102H9.8zm.2.102h59.5v.097H10zm.102.097H69.3V70H10.1zM10.3 70h58.898v.102H10.301zm.097.102H69v.097H10.398zm.204.097h58.296v.102H10.602zm.199.102h57.898v.097H10.801zm.199.097h57.5v.102H11zm.2.102h57.1v.102H11.2zm.198.102h56.704v.097H11.398zm.204.097h56.296v.102H11.602zm.199.102h55.898v.097H11.801zm.199.097h55.5V71H12zm.2.102h55.1v.102H12.2zm.198.102h54.704v.097H12.398zm.204.097h54.296v.102H12.602zm.199.102h53.898v.097H12.801zm.199.097h53.5v.102H13zm.2.102h53v.102h-53zm.3.102H66v.097H13.5zm.3.097h51.9v.102H13.8zm.302.102h51.296v.097H14.102zm.296.097h50.704V72H14.398zm.204.102H64.8v.102H14.6zm.296.102h49.704v.097H14.898zm.301.097H64.3v.102H15.199zm.301.102H64v.097H15.5zm.398.097h47.704v.102H15.898zm.403.102h46.898v.102H16.301zm.398.102H62.8v.097H16.699zm.5.097H62.3v.102H17.199zm.403.102h44.296v.097H17.602zm.398.097h43.5V73H18zm.5.102H61v.102H18.5zm.7.102h41.1v.097H19.2zm.698.097h39.704v.102H19.898zm.903.102h38v.097h-38zm.3.097h37.297v.102H21.102zm.098.102H58.3v.102H21.199zm.102.102h37v.097h-37zm0 .097h36.898v.102H21.301zm.097.102h36.704v.097H21.398zm.102.097H58v.204H21.5zm.102.204h36.296v.097H21.602zm.097.097H57.8v.102H21.699zm.102.102h35.898v.097H21.801zm.097.097H57.7v.102H21.9zm0 .102h35.704v.102H21.898zm.102.102h35.5v.097H22zm.102.097h35.296v.102H22.102zm.097.102H57.3v.097H22.199zm.102.097h35V75h-35zm.097.102H57.2v.102H22.4zm0 .102h34.704v.097H22.398zm.102.097H57v.102H22.5zm.102.102h34.296v.097H22.602zm.097.097h34.2v.102h-34.2zm.102.102h34v.102h-34zm0 .102h33.898v.097H22.801zm.097.097h33.704v.102H22.898zm.102.102h33.5v.097H23zm.102.097h33.296V76H23.102zm.097.102H56.3v.102H23.199zm.102.102h32.898v.097H23.301zm.097.097h32.704v.102H23.398zm.102.102H56v.097H23.5zm.102.097h32.296v.102H23.602zm.097.102H55.8v.102H23.699zm.102.102h31.898v.097H23.801zm.097.097h31.704v.102H23.898zm.102.102h31.5v.097H24zm.102.097h31.296V77H24.102zm.097.102H55.3v.102H24.199zm.102.102h30.898v.097H24.301zm.097.097h30.704v.102H24.398zm.102.102H55v.097H24.5zm.102.097h30.296v.102H24.602zm.097.102H54.8v.102H24.699zm.102.102h29.898v.097H24.801zm.097.097h29.704v.102H24.898zm.102.102h29.5v.097H25zm.2.097h29.198V78H25.2zm.1.102h28.9v.102H25.3zm.098.102h28.704v.097H25.398zm.204.097H54v.102H25.602zm.097.102h28.2v.097h-28.2zm.102.097h27.898v.102H25.801zm.097.102h27.704v.102H25.898zm.204.102H53.5v.097H26.102zm.097.097H53.3v.102H26.199zm.102.102h26.898v.097H26.301zm.199.097h26.602V79H26.5zm.102.102H53v.102H26.602zm.097.102H52.8v.097H26.699zm.102.097h25.898v.102H26.801zm.199.102h25.602v.097H27zm.102.097H52.5v.102H27.102zm.199.102h25v.102h-25zm.097.102h24.704v.097H27.398zm.204.097H52v.102H27.602zm.199.102h24v.097h-24zm.097.097h23.704V80H27.898zm.204.102H51.5v.102H28.102zm.199.102h23v.097h-23zm.097.097h22.704v.102H28.398zm.204.102H51v.097H28.602zm.199.097h22v.102h-22zm.097.102h21.704v.102H28.898zm.204.102H50.5v.097H29.102zm.199.097h21v.102h-21zm.097.102h20.704v.097H29.398zm.301.097h20.2V81h-20.2zm.2.102h19.8v.102H29.9zm.203.102h19.296v.097H30.102zm.199.097h18.898v.102H30.301zm.3.102H49v.097H30.602zm.2.097h18v.102h-18zm.2.102h17.5v.102H31zm.2.102h17.1v.097H31.2zm.3.097h16.602v.102H31.5zm.2.102h16.198v.097H31.7zm.198.097h15.704V82H31.898zM32.2 82h15.102v.102H32.199zm.403.102H47v.097H32.602zm.296.097H46.7v.102H32.9zm.301.102h13.102v.097H33.199zm.403.097H46v.102H33.602zm.296.102H45.7v.102H33.9zm.301.102h11.2v.097H34.2zm.403.097H45v.102H34.602zm.597.102h9.2v.097h-9.2zm.5.097h8.102V83H35.7zm0 0"/></clipPath><clipPath id="b"><path d="M21.125 73.324c-7.77-.644-14.031-3.98-18.07-10.789-4.028-6.789-3.918-13.82-.578-20.8-7.329-14.208 2.5-30.813 18.68-31.79C25.62 3.543 31.827 0 39.746.004c7.866 0 14.042 3.516 18.526 9.894 15.504.602 26.067 16.75 18.692 31.75 3.344 7.004 3.488 14.079-.567 20.91-4.039 6.813-10.324 10.114-18.015 10.77-8.91 13.266-28.207 13.328-37.258-.004zm0 0"/></clipPath><image xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAY4AAADQCAIAAACflREYAAAABmJLR0QA/wD/AP+gvaeTAAAF7ElEQVR4nO3da47bRhCFUSpmHsgis8LsMflhYDwQBD2L7Lrd52zAAuaDutguSZe///l3A+jtt9EvAOCxfbuMfgnku4rovzGvgqlcRbV7p6KcqCi3bxddAd3to18AeR4ebh4AedXDqNxV8Rq9UO6ZqNxV8SypUO75qDwA8pg3Kcq9GpVrde55b+/OXRV3vBeVB0Bu+yQMUXHTJ2G4VueaIij3eVTuqvil6mNWHgD5UhWVuyq2zWdBOUBtVO6qVnfEm5SoFndEVO6q1mWSotxxUbmrWtGP0S+A+Rwd1X5xV7WYE4YpSa3mhKhMVQsxTFHutKjcVS3BmxTlTo7KVDU5b1KUGxKVZYVpDXyTEtWsBkZlBXRCJinKDY/KA+BU/Dkp1ySq3VA1h+GH3neamkOrqJq8Y/I+f0LKNYzKXVWwhj2Rrm1UbV8Y9/izUa55VO6qwjTv6SdNZYmIyqfrk0QkRZaUqNxVZfh99AtgPllR2VbvLuXQ+05UzSVG5ePKfWUdekTIjSrx7XV+uT3RVnpU3qp6Se+JhuaIyreAdjFHTz9JqomZojJVjTdTTzQxX1Su1Uf6Y/QLYD6zRmVZYYz5Dr3vRDXE3FFZAT3brIceA60QlQ/WnGqFpDjZIlG5qzrJIj1xpqWicld1uKV6+klUR1swKndVB1qwJ462bFT2qg7x5+gXwHwWj8pX6xVb9tD7TlO1RLWZqgotfuhxBFF98VZVQE+UE9UV1+of0RPlRHWTZYU36ekOUb1HVHdYAX2ZnignqofcVb3gr9EvgPmI6km+Wu9Zzr3nSepJonqeqeox5x7lRPUqK6D3OPTeo6k7RPUe/wN4m54+IaqbRPUJe1XX9EQ5UX3OVPWLT1pVEdUXUVWxV7VtDj0OIKpaq09VDr0jiIpy6y4rOPQoJ6rjrLgC6tA72nJJiep4az0A6ukcoqLcKtfqeqKcqM60xFQ196/ONiQqyk2+Aurco5yohph2qnLoDSQqyk14V+XQo5yohptqqnLoNSEqyk2yV6WnVmZISlTNxG+r64lyomoo+Kv14t9l5xXblKj6ivzTOPQoJ6rmwq7VI99Z1yMqysWsgDr0KCeqIBlTlXMvi6go1/1aXU+Jejclqkh9/2p9XxmxRJWr4wroj9EvgA+1S0pU+XodM71eDVMQ1Ry63FU59GbSoylRTWX8/wDqaT6iotzIvSo9UU5UsxozVelpbqKi3NlfracnyolqBedNVb+d9Q8xnKgod8b/5Dr0KCeq1Ry+AurcW9DRU5WoFnTgA6CeliUqyh1yra4nyolqccVTlZ7YqqcqUbEVroDqiXKi4kvBVKUnroiKch/dVemJcqLipjenquGfR6UzUVHu5b0qPVFOVDz0wra6nignKp701Ffr6YlyouIljy8xJUU5UfGqe9fqeqKcqHjP7RVQPVFOVHxi/HerMx9RUa7LL9YA3GE3GAjQ8deVAa6YqoAA7qqAAKYqIICpCgiwXyzBAO2d/evKAG+wrQ4EcK0OBLACCgQwVQEBLCsAAVyrAwEsKwABrIACAUxVQAB3VUAAUxUQwF0VEMBeFRDAtjoQwLU6EMC1OhDAtToQwFQFBHBXBQSwrAAE2DdPgEB7pioggBVQIICpCghgqgIC+HEtIIC9KiCAB0AggGt1IIAVUCCAqQoI4K4KCGCqAgKYqoAAVkCBAFZAgQC+sBgIYKoCAuybuyqgPVMVEMCyAhDACigQwAMgEMC1OhDAVAUEsAIKBDBVAQHcVQEBTFVAAHtVQADb6kAAUxUQwI9rAQFcqwMBrIACAUxVQAC/WAMEsKwABLCsAAQwVQEBTFVAACugQABTFRDAXRUQwFQFBNgv7qqA9jwAAgE8AAIBTFVAAFMVEMAKKBDAVAUE8NV6QABfWAwEsAIKBDBVAQHcVQEBTFVAAFMVEMC1OhDAAyAQwAMgEMBUBQRwVwUEMFUBAdxVAQF8CQwQwBcWAwH2i7EKaM9UBQRwVwUEMFUBAayAAgE8AAIBPAACAUxVQAB7VUCA/wGXywxEGFvWqgAAAABJRU5ErkJggg==" id="c" width="398" height="208"/></defs><g clip-path="url(#a)"><g clip-path="url(#b)"><use xlink:href="#c" transform="matrix(.2 0 0 -.4 0 83.3)"/></g></g><path fill="#fff" d="M39.715 68.582c3.031.012 5.633-1.82 6.605-4.652.946-2.758.012-5.73-2.383-7.598-.488-.379-1.003-.742-1.414-1.2-2.378-2.632-1.156-6.57 2.29-7.425 2.867-.715 5.343 1.25 5.734 4.54.504 4.214 4.226 6.956 8.351 6.144 3.907-.766 6.352-4.774 5.235-8.586-1.137-3.875-5.36-5.871-9.293-4.395-.54.2-1.07.438-1.625.578-1.918.489-3.942-.277-5.04-1.863a4.315 4.315 0 0 1 .016-4.988c1.145-1.621 3.082-2.344 5.04-1.84.64.168 1.25.45 1.878.664 3.196 1.105 6.649-.117 8.32-2.938 1.637-2.757 1.13-6.242-1.214-8.386-2.469-2.262-6.219-2.453-8.942-.438-1.753 1.297-2.523 3.102-2.753 5.238-.258 2.356-1.934 3.973-4.243 4.278-1.847.238-3.87-.945-4.62-2.703-.864-2.028-.231-4.188 1.656-5.668.382-.301.78-.586 1.136-.918 2.848-2.703 2.906-7.04.14-9.723-2.839-2.765-7.495-2.57-10.097.422-2.57 2.95-2.101 7.32 1.028 9.777.558.434 1.132.871 1.585 1.403a4.48 4.48 0 0 1 .375 5.324c-1.05 1.66-3.02 2.445-4.968 1.93-2.532-.668-3.356-2.57-3.715-4.946-.617-4.062-4.473-6.578-8.45-5.62-3.867.925-6.136 4.898-4.933 8.636 1.227 3.816 5.461 5.742 9.262 4.226.617-.242 1.238-.511 1.883-.628 2.636-.493 5.027 1.199 5.46 3.812.391 2.34-1.355 4.785-3.859 4.992-1.21.102-2.523-.308-3.71-.715-3.813-1.316-7.934.649-9.087 4.426-1.144 3.77 1.137 7.684 5.02 8.602a6.91 6.91 0 0 0 8.437-5.516c.094-.523.145-1.058.258-1.574.512-2.258 2.637-3.856 4.879-3.688 2.23.164 3.977 1.86 4.168 4.118.168 2.027-.875 3.414-2.441 4.566-2.57 1.887-3.493 4.766-2.543 7.633.933 2.816 3.554 4.687 6.574 4.699m-13.942-3.168c-7.054 1.2-12.625-.812-16.332-6.93-2.558-4.218-2.886-11.156 2.305-16.808-4.621-5.512-5.715-11.504-1.762-17.82 3.118-4.985 7.711-6.653 15.743-6.09 2.37-6.461 6.945-10.348 13.984-10.36 6.992-.011 11.562 3.801 14.016 10.348 7.48-1.16 13.52 1.043 16.851 8.152 2.672 5.692 1.258 10.977-2.875 15.692 4.711 5.574 5.719 11.586 1.664 17.93-3.105 4.863-7.953 6.609-15.676 5.917-2.328 6.512-6.96 10.371-13.968 10.368-6.957-.008-11.578-3.813-13.95-10.399"/><path fill="#020202" d="M120.39 19.523q-8.853 0-14.18 5.207-5.329 5.208-5.327 13.47 0 8.215 4.875 12.898 4.875 4.68 13.336 4.68c5.086 0 9.957-.985 13.379-2.958V35.812H116.94v6.305h7.637v6.227c-1.11.539-3.226.808-5.117.808-3.145 0-5.645-.984-7.492-2.957q-2.778-2.957-2.778-8.36 0-5.331 3.094-8.519 3.093-3.191 8.008-3.191c3.91 0 7.836.781 10.543 2.348v-7.41c-2.836-1.028-6.73-1.54-10.445-1.54m29.938 9.555q-6.499 0-10.312 3.567-3.811 3.566-3.813 9.882.001 6.116 3.676 9.684t10.098 3.566q6.522 0 10.273-3.68Q164 48.419 164 42.078q-.002-5.866-3.637-9.433-3.638-3.568-10.035-3.567m-.101 20.684q-5.97 0-5.97-7.336-.002-3.502 1.555-5.418 1.556-1.915 4.364-1.914 5.747.001 5.746 7.133 0 7.535-5.695 7.535m44.836-20.684c-4.333 0-7.766 1.188-10.31 3.567q-3.813 3.566-3.812 9.882 0 6.116 3.672 9.684 3.676 3.567 10.098 3.566 6.523 0 10.273-3.68 3.75-3.678 3.75-10.019.002-5.866-3.636-9.433t-10.036-3.567m-.097 20.684c-3.985 0-5.973-2.446-5.973-7.336q.001-3.502 1.555-5.418 1.557-1.915 4.363-1.914 5.747.001 5.746 7.133 0 7.535-5.691 7.535"/><path fill="#020202" d="M186.813 20.11h-28.489v7.046h9.95v28.012h8.538V27.156h10V20.11m65.848.917h-3.582L241.414 48.2h-.941l-7.77-27.172h-2.226l-8.403 26.989h-.933l-7.965-26.989h-3.707l10.32 33.692h3.395l7.59-26.043h.953l7.585 26.043h3.028zm9.7 8.695c-6.587 0-11.184 5.406-11.184 13.152 0 7.563 4.5 12.262 11.75 12.262 3.332 0 5.66-1.133 7.203-1.88q.21-.1.402-.194l.063-2.829c-1.637 1.196-4.184 2.336-7.051 2.336-5.559 0-8.938-3.465-9.035-9.27l-.008-.503h17.555c.05-.434.101-.988.101-1.649 0-1.171-.273-11.425-9.797-11.425m-7.855 10.77.059-.552c.445-3.937 2.917-7.914 7.437-7.914 1.91 0 3.473.602 4.637 1.79 2.047 2.081 2.152 5.265 2.136 6.19l-.011.485h-14.258m25.598-19.465h-3.489V48.78a116 116 0 0 1-.175 5.938h2.917l.118-2.36s2.867 3.258 8.675 3.504c.114.004.223.008.336.008 5.055 0 10.707-4.793 10.707-13.422.028-3.914-.765-7.89-2.968-10.11-1.758-1.769-4.457-3.253-7.036-3.253-6.722 0-9.085 3.996-9.085 3.996zm7.511 32.118c-3.457 0-6.328-2.696-7.297-6.172-.101-.516-.214-1.121-.214-1.743v-4.476c0-.66.12-1.242.218-1.711l.059-.27c.95-3.543 2.785-6.39 7.437-6.39 5.457 0 7.836 3.707 7.836 10.222 0 6.114-3.144 10.54-8.039 10.54m17.145-33.266c-1.356 0-2.336.98-2.336 2.336 0 1.3.957 2.285 2.23 2.285.75 0 1.375-.238 1.813-.691.39-.407.598-.965.574-1.594 0-1.399-.918-2.336-2.281-2.336m1.77 10.355h-3.54V54.72h3.54zm15.73-.839-1.113.039c-4.047 0-7.172 3.472-7.172 3.472l-.172-3.492h-3.02c.117 1.79.172 4.445.172 6.996v18.31h3.54V39.602c0-.872.12-1.684.327-2.258.758-2.477 3.078-4.98 6.547-4.98 4.035 0 6.254 2.788 6.254 7.855v14.5h3.543V39.703c0-9.617-7.52-10.308-8.906-10.308m21.812.019c-2.89 0-6.222.809-8.148 2.844l-.031 3.926c1.867-1.93 5.293-3.926 7.566-3.926 3.969 0 6.102 1.851 6.102 5.969v1.367l-.72-.004c-9.194 0-14.843 3.156-14.843 8.941 0 3.164 2.36 7.43 6.906 7.43q.251.001.508-.016c4.246-.289 6.168-1.133 7.293-2.718.336-.477 1.266-1.532 1.266-1.532l.312 3.024h3.09c-.266-1.867-.324-4.184-.324-5.871v-9.516c0-6.582-3.02-9.918-8.977-9.918m-1.18 23.184c-2.898 0-5.64-1.004-5.64-3.985 0-2.843 2.723-5.93 11.246-5.93h1.164v3.692c0 .492-.101 1.07-.281 1.629-.711 2.117-2.832 4.594-6.488 4.594m24.054-23.246c-4.168 0-5.468 3.03-5.468 3.03h-1.04l-.156-2.402h-2.957c.121 2.024.176 4.297.176 7.278v17.46h3.488v-13.6c0-.806.078-2.497.196-3.134.453-2.472 2.433-5.906 5.746-5.906q.304 0 .625.047c1.007.145 1.863.645 2.445 1v-3.094l-.379-.133c-.469-.168-1.348-.484-1.605-.484a9 9 0 0 0-1.07-.062"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Google/Ads/CampaignDescription.ts b/packages/nodes-base/nodes/Google/Ads/CampaignDescription.ts
index 3e86ce50d2f2a..4506b33d3c767 100644
--- a/packages/nodes-base/nodes/Google/Ads/CampaignDescription.ts
+++ b/packages/nodes-base/nodes/Google/Ads/CampaignDescription.ts
@@ -41,7 +41,7 @@ export const campaignOperations: INodeProperties[] = [
 				routing: {
 					request: {
 						method: 'POST',
-						url: '={{"/v11/customers/" + $parameter["clientCustomerId"].toString().replace(/-/g, "")  + "/googleAds:search"}}',
+						url: '={{"/v15/customers/" + $parameter["clientCustomerId"].toString().replace(/-/g, "")  + "/googleAds:search"}}',
 						body: {
 							query:
 								'={{ "' +
@@ -89,7 +89,7 @@ export const campaignOperations: INodeProperties[] = [
 				routing: {
 					request: {
 						method: 'POST',
-						url: '={{"/v11/customers/" + $parameter["clientCustomerId"].toString().replace(/-/g, "") + "/googleAds:search"}}',
+						url: '={{"/v15/customers/" + $parameter["clientCustomerId"].toString().replace(/-/g, "") + "/googleAds:search"}}',
 						returnFullResponse: true,
 						body: {
 							query:
diff --git a/packages/nodes-base/nodes/Google/Ads/GoogleAds.node.ts b/packages/nodes-base/nodes/Google/Ads/GoogleAds.node.ts
index 39c19cb94cb0f..7864eb762dd9f 100644
--- a/packages/nodes-base/nodes/Google/Ads/GoogleAds.node.ts
+++ b/packages/nodes-base/nodes/Google/Ads/GoogleAds.node.ts
@@ -23,7 +23,7 @@ export class GoogleAds implements INodeType {
 				testedBy: {
 					request: {
 						method: 'GET',
-						url: '/v11/customers:listAccessibleCustomers',
+						url: '/v15/customers:listAccessibleCustomers',
 					},
 				},
 			},
diff --git a/packages/nodes-base/nodes/Google/Ads/googleAds.svg b/packages/nodes-base/nodes/Google/Ads/googleAds.svg
index a295244f04d57..42fa5ca41dd45 100644
--- a/packages/nodes-base/nodes/Google/Ads/googleAds.svg
+++ b/packages/nodes-base/nodes/Google/Ads/googleAds.svg
@@ -1,8 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="256px" height="230px" viewBox="0 0 256 230" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMidYMid">
-    <g>
-				<path d="M5.888,166.405103 L90.88,20.9 C101.676138,27.2558621 156.115862,57.3844138 164.908138,63.1135172 L79.9161379,208.627448 C70.6206897,220.906621 -5.888,185.040138 5.888,166.396276 L5.888,166.405103 Z" fill="#FBBC04"></path>
-				<path d="M250.084224,166.401789 L165.092224,20.9055131 C153.210293,1.13172 127.619121,-6.05393517 106.600638,5.62496138 C85.582155,17.3038579 79.182155,42.4624786 91.0640861,63.1190303 L176.056086,208.632961 C187.938017,228.397927 213.52919,235.583582 234.547672,223.904686 C254.648086,212.225789 261.966155,186.175582 250.084224,166.419444 L250.084224,166.401789 Z" fill="#4285F4"></path>
-				<ellipse fill="#34A853" cx="42.6637241" cy="187.924414" rx="42.6637241" ry="41.6044138"></ellipse>
-    </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="230" preserveAspectRatio="xMidYMid"><path fill="#FBBC04" d="M5.888 166.405 90.88 20.9c10.796 6.356 65.236 36.484 74.028 42.214L79.916 208.627c-9.295 12.28-85.804-23.587-74.028-42.23z"/><path fill="#4285F4" d="M250.084 166.402 165.092 20.906C153.21 1.132 127.62-6.054 106.601 5.625S79.182 42.462 91.064 63.119l84.992 145.514c11.882 19.765 37.473 26.95 58.492 15.272 20.1-11.68 27.418-37.73 15.536-57.486z"/><ellipse cx="42.664" cy="187.924" fill="#34A853" rx="42.664" ry="41.604"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Google/Analytics/analytics.svg b/packages/nodes-base/nodes/Google/Analytics/analytics.svg
index 19b89e413e798..4b193cca0b6bf 100644
--- a/packages/nodes-base/nodes/Google/Analytics/analytics.svg
+++ b/packages/nodes-base/nodes/Google/Analytics/analytics.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="192" height="192"><path fill="none" d="M0 0h192v192H0z"/><path fill="#F9AB00" d="M130 29v132c0 14.77 10.19 23 21 23 10 0 21-7 21-23V30c0-13.54-10-22-21-22s-21 9.33-21 21z"/><path fill="#E37400" d="M75 96v65c0 14.77 10.19 23 21 23 10 0 21-7 21-23V97c0-13.54-10-22-21-22s-21 9.33-21 21z"/><circle fill="#E37400" cx="41" cy="163" r="21"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="192" height="192"><path fill="none" d="M0 0h192v192H0z"/><path fill="#F9AB00" d="M130 29v132c0 14.77 10.19 23 21 23 10 0 21-7 21-23V30c0-13.54-10-22-21-22s-21 9.33-21 21"/><path fill="#E37400" d="M75 96v65c0 14.77 10.19 23 21 23 10 0 21-7 21-23V97c0-13.54-10-22-21-22s-21 9.33-21 21"/><circle cx="41" cy="163" r="21" fill="#E37400"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Google/Analytics/v1/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Analytics/v1/GenericFunctions.ts
index aaac818ff6eb8..fb05127647673 100644
--- a/packages/nodes-base/nodes/Google/Analytics/v1/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Analytics/v1/GenericFunctions.ts
@@ -1,16 +1,16 @@
-import type { OptionsWithUri } from 'request';
 import type {
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	ILoadOptionsFunctions,
 	IDataObject,
 	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function googleApiRequest(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject = {},
 	qs: IDataObject = {},
@@ -19,7 +19,7 @@ export async function googleApiRequest(
 ) {
 	const baseURL = 'https://analyticsreporting.googleapis.com';
 
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		headers: {
 			Accept: 'application/json',
 			'Content-Type': 'application/json',
@@ -61,7 +61,7 @@ export async function googleApiRequest(
 export async function googleApiRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject = {},
 	query: IDataObject = {},
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 6557252d8d10f..9f38d2a55a8cd 100644
--- a/packages/nodes-base/nodes/Google/Analytics/v1/GoogleAnalyticsV1.node.ts
+++ b/packages/nodes-base/nodes/Google/Analytics/v1/GoogleAnalyticsV1.node.ts
@@ -8,14 +8,17 @@ import type {
 	INodeType,
 	INodeTypeBaseDescription,
 	INodeTypeDescription,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 
+import moment from 'moment-timezone';
 import { reportFields, reportOperations } from './ReportDescription';
 import { userActivityFields, userActivityOperations } from './UserActivityDescription';
 import { googleApiRequest, googleApiRequestAllItems, merge, simplify } from './GenericFunctions';
-import moment from 'moment-timezone';
 import type { IData } from './Interfaces';
 
+import { oldVersionNotice } from '@utils/descriptions';
+
 const versionDescription: INodeTypeDescription = {
 	displayName: 'Google Analytics',
 	name: 'googleAnalytics',
@@ -36,6 +39,7 @@ const versionDescription: INodeTypeDescription = {
 		},
 	],
 	properties: [
+		oldVersionNotice,
 		{
 			displayName: 'Resource',
 			name: 'resource',
@@ -150,7 +154,7 @@ export class GoogleAnalyticsV1 implements INodeType {
 		const resource = this.getNodeParameter('resource', 0);
 		const operation = this.getNodeParameter('operation', 0);
 
-		let method = '';
+		let method: IHttpRequestMethods = 'GET';
 		const qs: IDataObject = {};
 		let endpoint = '';
 		let responseData;
@@ -244,7 +248,6 @@ export class GoogleAnalyticsV1 implements INodeType {
 						if (simple) {
 							responseData = simplify(responseData);
 						} else if (returnAll && responseData.length > 1) {
-							// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
 							responseData = merge(responseData);
 						}
 					}
@@ -300,6 +303,6 @@ export class GoogleAnalyticsV1 implements INodeType {
 				throw error;
 			}
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
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 ec1dd18965ee0..7c42fdc246b72 100644
--- a/packages/nodes-base/nodes/Google/Analytics/v2/GoogleAnalyticsV2.node.ts
+++ b/packages/nodes-base/nodes/Google/Analytics/v2/GoogleAnalyticsV2.node.ts
@@ -1,4 +1,3 @@
-/* eslint-disable n8n-nodes-base/node-filename-against-convention */
 import type {
 	IExecuteFunctions,
 	INodeExecutionData,
@@ -23,6 +22,6 @@ export class GoogleAnalyticsV2 implements INodeType {
 	methods = { loadOptions, listSearch };
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
-		return router.call(this);
+		return await router.call(this);
 	}
 }
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 faca9dfe42df6..85952e951f6e9 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
@@ -717,7 +717,6 @@ export async function execute(
 	if (simple) {
 		responseData = simplify(responseData);
 	} else if (returnAll && responseData.length > 1) {
-		// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
 		responseData = merge(responseData);
 	}
 
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 47ded6e2a4380..1d9cae99009a1 100644
--- a/packages/nodes-base/nodes/Google/Analytics/v2/actions/router.ts
+++ b/packages/nodes-base/nodes/Google/Analytics/v2/actions/router.ts
@@ -47,5 +47,5 @@ export async function router(this: IExecuteFunctions): Promise<INodeExecutionDat
 			throw error;
 		}
 	}
-	return this.prepareOutputData(returnData);
+	return [returnData];
 }
diff --git a/packages/nodes-base/nodes/Google/Analytics/v2/transport/index.ts b/packages/nodes-base/nodes/Google/Analytics/v2/transport/index.ts
index 804db4671764b..01e0f34f779a2 100644
--- a/packages/nodes-base/nodes/Google/Analytics/v2/transport/index.ts
+++ b/packages/nodes-base/nodes/Google/Analytics/v2/transport/index.ts
@@ -1,16 +1,16 @@
-import type { OptionsWithUri } from 'request';
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
+	IRequestOptions,
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function googleApiRequest(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject = {},
 	qs: IDataObject = {},
@@ -23,7 +23,7 @@ export async function googleApiRequest(
 			? 'https://analyticsdata.googleapis.com'
 			: 'https://analyticsreporting.googleapis.com';
 
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		headers: {
 			Accept: 'application/json',
 			'Content-Type': 'application/json',
@@ -67,7 +67,7 @@ export async function googleApiRequest(
 export async function googleApiRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject = {},
 	query: IDataObject = {},
diff --git a/packages/nodes-base/nodes/Google/BigQuery/GoogleBigQuery.node.ts b/packages/nodes-base/nodes/Google/BigQuery/GoogleBigQuery.node.ts
index 3059d5699e84a..6e2dd9a541f6b 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/GoogleBigQuery.node.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/GoogleBigQuery.node.ts
@@ -13,12 +13,13 @@ export class GoogleBigQuery extends VersionedNodeType {
 			group: ['input'],
 			subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
 			description: 'Consume Google BigQuery API',
-			defaultVersion: 2,
+			defaultVersion: 2.1,
 		};
 
 		const nodeVersions: IVersionedNodeType['nodeVersions'] = {
 			1: new GoogleBigQueryV1(baseDescription),
 			2: new GoogleBigQueryV2(baseDescription),
+			2.1: new GoogleBigQueryV2(baseDescription),
 		};
 
 		super(nodeVersions, baseDescription);
diff --git a/packages/nodes-base/nodes/Google/BigQuery/googleBigQuery.svg b/packages/nodes-base/nodes/Google/BigQuery/googleBigQuery.svg
index 35cf00485e9b7..274de708adc32 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/googleBigQuery.svg
+++ b/packages/nodes-base/nodes/Google/BigQuery/googleBigQuery.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 66 58" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><g stroke="none" fill-rule="nonzero"><path d="M14.48 54.473L.558 30.359a4.163 4.163 0 010-4.164L14.48 2.082A4.163 4.163 0 0118.08 0h27.857c1.48.007 2.845.8 3.585 2.082l13.92 24.113a4.163 4.163 0 010 4.164L49.52 54.473a4.163 4.163 0 01-3.6 2.082H18.07a4.167 4.167 0 01-3.593-2.082z" fill="#4386fa"/><path d="M40.697 20.512s3.87 9.283-1.406 14.545-14.883 1.894-14.883 1.894L43.95 56.547h1.984a4.163 4.163 0 003.6-2.082l9.216-15.958z" fill="#000" opacity=".1"/><path d="M45.266 39.507L41 35.23a.67.67 0 00-.158-.12 11.63 11.63 0 00-1.499-15.859 11.63 11.63 0 00-16.396 16.436 11.63 11.63 0 0015.863 1.46.695.695 0 00.113.15l4.277 4.277a.67.67 0 00.947 0l1.12-1.12a.67.67 0 000-.947zM31.64 36.741a8.75 8.75 0 01-6.188-14.937 8.75 8.75 0 0114.937 6.188 8.75 8.75 0 01-8.749 8.749zm-5.593-9.216v3.616a6.426 6.426 0 002.338 2.375v-6.013zm4.375-2.998v9.772a6.45 6.45 0 002.338 0v-9.772zm6.764 6.606v-2.142H34.85v4.5a6.43 6.43 0 002.338-2.368z"/></g></symbol></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round" viewBox="0 0 66 58"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><g fill-rule="nonzero" stroke="none"><path fill="#4386fa" d="M14.48 54.473.558 30.359a4.16 4.16 0 0 1 0-4.164L14.48 2.082A4.16 4.16 0 0 1 18.08 0h27.857c1.48.007 2.845.8 3.585 2.082l13.92 24.113a4.16 4.16 0 0 1 0 4.164L49.52 54.473a4.16 4.16 0 0 1-3.6 2.082H18.07a4.17 4.17 0 0 1-3.593-2.082z"/><path fill="#000" d="M40.697 20.512s3.87 9.283-1.406 14.545-14.883 1.894-14.883 1.894L43.95 56.547h1.984a4.16 4.16 0 0 0 3.6-2.082l9.216-15.958z" opacity=".1"/><path d="M45.266 39.507 41 35.23a.7.7 0 0 0-.158-.12 11.63 11.63 0 0 0-1.499-15.859 11.63 11.63 0 0 0-16.396 16.436 11.63 11.63 0 0 0 15.863 1.46.7.7 0 0 0 .113.15l4.277 4.277a.67.67 0 0 0 .947 0l1.12-1.12a.67.67 0 0 0 0-.947zM31.64 36.741a8.75 8.75 0 0 1-6.188-14.937 8.75 8.75 0 0 1 14.937 6.188 8.75 8.75 0 0 1-8.749 8.749m-5.593-9.216v3.616a6.4 6.4 0 0 0 2.338 2.375v-6.013zm4.375-2.998v9.772a6.5 6.5 0 0 0 2.338 0v-9.772zm6.764 6.606v-2.142H34.85v4.5a6.43 6.43 0 0 0 2.338-2.368z"/></g></symbol></svg>
\ No newline at end of file
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 e424ba7a11cf8..95a52e559d2a5 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,18 +1,16 @@
 import type { INodeTypes } from 'n8n-workflow';
 
-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';
-
 import nock from 'nock';
+import * as transport from '../../../v2/transport';
+import { setup, workflowToTests } from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 
 jest.mock('../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../v2/transport');
 	return {
 		...originalModule,
-		googleApiRequest: jest.fn(async (method: string, resource: string) => {
+		googleApiRequest: jest.fn(async (method: IHttpRequestMethods, resource: string) => {
 			if (resource === '/v2/projects/test-project/jobs' && method === 'POST') {
 				return {
 					jobReference: {
@@ -73,6 +71,6 @@ describe('Test Google BigQuery V2, executeQuery', () => {
 	};
 
 	for (const testData of tests) {
-		test(testData.description, async () => testNode(testData, nodeTypes));
+		test(testData.description, async () => await testNode(testData, nodeTypes));
 	}
 });
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 c79556283223d..7caccca38f90a 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,17 +1,16 @@
 import type { INodeTypes } from 'n8n-workflow';
 
-import { setup, workflowToTests } from '../../../../../../test/nodes/Helpers';
-import type { WorkflowTestData } from '../../../../../../test/nodes/types';
-import { executeWorkflow } from '../../../../../../test/nodes/ExecuteWorkflow';
 import nock from 'nock';
-
 import * as transport from '../../../v2/transport';
+import { setup, workflowToTests } from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 
 jest.mock('../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../v2/transport');
 	return {
 		...originalModule,
-		googleApiRequest: jest.fn(async (method: string, resource: string) => {
+		googleApiRequest: jest.fn(async (method: IHttpRequestMethods, resource: string) => {
 			if (
 				resource ===
 					'/v2/projects/test-project/datasets/bigquery_node_dev_test_dataset/tables/num_text' &&
@@ -79,6 +78,6 @@ describe('Test Google BigQuery V2, insert auto map', () => {
 	};
 
 	for (const testData of tests) {
-		test(testData.description, async () => testNode(testData, nodeTypes));
+		test(testData.description, async () => await testNode(testData, nodeTypes));
 	}
 });
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 52005cb834e88..6af6c8e51c588 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,17 +1,16 @@
 import type { INodeTypes } from 'n8n-workflow';
 
-import { setup, workflowToTests } from '../../../../../../test/nodes/Helpers';
-import type { WorkflowTestData } from '../../../../../../test/nodes/types';
-import { executeWorkflow } from '../../../../../../test/nodes/ExecuteWorkflow';
 import nock from 'nock';
-
 import * as transport from '../../../v2/transport';
+import { setup, workflowToTests } from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 
 jest.mock('../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../v2/transport');
 	return {
 		...originalModule,
-		googleApiRequest: jest.fn(async (method: string, resource: string) => {
+		googleApiRequest: jest.fn(async (method: IHttpRequestMethods, resource: string) => {
 			if (
 				resource ===
 					'/v2/projects/test-project/datasets/bigquery_node_dev_test_dataset/tables/test_json' &&
@@ -76,6 +75,6 @@ describe('Test Google BigQuery V2, insert define manually', () => {
 	};
 
 	for (const testData of tests) {
-		test(testData.description, async () => testNode(testData, nodeTypes));
+		test(testData.description, async () => await testNode(testData, nodeTypes));
 	}
 });
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 0af16e8eb2dfb..454831014025d 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,8 +1,14 @@
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, IExecuteFunctions, INode } from 'n8n-workflow';
+import { constructExecutionMetaData } from 'n8n-core';
+import { mock } from 'jest-mock-extended';
 import { prepareOutput } from '../../../v2/helpers/utils';
 
 describe('Google BigQuery v2 Utils', () => {
 	it('should prepareOutput', () => {
+		const thisArg = mock<IExecuteFunctions>({
+			getNode: () => ({ typeVersion: 2.1 }) as INode,
+			helpers: mock({ constructExecutionMetaData }),
+		});
 		const response: IDataObject = {
 			kind: 'bigquery#getQueryResultsResponse',
 			etag: 'e_tag',
@@ -211,7 +217,7 @@ describe('Google BigQuery v2 Utils', () => {
 			jobComplete: true,
 			cacheHit: true,
 		};
-		const returnData = prepareOutput(response, 0, false, false);
+		const returnData = prepareOutput.call(thisArg, response, 0, false, false);
 
 		expect(returnData).toBeDefined();
 		// expect(returnData).toHaveProperty('nodes');
diff --git a/packages/nodes-base/nodes/Google/BigQuery/v1/GenericFunctions.ts b/packages/nodes-base/nodes/Google/BigQuery/v1/GenericFunctions.ts
index db1d20c4a3caa..d4456f318b2ca 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/v1/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/v1/GenericFunctions.ts
@@ -1,71 +1,18 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	ILoadOptionsFunctions,
 	IDataObject,
 	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
-
-import moment from 'moment-timezone';
-
-import * as jwt from 'jsonwebtoken';
-
-async function getAccessToken(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	credentials: IDataObject,
-): Promise<IDataObject> {
-	//https://developers.google.com/identity/protocols/oauth2/service-account#httprest
-
-	const privateKey = (credentials.privateKey as string).replace(/\\n/g, '\n').trim();
-
-	const scopes = ['https://www.googleapis.com/auth/bigquery'];
-
-	const now = moment().unix();
-
-	const signature = jwt.sign(
-		{
-			iss: credentials.email as string,
-			sub: credentials.delegatedEmail || (credentials.email as string),
-			scope: scopes.join(' '),
-			aud: 'https://oauth2.googleapis.com/token',
-			iat: now,
-			exp: now + 3600,
-		},
-		privateKey,
-		{
-			algorithm: 'RS256',
-			header: {
-				kid: privateKey,
-				typ: 'JWT',
-				alg: 'RS256',
-			},
-		},
-	);
-
-	const options: OptionsWithUri = {
-		headers: {
-			'Content-Type': 'application/x-www-form-urlencoded',
-		},
-		method: 'POST',
-		form: {
-			grant_type: 'urn:ietf:params:oauth:grant-type:jwt-bearer',
-			assertion: signature,
-		},
-		uri: 'https://oauth2.googleapis.com/token',
-		json: true,
-	};
-
-	return this.helpers.request(options);
-}
+import { getGoogleAccessToken } from '../../GenericFunctions';
 
 export async function googleApiRequest(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
-
 	body: any = {},
 	qs: IDataObject = {},
 	uri?: string,
@@ -77,7 +24,7 @@ export async function googleApiRequest(
 		'serviceAccount',
 	) as string;
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			'Content-Type': 'application/json',
 		},
@@ -102,7 +49,7 @@ export async function googleApiRequest(
 				throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 			}
 
-			const { access_token } = await getAccessToken.call(this, credentials as IDataObject);
+			const { access_token } = await getGoogleAccessToken.call(this, credentials, 'bigquery');
 
 			options.headers!.Authorization = `Bearer ${access_token}`;
 			return await this.helpers.request(options);
@@ -121,7 +68,7 @@ export async function googleApiRequest(
 export async function googleApiRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: any = {},
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 2d3aac109c4ef..d15f05a63083d 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/v1/GoogleBigQueryV1.node.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/v1/GoogleBigQueryV1.node.ts
@@ -1,8 +1,7 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
 	IDataObject,
+	IExecuteFunctions,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
 	INodePropertyOptions,
@@ -14,11 +13,13 @@ import type {
 
 import { 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 { v4 as uuid } from 'uuid';
+import { oldVersionNotice } from '@utils/descriptions';
 
 const versionDescription: INodeTypeDescription = {
 	displayName: 'Google BigQuery',
@@ -54,6 +55,7 @@ const versionDescription: INodeTypeDescription = {
 		},
 	],
 	properties: [
+		oldVersionNotice,
 		{
 			displayName: 'Authentication',
 			name: 'authentication',
@@ -196,6 +198,8 @@ export class GoogleBigQueryV1 implements INodeType {
 
 				body.rows = rows;
 
+				const itemData = generatePairedItemData(items.length);
+
 				try {
 					responseData = await googleApiRequest.call(
 						this,
@@ -206,14 +210,14 @@ export class GoogleBigQueryV1 implements INodeType {
 
 					const executionData = this.helpers.constructExecutionMetaData(
 						this.helpers.returnJsonArray(responseData as IDataObject[]),
-						{ itemData: { item: 0 } },
+						{ itemData },
 					);
 					returnData.push(...executionData);
 				} catch (error) {
 					if (this.continueOnFail()) {
 						const executionErrorData = this.helpers.constructExecutionMetaData(
 							this.helpers.returnJsonArray({ error: error.message }),
-							{ itemData: { item: 0 } },
+							{ itemData },
 						);
 						returnData.push(...executionErrorData);
 					}
@@ -299,6 +303,6 @@ export class GoogleBigQueryV1 implements INodeType {
 			}
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
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 771b93e95f97e..9d55d463288a4 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/v2/GoogleBigQueryV2.node.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/v2/GoogleBigQueryV2.node.ts
@@ -1,7 +1,5 @@
-/* eslint-disable n8n-nodes-base/node-filename-against-convention */
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeBaseDescription,
@@ -25,6 +23,6 @@ export class GoogleBigQueryV2 implements INodeType {
 	methods = { loadOptions, listSearch };
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
-		return router.call(this);
+		return await router.call(this);
 	}
 }
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 a806e5afacc33..d6b67b1df0316 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
@@ -1,19 +1,26 @@
-import type { IExecuteFunctions } from 'n8n-core';
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
 
-import type { IDataObject, INodeExecutionData, INodeProperties } from 'n8n-workflow';
-
-import { NodeOperationError, sleep } from 'n8n-workflow';
-import { updateDisplayOptions } from '../../../../../../utils/utilities';
-import type { JobInsertResponse } from '../../helpers/interfaces';
+import { ApplicationError, NodeOperationError, sleep } from 'n8n-workflow';
+import type { ResponseWithJobReference } from '../../helpers/interfaces';
 
 import { prepareOutput } from '../../helpers/utils';
 import { googleApiRequest } from '../../transport';
+import { getResolvables, updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
 		displayName: 'SQL Query',
 		name: 'sqlQuery',
 		type: 'string',
+		noDataExpression: true,
+		typeOptions: {
+			editor: 'sqlEditor',
+		},
 		displayOptions: {
 			hide: {
 				'/options.useLegacySql': [true],
@@ -28,6 +35,10 @@ const properties: INodeProperties[] = [
 		displayName: 'SQL Query',
 		name: 'sqlQuery',
 		type: 'string',
+		noDataExpression: true,
+		typeOptions: {
+			editor: 'sqlEditor',
+		},
 		displayOptions: {
 			show: {
 				'/options.useLegacySql': [true],
@@ -80,7 +91,7 @@ const properties: INodeProperties[] = [
 				},
 			},
 			{
-				displayName: 'Location',
+				displayName: 'Location (Region)',
 				name: 'location',
 				type: 'string',
 				default: '',
@@ -154,12 +165,16 @@ export async function execute(this: IExecuteFunctions): Promise<INodeExecutionDa
 
 	for (let i = 0; i < length; i++) {
 		try {
-			const sqlQuery = this.getNodeParameter('sqlQuery', i) as string;
+			let sqlQuery = this.getNodeParameter('sqlQuery', i) as string;
 			const options = this.getNodeParameter('options', i);
 			const projectId = this.getNodeParameter('projectId', i, undefined, {
 				extractValue: true,
 			});
 
+			for (const resolvable of getResolvables(sqlQuery)) {
+				sqlQuery = sqlQuery.replace(resolvable, this.evaluateExpression(resolvable, i) as string);
+			}
+
 			let rawOutput = false;
 			let includeSchema = false;
 
@@ -188,7 +203,7 @@ export async function execute(this: IExecuteFunctions): Promise<INodeExecutionDa
 				body.useLegacySql = false;
 			}
 
-			const response: JobInsertResponse = await googleApiRequest.call(
+			const response: ResponseWithJobReference = await googleApiRequest.call(
 				this,
 				'POST',
 				`/v2/projects/${projectId}/jobs`,
@@ -208,9 +223,10 @@ export async function execute(this: IExecuteFunctions): Promise<INodeExecutionDa
 
 			const jobId = response?.jobReference?.jobId;
 			const raw = rawOutput || (options.dryRun as boolean) || false;
+			const location = options.location || response.jobReference.location;
 
 			if (response.status?.state === 'DONE') {
-				const qs = options.location ? { location: options.location } : {};
+				const qs = { location };
 
 				const queryResponse: IDataObject = await googleApiRequest.call(
 					this,
@@ -220,9 +236,9 @@ export async function execute(this: IExecuteFunctions): Promise<INodeExecutionDa
 					qs,
 				);
 
-				returnData.push(...prepareOutput(queryResponse, i, raw, includeSchema));
+				returnData.push(...prepareOutput.call(this, queryResponse, i, raw, includeSchema));
 			} else {
-				jobs.push({ jobId, projectId, i, raw, includeSchema, location: options.location });
+				jobs.push({ jobId, projectId, i, raw, includeSchema, location });
 			}
 		} catch (error) {
 			if (this.continueOnFail()) {
@@ -233,9 +249,19 @@ export async function execute(this: IExecuteFunctions): Promise<INodeExecutionDa
 				returnData.push(...executionErrorData);
 				continue;
 			}
-			throw new NodeOperationError(this.getNode(), error.message as string, {
+			if ((error.message as string).includes('location') || error.httpCode === '404') {
+				error.description =
+					"Are you sure your table is in that region? You can specify the region using the 'Location' parameter from options.";
+			}
+
+			if (error.httpCode === '403' && error.message.includes('Drive')) {
+				error.description =
+					'If your table(s) pull from a document in Google Drive, make sure that document is shared with your user';
+			}
+
+			throw new NodeOperationError(this.getNode(), error as Error, {
 				itemIndex: i,
-				description: error?.description,
+				description: error.description,
 			});
 		}
 	}
@@ -259,14 +285,15 @@ export async function execute(this: IExecuteFunctions): Promise<INodeExecutionDa
 				if (response.jobComplete) {
 					completedJobs.push(job.jobId);
 
-					returnData.push(...prepareOutput(response, job.i, job.raw, job.includeSchema));
+					returnData.push(...prepareOutput.call(this, response, job.i, job.raw, job.includeSchema));
 				}
 				if ((response?.errors as IDataObject[])?.length) {
 					const errorMessages = (response.errors as IDataObject[]).map((error) => error.message);
-					throw new Error(
+					throw new ApplicationError(
 						`Error(s) ocurring while executing query from item ${job.i.toString()}: ${errorMessages.join(
 							', ',
 						)}`,
+						{ level: 'warning' },
 					);
 				}
 			} catch (error) {
@@ -278,9 +305,9 @@ export async function execute(this: IExecuteFunctions): Promise<INodeExecutionDa
 					returnData.push(...executionErrorData);
 					continue;
 				}
-				throw new NodeOperationError(this.getNode(), error.message as string, {
+				throw new NodeOperationError(this.getNode(), error as Error, {
 					itemIndex: job.i,
-					description: error?.description,
+					description: error.description,
 				});
 			}
 		}
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 f85cd9d9886f2..8a9abeaa6131e 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
@@ -1,11 +1,15 @@
-import type { IExecuteFunctions } from 'n8n-core';
-import type { IDataObject, INodeExecutionData, INodeProperties } from 'n8n-workflow';
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 import { v4 as uuid } from 'uuid';
-import { updateDisplayOptions } from '../../../../../../utils/utilities';
 import type { TableSchema } from '../../helpers/interfaces';
 import { checkSchema, wrapData } from '../../helpers/utils';
 import { googleApiRequest } from '../../transport';
+import { generatePairedItemData, updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
@@ -29,7 +33,7 @@ const properties: INodeProperties[] = [
 	},
 	{
 		displayName:
-			"In this mode, make sure the incoming data fields are named the same as the columns in BigQuery. (Use a 'set' node before this node to change them if required.)",
+			"In this mode, make sure the incoming data fields are named the same as the columns in BigQuery. (Use an 'Edit Fields' node before this node to change them if required.)",
 		name: 'info',
 		type: 'notice',
 		default: '',
@@ -221,6 +225,7 @@ export async function execute(this: IExecuteFunctions): Promise<INodeExecutionDa
 		}
 	}
 
+	const itemData = generatePairedItemData(items.length);
 	for (let i = 0; i < rows.length; i += batchSize) {
 		const batch = rows.slice(i, i + batchSize);
 		body.rows = batch;
@@ -275,7 +280,7 @@ export async function execute(this: IExecuteFunctions): Promise<INodeExecutionDa
 
 		const executionData = this.helpers.constructExecutionMetaData(
 			wrapData(responseData as IDataObject[]),
-			{ itemData: { item: 0 } },
+			{ itemData },
 		);
 
 		returnData.push(...executionData);
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 e2888a85ee85e..9b6d45aa245a5 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/v2/actions/router.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/v2/actions/router.ts
@@ -1,5 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-import type { INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 import type { GoogleBigQuery } from './node.type';
 
@@ -24,5 +23,5 @@ export async function router(this: IExecuteFunctions): Promise<INodeExecutionDat
 			throw new NodeOperationError(this.getNode(), `The resource "${resource}" is not known`);
 	}
 
-	return this.prepareOutputData(returnData);
+	return [returnData];
 }
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 c1df1cf7a20be..0e232d38f6e2c 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/v2/actions/versionDescription.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/v2/actions/versionDescription.ts
@@ -7,7 +7,7 @@ export const versionDescription: INodeTypeDescription = {
 	name: 'googleBigQuery',
 	icon: 'file:googleBigQuery.svg',
 	group: ['input'],
-	version: 2,
+	version: [2, 2.1],
 	subtitle: '={{$parameter["operation"]}}',
 	description: 'Consume Google BigQuery API',
 	defaults: {
diff --git a/packages/nodes-base/nodes/Google/BigQuery/v2/helpers/interfaces.ts b/packages/nodes-base/nodes/Google/BigQuery/v2/helpers/interfaces.ts
index ffd8e9d2275e2..84d27b361ab54 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/v2/helpers/interfaces.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/v2/helpers/interfaces.ts
@@ -21,7 +21,7 @@ export type JobReference = {
 	location: string;
 };
 
-export type JobInsertResponse = {
+export type ResponseWithJobReference = {
 	kind: string;
 	id: string;
 	jobReference: JobReference;
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 7325446592a82..34fd023c6e2e1 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/v2/helpers/utils.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/v2/helpers/utils.ts
@@ -1,10 +1,9 @@
-import type { IExecuteFunctions } from 'n8n-core';
-import { constructExecutionMetaData } from 'n8n-core';
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+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) {
+function getFieldValue(schemaField: SchemaField, field: IDataObject, parseTimestamps = false) {
 	if (schemaField.type === 'RECORD') {
 		// eslint-disable-next-line @typescript-eslint/no-use-before-define
 		return simplify([field.v as TableRawData], schemaField.fields as unknown as SchemaField[]);
@@ -14,6 +13,9 @@ function getFieldValue(schemaField: SchemaField, field: IDataObject) {
 			try {
 				value = jsonParse(value as string);
 			} catch (error) {}
+		} else if (schemaField.type === 'TIMESTAMP' && parseTimestamps) {
+			const dt = DateTime.fromSeconds(Number(value));
+			value = dt.isValid ? dt.toISO() : value;
 		}
 		return value;
 	}
@@ -28,18 +30,27 @@ export function wrapData(data: IDataObject | IDataObject[]): INodeExecutionData[
 	}));
 }
 
-export function simplify(data: TableRawData[], schema: SchemaField[], includeSchema = false) {
+export function simplify(
+	data: TableRawData[],
+	schema: SchemaField[],
+	includeSchema = false,
+	parseTimestamps = false,
+) {
 	const returnData: IDataObject[] = [];
 	for (const entry of data) {
 		const record: IDataObject = {};
 
 		for (const [index, field] of entry.f.entries()) {
 			if (schema[index].mode !== 'REPEATED') {
-				record[schema[index].name] = getFieldValue(schema[index], field);
+				record[schema[index].name] = getFieldValue(schema[index], field, parseTimestamps);
 			} else {
 				record[schema[index].name] = (field.v as unknown as IDataObject[]).flatMap(
 					(repeatedField) => {
-						return getFieldValue(schema[index], repeatedField as unknown as IDataObject);
+						return getFieldValue(
+							schema[index],
+							repeatedField as unknown as IDataObject,
+							parseTimestamps,
+						);
 					},
 				);
 			}
@@ -56,6 +67,7 @@ export function simplify(data: TableRawData[], schema: SchemaField[], includeSch
 }
 
 export function prepareOutput(
+	this: IExecuteFunctions,
 	response: IDataObject,
 	itemIndex: number,
 	rawOutput: boolean,
@@ -69,12 +81,18 @@ export function prepareOutput(
 		responseData = response;
 	} else {
 		const { rows, schema } = response;
+		const parseTimestamps = this.getNode().typeVersion >= 2.1;
 
 		if (rows !== undefined && schema !== undefined) {
 			const fields = (schema as TableSchema).fields;
 			responseData = rows;
 
-			responseData = simplify(responseData as TableRawData[], fields, includeSchema);
+			responseData = simplify(
+				responseData as TableRawData[],
+				fields,
+				includeSchema,
+				parseTimestamps,
+			);
 		} else if (schema && includeSchema) {
 			responseData = { success: true, _schema: schema };
 		} else {
@@ -82,9 +100,12 @@ export function prepareOutput(
 		}
 	}
 
-	const executionData = constructExecutionMetaData(wrapData(responseData as IDataObject[]), {
-		itemData: { item: itemIndex },
-	});
+	const executionData = this.helpers.constructExecutionMetaData(
+		wrapData(responseData as IDataObject[]),
+		{
+			itemData: { item: itemIndex },
+		},
+	);
 
 	return executionData;
 }
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 41966678c68a9..aaf6fe7608eac 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/v2/methods/loadOptions.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/v2/methods/loadOptions.ts
@@ -44,7 +44,7 @@ export async function getSchema(this: ILoadOptionsFunctions): Promise<INodePrope
 		returnData.push({
 			name: field.name as string,
 			value: field.name as string,
-			// eslint-disable-next-line n8n-nodes-base/node-param-description-lowercase-first-char
+
 			description:
 				`type: ${field.type as string}` + (field.mode ? ` mode: ${field.mode as string}` : ''),
 		});
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 8b61e324fdae4..d2ed271e24930 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/v2/transport/index.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/v2/transport/index.ts
@@ -1,62 +1,17 @@
-import type { OptionsWithUri } from 'request';
-import moment from 'moment-timezone';
-import * as jwt from 'jsonwebtoken';
-
-import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	IHttpRequestMethods,
+	ILoadOptionsFunctions,
+	IRequestOptions,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
-
-async function getAccessToken(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	credentials: IDataObject,
-): Promise<IDataObject> {
-	//https://developers.google.com/identity/protocols/oauth2/service-account#httprest
-
-	const privateKey = (credentials.privateKey as string).replace(/\\n/g, '\n').trim();
-
-	const scopes = ['https://www.googleapis.com/auth/bigquery'];
-
-	const now = moment().unix();
-
-	const signature = jwt.sign(
-		{
-			iss: credentials.email as string,
-			sub: credentials.delegatedEmail || (credentials.email as string),
-			scope: scopes.join(' '),
-			aud: 'https://oauth2.googleapis.com/token',
-			iat: now,
-			exp: now + 3600,
-		},
-		privateKey,
-		{
-			algorithm: 'RS256',
-			header: {
-				kid: privateKey,
-				typ: 'JWT',
-				alg: 'RS256',
-			},
-		},
-	);
-
-	const options: OptionsWithUri = {
-		headers: {
-			'Content-Type': 'application/x-www-form-urlencoded',
-		},
-		method: 'POST',
-		form: {
-			grant_type: 'urn:ietf:params:oauth:grant-type:jwt-bearer',
-			assertion: signature,
-		},
-		uri: 'https://oauth2.googleapis.com/token',
-		json: true,
-	};
-
-	return this.helpers.request(options);
-}
+import { getGoogleAccessToken } from '../../../GenericFunctions';
 
 export async function googleApiRequest(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 	body: IDataObject = {},
 	qs: IDataObject = {},
@@ -69,7 +24,7 @@ export async function googleApiRequest(
 		'serviceAccount',
 	) as string;
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			'Content-Type': 'application/json',
 		},
@@ -94,7 +49,7 @@ export async function googleApiRequest(
 				throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 			}
 
-			const { access_token } = await getAccessToken.call(this, credentials as IDataObject);
+			const { access_token } = await getGoogleAccessToken.call(this, credentials, 'bigquery');
 
 			options.headers!.Authorization = `Bearer ${access_token}`;
 			return await this.helpers.request(options);
@@ -115,7 +70,7 @@ export async function googleApiRequest(
 export async function googleApiRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject = {},
 	query: IDataObject = {},
diff --git a/packages/nodes-base/nodes/Google/Books/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Books/GenericFunctions.ts
index ed42ba9c6a957..ab8d73f58e576 100644
--- a/packages/nodes-base/nodes/Google/Books/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Books/GenericFunctions.ts
@@ -1,79 +1,18 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	ILoadOptionsFunctions,
 	IDataObject,
 	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
-
-import moment from 'moment-timezone';
-
-import jwt from 'jsonwebtoken';
-
-interface IGoogleAuthCredentials {
-	delegatedEmail?: string;
-	email: string;
-	inpersonate: boolean;
-	privateKey: string;
-}
-
-async function getAccessToken(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	credentials: IGoogleAuthCredentials,
-): Promise<IDataObject> {
-	//https://developers.google.com/identity/protocols/oauth2/service-account#httprest
-
-	const scopes = ['https://www.googleapis.com/auth/books'];
-
-	const now = moment().unix();
-
-	credentials.email = credentials.email.trim();
-	const privateKey = credentials.privateKey.replace(/\\n/g, '\n').trim();
-
-	const signature = jwt.sign(
-		{
-			iss: credentials.email,
-			sub: credentials.delegatedEmail || credentials.email,
-			scope: scopes.join(' '),
-			aud: 'https://oauth2.googleapis.com/token',
-			iat: now,
-			exp: now + 3600,
-		},
-		privateKey,
-		{
-			algorithm: 'RS256',
-			header: {
-				kid: privateKey,
-				typ: 'JWT',
-				alg: 'RS256',
-			},
-		},
-	);
-
-	const options: OptionsWithUri = {
-		headers: {
-			'Content-Type': 'application/x-www-form-urlencoded',
-		},
-		method: 'POST',
-		form: {
-			grant_type: 'urn:ietf:params:oauth:grant-type:jwt-bearer',
-			assertion: signature,
-		},
-		uri: 'https://oauth2.googleapis.com/token',
-		json: true,
-	};
-
-	return this.helpers.request(options);
-}
+import { getGoogleAccessToken } from '../GenericFunctions';
 
 export async function googleApiRequest(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
-
 	body: any = {},
 	qs: IDataObject = {},
 	uri?: string,
@@ -84,7 +23,7 @@ export async function googleApiRequest(
 		0,
 		'serviceAccount',
 	) as string;
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			'Content-Type': 'application/json',
 		},
@@ -108,10 +47,7 @@ export async function googleApiRequest(
 				privateKey: string;
 			};
 
-			const { access_token } = await getAccessToken.call(
-				this,
-				credentials as unknown as IGoogleAuthCredentials,
-			);
+			const { access_token } = await getGoogleAccessToken.call(this, credentials, 'books');
 
 			options.headers!.Authorization = `Bearer ${access_token}`;
 
@@ -131,7 +67,7 @@ export async function googleApiRequest(
 export async function googleApiRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: any = {},
diff --git a/packages/nodes-base/nodes/Google/Books/GoogleBooks.node.ts b/packages/nodes-base/nodes/Google/Books/GoogleBooks.node.ts
index 8f83b0cdcdd7a..481666a5f825b 100644
--- a/packages/nodes-base/nodes/Google/Books/GoogleBooks.node.ts
+++ b/packages/nodes-base/nodes/Google/Books/GoogleBooks.node.ts
@@ -522,6 +522,6 @@ export class GoogleBooks implements INodeType {
 				throw error;
 			}
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Google/Books/googlebooks.svg b/packages/nodes-base/nodes/Google/Books/googlebooks.svg
index f0715d1bf6d58..128cc7a184b93 100644
--- a/packages/nodes-base/nodes/Google/Books/googlebooks.svg
+++ b/packages/nodes-base/nodes/Google/Books/googlebooks.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448.7 500"><path fill="#0B5E9F" d="M428.2 221.9L49.2 6.5C33-2.6 18.5-1.7 9.7 6.8 3.4 12.8 0 22.4 0 34.9v429.9C0 477.4 3.7 487 9.7 493c9.1 8.8 23.3 9.7 39.5.3l379.1-215.4c27.2-15.4 27.2-40.4-.1-56z"/><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="223.168" y1="7682.241" x2="223.168" y2="8182.269" gradientTransform="matrix(.9998 0 0 -.9998 1.213 8180.705)"><stop offset="0" stop-color="#fff" stop-opacity="0"/><stop offset="1" stop-color="#fff" stop-opacity=".1"/></linearGradient><path fill-rule="evenodd" clip-rule="evenodd" fill="url(#a)" d="M428.3 221.9l-95-54-1.7-1.1-.1.1L49.2 6.6c-15.7-9-29.9-8.3-38.9-.2L8.8 7.7C3.2 13.7 0 23 0 35.1v429.7c0 12.1 3.2 21.4 9.1 27.2l-.2.2c8.9 9.5 23.7 10.6 40.4 1.3L331.5 333l.1.1s1.7-1.1 1.8-1.1l95-54c27.1-15.5 27.1-40.8-.1-56.1z"/><path opacity=".25" fill-rule="evenodd" clip-rule="evenodd" fill="#FFF" d="M49.2 9.4l379 215.3c12.3 6.9 19.2 16 20.3 25.3 0-10.1-6.7-20.3-20.3-28.1L49.2 6.6C22-9 0 4 0 35.1v2.8C0 6.8 22-5.9 49.2 9.4z"/><path fill="#40DCFF" d="M358.2 70.2H135.9V444l242.9-138V90.9c0-11.4-9.2-20.7-20.6-20.7z"/><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="7121.753" y1="-324.192" x2="7123.592" y2="-327.498" gradientTransform="matrix(38.316 0 0 -36.19 -272599.25 -11433.2)"><stop offset="0" stop-color="#5b7c8c" stop-opacity="0"/><stop offset="1" stop-color="#5b7c8c" stop-opacity=".4"/></linearGradient><path fill="url(#b)" d="M358.2 70.2H135.9v373.6l242.9-137.9v-215c0-11.4-9.2-20.7-20.6-20.7z"/><path fill="#009BF0" d="M135.9 70.2H70.3v411l65.6-37.2z"/><path opacity=".15" fill="#FFF" d="M358.2 70.2H70.3v2.3h287.9c11.4 0 20.7 6.9 20.7 18.3-.1-11.3-9.3-20.6-20.7-20.6z"/><path fill="#FAFAFA" d="M261.1 173.3l33.8-20.9 35 20.9V70.2h-68.8z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448.7 500"><path fill="#0B5E9F" d="M428.2 221.9 49.2 6.5C33-2.6 18.5-1.7 9.7 6.8 3.4 12.8 0 22.4 0 34.9v429.9C0 477.4 3.7 487 9.7 493c9.1 8.8 23.3 9.7 39.5.3l379.1-215.4c27.2-15.4 27.2-40.4-.1-56"/><linearGradient id="a" x1="223.168" x2="223.168" y1="7682.241" y2="8182.269" gradientTransform="matrix(.9998 0 0 -.9998 1.213 8180.705)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff" stop-opacity="0"/><stop offset="1" stop-color="#fff" stop-opacity=".1"/></linearGradient><path fill="url(#a)" fill-rule="evenodd" d="m428.3 221.9-95-54-1.7-1.1-.1.1L49.2 6.6c-15.7-9-29.9-8.3-38.9-.2L8.8 7.7C3.2 13.7 0 23 0 35.1v429.7c0 12.1 3.2 21.4 9.1 27.2l-.2.2c8.9 9.5 23.7 10.6 40.4 1.3L331.5 333l.1.1s1.7-1.1 1.8-1.1l95-54c27.1-15.5 27.1-40.8-.1-56.1" clip-rule="evenodd"/><path fill="#FFF" fill-rule="evenodd" d="m49.2 9.4 379 215.3c12.3 6.9 19.2 16 20.3 25.3 0-10.1-6.7-20.3-20.3-28.1L49.2 6.6C22-9 0 4 0 35.1v2.8C0 6.8 22-5.9 49.2 9.4" clip-rule="evenodd" opacity=".25"/><path fill="#40DCFF" d="M358.2 70.2H135.9V444l242.9-138V90.9c0-11.4-9.2-20.7-20.6-20.7"/><linearGradient id="b" x1="7121.753" x2="7123.592" y1="-324.192" y2="-327.498" gradientTransform="matrix(38.316 0 0 -36.19 -272599.25 -11433.2)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#5b7c8c" stop-opacity="0"/><stop offset="1" stop-color="#5b7c8c" stop-opacity=".4"/></linearGradient><path fill="url(#b)" d="M358.2 70.2H135.9v373.6l242.9-137.9v-215c0-11.4-9.2-20.7-20.6-20.7"/><path fill="#009BF0" d="M135.9 70.2H70.3v411l65.6-37.2z"/><path fill="#FFF" d="M358.2 70.2H70.3v2.3h287.9c11.4 0 20.7 6.9 20.7 18.3-.1-11.3-9.3-20.6-20.7-20.6" opacity=".15"/><path fill="#FAFAFA" d="m261.1 173.3 33.8-20.9 35 20.9V70.2h-68.8z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Google/Calendar/EventDescription.ts b/packages/nodes-base/nodes/Google/Calendar/EventDescription.ts
index 6383c04a0d44d..ee0d162b76aed 100644
--- a/packages/nodes-base/nodes/Google/Calendar/EventDescription.ts
+++ b/packages/nodes-base/nodes/Google/Calendar/EventDescription.ts
@@ -171,7 +171,7 @@ export const eventFields: INodeProperties[] = [
 					},
 				],
 				default: 'no',
-				description: 'Wheater the event is all day or not',
+				description: 'Whether the event is all day or not',
 			},
 			{
 				displayName: 'Attendees',
@@ -224,7 +224,7 @@ export const eventFields: INodeProperties[] = [
 						],
 					},
 				],
-				description: 'Creates a conference link (Hangouts, Meet etc) and attachs it to the event',
+				description: 'Creates a conference link (Hangouts, Meet etc) and attaches it to the event',
 			},
 			{
 				displayName: 'Description',
@@ -828,7 +828,7 @@ export const eventFields: INodeProperties[] = [
 					},
 				],
 				default: 'no',
-				description: 'Wheater the event is all day or not',
+				description: 'Whether the event is all day or not',
 			},
 			{
 				displayName: 'Attendees',
diff --git a/packages/nodes-base/nodes/Google/Calendar/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Calendar/GenericFunctions.ts
index 4b26b099e2f7b..819e67cd4665d 100644
--- a/packages/nodes-base/nodes/Google/Calendar/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Calendar/GenericFunctions.ts
@@ -1,30 +1,29 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
 	INodeListSearchItems,
 	INodeListSearchResult,
 	IPollFunctions,
+	IRequestOptions,
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import moment from 'moment-timezone';
+import { RRule } from 'rrule';
 
 export async function googleApiRequest(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IPollFunctions,
-	method: string,
+	this: IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
-
 	body: any = {},
 	qs: IDataObject = {},
 	uri?: string,
 	headers: IDataObject = {},
 ): Promise<any> {
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			'Content-Type': 'application/json',
 		},
@@ -51,7 +50,7 @@ export async function googleApiRequest(
 export async function googleApiRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: any = {},
@@ -129,3 +128,70 @@ export async function getTimezones(
 		);
 	return { results };
 }
+
+type RecurentEvent = {
+	start: {
+		dateTime: string;
+		timeZone: string;
+	};
+	end: {
+		dateTime: string;
+		timeZone: string;
+	};
+	recurrence: string[];
+	nextOccurrence?: {
+		start: {
+			dateTime: string;
+			timeZone: string;
+		};
+		end: {
+			dateTime: string;
+			timeZone: string;
+		};
+	};
+};
+
+export function addNextOccurrence(items: RecurentEvent[]) {
+	for (const item of items) {
+		if (item.recurrence) {
+			let eventRecurrence;
+			try {
+				eventRecurrence = item.recurrence.find((r) => r.toUpperCase().startsWith('RRULE'));
+				if (!eventRecurrence) continue;
+
+				const rrule = RRule.fromString(eventRecurrence);
+				const until = rrule.options?.until;
+
+				const now = new Date();
+				if (until && until < now) {
+					continue;
+				}
+
+				const nextOccurrence = rrule.after(new Date());
+
+				item.nextOccurrence = {
+					start: {
+						dateTime: moment(nextOccurrence).format(),
+						timeZone: item.start.timeZone,
+					},
+					end: {
+						dateTime: moment(nextOccurrence)
+							.add(moment(item.end.dateTime).diff(moment(item.start.dateTime)))
+							.format(),
+						timeZone: item.end.timeZone,
+					},
+				};
+			} catch (error) {
+				console.log(`Error adding next occurrence ${eventRecurrence}`);
+			}
+		}
+	}
+	return items;
+}
+
+const hasTimezone = (date: string) => date.endsWith('Z') || /\+\d{2}:\d{2}$/.test(date);
+
+export function addTimezoneToDate(date: string, timezone: string) {
+	if (hasTimezone(date)) return date;
+	return moment.tz(date, timezone).utc().format();
+}
diff --git a/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts b/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts
index 8fa0bd42a89e6..82d171973095c 100644
--- a/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts
+++ b/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts
@@ -10,7 +10,11 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
+import moment from 'moment-timezone';
+import { v4 as uuid } from 'uuid';
 import {
+	addNextOccurrence,
+	addTimezoneToDate,
 	encodeURIComponentOnce,
 	getCalendars,
 	getTimezones,
@@ -24,17 +28,13 @@ import { calendarFields, calendarOperations } from './CalendarDescription';
 
 import type { IEvent } from './EventInterface';
 
-import moment from 'moment-timezone';
-
-import { v4 as uuid } from 'uuid';
-
 export class GoogleCalendar implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Google Calendar',
 		name: 'googleCalendar',
 		icon: 'file:googleCalendar.svg',
 		group: ['input'],
-		version: 1,
+		version: [1, 1.1],
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
 		description: 'Consume Google Calendar API',
 		defaults: {
@@ -70,6 +70,13 @@ export class GoogleCalendar implements INodeType {
 			...calendarFields,
 			...eventOperations,
 			...eventFields,
+			{
+				displayName:
+					'This node will use the time zone set in n8n’s settings, but you can override this in the workflow settings',
+				name: 'useN8nTimeZone',
+				type: 'notice',
+				default: '',
+			},
 		],
 	};
 
@@ -128,9 +135,12 @@ export class GoogleCalendar implements INodeType {
 		const length = items.length;
 		const qs: IDataObject = {};
 		let responseData;
+
 		const resource = this.getNodeParameter('resource', 0);
 		const operation = this.getNodeParameter('operation', 0);
 		const timezone = this.getTimezone();
+		const nodeVersion = this.getNode().typeVersion;
+
 		for (let i = 0; i < length; i++) {
 			try {
 				if (resource === 'calendar') {
@@ -269,7 +279,7 @@ export class GoogleCalendar implements INodeType {
 							}
 						}
 
-						if (additionalFields.allday) {
+						if (additionalFields.allday === 'yes') {
 							body.start = {
 								date: timezone
 									? moment.tz(start, timezone).utc(true).format('YYYY-MM-DD')
@@ -281,6 +291,7 @@ export class GoogleCalendar implements INodeType {
 									: moment.tz(end, moment.tz.guess()).utc(true).format('YYYY-MM-DD'),
 							};
 						}
+
 						//exampel: RRULE:FREQ=WEEKLY;INTERVAL=2;COUNT=10;UNTIL=20110701T170000Z
 						//https://icalendar.org/iCalendar-RFC-5545/3-8-5-3-recurrence-rule.html
 						body.recurrence = [];
@@ -377,6 +388,10 @@ export class GoogleCalendar implements INodeType {
 							{},
 							qs,
 						);
+
+						if (responseData) {
+							responseData = addNextOccurrence([responseData]);
+						}
 					}
 					//https://developers.google.com/calendar/v3/reference/events/list
 					if (operation === 'getAll') {
@@ -410,16 +425,16 @@ export class GoogleCalendar implements INodeType {
 							qs.singleEvents = options.singleEvents as boolean;
 						}
 						if (options.timeMax) {
-							qs.timeMax = options.timeMax as string;
+							qs.timeMax = addTimezoneToDate(options.timeMax as string, tz || timezone);
 						}
 						if (options.timeMin) {
-							qs.timeMin = options.timeMin as string;
+							qs.timeMin = addTimezoneToDate(options.timeMin as string, tz || timezone);
 						}
 						if (tz) {
 							qs.timeZone = tz;
 						}
 						if (options.updatedMin) {
-							qs.updatedMin = options.updatedMin as string;
+							qs.updatedMin = addTimezoneToDate(options.updatedMin as string, tz || timezone);
 						}
 						if (returnAll) {
 							responseData = await googleApiRequestAllItems.call(
@@ -441,6 +456,10 @@ export class GoogleCalendar implements INodeType {
 							);
 							responseData = responseData.items;
 						}
+
+						if (responseData) {
+							responseData = addNextOccurrence(responseData);
+						}
 					}
 					//https://developers.google.com/calendar/v3/reference/events/patch
 					if (operation === 'update') {
@@ -450,7 +469,11 @@ export class GoogleCalendar implements INodeType {
 						const eventId = this.getNodeParameter('eventId', i) as string;
 						const useDefaultReminders = this.getNodeParameter('useDefaultReminders', i) as boolean;
 						const updateFields = this.getNodeParameter('updateFields', i);
-						const updateTimezone = updateFields.timezone as string;
+						let updateTimezone = updateFields.timezone as string;
+
+						if (nodeVersion > 1 && updateTimezone === undefined) {
+							updateTimezone = timezone;
+						}
 
 						if (updateFields.maxAttendees) {
 							qs.maxAttendees = updateFields.maxAttendees as number;
@@ -526,7 +549,8 @@ export class GoogleCalendar implements INodeType {
 								body.reminders.overrides = reminders;
 							}
 						}
-						if (updateFields.allday && updateFields.start && updateFields.end) {
+
+						if (updateFields.allday === 'yes' && updateFields.start && updateFields.end) {
 							body.start = {
 								date: updateTimezone
 									? moment.tz(updateFields.start, updateTimezone).utc(true).format('YYYY-MM-DD')
@@ -538,7 +562,7 @@ export class GoogleCalendar implements INodeType {
 									: moment.tz(updateFields.end, moment.tz.guess()).utc(true).format('YYYY-MM-DD'),
 							};
 						}
-						//exampel: RRULE:FREQ=WEEKLY;INTERVAL=2;COUNT=10;UNTIL=20110701T170000Z
+						//example: RRULE:FREQ=WEEKLY;INTERVAL=2;COUNT=10;UNTIL=20110701T170000Z
 						//https://icalendar.org/iCalendar-RFC-5545/3-8-5-3-recurrence-rule.html
 						body.recurrence = [];
 						if (updateFields.rrule) {
@@ -600,6 +624,6 @@ export class GoogleCalendar implements INodeType {
 				}
 			}
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Google/Calendar/GoogleCalendarTrigger.node.ts b/packages/nodes-base/nodes/Google/Calendar/GoogleCalendarTrigger.node.ts
index abea31f81581b..a79726cef5546 100644
--- a/packages/nodes-base/nodes/Google/Calendar/GoogleCalendarTrigger.node.ts
+++ b/packages/nodes-base/nodes/Google/Calendar/GoogleCalendarTrigger.node.ts
@@ -7,9 +7,14 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
-import { getCalendars, googleApiRequest, googleApiRequestAllItems } from './GenericFunctions';
+import moment from 'moment-timezone';
 
-import moment from 'moment';
+import {
+	encodeURIComponentOnce,
+	getCalendars,
+	googleApiRequest,
+	googleApiRequestAllItems,
+} from './GenericFunctions';
 
 export class GoogleCalendarTrigger implements INodeType {
 	description: INodeTypeDescription = {
@@ -81,6 +86,10 @@ export class GoogleCalendarTrigger implements INodeType {
 				required: true,
 				default: '',
 				options: [
+					{
+						name: 'Event Cancelled',
+						value: 'eventCancelled',
+					},
 					{
 						name: 'Event Created',
 						value: 'eventCreated',
@@ -128,7 +137,9 @@ export class GoogleCalendarTrigger implements INodeType {
 	async poll(this: IPollFunctions): Promise<INodeExecutionData[][] | null> {
 		const poolTimes = this.getNodeParameter('pollTimes.item', []) as IDataObject[];
 		const triggerOn = this.getNodeParameter('triggerOn', '') as string;
-		const calendarId = this.getNodeParameter('calendarId', '', { extractValue: true }) as string;
+		const calendarId = encodeURIComponentOnce(
+			this.getNodeParameter('calendarId', '', { extractValue: true }) as string,
+		);
 		const webhookData = this.getWorkflowStaticData('node');
 		const matchTerm = this.getNodeParameter('options.matchTerm', '') as string;
 
@@ -160,10 +171,15 @@ export class GoogleCalendarTrigger implements INodeType {
 
 		let events;
 
-		if (triggerOn === 'eventCreated' || triggerOn === 'eventUpdated') {
+		if (
+			triggerOn === 'eventCreated' ||
+			triggerOn === 'eventUpdated' ||
+			triggerOn === 'eventCancelled'
+		) {
 			Object.assign(qs, {
 				updatedMin: startDate,
 				orderBy: 'updated',
+				showDeleted: triggerOn === 'eventCancelled',
 			});
 		} else if (triggerOn === 'eventStarted' || triggerOn === 'eventEnded') {
 			Object.assign(qs, {
@@ -201,13 +217,16 @@ export class GoogleCalendarTrigger implements INodeType {
 				events = events.filter((event: { created: string }) =>
 					moment(event.created).isBetween(startDate, endDate),
 				);
-			} else if (triggerOn === 'eventUpdated') {
+			} else if (triggerOn === 'eventUpdated' || triggerOn === 'eventCancelled') {
 				events = events.filter(
 					(event: { created: string; updated: string }) =>
 						!moment(moment(event.created).format('YYYY-MM-DDTHH:mm:ss')).isSame(
 							moment(event.updated).format('YYYY-MM-DDTHH:mm:ss'),
 						),
 				);
+				if (triggerOn === 'eventCancelled') {
+					events = events.filter((event: { status: string }) => event.status === 'cancelled');
+				}
 			} else if (triggerOn === 'eventStarted') {
 				events = events.filter((event: { start: { dateTime: string } }) =>
 					moment(event.start.dateTime).isBetween(startDate, endDate, null, '[]'),
diff --git a/packages/nodes-base/nodes/Google/Calendar/googleCalendar.svg b/packages/nodes-base/nodes/Google/Calendar/googleCalendar.svg
index 8e8fa53a0914b..fe1e1676b208b 100644
--- a/packages/nodes-base/nodes/Google/Calendar/googleCalendar.svg
+++ b/packages/nodes-base/nodes/Google/Calendar/googleCalendar.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 81 82" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><g stroke="none" fill-rule="nonzero"><path d="M61.052 18.947H18.947v42.105h42.105V18.947z"/><path d="M61.053 80L80 61.053H61.053V80z" fill="#ea4335"/><path d="M80 18.947H61.053v42.105H80V18.947z" fill="#fbbc04"/><path d="M61.052 61.053H18.947V80h42.105V61.053z" fill="#34a853"/><path d="M0 61.053v12.632A6.314 6.314 0 006.316 80h12.632V61.053H0z" fill="#188038"/><path d="M80 18.947V6.316A6.314 6.314 0 0073.685 0H61.053v18.947H80z" fill="#1967d2"/><path d="M61.053 0H6.316A6.314 6.314 0 000 6.316v54.737h18.947V18.947h42.105V0zM27.584 51.611c-1.574-1.063-2.663-2.616-3.258-4.668l3.653-1.505c.332 1.263.911 2.242 1.737 2.937s1.821 1.037 2.989 1.037c1.195 0 2.221-.363 3.079-1.089s1.29-1.653 1.29-2.774a3.44 3.44 0 00-1.358-2.811c-.905-.727-2.042-1.089-3.4-1.089h-2.111v-3.616H32.1c1.168 0 2.153-.316 2.953-.947s1.2-1.495 1.2-2.595c0-.979-.358-1.758-1.074-2.342s-1.621-.879-2.721-.879c-1.074 0-1.926.284-2.558.858s-1.106 1.301-1.379 2.111l-3.616-1.505c.479-1.358 1.358-2.558 2.647-3.595s2.937-1.558 4.937-1.558c1.479 0 2.811.284 3.989.858s2.105 1.368 2.774 2.379 1 2.153 1 3.416c0 1.289-.311 2.379-.932 3.274s-1.384 1.579-2.289 2.058v.216a6.95 6.95 0 012.937 2.289c.763 1.026 1.147 2.253 1.147 3.684s-.363 2.711-1.089 3.832-1.732 2.005-3.005 2.647c-1.279.642-2.716.968-4.311.968-1.847.005-3.553-.526-5.126-1.589zm22.437-18.126l-4.01 2.9-2.005-3.042 7.195-5.189h2.758v24.479h-3.937V33.484z" fill="#4285f4"/></g></symbol></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round" viewBox="0 0 81 82"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><g fill-rule="nonzero" stroke="none"><path d="M61.052 18.947H18.947v42.105h42.105z"/><path fill="#ea4335" d="M61.053 80 80 61.053H61.053z"/><path fill="#fbbc04" d="M80 18.947H61.053v42.105H80z"/><path fill="#34a853" d="M61.052 61.053H18.947V80h42.105z"/><path fill="#188038" d="M0 61.053v12.632A6.314 6.314 0 0 0 6.316 80h12.632V61.053z"/><path fill="#1967d2" d="M80 18.947V6.316A6.314 6.314 0 0 0 73.685 0H61.053v18.947z"/><path fill="#4285f4" d="M61.053 0H6.316A6.314 6.314 0 0 0 0 6.316v54.737h18.947V18.947h42.105V0zM27.584 51.611c-1.574-1.063-2.663-2.616-3.258-4.668l3.653-1.505q.498 1.894 1.737 2.937c1.239 1.043 1.821 1.037 2.989 1.037q1.792 0 3.079-1.089c1.287-1.089 1.29-1.653 1.29-2.774a3.44 3.44 0 0 0-1.358-2.811c-.905-.727-2.042-1.089-3.4-1.089h-2.111v-3.616H32.1q1.752 0 2.953-.947c1.201-.947 1.2-1.495 1.2-2.595q0-1.467-1.074-2.342c-1.074-.875-1.621-.879-2.721-.879q-1.61-.002-2.558.858c-.948.86-1.106 1.301-1.379 2.111l-3.616-1.505c.479-1.358 1.358-2.558 2.647-3.595s2.937-1.558 4.937-1.558q2.22-.002 3.989.858c1.769.86 2.105 1.368 2.774 2.379s1 2.153 1 3.416q0 1.932-.932 3.274c-.932 1.342-1.384 1.579-2.289 2.058v.216a6.95 6.95 0 0 1 2.937 2.289q1.146 1.538 1.147 3.684c.001 2.146-.363 2.711-1.089 3.832s-1.732 2.005-3.005 2.647c-1.279.642-2.716.968-4.311.968-1.847.005-3.553-.526-5.126-1.589zm22.437-18.126-4.01 2.9-2.005-3.042 7.195-5.189h2.758v24.479h-3.937V33.484z"/></g></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Google/Calendar/test/GeneircFunctions.test.ts b/packages/nodes-base/nodes/Google/Calendar/test/GeneircFunctions.test.ts
new file mode 100644
index 0000000000000..1da9122e2ce0f
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Calendar/test/GeneircFunctions.test.ts
@@ -0,0 +1,20 @@
+import { addTimezoneToDate } from '../GenericFunctions';
+
+describe('addTimezoneToDate', () => {
+	it('should add timezone to date', () => {
+		const dateWithTimezone = '2021-09-01T12:00:00.000Z';
+		const result1 = addTimezoneToDate(dateWithTimezone, 'Europe/Prague');
+		expect(result1).toBe('2021-09-01T12:00:00.000Z');
+
+		const dateWithoutTimezone = '2021-09-01T12:00:00';
+		const result2 = addTimezoneToDate(dateWithoutTimezone, 'Europe/Prague');
+		expect(result2).toBe('2021-09-01T10:00:00Z');
+
+		const result3 = addTimezoneToDate(dateWithoutTimezone, 'Asia/Tokyo');
+		expect(result3).toBe('2021-09-01T03:00:00Z');
+
+		const dateWithDifferentTimezone = '2021-09-01T12:00:00.000+08:00';
+		const result4 = addTimezoneToDate(dateWithDifferentTimezone, 'Europe/Prague');
+		expect(result4).toBe('2021-09-01T12:00:00.000+08:00');
+	});
+});
diff --git a/packages/nodes-base/nodes/Google/Chat/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Chat/GenericFunctions.ts
index bd60ce1cc3dab..442ba4799d581 100644
--- a/packages/nodes-base/nodes/Google/Chat/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Chat/GenericFunctions.ts
@@ -1,83 +1,19 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
-	ICredentialTestFunctions,
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
 	INodeProperties,
+	IRequestOptions,
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
-
-import jwt from 'jsonwebtoken';
-
-interface IGoogleAuthCredentials {
-	delegatedEmail?: string;
-	email: string;
-	inpersonate: boolean;
-	privateKey: string;
-}
-
-export async function getAccessToken(
-	this:
-		| IExecuteFunctions
-		| IExecuteSingleFunctions
-		| ILoadOptionsFunctions
-		| ICredentialTestFunctions,
-	credentials: IGoogleAuthCredentials,
-): Promise<IDataObject> {
-	//https://developers.google.com/identity/protocols/oauth2/service-account#httprest
-
-	const scopes = ['https://www.googleapis.com/auth/chat.bot'];
-
-	const now = moment().unix();
-
-	credentials.email = credentials.email.trim();
-	const privateKey = credentials.privateKey.replace(/\\n/g, '\n').trim();
-
-	const signature = jwt.sign(
-		{
-			iss: credentials.email,
-			sub: credentials.delegatedEmail || credentials.email,
-			scope: scopes.join(' '),
-			aud: 'https://oauth2.googleapis.com/token',
-			iat: now,
-			exp: now + 3600,
-		},
-		privateKey,
-		{
-			algorithm: 'RS256',
-			header: {
-				kid: privateKey,
-				typ: 'JWT',
-				alg: 'RS256',
-			},
-		},
-	);
-
-	const options: OptionsWithUri = {
-		headers: {
-			'Content-Type': 'application/x-www-form-urlencoded',
-		},
-		method: 'POST',
-		form: {
-			grant_type: 'urn:ietf:params:oauth:grant-type:jwt-bearer',
-			assertion: signature,
-		},
-		uri: 'https://oauth2.googleapis.com/token',
-		json: true,
-	};
-
-	return this.helpers.request(options);
-}
+import { getGoogleAccessToken } from '../GenericFunctions';
 
 export async function googleApiRequest(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -86,7 +22,7 @@ export async function googleApiRequest(
 	noCredentials = false,
 	encoding?: null | undefined,
 ): Promise<any> {
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			'Content-Type': 'application/json',
 		},
@@ -112,10 +48,7 @@ export async function googleApiRequest(
 		} else {
 			const credentials = await this.getCredentials('googleApi');
 
-			const { access_token } = await getAccessToken.call(
-				this,
-				credentials as unknown as IGoogleAuthCredentials,
-			);
+			const { access_token } = await getGoogleAccessToken.call(this, credentials, 'chat');
 			options.headers!.Authorization = `Bearer ${access_token}`;
 			responseData = await this.helpers.request(options);
 		}
@@ -136,7 +69,7 @@ export async function googleApiRequest(
 export async function googleApiRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: any = {},
diff --git a/packages/nodes-base/nodes/Google/Chat/GoogleChat.node.ts b/packages/nodes-base/nodes/Google/Chat/GoogleChat.node.ts
index e2de5d2132d89..60b7781d2da1b 100644
--- a/packages/nodes-base/nodes/Google/Chat/GoogleChat.node.ts
+++ b/packages/nodes-base/nodes/Google/Chat/GoogleChat.node.ts
@@ -9,13 +9,14 @@ import type {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
+import moment from 'moment-timezone';
+import jwt from 'jsonwebtoken';
 import type { IMessage, IMessageUi } from './MessageInterface';
 
-import type { OptionsWithUri } from 'request';
-
 import {
 	// attachmentFields,
 	// attachmentOperations,
@@ -33,9 +34,6 @@ import {
 
 import { googleApiRequest, googleApiRequestAllItems, validateJSON } from './GenericFunctions';
 
-import moment from 'moment-timezone';
-
-import jwt from 'jsonwebtoken';
 export class GoogleChat implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Google Chat',
@@ -156,7 +154,7 @@ export class GoogleChat implements INodeType {
 						},
 					);
 
-					const options: OptionsWithUri = {
+					const options: IRequestOptions = {
 						headers: {
 							'Content-Type': 'application/x-www-form-urlencoded',
 						},
@@ -559,10 +557,10 @@ export class GoogleChat implements INodeType {
 
 		if (operation === 'download') {
 			// For file downloads the files get attached to the existing items
-			return this.prepareOutputData(items);
+			return [items];
 		} else {
 			// For all other ones does the output get replaced
-			return this.prepareOutputData(returnData);
+			return [returnData];
 		}
 	}
 }
diff --git a/packages/nodes-base/nodes/Google/Chat/descriptions/MediaDescription.ts b/packages/nodes-base/nodes/Google/Chat/descriptions/MediaDescription.ts
index 37131819aeb93..18fc055056ee8 100644
--- a/packages/nodes-base/nodes/Google/Chat/descriptions/MediaDescription.ts
+++ b/packages/nodes-base/nodes/Google/Chat/descriptions/MediaDescription.ts
@@ -42,7 +42,7 @@ export const mediaFields: INodeProperties[] = [
 		description: 'Name of the media that is being downloaded',
 	},
 	{
-		displayName: 'Binary Property',
+		displayName: 'Put Output File in Field',
 		name: 'binaryPropertyName',
 		type: 'string',
 		default: 'data',
@@ -53,6 +53,6 @@ export const mediaFields: INodeProperties[] = [
 				operation: ['download'],
 			},
 		},
-		description: 'Name of the binary property to which to write the data of the read file',
+		hint: 'The name of the output binary field to put the file in',
 	},
 ];
diff --git a/packages/nodes-base/nodes/Google/Chat/googleChat.svg b/packages/nodes-base/nodes/Google/Chat/googleChat.svg
index 9799f878d6cf3..1646e75d0ac73 100644
--- a/packages/nodes-base/nodes/Google/Chat/googleChat.svg
+++ b/packages/nodes-base/nodes/Google/Chat/googleChat.svg
@@ -1 +1 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 479.4 499.98"><defs><style>.cls-1{fill:#00ac47;}.cls-2{fill:#5bb974;}.cls-3{fill:#00832d;}</style></defs><title>google-chat</title><path class="cls-1" d="M121.24,275.69V113.19h-71a37.86,37.86,0,0,0-37.8,37.9V487c0,16.9,20.4,25.3,32.3,13.4l78.1-78.1h222.4a37.77,37.77,0,0,0,37.8-37.8v-71H159.14A37.86,37.86,0,0,1,121.24,275.69Z" transform="translate(-12.44 -5.99)"/><path class="cls-2" d="M454,6H159.14a37.77,37.77,0,0,0-37.8,37.8v69.4h223.9A37.77,37.77,0,0,1,383,151v162.4h71a37.77,37.77,0,0,0,37.8-37.8V43.79A37.77,37.77,0,0,0,454,6Z" transform="translate(-12.44 -5.99)"/><path class="cls-3" d="M345.24,113.19h-224v162.4a37.77,37.77,0,0,0,37.8,37.8h223.9V151.09A37.71,37.71,0,0,0,345.24,113.19Z" transform="translate(-12.44 -5.99)"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" data-name="Layer 1" viewBox="0 0 479.4 499.98"><path d="M121.24 275.69v-162.5h-71a37.86 37.86 0 0 0-37.8 37.9V487c0 16.9 20.4 25.3 32.3 13.4l78.1-78.1h222.4a37.77 37.77 0 0 0 37.8-37.8v-71h-223.9a37.86 37.86 0 0 1-37.9-37.81" style="fill:#00ac47" transform="translate(-12.44 -5.99)"/><path d="M454 6H159.14a37.77 37.77 0 0 0-37.8 37.8v69.4h223.9A37.77 37.77 0 0 1 383 151v162.4h71a37.77 37.77 0 0 0 37.8-37.8V43.79A37.77 37.77 0 0 0 454 6" style="fill:#5bb974" transform="translate(-12.44 -5.99)"/><path d="M345.24 113.19h-224v162.4a37.77 37.77 0 0 0 37.8 37.8h223.9v-162.3a37.71 37.71 0 0 0-37.7-37.9" style="fill:#00832d" transform="translate(-12.44 -5.99)"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Google/CloudNaturalLanguage/GenericFunctions.ts b/packages/nodes-base/nodes/Google/CloudNaturalLanguage/GenericFunctions.ts
index 3430912a0e999..58cb39c8b0b08 100644
--- a/packages/nodes-base/nodes/Google/CloudNaturalLanguage/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/CloudNaturalLanguage/GenericFunctions.ts
@@ -1,17 +1,16 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
+	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
-	IDataObject,
+	IRequestOptions,
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function googleApiRequest(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: any = {},
@@ -19,7 +18,7 @@ export async function googleApiRequest(
 	uri?: string,
 	option: IDataObject = {},
 ): Promise<any> {
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		headers: {
 			Accept: 'application/json',
 			'Content-Type': 'application/json',
diff --git a/packages/nodes-base/nodes/Google/CloudStorage/ObjectDescription.ts b/packages/nodes-base/nodes/Google/CloudStorage/ObjectDescription.ts
index afede1685115e..a4378515b96c0 100644
--- a/packages/nodes-base/nodes/Google/CloudStorage/ObjectDescription.ts
+++ b/packages/nodes-base/nodes/Google/CloudStorage/ObjectDescription.ts
@@ -1,5 +1,11 @@
+import type { Readable } from 'stream';
 import FormData from 'form-data';
-import type { IDataObject, INodeExecutionData, INodeProperties } from 'n8n-workflow';
+import {
+	BINARY_ENCODING,
+	type IDataObject,
+	type INodeExecutionData,
+	type INodeProperties,
+} from 'n8n-workflow';
 
 // Define these because we'll be using them in two separate places
 const metagenerationFilters: INodeProperties[] = [
@@ -144,33 +150,40 @@ export const objectOperations: INodeProperties[] = [
 								});
 
 								// Determine content and content type
-								let content: string | Buffer;
+								let content: string | Buffer | Readable;
 								let contentType: string;
+								let contentLength: number;
 								if (useBinary) {
 									const binaryPropertyName = this.getNodeParameter(
 										'createBinaryPropertyName',
 									) as string;
 
 									const binaryData = this.helpers.assertBinaryData(binaryPropertyName);
-
-									// Decode from base64 for upload
-									content = Buffer.from(binaryData.data, 'base64');
-									contentType = binaryData.mimeType;
+									if (binaryData.id) {
+										content = await this.helpers.getBinaryStream(binaryData.id);
+										const binaryMetadata = await this.helpers.getBinaryMetadata(binaryData.id);
+										contentType = binaryMetadata.mimeType ?? 'application/octet-stream';
+										contentLength = binaryMetadata.fileSize;
+									} else {
+										content = Buffer.from(binaryData.data, BINARY_ENCODING);
+										contentType = binaryData.mimeType;
+										contentLength = content.length;
+									}
 								} else {
 									content = this.getNodeParameter('createContent') as string;
 									contentType = 'text/plain';
+									contentLength = content.length;
 								}
-								body.append('file', content, { contentType });
+								body.append('file', content, { contentType, knownLength: contentLength });
 
 								// Set the headers
 								if (!requestOptions.headers) requestOptions.headers = {};
 								requestOptions.headers['Content-Length'] = body.getLengthSync();
-								requestOptions.headers[
-									'Content-Type'
-								] = `multipart/related; boundary=${body.getBoundary()}`;
+								requestOptions.headers['Content-Type'] =
+									`multipart/related; boundary=${body.getBoundary()}`;
 
 								// Return the request data
-								requestOptions.body = body.getBuffer();
+								requestOptions.body = body;
 								return requestOptions;
 							},
 						],
@@ -483,7 +496,7 @@ export const objectFields: INodeProperties[] = [
 		},
 	},
 	{
-		displayName: 'Use Binary Property',
+		displayName: 'Use Input Binary Field',
 		name: 'createFromBinary',
 		type: 'boolean',
 		displayOptions: {
@@ -497,9 +510,10 @@ export const objectFields: INodeProperties[] = [
 		description: 'Whether the data for creating a file should come from a binary field',
 	},
 	{
-		displayName: 'Binary Property',
+		displayName: 'Input Binary Field',
 		name: 'createBinaryPropertyName',
 		type: 'string',
+		hint: 'The name of the input binary field containing the file to be written',
 		displayOptions: {
 			show: {
 				resource: ['object'],
@@ -524,9 +538,10 @@ export const objectFields: INodeProperties[] = [
 		description: 'Content of the file to be uploaded',
 	},
 	{
-		displayName: 'Binary Property',
+		displayName: 'Put Output File in Field',
 		name: 'binaryPropertyName',
 		type: 'string',
+		hint: 'The name of the output binary field to put the file in',
 		displayOptions: {
 			show: {
 				resource: ['object'],
diff --git a/packages/nodes-base/nodes/Google/CloudStorage/googleCloudStorage.svg b/packages/nodes-base/nodes/Google/CloudStorage/googleCloudStorage.svg
index 59db35d960aca..8ffb8af355bd7 100644
--- a/packages/nodes-base/nodes/Google/CloudStorage/googleCloudStorage.svg
+++ b/packages/nodes-base/nodes/Google/CloudStorage/googleCloudStorage.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24px" height="24px" viewBox="0 0 24 24"><defs><style>.cls-1{fill:#aecbfa;}.cls-2{fill:#669df6;}.cls-3{fill:#4285f4;}.cls-4{fill:#fff;}</style></defs><title>Icon_24px_CloudStorage_Color</title><g data-name="Product Icons"><rect class="cls-1" x="2" y="4" width="20" height="7"/><rect class="cls-2" x="20" y="4" width="2" height="7"/><polygon class="cls-3" points="22 4 20 4 20 11 22 4"/><rect class="cls-2" x="2" y="4" width="2" height="7"/><rect class="cls-4" x="6" y="7" width="6" height="1"/><rect class="cls-4" x="15" y="6" width="3" height="3" rx="1.5"/><rect class="cls-1" x="2" y="13" width="20" height="7"/><rect class="cls-2" x="20" y="13" width="2" height="7"/><polygon class="cls-3" points="22 13 20 13 20 20 22 13"/><rect class="cls-2" x="2" y="13" width="2" height="7"/><rect class="cls-4" x="6" y="16" width="6" height="1"/><rect class="cls-4" x="15" y="15" width="3" height="3" rx="1.5"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24"><defs><style>.cls-1{fill:#aecbfa}.cls-2{fill:#669df6}.cls-3{fill:#4285f4}.cls-4{fill:#fff}</style></defs><g data-name="Product Icons"><path d="M2 4h20v7H2z" class="cls-1"/><path d="M20 4h2v7h-2z" class="cls-2"/><path d="M22 4h-2v7z" class="cls-3"/><path d="M2 4h2v7H2z" class="cls-2"/><path d="M6 7h6v1H6z" class="cls-4"/><rect width="3" height="3" x="15" y="6" class="cls-4" rx="1.5"/><path d="M2 13h20v7H2z" class="cls-1"/><path d="M20 13h2v7h-2z" class="cls-2"/><path d="M22 13h-2v7z" class="cls-3"/><path d="M2 13h2v7H2z" class="cls-2"/><path d="M6 16h6v1H6z" class="cls-4"/><rect width="3" height="3" x="15" y="15" class="cls-4" rx="1.5"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Google/Contacts/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Contacts/GenericFunctions.ts
index 55cc5c75a3cdb..6c07a1a0daedb 100644
--- a/packages/nodes-base/nodes/Google/Contacts/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Contacts/GenericFunctions.ts
@@ -1,17 +1,16 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
+	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
-	IDataObject,
+	IRequestOptions,
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function googleApiRequest(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -19,7 +18,7 @@ export async function googleApiRequest(
 	uri?: string,
 	headers: IDataObject = {},
 ): Promise<any> {
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			'Content-Type': 'application/json',
 		},
@@ -47,7 +46,7 @@ export async function googleApiRequest(
 export async function googleApiRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: any = {},
diff --git a/packages/nodes-base/nodes/Google/Contacts/GoogleContacts.node.ts b/packages/nodes-base/nodes/Google/Contacts/GoogleContacts.node.ts
index 4db3e7f6b25ab..098f991042961 100644
--- a/packages/nodes-base/nodes/Google/Contacts/GoogleContacts.node.ts
+++ b/packages/nodes-base/nodes/Google/Contacts/GoogleContacts.node.ts
@@ -8,6 +8,7 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
+import moment from 'moment-timezone';
 import {
 	allFields,
 	cleanData,
@@ -17,8 +18,6 @@ import {
 
 import { contactFields, contactOperations } from './ContactDescription';
 
-import moment from 'moment';
-
 export class GoogleContacts implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Google Contacts',
@@ -521,6 +520,6 @@ export class GoogleContacts implements INodeType {
 			}
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Google/Docs/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Docs/GenericFunctions.ts
index a082254e73519..02183796d3d2a 100644
--- a/packages/nodes-base/nodes/Google/Docs/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Docs/GenericFunctions.ts
@@ -1,80 +1,18 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
+	IDataObject,
 	IExecuteFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
-	IDataObject,
+	IRequestOptions,
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
-
-import jwt from 'jsonwebtoken';
-
-interface IGoogleAuthCredentials {
-	delegatedEmail?: string;
-	email: string;
-	inpersonate: boolean;
-	privateKey: string;
-}
-
-async function getAccessToken(
-	this: IExecuteFunctions | ILoadOptionsFunctions,
-	credentials: IGoogleAuthCredentials,
-): Promise<IDataObject> {
-	//https://developers.google.com/identity/protocols/oauth2/service-account#httprest
-
-	const scopes = [
-		'https://www.googleapis.com/auth/documents',
-		'https://www.googleapis.com/auth/drive',
-		'https://www.googleapis.com/auth/drive.file',
-	];
-
-	const now = moment().unix();
-
-	credentials.email = credentials.email.trim();
-	const privateKey = credentials.privateKey.replace(/\\n/g, '\n').trim();
-
-	const signature = jwt.sign(
-		{
-			iss: credentials.email,
-			sub: credentials.delegatedEmail || credentials.email,
-			scope: scopes.join(' '),
-			aud: 'https://oauth2.googleapis.com/token',
-			iat: now,
-			exp: now + 3600,
-		},
-		privateKey,
-		{
-			algorithm: 'RS256',
-			header: {
-				kid: privateKey,
-				typ: 'JWT',
-				alg: 'RS256',
-			},
-		},
-	);
-
-	const options: OptionsWithUri = {
-		headers: {
-			'Content-Type': 'application/x-www-form-urlencoded',
-		},
-		method: 'POST',
-		form: {
-			grant_type: 'urn:ietf:params:oauth:grant-type:jwt-bearer',
-			assertion: signature,
-		},
-		uri: 'https://oauth2.googleapis.com/token',
-		json: true,
-	};
-
-	return this.helpers.request(options);
-}
+import { getGoogleAccessToken } from '../GenericFunctions';
 
 export async function googleApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject = {},
 	qs?: IDataObject,
@@ -86,7 +24,7 @@ export async function googleApiRequest(
 		'serviceAccount',
 	) as string;
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			'Content-Type': 'application/json',
 		},
@@ -104,10 +42,7 @@ export async function googleApiRequest(
 		if (authenticationMethod === 'serviceAccount') {
 			const credentials = await this.getCredentials('googleApi');
 
-			const { access_token } = await getAccessToken.call(
-				this,
-				credentials as unknown as IGoogleAuthCredentials,
-			);
+			const { access_token } = await getGoogleAccessToken.call(this, credentials, 'docs');
 
 			options.headers!.Authorization = `Bearer ${access_token}`;
 			return await this.helpers.request(options);
@@ -122,7 +57,7 @@ export async function googleApiRequest(
 export async function googleApiRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject = {},
 	qs?: IDataObject,
diff --git a/packages/nodes-base/nodes/Google/Docs/GoogleDocs.node.ts b/packages/nodes-base/nodes/Google/Docs/GoogleDocs.node.ts
index 8ac6c6dc99f58..29dd2763cacc3 100644
--- a/packages/nodes-base/nodes/Google/Docs/GoogleDocs.node.ts
+++ b/packages/nodes-base/nodes/Google/Docs/GoogleDocs.node.ts
@@ -528,6 +528,6 @@ export class GoogleDocs implements INodeType {
 			returnData.push(...executionData);
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Google/Docs/googleDocs.svg b/packages/nodes-base/nodes/Google/Docs/googleDocs.svg
index c35f74f7cc040..ec052c8e13d0e 100644
--- a/packages/nodes-base/nodes/Google/Docs/googleDocs.svg
+++ b/packages/nodes-base/nodes/Google/Docs/googleDocs.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="-18 0 90 80" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#A" x=".5" y=".5"/><symbol id="A" overflow="visible"><g stroke="none"><path fill="#548df6" d="M36 0l22 22v53a4.99 4.99 0 0 1-5 5H5a4.99 4.99 0 0 1-5-5V5a4.99 4.99 0 0 1 5-5z"/><path d="M14 40h30v3H14zm0 7h30v3H14zm0 8h30v3H14zm0 7h21v3H14z"/><path fill="#abd0fb" d="M36 0l22 22H41c-2.77 0-5-2.48-5-5.25z"/><path fill="#3e5bb9" d="M40.75 22L58 29.125V22z"/></g></symbol></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round" viewBox="-18 0 90 80"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><g stroke="none"><path fill="#548df6" d="m36 0 22 22v53a4.99 4.99 0 0 1-5 5H5a4.99 4.99 0 0 1-5-5V5a4.99 4.99 0 0 1 5-5z"/><path d="M14 40h30v3H14zm0 7h30v3H14zm0 8h30v3H14zm0 7h21v3H14z"/><path fill="#abd0fb" d="m36 0 22 22H41c-2.77 0-5-2.48-5-5.25z"/><path fill="#3e5bb9" d="M40.75 22 58 29.125V22z"/></g></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Google/Docs/interfaces.d.ts b/packages/nodes-base/nodes/Google/Docs/interfaces.ts
similarity index 100%
rename from packages/nodes-base/nodes/Google/Docs/interfaces.d.ts
rename to packages/nodes-base/nodes/Google/Docs/interfaces.ts
diff --git a/packages/nodes-base/nodes/Google/Drive/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Drive/GenericFunctions.ts
deleted file mode 100644
index 4daee7ee9fc86..0000000000000
--- a/packages/nodes-base/nodes/Google/Drive/GenericFunctions.ts
+++ /dev/null
@@ -1,168 +0,0 @@
-import type { OptionsWithUri } from 'request';
-
-import type {
-	IExecuteFunctions,
-	IExecuteSingleFunctions,
-	ILoadOptionsFunctions,
-	IDataObject,
-	IPollFunctions,
-	JsonObject,
-} from 'n8n-workflow';
-import { NodeApiError } from 'n8n-workflow';
-
-import moment from 'moment-timezone';
-
-import jwt from 'jsonwebtoken';
-
-interface IGoogleAuthCredentials {
-	delegatedEmail?: string;
-	email: string;
-	inpersonate: boolean;
-	privateKey: string;
-}
-
-async function getAccessToken(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IPollFunctions,
-	credentials: IGoogleAuthCredentials,
-): Promise<IDataObject> {
-	//https://developers.google.com/identity/protocols/oauth2/service-account#httprest
-
-	const scopes = [
-		'https://www.googleapis.com/auth/drive',
-		'https://www.googleapis.com/auth/drive.appdata',
-		'https://www.googleapis.com/auth/drive.photos.readonly',
-	];
-
-	const now = moment().unix();
-
-	credentials.email = credentials.email.trim();
-	const privateKey = credentials.privateKey.replace(/\\n/g, '\n').trim();
-
-	const signature = jwt.sign(
-		{
-			iss: credentials.email,
-			sub: credentials.delegatedEmail || credentials.email,
-			scope: scopes.join(' '),
-			aud: 'https://oauth2.googleapis.com/token',
-			iat: now,
-			exp: now + 3600,
-		},
-		privateKey,
-		{
-			algorithm: 'RS256',
-			header: {
-				kid: privateKey,
-				typ: 'JWT',
-				alg: 'RS256',
-			},
-		},
-	);
-
-	const options: OptionsWithUri = {
-		headers: {
-			'Content-Type': 'application/x-www-form-urlencoded',
-		},
-		method: 'POST',
-		form: {
-			grant_type: 'urn:ietf:params:oauth:grant-type:jwt-bearer',
-			assertion: signature,
-		},
-		uri: 'https://oauth2.googleapis.com/token',
-		json: true,
-	};
-
-	return this.helpers.request(options);
-}
-
-export async function googleApiRequest(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IPollFunctions,
-	method: string,
-	resource: string,
-
-	body: any = {},
-	qs: IDataObject = {},
-	uri?: string,
-	option: IDataObject = {},
-): Promise<any> {
-	const authenticationMethod = this.getNodeParameter(
-		'authentication',
-		0,
-		'serviceAccount',
-	) as string;
-
-	let options: OptionsWithUri = {
-		headers: {
-			'Content-Type': 'application/json',
-		},
-		method,
-		body,
-		qs,
-		uri: uri || `https://www.googleapis.com${resource}`,
-		json: true,
-	};
-
-	options = Object.assign({}, options, option);
-
-	try {
-		if (Object.keys(body as IDataObject).length === 0) {
-			delete options.body;
-		}
-
-		if (authenticationMethod === 'serviceAccount') {
-			const credentials = await this.getCredentials('googleApi');
-
-			const { access_token } = await getAccessToken.call(
-				this,
-				credentials as unknown as IGoogleAuthCredentials,
-			);
-
-			options.headers!.Authorization = `Bearer ${access_token}`;
-			return await this.helpers.request(options);
-		} else {
-			return await this.helpers.requestOAuth2.call(this, 'googleDriveOAuth2Api', options);
-		}
-	} catch (error) {
-		if (error.code === 'ERR_OSSL_PEM_NO_START_LINE') {
-			error.statusCode = '401';
-		}
-
-		throw new NodeApiError(this.getNode(), error as JsonObject);
-	}
-}
-
-export async function googleApiRequestAllItems(
-	this: IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions,
-	propertyName: string,
-	method: string,
-	endpoint: string,
-
-	body: any = {},
-	query: IDataObject = {},
-): Promise<any> {
-	const returnData: IDataObject[] = [];
-
-	let responseData;
-	query.maxResults = query.maxResults || 100;
-	query.pageSize = query.pageSize || 100;
-
-	do {
-		responseData = await googleApiRequest.call(this, method, endpoint, body, query);
-		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
-	} while (responseData.nextPageToken !== undefined && responseData.nextPageToken !== '');
-
-	return returnData;
-}
-
-export function extractId(url: string): string {
-	if (url.includes('/d/')) {
-		//https://docs.google.com/document/d/1TUJGUf5HUv9e6MJBzcOsPruxXDeGMnGYTBWfkMagcg4/edit
-		const data = url.match(/[-\w]{25,}/);
-		if (Array.isArray(data)) {
-			return data[0];
-		}
-	} else if (url.includes('/folders/')) {
-		//https://drive.google.com/drive/u/0/folders/19MqnruIXju5sAWYD3J71im1d2CBJkZzy
-		return url.split('/folders/')[1];
-	}
-	return url;
-}
diff --git a/packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.ts b/packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.ts
index f51d1461a685d..ed2dde9c548bc 100644
--- a/packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.ts
+++ b/packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.ts
@@ -1,2738 +1,27 @@
-import type {
-	IDataObject,
-	IExecuteFunctions,
-	INodeExecutionData,
-	INodeType,
-	INodeTypeDescription,
-} from 'n8n-workflow';
-import { BINARY_ENCODING } from 'n8n-workflow';
-
-import { googleApiRequest, googleApiRequestAllItems } from './GenericFunctions';
-
-import { v4 as uuid } from 'uuid';
-import type { Readable } from 'stream';
-import { driveSearch, fileSearch, folderSearch } from './SearchFunctions';
-
-const UPLOAD_CHUNK_SIZE = 256 * 1024;
-
-export class GoogleDrive implements INodeType {
-	description: INodeTypeDescription = {
-		displayName: 'Google Drive',
-		name: 'googleDrive',
-		icon: 'file:googleDrive.svg',
-		group: ['input'],
-		version: [1, 2],
-		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Access data on Google Drive',
-		defaults: {
-			name: 'Google Drive',
-		},
-		inputs: ['main'],
-		outputs: ['main'],
-		credentials: [
-			{
-				name: 'googleApi',
-				required: true,
-				displayOptions: {
-					show: {
-						authentication: ['serviceAccount'],
-					},
-				},
-			},
-			{
-				name: 'googleDriveOAuth2Api',
-				required: true,
-				displayOptions: {
-					show: {
-						authentication: ['oAuth2'],
-					},
-				},
-			},
-		],
-		properties: [
-			{
-				displayName: 'Authentication',
-				name: 'authentication',
-				type: 'options',
-				options: [
-					{
-						name: 'Service Account',
-						value: 'serviceAccount',
-					},
-					{
-						name: 'OAuth2',
-						value: 'oAuth2',
-					},
-				],
-				default: 'serviceAccount',
-				displayOptions: {
-					show: {
-						'@version': [1],
-					},
-				},
-			},
-			{
-				displayName: 'Authentication',
-				name: 'authentication',
-				type: 'options',
-				options: [
-					{
-						// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
-						name: 'OAuth2 (recommended)',
-						value: 'oAuth2',
-					},
-					{
-						name: 'Service Account',
-						value: 'serviceAccount',
-					},
-				],
-				default: 'oAuth2',
-				displayOptions: {
-					show: {
-						'@version': [2],
-					},
-				},
-			},
-			{
-				displayName: 'Resource',
-				name: 'resource',
-				type: 'options',
-				noDataExpression: true,
-				options: [
-					{
-						name: 'Drive',
-						value: 'drive',
-					},
-					{
-						name: 'File',
-						value: 'file',
-					},
-					{
-						name: 'Folder',
-						value: 'folder',
-					},
-				],
-				default: 'file',
-			},
-
-			// ----------------------------------
-			//         operations
-			// ----------------------------------
-			{
-				displayName: 'Operation',
-				name: 'operation',
-				type: 'options',
-				noDataExpression: true,
-				displayOptions: {
-					show: {
-						resource: ['file'],
-					},
-				},
-				options: [
-					{
-						name: 'Copy',
-						value: 'copy',
-						description: 'Copy a file',
-						action: 'Copy a file',
-					},
-					{
-						name: 'Delete',
-						value: 'delete',
-						description: 'Delete a file',
-						action: 'Delete a file',
-					},
-					{
-						name: 'Download',
-						value: 'download',
-						description: 'Download a file',
-						action: 'Download a file',
-					},
-					{
-						name: 'List',
-						value: 'list',
-						description: 'List files and folders',
-						action: 'List a file',
-					},
-					{
-						name: 'Share',
-						value: 'share',
-						description: 'Share a file',
-						action: 'Share a file',
-					},
-					{
-						name: 'Update',
-						value: 'update',
-						description: 'Update a file',
-						action: 'Update a file',
-					},
-					{
-						name: 'Upload',
-						value: 'upload',
-						description: 'Upload a file',
-						action: 'Upload a file',
-					},
-				],
-				default: 'upload',
-			},
-
-			{
-				displayName: 'Operation',
-				name: 'operation',
-				type: 'options',
-				noDataExpression: true,
-				displayOptions: {
-					show: {
-						resource: ['folder'],
-					},
-				},
-				options: [
-					{
-						name: 'Create',
-						value: 'create',
-						description: 'Create a folder',
-						action: 'Create a folder',
-					},
-					{
-						name: 'Delete',
-						value: 'delete',
-						description: 'Delete a folder',
-						action: 'Delete a folder',
-					},
-					{
-						name: 'Share',
-						value: 'share',
-						description: 'Share a folder',
-						action: 'Share a folder',
-					},
-				],
-				default: 'create',
-			},
-
-			// ----------------------------------
-			//         file
-			// ----------------------------------
-
-			{
-				displayName: 'File',
-				name: 'fileId',
-				type: 'resourceLocator',
-				default: { mode: 'list', value: '' },
-				required: true,
-				modes: [
-					{
-						displayName: 'File',
-						name: 'list',
-						type: 'list',
-						placeholder: 'Select a file...',
-						typeOptions: {
-							searchListMethod: 'fileSearch',
-							searchable: true,
-						},
-					},
-					{
-						displayName: 'Link',
-						name: 'url',
-						type: 'string',
-						placeholder:
-							'https://drive.google.com/file/d/1anGBg0b5re2VtF2bKu201_a-Vnz5BHq9Y4r-yBDAj5A/edit',
-						extractValue: {
-							type: 'regex',
-							regex:
-								'https:\\/\\/(?:drive|docs)\\.google\\.com\\/\\w+\\/d\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)',
-						},
-						validation: [
-							{
-								type: 'regex',
-								properties: {
-									regex:
-										'https:\\/\\/(?:drive|docs)\\.google.com\\/\\w+\\/d\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)',
-									errorMessage: 'Not a valid Google Drive File URL',
-								},
-							},
-						],
-					},
-					{
-						displayName: 'ID',
-						name: 'id',
-						type: 'string',
-						placeholder: '1anGBg0b5re2VtF2bKu201_a-Vnz5BHq9Y4r-yBDAj5A',
-						validation: [
-							{
-								type: 'regex',
-								properties: {
-									regex: '[a-zA-Z0-9\\-_]{2,}',
-									errorMessage: 'Not a valid Google Drive File ID',
-								},
-							},
-						],
-						url: '=https://drive.google.com/file/d/{{$value}}/view',
-					},
-				],
-				displayOptions: {
-					show: {
-						operation: ['download', 'copy', 'update', 'delete', 'share'],
-						resource: ['file'],
-					},
-				},
-				description: 'The ID of the file',
-			},
-
-			{
-				displayName: 'Folder',
-				name: 'fileId',
-				type: 'resourceLocator',
-				default: { mode: 'list', value: '' },
-				required: true,
-				modes: [
-					{
-						displayName: 'Folder',
-						name: 'list',
-						type: 'list',
-						placeholder: 'Select a folder...',
-						typeOptions: {
-							searchListMethod: 'folderSearch',
-							searchable: true,
-						},
-					},
-					{
-						displayName: 'Link',
-						name: 'url',
-						type: 'string',
-						placeholder: 'https://drive.google.com/drive/folders/1Tx9WHbA3wBpPB4C_HcoZDH9WZFWYxAMU',
-						extractValue: {
-							type: 'regex',
-							regex:
-								'https:\\/\\/drive\\.google\\.com\\/\\w+\\/folders\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)',
-						},
-						validation: [
-							{
-								type: 'regex',
-								properties: {
-									regex:
-										'https:\\/\\/drive\\.google\\.com\\/\\w+\\/folders\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)',
-									errorMessage: 'Not a valid Google Drive Folder URL',
-								},
-							},
-						],
-					},
-					{
-						displayName: 'ID',
-						name: 'id',
-						type: 'string',
-						placeholder: '1anGBg0b5re2VtF2bKu201_a-Vnz5BHq9Y4r-yBDAj5A',
-						validation: [
-							{
-								type: 'regex',
-								properties: {
-									regex: '[a-zA-Z0-9\\-_]{2,}',
-									errorMessage: 'Not a valid Google Drive Folder ID',
-								},
-							},
-						],
-						url: '=https://drive.google.com/drive/folders/{{$value}}',
-					},
-				],
-				displayOptions: {
-					show: {
-						operation: ['delete', 'share'],
-						resource: ['folder'],
-					},
-				},
-				description: 'The ID of the folder',
-			},
-
-			// ----------------------------------
-			//         file:copy
-			// ----------------------------------
-
-			// ----------------------------------
-			//         file/folder:delete
-			// ----------------------------------
-
-			// ----------------------------------
-			//         file:download
-			// ----------------------------------
-			{
-				displayName: 'Binary Property',
-				name: 'binaryPropertyName',
-				type: 'string',
-				required: true,
-				default: 'data',
-				displayOptions: {
-					show: {
-						operation: ['download'],
-						resource: ['file'],
-					},
-				},
-				description: 'Name of the binary property to which to write the data of the read file',
-			},
-			{
-				displayName: 'Options',
-				name: 'options',
-				type: 'collection',
-				placeholder: 'Add Option',
-				default: {},
-				displayOptions: {
-					show: {
-						operation: ['download'],
-						resource: ['file'],
-					},
-				},
-				options: [
-					{
-						displayName: 'Google File Conversion',
-						name: 'googleFileConversion',
-						type: 'fixedCollection',
-						typeOptions: {
-							multipleValues: false,
-						},
-						default: {},
-						placeholder: 'Add Conversion',
-						options: [
-							{
-								displayName: 'Conversion',
-								name: 'conversion',
-								values: [
-									{
-										displayName: 'Google Docs',
-										name: 'docsToFormat',
-										type: 'options',
-										options: [
-											{
-												name: 'To HTML',
-												value: 'text/html',
-											},
-											{
-												name: 'To MS Word',
-												value:
-													'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-											},
-											{
-												name: 'To OpenOffice Doc',
-												value: 'application/vnd.oasis.opendocument.text',
-											},
-											{
-												name: 'To PDF',
-												value: 'application/pdf',
-											},
-											{
-												name: 'To Rich Text',
-												value: 'application/rtf',
-											},
-										],
-										default:
-											'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-										description: 'Format used to export when downloading Google Docs files',
-									},
-									{
-										displayName: 'Google Drawings',
-										name: 'drawingsToFormat',
-										type: 'options',
-										options: [
-											{
-												name: 'To JPEG',
-												value: 'image/jpeg',
-											},
-											{
-												name: 'To PNG',
-												value: 'image/png',
-											},
-											{
-												name: 'To SVG',
-												value: 'image/svg+xml',
-											},
-											{
-												name: 'To PDF',
-												value: 'application/pdf',
-											},
-										],
-										default: 'image/jpeg',
-										description: 'Format used to export when downloading Google Drawings files',
-									},
-									{
-										displayName: 'Google Slides',
-										name: 'slidesToFormat',
-										type: 'options',
-										options: [
-											{
-												name: 'To MS PowerPoint',
-												value:
-													'application/vnd.openxmlformats-officedocument.presentationml.presentation',
-											},
-											{
-												name: 'To PDF',
-												value: 'application/pdf',
-											},
-											{
-												name: 'To OpenOffice Presentation',
-												value: 'application/vnd.oasis.opendocument.presentation',
-											},
-											{
-												name: 'To Plain Text',
-												value: 'text/plain',
-											},
-										],
-										default:
-											'application/vnd.openxmlformats-officedocument.presentationml.presentation',
-										description: 'Format used to export when downloading Google Slides files',
-									},
-									{
-										displayName: 'Google Sheets',
-										name: 'sheetsToFormat',
-										type: 'options',
-										options: [
-											{
-												name: 'To MS Excel',
-												value: 'application/x-vnd.oasis.opendocument.spreadsheet',
-											},
-											{
-												name: 'To PDF',
-												value: 'application/pdf',
-											},
-											{
-												name: 'To CSV',
-												value: 'text/csv',
-											},
-										],
-										default: 'application/x-vnd.oasis.opendocument.spreadsheet',
-										description: 'Format used to export when downloading Google Spreadsheets files',
-									},
-								],
-							},
-						],
-					},
-					{
-						displayName: 'File Name',
-						name: 'fileName',
-						type: 'string',
-						default: '',
-						description: 'File name. Ex: data.pdf.',
-					},
-				],
-			},
-
-			// ----------------------------------
-			//         file:list
-			// ----------------------------------
-			{
-				displayName: 'Use Query String',
-				name: 'useQueryString',
-				type: 'boolean',
-				default: false,
-				displayOptions: {
-					show: {
-						operation: ['list'],
-						resource: ['file'],
-					},
-				},
-				description: 'Whether a query string should be used to filter results',
-			},
-			{
-				displayName: 'Query String',
-				name: 'queryString',
-				type: 'string',
-				default: '',
-				displayOptions: {
-					show: {
-						operation: ['list'],
-						useQueryString: [true],
-						resource: ['file'],
-					},
-				},
-				placeholder: "name contains 'invoice'",
-				description: 'Query to use to return only specific files',
-			},
-			{
-				displayName: 'Limit',
-				name: 'limit',
-				type: 'number',
-				displayOptions: {
-					show: {
-						operation: ['list'],
-						resource: ['file'],
-					},
-				},
-				typeOptions: {
-					minValue: 1,
-					maxValue: 1000,
-				},
-				default: 50,
-				description: 'Max number of results to return',
-			},
-			{
-				displayName: 'Filters',
-				name: 'queryFilters',
-				placeholder: 'Add Filter',
-				description: 'Filters to use to return only specific files',
-				type: 'fixedCollection',
-				typeOptions: {
-					multipleValues: true,
-				},
-				default: {},
-				displayOptions: {
-					show: {
-						operation: ['list'],
-						useQueryString: [false],
-						resource: ['file'],
-					},
-				},
-				options: [
-					{
-						name: 'name',
-						displayName: 'Name',
-						values: [
-							{
-								displayName: 'Operation',
-								name: 'operation',
-								type: 'options',
-								noDataExpression: true,
-								options: [
-									{
-										name: 'Contains',
-										value: 'contains',
-									},
-									{
-										name: 'Is',
-										value: 'is',
-									},
-									{
-										name: 'Is Not',
-										value: 'isNot',
-									},
-								],
-								default: 'contains',
-							},
-							{
-								displayName: 'Value',
-								name: 'value',
-								type: 'string',
-								default: '',
-								description: 'The value for operation',
-							},
-						],
-					},
-					{
-						name: 'mimeType',
-						displayName: 'Mime Type',
-						values: [
-							{
-								displayName: 'Mime Type',
-								name: 'mimeType',
-								type: 'options',
-								options: [
-									{
-										name: '3rd Party Shortcut',
-										value: 'application/vnd.google-apps.drive-sdk',
-									},
-									{
-										name: 'Audio',
-										value: 'application/vnd.google-apps.audio',
-									},
-									{
-										name: 'Custom Mime Type',
-										value: 'custom',
-									},
-									{
-										name: 'Google Apps Scripts',
-										value: 'application/vnd.google-apps.script',
-									},
-									{
-										name: 'Google Docs',
-										value: 'application/vnd.google-apps.document',
-									},
-									{
-										name: 'Google Drawing',
-										value: 'application/vnd.google-apps.drawing',
-									},
-									{
-										name: 'Google Drive File',
-										value: 'application/vnd.google-apps.file',
-									},
-									{
-										name: 'Google Drive Folder',
-										value: 'application/vnd.google-apps.folder',
-									},
-									{
-										name: 'Google Forms',
-										value: 'application/vnd.google-apps.form',
-									},
-									{
-										name: 'Google Fusion Tables',
-										value: 'application/vnd.google-apps.fusiontable',
-									},
-									{
-										name: 'Google My Maps',
-										value: 'application/vnd.google-apps.map',
-									},
-									{
-										name: 'Google Sheets',
-										value: 'application/vnd.google-apps.spreadsheet',
-									},
-									{
-										name: 'Google Sites',
-										value: 'application/vnd.google-apps.site',
-									},
-									{
-										name: 'Google Slides',
-										value: 'application/vnd.google-apps.presentation',
-									},
-									{
-										name: 'Photo',
-										value: 'application/vnd.google-apps.photo',
-									},
-									{
-										name: 'Unknown',
-										value: 'application/vnd.google-apps.unknown',
-									},
-									{
-										name: 'Video',
-										value: 'application/vnd.google-apps.video',
-									},
-								],
-								default: 'application/vnd.google-apps.file',
-								description: 'The Mime-Type of the files to return',
-							},
-							{
-								displayName: 'Custom Mime Type',
-								name: 'customMimeType',
-								type: 'string',
-								default: '',
-								displayOptions: {
-									show: {
-										mimeType: ['custom'],
-									},
-								},
-							},
-						],
-					},
-				],
-			},
-
-			// ----------------------------------
-			//         file:share
-			// ----------------------------------
-			{
-				displayName: 'Permissions',
-				name: 'permissionsUi',
-				placeholder: 'Add Permission',
-				type: 'fixedCollection',
-				default: {},
-				typeOptions: {
-					multipleValues: false,
-				},
-				displayOptions: {
-					show: {
-						resource: ['file', 'folder'],
-						operation: ['share'],
-					},
-				},
-				options: [
-					{
-						displayName: 'Permission',
-						name: 'permissionsValues',
-						values: [
-							{
-								displayName: 'Role',
-								name: 'role',
-								type: 'options',
-								options: [
-									{
-										name: 'Commenter',
-										value: 'commenter',
-									},
-									{
-										name: 'File Organizer',
-										value: 'fileOrganizer',
-									},
-									{
-										name: 'Organizer',
-										value: 'organizer',
-									},
-									{
-										name: 'Owner',
-										value: 'owner',
-									},
-									{
-										name: 'Reader',
-										value: 'reader',
-									},
-									{
-										name: 'Writer',
-										value: 'writer',
-									},
-								],
-								default: '',
-							},
-							{
-								displayName: 'Type',
-								name: 'type',
-								type: 'options',
-								options: [
-									{
-										name: 'User',
-										value: 'user',
-									},
-									{
-										name: 'Group',
-										value: 'group',
-									},
-									{
-										name: 'Domain',
-										value: 'domain',
-									},
-									{
-										name: 'Anyone',
-										value: 'anyone',
-									},
-								],
-								default: '',
-								description:
-									'Information about the different types can be found <a href="https://developers.google.com/drive/api/v3/ref-roles">here</a>',
-							},
-							{
-								displayName: 'Email Address',
-								name: 'emailAddress',
-								type: 'string',
-								displayOptions: {
-									show: {
-										type: ['user', 'group'],
-									},
-								},
-								default: '',
-								description:
-									'The email address of the user or group to which this permission refers',
-							},
-							{
-								displayName: 'Domain',
-								name: 'domain',
-								type: 'string',
-								displayOptions: {
-									show: {
-										type: ['domain'],
-									},
-								},
-								default: '',
-								description: 'The domain to which this permission refers',
-							},
-							{
-								displayName: 'Allow File Discovery',
-								name: 'allowFileDiscovery',
-								type: 'boolean',
-								displayOptions: {
-									show: {
-										type: ['domain', 'anyone'],
-									},
-								},
-								default: false,
-								description:
-									'Whether the permission allows the file to be discovered through search',
-							},
-						],
-					},
-				],
-			},
-
-			{
-				displayName: 'Binary Data',
-				name: 'binaryData',
-				type: 'boolean',
-				default: false,
-				displayOptions: {
-					show: {
-						operation: ['upload'],
-						resource: ['file'],
-					},
-				},
-				description: 'Whether the data to upload should be taken from binary field',
-			},
-			{
-				displayName: 'File Content',
-				name: 'fileContent',
-				type: 'string',
-				default: '',
-				displayOptions: {
-					show: {
-						operation: ['upload'],
-						resource: ['file'],
-						binaryData: [false],
-					},
-				},
-				placeholder: '',
-				description: 'The text content of the file to upload',
-			},
-			{
-				displayName: 'Binary Property',
-				name: 'binaryPropertyName',
-				type: 'string',
-				default: 'data',
-				required: true,
-				displayOptions: {
-					show: {
-						operation: ['upload'],
-						resource: ['file'],
-						binaryData: [true],
-					},
-				},
-				placeholder: '',
-				description:
-					'Name of the binary property which contains the data for the file to be uploaded',
-			},
-
-			// ----------------------------------
-			//         file:update
-			// ----------------------------------
-			{
-				displayName: 'Update Fields',
-				name: 'updateFields',
-				type: 'collection',
-				placeholder: 'Add Option',
-				default: {},
-				displayOptions: {
-					show: {
-						operation: ['update'],
-						resource: ['file'],
-					},
-				},
-				options: [
-					{
-						displayName: 'File Name',
-						name: 'fileName',
-						type: 'string',
-						default: '',
-						description: 'The name of the file',
-					},
-					{
-						displayName: 'Keep Revision Forever',
-						name: 'keepRevisionForever',
-						type: 'boolean',
-						default: false,
-						description:
-							"Whether to set the 'keepForever' field in the new head revision. This is only applicable to files with binary content in Google Drive. Only 200 revisions for the file can be kept forever. If the limit is reached, try deleting pinned revisions.",
-					},
-					{
-						displayName: 'Move to Trash',
-						name: 'trashed',
-						type: 'boolean',
-						default: false,
-						description: 'Whether to move a file to the trash. Only the owner may trash a file.',
-					},
-					{
-						displayName: 'OCR Language',
-						name: 'ocrLanguage',
-						type: 'string',
-						default: '',
-						description: 'A language hint for OCR processing during image import (ISO 639-1 code)',
-					},
-					{
-						displayName: 'Parent ID',
-						name: 'parentId',
-						type: 'string',
-						default: '',
-						description: 'The ID of the parent to set',
-					},
-					{
-						displayName: 'Use Content As Indexable Text',
-						name: 'useContentAsIndexableText',
-						type: 'boolean',
-						default: false,
-						description: 'Whether to use the uploaded content as indexable text',
-					},
-				],
-			},
-			{
-				displayName: 'Options',
-				name: 'options',
-				type: 'collection',
-				placeholder: 'Add Option',
-				default: {},
-				displayOptions: {
-					show: {
-						operation: ['update'],
-						resource: ['file'],
-					},
-				},
-				options: [
-					{
-						displayName: 'Fields',
-						name: 'fields',
-						type: 'multiOptions',
-						options: [
-							{
-								name: '[All]',
-								value: '*',
-								description: 'All fields',
-							},
-							{
-								name: 'explicitlyTrashed',
-								value: 'explicitlyTrashed',
-							},
-							{
-								name: 'exportLinks',
-								value: 'exportLinks',
-							},
-							{
-								name: 'hasThumbnail',
-								value: 'hasThumbnail',
-							},
-							{
-								name: 'iconLink',
-								value: 'iconLink',
-							},
-							{
-								name: 'ID',
-								value: 'id',
-							},
-							{
-								name: 'Kind',
-								value: 'kind',
-							},
-							{
-								name: 'mimeType',
-								value: 'mimeType',
-							},
-							{
-								name: 'Name',
-								value: 'name',
-							},
-							{
-								name: 'Permissions',
-								value: 'permissions',
-							},
-							{
-								name: 'Shared',
-								value: 'shared',
-							},
-							{
-								name: 'Spaces',
-								value: 'spaces',
-							},
-							{
-								name: 'Starred',
-								value: 'starred',
-							},
-							{
-								name: 'thumbnailLink',
-								value: 'thumbnailLink',
-							},
-							{
-								name: 'Trashed',
-								value: 'trashed',
-							},
-							{
-								name: 'Version',
-								value: 'version',
-							},
-							{
-								name: 'webViewLink',
-								value: 'webViewLink',
-							},
-						],
-						default: [],
-						description: 'The fields to return',
-					},
-				],
-			},
-			// ----------------------------------
-			//         file:upload
-			// ----------------------------------
-			{
-				displayName: 'File Name',
-				name: 'name',
-				type: 'string',
-				default: '',
-				required: true,
-				displayOptions: {
-					show: {
-						operation: ['upload'],
-						resource: ['file'],
-					},
-				},
-				placeholder: 'invoice_1.pdf',
-				description: 'The name the file should be saved as',
-			},
-			// ----------------------------------
-			{
-				displayName: 'Resolve Data',
-				name: 'resolveData',
-				type: 'boolean',
-				default: false,
-				displayOptions: {
-					show: {
-						operation: ['upload'],
-						resource: ['file'],
-					},
-				},
-				// eslint-disable-next-line n8n-nodes-base/node-param-description-boolean-without-whether
-				description:
-					'By default the response only contain the ID of the file. If this option gets activated, it will resolve the data automatically.',
-			},
-			{
-				displayName: 'Parents',
-				name: 'parents',
-				type: 'string',
-				typeOptions: {
-					multipleValues: true,
-				},
-				default: [],
-				displayOptions: {
-					show: {
-						operation: ['upload'],
-						resource: ['file'],
-					},
-				},
-				description: 'The IDs of the parent folders which contain the file',
-			},
-
-			// ----------------------------------
-			//         folder
-			// ----------------------------------
-
-			// ----------------------------------
-			//         folder:create
-			// ----------------------------------
-			{
-				displayName: 'Folder',
-				name: 'name',
-				type: 'string',
-				default: '',
-				required: true,
-				displayOptions: {
-					show: {
-						operation: ['create'],
-						resource: ['folder'],
-					},
-				},
-				placeholder: 'invoices',
-				description: 'The name of folder to create',
-			},
-			{
-				displayName: 'Options',
-				name: 'options',
-				type: 'collection',
-				placeholder: 'Add Option',
-				default: {},
-				displayOptions: {
-					show: {
-						'/operation': ['copy', 'list', 'share', 'create'],
-						'/resource': ['file', 'folder'],
-					},
-				},
-				options: [
-					{
-						displayName: 'Email Message',
-						name: 'emailMessage',
-						type: 'string',
-						displayOptions: {
-							show: {
-								'/operation': ['share'],
-								'/resource': ['file', 'folder'],
-							},
-						},
-						default: '',
-						description: 'A plain text custom message to include in the notification email',
-					},
-					{
-						displayName: 'Enforce Single Parent',
-						name: 'enforceSingleParent',
-						type: 'boolean',
-						displayOptions: {
-							show: {
-								'/operation': ['share'],
-								'/resource': ['file', 'folder'],
-							},
-						},
-						default: false,
-						description:
-							'Whether to opt in to API behavior that aims for all items to have exactly one parent. This parameter only takes effect if the item is not in a shared drive.',
-					},
-					{
-						displayName: 'Fields',
-						name: 'fields',
-						type: 'multiOptions',
-						displayOptions: {
-							show: {
-								'/operation': ['list', 'copy'],
-							},
-						},
-						options: [
-							{
-								name: '*',
-								value: '*',
-								description: 'All fields',
-							},
-							{
-								name: 'explicitlyTrashed',
-								value: 'explicitlyTrashed',
-							},
-							{
-								name: 'exportLinks',
-								value: 'exportLinks',
-							},
-							{
-								name: 'hasThumbnail',
-								value: 'hasThumbnail',
-							},
-							{
-								name: 'iconLink',
-								value: 'iconLink',
-							},
-							{
-								name: 'ID',
-								value: 'id',
-							},
-							{
-								name: 'Kind',
-								value: 'kind',
-							},
-							{
-								name: 'mimeType',
-								value: 'mimeType',
-							},
-							{
-								name: 'Name',
-								value: 'name',
-							},
-							{
-								name: 'Permissions',
-								value: 'permissions',
-							},
-							{
-								name: 'Shared',
-								value: 'shared',
-							},
-							{
-								name: 'Spaces',
-								value: 'spaces',
-							},
-							{
-								name: 'Starred',
-								value: 'starred',
-							},
-							{
-								name: 'thumbnailLink',
-								value: 'thumbnailLink',
-							},
-							{
-								name: 'Trashed',
-								value: 'trashed',
-							},
-							{
-								name: 'Version',
-								value: 'version',
-							},
-							{
-								name: 'webViewLink',
-								value: 'webViewLink',
-							},
-						],
-						default: [],
-						description: 'The fields to return',
-					},
-					{
-						displayName: 'Move To New Owners Root',
-						name: 'moveToNewOwnersRoot',
-						type: 'boolean',
-						displayOptions: {
-							show: {
-								'/operation': ['share'],
-								'/resource': ['file', 'folder'],
-							},
-						},
-						default: false,
-						// eslint-disable-next-line n8n-nodes-base/node-param-description-boolean-without-whether
-						description:
-							"<p>This parameter only takes effect if the item is not in a shared drive and the request is attempting to transfer the ownership of the item.</p><p>When set to true, the item is moved to the new owner's My Drive root folder and all prior parents removed.</p>",
-					},
-					{
-						displayName: 'Send Notification Email',
-						name: 'sendNotificationEmail',
-						type: 'boolean',
-						displayOptions: {
-							show: {
-								'/operation': ['share'],
-								'/resource': ['file', 'folder'],
-							},
-						},
-						default: false,
-						description: 'Whether to send a notification email when sharing to users or groups',
-					},
-					{
-						displayName: 'Supports All Drives',
-						name: 'supportsAllDrives',
-						type: 'boolean',
-						displayOptions: {
-							show: {
-								'/operation': ['share'],
-								'/resource': ['file', 'folder'],
-							},
-						},
-						default: false,
-						description:
-							'Whether the requesting application supports both My Drives and shared drives',
-					},
-					{
-						displayName: 'Transfer Ownership',
-						name: 'transferOwnership',
-						type: 'boolean',
-						displayOptions: {
-							show: {
-								'/operation': ['share'],
-								'/resource': ['file', 'folder'],
-							},
-						},
-						default: false,
-						description:
-							'Whether to transfer ownership to the specified user and downgrade the current owner to a writer',
-					},
-					{
-						displayName: 'Use Domain Admin Access',
-						name: 'useDomainAdminAccess',
-						type: 'boolean',
-						displayOptions: {
-							show: {
-								'/operation': ['share'],
-								'/resource': ['file', 'folder'],
-							},
-						},
-						default: false,
-						description:
-							'Whether to perform the operation as domain administrator, i.e. if you are an administrator of the domain to which the shared drive belongs, you will be granted access automatically.',
-					},
-
-					{
-						displayName: 'File Name',
-						name: 'name',
-						type: 'string',
-						displayOptions: {
-							show: {
-								'/operation': ['copy'],
-								'/resource': ['file'],
-							},
-						},
-						default: '',
-						placeholder: 'invoice_1.pdf',
-						description: 'The name the file should be saved as',
-					},
-					{
-						displayName: 'Parents',
-						name: 'parents',
-						type: 'string',
-						displayOptions: {
-							show: {
-								'/operation': ['copy', 'create'],
-								'/resource': ['file', 'folder'],
-							},
-						},
-						typeOptions: {
-							multipleValues: true,
-						},
-						default: [],
-						description: 'The IDs of the parent folders the file/folder should be saved in',
-					},
-					{
-						displayName: 'Spaces',
-						name: 'spaces',
-						type: 'multiOptions',
-						displayOptions: {
-							show: {
-								'/operation': ['list'],
-								'/resource': ['file'],
-							},
-						},
-						options: [
-							{
-								name: '[All]',
-								value: '*',
-								description: 'All spaces',
-							},
-							{
-								name: 'appDataFolder',
-								value: 'appDataFolder',
-							},
-							{
-								name: 'Drive',
-								value: 'drive',
-							},
-							{
-								name: 'Photos',
-								value: 'photos',
-							},
-						],
-						default: [],
-						description: 'The spaces to operate on',
-					},
-					{
-						displayName: 'Corpora',
-						name: 'corpora',
-						type: 'options',
-						displayOptions: {
-							show: {
-								'/operation': ['list'],
-								'/resource': ['file'],
-							},
-						},
-						options: [
-							{
-								name: 'User',
-								value: 'user',
-								description: 'All files in "My Drive" and "Shared with me"',
-							},
-							{
-								name: 'Domain',
-								value: 'domain',
-								description: "All files shared to the user's domain that are searchable",
-							},
-							{
-								name: 'Drive',
-								value: 'drive',
-								description: 'All files contained in a single shared drive',
-							},
-							{
-								name: 'allDrives',
-								value: 'allDrives',
-								description: 'All drives',
-							},
-						],
-						default: '',
-						description: 'The corpora to operate on',
-					},
-					{
-						displayName: 'Drive ID',
-						name: 'driveId',
-						type: 'string',
-						default: '',
-						displayOptions: {
-							show: {
-								'/operation': ['list'],
-								'/resource': ['file'],
-								corpora: ['drive'],
-							},
-						},
-						description:
-							'ID of the shared drive to search. The driveId parameter must be specified if and only if corpora is set to drive.',
-					},
-				],
-			},
-			// ----------------------------------
-			//         drive
-			// ----------------------------------
-			{
-				displayName: 'Operation',
-				name: 'operation',
-				type: 'options',
-				noDataExpression: true,
-				displayOptions: {
-					show: {
-						resource: ['drive'],
-					},
-				},
-				options: [
-					{
-						name: 'Create',
-						value: 'create',
-						description: 'Create a drive',
-						action: 'Create a drive',
-					},
-					{
-						name: 'Delete',
-						value: 'delete',
-						description: 'Delete a drive',
-						action: 'Delete a drive',
-					},
-					{
-						name: 'Get',
-						value: 'get',
-						description: 'Get a drive',
-						action: 'Get a drive',
-					},
-					{
-						name: 'List',
-						value: 'list',
-						description: 'List all drives',
-						action: 'List all drives',
-					},
-					{
-						name: 'Update',
-						value: 'update',
-						description: 'Update a drive',
-						action: 'Update a drive',
-					},
-				],
-				default: 'create',
-			},
-
-			{
-				displayName: 'Drive',
-				name: 'driveId',
-				type: 'resourceLocator',
-				default: { mode: 'list', value: '' },
-				required: true,
-				hint: 'The Google Drive drive to operate on',
-				modes: [
-					{
-						displayName: 'Drive',
-						name: 'list',
-						type: 'list',
-						placeholder: 'Drive',
-						typeOptions: {
-							searchListMethod: 'driveSearch',
-							searchable: true,
-						},
-					},
-					{
-						displayName: 'Link',
-						name: 'url',
-						type: 'string',
-						placeholder: 'https://drive.google.com/drive/folders/0AaaaaAAAAAAAaa',
-						extractValue: {
-							type: 'regex',
-							regex:
-								'https:\\/\\/drive\\.google\\.com\\/\\w+\\/folders\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)',
-						},
-						validation: [
-							{
-								type: 'regex',
-								properties: {
-									regex:
-										'https:\\/\\/drive\\.google\\.com\\/\\w+\\/folders\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)',
-									errorMessage: 'Not a valid Google Drive Drive URL',
-								},
-							},
-						],
-					},
-					{
-						displayName: 'ID',
-						name: 'id',
-						type: 'string',
-						hint: 'The ID of the shared drive',
-						validation: [
-							{
-								type: 'regex',
-								properties: {
-									regex: '[a-zA-Z0-9\\-_]{2,}',
-									errorMessage: 'Not a valid Google Drive Drive ID',
-								},
-							},
-						],
-						url: '=https://drive.google.com/drive/folders/{{$value}}',
-					},
-				],
-				displayOptions: {
-					show: {
-						operation: ['delete', 'get', 'update'],
-						resource: ['drive'],
-					},
-				},
-				description: 'The ID of the drive',
-			},
-
-			// ----------------------------------
-			//         drive:create
-			// ----------------------------------
-			{
-				displayName: 'Name',
-				name: 'name',
-				type: 'string',
-				default: '',
-				displayOptions: {
-					show: {
-						operation: ['create'],
-						resource: ['drive'],
-					},
-				},
-				description: 'The name of this shared drive',
-			},
-			{
-				displayName: 'Options',
-				name: 'options',
-				type: 'collection',
-				placeholder: 'Add Option',
-				default: {},
-				displayOptions: {
-					show: {
-						operation: ['create'],
-						resource: ['drive'],
-					},
-				},
-				options: [
-					{
-						displayName: 'Capabilities',
-						name: 'capabilities',
-						type: 'collection',
-						placeholder: 'Add Field',
-						default: {},
-						options: [
-							{
-								displayName: 'Can Add Children',
-								name: 'canAddChildren',
-								type: 'boolean',
-								default: false,
-								description:
-									'Whether the current user can add children to folders in this shared drive',
-							},
-							{
-								displayName: 'Can Change Copy Requires Writer Permission Restriction',
-								name: 'canChangeCopyRequiresWriterPermissionRestriction',
-								type: 'boolean',
-								default: false,
-								description:
-									'Whether the current user can change the copyRequiresWriterPermission restriction of this shared drive',
-							},
-							{
-								displayName: 'Can Change Domain Users Only Restriction',
-								name: 'canChangeDomainUsersOnlyRestriction',
-								type: 'boolean',
-								default: false,
-								description:
-									'Whether the current user can change the domainUsersOnly restriction of this shared drive',
-							},
-							{
-								displayName: 'Can Change Drive Background',
-								name: 'canChangeDriveBackground',
-								type: 'boolean',
-								default: false,
-								description:
-									'Whether the current user can change the background of this shared drive',
-							},
-							{
-								displayName: 'Can Change Drive Members Only Restriction',
-								name: 'canChangeDriveMembersOnlyRestriction',
-								type: 'boolean',
-								default: false,
-								description:
-									'Whether the current user can change the driveMembersOnly restriction of this shared drive',
-							},
-							{
-								displayName: 'Can Comment',
-								name: 'canComment',
-								type: 'boolean',
-								default: false,
-								description: 'Whether the current user can comment on files in this shared drive',
-							},
-							{
-								displayName: 'Can Copy',
-								name: 'canCopy',
-								type: 'boolean',
-								default: false,
-								description: 'Whether the current user can copy files in this shared drive',
-							},
-							{
-								displayName: 'Can Delete Children',
-								name: 'canDeleteChildren',
-								type: 'boolean',
-								default: false,
-								description:
-									'Whether the current user can delete children from folders in this shared drive',
-							},
-							{
-								displayName: 'Can Delete Drive',
-								name: 'canDeleteDrive',
-								type: 'boolean',
-								default: false,
-								description:
-									'Whether the current user can delete this shared drive. Attempting to delete the shared drive may still fail if there are untrashed items inside the shared drive.',
-							},
-							{
-								displayName: 'Can Download',
-								name: 'canDownload',
-								type: 'boolean',
-								default: false,
-								description: 'Whether the current user can download files in this shared drive',
-							},
-							{
-								displayName: 'Can Edit',
-								name: 'canEdit',
-								type: 'boolean',
-								default: false,
-								description: 'Whether the current user can edit files in this shared drive',
-							},
-							{
-								displayName: 'Can List Children',
-								name: 'canListChildren',
-								type: 'boolean',
-								default: false,
-								description:
-									'Whether the current user can list the children of folders in this shared drive',
-							},
-							{
-								displayName: 'Can Manage Members',
-								name: 'canManageMembers',
-								type: 'boolean',
-								default: false,
-								description:
-									'Whether the current user can add members to this shared drive or remove them or change their role',
-							},
-							{
-								displayName: 'Can Read Revisions',
-								name: 'canReadRevisions',
-								type: 'boolean',
-								default: false,
-								description:
-									'Whether the current user can read the revisions resource of files in this shared drive',
-							},
-							{
-								displayName: 'Can Rename',
-								name: 'canRename',
-								type: 'boolean',
-								default: false,
-								description:
-									'Whether the current user can rename files or folders in this shared drive',
-							},
-							{
-								displayName: 'Can Rename Drive',
-								name: 'canRenameDrive',
-								type: 'boolean',
-								default: false,
-								description: 'Whether the current user can rename this shared drive',
-							},
-							{
-								displayName: 'Can Share',
-								name: 'canShare',
-								type: 'boolean',
-								default: false,
-								description: 'Whether the current user can rename this shared drive',
-							},
-							{
-								displayName: 'Can Trash Children',
-								name: 'canTrashChildren',
-								type: 'boolean',
-								default: false,
-								description:
-									'Whether the current user can trash children from folders in this shared drive',
-							},
-						],
-					},
-					{
-						displayName: 'Color RGB',
-						name: 'colorRgb',
-						type: 'color',
-						default: '',
-						description: 'The color of this shared drive as an RGB hex string',
-					},
-					{
-						displayName: 'Created Time',
-						name: 'createdTime',
-						type: 'dateTime',
-						default: '',
-						description: 'The time at which the shared drive was created (RFC 3339 date-time)',
-					},
-					{
-						displayName: 'Hidden',
-						name: 'hidden',
-						type: 'boolean',
-						default: false,
-						description: 'Whether the shared drive is hidden from default view',
-					},
-					{
-						displayName: 'Restrictions',
-						name: 'restrictions',
-						type: 'collection',
-						placeholder: 'Add Field',
-						default: {},
-						options: [
-							{
-								displayName: 'Admin Managed Restrictions',
-								name: 'adminManagedRestrictions',
-								type: 'boolean',
-								default: false,
-								description:
-									'Whether the options to copy, print, or download files inside this shared drive, should be disabled for readers and commenters. When this restriction is set to true, it will override the similarly named field to true for any file inside this shared drive.',
-							},
-							{
-								displayName: 'Copy Requires Writer Permission',
-								name: 'copyRequiresWriterPermission',
-								type: 'boolean',
-								default: false,
-								description:
-									'Whether the options to copy, print, or download files inside this shared drive, should be disabled for readers and commenters. When this restriction is set to true, it will override the similarly named field to true for any file inside this shared drive.',
-							},
-							{
-								displayName: 'Domain Users Only',
-								name: 'domainUsersOnly',
-								type: 'boolean',
-								default: false,
-								description:
-									'Whether access to this shared drive and items inside this shared drive is restricted to users of the domain to which this shared drive belongs. This restriction may be overridden by other sharing policies controlled outside of this shared drive.',
-							},
-							{
-								displayName: 'Drive Members Only',
-								name: 'driveMembersOnly',
-								type: 'boolean',
-								default: false,
-								description:
-									'Whether access to items inside this shared drive is restricted to its members',
-							},
-						],
-					},
-				],
-			},
-			// ----------------------------------
-			//         drive:delete
-			// ----------------------------------
-
-			// ----------------------------------
-			//         drive:get
-			// ----------------------------------
-			{
-				displayName: 'Options',
-				name: 'options',
-				type: 'collection',
-				placeholder: 'Add Option',
-				default: {},
-				displayOptions: {
-					show: {
-						operation: ['get'],
-						resource: ['drive'],
-					},
-				},
-				options: [
-					{
-						displayName: 'Use Domain Admin Access',
-						name: 'useDomainAdminAccess',
-						type: 'boolean',
-						default: false,
-						description:
-							'Whether to issue the request as a domain administrator; if set to true, then the requester will be granted access if they are an administrator of the domain to which the shared drive belongs. (Default: false).',
-					},
-				],
-			},
-			// ----------------------------------
-			//         drive:list
-			// ----------------------------------
-			{
-				displayName: 'Return All',
-				name: 'returnAll',
-				type: 'boolean',
-				displayOptions: {
-					show: {
-						operation: ['list'],
-						resource: ['drive'],
-					},
-				},
-				default: false,
-				description: 'Whether to return all results or only up to a given limit',
-			},
-			{
-				displayName: 'Limit',
-				name: 'limit',
-				type: 'number',
-				displayOptions: {
-					show: {
-						operation: ['list'],
-						resource: ['drive'],
-						returnAll: [false],
-					},
-				},
-				typeOptions: {
-					minValue: 1,
-					maxValue: 200,
-				},
-				default: 100,
-				description: 'Max number of results to return',
-			},
-			{
-				displayName: 'Options',
-				name: 'options',
-				type: 'collection',
-				placeholder: 'Add Option',
-				default: {},
-				displayOptions: {
-					show: {
-						operation: ['list'],
-						resource: ['drive'],
-					},
-				},
-				options: [
-					{
-						displayName: 'Query',
-						name: 'q',
-						type: 'string',
-						default: '',
-						description:
-							'Query string for searching shared drives. See the <a href="https://developers.google.com/drive/api/v3/search-shareddrives">"Search for shared drives"</a> guide for supported syntax.',
-					},
-					{
-						displayName: 'Use Domain Admin Access',
-						name: 'useDomainAdminAccess',
-						type: 'boolean',
-						default: false,
-						description:
-							'Whether to issue the request as a domain administrator; if set to true, then the requester will be granted access if they are an administrator of the domain to which the shared drive belongs. (Default: false).',
-					},
-				],
-			},
-			// ----------------------------------
-			//         drive:update
-			// ----------------------------------
-			{
-				displayName: 'Update Fields',
-				name: 'options',
-				type: 'collection',
-				placeholder: 'Add Option',
-				default: {},
-				displayOptions: {
-					show: {
-						operation: ['update'],
-						resource: ['drive'],
-					},
-				},
-				options: [
-					{
-						displayName: 'Color RGB',
-						name: 'colorRgb',
-						type: 'color',
-						default: '',
-						description: 'The color of this shared drive as an RGB hex string',
-					},
-					{
-						displayName: 'Name',
-						name: 'name',
-						type: 'string',
-						default: '',
-						description: 'The name of this shared drive',
-					},
-					{
-						displayName: 'Restrictions',
-						name: 'restrictions',
-						type: 'collection',
-						placeholder: 'Add Field',
-						default: {},
-						options: [
-							{
-								displayName: 'Admin Managed Restrictions',
-								name: 'adminManagedRestrictions',
-								type: 'boolean',
-								default: false,
-								description:
-									'Whether the options to copy, print, or download files inside this shared drive, should be disabled for readers and commenters. When this restriction is set to true, it will override the similarly named field to true for any file inside this shared drive.',
-							},
-							{
-								displayName: 'Copy Requires Writer Permission',
-								name: 'copyRequiresWriterPermission',
-								type: 'boolean',
-								default: false,
-								description:
-									'Whether the options to copy, print, or download files inside this shared drive, should be disabled for readers and commenters. When this restriction is set to true, it will override the similarly named field to true for any file inside this shared drive.',
-							},
-							{
-								displayName: 'Domain Users Only',
-								name: 'domainUsersOnly',
-								type: 'boolean',
-								default: false,
-								description:
-									'Whether access to this shared drive and items inside this shared drive is restricted to users of the domain to which this shared drive belongs. This restriction may be overridden by other sharing policies controlled outside of this shared drive.',
-							},
-							{
-								displayName: 'Drive Members Only',
-								name: 'driveMembersOnly',
-								type: 'boolean',
-								default: false,
-								description:
-									'Whether access to items inside this shared drive is restricted to its members',
-							},
-						],
-					},
-				],
-			},
-			{
-				displayName: 'Options',
-				name: 'options',
-				type: 'collection',
-				placeholder: 'Add Option',
-				default: {},
-				displayOptions: {
-					show: {
-						operation: ['upload'],
-						resource: ['file'],
-					},
-				},
-				options: [
-					{
-						displayName: 'APP Properties',
-						name: 'appPropertiesUi',
-						placeholder: 'Add Property',
-						type: 'fixedCollection',
-						default: {},
-						typeOptions: {
-							multipleValues: true,
-						},
-						description:
-							'A collection of arbitrary key-value pairs which are private to the requesting app',
-						options: [
-							{
-								name: 'appPropertyValues',
-								displayName: 'APP Property',
-								values: [
-									{
-										displayName: 'Key',
-										name: 'key',
-										type: 'string',
-										default: '',
-										description: 'Name of the key to add',
-									},
-									{
-										displayName: 'Value',
-										name: 'value',
-										type: 'string',
-										default: '',
-										description: 'Value to set for the key',
-									},
-								],
-							},
-						],
-					},
-					{
-						displayName: 'Properties',
-						name: 'propertiesUi',
-						placeholder: 'Add Property',
-						type: 'fixedCollection',
-						default: {},
-						typeOptions: {
-							multipleValues: true,
-						},
-						description: 'A collection of arbitrary key-value pairs which are visible to all apps',
-						options: [
-							{
-								name: 'propertyValues',
-								displayName: 'Property',
-								values: [
-									{
-										displayName: 'Key',
-										name: 'key',
-										type: 'string',
-										default: '',
-										description: 'Name of the key to add',
-									},
-									{
-										displayName: 'Value',
-										name: 'value',
-										type: 'string',
-										default: '',
-										description: 'Value to set for the key',
-									},
-								],
-							},
-						],
-					},
-				],
-			},
-		],
-	};
-
-	methods = {
-		listSearch: {
-			fileSearch,
-			folderSearch,
-			driveSearch,
-		},
-	};
-
-	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
-		const items = this.getInputData();
-		const returnData: INodeExecutionData[] = [];
-
-		const resource = this.getNodeParameter('resource', 0);
-		const operation = this.getNodeParameter('operation', 0);
-
-		for (let i = 0; i < items.length; i++) {
-			try {
-				const options = this.getNodeParameter('options', i, {});
-
-				let queryFields = 'id, name';
-				if (options?.fields) {
-					const fields = options.fields as string[];
-					if (fields.includes('*')) {
-						queryFields = '*';
-					} else {
-						queryFields = fields.join(', ');
-					}
-				}
-
-				if (resource === 'drive') {
-					if (operation === 'create') {
-						// ----------------------------------
-						//         create
-						// ----------------------------------
-
-						const name = this.getNodeParameter('name', i) as string;
-
-						const body: IDataObject = {
-							name,
-						};
-
-						Object.assign(body, options);
-
-						const response = await googleApiRequest.call(this, 'POST', '/drive/v3/drives', body, {
-							requestId: uuid(),
-						});
-
-						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(response as IDataObject[]),
-							{ itemData: { item: i } },
-						);
-
-						returnData.push(...executionData);
-					}
-					if (operation === 'delete') {
-						// ----------------------------------
-						//         delete
-						// ----------------------------------
-
-						const driveId = this.getNodeParameter('driveId', i, undefined, {
-							extractValue: true,
-						}) as string;
-
-						await googleApiRequest.call(this, 'DELETE', `/drive/v3/drives/${driveId}`);
-
-						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray({ success: true }),
-							{ itemData: { item: i } },
-						);
-
-						returnData.push(...executionData);
-					}
-					if (operation === 'get') {
-						// ----------------------------------
-						//         get
-						// ----------------------------------
-
-						const driveId = this.getNodeParameter('driveId', i, undefined, {
-							extractValue: true,
-						}) as string;
-
-						const qs: IDataObject = {};
-
-						Object.assign(qs, options);
-
-						const response = await googleApiRequest.call(
-							this,
-							'GET',
-							`/drive/v3/drives/${driveId}`,
-							{},
-							qs,
-						);
-
-						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(response as IDataObject[]),
-							{ itemData: { item: i } },
-						);
-
-						returnData.push(...executionData);
-					}
-					if (operation === 'list') {
-						// ----------------------------------
-						//         list
-						// ----------------------------------
-						const returnAll = this.getNodeParameter('returnAll', i);
-
-						const qs: IDataObject = {};
-
-						let response: IDataObject[] = [];
-
-						Object.assign(qs, options);
-
-						if (returnAll) {
-							response = await googleApiRequestAllItems.call(
-								this,
-								'drives',
-								'GET',
-								'/drive/v3/drives',
-								{},
-								qs,
-							);
-						} else {
-							qs.pageSize = this.getNodeParameter('limit', i);
-							const data = await googleApiRequest.call(this, 'GET', '/drive/v3/drives', {}, qs);
-							response = data.drives as IDataObject[];
-						}
-
-						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(response),
-							{ itemData: { item: i } },
-						);
-
-						returnData.push(...executionData);
-					}
-					if (operation === 'update') {
-						// ----------------------------------
-						//         update
-						// ----------------------------------
-
-						const driveId = this.getNodeParameter('driveId', i, undefined, {
-							extractValue: true,
-						}) as string;
-
-						const body: IDataObject = {};
-
-						Object.assign(body, options);
-
-						const response = await googleApiRequest.call(
-							this,
-							'PATCH',
-							`/drive/v3/drives/${driveId}`,
-							body,
-						);
-
-						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(response as IDataObject[]),
-							{ itemData: { item: i } },
-						);
-
-						returnData.push(...executionData);
-					}
-				}
-				if (resource === 'file') {
-					if (operation === 'copy') {
-						// ----------------------------------
-						//         copy
-						// ----------------------------------
-
-						const fileId = this.getNodeParameter('fileId', i, undefined, {
-							extractValue: true,
-						}) as string;
-
-						const body: IDataObject = {
-							fields: queryFields,
-						};
-
-						const optionProperties = ['name', 'parents'];
-						for (const propertyName of optionProperties) {
-							if (options[propertyName] !== undefined) {
-								body[propertyName] = options[propertyName];
-							}
-						}
-
-						const qs = {
-							supportsAllDrives: true,
-						};
-
-						const response = await googleApiRequest.call(
-							this,
-							'POST',
-							`/drive/v3/files/${fileId}/copy`,
-							body,
-							qs,
-						);
-
-						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(response as IDataObject[]),
-							{ itemData: { item: i } },
-						);
-
-						returnData.push(...executionData);
-					} else if (operation === 'download') {
-						// ----------------------------------
-						//         download
-						// ----------------------------------
-
-						const fileId = this.getNodeParameter('fileId', i, undefined, {
-							extractValue: true,
-						}) as string;
-						const downloadOptions = this.getNodeParameter('options', i);
-
-						const requestOptions = {
-							useStream: true,
-							resolveWithFullResponse: true,
-							encoding: null,
-							json: false,
-						};
-
-						const file = await googleApiRequest.call(
-							this,
-							'GET',
-							`/drive/v3/files/${fileId}`,
-							{},
-							{ fields: 'mimeType,name', supportsTeamDrives: true },
-						);
-						let response;
-
-						if (file.mimeType.includes('vnd.google-apps')) {
-							const parameterKey = 'options.googleFileConversion.conversion';
-							const type = file.mimeType.split('.')[2];
-							let mime;
-							if (type === 'document') {
-								mime = this.getNodeParameter(
-									`${parameterKey}.docsToFormat`,
-									i,
-									'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-								) as string;
-							} else if (type === 'presentation') {
-								mime = this.getNodeParameter(
-									`${parameterKey}.slidesToFormat`,
-									i,
-									'application/vnd.openxmlformats-officedocument.presentationml.presentation',
-								) as string;
-							} else if (type === 'spreadsheet') {
-								mime = this.getNodeParameter(
-									`${parameterKey}.sheetsToFormat`,
-									i,
-									'application/x-vnd.oasis.opendocument.spreadsheet',
-								) as string;
-							} else {
-								mime = this.getNodeParameter(
-									`${parameterKey}.drawingsToFormat`,
-									i,
-									'image/jpeg',
-								) as string;
-							}
-							response = await googleApiRequest.call(
-								this,
-								'GET',
-								`/drive/v3/files/${fileId}/export`,
-								{},
-								{ mimeType: mime },
-								undefined,
-								requestOptions,
-							);
-						} else {
-							response = await googleApiRequest.call(
-								this,
-								'GET',
-								`/drive/v3/files/${fileId}`,
-								{},
-								{ alt: 'media' },
-								undefined,
-								requestOptions,
-							);
-						}
-
-						const mimeType = response.headers['content-type'] ?? file.mimeType ?? undefined;
-						const fileName = downloadOptions.fileName ?? file.name ?? undefined;
-
-						const newItem: INodeExecutionData = {
-							json: items[i].json,
-							binary: {},
-						};
-
-						if (items[i].binary !== undefined) {
-							// Create a shallow copy of the binary data so that the old
-							// data references which do not get changed still stay behind
-							// but the incoming data does not get changed.
-							// @ts-ignore
-							Object.assign(newItem.binary, items[i].binary);
-						}
-
-						items[i] = newItem;
-
-						const dataPropertyNameDownload = this.getNodeParameter('binaryPropertyName', i);
-
-						items[i].binary![dataPropertyNameDownload] = await this.helpers.prepareBinaryData(
-							response.body as unknown as Readable,
-							fileName as string,
-							mimeType as string,
-						);
-					} else if (operation === 'list') {
-						// ----------------------------------
-						//         list
-						// ----------------------------------
-
-						let querySpaces = '';
-						if (options.spaces) {
-							const spaces = options.spaces as string[];
-							if (spaces.includes('*')) {
-								querySpaces = 'appDataFolder, drive, photos';
-							} else {
-								querySpaces = spaces.join(', ');
-							}
-						}
-
-						let queryCorpora = '';
-						if (options.corpora) {
-							queryCorpora = options.corpora as string;
-						}
-
-						let driveId: string | undefined;
-						driveId = options.driveId as string;
-						if (driveId === '') {
-							driveId = undefined;
-						}
-
-						let queryString = '';
-						const useQueryString = this.getNodeParameter('useQueryString', i) as boolean;
-						if (useQueryString) {
-							// Use the user defined query string
-							queryString = this.getNodeParameter('queryString', i) as string;
-						} else {
-							// Build query string out of parameters set by user
-							const queryFilters = this.getNodeParameter('queryFilters', i) as IDataObject;
-
-							const queryFilterFields: string[] = [];
-							if (queryFilters.name) {
-								(queryFilters.name as IDataObject[]).forEach((nameFilter) => {
-									let filterOperation = nameFilter.operation;
-									if (filterOperation === 'is') {
-										filterOperation = '=';
-									} else if (filterOperation === 'isNot') {
-										filterOperation = '!=';
-									}
-									queryFilterFields.push(`name ${filterOperation} '${nameFilter.value}'`);
-								});
-
-								queryString += queryFilterFields.join(' or ');
-							}
-
-							queryFilterFields.length = 0;
-							if (queryFilters.mimeType) {
-								(queryFilters.mimeType as IDataObject[]).forEach((mimeTypeFilter) => {
-									let mimeType = mimeTypeFilter.mimeType;
-									if (mimeTypeFilter.mimeType === 'custom') {
-										mimeType = mimeTypeFilter.customMimeType;
-									}
-									queryFilterFields.push(`mimeType = '${mimeType}'`);
-								});
-
-								if (queryFilterFields.length) {
-									if (queryString !== '') {
-										queryString += ' and ';
-									}
-
-									queryString += queryFilterFields.join(' or ');
-								}
-							}
-						}
-
-						const pageSize = this.getNodeParameter('limit', i);
-
-						const qs = {
-							pageSize,
-							orderBy: 'modifiedTime',
-							fields: `nextPageToken, files(${queryFields})`,
-							spaces: querySpaces,
-							q: queryString,
-							includeItemsFromAllDrives: queryCorpora !== '' || driveId !== '',
-							supportsAllDrives: queryCorpora !== '' || driveId !== '',
-						};
-
-						const response = await googleApiRequest.call(this, 'GET', '/drive/v3/files', {}, qs);
-
-						const files = response.files;
-
-						const version = this.getNode().typeVersion;
-
-						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(files as IDataObject[]),
-							{ itemData: { item: i } },
-						);
-
-						if (version === 1) {
-							return [executionData];
-						}
-
-						returnData.push(...executionData);
-					} else if (operation === 'upload') {
-						// ----------------------------------
-						//         upload
-						// ----------------------------------
-						const resolveData = this.getNodeParameter('resolveData', 0);
-
-						let contentLength: number;
-						let fileContent: Buffer | Readable;
-						let originalFilename: string | undefined;
-						let mimeType = 'text/plain';
-
-						if (this.getNodeParameter('binaryData', i)) {
-							const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i);
-							const binaryData = this.helpers.assertBinaryData(i, binaryPropertyName);
-							if (binaryData.id) {
-								// Stream data in 256KB chunks, and upload the via the resumable upload api
-								fileContent = this.helpers.getBinaryStream(binaryData.id, UPLOAD_CHUNK_SIZE);
-								const metadata = await this.helpers.getBinaryMetadata(binaryData.id);
-								contentLength = metadata.fileSize;
-								originalFilename = metadata.fileName;
-								if (metadata.mimeType) mimeType = binaryData.mimeType;
-							} else {
-								fileContent = Buffer.from(binaryData.data, BINARY_ENCODING);
-								contentLength = fileContent.length;
-								originalFilename = binaryData.fileName;
-								mimeType = binaryData.mimeType;
-							}
-						} else {
-							// Is text file
-							fileContent = Buffer.from(this.getNodeParameter('fileContent', i) as string, 'utf8');
-							contentLength = fileContent.byteLength;
-						}
-
-						const name = this.getNodeParameter('name', i) as string;
-						const parents = this.getNodeParameter('parents', i) as string[];
-
-						let uploadId;
-						if (Buffer.isBuffer(fileContent)) {
-							const response = await googleApiRequest.call(
-								this,
-								'POST',
-								'/upload/drive/v3/files',
-								fileContent,
-								{
-									fields: queryFields,
-									uploadType: 'media',
-								},
-								undefined,
-								{
-									headers: {
-										'Content-Type': mimeType,
-										'Content-Length': contentLength,
-									},
-									encoding: null,
-									json: false,
-								},
-							);
-							uploadId = JSON.parse(response as string).id;
-						} else {
-							const resumableUpload = await googleApiRequest.call(
-								this,
-								'POST',
-								'/upload/drive/v3/files',
-								undefined,
-								{ uploadType: 'resumable' },
-								undefined,
-								{
-									resolveWithFullResponse: true,
-								},
-							);
-							const uploadUrl = resumableUpload.headers.location;
-
-							let offset = 0;
-							for await (const chunk of fileContent) {
-								const nextOffset = offset + Number(chunk.length);
-								try {
-									const response = await this.helpers.httpRequest({
-										method: 'PUT',
-										url: uploadUrl,
-										headers: {
-											'Content-Length': chunk.length,
-											'Content-Range': `bytes ${offset}-${nextOffset - 1}/${contentLength}`,
-										},
-										body: chunk,
-									});
-									uploadId = response.id;
-								} catch (error) {
-									if (error.response?.status !== 308) throw error;
-								}
-								offset = nextOffset;
-							}
-						}
-
-						const requestBody = {
-							mimeType,
-							name,
-							originalFilename,
-						};
-
-						const properties = this.getNodeParameter(
-							'options.propertiesUi.propertyValues',
-							i,
-							[],
-						) as IDataObject[];
-
-						if (properties.length) {
-							Object.assign(requestBody, {
-								properties: properties.reduce(
-									(obj, value) => Object.assign(obj, { [`${value.key}`]: value.value }),
-									{},
-								),
-							});
-						}
-
-						const appProperties = this.getNodeParameter(
-							'options.appPropertiesUi.appPropertyValues',
-							i,
-							[],
-						) as IDataObject[];
-
-						if (properties.length) {
-							Object.assign(requestBody, {
-								appProperties: appProperties.reduce(
-									(obj, value) => Object.assign(obj, { [`${value.key}`]: value.value }),
-									{},
-								),
-							});
-						}
-
-						let response = await googleApiRequest.call(
-							this,
-							'PATCH',
-							`/drive/v3/files/${uploadId}`,
-							requestBody,
-							{
-								addParents: parents.join(','),
-								// When set to true shared drives can be used.
-								supportsAllDrives: true,
-							},
-						);
-
-						if (resolveData) {
-							response = await googleApiRequest.call(
-								this,
-								'GET',
-								`/drive/v3/files/${response.id}`,
-								{},
-								{ fields: '*' },
-							);
-						}
-
-						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(response as IDataObject[]),
-							{ itemData: { item: i } },
-						);
-						returnData.push(...executionData);
-					} else if (operation === 'update') {
-						// ----------------------------------
-						//         file:update
-						// ----------------------------------
-
-						const id = this.getNodeParameter('fileId', i, undefined, {
-							extractValue: true,
-						}) as string;
-						const updateFields = this.getNodeParameter('updateFields', i, {});
-
-						const qs: IDataObject = {
-							supportsAllDrives: true,
-						};
-
-						Object.assign(qs, options);
-
-						qs.fields = queryFields;
-
-						const body: IDataObject = {};
-
-						if (updateFields.fileName) {
-							body.name = updateFields.fileName;
-						}
-
-						if (updateFields.hasOwnProperty('trashed')) {
-							body.trashed = updateFields.trashed;
-						}
-
-						if (updateFields.parentId && updateFields.parentId !== '') {
-							qs.addParents = updateFields.parentId;
-						}
-
-						const responseData = await googleApiRequest.call(
-							this,
-							'PATCH',
-							`/drive/v3/files/${id}`,
-							body,
-							qs,
-						);
-
-						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData as IDataObject[]),
-							{ itemData: { item: i } },
-						);
-						returnData.push(...executionData);
-					}
-				}
-				if (resource === 'folder') {
-					if (operation === 'create') {
-						// ----------------------------------
-						//         folder:create
-						// ----------------------------------
-
-						const name = this.getNodeParameter('name', i) as string;
-
-						const body = {
-							name,
-							mimeType: 'application/vnd.google-apps.folder',
-							parents: options.parents || [],
-						};
-
-						const qs = {
-							fields: queryFields,
-							supportsAllDrives: true,
-						};
-
-						const response = await googleApiRequest.call(this, 'POST', '/drive/v3/files', body, qs);
-
-						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(response as IDataObject[]),
-							{ itemData: { item: i } },
-						);
-						returnData.push(...executionData);
-					}
-				}
-				if (['file', 'folder'].includes(resource)) {
-					if (operation === 'delete') {
-						// ----------------------------------
-						//         delete
-						// ----------------------------------
-
-						const fileId = this.getNodeParameter('fileId', i, undefined, {
-							extractValue: true,
-						}) as string;
-
-						await googleApiRequest.call(
-							this,
-							'DELETE',
-							`/drive/v3/files/${fileId}`,
-							{},
-							{ supportsTeamDrives: true },
-						);
-
-						// If we are still here it did succeed
-						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray({
-								fileId,
-								success: true,
-							}),
-							{ itemData: { item: i } },
-						);
-
-						returnData.push(...executionData);
-					}
-					if (operation === 'share') {
-						const fileId = this.getNodeParameter('fileId', i, undefined, {
-							extractValue: true,
-						}) as string;
-
-						const permissions = this.getNodeParameter('permissionsUi', i) as IDataObject;
-
-						const shareOption = this.getNodeParameter('options', i);
-
-						const body: IDataObject = {};
-
-						const qs: IDataObject = {
-							supportsTeamDrives: true,
-						};
-
-						if (permissions.permissionsValues) {
-							Object.assign(body, permissions.permissionsValues);
-						}
-
-						Object.assign(qs, shareOption);
-
-						const response = await googleApiRequest.call(
-							this,
-							'POST',
-							`/drive/v3/files/${fileId}/permissions`,
-							body,
-							qs,
-						);
-
-						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(response as IDataObject[]),
-							{ itemData: { item: i } },
-						);
-						returnData.push(...executionData);
-					}
-				}
-			} catch (error) {
-				if (this.continueOnFail()) {
-					if (resource === 'file' && operation === 'download') {
-						items[i].json = { error: error.message };
-					} else {
-						returnData.push({ json: { error: error.message } });
-					}
-					continue;
-				}
-				throw error;
-			}
-		}
-		if (resource === 'file' && operation === 'download') {
-			// For file downloads the files get attached to the existing items
-			return this.prepareOutputData(items);
-		} else {
-			// For all other ones does the output items get replaced
-			return this.prepareOutputData(returnData);
-		}
+import type { INodeTypeBaseDescription, IVersionedNodeType } from 'n8n-workflow';
+import { VersionedNodeType } from 'n8n-workflow';
+
+import { GoogleDriveV1 } from './v1/GoogleDriveV1.node';
+import { GoogleDriveV2 } from './v2/GoogleDriveV2.node';
+
+export class GoogleDrive extends VersionedNodeType {
+	constructor() {
+		const baseDescription: INodeTypeBaseDescription = {
+			displayName: 'Google Drive',
+			name: 'googleDrive',
+			icon: 'file:googleDrive.svg',
+			group: ['input'],
+			subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+			description: 'Access data on Google Drive',
+			defaultVersion: 3,
+		};
+
+		const nodeVersions: IVersionedNodeType['nodeVersions'] = {
+			1: new GoogleDriveV1(baseDescription),
+			2: new GoogleDriveV1(baseDescription),
+			3: new GoogleDriveV2(baseDescription),
+		};
+
+		super(nodeVersions, baseDescription);
 	}
 }
diff --git a/packages/nodes-base/nodes/Google/Drive/GoogleDriveTrigger.node.ts b/packages/nodes-base/nodes/Google/Drive/GoogleDriveTrigger.node.ts
index fd964b0a26fb0..50efeade16a57 100644
--- a/packages/nodes-base/nodes/Google/Drive/GoogleDriveTrigger.node.ts
+++ b/packages/nodes-base/nodes/Google/Drive/GoogleDriveTrigger.node.ts
@@ -9,10 +9,10 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import { extractId, googleApiRequest, googleApiRequestAllItems } from './GenericFunctions';
-
-import moment from 'moment';
-import { fileSearch, folderSearch } from './SearchFunctions';
+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';
 
 export class GoogleDriveTrigger implements INodeType {
 	description: INodeTypeDescription = {
@@ -112,15 +112,13 @@ export class GoogleDriveTrigger implements INodeType {
 						placeholder: 'https://drive.google.com/file/d/1wroCSfK-hupQIYf_xzeoUEzOhvfTFH2P/edit',
 						extractValue: {
 							type: 'regex',
-							regex:
-								'https:\\/\\/(?:drive|docs)\\.google\\.com\\/\\w+\\/d\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)',
+							regex: GOOGLE_DRIVE_FILE_URL_REGEX,
 						},
 						validation: [
 							{
 								type: 'regex',
 								properties: {
-									regex:
-										'https:\\/\\/(?:drive|docs)\\.google.com\\/\\w+\\/d\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)',
+									regex: GOOGLE_DRIVE_FILE_URL_REGEX,
 									errorMessage: 'Not a valid Google Drive File URL',
 								},
 							},
@@ -192,15 +190,13 @@ export class GoogleDriveTrigger implements INodeType {
 						placeholder: 'https://drive.google.com/drive/folders/1Tx9WHbA3wBpPB4C_HcoZDH9WZFWYxAMU',
 						extractValue: {
 							type: 'regex',
-							regex:
-								'https:\\/\\/drive\\.google\\.com\\/\\w+\\/folders\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)',
+							regex: GOOGLE_DRIVE_FOLDER_URL_REGEX,
 						},
 						validation: [
 							{
 								type: 'regex',
 								properties: {
-									regex:
-										'https:\\/\\/drive\\.google\\.com\\/\\w+\\/folders\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)',
+									regex: GOOGLE_DRIVE_FOLDER_URL_REGEX,
 									errorMessage: 'Not a valid Google Drive Folder URL',
 								},
 							},
@@ -432,7 +428,12 @@ export class GoogleDriveTrigger implements INodeType {
 		const event = this.getNodeParameter('event') as string;
 		const webhookData = this.getWorkflowStaticData('node');
 		const options = this.getNodeParameter('options', {}) as IDataObject;
-		const qs: IDataObject = {};
+		const qs: IDataObject = {
+			includeItemsFromAllDrives: true,
+			supportsAllDrives: true,
+			spaces: 'appDataFolder, drive',
+			corpora: 'allDrives',
+		};
 
 		const now = moment().utc().format();
 
diff --git a/packages/nodes-base/nodes/Google/Drive/googleDrive.svg b/packages/nodes-base/nodes/Google/Drive/googleDrive.svg
index f312de582ec04..643c5d9941dc9 100644
--- a/packages/nodes-base/nodes/Google/Drive/googleDrive.svg
+++ b/packages/nodes-base/nodes/Google/Drive/googleDrive.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 81 73" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><g stroke="none" fill-rule="nonzero"><path d="M6.048 61.26l3.528 6.094c.733 1.283 1.787 2.291 3.024 3.024l12.6-21.81H0a8.3 8.3 0 001.1 4.124z" fill="#0066da"/><path d="M40 22.91L27.4 1.1c-1.237.733-2.291 1.741-3.024 3.024L1.1 44.445A8.298 8.298 0 000 48.568h25.2z" fill="#00ac47"/><path d="M67.4 70.378c1.237-.733 2.291-1.741 3.024-3.024l1.466-2.52 7.01-12.142a8.3 8.3 0 001.1-4.124H54.798l5.363 10.538z" fill="#ea4335"/><path d="M40 22.91L52.6 1.1C51.363.367 49.943 0 48.477 0H31.524c-1.466 0-2.887.412-4.124 1.1z" fill="#00832d"/><path d="M54.799 48.568H25.2l-12.6 21.81c1.237.733 2.657 1.1 4.124 1.1h46.552c1.466 0 2.887-.412 4.124-1.1z" fill="#2684fc"/><path d="M67.262 24.284L55.624 4.124C54.891 2.841 53.837 1.833 52.6 1.1L40 22.91l14.8 25.659h25.155a8.3 8.3 0 00-1.1-4.124z" fill="#ffba00"/></g></symbol></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round" viewBox="0 0 81 73"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><g fill-rule="nonzero" stroke="none"><path fill="#0066da" d="m6.048 61.26 3.528 6.094c.733 1.283 1.787 2.291 3.024 3.024l12.6-21.81H0a8.3 8.3 0 0 0 1.1 4.124z"/><path fill="#00ac47" d="M40 22.91 27.4 1.1c-1.237.733-2.291 1.741-3.024 3.024L1.1 44.445A8.3 8.3 0 0 0 0 48.568h25.2z"/><path fill="#ea4335" d="M67.4 70.378c1.237-.733 2.291-1.741 3.024-3.024l1.466-2.52 7.01-12.142a8.3 8.3 0 0 0 1.1-4.124H54.798l5.363 10.538z"/><path fill="#00832d" d="M40 22.91 52.6 1.1C51.363.367 49.943 0 48.477 0H31.524c-1.466 0-2.887.412-4.124 1.1z"/><path fill="#2684fc" d="M54.799 48.568H25.2l-12.6 21.81c1.237.733 2.657 1.1 4.124 1.1h46.552c1.466 0 2.887-.412 4.124-1.1z"/><path fill="#ffba00" d="M67.262 24.284 55.624 4.124C54.891 2.841 53.837 1.833 52.6 1.1L40 22.91l14.8 25.659h25.155a8.3 8.3 0 0 0-1.1-4.124z"/></g></symbol></svg>
\ No newline at end of file
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
new file mode 100644
index 0000000000000..55b84d77631d9
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/create.test.ts
@@ -0,0 +1,75 @@
+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', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		googleApiRequest: jest.fn(async function () {
+			return {};
+		}),
+	};
+});
+
+jest.mock('uuid', () => {
+	const originalModule = jest.requireActual('uuid');
+	return {
+		...originalModule,
+		v4: jest.fn(function () {
+			return '430c0ca1-2498-472c-9d43-da0163839823';
+		}),
+	};
+});
+
+describe('test GoogleDriveV2: drive create', () => {
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	it('shuold be called with', async () => {
+		const nodeParameters = {
+			resource: 'drive',
+			name: 'newDrive',
+			options: {
+				capabilities: {
+					canComment: true,
+					canRename: true,
+					canTrashChildren: true,
+				},
+				colorRgb: '#451AD3',
+				hidden: false,
+				restrictions: {
+					driveMembersOnly: true,
+				},
+			},
+		};
+
+		const fakeExecuteFunction = createMockExecuteFunction(nodeParameters, driveNode);
+
+		await create.execute.call(fakeExecuteFunction, 0);
+
+		expect(transport.googleApiRequest).toBeCalledTimes(1);
+		expect(transport.googleApiRequest).toHaveBeenCalledWith(
+			'POST',
+			'/drive/v3/drives',
+			{
+				capabilities: { canComment: true, canRename: true, canTrashChildren: true },
+				colorRgb: '#451AD3',
+				hidden: false,
+				name: 'newDrive',
+				restrictions: { driveMembersOnly: true },
+			},
+			{ requestId: '430c0ca1-2498-472c-9d43-da0163839823' },
+		);
+	});
+});
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
new file mode 100644
index 0000000000000..e18249797ecad
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/deleteDrive.test.ts
@@ -0,0 +1,50 @@
+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', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		googleApiRequest: jest.fn(async function () {
+			return {};
+		}),
+	};
+});
+
+describe('test GoogleDriveV2: drive deleteDrive', () => {
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	it('shuold be called with', async () => {
+		const nodeParameters = {
+			resource: 'drive',
+			operation: 'deleteDrive',
+			driveId: {
+				__rl: true,
+				value: 'driveIDxxxxxx',
+				mode: 'id',
+			},
+		};
+
+		const fakeExecuteFunction = createMockExecuteFunction(nodeParameters, driveNode);
+
+		await deleteDrive.execute.call(fakeExecuteFunction, 0);
+
+		expect(transport.googleApiRequest).toBeCalledTimes(1);
+		expect(transport.googleApiRequest).toHaveBeenCalledWith(
+			'DELETE',
+			'/drive/v3/drives/driveIDxxxxxx',
+		);
+	});
+});
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
new file mode 100644
index 0000000000000..d46cb35fb9150
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/get.test.ts
@@ -0,0 +1,55 @@
+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', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		googleApiRequest: jest.fn(async function () {
+			return {};
+		}),
+	};
+});
+
+describe('test GoogleDriveV2: drive get', () => {
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	it('shuold be called with', async () => {
+		const nodeParameters = {
+			resource: 'drive',
+			operation: 'get',
+			driveId: {
+				__rl: true,
+				value: 'driveIDxxxxxx',
+				mode: 'id',
+			},
+			options: {
+				useDomainAdminAccess: true,
+			},
+		};
+
+		const fakeExecuteFunction = createMockExecuteFunction(nodeParameters, driveNode);
+
+		await get.execute.call(fakeExecuteFunction, 0);
+
+		expect(transport.googleApiRequest).toBeCalledTimes(1);
+		expect(transport.googleApiRequest).toHaveBeenCalledWith(
+			'GET',
+			'/drive/v3/drives/driveIDxxxxxx',
+			{},
+			{ useDomainAdminAccess: true },
+		);
+	});
+});
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
new file mode 100644
index 0000000000000..3d5507386daac
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/list.test.ts
@@ -0,0 +1,78 @@
+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', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		googleApiRequest: jest.fn(async function (method: IHttpRequestMethods) {
+			if (method === 'GET') {
+				return {};
+			}
+		}),
+		googleApiRequestAllItems: jest.fn(async function (method: IHttpRequestMethods) {
+			if (method === 'GET') {
+				return {};
+			}
+		}),
+	};
+});
+
+describe('test GoogleDriveV2: drive list', () => {
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	it('shuold be called with limit', async () => {
+		const nodeParameters = {
+			resource: 'drive',
+			operation: 'list',
+			limit: 20,
+			options: {},
+		};
+
+		const fakeExecuteFunction = createMockExecuteFunction(nodeParameters, driveNode);
+
+		await list.execute.call(fakeExecuteFunction, 0);
+
+		expect(transport.googleApiRequest).toBeCalledTimes(1);
+		expect(transport.googleApiRequest).toHaveBeenCalledWith(
+			'GET',
+			'/drive/v3/drives',
+			{},
+			{ pageSize: 20 },
+		);
+	});
+
+	it('shuold be called with returnAll true', async () => {
+		const nodeParameters = {
+			resource: 'drive',
+			operation: 'list',
+			returnAll: true,
+			options: {},
+		};
+
+		const fakeExecuteFunction = createMockExecuteFunction(nodeParameters, driveNode);
+
+		await list.execute.call(fakeExecuteFunction, 0);
+
+		expect(transport.googleApiRequestAllItems).toBeCalledTimes(1);
+		expect(transport.googleApiRequestAllItems).toHaveBeenCalledWith(
+			'GET',
+			'drives',
+			'/drive/v3/drives',
+			{},
+			{},
+		);
+	});
+});
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
new file mode 100644
index 0000000000000..534379fd54eef
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/update.test.ts
@@ -0,0 +1,58 @@
+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', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		googleApiRequest: jest.fn(async function () {
+			return {};
+		}),
+	};
+});
+
+describe('test GoogleDriveV2: drive update', () => {
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	it('shuold be called with', async () => {
+		const nodeParameters = {
+			resource: 'drive',
+			operation: 'update',
+			driveId: {
+				__rl: true,
+				value: 'sharedDriveIDxxxxx',
+				mode: 'id',
+			},
+			options: {
+				colorRgb: '#F4BEBE',
+				name: 'newName',
+				restrictions: {
+					driveMembersOnly: true,
+				},
+			},
+		};
+
+		const fakeExecuteFunction = createMockExecuteFunction(nodeParameters, driveNode);
+
+		await update.execute.call(fakeExecuteFunction, 0);
+
+		expect(transport.googleApiRequest).toBeCalledTimes(1);
+		expect(transport.googleApiRequest).toHaveBeenCalledWith(
+			'PATCH',
+			'/drive/v3/drives/sharedDriveIDxxxxx',
+			{ colorRgb: '#F4BEBE', name: 'newName', restrictions: { driveMembersOnly: true } },
+		);
+	});
+});
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
new file mode 100644
index 0000000000000..ddc4891cbf0ee
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/copy.test.ts
@@ -0,0 +1,76 @@
+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', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		googleApiRequest: jest.fn(async function () {
+			return {};
+		}),
+	};
+});
+
+describe('test GoogleDriveV2: file copy', () => {
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	it('should be called with', async () => {
+		const nodeParameters = {
+			operation: 'copy',
+			fileId: {
+				__rl: true,
+				value: 'fileIDxxxxxx',
+				mode: 'list',
+				cachedResultName: 'test01.png',
+				cachedResultUrl: 'https://drive.google.com/file/d/fileIDxxxxxx/view?usp=drivesdk',
+			},
+			name: 'copyImage.png',
+			sameFolder: false,
+			folderId: {
+				__rl: true,
+				value: 'folderIDxxxxxx',
+				mode: 'list',
+				cachedResultName: 'testFolder 3',
+				cachedResultUrl: 'https://drive.google.com/drive/folders/folderIDxxxxxx',
+			},
+			options: {
+				copyRequiresWriterPermission: true,
+				description: 'image copy',
+			},
+		};
+
+		const fakeExecuteFunction = createMockExecuteFunction(nodeParameters, driveNode);
+
+		await copy.execute.call(fakeExecuteFunction, 0);
+
+		expect(transport.googleApiRequest).toBeCalledTimes(1);
+		expect(transport.googleApiRequest).toBeCalledWith(
+			'POST',
+			'/drive/v3/files/fileIDxxxxxx/copy',
+			{
+				copyRequiresWriterPermission: true,
+				description: 'image copy',
+				name: 'copyImage.png',
+				parents: ['folderIDxxxxxx'],
+			},
+			{
+				supportsAllDrives: true,
+				corpora: 'allDrives',
+				includeItemsFromAllDrives: true,
+				spaces: 'appDataFolder, drive',
+			},
+		);
+	});
+});
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
new file mode 100644
index 0000000000000..040c9aa8806c0
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/createFromText.test.ts
@@ -0,0 +1,102 @@
+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', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		googleApiRequest: jest.fn(async function () {
+			return { id: 42 };
+		}),
+	};
+});
+
+describe('test GoogleDriveV2: file createFromText', () => {
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	it('should be called with', async () => {
+		const nodeParameters = {
+			operation: 'createFromText',
+			content: 'hello drive!',
+			name: 'helloDrive.txt',
+			folderId: {
+				__rl: true,
+				value: 'folderIDxxxxxx',
+				mode: 'list',
+				cachedResultName: 'testFolder 3',
+				cachedResultUrl: 'https://drive.google.com/drive/folders/folderIDxxxxxx',
+			},
+			options: {
+				appPropertiesUi: {
+					appPropertyValues: [
+						{
+							key: 'appKey1',
+							value: 'appValue1',
+						},
+					],
+				},
+				propertiesUi: {
+					propertyValues: [
+						{
+							key: 'prop1',
+							value: 'value1',
+						},
+						{
+							key: 'prop2',
+							value: 'value2',
+						},
+					],
+				},
+				keepRevisionForever: true,
+				ocrLanguage: 'en',
+				useContentAsIndexableText: true,
+			},
+		};
+
+		const fakeExecuteFunction = createMockExecuteFunction(nodeParameters, driveNode);
+
+		await createFromText.execute.call(fakeExecuteFunction, 0);
+
+		expect(transport.googleApiRequest).toBeCalledTimes(2);
+		expect(transport.googleApiRequest).toHaveBeenCalledWith(
+			'POST',
+			'/upload/drive/v3/files',
+			expect.anything(), // Buffer of content goes here
+			{ uploadType: 'media' },
+			undefined,
+			{ headers: { 'Content-Length': 12, 'Content-Type': 'text/plain' } },
+		);
+		expect(transport.googleApiRequest).toHaveBeenCalledWith(
+			'PATCH',
+			'/drive/v3/files/42',
+			{
+				appProperties: { appKey1: 'appValue1' },
+				mimeType: 'text/plain',
+				name: 'helloDrive.txt',
+				properties: { prop1: 'value1', prop2: 'value2' },
+			},
+			{
+				addParents: 'folderIDxxxxxx',
+				corpora: 'allDrives',
+				includeItemsFromAllDrives: true,
+				keepRevisionForever: true,
+				ocrLanguage: 'en',
+				spaces: 'appDataFolder, drive',
+				supportsAllDrives: true,
+				useContentAsIndexableText: true,
+			},
+		);
+	});
+});
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
new file mode 100644
index 0000000000000..cbfd2edf6b70b
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/deleteFile.test.ts
@@ -0,0 +1,56 @@
+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', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		googleApiRequest: jest.fn(async function () {
+			return {};
+		}),
+	};
+});
+
+describe('test GoogleDriveV2: file deleteFile', () => {
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	it('should be called with', async () => {
+		const nodeParameters = {
+			operation: 'deleteFile',
+			fileId: {
+				__rl: true,
+				value: 'fileIDxxxxxx',
+				mode: 'list',
+				cachedResultName: 'test.txt',
+				cachedResultUrl: 'https://drive.google.com/file/d/fileIDxxxxxx/view?usp=drivesdk',
+			},
+			options: {
+				deletePermanently: true,
+			},
+		};
+
+		const fakeExecuteFunction = createMockExecuteFunction(nodeParameters, driveNode);
+
+		await deleteFile.execute.call(fakeExecuteFunction, 0);
+
+		expect(transport.googleApiRequest).toBeCalledTimes(1);
+		expect(transport.googleApiRequest).toHaveBeenCalledWith(
+			'DELETE',
+			'/drive/v3/files/fileIDxxxxxx',
+			undefined,
+			{ supportsAllDrives: true },
+		);
+	});
+});
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
new file mode 100644
index 0000000000000..3061f74953418
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/download.test.ts
@@ -0,0 +1,64 @@
+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', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		googleApiRequest: jest.fn(async function () {
+			return {};
+		}),
+	};
+});
+
+describe('test GoogleDriveV2: file download', () => {
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	it('should be called with', async () => {
+		const nodeParameters = {
+			operation: 'deleteFile',
+			fileId: {
+				__rl: true,
+				value: 'fileIDxxxxxx',
+				mode: 'list',
+				cachedResultName: 'test.txt',
+				cachedResultUrl: 'https://drive.google.com/file/d/fileIDxxxxxx/view?usp=drivesdk',
+			},
+			options: {
+				deletePermanently: true,
+			},
+		};
+
+		const fakeExecuteFunction = createMockExecuteFunction(nodeParameters, driveNode);
+
+		await download.execute.call(fakeExecuteFunction, 0, { json: {} });
+
+		expect(transport.googleApiRequest).toBeCalledTimes(2);
+		expect(transport.googleApiRequest).toHaveBeenCalledWith(
+			'GET',
+			'/drive/v3/files/fileIDxxxxxx',
+			{},
+			{ fields: 'mimeType,name', supportsTeamDrives: true, supportsAllDrives: true },
+		);
+		expect(transport.googleApiRequest).toHaveBeenCalledWith(
+			'GET',
+			'/drive/v3/files/fileIDxxxxxx',
+			{},
+			{ alt: 'media', supportsAllDrives: true },
+			undefined,
+			{ encoding: 'arraybuffer', json: false, returnFullResponse: true, useStream: true },
+		);
+	});
+});
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
new file mode 100644
index 0000000000000..ead8e50d666b4
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/move.test.ts
@@ -0,0 +1,84 @@
+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', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		googleApiRequest: jest.fn(async function (method: IHttpRequestMethods) {
+			if (method === 'GET') {
+				return {
+					parents: ['parentFolderIDxxxxxx'],
+				};
+			}
+			return {};
+		}),
+	};
+});
+
+describe('test GoogleDriveV2: file move', () => {
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	it('should be called with', async () => {
+		const nodeParameters = {
+			operation: 'move',
+			fileId: {
+				__rl: true,
+				value: 'fileIDxxxxxx',
+				mode: 'list',
+				cachedResultName: 'test.txt',
+				cachedResultUrl: 'https://drive.google.com/file/d/fileIDxxxxxx/view?usp=drivesdk',
+			},
+			folderId: {
+				__rl: true,
+				value: 'folderIDxxxxxx',
+				mode: 'list',
+				cachedResultName: 'testFolder1',
+				cachedResultUrl: 'https://drive.google.com/drive/folders/folderIDxxxxxx',
+			},
+		};
+
+		const fakeExecuteFunction = createMockExecuteFunction(nodeParameters, driveNode);
+
+		await move.execute.call(fakeExecuteFunction, 0);
+
+		expect(transport.googleApiRequest).toBeCalledTimes(2);
+		expect(transport.googleApiRequest).toHaveBeenCalledWith(
+			'GET',
+			'/drive/v3/files/fileIDxxxxxx',
+			undefined,
+			{
+				corpora: 'allDrives',
+				fields: 'parents',
+				includeItemsFromAllDrives: true,
+				spaces: 'appDataFolder, drive',
+				supportsAllDrives: true,
+			},
+		);
+		expect(transport.googleApiRequest).toHaveBeenCalledWith(
+			'PATCH',
+			'/drive/v3/files/fileIDxxxxxx',
+			undefined,
+			{
+				addParents: 'folderIDxxxxxx',
+				removeParents: 'parentFolderIDxxxxxx',
+				corpora: 'allDrives',
+				includeItemsFromAllDrives: true,
+				spaces: 'appDataFolder, drive',
+				supportsAllDrives: true,
+			},
+		);
+	});
+});
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
new file mode 100644
index 0000000000000..c7111f4e94bfc
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/share.test.ts
@@ -0,0 +1,74 @@
+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', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		googleApiRequest: jest.fn(async function () {
+			return {};
+		}),
+	};
+});
+
+describe('test GoogleDriveV2: file share', () => {
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	it('should be called with', async () => {
+		const nodeParameters = {
+			operation: 'share',
+			fileId: {
+				__rl: true,
+				value: 'fileIDxxxxxx',
+				mode: 'list',
+				cachedResultName: 'test.txt',
+				cachedResultUrl: 'https://drive.google.com/file/d/fileIDxxxxxx/view?usp=drivesdk',
+			},
+			permissionsUi: {
+				permissionsValues: {
+					role: 'owner',
+					type: 'user',
+					emailAddress: 'user@gmail.com',
+				},
+			},
+			options: {
+				emailMessage: 'some message',
+				moveToNewOwnersRoot: true,
+				sendNotificationEmail: true,
+				transferOwnership: true,
+				useDomainAdminAccess: true,
+			},
+		};
+
+		const fakeExecuteFunction = createMockExecuteFunction(nodeParameters, driveNode);
+
+		await share.execute.call(fakeExecuteFunction, 0);
+
+		expect(transport.googleApiRequest).toBeCalledTimes(1);
+		expect(transport.googleApiRequest).toHaveBeenCalledWith(
+			'POST',
+			'/drive/v3/files/fileIDxxxxxx/permissions',
+			{ emailAddress: 'user@gmail.com', role: 'owner', type: 'user' },
+			{
+				emailMessage: 'some message',
+				moveToNewOwnersRoot: true,
+				sendNotificationEmail: true,
+				supportsAllDrives: true,
+				transferOwnership: true,
+				useDomainAdminAccess: true,
+			},
+		);
+	});
+});
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
new file mode 100644
index 0000000000000..868f727a47e3a
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/update.test.ts
@@ -0,0 +1,66 @@
+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', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		googleApiRequest: jest.fn(async function () {
+			return {};
+		}),
+	};
+});
+
+describe('test GoogleDriveV2: file update', () => {
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	it('should be called with', async () => {
+		const nodeParameters = {
+			operation: 'update',
+			fileId: {
+				__rl: true,
+				value: 'fileIDxxxxxx',
+				mode: 'list',
+				cachedResultName: 'test.txt',
+				cachedResultUrl: 'https://drive.google.com/file/d/fileIDxxxxxx/view?usp=drivesdk',
+			},
+			newUpdatedFileName: 'test2.txt',
+			options: {
+				keepRevisionForever: true,
+				ocrLanguage: 'en',
+				useContentAsIndexableText: true,
+				fields: ['hasThumbnail', 'starred'],
+			},
+		};
+
+		const fakeExecuteFunction = createMockExecuteFunction(nodeParameters, driveNode);
+
+		await update.execute.call(fakeExecuteFunction, 0);
+
+		expect(transport.googleApiRequest).toBeCalledTimes(1);
+		expect(transport.googleApiRequest).toHaveBeenCalledWith(
+			'PATCH',
+			'/drive/v3/files/fileIDxxxxxx',
+			{ name: 'test2.txt' },
+			{
+				fields: 'hasThumbnail, starred',
+				keepRevisionForever: true,
+				ocrLanguage: 'en',
+				supportsAllDrives: true,
+				useContentAsIndexableText: true,
+			},
+		);
+	});
+});
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
new file mode 100644
index 0000000000000..abc98839f9a26
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/upload.test.ts
@@ -0,0 +1,96 @@
+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 { createMockExecuteFunction, driveNode } from '../helpers';
+
+jest.mock('../../../../v2/transport', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		googleApiRequest: jest.fn(async function (method: IHttpRequestMethods) {
+			if (method === 'POST') {
+				return {
+					headers: { location: 'someLocation' },
+				};
+			}
+			return {};
+		}),
+	};
+});
+
+jest.mock('../../../../v2/helpers/utils', () => {
+	const originalModule = jest.requireActual('../../../../v2/helpers/utils');
+	return {
+		...originalModule,
+		getItemBinaryData: jest.fn(async function () {
+			return {
+				contentLength: '123',
+				fileContent: 'Hello Drive!',
+				originalFilename: 'original.txt',
+				mimeType: 'text/plain',
+			};
+		}),
+	};
+});
+
+describe('test GoogleDriveV2: file upload', () => {
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+		jest.unmock('../../../../v2/helpers/utils');
+	});
+
+	it('should be called with', async () => {
+		const nodeParameters = {
+			name: 'newFile.txt',
+			folderId: {
+				__rl: true,
+				value: 'folderIDxxxxxx',
+				mode: 'list',
+				cachedResultName: 'testFolder 3',
+				cachedResultUrl: 'https://drive.google.com/drive/folders/folderIDxxxxxx',
+			},
+			options: {
+				simplifyOutput: true,
+			},
+		};
+
+		const fakeExecuteFunction = createMockExecuteFunction(nodeParameters, driveNode);
+
+		await upload.execute.call(fakeExecuteFunction, 0);
+
+		expect(transport.googleApiRequest).toBeCalledTimes(2);
+
+		expect(transport.googleApiRequest).toHaveBeenCalledWith(
+			'POST',
+			'/upload/drive/v3/files',
+			undefined,
+			{ uploadType: 'resumable' },
+			undefined,
+			{ returnFullResponse: true },
+		);
+		expect(transport.googleApiRequest).toHaveBeenCalledWith(
+			'PATCH',
+			'/drive/v3/files/undefined',
+			{ mimeType: 'text/plain', name: 'newFile.txt', originalFilename: 'original.txt' },
+			{
+				addParents: 'folderIDxxxxxx',
+				supportsAllDrives: true,
+				corpora: 'allDrives',
+				includeItemsFromAllDrives: true,
+				spaces: 'appDataFolder, drive',
+			},
+		);
+
+		expect(utils.getItemBinaryData).toBeCalledTimes(1);
+		expect(utils.getItemBinaryData).toHaveBeenCalled();
+	});
+});
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
new file mode 100644
index 0000000000000..df26385aa44fd
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/fileFolder/search.test.ts
@@ -0,0 +1,119 @@
+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', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		googleApiRequest: jest.fn(async function (method: IHttpRequestMethods) {
+			if (method === 'GET') {
+				return {};
+			}
+		}),
+		googleApiRequestAllItems: jest.fn(async function (method: IHttpRequestMethods) {
+			if (method === 'GET') {
+				return {};
+			}
+		}),
+	};
+});
+
+describe('test GoogleDriveV2: fileFolder search', () => {
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	it('returnAll = false', async () => {
+		const nodeParameters = {
+			searchMethod: 'name',
+			resource: 'fileFolder',
+			queryString: 'test',
+			returnAll: false,
+			limit: 2,
+			filter: {
+				whatToSearch: 'files',
+				fileTypes: ['application/vnd.google-apps.document'],
+			},
+			options: {
+				fields: ['id', 'name', 'starred', 'version'],
+			},
+		};
+
+		const fakeExecuteFunction = createMockExecuteFunction(nodeParameters, driveNode);
+
+		await search.execute.call(fakeExecuteFunction, 0);
+
+		expect(transport.googleApiRequest).toBeCalledTimes(1);
+		expect(transport.googleApiRequest).toBeCalledWith('GET', '/drive/v3/files', undefined, {
+			corpora: 'allDrives',
+			fields: 'nextPageToken, files(id, name, starred, version)',
+			includeItemsFromAllDrives: true,
+			pageSize: 2,
+			q: "name contains 'test' and mimeType != 'application/vnd.google-apps.folder' and trashed = false and (mimeType = 'application/vnd.google-apps.document')",
+			spaces: 'appDataFolder, drive',
+			supportsAllDrives: true,
+		});
+	});
+
+	it('returnAll = true', async () => {
+		const nodeParameters = {
+			resource: 'fileFolder',
+			searchMethod: 'query',
+			queryString: 'test',
+			returnAll: true,
+			filter: {
+				driveId: {
+					__rl: true,
+					value: 'driveID000000123',
+					mode: 'list',
+					cachedResultName: 'sharedDrive',
+					cachedResultUrl: 'https://drive.google.com/drive/folders/driveID000000123',
+				},
+				folderId: {
+					__rl: true,
+					value: 'folderID000000123',
+					mode: 'list',
+					cachedResultName: 'testFolder 3',
+					cachedResultUrl: 'https://drive.google.com/drive/folders/folderID000000123',
+				},
+				whatToSearch: 'all',
+				fileTypes: ['*'],
+				includeTrashed: true,
+			},
+			options: {
+				fields: ['permissions', 'mimeType'],
+			},
+		};
+
+		const fakeExecuteFunction = createMockExecuteFunction(nodeParameters, driveNode);
+
+		await search.execute.call(fakeExecuteFunction, 0);
+
+		expect(transport.googleApiRequestAllItems).toBeCalledTimes(1);
+		expect(transport.googleApiRequestAllItems).toBeCalledWith(
+			'GET',
+			'files',
+			'/drive/v3/files',
+			{},
+			{
+				corpora: 'drive',
+				driveId: 'driveID000000123',
+				fields: 'nextPageToken, files(permissions, mimeType)',
+				includeItemsFromAllDrives: true,
+				q: "test and 'folderID000000123' in parents",
+				spaces: 'appDataFolder, drive',
+				supportsAllDrives: true,
+			},
+		);
+	});
+});
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
new file mode 100644
index 0000000000000..37858c78dc6be
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/folder/create.test.ts
@@ -0,0 +1,68 @@
+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', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		googleApiRequest: jest.fn(async function () {
+			return {};
+		}),
+	};
+});
+
+describe('test GoogleDriveV2: folder create', () => {
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	it('shuold be called with', async () => {
+		const nodeParameters = {
+			resource: 'folder',
+			name: 'testFolder 2',
+			folderId: {
+				__rl: true,
+				value: 'root',
+				mode: 'list',
+				cachedResultName: 'root',
+				cachedResultUrl: 'https://drive.google.com/drive',
+			},
+			options: {
+				folderColorRgb: '#167D08',
+			},
+		};
+
+		const fakeExecuteFunction = createMockExecuteFunction(nodeParameters, driveNode);
+
+		await create.execute.call(fakeExecuteFunction, 0);
+
+		expect(transport.googleApiRequest).toBeCalledTimes(1);
+		expect(transport.googleApiRequest).toHaveBeenCalledWith(
+			'POST',
+			'/drive/v3/files',
+			{
+				folderColorRgb: '#167D08',
+				mimeType: 'application/vnd.google-apps.folder',
+				name: 'testFolder 2',
+				parents: ['root'],
+			},
+			{
+				fields: undefined,
+				includeItemsFromAllDrives: true,
+				supportsAllDrives: true,
+				spaces: 'appDataFolder, drive',
+				corpora: 'allDrives',
+			},
+		);
+	});
+});
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
new file mode 100644
index 0000000000000..b141d206a17bf
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/folder/deleteFolder.test.ts
@@ -0,0 +1,80 @@
+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', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		googleApiRequest: jest.fn(async function () {
+			return {};
+		}),
+	};
+});
+
+describe('test GoogleDriveV2: folder deleteFolder', () => {
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	it('shuold be called with PATCH', async () => {
+		const nodeParameters = {
+			resource: 'folder',
+			operation: 'deleteFolder',
+			folderNoRootId: {
+				__rl: true,
+				value: 'folderIDxxxxxx',
+				mode: 'list',
+				cachedResultName: 'testFolder 2',
+				cachedResultUrl: 'https://drive.google.com/drive/folders/folderIDxxxxxx',
+			},
+			options: {},
+		};
+
+		const fakeExecuteFunction = createMockExecuteFunction(nodeParameters, driveNode);
+
+		await deleteFolder.execute.call(fakeExecuteFunction, 0);
+
+		expect(transport.googleApiRequest).toHaveBeenCalledWith(
+			'PATCH',
+			'/drive/v3/files/folderIDxxxxxx',
+			{ trashed: true },
+			{ supportsAllDrives: true },
+		);
+	});
+
+	it('shuold be called with DELETE', async () => {
+		const nodeParameters = {
+			resource: 'folder',
+			operation: 'deleteFolder',
+			folderNoRootId: {
+				__rl: true,
+				value: 'folderIDxxxxxx',
+				mode: 'list',
+				cachedResultName: 'testFolder 2',
+				cachedResultUrl: 'https://drive.google.com/drive/folders/folderIDxxxxxx',
+			},
+			options: { deletePermanently: true },
+		};
+
+		const fakeExecuteFunction = createMockExecuteFunction(nodeParameters, driveNode);
+
+		await deleteFolder.execute.call(fakeExecuteFunction, 0);
+
+		expect(transport.googleApiRequest).toHaveBeenCalledWith(
+			'DELETE',
+			'/drive/v3/files/folderIDxxxxxx',
+			undefined,
+			{ supportsAllDrives: true },
+		);
+	});
+});
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
new file mode 100644
index 0000000000000..d5854e38f5698
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/folder/share.test.ts
@@ -0,0 +1,64 @@
+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', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		googleApiRequest: jest.fn(async function () {
+			return {};
+		}),
+	};
+});
+
+describe('test GoogleDriveV2: folder share', () => {
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	it('shuold be called with', async () => {
+		const nodeParameters = {
+			resource: 'folder',
+			operation: 'share',
+			folderNoRootId: {
+				__rl: true,
+				value: 'folderIDxxxxxx',
+				mode: 'list',
+				cachedResultName: 'testFolder 2',
+				cachedResultUrl: 'https://drive.google.com/drive/folders/folderIDxxxxxx',
+			},
+			permissionsUi: {
+				permissionsValues: {
+					role: 'reader',
+					type: 'anyone',
+					allowFileDiscovery: true,
+				},
+			},
+			options: {
+				moveToNewOwnersRoot: true,
+			},
+		};
+
+		const fakeExecuteFunction = createMockExecuteFunction(nodeParameters, driveNode);
+
+		await share.execute.call(fakeExecuteFunction, 0);
+
+		expect(transport.googleApiRequest).toBeCalledTimes(1);
+		expect(transport.googleApiRequest).toHaveBeenCalledWith(
+			'POST',
+			'/drive/v3/files/folderIDxxxxxx/permissions',
+			{ allowFileDiscovery: true, role: 'reader', type: 'anyone' },
+			{ moveToNewOwnersRoot: true, supportsAllDrives: true },
+		);
+	});
+});
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
new file mode 100644
index 0000000000000..b04a33e2e26bb
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/helpers.ts
@@ -0,0 +1,42 @@
+import type { IDataObject, IExecuteFunctions, IGetNodeParameterOptions, INode } from 'n8n-workflow';
+
+import { get } from 'lodash';
+import { constructExecutionMetaData, returnJsonArray } from 'n8n-core';
+
+export const driveNode: INode = {
+	id: '11',
+	name: 'Google Drive node',
+	typeVersion: 3,
+	type: 'n8n-nodes-base.googleDrive',
+	position: [42, 42],
+	parameters: {},
+};
+
+export const createMockExecuteFunction = (
+	nodeParameters: IDataObject,
+	node: INode,
+	continueOnFail = 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,
+			returnJsonArray,
+			prepareBinaryData: () => {},
+			httpRequest: () => {},
+		},
+		continueOnFail: () => continueOnFail,
+	} as unknown as IExecuteFunctions;
+	return fakeExecuteFunction;
+};
diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/utils.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/utils.test.ts
new file mode 100644
index 0000000000000..7af5aa9abc5ec
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/utils.test.ts
@@ -0,0 +1,125 @@
+import {
+	prepareQueryString,
+	setFileProperties,
+	setUpdateCommonParams,
+} from '../../v2/helpers/utils';
+
+describe('test GoogleDriveV2, prepareQueryString', () => {
+	it('should return id, name', () => {
+		const fields = undefined;
+
+		const result = prepareQueryString(fields);
+
+		expect(result).toEqual('id, name');
+	});
+
+	it('should return *', () => {
+		const fields = ['*'];
+
+		const result = prepareQueryString(fields);
+
+		expect(result).toEqual('*');
+	});
+
+	it('should return string joined by ,', () => {
+		const fields = ['id', 'name', 'mimeType'];
+
+		const result = prepareQueryString(fields);
+
+		expect(result).toEqual('id, name, mimeType');
+	});
+});
+
+describe('test GoogleDriveV2, setFileProperties', () => {
+	it('should return empty object', () => {
+		const body = {};
+		const options = {};
+
+		const result = setFileProperties(body, options);
+
+		expect(result).toEqual({});
+	});
+
+	it('should return object with properties', () => {
+		const body = {};
+		const options = {
+			propertiesUi: {
+				propertyValues: [
+					{
+						key: 'propertyKey1',
+						value: 'propertyValue1',
+					},
+					{
+						key: 'propertyKey2',
+						value: 'propertyValue2',
+					},
+				],
+			},
+		};
+
+		const result = setFileProperties(body, options);
+
+		expect(result).toEqual({
+			properties: {
+				propertyKey1: 'propertyValue1',
+				propertyKey2: 'propertyValue2',
+			},
+		});
+	});
+
+	it('should return object with appProperties', () => {
+		const body = {};
+		const options = {
+			appPropertiesUi: {
+				appPropertyValues: [
+					{
+						key: 'appPropertyKey1',
+						value: 'appPropertyValue1',
+					},
+					{
+						key: 'appPropertyKey2',
+						value: 'appPropertyValue2',
+					},
+				],
+			},
+		};
+
+		const result = setFileProperties(body, options);
+
+		expect(result).toEqual({
+			appProperties: {
+				appPropertyKey1: 'appPropertyValue1',
+				appPropertyKey2: 'appPropertyValue2',
+			},
+		});
+	});
+});
+
+describe('test GoogleDriveV2, setUpdateCommonParams', () => {
+	it('should return empty object', () => {
+		const qs = {};
+		const options = {};
+
+		const result = setUpdateCommonParams(qs, options);
+
+		expect(result).toEqual({});
+	});
+
+	it('should return qs with params', () => {
+		const options = {
+			useContentAsIndexableText: true,
+			keepRevisionForever: true,
+			ocrLanguage: 'en',
+			trashed: true,
+			includePermissionsForView: 'published',
+		};
+
+		const qs = setUpdateCommonParams({}, options);
+
+		expect(qs).toEqual({
+			useContentAsIndexableText: true,
+			keepRevisionForever: true,
+			ocrLanguage: 'en',
+		});
+	});
+});
diff --git a/packages/nodes-base/nodes/Google/Drive/v1/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Drive/v1/GenericFunctions.ts
new file mode 100644
index 0000000000000..16171fb75f421
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/v1/GenericFunctions.ts
@@ -0,0 +1,101 @@
+import type {
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	IPollFunctions,
+	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
+} from 'n8n-workflow';
+import { NodeApiError } from 'n8n-workflow';
+
+import { getGoogleAccessToken } from '../../GenericFunctions';
+
+export async function googleApiRequest(
+	this: IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions,
+	method: IHttpRequestMethods,
+	resource: string,
+	body: any = {},
+	qs: IDataObject = {},
+	uri?: string,
+	option: IDataObject = {},
+): Promise<any> {
+	const authenticationMethod = this.getNodeParameter(
+		'authentication',
+		0,
+		'serviceAccount',
+	) as string;
+
+	let options: IRequestOptions = {
+		headers: {
+			'Content-Type': 'application/json',
+		},
+		method,
+		body,
+		qs,
+		uri: uri || `https://www.googleapis.com${resource}`,
+		json: true,
+	};
+
+	options = Object.assign({}, options, option);
+
+	try {
+		if (Object.keys(body as IDataObject).length === 0) {
+			delete options.body;
+		}
+
+		if (authenticationMethod === 'serviceAccount') {
+			const credentials = await this.getCredentials('googleApi');
+
+			const { access_token } = await getGoogleAccessToken.call(this, credentials, 'drive');
+
+			options.headers!.Authorization = `Bearer ${access_token}`;
+			return await this.helpers.request(options);
+		} else {
+			return await this.helpers.requestOAuth2.call(this, 'googleDriveOAuth2Api', options);
+		}
+	} catch (error) {
+		if (error.code === 'ERR_OSSL_PEM_NO_START_LINE') {
+			error.statusCode = '401';
+		}
+
+		throw new NodeApiError(this.getNode(), error as JsonObject);
+	}
+}
+
+export async function googleApiRequestAllItems(
+	this: IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions,
+	propertyName: string,
+	method: IHttpRequestMethods,
+	endpoint: string,
+
+	body: any = {},
+	query: IDataObject = {},
+): Promise<any> {
+	const returnData: IDataObject[] = [];
+
+	let responseData;
+	query.maxResults = query.maxResults || 100;
+	query.pageSize = query.pageSize || 100;
+
+	do {
+		responseData = await googleApiRequest.call(this, method, endpoint, body, query);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
+	} while (responseData.nextPageToken !== undefined && responseData.nextPageToken !== '');
+
+	return returnData;
+}
+
+export function extractId(url: string): string {
+	if (url.includes('/d/')) {
+		//https://docs.google.com/document/d/1TUJGUf5HUv9e6MJBzcOsPruxXDeGMnGYTBWfkMagcg4/edit
+		const data = url.match(/[-\w]{25,}/);
+		if (Array.isArray(data)) {
+			return data[0];
+		}
+	} else if (url.includes('/folders/')) {
+		//https://drive.google.com/drive/u/0/folders/19MqnruIXju5sAWYD3J71im1d2CBJkZzy
+		return url.split('/folders/')[1];
+	}
+	return url;
+}
diff --git a/packages/nodes-base/nodes/Google/Drive/v1/GoogleDriveV1.node.ts b/packages/nodes-base/nodes/Google/Drive/v1/GoogleDriveV1.node.ts
new file mode 100644
index 0000000000000..9099b12c582a1
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/v1/GoogleDriveV1.node.ts
@@ -0,0 +1,2744 @@
+/* eslint-disable n8n-nodes-base/node-filename-against-convention */
+import type { Readable } from 'stream';
+import type {
+	IBinaryKeyData,
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeBaseDescription,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+import { BINARY_ENCODING } from 'n8n-workflow';
+
+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';
+
+const UPLOAD_CHUNK_SIZE = 256 * 1024;
+
+const versionDescription: INodeTypeDescription = {
+	displayName: 'Google Drive',
+	name: 'googleDrive',
+	icon: 'file:googleDrive.svg',
+	group: ['input'],
+	version: [1, 2],
+	subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+	description: 'Access data on Google Drive',
+	defaults: {
+		name: 'Google Drive',
+	},
+	inputs: ['main'],
+	outputs: ['main'],
+	credentials: [
+		{
+			name: 'googleApi',
+			required: true,
+			displayOptions: {
+				show: {
+					authentication: ['serviceAccount'],
+				},
+			},
+		},
+		{
+			name: 'googleDriveOAuth2Api',
+			required: true,
+			displayOptions: {
+				show: {
+					authentication: ['oAuth2'],
+				},
+			},
+		},
+	],
+	properties: [
+		oldVersionNotice,
+		{
+			displayName: 'Authentication',
+			name: 'authentication',
+			type: 'options',
+			options: [
+				{
+					name: 'Service Account',
+					value: 'serviceAccount',
+				},
+				{
+					name: 'OAuth2',
+					value: 'oAuth2',
+				},
+			],
+			default: 'serviceAccount',
+			displayOptions: {
+				show: {
+					'@version': [1],
+				},
+			},
+		},
+		{
+			displayName: 'Authentication',
+			name: 'authentication',
+			type: 'options',
+			options: [
+				{
+					// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+					name: 'OAuth2 (recommended)',
+					value: 'oAuth2',
+				},
+				{
+					name: 'Service Account',
+					value: 'serviceAccount',
+				},
+			],
+			default: 'oAuth2',
+			displayOptions: {
+				show: {
+					'@version': [2],
+				},
+			},
+		},
+		{
+			displayName: 'Resource',
+			name: 'resource',
+			type: 'options',
+			noDataExpression: true,
+			options: [
+				{
+					name: 'Drive',
+					value: 'drive',
+				},
+				{
+					name: 'File',
+					value: 'file',
+				},
+				{
+					name: 'Folder',
+					value: 'folder',
+				},
+			],
+			default: 'file',
+		},
+
+		// ----------------------------------
+		//         operations
+		// ----------------------------------
+		{
+			displayName: 'Operation',
+			name: 'operation',
+			type: 'options',
+			noDataExpression: true,
+			displayOptions: {
+				show: {
+					resource: ['file'],
+				},
+			},
+			options: [
+				{
+					name: 'Copy',
+					value: 'copy',
+					description: 'Copy a file',
+					action: 'Copy a file',
+				},
+				{
+					name: 'Delete',
+					value: 'delete',
+					description: 'Delete a file',
+					action: 'Delete a file',
+				},
+				{
+					name: 'Download',
+					value: 'download',
+					description: 'Download a file',
+					action: 'Download a file',
+				},
+				{
+					name: 'List',
+					value: 'list',
+					description: 'List files and folders',
+					action: 'List a file',
+				},
+				{
+					name: 'Share',
+					value: 'share',
+					description: 'Share a file',
+					action: 'Share a file',
+				},
+				{
+					name: 'Update',
+					value: 'update',
+					description: 'Update a file',
+					action: 'Update a file',
+				},
+				{
+					name: 'Upload',
+					value: 'upload',
+					description: 'Upload a file',
+					action: 'Upload a file',
+				},
+			],
+			default: 'upload',
+		},
+
+		{
+			displayName: 'Operation',
+			name: 'operation',
+			type: 'options',
+			noDataExpression: true,
+			displayOptions: {
+				show: {
+					resource: ['folder'],
+				},
+			},
+			options: [
+				{
+					name: 'Create',
+					value: 'create',
+					description: 'Create a folder',
+					action: 'Create a folder',
+				},
+				{
+					name: 'Delete',
+					value: 'delete',
+					description: 'Delete a folder',
+					action: 'Delete a folder',
+				},
+				{
+					name: 'Share',
+					value: 'share',
+					description: 'Share a folder',
+					action: 'Share a folder',
+				},
+			],
+			default: 'create',
+		},
+
+		// ----------------------------------
+		//         file
+		// ----------------------------------
+
+		{
+			displayName: 'File',
+			name: 'fileId',
+			type: 'resourceLocator',
+			default: { mode: 'list', value: '' },
+			required: true,
+			modes: [
+				{
+					displayName: 'File',
+					name: 'list',
+					type: 'list',
+					placeholder: 'Select a file...',
+					typeOptions: {
+						searchListMethod: 'fileSearch',
+						searchable: true,
+					},
+				},
+				{
+					displayName: 'Link',
+					name: 'url',
+					type: 'string',
+					placeholder:
+						'https://drive.google.com/file/d/1anGBg0b5re2VtF2bKu201_a-Vnz5BHq9Y4r-yBDAj5A/edit',
+					extractValue: {
+						type: 'regex',
+						regex: GOOGLE_DRIVE_FILE_URL_REGEX,
+					},
+					validation: [
+						{
+							type: 'regex',
+							properties: {
+								regex: GOOGLE_DRIVE_FILE_URL_REGEX,
+								errorMessage: 'Not a valid Google Drive File URL',
+							},
+						},
+					],
+				},
+				{
+					displayName: 'ID',
+					name: 'id',
+					type: 'string',
+					placeholder: '1anGBg0b5re2VtF2bKu201_a-Vnz5BHq9Y4r-yBDAj5A',
+					validation: [
+						{
+							type: 'regex',
+							properties: {
+								regex: '[a-zA-Z0-9\\-_]{2,}',
+								errorMessage: 'Not a valid Google Drive File ID',
+							},
+						},
+					],
+					url: '=https://drive.google.com/file/d/{{$value}}/view',
+				},
+			],
+			displayOptions: {
+				show: {
+					operation: ['download', 'copy', 'update', 'delete', 'share'],
+					resource: ['file'],
+				},
+			},
+			description: 'The ID of the file',
+		},
+
+		{
+			displayName: 'Folder',
+			name: 'fileId',
+			type: 'resourceLocator',
+			default: { mode: 'list', value: '' },
+			required: true,
+			modes: [
+				{
+					displayName: 'Folder',
+					name: 'list',
+					type: 'list',
+					placeholder: 'Select a folder...',
+					typeOptions: {
+						searchListMethod: 'folderSearch',
+						searchable: true,
+					},
+				},
+				{
+					displayName: 'Link',
+					name: 'url',
+					type: 'string',
+					placeholder: 'https://drive.google.com/drive/folders/1Tx9WHbA3wBpPB4C_HcoZDH9WZFWYxAMU',
+					extractValue: {
+						type: 'regex',
+						regex: GOOGLE_DRIVE_FOLDER_URL_REGEX,
+					},
+					validation: [
+						{
+							type: 'regex',
+							properties: {
+								regex: GOOGLE_DRIVE_FOLDER_URL_REGEX,
+								errorMessage: 'Not a valid Google Drive Folder URL',
+							},
+						},
+					],
+				},
+				{
+					displayName: 'ID',
+					name: 'id',
+					type: 'string',
+					placeholder: '1anGBg0b5re2VtF2bKu201_a-Vnz5BHq9Y4r-yBDAj5A',
+					validation: [
+						{
+							type: 'regex',
+							properties: {
+								regex: '[a-zA-Z0-9\\-_]{2,}',
+								errorMessage: 'Not a valid Google Drive Folder ID',
+							},
+						},
+					],
+					url: '=https://drive.google.com/drive/folders/{{$value}}',
+				},
+			],
+			displayOptions: {
+				show: {
+					operation: ['delete', 'share'],
+					resource: ['folder'],
+				},
+			},
+			description: 'The ID of the folder',
+		},
+
+		// ----------------------------------
+		//         file:copy
+		// ----------------------------------
+
+		// ----------------------------------
+		//         file/folder:delete
+		// ----------------------------------
+
+		// ----------------------------------
+		//         file:download
+		// ----------------------------------
+		{
+			displayName: 'Put Output File in Field',
+			name: 'binaryPropertyName',
+			type: 'string',
+			required: true,
+			default: 'data',
+			displayOptions: {
+				show: {
+					operation: ['download'],
+					resource: ['file'],
+				},
+			},
+			hint: 'The name of the output binary field to put the file in',
+		},
+		{
+			displayName: 'Options',
+			name: 'options',
+			type: 'collection',
+			placeholder: 'Add Option',
+			default: {},
+			displayOptions: {
+				show: {
+					operation: ['download'],
+					resource: ['file'],
+				},
+			},
+			options: [
+				{
+					displayName: 'Google File Conversion',
+					name: 'googleFileConversion',
+					type: 'fixedCollection',
+					typeOptions: {
+						multipleValues: false,
+					},
+					default: {},
+					placeholder: 'Add Conversion',
+					options: [
+						{
+							displayName: 'Conversion',
+							name: 'conversion',
+							values: [
+								{
+									displayName: 'Google Docs',
+									name: 'docsToFormat',
+									type: 'options',
+									options: [
+										{
+											name: 'To HTML',
+											value: 'text/html',
+										},
+										{
+											name: 'To MS Word',
+											value:
+												'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+										},
+										{
+											name: 'To OpenOffice Doc',
+											value: 'application/vnd.oasis.opendocument.text',
+										},
+										{
+											name: 'To PDF',
+											value: 'application/pdf',
+										},
+										{
+											name: 'To Rich Text',
+											value: 'application/rtf',
+										},
+									],
+									default:
+										'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+									description: 'Format used to export when downloading Google Docs files',
+								},
+								{
+									displayName: 'Google Drawings',
+									name: 'drawingsToFormat',
+									type: 'options',
+									options: [
+										{
+											name: 'To JPEG',
+											value: 'image/jpeg',
+										},
+										{
+											name: 'To PNG',
+											value: 'image/png',
+										},
+										{
+											name: 'To SVG',
+											value: 'image/svg+xml',
+										},
+										{
+											name: 'To PDF',
+											value: 'application/pdf',
+										},
+									],
+									default: 'image/jpeg',
+									description: 'Format used to export when downloading Google Drawings files',
+								},
+								{
+									displayName: 'Google Slides',
+									name: 'slidesToFormat',
+									type: 'options',
+									options: [
+										{
+											name: 'To MS PowerPoint',
+											value:
+												'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+										},
+										{
+											name: 'To PDF',
+											value: 'application/pdf',
+										},
+										{
+											name: 'To OpenOffice Presentation',
+											value: 'application/vnd.oasis.opendocument.presentation',
+										},
+										{
+											name: 'To Plain Text',
+											value: 'text/plain',
+										},
+									],
+									default:
+										'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+									description: 'Format used to export when downloading Google Slides files',
+								},
+								{
+									displayName: 'Google Sheets',
+									name: 'sheetsToFormat',
+									type: 'options',
+									options: [
+										{
+											name: 'To MS Excel',
+											value: 'application/x-vnd.oasis.opendocument.spreadsheet',
+										},
+										{
+											name: 'To PDF',
+											value: 'application/pdf',
+										},
+										{
+											name: 'To CSV',
+											value: 'text/csv',
+										},
+									],
+									default: 'application/x-vnd.oasis.opendocument.spreadsheet',
+									description: 'Format used to export when downloading Google Spreadsheets files',
+								},
+							],
+						},
+					],
+				},
+				{
+					displayName: 'File Name',
+					name: 'fileName',
+					type: 'string',
+					default: '',
+					description: 'File name. Ex: data.pdf.',
+				},
+			],
+		},
+
+		// ----------------------------------
+		//         file:list
+		// ----------------------------------
+		{
+			displayName: 'Use Query String',
+			name: 'useQueryString',
+			type: 'boolean',
+			default: false,
+			displayOptions: {
+				show: {
+					operation: ['list'],
+					resource: ['file'],
+				},
+			},
+			description: 'Whether a query string should be used to filter results',
+		},
+		{
+			displayName: 'Query String',
+			name: 'queryString',
+			type: 'string',
+			default: '',
+			displayOptions: {
+				show: {
+					operation: ['list'],
+					useQueryString: [true],
+					resource: ['file'],
+				},
+			},
+			placeholder: "name contains 'invoice'",
+			description: 'Query to use to return only specific files',
+		},
+		{
+			displayName: 'Limit',
+			name: 'limit',
+			type: 'number',
+			displayOptions: {
+				show: {
+					operation: ['list'],
+					resource: ['file'],
+				},
+			},
+			typeOptions: {
+				minValue: 1,
+				maxValue: 1000,
+			},
+			default: 50,
+			description: 'Max number of results to return',
+		},
+		{
+			displayName: 'Filters',
+			name: 'queryFilters',
+			placeholder: 'Add Filter',
+			description: 'Filters to use to return only specific files',
+			type: 'fixedCollection',
+			typeOptions: {
+				multipleValues: true,
+			},
+			default: {},
+			displayOptions: {
+				show: {
+					operation: ['list'],
+					useQueryString: [false],
+					resource: ['file'],
+				},
+			},
+			options: [
+				{
+					name: 'name',
+					displayName: 'Name',
+					values: [
+						{
+							displayName: 'Operation',
+							name: 'operation',
+							type: 'options',
+							noDataExpression: true,
+							options: [
+								{
+									name: 'Contains',
+									value: 'contains',
+								},
+								{
+									name: 'Is',
+									value: 'is',
+								},
+								{
+									name: 'Is Not',
+									value: 'isNot',
+								},
+							],
+							default: 'contains',
+						},
+						{
+							displayName: 'Value',
+							name: 'value',
+							type: 'string',
+							default: '',
+							description: 'The value for operation',
+						},
+					],
+				},
+				{
+					name: 'mimeType',
+					displayName: 'Mime Type',
+					values: [
+						{
+							displayName: 'Mime Type',
+							name: 'mimeType',
+							type: 'options',
+							options: [
+								{
+									name: '3rd Party Shortcut',
+									value: 'application/vnd.google-apps.drive-sdk',
+								},
+								{
+									name: 'Audio',
+									value: 'application/vnd.google-apps.audio',
+								},
+								{
+									name: 'Custom Mime Type',
+									value: 'custom',
+								},
+								{
+									name: 'Google Apps Scripts',
+									value: 'application/vnd.google-apps.script',
+								},
+								{
+									name: 'Google Docs',
+									value: 'application/vnd.google-apps.document',
+								},
+								{
+									name: 'Google Drawing',
+									value: 'application/vnd.google-apps.drawing',
+								},
+								{
+									name: 'Google Drive File',
+									value: 'application/vnd.google-apps.file',
+								},
+								{
+									name: 'Google Drive Folder',
+									value: 'application/vnd.google-apps.folder',
+								},
+								{
+									name: 'Google Forms',
+									value: 'application/vnd.google-apps.form',
+								},
+								{
+									name: 'Google Fusion Tables',
+									value: 'application/vnd.google-apps.fusiontable',
+								},
+								{
+									name: 'Google My Maps',
+									value: 'application/vnd.google-apps.map',
+								},
+								{
+									name: 'Google Sheets',
+									value: 'application/vnd.google-apps.spreadsheet',
+								},
+								{
+									name: 'Google Sites',
+									value: 'application/vnd.google-apps.site',
+								},
+								{
+									name: 'Google Slides',
+									value: 'application/vnd.google-apps.presentation',
+								},
+								{
+									name: 'Photo',
+									value: 'application/vnd.google-apps.photo',
+								},
+								{
+									name: 'Unknown',
+									value: 'application/vnd.google-apps.unknown',
+								},
+								{
+									name: 'Video',
+									value: 'application/vnd.google-apps.video',
+								},
+							],
+							default: 'application/vnd.google-apps.file',
+							description: 'The Mime-Type of the files to return',
+						},
+						{
+							displayName: 'Custom Mime Type',
+							name: 'customMimeType',
+							type: 'string',
+							default: '',
+							displayOptions: {
+								show: {
+									mimeType: ['custom'],
+								},
+							},
+						},
+					],
+				},
+			],
+		},
+
+		// ----------------------------------
+		//         file:share
+		// ----------------------------------
+		{
+			displayName: 'Permissions',
+			name: 'permissionsUi',
+			placeholder: 'Add Permission',
+			type: 'fixedCollection',
+			default: {},
+			typeOptions: {
+				multipleValues: false,
+			},
+			displayOptions: {
+				show: {
+					resource: ['file', 'folder'],
+					operation: ['share'],
+				},
+			},
+			options: [
+				{
+					displayName: 'Permission',
+					name: 'permissionsValues',
+					values: [
+						{
+							displayName: 'Role',
+							name: 'role',
+							type: 'options',
+							options: [
+								{
+									name: 'Commenter',
+									value: 'commenter',
+								},
+								{
+									name: 'File Organizer',
+									value: 'fileOrganizer',
+								},
+								{
+									name: 'Organizer',
+									value: 'organizer',
+								},
+								{
+									name: 'Owner',
+									value: 'owner',
+								},
+								{
+									name: 'Reader',
+									value: 'reader',
+								},
+								{
+									name: 'Writer',
+									value: 'writer',
+								},
+							],
+							default: '',
+						},
+						{
+							displayName: 'Type',
+							name: 'type',
+							type: 'options',
+							options: [
+								{
+									name: 'User',
+									value: 'user',
+								},
+								{
+									name: 'Group',
+									value: 'group',
+								},
+								{
+									name: 'Domain',
+									value: 'domain',
+								},
+								{
+									name: 'Anyone',
+									value: 'anyone',
+								},
+							],
+							default: '',
+							description:
+								'Information about the different types can be found <a href="https://developers.google.com/drive/api/v3/ref-roles">here</a>',
+						},
+						{
+							displayName: 'Email Address',
+							name: 'emailAddress',
+							type: 'string',
+							displayOptions: {
+								show: {
+									type: ['user', 'group'],
+								},
+							},
+							default: '',
+							description: 'The email address of the user or group to which this permission refers',
+						},
+						{
+							displayName: 'Domain',
+							name: 'domain',
+							type: 'string',
+							displayOptions: {
+								show: {
+									type: ['domain'],
+								},
+							},
+							default: '',
+							description: 'The domain to which this permission refers',
+						},
+						{
+							displayName: 'Allow File Discovery',
+							name: 'allowFileDiscovery',
+							type: 'boolean',
+							displayOptions: {
+								show: {
+									type: ['domain', 'anyone'],
+								},
+							},
+							default: false,
+							description: 'Whether the permission allows the file to be discovered through search',
+						},
+					],
+				},
+			],
+		},
+
+		{
+			displayName: 'Binary File',
+			name: 'binaryData',
+			type: 'boolean',
+			default: false,
+			displayOptions: {
+				show: {
+					operation: ['upload'],
+					resource: ['file'],
+				},
+			},
+			description: 'Whether the data to upload should be taken from binary field',
+		},
+		{
+			displayName: 'File Content',
+			name: 'fileContent',
+			type: 'string',
+			default: '',
+			displayOptions: {
+				show: {
+					operation: ['upload'],
+					resource: ['file'],
+					binaryData: [false],
+				},
+			},
+			placeholder: '',
+			description: 'The text content of the file to upload',
+		},
+		{
+			displayName: 'Input Binary Field',
+			name: 'binaryPropertyName',
+			type: 'string',
+			default: 'data',
+			required: true,
+			displayOptions: {
+				show: {
+					operation: ['upload'],
+					resource: ['file'],
+					binaryData: [true],
+				},
+			},
+			placeholder: '',
+			hint: 'The name of the input binary field containing the file to be uploaded',
+		},
+
+		// ----------------------------------
+		//         file:update
+		// ----------------------------------
+		{
+			displayName: 'Update Fields',
+			name: 'updateFields',
+			type: 'collection',
+			placeholder: 'Add Option',
+			default: {},
+			displayOptions: {
+				show: {
+					operation: ['update'],
+					resource: ['file'],
+				},
+			},
+			options: [
+				{
+					displayName: 'File Name',
+					name: 'fileName',
+					type: 'string',
+					default: '',
+					description: 'The name of the file',
+				},
+				{
+					displayName: 'Keep Revision Forever',
+					name: 'keepRevisionForever',
+					type: 'boolean',
+					default: false,
+					description:
+						"Whether to set the 'keepForever' field in the new head revision. This is only applicable to files with binary content in Google Drive. Only 200 revisions for the file can be kept forever. If the limit is reached, try deleting pinned revisions.",
+				},
+				{
+					displayName: 'Move to Trash',
+					name: 'trashed',
+					type: 'boolean',
+					default: false,
+					description: 'Whether to move a file to the trash. Only the owner may trash a file.',
+				},
+				{
+					displayName: 'OCR Language',
+					name: 'ocrLanguage',
+					type: 'string',
+					default: '',
+					description: 'A language hint for OCR processing during image import (ISO 639-1 code)',
+				},
+				{
+					displayName: 'Parent ID',
+					name: 'parentId',
+					type: 'string',
+					default: '',
+					description: 'The ID of the parent to set',
+				},
+				{
+					displayName: 'Use Content As Indexable Text',
+					name: 'useContentAsIndexableText',
+					type: 'boolean',
+					default: false,
+					description: 'Whether to use the uploaded content as indexable text',
+				},
+			],
+		},
+		{
+			displayName: 'Options',
+			name: 'options',
+			type: 'collection',
+			placeholder: 'Add Option',
+			default: {},
+			displayOptions: {
+				show: {
+					operation: ['update'],
+					resource: ['file'],
+				},
+			},
+			options: [
+				{
+					displayName: 'Fields',
+					name: 'fields',
+					type: 'multiOptions',
+					options: [
+						{
+							name: '[All]',
+							value: '*',
+							description: 'All fields',
+						},
+						{
+							name: 'explicitlyTrashed',
+							value: 'explicitlyTrashed',
+						},
+						{
+							name: 'exportLinks',
+							value: 'exportLinks',
+						},
+						{
+							name: 'hasThumbnail',
+							value: 'hasThumbnail',
+						},
+						{
+							name: 'iconLink',
+							value: 'iconLink',
+						},
+						{
+							name: 'ID',
+							value: 'id',
+						},
+						{
+							name: 'Kind',
+							value: 'kind',
+						},
+						{
+							name: 'mimeType',
+							value: 'mimeType',
+						},
+						{
+							name: 'Name',
+							value: 'name',
+						},
+						{
+							name: 'Permissions',
+							value: 'permissions',
+						},
+						{
+							name: 'Shared',
+							value: 'shared',
+						},
+						{
+							name: 'Spaces',
+							value: 'spaces',
+						},
+						{
+							name: 'Starred',
+							value: 'starred',
+						},
+						{
+							name: 'thumbnailLink',
+							value: 'thumbnailLink',
+						},
+						{
+							name: 'Trashed',
+							value: 'trashed',
+						},
+						{
+							name: 'Version',
+							value: 'version',
+						},
+						{
+							name: 'webViewLink',
+							value: 'webViewLink',
+						},
+					],
+					default: [],
+					description: 'The fields to return',
+				},
+			],
+		},
+		// ----------------------------------
+		//         file:upload
+		// ----------------------------------
+		{
+			displayName: 'File Name',
+			name: 'name',
+			type: 'string',
+			default: '',
+			required: true,
+			displayOptions: {
+				show: {
+					operation: ['upload'],
+					resource: ['file'],
+				},
+			},
+			placeholder: 'invoice_1.pdf',
+			description: 'The name the file should be saved as',
+		},
+		// ----------------------------------
+		{
+			displayName: 'Resolve Data',
+			name: 'resolveData',
+			type: 'boolean',
+			default: false,
+			displayOptions: {
+				show: {
+					operation: ['upload'],
+					resource: ['file'],
+				},
+			},
+			// eslint-disable-next-line n8n-nodes-base/node-param-description-boolean-without-whether
+			description:
+				'By default the response only contain the ID of the file. If this option gets activated, it will resolve the data automatically.',
+		},
+		{
+			displayName: 'Parents',
+			name: 'parents',
+			type: 'string',
+			typeOptions: {
+				multipleValues: true,
+			},
+			default: [],
+			displayOptions: {
+				show: {
+					operation: ['upload'],
+					resource: ['file'],
+				},
+			},
+			description: 'The IDs of the parent folders which contain the file',
+		},
+
+		// ----------------------------------
+		//         folder
+		// ----------------------------------
+
+		// ----------------------------------
+		//         folder:create
+		// ----------------------------------
+		{
+			displayName: 'Folder',
+			name: 'name',
+			type: 'string',
+			default: '',
+			required: true,
+			displayOptions: {
+				show: {
+					operation: ['create'],
+					resource: ['folder'],
+				},
+			},
+			placeholder: 'invoices',
+			description: 'The name of folder to create',
+		},
+		{
+			displayName: 'Options',
+			name: 'options',
+			type: 'collection',
+			placeholder: 'Add Option',
+			default: {},
+			displayOptions: {
+				show: {
+					'/operation': ['copy', 'list', 'share', 'create'],
+					'/resource': ['file', 'folder'],
+				},
+			},
+			options: [
+				{
+					displayName: 'Email Message',
+					name: 'emailMessage',
+					type: 'string',
+					displayOptions: {
+						show: {
+							'/operation': ['share'],
+							'/resource': ['file', 'folder'],
+						},
+					},
+					default: '',
+					description: 'A plain text custom message to include in the notification email',
+				},
+				{
+					displayName: 'Enforce Single Parent',
+					name: 'enforceSingleParent',
+					type: 'boolean',
+					displayOptions: {
+						show: {
+							'/operation': ['share'],
+							'/resource': ['file', 'folder'],
+						},
+					},
+					default: false,
+					description:
+						'Whether to opt in to API behavior that aims for all items to have exactly one parent. This parameter only takes effect if the item is not in a shared drive.',
+				},
+				{
+					displayName: 'Fields',
+					name: 'fields',
+					type: 'multiOptions',
+					displayOptions: {
+						show: {
+							'/operation': ['list', 'copy'],
+						},
+					},
+					options: [
+						{
+							name: '*',
+							value: '*',
+							description: 'All fields',
+						},
+						{
+							name: 'explicitlyTrashed',
+							value: 'explicitlyTrashed',
+						},
+						{
+							name: 'exportLinks',
+							value: 'exportLinks',
+						},
+						{
+							name: 'hasThumbnail',
+							value: 'hasThumbnail',
+						},
+						{
+							name: 'iconLink',
+							value: 'iconLink',
+						},
+						{
+							name: 'ID',
+							value: 'id',
+						},
+						{
+							name: 'Kind',
+							value: 'kind',
+						},
+						{
+							name: 'mimeType',
+							value: 'mimeType',
+						},
+						{
+							name: 'Name',
+							value: 'name',
+						},
+						{
+							name: 'Permissions',
+							value: 'permissions',
+						},
+						{
+							name: 'Shared',
+							value: 'shared',
+						},
+						{
+							name: 'Spaces',
+							value: 'spaces',
+						},
+						{
+							name: 'Starred',
+							value: 'starred',
+						},
+						{
+							name: 'thumbnailLink',
+							value: 'thumbnailLink',
+						},
+						{
+							name: 'Trashed',
+							value: 'trashed',
+						},
+						{
+							name: 'Version',
+							value: 'version',
+						},
+						{
+							name: 'webViewLink',
+							value: 'webViewLink',
+						},
+					],
+					default: [],
+					description: 'The fields to return',
+				},
+				{
+					displayName: 'Move To New Owners Root',
+					name: 'moveToNewOwnersRoot',
+					type: 'boolean',
+					displayOptions: {
+						show: {
+							'/operation': ['share'],
+							'/resource': ['file', 'folder'],
+						},
+					},
+					default: false,
+					// eslint-disable-next-line n8n-nodes-base/node-param-description-boolean-without-whether
+					description:
+						"<p>This parameter only takes effect if the item is not in a shared drive and the request is attempting to transfer the ownership of the item.</p><p>When set to true, the item is moved to the new owner's My Drive root folder and all prior parents removed.</p>",
+				},
+				{
+					displayName: 'Send Notification Email',
+					name: 'sendNotificationEmail',
+					type: 'boolean',
+					displayOptions: {
+						show: {
+							'/operation': ['share'],
+							'/resource': ['file', 'folder'],
+						},
+					},
+					default: false,
+					description: 'Whether to send a notification email when sharing to users or groups',
+				},
+				{
+					displayName: 'Supports All Drives',
+					name: 'supportsAllDrives',
+					type: 'boolean',
+					displayOptions: {
+						show: {
+							'/operation': ['share'],
+							'/resource': ['file', 'folder'],
+						},
+					},
+					default: false,
+					description:
+						'Whether the requesting application supports both My Drives and shared drives',
+				},
+				{
+					displayName: 'Transfer Ownership',
+					name: 'transferOwnership',
+					type: 'boolean',
+					displayOptions: {
+						show: {
+							'/operation': ['share'],
+							'/resource': ['file', 'folder'],
+						},
+					},
+					default: false,
+					description:
+						'Whether to transfer ownership to the specified user and downgrade the current owner to a writer',
+				},
+				{
+					displayName: 'Use Domain Admin Access',
+					name: 'useDomainAdminAccess',
+					type: 'boolean',
+					displayOptions: {
+						show: {
+							'/operation': ['share'],
+							'/resource': ['file', 'folder'],
+						},
+					},
+					default: false,
+					description:
+						'Whether to perform the operation as domain administrator, i.e. if you are an administrator of the domain to which the shared drive belongs, you will be granted access automatically.',
+				},
+
+				{
+					displayName: 'File Name',
+					name: 'name',
+					type: 'string',
+					displayOptions: {
+						show: {
+							'/operation': ['copy'],
+							'/resource': ['file'],
+						},
+					},
+					default: '',
+					placeholder: 'invoice_1.pdf',
+					description: 'The name the file should be saved as',
+				},
+				{
+					displayName: 'Parents',
+					name: 'parents',
+					type: 'string',
+					displayOptions: {
+						show: {
+							'/operation': ['copy', 'create'],
+							'/resource': ['file', 'folder'],
+						},
+					},
+					typeOptions: {
+						multipleValues: true,
+					},
+					default: [],
+					description: 'The IDs of the parent folders the file/folder should be saved in',
+				},
+				{
+					displayName: 'Spaces',
+					name: 'spaces',
+					type: 'multiOptions',
+					displayOptions: {
+						show: {
+							'/operation': ['list'],
+							'/resource': ['file'],
+						},
+					},
+					options: [
+						{
+							name: '[All]',
+							value: '*',
+							description: 'All spaces',
+						},
+						{
+							name: 'appDataFolder',
+							value: 'appDataFolder',
+						},
+						{
+							name: 'Drive',
+							value: 'drive',
+						},
+						{
+							name: 'Photos',
+							value: 'photos',
+						},
+					],
+					default: [],
+					description: 'The spaces to operate on',
+				},
+				{
+					displayName: 'Corpora',
+					name: 'corpora',
+					type: 'options',
+					displayOptions: {
+						show: {
+							'/operation': ['list'],
+							'/resource': ['file'],
+						},
+					},
+					options: [
+						{
+							name: 'User',
+							value: 'user',
+							description: 'All files in "My Drive" and "Shared with me"',
+						},
+						{
+							name: 'Domain',
+							value: 'domain',
+							description: "All files shared to the user's domain that are searchable",
+						},
+						{
+							name: 'Drive',
+							value: 'drive',
+							description: 'All files contained in a single shared drive',
+						},
+						{
+							name: 'allDrives',
+							value: 'allDrives',
+							description: 'All drives',
+						},
+					],
+					default: '',
+					description: 'The corpora to operate on',
+				},
+				{
+					displayName: 'Drive ID',
+					name: 'driveId',
+					type: 'string',
+					default: '',
+					displayOptions: {
+						show: {
+							'/operation': ['list'],
+							'/resource': ['file'],
+							corpora: ['drive'],
+						},
+					},
+					description:
+						'ID of the shared drive to search. The driveId parameter must be specified if and only if corpora is set to drive.',
+				},
+			],
+		},
+		// ----------------------------------
+		//         drive
+		// ----------------------------------
+		{
+			displayName: 'Operation',
+			name: 'operation',
+			type: 'options',
+			noDataExpression: true,
+			displayOptions: {
+				show: {
+					resource: ['drive'],
+				},
+			},
+			options: [
+				{
+					name: 'Create',
+					value: 'create',
+					description: 'Create a drive',
+					action: 'Create a drive',
+				},
+				{
+					name: 'Delete',
+					value: 'delete',
+					description: 'Delete a drive',
+					action: 'Delete a drive',
+				},
+				{
+					name: 'Get',
+					value: 'get',
+					description: 'Get a drive',
+					action: 'Get a drive',
+				},
+				{
+					name: 'List',
+					value: 'list',
+					description: 'List all drives',
+					action: 'List all drives',
+				},
+				{
+					name: 'Update',
+					value: 'update',
+					description: 'Update a drive',
+					action: 'Update a drive',
+				},
+			],
+			default: 'create',
+		},
+
+		{
+			displayName: 'Drive',
+			name: 'driveId',
+			type: 'resourceLocator',
+			default: { mode: 'list', value: '' },
+			required: true,
+			hint: 'The Google Drive drive to operate on',
+			modes: [
+				{
+					displayName: 'Drive',
+					name: 'list',
+					type: 'list',
+					placeholder: 'Drive',
+					typeOptions: {
+						searchListMethod: 'driveSearch',
+						searchable: true,
+					},
+				},
+				{
+					displayName: 'Link',
+					name: 'url',
+					type: 'string',
+					placeholder: 'https://drive.google.com/drive/folders/0AaaaaAAAAAAAaa',
+					extractValue: {
+						type: 'regex',
+						regex: GOOGLE_DRIVE_FOLDER_URL_REGEX,
+					},
+					validation: [
+						{
+							type: 'regex',
+							properties: {
+								regex: GOOGLE_DRIVE_FOLDER_URL_REGEX,
+								errorMessage: 'Not a valid Google Drive Drive URL',
+							},
+						},
+					],
+				},
+				{
+					displayName: 'ID',
+					name: 'id',
+					type: 'string',
+					hint: 'The ID of the shared drive',
+					validation: [
+						{
+							type: 'regex',
+							properties: {
+								regex: '[a-zA-Z0-9\\-_]{2,}',
+								errorMessage: 'Not a valid Google Drive Drive ID',
+							},
+						},
+					],
+					url: '=https://drive.google.com/drive/folders/{{$value}}',
+				},
+			],
+			displayOptions: {
+				show: {
+					operation: ['delete', 'get', 'update'],
+					resource: ['drive'],
+				},
+			},
+			description: 'The ID of the drive',
+		},
+
+		// ----------------------------------
+		//         drive:create
+		// ----------------------------------
+		{
+			displayName: 'Name',
+			name: 'name',
+			type: 'string',
+			default: '',
+			displayOptions: {
+				show: {
+					operation: ['create'],
+					resource: ['drive'],
+				},
+			},
+			description: 'The name of this shared drive',
+		},
+		{
+			displayName: 'Options',
+			name: 'options',
+			type: 'collection',
+			placeholder: 'Add Option',
+			default: {},
+			displayOptions: {
+				show: {
+					operation: ['create'],
+					resource: ['drive'],
+				},
+			},
+			options: [
+				{
+					displayName: 'Capabilities',
+					name: 'capabilities',
+					type: 'collection',
+					placeholder: 'Add Field',
+					default: {},
+					options: [
+						{
+							displayName: 'Can Add Children',
+							name: 'canAddChildren',
+							type: 'boolean',
+							default: false,
+							description:
+								'Whether the current user can add children to folders in this shared drive',
+						},
+						{
+							displayName: 'Can Change Copy Requires Writer Permission Restriction',
+							name: 'canChangeCopyRequiresWriterPermissionRestriction',
+							type: 'boolean',
+							default: false,
+							description:
+								'Whether the current user can change the copyRequiresWriterPermission restriction of this shared drive',
+						},
+						{
+							displayName: 'Can Change Domain Users Only Restriction',
+							name: 'canChangeDomainUsersOnlyRestriction',
+							type: 'boolean',
+							default: false,
+							description:
+								'Whether the current user can change the domainUsersOnly restriction of this shared drive',
+						},
+						{
+							displayName: 'Can Change Drive Background',
+							name: 'canChangeDriveBackground',
+							type: 'boolean',
+							default: false,
+							description:
+								'Whether the current user can change the background of this shared drive',
+						},
+						{
+							displayName: 'Can Change Drive Members Only Restriction',
+							name: 'canChangeDriveMembersOnlyRestriction',
+							type: 'boolean',
+							default: false,
+							description:
+								'Whether the current user can change the driveMembersOnly restriction of this shared drive',
+						},
+						{
+							displayName: 'Can Comment',
+							name: 'canComment',
+							type: 'boolean',
+							default: false,
+							description: 'Whether the current user can comment on files in this shared drive',
+						},
+						{
+							displayName: 'Can Copy',
+							name: 'canCopy',
+							type: 'boolean',
+							default: false,
+							description: 'Whether the current user can copy files in this shared drive',
+						},
+						{
+							displayName: 'Can Delete Children',
+							name: 'canDeleteChildren',
+							type: 'boolean',
+							default: false,
+							description:
+								'Whether the current user can delete children from folders in this shared drive',
+						},
+						{
+							displayName: 'Can Delete Drive',
+							name: 'canDeleteDrive',
+							type: 'boolean',
+							default: false,
+							description:
+								'Whether the current user can delete this shared drive. Attempting to delete the shared drive may still fail if there are untrashed items inside the shared drive.',
+						},
+						{
+							displayName: 'Can Download',
+							name: 'canDownload',
+							type: 'boolean',
+							default: false,
+							description: 'Whether the current user can download files in this shared drive',
+						},
+						{
+							displayName: 'Can Edit',
+							name: 'canEdit',
+							type: 'boolean',
+							default: false,
+							description: 'Whether the current user can edit files in this shared drive',
+						},
+						{
+							displayName: 'Can List Children',
+							name: 'canListChildren',
+							type: 'boolean',
+							default: false,
+							description:
+								'Whether the current user can list the children of folders in this shared drive',
+						},
+						{
+							displayName: 'Can Manage Members',
+							name: 'canManageMembers',
+							type: 'boolean',
+							default: false,
+							description:
+								'Whether the current user can add members to this shared drive or remove them or change their role',
+						},
+						{
+							displayName: 'Can Read Revisions',
+							name: 'canReadRevisions',
+							type: 'boolean',
+							default: false,
+							description:
+								'Whether the current user can read the revisions resource of files in this shared drive',
+						},
+						{
+							displayName: 'Can Rename',
+							name: 'canRename',
+							type: 'boolean',
+							default: false,
+							description:
+								'Whether the current user can rename files or folders in this shared drive',
+						},
+						{
+							displayName: 'Can Rename Drive',
+							name: 'canRenameDrive',
+							type: 'boolean',
+							default: false,
+							description: 'Whether the current user can rename this shared drive',
+						},
+						{
+							displayName: 'Can Share',
+							name: 'canShare',
+							type: 'boolean',
+							default: false,
+							description: 'Whether the current user can rename this shared drive',
+						},
+						{
+							displayName: 'Can Trash Children',
+							name: 'canTrashChildren',
+							type: 'boolean',
+							default: false,
+							description:
+								'Whether the current user can trash children from folders in this shared drive',
+						},
+					],
+				},
+				{
+					displayName: 'Color RGB',
+					name: 'colorRgb',
+					type: 'color',
+					default: '',
+					description: 'The color of this shared drive as an RGB hex string',
+				},
+				{
+					displayName: 'Created Time',
+					name: 'createdTime',
+					type: 'dateTime',
+					default: '',
+					description: 'The time at which the shared drive was created (RFC 3339 date-time)',
+				},
+				{
+					displayName: 'Hidden',
+					name: 'hidden',
+					type: 'boolean',
+					default: false,
+					description: 'Whether the shared drive is hidden from default view',
+				},
+				{
+					displayName: 'Restrictions',
+					name: 'restrictions',
+					type: 'collection',
+					placeholder: 'Add Field',
+					default: {},
+					options: [
+						{
+							displayName: 'Admin Managed Restrictions',
+							name: 'adminManagedRestrictions',
+							type: 'boolean',
+							default: false,
+							description:
+								'Whether the options to copy, print, or download files inside this shared drive, should be disabled for readers and commenters. When this restriction is set to true, it will override the similarly named field to true for any file inside this shared drive.',
+						},
+						{
+							displayName: 'Copy Requires Writer Permission',
+							name: 'copyRequiresWriterPermission',
+							type: 'boolean',
+							default: false,
+							description:
+								'Whether the options to copy, print, or download files inside this shared drive, should be disabled for readers and commenters. When this restriction is set to true, it will override the similarly named field to true for any file inside this shared drive.',
+						},
+						{
+							displayName: 'Domain Users Only',
+							name: 'domainUsersOnly',
+							type: 'boolean',
+							default: false,
+							description:
+								'Whether access to this shared drive and items inside this shared drive is restricted to users of the domain to which this shared drive belongs. This restriction may be overridden by other sharing policies controlled outside of this shared drive.',
+						},
+						{
+							displayName: 'Drive Members Only',
+							name: 'driveMembersOnly',
+							type: 'boolean',
+							default: false,
+							description:
+								'Whether access to items inside this shared drive is restricted to its members',
+						},
+					],
+				},
+			],
+		},
+		// ----------------------------------
+		//         drive:delete
+		// ----------------------------------
+
+		// ----------------------------------
+		//         drive:get
+		// ----------------------------------
+		{
+			displayName: 'Options',
+			name: 'options',
+			type: 'collection',
+			placeholder: 'Add Option',
+			default: {},
+			displayOptions: {
+				show: {
+					operation: ['get'],
+					resource: ['drive'],
+				},
+			},
+			options: [
+				{
+					displayName: 'Use Domain Admin Access',
+					name: 'useDomainAdminAccess',
+					type: 'boolean',
+					default: false,
+					description:
+						'Whether to issue the request as a domain administrator; if set to true, then the requester will be granted access if they are an administrator of the domain to which the shared drive belongs. (Default: false).',
+				},
+			],
+		},
+		// ----------------------------------
+		//         drive:list
+		// ----------------------------------
+		{
+			displayName: 'Return All',
+			name: 'returnAll',
+			type: 'boolean',
+			displayOptions: {
+				show: {
+					operation: ['list'],
+					resource: ['drive'],
+				},
+			},
+			default: false,
+			description: 'Whether to return all results or only up to a given limit',
+		},
+		{
+			displayName: 'Limit',
+			name: 'limit',
+			type: 'number',
+			displayOptions: {
+				show: {
+					operation: ['list'],
+					resource: ['drive'],
+					returnAll: [false],
+				},
+			},
+			typeOptions: {
+				minValue: 1,
+				maxValue: 200,
+			},
+			default: 100,
+			description: 'Max number of results to return',
+		},
+		{
+			displayName: 'Options',
+			name: 'options',
+			type: 'collection',
+			placeholder: 'Add Option',
+			default: {},
+			displayOptions: {
+				show: {
+					operation: ['list'],
+					resource: ['drive'],
+				},
+			},
+			options: [
+				{
+					displayName: 'Query',
+					name: 'q',
+					type: 'string',
+					default: '',
+					description:
+						'Query string for searching shared drives. See the <a href="https://developers.google.com/drive/api/v3/search-shareddrives">"Search for shared drives"</a> guide for supported syntax.',
+				},
+				{
+					displayName: 'Use Domain Admin Access',
+					name: 'useDomainAdminAccess',
+					type: 'boolean',
+					default: false,
+					description:
+						'Whether to issue the request as a domain administrator; if set to true, then the requester will be granted access if they are an administrator of the domain to which the shared drive belongs. (Default: false).',
+				},
+			],
+		},
+		// ----------------------------------
+		//         drive:update
+		// ----------------------------------
+		{
+			displayName: 'Update Fields',
+			name: 'options',
+			type: 'collection',
+			placeholder: 'Add Option',
+			default: {},
+			displayOptions: {
+				show: {
+					operation: ['update'],
+					resource: ['drive'],
+				},
+			},
+			options: [
+				{
+					displayName: 'Color RGB',
+					name: 'colorRgb',
+					type: 'color',
+					default: '',
+					description: 'The color of this shared drive as an RGB hex string',
+				},
+				{
+					displayName: 'Name',
+					name: 'name',
+					type: 'string',
+					default: '',
+					description: 'The name of this shared drive',
+				},
+				{
+					displayName: 'Restrictions',
+					name: 'restrictions',
+					type: 'collection',
+					placeholder: 'Add Field',
+					default: {},
+					options: [
+						{
+							displayName: 'Admin Managed Restrictions',
+							name: 'adminManagedRestrictions',
+							type: 'boolean',
+							default: false,
+							description:
+								'Whether the options to copy, print, or download files inside this shared drive, should be disabled for readers and commenters. When this restriction is set to true, it will override the similarly named field to true for any file inside this shared drive.',
+						},
+						{
+							displayName: 'Copy Requires Writer Permission',
+							name: 'copyRequiresWriterPermission',
+							type: 'boolean',
+							default: false,
+							description:
+								'Whether the options to copy, print, or download files inside this shared drive, should be disabled for readers and commenters. When this restriction is set to true, it will override the similarly named field to true for any file inside this shared drive.',
+						},
+						{
+							displayName: 'Domain Users Only',
+							name: 'domainUsersOnly',
+							type: 'boolean',
+							default: false,
+							description:
+								'Whether access to this shared drive and items inside this shared drive is restricted to users of the domain to which this shared drive belongs. This restriction may be overridden by other sharing policies controlled outside of this shared drive.',
+						},
+						{
+							displayName: 'Drive Members Only',
+							name: 'driveMembersOnly',
+							type: 'boolean',
+							default: false,
+							description:
+								'Whether access to items inside this shared drive is restricted to its members',
+						},
+					],
+				},
+			],
+		},
+		{
+			displayName: 'Options',
+			name: 'options',
+			type: 'collection',
+			placeholder: 'Add Option',
+			default: {},
+			displayOptions: {
+				show: {
+					operation: ['upload'],
+					resource: ['file'],
+				},
+			},
+			options: [
+				{
+					displayName: 'APP Properties',
+					name: 'appPropertiesUi',
+					placeholder: 'Add Property',
+					type: 'fixedCollection',
+					default: {},
+					typeOptions: {
+						multipleValues: true,
+					},
+					description:
+						'A collection of arbitrary key-value pairs which are private to the requesting app',
+					options: [
+						{
+							name: 'appPropertyValues',
+							displayName: 'APP Property',
+							values: [
+								{
+									displayName: 'Key',
+									name: 'key',
+									type: 'string',
+									default: '',
+									description: 'Name of the key to add',
+								},
+								{
+									displayName: 'Value',
+									name: 'value',
+									type: 'string',
+									default: '',
+									description: 'Value to set for the key',
+								},
+							],
+						},
+					],
+				},
+				{
+					displayName: 'Properties',
+					name: 'propertiesUi',
+					placeholder: 'Add Property',
+					type: 'fixedCollection',
+					default: {},
+					typeOptions: {
+						multipleValues: true,
+					},
+					description: 'A collection of arbitrary key-value pairs which are visible to all apps',
+					options: [
+						{
+							name: 'propertyValues',
+							displayName: 'Property',
+							values: [
+								{
+									displayName: 'Key',
+									name: 'key',
+									type: 'string',
+									default: '',
+									description: 'Name of the key to add',
+								},
+								{
+									displayName: 'Value',
+									name: 'value',
+									type: 'string',
+									default: '',
+									description: 'Value to set for the key',
+								},
+							],
+						},
+					],
+				},
+			],
+		},
+	],
+};
+
+export class GoogleDriveV1 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			...versionDescription,
+		};
+	}
+
+	methods = {
+		listSearch: {
+			fileSearch,
+			folderSearch,
+			driveSearch,
+		},
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = this.getInputData();
+		const returnData: INodeExecutionData[] = [];
+
+		const resource = this.getNodeParameter('resource', 0);
+		const operation = this.getNodeParameter('operation', 0);
+
+		for (let i = 0; i < items.length; i++) {
+			try {
+				const options = this.getNodeParameter('options', i, {});
+
+				let queryFields = 'id, name';
+				if (options?.fields) {
+					const fields = options.fields as string[];
+					if (fields.includes('*')) {
+						queryFields = '*';
+					} else {
+						queryFields = fields.join(', ');
+					}
+				}
+
+				if (resource === 'drive') {
+					if (operation === 'create') {
+						// ----------------------------------
+						//         create
+						// ----------------------------------
+
+						const name = this.getNodeParameter('name', i) as string;
+
+						const body: IDataObject = {
+							name,
+						};
+
+						Object.assign(body, options);
+
+						const response = await googleApiRequest.call(this, 'POST', '/drive/v3/drives', body, {
+							requestId: uuid(),
+						});
+
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(response as IDataObject[]),
+							{ itemData: { item: i } },
+						);
+
+						returnData.push(...executionData);
+					}
+					if (operation === 'delete') {
+						// ----------------------------------
+						//         delete
+						// ----------------------------------
+
+						const driveId = this.getNodeParameter('driveId', i, undefined, {
+							extractValue: true,
+						}) as string;
+
+						await googleApiRequest.call(this, 'DELETE', `/drive/v3/drives/${driveId}`);
+
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray({ success: true }),
+							{ itemData: { item: i } },
+						);
+
+						returnData.push(...executionData);
+					}
+					if (operation === 'get') {
+						// ----------------------------------
+						//         get
+						// ----------------------------------
+
+						const driveId = this.getNodeParameter('driveId', i, undefined, {
+							extractValue: true,
+						}) as string;
+
+						const qs: IDataObject = {};
+
+						Object.assign(qs, options);
+
+						const response = await googleApiRequest.call(
+							this,
+							'GET',
+							`/drive/v3/drives/${driveId}`,
+							{},
+							qs,
+						);
+
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(response as IDataObject[]),
+							{ itemData: { item: i } },
+						);
+
+						returnData.push(...executionData);
+					}
+					if (operation === 'list') {
+						// ----------------------------------
+						//         list
+						// ----------------------------------
+						const returnAll = this.getNodeParameter('returnAll', i);
+
+						const qs: IDataObject = {};
+
+						let response: IDataObject[] = [];
+
+						Object.assign(qs, options);
+
+						if (returnAll) {
+							response = await googleApiRequestAllItems.call(
+								this,
+								'drives',
+								'GET',
+								'/drive/v3/drives',
+								{},
+								qs,
+							);
+						} else {
+							qs.pageSize = this.getNodeParameter('limit', i);
+							const data = await googleApiRequest.call(this, 'GET', '/drive/v3/drives', {}, qs);
+							response = data.drives as IDataObject[];
+						}
+
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(response),
+							{ itemData: { item: i } },
+						);
+
+						returnData.push(...executionData);
+					}
+					if (operation === 'update') {
+						// ----------------------------------
+						//         update
+						// ----------------------------------
+
+						const driveId = this.getNodeParameter('driveId', i, undefined, {
+							extractValue: true,
+						}) as string;
+
+						const body: IDataObject = {};
+
+						Object.assign(body, options);
+
+						const response = await googleApiRequest.call(
+							this,
+							'PATCH',
+							`/drive/v3/drives/${driveId}`,
+							body,
+						);
+
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(response as IDataObject[]),
+							{ itemData: { item: i } },
+						);
+
+						returnData.push(...executionData);
+					}
+				}
+				if (resource === 'file') {
+					if (operation === 'copy') {
+						// ----------------------------------
+						//         copy
+						// ----------------------------------
+
+						const fileId = this.getNodeParameter('fileId', i, undefined, {
+							extractValue: true,
+						}) as string;
+
+						const body: IDataObject = {
+							fields: queryFields,
+						};
+
+						const optionProperties = ['name', 'parents'];
+						for (const propertyName of optionProperties) {
+							if (options[propertyName] !== undefined) {
+								body[propertyName] = options[propertyName];
+							}
+						}
+
+						const qs = {
+							supportsAllDrives: true,
+						};
+
+						const response = await googleApiRequest.call(
+							this,
+							'POST',
+							`/drive/v3/files/${fileId}/copy`,
+							body,
+							qs,
+						);
+
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(response as IDataObject[]),
+							{ itemData: { item: i } },
+						);
+
+						returnData.push(...executionData);
+					} else if (operation === 'download') {
+						// ----------------------------------
+						//         download
+						// ----------------------------------
+
+						const fileId = this.getNodeParameter('fileId', i, undefined, {
+							extractValue: true,
+						}) as string;
+						const downloadOptions = this.getNodeParameter('options', i);
+
+						const requestOptions = {
+							useStream: true,
+							resolveWithFullResponse: true,
+							encoding: null,
+							json: false,
+						};
+
+						const file = await googleApiRequest.call(
+							this,
+							'GET',
+							`/drive/v3/files/${fileId}`,
+							{},
+							{ fields: 'mimeType,name', supportsTeamDrives: true },
+						);
+						let response;
+
+						if (file.mimeType.includes('vnd.google-apps')) {
+							const parameterKey = 'options.googleFileConversion.conversion';
+							const type = file.mimeType.split('.')[2];
+							let mime;
+							if (type === 'document') {
+								mime = this.getNodeParameter(
+									`${parameterKey}.docsToFormat`,
+									i,
+									'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+								) as string;
+							} else if (type === 'presentation') {
+								mime = this.getNodeParameter(
+									`${parameterKey}.slidesToFormat`,
+									i,
+									'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+								) as string;
+							} else if (type === 'spreadsheet') {
+								mime = this.getNodeParameter(
+									`${parameterKey}.sheetsToFormat`,
+									i,
+									'application/x-vnd.oasis.opendocument.spreadsheet',
+								) as string;
+							} else {
+								mime = this.getNodeParameter(
+									`${parameterKey}.drawingsToFormat`,
+									i,
+									'image/jpeg',
+								) as string;
+							}
+							response = await googleApiRequest.call(
+								this,
+								'GET',
+								`/drive/v3/files/${fileId}/export`,
+								{},
+								{ mimeType: mime },
+								undefined,
+								requestOptions,
+							);
+						} else {
+							response = await googleApiRequest.call(
+								this,
+								'GET',
+								`/drive/v3/files/${fileId}`,
+								{},
+								{ alt: 'media' },
+								undefined,
+								requestOptions,
+							);
+						}
+
+						const mimeType = response.headers['content-type'] ?? file.mimeType ?? undefined;
+						const fileName = downloadOptions.fileName ?? file.name ?? undefined;
+
+						const newItem: INodeExecutionData = {
+							json: items[i].json,
+							binary: {},
+						};
+
+						if (items[i].binary !== undefined) {
+							// Create a shallow copy of the binary data so that the old
+							// data references which do not get changed still stay behind
+							// but the incoming data does not get changed.
+							Object.assign(newItem.binary as IBinaryKeyData, items[i].binary);
+						}
+
+						items[i] = newItem;
+
+						const dataPropertyNameDownload = this.getNodeParameter('binaryPropertyName', i);
+
+						items[i].binary![dataPropertyNameDownload] = await this.helpers.prepareBinaryData(
+							response.body as unknown as Readable,
+							fileName as string,
+							mimeType as string,
+						);
+					} else if (operation === 'list') {
+						// ----------------------------------
+						//         list
+						// ----------------------------------
+
+						let querySpaces = '';
+						if (options.spaces) {
+							const spaces = options.spaces as string[];
+							if (spaces.includes('*')) {
+								querySpaces = 'appDataFolder, drive, photos';
+							} else {
+								querySpaces = spaces.join(', ');
+							}
+						}
+
+						let queryCorpora = '';
+						if (options.corpora) {
+							queryCorpora = options.corpora as string;
+						}
+
+						let driveId: string | undefined;
+						driveId = options.driveId as string;
+						if (driveId === '') {
+							driveId = undefined;
+						}
+
+						let queryString = '';
+						const useQueryString = this.getNodeParameter('useQueryString', i) as boolean;
+						if (useQueryString) {
+							// Use the user defined query string
+							queryString = this.getNodeParameter('queryString', i) as string;
+						} else {
+							// Build query string out of parameters set by user
+							const queryFilters = this.getNodeParameter('queryFilters', i) as IDataObject;
+
+							const queryFilterFields: string[] = [];
+							if (queryFilters.name) {
+								(queryFilters.name as IDataObject[]).forEach((nameFilter) => {
+									let filterOperation = nameFilter.operation;
+									if (filterOperation === 'is') {
+										filterOperation = '=';
+									} else if (filterOperation === 'isNot') {
+										filterOperation = '!=';
+									}
+									queryFilterFields.push(`name ${filterOperation} '${nameFilter.value}'`);
+								});
+
+								queryString += queryFilterFields.join(' or ');
+							}
+
+							queryFilterFields.length = 0;
+							if (queryFilters.mimeType) {
+								(queryFilters.mimeType as IDataObject[]).forEach((mimeTypeFilter) => {
+									let mimeType = mimeTypeFilter.mimeType;
+									if (mimeTypeFilter.mimeType === 'custom') {
+										mimeType = mimeTypeFilter.customMimeType;
+									}
+									queryFilterFields.push(`mimeType = '${mimeType}'`);
+								});
+
+								if (queryFilterFields.length) {
+									if (queryString !== '') {
+										queryString += ' and ';
+									}
+
+									queryString += queryFilterFields.join(' or ');
+								}
+							}
+						}
+
+						const pageSize = this.getNodeParameter('limit', i);
+
+						const qs = {
+							pageSize,
+							orderBy: 'modifiedTime',
+							fields: `nextPageToken, files(${queryFields})`,
+							spaces: querySpaces,
+							q: queryString,
+							includeItemsFromAllDrives: queryCorpora !== '' || driveId !== '',
+							supportsAllDrives: queryCorpora !== '' || driveId !== '',
+						};
+
+						const response = await googleApiRequest.call(this, 'GET', '/drive/v3/files', {}, qs);
+
+						const files = response.files;
+
+						const version = this.getNode().typeVersion;
+
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(files as IDataObject[]),
+							{ itemData: { item: i } },
+						);
+
+						if (version === 1) {
+							return [executionData];
+						}
+
+						returnData.push(...executionData);
+					} else if (operation === 'upload') {
+						// ----------------------------------
+						//         upload
+						// ----------------------------------
+						const resolveData = this.getNodeParameter('resolveData', 0);
+
+						let contentLength: number;
+						let fileContent: Buffer | Readable;
+						let originalFilename: string | undefined;
+						let mimeType = 'text/plain';
+
+						if (this.getNodeParameter('binaryData', i)) {
+							const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i);
+							const binaryData = this.helpers.assertBinaryData(i, binaryPropertyName);
+							if (binaryData.id) {
+								// Stream data in 256KB chunks, and upload the via the resumable upload api
+								fileContent = await this.helpers.getBinaryStream(binaryData.id, UPLOAD_CHUNK_SIZE);
+								const metadata = await this.helpers.getBinaryMetadata(binaryData.id);
+								contentLength = metadata.fileSize;
+								originalFilename = metadata.fileName;
+								if (metadata.mimeType) mimeType = binaryData.mimeType;
+							} else {
+								fileContent = Buffer.from(binaryData.data, BINARY_ENCODING);
+								contentLength = fileContent.length;
+								originalFilename = binaryData.fileName;
+								mimeType = binaryData.mimeType;
+							}
+						} else {
+							// Is text file
+							fileContent = Buffer.from(this.getNodeParameter('fileContent', i) as string, 'utf8');
+							contentLength = fileContent.byteLength;
+						}
+
+						const name = this.getNodeParameter('name', i) as string;
+						const parents = this.getNodeParameter('parents', i) as string[];
+
+						let uploadId;
+						if (Buffer.isBuffer(fileContent)) {
+							const response = await googleApiRequest.call(
+								this,
+								'POST',
+								'/upload/drive/v3/files',
+								fileContent,
+								{
+									fields: queryFields,
+									uploadType: 'media',
+								},
+								undefined,
+								{
+									headers: {
+										'Content-Type': mimeType,
+										'Content-Length': contentLength,
+									},
+									encoding: null,
+									json: false,
+								},
+							);
+							uploadId = JSON.parse(response as string).id;
+						} else {
+							const resumableUpload = await googleApiRequest.call(
+								this,
+								'POST',
+								'/upload/drive/v3/files',
+								undefined,
+								{ uploadType: 'resumable' },
+								undefined,
+								{
+									resolveWithFullResponse: true,
+								},
+							);
+							const uploadUrl = resumableUpload.headers.location;
+
+							let offset = 0;
+							for await (const chunk of fileContent) {
+								const nextOffset = offset + Number(chunk.length);
+								try {
+									const response = await this.helpers.httpRequest({
+										method: 'PUT',
+										url: uploadUrl,
+										headers: {
+											'Content-Length': chunk.length,
+											'Content-Range': `bytes ${offset}-${nextOffset - 1}/${contentLength}`,
+										},
+										body: chunk,
+									});
+									uploadId = response.id;
+								} catch (error) {
+									if (error.response?.status !== 308) throw error;
+								}
+								offset = nextOffset;
+							}
+						}
+
+						const requestBody = {
+							mimeType,
+							name,
+							originalFilename,
+						};
+
+						const properties = this.getNodeParameter(
+							'options.propertiesUi.propertyValues',
+							i,
+							[],
+						) as IDataObject[];
+
+						if (properties.length) {
+							Object.assign(requestBody, {
+								properties: properties.reduce(
+									(obj, value) => Object.assign(obj, { [`${value.key}`]: value.value }),
+									{},
+								),
+							});
+						}
+
+						const appProperties = this.getNodeParameter(
+							'options.appPropertiesUi.appPropertyValues',
+							i,
+							[],
+						) as IDataObject[];
+
+						if (properties.length) {
+							Object.assign(requestBody, {
+								appProperties: appProperties.reduce(
+									(obj, value) => Object.assign(obj, { [`${value.key}`]: value.value }),
+									{},
+								),
+							});
+						}
+
+						let response = await googleApiRequest.call(
+							this,
+							'PATCH',
+							`/drive/v3/files/${uploadId}`,
+							requestBody,
+							{
+								addParents: parents.join(','),
+								// When set to true shared drives can be used.
+								supportsAllDrives: true,
+							},
+						);
+
+						if (resolveData) {
+							response = await googleApiRequest.call(
+								this,
+								'GET',
+								`/drive/v3/files/${response.id}`,
+								{},
+								{ fields: '*' },
+							);
+						}
+
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(response as IDataObject[]),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
+					} else if (operation === 'update') {
+						// ----------------------------------
+						//         file:update
+						// ----------------------------------
+
+						const id = this.getNodeParameter('fileId', i, undefined, {
+							extractValue: true,
+						}) as string;
+						const updateFields = this.getNodeParameter('updateFields', i, {});
+
+						const qs: IDataObject = {
+							supportsAllDrives: true,
+						};
+
+						Object.assign(qs, options);
+
+						qs.fields = queryFields;
+
+						const body: IDataObject = {};
+
+						if (updateFields.fileName) {
+							body.name = updateFields.fileName;
+						}
+
+						if (updateFields.hasOwnProperty('trashed')) {
+							body.trashed = updateFields.trashed;
+						}
+
+						if (updateFields.parentId && updateFields.parentId !== '') {
+							qs.addParents = updateFields.parentId;
+						}
+
+						const responseData = await googleApiRequest.call(
+							this,
+							'PATCH',
+							`/drive/v3/files/${id}`,
+							body,
+							qs,
+						);
+
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
+					}
+				}
+				if (resource === 'folder') {
+					if (operation === 'create') {
+						// ----------------------------------
+						//         folder:create
+						// ----------------------------------
+
+						const name = this.getNodeParameter('name', i) as string;
+
+						const body = {
+							name,
+							mimeType: 'application/vnd.google-apps.folder',
+							parents: options.parents || [],
+						};
+
+						const qs = {
+							fields: queryFields,
+							supportsAllDrives: true,
+						};
+
+						const response = await googleApiRequest.call(this, 'POST', '/drive/v3/files', body, qs);
+
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(response as IDataObject[]),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
+					}
+				}
+				if (['file', 'folder'].includes(resource)) {
+					if (operation === 'delete') {
+						// ----------------------------------
+						//         delete
+						// ----------------------------------
+
+						const fileId = this.getNodeParameter('fileId', i, undefined, {
+							extractValue: true,
+						}) as string;
+
+						await googleApiRequest.call(
+							this,
+							'DELETE',
+							`/drive/v3/files/${fileId}`,
+							{},
+							{ supportsTeamDrives: true },
+						);
+
+						// If we are still here it did succeed
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray({
+								fileId,
+								success: true,
+							}),
+							{ itemData: { item: i } },
+						);
+
+						returnData.push(...executionData);
+					}
+					if (operation === 'share') {
+						const fileId = this.getNodeParameter('fileId', i, undefined, {
+							extractValue: true,
+						}) as string;
+
+						const permissions = this.getNodeParameter('permissionsUi', i) as IDataObject;
+
+						const shareOption = this.getNodeParameter('options', i);
+
+						const body: IDataObject = {};
+
+						const qs: IDataObject = {
+							supportsTeamDrives: true,
+						};
+
+						if (permissions.permissionsValues) {
+							Object.assign(body, permissions.permissionsValues);
+						}
+
+						Object.assign(qs, shareOption);
+
+						const response = await googleApiRequest.call(
+							this,
+							'POST',
+							`/drive/v3/files/${fileId}/permissions`,
+							body,
+							qs,
+						);
+
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(response as IDataObject[]),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
+					}
+				}
+			} catch (error) {
+				if (this.continueOnFail()) {
+					if (resource === 'file' && operation === 'download') {
+						items[i].json = { error: error.message };
+					} else {
+						returnData.push({ json: { error: error.message } });
+					}
+					continue;
+				}
+				throw error;
+			}
+		}
+		if (resource === 'file' && operation === 'download') {
+			// For file downloads the files get attached to the existing items
+			return [items];
+		} else {
+			// For all other ones does the output items get replaced
+			return [returnData];
+		}
+	}
+}
diff --git a/packages/nodes-base/nodes/Google/Drive/SearchFunctions.ts b/packages/nodes-base/nodes/Google/Drive/v1/SearchFunctions.ts
similarity index 100%
rename from packages/nodes-base/nodes/Google/Drive/SearchFunctions.ts
rename to packages/nodes-base/nodes/Google/Drive/v1/SearchFunctions.ts
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/GoogleDriveV2.node.ts b/packages/nodes-base/nodes/Google/Drive/v2/GoogleDriveV2.node.ts
new file mode 100644
index 0000000000000..5e147d81bf235
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/v2/GoogleDriveV2.node.ts
@@ -0,0 +1,27 @@
+import type {
+	IExecuteFunctions,
+	INodeType,
+	INodeTypeBaseDescription,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+
+import { versionDescription } from './actions/versionDescription';
+import { listSearch } from './methods';
+import { router } from './actions/router';
+
+export class GoogleDriveV2 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			...versionDescription,
+		};
+	}
+
+	methods = { listSearch };
+
+	async execute(this: IExecuteFunctions) {
+		return await router.call(this);
+	}
+}
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
new file mode 100644
index 0000000000000..1cb6d05911c58
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/common.descriptions.ts
@@ -0,0 +1,614 @@
+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';
+
+export const fileRLC: INodeProperties = {
+	displayName: 'File',
+	name: 'fileId',
+	type: 'resourceLocator',
+	default: { mode: 'list', value: '' },
+	required: true,
+	modes: [
+		{
+			displayName: 'File',
+			name: 'list',
+			type: 'list',
+			placeholder: 'Select a file...',
+			typeOptions: {
+				searchListMethod: 'fileSearch',
+				searchable: true,
+			},
+		},
+		{
+			displayName: 'Link',
+			name: 'url',
+			type: 'string',
+			placeholder:
+				'e.g. https://drive.google.com/file/d/1anGBg0b5re2VtF2bKu201_a-Vnz5BHq9Y4r-yBDAj5A/edit',
+			extractValue: {
+				type: 'regex',
+				regex: GOOGLE_DRIVE_FILE_URL_REGEX,
+			},
+			validation: [
+				{
+					type: 'regex',
+					properties: {
+						regex: GOOGLE_DRIVE_FILE_URL_REGEX,
+						errorMessage: 'Not a valid Google Drive File URL',
+					},
+				},
+			],
+		},
+		{
+			displayName: 'ID',
+			name: 'id',
+			type: 'string',
+			placeholder: 'e.g. 1anGBg0b5re2VtF2bKu201_a-Vnz5BHq9Y4r-yBDAj5A',
+			validation: [
+				{
+					type: 'regex',
+					properties: {
+						regex: '[a-zA-Z0-9\\-_]{2,}',
+						errorMessage: 'Not a valid Google Drive File ID',
+					},
+				},
+			],
+			url: '=https://drive.google.com/file/d/{{$value}}/view',
+		},
+	],
+	description: 'The file to operate on',
+};
+
+export const folderNoRootRLC: INodeProperties = {
+	displayName: 'Folder',
+	name: 'folderNoRootId',
+	type: 'resourceLocator',
+	default: { mode: 'list', value: '' },
+	required: true,
+	modes: [
+		{
+			displayName: 'Folder',
+			name: 'list',
+			type: 'list',
+			placeholder: 'Select a folder...',
+			typeOptions: {
+				searchListMethod: 'folderSearch',
+				searchable: true,
+			},
+		},
+		{
+			displayName: 'Link',
+			name: 'url',
+			type: 'string',
+			placeholder: 'e.g. https://drive.google.com/drive/folders/1Tx9WHbA3wBpPB4C_HcoZDH9WZFWYxAMU',
+			extractValue: {
+				type: 'regex',
+				regex: GOOGLE_DRIVE_FOLDER_URL_REGEX,
+			},
+			validation: [
+				{
+					type: 'regex',
+					properties: {
+						regex: GOOGLE_DRIVE_FOLDER_URL_REGEX,
+						errorMessage: 'Not a valid Google Drive Folder URL',
+					},
+				},
+			],
+		},
+		{
+			displayName: 'ID',
+			name: 'id',
+			type: 'string',
+			placeholder: 'e.g. 1anGBg0b5re2VtF2bKu201_a-Vnz5BHq9Y4r-yBDAj5A',
+			validation: [
+				{
+					type: 'regex',
+					properties: {
+						regex: '[a-zA-Z0-9\\-_]{2,}',
+						errorMessage: 'Not a valid Google Drive Folder ID',
+					},
+				},
+			],
+			url: '=https://drive.google.com/drive/folders/{{$value}}',
+		},
+	],
+	description: 'The folder to operate on',
+};
+
+export const folderRLC: INodeProperties = {
+	displayName: 'Folder',
+	name: 'folderId',
+	type: 'resourceLocator',
+	default: { mode: 'list', value: 'root', cachedResultName: '/ (Root folder)' },
+	required: true,
+	modes: [
+		{
+			displayName: 'Folder',
+			name: 'list',
+			type: 'list',
+			placeholder: 'Select a folder...',
+			typeOptions: {
+				searchListMethod: 'folderSearchWithDefault',
+				searchable: true,
+			},
+		},
+		{
+			displayName: 'Link',
+			name: 'url',
+			type: 'string',
+			placeholder: 'e.g. https://drive.google.com/drive/folders/1Tx9WHbA3wBpPB4C_HcoZDH9WZFWYxAMU',
+			extractValue: {
+				type: 'regex',
+				regex: GOOGLE_DRIVE_FOLDER_URL_REGEX,
+			},
+			validation: [
+				{
+					type: 'regex',
+					properties: {
+						regex: GOOGLE_DRIVE_FOLDER_URL_REGEX,
+						errorMessage: 'Not a valid Google Drive Folder URL',
+					},
+				},
+			],
+		},
+		{
+			displayName: 'ID',
+			name: 'id',
+			type: 'string',
+			placeholder: 'e.g. 1anGBg0b5re2VtF2bKu201_a-Vnz5BHq9Y4r-yBDAj5A',
+			validation: [
+				{
+					type: 'regex',
+					properties: {
+						regex: '[a-zA-Z0-9\\-_]{2,}',
+						errorMessage: 'Not a valid Google Drive Folder ID',
+					},
+				},
+			],
+			url: '=https://drive.google.com/drive/folders/{{$value}}',
+		},
+	],
+	description: 'The folder to operate on',
+};
+
+export const driveRLC: INodeProperties = {
+	displayName: 'Drive',
+	name: 'driveId',
+	type: 'resourceLocator',
+	default: { mode: 'list', value: RLC_DRIVE_DEFAULT },
+	required: true,
+	modes: [
+		{
+			displayName: 'Drive',
+			name: 'list',
+			type: 'list',
+			placeholder: 'Select a drive...',
+			typeOptions: {
+				searchListMethod: 'driveSearchWithDefault',
+				searchable: true,
+			},
+		},
+		{
+			displayName: 'Link',
+			name: 'url',
+			type: 'string',
+			placeholder: 'https://drive.google.com/drive/folders/0AaaaaAAAAAAAaa',
+			extractValue: {
+				type: 'regex',
+				regex: GOOGLE_DRIVE_FOLDER_URL_REGEX,
+			},
+			validation: [
+				{
+					type: 'regex',
+					properties: {
+						regex: GOOGLE_DRIVE_FOLDER_URL_REGEX,
+						errorMessage: 'Not a valid Google Drive Drive URL',
+					},
+				},
+			],
+		},
+		{
+			displayName: 'ID',
+			name: 'id',
+			type: 'string',
+			hint: 'The ID of the shared drive',
+			validation: [
+				{
+					type: 'regex',
+					properties: {
+						regex: '[a-zA-Z0-9\\-_]{2,}',
+						errorMessage: 'Not a valid Google Drive Drive ID',
+					},
+				},
+			],
+			url: '=https://drive.google.com/drive/folders/{{$value}}',
+		},
+	],
+	description: 'The ID of the drive',
+};
+
+export const sharedDriveRLC: INodeProperties = {
+	displayName: 'Shared Drive',
+	name: 'driveId',
+	type: 'resourceLocator',
+	default: { mode: 'list', value: '' },
+	required: true,
+	modes: [
+		{
+			displayName: 'Drive',
+			name: 'list',
+			type: 'list',
+			placeholder: 'Select a shared drive...',
+			typeOptions: {
+				searchListMethod: 'driveSearch',
+				searchable: true,
+			},
+		},
+		{
+			displayName: 'Link',
+			name: 'url',
+			type: 'string',
+			placeholder: 'e.g. https://drive.google.com/drive/u/1/folders/0AIjtcbwnjtcbwn9PVA',
+			extractValue: {
+				type: 'regex',
+				regex: GOOGLE_DRIVE_FOLDER_URL_REGEX,
+			},
+			validation: [
+				{
+					type: 'regex',
+					properties: {
+						regex: GOOGLE_DRIVE_FOLDER_URL_REGEX,
+						errorMessage: 'Not a valid Google Drive Drive URL',
+					},
+				},
+			],
+		},
+		{
+			displayName: 'ID',
+			name: 'id',
+			type: 'string',
+			// hint: 'The ID of the shared drive',
+			placeholder: 'e.g. 0AMXTKI5ZSiM7Uk9PVA',
+			validation: [
+				{
+					type: 'regex',
+					properties: {
+						regex: '[a-zA-Z0-9\\-_]{2,}',
+						errorMessage: 'Not a valid Google Drive Drive ID',
+					},
+				},
+			],
+			url: '=https://drive.google.com/drive/folders/{{$value}}',
+		},
+	],
+	description: 'The shared drive to operate on',
+};
+
+export const shareOptions: INodeProperties = {
+	displayName: 'Options',
+	name: 'options',
+	type: 'collection',
+	placeholder: 'Add Option',
+	default: {},
+	options: [
+		{
+			displayName: 'Email Message',
+			name: 'emailMessage',
+			type: 'string',
+			default: '',
+			description: 'A plain text custom message to include in the notification email',
+			typeOptions: {
+				rows: 2,
+			},
+		},
+		{
+			displayName: 'Move To New Owners Root',
+			name: 'moveToNewOwnersRoot',
+			type: 'boolean',
+			default: false,
+			// eslint-disable-next-line n8n-nodes-base/node-param-description-boolean-without-whether
+			description:
+				"<p>This parameter only takes effect if the item is not in a shared drive and the request is attempting to transfer the ownership of the item.</p><p>When set to true, the item is moved to the new owner's My Drive root folder and all prior parents removed.</p>",
+		},
+		{
+			displayName: 'Send Notification Email',
+			name: 'sendNotificationEmail',
+			type: 'boolean',
+			default: false,
+			description: 'Whether to send a notification email when sharing to users or groups',
+		},
+		{
+			displayName: 'Transfer Ownership',
+			name: 'transferOwnership',
+			type: 'boolean',
+			default: false,
+			description:
+				'Whether to transfer ownership to the specified user and downgrade the current owner to a writer',
+		},
+		{
+			displayName: 'Use Domain Admin Access',
+			name: 'useDomainAdminAccess',
+			type: 'boolean',
+			default: false,
+			description:
+				'Whether to perform the operation as domain administrator, i.e. if you are an administrator of the domain to which the shared drive belongs, you will be granted access automatically.',
+		},
+	],
+};
+
+export const permissionsOptions: INodeProperties = {
+	displayName: 'Permissions',
+	name: 'permissionsUi',
+	placeholder: 'Add Permission',
+	type: 'fixedCollection',
+	default: {},
+	typeOptions: {
+		multipleValues: false,
+	},
+	options: [
+		{
+			displayName: 'Permission',
+			name: 'permissionsValues',
+			values: [
+				{
+					displayName: 'Role',
+					name: 'role',
+					type: 'options',
+					description: 'Defines what users can do with the file or folder',
+					options: [
+						{
+							name: 'Commenter',
+							value: 'commenter',
+						},
+						{
+							name: 'File Organizer',
+							value: 'fileOrganizer',
+						},
+						{
+							name: 'Organizer',
+							value: 'organizer',
+						},
+						{
+							name: 'Owner',
+							value: 'owner',
+						},
+						{
+							name: 'Reader',
+							value: 'reader',
+						},
+						{
+							name: 'Writer',
+							value: 'writer',
+						},
+					],
+					default: '',
+				},
+				{
+					displayName: 'Type',
+					name: 'type',
+					type: 'options',
+					options: [
+						{
+							name: 'User',
+							value: 'user',
+						},
+						{
+							name: 'Group',
+							value: 'group',
+						},
+						{
+							name: 'Domain',
+							value: 'domain',
+						},
+						{
+							name: 'Anyone',
+							value: 'anyone',
+						},
+					],
+					default: '',
+					description:
+						'The scope of the permission. A permission with type=user applies to a specific user whereas a permission with type=domain applies to everyone in a specific domain.',
+				},
+				{
+					displayName: 'Email Address',
+					name: 'emailAddress',
+					type: 'string',
+					displayOptions: {
+						show: {
+							type: ['user', 'group'],
+						},
+					},
+					placeholder: '“e.g. name@mail.com',
+					default: '',
+					description: 'The email address of the user or group to which this permission refers',
+				},
+				{
+					displayName: 'Domain',
+					name: 'domain',
+					type: 'string',
+					displayOptions: {
+						show: {
+							type: ['domain'],
+						},
+					},
+					placeholder: 'e.g. mycompany.com',
+					default: '',
+					description: 'The domain to which this permission refers',
+				},
+				{
+					displayName: 'Allow File Discovery',
+					name: 'allowFileDiscovery',
+					type: 'boolean',
+					displayOptions: {
+						show: {
+							type: ['domain', 'anyone'],
+						},
+					},
+					default: false,
+					description: 'Whether to allow the file to be discovered through search',
+				},
+			],
+		},
+	],
+};
+
+export const updateCommonOptions: INodeProperties[] = [
+	{
+		displayName: 'APP Properties',
+		name: 'appPropertiesUi',
+		placeholder: 'Add Property',
+		type: 'fixedCollection',
+		default: {},
+		typeOptions: {
+			multipleValues: true,
+		},
+		description:
+			'A collection of arbitrary key-value pairs which are private to the requesting app',
+		options: [
+			{
+				name: 'appPropertyValues',
+				displayName: 'APP Property',
+				values: [
+					{
+						displayName: 'Key',
+						name: 'key',
+						type: 'string',
+						default: '',
+						description: 'Name of the key to add',
+					},
+					{
+						displayName: 'Value',
+						name: 'value',
+						type: 'string',
+						default: '',
+						description: 'Value to set for the key',
+					},
+				],
+			},
+		],
+	},
+	{
+		displayName: 'Properties',
+		name: 'propertiesUi',
+		placeholder: 'Add Property',
+		type: 'fixedCollection',
+		default: {},
+		typeOptions: {
+			multipleValues: true,
+		},
+		description: 'A collection of arbitrary key-value pairs which are visible to all apps',
+		options: [
+			{
+				name: 'propertyValues',
+				displayName: 'Property',
+				values: [
+					{
+						displayName: 'Key',
+						name: 'key',
+						type: 'string',
+						default: '',
+						description: 'Name of the key to add',
+					},
+					{
+						displayName: 'Value',
+						name: 'value',
+						type: 'string',
+						default: '',
+						description: 'Value to set for the key',
+					},
+				],
+			},
+		],
+	},
+	{
+		displayName: 'Keep Revision Forever',
+		name: 'keepRevisionForever',
+		type: 'boolean',
+		default: false,
+		description:
+			"Whether to set the 'keepForever' field in the new head revision. This is only applicable to files with binary content in Google Drive. Only 200 revisions for the file can be kept forever. If the limit is reached, try deleting pinned revisions.",
+	},
+	{
+		displayName: 'OCR Language',
+		name: 'ocrLanguage',
+		type: 'string',
+		default: '',
+		placeholder: 'e.g. en',
+		description: 'A language hint for OCR processing during image import (ISO 639-1 code)',
+	},
+	{
+		displayName: 'Use Content As Indexable Text',
+		name: 'useContentAsIndexableText',
+		type: 'boolean',
+		default: false,
+		description: 'Whether to use the uploaded content as indexable text',
+	},
+];
+
+export const fileTypesOptions = [
+	{
+		name: 'All',
+		value: '*',
+		description: 'Return all file types',
+	},
+	{
+		name: '3rd Party Shortcut',
+		value: DRIVE.SDK,
+	},
+	{
+		name: 'Audio',
+		value: DRIVE.AUDIO,
+	},
+	{
+		name: 'Folder',
+		value: DRIVE.FOLDER,
+	},
+	{
+		name: 'Google Apps Scripts',
+		value: DRIVE.APP_SCRIPTS,
+	},
+	{
+		name: 'Google Docs',
+		value: DRIVE.DOCUMENT,
+	},
+	{
+		name: 'Google Drawing',
+		value: DRIVE.DRAWING,
+	},
+	{
+		name: 'Google Forms',
+		value: DRIVE.FORM,
+	},
+	{
+		name: 'Google Fusion Tables',
+		value: DRIVE.FUSIONTABLE,
+	},
+	{
+		name: 'Google My Maps',
+		value: DRIVE.MAP,
+	},
+	{
+		name: 'Google Sheets',
+		value: DRIVE.SPREADSHEET,
+	},
+	{
+		name: 'Google Sites',
+		value: DRIVE.SITES,
+	},
+	{
+		name: 'Google Slides',
+		value: DRIVE.PRESENTATION,
+	},
+	{
+		name: 'Photo',
+		value: DRIVE.PHOTO,
+	},
+	{
+		name: 'Unknown',
+		value: DRIVE.UNKNOWN,
+	},
+	{
+		name: 'Video',
+		value: DRIVE.VIDEO,
+	},
+];
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/Drive.resource.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/Drive.resource.ts
new file mode 100644
index 0000000000000..19d82cb1eb3c9
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/Drive.resource.ts
@@ -0,0 +1,61 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+import * as create from './create.operation';
+import * as deleteDrive from './deleteDrive.operation';
+import * as get from './get.operation';
+import * as list from './list.operation';
+import * as update from './update.operation';
+
+export { create, deleteDrive, get, list, update };
+
+export const description: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a shared drive',
+				action: 'Create shared drive',
+			},
+			{
+				name: 'Delete',
+				value: 'deleteDrive',
+				description: 'Permanently delete a shared drive',
+				action: 'Delete shared drive',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get a shared drive',
+				action: 'Get shared drive',
+			},
+			{
+				name: 'Get Many',
+				value: 'list',
+				description: 'Get the list of shared drives',
+				action: 'Get many shared drives',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update a shared drive',
+				action: 'Update shared drive',
+			},
+		],
+		default: 'create',
+		displayOptions: {
+			show: {
+				resource: ['drive'],
+			},
+		},
+	},
+	...create.description,
+	...deleteDrive.description,
+	...get.description,
+	...list.description,
+	...update.description,
+];
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
new file mode 100644
index 0000000000000..18aa62a68b74c
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/create.operation.ts
@@ -0,0 +1,266 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+
+import { v4 as uuid } from 'uuid';
+import { googleApiRequest } from '../../transport';
+import { updateDisplayOptions } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	{
+		displayName: 'Name',
+		name: 'name',
+		type: 'string',
+		default: '',
+		placeholder: 'e.g. New Shared Drive',
+		description: 'The name of the shared drive to create',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			{
+				displayName: 'Capabilities',
+				name: 'capabilities',
+				type: 'collection',
+				placeholder: 'Add Field',
+				default: {},
+				options: [
+					{
+						displayName: 'Can Add Children',
+						name: 'canAddChildren',
+						type: 'boolean',
+						default: false,
+						description:
+							'Whether the current user can add children to folders in this shared drive',
+					},
+					{
+						displayName: 'Can Change Copy Requires Writer Permission Restriction',
+						name: 'canChangeCopyRequiresWriterPermissionRestriction',
+						type: 'boolean',
+						default: false,
+						description:
+							'Whether the current user can change the copyRequiresWriterPermission restriction of this shared drive',
+					},
+					{
+						displayName: 'Can Change Domain Users Only Restriction',
+						name: 'canChangeDomainUsersOnlyRestriction',
+						type: 'boolean',
+						default: false,
+						description:
+							'Whether the current user can change the domainUsersOnly restriction of this shared drive',
+					},
+					{
+						displayName: 'Can Change Drive Background',
+						name: 'canChangeDriveBackground',
+						type: 'boolean',
+						default: false,
+						description: 'Whether the current user can change the background of this shared drive',
+					},
+					{
+						displayName: 'Can Change Drive Members Only Restriction',
+						name: 'canChangeDriveMembersOnlyRestriction',
+						type: 'boolean',
+						default: false,
+						description:
+							'Whether the current user can change the driveMembersOnly restriction of this shared drive',
+					},
+					{
+						displayName: 'Can Comment',
+						name: 'canComment',
+						type: 'boolean',
+						default: false,
+						description: 'Whether the current user can comment on files in this shared drive',
+					},
+					{
+						displayName: 'Can Copy',
+						name: 'canCopy',
+						type: 'boolean',
+						default: false,
+						description: 'Whether the current user can copy files in this shared drive',
+					},
+					{
+						displayName: 'Can Delete Children',
+						name: 'canDeleteChildren',
+						type: 'boolean',
+						default: false,
+						description:
+							'Whether the current user can delete children from folders in this shared drive',
+					},
+					{
+						displayName: 'Can Delete Drive',
+						name: 'canDeleteDrive',
+						type: 'boolean',
+						default: false,
+						description:
+							'Whether the current user can delete this shared drive. Attempting to delete the shared drive may still fail if there are untrashed items inside the shared drive.',
+					},
+					{
+						displayName: 'Can Download',
+						name: 'canDownload',
+						type: 'boolean',
+						default: false,
+						description: 'Whether the current user can download files in this shared drive',
+					},
+					{
+						displayName: 'Can Edit',
+						name: 'canEdit',
+						type: 'boolean',
+						default: false,
+						description: 'Whether the current user can edit files in this shared drive',
+					},
+					{
+						displayName: 'Can List Children',
+						name: 'canListChildren',
+						type: 'boolean',
+						default: false,
+						description:
+							'Whether the current user can list the children of folders in this shared drive',
+					},
+					{
+						displayName: 'Can Manage Members',
+						name: 'canManageMembers',
+						type: 'boolean',
+						default: false,
+						description:
+							'Whether the current user can add members to this shared drive or remove them or change their role',
+					},
+					{
+						displayName: 'Can Read Revisions',
+						name: 'canReadRevisions',
+						type: 'boolean',
+						default: false,
+						description:
+							'Whether the current user can read the revisions resource of files in this shared drive',
+					},
+					{
+						displayName: 'Can Rename',
+						name: 'canRename',
+						type: 'boolean',
+						default: false,
+						description:
+							'Whether the current user can rename files or folders in this shared drive',
+					},
+					{
+						displayName: 'Can Rename Drive',
+						name: 'canRenameDrive',
+						type: 'boolean',
+						default: false,
+						description: 'Whether the current user can rename this shared drive',
+					},
+					{
+						displayName: 'Can Share',
+						name: 'canShare',
+						type: 'boolean',
+						default: false,
+						description: 'Whether the current user can rename this shared drive',
+					},
+					{
+						displayName: 'Can Trash Children',
+						name: 'canTrashChildren',
+						type: 'boolean',
+						default: false,
+						description:
+							'Whether the current user can trash children from folders in this shared drive',
+					},
+				],
+			},
+			{
+				displayName: 'Color RGB',
+				name: 'colorRgb',
+				type: 'color',
+				default: '',
+				description: 'The color of this shared drive as an RGB hex string',
+			},
+			{
+				displayName: 'Hidden',
+				name: 'hidden',
+				type: 'boolean',
+				default: false,
+				description: 'Whether the shared drive is hidden from default view',
+			},
+			{
+				displayName: 'Restrictions',
+				name: 'restrictions',
+				type: 'collection',
+				placeholder: 'Add Field',
+				default: {},
+				options: [
+					{
+						displayName: 'Admin Managed Restrictions',
+						name: 'adminManagedRestrictions',
+						type: 'boolean',
+						default: false,
+						description:
+							'Whether the options to copy, print, or download files inside this shared drive, should be disabled for readers and commenters. When this restriction is set to true, it will override the similarly named field to true for any file inside this shared drive.',
+					},
+					{
+						displayName: 'Copy Requires Writer Permission',
+						name: 'copyRequiresWriterPermission',
+						type: 'boolean',
+						default: false,
+						description:
+							'Whether the options to copy, print, or download files inside this shared drive, should be disabled for readers and commenters. When this restriction is set to true, it will override the similarly named field to true for any file inside this shared drive.',
+					},
+					{
+						displayName: 'Domain Users Only',
+						name: 'domainUsersOnly',
+						type: 'boolean',
+						default: false,
+						description:
+							'Whether access to this shared drive and items inside this shared drive is restricted to users of the domain to which this shared drive belongs. This restriction may be overridden by other sharing policies controlled outside of this shared drive.',
+					},
+					{
+						displayName: 'Drive Members Only',
+						name: 'driveMembersOnly',
+						type: 'boolean',
+						default: false,
+						description:
+							'Whether access to items inside this shared drive is restricted to its members',
+					},
+				],
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['drive'],
+		operation: ['create'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	const returnData: INodeExecutionData[] = [];
+	const options = this.getNodeParameter('options', i);
+
+	const name = this.getNodeParameter('name', i) as string;
+
+	const body: IDataObject = {
+		name,
+	};
+
+	Object.assign(body, options);
+
+	const response = await googleApiRequest.call(this, 'POST', '/drive/v3/drives', body, {
+		requestId: uuid(),
+	});
+
+	const executionData = this.helpers.constructExecutionMetaData(
+		this.helpers.returnJsonArray(response as IDataObject[]),
+		{ itemData: { item: i } },
+	);
+
+	returnData.push(...executionData);
+
+	return returnData;
+}
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
new file mode 100644
index 0000000000000..1c63a0f1fe642
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/deleteDrive.operation.ts
@@ -0,0 +1,40 @@
+import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
+
+import { googleApiRequest } from '../../transport';
+import { sharedDriveRLC } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	{
+		...sharedDriveRLC,
+		description: 'The shared drive to delete',
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['drive'],
+		operation: ['deleteDrive'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	const returnData: INodeExecutionData[] = [];
+
+	const driveId = this.getNodeParameter('driveId', i, undefined, {
+		extractValue: true,
+	}) as string;
+
+	await googleApiRequest.call(this, 'DELETE', `/drive/v3/drives/${driveId}`);
+
+	const executionData = this.helpers.constructExecutionMetaData(
+		this.helpers.returnJsonArray({ success: true }),
+		{ itemData: { item: i } },
+	);
+
+	returnData.push(...executionData);
+
+	return returnData;
+}
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
new file mode 100644
index 0000000000000..890043d43f068
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/get.operation.ts
@@ -0,0 +1,67 @@
+import type {
+	IExecuteFunctions,
+	IDataObject,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+
+import { googleApiRequest } from '../../transport';
+import { sharedDriveRLC } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	{
+		...sharedDriveRLC,
+		description: 'The shared drive to get',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			{
+				displayName: 'Use Domain Admin Access',
+				name: 'useDomainAdminAccess',
+				type: 'boolean',
+				default: false,
+				description:
+					'Whether to issue the request as a domain administrator; if set to true, then the requester will be granted access if they are an administrator of the domain to which the shared drive belongs',
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['drive'],
+		operation: ['get'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	const returnData: INodeExecutionData[] = [];
+	const options = this.getNodeParameter('options', i);
+
+	const driveId = this.getNodeParameter('driveId', i, undefined, {
+		extractValue: true,
+	}) as string;
+
+	const qs: IDataObject = {};
+
+	Object.assign(qs, options);
+
+	const response = await googleApiRequest.call(this, 'GET', `/drive/v3/drives/${driveId}`, {}, qs);
+
+	const executionData = this.helpers.constructExecutionMetaData(
+		this.helpers.returnJsonArray(response as IDataObject[]),
+		{ itemData: { item: i } },
+	);
+
+	returnData.push(...executionData);
+
+	return returnData;
+}
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
new file mode 100644
index 0000000000000..7f9d03162ea65
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/list.operation.ts
@@ -0,0 +1,106 @@
+import type {
+	IExecuteFunctions,
+	IDataObject,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+
+import { googleApiRequest, googleApiRequestAllItems } from '../../transport';
+import { updateDisplayOptions } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		default: false,
+		description: 'Whether to return all results or only up to a given limit',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				returnAll: [false],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 200,
+		},
+		default: 100,
+		description: 'Max number of results to return',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			{
+				displayName: 'Query',
+				name: 'q',
+				type: 'string',
+				default: '',
+				description:
+					'Query string for searching shared drives. See the <a href="https://developers.google.com/drive/api/v3/search-shareddrives">"Search for shared drives"</a> guide for supported syntax.',
+			},
+			{
+				displayName: 'Use Domain Admin Access',
+				name: 'useDomainAdminAccess',
+				type: 'boolean',
+				default: false,
+				description:
+					'Whether to issue the request as a domain administrator; if set to true, then the requester will be granted access if they are an administrator of the domain to which the shared drive belongs',
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['drive'],
+		operation: ['list'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	const returnData: INodeExecutionData[] = [];
+	const options = this.getNodeParameter('options', i);
+
+	const returnAll = this.getNodeParameter('returnAll', i);
+
+	const qs: IDataObject = {};
+
+	let response: IDataObject[] = [];
+
+	Object.assign(qs, options);
+
+	if (returnAll) {
+		response = await googleApiRequestAllItems.call(
+			this,
+			'GET',
+			'drives',
+			'/drive/v3/drives',
+			{},
+			qs,
+		);
+	} else {
+		qs.pageSize = this.getNodeParameter('limit', i);
+		const data = await googleApiRequest.call(this, 'GET', '/drive/v3/drives', {}, qs);
+		response = data.drives as IDataObject[];
+	}
+
+	const executionData = this.helpers.constructExecutionMetaData(
+		this.helpers.returnJsonArray(response),
+		{ itemData: { item: i } },
+	);
+
+	returnData.push(...executionData);
+
+	return returnData;
+}
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
new file mode 100644
index 0000000000000..07b598b512b07
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/update.operation.ts
@@ -0,0 +1,120 @@
+import type {
+	IExecuteFunctions,
+	IDataObject,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+
+import { googleApiRequest } from '../../transport';
+import { sharedDriveRLC } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	{
+		...sharedDriveRLC,
+		description: 'The shared drive to update',
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		displayOptions: {
+			show: {
+				operation: ['update'],
+				resource: ['drive'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Color RGB',
+				name: 'colorRgb',
+				type: 'color',
+				default: '',
+				description: 'The color of this shared drive as an RGB hex string',
+			},
+			{
+				displayName: 'Name',
+				name: 'name',
+				type: 'string',
+				default: '',
+				description: 'The updated name of the shared drive',
+			},
+			{
+				displayName: 'Restrictions',
+				name: 'restrictions',
+				type: 'collection',
+				placeholder: 'Add Field',
+				default: {},
+				options: [
+					{
+						displayName: 'Admin Managed Restrictions',
+						name: 'adminManagedRestrictions',
+						type: 'boolean',
+						default: false,
+						description:
+							'Whether the options to copy, print, or download files inside this shared drive, should be disabled for readers and commenters. When this restriction is set to true, it will override the similarly named field to true for any file inside this shared drive.',
+					},
+					{
+						displayName: 'Copy Requires Writer Permission',
+						name: 'copyRequiresWriterPermission',
+						type: 'boolean',
+						default: false,
+						description:
+							'Whether the options to copy, print, or download files inside this shared drive, should be disabled for readers and commenters. When this restriction is set to true, it will override the similarly named field to true for any file inside this shared drive.',
+					},
+					{
+						displayName: 'Domain Users Only',
+						name: 'domainUsersOnly',
+						type: 'boolean',
+						default: false,
+						description:
+							'Whether access to this shared drive and items inside this shared drive is restricted to users of the domain to which this shared drive belongs. This restriction may be overridden by other sharing policies controlled outside of this shared drive.',
+					},
+					{
+						displayName: 'Drive Members Only',
+						name: 'driveMembersOnly',
+						type: 'boolean',
+						default: false,
+						description:
+							'Whether access to items inside this shared drive is restricted to its members',
+					},
+				],
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['drive'],
+		operation: ['update'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	const returnData: INodeExecutionData[] = [];
+	const options = this.getNodeParameter('options', i, {});
+
+	const driveId = this.getNodeParameter('driveId', i, undefined, {
+		extractValue: true,
+	}) as string;
+
+	const body: IDataObject = {};
+
+	Object.assign(body, options);
+
+	const response = await googleApiRequest.call(this, 'PATCH', `/drive/v3/drives/${driveId}`, body);
+
+	const executionData = this.helpers.constructExecutionMetaData(
+		this.helpers.returnJsonArray(response as IDataObject[]),
+		{ itemData: { item: i } },
+	);
+
+	returnData.push(...executionData);
+
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/File.resource.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/File.resource.ts
new file mode 100644
index 0000000000000..2c7b34b3c3d60
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/File.resource.ts
@@ -0,0 +1,85 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+import * as copy from './copy.operation';
+import * as createFromText from './createFromText.operation';
+import * as deleteFile from './deleteFile.operation';
+import * as download from './download.operation';
+import * as move from './move.operation';
+import * as share from './share.operation';
+import * as update from './update.operation';
+import * as upload from './upload.operation';
+
+export { copy, createFromText, deleteFile, download, move, share, update, upload };
+
+export const description: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				resource: ['file'],
+			},
+		},
+		options: [
+			{
+				name: 'Copy',
+				value: 'copy',
+				description: 'Create a copy of an existing file',
+				action: 'Copy file',
+			},
+			{
+				name: 'Create From Text',
+				value: 'createFromText',
+				description: 'Create a file from a provided text',
+				action: 'Create file from text',
+			},
+			{
+				name: 'Delete',
+				value: 'deleteFile',
+				description: 'Permanently delete a file',
+				action: 'Delete a file',
+			},
+			{
+				name: 'Download',
+				value: 'download',
+				description: 'Download a file',
+				action: 'Download file',
+			},
+			{
+				name: 'Move',
+				value: 'move',
+				description: 'Move a file to another folder',
+				action: 'Move file',
+			},
+			{
+				name: 'Share',
+				value: 'share',
+				description: 'Add sharing permissions to a file',
+				action: 'Share file',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update a file',
+				action: 'Update file',
+			},
+			{
+				name: 'Upload',
+				value: 'upload',
+				description: 'Upload an existing file to Google Drive',
+				action: 'Upload file',
+			},
+		],
+		default: 'upload',
+	},
+	...copy.description,
+	...deleteFile.description,
+	...createFromText.description,
+	...download.description,
+	...move.description,
+	...share.description,
+	...update.description,
+	...upload.description,
+];
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
new file mode 100644
index 0000000000000..368ff55e228f4
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/copy.operation.ts
@@ -0,0 +1,136 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeParameterResourceLocator,
+	INodeProperties,
+} from 'n8n-workflow';
+
+import { googleApiRequest } from '../../transport';
+import { driveRLC, fileRLC, folderRLC } from '../common.descriptions';
+import { setParentFolder } from '../../helpers/utils';
+import { updateDisplayOptions } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	{
+		...fileRLC,
+		description: 'The file to copy',
+	},
+	{
+		displayName: 'File Name',
+		name: 'name',
+		type: 'string',
+		default: '',
+		placeholder: 'e.g. My File',
+		description:
+			'The name of the new file. If not set, “Copy of {original file name}” will be used.',
+	},
+	{
+		displayName: 'Copy In The Same Folder',
+		name: 'sameFolder',
+		type: 'boolean',
+		default: true,
+		description: 'Whether to copy the file in the same folder as the original file',
+	},
+	{
+		...driveRLC,
+		displayName: 'Parent Drive',
+		description: 'The drive where to save the copied file',
+		displayOptions: { show: { sameFolder: [false] } },
+	},
+	{
+		...folderRLC,
+		displayName: 'Parent Folder',
+		description: 'The folder where to save the copied file',
+		displayOptions: { show: { sameFolder: [false] } },
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			{
+				displayName: 'Copy Requires Writer Permission',
+				name: 'copyRequiresWriterPermission',
+				type: 'boolean',
+				default: false,
+				description:
+					'Whether the options to copy, print, or download this file, should be disabled for readers and commenters',
+			},
+			{
+				displayName: 'Description',
+				name: 'description',
+				type: 'string',
+				default: '',
+				description: 'A short description of the file',
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['file'],
+		operation: ['copy'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	const file = this.getNodeParameter('fileId', i) as INodeParameterResourceLocator;
+
+	const fileId = file.value;
+
+	const options = this.getNodeParameter('options', i, {});
+
+	let name = this.getNodeParameter('name', i) as string;
+	name = name ? name : `Copy of ${file.cachedResultName}`;
+
+	const copyRequiresWriterPermission = options.copyRequiresWriterPermission || false;
+
+	const qs = {
+		includeItemsFromAllDrives: true,
+		supportsAllDrives: true,
+		spaces: 'appDataFolder, drive',
+		corpora: 'allDrives',
+	};
+
+	const parents: string[] = [];
+	const sameFolder = this.getNodeParameter('sameFolder', i) as boolean;
+
+	if (!sameFolder) {
+		const driveId = this.getNodeParameter('driveId', i, undefined, {
+			extractValue: true,
+		}) as string;
+
+		const folderId = this.getNodeParameter('folderId', i, undefined, {
+			extractValue: true,
+		}) as string;
+
+		parents.push(setParentFolder(folderId, driveId));
+	}
+
+	const body: IDataObject = { copyRequiresWriterPermission, parents, name };
+
+	if (options.description) {
+		body.description = options.description;
+	}
+
+	const response = await googleApiRequest.call(
+		this,
+		'POST',
+		`/drive/v3/files/${fileId}/copy`,
+		body,
+		qs,
+	);
+
+	const executionData = this.helpers.constructExecutionMetaData(
+		this.helpers.returnJsonArray(response as IDataObject[]),
+		{ itemData: { item: i } },
+	);
+
+	return executionData;
+}
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
new file mode 100644
index 0000000000000..ac45185040f40
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/createFromText.operation.ts
@@ -0,0 +1,187 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+
+import { driveRLC, folderRLC, updateCommonOptions } from '../common.descriptions';
+import { googleApiRequest } from '../../transport';
+import { DRIVE } from '../../helpers/interfaces';
+import { setFileProperties, setParentFolder, setUpdateCommonParams } from '../../helpers/utils';
+import { updateDisplayOptions } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	{
+		displayName: 'File Content',
+		name: 'content',
+		type: 'string',
+		default: '',
+		typeOptions: {
+			rows: 2,
+		},
+		description: 'The text to create the file with',
+	},
+	{
+		displayName: 'File Name',
+		name: 'name',
+		type: 'string',
+		default: '',
+		placeholder: 'e.g. My New File',
+		description:
+			"The name of the file you want to create. If not specified, 'Untitled' will be used.",
+	},
+	{
+		...driveRLC,
+		displayName: 'Parent Drive',
+		required: false,
+		description: 'The drive where to create the new file',
+	},
+	{
+		...folderRLC,
+		displayName: 'Parent Folder',
+		required: false,
+		description: 'The folder where to create the new file',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			...updateCommonOptions,
+			{
+				displayName: 'Convert to Google Document',
+				name: 'convertToGoogleDocument',
+				type: 'boolean',
+				default: false,
+				description: 'Whether to create a Google Document (instead of the .txt default format)',
+				hint: 'Google Docs API has to be enabled in the <a href="https://console.developers.google.com/apis/library/docs.googleapis.com" target="_blank">Google API Console</a>.',
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['file'],
+		operation: ['createFromText'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	const name = (this.getNodeParameter('name', i) as string) || 'Untitled';
+
+	const options = this.getNodeParameter('options', i, {});
+	const convertToGoogleDocument = (options.convertToGoogleDocument as boolean) || false;
+	const mimeType = convertToGoogleDocument ? DRIVE.DOCUMENT : 'text/plain';
+
+	const driveId = this.getNodeParameter('driveId', i, undefined, {
+		extractValue: true,
+	}) as string;
+
+	const folderId = this.getNodeParameter('folderId', i, undefined, {
+		extractValue: true,
+	}) as string;
+
+	const bodyParameters = setFileProperties(
+		{
+			name,
+			parents: [setParentFolder(folderId, driveId)],
+			mimeType,
+		},
+		options,
+	);
+
+	const qs = setUpdateCommonParams(
+		{
+			includeItemsFromAllDrives: true,
+			supportsAllDrives: true,
+			spaces: 'appDataFolder, drive',
+			corpora: 'allDrives',
+		},
+		options,
+	);
+
+	let response;
+	if (convertToGoogleDocument) {
+		const document = await googleApiRequest.call(
+			this,
+			'POST',
+			'/drive/v3/files',
+			bodyParameters,
+			qs,
+		);
+
+		const text = this.getNodeParameter('content', i, '') as string;
+
+		const body = {
+			requests: [
+				{
+					insertText: {
+						text,
+						endOfSegmentLocation: {
+							segmentId: '', //empty segment ID signifies the document's body
+						},
+					},
+				},
+			],
+		};
+
+		const updateResponse = await googleApiRequest.call(
+			this,
+			'POST',
+			'',
+			body,
+			undefined,
+			`https://docs.googleapis.com/v1/documents/${document.id}:batchUpdate`,
+		);
+
+		response = { id: updateResponse.documentId };
+	} else {
+		const content = Buffer.from(this.getNodeParameter('content', i, '') as string, 'utf8');
+		const contentLength = content.byteLength;
+
+		const uploadData = await googleApiRequest.call(
+			this,
+			'POST',
+			'/upload/drive/v3/files',
+			content,
+			{
+				uploadType: 'media',
+			},
+			undefined,
+			{
+				headers: {
+					'Content-Type': mimeType,
+					'Content-Length': contentLength,
+				},
+			},
+		);
+
+		const uploadId = uploadData.id;
+
+		qs.addParents = setParentFolder(folderId, driveId);
+		delete bodyParameters.parents;
+
+		const responseData = await googleApiRequest.call(
+			this,
+			'PATCH',
+			`/drive/v3/files/${uploadId}`,
+			bodyParameters,
+			qs,
+		);
+
+		response = { id: responseData.id };
+	}
+
+	const executionData = this.helpers.constructExecutionMetaData(
+		this.helpers.returnJsonArray(response as IDataObject),
+		{ itemData: { item: i } },
+	);
+
+	return executionData;
+}
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
new file mode 100644
index 0000000000000..241c210a81250
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/deleteFile.operation.ts
@@ -0,0 +1,66 @@
+import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
+
+import { googleApiRequest } from '../../transport';
+import { fileRLC } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	{
+		...fileRLC,
+		description: 'The file to delete',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			{
+				displayName: 'Delete Permanently',
+				name: 'deletePermanently',
+				type: 'boolean',
+				default: false,
+				description:
+					'Whether to delete the file immediately. If false, the file will be moved to the trash.',
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['file'],
+		operation: ['deleteFile'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	const fileId = this.getNodeParameter('fileId', i, undefined, {
+		extractValue: true,
+	}) as string;
+
+	const deletePermanently = this.getNodeParameter('options.deletePermanently', i, false) as boolean;
+
+	const qs = {
+		supportsAllDrives: true,
+	};
+
+	if (deletePermanently) {
+		await googleApiRequest.call(this, 'DELETE', `/drive/v3/files/${fileId}`, undefined, qs);
+	} else {
+		await googleApiRequest.call(this, 'PATCH', `/drive/v3/files/${fileId}`, { trashed: true }, qs);
+	}
+
+	const executionData = this.helpers.constructExecutionMetaData(
+		this.helpers.returnJsonArray({
+			id: fileId,
+			success: true,
+		}),
+		{ itemData: { item: i } },
+	);
+
+	return executionData;
+}
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
new file mode 100644
index 0000000000000..26a21c2070d68
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/download.operation.ts
@@ -0,0 +1,284 @@
+import type {
+	IExecuteFunctions,
+	IBinaryKeyData,
+	IDataObject,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+
+import { googleApiRequest } from '../../transport';
+import { fileRLC } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	{
+		...fileRLC,
+		description: 'The file to download',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			{
+				displayName: 'Put Output File in Field',
+				name: 'binaryPropertyName',
+				type: 'string',
+				placeholder: 'e.g. data',
+				default: 'data',
+				description: 'Use this field name in the following nodes, to use the binary file data',
+				hint: 'The name of the output binary field to put the file in',
+			},
+			{
+				displayName: 'Google File Conversion',
+				name: 'googleFileConversion',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: false,
+				},
+				default: {},
+				placeholder: 'Add Conversion',
+				options: [
+					{
+						displayName: 'Conversion',
+						name: 'conversion',
+						values: [
+							{
+								displayName: 'Google Docs',
+								name: 'docsToFormat',
+								type: 'options',
+
+								options: [
+									{
+										name: 'HTML',
+										value: 'text/html',
+									},
+									{
+										name: 'MS Word Document',
+										value:
+											'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+									},
+									{
+										name: 'Open Office Document',
+										value: 'application/vnd.oasis.opendocument.text',
+									},
+									{
+										name: 'PDF',
+										value: 'application/pdf',
+									},
+									{
+										// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+										name: 'Rich Text (rtf)',
+										value: 'application/rtf',
+									},
+									{
+										// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+										name: 'Text (txt)',
+										value: 'text/plain',
+									},
+								],
+								default: 'text/html',
+								description: 'Format used to export when downloading Google Docs files',
+							},
+							{
+								displayName: 'Google Drawings',
+								name: 'drawingsToFormat',
+								type: 'options',
+								options: [
+									{
+										name: 'JPEG',
+										value: 'image/jpeg',
+									},
+									{
+										name: 'PDF',
+										value: 'application/pdf',
+									},
+									{
+										name: 'PNG',
+										value: 'image/png',
+									},
+									{
+										name: 'SVG',
+										value: 'image/svg+xml',
+									},
+								],
+								default: 'image/jpeg',
+								description: 'Format used to export when downloading Google Drawings files',
+							},
+							{
+								displayName: 'Google Slides',
+								name: 'slidesToFormat',
+								type: 'options',
+								options: [
+									{
+										name: 'MS PowerPoint',
+										value:
+											'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+									},
+									{
+										name: 'OpenOffice Presentation',
+										value: 'application/vnd.oasis.opendocument.presentation',
+									},
+									{
+										name: 'PDF',
+										value: 'application/pdf',
+									},
+								],
+								default:
+									'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+								description: 'Format used to export when downloading Google Slides files',
+							},
+							{
+								displayName: 'Google Sheets',
+								name: 'sheetsToFormat',
+								type: 'options',
+								options: [
+									{
+										name: 'CSV',
+										value: 'text/csv',
+									},
+									{
+										name: 'MS Excel',
+										value: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+									},
+									{
+										name: 'Open Office Sheet',
+										value: 'application/vnd.oasis.opendocument.spreadsheet',
+									},
+									{
+										name: 'PDF',
+										value: 'application/pdf',
+									},
+								],
+								default: 'text/csv',
+								description: 'Format used to export when downloading Google Sheets files',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'File Name',
+				name: 'fileName',
+				type: 'string',
+				default: '',
+				description: 'File name. Ex: data.pdf.',
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['file'],
+		operation: ['download'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	i: number,
+	item: INodeExecutionData,
+): Promise<INodeExecutionData[]> {
+	const fileId = this.getNodeParameter('fileId', i, undefined, {
+		extractValue: true,
+	}) as string;
+
+	const downloadOptions = this.getNodeParameter('options', i);
+
+	const requestOptions = {
+		useStream: true,
+		returnFullResponse: true,
+		encoding: 'arraybuffer',
+		json: false,
+	};
+
+	const file = await googleApiRequest.call(
+		this,
+		'GET',
+		`/drive/v3/files/${fileId}`,
+		{},
+		{ fields: 'mimeType,name', supportsTeamDrives: true, supportsAllDrives: true },
+	);
+	let response;
+
+	if (file.mimeType?.includes('vnd.google-apps')) {
+		const parameterKey = 'options.googleFileConversion.conversion';
+		const type = file.mimeType.split('.')[2];
+		let mime;
+		if (type === 'document') {
+			mime = this.getNodeParameter(
+				`${parameterKey}.docsToFormat`,
+				i,
+				'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+			) as string;
+		} else if (type === 'presentation') {
+			mime = this.getNodeParameter(
+				`${parameterKey}.slidesToFormat`,
+				i,
+				'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+			) as string;
+		} else if (type === 'spreadsheet') {
+			mime = this.getNodeParameter(
+				`${parameterKey}.sheetsToFormat`,
+				i,
+				'application/x-vnd.oasis.opendocument.spreadsheet',
+			) as string;
+		} else {
+			mime = this.getNodeParameter(`${parameterKey}.drawingsToFormat`, i, 'image/jpeg') as string;
+		}
+		response = await googleApiRequest.call(
+			this,
+			'GET',
+			`/drive/v3/files/${fileId}/export`,
+			{},
+			{ mimeType: mime, supportsAllDrives: true },
+			undefined,
+			requestOptions,
+		);
+	} else {
+		response = await googleApiRequest.call(
+			this,
+			'GET',
+			`/drive/v3/files/${fileId}`,
+			{},
+			{ alt: 'media', supportsAllDrives: true },
+			undefined,
+			requestOptions,
+		);
+	}
+
+	const mimeType =
+		(response.headers as IDataObject)?.['content-type'] ?? file.mimeType ?? undefined;
+	const fileName = downloadOptions.fileName ?? file.name ?? undefined;
+
+	const newItem: INodeExecutionData = {
+		json: item.json,
+		binary: {},
+	};
+
+	if (item.binary !== undefined) {
+		// Create a shallow copy of the binary data so that the old
+		// data references which do not get changed still stay behind
+		// but the incoming data does not get changed.
+		Object.assign(newItem.binary as IBinaryKeyData, item.binary);
+	}
+
+	item = newItem;
+
+	const dataPropertyNameDownload = (downloadOptions.binaryPropertyName as string) || 'data';
+
+	item.binary![dataPropertyNameDownload] = await this.helpers.prepareBinaryData(
+		response.body as Buffer,
+		fileName as string,
+		mimeType as string,
+	);
+
+	const executionData = this.helpers.constructExecutionMetaData([item], { itemData: { item: i } });
+
+	return executionData;
+}
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
new file mode 100644
index 0000000000000..d6770f596c963
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/move.operation.ts
@@ -0,0 +1,88 @@
+import type {
+	IExecuteFunctions,
+	IDataObject,
+	INodeExecutionData,
+	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';
+
+const properties: INodeProperties[] = [
+	{
+		...fileRLC,
+		description: 'The file to move',
+	},
+	{
+		...driveRLC,
+		displayName: 'Parent Drive',
+		description: 'The drive where to move the file',
+	},
+	{
+		...folderRLC,
+		displayName: 'Parent Folder',
+		description: 'The folder where to move the file',
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['file'],
+		operation: ['move'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	const fileId = this.getNodeParameter('fileId', i, undefined, {
+		extractValue: true,
+	});
+
+	const driveId = this.getNodeParameter('driveId', i, undefined, {
+		extractValue: true,
+	}) as string;
+
+	const folderId = this.getNodeParameter('folderId', i, undefined, {
+		extractValue: true,
+	}) as string;
+
+	const qs = {
+		includeItemsFromAllDrives: true,
+		supportsAllDrives: true,
+		spaces: 'appDataFolder, drive',
+		corpora: 'allDrives',
+	};
+
+	const { parents } = await googleApiRequest.call(
+		this,
+		'GET',
+		`/drive/v3/files/${fileId}`,
+		undefined,
+		{
+			...qs,
+			fields: 'parents',
+		},
+	);
+
+	const response = await googleApiRequest.call(
+		this,
+		'PATCH',
+		`/drive/v3/files/${fileId}`,
+		undefined,
+		{
+			...qs,
+			addParents: setParentFolder(folderId, driveId),
+			removeParents: ((parents as string[]) || []).join(','),
+		},
+	);
+
+	const executionData = this.helpers.constructExecutionMetaData(
+		this.helpers.returnJsonArray(response as IDataObject[]),
+		{ itemData: { item: i } },
+	);
+
+	return executionData;
+}
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
new file mode 100644
index 0000000000000..93a5fe77d3d21
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/share.operation.ts
@@ -0,0 +1,68 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+
+import { googleApiRequest } from '../../transport';
+import { fileRLC, permissionsOptions, shareOptions } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	{
+		...fileRLC,
+		description: 'The file to share',
+	},
+	permissionsOptions,
+	shareOptions,
+];
+
+const displayOptions = {
+	show: {
+		resource: ['file'],
+		operation: ['share'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	const returnData: INodeExecutionData[] = [];
+
+	const fileId = this.getNodeParameter('fileId', i, undefined, {
+		extractValue: true,
+	}) as string;
+
+	const permissions = this.getNodeParameter('permissionsUi', i) as IDataObject;
+
+	const shareOption = this.getNodeParameter('options', i);
+
+	const body: IDataObject = {};
+
+	const qs: IDataObject = {
+		supportsAllDrives: true,
+	};
+
+	if (permissions.permissionsValues) {
+		Object.assign(body, permissions.permissionsValues);
+	}
+
+	Object.assign(qs, shareOption);
+
+	const response = await googleApiRequest.call(
+		this,
+		'POST',
+		`/drive/v3/files/${fileId}/permissions`,
+		body,
+		qs,
+	);
+
+	const executionData = this.helpers.constructExecutionMetaData(
+		this.helpers.returnJsonArray(response as IDataObject[]),
+		{ itemData: { item: i } },
+	);
+	returnData.push(...executionData);
+
+	return returnData;
+}
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
new file mode 100644
index 0000000000000..ec6282e58f6aa
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/update.operation.ts
@@ -0,0 +1,279 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+import { NodeOperationError } from 'n8n-workflow';
+
+import {
+	getItemBinaryData,
+	prepareQueryString,
+	setFileProperties,
+	setUpdateCommonParams,
+} from '../../helpers/utils';
+import { googleApiRequest } from '../../transport';
+import { fileRLC, updateCommonOptions } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	{
+		...fileRLC,
+		displayName: 'File to Update',
+		description: 'The file to update',
+	},
+	{
+		displayName: 'Change File Content',
+		name: 'changeFileContent',
+		type: 'boolean',
+		default: false,
+		description: 'Whether to send a new binary data to update the file',
+	},
+	{
+		displayName: 'Input Data Field Name',
+		name: 'inputDataFieldName',
+		type: 'string',
+		placeholder: 'e.g. data',
+		default: 'data',
+		hint: 'The name of the input field containing the binary file data to update the file',
+		description:
+			'Find the name of input field containing the binary data to update the file in the Input panel on the left, in the Binary tab',
+		displayOptions: {
+			show: {
+				changeFileContent: [true],
+			},
+		},
+	},
+	{
+		displayName: 'New Updated File Name',
+		name: 'newUpdatedFileName',
+		type: 'string',
+		default: '',
+		placeholder: 'e.g. My New File',
+		description: 'If not specified, the file name will not be changed',
+	},
+
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			...updateCommonOptions,
+			{
+				displayName: 'Move to Trash',
+				name: 'trashed',
+				type: 'boolean',
+				default: false,
+				description: 'Whether to move a file to the trash. Only the owner may trash a file.',
+			},
+			{
+				displayName: 'Return Fields',
+				name: 'fields',
+				type: 'multiOptions',
+				options: [
+					{
+						name: '[All]',
+						value: '*',
+						description: 'All fields',
+					},
+					{
+						name: 'explicitlyTrashed',
+						value: 'explicitlyTrashed',
+					},
+					{
+						name: 'exportLinks',
+						value: 'exportLinks',
+					},
+					{
+						name: 'hasThumbnail',
+						value: 'hasThumbnail',
+					},
+					{
+						name: 'iconLink',
+						value: 'iconLink',
+					},
+					{
+						name: 'ID',
+						value: 'id',
+					},
+					{
+						name: 'Kind',
+						value: 'kind',
+					},
+					{
+						name: 'mimeType',
+						value: 'mimeType',
+					},
+					{
+						name: 'Name',
+						value: 'name',
+					},
+					{
+						name: 'Permissions',
+						value: 'permissions',
+					},
+					{
+						name: 'Shared',
+						value: 'shared',
+					},
+					{
+						name: 'Spaces',
+						value: 'spaces',
+					},
+					{
+						name: 'Starred',
+						value: 'starred',
+					},
+					{
+						name: 'thumbnailLink',
+						value: 'thumbnailLink',
+					},
+					{
+						name: 'Trashed',
+						value: 'trashed',
+					},
+					{
+						name: 'Version',
+						value: 'version',
+					},
+					{
+						name: 'webViewLink',
+						value: 'webViewLink',
+					},
+				],
+				default: [],
+				description: 'The fields to return',
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['file'],
+		operation: ['update'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	const fileId = this.getNodeParameter('fileId', i, undefined, {
+		extractValue: true,
+	}) as string;
+
+	const changeFileContent = this.getNodeParameter('changeFileContent', i, false) as boolean;
+
+	let mimeType;
+
+	// update file binary data
+	if (changeFileContent) {
+		const inputDataFieldName = this.getNodeParameter('inputDataFieldName', i) as string;
+
+		const binaryData = await getItemBinaryData.call(this, inputDataFieldName, i);
+
+		const { contentLength, fileContent } = binaryData;
+		mimeType = binaryData.mimeType;
+
+		if (Buffer.isBuffer(fileContent)) {
+			await googleApiRequest.call(
+				this,
+				'PATCH',
+				`/upload/drive/v3/files/${fileId}`,
+				fileContent,
+				{
+					uploadType: 'media',
+					supportsAllDrives: true,
+				},
+				undefined,
+				{
+					headers: {
+						'Content-Type': mimeType,
+						'Content-Length': contentLength,
+					},
+				},
+			);
+		} else {
+			const resumableUpload = await googleApiRequest.call(
+				this,
+				'PATCH',
+				`/upload/drive/v3/files/${fileId}`,
+				undefined,
+				{ uploadType: 'resumable', supportsAllDrives: true },
+				undefined,
+				{
+					returnFullResponse: true,
+				},
+			);
+			const uploadUrl = resumableUpload.headers.location;
+
+			let offset = 0;
+			for await (const chunk of fileContent) {
+				const nextOffset = offset + Number(chunk.length);
+				try {
+					await this.helpers.httpRequest({
+						method: 'PUT',
+						url: uploadUrl,
+						headers: {
+							'Content-Length': chunk.length,
+							'Content-Range': `bytes ${offset}-${nextOffset - 1}/${contentLength}`,
+						},
+						body: chunk,
+					});
+				} catch (error) {
+					if (error.response?.status !== 308) {
+						throw new NodeOperationError(this.getNode(), error as Error, { itemIndex: i });
+					}
+				}
+				offset = nextOffset;
+			}
+		}
+	}
+
+	const options = this.getNodeParameter('options', i, {});
+
+	const qs: IDataObject = setUpdateCommonParams(
+		{
+			supportsAllDrives: true,
+		},
+		options,
+	);
+
+	if (options.fields) {
+		const queryFields = prepareQueryString(options.fields as string[]);
+		qs.fields = queryFields;
+	}
+
+	if (options.trashed) {
+		qs.trashed = options.trashed;
+	}
+
+	const body: IDataObject = setFileProperties({}, options);
+
+	const newUpdatedFileName = this.getNodeParameter('newUpdatedFileName', i, '') as string;
+	if (newUpdatedFileName) {
+		body.name = newUpdatedFileName;
+	}
+
+	if (mimeType) {
+		body.mimeType = mimeType;
+	}
+
+	// update file metadata
+	const responseData = await googleApiRequest.call(
+		this,
+		'PATCH',
+		`/drive/v3/files/${fileId}`,
+		body,
+		qs,
+	);
+
+	const executionData = this.helpers.constructExecutionMetaData(
+		this.helpers.returnJsonArray(responseData as IDataObject[]),
+		{ itemData: { item: i } },
+	);
+
+	return executionData;
+}
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
new file mode 100644
index 0000000000000..6c2dc379c12dc
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/upload.operation.ts
@@ -0,0 +1,194 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+
+import { googleApiRequest } from '../../transport';
+import { driveRLC, folderRLC, updateCommonOptions } from '../common.descriptions';
+import {
+	getItemBinaryData,
+	setFileProperties,
+	setUpdateCommonParams,
+	setParentFolder,
+} from '../../helpers/utils';
+import { updateDisplayOptions } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	{
+		displayName: 'Input Data Field Name',
+		name: 'inputDataFieldName',
+		type: 'string',
+		placeholder: '“e.g. data',
+		default: 'data',
+		required: true,
+		hint: 'The name of the input field containing the binary file data to update the file',
+		description:
+			'Find the name of input field containing the binary data to update the file in the Input panel on the left, in the Binary tab',
+	},
+	{
+		displayName: 'File Name',
+		name: 'name',
+		type: 'string',
+		default: '',
+		placeholder: 'e.g. My New File',
+		description: 'If not specified, the original file name will be used',
+	},
+	{
+		...driveRLC,
+		displayName: 'Parent Drive',
+		description: 'The drive where to upload the file',
+	},
+	{
+		...folderRLC,
+		displayName: 'Parent Folder',
+		description: 'The folder where to upload the file',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			...updateCommonOptions,
+			{
+				displayName: 'Simplify Output',
+				name: 'simplifyOutput',
+				type: 'boolean',
+				default: true,
+				description: 'Whether to return a simplified version of the response instead of all fields',
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['file'],
+		operation: ['upload'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	const returnData: INodeExecutionData[] = [];
+
+	const inputDataFieldName = this.getNodeParameter('inputDataFieldName', i) as string;
+
+	const { contentLength, fileContent, originalFilename, mimeType } = await getItemBinaryData.call(
+		this,
+		inputDataFieldName,
+		i,
+	);
+
+	const name = (this.getNodeParameter('name', i) as string) || originalFilename;
+
+	const driveId = this.getNodeParameter('driveId', i, undefined, {
+		extractValue: true,
+	}) as string;
+
+	const folderId = this.getNodeParameter('folderId', i, undefined, {
+		extractValue: true,
+	}) as string;
+
+	let uploadId;
+	if (Buffer.isBuffer(fileContent)) {
+		const response = await googleApiRequest.call(
+			this,
+			'POST',
+			'/upload/drive/v3/files',
+			fileContent,
+			{
+				uploadType: 'media',
+			},
+			undefined,
+			{
+				headers: {
+					'Content-Type': mimeType,
+					'Content-Length': contentLength,
+				},
+			},
+		);
+
+		uploadId = response.id;
+	} else {
+		const resumableUpload = await googleApiRequest.call(
+			this,
+			'POST',
+			'/upload/drive/v3/files',
+			undefined,
+			{ uploadType: 'resumable' },
+			undefined,
+			{
+				returnFullResponse: true,
+			},
+		);
+
+		const uploadUrl = resumableUpload.headers.location;
+
+		let offset = 0;
+		for await (const chunk of fileContent) {
+			const nextOffset = offset + Number(chunk.length);
+			try {
+				const response = await this.helpers.httpRequest({
+					method: 'PUT',
+					url: uploadUrl,
+					headers: {
+						'Content-Length': chunk.length,
+						'Content-Range': `bytes ${offset}-${nextOffset - 1}/${contentLength}`,
+					},
+					body: chunk,
+				});
+				uploadId = response?.id;
+			} catch (error) {
+				if (error.response?.status !== 308) throw error;
+			}
+			offset = nextOffset;
+		}
+	}
+
+	const options = this.getNodeParameter('options', i, {});
+
+	const qs = setUpdateCommonParams(
+		{
+			addParents: setParentFolder(folderId, driveId),
+			includeItemsFromAllDrives: true,
+			supportsAllDrives: true,
+			spaces: 'appDataFolder, drive',
+			corpora: 'allDrives',
+		},
+		options,
+	);
+
+	if (!options.simplifyOutput) {
+		qs.fields = '*';
+	}
+
+	const body = setFileProperties(
+		{
+			mimeType,
+			name,
+			originalFilename,
+		},
+		options,
+	);
+
+	const response = await googleApiRequest.call(
+		this,
+		'PATCH',
+		`/drive/v3/files/${uploadId}`,
+		body,
+		qs,
+	);
+
+	const executionData = this.helpers.constructExecutionMetaData(
+		this.helpers.returnJsonArray(response as IDataObject[]),
+		{ itemData: { item: i } },
+	);
+	returnData.push(...executionData);
+
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/fileFolder/FileFolder.resource.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/fileFolder/FileFolder.resource.ts
new file mode 100644
index 0000000000000..94b38407622f8
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/fileFolder/FileFolder.resource.ts
@@ -0,0 +1,29 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+import * as search from './search.operation';
+
+export { search };
+
+export const description: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				resource: ['fileFolder'],
+			},
+		},
+		options: [
+			{
+				name: 'Search',
+				value: 'search',
+				description: 'Search or list files and folders',
+				action: 'Search files and folders',
+			},
+		],
+		default: 'search',
+	},
+	...search.description,
+];
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
new file mode 100644
index 0000000000000..d06997a3c141b
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/fileFolder/search.operation.ts
@@ -0,0 +1,363 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+
+import { driveRLC, fileTypesOptions, folderRLC } from '../common.descriptions';
+import { googleApiRequest, googleApiRequestAllItems } from '../../transport';
+import { prepareQueryString, updateDriveScopes } from '../../helpers/utils';
+import type { SearchFilter } from '../../helpers/interfaces';
+import { DRIVE, RLC_FOLDER_DEFAULT } from '../../helpers/interfaces';
+import { updateDisplayOptions } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	{
+		displayName: 'Search Method',
+		name: 'searchMethod',
+		type: 'options',
+		options: [
+			{
+				name: 'Search File/Folder Name',
+				value: 'name',
+			},
+			{
+				name: 'Advanced Search',
+				value: 'query',
+			},
+		],
+		default: 'name',
+		description: 'Whether to search for the file/folder name or use a query string',
+	},
+	{
+		displayName: 'Search Query',
+		name: 'queryString',
+		type: 'string',
+		default: '',
+		displayOptions: {
+			show: {
+				searchMethod: ['name'],
+			},
+		},
+		placeholder: 'e.g. My File / My Folder',
+		description:
+			'The name of the file or folder to search for. Returns also files and folders whose names partially match this search term.',
+	},
+	{
+		displayName: 'Query String',
+		name: 'queryString',
+		type: 'string',
+		default: '',
+		displayOptions: {
+			show: {
+				searchMethod: ['query'],
+			},
+		},
+		placeholder: "e.g. not name contains 'hello'",
+		description:
+			'Use the Google query strings syntax to search for a specific set of files or folders. <a href="https://developers.google.com/drive/api/v3/search-files" target="_blank">Learn more</a>.',
+	},
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		default: false,
+		description: 'Whether to return all results or only up to a given limit',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		default: 50,
+		description: 'Max number of results to return',
+		typeOptions: {
+			minValue: 1,
+		},
+		displayOptions: {
+			show: {
+				returnAll: [false],
+			},
+		},
+	},
+	{
+		displayName: 'Filter',
+		name: 'filter',
+		type: 'collection',
+		placeholder: 'Add Filter',
+		default: {},
+		options: [
+			{
+				...driveRLC,
+				description:
+					'The drive you want to search in. By default, the personal "My Drive" is used.',
+				required: false,
+			},
+			{
+				...folderRLC,
+				description:
+					'The folder you want to search in. By default, the root folder of the drive is used. If you select a folder other than the root folder, only the direct children will be included.',
+				required: false,
+			},
+			{
+				displayName: 'What to Search',
+				name: 'whatToSearch',
+				type: 'options',
+				default: 'all',
+				options: [
+					{
+						name: 'Files and Folders',
+						value: 'all',
+					},
+					{
+						name: 'Files',
+						value: 'files',
+					},
+					{
+						name: 'Folders',
+						value: 'folders',
+					},
+				],
+			},
+			{
+				displayName: 'File Types',
+				name: 'fileTypes',
+				type: 'multiOptions',
+				default: [],
+				description: 'Return only items corresponding to the selected MIME types',
+				options: fileTypesOptions,
+				displayOptions: {
+					show: {
+						whatToSearch: ['all'],
+					},
+				},
+			},
+			{
+				displayName: 'File Types',
+				name: 'fileTypes',
+				type: 'multiOptions',
+				default: [],
+				description: 'Return only items corresponding to the selected MIME types',
+				options: fileTypesOptions.filter((option) => option.name !== 'Folder'),
+				displayOptions: {
+					show: {
+						whatToSearch: ['files'],
+					},
+				},
+			},
+			{
+				displayName: 'Include Trashed Items',
+				name: 'includeTrashed',
+				type: 'boolean',
+				default: false,
+				description: "Whether to return also items in the Drive's bin",
+			},
+		],
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			{
+				displayName: 'Fields',
+				name: 'fields',
+				type: 'multiOptions',
+				options: [
+					{
+						name: '*',
+						value: '*',
+						description: 'All fields',
+					},
+					{
+						name: 'explicitlyTrashed',
+						value: 'explicitlyTrashed',
+					},
+					{
+						name: 'exportLinks',
+						value: 'exportLinks',
+					},
+					{
+						name: 'hasThumbnail',
+						value: 'hasThumbnail',
+					},
+					{
+						name: 'iconLink',
+						value: 'iconLink',
+					},
+					{
+						name: 'ID',
+						value: 'id',
+					},
+					{
+						name: 'Kind',
+						value: 'kind',
+					},
+					{
+						name: 'mimeType',
+						value: 'mimeType',
+					},
+					{
+						name: 'Name',
+						value: 'name',
+					},
+					{
+						name: 'Permissions',
+						value: 'permissions',
+					},
+					{
+						name: 'Shared',
+						value: 'shared',
+					},
+					{
+						name: 'Spaces',
+						value: 'spaces',
+					},
+					{
+						name: 'Starred',
+						value: 'starred',
+					},
+					{
+						name: 'thumbnailLink',
+						value: 'thumbnailLink',
+					},
+					{
+						name: 'Trashed',
+						value: 'trashed',
+					},
+					{
+						name: 'Version',
+						value: 'version',
+					},
+					{
+						name: 'webViewLink',
+						value: 'webViewLink',
+					},
+				],
+				default: [],
+				description: 'The fields to return',
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['fileFolder'],
+		operation: ['search'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	const searchMethod = this.getNodeParameter('searchMethod', i) as string;
+	const options = this.getNodeParameter('options', i, {});
+
+	const query = [];
+
+	const queryString = this.getNodeParameter('queryString', i) as string;
+
+	if (searchMethod === 'name') {
+		query.push(`name contains '${queryString}'`);
+	} else {
+		query.push(queryString);
+	}
+
+	const filter = this.getNodeParameter('filter', i, {}) as SearchFilter;
+
+	let driveId = '';
+	let folderId = '';
+	const returnedTypes: string[] = [];
+
+	if (Object.keys(filter)?.length) {
+		if (filter.folderId) {
+			if (filter.folderId.mode === 'url') {
+				folderId = this.getNodeParameter('filter.folderId', i, undefined, {
+					extractValue: true,
+				}) as string;
+			} else {
+				folderId = filter.folderId.value;
+			}
+		}
+
+		if (folderId && folderId !== RLC_FOLDER_DEFAULT) {
+			query.push(`'${folderId}' in parents`);
+		}
+
+		if (filter.driveId) {
+			let value;
+			if (filter.driveId.mode === 'url') {
+				value = this.getNodeParameter('filter.driveId', i, undefined, {
+					extractValue: true,
+				}) as string;
+			} else {
+				value = filter.driveId.value;
+			}
+			driveId = value;
+		}
+
+		const whatToSearch = filter.whatToSearch || 'all';
+		if (whatToSearch === 'folders') {
+			query.push(`mimeType = '${DRIVE.FOLDER}'`);
+		} else {
+			if (whatToSearch === 'files') {
+				query.push(`mimeType != '${DRIVE.FOLDER}'`);
+			}
+
+			if (filter?.fileTypes?.length && !filter.fileTypes.includes('*')) {
+				filter.fileTypes.forEach((fileType: string) => {
+					returnedTypes.push(`mimeType = '${fileType}'`);
+				});
+			}
+		}
+
+		if (!filter.includeTrashed) {
+			query.push('trashed = false');
+		}
+	}
+
+	if (returnedTypes.length) {
+		query.push(`(${returnedTypes.join(' or ')})`);
+	}
+
+	const queryFields = prepareQueryString(options.fields as string[]);
+
+	const qs: IDataObject = {
+		fields: `nextPageToken, files(${queryFields})`,
+		q: query.filter((q) => q).join(' and '),
+		includeItemsFromAllDrives: true,
+		supportsAllDrives: true,
+		spaces: 'appDataFolder, drive',
+		corpora: 'allDrives',
+	};
+
+	updateDriveScopes(qs, driveId);
+
+	if (!driveId && folderId === RLC_FOLDER_DEFAULT) {
+		qs.corpora = 'user';
+		qs.spaces = 'drive';
+		qs.includeItemsFromAllDrives = false;
+		qs.supportsAllDrives = false;
+	}
+
+	const returnAll = this.getNodeParameter('returnAll', i, false);
+
+	let response;
+	if (returnAll) {
+		response = await googleApiRequestAllItems.call(this, 'GET', 'files', '/drive/v3/files', {}, qs);
+	} else {
+		qs.pageSize = this.getNodeParameter('limit', i);
+		response = await googleApiRequest.call(this, 'GET', '/drive/v3/files', undefined, qs);
+		response = response.files;
+	}
+
+	const executionData = this.helpers.constructExecutionMetaData(
+		this.helpers.returnJsonArray(response as IDataObject[]),
+		{ itemData: { item: i } },
+	);
+
+	return executionData;
+}
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/Folder.resource.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/Folder.resource.ts
new file mode 100644
index 0000000000000..370e7188b027b
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/Folder.resource.ts
@@ -0,0 +1,45 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+import * as create from './create.operation';
+import * as deleteFolder from './deleteFolder.operation';
+import * as share from './share.operation';
+
+export { create, deleteFolder, share };
+
+export const description: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				resource: ['folder'],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a folder',
+				action: 'Create folder',
+			},
+			{
+				name: 'Delete',
+				value: 'deleteFolder',
+				description: 'Permanently delete a folder',
+				action: 'Delete folder',
+			},
+			{
+				name: 'Share',
+				value: 'share',
+				description: 'Add sharing permissions to a folder',
+				action: 'Share folder',
+			},
+		],
+		default: 'create',
+	},
+	...create.description,
+	...deleteFolder.description,
+	...share.description,
+];
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
new file mode 100644
index 0000000000000..643fa592cfff6
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/create.operation.ts
@@ -0,0 +1,113 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+
+import { googleApiRequest } from '../../transport';
+import { driveRLC, folderRLC } from '../common.descriptions';
+import { DRIVE } from '../../helpers/interfaces';
+import { setParentFolder } from '../../helpers/utils';
+import { updateDisplayOptions } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	{
+		displayName: 'Folder Name',
+		name: 'name',
+		type: 'string',
+		default: '',
+		placeholder: 'e.g. New Folder',
+		description: "The name of the new folder. If not set, 'Untitled' will be used.",
+	},
+	{
+		...driveRLC,
+		displayName: 'Parent Drive',
+		description: 'The drive where to create the new folder',
+	},
+	{
+		...folderRLC,
+		displayName: 'Parent Folder',
+		description: 'The parent folder where to create the new folder',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			{
+				displayName: 'Simplify Output',
+				name: 'simplifyOutput',
+				type: 'boolean',
+				default: true,
+				description: 'Whether to return a simplified version of the response instead of all fields',
+			},
+			{
+				displayName: 'Folder Color',
+				name: 'folderColorRgb',
+				type: 'color',
+				default: '',
+				description:
+					'The color of the folder as an RGB hex string. If an unsupported color is specified, the closest color in the palette will be used instead.',
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['folder'],
+		operation: ['create'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	const name = (this.getNodeParameter('name', i) as string) || 'Untitled';
+
+	const driveId = this.getNodeParameter('driveId', i, undefined, {
+		extractValue: true,
+	}) as string;
+
+	const folderId = this.getNodeParameter('folderId', i, undefined, {
+		extractValue: true,
+	}) as string;
+
+	const body: IDataObject = {
+		name,
+		mimeType: DRIVE.FOLDER,
+		parents: [setParentFolder(folderId, driveId)],
+	};
+
+	const folderColorRgb =
+		(this.getNodeParameter('options.folderColorRgb', i, '') as string) || undefined;
+	if (folderColorRgb) {
+		body.folderColorRgb = folderColorRgb;
+	}
+
+	const simplifyOutput = this.getNodeParameter('options.simplifyOutput', i, true) as boolean;
+	let fields;
+	if (!simplifyOutput) {
+		fields = '*';
+	}
+
+	const qs = {
+		fields,
+		includeItemsFromAllDrives: true,
+		supportsAllDrives: true,
+		spaces: 'appDataFolder, drive',
+		corpora: 'allDrives',
+	};
+
+	const response = await googleApiRequest.call(this, 'POST', '/drive/v3/files', body, qs);
+
+	const executionData = this.helpers.constructExecutionMetaData(
+		this.helpers.returnJsonArray(response as IDataObject[]),
+		{ itemData: { item: i } },
+	);
+
+	return executionData;
+}
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
new file mode 100644
index 0000000000000..8f1d8caad4761
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/deleteFolder.operation.ts
@@ -0,0 +1,76 @@
+import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
+
+import { googleApiRequest } from '../../transport';
+import { folderNoRootRLC } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	{
+		...folderNoRootRLC,
+		description: 'The folder to delete',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			{
+				displayName: 'Delete Permanently',
+				name: 'deletePermanently',
+				type: 'boolean',
+				default: false,
+				description:
+					'Whether to delete the folder immediately. If false, the folder will be moved to the trash.',
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['folder'],
+		operation: ['deleteFolder'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	const returnData: INodeExecutionData[] = [];
+
+	const folderId = this.getNodeParameter('folderNoRootId', i, undefined, {
+		extractValue: true,
+	}) as string;
+
+	const deletePermanently = this.getNodeParameter('options.deletePermanently', i, false) as boolean;
+
+	const qs = {
+		supportsAllDrives: true,
+	};
+
+	if (deletePermanently) {
+		await googleApiRequest.call(this, 'DELETE', `/drive/v3/files/${folderId}`, undefined, qs);
+	} else {
+		await googleApiRequest.call(
+			this,
+			'PATCH',
+			`/drive/v3/files/${folderId}`,
+			{ trashed: true },
+			qs,
+		);
+	}
+
+	const executionData = this.helpers.constructExecutionMetaData(
+		this.helpers.returnJsonArray({
+			fileId: folderId,
+			success: true,
+		}),
+		{ itemData: { item: i } },
+	);
+
+	returnData.push(...executionData);
+
+	return returnData;
+}
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
new file mode 100644
index 0000000000000..a3908b2c293ef
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/share.operation.ts
@@ -0,0 +1,68 @@
+import type {
+	IExecuteFunctions,
+	IDataObject,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+
+import { googleApiRequest } from '../../transport';
+import { folderNoRootRLC, permissionsOptions, shareOptions } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	{
+		...folderNoRootRLC,
+		description: 'The folder to share',
+	},
+	permissionsOptions,
+	shareOptions,
+];
+
+const displayOptions = {
+	show: {
+		resource: ['folder'],
+		operation: ['share'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	const returnData: INodeExecutionData[] = [];
+
+	const folderId = this.getNodeParameter('folderNoRootId', i, undefined, {
+		extractValue: true,
+	}) as string;
+
+	const permissions = this.getNodeParameter('permissionsUi', i) as IDataObject;
+
+	const shareOption = this.getNodeParameter('options', i);
+
+	const body: IDataObject = {};
+
+	const qs: IDataObject = {
+		supportsAllDrives: true,
+	};
+
+	if (permissions.permissionsValues) {
+		Object.assign(body, permissions.permissionsValues);
+	}
+
+	Object.assign(qs, shareOption);
+
+	const response = await googleApiRequest.call(
+		this,
+		'POST',
+		`/drive/v3/files/${folderId}/permissions`,
+		body,
+		qs,
+	);
+
+	const executionData = this.helpers.constructExecutionMetaData(
+		this.helpers.returnJsonArray(response as IDataObject[]),
+		{ itemData: { item: i } },
+	);
+	returnData.push(...executionData);
+
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/node.type.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/node.type.ts
new file mode 100644
index 0000000000000..61a7b40834867
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/node.type.ts
@@ -0,0 +1,18 @@
+import type { AllEntities } from 'n8n-workflow';
+
+type NodeMap = {
+	drive: 'create' | 'deleteDrive' | 'get' | 'list' | 'update';
+	file:
+		| 'copy'
+		| 'createFromText'
+		| 'download'
+		| 'deleteFile'
+		| 'move'
+		| 'share'
+		| 'upload'
+		| 'update';
+	folder: 'create' | 'deleteFolder' | 'share';
+	fileFolder: 'search';
+};
+
+export type GoogleDriveType = AllEntities<NodeMap>;
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/router.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/router.ts
new file mode 100644
index 0000000000000..feffd170d9eb0
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/router.ts
@@ -0,0 +1,55 @@
+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';
+
+export async function router(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+	const items = this.getInputData();
+	const returnData: INodeExecutionData[] = [];
+
+	const resource = this.getNodeParameter<GoogleDriveType>('resource', 0);
+	const operation = this.getNodeParameter('operation', 0);
+
+	const googleDrive = {
+		resource,
+		operation,
+	} as GoogleDriveType;
+
+	for (let i = 0; i < items.length; i++) {
+		try {
+			switch (googleDrive.resource) {
+				case 'drive':
+					returnData.push(...(await drive[googleDrive.operation].execute.call(this, i)));
+					break;
+				case 'file':
+					returnData.push(...(await file[googleDrive.operation].execute.call(this, i, items[i])));
+					break;
+				case 'fileFolder':
+					returnData.push(...(await fileFolder[googleDrive.operation].execute.call(this, i)));
+					break;
+				case 'folder':
+					returnData.push(...(await folder[googleDrive.operation].execute.call(this, i)));
+					break;
+				default:
+					throw new NodeOperationError(this.getNode(), `The resource "${resource}" is not known`);
+			}
+		} catch (error) {
+			if (this.continueOnFail()) {
+				if (resource === 'file' && operation === 'download') {
+					items[i].json = { error: error.message };
+				} else {
+					returnData.push({ json: { error: error.message } });
+				}
+				continue;
+			}
+			throw error;
+		}
+	}
+
+	return [returnData];
+}
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/versionDescription.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/versionDescription.ts
new file mode 100644
index 0000000000000..7659ddf551e7a
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/versionDescription.ts
@@ -0,0 +1,90 @@
+/* eslint-disable n8n-nodes-base/node-filename-against-convention */
+import type { INodeTypeDescription } from 'n8n-workflow';
+
+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';
+
+export const versionDescription: INodeTypeDescription = {
+	displayName: 'Google Drive',
+	name: 'googleDrive',
+	icon: 'file:googleDrive.svg',
+	group: ['input'],
+	version: 3,
+	subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+	description: 'Access data on Google Drive',
+	defaults: {
+		name: 'Google Drive',
+	},
+	inputs: ['main'],
+	outputs: ['main'],
+	credentials: [
+		{
+			name: 'googleApi',
+			required: true,
+			displayOptions: {
+				show: {
+					authentication: ['serviceAccount'],
+				},
+			},
+		},
+		{
+			name: 'googleDriveOAuth2Api',
+			required: true,
+			displayOptions: {
+				show: {
+					authentication: ['oAuth2'],
+				},
+			},
+		},
+	],
+	properties: [
+		{
+			displayName: 'Authentication',
+			name: 'authentication',
+			type: 'options',
+			options: [
+				{
+					// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+					name: 'OAuth2 (recommended)',
+					value: 'oAuth2',
+				},
+				{
+					name: 'Service Account',
+					value: 'serviceAccount',
+				},
+			],
+			default: 'oAuth2',
+		},
+		{
+			displayName: 'Resource',
+			name: 'resource',
+			type: 'options',
+			noDataExpression: true,
+			options: [
+				{
+					name: 'File',
+					value: 'file',
+				},
+				{
+					name: 'File/Folder',
+					value: 'fileFolder',
+				},
+				{
+					name: 'Folder',
+					value: 'folder',
+				},
+				{
+					name: 'Shared Drive',
+					value: 'drive',
+				},
+			],
+			default: 'file',
+		},
+		...drive.description,
+		...file.description,
+		...fileFolder.description,
+		...folder.description,
+	],
+};
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/helpers/interfaces.ts b/packages/nodes-base/nodes/Google/Drive/v2/helpers/interfaces.ts
new file mode 100644
index 0000000000000..8da73ac857cb8
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/v2/helpers/interfaces.ts
@@ -0,0 +1,37 @@
+export const UPLOAD_CHUNK_SIZE = 256 * 1024;
+
+export type SearchFilter = {
+	driveId?: {
+		value: string;
+		mode: string;
+	};
+	folderId?: {
+		value: string;
+		mode: string;
+	};
+	whatToSearch?: 'all' | 'files' | 'folders';
+	fileTypes?: string[];
+	includeTrashed?: boolean;
+};
+
+export const RLC_DRIVE_DEFAULT = 'My Drive';
+export const RLC_FOLDER_DEFAULT = 'root';
+
+export const enum DRIVE {
+	FOLDER = 'application/vnd.google-apps.folder',
+	AUDIO = 'application/vnd.google-apps.audio',
+	DOCUMENT = 'application/vnd.google-apps.document',
+	SDK = 'application/vnd.google-apps.drive-sdk',
+	DRAWING = 'application/vnd.google-apps.drawing',
+	FILE = 'application/vnd.google-apps.file',
+	FORM = 'application/vnd.google-apps.form',
+	FUSIONTABLE = 'application/vnd.google-apps.fusiontable',
+	MAP = 'application/vnd.google-apps.map',
+	PHOTO = 'application/vnd.google-apps.photo',
+	PRESENTATION = 'application/vnd.google-apps.presentation',
+	APP_SCRIPTS = 'application/vnd.google-apps.script',
+	SITES = 'application/vnd.google-apps.sites',
+	SPREADSHEET = 'application/vnd.google-apps.spreadsheet',
+	UNKNOWN = 'application/vnd.google-apps.unknown',
+	VIDEO = 'application/vnd.google-apps.video',
+}
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/helpers/utils.ts b/packages/nodes-base/nodes/Google/Drive/v2/helpers/utils.ts
new file mode 100644
index 0000000000000..62f029931de74
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/v2/helpers/utils.ts
@@ -0,0 +1,133 @@
+import type { Readable } from 'stream';
+import type { IDataObject, IExecuteFunctions } from 'n8n-workflow';
+import { BINARY_ENCODING, NodeOperationError } from 'n8n-workflow';
+
+import { RLC_DRIVE_DEFAULT, RLC_FOLDER_DEFAULT, UPLOAD_CHUNK_SIZE } from './interfaces';
+
+export function prepareQueryString(fields: string[] | undefined) {
+	let queryFields = 'id, name';
+	if (fields) {
+		if (fields.includes('*')) {
+			queryFields = '*';
+		} else {
+			queryFields = fields.join(', ');
+		}
+	}
+	return queryFields;
+}
+
+export async function getItemBinaryData(
+	this: IExecuteFunctions,
+	inputDataFieldName: string,
+	i: number,
+	chunkSize = UPLOAD_CHUNK_SIZE,
+) {
+	let contentLength: number;
+	let fileContent: Buffer | Readable;
+	let originalFilename: string | undefined;
+	let mimeType;
+
+	if (!inputDataFieldName) {
+		throw new NodeOperationError(
+			this.getNode(),
+			'The name of the input field containing the binary file data must be set',
+			{
+				itemIndex: i,
+			},
+		);
+	}
+	const binaryData = this.helpers.assertBinaryData(i, inputDataFieldName);
+
+	if (binaryData.id) {
+		// Stream data in 256KB chunks, and upload the via the resumable upload api
+		fileContent = await this.helpers.getBinaryStream(binaryData.id, chunkSize);
+		const metadata = await this.helpers.getBinaryMetadata(binaryData.id);
+		contentLength = metadata.fileSize;
+		originalFilename = metadata.fileName;
+		if (metadata.mimeType) mimeType = binaryData.mimeType;
+	} else {
+		fileContent = Buffer.from(binaryData.data, BINARY_ENCODING);
+		contentLength = fileContent.length;
+		originalFilename = binaryData.fileName;
+		mimeType = binaryData.mimeType;
+	}
+
+	return {
+		contentLength,
+		fileContent,
+		originalFilename,
+		mimeType,
+	};
+}
+
+export function setFileProperties(body: IDataObject, options: IDataObject) {
+	if (options.propertiesUi) {
+		const values = ((options.propertiesUi as IDataObject).propertyValues as IDataObject[]) || [];
+
+		body.properties = values.reduce(
+			(acc, value) => Object.assign(acc, { [`${value.key}`]: value.value }),
+			{} as IDataObject,
+		);
+	}
+
+	if (options.appPropertiesUi) {
+		const values =
+			((options.appPropertiesUi as IDataObject).appPropertyValues as IDataObject[]) || [];
+
+		body.appProperties = values.reduce(
+			(acc, value) => Object.assign(acc, { [`${value.key}`]: value.value }),
+			{} as IDataObject,
+		);
+	}
+
+	return body;
+}
+
+export function setUpdateCommonParams(qs: IDataObject, options: IDataObject) {
+	if (options.keepRevisionForever) {
+		qs.keepRevisionForever = options.keepRevisionForever;
+	}
+
+	if (options.ocrLanguage) {
+		qs.ocrLanguage = options.ocrLanguage;
+	}
+
+	if (options.useContentAsIndexableText) {
+		qs.useContentAsIndexableText = options.useContentAsIndexableText;
+	}
+
+	return qs;
+}
+
+export function updateDriveScopes(
+	qs: IDataObject,
+	driveId: string,
+	defaultDrive = RLC_DRIVE_DEFAULT,
+) {
+	if (driveId) {
+		if (driveId === defaultDrive) {
+			qs.includeItemsFromAllDrives = false;
+			qs.supportsAllDrives = false;
+			qs.spaces = 'appDataFolder, drive';
+			qs.corpora = 'user';
+		} else {
+			qs.driveId = driveId;
+			qs.corpora = 'drive';
+		}
+	}
+}
+
+export function setParentFolder(
+	folderId: string,
+	driveId: string,
+	folderIdDefault = RLC_FOLDER_DEFAULT,
+	driveIdDefault = RLC_DRIVE_DEFAULT,
+) {
+	if (folderId !== folderIdDefault) {
+		return folderId;
+	} else if (driveId && driveId !== driveIdDefault) {
+		return driveId;
+	} else {
+		return 'root';
+	}
+}
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/methods/index.ts b/packages/nodes-base/nodes/Google/Drive/v2/methods/index.ts
new file mode 100644
index 0000000000000..c7fb720e474f5
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/v2/methods/index.ts
@@ -0,0 +1 @@
+export * as listSearch from './listSearch';
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/methods/listSearch.ts b/packages/nodes-base/nodes/Google/Drive/v2/methods/listSearch.ts
new file mode 100644
index 0000000000000..c31502cfcc2fe
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/v2/methods/listSearch.ts
@@ -0,0 +1,198 @@
+import type {
+	IDataObject,
+	ILoadOptionsFunctions,
+	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';
+
+interface FilesItem {
+	id: string;
+	name: string;
+	mimeType: string;
+	webViewLink: string;
+}
+
+interface DriveItem {
+	id: string;
+	name: string;
+}
+
+export async function fileSearch(
+	this: ILoadOptionsFunctions,
+	filter?: string,
+	paginationToken?: string,
+): Promise<INodeListSearchResult> {
+	const query: string[] = ['trashed = false'];
+	if (filter) {
+		query.push(`name contains '${filter.replace("'", "\\'")}'`);
+	}
+	query.push(`mimeType != '${DRIVE.FOLDER}'`);
+	const res = await googleApiRequest.call(this, 'GET', '/drive/v3/files', undefined, {
+		q: query.join(' and '),
+		pageToken: paginationToken,
+		fields: 'nextPageToken,files(id,name,mimeType,webViewLink)',
+		orderBy: 'name_natural',
+		includeItemsFromAllDrives: true,
+		supportsAllDrives: true,
+		spaces: 'appDataFolder, drive',
+		corpora: 'allDrives',
+	});
+	return {
+		results: res.files.map((file: FilesItem) => ({
+			name: file.name,
+			value: file.id,
+			url: file.webViewLink,
+		})),
+		paginationToken: res.nextPageToken,
+	};
+}
+
+export async function driveSearch(
+	this: ILoadOptionsFunctions,
+	filter?: string,
+	paginationToken?: string,
+): Promise<INodeListSearchResult> {
+	let res = { drives: [], nextPageToken: undefined };
+
+	res = await googleApiRequest.call(this, 'GET', '/drive/v3/drives', undefined, {
+		q: filter ? `name contains '${filter.replace("'", "\\'")}'` : undefined,
+		pageToken: paginationToken,
+	});
+
+	const results: INodeListSearchItems[] = [];
+
+	res.drives.forEach((drive: DriveItem) => {
+		results.push({
+			name: drive.name,
+			value: drive.id,
+			url: `https://drive.google.com/drive/folders/${drive.id}`,
+		});
+	});
+
+	return {
+		results,
+		paginationToken: res.nextPageToken,
+	};
+}
+
+export async function driveSearchWithDefault(
+	this: ILoadOptionsFunctions,
+	filter?: string,
+	paginationToken?: string,
+): Promise<INodeListSearchResult> {
+	const drives = await driveSearch.call(this, filter, paginationToken);
+
+	let results: INodeListSearchItems[] = [];
+
+	if (filter && !RLC_DRIVE_DEFAULT.toLowerCase().includes(filter.toLowerCase())) {
+		results = drives.results;
+	} else {
+		results = [
+			{
+				name: RLC_DRIVE_DEFAULT,
+				value: RLC_DRIVE_DEFAULT,
+				url: 'https://drive.google.com/drive/my-drive',
+			},
+			...drives.results,
+		];
+	}
+
+	return {
+		results,
+		paginationToken: drives.paginationToken,
+	};
+}
+
+export async function folderSearch(
+	this: ILoadOptionsFunctions,
+	filter?: string,
+	paginationToken?: string,
+): Promise<INodeListSearchResult> {
+	const query: string[] = [];
+	if (filter) {
+		query.push(`name contains '${filter.replace("'", "\\'")}'`);
+	}
+	query.push(`mimeType = '${DRIVE.FOLDER}'`);
+
+	const qs: IDataObject = {
+		q: query.join(' and '),
+		pageToken: paginationToken,
+		fields: 'nextPageToken,files(id,name,mimeType,webViewLink,parents,driveId)',
+		orderBy: 'name_natural',
+		includeItemsFromAllDrives: true,
+		supportsAllDrives: true,
+		spaces: 'appDataFolder, drive',
+		corpora: 'allDrives',
+	};
+
+	let driveId;
+
+	driveId = this.getNodeParameter('driveId', '') as IDataObject;
+
+	if (!driveId) {
+		const searchFilter = this.getNodeParameter('filter', {}) as SearchFilter;
+		if (searchFilter?.driveId?.mode === 'url') {
+			searchFilter.driveId.value = this.getNodeParameter('filter.folderId', undefined, {
+				extractValue: true,
+			}) as string;
+		}
+		driveId = searchFilter.driveId;
+	}
+	updateDriveScopes(qs, driveId?.value as string);
+
+	const res = await googleApiRequest.call(this, 'GET', '/drive/v3/files', undefined, qs);
+
+	const results: INodeListSearchItems[] = [];
+
+	res.files.forEach((i: FilesItem) => {
+		results.push({
+			name: i.name,
+			value: i.id,
+			url: i.webViewLink,
+		});
+	});
+
+	return {
+		results,
+		paginationToken: res.nextPageToken,
+	};
+}
+
+export async function folderSearchWithDefault(
+	this: ILoadOptionsFunctions,
+	filter?: string,
+	paginationToken?: string,
+): Promise<INodeListSearchResult> {
+	const folders = await folderSearch.call(this, filter, paginationToken);
+
+	let results: INodeListSearchItems[] = [];
+	const rootDefaultDisplayName = '/ (Root folder)';
+
+	if (
+		filter &&
+		!(
+			RLC_FOLDER_DEFAULT.toLowerCase().includes(filter.toLowerCase()) ||
+			rootDefaultDisplayName.toLowerCase().includes(filter.toLowerCase())
+		)
+	) {
+		results = folders.results;
+	} else {
+		results = [
+			{
+				name: rootDefaultDisplayName,
+				value: RLC_FOLDER_DEFAULT,
+				url: 'https://drive.google.com/drive',
+			},
+			...folders.results,
+		];
+	}
+
+	return {
+		results,
+		paginationToken: folders.paginationToken,
+	};
+}
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/transport/index.ts b/packages/nodes-base/nodes/Google/Drive/v2/transport/index.ts
new file mode 100644
index 0000000000000..b0d984f529b38
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/v2/transport/index.ts
@@ -0,0 +1,94 @@
+import type {
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	IPollFunctions,
+	JsonObject,
+	IHttpRequestOptions,
+	IHttpRequestMethods,
+} from 'n8n-workflow';
+import { NodeApiError } from 'n8n-workflow';
+import { getGoogleAccessToken } from '../../../GenericFunctions';
+
+export async function googleApiRequest(
+	this: IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions,
+	method: IHttpRequestMethods,
+	resource: string,
+	body: IDataObject | string | Buffer = {},
+	qs: IDataObject = {},
+	uri?: string,
+	option: IDataObject = {},
+) {
+	const authenticationMethod = this.getNodeParameter(
+		'authentication',
+		0,
+		'serviceAccount',
+	) as string;
+
+	let options: IHttpRequestOptions = {
+		headers: {
+			'Content-Type': 'application/json',
+		},
+		method,
+		body,
+		qs,
+		url: uri || `https://www.googleapis.com${resource}`,
+		json: true,
+	};
+
+	options = Object.assign({}, options, option);
+	try {
+		if (Object.keys(body).length === 0) {
+			delete options.body;
+		}
+
+		if (authenticationMethod === 'serviceAccount') {
+			const credentials = await this.getCredentials('googleApi');
+
+			const { access_token } = await getGoogleAccessToken.call(this, credentials, 'drive');
+
+			options.headers!.Authorization = `Bearer ${access_token}`;
+			return await this.helpers.httpRequest(options);
+		} else {
+			return await this.helpers.httpRequestWithAuthentication.call(
+				this,
+				'googleDriveOAuth2Api',
+				options,
+			);
+		}
+	} catch (error) {
+		if (error instanceof NodeApiError) throw error;
+
+		if (error.code === 'ERR_OSSL_PEM_NO_START_LINE') {
+			error.statusCode = '401';
+		}
+
+		throw new NodeApiError(this.getNode(), error as JsonObject);
+	}
+}
+
+export async function googleApiRequestAllItems(
+	this: IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions,
+	method: IHttpRequestMethods,
+	propertyName: string,
+	endpoint: string,
+	body: IDataObject = {},
+	query: IDataObject = {},
+) {
+	const returnData: IDataObject[] = [];
+
+	let responseData;
+	query.maxResults = query.maxResults || 100;
+	query.pageSize = query.pageSize || 100;
+
+	do {
+		responseData = await googleApiRequest.call(this, method, endpoint, body, query);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
+
+		if (responseData.nextPageToken) {
+			query.pageToken = responseData.nextPageToken as string;
+		}
+	} while (responseData.nextPageToken !== undefined && responseData.nextPageToken !== '');
+
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GenericFunctions.ts
index ae1f5e141bf3c..328fa246feca2 100644
--- a/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GenericFunctions.ts
@@ -1,26 +1,25 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	ILoadOptionsFunctions,
 	IDataObject,
 	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import moment from 'moment-timezone';
 
 export async function googleApiRequest(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
 	qs: IDataObject = {},
 	uri: string | null = null,
 ): Promise<any> {
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			'Content-Type': 'application/json',
 		},
@@ -52,7 +51,7 @@ export async function googleApiRequest(
 export async function googleApiRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: any = {},
@@ -84,7 +83,7 @@ export function jsonToDocument(value: string | number | IDataObject | IDataObjec
 		return { booleanValue: value };
 	} else if (value === null) {
 		return { nullValue: null };
-	} else if (!isNaN(value as number)) {
+	} else if (value !== '' && !isNaN(value as number)) {
 		if (value.toString().indexOf('.') !== -1) {
 			return { doubleValue: value };
 		} else {
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 6e1c2b17e6868..49c76afbb43e1 100644
--- a/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GoogleFirebaseCloudFirestore.node.ts
+++ b/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GoogleFirebaseCloudFirestore.node.ts
@@ -9,6 +9,7 @@ import type {
 } from 'n8n-workflow';
 import { jsonParse } from 'n8n-workflow';
 
+import { generatePairedItemData } from '../../../../utils/utilities';
 import {
 	fullDocumentToJson,
 	googleApiRequest,
@@ -90,6 +91,7 @@ export class GoogleFirebaseCloudFirestore implements INodeType {
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const items = this.getInputData();
+		const itemData = generatePairedItemData(items.length);
 		const returnData: INodeExecutionData[] = [];
 		let responseData;
 		const resource = this.getNodeParameter('resource', 0);
@@ -130,7 +132,7 @@ export class GoogleFirebaseCloudFirestore implements INodeType {
 
 				const executionData = this.helpers.constructExecutionMetaData(
 					this.helpers.returnJsonArray(responseData as IDataObject[]),
-					{ itemData: { item: 0 } },
+					{ itemData },
 				);
 
 				returnData.push(...executionData);
@@ -213,7 +215,7 @@ export class GoogleFirebaseCloudFirestore implements INodeType {
 
 				const executionData = this.helpers.constructExecutionMetaData(
 					this.helpers.returnJsonArray(responseData as IDataObject[]),
-					{ itemData: { item: 0 } },
+					{ itemData },
 				);
 
 				returnData.push(...executionData);
@@ -395,13 +397,13 @@ export class GoogleFirebaseCloudFirestore implements INodeType {
 
 				const executionData = this.helpers.constructExecutionMetaData(
 					this.helpers.returnJsonArray(responseData as IDataObject[]),
-					{ itemData: { item: 0 } },
+					{ itemData },
 				);
 
 				returnData.push(...executionData);
 			}
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Google/Firebase/RealtimeDatabase/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Firebase/RealtimeDatabase/GenericFunctions.ts
index ccf0c189cbef6..fb19c1d4d893c 100644
--- a/packages/nodes-base/nodes/Google/Firebase/RealtimeDatabase/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Firebase/RealtimeDatabase/GenericFunctions.ts
@@ -1,18 +1,17 @@
-import type { OptionsWithUrl } from 'request';
-
 import type {
+	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
-	IDataObject,
+	IRequestOptions,
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function googleApiRequest(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
+	this: IExecuteFunctions | ILoadOptionsFunctions,
 	projectId: string,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -24,7 +23,7 @@ export async function googleApiRequest(
 		'googleFirebaseRealtimeDatabaseOAuth2Api',
 	)) as IDataObject;
 
-	const options: OptionsWithUrl = {
+	const options: IRequestOptions = {
 		headers: {
 			'Content-Type': 'application/json',
 		},
@@ -54,9 +53,9 @@ export async function googleApiRequest(
 }
 
 export async function googleApiRequestAllItems(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
+	this: IExecuteFunctions | ILoadOptionsFunctions,
 	projectId: string,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
diff --git a/packages/nodes-base/nodes/Google/Firebase/RealtimeDatabase/GoogleFirebaseRealtimeDatabase.node.ts b/packages/nodes-base/nodes/Google/Firebase/RealtimeDatabase/GoogleFirebaseRealtimeDatabase.node.ts
index d63d49b6d7e76..9f66450966c8d 100644
--- a/packages/nodes-base/nodes/Google/Firebase/RealtimeDatabase/GoogleFirebaseRealtimeDatabase.node.ts
+++ b/packages/nodes-base/nodes/Google/Firebase/RealtimeDatabase/GoogleFirebaseRealtimeDatabase.node.ts
@@ -7,6 +7,7 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 	JsonObject,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
@@ -180,7 +181,7 @@ export class GoogleFirebaseRealtimeDatabase implements INodeType {
 			try {
 				const projectId = this.getNodeParameter('projectId', i) as string;
 
-				let method = 'GET',
+				let method: IHttpRequestMethods = 'GET',
 					attributes = '';
 				const document: IDataObject = {};
 				if (operation === 'create') {
@@ -249,6 +250,6 @@ export class GoogleFirebaseRealtimeDatabase implements INodeType {
 			returnData.push(...executionData);
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Google/Firebase/RealtimeDatabase/googleFirebaseRealtimeDatabase.svg b/packages/nodes-base/nodes/Google/Firebase/RealtimeDatabase/googleFirebaseRealtimeDatabase.svg
index feec452fc2cd8..9fa5cea4f91c2 100644
--- a/packages/nodes-base/nodes/Google/Firebase/RealtimeDatabase/googleFirebaseRealtimeDatabase.svg
+++ b/packages/nodes-base/nodes/Google/Firebase/RealtimeDatabase/googleFirebaseRealtimeDatabase.svg
@@ -1,36 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="192" height="192">
-  <defs>
-    <clipPath id="a">
-      <path d="M143.41 47.34a4 4 0 0 0-6.77-2.16L115.88 66 99.54 34.89a4 4 0 0 0-7.08 0l-8.93 17-22.4-41.77a4 4 0 0 0-7.48 1.28L32 150l57.9 32.46a12 12 0 0 0 11.7 0L160 150z" fill="none"/>
-    </clipPath>
-    <linearGradient x1="56.9" y1="102.54" x2="48.9" y2="98.36" gradientUnits="userSpaceOnUse" id="b">
-      <stop offset="0" stop-color="#a52714"/>
-      <stop offset=".4" stop-color="#a52714" stop-opacity=".5"/>
-      <stop offset=".8" stop-color="#a52714" stop-opacity="0"/>
-    </linearGradient>
-    <linearGradient x1="90.89" y1="90.91" x2="87.31" y2="87.33" gradientUnits="userSpaceOnUse" id="c">
-      <stop offset="0" stop-color="#a52714" stop-opacity=".8"/>
-      <stop offset=".5" stop-color="#a52714" stop-opacity=".21"/>
-      <stop offset="1" stop-color="#a52714" stop-opacity="0"/>
-    </linearGradient>
-    <linearGradient x1="27.188" y1="40.281" x2="160.875" y2="173.968" gradientUnits="userSpaceOnUse" id="d">
-      <stop offset="0" stop-color="#fff" stop-opacity=".1"/>
-      <stop offset="1" stop-color="#fff" stop-opacity="0"/>
-    </linearGradient>
-  </defs>
-  <g fill="none">
-    <path d="M0 0h192v192H0z"/>
-    <g clip-path="url(#a)">
-      <path d="M32 150L53.66 11.39a4 4 0 0 1 7.48-1.27l22.4 41.78 8.93-17a4 4 0 0 1 7.08 0L160 150z" fill="#ffa000"/>
-      <path d="M106 9L0 0v192l32-42z" fill="url(#b)" opacity=".12"/>
-      <path d="M106.83 96.01l-23.3-44.12L32 150z" fill="#f57c00"/>
-      <path d="M0 0h192v192H0z" fill="url(#c)" opacity=".2"/>
-      <path d="M160 150L143.41 47.34a4 4 0 0 0-6.77-2.16L32 150l57.9 32.47a12 12 0 0 0 11.7 0z" fill="#ffca28"/>
-      <path d="M143.41 47.34a4 4 0 0 0-6.77-2.16L115.88 66 99.54 34.89a4 4 0 0 0-7.08 0l-8.93 17-22.4-41.77a4 4 0 0 0-7.48 1.28L32 150h-.08l.07.08.57.28L115.83 67l20.78-20.8a4 4 0 0 1 6.78 2.16l16.45 101.74.16-.1zM32.19 149.81L53.66 12.39a4 4 0 0 1 7.48-1.28l22.4 41.78 8.93-17a4 4 0 0 1 7.08 0l16 30.43z" fill-opacity=".2" fill="#fff"/>
-      <path d="M101.6 181.49a12 12 0 0 1-11.7 0l-57.76-32.4-.14.91 57.9 32.46a12 12 0 0 0 11.7 0L160 150l-.15-.92z" fill="#a52714" opacity=".2"/>
-      <path d="M143.41 47.34a4 4 0 0 0-6.77-2.16L115.88 66 99.54 34.89a4 4 0 0 0-7.08 0l-8.93 17-22.4-41.77a4 4 0 0 0-7.48 1.28L32 150l57.9 32.46a12 12 0 0 0 11.7 0L160 150z" fill="url(#d)"/>
-    </g>
-    <circle cx="144" cy="144" r="40" fill="#757575"/>
-    <path d="M126 150h36v8.004a3.992 3.992 0 0 1-3.99 3.996h-28.02a3.998 3.998 0 0 1-3.99-3.996zm0-20.016c0-2.2 1.786-3.984 3.99-3.984h28.02c2.204 0 3.99 1.8 3.99 3.984v14.032c0 2.2-1.786 3.984-3.99 3.984h-28.02c-2.204 0-3.99-1.8-3.99-3.984zm4 .016h28v6h-28zm0 11.01c0-.56.428-1.01 1.01-1.01h1.98c.56 0 1.01.428 1.01 1.01v1.98a.994.994 0 0 1-1.01 1.01h-1.98a.994.994 0 0 1-1.01-1.01zm0 14c0-.56.428-1.01 1.01-1.01h1.98c.56 0 1.01.428 1.01 1.01v1.98a.994.994 0 0 1-1.01 1.01h-1.98a.994.994 0 0 1-1.01-1.01z" fill="#fff" fill-rule="evenodd"/>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="192" height="192"><defs><linearGradient id="b" x1="56.9" x2="48.9" y1="102.54" y2="98.36" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#a52714"/><stop offset=".4" stop-color="#a52714" stop-opacity=".5"/><stop offset=".8" stop-color="#a52714" stop-opacity="0"/></linearGradient><linearGradient id="c" x1="90.89" x2="87.31" y1="90.91" y2="87.33" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#a52714" stop-opacity=".8"/><stop offset=".5" stop-color="#a52714" stop-opacity=".21"/><stop offset="1" stop-color="#a52714" stop-opacity="0"/></linearGradient><linearGradient id="d" x1="27.188" x2="160.875" y1="40.281" y2="173.968" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff" stop-opacity=".1"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><clipPath id="a"><path fill="none" d="M143.41 47.34a4 4 0 0 0-6.77-2.16L115.88 66 99.54 34.89a4 4 0 0 0-7.08 0l-8.93 17-22.4-41.77a4 4 0 0 0-7.48 1.28L32 150l57.9 32.46a12 12 0 0 0 11.7 0L160 150z"/></clipPath></defs><g fill="none"><path d="M0 0h192v192H0z"/><g clip-path="url(#a)"><path fill="#ffa000" d="M32 150 53.66 11.39a4 4 0 0 1 7.48-1.27l22.4 41.78 8.93-17a4 4 0 0 1 7.08 0L160 150z"/><path fill="url(#b)" d="M106 9 0 0v192l32-42z" opacity=".12"/><path fill="#f57c00" d="m106.83 96.01-23.3-44.12L32 150z"/><path fill="url(#c)" d="M0 0h192v192H0z" opacity=".2"/><path fill="#ffca28" d="M160 150 143.41 47.34a4 4 0 0 0-6.77-2.16L32 150l57.9 32.47a12 12 0 0 0 11.7 0z"/><path fill="#fff" fill-opacity=".2" d="M143.41 47.34a4 4 0 0 0-6.77-2.16L115.88 66 99.54 34.89a4 4 0 0 0-7.08 0l-8.93 17-22.4-41.77a4 4 0 0 0-7.48 1.28L32 150h-.08l.07.08.57.28L115.83 67l20.78-20.8a4 4 0 0 1 6.78 2.16l16.45 101.74.16-.1zM32.19 149.81 53.66 12.39a4 4 0 0 1 7.48-1.28l22.4 41.78 8.93-17a4 4 0 0 1 7.08 0l16 30.43z"/><path fill="#a52714" d="M101.6 181.49a12 12 0 0 1-11.7 0l-57.76-32.4-.14.91 57.9 32.46a12 12 0 0 0 11.7 0L160 150l-.15-.92z" opacity=".2"/><path fill="url(#d)" d="M143.41 47.34a4 4 0 0 0-6.77-2.16L115.88 66 99.54 34.89a4 4 0 0 0-7.08 0l-8.93 17-22.4-41.77a4 4 0 0 0-7.48 1.28L32 150l57.9 32.46a12 12 0 0 0 11.7 0L160 150z"/></g><circle cx="144" cy="144" r="40" fill="#757575"/><path fill="#fff" fill-rule="evenodd" d="M126 150h36v8.004a3.99 3.99 0 0 1-3.99 3.996h-28.02a4 4 0 0 1-3.99-3.996zm0-20.016c0-2.2 1.786-3.984 3.99-3.984h28.02c2.204 0 3.99 1.8 3.99 3.984v14.032c0 2.2-1.786 3.984-3.99 3.984h-28.02c-2.204 0-3.99-1.8-3.99-3.984zm4 .016h28v6h-28zm0 11.01c0-.56.428-1.01 1.01-1.01h1.98c.56 0 1.01.428 1.01 1.01v1.98a.994.994 0 0 1-1.01 1.01h-1.98a.994.994 0 0 1-1.01-1.01zm0 14c0-.56.428-1.01 1.01-1.01h1.98c.56 0 1.01.428 1.01 1.01v1.98a.994.994 0 0 1-1.01 1.01h-1.98a.994.994 0 0 1-1.01-1.01z"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Google/GSuiteAdmin/GSuiteAdmin.node.ts b/packages/nodes-base/nodes/Google/GSuiteAdmin/GSuiteAdmin.node.ts
index ef209691174b8..f3d63b596a049 100644
--- a/packages/nodes-base/nodes/Google/GSuiteAdmin/GSuiteAdmin.node.ts
+++ b/packages/nodes-base/nodes/Google/GSuiteAdmin/GSuiteAdmin.node.ts
@@ -115,315 +115,344 @@ export class GSuiteAdmin implements INodeType {
 		const resource = this.getNodeParameter('resource', 0);
 		const operation = this.getNodeParameter('operation', 0);
 		for (let i = 0; i < length; i++) {
-			if (resource === 'group') {
-				//https://developers.google.com/admin-sdk/directory/v1/reference/groups/insert
-				if (operation === 'create') {
-					const email = this.getNodeParameter('email', i) as string;
+			try {
+				if (resource === 'group') {
+					//https://developers.google.com/admin-sdk/directory/v1/reference/groups/insert
+					if (operation === 'create') {
+						const email = this.getNodeParameter('email', i) as string;
 
-					const additionalFields = this.getNodeParameter('additionalFields', i);
+						const additionalFields = this.getNodeParameter('additionalFields', i);
 
-					const body: IDataObject = {
-						email,
-					};
+						const body: IDataObject = {
+							email,
+						};
 
-					Object.assign(body, additionalFields);
+						Object.assign(body, additionalFields);
 
-					responseData = await googleApiRequest.call(this, 'POST', '/directory/v1/groups', body);
-				}
-
-				//https://developers.google.com/admin-sdk/directory/v1/reference/groups/delete
-				if (operation === 'delete') {
-					const groupId = this.getNodeParameter('groupId', i) as string;
-
-					responseData = await googleApiRequest.call(
-						this,
-						'DELETE',
-						`/directory/v1/groups/${groupId}`,
-						{},
-					);
-
-					responseData = { success: true };
-				}
-
-				//https://developers.google.com/admin-sdk/directory/v1/reference/groups/get
-				if (operation === 'get') {
-					const groupId = this.getNodeParameter('groupId', i) as string;
-
-					responseData = await googleApiRequest.call(
-						this,
-						'GET',
-						`/directory/v1/groups/${groupId}`,
-						{},
-					);
-				}
-
-				//https://developers.google.com/admin-sdk/directory/v1/reference/groups/list
-				if (operation === 'getAll') {
-					const returnAll = this.getNodeParameter('returnAll', i);
+						responseData = await googleApiRequest.call(this, 'POST', '/directory/v1/groups', body);
+					}
 
-					const options = this.getNodeParameter('options', i);
+					//https://developers.google.com/admin-sdk/directory/v1/reference/groups/delete
+					if (operation === 'delete') {
+						const groupId = this.getNodeParameter('groupId', i) as string;
 
-					Object.assign(qs, options);
+						responseData = await googleApiRequest.call(
+							this,
+							'DELETE',
+							`/directory/v1/groups/${groupId}`,
+							{},
+						);
 
-					if (qs.customer === undefined) {
-						qs.customer = 'my_customer';
+						responseData = { success: true };
 					}
 
-					if (returnAll) {
-						responseData = await googleApiRequestAllItems.call(
+					//https://developers.google.com/admin-sdk/directory/v1/reference/groups/get
+					if (operation === 'get') {
+						const groupId = this.getNodeParameter('groupId', i) as string;
+
+						responseData = await googleApiRequest.call(
 							this,
-							'groups',
 							'GET',
-							'/directory/v1/groups',
+							`/directory/v1/groups/${groupId}`,
 							{},
-							qs,
 						);
-					} else {
-						qs.maxResults = this.getNodeParameter('limit', i);
-
-						responseData = await googleApiRequest.call(this, 'GET', '/directory/v1/groups', {}, qs);
+					}
 
-						responseData = responseData.groups;
+					//https://developers.google.com/admin-sdk/directory/v1/reference/groups/list
+					if (operation === 'getAll') {
+						const returnAll = this.getNodeParameter('returnAll', i);
+
+						const options = this.getNodeParameter('options', i);
+
+						Object.assign(qs, options);
+
+						if (qs.customer === undefined) {
+							qs.customer = 'my_customer';
+						}
+
+						if (returnAll) {
+							responseData = await googleApiRequestAllItems.call(
+								this,
+								'groups',
+								'GET',
+								'/directory/v1/groups',
+								{},
+								qs,
+							);
+						} else {
+							qs.maxResults = this.getNodeParameter('limit', i);
+
+							responseData = await googleApiRequest.call(
+								this,
+								'GET',
+								'/directory/v1/groups',
+								{},
+								qs,
+							);
+
+							responseData = responseData.groups;
+						}
 					}
-				}
 
-				//https://developers.google.com/admin-sdk/directory/v1/reference/groups/update
-				if (operation === 'update') {
-					const groupId = this.getNodeParameter('groupId', i) as string;
+					//https://developers.google.com/admin-sdk/directory/v1/reference/groups/update
+					if (operation === 'update') {
+						const groupId = this.getNodeParameter('groupId', i) as string;
 
-					const updateFields = this.getNodeParameter('updateFields', i);
+						const updateFields = this.getNodeParameter('updateFields', i);
 
-					const body: IDataObject = {};
+						const body: IDataObject = {};
 
-					Object.assign(body, updateFields);
+						Object.assign(body, updateFields);
 
-					responseData = await googleApiRequest.call(
-						this,
-						'PUT',
-						`/directory/v1/groups/${groupId}`,
-						body,
-					);
+						responseData = await googleApiRequest.call(
+							this,
+							'PUT',
+							`/directory/v1/groups/${groupId}`,
+							body,
+						);
+					}
 				}
-			}
 
-			if (resource === 'user') {
-				//https://developers.google.com/admin-sdk/directory/v1/reference/users/insert
-				if (operation === 'create') {
-					const domain = this.getNodeParameter('domain', i) as string;
+				if (resource === 'user') {
+					//https://developers.google.com/admin-sdk/directory/v1/reference/users/insert
+					if (operation === 'create') {
+						const domain = this.getNodeParameter('domain', i) as string;
 
-					const firstName = this.getNodeParameter('firstName', i) as string;
+						const firstName = this.getNodeParameter('firstName', i) as string;
 
-					const lastName = this.getNodeParameter('lastName', i) as string;
+						const lastName = this.getNodeParameter('lastName', i) as string;
 
-					const password = this.getNodeParameter('password', i) as string;
+						const password = this.getNodeParameter('password', i) as string;
 
-					const username = this.getNodeParameter('username', i) as string;
+						const username = this.getNodeParameter('username', i) as string;
 
-					const makeAdmin = this.getNodeParameter('makeAdmin', i) as boolean;
+						const makeAdmin = this.getNodeParameter('makeAdmin', i) as boolean;
 
-					const additionalFields = this.getNodeParameter('additionalFields', i);
+						const additionalFields = this.getNodeParameter('additionalFields', i);
 
-					const body: IDataObject = {
-						name: {
-							familyName: lastName,
-							givenName: firstName,
-						},
-						password,
-						primaryEmail: `${username}@${domain}`,
-					};
+						const body: IDataObject = {
+							name: {
+								familyName: lastName,
+								givenName: firstName,
+							},
+							password,
+							primaryEmail: `${username}@${domain}`,
+						};
 
-					Object.assign(body, additionalFields);
+						Object.assign(body, additionalFields);
 
-					if (additionalFields.phoneUi) {
-						const phones = (additionalFields.phoneUi as IDataObject).phoneValues as IDataObject[];
+						if (additionalFields.phoneUi) {
+							const phones = (additionalFields.phoneUi as IDataObject).phoneValues as IDataObject[];
 
-						body.phones = phones;
-
-						delete body.phoneUi;
-					}
+							body.phones = phones;
 
-					if (additionalFields.emailUi) {
-						const emails = (additionalFields.emailUi as IDataObject).emailValues as IDataObject[];
+							delete body.phoneUi;
+						}
 
-						body.emails = emails;
+						if (additionalFields.emailUi) {
+							const emails = (additionalFields.emailUi as IDataObject).emailValues as IDataObject[];
 
-						delete body.emailUi;
-					}
+							body.emails = emails;
 
-					responseData = await googleApiRequest.call(this, 'POST', '/directory/v1/users', body, qs);
+							delete body.emailUi;
+						}
 
-					if (makeAdmin) {
-						await googleApiRequest.call(
+						responseData = await googleApiRequest.call(
 							this,
 							'POST',
-							`/directory/v1/users/${responseData.id}/makeAdmin`,
-							{ status: true },
+							'/directory/v1/users',
+							body,
+							qs,
 						);
 
-						responseData.isAdmin = true;
-					}
-				}
-
-				//https://developers.google.com/admin-sdk/directory/v1/reference/users/delete
-				if (operation === 'delete') {
-					const userId = this.getNodeParameter('userId', i) as string;
-
-					responseData = await googleApiRequest.call(
-						this,
-						'DELETE',
-						`/directory/v1/users/${userId}`,
-						{},
-					);
-
-					responseData = { success: true };
-				}
-
-				//https://developers.google.com/admin-sdk/directory/v1/reference/users/get
-				if (operation === 'get') {
-					const userId = this.getNodeParameter('userId', i) as string;
-
-					const projection = this.getNodeParameter('projection', i) as string;
-
-					const options = this.getNodeParameter('options', i);
-
-					qs.projection = projection;
+						if (makeAdmin) {
+							await googleApiRequest.call(
+								this,
+								'POST',
+								`/directory/v1/users/${responseData.id}/makeAdmin`,
+								{ status: true },
+							);
 
-					Object.assign(qs, options);
-
-					if (qs.customFieldMask) {
-						qs.customFieldMask = (qs.customFieldMask as string[]).join(' ');
+							responseData.isAdmin = true;
+						}
 					}
 
-					if (qs.projection === 'custom' && qs.customFieldMask === undefined) {
-						throw new NodeOperationError(
-							this.getNode(),
-							'When projection is set to custom, the custom schemas field must be defined',
-							{ itemIndex: i },
-						);
-					}
+					//https://developers.google.com/admin-sdk/directory/v1/reference/users/delete
+					if (operation === 'delete') {
+						const userId = this.getNodeParameter('userId', i) as string;
 
-					responseData = await googleApiRequest.call(
-						this,
-						'GET',
-						`/directory/v1/users/${userId}`,
-						{},
-						qs,
-					);
-				}
+						responseData = await googleApiRequest.call(
+							this,
+							'DELETE',
+							`/directory/v1/users/${userId}`,
+							{},
+						);
 
-				//https://developers.google.com/admin-sdk/directory/v1/reference/users/list
-				if (operation === 'getAll') {
-					const returnAll = this.getNodeParameter('returnAll', i);
+						responseData = { success: true };
+					}
 
-					const projection = this.getNodeParameter('projection', i) as string;
+					//https://developers.google.com/admin-sdk/directory/v1/reference/users/get
+					if (operation === 'get') {
+						const userId = this.getNodeParameter('userId', i) as string;
 
-					const options = this.getNodeParameter('options', i);
+						const projection = this.getNodeParameter('projection', i) as string;
 
-					qs.projection = projection;
+						const options = this.getNodeParameter('options', i);
 
-					Object.assign(qs, options);
+						qs.projection = projection;
 
-					if (qs.customer === undefined) {
-						qs.customer = 'my_customer';
-					}
+						Object.assign(qs, options);
 
-					if (qs.customFieldMask) {
-						qs.customFieldMask = (qs.customFieldMask as string[]).join(' ');
-					}
+						if (qs.customFieldMask) {
+							qs.customFieldMask = (qs.customFieldMask as string[]).join(' ');
+						}
 
-					if (qs.projection === 'custom' && qs.customFieldMask === undefined) {
-						throw new NodeOperationError(
-							this.getNode(),
-							'When projection is set to custom, the custom schemas field must be defined',
-							{ itemIndex: i },
-						);
-					}
+						if (qs.projection === 'custom' && qs.customFieldMask === undefined) {
+							throw new NodeOperationError(
+								this.getNode(),
+								'When projection is set to custom, the custom schemas field must be defined',
+								{ itemIndex: i },
+							);
+						}
 
-					if (returnAll) {
-						responseData = await googleApiRequestAllItems.call(
+						responseData = await googleApiRequest.call(
 							this,
-							'users',
 							'GET',
-							'/directory/v1/users',
+							`/directory/v1/users/${userId}`,
 							{},
 							qs,
 						);
-					} else {
-						qs.maxResults = this.getNodeParameter('limit', i);
-
-						responseData = await googleApiRequest.call(this, 'GET', '/directory/v1/users', {}, qs);
+					}
 
-						responseData = responseData.users;
+					//https://developers.google.com/admin-sdk/directory/v1/reference/users/list
+					if (operation === 'getAll') {
+						const returnAll = this.getNodeParameter('returnAll', i);
+
+						const projection = this.getNodeParameter('projection', i) as string;
+
+						const options = this.getNodeParameter('options', i);
+
+						qs.projection = projection;
+
+						Object.assign(qs, options);
+
+						if (qs.customer === undefined) {
+							qs.customer = 'my_customer';
+						}
+
+						if (qs.customFieldMask) {
+							qs.customFieldMask = (qs.customFieldMask as string[]).join(' ');
+						}
+
+						if (qs.projection === 'custom' && qs.customFieldMask === undefined) {
+							throw new NodeOperationError(
+								this.getNode(),
+								'When projection is set to custom, the custom schemas field must be defined',
+								{ itemIndex: i },
+							);
+						}
+
+						if (returnAll) {
+							responseData = await googleApiRequestAllItems.call(
+								this,
+								'users',
+								'GET',
+								'/directory/v1/users',
+								{},
+								qs,
+							);
+						} else {
+							qs.maxResults = this.getNodeParameter('limit', i);
+
+							responseData = await googleApiRequest.call(
+								this,
+								'GET',
+								'/directory/v1/users',
+								{},
+								qs,
+							);
+
+							responseData = responseData.users;
+						}
 					}
-				}
 
-				//https://developers.google.com/admin-sdk/directory/v1/reference/users/update
-				if (operation === 'update') {
-					const userId = this.getNodeParameter('userId', i) as string;
+					//https://developers.google.com/admin-sdk/directory/v1/reference/users/update
+					if (operation === 'update') {
+						const userId = this.getNodeParameter('userId', i) as string;
 
-					const updateFields = this.getNodeParameter('updateFields', i);
+						const updateFields = this.getNodeParameter('updateFields', i);
 
-					const body: {
-						name: { givenName?: string; familyName?: string };
-						emails?: IDataObject[];
-						phones?: IDataObject[];
-					} = { name: {} };
+						const body: {
+							name: { givenName?: string; familyName?: string };
+							emails?: IDataObject[];
+							phones?: IDataObject[];
+						} = { name: {} };
 
-					Object.assign(body, updateFields);
+						Object.assign(body, updateFields);
 
-					if (updateFields.firstName) {
-						body.name.givenName = updateFields.firstName as string;
-						//@ts-ignore
-						delete body.firstName;
-					}
+						if (updateFields.firstName) {
+							body.name.givenName = updateFields.firstName as string;
+							//@ts-ignore
+							delete body.firstName;
+						}
 
-					if (updateFields.lastName) {
-						body.name.familyName = updateFields.lastName as string;
-						//@ts-ignore
-						delete body.lastName;
-					}
+						if (updateFields.lastName) {
+							body.name.familyName = updateFields.lastName as string;
+							//@ts-ignore
+							delete body.lastName;
+						}
 
-					if (Object.keys(body.name).length === 0) {
-						//@ts-ignore
-						delete body.name;
-					}
+						if (Object.keys(body.name).length === 0) {
+							//@ts-ignore
+							delete body.name;
+						}
 
-					if (updateFields.phoneUi) {
-						const phones = (updateFields.phoneUi as IDataObject).phoneValues as IDataObject[];
+						if (updateFields.phoneUi) {
+							const phones = (updateFields.phoneUi as IDataObject).phoneValues as IDataObject[];
 
-						body.phones = phones;
+							body.phones = phones;
 
-						//@ts-ignore
-						delete body.phoneUi;
-					}
+							//@ts-ignore
+							delete body.phoneUi;
+						}
+
+						if (updateFields.emailUi) {
+							const emails = (updateFields.emailUi as IDataObject).emailValues as IDataObject[];
 
-					if (updateFields.emailUi) {
-						const emails = (updateFields.emailUi as IDataObject).emailValues as IDataObject[];
+							body.emails = emails;
 
-						body.emails = emails;
+							//@ts-ignore
+							delete body.emailUi;
+						}
 
-						//@ts-ignore
-						delete body.emailUi;
+						responseData = await googleApiRequest.call(
+							this,
+							'PUT',
+							`/directory/v1/users/${userId}`,
+							body,
+							qs,
+						);
 					}
+				}
 
-					responseData = await googleApiRequest.call(
-						this,
-						'PUT',
-						`/directory/v1/users/${userId}`,
-						body,
-						qs,
+				const executionData = this.helpers.constructExecutionMetaData(
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
+					{ itemData: { item: i } },
+				);
+
+				returnData.push(...executionData);
+			} 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 this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Google/GSuiteAdmin/GenericFunctions.ts b/packages/nodes-base/nodes/Google/GSuiteAdmin/GenericFunctions.ts
index 848bab2e96935..7f30fe6812e29 100644
--- a/packages/nodes-base/nodes/Google/GSuiteAdmin/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/GSuiteAdmin/GenericFunctions.ts
@@ -1,17 +1,16 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	ILoadOptionsFunctions,
 	IDataObject,
 	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function googleApiRequest(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -19,7 +18,7 @@ export async function googleApiRequest(
 	uri?: string,
 	headers: IDataObject = {},
 ): Promise<any> {
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			'Content-Type': 'application/json',
 		},
@@ -46,7 +45,7 @@ export async function googleApiRequest(
 export async function googleApiRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: any = {},
diff --git a/packages/nodes-base/nodes/Google/GSuiteAdmin/UserDescription.ts b/packages/nodes-base/nodes/Google/GSuiteAdmin/UserDescription.ts
index 499e5b0ce5548..e3685380c9620 100644
--- a/packages/nodes-base/nodes/Google/GSuiteAdmin/UserDescription.ts
+++ b/packages/nodes-base/nodes/Google/GSuiteAdmin/UserDescription.ts
@@ -157,6 +157,7 @@ export const userFields: INodeProperties[] = [
 			{
 				displayName: 'Change Password At Next Login',
 				name: 'changePasswordAtNextLogin',
+
 				type: 'boolean',
 				default: false,
 				description: 'Whether the user is forced to change their password at next login',
@@ -682,6 +683,7 @@ export const userFields: INodeProperties[] = [
 			{
 				displayName: 'Change Password At Next Login',
 				name: 'changePasswordAtNextLogin',
+
 				type: 'boolean',
 				default: false,
 				description: 'Whether the user is forced to change their password at next login',
diff --git a/packages/nodes-base/nodes/Google/GenericFunctions.ts b/packages/nodes-base/nodes/Google/GenericFunctions.ts
new file mode 100644
index 0000000000000..51ab4a0fb9042
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/GenericFunctions.ts
@@ -0,0 +1,107 @@
+import type {
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
+	ICredentialTestFunctions,
+	IDataObject,
+	IPollFunctions,
+	IRequestOptions,
+} from 'n8n-workflow';
+
+import moment from 'moment-timezone';
+import * as jwt from 'jsonwebtoken';
+
+import { formatPrivateKey } from '@utils/utilities';
+
+const googleServiceAccountScopes = {
+	bigquery: ['https://www.googleapis.com/auth/bigquery'],
+	books: ['https://www.googleapis.com/auth/books'],
+	chat: ['https://www.googleapis.com/auth/chat.bot'],
+	docs: [
+		'https://www.googleapis.com/auth/documents',
+		'https://www.googleapis.com/auth/drive',
+		'https://www.googleapis.com/auth/drive.file',
+	],
+	drive: [
+		'https://www.googleapis.com/auth/drive',
+		'https://www.googleapis.com/auth/drive.appdata',
+		'https://www.googleapis.com/auth/drive.photos.readonly',
+	],
+	gmail: [
+		'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',
+	],
+	sheetV1: [
+		'https://www.googleapis.com/auth/drive',
+		'https://www.googleapis.com/auth/drive.file',
+		'https://www.googleapis.com/auth/spreadsheets',
+	],
+	sheetV2: [
+		'https://www.googleapis.com/auth/drive.file',
+		'https://www.googleapis.com/auth/spreadsheets',
+		'https://www.googleapis.com/auth/drive.metadata',
+	],
+	slides: [
+		'https://www.googleapis.com/auth/drive.file',
+		'https://www.googleapis.com/auth/presentations',
+	],
+	translate: [
+		'https://www.googleapis.com/auth/cloud-translation',
+		'https://www.googleapis.com/auth/cloud-platform',
+	],
+};
+
+type GoogleServiceAccount = keyof typeof googleServiceAccountScopes;
+
+export async function getGoogleAccessToken(
+	this: IExecuteFunctions | ILoadOptionsFunctions | ICredentialTestFunctions | IPollFunctions,
+	credentials: IDataObject,
+	service: GoogleServiceAccount,
+): Promise<IDataObject> {
+	//https://developers.google.com/identity/protocols/oauth2/service-account#httprest
+
+	const scopes = googleServiceAccountScopes[service];
+
+	const privateKey = formatPrivateKey(credentials.privateKey as string);
+	credentials.email = ((credentials.email as string) || '').trim();
+
+	const now = moment().unix();
+
+	const signature = jwt.sign(
+		{
+			iss: credentials.email,
+			sub: credentials.delegatedEmail || credentials.email,
+			scope: scopes.join(' '),
+			aud: 'https://oauth2.googleapis.com/token',
+			iat: now,
+			exp: now + 3600,
+		},
+		privateKey,
+		{
+			algorithm: 'RS256',
+			header: {
+				kid: privateKey,
+				typ: 'JWT',
+				alg: 'RS256',
+			},
+		},
+	);
+
+	const options: IRequestOptions = {
+		headers: {
+			'Content-Type': 'application/x-www-form-urlencoded',
+		},
+		method: 'POST',
+		form: {
+			grant_type: 'urn:ietf:params:oauth:grant-type:jwt-bearer',
+			assertion: signature,
+		},
+		uri: 'https://oauth2.googleapis.com/token',
+		json: true,
+	};
+
+	return await this.helpers.request(options);
+}
diff --git a/packages/nodes-base/nodes/Google/Gmail/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Gmail/GenericFunctions.ts
index e1fd977b2d063..8e0bfa58d4c2f 100644
--- a/packages/nodes-base/nodes/Google/Gmail/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Gmail/GenericFunctions.ts
@@ -1,34 +1,29 @@
-import type { OptionsWithUri } from 'request';
-
 import { simpleParser } from 'mailparser';
 
 import type {
 	IBinaryKeyData,
-	ICredentialDataDecryptedObject,
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
 	INode,
 	INodeExecutionData,
 	IPollFunctions,
+	IRequestOptions,
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
-
-import jwt from 'jsonwebtoken';
-
 import { DateTime } from 'luxon';
 
-import isEmpty from 'lodash.isempty';
+import isEmpty from 'lodash/isEmpty';
 
 export interface IEmail {
 	from?: string;
 	to?: string;
 	cc?: string;
 	bcc?: string;
+	replyTo?: string;
 	inReplyTo?: string;
 	reference?: string;
 	subject: string;
@@ -44,73 +39,18 @@ export interface IAttachments {
 }
 
 import MailComposer from 'nodemailer/lib/mail-composer';
-
-async function getAccessToken(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IPollFunctions,
-	credentials: ICredentialDataDecryptedObject,
-): Promise<IDataObject> {
-	//https://developers.google.com/identity/protocols/oauth2/service-account#httprest
-
-	const scopes = [
-		'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',
-	];
-
-	const now = moment().unix();
-
-	credentials.email = (credentials.email as string).trim();
-	const privateKey = (credentials.privateKey as string).replace(/\\n/g, '\n').trim();
-
-	const signature = jwt.sign(
-		{
-			iss: credentials.email,
-			sub: credentials.delegatedEmail || credentials.email,
-			scope: scopes.join(' '),
-			aud: 'https://oauth2.googleapis.com/token',
-			iat: now,
-			exp: now + 3600,
-		},
-		privateKey,
-		{
-			algorithm: 'RS256',
-			header: {
-				kid: privateKey,
-				typ: 'JWT',
-				alg: 'RS256',
-			},
-		},
-	);
-
-	const options: OptionsWithUri = {
-		headers: {
-			'Content-Type': 'application/x-www-form-urlencoded',
-		},
-		method: 'POST',
-		form: {
-			grant_type: 'urn:ietf:params:oauth:grant-type:jwt-bearer',
-			assertion: signature,
-		},
-		uri: 'https://oauth2.googleapis.com/token',
-		json: true,
-	};
-
-	return this.helpers.request(options);
-}
+import { getGoogleAccessToken } from '../GenericFunctions';
 
 export async function googleApiRequest(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IPollFunctions,
-	method: string,
+	this: IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject = {},
 	qs: IDataObject = {},
 	uri?: string,
 	option: IDataObject = {},
 ) {
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		headers: {
 			Accept: 'application/json',
 			'Content-Type': 'application/json',
@@ -139,7 +79,7 @@ export async function googleApiRequest(
 			const credentials = await this.getCredentials('googleApi');
 			credentialType = 'googleApi';
 
-			const { access_token } = await getAccessToken.call(this, credentials);
+			const { access_token } = await getGoogleAccessToken.call(this, credentials, 'gmail');
 
 			(options.headers as IDataObject).Authorization = `Bearer ${access_token}`;
 		}
@@ -282,6 +222,7 @@ export async function encodeEmail(email: IEmail) {
 		to: email.to,
 		cc: email.cc,
 		bcc: email.bcc,
+		replyTo: email.replyTo,
 		inReplyTo: email.inReplyTo,
 		references: email.reference,
 		subject: email.subject,
@@ -324,7 +265,7 @@ export async function encodeEmail(email: IEmail) {
 export async function googleApiRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: any = {},
@@ -407,7 +348,7 @@ export const prepareTimestamp = (
 };
 
 export function prepareQuery(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IPollFunctions,
+	this: IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions,
 	fields: IDataObject,
 	itemIndex: number,
 ) {
@@ -464,7 +405,7 @@ export function prepareQuery(
 }
 
 export function prepareEmailsInput(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
+	this: IExecuteFunctions | ILoadOptionsFunctions,
 	input: string,
 	fieldName: string,
 	itemIndex: number,
@@ -492,21 +433,45 @@ export function prepareEmailsInput(
 }
 
 export function prepareEmailBody(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
+	this: IExecuteFunctions | ILoadOptionsFunctions,
 	itemIndex: number,
+	appendAttribution = false,
+	instanceId?: string,
 ) {
 	const emailType = this.getNodeParameter('emailType', itemIndex) as string;
+	let message = (this.getNodeParameter('message', itemIndex, '') as string).trim();
+
+	if (appendAttribution) {
+		const attributionText = 'This email was sent automatically with ';
+		const link = `https://n8n.io/?utm_source=n8n-internal&utm_medium=powered_by&utm_campaign=${encodeURIComponent(
+			'n8n-nodes-base.gmail',
+		)}${instanceId ? '_' + instanceId : ''}`;
+		if (emailType === 'html') {
+			message = `
+			${message}
+			<br>
+			<br>
+			---
+			<br>
+			<em>${attributionText}<a href="${link}" target="_blank">n8n</a></em>
+			`;
+		} else {
+			message = `${message}\n\n---\n${attributionText}n8n\n${'https://n8n.io'}`;
+		}
+	}
 
-	let body = '';
-	let htmlBody = '';
+	const body = {
+		body: '',
+		htmlBody: '',
+	};
 
 	if (emailType === 'html') {
-		htmlBody = (this.getNodeParameter('message', itemIndex, '') as string).trim();
+		body.htmlBody = message;
 	} else {
-		body = (this.getNodeParameter('message', itemIndex, '') as string).trim();
+		body.body = message;
 	}
 
-	return { body, htmlBody };
+	return body;
 }
 
 export async function prepareEmailAttachments(
@@ -569,7 +534,7 @@ export function unescapeSnippets(items: INodeExecutionData[]) {
 	return result;
 }
 
-export async function replayToEmail(
+export async function replyToEmail(
 	this: IExecuteFunctions,
 	items: INodeExecutionData[],
 	gmailId: string,
@@ -673,7 +638,7 @@ export async function replayToEmail(
 		threadId,
 	};
 
-	return googleApiRequest.call(this, 'POST', '/gmail/v1/users/me/messages/send', body, qs);
+	return await googleApiRequest.call(this, 'POST', '/gmail/v1/users/me/messages/send', body, qs);
 }
 
 export async function simplifyOutput(
diff --git a/packages/nodes-base/nodes/Google/Gmail/Gmail.node.json b/packages/nodes-base/nodes/Google/Gmail/Gmail.node.json
index 73a72d2fb569f..f55b13a1667db 100644
--- a/packages/nodes-base/nodes/Google/Gmail/Gmail.node.json
+++ b/packages/nodes-base/nodes/Google/Gmail/Gmail.node.json
@@ -51,5 +51,6 @@
 				"url": "https://n8n.io/blog/using-automation-to-boost-productivity-in-the-workplace/"
 			}
 		]
-	}
+	},
+	"alias": ["email"]
 }
diff --git a/packages/nodes-base/nodes/Google/Gmail/Gmail.node.ts b/packages/nodes-base/nodes/Google/Gmail/Gmail.node.ts
index 56ed095bf207f..fb6eda498514e 100644
--- a/packages/nodes-base/nodes/Google/Gmail/Gmail.node.ts
+++ b/packages/nodes-base/nodes/Google/Gmail/Gmail.node.ts
@@ -13,12 +13,13 @@ export class Gmail extends VersionedNodeType {
 			group: ['transform'],
 			subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
 			description: 'Consume the Gmail API',
-			defaultVersion: 2,
+			defaultVersion: 2.1,
 		};
 
 		const nodeVersions: IVersionedNodeType['nodeVersions'] = {
 			1: new GmailV1(baseDescription),
 			2: new GmailV2(baseDescription),
+			2.1: new GmailV2(baseDescription),
 		};
 
 		super(nodeVersions, baseDescription);
diff --git a/packages/nodes-base/nodes/Google/Gmail/GmailTrigger.node.ts b/packages/nodes-base/nodes/Google/Gmail/GmailTrigger.node.ts
index 83c89147fce04..ac6855d58a16c 100644
--- a/packages/nodes-base/nodes/Google/Gmail/GmailTrigger.node.ts
+++ b/packages/nodes-base/nodes/Google/Gmail/GmailTrigger.node.ts
@@ -8,6 +8,7 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
+import { DateTime } from 'luxon';
 import {
 	googleApiRequest,
 	googleApiRequestAllItems,
@@ -16,8 +17,6 @@ import {
 	simplifyOutput,
 } from './GenericFunctions';
 
-import { DateTime } from 'luxon';
-
 export class GmailTrigger implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Gmail Trigger',
@@ -185,7 +184,7 @@ export class GmailTrigger implements INodeType {
 						name: 'downloadAttachments',
 						type: 'boolean',
 						default: false,
-						description: "Whether the emaail's attachments will be downloaded",
+						description: "Whether the email's attachments will be downloaded",
 					},
 				],
 			},
@@ -257,8 +256,9 @@ export class GmailTrigger implements INodeType {
 			);
 			responseData = responseData.messages;
 
-			if (responseData === undefined) {
-				responseData = [];
+			if (!responseData?.length) {
+				webhookData.lastTimeChecked = endDate;
+				return null;
 			}
 
 			const simple = this.getNodeParameter('simple') as boolean;
@@ -312,6 +312,11 @@ export class GmailTrigger implements INodeType {
 			);
 		}
 
+		if (!responseData?.length) {
+			webhookData.lastTimeChecked = endDate;
+			return null;
+		}
+
 		const getEmailDateAsSeconds = (email: IDataObject) => {
 			const { internalDate, date } = email;
 			return internalDate
diff --git a/packages/nodes-base/nodes/Google/Gmail/gmail.svg b/packages/nodes-base/nodes/Google/Gmail/gmail.svg
index e9a598fe768e6..a15343672c448 100644
--- a/packages/nodes-base/nodes/Google/Gmail/gmail.svg
+++ b/packages/nodes-base/nodes/Google/Gmail/gmail.svg
@@ -1 +1 @@
-<svg width="256" height="193" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid"><path d="M58.182 192.05V93.14L27.507 65.077 0 49.504v125.091c0 9.658 7.825 17.455 17.455 17.455h40.727z" fill="#4285F4"/><path d="M197.818 192.05h40.727c9.659 0 17.455-7.826 17.455-17.455V49.505l-31.156 17.837-27.026 25.798v98.91z" fill="#34A853"/><path fill="#EA4335" d="M58.182 93.14l-4.174-38.647 4.174-36.989L128 69.868l69.818-52.364 4.67 34.992-4.67 40.644L128 145.504z"/><path d="M197.818 17.504V93.14L256 49.504V26.231c0-21.585-24.64-33.89-41.89-20.945l-16.292 12.218z" fill="#FBBC04"/><path d="M0 49.504l26.759 20.07L58.182 93.14V17.504L41.89 5.286C24.61-7.66 0 4.646 0 26.23v23.273z" fill="#C5221F"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="193" preserveAspectRatio="xMidYMid"><path fill="#4285F4" d="M58.182 192.05V93.14L27.507 65.077 0 49.504v125.091c0 9.658 7.825 17.455 17.455 17.455z"/><path fill="#34A853" d="M197.818 192.05h40.727c9.659 0 17.455-7.826 17.455-17.455V49.505l-31.156 17.837-27.026 25.798z"/><path fill="#EA4335" d="m58.182 93.14-4.174-38.647 4.174-36.989L128 69.868l69.818-52.364 4.67 34.992-4.67 40.644L128 145.504z"/><path fill="#FBBC04" d="M197.818 17.504V93.14L256 49.504V26.231c0-21.585-24.64-33.89-41.89-20.945z"/><path fill="#C5221F" d="m0 49.504 26.759 20.07L58.182 93.14V17.504L41.89 5.286C24.61-7.66 0 4.646 0 26.23z"/></svg>
\ No newline at end of file
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 91813b0273eec..7aaa6d70936c6 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,7 +1,6 @@
 import type { INode } from 'n8n-workflow';
-import { prepareTimestamp } from '../../GenericFunctions';
-
 import { DateTime } from 'luxon';
+import { prepareTimestamp } from '../../GenericFunctions';
 
 const node: INode = {
 	id: '1',
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 a473d64456255..03d40ef2d0b7f 100644
--- a/packages/nodes-base/nodes/Google/Gmail/v1/GmailV1.node.ts
+++ b/packages/nodes-base/nodes/Google/Gmail/v1/GmailV1.node.ts
@@ -3,6 +3,7 @@ import type {
 	IBinaryKeyData,
 	IDataObject,
 	IExecuteFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
 	INodePropertyOptions,
@@ -11,6 +12,7 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
+import isEmpty from 'lodash/isEmpty';
 import type { IEmail } from '../GenericFunctions';
 import {
 	encodeEmail,
@@ -28,7 +30,7 @@ import { labelFields, labelOperations } from './LabelDescription';
 
 import { draftFields, draftOperations } from './DraftDescription';
 
-import isEmpty from 'lodash.isempty';
+import { oldVersionNotice } from '@utils/descriptions';
 
 const versionDescription: INodeTypeDescription = {
 	displayName: 'Gmail',
@@ -64,6 +66,7 @@ const versionDescription: INodeTypeDescription = {
 		},
 	],
 	properties: [
+		oldVersionNotice,
 		{
 			displayName: 'Authentication',
 			name: 'authentication',
@@ -177,7 +180,7 @@ export class GmailV1 implements INodeType {
 		const resource = this.getNodeParameter('resource', 0);
 		const operation = this.getNodeParameter('operation', 0);
 
-		let method = '';
+		let method: IHttpRequestMethods = 'GET';
 		let body: IDataObject = {};
 		let qs: IDataObject = {};
 		let endpoint = '';
@@ -831,6 +834,6 @@ export class GmailV1 implements INodeType {
 				throw error;
 			}
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Google/Gmail/v2/DraftDescription.ts b/packages/nodes-base/nodes/Google/Gmail/v2/DraftDescription.ts
index 25a42d853eb3f..3bd3dd2efa6f4 100644
--- a/packages/nodes-base/nodes/Google/Gmail/v2/DraftDescription.ts
+++ b/packages/nodes-base/nodes/Google/Gmail/v2/DraftDescription.ts
@@ -116,33 +116,6 @@ export const draftFields: INodeProperties[] = [
 		},
 		default: {},
 		options: [
-			{
-				displayName: 'To Email',
-				name: 'sendTo',
-				type: 'string',
-				default: '',
-				placeholder: 'info@example.com',
-				description:
-					'The email addresses of the recipients. Multiple addresses can be separated by a comma. e.g. jay@getsby.com, jon@smith.com.',
-			},
-			{
-				displayName: 'BCC',
-				name: 'bccList',
-				type: 'string',
-				description:
-					'The email addresses of the blind copy recipients. Multiple addresses can be separated by a comma. e.g. jay@getsby.com, jon@smith.com.',
-				placeholder: 'info@example.com',
-				default: '',
-			},
-			{
-				displayName: 'CC',
-				name: 'ccList',
-				type: 'string',
-				description:
-					'The email addresses of the copy recipients. Multiple addresses can be separated by a comma. e.g. jay@getsby.com, jon@smith.com.',
-				placeholder: 'info@example.com',
-				default: '',
-			},
 			{
 				displayName: 'Attachments',
 				name: 'attachmentsUi',
@@ -170,6 +143,60 @@ export const draftFields: INodeProperties[] = [
 				default: {},
 				description: 'Array of supported attachments to add to the message',
 			},
+			{
+				displayName: 'BCC',
+				name: 'bccList',
+				type: 'string',
+				description:
+					'The email addresses of the blind copy recipients. Multiple addresses can be separated by a comma. e.g. jay@getsby.com, jon@smith.com.',
+				placeholder: 'info@example.com',
+				default: '',
+			},
+			{
+				displayName: 'CC',
+				name: 'ccList',
+				type: 'string',
+				description:
+					'The email addresses of the copy recipients. Multiple addresses can be separated by a comma. e.g. jay@getsby.com, jon@smith.com.',
+				placeholder: 'info@example.com',
+				default: '',
+			},
+			{
+				displayName: 'From Alias Name or ID',
+				name: 'fromAlias',
+				type: 'options',
+				default: '',
+				description:
+					'Select the alias to send the email from. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+				typeOptions: {
+					loadOptionsMethod: 'getGmailAliases',
+				},
+			},
+			{
+				displayName: 'Send Replies To',
+				name: 'replyTo',
+				type: 'string',
+				placeholder: 'reply@example.com',
+				default: '',
+				description: 'The email address that the reply message is sent to',
+			},
+			{
+				displayName: 'Thread ID',
+				name: 'threadId',
+				type: 'string',
+				placeholder: '18cc573e2431878f',
+				default: '',
+				description: 'The identifier of the thread to attach the draft',
+			},
+			{
+				displayName: 'To Email',
+				name: 'sendTo',
+				type: 'string',
+				default: '',
+				placeholder: 'info@example.com',
+				description:
+					'The email addresses of the recipients. Multiple addresses can be separated by a comma. e.g. jay@getsby.com, jon@smith.com.',
+			},
 		],
 	},
 	{
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 2d1b0b787a2a5..ab91df91358f8 100644
--- a/packages/nodes-base/nodes/Google/Gmail/v2/GmailV2.node.ts
+++ b/packages/nodes-base/nodes/Google/Gmail/v2/GmailV2.node.ts
@@ -21,7 +21,7 @@ import {
 	prepareEmailBody,
 	prepareEmailsInput,
 	prepareQuery,
-	replayToEmail,
+	replyToEmail,
 	simplifyOutput,
 	unescapeSnippets,
 } from '../GenericFunctions';
@@ -39,7 +39,7 @@ const versionDescription: INodeTypeDescription = {
 	name: 'gmail',
 	icon: 'file:gmail.svg',
 	group: ['transform'],
-	version: 2,
+	version: [2, 2.1],
 	subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
 	description: 'Consume the Gmail API',
 	defaults: {
@@ -197,6 +197,27 @@ export class GmailV2 implements INodeType {
 
 				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;
+			},
 		},
 	};
 
@@ -205,6 +226,8 @@ export class GmailV2 implements INodeType {
 		const returnData: INodeExecutionData[] = [];
 		const resource = this.getNodeParameter('resource', 0);
 		const operation = this.getNodeParameter('operation', 0);
+		const nodeVersion = this.getNode().typeVersion;
+		const instanceId = this.getInstanceId();
 
 		let responseData;
 
@@ -282,6 +305,7 @@ export class GmailV2 implements INodeType {
 						const to = prepareEmailsInput.call(this, sendTo, 'To', i);
 						let cc = '';
 						let bcc = '';
+						let replyTo = '';
 
 						if (options.ccList) {
 							cc = prepareEmailsInput.call(this, options.ccList as string, 'CC', i);
@@ -291,6 +315,10 @@ export class GmailV2 implements INodeType {
 							bcc = prepareEmailsInput.call(this, options.bccList as string, 'BCC', i);
 						}
 
+						if (options.replyTo) {
+							replyTo = prepareEmailsInput.call(this, options.replyTo as string, 'ReplyTo', i);
+						}
+
 						let attachments: IDataObject[] = [];
 
 						if (options.attachmentsUi) {
@@ -318,13 +346,19 @@ export class GmailV2 implements INodeType {
 							from = `${options.senderName as string} <${emailAddress}>`;
 						}
 
+						let appendAttribution = options.appendAttribution;
+						if (appendAttribution === undefined) {
+							appendAttribution = nodeVersion >= 2.1;
+						}
+
 						const email: IEmail = {
 							from,
 							to,
 							cc,
 							bcc,
+							replyTo,
 							subject: this.getNodeParameter('subject', i) as string,
-							...prepareEmailBody.call(this, i),
+							...prepareEmailBody.call(this, i, appendAttribution as boolean, instanceId),
 							attachments,
 						};
 
@@ -340,7 +374,7 @@ export class GmailV2 implements INodeType {
 						const messageIdGmail = this.getNodeParameter('messageId', i) as string;
 						const options = this.getNodeParameter('options', i);
 
-						responseData = await replayToEmail.call(this, items, messageIdGmail, options, i);
+						responseData = await replyToEmail.call(this, items, messageIdGmail, options, i);
 					}
 					if (operation === 'get') {
 						//https://developers.google.com/gmail/api/v1/reference/users/messages/get
@@ -514,6 +548,9 @@ export class GmailV2 implements INodeType {
 						let to = '';
 						let cc = '';
 						let bcc = '';
+						let replyTo = '';
+						let fromAlias = '';
+						let threadId = null;
 
 						if (options.sendTo) {
 							to += prepareEmailsInput.call(this, options.sendTo as string, 'To', i);
@@ -527,6 +564,18 @@ export class GmailV2 implements INodeType {
 							bcc = prepareEmailsInput.call(this, options.bccList as string, 'BCC', i);
 						}
 
+						if (options.replyTo) {
+							replyTo = prepareEmailsInput.call(this, options.replyTo as string, 'ReplyTo', i);
+						}
+
+						if (options.fromAlias) {
+							fromAlias = options.fromAlias as string;
+						}
+
+						if (options.threadId && typeof options.threadId === 'string') {
+							threadId = options.threadId;
+						}
+
 						let attachments: IDataObject[] = [];
 						if (options.attachmentsUi) {
 							attachments = await prepareEmailAttachments.call(
@@ -544,9 +593,11 @@ export class GmailV2 implements INodeType {
 						}
 
 						const email: IEmail = {
+							from: fromAlias,
 							to,
 							cc,
 							bcc,
+							replyTo,
 							subject: this.getNodeParameter('subject', i) as string,
 							...prepareEmailBody.call(this, i),
 							attachments,
@@ -555,6 +606,7 @@ export class GmailV2 implements INodeType {
 						const body = {
 							message: {
 								raw: await encodeEmail(email),
+								threadId: threadId || undefined,
 							},
 						};
 
@@ -741,7 +793,7 @@ export class GmailV2 implements INodeType {
 						const messageIdGmail = this.getNodeParameter('messageId', i) as string;
 						const options = this.getNodeParameter('options', i);
 
-						responseData = await replayToEmail.call(this, items, messageIdGmail, options, i);
+						responseData = await replyToEmail.call(this, items, messageIdGmail, options, i);
 					}
 					if (operation === 'trash') {
 						//https://developers.google.com/gmail/api/reference/rest/v1/users.threads/trash
@@ -807,8 +859,8 @@ export class GmailV2 implements INodeType {
 			['draft', 'message', 'thread'].includes(resource) &&
 			['get', 'getAll'].includes(operation)
 		) {
-			return this.prepareOutputData(unescapeSnippets(returnData));
+			return [unescapeSnippets(returnData)];
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Google/Gmail/v2/MessageDescription.ts b/packages/nodes-base/nodes/Google/Gmail/v2/MessageDescription.ts
index d824d66ace801..0f0875fd49d51 100644
--- a/packages/nodes-base/nodes/Google/Gmail/v2/MessageDescription.ts
+++ b/packages/nodes-base/nodes/Google/Gmail/v2/MessageDescription.ts
@@ -125,7 +125,7 @@ export const messageFields: INodeProperties[] = [
 		displayName: 'Email Type',
 		name: 'emailType',
 		type: 'options',
-		default: 'text',
+		default: 'html',
 		required: true,
 		noDataExpression: true,
 		options: [
@@ -143,6 +143,34 @@ export const messageFields: INodeProperties[] = [
 				resource: ['message'],
 				operation: ['send', 'reply'],
 			},
+			hide: {
+				'@version': [2],
+			},
+		},
+	},
+	{
+		displayName: 'Email Type',
+		name: 'emailType',
+		type: 'options',
+		default: 'html',
+		required: true,
+		noDataExpression: true,
+		options: [
+			{
+				name: 'Text',
+				value: 'text',
+			},
+			{
+				name: 'HTML',
+				value: 'html',
+			},
+		],
+		displayOptions: {
+			show: {
+				resource: ['message'],
+				operation: ['send', 'reply'],
+				'@version': [2],
+			},
 		},
 	},
 	{
@@ -171,6 +199,15 @@ export const messageFields: INodeProperties[] = [
 		},
 		default: {},
 		options: [
+			{
+				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+				displayName: 'Append n8n Attribution',
+				name: 'appendAttribution',
+				type: 'boolean',
+				default: true,
+				description:
+					'Whether to include the phrase “This email was sent automatically with n8n” to the end of the email',
+			},
 			{
 				displayName: 'Attachments',
 				name: 'attachmentsUi',
@@ -225,6 +262,19 @@ export const messageFields: INodeProperties[] = [
 				default: '',
 				description: "The name that will be shown in recipients' inboxes",
 			},
+			{
+				displayName: 'Send Replies To',
+				name: 'replyTo',
+				type: 'string',
+				placeholder: 'reply@example.com',
+				default: '',
+				description: 'The email address that the reply message is sent to',
+				displayOptions: {
+					hide: {
+						'/operation': ['reply'],
+					},
+				},
+			},
 			{
 				displayName: 'Reply to Sender Only',
 				name: 'replyToSenderOnly',
diff --git a/packages/nodes-base/nodes/Google/Perspective/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Perspective/GenericFunctions.ts
index 9363d4392b537..fdc1b043f598f 100644
--- a/packages/nodes-base/nodes/Google/Perspective/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Perspective/GenericFunctions.ts
@@ -1,6 +1,4 @@
-import type { OptionsWithUri } from 'request';
-
-import type { IExecuteFunctions, IDataObject, JsonObject } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, JsonObject, IRequestOptions } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function googleApiRequest(
@@ -9,7 +7,7 @@ export async function googleApiRequest(
 	endpoint: string,
 	body: IDataObject = {},
 ) {
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			Accept: 'application/json',
 			'Content-Type': 'application/json',
diff --git a/packages/nodes-base/nodes/Google/Perspective/GooglePerspective.node.ts b/packages/nodes-base/nodes/Google/Perspective/GooglePerspective.node.ts
index 1b0c9411991a5..74de6a53ee7b4 100644
--- a/packages/nodes-base/nodes/Google/Perspective/GooglePerspective.node.ts
+++ b/packages/nodes-base/nodes/Google/Perspective/GooglePerspective.node.ts
@@ -9,6 +9,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
+import ISO6391 from 'iso-639-1';
 import type {
 	AttributesValuesUi,
 	CommentAnalyzeBody,
@@ -18,8 +19,6 @@ import type {
 
 import { googleApiRequest } from './GenericFunctions';
 
-import ISO6391 from 'iso-639-1';
-
 export class GooglePerspective implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Google Perspective',
@@ -282,6 +281,6 @@ export class GooglePerspective implements INodeType {
 			returnData.push(...executionData);
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Google/Perspective/perspective.svg b/packages/nodes-base/nodes/Google/Perspective/perspective.svg
index 2cfbaf8a3db9e..428a6647bc8b3 100644
--- a/packages/nodes-base/nodes/Google/Perspective/perspective.svg
+++ b/packages/nodes-base/nodes/Google/Perspective/perspective.svg
@@ -1,30 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   viewBox="6 10 125 125"
-   version="1.1"
-   id="svg4"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs8">
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath937">
-      <rect
-         style="fill:#0000ff;fill-rule:evenodd"
-         id="rect939"
-         width="123.4947"
-         height="119.02773"
-         x="12.25"
-         y="12.482271" />
-    </clipPath>
-  </defs>
-  <g
-     id="g532"
-     clip-path="url(#clipPath937)">
-    <path
-       d="M131.53 72a59.79 59.79 0 0 1-53.81 59.49v-119A59.79 59.79 0 0 1 131.53 72zM12.25 78v53.51h53.52A59.81 59.81 0 0 0 12.25 78zm0-12h53.52V12.51A59.81 59.81 0 0 0 12.25 66zm176.83-37.06H223c21.77 0 35.8 11.32 35.8 29.65s-14 29.64-35.8 29.64h-15.22v26.82h-18.7zm33.34 44c11.81 0 17.34-4.55 17.34-14.39s-5.53-14.4-17.34-14.4h-14.64V73zm37.14 11.72v-.61c0-19.93 12.91-33 32-33 18 0 31 12.67 31 33.46v4.18h-44.9c1 9.72 6 14.27 14.14 14.27 5.91 0 10.09-2.58 11.94-7h18.2c-2.7 12.42-14.64 21-30.26 21-19.82.04-32.12-11.96-32.12-32.3zm18.57-7.87h26.2c-1.72-8.12-6.27-12.18-12.91-12.18s-11.69 3.94-13.29 12.18zm54.73-23.74h17.59v9.47C354.26 55.88 361 52.31 370 52.31h3.56v17h-15.5c-4.67 0-7.13 2.46-7.13 7v38.75h-18.07zM378.12 96H395c.62 4.92 4.55 7.5 13.29 7.5 7.38 0 10.94-2.33 10.94-5.65 0-2.71-1.72-3.94-6.15-4.8l-14.79-2.85c-13.65-2.46-19.06-8.12-19.06-18.08 0-12.3 10-21 27.92-21 16.73 0 28.17 8.37 29 20.54h-16.82c-.74-4.42-4.8-7-12.3-7-7 0-10.46 2.22-10.46 5.54 0 2.58 1.72 3.81 6 4.67l14.88 2.83c13.53 2.46 18.94 8.12 18.94 18.21 0 12.91-10.45 21.15-28.29 21.15-18.79-.06-29.37-8.78-29.98-21.06zm68.13-42.95h17.59v9.84c3.7-7.38 10.71-11.56 19.56-11.56 14.89 0 26.33 11.68 26.33 32v.62c0 20.17-12.06 32.84-26.94 32.84-8.12 0-14.76-3.32-18.45-9.47v30.63h-18.09zM491 84.42v-1.6c0-11.32-4.92-17.35-13.16-17.35-8.61 0-13.53 5.91-13.53 17.23v2.7c0 12.18 5 17.22 13.16 17.22 7.9 0 13.53-6.62 13.53-18.2zm26.1.24v-.61c0-19.93 12.92-33 32-33 18 0 31 12.67 31 33.46v4.18h-44.9c1 9.72 6 14.27 14.15 14.27 5.9 0 10.08-2.58 11.93-7h18.2c-2.7 12.42-14.63 21-30.25 21-19.83.04-32.13-11.96-32.13-32.3zm18.57-7.87h26.21c-1.73-8.12-6.28-12.18-12.92-12.18s-11.69 3.94-13.29 12.18zm51.53 7.75v-.74c0-19.31 13.16-32.72 31.37-32.72 16.24 0 27.8 9.35 29.4 24.6h-17.71c-.74-6.64-5.42-10.45-11.44-10.45-7.88 0-13 6.52-13 18.2v1.48c0 11.81 5.16 18 12.79 18 6.52 0 10.95-4.06 11.81-11.2h17.71c-1.6 15.75-13 25.34-29.77 25.34C600 117 587.2 104.34 587.2 84.54zm76.01 9.35V67.32h-10.7V53.05h10.7v-18h18v18h18.21v14.27h-18.25v30.75c0 1.72.74 2.46 2.46 2.46h15.75v14.52H685.6c-14.52 0-22.39-7.51-22.39-21.16zm46-58.31a10.09 10.09 0 0 1 20.17 0 10.09 10.09 0 1 1-20.17 0zm1 17.47h18.08v62h-18.1zm25.19 0H754l14.39 45.27 14.27-45.27h17.71l-20.91 62h-23.15zm68.88 31.61v-.61c0-19.93 12.92-33 32-33 18 0 31 12.67 31 33.46v4.18h-44.9c1 9.72 6 14.27 14.15 14.27 5.9 0 10.09-2.58 11.93-7h18.21c-2.71 12.42-14.64 21-30.26 21-19.83.04-32.13-11.96-32.13-32.3zm18.57-7.87h26.21c-1.73-8.12-6.28-12.18-12.92-12.18s-11.69 3.94-13.29 12.18z"
-       fill="#451735"
-       id="path2" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="6 10 125 125"><defs><clipPath id="a" clipPathUnits="userSpaceOnUse"><path d="M12.25 12.482h123.495V131.51H12.25z" style="fill:#00f;fill-rule:evenodd"/></clipPath></defs><g clip-path="url(#a)"><path fill="#451735" d="M131.53 72a59.79 59.79 0 0 1-53.81 59.49v-119A59.79 59.79 0 0 1 131.53 72M12.25 78v53.51h53.52A59.81 59.81 0 0 0 12.25 78m0-12h53.52V12.51A59.81 59.81 0 0 0 12.25 66m176.83-37.06H223c21.77 0 35.8 11.32 35.8 29.65s-14 29.64-35.8 29.64h-15.22v26.82h-18.7zm33.34 44c11.81 0 17.34-4.55 17.34-14.39s-5.53-14.4-17.34-14.4h-14.64V73zm37.14 11.72v-.61c0-19.93 12.91-33 32-33 18 0 31 12.67 31 33.46v4.18h-44.9c1 9.72 6 14.27 14.14 14.27 5.91 0 10.09-2.58 11.94-7h18.2c-2.7 12.42-14.64 21-30.26 21-19.82.04-32.12-11.96-32.12-32.3m18.57-7.87h26.2c-1.72-8.12-6.27-12.18-12.91-12.18s-11.69 3.94-13.29 12.18m54.73-23.74h17.59v9.47C354.26 55.88 361 52.31 370 52.31h3.56v17h-15.5c-4.67 0-7.13 2.46-7.13 7v38.75h-18.07zM378.12 96H395c.62 4.92 4.55 7.5 13.29 7.5 7.38 0 10.94-2.33 10.94-5.65 0-2.71-1.72-3.94-6.15-4.8l-14.79-2.85c-13.65-2.46-19.06-8.12-19.06-18.08 0-12.3 10-21 27.92-21 16.73 0 28.17 8.37 29 20.54h-16.82c-.74-4.42-4.8-7-12.3-7-7 0-10.46 2.22-10.46 5.54 0 2.58 1.72 3.81 6 4.67l14.88 2.83c13.53 2.46 18.94 8.12 18.94 18.21 0 12.91-10.45 21.15-28.29 21.15-18.79-.06-29.37-8.78-29.98-21.06m68.13-42.95h17.59v9.84c3.7-7.38 10.71-11.56 19.56-11.56 14.89 0 26.33 11.68 26.33 32v.62c0 20.17-12.06 32.84-26.94 32.84-8.12 0-14.76-3.32-18.45-9.47v30.63h-18.09zM491 84.42v-1.6c0-11.32-4.92-17.35-13.16-17.35-8.61 0-13.53 5.91-13.53 17.23v2.7c0 12.18 5 17.22 13.16 17.22 7.9 0 13.53-6.62 13.53-18.2m26.1.24v-.61c0-19.93 12.92-33 32-33 18 0 31 12.67 31 33.46v4.18h-44.9c1 9.72 6 14.27 14.15 14.27 5.9 0 10.08-2.58 11.93-7h18.2c-2.7 12.42-14.63 21-30.25 21-19.83.04-32.13-11.96-32.13-32.3m18.57-7.87h26.21c-1.73-8.12-6.28-12.18-12.92-12.18s-11.69 3.94-13.29 12.18m51.53 7.75v-.74c0-19.31 13.16-32.72 31.37-32.72 16.24 0 27.8 9.35 29.4 24.6h-17.71c-.74-6.64-5.42-10.45-11.44-10.45-7.88 0-13 6.52-13 18.2v1.48c0 11.81 5.16 18 12.79 18 6.52 0 10.95-4.06 11.81-11.2h17.71c-1.6 15.75-13 25.34-29.77 25.34C600 117 587.2 104.34 587.2 84.54m76.01 9.35V67.32h-10.7V53.05h10.7v-18h18v18h18.21v14.27h-18.25v30.75c0 1.72.74 2.46 2.46 2.46h15.75v14.52H685.6c-14.52 0-22.39-7.51-22.39-21.16m46-58.31a10.09 10.09 0 0 1 20.17 0 10.09 10.09 0 1 1-20.17 0m1 17.47h18.08v62h-18.1zm25.19 0H754l14.39 45.27 14.27-45.27h17.71l-20.91 62h-23.15zm68.88 31.61v-.61c0-19.93 12.92-33 32-33 18 0 31 12.67 31 33.46v4.18h-44.9c1 9.72 6 14.27 14.15 14.27 5.9 0 10.09-2.58 11.93-7h18.21c-2.71 12.42-14.64 21-30.26 21-19.83.04-32.13-11.96-32.13-32.3m18.57-7.87h26.21c-1.73-8.12-6.28-12.18-12.92-12.18s-11.69 3.94-13.29 12.18"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Google/Perspective/types.d.ts b/packages/nodes-base/nodes/Google/Perspective/types.ts
similarity index 100%
rename from packages/nodes-base/nodes/Google/Perspective/types.d.ts
rename to packages/nodes-base/nodes/Google/Perspective/types.ts
diff --git a/packages/nodes-base/nodes/Google/Sheet/GoogleSheets.node.json b/packages/nodes-base/nodes/Google/Sheet/GoogleSheets.node.json
index 1f61a2a1a33bd..4384816b67e01 100644
--- a/packages/nodes-base/nodes/Google/Sheet/GoogleSheets.node.json
+++ b/packages/nodes-base/nodes/Google/Sheet/GoogleSheets.node.json
@@ -91,5 +91,5 @@
 			}
 		]
 	},
-	"alias": ["CSV", "Spreadsheet", "GS"]
+	"alias": ["CSV", "Sheet", "Spreadsheet", "GS"]
 }
diff --git a/packages/nodes-base/nodes/Google/Sheet/GoogleSheets.node.ts b/packages/nodes-base/nodes/Google/Sheet/GoogleSheets.node.ts
index 2ee3f429b9892..c29ae24cf8bfc 100644
--- a/packages/nodes-base/nodes/Google/Sheet/GoogleSheets.node.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/GoogleSheets.node.ts
@@ -7,11 +7,11 @@ import { GoogleSheetsV2 } from './v2/GoogleSheetsV2.node';
 export class GoogleSheets extends VersionedNodeType {
 	constructor() {
 		const baseDescription: INodeTypeBaseDescription = {
-			displayName: 'Google Sheets ',
+			displayName: 'Google Sheets',
 			name: 'googleSheets',
 			icon: 'file:googleSheets.svg',
 			group: ['input', 'output'],
-			defaultVersion: 3,
+			defaultVersion: 4.3,
 			subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
 			description: 'Read, update and write data to Google Sheets',
 		};
@@ -20,6 +20,10 @@ export class GoogleSheets extends VersionedNodeType {
 			1: new GoogleSheetsV1(baseDescription),
 			2: new GoogleSheetsV1(baseDescription),
 			3: new GoogleSheetsV2(baseDescription),
+			4: new GoogleSheetsV2(baseDescription),
+			4.1: new GoogleSheetsV2(baseDescription),
+			4.2: new GoogleSheetsV2(baseDescription),
+			4.3: new GoogleSheetsV2(baseDescription),
 		};
 
 		super(nodeVersions, baseDescription);
diff --git a/packages/nodes-base/nodes/Google/Sheet/GoogleSheetsTrigger.node.ts b/packages/nodes-base/nodes/Google/Sheet/GoogleSheetsTrigger.node.ts
index 514c12d95270c..da4dd338aac31 100644
--- a/packages/nodes-base/nodes/Google/Sheet/GoogleSheetsTrigger.node.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/GoogleSheetsTrigger.node.ts
@@ -7,11 +7,12 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
+import { GOOGLE_DRIVE_FILE_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 { ValueRenderOption } from './v2/helpers/GoogleSheets.types';
+import type { ResourceLocator, ValueRenderOption } from './v2/helpers/GoogleSheets.types';
 
 import {
 	arrayOfArraysToJson,
@@ -84,15 +85,13 @@ export class GoogleSheetsTrigger implements INodeType {
 						type: 'string',
 						extractValue: {
 							type: 'regex',
-							regex:
-								'https:\\/\\/(?:drive|docs)\\.google\\.com\\/\\w+\\/d\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)',
+							regex: GOOGLE_DRIVE_FILE_URL_REGEX,
 						},
 						validation: [
 							{
 								type: 'regex',
 								properties: {
-									regex:
-										'https:\\/\\/(?:drive|docs)\\.google.com\\/\\w+\\/d\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)',
+									regex: GOOGLE_DRIVE_FILE_URL_REGEX,
 									errorMessage: 'Not a valid Google Drive File URL',
 								},
 							},
@@ -400,11 +399,21 @@ export class GoogleSheetsTrigger implements INodeType {
 				extractValue: true,
 			}) as string;
 
-			let sheetId = this.getNodeParameter('sheetName', undefined, {
+			const sheetWithinDocument = this.getNodeParameter('sheetName', undefined, {
 				extractValue: true,
 			}) as string;
+			const { mode: sheetMode } = this.getNodeParameter('sheetName', 0) as {
+				mode: ResourceLocator;
+			};
+
+			const googleSheet = new GoogleSheet(documentId, this);
+			const { sheetId, title: sheetName } = await googleSheet.spreadsheetGetSheet(
+				this.getNode(),
+				sheetMode,
+				sheetWithinDocument,
+			);
 
-			sheetId = sheetId === 'gid=0' ? '0' : sheetId;
+			const options = this.getNodeParameter('options') as IDataObject;
 
 			// If the documentId or sheetId changed, reset the workflow static data
 			if (
@@ -418,10 +427,6 @@ export class GoogleSheetsTrigger implements INodeType {
 				workflowStaticData.lastIndexChecked = undefined;
 			}
 
-			const googleSheet = new GoogleSheet(documentId, this);
-			const sheetName = await googleSheet.spreadsheetGetSheetNameById(sheetId);
-			const options = this.getNodeParameter('options') as IDataObject;
-
 			const previousRevision = workflowStaticData.lastRevision as number;
 			const previousRevisionLink = workflowStaticData.lastRevisionLink as string;
 
@@ -468,7 +473,7 @@ export class GoogleSheetsTrigger implements INodeType {
 
 			const [from, to] = range.split(':');
 			let keyRange = `${from}${keyRow}:${to}${keyRow}`;
-			let rangeToCheck = `${from}${startIndex}:${to}`;
+			let rangeToCheck = `${from}${keyRow}:${to}`;
 
 			if (options.dataLocationOnSheet) {
 				const locationDefine = (options.dataLocationOnSheet as IDataObject).values as IDataObject;
@@ -498,7 +503,7 @@ export class GoogleSheetsTrigger implements INodeType {
 					rangeToCheck = `${cellDataFrom[1]}${+cellDataFrom[2] + 1}:${rangeTo}`;
 				} else {
 					keyRange = `${cellDataFrom[1]}${keyRow}:${cellDataTo[1]}${keyRow}`;
-					rangeToCheck = `${cellDataFrom[1]}${startIndex}:${rangeTo}`;
+					rangeToCheck = `${cellDataFrom[1]}${keyRow}:${rangeTo}`;
 				}
 			}
 
@@ -511,7 +516,7 @@ export class GoogleSheetsTrigger implements INodeType {
 					(await apiRequest.call(
 						this,
 						'GET',
-						`/v4/spreadsheets/${documentId}/values/${sheetName}!${keyRange}`,
+						`/v4/spreadsheets/${documentId}/values/${encodeURIComponent(sheetName)}!${keyRange}`,
 					)) as IDataObject
 				).values as string[][]) || [[]];
 
@@ -597,7 +602,7 @@ export class GoogleSheetsTrigger implements INodeType {
 				const previousRevisionSheetData =
 					sheetBinaryToArrayOfArrays(
 						previousRevisionBinaryData,
-						sheetName as string,
+						sheetName,
 						rangeDefinition === 'specifyRangeA1' ? range : undefined,
 					) || [];
 
diff --git a/packages/nodes-base/nodes/Google/Sheet/GoogleSheetsTrigger.utils.ts b/packages/nodes-base/nodes/Google/Sheet/GoogleSheetsTrigger.utils.ts
index a7044941a6698..91ab4c69a8741 100644
--- a/packages/nodes-base/nodes/Google/Sheet/GoogleSheetsTrigger.utils.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/GoogleSheetsTrigger.utils.ts
@@ -1,10 +1,10 @@
 import type { IDataObject, IPollFunctions } from 'n8n-workflow';
-import { apiRequest } from './v2/transport';
-import type { SheetDataRow, SheetRangeData } from './v2/helpers/GoogleSheets.types';
 
 import * as XLSX from 'xlsx';
-import isEqual from 'lodash.isequal';
-import zip from 'lodash.zip';
+import isEqual from 'lodash/isEqual';
+import zip from 'lodash/zip';
+import type { SheetDataRow, SheetRangeData } from './v2/helpers/GoogleSheets.types';
+import { apiRequest } from './v2/transport';
 
 export const BINARY_MIME_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
 
diff --git a/packages/nodes-base/nodes/Google/Sheet/googleSheets.svg b/packages/nodes-base/nodes/Google/Sheet/googleSheets.svg
index 257f88ea8e9b9..f65da903643b0 100644
--- a/packages/nodes-base/nodes/Google/Sheet/googleSheets.svg
+++ b/packages/nodes-base/nodes/Google/Sheet/googleSheets.svg
@@ -1 +1 @@
-<svg width="60" height="60" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round"><path d="M35.69 1L52 17.225v39.087a3.67 3.67 0 01-1.084 2.61A3.71 3.71 0 0148.293 60H12.707a3.71 3.71 0 01-2.623-1.078A3.67 3.67 0 019 56.312V4.688a3.67 3.67 0 011.084-2.61A3.71 3.71 0 0112.707 1H35.69z" fill="#28B446"/><path d="M35.69 1L52 17.225H39.397c-2.054 0-3.707-1.829-3.707-3.872V1z" fill="#6ACE7C"/><path fill="#219B38" d="M39.211 17.225L52 22.48v-5.255z"/><path d="M20.12 31.975c0-.817.662-1.475 1.483-1.475h17.794c.821 0 1.482.658 1.482 1.475v15.487c0 .818-.661 1.475-1.482 1.475H21.603a1.476 1.476 0 01-1.482-1.474V31.974zm2.225 1.475h6.672v2.212h-6.672V33.45zm0 5.162h6.672v2.213h-6.672v-2.213zm0 5.163h6.672v2.212h-6.672v-2.212zm9.638-10.325h6.672v2.212h-6.672V33.45zm0 5.162h6.672v2.213h-6.672v-2.213zm0 5.163h6.672v2.212h-6.672v-2.212z" fill="#FFF"/><path d="M34.69 0L51 16.225v39.087a3.67 3.67 0 01-1.084 2.61A3.71 3.71 0 0147.293 59H11.707a3.71 3.71 0 01-2.623-1.078A3.67 3.67 0 018 55.312V3.688a3.67 3.67 0 011.084-2.61A3.71 3.71 0 0111.707 0H34.69z" fill="#28B446"/><path d="M34.69 0L51 16.225H38.397c-2.054 0-3.707-1.829-3.707-3.872V0z" fill="#6ACE7C"/><path fill="#219B38" d="M38.211 16.225L51 21.48v-5.255z"/><path d="M19.12 30.975c0-.817.662-1.475 1.483-1.475h17.794c.821 0 1.482.658 1.482 1.475v15.487c0 .818-.661 1.475-1.482 1.475H20.603a1.476 1.476 0 01-1.482-1.474V30.974zm2.225 1.475h6.672v2.212h-6.672V32.45zm0 5.162h6.672v2.213h-6.672v-2.213zm0 5.163h6.672v2.212h-6.672v-2.212zm9.638-10.325h6.672v2.212h-6.672V32.45zm0 5.162h6.672v2.213h-6.672v-2.213zm0 5.163h6.672v2.212h-6.672v-2.212z" fill="#FFF"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="60" height="60"><g fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round"><path fill="#28B446" d="M35.69 1 52 17.225v39.087a3.67 3.67 0 0 1-1.084 2.61A3.7 3.7 0 0 1 48.293 60H12.707a3.7 3.7 0 0 1-2.623-1.078A3.67 3.67 0 0 1 9 56.312V4.688a3.67 3.67 0 0 1 1.084-2.61A3.7 3.7 0 0 1 12.707 1z"/><path fill="#6ACE7C" d="M35.69 1 52 17.225H39.397c-2.054 0-3.707-1.829-3.707-3.872z"/><path fill="#219B38" d="M39.211 17.225 52 22.48v-5.255z"/><path fill="#FFF" d="M20.12 31.975c0-.817.662-1.475 1.483-1.475h17.794c.821 0 1.482.658 1.482 1.475v15.487c0 .818-.661 1.475-1.482 1.475H21.603a1.476 1.476 0 0 1-1.482-1.474V31.974zm2.225 1.475h6.672v2.212h-6.672zm0 5.162h6.672v2.213h-6.672zm0 5.163h6.672v2.212h-6.672zm9.638-10.325h6.672v2.212h-6.672zm0 5.162h6.672v2.213h-6.672zm0 5.163h6.672v2.212h-6.672z"/><path fill="#28B446" d="M34.69 0 51 16.225v39.087a3.67 3.67 0 0 1-1.084 2.61A3.7 3.7 0 0 1 47.293 59H11.707a3.7 3.7 0 0 1-2.623-1.078A3.67 3.67 0 0 1 8 55.312V3.688a3.67 3.67 0 0 1 1.084-2.61A3.7 3.7 0 0 1 11.707 0z"/><path fill="#6ACE7C" d="M34.69 0 51 16.225H38.397c-2.054 0-3.707-1.829-3.707-3.872z"/><path fill="#219B38" d="M38.211 16.225 51 21.48v-5.255z"/><path fill="#FFF" d="M19.12 30.975c0-.817.662-1.475 1.483-1.475h17.794c.821 0 1.482.658 1.482 1.475v15.487c0 .818-.661 1.475-1.482 1.475H20.603a1.476 1.476 0 0 1-1.482-1.474V30.974zm2.225 1.475h6.672v2.212h-6.672zm0 5.162h6.672v2.213h-6.672zm0 5.163h6.672v2.212h-6.672zm9.638-10.325h6.672v2.212h-6.672zm0 5.162h6.672v2.213h-6.672zm0 5.163h6.672v2.212h-6.672z"/></g></svg>
\ No newline at end of file
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 d00eaf6387167..474c878dedb78 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
@@ -163,7 +163,7 @@ describe('Test Google Sheets, removeEmptyColumns', () => {
 		expect(result).toBeDefined();
 		expect(result).toEqual([
 			['id', 'col1', 'col3'],
-			['', 'A', 'C'], // TODO:should be [0, 'A', 'C'] ?
+			[0, 'A', 'C'],
 			[1, 'a', 'c'],
 			[2, 'd', 'f'],
 			[3, 'g', 'i'],
@@ -282,3 +282,121 @@ describe('Test Google Sheets, autoMapInputData', () => {
 		]);
 	});
 });
+
+describe('Test Google Sheets, lookupValues', () => {
+	const inputData = [
+		['row_number', 'id', 'num', 'text'],
+		[2, 1, '111', 'bar'],
+		[3, 3, 1, 'bar'],
+		[4, 4, 1, 'baz'],
+		[5, 5, 1, 'baz'],
+		[6, 6, 66, 'foo'],
+		[7, 7, 77, 'foo'],
+	] as string[][];
+
+	it('should return rows by combining filters by OR', async () => {
+		const fakeExecuteFunction = {
+			getNode() {
+				return {};
+			},
+		} as unknown as IExecuteFunctions;
+
+		const googleSheet = new GoogleSheet('spreadsheetId', fakeExecuteFunction);
+
+		const result = await googleSheet.lookupValues(
+			inputData,
+			0,
+			1,
+			[
+				{
+					lookupColumn: 'num',
+					lookupValue: '1',
+				},
+				{
+					lookupColumn: 'text',
+					lookupValue: 'foo',
+				},
+			],
+			true,
+			'OR',
+		);
+
+		expect(result).toBeDefined();
+		expect(result).toEqual([
+			{
+				row_number: 3,
+				id: 3,
+				num: 1,
+				text: 'bar',
+			},
+			{
+				row_number: 4,
+				id: 4,
+				num: 1,
+				text: 'baz',
+			},
+			{
+				row_number: 5,
+				id: 5,
+				num: 1,
+				text: 'baz',
+			},
+			{
+				row_number: 6,
+				id: 6,
+				num: 66,
+				text: 'foo',
+			},
+			{
+				row_number: 7,
+				id: 7,
+				num: 77,
+				text: 'foo',
+			},
+		]);
+	});
+
+	it('should return rows by combining filters by AND', async () => {
+		const fakeExecuteFunction = {
+			getNode() {
+				return {};
+			},
+		} as unknown as IExecuteFunctions;
+
+		const googleSheet = new GoogleSheet('spreadsheetId', fakeExecuteFunction);
+
+		const result = await googleSheet.lookupValues(
+			inputData,
+			0,
+			1,
+			[
+				{
+					lookupColumn: 'num',
+					lookupValue: '1',
+				},
+				{
+					lookupColumn: 'text',
+					lookupValue: 'baz',
+				},
+			],
+			true,
+			'AND',
+		);
+
+		expect(result).toBeDefined();
+		expect(result).toEqual([
+			{
+				row_number: 4,
+				id: 4,
+				num: 1,
+				text: 'baz',
+			},
+			{
+				row_number: 5,
+				id: 5,
+				num: 1,
+				text: 'baz',
+			},
+		]);
+	});
+});
diff --git a/packages/nodes-base/nodes/Google/Sheet/v1/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Sheet/v1/GenericFunctions.ts
index 95f0421b07e96..c5c3feae78f21 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v1/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v1/GenericFunctions.ts
@@ -1,18 +1,13 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
-	ICredentialTestFunctions,
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
+	IRequestOptions,
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
-
-import moment from 'moment-timezone';
-
-import jwt from 'jsonwebtoken';
+import { getGoogleAccessToken } from '../../GenericFunctions';
 
 export interface IGoogleAuthCredentials {
 	delegatedEmail?: string;
@@ -21,66 +16,9 @@ export interface IGoogleAuthCredentials {
 	privateKey: string;
 }
 
-export async function getAccessToken(
-	this:
-		| IExecuteFunctions
-		| IExecuteSingleFunctions
-		| ILoadOptionsFunctions
-		| ICredentialTestFunctions,
-	credentials: IGoogleAuthCredentials,
-): Promise<IDataObject> {
-	//https://developers.google.com/identity/protocols/oauth2/service-account#httprest
-
-	const scopes = [
-		'https://www.googleapis.com/auth/drive',
-		'https://www.googleapis.com/auth/drive.file',
-		'https://www.googleapis.com/auth/spreadsheets',
-	];
-
-	const now = moment().unix();
-
-	credentials.email = credentials.email.trim();
-	const privateKey = credentials.privateKey.replace(/\\n/g, '\n').trim();
-
-	const signature = jwt.sign(
-		{
-			iss: credentials.email,
-			sub: credentials.delegatedEmail || credentials.email,
-			scope: scopes.join(' '),
-			aud: 'https://oauth2.googleapis.com/token',
-			iat: now,
-			exp: now + 3600,
-		},
-		privateKey,
-		{
-			algorithm: 'RS256',
-			header: {
-				kid: privateKey,
-				typ: 'JWT',
-				alg: 'RS256',
-			},
-		},
-	);
-
-	const options: OptionsWithUri = {
-		headers: {
-			'Content-Type': 'application/x-www-form-urlencoded',
-		},
-		method: 'POST',
-		form: {
-			grant_type: 'urn:ietf:params:oauth:grant-type:jwt-bearer',
-			assertion: signature,
-		},
-		uri: 'https://oauth2.googleapis.com/token',
-		json: true,
-	};
-
-	return this.helpers.request(options);
-}
-
 export async function googleApiRequest(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -93,7 +31,7 @@ export async function googleApiRequest(
 		0,
 		'serviceAccount',
 	) as string;
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			'Content-Type': 'application/json',
 		},
@@ -114,10 +52,7 @@ export async function googleApiRequest(
 		if (authenticationMethod === 'serviceAccount') {
 			const credentials = await this.getCredentials('googleApi');
 
-			const { access_token } = await getAccessToken.call(
-				this,
-				credentials as unknown as IGoogleAuthCredentials,
-			);
+			const { access_token } = await getGoogleAccessToken.call(this, credentials, 'sheetV1');
 
 			options.headers!.Authorization = `Bearer ${access_token}`;
 			return await this.helpers.request(options);
@@ -136,7 +71,7 @@ export async function googleApiRequest(
 export async function googleApiRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: any = {},
@@ -161,7 +96,6 @@ export function hexToRgb(hex: string) {
 	// Expand shorthand form (e.g. "03F") to full form (e.g. "0033FF")
 	const shorthandRegex = /^#?([a-f\d])([a-f\d])([a-f\d])$/i;
 	hex = hex.replace(shorthandRegex, (m, r, g, b) => {
-		// eslint-disable-next-line @typescript-eslint/restrict-plus-operands
 		return r + r + g + g + b + b;
 	});
 
diff --git a/packages/nodes-base/nodes/Google/Sheet/v1/GoogleSheet.ts b/packages/nodes-base/nodes/Google/Sheet/v1/GoogleSheet.ts
index 40fb2b9980cca..809420a59aa69 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v1/GoogleSheet.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v1/GoogleSheet.ts
@@ -1,11 +1,10 @@
 import type { IExecuteFunctions, ILoadOptionsFunctions, IDataObject } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import { googleApiRequest } from './GenericFunctions';
-
 import { utils as xlsxUtils } from 'xlsx';
 
-import get from 'lodash.get';
+import get from 'lodash/get';
+import { googleApiRequest } from './GenericFunctions';
 
 export interface ISheetOptions {
 	scope: string[];
@@ -282,7 +281,7 @@ export class GoogleSheet {
 			keyRowIndex,
 			usePathForKeyRow,
 		);
-		return this.appendData(range, data, valueInputMode);
+		return await this.appendData(range, data, valueInputMode);
 	}
 
 	getColumnWithOffset(startColumn: string, offset: number): string {
@@ -399,7 +398,7 @@ export class GoogleSheet {
 			if (itemKey === undefined || itemKey === null) {
 				// Item does not have the indexKey so we can ignore it or append it if upsert true
 				if (upsert) {
-					const _data = await this.appendSheetData(
+					await this.appendSheetData(
 						[inputItem],
 						this.encodeRange(range),
 						keyRowIndex,
@@ -415,7 +414,7 @@ export class GoogleSheet {
 			if (itemKeyIndex === -1) {
 				// Key does not exist in the Sheet so it can not be updated so skip it or append it if upsert true
 				if (upsert) {
-					const _data = await this.appendSheetData(
+					await this.appendSheetData(
 						[inputItem],
 						this.encodeRange(range),
 						keyRowIndex,
@@ -457,13 +456,13 @@ export class GoogleSheet {
 			}
 		}
 
-		return this.batchUpdate(updateData, valueInputMode);
+		return await this.batchUpdate(updateData, valueInputMode);
 	}
 
 	/**
 	 * Looks for a specific value in a column and if it gets found it returns the whole row
 	 *
-	 * @param {string[][]} inputData Data to to check for lookup value in
+	 * @param {string[][]} inputData Data to check for lookup value in
 	 * @param {number} keyRowIndex Index of the row which contains the keys
 	 * @param {number} dataStartRowIndex Index of the first row which contains data
 	 * @param {ILookupValues[]} lookupValues The lookup values which decide what data to return
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 9cdf31e1c2216..5b4fd9dfc98a6 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v1/GoogleSheetsV1.node.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v1/GoogleSheetsV1.node.ts
@@ -13,6 +13,8 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
+import { getGoogleAccessToken } from '../../GenericFunctions';
+import { generatePairedItemData } from '../../../../utils/utilities';
 import type {
 	ILookupValues,
 	ISheetUpdateData,
@@ -22,8 +24,7 @@ import type {
 } from './GoogleSheet';
 import { GoogleSheet } from './GoogleSheet';
 
-import type { IGoogleAuthCredentials } from './GenericFunctions';
-import { getAccessToken, googleApiRequest, hexToRgb } from './GenericFunctions';
+import { googleApiRequest, hexToRgb } from './GenericFunctions';
 
 import { versionDescription } from './versionDescription';
 
@@ -71,10 +72,8 @@ export class GoogleSheetsV1 implements INodeType {
 				credential: ICredentialsDecrypted,
 			): Promise<INodeCredentialTestResult> {
 				try {
-					const tokenRequest = await getAccessToken.call(
-						this,
-						credential.data! as unknown as IGoogleAuthCredentials,
-					);
+					const tokenRequest = await getGoogleAccessToken.call(this, credential.data!, 'sheetV1');
+
 					if (!tokenRequest.access_token) {
 						return {
 							status: 'Error',
@@ -132,7 +131,7 @@ export class GoogleSheetsV1 implements INodeType {
 					const usePathForKeyRow = (options.usePathForKeyRow || false) as boolean;
 
 					// Convert data into array format
-					const _data = await sheet.appendSheetData(
+					await sheet.appendSheetData(
 						setData,
 						sheet.encodeRange(range),
 						keyRow,
@@ -143,10 +142,10 @@ export class GoogleSheetsV1 implements INodeType {
 					// TODO: Should add this data somewhere
 					// TODO: Should have something like add metadata which does not get passed through
 
-					return await this.prepareOutputData(items);
+					return [items];
 				} catch (error) {
 					if (this.continueOnFail()) {
-						return this.prepareOutputData([{ json: { error: error.message } }]);
+						return [[{ json: { error: error.message } }]];
 					}
 					throw error;
 				}
@@ -158,10 +157,10 @@ export class GoogleSheetsV1 implements INodeType {
 					await sheet.clearData(sheet.encodeRange(range));
 
 					const items = this.getInputData();
-					return await this.prepareOutputData(items);
+					return [items];
 				} catch (error) {
 					if (this.continueOnFail()) {
-						return this.prepareOutputData([{ json: { error: error.message } }]);
+						return [[{ json: { error: error.message } }]];
 					}
 					throw error;
 				}
@@ -244,13 +243,13 @@ export class GoogleSheetsV1 implements INodeType {
 						}
 					}
 
-					const _data = await sheet.spreadsheetBatchUpdate(requests);
+					await sheet.spreadsheetBatchUpdate(requests);
 
 					const items = this.getInputData();
-					return await this.prepareOutputData(items);
+					return [items];
 				} catch (error) {
 					if (this.continueOnFail()) {
-						return this.prepareOutputData([{ json: { error: error.message } }]);
+						return [[{ json: { error: error.message } }]];
 					}
 					throw error;
 				}
@@ -297,7 +296,16 @@ export class GoogleSheetsV1 implements INodeType {
 						returnData = [];
 					}
 
-					return [this.helpers.returnJsonArray(returnData)];
+					const pairedItem = generatePairedItemData(items.length);
+
+					const lookupOutput = returnData.map((item) => {
+						return {
+							json: item,
+							pairedItem,
+						};
+					});
+
+					return [lookupOutput];
 				} catch (error) {
 					if (this.continueOnFail()) {
 						return [this.helpers.returnJsonArray({ error: error.message })];
@@ -397,7 +405,7 @@ export class GoogleSheetsV1 implements INodeType {
 							});
 						}
 
-						const _data = await sheet.batchUpdate(updateData, valueInputMode);
+						await sheet.batchUpdate(updateData, valueInputMode);
 					} else {
 						const keyName = this.getNodeParameter('key', 0) as string;
 						const keyRow = parseInt(this.getNodeParameter('keyRow', 0) as string, 10);
@@ -408,7 +416,7 @@ export class GoogleSheetsV1 implements INodeType {
 							setData.push(item.json);
 						});
 
-						const _data = await sheet.updateSheetData(
+						await sheet.updateSheetData(
 							setData,
 							keyName,
 							range,
@@ -422,10 +430,10 @@ export class GoogleSheetsV1 implements INodeType {
 					// TODO: Should add this data somewhere
 					// TODO: Should have something like add metadata which does not get passed through
 
-					return await this.prepareOutputData(items);
+					return [items];
 				} catch (error) {
 					if (this.continueOnFail()) {
-						return this.prepareOutputData([{ json: { error: error.message } }]);
+						return [[{ json: { error: error.message } }]];
 					}
 					throw error;
 				}
diff --git a/packages/nodes-base/nodes/Google/Sheet/v1/versionDescription.ts b/packages/nodes-base/nodes/Google/Sheet/v1/versionDescription.ts
index a8fdd72362923..294df40cd911d 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v1/versionDescription.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v1/versionDescription.ts
@@ -1,6 +1,8 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
 import type { INodeTypeDescription } from 'n8n-workflow';
 
+import { oldVersionNotice } from '@utils/descriptions';
+
 export const versionDescription: INodeTypeDescription = {
 	displayName: 'Google Sheets ',
 	name: 'googleSheets',
@@ -36,6 +38,7 @@ export const versionDescription: INodeTypeDescription = {
 		},
 	],
 	properties: [
+		oldVersionNotice,
 		{
 			displayName: 'Authentication',
 			name: 'authentication',
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 de2973ca2a60c..912ca8a7971ff 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/GoogleSheetsV2.node.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/GoogleSheetsV2.node.ts
@@ -5,7 +5,7 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { versionDescription } from './actions/versionDescription';
-import { credentialTest, listSearch, loadOptions } from './methods';
+import { credentialTest, listSearch, loadOptions, resourceMapping } from './methods';
 import { router } from './actions/router';
 
 export class GoogleSheetsV2 implements INodeType {
@@ -22,9 +22,10 @@ export class GoogleSheetsV2 implements INodeType {
 		loadOptions,
 		credentialTest,
 		listSearch,
+		resourceMapping,
 	};
 
 	async execute(this: IExecuteFunctions) {
-		return router.call(this);
+		return await router.call(this);
 	}
 }
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 ab5929c31baa3..5159e9b76e565 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/router.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/router.ts
@@ -1,12 +1,12 @@
-import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
-import * as sheet from './sheet/Sheet.resource';
-import * as spreadsheet from './spreadsheet/SpreadSheet.resource';
+import { type IExecuteFunctions, type IDataObject, type INodeExecutionData } from 'n8n-workflow';
 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';
 
 export async function router(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
-	const operationResult: INodeExecutionData[] = [];
+	let operationResult: INodeExecutionData[] = [];
 
 	try {
 		const resource = this.getNodeParameter('resource', 0);
@@ -17,24 +17,37 @@ export async function router(this: IExecuteFunctions): Promise<INodeExecutionDat
 			operation,
 		} as GoogleSheets;
 
+		let results: INodeExecutionData[] | undefined;
 		if (googleSheets.resource === 'sheet') {
 			const { mode, value } = this.getNodeParameter('documentId', 0) as IDataObject;
-			const spreadsheetId = getSpreadsheetId(mode as ResourceLocator, value as string);
+			const spreadsheetId = getSpreadsheetId(
+				this.getNode(),
+				mode as ResourceLocator,
+				value as string,
+			);
 
 			const googleSheet = new GoogleSheet(spreadsheetId, this);
 
 			let sheetId = '';
+			let sheetName = '';
+
 			if (operation !== 'create') {
-				sheetId = this.getNodeParameter('sheetName', 0, undefined, {
+				const sheetWithinDocument = this.getNodeParameter('sheetName', 0, undefined, {
 					extractValue: true,
 				}) as string;
-			}
+				const { mode: sheetMode } = this.getNodeParameter('sheetName', 0) as {
+					mode: ResourceLocator;
+				};
 
-			if (sheetId === 'gid=0') {
-				sheetId = '0';
+				const result = await googleSheet.spreadsheetGetSheet(
+					this.getNode(),
+					sheetMode,
+					sheetWithinDocument,
+				);
+				sheetId = result.sheetId.toString();
+				sheetName = result.title;
 			}
 
-			let sheetName = '';
 			switch (operation) {
 				case 'create':
 					sheetName = spreadsheetId;
@@ -45,35 +58,25 @@ export async function router(this: IExecuteFunctions): Promise<INodeExecutionDat
 				case 'remove':
 					sheetName = `${spreadsheetId}||${sheetId}`;
 					break;
-				default:
-					sheetName = await googleSheet.spreadsheetGetSheetNameById(sheetId);
 			}
 
-			operationResult.push(
-				...(await sheet[googleSheets.operation].execute.call(
-					this,
-					googleSheet,
-					sheetName,
-					sheetId,
-				)),
+			results = await sheet[googleSheets.operation].execute.call(
+				this,
+				googleSheet,
+				sheetName,
+				sheetId,
 			);
 		} else if (googleSheets.resource === 'spreadsheet') {
-			operationResult.push(...(await spreadsheet[googleSheets.operation].execute.call(this)));
+			results = await spreadsheet[googleSheets.operation].execute.call(this);
 		}
-	} catch (err) {
+		if (results?.length) {
+			operationResult = operationResult.concat(results);
+		}
+	} catch (error) {
 		if (this.continueOnFail()) {
-			operationResult.push({ json: this.getInputData(0)[0].json, error: err });
+			operationResult.push({ json: this.getInputData(0)[0].json, error });
 		} else {
-			if (
-				err.message &&
-				(err.message.toLowerCase().includes('bad request') ||
-					err.message.toLowerCase().includes('uknown error')) &&
-				err.description
-			) {
-				err.message = err.description;
-				err.description = undefined;
-			}
-			throw err;
+			throw error;
 		}
 	}
 
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 b6ea2b41d5594..e7df39ac46cb0 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,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+import { GOOGLE_DRIVE_FILE_URL_REGEX } from '../../../../constants';
 import * as append from './append.operation';
 import * as appendOrUpdate from './appendOrUpdate.operation';
 import * as clear from './clear.operation';
@@ -23,53 +24,52 @@ export const descriptions: INodeProperties[] = [
 		},
 		options: [
 			{
-				name: 'Append',
-				value: 'append',
-				description: 'Append data to a sheet',
-				action: 'Append data to a sheet',
+				name: 'Append or Update Row',
+				value: 'appendOrUpdate',
+				description: 'Append a new row or update an existing one (upsert)',
+				action: 'Append or update row in sheet',
 			},
 			{
-				// eslint-disable-next-line n8n-nodes-base/node-param-option-name-wrong-for-upsert
-				name: 'Append or Update',
-				value: 'appendOrUpdate',
-				description: 'Append a new row or update the current one if it already exists (upsert)',
-				action: 'Append or update a sheet',
+				name: 'Append Row',
+				value: 'append',
+				description: 'Create a new row in a sheet',
+				action: 'Append row in sheet',
 			},
 			{
 				name: 'Clear',
 				value: 'clear',
-				description: 'Clear data from a sheet',
-				action: 'Clear a sheet',
+				description: 'Delete all the contents or a part of a sheet',
+				action: 'Clear sheet',
 			},
 			{
 				name: 'Create',
 				value: 'create',
 				description: 'Create a new sheet',
-				action: 'Create a sheet',
+				action: 'Create sheet',
 			},
 			{
 				name: 'Delete',
-				value: 'delete',
-				description: 'Delete columns and rows from a sheet',
-				action: 'Delete a sheet',
+				value: 'remove',
+				description: 'Permanently delete a sheet',
+				action: 'Delete sheet',
 			},
 			{
-				name: 'Read Rows',
-				value: 'read',
-				description: 'Read all rows in a sheet',
-				action: 'Read all rows',
+				name: 'Delete Rows or Columns',
+				value: 'delete',
+				description: 'Delete columns or rows from a sheet',
+				action: 'Delete rows or columns from sheet',
 			},
 			{
-				name: 'Remove',
-				value: 'remove',
-				description: 'Remove a sheet',
-				action: 'Remove a sheet',
+				name: 'Get Row(s)',
+				value: 'read',
+				description: 'Retrieve one or more rows from a sheet',
+				action: 'Get row(s) in sheet',
 			},
 			{
-				name: 'Update',
+				name: 'Update Row',
 				value: 'update',
-				description: 'Update rows in a sheet',
-				action: 'Update a sheet',
+				description: 'Update an existing row in a sheet',
+				action: 'Update row in sheet',
 			},
 		],
 		default: 'read',
@@ -96,15 +96,13 @@ export const descriptions: INodeProperties[] = [
 				type: 'string',
 				extractValue: {
 					type: 'regex',
-					regex:
-						'https:\\/\\/(?:drive|docs)\\.google\\.com\\/\\w+\\/d\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)',
+					regex: GOOGLE_DRIVE_FILE_URL_REGEX,
 				},
 				validation: [
 					{
 						type: 'regex',
 						properties: {
-							regex:
-								'https:\\/\\/(?:drive|docs)\\.google.com\\/\\w+\\/d\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)',
+							regex: GOOGLE_DRIVE_FILE_URL_REGEX,
 							errorMessage: 'Not a valid Google Drive File URL',
 						},
 					},
@@ -139,6 +137,9 @@ export const descriptions: INodeProperties[] = [
 		default: { mode: 'list', value: '' },
 		// default: '', //empty string set to progresivly reveal fields
 		required: true,
+		typeOptions: {
+			loadOptionsDependsOn: ['documentId.value'],
+		},
 		modes: [
 			{
 				displayName: 'From List',
@@ -183,6 +184,12 @@ export const descriptions: INodeProperties[] = [
 					},
 				],
 			},
+			{
+				displayName: 'By Name',
+				name: 'name',
+				type: 'string',
+				placeholder: 'Sheet1',
+			},
 		],
 		displayOptions: {
 			show: {
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 bb9d36106c383..5e1d0a810d044 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
@@ -1,7 +1,12 @@
 import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 import type { SheetProperties, ValueInputOption } from '../../helpers/GoogleSheets.types';
 import type { GoogleSheet } from '../../helpers/GoogleSheet';
-import { autoMapInputData, mapFields, untilSheetSelected } from '../../helpers/GoogleSheets.utils';
+import {
+	autoMapInputData,
+	cellFormatDefault,
+	mapFields,
+	untilSheetSelected,
+} from '../../helpers/GoogleSheets.utils';
 import { cellFormat, handlingExtraData } from './commonDescription';
 
 export const description: SheetProperties = [
@@ -30,6 +35,7 @@ export const description: SheetProperties = [
 			show: {
 				resource: ['sheet'],
 				operation: ['append'],
+				'@version': [3],
 			},
 			hide: {
 				...untilSheetSelected,
@@ -40,7 +46,7 @@ export const description: SheetProperties = [
 	},
 	{
 		displayName:
-			"In this mode, make sure the incoming data is named the same as the columns in your Sheet. (Use a 'set' node before this node to change it if required.)",
+			"In this mode, make sure the incoming data is named the same as the columns in your Sheet. (Use an 'Edit Fields' node before this node to change it if required.)",
 		name: 'autoMapNotice',
 		type: 'notice',
 		default: '',
@@ -48,6 +54,7 @@ export const description: SheetProperties = [
 			show: {
 				operation: ['append'],
 				dataMode: ['autoMapInputData'],
+				'@version': [3],
 			},
 			hide: {
 				...untilSheetSelected,
@@ -68,6 +75,7 @@ export const description: SheetProperties = [
 				resource: ['sheet'],
 				operation: ['append'],
 				dataMode: ['defineBelow'],
+				'@version': [3],
 			},
 			hide: {
 				...untilSheetSelected,
@@ -101,6 +109,40 @@ export const description: SheetProperties = [
 			},
 		],
 	},
+	{
+		displayName: 'Columns',
+		name: 'columns',
+		type: 'resourceMapper',
+		noDataExpression: true,
+		default: {
+			mappingMode: 'defineBelow',
+			value: null,
+		},
+		required: true,
+		typeOptions: {
+			loadOptionsDependsOn: ['sheetName.value'],
+			resourceMapper: {
+				resourceMapperMethod: 'getMappingColumns',
+				mode: 'add',
+				fieldWords: {
+					singular: 'column',
+					plural: 'columns',
+				},
+				addAllFields: true,
+				multiKeyMatch: false,
+			},
+		},
+		displayOptions: {
+			show: {
+				resource: ['sheet'],
+				operation: ['append'],
+				'@version': [{ _cnd: { gte: 4 } }],
+			},
+			hide: {
+				...untilSheetSelected,
+			},
+		},
+	},
 	{
 		displayName: 'Options',
 		name: 'options',
@@ -117,7 +159,7 @@ export const description: SheetProperties = [
 			},
 		},
 		options: [
-			...cellFormat,
+			cellFormat,
 			{
 				displayName: 'Data Location on Sheet',
 				name: 'locationDefine',
@@ -144,7 +186,19 @@ export const description: SheetProperties = [
 					},
 				],
 			},
-			...handlingExtraData,
+			handlingExtraData,
+			{
+				...handlingExtraData,
+				displayOptions: { show: { '/columns.mappingMode': ['autoMapInputData'] } },
+			},
+			{
+				displayName: 'Use Append',
+				name: 'useAppend',
+				type: 'boolean',
+				default: false,
+				description:
+					'Whether to use append instead of update(default), this is more efficient but in some cases data might be misaligned',
+			},
 		],
 	},
 ];
@@ -156,7 +210,11 @@ export async function execute(
 	sheetId: string,
 ): Promise<INodeExecutionData[]> {
 	const items = this.getInputData();
-	const dataMode = this.getNodeParameter('dataMode', 0) as string;
+	const nodeVersion = this.getNode().typeVersion;
+	const dataMode =
+		nodeVersion < 4
+			? (this.getNodeParameter('dataMode', 0) as string)
+			: (this.getNodeParameter('columns.mappingMode', 0) as string);
 
 	if (!items.length || dataMode === 'nothing') return [];
 
@@ -178,17 +236,39 @@ export async function execute(
 
 	if (setData.length === 0) {
 		return [];
+	} else if (options.useAppend) {
+		await sheet.appendSheetData(
+			setData,
+			sheetName,
+			headerRow,
+			(options.cellFormat as ValueInputOption) || cellFormatDefault(nodeVersion),
+			false,
+			undefined,
+			undefined,
+			options.useAppend as boolean,
+		);
 	} else {
 		await sheet.appendEmptyRowsOrColumns(sheetId, 1, 0);
-	}
 
-	await sheet.appendSheetData(
-		setData,
-		sheetName,
-		headerRow,
-		(options.cellFormat as ValueInputOption) || 'RAW',
-		false,
-	);
+		await sheet.appendSheetData(
+			setData,
+			sheetName,
+			headerRow,
+			(options.cellFormat as ValueInputOption) || cellFormatDefault(nodeVersion),
+			false,
+		);
+	}
 
-	return items;
+	if (nodeVersion < 4 || dataMode === 'autoMapInputData') {
+		return items;
+	} else {
+		const returnData: INodeExecutionData[] = [];
+		for (const [index, entry] of setData.entries()) {
+			returnData.push({
+				json: entry,
+				pairedItem: { item: index },
+			});
+		}
+		return returnData;
+	}
 }
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 b8b11fb9ccbe4..ea68b5b954302 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
@@ -1,13 +1,13 @@
 import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
+import { NodeOperationError } from 'n8n-workflow';
 import type {
 	ISheetUpdateData,
 	SheetProperties,
 	ValueInputOption,
 	ValueRenderOption,
 } from '../../helpers/GoogleSheets.types';
-import { NodeOperationError } from 'n8n-workflow';
 import type { GoogleSheet } from '../../helpers/GoogleSheet';
-import { untilSheetSelected } from '../../helpers/GoogleSheets.utils';
+import { cellFormatDefault, untilSheetSelected } from '../../helpers/GoogleSheets.utils';
 import { cellFormat, handlingExtraData, locationDefine } from './commonDescription';
 
 export const description: SheetProperties = [
@@ -36,6 +36,7 @@ export const description: SheetProperties = [
 			show: {
 				resource: ['sheet'],
 				operation: ['appendOrUpdate'],
+				'@version': [3],
 			},
 			hide: {
 				...untilSheetSelected,
@@ -61,6 +62,7 @@ export const description: SheetProperties = [
 			show: {
 				resource: ['sheet'],
 				operation: ['appendOrUpdate'],
+				'@version': [3],
 			},
 			hide: {
 				...untilSheetSelected,
@@ -77,6 +79,7 @@ export const description: SheetProperties = [
 				resource: ['sheet'],
 				operation: ['appendOrUpdate'],
 				dataMode: ['defineBelow'],
+				'@version': [3],
 			},
 			hide: {
 				...untilSheetSelected,
@@ -96,6 +99,7 @@ export const description: SheetProperties = [
 				resource: ['sheet'],
 				operation: ['appendOrUpdate'],
 				dataMode: ['defineBelow'],
+				'@version': [3],
 			},
 			hide: {
 				...untilSheetSelected,
@@ -141,6 +145,40 @@ export const description: SheetProperties = [
 			},
 		],
 	},
+	{
+		displayName: 'Columns',
+		name: 'columns',
+		type: 'resourceMapper',
+		noDataExpression: true,
+		default: {
+			mappingMode: 'defineBelow',
+			value: null,
+		},
+		required: true,
+		typeOptions: {
+			loadOptionsDependsOn: ['sheetName.value'],
+			resourceMapper: {
+				resourceMapperMethod: 'getMappingColumns',
+				mode: 'upsert',
+				fieldWords: {
+					singular: 'column',
+					plural: 'columns',
+				},
+				addAllFields: true,
+				multiKeyMatch: false,
+			},
+		},
+		displayOptions: {
+			show: {
+				resource: ['sheet'],
+				operation: ['appendOrUpdate'],
+				'@version': [{ _cnd: { gte: 4 } }],
+			},
+			hide: {
+				...untilSheetSelected,
+			},
+		},
+	},
 	{
 		displayName: 'Options',
 		name: 'options',
@@ -156,7 +194,23 @@ export const description: SheetProperties = [
 				...untilSheetSelected,
 			},
 		},
-		options: [...cellFormat, ...locationDefine, ...handlingExtraData],
+		options: [
+			cellFormat,
+			locationDefine,
+			handlingExtraData,
+			{
+				...handlingExtraData,
+				displayOptions: { show: { '/columns.mappingMode': ['autoMapInputData'] } },
+			},
+			{
+				displayName: 'Use Append',
+				name: 'useAppend',
+				type: 'boolean',
+				default: false,
+				description:
+					'Whether to use append instead of update(default), this is more efficient but in some cases data might be misaligned',
+			},
+		],
 	},
 ];
 
@@ -167,9 +221,16 @@ export async function execute(
 	sheetId: string,
 ): Promise<INodeExecutionData[]> {
 	const items = this.getInputData();
-	const valueInputMode = this.getNodeParameter('options.cellFormat', 0, 'RAW') as ValueInputOption;
+	const nodeVersion = this.getNode().typeVersion;
+
 	const range = `${sheetName}!A:Z`;
 
+	const valueInputMode = this.getNodeParameter(
+		'options.cellFormat',
+		0,
+		cellFormatDefault(nodeVersion),
+	) as ValueInputOption;
+
 	const options = this.getNodeParameter('options', 0, {});
 
 	const valueRenderMode = (options.valueRenderMode || 'UNFORMATTED_VALUE') as ValueRenderOption;
@@ -188,22 +249,33 @@ export async function execute(
 		}
 	}
 
+	const dataMode =
+		nodeVersion < 4
+			? (this.getNodeParameter('dataMode', 0) as string)
+			: (this.getNodeParameter('columns.mappingMode', 0) as string);
+
 	let columnNames: string[] = [];
 
-	const sheetData = await sheet.getData(sheetName, 'FORMATTED_VALUE');
+	const sheetData = (await sheet.getData(sheetName, 'FORMATTED_VALUE')) ?? [];
 
-	if (sheetData === undefined || sheetData[headerRow] === undefined) {
+	if (!sheetData[headerRow] && dataMode !== 'autoMapInputData') {
 		throw new NodeOperationError(
 			this.getNode(),
 			`Could not retrieve the column names from row ${headerRow + 1}`,
 		);
 	}
 
-	columnNames = sheetData[headerRow];
+	columnNames = sheetData[headerRow] ?? [];
+
 	const newColumns = new Set<string>();
 
-	const columnToMatchOn = this.getNodeParameter('columnToMatchOn', 0) as string;
-	const keyIndex = columnNames.indexOf(columnToMatchOn);
+	const columnsToMatchOn: string[] =
+		nodeVersion < 4
+			? [this.getNodeParameter('columnToMatchOn', 0) as string]
+			: (this.getNodeParameter('columns.matchingColumns', 0) as string[]);
+
+	// TODO: Add support for multiple columns to match on in the next overhaul
+	const keyIndex = columnNames.indexOf(columnsToMatchOn[0]);
 
 	const columnValues = await sheet.getColumnValues(
 		range,
@@ -216,12 +288,23 @@ export async function execute(
 	const updateData: ISheetUpdateData[] = [];
 	const appendData: IDataObject[] = [];
 
-	for (let i = 0; i < items.length; i++) {
-		const dataMode = this.getNodeParameter('dataMode', i) as
-			| 'defineBelow'
-			| 'autoMapInputData'
-			| 'nothing';
+	const errorOnUnexpectedColumn = (key: string, i: number) => {
+		if (!columnNames.includes(key)) {
+			throw new NodeOperationError(this.getNode(), 'Unexpected fields in node input', {
+				itemIndex: i,
+				description: `The input field '${key}' doesn't match any column in the Sheet. You can ignore this by changing the 'Handling extra data' field, which you can find under 'Options'.`,
+			});
+		}
+	};
 
+	const addNewColumn = (key: string) => {
+		if (!columnNames.includes(key)) {
+			newColumns.add(key);
+		}
+	};
+
+	const mappedValues: IDataObject[] = [];
+	for (let i = 0; i < items.length; i++) {
 		if (dataMode === 'nothing') continue;
 
 		const data: IDataObject[] = [];
@@ -232,66 +315,77 @@ export async function execute(
 				data.push(items[i].json);
 			}
 			if (handlingExtraDataOption === 'error') {
-				Object.keys(items[i].json).forEach((key) => {
-					if (!columnNames.includes(key)) {
-						throw new NodeOperationError(this.getNode(), 'Unexpected fields in node input', {
-							itemIndex: i,
-							description: `The input field '${key}' doesn't match any column in the Sheet. You can ignore this by changing the 'Handling extra data' field, which you can find under 'Options'.`,
-						});
-					}
-				});
+				Object.keys(items[i].json).forEach((key) => errorOnUnexpectedColumn(key, i));
 				data.push(items[i].json);
 			}
 			if (handlingExtraDataOption === 'insertInNewColumn') {
-				Object.keys(items[i].json).forEach((key) => {
-					if (!columnNames.includes(key)) {
-						newColumns.add(key);
-					}
-				});
+				Object.keys(items[i].json).forEach(addNewColumn);
 				data.push(items[i].json);
 			}
 		} else {
-			const valueToMatchOn = this.getNodeParameter('valueToMatchOn', i) as string;
-
-			const valuesToSend = this.getNodeParameter('fieldsUi.values', i, []) as IDataObject[];
-			if (!valuesToSend?.length) {
-				throw new NodeOperationError(
-					this.getNode(),
-					"At least one value has to be added under 'Values to Send'",
-				);
-			}
-			const fields = valuesToSend.reduce((acc, entry) => {
-				if (entry.column === 'newColumn') {
-					const columnName = entry.columnName as string;
+			const valueToMatchOn =
+				nodeVersion < 4
+					? (this.getNodeParameter('valueToMatchOn', i) as string)
+					: (this.getNodeParameter(`columns.value[${columnsToMatchOn[0]}]`, i) as string);
 
-					if (!columnNames.includes(columnName)) {
-						newColumns.add(columnName);
+			if (nodeVersion < 4) {
+				const valuesToSend = this.getNodeParameter('fieldsUi.values', i, []) as IDataObject[];
+				if (!valuesToSend?.length) {
+					throw new NodeOperationError(
+						this.getNode(),
+						"At least one value has to be added under 'Values to Send'",
+					);
+				}
+				// eslint-disable-next-line @typescript-eslint/no-loop-func
+				const fields = valuesToSend.reduce((acc, entry) => {
+					if (entry.column === 'newColumn') {
+						const columnName = entry.columnName as string;
+						if (!columnNames.includes(columnName)) {
+							newColumns.add(columnName);
+						}
+						acc[columnName] = entry.fieldValue as string;
+					} else {
+						acc[entry.column as string] = entry.fieldValue as string;
 					}
-
-					acc[columnName] = entry.fieldValue as string;
-				} else {
-					acc[entry.column as string] = entry.fieldValue as string;
+					return acc;
+				}, {} as IDataObject);
+				fields[columnsToMatchOn[0]] = valueToMatchOn;
+				data.push(fields);
+			} else {
+				const mappingValues = this.getNodeParameter('columns.value', i) as IDataObject;
+				if (Object.keys(mappingValues).length === 0) {
+					throw new NodeOperationError(
+						this.getNode(),
+						"At least one value has to be added under 'Values to Send'",
+					);
 				}
-				return acc;
-			}, {} as IDataObject);
-
-			fields[columnToMatchOn] = valueToMatchOn;
-
-			data.push(fields);
+				// Setting empty values to empty string so that they are not ignored by the API
+				Object.keys(mappingValues).forEach((key) => {
+					if (mappingValues[key] === undefined || mappingValues[key] === null) {
+						mappingValues[key] = '';
+					}
+				});
+				data.push(mappingValues);
+				mappedValues.push(mappingValues);
+			}
 		}
 
 		if (newColumns.size) {
+			const newColumnNames = columnNames.concat([...newColumns]);
 			await sheet.updateRows(
 				sheetName,
-				[columnNames.concat([...newColumns])],
-				(options.cellFormat as ValueInputOption) || 'RAW',
+				[newColumnNames],
+				(options.cellFormat as ValueInputOption) || cellFormatDefault(nodeVersion),
 				headerRow + 1,
 			);
+			columnNames = newColumnNames;
+			sheetData[headerRow] = newColumnNames;
+			newColumns.clear();
 		}
 
 		const preparedData = await sheet.prepareDataForUpdateOrUpsert(
 			data,
-			columnToMatchOn,
+			columnsToMatchOn[0],
 			range,
 			headerRow,
 			firstDataRow,
@@ -309,17 +403,42 @@ export async function execute(
 		await sheet.batchUpdate(updateData, valueInputMode);
 	}
 	if (appendData.length) {
-		await sheet.appendEmptyRowsOrColumns(sheetId, 1, 0);
 		const lastRow = sheetData.length + 1;
-		await sheet.appendSheetData(
-			appendData,
-			range,
-			headerRow + 1,
-			valueInputMode,
-			false,
-			[columnNames.concat([...newColumns])],
-			lastRow,
-		);
+		if (options.useAppend) {
+			await sheet.appendSheetData(
+				appendData,
+				range,
+				headerRow + 1,
+				valueInputMode,
+				false,
+				[columnNames.concat([...newColumns])],
+				lastRow,
+				options.useAppend as boolean,
+			);
+		} else {
+			await sheet.appendEmptyRowsOrColumns(sheetId, 1, 0);
+			await sheet.appendSheetData(
+				appendData,
+				range,
+				headerRow + 1,
+				valueInputMode,
+				false,
+				[columnNames.concat([...newColumns])],
+				lastRow,
+			);
+		}
+	}
+
+	if (nodeVersion < 4 || dataMode === 'autoMapInputData') {
+		return items;
+	} else {
+		const returnData: INodeExecutionData[] = [];
+		for (const [index, entry] of mappedValues.entries()) {
+			returnData.push({
+				json: entry,
+				pairedItem: { item: index },
+			});
+		}
+		return returnData;
 	}
-	return items;
 }
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/commonDescription.ts b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/commonDescription.ts
index 726745fde1eb7..66fdd1166c9d2 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/commonDescription.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/commonDescription.ts
@@ -1,270 +1,260 @@
 import type { INodeProperties } from 'n8n-workflow';
 
-export const dataLocationOnSheet: INodeProperties[] = [
-	{
-		displayName: 'Data Location on Sheet',
-		name: 'dataLocationOnSheet',
-		type: 'fixedCollection',
-		placeholder: 'Select Range',
-		default: { values: { rangeDefinition: 'detectAutomatically' } },
-		options: [
-			{
-				displayName: 'Values',
-				name: 'values',
-				values: [
-					{
-						displayName: 'Range Definition',
-						name: 'rangeDefinition',
-						type: 'options',
-						options: [
-							{
-								name: 'Detect Automatically',
-								value: 'detectAutomatically',
-								description: 'Automatically detect the data range',
-							},
-							{
-								name: 'Specify Range (A1 Notation)',
-								value: 'specifyRangeA1',
-								description: 'Manually specify the data range',
-							},
-							{
-								name: 'Specify Range (Rows)',
-								value: 'specifyRange',
-								description: 'Manually specify the data range',
-							},
-						],
-						default: '',
-					},
-					{
-						displayName: 'Read Rows Until',
-						name: 'readRowsUntil',
-						type: 'options',
-						default: 'lastRowInSheet',
-						options: [
-							{
-								name: 'First Empty Row',
-								value: 'firstEmptyRow',
-							},
-							{
-								name: 'Last Row In Sheet',
-								value: 'lastRowInSheet',
-							},
-						],
-						displayOptions: {
-							show: {
-								rangeDefinition: ['detectAutomatically'],
-							},
+export const dataLocationOnSheet: INodeProperties = {
+	displayName: 'Data Location on Sheet',
+	name: 'dataLocationOnSheet',
+	type: 'fixedCollection',
+	placeholder: 'Select Range',
+	default: { values: { rangeDefinition: 'detectAutomatically' } },
+	options: [
+		{
+			displayName: 'Values',
+			name: 'values',
+			values: [
+				{
+					displayName: 'Range Definition',
+					name: 'rangeDefinition',
+					type: 'options',
+					options: [
+						{
+							name: 'Detect Automatically',
+							value: 'detectAutomatically',
+							description: 'Automatically detect the data range',
 						},
-					},
-					{
-						displayName: 'Header Row',
-						name: 'headerRow',
-						type: 'number',
-						typeOptions: {
-							minValue: 1,
+						{
+							name: 'Specify Range (A1 Notation)',
+							value: 'specifyRangeA1',
+							description: 'Manually specify the data range',
 						},
-						default: 1,
-						description: "Index is relative to the set 'Range', first row index is 1",
-						hint: 'Index of the row which contains the column names',
-						displayOptions: {
-							show: {
-								rangeDefinition: ['specifyRange'],
-							},
+						{
+							name: 'Specify Range (Rows)',
+							value: 'specifyRange',
+							description: 'Manually specify the data range',
 						},
-					},
-					{
-						displayName: 'First Data Row',
-						name: 'firstDataRow',
-						type: 'number',
-						typeOptions: {
-							minValue: 1,
+					],
+					default: '',
+				},
+				{
+					displayName: 'Read Rows Until',
+					name: 'readRowsUntil',
+					type: 'options',
+					default: 'lastRowInSheet',
+					options: [
+						{
+							name: 'First Empty Row',
+							value: 'firstEmptyRow',
+						},
+						{
+							name: 'Last Row In Sheet',
+							value: 'lastRowInSheet',
 						},
-						default: 2,
-						description: "Index is relative to the set 'Range', first row index is 1",
-						hint: 'Index of first row which contains the actual data',
-						displayOptions: {
-							show: {
-								rangeDefinition: ['specifyRange'],
-							},
+					],
+					displayOptions: {
+						show: {
+							rangeDefinition: ['detectAutomatically'],
 						},
 					},
-					{
-						displayName: 'Range',
-						name: 'range',
-						type: 'string',
-						default: '',
-						placeholder: 'A:Z',
-						description:
-							'The table range to read from or to append data to. See the Google <a href="https://developers.google.com/sheets/api/guides/values#writing">documentation</a> for the details.',
-						hint: 'You can specify both the rows and the columns, e.g. C4:E7',
-						displayOptions: {
-							show: {
-								rangeDefinition: ['specifyRangeA1'],
-							},
+				},
+				{
+					displayName: 'Header Row',
+					name: 'headerRow',
+					type: 'number',
+					typeOptions: {
+						minValue: 1,
+					},
+					default: 1,
+					description: "Index is relative to the set 'Range', first row index is 1",
+					hint: 'Index of the row which contains the column names',
+					displayOptions: {
+						show: {
+							rangeDefinition: ['specifyRange'],
 						},
 					},
-				],
-			},
-		],
-	},
-];
-
-export const locationDefine: INodeProperties[] = [
-	{
-		displayName: 'Data Location on Sheet',
-		name: 'locationDefine',
-		type: 'fixedCollection',
-		placeholder: 'Select Range',
-		default: { values: {} },
-		options: [
-			{
-				displayName: 'Values',
-				name: 'values',
-				values: [
-					{
-						displayName: 'Header Row',
-						name: 'headerRow',
-						type: 'number',
-						typeOptions: {
-							minValue: 1,
+				},
+				{
+					displayName: 'First Data Row',
+					name: 'firstDataRow',
+					type: 'number',
+					typeOptions: {
+						minValue: 1,
+					},
+					default: 2,
+					description: "Index is relative to the set 'Range', first row index is 1",
+					hint: 'Index of first row which contains the actual data',
+					displayOptions: {
+						show: {
+							rangeDefinition: ['specifyRange'],
 						},
-						default: 1,
-						description: "Index is relative to the set 'Range', first row index is 1",
-						hint: 'Index of the row which contains the column names',
 					},
-					{
-						displayName: 'First Data Row',
-						name: 'firstDataRow',
-						type: 'number',
-						typeOptions: {
-							minValue: 1,
+				},
+				{
+					displayName: 'Range',
+					name: 'range',
+					type: 'string',
+					default: '',
+					placeholder: 'A:Z',
+					description:
+						'The table range to read from or to append data to. See the Google <a href="https://developers.google.com/sheets/api/guides/values#writing">documentation</a> for the details.',
+					hint: 'You can specify both the rows and the columns, e.g. C4:E7',
+					displayOptions: {
+						show: {
+							rangeDefinition: ['specifyRangeA1'],
 						},
-						default: 2,
-						description: "Index is relative to the set 'Range', first row index is 1",
-						hint: 'Index of first row which contains the actual data',
 					},
-				],
-			},
-		],
-	},
-];
+				},
+			],
+		},
+	],
+};
 
-export const outputFormatting: INodeProperties[] = [
-	{
-		displayName: 'Output Formatting',
-		name: 'outputFormatting',
-		type: 'fixedCollection',
-		placeholder: 'Add Formatting',
-		default: { values: { general: 'UNFORMATTED_VALUE', date: 'FORMATTED_STRING' } },
-		options: [
-			{
-				displayName: 'Values',
-				name: 'values',
-				values: [
-					{
-						displayName: 'General Formatting',
-						name: 'general',
-						type: 'options',
-						options: [
-							{
-								// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
-								name: 'Values (unformatted)',
-								value: 'UNFORMATTED_VALUE',
-								description:
-									'Numbers stay as numbers, but any currency signs or special formatting is lost',
-							},
-							{
-								// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
-								name: 'Values (formatted)',
-								value: 'FORMATTED_VALUE',
-								description:
-									'Numbers are turned to text, and displayed as in Google Sheets (e.g. with commas or currency signs)',
-							},
-							{
-								name: 'Formulas',
-								value: 'FORMULA',
-							},
-						],
-						default: '',
-						description: 'Determines how values should be rendered in the output',
+export const locationDefine: INodeProperties = {
+	displayName: 'Data Location on Sheet',
+	name: 'locationDefine',
+	type: 'fixedCollection',
+	placeholder: 'Select Range',
+	default: { values: {} },
+	options: [
+		{
+			displayName: 'Values',
+			name: 'values',
+			values: [
+				{
+					displayName: 'Header Row',
+					name: 'headerRow',
+					type: 'number',
+					typeOptions: {
+						minValue: 1,
 					},
-					{
-						displayName: 'Date Formatting',
-						name: 'date',
-						type: 'options',
-						default: '',
-						options: [
-							{
-								name: 'Formatted Text',
-								value: 'FORMATTED_STRING',
-								description: "As displayed in Google Sheets, e.g. '01/01/2022'",
-							},
-							{
-								name: 'Serial Number',
-								value: 'SERIAL_NUMBER',
-								description: 'A number representing the number of days since Dec 30, 1899',
-							},
-						],
+					default: 1,
+					description: "Index is relative to the set 'Range', first row index is 1",
+					hint: 'Index of the row which contains the column names',
+				},
+				{
+					displayName: 'First Data Row',
+					name: 'firstDataRow',
+					type: 'number',
+					typeOptions: {
+						minValue: 1,
 					},
-				],
-			},
-		],
-	},
-];
+					default: 2,
+					description: "Index is relative to the set 'Range', first row index is 1",
+					hint: 'Index of first row which contains the actual data',
+				},
+			],
+		},
+	],
+};
 
-export const cellFormat: INodeProperties[] = [
-	{
-		displayName: 'Cell Format',
-		name: 'cellFormat',
-		type: 'options',
-		options: [
-			{
-				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
-				name: 'Let n8n format',
-				value: 'RAW',
-				description: 'Cells have the same types as the input data',
-			},
-			{
-				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
-				name: 'Let Google Sheets format',
-				value: 'USER_ENTERED',
-				description: 'Cells are styled as if you typed the values into Google Sheets directly',
-			},
-		],
-		default: 'RAW',
-		description: 'Determines how data should be interpreted',
-	},
-];
+export const outputFormatting: INodeProperties = {
+	displayName: 'Output Formatting',
+	name: 'outputFormatting',
+	type: 'fixedCollection',
+	placeholder: 'Add Formatting',
+	default: { values: { general: 'UNFORMATTED_VALUE', date: 'FORMATTED_STRING' } },
+	options: [
+		{
+			displayName: 'Values',
+			name: 'values',
+			values: [
+				{
+					displayName: 'General Formatting',
+					name: 'general',
+					type: 'options',
+					options: [
+						{
+							// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+							name: 'Values (unformatted)',
+							value: 'UNFORMATTED_VALUE',
+							description:
+								'Numbers stay as numbers, but any currency signs or special formatting is lost',
+						},
+						{
+							// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+							name: 'Values (formatted)',
+							value: 'FORMATTED_VALUE',
+							description:
+								'Numbers are turned to text, and displayed as in Google Sheets (e.g. with commas or currency signs)',
+						},
+						{
+							name: 'Formulas',
+							value: 'FORMULA',
+						},
+					],
+					default: '',
+					description: 'Determines how values should be rendered in the output',
+				},
+				{
+					displayName: 'Date Formatting',
+					name: 'date',
+					type: 'options',
+					default: '',
+					options: [
+						{
+							name: 'Formatted Text',
+							value: 'FORMATTED_STRING',
+							description: "As displayed in Google Sheets, e.g. '01/01/2022'",
+						},
+						{
+							name: 'Serial Number',
+							value: 'SERIAL_NUMBER',
+							description: 'A number representing the number of days since Dec 30, 1899',
+						},
+					],
+				},
+			],
+		},
+	],
+};
 
-export const handlingExtraData: INodeProperties[] = [
-	{
-		// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
-		displayName: 'Handling extra fields in input',
-		name: 'handlingExtraData',
-		type: 'options',
-		options: [
-			{
-				name: 'Insert in New Column(s)',
-				value: 'insertInNewColumn',
-				description: 'Create a new column for extra data',
-			},
-			{
-				name: 'Ignore Them',
-				value: 'ignoreIt',
-				description: 'Ignore extra data',
-			},
-			{
-				name: 'Error',
-				value: 'error',
-				description: 'Throw an error',
-			},
-		],
-		displayOptions: {
-			show: {
-				'/dataMode': ['autoMapInputData'],
-			},
+export const cellFormat: INodeProperties = {
+	displayName: 'Cell Format',
+	name: 'cellFormat',
+	type: 'options',
+	options: [
+		{
+			// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+			name: 'Let Google Sheets format',
+			value: 'USER_ENTERED',
+			description: 'Cells are styled as if you typed the values into Google Sheets directly',
+		},
+		{
+			// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+			name: 'Let n8n format',
+			value: 'RAW',
+			description: 'Cells have the same types as the input data',
+		},
+	],
+	default: 'USER_ENTERED',
+	description: 'Determines how data should be interpreted',
+};
+
+export const handlingExtraData: INodeProperties = {
+	// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+	displayName: 'Handling extra fields in input',
+	name: 'handlingExtraData',
+	type: 'options',
+	options: [
+		{
+			name: 'Insert in New Column(s)',
+			value: 'insertInNewColumn',
+			description: 'Create a new column for extra data',
+		},
+		{
+			name: 'Ignore Them',
+			value: 'ignoreIt',
+			description: 'Ignore extra data',
+		},
+		{
+			name: 'Error',
+			value: 'error',
+			description: 'Throw an error',
+		},
+	],
+	displayOptions: {
+		show: {
+			'/dataMode': ['autoMapInputData'],
 		},
-		default: 'insertInNewColumn',
-		description: "What do to with fields that don't match any columns in the Google Sheet",
 	},
-];
+	default: 'insertInNewColumn',
+	description: "What do to with fields that don't match any columns in the Google Sheet",
+};
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 2b3d024581f62..7dd880fb521b7 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
@@ -3,6 +3,7 @@ import type { SheetProperties } from '../../helpers/GoogleSheets.types';
 import { apiRequest } from '../../transport';
 import type { GoogleSheet } from '../../helpers/GoogleSheet';
 import { getExistingSheetNames, hexToRgb } from '../../helpers/GoogleSheets.utils';
+import { wrapData } from '../../../../../../utils/utilities';
 
 export const description: SheetProperties = [
 	{
@@ -78,7 +79,7 @@ export async function execute(
 	sheetName: string,
 ): Promise<INodeExecutionData[]> {
 	let responseData;
-	const returnData: IDataObject[] = [];
+	const returnData: INodeExecutionData[] = [];
 	const items = this.getInputData();
 
 	const existingSheetNames = await getExistingSheetNames(sheet);
@@ -120,7 +121,12 @@ export async function execute(
 
 		existingSheetNames.push(sheetTitle);
 
-		returnData.push(responseData as IDataObject);
+		const executionData = this.helpers.constructExecutionMetaData(
+			wrapData(responseData as IDataObject[]),
+			{ itemData: { item: i } },
+		);
+
+		returnData.push(...executionData);
 	}
-	return this.helpers.returnJsonArray(returnData);
+	return returnData;
 }
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 42ec063c5e897..8edd179d0e2e2 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
@@ -2,6 +2,7 @@ import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-wor
 import type { SheetProperties } from '../../helpers/GoogleSheets.types';
 import type { GoogleSheet } from '../../helpers/GoogleSheet';
 import { getColumnNumber, untilSheetSelected } from '../../helpers/GoogleSheets.utils';
+import { generatePairedItemData, wrapData } from '../../../../../../utils/utilities';
 
 export const description: SheetProperties = [
 	{
@@ -164,5 +165,10 @@ export async function execute(
 		await sheet.spreadsheetBatchUpdate(requests);
 	}
 
-	return this.helpers.returnJsonArray({ success: true });
+	const itemData = generatePairedItemData(this.getInputData().length);
+	const returnData = this.helpers.constructExecutionMetaData(wrapData({ success: true }), {
+		itemData,
+	});
+
+	return returnData;
 }
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 b4b64d1786f2f..9650e73a4ae77 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
@@ -1,11 +1,15 @@
-import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IDataObject,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
 import type { GoogleSheet } from '../../helpers/GoogleSheet';
 import {
 	getRangeString,
 	prepareSheetData,
 	untilSheetSelected,
 } from '../../helpers/GoogleSheets.utils';
-import { dataLocationOnSheet, outputFormatting } from './commonDescription';
 import type {
 	ILookupValues,
 	RangeDetectionOptions,
@@ -14,6 +18,29 @@ import type {
 	ValueRenderOption,
 } from '../../helpers/GoogleSheets.types';
 
+import { dataLocationOnSheet, outputFormatting } from './commonDescription';
+
+const combineFiltersOptions: INodeProperties = {
+	displayName: 'Combine Filters',
+	name: 'combineFilters',
+	type: 'options',
+	description:
+		'How to combine the conditions defined in "Filters": AND requires all conditions to be true, OR requires at least one condition to be true',
+	options: [
+		{
+			name: 'AND',
+			value: 'AND',
+			description: 'Only rows that meet all the conditions are selected',
+		},
+		{
+			name: 'OR',
+			value: 'OR',
+			description: 'Rows that meet at least one condition are selected',
+		},
+	],
+	default: 'AND',
+};
+
 export const description: SheetProperties = [
 	{
 		displayName: 'Filters',
@@ -63,6 +90,33 @@ export const description: SheetProperties = [
 			},
 		},
 	},
+	{
+		...combineFiltersOptions,
+		default: 'OR',
+		displayOptions: {
+			show: {
+				'@version': [{ _cnd: { lt: 4.3 } }],
+				resource: ['sheet'],
+				operation: ['read'],
+			},
+			hide: {
+				...untilSheetSelected,
+			},
+		},
+	},
+	{
+		...combineFiltersOptions,
+		displayOptions: {
+			show: {
+				'@version': [{ _cnd: { gte: 4.3 } }],
+				resource: ['sheet'],
+				operation: ['read'],
+			},
+			hide: {
+				...untilSheetSelected,
+			},
+		},
+	},
 	{
 		displayName: 'Options',
 		name: 'options',
@@ -79,8 +133,8 @@ export const description: SheetProperties = [
 			},
 		},
 		options: [
-			...dataLocationOnSheet,
-			...outputFormatting,
+			dataLocationOnSheet,
+			outputFormatting,
 			{
 				displayName: 'When Filter Has Multiple Matches',
 				name: 'returnAllMatches',
@@ -110,60 +164,98 @@ export async function execute(
 	sheet: GoogleSheet,
 	sheetName: string,
 ): Promise<INodeExecutionData[]> {
-	const options = this.getNodeParameter('options', 0, {});
-	const outputFormattingOption =
-		((options.outputFormatting as IDataObject)?.values as IDataObject) || {};
-
-	const dataLocationOnSheetOptions =
-		((options.dataLocationOnSheet as IDataObject)?.values as RangeDetectionOptions) || {};
+	const items = this.getInputData();
+	const nodeVersion = this.getNode().typeVersion;
+	let length = 1;
 
-	if (dataLocationOnSheetOptions.rangeDefinition === undefined) {
-		dataLocationOnSheetOptions.rangeDefinition = 'detectAutomatically';
+	if (nodeVersion > 4.1) {
+		length = items.length;
 	}
 
-	const range = getRangeString(sheetName, dataLocationOnSheetOptions);
+	const returnData: INodeExecutionData[] = [];
 
-	const valueRenderMode = (outputFormattingOption.general ||
-		'UNFORMATTED_VALUE') as ValueRenderOption;
-	const dateTimeRenderOption = (outputFormattingOption.date || 'FORMATTED_STRING') as string;
+	for (let itemIndex = 0; itemIndex < length; itemIndex++) {
+		const options = this.getNodeParameter('options', itemIndex, {});
+		const outputFormattingOption =
+			((options.outputFormatting as IDataObject)?.values as IDataObject) || {};
 
-	const sheetData = (await sheet.getData(
-		range,
-		valueRenderMode,
-		dateTimeRenderOption,
-	)) as SheetRangeData;
+		const dataLocationOnSheetOptions =
+			((options.dataLocationOnSheet as IDataObject)?.values as RangeDetectionOptions) || {};
 
-	if (sheetData === undefined || sheetData.length === 0) {
-		return [];
-	}
+		if (dataLocationOnSheetOptions.rangeDefinition === undefined) {
+			dataLocationOnSheetOptions.rangeDefinition = 'detectAutomatically';
+		}
+
+		const range = getRangeString(sheetName, dataLocationOnSheetOptions);
+
+		const valueRenderMode = (outputFormattingOption.general ||
+			'UNFORMATTED_VALUE') as ValueRenderOption;
+		const dateTimeRenderOption = (outputFormattingOption.date || 'FORMATTED_STRING') as string;
+
+		const sheetData = (await sheet.getData(
+			range,
+			valueRenderMode,
+			dateTimeRenderOption,
+		)) as SheetRangeData;
 
-	const { data, headerRow, firstDataRow } = prepareSheetData(sheetData, dataLocationOnSheetOptions);
+		if (sheetData === undefined || sheetData.length === 0) {
+			return [];
+		}
+
+		const { data, headerRow, firstDataRow } = prepareSheetData(
+			sheetData,
+			dataLocationOnSheetOptions,
+		);
 
-	let returnData = [];
+		let responseData = [];
 
-	const lookupValues = this.getNodeParameter('filtersUI.values', 0, []) as ILookupValues[];
+		const lookupValues = this.getNodeParameter(
+			'filtersUI.values',
+			itemIndex,
+			[],
+		) as ILookupValues[];
 
-	if (lookupValues.length) {
-		const returnAllMatches = options.returnAllMatches === 'returnAllMatches' ? true : false;
+		if (lookupValues.length) {
+			const returnAllMatches = options.returnAllMatches === 'returnAllMatches' ? true : false;
 
-		const items = this.getInputData();
-		for (let i = 1; i < items.length; i++) {
-			const itemLookupValues = this.getNodeParameter('filtersUI.values', i, []) as ILookupValues[];
-			if (itemLookupValues.length) {
-				lookupValues.push(...itemLookupValues);
+			if (nodeVersion <= 4.1) {
+				for (let i = 1; i < items.length; i++) {
+					const itemLookupValues = this.getNodeParameter(
+						'filtersUI.values',
+						i,
+						[],
+					) as ILookupValues[];
+					if (itemLookupValues.length) {
+						lookupValues.push(...itemLookupValues);
+					}
+				}
 			}
+
+			const combineFilters = this.getNodeParameter('combineFilters', itemIndex, 'OR') as
+				| 'AND'
+				| 'OR';
+
+			responseData = await sheet.lookupValues(
+				data as string[][],
+				headerRow,
+				firstDataRow,
+				lookupValues,
+				returnAllMatches,
+				combineFilters,
+			);
+		} else {
+			responseData = sheet.structureArrayDataByColumn(data as string[][], headerRow, firstDataRow);
 		}
 
-		returnData = await sheet.lookupValues(
-			data as string[][],
-			headerRow,
-			firstDataRow,
-			lookupValues,
-			returnAllMatches,
+		returnData.push(
+			...responseData.map((item) => {
+				return {
+					json: item,
+					pairedItem: { item: itemIndex },
+				};
+			}),
 		);
-	} else {
-		returnData = sheet.structureArrayDataByColumn(data as string[][], headerRow, firstDataRow);
 	}
 
-	return this.helpers.returnJsonArray(returnData);
+	return returnData;
 }
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 7c856d2621bab..13e7fa348638b 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,13 +1,14 @@
 import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 import { apiRequest } from '../../transport';
 import type { GoogleSheet } from '../../helpers/GoogleSheet';
+import { wrapData } from '../../../../../../utils/utilities';
 
 export async function execute(
 	this: IExecuteFunctions,
-	sheet: GoogleSheet,
+	_sheet: GoogleSheet,
 	sheetName: string,
 ): Promise<INodeExecutionData[]> {
-	const returnData: IDataObject[] = [];
+	const returnData: INodeExecutionData[] = [];
 	const items = this.getInputData();
 	for (let i = 0; i < items.length; i++) {
 		const [spreadsheetId, sheetWithinDocument] = sheetName.split('||');
@@ -26,8 +27,14 @@ export async function execute(
 			{ requests },
 		);
 		delete responseData.replies;
-		returnData.push(responseData as IDataObject);
+
+		const executionData = this.helpers.constructExecutionMetaData(
+			wrapData(responseData as IDataObject[]),
+			{ itemData: { item: i } },
+		);
+
+		returnData.push(...executionData);
 	}
 
-	return this.helpers.returnJsonArray(returnData);
+	return returnData;
 }
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 499cd0fb8f11d..658d8ffcdd179 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,13 +1,13 @@
 import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
+import { NodeOperationError } from 'n8n-workflow';
 import type {
 	ISheetUpdateData,
 	SheetProperties,
 	ValueInputOption,
 	ValueRenderOption,
 } from '../../helpers/GoogleSheets.types';
-import { NodeOperationError } from 'n8n-workflow';
 import type { GoogleSheet } from '../../helpers/GoogleSheet';
-import { untilSheetSelected } from '../../helpers/GoogleSheets.utils';
+import { cellFormatDefault, untilSheetSelected } from '../../helpers/GoogleSheets.utils';
 import { cellFormat, handlingExtraData, locationDefine } from './commonDescription';
 
 export const description: SheetProperties = [
@@ -36,6 +36,7 @@ export const description: SheetProperties = [
 			show: {
 				resource: ['sheet'],
 				operation: ['update'],
+				'@version': [3],
 			},
 			hide: {
 				...untilSheetSelected,
@@ -61,6 +62,7 @@ export const description: SheetProperties = [
 			show: {
 				resource: ['sheet'],
 				operation: ['update'],
+				'@version': [3],
 			},
 			hide: {
 				...untilSheetSelected,
@@ -77,6 +79,7 @@ export const description: SheetProperties = [
 				resource: ['sheet'],
 				operation: ['update'],
 				dataMode: ['defineBelow'],
+				'@version': [3],
 			},
 			hide: {
 				...untilSheetSelected,
@@ -96,6 +99,7 @@ export const description: SheetProperties = [
 				resource: ['sheet'],
 				operation: ['update'],
 				dataMode: ['defineBelow'],
+				'@version': [3],
 			},
 			hide: {
 				...untilSheetSelected,
@@ -141,6 +145,40 @@ export const description: SheetProperties = [
 			},
 		],
 	},
+	{
+		displayName: 'Columns',
+		name: 'columns',
+		type: 'resourceMapper',
+		noDataExpression: true,
+		default: {
+			mappingMode: 'defineBelow',
+			value: null,
+		},
+		required: true,
+		typeOptions: {
+			loadOptionsDependsOn: ['sheetName.value'],
+			resourceMapper: {
+				resourceMapperMethod: 'getMappingColumns',
+				mode: 'update',
+				fieldWords: {
+					singular: 'column',
+					plural: 'columns',
+				},
+				addAllFields: true,
+				multiKeyMatch: false,
+			},
+		},
+		displayOptions: {
+			show: {
+				resource: ['sheet'],
+				operation: ['update'],
+				'@version': [{ _cnd: { gte: 4 } }],
+			},
+			hide: {
+				...untilSheetSelected,
+			},
+		},
+	},
 	{
 		displayName: 'Options',
 		name: 'options',
@@ -156,7 +194,15 @@ export const description: SheetProperties = [
 				...untilSheetSelected,
 			},
 		},
-		options: [...cellFormat, ...locationDefine, ...handlingExtraData],
+		options: [
+			cellFormat,
+			locationDefine,
+			handlingExtraData,
+			{
+				...handlingExtraData,
+				displayOptions: { show: { '/columns.mappingMode': ['autoMapInputData'] } },
+			},
+		],
 	},
 ];
 
@@ -166,9 +212,16 @@ export async function execute(
 	sheetName: string,
 ): Promise<INodeExecutionData[]> {
 	const items = this.getInputData();
-	const valueInputMode = this.getNodeParameter('options.cellFormat', 0, 'RAW') as ValueInputOption;
+	const nodeVersion = this.getNode().typeVersion;
+
 	const range = `${sheetName}!A:Z`;
 
+	const valueInputMode = this.getNodeParameter(
+		'options.cellFormat',
+		0,
+		cellFormatDefault(nodeVersion),
+	) as ValueInputOption;
+
 	const options = this.getNodeParameter('options', 0, {});
 
 	const valueRenderMode = (options.valueRenderMode || 'UNFORMATTED_VALUE') as ValueRenderOption;
@@ -191,7 +244,7 @@ export async function execute(
 
 	const sheetData = await sheet.getData(sheetName, 'FORMATTED_VALUE');
 
-	if (sheetData === undefined || sheetData[headerRow] === undefined) {
+	if (sheetData?.[headerRow] === undefined) {
 		throw new NodeOperationError(
 			this.getNode(),
 			`Could not retrieve the column names from row ${headerRow + 1}`,
@@ -201,9 +254,20 @@ export async function execute(
 	columnNames = sheetData[headerRow];
 	const newColumns = new Set<string>();
 
-	const columnToMatchOn = this.getNodeParameter('columnToMatchOn', 0) as string;
-	const keyIndex = columnNames.indexOf(columnToMatchOn);
+	const columnsToMatchOn: string[] =
+		nodeVersion < 4
+			? [this.getNodeParameter('columnToMatchOn', 0) as string]
+			: (this.getNodeParameter('columns.matchingColumns', 0) as string[]);
+
+	const dataMode =
+		nodeVersion < 4
+			? (this.getNodeParameter('dataMode', 0) as string)
+			: (this.getNodeParameter('columns.mappingMode', 0) as string);
 
+	// TODO: Add support for multiple columns to match on in the next overhaul
+	const keyIndex = columnNames.indexOf(columnsToMatchOn[0]);
+
+	//not used when updating row
 	const columnValues = await sheet.getColumnValues(
 		range,
 		keyIndex,
@@ -214,12 +278,24 @@ export async function execute(
 
 	const updateData: ISheetUpdateData[] = [];
 
-	for (let i = 0; i < items.length; i++) {
-		const dataMode = this.getNodeParameter('dataMode', i) as
-			| 'defineBelow'
-			| 'autoMapInputData'
-			| 'nothing';
+	const mappedValues: IDataObject[] = [];
+
+	const errorOnUnexpectedColumn = (key: string, i: number) => {
+		if (!columnNames.includes(key)) {
+			throw new NodeOperationError(this.getNode(), 'Unexpected fields in node input', {
+				itemIndex: i,
+				description: `The input field '${key}' doesn't match any column in the Sheet. You can ignore this by changing the 'Handling extra data' field, which you can find under 'Options'.`,
+			});
+		}
+	};
+
+	const addNewColumn = (key: string) => {
+		if (!columnNames.includes(key)) {
+			newColumns.add(key);
+		}
+	};
 
+	for (let i = 0; i < items.length; i++) {
 		if (dataMode === 'nothing') continue;
 
 		const data: IDataObject[] = [];
@@ -229,75 +305,96 @@ export async function execute(
 			if (handlingExtraDataOption === 'ignoreIt') {
 				data.push(items[i].json);
 			}
-			if (handlingExtraDataOption === 'error') {
-				Object.keys(items[i].json).forEach((key) => {
-					if (!columnNames.includes(key)) {
-						throw new NodeOperationError(this.getNode(), 'Unexpected fields in node input', {
-							itemIndex: i,
-							description: `The input field '${key}' doesn't match any column in the Sheet. You can ignore this by changing the 'Handling extra data' field, which you can find under 'Options'.`,
-						});
-					}
-				});
+			if (handlingExtraDataOption === 'error' && columnsToMatchOn[0] !== 'row_number') {
+				Object.keys(items[i].json).forEach((key) => errorOnUnexpectedColumn(key, i));
 				data.push(items[i].json);
 			}
-			if (handlingExtraDataOption === 'insertInNewColumn') {
-				Object.keys(items[i].json).forEach((key) => {
-					if (!columnNames.includes(key)) {
-						newColumns.add(key);
-					}
-				});
+			if (handlingExtraDataOption === 'insertInNewColumn' && columnsToMatchOn[0] !== 'row_number') {
+				Object.keys(items[i].json).forEach(addNewColumn);
 				data.push(items[i].json);
 			}
 		} else {
-			const valueToMatchOn = this.getNodeParameter('valueToMatchOn', i) as string;
-
-			const valuesToSend = this.getNodeParameter('fieldsUi.values', i, []) as IDataObject[];
-			if (!valuesToSend?.length) {
-				throw new NodeOperationError(
-					this.getNode(),
-					"At least one value has to be added under 'Values to Send'",
-				);
-			}
-			const fields = valuesToSend.reduce((acc, entry) => {
-				if (entry.column === 'newColumn') {
-					const columnName = entry.columnName as string;
-
-					if (!columnNames.includes(columnName)) {
-						newColumns.add(columnName);
-					}
+			const valueToMatchOn =
+				nodeVersion < 4
+					? (this.getNodeParameter('valueToMatchOn', i) as string)
+					: (this.getNodeParameter(`columns.value[${columnsToMatchOn[0]}]`, i) as string);
 
-					acc[columnName] = entry.fieldValue as string;
-				} else {
-					acc[entry.column as string] = entry.fieldValue as string;
+			if (nodeVersion < 4) {
+				const valuesToSend = this.getNodeParameter('fieldsUi.values', i, []) as IDataObject[];
+				if (!valuesToSend?.length) {
+					throw new NodeOperationError(
+						this.getNode(),
+						"At least one value has to be added under 'Values to Send'",
+					);
 				}
-				return acc;
-			}, {} as IDataObject);
+				// eslint-disable-next-line @typescript-eslint/no-loop-func
+				const fields = valuesToSend.reduce((acc, entry) => {
+					if (entry.column === 'newColumn') {
+						const columnName = entry.columnName as string;
+
+						if (!columnNames.includes(columnName)) {
+							newColumns.add(columnName);
+						}
+
+						acc[columnName] = entry.fieldValue as string;
+					} else {
+						acc[entry.column as string] = entry.fieldValue as string;
+					}
+					return acc;
+				}, {} as IDataObject);
 
-			fields[columnToMatchOn] = valueToMatchOn;
+				fields[columnsToMatchOn[0]] = valueToMatchOn;
 
-			data.push(fields);
+				data.push(fields);
+			} else {
+				const mappingValues = this.getNodeParameter('columns.value', i) as IDataObject;
+				if (Object.keys(mappingValues).length === 0) {
+					throw new NodeOperationError(
+						this.getNode(),
+						"At least one value has to be added under 'Values to Send'",
+					);
+				}
+				// Setting empty values to empty string so that they are not ignored by the API
+				Object.keys(mappingValues).forEach((key) => {
+					if (mappingValues[key] === undefined || mappingValues[key] === null) {
+						mappingValues[key] = '';
+					}
+				});
+				data.push(mappingValues);
+				mappedValues.push(mappingValues);
+			}
 		}
 
 		if (newColumns.size) {
+			const newColumnNames = columnNames.concat([...newColumns]);
 			await sheet.updateRows(
 				sheetName,
-				[columnNames.concat([...newColumns])],
-				(options.cellFormat as ValueInputOption) || 'RAW',
+				[newColumnNames],
+				(options.cellFormat as ValueInputOption) || cellFormatDefault(nodeVersion),
 				headerRow + 1,
 			);
+			columnNames = newColumnNames;
+			newColumns.clear();
 		}
 
-		const preparedData = await sheet.prepareDataForUpdateOrUpsert(
-			data,
-			columnToMatchOn,
-			range,
-			headerRow,
-			firstDataRow,
-			valueRenderMode,
-			false,
-			[columnNames.concat([...newColumns])],
-			columnValues,
-		);
+		let preparedData;
+		if (columnsToMatchOn[0] === 'row_number') {
+			preparedData = sheet.prepareDataForUpdatingByRowNumber(data, range, [
+				columnNames.concat([...newColumns]),
+			]);
+		} else {
+			preparedData = await sheet.prepareDataForUpdateOrUpsert(
+				data,
+				columnsToMatchOn[0],
+				range,
+				headerRow,
+				firstDataRow,
+				valueRenderMode,
+				false,
+				[columnNames.concat([...newColumns])],
+				columnValues,
+			);
+		}
 
 		updateData.push(...preparedData.updateData);
 	}
@@ -306,5 +403,20 @@ export async function execute(
 		await sheet.batchUpdate(updateData, valueInputMode);
 	}
 
-	return items;
+	if (nodeVersion < 4 || dataMode === 'autoMapInputData') {
+		return items;
+	} else {
+		if (!updateData.length) {
+			return [];
+		}
+
+		const returnData: INodeExecutionData[] = [];
+		for (const [index, entry] of mappedValues.entries()) {
+			returnData.push({
+				json: entry,
+				pairedItem: { item: index },
+			});
+		}
+		return returnData;
+	}
 }
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 f7243fa9c1e22..c0e7f3acfa8c3 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,6 +1,6 @@
+import type { INodeProperties } from 'n8n-workflow';
 import * as create from './create.operation';
 import * as deleteSpreadsheet from './delete.operation';
-import type { INodeProperties } from 'n8n-workflow';
 
 export { create, deleteSpreadsheet };
 
@@ -20,13 +20,13 @@ export const descriptions: INodeProperties[] = [
 				name: 'Create',
 				value: 'create',
 				description: 'Create a spreadsheet',
-				action: 'Create a spreadsheet',
+				action: 'Create spreadsheet',
 			},
 			{
 				name: 'Delete',
 				value: 'deleteSpreadsheet',
 				description: 'Delete a spreadsheet',
-				action: 'Delete a spreadsheet',
+				action: 'Delete spreadsheet',
 			},
 		],
 		default: 'create',
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 d1e93c717104d..155203e3761dd 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,6 +1,7 @@
 import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 import type { SpreadSheetProperties } from '../../helpers/GoogleSheets.types';
 import { apiRequest } from '../../transport';
+import { wrapData } from '../../../../../../utils/utilities';
 
 export const description: SpreadSheetProperties = [
 	{
@@ -115,7 +116,7 @@ export const description: SpreadSheetProperties = [
 
 export async function execute(this: IExecuteFunctions): Promise<INodeExecutionData[]> {
 	const items = this.getInputData();
-	const returnData: IDataObject[] = [];
+	const returnData: INodeExecutionData[] = [];
 
 	for (let i = 0; i < items.length; i++) {
 		const title = this.getNodeParameter('title', i) as string;
@@ -145,8 +146,14 @@ export async function execute(this: IExecuteFunctions): Promise<INodeExecutionDa
 		body.properties.locale = options.locale ? (options.locale as string) : undefined;
 
 		const response = await apiRequest.call(this, 'POST', '/v4/spreadsheets', body);
-		returnData.push(response as IDataObject);
+
+		const executionData = this.helpers.constructExecutionMetaData(
+			wrapData(response as IDataObject),
+			{ itemData: { item: i } },
+		);
+
+		returnData.push(...executionData);
 	}
 
-	return this.helpers.returnJsonArray(returnData);
+	return returnData;
 }
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 787b6412f6d9f..1991b0c17d1d5 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,20 +1,10 @@
-import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 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 = [
-	// {
-	// 	displayName: 'Spreadsheet ID',
-	// 	name: 'spreadsheetId',
-	// 	type: 'string',
-	// 	default: '',
-	// 	displayOptions: {
-	// 		show: {
-	// 			resource: ['spreadsheet'],
-	// 			operation: ['deleteSpreadsheet'],
-	// 		},
-	// 	},
-	// },
 	{
 		displayName: 'Document',
 		name: 'documentId',
@@ -37,15 +27,13 @@ export const description: SpreadSheetProperties = [
 				type: 'string',
 				extractValue: {
 					type: 'regex',
-					regex:
-						'https:\\/\\/(?:drive|docs)\\.google\\.com\\/\\w+\\/d\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)',
+					regex: GOOGLE_DRIVE_FILE_URL_REGEX,
 				},
 				validation: [
 					{
 						type: 'regex',
 						properties: {
-							regex:
-								'https:\\/\\/(?:drive|docs)\\.google.com\\/\\w+\\/d\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)',
+							regex: GOOGLE_DRIVE_FILE_URL_REGEX,
 							errorMessage: 'Not a valid Google Drive File URL',
 						},
 					},
@@ -78,7 +66,7 @@ export const description: SpreadSheetProperties = [
 
 export async function execute(this: IExecuteFunctions): Promise<INodeExecutionData[]> {
 	const items = this.getInputData();
-	const returnData: IDataObject[] = [];
+	const returnData: INodeExecutionData[] = [];
 
 	for (let i = 0; i < items.length; i++) {
 		// const spreadsheetId = this.getNodeParameter('spreadsheetId', i) as string;
@@ -95,8 +83,12 @@ export async function execute(this: IExecuteFunctions): Promise<INodeExecutionDa
 			`https://www.googleapis.com/drive/v3/files/${documentId}`,
 		);
 
-		returnData.push({ success: true });
+		const executionData = this.helpers.constructExecutionMetaData(wrapData({ success: true }), {
+			itemData: { item: i },
+		});
+
+		returnData.push(...executionData);
 	}
 
-	return this.helpers.returnJsonArray(returnData);
+	return returnData;
 }
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/actions/versionDescription.ts b/packages/nodes-base/nodes/Google/Sheet/v2/actions/versionDescription.ts
index 7150997dbfa93..8bb6064f49a67 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/versionDescription.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/versionDescription.ts
@@ -9,7 +9,7 @@ export const versionDescription: INodeTypeDescription = {
 	name: 'googleSheets',
 	icon: 'file:googleSheets.svg',
 	group: ['input', 'output'],
-	version: 3,
+	version: [3, 4, 4.1, 4.2, 4.3],
 	subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
 	description: 'Read, update and write data to Google Sheets',
 	defaults: {
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 dfc1d4fe58df8..993c49a0ffc4b 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/helpers/GoogleSheet.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/helpers/GoogleSheet.ts
@@ -1,23 +1,26 @@
+import get from 'lodash/get';
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	ILoadOptionsFunctions,
-	IDataObject,
+	INode,
 	IPollFunctions,
 } from 'n8n-workflow';
-import { NodeOperationError } from 'n8n-workflow';
-import { apiRequest } from '../transport';
+import { ApplicationError, NodeOperationError } from 'n8n-workflow';
 import { utils as xlsxUtils } from 'xlsx';
-import get from 'lodash.get';
+import { apiRequest } from '../transport';
 import type {
 	ILookupValues,
 	ISheetUpdateData,
+	ResourceLocator,
 	SheetCellDecoded,
 	SheetRangeData,
 	SheetRangeDecoded,
+	SpreadSheetResponse,
 	ValueInputOption,
 	ValueRenderOption,
 } from './GoogleSheets.types';
-import { removeEmptyColumns } from './GoogleSheets.utils';
+import { getSheetId, removeEmptyColumns } from './GoogleSheets.utils';
 
 export class GoogleSheet {
 	id: string;
@@ -44,7 +47,8 @@ export class GoogleSheet {
 			const [sheet, ranges] = range.split('!');
 			return `${encodeURIComponent(sheet)}!${ranges}`;
 		}
-		return encodeURIComponent(range);
+		// Use '' so that sheet is not interpreted as range
+		return encodeURIComponent(`'${range}'`);
 	}
 
 	/**
@@ -114,28 +118,32 @@ export class GoogleSheet {
 	}
 
 	/**
-	 *  Returns the name of a sheet from a sheet id
+	 *  Returns the sheet within a spreadsheet based on name or ID
 	 */
-	async spreadsheetGetSheetNameById(sheetId: string) {
+	async spreadsheetGetSheet(node: INode, mode: ResourceLocator, value: string) {
 		const query = {
 			fields: 'sheets.properties',
 		};
 
-		const response = await apiRequest.call(
+		const response = (await apiRequest.call(
 			this.executeFunctions,
 			'GET',
 			`/v4/spreadsheets/${this.id}`,
 			{},
 			query,
-		);
+		)) as SpreadSheetResponse;
+
+		const foundItem = response.sheets.find((item) => {
+			if (mode === 'name') return item.properties.title === value;
+			return item.properties.sheetId === getSheetId(value);
+		});
 
-		const foundItem = response.sheets.find(
-			(item: { properties: { sheetId: number } }) => item.properties.sheetId === +sheetId,
-		);
 		if (!foundItem?.properties?.title) {
-			throw new Error(`Sheet with id ${sheetId} not found`);
+			const error = new Error(`Sheet with ${mode === 'name' ? 'name' : 'ID'} ${value} not found`);
+			throw new NodeOperationError(node, error, { level: 'warning' });
 		}
-		return foundItem.properties.title;
+
+		return foundItem.properties;
 	}
 
 	/**
@@ -220,7 +228,9 @@ export class GoogleSheet {
 		}
 
 		if (requests.length === 0) {
-			throw new Error('Must specify at least one column or row to add');
+			throw new ApplicationError('Must specify at least one column or row to add', {
+				level: 'warning',
+			});
 		}
 
 		const response = await apiRequest.call(
@@ -241,24 +251,8 @@ export class GoogleSheet {
 		data: string[][],
 		valueInputMode: ValueInputOption,
 		lastRow?: number,
+		useAppend?: boolean,
 	) {
-		// const body = {
-		// 	range,
-		// 	values: data,
-		// };
-
-		// const query = {
-		// 	valueInputOption: valueInputMode,
-		// };
-
-		// const response = await apiRequest.call(
-		// 	this.executeFunctions,
-		// 	'POST',
-		// 	`/v4/spreadsheets/${this.id}/values/${this.encodeRange(range)}:append`,
-		// 	body,
-		// 	query,
-		// );
-
 		const lastRowWithData =
 			lastRow ||
 			(((await this.getData(range, 'UNFORMATTED_VALUE')) as string[][]) || []).length + 1;
@@ -269,6 +263,7 @@ export class GoogleSheet {
 			valueInputMode,
 			lastRowWithData,
 			data.length,
+			useAppend,
 		);
 
 		return response;
@@ -280,6 +275,7 @@ export class GoogleSheet {
 		valueInputMode: ValueInputOption,
 		row: number,
 		rowsLength?: number,
+		useAppend?: boolean,
 	) {
 		const [name, _sheetRange] = sheetName.split('!');
 		const range = `${name}!${row}:${rowsLength ? row + rowsLength - 1 : row}`;
@@ -293,13 +289,25 @@ export class GoogleSheet {
 			valueInputOption: valueInputMode,
 		};
 
-		const response = await apiRequest.call(
-			this.executeFunctions,
-			'PUT',
-			`/v4/spreadsheets/${this.id}/values/${this.encodeRange(range)}`,
-			body,
-			query,
-		);
+		let response;
+
+		if (useAppend) {
+			response = await apiRequest.call(
+				this.executeFunctions,
+				'POST',
+				`/v4/spreadsheets/${this.id}/values/${this.encodeRange(range)}:append`,
+				body,
+				query,
+			);
+		} else {
+			response = await apiRequest.call(
+				this.executeFunctions,
+				'PUT',
+				`/v4/spreadsheets/${this.id}/values/${this.encodeRange(range)}`,
+				body,
+				query,
+			);
+		}
 
 		return response;
 	}
@@ -380,6 +388,7 @@ export class GoogleSheet {
 		usePathForKeyRow: boolean,
 		columnNamesList?: string[][],
 		lastRow?: number,
+		useAppend?: boolean,
 	): Promise<string[][]> {
 		const data = await this.convertObjectArrayToSheetDataArray(
 			inputData,
@@ -387,8 +396,9 @@ export class GoogleSheet {
 			keyRowIndex,
 			usePathForKeyRow,
 			columnNamesList,
+			useAppend ? null : '',
 		);
-		return this.appendData(range, data, valueInputMode, lastRow);
+		return await this.appendData(range, data, valueInputMode, lastRow, useAppend);
 	}
 
 	getColumnWithOffset(startColumn: string, offset: number): string {
@@ -466,7 +476,7 @@ export class GoogleSheet {
 
 		const keyIndex = columnNames.indexOf(indexKey);
 
-		if (keyIndex === -1) {
+		if (keyIndex === -1 && !upsert) {
 			throw new NodeOperationError(
 				this.executeFunctions.getNode(),
 				`Could not find column for key "${indexKey}"`,
@@ -552,10 +562,57 @@ export class GoogleSheet {
 		return { updateData, appendData };
 	}
 
+	/**
+	 * Updates data in a sheet
+	 *
+	 * @param {IDataObject[]} inputData Data to update Sheet with
+	 * @param {string} range The range to look for data
+	 * @param {number} dataStartRowIndex Index of the first row which contains data
+	 * @param {string[][]} columnNamesList The column names to use
+	 * @returns {Promise<string[][]>}
+	 * @memberof GoogleSheet
+	 */
+	prepareDataForUpdatingByRowNumber(
+		inputData: IDataObject[],
+		range: string,
+		columnNamesList: string[][],
+	) {
+		const decodedRange = this.getDecodedSheetRange(range);
+		const columnNames = columnNamesList[0];
+		const updateData: ISheetUpdateData[] = [];
+
+		for (const item of inputData) {
+			const updateRowIndex = item.row_number as number;
+
+			for (const name of columnNames) {
+				if (name === 'row_number') continue;
+				if (item[name] === undefined || item[name] === null) continue;
+
+				const columnToUpdate = this.getColumnWithOffset(
+					decodedRange.start?.column || 'A',
+					columnNames.indexOf(name),
+				);
+
+				let updateValue = item[name] as string;
+				if (typeof updateValue === 'object') {
+					try {
+						updateValue = JSON.stringify(updateValue);
+					} catch (error) {}
+				}
+				updateData.push({
+					range: `${decodedRange.name}!${columnToUpdate}${updateRowIndex}`,
+					values: [[updateValue]],
+				});
+			}
+		}
+
+		return { updateData };
+	}
+
 	/**
 	 * Looks for a specific value in a column and if it gets found it returns the whole row
 	 *
-	 * @param {string[][]} inputData Data to to check for lookup value in
+	 * @param {string[][]} inputData Data to check for lookup value in
 	 * @param {number} keyRowIndex Index of the row which contains the keys
 	 * @param {number} dataStartRowIndex Index of the first row which contains data
 	 * @param {ILookupValues[]} lookupValues The lookup values which decide what data to return
@@ -569,6 +626,7 @@ export class GoogleSheet {
 		dataStartRowIndex: number,
 		lookupValues: ILookupValues[],
 		returnAllMatches?: boolean,
+		combineFilters: 'AND' | 'OR' = 'OR',
 	): Promise<IDataObject[]> {
 		const keys: string[] = [];
 
@@ -605,28 +663,65 @@ export class GoogleSheet {
 		// const returnData = [inputData[keyRowIndex]];
 		const returnData = [keys];
 
-		lookupLoop: for (const lookupValue of lookupValues) {
-			returnColumnIndex = keys.indexOf(lookupValue.lookupColumn);
+		if (combineFilters === 'OR') {
+			lookupLoop: for (const lookupValue of lookupValues) {
+				returnColumnIndex = keys.indexOf(lookupValue.lookupColumn);
 
-			if (returnColumnIndex === -1) {
-				throw new NodeOperationError(
-					this.executeFunctions.getNode(),
-					`The column "${lookupValue.lookupColumn}" could not be found`,
-				);
+				if (returnColumnIndex === -1) {
+					throw new NodeOperationError(
+						this.executeFunctions.getNode(),
+						`The column "${lookupValue.lookupColumn}" could not be found`,
+					);
+				}
+
+				// Loop over all the items and find the one with the matching value
+				for (rowIndex = dataStartRowIndex; rowIndex < inputData.length; rowIndex++) {
+					if (
+						inputData[rowIndex][returnColumnIndex]?.toString() ===
+						lookupValue.lookupValue.toString()
+					) {
+						if (addedRows.indexOf(rowIndex) === -1) {
+							returnData.push(inputData[rowIndex]);
+							addedRows.push(rowIndex);
+						}
+
+						if (returnAllMatches !== true) {
+							continue lookupLoop;
+						}
+					}
+				}
 			}
+		} else {
+			lookupLoop: for (rowIndex = dataStartRowIndex; rowIndex < inputData.length; rowIndex++) {
+				let allMatch = true;
+
+				for (const lookupValue of lookupValues) {
+					returnColumnIndex = keys.indexOf(lookupValue.lookupColumn);
+
+					if (returnColumnIndex === -1) {
+						throw new NodeOperationError(
+							this.executeFunctions.getNode(),
+							`The column "${lookupValue.lookupColumn}" could not be found`,
+						);
+					}
+
+					if (
+						inputData[rowIndex][returnColumnIndex]?.toString() !==
+						lookupValue.lookupValue.toString()
+					) {
+						allMatch = false;
+						break;
+					}
+				}
 
-			// Loop over all the items and find the one with the matching value
-			for (rowIndex = dataStartRowIndex; rowIndex < inputData.length; rowIndex++) {
-				if (
-					inputData[rowIndex][returnColumnIndex]?.toString() === lookupValue.lookupValue.toString()
-				) {
+				if (allMatch) {
 					if (addedRows.indexOf(rowIndex) === -1) {
 						returnData.push(inputData[rowIndex]);
 						addedRows.push(rowIndex);
 					}
 
 					if (returnAllMatches !== true) {
-						continue lookupLoop;
+						break lookupLoop;
 					}
 				}
 			}
@@ -647,6 +742,7 @@ export class GoogleSheet {
 		keyRowIndex: number,
 		usePathForKeyRow: boolean,
 		columnNamesList?: string[][],
+		emptyValue: string | null = '',
 	): Promise<string[][]> {
 		const decodedRange = this.getDecodedSheetRange(range);
 
@@ -677,7 +773,7 @@ export class GoogleSheet {
 					value = item[key] as string;
 				}
 				if (value === undefined || value === null) {
-					rowData.push('');
+					rowData.push(emptyValue as string);
 					return;
 				}
 				if (typeof value === 'object') {
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/helpers/GoogleSheets.types.ts b/packages/nodes-base/nodes/Google/Sheet/v2/helpers/GoogleSheets.types.ts
index a55fc71ae4dd7..ef643d9953574 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/helpers/GoogleSheets.types.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/helpers/GoogleSheets.types.ts
@@ -62,12 +62,24 @@ export type GoogleSheetsSheet = Entity<GoogleSheetsMap, 'sheet'>;
 export type SpreadSheetProperties = PropertiesOf<GoogleSheetsSpreadSheet>;
 export type SheetProperties = PropertiesOf<GoogleSheetsSheet>;
 
-export type ResourceLocator = 'id' | 'url' | 'list';
+export type ResourceLocator = 'id' | 'url' | 'list' | 'name';
 
 export const ResourceLocatorUiNames = {
 	id: 'By ID',
 	url: 'By URL',
 	list: 'From List',
+	name: 'By Name',
+};
+
+type SpreadSheetResponseSheet = {
+	properties: {
+		title: string;
+		sheetId: number;
+	};
+};
+
+export type SpreadSheetResponse = {
+	sheets: SpreadSheetResponseSheet[];
 };
 
 export type SheetCellDecoded = {
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 74907f2277435..be64a34e83e81 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
@@ -4,6 +4,7 @@ import type {
 	INodeExecutionData,
 	INodeListSearchItems,
 	INodePropertyOptions,
+	INode,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 import type { GoogleSheet } from './GoogleSheet';
@@ -18,10 +19,16 @@ import { ResourceLocatorUiNames, ROW_NUMBER } from './GoogleSheets.types';
 export const untilSheetSelected = { sheetName: [''] };
 
 // Used to extract the ID from the URL
-export function getSpreadsheetId(documentIdType: ResourceLocator, value: string): string {
+export function getSpreadsheetId(
+	node: INode,
+	documentIdType: ResourceLocator,
+	value: string,
+): string {
 	if (!value) {
-		throw new Error(
+		throw new NodeOperationError(
+			node,
 			`Can not get sheet '${ResourceLocatorUiNames[documentIdType]}' with a value of '${value}'`,
+			{ level: 'warning' },
 		);
 	}
 	if (documentIdType === 'url') {
@@ -38,6 +45,11 @@ export function getSpreadsheetId(documentIdType: ResourceLocator, value: string)
 	return value;
 }
 
+export function getSheetId(value: string): number {
+	if (value === 'gid=0') return 0;
+	return parseInt(value);
+}
+
 // Convert number to Sheets / Excel column name
 export function getColumnName(colNumber: number): string {
 	const baseChar = 'A'.charCodeAt(0);
@@ -66,7 +78,6 @@ export function hexToRgb(hex: string) {
 	// Expand shorthand form (e.g. "03F") to full form (e.g. "0033FF")
 	const shorthandRegex = /^#?([a-f\d])([a-f\d])([a-f\d])$/i;
 	hex = hex.replace(shorthandRegex, (m, r, g, b) => {
-		// eslint-disable-next-line @typescript-eslint/restrict-plus-operands
 		return r + r + g + g + b + b;
 	});
 
@@ -102,7 +113,9 @@ export function trimToFirstEmptyRow(data: SheetRangeData, includesRowNumber = tr
 export function removeEmptyRows(data: SheetRangeData, includesRowNumber = true) {
 	const baseLength = includesRowNumber ? 1 : 0;
 	const notEmptyRows = data.filter((row) =>
-		row.slice(baseLength).some((cell) => cell || typeof cell === 'number'),
+		row
+			.slice(baseLength)
+			.some((cell) => cell || typeof cell === 'number' || typeof cell === 'boolean'),
 	);
 	if (includesRowNumber) {
 		notEmptyRows[0][0] = ROW_NUMBER;
@@ -143,7 +156,9 @@ export function removeEmptyColumns(data: SheetRangeData) {
 			returnData.push(column);
 		}
 	}
-	return (returnData[0] || []).map((_, i) => returnData.map((row) => row[i] || ''));
+	return (returnData[0] || []).map((_, i) =>
+		returnData.map((row) => (row[i] === undefined ? '' : row[i])),
+	);
 }
 
 export function prepareSheetData(
@@ -195,12 +210,24 @@ export function mapFields(this: IExecuteFunctions, inputSize: number) {
 	const returnData: IDataObject[] = [];
 
 	for (let i = 0; i < inputSize; i++) {
-		const fields = this.getNodeParameter('fieldsUi.fieldValues', i, []) as IDataObject[];
-		let dataToSend: IDataObject = {};
-		for (const field of fields) {
-			dataToSend = { ...dataToSend, [field.fieldId as string]: field.fieldValue };
+		const nodeVersion = this.getNode().typeVersion;
+		if (nodeVersion < 4) {
+			const fields = this.getNodeParameter('fieldsUi.fieldValues', i, []) as IDataObject[];
+			let dataToSend: IDataObject = {};
+			for (const field of fields) {
+				dataToSend = { ...dataToSend, [field.fieldId as string]: field.fieldValue };
+			}
+			returnData.push(dataToSend);
+		} else {
+			const mappingValues = this.getNodeParameter('columns.value', i) as IDataObject;
+			if (Object.keys(mappingValues).length === 0) {
+				throw new NodeOperationError(
+					this.getNode(),
+					"At least one value has to be added under 'Values to Send'",
+				);
+			}
+			returnData.push(mappingValues);
 		}
-		returnData.push(dataToSend);
 	}
 
 	return returnData;
@@ -300,3 +327,10 @@ export function sortLoadOptions(data: INodePropertyOptions[] | INodeListSearchIt
 
 	return returnData;
 }
+
+export function cellFormatDefault(nodeVersion: number) {
+	if (nodeVersion < 4.1) {
+		return 'RAW';
+	}
+	return 'USER_ENTERED';
+}
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/methods/credentialTest.ts b/packages/nodes-base/nodes/Google/Sheet/v2/methods/credentialTest.ts
index 5d344ebe375d4..50792091f0b6f 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/methods/credentialTest.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/methods/credentialTest.ts
@@ -4,18 +4,14 @@ import type {
 	INodeCredentialTestResult,
 } from 'n8n-workflow';
 
-import type { IGoogleAuthCredentials } from '../transport';
-import { getAccessToken } from '../transport';
+import { getGoogleAccessToken } from '../../../GenericFunctions';
 
 export async function googleApiCredentialTest(
 	this: ICredentialTestFunctions,
 	credential: ICredentialsDecrypted,
 ): Promise<INodeCredentialTestResult> {
 	try {
-		const tokenRequest = await getAccessToken.call(
-			this,
-			credential.data! as unknown as IGoogleAuthCredentials,
-		);
+		const tokenRequest = await getGoogleAccessToken.call(this, credential.data!, 'sheetV2');
 		if (!tokenRequest.access_token) {
 			return {
 				status: 'Error',
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/methods/index.ts b/packages/nodes-base/nodes/Google/Sheet/v2/methods/index.ts
index fb801691f700a..1f2c678dd37e8 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/methods/index.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/methods/index.ts
@@ -1,3 +1,4 @@
 export * as loadOptions from './loadOptions';
 export * as listSearch from './listSearch';
 export * as credentialTest from './credentialTest';
+export * as resourceMapping from './resourceMapping';
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 60fb036ad7129..36f18521e472a 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/methods/listSearch.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/methods/listSearch.ts
@@ -51,8 +51,13 @@ export async function sheetsSearch(
 	this: ILoadOptionsFunctions,
 	_filter?: string,
 ): Promise<INodeListSearchResult> {
-	const { mode, value } = this.getNodeParameter('documentId', 0) as IDataObject;
-	const spreadsheetId = getSpreadsheetId(mode as ResourceLocator, value as string);
+	const documentId = this.getNodeParameter('documentId', 0) as IDataObject | null;
+
+	if (!documentId) return { results: [] };
+
+	const { mode, value } = documentId;
+
+	const spreadsheetId = getSpreadsheetId(this.getNode(), mode as ResourceLocator, value as string);
 
 	const query = {
 		fields: 'sheets.properties',
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 b9fe07f9f4779..90aa11cf90ab9 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/methods/loadOptions.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/methods/loadOptions.ts
@@ -5,8 +5,13 @@ import { getSpreadsheetId } from '../helpers/GoogleSheets.utils';
 import type { ResourceLocator } from '../helpers/GoogleSheets.types';
 
 export async function getSheets(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-	const { mode, value } = this.getNodeParameter('documentId', 0) as IDataObject;
-	const spreadsheetId = getSpreadsheetId(mode as ResourceLocator, value as string);
+	const documentId = this.getNodeParameter('documentId', 0) as IDataObject | null;
+
+	if (!documentId) return [];
+
+	const { mode, value } = documentId;
+
+	const spreadsheetId = getSpreadsheetId(this.getNode(), mode as ResourceLocator, value as string);
 
 	const sheet = new GoogleSheet(spreadsheetId, this);
 	const responseData = await sheet.spreadsheetGetSheets();
@@ -33,19 +38,27 @@ export async function getSheets(this: ILoadOptionsFunctions): Promise<INodePrope
 export async function getSheetHeaderRow(
 	this: ILoadOptionsFunctions,
 ): Promise<INodePropertyOptions[]> {
-	const { mode, value } = this.getNodeParameter('documentId', 0) as IDataObject;
-	const spreadsheetId = getSpreadsheetId(mode as ResourceLocator, value as string);
+	const documentId = this.getNodeParameter('documentId', 0) as IDataObject | null;
+
+	if (!documentId) return [];
+
+	const { mode, value } = documentId;
+
+	const spreadsheetId = getSpreadsheetId(this.getNode(), mode as ResourceLocator, value as string);
 
 	const sheet = new GoogleSheet(spreadsheetId, this);
-	let sheetWithinDocument = this.getNodeParameter('sheetName', undefined, {
+	const sheetWithinDocument = this.getNodeParameter('sheetName', undefined, {
 		extractValue: true,
 	}) as string;
-
-	if (sheetWithinDocument === 'gid=0') {
-		sheetWithinDocument = '0';
-	}
-
-	const sheetName = await sheet.spreadsheetGetSheetNameById(sheetWithinDocument);
+	const { mode: sheetMode } = this.getNodeParameter('sheetName', 0) as {
+		mode: ResourceLocator;
+	};
+
+	const { title: sheetName } = await sheet.spreadsheetGetSheet(
+		this.getNode(),
+		sheetMode,
+		sheetWithinDocument,
+	);
 	const sheetData = await sheet.getData(`${sheetName}!1:1`, 'FORMATTED_VALUE');
 
 	if (sheetData === undefined) {
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/methods/resourceMapping.ts b/packages/nodes-base/nodes/Google/Sheet/v2/methods/resourceMapping.ts
new file mode 100644
index 0000000000000..40ae402a646a4
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/methods/resourceMapping.ts
@@ -0,0 +1,64 @@
+import type {
+	IDataObject,
+	ILoadOptionsFunctions,
+	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';
+
+export async function getMappingColumns(
+	this: ILoadOptionsFunctions,
+): Promise<ResourceMapperFields> {
+	const documentId = this.getNodeParameter('documentId', 0) as IDataObject | null;
+
+	if (!documentId) return { fields: [] };
+
+	const { mode, value } = documentId;
+
+	const spreadsheetId = getSpreadsheetId(this.getNode(), mode as ResourceLocator, value as string);
+
+	const sheet = new GoogleSheet(spreadsheetId, this);
+	const sheetWithinDocument = this.getNodeParameter('sheetName', undefined, {
+		extractValue: true,
+	}) as string;
+	const { mode: sheetMode } = this.getNodeParameter('sheetName', 0) as { mode: ResourceLocator };
+
+	const { title: sheetName } = await sheet.spreadsheetGetSheet(
+		this.getNode(),
+		sheetMode,
+		sheetWithinDocument,
+	);
+	const sheetData = await sheet.getData(`${sheetName}!1:1`, 'FORMATTED_VALUE');
+
+	const columns = sheet.testFilter(sheetData || [], 0, 0).filter((col) => col !== '');
+
+	const fields: ResourceMapperField[] = columns.map((col) => ({
+		id: col,
+		displayName: col,
+		required: false,
+		defaultMatch: col === 'id',
+		display: true,
+		type: 'string',
+		canBeUsedToMatch: true,
+	}));
+
+	const operation = this.getNodeParameter('operation', 0) as string;
+
+	if (operation === 'update') {
+		fields.push({
+			id: ROW_NUMBER,
+			displayName: ROW_NUMBER,
+			required: false,
+			defaultMatch: false,
+			display: true,
+			type: 'string',
+			canBeUsedToMatch: true,
+			readOnly: true,
+			removed: true,
+		});
+	}
+
+	return { fields };
+}
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 226d2256b408e..d3fe3e07620c8 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/transport/index.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/transport/index.ts
@@ -1,85 +1,19 @@
-import type { OptionsWithUri } from 'request';
 import type {
-	ICredentialTestFunctions,
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
 	IPollFunctions,
+	IRequestOptions,
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
-import moment from 'moment-timezone';
-import jwt from 'jsonwebtoken';
-
-export interface IGoogleAuthCredentials {
-	delegatedEmail?: string;
-	email: string;
-	inpersonate: boolean;
-	privateKey: string;
-}
-
-export async function getAccessToken(
-	this:
-		| IExecuteFunctions
-		| IExecuteSingleFunctions
-		| ILoadOptionsFunctions
-		| ICredentialTestFunctions
-		| IPollFunctions,
-	credentials: IGoogleAuthCredentials,
-): Promise<IDataObject> {
-	//https://developers.google.com/identity/protocols/oauth2/service-account#httprest
-
-	const scopes = [
-		'https://www.googleapis.com/auth/drive.file',
-		'https://www.googleapis.com/auth/spreadsheets',
-		'https://www.googleapis.com/auth/drive.metadata',
-	];
-
-	const now = moment().unix();
-
-	credentials.email = credentials.email.trim();
-	const privateKey = credentials.privateKey.replace(/\\n/g, '\n').trim();
-
-	const signature = jwt.sign(
-		{
-			iss: credentials.email,
-			sub: credentials.delegatedEmail || credentials.email,
-			scope: scopes.join(' '),
-			aud: 'https://oauth2.googleapis.com/token',
-			iat: now,
-			exp: now + 3600,
-		},
-		privateKey,
-		{
-			algorithm: 'RS256',
-			header: {
-				kid: privateKey,
-				typ: 'JWT',
-				alg: 'RS256',
-			},
-		},
-	);
-
-	const options: OptionsWithUri = {
-		headers: {
-			'Content-Type': 'application/x-www-form-urlencoded',
-		},
-		method: 'POST',
-		form: {
-			grant_type: 'urn:ietf:params:oauth:grant-type:jwt-bearer',
-			assertion: signature,
-		},
-		uri: 'https://oauth2.googleapis.com/token',
-		json: true,
-	};
-
-	return this.helpers.request(options);
-}
+import set from 'lodash/set';
+import { getGoogleAccessToken } from '../../../GenericFunctions';
 
 export async function apiRequest(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IPollFunctions,
-	method: string,
+	this: IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 	body: IDataObject = {},
 	qs: IDataObject = {},
@@ -92,7 +26,7 @@ export async function apiRequest(
 		0,
 		'serviceAccount',
 	) as string;
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			'Content-Type': 'application/json',
 		},
@@ -114,10 +48,7 @@ export async function apiRequest(
 		if (authenticationMethod === 'serviceAccount') {
 			const credentials = await this.getCredentials('googleApi');
 
-			const { access_token } = await getAccessToken.call(
-				this,
-				credentials as unknown as IGoogleAuthCredentials,
-			);
+			const { access_token } = await getGoogleAccessToken.call(this, credentials, 'sheetV2');
 
 			options.headers!.Authorization = `Bearer ${access_token}`;
 
@@ -132,11 +63,15 @@ export async function apiRequest(
 			error.statusCode = '401';
 		}
 
-		if (error.message.includes('PERMISSION_DENIED')) {
-			const message = `Missing permissions for Google Sheet, ${error.message}}`;
-			const details = error.description ? ` Details of the error: ${error.description}.` : '';
-			const description = `Please check that the account you're using has the right permissions. (If you're trying to modify the sheet, you'll need edit access.)${details}`;
-			throw new NodeApiError(this.getNode(), error as JsonObject, { message, description });
+		if (error instanceof NodeApiError) {
+			if (error.message.includes('PERMISSION_DENIED')) {
+				const details = error.description ? ` Details of the error: ${error.description}.` : '';
+				const description = `Please check that the account you're using has the right permissions. (If you're trying to modify the sheet, you'll need edit access.)${details}`;
+
+				set(error, 'description', description);
+			}
+
+			throw error;
 		}
 
 		throw new NodeApiError(this.getNode(), error as JsonObject);
@@ -146,7 +81,7 @@ export async function apiRequest(
 export async function apiRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject = {},
 	query: IDataObject = {},
diff --git a/packages/nodes-base/nodes/Google/Slides/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Slides/GenericFunctions.ts
index e9b2aa548b2ac..98cbb28ecd06c 100644
--- a/packages/nodes-base/nodes/Google/Slides/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Slides/GenericFunctions.ts
@@ -1,79 +1,18 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
+	IDataObject,
 	IExecuteFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
-	IDataObject,
+	IRequestOptions,
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
-
-import jwt from 'jsonwebtoken';
-
-interface IGoogleAuthCredentials {
-	delegatedEmail?: string;
-	email: string;
-	inpersonate: boolean;
-	privateKey: string;
-}
-
-async function getAccessToken(
-	this: IExecuteFunctions | ILoadOptionsFunctions,
-	credentials: IGoogleAuthCredentials,
-) {
-	// https://developers.google.com/identity/protocols/oauth2/service-account#httprest
-
-	const scopes = [
-		'https://www.googleapis.com/auth/drive.file',
-		'https://www.googleapis.com/auth/presentations',
-	];
-
-	const now = moment().unix();
-
-	credentials.email = credentials.email.trim();
-	const privateKey = credentials.privateKey.replace(/\\n/g, '\n').trim();
-
-	const signature = jwt.sign(
-		{
-			iss: credentials.email,
-			sub: credentials.email,
-			scope: scopes.join(' '),
-			aud: 'https://oauth2.googleapis.com/token',
-			iat: now,
-			exp: now + 3600,
-		},
-		privateKey,
-		{
-			algorithm: 'RS256',
-			header: {
-				kid: privateKey,
-				typ: 'JWT',
-				alg: 'RS256',
-			},
-		},
-	);
-
-	const options: OptionsWithUri = {
-		headers: {
-			'Content-Type': 'application/x-www-form-urlencoded',
-		},
-		method: 'POST',
-		form: {
-			grant_type: 'urn:ietf:params:oauth:grant-type:jwt-bearer',
-			assertion: signature,
-		},
-		uri: 'https://oauth2.googleapis.com/token',
-		json: true,
-	};
-
-	return this.helpers.request(options);
-}
+import { getGoogleAccessToken } from '../GenericFunctions';
 
 export async function googleApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 	body: IDataObject = {},
 	qs: IDataObject = {},
@@ -83,7 +22,7 @@ export async function googleApiRequest(
 		0,
 		'serviceAccount',
 	) as string;
-	const options: OptionsWithUri & { headers: IDataObject } = {
+	const options: IRequestOptions & { headers: IDataObject } = {
 		headers: {
 			'Content-Type': 'application/json',
 		},
@@ -106,10 +45,7 @@ export async function googleApiRequest(
 		if (authenticationMethod === 'serviceAccount') {
 			const credentials = await this.getCredentials('googleApi');
 
-			const { access_token } = await getAccessToken.call(
-				this,
-				credentials as unknown as IGoogleAuthCredentials,
-			);
+			const { access_token } = await getGoogleAccessToken.call(this, credentials, 'slides');
 			options.headers.Authorization = `Bearer ${access_token}`;
 			return await this.helpers.request(options);
 		} else {
diff --git a/packages/nodes-base/nodes/Google/Slides/GoogleSlides.node.json b/packages/nodes-base/nodes/Google/Slides/GoogleSlides.node.json
index f745a70d99658..fa81174273540 100644
--- a/packages/nodes-base/nodes/Google/Slides/GoogleSlides.node.json
+++ b/packages/nodes-base/nodes/Google/Slides/GoogleSlides.node.json
@@ -2,7 +2,7 @@
 	"node": "n8n-nodes-base.googleSlides",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Marketing & Content"],
+	"categories": ["Marketing"],
 	"resources": {
 		"credentialDocumentation": [
 			{
diff --git a/packages/nodes-base/nodes/Google/Slides/GoogleSlides.node.ts b/packages/nodes-base/nodes/Google/Slides/GoogleSlides.node.ts
index fe50cf29e92c1..38ee4bb8ab847 100644
--- a/packages/nodes-base/nodes/Google/Slides/GoogleSlides.node.ts
+++ b/packages/nodes-base/nodes/Google/Slides/GoogleSlides.node.ts
@@ -341,12 +341,12 @@ export class GoogleSlides implements INodeType {
 				description: 'Name of the binary property to which to write the data of the read page',
 			},
 			{
-				displayName: 'Binary Property',
+				displayName: 'Put Output File in Field',
 				name: 'binaryProperty',
 				type: 'string',
 				required: true,
 				default: 'data',
-				description: 'Name of the binary property to which to write to',
+				hint: 'The name of the output binary field to put the file in',
 				displayOptions: {
 					show: {
 						resource: ['page'],
@@ -591,6 +591,6 @@ export class GoogleSlides implements INodeType {
 			}
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Google/Slides/googleslides.svg b/packages/nodes-base/nodes/Google/Slides/googleslides.svg
index 666d185ea52d5..7ed5db641310c 100644
--- a/packages/nodes-base/nodes/Google/Slides/googleslides.svg
+++ b/packages/nodes-base/nodes/Google/Slides/googleslides.svg
@@ -1 +1 @@
-<svg viewBox="-60 -60 630 630" xmlns="http://www.w3.org/2000/svg"><path d="M440.8 140.2V479c0 18.2-14.8 33-33 33H102.9c-18.2 0-33-14.8-33-33V33c0-18.2 14.8-33 33-33h197.6z" fill="#f5b912"/><path d="M323.6 233.5H189.1c-12.5 0-22.6 10.1-22.6 22.6v134.5c0 12.5 10.1 22.6 22.6 22.6h134.5c12.5 0 22.6-10.1 22.6-22.6V256c0-12.4-10.1-22.5-22.6-22.5zm-.7 139.5h-133v-90.5h133z" fill="#fff"/><path d="M319.6 134.4l121.1 98.1v-92.2L372 100.5z" opacity=".19"/><path d="M441.4 140.2H334.2c-18.2 0-33-14.8-33-33V0z" fill="#fadc87"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="-60 -60 630 630"><path fill="#f5b912" d="M440.8 140.2V479c0 18.2-14.8 33-33 33H102.9c-18.2 0-33-14.8-33-33V33c0-18.2 14.8-33 33-33h197.6z"/><path fill="#fff" d="M323.6 233.5H189.1c-12.5 0-22.6 10.1-22.6 22.6v134.5c0 12.5 10.1 22.6 22.6 22.6h134.5c12.5 0 22.6-10.1 22.6-22.6V256c0-12.4-10.1-22.5-22.6-22.5m-.7 139.5h-133v-90.5h133z"/><path d="m319.6 134.4 121.1 98.1v-92.2L372 100.5z" opacity=".19"/><path fill="#fadc87" d="M441.4 140.2H334.2c-18.2 0-33-14.8-33-33V0z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Google/Task/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Task/GenericFunctions.ts
index 265b11773c562..c0e69151e4aa0 100644
--- a/packages/nodes-base/nodes/Google/Task/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Task/GenericFunctions.ts
@@ -1,24 +1,23 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
+	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
-	IDataObject,
+	IRequestOptions,
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function googleApiRequest(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 	body: IDataObject = {},
 	qs: IDataObject = {},
 	uri?: string,
 	headers: IDataObject = {},
 ): Promise<any> {
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			'Content-Type': 'application/json',
 		},
@@ -46,7 +45,7 @@ export async function googleApiRequest(
 export async function googleApiRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject = {},
 	query: IDataObject = {},
diff --git a/packages/nodes-base/nodes/Google/Task/GoogleTasks.node.ts b/packages/nodes-base/nodes/Google/Task/GoogleTasks.node.ts
index ea415c1ecafc1..880b2a707cd09 100644
--- a/packages/nodes-base/nodes/Google/Task/GoogleTasks.node.ts
+++ b/packages/nodes-base/nodes/Google/Task/GoogleTasks.node.ts
@@ -271,6 +271,6 @@ export class GoogleTasks implements INodeType {
 			}
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Google/Translate/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Translate/GenericFunctions.ts
index b65cef0c12fe9..d85912801a720 100644
--- a/packages/nodes-base/nodes/Google/Translate/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Translate/GenericFunctions.ts
@@ -1,80 +1,18 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
+	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
-	IDataObject,
+	IRequestOptions,
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
-
-import jwt from 'jsonwebtoken';
-
-interface IGoogleAuthCredentials {
-	delegatedEmail?: string;
-	email: string;
-	inpersonate: boolean;
-	privateKey: string;
-}
-
-async function getAccessToken(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	credentials: IGoogleAuthCredentials,
-): Promise<IDataObject> {
-	//https://developers.google.com/identity/protocols/oauth2/service-account#httprest
-
-	const scopes = [
-		'https://www.googleapis.com/auth/cloud-translation',
-		'https://www.googleapis.com/auth/cloud-platform',
-	];
-
-	const now = moment().unix();
-
-	credentials.email = credentials.email.trim();
-	const privateKey = credentials.privateKey.replace(/\\n/g, '\n').trim();
-
-	const signature = jwt.sign(
-		{
-			iss: credentials.email,
-			sub: credentials.email,
-			scope: scopes.join(' '),
-			aud: 'https://oauth2.googleapis.com/token',
-			iat: now,
-			exp: now + 3600,
-		},
-		privateKey,
-		{
-			algorithm: 'RS256',
-			header: {
-				kid: privateKey,
-				typ: 'JWT',
-				alg: 'RS256',
-			},
-		},
-	);
-
-	const options: OptionsWithUri = {
-		headers: {
-			'Content-Type': 'application/x-www-form-urlencoded',
-		},
-		method: 'POST',
-		form: {
-			grant_type: 'urn:ietf:params:oauth:grant-type:jwt-bearer',
-			assertion: signature,
-		},
-		uri: 'https://oauth2.googleapis.com/token',
-		json: true,
-	};
-
-	return this.helpers.request(options);
-}
+import { getGoogleAccessToken } from '../GenericFunctions';
 
 export async function googleApiRequest(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -87,7 +25,7 @@ export async function googleApiRequest(
 		0,
 		'serviceAccount',
 	) as string;
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			'Content-Type': 'application/json',
 		},
@@ -108,16 +46,12 @@ export async function googleApiRequest(
 		if (authenticationMethod === 'serviceAccount') {
 			const credentials = await this.getCredentials('googleApi');
 
-			const { access_token } = await getAccessToken.call(
-				this,
-				credentials as unknown as IGoogleAuthCredentials,
-			);
+			const { access_token } = await getGoogleAccessToken.call(this, credentials, 'translate');
 
 			options.headers!.Authorization = `Bearer ${access_token}`;
-			//@ts-ignore
+
 			return await this.helpers.request(options);
 		} else {
-			//@ts-ignore
 			return await this.helpers.requestOAuth2.call(this, 'googleTranslateOAuth2Api', options);
 		}
 	} catch (error) {
@@ -128,7 +62,7 @@ export async function googleApiRequest(
 export async function googleApiRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: any = {},
diff --git a/packages/nodes-base/nodes/Google/Translate/GoogleTranslate.node.ts b/packages/nodes-base/nodes/Google/Translate/GoogleTranslate.node.ts
index c907f0a8f1292..cee1333ee8723 100644
--- a/packages/nodes-base/nodes/Google/Translate/GoogleTranslate.node.ts
+++ b/packages/nodes-base/nodes/Google/Translate/GoogleTranslate.node.ts
@@ -212,6 +212,6 @@ export class GoogleTranslate implements INodeType {
 			}
 		}
 
-		return this.prepareOutputData(responseData);
+		return [responseData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Google/YouTube/ChannelDescription.ts b/packages/nodes-base/nodes/Google/YouTube/ChannelDescription.ts
index 7475c23920d6f..7503b0af01f4b 100644
--- a/packages/nodes-base/nodes/Google/YouTube/ChannelDescription.ts
+++ b/packages/nodes-base/nodes/Google/YouTube/ChannelDescription.ts
@@ -545,10 +545,11 @@ export const channelFields: INodeProperties[] = [
 		default: '',
 	},
 	{
-		displayName: 'Binary Property',
+		displayName: 'Input Binary Field',
 		name: 'binaryProperty',
 		type: 'string',
 		required: true,
+		hint: 'The name of the input binary field containing the file to be uploaded',
 		displayOptions: {
 			show: {
 				operation: ['uploadBanner'],
diff --git a/packages/nodes-base/nodes/Google/YouTube/GenericFunctions.ts b/packages/nodes-base/nodes/Google/YouTube/GenericFunctions.ts
index e18ea26ce5a3c..acd718c1b2b19 100644
--- a/packages/nodes-base/nodes/Google/YouTube/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/YouTube/GenericFunctions.ts
@@ -1,17 +1,16 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	ILoadOptionsFunctions,
 	IDataObject,
 	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function googleApiRequest(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -19,7 +18,7 @@ export async function googleApiRequest(
 	uri?: string,
 	option: IDataObject = {},
 ): Promise<any> {
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		headers: {
 			'Content-Type': 'application/json',
 		},
@@ -46,7 +45,7 @@ export async function googleApiRequest(
 export async function googleApiRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: any = {},
diff --git a/packages/nodes-base/nodes/Google/YouTube/VideoDescription.ts b/packages/nodes-base/nodes/Google/YouTube/VideoDescription.ts
index bdb6e8160f016..339d20e3f0d17 100644
--- a/packages/nodes-base/nodes/Google/YouTube/VideoDescription.ts
+++ b/packages/nodes-base/nodes/Google/YouTube/VideoDescription.ts
@@ -107,10 +107,11 @@ export const videoFields: INodeProperties[] = [
 		default: '',
 	},
 	{
-		displayName: 'Binary Property',
+		displayName: 'Input Binary Field',
 		name: 'binaryProperty',
 		type: 'string',
 		required: true,
+		hint: 'The name of the input binary field containing the file to be uploaded',
 		displayOptions: {
 			show: {
 				operation: ['upload'],
diff --git a/packages/nodes-base/nodes/Google/YouTube/YouTube.node.json b/packages/nodes-base/nodes/Google/YouTube/YouTube.node.json
index 50e5eb2aac132..34edb0df553c0 100644
--- a/packages/nodes-base/nodes/Google/YouTube/YouTube.node.json
+++ b/packages/nodes-base/nodes/Google/YouTube/YouTube.node.json
@@ -2,7 +2,7 @@
 	"node": "n8n-nodes-base.youTube",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Marketing & Content"],
+	"categories": ["Marketing"],
 	"resources": {
 		"credentialDocumentation": [
 			{
diff --git a/packages/nodes-base/nodes/Google/YouTube/YouTube.node.ts b/packages/nodes-base/nodes/Google/YouTube/YouTube.node.ts
index fe32e445bd089..9115cd473f361 100644
--- a/packages/nodes-base/nodes/Google/YouTube/YouTube.node.ts
+++ b/packages/nodes-base/nodes/Google/YouTube/YouTube.node.ts
@@ -1,3 +1,4 @@
+import type { Readable } from 'stream';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -8,7 +9,6 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { BINARY_ENCODING, NodeOperationError } from 'n8n-workflow';
-import type { Readable } from 'stream';
 
 import { googleApiRequest, googleApiRequestAllItems } from './GenericFunctions';
 
@@ -838,7 +838,7 @@ export class YouTube implements INodeType {
 
 						if (binaryData.id) {
 							// Stream data in 256KB chunks, and upload the via the resumable upload api
-							fileContent = this.helpers.getBinaryStream(binaryData.id, UPLOAD_CHUNK_SIZE);
+							fileContent = await this.helpers.getBinaryStream(binaryData.id, UPLOAD_CHUNK_SIZE);
 							const metadata = await this.helpers.getBinaryMetadata(binaryData.id);
 							contentLength = metadata.fileSize;
 							mimeType = metadata.mimeType ?? binaryData.mimeType;
@@ -1068,6 +1068,6 @@ export class YouTube implements INodeType {
 			returnData.push(...executionData);
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Google/constants.ts b/packages/nodes-base/nodes/Google/constants.ts
new file mode 100644
index 0000000000000..374cb345b5e1c
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/constants.ts
@@ -0,0 +1,5 @@
+export const GOOGLE_DRIVE_FILE_URL_REGEX =
+	'https:\\/\\/(?:drive|docs)\\.google\\.com(?:\\/.*|)\\/d\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)';
+
+export const GOOGLE_DRIVE_FOLDER_URL_REGEX =
+	'https:\\/\\/drive\\.google\\.com(?:\\/.*|)\\/folders\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)';
diff --git a/packages/nodes-base/nodes/Gotify/GenericFunctions.ts b/packages/nodes-base/nodes/Gotify/GenericFunctions.ts
index b9c50da913331..8aa00f4ace6c3 100644
--- a/packages/nodes-base/nodes/Gotify/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Gotify/GenericFunctions.ts
@@ -1,17 +1,16 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	ILoadOptionsFunctions,
 	IDataObject,
 	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function gotifyApiRequest(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	path: string,
 
 	body: any = {},
@@ -21,7 +20,7 @@ export async function gotifyApiRequest(
 ): Promise<any> {
 	const credentials = await this.getCredentials('gotifyApi');
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		method,
 		headers: {
 			'X-Gotify-Key': method === 'POST' ? credentials.appApiToken : credentials.clientApiToken,
@@ -31,6 +30,7 @@ export async function gotifyApiRequest(
 		qs,
 		uri: uri || `${credentials.url}${path}`,
 		json: true,
+		rejectUnauthorized: credentials.ignoreSSLIssues as boolean,
 	};
 	try {
 		if (Object.keys(body as IDataObject).length === 0) {
@@ -47,7 +47,7 @@ export async function gotifyApiRequest(
 export async function gotifyApiRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: any = {},
diff --git a/packages/nodes-base/nodes/Gotify/Gotify.node.ts b/packages/nodes-base/nodes/Gotify/Gotify.node.ts
index 0ced6e1912c61..a535378461e6c 100644
--- a/packages/nodes-base/nodes/Gotify/Gotify.node.ts
+++ b/packages/nodes-base/nodes/Gotify/Gotify.node.ts
@@ -84,7 +84,7 @@ export class Gotify implements INodeType {
 					},
 				},
 				default: '',
-				description: 'The message. Markdown (excluding html) is allowed.',
+				description: 'The message to send, If using Markdown add the Content Type option',
 			},
 			{
 				displayName: 'Additional Fields',
@@ -115,6 +115,38 @@ export class Gotify implements INodeType {
 					},
 				],
 			},
+			{
+				displayName: 'Options',
+				name: 'options',
+				type: 'collection',
+				placeholder: 'Add Option',
+				displayOptions: {
+					show: {
+						resource: ['message'],
+						operation: ['create'],
+					},
+				},
+				default: {},
+				options: [
+					{
+						displayName: 'Content Type',
+						name: 'contentType',
+						type: 'options',
+						default: 'text/plain',
+						description: 'The message content type',
+						options: [
+							{
+								name: 'Plain',
+								value: 'text/plain',
+							},
+							{
+								name: 'Markdown',
+								value: 'text/markdown',
+							},
+						],
+					},
+				],
+			},
 			{
 				displayName: 'Message ID',
 				name: 'messageId',
@@ -176,11 +208,20 @@ export class Gotify implements INodeType {
 						const message = this.getNodeParameter('message', i) as string;
 
 						const additionalFields = this.getNodeParameter('additionalFields', i);
+						const options = this.getNodeParameter('options', i);
 
 						const body: IDataObject = {
 							message,
 						};
 
+						if (options.contentType) {
+							body.extras = {
+								'client::display': {
+									contentType: options.contentType,
+								},
+							};
+						}
+
 						Object.assign(body, additionalFields);
 
 						responseData = await gotifyApiRequest.call(this, 'POST', '/message', body);
@@ -225,6 +266,6 @@ export class Gotify implements INodeType {
 				throw error;
 			}
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Grafana/GenericFunctions.ts b/packages/nodes-base/nodes/Grafana/GenericFunctions.ts
index 48d72bd9d7063..9fb11f7c0ec72 100644
--- a/packages/nodes-base/nodes/Grafana/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Grafana/GenericFunctions.ts
@@ -3,11 +3,11 @@ import type {
 	IDataObject,
 	ILoadOptionsFunctions,
 	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
-import type { OptionsWithUri } from 'request';
-
 import type { GrafanaCredentials } from './types';
 
 export function tolerateTrailingSlash(baseUrl: string) {
@@ -16,7 +16,7 @@ export function tolerateTrailingSlash(baseUrl: string) {
 
 export async function grafanaApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject = {},
 	qs: IDataObject = {},
@@ -25,7 +25,7 @@ export async function grafanaApiRequest(
 
 	const baseUrl = tolerateTrailingSlash(rawBaseUrl);
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			'Content-Type': 'application/json',
 		},
diff --git a/packages/nodes-base/nodes/Grafana/grafana.svg b/packages/nodes-base/nodes/Grafana/grafana.svg
index c78f1104906fc..1080e570ce609 100644
--- a/packages/nodes-base/nodes/Grafana/grafana.svg
+++ b/packages/nodes-base/nodes/Grafana/grafana.svg
@@ -1,191 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   viewBox="0 0 64 64"
-   xml:space="preserve"
-   sodipodi:docname="grafana-icon.svg"
-   width="64"
-   height="64"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"><metadata
-   id="metadata56"><rdf:RDF><cc:Work
-       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-   id="defs54">
-	
-
-		<defs
-   id="defs5">
-			<rect
-   id="SVGID_1_"
-   x="-849.70001"
-   y="-1412.2"
-   width="4355.2002"
-   height="5636.2002" />
-		</defs>
-		<clipPath
-   id="SVGID_2_">
-			<use
-   xlink:href="#SVGID_1_"
-   style="overflow:visible"
-   id="use7"
-   x="0"
-   y="0"
-   width="100%"
-   height="100%" />
-		</clipPath>
-		
-		
-	
-			<defs
-   id="defs33">
-				<path
-   inkscape:connector-curvature="0"
-   d="m 1229.6,328.6 c 0,0 -0.7,2.9 -1.6,7.8 -8.3,2.4 -16.6,4.7 -24.9,7.4 -11.5,3.5 -22.8,7.7 -34.3,11.8 -11.3,4.4 -22.8,8.8 -34,13.8 -22.6,9.7 -45,20.6 -66.9,32.9 -21.2,11.9 -42.1,25 -62.4,39.2 -2.9,-1.4 -5.2,-2.4 -5.2,-2.4 -207.3,-79.2 -391.4,16.1 -391.4,16.1 -16.8,220.5 82.8,359.5 102.5,384.7 -4.9,13.6 -9.5,27.4 -13.7,41.3 -15.3,50 -26.8,101.3 -33.9,154.3 -1,7.6 -1.9,15.3 -2.8,23 -191.5,94.6 -248.3,288.5 -248.3,288.5 159.9,183.9 346.3,195.3 346.3,195.3 0.2,-0.1 0.3,-0.3 0.5,-0.4 23.7,42.3 51.1,82.6 82,120.1 12.9,15.7 26.5,30.9 40.6,45.6 -58.3,166.7 8.2,305.4 8.2,305.4 178,6.7 294.9,-77.9 319.5,-97.4 17.7,6 35.7,11.3 53.8,16 54.7,14.1 110.7,22.4 166.7,24.8 14,0.6 28,0.9 41.9,0.8 h 6.8 l 4.4,-0.1 8.8,-0.3 8.7,-0.4 0.2,0.3 c 83.8,119.6 231.3,136.5 231.3,136.5 104.9,-110.6 110.9,-220.3 110.9,-244 v 0 c 0,0 0,-0.8 0,-1.6 0,-2 -0.1,-3.3 -0.1,-3.3 0,0 0,0 0,0 -0.1,-1.7 -0.1,-3.3 -0.3,-5.1 22,-15.4 43,-32 62.9,-49.8 42,-38 78.7,-81.2 109.1,-127.9 2.9,-4.4 5.7,-8.8 8.4,-13.3 118.7,6.8 202.4,-73.5 202.4,-73.5 -19.7,-123.7 -90.2,-184 -104.9,-195.4 v 0 c 0,0 -0.6,-0.5 -1.5,-1.1 -0.8,-0.6 -1.4,-1 -1.4,-1 0,0 0,0 0,0 -0.7,-0.5 -1.6,-1.1 -2.6,-1.7 0.7,-7.5 1.4,-14.9 1.8,-22.3 0.9,-13.3 1.2,-26.7 1.3,-39.9 l -0.1,-9.9 -0.1,-5 v -2.5 c 0,-3.4 -0.1,-2.1 -0.1,-3.4 l -0.4,-8.3 -0.6,-11.2 c -0.2,-3.9 -0.5,-7.2 -0.8,-10.7 -0.3,-3.4 -0.6,-6.9 -1,-10.3 l -1.2,-10.3 -1.4,-10.2 c -2,-13.6 -4.6,-27.1 -7.7,-40.4 -12.4,-53.3 -33.2,-103.9 -60.7,-149.4 -27.5,-45.5 -61.7,-85.8 -100.2,-119.7 -38.5,-34 -81.7,-61.3 -127,-81.7 -45.3,-20.4 -92.9,-33.5 -140.3,-39.5 -23.7,-3.1 -47.3,-4.3 -70.7,-4 l -8.7,0.2 -2.2,0.1 c -0.6,0 -3.3,0.1 -3,0.1 l -3.6,0.2 -8.7,0.6 c -3.3,0.2 -6.7,0.5 -9.6,0.8 -12,1.2 -23.9,2.8 -35.7,5 -47,8.8 -91.4,25.8 -130.5,49.2 -39.1,23.4 -73.1,52.7 -100.8,85.9 -27.6,33.1 -49.1,69.8 -63.9,107.8 -14.8,38 -23.1,77.2 -25.4,115.3 -0.6,9.5 -0.8,19 -0.6,28.4 0,2.3 0.1,4.7 0.2,7 l 0.3,7.6 c 0.3,4.6 0.7,9.1 1.1,13.6 1.9,19.3 5.4,37.8 10.6,55.7 10.3,35.7 26.9,68 47.3,95.4 20.4,27.5 44.8,50.2 70.7,67.9 25.9,17.7 53.6,30.4 81,38.5 27.5,8.1 54.8,11.6 80.5,11.5 3.2,0 6.4,-0.1 9.6,-0.2 1.7,0 3.4,-0.2 5.1,-0.2 1.7,-0.1 3.4,-0.2 5.1,-0.3 2.7,-0.3 5.5,-0.5 8.2,-0.8 0.6,0 1.5,-0.2 2.3,-0.3 l 2.5,-0.3 c 1.7,-0.2 3.3,-0.5 5,-0.7 3.4,-0.4 6.3,-1.1 9.3,-1.6 3,-0.6 6,-1.2 9,-2 5.9,-1.3 11.6,-3.1 17.3,-4.8 11.2,-3.7 21.7,-8.2 31.5,-13.2 9.8,-5 18.8,-10.7 27.2,-16.6 2.4,-1.7 4.7,-3.5 7,-5.3 9,-7 10.4,-20.2 3.2,-29 -6.3,-7.7 -17.1,-9.7 -25.7,-4.9 -2.1,1.2 -4.3,2.3 -6.5,3.4 -7.5,3.6 -15.3,7 -23.6,9.7 -8.3,2.6 -16.9,4.8 -25.9,6.4 -4.5,0.6 -9,1.3 -13.6,1.7 -2.3,0.3 -4.6,0.4 -7,0.4 -2.3,0.1 -4.8,0.3 -6.9,0.2 -2.2,0 -4.4,-0.1 -6.7,-0.1 -2.8,-0.1 -5.6,-0.3 -8.4,-0.4 0,0 -1.4,0 -0.3,-0.1 l -0.9,-0.1 -1.9,-0.2 c -1.3,-0.1 -2.5,-0.2 -3.8,-0.4 -2.5,-0.3 -5,-0.6 -7.5,-1 -20.1,-2.8 -40.5,-8.7 -60.1,-17.6 -19.7,-8.9 -38.5,-21.1 -55.5,-36.4 -17,-15.2 -31.8,-33.6 -43.4,-54.4 -11.6,-20.7 -19.7,-43.8 -23.5,-68 -1.9,-12.1 -2.7,-24.6 -2.4,-36.8 0.2,-3.4 0.3,-6.7 0.5,-10.1 0,0.9 0.1,-0.5 0.1,-0.6 l 0.1,-1.2 0.2,-2.5 c 0.1,-1.7 0.3,-3.3 0.5,-5 0.7,-6.6 1.7,-13.3 2.9,-19.8 9.3,-52.7 35.7,-104.1 76.5,-143.2 10.2,-9.7 21.2,-18.8 32.9,-26.8 11.7,-8 24.2,-15.2 37.2,-21.2 13,-6 26.6,-10.9 40.5,-14.7 13.9,-3.7 28.2,-6.2 42.7,-7.5 7.2,-0.6 14.5,-0.9 21.8,-0.9 1.9,0 3.4,0.1 4.9,0.1 l 5.9,0.2 3.7,0.1 c 1.5,0 0,0 0.7,0.1 l 1.5,0.1 5.9,0.4 c 15.7,1.3 31.4,3.5 46.8,7 30.9,6.9 60.9,18.2 88.9,33.7 56,31 103.7,79.5 133,138 14.8,29.1 25,60.5 30.2,92.9 1.2,8.1 2.2,16.3 2.9,24.5 l 0.5,6.2 0.3,6.2 c 0.1,2.1 0.1,4.1 0.2,6.2 0,2 0.1,4.3 0.1,5.8 v 5.3 l -0.1,6 c -0.2,4 -0.5,10.5 -0.7,14.5 -0.7,8.9 -1.4,17.9 -2.6,26.8 -1.1,8.8 -2.6,17.6 -4.2,26.4 -1.8,8.7 -3.6,17.4 -5.9,26 -4.3,17.3 -9.9,34.2 -16.4,50.8 -13.1,33.2 -30.6,64.7 -51.7,93.8 -42.3,58.1 -100,105.6 -165.6,135.4 -32.8,14.8 -67.4,25.7 -103,31.6 -17.8,3 -35.8,4.8 -53.8,5.4 l -3.3,0.1 h -2.9 l -5.8,0.1 h -8.9 -4.4 c 2.5,0 -0.4,0 -0.3,-0.1 l -1.8,-0.1 c -9.7,-0.2 -19.3,-0.7 -28.9,-1.4 -38.5,-2.9 -76.6,-9.7 -113.5,-20.5 -36.9,-10.7 -72.7,-25 -106.6,-43 -67.7,-36.2 -128.2,-85.8 -175.6,-145.6 -23.8,-29.8 -44.6,-61.8 -61.8,-95.5 -17.2,-33.7 -30.7,-69 -40.7,-105.1 -9.9,-36.1 -16.1,-73.1 -18.5,-110.3 l -0.4,-7 -0.1,-1.7 v -1.5 l -0.1,-3.1 -0.2,-6.1 -0.1,-1.5 v -2.1 -4.3 l -0.1,-8.7 v -1.7 c 0,0.3 0,0.3 0,-0.6 v -3.4 c 0,-4.5 0.2,-9.1 0.3,-13.6 0.7,-18.4 2.2,-37.3 4.6,-56.2 2.4,-18.9 5.5,-37.9 9.4,-56.8 3.9,-18.8 8.5,-37.5 13.7,-55.8 10.5,-36.7 23.6,-72.3 39.1,-105.9 31.1,-67.3 71.9,-126.6 120.9,-174.4 12.2,-12 24.9,-23.3 38.1,-33.9 13.2,-10.6 26.9,-20.4 41,-29.6 14,-9.3 28.5,-17.7 43.4,-25.5 7.4,-4 15,-7.5 22.6,-11.2 3.8,-1.7 7.7,-3.4 11.5,-5.1 3.8,-1.7 7.7,-3.4 11.6,-4.9 15.5,-6.6 31.5,-12.1 47.5,-17.3 4.1,-1.2 8.1,-2.5 12.1,-3.7 4,-1.3 8.2,-2.2 12.2,-3.4 8.1,-2.3 16.4,-4.2 24.6,-6.3 4.1,-1.1 8.3,-1.8 12.4,-2.7 4.2,-0.9 8.3,-1.8 12.5,-2.6 4.2,-0.8 8.4,-1.5 12.5,-2.3 l 6.3,-1.1 6.3,-1 c 4.2,-0.6 8.4,-1.3 12.6,-1.9 4.7,-0.8 9.5,-1.2 14.2,-1.9 3.9,-0.5 10.2,-1.2 14.1,-1.7 3,-0.3 5.9,-0.6 8.9,-0.9 l 5.9,-0.6 3,-0.3 3.5,-0.2 c 4.8,-0.3 9.5,-0.6 14.3,-0.9 l 7.1,-0.5 c 0,0 2.6,-0.1 0.3,-0.1 l 1.5,-0.1 3,-0.1 c 4.1,-0.2 8.1,-0.4 12.2,-0.6 16.2,-0.5 32.3,-0.5 48.2,0 31.9,1.3 63.2,4.8 93.6,10.4 60.9,11.3 118.2,30.9 170,56.5 51.9,25.4 98.4,56.6 138.8,90.5 2.5,2.1 5,4.3 7.5,6.4 2.5,2.2 4.9,4.3 7.3,6.5 4.9,4.3 9.6,8.8 14.3,13.1 4.7,4.4 9.2,8.9 13.8,13.3 4.4,4.5 8.9,8.9 13.2,13.5 17.1,18.1 33,36.5 47.3,55 28.7,36.9 51.6,74.1 69.9,109.3 1.2,2.2 2.3,4.4 3.4,6.6 1.1,2.2 2.2,4.4 3.2,6.6 2.1,4.3 4.3,8.6 6.2,12.9 2,4.3 4,8.5 5.9,12.7 1.8,4.2 3.6,8.4 5.4,12.4 6.8,16.5 13,32.1 18.1,47 8.4,23.9 14.5,45.5 19.3,64.2 1.9,7.5 9,12.5 16.7,11.8 8,-0.7 14.1,-7.3 14.3,-15.3 0.4,-20.1 -0.1,-43.8 -2.4,-70.8 -3,-33.4 -8.7,-72.1 -20,-114.6 -11.1,-42.5 -27.6,-89 -51.6,-137.3 -24.1,-48.2 -55.5,-98.4 -96.3,-146.9 -15.9,-19 -33.3,-37.8 -52.1,-56.1 28,-111.4 -34.1,-208 -34.1,-208 -107.2,-6.7 -175.4,33.3 -200.7,51.6 -4.2,-1.8 -8.5,-3.6 -12.8,-5.4 -18.3,-7.4 -37,-14.3 -56.3,-20.4 -19.3,-6.1 -39,-11.7 -59.1,-16.4 -20.2,-4.7 -40.7,-8.7 -61.6,-11.9 -3.7,-0.5 -7.3,-1 -11,-1.6 -46.6,-149.4 -180.9,-211.9 -180.9,-211.9 -149.8,94.5 -178.3,227.4 -178.3,227.4"
-   id="SVGID_5_" />
-			</defs>
-			<clipPath
-   id="SVGID_6_">
-				<use
-   height="100%"
-   width="100%"
-   y="0"
-   x="0"
-   id="use35"
-   style="overflow:visible"
-   xlink:href="#SVGID_5_" />
-			</clipPath>
-			
-				<linearGradient
-   gradientTransform="matrix(0,-255.7742,-255.7742,0,2099115.5,-207133.55)"
-   y2="8201.71"
-   x2="-812.64868"
-   y1="8201.71"
-   x1="-819.76501"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_7_">
-				<stop
-   id="stop38"
-   style="stop-color:#FFF200"
-   offset="0" />
-				<stop
-   id="stop40"
-   style="stop-color:#F15A29"
-   offset="1" />
-			</linearGradient>
-			
-		
-			<defs
-   id="defs11">
-				<rect
-   height="5636.2002"
-   width="4355.2002"
-   y="-1412.2"
-   x="-849.70001"
-   id="SVGID_3_" />
-			</defs>
-			<clipPath
-   id="SVGID_4_">
-				<use
-   height="100%"
-   width="100%"
-   y="0"
-   x="0"
-   id="use13"
-   style="overflow:visible"
-   xlink:href="#SVGID_3_" />
-			</clipPath>
-			
-			
-			
-			
-			
-			
-			
-		</defs><sodipodi:namedview
-   pagecolor="#ffffff"
-   bordercolor="#666666"
-   borderopacity="1"
-   objecttolerance="10"
-   gridtolerance="10"
-   guidetolerance="10"
-   inkscape:pageopacity="0"
-   inkscape:pageshadow="2"
-   inkscape:window-width="1920"
-   inkscape:window-height="1001"
-   id="namedview52"
-   showgrid="false"
-   inkscape:zoom="5.3636363"
-   inkscape:cx="69.64473"
-   inkscape:cy="40.534302"
-   inkscape:window-x="-9"
-   inkscape:window-y="-9"
-   inkscape:window-maximized="1"
-   inkscape:current-layer="Layer_1" />
-<style
-   type="text/css"
-   id="style2">
-	.st0{fill:#C59A6E;}
-	.st1{fill:#3CB44B;}
-	.st2{fill:#67308F;}
-	.st3{fill:#D1D1D1;}
-	.st4{fill:#EF5B28;}
-	.st5{stroke:#000000;stroke-width:16;stroke-miterlimit:10;}
-	.st6{fill:url(#Triangle-3_1_);}
-	.st7{fill:#333333;}
-	.st8{fill:#CF2129;}
-	.st9{fill:#CC3832;}
-	.st10{fill:#BA443D;}
-	.st11{fill:#BAC556;}
-	.st12{fill:#F8DF4B;}
-	.st13{fill:#F5CF47;}
-	.st14{fill:#A9B75D;}
-	.st15{fill:#DDBE5B;}
-	.st16{fill:#6FBECB;}
-	.st17{fill:#79C0BF;}
-	.st18{fill:#77C3D2;}
-	.st19{fill:#5CB8BB;}
-	.st20{fill:#529FB5;}
-	.st21{fill:#BA3D36;}
-	.st22{fill:#9D3634;}
-	.st23{fill:#D33E35;}
-	.st24{fill:#869B63;}
-	.st25{fill:#BEC54F;}
-	.st26{fill:#9EAD59;}
-	.st27{fill:none;}
-	.st28{fill:#43AE2A;}
-	.st29{fill:#009DDD;}
-	.st30{fill:#00A297;}
-	.st31{fill:#0072CC;}
-	.st32{fill:#82BB00;}
-	.st33{fill:#10069D;}
-	.st34{fill:#333F48;}
-	.st35{clip-path:url(#SVGID_2_);}
-	.st36{clip-path:url(#SVGID_4_);fill:#414042;}
-	.st37{clip-path:url(#SVGID_6_);fill:url(#SVGID_7_);}
-</style>
-<g
-   id="g937"
-   transform="matrix(0.81591244,0,0,0.81591244,-57.832357,129.71853)"><rect
-     transform="matrix(0.03937938,0,0,0.03937938,57.733299,-162.97104)"
-     x="412.70001"
-     y="100.8"
-     class="st37"
-     width="1834.4"
-     height="1992.3"
-     clip-path="url(#SVGID_6_)"
-     id="rect43"
-     style="fill:url(#SVGID_7_)" /></g>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" width="64" height="64"><defs><linearGradient id="e" x1="-819.765" x2="-812.649" y1="8201.71" y2="8201.71" gradientTransform="scale(255.7742 -255.7742)rotate(90 3698.54 4508.37)" gradientUnits="userSpaceOnUse"><stop offset="0" style="stop-color:#fff200"/><stop offset="1" style="stop-color:#f15a29"/></linearGradient><clipPath id="c"><use xlink:href="#a" width="100%" height="100%" style="overflow:visible"/></clipPath><path id="a" d="M1229.6 328.6s-.7 2.9-1.6 7.8c-8.3 2.4-16.6 4.7-24.9 7.4-11.5 3.5-22.8 7.7-34.3 11.8-11.3 4.4-22.8 8.8-34 13.8-22.6 9.7-45 20.6-66.9 32.9-21.2 11.9-42.1 25-62.4 39.2-2.9-1.4-5.2-2.4-5.2-2.4-207.3-79.2-391.4 16.1-391.4 16.1-16.8 220.5 82.8 359.5 102.5 384.7-4.9 13.6-9.5 27.4-13.7 41.3-15.3 50-26.8 101.3-33.9 154.3-1 7.6-1.9 15.3-2.8 23-191.5 94.6-248.3 288.5-248.3 288.5C572.6 1530.9 759 1542.3 759 1542.3c.2-.1.3-.3.5-.4 23.7 42.3 51.1 82.6 82 120.1 12.9 15.7 26.5 30.9 40.6 45.6-58.3 166.7 8.2 305.4 8.2 305.4 178 6.7 294.9-77.9 319.5-97.4 17.7 6 35.7 11.3 53.8 16 54.7 14.1 110.7 22.4 166.7 24.8 14 .6 28 .9 41.9.8h6.8l4.4-.1 8.8-.3 8.7-.4.2.3c83.8 119.6 231.3 136.5 231.3 136.5 104.9-110.6 110.9-220.3 110.9-244v-1.6c0-2-.1-3.3-.1-3.3-.1-1.7-.1-3.3-.3-5.1 22-15.4 43-32 62.9-49.8 42-38 78.7-81.2 109.1-127.9 2.9-4.4 5.7-8.8 8.4-13.3 118.7 6.8 202.4-73.5 202.4-73.5-19.7-123.7-90.2-184-104.9-195.4 0 0-.6-.5-1.5-1.1-.8-.6-1.4-1-1.4-1-.7-.5-1.6-1.1-2.6-1.7.7-7.5 1.4-14.9 1.8-22.3.9-13.3 1.2-26.7 1.3-39.9l-.1-9.9-.1-5v-2.5c0-3.4-.1-2.1-.1-3.4l-.4-8.3-.6-11.2c-.2-3.9-.5-7.2-.8-10.7-.3-3.4-.6-6.9-1-10.3l-1.2-10.3-1.4-10.2c-2-13.6-4.6-27.1-7.7-40.4-12.4-53.3-33.2-103.9-60.7-149.4s-61.7-85.8-100.2-119.7c-38.5-34-81.7-61.3-127-81.7s-92.9-33.5-140.3-39.5c-23.7-3.1-47.3-4.3-70.7-4l-8.7.2-2.2.1c-.6 0-3.3.1-3 .1l-3.6.2-8.7.6c-3.3.2-6.7.5-9.6.8-12 1.2-23.9 2.8-35.7 5-47 8.8-91.4 25.8-130.5 49.2s-73.1 52.7-100.8 85.9c-27.6 33.1-49.1 69.8-63.9 107.8s-23.1 77.2-25.4 115.3c-.6 9.5-.8 19-.6 28.4 0 2.3.1 4.7.2 7l.3 7.6c.3 4.6.7 9.1 1.1 13.6 1.9 19.3 5.4 37.8 10.6 55.7 10.3 35.7 26.9 68 47.3 95.4 20.4 27.5 44.8 50.2 70.7 67.9s53.6 30.4 81 38.5c27.5 8.1 54.8 11.6 80.5 11.5 3.2 0 6.4-.1 9.6-.2 1.7 0 3.4-.2 5.1-.2l5.1-.3c2.7-.3 5.5-.5 8.2-.8.6 0 1.5-.2 2.3-.3l2.5-.3c1.7-.2 3.3-.5 5-.7 3.4-.4 6.3-1.1 9.3-1.6 3-.6 6-1.2 9-2 5.9-1.3 11.6-3.1 17.3-4.8 11.2-3.7 21.7-8.2 31.5-13.2s18.8-10.7 27.2-16.6c2.4-1.7 4.7-3.5 7-5.3 9-7 10.4-20.2 3.2-29-6.3-7.7-17.1-9.7-25.7-4.9-2.1 1.2-4.3 2.3-6.5 3.4-7.5 3.6-15.3 7-23.6 9.7-8.3 2.6-16.9 4.8-25.9 6.4-4.5.6-9 1.3-13.6 1.7-2.3.3-4.6.4-7 .4-2.3.1-4.8.3-6.9.2-2.2 0-4.4-.1-6.7-.1-2.8-.1-5.6-.3-8.4-.4 0 0-1.4 0-.3-.1l-.9-.1-1.9-.2c-1.3-.1-2.5-.2-3.8-.4-2.5-.3-5-.6-7.5-1-20.1-2.8-40.5-8.7-60.1-17.6-19.7-8.9-38.5-21.1-55.5-36.4-17-15.2-31.8-33.6-43.4-54.4-11.6-20.7-19.7-43.8-23.5-68-1.9-12.1-2.7-24.6-2.4-36.8.2-3.4.3-6.7.5-10.1 0 .9.1-.5.1-.6l.1-1.2.2-2.5c.1-1.7.3-3.3.5-5 .7-6.6 1.7-13.3 2.9-19.8 9.3-52.7 35.7-104.1 76.5-143.2 10.2-9.7 21.2-18.8 32.9-26.8s24.2-15.2 37.2-21.2 26.6-10.9 40.5-14.7c13.9-3.7 28.2-6.2 42.7-7.5a263 263 0 0 1 21.8-.9c1.9 0 3.4.1 4.9.1l5.9.2 3.7.1c1.5 0 0 0 .7.1l1.5.1 5.9.4c15.7 1.3 31.4 3.5 46.8 7 30.9 6.9 60.9 18.2 88.9 33.7 56 31 103.7 79.5 133 138 14.8 29.1 25 60.5 30.2 92.9 1.2 8.1 2.2 16.3 2.9 24.5l.5 6.2.3 6.2c.1 2.1.1 4.1.2 6.2 0 2 .1 4.3.1 5.8v5.3l-.1 6c-.2 4-.5 10.5-.7 14.5-.7 8.9-1.4 17.9-2.6 26.8-1.1 8.8-2.6 17.6-4.2 26.4-1.8 8.7-3.6 17.4-5.9 26-4.3 17.3-9.9 34.2-16.4 50.8-13.1 33.2-30.6 64.7-51.7 93.8-42.3 58.1-100 105.6-165.6 135.4-32.8 14.8-67.4 25.7-103 31.6-17.8 3-35.8 4.8-53.8 5.4l-3.3.1h-2.9l-5.8.1h-13.3c2.5 0-.4 0-.3-.1l-1.8-.1c-9.7-.2-19.3-.7-28.9-1.4-38.5-2.9-76.6-9.7-113.5-20.5-36.9-10.7-72.7-25-106.6-43-67.7-36.2-128.2-85.8-175.6-145.6-23.8-29.8-44.6-61.8-61.8-95.5s-30.7-69-40.7-105.1c-9.9-36.1-16.1-73.1-18.5-110.3l-.4-7-.1-1.7v-1.5l-.1-3.1-.2-6.1-.1-1.5v-6.4l-.1-8.7v-5.7c0-4.5.2-9.1.3-13.6.7-18.4 2.2-37.3 4.6-56.2s5.5-37.9 9.4-56.8c3.9-18.8 8.5-37.5 13.7-55.8 10.5-36.7 23.6-72.3 39.1-105.9 31.1-67.3 71.9-126.6 120.9-174.4q18.3-18 38.1-33.9c13.2-10.6 26.9-20.4 41-29.6 14-9.3 28.5-17.7 43.4-25.5 7.4-4 15-7.5 22.6-11.2 3.8-1.7 7.7-3.4 11.5-5.1s7.7-3.4 11.6-4.9c15.5-6.6 31.5-12.1 47.5-17.3 4.1-1.2 8.1-2.5 12.1-3.7 4-1.3 8.2-2.2 12.2-3.4 8.1-2.3 16.4-4.2 24.6-6.3 4.1-1.1 8.3-1.8 12.4-2.7 4.2-.9 8.3-1.8 12.5-2.6s8.4-1.5 12.5-2.3l6.3-1.1 6.3-1c4.2-.6 8.4-1.3 12.6-1.9 4.7-.8 9.5-1.2 14.2-1.9 3.9-.5 10.2-1.2 14.1-1.7 3-.3 5.9-.6 8.9-.9l5.9-.6 3-.3 3.5-.2c4.8-.3 9.5-.6 14.3-.9l7.1-.5s2.6-.1.3-.1l1.5-.1 3-.1c4.1-.2 8.1-.4 12.2-.6 16.2-.5 32.3-.5 48.2 0 31.9 1.3 63.2 4.8 93.6 10.4 60.9 11.3 118.2 30.9 170 56.5 51.9 25.4 98.4 56.6 138.8 90.5 2.5 2.1 5 4.3 7.5 6.4 2.5 2.2 4.9 4.3 7.3 6.5 4.9 4.3 9.6 8.8 14.3 13.1 4.7 4.4 9.2 8.9 13.8 13.3 4.4 4.5 8.9 8.9 13.2 13.5 17.1 18.1 33 36.5 47.3 55 28.7 36.9 51.6 74.1 69.9 109.3 1.2 2.2 2.3 4.4 3.4 6.6s2.2 4.4 3.2 6.6c2.1 4.3 4.3 8.6 6.2 12.9 2 4.3 4 8.5 5.9 12.7 1.8 4.2 3.6 8.4 5.4 12.4 6.8 16.5 13 32.1 18.1 47 8.4 23.9 14.5 45.5 19.3 64.2 1.9 7.5 9 12.5 16.7 11.8 8-.7 14.1-7.3 14.3-15.3.4-20.1-.1-43.8-2.4-70.8-3-33.4-8.7-72.1-20-114.6-11.1-42.5-27.6-89-51.6-137.3-24.1-48.2-55.5-98.4-96.3-146.9-15.9-19-33.3-37.8-52.1-56.1 28-111.4-34.1-208-34.1-208-107.2-6.7-175.4 33.3-200.7 51.6-4.2-1.8-8.5-3.6-12.8-5.4-18.3-7.4-37-14.3-56.3-20.4s-39-11.7-59.1-16.4c-20.2-4.7-40.7-8.7-61.6-11.9-3.7-.5-7.3-1-11-1.6-46.6-149.4-180.9-211.9-180.9-211.9-149.8 94.5-178.3 227.4-178.3 227.4"/></defs><path d="M412.7 100.8h1834.4v1992.3H412.7z" style="clip-path:url(#c);fill:url(#e)" transform="translate(-10.727 -3.252)scale(.03213)"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Grafana/types.d.ts b/packages/nodes-base/nodes/Grafana/types.ts
similarity index 100%
rename from packages/nodes-base/nodes/Grafana/types.d.ts
rename to packages/nodes-base/nodes/Grafana/types.ts
diff --git a/packages/nodes-base/nodes/GraphQL/GraphQL.node.ts b/packages/nodes-base/nodes/GraphQL/GraphQL.node.ts
index 13129d9d3aea2..ff2df48de48c4 100644
--- a/packages/nodes-base/nodes/GraphQL/GraphQL.node.ts
+++ b/packages/nodes-base/nodes/GraphQL/GraphQL.node.ts
@@ -6,11 +6,11 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 	JsonObject,
+	IRequestOptionsSimplified,
+	IRequestOptions,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
-import { NodeApiError, NodeOperationError } from 'n8n-workflow';
-
-import type { OptionsWithUri } from 'request';
-import type { RequestPromiseOptions } from 'request-promise-native';
+import { NodeApiError, NodeOperationError, jsonParse } from 'n8n-workflow';
 
 export class GraphQL implements INodeType {
 	description: INodeTypeDescription = {
@@ -36,6 +36,15 @@ export class GraphQL implements INodeType {
 					},
 				},
 			},
+			{
+				name: 'httpCustomAuth',
+				required: true,
+				displayOptions: {
+					show: {
+						authentication: ['customAuth'],
+					},
+				},
+			},
 			{
 				name: 'httpDigestAuth',
 				required: true,
@@ -92,6 +101,10 @@ export class GraphQL implements INodeType {
 						name: 'Basic Auth',
 						value: 'basicAuth',
 					},
+					{
+						name: 'Custom Auth',
+						value: 'customAuth',
+					},
 					{
 						name: 'Digest Auth',
 						value: 'digestAuth',
@@ -284,6 +297,7 @@ export class GraphQL implements INodeType {
 		const items = this.getInputData();
 		let httpBasicAuth;
 		let httpDigestAuth;
+		let httpCustomAuth;
 		let httpHeaderAuth;
 		let httpQueryAuth;
 		let oAuth1Api;
@@ -294,6 +308,11 @@ export class GraphQL implements INodeType {
 		} catch (error) {
 			// Do nothing
 		}
+		try {
+			httpCustomAuth = await this.getCredentials('httpCustomAuth');
+		} catch (error) {
+			// Do nothing
+		}
 		try {
 			httpDigestAuth = await this.getCredentials('httpDigestAuth');
 		} catch (error) {
@@ -320,12 +339,16 @@ export class GraphQL implements INodeType {
 			// Do nothing
 		}
 
-		let requestOptions: OptionsWithUri & RequestPromiseOptions;
+		let requestOptions: IRequestOptions;
 
 		const returnItems: INodeExecutionData[] = [];
 		for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
 			try {
-				const requestMethod = this.getNodeParameter('requestMethod', itemIndex, 'POST') as string;
+				const requestMethod = this.getNodeParameter(
+					'requestMethod',
+					itemIndex,
+					'POST',
+				) as IHttpRequestMethods;
 				const endpoint = this.getNodeParameter('endpoint', itemIndex, '') as string;
 				const requestFormat = this.getNodeParameter(
 					'requestFormat',
@@ -361,6 +384,21 @@ export class GraphQL implements INodeType {
 						pass: httpBasicAuth.password as string,
 					};
 				}
+				if (httpCustomAuth !== undefined) {
+					const customAuth = jsonParse<IRequestOptionsSimplified>(
+						(httpCustomAuth.json as string) || '{}',
+						{ errorMessage: 'Invalid Custom Auth JSON' },
+					);
+					if (customAuth.headers) {
+						requestOptions.headers = { ...requestOptions.headers, ...customAuth.headers };
+					}
+					if (customAuth.body) {
+						requestOptions.body = { ...requestOptions.body, ...customAuth.body };
+					}
+					if (customAuth.qs) {
+						requestOptions.qs = { ...requestOptions.qs, ...customAuth.qs };
+					}
+				}
 				if (httpHeaderAuth !== undefined) {
 					requestOptions.headers![httpHeaderAuth.name as string] = httpHeaderAuth.value;
 				}
@@ -386,31 +424,31 @@ export class GraphQL implements INodeType {
 					requestOptions.qs.query = gqlQuery;
 				} else {
 					if (requestFormat === 'json') {
-						requestOptions.body = {
+						const jsonBody = {
+							...requestOptions.body,
 							query: gqlQuery,
 							variables: this.getNodeParameter('variables', itemIndex, {}) as object,
 							operationName: this.getNodeParameter('operationName', itemIndex) as string,
 						};
-						if (typeof requestOptions.body.variables === 'string') {
+						if (typeof jsonBody.variables === 'string') {
 							try {
-								requestOptions.body.variables = JSON.parse(
-									(requestOptions.body.variables as string) || '{}',
-								);
+								jsonBody.variables = JSON.parse(jsonBody.variables || '{}');
 							} catch (error) {
 								throw new NodeOperationError(
 									this.getNode(),
 									'Using variables failed:\n' +
-										(requestOptions.body.variables as string) +
+										(jsonBody.variables as string) +
 										'\n\nWith error message:\n' +
 										(error as string),
 									{ itemIndex },
 								);
 							}
 						}
-						if (requestOptions.body.operationName === '') {
-							requestOptions.body.operationName = null;
+						if (jsonBody.operationName === '') {
+							jsonBody.operationName = null;
 						}
 						requestOptions.json = true;
+						requestOptions.body = jsonBody;
 					} else {
 						requestOptions.body = gqlQuery;
 					}
@@ -447,18 +485,29 @@ export class GraphQL implements INodeType {
 						}
 					}
 
-					if (response.errors) {
-						const message =
-							response.errors?.map((error: IDataObject) => error.message).join(', ') ||
-							'Unexpected error';
-						throw new NodeApiError(this.getNode(), response.errors as JsonObject, { message });
-					}
 					const executionData = this.helpers.constructExecutionMetaData(
 						this.helpers.returnJsonArray(response as IDataObject),
 						{ itemData: { item: itemIndex } },
 					);
 					returnItems.push(...executionData);
 				}
+
+				// parse error string messages
+				if (typeof response === 'string' && response.startsWith('{"errors":')) {
+					try {
+						const errorResponse = JSON.parse(response) as IDataObject;
+						if (Array.isArray(errorResponse.errors)) {
+							response = errorResponse;
+						}
+					} catch (e) {}
+				}
+				// throw from response object.errors[]
+				if (typeof response === 'object' && response.errors) {
+					const message =
+						response.errors?.map((error: IDataObject) => error.message).join(', ') ||
+						'Unexpected error';
+					throw new NodeApiError(this.getNode(), response.errors as JsonObject, { message });
+				}
 			} catch (error) {
 				if (this.continueOnFail()) {
 					const errorData = this.helpers.returnJsonArray({
@@ -476,6 +525,6 @@ export class GraphQL implements INodeType {
 			}
 		}
 
-		return this.prepareOutputData(returnItems);
+		return [returnItems];
 	}
 }
diff --git a/packages/nodes-base/nodes/GraphQL/test/GraphQL.node.test.ts b/packages/nodes-base/nodes/GraphQL/test/GraphQL.node.test.ts
new file mode 100644
index 0000000000000..4d099f5769883
--- /dev/null
+++ b/packages/nodes-base/nodes/GraphQL/test/GraphQL.node.test.ts
@@ -0,0 +1,54 @@
+import type { WorkflowTestData } from '@test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+import * as Helpers from '@test/nodes/Helpers';
+
+describe('GraphQL Node', () => {
+	const mockResponse = {
+		data: {
+			nodes: {},
+		},
+	};
+
+	const tests: WorkflowTestData[] = [
+		{
+			description: 'should run Request Format JSON',
+			input: {
+				workflowData: Helpers.readJsonFileSync('nodes/GraphQL/test/workflow.json'),
+			},
+			output: {
+				nodeExecutionOrder: ['Start'],
+				nodeData: {
+					'Fetch Request Format JSON': [
+						[
+							{
+								json: mockResponse,
+							},
+						],
+					],
+				},
+			},
+			nock: {
+				baseUrl: 'https://api.n8n.io',
+				mocks: [
+					{
+						method: 'post',
+						path: '/graphql',
+						statusCode: 200,
+						responseBody: mockResponse,
+					},
+				],
+			},
+		},
+	];
+
+	const nodeTypes = Helpers.setup(tests);
+
+	test.each(tests)('$description', async (testData) => {
+		const { result } = await executeWorkflow(testData, nodeTypes);
+		const resultNodeData = Helpers.getResultNodeData(result, testData);
+		resultNodeData.forEach(({ nodeName, resultData }) =>
+			expect(resultData).toEqual(testData.output.nodeData[nodeName]),
+		);
+		expect(result.finished).toEqual(true);
+	});
+});
diff --git a/packages/nodes-base/nodes/GraphQL/test/workflow.json b/packages/nodes-base/nodes/GraphQL/test/workflow.json
new file mode 100644
index 0000000000000..f78c655da4778
--- /dev/null
+++ b/packages/nodes-base/nodes/GraphQL/test/workflow.json
@@ -0,0 +1,42 @@
+{
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "104a4d08d8897b8bdeb38aaca515021075e0bd8544c983c2bb8c86e6a8e6081c"
+	},
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "fb826323-2e48-4f11-bb0e-e12de32e22ee",
+			"name": "When clicking \"Test workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [180, 160]
+		},
+		{
+			"parameters": {
+				"endpoint": "https://api.n8n.io/graphql",
+				"requestFormat": "json",
+				"query": "query {\n  nodes(pagination: { limit: 1 }) {\n    data {\n      id\n      attributes {\n        name\n        displayName\n        description\n        group\n        codex\n        createdAt\n      }\n    }\n  }\n}"
+			},
+			"name": "Fetch Request Format JSON",
+			"type": "n8n-nodes-base.graphql",
+			"typeVersion": 1,
+			"position": [420, 160],
+			"id": "7f8ceaf4-b82f-48d5-be0b-9fe3bfb35ee4"
+		}
+	],
+	"connections": {
+		"When clicking \"Test workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Fetch Request Format JSON",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"pinData": {}
+}
diff --git a/packages/nodes-base/nodes/Grist/GenericFunctions.ts b/packages/nodes-base/nodes/Grist/GenericFunctions.ts
index 3fb890c20b19c..07a4505d35eda 100644
--- a/packages/nodes-base/nodes/Grist/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Grist/GenericFunctions.ts
@@ -1,9 +1,9 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
+	IRequestOptions,
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
@@ -17,7 +17,7 @@ import type {
 
 export async function gristApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject | number[] = {},
 	qs: IDataObject = {},
@@ -30,10 +30,10 @@ export async function gristApiRequest(
 		planType === 'free'
 			? `https://docs.getgrist.com/api${endpoint}`
 			: planType === 'paid'
-			? `https://${customSubdomain}.getgrist.com/api${endpoint}`
-			: `${selfHostedUrl}/api${endpoint}`;
+				? `https://${customSubdomain}.getgrist.com/api${endpoint}`
+				: `${selfHostedUrl}/api${endpoint}`;
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			Authorization: `Bearer ${apiKey}`,
 		},
diff --git a/packages/nodes-base/nodes/Grist/Grist.node.ts b/packages/nodes-base/nodes/Grist/Grist.node.ts
index cbc152205e986..675b5d5a99dd2 100644
--- a/packages/nodes-base/nodes/Grist/Grist.node.ts
+++ b/packages/nodes-base/nodes/Grist/Grist.node.ts
@@ -8,10 +8,9 @@ import type {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	IRequestOptions,
 } from 'n8n-workflow';
 
-import type { OptionsWithUri } from 'request';
-
 import {
 	gristApiRequest,
 	parseAutoMappedInputs,
@@ -83,10 +82,10 @@ export class Grist implements INodeType {
 					planType === 'free'
 						? `https://docs.getgrist.com/api${endpoint}`
 						: planType === 'paid'
-						? `https://${customSubdomain}.getgrist.com/api${endpoint}`
-						: `${selfHostedUrl}/api${endpoint}`;
+							? `https://${customSubdomain}.getgrist.com/api${endpoint}`
+							: `${selfHostedUrl}/api${endpoint}`;
 
-				const options: OptionsWithUri = {
+				const options: IRequestOptions = {
 					headers: {
 						Authorization: `Bearer ${apiKey}`,
 					},
@@ -263,6 +262,6 @@ export class Grist implements INodeType {
 			returnData.push(...executionData);
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Grist/grist.svg b/packages/nodes-base/nodes/Grist/grist.svg
index 180f36b827a7d..6945efdfa606b 100644
--- a/packages/nodes-base/nodes/Grist/grist.svg
+++ b/packages/nodes-base/nodes/Grist/grist.svg
@@ -1 +1 @@
-<svg id="svg" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="400" height="400" viewBox="0, 0, 400,400"><g id="svgg"><path id="path0" d="M142.540 174.296 C 142.658 198.242,142.978 207.381,143.849 211.600 C 144.008 212.370,144.155 213.090,144.175 213.200 C 144.196 213.310,144.324 213.580,144.460 213.800 C 144.596 214.020,144.834 214.965,144.989 215.900 C 145.144 216.835,145.417 217.600,145.595 217.600 C 145.774 217.600,146.136 218.500,146.400 219.600 C 146.664 220.700,147.042 221.600,147.240 221.600 C 147.438 221.600,147.600 221.947,147.600 222.371 C 147.600 222.796,147.835 223.381,148.122 223.671 C 148.719 224.275,149.360 225.649,149.260 226.111 C 149.223 226.282,149.464 226.527,149.796 226.654 C 150.128 226.781,150.400 227.142,150.400 227.455 C 150.400 227.769,150.654 228.122,150.964 228.241 C 151.274 228.361,151.627 228.850,151.749 229.329 C 151.966 230.182,153.107 231.817,154.500 233.270 C 154.885 233.671,155.200 234.055,155.200 234.122 C 155.200 234.450,160.013 239.146,161.408 240.179 C 162.283 240.827,163.128 241.547,163.285 241.779 C 163.442 242.010,163.764 242.200,164.000 242.200 C 164.236 242.200,164.558 242.398,164.715 242.640 C 165.066 243.182,166.890 244.201,167.300 244.085 C 167.465 244.038,167.600 244.176,167.600 244.392 C 167.600 244.705,170.367 246.411,171.200 246.612 C 171.310 246.639,172.599 247.232,174.065 247.930 C 175.530 248.629,177.065 249.200,177.476 249.200 C 177.886 249.200,178.592 249.459,179.044 249.776 C 179.496 250.092,181.471 250.555,183.433 250.804 C 185.395 251.054,187.313 251.425,187.695 251.629 C 188.106 251.849,202.472 252.000,222.983 252.000 L 257.578 252.000 257.594 225.948 C 257.607 205.531,257.502 199.760,257.105 199.271 C 256.683 198.749,256.698 198.704,257.200 199.000 C 257.679 199.283,257.711 199.238,257.355 198.777 C 257.110 198.460,256.793 196.310,256.650 194.000 C 256.397 189.885,255.355 184.994,254.220 182.591 C 253.906 181.926,253.554 180.860,253.438 180.223 C 253.323 179.586,253.056 178.958,252.846 178.828 C 252.636 178.698,252.340 178.099,252.188 177.496 C 252.037 176.893,251.772 176.400,251.600 176.400 C 251.428 176.400,251.169 175.932,251.026 175.360 C 250.773 174.353,249.347 172.054,248.666 171.555 C 248.482 171.421,248.349 171.151,248.369 170.955 C 248.390 170.760,248.095 170.240,247.714 169.800 C 245.885 167.689,242.324 163.400,242.077 163.011 C 241.925 162.770,240.360 161.410,238.600 159.987 C 236.840 158.564,235.268 157.220,235.106 157.000 C 234.944 156.780,234.809 156.733,234.806 156.896 C 234.800 157.186,230.796 154.897,230.400 154.378 C 230.290 154.234,229.525 153.896,228.700 153.627 C 227.875 153.358,227.200 152.980,227.200 152.787 C 227.200 152.594,226.570 152.318,225.800 152.174 C 225.030 152.029,224.400 151.774,224.400 151.607 C 224.400 151.441,223.545 151.073,222.500 150.790 C 221.455 150.507,220.406 150.127,220.168 149.946 C 219.931 149.764,217.996 149.395,215.868 149.127 C 213.741 148.858,212.000 148.498,212.000 148.328 C 212.000 148.157,196.343 148.011,177.206 148.004 L 142.411 147.992 142.540 174.296 M331.600 148.342 C 331.600 148.530,330.475 148.797,329.100 148.934 C 327.725 149.071,326.060 149.298,325.400 149.438 C 324.740 149.579,323.983 149.702,323.718 149.713 C 323.452 149.724,323.315 149.863,323.414 150.022 C 323.512 150.181,322.784 150.432,321.796 150.580 C 320.808 150.728,320.000 151.012,320.000 151.212 C 320.000 151.412,319.730 151.471,319.400 151.345 C 319.070 151.218,318.800 151.314,318.800 151.557 C 318.800 151.801,318.363 152.000,317.829 152.000 C 317.294 152.000,316.619 152.233,316.329 152.517 C 316.038 152.801,315.170 153.289,314.400 153.600 C 313.630 153.911,312.762 154.399,312.471 154.683 C 312.181 154.967,311.686 155.200,311.371 155.200 C 311.057 155.200,310.800 155.358,310.800 155.551 C 310.800 155.745,310.260 156.127,309.600 156.400 C 308.940 156.673,308.400 157.043,308.400 157.222 C 308.400 157.400,308.085 157.647,307.700 157.770 C 307.315 157.894,306.292 158.626,305.427 159.397 C 304.562 160.169,303.697 160.800,303.504 160.800 C 303.311 160.800,303.264 160.980,303.400 161.200 C 303.536 161.420,303.469 161.600,303.251 161.600 C 303.034 161.600,302.078 162.419,301.128 163.420 C 300.178 164.420,298.743 165.933,297.939 166.780 C 297.136 167.628,296.358 168.701,296.211 169.166 C 296.063 169.631,295.802 169.925,295.630 169.818 C 295.337 169.638,294.453 171.126,294.554 171.629 C 294.579 171.754,294.285 172.172,293.900 172.557 C 293.515 172.942,293.200 173.499,293.200 173.795 C 293.200 174.091,293.065 174.393,292.900 174.467 C 292.507 174.641,290.400 178.938,290.400 179.564 C 290.400 179.830,290.250 179.955,290.067 179.841 C 289.883 179.728,289.728 179.852,289.722 180.118 C 289.716 180.383,289.236 181.999,288.656 183.708 C 288.075 185.418,287.600 187.263,287.600 187.808 C 287.600 188.354,287.450 188.800,287.267 188.800 C 287.083 188.800,286.915 189.025,286.894 189.300 C 286.872 189.575,286.665 191.870,286.433 194.400 C 286.191 197.053,286.010 210.217,286.007 225.500 L 286.000 252.000 320.405 252.000 C 340.891 252.000,355.092 251.849,355.505 251.627 C 355.887 251.422,357.865 251.036,359.900 250.769 C 361.935 250.502,363.600 250.159,363.600 250.006 C 363.600 249.853,364.590 249.490,365.800 249.200 C 367.010 248.910,368.000 248.541,368.000 248.381 C 368.000 248.220,368.630 247.971,369.400 247.826 C 370.170 247.682,370.800 247.406,370.800 247.214 C 370.800 247.021,371.338 246.745,371.995 246.601 C 372.653 246.457,373.295 246.170,373.423 245.963 C 373.550 245.757,374.227 245.314,374.927 244.980 C 377.345 243.824,378.400 243.155,378.400 242.778 C 378.400 242.570,378.641 242.400,378.937 242.400 C 379.623 242.400,380.843 241.370,384.912 237.356 C 388.140 234.171,390.487 231.600,390.165 231.600 C 390.075 231.600,390.801 230.514,391.778 229.187 C 392.755 227.860,393.667 226.420,393.804 225.987 C 393.942 225.554,394.222 225.200,394.427 225.200 C 394.632 225.200,394.800 224.998,394.800 224.750 C 394.800 224.295,396.453 220.238,397.388 218.400 C 397.668 217.850,398.026 216.680,398.184 215.800 C 398.342 214.920,398.615 214.020,398.790 213.800 C 399.757 212.586,400.000 205.256,400.000 177.336 L 400.000 148.000 365.800 148.000 C 346.990 148.000,331.600 148.154,331.600 148.342 M142.414 307.768 C 142.410 322.612,142.558 334.850,142.744 334.965 C 142.929 335.080,143.207 337.288,143.362 339.872 C 143.516 342.455,143.790 344.756,143.969 344.985 C 144.148 345.213,144.522 346.390,144.800 347.600 C 145.078 348.810,145.430 349.980,145.582 350.200 C 145.874 350.620,146.936 354.117,146.832 354.314 C 146.799 354.377,147.048 354.705,147.386 355.043 C 147.724 355.381,148.000 355.914,148.000 356.229 C 148.000 356.543,148.166 356.800,148.368 356.800 C 148.571 356.800,148.855 357.339,148.999 357.998 C 149.144 358.656,149.484 359.331,149.755 359.498 C 150.025 359.664,150.477 360.370,150.758 361.067 C 151.040 361.764,151.788 362.934,152.422 363.667 C 153.056 364.400,153.768 365.225,154.003 365.500 C 154.239 365.775,154.357 366.000,154.266 366.000 C 154.174 366.000,154.960 366.888,156.011 367.972 C 157.062 369.057,157.819 370.047,157.694 370.172 C 157.569 370.298,157.734 370.400,158.061 370.400 C 158.388 370.400,159.022 370.805,159.470 371.300 C 161.066 373.063,164.505 375.811,165.941 376.470 C 166.743 376.839,167.220 377.157,167.000 377.176 C 166.437 377.226,174.010 380.952,174.974 381.099 C 175.409 381.166,175.863 381.351,175.983 381.510 C 176.410 382.081,181.444 383.589,183.800 383.853 C 185.120 384.000,186.328 384.319,186.485 384.561 C 186.918 385.227,256.226 385.442,257.025 384.779 C 257.733 384.191,257.895 331.600,257.189 331.600 C 256.975 331.600,256.796 330.385,256.792 328.900 C 256.783 325.703,256.131 320.841,255.629 320.231 C 255.434 319.994,255.148 318.945,254.992 317.900 C 254.836 316.855,254.578 316.000,254.418 316.000 C 254.258 316.000,253.908 315.022,253.641 313.826 C 253.373 312.630,253.029 311.595,252.877 311.526 C 252.725 311.457,252.060 310.320,251.400 309.000 C 250.740 307.680,250.108 306.510,249.996 306.400 C 249.601 306.012,247.458 302.600,247.610 302.600 C 247.890 302.600,245.887 300.301,241.824 295.959 C 240.877 294.947,239.404 293.598,238.551 292.961 C 237.698 292.325,236.910 291.702,236.800 291.576 C 236.449 291.175,232.866 288.800,232.611 288.800 C 232.387 288.800,232.126 288.609,230.686 287.388 C 230.419 287.161,229.435 286.727,228.500 286.424 C 227.565 286.120,226.800 285.721,226.800 285.536 C 226.800 285.351,226.602 285.200,226.360 285.200 C 226.119 285.200,225.354 284.946,224.660 284.636 C 221.964 283.430,215.656 281.755,212.000 281.275 C 211.230 281.174,195.260 281.021,176.511 280.935 L 142.422 280.779 142.414 307.768 M332.400 281.150 C 332.400 281.333,331.725 281.491,330.900 281.502 C 328.724 281.528,325.228 282.281,324.486 282.882 C 323.946 283.319,323.901 283.307,324.200 282.800 C 324.483 282.320,324.438 282.290,323.977 282.648 C 323.660 282.895,322.455 283.334,321.300 283.624 C 320.145 283.914,319.200 284.289,319.200 284.457 C 319.200 284.626,318.570 284.882,317.800 285.026 C 317.030 285.171,316.400 285.420,316.400 285.580 C 316.400 285.741,315.680 286.110,314.800 286.400 C 313.920 286.690,313.200 287.058,313.200 287.217 C 313.200 287.455,312.424 287.775,311.391 287.965 C 311.286 287.984,310.870 288.315,310.466 288.700 C 310.062 289.085,309.320 289.670,308.817 290.000 C 308.314 290.330,307.654 290.838,307.351 291.129 C 307.048 291.419,306.800 291.553,306.800 291.425 C 306.800 291.093,304.775 292.912,300.940 296.690 C 299.103 298.500,297.600 300.165,297.600 300.390 C 297.600 300.616,297.416 300.800,297.191 300.800 C 296.967 300.800,296.564 301.295,296.298 301.900 C 296.031 302.505,295.479 303.246,295.072 303.547 C 294.665 303.847,293.986 304.837,293.565 305.747 C 293.143 306.656,292.442 307.985,292.007 308.700 C 291.572 309.415,291.348 310.003,291.508 310.006 C 291.669 310.009,291.618 310.144,291.396 310.306 C 290.786 310.750,289.254 314.400,288.966 316.096 C 288.827 316.920,288.569 317.504,288.394 317.396 C 288.219 317.288,287.946 318.144,287.789 319.300 C 287.632 320.455,287.355 321.494,287.175 321.609 C 286.340 322.141,285.968 335.008,286.081 359.400 L 286.200 385.000 321.315 385.000 C 345.214 385.000,356.521 384.867,356.715 384.583 C 356.872 384.354,358.507 383.953,360.350 383.691 C 362.192 383.430,363.902 383.057,364.150 382.863 C 364.647 382.474,366.827 381.831,367.300 381.934 C 367.465 381.970,367.600 381.840,367.600 381.643 C 367.600 381.327,368.720 380.889,370.360 380.564 C 370.668 380.503,371.028 380.285,371.160 380.081 C 371.292 379.876,371.850 379.569,372.400 379.399 C 372.950 379.229,374.152 378.575,375.072 377.945 C 375.992 377.315,376.927 376.800,377.149 376.800 C 377.372 376.800,377.806 376.441,378.113 376.003 C 378.420 375.564,378.766 375.300,378.882 375.415 C 378.997 375.531,379.521 375.173,380.046 374.619 C 380.571 374.066,381.141 373.611,381.313 373.607 C 381.824 373.596,388.517 366.728,389.601 365.103 C 390.150 364.279,390.735 363.604,390.900 363.603 C 391.065 363.601,391.200 363.407,391.200 363.171 C 391.200 362.936,391.425 362.492,391.700 362.185 C 392.837 360.917,393.200 360.417,393.201 360.117 C 393.202 359.943,393.833 358.753,394.604 357.474 C 395.376 356.195,395.853 355.244,395.665 355.360 C 395.477 355.476,395.742 354.744,396.254 353.734 C 396.765 352.724,397.087 351.740,396.968 351.548 C 396.850 351.357,396.922 351.200,397.129 351.200 C 397.336 351.200,397.736 350.345,398.019 349.300 C 398.601 347.147,398.582 347.210,398.918 346.400 C 399.787 344.305,400.000 337.179,400.000 310.167 L 400.000 280.792 366.200 280.805 C 347.610 280.812,332.400 280.967,332.400 281.150 " stroke="none" fill="#d4d4d4" fill-rule="evenodd"></path><path id="path1" d="M142.696 15.038 C 142.228 15.506,142.331 68.710,142.800 69.000 C 143.020 69.136,143.200 70.259,143.200 71.497 C 143.200 74.622,144.032 80.800,144.452 80.800 C 144.644 80.800,144.806 81.295,144.814 81.900 C 144.821 82.505,145.175 83.720,145.600 84.600 C 146.025 85.480,146.379 86.426,146.386 86.701 C 146.394 86.977,146.760 87.875,147.200 88.696 C 147.640 89.516,148.000 90.416,148.000 90.694 C 148.000 90.972,148.144 91.200,148.320 91.200 C 148.495 91.200,148.867 91.830,149.146 92.600 C 149.424 93.370,149.820 94.000,150.026 94.000 C 150.232 94.000,150.400 94.237,150.400 94.528 C 150.400 94.818,151.129 96.033,152.020 97.228 C 152.911 98.422,153.946 99.827,154.320 100.348 C 155.448 101.920,159.744 106.131,162.042 107.916 C 163.229 108.838,164.418 109.775,164.685 109.998 C 164.952 110.221,165.672 110.626,166.285 110.897 C 166.898 111.169,167.619 111.573,167.886 111.795 C 168.153 112.018,168.614 112.400,168.909 112.643 C 169.204 112.887,170.110 113.306,170.923 113.574 C 171.735 113.843,172.400 114.214,172.400 114.399 C 172.400 114.585,172.942 114.855,173.604 115.001 C 174.266 115.146,175.341 115.531,175.992 115.856 C 176.643 116.181,177.856 116.554,178.688 116.685 C 179.519 116.816,180.290 117.052,180.400 117.209 C 180.590 117.480,182.950 118.013,187.400 118.792 C 188.500 118.984,204.745 119.155,223.500 119.171 L 257.600 119.200 257.600 92.624 C 257.600 75.337,257.460 65.961,257.200 65.800 C 256.980 65.664,256.800 64.406,256.800 63.005 C 256.800 60.042,256.073 54.382,255.617 53.800 C 255.445 53.580,255.184 52.733,255.037 51.917 C 254.890 51.101,254.508 49.931,254.188 49.317 C 253.867 48.703,253.604 48.012,253.602 47.782 C 253.599 47.167,250.312 40.623,249.928 40.467 C 249.748 40.393,249.600 40.151,249.600 39.928 C 249.600 38.065,240.798 28.218,236.793 25.600 C 236.289 25.270,235.593 24.685,235.249 24.300 C 234.904 23.915,234.420 23.600,234.172 23.600 C 233.925 23.600,233.307 23.240,232.800 22.800 C 232.293 22.360,231.712 22.000,231.510 22.000 C 231.308 22.000,230.864 21.721,230.523 21.380 C 230.182 21.040,229.385 20.657,228.752 20.530 C 228.118 20.404,227.600 20.162,227.600 19.993 C 227.600 19.825,227.111 19.564,226.514 19.414 C 225.917 19.264,224.666 18.795,223.736 18.371 C 222.805 17.947,221.764 17.600,221.422 17.600 C 221.080 17.600,220.800 17.449,220.800 17.264 C 220.800 17.080,219.225 16.706,217.300 16.433 C 215.375 16.160,213.440 15.726,213.000 15.468 C 212.091 14.936,143.219 14.514,142.696 15.038 M333.500 15.097 C 331.795 15.172,330.400 15.406,330.400 15.617 C 330.400 15.828,329.800 16.000,329.067 16.000 C 327.311 16.000,323.102 16.820,322.620 17.256 C 322.411 17.445,321.988 17.600,321.680 17.600 C 321.373 17.600,320.554 17.854,319.860 18.165 C 319.167 18.476,317.430 19.231,316.000 19.843 C 314.570 20.456,312.971 21.281,312.446 21.678 C 311.921 22.075,311.246 22.400,310.946 22.400 C 310.646 22.400,310.400 22.551,310.400 22.736 C 310.400 22.920,309.943 23.280,309.385 23.534 C 308.281 24.037,307.508 24.614,306.483 25.700 C 306.120 26.085,305.637 26.401,305.411 26.402 C 304.968 26.403,297.600 33.700,297.600 34.137 C 297.600 34.281,297.285 34.739,296.900 35.153 C 295.662 36.483,294.800 37.750,294.800 38.239 C 294.800 38.500,294.530 38.818,294.200 38.945 C 293.870 39.071,293.600 39.438,293.600 39.759 C 293.600 40.080,293.368 40.581,293.085 40.871 C 292.339 41.638,290.400 45.480,290.400 46.193 C 290.400 46.527,290.238 46.800,290.040 46.800 C 289.842 46.800,289.458 47.745,289.188 48.900 C 288.917 50.055,288.559 51.180,288.393 51.400 C 288.227 51.620,287.960 52.610,287.800 53.600 C 287.640 54.590,287.358 55.589,287.172 55.820 C 286.359 56.832,286.000 68.196,286.000 92.874 L 286.000 119.232 321.539 119.116 C 346.951 119.033,357.237 118.873,357.639 118.553 C 357.947 118.307,359.186 117.981,360.390 117.828 C 361.595 117.674,362.765 117.410,362.990 117.241 C 363.216 117.072,364.435 116.695,365.700 116.403 C 366.965 116.111,368.000 115.741,368.000 115.581 C 368.000 115.420,368.630 115.171,369.400 115.026 C 370.170 114.882,370.800 114.606,370.800 114.414 C 370.800 114.221,371.325 113.948,371.967 113.807 C 372.609 113.666,373.537 113.202,374.028 112.775 C 374.520 112.349,375.165 112.000,375.461 112.000 C 375.758 112.000,376.000 111.832,376.000 111.627 C 376.000 111.422,376.359 111.140,376.798 111.001 C 377.236 110.862,377.821 110.527,378.098 110.257 C 378.374 109.988,378.987 109.500,379.460 109.174 C 382.322 107.199,387.600 102.317,387.600 101.644 C 387.600 101.386,387.847 101.080,388.149 100.964 C 388.451 100.848,389.299 99.909,390.035 98.877 C 390.770 97.845,391.603 96.762,391.886 96.471 C 392.169 96.181,392.400 95.686,392.400 95.371 C 392.400 95.057,392.568 94.800,392.774 94.800 C 392.980 94.800,393.376 94.170,393.654 93.400 C 393.933 92.630,394.290 92.000,394.449 92.000 C 394.607 92.000,394.855 91.460,395.000 90.800 C 395.145 90.140,395.400 89.600,395.568 89.600 C 395.735 89.600,396.112 88.835,396.406 87.900 C 396.699 86.965,397.088 86.029,397.270 85.820 C 397.451 85.611,397.600 85.188,397.600 84.880 C 397.600 84.573,397.857 83.754,398.170 83.060 C 399.671 79.742,399.732 78.444,399.888 46.300 L 400.040 14.800 368.320 14.880 C 350.874 14.925,335.205 15.022,333.500 15.097 " stroke="none" fill="#2cb3ac" fill-rule="evenodd"></path><path id="path2" d="M0.002 177.500 C 0.005 207.289,0.291 214.051,1.603 215.363 C 1.821 215.581,2.000 216.102,2.000 216.520 C 2.000 217.275,2.180 217.738,4.161 222.075 C 4.732 223.327,5.200 224.542,5.200 224.775 C 5.200 225.009,5.335 225.201,5.500 225.201 C 5.665 225.202,6.334 226.192,6.986 227.401 C 7.638 228.611,8.291 229.600,8.437 229.600 C 8.583 229.600,8.921 230.127,9.188 230.771 C 9.455 231.415,9.927 232.040,10.237 232.159 C 10.546 232.278,10.800 232.572,10.800 232.813 C 10.800 233.187,17.408 239.868,19.207 241.313 C 20.458 242.318,23.193 244.060,24.800 244.876 C 25.350 245.155,25.890 245.490,26.000 245.619 C 26.418 246.112,33.378 249.199,34.078 249.202 C 34.365 249.204,35.065 249.448,35.633 249.744 C 36.201 250.040,38.181 250.506,40.033 250.778 C 41.885 251.050,43.713 251.437,44.095 251.636 C 44.496 251.846,59.414 252.000,79.395 252.000 L 114.000 252.000 114.000 225.658 C 114.000 201.048,113.630 189.328,112.838 188.813 C 112.658 188.696,112.379 187.700,112.218 186.600 C 112.057 185.500,111.785 184.420,111.614 184.200 C 111.443 183.980,111.066 182.855,110.776 181.700 C 110.486 180.545,110.110 179.600,109.940 179.600 C 109.771 179.600,109.416 178.880,109.153 178.000 C 108.889 177.120,108.541 176.400,108.380 176.400 C 108.219 176.400,107.963 175.907,107.812 175.304 C 107.660 174.701,107.407 174.116,107.249 174.004 C 107.091 173.892,106.446 172.900,105.817 171.800 C 105.187 170.700,104.431 169.656,104.136 169.480 C 103.841 169.304,103.600 168.973,103.600 168.744 C 103.600 167.851,96.827 160.931,93.886 158.819 C 92.849 158.074,92.000 157.337,92.000 157.181 C 92.000 157.025,91.415 156.660,90.700 156.371 C 89.985 156.082,89.310 155.736,89.200 155.602 C 88.827 155.147,86.206 153.693,85.219 153.393 C 84.679 153.229,83.991 152.848,83.690 152.547 C 83.389 152.246,82.806 152.000,82.395 152.000 C 81.984 152.000,81.547 151.838,81.425 151.640 C 81.303 151.442,80.257 151.056,79.101 150.782 C 77.946 150.508,76.906 150.141,76.792 149.967 C 76.677 149.792,74.967 149.440,72.992 149.184 C 71.016 148.929,69.087 148.558,68.705 148.360 C 68.310 148.155,53.359 148.000,34.005 148.000 L 0.000 148.000 0.002 177.500 M0.112 312.300 C 0.263 343.398,0.398 346.640,1.601 348.200 C 1.771 348.420,2.036 349.365,2.190 350.300 C 2.344 351.235,2.620 352.000,2.803 352.000 C 2.987 352.000,3.263 352.585,3.418 353.300 C 3.682 354.513,5.111 357.547,5.632 357.999 C 5.760 358.109,6.119 358.785,6.430 359.500 C 6.741 360.215,7.131 360.800,7.298 360.800 C 7.464 360.800,7.600 361.076,7.600 361.413 C 7.600 361.749,7.870 362.129,8.200 362.255 C 8.530 362.382,8.802 362.691,8.805 362.943 C 8.823 364.430,18.867 374.409,22.350 376.400 C 22.928 376.730,23.460 377.135,23.533 377.300 C 23.607 377.465,23.849 377.600,24.072 377.600 C 24.294 377.600,24.965 377.948,25.563 378.373 C 26.160 378.799,27.133 379.268,27.724 379.417 C 28.316 379.565,28.800 379.840,28.800 380.027 C 28.800 380.215,29.565 380.591,30.500 380.864 C 31.435 381.138,32.290 381.464,32.400 381.591 C 32.851 382.109,38.421 383.660,40.628 383.882 C 41.933 384.013,43.128 384.318,43.285 384.560 C 43.488 384.873,53.752 385.037,78.785 385.129 L 114.000 385.258 114.000 358.651 C 114.000 333.710,113.628 322.122,112.811 321.600 C 112.638 321.490,112.368 320.455,112.211 319.300 C 112.054 318.145,111.778 317.200,111.598 317.200 C 111.418 317.200,111.151 316.494,111.005 315.632 C 110.240 311.100,103.947 301.108,98.600 295.933 C 97.940 295.295,96.751 294.148,95.959 293.386 C 95.166 292.624,94.311 292.000,94.059 292.000 C 93.806 292.000,93.600 291.852,93.600 291.671 C 93.600 291.303,90.522 289.200,89.984 289.200 C 89.795 289.200,89.496 288.973,89.320 288.696 C 88.955 288.121,84.843 286.000,84.094 286.000 C 83.822 286.000,83.600 285.820,83.600 285.600 C 83.600 285.380,83.375 285.199,83.100 285.198 C 82.825 285.196,82.090 284.929,81.467 284.604 C 80.843 284.279,79.583 283.822,78.667 283.590 C 77.750 283.357,76.640 282.997,76.200 282.789 C 75.760 282.581,74.320 282.221,73.000 281.989 C 71.680 281.756,69.790 281.405,68.800 281.207 C 67.810 281.009,51.916 280.837,33.480 280.824 L -0.040 280.800 0.112 312.300 " stroke="none" fill="#fcac44" fill-rule="evenodd"></path><path id="path3" d="" stroke="none" fill="#d8c0b0" fill-rule="evenodd"></path><path id="path4" d="" stroke="none" fill="#ecc0b0" fill-rule="evenodd"></path></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="400" height="400"><g fill-rule="evenodd"><path fill="#d4d4d4" d="M142.54 174.296c.118 23.946.438 33.085 1.309 37.304.159.77.306 1.49.326 1.6s.149.38.285.6.374 1.165.529 2.1.428 1.7.606 1.7c.179 0 .541.9.805 2s.642 2 .84 2 .36.347.36.771.235 1.01.522 1.3c.597.604 1.238 1.978 1.138 2.44-.037.171.204.416.536.543s.604.488.604.801.254.667.564.786c.31.12.663.609.785 1.088.217.853 1.358 2.488 2.751 3.941.385.401.7.785.7.852 0 .328 4.813 5.024 6.208 6.057.875.648 1.72 1.368 1.877 1.6s.479.421.715.421.558.198.715.44c.351.542 2.175 1.561 2.585 1.445.165-.047.3.091.3.307 0 .313 2.767 2.019 3.6 2.22.11.027 1.399.62 2.865 1.318 1.465.699 3 1.27 3.411 1.27.41 0 1.116.259 1.568.576s2.427.779 4.389 1.028c1.962.25 3.88.621 4.262.825.411.22 14.777.371 35.288.371h34.595l.016-26.052c.013-20.417-.092-26.188-.489-26.677-.422-.522-.407-.567.095-.271.479.283.511.238.155-.223-.245-.317-.562-2.467-.705-4.777-.253-4.115-1.295-9.006-2.43-11.409-.314-.665-.666-1.731-.782-2.368s-.382-1.265-.592-1.395-.506-.729-.658-1.332c-.151-.603-.416-1.096-.588-1.096s-.431-.468-.574-1.04c-.253-1.007-1.679-3.306-2.36-3.805-.184-.134-.317-.404-.297-.6s-.274-.715-.655-1.155c-1.829-2.111-5.39-6.4-5.637-6.789-.152-.241-1.717-1.601-3.477-3.024s-3.332-2.767-3.494-2.987-.297-.267-.3-.104c-.006.29-4.01-1.999-4.406-2.518-.11-.144-.875-.482-1.7-.751s-1.5-.647-1.5-.84-.63-.469-1.4-.613-1.4-.4-1.4-.567-.855-.534-1.9-.817-2.094-.663-2.332-.844c-.237-.182-2.172-.551-4.3-.819-2.127-.269-3.868-.629-3.868-.799s-15.657-.317-34.794-.324l-34.795-.012zm189.06-25.954c0 .188-1.125.455-2.5.592s-3.04.364-3.7.504-1.417.264-1.682.275c-.266.011-.403.15-.304.309.098.159-.63.41-1.618.558s-1.796.432-1.796.632-.27.259-.6.133c-.33-.127-.6-.031-.6.212 0 .244-.437.443-.971.443-.535 0-1.21.233-1.5.517s-1.159.772-1.929 1.083-1.638.799-1.929 1.083c-.29.284-.785.517-1.1.517-.314 0-.571.158-.571.351 0 .194-.54.576-1.2.849s-1.2.643-1.2.822-.315.425-.7.548-1.408.856-2.273 1.627c-.865.772-1.73 1.403-1.923 1.403s-.24.18-.104.4.069.4-.149.4c-.217 0-1.173.819-2.123 1.82l-3.189 3.36c-.803.848-1.581 1.921-1.728 2.386s-.409.759-.581.652c-.293-.18-1.177 1.308-1.076 1.811.025.125-.269.543-.654.928s-.7.942-.7 1.238-.135.598-.3.672c-.393.174-2.5 4.471-2.5 5.097 0 .266-.15.391-.333.277s-.339.011-.345.277c-.006.265-.486 1.881-1.066 3.59-.581 1.71-1.056 3.555-1.056 4.1 0 .546-.15.992-.333.992s-.352.225-.373.5-.229 2.57-.461 5.1c-.242 2.653-.423 15.817-.426 31.1L286 252h34.405c20.486 0 34.687-.151 35.1-.373.382-.205 2.36-.591 4.395-.858s3.7-.61 3.7-.763.99-.516 2.2-.806 2.2-.659 2.2-.819c0-.161.63-.41 1.4-.555.77-.144 1.4-.42 1.4-.612 0-.193.538-.469 1.195-.613.658-.144 1.3-.431 1.428-.638.127-.206.804-.649 1.504-.983 2.418-1.156 3.473-1.825 3.473-2.202 0-.208.241-.378.537-.378.686 0 1.906-1.03 5.975-5.044 3.228-3.185 5.575-5.756 5.253-5.756-.09 0 .636-1.086 1.613-2.413s1.889-2.767 2.026-3.2c.138-.433.418-.787.623-.787s.373-.202.373-.45c0-.455 1.653-4.512 2.588-6.35.28-.55.638-1.72.796-2.6s.431-1.78.606-2c.967-1.214 1.21-8.544 1.21-36.464V148h-34.2c-18.81 0-34.2.154-34.2.342M142.414 307.768c-.004 14.844.144 27.082.33 27.197.185.115.463 2.323.618 4.907s.428 4.884.607 5.113c.179.228.553 1.405.831 2.615s.63 2.38.782 2.6c.292.42 1.354 3.917 1.25 4.114-.033.063.216.391.554.729s.614.871.614 1.186.166.571.368.571c.203 0 .487.539.631 1.198s.485 1.333.756 1.5c.27.166.722.872 1.003 1.569.282.697 1.03 1.867 1.664 2.6s1.346 1.558 1.581 1.833c.236.275.354.5.263.5-.092 0 .694.888 1.745 1.972s1.808 2.075 1.683 2.2c-.125.126.04.228.367.228s.961.405 1.409.9c1.596 1.763 5.035 4.511 6.471 5.17.802.369 1.279.687 1.059.706-.563.05 7.01 3.776 7.974 3.923.435.067.889.252 1.009.411.427.571 5.461 2.079 7.817 2.343 1.32.147 2.528.466 2.685.708.433.666 69.741.881 70.54.218.708-.588.87-53.179.164-53.179-.214 0-.393-1.215-.397-2.7-.009-3.197-.661-8.059-1.163-8.669-.195-.237-.481-1.286-.637-2.331s-.414-1.9-.574-1.9-.51-.978-.777-2.174c-.268-1.196-.612-2.231-.764-2.3s-.817-1.206-1.477-2.526-1.292-2.49-1.404-2.6c-.395-.388-2.538-3.8-2.386-3.8.28 0-1.723-2.299-5.786-6.641-.947-1.012-2.42-2.361-3.273-2.998-.853-.636-1.641-1.259-1.751-1.385-.351-.401-3.934-2.776-4.189-2.776-.224 0-.485-.191-1.925-1.412-.267-.227-1.251-.661-2.186-.964-.935-.304-1.7-.703-1.7-.888s-.198-.336-.44-.336c-.241 0-1.006-.254-1.7-.564-2.696-1.206-9.004-2.881-12.66-3.361-.77-.101-16.74-.254-35.489-.34l-34.089-.156zM332.4 281.15c0 .183-.675.341-1.5.352-2.176.026-5.672.779-6.414 1.38-.54.437-.585.425-.286-.082.283-.48.238-.51-.223-.152-.317.247-1.522.686-2.677.976s-2.1.665-2.1.833c0 .169-.63.425-1.4.569-.77.145-1.4.394-1.4.554s-.72.53-1.6.82-1.6.658-1.6.817c0 .238-.776.558-1.809.748-.105.019-.521.35-.925.735s-1.146.97-1.649 1.3-1.163.838-1.466 1.129c-.303.29-.551.424-.551.296 0-.332-2.025 1.487-5.86 5.265-1.837 1.81-3.34 3.475-3.34 3.7a.41.41 0 0 1-.409.41c-.224 0-.627.495-.893 1.1-.267.605-.819 1.346-1.226 1.647s-1.086 1.29-1.507 2.2a36 36 0 0 1-1.558 2.953c-.435.715-.659 1.303-.499 1.306s.11.138-.112.3c-.61.444-2.142 4.094-2.43 5.79-.139.824-.397 1.408-.572 1.3s-.448.748-.605 1.904-.434 2.194-.614 2.309c-.835.532-1.207 13.399-1.094 37.791l.119 25.6h35.115c23.899 0 35.206-.133 35.4-.417.157-.229 1.792-.63 3.635-.892 1.842-.261 3.552-.634 3.8-.828.497-.389 2.677-1.032 3.15-.929.165.036.3-.094.3-.291 0-.316 1.12-.754 2.76-1.079.308-.061.668-.279.8-.483.132-.205.69-.512 1.24-.682s1.752-.824 2.672-1.454 1.855-1.145 2.077-1.145c.223 0 .657-.359.964-.797s.653-.703.769-.588c.115.116.639-.242 1.164-.796.525-.553 1.095-1.008 1.267-1.012.511-.011 7.204-6.879 8.288-8.504.549-.824 1.134-1.499 1.299-1.5.165-.002.3-.196.3-.432 0-.235.225-.679.5-.986 1.137-1.268 1.5-1.768 1.501-2.068.001-.174.632-1.364 1.403-2.643.772-1.279 1.249-2.23 1.061-2.114s.077-.616.589-1.626c.511-1.01.833-1.994.714-2.186-.118-.191-.046-.348.161-.348s.607-.855.89-1.9c.582-2.153.563-2.09.899-2.9.869-2.095 1.082-9.221 1.082-36.233v-29.375l-33.8.013c-18.59.007-33.8.162-33.8.345"/><path fill="#2cb3ac" d="M142.696 15.038c-.468.468-.365 53.672.104 53.962.22.136.4 1.259.4 2.497 0 3.125.832 9.303 1.252 9.303.192 0 .354.495.362 1.1.007.605.361 1.82.786 2.7s.779 1.826.786 2.101c.008.276.374 1.174.814 1.995.44.82.8 1.72.8 1.998s.144.506.32.506c.175 0 .547.63.826 1.4s.674 1.4.88 1.4.374.237.374.528c0 .29.729 1.505 1.62 2.7a290 290 0 0 1 2.3 3.12c1.128 1.572 5.424 5.783 7.722 7.568 1.187.922 2.376 1.859 2.643 2.082s.987.628 1.6.899c.613.272 1.334.676 1.601.898.267.223.728.605 1.023.848.295.244 1.201.663 2.014.931.812.269 1.477.64 1.477.825 0 .186.542.456 1.204.602s1.737.53 2.388.855 1.864.698 2.696.829c.831.131 1.602.367 1.712.524.19.271 2.55.804 7 1.583 1.1.192 17.345.363 36.1.379l34.1.029V92.624c0-17.287-.14-26.663-.4-26.824-.22-.136-.4-1.394-.4-2.795 0-2.963-.727-8.623-1.183-9.205-.172-.22-.433-1.067-.58-1.883s-.529-1.986-.849-2.6c-.321-.614-.584-1.305-.586-1.535-.003-.615-3.29-7.159-3.674-7.315-.18-.074-.328-.316-.328-.539 0-1.863-8.802-11.71-12.807-14.328-.504-.33-1.2-.915-1.544-1.3s-.829-.7-1.077-.7c-.247 0-.865-.36-1.372-.8s-1.088-.8-1.29-.8-.646-.279-.987-.62-1.138-.723-1.771-.85c-.634-.126-1.152-.368-1.152-.537 0-.168-.489-.429-1.086-.579s-1.848-.619-2.778-1.043c-.931-.424-1.972-.771-2.314-.771s-.622-.151-.622-.336c0-.184-1.575-.558-3.5-.831s-3.86-.707-4.3-.965c-.909-.532-69.781-.954-70.304-.43m190.804.059c-1.705.075-3.1.309-3.1.52s-.6.383-1.333.383c-1.756 0-5.965.82-6.447 1.256-.209.189-.632.344-.94.344s-1.126.254-1.82.565c-.693.311-2.43 1.066-3.86 1.678-1.43.613-3.029 1.438-3.554 1.835s-1.2.722-1.5.722-.546.151-.546.336c0 .184-.457.544-1.015.798-1.104.503-1.877 1.08-2.902 2.166-.363.385-.846.701-1.072.702-.443.001-7.811 7.298-7.811 7.735 0 .144-.315.602-.7 1.016-1.238 1.33-2.1 2.597-2.1 3.086 0 .261-.27.579-.6.706-.33.126-.6.493-.6.814s-.232.822-.515 1.112c-.746.767-2.685 4.609-2.685 5.322 0 .334-.162.607-.36.607s-.582.945-.852 2.1c-.271 1.155-.629 2.28-.795 2.5s-.433 1.21-.593 2.2-.442 1.989-.628 2.22C286.359 56.832 286 68.196 286 92.874v26.358l35.539-.116c25.412-.083 35.698-.243 36.1-.563.308-.246 1.547-.572 2.751-.725 1.205-.154 2.375-.418 2.6-.587s1.445-.546 2.71-.838 2.3-.662 2.3-.822c0-.161.63-.41 1.4-.555.77-.144 1.4-.42 1.4-.612 0-.193.525-.466 1.167-.607s1.57-.605 2.061-1.032c.492-.426 1.137-.775 1.433-.775s.539-.168.539-.373.359-.487.798-.626c.438-.139 1.023-.474 1.3-.744.276-.269.889-.757 1.362-1.083 2.862-1.975 8.14-6.857 8.14-7.53 0-.258.247-.564.549-.68s1.15-1.055 1.886-2.087c.735-1.032 1.568-2.115 1.851-2.406s.514-.785.514-1.1c0-.314.168-.571.374-.571s.602-.63.88-1.4c.279-.77.636-1.4.795-1.4.158 0 .406-.54.551-1.2s.4-1.2.568-1.2.544-.765.838-1.7.682-1.871.864-2.08.33-.632.33-.94.257-1.126.57-1.82c1.501-3.318 1.562-4.616 1.718-36.76l.152-31.5-31.72.08c-17.446.045-33.115.142-34.82.217"/><path fill="#fcac44" d="M.002 177.5c.003 29.789.289 36.551 1.601 37.863.218.218.397.739.397 1.157 0 .755.18 1.218 2.161 5.555.571 1.252 1.039 2.467 1.039 2.7s.135.426.3.426c.165.001.834.991 1.486 2.2s1.305 2.199 1.451 2.199.484.527.751 1.171.739 1.269 1.049 1.388.563.413.563.654c0 .374 6.608 7.055 8.407 8.5 1.251 1.005 3.986 2.747 5.593 3.563.55.279 1.09.614 1.2.743.418.493 7.378 3.58 8.078 3.583.287.002.987.246 1.555.542s2.548.762 4.4 1.034 3.68.659 4.062.858c.401.21 15.319.364 35.3.364H114v-26.342c0-24.61-.37-36.33-1.162-36.845-.18-.117-.459-1.113-.62-2.213s-.433-2.18-.604-2.4-.548-1.345-.838-2.5-.666-2.1-.836-2.1-.524-.72-.787-1.6c-.264-.88-.612-1.6-.773-1.6s-.417-.493-.568-1.096c-.152-.603-.405-1.188-.563-1.3s-.803-1.104-1.432-2.204c-.63-1.1-1.386-2.144-1.681-2.32s-.536-.507-.536-.736c0-.893-6.773-7.813-9.714-9.925-1.037-.745-1.886-1.482-1.886-1.638s-.585-.521-1.3-.81-1.39-.635-1.5-.769c-.373-.455-2.994-1.909-3.981-2.209-.54-.164-1.228-.545-1.529-.846s-.884-.547-1.295-.547-.848-.162-.97-.36-1.168-.584-2.324-.858-2.195-.641-2.309-.815c-.115-.175-1.825-.527-3.8-.783-1.976-.255-3.905-.626-4.287-.824-.395-.205-15.346-.36-34.7-.36H0zm.11 134.8c.151 31.098.286 34.34 1.489 35.9.17.22.435 1.165.589 2.1s.43 1.7.613 1.7c.184 0 .46.585.615 1.3.264 1.213 1.693 4.247 2.214 4.699.128.11.487.786.798 1.501s.701 1.3.868 1.3c.166 0 .302.276.302.613s.27.716.6.842c.33.127.602.436.605.688.018 1.487 10.062 11.466 13.545 13.457.578.33 1.11.735 1.183.9.074.165.316.3.539.3.222 0 .893.348 1.491.773.597.426 1.57.895 2.161 1.044.592.148 1.076.423 1.076.61 0 .188.765.564 1.7.837.935.274 1.79.6 1.9.727.451.518 6.021 2.069 8.228 2.291 1.305.131 2.5.436 2.657.678.203.313 10.467.477 35.5.569l35.215.129v-26.607c0-24.941-.372-36.529-1.189-37.051-.173-.11-.443-1.145-.6-2.3s-.433-2.1-.613-2.1-.447-.706-.593-1.568c-.765-4.532-7.058-14.524-12.405-19.699-.66-.638-1.849-1.785-2.641-2.547-.793-.762-1.648-1.386-1.9-1.386-.253 0-.459-.148-.459-.329 0-.368-3.078-2.471-3.616-2.471-.189 0-.488-.227-.664-.504-.365-.575-4.477-2.696-5.226-2.696-.272 0-.494-.18-.494-.4s-.225-.401-.5-.402-1.01-.269-1.633-.594c-.624-.325-1.884-.782-2.8-1.014-.917-.233-2.027-.593-2.467-.801s-1.88-.568-3.2-.8-3.21-.584-4.2-.782-16.884-.37-35.32-.383L-.04 280.8z"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Grist/types.d.ts b/packages/nodes-base/nodes/Grist/types.ts
similarity index 100%
rename from packages/nodes-base/nodes/Grist/types.d.ts
rename to packages/nodes-base/nodes/Grist/types.ts
diff --git a/packages/nodes-base/nodes/Gumroad/GenericFunctions.ts b/packages/nodes-base/nodes/Gumroad/GenericFunctions.ts
index 35023996dea57..8c4e810e670a3 100644
--- a/packages/nodes-base/nodes/Gumroad/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Gumroad/GenericFunctions.ts
@@ -1,23 +1,18 @@
-import type { OptionsWithUri } from 'request';
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
+	IRequestOptions,
 	IWebhookFunctions,
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function gumroadApiRequest(
-	this:
-		| IHookFunctions
-		| IExecuteFunctions
-		| IExecuteSingleFunctions
-		| ILoadOptionsFunctions
-		| IWebhookFunctions,
-	method: string,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -28,7 +23,7 @@ export async function gumroadApiRequest(
 	const credentials = await this.getCredentials('gumroadApi');
 	body = Object.assign({ access_token: credentials.accessToken }, body);
 
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		method,
 		qs,
 		body,
diff --git a/packages/nodes-base/nodes/HackerNews/GenericFunctions.ts b/packages/nodes-base/nodes/HackerNews/GenericFunctions.ts
index b82ea5a647679..414ce7a2797f5 100644
--- a/packages/nodes-base/nodes/HackerNews/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/HackerNews/GenericFunctions.ts
@@ -4,22 +4,22 @@ import type {
 	IDataObject,
 	ILoadOptionsFunctions,
 	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import type { OptionsWithUri } from 'request';
-
 /**
  * Make an API request to HackerNews
  *
  */
 export async function hackerNewsApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	qs: IDataObject,
 ): Promise<any> {
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		method,
 		qs,
 		uri: `http://hn.algolia.com/api/v1/${endpoint}`,
@@ -41,7 +41,7 @@ export async function hackerNewsApiRequest(
  */
 export async function hackerNewsApiRequestAllItems(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	qs: IDataObject,
 ): Promise<any> {
diff --git a/packages/nodes-base/nodes/HackerNews/HackerNews.node.json b/packages/nodes-base/nodes/HackerNews/HackerNews.node.json
index 6a9fb7c977290..f7cffd717c6f9 100644
--- a/packages/nodes-base/nodes/HackerNews/HackerNews.node.json
+++ b/packages/nodes-base/nodes/HackerNews/HackerNews.node.json
@@ -2,7 +2,7 @@
 	"node": "n8n-nodes-base.hackerNews",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Communication", "Marketing & Content"],
+	"categories": ["Communication", "Marketing"],
 	"resources": {
 		"primaryDocumentation": [
 			{
diff --git a/packages/nodes-base/nodes/HackerNews/HackerNews.node.ts b/packages/nodes-base/nodes/HackerNews/HackerNews.node.ts
index c5596c1a350cb..cf9642b632b78 100644
--- a/packages/nodes-base/nodes/HackerNews/HackerNews.node.ts
+++ b/packages/nodes-base/nodes/HackerNews/HackerNews.node.ts
@@ -360,6 +360,6 @@ export class HackerNews implements INodeType {
 			}
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/HaloPSA/GenericFunctions.ts b/packages/nodes-base/nodes/HaloPSA/GenericFunctions.ts
index dd8a022582bc0..f6ac15258d756 100644
--- a/packages/nodes-base/nodes/HaloPSA/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/HaloPSA/GenericFunctions.ts
@@ -4,15 +4,14 @@ import type {
 	IDataObject,
 	IExecuteFunctions,
 	IHookFunctions,
-	IExecuteSingleFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
 	IPollFunctions,
+	IRequestOptions,
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import type { OptionsWithUri } from 'request';
-
 // Interfaces and Types -------------------------------------------------------------
 interface IHaloPSATokens {
 	scope: string;
@@ -36,7 +35,7 @@ export async function getAccessTokens(
 ): Promise<IHaloPSATokens> {
 	const credentials = await this.getCredentials('haloPSAApi');
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			'Content-Type': 'application/x-www-form-urlencoded',
 		},
@@ -60,13 +59,8 @@ export async function getAccessTokens(
 }
 
 export async function haloPSAApiRequest(
-	this:
-		| IHookFunctions
-		| IExecuteFunctions
-		| IExecuteSingleFunctions
-		| ILoadOptionsFunctions
-		| IPollFunctions,
-	method: string,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 	accessToken: string,
 	body: IDataObject | IDataObject[] = {},
@@ -76,7 +70,7 @@ export async function haloPSAApiRequest(
 	const resourceApiUrl = (await this.getCredentials('haloPSAApi')).resourceApiUrl as string;
 
 	try {
-		let options: OptionsWithUri = {
+		let options: IRequestOptions = {
 			headers: {
 				Authorization: `Bearer ${accessToken}`,
 				'User-Agent': 'https://n8n.io',
@@ -102,7 +96,7 @@ export async function haloPSAApiRequest(
 		return result;
 	} catch (error) {
 		const message = (error as JsonObject).message as string;
-		if (method === 'DELETE' || 'GET' || ('UPDATE' && message)) {
+		if (method === 'DELETE' || method === 'GET' || (method === 'POST' && message)) {
 			let newErrorMessage;
 			if (message.includes('400')) {
 				console.log(message);
@@ -112,11 +106,10 @@ export async function haloPSAApiRequest(
 				}`;
 			}
 			if (message.includes('403')) {
-				(
-					error as JsonObject
-				).message = `You don\'t have permissions to ${method.toLowerCase()} ${resource
-					.split('/')[1]
-					.toLowerCase()}.`;
+				(error as JsonObject).message =
+					`You don\'t have permissions to ${method.toLowerCase()} ${resource
+						.split('/')[1]
+						.toLowerCase()}.`;
 			}
 		}
 		throw new NodeApiError(this.getNode(), error as JsonObject);
@@ -127,7 +120,6 @@ export async function haloPSAApiRequest(
 // 	this:
 // 		| IHookFunctions
 // 		| IExecuteFunctions
-// 		| IExecuteSingleFunctions
 // 		| ILoadOptionsFunctions
 // 		| IPollFunctions,
 // 	clientId: string,
@@ -159,7 +151,7 @@ export async function haloPSAApiRequest(
 export async function haloPSAApiRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	accessToken: string,
 	body = {},
@@ -232,7 +224,7 @@ export async function validateCredentials(
 ): Promise<IHaloPSATokens> {
 	const credentials = decryptedCredentials;
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			'Content-Type': 'application/x-www-form-urlencoded',
 		},
diff --git a/packages/nodes-base/nodes/HaloPSA/HaloPSA.node.ts b/packages/nodes-base/nodes/HaloPSA/HaloPSA.node.ts
index 341f76c9b1d48..79f0a7cf34910 100644
--- a/packages/nodes-base/nodes/HaloPSA/HaloPSA.node.ts
+++ b/packages/nodes-base/nodes/HaloPSA/HaloPSA.node.ts
@@ -678,6 +678,6 @@ export class HaloPSA implements INodeType {
 			}
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/HaloPSA/halopsa.svg b/packages/nodes-base/nodes/HaloPSA/halopsa.svg
index 7419d179fef35..865e3b62d7d96 100644
--- a/packages/nodes-base/nodes/HaloPSA/halopsa.svg
+++ b/packages/nodes-base/nodes/HaloPSA/halopsa.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" style="enable-background:new 0 0 142.02 142.02" viewBox="0 0 142.02 142.02" xml:space="preserve"><path d="M71.01 0C31.79 0 0 31.79 0 71.01c0 39.22 31.79 71.01 71.01 71.01s71.01-31.79 71.01-71.01C142.02 31.79 110.23 0 71.01 0zm0 107.77c-4.72 0-9.22-.89-13.37-2.49l-13.12 6.34.23-14.74c-6.72-6.72-10.87-16-10.87-26.25 0-20.51 16.62-37.13 37.13-37.13s37.13 16.62 37.13 37.13c0 20.52-16.62 37.14-37.13 37.14z" style="fill:#f8384b"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 142.02 142.02"><path d="M71.01 0C31.79 0 0 31.79 0 71.01s31.79 71.01 71.01 71.01 71.01-31.79 71.01-71.01S110.23 0 71.01 0m0 107.77c-4.72 0-9.22-.89-13.37-2.49l-13.12 6.34.23-14.74c-6.72-6.72-10.87-16-10.87-26.25 0-20.51 16.62-37.13 37.13-37.13s37.13 16.62 37.13 37.13c0 20.52-16.62 37.14-37.13 37.14" style="fill:#f8384b"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Harvest/GenericFunctions.ts b/packages/nodes-base/nodes/Harvest/GenericFunctions.ts
index 583741c35f5ea..66c1865650f8d 100644
--- a/packages/nodes-base/nodes/Harvest/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Harvest/GenericFunctions.ts
@@ -1,25 +1,24 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	JsonObject,
+	IRequestOptions,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function harvestApiRequest(
-	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	qs: IDataObject,
 	path: string,
 	body: IDataObject = {},
 	option: IDataObject = {},
 	uri?: string,
 ): Promise<any> {
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		headers: {
 			'Harvest-Account-Id': `${this.getNodeParameter('accountId', 0)}`,
 			'User-Agent': 'Harvest App',
@@ -59,8 +58,8 @@ export async function harvestApiRequest(
  * and return all results
  */
 export async function harvestApiRequestAllItems(
-	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	qs: IDataObject,
 	uri: string,
 	resource: string,
diff --git a/packages/nodes-base/nodes/Harvest/Harvest.node.ts b/packages/nodes-base/nodes/Harvest/Harvest.node.ts
index 63b38cab98383..79a6de23c6c10 100644
--- a/packages/nodes-base/nodes/Harvest/Harvest.node.ts
+++ b/packages/nodes-base/nodes/Harvest/Harvest.node.ts
@@ -6,6 +6,7 @@ import type {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
@@ -208,7 +209,7 @@ export class Harvest implements INodeType {
 		const operation = this.getNodeParameter('operation', 0);
 
 		let endpoint = '';
-		let requestMethod = '';
+		let requestMethod: IHttpRequestMethods;
 		let body: IDataObject | Buffer;
 		let qs: IDataObject;
 
@@ -1345,6 +1346,6 @@ export class Harvest implements INodeType {
 			}
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/HelpScout/GenericFunctions.ts b/packages/nodes-base/nodes/HelpScout/GenericFunctions.ts
index 11eb6daf4a081..6ad5fbdbc71e0 100644
--- a/packages/nodes-base/nodes/HelpScout/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/HelpScout/GenericFunctions.ts
@@ -1,20 +1,19 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	JsonObject,
+	IRequestOptions,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import get from 'lodash.get';
+import get from 'lodash/get';
 
 export async function helpscoutApiRequest(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IHookFunctions,
-	method: string,
+	this: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -22,7 +21,7 @@ export async function helpscoutApiRequest(
 	uri?: string,
 	option: IDataObject = {},
 ): Promise<any> {
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		headers: {
 			'Content-Type': 'application/json',
 		},
@@ -49,7 +48,7 @@ export async function helpscoutApiRequest(
 export async function helpscoutApiRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: any = {},
diff --git a/packages/nodes-base/nodes/HelpScout/HelpScout.node.ts b/packages/nodes-base/nodes/HelpScout/HelpScout.node.ts
index 6cc6cd03294c2..3e05d2881d5a7 100644
--- a/packages/nodes-base/nodes/HelpScout/HelpScout.node.ts
+++ b/packages/nodes-base/nodes/HelpScout/HelpScout.node.ts
@@ -113,7 +113,6 @@ export class HelpScout implements INodeType {
 				);
 				for (const tag of tags) {
 					const tagName = tag.name;
-					const _tagId = tag.id;
 					returnData.push({
 						name: tagName,
 						value: tagName,
@@ -457,7 +456,6 @@ export class HelpScout implements INodeType {
 					//https://developer.helpscout.com/mailbox-api/endpoints/conversations/threads/chat
 					if (operation === 'create') {
 						const conversationId = this.getNodeParameter('conversationId', i) as string;
-						const _type = this.getNodeParameter('type', i) as string;
 						const text = this.getNodeParameter('text', i) as string;
 						const additionalFields = this.getNodeParameter('additionalFields', i);
 						const attachments = this.getNodeParameter('attachmentsUi', i) as IDataObject;
@@ -579,6 +577,6 @@ export class HelpScout implements INodeType {
 			returnData.push(...executionData);
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/HelpScout/HelpScoutTrigger.node.ts b/packages/nodes-base/nodes/HelpScout/HelpScoutTrigger.node.ts
index 3ebed8e04a13e..5fb6e92793504 100644
--- a/packages/nodes-base/nodes/HelpScout/HelpScoutTrigger.node.ts
+++ b/packages/nodes-base/nodes/HelpScout/HelpScoutTrigger.node.ts
@@ -1,3 +1,4 @@
+import { createHmac } from 'crypto';
 import type {
 	IHookFunctions,
 	IWebhookFunctions,
@@ -9,8 +10,6 @@ import type {
 
 import { helpscoutApiRequest, helpscoutApiRequestAllItems } from './GenericFunctions';
 
-import { createHmac } from 'crypto';
-
 export class HelpScoutTrigger implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'HelpScout Trigger',
diff --git a/packages/nodes-base/nodes/HelpScout/helpScout.svg b/packages/nodes-base/nodes/HelpScout/helpScout.svg
index f82e8a8c1bd7a..94d2eaf05c805 100644
--- a/packages/nodes-base/nodes/HelpScout/helpScout.svg
+++ b/packages/nodes-base/nodes/HelpScout/helpScout.svg
@@ -1 +1 @@
-<svg width="256" height="310" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid"><path d="M18.432 180.969l90.484-90.485a63.717 63.717 0 0018.99-45.428A64.245 64.245 0 00109.476 0L18.99 90.484A63.717 63.717 0 000 135.913c0 17.687 7.075 33.512 18.432 45.056zm219.136-52.876l-90.484 90.484a63.717 63.717 0 00-18.99 45.429 64.245 64.245 0 0018.431 45.056l90.484-90.485A63.717 63.717 0 00256 173.15c0-17.687-7.075-33.513-18.432-45.056zm-.559-37.422A63.717 63.717 0 00256 45.242 64.245 64.245 0 00237.568.186L18.991 218.577C7.26 230.307 0 246.32 0 264.192a64.245 64.245 0 0018.432 45.056L237.009 90.671z" fill="#1292EE"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="310" preserveAspectRatio="xMidYMid"><path fill="#1292EE" d="m18.432 180.969 90.484-90.485a63.72 63.72 0 0 0 18.99-45.428A64.25 64.25 0 0 0 109.476 0L18.99 90.484A63.72 63.72 0 0 0 0 135.913c0 17.687 7.075 33.512 18.432 45.056m219.136-52.876-90.484 90.484a63.72 63.72 0 0 0-18.99 45.429 64.25 64.25 0 0 0 18.431 45.056l90.484-90.485A63.72 63.72 0 0 0 256 173.15c0-17.687-7.075-33.513-18.432-45.056zm-.559-37.422A63.72 63.72 0 0 0 256 45.242 64.25 64.25 0 0 0 237.568.186L18.991 218.577C7.26 230.307 0 246.32 0 264.192a64.25 64.25 0 0 0 18.432 45.056z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/HighLevel/GenericFunctions.ts b/packages/nodes-base/nodes/HighLevel/GenericFunctions.ts
index 25af2a5d2470a..bb6f977ad80cb 100644
--- a/packages/nodes-base/nodes/HighLevel/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/HighLevel/GenericFunctions.ts
@@ -5,18 +5,18 @@ import type {
 	IExecutePaginationFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
+	IHttpRequestMethods,
 	IHttpRequestOptions,
 	ILoadOptionsFunctions,
 	IN8nHttpFullResponse,
 	INodeExecutionData,
 	INodePropertyOptions,
 	IPollFunctions,
+	IRequestOptions,
 	IWebhookFunctions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import type { OptionsWithUri } from 'request';
-
 import type { ToISOTimeOptions } from 'luxon';
 import { DateTime } from 'luxon';
 
@@ -131,14 +131,14 @@ export async function highLevelApiRequest(
 		| IPollFunctions
 		| IHookFunctions
 		| ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 	body: IDataObject = {},
 	qs: IDataObject = {},
 	uri?: string,
 	option: IDataObject = {},
 ) {
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		method,
 		body,
 		qs,
@@ -152,7 +152,7 @@ export async function highLevelApiRequest(
 		delete options.qs;
 	}
 	options = Object.assign({}, options, option);
-	return this.helpers.requestWithAuthentication.call(this, 'highLevelApi', options);
+	return await this.helpers.requestWithAuthentication.call(this, 'highLevelApi', options);
 }
 
 export async function opportunityUpdatePreSendAction(
diff --git a/packages/nodes-base/nodes/HighLevel/HighLevel.node.json b/packages/nodes-base/nodes/HighLevel/HighLevel.node.json
index a7370f857ccef..305d966ca134f 100644
--- a/packages/nodes-base/nodes/HighLevel/HighLevel.node.json
+++ b/packages/nodes-base/nodes/HighLevel/HighLevel.node.json
@@ -2,7 +2,7 @@
 	"node": "n8n-nodes-base.highLevel",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Marketing & Content", "Sales"],
+	"categories": ["Marketing", "Sales"],
 	"resources": {
 		"credentialDocumentation": [
 			{
diff --git a/packages/nodes-base/nodes/HighLevel/highLevel.svg b/packages/nodes-base/nodes/HighLevel/highLevel.svg
index f81310d29a5b3..3df6e466f0bfa 100644
--- a/packages/nodes-base/nodes/HighLevel/highLevel.svg
+++ b/packages/nodes-base/nodes/HighLevel/highLevel.svg
@@ -1 +1 @@
-<svg id="svg" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="400" height="400" viewBox="0, 0, 400,400"><g id="svgg"><path id="path0" d="M42.102 52.191 C 16.992 77.309,1.219 92.800,0.753 92.800 C 0.141 92.800,0.000 93.100,0.000 94.400 L 0.000 96.000 26.414 96.000 C 50.056 96.000,52.932 96.068,53.814 96.646 L 54.800 97.292 54.800 231.217 L 54.800 365.142 55.854 365.971 C 57.141 366.984,108.058 367.303,110.233 366.312 L 111.303 365.825 111.159 232.212 C 111.080 158.726,111.145 98.240,111.303 97.799 C 112.028 95.782,111.498 95.817,139.335 95.933 C 157.780 96.009,165.423 95.913,165.800 95.600 C 166.901 94.686,171.339 99.321,118.037 45.717 C 99.742 27.319,84.439 12.243,83.820 12.007 C 82.715 11.587,82.119 12.161,42.102 52.191 " stroke="none" fill="#d5b718" fill-rule="evenodd"></path><path id="path1" d="M197.800 141.540 C 196.883 141.838,195.891 142.804,165.596 172.884 C 153.253 185.141,136.639 201.623,128.677 209.511 C 112.398 225.639,112.968 225.025,113.907 225.386 C 114.276 225.527,126.552 225.629,141.189 225.612 C 164.826 225.585,167.901 225.652,168.700 226.213 L 169.600 226.845 169.600 295.804 C 169.600 347.283,169.718 365.021,170.064 365.781 L 170.528 366.800 198.055 366.800 L 225.582 366.800 226.257 365.769 C 226.887 364.808,226.914 360.169,226.664 297.028 C 226.517 259.788,226.511 228.744,226.652 228.042 C 227.158 225.511,226.383 225.576,255.603 225.611 C 270.125 225.629,282.188 225.531,282.409 225.394 C 283.324 224.829,280.075 221.448,249.622 191.285 C 213.380 155.390,216.261 158.259,207.616 149.447 C 201.800 143.518,199.194 141.108,198.738 141.240 C 198.662 141.262,198.240 141.397,197.800 141.540 " stroke="none" fill="#1988e9" fill-rule="evenodd"></path><path id="path2" d="M312.279 12.444 C 311.481 12.908,301.065 23.377,282.200 42.678 C 275.380 49.655,268.560 56.542,267.044 57.982 C 264.748 60.163,251.720 73.289,236.455 88.800 C 231.890 93.439,230.642 95.051,231.290 95.470 C 231.570 95.652,243.455 95.862,257.699 95.939 L 283.598 96.077 284.798 97.198 L 285.997 98.318 285.998 231.584 C 285.998 320.948,286.132 365.099,286.404 365.607 C 286.627 366.024,287.393 366.473,288.105 366.604 C 290.853 367.110,339.750 366.629,340.700 366.086 L 341.600 365.572 341.609 231.886 C 341.618 100.674,341.632 98.181,342.386 97.200 L 343.154 96.200 369.557 96.000 C 389.454 95.849,396.080 95.681,396.444 95.316 C 396.937 94.823,316.158 13.511,314.126 12.455 C 313.091 11.916,313.185 11.916,312.279 12.444 " stroke="none" fill="#34c734" fill-rule="evenodd"></path><path id="path3" d="M0.000 45.600 C 0.000 88.598,0.040 91.200,0.693 91.200 C 1.080 91.200,19.380 73.213,42.053 50.547 C 80.812 11.801,82.773 9.906,83.860 10.171 C 84.883 10.420,93.972 19.287,104.960 30.756 C 106.478 32.340,108.110 33.943,108.586 34.318 C 109.062 34.693,109.789 35.515,110.201 36.144 C 110.990 37.350,113.117 39.600,113.468 39.600 C 113.919 39.600,115.823 41.320,116.480 42.322 C 117.052 43.194,137.821 64.256,140.273 66.450 C 141.118 67.206,154.503 80.845,159.856 86.403 C 161.867 88.492,164.612 91.215,165.956 92.455 C 168.836 95.113,169.355 97.037,167.300 97.431 C 166.695 97.547,154.268 97.678,139.685 97.721 C 116.610 97.790,113.122 97.878,112.791 98.400 C 112.381 99.049,112.236 221.548,112.644 223.068 C 112.843 223.810,118.322 218.518,150.138 186.858 C 200.576 136.667,197.688 139.361,199.830 140.499 C 200.254 140.724,212.120 152.371,226.200 166.382 C 249.504 189.572,257.055 196.963,262.507 201.922 C 263.548 202.869,264.400 203.797,264.400 203.983 C 264.400 204.605,280.893 220.855,281.921 221.246 C 282.658 221.526,283.023 221.491,283.261 221.116 C 283.841 220.201,283.682 98.900,283.100 98.524 C 282.825 98.346,270.594 98.110,255.920 98.000 C 238.930 97.873,229.097 97.655,228.848 97.400 C 226.798 95.305,224.868 97.473,260.767 61.537 C 276.515 45.772,294.170 28.059,300.000 22.176 C 305.830 16.292,311.145 10.970,311.811 10.349 L 313.021 9.220 314.211 9.982 C 314.865 10.401,334.197 29.567,357.172 52.572 C 380.146 75.577,399.181 94.400,399.472 94.400 C 399.906 94.400,400.000 86.049,400.000 47.200 L 400.000 0.000 200.000 0.000 L 0.000 0.000 0.000 45.600 M372.000 97.893 C 352.501 97.965,345.160 98.117,344.500 98.463 L 343.600 98.935 343.568 232.168 L 343.536 365.400 342.664 367.000 L 341.793 368.600 313.640 368.600 L 285.486 368.600 284.643 367.471 L 283.800 366.341 283.600 296.804 C 283.490 258.558,283.250 227.117,283.067 226.933 C 282.701 226.568,229.405 226.461,229.041 226.825 C 228.918 226.949,228.693 258.583,228.542 297.123 C 228.274 365.778,228.252 367.210,227.492 367.898 C 226.188 369.078,170.784 369.184,169.608 368.008 C 168.804 367.204,168.800 366.891,168.800 298.226 C 168.800 229.341,168.767 227.536,167.475 226.714 C 167.214 226.548,154.826 226.409,139.947 226.406 L 112.893 226.400 112.652 227.300 C 112.519 227.795,112.408 259.223,112.405 297.140 C 112.401 359.746,112.341 366.204,111.754 367.440 L 111.109 368.800 83.408 368.800 C 55.990 368.800,55.697 368.792,54.654 367.971 L 53.600 367.142 53.600 232.985 C 53.600 100.757,53.589 98.822,52.826 98.414 C 52.316 98.141,43.202 98.000,26.026 98.000 L 0.000 98.000 0.000 249.000 L 0.000 400.000 200.000 400.000 L 400.000 400.000 400.000 248.800 C 400.000 105.030,399.966 97.605,399.300 97.697 C 398.915 97.750,386.630 97.838,372.000 97.893 " stroke="none" fill="#fbfbfb" fill-rule="evenodd"></path><path id="path4" d="M311.769 10.369 C 311.126 10.984,305.830 16.299,300.000 22.180 C 294.170 28.061,276.515 45.772,260.767 61.537 C 224.868 97.473,226.798 95.305,228.848 97.400 C 229.097 97.655,238.930 97.873,255.920 98.000 C 270.594 98.110,282.825 98.346,283.100 98.524 C 283.682 98.900,283.841 220.201,283.261 221.116 C 283.023 221.491,282.658 221.526,281.921 221.246 C 280.893 220.855,264.400 204.605,264.400 203.983 C 264.400 203.797,263.548 202.869,262.507 201.922 C 257.055 196.963,249.504 189.572,226.200 166.382 C 212.120 152.371,200.254 140.724,199.830 140.499 C 197.688 139.361,200.576 136.667,150.138 186.858 C 118.322 218.518,112.843 223.810,112.644 223.068 C 112.236 221.548,112.381 99.049,112.791 98.400 C 113.122 97.878,116.610 97.790,139.685 97.721 C 154.268 97.678,166.695 97.547,167.300 97.431 C 169.355 97.037,168.836 95.113,165.956 92.455 C 164.612 91.215,161.867 88.492,159.856 86.403 C 154.503 80.845,141.118 67.206,140.273 66.450 C 137.821 64.256,117.052 43.194,116.480 42.322 C 115.823 41.320,113.919 39.600,113.468 39.600 C 113.117 39.600,110.990 37.350,110.201 36.144 C 109.789 35.515,109.062 34.693,108.586 34.318 C 108.110 33.943,106.478 32.340,104.960 30.756 C 93.972 19.287,84.883 10.420,83.860 10.171 C 82.773 9.906,80.812 11.801,42.053 50.547 C 19.380 73.213,1.080 91.200,0.693 91.200 C 0.267 91.200,0.000 91.508,0.000 92.000 C 0.000 94.147,2.906 91.400,42.102 52.191 C 82.119 12.161,82.715 11.587,83.820 12.007 C 84.439 12.243,99.742 27.319,118.037 45.717 C 171.339 99.321,166.901 94.686,165.800 95.600 C 165.423 95.913,157.780 96.009,139.335 95.933 C 111.498 95.817,112.028 95.782,111.303 97.799 C 111.145 98.240,111.080 158.726,111.159 232.212 L 111.303 365.825 110.233 366.312 C 108.058 367.303,57.141 366.984,55.854 365.971 L 54.800 365.142 54.800 231.217 L 54.800 97.292 53.814 96.646 C 52.932 96.068,50.056 96.000,26.414 96.000 L 0.000 96.000 0.000 97.000 L 0.000 98.000 26.026 98.000 C 43.202 98.000,52.316 98.141,52.826 98.414 C 53.589 98.822,53.600 100.757,53.600 232.985 L 53.600 367.142 54.654 367.971 C 55.697 368.792,55.990 368.800,83.408 368.800 L 111.109 368.800 111.754 367.440 C 112.341 366.204,112.401 359.746,112.405 297.140 C 112.408 259.223,112.519 227.795,112.652 227.300 L 112.893 226.400 139.947 226.406 C 154.826 226.409,167.214 226.548,167.475 226.714 C 168.767 227.536,168.800 229.341,168.800 298.226 C 168.800 366.891,168.804 367.204,169.608 368.008 C 170.784 369.184,226.188 369.078,227.492 367.898 C 228.252 367.210,228.274 365.778,228.542 297.123 C 228.693 258.583,228.918 226.949,229.041 226.825 C 229.405 226.461,282.701 226.568,283.067 226.933 C 283.250 227.117,283.490 258.558,283.600 296.804 L 283.800 366.341 284.643 367.471 L 285.486 368.600 313.640 368.600 L 341.793 368.600 342.664 367.000 L 343.536 365.400 343.568 232.244 C 343.598 105.920,343.636 99.061,344.300 98.557 C 344.865 98.128,350.057 98.023,371.250 98.013 C 401.268 97.998,400.000 98.089,400.000 95.950 C 400.000 94.932,399.819 94.400,399.471 94.400 C 399.180 94.400,380.055 75.494,356.971 52.386 C 311.418 6.786,313.497 8.718,311.769 10.369 M314.126 12.455 C 316.158 13.511,396.937 94.823,396.444 95.316 C 396.080 95.681,389.454 95.849,369.557 96.000 L 343.154 96.200 342.386 97.200 C 341.632 98.181,341.618 100.674,341.609 231.886 L 341.600 365.572 340.700 366.086 C 339.750 366.629,290.853 367.110,288.105 366.604 C 287.393 366.473,286.627 366.024,286.404 365.607 C 286.132 365.099,285.998 320.948,285.998 231.584 L 285.997 98.318 284.798 97.198 L 283.598 96.077 257.699 95.939 C 243.455 95.862,231.570 95.652,231.290 95.470 C 230.642 95.051,231.890 93.439,236.455 88.800 C 251.720 73.289,264.748 60.163,267.044 57.982 C 268.560 56.542,275.380 49.655,282.200 42.678 C 306.845 17.464,312.259 12.096,313.126 12.012 C 313.196 12.005,313.646 12.205,314.126 12.455 M199.955 141.968 C 200.548 142.390,203.996 145.756,207.616 149.447 C 216.261 158.259,213.380 155.390,249.622 191.285 C 280.075 221.448,283.324 224.829,282.409 225.394 C 282.188 225.531,270.125 225.629,255.603 225.611 C 226.383 225.576,227.158 225.511,226.652 228.042 C 226.511 228.744,226.517 259.788,226.664 297.028 C 226.914 360.169,226.887 364.808,226.257 365.769 L 225.582 366.800 198.055 366.800 L 170.528 366.800 170.064 365.781 C 169.718 365.021,169.600 347.283,169.600 295.804 L 169.600 226.845 168.700 226.213 C 167.901 225.652,164.826 225.585,141.189 225.612 C 126.552 225.629,114.276 225.527,113.907 225.386 C 112.968 225.025,112.398 225.639,128.677 209.511 C 136.639 201.623,153.253 185.141,165.596 172.884 C 199.001 139.716,196.827 141.791,198.738 141.240 C 198.814 141.218,199.362 141.545,199.955 141.968 " stroke="none" fill="#b2c897" fill-rule="evenodd"></path></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="400" height="400"><g fill-rule="evenodd"><path fill="#d5b718" d="M42.102 52.191C16.992 77.309 1.219 92.8.753 92.8c-.612 0-.753.3-.753 1.6V96h26.414c23.642 0 26.518.068 27.4.646l.986.646v267.85l1.054.829c1.287 1.013 52.204 1.332 54.379.341l1.07-.487-.144-133.613c-.079-73.486-.014-133.972.144-134.413.725-2.017.195-1.982 28.032-1.866 18.445.076 26.088-.02 26.465-.333 1.101-.914 5.539 3.721-47.763-49.883-18.295-18.398-33.598-33.474-34.217-33.71-1.105-.42-1.701.154-41.718 40.184"/><path fill="#1988e9" d="M197.8 141.54c-.917.298-1.909 1.264-32.204 31.344a55620 55620 0 0 1-36.919 36.627c-16.279 16.128-15.709 15.514-14.77 15.875.369.141 12.645.243 27.282.226 23.637-.027 26.712.04 27.511.601l.9.632v68.959c0 51.479.118 69.217.464 69.977l.464 1.019h55.054l.675-1.031c.63-.961.657-5.6.407-68.741-.147-37.24-.153-68.284-.012-68.986.506-2.531-.269-2.466 28.951-2.431 14.522.018 26.585-.08 26.806-.217.915-.565-2.334-3.946-32.787-34.109-36.242-35.895-33.361-33.026-42.006-41.838-5.816-5.929-8.422-8.339-8.878-8.207-.076.022-.498.157-.938.3"/><path fill="#34c734" d="M312.279 12.444c-.798.464-11.214 10.933-30.079 30.234-6.82 6.977-13.64 13.864-15.156 15.304-2.296 2.181-15.324 15.307-30.589 30.818-4.565 4.639-5.813 6.251-5.165 6.67.28.182 12.165.392 26.409.469l25.899.138 1.2 1.121 1.199 1.12.001 133.266c0 89.364.134 133.515.406 134.023.223.417.989.866 1.701.997 2.748.506 51.645.025 52.595-.518l.9-.514.009-133.686c.009-131.212.023-133.705.777-134.686l.768-1 26.403-.2c19.897-.151 26.523-.319 26.887-.684.493-.493-80.286-81.805-82.318-82.861-1.035-.539-.941-.539-1.847-.011"/><path fill="#fbfbfb" d="M0 45.6c0 42.998.04 45.6.693 45.6.387 0 18.687-17.987 41.36-40.653C80.812 11.801 82.773 9.906 83.86 10.171c1.023.249 10.112 9.116 21.1 20.585 1.518 1.584 3.15 3.187 3.626 3.562s1.203 1.197 1.615 1.826c.789 1.206 2.916 3.456 3.267 3.456.451 0 2.355 1.72 3.012 2.722.572.872 21.341 21.934 23.793 24.128.845.756 14.23 14.395 19.583 19.953 2.011 2.089 4.756 4.812 6.1 6.052 2.88 2.658 3.399 4.582 1.344 4.976-.605.116-13.032.247-27.615.29-23.075.069-26.563.157-26.894.679-.41.649-.555 123.148-.147 124.668.199.742 5.678-4.55 37.494-36.21 50.438-50.191 47.55-47.497 49.692-46.359.424.225 12.29 11.872 26.37 25.883 23.304 23.19 30.855 30.581 36.307 35.54 1.041.947 1.893 1.875 1.893 2.061 0 .622 16.493 16.872 17.521 17.263.737.28 1.102.245 1.34-.13.58-.915.421-122.216-.161-122.592-.275-.178-12.506-.414-27.18-.524-16.99-.127-26.823-.345-27.072-.6-2.05-2.095-3.98.073 31.919-35.863C276.515 45.772 294.17 28.059 300 22.176c5.83-5.884 11.145-11.206 11.811-11.827l1.21-1.129 1.19.762c.654.419 19.986 19.585 42.961 42.59s42.009 41.828 42.3 41.828c.434 0 .528-8.351.528-47.2V0H0zm372 52.293c-19.499.072-26.84.224-27.5.57l-.9.472-.032 133.233-.032 133.232-.872 1.6-.871 1.6h-56.307l-.843-1.129-.843-1.13-.2-69.537c-.11-38.246-.35-69.687-.533-69.871-.366-.365-53.662-.472-54.026-.108-.123.124-.348 31.758-.499 70.298-.268 68.655-.29 70.087-1.05 70.775-1.304 1.18-56.708 1.286-57.884.11-.804-.804-.808-1.117-.808-69.782 0-68.885-.033-70.69-1.325-71.512-.261-.166-12.649-.305-27.528-.308l-27.054-.006-.241.9c-.133.495-.244 31.923-.247 69.84-.004 62.606-.064 69.064-.651 70.3l-.645 1.36H83.408c-27.418 0-27.711-.008-28.754-.829l-1.054-.829V232.985c0-132.228-.011-134.163-.774-134.571-.51-.273-9.624-.414-26.8-.414H0v302h400V248.8c0-143.77-.034-151.195-.7-151.103-.385.053-12.67.141-27.3.196"/><path fill="#b2c897" d="M311.769 10.369c-.643.615-5.939 5.93-11.769 11.811s-23.485 23.592-39.233 39.357c-35.899 35.936-33.969 33.768-31.919 35.863.249.255 10.082.473 27.072.6 14.674.11 26.905.346 27.18.524.582.376.741 121.677.161 122.592-.238.375-.603.41-1.34.13-1.028-.391-17.521-16.641-17.521-17.263 0-.186-.852-1.114-1.893-2.061-5.452-4.959-13.003-12.35-36.307-35.54-14.08-14.011-25.946-25.658-26.37-25.883-2.142-1.138.746-3.832-49.692 46.359-31.816 31.66-37.295 36.952-37.494 36.21-.408-1.52-.263-124.019.147-124.668.331-.522 3.819-.61 26.894-.679 14.583-.043 27.01-.174 27.615-.29 2.055-.394 1.536-2.318-1.344-4.976-1.344-1.24-4.089-3.963-6.1-6.052-5.353-5.558-18.738-19.197-19.583-19.953-2.452-2.194-23.221-23.256-23.793-24.128-.657-1.002-2.561-2.722-3.012-2.722-.351 0-2.478-2.25-3.267-3.456-.412-.629-1.139-1.451-1.615-1.826s-2.108-1.978-3.626-3.562C93.972 19.287 84.883 10.42 83.86 10.171c-1.087-.265-3.048 1.63-41.807 40.376C19.38 73.213 1.08 91.2.693 91.2c-.426 0-.693.308-.693.8 0 2.147 2.906-.6 42.102-39.809 40.017-40.03 40.613-40.604 41.718-40.184.619.236 15.922 15.312 34.217 33.71C171.339 99.321 166.901 94.686 165.8 95.6c-.377.313-8.02.409-26.465.333-27.837-.116-27.307-.151-28.032 1.866-.158.441-.223 60.927-.144 134.413l.144 133.613-1.07.487c-2.175.991-53.092.672-54.379-.341l-1.054-.829V97.292l-.986-.646c-.882-.578-3.758-.646-27.4-.646H0v2h26.026c17.176 0 26.29.141 26.8.414.763.408.774 2.343.774 134.571v134.157l1.054.829c1.043.821 1.336.829 28.754.829h27.701l.645-1.36c.587-1.236.647-7.694.651-70.3.003-37.917.114-69.345.247-69.84l.241-.9 27.054.006c14.879.003 27.267.142 27.528.308 1.292.822 1.325 2.627 1.325 71.512 0 68.665.004 68.978.808 69.782 1.176 1.176 56.58 1.07 57.884-.11.76-.688.782-2.12 1.05-70.775.151-38.54.376-70.174.499-70.298.364-.364 53.66-.257 54.026.108.183.184.423 31.625.533 69.871l.2 69.537.843 1.13.843 1.129h56.307l.871-1.6.872-1.6.032-133.156c.03-126.324.068-133.183.732-133.687.565-.429 5.757-.534 26.95-.544 30.018-.015 28.75.076 28.75-2.063 0-1.018-.181-1.55-.529-1.55-.291 0-19.416-18.906-42.5-42.014-45.553-45.6-43.474-43.668-45.202-42.017m2.357 2.086c2.032 1.056 82.811 82.368 82.318 82.861-.364.365-6.99.533-26.887.684l-26.403.2-.768 1c-.754.981-.768 3.474-.777 134.686l-.009 133.686-.9.514c-.95.543-49.847 1.024-52.595.518-.712-.131-1.478-.58-1.701-.997-.272-.508-.406-44.659-.406-134.023l-.001-133.266-1.199-1.12-1.2-1.121-25.899-.138c-14.244-.077-26.129-.287-26.409-.469-.648-.419.6-2.031 5.165-6.67 15.265-15.511 28.293-28.637 30.589-30.818 1.516-1.44 8.336-8.327 15.156-15.304 24.645-25.214 30.059-30.582 30.926-30.666.07-.007.52.193 1 .443M199.955 141.968c.593.422 4.041 3.788 7.661 7.479 8.645 8.812 5.764 5.943 42.006 41.838 30.453 30.163 33.702 33.544 32.787 34.109-.221.137-12.284.235-26.806.217-29.22-.035-28.445-.1-28.951 2.431-.141.702-.135 31.746.012 68.986.25 63.141.223 67.78-.407 68.741l-.675 1.031h-55.054l-.464-1.019c-.346-.76-.464-18.498-.464-69.977v-68.959l-.9-.632c-.799-.561-3.874-.628-27.511-.601-14.637.017-26.913-.085-27.282-.226-.939-.361-1.509.253 14.77-15.875 7.962-7.888 24.576-24.37 36.919-36.627 33.405-33.168 31.231-31.093 33.142-31.644.076-.022.624.305 1.217.728"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/HomeAssistant/CameraProxyDescription.ts b/packages/nodes-base/nodes/HomeAssistant/CameraProxyDescription.ts
index 31d76dda84ed6..540a4af70d53b 100644
--- a/packages/nodes-base/nodes/HomeAssistant/CameraProxyDescription.ts
+++ b/packages/nodes-base/nodes/HomeAssistant/CameraProxyDescription.ts
@@ -46,7 +46,7 @@ export const cameraProxyFields: INodeProperties[] = [
 		},
 	},
 	{
-		displayName: 'Binary Property',
+		displayName: 'Put Output File in Field',
 		name: 'binaryPropertyName',
 		type: 'string',
 		required: true,
@@ -57,6 +57,6 @@ export const cameraProxyFields: INodeProperties[] = [
 				resource: ['cameraProxy'],
 			},
 		},
-		description: 'Name of the binary property to which to write the data of the read file',
+		hint: 'The name of the output binary field to put the file in',
 	},
 ];
diff --git a/packages/nodes-base/nodes/HomeAssistant/GenericFunctions.ts b/packages/nodes-base/nodes/HomeAssistant/GenericFunctions.ts
index f277b4f9de76a..58194341bcb7a 100644
--- a/packages/nodes-base/nodes/HomeAssistant/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/HomeAssistant/GenericFunctions.ts
@@ -1,17 +1,17 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IExecuteFunctions,
 	ILoadOptionsFunctions,
 	IDataObject,
 	INodePropertyOptions,
 	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function homeAssistantApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 	body: IDataObject = {},
 	qs: IDataObject = {},
@@ -20,7 +20,7 @@ export async function homeAssistantApiRequest(
 ) {
 	const credentials = await this.getCredentials('homeAssistantApi');
 
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		headers: {
 			Authorization: `Bearer ${credentials.accessToken}`,
 		},
diff --git a/packages/nodes-base/nodes/HomeAssistant/HomeAssistant.node.ts b/packages/nodes-base/nodes/HomeAssistant/HomeAssistant.node.ts
index cadc3a235e21b..3fd0f241e62f9 100644
--- a/packages/nodes-base/nodes/HomeAssistant/HomeAssistant.node.ts
+++ b/packages/nodes-base/nodes/HomeAssistant/HomeAssistant.node.ts
@@ -158,18 +158,18 @@ export class HomeAssistant implements INodeType {
 
 		loadOptions: {
 			async getAllEntities(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				return getHomeAssistantEntities.call(this);
+				return await getHomeAssistantEntities.call(this);
 			},
 			async getCameraEntities(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				return getHomeAssistantEntities.call(this, 'camera');
+				return await getHomeAssistantEntities.call(this, 'camera');
 			},
 			async getDomains(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				return getHomeAssistantServices.call(this);
+				return await getHomeAssistantServices.call(this);
 			},
 			async getDomainServices(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
 				const currentDomain = this.getCurrentNodeParameter('domain') as string;
 				if (currentDomain) {
-					return getHomeAssistantServices.call(this, currentDomain);
+					return await getHomeAssistantServices.call(this, currentDomain);
 				} else {
 					return [];
 				}
@@ -459,9 +459,9 @@ export class HomeAssistant implements INodeType {
 		}
 
 		if (resource === 'cameraProxy' && operation === 'getScreenshot') {
-			return this.prepareOutputData(items);
+			return [items];
 		} else {
-			return this.prepareOutputData(returnData);
+			return [returnData];
 		}
 	}
 }
diff --git a/packages/nodes-base/nodes/HomeAssistant/homeAssistant.svg b/packages/nodes-base/nodes/HomeAssistant/homeAssistant.svg
index 9e25b23da5210..6b2cc124f7b33 100644
--- a/packages/nodes-base/nodes/HomeAssistant/homeAssistant.svg
+++ b/packages/nodes-base/nodes/HomeAssistant/homeAssistant.svg
@@ -1,16 +1 @@
-<svg viewBox="0 0 500 500" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-  <defs>
-    <path d="M44.041 343.222V209.58H9.288a9.333 9.333 0 0 1-6.655-15.876L189.639 3.497c4.517-4.594 11.903-4.657 16.498-.14l.12.12 97.601 98.794V83.974a7.778 7.778 0 0 1 7.778-7.778h32.41a7.778 7.778 0 0 1 7.779 7.778v67.138l41.568 42.618a9.333 9.333 0 0 1-6.682 15.85h-34.886v133.642a7.778 7.778 0 0 1-7.778 7.778H51.819a7.778 7.778 0 0 1-7.778-7.778zm206.393-163.26a15.029 15.029 0 0 0 1.46-6.486c0-8.308-6.71-15.043-14.989-15.043-8.278 0-14.989 6.735-14.989 15.043s6.711 15.044 14.99 15.044c2.314 0 4.505-.527 6.462-1.467l21.518 21.596v20.918l-26.981 27.078v-19.84a15.046 15.046 0 0 0 9.993-14.187c0-8.308-6.711-15.044-14.99-15.044-8.278 0-14.99 6.736-14.99 15.044 0 6.55 4.172 12.122 9.994 14.187v29.868l-24.983 25.073V144.464l20.519-20.592a14.886 14.886 0 0 0 6.462 1.466c8.279 0 14.99-6.735 14.99-15.044 0-8.308-6.711-15.043-14.99-15.043-8.278 0-14.989 6.735-14.989 15.043 0 2.323.524 4.522 1.46 6.486l-18.448 18.515-18.449-18.515a15.029 15.029 0 0 0 1.46-6.486c0-8.308-6.71-15.043-14.989-15.043-8.278 0-14.989 6.735-14.989 15.043 0 8.309 6.711 15.044 14.99 15.044 2.314 0 4.505-.527 6.462-1.466l20.518 20.592v105.16l-35.974-36.104v-28.865a15.046 15.046 0 0 0 9.993-14.187c0-8.309-6.711-15.044-14.99-15.044-8.278 0-14.99 6.735-14.99 15.044 0 6.55 4.172 12.122 9.994 14.187v18.837l-27.98-28.081v-27.863a15.046 15.046 0 0 0 9.993-14.187c0-8.308-6.711-15.044-14.99-15.044-8.278 0-14.99 6.736-14.99 15.044 0 6.55 4.172 12.122 9.994 14.187v32.017l30.907 31.018h-17.77c-2.058-5.843-7.61-10.029-14.137-10.029-8.278 0-14.99 6.735-14.99 15.043 0 8.309 6.712 15.044 14.99 15.044 6.527 0 12.08-4.186 14.137-10.03h27.763l43.04 43.196v75.074l-22.983-23.066v-28.866a15.046 15.046 0 0 0 9.993-14.187c0-8.308-6.711-15.043-14.99-15.043-8.278 0-14.99 6.735-14.99 15.043 0 6.55 4.172 12.122 9.994 14.187v18.837l-33.439-33.558a15.029 15.029 0 0 0 1.461-6.486c0-8.308-6.71-15.043-14.99-15.043-8.278 0-14.989 6.735-14.989 15.043s6.711 15.043 14.99 15.043c2.314 0 4.506-.526 6.462-1.466l33.439 33.559h-17.77c-2.058-5.843-7.61-10.03-14.137-10.03-8.278 0-14.99 6.736-14.99 15.044s6.712 15.043 14.99 15.043c6.527 0 12.079-4.186 14.137-10.029h27.763l27.98 28.081h14.132l28.98-29.083h26.763c2.058 5.842 7.61 10.028 14.137 10.028 8.278 0 14.99-6.735 14.99-15.043s-6.712-15.043-14.99-15.043c-6.527 0-12.079 4.186-14.137 10.029H229.84l-26.91 27.006V305.93l32.049-32.164h51.746c2.058 5.843 7.61 10.029 14.136 10.029 8.279 0 14.99-6.735 14.99-15.043 0-8.309-6.711-15.044-14.99-15.044-6.526 0-12.078 4.186-14.136 10.03H244.97l29.908-30.016v-25.072l21.517-21.596a14.886 14.886 0 0 0 6.463 1.467c8.278 0 14.99-6.736 14.99-15.044s-6.712-15.043-14.99-15.043-14.99 6.735-14.99 15.043c0 2.323.525 4.522 1.461 6.486l-14.451 14.504V148.55a15.046 15.046 0 0 0 9.993-14.187c0-8.309-6.711-15.044-14.99-15.044-8.278 0-14.99 6.735-14.99 15.044 0 6.55 4.172 12.122 9.994 14.187v45.915l-14.452-14.504zM120.987 323.909c-3.311 0-5.996-2.694-5.996-6.017 0-3.323 2.685-6.017 5.996-6.017 3.312 0 5.996 2.694 5.996 6.017 0 3.323-2.684 6.017-5.996 6.017zm43.97-45.13c-3.312 0-5.997-2.694-5.997-6.017 0-3.323 2.685-6.017 5.996-6.017 3.312 0 5.996 2.694 5.996 6.017 0 3.323-2.684 6.017-5.996 6.017zm-51.964-7.02c-3.312 0-5.996-2.694-5.996-6.017 0-3.323 2.684-6.017 5.996-6.017 3.311 0 5.996 2.694 5.996 6.017 0 3.323-2.685 6.017-5.996 6.017zm-4.997-50.144c-3.311 0-5.995-2.694-5.995-6.018 0-3.323 2.684-6.017 5.995-6.017 3.312 0 5.996 2.694 5.996 6.017 0 3.324-2.684 6.018-5.996 6.018zm124.912 7.02c-3.311 0-5.995-2.694-5.995-6.017 0-3.324 2.684-6.018 5.995-6.018 3.312 0 5.996 2.694 5.996 6.018 0 3.323-2.684 6.017-5.996 6.017zm67.952 46.133c-3.31 0-5.995-2.694-5.995-6.017 0-3.324 2.684-6.018 5.995-6.018 3.312 0 5.996 2.694 5.996 6.018 0 3.323-2.684 6.017-5.996 6.017zm-25.981 48.138c-3.312 0-5.996-2.694-5.996-6.017 0-3.323 2.684-6.017 5.996-6.017 3.311 0 5.996 2.694 5.996 6.017 0 3.323-2.685 6.017-5.996 6.017zm27.98-143.412c-3.311 0-5.996-2.695-5.996-6.018s2.685-6.017 5.996-6.017c3.311 0 5.996 2.694 5.996 6.017 0 3.323-2.685 6.018-5.996 6.018zm-32.977-39.113c-3.311 0-5.996-2.694-5.996-6.017 0-3.324 2.685-6.018 5.996-6.018 3.312 0 5.996 2.694 5.996 6.018 0 3.323-2.684 6.017-5.996 6.017zm-39.972-24.07c-3.311 0-5.995-2.693-5.995-6.017 0-3.323 2.684-6.017 5.995-6.017 3.312 0 5.996 2.694 5.996 6.017 0 3.324-2.684 6.018-5.996 6.018zm-63.955 0c-3.31 0-5.995-2.693-5.995-6.017 0-3.323 2.684-6.017 5.995-6.017 3.312 0 5.996 2.694 5.996 6.017 0 3.324-2.684 6.018-5.996 6.018zm-51.963 23.067c-3.311 0-5.996-2.694-5.996-6.017 0-3.324 2.685-6.018 5.996-6.018 3.311 0 5.996 2.694 5.996 6.018 0 3.323-2.685 6.017-5.996 6.017zm37.973 37.107c-3.311 0-5.995-2.694-5.995-6.017 0-3.324 2.684-6.018 5.995-6.018 3.312 0 5.996 2.694 5.996 6.018 0 3.323-2.684 6.017-5.996 6.017zm84.94 3.009c-3.31 0-5.995-2.695-5.995-6.018s2.684-6.017 5.995-6.017c3.312 0 5.996 2.694 5.996 6.017 0 3.323-2.684 6.018-5.996 6.018z" id="a"/>
-  </defs>
-  <g fill="none" fill-rule="evenodd">
-    <path d="M0 0h500v500H0z" fill="#41BDF5"/>
-    <g transform="translate(52 70)">
-      <mask id="b" fill="#fff">
-        <use xlink:href="#a"/>
-      </mask>
-      <g mask="url(#b)" fill="#FFF">
-        <path d="M0 0h396v351H0z"/>
-      </g>
-    </g>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="240" height="240" fill="none"><path fill="#F2F4F9" d="M240 224.762c0 8.25-6.75 15-15 15H15c-8.25 0-15-6.75-15-15v-90c0-8.25 4.77-19.769 10.61-25.609l98.78-98.78c5.83-5.83 15.38-5.83 21.21 0l98.79 98.789c5.83 5.83 10.61 17.36 10.61 25.61v90z"/><path fill="#18BCF2" d="m229.39 109.153-98.78-98.78c-5.83-5.83-15.38-5.83-21.21 0l-98.79 98.78C4.78 114.983 0 126.512 0 134.762v90c0 8.25 6.75 15 15 15h92.27l-40.63-40.63c-2.09.72-4.32 1.13-6.64 1.13-11.3 0-20.5-9.2-20.5-20.5s9.2-20.5 20.5-20.5 20.5 9.2 20.5 20.5c0 2.33-.41 4.56-1.13 6.65l31.63 31.63v-115.88c-6.8-3.34-11.5-10.32-11.5-18.39 0-11.3 9.2-20.5 20.5-20.5s20.5 9.2 20.5 20.5c0 8.07-4.7 15.05-11.5 18.39v81.27l31.46-31.46c-.62-1.96-.96-4.04-.96-6.2 0-11.3 9.2-20.5 20.5-20.5s20.5 9.2 20.5 20.5-9.2 20.5-20.5 20.5c-2.5 0-4.88-.47-7.09-1.29L129 208.892v30.88h96c8.25 0 15-6.75 15-15v-90c0-8.25-4.77-19.77-10.61-25.61z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Html/Html.node.json b/packages/nodes-base/nodes/Html/Html.node.json
index b23e6c8cf9a24..dbd9b221e4ff1 100644
--- a/packages/nodes-base/nodes/Html/Html.node.json
+++ b/packages/nodes-base/nodes/Html/Html.node.json
@@ -11,7 +11,7 @@
 		]
 	},
 	"subcategories": {
-		"Core Nodes": ["Helpers", "Data Transformation"]
+		"Core Nodes": ["Data Transformation"]
 	},
-	"alias": ["extract", "template"]
+	"alias": ["extract", "template", "table"]
 }
diff --git a/packages/nodes-base/nodes/Html/Html.node.ts b/packages/nodes-base/nodes/Html/Html.node.ts
index a4996281f4f39..c00a896e6c48a 100644
--- a/packages/nodes-base/nodes/Html/Html.node.ts
+++ b/packages/nodes-base/nodes/Html/Html.node.ts
@@ -5,11 +5,121 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 	IDataObject,
+	INodeProperties,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
+import get from 'lodash/get';
 import { placeholder } from './placeholder';
-import { getResolvables, getValue } from './utils';
+import { getValue } from './utils';
 import type { IValueData } from './types';
+import { getResolvables, sanitazeDataPathKey } from '@utils/utilities';
+
+export const capitalizeHeader = (header: string, capitalize?: boolean) => {
+	if (!capitalize) return header;
+	return header
+		.split('_')
+		.filter((word) => word)
+		.map((word) => word[0].toUpperCase() + word.slice(1))
+		.join(' ');
+};
+
+const extractionValuesCollection: INodeProperties = {
+	displayName: 'Extraction Values',
+	name: 'extractionValues',
+	placeholder: 'Add Value',
+	type: 'fixedCollection',
+	typeOptions: {
+		multipleValues: true,
+	},
+	default: {},
+	options: [
+		{
+			name: 'values',
+			displayName: 'Values',
+			values: [
+				{
+					displayName: 'Key',
+					name: 'key',
+					type: 'string',
+					default: '',
+					description: 'The key under which the extracted value should be saved',
+				},
+				{
+					displayName: 'CSS Selector',
+					name: 'cssSelector',
+					type: 'string',
+					default: '',
+					placeholder: '.price',
+					description: 'The CSS selector to use',
+				},
+				{
+					displayName: 'Return Value',
+					name: 'returnValue',
+					type: 'options',
+					options: [
+						{
+							name: 'Attribute',
+							value: 'attribute',
+							description: 'Get an attribute value like "class" from an element',
+						},
+						{
+							name: 'HTML',
+							value: 'html',
+							description: 'Get the HTML the element contains',
+						},
+						{
+							name: 'Text',
+							value: 'text',
+							description: 'Get only the text content of the element',
+						},
+						{
+							name: 'Value',
+							value: 'value',
+							description: 'Get value of an input, select or textarea',
+						},
+					],
+					default: 'text',
+					description: 'What kind of data should be returned',
+				},
+				{
+					displayName: 'Attribute',
+					name: 'attribute',
+					type: 'string',
+					displayOptions: {
+						show: {
+							returnValue: ['attribute'],
+						},
+					},
+					default: '',
+					placeholder: 'class',
+					description: 'The name of the attribute to return the value off',
+				},
+				{
+					displayName: 'Skip Selectors',
+					name: 'skipSelectors',
+					type: 'string',
+					displayOptions: {
+						show: {
+							returnValue: ['text'],
+							'@version': [{ _cnd: { gt: 1.1 } }],
+						},
+					},
+					default: '',
+					placeholder: 'e.g. img, .className, #ItemId',
+					description: 'Comma-separated list of selectors to skip in the text extraction',
+				},
+				{
+					displayName: 'Return Array',
+					name: 'returnArray',
+					type: 'boolean',
+					default: false,
+					description:
+						'Whether to return the values as an array so if multiple ones get found they also get returned separately. If not set all will be returned as a single string.',
+				},
+			],
+		},
+	],
+};
 
 export class Html implements INodeType {
 	description: INodeTypeDescription = {
@@ -17,7 +127,7 @@ export class Html implements INodeType {
 		name: 'html',
 		icon: 'file:html.svg',
 		group: ['transform'],
-		version: 1,
+		version: [1, 1.1, 1.2],
 		subtitle: '={{ $parameter["operation"] }}',
 		description: 'Work with HTML',
 		defaults: {
@@ -43,6 +153,11 @@ export class Html implements INodeType {
 						value: 'extractHtmlContent',
 						action: 'Extract HTML Content',
 					},
+					{
+						name: 'Convert to HTML Table',
+						value: 'convertToHtmlTable',
+						action: 'Convert to HTML Table',
+					},
 				],
 				default: 'generateHtmlTemplate',
 			},
@@ -97,9 +212,10 @@ export class Html implements INodeType {
 				},
 			},
 			{
-				displayName: 'Binary Property',
+				displayName: 'Input Binary Field',
 				name: 'dataPropertyName',
 				type: 'string',
+				requiresDataPath: 'single',
 				displayOptions: {
 					show: {
 						operation: ['extractHtmlContent'],
@@ -108,13 +224,13 @@ export class Html implements INodeType {
 				},
 				default: 'data',
 				required: true,
-				description:
-					'Name of the binary property in which the HTML to extract the data from can be found',
+				hint: 'The name of the input binary field containing the file to be extracted',
 			},
 			{
 				displayName: 'JSON Property',
 				name: 'dataPropertyName',
 				type: 'string',
+				requiresDataPath: 'single',
 				displayOptions: {
 					show: {
 						operation: ['extractHtmlContent'],
@@ -127,94 +243,33 @@ export class Html implements INodeType {
 					'Name of the JSON property in which the HTML to extract the data from can be found. The property can either contain a string or an array of strings.',
 			},
 			{
-				displayName: 'Extraction Values',
-				name: 'extractionValues',
-				placeholder: 'Add Value',
-				type: 'fixedCollection',
-				typeOptions: {
-					multipleValues: true,
-				},
+				...extractionValuesCollection,
 				displayOptions: {
 					show: {
 						operation: ['extractHtmlContent'],
+						'@version': [1],
 					},
 				},
-				default: {},
-				options: [
-					{
-						name: 'values',
-						displayName: 'Values',
-						values: [
-							{
-								displayName: 'Key',
-								name: 'key',
-								type: 'string',
-								default: '',
-								description: 'The key under which the extracted value should be saved',
-							},
-							{
-								displayName: 'CSS Selector',
-								name: 'cssSelector',
-								type: 'string',
-								default: '',
-								placeholder: '.price',
-								description: 'The CSS selector to use',
-							},
-							{
-								displayName: 'Return Value',
-								name: 'returnValue',
-								type: 'options',
-								options: [
-									{
-										name: 'Attribute',
-										value: 'attribute',
-										description: 'Get an attribute value like "class" from an element',
-									},
-									{
-										name: 'HTML',
-										value: 'html',
-										description: 'Get the HTML the element contains',
-									},
-									{
-										name: 'Text',
-										value: 'text',
-										description: 'Get only the text content of the element',
-									},
-									{
-										name: 'Value',
-										value: 'value',
-										description: 'Get value of an input, select or textarea',
-									},
-								],
-								default: 'text',
-								description: 'What kind of data should be returned',
-							},
-							{
-								displayName: 'Attribute',
-								name: 'attribute',
-								type: 'string',
-								displayOptions: {
-									show: {
-										returnValue: ['attribute'],
-									},
-								},
-								default: '',
-								placeholder: 'class',
-								description: 'The name of the attribute to return the value off',
-							},
-							{
-								displayName: 'Return Array',
-								name: 'returnArray',
-								type: 'boolean',
-								default: false,
-								description:
-									'Whether to return the values as an array so if multiple ones get found they also get returned separately. If not set all will be returned as a single string.',
-							},
-						],
+			},
+			{
+				...extractionValuesCollection,
+				default: {
+					values: [
+						{
+							key: '',
+							cssSelector: '',
+							returnValue: 'text',
+							returnArray: false,
+						},
+					],
+				},
+				displayOptions: {
+					show: {
+						operation: ['extractHtmlContent'],
+						'@version': [{ _cnd: { gt: 1 } }],
 					},
-				],
+				},
 			},
-
 			{
 				displayName: 'Options',
 				name: 'options',
@@ -235,6 +290,84 @@ export class Html implements INodeType {
 						description:
 							'Whether to remove automatically all spaces and newlines from the beginning and end of the values',
 					},
+					{
+						displayName: 'Clean Up Text',
+						name: 'cleanUpText',
+						type: 'boolean',
+						default: true,
+						description:
+							'Whether to remove remove leading and trailing whitespaces, line breaks (newlines) and condense multiple consecutive whitespaces into a single space',
+					},
+				],
+			},
+			// ----------------------------------
+			//       convertToHtmlTable
+			// ----------------------------------
+			{
+				displayName: 'Options',
+				name: 'options',
+				type: 'collection',
+				placeholder: 'Add Option',
+				default: {},
+				displayOptions: {
+					show: {
+						operation: ['convertToHtmlTable'],
+					},
+				},
+				options: [
+					{
+						displayName: 'Capitalize Headers',
+						name: 'capitalize',
+						type: 'boolean',
+						default: false,
+						description: 'Whether to capitalize the headers',
+					},
+					{
+						displayName: 'Custom Styling',
+						name: 'customStyling',
+						type: 'boolean',
+						default: false,
+						description: 'Whether to use custom styling',
+					},
+					{
+						displayName: 'Caption',
+						name: 'caption',
+						type: 'string',
+						default: '',
+						description: 'Caption to add to the table',
+					},
+					{
+						displayName: 'Table Attributes',
+						name: 'tableAttributes',
+						type: 'string',
+						default: '',
+						description: 'Attributes to attach to the table',
+						placeholder: 'e.g. style="padding:10px"',
+					},
+					{
+						displayName: 'Header Attributes',
+						name: 'headerAttributes',
+						type: 'string',
+						default: '',
+						description: 'Attributes to attach to the table header',
+						placeholder: 'e.g. style="padding:10px"',
+					},
+					{
+						displayName: 'Row Attributes',
+						name: 'rowAttributes',
+						type: 'string',
+						default: '',
+						description: 'Attributes to attach to the table row',
+						placeholder: 'e.g. style="padding:10px"',
+					},
+					{
+						displayName: 'Cell Attributes',
+						name: 'cellAttributes',
+						type: 'string',
+						default: '',
+						description: 'Attributes to attach to the table cell',
+						placeholder: 'e.g. style="padding:10px"',
+					},
 				],
 			},
 		],
@@ -242,10 +375,105 @@ export class Html implements INodeType {
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const items = this.getInputData();
-		let item: INodeExecutionData;
-		const returnData: INodeExecutionData[] = [];
 		const operation = this.getNodeParameter('operation', 0);
+		const nodeVersion = this.getNode().typeVersion;
+
+		if (operation === 'convertToHtmlTable' && items.length) {
+			let table = '';
+
+			const options = this.getNodeParameter('options', 0);
+
+			let tableStyle = '';
+			let headerStyle = '';
+			let cellStyle = '';
+
+			if (!options.customStyling) {
+				tableStyle = "style='border-spacing:0; font-family:helvetica,arial,sans-serif'";
+				headerStyle =
+					"style='margin:0; padding:7px 20px 7px 0px; border-bottom:1px solid #eee; text-align:left; color:#888; font-weight:normal'";
+				cellStyle = "style='margin:0; padding:7px 20px 7px 0px; border-bottom:1px solid #eee'";
+			}
+
+			const tableAttributes = (options.tableAttributes as string) || '';
+			const headerAttributes = (options.headerAttributes as string) || '';
+
+			const itemsData: IDataObject[] = [];
+			const itemsKeys = new Set<string>();
+
+			for (const entry of items) {
+				itemsData.push(entry.json);
+
+				for (const key of Object.keys(entry.json)) {
+					itemsKeys.add(key);
+				}
+			}
+
+			const headers = Array.from(itemsKeys);
+
+			table += `<table ${tableStyle} ${tableAttributes}>`;
+
+			if (options.caption) {
+				table += `<caption>${options.caption}</caption>`;
+			}
+
+			table += `<thead ${headerStyle} ${headerAttributes}>`;
+			table += '<tr>';
+			table += headers
+				.map((header) => '<th>' + capitalizeHeader(header, options.capitalize as boolean) + '</th>')
+				.join('');
+			table += '</tr>';
+			table += '</thead>';
+
+			table += '<tbody>';
+			itemsData.forEach((entry, entryIndex) => {
+				const rowsAttributes = this.getNodeParameter(
+					'options.rowsAttributes',
+					entryIndex,
+					'',
+				) as string;
+
+				table += `<tr  ${rowsAttributes}>`;
 
+				const cellsAttributes = this.getNodeParameter(
+					'options.cellAttributes',
+					entryIndex,
+					'',
+				) as string;
+
+				table += headers
+					.map((header) => {
+						let td = `<td ${cellStyle} ${cellsAttributes}>`;
+
+						if (typeof entry[header] === 'boolean') {
+							const isChecked = entry[header] ? 'checked="checked"' : '';
+							td += `<input type="checkbox" ${isChecked}/>`;
+						} else {
+							td += entry[header];
+						}
+						td += '</td>';
+						return td;
+					})
+					.join('');
+				table += '</tr>';
+			});
+
+			table += '</tbody>';
+			table += '</table>';
+
+			return [
+				[
+					{
+						json: { table },
+						pairedItem: items.map((_item, index) => ({
+							item: index,
+						})),
+					},
+				],
+			];
+		}
+
+		let item: INodeExecutionData;
+		const returnData: INodeExecutionData[] = [];
 		for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
 			try {
 				if (operation === 'generateHtmlTemplate') {
@@ -287,14 +515,27 @@ export class Html implements INodeType {
 
 					let htmlArray: string[] | string = [];
 					if (sourceData === 'json') {
-						if (item.json[dataPropertyName] === undefined) {
-							throw new NodeOperationError(
-								this.getNode(),
-								`No property named "${dataPropertyName}" exists!`,
-								{ itemIndex },
-							);
+						if (nodeVersion === 1) {
+							const key = sanitazeDataPathKey(item.json, dataPropertyName);
+							if (item.json[key] === undefined) {
+								throw new NodeOperationError(
+									this.getNode(),
+									`No property named "${dataPropertyName}" exists!`,
+									{ itemIndex },
+								);
+							}
+							htmlArray = item.json[key] as string;
+						} else {
+							const value = get(item.json, dataPropertyName);
+							if (value === undefined) {
+								throw new NodeOperationError(
+									this.getNode(),
+									`No property named "${dataPropertyName}" exists!`,
+									{ itemIndex },
+								);
+							}
+							htmlArray = value as string;
 						}
-						htmlArray = item.json[dataPropertyName] as string;
 					} else {
 						this.helpers.assertBinaryData(itemIndex, dataPropertyName);
 						const binaryDataBuffer = await this.helpers.getBinaryDataBuffer(
@@ -309,7 +550,7 @@ export class Html implements INodeType {
 						htmlArray = [htmlArray];
 					}
 
-					for (const html of htmlArray as string[]) {
+					for (const html of htmlArray) {
 						const $ = cheerio.load(html);
 
 						const newItem: INodeExecutionData = {
@@ -328,14 +569,19 @@ export class Html implements INodeType {
 								// An array should be returned so iterate over one
 								// value at a time
 								newItem.json[valueData.key] = [];
-								htmlElement.each((i, el) => {
+								htmlElement.each((_, el) => {
 									(newItem.json[valueData.key] as Array<string | undefined>).push(
-										getValue($(el), valueData, options),
+										getValue($(el), valueData, options, nodeVersion),
 									);
 								});
 							} else {
 								// One single value should be returned
-								newItem.json[valueData.key] = getValue(htmlElement, valueData, options);
+								newItem.json[valueData.key] = getValue(
+									htmlElement,
+									valueData,
+									options,
+									nodeVersion,
+								);
 							}
 						}
 						returnData.push(newItem);
@@ -358,6 +604,6 @@ export class Html implements INodeType {
 			}
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Html/html.svg b/packages/nodes-base/nodes/Html/html.svg
index 80cab9e7ace63..816043b8872ea 100644
--- a/packages/nodes-base/nodes/Html/html.svg
+++ b/packages/nodes-base/nodes/Html/html.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 63.75 85" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#A" x="1.875" y="2.5"/><symbol id="A" overflow="visible"><g stroke="none"><path d="M60 15H0l5 57.5L30 80l25-7.5L60 15" fill="#e44d26"/><path d="M7 0v11h3V7h4v4h3V0h-3v4h-4V0zm24 0v11h3V5l2.5 4L39 5v6h3V0h-3l-2.5 3.5L34 0zm13 0v11h9V8h-6V0z" fill="#000"/><path d="M22.366 65.21l-8.214-2.464-.67-7.701-.221-2.545h8l.436 5.009L30 60v7.5zM30 32.5H19.522l.652 7.5H30v7.5h-9.174-8l-.652-7.5-.652-7.5-.652-7.5h8H30z" fill="#ebebeb"/><path d="M51.739 52.5l.435-5 .652-7.5.652-7.5.652-7.5.435-5H30v55l15.179-4.554 5.134-1.54.67-7.701.67-7.701z" fill="#f16529"/><path d="M19 0v3h3.5v8h3V3H29V0z" fill="#000"/><path d="M30 32.5h10.478 8l.652-7.5h-8H30zm9.174 15H30V40h9.826 8l-.652 7.5-.435 5-.221 2.545-.67 7.701-8.214 2.464L30 67.5V60l8.304-2.491.435-5.009z"/></g></symbol></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round" viewBox="0 0 63.75 85"><use xlink:href="#a" x="1.875" y="2.5"/><symbol id="a" overflow="visible"><g stroke="none"><path fill="#e44d26" d="M60 15H0l5 57.5L30 80l25-7.5z"/><path fill="#000" d="M7 0v11h3V7h4v4h3V0h-3v4h-4V0zm24 0v11h3V5l2.5 4L39 5v6h3V0h-3l-2.5 3.5L34 0zm13 0v11h9V8h-6V0z"/><path fill="#ebebeb" d="m22.366 65.21-8.214-2.464-.67-7.701-.221-2.545h8l.436 5.009L30 60v7.5zM30 32.5H19.522l.652 7.5H30v7.5H12.826l-.652-7.5-.652-7.5-.652-7.5H30z"/><path fill="#f16529" d="m51.739 52.5.435-5 .652-7.5.652-7.5.652-7.5.435-5H30v55l15.179-4.554 5.134-1.54.67-7.701.67-7.701z"/><path fill="#000" d="M19 0v3h3.5v8h3V3H29V0z"/><path d="M30 32.5h18.478l.652-7.5H30zm9.174 15H30V40h17.826l-.652 7.5-.435 5-.221 2.545-.67 7.701-8.214 2.464L30 67.5V60l8.304-2.491.435-5.009z"/></g></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Html/test/Html.node.test.ts b/packages/nodes-base/nodes/Html/test/Html.node.test.ts
new file mode 100644
index 0000000000000..9fc798c198692
--- /dev/null
+++ b/packages/nodes-base/nodes/Html/test/Html.node.test.ts
@@ -0,0 +1,5 @@
+import { testWorkflows, getWorkflowFilenames } from '@test/nodes/Helpers';
+
+const workflows = getWorkflowFilenames(__dirname);
+
+describe('Test Html Node > extractHtmlContent', () => testWorkflows(workflows));
diff --git a/packages/nodes-base/nodes/Html/test/extractHtmlContent.workflow.json b/packages/nodes-base/nodes/Html/test/extractHtmlContent.workflow.json
new file mode 100644
index 0000000000000..e027d29e07e59
--- /dev/null
+++ b/packages/nodes-base/nodes/Html/test/extractHtmlContent.workflow.json
@@ -0,0 +1,469 @@
+{
+  "name": "html extract fix",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "b421815f-bbeb-480d-a759-6a0360a050b6",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        480,
+        780
+      ]
+    },
+    {
+      "parameters": {
+        "operation": "extractHtmlContent",
+        "extractionValues": {
+          "values": [
+            {
+              "key": "data",
+              "cssSelector": "html"
+            }
+          ]
+        },
+        "options": {
+          "cleanUpText": true
+        }
+      },
+      "id": "73ed18ec-3a26-4300-b917-240faa810a33",
+      "name": "HTML",
+      "type": "n8n-nodes-base.html",
+      "typeVersion": 1.2,
+      "position": [
+        1280,
+        260
+      ]
+    },
+    {
+      "parameters": {
+        "operation": "extractHtmlContent",
+        "extractionValues": {
+          "values": [
+            {
+              "key": "data",
+              "cssSelector": "html",
+              "skipSelectors": "img, a"
+            }
+          ]
+        },
+        "options": {}
+      },
+      "id": "d8eaf4c4-be91-43ba-b5ff-efcc7ece60b0",
+      "name": "HTML2",
+      "type": "n8n-nodes-base.html",
+      "typeVersion": 1.2,
+      "position": [
+        1280,
+        600
+      ]
+    },
+    {
+      "parameters": {
+        "operation": "extractHtmlContent",
+        "extractionValues": {
+          "values": [
+            {
+              "key": "data",
+              "cssSelector": "p",
+              "returnArray": true
+            }
+          ]
+        },
+        "options": {}
+      },
+      "id": "145a5168-69fd-49bd-a2a0-07841854937c",
+      "name": "HTML3",
+      "type": "n8n-nodes-base.html",
+      "typeVersion": 1.2,
+      "position": [
+        1280,
+        760
+      ]
+    },
+    {
+      "parameters": {
+        "operation": "extractHtmlContent",
+        "extractionValues": {
+          "values": [
+            {
+              "key": "data",
+              "cssSelector": "=html"
+            }
+          ]
+        },
+        "options": {
+          "trimValues": true
+        }
+      },
+      "id": "7a370ce9-e4c4-46e0-89a4-881a6c8a7019",
+      "name": "HTML1",
+      "type": "n8n-nodes-base.html",
+      "typeVersion": 1.2,
+      "position": [
+        1280,
+        420
+      ]
+    },
+    {
+      "parameters": {
+        "operation": "extractHtmlContent",
+        "extractionValues": {
+          "values": [
+            {
+              "key": "data",
+              "cssSelector": "div",
+              "returnValue": "attribute"
+            }
+          ]
+        },
+        "options": {}
+      },
+      "id": "64c9005d-f9fe-457e-8e24-f1c59e76aeae",
+      "name": "HTML4",
+      "type": "n8n-nodes-base.html",
+      "typeVersion": 1.2,
+      "position": [
+        1280,
+        940
+      ]
+    },
+    {
+      "parameters": {
+        "operation": "extractHtmlContent",
+        "extractionValues": {
+          "values": [
+            {
+              "key": "data",
+              "cssSelector": "body",
+              "returnValue": "html"
+            }
+          ]
+        },
+        "options": {}
+      },
+      "id": "eef6b477-2c28-4c20-884f-93bbd48f9d0d",
+      "name": "HTML5",
+      "type": "n8n-nodes-base.html",
+      "typeVersion": 1.2,
+      "position": [
+        1280,
+        1120
+      ]
+    },
+    {
+      "parameters": {
+        "operation": "extractHtmlContent",
+        "extractionValues": {
+          "values": [
+            {
+              "key": "data",
+              "cssSelector": "#text-id",
+              "returnValue": "value"
+            }
+          ]
+        },
+        "options": {}
+      },
+      "id": "a548e5e3-0dcd-4f52-a581-bd046ef325b3",
+      "name": "HTML6",
+      "type": "n8n-nodes-base.html",
+      "typeVersion": 1.2,
+      "position": [
+        1280,
+        1280
+      ]
+    },
+    {
+      "parameters": {
+        "jsCode": "return {\n  data: `<html>\n<head>\n\t<title>My Page</title>\t\n</head>\n<body>\n\t<h1>My Page</h1>\n\t<p>Hello World</p>\n\t<div class=\"content\">\n\t\t<p>Another paragraph\\n</p>\n\t\t<p>Yet \\r\\n\\r\\n\\t\\t\\t\\t\\t\\t\\another paragraph\\n</p>\n\t\t<p>And\\one more\\n</p>\n\t</div>\n\t<img src=\"https://n8n.io/n8n-logo.png\" alt=\"n8n.io logo\" />\n\t<a href=\"https://n8n.io\">n8n.io</a>\n    <input id=\"text-id\" type=\"text\" value=\"n8n\" />\n</body>\n</html>`\n};"
+      },
+      "id": "ed46f03d-6cde-4225-beab-fdbe82bf095f",
+      "name": "Code",
+      "type": "n8n-nodes-base.code",
+      "typeVersion": 2,
+      "position": [
+        780,
+        740
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "9d4c07df-3348-4b0e-b144-dfb038bddb99",
+      "name": "No Operation, do nothing",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        1500,
+        260
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "0dd56421-7e3a-4908-a933-c4e09de6b7d5",
+      "name": "No Operation, do nothing1",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        1580,
+        620
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "15c21267-b4b7-4805-ad40-32060400fcef",
+      "name": "No Operation, do nothing2",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        1600,
+        780
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "d6fd1d78-e24b-4237-bd66-620130f0e5fc",
+      "name": "No Operation, do nothing3",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        1640,
+        1140
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "f8b7457b-7b46-4af6-958c-ad770f29e587",
+      "name": "No Operation, do nothing4",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        1560,
+        960
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "f509b012-78ea-4e14-9ee4-ebdd562efe3e",
+      "name": "No Operation, do nothing5",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        1560,
+        420
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "173f20fb-80aa-42d1-97b1-fc7a751fbedd",
+      "name": "No Operation, do nothing6",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        1580,
+        1300
+      ]
+    }
+  ],
+  "pinData": {
+    "No Operation, do nothing4": [
+      {
+        "json": {
+          "data": {
+            "class": "content"
+          }
+        }
+      }
+    ],
+    "No Operation, do nothing": [
+      {
+        "json": {
+          "data": "MY PAGEHello WorldAnother paragraphYet another paragraphAndone moren8n.io logo [https://n8n.io/n8n-logo.png] n8n.io [https://n8n.io]"
+        }
+      }
+    ],
+    "No Operation, do nothing5": [
+      {
+        "json": {
+          "data": "MY PAGE\n\nHello World\n\nAnother paragraph\n\nYet another paragraph\n\nAndone more\n\nn8n.io logo [https://n8n.io/n8n-logo.png] n8n.io [https://n8n.io]"
+        }
+      }
+    ],
+    "No Operation, do nothing1": [
+      {
+        "json": {
+          "data": "MY PAGE\n\nHello World\n\nAnother paragraph\n\nYet another paragraph\n\nAndone more"
+        }
+      }
+    ],
+    "No Operation, do nothing2": [
+      {
+        "json": {
+          "data": [
+            "Hello World",
+            "Another paragraph",
+            "Yet another paragraph",
+            "Andone more"
+          ]
+        }
+      }
+    ],
+    "No Operation, do nothing3": [
+      {
+        "json": {
+          "data": "\n\t<h1>My Page</h1>\n\t<p>Hello World</p>\n\t<div class=\"content\">\n\t\t<p>Another paragraph\n</p>\n\t\t<p>Yet \n\n\t\t\t\t\t\tanother paragraph\n</p>\n\t\t<p>Andone more\n</p>\n\t</div>\n\t<img src=\"https://n8n.io/n8n-logo.png\" alt=\"n8n.io logo\">\n\t<a href=\"https://n8n.io\">n8n.io</a>\n    <input id=\"text-id\" type=\"text\" value=\"n8n\">\n\n"
+        }
+      }
+    ],
+    "No Operation, do nothing6": [
+      {
+        "json": {
+          "data": "n8n"
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Code",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Code": {
+      "main": [
+        [
+          {
+            "node": "HTML",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "HTML1",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "HTML2",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "HTML3",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "HTML4",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "HTML5",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "HTML6",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "HTML": {
+      "main": [
+        [
+          {
+            "node": "No Operation, do nothing",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "HTML6": {
+      "main": [
+        [
+          {
+            "node": "No Operation, do nothing6",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "HTML5": {
+      "main": [
+        [
+          {
+            "node": "No Operation, do nothing3",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "HTML4": {
+      "main": [
+        [
+          {
+            "node": "No Operation, do nothing4",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "HTML3": {
+      "main": [
+        [
+          {
+            "node": "No Operation, do nothing2",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "HTML2": {
+      "main": [
+        [
+          {
+            "node": "No Operation, do nothing1",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "HTML1": {
+      "main": [
+        [
+          {
+            "node": "No Operation, do nothing5",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "170b087f-19bf-4cbd-90cf-d684fb112034",
+  "meta": {
+    "templateCredsSetupCompleted": true,
+    "instanceId": "be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd"
+  },
+  "id": "vqwcz5PIBQmAw4SZ",
+  "tags": []
+}
diff --git a/packages/nodes-base/nodes/Html/types.ts b/packages/nodes-base/nodes/Html/types.ts
index bbe5ab68ac375..251720845c082 100644
--- a/packages/nodes-base/nodes/Html/types.ts
+++ b/packages/nodes-base/nodes/Html/types.ts
@@ -4,6 +4,7 @@ export type Cheerio = ReturnType<typeof cheerio>;
 
 export interface IValueData {
 	attribute?: string;
+	skipSelectors?: string;
 	cssSelector: string;
 	returnValue: string;
 	key: string;
diff --git a/packages/nodes-base/nodes/Html/utils.ts b/packages/nodes-base/nodes/Html/utils.ts
index 3172908a872a4..923443b2fe57f 100644
--- a/packages/nodes-base/nodes/Html/utils.ts
+++ b/packages/nodes-base/nodes/Html/utils.ts
@@ -1,46 +1,58 @@
 import type { IDataObject } from 'n8n-workflow';
+import { convert } from 'html-to-text';
 import type { IValueData, Cheerio } from './types';
 
-/**
- * @TECH_DEBT Explore replacing with handlebars
- */
-export function getResolvables(html: string) {
-	if (!html) return [];
-
-	const resolvables = [];
-	const resolvableRegex = /({{[\s\S]*?}})/g;
-
-	let match;
-
-	while ((match = resolvableRegex.exec(html)) !== null) {
-		if (match[1]) {
-			resolvables.push(match[1]);
-		}
-	}
-
-	return resolvables;
-}
-
 // The extraction functions
 const extractFunctions: {
-	[key: string]: ($: Cheerio, valueData: IValueData) => string | undefined;
+	[key: string]: ($: Cheerio, valueData: IValueData, nodeVersion: number) => string | undefined;
 } = {
 	attribute: ($: Cheerio, valueData: IValueData): string | undefined =>
 		$.attr(valueData.attribute!),
-	// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
 	html: ($: Cheerio, _valueData: IValueData): string | undefined => $.html() || undefined,
-	text: ($: Cheerio, _valueData: IValueData): string | undefined => $.text(),
+	text: ($: Cheerio, _valueData: IValueData, nodeVersion: number): string | undefined => {
+		if (nodeVersion <= 1.1) return $.text() || undefined;
+
+		const html = $.html() || '';
+
+		let options;
+		if (_valueData.skipSelectors) {
+			options = {
+				selectors: _valueData.skipSelectors.split(',').map((s) => ({
+					selector: s.trim(),
+					format: 'skip',
+				})),
+			};
+		}
+		return convert(html, options);
+	},
 	value: ($: Cheerio, _valueData: IValueData): string | undefined => $.val(),
 };
 
 /**
  * Simple helper function which applies options
  */
-export function getValue($: Cheerio, valueData: IValueData, options: IDataObject) {
-	const value = extractFunctions[valueData.returnValue]($, valueData);
-	if (options.trimValues === false || value === undefined) {
+export function getValue(
+	$: Cheerio,
+	valueData: IValueData,
+	options: IDataObject,
+	nodeVersion: number,
+) {
+	let value = extractFunctions[valueData.returnValue]($, valueData, nodeVersion);
+
+	if (value === undefined) {
 		return value;
 	}
 
-	return value.trim();
+	if (options.trimValues) {
+		value = value.trim();
+	}
+
+	if (options.cleanUpText) {
+		value = value
+			.replace(/^\s+|\s+$/g, '')
+			.replace(/(\r\n|\n|\r)/gm, '')
+			.replace(/\s+/g, ' ');
+	}
+
+	return value;
 }
diff --git a/packages/nodes-base/nodes/HtmlExtract/HtmlExtract.node.ts b/packages/nodes-base/nodes/HtmlExtract/HtmlExtract.node.ts
index 426395dce03f1..e9de09050edb8 100644
--- a/packages/nodes-base/nodes/HtmlExtract/HtmlExtract.node.ts
+++ b/packages/nodes-base/nodes/HtmlExtract/HtmlExtract.node.ts
@@ -8,7 +8,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import get from 'lodash.get';
+import get from 'lodash/get';
 
 type Cheerio = ReturnType<typeof cheerio>;
 
@@ -78,7 +78,7 @@ export class HtmlExtract implements INodeType {
 				description: 'If HTML should be read from binary or JSON data',
 			},
 			{
-				displayName: 'Binary Property',
+				displayName: 'Input Binary Field',
 				name: 'dataPropertyName',
 				type: 'string',
 				displayOptions: {
@@ -88,8 +88,7 @@ export class HtmlExtract implements INodeType {
 				},
 				default: 'data',
 				required: true,
-				description:
-					'Name of the binary property in which the HTML to extract the data from can be found',
+				hint: 'The name of the input binary field containing the file to be extracted',
 			},
 			{
 				displayName: 'JSON Property',
@@ -271,7 +270,7 @@ export class HtmlExtract implements INodeType {
 							// An array should be returned so iterate over one
 							// value at a time
 							newItem.json[valueData.key] = [];
-							htmlElement.each((i, el) => {
+							htmlElement.each((_, el) => {
 								(newItem.json[valueData.key] as Array<string | undefined>).push(
 									getValue($(el), valueData, options),
 								);
@@ -299,6 +298,6 @@ export class HtmlExtract implements INodeType {
 			}
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/HtmlExtract/test/HtmlExtract.node.test.ts b/packages/nodes-base/nodes/HtmlExtract/test/HtmlExtract.node.test.ts
index b5db1b38bb069..ef08ff6a280dd 100644
--- a/packages/nodes-base/nodes/HtmlExtract/test/HtmlExtract.node.test.ts
+++ b/packages/nodes-base/nodes/HtmlExtract/test/HtmlExtract.node.test.ts
@@ -1,4 +1,4 @@
-import { testWorkflows, getWorkflowFilenames } from '../../../test/nodes/Helpers';
+import { testWorkflows, getWorkflowFilenames } from '@test/nodes/Helpers';
 
 const workflows = getWorkflowFilenames(__dirname);
 
diff --git a/packages/nodes-base/nodes/HttpRequest/GenericFunctions.ts b/packages/nodes-base/nodes/HttpRequest/GenericFunctions.ts
index 43bd1d0e21911..54a37a595330b 100644
--- a/packages/nodes-base/nodes/HttpRequest/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/HttpRequest/GenericFunctions.ts
@@ -1,9 +1,22 @@
-import type { IDataObject, INodeExecutionData, IOAuth2Options } from 'n8n-workflow';
-import type { OptionsWithUri } from 'request-promise-native';
+import type { SecureContextOptions } from 'tls';
+import type {
+	IDataObject,
+	INodeExecutionData,
+	IOAuth2Options,
+	IRequestOptions,
+} from 'n8n-workflow';
 
-import set from 'lodash.set';
+import set from 'lodash/set';
 
-export type BodyParameter = { name: string; value: string };
+import FormData from 'form-data';
+import type { HttpSslAuthCredentials } from './interfaces';
+import { formatPrivateKey } from '../../utils/utilities';
+
+export type BodyParameter = {
+	name: string;
+	value: string;
+	parameterType?: 'formBinaryData' | 'formData';
+};
 
 export type IAuthDataSanitizeKeys = {
 	[key: string]: string[];
@@ -16,14 +29,16 @@ export const replaceNullValues = (item: INodeExecutionData) => {
 	return item;
 };
 
-export function sanitizeUiMessage(request: OptionsWithUri, authDataKeys: IAuthDataSanitizeKeys) {
+export function sanitizeUiMessage(request: IRequestOptions, authDataKeys: IAuthDataSanitizeKeys) {
 	let sendRequest = request as unknown as IDataObject;
 
 	// Protect browser from sending large binary data
 	if (Buffer.isBuffer(sendRequest.body) && sendRequest.body.length > 250000) {
 		sendRequest = {
 			...request,
-			body: `Binary data got replaced with this text. Original was a Buffer with a size of ${request.body.length} byte.`,
+			body: `Binary data got replaced with this text. Original was a Buffer with a size of ${
+				(request.body as string).length
+			} byte.`,
 		};
 	}
 
@@ -138,21 +153,62 @@ export const binaryContentTypes = [
 export type BodyParametersReducer = (
 	acc: IDataObject,
 	cur: { name: string; value: string },
-) => IDataObject;
+) => Promise<IDataObject>;
+
+export async function reduceAsync<T, R>(
+	arr: T[],
+	reducer: (acc: Awaited<Promise<R>>, cur: T) => Promise<R>,
+	init: Promise<R> = Promise.resolve({} as R),
+): Promise<R> {
+	return await arr.reduce(async (promiseAcc, item) => {
+		return await reducer(await promiseAcc, item);
+	}, init);
+}
 
-export const prepareRequestBody = (
+export const prepareRequestBody = async (
 	parameters: BodyParameter[],
 	bodyType: string,
 	version: number,
 	defaultReducer: BodyParametersReducer,
 ) => {
 	if (bodyType === 'json' && version >= 4) {
-		return parameters.reduce((acc, entry) => {
-			const value = entry.value;
-			set(acc, entry.name, value);
-			return acc;
-		}, {} as IDataObject);
+		return await parameters.reduce(async (acc, entry) => {
+			const result = await acc;
+			set(result, entry.name, entry.value);
+			return result;
+		}, Promise.resolve({}));
+	} else if (bodyType === 'multipart-form-data' && version >= 4.2) {
+		const formData = new FormData();
+
+		for (const parameter of parameters) {
+			if (parameter.parameterType === 'formBinaryData') {
+				const entry = await defaultReducer({}, parameter);
+				const key = Object.keys(entry)[0];
+				const data = entry[key] as { value: Buffer; options: FormData.AppendOptions };
+				formData.append(key, data.value, data.options);
+				continue;
+			}
+
+			formData.append(parameter.name, parameter.value);
+		}
+
+		return formData;
 	} else {
-		return parameters.reduce(defaultReducer, {});
+		return await reduceAsync(parameters, defaultReducer);
+	}
+};
+
+export const setAgentOptions = (
+	requestOptions: IRequestOptions,
+	sslCertificates: HttpSslAuthCredentials | undefined,
+) => {
+	if (sslCertificates) {
+		const agentOptions: SecureContextOptions = {};
+		if (sslCertificates.ca) agentOptions.ca = formatPrivateKey(sslCertificates.ca);
+		if (sslCertificates.cert) agentOptions.cert = formatPrivateKey(sslCertificates.cert);
+		if (sslCertificates.key) agentOptions.key = formatPrivateKey(sslCertificates.key);
+		if (sslCertificates.passphrase)
+			agentOptions.passphrase = formatPrivateKey(sslCertificates.passphrase);
+		requestOptions.agentOptions = agentOptions;
 	}
 };
diff --git a/packages/nodes-base/nodes/HttpRequest/HttpRequest.node.json b/packages/nodes-base/nodes/HttpRequest/HttpRequest.node.json
index c4e75519bd88c..ffbf6c0e0f855 100644
--- a/packages/nodes-base/nodes/HttpRequest/HttpRequest.node.json
+++ b/packages/nodes-base/nodes/HttpRequest/HttpRequest.node.json
@@ -126,7 +126,7 @@
 			}
 		]
 	},
-	"alias": ["API", "Request", "URL", "Build"],
+	"alias": ["API", "Request", "URL", "Build", "cURL"],
 	"subcategories": {
 		"Core Nodes": ["Helpers"]
 	}
diff --git a/packages/nodes-base/nodes/HttpRequest/HttpRequest.node.ts b/packages/nodes-base/nodes/HttpRequest/HttpRequest.node.ts
index 34394d555d42b..a8317a289ae8f 100644
--- a/packages/nodes-base/nodes/HttpRequest/HttpRequest.node.ts
+++ b/packages/nodes-base/nodes/HttpRequest/HttpRequest.node.ts
@@ -10,11 +10,11 @@ export class HttpRequest extends VersionedNodeType {
 		const baseDescription: INodeTypeBaseDescription = {
 			displayName: 'HTTP Request',
 			name: 'httpRequest',
-			icon: 'fa:at',
+			icon: 'file:httprequest.svg',
 			group: ['output'],
 			subtitle: '={{$parameter["requestMethod"] + ": " + $parameter["url"]}}',
 			description: 'Makes an HTTP request and returns the response data',
-			defaultVersion: 4,
+			defaultVersion: 4.2,
 		};
 
 		const nodeVersions: IVersionedNodeType['nodeVersions'] = {
@@ -22,6 +22,8 @@ export class HttpRequest extends VersionedNodeType {
 			2: new HttpRequestV2(baseDescription),
 			3: new HttpRequestV3(baseDescription),
 			4: new HttpRequestV3(baseDescription),
+			4.1: new HttpRequestV3(baseDescription),
+			4.2: new HttpRequestV3(baseDescription),
 		};
 
 		super(nodeVersions, baseDescription);
diff --git a/packages/nodes-base/nodes/HttpRequest/V1/HttpRequestV1.node.ts b/packages/nodes-base/nodes/HttpRequest/V1/HttpRequestV1.node.ts
index e5971875d686a..b0c5185373c7e 100644
--- a/packages/nodes-base/nodes/HttpRequest/V1/HttpRequestV1.node.ts
+++ b/packages/nodes-base/nodes/HttpRequest/V1/HttpRequestV1.node.ts
@@ -1,4 +1,5 @@
-// eslint-disable-next-line n8n-nodes-base/node-filename-against-convention
+import type { Readable } from 'stream';
+
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -7,13 +8,13 @@ import type {
 	INodeTypeBaseDescription,
 	INodeTypeDescription,
 	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
-import { NodeApiError, NodeOperationError, sleep } from 'n8n-workflow';
+import { NodeApiError, NodeOperationError, sleep, removeCircularRefs } from 'n8n-workflow';
 
-import type { OptionsWithUri } from 'request';
 import type { IAuthDataSanitizeKeys } from '../GenericFunctions';
 import { replaceNullValues, sanitizeUiMessage } from '../GenericFunctions';
-
 interface OptionData {
 	name: string;
 	displayName: string;
@@ -23,7 +24,7 @@ interface OptionDataParameters {
 	[key: string]: OptionData;
 }
 
-type OptionsWithUriKeys = keyof OptionsWithUri;
+type IRequestOptionsKeys = keyof IRequestOptions;
 
 export class HttpRequestV1 implements INodeType {
 	description: INodeTypeDescription;
@@ -232,7 +233,7 @@ export class HttpRequestV1 implements INodeType {
 					description: 'Name of the property to which to write the response data',
 				},
 				{
-					displayName: 'Binary Property',
+					displayName: 'Put Output File in Field',
 					name: 'dataPropertyName',
 					type: 'string',
 					default: 'data',
@@ -242,7 +243,7 @@ export class HttpRequestV1 implements INodeType {
 							responseFormat: ['file'],
 						},
 					},
-					description: 'Name of the binary property to which to write the data of the read file',
+					hint: 'The name of the output binary field to put the file in',
 				},
 
 				{
@@ -324,14 +325,14 @@ export class HttpRequestV1 implements INodeType {
 							name: 'followAllRedirects',
 							type: 'boolean',
 							default: false,
-							description: 'Whether to follow non-GET HTTP 3xx redirects',
+							description: 'Whether to follow All HTTP 3xx redirects',
 						},
 						{
-							displayName: 'Follow GET Redirect',
+							displayName: 'Follow GET/HEAD Redirect',
 							name: 'followRedirect',
 							type: 'boolean',
 							default: true,
-							description: 'Whether to follow GET HTTP 3xx redirects',
+							description: 'Whether to follow GET or HEAD HTTP 3xx redirects',
 						},
 						{
 							displayName: 'Ignore Response Code',
@@ -397,7 +398,7 @@ export class HttpRequestV1 implements INodeType {
 
 				// Body Parameter
 				{
-					displayName: 'Send Binary Data',
+					displayName: 'Send Binary File',
 					name: 'sendBinaryData',
 					type: 'boolean',
 					displayOptions: {
@@ -414,7 +415,7 @@ export class HttpRequestV1 implements INodeType {
 					description: 'Whether binary data should be send as body',
 				},
 				{
-					displayName: 'Binary Property',
+					displayName: 'Input Binary Field',
 					name: 'binaryPropertyName',
 					type: 'string',
 					required: true,
@@ -428,8 +429,9 @@ export class HttpRequestV1 implements INodeType {
 							requestMethod: ['PATCH', 'POST', 'PUT'],
 						},
 					},
+					hint: 'The name of the input binary field containing the file to be uploaded',
 					description:
-						'Name of the binary property which contains the data for the file to be uploaded. For Form-Data Multipart, they can be provided in the format: <code>"sendKey1:binaryProperty1,sendKey2:binaryProperty2</code>',
+						'For Form-Data Multipart, they can be provided in the format: <code>"sendKey1:binaryProperty1,sendKey2:binaryProperty2</code>',
 				},
 				{
 					displayName: 'Body Parameters',
@@ -590,6 +592,13 @@ export class HttpRequestV1 implements INodeType {
 						},
 					],
 				},
+				{
+					displayName:
+						"You can view the raw requests this node makes in your browser's developer console",
+					name: 'infoMessage',
+					type: 'notice',
+					default: '',
+				},
 			],
 		};
 	}
@@ -627,7 +636,7 @@ export class HttpRequestV1 implements INodeType {
 			oAuth2Api = await this.getCredentials('oAuth2Api');
 		} catch {}
 
-		let requestOptions: OptionsWithUri;
+		let requestOptions: IRequestOptions;
 		let setUiParameter: IDataObject;
 
 		const uiParameters: IDataObject = {
@@ -653,7 +662,10 @@ export class HttpRequestV1 implements INodeType {
 		let returnItems: INodeExecutionData[] = [];
 		const requestPromises = [];
 		for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
-			const requestMethod = this.getNodeParameter('requestMethod', itemIndex) as string;
+			const requestMethod = this.getNodeParameter(
+				'requestMethod',
+				itemIndex,
+			) as IHttpRequestMethods;
 			const parametersAreJson = this.getNodeParameter('jsonParameters', itemIndex);
 
 			const options = this.getNodeParameter('options', itemIndex, {});
@@ -680,7 +692,7 @@ export class HttpRequestV1 implements INodeType {
 				uri: url,
 				gzip: true,
 				rejectUnauthorized: !this.getNodeParameter('allowUnauthorizedCerts', itemIndex, false),
-			};
+			} satisfies IRequestOptions;
 
 			if (fullResponse) {
 				// @ts-ignore
@@ -807,7 +819,7 @@ export class HttpRequestV1 implements INodeType {
 						try {
 							// @ts-ignore
 							requestOptions[optionData.name] = JSON.parse(
-								requestOptions[optionData.name as OptionsWithUriKeys] as string,
+								requestOptions[optionData.name as IRequestOptionsKeys] as string,
 							);
 						} catch (error) {
 							throw new NodeOperationError(
@@ -840,8 +852,8 @@ export class HttpRequestV1 implements INodeType {
 										return newValue;
 									}
 								};
-								requestOptions[optionName][parameterDataName] = computeNewValue(
-									requestOptions[optionName][parameterDataName],
+								requestOptions[optionName]![parameterDataName] = computeNewValue(
+									requestOptions[optionName]![parameterDataName],
 								);
 							} else if (optionName === 'headers') {
 								// @ts-ignore
@@ -868,6 +880,7 @@ export class HttpRequestV1 implements INodeType {
 
 			if (responseFormat === 'file') {
 				requestOptions.encoding = null;
+				requestOptions.useStream = true;
 
 				if (options.bodyContentType !== 'raw') {
 					requestOptions.body = JSON.stringify(requestOptions.body);
@@ -880,6 +893,7 @@ export class HttpRequestV1 implements INodeType {
 				}
 			} else if (options.bodyContentType === 'raw') {
 				requestOptions.json = false;
+				requestOptions.useStream = true;
 			} else {
 				requestOptions.json = true;
 			}
@@ -969,6 +983,7 @@ export class HttpRequestV1 implements INodeType {
 					// throw error;
 					throw new NodeApiError(this.getNode(), response as JsonObject, { itemIndex });
 				} else {
+					removeCircularRefs(response.reason as JsonObject);
 					// Return the actual reason as error
 					returnItems.push({
 						json: {
@@ -983,9 +998,9 @@ export class HttpRequestV1 implements INodeType {
 			}
 
 			response = response.value;
+			if (response?.request?.constructor.name === 'ClientRequest') delete response.request;
 
 			const options = this.getNodeParameter('options', itemIndex, {});
-			const url = this.getNodeParameter('url', itemIndex) as string;
 
 			const fullResponse = !!options.fullResponse;
 
@@ -1008,8 +1023,7 @@ export class HttpRequestV1 implements INodeType {
 					Object.assign(newItem.binary, items[itemIndex].binary);
 				}
 
-				const fileName = url.split('/').pop();
-
+				let binaryData: Buffer | Readable;
 				if (fullResponse) {
 					const returnItem: IDataObject = {};
 					for (const property of fullResponseProperties) {
@@ -1020,20 +1034,13 @@ export class HttpRequestV1 implements INodeType {
 					}
 
 					newItem.json = returnItem;
-
-					newItem.binary![dataPropertyName] = await this.helpers.prepareBinaryData(
-						response!.body as Buffer,
-						fileName,
-					);
+					binaryData = response!.body;
 				} else {
 					newItem.json = items[itemIndex].json;
-
-					newItem.binary![dataPropertyName] = await this.helpers.prepareBinaryData(
-						response! as Buffer,
-						fileName,
-					);
+					binaryData = response;
 				}
 
+				newItem.binary![dataPropertyName] = await this.helpers.prepareBinaryData(binaryData);
 				returnItems.push(newItem);
 			} else if (responseFormat === 'string') {
 				const dataPropertyName = this.getNodeParameter('dataPropertyName', 0);
@@ -1127,6 +1134,6 @@ export class HttpRequestV1 implements INodeType {
 
 		returnItems = returnItems.map(replaceNullValues);
 
-		return this.prepareOutputData(returnItems);
+		return [returnItems];
 	}
 }
diff --git a/packages/nodes-base/nodes/HttpRequest/V2/HttpRequestV2.node.ts b/packages/nodes-base/nodes/HttpRequest/V2/HttpRequestV2.node.ts
index 69d9d3d11b52a..5b1b53af7f589 100644
--- a/packages/nodes-base/nodes/HttpRequest/V2/HttpRequestV2.node.ts
+++ b/packages/nodes-base/nodes/HttpRequest/V2/HttpRequestV2.node.ts
@@ -1,15 +1,18 @@
+import type { Readable } from 'stream';
+
 import type {
 	IDataObject,
 	IExecuteFunctions,
+	IHttpRequestMethods,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeBaseDescription,
 	INodeTypeDescription,
+	IRequestOptions,
 	JsonObject,
 } from 'n8n-workflow';
-import { NodeApiError, NodeOperationError, sleep } from 'n8n-workflow';
+import { NodeApiError, NodeOperationError, sleep, removeCircularRefs } from 'n8n-workflow';
 
-import type { OptionsWithUri } from 'request';
 import type { IAuthDataSanitizeKeys } from '../GenericFunctions';
 import {
 	getOAuth2AdditionalParameters,
@@ -26,7 +29,7 @@ interface OptionDataParameters {
 	[key: string]: OptionData;
 }
 
-type OptionsWithUriKeys = keyof OptionsWithUri;
+type IRequestOptionsKeys = keyof IRequestOptions;
 export class HttpRequestV2 implements INodeType {
 	description: INodeTypeDescription;
 
@@ -245,7 +248,7 @@ export class HttpRequestV2 implements INodeType {
 					description: 'Name of the property to which to write the response data',
 				},
 				{
-					displayName: 'Binary Property',
+					displayName: 'Put Output File in Field',
 					name: 'dataPropertyName',
 					type: 'string',
 					default: 'data',
@@ -255,7 +258,7 @@ export class HttpRequestV2 implements INodeType {
 							responseFormat: ['file'],
 						},
 					},
-					description: 'Name of the binary property to which to write the data of the read file',
+					hint: 'The name of the output binary field to put the file in',
 				},
 
 				{
@@ -337,14 +340,14 @@ export class HttpRequestV2 implements INodeType {
 							name: 'followAllRedirects',
 							type: 'boolean',
 							default: false,
-							description: 'Whether to follow non-GET HTTP 3xx redirects',
+							description: 'Whether to follow All HTTP 3xx redirects',
 						},
 						{
-							displayName: 'Follow GET Redirect',
+							displayName: 'Follow GET/HEAD Redirect',
 							name: 'followRedirect',
 							type: 'boolean',
 							default: true,
-							description: 'Whether to follow GET HTTP 3xx redirects',
+							description: 'Whether to follow GET or HEAD HTTP 3xx redirects',
 						},
 						{
 							displayName: 'Ignore Response Code',
@@ -410,7 +413,7 @@ export class HttpRequestV2 implements INodeType {
 
 				// Body Parameter
 				{
-					displayName: 'Send Binary Data',
+					displayName: 'Send Binary File',
 					name: 'sendBinaryData',
 					type: 'boolean',
 					displayOptions: {
@@ -427,7 +430,7 @@ export class HttpRequestV2 implements INodeType {
 					description: 'Whether binary data should be send as body',
 				},
 				{
-					displayName: 'Binary Property',
+					displayName: 'Input Binary Field',
 					name: 'binaryPropertyName',
 					type: 'string',
 					required: true,
@@ -441,8 +444,9 @@ export class HttpRequestV2 implements INodeType {
 							requestMethod: ['PATCH', 'POST', 'PUT'],
 						},
 					},
+					hint: 'The name of the input binary field containing the file to be uploaded',
 					description:
-						'Name of the binary property which contains the data for the file to be uploaded. For Form-Data Multipart, they can be provided in the format: <code>"sendKey1:binaryProperty1,sendKey2:binaryProperty2</code>',
+						'For Form-Data Multipart, they can be provided in the format: <code>"sendKey1:binaryProperty1,sendKey2:binaryProperty2</code>',
 				},
 				{
 					displayName: 'Body Parameters',
@@ -603,6 +607,13 @@ export class HttpRequestV2 implements INodeType {
 						},
 					],
 				},
+				{
+					displayName:
+						"You can view the raw requests this node makes in your browser's developer console",
+					name: 'infoMessage',
+					type: 'notice',
+					default: '',
+				},
 			],
 		};
 	}
@@ -665,7 +676,7 @@ export class HttpRequestV2 implements INodeType {
 			} catch {}
 		}
 
-		let requestOptions: OptionsWithUri;
+		let requestOptions: IRequestOptions & { useStream?: boolean };
 		let setUiParameter: IDataObject;
 
 		const uiParameters: IDataObject = {
@@ -691,7 +702,10 @@ export class HttpRequestV2 implements INodeType {
 		let returnItems: INodeExecutionData[] = [];
 		const requestPromises = [];
 		for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
-			const requestMethod = this.getNodeParameter('requestMethod', itemIndex) as string;
+			const requestMethod = this.getNodeParameter(
+				'requestMethod',
+				itemIndex,
+			) as IHttpRequestMethods;
 			const parametersAreJson = this.getNodeParameter('jsonParameters', itemIndex);
 
 			const options = this.getNodeParameter('options', itemIndex, {});
@@ -845,7 +859,7 @@ export class HttpRequestV2 implements INodeType {
 						try {
 							// @ts-ignore
 							requestOptions[optionData.name] = JSON.parse(
-								requestOptions[optionData.name as OptionsWithUriKeys] as string,
+								requestOptions[optionData.name as IRequestOptionsKeys] as string,
 							);
 						} catch (error) {
 							throw new NodeOperationError(
@@ -878,8 +892,8 @@ export class HttpRequestV2 implements INodeType {
 										return newValue;
 									}
 								};
-								requestOptions[optionName][parameterDataName] = computeNewValue(
-									requestOptions[optionName][parameterDataName],
+								requestOptions[optionName]![parameterDataName] = computeNewValue(
+									requestOptions[optionName]![parameterDataName],
 								);
 							} else if (optionName === 'headers') {
 								// @ts-ignore
@@ -906,6 +920,7 @@ export class HttpRequestV2 implements INodeType {
 
 			if (responseFormat === 'file') {
 				requestOptions.encoding = null;
+				requestOptions.useStream = true;
 
 				if (options.bodyContentType !== 'raw') {
 					requestOptions.body = JSON.stringify(requestOptions.body);
@@ -918,6 +933,7 @@ export class HttpRequestV2 implements INodeType {
 				}
 			} else if (options.bodyContentType === 'raw') {
 				requestOptions.json = false;
+				requestOptions.useStream = true;
 			} else {
 				requestOptions.json = true;
 			}
@@ -1015,12 +1031,12 @@ export class HttpRequestV2 implements INodeType {
 		for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
 			// @ts-ignore
 			response = promisesResponses.shift();
-
 			if (response!.status !== 'fulfilled') {
 				if (!this.continueOnFail()) {
 					// throw error;
 					throw new NodeApiError(this.getNode(), response as JsonObject, { itemIndex });
 				} else {
+					removeCircularRefs(response.reason as JsonObject);
 					// Return the actual reason as error
 					returnItems.push({
 						json: {
@@ -1035,9 +1051,9 @@ export class HttpRequestV2 implements INodeType {
 			}
 
 			response = response.value;
+			if (response?.request?.constructor.name === 'ClientRequest') delete response.request;
 
 			const options = this.getNodeParameter('options', itemIndex, {});
-			const url = this.getNodeParameter('url', itemIndex) as string;
 
 			const fullResponse = !!options.fullResponse;
 
@@ -1060,8 +1076,7 @@ export class HttpRequestV2 implements INodeType {
 					Object.assign(newItem.binary, items[itemIndex].binary);
 				}
 
-				const fileName = url.split('/').pop();
-
+				let binaryData: Buffer | Readable;
 				if (fullResponse) {
 					const returnItem: IDataObject = {};
 					for (const property of fullResponseProperties) {
@@ -1072,20 +1087,13 @@ export class HttpRequestV2 implements INodeType {
 					}
 
 					newItem.json = returnItem;
-
-					newItem.binary![dataPropertyName] = await this.helpers.prepareBinaryData(
-						response!.body as Buffer,
-						fileName,
-					);
+					binaryData = response!.body;
 				} else {
 					newItem.json = items[itemIndex].json;
-
-					newItem.binary![dataPropertyName] = await this.helpers.prepareBinaryData(
-						response! as Buffer,
-						fileName,
-					);
+					binaryData = response;
 				}
 
+				newItem.binary![dataPropertyName] = await this.helpers.prepareBinaryData(binaryData);
 				returnItems.push(newItem);
 			} else if (responseFormat === 'string') {
 				const dataPropertyName = this.getNodeParameter('dataPropertyName', 0);
@@ -1179,6 +1187,6 @@ export class HttpRequestV2 implements INodeType {
 
 		returnItems = returnItems.map(replaceNullValues);
 
-		return this.prepareOutputData(returnItems);
+		return [returnItems];
 	}
 }
diff --git a/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts b/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts
index f515b7ab2adb4..386721c3b1025 100644
--- a/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts
+++ b/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts
@@ -8,22 +8,35 @@ import type {
 	INodeType,
 	INodeTypeBaseDescription,
 	INodeTypeDescription,
+	IRequestOptionsSimplified,
+	PaginationOptions,
 	JsonObject,
+	IRequestOptions,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 
-import { BINARY_ENCODING, jsonParse, NodeApiError, NodeOperationError, sleep } from 'n8n-workflow';
-
-import type { OptionsWithUri } from 'request-promise-native';
+import {
+	BINARY_ENCODING,
+	NodeApiError,
+	NodeOperationError,
+	jsonParse,
+	removeCircularRefs,
+	sleep,
+} from 'n8n-workflow';
 
+import set from 'lodash/set';
 import type { BodyParameter, IAuthDataSanitizeKeys } from '../GenericFunctions';
-
 import {
 	binaryContentTypes,
 	getOAuth2AdditionalParameters,
 	prepareRequestBody,
+	reduceAsync,
 	replaceNullValues,
 	sanitizeUiMessage,
+	setAgentOptions,
 } from '../GenericFunctions';
+import { keysToLowercase } from '@utils/utilities';
+import type { HttpSslAuthCredentials } from '../interfaces';
 
 function toText<T>(data: T) {
 	if (typeof data === 'object' && data !== null) {
@@ -38,14 +51,24 @@ export class HttpRequestV3 implements INodeType {
 		this.description = {
 			...baseDescription,
 			subtitle: '={{$parameter["method"] + ": " + $parameter["url"]}}',
-			version: [3, 4],
+			version: [3, 4, 4.1, 4.2],
 			defaults: {
 				name: 'HTTP Request',
-				color: '#2200DD',
+				color: '#0004F5',
 			},
 			inputs: ['main'],
 			outputs: ['main'],
-			credentials: [],
+			credentials: [
+				{
+					name: 'httpSslAuth',
+					required: true,
+					displayOptions: {
+						show: {
+							provideSslCertificates: [true],
+						},
+					},
+				},
+			],
 			properties: [
 				{
 					displayName: '',
@@ -162,6 +185,36 @@ export class HttpRequestV3 implements INodeType {
 						},
 					},
 				},
+				{
+					displayName: 'SSL Certificates',
+					name: 'provideSslCertificates',
+					type: 'boolean',
+					default: false,
+					isNodeSetting: true,
+				},
+				{
+					displayName: "Provide certificates in node's 'Credential for SSL Certificates' parameter",
+					name: 'provideSslCertificatesNotice',
+					type: 'notice',
+					default: '',
+					isNodeSetting: true,
+					displayOptions: {
+						show: {
+							provideSslCertificates: [true],
+						},
+					},
+				},
+				{
+					displayName: 'SSL Certificate',
+					name: 'sslCertificate',
+					type: 'credentials',
+					default: '',
+					displayOptions: {
+						show: {
+							provideSslCertificates: [true],
+						},
+					},
+				},
 				{
 					displayName: 'Send Query Parameters',
 					name: 'sendQuery',
@@ -362,7 +415,7 @@ export class HttpRequestV3 implements INodeType {
 						},
 						{
 							// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
-							name: 'n8n Binary Data',
+							name: 'n8n Binary File',
 							value: 'binaryData',
 						},
 						{
@@ -394,7 +447,9 @@ export class HttpRequestV3 implements INodeType {
 						},
 					],
 					default: 'keypair',
-					description: 'Asasas',
+					// eslint-disable-next-line n8n-nodes-base/node-param-description-miscased-json
+					description:
+						'The body can be specified using explicit fields (<code>keypair</code>) or using a JavaScript object (<code>json</code>)',
 				},
 				{
 					displayName: 'Body Parameters',
@@ -490,7 +545,7 @@ export class HttpRequestV3 implements INodeType {
 									options: [
 										{
 											// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
-											name: 'n8n Binary Data',
+											name: 'n8n Binary File',
 											value: 'formBinaryData',
 										},
 										{
@@ -524,7 +579,6 @@ export class HttpRequestV3 implements INodeType {
 									displayName: 'Input Data Field Name',
 									name: 'inputDataFieldName',
 									type: 'string',
-									noDataExpression: true,
 									displayOptions: {
 										show: {
 											parameterType: ['formBinaryData'],
@@ -624,7 +678,6 @@ export class HttpRequestV3 implements INodeType {
 					displayName: 'Input Data Field Name',
 					name: 'inputDataFieldName',
 					type: 'string',
-					noDataExpression: true,
 					displayOptions: {
 						show: {
 							sendBody: [true],
@@ -915,6 +968,247 @@ export class HttpRequestV3 implements INodeType {
 								},
 							],
 						},
+						{
+							displayName: 'Pagination',
+							name: 'pagination',
+							placeholder: 'Add pagination',
+							type: 'fixedCollection',
+							typeOptions: {
+								multipleValues: false,
+							},
+							default: {
+								pagination: {},
+							},
+							options: [
+								{
+									displayName: 'Pagination',
+									name: 'pagination',
+									values: [
+										{
+											displayName: 'Pagination Mode',
+											name: 'paginationMode',
+											type: 'options',
+											typeOptions: {
+												noDataExpression: true,
+											},
+											options: [
+												{
+													name: 'Off',
+													value: 'off',
+												},
+												{
+													name: 'Update a Parameter in Each Request',
+													value: 'updateAParameterInEachRequest',
+												},
+												{
+													name: 'Response Contains Next URL',
+													value: 'responseContainsNextURL',
+												},
+											],
+											default: 'updateAParameterInEachRequest',
+											description: 'If pagination should be used',
+										},
+										{
+											displayName:
+												'Use the $response variables to access the data of the previous response. <a href="https://docs.n8n.io/code/builtin/http-node-variables/?utm_source=n8n_app&utm_medium=node_settings_modal-credential_link&utm_campaign=n8n-nodes-base.httpRequest" target="_blank">More info</a>',
+											name: 'webhookNotice',
+											displayOptions: {
+												hide: {
+													paginationMode: ['off'],
+												},
+											},
+											type: 'notice',
+											default: '',
+										},
+										{
+											displayName: 'Next URL',
+											name: 'nextURL',
+											type: 'string',
+											displayOptions: {
+												show: {
+													paginationMode: ['responseContainsNextURL'],
+												},
+											},
+											default: '',
+											description:
+												'Should evaluate to the URL of the next page. <a href="https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.httprequest/#pagination" target="_blank">More info</a>.',
+										},
+										{
+											displayName: 'Parameters',
+											name: 'parameters',
+											type: 'fixedCollection',
+											displayOptions: {
+												show: {
+													paginationMode: ['updateAParameterInEachRequest'],
+												},
+											},
+											typeOptions: {
+												multipleValues: true,
+												noExpression: true,
+											},
+											placeholder: 'Add Parameter',
+											default: {
+												parameters: [
+													{
+														type: 'qs',
+														name: '',
+														value: '',
+													},
+												],
+											},
+											options: [
+												{
+													name: 'parameters',
+													displayName: 'Parameter',
+													values: [
+														{
+															displayName: 'Type',
+															name: 'type',
+															type: 'options',
+															options: [
+																{
+																	name: 'Body',
+																	value: 'body',
+																},
+																{
+																	name: 'Header',
+																	value: 'headers',
+																},
+																{
+																	name: 'Query',
+																	value: 'qs',
+																},
+															],
+															default: 'qs',
+															description: 'Where the parameter should be set',
+														},
+														{
+															displayName: 'Name',
+															name: 'name',
+															type: 'string',
+															default: '',
+															placeholder: 'e.g page',
+														},
+														{
+															displayName: 'Value',
+															name: 'value',
+															type: 'string',
+															default: '',
+															hint: 'Use expression mode and $response to access response data',
+														},
+													],
+												},
+											],
+										},
+										{
+											displayName: 'Pagination Complete When',
+											name: 'paginationCompleteWhen',
+											type: 'options',
+											typeOptions: {
+												noDataExpression: true,
+											},
+											displayOptions: {
+												hide: {
+													paginationMode: ['off'],
+												},
+											},
+											options: [
+												{
+													name: 'Response Is Empty',
+													value: 'responseIsEmpty',
+												},
+												{
+													name: 'Receive Specific Status Code(s)',
+													value: 'receiveSpecificStatusCodes',
+												},
+												{
+													name: 'Other',
+													value: 'other',
+												},
+											],
+											default: 'responseIsEmpty',
+											description: 'When should no further requests be made?',
+										},
+										{
+											displayName: 'Status Code(s) when Complete',
+											name: 'statusCodesWhenComplete',
+											type: 'string',
+											typeOptions: {
+												noDataExpression: true,
+											},
+											displayOptions: {
+												show: {
+													paginationCompleteWhen: ['receiveSpecificStatusCodes'],
+												},
+											},
+											default: '',
+											description: 'Accepts comma-separated values',
+										},
+										{
+											displayName: 'Complete Expression',
+											name: 'completeExpression',
+											type: 'string',
+											displayOptions: {
+												show: {
+													paginationCompleteWhen: ['other'],
+												},
+											},
+											default: '',
+											description:
+												'Should evaluate to true when pagination is complete. <a href="https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.httprequest/#pagination" target="_blank">More info</a>.',
+										},
+										{
+											displayName: 'Limit Pages Fetched',
+											name: 'limitPagesFetched',
+											type: 'boolean',
+											typeOptions: {
+												noDataExpression: true,
+											},
+											displayOptions: {
+												hide: {
+													paginationMode: ['off'],
+												},
+											},
+											default: false,
+											noDataExpression: true,
+											description: 'Whether the number of requests should be limited',
+										},
+										{
+											displayName: 'Max Pages',
+											name: 'maxRequests',
+											type: 'number',
+											typeOptions: {
+												noDataExpression: true,
+											},
+											displayOptions: {
+												show: {
+													limitPagesFetched: [true],
+												},
+											},
+											default: 100,
+											description: 'Maximum amount of request to be make',
+										},
+										{
+											// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+											displayName: 'Interval Between Requests (ms)',
+											name: 'requestInterval',
+											type: 'number',
+											displayOptions: {
+												hide: {
+													paginationMode: ['off'],
+												},
+											},
+											default: 0,
+											description: 'Time in milliseconds to wait between requests',
+											hint: 'At 0 no delay will be added',
+											typeOptions: {
+												minValue: 0,
+											},
+										},
+									],
+								},
+							],
+						},
 						{
 							displayName: 'Proxy',
 							name: 'proxy',
@@ -936,6 +1230,13 @@ export class HttpRequestV3 implements INodeType {
 						},
 					],
 				},
+				{
+					displayName:
+						"You can view the raw requests this node makes in your browser's developer console",
+					name: 'infoMessage',
+					type: 'notice',
+					default: '',
+				},
 			],
 		};
 	}
@@ -959,46 +1260,14 @@ export class HttpRequestV3 implements INodeType {
 		let httpDigestAuth;
 		let httpHeaderAuth;
 		let httpQueryAuth;
+		let httpCustomAuth;
 		let oAuth1Api;
 		let oAuth2Api;
-		let nodeCredentialType;
-
-		if (authentication === 'genericCredentialType') {
-			const genericAuthType = this.getNodeParameter('genericAuthType', 0) as string;
-
-			if (genericAuthType === 'httpBasicAuth') {
-				try {
-					httpBasicAuth = await this.getCredentials('httpBasicAuth');
-				} catch {}
-			} else if (genericAuthType === 'httpDigestAuth') {
-				try {
-					httpDigestAuth = await this.getCredentials('httpDigestAuth');
-				} catch {}
-			} else if (genericAuthType === 'httpHeaderAuth') {
-				try {
-					httpHeaderAuth = await this.getCredentials('httpHeaderAuth');
-				} catch {}
-			} else if (genericAuthType === 'httpQueryAuth') {
-				try {
-					httpQueryAuth = await this.getCredentials('httpQueryAuth');
-				} catch {}
-			} else if (genericAuthType === 'oAuth1Api') {
-				try {
-					oAuth1Api = await this.getCredentials('oAuth1Api');
-				} catch {}
-			} else if (genericAuthType === 'oAuth2Api') {
-				try {
-					oAuth2Api = await this.getCredentials('oAuth2Api');
-				} catch {}
-			}
-		} else if (authentication === 'predefinedCredentialType') {
-			try {
-				nodeCredentialType = this.getNodeParameter('nodeCredentialType', 0) as string;
-			} catch {}
-		}
+		let sslCertificates;
+		let nodeCredentialType: string | undefined;
+		let genericCredentialType: string | undefined;
 
-		type RequestOptions = OptionsWithUri & { useStream?: boolean };
-		let requestOptions: RequestOptions = {
+		let requestOptions: IRequestOptions = {
 			uri: '',
 		};
 
@@ -1009,8 +1278,65 @@ export class HttpRequestV3 implements INodeType {
 
 		let autoDetectResponseFormat = false;
 
+		// Can not be defined on a per item level
+		const pagination = this.getNodeParameter('options.pagination.pagination', 0, null, {
+			rawExpressions: true,
+		}) as {
+			paginationMode: 'off' | 'updateAParameterInEachRequest' | 'responseContainsNextURL';
+			nextURL?: string;
+			parameters: {
+				parameters: Array<{
+					type: 'body' | 'headers' | 'qs';
+					name: string;
+					value: string;
+				}>;
+			};
+			paginationCompleteWhen: 'responseIsEmpty' | 'receiveSpecificStatusCodes' | 'other';
+			statusCodesWhenComplete: string;
+			completeExpression: string;
+			limitPagesFetched: boolean;
+			maxRequests: number;
+			requestInterval: number;
+		};
+
+		const sanitazedRequests: IDataObject[] = [];
 		for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
-			const requestMethod = this.getNodeParameter('method', itemIndex) as string;
+			if (authentication === 'genericCredentialType') {
+				genericCredentialType = this.getNodeParameter('genericAuthType', 0) as string;
+
+				if (genericCredentialType === 'httpBasicAuth') {
+					httpBasicAuth = await this.getCredentials('httpBasicAuth', itemIndex);
+				} else if (genericCredentialType === 'httpDigestAuth') {
+					httpDigestAuth = await this.getCredentials('httpDigestAuth', itemIndex);
+				} else if (genericCredentialType === 'httpHeaderAuth') {
+					httpHeaderAuth = await this.getCredentials('httpHeaderAuth', itemIndex);
+				} else if (genericCredentialType === 'httpQueryAuth') {
+					httpQueryAuth = await this.getCredentials('httpQueryAuth', itemIndex);
+				} else if (genericCredentialType === 'httpCustomAuth') {
+					httpCustomAuth = await this.getCredentials('httpCustomAuth', itemIndex);
+				} else if (genericCredentialType === 'oAuth1Api') {
+					oAuth1Api = await this.getCredentials('oAuth1Api', itemIndex);
+				} else if (genericCredentialType === 'oAuth2Api') {
+					oAuth2Api = await this.getCredentials('oAuth2Api', itemIndex);
+				}
+			} else if (authentication === 'predefinedCredentialType') {
+				nodeCredentialType = this.getNodeParameter('nodeCredentialType', itemIndex) as string;
+			}
+
+			const provideSslCertificates = this.getNodeParameter(
+				'provideSslCertificates',
+				itemIndex,
+				false,
+			);
+
+			if (provideSslCertificates) {
+				sslCertificates = (await this.getCredentials(
+					'httpSslAuth',
+					itemIndex,
+				)) as HttpSslAuthCredentials;
+			}
+
+			const requestMethod = this.getNodeParameter('method', itemIndex) as IHttpRequestMethods;
 
 			const sendQuery = this.getNodeParameter('sendQuery', itemIndex, false) as boolean;
 			const queryParameters = this.getNodeParameter(
@@ -1033,17 +1359,21 @@ export class HttpRequestV3 implements INodeType {
 			const body = this.getNodeParameter('body', itemIndex, '') as string;
 
 			const sendHeaders = this.getNodeParameter('sendHeaders', itemIndex, false) as boolean;
+
 			const headerParameters = this.getNodeParameter(
 				'headerParameters.parameters',
 				itemIndex,
 				[],
 			) as [{ name: string; value: string }];
+
 			const specifyHeaders = this.getNodeParameter(
 				'specifyHeaders',
 				itemIndex,
 				'keypair',
 			) as string;
+
 			const jsonHeadersParameter = this.getNodeParameter('jsonHeaders', itemIndex, '') as string;
+
 			const {
 				redirect,
 				batching,
@@ -1089,14 +1419,13 @@ export class HttpRequestV3 implements INodeType {
 				gzip: true,
 				rejectUnauthorized: !allowUnauthorizedCerts || false,
 				followRedirect: false,
+				resolveWithFullResponse: true,
 			};
 
-			// When response format is set to auto-detect,
-			// we need to access to response header content-type
-			// and the only way is using "resolveWithFullResponse"
-			if (autoDetectResponseFormat || fullResponse) {
-				requestOptions.resolveWithFullResponse = true;
+			if (requestOptions.method !== 'GET' && nodeVersion >= 4.1) {
+				requestOptions = { ...requestOptions, followAllRedirects: false };
 			}
+
 			const defaultRedirect = nodeVersion >= 4 && redirect === undefined;
 
 			if (redirect?.redirect?.followRedirects || defaultRedirect) {
@@ -1119,17 +1448,16 @@ export class HttpRequestV3 implements INodeType {
 			if (timeout) {
 				requestOptions.timeout = timeout;
 			} else {
-				// set default timeout to 1 hour
-				requestOptions.timeout = 3600000;
+				// set default timeout to 5 minutes
+				requestOptions.timeout = 300_000;
 			}
-
 			if (sendQuery && queryParameterArrays) {
 				Object.assign(requestOptions, {
 					qsStringifyOptions: { arrayFormat: queryParameterArrays },
 				});
 			}
 
-			const parametersToKeyValue = (
+			const parametersToKeyValue = async (
 				accumulator: { [key: string]: any },
 				cur: { name: string; value: string; parameterType?: string; inputDataFieldName?: string },
 			) => {
@@ -1139,7 +1467,7 @@ export class HttpRequestV3 implements INodeType {
 					let uploadData: Buffer | Readable;
 					const itemBinaryData = items[itemIndex].binary![cur.inputDataFieldName];
 					if (itemBinaryData.id) {
-						uploadData = this.helpers.getBinaryStream(itemBinaryData.id);
+						uploadData = await this.helpers.getBinaryStream(itemBinaryData.id);
 					} else {
 						uploadData = Buffer.from(itemBinaryData.data, BINARY_ENCODING);
 					}
@@ -1160,7 +1488,7 @@ export class HttpRequestV3 implements INodeType {
 			// Get parameters defined in the UI
 			if (sendBody && bodyParameters) {
 				if (specifyBody === 'keypair' || bodyContentType === 'multipart-form-data') {
-					requestOptions.body = prepareRequestBody(
+					requestOptions.body = await prepareRequestBody(
 						bodyParameters,
 						bodyContentType,
 						nodeVersion,
@@ -1194,10 +1522,10 @@ export class HttpRequestV3 implements INodeType {
 			// Change the way data get send in case a different content-type than JSON got selected
 			if (sendBody && ['PATCH', 'POST', 'PUT', 'GET'].includes(requestMethod)) {
 				if (bodyContentType === 'multipart-form-data') {
-					requestOptions.formData = requestOptions.body;
+					requestOptions.formData = requestOptions.body as IDataObject;
 					delete requestOptions.body;
 				} else if (bodyContentType === 'form-urlencoded') {
-					requestOptions.form = requestOptions.body;
+					requestOptions.form = requestOptions.body as IDataObject;
 					delete requestOptions.body;
 				} else if (bodyContentType === 'binaryData') {
 					const inputDataFieldName = this.getNodeParameter(
@@ -1211,7 +1539,7 @@ export class HttpRequestV3 implements INodeType {
 					const itemBinaryData = this.helpers.assertBinaryData(itemIndex, inputDataFieldName);
 
 					if (itemBinaryData.id) {
-						uploadData = this.helpers.getBinaryStream(itemBinaryData.id);
+						uploadData = await this.helpers.getBinaryStream(itemBinaryData.id);
 						const metadata = await this.helpers.getBinaryMetadata(itemBinaryData.id);
 						contentLength = metadata.fileSize;
 					} else {
@@ -1221,8 +1549,8 @@ export class HttpRequestV3 implements INodeType {
 					requestOptions.body = uploadData;
 					requestOptions.headers = {
 						...requestOptions.headers,
-						'Content-Length': contentLength,
-						'Content-Type': itemBinaryData.mimeType ?? 'application/octet-stream',
+						'content-length': contentLength,
+						'content-type': itemBinaryData.mimeType ?? 'application/octet-stream',
 					};
 				} else if (bodyContentType === 'raw') {
 					requestOptions.body = body;
@@ -1232,7 +1560,7 @@ export class HttpRequestV3 implements INodeType {
 			// Get parameters defined in the UI
 			if (sendQuery && queryParameters) {
 				if (specifyQuery === 'keypair') {
-					requestOptions.qs = queryParameters.reduce(parametersToKeyValue, {});
+					requestOptions.qs = await reduceAsync(queryParameters, parametersToKeyValue);
 				} else if (specifyQuery === 'json') {
 					// query is specified using JSON
 					try {
@@ -1253,8 +1581,12 @@ export class HttpRequestV3 implements INodeType {
 
 			// Get parameters defined in the UI
 			if (sendHeaders && headerParameters) {
+				let additionalHeaders: IDataObject = {};
 				if (specifyHeaders === 'keypair') {
-					requestOptions.headers = headerParameters.reduce(parametersToKeyValue, {});
+					additionalHeaders = await reduceAsync(
+						headerParameters.filter((header) => header.name),
+						parametersToKeyValue,
+					);
 				} else if (specifyHeaders === 'json') {
 					// body is specified using JSON
 					try {
@@ -1269,8 +1601,12 @@ export class HttpRequestV3 implements INodeType {
 						);
 					}
 
-					requestOptions.headers = jsonParse(jsonHeadersParameter);
+					additionalHeaders = jsonParse(jsonHeadersParameter);
 				}
+				requestOptions.headers = {
+					...requestOptions.headers,
+					...keysToLowercase(additionalHeaders),
+				};
 			}
 
 			if (autoDetectResponseFormat || responseFormat === 'file') {
@@ -1284,17 +1620,23 @@ export class HttpRequestV3 implements INodeType {
 				requestOptions.json = true;
 			}
 
-			// // Add Content Type if any are set
+			// Add Content Type if any are set
 			if (bodyContentType === 'raw') {
 				if (requestOptions.headers === undefined) {
 					requestOptions.headers = {};
 				}
 				const rawContentType = this.getNodeParameter('rawContentType', itemIndex) as string;
-				requestOptions.headers['Content-Type'] = rawContentType;
+				requestOptions.headers['content-type'] = rawContentType;
 			}
 
 			const authDataKeys: IAuthDataSanitizeKeys = {};
 
+			// Add SSL certificates if any are set
+			setAgentOptions(requestOptions, sslCertificates);
+			if (requestOptions.agentOptions) {
+				authDataKeys.agentOptions = Object.keys(requestOptions.agentOptions);
+			}
+
 			// Add credentials if any are set
 			if (httpBasicAuth !== undefined) {
 				requestOptions.auth = {
@@ -1314,6 +1656,7 @@ export class HttpRequestV3 implements INodeType {
 				requestOptions.qs[httpQueryAuth.name as string] = httpQueryAuth.value;
 				authDataKeys.qs = [httpQueryAuth.name as string];
 			}
+
 			if (httpDigestAuth !== undefined) {
 				requestOptions.auth = {
 					user: httpDigestAuth.user as string,
@@ -1322,6 +1665,24 @@ export class HttpRequestV3 implements INodeType {
 				};
 				authDataKeys.auth = ['pass'];
 			}
+			if (httpCustomAuth !== undefined) {
+				const customAuth = jsonParse<IRequestOptionsSimplified>(
+					(httpCustomAuth.json as string) || '{}',
+					{ errorMessage: 'Invalid Custom Auth JSON' },
+				);
+				if (customAuth.headers) {
+					requestOptions.headers = { ...requestOptions.headers, ...customAuth.headers };
+					authDataKeys.headers = Object.keys(customAuth.headers);
+				}
+				if (customAuth.body) {
+					requestOptions.body = { ...(requestOptions.body as IDataObject), ...customAuth.body };
+					authDataKeys.body = Object.keys(customAuth.body);
+				}
+				if (customAuth.qs) {
+					requestOptions.qs = { ...requestOptions.qs, ...customAuth.qs };
+					authDataKeys.qs = Object.keys(customAuth.qs);
+				}
+			}
 
 			if (requestOptions.headers!.accept === undefined) {
 				if (responseFormat === 'json') {
@@ -1336,10 +1697,104 @@ export class HttpRequestV3 implements INodeType {
 			}
 
 			try {
-				this.sendMessageToUI(sanitizeUiMessage(requestOptions, authDataKeys));
+				const sanitazedRequestOptions = sanitizeUiMessage(requestOptions, authDataKeys);
+				this.sendMessageToUI(sanitazedRequestOptions);
+				sanitazedRequests.push(sanitazedRequestOptions);
 			} catch (e) {}
 
-			if (authentication === 'genericCredentialType' || authentication === 'none') {
+			if (pagination && pagination.paginationMode !== 'off') {
+				let continueExpression = '={{false}}';
+				if (pagination.paginationCompleteWhen === 'receiveSpecificStatusCodes') {
+					// Split out comma separated list of status codes into array
+					const statusCodesWhenCompleted = pagination.statusCodesWhenComplete
+						.split(',')
+						.map((item) => parseInt(item.trim()));
+
+					continueExpression = `={{ !${JSON.stringify(
+						statusCodesWhenCompleted,
+					)}.includes($response.statusCode) }}`;
+				} else if (pagination.paginationCompleteWhen === 'responseIsEmpty') {
+					continueExpression =
+						'={{ Array.isArray($response.body) ? $response.body.length : !!$response.body }}';
+				} else {
+					// Other
+					if (!pagination.completeExpression.length || pagination.completeExpression[0] !== '=') {
+						throw new NodeOperationError(this.getNode(), 'Invalid or empty Complete Expression');
+					}
+					continueExpression = `={{ !(${pagination.completeExpression.trim().slice(3, -2)}) }}`;
+				}
+
+				const paginationData: PaginationOptions = {
+					continue: continueExpression,
+					request: {},
+					requestInterval: pagination.requestInterval,
+				};
+
+				if (pagination.paginationMode === 'updateAParameterInEachRequest') {
+					// Iterate over all parameters and add them to the request
+					paginationData.request = {};
+					const { parameters } = pagination.parameters;
+					if (parameters.length === 1 && parameters[0].name === '' && parameters[0].value === '') {
+						throw new NodeOperationError(
+							this.getNode(),
+							"At least one entry with 'Name' and 'Value' filled must be included in 'Parameters' to use 'Update a Parameter in Each Request' mode ",
+						);
+					}
+					pagination.parameters.parameters.forEach((parameter, index) => {
+						if (!paginationData.request[parameter.type]) {
+							paginationData.request[parameter.type] = {};
+						}
+						const parameterName = parameter.name;
+						if (parameterName === '') {
+							throw new NodeOperationError(
+								this.getNode(),
+								`Parameter name must be set for parameter [${index + 1}] in pagination settings`,
+							);
+						}
+						const parameterValue = parameter.value;
+						if (parameterValue === '') {
+							throw new NodeOperationError(
+								this.getNode(),
+								`Some value must be provided for parameter [${
+									index + 1
+								}] in pagination settings, omitting it will result in an infinite loop`,
+							);
+						}
+						paginationData.request[parameter.type]![parameterName] = parameterValue;
+					});
+				} else if (pagination.paginationMode === 'responseContainsNextURL') {
+					paginationData.request.url = pagination.nextURL;
+				}
+
+				if (pagination.limitPagesFetched) {
+					paginationData.maxRequests = pagination.maxRequests;
+				}
+
+				if (responseFormat === 'file') {
+					paginationData.binaryResult = true;
+				}
+
+				const requestPromise = this.helpers.requestWithAuthenticationPaginated
+					.call(
+						this,
+						requestOptions,
+						itemIndex,
+						paginationData,
+						nodeCredentialType ?? genericCredentialType,
+					)
+					.catch((error) => {
+						if (error instanceof NodeOperationError && error.type === 'invalid_url') {
+							const urlParameterName =
+								pagination.paginationMode === 'responseContainsNextURL' ? 'Next URL' : 'URL';
+							throw new NodeOperationError(this.getNode(), error.message, {
+								description: `Make sure the "${urlParameterName}" parameter evaluates to a valid URL.`,
+							});
+						}
+
+						throw error;
+					});
+				requestPromises.push(requestPromise);
+			} else if (authentication === 'genericCredentialType' || authentication === 'none') {
 				if (oAuth1Api) {
 					const requestOAuth1 = this.helpers.requestOAuth1.call(this, 'oAuth1Api', requestOptions);
 					requestOAuth1.catch(() => {});
@@ -1366,6 +1821,7 @@ export class HttpRequestV3 implements INodeType {
 					nodeCredentialType,
 					requestOptions,
 					additionalOAuth2Options && { oauth2: additionalOAuth2Options },
+					itemIndex,
 				);
 				requestWithAuthentication.catch(() => {});
 				requestPromises.push(requestWithAuthentication);
@@ -1373,20 +1829,27 @@ export class HttpRequestV3 implements INodeType {
 		}
 		const promisesResponses = await Promise.allSettled(requestPromises);
 
-		let response: any;
+		let responseData: any;
 		for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
-			response = promisesResponses.shift();
-			if (response!.status !== 'fulfilled') {
+			responseData = promisesResponses.shift();
+			if (responseData!.status !== 'fulfilled') {
+				if (responseData.reason.statusCode === 429) {
+					responseData.reason.message =
+						"Try spacing your requests out using the batching settings under 'Options'";
+				}
 				if (!this.continueOnFail()) {
-					if (autoDetectResponseFormat && response.reason.error instanceof Buffer) {
-						response.reason.error = Buffer.from(response.reason.error as Buffer).toString();
+					if (autoDetectResponseFormat && responseData.reason.error instanceof Buffer) {
+						responseData.reason.error = Buffer.from(responseData.reason.error as Buffer).toString();
 					}
-					throw new NodeApiError(this.getNode(), response as JsonObject, { itemIndex });
+					const error = new NodeApiError(this.getNode(), responseData as JsonObject, { itemIndex });
+					set(error, 'context.request', sanitazedRequests[itemIndex]);
+					throw error;
 				} else {
+					removeCircularRefs(responseData.reason as JsonObject);
 					// Return the actual reason as error
 					returnItems.push({
 						json: {
-							error: response.reason,
+							error: responseData.reason,
 						},
 						pairedItem: {
 							item: itemIndex,
@@ -1396,9 +1859,12 @@ export class HttpRequestV3 implements INodeType {
 				}
 			}
 
-			response = response.value;
-
-			const url = this.getNodeParameter('url', itemIndex) as string;
+			let responses: any[];
+			if (Array.isArray(responseData.value)) {
+				responses = responseData.value;
+			} else {
+				responses = [responseData.value];
+			}
 
 			let responseFormat = this.getNodeParameter(
 				'options.response.response.responseFormat',
@@ -1412,187 +1878,218 @@ export class HttpRequestV3 implements INodeType {
 				false,
 			) as boolean;
 
-			if (autoDetectResponseFormat) {
-				const responseContentType = response.headers['content-type'] ?? '';
-				if (responseContentType.includes('application/json')) {
-					responseFormat = 'json';
-					const neverError = this.getNodeParameter(
-						'options.response.response.neverError',
-						0,
-						false,
-					) as boolean;
-
-					const data = await this.helpers
-						.binaryToBuffer(response.body as Buffer | Readable)
-						.then((body) => body.toString());
-					response.body = jsonParse(data, {
-						...(neverError
-							? { fallbackValue: {} }
-							: { errorMessage: 'Invalid JSON in response body' }),
-					});
-				} else if (binaryContentTypes.some((e) => responseContentType.includes(e))) {
-					responseFormat = 'file';
-				} else {
-					responseFormat = 'text';
-					const data = await this.helpers
-						.binaryToBuffer(response.body as Buffer | Readable)
-						.then((body) => body.toString());
-					response.body = !data ? undefined : data;
-				}
-			}
-
-			if (autoDetectResponseFormat && !fullResponse) {
-				delete response.headers;
-				delete response.statusCode;
-				delete response.statusMessage;
-				response = response.body;
-				requestOptions.resolveWithFullResponse = false;
-			}
-
-			if (responseFormat === 'file') {
-				const outputPropertyName = this.getNodeParameter(
-					'options.response.response.outputPropertyName',
-					0,
-					'data',
-				) as string;
-
-				const newItem: INodeExecutionData = {
-					json: {},
-					binary: {},
-					pairedItem: {
-						item: itemIndex,
-					},
-				};
-
-				if (items[itemIndex].binary !== undefined) {
-					// Create a shallow copy of the binary data so that the old
-					// data references which do not get changed still stay behind
-					// but the incoming data does not get changed.
-					Object.assign(newItem.binary as IBinaryKeyData, items[itemIndex].binary);
+			// eslint-disable-next-line prefer-const
+			for (let [index, response] of Object.entries(responses)) {
+				if (response?.request?.constructor.name === 'ClientRequest') delete response.request;
+
+				if (this.getMode() === 'manual' && index === '0') {
+					// For manual executions save the first response in the context
+					// so that we can use it in the frontend and so make it easier for
+					// the users to create the required pagination expressions
+					const nodeContext = this.getContext('node');
+					if (pagination && pagination.paginationMode !== 'off') {
+						nodeContext.response = responseData.value[0];
+					} else {
+						nodeContext.response = responseData.value;
+					}
 				}
 
-				const fileName = url.split('/').pop();
-
-				if (fullResponse) {
-					const returnItem: IDataObject = {};
-					for (const property of fullResponseProperties) {
-						if (property === 'body') {
-							continue;
+				const responseContentType = response.headers['content-type'] ?? '';
+				if (autoDetectResponseFormat) {
+					if (responseContentType.includes('application/json')) {
+						responseFormat = 'json';
+						if (!response.__bodyResolved) {
+							const neverError = this.getNodeParameter(
+								'options.response.response.neverError',
+								0,
+								false,
+							) as boolean;
+
+							const data = await this.helpers
+								.binaryToBuffer(response.body as Buffer | Readable)
+								.then((body) => body.toString());
+							response.body = jsonParse(data, {
+								...(neverError
+									? { fallbackValue: {} }
+									: { errorMessage: 'Invalid JSON in response body' }),
+							});
+						}
+					} else if (binaryContentTypes.some((e) => responseContentType.includes(e))) {
+						responseFormat = 'file';
+					} else {
+						responseFormat = 'text';
+						if (!response.__bodyResolved) {
+							const data = await this.helpers
+								.binaryToBuffer(response.body as Buffer | Readable)
+								.then((body) => body.toString());
+							response.body = !data ? undefined : data;
 						}
-						returnItem[property] = response![property];
 					}
+				}
 
-					newItem.json = returnItem;
-
-					newItem.binary![outputPropertyName] = await this.helpers.prepareBinaryData(
-						response!.body as Buffer | Readable,
-						fileName,
-					);
-				} else {
-					newItem.json = items[itemIndex].json;
-
-					newItem.binary![outputPropertyName] = await this.helpers.prepareBinaryData(
-						response! as Buffer | Readable,
-						fileName,
-					);
+				if (autoDetectResponseFormat && !fullResponse) {
+					delete response.headers;
+					delete response.statusCode;
+					delete response.statusMessage;
+				}
+				if (!fullResponse) {
+					response = response.body;
 				}
 
-				returnItems.push(newItem);
-			} else if (responseFormat === 'text') {
-				const outputPropertyName = this.getNodeParameter(
-					'options.response.response.outputPropertyName',
-					0,
-					'data',
-				) as string;
-				if (fullResponse) {
-					const returnItem: IDataObject = {};
-					for (const property of fullResponseProperties) {
-						if (property === 'body') {
-							returnItem[outputPropertyName] = toText(response![property]);
-							continue;
-						}
+				if (responseFormat === 'file') {
+					const outputPropertyName = this.getNodeParameter(
+						'options.response.response.outputPropertyName',
+						0,
+						'data',
+					) as string;
 
-						returnItem[property] = response![property];
-					}
-					returnItems.push({
-						json: returnItem,
-						pairedItem: {
-							item: itemIndex,
-						},
-					});
-				} else {
-					returnItems.push({
-						json: {
-							[outputPropertyName]: toText(response),
-						},
+					const newItem: INodeExecutionData = {
+						json: {},
+						binary: {},
 						pairedItem: {
 							item: itemIndex,
 						},
-					});
-				}
-			} else {
-				// responseFormat: 'json'
-				if (requestOptions.resolveWithFullResponse === true) {
-					const returnItem: IDataObject = {};
-					for (const property of fullResponseProperties) {
-						returnItem[property] = response![property];
+					};
+
+					if (items[itemIndex].binary !== undefined) {
+						// Create a shallow copy of the binary data so that the old
+						// data references which do not get changed still stay behind
+						// but the incoming data does not get changed.
+						Object.assign(newItem.binary as IBinaryKeyData, items[itemIndex].binary);
 					}
 
-					if (responseFormat === 'json' && typeof returnItem.body === 'string') {
-						try {
-							returnItem.body = JSON.parse(returnItem.body);
-						} catch (error) {
-							throw new NodeOperationError(
-								this.getNode(),
-								'Response body is not valid JSON. Change "Response Format" to "Text"',
-								{ itemIndex },
-							);
+					let binaryData: Buffer | Readable;
+					if (fullResponse) {
+						const returnItem: IDataObject = {};
+						for (const property of fullResponseProperties) {
+							if (property === 'body') {
+								continue;
+							}
+							returnItem[property] = response[property];
 						}
+
+						newItem.json = returnItem;
+						binaryData = response?.body;
+					} else {
+						newItem.json = items[itemIndex].json;
+						binaryData = response;
 					}
+					const preparedBinaryData = await this.helpers.prepareBinaryData(
+						binaryData,
+						undefined,
+						responseContentType || undefined,
+					);
 
-					returnItems.push({
-						json: returnItem,
-						pairedItem: {
-							item: itemIndex,
-						},
-					});
-				} else {
-					if (responseFormat === 'json' && typeof response === 'string') {
-						try {
-							response = JSON.parse(response);
-						} catch (error) {
-							throw new NodeOperationError(
-								this.getNode(),
-								'Response body is not valid JSON. Change "Response Format" to "Text"',
-								{ itemIndex },
-							);
-						}
+					if (
+						!preparedBinaryData.fileName &&
+						preparedBinaryData.fileExtension &&
+						typeof requestOptions.uri === 'string' &&
+						requestOptions.uri.endsWith(preparedBinaryData.fileExtension)
+					) {
+						preparedBinaryData.fileName = requestOptions.uri.split('/').pop();
 					}
 
-					if (Array.isArray(response)) {
-						// eslint-disable-next-line @typescript-eslint/no-loop-func
-						response.forEach((item) =>
-							returnItems.push({
-								json: item,
-								pairedItem: {
-									item: itemIndex,
-								},
-							}),
-						);
+					newItem.binary![outputPropertyName] = preparedBinaryData;
+
+					returnItems.push(newItem);
+				} else if (responseFormat === 'text') {
+					const outputPropertyName = this.getNodeParameter(
+						'options.response.response.outputPropertyName',
+						0,
+						'data',
+					) as string;
+					if (fullResponse) {
+						const returnItem: IDataObject = {};
+						for (const property of fullResponseProperties) {
+							if (property === 'body') {
+								returnItem[outputPropertyName] = toText(response[property]);
+								continue;
+							}
+
+							returnItem[property] = response[property];
+						}
+						returnItems.push({
+							json: returnItem,
+							pairedItem: {
+								item: itemIndex,
+							},
+						});
 					} else {
 						returnItems.push({
-							json: response,
+							json: {
+								[outputPropertyName]: toText(response),
+							},
 							pairedItem: {
 								item: itemIndex,
 							},
 						});
 					}
+				} else {
+					// responseFormat: 'json'
+					if (fullResponse) {
+						const returnItem: IDataObject = {};
+						for (const property of fullResponseProperties) {
+							returnItem[property] = response[property];
+						}
+
+						if (responseFormat === 'json' && typeof returnItem.body === 'string') {
+							try {
+								returnItem.body = JSON.parse(returnItem.body);
+							} catch (error) {
+								throw new NodeOperationError(
+									this.getNode(),
+									'Response body is not valid JSON. Change "Response Format" to "Text"',
+									{ itemIndex },
+								);
+							}
+						}
+
+						returnItems.push({
+							json: returnItem,
+							pairedItem: {
+								item: itemIndex,
+							},
+						});
+					} else {
+						if (responseFormat === 'json' && typeof response === 'string') {
+							try {
+								if (typeof response !== 'object') {
+									response = JSON.parse(response);
+								}
+							} catch (error) {
+								throw new NodeOperationError(
+									this.getNode(),
+									'Response body is not valid JSON. Change "Response Format" to "Text"',
+									{ itemIndex },
+								);
+							}
+						}
+
+						if (Array.isArray(response)) {
+							// eslint-disable-next-line @typescript-eslint/no-loop-func
+							response.forEach((item) =>
+								returnItems.push({
+									json: item,
+									pairedItem: {
+										item: itemIndex,
+									},
+								}),
+							);
+						} else {
+							returnItems.push({
+								json: response,
+								pairedItem: {
+									item: itemIndex,
+								},
+							});
+						}
+					}
 				}
 			}
 		}
 
 		returnItems = returnItems.map(replaceNullValues);
 
-		return this.prepareOutputData(returnItems);
+		return [returnItems];
 	}
 }
diff --git a/packages/nodes-base/nodes/HttpRequest/httprequest.svg b/packages/nodes-base/nodes/HttpRequest/httprequest.svg
new file mode 100644
index 0000000000000..955eb3940194a
--- /dev/null
+++ b/packages/nodes-base/nodes/HttpRequest/httprequest.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 40"><path fill="#0004F5" fill-rule="evenodd" d="M40 20C40 8.953 31.047 0 20 0S0 8.953 0 20s8.953 20 20 20 20-8.953 20-20M20 36.946c-1.115 0-2.862-.979-4.5-4.247-.704-1.407-1.304-3.156-1.747-5.014H26.19c-.386 1.855-.986 3.605-1.69 5.014-1.638 3.268-3.385 4.247-4.5 4.247M12.906 20c0 1.61.103 3.164.294 4.63h13.6a36 36 0 0 0 .294-4.63c0-1.61-.103-3.164-.294-4.63H13.2a36 36 0 0 0-.294 4.63M20 3.054c1.115 0 2.862.977 4.5 4.246.707 1.414 1.307 3.107 1.692 5.015H13.75c.443-1.91 1.044-3.602 1.75-5.014 1.638-3.27 3.385-4.247 4.5-4.247M30.148 20c0-1.59-.094-3.138-.325-4.63h6.481c.421 1.472.642 3.026.642 4.63s-.22 3.158-.642 4.63h-6.481c.231-1.492.325-3.04.325-4.63M26.277 4.255c1.36 2.105 2.434 4.877 3.1 8.06h5.728a16.98 16.98 0 0 0-8.828-8.06m-15.654 8.06h-5.73c1.858-3.647 5-6.532 8.83-8.06-1.36 2.105-2.434 4.877-3.1 8.06M3.054 20c0 1.603.223 3.157.64 4.63h6.428a40 40 0 0 1-.27-4.63c0-1.594.094-3.142.27-4.63H3.695a17 17 0 0 0-.64 4.63m23.223 15.743c1.36-2.104 2.434-4.875 3.1-8.058h5.728a16.96 16.96 0 0 1-8.828 8.058m-12.554 0a17 17 0 0 1-8.83-8.058h5.73c.666 3.183 1.74 5.954 3.1 8.058" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/HttpRequest/interfaces.ts b/packages/nodes-base/nodes/HttpRequest/interfaces.ts
new file mode 100644
index 0000000000000..83ef3532daa2e
--- /dev/null
+++ b/packages/nodes-base/nodes/HttpRequest/interfaces.ts
@@ -0,0 +1,6 @@
+export type HttpSslAuthCredentials = {
+	ca?: string;
+	cert?: string;
+	key?: string;
+	passphrase?: string;
+};
diff --git a/packages/nodes-base/nodes/HttpRequest/test/binaryData/HttpRequest.test.ts b/packages/nodes-base/nodes/HttpRequest/test/binaryData/HttpRequest.test.ts
new file mode 100644
index 0000000000000..32734939c29ac
--- /dev/null
+++ b/packages/nodes-base/nodes/HttpRequest/test/binaryData/HttpRequest.test.ts
@@ -0,0 +1,45 @@
+import nock from 'nock';
+import {
+	setup,
+	equalityTest,
+	workflowToTests,
+	getWorkflowFilenames,
+	initBinaryDataService,
+} from '@test/nodes/Helpers';
+
+describe('Test Binary Data Download', () => {
+	const workflows = getWorkflowFilenames(__dirname);
+	const tests = workflowToTests(workflows);
+
+	const baseUrl = 'https://dummy.domain';
+
+	beforeAll(async () => {
+		await initBinaryDataService();
+
+		nock.disableNetConnect();
+
+		nock(baseUrl)
+			.persist()
+			.get('/path/to/image.png')
+			.reply(200, Buffer.from('test'), { 'content-type': 'image/png' });
+
+		nock(baseUrl)
+			.persist()
+			.get('/redirect-to-image')
+			.reply(302, {}, { location: baseUrl + '/path/to/image.png' });
+
+		nock(baseUrl).persist().get('/custom-content-disposition').reply(200, Buffer.from('testing'), {
+			'content-disposition': 'attachment; filename="testing.jpg"',
+		});
+	});
+
+	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/HttpRequest/test/binaryData/binaryData.test.json b/packages/nodes-base/nodes/HttpRequest/test/binaryData/binaryData.test.json
new file mode 100644
index 0000000000000..5e1cc9496a060
--- /dev/null
+++ b/packages/nodes-base/nodes/HttpRequest/test/binaryData/binaryData.test.json
@@ -0,0 +1,242 @@
+{
+  "name": "Download as Binary Data",
+  "nodes": [
+    {
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "parameters": {},
+      "position": [
+        580,
+        300
+      ]
+    },
+    {
+      "name": "HTTP Request (v1)",
+      "type": "n8n-nodes-base.httpRequest",
+      "typeVersion": 1,
+      "parameters": {
+        "url": "https://dummy.domain/path/to/image.png",
+        "responseFormat": "file"
+      },
+      "position": [
+        1020,
+        -100
+      ]
+    },
+    {
+      "name": "HTTP Request (v2)",
+      "type": "n8n-nodes-base.httpRequest",
+      "typeVersion": 2,
+      "parameters": {
+        "url": "https://dummy.domain/path/to/image.png",
+        "responseFormat": "file",
+        "options": {}
+      },
+      "position": [
+        1020,
+        80
+      ]
+    },
+    {
+      "name": "HTTP Request (v3)",
+      "type": "n8n-nodes-base.httpRequest",
+      "typeVersion": 3,
+      "parameters": {
+        "url": "https://dummy.domain/path/to/image.png",
+        "options": {
+          "response": {
+            "response": {
+              "responseFormat": "file"
+            }
+          }
+        }
+      },
+      "position": [
+        1020,
+        240
+      ]
+    },
+    {
+      "name": "HTTP Request (v4)",
+      "type": "n8n-nodes-base.httpRequest",
+      "typeVersion": 4,
+      "parameters": {
+        "url": "https://dummy.domain/path/to/image.png",
+        "options": {
+          "response": {
+            "response": {
+              "responseFormat": "file"
+            }
+          }
+        }
+      },
+      "position": [
+        1020,
+        400
+      ]
+    },
+    {
+      "name": "Follow Redirect",
+      "type": "n8n-nodes-base.httpRequest",
+      "typeVersion": 4.1,
+      "parameters": {
+        "url": "https://dummy.domain/redirect-to-image",
+        "options": {
+          "response": {
+            "response": {
+              "responseFormat": "file"
+            }
+          }
+        }
+      },
+      "position": [
+        1020,
+        560
+      ]
+    },
+    {
+      "name": "Content Disposition",
+      "type": "n8n-nodes-base.httpRequest",
+      "typeVersion": 4.1,
+      "parameters": {
+        "url": "https://dummy.domain/custom-content-disposition",
+        "options": {
+          "response": {
+            "response": {
+              "responseFormat": "file"
+            }
+          }
+        }
+      },
+      "position": [
+        1020,
+        720
+      ]
+    }
+  ],
+  "pinData": {
+    "HTTP Request (v1)": [
+      {
+        "binary": {
+          "data": {
+            "mimeType": "image/png",
+            "fileType": "image",
+            "fileExtension": "png",
+            "fileName": "image.png",
+            "fileSize": "4 B"
+          }
+        },
+        "json": {}
+      }
+    ],
+    "HTTP Request (v2)": [
+      {
+        "binary": {
+          "data": {
+            "mimeType": "image/png",
+            "fileType": "image",
+            "fileExtension": "png",
+            "fileName": "image.png",
+            "fileSize": "4 B"
+          }
+        },
+        "json": {}
+      }
+    ],
+    "HTTP Request (v3)": [
+      {
+        "binary": {
+          "data": {
+            "mimeType": "image/png",
+            "fileType": "image",
+            "fileExtension": "png",
+            "fileName": "image.png",
+            "fileSize": "4 B"
+          }
+        },
+        "json": {}
+      }
+    ],
+    "HTTP Request (v4)": [
+      {
+        "binary": {
+          "data": {
+            "mimeType": "image/png",
+            "fileType": "image",
+            "fileExtension": "png",
+            "fileName": "image.png",
+            "fileSize": "4 B"
+          }
+        },
+        "json": {}
+      }
+    ],
+    "Follow Redirect": [
+      {
+        "binary": {
+          "data": {
+            "mimeType": "image/png",
+            "fileType": "image",
+            "fileExtension": "png",
+            "fileName": "image.png",
+            "fileSize": "4 B"
+          }
+        },
+        "json": {}
+      }
+    ],
+    "Content Disposition": [
+      {
+        "binary": {
+          "data": {
+            "mimeType": "image/jpeg",
+            "fileType": "image",
+            "fileExtension": "jpg",
+            "fileName": "testing.jpg",
+            "fileSize": "7 B"
+          }
+        },
+        "json": {}
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "HTTP Request (v1)",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "HTTP Request (v2)",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "HTTP Request (v3)",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "HTTP Request (v4)",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Follow Redirect",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Content Disposition",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  }
+}
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 b59a9bfe48783..0899ce5637262 100644
--- a/packages/nodes-base/nodes/HttpRequest/test/node/HttpRequest.test.ts
+++ b/packages/nodes-base/nodes/HttpRequest/test/node/HttpRequest.test.ts
@@ -1,11 +1,12 @@
+import { parse as parseUrl } from 'url';
+import nock from 'nock';
 import {
+	initBinaryDataService,
 	setup,
 	equalityTest,
 	workflowToTests,
 	getWorkflowFilenames,
-} from '../../../../test/nodes/Helpers';
-
-import nock from 'nock';
+} from '@test/nodes/Helpers';
 
 describe('Test HTTP Request Node', () => {
 	const workflows = getWorkflowFilenames(__dirname);
@@ -13,9 +14,44 @@ describe('Test HTTP Request Node', () => {
 
 	const baseUrl = 'https://dummyjson.com';
 
-	beforeAll(() => {
+	beforeAll(async () => {
+		await initBinaryDataService();
 		nock.disableNetConnect();
 
+		function getPaginationReturnData(this: nock.ReplyFnContext, limit = 10, skip = 0) {
+			const nextUrl = `${baseUrl}/users?skip=${skip + limit}&limit=${limit}`;
+
+			const response = [];
+			for (let i = skip; i < skip + limit; i++) {
+				if (i > 14) {
+					break;
+				}
+				response.push({
+					id: i,
+				});
+			}
+
+			if (!response.length) {
+				return [
+					404,
+					response,
+					{
+						'next-url': nextUrl,
+						'content-type': this.req.headers['content-type'] || 'application/json',
+					},
+				];
+			}
+
+			return [
+				200,
+				response,
+				{
+					'next-url': nextUrl,
+					'content-type': this.req.headers['content-type'] || 'application/json',
+				},
+			];
+		}
+
 		//GET
 		nock(baseUrl).get('/todos/1').reply(200, {
 			id: 1,
@@ -23,6 +59,12 @@ describe('Test HTTP Request Node', () => {
 			completed: true,
 			userId: 26,
 		});
+		nock(baseUrl).get('/todos/1').reply(200, {
+			id: 1,
+			todo: 'Do something nice for someone I care about',
+			completed: true,
+			userId: 26,
+		});
 		nock(baseUrl).matchHeader('Authorization', 'Bearer 12345').get('/todos/3').reply(200, {
 			id: 3,
 			todo: 'Watch a classic movie',
@@ -116,6 +158,38 @@ describe('Test HTTP Request Node', () => {
 			isDeleted: true,
 			deletedOn: '2023-02-09T05:37:31.720Z',
 		});
+
+		// Pagination - GET
+		nock(baseUrl)
+			.persist()
+			.get('/users')
+			.query(true)
+			.reply(function (uri) {
+				const data = parseUrl(uri, true);
+				const limit = parseInt((data.query.limit as string) || '10', 10);
+				const skip = parseInt((data.query.skip as string) || '0', 10);
+				return getPaginationReturnData.call(this, limit, skip);
+			});
+
+		// Pagination - POST
+		nock(baseUrl)
+			.persist()
+			.post('/users')
+			.reply(function (_uri, body) {
+				let skip = 0;
+				let limit = 10;
+
+				if (typeof body === 'string') {
+					// Form data
+					skip = parseInt(body.split('name="skip"')[1].split('---')[0] ?? '0', 10);
+					limit = parseInt(body.split('name="limit"')[1].split('---')[0] ?? '0', 10);
+				} else {
+					skip = parseInt(body.skip ?? '0', 10);
+					limit = parseInt(body.limit ?? '10', 10);
+				}
+
+				return getPaginationReturnData.call(this, limit, skip);
+			});
 	});
 
 	afterAll(() => {
@@ -125,6 +199,6 @@ describe('Test HTTP Request Node', () => {
 	const nodeTypes = setup(tests);
 
 	for (const testData of tests) {
-		test(testData.description, async () => equalityTest(testData, nodeTypes));
+		test(testData.description, async () => await equalityTest(testData, nodeTypes));
 	}
 });
diff --git a/packages/nodes-base/nodes/HttpRequest/test/node/workflow.get.json b/packages/nodes-base/nodes/HttpRequest/test/node/workflow.get.json
index 2615f4cfa1f6b..f069b866f284f 100644
--- a/packages/nodes-base/nodes/HttpRequest/test/node/workflow.get.json
+++ b/packages/nodes-base/nodes/HttpRequest/test/node/workflow.get.json
@@ -1,144 +1,188 @@
 {
-	"name": "http request test",
+	"name": "HTTP Request test",
 	"nodes": [
-		{
-			"parameters": {},
-			"id": "12433cfb-74d9-4bf1-9afd-0ab9afc9ef19",
-			"name": "When clicking \"Execute Workflow\"",
-			"type": "n8n-nodes-base.manualTrigger",
-			"typeVersion": 1,
-			"position": [820, 360]
+	  {
+		"parameters": {},
+		"id": "3db51d12-a71b-4d0d-84db-1d4c46454c40",
+		"name": "When clicking \"Execute Workflow\"",
+		"type": "n8n-nodes-base.manualTrigger",
+		"typeVersion": 1,
+		"position": [
+		  160,
+		  720
+		]
+	  },
+	  {
+		"parameters": {
+		  "url": "https://dummyjson.com/todos/1",
+		  "options": {}
 		},
-		{
-			"parameters": {
-				"url": "https://dummyjson.com/todos/1",
-				"options": {}
-			},
-			"id": "07670093-862f-403f-96a5-ddf7fdb0d225",
-			"name": "HTTP Request",
-			"type": "n8n-nodes-base.httpRequest",
-			"typeVersion": 3,
-			"position": [1120, 100]
+		"id": "96f38d87-0bdd-420c-b981-26fd55d11cb2",
+		"name": "HTTP Request",
+		"type": "n8n-nodes-base.httpRequest",
+		"typeVersion": 3,
+		"position": [
+		  460,
+		  460
+		]
+	  },
+	  {
+		"parameters": {
+		  "url": "https://dummyjson.com/todos/3",
+		  "sendHeaders": true,
+		  "headerParameters": {
+			"parameters": [
+			  {
+				"name": "Authorization",
+				"value": "Bearer 12345"
+			  }
+			]
+		  },
+		  "options": {}
 		},
-		{
-			"parameters": {
-				"url": "https://dummyjson.com/todos/3",
-				"sendHeaders": true,
-				"headerParameters": {
-					"parameters": [
-						{
-							"name": "Authorization",
-							"value": "Bearer 12345"
-						}
-					]
-				},
-				"options": {}
-			},
-			"id": "25cc4f31-9363-4247-a49d-7ac49f174d16",
-			"name": "HTTP Request fake header",
-			"type": "n8n-nodes-base.httpRequest",
-			"typeVersion": 3,
-			"position": [1120, 440]
+		"id": "85ca0a5b-3ff4-491d-ba51-990fdf2b757f",
+		"name": "HTTP Request fake header",
+		"type": "n8n-nodes-base.httpRequest",
+		"typeVersion": 3,
+		"position": [
+		  460,
+		  800
+		]
+	  },
+	  {
+		"parameters": {
+		  "url": "https://dummyjson.com/todos",
+		  "sendQuery": true,
+		  "queryParameters": {
+			"parameters": [
+			  {
+				"name": "limit",
+				"value": "2"
+			  },
+			  {
+				"name": "skip",
+				"value": "10"
+			  }
+			]
+		  },
+		  "options": {}
 		},
-		{
-			"parameters": {
-				"url": "https://dummyjson.com/todos",
-				"sendQuery": true,
-				"queryParameters": {
-					"parameters": [
-						{
-							"name": "limit",
-							"value": "2"
-						},
-						{
-							"name": "skip",
-							"value": "10"
-						}
-					]
-				},
-				"options": {}
-			},
-			"id": "33c80933-b113-4eff-beb7-4a5b0bc30bcf",
-			"name": "HTTP Request with query",
-			"type": "n8n-nodes-base.httpRequest",
-			"typeVersion": 3,
-			"position": [1120, 620]
-		}
+		"id": "68d6e51a-66ea-45bf-928c-55efd2493cf0",
+		"name": "HTTP Request with query",
+		"type": "n8n-nodes-base.httpRequest",
+		"typeVersion": 3,
+		"position": [
+		  460,
+		  980
+		]
+	  },
+	  {
+		"parameters": {
+		  "url": "https://dummyjson.com/todos/1",
+		  "sendHeaders": true,
+		  "options": {}
+		},
+		"id": "38ec1a50-7f0e-4749-822d-f26370b00694",
+		"name": "HTTP Request empty header",
+		"type": "n8n-nodes-base.httpRequest",
+		"typeVersion": 3,
+		"position": [
+		  460,
+		  640
+		]
+	  }
 	],
 	"pinData": {
-		"HTTP Request": [
+	  "HTTP Request": [
+		{
+		  "json": {
+			"id": 1,
+			"todo": "Do something nice for someone I care about",
+			"completed": true,
+			"userId": 26
+		  }
+		}
+	  ],
+	  "HTTP Request with query": [
+		{
+		  "json": {
+			"todos": [
+			  {
+				"id": 11,
+				"todo": "Text a friend I haven't talked to in a long time",
+				"completed": false,
+				"userId": 39
+			  },
+			  {
+				"id": 12,
+				"todo": "Organize pantry",
+				"completed": true,
+				"userId": 39
+			  }
+			],
+			"total": 150,
+			"skip": 10,
+			"limit": 2
+		  }
+		}
+	  ],
+	  "HTTP Request fake header": [
+		{
+		  "json": {
+			"id": 3,
+			"todo": "Watch a classic movie",
+			"completed": false,
+			"userId": 4
+		  }
+		}
+	  ],
+	  "HTTP Request empty header": [
+		{
+		  "json": {
+			"id": 1,
+			"todo": "Do something nice for someone I care about",
+			"completed": true,
+			"userId": 26
+		  }
+		}
+	  ]
+	},
+	"connections": {
+	  "When clicking \"Execute Workflow\"": {
+		"main": [
+		  [
 			{
-				"json": {
-					"id": 1,
-					"todo": "Do something nice for someone I care about",
-					"completed": true,
-					"userId": 26
-				}
-			}
-		],
-		"HTTP Request with query": [
+			  "node": "HTTP Request",
+			  "type": "main",
+			  "index": 0
+			},
 			{
-				"json": {
-					"todos": [
-						{
-							"id": 11,
-							"todo": "Text a friend I haven't talked to in a long time",
-							"completed": false,
-							"userId": 39
-						},
-						{
-							"id": 12,
-							"todo": "Organize pantry",
-							"completed": true,
-							"userId": 39
-						}
-					],
-					"total": 150,
-					"skip": 10,
-					"limit": 2
-				}
-			}
-		],
-		"HTTP Request fake header": [
+			  "node": "HTTP Request with query",
+			  "type": "main",
+			  "index": 0
+			},
 			{
-				"json": {
-					"id": 3,
-					"todo": "Watch a classic movie",
-					"completed": false,
-					"userId": 4
-				}
+			  "node": "HTTP Request fake header",
+			  "type": "main",
+			  "index": 0
+			},
+			{
+			  "node": "HTTP Request empty header",
+			  "type": "main",
+			  "index": 0
 			}
+		  ]
 		]
-	},
-	"connections": {
-		"When clicking \"Execute Workflow\"": {
-			"main": [
-				[
-					{
-						"node": "HTTP Request",
-						"type": "main",
-						"index": 0
-					},
-					{
-						"node": "HTTP Request with query",
-						"type": "main",
-						"index": 0
-					},
-					{
-						"node": "HTTP Request fake header",
-						"type": "main",
-						"index": 0
-					}
-				]
-			]
-		}
+	  }
 	},
 	"active": false,
-	"settings": {},
-	"versionId": "0fb64565-22b3-4ff3-8ba4-354b2bcaf8a6",
-	"id": "108",
+	"settings": {
+	  "executionOrder": "v1"
+	},
+	"versionId": "",
 	"meta": {
-		"instanceId": "36203ea1ce3cef713fa25999bd9874ae26b9e4c2c3a90a365f2882a154d031d0"
+	  "templateCredsSetupCompleted": true,
+	  "instanceId": "27cc9b56542ad45b38725555722c50a1c3fee1670bbb67980558314ee08517c4"
 	},
 	"tags": []
-}
+  }
diff --git a/packages/nodes-base/nodes/HttpRequest/test/node/workflow.pagination.json b/packages/nodes-base/nodes/HttpRequest/test/node/workflow.pagination.json
new file mode 100644
index 0000000000000..8411887e1311d
--- /dev/null
+++ b/packages/nodes-base/nodes/HttpRequest/test/node/workflow.pagination.json
@@ -0,0 +1,1868 @@
+{
+  "name": "HTTP Pagination Test",
+  "nodes": [
+    {
+      "parameters": {
+        "url": "https://dummyjson.com/users",
+        "sendQuery": true,
+        "queryParameters": {
+          "parameters": [
+            {
+              "name": "limit",
+              "value": "3"
+            }
+          ]
+        },
+        "options": {
+          "response": {
+            "response": {
+              "responseFormat": "json"
+            }
+          },
+          "pagination": {
+            "pagination": {
+              "parameters": {
+                "parameters": [
+                  {
+                    "name": "skip",
+                    "value": "={{ $pageCount * 3 }}"
+                  }
+                ]
+              },
+              "limitPagesFetched": true,
+              "maxRequests": 3
+            }
+          }
+        }
+      },
+      "id": "c42631bf-5122-4b84-86c7-00ad9dcdcdfb",
+      "name": "Page Limit",
+      "type": "n8n-nodes-base.httpRequest",
+      "typeVersion": 4.1,
+      "position": [
+        980,
+        1980
+      ]
+    },
+    {
+      "parameters": {
+        "url": "https://dummyjson.com/users",
+        "sendQuery": true,
+        "queryParameters": {
+          "parameters": [
+            {
+              "name": "limit",
+              "value": "3"
+            }
+          ]
+        },
+        "options": {
+          "response": {
+            "response": {
+              "neverError": true,
+              "responseFormat": "json"
+            }
+          },
+          "pagination": {
+            "pagination": {
+              "parameters": {
+                "parameters": [
+                  {
+                    "name": "skip",
+                    "value": "={{ $pageCount * 3 }}"
+                  }
+                ]
+              }
+            }
+          }
+        }
+      },
+      "id": "337101b7-9815-466b-8920-b69529c90c73",
+      "name": "Response Empty",
+      "type": "n8n-nodes-base.httpRequest",
+      "typeVersion": 4.1,
+      "position": [
+        980,
+        2160
+      ]
+    },
+    {
+      "parameters": {
+        "url": "https://dummyjson.com/users",
+        "sendQuery": true,
+        "queryParameters": {
+          "parameters": [
+            {
+              "name": "limit",
+              "value": "3"
+            }
+          ]
+        },
+        "options": {
+          "response": {
+            "response": {
+              "responseFormat": "json"
+            }
+          },
+          "pagination": {
+            "pagination": {
+              "parameters": {
+                "parameters": [
+                  {
+                    "name": "skip",
+                    "value": "={{ $pageCount * 3 }}"
+                  }
+                ]
+              },
+              "paginationCompleteWhen": "receiveSpecificStatusCodes",
+              "statusCodesWhenComplete": "404",
+              "limitPagesFetched": true
+            }
+          }
+        }
+      },
+      "id": "a2953ca3-e17c-4e83-8bf0-149587c14088",
+      "name": "Receive Status Code",
+      "type": "n8n-nodes-base.httpRequest",
+      "typeVersion": 4.1,
+      "position": [
+        980,
+        2320
+      ]
+    },
+    {
+      "parameters": {
+        "url": "https://dummyjson.com/users",
+        "sendQuery": true,
+        "queryParameters": {
+          "parameters": [
+            {
+              "name": "limit",
+              "value": "3"
+            }
+          ]
+        },
+        "options": {
+          "response": {
+            "response": {
+              "neverError": true,
+              "responseFormat": "json"
+            }
+          },
+          "pagination": {
+            "pagination": {
+              "parameters": {
+                "parameters": [
+                  {
+                    "name": "skip",
+                    "value": "={{ $pageCount * 3 }}"
+                  }
+                ]
+              },
+              "paginationCompleteWhen": "other",
+              "completeExpression": "={{ $response.statusCode === 404 }}"
+            }
+          }
+        }
+      },
+      "id": "aad6795d-4156-445b-8b6c-968692ed3620",
+      "name": "Complete Expression",
+      "type": "n8n-nodes-base.httpRequest",
+      "typeVersion": 4.1,
+      "position": [
+        980,
+        2500
+      ]
+    },
+    {
+      "parameters": {
+        "content": "### Next URL\nResponse Format: JSON",
+        "height": 223.6542431762359,
+        "width": 365.5274479049966
+      },
+      "id": "036cf1e4-0534-4422-9aea-36a9bb308e79",
+      "name": "Sticky Note",
+      "type": "n8n-nodes-base.stickyNote",
+      "typeVersion": 1,
+      "position": [
+        920,
+        3100
+      ]
+    },
+    {
+      "parameters": {
+        "content": "### Update a Parameter in Each Request\nResponse Format: JSON",
+        "height": 1140.0832129820226,
+        "width": 354.2110090941684
+      },
+      "id": "e36564a0-d1d9-4f15-9c78-b4713f75b13f",
+      "name": "Sticky Note1",
+      "type": "n8n-nodes-base.stickyNote",
+      "typeVersion": 1,
+      "position": [
+        927,
+        1901
+      ]
+    },
+    {
+      "parameters": {
+        "url": "https://dummyjson.com/users",
+        "sendQuery": true,
+        "queryParameters": {
+          "parameters": [
+            {
+              "name": "limit",
+              "value": "4"
+            }
+          ]
+        },
+        "options": {
+          "response": {
+            "response": {
+              "neverError": true,
+              "responseFormat": "text"
+            }
+          },
+          "pagination": {
+            "pagination": {
+              "paginationMode": "responseContainsNextURL",
+              "nextURL": "={{ $response.headers[\"next-url\"] }}",
+              "paginationCompleteWhen": "receiveSpecificStatusCodes",
+              "statusCodesWhenComplete": "404"
+            }
+          }
+        }
+      },
+      "id": "83ca19dd-f110-4b36-8c52-836c0b501a7e",
+      "name": "Response Empty - Text",
+      "type": "n8n-nodes-base.httpRequest",
+      "typeVersion": 4.1,
+      "position": [
+        980,
+        3420
+      ]
+    },
+    {
+      "parameters": {
+        "url": "https://dummyjson.com/users",
+        "sendQuery": true,
+        "queryParameters": {
+          "parameters": [
+            {
+              "name": "limit",
+              "value": "4"
+            }
+          ]
+        },
+        "options": {
+          "response": {
+            "response": {
+              "responseFormat": "json"
+            }
+          },
+          "pagination": {
+            "pagination": {
+              "paginationMode": "responseContainsNextURL",
+              "nextURL": "={{ $response.headers[\"next-url\"] }}",
+              "limitPagesFetched": true,
+              "maxRequests": 3
+            }
+          }
+        }
+      },
+      "id": "2b770b1b-0c66-4668-a037-f7b2986fd793",
+      "name": "Response Empty Next with Max Pages",
+      "type": "n8n-nodes-base.httpRequest",
+      "typeVersion": 4.1,
+      "position": [
+        980,
+        3160
+      ]
+    },
+    {
+      "parameters": {
+        "content": "### Next URL\nResponse Format: Text",
+        "height": 388.6542431762359,
+        "width": 363.5274479049966
+      },
+      "id": "fee3b5a3-9af9-44d6-8814-a8334e29ed0e",
+      "name": "Sticky Note2",
+      "type": "n8n-nodes-base.stickyNote",
+      "typeVersion": 1,
+      "position": [
+        920,
+        3360
+      ]
+    },
+    {
+      "parameters": {
+        "url": "https://dummyjson.com/users",
+        "sendQuery": true,
+        "queryParameters": {
+          "parameters": [
+            {
+              "name": "limit",
+              "value": "3"
+            }
+          ]
+        },
+        "options": {
+          "response": {
+            "response": {
+              "neverError": true,
+              "responseFormat": "json"
+            }
+          },
+          "pagination": {
+            "pagination": {
+              "parameters": {
+                "parameters": [
+                  {
+                    "name": "skip",
+                    "value": "={{ $pageCount * 3 }}"
+                  }
+                ]
+              },
+              "paginationCompleteWhen": "other",
+              "completeExpression": "={{ $response.statusCode === 404 }}"
+            }
+          }
+        }
+      },
+      "id": "d91beb91-8716-4817-a729-91114a8d4a63",
+      "name": "Complete Expression - JSON",
+      "type": "n8n-nodes-base.httpRequest",
+      "typeVersion": 4.1,
+      "position": [
+        980,
+        1700
+      ]
+    },
+    {
+      "parameters": {
+        "content": "### Update a Parameter in Each Request\nResponse Format: JSON",
+        "height": 232.15942469988397,
+        "width": 323.21100909416833
+      },
+      "id": "693b1adb-1be8-4e87-bad8-23936c685155",
+      "name": "Sticky Note3",
+      "type": "n8n-nodes-base.stickyNote",
+      "typeVersion": 1,
+      "position": [
+        920,
+        1632.366284408126
+      ]
+    },
+    {
+      "parameters": {
+        "url": "https://dummyjson.com/users",
+        "sendQuery": true,
+        "queryParameters": {
+          "parameters": [
+            {
+              "name": "limit",
+              "value": "4"
+            }
+          ]
+        },
+        "options": {
+          "response": {
+            "response": {
+              "fullResponse": true,
+              "neverError": true,
+              "responseFormat": "text"
+            }
+          },
+          "pagination": {
+            "pagination": {
+              "paginationMode": "responseContainsNextURL",
+              "nextURL": "={{ $response.headers[\"next-url\"] }}",
+              "paginationCompleteWhen": "receiveSpecificStatusCodes",
+              "statusCodesWhenComplete": "404"
+            }
+          }
+        }
+      },
+      "id": "72a3ce0d-f428-41cc-a93e-8692f5ed97f9",
+      "name": "Response Empty - Include Full Response",
+      "type": "n8n-nodes-base.httpRequest",
+      "typeVersion": 4.1,
+      "position": [
+        980,
+        3600
+      ]
+    },
+    {
+      "parameters": {
+        "url": "https://dummyjson.com/users",
+        "sendQuery": true,
+        "queryParameters": {
+          "parameters": [
+            {
+              "name": "limit",
+              "value": "3"
+            }
+          ]
+        },
+        "options": {
+          "response": {
+            "response": {
+              "neverError": true,
+              "responseFormat": "json"
+            }
+          },
+          "pagination": {
+            "pagination": {
+              "paginationMode": "off"
+            }
+          }
+        }
+      },
+      "id": "b579b38a-ac67-40ab-ab82-b465dc6387dc",
+      "name": "Pagination Off",
+      "type": "n8n-nodes-base.httpRequest",
+      "typeVersion": 4.1,
+      "position": [
+        980,
+        3820
+      ]
+    },
+    {
+      "parameters": {
+        "content": "### Pagination Off",
+        "height": 373,
+        "width": 363
+      },
+      "id": "601cef96-0ac0-4890-b1c3-8ca15fbc2571",
+      "name": "Sticky Note4",
+      "type": "n8n-nodes-base.stickyNote",
+      "typeVersion": 1,
+      "position": [
+        920,
+        3780
+      ]
+    },
+    {
+      "parameters": {
+        "url": "https://dummyjson.com/users",
+        "sendQuery": true,
+        "queryParameters": {
+          "parameters": [
+            {
+              "name": "limit",
+              "value": "3"
+            }
+          ]
+        },
+        "options": {
+          "response": {
+            "response": {
+              "neverError": true,
+              "responseFormat": "json"
+            }
+          }
+        }
+      },
+      "id": "bdd6cf22-746e-4fda-84b2-df178f5d3dab",
+      "name": "Pagination Not Set",
+      "type": "n8n-nodes-base.httpRequest",
+      "typeVersion": 4.1,
+      "position": [
+        980,
+        4000
+      ]
+    },
+    {
+      "parameters": {
+        "content": "### Detect identical responses\nThrow then error",
+        "height": 232.15942469988397,
+        "width": 394.89100909416834
+      },
+      "id": "1e7bfcfb-93d0-4ee2-8c0f-380ee2dd7fcb",
+      "name": "Sticky Note5",
+      "type": "n8n-nodes-base.stickyNote",
+      "typeVersion": 1,
+      "position": [
+        920,
+        4220
+      ]
+    },
+    {
+      "parameters": {
+        "fields": {
+          "values": [
+            {
+              "name": "Error",
+              "stringValue": "={{ $json.error.name }}"
+            }
+          ]
+        },
+        "include": "none",
+        "options": {}
+      },
+      "id": "35a1f1f3-d701-4252-9dea-5b2b0ef7f32f",
+      "name": "Edit Fields",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.2,
+      "position": [
+        1160,
+        4300
+      ]
+    },
+    {
+      "parameters": {
+        "url": "https://dummyjson.com/users",
+        "sendQuery": true,
+        "queryParameters": {
+          "parameters": [
+            {
+              "name": "limit",
+              "value": "3"
+            }
+          ]
+        },
+        "options": {
+          "response": {
+            "response": {
+              "responseFormat": "json"
+            }
+          },
+          "pagination": {
+            "pagination": {
+              "parameters": {
+                "parameters": [
+                  {
+                    "name": "does_not_matter",
+                    "value": "0"
+                  }
+                ]
+              }
+            }
+          }
+        }
+      },
+      "id": "12f6310f-e88e-490f-9dd1-2012586bf9c9",
+      "name": "Loop",
+      "type": "n8n-nodes-base.httpRequest",
+      "typeVersion": 4.1,
+      "position": [
+        980,
+        4300
+      ],
+      "continueOnFail": true
+    },
+    {
+      "parameters": {
+        "content": "### Next URL\nResponse Format: Autodetect\nActual Response Format: JSON",
+        "height": 650.4724697091658,
+        "width": 323.21100909416833
+      },
+      "id": "0074b955-3217-4fc9-b7c4-58f11fc323c1",
+      "name": "Sticky Note6",
+      "type": "n8n-nodes-base.stickyNote",
+      "typeVersion": 1,
+      "position": [
+        900,
+        507.8499967658788
+      ]
+    },
+    {
+      "parameters": {
+        "content": "# Response Format: Autodetect\n",
+        "width": 545.8929725020898
+      },
+      "id": "e7b7440f-aad2-49df-9c10-695497aec7c5",
+      "name": "Sticky Note7",
+      "type": "n8n-nodes-base.stickyNote",
+      "typeVersion": 1,
+      "position": [
+        280,
+        708
+      ]
+    },
+    {
+      "parameters": {
+        "content": "# Response Format: set",
+        "width": 545.8929725020898
+      },
+      "id": "1ad4fad8-4c66-4afe-8893-2727c852ba44",
+      "name": "Sticky Note8",
+      "type": "n8n-nodes-base.stickyNote",
+      "typeVersion": 1,
+      "position": [
+        300,
+        1640
+      ]
+    },
+    {
+      "parameters": {
+        "url": "https://dummyjson.com/users",
+        "sendQuery": true,
+        "queryParameters": {
+          "parameters": [
+            {
+              "name": "limit",
+              "value": "3"
+            }
+          ]
+        },
+        "options": {
+          "response": {
+            "response": {}
+          },
+          "pagination": {
+            "pagination": {
+              "paginationMode": "responseContainsNextURL",
+              "nextURL": "={{ $response.headers[\"next-url\"] }}",
+              "limitPagesFetched": true,
+              "maxRequests": 2
+            }
+          }
+        }
+      },
+      "id": "415e52cd-bdb4-42a8-af18-fec7eb9e6a1f",
+      "name": "Complete Expression - JSON Autodetect set",
+      "type": "n8n-nodes-base.httpRequest",
+      "typeVersion": 4.1,
+      "position": [
+        960,
+        600
+      ]
+    },
+    {
+      "parameters": {
+        "url": "https://dummyjson.com/users",
+        "sendQuery": true,
+        "queryParameters": {
+          "parameters": [
+            {
+              "name": "limit",
+              "value": "3"
+            }
+          ]
+        },
+        "options": {
+          "pagination": {
+            "pagination": {
+              "paginationMode": "responseContainsNextURL",
+              "nextURL": "={{ $response.headers[\"next-url\"] }}",
+              "limitPagesFetched": true,
+              "maxRequests": 2
+            }
+          }
+        }
+      },
+      "id": "a111a0a4-ae9c-4b27-af04-5ab9584798ae",
+      "name": "Complete Expression - JSON unset",
+      "type": "n8n-nodes-base.httpRequest",
+      "typeVersion": 4.1,
+      "position": [
+        960,
+        780
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "aaa4d56b-5d72-4ecb-bcc4-9ccdf0c7c139",
+      "name": "No Operation, do nothing1",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        500,
+        2500
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "6fbde1fb-8f7d-4947-84f1-2695b919cc43",
+      "name": "Data 2",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        200,
+        1980
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "f13379f2-5867-46d9-9af1-48b9ff9524d0",
+      "name": "Data 1",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        520,
+        960
+      ]
+    },
+    {
+      "parameters": {
+        "url": "https://dummyjson.com/users",
+        "sendQuery": true,
+        "queryParameters": {
+          "parameters": [
+            {
+              "name": "limit",
+              "value": "4"
+            }
+          ]
+        },
+        "sendHeaders": true,
+        "headerParameters": {
+          "parameters": [
+            {
+              "name": "content-type",
+              "value": "text/plain"
+            }
+          ]
+        },
+        "options": {
+          "response": {
+            "response": {
+              "neverError": true
+            }
+          },
+          "pagination": {
+            "pagination": {
+              "paginationMode": "responseContainsNextURL",
+              "nextURL": "={{ $response.headers[\"next-url\"] }}",
+              "paginationCompleteWhen": "receiveSpecificStatusCodes",
+              "statusCodesWhenComplete": "404"
+            }
+          }
+        }
+      },
+      "id": "bcbb8fe5-1613-4dc6-a92c-89f1415c1821",
+      "name": "Response Empty - Text1",
+      "type": "n8n-nodes-base.httpRequest",
+      "typeVersion": 4.1,
+      "position": [
+        960,
+        1260
+      ]
+    },
+    {
+      "parameters": {
+        "content": "### Next URL\nResponse Format: Autodetect\nActual Response Format: text",
+        "height": 437.60980047313967,
+        "width": 323.31395441111135
+      },
+      "id": "4e73a489-5c9f-4b8f-a32f-ad6d91fc187a",
+      "name": "Sticky Note9",
+      "type": "n8n-nodes-base.stickyNote",
+      "typeVersion": 1,
+      "position": [
+        900,
+        1173.7738085909446
+      ]
+    },
+    {
+      "parameters": {
+        "url": "https://dummyjson.com/users",
+        "sendQuery": true,
+        "queryParameters": {
+          "parameters": [
+            {
+              "name": "limit",
+              "value": "4"
+            }
+          ]
+        },
+        "sendHeaders": true,
+        "headerParameters": {
+          "parameters": [
+            {
+              "name": "content-type",
+              "value": "text/plain"
+            }
+          ]
+        },
+        "options": {
+          "response": {
+            "response": {
+              "fullResponse": true,
+              "neverError": true
+            }
+          },
+          "pagination": {
+            "pagination": {
+              "paginationMode": "responseContainsNextURL",
+              "nextURL": "={{ $response.headers[\"next-url\"] }}",
+              "paginationCompleteWhen": "receiveSpecificStatusCodes",
+              "statusCodesWhenComplete": "404"
+            }
+          }
+        }
+      },
+      "id": "c02661c0-b6e7-45f8-8049-ef1a97f4b590",
+      "name": "Response Empty - Include Full Response1",
+      "type": "n8n-nodes-base.httpRequest",
+      "typeVersion": 4.1,
+      "position": [
+        960,
+        1440
+      ]
+    },
+    {
+      "parameters": {
+        "method": "POST",
+        "url": "https://dummyjson.com/users",
+        "sendBody": true,
+        "contentType": "multipart-form-data",
+        "bodyParameters": {
+          "parameters": [
+            {
+              "name": "limit",
+              "value": "3"
+            },
+            {
+              "name": "skip",
+              "value": "0"
+            }
+          ]
+        },
+        "options": {
+          "response": {
+            "response": {
+              "responseFormat": "json"
+            }
+          },
+          "pagination": {
+            "pagination": {
+              "parameters": {
+                "parameters": [
+                  {
+                    "type": "body",
+                    "name": "skip",
+                    "value": "={{ $pageCount * 3 }}"
+                  }
+                ]
+              },
+              "limitPagesFetched": true,
+              "maxRequests": 3
+            }
+          }
+        }
+      },
+      "id": "69569627-0e1b-45e0-a279-bf53c3f99c8f",
+      "name": "POST Form Data",
+      "type": "n8n-nodes-base.httpRequest",
+      "typeVersion": 4.1,
+      "position": [
+        980,
+        2860
+      ]
+    },
+    {
+      "parameters": {
+        "method": "POST",
+        "url": "https://dummyjson.com/users",
+        "sendBody": true,
+        "bodyParameters": {
+          "parameters": [
+            {
+              "name": "limit",
+              "value": "3"
+            },
+            {
+              "name": "skip",
+              "value": "0"
+            }
+          ]
+        },
+        "options": {
+          "response": {
+            "response": {
+              "responseFormat": "json"
+            }
+          },
+          "pagination": {
+            "pagination": {
+              "parameters": {
+                "parameters": [
+                  {
+                    "type": "body",
+                    "name": "skip",
+                    "value": "={{ $pageCount * 3 }}"
+                  }
+                ]
+              },
+              "limitPagesFetched": true,
+              "maxRequests": 3
+            }
+          }
+        }
+      },
+      "id": "c68c8649-298e-42fe-bc61-df4a4b9d5c39",
+      "name": "POST JSON",
+      "type": "n8n-nodes-base.httpRequest",
+      "typeVersion": 4.1,
+      "position": [
+        980,
+        2680
+      ]
+    },
+    {
+      "parameters": {
+        "url": "https://dummyjson.com/users",
+        "options": {
+          "pagination": {
+            "pagination": {
+              "paginationMode": "responseContainsNextURL",
+              "limitPagesFetched": true,
+              "maxRequests": 2
+            }
+          }
+        }
+      },
+      "id": "c004d7eb-d755-4d65-b359-6e0ddab0406d",
+      "name": "Complete Expression - JSON unset1",
+      "type": "n8n-nodes-base.httpRequest",
+      "typeVersion": 4.1,
+      "position": [
+        960,
+        980
+      ],
+      "onError": "continueRegularOutput"
+    }
+  ],
+  "pinData": {
+    "Page Limit": [
+      {
+        "json": {
+          "id": 0
+        }
+      },
+      {
+        "json": {
+          "id": 1
+        }
+      },
+      {
+        "json": {
+          "id": 2
+        }
+      },
+      {
+        "json": {
+          "id": 3
+        }
+      },
+      {
+        "json": {
+          "id": 4
+        }
+      },
+      {
+        "json": {
+          "id": 5
+        }
+      },
+      {
+        "json": {
+          "id": 6
+        }
+      },
+      {
+        "json": {
+          "id": 7
+        }
+      },
+      {
+        "json": {
+          "id": 8
+        }
+      }
+    ],
+    "Response Empty": [
+      {
+        "json": {
+          "id": 0
+        }
+      },
+      {
+        "json": {
+          "id": 1
+        }
+      },
+      {
+        "json": {
+          "id": 2
+        }
+      },
+      {
+        "json": {
+          "id": 3
+        }
+      },
+      {
+        "json": {
+          "id": 4
+        }
+      },
+      {
+        "json": {
+          "id": 5
+        }
+      },
+      {
+        "json": {
+          "id": 6
+        }
+      },
+      {
+        "json": {
+          "id": 7
+        }
+      },
+      {
+        "json": {
+          "id": 8
+        }
+      },
+      {
+        "json": {
+          "id": 9
+        }
+      },
+      {
+        "json": {
+          "id": 10
+        }
+      },
+      {
+        "json": {
+          "id": 11
+        }
+      },
+      {
+        "json": {
+          "id": 12
+        }
+      },
+      {
+        "json": {
+          "id": 13
+        }
+      },
+      {
+        "json": {
+          "id": 14
+        }
+      }
+    ],
+    "Receive Status Code": [
+      {
+        "json": {
+          "id": 0
+        }
+      },
+      {
+        "json": {
+          "id": 1
+        }
+      },
+      {
+        "json": {
+          "id": 2
+        }
+      },
+      {
+        "json": {
+          "id": 3
+        }
+      },
+      {
+        "json": {
+          "id": 4
+        }
+      },
+      {
+        "json": {
+          "id": 5
+        }
+      },
+      {
+        "json": {
+          "id": 6
+        }
+      },
+      {
+        "json": {
+          "id": 7
+        }
+      },
+      {
+        "json": {
+          "id": 8
+        }
+      },
+      {
+        "json": {
+          "id": 9
+        }
+      },
+      {
+        "json": {
+          "id": 10
+        }
+      },
+      {
+        "json": {
+          "id": 11
+        }
+      },
+      {
+        "json": {
+          "id": 12
+        }
+      },
+      {
+        "json": {
+          "id": 13
+        }
+      },
+      {
+        "json": {
+          "id": 14
+        }
+      }
+    ],
+    "Complete Expression": [
+      {
+        "json": {
+          "id": 0
+        }
+      },
+      {
+        "json": {
+          "id": 1
+        }
+      },
+      {
+        "json": {
+          "id": 2
+        }
+      },
+      {
+        "json": {
+          "id": 3
+        }
+      },
+      {
+        "json": {
+          "id": 4
+        }
+      },
+      {
+        "json": {
+          "id": 5
+        }
+      },
+      {
+        "json": {
+          "id": 6
+        }
+      },
+      {
+        "json": {
+          "id": 7
+        }
+      },
+      {
+        "json": {
+          "id": 8
+        }
+      },
+      {
+        "json": {
+          "id": 9
+        }
+      },
+      {
+        "json": {
+          "id": 10
+        }
+      },
+      {
+        "json": {
+          "id": 11
+        }
+      },
+      {
+        "json": {
+          "id": 12
+        }
+      },
+      {
+        "json": {
+          "id": 13
+        }
+      },
+      {
+        "json": {
+          "id": 14
+        }
+      }
+    ],
+    "Response Empty - Text": [
+      {
+        "json": {
+          "data": "[{\"id\":0},{\"id\":1},{\"id\":2},{\"id\":3}]"
+        }
+      },
+      {
+        "json": {
+          "data": "[{\"id\":4},{\"id\":5},{\"id\":6},{\"id\":7}]"
+        }
+      },
+      {
+        "json": {
+          "data": "[{\"id\":8},{\"id\":9},{\"id\":10},{\"id\":11}]"
+        }
+      },
+      {
+        "json": {
+          "data": "[{\"id\":12},{\"id\":13},{\"id\":14}]"
+        }
+      },
+      {
+        "json": {
+          "data": "[]"
+        }
+      }
+    ],
+    "Response Empty Next with Max Pages": [
+      {
+        "json": {
+          "id": 0
+        }
+      },
+      {
+        "json": {
+          "id": 1
+        }
+      },
+      {
+        "json": {
+          "id": 2
+        }
+      },
+      {
+        "json": {
+          "id": 3
+        }
+      },
+      {
+        "json": {
+          "id": 4
+        }
+      },
+      {
+        "json": {
+          "id": 5
+        }
+      },
+      {
+        "json": {
+          "id": 6
+        }
+      },
+      {
+        "json": {
+          "id": 7
+        }
+      },
+      {
+        "json": {
+          "id": 8
+        }
+      },
+      {
+        "json": {
+          "id": 9
+        }
+      },
+      {
+        "json": {
+          "id": 10
+        }
+      },
+      {
+        "json": {
+          "id": 11
+        }
+      }
+    ],
+    "Response Empty - Include Full Response": [
+      {
+        "json": {
+          "data": "[{\"id\":0},{\"id\":1},{\"id\":2},{\"id\":3}]",
+          "headers": {
+            "content-type": "application/json",
+            "next-url": "https://dummyjson.com/users?skip=4&limit=4"
+          },
+          "statusCode": 200,
+          "statusMessage": null
+        }
+      },
+      {
+        "json": {
+          "data": "[{\"id\":4},{\"id\":5},{\"id\":6},{\"id\":7}]",
+          "headers": {
+            "content-type": "application/json",
+            "next-url": "https://dummyjson.com/users?skip=8&limit=4"
+          },
+          "statusCode": 200,
+          "statusMessage": null
+        }
+      },
+      {
+        "json": {
+          "data": "[{\"id\":8},{\"id\":9},{\"id\":10},{\"id\":11}]",
+          "headers": {
+            "content-type": "application/json",
+            "next-url": "https://dummyjson.com/users?skip=12&limit=4"
+          },
+          "statusCode": 200,
+          "statusMessage": null
+        }
+      },
+      {
+        "json": {
+          "data": "[{\"id\":12},{\"id\":13},{\"id\":14}]",
+          "headers": {
+            "content-type": "application/json",
+            "next-url": "https://dummyjson.com/users?skip=16&limit=4"
+          },
+          "statusCode": 200,
+          "statusMessage": null
+        }
+      },
+      {
+        "json": {
+          "data": "[]",
+          "headers": {
+            "content-type": "application/json",
+            "next-url": "https://dummyjson.com/users?skip=20&limit=4"
+          },
+          "statusCode": 404,
+          "statusMessage": null
+        }
+      }
+    ],
+    "Complete Expression - JSON": [
+      {
+        "json": {
+          "id": 0
+        }
+      },
+      {
+        "json": {
+          "id": 1
+        }
+      },
+      {
+        "json": {
+          "id": 2
+        }
+      },
+      {
+        "json": {
+          "id": 3
+        }
+      },
+      {
+        "json": {
+          "id": 4
+        }
+      },
+      {
+        "json": {
+          "id": 5
+        }
+      },
+      {
+        "json": {
+          "id": 6
+        }
+      },
+      {
+        "json": {
+          "id": 7
+        }
+      },
+      {
+        "json": {
+          "id": 8
+        }
+      },
+      {
+        "json": {
+          "id": 9
+        }
+      },
+      {
+        "json": {
+          "id": 10
+        }
+      },
+      {
+        "json": {
+          "id": 11
+        }
+      },
+      {
+        "json": {
+          "id": 12
+        }
+      },
+      {
+        "json": {
+          "id": 13
+        }
+      },
+      {
+        "json": {
+          "id": 14
+        }
+      }
+    ],
+    "Pagination Off": [
+      {
+        "json": {
+          "id": 0
+        }
+      },
+      {
+        "json": {
+          "id": 1
+        }
+      },
+      {
+        "json": {
+          "id": 2
+        }
+      }
+    ],
+    "Pagination Not Set": [
+      {
+        "json": {
+          "id": 0
+        }
+      },
+      {
+        "json": {
+          "id": 1
+        }
+      },
+      {
+        "json": {
+          "id": 2
+        }
+      }
+    ],
+    "Edit Fields": [
+      {
+        "json": {
+          "Error": "NodeOperationError"
+        }
+      }
+    ],
+    "Complete Expression - JSON Autodetect set": [
+      {
+        "json": {
+          "id": 0
+        }
+      },
+      {
+        "json": {
+          "id": 1
+        }
+      },
+      {
+        "json": {
+          "id": 2
+        }
+      },
+      {
+        "json": {
+          "id": 3
+        }
+      },
+      {
+        "json": {
+          "id": 4
+        }
+      },
+      {
+        "json": {
+          "id": 5
+        }
+      }
+    ],
+    "Complete Expression - JSON unset": [
+      {
+        "json": {
+          "id": 0
+        }
+      },
+      {
+        "json": {
+          "id": 1
+        }
+      },
+      {
+        "json": {
+          "id": 2
+        }
+      },
+      {
+        "json": {
+          "id": 3
+        }
+      },
+      {
+        "json": {
+          "id": 4
+        }
+      },
+      {
+        "json": {
+          "id": 5
+        }
+      }
+    ],
+    "Response Empty - Text1": [
+      {
+        "json": {
+          "data": "[{\"id\":0},{\"id\":1},{\"id\":2},{\"id\":3}]"
+        }
+      },
+      {
+        "json": {
+          "data": "[{\"id\":4},{\"id\":5},{\"id\":6},{\"id\":7}]"
+        }
+      },
+      {
+        "json": {
+          "data": "[{\"id\":8},{\"id\":9},{\"id\":10},{\"id\":11}]"
+        }
+      },
+      {
+        "json": {
+          "data": "[{\"id\":12},{\"id\":13},{\"id\":14}]"
+        }
+      },
+      {
+        "json": {
+          "data": "[]"
+        }
+      }
+    ],
+    "Response Empty - Include Full Response1": [
+      {
+        "json": {
+          "data": "[{\"id\":0},{\"id\":1},{\"id\":2},{\"id\":3}]",
+          "headers": {
+            "content-type": "text/plain",
+            "next-url": "https://dummyjson.com/users?skip=4&limit=4"
+          },
+          "statusCode": 200,
+          "statusMessage": null
+        }
+      },
+      {
+        "json": {
+          "data": "[{\"id\":4},{\"id\":5},{\"id\":6},{\"id\":7}]",
+          "headers": {
+            "content-type": "text/plain",
+            "next-url": "https://dummyjson.com/users?skip=8&limit=4"
+          },
+          "statusCode": 200,
+          "statusMessage": null
+        }
+      },
+      {
+        "json": {
+          "data": "[{\"id\":8},{\"id\":9},{\"id\":10},{\"id\":11}]",
+          "headers": {
+            "content-type": "text/plain",
+            "next-url": "https://dummyjson.com/users?skip=12&limit=4"
+          },
+          "statusCode": 200,
+          "statusMessage": null
+        }
+      },
+      {
+        "json": {
+          "data": "[{\"id\":12},{\"id\":13},{\"id\":14}]",
+          "headers": {
+            "content-type": "text/plain",
+            "next-url": "https://dummyjson.com/users?skip=16&limit=4"
+          },
+          "statusCode": 200,
+          "statusMessage": null
+        }
+      },
+      {
+        "json": {
+          "data": "[]",
+          "headers": {
+            "content-type": "text/plain",
+            "next-url": "https://dummyjson.com/users?skip=20&limit=4"
+          },
+          "statusCode": 404,
+          "statusMessage": null
+        }
+      }
+    ],
+    "POST Form Data": [
+      {
+        "json": {
+          "id": 0
+        }
+      },
+      {
+        "json": {
+          "id": 1
+        }
+      },
+      {
+        "json": {
+          "id": 2
+        }
+      },
+      {
+        "json": {
+          "id": 3
+        }
+      },
+      {
+        "json": {
+          "id": 4
+        }
+      },
+      {
+        "json": {
+          "id": 5
+        }
+      },
+      {
+        "json": {
+          "id": 6
+        }
+      },
+      {
+        "json": {
+          "id": 7
+        }
+      },
+      {
+        "json": {
+          "id": 8
+        }
+      }
+    ],
+    "POST JSON": [
+      {
+        "json": {
+          "id": 0
+        }
+      },
+      {
+        "json": {
+          "id": 1
+        }
+      },
+      {
+        "json": {
+          "id": 2
+        }
+      },
+      {
+        "json": {
+          "id": 3
+        }
+      },
+      {
+        "json": {
+          "id": 4
+        }
+      },
+      {
+        "json": {
+          "id": 5
+        }
+      },
+      {
+        "json": {
+          "id": 6
+        }
+      },
+      {
+        "json": {
+          "id": 7
+        }
+      },
+      {
+        "json": {
+          "id": 8
+        }
+      }
+    ],
+    "Complete Expression - JSON unset1": [
+      {
+        "json": {
+          "error": {
+            "message": "'' is not a valid URL.",
+            "name": "NodeOperationError",
+            "description": "Make sure the \"Next URL\" parameter evaluates to a valid URL.",
+            "context": {}
+          }
+        }
+      }
+    ]
+  },
+  "connections": {
+    "Loop": {
+      "main": [
+        [
+          {
+            "node": "Edit Fields",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "No Operation, do nothing1": {
+      "main": [
+        [
+          {
+            "node": "Receive Status Code",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Complete Expression",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Response Empty Next with Max Pages",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Response Empty - Text",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Response Empty - Include Full Response",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Pagination Off",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Pagination Not Set",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Loop",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Response Empty",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Page Limit",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Complete Expression - JSON",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "POST JSON",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "POST Form Data",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Data 2": {
+      "main": [
+        [
+          {
+            "node": "Data 1",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "No Operation, do nothing1",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Data 1": {
+      "main": [
+        [
+          {
+            "node": "Complete Expression - JSON Autodetect set",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Complete Expression - JSON unset",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Response Empty - Text1",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Response Empty - Include Full Response1",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Complete Expression - JSON unset1",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "5189ec73-b659-4740-83f5-d5bf3995f5df",
+  "meta": {
+    "templateCredsSetupCompleted": true,
+    "instanceId": "27cc9b56542ad45b38725555722c50a1c3fee1670bbb67980558314ee08517c4"
+  },
+  "id": "4WORX7JyBFP94dXM",
+  "tags": []
+}
diff --git a/packages/nodes-base/nodes/HttpRequest/test/utils/utils.test.ts b/packages/nodes-base/nodes/HttpRequest/test/utils/utils.test.ts
index db0884412038c..716b59e9b800f 100644
--- a/packages/nodes-base/nodes/HttpRequest/test/utils/utils.test.ts
+++ b/packages/nodes-base/nodes/HttpRequest/test/utils/utils.test.ts
@@ -1,8 +1,9 @@
-import { prepareRequestBody } from '../../GenericFunctions';
+import type { IRequestOptions } from 'n8n-workflow';
+import { prepareRequestBody, setAgentOptions } from '../../GenericFunctions';
 import type { BodyParameter, BodyParametersReducer } from '../../GenericFunctions';
 
 describe('HTTP Node Utils, prepareRequestBody', () => {
-	it('should call default reducer', () => {
+	it('should call default reducer', async () => {
 		const bodyParameters: BodyParameter[] = [
 			{
 				name: 'foo.bar',
@@ -11,15 +12,13 @@ describe('HTTP Node Utils, prepareRequestBody', () => {
 		];
 		const defaultReducer: BodyParametersReducer = jest.fn();
 
-		prepareRequestBody(bodyParameters, 'json', 3, defaultReducer);
+		await prepareRequestBody(bodyParameters, 'json', 3, defaultReducer);
 
 		expect(defaultReducer).toBeCalledTimes(1);
-		expect(defaultReducer).toBeCalledWith({}, { name: 'foo.bar', value: 'baz' }, 0, [
-			{ name: 'foo.bar', value: 'baz' },
-		]);
+		expect(defaultReducer).toBeCalledWith({}, { name: 'foo.bar', value: 'baz' });
 	});
 
-	it('should call process dot notations', () => {
+	it('should call process dot notations', async () => {
 		const bodyParameters: BodyParameter[] = [
 			{
 				name: 'foo.bar.spam',
@@ -28,10 +27,49 @@ describe('HTTP Node Utils, prepareRequestBody', () => {
 		];
 		const defaultReducer: BodyParametersReducer = jest.fn();
 
-		const result = prepareRequestBody(bodyParameters, 'json', 4, defaultReducer);
+		const result = await prepareRequestBody(bodyParameters, 'json', 4, defaultReducer);
 
 		expect(defaultReducer).toBeCalledTimes(0);
 		expect(result).toBeDefined();
 		expect(result).toEqual({ foo: { bar: { spam: 'baz' } } });
 	});
 });
+
+describe('HTTP Node Utils, setAgentOptions', () => {
+	it("should not have agentOptions as it's undefined", async () => {
+		const requestOptions: IRequestOptions = {
+			method: 'GET',
+			uri: 'https://example.com',
+		};
+
+		const sslCertificates = undefined;
+
+		setAgentOptions(requestOptions, sslCertificates);
+
+		expect(requestOptions).toEqual({
+			method: 'GET',
+			uri: 'https://example.com',
+		});
+	});
+
+	it('should have agentOptions set', async () => {
+		const requestOptions: IRequestOptions = {
+			method: 'GET',
+			uri: 'https://example.com',
+		};
+
+		const sslCertificates = {
+			ca: 'mock-ca',
+		};
+
+		setAgentOptions(requestOptions, sslCertificates);
+
+		expect(requestOptions).toStrictEqual({
+			method: 'GET',
+			uri: 'https://example.com',
+			agentOptions: {
+				ca: 'mock-ca',
+			},
+		});
+	});
+});
diff --git a/packages/nodes-base/nodes/Hubspot/CompanyDescription.ts b/packages/nodes-base/nodes/Hubspot/CompanyDescription.ts
deleted file mode 100644
index 3c1c59d805044..0000000000000
--- a/packages/nodes-base/nodes/Hubspot/CompanyDescription.ts
+++ /dev/null
@@ -1,1057 +0,0 @@
-import type { INodeProperties } from 'n8n-workflow';
-
-export const companyOperations: INodeProperties[] = [
-	{
-		displayName: 'Operation',
-		name: 'operation',
-		type: 'options',
-		noDataExpression: true,
-		displayOptions: {
-			show: {
-				resource: ['company'],
-			},
-		},
-		options: [
-			{
-				name: 'Create',
-				value: 'create',
-				description: 'Create a company',
-				action: 'Create a company',
-			},
-			{
-				name: 'Delete',
-				value: 'delete',
-				description: 'Delete a company',
-				action: 'Delete a company',
-			},
-			{
-				name: 'Get',
-				value: 'get',
-				description: 'Get a company',
-				action: 'Get a company',
-			},
-			{
-				name: 'Get Many',
-				value: 'getAll',
-				description: 'Get many companies',
-				action: 'Get many companies',
-			},
-			{
-				name: 'Get Recently Created',
-				value: 'getRecentlyCreated',
-				description: 'Get recently created companies',
-				action: 'Get a recently created company',
-			},
-			{
-				name: 'Get Recently Modified',
-				value: 'getRecentlyModified',
-				description: 'Get recently modified companies',
-				action: 'Get a recently modified company',
-			},
-			{
-				name: 'Search By Domain',
-				value: 'searchByDomain',
-				description: 'Search companies by domain',
-				action: 'Search for a company by Domain',
-			},
-			{
-				name: 'Update',
-				value: 'update',
-				description: 'Update a company',
-				action: 'Update a company',
-			},
-		],
-		default: 'create',
-	},
-];
-
-export const companyFields: INodeProperties[] = [
-	/* -------------------------------------------------------------------------- */
-	/*                                company:create                              */
-	/* -------------------------------------------------------------------------- */
-	{
-		displayName: 'Name',
-		name: 'name',
-		type: 'string',
-		required: true,
-		displayOptions: {
-			show: {
-				resource: ['company'],
-				operation: ['create'],
-			},
-		},
-		default: '',
-	},
-	{
-		displayName: 'Additional Fields',
-		name: 'additionalFields',
-		type: 'collection',
-		placeholder: 'Add Field',
-		default: {},
-		displayOptions: {
-			show: {
-				resource: ['company'],
-				operation: ['create'],
-			},
-		},
-		options: [
-			{
-				displayName: 'About Us',
-				name: 'aboutUs',
-				type: 'string',
-				default: '',
-			},
-			{
-				displayName: 'Annual Revenue',
-				name: 'annualRevenue',
-				type: 'number',
-				typeOptions: {
-					minValue: 0,
-				},
-				default: 0,
-				description: 'The actual or estimated annual revenue of the company',
-			},
-			{
-				displayName: 'City',
-				name: 'city',
-				type: 'string',
-				default: '',
-				description: 'The city where the company is located',
-			},
-			{
-				displayName: 'Close Date',
-				name: 'closeDate',
-				type: 'dateTime',
-				default: '',
-				description: 'The date the company or organization was closed as a customer',
-			},
-			{
-				displayName: 'Company Domain Name',
-				name: 'companyDomainName',
-				type: 'string',
-				default: '',
-				description: 'The domain name of the company or organization',
-			},
-			{
-				displayName: 'Company Owner Name or ID',
-				name: 'companyOwner',
-				type: 'options',
-				typeOptions: {
-					loadOptionsMethod: 'getOwners',
-				},
-				default: '',
-				description:
-					'The owner of the company. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
-			},
-			{
-				displayName: 'Country/Region',
-				name: 'countryRegion',
-				type: 'string',
-				default: '',
-				description: 'The country/region in which the company or organization is located',
-			},
-			{
-				displayName: 'Custom Properties',
-				name: 'customPropertiesUi',
-				placeholder: 'Add Custom Property',
-				type: 'fixedCollection',
-				typeOptions: {
-					multipleValues: true,
-				},
-				default: {},
-				options: [
-					{
-						name: 'customPropertiesValues',
-						displayName: 'Custom Property',
-						values: [
-							{
-								displayName: 'Property Name or ID',
-								name: 'property',
-								type: 'options',
-								typeOptions: {
-									loadOptionsMethod: 'getCompanyCustomProperties',
-								},
-								default: '',
-								description:
-									'Name of the property. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
-							},
-							{
-								displayName: 'Value',
-								name: 'value',
-								type: 'string',
-								default: '',
-								description: 'Value of the property',
-							},
-						],
-					},
-				],
-			},
-			{
-				displayName: 'Description',
-				name: 'description',
-				type: 'string',
-				default: '',
-				description: "A short statement about the company's mission and goals",
-			},
-			{
-				displayName: 'Facebook Fans',
-				name: 'facebookFans',
-				type: 'number',
-				typeOptions: {
-					minValue: 0,
-				},
-				default: 0,
-				description: 'Number of facebook fans',
-			},
-			{
-				displayName: 'Google Plus Page',
-				name: 'googlePlusPage',
-				type: 'string',
-				default: '',
-				description: 'The URL of the Google Plus page for the company or organization',
-			},
-			{
-				displayName: 'Industry Name or ID',
-				name: 'industry',
-				type: 'options',
-				typeOptions: {
-					loadOptionsMethod: 'getCompanyIndustries',
-				},
-				default: '',
-				description:
-					'The type of business the company performs. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
-			},
-			{
-				displayName: 'Is Public',
-				name: 'isPublic',
-				type: 'boolean',
-				default: false,
-				description: 'Whether that the company is publicly traded',
-			},
-			{
-				displayName: 'Lead Status Name or ID',
-				name: 'leadStatus',
-				type: 'options',
-				typeOptions: {
-					loadOptionsMethod: 'getCompanyleadStatuses',
-				},
-				default: '',
-				description:
-					'The company\'s sales, prospecting or outreach status. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
-			},
-			{
-				displayName: 'Lifecycle Stage Name or ID',
-				name: 'lifecycleStatus',
-				type: 'options',
-				typeOptions: {
-					loadOptionsMethod: 'getCompanylifecycleStages',
-				},
-				default: '',
-				description:
-					'The most advanced lifecycle stage across all contacts associated with this company or organization. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
-			},
-			{
-				displayName: 'LinkedIn Bio',
-				name: 'linkedinBio',
-				type: 'string',
-				default: '',
-				description: 'The LinkedIn bio for the company or organization',
-			},
-			{
-				displayName: 'LinkedIn Company Page',
-				name: 'linkedInCompanyPage',
-				type: 'string',
-				default: '',
-				description: 'The URL of the LinkedIn company page for the company or organization',
-			},
-			{
-				displayName: 'Number Of Employees',
-				name: 'numberOfEmployees',
-				type: 'number',
-				typeOptions: {
-					minValue: 0,
-				},
-				default: 0,
-				description: 'The total number of employees who work for the company or organization',
-			},
-			{
-				displayName: 'Original Source Type Name or ID',
-				name: 'originalSourceType',
-				type: 'options',
-				typeOptions: {
-					loadOptionsMethod: 'getCompanySourceTypes',
-				},
-				default: '',
-				description:
-					'Original source for the contact with the earliest activity for this company or organization. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
-			},
-			{
-				displayName: 'Phone Number',
-				name: 'phoneNumber',
-				type: 'string',
-				default: '',
-				description: "A company's primary phone number. Powered by HubSpot Insights.",
-			},
-			{
-				displayName: 'Postal Code',
-				name: 'postalCode',
-				type: 'string',
-				default: '',
-				description:
-					'The postal or zip code of the company or organization. Powered by HubSpot Insights.',
-			},
-			{
-				displayName: 'State/Region',
-				name: 'stateRegion',
-				type: 'string',
-				default: '',
-				description:
-					'The state or region in which the company or organization is located. Powered by HubSpot Insights.',
-			},
-			{
-				displayName: 'Street Address',
-				name: 'streetAddress',
-				type: 'string',
-				default: '',
-				description:
-					'The street address of the company or organization, including unit number. Powered by HubSpot Insights.',
-			},
-			{
-				displayName: 'Street Address 2',
-				name: 'streetAddress2',
-				type: 'string',
-				default: '',
-				description:
-					'The additional address of the company or organization. Powered by HubSpot Insights.',
-			},
-
-			{
-				displayName: 'Target Account Name or ID',
-				name: 'targetAccount',
-				type: 'options',
-				typeOptions: {
-					loadOptionsMethod: 'getCompanyTargetAccounts',
-				},
-				default: '',
-				description:
-					'The Target Account property is a means to flag high priority companies if you are following an account based strategy. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
-			},
-			{
-				displayName: 'Timezone',
-				name: 'timezone',
-				type: 'string',
-				default: '',
-				description:
-					'The time zone where the company or organization is located. Powered by HubSpot Insights.',
-			},
-			{
-				displayName: 'Total Money Raised',
-				name: 'totalMoneyRaised',
-				type: 'number',
-				typeOptions: {
-					minValue: 0,
-				},
-				default: 0,
-				description:
-					'The total amount of money raised by the company. Powered by HubSpot Insights.',
-			},
-			{
-				displayName: 'Twitter Bio',
-				name: 'twitterBio',
-				type: 'string',
-				default: '',
-				description: 'The Twitter bio of the company or organization',
-			},
-			{
-				displayName: 'Twitter Followers',
-				name: 'twitterFollowers',
-				type: 'number',
-				typeOptions: {
-					minValue: 0,
-				},
-				default: 0,
-				description: 'The number of Twitter followers of the company or organization',
-			},
-			{
-				displayName: 'Twitter Handle',
-				name: 'twitterHandle',
-				type: 'string',
-				default: '',
-				description: 'The main twitter account of the company or organization',
-			},
-			{
-				displayName: 'Type Name or ID',
-				name: 'type',
-				type: 'options',
-				typeOptions: {
-					loadOptionsMethod: 'getCompanyTypes',
-				},
-				default: '',
-				description:
-					'The optional classification of this company record - prospect, partner, etc. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
-			},
-			{
-				displayName: 'Web Technologies Name or ID',
-				name: 'webTechnologies',
-				type: 'options',
-				typeOptions: {
-					loadOptionsMethod: 'getCompanyWebTechnologies',
-				},
-				default: '',
-				description:
-					'The web technologies used by the company or organization. Powered by HubSpot Insights. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
-			},
-			{
-				displayName: 'Website URL',
-				name: 'websiteUrl',
-				type: 'string',
-				default: '',
-				description:
-					'The main website of the company or organization. This property is used to identify unique companies. Powered by HubSpot Insights.',
-			},
-			{
-				displayName: 'Year Founded',
-				name: 'yearFounded',
-				type: 'string',
-				default: '',
-				description: 'The year the company was created. Powered by HubSpot Insights.',
-			},
-		],
-	},
-
-	/* -------------------------------------------------------------------------- */
-	/*                                 company:update                             */
-	/* -------------------------------------------------------------------------- */
-	{
-		displayName: 'Company ID',
-		name: 'companyId',
-		type: 'string',
-		required: true,
-		displayOptions: {
-			show: {
-				resource: ['company'],
-				operation: ['update'],
-			},
-		},
-		default: '',
-		description: 'Unique identifier for a particular company',
-	},
-	{
-		displayName: 'Update Fields',
-		name: 'updateFields',
-		type: 'collection',
-		placeholder: 'Add Field',
-		default: {},
-		displayOptions: {
-			show: {
-				resource: ['company'],
-				operation: ['update'],
-			},
-		},
-		options: [
-			{
-				displayName: 'About Us',
-				name: 'aboutUs',
-				type: 'string',
-				default: '',
-			},
-			{
-				displayName: 'Annual Revenue',
-				name: 'annualRevenue',
-				type: 'number',
-				typeOptions: {
-					minValue: 0,
-				},
-				default: 0,
-				description: 'The actual or estimated annual revenue of the company',
-			},
-			{
-				displayName: 'City',
-				name: 'city',
-				type: 'string',
-				default: '',
-				description: 'The city where the company is located',
-			},
-			{
-				displayName: 'Close Date',
-				name: 'closeDate',
-				type: 'dateTime',
-				default: '',
-				description: 'The date the company or organization was closed as a customer',
-			},
-			{
-				displayName: 'Company Domain Name',
-				name: 'companyDomainName',
-				type: 'string',
-				default: '',
-				description: 'The domain name of the company or organization',
-			},
-			{
-				displayName: 'Company Owmer Name or ID',
-				name: 'companyOwner',
-				type: 'options',
-				typeOptions: {
-					loadOptionsMethod: 'getOwners',
-				},
-				default: '',
-				description:
-					'The owner of the company. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
-			},
-			{
-				displayName: 'Country/Region',
-				name: 'countryRegion',
-				type: 'string',
-				default: '',
-				description: 'The country/region in which the company or organization is located',
-			},
-			{
-				displayName: 'Custom Properties',
-				name: 'customPropertiesUi',
-				placeholder: 'Add Custom Property',
-				type: 'fixedCollection',
-				typeOptions: {
-					multipleValues: true,
-				},
-				default: {},
-				options: [
-					{
-						name: 'customPropertiesValues',
-						displayName: 'Custom Property',
-						values: [
-							{
-								displayName: 'Property Name or ID',
-								name: 'property',
-								type: 'options',
-								typeOptions: {
-									loadOptionsMethod: 'getCompanyCustomProperties',
-								},
-								default: '',
-								description:
-									'Name of the property. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
-							},
-							{
-								displayName: 'Value',
-								name: 'value',
-								type: 'string',
-								default: '',
-								description: 'Value of the property',
-							},
-						],
-					},
-				],
-			},
-			{
-				displayName: 'Description',
-				name: 'description',
-				type: 'string',
-				default: '',
-				description: "A short statement about the company's mission and goals",
-			},
-			{
-				displayName: 'Facebook Fans',
-				name: 'facebookFans',
-				type: 'number',
-				typeOptions: {
-					minValue: 0,
-				},
-				default: 0,
-				description: 'Number of facebook fans',
-			},
-			{
-				displayName: 'Google Plus Page',
-				name: 'googlePlusPage',
-				type: 'string',
-				default: '',
-				description: 'The URL of the Google Plus page for the company or organization',
-			},
-			{
-				displayName: 'Industry Name or ID',
-				name: 'industry',
-				type: 'options',
-				typeOptions: {
-					loadOptionsMethod: 'getCompanyIndustries',
-				},
-				default: '',
-				description:
-					'The type of business the company performs. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
-			},
-			{
-				displayName: 'Is Public',
-				name: 'isPublic',
-				type: 'boolean',
-				default: false,
-				description: 'Whether that the company is publicly traded',
-			},
-			{
-				displayName: 'Lead Status Name or ID',
-				name: 'leadStatus',
-				type: 'options',
-				typeOptions: {
-					loadOptionsMethod: 'getCompanyleadStatuses',
-				},
-				default: '',
-				description:
-					'The company\'s sales, prospecting or outreach status. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
-			},
-			{
-				displayName: 'Lifecycle Stage Name or ID',
-				name: 'lifecycleStatus',
-				type: 'options',
-				typeOptions: {
-					loadOptionsMethod: 'getCompanylifecycleStages',
-				},
-				default: '',
-				description:
-					'The most advanced lifecycle stage across all contacts associated with this company or organization. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
-			},
-			{
-				displayName: 'Linkedin Bio',
-				name: 'linkedinBio',
-				type: 'string',
-				default: '',
-				description: 'The LinkedIn bio for the company or organization',
-			},
-			{
-				displayName: 'LinkedIn Company Page',
-				name: 'linkedInCompanyPage',
-				type: 'string',
-				default: '',
-				description: 'The URL of the LinkedIn company page for the company or organization',
-			},
-			{
-				displayName: 'Name',
-				name: 'name',
-				type: 'string',
-				default: '',
-			},
-			{
-				displayName: 'Number Of Employees',
-				name: 'numberOfEmployees',
-				type: 'number',
-				typeOptions: {
-					minValue: 0,
-				},
-				default: 0,
-				description: 'The total number of employees who work for the company or organization',
-			},
-			{
-				displayName: 'Original Source Type Name or ID',
-				name: 'originalSourceType',
-				type: 'options',
-				typeOptions: {
-					loadOptionsMethod: 'getCompanySourceTypes',
-				},
-				default: '',
-				description:
-					'Original source for the contact with the earliest activity for this company or organization. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
-			},
-			{
-				displayName: 'Phone Number',
-				name: 'phoneNumber',
-				type: 'string',
-				default: '',
-				description: "A company's primary phone number. Powered by HubSpot Insights.",
-			},
-			{
-				displayName: 'Postal Code',
-				name: 'postalCode',
-				type: 'string',
-				default: '',
-				description:
-					'The postal or zip code of the company or organization. Powered by HubSpot Insights.',
-			},
-			{
-				displayName: 'State/Region',
-				name: 'stateRegion',
-				type: 'string',
-				default: '',
-				description:
-					'The state or region in which the company or organization is located. Powered by HubSpot Insights.',
-			},
-			{
-				displayName: 'Street Address',
-				name: 'streetAddress',
-				type: 'string',
-				default: '',
-				description:
-					'The street address of the company or organization, including unit number. Powered by HubSpot Insights.',
-			},
-			{
-				displayName: 'Street Address 2',
-				name: 'streetAddress2',
-				type: 'string',
-				default: '',
-				description:
-					'The additional address of the company or organization. Powered by HubSpot Insights.',
-			},
-
-			{
-				displayName: 'Target Account Name or ID',
-				name: 'targetAccount',
-				type: 'options',
-				typeOptions: {
-					loadOptionsMethod: 'getCompanyTargetAccounts',
-				},
-				default: '',
-				description:
-					'The Target Account property is a means to flag high priority companies if you are following an account based strategy. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
-			},
-			{
-				displayName: 'Timezone',
-				name: 'timezone',
-				type: 'string',
-				default: '',
-				description:
-					'The time zone where the company or organization is located. Powered by HubSpot Insights.',
-			},
-			{
-				displayName: 'Total Money Raised',
-				name: 'totalMoneyRaised',
-				type: 'number',
-				typeOptions: {
-					minValue: 0,
-				},
-				default: 0,
-				description:
-					'The total amount of money raised by the company. Powered by HubSpot Insights.',
-			},
-			{
-				displayName: 'Twitter Bio',
-				name: 'twitterBio',
-				type: 'string',
-				default: '',
-				description: 'The Twitter bio of the company or organization',
-			},
-			{
-				displayName: 'Twitter Followers',
-				name: 'twitterFollowers',
-				type: 'number',
-				typeOptions: {
-					minValue: 0,
-				},
-				default: 0,
-				description: 'The number of Twitter followers of the company or organization',
-			},
-			{
-				displayName: 'Twitter Handle',
-				name: 'twitterHandle',
-				type: 'string',
-				default: '',
-				description: 'The main twitter account of the company or organization',
-			},
-			{
-				displayName: 'Type Name or ID',
-				name: 'type',
-				type: 'options',
-				typeOptions: {
-					loadOptionsMethod: 'getCompanyTypes',
-				},
-				default: '',
-				description:
-					'The optional classification of this company record - prospect, partner, etc. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
-			},
-			{
-				displayName: 'Web Technologies Name or ID',
-				name: 'webTechnologies',
-				type: 'options',
-				typeOptions: {
-					loadOptionsMethod: 'getCompanyWebTechnologies',
-				},
-				default: '',
-				description:
-					'The web technologies used by the company or organization. Powered by HubSpot Insights. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
-			},
-			{
-				displayName: 'Website URL',
-				name: 'websiteUrl',
-				type: 'string',
-				default: '',
-				description:
-					'The main website of the company or organization. This property is used to identify unique companies. Powered by HubSpot Insights.',
-			},
-			{
-				displayName: 'Year Founded',
-				name: 'yearFounded',
-				type: 'string',
-				default: '',
-				description: 'The year the company was created. Powered by HubSpot Insights.',
-			},
-		],
-	},
-
-	/* -------------------------------------------------------------------------- */
-	/*                                  company:get                               */
-	/* -------------------------------------------------------------------------- */
-	{
-		displayName: 'Company ID',
-		name: 'companyId',
-		type: 'string',
-		required: true,
-		displayOptions: {
-			show: {
-				resource: ['company'],
-				operation: ['get'],
-			},
-		},
-		default: '',
-		description: 'Unique identifier for a particular company',
-	},
-	{
-		displayName: 'Additional Fields',
-		name: 'additionalFields',
-		type: 'collection',
-		placeholder: 'Add Field',
-		default: {},
-		displayOptions: {
-			show: {
-				resource: ['company'],
-				operation: ['get'],
-			},
-		},
-		options: [
-			{
-				displayName: 'Include Merge Audits',
-				name: 'includeMergeAudits',
-				type: 'boolean',
-				default: false,
-				description:
-					'Whether to return any merge history if the company has been previously merged with another company record. Defaults to false.',
-			},
-		],
-	},
-
-	/* -------------------------------------------------------------------------- */
-	/*                                 company:getAll                             */
-	/* -------------------------------------------------------------------------- */
-	{
-		displayName: 'Return All',
-		name: 'returnAll',
-		type: 'boolean',
-		displayOptions: {
-			show: {
-				resource: ['company'],
-				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: ['company'],
-				operation: ['getAll'],
-				returnAll: [false],
-			},
-		},
-		typeOptions: {
-			minValue: 1,
-			maxValue: 250,
-		},
-		default: 100,
-		description: 'Max number of results to return',
-	},
-	{
-		displayName: 'Options',
-		name: 'options',
-		type: 'collection',
-		placeholder: 'Add Field',
-		default: {},
-		displayOptions: {
-			show: {
-				resource: ['company'],
-				operation: ['getAll'],
-			},
-		},
-		options: [
-			{
-				displayName: 'Include Merge Audits',
-				name: 'includeMergeAudits',
-				type: 'boolean',
-				default: false,
-				description:
-					'Whether to return any merge history if a company has been previously merged with another company record. Defaults to false.',
-			},
-			{
-				displayName: 'Property Names or IDs',
-				name: 'properties',
-				type: 'multiOptions',
-				typeOptions: {
-					loadOptionsMethod: 'getCompanyProperties',
-				},
-				default: [],
-				description:
-					'<p>Used to include specific company properties in the results. By default, the results will only include company ID and will not include the values for any properties for your companies.</p><p>Including this parameter will include the data for the specified property in the results. You can include this parameter multiple times to request multiple properties separated by a comma: <code>,</code>.</p>. Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
-			},
-			{
-				displayName: 'Properties With History',
-				name: 'propertiesWithHistory',
-				type: 'string',
-				default: '',
-				description:
-					"Works similarly to properties=, but this parameter will include the history for the specified property, instead of just including the current value. Use this parameter when you need the full history of changes to a property's value.",
-			},
-		],
-	},
-
-	/* -------------------------------------------------------------------------- */
-	/*                                 company:delete                             */
-	/* -------------------------------------------------------------------------- */
-	{
-		displayName: 'Company ID',
-		name: 'companyId',
-		type: 'string',
-		required: true,
-		displayOptions: {
-			show: {
-				resource: ['company'],
-				operation: ['delete'],
-			},
-		},
-		default: '',
-		description: 'Unique identifier for a particular company',
-	},
-
-	/* -------------------------------------------------------------------------- */
-	/*               company:getRecentlyCreated company:getRecentlyModifie        */
-	/* -------------------------------------------------------------------------- */
-	{
-		displayName: 'Return All',
-		name: 'returnAll',
-		type: 'boolean',
-		displayOptions: {
-			show: {
-				resource: ['company'],
-				operation: ['getRecentlyCreated', 'getRecentlyModified'],
-			},
-		},
-		default: false,
-		description: 'Whether to return all results or only up to a given limit',
-	},
-	{
-		displayName: 'Limit',
-		name: 'limit',
-		type: 'number',
-		displayOptions: {
-			show: {
-				resource: ['company'],
-				operation: ['getRecentlyCreated', 'getRecentlyModified'],
-				returnAll: [false],
-			},
-		},
-		typeOptions: {
-			minValue: 1,
-			maxValue: 250,
-		},
-		default: 100,
-		description: 'Max number of results to return',
-	},
-	{
-		displayName: 'Filters',
-		name: 'filters',
-		type: 'collection',
-		placeholder: 'Add Filter',
-		default: {},
-		displayOptions: {
-			show: {
-				resource: ['company'],
-				operation: ['getRecentlyModified'],
-			},
-		},
-		options: [
-			{
-				displayName: 'Since',
-				name: 'since',
-				type: 'dateTime',
-				default: '',
-				description: 'Only return companys created after timestamp x',
-			},
-			{
-				displayName: 'Include Property Versions',
-				name: 'includePropertyVersions',
-				type: 'boolean',
-				default: false,
-				// eslint-disable-next-line n8n-nodes-base/node-param-description-boolean-without-whether
-				description:
-					'By default, you will only get data for the most recent version of a property in the "versions" data. If you include this parameter, you will get data for all previous versions.',
-			},
-		],
-	},
-
-	/* -------------------------------------------------------------------------- */
-	/*                            company:searchByDomain                          */
-	/* -------------------------------------------------------------------------- */
-	{
-		displayName: 'Domain',
-		name: 'domain',
-		type: 'string',
-		displayOptions: {
-			show: {
-				resource: ['company'],
-				operation: ['searchByDomain'],
-			},
-		},
-		required: true,
-		default: '',
-	},
-	{
-		displayName: 'Return All',
-		name: 'returnAll',
-		type: 'boolean',
-		displayOptions: {
-			show: {
-				resource: ['company'],
-				operation: ['searchByDomain'],
-			},
-		},
-		default: false,
-		description: 'Whether to return all results or only up to a given limit',
-	},
-	{
-		displayName: 'Limit',
-		name: 'limit',
-		type: 'number',
-		displayOptions: {
-			show: {
-				resource: ['company'],
-				operation: ['searchByDomain'],
-				returnAll: [false],
-			},
-		},
-		typeOptions: {
-			minValue: 1,
-			maxValue: 250,
-		},
-		default: 100,
-		description: 'Max number of results to return',
-	},
-	{
-		displayName: 'Options',
-		name: 'options',
-		type: 'collection',
-		placeholder: 'Add Field',
-		default: {},
-		displayOptions: {
-			show: {
-				resource: ['company'],
-				operation: ['searchByDomain'],
-			},
-		},
-		options: [
-			{
-				displayName: 'Property Names or IDs',
-				name: 'properties',
-				type: 'multiOptions',
-				typeOptions: {
-					loadOptionsMethod: 'getCompanyProperties',
-				},
-				default: [],
-				description:
-					'<p>Used to include specific company properties in the results. By default, the results will only include company ID and will not include the values for any properties for your company.</p><p>Including this parameter will include the data for the specified property in the results. You can include this parameter multiple times to request multiple properties separated by a comma: <code>,</code>.</p>. Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
-			},
-		],
-	},
-];
diff --git a/packages/nodes-base/nodes/Hubspot/DealDescription.ts b/packages/nodes-base/nodes/Hubspot/DealDescription.ts
deleted file mode 100644
index 78e006452cbcd..0000000000000
--- a/packages/nodes-base/nodes/Hubspot/DealDescription.ts
+++ /dev/null
@@ -1,743 +0,0 @@
-import type { INodeProperties } from 'n8n-workflow';
-
-export const dealOperations: INodeProperties[] = [
-	{
-		displayName: 'Operation',
-		name: 'operation',
-		type: 'options',
-		noDataExpression: true,
-		displayOptions: {
-			show: {
-				resource: ['deal'],
-			},
-		},
-		options: [
-			{
-				name: 'Create',
-				value: 'create',
-				description: 'Create a deal',
-				action: 'Create a deal',
-			},
-			{
-				name: 'Delete',
-				value: 'delete',
-				description: 'Delete a deal',
-				action: 'Delete a deal',
-			},
-			{
-				name: 'Get',
-				value: 'get',
-				description: 'Get a deal',
-				action: 'Get a deal',
-			},
-			{
-				name: 'Get Many',
-				value: 'getAll',
-				description: 'Get many deals',
-				action: 'Get many deals',
-			},
-			{
-				name: 'Get Recently Created',
-				value: 'getRecentlyCreated',
-				description: 'Get recently created deals',
-				action: 'Get recently created deals',
-			},
-			{
-				name: 'Get Recently Modified',
-				value: 'getRecentlyModified',
-				description: 'Get recently modified deals',
-				action: 'Get recently modified deals',
-			},
-			{
-				name: 'Search',
-				value: 'search',
-				description: 'Search deals',
-				action: 'Search for deals',
-			},
-			{
-				name: 'Update',
-				value: 'update',
-				description: 'Update a deal',
-				action: 'Update a deal',
-			},
-		],
-		default: 'create',
-	},
-];
-
-export const dealFields: INodeProperties[] = [
-	/* -------------------------------------------------------------------------- */
-	/*                                deal:create                                 */
-	/* -------------------------------------------------------------------------- */
-	{
-		displayName: 'Deal Stage Name or ID',
-		name: 'stage',
-		type: 'options',
-		required: true,
-		typeOptions: {
-			loadOptionsMethod: 'getDealStages',
-		},
-		displayOptions: {
-			show: {
-				resource: ['deal'],
-				operation: ['create'],
-			},
-		},
-		default: '',
-		options: [],
-		description:
-			'The dealstage is required when creating a deal. See the CRM Pipelines API for details on managing pipelines and stages. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
-	},
-	{
-		displayName: 'Additional Fields',
-		name: 'additionalFields',
-		type: 'collection',
-		placeholder: 'Add Field',
-		default: {},
-		displayOptions: {
-			show: {
-				resource: ['deal'],
-				operation: ['create'],
-			},
-		},
-		options: [
-			{
-				displayName: 'Amount',
-				name: 'amount',
-				type: 'string',
-				default: '',
-			},
-			{
-				displayName: 'Associated Company Names or IDs',
-				name: 'associatedCompany',
-				type: 'multiOptions',
-				description:
-					'Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
-				typeOptions: {
-					loadOptionsMethod: 'getCompanies',
-				},
-				default: [],
-			},
-			{
-				displayName: 'Associated Vid Names or IDs',
-				name: 'associatedVids',
-				type: 'multiOptions',
-				description:
-					'Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
-				typeOptions: {
-					loadOptionsMethod: 'getContacts',
-				},
-				default: [],
-			},
-			{
-				displayName: 'Close Date',
-				name: 'closeDate',
-				type: 'dateTime',
-				default: '',
-			},
-			{
-				displayName: 'Custom Properties',
-				name: 'customPropertiesUi',
-				placeholder: 'Add Custom Property',
-				type: 'fixedCollection',
-				typeOptions: {
-					multipleValues: true,
-				},
-				default: {},
-				options: [
-					{
-						name: 'customPropertiesValues',
-						displayName: 'Custom Property',
-						values: [
-							{
-								displayName: 'Property Name or ID',
-								name: 'property',
-								type: 'options',
-								typeOptions: {
-									loadOptionsMethod: 'getDealCustomProperties',
-								},
-								default: '',
-								description:
-									'Name of the property. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
-							},
-							{
-								displayName: 'Value',
-								name: 'value',
-								type: 'string',
-								default: '',
-								description: 'Value of the property',
-							},
-						],
-					},
-				],
-			},
-			{
-				displayName: 'Deal Description',
-				name: 'description',
-				type: 'string',
-				default: '',
-			},
-			{
-				displayName: 'Deal Name',
-				name: 'dealName',
-				type: 'string',
-				default: '',
-			},
-			{
-				displayName: 'Deal Type Name or ID',
-				name: 'dealType',
-				type: 'options',
-				description:
-					'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
-				typeOptions: {
-					loadOptionsMethod: 'getDealTypes',
-				},
-				default: '',
-			},
-			{
-				displayName: 'Pipeline',
-				name: 'pipeline',
-				type: 'string',
-				default: '',
-			},
-		],
-	},
-
-	/* -------------------------------------------------------------------------- */
-	/*                                 deal:update                                */
-	/* -------------------------------------------------------------------------- */
-	{
-		displayName: 'Deal ID',
-		name: 'dealId',
-		type: 'string',
-		required: true,
-		displayOptions: {
-			show: {
-				resource: ['deal'],
-				operation: ['update'],
-			},
-		},
-		default: '',
-		description: 'Unique identifier for a particular deal',
-	},
-	{
-		displayName: 'Update Fields',
-		name: 'updateFields',
-		type: 'collection',
-		placeholder: 'Add Update Field',
-		default: {},
-		displayOptions: {
-			show: {
-				resource: ['deal'],
-				operation: ['update'],
-			},
-		},
-		options: [
-			{
-				displayName: 'Amount',
-				name: 'amount',
-				type: 'string',
-				default: '',
-			},
-			{
-				displayName: 'Close Date',
-				name: 'closeDate',
-				type: 'dateTime',
-				default: '',
-			},
-			{
-				displayName: 'Custom Properties',
-				name: 'customPropertiesUi',
-				placeholder: 'Add Custom Property',
-				type: 'fixedCollection',
-				typeOptions: {
-					multipleValues: true,
-				},
-				default: {},
-				options: [
-					{
-						name: 'customPropertiesValues',
-						displayName: 'Custom Property',
-						values: [
-							{
-								displayName: 'Property Name or ID',
-								name: 'property',
-								type: 'options',
-								typeOptions: {
-									loadOptionsMethod: 'getDealCustomProperties',
-								},
-								default: '',
-								description:
-									'Name of the property. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
-							},
-							{
-								displayName: 'Value',
-								name: 'value',
-								type: 'string',
-								default: '',
-								description: 'Value of the property',
-							},
-						],
-					},
-				],
-			},
-			{
-				displayName: 'Deal Description',
-				name: 'description',
-				type: 'string',
-				default: '',
-			},
-			{
-				displayName: 'Deal Name',
-				name: 'dealName',
-				type: 'string',
-				default: '',
-			},
-			{
-				displayName: 'Deal Stage Name or ID',
-				name: 'stage',
-				type: 'options',
-				typeOptions: {
-					loadOptionsMethod: 'getDealStages',
-				},
-				default: '',
-				description:
-					'The dealstage is required when creating a deal. See the CRM Pipelines API for details on managing pipelines and stages. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
-			},
-			{
-				displayName: 'Deal Type Name or ID',
-				name: 'dealType',
-				type: 'options',
-				description:
-					'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
-				typeOptions: {
-					loadOptionsMethod: 'getDealTypes',
-				},
-				default: '',
-			},
-			{
-				displayName: 'Pipeline',
-				name: 'pipeline',
-				type: 'string',
-				default: '',
-			},
-		],
-	},
-
-	/* -------------------------------------------------------------------------- */
-	/*                                  deal:get                                  */
-	/* -------------------------------------------------------------------------- */
-	{
-		displayName: 'Deal ID',
-		name: 'dealId',
-		type: 'string',
-		required: true,
-		displayOptions: {
-			show: {
-				resource: ['deal'],
-				operation: ['get'],
-			},
-		},
-		default: '',
-		description: 'Unique identifier for a particular deal',
-	},
-	{
-		displayName: 'Additional Fields',
-		name: 'additionalFields',
-		type: 'collection',
-		placeholder: 'Add Field',
-		default: {},
-		displayOptions: {
-			show: {
-				resource: ['deal'],
-				operation: ['get'],
-			},
-		},
-		options: [
-			{
-				displayName: 'Include Property Versions',
-				name: 'includePropertyVersions',
-				type: 'boolean',
-				default: false,
-				// eslint-disable-next-line n8n-nodes-base/node-param-description-boolean-without-whether
-				description:
-					'By default, you will only get data for the most recent version of a property in the "versions" data. If you include this parameter, you will get data for all previous versions.',
-			},
-		],
-	},
-
-	/* -------------------------------------------------------------------------- */
-	/*                                 deal:getAll                                */
-	/* -------------------------------------------------------------------------- */
-	{
-		displayName: 'Return All',
-		name: 'returnAll',
-		type: 'boolean',
-		displayOptions: {
-			show: {
-				resource: ['deal'],
-				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: ['deal'],
-				operation: ['getAll'],
-				returnAll: [false],
-			},
-		},
-		typeOptions: {
-			minValue: 1,
-			maxValue: 250,
-		},
-		default: 100,
-		description: 'Max number of results to return',
-	},
-	{
-		displayName: 'Filters',
-		name: 'filters',
-		type: 'collection',
-		placeholder: 'Add Filter',
-		default: {},
-		displayOptions: {
-			show: {
-				resource: ['deal'],
-				operation: ['getAll'],
-			},
-		},
-		options: [
-			{
-				displayName: 'Include Associations',
-				name: 'includeAssociations',
-				type: 'boolean',
-				default: false,
-				description:
-					'Whether to include the IDs of the associated contacts and companies in the results. This will also automatically include the num_associated_contacts property.',
-			},
-			{
-				displayName: 'Property Names or IDs',
-				name: 'properties',
-				type: 'multiOptions',
-				typeOptions: {
-					loadOptionsMethod: 'getDealProperties',
-				},
-				default: [],
-				description:
-					'<p>Used to include specific deal properties in the results. By default, the results will only include Deal ID and will not include the values for any properties for your Deals.</p><p>Including this parameter will include the data for the specified property in the results. You can include this parameter multiple times to request multiple properties separated by a comma: <code>,</code>.</p>. Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
-			},
-			{
-				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-multi-options
-				displayName: 'Properties with History',
-				name: 'propertiesWithHistory',
-				type: 'multiOptions',
-				typeOptions: {
-					loadOptionsMethod: 'getDealProperties',
-				},
-				default: [],
-				description:
-					'Works similarly to properties=, but this parameter will include the history for the specified property, instead of just including the current value. Use this parameter when you need the full history of changes to a property\'s value. Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
-			},
-		],
-	},
-
-	/* -------------------------------------------------------------------------- */
-	/*                                 deal:delete                                */
-	/* -------------------------------------------------------------------------- */
-	{
-		displayName: 'Deal ID',
-		name: 'dealId',
-		type: 'string',
-		required: true,
-		displayOptions: {
-			show: {
-				resource: ['deal'],
-				operation: ['delete'],
-			},
-		},
-		default: '',
-		description: 'Unique identifier for a particular deal',
-	},
-
-	/* -------------------------------------------------------------------------- */
-	/*               deal:getRecentlyCreated deal:getRecentlyModified             */
-	/* -------------------------------------------------------------------------- */
-	{
-		displayName: 'Return All',
-		name: 'returnAll',
-		type: 'boolean',
-		displayOptions: {
-			show: {
-				resource: ['deal'],
-				operation: ['getRecentlyCreated', 'getRecentlyModified'],
-			},
-		},
-		default: false,
-		description: 'Whether to return all results or only up to a given limit',
-	},
-	{
-		displayName: 'Limit',
-		name: 'limit',
-		type: 'number',
-		displayOptions: {
-			show: {
-				resource: ['deal'],
-				operation: ['getRecentlyCreated', 'getRecentlyModified'],
-				returnAll: [false],
-			},
-		},
-		typeOptions: {
-			minValue: 1,
-			maxValue: 250,
-		},
-		default: 100,
-		description: 'Max number of results to return',
-	},
-	{
-		displayName: 'Filters',
-		name: 'filters',
-		type: 'collection',
-		placeholder: 'Add Filter',
-		default: {},
-		displayOptions: {
-			show: {
-				resource: ['deal'],
-				operation: ['getRecentlyCreated', 'getRecentlyModified'],
-			},
-		},
-		options: [
-			{
-				displayName: 'Since',
-				name: 'since',
-				type: 'dateTime',
-				default: '',
-				description: 'Only return deals created after timestamp x',
-			},
-			{
-				displayName: 'Include Property Versions',
-				name: 'includePropertyVersions',
-				type: 'boolean',
-				default: false,
-				// eslint-disable-next-line n8n-nodes-base/node-param-description-boolean-without-whether
-				description:
-					'By default, you will only get data for the most recent version of a property in the "versions" data. If you include this parameter, you will get data for all previous versions.',
-			},
-		],
-	},
-
-	/*--------------------------------------------------------------------------- */
-	/*                                 deal:search                                */
-	/* -------------------------------------------------------------------------- */
-	{
-		displayName: 'Return All',
-		name: 'returnAll',
-		type: 'boolean',
-		displayOptions: {
-			show: {
-				resource: ['deal'],
-				operation: ['search'],
-			},
-		},
-		default: false,
-		description: 'Whether to return all results or only up to a given limit',
-	},
-	{
-		displayName: 'Limit',
-		name: 'limit',
-		type: 'number',
-		displayOptions: {
-			show: {
-				resource: ['deal'],
-				operation: ['search'],
-				returnAll: [false],
-			},
-		},
-		typeOptions: {
-			minValue: 1,
-			maxValue: 250,
-		},
-		default: 100,
-		description: 'Max number of results to return',
-	},
-	{
-		displayName: 'Filter Groups',
-		name: 'filterGroupsUi',
-		type: 'fixedCollection',
-		default: {},
-		placeholder: 'Add Filter Group',
-		typeOptions: {
-			multipleValues: true,
-		},
-		displayOptions: {
-			show: {
-				resource: ['deal'],
-				operation: ['search'],
-			},
-		},
-		options: [
-			{
-				name: 'filterGroupsValues',
-				displayName: 'Filter Group',
-				values: [
-					{
-						displayName: 'Filters',
-						name: 'filtersUi',
-						type: 'fixedCollection',
-						default: {},
-						placeholder: 'Add Filter',
-						typeOptions: {
-							multipleValues: true,
-						},
-						options: [
-							{
-								name: 'filterValues',
-								displayName: 'Filter',
-								values: [
-									{
-										displayName: 'Property Name or ID',
-										name: 'propertyName',
-										type: 'options',
-										description:
-											'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
-										typeOptions: {
-											loadOptionsMethod: 'getDealProperties',
-										},
-										default: '',
-									},
-									{
-										displayName: 'Operator',
-										name: 'operator',
-										type: 'options',
-										options: [
-											{
-												name: 'Contains Exactly',
-												value: 'CONTAINS_TOKEN',
-											},
-											{
-												name: 'Equal',
-												value: 'EQ',
-											},
-											{
-												name: 'Greater Than',
-												value: 'GT',
-											},
-											{
-												name: 'Greater Than Or Equal',
-												value: 'GTE',
-											},
-											{
-												name: 'Is Known',
-												value: 'HAS_PROPERTY',
-											},
-											{
-												name: 'Is Unknown',
-												value: 'NOT_HAS_PROPERTY',
-											},
-											{
-												name: 'Less Than',
-												value: 'LT',
-											},
-											{
-												name: 'Less Than Or Equal',
-												value: 'LTE',
-											},
-											{
-												name: 'Not Equal',
-												value: 'NEQ',
-											},
-										],
-										default: 'EQ',
-									},
-									{
-										displayName: 'Value',
-										name: 'value',
-										displayOptions: {
-											hide: {
-												operator: ['HAS_PROPERTY', 'NOT_HAS_PROPERTY'],
-											},
-										},
-										type: 'string',
-										default: '',
-									},
-								],
-							},
-						],
-						description:
-							'Use filters to limit the results to only CRM objects with matching property values. More info <a href="https://developers.hubspot.com/docs/api/crm/search">here</a>.',
-					},
-				],
-			},
-		],
-		description:
-			'When multiple filters are provided within a filterGroup, they will be combined using a logical AND operator. When multiple filterGroups are provided, they will be combined using a logical OR operator. The system supports a maximum of three filterGroups with up to three filters each. More info <a href="https://developers.hubspot.com/docs/api/crm/search">here</a>',
-	},
-	{
-		displayName: 'Additional Fields',
-		name: 'additionalFields',
-		type: 'collection',
-		placeholder: 'Add Field',
-		default: {},
-		displayOptions: {
-			show: {
-				resource: ['deal'],
-				operation: ['search'],
-			},
-		},
-		options: [
-			{
-				displayName: 'Direction',
-				name: 'direction',
-				type: 'options',
-				options: [
-					{
-						name: 'ASC',
-						value: 'ASCENDING',
-					},
-					{
-						name: 'DESC',
-						value: 'DESCENDING',
-					},
-				],
-				default: 'DESCENDING',
-				description:
-					'Defines the direction in which search results are ordered. Default value is DESC.',
-			},
-			{
-				displayName: 'Field Names or IDs',
-				name: 'properties',
-				type: 'multiOptions',
-				typeOptions: {
-					loadOptionsMethod: 'getDealProperties',
-				},
-				default: [],
-				description:
-					'<p>Used to include specific deal properties in the results. By default, the results will only include Deal ID and will not include the values for any properties for your company.</p><p>Including this parameter will include the data for the specified property in the results. You can include this parameter multiple times to request multiple properties separated by a comma: <code>,</code>.</p>. Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
-			},
-			{
-				displayName: 'Query',
-				name: 'query',
-				type: 'string',
-				default: '',
-				description: 'Perform a text search against all property values for an object type',
-			},
-			{
-				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-options
-				displayName: 'Sort By',
-				name: 'sortBy',
-				type: 'options',
-				description:
-					'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
-				typeOptions: {
-					loadOptionsMethod: 'getDealProperties',
-				},
-				default: 'createdate',
-			},
-		],
-	},
-];
diff --git a/packages/nodes-base/nodes/Hubspot/GenericFunctions.ts b/packages/nodes-base/nodes/Hubspot/GenericFunctions.ts
deleted file mode 100644
index be7d8040f5dca..0000000000000
--- a/packages/nodes-base/nodes/Hubspot/GenericFunctions.ts
+++ /dev/null
@@ -1,2009 +0,0 @@
-import type { OptionsWithUri } from 'request';
-
-import type {
-	ICredentialDataDecryptedObject,
-	ICredentialTestFunctions,
-	IDataObject,
-	IExecuteFunctions,
-	IExecuteSingleFunctions,
-	IHookFunctions,
-	ILoadOptionsFunctions,
-	JsonObject,
-} from 'n8n-workflow';
-import { NodeApiError } from 'n8n-workflow';
-
-import moment from 'moment';
-
-export async function hubspotApiRequest(
-	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
-	endpoint: string,
-
-	body: any = {},
-	query: IDataObject = {},
-	uri?: string,
-): Promise<any> {
-	let authenticationMethod = this.getNodeParameter('authentication', 0);
-
-	if (this.getNode().type.includes('Trigger')) {
-		authenticationMethod = 'developerApi';
-	}
-
-	const options: OptionsWithUri = {
-		method,
-		qs: query,
-		headers: {},
-		uri: uri || `https://api.hubapi.com${endpoint}`,
-		body,
-		json: true,
-		useQuerystring: true,
-	};
-
-	try {
-		if (authenticationMethod === 'apiKey' || authenticationMethod === 'appToken') {
-			const credentialType = authenticationMethod === 'apiKey' ? 'hubspotApi' : 'hubspotAppToken';
-			return await this.helpers.requestWithAuthentication.call(this, credentialType, options);
-		} else if (authenticationMethod === 'developerApi') {
-			if (endpoint.includes('webhooks')) {
-				const credentials = await this.getCredentials('hubspotDeveloperApi');
-				options.qs.hapikey = credentials.apiKey as string;
-				return await this.helpers.request(options);
-			} else {
-				return await this.helpers.requestOAuth2.call(this, 'hubspotDeveloperApi', options, {
-					tokenType: 'Bearer',
-					includeCredentialsOnRefreshOnBody: true,
-				});
-			}
-		} else {
-			return await this.helpers.requestOAuth2.call(this, 'hubspotOAuth2Api', options, {
-				tokenType: 'Bearer',
-				includeCredentialsOnRefreshOnBody: true,
-			});
-		}
-	} catch (error) {
-		throw new NodeApiError(this.getNode(), error as JsonObject);
-	}
-}
-
-/**
- * Make an API request to paginated hubspot endpoint
- * and return all results
- */
-export async function hubspotApiRequestAllItems(
-	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
-	propertyName: string,
-	method: string,
-	endpoint: string,
-
-	body: any = {},
-	query: IDataObject = {},
-): Promise<any> {
-	const returnData: IDataObject[] = [];
-
-	let responseData;
-
-	query.limit = query.limit || 250;
-	query.count = 100;
-	body.limit = body.limit || 100;
-
-	do {
-		responseData = await hubspotApiRequest.call(this, method, endpoint, body, query);
-		query.offset = responseData.offset;
-		query.vidOffset = responseData['vid-offset'];
-		//Used by Search endpoints
-		if (responseData.paging) {
-			body.after = responseData.paging.next.after;
-		}
-		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
-		//ticket:getAll endpoint does not support setting a limit, so return once the limit is reached
-		const limit = query.limit as number | undefined;
-		if (limit && limit <= returnData.length && endpoint.includes('/tickets/paged')) {
-			return returnData;
-		}
-	} while (responseData.hasMore || responseData['has-more'] || responseData.paging);
-	return returnData;
-}
-
-export function validateJSON(json: string | undefined): any {
-	let result;
-	try {
-		result = JSON.parse(json!);
-	} catch (exception) {
-		result = '';
-	}
-	return result;
-}
-
-export function clean(obj: any) {
-	for (const propName in obj) {
-		if (obj[propName] === null || obj[propName] === undefined || obj[propName] === '') {
-			delete obj[propName];
-		}
-	}
-	return obj;
-}
-
-export const propertyEvents = [
-	'contact.propertyChange',
-	'company.propertyChange',
-	'deal.propertyChange',
-];
-
-export const contactFields = [
-	{
-		id: 'company_size',
-		label: 'testingricardo',
-	},
-	{
-		id: 'date',
-		label: 'Date',
-	},
-	{
-		id: 'date_of_birth',
-		label: 'Date of birth',
-	},
-	{
-		id: 'days_to_close',
-		label: 'Days To Close',
-	},
-	{
-		id: 'degree',
-		label: 'Degree',
-	},
-	{
-		id: 'field_of_study',
-		label: 'Field of study',
-	},
-	{
-		id: 'first_conversion_date',
-		label: 'First Conversion Date',
-	},
-	{
-		id: 'first_conversion_event_name',
-		label: 'First Conversion',
-	},
-	{
-		id: 'first_deal_created_date',
-		label: 'First Deal Created Date',
-	},
-	{
-		id: 'gender',
-		label: 'Gender',
-	},
-	{
-		id: 'graduation_date',
-		label: 'Graduation date',
-	},
-	{
-		id: 'hs_additional_emails',
-		label: 'Additional email addresses',
-	},
-	{
-		id: 'hs_all_contact_vids',
-		label: 'All vids for a contact',
-	},
-	{
-		id: 'hs_analytics_first_touch_converting_campaign',
-		label: 'First Touch Converting Campaign',
-	},
-	{
-		id: 'hs_analytics_last_touch_converting_campaign',
-		label: 'Last Touch Converting Campaign',
-	},
-	{
-		id: 'hs_avatar_filemanager_key',
-		label: 'Avatar FileManager key',
-	},
-	{
-		id: 'hs_buying_role',
-		label: 'Buying Role',
-	},
-	{
-		id: 'hs_calculated_form_submissions',
-		label: 'All form submissions for a contact',
-	},
-	{
-		id: 'hs_calculated_merged_vids',
-		label: 'Merged vids with timestamps of a contact',
-	},
-	{
-		id: 'hs_calculated_mobile_number',
-		label: 'Calculated Mobile Number in International Format',
-	},
-	{
-		id: 'hs_calculated_phone_number',
-		label: 'Calculated Phone Number in International Format',
-	},
-	{
-		id: 'hs_calculated_phone_number_area_code',
-		label: 'Calculated Phone Number Area Code',
-	},
-	{
-		id: 'hs_calculated_phone_number_country_code',
-		label: 'Calculated Phone Number Country Code',
-	},
-	{
-		id: 'hs_calculated_phone_number_region_code',
-		label: 'Calculated Phone Number Region',
-	},
-	{
-		id: 'hs_content_membership_email_confirmed',
-		label: 'Email Confirmed',
-	},
-	{
-		id: 'hs_content_membership_notes',
-		label: 'Membership Notes',
-	},
-	{
-		id: 'hs_content_membership_registered_at',
-		label: 'Registered At',
-	},
-	{
-		id: 'hs_content_membership_registration_domain_sent_to',
-		label: 'Domain to which registration email was sent',
-	},
-	{
-		id: 'hs_content_membership_registration_email_sent_at',
-		label: 'Time registration email was sent',
-	},
-	{
-		id: 'hs_content_membership_status',
-		label: 'Status',
-	},
-	{
-		id: 'hs_conversations_visitor_email',
-		label: 'Conversations visitor email',
-	},
-	{
-		id: 'hs_count_is_unworked',
-		label: 'Count of unengaged contacts',
-	},
-	{
-		id: 'hs_count_is_worked',
-		label: 'Count of engaged contacts',
-	},
-	{
-		id: 'hs_created_by_conversations',
-		label: 'Created By Conversations',
-	},
-	{
-		id: 'hs_created_by_user_id',
-		label: 'Created by user ID',
-	},
-	{
-		id: 'hs_createdate',
-		label: 'Object create date/time',
-	},
-	{
-		id: 'hs_document_last_revisited',
-		label: 'Recent Document Revisit Date',
-	},
-	{
-		id: 'hs_email_bad_address',
-		label: 'Invalid email address',
-	},
-	{
-		id: 'hs_email_customer_quarantined_reason',
-		label: 'Email address quarantine reason',
-	},
-	{
-		id: 'hs_email_domain',
-		label: 'Email Domain',
-	},
-	{
-		id: 'hs_email_hard_bounce_reason',
-		label: 'Email hard bounce reason',
-	},
-	{
-		id: 'hs_email_hard_bounce_reason_enum',
-		label: 'Email hard bounce reason',
-	},
-	{
-		id: 'hs_email_quarantined',
-		label: 'Email Address Quarantined',
-	},
-	{
-		id: 'hs_email_quarantined_reason',
-		label: 'Email address internal quarantine reason',
-	},
-	{
-		id: 'hs_email_recipient_fatigue_recovery_time',
-		label: 'Email Address Recipient Fatigue Next Available Sending Time',
-	},
-	{
-		id: 'hs_email_sends_since_last_engagement',
-		label: 'Sends Since Last Engagement',
-	},
-	{
-		id: 'hs_emailconfirmationstatus',
-		label: 'Marketing email confirmation status',
-	},
-	{
-		id: 'hs_facebook_ad_clicked',
-		label: 'Clicked Facebook ad',
-	},
-	{
-		id: 'hs_facebook_click_id',
-		label: 'Facebook click id',
-	},
-	{
-		id: 'hs_facebookid',
-		label: 'Facebook ID',
-	},
-	{
-		id: 'hs_feedback_last_nps_follow_up',
-		label: 'Last NPS survey comment',
-	},
-	{
-		id: 'hs_feedback_last_nps_rating',
-		label: 'Last NPS survey rating',
-	},
-	{
-		id: 'hs_feedback_last_survey_date',
-		label: 'Last NPS survey date',
-	},
-	{
-		id: 'hs_feedback_show_nps_web_survey',
-		label: 'Should be shown an NPS web survey',
-	},
-	{
-		id: 'hs_first_engagement_object_id',
-		label: 'ID of first engagement',
-	},
-	{
-		id: 'hs_google_click_id',
-		label: 'Google ad click id',
-	},
-	{
-		id: 'hs_googleplusid',
-		label: 'googleplus ID',
-	},
-	{
-		id: 'hs_ip_timezone',
-		label: 'IP Timezone',
-	},
-	{
-		id: 'hs_is_contact',
-		label: 'Is a contact',
-	},
-	{
-		id: 'hs_is_unworked',
-		label: 'Contact unworked',
-	},
-	{
-		id: 'hs_last_sales_activity_date',
-		label: 'last sales activity date old',
-	},
-	{
-		id: 'hs_last_sales_activity_timestamp',
-		label: 'Last Engagement Date',
-	},
-	{
-		id: 'hs_lastmodifieddate',
-		label: 'Object last modified date/time',
-	},
-	{
-		id: 'hs_lead_status',
-		label: 'Lead Status',
-	},
-	{
-		id: 'hs_legal_basis',
-		label: "Legal basis for processing contact's data",
-	},
-	{
-		id: 'hs_linkedinid',
-		label: 'Linkedin ID',
-	},
-	{
-		id: 'hs_marketable_reason_id',
-		label: 'Marketing contact status source name',
-	},
-	{
-		id: 'hs_marketable_reason_type',
-		label: 'Marketing contact status source type',
-	},
-	{
-		id: 'hs_marketable_status',
-		label: 'Marketing contact status',
-	},
-	{
-		id: 'hs_marketable_until_renewal',
-		label: 'Marketing contact until next update',
-	},
-	{
-		id: 'hs_merged_object_ids',
-		label: 'Merged object IDs',
-	},
-	{
-		id: 'hs_object_id',
-		label: 'Contact ID',
-	},
-	{
-		id: 'hs_predictivecontactscore_v2',
-		label: 'Likelihood to close',
-	},
-	{
-		id: 'hs_predictivescoringtier',
-		label: 'Contact priority',
-	},
-	{
-		id: 'hs_sa_first_engagement_date',
-		label: 'Date of first engagement',
-	},
-	{
-		id: 'hs_sa_first_engagement_descr',
-		label: 'Description of first engagement',
-	},
-	{
-		id: 'hs_sa_first_engagement_object_type',
-		label: 'Type of first engagement',
-	},
-	{
-		id: 'hs_sales_email_last_clicked',
-		label: 'Recent Sales Email Clicked Date',
-	},
-	{
-		id: 'hs_sales_email_last_opened',
-		label: 'Recent Sales Email Opened Date',
-	},
-	{
-		id: 'hs_searchable_calculated_international_mobile_number',
-		label: 'Calculated Mobile Number with country code',
-	},
-	{
-		id: 'hs_searchable_calculated_international_phone_number',
-		label: 'Calculated Phone Number with country code',
-	},
-	{
-		id: 'hs_searchable_calculated_mobile_number',
-		label: 'Calculated Mobile Number without country code',
-	},
-	{
-		id: 'hs_searchable_calculated_phone_number',
-		label: 'Calculated Phone Number without country code',
-	},
-	{
-		id: 'hs_sequences_is_enrolled',
-		label: 'Currently in Sequence',
-	},
-	{
-		id: 'hs_testpurge',
-		label: 'testpurge',
-	},
-	{
-		id: 'hs_testrollback',
-		label: 'testrollback',
-	},
-	{
-		id: 'hs_time_between_contact_creation_and_deal_close',
-		label: 'Time between contact creation and deal close',
-	},
-	{
-		id: 'hs_time_between_contact_creation_and_deal_creation',
-		label: 'Time between contact creation and deal creation',
-	},
-	{
-		id: 'hs_time_to_first_engagement',
-		label: 'Lead response time',
-	},
-	{
-		id: 'hs_time_to_move_from_lead_to_customer',
-		label: 'Time to move from lead to customer',
-	},
-	{
-		id: 'hs_time_to_move_from_marketingqualifiedlead_to_customer',
-		label: 'Time to move from marketing qualified lead to customer',
-	},
-	{
-		id: 'hs_time_to_move_from_opportunity_to_customer',
-		label: 'Time to move from opportunity to customer',
-	},
-	{
-		id: 'hs_time_to_move_from_salesqualifiedlead_to_customer',
-		label: 'Time to move from sales qualified lead to customer',
-	},
-	{
-		id: 'hs_time_to_move_from_subscriber_to_customer',
-		label: 'Time to move from subscriber to customer',
-	},
-	{
-		id: 'hs_twitterid',
-		label: 'Twitter ID',
-	},
-	{
-		id: 'hs_updated_by_user_id',
-		label: 'Updated by user ID',
-	},
-	{
-		id: 'hs_user_ids_of_all_owners',
-		label: 'User IDs of all owners',
-	},
-	{
-		id: 'hubspot_owner_assigneddate',
-		label: 'Owner Assigned Date',
-	},
-	{
-		id: 'ip_city',
-		label: 'IP City',
-	},
-	{
-		id: 'ip_country',
-		label: 'IP Country',
-	},
-	{
-		id: 'ip_country_code',
-		label: 'IP Country Code',
-	},
-	{
-		id: 'ip_latlon',
-		label: 'IP Latitude & Longitude',
-	},
-	{
-		id: 'ip_state',
-		label: 'IP State/Region',
-	},
-	{
-		id: 'ip_state_code',
-		label: 'IP State Code/Region Code',
-	},
-	{
-		id: 'ip_zipcode',
-		label: 'IP Zipcode',
-	},
-	{
-		id: 'job_function',
-		label: 'Job function',
-	},
-	{
-		id: 'lastmodifieddate',
-		label: 'Last Modified Date',
-	},
-	{
-		id: 'marital_status',
-		label: 'Marital Status',
-	},
-	{
-		id: 'military_status',
-		label: 'Military status',
-	},
-	{
-		id: 'num_associated_deals',
-		label: 'Associated Deals',
-	},
-	{
-		id: 'num_conversion_events',
-		label: 'Number of Form Submissions',
-	},
-	{
-		id: 'num_unique_conversion_events',
-		label: 'Number of Unique Forms Submitted',
-	},
-	{
-		id: 'recent_conversion_date',
-		label: 'Recent Conversion Date',
-	},
-	{
-		id: 'recent_conversion_event_name',
-		label: 'Recent Conversion',
-	},
-	{
-		id: 'recent_deal_amount',
-		label: 'Recent Deal Amount',
-	},
-	{
-		id: 'recent_deal_close_date',
-		label: 'Recent Deal Close Date',
-	},
-	{
-		id: 'relationship_status',
-		label: 'Relationship Status',
-	},
-	{
-		id: 'school',
-		label: 'School',
-	},
-	{
-		id: 'seniority',
-		label: 'Seniority',
-	},
-	{
-		id: 'start_date',
-		label: 'Start date',
-	},
-	{
-		id: 'testing',
-		label: 'testing',
-	},
-	{
-		id: 'total_revenue',
-		label: 'Total Revenue',
-	},
-	{
-		id: 'work_email',
-		label: 'Work email',
-	},
-	{
-		id: 'firstname',
-		label: 'First Name',
-	},
-	{
-		id: 'hs_analytics_first_url',
-		label: 'First Page Seen',
-	},
-	{
-		id: 'hs_email_delivered',
-		label: 'Marketing emails delivered',
-	},
-	{
-		id: 'hs_email_optout_6871816',
-		label: 'Opted out of email: Marketing Information',
-	},
-	{
-		id: 'hs_email_optout_8363428',
-		label: 'Opted out of email: One to One',
-	},
-	{
-		id: 'twitterhandle',
-		label: 'Twitter Username',
-	},
-	{
-		id: 'currentlyinworkflow',
-		label: 'Currently in workflow',
-	},
-	{
-		id: 'followercount',
-		label: 'Follower Count',
-	},
-	{
-		id: 'hs_analytics_last_url',
-		label: 'Last Page Seen',
-	},
-	{
-		id: 'hs_email_open',
-		label: 'Marketing emails opened',
-	},
-	{
-		id: 'lastname',
-		label: 'Last Name',
-	},
-	{
-		id: 'hs_analytics_num_page_views',
-		label: 'Number of Pageviews',
-	},
-	{
-		id: 'hs_email_click',
-		label: 'Marketing emails clicked',
-	},
-	{
-		id: 'salutation',
-		label: 'Salutation',
-	},
-	{
-		id: 'twitterprofilephoto',
-		label: 'Twitter Profile Photo',
-	},
-	{
-		id: 'email',
-		label: 'Email',
-	},
-	{
-		id: 'hs_analytics_num_visits',
-		label: 'Number of Sessions',
-	},
-	{
-		id: 'hs_email_bounce',
-		label: 'Marketing emails bounced',
-	},
-	{
-		id: 'hs_persona',
-		label: 'Persona',
-	},
-	{
-		id: 'hs_social_last_engagement',
-		label: 'Most Recent Social Click',
-	},
-	{
-		id: 'hs_analytics_num_event_completions',
-		label: 'Number of event completions',
-	},
-	{
-		id: 'hs_email_optout',
-		label: 'Unsubscribed from all email',
-	},
-	{
-		id: 'hs_social_twitter_clicks',
-		label: 'Twitter Clicks',
-	},
-	{
-		id: 'mobilephone',
-		label: 'Mobile Phone Number',
-	},
-	{
-		id: 'phone',
-		label: 'Phone Number',
-	},
-	{
-		id: 'fax',
-		label: 'Fax Number',
-	},
-	{
-		id: 'hs_analytics_first_timestamp',
-		label: 'Time First Seen',
-	},
-	{
-		id: 'hs_email_last_email_name',
-		label: 'Last marketing email name',
-	},
-	{
-		id: 'hs_email_last_send_date',
-		label: 'Last marketing email send date',
-	},
-	{
-		id: 'hs_social_facebook_clicks',
-		label: 'Facebook Clicks',
-	},
-	{
-		id: 'address',
-		label: 'Street Address',
-	},
-	{
-		id: 'engagements_last_meeting_booked',
-		label: 'Date of last meeting booked in meetings tool',
-	},
-	{
-		id: 'engagements_last_meeting_booked_campaign',
-		label: 'Campaign of last booking in meetings tool',
-	},
-	{
-		id: 'engagements_last_meeting_booked_medium',
-		label: 'Medium of last booking in meetings tool',
-	},
-	{
-		id: 'engagements_last_meeting_booked_source',
-		label: 'Source of last booking in meetings tool',
-	},
-	{
-		id: 'hs_analytics_first_visit_timestamp',
-		label: 'Time of First Session',
-	},
-	{
-		id: 'hs_email_last_open_date',
-		label: 'Last marketing email open date',
-	},
-	{
-		id: 'hs_latest_meeting_activity',
-		label: 'Latest meeting activity',
-	},
-	{
-		id: 'hs_sales_email_last_replied',
-		label: 'Recent Sales Email Replied Date',
-	},
-	{
-		id: 'hs_social_linkedin_clicks',
-		label: 'LinkedIn Clicks',
-	},
-	{
-		id: 'hubspot_owner_id',
-		label: 'Contact owner',
-	},
-	{
-		id: 'notes_last_contacted',
-		label: 'Last Contacted',
-	},
-	{
-		id: 'notes_last_updated',
-		label: 'Last Activity Date',
-	},
-	{
-		id: 'notes_next_activity_date',
-		label: 'Next Activity Date',
-	},
-	{
-		id: 'num_contacted_notes',
-		label: 'Number of times contacted',
-	},
-	{
-		id: 'num_notes',
-		label: 'Number of Sales Activities',
-	},
-	{
-		id: 'owneremail',
-		label: 'HubSpot Owner Email (legacy)',
-	},
-	{
-		id: 'ownername',
-		label: 'HubSpot Owner Name (legacy)',
-	},
-	{
-		id: 'surveymonkeyeventlastupdated',
-		label: 'SurveyMonkey Event Last Updated',
-	},
-	{
-		id: 'webinareventlastupdated',
-		label: 'Webinar Event Last Updated',
-	},
-	{
-		id: 'city',
-		label: 'City',
-	},
-	{
-		id: 'hs_analytics_last_timestamp',
-		label: 'Time Last Seen',
-	},
-	{
-		id: 'hs_email_last_click_date',
-		label: 'Last marketing email click date',
-	},
-	{
-		id: 'hs_social_google_plus_clicks',
-		label: 'Google Plus Clicks',
-	},
-	{
-		id: 'hubspot_team_id',
-		label: 'HubSpot Team',
-	},
-	{
-		id: 'linkedinbio',
-		label: 'LinkedIn Bio',
-	},
-	{
-		id: 'twitterbio',
-		label: 'Twitter Bio',
-	},
-	{
-		id: 'hs_all_owner_ids',
-		label: 'All owner ids',
-	},
-	{
-		id: 'hs_analytics_last_visit_timestamp',
-		label: 'Time of Last Session',
-	},
-	{
-		id: 'hs_email_first_send_date',
-		label: 'First marketing email send date',
-	},
-	{
-		id: 'hs_social_num_broadcast_clicks',
-		label: 'Broadcast Clicks',
-	},
-	{
-		id: 'state',
-		label: 'State/Region',
-	},
-	{
-		id: 'hs_all_team_ids',
-		label: 'All team ids',
-	},
-	{
-		id: 'hs_analytics_source',
-		label: 'Original Source',
-	},
-	{
-		id: 'hs_email_first_open_date',
-		label: 'First marketing email open date',
-	},
-	{
-		id: 'zip',
-		label: 'Postal Code',
-	},
-	{
-		id: 'country',
-		label: 'Country/Region',
-	},
-	{
-		id: 'hs_all_accessible_team_ids',
-		label: 'All accessible team ids',
-	},
-	{
-		id: 'hs_analytics_source_data_1',
-		label: 'Original Source Drill-Down 1',
-	},
-	{
-		id: 'hs_email_first_click_date',
-		label: 'First marketing email click date',
-	},
-	{
-		id: 'linkedinconnections',
-		label: 'LinkedIn Connections',
-	},
-	{
-		id: 'hs_analytics_source_data_2',
-		label: 'Original Source Drill-Down 2',
-	},
-	{
-		id: 'hs_email_is_ineligible',
-		label: 'Is globally ineligible',
-	},
-	{
-		id: 'hs_language',
-		label: 'Preferred language',
-	},
-	{
-		id: 'kloutscoregeneral',
-		label: 'Klout Score',
-	},
-	{
-		id: 'hs_analytics_first_referrer',
-		label: 'First Referring Site',
-	},
-	{
-		id: 'hs_email_first_reply_date',
-		label: 'First marketing email reply date',
-	},
-	{
-		id: 'jobtitle',
-		label: 'Job Title',
-	},
-	{
-		id: 'photo',
-		label: 'Photo',
-	},
-	{
-		id: 'hs_analytics_last_referrer',
-		label: 'Last Referring Site',
-	},
-	{
-		id: 'hs_email_last_reply_date',
-		label: 'Last marketing email reply date',
-	},
-	{
-		id: 'message',
-		label: 'Message',
-	},
-	{
-		id: 'closedate',
-		label: 'Close Date',
-	},
-	{
-		id: 'hs_analytics_average_page_views',
-		label: 'Average Pageviews',
-	},
-	{
-		id: 'hs_email_replied',
-		label: 'Marketing emails replied',
-	},
-	{
-		id: 'hs_analytics_revenue',
-		label: 'Event Revenue',
-	},
-	{
-		id: 'hs_lifecyclestage_lead_date',
-		label: 'Became a Lead Date',
-	},
-	{
-		id: 'hs_lifecyclestage_marketingqualifiedlead_date',
-		label: 'Became a Marketing Qualified Lead Date',
-	},
-	{
-		id: 'hs_lifecyclestage_opportunity_date',
-		label: 'Became an Opportunity Date',
-	},
-	{
-		id: 'lifecyclestage',
-		label: 'Lifecycle Stage',
-	},
-	{
-		id: 'hs_lifecyclestage_salesqualifiedlead_date',
-		label: 'Became a Sales Qualified Lead Date',
-	},
-	{
-		id: 'createdate',
-		label: 'Create Date',
-	},
-	{
-		id: 'hs_lifecyclestage_evangelist_date',
-		label: 'Became an Evangelist Date',
-	},
-	{
-		id: 'hs_lifecyclestage_customer_date',
-		label: 'Became a Customer Date',
-	},
-	{
-		id: 'hubspotscore',
-		label: 'HubSpot Score',
-	},
-	{
-		id: 'company',
-		label: 'Company Name',
-	},
-	{
-		id: 'hs_lifecyclestage_subscriber_date',
-		label: 'Became a Subscriber Date',
-	},
-	{
-		id: 'hs_lifecyclestage_other_date',
-		label: 'Became an Other Lifecycle Date',
-	},
-	{
-		id: 'website',
-		label: 'Website URL',
-	},
-	{
-		id: 'numemployees',
-		label: 'Number of Employees',
-	},
-	{
-		id: 'annualrevenue',
-		label: 'Annual Revenue',
-	},
-	{
-		id: 'industry',
-		label: 'Industry',
-	},
-	{
-		id: 'associatedcompanyid',
-		label: 'Associated Company ID',
-	},
-	{
-		id: 'associatedcompanylastupdated',
-		label: 'Associated Company Last Updated',
-	},
-	{
-		id: 'hs_predictivecontactscorebucket',
-		label: 'Lead Rating',
-	},
-	{
-		id: 'hs_predictivecontactscore',
-		label: 'Predictive Lead Score',
-	},
-];
-
-export const companyFields = [
-	{
-		id: 'about_us',
-		label: 'About Us',
-	},
-	{
-		id: 'closedate_timestamp_earliest_value_a2a17e6e',
-		label: 'closedate_timestamp_earliest_value_a2a17e6e',
-	},
-	{
-		id: 'facebookfans',
-		label: 'Facebook Fans',
-	},
-	{
-		id: 'first_contact_createdate_timestamp_earliest_value_78b50eea',
-		label: 'first_contact_createdate_timestamp_earliest_value_78b50eea',
-	},
-	{
-		id: 'first_conversion_date',
-		label: 'First Conversion Date',
-	},
-	{
-		id: 'first_conversion_date_timestamp_earliest_value_61f58f2c',
-		label: 'first_conversion_date_timestamp_earliest_value_61f58f2c',
-	},
-	{
-		id: 'first_conversion_event_name',
-		label: 'First Conversion',
-	},
-	{
-		id: 'first_conversion_event_name_timestamp_earliest_value_68ddae0a',
-		label: 'first_conversion_event_name_timestamp_earliest_value_68ddae0a',
-	},
-	{
-		id: 'first_deal_created_date',
-		label: 'First Deal Created Date',
-	},
-	{
-		id: 'founded_year',
-		label: 'Year Founded',
-	},
-	{
-		id: 'hs_additional_domains',
-		label: 'Additional Domains',
-	},
-	{
-		id: 'hs_analytics_first_timestamp',
-		label: 'Time First Seen',
-	},
-	{
-		id: 'hs_analytics_first_timestamp_timestamp_earliest_value_11e3a63a',
-		label: 'hs_analytics_first_timestamp_timestamp_earliest_value_11e3a63a',
-	},
-	{
-		id: 'hs_analytics_first_touch_converting_campaign',
-		label: 'First Touch Converting Campaign',
-	},
-	{
-		id: 'hs_analytics_first_touch_converting_campaign_timestamp_earliest_value_4757fe10',
-		label: 'hs_analytics_first_touch_converting_campaign_timestamp_earliest_value_4757fe10',
-	},
-	{
-		id: 'hs_analytics_first_visit_timestamp',
-		label: 'Time of First Session',
-	},
-	{
-		id: 'hs_analytics_first_visit_timestamp_timestamp_earliest_value_accc17ae',
-		label: 'hs_analytics_first_visit_timestamp_timestamp_earliest_value_accc17ae',
-	},
-	{
-		id: 'hs_analytics_last_timestamp',
-		label: 'Time Last Seen',
-	},
-	{
-		id: 'hs_analytics_last_timestamp_timestamp_latest_value_4e16365a',
-		label: 'hs_analytics_last_timestamp_timestamp_latest_value_4e16365a',
-	},
-	{
-		id: 'hs_analytics_last_touch_converting_campaign',
-		label: 'Last Touch Converting Campaign',
-	},
-	{
-		id: 'hs_analytics_last_touch_converting_campaign_timestamp_latest_value_81a64e30',
-		label: 'hs_analytics_last_touch_converting_campaign_timestamp_latest_value_81a64e30',
-	},
-	{
-		id: 'hs_analytics_last_visit_timestamp',
-		label: 'Time of Last Session',
-	},
-	{
-		id: 'hs_analytics_last_visit_timestamp_timestamp_latest_value_999a0fce',
-		label: 'hs_analytics_last_visit_timestamp_timestamp_latest_value_999a0fce',
-	},
-	{
-		id: 'hs_analytics_num_page_views',
-		label: 'Number of Pageviews',
-	},
-	{
-		id: 'hs_analytics_num_page_views_cardinality_sum_e46e85b0',
-		label: 'hs_analytics_num_page_views_cardinality_sum_e46e85b0',
-	},
-	{
-		id: 'hs_analytics_num_visits',
-		label: 'Number of Sessions',
-	},
-	{
-		id: 'hs_analytics_num_visits_cardinality_sum_53d952a6',
-		label: 'hs_analytics_num_visits_cardinality_sum_53d952a6',
-	},
-	{
-		id: 'hs_analytics_source',
-		label: 'Original Source Type',
-	},
-	{
-		id: 'hs_analytics_source_data_1',
-		label: 'Original Source Data 1',
-	},
-	{
-		id: 'hs_analytics_source_data_1_timestamp_earliest_value_9b2f1fa1',
-		label: 'hs_analytics_source_data_1_timestamp_earliest_value_9b2f1fa1',
-	},
-	{
-		id: 'hs_analytics_source_data_2',
-		label: 'Original Source Data 2',
-	},
-	{
-		id: 'hs_analytics_source_data_2_timestamp_earliest_value_9b2f9400',
-		label: 'hs_analytics_source_data_2_timestamp_earliest_value_9b2f9400',
-	},
-	{
-		id: 'hs_analytics_source_timestamp_earliest_value_25a3a52c',
-		label: 'hs_analytics_source_timestamp_earliest_value_25a3a52c',
-	},
-	{
-		id: 'hs_avatar_filemanager_key',
-		label: 'Avatar FileManager key',
-	},
-	{
-		id: 'hs_created_by_user_id',
-		label: 'Created by user ID',
-	},
-	{
-		id: 'hs_createdate',
-		label: 'Object create date/time',
-	},
-	{
-		id: 'hs_ideal_customer_profile',
-		label: 'Ideal Customer Profile Tier',
-	},
-	{
-		id: 'hs_is_target_account',
-		label: 'Target Account',
-	},
-	{
-		id: 'hs_last_booked_meeting_date',
-		label: 'Last Booked Meeting Date',
-	},
-	{
-		id: 'hs_last_logged_call_date',
-		label: 'Last Logged Call Date',
-	},
-	{
-		id: 'hs_last_open_task_date',
-		label: 'Last Open Task Date',
-	},
-	{
-		id: 'hs_last_sales_activity_date',
-		label: 'last sales activity date old',
-	},
-	{
-		id: 'hs_last_sales_activity_timestamp',
-		label: 'Last Engagement Date',
-	},
-	{
-		id: 'hs_lastmodifieddate',
-		label: 'Last Modified Date',
-	},
-	{
-		id: 'hs_merged_object_ids',
-		label: 'Merged object IDs',
-	},
-	{
-		id: 'hs_num_blockers',
-		label: 'Number of blockers',
-	},
-	{
-		id: 'hs_num_contacts_with_buying_roles',
-		label: 'Number of contacts with a buying role',
-	},
-	{
-		id: 'hs_num_decision_makers',
-		label: 'Number of decision makers',
-	},
-	{
-		id: 'hs_num_open_deals',
-		label: 'Number of open deals',
-	},
-	{
-		id: 'hs_object_id',
-		label: 'Company ID',
-	},
-	{
-		id: 'hs_predictivecontactscore_v2',
-		label: 'Likelihood to close',
-	},
-	{
-		id: 'hs_predictivecontactscore_v2_next_max_max_d4e58c1e',
-		label: 'hs_predictivecontactscore_v2_next_max_max_d4e58c1e',
-	},
-	{
-		id: 'hs_target_account',
-		label: 'Target Account',
-	},
-	{
-		id: 'hs_target_account_probability',
-		label: 'Target Account Probability',
-	},
-	{
-		id: 'hs_target_account_recommendation_snooze_time',
-		label: 'Target Account Recommendation Snooze Time',
-	},
-	{
-		id: 'hs_target_account_recommendation_state',
-		label: 'Target Account Recommendation State',
-	},
-	{
-		id: 'hs_total_deal_value',
-		label: 'Total open deal value',
-	},
-	{
-		id: 'hs_updated_by_user_id',
-		label: 'Updated by user ID',
-	},
-	{
-		id: 'hs_user_ids_of_all_owners',
-		label: 'User IDs of all owners',
-	},
-	{
-		id: 'hubspot_owner_assigneddate',
-		label: 'Owner Assigned Date',
-	},
-	{
-		id: 'is_public',
-		label: 'Is Public',
-	},
-	{
-		id: 'num_associated_contacts',
-		label: 'Associated Contacts',
-	},
-	{
-		id: 'num_associated_deals',
-		label: 'Associated Deals',
-	},
-	{
-		id: 'num_conversion_events',
-		label: 'Number of Form Submissions',
-	},
-	{
-		id: 'num_conversion_events_cardinality_sum_d095f14b',
-		label: 'num_conversion_events_cardinality_sum_d095f14b',
-	},
-	{
-		id: 'recent_conversion_date',
-		label: 'Recent Conversion Date',
-	},
-	{
-		id: 'recent_conversion_date_timestamp_latest_value_72856da1',
-		label: 'recent_conversion_date_timestamp_latest_value_72856da1',
-	},
-	{
-		id: 'recent_conversion_event_name',
-		label: 'Recent Conversion',
-	},
-	{
-		id: 'recent_conversion_event_name_timestamp_latest_value_66c820bf',
-		label: 'recent_conversion_event_name_timestamp_latest_value_66c820bf',
-	},
-	{
-		id: 'recent_deal_amount',
-		label: 'Recent Deal Amount',
-	},
-	{
-		id: 'recent_deal_close_date',
-		label: 'Recent Deal Close Date',
-	},
-	{
-		id: 'timezone',
-		label: 'Time Zone',
-	},
-	{
-		id: 'total_money_raised',
-		label: 'Total Money Raised',
-	},
-	{
-		id: 'total_revenue',
-		label: 'Total Revenue',
-	},
-	{
-		id: 'name',
-		label: 'Name',
-	},
-	{
-		id: 'owneremail',
-		label: 'HubSpot Owner Email',
-	},
-	{
-		id: 'twitterhandle',
-		label: 'Twitter Handle',
-	},
-	{
-		id: 'ownername',
-		label: 'HubSpot Owner Name',
-	},
-	{
-		id: 'phone',
-		label: 'Phone Number',
-	},
-	{
-		id: 'twitterbio',
-		label: 'Twitter Bio',
-	},
-	{
-		id: 'twitterfollowers',
-		label: 'Twitter Followers',
-	},
-	{
-		id: 'address',
-		label: 'Street Address',
-	},
-	{
-		id: 'address2',
-		label: 'Street Address 2',
-	},
-	{
-		id: 'facebook_company_page',
-		label: 'Facebook Company Page',
-	},
-	{
-		id: 'city',
-		label: 'City',
-	},
-	{
-		id: 'linkedin_company_page',
-		label: 'LinkedIn Company Page',
-	},
-	{
-		id: 'linkedinbio',
-		label: 'LinkedIn Bio',
-	},
-	{
-		id: 'state',
-		label: 'State/Region',
-	},
-	{
-		id: 'googleplus_page',
-		label: 'Google Plus Page',
-	},
-	{
-		id: 'engagements_last_meeting_booked',
-		label: 'Date of last meeting booked in meetings tool',
-	},
-	{
-		id: 'engagements_last_meeting_booked_campaign',
-		label: 'Campaign of last booking in meetings tool',
-	},
-	{
-		id: 'engagements_last_meeting_booked_medium',
-		label: 'Medium of last booking in meetings tool',
-	},
-	{
-		id: 'engagements_last_meeting_booked_source',
-		label: 'Source of last booking in meetings tool',
-	},
-	{
-		id: 'hs_latest_meeting_activity',
-		label: 'Latest meeting activity',
-	},
-	{
-		id: 'hs_sales_email_last_replied',
-		label: 'Recent Sales Email Replied Date',
-	},
-	{
-		id: 'hubspot_owner_id',
-		label: 'Company owner',
-	},
-	{
-		id: 'notes_last_contacted',
-		label: 'Last Contacted',
-	},
-	{
-		id: 'notes_last_updated',
-		label: 'Last Activity Date',
-	},
-	{
-		id: 'notes_next_activity_date',
-		label: 'Next Activity Date',
-	},
-	{
-		id: 'num_contacted_notes',
-		label: 'Number of times contacted',
-	},
-	{
-		id: 'num_notes',
-		label: 'Number of Sales Activities',
-	},
-	{
-		id: 'zip',
-		label: 'Postal Code',
-	},
-	{
-		id: 'country',
-		label: 'Country/Region',
-	},
-	{
-		id: 'hubspot_team_id',
-		label: 'HubSpot Team',
-	},
-	{
-		id: 'hs_all_owner_ids',
-		label: 'All owner ids',
-	},
-	{
-		id: 'website',
-		label: 'Website URL',
-	},
-	{
-		id: 'domain',
-		label: 'Company Domain Name',
-	},
-	{
-		id: 'hs_all_team_ids',
-		label: 'All team ids',
-	},
-	{
-		id: 'hs_all_accessible_team_ids',
-		label: 'All accessible team ids',
-	},
-	{
-		id: 'numberofemployees',
-		label: 'Number of Employees',
-	},
-	{
-		id: 'industry',
-		label: 'Industry',
-	},
-	{
-		id: 'annualrevenue',
-		label: 'Annual Revenue',
-	},
-	{
-		id: 'lifecyclestage',
-		label: 'Lifecycle Stage',
-	},
-	{
-		id: 'hs_lead_status',
-		label: 'Lead Status',
-	},
-	{
-		id: 'hs_parent_company_id',
-		label: 'Parent Company',
-	},
-	{
-		id: 'type',
-		label: 'Type',
-	},
-	{
-		id: 'description',
-		label: 'Description',
-	},
-	{
-		id: 'hs_num_child_companies',
-		label: 'Number of child companies',
-	},
-	{
-		id: 'hubspotscore',
-		label: 'HubSpot Score',
-	},
-	{
-		id: 'createdate',
-		label: 'Create Date',
-	},
-	{
-		id: 'closedate',
-		label: 'Close Date',
-	},
-	{
-		id: 'first_contact_createdate',
-		label: 'First Contact Create Date',
-	},
-	{
-		id: 'days_to_close',
-		label: 'Days to Close',
-	},
-	{
-		id: 'web_technologies',
-		label: 'Web Technologies',
-	},
-];
-
-export const dealFields = [
-	{
-		id: 'amount_in_home_currency',
-		label: 'Amount in company currency',
-	},
-	{
-		id: 'days_to_close',
-		label: 'Days to close',
-	},
-	{
-		id: 'deal_currency_code',
-		label: 'Currency',
-	},
-	{
-		id: 'hs_acv',
-		label: 'Annual contract value',
-	},
-	{
-		id: 'hs_analytics_source',
-		label: 'Original Source Type',
-	},
-	{
-		id: 'hs_analytics_source_data_1',
-		label: 'Original Source Data 1',
-	},
-	{
-		id: 'hs_analytics_source_data_2',
-		label: 'Original Source Data 2',
-	},
-	{
-		id: 'hs_arr',
-		label: 'Annual recurring revenue',
-	},
-	{
-		id: 'hs_campaign',
-		label: 'HubSpot Campaign',
-	},
-	{
-		id: 'hs_closed_amount',
-		label: 'Closed Deal Amount',
-	},
-	{
-		id: 'hs_closed_amount_in_home_currency',
-		label: 'Closed Deal Amount In Home Currency',
-	},
-	{
-		id: 'hs_created_by_user_id',
-		label: 'Created by user ID',
-	},
-	{
-		id: 'hs_date_entered_appointmentscheduled',
-		label: "Date entered 'Appointment Scheduled (Sales Pipeline)'",
-	},
-	{
-		id: 'hs_date_entered_closedlost',
-		label: "Date entered 'Closed Lost (Sales Pipeline)'",
-	},
-	{
-		id: 'hs_date_entered_closedwon',
-		label: "Date entered 'Closed Won (Sales Pipeline)'",
-	},
-	{
-		id: 'hs_date_entered_contractsent',
-		label: "Date entered 'Contract Sent (Sales Pipeline)'",
-	},
-	{
-		id: 'hs_date_entered_decisionmakerboughtin',
-		label: "Date entered 'Decision Maker Bought-In (Sales Pipeline)'",
-	},
-	{
-		id: 'hs_date_entered_presentationscheduled',
-		label: "Date entered 'Presentation Scheduled (Sales Pipeline)'",
-	},
-	{
-		id: 'hs_date_entered_qualifiedtobuy',
-		label: "Date entered 'Qualified To Buy (Sales Pipeline)'",
-	},
-	{
-		id: 'hs_date_exited_appointmentscheduled',
-		label: "Date exited 'Appointment Scheduled (Sales Pipeline)'",
-	},
-	{
-		id: 'hs_date_exited_closedlost',
-		label: "Date exited 'Closed Lost (Sales Pipeline)'",
-	},
-	{
-		id: 'hs_date_exited_closedwon',
-		label: "Date exited 'Closed Won (Sales Pipeline)'",
-	},
-	{
-		id: 'hs_date_exited_contractsent',
-		label: "Date exited 'Contract Sent (Sales Pipeline)'",
-	},
-	{
-		id: 'hs_date_exited_decisionmakerboughtin',
-		label: "Date exited 'Decision Maker Bought-In (Sales Pipeline)'",
-	},
-	{
-		id: 'hs_date_exited_presentationscheduled',
-		label: "Date exited 'Presentation Scheduled (Sales Pipeline)'",
-	},
-	{
-		id: 'hs_date_exited_qualifiedtobuy',
-		label: "Date exited 'Qualified To Buy (Sales Pipeline)'",
-	},
-	{
-		id: 'hs_deal_amount_calculation_preference',
-		label: 'Deal amount calculation preference',
-	},
-	{
-		id: 'hs_deal_stage_probability',
-		label: 'Deal Stage Probability',
-	},
-	{
-		id: 'hs_forecast_amount',
-		label: 'Forecast Amount',
-	},
-	{
-		id: 'hs_forecast_probability',
-		label: 'Forecast Probability',
-	},
-	{
-		id: 'hs_is_closed',
-		label: 'Is Deal Closed?',
-	},
-	{
-		id: 'hs_lastmodifieddate',
-		label: 'Last Modified Date',
-	},
-	{
-		id: 'hs_likelihood_to_close',
-		label: 'Likelihood to close by the close date',
-	},
-	{
-		id: 'hs_line_item_global_term_hs_discount_percentage',
-		label: 'Global Term Line Item Discount Percentage',
-	},
-	{
-		id: 'hs_line_item_global_term_hs_discount_percentage_enabled',
-		label: 'Global Term Line Item Discount Percentage Enabled',
-	},
-	{
-		id: 'hs_line_item_global_term_hs_recurring_billing_period',
-		label: 'Global Term Line Item Recurring Billing Period',
-	},
-	{
-		id: 'hs_line_item_global_term_hs_recurring_billing_period_enabled',
-		label: 'Global Term Line Item Recurring Billing Period Enabled',
-	},
-	{
-		id: 'hs_line_item_global_term_hs_recurring_billing_start_date',
-		label: 'Global Term Line Item Recurring Billing Start Date',
-	},
-	{
-		id: 'hs_line_item_global_term_hs_recurring_billing_start_date_enabled',
-		label: 'Global Term Line Item Recurring Billing Start Date Enabled',
-	},
-	{
-		id: 'hs_line_item_global_term_recurringbillingfrequency',
-		label: 'Global Term Line Item Recurring Billing Frequency',
-	},
-	{
-		id: 'hs_line_item_global_term_recurringbillingfrequency_enabled',
-		label: 'Global Term Line Item Recurring Billing Frequency Enabled',
-	},
-	{
-		id: 'hs_manual_forecast_category',
-		label: 'Forecast category',
-	},
-	{
-		id: 'hs_merged_object_ids',
-		label: 'Merged object IDs',
-	},
-	{
-		id: 'hs_mrr',
-		label: 'Monthly recurring revenue',
-	},
-	{
-		id: 'hs_next_step',
-		label: 'Next step',
-	},
-	{
-		id: 'hs_object_id',
-		label: 'Deal ID',
-	},
-	{
-		id: 'hs_predicted_amount',
-		label: 'The predicted deal amount',
-	},
-	{
-		id: 'hs_predicted_amount_in_home_currency',
-		label: "The predicted deal amount in your company's currency",
-	},
-	{
-		id: 'hs_projected_amount',
-		label: 'Projected Deal Amount',
-	},
-	{
-		id: 'hs_projected_amount_in_home_currency',
-		label: 'Projected Deal Amount in Home Currency',
-	},
-	{
-		id: 'hs_tcv',
-		label: 'Total contract value',
-	},
-	{
-		id: 'hs_time_in_appointmentscheduled',
-		label: "Time in 'Appointment Scheduled (Sales Pipeline)'",
-	},
-	{
-		id: 'hs_time_in_closedlost',
-		label: "Time in 'Closed Lost (Sales Pipeline)'",
-	},
-	{
-		id: 'hs_time_in_closedwon',
-		label: "Time in 'Closed Won (Sales Pipeline)'",
-	},
-	{
-		id: 'hs_time_in_contractsent',
-		label: "Time in 'Contract Sent (Sales Pipeline)'",
-	},
-	{
-		id: 'hs_time_in_decisionmakerboughtin',
-		label: "Time in 'Decision Maker Bought-In (Sales Pipeline)'",
-	},
-	{
-		id: 'hs_time_in_presentationscheduled',
-		label: "Time in 'Presentation Scheduled (Sales Pipeline)'",
-	},
-	{
-		id: 'hs_time_in_qualifiedtobuy',
-		label: "Time in 'Qualified To Buy (Sales Pipeline)'",
-	},
-	{
-		id: 'hs_updated_by_user_id',
-		label: 'Updated by user ID',
-	},
-	{
-		id: 'hs_user_ids_of_all_owners',
-		label: 'User IDs of all owners',
-	},
-	{
-		id: 'hubspot_owner_assigneddate',
-		label: 'Owner Assigned Date',
-	},
-	{
-		id: 'testing',
-		label: 'testing',
-	},
-	{
-		id: 'dealname',
-		label: 'Deal Name',
-	},
-	{
-		id: 'amount',
-		label: 'Amount',
-	},
-	{
-		id: 'dealstage',
-		label: 'Deal Stage',
-	},
-	{
-		id: 'pipeline',
-		label: 'Pipeline',
-	},
-	{
-		id: 'closedate',
-		label: 'Close Date',
-	},
-	{
-		id: 'createdate',
-		label: 'Create Date',
-	},
-	{
-		id: 'engagements_last_meeting_booked',
-		label: 'Date of last meeting booked in meetings tool',
-	},
-	{
-		id: 'engagements_last_meeting_booked_campaign',
-		label: 'Campaign of last booking in meetings tool',
-	},
-	{
-		id: 'engagements_last_meeting_booked_medium',
-		label: 'Medium of last booking in meetings tool',
-	},
-	{
-		id: 'engagements_last_meeting_booked_source',
-		label: 'Source of last booking in meetings tool',
-	},
-	{
-		id: 'hs_latest_meeting_activity',
-		label: 'Latest meeting activity',
-	},
-	{
-		id: 'hs_sales_email_last_replied',
-		label: 'Recent Sales Email Replied Date',
-	},
-	{
-		id: 'hubspot_owner_id',
-		label: 'Deal owner',
-	},
-	{
-		id: 'notes_last_contacted',
-		label: 'Last Contacted',
-	},
-	{
-		id: 'notes_last_updated',
-		label: 'Last Activity Date',
-	},
-	{
-		id: 'notes_next_activity_date',
-		label: 'Next Activity Date',
-	},
-	{
-		id: 'num_contacted_notes',
-		label: 'Number of times contacted',
-	},
-	{
-		id: 'num_notes',
-		label: 'Number of Sales Activities',
-	},
-	{
-		id: 'hs_createdate',
-		label: 'HubSpot Create Date',
-	},
-	{
-		id: 'hubspot_team_id',
-		label: 'HubSpot Team',
-	},
-	{
-		id: 'dealtype',
-		label: 'Deal Type',
-	},
-	{
-		id: 'hs_all_owner_ids',
-		label: 'All owner ids',
-	},
-	{
-		id: 'description',
-		label: 'Deal Description',
-	},
-	{
-		id: 'hs_all_team_ids',
-		label: 'All team ids',
-	},
-	{
-		id: 'hs_all_accessible_team_ids',
-		label: 'All accessible team ids',
-	},
-	{
-		id: 'num_associated_contacts',
-		label: 'Number of Contacts',
-	},
-	{
-		id: 'closed_lost_reason',
-		label: 'Closed Lost Reason',
-	},
-	{
-		id: 'closed_won_reason',
-		label: 'Closed Won Reason',
-	},
-];
-
-const reduceMetadatFields = (data: string[]) => {
-	return data
-		.reduce((a, v) => {
-			//@ts-ignore
-			a.push(...v.split(','));
-			return a;
-		}, [])
-		.map((email) => ({ email }));
-};
-
-export const getEmailMetadata = (meta: IDataObject) => {
-	return {
-		from: {
-			...(meta.fromEmail && { email: meta.fromEmail }),
-			...(meta.firstName && { firstName: meta.firstName }),
-			...(meta.lastName && { lastName: meta.lastName }),
-		},
-		cc: reduceMetadatFields((meta.cc as string[]) || []),
-		bcc: reduceMetadatFields((meta.bcc as string[]) || []),
-		...(meta.subject && { subject: meta.subject }),
-		...(meta.html && { html: meta.html }),
-		...(meta.text && { text: meta.text }),
-	};
-};
-
-export const getTaskMetadata = (meta: IDataObject) => {
-	return {
-		...(meta.body && { body: meta.body }),
-		...(meta.subject && { subject: meta.subject }),
-		...(meta.status && { status: meta.status }),
-		...(meta.forObjectType && { forObjectType: meta.forObjectType }),
-	};
-};
-
-export const getMeetingMetadata = (meta: IDataObject) => {
-	return {
-		...(meta.body && { body: meta.body }),
-		...(meta.startTime && { startTime: moment(meta.startTime as string).unix() }),
-		...(meta.endTime && { endTime: moment(meta.endTime as string).unix() }),
-		...(meta.title && { title: meta.title }),
-		...(meta.internalMeetingNotes && { internalMeetingNotes: meta.internalMeetingNotes }),
-	};
-};
-
-export const getCallMetadata = (meta: IDataObject) => {
-	return {
-		...(meta.toNumber && { toNumber: meta.toNumber }),
-		...(meta.fromNumber && { fromNumber: meta.fromNumber }),
-		...(meta.status && { status: meta.status }),
-		...(meta.durationMilliseconds && { durationMilliseconds: meta.durationMilliseconds }),
-		...(meta.recordingUrl && { recordingUrl: meta.recordingUrl }),
-		...(meta.body && { body: meta.body }),
-	};
-};
-
-export const getAssociations = (associations: {
-	companyIds: string;
-	dealIds: string;
-	ownerIds: string;
-	contactIds: string;
-	ticketIds: string;
-}) => {
-	return {
-		...(associations.companyIds && { companyIds: associations.companyIds.toString().split(',') }),
-		...(associations.contactIds && { contactIds: associations.contactIds.toString().split(',') }),
-		...(associations.dealIds && { dealIds: associations.dealIds.toString().split(',') }),
-		...(associations.ownerIds && { ownerIds: associations.ownerIds.toString().split(',') }),
-		...(associations.ticketIds && { ticketIds: associations.ticketIds.toString().split(',') }),
-	};
-};
-
-export async function validateCredentials(
-	this: ICredentialTestFunctions,
-	decryptedCredentials: ICredentialDataDecryptedObject,
-): Promise<any> {
-	const credentials = decryptedCredentials;
-
-	const { apiKey, appToken } = credentials as {
-		appToken: string;
-		apiKey: string;
-	};
-
-	const options: OptionsWithUri = {
-		method: 'GET',
-		headers: {},
-		uri: 'https://api.hubapi.com/deals/v1/deal/paged',
-		json: true,
-	};
-
-	if (apiKey) {
-		options.qs = { hapikey: apiKey };
-	} else {
-		options.headers = { Authorization: `Bearer ${appToken}` };
-	}
-
-	return this.helpers.request(options);
-}
diff --git a/packages/nodes-base/nodes/Hubspot/Hubspot.node.ts b/packages/nodes-base/nodes/Hubspot/Hubspot.node.ts
index 307594f3544ff..f20a3c7746778 100644
--- a/packages/nodes-base/nodes/Hubspot/Hubspot.node.ts
+++ b/packages/nodes-base/nodes/Hubspot/Hubspot.node.ts
@@ -1,2737 +1,28 @@
-import type {
-	IExecuteFunctions,
-	ICredentialDataDecryptedObject,
-	ICredentialsDecrypted,
-	ICredentialTestFunctions,
-	IDataObject,
-	ILoadOptionsFunctions,
-	INodeCredentialTestResult,
-	INodeExecutionData,
-	INodePropertyOptions,
-	INodeType,
-	INodeTypeDescription,
-	JsonObject,
-} from 'n8n-workflow';
-import { NodeOperationError } from 'n8n-workflow';
-
-import {
-	clean,
-	getAssociations,
-	getCallMetadata,
-	getEmailMetadata,
-	getMeetingMetadata,
-	getTaskMetadata,
-	hubspotApiRequest,
-	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';
-
-import { snakeCase } from 'change-case';
-
-export class Hubspot implements INodeType {
-	description: INodeTypeDescription = {
-		displayName: 'HubSpot',
-		name: 'hubspot',
-		icon: 'file:hubspot.svg',
-		group: ['output'],
-		version: 1,
-		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume HubSpot API',
-		defaults: {
-			name: 'HubSpot',
-		},
-		inputs: ['main'],
-		outputs: ['main'],
-		credentials: [
-			{
-				name: 'hubspotApi',
-				required: true,
-				testedBy: 'hubspotApiTest',
-				displayOptions: {
-					show: {
-						authentication: ['apiKey'],
-					},
-				},
-			},
-			{
-				name: 'hubspotAppToken',
-				required: true,
-				testedBy: 'hubspotApiTest',
-				displayOptions: {
-					show: {
-						authentication: ['appToken'],
-					},
-				},
-			},
-			{
-				name: 'hubspotOAuth2Api',
-				required: true,
-				displayOptions: {
-					show: {
-						authentication: ['oAuth2'],
-					},
-				},
-			},
-		],
-		properties: [
-			{
-				displayName: 'Authentication',
-				name: 'authentication',
-				type: 'options',
-				options: [
-					{
-						name: 'API Key',
-						value: 'apiKey',
-					},
-					{
-						name: 'APP Token',
-						value: 'appToken',
-					},
-					{
-						name: 'OAuth2',
-						value: 'oAuth2',
-					},
-				],
-				default: 'apiKey',
-			},
-			{
-				displayName: 'Resource',
-				name: 'resource',
-				type: 'options',
-				noDataExpression: true,
-				options: [
-					{
-						name: 'Company',
-						value: 'company',
-					},
-					{
-						name: 'Contact',
-						value: 'contact',
-					},
-					{
-						name: 'Contact List',
-						value: 'contactList',
-					},
-					{
-						name: 'Deal',
-						value: 'deal',
-					},
-					{
-						name: 'Engagement',
-						value: 'engagement',
-					},
-					{
-						name: 'Form',
-						value: 'form',
-					},
-					{
-						name: 'Ticket',
-						value: 'ticket',
-					},
-				],
-				default: 'deal',
-			},
-			// CONTACT
-			...contactOperations,
-			...contactFields,
-			// CONTACT LIST
-			...contactListOperations,
-			...contactListFields,
-			// COMPANY
-			...companyOperations,
-			...companyFields,
-			// DEAL
-			...dealOperations,
-			...dealFields,
-			// ENGAGEMENT
-			...engagementOperations,
-			...engagementFields,
-			// FORM
-			...formOperations,
-			...formFields,
-			// TICKET
-			...ticketOperations,
-			...ticketFields,
-		],
-	};
-
-	methods = {
-		credentialTest: {
-			async hubspotApiTest(
-				this: ICredentialTestFunctions,
-				credential: ICredentialsDecrypted,
-			): Promise<INodeCredentialTestResult> {
-				try {
-					await validateCredentials.call(this, credential.data as ICredentialDataDecryptedObject);
-				} catch (error) {
-					const err = error as JsonObject;
-					if (err.statusCode === 401) {
-						return {
-							status: 'Error',
-							message: 'Invalid credentials',
-						};
-					}
-				}
-				return {
-					status: 'OK',
-					message: 'Authentication successful',
-				};
-			},
-		},
-
-		loadOptions: {
-			/* -------------------------------------------------------------------------- */
-			/*                                 CONTACT                                    */
-			/* -------------------------------------------------------------------------- */
-
-			// Get all the contact lead statuses to display them to user so that they can
-			// select them easily
-			async getContactLeadStatuses(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const endpoint = '/properties/v2/contacts/properties';
-				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
-				for (const property of properties) {
-					if (property.name === 'hs_lead_status') {
-						for (const option of property.options) {
-							const statusName = option.label;
-							const statusId = option.value;
-							returnData.push({
-								name: statusName,
-								value: statusId,
-							});
-						}
-					}
-				}
-				return returnData;
-			},
-
-			// Get all the contact legal basics to display them to user so that they can
-			// select them easily
-			async getContactLealBasics(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const endpoint = '/properties/v2/contacts/properties';
-				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
-				for (const property of properties) {
-					if (property.name === 'hs_legal_basis') {
-						for (const option of property.options) {
-							const statusName = option.label;
-							const statusId = option.value;
-							returnData.push({
-								name: statusName,
-								value: statusId,
-							});
-						}
-					}
-				}
-				return returnData;
-			},
-
-			// Get all the contact lifecycle stages to display them to user so that they can
-			// select them easily
-			async getContactLifeCycleStages(
-				this: ILoadOptionsFunctions,
-			): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const endpoint = '/properties/v2/contacts/properties';
-				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
-				for (const property of properties) {
-					if (property.name === 'lifecyclestage') {
-						for (const option of property.options) {
-							const stageName = option.label;
-							const stageId = option.value;
-							returnData.push({
-								name: stageName,
-								value: stageId,
-							});
-						}
-					}
-				}
-				return returnData;
-			},
-
-			// Get all the contact lifecycle stages to display them to user so that they can
-			// select them easily
-			async getContactOriginalSources(
-				this: ILoadOptionsFunctions,
-			): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const endpoint = '/properties/v2/contacts/properties';
-				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
-				for (const property of properties) {
-					if (property.name === 'hs_analytics_source') {
-						for (const option of property.options) {
-							const sourceName = option.label;
-							const sourceId = option.value;
-							returnData.push({
-								name: sourceName,
-								value: sourceId,
-							});
-						}
-					}
-				}
-				return returnData;
-			},
-
-			// Get all the contact preffered languages to display them to user so that they can
-			// select them easily
-			async getContactPrefferedLanguages(
-				this: ILoadOptionsFunctions,
-			): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const endpoint = '/properties/v2/contacts/properties';
-				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
-				for (const property of properties) {
-					if (property.name === 'hs_language') {
-						for (const option of property.options) {
-							const languageName = option.label;
-							const languageId = option.value;
-							returnData.push({
-								name: languageName,
-								value: languageId,
-							});
-						}
-					}
-				}
-				return returnData;
-			},
-
-			// Get all the contact preffered languages to display them to user so that they can
-			// select them easily
-			async getContactStatuses(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const endpoint = '/properties/v2/contacts/properties';
-				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
-				for (const property of properties) {
-					if (property.name === 'hs_content_membership_status') {
-						for (const option of property.options) {
-							const languageName = option.label;
-							const languageId = option.value;
-							returnData.push({
-								name: languageName,
-								value: languageId,
-							});
-						}
-					}
-				}
-				return returnData;
-			},
-
-			// Get all the contact properties to display them to user so that they can
-			// select them easily
-			async getContactProperties(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const endpoint = '/properties/v2/contacts/properties';
-				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
-				for (const property of properties) {
-					const propertyName = property.label;
-					const propertyId = property.name;
-					returnData.push({
-						name: propertyName,
-						value: propertyId,
-					});
-				}
-				return returnData;
-			},
-
-			// Get all the contact properties to display them to user so that they can
-			// select them easily
-			async getContactCustomProperties(
-				this: ILoadOptionsFunctions,
-			): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const endpoint = '/properties/v2/contacts/properties';
-				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
-				for (const property of properties) {
-					if (property.hubspotDefined === null) {
-						const propertyName = property.label;
-						const propertyId = property.name;
-						returnData.push({
-							name: propertyName,
-							value: propertyId,
-						});
-					}
-				}
-				return returnData;
-			},
-
-			// Get all the contact number of employees options to display them to user so that they can
-			// select them easily
-			async getContactNumberOfEmployees(
-				this: ILoadOptionsFunctions,
-			): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const endpoint = '/properties/v2/contacts/properties';
-				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
-				for (const property of properties) {
-					if (property.name === 'numemployees') {
-						for (const option of property.options) {
-							const optionName = option.label;
-							const optionId = option.value;
-							returnData.push({
-								name: optionName,
-								value: optionId,
-							});
-						}
-					}
-				}
-				return returnData;
-			},
-
-			/* -------------------------------------------------------------------------- */
-			/*                                 COMPANY                                    */
-			/* -------------------------------------------------------------------------- */
-
-			// Get all the company industries to display them to user so that they can
-			// select them easily
-			async getCompanyIndustries(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const endpoint = '/properties/v2/companies/properties';
-				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
-				for (const property of properties) {
-					if (property.name === 'industry') {
-						for (const option of property.options) {
-							const industryName = option.label;
-							const industryId = option.value;
-							returnData.push({
-								name: industryName,
-								value: industryId,
-							});
-						}
-					}
-				}
-				return returnData;
-			},
-
-			// Get all the company lead statuses to display them to user so that they can
-			// select them easily
-			async getCompanyleadStatuses(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const endpoint = '/properties/v2/companies/properties';
-				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
-				for (const property of properties) {
-					if (property.name === 'hs_lead_status') {
-						for (const option of property.options) {
-							const statusName = option.label;
-							const statusId = option.value;
-							returnData.push({
-								name: statusName,
-								value: statusId,
-							});
-						}
-					}
-				}
-				return returnData;
-			},
-
-			// Get all the company lifecycle stages to display them to user so that they can
-			// select them easily
-			async getCompanylifecycleStages(
-				this: ILoadOptionsFunctions,
-			): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const endpoint = '/properties/v2/companies/properties';
-				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
-				for (const property of properties) {
-					if (property.name === 'lifecyclestage') {
-						for (const option of property.options) {
-							const stageName = option.label;
-							const stageId = option.value;
-							returnData.push({
-								name: stageName,
-								value: stageId,
-							});
-						}
-					}
-				}
-				return returnData;
-			},
-
-			// Get all the company types stages to display them to user so that they can
-			// select them easily
-			async getCompanyTypes(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const endpoint = '/properties/v2/companies/properties';
-				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
-				for (const property of properties) {
-					if (property.name === 'type') {
-						for (const option of property.options) {
-							const typeName = option.label;
-							const typeId = option.value;
-							returnData.push({
-								name: typeName,
-								value: typeId,
-							});
-						}
-					}
-				}
-				return returnData;
-			},
-
-			// Get all the company types stages to display them to user so that they can
-			// select them easily
-			async getCompanyTargetAccounts(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const endpoint = '/properties/v2/companies/properties';
-				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
-				for (const property of properties) {
-					if (property.name === 'hs_target_account') {
-						for (const option of property.options) {
-							const targetName = option.label;
-							const targetId = option.value;
-							returnData.push({
-								name: targetName,
-								value: targetId,
-							});
-						}
-					}
-				}
-				return returnData;
-			},
-
-			// Get all the company source types stages to display them to user so that they can
-			// select them easily
-			async getCompanySourceTypes(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const endpoint = '/properties/v2/companies/properties';
-				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
-				for (const property of properties) {
-					if (property.name === 'hs_analytics_source') {
-						for (const option of property.options) {
-							const typeName = option.label;
-							const typeId = option.value;
-							returnData.push({
-								name: typeName,
-								value: typeId,
-							});
-						}
-					}
-				}
-				return returnData;
-			},
-
-			// Get all the company web technologies stages to display them to user so that they can
-			// select them easily
-			async getCompanyWebTechnologies(
-				this: ILoadOptionsFunctions,
-			): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const endpoint = '/properties/v2/companies/properties';
-				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
-				for (const property of properties) {
-					if (property.name === 'web_technologies') {
-						for (const option of property.options) {
-							const technologyName = option.label;
-							const technologyId = option.value;
-							returnData.push({
-								name: technologyName,
-								value: technologyId,
-							});
-						}
-					}
-				}
-				return returnData;
-			},
-
-			// Get all the company properties to display them to user so that they can
-			// select them easily
-			async getCompanyProperties(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const endpoint = '/properties/v2/companies/properties';
-				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
-				for (const property of properties) {
-					const propertyName = property.label;
-					const propertyId = property.name;
-					returnData.push({
-						name: propertyName,
-						value: propertyId,
-					});
-				}
-				return returnData;
-			},
-
-			// Get all the company custom properties to display them to user so that they can
-			// select them easily
-			async getCompanyCustomProperties(
-				this: ILoadOptionsFunctions,
-			): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const endpoint = '/properties/v2/companies/properties';
-				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
-				for (const property of properties) {
-					if (property.hubspotDefined === null) {
-						const propertyName = property.label;
-						const propertyId = property.name;
-						returnData.push({
-							name: propertyName,
-							value: propertyId,
-						});
-					}
-				}
-				return returnData;
-			},
-
-			/* -------------------------------------------------------------------------- */
-			/*                                 DEAL                                       */
-			/* -------------------------------------------------------------------------- */
-
-			// Get all the groups to display them to user so that they can
-			// select them easily
-			async getDealStages(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const endpoint = '/crm-pipelines/v1/pipelines/deals';
-				let stages = await hubspotApiRequest.call(this, 'GET', endpoint, {});
-				stages = stages.results[0].stages;
-				for (const stage of stages) {
-					const stageName = stage.label;
-					const stageId = stage.stageId;
-					returnData.push({
-						name: stageName,
-						value: stageId,
-					});
-				}
-				return returnData;
-			},
-
-			// Get all the deal types to display them to user so that they can
-			// select them easily
-			async getDealTypes(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const endpoint = '/properties/v1/deals/properties/named/dealtype';
-				const dealTypes = await hubspotApiRequest.call(this, 'GET', endpoint);
-				for (const dealType of dealTypes.options) {
-					const dealTypeName = dealType.label;
-					const dealTypeId = dealType.value;
-					returnData.push({
-						name: dealTypeName,
-						value: dealTypeId,
-					});
-				}
-				return returnData;
-			},
-
-			// Get all the deal properties to display them to user so that they can
-			// select them easily
-			async getDealCustomProperties(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const endpoint = '/properties/v2/deals/properties';
-				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
-				for (const property of properties) {
-					if (property.hubspotDefined === null) {
-						const propertyName = property.label;
-						const propertyId = property.name;
-						returnData.push({
-							name: propertyName,
-							value: propertyId,
-						});
-					}
-				}
-				return returnData;
-			},
-			// Get all the deal properties to display them to user so that they can
-			// select them easily
-			async getDealProperties(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const endpoint = '/properties/v2/deals/properties';
-				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
-				for (const property of properties) {
-					const propertyName = property.label;
-					const propertyId = property.name;
-					returnData.push({
-						name: propertyName,
-						value: propertyId,
-					});
-				}
-				return returnData;
-			},
-
-			/* -------------------------------------------------------------------------- */
-			/*                                 FORM                                       */
-			/* -------------------------------------------------------------------------- */
-
-			// Get all the forms to display them to user so that they can
-			// select them easily
-			async getForms(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const endpoint = '/forms/v2/forms';
-				const forms = await hubspotApiRequest.call(this, 'GET', endpoint, {}, { formTypes: 'ALL' });
-				for (const form of forms) {
-					const formName = form.name;
-					const formId = form.guid;
-					returnData.push({
-						name: formName,
-						value: formId,
-					});
-				}
-				return returnData;
-			},
-
-			// Get all the subscription types to display them to user so that they can
-			// select them easily
-			async getSubscriptionTypes(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const endpoint = '/email/public/v1/subscriptions';
-				const subscriptions = await hubspotApiRequestAllItems.call(
-					this,
-					'subscriptionDefinitions',
-					'GET',
-					endpoint,
-					{},
-				);
-				for (const subscription of subscriptions) {
-					const subscriptionName = subscription.name;
-					const subscriptionId = subscription.id;
-					returnData.push({
-						name: subscriptionName,
-						value: subscriptionId,
-					});
-				}
-				return returnData;
-			},
-
-			/* -------------------------------------------------------------------------- */
-			/*                                 TICKET                                     */
-			/* -------------------------------------------------------------------------- */
-
-			// Get all the ticket categories to display them to user so that they can
-			// select them easily
-			async getTicketCategories(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const endpoint = '/properties/v2/tickets/properties';
-				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
-				for (const property of properties) {
-					if (property.name === 'hs_ticket_category') {
-						for (const option of property.options) {
-							const categoryName = option.label;
-							const categoryId = option.value;
-							returnData.push({
-								name: categoryName,
-								value: categoryId,
-							});
-						}
-					}
-				}
-				return returnData.sort((a, b) => (a.name < b.name ? 0 : 1));
-			},
-
-			// Get all the ticket pipelines to display them to user so that they can
-			// select them easily
-			async getTicketPipelines(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const endpoint = '/crm-pipelines/v1/pipelines/tickets';
-				const { results } = await hubspotApiRequest.call(this, 'GET', endpoint, {});
-				for (const pipeline of results) {
-					const pipelineName = pipeline.label;
-					const pipelineId = pipeline.pipelineId;
-					returnData.push({
-						name: pipelineName,
-						value: pipelineId,
-					});
-				}
-				return returnData;
-			},
-
-			// Get all the ticket resolutions to display them to user so that they can
-			// select them easily
-			async getTicketPriorities(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const endpoint = '/properties/v2/tickets/properties';
-				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
-				for (const property of properties) {
-					if (property.name === 'hs_ticket_priority') {
-						for (const option of property.options) {
-							const priorityName = option.label;
-							const priorityId = option.value;
-							returnData.push({
-								name: priorityName,
-								value: priorityId,
-							});
-						}
-					}
-				}
-				return returnData;
-			},
-
-			// Get all the ticket properties to display them to user so that they can
-			// select them easily
-			async getTicketProperties(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const endpoint = '/properties/v2/tickets/properties';
-				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
-				for (const property of properties) {
-					const propertyName = property.label;
-					const propertyId = property.name;
-					returnData.push({
-						name: propertyName,
-						value: propertyId,
-					});
-				}
-				return returnData;
-			},
-
-			// Get all the ticket resolutions to display them to user so that they can
-			// select them easily
-			async getTicketResolutions(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const endpoint = '/properties/v2/tickets/properties';
-				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
-				for (const property of properties) {
-					if (property.name === 'hs_resolution') {
-						for (const option of property.options) {
-							const resolutionName = option.label;
-							const resolutionId = option.value;
-							returnData.push({
-								name: resolutionName,
-								value: resolutionId,
-							});
-						}
-					}
-				}
-				return returnData.sort((a, b) => (a.name < b.name ? 0 : 1));
-			},
-
-			// Get all the ticket sources to display them to user so that they can
-			// select them easily
-			async getTicketSources(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const endpoint = '/properties/v2/tickets/properties';
-				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
-				for (const property of properties) {
-					if (property.name === 'source_type') {
-						for (const option of property.options) {
-							const sourceName = option.label;
-							const sourceId = option.value;
-							returnData.push({
-								name: sourceName,
-								value: sourceId,
-							});
-						}
-					}
-				}
-				return returnData.sort((a, b) => (a.name < b.name ? 0 : 1));
-			},
-
-			// Get all the ticket stages to display them to user so that they can
-			// select them easily
-			async getTicketStages(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				let currentPipelineId = this.getCurrentNodeParameter('pipelineId') as string;
-				if (currentPipelineId === undefined) {
-					currentPipelineId = this.getNodeParameter('updateFields.pipelineId', '') as string;
-				}
-				const returnData: INodePropertyOptions[] = [];
-				const endpoint = '/crm-pipelines/v1/pipelines/tickets';
-				const { results } = await hubspotApiRequest.call(this, 'GET', endpoint, {});
-				for (const pipeline of results) {
-					if (currentPipelineId === pipeline.pipelineId) {
-						for (const stage of pipeline.stages) {
-							const stageName = stage.label;
-							const stageId = stage.stageId;
-							returnData.push({
-								name: stageName,
-								value: stageId,
-							});
-						}
-					}
-				}
-				return returnData;
-			},
-
-			/* -------------------------------------------------------------------------- */
-			/*                                 COMMON                                     */
-			/* -------------------------------------------------------------------------- */
-
-			// Get all the owners to display them to user so that they can
-			// select them easily
-			async getOwners(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const endpoint = '/owners/v2/owners';
-				const owners = await hubspotApiRequest.call(this, 'GET', endpoint);
-				for (const owner of owners) {
-					const ownerName = owner.email;
-					const ownerId = owner.ownerId;
-					returnData.push({
-						name: ownerName,
-						value: ownerId,
-					});
-				}
-				return returnData;
-			},
-
-			// Get all the companies to display them to user so that they can
-			// select them easily
-			async getCompanies(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const qs: IDataObject = {
-					properties: ['name'],
-				};
-				const endpoint = '/companies/v2/companies/paged';
-				const companies = await hubspotApiRequestAllItems.call(
-					this,
-					'companies',
-					'GET',
-					endpoint,
-					{},
-					qs,
-				);
-				for (const company of companies) {
-					const companyName = company.properties.name
-						? company.properties.name.value
-						: company.companyId;
-					const companyId = company.companyId;
-					returnData.push({
-						name: companyName,
-						value: companyId,
-					});
-				}
-				return returnData.sort((a, b) => (a.name < b.name ? 0 : 1));
-			},
-
-			// Get all the companies to display them to user so that they can
-			// select them easily
-			async getContacts(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const endpoint = '/contacts/v1/lists/all/contacts/all';
-				const contacts = await hubspotApiRequestAllItems.call(this, 'contacts', 'GET', endpoint);
-
-				for (const contact of contacts) {
-					const firstName = contact.properties?.firstname?.value || '';
-					const lastName = contact.properties?.lastname?.value || '';
-					const contactName = `${firstName} ${lastName}`;
-					const contactId = contact.vid;
-					returnData.push({
-						name: contactName,
-						value: contactId,
-						description: `Contact VID: ${contactId}`,
-					});
-				}
-				return returnData.sort((a, b) => (a.name < b.name ? 0 : 1));
-			},
-		},
-	};
-
-	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
-		const items = this.getInputData();
-		const returnData: INodeExecutionData[] = [];
-		const length = items.length;
-		let responseData;
-		const qs: IDataObject = {};
-		const resource = this.getNodeParameter('resource', 0);
-		const operation = this.getNodeParameter('operation', 0);
-
-		//https://legacydocs.hubspot.com/docs/methods/lists/contact-lists-overview
-		if (resource === 'contactList') {
-			try {
-				//https://legacydocs.hubspot.com/docs/methods/lists/add_contact_to_list
-				if (operation === 'add') {
-					const listId = this.getNodeParameter('listId', 0) as string;
-					const by = this.getNodeParameter('by', 0) as string;
-					const body: { [key: string]: [] } = { emails: [], vids: [] };
-					for (let i = 0; i < length; i++) {
-						if (by === 'id') {
-							const id = this.getNodeParameter('id', i) as string;
-							body.vids.push(parseInt(id, 10) as never);
-						} else {
-							const email = this.getNodeParameter('email', i) as string;
-							body.emails.push(email as never);
-						}
-					}
-					responseData = await hubspotApiRequest.call(
-						this,
-						'POST',
-						`/contacts/v1/lists/${listId}/add`,
-						body,
-					);
-					returnData.push(responseData as INodeExecutionData);
-				}
-				//https://legacydocs.hubspot.com/docs/methods/lists/remove_contact_from_list
-				if (operation === 'remove') {
-					const listId = this.getNodeParameter('listId', 0) as string;
-					const body: { [key: string]: [] } = { vids: [] };
-					for (let i = 0; i < length; i++) {
-						const id = this.getNodeParameter('id', i) as string;
-						body.vids.push(parseInt(id, 10) as never);
-					}
-					responseData = await hubspotApiRequest.call(
-						this,
-						'POST',
-						`/contacts/v1/lists/${listId}/remove`,
-						body,
-					);
-					returnData.push(responseData as INodeExecutionData);
-				}
-			} catch (error) {
-				if (this.continueOnFail()) {
-					returnData.push({ json: { error: (error as JsonObject).message } });
-				} else {
-					throw error;
-				}
-			}
-		} else {
-			for (let i = 0; i < length; i++) {
-				try {
-					//https://developers.hubspot.com/docs/methods/contacts/create_or_update
-					if (resource === 'contact') {
-						//https://developers.hubspot.com/docs/methods/companies/create_company
-						if (operation === 'upsert') {
-							const email = this.getNodeParameter('email', i) as string;
-							const resolveData = this.getNodeParameter('resolveData', i);
-							const additionalFields = this.getNodeParameter('additionalFields', i);
-							const body: IDataObject[] = [];
-							if (additionalFields.annualRevenue) {
-								body.push({
-									property: 'annualrevenue',
-									value: (additionalFields.annualRevenue as number).toString(),
-								});
-							}
-							if (additionalFields.city) {
-								body.push({
-									property: 'city',
-									value: additionalFields.city,
-								});
-							}
-							if (additionalFields.clickedFacebookAd) {
-								body.push({
-									property: 'hs_facebook_ad_clicked',
-									value: additionalFields.clickedFacebookAd,
-								});
-							}
-							if (additionalFields.closeDate) {
-								body.push({
-									property: 'closedate',
-									value: new Date(additionalFields.closeDate as string).getTime(),
-								});
-							}
-							if (additionalFields.companyName) {
-								body.push({
-									property: 'company',
-									value: additionalFields.companyName,
-								});
-							}
-							if (additionalFields.companySize) {
-								body.push({
-									property: 'company_size',
-									value: additionalFields.companySize,
-								});
-							}
-							if (additionalFields.description) {
-								body.push({
-									property: 'description',
-									value: additionalFields.description,
-								});
-							}
-							if (additionalFields.contactOwner) {
-								body.push({
-									property: 'hubspot_owner_id',
-									value: additionalFields.contactOwner,
-								});
-							}
-							if (additionalFields.country) {
-								body.push({
-									property: 'country',
-									value: additionalFields.country,
-								});
-							}
-							if (additionalFields.dateOfBirth) {
-								body.push({
-									property: 'date_of_birth',
-									value: additionalFields.dateOfBirth,
-								});
-							}
-							if (additionalFields.degree) {
-								body.push({
-									property: 'degree',
-									value: additionalFields.degree,
-								});
-							}
-							if (additionalFields.facebookClickId) {
-								body.push({
-									property: 'hs_facebook_click_id',
-									value: additionalFields.facebookClickId,
-								});
-							}
-							if (additionalFields.faxNumber) {
-								body.push({
-									property: 'fax',
-									value: additionalFields.faxNumber,
-								});
-							}
-							if (additionalFields.fieldOfStudy) {
-								body.push({
-									property: 'field_of_study',
-									value: additionalFields.fieldOfStudy,
-								});
-							}
-							if (additionalFields.firstName) {
-								body.push({
-									property: 'firstname',
-									value: additionalFields.firstName,
-								});
-							}
-							if (additionalFields.gender) {
-								body.push({
-									property: 'gender',
-									value: additionalFields.gender,
-								});
-							}
-							if (additionalFields.googleAdClickId) {
-								body.push({
-									property: 'hs_google_click_id',
-									value: additionalFields.googleAdClickId,
-								});
-							}
-							if (additionalFields.graduationDate) {
-								body.push({
-									property: 'graduation_date',
-									value: additionalFields.graduationDate,
-								});
-							}
-							if (additionalFields.industry) {
-								body.push({
-									property: 'industry',
-									value: additionalFields.industry,
-								});
-							}
-							if (additionalFields.jobFunction) {
-								body.push({
-									property: 'job_function',
-									value: additionalFields.jobFunction,
-								});
-							}
-							if (additionalFields.jobTitle) {
-								body.push({
-									property: 'jobtitle',
-									value: additionalFields.jobTitle,
-								});
-							}
-							if (additionalFields.lastName) {
-								body.push({
-									property: 'lastname',
-									value: additionalFields.lastName,
-								});
-							}
-							if (additionalFields.leadStatus) {
-								body.push({
-									property: 'hs_lead_status',
-									value: additionalFields.leadStatus,
-								});
-							}
-							if (additionalFields.processingContactData) {
-								body.push({
-									property: 'hs_legal_basis',
-									value: additionalFields.processingContactData,
-								});
-							}
-							if (additionalFields.lifeCycleStage) {
-								body.push({
-									property: 'lifecyclestage',
-									value: additionalFields.lifeCycleStage,
-								});
-							}
-							if (additionalFields.maritalStatus) {
-								body.push({
-									property: 'marital_status',
-									value: additionalFields.maritalStatus,
-								});
-							}
-							if (additionalFields.membershipNote) {
-								body.push({
-									property: 'hs_content_membership_notes',
-									value: additionalFields.membershipNote,
-								});
-							}
-							if (additionalFields.message) {
-								body.push({
-									property: 'message',
-									value: additionalFields.message,
-								});
-							}
-							if (additionalFields.mobilePhoneNumber) {
-								body.push({
-									property: 'mobilephone',
-									value: additionalFields.mobilePhoneNumber,
-								});
-							}
-							if (additionalFields.numberOfEmployees) {
-								body.push({
-									property: 'numemployees',
-									value: additionalFields.numberOfEmployees,
-								});
-							}
-							if (additionalFields.originalSource) {
-								body.push({
-									property: 'hs_analytics_source',
-									value: additionalFields.originalSource,
-								});
-							}
-							if (additionalFields.phoneNumber) {
-								body.push({
-									property: 'phone',
-									value: additionalFields.phoneNumber,
-								});
-							}
-							if (additionalFields.postalCode) {
-								body.push({
-									property: 'zip',
-									value: additionalFields.postalCode,
-								});
-							}
-							if (additionalFields.prefferedLanguage) {
-								body.push({
-									property: 'hs_language',
-									value: additionalFields.prefferedLanguage,
-								});
-							}
-							if (additionalFields.relationshipStatus) {
-								body.push({
-									property: 'relationship_status',
-									value: additionalFields.relationshipStatus,
-								});
-							}
-							if (additionalFields.salutation) {
-								body.push({
-									property: 'salutation',
-									value: additionalFields.salutation,
-								});
-							}
-							if (additionalFields.school) {
-								body.push({
-									property: 'school',
-									value: additionalFields.school,
-								});
-							}
-							if (additionalFields.seniority) {
-								body.push({
-									property: 'seniority',
-									value: additionalFields.seniority,
-								});
-							}
-							if (additionalFields.startDate) {
-								body.push({
-									property: 'start_date',
-									value: additionalFields.startDate,
-								});
-							}
-							if (additionalFields.stateRegion) {
-								body.push({
-									property: 'state',
-									value: additionalFields.stateRegion,
-								});
-							}
-							if (additionalFields.status) {
-								body.push({
-									property: 'hs_content_membership_status',
-									value: additionalFields.status,
-								});
-							}
-							if (additionalFields.streetAddress) {
-								body.push({
-									property: 'address',
-									value: additionalFields.streetAddress,
-								});
-							}
-							if (additionalFields.twitterUsername) {
-								body.push({
-									property: 'twitterhandle',
-									value: additionalFields.twitterUsername,
-								});
-							}
-							if (additionalFields.websiteUrl) {
-								body.push({
-									property: 'website',
-									value: additionalFields.websiteUrl,
-								});
-							}
-							if (additionalFields.workEmail) {
-								body.push({
-									property: 'work_email',
-									value: additionalFields.workEmail,
-								});
-							}
-
-							if (additionalFields.customPropertiesUi) {
-								const customProperties = (additionalFields.customPropertiesUi as IDataObject)
-									.customPropertiesValues as IDataObject[];
-
-								if (customProperties) {
-									for (const customProperty of customProperties) {
-										body.push({
-											property: customProperty.property,
-											value: customProperty.value,
-										});
-									}
-								}
-							}
-
-							const endpoint = `/contacts/v1/contact/createOrUpdate/email/${email}`;
-							responseData = await hubspotApiRequest.call(this, 'POST', endpoint, {
-								properties: body,
-							});
-
-							if (additionalFields.associatedCompanyId) {
-								const companyAssociations: IDataObject[] = [];
-								companyAssociations.push({
-									fromObjectId: responseData.vid,
-									toObjectId: additionalFields.associatedCompanyId,
-									category: 'HUBSPOT_DEFINED',
-									definitionId: 1,
-								});
-								await hubspotApiRequest.call(
-									this,
-									'PUT',
-									'/crm-associations/v1/associations/create-batch',
-									companyAssociations,
-								);
-							}
-
-							if (resolveData) {
-								const isNew = responseData.isNew;
-								if (additionalFields.properties) {
-									qs.property = additionalFields.properties as string[];
-								}
-								responseData = await hubspotApiRequest.call(
-									this,
-									'GET',
-									`/contacts/v1/contact/vid/${responseData.vid}/profile`,
-									{},
-									qs,
-								);
-								responseData.isNew = isNew;
-							}
-						}
-						//https://developers.hubspot.com/docs/methods/contacts/get_contact
-						if (operation === 'get') {
-							const contactId = this.getNodeParameter('contactId', i) as string;
-							const additionalFields = this.getNodeParameter('additionalFields', i);
-							if (additionalFields.formSubmissionMode) {
-								qs.formSubmissionMode = additionalFields.formSubmissionMode as string;
-							}
-							if (additionalFields.listMemberships) {
-								qs.showListMemberships = additionalFields.listMemberships as boolean;
-							}
-							if (additionalFields.properties) {
-								qs.property = additionalFields.properties as string[];
-							}
-							if (additionalFields.propertyMode) {
-								qs.propertyMode = snakeCase(additionalFields.propertyMode as string);
-							}
-							const endpoint = `/contacts/v1/contact/vid/${contactId}/profile`;
-							responseData = await hubspotApiRequest.call(this, 'GET', endpoint, {}, qs);
-						}
-						//https://developers.hubspot.com/docs/methods/contacts/get_contacts
-						if (operation === 'getAll') {
-							const additionalFields = this.getNodeParameter('additionalFields', i);
-							const returnAll = this.getNodeParameter('returnAll', 0);
-							if (additionalFields.formSubmissionMode) {
-								qs.formSubmissionMode = additionalFields.formSubmissionMode as string;
-							}
-							if (additionalFields.listMemberships) {
-								qs.showListMemberships = additionalFields.listMemberships as boolean;
-							}
-							if (additionalFields.properties) {
-								qs.property = additionalFields.properties as string[];
-							}
-							if (additionalFields.propertyMode) {
-								qs.propertyMode = snakeCase(additionalFields.propertyMode as string);
-							}
-							const endpoint = '/contacts/v1/lists/all/contacts/all';
-							if (returnAll) {
-								responseData = await hubspotApiRequestAllItems.call(
-									this,
-									'contacts',
-									'GET',
-									endpoint,
-									{},
-									qs,
-								);
-							} else {
-								qs.count = this.getNodeParameter('limit', 0);
-								responseData = await hubspotApiRequest.call(this, 'GET', endpoint, {}, qs);
-								responseData = responseData.contacts;
-							}
-						}
-						//https://developers.hubspot.com/docs/methods/contacts/get_recently_created_contacts
-						if (operation === 'getRecentlyCreatedUpdated') {
-							const returnAll = this.getNodeParameter('returnAll', 0);
-							const filters = this.getNodeParameter('filters', i);
-							if (filters.formSubmissionMode) {
-								qs.formSubmissionMode = filters.formSubmissionMode as string;
-							}
-							if (filters.listMemberships) {
-								qs.showListMemberships = filters.listMemberships as boolean;
-							}
-							if (filters.properties) {
-								qs.property = filters.properties as string[];
-							}
-							if (filters.propertyMode) {
-								qs.propertyMode = snakeCase(filters.propertyMode as string);
-							}
-
-							const endpoint = '/contacts/v1/lists/recently_updated/contacts/recent';
-
-							if (returnAll) {
-								responseData = await hubspotApiRequestAllItems.call(
-									this,
-									'contacts',
-									'GET',
-									endpoint,
-									{},
-									qs,
-								);
-							} else {
-								qs.count = this.getNodeParameter('limit', 0);
-								responseData = await hubspotApiRequest.call(this, 'GET', endpoint, {}, qs);
-								responseData = responseData.contacts;
-							}
-						}
-						//https://developers.hubspot.com/docs/methods/contacts/delete_contact
-						if (operation === 'delete') {
-							const contactId = this.getNodeParameter('contactId', i) as string;
-							const endpoint = `/contacts/v1/contact/vid/${contactId}`;
-							responseData = await hubspotApiRequest.call(this, 'DELETE', endpoint);
-						}
-						//https://developers.hubspot.com/docs/api/crm/search
-						if (operation === 'search') {
-							const additionalFields = this.getNodeParameter('additionalFields', i);
-							const returnAll = this.getNodeParameter('returnAll', 0);
-							const filtersGroupsUi = this.getNodeParameter('filterGroupsUi', i) as IDataObject;
-							const sortBy = additionalFields.sortBy || 'createdate';
-							const direction = additionalFields.direction || 'DESCENDING';
-
-							const body: IDataObject = {
-								sorts: [
-									{
-										propertyName: sortBy,
-										direction,
-									},
-								],
-							};
-
-							if (filtersGroupsUi) {
-								const filterGroupValues = filtersGroupsUi.filterGroupsValues as IDataObject[];
-								if (filterGroupValues) {
-									body.filterGroups = [];
-									for (const filterGroupValue of filterGroupValues) {
-										if (filterGroupValue.filtersUi) {
-											const filterValues = (filterGroupValue.filtersUi as IDataObject)
-												.filterValues as IDataObject[];
-											if (filterValues) {
-												//@ts-ignore
-												body.filterGroups.push({ filters: filterValues });
-											}
-										}
-									}
-								}
-							}
-
-							Object.assign(body, additionalFields);
-
-							const endpoint = '/crm/v3/objects/contacts/search';
-
-							if (returnAll) {
-								responseData = await hubspotApiRequestAllItems.call(
-									this,
-									'results',
-									'POST',
-									endpoint,
-									body,
-									qs,
-								);
-							} else {
-								body.limit = this.getNodeParameter('limit', 0);
-								responseData = await hubspotApiRequest.call(this, 'POST', endpoint, body, qs);
-								responseData = responseData.results;
-							}
-						}
-					}
-					//https://developers.hubspot.com/docs/methods/companies/companies-overview
-					if (resource === 'company') {
-						//https://developers.hubspot.com/docs/methods/companies/create_company
-						if (operation === 'create') {
-							const name = this.getNodeParameter('name', i) as string;
-							const additionalFields = this.getNodeParameter('additionalFields', i);
-							const body: IDataObject[] = [];
-							body.push({
-								name: 'name',
-								value: name,
-							});
-							if (additionalFields.aboutUs) {
-								body.push({
-									name: 'about_us',
-									value: additionalFields.aboutUs,
-								});
-							}
-							if (additionalFields.annualRevenue) {
-								body.push({
-									name: 'annualrevenue',
-									value: (additionalFields.annualRevenue as number).toString(),
-								});
-							}
-							if (additionalFields.city) {
-								body.push({
-									name: 'city',
-									value: additionalFields.city,
-								});
-							}
-							if (additionalFields.closeDate) {
-								body.push({
-									name: 'closedate',
-									value: new Date(additionalFields.closeDate as string).getTime(),
-								});
-							}
-							if (additionalFields.companyDomainName) {
-								body.push({
-									name: 'domain',
-									value: additionalFields.companyDomainName,
-								});
-							}
-							if (additionalFields.companyOwner) {
-								body.push({
-									name: 'hubspot_owner_id',
-									value: additionalFields.companyOwner,
-								});
-							}
-							if (additionalFields.countryRegion) {
-								body.push({
-									name: 'country',
-									value: additionalFields.countryRegion,
-								});
-							}
-							if (additionalFields.description) {
-								body.push({
-									name: 'description',
-									value: additionalFields.description,
-								});
-							}
-							if (additionalFields.facebookFans) {
-								body.push({
-									name: 'facebookfans',
-									value: additionalFields.facebookFans,
-								});
-							}
-							if (additionalFields.googlePlusPage) {
-								body.push({
-									name: 'googleplus_page',
-									value: additionalFields.googlePlusPage,
-								});
-							}
-							if (additionalFields.industry) {
-								body.push({
-									name: 'industry',
-									value: additionalFields.industry,
-								});
-							}
-							if (additionalFields.isPublic) {
-								body.push({
-									name: 'is_public',
-									value: additionalFields.isPublic,
-								});
-							}
-							if (additionalFields.leadStatus) {
-								body.push({
-									name: 'hs_lead_status',
-									value: additionalFields.leadStatus,
-								});
-							}
-							if (additionalFields.lifecycleStatus) {
-								body.push({
-									name: 'lifecyclestage',
-									value: additionalFields.lifecycleStatus,
-								});
-							}
-							if (additionalFields.linkedinBio) {
-								body.push({
-									name: 'linkedinbio',
-									value: additionalFields.linkedinBio,
-								});
-							}
-							if (additionalFields.linkedInCompanyPage) {
-								body.push({
-									name: 'linkedin_company_page',
-									value: additionalFields.linkedInCompanyPage,
-								});
-							}
-							if (additionalFields.numberOfEmployees) {
-								body.push({
-									name: 'numberofemployees',
-									value: additionalFields.numberOfEmployees,
-								});
-							}
-							if (additionalFields.originalSourceType) {
-								body.push({
-									name: 'hs_analytics_source',
-									value: additionalFields.originalSourceType,
-								});
-							}
-							if (additionalFields.phoneNumber) {
-								body.push({
-									name: 'phone',
-									value: additionalFields.phoneNumber,
-								});
-							}
-							if (additionalFields.postalCode) {
-								body.push({
-									name: 'zip',
-									value: additionalFields.postalCode,
-								});
-							}
-							if (additionalFields.stateRegion) {
-								body.push({
-									name: 'state',
-									value: additionalFields.stateRegion,
-								});
-							}
-							if (additionalFields.streetAddress) {
-								body.push({
-									name: 'address',
-									value: additionalFields.streetAddress,
-								});
-							}
-							if (additionalFields.streetAddress2) {
-								body.push({
-									name: 'address2',
-									value: additionalFields.streetAddress2,
-								});
-							}
-							if (additionalFields.targetAccount) {
-								body.push({
-									name: 'hs_target_account',
-									value: additionalFields.targetAccount,
-								});
-							}
-							if (additionalFields.timezone) {
-								body.push({
-									name: 'timezone',
-									value: additionalFields.timezone,
-								});
-							}
-							if (additionalFields.totalMoneyRaised) {
-								body.push({
-									name: 'total_money_raised',
-									value: additionalFields.totalMoneyRaised,
-								});
-							}
-							if (additionalFields.twitterBio) {
-								body.push({
-									name: 'twitterbio',
-									value: additionalFields.twitterBio,
-								});
-							}
-							if (additionalFields.twitterFollowers) {
-								body.push({
-									name: 'twitterfollowers',
-									value: additionalFields.twitterFollowers,
-								});
-							}
-							if (additionalFields.twitterHandle) {
-								body.push({
-									name: 'twitterhandle',
-									value: additionalFields.twitterHandle,
-								});
-							}
-							if (additionalFields.type) {
-								body.push({
-									name: 'type',
-									value: additionalFields.type,
-								});
-							}
-							if (additionalFields.websiteUrl) {
-								body.push({
-									name: 'website',
-									value: additionalFields.websiteUrl,
-								});
-							}
-							if (additionalFields.webTechnologies) {
-								body.push({
-									name: 'web_technologies',
-									value: additionalFields.webTechnologies,
-								});
-							}
-							if (additionalFields.yearFounded) {
-								body.push({
-									name: 'founded_year',
-									value: additionalFields.yearFounded,
-								});
-							}
-							if (additionalFields.customPropertiesUi) {
-								const customProperties = (additionalFields.customPropertiesUi as IDataObject)
-									.customPropertiesValues as IDataObject[];
-
-								if (customProperties) {
-									for (const customProperty of customProperties) {
-										body.push({
-											name: customProperty.property,
-											value: customProperty.value,
-										});
-									}
-								}
-							}
-							const endpoint = '/companies/v2/companies';
-							responseData = await hubspotApiRequest.call(this, 'POST', endpoint, {
-								properties: body,
-							});
-						}
-						//https://developers.hubspot.com/docs/methods/companies/update_company
-						if (operation === 'update') {
-							const companyId = this.getNodeParameter('companyId', i) as string;
-							const updateFields = this.getNodeParameter('updateFields', i);
-							const body: IDataObject[] = [];
-							if (updateFields.name) {
-								body.push({
-									name: 'name',
-									value: updateFields.name,
-								});
-							}
-							if (updateFields.aboutUs) {
-								body.push({
-									name: 'about_us',
-									value: updateFields.aboutUs,
-								});
-							}
-							if (updateFields.annualRevenue) {
-								body.push({
-									name: 'annualrevenue',
-									value: (updateFields.annualRevenue as number).toString(),
-								});
-							}
-							if (updateFields.city) {
-								body.push({
-									name: 'city',
-									value: updateFields.city,
-								});
-							}
-							if (updateFields.closeDate) {
-								body.push({
-									name: 'closedate',
-									value: new Date(updateFields.closeDate as string).getTime(),
-								});
-							}
-							if (updateFields.companyDomainName) {
-								body.push({
-									name: 'domain',
-									value: updateFields.companyDomainName,
-								});
-							}
-							if (updateFields.companyOwner) {
-								body.push({
-									name: 'hubspot_owner_id',
-									value: updateFields.companyOwner,
-								});
-							}
-							if (updateFields.countryRegion) {
-								body.push({
-									name: 'country',
-									value: updateFields.countryRegion,
-								});
-							}
-							if (updateFields.description) {
-								body.push({
-									name: 'description',
-									value: updateFields.description,
-								});
-							}
-							if (updateFields.facebookFans) {
-								body.push({
-									name: 'facebookfans',
-									value: updateFields.facebookFans,
-								});
-							}
-							if (updateFields.googlePlusPage) {
-								body.push({
-									name: 'googleplus_page',
-									value: updateFields.googlePlusPage,
-								});
-							}
-							if (updateFields.industry) {
-								body.push({
-									name: 'industry',
-									value: updateFields.industry,
-								});
-							}
-							if (updateFields.isPublic) {
-								body.push({
-									name: 'is_public',
-									value: updateFields.isPublic,
-								});
-							}
-							if (updateFields.leadStatus) {
-								body.push({
-									name: 'hs_lead_status',
-									value: updateFields.leadStatus,
-								});
-							}
-							if (updateFields.lifecycleStatus) {
-								body.push({
-									name: 'lifecyclestage',
-									value: updateFields.lifecycleStatus,
-								});
-							}
-							if (updateFields.linkedinBio) {
-								body.push({
-									name: 'linkedinbio',
-									value: updateFields.linkedinBio,
-								});
-							}
-							if (updateFields.linkedInCompanyPage) {
-								body.push({
-									name: 'linkedin_company_page',
-									value: updateFields.linkedInCompanyPage,
-								});
-							}
-							if (updateFields.numberOfEmployees) {
-								body.push({
-									name: 'numberofemployees',
-									value: updateFields.numberOfEmployees,
-								});
-							}
-							if (updateFields.originalSourceType) {
-								body.push({
-									name: 'hs_analytics_source',
-									value: updateFields.originalSourceType,
-								});
-							}
-							if (updateFields.phoneNumber) {
-								body.push({
-									name: 'phone',
-									value: updateFields.phoneNumber,
-								});
-							}
-							if (updateFields.postalCode) {
-								body.push({
-									name: 'zip',
-									value: updateFields.postalCode,
-								});
-							}
-							if (updateFields.stateRegion) {
-								body.push({
-									name: 'state',
-									value: updateFields.stateRegion,
-								});
-							}
-							if (updateFields.streetAddress) {
-								body.push({
-									name: 'address',
-									value: updateFields.streetAddress,
-								});
-							}
-							if (updateFields.streetAddress2) {
-								body.push({
-									name: 'address2',
-									value: updateFields.streetAddress2,
-								});
-							}
-							if (updateFields.targetAccount) {
-								body.push({
-									name: 'hs_target_account',
-									value: updateFields.targetAccount,
-								});
-							}
-							if (updateFields.timezone) {
-								body.push({
-									name: 'timezone',
-									value: updateFields.timezone,
-								});
-							}
-							if (updateFields.totalMoneyRaised) {
-								body.push({
-									name: 'total_money_raised',
-									value: updateFields.totalMoneyRaised,
-								});
-							}
-							if (updateFields.twitterBio) {
-								body.push({
-									name: 'twitterbio',
-									value: updateFields.twitterBio,
-								});
-							}
-							if (updateFields.twitterFollowers) {
-								body.push({
-									name: 'twitterfollowers',
-									value: updateFields.twitterFollowers,
-								});
-							}
-							if (updateFields.twitterHandle) {
-								body.push({
-									name: 'twitterhandle',
-									value: updateFields.twitterHandle,
-								});
-							}
-							if (updateFields.type) {
-								body.push({
-									name: 'type',
-									value: updateFields.type,
-								});
-							}
-							if (updateFields.websiteUrl) {
-								body.push({
-									name: 'website',
-									value: updateFields.websiteUrl,
-								});
-							}
-							if (updateFields.webTechnologies) {
-								body.push({
-									name: 'web_technologies',
-									value: updateFields.webTechnologies,
-								});
-							}
-							if (updateFields.yearFounded) {
-								body.push({
-									name: 'founded_year',
-									value: updateFields.yearFounded,
-								});
-							}
-							if (updateFields.customPropertiesUi) {
-								const customProperties = (updateFields.customPropertiesUi as IDataObject)
-									.customPropertiesValues as IDataObject[];
-
-								if (customProperties) {
-									for (const customProperty of customProperties) {
-										body.push({
-											name: customProperty.property,
-											value: customProperty.value,
-										});
-									}
-								}
-							}
-							const endpoint = `/companies/v2/companies/${companyId}`;
-							responseData = await hubspotApiRequest.call(this, 'PUT', endpoint, {
-								properties: body,
-							});
-						}
-						//https://developers.hubspot.com/docs/methods/companies/get_company
-						if (operation === 'get') {
-							const companyId = this.getNodeParameter('companyId', i) as string;
-							const additionalFields = this.getNodeParameter('additionalFields', i);
-							if (additionalFields.includeMergeAudits) {
-								qs.includeMergeAudits = additionalFields.includeMergeAudits as boolean;
-							}
-							const endpoint = `/companies/v2/companies/${companyId}`;
-							responseData = await hubspotApiRequest.call(this, 'GET', endpoint, {}, qs);
-						}
-						//https://developers.hubspot.com/docs/methods/companies/get-all-companies
-						if (operation === 'getAll') {
-							const options = this.getNodeParameter('options', i);
-							const returnAll = this.getNodeParameter('returnAll', 0);
-							if (options.includeMergeAudits) {
-								qs.includeMergeAudits = options.includeMergeAudits as boolean;
-							}
-							if (options.properties) {
-								qs.properties = options.properties as string[];
-							}
-							if (options.propertiesWithHistory) {
-								qs.propertiesWithHistory = (options.propertiesWithHistory as string).split(',');
-							}
-							const endpoint = '/companies/v2/companies/paged';
-							if (returnAll) {
-								responseData = await hubspotApiRequestAllItems.call(
-									this,
-									'companies',
-									'GET',
-									endpoint,
-									{},
-									qs,
-								);
-							} else {
-								qs.limit = this.getNodeParameter('limit', 0);
-								responseData = await hubspotApiRequest.call(this, 'GET', endpoint, {}, qs);
-								responseData = responseData.companies;
-							}
-						}
-						//https://developers.hubspot.com/docs/methods/companies/get_companies_modified
-						if (operation === 'getRecentlyCreated' || operation === 'getRecentlyModified') {
-							let endpoint;
-							const returnAll = this.getNodeParameter('returnAll', 0);
-							if (operation === 'getRecentlyCreated') {
-								endpoint = '/companies/v2/companies/recent/created';
-							} else {
-								const filters = this.getNodeParameter('filters', i);
-								if (filters.since) {
-									qs.since = new Date(filters.since as string).getTime();
-								}
-								endpoint = '/companies/v2/companies/recent/modified';
-							}
-							if (returnAll) {
-								responseData = await hubspotApiRequestAllItems.call(
-									this,
-									'results',
-									'GET',
-									endpoint,
-									{},
-									qs,
-								);
-							} else {
-								qs.count = this.getNodeParameter('limit', 0);
-								responseData = await hubspotApiRequest.call(this, 'GET', endpoint, {}, qs);
-								responseData = responseData.results;
-							}
-						}
-						//https://developers.hubspot.com/docs/methods/companies/search_companies_by_domain
-						if (operation === 'searchByDomain') {
-							const domain = this.getNodeParameter('domain', i) as string;
-							const options = this.getNodeParameter('options', i);
-							const returnAll = this.getNodeParameter('returnAll', 0);
-							const body: IDataObject = {
-								requestOptions: {},
-							};
-							if (options.properties) {
-								body.requestOptions = { properties: options.properties as string[] };
-							}
-							const endpoint = `/companies/v2/domains/${domain}/companies`;
-							if (returnAll) {
-								responseData = await hubspotApiRequestAllItems.call(
-									this,
-									'results',
-									'POST',
-									endpoint,
-									body,
-								);
-							} else {
-								body.limit = this.getNodeParameter('limit', 0);
-								responseData = await hubspotApiRequest.call(this, 'POST', endpoint, body);
-								responseData = responseData.results;
-							}
-						}
-						//https://developers.hubspot.com/docs/methods/companies/delete_company
-						if (operation === 'delete') {
-							const companyId = this.getNodeParameter('companyId', i) as string;
-							const endpoint = `/companies/v2/companies/${companyId}`;
-							responseData = await hubspotApiRequest.call(this, 'DELETE', endpoint);
-						}
-					}
-					//https://developers.hubspot.com/docs/methods/deals/deals_overview
-					if (resource === 'deal') {
-						if (operation === 'create') {
-							const body: IDeal = {};
-							body.properties = [];
-							const association: IAssociation = {};
-							const additionalFields = this.getNodeParameter('additionalFields', i);
-							const stage = this.getNodeParameter('stage', i) as string;
-							if (stage) {
-								body.properties.push({
-									name: 'dealstage',
-									value: stage,
-								});
-							}
-							if (additionalFields.associatedCompany) {
-								association.associatedCompanyIds = additionalFields.associatedCompany as number[];
-							}
-							if (additionalFields.associatedVids) {
-								association.associatedVids = additionalFields.associatedVids as number[];
-							}
-							if (additionalFields.dealName) {
-								body.properties.push({
-									name: 'dealname',
-									value: additionalFields.dealName as string,
-								});
-							}
-							if (additionalFields.closeDate) {
-								body.properties.push({
-									name: 'closedate',
-									value: new Date(additionalFields.closeDate as string).getTime(),
-								});
-							}
-							if (additionalFields.amount) {
-								body.properties.push({
-									name: 'amount',
-									value: additionalFields.amount as string,
-								});
-							}
-							if (additionalFields.dealType) {
-								body.properties.push({
-									name: 'dealtype',
-									value: additionalFields.dealType as string,
-								});
-							}
-							if (additionalFields.pipeline) {
-								body.properties.push({
-									name: 'pipeline',
-									value: additionalFields.pipeline as string,
-								});
-							}
-							if (additionalFields.description) {
-								body.properties.push({
-									name: 'description',
-									value: additionalFields.description as string,
-								});
-							}
-							if (additionalFields.customPropertiesUi) {
-								const customProperties = (additionalFields.customPropertiesUi as IDataObject)
-									.customPropertiesValues as IDataObject[];
-								if (customProperties) {
-									for (const customProperty of customProperties) {
-										body.properties.push({
-											name: customProperty.property,
-											value: customProperty.value,
-										});
-									}
-								}
-							}
-							body.associations = association;
-							const endpoint = '/deals/v1/deal';
-							responseData = await hubspotApiRequest.call(this, 'POST', endpoint, body);
-						}
-						if (operation === 'update') {
-							const body: IDeal = {};
-							body.properties = [];
-							const updateFields = this.getNodeParameter('updateFields', i);
-							const dealId = this.getNodeParameter('dealId', i) as string;
-							if (updateFields.stage) {
-								body.properties.push({
-									name: 'dealstage',
-									value: updateFields.stage as string,
-								});
-							}
-							if (updateFields.dealName) {
-								body.properties.push({
-									name: 'dealname',
-									value: updateFields.dealName as string,
-								});
-							}
-							if (updateFields.closeDate) {
-								body.properties.push({
-									name: 'closedate',
-									value: new Date(updateFields.closeDate as string).getTime(),
-								});
-							}
-							if (updateFields.amount) {
-								body.properties.push({
-									name: 'amount',
-									value: updateFields.amount as string,
-								});
-							}
-							if (updateFields.dealType) {
-								body.properties.push({
-									name: 'dealtype',
-									value: updateFields.dealType as string,
-								});
-							}
-							if (updateFields.pipeline) {
-								body.properties.push({
-									name: 'pipeline',
-									value: updateFields.pipeline as string,
-								});
-							}
-							if (updateFields.description) {
-								body.properties.push({
-									name: 'description',
-									value: updateFields.description as string,
-								});
-							}
-							if (updateFields.customPropertiesUi) {
-								const customProperties = (updateFields.customPropertiesUi as IDataObject)
-									.customPropertiesValues as IDataObject[];
-								if (customProperties) {
-									for (const customProperty of customProperties) {
-										body.properties.push({
-											name: customProperty.property,
-											value: customProperty.value,
-										});
-									}
-								}
-							}
-							const endpoint = `/deals/v1/deal/${dealId}`;
-							responseData = await hubspotApiRequest.call(this, 'PUT', endpoint, body);
-						}
-						if (operation === 'get') {
-							const dealId = this.getNodeParameter('dealId', i) as string;
-							const additionalFields = this.getNodeParameter('additionalFields', i);
-							if (additionalFields.includePropertyVersions) {
-								qs.includePropertyVersions = additionalFields.includePropertyVersions as boolean;
-							}
-							const endpoint = `/deals/v1/deal/${dealId}`;
-							responseData = await hubspotApiRequest.call(this, 'GET', endpoint);
-						}
-						if (operation === 'getAll') {
-							const filters = this.getNodeParameter('filters', i);
-							const returnAll = this.getNodeParameter('returnAll', 0);
-							if (filters.includeAssociations) {
-								qs.includeAssociations = filters.includeAssociations as boolean;
-							}
-							if (filters.properties) {
-								const properties = filters.properties as string | string[];
-								qs.properties = !Array.isArray(filters.properties)
-									? (properties as string).split(',')
-									: properties;
-							}
-							if (filters.propertiesWithHistory) {
-								const propertiesWithHistory = filters.propertiesWithHistory as string | string[];
-								qs.propertiesWithHistory = !Array.isArray(filters.propertiesWithHistory)
-									? (propertiesWithHistory as string).split(',')
-									: propertiesWithHistory;
-							}
-							const endpoint = '/deals/v1/deal/paged';
-							if (returnAll) {
-								responseData = await hubspotApiRequestAllItems.call(
-									this,
-									'deals',
-									'GET',
-									endpoint,
-									{},
-									qs,
-								);
-							} else {
-								qs.limit = this.getNodeParameter('limit', 0);
-								responseData = await hubspotApiRequest.call(this, 'GET', endpoint, {}, qs);
-								responseData = responseData.deals;
-							}
-						}
-						if (operation === 'getRecentlyCreated' || operation === 'getRecentlyModified') {
-							let endpoint;
-							const filters = this.getNodeParameter('filters', i);
-							const returnAll = this.getNodeParameter('returnAll', 0);
-							if (filters.since) {
-								qs.since = new Date(filters.since as string).getTime();
-							}
-							if (filters.includePropertyVersions) {
-								qs.includePropertyVersions = filters.includePropertyVersions as boolean;
-							}
-							if (operation === 'getRecentlyCreated') {
-								endpoint = '/deals/v1/deal/recent/created';
-							} else {
-								endpoint = '/deals/v1/deal/recent/modified';
-							}
-							if (returnAll) {
-								responseData = await hubspotApiRequestAllItems.call(
-									this,
-									'results',
-									'GET',
-									endpoint,
-									{},
-									qs,
-								);
-							} else {
-								qs.count = this.getNodeParameter('limit', 0);
-								responseData = await hubspotApiRequest.call(this, 'GET', endpoint, {}, qs);
-								responseData = responseData.results;
-							}
-						}
-						if (operation === 'delete') {
-							const dealId = this.getNodeParameter('dealId', i) as string;
-							const endpoint = `/deals/v1/deal/${dealId}`;
-							responseData = await hubspotApiRequest.call(this, 'DELETE', endpoint);
-						}
-						//https://developers.hubspot.com/docs/api/crm/search
-						if (operation === 'search') {
-							const additionalFields = this.getNodeParameter('additionalFields', i);
-							const returnAll = this.getNodeParameter('returnAll', 0);
-							const filtersGroupsUi = this.getNodeParameter('filterGroupsUi', i) as IDataObject;
-							const sortBy = additionalFields.sortBy || 'createdate';
-							const direction = additionalFields.direction || 'DESCENDING';
-
-							const body: IDataObject = {
-								sorts: [
-									{
-										propertyName: sortBy,
-										direction,
-									},
-								],
-							};
-
-							if (filtersGroupsUi) {
-								const filterGroupValues = filtersGroupsUi.filterGroupsValues as IDataObject[];
-								if (filterGroupValues) {
-									body.filterGroups = [];
-									for (const filterGroupValue of filterGroupValues) {
-										if (filterGroupValue.filtersUi) {
-											const filterValues = (filterGroupValue.filtersUi as IDataObject)
-												.filterValues as IDataObject[];
-											if (filterValues) {
-												//@ts-ignore
-												body.filterGroups.push({ filters: filterValues });
-											}
-										}
-									}
-								}
-							}
-
-							Object.assign(body, additionalFields);
-
-							const endpoint = '/crm/v3/objects/deals/search';
-
-							if (returnAll) {
-								responseData = await hubspotApiRequestAllItems.call(
-									this,
-									'results',
-									'POST',
-									endpoint,
-									body,
-									qs,
-								);
-							} else {
-								body.limit = this.getNodeParameter('limit', 0);
-								responseData = await hubspotApiRequest.call(this, 'POST', endpoint, body, qs);
-								responseData = responseData.results;
-							}
-						}
-					}
-					if (resource === 'engagement') {
-						//https://legacydocs.hubspot.com/docs/methods/engagements/create_engagement
-						if (operation === 'create') {
-							const type = this.getNodeParameter('type', i) as string;
-							const metadata = this.getNodeParameter('metadata', i) as IDataObject;
-							const associations = this.getNodeParameter(
-								'additionalFields.associations',
-								i,
-								{},
-							) as IDataObject;
-
-							if (!Object.keys(metadata).length) {
-								throw new NodeOperationError(
-									this.getNode(),
-									'At least one metadata field needs to set',
-									{ itemIndex: i },
-								);
-							}
-
-							const body: {
-								engagement: { type: string };
-								metadata: IDataObject;
-								associations: IDataObject;
-							} = {
-								engagement: {
-									type: type.toUpperCase(),
-								},
-								metadata: {},
-								associations: {},
-							};
-
-							if (type === 'email') {
-								body.metadata = getEmailMetadata(metadata);
-							}
-
-							if (type === 'task') {
-								body.metadata = getTaskMetadata(metadata);
-							}
-
-							if (type === 'meeting') {
-								body.metadata = getMeetingMetadata(metadata);
-							}
-
-							if (type === 'call') {
-								body.metadata = getCallMetadata(metadata);
-							}
-
-							//@ts-ignore
-							body.associations = getAssociations(associations);
-
-							const endpoint = '/engagements/v1/engagements';
-							responseData = await hubspotApiRequest.call(this, 'POST', endpoint, body);
-						}
-						//https://legacydocs.hubspot.com/docs/methods/engagements/get_engagement
-						if (operation === 'delete') {
-							const engagementId = this.getNodeParameter('engagementId', i) as string;
-							const endpoint = `/engagements/v1/engagements/${engagementId}`;
-							responseData = await hubspotApiRequest.call(this, 'DELETE', endpoint, {}, qs);
-							responseData = { success: true };
-						}
-						//https://legacydocs.hubspot.com/docs/methods/engagements/get_engagement
-						if (operation === 'get') {
-							const engagementId = this.getNodeParameter('engagementId', i) as string;
-							const endpoint = `/engagements/v1/engagements/${engagementId}`;
-							responseData = await hubspotApiRequest.call(this, 'GET', endpoint, {}, qs);
-						}
-						//https://legacydocs.hubspot.com/docs/methods/engagements/get-all-engagements
-						if (operation === 'getAll') {
-							const returnAll = this.getNodeParameter('returnAll', 0);
-							const endpoint = '/engagements/v1/engagements/paged';
-							if (returnAll) {
-								responseData = await hubspotApiRequestAllItems.call(
-									this,
-									'results',
-									'GET',
-									endpoint,
-									{},
-									qs,
-								);
-							} else {
-								qs.limit = this.getNodeParameter('limit', 0);
-								responseData = await hubspotApiRequest.call(this, 'GET', endpoint, {}, qs);
-								responseData = responseData.results;
-							}
-						}
-					}
-					//https://developers.hubspot.com/docs/methods/forms/forms_overview
-					if (resource === 'form') {
-						//https://developers.hubspot.com/docs/methods/forms/v2/get_fields
-						if (operation === 'getFields') {
-							const formId = this.getNodeParameter('formId', i) as string;
-							responseData = await hubspotApiRequest.call(
-								this,
-								'GET',
-								`/forms/v2/fields/${formId}`,
-							);
-						}
-						//https://developers.hubspot.com/docs/methods/forms/submit_form_v3
-						if (operation === 'submit') {
-							const formId = this.getNodeParameter('formId', i) as string;
-							const additionalFields = this.getNodeParameter('additionalFields', i);
-							const context = (this.getNodeParameter('contextUi', i) as IDataObject)
-								.contextValue as IDataObject;
-							const legalConsent = (this.getNodeParameter('lengalConsentUi', i) as IDataObject)
-								.lengalConsentValues as IDataObject;
-							const legitimateInteres = (this.getNodeParameter('lengalConsentUi', i) as IDataObject)
-								.legitimateInterestValues as IDataObject;
-							const { portalId } = await hubspotApiRequest.call(
-								this,
-								'GET',
-								`/forms/v2/forms/${formId}`,
-							);
-							const body: IForm = {
-								formId,
-								portalId,
-								legalConsentOptions: {},
-								fields: [],
-							};
-							if (additionalFields.submittedAt) {
-								body.submittedAt = new Date(additionalFields.submittedAt as string).getTime();
-							}
-							if (additionalFields.skipValidation) {
-								body.skipValidation = additionalFields.skipValidation as boolean;
-							}
-							const consent: IDataObject = {};
-							if (legalConsent) {
-								if (legalConsent.consentToProcess) {
-									consent.consentToProcess = legalConsent.consentToProcess as boolean;
-								}
-								if (legalConsent.text) {
-									consent.text = legalConsent.text as string;
-								}
-								if (legalConsent.communicationsUi) {
-									consent.communications = (legalConsent.communicationsUi as IDataObject)
-										.communicationValues as IDataObject;
-								}
-							}
-							body.legalConsentOptions!.consent = consent;
-							const fields: IDataObject = items[i].json;
-							for (const key of Object.keys(fields)) {
-								body.fields?.push({ name: key, value: fields[key] });
-							}
-							if (body.legalConsentOptions!.legitimateInterest) {
-								Object.assign(body, {
-									legalConsentOptions: { legitimateInterest: legitimateInteres },
-								});
-							}
-							if (context) {
-								clean(context);
-								Object.assign(body, { context });
-							}
-							const uri = `https://api.hsforms.com/submissions/v3/integration/submit/${portalId}/${formId}`;
-							responseData = await hubspotApiRequest.call(this, 'POST', '', body, {}, uri);
-						}
-					}
-					//https://developers.hubspot.com/docs/methods/tickets/tickets-overview
-					if (resource === 'ticket') {
-						//https://developers.hubspot.com/docs/methods/tickets/create-ticket
-						if (operation === 'create') {
-							const additionalFields = this.getNodeParameter('additionalFields', i);
-							const pipelineId = this.getNodeParameter('pipelineId', i) as string;
-							const stageId = this.getNodeParameter('stageId', i) as string;
-							const ticketName = this.getNodeParameter('ticketName', i) as string;
-							const body: IDataObject[] = [
-								{
-									// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
-									name: 'hs_pipeline',
-									value: pipelineId,
-								},
-								{
-									// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
-									name: 'hs_pipeline_stage',
-									value: stageId,
-								},
-								{
-									// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
-									name: 'subject',
-									value: ticketName,
-								},
-							];
-							if (additionalFields.category) {
-								body.push({
-									name: 'hs_ticket_category',
-									value: additionalFields.category as string,
-								});
-							}
-							if (additionalFields.closeDate) {
-								body.push({
-									name: 'closed_date',
-									value: new Date(additionalFields.closeDate as string).getTime(),
-								});
-							}
-							if (additionalFields.createDate) {
-								body.push({
-									name: 'createdate',
-									value: new Date(additionalFields.createDate as string).getTime(),
-								});
-							}
-							if (additionalFields.description) {
-								body.push({
-									name: 'content',
-									value: additionalFields.description as string,
-								});
-							}
-							if (additionalFields.priority) {
-								body.push({
-									name: 'hs_ticket_priority',
-									value: additionalFields.priority as string,
-								});
-							}
-							if (additionalFields.resolution) {
-								body.push({
-									name: 'hs_resolution',
-									value: additionalFields.resolution as string,
-								});
-							}
-							if (additionalFields.source) {
-								body.push({
-									name: 'source_type',
-									value: additionalFields.source as string,
-								});
-							}
-							if (additionalFields.ticketOwnerId) {
-								body.push({
-									name: 'hubspot_owner_id',
-									value: additionalFields.ticketOwnerId as string,
-								});
-							}
-							const endpoint = '/crm-objects/v1/objects/tickets';
-							responseData = await hubspotApiRequest.call(this, 'POST', endpoint, body);
-
-							if (additionalFields.associatedCompanyIds) {
-								const companyAssociations: IDataObject[] = [];
-								for (const companyId of additionalFields.associatedCompanyIds as IDataObject[]) {
-									companyAssociations.push({
-										fromObjectId: responseData.objectId,
-										toObjectId: companyId,
-										category: 'HUBSPOT_DEFINED',
-										definitionId: 26,
-									});
-								}
-								await hubspotApiRequest.call(
-									this,
-									'PUT',
-									'/crm-associations/v1/associations/create-batch',
-									companyAssociations,
-								);
-							}
-
-							if (additionalFields.associatedContactIds) {
-								const contactAssociations: IDataObject[] = [];
-								for (const contactId of additionalFields.associatedContactIds as IDataObject[]) {
-									contactAssociations.push({
-										fromObjectId: responseData.objectId,
-										toObjectId: contactId,
-										category: 'HUBSPOT_DEFINED',
-										definitionId: 16,
-									});
-								}
-								await hubspotApiRequest.call(
-									this,
-									'PUT',
-									'/crm-associations/v1/associations/create-batch',
-									contactAssociations,
-								);
-							}
-						}
-						//https://developers.hubspot.com/docs/methods/tickets/get_ticket_by_id
-						if (operation === 'get') {
-							const ticketId = this.getNodeParameter('ticketId', i) as string;
-							const additionalFields = this.getNodeParameter('additionalFields', i);
-							if (additionalFields.properties) {
-								qs.properties = additionalFields.properties as string[];
-							}
-							if (additionalFields.propertiesWithHistory) {
-								qs.propertiesWithHistory = (additionalFields.propertiesWithHistory as string).split(
-									',',
-								);
-							}
-							if (additionalFields.includeDeleted) {
-								qs.includeDeleted = additionalFields.includeDeleted as boolean;
-							}
-							const endpoint = `/crm-objects/v1/objects/tickets/${ticketId}`;
-							responseData = await hubspotApiRequest.call(this, 'GET', endpoint, {}, qs);
-						}
-						//https://developers.hubspot.com/docs/methods/tickets/get-all-tickets
-						if (operation === 'getAll') {
-							const additionalFields = this.getNodeParameter('additionalFields', i);
-							const returnAll = this.getNodeParameter('returnAll', 0);
-							if (additionalFields.properties) {
-								qs.properties = additionalFields.properties as string[];
-							}
-							if (additionalFields.propertiesWithHistory) {
-								qs.propertiesWithHistory = (additionalFields.propertiesWithHistory as string).split(
-									',',
-								);
-							}
-							const endpoint = '/crm-objects/v1/objects/tickets/paged';
-							if (returnAll) {
-								responseData = await hubspotApiRequestAllItems.call(
-									this,
-									'objects',
-									'GET',
-									endpoint,
-									{},
-									qs,
-								);
-							} else {
-								qs.limit = this.getNodeParameter('limit', 0);
-								responseData = await hubspotApiRequestAllItems.call(
-									this,
-									'objects',
-									'GET',
-									endpoint,
-									{},
-									qs,
-								);
-								responseData = responseData.splice(0, qs.limit);
-							}
-						}
-						//https://developers.hubspot.com/docs/methods/tickets/delete-ticket
-						if (operation === 'delete') {
-							const ticketId = this.getNodeParameter('ticketId', i) as string;
-							const endpoint = `/crm-objects/v1/objects/tickets/${ticketId}`;
-							await hubspotApiRequest.call(this, 'DELETE', endpoint);
-							responseData = { success: true };
-						}
-						//https://developers.hubspot.com/docs/methods/tickets/update-ticket
-						if (operation === 'update') {
-							const updateFields = this.getNodeParameter('updateFields', i);
-							const ticketId = this.getNodeParameter('ticketId', i) as string;
-							const body: IDataObject[] = [];
-							if (updateFields.pipelineId) {
-								body.push({
-									name: 'hs_pipeline',
-									value: updateFields.pipelineId as string,
-								});
-							}
-							if (updateFields.stageId) {
-								body.push({
-									name: 'hs_pipeline_stage',
-									value: updateFields.stageId as string,
-								});
-							}
-							if (updateFields.ticketName) {
-								body.push({
-									name: 'subject',
-									value: updateFields.ticketName as string,
-								});
-							}
-							if (updateFields.category) {
-								body.push({
-									name: 'hs_ticket_category',
-									value: updateFields.category as string,
-								});
-							}
-							if (updateFields.closeDate) {
-								body.push({
-									name: 'closed_date',
-									value: new Date(updateFields.createDate as string).getTime(),
-								});
-							}
-							if (updateFields.createDate) {
-								body.push({
-									name: 'createdate',
-									value: new Date(updateFields.createDate as string).getTime(),
-								});
-							}
-							if (updateFields.description) {
-								body.push({
-									name: 'content',
-									value: updateFields.description as string,
-								});
-							}
-							if (updateFields.priority) {
-								body.push({
-									name: 'hs_ticket_priority',
-									value: updateFields.priority as string,
-								});
-							}
-							if (updateFields.resolution) {
-								body.push({
-									name: 'hs_resolution',
-									value: updateFields.resolution as string,
-								});
-							}
-							if (updateFields.source) {
-								body.push({
-									name: 'source_type',
-									value: updateFields.source as string,
-								});
-							}
-							if (updateFields.ticketOwnerId) {
-								body.push({
-									name: 'hubspot_owner_id',
-									value: updateFields.ticketOwnerId as string,
-								});
-							}
-							const endpoint = `/crm-objects/v1/objects/tickets/${ticketId}`;
-							responseData = await hubspotApiRequest.call(this, 'PUT', endpoint, body);
-
-							if (updateFields.associatedCompanyIds) {
-								const companyAssociations: IDataObject[] = [];
-								for (const companyId of updateFields.associatedCompanyIds as IDataObject[]) {
-									companyAssociations.push({
-										fromObjectId: responseData.objectId,
-										toObjectId: companyId,
-										category: 'HUBSPOT_DEFINED',
-										definitionId: 26,
-									});
-								}
-								await hubspotApiRequest.call(
-									this,
-									'PUT',
-									'/crm-associations/v1/associations/create-batch',
-									companyAssociations,
-								);
-							}
-
-							if (updateFields.associatedContactIds) {
-								const contactAssociations: IDataObject[] = [];
-								for (const contactId of updateFields.associatedContactIds as IDataObject[]) {
-									contactAssociations.push({
-										fromObjectId: responseData.objectId,
-										toObjectId: contactId,
-										category: 'HUBSPOT_DEFINED',
-										definitionId: 16,
-									});
-								}
-								await hubspotApiRequest.call(
-									this,
-									'PUT',
-									'/crm-associations/v1/associations/create-batch',
-									contactAssociations,
-								);
-							}
-						}
-					}
-					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData as IDataObject[]),
-						{ itemData: { item: i } },
-					);
-					returnData.push(...executionData);
-				} catch (error) {
-					if (this.continueOnFail()) {
-						returnData.push({ json: { error: (error as JsonObject).message } });
-						continue;
-					}
-					throw error;
-				}
-			}
-		}
-		return this.prepareOutputData(returnData);
+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 {
+	constructor() {
+		const baseDescription: INodeTypeBaseDescription = {
+			displayName: 'HubSpot',
+			name: 'hubspot',
+			icon: 'file:hubspot.svg',
+			group: ['output'],
+			subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+			description: 'Consume HubSpot API',
+			defaultVersion: 2.1,
+		};
+
+		const nodeVersions: IVersionedNodeType['nodeVersions'] = {
+			1: new HubspotV1(baseDescription),
+			2: new HubspotV2(baseDescription),
+			2.1: new HubspotV2(baseDescription),
+		};
+
+		super(nodeVersions, baseDescription);
 	}
 }
diff --git a/packages/nodes-base/nodes/Hubspot/HubspotTrigger.node.ts b/packages/nodes-base/nodes/Hubspot/HubspotTrigger.node.ts
index 31fee0fd3c380..63bd7905fa925 100644
--- a/packages/nodes-base/nodes/Hubspot/HubspotTrigger.node.ts
+++ b/packages/nodes-base/nodes/Hubspot/HubspotTrigger.node.ts
@@ -1,3 +1,4 @@
+import { createHash } from 'crypto';
 import type {
 	IHookFunctions,
 	IWebhookFunctions,
@@ -10,9 +11,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import { hubspotApiRequest, propertyEvents } from './GenericFunctions';
-
-import { createHash } from 'crypto';
+import { hubspotApiRequest, propertyEvents } from './V1/GenericFunctions';
 
 export class HubspotTrigger implements INodeType {
 	description: INodeTypeDescription = {
@@ -151,6 +150,22 @@ export class HubspotTrigger implements INodeType {
 										description:
 											"To get notified if a specified property is changed for any deal in a customer's account",
 									},
+									{
+										name: 'Ticket Created',
+										value: 'ticket.creation',
+										description: "To get notified if a ticket is created in a customer's account",
+									},
+									{
+										name: 'Ticket Deleted',
+										value: 'ticket.deletion',
+										description: "To get notified if any ticket is deleted in a customer's account",
+									},
+									{
+										name: 'Ticket Property Changed',
+										value: 'ticket.propertyChange',
+										description:
+											"To get notified if a specified property is changed for any ticket in a customer's account",
+									},
 								],
 								default: 'contact.creation',
 								required: true,
diff --git a/packages/nodes-base/nodes/Hubspot/V1/CompanyDescription.ts b/packages/nodes-base/nodes/Hubspot/V1/CompanyDescription.ts
new file mode 100644
index 0000000000000..501f6d0f99752
--- /dev/null
+++ b/packages/nodes-base/nodes/Hubspot/V1/CompanyDescription.ts
@@ -0,0 +1,1058 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+export const companyOperations: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				resource: ['company'],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a company',
+				action: 'Create a company',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a company',
+				action: 'Delete a company',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get a company',
+				action: 'Get a company',
+			},
+			{
+				name: 'Get Many',
+				value: 'getAll',
+				description: 'Get many companies',
+				action: 'Get many companies',
+			},
+			{
+				name: 'Get Recently Created',
+				value: 'getRecentlyCreated',
+				description: 'Get recently created companies',
+				action: 'Get a recently created company',
+			},
+			{
+				name: 'Get Recently Modified',
+				value: 'getRecentlyModified',
+				description: 'Get recently modified companies',
+				action: 'Get a recently modified company',
+			},
+			{
+				name: 'Search By Domain',
+				value: 'searchByDomain',
+				description: 'Search companies by domain',
+				action: 'Search for a company by Domain',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update a company',
+				action: 'Update a company',
+			},
+		],
+		default: 'create',
+	},
+];
+
+export const companyFields: INodeProperties[] = [
+	/* -------------------------------------------------------------------------- */
+	/*                                company:create                              */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Name',
+		name: 'name',
+		type: 'string',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: ['company'],
+				operation: ['create'],
+			},
+		},
+		default: '',
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['company'],
+				operation: ['create'],
+			},
+		},
+		options: [
+			{
+				displayName: 'About Us',
+				name: 'aboutUs',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Annual Revenue',
+				name: 'annualRevenue',
+				type: 'number',
+				typeOptions: {
+					minValue: 0,
+				},
+				default: 0,
+				description: 'The actual or estimated annual revenue of the company',
+			},
+			{
+				displayName: 'City',
+				name: 'city',
+				type: 'string',
+				default: '',
+				description: 'The city where the company is located',
+			},
+			{
+				displayName: 'Close Date',
+				name: 'closeDate',
+				type: 'dateTime',
+				default: '',
+				description: 'The date the company or organization was closed as a customer',
+			},
+			{
+				displayName: 'Company Domain Name',
+				name: 'companyDomainName',
+				type: 'string',
+				default: '',
+				description: 'The domain name of the company or organization',
+			},
+			{
+				displayName: 'Company Owner Name or ID',
+				name: 'companyOwner',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getOwners',
+				},
+				default: '',
+				description:
+					'The owner of the company. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Country/Region',
+				name: 'countryRegion',
+				type: 'string',
+				default: '',
+				description: 'The country/region in which the company or organization is located',
+			},
+			{
+				displayName: 'Custom Properties',
+				name: 'customPropertiesUi',
+				placeholder: 'Add Custom Property',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: true,
+				},
+				default: {},
+				options: [
+					{
+						name: 'customPropertiesValues',
+						displayName: 'Custom Property',
+						values: [
+							{
+								displayName: 'Property Name or ID',
+								name: 'property',
+								type: 'options',
+								typeOptions: {
+									loadOptionsMethod: 'getCompanyCustomProperties',
+								},
+								default: '',
+								description:
+									'Name of the property. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+							},
+							{
+								displayName: 'Value',
+								name: 'value',
+								type: 'string',
+								default: '',
+								description: 'Value of the property',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Description',
+				name: 'description',
+				type: 'string',
+				default: '',
+				description: "A short statement about the company's mission and goals",
+			},
+			{
+				displayName: 'Facebook Fans',
+				name: 'facebookFans',
+				type: 'number',
+				typeOptions: {
+					minValue: 0,
+				},
+				default: 0,
+				description: 'Number of facebook fans',
+			},
+			{
+				displayName: 'Google Plus Page',
+				name: 'googlePlusPage',
+				type: 'string',
+				default: '',
+				description: 'The URL of the Google Plus page for the company or organization',
+			},
+			{
+				displayName: 'Industry Name or ID',
+				name: 'industry',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getCompanyIndustries',
+				},
+				default: '',
+				description:
+					'The type of business the company performs. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Is Public',
+				name: 'isPublic',
+				type: 'boolean',
+				default: false,
+				description: 'Whether that the company is publicly traded',
+			},
+			{
+				displayName: 'Lead Status Name or ID',
+				name: 'leadStatus',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getCompanyleadStatuses',
+				},
+				default: '',
+				description:
+					'The company\'s sales, prospecting or outreach status. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Lifecycle Stage Name or ID',
+				name: 'lifecycleStatus',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getCompanylifecycleStages',
+				},
+				default: '',
+				description:
+					'The most advanced lifecycle stage across all contacts associated with this company or organization. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'LinkedIn Bio',
+				name: 'linkedinBio',
+				type: 'string',
+				default: '',
+				description: 'The LinkedIn bio for the company or organization',
+			},
+			{
+				displayName: 'LinkedIn Company Page',
+				name: 'linkedInCompanyPage',
+				type: 'string',
+				default: '',
+				description: 'The URL of the LinkedIn company page for the company or organization',
+			},
+			{
+				displayName: 'Number Of Employees',
+				name: 'numberOfEmployees',
+				type: 'number',
+				typeOptions: {
+					minValue: 0,
+				},
+				default: 0,
+				description: 'The total number of employees who work for the company or organization',
+			},
+			{
+				displayName: 'Original Source Type Name or ID',
+				name: 'originalSourceType',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getCompanySourceTypes',
+				},
+				default: '',
+				description:
+					'Original source for the contact with the earliest activity for this company or organization. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Phone Number',
+				name: 'phoneNumber',
+				type: 'string',
+				default: '',
+				description: "A company's primary phone number. Powered by HubSpot Insights.",
+			},
+			{
+				displayName: 'Postal Code',
+				name: 'postalCode',
+				type: 'string',
+				default: '',
+				description:
+					'The postal or zip code of the company or organization. Powered by HubSpot Insights.',
+			},
+			{
+				displayName: 'State/Region',
+				name: 'stateRegion',
+				type: 'string',
+				default: '',
+				description:
+					'The state or region in which the company or organization is located. Powered by HubSpot Insights.',
+			},
+			{
+				displayName: 'Street Address',
+				name: 'streetAddress',
+				type: 'string',
+				default: '',
+				description:
+					'The street address of the company or organization, including unit number. Powered by HubSpot Insights.',
+			},
+			{
+				displayName: 'Street Address 2',
+				name: 'streetAddress2',
+				type: 'string',
+				default: '',
+				description:
+					'The additional address of the company or organization. Powered by HubSpot Insights.',
+			},
+
+			{
+				displayName: 'Target Account Name or ID',
+				name: 'targetAccount',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getCompanyTargetAccounts',
+				},
+				default: '',
+				description:
+					'The Target Account property is a means to flag high priority companies if you are following an account based strategy. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Timezone',
+				name: 'timezone',
+				type: 'string',
+				default: '',
+				description:
+					'The time zone where the company or organization is located. Powered by HubSpot Insights.',
+			},
+			{
+				displayName: 'Total Money Raised',
+				name: 'totalMoneyRaised',
+				type: 'number',
+				typeOptions: {
+					minValue: 0,
+				},
+				default: 0,
+				description:
+					'The total amount of money raised by the company. Powered by HubSpot Insights.',
+			},
+			{
+				displayName: 'Twitter Bio',
+				name: 'twitterBio',
+				type: 'string',
+				default: '',
+				description: 'The Twitter bio of the company or organization',
+			},
+			{
+				displayName: 'Twitter Followers',
+				name: 'twitterFollowers',
+				type: 'number',
+				typeOptions: {
+					minValue: 0,
+				},
+				default: 0,
+				description: 'The number of Twitter followers of the company or organization',
+			},
+			{
+				displayName: 'Twitter Handle',
+				name: 'twitterHandle',
+				type: 'string',
+				default: '',
+				description: 'The main twitter account of the company or organization',
+			},
+			{
+				displayName: 'Type Name or ID',
+				name: 'type',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getCompanyTypes',
+				},
+				default: '',
+				description:
+					'The optional classification of this company record - prospect, partner, etc. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Web Technologies Name or ID',
+				name: 'webTechnologies',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getCompanyWebTechnologies',
+				},
+				default: '',
+				description:
+					'The web technologies used by the company or organization. Powered by HubSpot Insights. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Website URL',
+				name: 'websiteUrl',
+				type: 'string',
+				default: '',
+				description:
+					'The main website of the company or organization. This property is used to identify unique companies. Powered by HubSpot Insights.',
+			},
+			{
+				displayName: 'Year Founded',
+				name: 'yearFounded',
+				type: 'string',
+				default: '',
+				description: 'The year the company was created. Powered by HubSpot Insights.',
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                 company:update                             */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Company ID',
+		name: 'companyId',
+		type: 'string',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: ['company'],
+				operation: ['update'],
+			},
+		},
+		default: '',
+		description: 'Unique identifier for a particular company',
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['company'],
+				operation: ['update'],
+			},
+		},
+		options: [
+			{
+				displayName: 'About Us',
+				name: 'aboutUs',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Annual Revenue',
+				name: 'annualRevenue',
+				type: 'number',
+				typeOptions: {
+					minValue: 0,
+				},
+				default: 0,
+				description: 'The actual or estimated annual revenue of the company',
+			},
+			{
+				displayName: 'City',
+				name: 'city',
+				type: 'string',
+				default: '',
+				description: 'The city where the company is located',
+			},
+			{
+				displayName: 'Close Date',
+				name: 'closeDate',
+				type: 'dateTime',
+				default: '',
+				description: 'The date the company or organization was closed as a customer',
+			},
+			{
+				displayName: 'Company Domain Name',
+				name: 'companyDomainName',
+				type: 'string',
+				default: '',
+				description: 'The domain name of the company or organization',
+			},
+			{
+				displayName: 'Company Owmer Name or ID',
+				name: 'companyOwner',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getOwners',
+				},
+				default: '',
+				description:
+					'The owner of the company. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Country/Region',
+				name: 'countryRegion',
+				type: 'string',
+				default: '',
+				description: 'The country/region in which the company or organization is located',
+			},
+			{
+				displayName: 'Custom Properties',
+				name: 'customPropertiesUi',
+				placeholder: 'Add Custom Property',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: true,
+				},
+				default: {},
+				options: [
+					{
+						name: 'customPropertiesValues',
+						displayName: 'Custom Property',
+						values: [
+							{
+								displayName: 'Property Name or ID',
+								name: 'property',
+								type: 'options',
+								typeOptions: {
+									loadOptionsMethod: 'getCompanyCustomProperties',
+								},
+								default: '',
+								description:
+									'Name of the property. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+							},
+							{
+								displayName: 'Value',
+								name: 'value',
+								type: 'string',
+								default: '',
+								description: 'Value of the property',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Description',
+				name: 'description',
+				type: 'string',
+				default: '',
+				description: "A short statement about the company's mission and goals",
+			},
+			{
+				displayName: 'Facebook Fans',
+				name: 'facebookFans',
+				type: 'number',
+				typeOptions: {
+					minValue: 0,
+				},
+				default: 0,
+				description: 'Number of facebook fans',
+			},
+			{
+				displayName: 'Google Plus Page',
+				name: 'googlePlusPage',
+				type: 'string',
+				default: '',
+				description: 'The URL of the Google Plus page for the company or organization',
+			},
+			{
+				displayName: 'Industry Name or ID',
+				name: 'industry',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getCompanyIndustries',
+				},
+				default: '',
+				description:
+					'The type of business the company performs. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Is Public',
+				name: 'isPublic',
+				type: 'boolean',
+				default: false,
+				description: 'Whether that the company is publicly traded',
+			},
+			{
+				displayName: 'Lead Status Name or ID',
+				name: 'leadStatus',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getCompanyleadStatuses',
+				},
+				default: '',
+				description:
+					'The company\'s sales, prospecting or outreach status. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Lifecycle Stage Name or ID',
+				name: 'lifecycleStatus',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getCompanylifecycleStages',
+				},
+				default: '',
+				description:
+					'The most advanced lifecycle stage across all contacts associated with this company or organization. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Linkedin Bio',
+				name: 'linkedinBio',
+				type: 'string',
+				default: '',
+				description: 'The LinkedIn bio for the company or organization',
+			},
+			{
+				displayName: 'LinkedIn Company Page',
+				name: 'linkedInCompanyPage',
+				type: 'string',
+				default: '',
+				description: 'The URL of the LinkedIn company page for the company or organization',
+			},
+			{
+				displayName: 'Name',
+				name: 'name',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Number Of Employees',
+				name: 'numberOfEmployees',
+				type: 'number',
+				typeOptions: {
+					minValue: 0,
+				},
+				default: 0,
+				description: 'The total number of employees who work for the company or organization',
+			},
+			{
+				displayName: 'Original Source Type Name or ID',
+				name: 'originalSourceType',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getCompanySourceTypes',
+				},
+				default: '',
+				description:
+					'Original source for the contact with the earliest activity for this company or organization. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Phone Number',
+				name: 'phoneNumber',
+				type: 'string',
+				default: '',
+				description: "A company's primary phone number. Powered by HubSpot Insights.",
+			},
+			{
+				displayName: 'Postal Code',
+				name: 'postalCode',
+				type: 'string',
+				default: '',
+				description:
+					'The postal or zip code of the company or organization. Powered by HubSpot Insights.',
+			},
+			{
+				displayName: 'State/Region',
+				name: 'stateRegion',
+				type: 'string',
+				default: '',
+				description:
+					'The state or region in which the company or organization is located. Powered by HubSpot Insights.',
+			},
+			{
+				displayName: 'Street Address',
+				name: 'streetAddress',
+				type: 'string',
+				default: '',
+				description:
+					'The street address of the company or organization, including unit number. Powered by HubSpot Insights.',
+			},
+			{
+				displayName: 'Street Address 2',
+				name: 'streetAddress2',
+				type: 'string',
+				default: '',
+				description:
+					'The additional address of the company or organization. Powered by HubSpot Insights.',
+			},
+
+			{
+				displayName: 'Target Account Name or ID',
+				name: 'targetAccount',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getCompanyTargetAccounts',
+				},
+				default: '',
+				description:
+					'The Target Account property is a means to flag high priority companies if you are following an account based strategy. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Timezone',
+				name: 'timezone',
+				type: 'string',
+				default: '',
+				description:
+					'The time zone where the company or organization is located. Powered by HubSpot Insights.',
+			},
+			{
+				displayName: 'Total Money Raised',
+				name: 'totalMoneyRaised',
+				type: 'number',
+				typeOptions: {
+					minValue: 0,
+				},
+				default: 0,
+				description:
+					'The total amount of money raised by the company. Powered by HubSpot Insights.',
+			},
+			{
+				displayName: 'Twitter Bio',
+				name: 'twitterBio',
+				type: 'string',
+				default: '',
+				description: 'The Twitter bio of the company or organization',
+			},
+			{
+				displayName: 'Twitter Followers',
+				name: 'twitterFollowers',
+				type: 'number',
+				typeOptions: {
+					minValue: 0,
+				},
+				default: 0,
+				description: 'The number of Twitter followers of the company or organization',
+			},
+			{
+				displayName: 'Twitter Handle',
+				name: 'twitterHandle',
+				type: 'string',
+				default: '',
+				description: 'The main twitter account of the company or organization',
+			},
+			{
+				displayName: 'Type Name or ID',
+				name: 'type',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getCompanyTypes',
+				},
+				default: '',
+				description:
+					'The optional classification of this company record - prospect, partner, etc. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Web Technologies Name or ID',
+				name: 'webTechnologies',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getCompanyWebTechnologies',
+				},
+				default: '',
+				description:
+					'The web technologies used by the company or organization. Powered by HubSpot Insights. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Website URL',
+				name: 'websiteUrl',
+				type: 'string',
+				default: '',
+				description:
+					'The main website of the company or organization. This property is used to identify unique companies. Powered by HubSpot Insights.',
+			},
+			{
+				displayName: 'Year Founded',
+				name: 'yearFounded',
+				type: 'string',
+				default: '',
+				description: 'The year the company was created. Powered by HubSpot Insights.',
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                  company:get                               */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Company ID',
+		name: 'companyId',
+		type: 'string',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: ['company'],
+				operation: ['get'],
+			},
+		},
+		default: '',
+		description: 'Unique identifier for a particular company',
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['company'],
+				operation: ['get'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Include Merge Audits',
+				name: 'includeMergeAudits',
+				type: 'boolean',
+				default: false,
+				description:
+					'Whether to return any merge history if the company has been previously merged with another company record. Defaults to false.',
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                 company:getAll                             */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: ['company'],
+				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: ['company'],
+				operation: ['getAll'],
+				returnAll: [false],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 250,
+		},
+		default: 100,
+		description: 'Max number of results to return',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['company'],
+				operation: ['getAll'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Include Merge Audits',
+				name: 'includeMergeAudits',
+				type: 'boolean',
+				default: false,
+				description:
+					'Whether to return any merge history if a company has been previously merged with another company record. Defaults to false.',
+			},
+			{
+				displayName: 'Property Names or IDs',
+				name: 'properties',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getCompanyProperties',
+				},
+				default: [],
+				description:
+					'<p>Used to include specific company properties in the results. By default, the results will only include company ID and will not include the values for any properties for your companies.</p><p>Including this parameter will include the data for the specified property in the results. You can include this parameter multiple times to request multiple properties separated by a comma: <code>,</code>.</p>. Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Properties With History',
+				name: 'propertiesWithHistory',
+				type: 'string',
+				default: '',
+				description:
+					"Works similarly to properties=, but this parameter will include the history for the specified property, instead of just including the current value. Use this parameter when you need the full history of changes to a property's value.",
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                 company:delete                             */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Company ID',
+		name: 'companyId',
+		type: 'string',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: ['company'],
+				operation: ['delete'],
+			},
+		},
+		default: '',
+		description: 'Unique identifier for a particular company',
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*               company:getRecentlyCreated company:getRecentlyModifie        */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: ['company'],
+				operation: ['getRecentlyCreated', 'getRecentlyModified'],
+			},
+		},
+		default: false,
+		description: 'Whether to return all results or only up to a given limit',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				resource: ['company'],
+				operation: ['getRecentlyCreated', 'getRecentlyModified'],
+				returnAll: [false],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 250,
+		},
+		default: 100,
+		description: 'Max number of results to return',
+	},
+	{
+		displayName: 'Filters',
+		name: 'filters',
+		type: 'collection',
+		placeholder: 'Add Filter',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['company'],
+				operation: ['getRecentlyModified'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Since',
+				name: 'since',
+				type: 'dateTime',
+				default: '',
+				description: 'Only return companys created after timestamp x',
+			},
+			{
+				displayName: 'Include Property Versions',
+				name: 'includePropertyVersions',
+				type: 'boolean',
+				default: false,
+				// eslint-disable-next-line n8n-nodes-base/node-param-description-boolean-without-whether
+				description:
+					'By default, you will only get data for the most recent version of a property in the "versions" data. If you include this parameter, you will get data for all previous versions.',
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                            company:searchByDomain                          */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Domain',
+		name: 'domain',
+		type: 'string',
+		displayOptions: {
+			show: {
+				resource: ['company'],
+				operation: ['searchByDomain'],
+			},
+		},
+		required: true,
+		description: "The company's website domain to search for, like n8n.io",
+		default: '',
+	},
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: ['company'],
+				operation: ['searchByDomain'],
+			},
+		},
+		default: false,
+		description: 'Whether to return all results or only up to a given limit',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				resource: ['company'],
+				operation: ['searchByDomain'],
+				returnAll: [false],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 250,
+		},
+		default: 100,
+		description: 'Max number of results to return',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['company'],
+				operation: ['searchByDomain'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Property Names or IDs',
+				name: 'properties',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getCompanyProperties',
+				},
+				default: [],
+				description:
+					'<p>Used to include specific company properties in the results. By default, the results will only include company ID and will not include the values for any properties for your company.</p><p>Including this parameter will include the data for the specified property in the results. You can include this parameter multiple times to request multiple properties separated by a comma: <code>,</code>.</p>. Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+		],
+	},
+];
diff --git a/packages/nodes-base/nodes/Hubspot/ContactDescription.ts b/packages/nodes-base/nodes/Hubspot/V1/ContactDescription.ts
similarity index 100%
rename from packages/nodes-base/nodes/Hubspot/ContactDescription.ts
rename to packages/nodes-base/nodes/Hubspot/V1/ContactDescription.ts
diff --git a/packages/nodes-base/nodes/Hubspot/ContactListDescription.ts b/packages/nodes-base/nodes/Hubspot/V1/ContactListDescription.ts
similarity index 100%
rename from packages/nodes-base/nodes/Hubspot/ContactListDescription.ts
rename to packages/nodes-base/nodes/Hubspot/V1/ContactListDescription.ts
diff --git a/packages/nodes-base/nodes/Hubspot/V1/DealDescription.ts b/packages/nodes-base/nodes/Hubspot/V1/DealDescription.ts
new file mode 100644
index 0000000000000..b8953f0711649
--- /dev/null
+++ b/packages/nodes-base/nodes/Hubspot/V1/DealDescription.ts
@@ -0,0 +1,742 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+export const dealOperations: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				resource: ['deal'],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a deal',
+				action: 'Create a deal',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a deal',
+				action: 'Delete a deal',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get a deal',
+				action: 'Get a deal',
+			},
+			{
+				name: 'Get Many',
+				value: 'getAll',
+				description: 'Get many deals',
+				action: 'Get many deals',
+			},
+			{
+				name: 'Get Recently Created',
+				value: 'getRecentlyCreated',
+				description: 'Get recently created deals',
+				action: 'Get recently created deals',
+			},
+			{
+				name: 'Get Recently Modified',
+				value: 'getRecentlyModified',
+				description: 'Get recently modified deals',
+				action: 'Get recently modified deals',
+			},
+			{
+				name: 'Search',
+				value: 'search',
+				description: 'Search deals',
+				action: 'Search for deals',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update a deal',
+				action: 'Update a deal',
+			},
+		],
+		default: 'create',
+	},
+];
+
+export const dealFields: INodeProperties[] = [
+	/* -------------------------------------------------------------------------- */
+	/*                                deal:create                                 */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Deal Stage Name or ID',
+		name: 'stage',
+		type: 'options',
+		required: true,
+		typeOptions: {
+			loadOptionsMethod: 'getDealStages',
+		},
+		displayOptions: {
+			show: {
+				resource: ['deal'],
+				operation: ['create'],
+			},
+		},
+		default: '',
+		options: [],
+		description:
+			'The dealstage is required when creating a deal. See the CRM Pipelines API for details on managing pipelines and stages. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['deal'],
+				operation: ['create'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Amount',
+				name: 'amount',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Associated Company Names or IDs',
+				name: 'associatedCompany',
+				type: 'multiOptions',
+				description:
+					'Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
+				typeOptions: {
+					loadOptionsMethod: 'getCompanies',
+				},
+				default: [],
+			},
+			{
+				displayName: 'Associated Vid Names or IDs',
+				name: 'associatedVids',
+				type: 'multiOptions',
+				description:
+					'Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
+				typeOptions: {
+					loadOptionsMethod: 'getContacts',
+				},
+				default: [],
+			},
+			{
+				displayName: 'Close Date',
+				name: 'closeDate',
+				type: 'dateTime',
+				default: '',
+			},
+			{
+				displayName: 'Custom Properties',
+				name: 'customPropertiesUi',
+				placeholder: 'Add Custom Property',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: true,
+				},
+				default: {},
+				options: [
+					{
+						name: 'customPropertiesValues',
+						displayName: 'Custom Property',
+						values: [
+							{
+								displayName: 'Property Name or ID',
+								name: 'property',
+								type: 'options',
+								typeOptions: {
+									loadOptionsMethod: 'getDealCustomProperties',
+								},
+								default: '',
+								description:
+									'Name of the property. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+							},
+							{
+								displayName: 'Value',
+								name: 'value',
+								type: 'string',
+								default: '',
+								description: 'Value of the property',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Deal Description',
+				name: 'description',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Deal Name',
+				name: 'dealName',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Deal Type Name or ID',
+				name: 'dealType',
+				type: 'options',
+				description:
+					'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
+				typeOptions: {
+					loadOptionsMethod: 'getDealTypes',
+				},
+				default: '',
+			},
+			{
+				displayName: 'Pipeline',
+				name: 'pipeline',
+				type: 'string',
+				default: '',
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                 deal:update                                */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Deal ID',
+		name: 'dealId',
+		type: 'string',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: ['deal'],
+				operation: ['update'],
+			},
+		},
+		default: '',
+		description: 'Unique identifier for a particular deal',
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		placeholder: 'Add Update Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['deal'],
+				operation: ['update'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Amount',
+				name: 'amount',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Close Date',
+				name: 'closeDate',
+				type: 'dateTime',
+				default: '',
+			},
+			{
+				displayName: 'Custom Properties',
+				name: 'customPropertiesUi',
+				placeholder: 'Add Custom Property',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: true,
+				},
+				default: {},
+				options: [
+					{
+						name: 'customPropertiesValues',
+						displayName: 'Custom Property',
+						values: [
+							{
+								displayName: 'Property Name or ID',
+								name: 'property',
+								type: 'options',
+								typeOptions: {
+									loadOptionsMethod: 'getDealCustomProperties',
+								},
+								default: '',
+								description:
+									'Name of the property. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+							},
+							{
+								displayName: 'Value',
+								name: 'value',
+								type: 'string',
+								default: '',
+								description: 'Value of the property',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Deal Description',
+				name: 'description',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Deal Name',
+				name: 'dealName',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Deal Stage Name or ID',
+				name: 'stage',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getDealStages',
+				},
+				default: '',
+				description:
+					'The dealstage is required when creating a deal. See the CRM Pipelines API for details on managing pipelines and stages. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Deal Type Name or ID',
+				name: 'dealType',
+				type: 'options',
+				description:
+					'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
+				typeOptions: {
+					loadOptionsMethod: 'getDealTypes',
+				},
+				default: '',
+			},
+			{
+				displayName: 'Pipeline',
+				name: 'pipeline',
+				type: 'string',
+				default: '',
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                  deal:get                                  */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Deal ID',
+		name: 'dealId',
+		type: 'string',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: ['deal'],
+				operation: ['get'],
+			},
+		},
+		default: '',
+		description: 'Unique identifier for a particular deal',
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['deal'],
+				operation: ['get'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Include Property Versions',
+				name: 'includePropertyVersions',
+				type: 'boolean',
+				default: false,
+				// eslint-disable-next-line n8n-nodes-base/node-param-description-boolean-without-whether
+				description:
+					'By default, you will only get data for the most recent version of a property in the "versions" data. If you include this parameter, you will get data for all previous versions.',
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                 deal:getAll                                */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: ['deal'],
+				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: ['deal'],
+				operation: ['getAll'],
+				returnAll: [false],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 250,
+		},
+		default: 100,
+		description: 'Max number of results to return',
+	},
+	{
+		displayName: 'Filters',
+		name: 'filters',
+		type: 'collection',
+		placeholder: 'Add Filter',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['deal'],
+				operation: ['getAll'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Include Associations',
+				name: 'includeAssociations',
+				type: 'boolean',
+				default: false,
+				description:
+					'Whether to include the IDs of the associated contacts and companies in the results. This will also automatically include the num_associated_contacts property.',
+			},
+			{
+				displayName: 'Property Names or IDs',
+				name: 'properties',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getDealProperties',
+				},
+				default: [],
+				description:
+					'<p>Used to include specific deal properties in the results. By default, the results will only include Deal ID and will not include the values for any properties for your Deals.</p><p>Including this parameter will include the data for the specified property in the results. You can include this parameter multiple times to request multiple properties separated by a comma: <code>,</code>.</p>. Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Properties with History',
+				name: 'propertiesWithHistory',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getDealProperties',
+				},
+				default: [],
+				description:
+					'Works similarly to properties=, but this parameter will include the history for the specified property, instead of just including the current value. Use this parameter when you need the full history of changes to a property\'s value. Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                 deal:delete                                */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Deal ID',
+		name: 'dealId',
+		type: 'string',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: ['deal'],
+				operation: ['delete'],
+			},
+		},
+		default: '',
+		description: 'Unique identifier for a particular deal',
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*               deal:getRecentlyCreated deal:getRecentlyModified             */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: ['deal'],
+				operation: ['getRecentlyCreated', 'getRecentlyModified'],
+			},
+		},
+		default: false,
+		description: 'Whether to return all results or only up to a given limit',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				resource: ['deal'],
+				operation: ['getRecentlyCreated', 'getRecentlyModified'],
+				returnAll: [false],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 250,
+		},
+		default: 100,
+		description: 'Max number of results to return',
+	},
+	{
+		displayName: 'Filters',
+		name: 'filters',
+		type: 'collection',
+		placeholder: 'Add Filter',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['deal'],
+				operation: ['getRecentlyCreated', 'getRecentlyModified'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Since',
+				name: 'since',
+				type: 'dateTime',
+				default: '',
+				description: 'Only return deals created after timestamp x',
+			},
+			{
+				displayName: 'Include Property Versions',
+				name: 'includePropertyVersions',
+				type: 'boolean',
+				default: false,
+				// eslint-disable-next-line n8n-nodes-base/node-param-description-boolean-without-whether
+				description:
+					'By default, you will only get data for the most recent version of a property in the "versions" data. If you include this parameter, you will get data for all previous versions.',
+			},
+		],
+	},
+
+	/*--------------------------------------------------------------------------- */
+	/*                                 deal:search                                */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: ['deal'],
+				operation: ['search'],
+			},
+		},
+		default: false,
+		description: 'Whether to return all results or only up to a given limit',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				resource: ['deal'],
+				operation: ['search'],
+				returnAll: [false],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 250,
+		},
+		default: 100,
+		description: 'Max number of results to return',
+	},
+	{
+		displayName: 'Filter Groups',
+		name: 'filterGroupsUi',
+		type: 'fixedCollection',
+		default: {},
+		placeholder: 'Add Filter Group',
+		typeOptions: {
+			multipleValues: true,
+		},
+		displayOptions: {
+			show: {
+				resource: ['deal'],
+				operation: ['search'],
+			},
+		},
+		options: [
+			{
+				name: 'filterGroupsValues',
+				displayName: 'Filter Group',
+				values: [
+					{
+						displayName: 'Filters',
+						name: 'filtersUi',
+						type: 'fixedCollection',
+						default: {},
+						placeholder: 'Add Filter',
+						typeOptions: {
+							multipleValues: true,
+						},
+						options: [
+							{
+								name: 'filterValues',
+								displayName: 'Filter',
+								values: [
+									{
+										displayName: 'Property Name or ID',
+										name: 'propertyName',
+										type: 'options',
+										description:
+											'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
+										typeOptions: {
+											loadOptionsMethod: 'getDealProperties',
+										},
+										default: '',
+									},
+									{
+										displayName: 'Operator',
+										name: 'operator',
+										type: 'options',
+										options: [
+											{
+												name: 'Contains Exactly',
+												value: 'CONTAINS_TOKEN',
+											},
+											{
+												name: 'Equal',
+												value: 'EQ',
+											},
+											{
+												name: 'Greater Than',
+												value: 'GT',
+											},
+											{
+												name: 'Greater Than Or Equal',
+												value: 'GTE',
+											},
+											{
+												name: 'Is Known',
+												value: 'HAS_PROPERTY',
+											},
+											{
+												name: 'Is Unknown',
+												value: 'NOT_HAS_PROPERTY',
+											},
+											{
+												name: 'Less Than',
+												value: 'LT',
+											},
+											{
+												name: 'Less Than Or Equal',
+												value: 'LTE',
+											},
+											{
+												name: 'Not Equal',
+												value: 'NEQ',
+											},
+										],
+										default: 'EQ',
+									},
+									{
+										displayName: 'Value',
+										name: 'value',
+										displayOptions: {
+											hide: {
+												operator: ['HAS_PROPERTY', 'NOT_HAS_PROPERTY'],
+											},
+										},
+										type: 'string',
+										default: '',
+									},
+								],
+							},
+						],
+						description:
+							'Use filters to limit the results to only CRM objects with matching property values. More info <a href="https://developers.hubspot.com/docs/api/crm/search">here</a>.',
+					},
+				],
+			},
+		],
+		description:
+			'When multiple filters are provided within a filterGroup, they will be combined using a logical AND operator. When multiple filterGroups are provided, they will be combined using a logical OR operator. The system supports a maximum of three filterGroups with up to three filters each. More info <a href="https://developers.hubspot.com/docs/api/crm/search">here</a>',
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['deal'],
+				operation: ['search'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Direction',
+				name: 'direction',
+				type: 'options',
+				options: [
+					{
+						name: 'ASC',
+						value: 'ASCENDING',
+					},
+					{
+						name: 'DESC',
+						value: 'DESCENDING',
+					},
+				],
+				default: 'DESCENDING',
+				description:
+					'Defines the direction in which search results are ordered. Default value is DESC.',
+			},
+			{
+				displayName: 'Field Names or IDs',
+				name: 'properties',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getDealProperties',
+				},
+				default: [],
+				description:
+					'<p>Used to include specific deal properties in the results. By default, the results will only include Deal ID and will not include the values for any properties for your company.</p><p>Including this parameter will include the data for the specified property in the results. You can include this parameter multiple times to request multiple properties separated by a comma: <code>,</code>.</p>. Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Query',
+				name: 'query',
+				type: 'string',
+				default: '',
+				description: 'Perform a text search against all property values for an object type',
+			},
+			{
+				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-options
+				displayName: 'Sort By',
+				name: 'sortBy',
+				type: 'options',
+				description:
+					'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
+				typeOptions: {
+					loadOptionsMethod: 'getDealProperties',
+				},
+				default: 'createdate',
+			},
+		],
+	},
+];
diff --git a/packages/nodes-base/nodes/Hubspot/DealInterface.ts b/packages/nodes-base/nodes/Hubspot/V1/DealInterface.ts
similarity index 100%
rename from packages/nodes-base/nodes/Hubspot/DealInterface.ts
rename to packages/nodes-base/nodes/Hubspot/V1/DealInterface.ts
diff --git a/packages/nodes-base/nodes/Hubspot/EngagementDescription.ts b/packages/nodes-base/nodes/Hubspot/V1/EngagementDescription.ts
similarity index 100%
rename from packages/nodes-base/nodes/Hubspot/EngagementDescription.ts
rename to packages/nodes-base/nodes/Hubspot/V1/EngagementDescription.ts
diff --git a/packages/nodes-base/nodes/Hubspot/FormDescription.ts b/packages/nodes-base/nodes/Hubspot/V1/FormDescription.ts
similarity index 100%
rename from packages/nodes-base/nodes/Hubspot/FormDescription.ts
rename to packages/nodes-base/nodes/Hubspot/V1/FormDescription.ts
diff --git a/packages/nodes-base/nodes/Hubspot/FormInterface.ts b/packages/nodes-base/nodes/Hubspot/V1/FormInterface.ts
similarity index 100%
rename from packages/nodes-base/nodes/Hubspot/FormInterface.ts
rename to packages/nodes-base/nodes/Hubspot/V1/FormInterface.ts
diff --git a/packages/nodes-base/nodes/Hubspot/V1/GenericFunctions.ts b/packages/nodes-base/nodes/Hubspot/V1/GenericFunctions.ts
new file mode 100644
index 0000000000000..630ef73f0fb03
--- /dev/null
+++ b/packages/nodes-base/nodes/Hubspot/V1/GenericFunctions.ts
@@ -0,0 +1,2019 @@
+import type {
+	ICredentialDataDecryptedObject,
+	ICredentialTestFunctions,
+	IDataObject,
+	IExecuteFunctions,
+	IHookFunctions,
+	IHttpRequestMethods,
+	ILoadOptionsFunctions,
+	IRequestOptions,
+	JsonObject,
+} from 'n8n-workflow';
+import { NodeApiError } from 'n8n-workflow';
+
+import moment from 'moment-timezone';
+
+export async function hubspotApiRequest(
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
+	endpoint: string,
+	// tslint:disable-next-line:no-any
+	body: any = {},
+	query: IDataObject = {},
+	uri?: string,
+	// tslint:disable-next-line:no-any
+): Promise<any> {
+	let authenticationMethod = this.getNodeParameter('authentication', 0);
+
+	if (this.getNode().type.includes('Trigger')) {
+		authenticationMethod = 'developerApi';
+	}
+
+	const options = {
+		method,
+		qs: query,
+		headers: {} as IDataObject,
+		uri: uri || `https://api.hubapi.com${endpoint}`,
+		body,
+		json: true,
+		useQuerystring: true,
+	} satisfies IRequestOptions;
+
+	try {
+		if (authenticationMethod === 'apiKey') {
+			const credentials = await this.getCredentials('hubspotApi');
+
+			options.qs.hapikey = credentials.apiKey as string;
+			return await this.helpers.request(options);
+		} else if (authenticationMethod === 'appToken') {
+			const credentials = await this.getCredentials('hubspotAppToken');
+
+			options.headers.Authorization = `Bearer ${credentials.appToken}`;
+			return await this.helpers.request(options);
+		} else if (authenticationMethod === 'developerApi') {
+			if (endpoint.includes('webhooks')) {
+				const credentials = await this.getCredentials('hubspotDeveloperApi');
+				options.qs.hapikey = credentials.apiKey as string;
+				return await this.helpers.request(options);
+			} else {
+				return await this.helpers.requestOAuth2.call(this, 'hubspotDeveloperApi', options, {
+					tokenType: 'Bearer',
+					includeCredentialsOnRefreshOnBody: true,
+				});
+			}
+		} else {
+			return await this.helpers.requestOAuth2.call(this, 'hubspotOAuth2Api', options, {
+				tokenType: 'Bearer',
+				includeCredentialsOnRefreshOnBody: true,
+			});
+		}
+	} catch (error) {
+		throw new NodeApiError(this.getNode(), error as JsonObject);
+	}
+}
+
+/**
+ * Make an API request to paginated hubspot endpoint
+ * and return all results
+ */
+export async function hubspotApiRequestAllItems(
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
+	propertyName: string,
+	method: IHttpRequestMethods,
+	endpoint: string,
+	// tslint:disable-next-line:no-any
+	body: any = {},
+	query: IDataObject = {},
+	// tslint:disable-next-line:no-any
+): Promise<any> {
+	const returnData: IDataObject[] = [];
+
+	let responseData;
+
+	query.limit = (query.limit as number) || 250;
+	query.count = 100;
+	body.limit = body.limit || 100;
+
+	do {
+		responseData = await hubspotApiRequest.call(this, method, endpoint, body, query);
+		query.offset = responseData.offset;
+		query.vidOffset = responseData['vid-offset'];
+		//Used by Search endpoints
+		if (responseData.paging) {
+			body.after = responseData.paging.next.after;
+		}
+		returnData.push.apply(returnData, responseData.propertyName as IDataObject[]);
+		//ticket:getAll endpoint does not support setting a limit, so return once the limit is reached
+		if (query.limit && query.limit <= returnData.length && endpoint.includes('/tickets/paged')) {
+			return returnData;
+		}
+	} while (responseData.hasMore || responseData['has-more'] || responseData.paging);
+	return returnData;
+}
+
+// tslint:disable-next-line:no-any
+export function validateJSON(json: string | undefined): any {
+	let result;
+	try {
+		result = JSON.parse(json!);
+	} catch (exception) {
+		result = '';
+	}
+	return result;
+}
+
+// tslint:disable-next-line: no-any
+export function clean(obj: any) {
+	for (const propName in obj) {
+		if (obj[propName] === null || obj[propName] === undefined || obj[propName] === '') {
+			delete obj[propName];
+		}
+	}
+	return obj;
+}
+
+export const propertyEvents = [
+	'contact.propertyChange',
+	'company.propertyChange',
+	'deal.propertyChange',
+];
+
+export const contactFields = [
+	{
+		id: 'company_size',
+		label: 'testingricardo',
+	},
+	{
+		id: 'date',
+		label: 'Date',
+	},
+	{
+		id: 'date_of_birth',
+		label: 'Date of birth',
+	},
+	{
+		id: 'days_to_close',
+		label: 'Days To Close',
+	},
+	{
+		id: 'degree',
+		label: 'Degree',
+	},
+	{
+		id: 'field_of_study',
+		label: 'Field of study',
+	},
+	{
+		id: 'first_conversion_date',
+		label: 'First Conversion Date',
+	},
+	{
+		id: 'first_conversion_event_name',
+		label: 'First Conversion',
+	},
+	{
+		id: 'first_deal_created_date',
+		label: 'First Deal Created Date',
+	},
+	{
+		id: 'gender',
+		label: 'Gender',
+	},
+	{
+		id: 'graduation_date',
+		label: 'Graduation date',
+	},
+	{
+		id: 'hs_additional_emails',
+		label: 'Additional email addresses',
+	},
+	{
+		id: 'hs_all_contact_vids',
+		label: 'All vids for a contact',
+	},
+	{
+		id: 'hs_analytics_first_touch_converting_campaign',
+		label: 'First Touch Converting Campaign',
+	},
+	{
+		id: 'hs_analytics_last_touch_converting_campaign',
+		label: 'Last Touch Converting Campaign',
+	},
+	{
+		id: 'hs_avatar_filemanager_key',
+		label: 'Avatar FileManager key',
+	},
+	{
+		id: 'hs_buying_role',
+		label: 'Buying Role',
+	},
+	{
+		id: 'hs_calculated_form_submissions',
+		label: 'All form submissions for a contact',
+	},
+	{
+		id: 'hs_calculated_merged_vids',
+		label: 'Merged vids with timestamps of a contact',
+	},
+	{
+		id: 'hs_calculated_mobile_number',
+		label: 'Calculated Mobile Number in International Format',
+	},
+	{
+		id: 'hs_calculated_phone_number',
+		label: 'Calculated Phone Number in International Format',
+	},
+	{
+		id: 'hs_calculated_phone_number_area_code',
+		label: 'Calculated Phone Number Area Code',
+	},
+	{
+		id: 'hs_calculated_phone_number_country_code',
+		label: 'Calculated Phone Number Country Code',
+	},
+	{
+		id: 'hs_calculated_phone_number_region_code',
+		label: 'Calculated Phone Number Region',
+	},
+	{
+		id: 'hs_content_membership_email_confirmed',
+		label: 'Email Confirmed',
+	},
+	{
+		id: 'hs_content_membership_notes',
+		label: 'Membership Notes',
+	},
+	{
+		id: 'hs_content_membership_registered_at',
+		label: 'Registered At',
+	},
+	{
+		id: 'hs_content_membership_registration_domain_sent_to',
+		label: 'Domain to which registration email was sent',
+	},
+	{
+		id: 'hs_content_membership_registration_email_sent_at',
+		label: 'Time registration email was sent',
+	},
+	{
+		id: 'hs_content_membership_status',
+		label: 'Status',
+	},
+	{
+		id: 'hs_conversations_visitor_email',
+		label: 'Conversations visitor email',
+	},
+	{
+		id: 'hs_count_is_unworked',
+		label: 'Count of unengaged contacts',
+	},
+	{
+		id: 'hs_count_is_worked',
+		label: 'Count of engaged contacts',
+	},
+	{
+		id: 'hs_created_by_conversations',
+		label: 'Created By Conversations',
+	},
+	{
+		id: 'hs_created_by_user_id',
+		label: 'Created by user ID',
+	},
+	{
+		id: 'hs_createdate',
+		label: 'Object create date/time',
+	},
+	{
+		id: 'hs_document_last_revisited',
+		label: 'Recent Document Revisit Date',
+	},
+	{
+		id: 'hs_email_bad_address',
+		label: 'Invalid email address',
+	},
+	{
+		id: 'hs_email_customer_quarantined_reason',
+		label: 'Email address quarantine reason',
+	},
+	{
+		id: 'hs_email_domain',
+		label: 'Email Domain',
+	},
+	{
+		id: 'hs_email_hard_bounce_reason',
+		label: 'Email hard bounce reason',
+	},
+	{
+		id: 'hs_email_hard_bounce_reason_enum',
+		label: 'Email hard bounce reason',
+	},
+	{
+		id: 'hs_email_quarantined',
+		label: 'Email Address Quarantined',
+	},
+	{
+		id: 'hs_email_quarantined_reason',
+		label: 'Email address internal quarantine reason',
+	},
+	{
+		id: 'hs_email_recipient_fatigue_recovery_time',
+		label: 'Email Address Recipient Fatigue Next Available Sending Time',
+	},
+	{
+		id: 'hs_email_sends_since_last_engagement',
+		label: 'Sends Since Last Engagement',
+	},
+	{
+		id: 'hs_emailconfirmationstatus',
+		label: 'Marketing email confirmation status',
+	},
+	{
+		id: 'hs_facebook_ad_clicked',
+		label: 'Clicked Facebook ad',
+	},
+	{
+		id: 'hs_facebook_click_id',
+		label: 'Facebook click id',
+	},
+	{
+		id: 'hs_facebookid',
+		label: 'Facebook ID',
+	},
+	{
+		id: 'hs_feedback_last_nps_follow_up',
+		label: 'Last NPS survey comment',
+	},
+	{
+		id: 'hs_feedback_last_nps_rating',
+		label: 'Last NPS survey rating',
+	},
+	{
+		id: 'hs_feedback_last_survey_date',
+		label: 'Last NPS survey date',
+	},
+	{
+		id: 'hs_feedback_show_nps_web_survey',
+		label: 'Should be shown an NPS web survey',
+	},
+	{
+		id: 'hs_first_engagement_object_id',
+		label: 'ID of first engagement',
+	},
+	{
+		id: 'hs_google_click_id',
+		label: 'Google ad click id',
+	},
+	{
+		id: 'hs_googleplusid',
+		label: 'googleplus ID',
+	},
+	{
+		id: 'hs_ip_timezone',
+		label: 'IP Timezone',
+	},
+	{
+		id: 'hs_is_contact',
+		label: 'Is a contact',
+	},
+	{
+		id: 'hs_is_unworked',
+		label: 'Contact unworked',
+	},
+	{
+		id: 'hs_last_sales_activity_date',
+		label: 'last sales activity date old',
+	},
+	{
+		id: 'hs_last_sales_activity_timestamp',
+		label: 'Last Engagement Date',
+	},
+	{
+		id: 'hs_lastmodifieddate',
+		label: 'Object last modified date/time',
+	},
+	{
+		id: 'hs_lead_status',
+		label: 'Lead Status',
+	},
+	{
+		id: 'hs_legal_basis',
+		label: "Legal basis for processing contact's data",
+	},
+	{
+		id: 'hs_linkedinid',
+		label: 'Linkedin ID',
+	},
+	{
+		id: 'hs_marketable_reason_id',
+		label: 'Marketing contact status source name',
+	},
+	{
+		id: 'hs_marketable_reason_type',
+		label: 'Marketing contact status source type',
+	},
+	{
+		id: 'hs_marketable_status',
+		label: 'Marketing contact status',
+	},
+	{
+		id: 'hs_marketable_until_renewal',
+		label: 'Marketing contact until next update',
+	},
+	{
+		id: 'hs_merged_object_ids',
+		label: 'Merged object IDs',
+	},
+	{
+		id: 'hs_object_id',
+		label: 'Contact ID',
+	},
+	{
+		id: 'hs_predictivecontactscore_v2',
+		label: 'Likelihood to close',
+	},
+	{
+		id: 'hs_predictivescoringtier',
+		label: 'Contact priority',
+	},
+	{
+		id: 'hs_sa_first_engagement_date',
+		label: 'Date of first engagement',
+	},
+	{
+		id: 'hs_sa_first_engagement_descr',
+		label: 'Description of first engagement',
+	},
+	{
+		id: 'hs_sa_first_engagement_object_type',
+		label: 'Type of first engagement',
+	},
+	{
+		id: 'hs_sales_email_last_clicked',
+		label: 'Recent Sales Email Clicked Date',
+	},
+	{
+		id: 'hs_sales_email_last_opened',
+		label: 'Recent Sales Email Opened Date',
+	},
+	{
+		id: 'hs_searchable_calculated_international_mobile_number',
+		label: 'Calculated Mobile Number with country code',
+	},
+	{
+		id: 'hs_searchable_calculated_international_phone_number',
+		label: 'Calculated Phone Number with country code',
+	},
+	{
+		id: 'hs_searchable_calculated_mobile_number',
+		label: 'Calculated Mobile Number without country code',
+	},
+	{
+		id: 'hs_searchable_calculated_phone_number',
+		label: 'Calculated Phone Number without country code',
+	},
+	{
+		id: 'hs_sequences_is_enrolled',
+		label: 'Currently in Sequence',
+	},
+	{
+		id: 'hs_testpurge',
+		label: 'testpurge',
+	},
+	{
+		id: 'hs_testrollback',
+		label: 'testrollback',
+	},
+	{
+		id: 'hs_time_between_contact_creation_and_deal_close',
+		label: 'Time between contact creation and deal close',
+	},
+	{
+		id: 'hs_time_between_contact_creation_and_deal_creation',
+		label: 'Time between contact creation and deal creation',
+	},
+	{
+		id: 'hs_time_to_first_engagement',
+		label: 'Lead response time',
+	},
+	{
+		id: 'hs_time_to_move_from_lead_to_customer',
+		label: 'Time to move from lead to customer',
+	},
+	{
+		id: 'hs_time_to_move_from_marketingqualifiedlead_to_customer',
+		label: 'Time to move from marketing qualified lead to customer',
+	},
+	{
+		id: 'hs_time_to_move_from_opportunity_to_customer',
+		label: 'Time to move from opportunity to customer',
+	},
+	{
+		id: 'hs_time_to_move_from_salesqualifiedlead_to_customer',
+		label: 'Time to move from sales qualified lead to customer',
+	},
+	{
+		id: 'hs_time_to_move_from_subscriber_to_customer',
+		label: 'Time to move from subscriber to customer',
+	},
+	{
+		id: 'hs_twitterid',
+		label: 'Twitter ID',
+	},
+	{
+		id: 'hs_updated_by_user_id',
+		label: 'Updated by user ID',
+	},
+	{
+		id: 'hs_user_ids_of_all_owners',
+		label: 'User IDs of all owners',
+	},
+	{
+		id: 'hubspot_owner_assigneddate',
+		label: 'Owner Assigned Date',
+	},
+	{
+		id: 'ip_city',
+		label: 'IP City',
+	},
+	{
+		id: 'ip_country',
+		label: 'IP Country',
+	},
+	{
+		id: 'ip_country_code',
+		label: 'IP Country Code',
+	},
+	{
+		id: 'ip_latlon',
+		label: 'IP Latitude & Longitude',
+	},
+	{
+		id: 'ip_state',
+		label: 'IP State/Region',
+	},
+	{
+		id: 'ip_state_code',
+		label: 'IP State Code/Region Code',
+	},
+	{
+		id: 'ip_zipcode',
+		label: 'IP Zipcode',
+	},
+	{
+		id: 'job_function',
+		label: 'Job function',
+	},
+	{
+		id: 'lastmodifieddate',
+		label: 'Last Modified Date',
+	},
+	{
+		id: 'marital_status',
+		label: 'Marital Status',
+	},
+	{
+		id: 'military_status',
+		label: 'Military status',
+	},
+	{
+		id: 'num_associated_deals',
+		label: 'Associated Deals',
+	},
+	{
+		id: 'num_conversion_events',
+		label: 'Number of Form Submissions',
+	},
+	{
+		id: 'num_unique_conversion_events',
+		label: 'Number of Unique Forms Submitted',
+	},
+	{
+		id: 'recent_conversion_date',
+		label: 'Recent Conversion Date',
+	},
+	{
+		id: 'recent_conversion_event_name',
+		label: 'Recent Conversion',
+	},
+	{
+		id: 'recent_deal_amount',
+		label: 'Recent Deal Amount',
+	},
+	{
+		id: 'recent_deal_close_date',
+		label: 'Recent Deal Close Date',
+	},
+	{
+		id: 'relationship_status',
+		label: 'Relationship Status',
+	},
+	{
+		id: 'school',
+		label: 'School',
+	},
+	{
+		id: 'seniority',
+		label: 'Seniority',
+	},
+	{
+		id: 'start_date',
+		label: 'Start date',
+	},
+	{
+		id: 'testing',
+		label: 'testing',
+	},
+	{
+		id: 'total_revenue',
+		label: 'Total Revenue',
+	},
+	{
+		id: 'work_email',
+		label: 'Work email',
+	},
+	{
+		id: 'firstname',
+		label: 'First Name',
+	},
+	{
+		id: 'hs_analytics_first_url',
+		label: 'First Page Seen',
+	},
+	{
+		id: 'hs_email_delivered',
+		label: 'Marketing emails delivered',
+	},
+	{
+		id: 'hs_email_optout_6871816',
+		label: 'Opted out of email: Marketing Information',
+	},
+	{
+		id: 'hs_email_optout_8363428',
+		label: 'Opted out of email: One to One',
+	},
+	{
+		id: 'twitterhandle',
+		label: 'Twitter Username',
+	},
+	{
+		id: 'currentlyinworkflow',
+		label: 'Currently in workflow',
+	},
+	{
+		id: 'followercount',
+		label: 'Follower Count',
+	},
+	{
+		id: 'hs_analytics_last_url',
+		label: 'Last Page Seen',
+	},
+	{
+		id: 'hs_email_open',
+		label: 'Marketing emails opened',
+	},
+	{
+		id: 'lastname',
+		label: 'Last Name',
+	},
+	{
+		id: 'hs_analytics_num_page_views',
+		label: 'Number of Pageviews',
+	},
+	{
+		id: 'hs_email_click',
+		label: 'Marketing emails clicked',
+	},
+	{
+		id: 'salutation',
+		label: 'Salutation',
+	},
+	{
+		id: 'twitterprofilephoto',
+		label: 'Twitter Profile Photo',
+	},
+	{
+		id: 'email',
+		label: 'Email',
+	},
+	{
+		id: 'hs_analytics_num_visits',
+		label: 'Number of Sessions',
+	},
+	{
+		id: 'hs_email_bounce',
+		label: 'Marketing emails bounced',
+	},
+	{
+		id: 'hs_persona',
+		label: 'Persona',
+	},
+	{
+		id: 'hs_social_last_engagement',
+		label: 'Most Recent Social Click',
+	},
+	{
+		id: 'hs_analytics_num_event_completions',
+		label: 'Number of event completions',
+	},
+	{
+		id: 'hs_email_optout',
+		label: 'Unsubscribed from all email',
+	},
+	{
+		id: 'hs_social_twitter_clicks',
+		label: 'Twitter Clicks',
+	},
+	{
+		id: 'mobilephone',
+		label: 'Mobile Phone Number',
+	},
+	{
+		id: 'phone',
+		label: 'Phone Number',
+	},
+	{
+		id: 'fax',
+		label: 'Fax Number',
+	},
+	{
+		id: 'hs_analytics_first_timestamp',
+		label: 'Time First Seen',
+	},
+	{
+		id: 'hs_email_last_email_name',
+		label: 'Last marketing email name',
+	},
+	{
+		id: 'hs_email_last_send_date',
+		label: 'Last marketing email send date',
+	},
+	{
+		id: 'hs_social_facebook_clicks',
+		label: 'Facebook Clicks',
+	},
+	{
+		id: 'address',
+		label: 'Street Address',
+	},
+	{
+		id: 'engagements_last_meeting_booked',
+		label: 'Date of last meeting booked in meetings tool',
+	},
+	{
+		id: 'engagements_last_meeting_booked_campaign',
+		label: 'Campaign of last booking in meetings tool',
+	},
+	{
+		id: 'engagements_last_meeting_booked_medium',
+		label: 'Medium of last booking in meetings tool',
+	},
+	{
+		id: 'engagements_last_meeting_booked_source',
+		label: 'Source of last booking in meetings tool',
+	},
+	{
+		id: 'hs_analytics_first_visit_timestamp',
+		label: 'Time of First Session',
+	},
+	{
+		id: 'hs_email_last_open_date',
+		label: 'Last marketing email open date',
+	},
+	{
+		id: 'hs_latest_meeting_activity',
+		label: 'Latest meeting activity',
+	},
+	{
+		id: 'hs_sales_email_last_replied',
+		label: 'Recent Sales Email Replied Date',
+	},
+	{
+		id: 'hs_social_linkedin_clicks',
+		label: 'LinkedIn Clicks',
+	},
+	{
+		id: 'hubspot_owner_id',
+		label: 'Contact owner',
+	},
+	{
+		id: 'notes_last_contacted',
+		label: 'Last Contacted',
+	},
+	{
+		id: 'notes_last_updated',
+		label: 'Last Activity Date',
+	},
+	{
+		id: 'notes_next_activity_date',
+		label: 'Next Activity Date',
+	},
+	{
+		id: 'num_contacted_notes',
+		label: 'Number of times contacted',
+	},
+	{
+		id: 'num_notes',
+		label: 'Number of Sales Activities',
+	},
+	{
+		id: 'owneremail',
+		label: 'HubSpot Owner Email (legacy)',
+	},
+	{
+		id: 'ownername',
+		label: 'HubSpot Owner Name (legacy)',
+	},
+	{
+		id: 'surveymonkeyeventlastupdated',
+		label: 'SurveyMonkey Event Last Updated',
+	},
+	{
+		id: 'webinareventlastupdated',
+		label: 'Webinar Event Last Updated',
+	},
+	{
+		id: 'city',
+		label: 'City',
+	},
+	{
+		id: 'hs_analytics_last_timestamp',
+		label: 'Time Last Seen',
+	},
+	{
+		id: 'hs_email_last_click_date',
+		label: 'Last marketing email click date',
+	},
+	{
+		id: 'hs_social_google_plus_clicks',
+		label: 'Google Plus Clicks',
+	},
+	{
+		id: 'hubspot_team_id',
+		label: 'HubSpot Team',
+	},
+	{
+		id: 'linkedinbio',
+		label: 'LinkedIn Bio',
+	},
+	{
+		id: 'twitterbio',
+		label: 'Twitter Bio',
+	},
+	{
+		id: 'hs_all_owner_ids',
+		label: 'All owner ids',
+	},
+	{
+		id: 'hs_analytics_last_visit_timestamp',
+		label: 'Time of Last Session',
+	},
+	{
+		id: 'hs_email_first_send_date',
+		label: 'First marketing email send date',
+	},
+	{
+		id: 'hs_social_num_broadcast_clicks',
+		label: 'Broadcast Clicks',
+	},
+	{
+		id: 'state',
+		label: 'State/Region',
+	},
+	{
+		id: 'hs_all_team_ids',
+		label: 'All team ids',
+	},
+	{
+		id: 'hs_analytics_source',
+		label: 'Original Source',
+	},
+	{
+		id: 'hs_email_first_open_date',
+		label: 'First marketing email open date',
+	},
+	{
+		id: 'zip',
+		label: 'Postal Code',
+	},
+	{
+		id: 'country',
+		label: 'Country/Region',
+	},
+	{
+		id: 'hs_all_accessible_team_ids',
+		label: 'All accessible team ids',
+	},
+	{
+		id: 'hs_analytics_source_data_1',
+		label: 'Original Source Drill-Down 1',
+	},
+	{
+		id: 'hs_email_first_click_date',
+		label: 'First marketing email click date',
+	},
+	{
+		id: 'linkedinconnections',
+		label: 'LinkedIn Connections',
+	},
+	{
+		id: 'hs_analytics_source_data_2',
+		label: 'Original Source Drill-Down 2',
+	},
+	{
+		id: 'hs_email_is_ineligible',
+		label: 'Is globally ineligible',
+	},
+	{
+		id: 'hs_language',
+		label: 'Preferred language',
+	},
+	{
+		id: 'kloutscoregeneral',
+		label: 'Klout Score',
+	},
+	{
+		id: 'hs_analytics_first_referrer',
+		label: 'First Referring Site',
+	},
+	{
+		id: 'hs_email_first_reply_date',
+		label: 'First marketing email reply date',
+	},
+	{
+		id: 'jobtitle',
+		label: 'Job Title',
+	},
+	{
+		id: 'photo',
+		label: 'Photo',
+	},
+	{
+		id: 'hs_analytics_last_referrer',
+		label: 'Last Referring Site',
+	},
+	{
+		id: 'hs_email_last_reply_date',
+		label: 'Last marketing email reply date',
+	},
+	{
+		id: 'message',
+		label: 'Message',
+	},
+	{
+		id: 'closedate',
+		label: 'Close Date',
+	},
+	{
+		id: 'hs_analytics_average_page_views',
+		label: 'Average Pageviews',
+	},
+	{
+		id: 'hs_email_replied',
+		label: 'Marketing emails replied',
+	},
+	{
+		id: 'hs_analytics_revenue',
+		label: 'Event Revenue',
+	},
+	{
+		id: 'hs_lifecyclestage_lead_date',
+		label: 'Became a Lead Date',
+	},
+	{
+		id: 'hs_lifecyclestage_marketingqualifiedlead_date',
+		label: 'Became a Marketing Qualified Lead Date',
+	},
+	{
+		id: 'hs_lifecyclestage_opportunity_date',
+		label: 'Became an Opportunity Date',
+	},
+	{
+		id: 'lifecyclestage',
+		label: 'Lifecycle Stage',
+	},
+	{
+		id: 'hs_lifecyclestage_salesqualifiedlead_date',
+		label: 'Became a Sales Qualified Lead Date',
+	},
+	{
+		id: 'createdate',
+		label: 'Create Date',
+	},
+	{
+		id: 'hs_lifecyclestage_evangelist_date',
+		label: 'Became an Evangelist Date',
+	},
+	{
+		id: 'hs_lifecyclestage_customer_date',
+		label: 'Became a Customer Date',
+	},
+	{
+		id: 'hubspotscore',
+		label: 'HubSpot Score',
+	},
+	{
+		id: 'company',
+		label: 'Company Name',
+	},
+	{
+		id: 'hs_lifecyclestage_subscriber_date',
+		label: 'Became a Subscriber Date',
+	},
+	{
+		id: 'hs_lifecyclestage_other_date',
+		label: 'Became an Other Lifecycle Date',
+	},
+	{
+		id: 'website',
+		label: 'Website URL',
+	},
+	{
+		id: 'numemployees',
+		label: 'Number of Employees',
+	},
+	{
+		id: 'annualrevenue',
+		label: 'Annual Revenue',
+	},
+	{
+		id: 'industry',
+		label: 'Industry',
+	},
+	{
+		id: 'associatedcompanyid',
+		label: 'Associated Company ID',
+	},
+	{
+		id: 'associatedcompanylastupdated',
+		label: 'Associated Company Last Updated',
+	},
+	{
+		id: 'hs_predictivecontactscorebucket',
+		label: 'Lead Rating',
+	},
+	{
+		id: 'hs_predictivecontactscore',
+		label: 'Predictive Lead Score',
+	},
+];
+
+export const companyFields = [
+	{
+		id: 'about_us',
+		label: 'About Us',
+	},
+	{
+		id: 'closedate_timestamp_earliest_value_a2a17e6e',
+		label: 'closedate_timestamp_earliest_value_a2a17e6e',
+	},
+	{
+		id: 'facebookfans',
+		label: 'Facebook Fans',
+	},
+	{
+		id: 'first_contact_createdate_timestamp_earliest_value_78b50eea',
+		label: 'first_contact_createdate_timestamp_earliest_value_78b50eea',
+	},
+	{
+		id: 'first_conversion_date',
+		label: 'First Conversion Date',
+	},
+	{
+		id: 'first_conversion_date_timestamp_earliest_value_61f58f2c',
+		label: 'first_conversion_date_timestamp_earliest_value_61f58f2c',
+	},
+	{
+		id: 'first_conversion_event_name',
+		label: 'First Conversion',
+	},
+	{
+		id: 'first_conversion_event_name_timestamp_earliest_value_68ddae0a',
+		label: 'first_conversion_event_name_timestamp_earliest_value_68ddae0a',
+	},
+	{
+		id: 'first_deal_created_date',
+		label: 'First Deal Created Date',
+	},
+	{
+		id: 'founded_year',
+		label: 'Year Founded',
+	},
+	{
+		id: 'hs_additional_domains',
+		label: 'Additional Domains',
+	},
+	{
+		id: 'hs_analytics_first_timestamp',
+		label: 'Time First Seen',
+	},
+	{
+		id: 'hs_analytics_first_timestamp_timestamp_earliest_value_11e3a63a',
+		label: 'hs_analytics_first_timestamp_timestamp_earliest_value_11e3a63a',
+	},
+	{
+		id: 'hs_analytics_first_touch_converting_campaign',
+		label: 'First Touch Converting Campaign',
+	},
+	{
+		id: 'hs_analytics_first_touch_converting_campaign_timestamp_earliest_value_4757fe10',
+		label: 'hs_analytics_first_touch_converting_campaign_timestamp_earliest_value_4757fe10',
+	},
+	{
+		id: 'hs_analytics_first_visit_timestamp',
+		label: 'Time of First Session',
+	},
+	{
+		id: 'hs_analytics_first_visit_timestamp_timestamp_earliest_value_accc17ae',
+		label: 'hs_analytics_first_visit_timestamp_timestamp_earliest_value_accc17ae',
+	},
+	{
+		id: 'hs_analytics_last_timestamp',
+		label: 'Time Last Seen',
+	},
+	{
+		id: 'hs_analytics_last_timestamp_timestamp_latest_value_4e16365a',
+		label: 'hs_analytics_last_timestamp_timestamp_latest_value_4e16365a',
+	},
+	{
+		id: 'hs_analytics_last_touch_converting_campaign',
+		label: 'Last Touch Converting Campaign',
+	},
+	{
+		id: 'hs_analytics_last_touch_converting_campaign_timestamp_latest_value_81a64e30',
+		label: 'hs_analytics_last_touch_converting_campaign_timestamp_latest_value_81a64e30',
+	},
+	{
+		id: 'hs_analytics_last_visit_timestamp',
+		label: 'Time of Last Session',
+	},
+	{
+		id: 'hs_analytics_last_visit_timestamp_timestamp_latest_value_999a0fce',
+		label: 'hs_analytics_last_visit_timestamp_timestamp_latest_value_999a0fce',
+	},
+	{
+		id: 'hs_analytics_num_page_views',
+		label: 'Number of Pageviews',
+	},
+	{
+		id: 'hs_analytics_num_page_views_cardinality_sum_e46e85b0',
+		label: 'hs_analytics_num_page_views_cardinality_sum_e46e85b0',
+	},
+	{
+		id: 'hs_analytics_num_visits',
+		label: 'Number of Sessions',
+	},
+	{
+		id: 'hs_analytics_num_visits_cardinality_sum_53d952a6',
+		label: 'hs_analytics_num_visits_cardinality_sum_53d952a6',
+	},
+	{
+		id: 'hs_analytics_source',
+		label: 'Original Source Type',
+	},
+	{
+		id: 'hs_analytics_source_data_1',
+		label: 'Original Source Data 1',
+	},
+	{
+		id: 'hs_analytics_source_data_1_timestamp_earliest_value_9b2f1fa1',
+		label: 'hs_analytics_source_data_1_timestamp_earliest_value_9b2f1fa1',
+	},
+	{
+		id: 'hs_analytics_source_data_2',
+		label: 'Original Source Data 2',
+	},
+	{
+		id: 'hs_analytics_source_data_2_timestamp_earliest_value_9b2f9400',
+		label: 'hs_analytics_source_data_2_timestamp_earliest_value_9b2f9400',
+	},
+	{
+		id: 'hs_analytics_source_timestamp_earliest_value_25a3a52c',
+		label: 'hs_analytics_source_timestamp_earliest_value_25a3a52c',
+	},
+	{
+		id: 'hs_avatar_filemanager_key',
+		label: 'Avatar FileManager key',
+	},
+	{
+		id: 'hs_created_by_user_id',
+		label: 'Created by user ID',
+	},
+	{
+		id: 'hs_createdate',
+		label: 'Object create date/time',
+	},
+	{
+		id: 'hs_ideal_customer_profile',
+		label: 'Ideal Customer Profile Tier',
+	},
+	{
+		id: 'hs_is_target_account',
+		label: 'Target Account',
+	},
+	{
+		id: 'hs_last_booked_meeting_date',
+		label: 'Last Booked Meeting Date',
+	},
+	{
+		id: 'hs_last_logged_call_date',
+		label: 'Last Logged Call Date',
+	},
+	{
+		id: 'hs_last_open_task_date',
+		label: 'Last Open Task Date',
+	},
+	{
+		id: 'hs_last_sales_activity_date',
+		label: 'last sales activity date old',
+	},
+	{
+		id: 'hs_last_sales_activity_timestamp',
+		label: 'Last Engagement Date',
+	},
+	{
+		id: 'hs_lastmodifieddate',
+		label: 'Last Modified Date',
+	},
+	{
+		id: 'hs_merged_object_ids',
+		label: 'Merged object IDs',
+	},
+	{
+		id: 'hs_num_blockers',
+		label: 'Number of blockers',
+	},
+	{
+		id: 'hs_num_contacts_with_buying_roles',
+		label: 'Number of contacts with a buying role',
+	},
+	{
+		id: 'hs_num_decision_makers',
+		label: 'Number of decision makers',
+	},
+	{
+		id: 'hs_num_open_deals',
+		label: 'Number of open deals',
+	},
+	{
+		id: 'hs_object_id',
+		label: 'Company ID',
+	},
+	{
+		id: 'hs_predictivecontactscore_v2',
+		label: 'Likelihood to close',
+	},
+	{
+		id: 'hs_predictivecontactscore_v2_next_max_max_d4e58c1e',
+		label: 'hs_predictivecontactscore_v2_next_max_max_d4e58c1e',
+	},
+	{
+		id: 'hs_target_account',
+		label: 'Target Account',
+	},
+	{
+		id: 'hs_target_account_probability',
+		label: 'Target Account Probability',
+	},
+	{
+		id: 'hs_target_account_recommendation_snooze_time',
+		label: 'Target Account Recommendation Snooze Time',
+	},
+	{
+		id: 'hs_target_account_recommendation_state',
+		label: 'Target Account Recommendation State',
+	},
+	{
+		id: 'hs_total_deal_value',
+		label: 'Total open deal value',
+	},
+	{
+		id: 'hs_updated_by_user_id',
+		label: 'Updated by user ID',
+	},
+	{
+		id: 'hs_user_ids_of_all_owners',
+		label: 'User IDs of all owners',
+	},
+	{
+		id: 'hubspot_owner_assigneddate',
+		label: 'Owner Assigned Date',
+	},
+	{
+		id: 'is_public',
+		label: 'Is Public',
+	},
+	{
+		id: 'num_associated_contacts',
+		label: 'Associated Contacts',
+	},
+	{
+		id: 'num_associated_deals',
+		label: 'Associated Deals',
+	},
+	{
+		id: 'num_conversion_events',
+		label: 'Number of Form Submissions',
+	},
+	{
+		id: 'num_conversion_events_cardinality_sum_d095f14b',
+		label: 'num_conversion_events_cardinality_sum_d095f14b',
+	},
+	{
+		id: 'recent_conversion_date',
+		label: 'Recent Conversion Date',
+	},
+	{
+		id: 'recent_conversion_date_timestamp_latest_value_72856da1',
+		label: 'recent_conversion_date_timestamp_latest_value_72856da1',
+	},
+	{
+		id: 'recent_conversion_event_name',
+		label: 'Recent Conversion',
+	},
+	{
+		id: 'recent_conversion_event_name_timestamp_latest_value_66c820bf',
+		label: 'recent_conversion_event_name_timestamp_latest_value_66c820bf',
+	},
+	{
+		id: 'recent_deal_amount',
+		label: 'Recent Deal Amount',
+	},
+	{
+		id: 'recent_deal_close_date',
+		label: 'Recent Deal Close Date',
+	},
+	{
+		id: 'timezone',
+		label: 'Time Zone',
+	},
+	{
+		id: 'total_money_raised',
+		label: 'Total Money Raised',
+	},
+	{
+		id: 'total_revenue',
+		label: 'Total Revenue',
+	},
+	{
+		id: 'name',
+		label: 'Name',
+	},
+	{
+		id: 'owneremail',
+		label: 'HubSpot Owner Email',
+	},
+	{
+		id: 'twitterhandle',
+		label: 'Twitter Handle',
+	},
+	{
+		id: 'ownername',
+		label: 'HubSpot Owner Name',
+	},
+	{
+		id: 'phone',
+		label: 'Phone Number',
+	},
+	{
+		id: 'twitterbio',
+		label: 'Twitter Bio',
+	},
+	{
+		id: 'twitterfollowers',
+		label: 'Twitter Followers',
+	},
+	{
+		id: 'address',
+		label: 'Street Address',
+	},
+	{
+		id: 'address2',
+		label: 'Street Address 2',
+	},
+	{
+		id: 'facebook_company_page',
+		label: 'Facebook Company Page',
+	},
+	{
+		id: 'city',
+		label: 'City',
+	},
+	{
+		id: 'linkedin_company_page',
+		label: 'LinkedIn Company Page',
+	},
+	{
+		id: 'linkedinbio',
+		label: 'LinkedIn Bio',
+	},
+	{
+		id: 'state',
+		label: 'State/Region',
+	},
+	{
+		id: 'googleplus_page',
+		label: 'Google Plus Page',
+	},
+	{
+		id: 'engagements_last_meeting_booked',
+		label: 'Date of last meeting booked in meetings tool',
+	},
+	{
+		id: 'engagements_last_meeting_booked_campaign',
+		label: 'Campaign of last booking in meetings tool',
+	},
+	{
+		id: 'engagements_last_meeting_booked_medium',
+		label: 'Medium of last booking in meetings tool',
+	},
+	{
+		id: 'engagements_last_meeting_booked_source',
+		label: 'Source of last booking in meetings tool',
+	},
+	{
+		id: 'hs_latest_meeting_activity',
+		label: 'Latest meeting activity',
+	},
+	{
+		id: 'hs_sales_email_last_replied',
+		label: 'Recent Sales Email Replied Date',
+	},
+	{
+		id: 'hubspot_owner_id',
+		label: 'Company owner',
+	},
+	{
+		id: 'notes_last_contacted',
+		label: 'Last Contacted',
+	},
+	{
+		id: 'notes_last_updated',
+		label: 'Last Activity Date',
+	},
+	{
+		id: 'notes_next_activity_date',
+		label: 'Next Activity Date',
+	},
+	{
+		id: 'num_contacted_notes',
+		label: 'Number of times contacted',
+	},
+	{
+		id: 'num_notes',
+		label: 'Number of Sales Activities',
+	},
+	{
+		id: 'zip',
+		label: 'Postal Code',
+	},
+	{
+		id: 'country',
+		label: 'Country/Region',
+	},
+	{
+		id: 'hubspot_team_id',
+		label: 'HubSpot Team',
+	},
+	{
+		id: 'hs_all_owner_ids',
+		label: 'All owner ids',
+	},
+	{
+		id: 'website',
+		label: 'Website URL',
+	},
+	{
+		id: 'domain',
+		label: 'Company Domain Name',
+	},
+	{
+		id: 'hs_all_team_ids',
+		label: 'All team ids',
+	},
+	{
+		id: 'hs_all_accessible_team_ids',
+		label: 'All accessible team ids',
+	},
+	{
+		id: 'numberofemployees',
+		label: 'Number of Employees',
+	},
+	{
+		id: 'industry',
+		label: 'Industry',
+	},
+	{
+		id: 'annualrevenue',
+		label: 'Annual Revenue',
+	},
+	{
+		id: 'lifecyclestage',
+		label: 'Lifecycle Stage',
+	},
+	{
+		id: 'hs_lead_status',
+		label: 'Lead Status',
+	},
+	{
+		id: 'hs_parent_company_id',
+		label: 'Parent Company',
+	},
+	{
+		id: 'type',
+		label: 'Type',
+	},
+	{
+		id: 'description',
+		label: 'Description',
+	},
+	{
+		id: 'hs_num_child_companies',
+		label: 'Number of child companies',
+	},
+	{
+		id: 'hubspotscore',
+		label: 'HubSpot Score',
+	},
+	{
+		id: 'createdate',
+		label: 'Create Date',
+	},
+	{
+		id: 'closedate',
+		label: 'Close Date',
+	},
+	{
+		id: 'first_contact_createdate',
+		label: 'First Contact Create Date',
+	},
+	{
+		id: 'days_to_close',
+		label: 'Days to Close',
+	},
+	{
+		id: 'web_technologies',
+		label: 'Web Technologies',
+	},
+];
+
+export const dealFields = [
+	{
+		id: 'amount_in_home_currency',
+		label: 'Amount in company currency',
+	},
+	{
+		id: 'days_to_close',
+		label: 'Days to close',
+	},
+	{
+		id: 'deal_currency_code',
+		label: 'Currency',
+	},
+	{
+		id: 'hs_acv',
+		label: 'Annual contract value',
+	},
+	{
+		id: 'hs_analytics_source',
+		label: 'Original Source Type',
+	},
+	{
+		id: 'hs_analytics_source_data_1',
+		label: 'Original Source Data 1',
+	},
+	{
+		id: 'hs_analytics_source_data_2',
+		label: 'Original Source Data 2',
+	},
+	{
+		id: 'hs_arr',
+		label: 'Annual recurring revenue',
+	},
+	{
+		id: 'hs_campaign',
+		label: 'HubSpot Campaign',
+	},
+	{
+		id: 'hs_closed_amount',
+		label: 'Closed Deal Amount',
+	},
+	{
+		id: 'hs_closed_amount_in_home_currency',
+		label: 'Closed Deal Amount In Home Currency',
+	},
+	{
+		id: 'hs_created_by_user_id',
+		label: 'Created by user ID',
+	},
+	{
+		id: 'hs_date_entered_appointmentscheduled',
+		label: "Date entered 'Appointment Scheduled (Sales Pipeline)'",
+	},
+	{
+		id: 'hs_date_entered_closedlost',
+		label: "Date entered 'Closed Lost (Sales Pipeline)'",
+	},
+	{
+		id: 'hs_date_entered_closedwon',
+		label: "Date entered 'Closed Won (Sales Pipeline)'",
+	},
+	{
+		id: 'hs_date_entered_contractsent',
+		label: "Date entered 'Contract Sent (Sales Pipeline)'",
+	},
+	{
+		id: 'hs_date_entered_decisionmakerboughtin',
+		label: "Date entered 'Decision Maker Bought-In (Sales Pipeline)'",
+	},
+	{
+		id: 'hs_date_entered_presentationscheduled',
+		label: "Date entered 'Presentation Scheduled (Sales Pipeline)'",
+	},
+	{
+		id: 'hs_date_entered_qualifiedtobuy',
+		label: "Date entered 'Qualified To Buy (Sales Pipeline)'",
+	},
+	{
+		id: 'hs_date_exited_appointmentscheduled',
+		label: "Date exited 'Appointment Scheduled (Sales Pipeline)'",
+	},
+	{
+		id: 'hs_date_exited_closedlost',
+		label: "Date exited 'Closed Lost (Sales Pipeline)'",
+	},
+	{
+		id: 'hs_date_exited_closedwon',
+		label: "Date exited 'Closed Won (Sales Pipeline)'",
+	},
+	{
+		id: 'hs_date_exited_contractsent',
+		label: "Date exited 'Contract Sent (Sales Pipeline)'",
+	},
+	{
+		id: 'hs_date_exited_decisionmakerboughtin',
+		label: "Date exited 'Decision Maker Bought-In (Sales Pipeline)'",
+	},
+	{
+		id: 'hs_date_exited_presentationscheduled',
+		label: "Date exited 'Presentation Scheduled (Sales Pipeline)'",
+	},
+	{
+		id: 'hs_date_exited_qualifiedtobuy',
+		label: "Date exited 'Qualified To Buy (Sales Pipeline)'",
+	},
+	{
+		id: 'hs_deal_amount_calculation_preference',
+		label: 'Deal amount calculation preference',
+	},
+	{
+		id: 'hs_deal_stage_probability',
+		label: 'Deal Stage Probability',
+	},
+	{
+		id: 'hs_forecast_amount',
+		label: 'Forecast Amount',
+	},
+	{
+		id: 'hs_forecast_probability',
+		label: 'Forecast Probability',
+	},
+	{
+		id: 'hs_is_closed',
+		label: 'Is Deal Closed?',
+	},
+	{
+		id: 'hs_lastmodifieddate',
+		label: 'Last Modified Date',
+	},
+	{
+		id: 'hs_likelihood_to_close',
+		label: 'Likelihood to close by the close date',
+	},
+	{
+		id: 'hs_line_item_global_term_hs_discount_percentage',
+		label: 'Global Term Line Item Discount Percentage',
+	},
+	{
+		id: 'hs_line_item_global_term_hs_discount_percentage_enabled',
+		label: 'Global Term Line Item Discount Percentage Enabled',
+	},
+	{
+		id: 'hs_line_item_global_term_hs_recurring_billing_period',
+		label: 'Global Term Line Item Recurring Billing Period',
+	},
+	{
+		id: 'hs_line_item_global_term_hs_recurring_billing_period_enabled',
+		label: 'Global Term Line Item Recurring Billing Period Enabled',
+	},
+	{
+		id: 'hs_line_item_global_term_hs_recurring_billing_start_date',
+		label: 'Global Term Line Item Recurring Billing Start Date',
+	},
+	{
+		id: 'hs_line_item_global_term_hs_recurring_billing_start_date_enabled',
+		label: 'Global Term Line Item Recurring Billing Start Date Enabled',
+	},
+	{
+		id: 'hs_line_item_global_term_recurringbillingfrequency',
+		label: 'Global Term Line Item Recurring Billing Frequency',
+	},
+	{
+		id: 'hs_line_item_global_term_recurringbillingfrequency_enabled',
+		label: 'Global Term Line Item Recurring Billing Frequency Enabled',
+	},
+	{
+		id: 'hs_manual_forecast_category',
+		label: 'Forecast category',
+	},
+	{
+		id: 'hs_merged_object_ids',
+		label: 'Merged object IDs',
+	},
+	{
+		id: 'hs_mrr',
+		label: 'Monthly recurring revenue',
+	},
+	{
+		id: 'hs_next_step',
+		label: 'Next step',
+	},
+	{
+		id: 'hs_object_id',
+		label: 'Deal ID',
+	},
+	{
+		id: 'hs_predicted_amount',
+		label: 'The predicted deal amount',
+	},
+	{
+		id: 'hs_predicted_amount_in_home_currency',
+		label: "The predicted deal amount in your company's currency",
+	},
+	{
+		id: 'hs_projected_amount',
+		label: 'Projected Deal Amount',
+	},
+	{
+		id: 'hs_projected_amount_in_home_currency',
+		label: 'Projected Deal Amount in Home Currency',
+	},
+	{
+		id: 'hs_tcv',
+		label: 'Total contract value',
+	},
+	{
+		id: 'hs_time_in_appointmentscheduled',
+		label: "Time in 'Appointment Scheduled (Sales Pipeline)'",
+	},
+	{
+		id: 'hs_time_in_closedlost',
+		label: "Time in 'Closed Lost (Sales Pipeline)'",
+	},
+	{
+		id: 'hs_time_in_closedwon',
+		label: "Time in 'Closed Won (Sales Pipeline)'",
+	},
+	{
+		id: 'hs_time_in_contractsent',
+		label: "Time in 'Contract Sent (Sales Pipeline)'",
+	},
+	{
+		id: 'hs_time_in_decisionmakerboughtin',
+		label: "Time in 'Decision Maker Bought-In (Sales Pipeline)'",
+	},
+	{
+		id: 'hs_time_in_presentationscheduled',
+		label: "Time in 'Presentation Scheduled (Sales Pipeline)'",
+	},
+	{
+		id: 'hs_time_in_qualifiedtobuy',
+		label: "Time in 'Qualified To Buy (Sales Pipeline)'",
+	},
+	{
+		id: 'hs_updated_by_user_id',
+		label: 'Updated by user ID',
+	},
+	{
+		id: 'hs_user_ids_of_all_owners',
+		label: 'User IDs of all owners',
+	},
+	{
+		id: 'hubspot_owner_assigneddate',
+		label: 'Owner Assigned Date',
+	},
+	{
+		id: 'testing',
+		label: 'testing',
+	},
+	{
+		id: 'dealname',
+		label: 'Deal Name',
+	},
+	{
+		id: 'amount',
+		label: 'Amount',
+	},
+	{
+		id: 'dealstage',
+		label: 'Deal Stage',
+	},
+	{
+		id: 'pipeline',
+		label: 'Pipeline',
+	},
+	{
+		id: 'closedate',
+		label: 'Close Date',
+	},
+	{
+		id: 'createdate',
+		label: 'Create Date',
+	},
+	{
+		id: 'engagements_last_meeting_booked',
+		label: 'Date of last meeting booked in meetings tool',
+	},
+	{
+		id: 'engagements_last_meeting_booked_campaign',
+		label: 'Campaign of last booking in meetings tool',
+	},
+	{
+		id: 'engagements_last_meeting_booked_medium',
+		label: 'Medium of last booking in meetings tool',
+	},
+	{
+		id: 'engagements_last_meeting_booked_source',
+		label: 'Source of last booking in meetings tool',
+	},
+	{
+		id: 'hs_latest_meeting_activity',
+		label: 'Latest meeting activity',
+	},
+	{
+		id: 'hs_sales_email_last_replied',
+		label: 'Recent Sales Email Replied Date',
+	},
+	{
+		id: 'hubspot_owner_id',
+		label: 'Deal owner',
+	},
+	{
+		id: 'notes_last_contacted',
+		label: 'Last Contacted',
+	},
+	{
+		id: 'notes_last_updated',
+		label: 'Last Activity Date',
+	},
+	{
+		id: 'notes_next_activity_date',
+		label: 'Next Activity Date',
+	},
+	{
+		id: 'num_contacted_notes',
+		label: 'Number of times contacted',
+	},
+	{
+		id: 'num_notes',
+		label: 'Number of Sales Activities',
+	},
+	{
+		id: 'hs_createdate',
+		label: 'HubSpot Create Date',
+	},
+	{
+		id: 'hubspot_team_id',
+		label: 'HubSpot Team',
+	},
+	{
+		id: 'dealtype',
+		label: 'Deal Type',
+	},
+	{
+		id: 'hs_all_owner_ids',
+		label: 'All owner ids',
+	},
+	{
+		id: 'description',
+		label: 'Deal Description',
+	},
+	{
+		id: 'hs_all_team_ids',
+		label: 'All team ids',
+	},
+	{
+		id: 'hs_all_accessible_team_ids',
+		label: 'All accessible team ids',
+	},
+	{
+		id: 'num_associated_contacts',
+		label: 'Number of Contacts',
+	},
+	{
+		id: 'closed_lost_reason',
+		label: 'Closed Lost Reason',
+	},
+	{
+		id: 'closed_won_reason',
+		label: 'Closed Won Reason',
+	},
+];
+
+const reduceMetadatFields = (data: string[]) => {
+	return data
+		.reduce((a, v) => {
+			//@ts-ignore
+			a.push(...v.split(','));
+			return a;
+		}, [])
+		.map((email) => ({ email }));
+};
+
+export const getEmailMetadata = (meta: IDataObject) => {
+	return {
+		from: {
+			...(meta.fromEmail && { email: meta.fromEmail }),
+			...(meta.firstName && { firstName: meta.firstName }),
+			...(meta.lastName && { lastName: meta.lastName }),
+		},
+		cc: reduceMetadatFields((meta.cc as string[]) || []),
+		bcc: reduceMetadatFields((meta.bcc as string[]) || []),
+		...(meta.subject && { subject: meta.subject }),
+		...(meta.html && { html: meta.html }),
+		...(meta.text && { text: meta.text }),
+	};
+};
+
+export const getTaskMetadata = (meta: IDataObject) => {
+	return {
+		...(meta.body && { body: meta.body }),
+		...(meta.subject && { subject: meta.subject }),
+		...(meta.status && { status: meta.status }),
+		...(meta.forObjectType && { forObjectType: meta.forObjectType }),
+	};
+};
+
+export const getMeetingMetadata = (meta: IDataObject) => {
+	return {
+		...(meta.body && { body: meta.body }),
+		...(meta.startTime && { startTime: moment(meta.startTime as string).unix() }),
+		...(meta.endTime && { endTime: moment(meta.endTime as string).unix() }),
+		...(meta.title && { title: meta.title }),
+		...(meta.internalMeetingNotes && { internalMeetingNotes: meta.internalMeetingNotes }),
+	};
+};
+
+export const getCallMetadata = (meta: IDataObject) => {
+	return {
+		...(meta.toNumber && { toNumber: meta.toNumber }),
+		...(meta.fromNumber && { fromNumber: meta.fromNumber }),
+		...(meta.status && { status: meta.status }),
+		...(meta.durationMilliseconds && { durationMilliseconds: meta.durationMilliseconds }),
+		...(meta.recordingUrl && { recordingUrl: meta.recordingUrl }),
+		...(meta.body && { body: meta.body }),
+	};
+};
+
+export const getAssociations = (associations: {
+	companyIds: string;
+	dealIds: string;
+	ownerIds: string;
+	contactIds: string;
+	ticketIds: string;
+}) => {
+	return {
+		...(associations.companyIds && { companyIds: associations.companyIds.toString().split(',') }),
+		...(associations.contactIds && { contactIds: associations.contactIds.toString().split(',') }),
+		...(associations.dealIds && { dealIds: associations.dealIds.toString().split(',') }),
+		...(associations.ownerIds && { ownerIds: associations.ownerIds.toString().split(',') }),
+		...(associations.ticketIds && { ticketIds: associations.ticketIds.toString().split(',') }),
+	};
+};
+
+export async function validateCredentials(
+	this: ICredentialTestFunctions,
+	decryptedCredentials: ICredentialDataDecryptedObject,
+	// tslint:disable-next-line:no-any
+): Promise<any> {
+	const credentials = decryptedCredentials;
+
+	const { apiKey, appToken } = credentials as {
+		appToken: string;
+		apiKey: string;
+	};
+
+	const options: IRequestOptions = {
+		method: 'GET',
+		headers: {},
+		uri: 'https://api.hubapi.com/deals/v1/deal/paged',
+		json: true,
+	};
+
+	if (apiKey) {
+		options.qs = { hapikey: apiKey };
+	} else {
+		options.headers = { Authorization: `Bearer ${appToken}` };
+	}
+
+	return await this.helpers.request(options);
+}
diff --git a/packages/nodes-base/nodes/Hubspot/V1/HubspotV1.node.ts b/packages/nodes-base/nodes/Hubspot/V1/HubspotV1.node.ts
new file mode 100644
index 0000000000000..68d963e5f3980
--- /dev/null
+++ b/packages/nodes-base/nodes/Hubspot/V1/HubspotV1.node.ts
@@ -0,0 +1,2737 @@
+import type {
+	ICredentialDataDecryptedObject,
+	ICredentialsDecrypted,
+	ICredentialTestFunctions,
+	IDataObject,
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
+	INodeCredentialTestResult,
+	INodeExecutionData,
+	INodePropertyOptions,
+	INodeType,
+	INodeTypeBaseDescription,
+	INodeTypeDescription,
+	JsonObject,
+} from 'n8n-workflow';
+import { NodeOperationError } from 'n8n-workflow';
+
+import { snakeCase } from 'change-case';
+import {
+	clean,
+	getAssociations,
+	getCallMetadata,
+	getEmailMetadata,
+	getMeetingMetadata,
+	getTaskMetadata,
+	hubspotApiRequest,
+	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;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			group: ['output'],
+			version: 1,
+			subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+			defaults: {
+				name: 'HubSpot',
+			},
+			inputs: ['main'],
+			outputs: ['main'],
+			credentials: [
+				{
+					name: 'hubspotApi',
+					required: true,
+					testedBy: 'hubspotApiTest',
+					displayOptions: {
+						show: {
+							authentication: ['apiKey'],
+						},
+					},
+				},
+				{
+					name: 'hubspotAppToken',
+					required: true,
+					testedBy: 'hubspotApiTest',
+					displayOptions: {
+						show: {
+							authentication: ['appToken'],
+						},
+					},
+				},
+				{
+					name: 'hubspotOAuth2Api',
+					required: true,
+					displayOptions: {
+						show: {
+							authentication: ['oAuth2'],
+						},
+					},
+				},
+			],
+			properties: [
+				{
+					displayName: 'Authentication',
+					name: 'authentication',
+					type: 'options',
+					options: [
+						{
+							name: 'API Key',
+							value: 'apiKey',
+						},
+						{
+							name: 'APP Token',
+							value: 'appToken',
+						},
+						{
+							name: 'OAuth2',
+							value: 'oAuth2',
+						},
+					],
+					default: 'apiKey',
+				},
+				{
+					displayName: 'Resource',
+					name: 'resource',
+					type: 'options',
+					noDataExpression: true,
+					options: [
+						{
+							name: 'Company',
+							value: 'company',
+						},
+						{
+							name: 'Contact',
+							value: 'contact',
+						},
+						{
+							name: 'Contact List',
+							value: 'contactList',
+						},
+						{
+							name: 'Deal',
+							value: 'deal',
+						},
+						{
+							name: 'Engagement',
+							value: 'engagement',
+						},
+						{
+							name: 'Form',
+							value: 'form',
+						},
+						{
+							name: 'Ticket',
+							value: 'ticket',
+						},
+					],
+					default: 'deal',
+				},
+				// CONTACT
+				...contactOperations,
+				...contactFields,
+				// CONTACT LIST
+				...contactListOperations,
+				...contactListFields,
+				// COMPANY
+				...companyOperations,
+				...companyFields,
+				// DEAL
+				...dealOperations,
+				...dealFields,
+				// ENGAGEMENT
+				...engagementOperations,
+				...engagementFields,
+				// FORM
+				...formOperations,
+				...formFields,
+				// TICKET
+				...ticketOperations,
+				...ticketFields,
+			],
+		};
+	}
+
+	methods = {
+		credentialTest: {
+			async hubspotApiTest(
+				this: ICredentialTestFunctions,
+				credential: ICredentialsDecrypted,
+			): Promise<INodeCredentialTestResult> {
+				try {
+					await validateCredentials.call(this, credential.data as ICredentialDataDecryptedObject);
+				} catch (error) {
+					const err = error as JsonObject;
+					if (err.statusCode === 401) {
+						return {
+							status: 'Error',
+							message: 'Invalid credentials',
+						};
+					}
+				}
+				return {
+					status: 'OK',
+					message: 'Authentication successful',
+				};
+			},
+		},
+
+		loadOptions: {
+			/* -------------------------------------------------------------------------- */
+			/*                                 CONTACT                                    */
+			/* -------------------------------------------------------------------------- */
+
+			// Get all the contact lead statuses to display them to user so that they can
+			// select them easily
+			async getContactLeadStatuses(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/properties/v2/contacts/properties';
+				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
+				for (const property of properties) {
+					if (property.name === 'hs_lead_status') {
+						for (const option of property.options) {
+							const statusName = option.label;
+							const statusId = option.value;
+							returnData.push({
+								name: statusName,
+								value: statusId,
+							});
+						}
+					}
+				}
+				return returnData;
+			},
+
+			// Get all the contact legal basics to display them to user so that they can
+			// select them easily
+			async getContactLealBasics(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/properties/v2/contacts/properties';
+				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
+				for (const property of properties) {
+					if (property.name === 'hs_legal_basis') {
+						for (const option of property.options) {
+							const statusName = option.label;
+							const statusId = option.value;
+							returnData.push({
+								name: statusName,
+								value: statusId,
+							});
+						}
+					}
+				}
+				return returnData;
+			},
+
+			// Get all the contact lifecycle stages to display them to user so that they can
+			// select them easily
+			async getContactLifeCycleStages(
+				this: ILoadOptionsFunctions,
+			): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/properties/v2/contacts/properties';
+				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
+				for (const property of properties) {
+					if (property.name === 'lifecyclestage') {
+						for (const option of property.options) {
+							const stageName = option.label;
+							const stageId = option.value;
+							returnData.push({
+								name: stageName,
+								value: stageId,
+							});
+						}
+					}
+				}
+				return returnData;
+			},
+
+			// Get all the contact lifecycle stages to display them to user so that they can
+			// select them easily
+			async getContactOriginalSources(
+				this: ILoadOptionsFunctions,
+			): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/properties/v2/contacts/properties';
+				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
+				for (const property of properties) {
+					if (property.name === 'hs_analytics_source') {
+						for (const option of property.options) {
+							const sourceName = option.label;
+							const sourceId = option.value;
+							returnData.push({
+								name: sourceName,
+								value: sourceId,
+							});
+						}
+					}
+				}
+				return returnData;
+			},
+
+			// Get all the contact preffered languages to display them to user so that they can
+			// select them easily
+			async getContactPrefferedLanguages(
+				this: ILoadOptionsFunctions,
+			): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/properties/v2/contacts/properties';
+				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
+				for (const property of properties) {
+					if (property.name === 'hs_language') {
+						for (const option of property.options) {
+							const languageName = option.label;
+							const languageId = option.value;
+							returnData.push({
+								name: languageName,
+								value: languageId,
+							});
+						}
+					}
+				}
+				return returnData;
+			},
+
+			// Get all the contact preffered languages to display them to user so that they can
+			// select them easily
+			async getContactStatuses(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/properties/v2/contacts/properties';
+				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
+				for (const property of properties) {
+					if (property.name === 'hs_content_membership_status') {
+						for (const option of property.options) {
+							const languageName = option.label;
+							const languageId = option.value;
+							returnData.push({
+								name: languageName,
+								value: languageId,
+							});
+						}
+					}
+				}
+				return returnData;
+			},
+
+			// Get all the contact properties to display them to user so that they can
+			// select them easily
+			async getContactProperties(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/properties/v2/contacts/properties';
+				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
+				for (const property of properties) {
+					const propertyName = property.label;
+					const propertyId = property.name;
+					returnData.push({
+						name: propertyName,
+						value: propertyId,
+					});
+				}
+				return returnData;
+			},
+
+			// Get all the contact properties to display them to user so that they can
+			// select them easily
+			async getContactCustomProperties(
+				this: ILoadOptionsFunctions,
+			): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/properties/v2/contacts/properties';
+				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
+				for (const property of properties) {
+					if (property.hubspotDefined === null) {
+						const propertyName = property.label;
+						const propertyId = property.name;
+						returnData.push({
+							name: propertyName,
+							value: propertyId,
+						});
+					}
+				}
+				return returnData;
+			},
+
+			// Get all the contact number of employees options to display them to user so that they can
+			// select them easily
+			async getContactNumberOfEmployees(
+				this: ILoadOptionsFunctions,
+			): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/properties/v2/contacts/properties';
+				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
+				for (const property of properties) {
+					if (property.name === 'numemployees') {
+						for (const option of property.options) {
+							const optionName = option.label;
+							const optionId = option.value;
+							returnData.push({
+								name: optionName,
+								value: optionId,
+							});
+						}
+					}
+				}
+				return returnData;
+			},
+
+			/* -------------------------------------------------------------------------- */
+			/*                                 COMPANY                                    */
+			/* -------------------------------------------------------------------------- */
+
+			// Get all the company industries to display them to user so that they can
+			// select them easily
+			async getCompanyIndustries(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/properties/v2/companies/properties';
+				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
+				for (const property of properties) {
+					if (property.name === 'industry') {
+						for (const option of property.options) {
+							const industryName = option.label;
+							const industryId = option.value;
+							returnData.push({
+								name: industryName,
+								value: industryId,
+							});
+						}
+					}
+				}
+				return returnData;
+			},
+
+			// Get all the company lead statuses to display them to user so that they can
+			// select them easily
+			async getCompanyleadStatuses(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/properties/v2/companies/properties';
+				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
+				for (const property of properties) {
+					if (property.name === 'hs_lead_status') {
+						for (const option of property.options) {
+							const statusName = option.label;
+							const statusId = option.value;
+							returnData.push({
+								name: statusName,
+								value: statusId,
+							});
+						}
+					}
+				}
+				return returnData;
+			},
+
+			// Get all the company lifecycle stages to display them to user so that they can
+			// select them easily
+			async getCompanylifecycleStages(
+				this: ILoadOptionsFunctions,
+			): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/properties/v2/companies/properties';
+				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
+				for (const property of properties) {
+					if (property.name === 'lifecyclestage') {
+						for (const option of property.options) {
+							const stageName = option.label;
+							const stageId = option.value;
+							returnData.push({
+								name: stageName,
+								value: stageId,
+							});
+						}
+					}
+				}
+				return returnData;
+			},
+
+			// Get all the company types stages to display them to user so that they can
+			// select them easily
+			async getCompanyTypes(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/properties/v2/companies/properties';
+				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
+				for (const property of properties) {
+					if (property.name === 'type') {
+						for (const option of property.options) {
+							const typeName = option.label;
+							const typeId = option.value;
+							returnData.push({
+								name: typeName,
+								value: typeId,
+							});
+						}
+					}
+				}
+				return returnData;
+			},
+
+			// Get all the company types stages to display them to user so that they can
+			// select them easily
+			async getCompanyTargetAccounts(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/properties/v2/companies/properties';
+				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
+				for (const property of properties) {
+					if (property.name === 'hs_target_account') {
+						for (const option of property.options) {
+							const targetName = option.label;
+							const targetId = option.value;
+							returnData.push({
+								name: targetName,
+								value: targetId,
+							});
+						}
+					}
+				}
+				return returnData;
+			},
+
+			// Get all the company source types stages to display them to user so that they can
+			// select them easily
+			async getCompanySourceTypes(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/properties/v2/companies/properties';
+				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
+				for (const property of properties) {
+					if (property.name === 'hs_analytics_source') {
+						for (const option of property.options) {
+							const typeName = option.label;
+							const typeId = option.value;
+							returnData.push({
+								name: typeName,
+								value: typeId,
+							});
+						}
+					}
+				}
+				return returnData;
+			},
+
+			// Get all the company web technologies stages to display them to user so that they can
+			// select them easily
+			async getCompanyWebTechnologies(
+				this: ILoadOptionsFunctions,
+			): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/properties/v2/companies/properties';
+				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
+				for (const property of properties) {
+					if (property.name === 'web_technologies') {
+						for (const option of property.options) {
+							const technologyName = option.label;
+							const technologyId = option.value;
+							returnData.push({
+								name: technologyName,
+								value: technologyId,
+							});
+						}
+					}
+				}
+				return returnData;
+			},
+
+			// Get all the company properties to display them to user so that they can
+			// select them easily
+			async getCompanyProperties(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/properties/v2/companies/properties';
+				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
+				for (const property of properties) {
+					const propertyName = property.label;
+					const propertyId = property.name;
+					returnData.push({
+						name: propertyName,
+						value: propertyId,
+					});
+				}
+				return returnData;
+			},
+
+			// Get all the company custom properties to display them to user so that they can
+			// select them easily
+			async getCompanyCustomProperties(
+				this: ILoadOptionsFunctions,
+			): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/properties/v2/companies/properties';
+				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
+				for (const property of properties) {
+					if (property.hubspotDefined === null) {
+						const propertyName = property.label;
+						const propertyId = property.name;
+						returnData.push({
+							name: propertyName,
+							value: propertyId,
+						});
+					}
+				}
+				return returnData;
+			},
+
+			/* -------------------------------------------------------------------------- */
+			/*                                 DEAL                                       */
+			/* -------------------------------------------------------------------------- */
+
+			// Get all the groups to display them to user so that they can
+			// select them easily
+			async getDealStages(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/crm-pipelines/v1/pipelines/deals';
+				let stages = await hubspotApiRequest.call(this, 'GET', endpoint, {});
+				stages = stages.results[0].stages;
+				for (const stage of stages) {
+					const stageName = stage.label;
+					const stageId = stage.stageId;
+					returnData.push({
+						name: stageName,
+						value: stageId,
+					});
+				}
+				return returnData;
+			},
+
+			// Get all the deal types to display them to user so that they can
+			// select them easily
+			async getDealTypes(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/properties/v1/deals/properties/named/dealtype';
+				const dealTypes = await hubspotApiRequest.call(this, 'GET', endpoint);
+				for (const dealType of dealTypes.options) {
+					const dealTypeName = dealType.label;
+					const dealTypeId = dealType.value;
+					returnData.push({
+						name: dealTypeName,
+						value: dealTypeId,
+					});
+				}
+				return returnData;
+			},
+
+			// Get all the deal properties to display them to user so that they can
+			// select them easily
+			async getDealCustomProperties(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/properties/v2/deals/properties';
+				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
+				for (const property of properties) {
+					if (property.hubspotDefined === null) {
+						const propertyName = property.label;
+						const propertyId = property.name;
+						returnData.push({
+							name: propertyName,
+							value: propertyId,
+						});
+					}
+				}
+				return returnData;
+			},
+			// Get all the deal properties to display them to user so that they can
+			// select them easily
+			async getDealProperties(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/properties/v2/deals/properties';
+				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
+				for (const property of properties) {
+					const propertyName = property.label;
+					const propertyId = property.name;
+					returnData.push({
+						name: propertyName,
+						value: propertyId,
+					});
+				}
+				return returnData;
+			},
+
+			/* -------------------------------------------------------------------------- */
+			/*                                 FORM                                       */
+			/* -------------------------------------------------------------------------- */
+
+			// Get all the forms to display them to user so that they can
+			// select them easily
+			async getForms(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/forms/v2/forms';
+				const forms = await hubspotApiRequest.call(this, 'GET', endpoint, {}, { formTypes: 'ALL' });
+				for (const form of forms) {
+					const formName = form.name;
+					const formId = form.guid;
+					returnData.push({
+						name: formName,
+						value: formId,
+					});
+				}
+				return returnData;
+			},
+
+			// Get all the subscription types to display them to user so that they can
+			// select them easily
+			async getSubscriptionTypes(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/email/public/v1/subscriptions';
+				const subscriptions = await hubspotApiRequestAllItems.call(
+					this,
+					'subscriptionDefinitions',
+					'GET',
+					endpoint,
+					{},
+				);
+				for (const subscription of subscriptions) {
+					const subscriptionName = subscription.name;
+					const subscriptionId = subscription.id;
+					returnData.push({
+						name: subscriptionName,
+						value: subscriptionId,
+					});
+				}
+				return returnData;
+			},
+
+			/* -------------------------------------------------------------------------- */
+			/*                                 TICKET                                     */
+			/* -------------------------------------------------------------------------- */
+
+			// Get all the ticket categories to display them to user so that they can
+			// select them easily
+			async getTicketCategories(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/properties/v2/tickets/properties';
+				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
+				for (const property of properties) {
+					if (property.name === 'hs_ticket_category') {
+						for (const option of property.options) {
+							const categoryName = option.label;
+							const categoryId = option.value;
+							returnData.push({
+								name: categoryName,
+								value: categoryId,
+							});
+						}
+					}
+				}
+				return returnData.sort((a, b) => (a.name < b.name ? 0 : 1));
+			},
+
+			// Get all the ticket pipelines to display them to user so that they can
+			// select them easily
+			async getTicketPipelines(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/crm-pipelines/v1/pipelines/tickets';
+				const { results } = await hubspotApiRequest.call(this, 'GET', endpoint, {});
+				for (const pipeline of results) {
+					const pipelineName = pipeline.label;
+					const pipelineId = pipeline.pipelineId;
+					returnData.push({
+						name: pipelineName,
+						value: pipelineId,
+					});
+				}
+				return returnData;
+			},
+
+			// Get all the ticket resolutions to display them to user so that they can
+			// select them easily
+			async getTicketPriorities(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/properties/v2/tickets/properties';
+				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
+				for (const property of properties) {
+					if (property.name === 'hs_ticket_priority') {
+						for (const option of property.options) {
+							const priorityName = option.label;
+							const priorityId = option.value;
+							returnData.push({
+								name: priorityName,
+								value: priorityId,
+							});
+						}
+					}
+				}
+				return returnData;
+			},
+
+			// Get all the ticket properties to display them to user so that they can
+			// select them easily
+			async getTicketProperties(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/properties/v2/tickets/properties';
+				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
+				for (const property of properties) {
+					const propertyName = property.label;
+					const propertyId = property.name;
+					returnData.push({
+						name: propertyName,
+						value: propertyId,
+					});
+				}
+				return returnData;
+			},
+
+			// Get all the ticket resolutions to display them to user so that they can
+			// select them easily
+			async getTicketResolutions(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/properties/v2/tickets/properties';
+				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
+				for (const property of properties) {
+					if (property.name === 'hs_resolution') {
+						for (const option of property.options) {
+							const resolutionName = option.label;
+							const resolutionId = option.value;
+							returnData.push({
+								name: resolutionName,
+								value: resolutionId,
+							});
+						}
+					}
+				}
+				return returnData.sort((a, b) => (a.name < b.name ? 0 : 1));
+			},
+
+			// Get all the ticket sources to display them to user so that they can
+			// select them easily
+			async getTicketSources(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/properties/v2/tickets/properties';
+				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
+				for (const property of properties) {
+					if (property.name === 'source_type') {
+						for (const option of property.options) {
+							const sourceName = option.label;
+							const sourceId = option.value;
+							returnData.push({
+								name: sourceName,
+								value: sourceId,
+							});
+						}
+					}
+				}
+				return returnData.sort((a, b) => (a.name < b.name ? 0 : 1));
+			},
+
+			// Get all the ticket stages to display them to user so that they can
+			// select them easily
+			async getTicketStages(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				let currentPipelineId = this.getCurrentNodeParameter('pipelineId') as string;
+				if (currentPipelineId === undefined) {
+					currentPipelineId = this.getNodeParameter('updateFields.pipelineId', '') as string;
+				}
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/crm-pipelines/v1/pipelines/tickets';
+				const { results } = await hubspotApiRequest.call(this, 'GET', endpoint, {});
+				for (const pipeline of results) {
+					if (currentPipelineId === pipeline.pipelineId) {
+						for (const stage of pipeline.stages) {
+							const stageName = stage.label;
+							const stageId = stage.stageId;
+							returnData.push({
+								name: stageName,
+								value: stageId,
+							});
+						}
+					}
+				}
+				return returnData;
+			},
+
+			/* -------------------------------------------------------------------------- */
+			/*                                 COMMON                                     */
+			/* -------------------------------------------------------------------------- */
+
+			// Get all the owners to display them to user so that they can
+			// select them easily
+			async getOwners(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/owners/v2/owners';
+				const owners = await hubspotApiRequest.call(this, 'GET', endpoint);
+				for (const owner of owners) {
+					const ownerName = owner.email;
+					const ownerId = owner.ownerId;
+					returnData.push({
+						name: ownerName,
+						value: ownerId,
+					});
+				}
+				return returnData;
+			},
+
+			// Get all the companies to display them to user so that they can
+			// select them easily
+			async getCompanies(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const qs: IDataObject = {
+					properties: ['name'],
+				};
+				const endpoint = '/companies/v2/companies/paged';
+				const companies = await hubspotApiRequestAllItems.call(
+					this,
+					'companies',
+					'GET',
+					endpoint,
+					{},
+					qs,
+				);
+				for (const company of companies) {
+					const companyName = company.properties.name
+						? company.properties.name.value
+						: company.companyId;
+					const companyId = company.companyId;
+					returnData.push({
+						name: companyName,
+						value: companyId,
+					});
+				}
+				return returnData.sort((a, b) => (a.name < b.name ? 0 : 1));
+			},
+
+			// Get all the companies to display them to user so that they can
+			// select them easily
+			async getContacts(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/contacts/v1/lists/all/contacts/all';
+				const contacts = await hubspotApiRequestAllItems.call(this, 'contacts', 'GET', endpoint);
+
+				for (const contact of contacts) {
+					const firstName = contact.properties?.firstname?.value || '';
+					const lastName = contact.properties?.lastname?.value || '';
+					const contactName = `${firstName} ${lastName}`;
+					const contactId = contact.vid;
+					returnData.push({
+						name: contactName,
+						value: contactId,
+						description: `Contact VID: ${contactId}`,
+					});
+				}
+				return returnData.sort((a, b) => (a.name < b.name ? 0 : 1));
+			},
+		},
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = this.getInputData();
+		const returnData: INodeExecutionData[] = [];
+		const length = items.length;
+		let responseData;
+		const qs: IDataObject = {};
+		const resource = this.getNodeParameter('resource', 0);
+		const operation = this.getNodeParameter('operation', 0);
+
+		//https://legacydocs.hubspot.com/docs/methods/lists/contact-lists-overview
+		if (resource === 'contactList') {
+			try {
+				//https://legacydocs.hubspot.com/docs/methods/lists/add_contact_to_list
+				if (operation === 'add') {
+					const listId = this.getNodeParameter('listId', 0) as string;
+					const by = this.getNodeParameter('by', 0) as string;
+					const body: { [key: string]: [] } = { emails: [], vids: [] };
+					for (let i = 0; i < length; i++) {
+						if (by === 'id') {
+							const id = this.getNodeParameter('id', i) as string;
+							body.vids.push(parseInt(id, 10) as never);
+						} else {
+							const email = this.getNodeParameter('email', i) as string;
+							body.emails.push(email as never);
+						}
+					}
+					responseData = await hubspotApiRequest.call(
+						this,
+						'POST',
+						`/contacts/v1/lists/${listId}/add`,
+						body,
+					);
+				}
+				//https://legacydocs.hubspot.com/docs/methods/lists/remove_contact_from_list
+				if (operation === 'remove') {
+					const listId = this.getNodeParameter('listId', 0) as string;
+					const body: { [key: string]: [] } = { vids: [] };
+					for (let i = 0; i < length; i++) {
+						const id = this.getNodeParameter('id', i) as string;
+						body.vids.push(parseInt(id, 10) as never);
+					}
+					responseData = await hubspotApiRequest.call(
+						this,
+						'POST',
+						`/contacts/v1/lists/${listId}/remove`,
+						body,
+					);
+					returnData.push.apply(returnData, responseData as INodeExecutionData[]);
+				}
+			} catch (error) {
+				if (this.continueOnFail()) {
+					returnData.push({ json: { error: (error as JsonObject).message } });
+				} else {
+					throw error;
+				}
+			}
+		} else {
+			for (let i = 0; i < length; i++) {
+				try {
+					//https://developers.hubspot.com/docs/methods/contacts/create_or_update
+					if (resource === 'contact') {
+						//https://developers.hubspot.com/docs/methods/companies/create_company
+						if (operation === 'upsert') {
+							const email = this.getNodeParameter('email', i) as string;
+							const resolveData = this.getNodeParameter('resolveData', i);
+							const additionalFields = this.getNodeParameter('additionalFields', i);
+							const body: IDataObject[] = [];
+							if (additionalFields.annualRevenue) {
+								body.push({
+									property: 'annualrevenue',
+									value: (additionalFields.annualRevenue as number).toString(),
+								});
+							}
+							if (additionalFields.city) {
+								body.push({
+									property: 'city',
+									value: additionalFields.city,
+								});
+							}
+							if (additionalFields.clickedFacebookAd) {
+								body.push({
+									property: 'hs_facebook_ad_clicked',
+									value: additionalFields.clickedFacebookAd,
+								});
+							}
+							if (additionalFields.closeDate) {
+								body.push({
+									property: 'closedate',
+									value: new Date(additionalFields.closeDate as string).getTime(),
+								});
+							}
+							if (additionalFields.companyName) {
+								body.push({
+									property: 'company',
+									value: additionalFields.companyName,
+								});
+							}
+							if (additionalFields.companySize) {
+								body.push({
+									property: 'company_size',
+									value: additionalFields.companySize,
+								});
+							}
+							if (additionalFields.description) {
+								body.push({
+									property: 'description',
+									value: additionalFields.description,
+								});
+							}
+							if (additionalFields.contactOwner) {
+								body.push({
+									property: 'hubspot_owner_id',
+									value: additionalFields.contactOwner,
+								});
+							}
+							if (additionalFields.country) {
+								body.push({
+									property: 'country',
+									value: additionalFields.country,
+								});
+							}
+							if (additionalFields.dateOfBirth) {
+								body.push({
+									property: 'date_of_birth',
+									value: additionalFields.dateOfBirth,
+								});
+							}
+							if (additionalFields.degree) {
+								body.push({
+									property: 'degree',
+									value: additionalFields.degree,
+								});
+							}
+							if (additionalFields.facebookClickId) {
+								body.push({
+									property: 'hs_facebook_click_id',
+									value: additionalFields.facebookClickId,
+								});
+							}
+							if (additionalFields.faxNumber) {
+								body.push({
+									property: 'fax',
+									value: additionalFields.faxNumber,
+								});
+							}
+							if (additionalFields.fieldOfStudy) {
+								body.push({
+									property: 'field_of_study',
+									value: additionalFields.fieldOfStudy,
+								});
+							}
+							if (additionalFields.firstName) {
+								body.push({
+									property: 'firstname',
+									value: additionalFields.firstName,
+								});
+							}
+							if (additionalFields.gender) {
+								body.push({
+									property: 'gender',
+									value: additionalFields.gender,
+								});
+							}
+							if (additionalFields.googleAdClickId) {
+								body.push({
+									property: 'hs_google_click_id',
+									value: additionalFields.googleAdClickId,
+								});
+							}
+							if (additionalFields.graduationDate) {
+								body.push({
+									property: 'graduation_date',
+									value: additionalFields.graduationDate,
+								});
+							}
+							if (additionalFields.industry) {
+								body.push({
+									property: 'industry',
+									value: additionalFields.industry,
+								});
+							}
+							if (additionalFields.jobFunction) {
+								body.push({
+									property: 'job_function',
+									value: additionalFields.jobFunction,
+								});
+							}
+							if (additionalFields.jobTitle) {
+								body.push({
+									property: 'jobtitle',
+									value: additionalFields.jobTitle,
+								});
+							}
+							if (additionalFields.lastName) {
+								body.push({
+									property: 'lastname',
+									value: additionalFields.lastName,
+								});
+							}
+							if (additionalFields.leadStatus) {
+								body.push({
+									property: 'hs_lead_status',
+									value: additionalFields.leadStatus,
+								});
+							}
+							if (additionalFields.processingContactData) {
+								body.push({
+									property: 'hs_legal_basis',
+									value: additionalFields.processingContactData,
+								});
+							}
+							if (additionalFields.lifeCycleStage) {
+								body.push({
+									property: 'lifecyclestage',
+									value: additionalFields.lifeCycleStage,
+								});
+							}
+							if (additionalFields.maritalStatus) {
+								body.push({
+									property: 'marital_status',
+									value: additionalFields.maritalStatus,
+								});
+							}
+							if (additionalFields.membershipNote) {
+								body.push({
+									property: 'hs_content_membership_notes',
+									value: additionalFields.membershipNote,
+								});
+							}
+							if (additionalFields.message) {
+								body.push({
+									property: 'message',
+									value: additionalFields.message,
+								});
+							}
+							if (additionalFields.mobilePhoneNumber) {
+								body.push({
+									property: 'mobilephone',
+									value: additionalFields.mobilePhoneNumber,
+								});
+							}
+							if (additionalFields.numberOfEmployees) {
+								body.push({
+									property: 'numemployees',
+									value: additionalFields.numberOfEmployees,
+								});
+							}
+							if (additionalFields.originalSource) {
+								body.push({
+									property: 'hs_analytics_source',
+									value: additionalFields.originalSource,
+								});
+							}
+							if (additionalFields.phoneNumber) {
+								body.push({
+									property: 'phone',
+									value: additionalFields.phoneNumber,
+								});
+							}
+							if (additionalFields.postalCode) {
+								body.push({
+									property: 'zip',
+									value: additionalFields.postalCode,
+								});
+							}
+							if (additionalFields.prefferedLanguage) {
+								body.push({
+									property: 'hs_language',
+									value: additionalFields.prefferedLanguage,
+								});
+							}
+							if (additionalFields.relationshipStatus) {
+								body.push({
+									property: 'relationship_status',
+									value: additionalFields.relationshipStatus,
+								});
+							}
+							if (additionalFields.salutation) {
+								body.push({
+									property: 'salutation',
+									value: additionalFields.salutation,
+								});
+							}
+							if (additionalFields.school) {
+								body.push({
+									property: 'school',
+									value: additionalFields.school,
+								});
+							}
+							if (additionalFields.seniority) {
+								body.push({
+									property: 'seniority',
+									value: additionalFields.seniority,
+								});
+							}
+							if (additionalFields.startDate) {
+								body.push({
+									property: 'start_date',
+									value: additionalFields.startDate,
+								});
+							}
+							if (additionalFields.stateRegion) {
+								body.push({
+									property: 'state',
+									value: additionalFields.stateRegion,
+								});
+							}
+							if (additionalFields.status) {
+								body.push({
+									property: 'hs_content_membership_status',
+									value: additionalFields.status,
+								});
+							}
+							if (additionalFields.streetAddress) {
+								body.push({
+									property: 'address',
+									value: additionalFields.streetAddress,
+								});
+							}
+							if (additionalFields.twitterUsername) {
+								body.push({
+									property: 'twitterhandle',
+									value: additionalFields.twitterUsername,
+								});
+							}
+							if (additionalFields.websiteUrl) {
+								body.push({
+									property: 'website',
+									value: additionalFields.websiteUrl,
+								});
+							}
+							if (additionalFields.workEmail) {
+								body.push({
+									property: 'work_email',
+									value: additionalFields.workEmail,
+								});
+							}
+
+							if (additionalFields.customPropertiesUi) {
+								const customProperties = (additionalFields.customPropertiesUi as IDataObject)
+									.customPropertiesValues as IDataObject[];
+
+								if (customProperties) {
+									for (const customProperty of customProperties) {
+										body.push({
+											property: customProperty.property,
+											value: customProperty.value,
+										});
+									}
+								}
+							}
+
+							const endpoint = `/contacts/v1/contact/createOrUpdate/email/${email}`;
+							responseData = await hubspotApiRequest.call(this, 'POST', endpoint, {
+								properties: body,
+							});
+
+							if (additionalFields.associatedCompanyId) {
+								const companyAssociations: IDataObject[] = [];
+								companyAssociations.push({
+									fromObjectId: responseData.vid,
+									toObjectId: additionalFields.associatedCompanyId,
+									category: 'HUBSPOT_DEFINED',
+									definitionId: 1,
+								});
+								await hubspotApiRequest.call(
+									this,
+									'PUT',
+									'/crm-associations/v1/associations/create-batch',
+									companyAssociations,
+								);
+							}
+
+							if (resolveData) {
+								const isNew = responseData.isNew;
+								if (additionalFields.properties) {
+									qs.property = additionalFields.properties as string[];
+								}
+								responseData = await hubspotApiRequest.call(
+									this,
+									'GET',
+									`/contacts/v1/contact/vid/${responseData.vid}/profile`,
+									{},
+									qs,
+								);
+								responseData.isNew = isNew;
+							}
+						}
+						//https://developers.hubspot.com/docs/methods/contacts/get_contact
+						if (operation === 'get') {
+							const contactId = this.getNodeParameter('contactId', i) as string;
+							const additionalFields = this.getNodeParameter('additionalFields', i);
+							if (additionalFields.formSubmissionMode) {
+								qs.formSubmissionMode = additionalFields.formSubmissionMode as string;
+							}
+							if (additionalFields.listMemberships) {
+								qs.showListMemberships = additionalFields.listMemberships as boolean;
+							}
+							if (additionalFields.properties) {
+								qs.property = additionalFields.properties as string[];
+							}
+							if (additionalFields.propertyMode) {
+								qs.propertyMode = snakeCase(additionalFields.propertyMode as string);
+							}
+							const endpoint = `/contacts/v1/contact/vid/${contactId}/profile`;
+							responseData = await hubspotApiRequest.call(this, 'GET', endpoint, {}, qs);
+						}
+						//https://developers.hubspot.com/docs/methods/contacts/get_contacts
+						if (operation === 'getAll') {
+							const additionalFields = this.getNodeParameter('additionalFields', i);
+							const returnAll = this.getNodeParameter('returnAll', 0);
+							if (additionalFields.formSubmissionMode) {
+								qs.formSubmissionMode = additionalFields.formSubmissionMode as string;
+							}
+							if (additionalFields.listMemberships) {
+								qs.showListMemberships = additionalFields.listMemberships as boolean;
+							}
+							if (additionalFields.properties) {
+								qs.property = additionalFields.properties as string[];
+							}
+							if (additionalFields.propertyMode) {
+								qs.propertyMode = snakeCase(additionalFields.propertyMode as string);
+							}
+							const endpoint = '/contacts/v1/lists/all/contacts/all';
+							if (returnAll) {
+								responseData = await hubspotApiRequestAllItems.call(
+									this,
+									'contacts',
+									'GET',
+									endpoint,
+									{},
+									qs,
+								);
+							} else {
+								qs.count = this.getNodeParameter('limit', 0);
+								responseData = await hubspotApiRequest.call(this, 'GET', endpoint, {}, qs);
+								responseData = responseData.contacts;
+							}
+						}
+						//https://developers.hubspot.com/docs/methods/contacts/get_recently_created_contacts
+						if (operation === 'getRecentlyCreatedUpdated') {
+							const returnAll = this.getNodeParameter('returnAll', 0);
+							const filters = this.getNodeParameter('filters', i);
+							if (filters.formSubmissionMode) {
+								qs.formSubmissionMode = filters.formSubmissionMode as string;
+							}
+							if (filters.listMemberships) {
+								qs.showListMemberships = filters.listMemberships as boolean;
+							}
+							if (filters.properties) {
+								qs.property = filters.properties as string[];
+							}
+							if (filters.propertyMode) {
+								qs.propertyMode = snakeCase(filters.propertyMode as string);
+							}
+
+							const endpoint = '/contacts/v1/lists/recently_updated/contacts/recent';
+
+							if (returnAll) {
+								responseData = await hubspotApiRequestAllItems.call(
+									this,
+									'contacts',
+									'GET',
+									endpoint,
+									{},
+									qs,
+								);
+							} else {
+								qs.count = this.getNodeParameter('limit', 0);
+								responseData = await hubspotApiRequest.call(this, 'GET', endpoint, {}, qs);
+								responseData = responseData.contacts;
+							}
+						}
+						//https://developers.hubspot.com/docs/methods/contacts/delete_contact
+						if (operation === 'delete') {
+							const contactId = this.getNodeParameter('contactId', i) as string;
+							const endpoint = `/contacts/v1/contact/vid/${contactId}`;
+							responseData = await hubspotApiRequest.call(this, 'DELETE', endpoint);
+						}
+						//https://developers.hubspot.com/docs/api/crm/search
+						if (operation === 'search') {
+							const additionalFields = this.getNodeParameter('additionalFields', i);
+							const returnAll = this.getNodeParameter('returnAll', 0);
+							const filtersGroupsUi = this.getNodeParameter('filterGroupsUi', i) as IDataObject;
+							const sortBy = additionalFields.sortBy || 'createdate';
+							const direction = additionalFields.direction || 'DESCENDING';
+
+							const body: IDataObject = {
+								sorts: [
+									{
+										propertyName: sortBy,
+										direction,
+									},
+								],
+							};
+
+							if (filtersGroupsUi) {
+								const filterGroupValues = filtersGroupsUi.filterGroupsValues as IDataObject[];
+								if (filterGroupValues) {
+									body.filterGroups = [];
+									for (const filterGroupValue of filterGroupValues) {
+										if (filterGroupValue.filtersUi) {
+											const filterValues = (filterGroupValue.filtersUi as IDataObject)
+												.filterValues as IDataObject[];
+											if (filterValues) {
+												//@ts-ignore
+												body.filterGroups.push({ filters: filterValues });
+											}
+										}
+									}
+								}
+							}
+
+							Object.assign(body, additionalFields);
+
+							const endpoint = '/crm/v3/objects/contacts/search';
+
+							if (returnAll) {
+								responseData = await hubspotApiRequestAllItems.call(
+									this,
+									'results',
+									'POST',
+									endpoint,
+									body,
+									qs,
+								);
+							} else {
+								body.limit = this.getNodeParameter('limit', 0);
+								responseData = await hubspotApiRequest.call(this, 'POST', endpoint, body, qs);
+								responseData = responseData.results;
+							}
+						}
+					}
+					//https://developers.hubspot.com/docs/methods/companies/companies-overview
+					if (resource === 'company') {
+						//https://developers.hubspot.com/docs/methods/companies/create_company
+						if (operation === 'create') {
+							const name = this.getNodeParameter('name', i) as string;
+							const additionalFields = this.getNodeParameter('additionalFields', i);
+							const body: IDataObject[] = [];
+							body.push({
+								name: 'name',
+								value: name,
+							});
+							if (additionalFields.aboutUs) {
+								body.push({
+									name: 'about_us',
+									value: additionalFields.aboutUs,
+								});
+							}
+							if (additionalFields.annualRevenue) {
+								body.push({
+									name: 'annualrevenue',
+									value: (additionalFields.annualRevenue as number).toString(),
+								});
+							}
+							if (additionalFields.city) {
+								body.push({
+									name: 'city',
+									value: additionalFields.city,
+								});
+							}
+							if (additionalFields.closeDate) {
+								body.push({
+									name: 'closedate',
+									value: new Date(additionalFields.closeDate as string).getTime(),
+								});
+							}
+							if (additionalFields.companyDomainName) {
+								body.push({
+									name: 'domain',
+									value: additionalFields.companyDomainName,
+								});
+							}
+							if (additionalFields.companyOwner) {
+								body.push({
+									name: 'hubspot_owner_id',
+									value: additionalFields.companyOwner,
+								});
+							}
+							if (additionalFields.countryRegion) {
+								body.push({
+									name: 'country',
+									value: additionalFields.countryRegion,
+								});
+							}
+							if (additionalFields.description) {
+								body.push({
+									name: 'description',
+									value: additionalFields.description,
+								});
+							}
+							if (additionalFields.facebookFans) {
+								body.push({
+									name: 'facebookfans',
+									value: additionalFields.facebookFans,
+								});
+							}
+							if (additionalFields.googlePlusPage) {
+								body.push({
+									name: 'googleplus_page',
+									value: additionalFields.googlePlusPage,
+								});
+							}
+							if (additionalFields.industry) {
+								body.push({
+									name: 'industry',
+									value: additionalFields.industry,
+								});
+							}
+							if (additionalFields.isPublic) {
+								body.push({
+									name: 'is_public',
+									value: additionalFields.isPublic,
+								});
+							}
+							if (additionalFields.leadStatus) {
+								body.push({
+									name: 'hs_lead_status',
+									value: additionalFields.leadStatus,
+								});
+							}
+							if (additionalFields.lifecycleStatus) {
+								body.push({
+									name: 'lifecyclestage',
+									value: additionalFields.lifecycleStatus,
+								});
+							}
+							if (additionalFields.linkedinBio) {
+								body.push({
+									name: 'linkedinbio',
+									value: additionalFields.linkedinBio,
+								});
+							}
+							if (additionalFields.linkedInCompanyPage) {
+								body.push({
+									name: 'linkedin_company_page',
+									value: additionalFields.linkedInCompanyPage,
+								});
+							}
+							if (additionalFields.numberOfEmployees) {
+								body.push({
+									name: 'numberofemployees',
+									value: additionalFields.numberOfEmployees,
+								});
+							}
+							if (additionalFields.originalSourceType) {
+								body.push({
+									name: 'hs_analytics_source',
+									value: additionalFields.originalSourceType,
+								});
+							}
+							if (additionalFields.phoneNumber) {
+								body.push({
+									name: 'phone',
+									value: additionalFields.phoneNumber,
+								});
+							}
+							if (additionalFields.postalCode) {
+								body.push({
+									name: 'zip',
+									value: additionalFields.postalCode,
+								});
+							}
+							if (additionalFields.stateRegion) {
+								body.push({
+									name: 'state',
+									value: additionalFields.stateRegion,
+								});
+							}
+							if (additionalFields.streetAddress) {
+								body.push({
+									name: 'address',
+									value: additionalFields.streetAddress,
+								});
+							}
+							if (additionalFields.streetAddress2) {
+								body.push({
+									name: 'address2',
+									value: additionalFields.streetAddress2,
+								});
+							}
+							if (additionalFields.targetAccount) {
+								body.push({
+									name: 'hs_target_account',
+									value: additionalFields.targetAccount,
+								});
+							}
+							if (additionalFields.timezone) {
+								body.push({
+									name: 'timezone',
+									value: additionalFields.timezone,
+								});
+							}
+							if (additionalFields.totalMoneyRaised) {
+								body.push({
+									name: 'total_money_raised',
+									value: additionalFields.totalMoneyRaised,
+								});
+							}
+							if (additionalFields.twitterBio) {
+								body.push({
+									name: 'twitterbio',
+									value: additionalFields.twitterBio,
+								});
+							}
+							if (additionalFields.twitterFollowers) {
+								body.push({
+									name: 'twitterfollowers',
+									value: additionalFields.twitterFollowers,
+								});
+							}
+							if (additionalFields.twitterHandle) {
+								body.push({
+									name: 'twitterhandle',
+									value: additionalFields.twitterHandle,
+								});
+							}
+							if (additionalFields.type) {
+								body.push({
+									name: 'type',
+									value: additionalFields.type,
+								});
+							}
+							if (additionalFields.websiteUrl) {
+								body.push({
+									name: 'website',
+									value: additionalFields.websiteUrl,
+								});
+							}
+							if (additionalFields.webTechnologies) {
+								body.push({
+									name: 'web_technologies',
+									value: additionalFields.webTechnologies,
+								});
+							}
+							if (additionalFields.yearFounded) {
+								body.push({
+									name: 'founded_year',
+									value: additionalFields.yearFounded,
+								});
+							}
+							if (additionalFields.customPropertiesUi) {
+								const customProperties = (additionalFields.customPropertiesUi as IDataObject)
+									.customPropertiesValues as IDataObject[];
+
+								if (customProperties) {
+									for (const customProperty of customProperties) {
+										body.push({
+											name: customProperty.property,
+											value: customProperty.value,
+										});
+									}
+								}
+							}
+							const endpoint = '/companies/v2/companies';
+							responseData = await hubspotApiRequest.call(this, 'POST', endpoint, {
+								properties: body,
+							});
+						}
+						//https://developers.hubspot.com/docs/methods/companies/update_company
+						if (operation === 'update') {
+							const companyId = this.getNodeParameter('companyId', i) as string;
+							const updateFields = this.getNodeParameter('updateFields', i);
+							const body: IDataObject[] = [];
+							if (updateFields.name) {
+								body.push({
+									name: 'name',
+									value: updateFields.name,
+								});
+							}
+							if (updateFields.aboutUs) {
+								body.push({
+									name: 'about_us',
+									value: updateFields.aboutUs,
+								});
+							}
+							if (updateFields.annualRevenue) {
+								body.push({
+									name: 'annualrevenue',
+									value: (updateFields.annualRevenue as number).toString(),
+								});
+							}
+							if (updateFields.city) {
+								body.push({
+									name: 'city',
+									value: updateFields.city,
+								});
+							}
+							if (updateFields.closeDate) {
+								body.push({
+									name: 'closedate',
+									value: new Date(updateFields.closeDate as string).getTime(),
+								});
+							}
+							if (updateFields.companyDomainName) {
+								body.push({
+									name: 'domain',
+									value: updateFields.companyDomainName,
+								});
+							}
+							if (updateFields.companyOwner) {
+								body.push({
+									name: 'hubspot_owner_id',
+									value: updateFields.companyOwner,
+								});
+							}
+							if (updateFields.countryRegion) {
+								body.push({
+									name: 'country',
+									value: updateFields.countryRegion,
+								});
+							}
+							if (updateFields.description) {
+								body.push({
+									name: 'description',
+									value: updateFields.description,
+								});
+							}
+							if (updateFields.facebookFans) {
+								body.push({
+									name: 'facebookfans',
+									value: updateFields.facebookFans,
+								});
+							}
+							if (updateFields.googlePlusPage) {
+								body.push({
+									name: 'googleplus_page',
+									value: updateFields.googlePlusPage,
+								});
+							}
+							if (updateFields.industry) {
+								body.push({
+									name: 'industry',
+									value: updateFields.industry,
+								});
+							}
+							if (updateFields.isPublic) {
+								body.push({
+									name: 'is_public',
+									value: updateFields.isPublic,
+								});
+							}
+							if (updateFields.leadStatus) {
+								body.push({
+									name: 'hs_lead_status',
+									value: updateFields.leadStatus,
+								});
+							}
+							if (updateFields.lifecycleStatus) {
+								body.push({
+									name: 'lifecyclestage',
+									value: updateFields.lifecycleStatus,
+								});
+							}
+							if (updateFields.linkedinBio) {
+								body.push({
+									name: 'linkedinbio',
+									value: updateFields.linkedinBio,
+								});
+							}
+							if (updateFields.linkedInCompanyPage) {
+								body.push({
+									name: 'linkedin_company_page',
+									value: updateFields.linkedInCompanyPage,
+								});
+							}
+							if (updateFields.numberOfEmployees) {
+								body.push({
+									name: 'numberofemployees',
+									value: updateFields.numberOfEmployees,
+								});
+							}
+							if (updateFields.originalSourceType) {
+								body.push({
+									name: 'hs_analytics_source',
+									value: updateFields.originalSourceType,
+								});
+							}
+							if (updateFields.phoneNumber) {
+								body.push({
+									name: 'phone',
+									value: updateFields.phoneNumber,
+								});
+							}
+							if (updateFields.postalCode) {
+								body.push({
+									name: 'zip',
+									value: updateFields.postalCode,
+								});
+							}
+							if (updateFields.stateRegion) {
+								body.push({
+									name: 'state',
+									value: updateFields.stateRegion,
+								});
+							}
+							if (updateFields.streetAddress) {
+								body.push({
+									name: 'address',
+									value: updateFields.streetAddress,
+								});
+							}
+							if (updateFields.streetAddress2) {
+								body.push({
+									name: 'address2',
+									value: updateFields.streetAddress2,
+								});
+							}
+							if (updateFields.targetAccount) {
+								body.push({
+									name: 'hs_target_account',
+									value: updateFields.targetAccount,
+								});
+							}
+							if (updateFields.timezone) {
+								body.push({
+									name: 'timezone',
+									value: updateFields.timezone,
+								});
+							}
+							if (updateFields.totalMoneyRaised) {
+								body.push({
+									name: 'total_money_raised',
+									value: updateFields.totalMoneyRaised,
+								});
+							}
+							if (updateFields.twitterBio) {
+								body.push({
+									name: 'twitterbio',
+									value: updateFields.twitterBio,
+								});
+							}
+							if (updateFields.twitterFollowers) {
+								body.push({
+									name: 'twitterfollowers',
+									value: updateFields.twitterFollowers,
+								});
+							}
+							if (updateFields.twitterHandle) {
+								body.push({
+									name: 'twitterhandle',
+									value: updateFields.twitterHandle,
+								});
+							}
+							if (updateFields.type) {
+								body.push({
+									name: 'type',
+									value: updateFields.type,
+								});
+							}
+							if (updateFields.websiteUrl) {
+								body.push({
+									name: 'website',
+									value: updateFields.websiteUrl,
+								});
+							}
+							if (updateFields.webTechnologies) {
+								body.push({
+									name: 'web_technologies',
+									value: updateFields.webTechnologies,
+								});
+							}
+							if (updateFields.yearFounded) {
+								body.push({
+									name: 'founded_year',
+									value: updateFields.yearFounded,
+								});
+							}
+							if (updateFields.customPropertiesUi) {
+								const customProperties = (updateFields.customPropertiesUi as IDataObject)
+									.customPropertiesValues as IDataObject[];
+
+								if (customProperties) {
+									for (const customProperty of customProperties) {
+										body.push({
+											name: customProperty.property,
+											value: customProperty.value,
+										});
+									}
+								}
+							}
+							const endpoint = `/companies/v2/companies/${companyId}`;
+							responseData = await hubspotApiRequest.call(this, 'PUT', endpoint, {
+								properties: body,
+							});
+						}
+						//https://developers.hubspot.com/docs/methods/companies/get_company
+						if (operation === 'get') {
+							const companyId = this.getNodeParameter('companyId', i) as string;
+							const additionalFields = this.getNodeParameter('additionalFields', i);
+							if (additionalFields.includeMergeAudits) {
+								qs.includeMergeAudits = additionalFields.includeMergeAudits as boolean;
+							}
+							const endpoint = `/companies/v2/companies/${companyId}`;
+							responseData = await hubspotApiRequest.call(this, 'GET', endpoint, {}, qs);
+						}
+						//https://developers.hubspot.com/docs/methods/companies/get-all-companies
+						if (operation === 'getAll') {
+							const options = this.getNodeParameter('options', i);
+							const returnAll = this.getNodeParameter('returnAll', 0);
+							if (options.includeMergeAudits) {
+								qs.includeMergeAudits = options.includeMergeAudits as boolean;
+							}
+							if (options.properties) {
+								qs.properties = options.properties as string[];
+							}
+							if (options.propertiesWithHistory) {
+								qs.propertiesWithHistory = (options.propertiesWithHistory as string).split(',');
+							}
+							const endpoint = '/companies/v2/companies/paged';
+							if (returnAll) {
+								responseData = await hubspotApiRequestAllItems.call(
+									this,
+									'companies',
+									'GET',
+									endpoint,
+									{},
+									qs,
+								);
+							} else {
+								qs.limit = this.getNodeParameter('limit', 0);
+								responseData = await hubspotApiRequest.call(this, 'GET', endpoint, {}, qs);
+								responseData = responseData.companies;
+							}
+						}
+						//https://developers.hubspot.com/docs/methods/companies/get_companies_modified
+						if (operation === 'getRecentlyCreated' || operation === 'getRecentlyModified') {
+							let endpoint;
+							const returnAll = this.getNodeParameter('returnAll', 0);
+							if (operation === 'getRecentlyCreated') {
+								endpoint = '/companies/v2/companies/recent/created';
+							} else {
+								const filters = this.getNodeParameter('filters', i);
+								if (filters.since) {
+									qs.since = new Date(filters.since as string).getTime();
+								}
+								endpoint = '/companies/v2/companies/recent/modified';
+							}
+							if (returnAll) {
+								responseData = await hubspotApiRequestAllItems.call(
+									this,
+									'results',
+									'GET',
+									endpoint,
+									{},
+									qs,
+								);
+							} else {
+								qs.count = this.getNodeParameter('limit', 0);
+								responseData = await hubspotApiRequest.call(this, 'GET', endpoint, {}, qs);
+								responseData = responseData.results;
+							}
+						}
+						//https://developers.hubspot.com/docs/methods/companies/search_companies_by_domain
+						if (operation === 'searchByDomain') {
+							const domain = this.getNodeParameter('domain', i) as string;
+							const options = this.getNodeParameter('options', i);
+							const returnAll = this.getNodeParameter('returnAll', 0);
+							const body: IDataObject = {
+								requestOptions: {},
+							};
+							if (options.properties) {
+								body.requestOptions = { properties: options.properties as string[] };
+							}
+							const endpoint = `/companies/v2/domains/${domain}/companies`;
+							if (returnAll) {
+								responseData = await hubspotApiRequestAllItems.call(
+									this,
+									'results',
+									'POST',
+									endpoint,
+									body,
+								);
+							} else {
+								body.limit = this.getNodeParameter('limit', 0);
+								responseData = await hubspotApiRequest.call(this, 'POST', endpoint, body);
+								responseData = responseData.results;
+							}
+						}
+						//https://developers.hubspot.com/docs/methods/companies/delete_company
+						if (operation === 'delete') {
+							const companyId = this.getNodeParameter('companyId', i) as string;
+							const endpoint = `/companies/v2/companies/${companyId}`;
+							responseData = await hubspotApiRequest.call(this, 'DELETE', endpoint);
+						}
+					}
+					//https://developers.hubspot.com/docs/methods/deals/deals_overview
+					if (resource === 'deal') {
+						if (operation === 'create') {
+							const body: IDeal = {};
+							body.properties = [];
+							const association: IAssociation = {};
+							const additionalFields = this.getNodeParameter('additionalFields', i);
+							const stage = this.getNodeParameter('stage', i) as string;
+							if (stage) {
+								body.properties.push({
+									name: 'dealstage',
+									value: stage,
+								});
+							}
+							if (additionalFields.associatedCompany) {
+								association.associatedCompanyIds = additionalFields.associatedCompany as number[];
+							}
+							if (additionalFields.associatedVids) {
+								association.associatedVids = additionalFields.associatedVids as number[];
+							}
+							if (additionalFields.dealName) {
+								body.properties.push({
+									name: 'dealname',
+									value: additionalFields.dealName as string,
+								});
+							}
+							if (additionalFields.closeDate) {
+								body.properties.push({
+									name: 'closedate',
+									value: new Date(additionalFields.closeDate as string).getTime(),
+								});
+							}
+							if (additionalFields.amount) {
+								body.properties.push({
+									name: 'amount',
+									value: additionalFields.amount as string,
+								});
+							}
+							if (additionalFields.dealType) {
+								body.properties.push({
+									name: 'dealtype',
+									value: additionalFields.dealType as string,
+								});
+							}
+							if (additionalFields.pipeline) {
+								body.properties.push({
+									name: 'pipeline',
+									value: additionalFields.pipeline as string,
+								});
+							}
+							if (additionalFields.description) {
+								body.properties.push({
+									name: 'description',
+									value: additionalFields.description as string,
+								});
+							}
+							if (additionalFields.customPropertiesUi) {
+								const customProperties = (additionalFields.customPropertiesUi as IDataObject)
+									.customPropertiesValues as IDataObject[];
+								if (customProperties) {
+									for (const customProperty of customProperties) {
+										body.properties.push({
+											name: customProperty.property,
+											value: customProperty.value,
+										});
+									}
+								}
+							}
+							body.associations = association;
+							const endpoint = '/deals/v1/deal';
+							responseData = await hubspotApiRequest.call(this, 'POST', endpoint, body);
+						}
+						if (operation === 'update') {
+							const body: IDeal = {};
+							body.properties = [];
+							const updateFields = this.getNodeParameter('updateFields', i);
+							const dealId = this.getNodeParameter('dealId', i) as string;
+							if (updateFields.stage) {
+								body.properties.push({
+									name: 'dealstage',
+									value: updateFields.stage as string,
+								});
+							}
+							if (updateFields.dealName) {
+								body.properties.push({
+									name: 'dealname',
+									value: updateFields.dealName as string,
+								});
+							}
+							if (updateFields.closeDate) {
+								body.properties.push({
+									name: 'closedate',
+									value: new Date(updateFields.closeDate as string).getTime(),
+								});
+							}
+							if (updateFields.amount) {
+								body.properties.push({
+									name: 'amount',
+									value: updateFields.amount as string,
+								});
+							}
+							if (updateFields.dealType) {
+								body.properties.push({
+									name: 'dealtype',
+									value: updateFields.dealType as string,
+								});
+							}
+							if (updateFields.pipeline) {
+								body.properties.push({
+									name: 'pipeline',
+									value: updateFields.pipeline as string,
+								});
+							}
+							if (updateFields.description) {
+								body.properties.push({
+									name: 'description',
+									value: updateFields.description as string,
+								});
+							}
+							if (updateFields.customPropertiesUi) {
+								const customProperties = (updateFields.customPropertiesUi as IDataObject)
+									.customPropertiesValues as IDataObject[];
+								if (customProperties) {
+									for (const customProperty of customProperties) {
+										body.properties.push({
+											name: customProperty.property,
+											value: customProperty.value,
+										});
+									}
+								}
+							}
+							const endpoint = `/deals/v1/deal/${dealId}`;
+							responseData = await hubspotApiRequest.call(this, 'PUT', endpoint, body);
+						}
+						if (operation === 'get') {
+							const dealId = this.getNodeParameter('dealId', i) as string;
+							const additionalFields = this.getNodeParameter('additionalFields', i);
+							if (additionalFields.includePropertyVersions) {
+								qs.includePropertyVersions = additionalFields.includePropertyVersions as boolean;
+							}
+							const endpoint = `/deals/v1/deal/${dealId}`;
+							responseData = await hubspotApiRequest.call(this, 'GET', endpoint);
+						}
+						if (operation === 'getAll') {
+							const filters = this.getNodeParameter('filters', i);
+							const returnAll = this.getNodeParameter('returnAll', 0);
+							if (filters.includeAssociations) {
+								qs.includeAssociations = filters.includeAssociations as boolean;
+							}
+							if (filters.properties) {
+								const properties = filters.properties as string | string[];
+								qs.properties = !Array.isArray(filters.properties)
+									? (properties as string).split(',')
+									: properties;
+							}
+							if (filters.propertiesWithHistory) {
+								const propertiesWithHistory = filters.propertiesWithHistory as string | string[];
+								qs.propertiesWithHistory = !Array.isArray(filters.propertiesWithHistory)
+									? (propertiesWithHistory as string).split(',')
+									: propertiesWithHistory;
+							}
+							const endpoint = '/deals/v1/deal/paged';
+							if (returnAll) {
+								responseData = await hubspotApiRequestAllItems.call(
+									this,
+									'deals',
+									'GET',
+									endpoint,
+									{},
+									qs,
+								);
+							} else {
+								qs.limit = this.getNodeParameter('limit', 0);
+								responseData = await hubspotApiRequest.call(this, 'GET', endpoint, {}, qs);
+								responseData = responseData.deals;
+							}
+						}
+						if (operation === 'getRecentlyCreated' || operation === 'getRecentlyModified') {
+							let endpoint;
+							const filters = this.getNodeParameter('filters', i);
+							const returnAll = this.getNodeParameter('returnAll', 0);
+							if (filters.since) {
+								qs.since = new Date(filters.since as string).getTime();
+							}
+							if (filters.includePropertyVersions) {
+								qs.includePropertyVersions = filters.includePropertyVersions as boolean;
+							}
+							if (operation === 'getRecentlyCreated') {
+								endpoint = '/deals/v1/deal/recent/created';
+							} else {
+								endpoint = '/deals/v1/deal/recent/modified';
+							}
+							if (returnAll) {
+								responseData = await hubspotApiRequestAllItems.call(
+									this,
+									'results',
+									'GET',
+									endpoint,
+									{},
+									qs,
+								);
+							} else {
+								qs.count = this.getNodeParameter('limit', 0);
+								responseData = await hubspotApiRequest.call(this, 'GET', endpoint, {}, qs);
+								responseData = responseData.results;
+							}
+						}
+						if (operation === 'delete') {
+							const dealId = this.getNodeParameter('dealId', i) as string;
+							const endpoint = `/deals/v1/deal/${dealId}`;
+							responseData = await hubspotApiRequest.call(this, 'DELETE', endpoint);
+						}
+						//https://developers.hubspot.com/docs/api/crm/search
+						if (operation === 'search') {
+							const additionalFields = this.getNodeParameter('additionalFields', i);
+							const returnAll = this.getNodeParameter('returnAll', 0);
+							const filtersGroupsUi = this.getNodeParameter('filterGroupsUi', i) as IDataObject;
+							const sortBy = additionalFields.sortBy || 'createdate';
+							const direction = additionalFields.direction || 'DESCENDING';
+
+							const body: IDataObject = {
+								sorts: [
+									{
+										propertyName: sortBy,
+										direction,
+									},
+								],
+							};
+
+							if (filtersGroupsUi) {
+								const filterGroupValues = filtersGroupsUi.filterGroupsValues as IDataObject[];
+								if (filterGroupValues) {
+									body.filterGroups = [];
+									for (const filterGroupValue of filterGroupValues) {
+										if (filterGroupValue.filtersUi) {
+											const filterValues = (filterGroupValue.filtersUi as IDataObject)
+												.filterValues as IDataObject[];
+											if (filterValues) {
+												//@ts-ignore
+												body.filterGroups.push({ filters: filterValues });
+											}
+										}
+									}
+								}
+							}
+
+							Object.assign(body, additionalFields);
+
+							const endpoint = '/crm/v3/objects/deals/search';
+
+							if (returnAll) {
+								responseData = await hubspotApiRequestAllItems.call(
+									this,
+									'results',
+									'POST',
+									endpoint,
+									body,
+									qs,
+								);
+							} else {
+								body.limit = this.getNodeParameter('limit', 0);
+								responseData = await hubspotApiRequest.call(this, 'POST', endpoint, body, qs);
+								responseData = responseData.results;
+							}
+						}
+					}
+					if (resource === 'engagement') {
+						//https://legacydocs.hubspot.com/docs/methods/engagements/create_engagement
+						if (operation === 'create') {
+							const type = this.getNodeParameter('type', i) as string;
+							const metadata = this.getNodeParameter('metadata', i) as IDataObject;
+							const associations = this.getNodeParameter(
+								'additionalFields.associations',
+								i,
+								{},
+							) as IDataObject;
+
+							if (!Object.keys(metadata).length) {
+								throw new NodeOperationError(
+									this.getNode(),
+									'At least one metadata field needs to set',
+									{ itemIndex: i },
+								);
+							}
+
+							const body: {
+								engagement: { type: string };
+								metadata: IDataObject;
+								associations: IDataObject;
+							} = {
+								engagement: {
+									type: type.toUpperCase(),
+								},
+								metadata: {},
+								associations: {},
+							};
+
+							if (type === 'email') {
+								body.metadata = getEmailMetadata(metadata);
+							}
+
+							if (type === 'task') {
+								body.metadata = getTaskMetadata(metadata);
+							}
+
+							if (type === 'meeting') {
+								body.metadata = getMeetingMetadata(metadata);
+							}
+
+							if (type === 'call') {
+								body.metadata = getCallMetadata(metadata);
+							}
+
+							//@ts-ignore
+							body.associations = getAssociations(associations);
+
+							const endpoint = '/engagements/v1/engagements';
+							responseData = await hubspotApiRequest.call(this, 'POST', endpoint, body);
+						}
+						//https://legacydocs.hubspot.com/docs/methods/engagements/get_engagement
+						if (operation === 'delete') {
+							const engagementId = this.getNodeParameter('engagementId', i) as string;
+							const endpoint = `/engagements/v1/engagements/${engagementId}`;
+							responseData = await hubspotApiRequest.call(this, 'DELETE', endpoint, {}, qs);
+							responseData = { success: true };
+						}
+						//https://legacydocs.hubspot.com/docs/methods/engagements/get_engagement
+						if (operation === 'get') {
+							const engagementId = this.getNodeParameter('engagementId', i) as string;
+							const endpoint = `/engagements/v1/engagements/${engagementId}`;
+							responseData = await hubspotApiRequest.call(this, 'GET', endpoint, {}, qs);
+						}
+						//https://legacydocs.hubspot.com/docs/methods/engagements/get-all-engagements
+						if (operation === 'getAll') {
+							const returnAll = this.getNodeParameter('returnAll', 0);
+							const endpoint = '/engagements/v1/engagements/paged';
+							if (returnAll) {
+								responseData = await hubspotApiRequestAllItems.call(
+									this,
+									'results',
+									'GET',
+									endpoint,
+									{},
+									qs,
+								);
+							} else {
+								qs.limit = this.getNodeParameter('limit', 0);
+								responseData = await hubspotApiRequest.call(this, 'GET', endpoint, {}, qs);
+								responseData = responseData.results;
+							}
+						}
+					}
+					//https://developers.hubspot.com/docs/methods/forms/forms_overview
+					if (resource === 'form') {
+						//https://developers.hubspot.com/docs/methods/forms/v2/get_fields
+						if (operation === 'getFields') {
+							const formId = this.getNodeParameter('formId', i) as string;
+							responseData = await hubspotApiRequest.call(
+								this,
+								'GET',
+								`/forms/v2/fields/${formId}`,
+							);
+						}
+						//https://developers.hubspot.com/docs/methods/forms/submit_form_v3
+						if (operation === 'submit') {
+							const formId = this.getNodeParameter('formId', i) as string;
+							const additionalFields = this.getNodeParameter('additionalFields', i);
+							const context = (this.getNodeParameter('contextUi', i) as IDataObject)
+								.contextValue as IDataObject;
+							const legalConsent = (this.getNodeParameter('lengalConsentUi', i) as IDataObject)
+								.lengalConsentValues as IDataObject;
+							const legitimateInteres = (this.getNodeParameter('lengalConsentUi', i) as IDataObject)
+								.legitimateInterestValues as IDataObject;
+							const { portalId } = await hubspotApiRequest.call(
+								this,
+								'GET',
+								`/forms/v2/forms/${formId}`,
+							);
+							const body: IForm = {
+								formId,
+								portalId,
+								legalConsentOptions: {},
+								fields: [],
+							};
+							if (additionalFields.submittedAt) {
+								body.submittedAt = new Date(additionalFields.submittedAt as string).getTime();
+							}
+							if (additionalFields.skipValidation) {
+								body.skipValidation = additionalFields.skipValidation as boolean;
+							}
+							const consent: IDataObject = {};
+							if (legalConsent) {
+								if (legalConsent.consentToProcess) {
+									consent.consentToProcess = legalConsent.consentToProcess as boolean;
+								}
+								if (legalConsent.text) {
+									consent.text = legalConsent.text as string;
+								}
+								if (legalConsent.communicationsUi) {
+									consent.communications = (legalConsent.communicationsUi as IDataObject)
+										.communicationValues as IDataObject;
+								}
+							}
+							body.legalConsentOptions!.consent = consent;
+							const fields: IDataObject = items[i].json;
+							for (const key of Object.keys(fields)) {
+								body.fields?.push({ name: key, value: fields[key] });
+							}
+							if (body.legalConsentOptions!.legitimateInterest) {
+								Object.assign(body, {
+									legalConsentOptions: { legitimateInterest: legitimateInteres },
+								});
+							}
+							if (context) {
+								clean(context);
+								Object.assign(body, { context });
+							}
+							const uri = `https://api.hsforms.com/submissions/v3/integration/submit/${portalId}/${formId}`;
+							responseData = await hubspotApiRequest.call(this, 'POST', '', body, {}, uri);
+						}
+					}
+					//https://developers.hubspot.com/docs/methods/tickets/tickets-overview
+					if (resource === 'ticket') {
+						//https://developers.hubspot.com/docs/methods/tickets/create-ticket
+						if (operation === 'create') {
+							const additionalFields = this.getNodeParameter('additionalFields', i);
+							const pipelineId = this.getNodeParameter('pipelineId', i) as string;
+							const stageId = this.getNodeParameter('stageId', i) as string;
+							const ticketName = this.getNodeParameter('ticketName', i) as string;
+							const body: IDataObject[] = [
+								{
+									// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+									name: 'hs_pipeline',
+									value: pipelineId,
+								},
+								{
+									// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+									name: 'hs_pipeline_stage',
+									value: stageId,
+								},
+								{
+									// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+									name: 'subject',
+									value: ticketName,
+								},
+							];
+							if (additionalFields.category) {
+								body.push({
+									name: 'hs_ticket_category',
+									value: additionalFields.category as string,
+								});
+							}
+							if (additionalFields.closeDate) {
+								body.push({
+									name: 'closed_date',
+									value: new Date(additionalFields.closeDate as string).getTime(),
+								});
+							}
+							if (additionalFields.createDate) {
+								body.push({
+									name: 'createdate',
+									value: new Date(additionalFields.createDate as string).getTime(),
+								});
+							}
+							if (additionalFields.description) {
+								body.push({
+									name: 'content',
+									value: additionalFields.description as string,
+								});
+							}
+							if (additionalFields.priority) {
+								body.push({
+									name: 'hs_ticket_priority',
+									value: additionalFields.priority as string,
+								});
+							}
+							if (additionalFields.resolution) {
+								body.push({
+									name: 'hs_resolution',
+									value: additionalFields.resolution as string,
+								});
+							}
+							if (additionalFields.source) {
+								body.push({
+									name: 'source_type',
+									value: additionalFields.source as string,
+								});
+							}
+							if (additionalFields.ticketOwnerId) {
+								body.push({
+									name: 'hubspot_owner_id',
+									value: additionalFields.ticketOwnerId as string,
+								});
+							}
+							const endpoint = '/crm-objects/v1/objects/tickets';
+							responseData = await hubspotApiRequest.call(this, 'POST', endpoint, body);
+
+							if (additionalFields.associatedCompanyIds) {
+								const companyAssociations: IDataObject[] = [];
+								for (const companyId of additionalFields.associatedCompanyIds as IDataObject[]) {
+									companyAssociations.push({
+										fromObjectId: responseData.objectId,
+										toObjectId: companyId,
+										category: 'HUBSPOT_DEFINED',
+										definitionId: 26,
+									});
+								}
+								await hubspotApiRequest.call(
+									this,
+									'PUT',
+									'/crm-associations/v1/associations/create-batch',
+									companyAssociations,
+								);
+							}
+
+							if (additionalFields.associatedContactIds) {
+								const contactAssociations: IDataObject[] = [];
+								for (const contactId of additionalFields.associatedContactIds as IDataObject[]) {
+									contactAssociations.push({
+										fromObjectId: responseData.objectId,
+										toObjectId: contactId,
+										category: 'HUBSPOT_DEFINED',
+										definitionId: 16,
+									});
+								}
+								await hubspotApiRequest.call(
+									this,
+									'PUT',
+									'/crm-associations/v1/associations/create-batch',
+									contactAssociations,
+								);
+							}
+						}
+						//https://developers.hubspot.com/docs/methods/tickets/get_ticket_by_id
+						if (operation === 'get') {
+							const ticketId = this.getNodeParameter('ticketId', i) as string;
+							const additionalFields = this.getNodeParameter('additionalFields', i);
+							if (additionalFields.properties) {
+								qs.properties = additionalFields.properties as string[];
+							}
+							if (additionalFields.propertiesWithHistory) {
+								qs.propertiesWithHistory = (additionalFields.propertiesWithHistory as string).split(
+									',',
+								);
+							}
+							if (additionalFields.includeDeleted) {
+								qs.includeDeleted = additionalFields.includeDeleted as boolean;
+							}
+							const endpoint = `/crm-objects/v1/objects/tickets/${ticketId}`;
+							responseData = await hubspotApiRequest.call(this, 'GET', endpoint, {}, qs);
+						}
+						//https://developers.hubspot.com/docs/methods/tickets/get-all-tickets
+						if (operation === 'getAll') {
+							const additionalFields = this.getNodeParameter('additionalFields', i);
+							const returnAll = this.getNodeParameter('returnAll', 0);
+							if (additionalFields.properties) {
+								qs.properties = additionalFields.properties as string[];
+							}
+							if (additionalFields.propertiesWithHistory) {
+								qs.propertiesWithHistory = (additionalFields.propertiesWithHistory as string).split(
+									',',
+								);
+							}
+							const endpoint = '/crm-objects/v1/objects/tickets/paged';
+							if (returnAll) {
+								responseData = await hubspotApiRequestAllItems.call(
+									this,
+									'objects',
+									'GET',
+									endpoint,
+									{},
+									qs,
+								);
+							} else {
+								qs.limit = this.getNodeParameter('limit', 0);
+								responseData = await hubspotApiRequestAllItems.call(
+									this,
+									'objects',
+									'GET',
+									endpoint,
+									{},
+									qs,
+								);
+								responseData = responseData.splice(0, qs.limit);
+							}
+						}
+						//https://developers.hubspot.com/docs/methods/tickets/delete-ticket
+						if (operation === 'delete') {
+							const ticketId = this.getNodeParameter('ticketId', i) as string;
+							const endpoint = `/crm-objects/v1/objects/tickets/${ticketId}`;
+							await hubspotApiRequest.call(this, 'DELETE', endpoint);
+							responseData = { success: true };
+						}
+						//https://developers.hubspot.com/docs/methods/tickets/update-ticket
+						if (operation === 'update') {
+							const updateFields = this.getNodeParameter('updateFields', i);
+							const ticketId = this.getNodeParameter('ticketId', i) as string;
+							const body: IDataObject[] = [];
+							if (updateFields.pipelineId) {
+								body.push({
+									name: 'hs_pipeline',
+									value: updateFields.pipelineId as string,
+								});
+							}
+							if (updateFields.stageId) {
+								body.push({
+									name: 'hs_pipeline_stage',
+									value: updateFields.stageId as string,
+								});
+							}
+							if (updateFields.ticketName) {
+								body.push({
+									name: 'subject',
+									value: updateFields.ticketName as string,
+								});
+							}
+							if (updateFields.category) {
+								body.push({
+									name: 'hs_ticket_category',
+									value: updateFields.category as string,
+								});
+							}
+							if (updateFields.closeDate) {
+								body.push({
+									name: 'closed_date',
+									value: new Date(updateFields.createDate as string).getTime(),
+								});
+							}
+							if (updateFields.createDate) {
+								body.push({
+									name: 'createdate',
+									value: new Date(updateFields.createDate as string).getTime(),
+								});
+							}
+							if (updateFields.description) {
+								body.push({
+									name: 'content',
+									value: updateFields.description as string,
+								});
+							}
+							if (updateFields.priority) {
+								body.push({
+									name: 'hs_ticket_priority',
+									value: updateFields.priority as string,
+								});
+							}
+							if (updateFields.resolution) {
+								body.push({
+									name: 'hs_resolution',
+									value: updateFields.resolution as string,
+								});
+							}
+							if (updateFields.source) {
+								body.push({
+									name: 'source_type',
+									value: updateFields.source as string,
+								});
+							}
+							if (updateFields.ticketOwnerId) {
+								body.push({
+									name: 'hubspot_owner_id',
+									value: updateFields.ticketOwnerId as string,
+								});
+							}
+							const endpoint = `/crm-objects/v1/objects/tickets/${ticketId}`;
+							responseData = await hubspotApiRequest.call(this, 'PUT', endpoint, body);
+
+							if (updateFields.associatedCompanyIds) {
+								const companyAssociations: IDataObject[] = [];
+								for (const companyId of updateFields.associatedCompanyIds as IDataObject[]) {
+									companyAssociations.push({
+										fromObjectId: responseData.objectId,
+										toObjectId: companyId,
+										category: 'HUBSPOT_DEFINED',
+										definitionId: 26,
+									});
+								}
+								await hubspotApiRequest.call(
+									this,
+									'PUT',
+									'/crm-associations/v1/associations/create-batch',
+									companyAssociations,
+								);
+							}
+
+							if (updateFields.associatedContactIds) {
+								const contactAssociations: IDataObject[] = [];
+								for (const contactId of updateFields.associatedContactIds as IDataObject[]) {
+									contactAssociations.push({
+										fromObjectId: responseData.objectId,
+										toObjectId: contactId,
+										category: 'HUBSPOT_DEFINED',
+										definitionId: 16,
+									});
+								}
+								await hubspotApiRequest.call(
+									this,
+									'PUT',
+									'/crm-associations/v1/associations/create-batch',
+									contactAssociations,
+								);
+							}
+						}
+					}
+					const executionData = this.helpers.constructExecutionMetaData(
+						this.helpers.returnJsonArray(responseData as IDataObject[]),
+						{ itemData: { item: i } },
+					);
+					returnData.push(...executionData);
+				} catch (error) {
+					if (this.continueOnFail()) {
+						returnData.push({ json: { error: (error as JsonObject).message } });
+						continue;
+					}
+					throw error;
+				}
+			}
+		}
+		return [returnData];
+	}
+}
diff --git a/packages/nodes-base/nodes/Hubspot/TicketDescription.ts b/packages/nodes-base/nodes/Hubspot/V1/TicketDescription.ts
similarity index 100%
rename from packages/nodes-base/nodes/Hubspot/TicketDescription.ts
rename to packages/nodes-base/nodes/Hubspot/V1/TicketDescription.ts
diff --git a/packages/nodes-base/nodes/Hubspot/V2/CompanyDescription.ts b/packages/nodes-base/nodes/Hubspot/V2/CompanyDescription.ts
new file mode 100644
index 0000000000000..04244059e12d3
--- /dev/null
+++ b/packages/nodes-base/nodes/Hubspot/V2/CompanyDescription.ts
@@ -0,0 +1,1206 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+export const companyOperations: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				resource: ['company'],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a company',
+				action: 'Create a company',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a company',
+				action: 'Delete a company',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get a company',
+				action: 'Get a company',
+			},
+			{
+				name: 'Get Many',
+				value: 'getAll',
+				description: 'Get many companies',
+				action: 'Get many companies',
+			},
+			{
+				name: 'Get Recently Created/Updated',
+				value: 'getRecentlyCreatedUpdated',
+				description: 'Get recently created/updated companies',
+				action: 'Get recently created/updated companies',
+			},
+			{
+				name: 'Search',
+				value: 'searchByDomain',
+				description: 'Search companies by their website domain',
+				action: 'Search for a company by Domain',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update a company',
+				action: 'Update a company',
+			},
+		],
+		default: 'create',
+	},
+];
+
+export const companyFields: INodeProperties[] = [
+	/* -------------------------------------------------------------------------- */
+	/*                                company:create                              */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Name',
+		name: 'name',
+		type: 'string',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: ['company'],
+				operation: ['create'],
+			},
+		},
+		default: '',
+	},
+	{
+		displayName: 'Company Properties',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Property',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['company'],
+				operation: ['create'],
+			},
+		},
+		options: [
+			{
+				displayName: 'About Us',
+				name: 'aboutUs',
+				type: 'string',
+				typeOptions: {
+					alwaysOpenEditWindow: true,
+				},
+				default: '',
+			},
+			{
+				displayName: 'Annual Revenue',
+				name: 'annualRevenue',
+				type: 'number',
+				typeOptions: {
+					minValue: 0,
+				},
+				default: 0,
+				description: 'The actual or estimated annual revenue of the company',
+			},
+			{
+				displayName: 'City',
+				name: 'city',
+				type: 'string',
+				default: '',
+				description: 'The city where the company is located',
+			},
+			{
+				displayName: 'Close Date',
+				name: 'closeDate',
+				type: 'dateTime',
+				default: '',
+				description:
+					'The date the company or organization was closed as a customer. When using expressions, the time should be specified in YYYY-MM-DD hh-mm-ss format.',
+			},
+			{
+				displayName: 'Company Domain Name',
+				name: 'companyDomainName',
+				type: 'string',
+				default: '',
+				description: 'The domain name of the company or organization',
+			},
+			{
+				displayName: 'Company Owner Name or ID',
+				name: 'companyOwner',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getOwners',
+				},
+				default: '',
+				description:
+					'The owner of the company. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Country/Region',
+				name: 'countryRegion',
+				type: 'string',
+				default: '',
+				description: 'The country/region in which the company or organization is located',
+			},
+			{
+				displayName: 'Custom Properties',
+				name: 'customPropertiesUi',
+				placeholder: 'Add Custom Property',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: true,
+				},
+				default: {},
+				options: [
+					{
+						name: 'customPropertiesValues',
+						displayName: 'Custom Property',
+						values: [
+							{
+								displayName: 'Property Name or ID',
+								name: 'property',
+								type: 'options',
+								typeOptions: {
+									loadOptionsMethod: 'getCompanyCustomProperties',
+								},
+								default: {},
+								description:
+									'Name of the property. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+							},
+							{
+								displayName: 'Value',
+								name: 'value',
+								type: 'string',
+								default: '',
+								required: true,
+								description: 'Value of the property',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Description',
+				name: 'description',
+				type: 'string',
+				default: '',
+				description: "A short statement about the company's mission and goals",
+			},
+			{
+				displayName: 'Facebook Fans',
+				name: 'facebookFans',
+				type: 'number',
+				typeOptions: {
+					minValue: 0,
+				},
+				default: 0,
+				description: 'Number of facebook fans',
+			},
+			{
+				displayName: 'Google Plus Page',
+				name: 'googlePlusPage',
+				type: 'string',
+				default: '',
+				description: 'The URL of the Google Plus page for the company or organization',
+			},
+			{
+				displayName: 'Industry Name or ID',
+				name: 'industry',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getCompanyIndustries',
+				},
+				default: '',
+				description:
+					'The type of business the company performs. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Is Public',
+				name: 'isPublic',
+				type: 'boolean',
+				default: false,
+				description: 'Whether that the company is publicly traded',
+			},
+			{
+				displayName: 'Lead Status Name or ID',
+				name: 'leadStatus',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getCompanyleadStatuses',
+				},
+				default: '',
+				description:
+					'The company\'s sales, prospecting or outreach status. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Lifecycle Stage Name or ID',
+				name: 'lifecycleStatus',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getCompanylifecycleStages',
+				},
+				default: '',
+				description:
+					'The most advanced lifecycle stage across all contacts associated with this company or organization. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'LinkedIn Bio',
+				name: 'linkedinBio',
+				type: 'string',
+				default: '',
+				description: 'The LinkedIn bio for the company or organization',
+			},
+			{
+				displayName: 'LinkedIn Company Page',
+				name: 'linkedInCompanyPage',
+				type: 'string',
+				default: '',
+				description: 'The URL of the LinkedIn company page for the company or organization',
+			},
+			{
+				displayName: 'Number Of Employees',
+				name: 'numberOfEmployees',
+				type: 'number',
+				typeOptions: {
+					minValue: 0,
+				},
+				default: 0,
+				description: 'The total number of employees who work for the company or organization',
+			},
+			{
+				displayName: 'Original Source Type Name or ID',
+				name: 'originalSourceType',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getCompanySourceTypes',
+				},
+				default: '',
+				description:
+					'Original source for the contact with the earliest activity for this company or organization. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Phone Number',
+				name: 'phoneNumber',
+				type: 'string',
+				default: '',
+				description: "A company's primary phone number. Powered by HubSpot Insights.",
+			},
+			{
+				displayName: 'Postal Code',
+				name: 'postalCode',
+				type: 'string',
+				default: '',
+				description:
+					'The postal or zip code of the company or organization. Powered by HubSpot Insights.',
+			},
+			{
+				displayName: 'State/Region',
+				name: 'stateRegion',
+				type: 'string',
+				default: '',
+				description:
+					'The state or region in which the company or organization is located. Powered by HubSpot Insights.',
+			},
+			{
+				displayName: 'Street Address',
+				name: 'streetAddress',
+				type: 'string',
+				default: '',
+				description:
+					'The street address of the company or organization, including unit number. Powered by HubSpot Insights.',
+			},
+			{
+				displayName: 'Street Address 2',
+				name: 'streetAddress2',
+				type: 'string',
+				default: '',
+				description:
+					'The additional address of the company or organization. Powered by HubSpot Insights.',
+			},
+
+			{
+				displayName: 'Target Account Name or ID',
+				name: 'targetAccount',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getCompanyTargetAccounts',
+				},
+				default: '',
+				description:
+					'The Target Account property is a means to flag high priority companies if you are following an account based strategy. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Timezone',
+				name: 'timezone',
+				type: 'string',
+				default: '',
+				description:
+					'The time zone where the company or organization is located. Powered by HubSpot Insights.',
+			},
+			{
+				displayName: 'Total Money Raised',
+				name: 'totalMoneyRaised',
+				type: 'number',
+				typeOptions: {
+					minValue: 0,
+				},
+				default: 0,
+				description:
+					'The total amount of money raised by the company. Powered by HubSpot Insights.',
+			},
+			{
+				displayName: 'Twitter Bio',
+				name: 'twitterBio',
+				type: 'string',
+				typeOptions: {
+					alwaysOpenEditWindow: true,
+				},
+				default: '',
+				description: 'The Twitter bio of the company or organization',
+			},
+			{
+				displayName: 'Twitter Followers',
+				name: 'twitterFollowers',
+				type: 'number',
+				typeOptions: {
+					minValue: 0,
+				},
+				default: 0,
+				description: 'The number of Twitter followers of the company or organization',
+			},
+			{
+				displayName: 'Twitter Handle',
+				name: 'twitterHandle',
+				type: 'string',
+				default: '',
+				description: 'The main twitter account of the company or organization',
+			},
+			{
+				displayName: 'Type Name or ID',
+				name: 'type',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getCompanyTypes',
+				},
+				default: '',
+				description:
+					'The optional classification of this company record - prospect, partner, etc. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Web Technologies Name or ID',
+				name: 'webTechnologies',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getCompanyWebTechnologies',
+				},
+				default: '',
+				description:
+					'The web technologies used by the company or organization. Powered by HubSpot Insights. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Website URL',
+				name: 'websiteUrl',
+				type: 'string',
+				default: '',
+				description:
+					'The main website of the company or organization. This property is used to identify unique companies. Powered by HubSpot Insights.',
+			},
+			{
+				displayName: 'Year Founded',
+				name: 'yearFounded',
+				type: 'string',
+				default: '',
+				description: 'The year the company was created. Powered by HubSpot Insights.',
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                 company:update                             */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Company to Update',
+		name: 'companyId',
+		type: 'resourceLocator',
+		default: { mode: 'list', value: '' },
+		required: true,
+		displayOptions: {
+			show: {
+				resource: ['company'],
+				operation: ['update'],
+			},
+		},
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				placeholder: 'Select from the list',
+				typeOptions: {
+					searchListMethod: 'searchCompanies',
+				},
+			},
+			{
+				displayName: 'By Id',
+				name: 'id',
+				type: 'string',
+				placeholder: '58539222',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex: '[0-9]+',
+							errorMessage: 'Not a valid HubSpot Company ID',
+						},
+					},
+				],
+			},
+		],
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['company'],
+				operation: ['update'],
+			},
+		},
+		options: [
+			{
+				displayName: 'About Us',
+				name: 'aboutUs',
+				type: 'string',
+				typeOptions: {
+					alwaysOpenEditWindow: true,
+				},
+				default: '',
+			},
+			{
+				displayName: 'Annual Revenue',
+				name: 'annualRevenue',
+				type: 'number',
+				typeOptions: {
+					minValue: 0,
+				},
+				default: 0,
+				description: 'The actual or estimated annual revenue of the company',
+			},
+			{
+				displayName: 'City',
+				name: 'city',
+				type: 'string',
+				default: '',
+				description: 'The city where the company is located',
+			},
+			{
+				displayName: 'Close Date',
+				name: 'closeDate',
+				type: 'dateTime',
+				default: '',
+				description:
+					'The date the company or organization was closed as a customer. When using expressions, the time should be specified in YYYY-MM-DD hh-mm-ss format.',
+			},
+			{
+				displayName: 'Company Domain Name',
+				name: 'companyDomainName',
+				type: 'string',
+				default: '',
+				description: 'The domain name of the company or organization',
+			},
+			{
+				displayName: 'Company Owner Name or ID',
+				name: 'companyOwner',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getOwners',
+				},
+				default: '',
+				description:
+					'The owner of the company. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Country/Region',
+				name: 'countryRegion',
+				type: 'string',
+				default: '',
+				description: 'The country/region in which the company or organization is located',
+			},
+			{
+				displayName: 'Custom Properties',
+				name: 'customPropertiesUi',
+				placeholder: 'Add Custom Property',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: true,
+				},
+				default: {},
+				options: [
+					{
+						name: 'customPropertiesValues',
+						displayName: 'Custom Property',
+						values: [
+							{
+								displayName: 'Property Name or ID',
+								name: 'property',
+								type: 'options',
+								typeOptions: {
+									loadOptionsMethod: 'getCompanyCustomProperties',
+								},
+								default: '',
+								description:
+									'Name of the property. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+							},
+							{
+								displayName: 'Value',
+								name: 'value',
+								type: 'string',
+								default: '',
+								required: true,
+								description: 'Value of the property',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Description',
+				name: 'description',
+				type: 'string',
+				default: '',
+				description: "A short statement about the company's mission and goals",
+			},
+			{
+				displayName: 'Facebook Fans',
+				name: 'facebookFans',
+				type: 'number',
+				typeOptions: {
+					minValue: 0,
+				},
+				default: 0,
+				description: 'Number of facebook fans',
+			},
+			{
+				displayName: 'Google Plus Page',
+				name: 'googlePlusPage',
+				type: 'string',
+				default: '',
+				description: 'The URL of the Google Plus page for the company or organization',
+			},
+			{
+				displayName: 'Industry Name or ID',
+				name: 'industry',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getCompanyIndustries',
+				},
+				default: '',
+				description:
+					'The type of business the company performs. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Is Public',
+				name: 'isPublic',
+				type: 'boolean',
+				default: false,
+				description: 'Whether that the company is publicly traded',
+			},
+			{
+				displayName: 'Lead Status Name or ID',
+				name: 'leadStatus',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getCompanyleadStatuses',
+				},
+				default: '',
+				description:
+					'The company\'s sales, prospecting or outreach status. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Lifecycle Stage Name or ID',
+				name: 'lifecycleStatus',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getCompanylifecycleStages',
+				},
+				default: '',
+				description:
+					'The most advanced lifecycle stage across all contacts associated with this company or organization. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Linkedin Bio',
+				name: 'linkedinBio',
+				type: 'string',
+				default: '',
+				description: 'The LinkedIn bio for the company or organization',
+			},
+			{
+				displayName: 'LinkedIn Company Page',
+				name: 'linkedInCompanyPage',
+				type: 'string',
+				default: '',
+				description: 'The URL of the LinkedIn company page for the company or organization',
+			},
+			{
+				displayName: 'Name',
+				name: 'name',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Number Of Employees',
+				name: 'numberOfEmployees',
+				type: 'number',
+				typeOptions: {
+					minValue: 0,
+				},
+				default: 0,
+				description: 'The total number of employees who work for the company or organization',
+			},
+			{
+				displayName: 'Original Source Type Name or ID',
+				name: 'originalSourceType',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getCompanySourceTypes',
+				},
+				default: '',
+				description:
+					'Original source for the contact with the earliest activity for this company or organization. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Phone Number',
+				name: 'phoneNumber',
+				type: 'string',
+				default: '',
+				description: "A company's primary phone number. Powered by HubSpot Insights.",
+			},
+			{
+				displayName: 'Postal Code',
+				name: 'postalCode',
+				type: 'string',
+				default: '',
+				description:
+					'The postal or zip code of the company or organization. Powered by HubSpot Insights.',
+			},
+			{
+				displayName: 'State/Region',
+				name: 'stateRegion',
+				type: 'string',
+				default: '',
+				description:
+					'The state or region in which the company or organization is located. Powered by HubSpot Insights.',
+			},
+			{
+				displayName: 'Street Address',
+				name: 'streetAddress',
+				type: 'string',
+				default: '',
+				description:
+					'The street address of the company or organization, including unit number. Powered by HubSpot Insights.',
+			},
+			{
+				displayName: 'Street Address 2',
+				name: 'streetAddress2',
+				type: 'string',
+				default: '',
+				description:
+					'The additional address of the company or organization. Powered by HubSpot Insights.',
+			},
+
+			{
+				displayName: 'Target Account Name or ID',
+				name: 'targetAccount',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getCompanyTargetAccounts',
+				},
+				default: '',
+				description:
+					'The Target Account property is a means to flag high priority companies if you are following an account based strategy. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Timezone',
+				name: 'timezone',
+				type: 'string',
+				default: '',
+				description:
+					'The time zone where the company or organization is located. Powered by HubSpot Insights.',
+			},
+			{
+				displayName: 'Total Money Raised',
+				name: 'totalMoneyRaised',
+				type: 'number',
+				typeOptions: {
+					minValue: 0,
+				},
+				default: 0,
+				description:
+					'The total amount of money raised by the company. Powered by HubSpot Insights.',
+			},
+			{
+				displayName: 'Twitter Bio',
+				name: 'twitterBio',
+				type: 'string',
+				typeOptions: {
+					alwaysOpenEditWindow: true,
+				},
+				default: '',
+				description: 'The Twitter bio of the company or organization',
+			},
+			{
+				displayName: 'Twitter Followers',
+				name: 'twitterFollowers',
+				type: 'number',
+				typeOptions: {
+					minValue: 0,
+				},
+				default: 0,
+				description: 'The number of Twitter followers of the company or organization',
+			},
+			{
+				displayName: 'Twitter Handle',
+				name: 'twitterHandle',
+				type: 'string',
+				default: '',
+				description: 'The main twitter account of the company or organization',
+			},
+			{
+				displayName: 'Type Name or ID',
+				name: 'type',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getCompanyTypes',
+				},
+				default: '',
+				description:
+					'The optional classification of this company record - prospect, partner, etc. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Web Technologies Name or ID',
+				name: 'webTechnologies',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getCompanyWebTechnologies',
+				},
+				default: '',
+				description:
+					'The web technologies used by the company or organization. Powered by HubSpot Insights. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Website URL',
+				name: 'websiteUrl',
+				type: 'string',
+				default: '',
+				description:
+					'The main website of the company or organization. This property is used to identify unique companies. Powered by HubSpot Insights.',
+			},
+			{
+				displayName: 'Year Founded',
+				name: 'yearFounded',
+				type: 'string',
+				default: '',
+				description: 'The year the company was created. Powered by HubSpot Insights.',
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                  company:get                               */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Company to Get',
+		name: 'companyId',
+		type: 'resourceLocator',
+		default: { mode: 'list', value: '' },
+		required: true,
+		displayOptions: {
+			show: {
+				resource: ['company'],
+				operation: ['get'],
+			},
+		},
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				placeholder: 'Select from the list',
+				typeOptions: {
+					searchListMethod: 'searchCompanies',
+				},
+			},
+			{
+				displayName: 'By Id',
+				name: 'id',
+				type: 'string',
+				placeholder: '58539222',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex: '[0-9]+',
+							errorMessage: 'Not a valid HubSpot Company ID',
+						},
+					},
+				],
+			},
+		],
+	},
+	{
+		displayName: 'Options',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['company'],
+				operation: ['get'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Include Merge Audits',
+				name: 'includeMergeAudits',
+				type: 'boolean',
+				default: false,
+				description:
+					'Whether to return any merge history if the company has been previously merged with another company record. Defaults to false.',
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                 company:getAll                             */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: ['company'],
+				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: ['company'],
+				operation: ['getAll'],
+				returnAll: [false],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 250,
+		},
+		default: 100,
+		description: 'Max number of results to return',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['company'],
+				operation: ['getAll'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Include Merge Audits',
+				name: 'includeMergeAudits',
+				type: 'boolean',
+				default: false,
+				description:
+					'Whether to return any merge history if a company has been previously merged with another company record. Defaults to false.',
+			},
+			{
+				displayName: 'Company Properties to Include',
+				name: 'propertiesCollection',
+				type: 'fixedCollection',
+				default: {},
+				options: [
+					{
+						name: 'propertiesValues',
+						displayName: 'Companies Properties to Include',
+						values: [
+							{
+								displayName: 'Companies Properties to Include',
+								name: 'properties',
+								type: 'multiOptions',
+								typeOptions: {
+									loadOptionsMethod: 'getCompanyProperties',
+								},
+								default: [],
+								description:
+									'Whether to include specific Company properties in the returned results. Choose from a list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>. Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+							},
+							{
+								displayName: 'Include',
+								name: 'propertyMode',
+								type: 'options',
+								options: [
+									{
+										name: 'Value And History',
+										value: 'valueAndHistory',
+									},
+									{
+										name: 'Value Only',
+										value: 'valueOnly',
+									},
+								],
+								default: 'valueAndHistory',
+								description:
+									'Specify if the current value for a property should be fetched, or the value and all the historical values for that property',
+							},
+						],
+					},
+				],
+				description:
+					'Whether to include specific Company properties in the returned results. Choose from a list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                 company:delete                             */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Company to Delete',
+		name: 'companyId',
+		type: 'resourceLocator',
+		default: { mode: 'list', value: '' },
+		required: true,
+		displayOptions: {
+			show: {
+				resource: ['company'],
+				operation: ['delete'],
+			},
+		},
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				placeholder: 'Select from the list',
+				typeOptions: {
+					searchListMethod: 'searchCompanies',
+				},
+			},
+			{
+				displayName: 'By Id',
+				name: 'id',
+				type: 'string',
+				placeholder: '58539222',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex: '[0-9]+',
+							errorMessage: 'Not a valid HubSpot Company ID',
+						},
+					},
+				],
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*              getRecentlyCreatedUpdate                                      */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: ['company'],
+				operation: ['getRecentlyCreatedUpdated'],
+			},
+		},
+		default: false,
+		description: 'Whether to return all results or only up to a given limit',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				resource: ['company'],
+				operation: ['getRecentlyCreatedUpdated'],
+				returnAll: [false],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 250,
+		},
+		default: 100,
+		description: 'Max number of results to return',
+	},
+	{
+		displayName: 'Options',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['company'],
+				operation: ['getRecentlyCreatedUpdated'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Since',
+				name: 'since',
+				type: 'dateTime',
+				default: '',
+				description:
+					'Only return companys created after timestamp x. When using expressions, the time should be specified in YYYY-MM-DD hh-mm-ss format.',
+			},
+			{
+				displayName: 'Company Properties to Include',
+				name: 'propertiesCollection',
+				type: 'fixedCollection',
+				default: {},
+				options: [
+					{
+						name: 'propertiesValues',
+						displayName: 'Companies Properties to Include',
+						values: [
+							{
+								displayName: 'Companies Properties to Include',
+								name: 'properties',
+								type: 'multiOptions',
+								typeOptions: {
+									loadOptionsMethod: 'getCompanyProperties',
+								},
+								default: [],
+								description:
+									'Whether to include specific Company properties in the returned results. Choose from a list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>. Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+							},
+							{
+								displayName: 'Include',
+								name: 'propertyMode',
+								type: 'options',
+								options: [
+									{
+										name: 'Value And History',
+										value: 'valueAndHistory',
+									},
+									{
+										name: 'Value Only',
+										value: 'valueOnly',
+									},
+								],
+								default: 'valueAndHistory',
+								description:
+									'Specify if the current value for a property should be fetched, or the value and all the historical values for that property',
+							},
+						],
+					},
+				],
+				description:
+					'Whether to include specific Company properties in the returned results. Choose from a list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                            company:searchByDomain                          */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Domain',
+		name: 'domain',
+		type: 'string',
+		displayOptions: {
+			show: {
+				resource: ['company'],
+				operation: ['searchByDomain'],
+			},
+		},
+		required: true,
+		default: '',
+		description: "The company's website domain to search for, like n8n.io",
+	},
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: ['company'],
+				operation: ['searchByDomain'],
+			},
+		},
+		default: false,
+		description: 'Whether to return all results or only up to a given limit',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				resource: ['company'],
+				operation: ['searchByDomain'],
+				returnAll: [false],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 250,
+		},
+		default: 100,
+		description: 'Max number of results to return',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['company'],
+				operation: ['searchByDomain'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Company Properties to Include',
+				name: 'properties',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getCompanyProperties',
+				},
+				default: [],
+				description:
+					'Whether to include specific Company properties in the returned results. Choose from a list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>. Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+		],
+	},
+];
diff --git a/packages/nodes-base/nodes/Hubspot/V2/ContactDescription.ts b/packages/nodes-base/nodes/Hubspot/V2/ContactDescription.ts
new file mode 100644
index 0000000000000..c8a9417ce6dea
--- /dev/null
+++ b/packages/nodes-base/nodes/Hubspot/V2/ContactDescription.ts
@@ -0,0 +1,1225 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+export const contactOperations: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				resource: ['contact'],
+			},
+		},
+		options: [
+			{
+				name: 'Create or Update',
+				value: 'upsert',
+				description:
+					'Create a new contact, or update the current one if it already exists (upsert)',
+				action: 'Create or update a contact',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a contact',
+				action: 'Delete a contact',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get a contact',
+				action: 'Get a contact',
+			},
+			{
+				name: 'Get Many',
+				value: 'getAll',
+				description: 'Get many contacts',
+				action: 'Get many contacts',
+			},
+			{
+				name: 'Get Recently Created/Updated',
+				value: 'getRecentlyCreatedUpdated',
+				description: 'Get recently created/updated contacts',
+				action: 'Get recently created/updated contacts',
+			},
+			{
+				name: 'Search',
+				value: 'search',
+				description: 'Search contacts',
+				action: 'Search contacts',
+			},
+		],
+		default: 'upsert',
+	},
+];
+
+export const contactFields: INodeProperties[] = [
+	/* -------------------------------------------------------------------------- */
+	/*                                contact:upsert                              */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Email',
+		name: 'email',
+		type: 'string',
+		placeholder: 'name@email.com',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: ['contact'],
+				operation: ['upsert'],
+			},
+		},
+		default: '',
+	},
+	{
+		displayName: 'Contact Properties',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Property',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['contact'],
+				operation: ['upsert'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Annual Revenue',
+				name: 'annualRevenue',
+				type: 'number',
+				typeOptions: {
+					minValue: 0,
+				},
+				default: 0,
+			},
+			{
+				displayName: 'Associated Company Name or ID',
+				name: 'associatedCompanyId',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getCompanies',
+				},
+				default: '',
+				description:
+					'Companies associated with the ticket. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'City',
+				name: 'city',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Clicked Facebook Ad',
+				name: 'clickedFacebookAd',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Close Date',
+				name: 'closeDate',
+				type: 'dateTime',
+				default: '',
+				description:
+					'When using expressions, the time should be specified in YYYY-MM-DD hh-mm-ss format',
+			},
+			{
+				displayName: 'Company Name',
+				name: 'companyName',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Company Size',
+				name: 'companySize',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Contact Owner Name or ID',
+				name: 'contactOwner',
+				type: 'options',
+				description:
+					'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
+				typeOptions: {
+					loadOptionsMethod: 'getOwners',
+				},
+				default: '',
+			},
+			{
+				displayName: 'Country/Region',
+				name: 'country',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Custom Properties',
+				name: 'customPropertiesUi',
+				placeholder: 'Add Custom Property',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: true,
+				},
+				default: {},
+				options: [
+					{
+						name: 'customPropertiesValues',
+						displayName: 'Custom Property',
+						values: [
+							{
+								displayName: 'Property Name or ID',
+								name: 'property',
+								type: 'options',
+								typeOptions: {
+									loadOptionsMethod: 'getContactCustomProperties',
+								},
+								default: '',
+								description:
+									'Name of the property. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+							},
+							{
+								displayName: 'Value',
+								name: 'value',
+								type: 'string',
+								default: '',
+								required: true,
+								description: 'Value of the property',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Date of Birth',
+				name: 'dateOfBirth',
+				type: 'dateTime',
+				default: '',
+				description:
+					'When using expressions, the time should be specified in YYYY-MM-DD hh-mm-ss format',
+			},
+			{
+				displayName: 'Degree',
+				name: 'degree',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Facebook Click ID',
+				name: 'facebookClickId',
+				type: 'number',
+				default: '',
+			},
+			{
+				displayName: 'Fax Number',
+				name: 'faxNumber',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Field Of Study',
+				name: 'fieldOfStudy',
+				type: 'string',
+				default: '',
+				description:
+					"A contact's field of study. This property is required for the Facebook Ads Integration. This property will be automatically synced via the Lead Ads tool",
+			},
+			{
+				displayName: 'First Name',
+				name: 'firstName',
+				type: 'string',
+				default: '',
+				description: "A contact's first name",
+			},
+			{
+				displayName: 'Gender',
+				name: 'gender',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Google Ad Click ID',
+				name: 'googleAdClickId',
+				type: 'number',
+				default: '',
+			},
+			{
+				displayName: 'Graduation Date',
+				name: 'graduationDate',
+				type: 'dateTime',
+				default: '',
+				description:
+					"A contact's graduation date. This property is required for the Facebook Ads Integration. This property will be automatically synced via the Lead Ads tool. When using expressions, the time should be specified in YYYY-MM-DD hh-mm-ss format",
+			},
+			{
+				displayName: 'Industry',
+				name: 'industry',
+				type: 'string',
+				default: '',
+				description: 'The industry a contact is in',
+			},
+			{
+				displayName: 'Job Function',
+				name: 'jobFunction',
+				type: 'string',
+				default: '',
+				description:
+					"A contact's job function. This property is required for the Facebook Ads Integration. This property will be automatically synced via the Lead Ads tool",
+			},
+			{
+				displayName: 'Job Title',
+				name: 'jobTitle',
+				type: 'string',
+				default: '',
+				description: "A contact's job title",
+			},
+			{
+				displayName: 'Last Name',
+				name: 'lastName',
+				type: 'string',
+				default: '',
+				description: "A contact's last name",
+			},
+			{
+				displayName: 'Lead Status Name or ID',
+				name: 'leadStatus',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getContactLeadStatuses',
+				},
+				default: '',
+				description:
+					'The contact\'s sales, prospecting or outreach status. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Legal Basic For Processing Contact Data Name or ID',
+				name: 'processingContactData',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getContactLealBasics',
+				},
+				default: '',
+				description:
+					"Legal basis for processing contact's data; 'Not applicable' will exempt the contact from GDPR protections. Choose from the list, or specify an ID using an <a href=\"https://docs.n8n.io/code-examples/expressions/\">expression</a>.",
+			},
+			{
+				displayName: 'Lifecycle Stage Name or ID',
+				name: 'lifeCycleStage',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getContactLifeCycleStages',
+				},
+				default: '',
+				description:
+					'The qualification of contacts to sales readiness. It can be set through imports, forms, workflows, and manually on a per contact basis. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Marital Status',
+				name: 'maritalStatus',
+				type: 'string',
+				default: '',
+				description:
+					"A contact's marital status. This property is required for the Facebook Ads Integration. This property will be automatically synced via the Lead Ads tool",
+			},
+			{
+				displayName: 'Membership Note',
+				name: 'membershipNote',
+				type: 'string',
+				typeOptions: {
+					alwaysOpenEditWindow: true,
+				},
+				default: '',
+				description: "The notes relating to the contact's content membership",
+			},
+			{
+				displayName: 'Message',
+				name: 'message',
+				type: 'string',
+				typeOptions: {
+					alwaysOpenEditWindow: true,
+				},
+				default: '',
+				description:
+					'A default property to be used for any message or comments a contact may want to leave on a form',
+			},
+			{
+				displayName: 'Mobile Phone Number',
+				name: 'mobilePhoneNumber',
+				type: 'string',
+				default: '',
+				description: "A contact's mobile phone number",
+			},
+			{
+				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-options
+				displayName: 'Number Of Employees',
+				name: 'numberOfEmployees',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getContactNumberOfEmployees',
+				},
+				default: '',
+				description:
+					'The number of company employees. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Original Source Name or ID',
+				name: 'originalSource',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getContactOriginalSources',
+				},
+				default: '',
+				description:
+					'The first known source through which a contact found your website. Source is automatically set by HubSpot, but may be updated manually. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Phone Number',
+				name: 'phoneNumber',
+				type: 'string',
+				default: '',
+				description: "A contact's primary phone number",
+			},
+			{
+				displayName: 'Contact Properties to Include',
+				name: 'properties',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getContactProperties',
+				},
+				displayOptions: {
+					show: {
+						'/resolveData': [false],
+					},
+				},
+				default: [],
+				description:
+					'Whether to include specific Contact properties in the returned results. Choose from a list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>. Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Postal Code',
+				name: 'postalCode',
+				type: 'string',
+				default: '',
+				description: "The contact's zip code. This might be set via import, form, or integration.",
+			},
+			{
+				displayName: 'Preffered Language Name or ID',
+				name: 'prefferedLanguage',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getContactPrefferedLanguages',
+				},
+				default: '',
+				description:
+					'Set your contact\'s preferred language for communications. This property can be changed from an import, form, or integration. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Relationship Status',
+				name: 'relationshipStatus',
+				type: 'string',
+				default: '',
+				description:
+					"A contact's relationship status. This property is required for the Facebook Ads Integration. This property will be automatically synced via the Lead Ads tool",
+			},
+			{
+				displayName: 'Salutation',
+				name: 'salutation',
+				type: 'string',
+				default: '',
+				description: 'The title used to address a contact',
+			},
+			{
+				displayName: 'School',
+				name: 'school',
+				type: 'string',
+				default: '',
+				description:
+					"A contact's school. This property is required for the Facebook Ads Integration. This property will be automatically synced via the Lead Ads tool",
+			},
+			{
+				displayName: 'Seniority',
+				name: 'seniority',
+				type: 'string',
+				default: '',
+				description:
+					"A contact's seniority. This property is required for the Facebook Ads Integration. This property will be automatically synced via the Lead Ads tool",
+			},
+			{
+				displayName: 'Start Date',
+				name: 'startDate',
+				type: 'dateTime',
+				default: '',
+				description:
+					"A contact's start date. This property is required for the Facebook Ads Integration. This property will be automatically synced via the Lead Ads tool. When using expressions, the time should be specified in YYYY-MM-DD hh-mm-ss format",
+			},
+			{
+				displayName: 'State/Region',
+				name: 'stateRegion',
+				type: 'string',
+				default: '',
+				description:
+					"The contact's state of residence. This might be set via import, form, or integration.",
+			},
+			{
+				displayName: 'Status Name or ID',
+				name: 'status',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getContactStatuses',
+				},
+				default: '',
+				description:
+					'The status of the contact\'s content membership. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Street Address',
+				name: 'streetAddress',
+				type: 'string',
+				default: '',
+				description: "A contact's street address, including apartment or unit #",
+			},
+			{
+				displayName: 'Twitter Username',
+				name: 'twitterUsername',
+				type: 'string',
+				default: '',
+				description:
+					"The contact's Twitter handle. This is set by HubSpot using the contact's email address.",
+			},
+			{
+				displayName: 'Website URL',
+				name: 'websiteUrl',
+				type: 'string',
+				default: '',
+				description: "The contact's company website",
+			},
+			{
+				displayName: 'Work Email',
+				name: 'workEmail',
+				type: 'string',
+				default: '',
+				description:
+					"A contact's work email. This property is required for the Facebook Ads Integration. This property will be automatically synced via the Lead Ads tool",
+			},
+		],
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['contact'],
+				operation: ['upsert'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Simplify Output',
+				name: 'resolveData',
+				type: 'boolean',
+				default: false,
+				// eslint-disable-next-line n8n-nodes-base/node-param-description-boolean-without-whether
+				description:
+					'By default the response only includes the ID. If this option gets activated, it will resolve the data automatically.',
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                  contact:get                               */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Contact to Get',
+		name: 'contactId',
+		type: 'resourceLocator',
+		default: { mode: 'list', value: '' },
+		required: true,
+		hint: 'To lookup a user by their email, use the Search operation',
+		displayOptions: {
+			show: {
+				resource: ['contact'],
+				operation: ['get'],
+			},
+		},
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				placeholder: 'Select from the list',
+				typeOptions: {
+					searchListMethod: 'searchContacts',
+					searchable: true,
+				},
+			},
+			{
+				displayName: 'By Id',
+				name: 'id',
+				type: 'string',
+				placeholder: '58539222',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex: '[0-9]+',
+							errorMessage: 'Not a valid HubSpot Contact ID',
+						},
+					},
+				],
+			},
+		],
+		description: "This is not a contact's email but a number like 1485",
+	},
+	{
+		displayName: 'Options',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['contact'],
+				operation: ['get'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Form Submission Mode',
+				name: 'formSubmissionMode',
+				type: 'options',
+				options: [
+					{
+						name: 'All',
+						value: 'all',
+					},
+					{
+						name: 'None',
+						value: 'none',
+					},
+					{
+						name: 'Newest',
+						value: 'newest',
+					},
+					{
+						name: 'Oldest',
+						value: 'oldest',
+					},
+				],
+				default: 'all',
+				description: 'Specify which form submissions should be fetched',
+			},
+			{
+				displayName: 'Include List Memberships',
+				name: 'listMemberships',
+				type: 'boolean',
+				default: true,
+				description: 'Whether current list memberships should be fetched for the contact',
+			},
+			{
+				displayName: 'Contact Properties to Include',
+				name: 'propertiesCollection',
+				type: 'fixedCollection',
+				default: {},
+				options: [
+					{
+						name: 'propertiesValues',
+						displayName: 'Contact Properties to Include',
+						values: [
+							{
+								displayName: 'Contact Properties to Include',
+								name: 'properties',
+								type: 'multiOptions',
+								typeOptions: {
+									multipleValueButtonText: 'test',
+									loadOptionsMethod: 'getContactProperties',
+								},
+								default: [],
+								description:
+									'Whether to include specific Contact properties in the returned results. Choose from a list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>. Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+							},
+							{
+								displayName: 'Include',
+								name: 'propertyMode',
+								type: 'options',
+								options: [
+									{
+										name: 'Value And History',
+										value: 'valueAndHistory',
+									},
+									{
+										name: 'Value Only',
+										value: 'valueOnly',
+									},
+								],
+								default: 'valueAndHistory',
+								description:
+									'Specify if the current value for a property should be fetched, or the value and all the historical values for that property',
+							},
+						],
+					},
+				],
+				description:
+					'<p>Used to include specific contact properties in the results. By default, the results will only include Contact ID and will not include the values for any properties for your Contact.</p><p>Including this parameter will include the data for the specified property in the results. You can include this parameter multiple times to request multiple properties separated by a comma: <code>,</code>.</p>. Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                 contact:getAll                             */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: ['contact'],
+				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: ['contact'],
+				operation: ['getAll'],
+				returnAll: [false],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 250,
+		},
+		default: 100,
+		description: 'Max number of results to return',
+	},
+	{
+		displayName: 'Options',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['contact'],
+				operation: ['getAll'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Form Submission Mode',
+				name: 'formSubmissionMode',
+				type: 'options',
+				options: [
+					{
+						name: 'All',
+						value: 'all',
+					},
+					{
+						name: 'None',
+						value: 'none',
+					},
+					{
+						name: 'Newest',
+						value: 'newest',
+					},
+					{
+						name: 'Oldest',
+						value: 'oldest',
+					},
+				],
+				default: 'all',
+				description: 'Specify which form submissions should be fetched',
+			},
+			{
+				displayName: 'Include List Memberships',
+				name: 'listMemberships',
+				type: 'boolean',
+				default: true,
+				description: 'Whether current list memberships should be fetched for the contact',
+			},
+			{
+				displayName: 'Contact Properties to Include',
+				name: 'propertiesCollection',
+				type: 'fixedCollection',
+				default: {},
+				options: [
+					{
+						name: 'propertiesValues',
+						displayName: 'Contact Properties to Include',
+						values: [
+							{
+								displayName: 'Contact Properties to Include',
+								name: 'properties',
+								type: 'multiOptions',
+								typeOptions: {
+									loadOptionsMethod: 'getContactProperties',
+								},
+								default: [],
+								description:
+									'Whether to include specific Contact properties in the returned results. Choose from a list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>. Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+							},
+							{
+								displayName: 'Include',
+								name: 'propertyMode',
+								type: 'options',
+								options: [
+									{
+										name: 'Value And History',
+										value: 'valueAndHistory',
+									},
+									{
+										name: 'Value Only',
+										value: 'valueOnly',
+									},
+								],
+								default: 'valueAndHistory',
+								description:
+									'Specify if the current value for a property should be fetched, or the value and all the historical values for that property',
+							},
+						],
+					},
+				],
+				description:
+					'<p>Used to include specific contact properties in the results. By default, the results will only include Contact ID and will not include the values for any properties for your Contact.</p><p>Including this parameter will include the data for the specified property in the results. You can include this parameter multiple times to request multiple properties separated by a comma: <code>,</code>.</p>. Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                 contact:delete                             */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Contact to Delete',
+		name: 'contactId',
+		type: 'resourceLocator',
+		default: { mode: 'list', value: '' },
+		required: true,
+		hint: 'To lookup a user by their email, use the Search operation',
+		displayOptions: {
+			show: {
+				resource: ['contact'],
+				operation: ['delete'],
+			},
+		},
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				placeholder: 'Select from the list',
+				typeOptions: {
+					searchListMethod: 'searchContacts',
+					searchable: true,
+				},
+			},
+			{
+				displayName: 'By Id',
+				name: 'id',
+				type: 'string',
+				placeholder: '58539222',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex: '[0-9]+',
+							errorMessage: 'Not a valid HubSpot Contact ID',
+						},
+					},
+				],
+			},
+		],
+		description: "This is not a contact's email but a number like 1485",
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*               contact:getRecentlyCreatedUpdated                            */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: ['contact'],
+				operation: ['getRecentlyCreatedUpdated'],
+			},
+		},
+		default: false,
+		description: 'Whether to return all results or only up to a given limit',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				resource: ['contact'],
+				operation: ['getRecentlyCreatedUpdated'],
+				returnAll: [false],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 250,
+		},
+		default: 100,
+		description: 'Max number of results to return',
+	},
+	{
+		displayName: 'Options',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['contact'],
+				operation: ['getRecentlyCreatedUpdated'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Form Submission Mode',
+				name: 'formSubmissionMode',
+				type: 'options',
+				options: [
+					{
+						name: 'All',
+						value: 'all',
+					},
+					{
+						name: 'None',
+						value: 'none',
+					},
+					{
+						name: 'Newest',
+						value: 'newest',
+					},
+					{
+						name: 'Oldest',
+						value: 'oldest',
+					},
+				],
+				default: 'all',
+				description: 'Specify which form submissions should be fetched',
+			},
+			{
+				displayName: 'Include List Memberships',
+				name: 'listMemberships',
+				type: 'boolean',
+				default: true,
+				description: 'Whether current list memberships should be fetched for the contact',
+			},
+			{
+				displayName: 'Contact Properties to Include',
+				name: 'propertiesCollection',
+				type: 'fixedCollection',
+				default: {},
+				options: [
+					{
+						name: 'propertiesValues',
+						displayName: 'Contact Properties to Include',
+						values: [
+							{
+								displayName: 'Contact Properties to Include',
+								name: 'properties',
+								type: 'multiOptions',
+								typeOptions: {
+									loadOptionsMethod: 'getContactProperties',
+								},
+								default: [],
+								description:
+									'Whether to include specific Contact properties in the returned results. Choose from a list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>. Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+							},
+							{
+								displayName: 'Include',
+								name: 'propertyMode',
+								type: 'options',
+								options: [
+									{
+										name: 'Value And History',
+										value: 'valueAndHistory',
+									},
+									{
+										name: 'Value Only',
+										value: 'valueOnly',
+									},
+								],
+								default: 'valueAndHistory',
+								description:
+									'Specify if the current value for a property should be fetched, or the value and all the historical values for that property',
+							},
+						],
+					},
+				],
+				description:
+					'<p>Used to include specific contact properties in the results. By default, the results will only include Contact ID and will not include the values for any properties for your Contact.</p><p>Including this parameter will include the data for the specified property in the results. You can include this parameter multiple times to request multiple properties separated by a comma: <code>,</code>.</p>. Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+		],
+	},
+
+	//*-------------------------------------------------------------------------- */
+	/*                                 contact:search                             */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: ['contact'],
+				operation: ['search'],
+			},
+		},
+		default: false,
+		description: 'Whether to return all results or only up to a given limit',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				resource: ['contact'],
+				operation: ['search'],
+				returnAll: [false],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 250,
+		},
+		default: 100,
+		description: 'Max number of results to return',
+	},
+	{
+		displayName: 'Filter Groups',
+		name: 'filterGroupsUi',
+		type: 'fixedCollection',
+		default: {},
+		placeholder: 'Add Filter Group',
+		typeOptions: {
+			multipleValues: true,
+		},
+		displayOptions: {
+			show: {
+				resource: ['contact'],
+				operation: ['search'],
+			},
+		},
+		options: [
+			{
+				name: 'filterGroupsValues',
+				displayName: 'Filter Group',
+				values: [
+					{
+						displayName: 'Filters',
+						name: 'filtersUi',
+						type: 'fixedCollection',
+						default: {},
+						placeholder: 'Add Filter',
+						typeOptions: {
+							multipleValues: true,
+						},
+						options: [
+							{
+								name: 'filterValues',
+								displayName: 'Filter',
+								values: [
+									{
+										displayName: 'Property Name or ID',
+										name: 'propertyName',
+										type: 'options',
+										description:
+											'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
+										typeOptions: {
+											loadOptionsMethod: 'getContactPropertiesWithType',
+										},
+										default: '',
+									},
+									{
+										displayName: 'Type',
+										name: 'type',
+										type: 'hidden',
+										default: '={{$parameter["&propertyName"].split("|")[1]}}',
+									},
+									{
+										displayName: 'Operator',
+										name: 'operator',
+										type: 'options',
+										displayOptions: {
+											hide: {
+												type: ['number'],
+											},
+										},
+										options: [
+											{
+												name: 'Contains Exactly',
+												value: 'CONTAINS_TOKEN',
+											},
+											{
+												name: 'Equal',
+												value: 'EQ',
+											},
+											{
+												name: 'Is Known',
+												value: 'HAS_PROPERTY',
+											},
+											{
+												name: 'Is Unknown',
+												value: 'NOT_HAS_PROPERTY',
+											},
+											{
+												name: 'Not Equal',
+												value: 'NEQ',
+											},
+										],
+										default: 'EQ',
+									},
+									{
+										displayName: 'Operator',
+										name: 'operator',
+										type: 'options',
+										displayOptions: {
+											show: {
+												type: ['number'],
+											},
+										},
+										options: [
+											{
+												name: 'Contains Exactly',
+												value: 'CONTAINS_TOKEN',
+											},
+											{
+												name: 'Equal',
+												value: 'EQ',
+											},
+											{
+												name: 'Greater Than',
+												value: 'GT',
+											},
+											{
+												name: 'Greater Than Or Equal',
+												value: 'GTE',
+											},
+											{
+												name: 'Is Known',
+												value: 'HAS_PROPERTY',
+											},
+											{
+												name: 'Is Unknown',
+												value: 'NOT_HAS_PROPERTY',
+											},
+											{
+												name: 'Less Than',
+												value: 'LT',
+											},
+											{
+												name: 'Less Than Or Equal',
+												value: 'LTE',
+											},
+											{
+												name: 'Not Equal',
+												value: 'NEQ',
+											},
+										],
+										default: 'EQ',
+									},
+									{
+										displayName: 'Value',
+										name: 'value',
+										displayOptions: {
+											hide: {
+												operator: ['HAS_PROPERTY', 'NOT_HAS_PROPERTY'],
+											},
+										},
+										required: true,
+										type: 'string',
+										default: '',
+									},
+								],
+							},
+						],
+						description:
+							'Use filters to limit the results to only CRM objects with matching property values. More info <a href="https://developers.hubspot.com/docs/api/crm/search">here</a>.',
+					},
+				],
+			},
+		],
+		description:
+			'When multiple filters are provided within a Filter Group, they will be combined using a logical AND operator. When multiple Filter Groups are provided, they will be combined using a logical OR operator. The system supports a maximum of three Filter Groups with up to three filters each. More info <a href="https://developers.hubspot.com/docs/api/crm/search">here</a>',
+	},
+	{
+		displayName: 'Options',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['contact'],
+				operation: ['search'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Sort Order',
+				name: 'direction',
+				type: 'options',
+				options: [
+					{
+						name: 'Ascending',
+						value: 'ASCENDING',
+					},
+					{
+						name: 'Descending',
+						value: 'DESCENDING',
+					},
+				],
+				default: 'DESCENDING',
+				description:
+					'Defines the direction in which search results are ordered. Default value is Descending.',
+			},
+			{
+				displayName: 'Field Names or IDs',
+				name: 'properties',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getContactProperties',
+				},
+				default: ['firstname', 'lastname', 'email'],
+				description:
+					'Whether to include specific Contact properties in the returned results. Choose from a list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>. Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Query',
+				name: 'query',
+				type: 'string',
+				default: '',
+				description: 'Perform a text search against all property values for an object type',
+			},
+			{
+				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-options
+				displayName: 'Sort By',
+				name: 'sortBy',
+				type: 'options',
+				description:
+					'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
+				typeOptions: {
+					loadOptionsMethod: 'getContactProperties',
+				},
+				default: 'createdate',
+			},
+		],
+	},
+];
diff --git a/packages/nodes-base/nodes/Hubspot/V2/ContactListDescription.ts b/packages/nodes-base/nodes/Hubspot/V2/ContactListDescription.ts
new file mode 100644
index 0000000000000..2f52c06956f56
--- /dev/null
+++ b/packages/nodes-base/nodes/Hubspot/V2/ContactListDescription.ts
@@ -0,0 +1,131 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+export const contactListOperations: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				resource: ['contactList'],
+			},
+		},
+		options: [
+			{
+				name: 'Add',
+				value: 'add',
+				description: 'Add contact to a list',
+				action: 'Add a contact to a list',
+			},
+			{
+				name: 'Remove',
+				value: 'remove',
+				description: 'Remove a contact from a list',
+				action: 'Remove a contact from a list',
+			},
+		],
+		default: 'add',
+	},
+];
+
+export const contactListFields: INodeProperties[] = [
+	/* -------------------------------------------------------------------------- */
+	/*                                contactList:add                             */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'By',
+		name: 'by',
+		type: 'options',
+		options: [
+			{
+				name: 'Contact ID',
+				value: 'id',
+			},
+			{
+				name: 'Email',
+				value: 'email',
+			},
+		],
+		required: true,
+		displayOptions: {
+			show: {
+				resource: ['contactList'],
+				operation: ['add'],
+			},
+		},
+		default: 'email',
+	},
+	{
+		displayName: 'Email',
+		name: 'email',
+		type: 'string',
+		placeholder: 'name@email.com',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: ['contactList'],
+				operation: ['add'],
+				by: ['email'],
+			},
+		},
+		default: '',
+	},
+	{
+		displayName: 'Contact to Add',
+		name: 'id',
+		type: 'number',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: ['contactList'],
+				operation: ['add'],
+				by: ['id'],
+			},
+		},
+		default: '',
+	},
+	{
+		displayName: 'List to Add To',
+		name: 'listId',
+		type: 'number',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: ['contactList'],
+				operation: ['add'],
+			},
+		},
+		default: '',
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                contactList:remove                          */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Contact to Remove',
+		name: 'id',
+		type: 'number',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: ['contactList'],
+				operation: ['remove'],
+			},
+		},
+		default: '',
+	},
+	{
+		displayName: 'List to Remove From',
+		name: 'listId',
+		type: 'number',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: ['contactList'],
+				operation: ['remove'],
+			},
+		},
+		default: '',
+	},
+];
diff --git a/packages/nodes-base/nodes/Hubspot/V2/DealDescription.ts b/packages/nodes-base/nodes/Hubspot/V2/DealDescription.ts
new file mode 100644
index 0000000000000..ad28d00d0ef22
--- /dev/null
+++ b/packages/nodes-base/nodes/Hubspot/V2/DealDescription.ts
@@ -0,0 +1,1043 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+export const dealOperations: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				resource: ['deal'],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a deal',
+				action: 'Create a deal',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a deal',
+				action: 'Delete a deal',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get a deal',
+				action: 'Get a deal',
+			},
+			{
+				name: 'Get Many',
+				value: 'getAll',
+				description: 'Get many deals',
+				action: 'Get many deals',
+			},
+			{
+				name: 'Get Recently Created/Updated',
+				value: 'getRecentlyCreatedUpdated',
+				description: 'Get recently created/updated deals',
+				action: 'Get recently created/updated deals',
+			},
+			{
+				name: 'Search',
+				value: 'search',
+				description: 'Search deals',
+				action: 'Search for deals',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update a deal',
+				action: 'Update a deal',
+			},
+		],
+		default: 'create',
+	},
+];
+
+export const dealFields: INodeProperties[] = [
+	/* -------------------------------------------------------------------------- */
+	/*                                deal:create                                 */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Deal Stage Name or ID',
+		name: 'stage',
+		type: 'options',
+		required: true,
+		typeOptions: {
+			loadOptionsMethod: 'getDealStages',
+		},
+		displayOptions: {
+			show: {
+				resource: ['deal'],
+				operation: ['create'],
+			},
+		},
+		default: '',
+		options: [],
+		description:
+			'The deal stage is required when creating a deal. See the CRM Pipelines API for details on managing pipelines and stages. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+	},
+	{
+		displayName: 'Deal Properties',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['deal'],
+				operation: ['create'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Amount',
+				name: 'amount',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Associated Company Names or IDs',
+				name: 'associatedCompany',
+				type: 'multiOptions',
+				description:
+					'Whether to include specific Associated Company properties in the returned results. Choose from a list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>. Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+				typeOptions: {
+					loadOptionsMethod: 'getCompanies',
+				},
+				default: [],
+			},
+			{
+				displayName: 'Associated Vid Names or IDs',
+				name: 'associatedVids',
+				type: 'multiOptions',
+				description:
+					'Whether to include specific Associated Vid in the returned results. Choose from a list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>. Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+				typeOptions: {
+					loadOptionsMethod: 'getContacts',
+				},
+				default: [],
+			},
+			{
+				displayName: 'Close Date',
+				name: 'closeDate',
+				type: 'dateTime',
+				default: '',
+				description:
+					'When using expressions, the time should be specified in YYYY-MM-DD hh-mm-ss format',
+			},
+			{
+				displayName: 'Custom Properties',
+				name: 'customPropertiesUi',
+				placeholder: 'Add Custom Property',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: true,
+				},
+				default: {},
+				options: [
+					{
+						name: 'customPropertiesValues',
+						displayName: 'Custom Property',
+						values: [
+							{
+								displayName: 'Property Name or ID',
+								name: 'property',
+								type: 'options',
+								typeOptions: {
+									loadOptionsMethod: 'getDealCustomProperties',
+								},
+								default: '',
+								description:
+									'Name of the property. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+							},
+							{
+								displayName: 'Value',
+								name: 'value',
+								type: 'string',
+								default: '',
+								required: true,
+								description: 'Value of the property',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Deal Description',
+				name: 'description',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Deal Name',
+				name: 'dealName',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Deal Owner',
+				name: 'dealOwner',
+				type: 'resourceLocator',
+				default: { mode: 'list', value: '' },
+				modes: [
+					{
+						displayName: 'From List',
+						name: 'list',
+						type: 'list',
+						placeholder: 'Select from the list',
+						typeOptions: {
+							searchListMethod: 'searchOwners',
+						},
+					},
+					{
+						displayName: 'By Id',
+						name: 'id',
+						type: 'string',
+						placeholder: '58539222',
+						validation: [
+							{
+								type: 'regex',
+								properties: {
+									regex: '[0-9]+',
+									errorMessage: 'Not a valid HubSpot Owner ID',
+								},
+							},
+						],
+					},
+				],
+				description: 'The HubSpot user to be assigned to the deal',
+			},
+			{
+				displayName: 'Deal Type Name or ID',
+				name: 'dealType',
+				type: 'options',
+				description:
+					'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
+				typeOptions: {
+					loadOptionsMethod: 'getDealTypes',
+				},
+				default: '',
+			},
+			{
+				displayName: 'Pipeline Name or ID',
+				name: 'pipeline',
+				type: 'options',
+				description:
+					'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
+				typeOptions: {
+					loadOptionsMethod: 'getDealPipelines',
+				},
+				default: '',
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                 deal:update                                */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Deal to Update',
+		name: 'dealId',
+		type: 'resourceLocator',
+		default: { mode: 'list', value: '' },
+		required: true,
+		displayOptions: {
+			show: {
+				resource: ['deal'],
+				operation: ['update'],
+			},
+		},
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				placeholder: 'Select from the list',
+				typeOptions: {
+					searchListMethod: 'searchDeals',
+					searchable: true,
+				},
+			},
+			{
+				displayName: 'By Id',
+				name: 'id',
+				type: 'string',
+				placeholder: '58539222',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex: '[0-9]+',
+							errorMessage: 'Not a valid HubSpot Deal ID',
+						},
+					},
+				],
+			},
+		],
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		placeholder: 'Add Update Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['deal'],
+				operation: ['update'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Amount',
+				name: 'amount',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Close Date',
+				name: 'closeDate',
+				type: 'dateTime',
+				default: '',
+				description:
+					'When using expressions, the time should be specified in YYYY-MM-DD hh-mm-ss format',
+			},
+			{
+				displayName: 'Custom Properties',
+				name: 'customPropertiesUi',
+				placeholder: 'Add Custom Property',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: true,
+				},
+				default: {},
+				options: [
+					{
+						name: 'customPropertiesValues',
+						displayName: 'Custom Property',
+						values: [
+							{
+								displayName: 'Property Name or ID',
+								name: 'property',
+								type: 'options',
+								typeOptions: {
+									loadOptionsMethod: 'getDealCustomProperties',
+								},
+								default: '',
+								description:
+									'Name of the property. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+							},
+							{
+								displayName: 'Value',
+								name: 'value',
+								type: 'string',
+								default: '',
+								required: true,
+								description: 'Value of the property',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Deal Description',
+				name: 'description',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Deal Name',
+				name: 'dealName',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Deal Owner',
+				name: 'dealOwner',
+				type: 'resourceLocator',
+				default: { mode: 'list', value: '' },
+				modes: [
+					{
+						displayName: 'From List',
+						name: 'list',
+						type: 'list',
+						placeholder: 'Select from the list',
+						typeOptions: {
+							searchListMethod: 'searchOwners',
+						},
+					},
+					{
+						displayName: 'By Id',
+						name: 'id',
+						type: 'string',
+						placeholder: '58539222',
+						validation: [
+							{
+								type: 'regex',
+								properties: {
+									regex: '[0-9]+',
+									errorMessage: 'Not a valid HubSpot Owner ID',
+								},
+							},
+						],
+					},
+				],
+				description: 'The HubSpot user to be assigned to the deal',
+			},
+			{
+				displayName: 'Deal Stage Name or ID',
+				name: 'stage',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getDealStages',
+				},
+				default: '',
+				description:
+					'The deal stage is required when creating a deal. See the CRM Pipelines API for details on managing pipelines and stages. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Deal Type Name or ID',
+				name: 'dealType',
+				type: 'options',
+				description:
+					'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
+				typeOptions: {
+					loadOptionsMethod: 'getDealTypes',
+				},
+				default: '',
+			},
+			{
+				displayName: 'Pipeline',
+				name: 'pipeline',
+				type: 'string',
+				default: '',
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                  deal:get                                  */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Deal to Get',
+		name: 'dealId',
+		type: 'resourceLocator',
+		default: { mode: 'list', value: '' },
+		required: true,
+		displayOptions: {
+			show: {
+				resource: ['deal'],
+				operation: ['get'],
+			},
+		},
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				placeholder: 'Select from the list',
+				typeOptions: {
+					searchListMethod: 'searchDeals',
+					searchable: true,
+				},
+			},
+			{
+				displayName: 'By Id',
+				name: 'id',
+				type: 'string',
+				placeholder: '58539222',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex: '[0-9]+',
+							errorMessage: 'Not a valid HubSpot Deal ID',
+						},
+					},
+				],
+			},
+		],
+	},
+	{
+		displayName: 'Filters',
+		name: 'filters',
+		type: 'collection',
+		placeholder: 'Add Filter',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['deal'],
+				operation: ['get'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Include Property Versions',
+				name: 'includePropertyVersions',
+				type: 'boolean',
+				default: false,
+				// eslint-disable-next-line n8n-nodes-base/node-param-description-boolean-without-whether
+				description:
+					'By default, you will only get data for the most recent version of a property in the "versions" data. If you include this parameter, you will get data for all previous versions.',
+			},
+			{
+				displayName: 'Deal Properties to Include',
+				name: 'propertiesCollection',
+				type: 'fixedCollection',
+				default: {},
+				options: [
+					{
+						name: 'propertiesValues',
+						displayName: 'Deal Properties to Include',
+						values: [
+							{
+								displayName: 'Deal Properties to Include',
+								name: 'properties',
+								type: 'multiOptions',
+								typeOptions: {
+									loadOptionsMethod: 'getDealProperties',
+								},
+								default: [],
+								description:
+									'Whether to include specific Deal properties in the returned results. Choose from a list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>. Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+							},
+							{
+								displayName: 'Include',
+								name: 'propertyMode',
+								type: 'options',
+								options: [
+									{
+										name: 'Value And History',
+										value: 'valueAndHistory',
+									},
+									{
+										name: 'Value Only',
+										value: 'valueOnly',
+									},
+								],
+								default: 'valueAndHistory',
+								description:
+									'Specify if the current value for a property should be fetched, or the value and all the historical values for that property',
+							},
+						],
+					},
+				],
+				description:
+					'<p>Used to include specific deal properties in the results. By default, the results will only include Deal ID and will not include the values for any properties for your Deals.</p><p>Including this parameter will include the data for the specified property in the results. You can include this parameter multiple times to request multiple properties separated by a comma: <code>,</code>.</p>. Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+		],
+	},
+	/* -------------------------------------------------------------------------- */
+	/*                                 deal:getAll                                */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: ['deal'],
+				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: ['deal'],
+				operation: ['getAll'],
+				returnAll: [false],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 250,
+		},
+		default: 100,
+		description: 'Max number of results to return',
+	},
+	{
+		displayName: 'Options',
+		name: 'filters',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['deal'],
+				operation: ['getAll'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Include Associations',
+				name: 'includeAssociations',
+				type: 'boolean',
+				default: false,
+				description:
+					'Whether to include the IDs of the associated contacts and companies in the results. This will also automatically include the num_associated_contacts property.',
+			},
+			{
+				displayName: 'Deal Properties to Include',
+				name: 'properties',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getDealProperties',
+				},
+				default: [],
+				// eslint-disable-next-line n8n-nodes-base/node-param-description-wrong-for-dynamic-multi-options
+				description:
+					'Include specific deal properties in the results. By default, the results will only include Deal ID and will not include the values for any properties for your Deals.',
+				displayOptions: {
+					show: {
+						'@version': [{ _cnd: { gt: 2 } }],
+					},
+				},
+			},
+			{
+				displayName: 'Deal Properties with History to Include',
+				name: 'propertiesWithHistory',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getDealProperties',
+				},
+				default: [],
+				// eslint-disable-next-line n8n-nodes-base/node-param-description-wrong-for-dynamic-multi-options
+				description:
+					'Works similarly to properties, but this parameter will include the history for the specified property',
+				displayOptions: {
+					show: {
+						'@version': [{ _cnd: { gt: 2 } }],
+					},
+				},
+			},
+			{
+				displayName: 'Deal Properties to Include',
+				name: 'propertiesCollection',
+				type: 'fixedCollection',
+				default: {},
+				options: [
+					{
+						name: 'propertiesValues',
+						displayName: 'Deal Properties to Include',
+						values: [
+							{
+								displayName: 'Deal Properties to Include',
+								name: 'properties',
+								type: 'multiOptions',
+								typeOptions: {
+									loadOptionsMethod: 'getDealProperties',
+								},
+								default: [],
+								description:
+									'Whether to include specific Deal properties in the returned results. Choose from a list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>. Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+							},
+							{
+								displayName: 'Include',
+								name: 'propertyMode',
+								type: 'options',
+								options: [
+									{
+										name: 'Value And History',
+										value: 'valueAndHistory',
+									},
+									{
+										name: 'Value Only',
+										value: 'valueOnly',
+									},
+								],
+								default: 'valueAndHistory',
+								description:
+									'Specify if the current value for a property should be fetched, or the value and all the historical values for that property',
+							},
+						],
+					},
+				],
+				description:
+					'<p>Used to include specific deal properties in the results. By default, the results will only include Deal ID and will not include the values for any properties for your Deals.</p><p>Including this parameter will include the data for the specified property in the results. You can include this parameter multiple times to request multiple properties separated by a comma: <code>,</code>.</p>. Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+				displayOptions: {
+					show: {
+						'@version': [2],
+					},
+				},
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                 deal:delete                                */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Deal to Delete',
+		name: 'dealId',
+		type: 'resourceLocator',
+		default: { mode: 'list', value: '' },
+		required: true,
+		displayOptions: {
+			show: {
+				resource: ['deal'],
+				operation: ['delete'],
+			},
+		},
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				placeholder: 'Select from the list',
+				typeOptions: {
+					searchListMethod: 'searchDeals',
+					searchable: true,
+				},
+			},
+			{
+				displayName: 'By Id',
+				name: 'id',
+				type: 'string',
+				placeholder: '58539222',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex: '[0-9]+',
+							errorMessage: 'Not a valid HubSpot Deal ID',
+						},
+					},
+				],
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*               deal:getRecentDeals            */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: ['deal'],
+				operation: ['getRecentlyCreatedUpdated'],
+			},
+		},
+		default: false,
+		description: 'Whether to return all results or only up to a given limit',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				resource: ['deal'],
+				operation: ['getRecentlyCreatedUpdated'],
+				returnAll: [false],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 250,
+		},
+		default: 100,
+		description: 'Max number of results to return',
+	},
+	{
+		displayName: 'Options',
+		name: 'filters',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['deal'],
+				operation: ['getRecentlyCreatedUpdated'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Since',
+				name: 'since',
+				type: 'dateTime',
+				default: '',
+				description:
+					'Only return deals created after timestamp x. When using expressions, the time should be specified in YYYY-MM-DD hh-mm-ss format.',
+			},
+			{
+				displayName: 'Include Property Versions',
+				name: 'includePropertyVersions',
+				type: 'boolean',
+				default: false,
+				// eslint-disable-next-line n8n-nodes-base/node-param-description-boolean-without-whether
+				description:
+					'By default, you will only get data for the most recent version of a property in the "versions" data. If you include this parameter, you will get data for all previous versions.',
+			},
+		],
+	},
+
+	/*--------------------------------------------------------------------------- */
+	/*                                 deal:search                                */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: ['deal'],
+				operation: ['search'],
+			},
+		},
+		default: false,
+		description: 'Whether to return all results or only up to a given limit',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				resource: ['deal'],
+				operation: ['search'],
+				returnAll: [false],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 250,
+		},
+		default: 100,
+		description: 'Max number of results to return',
+	},
+	{
+		displayName: 'Filter Groups',
+		name: 'filterGroupsUi',
+		type: 'fixedCollection',
+		default: {},
+		placeholder: 'Add Filter Group',
+		typeOptions: {
+			multipleValues: true,
+		},
+		displayOptions: {
+			show: {
+				resource: ['deal'],
+				operation: ['search'],
+			},
+		},
+		options: [
+			{
+				name: 'filterGroupsValues',
+				displayName: 'Filter Group',
+				values: [
+					{
+						displayName: 'Filters',
+						name: 'filtersUi',
+						type: 'fixedCollection',
+						default: {},
+						placeholder: 'Add Filter',
+						typeOptions: {
+							multipleValues: true,
+						},
+						options: [
+							{
+								name: 'filterValues',
+								displayName: 'Filter',
+								values: [
+									{
+										displayName: 'Property Name or ID',
+										name: 'propertyName',
+										type: 'options',
+										description:
+											'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
+										typeOptions: {
+											loadOptionsMethod: 'getDealProperties',
+										},
+										default: '',
+									},
+									{
+										displayName: 'Type',
+										name: 'type',
+										type: 'hidden',
+										default: '={{$parameter["&propertyName"].split("|")[1]}}',
+									},
+									{
+										displayName: 'Operator',
+										name: 'operator',
+										type: 'options',
+										displayOptions: {
+											hide: {
+												type: ['number'],
+											},
+										},
+										options: [
+											{
+												name: 'Contains Exactly',
+												value: 'CONTAINS_TOKEN',
+											},
+											{
+												name: 'Equal',
+												value: 'EQ',
+											},
+											{
+												name: 'Is Known',
+												value: 'HAS_PROPERTY',
+											},
+											{
+												name: 'Is Unknown',
+												value: 'NOT_HAS_PROPERTY',
+											},
+											{
+												name: 'Not Equal',
+												value: 'NEQ',
+											},
+										],
+										default: 'EQ',
+									},
+									{
+										displayName: 'Operator',
+										name: 'operator',
+										type: 'options',
+										displayOptions: {
+											show: {
+												type: ['number'],
+											},
+										},
+										options: [
+											{
+												name: 'Contains Exactly',
+												value: 'CONTAINS_TOKEN',
+											},
+											{
+												name: 'Equal',
+												value: 'EQ',
+											},
+											{
+												name: 'Greater Than',
+												value: 'GT',
+											},
+											{
+												name: 'Greater Than Or Equal',
+												value: 'GTE',
+											},
+											{
+												name: 'Is Known',
+												value: 'HAS_PROPERTY',
+											},
+											{
+												name: 'Is Unknown',
+												value: 'NOT_HAS_PROPERTY',
+											},
+											{
+												name: 'Less Than',
+												value: 'LT',
+											},
+											{
+												name: 'Less Than Or Equal',
+												value: 'LTE',
+											},
+											{
+												name: 'Not Equal',
+												value: 'NEQ',
+											},
+										],
+										default: 'EQ',
+									},
+									{
+										displayName: 'Value',
+										name: 'value',
+										displayOptions: {
+											hide: {
+												operator: ['HAS_PROPERTY', 'NOT_HAS_PROPERTY'],
+											},
+										},
+										required: true,
+										type: 'string',
+										default: '',
+									},
+								],
+							},
+						],
+						description:
+							'Use filters to limit the results to only CRM objects with matching property values. More info <a href="https://developers.hubspot.com/docs/api/crm/search">here</a>.',
+					},
+				],
+			},
+		],
+		description:
+			'When multiple filters are provided within a Filter Group, they will be combined using a logical AND operator. When multiple Filter Groups are provided, they will be combined using a logical OR operator. The system supports a maximum of three Filter Groups with up to three filters each. More info <a href="https://developers.hubspot.com/docs/api/crm/search">here</a>',
+	},
+	{
+		displayName: 'Options',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['deal'],
+				operation: ['search'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Direction',
+				name: 'direction',
+				type: 'options',
+				options: [
+					{
+						name: 'Ascending',
+						value: 'ASCENDING',
+					},
+					{
+						name: 'Descending',
+						value: 'DESCENDING',
+					},
+				],
+				default: 'DESCENDING',
+				description:
+					'Defines the direction in which search results are ordered. Default value is Descending.',
+			},
+			{
+				displayName: 'Field Names or IDs',
+				name: 'properties',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getDealProperties',
+				},
+				default: [],
+				description:
+					'Whether to include specific Deal properties in the returned results. Choose from a list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>. Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Query',
+				name: 'query',
+				type: 'string',
+				default: '',
+				description: 'Perform a text search against all property values for an object type',
+			},
+			{
+				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-options
+				displayName: 'Sort By',
+				name: 'sortBy',
+				type: 'options',
+				description:
+					'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
+				typeOptions: {
+					loadOptionsMethod: 'getDealProperties',
+				},
+				default: 'createdate',
+			},
+		],
+	},
+];
diff --git a/packages/nodes-base/nodes/Hubspot/V2/DealInterface.ts b/packages/nodes-base/nodes/Hubspot/V2/DealInterface.ts
new file mode 100644
index 0000000000000..b3d5d1d0c050a
--- /dev/null
+++ b/packages/nodes-base/nodes/Hubspot/V2/DealInterface.ts
@@ -0,0 +1,11 @@
+import type { IDataObject } from 'n8n-workflow';
+
+export interface IAssociation {
+	associatedCompanyIds?: number[];
+	associatedVids?: number[];
+}
+
+export interface IDeal {
+	associations?: IAssociation;
+	properties?: IDataObject[];
+}
diff --git a/packages/nodes-base/nodes/Hubspot/V2/EngagementDescription.ts b/packages/nodes-base/nodes/Hubspot/V2/EngagementDescription.ts
new file mode 100644
index 0000000000000..7ae6f4b449b30
--- /dev/null
+++ b/packages/nodes-base/nodes/Hubspot/V2/EngagementDescription.ts
@@ -0,0 +1,543 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+export const engagementOperations: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				resource: ['engagement'],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create an engagement',
+				action: 'Create an engagement',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete an engagement',
+				action: 'Delete an engagement',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get an engagement',
+				action: 'Get an engagement',
+			},
+			{
+				name: 'Get Many',
+				value: 'getAll',
+				description: 'Get many engagements',
+				action: 'Get many engagements',
+			},
+		],
+		default: 'create',
+	},
+];
+
+export const engagementFields: INodeProperties[] = [
+	/* -------------------------------------------------------------------------- */
+	/*                                engagement:create                           */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Type',
+		name: 'type',
+		type: 'options',
+		required: true,
+		options: [
+			{
+				name: 'Call',
+				value: 'call',
+			},
+			{
+				name: 'Email',
+				value: 'email',
+			},
+			{
+				name: 'Meeting',
+				value: 'meeting',
+			},
+			{
+				name: 'Task',
+				value: 'task',
+			},
+		],
+		displayOptions: {
+			show: {
+				resource: ['engagement'],
+				operation: ['create'],
+			},
+		},
+		default: '',
+	},
+	{
+		displayName: 'Metadata',
+		name: 'metadata',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['engagement'],
+				operation: ['create'],
+				type: ['task'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Body',
+				name: 'body',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'For Object Type',
+				name: 'forObjectType',
+				type: 'options',
+				options: [
+					{
+						name: 'Company',
+						value: 'COMPANY',
+					},
+					{
+						name: 'Contact',
+						value: 'CONTACT',
+					},
+				],
+				default: '',
+			},
+			{
+				displayName: 'Status',
+				name: 'status',
+				type: 'options',
+				options: [
+					{
+						name: 'Completed',
+						value: 'COMPLETED',
+					},
+					{
+						name: 'Deferred',
+						value: 'DEFERRED',
+					},
+					{
+						name: 'In Progress',
+						value: 'IN_PROGRESS',
+					},
+					{
+						name: 'Not Started',
+						value: 'NOT_STARTED',
+					},
+					{
+						name: 'Waiting',
+						value: 'WAITING',
+					},
+				],
+				default: '',
+			},
+			{
+				displayName: 'Subject',
+				name: 'subject',
+				type: 'string',
+				default: '',
+			},
+		],
+	},
+	{
+		displayName: 'Metadata',
+		name: 'metadata',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['engagement'],
+				operation: ['create'],
+				type: ['email'],
+			},
+		},
+		options: [
+			{
+				displayName: 'BCC',
+				name: 'bcc',
+				type: 'string',
+				typeOptions: {
+					multipleValues: true,
+					multipleValueButtonText: 'Add BCC',
+				},
+				default: '',
+			},
+			{
+				displayName: 'CC',
+				name: 'cc',
+				type: 'string',
+				typeOptions: {
+					multipleValues: true,
+					multipleValueButtonText: 'Add CC',
+				},
+				default: '',
+			},
+			{
+				displayName: 'From Email',
+				name: 'fromEmail',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'From First Name',
+				name: 'firstName',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'From Last Name',
+				name: 'lastName',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'HTML',
+				name: 'html',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Subject',
+				name: 'subject',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'To Emails',
+				name: 'toEmail',
+				type: 'string',
+				typeOptions: {
+					multipleValues: true,
+					multipleValueButtonText: 'Add Email',
+				},
+				default: '',
+			},
+		],
+	},
+	{
+		displayName: 'Metadata',
+		name: 'metadata',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['engagement'],
+				operation: ['create'],
+				type: ['meeting'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Body',
+				name: 'body',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'End Time',
+				name: 'endTime',
+				type: 'dateTime',
+				default: '',
+				description:
+					'When using expressions, the time should be specified in YYYY-MM-DD hh-mm-ss format',
+			},
+			{
+				displayName: 'Internal Meeting Notes',
+				name: 'internalMeetingNotes',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Start Time',
+				name: 'startTime',
+				type: 'dateTime',
+				default: '',
+				description:
+					'When using expressions, the time should be specified in YYYY-MM-DD hh-mm-ss format',
+			},
+			{
+				displayName: 'Title',
+				name: 'title',
+				type: 'string',
+				default: '',
+			},
+		],
+	},
+	{
+		displayName: 'Metadata',
+		name: 'metadata',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['engagement'],
+				operation: ['create'],
+				type: ['call'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Body',
+				name: 'body',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Duration Milliseconds',
+				name: 'durationMilliseconds',
+				type: 'number',
+				default: 0,
+			},
+			{
+				displayName: 'From Number',
+				name: 'fromNumber',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Recording URL',
+				name: 'recordingUrl',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Status',
+				name: 'status',
+				type: 'options',
+				options: [
+					{
+						name: 'Busy',
+						value: 'BUSY',
+					},
+					{
+						name: 'Calling CRM User',
+						value: 'CALLING_CRM_USER',
+					},
+					{
+						name: 'Canceled',
+						value: 'CANCELED',
+					},
+					{
+						name: 'Completed',
+						value: 'COMPLETED',
+					},
+					{
+						name: 'Connecting',
+						value: 'CONNECTING',
+					},
+					{
+						name: 'Failed',
+						value: 'FAILED',
+					},
+					{
+						name: 'In Progress',
+						value: 'IN_PROGRESS',
+					},
+					{
+						name: 'No Answer',
+						value: 'NO_ANSWER',
+					},
+					{
+						name: 'Queued',
+						value: 'QUEUED',
+					},
+					{
+						name: 'Ringing',
+						value: 'RINGING',
+					},
+				],
+				default: 'QUEUED',
+			},
+			{
+				displayName: 'To Number',
+				name: 'toNumber',
+				type: 'string',
+				default: '',
+			},
+		],
+	},
+	{
+		displayName: 'Engagement Properties',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Property',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['engagement'],
+				operation: ['create'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Associations',
+				name: 'associations',
+				type: 'collection',
+				placeholder: 'Add Field',
+				default: {},
+				options: [
+					{
+						displayName: 'Company IDs',
+						name: 'companyIds',
+						type: 'string',
+						default: '',
+					},
+					{
+						displayName: 'Contact IDs',
+						name: 'contactIds',
+						type: 'string',
+						default: '',
+					},
+					{
+						displayName: 'Deals IDs',
+						name: 'dealIds',
+						type: 'string',
+						default: '',
+					},
+					{
+						displayName: 'Owner IDs',
+						name: 'ownerIds',
+						type: 'string',
+						default: '',
+					},
+					{
+						displayName: 'Ticket IDs',
+						name: 'ticketIds',
+						type: 'string',
+						default: '',
+					},
+				],
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                  engagement:get/delete                     */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Engagement to Get',
+		name: 'engagementId',
+		type: 'resourceLocator',
+		default: { mode: 'list', value: '' },
+		required: true,
+		displayOptions: {
+			show: {
+				resource: ['engagement'],
+				operation: ['get'],
+			},
+		},
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				placeholder: 'Select from the list',
+				typeOptions: {
+					searchListMethod: 'searchEngagements',
+				},
+			},
+			{
+				displayName: 'By Id',
+				name: 'id',
+				type: 'string',
+				placeholder: '58539222',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex: '[0-9]+',
+							errorMessage: 'Not a valid HubSpot Engagement ID',
+						},
+					},
+				],
+			},
+		],
+	},
+
+	{
+		displayName: 'Engagement to Delete',
+		name: 'engagementId',
+		type: 'resourceLocator',
+		default: { mode: 'list', value: '' },
+		required: true,
+		displayOptions: {
+			show: {
+				resource: ['engagement'],
+				operation: ['delete'],
+			},
+		},
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				placeholder: 'Select from the list',
+				typeOptions: {
+					searchListMethod: 'searchEngagements',
+				},
+			},
+			{
+				displayName: 'By Id',
+				name: 'id',
+				type: 'string',
+				placeholder: '58539222',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex: '[0-9]+',
+							errorMessage: 'Not a valid HubSpot Engagement ID',
+						},
+					},
+				],
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                 engagement:getAll                          */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: ['engagement'],
+				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: ['engagement'],
+				operation: ['getAll'],
+				returnAll: [false],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 250,
+		},
+		default: 100,
+		description: 'Max number of results to return',
+	},
+];
diff --git a/packages/nodes-base/nodes/Hubspot/V2/FormDescription.ts b/packages/nodes-base/nodes/Hubspot/V2/FormDescription.ts
new file mode 100644
index 0000000000000..09c12497f5b8b
--- /dev/null
+++ b/packages/nodes-base/nodes/Hubspot/V2/FormDescription.ts
@@ -0,0 +1,315 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+export const formOperations: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				resource: ['form'],
+			},
+		},
+		options: [
+			{
+				name: 'Get Fields',
+				value: 'getFields',
+				description: 'Get all fields from a form',
+				action: 'Get all fields from a form',
+			},
+			{
+				name: 'Submit',
+				value: 'submit',
+				description: 'Submit data to a form',
+				action: 'Submit a form',
+			},
+		],
+		default: 'getFields',
+	},
+];
+
+export const formFields: INodeProperties[] = [
+	/* -------------------------------------------------------------------------- */
+	/*                                form:submit                                 */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Form Name or ID',
+		name: 'formId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getForms',
+		},
+		required: true,
+		displayOptions: {
+			show: {
+				resource: ['form'],
+				operation: ['submit'],
+			},
+		},
+		default: '',
+		description:
+			'The ID of the form you\'re sending data to. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+	},
+	{
+		displayName: 'Options',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['form'],
+				operation: ['submit'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Skip Validation',
+				name: 'skipValidation',
+				type: 'boolean',
+				default: false,
+				description: 'Whether or not to skip validation based on the form settings',
+			},
+			{
+				displayName: 'Submitted At',
+				name: 'submittedAt',
+				type: 'dateTime',
+				default: '',
+				description:
+					'Time of the form submission. When using expressions, the time should be specified in YYYY-MM-DD hh-mm-ss format.',
+			},
+		],
+	},
+	{
+		displayName: 'Context',
+		name: 'contextUi',
+		placeholder: 'Add Context',
+		type: 'fixedCollection',
+		typeOptions: {
+			multipleValues: false,
+		},
+		displayOptions: {
+			show: {
+				resource: ['form'],
+				operation: ['submit'],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Context',
+				name: 'contextValue',
+				values: [
+					{
+						displayName: 'HubSpot Usertoken',
+						name: 'hutk',
+						type: 'string',
+						default: '',
+						description:
+							'Include this parameter and set it to the hubspotutk cookie value to enable cookie tracking on your submission',
+					},
+					{
+						displayName: 'IP Address',
+						name: 'ipAddress',
+						type: 'string',
+						default: '',
+						description: 'The IP address of the visitor filling out the form',
+					},
+					{
+						displayName: 'Page URI',
+						name: 'pageUri',
+						type: 'string',
+						default: '',
+						description: 'The URI of the page the submission happened on',
+					},
+					{
+						displayName: 'Page Name',
+						name: 'pageName',
+						type: 'string',
+						default: '',
+						description: 'The name or title of the page the submission happened on',
+					},
+					{
+						displayName: 'Page ID',
+						name: 'pageId',
+						type: 'number',
+						default: '',
+						description: 'The ID of a page created on the HubSpot CMS',
+					},
+					{
+						displayName: 'SFDC Campaign ID',
+						name: 'sfdcCampaignId',
+						type: 'number',
+						default: '',
+						description:
+							'If the form is for an account using the HubSpot Salesforce Integration, you can include the ID of a Salesforce campaign to add the contact to the specified campaign',
+					},
+					{
+						displayName: 'Go to Webinar Webinar ID',
+						name: 'goToWebinarWebinarKey',
+						type: 'number',
+						default: '',
+						description:
+							'If the form is for an account using the HubSpot GoToWebinar Integration, you can include the ID of a webinar to enroll the contact in that webinar when they submit the form',
+					},
+				],
+			},
+		],
+	},
+	{
+		displayName: 'Legal Consent',
+		name: 'lengalConsentUi',
+		placeholder: 'Add Legal Consent',
+		type: 'fixedCollection',
+		typeOptions: {
+			multipleValues: false,
+		},
+		displayOptions: {
+			show: {
+				resource: ['form'],
+				operation: ['submit'],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Consent',
+				name: 'lengalConsentValues',
+				values: [
+					{
+						displayName: 'Consent To Process',
+						name: 'consentToProcess',
+						type: 'boolean',
+						default: false,
+						description: 'Whether or not the visitor checked the Consent to process checkbox',
+					},
+					{
+						displayName: 'Text',
+						name: 'text',
+						type: 'string',
+						default: '',
+						description: 'The text displayed to the visitor for the Consent to process checkbox',
+					},
+					{
+						displayName: 'Communications',
+						name: 'communicationsUi',
+						placeholder: 'Add Communication',
+						type: 'fixedCollection',
+						typeOptions: {
+							multipleValues: true,
+						},
+						default: {},
+						options: [
+							{
+								displayName: 'Communication',
+								name: 'communicationValues',
+								values: [
+									{
+										displayName: 'Subcription Type Name or ID',
+										name: 'subscriptionTypeId',
+										type: 'options',
+										typeOptions: {
+											loadOptionsMethod: 'getSubscriptionTypes',
+										},
+										default: '',
+										description:
+											'The ID of the specific subscription type. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+									},
+									{
+										displayName: 'Value',
+										name: 'value',
+										type: 'boolean',
+										default: false,
+										description:
+											'Whether or not the visitor checked the checkbox for this subscription type',
+									},
+									{
+										displayName: 'Text',
+										name: 'text',
+										type: 'string',
+										default: '',
+										description:
+											'The text displayed to the visitor for this specific subscription checkbox',
+									},
+								],
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Legitimate Interest',
+				name: 'legitimateInterestValues',
+				values: [
+					{
+						displayName: 'Subcription Type Name or ID',
+						name: 'subscriptionTypeId',
+						type: 'options',
+						typeOptions: {
+							loadOptionsMethod: 'getSubscriptionTypes',
+						},
+						default: '',
+						description:
+							'The ID of the specific subscription type that this forms indicates interest to. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+					},
+					{
+						displayName: 'Value',
+						name: 'value',
+						type: 'boolean',
+						default: false,
+						// eslint-disable-next-line n8n-nodes-base/node-param-description-boolean-without-whether
+						description:
+							"This must be true when using the 'legitimateInterest' option, as it reflects the consent indicated by the visitor when submitting the form",
+					},
+					{
+						displayName: 'Legal Basis',
+						name: 'legalBasis',
+						type: 'options',
+						options: [
+							{
+								name: 'Customer',
+								value: 'CUSTOMER',
+							},
+							{
+								name: 'Lead',
+								value: 'LEAD',
+							},
+						],
+						default: '',
+						description: 'The privacy text displayed to the visitor',
+					},
+					{
+						displayName: 'Text',
+						name: 'text',
+						type: 'string',
+						default: '',
+						description: 'The privacy text displayed to the visitor',
+					},
+				],
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                  form:getFields                            */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Form Name or ID',
+		name: 'formId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getForms',
+		},
+		required: true,
+		displayOptions: {
+			show: {
+				resource: ['form'],
+				operation: ['getFields'],
+			},
+		},
+		default: '',
+		description:
+			'The ID of the form. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+	},
+];
diff --git a/packages/nodes-base/nodes/Hubspot/V2/FormInterface.ts b/packages/nodes-base/nodes/Hubspot/V2/FormInterface.ts
new file mode 100644
index 0000000000000..83f1153cb353a
--- /dev/null
+++ b/packages/nodes-base/nodes/Hubspot/V2/FormInterface.ts
@@ -0,0 +1,21 @@
+import type { IDataObject } from 'n8n-workflow';
+
+export interface IContext {
+	goToWebinarWebinarKey?: string;
+	hutk?: string;
+	ipAddress?: string;
+	pageId?: string;
+	pageName?: string;
+	pageUri?: string;
+	sfdcCampaignId?: string;
+}
+
+export interface IForm {
+	portalId?: number;
+	formId?: string;
+	fields?: IDataObject[];
+	legalConsentOptions?: IDataObject;
+	context?: IContext[];
+	submittedAt?: number;
+	skipValidation?: boolean;
+}
diff --git a/packages/nodes-base/nodes/Hubspot/V2/GenericFunctions.ts b/packages/nodes-base/nodes/Hubspot/V2/GenericFunctions.ts
new file mode 100644
index 0000000000000..c5b255ab6c386
--- /dev/null
+++ b/packages/nodes-base/nodes/Hubspot/V2/GenericFunctions.ts
@@ -0,0 +1,2008 @@
+import type {
+	ICredentialDataDecryptedObject,
+	ICredentialTestFunctions,
+	IDataObject,
+	IExecuteFunctions,
+	IHookFunctions,
+	IHttpRequestMethods,
+	ILoadOptionsFunctions,
+	IRequestOptions,
+	JsonObject,
+} from 'n8n-workflow';
+import { NodeApiError } from 'n8n-workflow';
+
+import moment from 'moment-timezone';
+
+export async function hubspotApiRequest(
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
+	endpoint: string,
+
+	body: any = {},
+	query: IDataObject = {},
+	uri?: string,
+): Promise<any> {
+	let authenticationMethod = this.getNodeParameter('authentication', 0);
+
+	if (this.getNode().type.includes('Trigger')) {
+		authenticationMethod = 'developerApi';
+	}
+
+	const options = {
+		method,
+		qs: query,
+		headers: {},
+		uri: uri || `https://api.hubapi.com${endpoint}`,
+		body,
+		json: true,
+		useQuerystring: true,
+	} satisfies IRequestOptions;
+
+	try {
+		if (authenticationMethod === 'apiKey' || authenticationMethod === 'appToken') {
+			const credentialType = authenticationMethod === 'apiKey' ? 'hubspotApi' : 'hubspotAppToken';
+			return await this.helpers.requestWithAuthentication.call(this, credentialType, options);
+		} else if (authenticationMethod === 'developerApi') {
+			if (endpoint.includes('webhooks')) {
+				const credentials = await this.getCredentials('hubspotDeveloperApi');
+				options.qs.hapikey = credentials.apiKey as string;
+				return await this.helpers.request(options);
+			} else {
+				return await this.helpers.requestOAuth2.call(this, 'hubspotDeveloperApi', options, {
+					tokenType: 'Bearer',
+					includeCredentialsOnRefreshOnBody: true,
+				});
+			}
+		} else {
+			return await this.helpers.requestOAuth2.call(this, 'hubspotOAuth2Api', options, {
+				tokenType: 'Bearer',
+				includeCredentialsOnRefreshOnBody: true,
+			});
+		}
+	} catch (error) {
+		throw new NodeApiError(this.getNode(), error as JsonObject);
+	}
+}
+
+/**
+ * Make an API request to paginated hubspot endpoint
+ * and return all results
+ */
+export async function hubspotApiRequestAllItems(
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
+	propertyName: string,
+	method: IHttpRequestMethods,
+	endpoint: string,
+
+	body: any = {},
+	query: IDataObject = {},
+): Promise<any> {
+	const returnData: IDataObject[] = [];
+
+	let responseData;
+
+	query.limit = query.limit || 250;
+	query.count = 100;
+	body.limit = body.limit || 100;
+
+	do {
+		responseData = await hubspotApiRequest.call(this, method, endpoint, body, query);
+		query.offset = responseData.offset;
+		query.vidOffset = responseData['vid-offset'];
+		//Used by Search endpoints
+		if (responseData.paging) {
+			body.after = responseData.paging.next.after;
+		}
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
+		//ticket:getAll endpoint does not support setting a limit, so return once the limit is reached
+		const limit = query.limit as number | undefined;
+		if (limit && limit <= returnData.length && endpoint.includes('/tickets/paged')) {
+			return returnData;
+		}
+	} while (responseData.hasMore || responseData['has-more'] || responseData.paging);
+	return returnData;
+}
+
+export function validateJSON(json: string | undefined): any {
+	let result;
+	try {
+		result = JSON.parse(json!);
+	} catch (exception) {
+		result = '';
+	}
+	return result;
+}
+
+export function clean(obj: any) {
+	for (const propName in obj) {
+		if (obj[propName] === null || obj[propName] === undefined || obj[propName] === '') {
+			delete obj[propName];
+		}
+	}
+	return obj;
+}
+
+export const propertyEvents = [
+	'contact.propertyChange',
+	'company.propertyChange',
+	'deal.propertyChange',
+];
+
+export const contactFields = [
+	{
+		id: 'company_size',
+		label: 'testingricardo',
+	},
+	{
+		id: 'date',
+		label: 'Date',
+	},
+	{
+		id: 'date_of_birth',
+		label: 'Date of birth',
+	},
+	{
+		id: 'days_to_close',
+		label: 'Days To Close',
+	},
+	{
+		id: 'degree',
+		label: 'Degree',
+	},
+	{
+		id: 'field_of_study',
+		label: 'Field of study',
+	},
+	{
+		id: 'first_conversion_date',
+		label: 'First Conversion Date',
+	},
+	{
+		id: 'first_conversion_event_name',
+		label: 'First Conversion',
+	},
+	{
+		id: 'first_deal_created_date',
+		label: 'First Deal Created Date',
+	},
+	{
+		id: 'gender',
+		label: 'Gender',
+	},
+	{
+		id: 'graduation_date',
+		label: 'Graduation date',
+	},
+	{
+		id: 'hs_additional_emails',
+		label: 'Additional email addresses',
+	},
+	{
+		id: 'hs_all_contact_vids',
+		label: 'All vids for a contact',
+	},
+	{
+		id: 'hs_analytics_first_touch_converting_campaign',
+		label: 'First Touch Converting Campaign',
+	},
+	{
+		id: 'hs_analytics_last_touch_converting_campaign',
+		label: 'Last Touch Converting Campaign',
+	},
+	{
+		id: 'hs_avatar_filemanager_key',
+		label: 'Avatar FileManager key',
+	},
+	{
+		id: 'hs_buying_role',
+		label: 'Buying Role',
+	},
+	{
+		id: 'hs_calculated_form_submissions',
+		label: 'All form submissions for a contact',
+	},
+	{
+		id: 'hs_calculated_merged_vids',
+		label: 'Merged vids with timestamps of a contact',
+	},
+	{
+		id: 'hs_calculated_mobile_number',
+		label: 'Calculated Mobile Number in International Format',
+	},
+	{
+		id: 'hs_calculated_phone_number',
+		label: 'Calculated Phone Number in International Format',
+	},
+	{
+		id: 'hs_calculated_phone_number_area_code',
+		label: 'Calculated Phone Number Area Code',
+	},
+	{
+		id: 'hs_calculated_phone_number_country_code',
+		label: 'Calculated Phone Number Country Code',
+	},
+	{
+		id: 'hs_calculated_phone_number_region_code',
+		label: 'Calculated Phone Number Region',
+	},
+	{
+		id: 'hs_content_membership_email_confirmed',
+		label: 'Email Confirmed',
+	},
+	{
+		id: 'hs_content_membership_notes',
+		label: 'Membership Notes',
+	},
+	{
+		id: 'hs_content_membership_registered_at',
+		label: 'Registered At',
+	},
+	{
+		id: 'hs_content_membership_registration_domain_sent_to',
+		label: 'Domain to which registration email was sent',
+	},
+	{
+		id: 'hs_content_membership_registration_email_sent_at',
+		label: 'Time registration email was sent',
+	},
+	{
+		id: 'hs_content_membership_status',
+		label: 'Status',
+	},
+	{
+		id: 'hs_conversations_visitor_email',
+		label: 'Conversations visitor email',
+	},
+	{
+		id: 'hs_count_is_unworked',
+		label: 'Count of unengaged contacts',
+	},
+	{
+		id: 'hs_count_is_worked',
+		label: 'Count of engaged contacts',
+	},
+	{
+		id: 'hs_created_by_conversations',
+		label: 'Created By Conversations',
+	},
+	{
+		id: 'hs_created_by_user_id',
+		label: 'Created by user ID',
+	},
+	{
+		id: 'hs_createdate',
+		label: 'Object create date/time',
+	},
+	{
+		id: 'hs_document_last_revisited',
+		label: 'Recent Document Revisit Date',
+	},
+	{
+		id: 'hs_email_bad_address',
+		label: 'Invalid email address',
+	},
+	{
+		id: 'hs_email_customer_quarantined_reason',
+		label: 'Email address quarantine reason',
+	},
+	{
+		id: 'hs_email_domain',
+		label: 'Email Domain',
+	},
+	{
+		id: 'hs_email_hard_bounce_reason',
+		label: 'Email hard bounce reason',
+	},
+	{
+		id: 'hs_email_hard_bounce_reason_enum',
+		label: 'Email hard bounce reason',
+	},
+	{
+		id: 'hs_email_quarantined',
+		label: 'Email Address Quarantined',
+	},
+	{
+		id: 'hs_email_quarantined_reason',
+		label: 'Email address internal quarantine reason',
+	},
+	{
+		id: 'hs_email_recipient_fatigue_recovery_time',
+		label: 'Email Address Recipient Fatigue Next Available Sending Time',
+	},
+	{
+		id: 'hs_email_sends_since_last_engagement',
+		label: 'Sends Since Last Engagement',
+	},
+	{
+		id: 'hs_emailconfirmationstatus',
+		label: 'Marketing email confirmation status',
+	},
+	{
+		id: 'hs_facebook_ad_clicked',
+		label: 'Clicked Facebook ad',
+	},
+	{
+		id: 'hs_facebook_click_id',
+		label: 'Facebook click id',
+	},
+	{
+		id: 'hs_facebookid',
+		label: 'Facebook ID',
+	},
+	{
+		id: 'hs_feedback_last_nps_follow_up',
+		label: 'Last NPS survey comment',
+	},
+	{
+		id: 'hs_feedback_last_nps_rating',
+		label: 'Last NPS survey rating',
+	},
+	{
+		id: 'hs_feedback_last_survey_date',
+		label: 'Last NPS survey date',
+	},
+	{
+		id: 'hs_feedback_show_nps_web_survey',
+		label: 'Should be shown an NPS web survey',
+	},
+	{
+		id: 'hs_first_engagement_object_id',
+		label: 'ID of first engagement',
+	},
+	{
+		id: 'hs_google_click_id',
+		label: 'Google ad click id',
+	},
+	{
+		id: 'hs_googleplusid',
+		label: 'googleplus ID',
+	},
+	{
+		id: 'hs_ip_timezone',
+		label: 'IP Timezone',
+	},
+	{
+		id: 'hs_is_contact',
+		label: 'Is a contact',
+	},
+	{
+		id: 'hs_is_unworked',
+		label: 'Contact unworked',
+	},
+	{
+		id: 'hs_last_sales_activity_date',
+		label: 'last sales activity date old',
+	},
+	{
+		id: 'hs_last_sales_activity_timestamp',
+		label: 'Last Engagement Date',
+	},
+	{
+		id: 'hs_lastmodifieddate',
+		label: 'Object last modified date/time',
+	},
+	{
+		id: 'hs_lead_status',
+		label: 'Lead Status',
+	},
+	{
+		id: 'hs_legal_basis',
+		label: "Legal basis for processing contact's data",
+	},
+	{
+		id: 'hs_linkedinid',
+		label: 'Linkedin ID',
+	},
+	{
+		id: 'hs_marketable_reason_id',
+		label: 'Marketing contact status source name',
+	},
+	{
+		id: 'hs_marketable_reason_type',
+		label: 'Marketing contact status source type',
+	},
+	{
+		id: 'hs_marketable_status',
+		label: 'Marketing contact status',
+	},
+	{
+		id: 'hs_marketable_until_renewal',
+		label: 'Marketing contact until next update',
+	},
+	{
+		id: 'hs_merged_object_ids',
+		label: 'Merged object IDs',
+	},
+	{
+		id: 'hs_object_id',
+		label: 'Contact ID',
+	},
+	{
+		id: 'hs_predictivecontactscore_v2',
+		label: 'Likelihood to close',
+	},
+	{
+		id: 'hs_predictivescoringtier',
+		label: 'Contact priority',
+	},
+	{
+		id: 'hs_sa_first_engagement_date',
+		label: 'Date of first engagement',
+	},
+	{
+		id: 'hs_sa_first_engagement_descr',
+		label: 'Description of first engagement',
+	},
+	{
+		id: 'hs_sa_first_engagement_object_type',
+		label: 'Type of first engagement',
+	},
+	{
+		id: 'hs_sales_email_last_clicked',
+		label: 'Recent Sales Email Clicked Date',
+	},
+	{
+		id: 'hs_sales_email_last_opened',
+		label: 'Recent Sales Email Opened Date',
+	},
+	{
+		id: 'hs_searchable_calculated_international_mobile_number',
+		label: 'Calculated Mobile Number with country code',
+	},
+	{
+		id: 'hs_searchable_calculated_international_phone_number',
+		label: 'Calculated Phone Number with country code',
+	},
+	{
+		id: 'hs_searchable_calculated_mobile_number',
+		label: 'Calculated Mobile Number without country code',
+	},
+	{
+		id: 'hs_searchable_calculated_phone_number',
+		label: 'Calculated Phone Number without country code',
+	},
+	{
+		id: 'hs_sequences_is_enrolled',
+		label: 'Currently in Sequence',
+	},
+	{
+		id: 'hs_testpurge',
+		label: 'testpurge',
+	},
+	{
+		id: 'hs_testrollback',
+		label: 'testrollback',
+	},
+	{
+		id: 'hs_time_between_contact_creation_and_deal_close',
+		label: 'Time between contact creation and deal close',
+	},
+	{
+		id: 'hs_time_between_contact_creation_and_deal_creation',
+		label: 'Time between contact creation and deal creation',
+	},
+	{
+		id: 'hs_time_to_first_engagement',
+		label: 'Lead response time',
+	},
+	{
+		id: 'hs_time_to_move_from_lead_to_customer',
+		label: 'Time to move from lead to customer',
+	},
+	{
+		id: 'hs_time_to_move_from_marketingqualifiedlead_to_customer',
+		label: 'Time to move from marketing qualified lead to customer',
+	},
+	{
+		id: 'hs_time_to_move_from_opportunity_to_customer',
+		label: 'Time to move from opportunity to customer',
+	},
+	{
+		id: 'hs_time_to_move_from_salesqualifiedlead_to_customer',
+		label: 'Time to move from sales qualified lead to customer',
+	},
+	{
+		id: 'hs_time_to_move_from_subscriber_to_customer',
+		label: 'Time to move from subscriber to customer',
+	},
+	{
+		id: 'hs_twitterid',
+		label: 'Twitter ID',
+	},
+	{
+		id: 'hs_updated_by_user_id',
+		label: 'Updated by user ID',
+	},
+	{
+		id: 'hs_user_ids_of_all_owners',
+		label: 'User IDs of all owners',
+	},
+	{
+		id: 'hubspot_owner_assigneddate',
+		label: 'Owner Assigned Date',
+	},
+	{
+		id: 'ip_city',
+		label: 'IP City',
+	},
+	{
+		id: 'ip_country',
+		label: 'IP Country',
+	},
+	{
+		id: 'ip_country_code',
+		label: 'IP Country Code',
+	},
+	{
+		id: 'ip_latlon',
+		label: 'IP Latitude & Longitude',
+	},
+	{
+		id: 'ip_state',
+		label: 'IP State/Region',
+	},
+	{
+		id: 'ip_state_code',
+		label: 'IP State Code/Region Code',
+	},
+	{
+		id: 'ip_zipcode',
+		label: 'IP Zipcode',
+	},
+	{
+		id: 'job_function',
+		label: 'Job function',
+	},
+	{
+		id: 'lastmodifieddate',
+		label: 'Last Modified Date',
+	},
+	{
+		id: 'marital_status',
+		label: 'Marital Status',
+	},
+	{
+		id: 'military_status',
+		label: 'Military status',
+	},
+	{
+		id: 'num_associated_deals',
+		label: 'Associated Deals',
+	},
+	{
+		id: 'num_conversion_events',
+		label: 'Number of Form Submissions',
+	},
+	{
+		id: 'num_unique_conversion_events',
+		label: 'Number of Unique Forms Submitted',
+	},
+	{
+		id: 'recent_conversion_date',
+		label: 'Recent Conversion Date',
+	},
+	{
+		id: 'recent_conversion_event_name',
+		label: 'Recent Conversion',
+	},
+	{
+		id: 'recent_deal_amount',
+		label: 'Recent Deal Amount',
+	},
+	{
+		id: 'recent_deal_close_date',
+		label: 'Recent Deal Close Date',
+	},
+	{
+		id: 'relationship_status',
+		label: 'Relationship Status',
+	},
+	{
+		id: 'school',
+		label: 'School',
+	},
+	{
+		id: 'seniority',
+		label: 'Seniority',
+	},
+	{
+		id: 'start_date',
+		label: 'Start date',
+	},
+	{
+		id: 'testing',
+		label: 'testing',
+	},
+	{
+		id: 'total_revenue',
+		label: 'Total Revenue',
+	},
+	{
+		id: 'work_email',
+		label: 'Work email',
+	},
+	{
+		id: 'firstname',
+		label: 'First Name',
+	},
+	{
+		id: 'hs_analytics_first_url',
+		label: 'First Page Seen',
+	},
+	{
+		id: 'hs_email_delivered',
+		label: 'Marketing emails delivered',
+	},
+	{
+		id: 'hs_email_optout_6871816',
+		label: 'Opted out of email: Marketing Information',
+	},
+	{
+		id: 'hs_email_optout_8363428',
+		label: 'Opted out of email: One to One',
+	},
+	{
+		id: 'twitterhandle',
+		label: 'Twitter Username',
+	},
+	{
+		id: 'currentlyinworkflow',
+		label: 'Currently in workflow',
+	},
+	{
+		id: 'followercount',
+		label: 'Follower Count',
+	},
+	{
+		id: 'hs_analytics_last_url',
+		label: 'Last Page Seen',
+	},
+	{
+		id: 'hs_email_open',
+		label: 'Marketing emails opened',
+	},
+	{
+		id: 'lastname',
+		label: 'Last Name',
+	},
+	{
+		id: 'hs_analytics_num_page_views',
+		label: 'Number of Pageviews',
+	},
+	{
+		id: 'hs_email_click',
+		label: 'Marketing emails clicked',
+	},
+	{
+		id: 'salutation',
+		label: 'Salutation',
+	},
+	{
+		id: 'twitterprofilephoto',
+		label: 'Twitter Profile Photo',
+	},
+	{
+		id: 'email',
+		label: 'Email',
+	},
+	{
+		id: 'hs_analytics_num_visits',
+		label: 'Number of Sessions',
+	},
+	{
+		id: 'hs_email_bounce',
+		label: 'Marketing emails bounced',
+	},
+	{
+		id: 'hs_persona',
+		label: 'Persona',
+	},
+	{
+		id: 'hs_social_last_engagement',
+		label: 'Most Recent Social Click',
+	},
+	{
+		id: 'hs_analytics_num_event_completions',
+		label: 'Number of event completions',
+	},
+	{
+		id: 'hs_email_optout',
+		label: 'Unsubscribed from all email',
+	},
+	{
+		id: 'hs_social_twitter_clicks',
+		label: 'Twitter Clicks',
+	},
+	{
+		id: 'mobilephone',
+		label: 'Mobile Phone Number',
+	},
+	{
+		id: 'phone',
+		label: 'Phone Number',
+	},
+	{
+		id: 'fax',
+		label: 'Fax Number',
+	},
+	{
+		id: 'hs_analytics_first_timestamp',
+		label: 'Time First Seen',
+	},
+	{
+		id: 'hs_email_last_email_name',
+		label: 'Last marketing email name',
+	},
+	{
+		id: 'hs_email_last_send_date',
+		label: 'Last marketing email send date',
+	},
+	{
+		id: 'hs_social_facebook_clicks',
+		label: 'Facebook Clicks',
+	},
+	{
+		id: 'address',
+		label: 'Street Address',
+	},
+	{
+		id: 'engagements_last_meeting_booked',
+		label: 'Date of last meeting booked in meetings tool',
+	},
+	{
+		id: 'engagements_last_meeting_booked_campaign',
+		label: 'Campaign of last booking in meetings tool',
+	},
+	{
+		id: 'engagements_last_meeting_booked_medium',
+		label: 'Medium of last booking in meetings tool',
+	},
+	{
+		id: 'engagements_last_meeting_booked_source',
+		label: 'Source of last booking in meetings tool',
+	},
+	{
+		id: 'hs_analytics_first_visit_timestamp',
+		label: 'Time of First Session',
+	},
+	{
+		id: 'hs_email_last_open_date',
+		label: 'Last marketing email open date',
+	},
+	{
+		id: 'hs_latest_meeting_activity',
+		label: 'Latest meeting activity',
+	},
+	{
+		id: 'hs_sales_email_last_replied',
+		label: 'Recent Sales Email Replied Date',
+	},
+	{
+		id: 'hs_social_linkedin_clicks',
+		label: 'LinkedIn Clicks',
+	},
+	{
+		id: 'hubspot_owner_id',
+		label: 'Contact owner',
+	},
+	{
+		id: 'notes_last_contacted',
+		label: 'Last Contacted',
+	},
+	{
+		id: 'notes_last_updated',
+		label: 'Last Activity Date',
+	},
+	{
+		id: 'notes_next_activity_date',
+		label: 'Next Activity Date',
+	},
+	{
+		id: 'num_contacted_notes',
+		label: 'Number of times contacted',
+	},
+	{
+		id: 'num_notes',
+		label: 'Number of Sales Activities',
+	},
+	{
+		id: 'owneremail',
+		label: 'HubSpot Owner Email (legacy)',
+	},
+	{
+		id: 'ownername',
+		label: 'HubSpot Owner Name (legacy)',
+	},
+	{
+		id: 'surveymonkeyeventlastupdated',
+		label: 'SurveyMonkey Event Last Updated',
+	},
+	{
+		id: 'webinareventlastupdated',
+		label: 'Webinar Event Last Updated',
+	},
+	{
+		id: 'city',
+		label: 'City',
+	},
+	{
+		id: 'hs_analytics_last_timestamp',
+		label: 'Time Last Seen',
+	},
+	{
+		id: 'hs_email_last_click_date',
+		label: 'Last marketing email click date',
+	},
+	{
+		id: 'hs_social_google_plus_clicks',
+		label: 'Google Plus Clicks',
+	},
+	{
+		id: 'hubspot_team_id',
+		label: 'HubSpot Team',
+	},
+	{
+		id: 'linkedinbio',
+		label: 'LinkedIn Bio',
+	},
+	{
+		id: 'twitterbio',
+		label: 'Twitter Bio',
+	},
+	{
+		id: 'hs_all_owner_ids',
+		label: 'All owner ids',
+	},
+	{
+		id: 'hs_analytics_last_visit_timestamp',
+		label: 'Time of Last Session',
+	},
+	{
+		id: 'hs_email_first_send_date',
+		label: 'First marketing email send date',
+	},
+	{
+		id: 'hs_social_num_broadcast_clicks',
+		label: 'Broadcast Clicks',
+	},
+	{
+		id: 'state',
+		label: 'State/Region',
+	},
+	{
+		id: 'hs_all_team_ids',
+		label: 'All team ids',
+	},
+	{
+		id: 'hs_analytics_source',
+		label: 'Original Source',
+	},
+	{
+		id: 'hs_email_first_open_date',
+		label: 'First marketing email open date',
+	},
+	{
+		id: 'zip',
+		label: 'Postal Code',
+	},
+	{
+		id: 'country',
+		label: 'Country/Region',
+	},
+	{
+		id: 'hs_all_accessible_team_ids',
+		label: 'All accessible team ids',
+	},
+	{
+		id: 'hs_analytics_source_data_1',
+		label: 'Original Source Drill-Down 1',
+	},
+	{
+		id: 'hs_email_first_click_date',
+		label: 'First marketing email click date',
+	},
+	{
+		id: 'linkedinconnections',
+		label: 'LinkedIn Connections',
+	},
+	{
+		id: 'hs_analytics_source_data_2',
+		label: 'Original Source Drill-Down 2',
+	},
+	{
+		id: 'hs_email_is_ineligible',
+		label: 'Is globally ineligible',
+	},
+	{
+		id: 'hs_language',
+		label: 'Preferred language',
+	},
+	{
+		id: 'kloutscoregeneral',
+		label: 'Klout Score',
+	},
+	{
+		id: 'hs_analytics_first_referrer',
+		label: 'First Referring Site',
+	},
+	{
+		id: 'hs_email_first_reply_date',
+		label: 'First marketing email reply date',
+	},
+	{
+		id: 'jobtitle',
+		label: 'Job Title',
+	},
+	{
+		id: 'photo',
+		label: 'Photo',
+	},
+	{
+		id: 'hs_analytics_last_referrer',
+		label: 'Last Referring Site',
+	},
+	{
+		id: 'hs_email_last_reply_date',
+		label: 'Last marketing email reply date',
+	},
+	{
+		id: 'message',
+		label: 'Message',
+	},
+	{
+		id: 'closedate',
+		label: 'Close Date',
+	},
+	{
+		id: 'hs_analytics_average_page_views',
+		label: 'Average Pageviews',
+	},
+	{
+		id: 'hs_email_replied',
+		label: 'Marketing emails replied',
+	},
+	{
+		id: 'hs_analytics_revenue',
+		label: 'Event Revenue',
+	},
+	{
+		id: 'hs_lifecyclestage_lead_date',
+		label: 'Became a Lead Date',
+	},
+	{
+		id: 'hs_lifecyclestage_marketingqualifiedlead_date',
+		label: 'Became a Marketing Qualified Lead Date',
+	},
+	{
+		id: 'hs_lifecyclestage_opportunity_date',
+		label: 'Became an Opportunity Date',
+	},
+	{
+		id: 'lifecyclestage',
+		label: 'Lifecycle Stage',
+	},
+	{
+		id: 'hs_lifecyclestage_salesqualifiedlead_date',
+		label: 'Became a Sales Qualified Lead Date',
+	},
+	{
+		id: 'createdate',
+		label: 'Create Date',
+	},
+	{
+		id: 'hs_lifecyclestage_evangelist_date',
+		label: 'Became an Evangelist Date',
+	},
+	{
+		id: 'hs_lifecyclestage_customer_date',
+		label: 'Became a Customer Date',
+	},
+	{
+		id: 'hubspotscore',
+		label: 'HubSpot Score',
+	},
+	{
+		id: 'company',
+		label: 'Company Name',
+	},
+	{
+		id: 'hs_lifecyclestage_subscriber_date',
+		label: 'Became a Subscriber Date',
+	},
+	{
+		id: 'hs_lifecyclestage_other_date',
+		label: 'Became an Other Lifecycle Date',
+	},
+	{
+		id: 'website',
+		label: 'Website URL',
+	},
+	{
+		id: 'numemployees',
+		label: 'Number of Employees',
+	},
+	{
+		id: 'annualrevenue',
+		label: 'Annual Revenue',
+	},
+	{
+		id: 'industry',
+		label: 'Industry',
+	},
+	{
+		id: 'associatedcompanyid',
+		label: 'Associated Company ID',
+	},
+	{
+		id: 'associatedcompanylastupdated',
+		label: 'Associated Company Last Updated',
+	},
+	{
+		id: 'hs_predictivecontactscorebucket',
+		label: 'Lead Rating',
+	},
+	{
+		id: 'hs_predictivecontactscore',
+		label: 'Predictive Lead Score',
+	},
+];
+
+export const companyFields = [
+	{
+		id: 'about_us',
+		label: 'About Us',
+	},
+	{
+		id: 'closedate_timestamp_earliest_value_a2a17e6e',
+		label: 'closedate_timestamp_earliest_value_a2a17e6e',
+	},
+	{
+		id: 'facebookfans',
+		label: 'Facebook Fans',
+	},
+	{
+		id: 'first_contact_createdate_timestamp_earliest_value_78b50eea',
+		label: 'first_contact_createdate_timestamp_earliest_value_78b50eea',
+	},
+	{
+		id: 'first_conversion_date',
+		label: 'First Conversion Date',
+	},
+	{
+		id: 'first_conversion_date_timestamp_earliest_value_61f58f2c',
+		label: 'first_conversion_date_timestamp_earliest_value_61f58f2c',
+	},
+	{
+		id: 'first_conversion_event_name',
+		label: 'First Conversion',
+	},
+	{
+		id: 'first_conversion_event_name_timestamp_earliest_value_68ddae0a',
+		label: 'first_conversion_event_name_timestamp_earliest_value_68ddae0a',
+	},
+	{
+		id: 'first_deal_created_date',
+		label: 'First Deal Created Date',
+	},
+	{
+		id: 'founded_year',
+		label: 'Year Founded',
+	},
+	{
+		id: 'hs_additional_domains',
+		label: 'Additional Domains',
+	},
+	{
+		id: 'hs_analytics_first_timestamp',
+		label: 'Time First Seen',
+	},
+	{
+		id: 'hs_analytics_first_timestamp_timestamp_earliest_value_11e3a63a',
+		label: 'hs_analytics_first_timestamp_timestamp_earliest_value_11e3a63a',
+	},
+	{
+		id: 'hs_analytics_first_touch_converting_campaign',
+		label: 'First Touch Converting Campaign',
+	},
+	{
+		id: 'hs_analytics_first_touch_converting_campaign_timestamp_earliest_value_4757fe10',
+		label: 'hs_analytics_first_touch_converting_campaign_timestamp_earliest_value_4757fe10',
+	},
+	{
+		id: 'hs_analytics_first_visit_timestamp',
+		label: 'Time of First Session',
+	},
+	{
+		id: 'hs_analytics_first_visit_timestamp_timestamp_earliest_value_accc17ae',
+		label: 'hs_analytics_first_visit_timestamp_timestamp_earliest_value_accc17ae',
+	},
+	{
+		id: 'hs_analytics_last_timestamp',
+		label: 'Time Last Seen',
+	},
+	{
+		id: 'hs_analytics_last_timestamp_timestamp_latest_value_4e16365a',
+		label: 'hs_analytics_last_timestamp_timestamp_latest_value_4e16365a',
+	},
+	{
+		id: 'hs_analytics_last_touch_converting_campaign',
+		label: 'Last Touch Converting Campaign',
+	},
+	{
+		id: 'hs_analytics_last_touch_converting_campaign_timestamp_latest_value_81a64e30',
+		label: 'hs_analytics_last_touch_converting_campaign_timestamp_latest_value_81a64e30',
+	},
+	{
+		id: 'hs_analytics_last_visit_timestamp',
+		label: 'Time of Last Session',
+	},
+	{
+		id: 'hs_analytics_last_visit_timestamp_timestamp_latest_value_999a0fce',
+		label: 'hs_analytics_last_visit_timestamp_timestamp_latest_value_999a0fce',
+	},
+	{
+		id: 'hs_analytics_num_page_views',
+		label: 'Number of Pageviews',
+	},
+	{
+		id: 'hs_analytics_num_page_views_cardinality_sum_e46e85b0',
+		label: 'hs_analytics_num_page_views_cardinality_sum_e46e85b0',
+	},
+	{
+		id: 'hs_analytics_num_visits',
+		label: 'Number of Sessions',
+	},
+	{
+		id: 'hs_analytics_num_visits_cardinality_sum_53d952a6',
+		label: 'hs_analytics_num_visits_cardinality_sum_53d952a6',
+	},
+	{
+		id: 'hs_analytics_source',
+		label: 'Original Source Type',
+	},
+	{
+		id: 'hs_analytics_source_data_1',
+		label: 'Original Source Data 1',
+	},
+	{
+		id: 'hs_analytics_source_data_1_timestamp_earliest_value_9b2f1fa1',
+		label: 'hs_analytics_source_data_1_timestamp_earliest_value_9b2f1fa1',
+	},
+	{
+		id: 'hs_analytics_source_data_2',
+		label: 'Original Source Data 2',
+	},
+	{
+		id: 'hs_analytics_source_data_2_timestamp_earliest_value_9b2f9400',
+		label: 'hs_analytics_source_data_2_timestamp_earliest_value_9b2f9400',
+	},
+	{
+		id: 'hs_analytics_source_timestamp_earliest_value_25a3a52c',
+		label: 'hs_analytics_source_timestamp_earliest_value_25a3a52c',
+	},
+	{
+		id: 'hs_avatar_filemanager_key',
+		label: 'Avatar FileManager key',
+	},
+	{
+		id: 'hs_created_by_user_id',
+		label: 'Created by user ID',
+	},
+	{
+		id: 'hs_createdate',
+		label: 'Object create date/time',
+	},
+	{
+		id: 'hs_ideal_customer_profile',
+		label: 'Ideal Customer Profile Tier',
+	},
+	{
+		id: 'hs_is_target_account',
+		label: 'Target Account',
+	},
+	{
+		id: 'hs_last_booked_meeting_date',
+		label: 'Last Booked Meeting Date',
+	},
+	{
+		id: 'hs_last_logged_call_date',
+		label: 'Last Logged Call Date',
+	},
+	{
+		id: 'hs_last_open_task_date',
+		label: 'Last Open Task Date',
+	},
+	{
+		id: 'hs_last_sales_activity_date',
+		label: 'last sales activity date old',
+	},
+	{
+		id: 'hs_last_sales_activity_timestamp',
+		label: 'Last Engagement Date',
+	},
+	{
+		id: 'hs_lastmodifieddate',
+		label: 'Last Modified Date',
+	},
+	{
+		id: 'hs_merged_object_ids',
+		label: 'Merged object IDs',
+	},
+	{
+		id: 'hs_num_blockers',
+		label: 'Number of blockers',
+	},
+	{
+		id: 'hs_num_contacts_with_buying_roles',
+		label: 'Number of contacts with a buying role',
+	},
+	{
+		id: 'hs_num_decision_makers',
+		label: 'Number of decision makers',
+	},
+	{
+		id: 'hs_num_open_deals',
+		label: 'Number of open deals',
+	},
+	{
+		id: 'hs_object_id',
+		label: 'Company ID',
+	},
+	{
+		id: 'hs_predictivecontactscore_v2',
+		label: 'Likelihood to close',
+	},
+	{
+		id: 'hs_predictivecontactscore_v2_next_max_max_d4e58c1e',
+		label: 'hs_predictivecontactscore_v2_next_max_max_d4e58c1e',
+	},
+	{
+		id: 'hs_target_account',
+		label: 'Target Account',
+	},
+	{
+		id: 'hs_target_account_probability',
+		label: 'Target Account Probability',
+	},
+	{
+		id: 'hs_target_account_recommendation_snooze_time',
+		label: 'Target Account Recommendation Snooze Time',
+	},
+	{
+		id: 'hs_target_account_recommendation_state',
+		label: 'Target Account Recommendation State',
+	},
+	{
+		id: 'hs_total_deal_value',
+		label: 'Total open deal value',
+	},
+	{
+		id: 'hs_updated_by_user_id',
+		label: 'Updated by user ID',
+	},
+	{
+		id: 'hs_user_ids_of_all_owners',
+		label: 'User IDs of all owners',
+	},
+	{
+		id: 'hubspot_owner_assigneddate',
+		label: 'Owner Assigned Date',
+	},
+	{
+		id: 'is_public',
+		label: 'Is Public',
+	},
+	{
+		id: 'num_associated_contacts',
+		label: 'Associated Contacts',
+	},
+	{
+		id: 'num_associated_deals',
+		label: 'Associated Deals',
+	},
+	{
+		id: 'num_conversion_events',
+		label: 'Number of Form Submissions',
+	},
+	{
+		id: 'num_conversion_events_cardinality_sum_d095f14b',
+		label: 'num_conversion_events_cardinality_sum_d095f14b',
+	},
+	{
+		id: 'recent_conversion_date',
+		label: 'Recent Conversion Date',
+	},
+	{
+		id: 'recent_conversion_date_timestamp_latest_value_72856da1',
+		label: 'recent_conversion_date_timestamp_latest_value_72856da1',
+	},
+	{
+		id: 'recent_conversion_event_name',
+		label: 'Recent Conversion',
+	},
+	{
+		id: 'recent_conversion_event_name_timestamp_latest_value_66c820bf',
+		label: 'recent_conversion_event_name_timestamp_latest_value_66c820bf',
+	},
+	{
+		id: 'recent_deal_amount',
+		label: 'Recent Deal Amount',
+	},
+	{
+		id: 'recent_deal_close_date',
+		label: 'Recent Deal Close Date',
+	},
+	{
+		id: 'timezone',
+		label: 'Time Zone',
+	},
+	{
+		id: 'total_money_raised',
+		label: 'Total Money Raised',
+	},
+	{
+		id: 'total_revenue',
+		label: 'Total Revenue',
+	},
+	{
+		id: 'name',
+		label: 'Name',
+	},
+	{
+		id: 'owneremail',
+		label: 'HubSpot Owner Email',
+	},
+	{
+		id: 'twitterhandle',
+		label: 'Twitter Handle',
+	},
+	{
+		id: 'ownername',
+		label: 'HubSpot Owner Name',
+	},
+	{
+		id: 'phone',
+		label: 'Phone Number',
+	},
+	{
+		id: 'twitterbio',
+		label: 'Twitter Bio',
+	},
+	{
+		id: 'twitterfollowers',
+		label: 'Twitter Followers',
+	},
+	{
+		id: 'address',
+		label: 'Street Address',
+	},
+	{
+		id: 'address2',
+		label: 'Street Address 2',
+	},
+	{
+		id: 'facebook_company_page',
+		label: 'Facebook Company Page',
+	},
+	{
+		id: 'city',
+		label: 'City',
+	},
+	{
+		id: 'linkedin_company_page',
+		label: 'LinkedIn Company Page',
+	},
+	{
+		id: 'linkedinbio',
+		label: 'LinkedIn Bio',
+	},
+	{
+		id: 'state',
+		label: 'State/Region',
+	},
+	{
+		id: 'googleplus_page',
+		label: 'Google Plus Page',
+	},
+	{
+		id: 'engagements_last_meeting_booked',
+		label: 'Date of last meeting booked in meetings tool',
+	},
+	{
+		id: 'engagements_last_meeting_booked_campaign',
+		label: 'Campaign of last booking in meetings tool',
+	},
+	{
+		id: 'engagements_last_meeting_booked_medium',
+		label: 'Medium of last booking in meetings tool',
+	},
+	{
+		id: 'engagements_last_meeting_booked_source',
+		label: 'Source of last booking in meetings tool',
+	},
+	{
+		id: 'hs_latest_meeting_activity',
+		label: 'Latest meeting activity',
+	},
+	{
+		id: 'hs_sales_email_last_replied',
+		label: 'Recent Sales Email Replied Date',
+	},
+	{
+		id: 'hubspot_owner_id',
+		label: 'Company owner',
+	},
+	{
+		id: 'notes_last_contacted',
+		label: 'Last Contacted',
+	},
+	{
+		id: 'notes_last_updated',
+		label: 'Last Activity Date',
+	},
+	{
+		id: 'notes_next_activity_date',
+		label: 'Next Activity Date',
+	},
+	{
+		id: 'num_contacted_notes',
+		label: 'Number of times contacted',
+	},
+	{
+		id: 'num_notes',
+		label: 'Number of Sales Activities',
+	},
+	{
+		id: 'zip',
+		label: 'Postal Code',
+	},
+	{
+		id: 'country',
+		label: 'Country/Region',
+	},
+	{
+		id: 'hubspot_team_id',
+		label: 'HubSpot Team',
+	},
+	{
+		id: 'hs_all_owner_ids',
+		label: 'All owner ids',
+	},
+	{
+		id: 'website',
+		label: 'Website URL',
+	},
+	{
+		id: 'domain',
+		label: 'Company Domain Name',
+	},
+	{
+		id: 'hs_all_team_ids',
+		label: 'All team ids',
+	},
+	{
+		id: 'hs_all_accessible_team_ids',
+		label: 'All accessible team ids',
+	},
+	{
+		id: 'numberofemployees',
+		label: 'Number of Employees',
+	},
+	{
+		id: 'industry',
+		label: 'Industry',
+	},
+	{
+		id: 'annualrevenue',
+		label: 'Annual Revenue',
+	},
+	{
+		id: 'lifecyclestage',
+		label: 'Lifecycle Stage',
+	},
+	{
+		id: 'hs_lead_status',
+		label: 'Lead Status',
+	},
+	{
+		id: 'hs_parent_company_id',
+		label: 'Parent Company',
+	},
+	{
+		id: 'type',
+		label: 'Type',
+	},
+	{
+		id: 'description',
+		label: 'Description',
+	},
+	{
+		id: 'hs_num_child_companies',
+		label: 'Number of child companies',
+	},
+	{
+		id: 'hubspotscore',
+		label: 'HubSpot Score',
+	},
+	{
+		id: 'createdate',
+		label: 'Create Date',
+	},
+	{
+		id: 'closedate',
+		label: 'Close Date',
+	},
+	{
+		id: 'first_contact_createdate',
+		label: 'First Contact Create Date',
+	},
+	{
+		id: 'days_to_close',
+		label: 'Days to Close',
+	},
+	{
+		id: 'web_technologies',
+		label: 'Web Technologies',
+	},
+];
+
+export const dealFields = [
+	{
+		id: 'amount_in_home_currency',
+		label: 'Amount in company currency',
+	},
+	{
+		id: 'days_to_close',
+		label: 'Days to close',
+	},
+	{
+		id: 'deal_currency_code',
+		label: 'Currency',
+	},
+	{
+		id: 'hs_acv',
+		label: 'Annual contract value',
+	},
+	{
+		id: 'hs_analytics_source',
+		label: 'Original Source Type',
+	},
+	{
+		id: 'hs_analytics_source_data_1',
+		label: 'Original Source Data 1',
+	},
+	{
+		id: 'hs_analytics_source_data_2',
+		label: 'Original Source Data 2',
+	},
+	{
+		id: 'hs_arr',
+		label: 'Annual recurring revenue',
+	},
+	{
+		id: 'hs_campaign',
+		label: 'HubSpot Campaign',
+	},
+	{
+		id: 'hs_closed_amount',
+		label: 'Closed Deal Amount',
+	},
+	{
+		id: 'hs_closed_amount_in_home_currency',
+		label: 'Closed Deal Amount In Home Currency',
+	},
+	{
+		id: 'hs_created_by_user_id',
+		label: 'Created by user ID',
+	},
+	{
+		id: 'hs_date_entered_appointmentscheduled',
+		label: "Date entered 'Appointment Scheduled (Sales Pipeline)'",
+	},
+	{
+		id: 'hs_date_entered_closedlost',
+		label: "Date entered 'Closed Lost (Sales Pipeline)'",
+	},
+	{
+		id: 'hs_date_entered_closedwon',
+		label: "Date entered 'Closed Won (Sales Pipeline)'",
+	},
+	{
+		id: 'hs_date_entered_contractsent',
+		label: "Date entered 'Contract Sent (Sales Pipeline)'",
+	},
+	{
+		id: 'hs_date_entered_decisionmakerboughtin',
+		label: "Date entered 'Decision Maker Bought-In (Sales Pipeline)'",
+	},
+	{
+		id: 'hs_date_entered_presentationscheduled',
+		label: "Date entered 'Presentation Scheduled (Sales Pipeline)'",
+	},
+	{
+		id: 'hs_date_entered_qualifiedtobuy',
+		label: "Date entered 'Qualified To Buy (Sales Pipeline)'",
+	},
+	{
+		id: 'hs_date_exited_appointmentscheduled',
+		label: "Date exited 'Appointment Scheduled (Sales Pipeline)'",
+	},
+	{
+		id: 'hs_date_exited_closedlost',
+		label: "Date exited 'Closed Lost (Sales Pipeline)'",
+	},
+	{
+		id: 'hs_date_exited_closedwon',
+		label: "Date exited 'Closed Won (Sales Pipeline)'",
+	},
+	{
+		id: 'hs_date_exited_contractsent',
+		label: "Date exited 'Contract Sent (Sales Pipeline)'",
+	},
+	{
+		id: 'hs_date_exited_decisionmakerboughtin',
+		label: "Date exited 'Decision Maker Bought-In (Sales Pipeline)'",
+	},
+	{
+		id: 'hs_date_exited_presentationscheduled',
+		label: "Date exited 'Presentation Scheduled (Sales Pipeline)'",
+	},
+	{
+		id: 'hs_date_exited_qualifiedtobuy',
+		label: "Date exited 'Qualified To Buy (Sales Pipeline)'",
+	},
+	{
+		id: 'hs_deal_amount_calculation_preference',
+		label: 'Deal amount calculation preference',
+	},
+	{
+		id: 'hs_deal_stage_probability',
+		label: 'Deal Stage Probability',
+	},
+	{
+		id: 'hs_forecast_amount',
+		label: 'Forecast Amount',
+	},
+	{
+		id: 'hs_forecast_probability',
+		label: 'Forecast Probability',
+	},
+	{
+		id: 'hs_is_closed',
+		label: 'Is Deal Closed?',
+	},
+	{
+		id: 'hs_lastmodifieddate',
+		label: 'Last Modified Date',
+	},
+	{
+		id: 'hs_likelihood_to_close',
+		label: 'Likelihood to close by the close date',
+	},
+	{
+		id: 'hs_line_item_global_term_hs_discount_percentage',
+		label: 'Global Term Line Item Discount Percentage',
+	},
+	{
+		id: 'hs_line_item_global_term_hs_discount_percentage_enabled',
+		label: 'Global Term Line Item Discount Percentage Enabled',
+	},
+	{
+		id: 'hs_line_item_global_term_hs_recurring_billing_period',
+		label: 'Global Term Line Item Recurring Billing Period',
+	},
+	{
+		id: 'hs_line_item_global_term_hs_recurring_billing_period_enabled',
+		label: 'Global Term Line Item Recurring Billing Period Enabled',
+	},
+	{
+		id: 'hs_line_item_global_term_hs_recurring_billing_start_date',
+		label: 'Global Term Line Item Recurring Billing Start Date',
+	},
+	{
+		id: 'hs_line_item_global_term_hs_recurring_billing_start_date_enabled',
+		label: 'Global Term Line Item Recurring Billing Start Date Enabled',
+	},
+	{
+		id: 'hs_line_item_global_term_recurringbillingfrequency',
+		label: 'Global Term Line Item Recurring Billing Frequency',
+	},
+	{
+		id: 'hs_line_item_global_term_recurringbillingfrequency_enabled',
+		label: 'Global Term Line Item Recurring Billing Frequency Enabled',
+	},
+	{
+		id: 'hs_manual_forecast_category',
+		label: 'Forecast category',
+	},
+	{
+		id: 'hs_merged_object_ids',
+		label: 'Merged object IDs',
+	},
+	{
+		id: 'hs_mrr',
+		label: 'Monthly recurring revenue',
+	},
+	{
+		id: 'hs_next_step',
+		label: 'Next step',
+	},
+	{
+		id: 'hs_object_id',
+		label: 'Deal ID',
+	},
+	{
+		id: 'hs_predicted_amount',
+		label: 'The predicted deal amount',
+	},
+	{
+		id: 'hs_predicted_amount_in_home_currency',
+		label: "The predicted deal amount in your company's currency",
+	},
+	{
+		id: 'hs_projected_amount',
+		label: 'Projected Deal Amount',
+	},
+	{
+		id: 'hs_projected_amount_in_home_currency',
+		label: 'Projected Deal Amount in Home Currency',
+	},
+	{
+		id: 'hs_tcv',
+		label: 'Total contract value',
+	},
+	{
+		id: 'hs_time_in_appointmentscheduled',
+		label: "Time in 'Appointment Scheduled (Sales Pipeline)'",
+	},
+	{
+		id: 'hs_time_in_closedlost',
+		label: "Time in 'Closed Lost (Sales Pipeline)'",
+	},
+	{
+		id: 'hs_time_in_closedwon',
+		label: "Time in 'Closed Won (Sales Pipeline)'",
+	},
+	{
+		id: 'hs_time_in_contractsent',
+		label: "Time in 'Contract Sent (Sales Pipeline)'",
+	},
+	{
+		id: 'hs_time_in_decisionmakerboughtin',
+		label: "Time in 'Decision Maker Bought-In (Sales Pipeline)'",
+	},
+	{
+		id: 'hs_time_in_presentationscheduled',
+		label: "Time in 'Presentation Scheduled (Sales Pipeline)'",
+	},
+	{
+		id: 'hs_time_in_qualifiedtobuy',
+		label: "Time in 'Qualified To Buy (Sales Pipeline)'",
+	},
+	{
+		id: 'hs_updated_by_user_id',
+		label: 'Updated by user ID',
+	},
+	{
+		id: 'hs_user_ids_of_all_owners',
+		label: 'User IDs of all owners',
+	},
+	{
+		id: 'hubspot_owner_assigneddate',
+		label: 'Owner Assigned Date',
+	},
+	{
+		id: 'testing',
+		label: 'testing',
+	},
+	{
+		id: 'dealname',
+		label: 'Deal Name',
+	},
+	{
+		id: 'amount',
+		label: 'Amount',
+	},
+	{
+		id: 'dealstage',
+		label: 'Deal Stage',
+	},
+	{
+		id: 'pipeline',
+		label: 'Pipeline',
+	},
+	{
+		id: 'closedate',
+		label: 'Close Date',
+	},
+	{
+		id: 'createdate',
+		label: 'Create Date',
+	},
+	{
+		id: 'engagements_last_meeting_booked',
+		label: 'Date of last meeting booked in meetings tool',
+	},
+	{
+		id: 'engagements_last_meeting_booked_campaign',
+		label: 'Campaign of last booking in meetings tool',
+	},
+	{
+		id: 'engagements_last_meeting_booked_medium',
+		label: 'Medium of last booking in meetings tool',
+	},
+	{
+		id: 'engagements_last_meeting_booked_source',
+		label: 'Source of last booking in meetings tool',
+	},
+	{
+		id: 'hs_latest_meeting_activity',
+		label: 'Latest meeting activity',
+	},
+	{
+		id: 'hs_sales_email_last_replied',
+		label: 'Recent Sales Email Replied Date',
+	},
+	{
+		id: 'hubspot_owner_id',
+		label: 'Deal owner',
+	},
+	{
+		id: 'notes_last_contacted',
+		label: 'Last Contacted',
+	},
+	{
+		id: 'notes_last_updated',
+		label: 'Last Activity Date',
+	},
+	{
+		id: 'notes_next_activity_date',
+		label: 'Next Activity Date',
+	},
+	{
+		id: 'num_contacted_notes',
+		label: 'Number of times contacted',
+	},
+	{
+		id: 'num_notes',
+		label: 'Number of Sales Activities',
+	},
+	{
+		id: 'hs_createdate',
+		label: 'HubSpot Create Date',
+	},
+	{
+		id: 'hubspot_team_id',
+		label: 'HubSpot Team',
+	},
+	{
+		id: 'dealtype',
+		label: 'Deal Type',
+	},
+	{
+		id: 'hs_all_owner_ids',
+		label: 'All owner ids',
+	},
+	{
+		id: 'description',
+		label: 'Deal Description',
+	},
+	{
+		id: 'hs_all_team_ids',
+		label: 'All team ids',
+	},
+	{
+		id: 'hs_all_accessible_team_ids',
+		label: 'All accessible team ids',
+	},
+	{
+		id: 'num_associated_contacts',
+		label: 'Number of Contacts',
+	},
+	{
+		id: 'closed_lost_reason',
+		label: 'Closed Lost Reason',
+	},
+	{
+		id: 'closed_won_reason',
+		label: 'Closed Won Reason',
+	},
+];
+
+const reduceMetadatFields = (data: string[]) => {
+	return data
+		.reduce((a, v) => {
+			//@ts-ignore
+			a.push(...v.split(','));
+			return a;
+		}, [])
+		.map((email) => ({ email }));
+};
+
+export const getEmailMetadata = (meta: IDataObject) => {
+	return {
+		from: {
+			...(meta.fromEmail && { email: meta.fromEmail }),
+			...(meta.firstName && { firstName: meta.firstName }),
+			...(meta.lastName && { lastName: meta.lastName }),
+		},
+		cc: reduceMetadatFields((meta.cc as string[]) || []),
+		bcc: reduceMetadatFields((meta.bcc as string[]) || []),
+		...(meta.subject && { subject: meta.subject }),
+		...(meta.html && { html: meta.html }),
+		...(meta.text && { text: meta.text }),
+	};
+};
+
+export const getTaskMetadata = (meta: IDataObject) => {
+	return {
+		...(meta.body && { body: meta.body }),
+		...(meta.subject && { subject: meta.subject }),
+		...(meta.status && { status: meta.status }),
+		...(meta.forObjectType && { forObjectType: meta.forObjectType }),
+	};
+};
+
+export const getMeetingMetadata = (meta: IDataObject) => {
+	return {
+		...(meta.body && { body: meta.body }),
+		...(meta.startTime && { startTime: moment(meta.startTime as string).unix() }),
+		...(meta.endTime && { endTime: moment(meta.endTime as string).unix() }),
+		...(meta.title && { title: meta.title }),
+		...(meta.internalMeetingNotes && { internalMeetingNotes: meta.internalMeetingNotes }),
+	};
+};
+
+export const getCallMetadata = (meta: IDataObject) => {
+	return {
+		...(meta.toNumber && { toNumber: meta.toNumber }),
+		...(meta.fromNumber && { fromNumber: meta.fromNumber }),
+		...(meta.status && { status: meta.status }),
+		...(meta.durationMilliseconds && { durationMilliseconds: meta.durationMilliseconds }),
+		...(meta.recordingUrl && { recordingUrl: meta.recordingUrl }),
+		...(meta.body && { body: meta.body }),
+	};
+};
+
+export const getAssociations = (associations: {
+	companyIds: string;
+	dealIds: string;
+	ownerIds: string;
+	contactIds: string;
+	ticketIds: string;
+}) => {
+	return {
+		...(associations.companyIds && { companyIds: associations.companyIds.toString().split(',') }),
+		...(associations.contactIds && { contactIds: associations.contactIds.toString().split(',') }),
+		...(associations.dealIds && { dealIds: associations.dealIds.toString().split(',') }),
+		...(associations.ownerIds && { ownerIds: associations.ownerIds.toString().split(',') }),
+		...(associations.ticketIds && { ticketIds: associations.ticketIds.toString().split(',') }),
+	};
+};
+
+export async function validateCredentials(
+	this: ICredentialTestFunctions,
+	decryptedCredentials: ICredentialDataDecryptedObject,
+): Promise<any> {
+	const credentials = decryptedCredentials;
+
+	const { apiKey, appToken } = credentials as {
+		appToken: string;
+		apiKey: string;
+	};
+
+	const options: IRequestOptions = {
+		method: 'GET',
+		headers: {},
+		uri: 'https://api.hubapi.com/deals/v1/deal/paged',
+		json: true,
+	};
+
+	if (apiKey) {
+		options.qs = { hapikey: apiKey };
+	} else {
+		options.headers = { Authorization: `Bearer ${appToken}` };
+	}
+
+	return await this.helpers.request(options);
+}
diff --git a/packages/nodes-base/nodes/Hubspot/V2/HubspotV2.node.ts b/packages/nodes-base/nodes/Hubspot/V2/HubspotV2.node.ts
new file mode 100644
index 0000000000000..35dfe7d4c3b43
--- /dev/null
+++ b/packages/nodes-base/nodes/Hubspot/V2/HubspotV2.node.ts
@@ -0,0 +1,3090 @@
+import type {
+	ICredentialDataDecryptedObject,
+	ICredentialsDecrypted,
+	ICredentialTestFunctions,
+	IDataObject,
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
+	INodeCredentialTestResult,
+	INodeExecutionData,
+	INodeListSearchItems,
+	INodeListSearchResult,
+	INodePropertyOptions,
+	INodeType,
+	INodeTypeBaseDescription,
+	INodeTypeDescription,
+	JsonObject,
+} from 'n8n-workflow';
+import { NodeApiError, NodeOperationError } from 'n8n-workflow';
+
+import { snakeCase } from 'change-case';
+import set from 'lodash/set';
+import { generatePairedItemData } from '../../../utils/utilities';
+import {
+	clean,
+	getAssociations,
+	getCallMetadata,
+	getEmailMetadata,
+	getMeetingMetadata,
+	getTaskMetadata,
+	hubspotApiRequest,
+	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';
+
+export class HubspotV2 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			group: ['output'],
+			version: [2, 2.1],
+			subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+			defaults: {
+				name: 'HubSpot',
+			},
+			inputs: ['main'],
+			outputs: ['main'],
+			credentials: [
+				{
+					name: 'hubspotApi',
+					required: true,
+					testedBy: 'hubspotApiTest',
+					displayOptions: {
+						show: {
+							authentication: ['apiKey'],
+						},
+					},
+				},
+				{
+					name: 'hubspotAppToken',
+					required: true,
+					testedBy: 'hubspotApiTest',
+					displayOptions: {
+						show: {
+							authentication: ['appToken'],
+						},
+					},
+				},
+				{
+					name: 'hubspotOAuth2Api',
+					required: true,
+					displayOptions: {
+						show: {
+							authentication: ['oAuth2'],
+						},
+					},
+				},
+			],
+			properties: [
+				{
+					displayName: 'Authentication',
+					name: 'authentication',
+					type: 'options',
+					options: [
+						{
+							name: 'API Key',
+							value: 'apiKey',
+						},
+						{
+							name: 'APP Token',
+							value: 'appToken',
+						},
+						{
+							name: 'OAuth2',
+							value: 'oAuth2',
+						},
+					],
+					default: 'apiKey',
+				},
+				{
+					displayName: 'Resource',
+					name: 'resource',
+					type: 'options',
+					noDataExpression: true,
+					options: [
+						{
+							name: 'Company',
+							value: 'company',
+						},
+						{
+							name: 'Contact',
+							value: 'contact',
+						},
+						{
+							name: 'Contact List',
+							value: 'contactList',
+						},
+						{
+							name: 'Deal',
+							value: 'deal',
+						},
+						{
+							name: 'Engagement',
+							value: 'engagement',
+						},
+						// {
+						// 	name: 'Form',
+						// 	value: 'form',
+						// },
+						{
+							name: 'Ticket',
+							value: 'ticket',
+						},
+					],
+					default: 'contact',
+				},
+				// CONTACT
+				...contactOperations,
+				...contactFields,
+				// CONTACT LIST
+				...contactListOperations,
+				...contactListFields,
+				// COMPANY
+				...companyOperations,
+				...companyFields,
+				// DEAL
+				...dealOperations,
+				...dealFields,
+				// ENGAGEMENT
+				...engagementOperations,
+				...engagementFields,
+				//! FORM Deprecated
+				//...formOperations,
+				//...formFields,
+				// TICKET
+				...ticketOperations,
+				...ticketFields,
+			],
+		};
+	}
+
+	methods = {
+		credentialTest: {
+			async hubspotApiTest(
+				this: ICredentialTestFunctions,
+				credential: ICredentialsDecrypted,
+			): Promise<INodeCredentialTestResult> {
+				try {
+					await validateCredentials.call(this, credential.data as ICredentialDataDecryptedObject);
+				} catch (error) {
+					const err = error as JsonObject;
+					if (err.statusCode === 401) {
+						return {
+							status: 'Error',
+							message: 'Invalid credentials',
+						};
+					}
+				}
+				return {
+					status: 'OK',
+					message: 'Authentication successful',
+				};
+			},
+		},
+		loadOptions: {
+			/* -------------------------------------------------------------------------- */
+			/*                                 CONTACT                                    */
+			/* -------------------------------------------------------------------------- */
+
+			// Get all the contact lead statuses to display them to user so that they can
+			// select them easily
+			async getContactLeadStatuses(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/properties/v2/contacts/properties';
+				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
+				for (const property of properties) {
+					if (property.name === 'hs_lead_status') {
+						for (const option of property.options) {
+							const statusName = option.label;
+							const statusId = option.value;
+							returnData.push({
+								name: statusName,
+								value: statusId,
+							});
+						}
+					}
+				}
+				return returnData;
+			},
+
+			// Get all the contact legal basics to display them to user so that they can
+			// select them easily
+			async getContactLealBasics(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/properties/v2/contacts/properties';
+				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
+				for (const property of properties) {
+					if (property.name === 'hs_legal_basis') {
+						for (const option of property.options) {
+							const statusName = option.label;
+							const statusId = option.value;
+							returnData.push({
+								name: statusName,
+								value: statusId,
+							});
+						}
+					}
+				}
+				return returnData;
+			},
+
+			// Get all the contact lifecycle stages to display them to user so that they can
+			// select them easily
+			async getContactLifeCycleStages(
+				this: ILoadOptionsFunctions,
+			): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/properties/v2/contacts/properties';
+				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
+				for (const property of properties) {
+					if (property.name === 'lifecyclestage') {
+						for (const option of property.options) {
+							const stageName = option.label;
+							const stageId = option.value;
+							returnData.push({
+								name: stageName,
+								value: stageId,
+							});
+						}
+					}
+				}
+				return returnData;
+			},
+
+			// Get all the contact lifecycle stages to display them to user so that they can
+			// select them easily
+			async getContactOriginalSources(
+				this: ILoadOptionsFunctions,
+			): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/properties/v2/contacts/properties';
+				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
+				for (const property of properties) {
+					if (property.name === 'hs_analytics_source') {
+						for (const option of property.options) {
+							const sourceName = option.label;
+							const sourceId = option.value;
+							returnData.push({
+								name: sourceName,
+								value: sourceId,
+							});
+						}
+					}
+				}
+				return returnData;
+			},
+
+			// Get all the contact preffered languages to display them to user so that they can
+			// select them easily
+			async getContactPrefferedLanguages(
+				this: ILoadOptionsFunctions,
+			): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/properties/v2/contacts/properties';
+				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
+				for (const property of properties) {
+					if (property.name === 'hs_language') {
+						for (const option of property.options) {
+							const languageName = option.label;
+							const languageId = option.value;
+							returnData.push({
+								name: languageName,
+								value: languageId,
+							});
+						}
+					}
+				}
+				return returnData;
+			},
+
+			// Get all the contact preffered languages to display them to user so that they can
+			// select them easily
+			async getContactStatuses(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/properties/v2/contacts/properties';
+				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
+				for (const property of properties) {
+					if (property.name === 'hs_content_membership_status') {
+						for (const option of property.options) {
+							const languageName = option.label;
+							const languageId = option.value;
+							returnData.push({
+								name: languageName,
+								value: languageId,
+							});
+						}
+					}
+				}
+				return returnData;
+			},
+			// Get all the contact properties to display them to user so that they can
+			// select them easily
+			async getContactProperties(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/properties/v2/contacts/properties';
+
+				let properties = (await hubspotApiRequest.call(this, 'GET', endpoint, {})) as Array<{
+					label: string;
+					name: string;
+				}>;
+
+				properties = properties.sort((a, b) => {
+					if (a.label < b.label) return -1;
+					if (a.label > b.label) return 1;
+					return 0;
+				});
+
+				for (const property of properties) {
+					const propertyName = property.label;
+					const propertyId = property.name;
+					returnData.push({
+						name: propertyName,
+						value: propertyId,
+					});
+				}
+
+				return returnData;
+			},
+			// Get all the contact properties to display them to user so that they can
+			// select them easily
+			async getContactPropertiesWithType(
+				this: ILoadOptionsFunctions,
+			): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/properties/v2/contacts/properties';
+				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
+				for (const property of properties) {
+					const propertyName = property.label;
+					const propertyId = property.name;
+					const propertyType = property.type;
+					returnData.push({
+						name: propertyName,
+						// Hacky way to get the property type need to be parsed to be use in the api
+						value: `${propertyId}|${propertyType}`,
+					});
+				}
+				return returnData;
+			},
+
+			// Get all the contact properties to display them to user so that they can
+			// select them easily
+			async getContactCustomProperties(
+				this: ILoadOptionsFunctions,
+			): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/properties/v2/contacts/properties';
+				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
+				for (const property of properties) {
+					if (property.hubspotDefined === null) {
+						const propertyName = property.label;
+						const propertyId = property.name;
+						returnData.push({
+							name: propertyName,
+							value: propertyId,
+						});
+					}
+				}
+				return returnData;
+			},
+
+			// Get all the contact number of employees options to display them to user so that they can
+			// select them easily
+			async getContactNumberOfEmployees(
+				this: ILoadOptionsFunctions,
+			): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/properties/v2/contacts/properties';
+				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
+				for (const property of properties) {
+					if (property.name === 'numemployees') {
+						for (const option of property.options) {
+							const optionName = option.label;
+							const optionId = option.value;
+							returnData.push({
+								name: optionName,
+								value: optionId,
+							});
+						}
+					}
+				}
+				return returnData;
+			},
+
+			/* -------------------------------------------------------------------------- */
+			/*                                 COMPANY                                    */
+			/* -------------------------------------------------------------------------- */
+
+			// Get all the company industries to display them to user so that they can
+			// select them easily
+			async getCompanyIndustries(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/properties/v2/companies/properties';
+				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
+				for (const property of properties) {
+					if (property.name === 'industry') {
+						for (const option of property.options) {
+							const industryName = option.label;
+							const industryId = option.value;
+							returnData.push({
+								name: industryName,
+								value: industryId,
+							});
+						}
+					}
+				}
+				return returnData;
+			},
+
+			// Get all the company lead statuses to display them to user so that they can
+			// select them easily
+			async getCompanyleadStatuses(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/properties/v2/companies/properties';
+				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
+				for (const property of properties) {
+					if (property.name === 'hs_lead_status') {
+						for (const option of property.options) {
+							const statusName = option.label;
+							const statusId = option.value;
+							returnData.push({
+								name: statusName,
+								value: statusId,
+							});
+						}
+					}
+				}
+				return returnData;
+			},
+
+			// Get all the company lifecycle stages to display them to user so that they can
+			// select them easily
+			async getCompanylifecycleStages(
+				this: ILoadOptionsFunctions,
+			): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/properties/v2/companies/properties';
+				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
+				for (const property of properties) {
+					if (property.name === 'lifecyclestage') {
+						for (const option of property.options) {
+							const stageName = option.label;
+							const stageId = option.value;
+							returnData.push({
+								name: stageName,
+								value: stageId,
+							});
+						}
+					}
+				}
+				return returnData;
+			},
+
+			// Get all the company types stages to display them to user so that they can
+			// select them easily
+			async getCompanyTypes(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/properties/v2/companies/properties';
+				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
+				for (const property of properties) {
+					if (property.name === 'type') {
+						for (const option of property.options) {
+							const typeName = option.label;
+							const typeId = option.value;
+							returnData.push({
+								name: typeName,
+								value: typeId,
+							});
+						}
+					}
+				}
+				return returnData;
+			},
+
+			// Get all the company types stages to display them to user so that they can
+			// select them easily
+			async getCompanyTargetAccounts(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/properties/v2/companies/properties';
+				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
+				for (const property of properties) {
+					if (property.name === 'hs_target_account') {
+						for (const option of property.options) {
+							const targetName = option.label;
+							const targetId = option.value;
+							returnData.push({
+								name: targetName,
+								value: targetId,
+							});
+						}
+					}
+				}
+				return returnData;
+			},
+
+			// Get all the company source types stages to display them to user so that they can
+			// select them easily
+			async getCompanySourceTypes(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/properties/v2/companies/properties';
+				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
+				for (const property of properties) {
+					if (property.name === 'hs_analytics_source') {
+						for (const option of property.options) {
+							const typeName = option.label;
+							const typeId = option.value;
+							returnData.push({
+								name: typeName,
+								value: typeId,
+							});
+						}
+					}
+				}
+				return returnData;
+			},
+
+			// Get all the company web technologies stages to display them to user so that they can
+			// select them easily
+			async getCompanyWebTechnologies(
+				this: ILoadOptionsFunctions,
+			): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/properties/v2/companies/properties';
+				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
+				for (const property of properties) {
+					if (property.name === 'web_technologies') {
+						for (const option of property.options) {
+							const technologyName = option.label;
+							const technologyId = option.value;
+							returnData.push({
+								name: technologyName,
+								value: technologyId,
+							});
+						}
+					}
+				}
+				return returnData;
+			},
+
+			// Get all the company properties to display them to user so that they can
+			// select them easily
+			async getCompanyProperties(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/properties/v2/companies/properties';
+				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
+				for (const property of properties) {
+					const propertyName = property.label;
+					const propertyId = property.name;
+					returnData.push({
+						name: propertyName,
+						value: propertyId,
+					});
+				}
+				return returnData;
+			},
+
+			// Get all the company custom properties to display them to user so that they can
+			// select them easily
+			async getCompanyCustomProperties(
+				this: ILoadOptionsFunctions,
+			): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/properties/v2/companies/properties';
+				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
+				for (const property of properties) {
+					if (property.hubspotDefined === null) {
+						const propertyName = property.label;
+						const propertyId = property.name;
+						returnData.push({
+							name: propertyName,
+							value: propertyId,
+						});
+					}
+				}
+				return returnData;
+			},
+
+			/* -------------------------------------------------------------------------- */
+			/*                                 DEAL                                       */
+			/* -------------------------------------------------------------------------- */
+
+			// Get all the groups to display them to user so that they can
+			// select them easily
+			async getDealStages(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/crm-pipelines/v1/pipelines/deals';
+				let stages = await hubspotApiRequest.call(this, 'GET', endpoint, {});
+				stages = stages.results[0].stages;
+				for (const stage of stages) {
+					const stageName = stage.label;
+					const stageId = stage.stageId;
+					returnData.push({
+						name: stageName,
+						value: stageId,
+					});
+				}
+				return returnData;
+			},
+
+			// Get all the deal types to display them to user so that they can
+			// select them easily
+			async getDealTypes(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/properties/v1/deals/properties/named/dealtype';
+				const dealTypes = await hubspotApiRequest.call(this, 'GET', endpoint);
+				for (const dealType of dealTypes.options) {
+					const dealTypeName = dealType.label;
+					const dealTypeId = dealType.value;
+					returnData.push({
+						name: dealTypeName,
+						value: dealTypeId,
+					});
+				}
+				return returnData;
+			},
+
+			// Get all the deal properties to display them to user so that they can
+			// select them easily
+			async getDealCustomProperties(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/properties/v2/deals/properties';
+				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
+				for (const property of properties) {
+					if (property.hubspotDefined === null) {
+						const propertyName = property.label;
+						const propertyId = property.name;
+						returnData.push({
+							name: propertyName,
+							value: propertyId,
+						});
+					}
+				}
+				return returnData;
+			},
+			// Get all the deal properties to display them to user so that they can
+			// select them easily
+			async getDealProperties(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/properties/v2/deals/properties';
+				let properties = (await hubspotApiRequest.call(this, 'GET', endpoint, {})) as Array<{
+					label: string;
+					name: string;
+				}>;
+
+				properties = properties.sort((a, b) => {
+					if (a.label < b.label) return -1;
+					if (a.label > b.label) return 1;
+					return 0;
+				});
+				for (const property of properties) {
+					const propertyName = property.label;
+					const propertyId = property.name;
+					returnData.push({
+						name: propertyName,
+						value: propertyId,
+					});
+				}
+				return returnData;
+			},
+			// Get all the deal properties to display them to user so that they can
+			// select them easily
+			async getDealPropertiesWithType(
+				this: ILoadOptionsFunctions,
+			): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/properties/v2/deals/properties';
+				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
+				for (const property of properties) {
+					const propertyName = property.label;
+					const propertyId = property.name;
+					const propertyType = property.type;
+					returnData.push({
+						name: propertyName,
+						// Hacky way to get the property type need to be parsed to be use in the api
+						// this is no longer working, properties does not returned in the response
+						value: `${propertyId}|${propertyType}`,
+					});
+				}
+				return returnData;
+			},
+
+			// Get all the deal pipelines to display them to user so that they can
+			// select them easily
+			async getDealPipelines(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/crm/v3/pipelines/deals';
+				const data = await hubspotApiRequest.call(this, 'GET', endpoint, {});
+				for (const pipeline of data.results) {
+					returnData.push({
+						name: pipeline.label,
+						value: pipeline.id,
+					});
+				}
+				return returnData;
+			},
+
+			/* -------------------------------------------------------------------------- */
+			/*                                 FORM                                       */
+			/* -------------------------------------------------------------------------- */
+
+			// Get all the forms to display them to user so that they can
+			// select them easily
+			async getForms(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/forms/v2/forms';
+				const forms = await hubspotApiRequest.call(this, 'GET', endpoint, {}, { formTypes: 'ALL' });
+				for (const form of forms) {
+					const formName = form.name;
+					const formId = form.guid;
+					returnData.push({
+						name: formName,
+						value: formId,
+					});
+				}
+				return returnData;
+			},
+
+			// Get all the subscription types to display them to user so that they can
+			// select them easily
+			async getSubscriptionTypes(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/email/public/v1/subscriptions';
+				const subscriptions = await hubspotApiRequestAllItems.call(
+					this,
+					'subscriptionDefinitions',
+					'GET',
+					endpoint,
+					{},
+				);
+				for (const subscription of subscriptions) {
+					const subscriptionName = subscription.name;
+					const subscriptionId = subscription.id;
+					returnData.push({
+						name: subscriptionName,
+						value: subscriptionId,
+					});
+				}
+				return returnData;
+			},
+
+			/* -------------------------------------------------------------------------- */
+			/*                                 TICKET                                     */
+			/* -------------------------------------------------------------------------- */
+
+			// Get all the ticket categories to display them to user so that they can
+			// select them easily
+			async getTicketCategories(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/properties/v2/tickets/properties';
+				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
+				for (const property of properties) {
+					if (property.name === 'hs_ticket_category') {
+						for (const option of property.options) {
+							const categoryName = option.label;
+							const categoryId = option.value;
+							returnData.push({
+								name: categoryName,
+								value: categoryId,
+							});
+						}
+					}
+				}
+				return returnData.sort((a, b) => (a.name < b.name ? 0 : 1));
+			},
+
+			// Get all the ticket pipelines to display them to user so that they can
+			// select them easily
+			async getTicketPipelines(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/crm-pipelines/v1/pipelines/tickets';
+				const { results } = await hubspotApiRequest.call(this, 'GET', endpoint, {});
+				for (const pipeline of results) {
+					const pipelineName = pipeline.label;
+					const pipelineId = pipeline.pipelineId;
+					returnData.push({
+						name: pipelineName,
+						value: pipelineId,
+					});
+				}
+				return returnData;
+			},
+
+			// Get all the ticket resolutions to display them to user so that they can
+			// select them easily
+			async getTicketPriorities(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/properties/v2/tickets/properties';
+				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
+				for (const property of properties) {
+					if (property.name === 'hs_ticket_priority') {
+						for (const option of property.options) {
+							const priorityName = option.label;
+							const priorityId = option.value;
+							returnData.push({
+								name: priorityName,
+								value: priorityId,
+							});
+						}
+					}
+				}
+				return returnData;
+			},
+
+			// Get all the ticket properties to display them to user so that they can
+			// select them easily
+			async getTicketProperties(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/properties/v2/tickets/properties';
+				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
+				for (const property of properties) {
+					const propertyName = property.label;
+					const propertyId = property.name;
+					returnData.push({
+						name: propertyName,
+						value: propertyId,
+					});
+				}
+				return returnData;
+			},
+
+			// Get all the ticket resolutions to display them to user so that they can
+			// select them easily
+			async getTicketResolutions(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/properties/v2/tickets/properties';
+				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
+				for (const property of properties) {
+					if (property.name === 'hs_resolution') {
+						for (const option of property.options) {
+							const resolutionName = option.label;
+							const resolutionId = option.value;
+							returnData.push({
+								name: resolutionName,
+								value: resolutionId,
+							});
+						}
+					}
+				}
+				return returnData.sort((a, b) => (a.name < b.name ? 0 : 1));
+			},
+
+			// Get all the ticket sources to display them to user so that they can
+			// select them easily
+			async getTicketSources(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/properties/v2/tickets/properties';
+				const properties = await hubspotApiRequest.call(this, 'GET', endpoint, {});
+				for (const property of properties) {
+					if (property.name === 'source_type') {
+						for (const option of property.options) {
+							const sourceName = option.label;
+							const sourceId = option.value;
+							returnData.push({
+								name: sourceName,
+								value: sourceId,
+							});
+						}
+					}
+				}
+				return returnData.sort((a, b) => (a.name < b.name ? 0 : 1));
+			},
+
+			// Get all the ticket stages to display them to user so that they can
+			// select them easily
+			async getTicketStages(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				let currentPipelineId = this.getCurrentNodeParameter('pipelineId') as string;
+				if (currentPipelineId === undefined) {
+					currentPipelineId = this.getNodeParameter('updateFields.pipelineId', '') as string;
+				}
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/crm-pipelines/v1/pipelines/tickets';
+				const { results } = await hubspotApiRequest.call(this, 'GET', endpoint, {});
+				for (const pipeline of results) {
+					if (currentPipelineId === pipeline.pipelineId) {
+						for (const stage of pipeline.stages) {
+							const stageName = stage.label;
+							const stageId = stage.stageId;
+							returnData.push({
+								name: stageName,
+								value: stageId,
+							});
+						}
+					}
+				}
+				return returnData;
+			},
+
+			/* -------------------------------------------------------------------------- */
+			/*                                 COMMON                                     */
+			/* -------------------------------------------------------------------------- */
+
+			// Get all the owners to display them to user so that they can
+			// select them easily
+			async getOwners(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/owners/v2/owners';
+				const owners = await hubspotApiRequest.call(this, 'GET', endpoint);
+				for (const owner of owners) {
+					const ownerName = owner.email;
+					const ownerId = owner.ownerId;
+					returnData.push({
+						name: ownerName,
+						value: ownerId,
+					});
+				}
+				return returnData;
+			},
+
+			// Get all the companies to display them to user so that they can
+			// select them easily
+			async getCompanies(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const qs: IDataObject = {
+					properties: ['name'],
+				};
+				const endpoint = '/companies/v2/companies/paged';
+				const companies = await hubspotApiRequestAllItems.call(
+					this,
+					'companies',
+					'GET',
+					endpoint,
+					{},
+					qs,
+				);
+				for (const company of companies) {
+					const companyName = company.properties.name
+						? company.properties.name.value
+						: company.companyId;
+					const companyId = company.companyId;
+					returnData.push({
+						name: companyName,
+						value: companyId,
+					});
+				}
+				return returnData.sort((a, b) => (a.name < b.name ? 0 : 1));
+			},
+
+			// Get all the companies to display them to user so that they can
+			// select them easily
+			async getContacts(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const endpoint = '/contacts/v1/lists/all/contacts/all';
+				const contacts = await hubspotApiRequestAllItems.call(this, 'contacts', 'GET', endpoint);
+
+				for (const contact of contacts) {
+					const firstName = contact.properties?.firstname?.value || '';
+					const lastName = contact.properties?.lastname?.value || '';
+					const contactName = `${firstName} ${lastName}`;
+					const contactId = contact.vid;
+					returnData.push({
+						name: contactName,
+						value: contactId,
+						description: `Contact VID: ${contactId}`,
+					});
+				}
+				return returnData.sort((a, b) => (a.name < b.name ? 0 : 1));
+			},
+		},
+		listSearch: {
+			async searchCompanies(this: ILoadOptionsFunctions): Promise<INodeListSearchResult> {
+				const qs: IDataObject = {
+					properties: ['name'],
+				};
+				const endpoint = '/companies/v2/companies/paged';
+				const searchResults = await hubspotApiRequestAllItems.call(
+					this,
+					'companies',
+					'GET',
+					endpoint,
+					{},
+					qs,
+				);
+				return {
+					// tslint:disable-next-line: no-any
+					results: searchResults.map((b: any) => ({
+						name: b.properties?.name?.value || b.companyId,
+						value: b.companyId,
+					})),
+				};
+			},
+			async searchContacts(
+				this: ILoadOptionsFunctions,
+				filter?: string,
+			): Promise<INodeListSearchResult> {
+				const endpoint = '/contacts/v1/lists/all/contacts/all';
+				const qs: IDataObject = {
+					property: ['email'],
+				};
+				const contacts = (await hubspotApiRequestAllItems.call(
+					this,
+					'contacts',
+					'GET',
+					endpoint,
+					{},
+					qs,
+				)) as Array<{ vid: string; properties: { email: { value: string } } }>;
+				const results: INodeListSearchItems[] = contacts
+					.map((c) => ({
+						name: c.properties.email.value || c.vid,
+						value: c.vid,
+					}))
+					.filter(
+						(c) =>
+							!filter ||
+							c.name.toLowerCase().includes(filter.toLowerCase()) ||
+							c.value?.toString() === filter,
+					)
+					.sort((a, b) => {
+						return a.name.toLowerCase() < b.name.toLowerCase() ? -1 : 1;
+					});
+
+				return { results };
+			},
+			async searchDeals(
+				this: ILoadOptionsFunctions,
+				filter?: string,
+			): Promise<INodeListSearchResult> {
+				const endpoint = '/deals/v1/deal/paged';
+				const qs: IDataObject = {
+					properties: ['dealname'],
+				};
+				const deals = (await hubspotApiRequestAllItems.call(
+					this,
+					'deals',
+					'GET',
+					endpoint,
+					{},
+					qs,
+				)) as Array<{ dealId: string; properties: { dealname: { value: string } } }>;
+				const results: INodeListSearchItems[] = deals
+					.map((c) => ({
+						name: c.properties?.dealname?.value || c.dealId,
+						value: c.dealId,
+					}))
+					.filter(
+						(c) =>
+							!filter ||
+							c.name.toString().toLowerCase().includes(filter.toString().toLowerCase()) ||
+							c.value?.toString() === filter,
+					)
+					.sort((a, b) => {
+						return a.name.toString().toLowerCase() < b.name.toString().toLowerCase() ? -1 : 1;
+					});
+				return {
+					results,
+				};
+			},
+			async searchEngagements(this: ILoadOptionsFunctions): Promise<INodeListSearchResult> {
+				const endpoint = '/engagements/v1/engagements/paged';
+				const qs: IDataObject = {
+					properties: ['name'],
+				};
+				const engagements = await hubspotApiRequest.call(this, 'GET', endpoint, {}, qs);
+				return {
+					// tslint:disable-next-line: no-any
+					results: engagements.results.map((b: any) => ({
+						name:
+							b.properties?.name?.value || b.engagement?.type
+								? `${b.engagement?.type}: ${b.engagement.id}`
+								: b.engagement.id,
+						value: b.engagement.id,
+					})),
+				};
+			},
+			async searchTickets(this: ILoadOptionsFunctions): Promise<INodeListSearchResult> {
+				const endpoint = '/crm-objects/v1/objects/tickets/paged';
+				const qs: IDataObject = {
+					properties: ['ticket_name'],
+				};
+				const tickets = await hubspotApiRequestAllItems.call(
+					this,
+					'objects',
+					'GET',
+					endpoint,
+					{},
+					qs,
+				);
+				return {
+					// tslint:disable-next-line: no-any
+					results: tickets.map((b: any) => ({
+						name: b.objectId,
+						value: b.objectId,
+					})),
+				};
+			},
+			async searchOwners(this: ILoadOptionsFunctions): Promise<INodeListSearchResult> {
+				const endpoint = '/owners/v2/owners';
+				const owners = await hubspotApiRequest.call(this, 'GET', endpoint, {});
+				return {
+					// tslint:disable-next-line: no-any
+					results: owners.map((b: any) => ({
+						name: b.email,
+						value: b.ownerId,
+					})),
+				};
+			},
+		},
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = this.getInputData();
+		const returnData: INodeExecutionData[] = [];
+		const length = items.length;
+		let responseData;
+		const qs: IDataObject = {};
+		const resource = this.getNodeParameter('resource', 0);
+		const operation = this.getNodeParameter('operation', 0);
+
+		//https://legacydocs.hubspot.com/docs/methods/lists/contact-lists-overview
+		if (resource === 'contactList') {
+			try {
+				//https://legacydocs.hubspot.com/docs/methods/lists/add_contact_to_list
+				if (operation === 'add') {
+					const listId = this.getNodeParameter('listId', 0) as string;
+					const by = this.getNodeParameter('by', 0) as string;
+					const body: { [key: string]: [] } = { emails: [], vids: [] };
+					for (let i = 0; i < length; i++) {
+						if (by === 'id') {
+							const id = this.getNodeParameter('id', i) as string;
+							body.vids.push(parseInt(id, 10) as never);
+						} else {
+							const email = this.getNodeParameter('email', i) as string;
+							body.emails.push(email as never);
+						}
+					}
+					responseData = await hubspotApiRequest.call(
+						this,
+						'POST',
+						`/contacts/v1/lists/${listId}/add`,
+						body,
+					);
+				}
+				//https://legacydocs.hubspot.com/docs/methods/lists/remove_contact_from_list
+				if (operation === 'remove') {
+					const listId = this.getNodeParameter('listId', 0) as string;
+					const body: { [key: string]: [] } = { vids: [] };
+					for (let i = 0; i < length; i++) {
+						const id = this.getNodeParameter('id', i) as string;
+						body.vids.push(parseInt(id, 10) as never);
+					}
+					responseData = await hubspotApiRequest.call(
+						this,
+						'POST',
+						`/contacts/v1/lists/${listId}/remove`,
+						body,
+					);
+				}
+
+				const itemData = generatePairedItemData(items.length);
+
+				const executionData = this.helpers.constructExecutionMetaData(
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
+					{ itemData },
+				);
+				returnData.push(...executionData);
+			} catch (error) {
+				if (this.continueOnFail()) {
+					returnData.push({ json: { error: (error as JsonObject).message } });
+				} else {
+					throw error;
+				}
+			}
+		} else {
+			for (let i = 0; i < length; i++) {
+				try {
+					//https://developers.hubspot.com/docs/methods/contacts/create_or_update
+					if (resource === 'contact') {
+						//https://developers.hubspot.com/docs/methods/companies/create_company
+						if (operation === 'upsert') {
+							const email = this.getNodeParameter('email', i) as string;
+							const additionalFields = this.getNodeParameter('additionalFields', i);
+							const options = this.getNodeParameter('options', i);
+							const body: IDataObject[] = [];
+							if (additionalFields.annualRevenue) {
+								body.push({
+									property: 'annualrevenue',
+									value: (additionalFields.annualRevenue as number).toString(),
+								});
+							}
+							if (additionalFields.city) {
+								body.push({
+									property: 'city',
+									value: additionalFields.city,
+								});
+							}
+							if (additionalFields.clickedFacebookAd) {
+								body.push({
+									property: 'hs_facebook_ad_clicked',
+									value: additionalFields.clickedFacebookAd,
+								});
+							}
+							if (additionalFields.closeDate) {
+								body.push({
+									property: 'closedate',
+									value: new Date(additionalFields.closeDate as string).getTime(),
+								});
+							}
+							if (additionalFields.companyName) {
+								body.push({
+									property: 'company',
+									value: additionalFields.companyName,
+								});
+							}
+							if (additionalFields.companySize) {
+								body.push({
+									property: 'company_size',
+									value: additionalFields.companySize,
+								});
+							}
+							if (additionalFields.description) {
+								body.push({
+									property: 'description',
+									value: additionalFields.description,
+								});
+							}
+							if (additionalFields.contactOwner) {
+								body.push({
+									property: 'hubspot_owner_id',
+									value: additionalFields.contactOwner,
+								});
+							}
+							if (additionalFields.country) {
+								body.push({
+									property: 'country',
+									value: additionalFields.country,
+								});
+							}
+							if (additionalFields.dateOfBirth) {
+								body.push({
+									property: 'date_of_birth',
+									value: additionalFields.dateOfBirth,
+								});
+							}
+							if (additionalFields.degree) {
+								body.push({
+									property: 'degree',
+									value: additionalFields.degree,
+								});
+							}
+							if (additionalFields.facebookClickId) {
+								body.push({
+									property: 'hs_facebook_click_id',
+									value: additionalFields.facebookClickId,
+								});
+							}
+							if (additionalFields.faxNumber) {
+								body.push({
+									property: 'fax',
+									value: additionalFields.faxNumber,
+								});
+							}
+							if (additionalFields.fieldOfStudy) {
+								body.push({
+									property: 'field_of_study',
+									value: additionalFields.fieldOfStudy,
+								});
+							}
+							if (additionalFields.firstName) {
+								body.push({
+									property: 'firstname',
+									value: additionalFields.firstName,
+								});
+							}
+							if (additionalFields.gender) {
+								body.push({
+									property: 'gender',
+									value: additionalFields.gender,
+								});
+							}
+							if (additionalFields.googleAdClickId) {
+								body.push({
+									property: 'hs_google_click_id',
+									value: additionalFields.googleAdClickId,
+								});
+							}
+							if (additionalFields.graduationDate) {
+								body.push({
+									property: 'graduation_date',
+									value: additionalFields.graduationDate,
+								});
+							}
+							if (additionalFields.industry) {
+								body.push({
+									property: 'industry',
+									value: additionalFields.industry,
+								});
+							}
+							if (additionalFields.jobFunction) {
+								body.push({
+									property: 'job_function',
+									value: additionalFields.jobFunction,
+								});
+							}
+							if (additionalFields.jobTitle) {
+								body.push({
+									property: 'jobtitle',
+									value: additionalFields.jobTitle,
+								});
+							}
+							if (additionalFields.lastName) {
+								body.push({
+									property: 'lastname',
+									value: additionalFields.lastName,
+								});
+							}
+							if (additionalFields.leadStatus) {
+								body.push({
+									property: 'hs_lead_status',
+									value: additionalFields.leadStatus,
+								});
+							}
+							if (additionalFields.processingContactData) {
+								body.push({
+									property: 'hs_legal_basis',
+									value: additionalFields.processingContactData,
+								});
+							}
+							if (additionalFields.lifeCycleStage) {
+								body.push({
+									property: 'lifecyclestage',
+									value: additionalFields.lifeCycleStage,
+								});
+							}
+							if (additionalFields.maritalStatus) {
+								body.push({
+									property: 'marital_status',
+									value: additionalFields.maritalStatus,
+								});
+							}
+							if (additionalFields.membershipNote) {
+								body.push({
+									property: 'hs_content_membership_notes',
+									value: additionalFields.membershipNote,
+								});
+							}
+							if (additionalFields.message) {
+								body.push({
+									property: 'message',
+									value: additionalFields.message,
+								});
+							}
+							if (additionalFields.mobilePhoneNumber) {
+								body.push({
+									property: 'mobilephone',
+									value: additionalFields.mobilePhoneNumber,
+								});
+							}
+							if (additionalFields.numberOfEmployees) {
+								body.push({
+									property: 'numemployees',
+									value: additionalFields.numberOfEmployees,
+								});
+							}
+							if (additionalFields.originalSource) {
+								body.push({
+									property: 'hs_analytics_source',
+									value: additionalFields.originalSource,
+								});
+							}
+							if (additionalFields.phoneNumber) {
+								body.push({
+									property: 'phone',
+									value: additionalFields.phoneNumber,
+								});
+							}
+							if (additionalFields.postalCode) {
+								body.push({
+									property: 'zip',
+									value: additionalFields.postalCode,
+								});
+							}
+							if (additionalFields.prefferedLanguage) {
+								body.push({
+									property: 'hs_language',
+									value: additionalFields.prefferedLanguage,
+								});
+							}
+							if (additionalFields.relationshipStatus) {
+								body.push({
+									property: 'relationship_status',
+									value: additionalFields.relationshipStatus,
+								});
+							}
+							if (additionalFields.salutation) {
+								body.push({
+									property: 'salutation',
+									value: additionalFields.salutation,
+								});
+							}
+							if (additionalFields.school) {
+								body.push({
+									property: 'school',
+									value: additionalFields.school,
+								});
+							}
+							if (additionalFields.seniority) {
+								body.push({
+									property: 'seniority',
+									value: additionalFields.seniority,
+								});
+							}
+							if (additionalFields.startDate) {
+								body.push({
+									property: 'start_date',
+									value: additionalFields.startDate,
+								});
+							}
+							if (additionalFields.stateRegion) {
+								body.push({
+									property: 'state',
+									value: additionalFields.stateRegion,
+								});
+							}
+							if (additionalFields.status) {
+								body.push({
+									property: 'hs_content_membership_status',
+									value: additionalFields.status,
+								});
+							}
+							if (additionalFields.streetAddress) {
+								body.push({
+									property: 'address',
+									value: additionalFields.streetAddress,
+								});
+							}
+							if (additionalFields.twitterUsername) {
+								body.push({
+									property: 'twitterhandle',
+									value: additionalFields.twitterUsername,
+								});
+							}
+							if (additionalFields.websiteUrl) {
+								body.push({
+									property: 'website',
+									value: additionalFields.websiteUrl,
+								});
+							}
+							if (additionalFields.workEmail) {
+								body.push({
+									property: 'work_email',
+									value: additionalFields.workEmail,
+								});
+							}
+
+							if (additionalFields.customPropertiesUi) {
+								const customProperties = (additionalFields.customPropertiesUi as IDataObject)
+									.customPropertiesValues as IDataObject[];
+
+								if (customProperties) {
+									for (const customProperty of customProperties) {
+										body.push({
+											property: customProperty.property,
+											value: customProperty.value,
+										});
+									}
+								}
+							}
+
+							const endpoint = `/contacts/v1/contact/createOrUpdate/email/${email}`;
+							responseData = await hubspotApiRequest.call(this, 'POST', endpoint, {
+								properties: body,
+							});
+
+							if (additionalFields.associatedCompanyId) {
+								const companyAssociations: IDataObject[] = [];
+								companyAssociations.push({
+									fromObjectId: responseData.vid,
+									toObjectId: additionalFields.associatedCompanyId,
+									category: 'HUBSPOT_DEFINED',
+									definitionId: 1,
+								});
+								await hubspotApiRequest.call(
+									this,
+									'PUT',
+									'/crm-associations/v1/associations/create-batch',
+									companyAssociations,
+								);
+							}
+
+							if (!options.resolveData) {
+								const isNew = responseData.isNew;
+								if (additionalFields.properties) {
+									qs.property = additionalFields.properties as string[];
+								}
+								responseData = await hubspotApiRequest.call(
+									this,
+									'GET',
+									`/contacts/v1/contact/vid/${responseData.vid}/profile`,
+									{},
+									qs,
+								);
+								responseData.isNew = isNew;
+							}
+						}
+						//https://developers.hubspot.com/docs/methods/contacts/get_contact
+						if (operation === 'get') {
+							const contactId = this.getNodeParameter('contactId', i, undefined, {
+								extractValue: true,
+							}) as string;
+							const additionalFields = this.getNodeParameter('additionalFields', i);
+							if (additionalFields.formSubmissionMode) {
+								qs.formSubmissionMode = additionalFields.formSubmissionMode as string;
+							}
+							if (additionalFields.listMemberships) {
+								qs.showListMemberships = additionalFields.listMemberships as boolean;
+							}
+							if (additionalFields.propertiesCollection) {
+								const propertiesValues = additionalFields.propertiesCollection // @ts-ignore
+									.propertiesValues as IDataObject;
+								const properties = propertiesValues.properties as string | string[];
+								qs.properties = !Array.isArray(propertiesValues.properties)
+									? (properties as string).split(',')
+									: properties;
+								qs.propertyMode = snakeCase(propertiesValues.propertyMode as string);
+							}
+							const endpoint = `/contacts/v1/contact/vid/${contactId}/profile`;
+							responseData = await hubspotApiRequest.call(this, 'GET', endpoint, {}, qs);
+						}
+						//https://developers.hubspot.com/docs/methods/contacts/get_contacts
+						if (operation === 'getAll') {
+							const additionalFields = this.getNodeParameter('additionalFields', i);
+							const returnAll = this.getNodeParameter('returnAll', 0);
+							if (additionalFields.formSubmissionMode) {
+								qs.formSubmissionMode = additionalFields.formSubmissionMode as string;
+							}
+							if (additionalFields.listMemberships) {
+								qs.showListMemberships = additionalFields.listMemberships as boolean;
+							}
+							if (additionalFields.propertiesCollection) {
+								const propertiesValues = additionalFields.propertiesCollection // @ts-ignore
+									.propertiesValues as IDataObject;
+								const properties = propertiesValues.properties as string | string[];
+								qs.property = !Array.isArray(propertiesValues.properties)
+									? (properties as string).split(',')
+									: properties;
+								qs.propertyMode = snakeCase(propertiesValues.propertyMode as string);
+							}
+							const endpoint = '/contacts/v1/lists/all/contacts/all';
+							if (returnAll) {
+								responseData = await hubspotApiRequestAllItems.call(
+									this,
+									'contacts',
+									'GET',
+									endpoint,
+									{},
+									qs,
+								);
+							} else {
+								qs.count = this.getNodeParameter('limit', 0);
+								responseData = await hubspotApiRequest.call(this, 'GET', endpoint, {}, qs);
+								responseData = responseData.contacts;
+							}
+						}
+						//https://developers.hubspot.com/docs/methods/contacts/get_recently_created_contacts
+						if (operation === 'getRecentlyCreatedUpdated') {
+							const returnAll = this.getNodeParameter('returnAll', 0);
+							const additionalFields = this.getNodeParameter('additionalFields', i);
+							if (additionalFields.formSubmissionMode) {
+								qs.formSubmissionMode = additionalFields.formSubmissionMode as string;
+							}
+							if (additionalFields.listMemberships) {
+								qs.showListMemberships = additionalFields.listMemberships as boolean;
+							}
+							if (additionalFields.propertiesCollection) {
+								const propertiesValues = additionalFields.propertiesCollection // @ts-ignore
+									.propertiesValues as IDataObject;
+								const properties = propertiesValues.properties as string | string[];
+								qs.properties = !Array.isArray(propertiesValues.properties)
+									? (properties as string).split(',')
+									: properties;
+								qs.propertyMode = snakeCase(propertiesValues.propertyMode as string);
+							}
+
+							const endpoint = '/contacts/v1/lists/recently_updated/contacts/recent';
+
+							if (returnAll) {
+								responseData = await hubspotApiRequestAllItems.call(
+									this,
+									'contacts',
+									'GET',
+									endpoint,
+									{},
+									qs,
+								);
+							} else {
+								qs.count = this.getNodeParameter('limit', 0);
+								responseData = await hubspotApiRequest.call(this, 'GET', endpoint, {}, qs);
+								responseData = responseData.contacts;
+							}
+						}
+						//https://developers.hubspot.com/docs/methods/contacts/delete_contact
+						if (operation === 'delete') {
+							const contactId = this.getNodeParameter('contactId', i, undefined, {
+								extractValue: true,
+							}) as string;
+							const endpoint = `/contacts/v1/contact/vid/${contactId}`;
+							responseData = await hubspotApiRequest.call(this, 'DELETE', endpoint);
+							responseData =
+								responseData === undefined ? { vid: contactId, deleted: true } : responseData;
+						}
+						//https://developers.hubspot.com/docs/api/crm/search
+						if (operation === 'search') {
+							const additionalFields = this.getNodeParameter('additionalFields', i);
+							const returnAll = this.getNodeParameter('returnAll', 0);
+							const filtersGroupsUi = this.getNodeParameter('filterGroupsUi', i) as IDataObject;
+							const sortBy = additionalFields.sortBy || 'createdate';
+							const direction = additionalFields.direction || 'DESCENDING';
+
+							const body: IDataObject = {
+								sorts: [
+									{
+										propertyName: sortBy,
+										direction,
+									},
+								],
+							};
+
+							if (filtersGroupsUi?.filterGroupsValues) {
+								const filterGroupValues = filtersGroupsUi.filterGroupsValues as IDataObject[];
+								body.filterGroups = [];
+								for (const filterGroupValue of filterGroupValues) {
+									if (filterGroupValue.filtersUi) {
+										const filterValues = (filterGroupValue.filtersUi as IDataObject)
+											.filterValues as IDataObject[];
+										for (const filter of filterValues) {
+											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 });
+									}
+								}
+								//@ts-ignore
+								if (body.filterGroups.length > 3) {
+									throw new NodeOperationError(this.getNode(), 'You can only have 3 filter groups');
+								}
+							}
+
+							Object.assign(body, additionalFields);
+
+							const endpoint = '/crm/v3/objects/contacts/search';
+
+							if (returnAll) {
+								responseData = await hubspotApiRequestAllItems.call(
+									this,
+									'results',
+									'POST',
+									endpoint,
+									body,
+									qs,
+								);
+							} else {
+								body.limit = this.getNodeParameter('limit', 0);
+								responseData = await hubspotApiRequest.call(this, 'POST', endpoint, body, qs);
+								responseData = responseData.results;
+							}
+						}
+					}
+					//https://developers.hubspot.com/docs/methods/companies/companies-overview
+					if (resource === 'company') {
+						//https://developers.hubspot.com/docs/methods/companies/create_company
+						if (operation === 'create') {
+							const name = this.getNodeParameter('name', i) as string;
+							const additionalFields = this.getNodeParameter('additionalFields', i);
+							const body: IDataObject[] = [];
+							body.push({
+								name: 'name',
+								value: name,
+							});
+							if (additionalFields.aboutUs) {
+								body.push({
+									name: 'about_us',
+									value: additionalFields.aboutUs,
+								});
+							}
+							if (additionalFields.annualRevenue) {
+								body.push({
+									name: 'annualrevenue',
+									value: (additionalFields.annualRevenue as number).toString(),
+								});
+							}
+							if (additionalFields.city) {
+								body.push({
+									name: 'city',
+									value: additionalFields.city,
+								});
+							}
+							if (additionalFields.closeDate) {
+								body.push({
+									name: 'closedate',
+									value: new Date(additionalFields.closeDate as string).getTime(),
+								});
+							}
+							if (additionalFields.companyDomainName) {
+								body.push({
+									name: 'domain',
+									value: additionalFields.companyDomainName,
+								});
+							}
+							if (additionalFields.companyOwner) {
+								body.push({
+									name: 'hubspot_owner_id',
+									value: additionalFields.companyOwner,
+								});
+							}
+							if (additionalFields.countryRegion) {
+								body.push({
+									name: 'country',
+									value: additionalFields.countryRegion,
+								});
+							}
+							if (additionalFields.description) {
+								body.push({
+									name: 'description',
+									value: additionalFields.description,
+								});
+							}
+							if (additionalFields.facebookFans) {
+								body.push({
+									name: 'facebookfans',
+									value: additionalFields.facebookFans,
+								});
+							}
+							if (additionalFields.googlePlusPage) {
+								body.push({
+									name: 'googleplus_page',
+									value: additionalFields.googlePlusPage,
+								});
+							}
+							if (additionalFields.industry) {
+								body.push({
+									name: 'industry',
+									value: additionalFields.industry,
+								});
+							}
+							if (additionalFields.isPublic) {
+								body.push({
+									name: 'is_public',
+									value: additionalFields.isPublic,
+								});
+							}
+							if (additionalFields.leadStatus) {
+								body.push({
+									name: 'hs_lead_status',
+									value: additionalFields.leadStatus,
+								});
+							}
+							if (additionalFields.lifecycleStatus) {
+								body.push({
+									name: 'lifecyclestage',
+									value: additionalFields.lifecycleStatus,
+								});
+							}
+							if (additionalFields.linkedinBio) {
+								body.push({
+									name: 'linkedinbio',
+									value: additionalFields.linkedinBio,
+								});
+							}
+							if (additionalFields.linkedInCompanyPage) {
+								body.push({
+									name: 'linkedin_company_page',
+									value: additionalFields.linkedInCompanyPage,
+								});
+							}
+							if (additionalFields.numberOfEmployees) {
+								body.push({
+									name: 'numberofemployees',
+									value: additionalFields.numberOfEmployees,
+								});
+							}
+							if (additionalFields.originalSourceType) {
+								body.push({
+									name: 'hs_analytics_source',
+									value: additionalFields.originalSourceType,
+								});
+							}
+							if (additionalFields.phoneNumber) {
+								body.push({
+									name: 'phone',
+									value: additionalFields.phoneNumber,
+								});
+							}
+							if (additionalFields.postalCode) {
+								body.push({
+									name: 'zip',
+									value: additionalFields.postalCode,
+								});
+							}
+							if (additionalFields.stateRegion) {
+								body.push({
+									name: 'state',
+									value: additionalFields.stateRegion,
+								});
+							}
+							if (additionalFields.streetAddress) {
+								body.push({
+									name: 'address',
+									value: additionalFields.streetAddress,
+								});
+							}
+							if (additionalFields.streetAddress2) {
+								body.push({
+									name: 'address2',
+									value: additionalFields.streetAddress2,
+								});
+							}
+							if (additionalFields.targetAccount) {
+								body.push({
+									name: 'hs_target_account',
+									value: additionalFields.targetAccount,
+								});
+							}
+							if (additionalFields.timezone) {
+								body.push({
+									name: 'timezone',
+									value: additionalFields.timezone,
+								});
+							}
+							if (additionalFields.totalMoneyRaised) {
+								body.push({
+									name: 'total_money_raised',
+									value: additionalFields.totalMoneyRaised,
+								});
+							}
+							if (additionalFields.twitterBio) {
+								body.push({
+									name: 'twitterbio',
+									value: additionalFields.twitterBio,
+								});
+							}
+							if (additionalFields.twitterFollowers) {
+								body.push({
+									name: 'twitterfollowers',
+									value: additionalFields.twitterFollowers,
+								});
+							}
+							if (additionalFields.twitterHandle) {
+								body.push({
+									name: 'twitterhandle',
+									value: additionalFields.twitterHandle,
+								});
+							}
+							if (additionalFields.type) {
+								body.push({
+									name: 'type',
+									value: additionalFields.type,
+								});
+							}
+							if (additionalFields.websiteUrl) {
+								body.push({
+									name: 'website',
+									value: additionalFields.websiteUrl,
+								});
+							}
+							if (additionalFields.webTechnologies) {
+								body.push({
+									name: 'web_technologies',
+									value: additionalFields.webTechnologies,
+								});
+							}
+							if (additionalFields.yearFounded) {
+								body.push({
+									name: 'founded_year',
+									value: additionalFields.yearFounded,
+								});
+							}
+							if (additionalFields.customPropertiesUi) {
+								const customProperties = (additionalFields.customPropertiesUi as IDataObject)
+									.customPropertiesValues as IDataObject[];
+
+								if (customProperties) {
+									for (const customProperty of customProperties) {
+										body.push({
+											name: customProperty.property,
+											value: customProperty.value,
+										});
+									}
+								}
+							}
+							const endpoint = '/companies/v2/companies';
+							responseData = await hubspotApiRequest.call(this, 'POST', endpoint, {
+								properties: body,
+							});
+						}
+						//https://developers.hubspot.com/docs/methods/companies/update_company
+						if (operation === 'update') {
+							const companyId = this.getNodeParameter('companyId', i, undefined, {
+								extractValue: true,
+							}) as string;
+							const updateFields = this.getNodeParameter('updateFields', i);
+							const body: IDataObject[] = [];
+							if (updateFields.name) {
+								body.push({
+									name: 'name',
+									value: updateFields.name,
+								});
+							}
+							if (updateFields.aboutUs) {
+								body.push({
+									name: 'about_us',
+									value: updateFields.aboutUs,
+								});
+							}
+							if (updateFields.annualRevenue) {
+								body.push({
+									name: 'annualrevenue',
+									value: (updateFields.annualRevenue as number).toString(),
+								});
+							}
+							if (updateFields.city) {
+								body.push({
+									name: 'city',
+									value: updateFields.city,
+								});
+							}
+							if (updateFields.closeDate) {
+								body.push({
+									name: 'closedate',
+									value: new Date(updateFields.closeDate as string).getTime(),
+								});
+							}
+							if (updateFields.companyDomainName) {
+								body.push({
+									name: 'domain',
+									value: updateFields.companyDomainName,
+								});
+							}
+							if (updateFields.companyOwner) {
+								body.push({
+									name: 'hubspot_owner_id',
+									value: updateFields.companyOwner,
+								});
+							}
+							if (updateFields.countryRegion) {
+								body.push({
+									name: 'country',
+									value: updateFields.countryRegion,
+								});
+							}
+							if (updateFields.description) {
+								body.push({
+									name: 'description',
+									value: updateFields.description,
+								});
+							}
+							if (updateFields.facebookFans) {
+								body.push({
+									name: 'facebookfans',
+									value: updateFields.facebookFans,
+								});
+							}
+							if (updateFields.googlePlusPage) {
+								body.push({
+									name: 'googleplus_page',
+									value: updateFields.googlePlusPage,
+								});
+							}
+							if (updateFields.industry) {
+								body.push({
+									name: 'industry',
+									value: updateFields.industry,
+								});
+							}
+							if (updateFields.isPublic) {
+								body.push({
+									name: 'is_public',
+									value: updateFields.isPublic,
+								});
+							}
+							if (updateFields.leadStatus) {
+								body.push({
+									name: 'hs_lead_status',
+									value: updateFields.leadStatus,
+								});
+							}
+							if (updateFields.lifecycleStatus) {
+								body.push({
+									name: 'lifecyclestage',
+									value: updateFields.lifecycleStatus,
+								});
+							}
+							if (updateFields.linkedinBio) {
+								body.push({
+									name: 'linkedinbio',
+									value: updateFields.linkedinBio,
+								});
+							}
+							if (updateFields.linkedInCompanyPage) {
+								body.push({
+									name: 'linkedin_company_page',
+									value: updateFields.linkedInCompanyPage,
+								});
+							}
+							if (updateFields.numberOfEmployees) {
+								body.push({
+									name: 'numberofemployees',
+									value: updateFields.numberOfEmployees,
+								});
+							}
+							if (updateFields.originalSourceType) {
+								body.push({
+									name: 'hs_analytics_source',
+									value: updateFields.originalSourceType,
+								});
+							}
+							if (updateFields.phoneNumber) {
+								body.push({
+									name: 'phone',
+									value: updateFields.phoneNumber,
+								});
+							}
+							if (updateFields.postalCode) {
+								body.push({
+									name: 'zip',
+									value: updateFields.postalCode,
+								});
+							}
+							if (updateFields.stateRegion) {
+								body.push({
+									name: 'state',
+									value: updateFields.stateRegion,
+								});
+							}
+							if (updateFields.streetAddress) {
+								body.push({
+									name: 'address',
+									value: updateFields.streetAddress,
+								});
+							}
+							if (updateFields.streetAddress2) {
+								body.push({
+									name: 'address2',
+									value: updateFields.streetAddress2,
+								});
+							}
+							if (updateFields.targetAccount) {
+								body.push({
+									name: 'hs_target_account',
+									value: updateFields.targetAccount,
+								});
+							}
+							if (updateFields.timezone) {
+								body.push({
+									name: 'timezone',
+									value: updateFields.timezone,
+								});
+							}
+							if (updateFields.totalMoneyRaised) {
+								body.push({
+									name: 'total_money_raised',
+									value: updateFields.totalMoneyRaised,
+								});
+							}
+							if (updateFields.twitterBio) {
+								body.push({
+									name: 'twitterbio',
+									value: updateFields.twitterBio,
+								});
+							}
+							if (updateFields.twitterFollowers) {
+								body.push({
+									name: 'twitterfollowers',
+									value: updateFields.twitterFollowers,
+								});
+							}
+							if (updateFields.twitterHandle) {
+								body.push({
+									name: 'twitterhandle',
+									value: updateFields.twitterHandle,
+								});
+							}
+							if (updateFields.type) {
+								body.push({
+									name: 'type',
+									value: updateFields.type,
+								});
+							}
+							if (updateFields.websiteUrl) {
+								body.push({
+									name: 'website',
+									value: updateFields.websiteUrl,
+								});
+							}
+							if (updateFields.webTechnologies) {
+								body.push({
+									name: 'web_technologies',
+									value: updateFields.webTechnologies,
+								});
+							}
+							if (updateFields.yearFounded) {
+								body.push({
+									name: 'founded_year',
+									value: updateFields.yearFounded,
+								});
+							}
+							if (updateFields.customPropertiesUi) {
+								const customProperties = (updateFields.customPropertiesUi as IDataObject)
+									.customPropertiesValues as IDataObject[];
+
+								if (customProperties) {
+									for (const customProperty of customProperties) {
+										body.push({
+											name: customProperty.property,
+											value: customProperty.value,
+										});
+									}
+								}
+							}
+							const endpoint = `/companies/v2/companies/${companyId}`;
+							responseData = await hubspotApiRequest.call(this, 'PUT', endpoint, {
+								properties: body,
+							});
+						}
+						//https://developers.hubspot.com/docs/methods/companies/get_company
+						if (operation === 'get') {
+							const companyId = this.getNodeParameter('companyId', i, undefined, {
+								extractValue: true,
+							}) as string;
+							const additionalFields = this.getNodeParameter('additionalFields', i);
+							if (additionalFields.includeMergeAudits) {
+								qs.includeMergeAudits = additionalFields.includeMergeAudits as boolean;
+							}
+							const endpoint = `/companies/v2/companies/${companyId}`;
+							responseData = await hubspotApiRequest.call(this, 'GET', endpoint, {}, qs);
+						}
+						//https://developers.hubspot.com/docs/methods/companies/get-all-companies
+						if (operation === 'getAll') {
+							const additionalFields = this.getNodeParameter('options', i);
+							const returnAll = this.getNodeParameter('returnAll', 0);
+							if (additionalFields.formSubmissionMode) {
+								qs.formSubmissionMode = additionalFields.formSubmissionMode as string;
+							}
+							if (additionalFields.listMerberships) {
+								qs.showListMemberships = additionalFields.listMerberships as boolean;
+							}
+							if (additionalFields.propertiesCollection) {
+								const propertiesValues = additionalFields.propertiesCollection // @ts-ignore
+									.propertiesValues as IDataObject;
+								const properties = propertiesValues.properties as string | string[];
+								qs.properties = !Array.isArray(propertiesValues.properties)
+									? (properties as string).split(',')
+									: properties;
+								qs.propertyMode = snakeCase(propertiesValues.propertyMode as string);
+							}
+							const endpoint = '/companies/v2/companies/paged';
+							if (returnAll) {
+								responseData = await hubspotApiRequestAllItems.call(
+									this,
+									'companies',
+									'GET',
+									endpoint,
+									{},
+									qs,
+								);
+							} else {
+								qs.limit = this.getNodeParameter('limit', 0);
+								responseData = await hubspotApiRequest.call(this, 'GET', endpoint, {}, qs);
+								responseData = responseData.companies;
+							}
+						}
+						//https://developers.hubspot.com/docs/methods/companies/get_companies_modified
+						if (operation === 'getRecentlyCreatedUpdated') {
+							const returnAll = this.getNodeParameter('returnAll', 0);
+							const additionalFields = this.getNodeParameter('additionalFields', i);
+							if (additionalFields.since) {
+								qs.since = new Date(additionalFields.since as string).getTime();
+							}
+							if (additionalFields.propertiesCollection) {
+								const propertiesValues = additionalFields.propertiesCollection // @ts-ignore
+									.propertiesValues as IDataObject;
+								const properties = propertiesValues.properties as string | string[];
+								qs.properties = !Array.isArray(propertiesValues.properties)
+									? (properties as string).split(',')
+									: properties;
+								qs.propertyMode = snakeCase(propertiesValues.propertyMode as string);
+							}
+							const endpoint = '/companies/v2/companies/recent/modified';
+							if (returnAll) {
+								responseData = await hubspotApiRequestAllItems.call(
+									this,
+									'results',
+									'GET',
+									endpoint,
+									{},
+									qs,
+								);
+							} else {
+								qs.count = this.getNodeParameter('limit', 0);
+								responseData = await hubspotApiRequest.call(this, 'GET', endpoint, {}, qs);
+								responseData = responseData.results;
+							}
+						}
+						//https://developers.hubspot.com/docs/methods/companies/search_companies_by_domain
+						if (operation === 'searchByDomain') {
+							let domain = this.getNodeParameter('domain', i) as string;
+							const options = this.getNodeParameter('options', i);
+							const returnAll = this.getNodeParameter('returnAll', 0);
+							if (domain.includes('https://')) {
+								domain = domain.replace('https://', '');
+							} else if (domain.includes('http://')) {
+								domain = domain.replace('http://', '');
+							}
+							const body: IDataObject = {
+								requestOptions: {},
+							};
+							if (options.properties) {
+								body.requestOptions = { properties: options.properties as string[] };
+							}
+							const endpoint = `/companies/v2/domains/${domain}/companies`;
+							if (returnAll) {
+								responseData = await hubspotApiRequestAllItems.call(
+									this,
+									'results',
+									'POST',
+									endpoint,
+									body,
+								);
+							} else {
+								body.limit = this.getNodeParameter('limit', 0);
+								responseData = await hubspotApiRequest.call(this, 'POST', endpoint, body);
+								responseData = responseData.results;
+							}
+						}
+						//https://developers.hubspot.com/docs/methods/companies/delete_company
+						if (operation === 'delete') {
+							const companyId = this.getNodeParameter('companyId', i, undefined, {
+								extractValue: true,
+							}) as string;
+							const endpoint = `/crm/v3/objects/companies/${companyId}`;
+							responseData = await hubspotApiRequest.call(this, 'DELETE', endpoint);
+							responseData =
+								responseData === undefined ? { vid: companyId, deleted: true } : responseData;
+						}
+					}
+					//https://developers.hubspot.com/docs/methods/deals/deals_overview
+					if (resource === 'deal') {
+						if (operation === 'create') {
+							const body: IDeal = {};
+							body.properties = [];
+							const association: IAssociation = {};
+							const additionalFields = this.getNodeParameter('additionalFields', i);
+							const stage = this.getNodeParameter('stage', i) as string;
+							if (stage) {
+								body.properties.push({
+									name: 'dealstage',
+									value: stage,
+								});
+							}
+							if (additionalFields.associatedCompany) {
+								association.associatedCompanyIds = additionalFields.associatedCompany as number[];
+							}
+							if (additionalFields.associatedVids) {
+								association.associatedVids = additionalFields.associatedVids as number[];
+							}
+							if (additionalFields.dealName) {
+								body.properties.push({
+									name: 'dealname',
+									value: additionalFields.dealName as string,
+								});
+							}
+							if (additionalFields.dealOwner) {
+								const dealOwner = additionalFields.dealOwner as IDataObject;
+								body.properties.push({
+									name: 'hubspot_owner_id',
+									value: dealOwner.value,
+								});
+							}
+							if (additionalFields.closeDate) {
+								body.properties.push({
+									name: 'closedate',
+									value: new Date(additionalFields.closeDate as string).getTime(),
+								});
+							}
+							if (additionalFields.amount) {
+								body.properties.push({
+									name: 'amount',
+									value: additionalFields.amount as string,
+								});
+							}
+							if (additionalFields.dealType) {
+								body.properties.push({
+									name: 'dealtype',
+									value: additionalFields.dealType as string,
+								});
+							}
+							if (additionalFields.pipeline) {
+								body.properties.push({
+									name: 'pipeline',
+									value: additionalFields.pipeline as string,
+								});
+							}
+							if (additionalFields.description) {
+								body.properties.push({
+									name: 'description',
+									value: additionalFields.description as string,
+								});
+							}
+							if (additionalFields.customPropertiesUi) {
+								const customProperties = (additionalFields.customPropertiesUi as IDataObject)
+									.customPropertiesValues as IDataObject[];
+								if (customProperties) {
+									for (const customProperty of customProperties) {
+										body.properties.push({
+											name: customProperty.property,
+											value: customProperty.value,
+										});
+									}
+								}
+							}
+							body.associations = association;
+							const endpoint = '/deals/v1/deal';
+							responseData = await hubspotApiRequest.call(this, 'POST', endpoint, body);
+						}
+						if (operation === 'update') {
+							const body: IDeal = {};
+							body.properties = [];
+							const updateFields = this.getNodeParameter('updateFields', i);
+							const dealId = this.getNodeParameter(
+								'dealId',
+								i,
+								{},
+								{ extractValue: true },
+							) as string;
+							if (updateFields.stage) {
+								body.properties.push({
+									name: 'dealstage',
+									value: updateFields.stage as string,
+								});
+							}
+							if (updateFields.dealName) {
+								body.properties.push({
+									name: 'dealname',
+									value: updateFields.dealName as string,
+								});
+							}
+							if (updateFields.dealOwner) {
+								const dealOwner = updateFields.dealOwner as IDataObject;
+								body.properties.push({
+									name: 'hubspot_owner_id',
+									value: dealOwner.value,
+								});
+							}
+							if (updateFields.closeDate) {
+								body.properties.push({
+									name: 'closedate',
+									value: new Date(updateFields.closeDate as string).getTime(),
+								});
+							}
+							if (updateFields.amount) {
+								body.properties.push({
+									name: 'amount',
+									value: updateFields.amount as string,
+								});
+							}
+							if (updateFields.dealType) {
+								body.properties.push({
+									name: 'dealtype',
+									value: updateFields.dealType as string,
+								});
+							}
+							if (updateFields.pipeline) {
+								body.properties.push({
+									name: 'pipeline',
+									value: updateFields.pipeline as string,
+								});
+							}
+							if (updateFields.description) {
+								body.properties.push({
+									name: 'description',
+									value: updateFields.description as string,
+								});
+							}
+							if (updateFields.customPropertiesUi) {
+								const customProperties = (updateFields.customPropertiesUi as IDataObject)
+									.customPropertiesValues as IDataObject[];
+								if (customProperties) {
+									for (const customProperty of customProperties) {
+										body.properties.push({
+											name: customProperty.property,
+											value: customProperty.value,
+										});
+									}
+								}
+							}
+							const endpoint = `/deals/v1/deal/${dealId}`;
+							responseData = await hubspotApiRequest.call(this, 'PUT', endpoint, body);
+						}
+						if (operation === 'get') {
+							const dealId = this.getNodeParameter(
+								'dealId',
+								i,
+								{},
+								{ extractValue: true },
+							) as string;
+							const filters = this.getNodeParameter('filters', i);
+							if (filters.includePropertyVersions) {
+								qs.includePropertyVersions = filters.includePropertyVersions as boolean;
+							}
+
+							if (filters.propertiesCollection) {
+								const propertiesValues = filters.propertiesCollection // @ts-ignore
+									.propertiesValues as IDataObject;
+								const properties = propertiesValues.properties as string | string[];
+								qs.properties = !Array.isArray(propertiesValues.properties)
+									? (properties as string).split(',')
+									: properties;
+								qs.propertyMode = snakeCase(propertiesValues.propertyMode as string);
+							}
+							const endpoint = `/deals/v1/deal/${dealId}`;
+							responseData = await hubspotApiRequest.call(this, 'GET', endpoint);
+						}
+						if (operation === 'getAll') {
+							const filters = this.getNodeParameter('filters', i);
+							const returnAll = this.getNodeParameter('returnAll', 0);
+							if (filters.includeAssociations) {
+								qs.includeAssociations = filters.includeAssociations as boolean;
+							}
+
+							//for version 2
+							if (filters.propertiesCollection) {
+								const propertiesValues = filters.propertiesCollection // @ts-ignore
+									.propertiesValues as IDataObject;
+								const properties = propertiesValues.properties as string | string[];
+								qs.properties = !Array.isArray(propertiesValues.properties)
+									? (properties as string).split(',')
+									: properties;
+								qs.propertyMode = snakeCase(propertiesValues.propertyMode as string);
+							}
+
+							//for version > 2
+							if (filters.properties) {
+								const properties = filters.properties as string | string[];
+								qs.properties = !Array.isArray(properties) ? properties.split(',') : properties;
+							}
+							if (filters.propertiesWithHistory) {
+								const properties = filters.propertiesWithHistory as string | string[];
+								qs.propertiesWithHistory = !Array.isArray(properties)
+									? properties.split(',')
+									: properties;
+							}
+
+							const endpoint = '/deals/v1/deal/paged';
+							if (returnAll) {
+								responseData = await hubspotApiRequestAllItems.call(
+									this,
+									'deals',
+									'GET',
+									endpoint,
+									{},
+									qs,
+								);
+							} else {
+								qs.limit = this.getNodeParameter('limit', 0);
+								responseData = await hubspotApiRequest.call(this, 'GET', endpoint, {}, qs);
+								responseData = responseData.deals;
+							}
+						}
+						if (operation === 'getRecentlyCreatedUpdated') {
+							const endpoint = '/deals/v1/deal/recent/created';
+							const filters = this.getNodeParameter('filters', i);
+							const returnAll = this.getNodeParameter('returnAll', 0);
+							if (filters.since) {
+								qs.since = new Date(filters.since as string).getTime();
+							}
+							if (filters.includePropertyVersions) {
+								qs.includePropertyVersions = filters.includePropertyVersions as boolean;
+							}
+							if (returnAll) {
+								responseData = await hubspotApiRequestAllItems.call(
+									this,
+									'results',
+									'GET',
+									endpoint,
+									{},
+									qs,
+								);
+							} else {
+								qs.count = this.getNodeParameter('limit', 0);
+								responseData = await hubspotApiRequest.call(this, 'GET', endpoint, {}, qs);
+								responseData = responseData.results;
+							}
+						}
+						if (operation === 'delete') {
+							const dealId = this.getNodeParameter(
+								'dealId',
+								i,
+								{},
+								{ extractValue: true },
+							) as string;
+							const endpoint = `/deals/v1/deal/${dealId}`;
+							responseData = await hubspotApiRequest.call(this, 'DELETE', endpoint);
+							responseData =
+								responseData === undefined ? { vid: dealId, deleted: true } : responseData;
+						}
+						//https://developers.hubspot.com/docs/api/crm/search
+						if (operation === 'search') {
+							const additionalFields = this.getNodeParameter('additionalFields', i);
+							const returnAll = this.getNodeParameter('returnAll', 0);
+							const filtersGroupsUi = this.getNodeParameter('filterGroupsUi', i) as IDataObject;
+							const sortBy = additionalFields.sortBy || 'createdate';
+							const direction = additionalFields.direction || 'DESCENDING';
+
+							const body: IDataObject = {
+								sorts: [
+									{
+										propertyName: sortBy,
+										direction,
+									},
+								],
+							};
+
+							if (filtersGroupsUi?.filterGroupsValues) {
+								const filterGroupValues = filtersGroupsUi.filterGroupsValues as IDataObject[];
+								body.filterGroups = [];
+								for (const filterGroupValue of filterGroupValues) {
+									if (filterGroupValue.filtersUi) {
+										const filterValues = (filterGroupValue.filtersUi as IDataObject)
+											.filterValues as IDataObject[];
+										for (const filter of filterValues) {
+											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];
+										}
+										(body.filterGroups as IDataObject[]).push({ filters: filterValues });
+									}
+								}
+								//@ts-ignore
+								if (body.filterGroups.length > 3) {
+									throw new NodeOperationError(this.getNode(), 'You can only have 3 filter groups');
+								}
+							}
+
+							Object.assign(body, additionalFields);
+
+							const endpoint = '/crm/v3/objects/deals/search';
+
+							if (returnAll) {
+								responseData = await hubspotApiRequestAllItems.call(
+									this,
+									'results',
+									'POST',
+									endpoint,
+									body,
+									qs,
+								);
+							} else {
+								body.limit = this.getNodeParameter('limit', 0);
+								responseData = await hubspotApiRequest.call(this, 'POST', endpoint, body, qs);
+								responseData = responseData.results;
+							}
+						}
+					}
+					if (resource === 'engagement') {
+						//https://legacydocs.hubspot.com/docs/methods/engagements/create_engagement
+						if (operation === 'create') {
+							const type = this.getNodeParameter('type', i) as string;
+							const metadata = this.getNodeParameter('metadata', i) as IDataObject;
+							const associations = this.getNodeParameter(
+								'additionalFields.associations',
+								i,
+								{},
+							) as IDataObject;
+
+							if (!Object.keys(metadata).length) {
+								throw new NodeOperationError(
+									this.getNode(),
+									'At least one metadata field needs to set',
+									{ itemIndex: i },
+								);
+							}
+
+							const body: {
+								engagement: { type: string };
+								metadata: IDataObject;
+								associations: IDataObject;
+							} = {
+								engagement: {
+									type: type.toUpperCase(),
+								},
+								metadata: {},
+								associations: {},
+							};
+
+							if (type === 'email') {
+								body.metadata = getEmailMetadata(metadata);
+							}
+
+							if (type === 'task') {
+								body.metadata = getTaskMetadata(metadata);
+							}
+
+							if (type === 'meeting') {
+								body.metadata = getMeetingMetadata(metadata);
+							}
+
+							if (type === 'call') {
+								body.metadata = getCallMetadata(metadata);
+							}
+
+							//@ts-ignore
+							body.associations = getAssociations(associations);
+
+							const endpoint = '/engagements/v1/engagements';
+							responseData = await hubspotApiRequest.call(this, 'POST', endpoint, body);
+						}
+						//https://legacydocs.hubspot.com/docs/methods/engagements/get_engagement
+						if (operation === 'delete') {
+							const engagementId = this.getNodeParameter('engagementId', i, undefined, {
+								extractValue: true,
+							}) as string;
+							const endpoint = `/engagements/v1/engagements/${engagementId}`;
+							responseData = await hubspotApiRequest.call(this, 'DELETE', endpoint, {}, qs);
+							responseData =
+								responseData === undefined ? { vid: engagementId, deleted: true } : responseData;
+						}
+						//https://legacydocs.hubspot.com/docs/methods/engagements/get_engagement
+						if (operation === 'get') {
+							const engagementId = this.getNodeParameter('engagementId', i, undefined, {
+								extractValue: true,
+							}) as string;
+							const endpoint = `/engagements/v1/engagements/${engagementId}`;
+							responseData = await hubspotApiRequest.call(this, 'GET', endpoint, {}, qs);
+						}
+						//https://legacydocs.hubspot.com/docs/methods/engagements/get-all-engagements
+						if (operation === 'getAll') {
+							const returnAll = this.getNodeParameter('returnAll', 0);
+							const endpoint = '/engagements/v1/engagements/paged';
+							if (returnAll) {
+								responseData = await hubspotApiRequestAllItems.call(
+									this,
+									'results',
+									'GET',
+									endpoint,
+									{},
+									qs,
+								);
+							} else {
+								qs.limit = this.getNodeParameter('limit', 0);
+								responseData = await hubspotApiRequest.call(this, 'GET', endpoint, {}, qs);
+								responseData = responseData.results;
+							}
+						}
+					}
+					//https://developers.hubspot.com/docs/methods/forms/forms_overview
+					if (resource === 'form') {
+						//https://developers.hubspot.com/docs/methods/forms/v2/get_fields
+						if (operation === 'getFields') {
+							const formId = this.getNodeParameter('formId', i) as string;
+							responseData = await hubspotApiRequest.call(
+								this,
+								'GET',
+								`/forms/v2/fields/${formId}`,
+							);
+						}
+						//https://developers.hubspot.com/docs/methods/forms/submit_form_v3
+						if (operation === 'submit') {
+							const formId = this.getNodeParameter('formId', i) as string;
+							const additionalFields = this.getNodeParameter('additionalFields', i);
+							const context = (this.getNodeParameter('contextUi', i) as IDataObject)
+								.contextValue as IDataObject;
+							const legalConsent = (this.getNodeParameter('lengalConsentUi', i) as IDataObject)
+								.lengalConsentValues as IDataObject;
+							const legitimateInteres = (this.getNodeParameter('lengalConsentUi', i) as IDataObject)
+								.legitimateInterestValues as IDataObject;
+							const { portalId } = await hubspotApiRequest.call(
+								this,
+								'GET',
+								`/forms/v2/forms/${formId}`,
+							);
+							const body: IForm = {
+								formId,
+								portalId,
+								legalConsentOptions: {},
+								fields: [],
+							};
+							if (additionalFields.submittedAt) {
+								body.submittedAt = new Date(additionalFields.submittedAt as string).getTime();
+							}
+							if (additionalFields.skipValidation) {
+								body.skipValidation = additionalFields.skipValidation as boolean;
+							}
+							const consent: IDataObject = {};
+							if (legalConsent) {
+								if (legalConsent.consentToProcess) {
+									consent.consentToProcess = legalConsent.consentToProcess as boolean;
+								}
+								if (legalConsent.text) {
+									consent.text = legalConsent.text as string;
+								}
+								if (legalConsent.communicationsUi) {
+									consent.communications = (legalConsent.communicationsUi as IDataObject)
+										.communicationValues as IDataObject;
+								}
+							}
+							body.legalConsentOptions!.consent = consent;
+							const fields: IDataObject = items[i].json;
+							for (const key of Object.keys(fields)) {
+								body.fields?.push({ name: key, value: fields[key] });
+							}
+							if (body.legalConsentOptions!.legitimateInterest) {
+								Object.assign(body, {
+									legalConsentOptions: { legitimateInterest: legitimateInteres },
+								});
+							}
+							if (context) {
+								clean(context);
+								Object.assign(body, { context });
+							}
+							const uri = `https://api.hsforms.com/submissions/v3/integration/submit/${portalId}/${formId}`;
+							responseData = await hubspotApiRequest.call(this, 'POST', '', body, {}, uri);
+						}
+					}
+					//https://developers.hubspot.com/docs/methods/tickets/tickets-overview
+					if (resource === 'ticket') {
+						//https://developers.hubspot.com/docs/methods/tickets/create-ticket
+						if (operation === 'create') {
+							const additionalFields = this.getNodeParameter('additionalFields', i);
+							const pipelineId = this.getNodeParameter('pipelineId', i) as string;
+							const stageId = this.getNodeParameter('stageId', i) as string;
+							const ticketName = this.getNodeParameter('ticketName', i) as string;
+							const body: IDataObject[] = [
+								{
+									// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+									name: 'hs_pipeline',
+									value: pipelineId,
+								},
+								{
+									// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+									name: 'hs_pipeline_stage',
+									value: stageId,
+								},
+								{
+									// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+									name: 'subject',
+									value: ticketName,
+								},
+							];
+							if (additionalFields.category) {
+								body.push({
+									name: 'hs_ticket_category',
+									value: additionalFields.category as string,
+								});
+							}
+							if (additionalFields.closeDate) {
+								body.push({
+									name: 'closed_date',
+									value: new Date(additionalFields.closeDate as string).getTime(),
+								});
+							}
+							if (additionalFields.createDate) {
+								body.push({
+									name: 'createdate',
+									value: new Date(additionalFields.createDate as string).getTime(),
+								});
+							}
+							if (additionalFields.description) {
+								body.push({
+									name: 'content',
+									value: additionalFields.description as string,
+								});
+							}
+							if (additionalFields.priority) {
+								body.push({
+									name: 'hs_ticket_priority',
+									value: additionalFields.priority as string,
+								});
+							}
+							if (additionalFields.resolution) {
+								body.push({
+									name: 'hs_resolution',
+									value: additionalFields.resolution as string,
+								});
+							}
+							if (additionalFields.source) {
+								body.push({
+									name: 'source_type',
+									value: additionalFields.source as string,
+								});
+							}
+							if (additionalFields.ticketOwnerId) {
+								body.push({
+									name: 'hubspot_owner_id',
+									value: additionalFields.ticketOwnerId as string,
+								});
+							}
+							const endpoint = '/crm-objects/v1/objects/tickets';
+							responseData = await hubspotApiRequest.call(this, 'POST', endpoint, body);
+
+							if (additionalFields.associatedCompanyIds) {
+								const companyAssociations: IDataObject[] = [];
+								for (const companyId of additionalFields.associatedCompanyIds as IDataObject[]) {
+									companyAssociations.push({
+										fromObjectId: responseData.objectId,
+										toObjectId: companyId,
+										category: 'HUBSPOT_DEFINED',
+										definitionId: 26,
+									});
+								}
+								await hubspotApiRequest.call(
+									this,
+									'PUT',
+									'/crm-associations/v1/associations/create-batch',
+									companyAssociations,
+								);
+							}
+
+							if (additionalFields.associatedContactIds) {
+								const contactAssociations: IDataObject[] = [];
+								for (const contactId of additionalFields.associatedContactIds as IDataObject[]) {
+									contactAssociations.push({
+										fromObjectId: responseData.objectId,
+										toObjectId: contactId,
+										category: 'HUBSPOT_DEFINED',
+										definitionId: 16,
+									});
+								}
+								await hubspotApiRequest.call(
+									this,
+									'PUT',
+									'/crm-associations/v1/associations/create-batch',
+									contactAssociations,
+								);
+							}
+						}
+						//https://developers.hubspot.com/docs/methods/tickets/get_ticket_by_id
+						if (operation === 'get') {
+							const ticketId = this.getNodeParameter('ticketId', i, undefined, {
+								extractValue: true,
+							}) as string;
+							const additionalFields = this.getNodeParameter('additionalFields', i);
+							if (additionalFields.properties) {
+								qs.properties = additionalFields.properties as string[];
+							}
+							if (additionalFields.propertiesWithHistory) {
+								qs.propertiesWithHistory = (additionalFields.propertiesWithHistory as string).split(
+									',',
+								);
+							}
+							if (additionalFields.includeDeleted) {
+								qs.includeDeleted = additionalFields.includeDeleted as boolean;
+							}
+							const endpoint = `/crm-objects/v1/objects/tickets/${ticketId}`;
+							responseData = await hubspotApiRequest.call(this, 'GET', endpoint, {}, qs);
+						}
+						//https://developers.hubspot.com/docs/methods/tickets/get-all-tickets
+						if (operation === 'getAll') {
+							const additionalFields = this.getNodeParameter('additionalFields', i);
+							const returnAll = this.getNodeParameter('returnAll', 0);
+							if (additionalFields.properties) {
+								qs.properties = additionalFields.properties as string[];
+							}
+							if (additionalFields.propertiesWithHistory) {
+								qs.propertiesWithHistory = (additionalFields.propertiesWithHistory as string).split(
+									',',
+								);
+							}
+							const endpoint = '/crm-objects/v1/objects/tickets/paged';
+							if (returnAll) {
+								responseData = await hubspotApiRequestAllItems.call(
+									this,
+									'objects',
+									'GET',
+									endpoint,
+									{},
+									qs,
+								);
+							} else {
+								qs.limit = this.getNodeParameter('limit', 0);
+								responseData = await hubspotApiRequestAllItems.call(
+									this,
+									'objects',
+									'GET',
+									endpoint,
+									{},
+									qs,
+								);
+								responseData = responseData.splice(0, qs.limit);
+							}
+						}
+						//https://developers.hubspot.com/docs/methods/tickets/delete-ticket
+						if (operation === 'delete') {
+							const ticketId = this.getNodeParameter('ticketId', i, undefined, {
+								extractValue: true,
+							}) as string;
+							const endpoint = `/crm-objects/v1/objects/tickets/${ticketId}`;
+							await hubspotApiRequest.call(this, 'DELETE', endpoint);
+							responseData =
+								responseData === undefined ? { vid: ticketId, deleted: true } : responseData;
+						}
+						//https://developers.hubspot.com/docs/methods/tickets/update-ticket
+						if (operation === 'update') {
+							const updateFields = this.getNodeParameter('updateFields', i);
+							const ticketId = this.getNodeParameter('ticketId', i, undefined, {
+								extractValue: true,
+							}) as string;
+							const body: IDataObject[] = [];
+							if (updateFields.pipelineId) {
+								body.push({
+									name: 'hs_pipeline',
+									value: updateFields.pipelineId as string,
+								});
+							}
+							if (updateFields.stageId) {
+								body.push({
+									name: 'hs_pipeline_stage',
+									value: updateFields.stageId as string,
+								});
+							}
+							if (updateFields.ticketName) {
+								body.push({
+									name: 'subject',
+									value: updateFields.ticketName as string,
+								});
+							}
+							if (updateFields.category) {
+								body.push({
+									name: 'hs_ticket_category',
+									value: updateFields.category as string,
+								});
+							}
+							if (updateFields.closeDate) {
+								body.push({
+									name: 'closed_date',
+									value: new Date(updateFields.createDate as string).getTime(),
+								});
+							}
+							if (updateFields.createDate) {
+								body.push({
+									name: 'createdate',
+									value: new Date(updateFields.createDate as string).getTime(),
+								});
+							}
+							if (updateFields.description) {
+								body.push({
+									name: 'content',
+									value: updateFields.description as string,
+								});
+							}
+							if (updateFields.priority) {
+								body.push({
+									name: 'hs_ticket_priority',
+									value: updateFields.priority as string,
+								});
+							}
+							if (updateFields.resolution) {
+								body.push({
+									name: 'hs_resolution',
+									value: updateFields.resolution as string,
+								});
+							}
+							if (updateFields.source) {
+								body.push({
+									name: 'source_type',
+									value: updateFields.source as string,
+								});
+							}
+							if (updateFields.ticketOwnerId) {
+								body.push({
+									name: 'hubspot_owner_id',
+									value: updateFields.ticketOwnerId as string,
+								});
+							}
+							const endpoint = `/crm-objects/v1/objects/tickets/${ticketId}`;
+							responseData = await hubspotApiRequest.call(this, 'PUT', endpoint, body);
+
+							if (updateFields.associatedCompanyIds) {
+								const companyAssociations: IDataObject[] = [];
+								for (const companyId of updateFields.associatedCompanyIds as IDataObject[]) {
+									companyAssociations.push({
+										fromObjectId: responseData.objectId,
+										toObjectId: companyId,
+										category: 'HUBSPOT_DEFINED',
+										definitionId: 26,
+									});
+								}
+								await hubspotApiRequest.call(
+									this,
+									'PUT',
+									'/crm-associations/v1/associations/create-batch',
+									companyAssociations,
+								);
+							}
+
+							if (updateFields.associatedContactIds) {
+								const contactAssociations: IDataObject[] = [];
+								for (const contactId of updateFields.associatedContactIds as IDataObject[]) {
+									contactAssociations.push({
+										fromObjectId: responseData.objectId,
+										toObjectId: contactId,
+										category: 'HUBSPOT_DEFINED',
+										definitionId: 16,
+									});
+								}
+								await hubspotApiRequest.call(
+									this,
+									'PUT',
+									'/crm-associations/v1/associations/create-batch',
+									contactAssociations,
+								);
+							}
+						}
+					}
+					const executionData = this.helpers.constructExecutionMetaData(
+						this.helpers.returnJsonArray(responseData as IDataObject[]),
+						{ itemData: { item: i } },
+					);
+					returnData.push(...executionData);
+				} catch (errorObject) {
+					const error = errorObject.cause.cause ? errorObject.cause : errorObject;
+					if (
+						error.cause.error?.validationResults &&
+						error.cause.error.validationResults[0].error === 'INVALID_EMAIL'
+					) {
+						const message = error.cause.error.validationResults[0].message as string;
+						set(error, 'message', message);
+					}
+					if (error.cause.error?.message !== 'The resource you are requesting could not be found') {
+						if (error.httpCode === '404' && error.description === 'resource not found') {
+							const message = `${error.node.parameters.resource} #${
+								error.node.parameters[`${error.node.parameters.resource}Id`].value
+							} could not be found. Check your ${error.node.parameters.resource} ID is correct`;
+
+							set(error, 'message', message);
+						}
+					}
+					if (this.continueOnFail()) {
+						returnData.push({
+							json: { error: (error as JsonObject).message },
+							pairedItem: { item: i },
+						});
+						continue;
+					}
+					if (error instanceof NodeApiError) {
+						set(error, 'context.itemIndex', i);
+					}
+					throw error;
+				}
+			}
+		}
+		return [returnData];
+	}
+}
diff --git a/packages/nodes-base/nodes/Hubspot/V2/TicketDescription.ts b/packages/nodes-base/nodes/Hubspot/V2/TicketDescription.ts
new file mode 100644
index 0000000000000..50a4082f41730
--- /dev/null
+++ b/packages/nodes-base/nodes/Hubspot/V2/TicketDescription.ts
@@ -0,0 +1,606 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+export const ticketOperations: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				resource: ['ticket'],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a ticket',
+				action: 'Create a ticket',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a ticket',
+				action: 'Delete a ticket',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get a ticket',
+				action: 'Get a ticket',
+			},
+			{
+				name: 'Get Many',
+				value: 'getAll',
+				description: 'Get many tickets',
+				action: 'Get many tickets',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update a ticket',
+				action: 'Update a ticket',
+			},
+		],
+		default: 'create',
+	},
+];
+
+export const ticketFields: INodeProperties[] = [
+	/* -------------------------------------------------------------------------- */
+	/*                                ticket:create                               */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Pipeline Name or ID',
+		name: 'pipelineId',
+		type: 'options',
+		required: true,
+		typeOptions: {
+			loadOptionsMethod: 'getTicketPipelines',
+		},
+		displayOptions: {
+			show: {
+				resource: ['ticket'],
+				operation: ['create'],
+			},
+		},
+		default: '',
+		description:
+			'The ID of the pipeline the ticket is in. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+	},
+	{
+		displayName: 'Stage Name or ID',
+		name: 'stageId',
+		type: 'options',
+		required: true,
+		typeOptions: {
+			loadOptionsMethod: 'getTicketStages',
+			loadOptionsDependsOn: ['pipelineId'],
+		},
+		displayOptions: {
+			show: {
+				resource: ['ticket'],
+				operation: ['create'],
+			},
+		},
+		default: '',
+		description:
+			'The stage ID of the pipeline the ticket is in; depends on Pipeline ID. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+	},
+	{
+		displayName: 'Ticket Name',
+		name: 'ticketName',
+		type: 'string',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: ['ticket'],
+				operation: ['create'],
+			},
+		},
+		default: '',
+	},
+	{
+		displayName: 'Ticket Properties',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Property',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['ticket'],
+				operation: ['create'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Company Names or IDs',
+				name: 'associatedCompanyIds',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getCompanies',
+				},
+				default: [],
+				description:
+					'Whether to include specific Company properties in the returned results. Choose from a list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>. Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Contact Names or IDs',
+				name: 'associatedContactIds',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getContacts',
+				},
+				default: [],
+				description:
+					'Whether to include specific Contact properties in the returned results. Choose from a list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>. Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Category Name or ID',
+				name: 'category',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getTicketCategories',
+				},
+				default: '',
+				description:
+					'Main reason customer reached out for help. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Close Date',
+				name: 'closeDate',
+				type: 'dateTime',
+				default: '',
+				description:
+					'The date the ticket was closed. When using expressions, the time should be specified in YYYY-MM-DD hh-mm-ss format.',
+			},
+			{
+				displayName: 'Create Date',
+				name: 'createDate',
+				type: 'dateTime',
+				default: '',
+				description:
+					'The date the ticket was created. When using expressions, the time should be specified in YYYY-MM-DD hh-mm-ss format.',
+			},
+			{
+				displayName: 'Description',
+				name: 'description',
+				type: 'string',
+				typeOptions: {
+					alwaysOpenEditWindow: true,
+				},
+				default: '',
+				description: 'Description of the ticket',
+			},
+			{
+				displayName: 'Priority Name or ID',
+				name: 'priority',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getTicketPriorities',
+				},
+				default: '',
+				description:
+					'The level of attention needed on the ticket. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Resolution Name or ID',
+				name: 'resolution',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getTicketResolutions',
+				},
+				default: '',
+				description:
+					'The action taken to resolve the ticket. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Source Name or ID',
+				name: 'source',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getTicketSources',
+				},
+				default: '',
+				description:
+					'Channel where ticket was originally submitted. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Ticket Owner Name or ID',
+				name: 'ticketOwnerId',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getOwners',
+				},
+				default: '',
+				description:
+					'The user from your team that the ticket is assigned to. You can assign additional users to a ticket record by creating a custom HubSpot user property. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+		],
+	},
+	/* -------------------------------------------------------------------------- */
+	/*                                 ticket:update                              */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Ticket to Update',
+		name: 'ticketId',
+		type: 'resourceLocator',
+		default: { mode: 'list', value: '' },
+		required: true,
+		displayOptions: {
+			show: {
+				resource: ['ticket'],
+				operation: ['update'],
+			},
+		},
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				placeholder: 'Select from the list',
+				typeOptions: {
+					searchListMethod: 'searchTickets',
+				},
+			},
+			{
+				displayName: 'By Id',
+				name: 'id',
+				type: 'string',
+				placeholder: '58539222',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex: '[0-9]+',
+							errorMessage: 'Not a valid HubSpot Ticket ID',
+						},
+					},
+				],
+			},
+		],
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['ticket'],
+				operation: ['update'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Company Names or IDs',
+				name: 'associatedCompanyIds',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getCompanies',
+				},
+				default: [],
+				description:
+					'Whether to include specific Company properties in the returned results. Choose from a list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>. Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Contact Names or IDs',
+				name: 'associatedContactIds',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getContacts',
+				},
+				default: [],
+				description:
+					'Whether to include specific Contact properties in the returned results. Choose from a list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>. Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Category Name or ID',
+				name: 'category',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getTicketCategories',
+				},
+				default: '',
+				description:
+					'Main reason customer reached out for help. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Close Date',
+				name: 'closeDate',
+				type: 'dateTime',
+				default: '',
+				description:
+					'The date the ticket was closed. When using expressions, the time should be specified in YYYY-MM-DD hh-mm-ss format.',
+			},
+			{
+				displayName: 'Create Date',
+				name: 'createDate',
+				type: 'dateTime',
+				default: '',
+				description:
+					'The date the ticket was created. When using expressions, the time should be specified in YYYY-MM-DD hh-mm-ss format.',
+			},
+			{
+				displayName: 'Description',
+				name: 'description',
+				type: 'string',
+				typeOptions: {
+					alwaysOpenEditWindow: true,
+				},
+				default: '',
+				description: 'Description of the ticket',
+			},
+			{
+				displayName: 'Pipeline Name or ID',
+				name: 'pipelineId',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getTicketPipelines',
+				},
+				default: '',
+				description:
+					'The ID of the pipeline the ticket is in. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Priority Name or ID',
+				name: 'priority',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getTicketPriorities',
+				},
+				default: '',
+				description:
+					'The level of attention needed on the ticket. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Resolution Name or ID',
+				name: 'resolution',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getTicketResolutions',
+				},
+				default: '',
+				description:
+					'The action taken to resolve the ticket. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Source Name or ID',
+				name: 'source',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getTicketSources',
+				},
+				default: '',
+				description:
+					'Channel where ticket was originally submitted. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Stage Name or ID',
+				name: 'stageId',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getTicketStages',
+					loadOptionsDependsOn: ['updateFields.pipelineId'],
+				},
+				default: '',
+				description:
+					'The stage ID of the pipeline the ticket is in; depends on Pipeline ID. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Ticket Name',
+				name: 'ticketName',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Ticket Owner Name or ID',
+				name: 'ticketOwnerId',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getOwners',
+				},
+				default: '',
+				description:
+					'The user from your team that the ticket is assigned to. You can assign additional users to a ticket record by creating a custom HubSpot user property. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                  ticket:get                                */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Ticket to Get',
+		name: 'ticketId',
+		type: 'resourceLocator',
+		default: { mode: 'list', value: '' },
+		required: true,
+		displayOptions: {
+			show: {
+				resource: ['ticket'],
+				operation: ['get'],
+			},
+		},
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				placeholder: 'Select from the list',
+				typeOptions: {
+					searchListMethod: 'searchTickets',
+				},
+			},
+			{
+				displayName: 'By Id',
+				name: 'id',
+				type: 'string',
+				placeholder: '58539222',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex: '[0-9]+',
+							errorMessage: 'Not a valid HubSpot Ticket ID',
+						},
+					},
+				],
+			},
+		],
+	},
+	{
+		displayName: 'Options',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['ticket'],
+				operation: ['get'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Include Deleted',
+				name: 'includeDeleted',
+				type: 'boolean',
+				default: false,
+			},
+			{
+				displayName: 'Ticket Properties to Include',
+				name: 'properties',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getTicketProperties',
+				},
+				default: [],
+				description:
+					'Whether to include specific Ticket properties in the returned results. Choose from a list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>. Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Properties With History',
+				name: 'propertiesWithHistory',
+				type: 'string',
+				default: '',
+				description:
+					"Works similarly to properties=, but this parameter will include the history for the specified property, instead of just including the current value. Use this parameter when you need the full history of changes to a property's value.",
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                 ticket:getAll                              */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: ['ticket'],
+				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: ['ticket'],
+				operation: ['getAll'],
+				returnAll: [false],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 250,
+		},
+		default: 100,
+		description: 'Max number of results to return',
+	},
+	{
+		displayName: 'Options',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['ticket'],
+				operation: ['getAll'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Ticket Properties to Include',
+				name: 'properties',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getTicketProperties',
+				},
+				default: [],
+				description:
+					'Whether to include specific Ticket properties in the returned results. Choose from a list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>. Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Properties With History',
+				name: 'propertiesWithHistory',
+				type: 'string',
+				default: '',
+				description:
+					"Works similarly to properties=, but this parameter will include the history for the specified property, instead of just including the current value. Use this parameter when you need the full history of changes to a property's value.",
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                 ticket:delete                              */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Ticket to Delete',
+		name: 'ticketId',
+		type: 'resourceLocator',
+		default: { mode: 'list', value: '' },
+		required: true,
+		displayOptions: {
+			show: {
+				resource: ['ticket'],
+				operation: ['delete'],
+			},
+		},
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				placeholder: 'Select from the list',
+				typeOptions: {
+					searchListMethod: 'searchTickets',
+				},
+			},
+			{
+				displayName: 'By Id',
+				name: 'id',
+				type: 'string',
+				placeholder: '58539222',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex: '[0-9]+',
+							errorMessage: 'Not a valid HubSpot Ticket ID',
+						},
+					},
+				],
+			},
+		],
+	},
+];
diff --git a/packages/nodes-base/nodes/Hubspot/hubspot.svg b/packages/nodes-base/nodes/Hubspot/hubspot.svg
index d2ea2822e5ac8..2b937259e9cce 100644
--- a/packages/nodes-base/nodes/Hubspot/hubspot.svg
+++ b/packages/nodes-base/nodes/Hubspot/hubspot.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 62.883 69.883" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x="2.442" y="2.442"/><symbol id="a" overflow="visible"><path d="M55.504 30.401a16.26 16.26 0 00-5.904-5.864c-1.865-1.084-3.794-1.773-5.972-2.07v-7.798a5.711 5.711 0 003.525-5.357 5.86 5.86 0 00-5.859-5.889 5.91 5.91 0 00-5.908 5.889c0 2.393 1.27 4.434 3.452 5.357v7.754a17.036 17.036 0 00-5.195 1.631L12.769 8.247c.146-.552.273-1.123.273-1.724A6.522 6.522 0 006.519 0 6.52 6.52 0 000 6.524a6.523 6.523 0 006.524 6.524 6.47 6.47 0 003.35-.952l1.367 1.035 18.726 13.501c-.991.908-1.914 1.943-2.651 3.105-1.494 2.368-2.407 4.971-2.407 7.813v.586a16.388 16.388 0 001.025 5.645C26.5 45.324 27.33 46.73 28.361 48l-6.221 6.235a5.015 5.015 0 00-5.298 1.162c-.947.942-1.48 2.227-1.475 3.565s.527 2.612 1.479 3.564 2.227 1.48 3.565 1.48a5.01 5.01 0 003.565-1.48 5.047 5.047 0 001.475-3.564 5.03 5.03 0 00-.234-1.514l6.426-6.426a16.09 16.09 0 002.856 1.563 16.7 16.7 0 006.685 1.406h.439a15.76 15.76 0 007.627-1.929 15.77 15.77 0 005.977-5.63c1.499-2.393 2.319-5.044 2.319-7.959v-.146c0-2.866-.664-5.508-2.051-7.93zm-7.847 13.487c-1.743 1.938-3.75 3.135-6.016 3.135h-.43c-1.294 0-2.564-.356-3.799-1.011a8.79 8.79 0 01-3.33-3.032c-.898-1.27-1.387-2.656-1.387-4.126v-.439c0-1.445.278-2.817.977-4.111.747-1.465 1.758-2.515 3.101-3.389a7.6 7.6 0 014.297-1.294h.147c1.416 0 2.769.278 4.038.928a8.558 8.558 0 013.174 2.886 9.18 9.18 0 011.421 4.053l.034.913c0 1.987-.762 3.828-2.28 5.498z" stroke="none" fill="#f8761f" fill-rule="nonzero"/></symbol></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round" viewBox="0 0 62.883 69.883"><use xlink:href="#a" x="2.442" y="2.442"/><symbol id="a" overflow="visible"><path fill="#f8761f" fill-rule="nonzero" stroke="none" d="M55.504 30.401a16.26 16.26 0 0 0-5.904-5.864c-1.865-1.084-3.794-1.773-5.972-2.07v-7.798a5.71 5.71 0 0 0 3.525-5.357 5.86 5.86 0 0 0-5.859-5.889 5.91 5.91 0 0 0-5.908 5.889c0 2.393 1.27 4.434 3.452 5.357v7.754a17 17 0 0 0-5.195 1.631L12.769 8.247c.146-.552.273-1.123.273-1.724A6.52 6.52 0 0 0 6.519 0 6.52 6.52 0 0 0 0 6.524a6.523 6.523 0 0 0 6.524 6.524 6.47 6.47 0 0 0 3.35-.952l1.367 1.035 18.726 13.501c-.991.908-1.914 1.943-2.651 3.105-1.494 2.368-2.407 4.971-2.407 7.813v.586a16.4 16.4 0 0 0 1.025 5.645C26.5 45.324 27.33 46.73 28.361 48l-6.221 6.235a5.01 5.01 0 0 0-5.298 1.162c-.947.942-1.48 2.227-1.475 3.565s.527 2.612 1.479 3.564 2.227 1.48 3.565 1.48a5 5 0 0 0 3.565-1.48 5.05 5.05 0 0 0 1.475-3.564 5 5 0 0 0-.234-1.514l6.426-6.426a16 16 0 0 0 2.856 1.563 16.7 16.7 0 0 0 6.685 1.406h.439a15.76 15.76 0 0 0 7.627-1.929 15.77 15.77 0 0 0 5.977-5.63c1.499-2.393 2.319-5.044 2.319-7.959v-.146c0-2.866-.664-5.508-2.051-7.93zm-7.847 13.487c-1.743 1.938-3.75 3.135-6.016 3.135h-.43c-1.294 0-2.564-.356-3.799-1.011a8.8 8.8 0 0 1-3.33-3.032c-.898-1.27-1.387-2.656-1.387-4.126v-.439c0-1.445.278-2.817.977-4.111.747-1.465 1.758-2.515 3.101-3.389a7.6 7.6 0 0 1 4.297-1.294h.147c1.416 0 2.769.278 4.038.928a8.56 8.56 0 0 1 3.174 2.886 9.2 9.2 0 0 1 1.421 4.053l.034.913c0 1.987-.762 3.828-2.28 5.498z"/></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/HumanticAI/GenericFunctions.ts b/packages/nodes-base/nodes/HumanticAI/GenericFunctions.ts
index d33ae31a96493..bd0479e0f0554 100644
--- a/packages/nodes-base/nodes/HumanticAI/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/HumanticAI/GenericFunctions.ts
@@ -1,18 +1,17 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	JsonObject,
+	IRequestOptions,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function humanticAiApiRequest(
-	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -21,7 +20,7 @@ export async function humanticAiApiRequest(
 ): Promise<any> {
 	try {
 		const credentials = await this.getCredentials('humanticAiApi');
-		let options: OptionsWithUri = {
+		let options = {
 			headers: {
 				'Content-Type': 'application/json',
 			},
@@ -30,7 +29,7 @@ export async function humanticAiApiRequest(
 			body,
 			uri: `https://api.humantic.ai/v1${resource}`,
 			json: true,
-		};
+		} satisfies IRequestOptions;
 
 		options = Object.assign({}, options, option);
 		options.qs.apikey = credentials.apiKey;
diff --git a/packages/nodes-base/nodes/HumanticAI/ProfileDescription.ts b/packages/nodes-base/nodes/HumanticAI/ProfileDescription.ts
index f12dc4b4d4d90..e27350232ed6c 100644
--- a/packages/nodes-base/nodes/HumanticAI/ProfileDescription.ts
+++ b/packages/nodes-base/nodes/HumanticAI/ProfileDescription.ts
@@ -68,7 +68,7 @@ export const profileFields: INodeProperties[] = [
 		description: 'Whether to send a resume for a resume based analysis',
 	},
 	{
-		displayName: 'Binary Property',
+		displayName: 'Input Binary Field',
 		name: 'binaryPropertyName',
 		type: 'string',
 		default: 'data',
@@ -79,7 +79,7 @@ export const profileFields: INodeProperties[] = [
 				sendResume: [true],
 			},
 		},
-		description: 'The resume in PDF or DOCX format',
+		hint: 'The name of the input binary field containing the resume in PDF or DOCX format',
 	},
 
 	/* -------------------------------------------------------------------------- */
@@ -180,7 +180,7 @@ export const profileFields: INodeProperties[] = [
 		description: 'Additional text written by the user',
 	},
 	{
-		displayName: 'Binary Property',
+		displayName: 'Input Binary Field',
 		name: 'binaryPropertyName',
 		type: 'string',
 		default: 'data',
@@ -191,6 +191,6 @@ export const profileFields: INodeProperties[] = [
 				sendResume: [true],
 			},
 		},
-		description: 'The resume in PDF or DOCX format',
+		hint: 'The name of the input binary field containing the resume in PDF or DOCX format',
 	},
 ];
diff --git a/packages/nodes-base/nodes/Hunter/GenericFunctions.ts b/packages/nodes-base/nodes/Hunter/GenericFunctions.ts
index 8627f4f2c2d50..d78a2d204a3f5 100644
--- a/packages/nodes-base/nodes/Hunter/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Hunter/GenericFunctions.ts
@@ -1,17 +1,17 @@
-import type { OptionsWithUri } from 'request';
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
+	IRequestOptions,
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function hunterApiRequest(
-	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -21,7 +21,7 @@ export async function hunterApiRequest(
 ): Promise<any> {
 	const credentials = await this.getCredentials('hunterApi');
 	qs = Object.assign({ api_key: credentials.apiKey }, qs);
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		method,
 		qs,
 		body,
@@ -46,7 +46,7 @@ export async function hunterApiRequest(
 export async function hunterApiRequestAllItems(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
diff --git a/packages/nodes-base/nodes/Hunter/Hunter.node.ts b/packages/nodes-base/nodes/Hunter/Hunter.node.ts
index 224518fa7c7c7..2f74dc145a181 100644
--- a/packages/nodes-base/nodes/Hunter/Hunter.node.ts
+++ b/packages/nodes-base/nodes/Hunter/Hunter.node.ts
@@ -85,7 +85,7 @@ export class Hunter implements INodeType {
 					},
 				},
 				default: true,
-				description: 'Whether to return only the the found emails',
+				description: 'Whether to return only the found emails',
 			},
 			{
 				displayName: 'Return All',
@@ -384,6 +384,6 @@ export class Hunter implements INodeType {
 			}
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/ICalendar/ICalendar.node.json b/packages/nodes-base/nodes/ICalendar/ICalendar.node.json
index 305df5af63b13..980ffbe77fa9f 100644
--- a/packages/nodes-base/nodes/ICalendar/ICalendar.node.json
+++ b/packages/nodes-base/nodes/ICalendar/ICalendar.node.json
@@ -6,10 +6,11 @@
 	"resources": {
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.ical/"
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.converttofile/"
 			}
 		]
 	},
+	"alias": ["ics", ".ics"],
 	"subcategories": {
 		"Core Nodes": ["Files"]
 	}
diff --git a/packages/nodes-base/nodes/ICalendar/ICalendar.node.ts b/packages/nodes-base/nodes/ICalendar/ICalendar.node.ts
index c08c2b72e274e..f24a3644d7075 100644
--- a/packages/nodes-base/nodes/ICalendar/ICalendar.node.ts
+++ b/packages/nodes-base/nodes/ICalendar/ICalendar.node.ts
@@ -1,22 +1,16 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
 import type {
 	IExecuteFunctions,
-	IDataObject,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
-import { promisify } from 'util';
-
-import moment from 'moment-timezone';
-
-import * as ics from 'ics';
-
-const createEvent = promisify(ics.createEvent);
+import * as createEvent from './createEvent.operation';
 
 export class ICalendar implements INodeType {
 	description: INodeTypeDescription = {
+		hidden: true,
 		displayName: 'iCalendar',
 		name: 'iCal',
 		icon: 'fa:calendar',
@@ -45,330 +39,20 @@ export class ICalendar implements INodeType {
 				],
 				default: 'createEventFile',
 			},
-			{
-				displayName: 'Event Title',
-				name: 'title',
-				type: 'string',
-				default: '',
-			},
-			{
-				displayName: 'Start',
-				name: 'start',
-				type: 'dateTime',
-				default: '',
-				required: true,
-				description:
-					'Date and time at which the event begins. (For all-day events, the time will be ignored.).',
-			},
-			{
-				displayName: 'End',
-				name: 'end',
-				type: 'dateTime',
-				default: '',
-				required: true,
-				description:
-					'Date and time at which the event ends. (For all-day events, the time will be ignored.).',
-			},
-			{
-				displayName: 'All Day',
-				name: 'allDay',
-				type: 'boolean',
-				default: false,
-				description: 'Whether the event lasts all day or not',
-			},
-			{
-				displayName: 'Binary Property',
-				name: 'binaryPropertyName',
-				type: 'string',
-				default: 'data',
-				required: true,
-				description: 'The field that your iCalendar file will be available under in the output',
-			},
-			{
-				displayName: 'Additional Fields',
-				name: 'additionalFields',
-				type: 'collection',
-				placeholder: 'Add Field',
-				default: {},
-				displayOptions: {
-					show: {
-						operation: ['createEventFile'],
-					},
-				},
-				options: [
-					{
-						displayName: 'Attendees',
-						name: 'attendeesUi',
-						type: 'fixedCollection',
-						typeOptions: {
-							multipleValues: true,
-						},
-						placeholder: 'Add Attendee',
-						default: {},
-						options: [
-							{
-								displayName: 'Attendees',
-								name: 'attendeeValues',
-								values: [
-									{
-										displayName: 'Name',
-										name: 'name',
-										type: 'string',
-										required: true,
-										default: '',
-									},
-									{
-										displayName: 'Email',
-										name: 'email',
-										type: 'string',
-										placeholder: 'name@email.com',
-										required: true,
-										default: '',
-									},
-									{
-										displayName: 'RSVP',
-										name: 'rsvp',
-										type: 'boolean',
-										default: false,
-										description: 'Whether the attendee has to confirm attendance or not',
-									},
-								],
-							},
-						],
-					},
-					{
-						displayName: 'Busy Status',
-						name: 'busyStatus',
-						type: 'options',
-						options: [
-							{
-								name: 'Busy',
-								value: 'BUSY',
-							},
-							{
-								name: 'Tentative',
-								value: 'TENTATIVE',
-							},
-						],
-						default: '',
-						description: 'Used to specify busy status for Microsoft applications, like Outlook',
-					},
-					{
-						displayName: 'Calendar Name',
-						name: 'calName',
-						type: 'string',
-						default: '',
-						description:
-							'Specifies the calendar (not event) name. Used by Apple iCal and Microsoft Outlook (<a href="https://docs.microsoft.com/en-us/openspecs/exchange_server_protocols/ms-oxcical/1da58449-b97e-46bd-b018-a1ce576f3e6d">spec</a>).',
-					},
-					{
-						displayName: 'Description',
-						name: 'description',
-						type: 'string',
-						default: '',
-					},
-					{
-						displayName: 'File Name',
-						name: 'fileName',
-						type: 'string',
-						default: '',
-						description: 'The name of the file to be generated. Default value is event.ics.',
-					},
-					{
-						displayName: 'Geolocation',
-						name: 'geolocationUi',
-						type: 'fixedCollection',
-						typeOptions: {
-							multipleValues: false,
-						},
-						placeholder: 'Add Geolocation',
-						default: {},
-						options: [
-							{
-								displayName: 'Geolocation',
-								name: 'geolocationValues',
-								values: [
-									{
-										displayName: 'Latitude',
-										name: 'lat',
-										type: 'string',
-										default: '',
-									},
-									{
-										displayName: 'Longitude',
-										name: 'lon',
-										type: 'string',
-										default: '',
-									},
-								],
-							},
-						],
-					},
-					{
-						displayName: 'Location',
-						name: 'location',
-						type: 'string',
-						default: '',
-						description: 'The intended venue',
-					},
-					{
-						displayName: 'Recurrence Rule',
-						name: 'recurrenceRule',
-						type: 'string',
-						default: '',
-						description:
-							'A rule to define the repeat pattern of the event (RRULE). (<a href="https://icalendar.org/rrule-tool.html">Rule generator</a>).',
-					},
-					{
-						displayName: 'Organizer',
-						name: 'organizerUi',
-						type: 'fixedCollection',
-						typeOptions: {
-							multipleValues: false,
-						},
-						placeholder: 'Add Organizer',
-						default: {},
-						options: [
-							{
-								displayName: 'Organizer',
-								name: 'organizerValues',
-								values: [
-									{
-										displayName: 'Name',
-										name: 'name',
-										type: 'string',
-										default: '',
-										required: true,
-									},
-									{
-										displayName: 'Email',
-										name: 'email',
-										type: 'string',
-										placeholder: 'name@email.com',
-										default: '',
-										required: true,
-									},
-								],
-							},
-						],
-					},
-					{
-						displayName: 'Sequence',
-						name: 'sequence',
-						type: 'number',
-						default: 0,
-						description:
-							'When sending an update for an event (with the same uid), defines the revision sequence number',
-					},
-					{
-						displayName: 'Status',
-						name: 'status',
-						type: 'options',
-						options: [
-							{
-								name: 'Confirmed',
-								value: 'CONFIRMED',
-							},
-							{
-								name: 'Cancelled',
-								value: 'CANCELLED',
-							},
-							{
-								name: 'Tentative',
-								value: 'TENTATIVE',
-							},
-						],
-						default: 'CONFIRMED',
-					},
-					{
-						displayName: 'UID',
-						name: 'uid',
-						type: 'string',
-						default: '',
-						description:
-							'Universally unique ID for the event (will be auto-generated if not specified here). Should be globally unique.',
-					},
-					{
-						displayName: 'URL',
-						name: 'url',
-						type: 'string',
-						default: '',
-						description: 'URL associated with event',
-					},
-				],
-			},
+			...createEvent.description,
 		],
 	};
 
-	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+	async execute(this: IExecuteFunctions) {
 		const items = this.getInputData();
-		const length = items.length;
-		const returnData: INodeExecutionData[] = [];
 		const operation = this.getNodeParameter('operation', 0);
-		if (operation === 'createEventFile') {
-			for (let i = 0; i < length; i++) {
-				const title = this.getNodeParameter('title', i) as string;
-				const allDay = this.getNodeParameter('allDay', i) as boolean;
-				const start = this.getNodeParameter('start', i) as string;
-				let end = this.getNodeParameter('end', i) as string;
-				end = allDay ? moment(end).utc().add(1, 'day').format() : end;
-				const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i);
-				const additionalFields = this.getNodeParameter('additionalFields', i);
-				let fileName = 'event.ics';
-
-				const eventStart = moment(start)
-					.toArray()
-					.splice(0, allDay ? 3 : 6) as ics.DateArray;
-				eventStart[1]++;
-				const eventEnd = moment(end)
-					.toArray()
-					.splice(0, allDay ? 3 : 6) as ics.DateArray;
-				eventEnd[1]++;
-
-				if (additionalFields.fileName) {
-					fileName = additionalFields.fileName as string;
-				}
-
-				const data: ics.EventAttributes = {
-					title,
-					start: eventStart,
-					end: eventEnd,
-					startInputType: 'utc',
-					endInputType: 'utc',
-				};
 
-				if (additionalFields.geolocationUi) {
-					data.geo = (additionalFields.geolocationUi as IDataObject)
-						.geolocationValues as ics.GeoCoordinates;
-					delete additionalFields.geolocationUi;
-				}
+		let returnData: INodeExecutionData[] = [];
 
-				if (additionalFields.organizerUi) {
-					data.organizer = (additionalFields.organizerUi as IDataObject)
-						.organizerValues as ics.Person;
-					delete additionalFields.organizerUi;
-				}
-
-				if (additionalFields.attendeesUi) {
-					data.attendees = (additionalFields.attendeesUi as IDataObject)
-						.attendeeValues as ics.Attendee[];
-					delete additionalFields.attendeesUi;
-				}
-
-				Object.assign(data, additionalFields);
-				const buffer = Buffer.from((await createEvent(data)) as string);
-				const binaryData = await this.helpers.prepareBinaryData(buffer, fileName, 'text/calendar');
-				returnData.push({
-					json: {},
-					binary: {
-						[binaryPropertyName]: binaryData,
-					},
-					pairedItem: {
-						item: i,
-					},
-				});
-			}
+		if (operation === 'createEventFile') {
+			returnData = await createEvent.execute.call(this, items);
 		}
+
 		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/ICalendar/createEvent.operation.ts b/packages/nodes-base/nodes/ICalendar/createEvent.operation.ts
new file mode 100644
index 0000000000000..73c0f09ac07f8
--- /dev/null
+++ b/packages/nodes-base/nodes/ICalendar/createEvent.operation.ts
@@ -0,0 +1,376 @@
+import { promisify } from 'util';
+import {
+	type IExecuteFunctions,
+	type IDataObject,
+	type INodeExecutionData,
+	type INodeProperties,
+	NodeOperationError,
+} from 'n8n-workflow';
+
+import moment from 'moment-timezone';
+import * as ics from 'ics';
+
+const createEvent = promisify(ics.createEvent);
+
+export const description: INodeProperties[] = [
+	{
+		displayName: 'Event Title',
+		name: 'title',
+		type: 'string',
+		default: '',
+		placeholder: 'e.g. New Event',
+	},
+	{
+		displayName: 'Start',
+		name: 'start',
+		type: 'dateTime',
+		default: '',
+		required: true,
+		description:
+			'Date and time at which the event begins. (For all-day events, the time will be ignored.).',
+		validateType: 'dateTime',
+	},
+	{
+		displayName: 'End',
+		name: 'end',
+		type: 'dateTime',
+		default: '',
+		required: true,
+		description:
+			'Date and time at which the event ends. (For all-day events, the time will be ignored.).',
+		hint: 'If not set, will be equal to the start date',
+	},
+	{
+		displayName: 'All Day',
+		name: 'allDay',
+		type: 'boolean',
+		default: false,
+		description: 'Whether the event lasts all day or not',
+	},
+	{
+		displayName: 'Put Output File in Field',
+		name: 'binaryPropertyName',
+		type: 'string',
+		default: 'data',
+		required: true,
+		hint: 'The name of the output binary field to put the file in',
+		description: 'The field that your iCalendar file will be available under in the output',
+	},
+	{
+		displayName: 'Options',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			{
+				displayName: 'Attendees',
+				name: 'attendeesUi',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: true,
+				},
+				placeholder: 'Add Attendee',
+				default: {},
+				options: [
+					{
+						displayName: 'Attendees',
+						name: 'attendeeValues',
+						values: [
+							{
+								displayName: 'Name',
+								name: 'name',
+								type: 'string',
+								required: true,
+								default: '',
+							},
+							{
+								displayName: 'Email',
+								name: 'email',
+								type: 'string',
+								placeholder: 'e.g. name@email.com',
+								required: true,
+								default: '',
+							},
+							{
+								displayName: 'RSVP',
+								name: 'rsvp',
+								type: 'boolean',
+								default: false,
+								description: 'Whether the attendee has to confirm attendance or not',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Busy Status',
+				name: 'busyStatus',
+				type: 'options',
+				options: [
+					{
+						name: 'Busy',
+						value: 'BUSY',
+					},
+					{
+						name: 'Tentative',
+						value: 'TENTATIVE',
+					},
+				],
+				default: '',
+				description: 'Used to specify busy status for Microsoft applications, like Outlook',
+			},
+			{
+				displayName: 'Calendar Name',
+				name: 'calName',
+				type: 'string',
+				default: '',
+				description:
+					'Specifies the calendar (not event) name. Used by Apple iCal and Microsoft Outlook. <a href="https://docs.microsoft.com/en-us/openspecs/exchange_server_protocols/ms-oxcical/1da58449-b97e-46bd-b018-a1ce576f3e6d">More info</a>.',
+			},
+			{
+				displayName: 'Description',
+				name: 'description',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'File Name',
+				name: 'fileName',
+				type: 'string',
+				default: '',
+				placeholder: 'e.g. event.ics',
+				description: 'The name of the file to be generated. Default name is event.ics.',
+			},
+			{
+				displayName: 'Geolocation',
+				name: 'geolocationUi',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: false,
+				},
+				placeholder: 'Add Geolocation',
+				default: {},
+				options: [
+					{
+						displayName: 'Geolocation',
+						name: 'geolocationValues',
+						values: [
+							{
+								displayName: 'Latitude',
+								name: 'lat',
+								type: 'string',
+								default: '',
+							},
+							{
+								displayName: 'Longitude',
+								name: 'lon',
+								type: 'string',
+								default: '',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Location',
+				name: 'location',
+				type: 'string',
+				default: '',
+				description: 'The intended venue',
+			},
+			{
+				displayName: 'Recurrence Rule',
+				name: 'recurrenceRule',
+				type: 'string',
+				default: '',
+				description:
+					'A rule to define the repeat pattern of the event (RRULE). (<a href="https://icalendar.org/rrule-tool.html">Rule generator</a>).',
+			},
+			{
+				displayName: 'Organizer',
+				name: 'organizerUi',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: false,
+				},
+				placeholder: 'Add Organizer',
+				default: {},
+				options: [
+					{
+						displayName: 'Organizer',
+						name: 'organizerValues',
+						values: [
+							{
+								displayName: 'Name',
+								name: 'name',
+								type: 'string',
+								default: '',
+								required: true,
+							},
+							{
+								displayName: 'Email',
+								name: 'email',
+								type: 'string',
+								placeholder: 'e.g. name@email.com',
+								default: '',
+								required: true,
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Sequence',
+				name: 'sequence',
+				type: 'number',
+				default: 0,
+				description:
+					'When sending an update for an event (with the same uid), defines the revision sequence number',
+			},
+			{
+				displayName: 'Status',
+				name: 'status',
+				type: 'options',
+				options: [
+					{
+						name: 'Confirmed',
+						value: 'CONFIRMED',
+					},
+					{
+						name: 'Cancelled',
+						value: 'CANCELLED',
+					},
+					{
+						name: 'Tentative',
+						value: 'TENTATIVE',
+					},
+				],
+				default: 'CONFIRMED',
+			},
+			{
+				displayName: 'UID',
+				name: 'uid',
+				type: 'string',
+				default: '',
+				description:
+					'Universally unique ID for the event (will be auto-generated if not specified here). Should be globally unique.',
+			},
+			{
+				displayName: 'URL',
+				name: 'url',
+				type: 'string',
+				default: '',
+				description: 'URL associated with event',
+			},
+			{
+				displayName: 'Use Workflow Timezone',
+				name: 'useWorkflowTimezone',
+				type: 'boolean',
+				default: false,
+				description: "Whether to use the workflow timezone set in node's settings rather than UTC",
+			},
+		],
+	},
+];
+
+export async function execute(this: IExecuteFunctions, items: INodeExecutionData[]) {
+	const returnData: INodeExecutionData[] = [];
+	const workflowTimezone = this.getTimezone();
+
+	for (let i = 0; i < items.length; i++) {
+		try {
+			const title = this.getNodeParameter('title', i) as string;
+			const allDay = this.getNodeParameter('allDay', i) as boolean;
+
+			let start = this.getNodeParameter('start', i) as string;
+			let end = this.getNodeParameter('end', i) as string;
+
+			if (!end) {
+				end = start;
+			}
+
+			end = allDay ? moment(end).utc().add(1, 'day').format() : end;
+
+			const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i);
+			const options = this.getNodeParameter('additionalFields', i);
+
+			if (options.useWorkflowTimezone) {
+				start = moment(start).tz(workflowTimezone).format();
+				end = moment(end).tz(workflowTimezone).format();
+				delete options.useWorkflowTimezone;
+			}
+
+			let fileName = 'event.ics';
+
+			const eventStart = moment(start)
+				.toArray()
+				.splice(0, allDay ? 3 : 6) as ics.DateArray;
+			eventStart[1]++;
+
+			const eventEnd = moment(end)
+				.toArray()
+				.splice(0, allDay ? 3 : 6) as ics.DateArray;
+			eventEnd[1]++;
+
+			if (options.fileName) {
+				fileName = options.fileName as string;
+			}
+
+			const data: ics.EventAttributes = {
+				title,
+				start: eventStart,
+				end: eventEnd,
+				startInputType: 'utc',
+				endInputType: 'utc',
+			};
+
+			if (options.geolocationUi) {
+				data.geo = (options.geolocationUi as IDataObject).geolocationValues as ics.GeoCoordinates;
+				delete options.geolocationUi;
+			}
+
+			if (options.organizerUi) {
+				data.organizer = (options.organizerUi as IDataObject).organizerValues as ics.Person;
+				delete options.organizerUi;
+			}
+
+			if (options.attendeesUi) {
+				data.attendees = (options.attendeesUi as IDataObject).attendeeValues as ics.Attendee[];
+				delete options.attendeesUi;
+			}
+
+			Object.assign(data, options);
+			const buffer = Buffer.from((await createEvent(data)) as string);
+			const binaryData = await this.helpers.prepareBinaryData(buffer, fileName, 'text/calendar');
+			returnData.push({
+				json: {},
+				binary: {
+					[binaryPropertyName]: binaryData,
+				},
+				pairedItem: {
+					item: i,
+				},
+			});
+		} catch (error) {
+			const errorDescription = error.description;
+			if (this.continueOnFail()) {
+				returnData.push({
+					json: {
+						error: error.message,
+					},
+					pairedItem: {
+						item: i,
+					},
+				});
+				continue;
+			}
+			throw new NodeOperationError(this.getNode(), error, {
+				itemIndex: i,
+				description: errorDescription,
+			});
+		}
+	}
+
+	return returnData;
+}
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 1566c91b45fb3..9757cd5f2a479 100644
--- a/packages/nodes-base/nodes/ICalendar/test/node/ICalendar.test.ts
+++ b/packages/nodes-base/nodes/ICalendar/test/node/ICalendar.test.ts
@@ -1,17 +1,17 @@
 /* eslint-disable @typescript-eslint/no-loop-func */
-import type { WorkflowTestData } from '../../../../test/nodes/types';
+import type { WorkflowTestData } from '@test/nodes/types';
 
 import {
 	getResultNodeData,
 	setup,
 	readJsonFileSync,
-	initBinaryDataManager,
-} from '../../../../test/nodes/Helpers';
-import { executeWorkflow } from '../../../../test/nodes/ExecuteWorkflow';
+	initBinaryDataService,
+} from '@test/nodes/Helpers';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 
 describe('Execute iCalendar Node', () => {
 	beforeEach(async () => {
-		await initBinaryDataManager();
+		await initBinaryDataService();
 	});
 	const workflowData = readJsonFileSync('nodes/ICalendar/test/node/workflow.iCalendar.json');
 
diff --git a/packages/nodes-base/nodes/If/If.node.ts b/packages/nodes-base/nodes/If/If.node.ts
index 96b016f74b9c5..0e0f55f21f37e 100644
--- a/packages/nodes-base/nodes/If/If.node.ts
+++ b/packages/nodes-base/nodes/If/If.node.ts
@@ -1,485 +1,25 @@
-import moment from 'moment';
-import type {
-	IExecuteFunctions,
-	INodeExecutionData,
-	INodeParameters,
-	INodeType,
-	INodeTypeDescription,
-	NodeParameterValue,
-} from 'n8n-workflow';
-import { NodeOperationError } from 'n8n-workflow';
-
-export class If implements INodeType {
-	description: INodeTypeDescription = {
-		displayName: 'IF',
-		name: 'if',
-		icon: 'fa:map-signs',
-		group: ['transform'],
-		version: 1,
-		description: 'Route items to different branches (true/false)',
-		defaults: {
-			name: 'IF',
-			color: '#408000',
-		},
-		inputs: ['main'],
-		// eslint-disable-next-line n8n-nodes-base/node-class-description-outputs-wrong
-		outputs: ['main', 'main'],
-		outputNames: ['true', 'false'],
-		properties: [
-			{
-				displayName: 'Conditions',
-				name: 'conditions',
-				placeholder: 'Add Condition',
-				type: 'fixedCollection',
-				typeOptions: {
-					multipleValues: true,
-					sortable: true,
-				},
-				description: 'The type of values to compare',
-				default: {},
-				options: [
-					{
-						name: 'boolean',
-						displayName: 'Boolean',
-						values: [
-							{
-								displayName: 'Value 1',
-								name: 'value1',
-								type: 'boolean',
-								default: false,
-								// eslint-disable-next-line n8n-nodes-base/node-param-description-boolean-without-whether
-								description: 'The value to compare with the second one',
-							},
-							// eslint-disable-next-line n8n-nodes-base/node-param-operation-without-no-data-expression
-							{
-								displayName: 'Operation',
-								name: 'operation',
-								type: 'options',
-								options: [
-									{
-										name: 'Equal',
-										value: 'equal',
-									},
-									{
-										name: 'Not Equal',
-										value: 'notEqual',
-									},
-								],
-								default: 'equal',
-								description: 'Operation to decide where the the data should be mapped to',
-							},
-							{
-								displayName: 'Value 2',
-								name: 'value2',
-								type: 'boolean',
-								default: false,
-								// eslint-disable-next-line n8n-nodes-base/node-param-description-boolean-without-whether
-								description: 'The value to compare with the first one',
-							},
-						],
-					},
-					{
-						name: 'dateTime',
-						displayName: 'Date & Time',
-						values: [
-							{
-								displayName: 'Value 1',
-								name: 'value1',
-								type: 'dateTime',
-								default: '',
-								description: 'The value to compare with the second one',
-							},
-							// eslint-disable-next-line n8n-nodes-base/node-param-operation-without-no-data-expression
-							{
-								displayName: 'Operation',
-								name: 'operation',
-								type: 'options',
-								options: [
-									{
-										name: 'Occurred After',
-										value: 'after',
-									},
-									{
-										name: 'Occurred Before',
-										value: 'before',
-									},
-								],
-								default: 'after',
-								description: 'Operation to decide where the the data should be mapped to',
-							},
-							{
-								displayName: 'Value 2',
-								name: 'value2',
-								type: 'dateTime',
-								default: '',
-								description: 'The value to compare with the first one',
-							},
-						],
-					},
-					{
-						name: 'number',
-						displayName: 'Number',
-						values: [
-							{
-								displayName: 'Value 1',
-								name: 'value1',
-								type: 'number',
-								default: 0,
-								description: 'The value to compare with the second one',
-							},
-							{
-								displayName: 'Operation',
-								name: 'operation',
-								type: 'options',
-								noDataExpression: true,
-								// eslint-disable-next-line n8n-nodes-base/node-param-options-type-unsorted-items
-								options: [
-									{
-										name: 'Smaller',
-										value: 'smaller',
-									},
-									{
-										name: 'Smaller or Equal',
-										value: 'smallerEqual',
-									},
-									{
-										name: 'Equal',
-										value: 'equal',
-									},
-									{
-										name: 'Not Equal',
-										value: 'notEqual',
-									},
-									{
-										name: 'Larger',
-										value: 'larger',
-									},
-									{
-										name: 'Larger or Equal',
-										value: 'largerEqual',
-									},
-									{
-										name: 'Is Empty',
-										value: 'isEmpty',
-									},
-									{
-										name: 'Is Not Empty',
-										value: 'isNotEmpty',
-									},
-								],
-								default: 'smaller',
-								description: 'Operation to decide where the the data should be mapped to',
-							},
-							{
-								displayName: 'Value 2',
-								name: 'value2',
-								type: 'number',
-								displayOptions: {
-									hide: {
-										operation: ['isEmpty', 'isNotEmpty'],
-									},
-								},
-								default: 0,
-								description: 'The value to compare with the first one',
-							},
-						],
-					},
-					{
-						name: 'string',
-						displayName: 'String',
-						values: [
-							{
-								displayName: 'Value 1',
-								name: 'value1',
-								type: 'string',
-								default: '',
-								description: 'The value to compare with the second one',
-							},
-							{
-								displayName: 'Operation',
-								name: 'operation',
-								type: 'options',
-								noDataExpression: true,
-								// eslint-disable-next-line n8n-nodes-base/node-param-options-type-unsorted-items
-								options: [
-									{
-										name: 'Contains',
-										value: 'contains',
-									},
-									{
-										name: 'Not Contains',
-										value: 'notContains',
-									},
-									{
-										name: 'Ends With',
-										value: 'endsWith',
-									},
-									{
-										name: 'Not Ends With',
-										value: 'notEndsWith',
-									},
-									{
-										name: 'Equal',
-										value: 'equal',
-									},
-									{
-										name: 'Not Equal',
-										value: 'notEqual',
-									},
-									{
-										name: 'Regex Match',
-										value: 'regex',
-									},
-									{
-										name: 'Regex Not Match',
-										value: 'notRegex',
-									},
-									{
-										name: 'Starts With',
-										value: 'startsWith',
-									},
-									{
-										name: 'Not Starts With',
-										value: 'notStartsWith',
-									},
-									{
-										name: 'Is Empty',
-										value: 'isEmpty',
-									},
-									{
-										name: 'Is Not Empty',
-										value: 'isNotEmpty',
-									},
-								],
-								default: 'equal',
-								description: 'Operation to decide where the the data should be mapped to',
-							},
-							{
-								displayName: 'Value 2',
-								name: 'value2',
-								type: 'string',
-								displayOptions: {
-									hide: {
-										operation: ['isEmpty', 'isNotEmpty', 'regex', 'notRegex'],
-									},
-								},
-								default: '',
-								description: 'The value to compare with the first one',
-							},
-							{
-								displayName: 'Regex',
-								name: 'value2',
-								type: 'string',
-								displayOptions: {
-									show: {
-										operation: ['regex', 'notRegex'],
-									},
-								},
-								default: '',
-								placeholder: '/text/i',
-								description: 'The regex which has to match',
-							},
-						],
-					},
-				],
-			},
-			{
-				displayName: 'Combine',
-				name: 'combineOperation',
-				type: 'options',
-				options: [
-					{
-						name: 'ALL',
-						description: 'Only if all conditions are met it goes into "true" branch',
-						value: 'all',
-					},
-					{
-						name: 'ANY',
-						description: 'If any of the conditions is met it goes into "true" branch',
-						value: 'any',
-					},
-				],
-				default: 'all',
-				description:
-					'If multiple rules got set this settings decides if it is true as soon as ANY condition matches or only if ALL get meet',
-			},
-		],
-	};
-
-	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
-		const returnDataTrue: INodeExecutionData[] = [];
-		const returnDataFalse: INodeExecutionData[] = [];
-
-		const items = this.getInputData();
-
-		let item: INodeExecutionData;
-		let combineOperation: string;
-
-		const isDateObject = (value: NodeParameterValue) =>
-			Object.prototype.toString.call(value) === '[object Date]';
-		const isDateInvalid = (value: NodeParameterValue) => value?.toString() === 'Invalid Date';
-
-		// The compare operations
-		const compareOperationFunctions: {
-			[key: string]: (value1: NodeParameterValue, value2: NodeParameterValue) => boolean;
-		} = {
-			after: (value1: NodeParameterValue, value2: NodeParameterValue) =>
-				(value1 || 0) > (value2 || 0),
-			before: (value1: NodeParameterValue, value2: NodeParameterValue) =>
-				(value1 || 0) < (value2 || 0),
-			contains: (value1: NodeParameterValue, value2: NodeParameterValue) =>
-				(value1 || '').toString().includes((value2 || '').toString()),
-			notContains: (value1: NodeParameterValue, value2: NodeParameterValue) =>
-				!(value1 || '').toString().includes((value2 || '').toString()),
-			endsWith: (value1: NodeParameterValue, value2: NodeParameterValue) =>
-				(value1 as string).endsWith(value2 as string),
-			notEndsWith: (value1: NodeParameterValue, value2: NodeParameterValue) =>
-				!(value1 as string).endsWith(value2 as string),
-			equal: (value1: NodeParameterValue, value2: NodeParameterValue) => value1 === value2,
-			notEqual: (value1: NodeParameterValue, value2: NodeParameterValue) => value1 !== value2,
-			larger: (value1: NodeParameterValue, value2: NodeParameterValue) =>
-				(value1 || 0) > (value2 || 0),
-			largerEqual: (value1: NodeParameterValue, value2: NodeParameterValue) =>
-				(value1 || 0) >= (value2 || 0),
-			smaller: (value1: NodeParameterValue, value2: NodeParameterValue) =>
-				(value1 || 0) < (value2 || 0),
-			smallerEqual: (value1: NodeParameterValue, value2: NodeParameterValue) =>
-				(value1 || 0) <= (value2 || 0),
-			startsWith: (value1: NodeParameterValue, value2: NodeParameterValue) =>
-				(value1 as string).startsWith(value2 as string),
-			notStartsWith: (value1: NodeParameterValue, value2: NodeParameterValue) =>
-				!(value1 as string).startsWith(value2 as string),
-			isEmpty: (value1: NodeParameterValue) =>
-				[undefined, null, '', NaN].includes(value1 as string) ||
-				(typeof value1 === 'object' && value1 !== null && !isDateObject(value1)
-					? Object.entries(value1 as string).length === 0
-					: false) ||
-				(isDateObject(value1) && isDateInvalid(value1)),
-			isNotEmpty: (value1: NodeParameterValue) =>
-				!(
-					[undefined, null, '', NaN].includes(value1 as string) ||
-					(typeof value1 === 'object' && value1 !== null && !isDateObject(value1)
-						? Object.entries(value1 as string).length === 0
-						: false) ||
-					(isDateObject(value1) && isDateInvalid(value1))
-				),
-			regex: (value1: NodeParameterValue, value2: NodeParameterValue) => {
-				const regexMatch = (value2 || '').toString().match(new RegExp('^/(.*?)/([gimusy]*)$'));
-
-				let regex: RegExp;
-				if (!regexMatch) {
-					regex = new RegExp((value2 || '').toString());
-				} else if (regexMatch.length === 1) {
-					regex = new RegExp(regexMatch[1]);
-				} else {
-					regex = new RegExp(regexMatch[1], regexMatch[2]);
-				}
-
-				return !!(value1 || '').toString().match(regex);
-			},
-			notRegex: (value1: NodeParameterValue, value2: NodeParameterValue) => {
-				const regexMatch = (value2 || '').toString().match(new RegExp('^/(.*?)/([gimusy]*)$'));
-
-				let regex: RegExp;
-				if (!regexMatch) {
-					regex = new RegExp((value2 || '').toString());
-				} else if (regexMatch.length === 1) {
-					regex = new RegExp(regexMatch[1]);
-				} else {
-					regex = new RegExp(regexMatch[1], regexMatch[2]);
-				}
-
-				return !(value1 || '').toString().match(regex);
-			},
+import type { INodeTypeBaseDescription, IVersionedNodeType } from 'n8n-workflow';
+import { VersionedNodeType } from 'n8n-workflow';
+
+import { IfV1 } from './V1/IfV1.node';
+import { IfV2 } from './V2/IfV2.node';
+
+export class If extends VersionedNodeType {
+	constructor() {
+		const baseDescription: INodeTypeBaseDescription = {
+			displayName: 'If',
+			name: 'if',
+			icon: 'fa:map-signs',
+			group: ['transform'],
+			description: 'Route items to different branches (true/false)',
+			defaultVersion: 2,
 		};
 
-		// Converts the input data of a dateTime into a number for easy compare
-		const convertDateTime = (value: NodeParameterValue): number => {
-			let returnValue: number | undefined = undefined;
-			if (typeof value === 'string') {
-				returnValue = new Date(value).getTime();
-			} else if (typeof value === 'number') {
-				returnValue = value;
-			}
-			if (moment.isMoment(value)) {
-				returnValue = value.unix();
-			}
-			if ((value as unknown as object) instanceof Date) {
-				returnValue = (value as unknown as Date).getTime();
-			}
-
-			if (returnValue === undefined || isNaN(returnValue)) {
-				throw new NodeOperationError(
-					this.getNode(),
-					`The value "${value}" is not a valid DateTime.`,
-				);
-			}
-
-			return returnValue;
+		const nodeVersions: IVersionedNodeType['nodeVersions'] = {
+			1: new IfV1(baseDescription),
+			2: new IfV2(baseDescription),
 		};
 
-		// The different dataTypes to check the values in
-		const dataTypes = ['boolean', 'dateTime', 'number', 'string'];
-
-		// Iterate over all items to check which ones should be output as via output "true" and
-		// which ones via output "false"
-		let dataType: string;
-		let compareOperationResult: boolean;
-		let value1: NodeParameterValue, value2: NodeParameterValue;
-		itemLoop: for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
-			item = items[itemIndex];
-
-			let compareData: INodeParameters;
-
-			combineOperation = this.getNodeParameter('combineOperation', itemIndex) as string;
-
-			// Check all the values of the different dataTypes
-			for (dataType of dataTypes) {
-				// Check all the values of the current dataType
-				for (compareData of this.getNodeParameter(
-					`conditions.${dataType}`,
-					itemIndex,
-					[],
-				) as INodeParameters[]) {
-					// Check if the values passes
-
-					value1 = compareData.value1 as NodeParameterValue;
-					value2 = compareData.value2 as NodeParameterValue;
-
-					if (dataType === 'dateTime') {
-						value1 = convertDateTime(value1);
-						value2 = convertDateTime(value2);
-					}
-
-					compareOperationResult = compareOperationFunctions[compareData.operation as string](
-						value1,
-						value2,
-					);
-
-					if (compareOperationResult && combineOperation === 'any') {
-						// If it passes and the operation is "any" we do not have to check any
-						// other ones as it should pass anyway. So go on with the next item.
-						returnDataTrue.push(item);
-						continue itemLoop;
-					} else if (!compareOperationResult && combineOperation === 'all') {
-						// If it fails and the operation is "all" we do not have to check any
-						// other ones as it should be not pass anyway. So go on with the next item.
-						returnDataFalse.push(item);
-						continue itemLoop;
-					}
-				}
-			}
-
-			if (combineOperation === 'all') {
-				// If the operation is "all" it means the item did match all conditions
-				// so it passes.
-				returnDataTrue.push(item);
-			} else {
-				// If the operation is "any" it means the the item did not match any condition.
-				returnDataFalse.push(item);
-			}
-		}
-
-		return [returnDataTrue, returnDataFalse];
+		super(nodeVersions, baseDescription);
 	}
 }
diff --git a/packages/nodes-base/nodes/If/V1/IfV1.node.ts b/packages/nodes-base/nodes/If/V1/IfV1.node.ts
new file mode 100644
index 0000000000000..b41be7178616c
--- /dev/null
+++ b/packages/nodes-base/nodes/If/V1/IfV1.node.ts
@@ -0,0 +1,486 @@
+import moment from 'moment-timezone';
+import type {
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeParameters,
+	INodeType,
+	INodeTypeBaseDescription,
+	INodeTypeDescription,
+	NodeParameterValue,
+} from 'n8n-workflow';
+import { NodeOperationError } from 'n8n-workflow';
+
+export class IfV1 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			version: 1,
+			defaults: {
+				name: 'If',
+				color: '#408000',
+			},
+			inputs: ['main'],
+			// eslint-disable-next-line n8n-nodes-base/node-class-description-outputs-wrong
+			outputs: ['main', 'main'],
+			outputNames: ['true', 'false'],
+			properties: [
+				{
+					displayName: 'Conditions',
+					name: 'conditions',
+					placeholder: 'Add Condition',
+					type: 'fixedCollection',
+					typeOptions: {
+						multipleValues: true,
+						sortable: true,
+					},
+					description: 'The type of values to compare',
+					default: {},
+					options: [
+						{
+							name: 'boolean',
+							displayName: 'Boolean',
+							values: [
+								{
+									displayName: 'Value 1',
+									name: 'value1',
+									type: 'boolean',
+									default: false,
+									// eslint-disable-next-line n8n-nodes-base/node-param-description-boolean-without-whether
+									description: 'The value to compare with the second one',
+								},
+								// eslint-disable-next-line n8n-nodes-base/node-param-operation-without-no-data-expression
+								{
+									displayName: 'Operation',
+									name: 'operation',
+									type: 'options',
+									options: [
+										{
+											name: 'Equal',
+											value: 'equal',
+										},
+										{
+											name: 'Not Equal',
+											value: 'notEqual',
+										},
+									],
+									default: 'equal',
+									description: 'Operation to decide where the data should be mapped to',
+								},
+								{
+									displayName: 'Value 2',
+									name: 'value2',
+									type: 'boolean',
+									default: false,
+									// eslint-disable-next-line n8n-nodes-base/node-param-description-boolean-without-whether
+									description: 'The value to compare with the first one',
+								},
+							],
+						},
+						{
+							name: 'dateTime',
+							displayName: 'Date & Time',
+							values: [
+								{
+									displayName: 'Value 1',
+									name: 'value1',
+									type: 'dateTime',
+									default: '',
+									description: 'The value to compare with the second one',
+								},
+								// eslint-disable-next-line n8n-nodes-base/node-param-operation-without-no-data-expression
+								{
+									displayName: 'Operation',
+									name: 'operation',
+									type: 'options',
+									options: [
+										{
+											name: 'Occurred After',
+											value: 'after',
+										},
+										{
+											name: 'Occurred Before',
+											value: 'before',
+										},
+									],
+									default: 'after',
+									description: 'Operation to decide where the data should be mapped to',
+								},
+								{
+									displayName: 'Value 2',
+									name: 'value2',
+									type: 'dateTime',
+									default: '',
+									description: 'The value to compare with the first one',
+								},
+							],
+						},
+						{
+							name: 'number',
+							displayName: 'Number',
+							values: [
+								{
+									displayName: 'Value 1',
+									name: 'value1',
+									type: 'number',
+									default: 0,
+									description: 'The value to compare with the second one',
+								},
+								{
+									displayName: 'Operation',
+									name: 'operation',
+									type: 'options',
+									noDataExpression: true,
+									// eslint-disable-next-line n8n-nodes-base/node-param-options-type-unsorted-items
+									options: [
+										{
+											name: 'Smaller',
+											value: 'smaller',
+										},
+										{
+											name: 'Smaller or Equal',
+											value: 'smallerEqual',
+										},
+										{
+											name: 'Equal',
+											value: 'equal',
+										},
+										{
+											name: 'Not Equal',
+											value: 'notEqual',
+										},
+										{
+											name: 'Larger',
+											value: 'larger',
+										},
+										{
+											name: 'Larger or Equal',
+											value: 'largerEqual',
+										},
+										{
+											name: 'Is Empty',
+											value: 'isEmpty',
+										},
+										{
+											name: 'Is Not Empty',
+											value: 'isNotEmpty',
+										},
+									],
+									default: 'smaller',
+									description: 'Operation to decide where the data should be mapped to',
+								},
+								{
+									displayName: 'Value 2',
+									name: 'value2',
+									type: 'number',
+									displayOptions: {
+										hide: {
+											operation: ['isEmpty', 'isNotEmpty'],
+										},
+									},
+									default: 0,
+									description: 'The value to compare with the first one',
+								},
+							],
+						},
+						{
+							name: 'string',
+							displayName: 'String',
+							values: [
+								{
+									displayName: 'Value 1',
+									name: 'value1',
+									type: 'string',
+									default: '',
+									description: 'The value to compare with the second one',
+								},
+								{
+									displayName: 'Operation',
+									name: 'operation',
+									type: 'options',
+									noDataExpression: true,
+									// eslint-disable-next-line n8n-nodes-base/node-param-options-type-unsorted-items
+									options: [
+										{
+											name: 'Contains',
+											value: 'contains',
+										},
+										{
+											name: 'Not Contains',
+											value: 'notContains',
+										},
+										{
+											name: 'Ends With',
+											value: 'endsWith',
+										},
+										{
+											name: 'Not Ends With',
+											value: 'notEndsWith',
+										},
+										{
+											name: 'Equal',
+											value: 'equal',
+										},
+										{
+											name: 'Not Equal',
+											value: 'notEqual',
+										},
+										{
+											name: 'Regex Match',
+											value: 'regex',
+										},
+										{
+											name: 'Regex Not Match',
+											value: 'notRegex',
+										},
+										{
+											name: 'Starts With',
+											value: 'startsWith',
+										},
+										{
+											name: 'Not Starts With',
+											value: 'notStartsWith',
+										},
+										{
+											name: 'Is Empty',
+											value: 'isEmpty',
+										},
+										{
+											name: 'Is Not Empty',
+											value: 'isNotEmpty',
+										},
+									],
+									default: 'equal',
+									description: 'Operation to decide where the data should be mapped to',
+								},
+								{
+									displayName: 'Value 2',
+									name: 'value2',
+									type: 'string',
+									displayOptions: {
+										hide: {
+											operation: ['isEmpty', 'isNotEmpty', 'regex', 'notRegex'],
+										},
+									},
+									default: '',
+									description: 'The value to compare with the first one',
+								},
+								{
+									displayName: 'Regex',
+									name: 'value2',
+									type: 'string',
+									displayOptions: {
+										show: {
+											operation: ['regex', 'notRegex'],
+										},
+									},
+									default: '',
+									placeholder: '/text/i',
+									description: 'The regex which has to match',
+								},
+							],
+						},
+					],
+				},
+				{
+					displayName: 'Combine',
+					name: 'combineOperation',
+					type: 'options',
+					options: [
+						{
+							name: 'ALL',
+							description: 'Only if all conditions are met it goes into "true" branch',
+							value: 'all',
+						},
+						{
+							name: 'ANY',
+							description: 'If any of the conditions is met it goes into "true" branch',
+							value: 'any',
+						},
+					],
+					default: 'all',
+					description:
+						'If multiple rules got set this settings decides if it is true as soon as ANY condition matches or only if ALL get meet',
+				},
+			],
+		};
+	}
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const returnDataTrue: INodeExecutionData[] = [];
+		const returnDataFalse: INodeExecutionData[] = [];
+
+		const items = this.getInputData();
+
+		let item: INodeExecutionData;
+		let combineOperation: string;
+
+		const isDateObject = (value: NodeParameterValue) =>
+			Object.prototype.toString.call(value) === '[object Date]';
+		const isDateInvalid = (value: NodeParameterValue) => value?.toString() === 'Invalid Date';
+
+		// The compare operations
+		const compareOperationFunctions: {
+			[key: string]: (value1: NodeParameterValue, value2: NodeParameterValue) => boolean;
+		} = {
+			after: (value1: NodeParameterValue, value2: NodeParameterValue) =>
+				(value1 || 0) > (value2 || 0),
+			before: (value1: NodeParameterValue, value2: NodeParameterValue) =>
+				(value1 || 0) < (value2 || 0),
+			contains: (value1: NodeParameterValue, value2: NodeParameterValue) =>
+				(value1 || '').toString().includes((value2 || '').toString()),
+			notContains: (value1: NodeParameterValue, value2: NodeParameterValue) =>
+				!(value1 || '').toString().includes((value2 || '').toString()),
+			endsWith: (value1: NodeParameterValue, value2: NodeParameterValue) =>
+				(value1 as string).endsWith(value2 as string),
+			notEndsWith: (value1: NodeParameterValue, value2: NodeParameterValue) =>
+				!(value1 as string).endsWith(value2 as string),
+			equal: (value1: NodeParameterValue, value2: NodeParameterValue) => value1 === value2,
+			notEqual: (value1: NodeParameterValue, value2: NodeParameterValue) => value1 !== value2,
+			larger: (value1: NodeParameterValue, value2: NodeParameterValue) =>
+				(value1 || 0) > (value2 || 0),
+			largerEqual: (value1: NodeParameterValue, value2: NodeParameterValue) =>
+				(value1 || 0) >= (value2 || 0),
+			smaller: (value1: NodeParameterValue, value2: NodeParameterValue) =>
+				(value1 || 0) < (value2 || 0),
+			smallerEqual: (value1: NodeParameterValue, value2: NodeParameterValue) =>
+				(value1 || 0) <= (value2 || 0),
+			startsWith: (value1: NodeParameterValue, value2: NodeParameterValue) =>
+				(value1 as string).startsWith(value2 as string),
+			notStartsWith: (value1: NodeParameterValue, value2: NodeParameterValue) =>
+				!(value1 as string).startsWith(value2 as string),
+			isEmpty: (value1: NodeParameterValue) =>
+				[undefined, null, '', NaN].includes(value1 as string) ||
+				(typeof value1 === 'object' && value1 !== null && !isDateObject(value1)
+					? Object.entries(value1 as string).length === 0
+					: false) ||
+				(isDateObject(value1) && isDateInvalid(value1)),
+			isNotEmpty: (value1: NodeParameterValue) =>
+				!(
+					[undefined, null, '', NaN].includes(value1 as string) ||
+					(typeof value1 === 'object' && value1 !== null && !isDateObject(value1)
+						? Object.entries(value1 as string).length === 0
+						: false) ||
+					(isDateObject(value1) && isDateInvalid(value1))
+				),
+			regex: (value1: NodeParameterValue, value2: NodeParameterValue) => {
+				const regexMatch = (value2 || '').toString().match(new RegExp('^/(.*?)/([gimusy]*)$'));
+
+				let regex: RegExp;
+				if (!regexMatch) {
+					regex = new RegExp((value2 || '').toString());
+				} else if (regexMatch.length === 1) {
+					regex = new RegExp(regexMatch[1]);
+				} else {
+					regex = new RegExp(regexMatch[1], regexMatch[2]);
+				}
+
+				return !!(value1 || '').toString().match(regex);
+			},
+			notRegex: (value1: NodeParameterValue, value2: NodeParameterValue) => {
+				const regexMatch = (value2 || '').toString().match(new RegExp('^/(.*?)/([gimusy]*)$'));
+
+				let regex: RegExp;
+				if (!regexMatch) {
+					regex = new RegExp((value2 || '').toString());
+				} else if (regexMatch.length === 1) {
+					regex = new RegExp(regexMatch[1]);
+				} else {
+					regex = new RegExp(regexMatch[1], regexMatch[2]);
+				}
+
+				return !(value1 || '').toString().match(regex);
+			},
+		};
+
+		// Converts the input data of a dateTime into a number for easy compare
+		const convertDateTime = (value: NodeParameterValue): number => {
+			let returnValue: number | undefined = undefined;
+			if (typeof value === 'string') {
+				returnValue = new Date(value).getTime();
+			} else if (typeof value === 'number') {
+				returnValue = value;
+			}
+			if (moment.isMoment(value)) {
+				returnValue = value.unix();
+			}
+			if ((value as unknown as object) instanceof Date) {
+				returnValue = (value as unknown as Date).getTime();
+			}
+
+			if (returnValue === undefined || isNaN(returnValue)) {
+				throw new NodeOperationError(
+					this.getNode(),
+					`The value "${value}" is not a valid DateTime.`,
+				);
+			}
+
+			return returnValue;
+		};
+
+		// The different dataTypes to check the values in
+		const dataTypes = ['boolean', 'dateTime', 'number', 'string'];
+
+		// Iterate over all items to check which ones should be output as via output "true" and
+		// which ones via output "false"
+		let dataType: string;
+		let compareOperationResult: boolean;
+		let value1: NodeParameterValue, value2: NodeParameterValue;
+		itemLoop: for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
+			item = items[itemIndex];
+
+			let compareData: INodeParameters;
+
+			combineOperation = this.getNodeParameter('combineOperation', itemIndex) as string;
+
+			// Check all the values of the different dataTypes
+			for (dataType of dataTypes) {
+				// Check all the values of the current dataType
+				for (compareData of this.getNodeParameter(
+					`conditions.${dataType}`,
+					itemIndex,
+					[],
+				) as INodeParameters[]) {
+					// Check if the values passes
+
+					value1 = compareData.value1 as NodeParameterValue;
+					value2 = compareData.value2 as NodeParameterValue;
+
+					if (dataType === 'dateTime') {
+						value1 = convertDateTime(value1);
+						value2 = convertDateTime(value2);
+					}
+
+					compareOperationResult = compareOperationFunctions[compareData.operation as string](
+						value1,
+						value2,
+					);
+
+					if (compareOperationResult && combineOperation === 'any') {
+						// If it passes and the operation is "any" we do not have to check any
+						// other ones as it should pass anyway. So go on with the next item.
+						returnDataTrue.push(item);
+						continue itemLoop;
+					} else if (!compareOperationResult && combineOperation === 'all') {
+						// If it fails and the operation is "all" we do not have to check any
+						// other ones as it should be not pass anyway. So go on with the next item.
+						returnDataFalse.push(item);
+						continue itemLoop;
+					}
+				}
+			}
+
+			if (combineOperation === 'all') {
+				// If the operation is "all" it means the item did match all conditions
+				// so it passes.
+				returnDataTrue.push(item);
+			} else {
+				// If the operation is "any" it means the the item did not match any condition.
+				returnDataFalse.push(item);
+			}
+		}
+
+		return [returnDataTrue, returnDataFalse];
+	}
+}
diff --git a/packages/nodes-base/nodes/If/V2/IfV2.node.ts b/packages/nodes-base/nodes/If/V2/IfV2.node.ts
new file mode 100644
index 0000000000000..6863ef676afbd
--- /dev/null
+++ b/packages/nodes-base/nodes/If/V2/IfV2.node.ts
@@ -0,0 +1,114 @@
+import set from 'lodash/set';
+import type {
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeBaseDescription,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+
+export class IfV2 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			version: 2,
+			defaults: {
+				name: 'If',
+				color: '#408000',
+			},
+			inputs: ['main'],
+			outputs: ['main', 'main'],
+			outputNames: ['true', 'false'],
+			parameterPane: 'wide',
+			properties: [
+				{
+					displayName: 'Conditions',
+					name: 'conditions',
+					placeholder: 'Add Condition',
+					type: 'filter',
+					default: {},
+					typeOptions: {
+						filter: {
+							caseSensitive: '={{!$parameter.options.ignoreCase}}',
+							typeValidation: '={{$parameter.options.looseTypeValidation ? "loose" : "strict"}}',
+						},
+					},
+				},
+				{
+					displayName: 'Options',
+					name: 'options',
+					type: 'collection',
+					placeholder: 'Add option',
+					default: {},
+					options: [
+						{
+							displayName: 'Ignore Case',
+							description: 'Whether to ignore letter case when evaluating conditions',
+							name: 'ignoreCase',
+							type: 'boolean',
+							default: true,
+						},
+						{
+							displayName: 'Less Strict Type Validation',
+							description: 'Whether to try casting value types based on the selected operator',
+							name: 'looseTypeValidation',
+							type: 'boolean',
+							default: true,
+						},
+					],
+				},
+			],
+		};
+	}
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const trueItems: INodeExecutionData[] = [];
+		const falseItems: INodeExecutionData[] = [];
+
+		this.getInputData().forEach((item, itemIndex) => {
+			try {
+				const options = this.getNodeParameter('options', itemIndex) as {
+					ignoreCase?: boolean;
+					looseTypeValidation?: boolean;
+				};
+				let pass = false;
+				try {
+					pass = this.getNodeParameter('conditions', itemIndex, false, {
+						extractValue: true,
+					}) as boolean;
+				} catch (error) {
+					if (!options.looseTypeValidation) {
+						set(
+							error,
+							'description',
+							"Try changing the type of comparison. Alternatively you can enable 'Less Strict Type Validation' in the options.",
+						);
+					}
+					set(error, 'context.itemIndex', itemIndex);
+					set(error, 'node', this.getNode());
+					throw error;
+				}
+
+				if (item.pairedItem === undefined) {
+					item.pairedItem = { item: itemIndex };
+				}
+
+				if (pass) {
+					trueItems.push(item);
+				} else {
+					falseItems.push(item);
+				}
+			} catch (error) {
+				if (this.continueOnFail()) {
+					falseItems.push(item);
+				} else {
+					throw error;
+				}
+			}
+		});
+
+		return [trueItems, falseItems];
+	}
+}
diff --git a/packages/nodes-base/nodes/If/test/If.node.test.ts b/packages/nodes-base/nodes/If/test/If.node.test.ts
deleted file mode 100644
index d30d7f20dffe0..0000000000000
--- a/packages/nodes-base/nodes/If/test/If.node.test.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { testWorkflows, getWorkflowFilenames } from '../../../test/nodes/Helpers';
-
-const workflows = getWorkflowFilenames(__dirname);
-
-describe('Test IF Node', () => testWorkflows(workflows));
diff --git a/packages/nodes-base/nodes/If/test/IF.boolean.json b/packages/nodes-base/nodes/If/test/v1/IF.boolean.json
similarity index 100%
rename from packages/nodes-base/nodes/If/test/IF.boolean.json
rename to packages/nodes-base/nodes/If/test/v1/IF.boolean.json
diff --git a/packages/nodes-base/nodes/If/test/IF.date-time.json b/packages/nodes-base/nodes/If/test/v1/IF.date-time.json
similarity index 100%
rename from packages/nodes-base/nodes/If/test/IF.date-time.json
rename to packages/nodes-base/nodes/If/test/v1/IF.date-time.json
diff --git a/packages/nodes-base/nodes/If/test/IF.number.json b/packages/nodes-base/nodes/If/test/v1/IF.number.json
similarity index 100%
rename from packages/nodes-base/nodes/If/test/IF.number.json
rename to packages/nodes-base/nodes/If/test/v1/IF.number.json
diff --git a/packages/nodes-base/nodes/If/test/IF.string.json b/packages/nodes-base/nodes/If/test/v1/IF.string.json
similarity index 100%
rename from packages/nodes-base/nodes/If/test/IF.string.json
rename to packages/nodes-base/nodes/If/test/v1/IF.string.json
diff --git a/packages/nodes-base/nodes/If/test/v1/If.node.test.ts b/packages/nodes-base/nodes/If/test/v1/If.node.test.ts
new file mode 100644
index 0000000000000..3a74ca0c07eed
--- /dev/null
+++ b/packages/nodes-base/nodes/If/test/v1/If.node.test.ts
@@ -0,0 +1,5 @@
+import { testWorkflows, getWorkflowFilenames } from '@test/nodes/Helpers';
+
+const workflows = getWorkflowFilenames(__dirname);
+
+describe('Test IF Node', () => testWorkflows(workflows));
diff --git a/packages/nodes-base/nodes/If/test/v2/IfV2.date-time.json b/packages/nodes-base/nodes/If/test/v2/IfV2.date-time.json
new file mode 100644
index 0000000000000..97f56cb654491
--- /dev/null
+++ b/packages/nodes-base/nodes/If/test/v2/IfV2.date-time.json
@@ -0,0 +1,165 @@
+{
+  "name": "Filter test",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "f332a7d1-31b4-4e78-b31e-9e8db945bf3f",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        -60,
+        480
+      ]
+    },
+    {
+      "parameters": {
+        "jsCode": "return [\n  {\n    \"date\": \"2023-10-26T16:45:52.367Z\",\n    \"label\": \"Apple\",\n  },\n  {\n    \"date\": \"2023-10-20T16:45:52.367Z\",\n    \"label\": \"Banana\"\n  },\n  {\n    \"date\": \"2023-10-20T16:45:52.367Z\",\n    \"label\": \"Kiwi\"\n  },\n  {\n    \"date\": \"2023-10-20T16:45:52.367Z\",\n    \"label\": \"Orange\"\n  }\n]"
+      },
+      "id": "60697c7f-3948-4790-97ba-8aba03d02ac2",
+      "name": "Code",
+      "type": "n8n-nodes-base.code",
+      "typeVersion": 2,
+      "position": [
+        160,
+        480
+      ]
+    },
+    {
+      "parameters": {
+        "conditions": {
+          "options": {
+            "caseSensitive": true,
+            "leftValue": ""
+          },
+          "conditions": [
+            {
+              "leftValue": "={{ $json.date }}",
+              "rightValue": "2023-10-21",
+              "operator": {
+                "type": "dateTime",
+                "operation": "before"
+              }
+            }
+          ],
+          "combinator": "or"
+        },
+        "options": {}
+      },
+      "id": "7531191b-5ac3-45dc-8afb-27ae83d8f33a",
+      "name": "If",
+      "type": "n8n-nodes-base.if",
+      "typeVersion": 2,
+      "position": [
+        380,
+        480
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "d8c614ea-0bbf-4b12-ad7d-c9ebe09ce583",
+      "name": "Then",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        600,
+        400
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "69364770-60d2-4ef4-9f29-9570718a9a10",
+      "name": "Else",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        600,
+        580
+      ]
+    }
+  ],
+  "pinData": {
+    "Then": [
+      {
+        "json": {
+          "date": "2023-10-20T16:45:52.367Z",
+          "label": "Banana"
+        }
+
+      },
+      {
+        "json": {
+          "date": "2023-10-20T16:45:52.367Z",
+          "label": "Kiwi"
+        }
+      },
+      {
+        "json": {
+          "date": "2023-10-20T16:45:52.367Z",
+          "label": "Orange"
+        }
+      }
+    ],
+    "Else": [
+      {
+        "json": {
+          "date": "2023-10-26T16:45:52.367Z",
+          "label": "Apple"
+        }
+
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Code",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Code": {
+      "main": [
+        [
+          {
+            "node": "If",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "If": {
+      "main": [
+        [
+          {
+            "node": "Then",
+            "type": "main",
+            "index": 0
+          }
+        ],
+        [
+          {
+            "node": "Else",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "ce7ed9ae-704e-4da8-b178-24556f720b2a",
+  "id": "BWUTRs5RHxVgQ4uT",
+  "meta": {
+    "instanceId": "78577815012af39cf16dad7a787b0898c42fb7514b8a7f99b2136862c2af502c"
+  },
+  "tags": []
+}
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
new file mode 100644
index 0000000000000..d0531ff3c2a92
--- /dev/null
+++ b/packages/nodes-base/nodes/If/test/v2/IfV2.node.test.ts
@@ -0,0 +1,5 @@
+import { testWorkflows, getWorkflowFilenames } from '@test/nodes/Helpers';
+
+const workflows = getWorkflowFilenames(__dirname);
+
+describe('Test IF v2 Node', () => testWorkflows(workflows));
diff --git a/packages/nodes-base/nodes/If/test/v2/IfV2.number.json b/packages/nodes-base/nodes/If/test/v2/IfV2.number.json
new file mode 100644
index 0000000000000..3f275a3f23dcf
--- /dev/null
+++ b/packages/nodes-base/nodes/If/test/v2/IfV2.number.json
@@ -0,0 +1,165 @@
+{
+  "name": "Filter test",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "f332a7d1-31b4-4e78-b31e-9e8db945bf3f",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        -60,
+        480
+      ]
+    },
+    {
+      "parameters": {
+        "jsCode": "return [\n  {\n    \"count\": 1,\n    \"label\": \"Apple\",\n  },\n  {\n    \"count\": 5,\n    \"label\": \"Banana\"\n  },\n  {\n    \"count\": 12,\n    \"label\": \"Kiwi\"\n  }\n]"
+      },
+      "id": "60697c7f-3948-4790-97ba-8aba03d02ac2",
+      "name": "Code",
+      "type": "n8n-nodes-base.code",
+      "typeVersion": 2,
+      "position": [
+        160,
+        480
+      ]
+    },
+    {
+      "parameters": {
+        "conditions": {
+          "options": {
+            "caseSensitive": true,
+            "leftValue": ""
+          },
+          "conditions": [
+            {
+              "leftValue": "={{ $json.count }}",
+              "rightValue": "1",
+              "operator": {
+                "type": "number",
+                "operation": "equals"
+              }
+            },
+            {
+              "leftValue": "={{ $json.count }}",
+              "rightValue": "10",
+              "operator": {
+                "type": "number",
+                "operation": "gt"
+              }
+            }
+          ],
+          "combinator": "or"
+        },
+        "options": {}
+      },
+      "id": "7531191b-5ac3-45dc-8afb-27ae83d8f33a",
+      "name": "If",
+      "type": "n8n-nodes-base.if",
+      "typeVersion": 2,
+      "position": [
+        380,
+        480
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "d8c614ea-0bbf-4b12-ad7d-c9ebe09ce583",
+      "name": "Then",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        600,
+        400
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "69364770-60d2-4ef4-9f29-9570718a9a10",
+      "name": "Else",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        600,
+        580
+      ]
+    }
+  ],
+  "pinData": {
+    "Then": [
+      {
+        "json": {
+          "count": 1,
+          "label": "Apple"
+        }
+      },
+      {
+        "json": {
+          "count": 12,
+          "label": "Kiwi"
+        }
+      }
+    ],
+    "Else": [
+      {
+        "json": {
+          "count": 5,
+          "label": "Banana"
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Code",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Code": {
+      "main": [
+        [
+          {
+            "node": "If",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "If": {
+      "main": [
+        [
+          {
+            "node": "Then",
+            "type": "main",
+            "index": 0
+          }
+        ],
+        [
+          {
+            "node": "Else",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "78d54316-4f39-4012-bbb8-c789f1f8865b",
+  "id": "BWUTRs5RHxVgQ4uT",
+  "meta": {
+    "instanceId": "78577815012af39cf16dad7a787b0898c42fb7514b8a7f99b2136862c2af502c"
+  },
+  "tags": []
+}
diff --git a/packages/nodes-base/nodes/If/test/v2/IfV2.other.json b/packages/nodes-base/nodes/If/test/v2/IfV2.other.json
new file mode 100644
index 0000000000000..6aa67c92729ee
--- /dev/null
+++ b/packages/nodes-base/nodes/If/test/v2/IfV2.other.json
@@ -0,0 +1,182 @@
+{
+  "name": "Filter test",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "f332a7d1-31b4-4e78-b31e-9e8db945bf3f",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        -60,
+        480
+      ]
+    },
+    {
+      "parameters": {
+        "jsCode": "return [\n  {\n    \"label\": \"Apple\",\n    tags: [],\n    meta: {foo: 'bar'}\n  },\n  {\n    \"label\": \"Banana\",\n    tags: ['exotic'],\n    meta: {}\n  },\n  {\n    \"label\": \"Kiwi\",\n    tags: ['exotic'],\n    meta: {}\n  },\n  {\n    \"label\": \"Orange\",\n    meta: {}\n  }\n]"
+      },
+      "id": "60697c7f-3948-4790-97ba-8aba03d02ac2",
+      "name": "Code",
+      "type": "n8n-nodes-base.code",
+      "typeVersion": 2,
+      "position": [
+        160,
+        480
+      ]
+    },
+    {
+      "parameters": {
+        "conditions": {
+          "options": {
+            "caseSensitive": true,
+            "leftValue": ""
+          },
+          "conditions": [
+            {
+              "leftValue": "={{ $json.tags }}",
+              "rightValue": "exotic",
+              "operator": {
+                "type": "array",
+                "operation": "contains",
+                "rightType": "any"
+              }
+            },
+            {
+              "leftValue": "={{ $json.meta }}",
+              "rightValue": "",
+              "operator": {
+                "type": "object",
+                "operation": "notEmpty",
+                "singleValue": true
+              }
+            }
+          ],
+          "combinator": "or"
+        },
+        "options": {}
+      },
+      "id": "7531191b-5ac3-45dc-8afb-27ae83d8f33a",
+      "name": "If",
+      "type": "n8n-nodes-base.if",
+      "typeVersion": 2,
+      "position": [
+        380,
+        480
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "d8c614ea-0bbf-4b12-ad7d-c9ebe09ce583",
+      "name": "Then",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        600,
+        400
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "69364770-60d2-4ef4-9f29-9570718a9a10",
+      "name": "Else",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        600,
+        580
+      ]
+    }
+  ],
+  "pinData": {
+    "Then": [
+      {
+        "json": {
+          "label": "Apple",
+          "tags": [],
+          "meta": {
+            "foo": "bar"
+          }
+        }
+      },
+      {
+        "json": {
+          "label": "Banana",
+          "tags": [
+            "exotic"
+          ],
+          "meta": {}
+        }
+      },
+      {
+        "json": {
+          "label": "Kiwi",
+          "tags": [
+            "exotic"
+          ],
+          "meta": {}
+        }
+      }
+    ],
+    "Else": [
+      {
+        "json": {
+          "label": "Orange",
+          "meta": {}
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Code",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Code": {
+      "main": [
+        [
+          {
+            "node": "If",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "If": {
+      "main": [
+        [
+          {
+            "node": "Then",
+            "type": "main",
+            "index": 0
+          }
+        ],
+        [
+          {
+            "node": "Else",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "a6249f48-d88f-4b80-9ed9-79555e522d48",
+  "id": "BWUTRs5RHxVgQ4uT",
+  "meta": {
+    "instanceId": "78577815012af39cf16dad7a787b0898c42fb7514b8a7f99b2136862c2af502c"
+  },
+  "tags": []
+}
diff --git a/packages/nodes-base/nodes/If/test/v2/IfV2.string.json b/packages/nodes-base/nodes/If/test/v2/IfV2.string.json
new file mode 100644
index 0000000000000..b6092baa859c6
--- /dev/null
+++ b/packages/nodes-base/nodes/If/test/v2/IfV2.string.json
@@ -0,0 +1,178 @@
+{
+    "name": "Filter test",
+    "nodes": [
+      {
+        "parameters": {},
+        "id": "96490c63-a3f4-4923-b969-8f9adcbb1bbb",
+        "name": "When clicking \"Execute Workflow\"",
+        "type": "n8n-nodes-base.manualTrigger",
+        "typeVersion": 1,
+        "position": [
+          -160,
+          300
+        ]
+      },
+      {
+        "parameters": {
+          "conditions": {
+            "options": {
+              "caseSensitive": false,
+              "leftValue": ""
+            },
+            "conditions": [
+              {
+                "leftValue": "={{ $json.firstname }}",
+                "rightValue": "s",
+                "operator": {
+                  "type": "string",
+                  "operation": "startsWith"
+                }
+              },
+              {
+                "leftValue": "={{ $json.lastname }}",
+                "rightValue": "",
+                "operator": {
+                  "type": "any",
+                  "operation": "exists"
+                }
+              },
+              {
+                "leftValue": "={{ $json.email }}",
+                "rightValue": "@yahoo.com",
+                "operator": {
+                  "type": "string",
+                  "operation": "endsWith"
+                }
+              }
+            ],
+            "combinator": "and"
+          },
+          "options": {
+            "caseSensitive": false
+          }
+        },
+        "id": "48399b31-219a-42fa-bb5b-380dbb4a2e7d",
+        "name": "If",
+        "type": "n8n-nodes-base.if",
+        "typeVersion": 2,
+        "position": [
+          260,
+          300
+        ]
+      },
+      {
+        "parameters": {},
+        "id": "8a59a941-bafd-46a6-8692-878de715d912",
+        "name": "false",
+        "type": "n8n-nodes-base.noOp",
+        "typeVersion": 1,
+        "position": [
+          560,
+          440
+        ]
+      },
+      {
+        "parameters": {},
+        "id": "b82546fa-f9e9-4fa3-9dcb-e2c94a3784de",
+        "name": "Then",
+        "type": "n8n-nodes-base.noOp",
+        "typeVersion": 1,
+        "position": [
+          560,
+          140
+        ]
+      },
+      {
+        "parameters": {
+          "jsCode": "return [\n  {\n    \"email\": \"Shane@yahoo.com\",\n    \"firstname\": \"Shane\",\n    \"lastname\": \"Martin\"\n  },\n  {\n    \"email\": \"Sharon@yahoo.com\",\n    \"firstname\": \"Sharon\",\n    \"lastname\": \"Tromp\"\n  },\n  {\n    \"email\": \"sarah@gmail.com\",\n    \"firstname\": \"Sarah\",\n    \"lastname\": \"Dawson\"\n  }\n]"
+        },
+        "id": "674c5688-ac03-49a7-83fb-62460a10cc10",
+        "name": "Code",
+        "type": "n8n-nodes-base.code",
+        "typeVersion": 2,
+        "position": [
+          60,
+          300
+        ]
+      }
+    ],
+    "pinData": {
+      "Then": [
+        {
+          "json": {
+            "email": "Shane@yahoo.com",
+            "firstname": "Shane",
+            "lastname": "Martin"
+          }
+        },
+        {
+          "json": {
+            "email": "Sharon@yahoo.com",
+            "firstname": "Sharon",
+            "lastname": "Tromp"
+          }
+        }
+      ],
+      "false": [
+        {
+          "json": {
+            "email": "sarah@gmail.com",
+            "firstname": "Sarah",
+            "lastname": "Dawson"
+          }
+        }
+      ]
+    },
+    "connections": {
+      "When clicking \"Execute Workflow\"": {
+        "main": [
+          [
+            {
+              "node": "Code",
+              "type": "main",
+              "index": 0
+            }
+          ]
+        ]
+      },
+      "If": {
+        "main": [
+          [
+            {
+              "node": "Then",
+              "type": "main",
+              "index": 0
+            }
+          ],
+          [
+            {
+              "node": "false",
+              "type": "main",
+              "index": 0
+            }
+          ]
+        ]
+      },
+      "Code": {
+        "main": [
+          [
+            {
+              "node": "If",
+              "type": "main",
+              "index": 0
+            }
+          ]
+        ]
+      }
+    },
+    "active": false,
+    "settings": {
+      "executionOrder": "v1"
+    },
+    "versionId": "48c6a584-e79b-4ce4-ab4b-2b4ab663b89d",
+    "id": "BWUTRs5RHxVgQ4uT",
+    "meta": {
+      "instanceId": "78577815012af39cf16dad7a787b0898c42fb7514b8a7f99b2136862c2af502c"
+    },
+    "tags": []
+  }
diff --git a/packages/nodes-base/nodes/Intercom/GenericFunctions.ts b/packages/nodes-base/nodes/Intercom/GenericFunctions.ts
index f064da22d31b3..6ebbfd0642ec4 100644
--- a/packages/nodes-base/nodes/Intercom/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Intercom/GenericFunctions.ts
@@ -1,19 +1,18 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	JsonObject,
+	IRequestOptions,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function intercomApiRequest(
-	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	endpoint: string,
-	method: string,
+	method: IHttpRequestMethods,
 
 	body: any = {},
 	query?: IDataObject,
@@ -26,7 +25,7 @@ export async function intercomApiRequest(
 		{ Authorization: `Bearer ${credentials.apiKey}`, Accept: 'application/json' },
 	);
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: headerWithAuthentication,
 		method,
 		qs: query,
@@ -50,7 +49,7 @@ export async function intercomApiRequestAllItems(
 	this: IHookFunctions | IExecuteFunctions,
 	propertyName: string,
 	endpoint: string,
-	method: string,
+	method: IHttpRequestMethods,
 
 	body: any = {},
 	query: IDataObject = {},
diff --git a/packages/nodes-base/nodes/Intercom/Intercom.node.ts b/packages/nodes-base/nodes/Intercom/Intercom.node.ts
index 7490c170fad9d..ba16a6422726a 100644
--- a/packages/nodes-base/nodes/Intercom/Intercom.node.ts
+++ b/packages/nodes-base/nodes/Intercom/Intercom.node.ts
@@ -633,6 +633,6 @@ export class Intercom implements INodeType {
 			}
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Interval/Interval.node.ts b/packages/nodes-base/nodes/Interval/Interval.node.ts
index 496f3df994376..b4a2f088c8896 100644
--- a/packages/nodes-base/nodes/Interval/Interval.node.ts
+++ b/packages/nodes-base/nodes/Interval/Interval.node.ts
@@ -28,7 +28,7 @@ export class Interval implements INodeType {
 		properties: [
 			{
 				displayName:
-					'This workflow will run on the schedule you define here once you <a data-key="activate">activate</a> it.<br><br>For testing, you can also trigger it manually: by going back to the canvas and clicking ‘execute workflow’',
+					'This workflow will run on the schedule you define here once you <a data-key="activate">activate</a> it.<br><br>For testing, you can also trigger it manually: by going back to the canvas and clicking \'test workflow\'',
 				name: 'notice',
 				type: 'notice',
 				default: '',
diff --git a/packages/nodes-base/nodes/InvoiceNinja/GenericFunctions.ts b/packages/nodes-base/nodes/InvoiceNinja/GenericFunctions.ts
index 187d637ebae38..76750e8fd9f2b 100644
--- a/packages/nodes-base/nodes/InvoiceNinja/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/InvoiceNinja/GenericFunctions.ts
@@ -1,16 +1,15 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	JsonObject,
+	IRequestOptions,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
-import get from 'lodash.get';
+import get from 'lodash/get';
 
 export const eventID: { [key: string]: string } = {
 	create_client: '1',
@@ -21,8 +20,8 @@ export const eventID: { [key: string]: string } = {
 };
 
 export async function invoiceNinjaApiRequest(
-	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject = {},
 	query?: IDataObject,
@@ -39,7 +38,7 @@ export async function invoiceNinjaApiRequest(
 	const defaultUrl = version === 'v4' ? 'https://app.invoiceninja.com' : 'https://invoicing.co';
 	const baseUrl = credentials.url || defaultUrl;
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		method,
 		qs: query,
 		uri: uri || `${baseUrl}/api/v1${endpoint}`,
@@ -57,7 +56,7 @@ export async function invoiceNinjaApiRequest(
 export async function invoiceNinjaApiRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject = {},
 	query: IDataObject = {},
diff --git a/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinja.node.ts b/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinja.node.ts
index 65ae05298789a..a14643d6fe8ee 100644
--- a/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinja.node.ts
+++ b/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinja.node.ts
@@ -418,7 +418,12 @@ export class InvoiceNinja implements INodeType {
 							body.invoice_date = additionalFields.invoiceDate as string;
 						}
 						if (additionalFields.invoiceNumber) {
-							body.invoice_number = additionalFields.invoiceNumber as string;
+							if (apiVersion === 'v4') {
+								body.invoice_number = additionalFields.invoiceNumber as string;
+							} else if (apiVersion === 'v5') {
+								// eslint-disable-next-line id-denylist
+								body.number = additionalFields.invoiceNumber as string;
+							}
 						}
 						if (additionalFields.invoiceStatus) {
 							body.invoice_status_id = additionalFields.invoiceStatus as number;
@@ -858,7 +863,12 @@ export class InvoiceNinja implements INodeType {
 							body.invoice_date = additionalFields.quouteDate as string;
 						}
 						if (additionalFields.quoteNumber) {
-							body.invoice_number = additionalFields.quoteNumber as string;
+							if (apiVersion === 'v4') {
+								body.invoice_number = additionalFields.quoteNumber as string;
+							} else if (apiVersion === 'v5') {
+								// eslint-disable-next-line id-denylist
+								body.number = additionalFields.quoteNumber as string;
+							}
 						}
 						if (additionalFields.invoiceStatus) {
 							body.invoice_status_id = additionalFields.invoiceStatus as number;
@@ -1023,6 +1033,6 @@ export class InvoiceNinja implements INodeType {
 			}
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/InvoiceNinja/QuoteInterface.ts b/packages/nodes-base/nodes/InvoiceNinja/QuoteInterface.ts
index f1e5329e41467..7784f880c71ef 100644
--- a/packages/nodes-base/nodes/InvoiceNinja/QuoteInterface.ts
+++ b/packages/nodes-base/nodes/InvoiceNinja/QuoteInterface.ts
@@ -23,6 +23,8 @@ export interface IQuote {
 	invoice_items?: IItem[];
 	line_items?: IItem[];
 	invoice_number?: string;
+	// eslint-disable-next-line id-denylist
+	number?: string;
 	invoice_status_id?: number;
 	is_amount_discount?: boolean;
 	is_quote?: boolean;
diff --git a/packages/nodes-base/nodes/InvoiceNinja/invoiceInterface.ts b/packages/nodes-base/nodes/InvoiceNinja/invoiceInterface.ts
index 22a8728ae422e..752fbbf4a7558 100644
--- a/packages/nodes-base/nodes/InvoiceNinja/invoiceInterface.ts
+++ b/packages/nodes-base/nodes/InvoiceNinja/invoiceInterface.ts
@@ -23,6 +23,8 @@ export interface IInvoice {
 	invoice_items?: IItem[];
 	line_items?: IItem[];
 	invoice_number?: string;
+	// eslint-disable-next-line id-denylist
+	number?: string;
 	invoice_status_id?: number;
 	is_amount_discount?: boolean;
 	paid?: number;
diff --git a/packages/nodes-base/nodes/InvoiceNinja/invoiceNinja.svg b/packages/nodes-base/nodes/InvoiceNinja/invoiceNinja.svg
index 5e0000cd1659d..fb0d71c694683 100644
--- a/packages/nodes-base/nodes/InvoiceNinja/invoiceNinja.svg
+++ b/packages/nodes-base/nodes/InvoiceNinja/invoiceNinja.svg
@@ -1 +1 @@
-<svg width="24" height="24" xmlns="http://www.w3.org/2000/svg"><path d="M16.247 10.326a1.164 1.164 0 11-2.328 0 1.164 1.164 0 012.328 0zm-6.288 0a1.164 1.164 0 11-2.329 0 1.164 1.164 0 012.329 0zm-.14 13.52c-4.712-.98-8.227-4.257-9.482-8.842-.421-1.537-.421-4.49 0-6.027C1.506 4.709 4.73 1.485 8.997.316c1.538-.421 4.49-.421 6.028 0 4.267 1.169 7.492 4.393 8.66 8.66.24.874.294 1.43.294 3.014 0 1.584-.054 2.14-.293 3.014-1.17 4.271-4.439 7.536-8.661 8.65-1.391.367-3.916.46-5.206.192zm6.64-9.315c-3.047-1.348-4.054-1.737-4.5-1.737-.446 0-1.433.38-4.38 1.684-2.091.926-3.828 1.76-3.86 1.79h16.663zm-9.873-.361c1.621-.729 3.06-1.387 3.196-1.464.258-.145.337-.09-5.285-3.682-.56-.358-1.023-.698-1.025-.65v7.19a790.1 790.1 0 003.114-1.394zm14.078-2.194V8.417c0-.11-1.676.993-3.496 2.12-3 1.854-3.281 2.06-3.004 2.185 1.345.611 6.42 2.862 6.5 2.872zm-8.169.11c.545.125.643.104 1.226-.263.349-.22.655-.419.681-.442.026-.024-.05-.181-.167-.35-.118-.168-.215-.5-.215-.739V9.86l-.569.21c-.726.267-2.28.27-3 .005l-.556-.205.013.452c.007.26-.088.563-.225.715-.232.256-.22.276.45.726.64.432.725.455 1.23.327a2.349 2.349 0 011.132-.002zm-4.23-2.65c-.105-.113-2.97-.954-3.033-.891-.03.03.504.414 1.186.854l1.24.8.34-.344c.186-.188.307-.377.268-.42zm9.76-.373c.473-.306.8-.555.728-.555-.155 0-2.877.804-3.027.894-.057.034.033.229.2.433l.304.37.47-.293c.257-.162.854-.544 1.326-.85zm-1.636-.555c2.11-.59 3.867-1.102 3.904-1.139H3.59c.187.187 7.779 2.195 8.323 2.202.41.005 2.014-.376 4.476-1.063z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24"><path d="M16.247 10.326a1.164 1.164 0 1 1-2.328 0 1.164 1.164 0 0 1 2.328 0m-6.288 0a1.164 1.164 0 1 1-2.329 0 1.164 1.164 0 0 1 2.329 0m-.14 13.52c-4.712-.98-8.227-4.257-9.482-8.842-.421-1.537-.421-4.49 0-6.027C1.506 4.709 4.73 1.485 8.997.316c1.538-.421 4.49-.421 6.028 0 4.267 1.169 7.492 4.393 8.66 8.66.24.874.294 1.43.294 3.014s-.054 2.14-.293 3.014c-1.17 4.271-4.439 7.536-8.661 8.65-1.391.367-3.916.46-5.206.192m6.64-9.315c-3.047-1.348-4.054-1.737-4.5-1.737s-1.433.38-4.38 1.684c-2.091.926-3.828 1.76-3.86 1.79h16.663zm-9.873-.361c1.621-.729 3.06-1.387 3.196-1.464.258-.145.337-.09-5.285-3.682-.56-.358-1.023-.698-1.025-.65v7.19a790 790 0 0 0 3.114-1.394m14.078-2.194V8.417c0-.11-1.676.993-3.496 2.12-3 1.854-3.281 2.06-3.004 2.185 1.345.611 6.42 2.862 6.5 2.872zm-8.169.11c.545.125.643.104 1.226-.263.349-.22.655-.419.681-.442s-.05-.181-.167-.35-.215-.5-.215-.739V9.86l-.569.21c-.726.267-2.28.27-3 .005l-.556-.205.013.452c.007.26-.088.563-.225.715-.232.256-.22.276.45.726.64.432.725.455 1.23.327a2.35 2.35 0 0 1 1.132-.002zm-4.23-2.65c-.105-.113-2.97-.954-3.033-.891-.03.03.504.414 1.186.854l1.24.8.34-.344c.186-.188.307-.377.268-.42zm9.76-.373c.473-.306.8-.555.728-.555-.155 0-2.877.804-3.027.894-.057.034.033.229.2.433l.304.37.47-.293c.257-.162.854-.544 1.326-.85zm-1.636-.555c2.11-.59 3.867-1.102 3.904-1.139H3.59c.187.187 7.779 2.195 8.323 2.202.41.005 2.014-.376 4.476-1.063"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/ItemLists/ItemLists.node.ts b/packages/nodes-base/nodes/ItemLists/ItemLists.node.ts
index 25a640528043e..e6b413ed11b8f 100644
--- a/packages/nodes-base/nodes/ItemLists/ItemLists.node.ts
+++ b/packages/nodes-base/nodes/ItemLists/ItemLists.node.ts
@@ -2,8 +2,8 @@ import type { INodeTypeBaseDescription, IVersionedNodeType } from 'n8n-workflow'
 import { VersionedNodeType } from 'n8n-workflow';
 
 import { ItemListsV1 } from './V1/ItemListsV1.node';
-
 import { ItemListsV2 } from './V2/ItemListsV2.node';
+import { ItemListsV3 } from './V3/ItemListsV3.node';
 
 export class ItemLists extends VersionedNodeType {
 	constructor() {
@@ -12,14 +12,19 @@ export class ItemLists extends VersionedNodeType {
 			name: 'itemLists',
 			icon: 'file:itemLists.svg',
 			group: ['input'],
+			hidden: true,
 			subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
 			description: 'Helper for working with lists of items and transforming arrays',
-			defaultVersion: 2,
+			defaultVersion: 3.1,
 		};
 
 		const nodeVersions: IVersionedNodeType['nodeVersions'] = {
 			1: new ItemListsV1(baseDescription),
 			2: new ItemListsV2(baseDescription),
+			2.1: new ItemListsV2(baseDescription),
+			2.2: new ItemListsV2(baseDescription),
+			3: new ItemListsV3(baseDescription),
+			3.1: new ItemListsV3(baseDescription),
 		};
 
 		super(nodeVersions, baseDescription);
diff --git a/packages/nodes-base/nodes/ItemLists/V1/ItemListsV1.node.ts b/packages/nodes-base/nodes/ItemLists/V1/ItemListsV1.node.ts
index 4b6e3c7b1611e..674a9eb42d280 100644
--- a/packages/nodes-base/nodes/ItemLists/V1/ItemListsV1.node.ts
+++ b/packages/nodes-base/nodes/ItemLists/V1/ItemListsV1.node.ts
@@ -1,6 +1,3 @@
-import type { NodeVMOptions } from 'vm2';
-import { NodeVM } from 'vm2';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -12,16 +9,16 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import get from 'lodash.get';
-import isEmpty from 'lodash.isempty';
-import isEqual from 'lodash.isequal';
-import isObject from 'lodash.isobject';
-import lt from 'lodash.lt';
-import merge from 'lodash.merge';
-import pick from 'lodash.pick';
-import reduce from 'lodash.reduce';
-import set from 'lodash.set';
-import unset from 'lodash.unset';
+import get from 'lodash/get';
+import isEmpty from 'lodash/isEmpty';
+import isEqual from 'lodash/isEqual';
+import isObject from 'lodash/isObject';
+import lt from 'lodash/lt';
+import merge from 'lodash/merge';
+import pick from 'lodash/pick';
+import reduce from 'lodash/reduce';
+import set from 'lodash/set';
+import unset from 'lodash/unset';
 
 const compareItems = (
 	obj: INodeExecutionData,
@@ -60,6 +57,7 @@ const shuffleArray = (array: any[]) => {
 	}
 };
 
+import { sortByCode } from '../V3/helpers/utils';
 import * as summarize from './summarize.operation';
 
 export class ItemListsV1 implements INodeType {
@@ -598,7 +596,7 @@ export class ItemListsV1 implements INodeType {
 					type: 'string',
 					typeOptions: {
 						alwaysOpenEditWindow: true,
-						editor: 'code',
+						editor: 'jsEditor',
 						rows: 10,
 					},
 					default: `// The two items to compare are in the variables a and b
@@ -922,7 +920,7 @@ return 0;`,
 					}
 				}
 
-				return this.prepareOutputData(returnData);
+				return [returnData];
 			} else if (operation === 'aggregateItems') {
 				const aggregate = this.getNodeParameter('aggregate', 0, '') as string;
 
@@ -1062,7 +1060,7 @@ return 0;`,
 
 					returnData.push(newItem);
 
-					return this.prepareOutputData(returnData);
+					return [returnData];
 				} else {
 					let newItems: IDataObject[] = items.map((item) => item.json);
 					const destinationFieldName = this.getNodeParameter('destinationFieldName', 0) as string;
@@ -1098,9 +1096,7 @@ return 0;`,
 						}, [] as IDataObject[]);
 					}
 
-					const output: INodeExecutionData = { json: { [destinationFieldName]: newItems } };
-
-					return this.prepareOutputData([output]);
+					return [[{ json: { [destinationFieldName]: newItems } }]];
 				}
 			} else if (operation === 'removeDuplicates') {
 				const compare = this.getNodeParameter('compare', 0) as string;
@@ -1167,7 +1163,7 @@ return 0;`,
 						({
 							json: { ...item.json, __INDEX: index },
 							pairedItem: { item: index },
-						} as INodeExecutionData),
+						}) as INodeExecutionData,
 				);
 				//sort items using the compare keys
 				newItems.sort((a, b) => {
@@ -1247,7 +1243,7 @@ return 0;`,
 				}
 
 				// return the filtered items
-				return this.prepareOutputData(data);
+				return [data];
 			} else if (operation === 'sort') {
 				let newItems = [...items];
 				const type = this.getNodeParameter('type', 0) as string;
@@ -1259,7 +1255,7 @@ return 0;`,
 
 				if (type === 'random') {
 					shuffleArray(newItems);
-					return this.prepareOutputData(newItems);
+					return [newItems];
 				}
 
 				if (type === 'simple') {
@@ -1369,45 +1365,16 @@ return 0;`,
 						return result;
 					});
 				} else {
-					const code = this.getNodeParameter('code', 0) as string;
-					const regexCheck = /\breturn\b/g.exec(code);
-
-					if (regexCheck?.length) {
-						const sandbox = {
-							newItems,
-						};
-						const mode = this.getMode();
-						const options = {
-							console: mode === 'manual' ? 'redirect' : 'inherit',
-							sandbox,
-						};
-						const vm = new NodeVM(options as unknown as NodeVMOptions);
-
-						newItems = await vm.run(
-							`
-						module.exports = async function() {
-							newItems.sort( (a,b) => {
-								${code}
-							})
-							return newItems;
-						}()`,
-							__dirname,
-						);
-					} else {
-						throw new NodeOperationError(
-							this.getNode(),
-							"Sort code doesn't return. Please add a 'return' statement to your code",
-						);
-					}
+					newItems = sortByCode.call(this, newItems);
 				}
-				return this.prepareOutputData(newItems);
+				return [newItems];
 			} else if (operation === 'limit') {
 				let newItems = items;
 				const maxItems = this.getNodeParameter('maxItems', 0) as number;
 				const keep = this.getNodeParameter('keep', 0) as string;
 
 				if (maxItems > items.length) {
-					return this.prepareOutputData(newItems);
+					return [newItems];
 				}
 
 				if (keep === 'firstItems') {
@@ -1415,9 +1382,9 @@ return 0;`,
 				} else {
 					newItems = items.slice(items.length - maxItems, items.length);
 				}
-				return this.prepareOutputData(newItems);
+				return [newItems];
 			} else if (operation === 'summarize') {
-				return summarize.execute.call(this, items);
+				return await summarize.execute.call(this, items);
 			} else {
 				throw new NodeOperationError(this.getNode(), `Operation '${operation}' is not recognized`);
 			}
diff --git a/packages/nodes-base/nodes/ItemLists/V1/summarize.operation.ts b/packages/nodes-base/nodes/ItemLists/V1/summarize.operation.ts
index 81ee759a3589a..c1f5b0d43fa48 100644
--- a/packages/nodes-base/nodes/ItemLists/V1/summarize.operation.ts
+++ b/packages/nodes-base/nodes/ItemLists/V1/summarize.operation.ts
@@ -7,7 +7,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import get from 'lodash.get';
+import get from 'lodash/get';
 
 type AggregationType =
 	| 'append'
@@ -555,7 +555,7 @@ export async function execute(
 				item: index,
 			})),
 		};
-		return this.prepareOutputData([executionData]);
+		return [[executionData]];
 	} else {
 		if (!fieldsToSplitBy.length) {
 			const { pairedItems, ...json } = aggregationResult;
@@ -565,7 +565,7 @@ export async function execute(
 					item: index,
 				})),
 			};
-			return this.prepareOutputData([executionData]);
+			return [[executionData]];
 		}
 		const returnData = aggregationToArray(aggregationResult, fieldsToSplitBy);
 		const executionData = returnData.map((item) => {
@@ -577,6 +577,6 @@ export async function execute(
 				})),
 			};
 		});
-		return this.prepareOutputData(executionData);
+		return [executionData];
 	}
 }
diff --git a/packages/nodes-base/nodes/ItemLists/V2/ItemListsV2.node.ts b/packages/nodes-base/nodes/ItemLists/V2/ItemListsV2.node.ts
index 37b3d691d6630..7b1738dc075bb 100644
--- a/packages/nodes-base/nodes/ItemLists/V2/ItemListsV2.node.ts
+++ b/packages/nodes-base/nodes/ItemLists/V2/ItemListsV2.node.ts
@@ -1,6 +1,3 @@
-import type { NodeVMOptions } from 'vm2';
-import { NodeVM } from 'vm2';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -9,19 +6,20 @@ import type {
 	INodeType,
 	INodeTypeBaseDescription,
 	INodeTypeDescription,
+	IPairedItemData,
 } from 'n8n-workflow';
-import { NodeOperationError } from 'n8n-workflow';
-
-import get from 'lodash.get';
-import isEmpty from 'lodash.isempty';
-import isEqual from 'lodash.isequal';
-import isObject from 'lodash.isobject';
-import lt from 'lodash.lt';
-import merge from 'lodash.merge';
-import pick from 'lodash.pick';
-import reduce from 'lodash.reduce';
-import set from 'lodash.set';
-import unset from 'lodash.unset';
+import { NodeOperationError, deepCopy } from 'n8n-workflow';
+
+import get from 'lodash/get';
+import isEmpty from 'lodash/isEmpty';
+import isEqual from 'lodash/isEqual';
+import isObject from 'lodash/isObject';
+import lt from 'lodash/lt';
+import merge from 'lodash/merge';
+import pick from 'lodash/pick';
+import reduce from 'lodash/reduce';
+import set from 'lodash/set';
+import unset from 'lodash/unset';
 
 const compareItems = (
 	obj: INodeExecutionData,
@@ -60,6 +58,7 @@ const shuffleArray = (array: any[]) => {
 	}
 };
 
+import { sortByCode } from '../V3/helpers/utils';
 import * as summarize from './summarize.operation';
 
 export class ItemListsV2 implements INodeType {
@@ -68,7 +67,7 @@ export class ItemListsV2 implements INodeType {
 	constructor(baseDescription: INodeTypeBaseDescription) {
 		this.description = {
 			...baseDescription,
-			version: 2,
+			version: [2, 2.1, 2.2],
 			defaults: {
 				name: 'Item Lists',
 			},
@@ -121,7 +120,8 @@ export class ItemListsV2 implements INodeType {
 						{
 							name: 'Split Out Items',
 							value: 'splitOutItems',
-							description: 'Turn a list inside item(s) into separate items',
+							description:
+								"Turn a list or values of object's properties inside item(s) into separate items",
 							action: 'Split Out Items',
 						},
 						{
@@ -135,7 +135,7 @@ export class ItemListsV2 implements INodeType {
 				},
 				// Split out items - Fields
 				{
-					displayName: 'Field To Split Out',
+					displayName: 'Fields To Split Out',
 					name: 'fieldToSplitOut',
 					type: 'string',
 					default: '',
@@ -146,8 +146,8 @@ export class ItemListsV2 implements INodeType {
 							operation: ['splitOutItems'],
 						},
 					},
-					description: 'The name of the input field to break out into separate items',
-					requiresDataPath: 'single',
+					description: 'The name of the input fields to break out into separate items',
+					requiresDataPath: 'multiple',
 				},
 				{
 					displayName: 'Include',
@@ -598,7 +598,7 @@ export class ItemListsV2 implements INodeType {
 					type: 'string',
 					typeOptions: {
 						alwaysOpenEditWindow: true,
-						editor: 'code',
+						editor: 'jsEditor',
 						rows: 10,
 					},
 					default: `// The two items to compare are in the variables a and b
@@ -754,6 +754,7 @@ return 0;`,
 							displayName: 'Destination Field Name',
 							name: 'destinationFieldName',
 							type: 'string',
+							requiresDataPath: 'multiple',
 							displayOptions: {
 								show: {
 									'/operation': ['splitOutItems'],
@@ -802,127 +803,162 @@ return 0;`,
 		const returnData: INodeExecutionData[] = [];
 		const resource = this.getNodeParameter('resource', 0);
 		const operation = this.getNodeParameter('operation', 0);
+		const nodeVersion = this.getNode().typeVersion;
+
 		if (resource === 'itemList') {
 			if (operation === 'splitOutItems') {
 				for (let i = 0; i < length; i++) {
-					const fieldToSplitOut = this.getNodeParameter('fieldToSplitOut', i) as string;
+					const fieldsToSplitOut = (this.getNodeParameter('fieldToSplitOut', i) as string)
+						.split(',')
+						.map((field) => field.trim());
 					const disableDotNotation = this.getNodeParameter(
 						'options.disableDotNotation',
 						0,
 						false,
 					) as boolean;
-					const destinationFieldName = this.getNodeParameter(
-						'options.destinationFieldName',
-						i,
-						'',
-					) as string;
-					const include = this.getNodeParameter('include', i) as string;
-
-					let arrayToSplit;
-					if (!disableDotNotation) {
-						arrayToSplit = get(items[i].json, fieldToSplitOut);
-					} else {
-						arrayToSplit = items[i].json[fieldToSplitOut];
-					}
 
-					if (arrayToSplit === undefined) {
-						if (fieldToSplitOut.includes('.') && disableDotNotation) {
-							throw new NodeOperationError(
-								this.getNode(),
-								`Couldn't find the field '${fieldToSplitOut}' in the input data`,
-								{
-									description:
-										"If you're trying to use a nested field, make sure you turn off 'disable dot notation' in the node options",
-								},
-							);
-						} else {
-							throw new NodeOperationError(
-								this.getNode(),
-								`Couldn't find the field '${fieldToSplitOut}' in the input data`,
-								{ itemIndex: i },
-							);
-						}
-					}
+					const destinationFields = (
+						this.getNodeParameter('options.destinationFieldName', i, '') as string
+					)
+						.split(',')
+						.filter((field) => field.trim() !== '')
+						.map((field) => field.trim());
 
-					if (!Array.isArray(arrayToSplit)) {
+					if (destinationFields.length && destinationFields.length !== fieldsToSplitOut.length) {
 						throw new NodeOperationError(
 							this.getNode(),
-							`The provided field '${fieldToSplitOut}' is not an array`,
-							{ itemIndex: i },
+							'If multiple fields to split out are given, the same number of destination fields must be given',
 						);
-					} else {
-						for (const element of arrayToSplit) {
-							let newItem = {};
+					}
 
-							if (include === 'selectedOtherFields') {
-								const fieldsToInclude = (
-									this.getNodeParameter('fieldsToInclude.fields', i, []) as [{ fieldName: string }]
-								).map((field) => field.fieldName);
+					const include = this.getNodeParameter('include', i) as
+						| 'selectedOtherFields'
+						| 'allOtherFields'
+						| 'noOtherFields';
 
-								if (!fieldsToInclude.length) {
-									throw new NodeOperationError(this.getNode(), 'No fields specified', {
-										description: 'Please add a field to include',
-									});
+					const multiSplit = fieldsToSplitOut.length > 1;
+
+					const item = { ...items[i].json };
+					const splited: IDataObject[] = [];
+					for (const [entryIndex, fieldToSplitOut] of fieldsToSplitOut.entries()) {
+						const destinationFieldName = destinationFields[entryIndex] || '';
+
+						let arrayToSplit;
+						if (!disableDotNotation) {
+							arrayToSplit = get(item, fieldToSplitOut);
+						} else {
+							arrayToSplit = item[fieldToSplitOut];
+						}
+
+						if (arrayToSplit === undefined) {
+							if (nodeVersion < 2.1) {
+								if (fieldToSplitOut.includes('.') && disableDotNotation) {
+									throw new NodeOperationError(
+										this.getNode(),
+										`Couldn't find the field '${fieldToSplitOut}' in the input data`,
+										{
+											description:
+												"If you're trying to use a nested field, make sure you turn off 'disable dot notation' in the node options",
+										},
+									);
+								} else {
+									throw new NodeOperationError(
+										this.getNode(),
+										`Couldn't find the field '${fieldToSplitOut}' in the input data`,
+										{ itemIndex: i },
+									);
 								}
+							} else {
+								arrayToSplit = [];
+							}
+						}
 
-								newItem = {
-									...fieldsToInclude.reduce((prev, field) => {
-										if (field === fieldToSplitOut) {
-											return prev;
-										}
-										let value;
-										if (!disableDotNotation) {
-											value = get(items[i].json, field);
-										} else {
-											value = items[i].json[field];
-										}
-										prev = { ...prev, [field]: value };
-										return prev;
-									}, {}),
-								};
-							} else if (include === 'allOtherFields') {
-								const keys = Object.keys(items[i].json);
-
-								newItem = {
-									...keys.reduce((prev, field) => {
-										let value;
-										if (!disableDotNotation) {
-											value = get(items[i].json, field);
-										} else {
-											value = items[i].json[field];
-										}
-										prev = { ...prev, [field]: value };
-										return prev;
-									}, {}),
-								};
+						if (typeof arrayToSplit !== 'object' || arrayToSplit === null) {
+							if (nodeVersion < 2.2) {
+								throw new NodeOperationError(
+									this.getNode(),
+									`The provided field '${fieldToSplitOut}' is not an array or object`,
+									{ itemIndex: i },
+								);
+							} else {
+								arrayToSplit = [arrayToSplit];
+							}
+						}
+
+						if (!Array.isArray(arrayToSplit)) {
+							arrayToSplit = Object.values(arrayToSplit);
+						}
 
-								unset(newItem, fieldToSplitOut);
+						for (const [elementIndex, element] of arrayToSplit.entries()) {
+							if (splited[elementIndex] === undefined) {
+								splited[elementIndex] = {};
 							}
 
-							if (
-								typeof element === 'object' &&
-								include === 'noOtherFields' &&
-								destinationFieldName === ''
-							) {
-								newItem = { ...newItem, ...element };
+							const fieldName = destinationFieldName || fieldToSplitOut;
+
+							if (typeof element === 'object' && element !== null && include === 'noOtherFields') {
+								if (destinationFieldName === '' && !multiSplit) {
+									splited[elementIndex] = { ...splited[elementIndex], ...element };
+								} else {
+									splited[elementIndex][fieldName] = element;
+								}
 							} else {
-								newItem = {
-									...newItem,
-									[destinationFieldName || fieldToSplitOut]: element,
-								};
+								splited[elementIndex][fieldName] = element;
 							}
+						}
+					}
 
-							returnData.push({
-								json: newItem,
-								pairedItem: {
-									item: i,
-								},
-							});
+					for (const splitEntry of splited) {
+						let newItem: IDataObject = {};
+
+						if (include === 'noOtherFields') {
+							newItem = splitEntry;
 						}
+
+						if (include === 'allOtherFields') {
+							const itemCopy = deepCopy(item);
+							for (const fieldToSplitOut of fieldsToSplitOut) {
+								if (!disableDotNotation) {
+									unset(itemCopy, fieldToSplitOut);
+								} else {
+									delete itemCopy[fieldToSplitOut];
+								}
+							}
+							newItem = { ...itemCopy, ...splitEntry };
+						}
+
+						if (include === 'selectedOtherFields') {
+							const fieldsToInclude = (
+								this.getNodeParameter('fieldsToInclude.fields', i, []) as [{ fieldName: string }]
+							).map((field) => field.fieldName);
+
+							if (!fieldsToInclude.length) {
+								throw new NodeOperationError(this.getNode(), 'No fields specified', {
+									description: 'Please add a field to include',
+								});
+							}
+
+							for (const field of fieldsToInclude) {
+								if (!disableDotNotation) {
+									splitEntry[field] = get(item, field);
+								} else {
+									splitEntry[field] = item[field];
+								}
+							}
+
+							newItem = splitEntry;
+						}
+
+						returnData.push({
+							json: newItem,
+							pairedItem: {
+								item: i,
+							},
+						});
 					}
 				}
 
-				return this.prepareOutputData(returnData);
+				return [returnData];
 			} else if (operation === 'aggregateItems') {
 				const aggregate = this.getNodeParameter('aggregate', 0, '') as string;
 
@@ -945,36 +981,39 @@ return 0;`,
 							description: 'Please add a field to aggregate',
 						});
 					}
-					for (const { fieldToAggregate } of fieldsToAggregate) {
-						let found = false;
-						for (const item of items) {
-							if (fieldToAggregate === '') {
-								throw new NodeOperationError(this.getNode(), 'Field to aggregate is blank', {
-									description: 'Please add a field to aggregate',
-								});
-							}
-							if (!disableDotNotation) {
-								if (get(item.json, fieldToAggregate) !== undefined) {
+
+					if (nodeVersion < 2.1) {
+						for (const { fieldToAggregate } of fieldsToAggregate) {
+							let found = false;
+							for (const item of items) {
+								if (fieldToAggregate === '') {
+									throw new NodeOperationError(this.getNode(), 'Field to aggregate is blank', {
+										description: 'Please add a field to aggregate',
+									});
+								}
+								if (!disableDotNotation) {
+									if (get(item.json, fieldToAggregate) !== undefined) {
+										found = true;
+									}
+								} else if (item.json.hasOwnProperty(fieldToAggregate)) {
 									found = true;
 								}
-							} else if (item.json.hasOwnProperty(fieldToAggregate)) {
-								found = true;
 							}
-						}
-						if (!found && disableDotNotation && fieldToAggregate.includes('.')) {
-							throw new NodeOperationError(
-								this.getNode(),
-								`Couldn't find the field '${fieldToAggregate}' in the input data`,
-								{
-									description:
-										"If you're trying to use a nested field, make sure you turn off 'disable dot notation' in the node options",
-								},
-							);
-						} else if (!found && !keepMissing) {
-							throw new NodeOperationError(
-								this.getNode(),
-								`Couldn't find the field '${fieldToAggregate}' in the input data`,
-							);
+							if (!found && disableDotNotation && fieldToAggregate.includes('.')) {
+								throw new NodeOperationError(
+									this.getNode(),
+									`Couldn't find the field '${fieldToAggregate}' in the input data`,
+									{
+										description:
+											"If you're trying to use a nested field, make sure you turn off 'disable dot notation' in the node options",
+									},
+								);
+							} else if (!found && !keepMissing) {
+								throw new NodeOperationError(
+									this.getNode(),
+									`Couldn't find the field '${fieldToAggregate}' in the input data`,
+								);
+							}
 						}
 					}
 
@@ -1062,9 +1101,10 @@ return 0;`,
 
 					returnData.push(newItem);
 
-					return this.prepareOutputData(returnData);
+					return [returnData];
 				} else {
 					let newItems: IDataObject[] = items.map((item) => item.json);
+					let pairedItem: IPairedItemData[] = [];
 					const destinationFieldName = this.getNodeParameter('destinationFieldName', 0) as string;
 					const fieldsToExclude = (
 						this.getNodeParameter('fieldsToExclude.fields', 0, []) as IDataObject[]
@@ -1074,7 +1114,7 @@ return 0;`,
 					).map((entry) => entry.fieldName);
 
 					if (fieldsToExclude.length || fieldsToInclude.length) {
-						newItems = newItems.reduce((acc, item) => {
+						newItems = newItems.reduce((acc, item, index) => {
 							const newItem: IDataObject = {};
 							let outputFields = Object.keys(item);
 
@@ -1094,13 +1134,16 @@ return 0;`,
 							if (isEmpty(newItem)) {
 								return acc;
 							}
+							pairedItem.push({ item: index });
 							return acc.concat([newItem]);
 						}, [] as IDataObject[]);
+					} else {
+						pairedItem = Array.from({ length: newItems.length }, (_, item) => ({
+							item,
+						}));
 					}
 
-					const output: INodeExecutionData = { json: { [destinationFieldName]: newItems } };
-
-					return this.prepareOutputData([output]);
+					return [[{ json: { [destinationFieldName]: newItems }, pairedItem }]];
 				}
 			} else if (operation === 'removeDuplicates') {
 				const compare = this.getNodeParameter('compare', 0) as string;
@@ -1167,7 +1210,7 @@ return 0;`,
 						({
 							json: { ...item.json, __INDEX: index },
 							pairedItem: { item: index },
-						} as INodeExecutionData),
+						}) as INodeExecutionData,
 				);
 				//sort items using the compare keys
 				newItems.sort((a, b) => {
@@ -1247,7 +1290,7 @@ return 0;`,
 				}
 
 				// return the filtered items
-				return this.prepareOutputData(data);
+				return [data];
 			} else if (operation === 'sort') {
 				let newItems = [...items];
 				const type = this.getNodeParameter('type', 0) as string;
@@ -1259,7 +1302,7 @@ return 0;`,
 
 				if (type === 'random') {
 					shuffleArray(newItems);
-					return this.prepareOutputData(newItems);
+					return [newItems];
 				}
 
 				if (type === 'simple') {
@@ -1369,45 +1412,16 @@ return 0;`,
 						return result;
 					});
 				} else {
-					const code = this.getNodeParameter('code', 0) as string;
-					const regexCheck = /\breturn\b/g.exec(code);
-
-					if (regexCheck?.length) {
-						const sandbox = {
-							newItems,
-						};
-						const mode = this.getMode();
-						const options = {
-							console: mode === 'manual' ? 'redirect' : 'inherit',
-							sandbox,
-						};
-						const vm = new NodeVM(options as unknown as NodeVMOptions);
-
-						newItems = await vm.run(
-							`
-						module.exports = async function() {
-							newItems.sort( (a,b) => {
-								${code}
-							})
-							return newItems;
-						}()`,
-							__dirname,
-						);
-					} else {
-						throw new NodeOperationError(
-							this.getNode(),
-							"Sort code doesn't return. Please add a 'return' statement to your code",
-						);
-					}
+					newItems = sortByCode.call(this, newItems);
 				}
-				return this.prepareOutputData(newItems);
+				return [newItems];
 			} else if (operation === 'limit') {
 				let newItems = items;
 				const maxItems = this.getNodeParameter('maxItems', 0) as number;
 				const keep = this.getNodeParameter('keep', 0) as string;
 
 				if (maxItems > items.length) {
-					return this.prepareOutputData(newItems);
+					return [newItems];
 				}
 
 				if (keep === 'firstItems') {
@@ -1415,9 +1429,9 @@ return 0;`,
 				} else {
 					newItems = items.slice(items.length - maxItems, items.length);
 				}
-				return this.prepareOutputData(newItems);
+				return [newItems];
 			} else if (operation === 'summarize') {
-				return summarize.execute.call(this, items);
+				return await summarize.execute.call(this, items);
 			} else {
 				throw new NodeOperationError(this.getNode(), `Operation '${operation}' is not recognized`);
 			}
diff --git a/packages/nodes-base/nodes/ItemLists/V2/summarize.operation.ts b/packages/nodes-base/nodes/ItemLists/V2/summarize.operation.ts
index 72347b4cb44b6..f29df77035cfa 100644
--- a/packages/nodes-base/nodes/ItemLists/V2/summarize.operation.ts
+++ b/packages/nodes-base/nodes/ItemLists/V2/summarize.operation.ts
@@ -7,7 +7,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import get from 'lodash.get';
+import get from 'lodash/get';
 
 type AggregationType =
 	| 'append'
@@ -29,7 +29,6 @@ type Aggregation = {
 
 type Aggregations = Aggregation[];
 
-// eslint-disable-next-line no-restricted-syntax
 const AggregationDisplayNames = {
 	append: 'appended_',
 	average: 'average_',
@@ -571,7 +570,11 @@ export async function execute(
 
 	const getValue = fieldValueGetter(options.disableDotNotation);
 
-	checkIfFieldExists.call(this, newItems, fieldsToSummarize, getValue);
+	const nodeVersion = this.getNode().typeVersion;
+
+	if (nodeVersion < 2.1) {
+		checkIfFieldExists.call(this, newItems, fieldsToSummarize, getValue);
+	}
 
 	const aggregationResult = splitData(
 		fieldsToSplitBy,
@@ -588,7 +591,7 @@ export async function execute(
 				item: index,
 			})),
 		};
-		return this.prepareOutputData([executionData]);
+		return [[executionData]];
 	} else {
 		if (!fieldsToSplitBy.length) {
 			const { pairedItems, ...json } = aggregationResult;
@@ -598,7 +601,7 @@ export async function execute(
 					item: index,
 				})),
 			};
-			return this.prepareOutputData([executionData]);
+			return [[executionData]];
 		}
 		const returnData = aggregationToArray(aggregationResult, fieldsToSplitBy);
 		const executionData = returnData.map((item) => {
@@ -610,6 +613,6 @@ export async function execute(
 				})),
 			};
 		});
-		return this.prepareOutputData(executionData);
+		return [executionData];
 	}
 }
diff --git a/packages/nodes-base/nodes/ItemLists/V3/ItemListsV3.node.ts b/packages/nodes-base/nodes/ItemLists/V3/ItemListsV3.node.ts
new file mode 100644
index 0000000000000..d2408eb277d66
--- /dev/null
+++ b/packages/nodes-base/nodes/ItemLists/V3/ItemListsV3.node.ts
@@ -0,0 +1,24 @@
+import type {
+	IExecuteFunctions,
+	INodeType,
+	INodeTypeBaseDescription,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+
+import { versionDescription } from './actions/versionDescription';
+import { router } from './actions/router';
+
+export class ItemListsV3 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			...versionDescription,
+		};
+	}
+
+	async execute(this: IExecuteFunctions) {
+		return await router.call(this);
+	}
+}
diff --git a/packages/nodes-base/nodes/ItemLists/V3/actions/common.descriptions.ts b/packages/nodes-base/nodes/ItemLists/V3/actions/common.descriptions.ts
new file mode 100644
index 0000000000000..d25b10e68bfc7
--- /dev/null
+++ b/packages/nodes-base/nodes/ItemLists/V3/actions/common.descriptions.ts
@@ -0,0 +1,10 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+export const disableDotNotationBoolean: INodeProperties = {
+	displayName: 'Disable Dot Notation',
+	name: 'disableDotNotation',
+	type: 'boolean',
+	default: false,
+	description:
+		'Whether to disallow referencing child fields using `parent.child` in the field name',
+};
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
new file mode 100644
index 0000000000000..138fd2d2767b7
--- /dev/null
+++ b/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/concatenateItems.operation.ts
@@ -0,0 +1,406 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+	IPairedItemData,
+} from 'n8n-workflow';
+import { NodeOperationError } from 'n8n-workflow';
+
+import get from 'lodash/get';
+import isEmpty from 'lodash/isEmpty';
+import set from 'lodash/set';
+
+import { addBinariesToItem, prepareFieldsArray } from '../../helpers/utils';
+import { disableDotNotationBoolean } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	{
+		displayName: 'Aggregate',
+		name: 'aggregate',
+		type: 'options',
+		default: 'aggregateIndividualFields',
+		options: [
+			{
+				name: 'Individual Fields',
+				value: 'aggregateIndividualFields',
+			},
+			{
+				name: 'All Item Data (Into a Single List)',
+				value: 'aggregateAllItemData',
+			},
+		],
+	},
+	{
+		displayName: 'Fields To Aggregate',
+		name: 'fieldsToAggregate',
+		type: 'fixedCollection',
+		typeOptions: {
+			multipleValues: true,
+		},
+		placeholder: 'Add Field To Aggregate',
+		default: { fieldToAggregate: [{ fieldToAggregate: '', renameField: false }] },
+		displayOptions: {
+			show: {
+				aggregate: ['aggregateIndividualFields'],
+			},
+		},
+		options: [
+			{
+				displayName: '',
+				name: 'fieldToAggregate',
+				values: [
+					{
+						displayName: 'Input Field Name',
+						name: 'fieldToAggregate',
+						type: 'string',
+						default: '',
+						description: 'The name of a field in the input items to aggregate together',
+						// eslint-disable-next-line n8n-nodes-base/node-param-placeholder-miscased-id
+						placeholder: 'e.g. id',
+						hint: ' Enter the field name as text',
+						requiresDataPath: 'single',
+					},
+					{
+						displayName: 'Rename Field',
+						name: 'renameField',
+						type: 'boolean',
+						default: false,
+						description: 'Whether to give the field a different name in the output',
+					},
+					{
+						displayName: 'Output Field Name',
+						name: 'outputFieldName',
+						displayOptions: {
+							show: {
+								renameField: [true],
+							},
+						},
+						type: 'string',
+						default: '',
+						description:
+							'The name of the field to put the aggregated data in. Leave blank to use the input field name.',
+						requiresDataPath: 'single',
+					},
+				],
+			},
+		],
+	},
+	{
+		displayName: 'Put Output in Field',
+		name: 'destinationFieldName',
+		type: 'string',
+		displayOptions: {
+			show: {
+				aggregate: ['aggregateAllItemData'],
+			},
+		},
+		default: 'data',
+		description: 'The name of the output field to put the data in',
+	},
+	{
+		displayName: 'Include',
+		name: 'include',
+		type: 'options',
+		default: 'allFields',
+		options: [
+			{
+				name: 'All Fields',
+				value: 'allFields',
+			},
+			{
+				name: 'Specified Fields',
+				value: 'specifiedFields',
+			},
+			{
+				name: 'All Fields Except',
+				value: 'allFieldsExcept',
+			},
+		],
+		displayOptions: {
+			show: {
+				aggregate: ['aggregateAllItemData'],
+			},
+		},
+	},
+	{
+		displayName: 'Fields To Exclude',
+		name: 'fieldsToExclude',
+		type: 'string',
+		placeholder: 'e.g. email, name',
+		default: '',
+		requiresDataPath: 'multiple',
+		displayOptions: {
+			show: {
+				aggregate: ['aggregateAllItemData'],
+				include: ['allFieldsExcept'],
+			},
+		},
+	},
+	{
+		displayName: 'Fields To Include',
+		name: 'fieldsToInclude',
+		type: 'string',
+		placeholder: 'e.g. email, name',
+		default: '',
+		requiresDataPath: 'multiple',
+		displayOptions: {
+			show: {
+				aggregate: ['aggregateAllItemData'],
+				include: ['specifiedFields'],
+			},
+		},
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		options: [
+			{
+				...disableDotNotationBoolean,
+				displayOptions: {
+					hide: {
+						'/aggregate': ['aggregateAllItemData'],
+					},
+				},
+			},
+			{
+				displayName: 'Merge Lists',
+				name: 'mergeLists',
+				type: 'boolean',
+				default: false,
+				description:
+					'Whether to merge the output into a single flat list (rather than a list of lists), if the field to aggregate is a list',
+				displayOptions: {
+					hide: {
+						'/aggregate': ['aggregateAllItemData'],
+					},
+				},
+			},
+			{
+				displayName: 'Include Binaries',
+				name: 'includeBinaries',
+				type: 'boolean',
+				default: false,
+				description: 'Whether to include the binary data in the new item',
+			},
+			{
+				displayName: 'Keep Only Unique Binaries',
+				name: 'keepOnlyUnique',
+				type: 'boolean',
+				default: false,
+				description:
+					'Whether to keep only unique binaries by comparing mime types, file types, file sizes and file extensions',
+				displayOptions: {
+					show: {
+						includeBinaries: [true],
+					},
+				},
+			},
+			{
+				displayName: 'Keep Missing And Null Values',
+				name: 'keepMissing',
+				type: 'boolean',
+				default: false,
+				description:
+					'Whether to add a null entry to the aggregated list when there is a missing or null value',
+				displayOptions: {
+					hide: {
+						'/aggregate': ['aggregateAllItemData'],
+					},
+				},
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['itemList'],
+		operation: ['concatenateItems'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	items: INodeExecutionData[],
+): Promise<INodeExecutionData[]> {
+	let returnData: INodeExecutionData = { json: {}, pairedItem: [] };
+
+	const aggregate = this.getNodeParameter('aggregate', 0, '') as string;
+
+	if (aggregate === 'aggregateIndividualFields') {
+		const disableDotNotation = this.getNodeParameter(
+			'options.disableDotNotation',
+			0,
+			false,
+		) as boolean;
+		const mergeLists = this.getNodeParameter('options.mergeLists', 0, false) as boolean;
+		const fieldsToAggregate = this.getNodeParameter(
+			'fieldsToAggregate.fieldToAggregate',
+			0,
+			[],
+		) as [{ fieldToAggregate: string; renameField: boolean; outputFieldName: string }];
+		const keepMissing = this.getNodeParameter('options.keepMissing', 0, false) as boolean;
+
+		if (!fieldsToAggregate.length) {
+			throw new NodeOperationError(this.getNode(), 'No fields specified', {
+				description: 'Please add a field to aggregate',
+			});
+		}
+
+		const newItem: INodeExecutionData = {
+			json: {},
+			pairedItem: Array.from({ length: items.length }, (_, i) => i).map((index) => {
+				return {
+					item: index,
+				};
+			}),
+		};
+
+		const values: { [key: string]: any } = {};
+		const outputFields: string[] = [];
+
+		for (const { fieldToAggregate, outputFieldName, renameField } of fieldsToAggregate) {
+			const field = renameField ? outputFieldName : fieldToAggregate;
+
+			if (outputFields.includes(field)) {
+				throw new NodeOperationError(
+					this.getNode(),
+					`The '${field}' output field is used more than once`,
+					{ description: 'Please make sure each output field name is unique' },
+				);
+			} else {
+				outputFields.push(field);
+			}
+
+			const getFieldToAggregate = () =>
+				!disableDotNotation && fieldToAggregate.includes('.')
+					? fieldToAggregate.split('.').pop()
+					: fieldToAggregate;
+
+			const _outputFieldName = outputFieldName
+				? outputFieldName
+				: (getFieldToAggregate() as string);
+
+			if (fieldToAggregate !== '') {
+				values[_outputFieldName] = [];
+				for (let i = 0; i < items.length; i++) {
+					if (!disableDotNotation) {
+						let value = get(items[i].json, fieldToAggregate);
+
+						if (!keepMissing) {
+							if (Array.isArray(value)) {
+								value = value.filter((entry) => entry !== null);
+							} else if (value === null || value === undefined) {
+								continue;
+							}
+						}
+
+						if (Array.isArray(value) && mergeLists) {
+							values[_outputFieldName].push(...value);
+						} else {
+							values[_outputFieldName].push(value);
+						}
+					} else {
+						let value = items[i].json[fieldToAggregate];
+
+						if (!keepMissing) {
+							if (Array.isArray(value)) {
+								value = value.filter((entry) => entry !== null);
+							} else if (value === null || value === undefined) {
+								continue;
+							}
+						}
+
+						if (Array.isArray(value) && mergeLists) {
+							values[_outputFieldName].push(...value);
+						} else {
+							values[_outputFieldName].push(value);
+						}
+					}
+				}
+			}
+		}
+
+		for (const key of Object.keys(values)) {
+			if (!disableDotNotation) {
+				set(newItem.json, key, values[key]);
+			} else {
+				newItem.json[key] = values[key];
+			}
+		}
+
+		returnData = newItem;
+	} else {
+		let newItems: IDataObject[] = items.map((item) => item.json);
+		let pairedItem: IPairedItemData[] = [];
+		const destinationFieldName = this.getNodeParameter('destinationFieldName', 0) as string;
+
+		const fieldsToExclude = prepareFieldsArray(
+			this.getNodeParameter('fieldsToExclude', 0, '') as string,
+			'Fields To Exclude',
+		);
+
+		const fieldsToInclude = prepareFieldsArray(
+			this.getNodeParameter('fieldsToInclude', 0, '') as string,
+			'Fields To Include',
+		);
+
+		if (fieldsToExclude.length || fieldsToInclude.length) {
+			newItems = newItems.reduce((acc, item, index) => {
+				const newItem: IDataObject = {};
+				let outputFields = Object.keys(item);
+
+				if (fieldsToExclude.length) {
+					outputFields = outputFields.filter((key) => !fieldsToExclude.includes(key));
+				}
+				if (fieldsToInclude.length) {
+					outputFields = outputFields.filter((key) =>
+						fieldsToInclude.length ? fieldsToInclude.includes(key) : true,
+					);
+				}
+
+				outputFields.forEach((key) => {
+					newItem[key] = item[key];
+				});
+
+				if (isEmpty(newItem)) {
+					return acc;
+				}
+
+				pairedItem.push({ item: index });
+				return acc.concat([newItem]);
+			}, [] as IDataObject[]);
+		} else {
+			pairedItem = Array.from({ length: newItems.length }, (_, item) => ({
+				item,
+			}));
+		}
+
+		const output: INodeExecutionData = { json: { [destinationFieldName]: newItems }, pairedItem };
+
+		returnData = output;
+	}
+
+	const includeBinaries = this.getNodeParameter('options.includeBinaries', 0, false) as boolean;
+
+	if (includeBinaries) {
+		const pairedItems = (returnData.pairedItem || []) as IPairedItemData[];
+
+		const aggregatedItems = pairedItems.map((item) => {
+			return items[item.item];
+		});
+
+		const keepOnlyUnique = this.getNodeParameter('options.keepOnlyUnique', 0, false) as boolean;
+
+		addBinariesToItem(returnData, aggregatedItems, keepOnlyUnique);
+	}
+
+	return [returnData];
+}
diff --git a/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/index.ts b/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/index.ts
new file mode 100644
index 0000000000000..6cb20a66e307c
--- /dev/null
+++ b/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/index.ts
@@ -0,0 +1,70 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+import * as concatenateItems from './concatenateItems.operation';
+import * as limit from './limit.operation';
+import * as removeDuplicates from './removeDuplicates.operation';
+import * as sort from './sort.operation';
+import * as splitOutItems from './splitOutItems.operation';
+import * as summarize from './summarize.operation';
+
+export { concatenateItems, limit, removeDuplicates, sort, splitOutItems, summarize };
+
+export const description: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				resource: ['itemList'],
+			},
+		},
+		options: [
+			{
+				name: 'Concatenate Items',
+				value: 'concatenateItems',
+				description: 'Combine fields into a list in a single new item',
+				action: 'Concatenate Items',
+			},
+			{
+				name: 'Limit',
+				value: 'limit',
+				description: 'Remove items if there are too many',
+				action: 'Limit',
+			},
+			{
+				name: 'Remove Duplicates',
+				value: 'removeDuplicates',
+				description: 'Remove extra items that are similar',
+				action: 'Remove Duplicates',
+			},
+			{
+				name: 'Sort',
+				value: 'sort',
+				description: 'Change the item order',
+				action: 'Sort',
+			},
+			{
+				name: 'Split Out Items',
+				value: 'splitOutItems',
+				description:
+					"Turn a list or values of object's properties inside item(s) into separate items",
+				action: 'Split Out Items',
+			},
+			{
+				name: 'Summarize',
+				value: 'summarize',
+				description: 'Aggregate items together (pivot table)',
+				action: 'Summarize',
+			},
+		],
+		default: 'splitOutItems',
+	},
+	...concatenateItems.description,
+	...limit.description,
+	...removeDuplicates.description,
+	...sort.description,
+	...splitOutItems.description,
+	...summarize.description,
+];
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
new file mode 100644
index 0000000000000..5671cf246fa03
--- /dev/null
+++ b/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/limit.operation.ts
@@ -0,0 +1,61 @@
+import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
+import { updateDisplayOptions } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	{
+		displayName: 'Max Items',
+		name: 'maxItems',
+		type: 'number',
+		typeOptions: {
+			minValue: 1,
+		},
+		default: 1,
+		description: 'If there are more items than this number, some are removed',
+	},
+	{
+		displayName: 'Keep',
+		name: 'keep',
+		type: 'options',
+		options: [
+			{
+				name: 'First Items',
+				value: 'firstItems',
+			},
+			{
+				name: 'Last Items',
+				value: 'lastItems',
+			},
+		],
+		default: 'firstItems',
+		description: 'When removing items, whether to keep the ones at the start or the ending',
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['itemList'],
+		operation: ['limit'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	items: INodeExecutionData[],
+): Promise<INodeExecutionData[]> {
+	let returnData = items;
+	const maxItems = this.getNodeParameter('maxItems', 0) as number;
+	const keep = this.getNodeParameter('keep', 0) as string;
+
+	if (maxItems > items.length) {
+		return returnData;
+	}
+
+	if (keep === 'firstItems') {
+		returnData = items.slice(0, maxItems);
+	} else {
+		returnData = items.slice(items.length - maxItems, items.length);
+	}
+	return returnData;
+}
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
new file mode 100644
index 0000000000000..8b8c7e6948a2f
--- /dev/null
+++ b/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/removeDuplicates.operation.ts
@@ -0,0 +1,249 @@
+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 { compareItems, flattenKeys, prepareFieldsArray, typeToNumber } from '../../helpers/utils';
+import { disableDotNotationBoolean } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	{
+		displayName: 'Compare',
+		name: 'compare',
+		type: 'options',
+		options: [
+			{
+				name: 'All Fields',
+				value: 'allFields',
+			},
+			{
+				name: 'All Fields Except',
+				value: 'allFieldsExcept',
+			},
+			{
+				name: 'Selected Fields',
+				value: 'selectedFields',
+			},
+		],
+		default: 'allFields',
+		description: 'The fields of the input items to compare to see if they are the same',
+	},
+	{
+		displayName: 'Fields To Exclude',
+		name: 'fieldsToExclude',
+		type: 'string',
+		placeholder: 'e.g. email, name',
+		requiresDataPath: 'multiple',
+		description: 'Fields in the input to exclude from the comparison',
+		default: '',
+		displayOptions: {
+			show: {
+				compare: ['allFieldsExcept'],
+			},
+		},
+	},
+	{
+		displayName: 'Fields To Compare',
+		name: 'fieldsToCompare',
+		type: 'string',
+		placeholder: 'e.g. email, name',
+		requiresDataPath: 'multiple',
+		description: 'Fields in the input to add to the comparison',
+		default: '',
+		displayOptions: {
+			show: {
+				compare: ['selectedFields'],
+			},
+		},
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				compare: ['allFieldsExcept', 'selectedFields'],
+			},
+		},
+		options: [
+			disableDotNotationBoolean,
+			{
+				displayName: 'Remove Other Fields',
+				name: 'removeOtherFields',
+				type: 'boolean',
+				default: false,
+				description:
+					'Whether to remove any fields that are not being compared. If disabled, will keep the values from the first of the duplicates.',
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['itemList'],
+		operation: ['removeDuplicates'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	items: INodeExecutionData[],
+): Promise<INodeExecutionData[]> {
+	const compare = this.getNodeParameter('compare', 0) as string;
+	const disableDotNotation = this.getNodeParameter(
+		'options.disableDotNotation',
+		0,
+		false,
+	) as boolean;
+	const removeOtherFields = this.getNodeParameter('options.removeOtherFields', 0, false) as boolean;
+	const nodeVersion = this.getNode().typeVersion;
+
+	let keys = disableDotNotation
+		? Object.keys(items[0].json)
+		: Object.keys(flattenKeys(items[0].json));
+
+	for (const item of items) {
+		for (const key of disableDotNotation
+			? Object.keys(item.json)
+			: Object.keys(flattenKeys(item.json))) {
+			if (!keys.includes(key)) {
+				keys.push(key);
+			}
+		}
+	}
+
+	if (compare === 'allFieldsExcept') {
+		const fieldsToExclude = prepareFieldsArray(
+			this.getNodeParameter('fieldsToExclude', 0, '') as string,
+			'Fields To Exclude',
+		);
+
+		if (!fieldsToExclude.length) {
+			throw new NodeOperationError(
+				this.getNode(),
+				'No fields specified. Please add a field to exclude from comparison',
+			);
+		}
+		if (!disableDotNotation) {
+			keys = Object.keys(flattenKeys(items[0].json));
+		}
+		keys = keys.filter((key) => !fieldsToExclude.includes(key));
+	}
+	if (compare === 'selectedFields') {
+		const fieldsToCompare = prepareFieldsArray(
+			this.getNodeParameter('fieldsToCompare', 0, '') as string,
+			'Fields To Compare',
+		);
+		if (!fieldsToCompare.length) {
+			throw new NodeOperationError(
+				this.getNode(),
+				'No fields specified. Please add a field to compare on',
+			);
+		}
+		if (!disableDotNotation) {
+			keys = Object.keys(flattenKeys(items[0].json));
+		}
+		keys = fieldsToCompare.map((key) => key.trim());
+	}
+
+	// This solution is O(nlogn)
+	// add original index to the items
+	const newItems = items.map(
+		(item, index) =>
+			({
+				json: { ...item.json, __INDEX: index },
+				pairedItem: { item: index },
+			}) as INodeExecutionData,
+	);
+
+	//sort items using the compare keys
+	newItems.sort((a, b) => {
+		let result = 0;
+
+		for (const key of keys) {
+			const a_value = disableDotNotation ? a.json[key] : get(a.json, key);
+			const b_value = disableDotNotation ? b.json[key] : get(b.json, key);
+
+			if (nodeVersion >= 3.1) {
+				const a_value_tnum = typeToNumber(a_value);
+				const b_value_tnum = typeToNumber(b_value);
+				if (a_value_tnum !== b_value_tnum) {
+					result = a_value_tnum - b_value_tnum;
+					break;
+				}
+			}
+
+			const equal = isEqual(a_value, b_value);
+
+			if (!equal) {
+				const lessThan = lt(a_value, b_value);
+				result = lessThan ? -1 : 1;
+				break;
+			}
+		}
+		return result;
+	});
+
+	for (const key of keys) {
+		let type: any = undefined;
+		for (const item of newItems) {
+			if (key === '') {
+				throw new NodeOperationError(this.getNode(), 'Name of field to compare is blank');
+			}
+			const value = !disableDotNotation ? get(item.json, key) : item.json[key];
+			if (value === undefined && disableDotNotation && key.includes('.')) {
+				throw new NodeOperationError(
+					this.getNode(),
+					`'${key}' field is missing from some input items`,
+					{
+						description:
+							"If you're trying to use a nested field, make sure you turn off 'disable dot notation' in the node options",
+					},
+				);
+			} else if (value === undefined) {
+				throw new NodeOperationError(
+					this.getNode(),
+					`'${key}' field is missing from some input items`,
+				);
+			}
+			if (nodeVersion < 3.1 && type !== undefined && value !== undefined && type !== typeof value) {
+				throw new NodeOperationError(this.getNode(), `'${key}' isn't always the same type`, {
+					description: 'The type of this field varies between items',
+				});
+			} else {
+				type = typeof value;
+			}
+		}
+	}
+
+	// collect the original indexes of items to be removed
+	const removedIndexes: number[] = [];
+	let temp = newItems[0];
+	for (let index = 1; index < newItems.length; index++) {
+		if (compareItems(newItems[index], temp, keys, disableDotNotation, this.getNode())) {
+			removedIndexes.push(newItems[index].json.__INDEX as unknown as number);
+		} else {
+			temp = newItems[index];
+		}
+	}
+
+	let returnData = items.filter((_, index) => !removedIndexes.includes(index));
+
+	if (removeOtherFields) {
+		returnData = returnData.map((item, index) => ({
+			json: pick(item.json, ...keys),
+			pairedItem: { item: index },
+		}));
+	}
+
+	return returnData;
+}
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
new file mode 100644
index 0000000000000..efc979917d832
--- /dev/null
+++ b/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/sort.operation.ts
@@ -0,0 +1,275 @@
+import type {
+	IExecuteFunctions,
+	IDataObject,
+	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 { shuffleArray, sortByCode } from '../../helpers/utils';
+import { disableDotNotationBoolean } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	{
+		displayName: 'Type',
+		name: 'type',
+		type: 'options',
+		options: [
+			{
+				name: 'Simple',
+				value: 'simple',
+			},
+			{
+				name: 'Random',
+				value: 'random',
+			},
+			{
+				name: 'Code',
+				value: 'code',
+			},
+		],
+		default: 'simple',
+		description: 'The fields of the input items to compare to see if they are the same',
+	},
+	{
+		displayName: 'Fields To Sort By',
+		name: 'sortFieldsUi',
+		type: 'fixedCollection',
+		typeOptions: {
+			multipleValues: true,
+		},
+		placeholder: 'Add Field To Sort By',
+		options: [
+			{
+				displayName: '',
+				name: 'sortField',
+				values: [
+					{
+						displayName: 'Field Name',
+						name: 'fieldName',
+						type: 'string',
+						required: true,
+						default: '',
+						description: 'The field to sort by',
+						// eslint-disable-next-line n8n-nodes-base/node-param-placeholder-miscased-id
+						placeholder: 'e.g. id',
+						hint: ' Enter the field name as text',
+						requiresDataPath: 'single',
+					},
+					{
+						displayName: 'Order',
+						name: 'order',
+						type: 'options',
+						options: [
+							{
+								name: 'Ascending',
+								value: 'ascending',
+							},
+							{
+								name: 'Descending',
+								value: 'descending',
+							},
+						],
+						default: 'ascending',
+						description: 'The order to sort by',
+					},
+				],
+			},
+		],
+		default: {},
+		description: 'The fields of the input items to compare to see if they are the same',
+		displayOptions: {
+			show: {
+				type: ['simple'],
+			},
+		},
+	},
+	{
+		displayName: 'Code',
+		name: 'code',
+		type: 'string',
+		typeOptions: {
+			alwaysOpenEditWindow: true,
+			editor: 'jsEditor',
+			rows: 10,
+		},
+		default: `// The two items to compare are in the variables a and b
+// Access the fields in a.json and b.json
+// Return -1 if a should go before b
+// Return 1 if b should go before a
+// Return 0 if there's no difference
+
+fieldName = 'myField';
+
+if (a.json[fieldName] < b.json[fieldName]) {
+return -1;
+}
+if (a.json[fieldName] > b.json[fieldName]) {
+return 1;
+}
+return 0;`,
+		description: 'Javascript code to determine the order of any two items',
+		displayOptions: {
+			show: {
+				type: ['code'],
+			},
+		},
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				type: ['simple'],
+			},
+		},
+		options: [disableDotNotationBoolean],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['itemList'],
+		operation: ['sort'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	items: INodeExecutionData[],
+): Promise<INodeExecutionData[]> {
+	let returnData = [...items];
+	const type = this.getNodeParameter('type', 0) as string;
+	const disableDotNotation = this.getNodeParameter(
+		'options.disableDotNotation',
+		0,
+		false,
+	) as boolean;
+
+	if (type === 'random') {
+		shuffleArray(returnData);
+		return returnData;
+	}
+
+	if (type === 'simple') {
+		const sortFieldsUi = this.getNodeParameter('sortFieldsUi', 0) as IDataObject;
+		const sortFields = sortFieldsUi.sortField as Array<{
+			fieldName: string;
+			order: 'ascending' | 'descending';
+		}>;
+
+		if (!sortFields?.length) {
+			throw new NodeOperationError(
+				this.getNode(),
+				'No sorting specified. Please add a field to sort by',
+			);
+		}
+
+		for (const { fieldName } of sortFields) {
+			let found = false;
+			for (const item of items) {
+				if (!disableDotNotation) {
+					if (get(item.json, fieldName) !== undefined) {
+						found = true;
+					}
+				} else if (item.json.hasOwnProperty(fieldName)) {
+					found = true;
+				}
+			}
+			if (!found && disableDotNotation && fieldName.includes('.')) {
+				throw new NodeOperationError(
+					this.getNode(),
+					`Couldn't find the field '${fieldName}' in the input data`,
+					{
+						description:
+							"If you're trying to use a nested field, make sure you turn off 'disable dot notation' in the node options",
+					},
+				);
+			} else if (!found) {
+				throw new NodeOperationError(
+					this.getNode(),
+					`Couldn't find the field '${fieldName}' in the input data`,
+				);
+			}
+		}
+
+		const sortFieldsWithDirection = sortFields.map((field) => ({
+			name: field.fieldName,
+			dir: field.order === 'ascending' ? 1 : -1,
+		}));
+
+		returnData.sort((a, b) => {
+			let result = 0;
+			for (const field of sortFieldsWithDirection) {
+				let equal;
+				if (!disableDotNotation) {
+					const _a =
+						typeof get(a.json, field.name) === 'string'
+							? (get(a.json, field.name) as string).toLowerCase()
+							: get(a.json, field.name);
+					const _b =
+						typeof get(b.json, field.name) === 'string'
+							? (get(b.json, field.name) as string).toLowerCase()
+							: get(b.json, field.name);
+					equal = isEqual(_a, _b);
+				} else {
+					const _a =
+						typeof a.json[field.name] === 'string'
+							? (a.json[field.name] as string).toLowerCase()
+							: a.json[field.name];
+					const _b =
+						typeof b.json[field.name] === 'string'
+							? (b.json[field.name] as string).toLowerCase()
+							: b.json[field.name];
+					equal = isEqual(_a, _b);
+				}
+
+				if (!equal) {
+					let lessThan;
+					if (!disableDotNotation) {
+						const _a =
+							typeof get(a.json, field.name) === 'string'
+								? (get(a.json, field.name) as string).toLowerCase()
+								: get(a.json, field.name);
+						const _b =
+							typeof get(b.json, field.name) === 'string'
+								? (get(b.json, field.name) as string).toLowerCase()
+								: get(b.json, field.name);
+						lessThan = lt(_a, _b);
+					} else {
+						const _a =
+							typeof a.json[field.name] === 'string'
+								? (a.json[field.name] as string).toLowerCase()
+								: a.json[field.name];
+						const _b =
+							typeof b.json[field.name] === 'string'
+								? (b.json[field.name] as string).toLowerCase()
+								: b.json[field.name];
+						lessThan = lt(_a, _b);
+					}
+					if (lessThan) {
+						result = -1 * field.dir;
+					} else {
+						result = 1 * field.dir;
+					}
+					break;
+				}
+			}
+			return result;
+		});
+	} else {
+		returnData = sortByCode.call(this, returnData);
+	}
+	return returnData;
+}
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
new file mode 100644
index 0000000000000..13d5bd89189b2
--- /dev/null
+++ b/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/splitOutItems.operation.ts
@@ -0,0 +1,248 @@
+import type {
+	IBinaryData,
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} 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';
+
+const properties: INodeProperties[] = [
+	{
+		displayName: 'Fields To Split Out',
+		name: 'fieldToSplitOut',
+		type: 'string',
+		default: '',
+		required: true,
+		placeholder: 'Drag fields from the left or type their names',
+		description:
+			'The name of the input fields to break out into separate items. Separate multiple field names by commas. For binary data, use $binary.',
+		requiresDataPath: 'multiple',
+	},
+	{
+		displayName: 'Include',
+		name: 'include',
+		type: 'options',
+		options: [
+			{
+				name: 'No Other Fields',
+				value: 'noOtherFields',
+			},
+			{
+				name: 'All Other Fields',
+				value: 'allOtherFields',
+			},
+			{
+				name: 'Selected Other Fields',
+				value: 'selectedOtherFields',
+			},
+		],
+		default: 'noOtherFields',
+		description: 'Whether to copy any other fields into the new items',
+	},
+	{
+		displayName: 'Fields To Include',
+		name: 'fieldsToInclude',
+		type: 'string',
+		placeholder: 'e.g. email, name',
+		requiresDataPath: 'multiple',
+		description: 'Fields in the input items to aggregate together',
+		default: '',
+		displayOptions: {
+			show: {
+				include: ['selectedOtherFields'],
+			},
+		},
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		options: [
+			disableDotNotationBoolean,
+			{
+				displayName: 'Destination Field Name',
+				name: 'destinationFieldName',
+				type: 'string',
+				requiresDataPath: 'multiple',
+				default: '',
+				description: 'The field in the output under which to put the split field contents',
+			},
+			{
+				displayName: 'Include Binary',
+				name: 'includeBinary',
+				type: 'boolean',
+				default: false,
+				description: 'Whether to include the binary data in the new items',
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['itemList'],
+		operation: ['splitOutItems'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	items: INodeExecutionData[],
+): Promise<INodeExecutionData[]> {
+	const returnData: INodeExecutionData[] = [];
+
+	for (let i = 0; i < items.length; i++) {
+		const fieldsToSplitOut = (this.getNodeParameter('fieldToSplitOut', i) as string)
+			.split(',')
+			.map((field) => field.trim().replace(/^\$json\./, ''));
+
+		const options = this.getNodeParameter('options', i, {});
+
+		const disableDotNotation = options.disableDotNotation as boolean;
+
+		const destinationFields = ((options.destinationFieldName as string) || '')
+			.split(',')
+			.filter((field) => field.trim() !== '')
+			.map((field) => field.trim());
+
+		if (destinationFields.length && destinationFields.length !== fieldsToSplitOut.length) {
+			throw new NodeOperationError(
+				this.getNode(),
+				'If multiple fields to split out are given, the same number of destination fields must be given',
+			);
+		}
+
+		const include = this.getNodeParameter('include', i) as
+			| 'selectedOtherFields'
+			| 'allOtherFields'
+			| 'noOtherFields';
+
+		const multiSplit = fieldsToSplitOut.length > 1;
+
+		const item = { ...items[i].json };
+		const splited: INodeExecutionData[] = [];
+		for (const [entryIndex, fieldToSplitOut] of fieldsToSplitOut.entries()) {
+			const destinationFieldName = destinationFields[entryIndex] || '';
+
+			let entityToSplit: IDataObject[] = [];
+
+			if (fieldToSplitOut === '$binary') {
+				entityToSplit = Object.entries(items[i].binary || {}).map(([key, value]) => ({
+					[key]: value,
+				}));
+			} else {
+				if (!disableDotNotation) {
+					entityToSplit = get(item, fieldToSplitOut) as IDataObject[];
+				} else {
+					entityToSplit = item[fieldToSplitOut] as IDataObject[];
+				}
+
+				if (entityToSplit === undefined) {
+					entityToSplit = [];
+				}
+
+				if (typeof entityToSplit !== 'object' || entityToSplit === null) {
+					entityToSplit = [entityToSplit];
+				}
+
+				if (!Array.isArray(entityToSplit)) {
+					entityToSplit = Object.values(entityToSplit);
+				}
+			}
+
+			for (const [elementIndex, element] of entityToSplit.entries()) {
+				if (splited[elementIndex] === undefined) {
+					splited[elementIndex] = { json: {}, pairedItem: { item: i } };
+				}
+
+				const fieldName = destinationFieldName || fieldToSplitOut;
+
+				if (fieldToSplitOut === '$binary') {
+					if (splited[elementIndex].binary === undefined) {
+						splited[elementIndex].binary = {};
+					}
+					splited[elementIndex].binary![Object.keys(element)[0]] = Object.values(
+						element,
+					)[0] as IBinaryData;
+
+					continue;
+				}
+
+				if (typeof element === 'object' && element !== null && include === 'noOtherFields') {
+					if (destinationFieldName === '' && !multiSplit) {
+						splited[elementIndex] = {
+							json: { ...splited[elementIndex].json, ...element },
+							pairedItem: { item: i },
+						};
+					} else {
+						splited[elementIndex].json[fieldName] = element;
+					}
+				} else {
+					splited[elementIndex].json[fieldName] = element;
+				}
+			}
+		}
+
+		for (const splitEntry of splited) {
+			let newItem: INodeExecutionData = splitEntry;
+
+			if (include === 'allOtherFields') {
+				const itemCopy = deepCopy(item);
+				for (const fieldToSplitOut of fieldsToSplitOut) {
+					if (!disableDotNotation) {
+						unset(itemCopy, fieldToSplitOut);
+					} else {
+						delete itemCopy[fieldToSplitOut];
+					}
+				}
+				newItem.json = { ...itemCopy, ...splitEntry.json };
+			}
+
+			if (include === 'selectedOtherFields') {
+				const fieldsToInclude = prepareFieldsArray(
+					this.getNodeParameter('fieldsToInclude', i, '') as string,
+					'Fields To Include',
+				);
+
+				if (!fieldsToInclude.length) {
+					throw new NodeOperationError(this.getNode(), 'No fields specified', {
+						description: 'Please add a field to include',
+					});
+				}
+
+				for (const field of fieldsToInclude) {
+					if (!disableDotNotation) {
+						splitEntry.json[field] = get(item, field);
+					} else {
+						splitEntry.json[field] = item[field];
+					}
+				}
+
+				newItem = splitEntry;
+			}
+
+			const includeBinary = options.includeBinary as boolean;
+
+			if (includeBinary) {
+				if (items[i].binary && !newItem.binary) {
+					newItem.binary = items[i].binary;
+				}
+			}
+
+			returnData.push(newItem);
+		}
+	}
+
+	return returnData;
+}
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
new file mode 100644
index 0000000000000..059446ac0f19a
--- /dev/null
+++ b/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/summarize.operation.ts
@@ -0,0 +1,615 @@
+import type {
+	GenericValue,
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+import { NodeOperationError } from 'n8n-workflow';
+
+import get from 'lodash/get';
+import { disableDotNotationBoolean } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+type AggregationType =
+	| 'append'
+	| 'average'
+	| 'concatenate'
+	| 'count'
+	| 'countUnique'
+	| 'max'
+	| 'min'
+	| 'sum';
+
+type Aggregation = {
+	aggregation: AggregationType;
+	field: string;
+	includeEmpty?: boolean;
+	separateBy?: string;
+	customSeparator?: string;
+};
+
+type Aggregations = Aggregation[];
+
+const AggregationDisplayNames = {
+	append: 'appended_',
+	average: 'average_',
+	concatenate: 'concatenated_',
+	count: 'count_',
+	countUnique: 'unique_count_',
+	max: 'max_',
+	min: 'min_',
+	sum: 'sum_',
+};
+
+const NUMERICAL_AGGREGATIONS = ['average', 'sum'];
+
+type SummarizeOptions = {
+	disableDotNotation?: boolean;
+	outputFormat?: 'separateItems' | 'singleItem';
+	skipEmptySplitFields?: boolean;
+};
+
+type ValueGetterFn = (
+	item: IDataObject,
+	field: string,
+) => IDataObject | IDataObject[] | GenericValue | GenericValue[];
+
+export const properties: INodeProperties[] = [
+	{
+		displayName: 'Fields to Summarize',
+		name: 'fieldsToSummarize',
+		type: 'fixedCollection',
+		placeholder: 'Add Field',
+		default: { values: [{ aggregation: 'count', field: '' }] },
+		typeOptions: {
+			multipleValues: true,
+		},
+		options: [
+			{
+				displayName: '',
+				name: 'values',
+				values: [
+					{
+						displayName: 'Aggregation',
+						name: 'aggregation',
+						type: 'options',
+						options: [
+							{
+								name: 'Append',
+								value: 'append',
+							},
+							{
+								name: 'Average',
+								value: 'average',
+							},
+							{
+								name: 'Concatenate',
+								value: 'concatenate',
+							},
+							{
+								name: 'Count',
+								value: 'count',
+							},
+							{
+								name: 'Count Unique',
+								value: 'countUnique',
+							},
+							{
+								name: 'Max',
+								value: 'max',
+							},
+							{
+								name: 'Min',
+								value: 'min',
+							},
+							{
+								name: 'Sum',
+								value: 'sum',
+							},
+						],
+						default: 'count',
+						description: 'How to combine the values of the field you want to summarize',
+					},
+					//field repeated to have different descriptions for different aggregations --------------------------------
+					{
+						displayName: 'Field',
+						name: 'field',
+						type: 'string',
+						default: '',
+						description: 'The name of an input field that you want to summarize',
+						placeholder: 'e.g. cost',
+						hint: ' Enter the field name as text',
+						displayOptions: {
+							hide: {
+								aggregation: [...NUMERICAL_AGGREGATIONS, 'countUnique', 'count', 'max', 'min'],
+							},
+						},
+						requiresDataPath: 'single',
+					},
+					{
+						displayName: 'Field',
+						name: 'field',
+						type: 'string',
+						default: '',
+						description:
+							'The name of an input field that you want to summarize. The field should contain numerical values; null, undefined, empty strings would be ignored.',
+						placeholder: 'e.g. cost',
+						hint: ' Enter the field name as text',
+						displayOptions: {
+							show: {
+								aggregation: NUMERICAL_AGGREGATIONS,
+							},
+						},
+						requiresDataPath: 'single',
+					},
+					{
+						displayName: 'Field',
+						name: 'field',
+						type: 'string',
+						default: '',
+						description:
+							'The name of an input field that you want to summarize; null, undefined, empty strings would be ignored',
+						placeholder: 'e.g. cost',
+						hint: ' Enter the field name as text',
+						displayOptions: {
+							show: {
+								aggregation: ['countUnique', 'count', 'max', 'min'],
+							},
+						},
+						requiresDataPath: 'single',
+					},
+					// ----------------------------------------------------------------------------------------------------------
+					{
+						displayName: 'Include Empty Values',
+						name: 'includeEmpty',
+						type: 'boolean',
+						default: false,
+						displayOptions: {
+							show: {
+								aggregation: ['append', 'concatenate'],
+							},
+						},
+					},
+					{
+						displayName: 'Separator',
+						name: 'separateBy',
+						type: 'options',
+						default: ',',
+						// eslint-disable-next-line n8n-nodes-base/node-param-options-type-unsorted-items
+						options: [
+							{
+								name: 'Comma',
+								value: ',',
+							},
+							{
+								name: 'Comma and Space',
+								value: ', ',
+							},
+							{
+								name: 'New Line',
+								value: '\n',
+							},
+							{
+								name: 'None',
+								value: '',
+							},
+							{
+								name: 'Space',
+								value: ' ',
+							},
+							{
+								name: 'Other',
+								value: 'other',
+							},
+						],
+						hint: 'What to insert between values',
+						displayOptions: {
+							show: {
+								aggregation: ['concatenate'],
+							},
+						},
+					},
+					{
+						displayName: 'Custom Separator',
+						name: 'customSeparator',
+						type: 'string',
+						default: '',
+						displayOptions: {
+							show: {
+								aggregation: ['concatenate'],
+								separateBy: ['other'],
+							},
+						},
+					},
+				],
+			},
+		],
+	},
+	// fieldsToSplitBy repeated to have different displayName for singleItem and separateItems -----------------------------
+	{
+		displayName: 'Fields to Split By',
+		name: 'fieldsToSplitBy',
+		type: 'string',
+		placeholder: 'e.g. country, city',
+		default: '',
+		description: 'The name of the input fields that you want to split the summary by',
+		hint: 'Enter the name of the fields as text (separated by commas)',
+		displayOptions: {
+			hide: {
+				'/options.outputFormat': ['singleItem'],
+			},
+		},
+		requiresDataPath: 'multiple',
+	},
+	{
+		displayName: 'Fields to Group By',
+		name: 'fieldsToSplitBy',
+		type: 'string',
+		placeholder: 'e.g. country, city',
+		default: '',
+		description: 'The name of the input fields that you want to split the summary by',
+		hint: 'Enter the name of the fields as text (separated by commas)',
+		displayOptions: {
+			show: {
+				'/options.outputFormat': ['singleItem'],
+			},
+		},
+		requiresDataPath: 'multiple',
+	},
+	// ----------------------------------------------------------------------------------------------------------
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			disableDotNotationBoolean,
+			{
+				displayName: 'Output Format',
+				name: 'outputFormat',
+				type: 'options',
+				default: 'separateItems',
+				options: [
+					{
+						name: 'Each Split in a Separate Item',
+						value: 'separateItems',
+					},
+					{
+						name: 'All Splits in a Single Item',
+						value: 'singleItem',
+					},
+				],
+			},
+			{
+				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+				displayName: 'Ignore items without valid fields to group by',
+				name: 'skipEmptySplitFields',
+				type: 'boolean',
+				default: false,
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['itemList'],
+		operation: ['summarize'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+function isEmpty<T>(value: T) {
+	return value === undefined || value === null || value === '';
+}
+
+function parseReturnData(returnData: IDataObject) {
+	const regexBrackets = /[\]\["]/g;
+	const regexSpaces = /[ .]/g;
+	for (const key of Object.keys(returnData)) {
+		if (key.match(regexBrackets)) {
+			const newKey = key.replace(regexBrackets, '');
+			returnData[newKey] = returnData[key];
+			delete returnData[key];
+		}
+	}
+	for (const key of Object.keys(returnData)) {
+		if (key.match(regexSpaces)) {
+			const newKey = key.replace(regexSpaces, '_');
+			returnData[newKey] = returnData[key];
+			delete returnData[key];
+		}
+	}
+}
+
+function parseFieldName(fieldName: string[]) {
+	const regexBrackets = /[\]\["]/g;
+	const regexSpaces = /[ .]/g;
+	fieldName = fieldName.map((field) => {
+		field = field.replace(regexBrackets, '');
+		field = field.replace(regexSpaces, '_');
+		return field;
+	});
+	return fieldName;
+}
+
+const fieldValueGetter = (disableDotNotation?: boolean) => {
+	if (disableDotNotation) {
+		return (item: IDataObject, field: string) => item[field];
+	} else {
+		return (item: IDataObject, field: string) => get(item, field);
+	}
+};
+
+function checkIfFieldExists(
+	this: IExecuteFunctions,
+	items: IDataObject[],
+	aggregations: Aggregations,
+	getValue: ValueGetterFn,
+) {
+	for (const aggregation of aggregations) {
+		if (aggregation.field === '') {
+			continue;
+		}
+		const exist = items.some((item) => getValue(item, aggregation.field) !== undefined);
+		if (!exist) {
+			throw new NodeOperationError(
+				this.getNode(),
+				`The field '${aggregation.field}' does not exist in any items`,
+			);
+		}
+	}
+}
+
+function aggregate(items: IDataObject[], entry: Aggregation, getValue: ValueGetterFn) {
+	const { aggregation, field } = entry;
+	let data = [...items];
+
+	if (NUMERICAL_AGGREGATIONS.includes(aggregation)) {
+		data = data.filter(
+			(item) => typeof getValue(item, field) === 'number' && !isEmpty(getValue(item, field)),
+		);
+	}
+
+	switch (aggregation) {
+		//combine operations
+		case 'append':
+			if (!entry.includeEmpty) {
+				data = data.filter((item) => !isEmpty(getValue(item, field)));
+			}
+			return data.map((item) => getValue(item, field));
+		case 'concatenate':
+			const separateBy = entry.separateBy === 'other' ? entry.customSeparator : entry.separateBy;
+			if (!entry.includeEmpty) {
+				data = data.filter((item) => !isEmpty(getValue(item, field)));
+			}
+			return data
+				.map((item) => {
+					let value = getValue(item, field);
+					if (typeof value === 'object') {
+						value = JSON.stringify(value);
+					}
+					if (typeof value === 'undefined') {
+						value = 'undefined';
+					}
+
+					return value;
+				})
+				.join(separateBy);
+
+		//numerical operations
+		case 'average':
+			return (
+				data.reduce((acc, item) => {
+					return acc + (getValue(item, field) as number);
+				}, 0) / data.length
+			);
+		case 'sum':
+			return data.reduce((acc, item) => {
+				return acc + (getValue(item, field) as number);
+			}, 0);
+		//comparison operations
+		case 'min':
+			let min;
+			for (const item of data) {
+				const value = getValue(item, field);
+				if (value !== undefined && value !== null && value !== '') {
+					if (min === undefined || value < min) {
+						min = value;
+					}
+				}
+			}
+			return min !== undefined ? min : null;
+		case 'max':
+			let max;
+			for (const item of data) {
+				const value = getValue(item, field);
+				if (value !== undefined && value !== null && value !== '') {
+					if (max === undefined || value > max) {
+						max = value;
+					}
+				}
+			}
+			return max !== undefined ? max : null;
+
+		//count operations
+		case 'countUnique':
+			return new Set(data.map((item) => getValue(item, field)).filter((item) => !isEmpty(item)))
+				.size;
+		default:
+			//count by default
+			return data.filter((item) => !isEmpty(getValue(item, field))).length;
+	}
+}
+
+function aggregateData(
+	data: IDataObject[],
+	fieldsToSummarize: Aggregations,
+	options: SummarizeOptions,
+	getValue: ValueGetterFn,
+) {
+	const returnData = fieldsToSummarize.reduce((acc, aggregation) => {
+		acc[`${AggregationDisplayNames[aggregation.aggregation]}${aggregation.field}`] = aggregate(
+			data,
+			aggregation,
+			getValue,
+		);
+		return acc;
+	}, {} as IDataObject);
+	parseReturnData(returnData);
+	if (options.outputFormat === 'singleItem') {
+		parseReturnData(returnData);
+		return returnData;
+	} else {
+		return { ...returnData, pairedItems: data.map((item) => item._itemIndex as number) };
+	}
+}
+
+function splitData(
+	splitKeys: string[],
+	data: IDataObject[],
+	fieldsToSummarize: Aggregations,
+	options: SummarizeOptions,
+	getValue: ValueGetterFn,
+) {
+	if (!splitKeys || splitKeys.length === 0) {
+		return aggregateData(data, fieldsToSummarize, options, getValue);
+	}
+
+	const [firstSplitKey, ...restSplitKeys] = splitKeys;
+
+	const groupedData = data.reduce((acc, item) => {
+		let keyValuee = getValue(item, firstSplitKey) as string;
+
+		if (typeof keyValuee === 'object') {
+			keyValuee = JSON.stringify(keyValuee);
+		}
+
+		if (options.skipEmptySplitFields && typeof keyValuee !== 'number' && !keyValuee) {
+			return acc;
+		}
+
+		if (acc[keyValuee] === undefined) {
+			acc[keyValuee] = [item];
+		} else {
+			(acc[keyValuee] as IDataObject[]).push(item);
+		}
+		return acc;
+	}, {} as IDataObject);
+
+	return Object.keys(groupedData).reduce((acc, key) => {
+		const value = groupedData[key] as IDataObject[];
+		acc[key] = splitData(restSplitKeys, value, fieldsToSummarize, options, getValue);
+		return acc;
+	}, {} as IDataObject);
+}
+
+function aggregationToArray(
+	aggregationResult: IDataObject,
+	fieldsToSplitBy: string[],
+	previousStage: IDataObject = {},
+) {
+	const returnData: IDataObject[] = [];
+	fieldsToSplitBy = parseFieldName(fieldsToSplitBy);
+	const splitFieldName = fieldsToSplitBy[0];
+	const isNext = fieldsToSplitBy[1];
+
+	if (isNext === undefined) {
+		for (const fieldName of Object.keys(aggregationResult)) {
+			returnData.push({
+				...previousStage,
+				[splitFieldName]: fieldName,
+				...(aggregationResult[fieldName] as IDataObject),
+			});
+		}
+		return returnData;
+	} else {
+		for (const key of Object.keys(aggregationResult)) {
+			returnData.push(
+				...aggregationToArray(aggregationResult[key] as IDataObject, fieldsToSplitBy.slice(1), {
+					...previousStage,
+					[splitFieldName]: key,
+				}),
+			);
+		}
+		return returnData;
+	}
+}
+
+export async function execute(
+	this: IExecuteFunctions,
+	items: INodeExecutionData[],
+): Promise<INodeExecutionData[]> {
+	const newItems = items.map(({ json }, i) => ({ ...json, _itemIndex: i }));
+
+	const options = this.getNodeParameter('options', 0, {}) as SummarizeOptions;
+
+	const fieldsToSplitBy = (this.getNodeParameter('fieldsToSplitBy', 0, '') as string)
+		.split(',')
+		.map((field) => field.trim())
+		.filter((field) => field);
+
+	const fieldsToSummarize = this.getNodeParameter(
+		'fieldsToSummarize.values',
+		0,
+		[],
+	) as Aggregations;
+
+	if (fieldsToSummarize.filter((aggregation) => aggregation.field !== '').length === 0) {
+		throw new NodeOperationError(
+			this.getNode(),
+			"You need to add at least one aggregation to 'Fields to Summarize' with non empty 'Field'",
+		);
+	}
+
+	const getValue = fieldValueGetter(options.disableDotNotation);
+
+	const nodeVersion = this.getNode().typeVersion;
+
+	if (nodeVersion < 2.1) {
+		checkIfFieldExists.call(this, newItems, fieldsToSummarize, getValue);
+	}
+
+	const aggregationResult = splitData(
+		fieldsToSplitBy,
+		newItems,
+		fieldsToSummarize,
+		options,
+		getValue,
+	);
+
+	if (options.outputFormat === 'singleItem') {
+		const executionData: INodeExecutionData = {
+			json: aggregationResult,
+			pairedItem: newItems.map((_v, index) => ({
+				item: index,
+			})),
+		};
+		return [executionData];
+	} else {
+		if (!fieldsToSplitBy.length) {
+			const { pairedItems, ...json } = aggregationResult;
+			const executionData: INodeExecutionData = {
+				json,
+				pairedItem: ((pairedItems as number[]) || []).map((index: number) => ({
+					item: index,
+				})),
+			};
+			return [executionData];
+		}
+		const returnData = aggregationToArray(aggregationResult, fieldsToSplitBy);
+		const executionData = returnData.map((item) => {
+			const { pairedItems, ...json } = item;
+			return {
+				json,
+				pairedItem: ((pairedItems as number[]) || []).map((index: number) => ({
+					item: index,
+				})),
+			};
+		});
+		return executionData;
+	}
+}
diff --git a/packages/nodes-base/nodes/ItemLists/V3/actions/node.type.ts b/packages/nodes-base/nodes/ItemLists/V3/actions/node.type.ts
new file mode 100644
index 0000000000000..86750f30eac1b
--- /dev/null
+++ b/packages/nodes-base/nodes/ItemLists/V3/actions/node.type.ts
@@ -0,0 +1,13 @@
+import type { AllEntities } from 'n8n-workflow';
+
+type NodeMap = {
+	itemList:
+		| 'concatenateItems'
+		| 'limit'
+		| 'removeDuplicates'
+		| 'sort'
+		| 'splitOutItems'
+		| 'summarize';
+};
+
+export type ItemListsType = AllEntities<NodeMap>;
diff --git a/packages/nodes-base/nodes/ItemLists/V3/actions/router.ts b/packages/nodes-base/nodes/ItemLists/V3/actions/router.ts
new file mode 100644
index 0000000000000..006d4f9b87e79
--- /dev/null
+++ b/packages/nodes-base/nodes/ItemLists/V3/actions/router.ts
@@ -0,0 +1,35 @@
+import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
+import { NodeOperationError } from 'n8n-workflow';
+import type { ItemListsType } from './node.type';
+
+import * as itemList from './itemList';
+
+export async function router(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+	let returnData: INodeExecutionData[] = [];
+
+	const items = this.getInputData();
+	const resource = this.getNodeParameter<ItemListsType>('resource', 0);
+	const operation = this.getNodeParameter('operation', 0);
+
+	const itemListsNodeData = {
+		resource,
+		operation,
+	} as ItemListsType;
+
+	try {
+		switch (itemListsNodeData.resource) {
+			case 'itemList':
+				returnData = await itemList[itemListsNodeData.operation].execute.call(this, items);
+				break;
+			default:
+				throw new NodeOperationError(
+					this.getNode(),
+					`The operation "${operation}" is not supported!`,
+				);
+		}
+	} catch (error) {
+		throw error;
+	}
+
+	return [returnData];
+}
diff --git a/packages/nodes-base/nodes/ItemLists/V3/actions/versionDescription.ts b/packages/nodes-base/nodes/ItemLists/V3/actions/versionDescription.ts
new file mode 100644
index 0000000000000..8c992a308ed51
--- /dev/null
+++ b/packages/nodes-base/nodes/ItemLists/V3/actions/versionDescription.ts
@@ -0,0 +1,35 @@
+/* eslint-disable n8n-nodes-base/node-filename-against-convention */
+import type { INodeTypeDescription } from 'n8n-workflow';
+
+import * as itemList from './itemList';
+
+export const versionDescription: INodeTypeDescription = {
+	displayName: 'Item Lists',
+	name: 'itemLists',
+	icon: 'file:itemLists.svg',
+	group: ['input'],
+	subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+	description: 'Helper for working with lists of items and transforming arrays',
+	version: [3, 3.1],
+	defaults: {
+		name: 'Item Lists',
+	},
+	inputs: ['main'],
+	outputs: ['main'],
+	credentials: [],
+	properties: [
+		{
+			displayName: 'Resource',
+			name: 'resource',
+			type: 'hidden',
+			options: [
+				{
+					name: 'Item List',
+					value: 'itemList',
+				},
+			],
+			default: 'itemList',
+		},
+		...itemList.description,
+	],
+};
diff --git a/packages/nodes-base/nodes/ItemLists/V3/helpers/utils.ts b/packages/nodes-base/nodes/ItemLists/V3/helpers/utils.ts
new file mode 100644
index 0000000000000..49b648527d2d5
--- /dev/null
+++ b/packages/nodes-base/nodes/ItemLists/V3/helpers/utils.ts
@@ -0,0 +1,170 @@
+import { NodeVM } from '@n8n/vm2';
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	IBinaryData,
+	INode,
+	INodeExecutionData,
+	GenericValue,
+} from 'n8n-workflow';
+import { ApplicationError, NodeOperationError } from 'n8n-workflow';
+
+import get from 'lodash/get';
+import isEqual from 'lodash/isEqual';
+import isObject from 'lodash/isObject';
+import merge from 'lodash/merge';
+import reduce from 'lodash/reduce';
+
+export const compareItems = (
+	obj: INodeExecutionData,
+	obj2: INodeExecutionData,
+	keys: string[],
+	disableDotNotation: boolean,
+	_node: INode,
+) => {
+	let result = true;
+	for (const key of keys) {
+		if (!disableDotNotation) {
+			if (!isEqual(get(obj.json, key), get(obj2.json, key))) {
+				result = false;
+				break;
+			}
+		} else {
+			if (!isEqual(obj.json[key], obj2.json[key])) {
+				result = false;
+				break;
+			}
+		}
+	}
+	return result;
+};
+
+export const flattenKeys = (obj: IDataObject, path: string[] = []): IDataObject => {
+	return !isObject(obj)
+		? { [path.join('.')]: obj }
+		: reduce(obj, (cum, next, key) => merge(cum, flattenKeys(next as IDataObject, [...path, key])), {}); //prettier-ignore
+};
+
+export const shuffleArray = (array: any[]) => {
+	for (let i = array.length - 1; i > 0; i--) {
+		const j = Math.floor(Math.random() * (i + 1));
+		[array[i], array[j]] = [array[j], array[i]];
+	}
+};
+
+export const prepareFieldsArray = (fields: string | string[], fieldName = 'Fields') => {
+	if (typeof fields === 'string') {
+		return fields
+			.split(',')
+			.map((entry) => entry.trim())
+			.filter((entry) => entry !== '');
+	}
+	if (Array.isArray(fields)) {
+		return fields;
+	}
+	throw new ApplicationError(
+		`The \'${fieldName}\' parameter must be a string of fields separated by commas or an array of strings.`,
+		{ level: 'warning' },
+	);
+};
+
+const returnRegExp = /\breturn\b/g;
+
+export function sortByCode(
+	this: IExecuteFunctions,
+	items: INodeExecutionData[],
+): INodeExecutionData[] {
+	const code = this.getNodeParameter('code', 0) as string;
+	if (!returnRegExp.test(code)) {
+		throw new NodeOperationError(
+			this.getNode(),
+			"Sort code doesn't return. Please add a 'return' statement to your code",
+		);
+	}
+
+	const mode = this.getMode();
+	const vm = new NodeVM({
+		console: mode === 'manual' ? 'redirect' : 'inherit',
+		sandbox: { items },
+	});
+
+	return vm.run(`module.exports = items.sort((a, b) => { ${code} })`);
+}
+
+type PartialBinaryData = Omit<IBinaryData, 'data'>;
+const isBinaryUniqueSetup = () => {
+	const binaries: PartialBinaryData[] = [];
+	return (binary: IBinaryData) => {
+		for (const existingBinary of binaries) {
+			if (
+				existingBinary.mimeType === binary.mimeType &&
+				existingBinary.fileType === binary.fileType &&
+				existingBinary.fileSize === binary.fileSize &&
+				existingBinary.fileExtension === binary.fileExtension
+			) {
+				return false;
+			}
+		}
+
+		binaries.push({
+			mimeType: binary.mimeType,
+			fileType: binary.fileType,
+			fileSize: binary.fileSize,
+			fileExtension: binary.fileExtension,
+		});
+
+		return true;
+	};
+};
+
+export function addBinariesToItem(
+	newItem: INodeExecutionData,
+	items: INodeExecutionData[],
+	uniqueOnly?: boolean,
+) {
+	const isBinaryUnique = uniqueOnly ? isBinaryUniqueSetup() : undefined;
+
+	for (const item of items) {
+		if (item.binary === undefined) continue;
+
+		for (const key of Object.keys(item.binary)) {
+			if (!newItem.binary) newItem.binary = {};
+			let binaryKey = key;
+			const binary = item.binary[key];
+
+			if (isBinaryUnique && !isBinaryUnique(binary)) {
+				continue;
+			}
+
+			// If the binary key already exists add a suffix to it
+			let i = 1;
+			while (newItem.binary[binaryKey] !== undefined) {
+				binaryKey = `${key}_${i}`;
+				i++;
+			}
+
+			newItem.binary[binaryKey] = binary;
+		}
+	}
+
+	return newItem;
+}
+
+export function typeToNumber(value: GenericValue): number {
+	if (typeof value === 'object') {
+		if (Array.isArray(value)) return 9;
+		if (value === null) return 10;
+		if (value instanceof Date) return 11;
+	}
+	const types = {
+		_string: 1,
+		_number: 2,
+		_bigint: 3,
+		_boolean: 4,
+		_symbol: 5,
+		_undefined: 6,
+		_object: 7,
+		_function: 8,
+	};
+	return types[`_${typeof value}`];
+}
diff --git a/packages/nodes-base/nodes/ItemLists/itemLists.svg b/packages/nodes-base/nodes/ItemLists/itemLists.svg
index 56100defcee2d..d1b86dff141d0 100644
--- a/packages/nodes-base/nodes/ItemLists/itemLists.svg
+++ b/packages/nodes-base/nodes/ItemLists/itemLists.svg
@@ -1,13 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" focusable="false" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 210 210" width="60" height="60"  xml:space="preserve">
-<style type="text/css">
-    .st0{fill:#FF6D5A;}
-</style>
-<path class="st0" d="M18.8,18.8C8.4,18.8,0,27.1,0,37.5s8.4,18.8,18.8,18.8s18.8-8.4,18.8-18.8S29.1,18.8,18.8,18.8z M18.8,81.2
-    C8.4,81.2,0,89.6,0,100s8.4,18.8,18.8,18.8s18.8-8.4,18.8-18.8S29.1,81.2,18.8,81.2z M18.8,143.8C8.4,143.8,0,152.1,0,162.5
-    s8.4,18.8,18.8,18.8s18.8-8.4,18.8-18.8S29.1,143.8,18.8,143.8z M193.8,150h-125c-3.5,0-6.2,2.8-6.2,6.2v12.5c0,3.5,2.8,6.2,6.2,6.2
-    h125c3.5,0,6.2-2.8,6.2-6.2v-12.5C200,152.8,197.2,150,193.8,150z M193.8,25h-125c-3.5,0-6.2,2.8-6.2,6.2v12.5
-    c0,3.5,2.8,6.2,6.2,6.2h125c3.5,0,6.2-2.8,6.2-6.2V31.2C200,27.8,197.2,25,193.8,25z M193.8,87.5h-125c-3.5,0-6.2,2.8-6.2,6.2v12.5
-    c0,3.5,2.8,6.2,6.2,6.2h125c3.5,0,6.2-2.8,6.2-6.2V93.8C200,90.3,197.2,87.5,193.8,87.5z"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="60" height="60" viewBox="0 0 210 210"><path d="M18.8 18.8C8.4 18.8 0 27.1 0 37.5s8.4 18.8 18.8 18.8 18.8-8.4 18.8-18.8-8.5-18.7-18.8-18.7m0 62.4C8.4 81.2 0 89.6 0 100s8.4 18.8 18.8 18.8 18.8-8.4 18.8-18.8-8.5-18.8-18.8-18.8m0 62.6C8.4 143.8 0 152.1 0 162.5s8.4 18.8 18.8 18.8 18.8-8.4 18.8-18.8-8.5-18.7-18.8-18.7m175 6.2h-125c-3.5 0-6.2 2.8-6.2 6.2v12.5c0 3.5 2.8 6.2 6.2 6.2h125c3.5 0 6.2-2.8 6.2-6.2v-12.5c0-3.4-2.8-6.2-6.2-6.2m0-125h-125c-3.5 0-6.2 2.8-6.2 6.2v12.5c0 3.5 2.8 6.2 6.2 6.2h125c3.5 0 6.2-2.8 6.2-6.2V31.2c0-3.4-2.8-6.2-6.2-6.2m0 62.5h-125c-3.5 0-6.2 2.8-6.2 6.2v12.5c0 3.5 2.8 6.2 6.2 6.2h125c3.5 0 6.2-2.8 6.2-6.2V93.8c0-3.5-2.8-6.3-6.2-6.3" style="fill:#ff6d5a"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/ItemLists/test/node/ItemLists.test.ts b/packages/nodes-base/nodes/ItemLists/test/node/ItemLists.test.ts
index 715ee90b71b0c..467b52d55cce6 100644
--- a/packages/nodes-base/nodes/ItemLists/test/node/ItemLists.test.ts
+++ b/packages/nodes-base/nodes/ItemLists/test/node/ItemLists.test.ts
@@ -1,4 +1,4 @@
-import { testWorkflows, getWorkflowFilenames } from '../../../../test/nodes/Helpers';
+import { testWorkflows, getWorkflowFilenames } from '@test/nodes/Helpers';
 
 const workflows = getWorkflowFilenames(__dirname);
 
diff --git a/packages/nodes-base/nodes/ItemLists/test/node/workflow.concatenate_pairedItems.json b/packages/nodes-base/nodes/ItemLists/test/node/workflow.concatenate_pairedItems.json
new file mode 100644
index 0000000000000..d6df0a5a41b2e
--- /dev/null
+++ b/packages/nodes-base/nodes/ItemLists/test/node/workflow.concatenate_pairedItems.json
@@ -0,0 +1,145 @@
+{
+  "name": "itemsList concatenate paired fix",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "37256a71-67fe-4643-b4c7-e670096b68fc",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        620,
+        540
+      ]
+    },
+    {
+      "parameters": {
+        "category": "randomData",
+        "randomDataSeed": "n8n",
+        "randomDataCount": 3
+      },
+      "id": "0518c1d3-2e6d-40c6-8225-d89ec28ed28d",
+      "name": "DebugHelper",
+      "type": "n8n-nodes-base.debugHelper",
+      "typeVersion": 1,
+      "position": [
+        1000,
+        540
+      ]
+    },
+    {
+      "parameters": {
+        "operation": "concatenateItems",
+        "aggregate": "aggregateAllItemData"
+      },
+      "id": "7866056b-a7c1-41e2-b3b7-301cb21d95d4",
+      "name": "Item Lists",
+      "type": "n8n-nodes-base.itemLists",
+      "typeVersion": 3,
+      "position": [
+        1200,
+        540
+      ]
+    },
+    {
+      "parameters": {
+        "fields": {
+          "values": [
+            {
+              "name": "foo",
+              "stringValue": "bar"
+            }
+          ]
+        },
+        "options": {}
+      },
+      "id": "191ec112-65b6-4e4a-bf11-b63ab7e96f68",
+      "name": "Edit Fields",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3,
+      "position": [
+        800,
+        540
+      ]
+    },
+    {
+      "parameters": {
+        "customerId": "1",
+        "message": "={{ $('Edit Fields').item.json.foo }}"
+      },
+      "id": "4a3d6844-5044-4570-912a-af3f32efa871",
+      "name": "Customer Messenger (n8n training)",
+      "type": "n8n-nodes-base.n8nTrainingCustomerMessenger",
+      "typeVersion": 1,
+      "position": [
+        1400,
+        540
+      ]
+    }
+  ],
+  "pinData": {
+    "Customer Messenger (n8n training)": [
+      {
+        "json": {
+          "output": "Sent message to customer 1:  bar"
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Edit Fields",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "DebugHelper": {
+      "main": [
+        [
+          {
+            "node": "Item Lists",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Item Lists": {
+      "main": [
+        [
+          {
+            "node": "Customer Messenger (n8n training)",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Edit Fields": {
+      "main": [
+        [
+          {
+            "node": "DebugHelper",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "d17719c9-c625-4419-8b3c-d4cfaeffc312",
+  "id": "vXdwDVBSRxZxMrcv",
+  "meta": {
+    "instanceId": "b888bd11cd1ddbb95450babf3e199556799d999b896f650de768b8370ee50363"
+  },
+  "tags": []
+}
diff --git a/packages/nodes-base/nodes/ItemLists/test/node/workflow.removeDuplicates_3_1.json b/packages/nodes-base/nodes/ItemLists/test/node/workflow.removeDuplicates_3_1.json
new file mode 100644
index 0000000000000..4a377950651dd
--- /dev/null
+++ b/packages/nodes-base/nodes/ItemLists/test/node/workflow.removeDuplicates_3_1.json
@@ -0,0 +1,292 @@
+{
+	"name": "My workflow 63",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "5f174c07-00e5-49fc-854f-b1571d35c5a3",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [
+				960,
+				520
+			]
+		},
+		{
+			"parameters": {
+				"jsCode": "return [\n  { mixed: \"1\", match: \"foo\" },\n  { mixed: 1, match: \"foo\" },\n  { mixed: true, match: \"foo\" },\n  { mixed: false, match: \"foo\" },\n  { mixed: {}, match: \"foo\" },\n  { mixed: [], match: \"foo\" },\n  //duplicates\n  { mixed: \"1\", match: \"foo\" },\n  { mixed: 1, match: \"foo\" },\n  { mixed: true, match: \"foo\" },\n  { mixed: false, match: \"foo\" },\n  { mixed: {}, match: \"foo\" },\n  { mixed: [], match: \"foo\" },\n];"
+			},
+			"id": "2aa52759-f7a5-4a60-bf2e-9c1e3d2821dc",
+			"name": "Code",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 2,
+			"position": [
+				1160,
+				520
+			]
+		},
+		{
+			"parameters": {
+				"operation": "removeDuplicates"
+			},
+			"id": "90acc956-989f-4008-a3df-fe0162762b24",
+			"name": "Remove duplicates",
+			"type": "n8n-nodes-base.itemLists",
+			"typeVersion": 3.1,
+			"position": [
+				1440,
+				160
+			]
+		},
+		{
+			"parameters": {
+				"operation": "removeDuplicates",
+				"compare": "selectedFields",
+				"fieldsToCompare": "mixed",
+				"options": {}
+			},
+			"id": "6c39a6bb-b042-4d4c-828c-52699f178828",
+			"name": "Remove duplicates by mixed",
+			"type": "n8n-nodes-base.itemLists",
+			"typeVersion": 3.1,
+			"position": [
+				1440,
+				340
+			]
+		},
+		{
+			"parameters": {
+				"operation": "removeDuplicates",
+				"compare": "selectedFields",
+				"fieldsToCompare": "match",
+				"options": {}
+			},
+			"id": "d3783be2-6705-44d3-b481-72e7a9dba458",
+			"name": "Remove duplicates by match",
+			"type": "n8n-nodes-base.itemLists",
+			"typeVersion": 3.1,
+			"position": [
+				1440,
+				520
+			]
+		},
+		{
+			"parameters": {
+				"operation": "removeDuplicates",
+				"compare": "allFieldsExcept",
+				"fieldsToExclude": "mixed",
+				"options": {}
+			},
+			"id": "e634e39d-0ce6-477f-97cc-69eec2dd981b",
+			"name": "Remove duplicates except by mixed",
+			"type": "n8n-nodes-base.itemLists",
+			"typeVersion": 3.1,
+			"position": [
+				1440,
+				720
+			]
+		},
+		{
+			"parameters": {
+				"operation": "removeDuplicates",
+				"compare": "allFieldsExcept",
+				"fieldsToExclude": "match",
+				"options": {}
+			},
+			"id": "0a1bbc9a-3505-413c-ae86-c60dc60b5909",
+			"name": "Remove duplicates except by match",
+			"type": "n8n-nodes-base.itemLists",
+			"typeVersion": 3.1,
+			"position": [
+				1440,
+				940
+			]
+		}
+	],
+	"pinData": {
+		"Remove duplicates": [
+			{
+				"json": {
+					"mixed": "1",
+					"match": "foo"
+				}
+			},
+			{
+				"json": {
+					"mixed": 1,
+					"match": "foo"
+				}
+			},
+			{
+				"json": {
+					"mixed": true,
+					"match": "foo"
+				}
+			},
+			{
+				"json": {
+					"mixed": false,
+					"match": "foo"
+				}
+			},
+			{
+				"json": {
+					"mixed": {},
+					"match": "foo"
+				}
+			},
+			{
+				"json": {
+					"mixed": [],
+					"match": "foo"
+				}
+			}
+		],
+		"Remove duplicates by mixed": [
+			{
+				"json": {
+					"mixed": "1",
+					"match": "foo"
+				}
+			},
+			{
+				"json": {
+					"mixed": 1,
+					"match": "foo"
+				}
+			},
+			{
+				"json": {
+					"mixed": true,
+					"match": "foo"
+				}
+			},
+			{
+				"json": {
+					"mixed": false,
+					"match": "foo"
+				}
+			},
+			{
+				"json": {
+					"mixed": {},
+					"match": "foo"
+				}
+			},
+			{
+				"json": {
+					"mixed": [],
+					"match": "foo"
+				}
+			}
+		],
+		"Remove duplicates by match": [
+			{
+				"json": {
+					"mixed": "1",
+					"match": "foo"
+				}
+			}
+		],
+		"Remove duplicates except by mixed": [
+			{
+				"json": {
+					"mixed": "1",
+					"match": "foo"
+				}
+			}
+		],
+		"Remove duplicates except by match": [
+			{
+				"json": {
+					"mixed": "1",
+					"match": "foo"
+				}
+			},
+			{
+				"json": {
+					"mixed": 1,
+					"match": "foo"
+				}
+			},
+			{
+				"json": {
+					"mixed": true,
+					"match": "foo"
+				}
+			},
+			{
+				"json": {
+					"mixed": false,
+					"match": "foo"
+				}
+			},
+			{
+				"json": {
+					"mixed": {},
+					"match": "foo"
+				}
+			},
+			{
+				"json": {
+					"mixed": [],
+					"match": "foo"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Code",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code": {
+			"main": [
+				[
+					{
+						"node": "Remove duplicates",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Remove duplicates by mixed",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Remove duplicates by match",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Remove duplicates except by mixed",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Remove duplicates except by match",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "c657bc6f-02bc-4e1b-b49a-d1dca8b13256",
+	"id": "cHSnZsTtYIJj3gL2",
+	"meta": {
+		"instanceId": "104a4d08d8897b8bdeb38aaca515021075e0bd8544c983c2bb8c86e6a8e6081c"
+	},
+	"tags": []
+}
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/ItemLists/test/node/workflow.splitOutItems.split_object.json b/packages/nodes-base/nodes/ItemLists/test/node/workflow.splitOutItems.split_object.json
new file mode 100644
index 0000000000000..39b9ecb6b1c74
--- /dev/null
+++ b/packages/nodes-base/nodes/ItemLists/test/node/workflow.splitOutItems.split_object.json
@@ -0,0 +1,391 @@
+{
+	"name": "itemList split Object",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "ade46a75-ab57-48c6-886b-0c118f5ef1c6",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [520, 800]
+		},
+		{
+			"parameters": {
+				"fieldToSplitOut": "data",
+				"include": "selectedOtherFields",
+				"fieldsToInclude": {
+					"fields": [
+						{
+							"fieldName": "tag"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "45e1d7a3-d6e8-4b69-a68a-1038db13be4c",
+			"name": "Item Lists1",
+			"type": "n8n-nodes-base.itemLists",
+			"typeVersion": 2,
+			"position": [1120, 340]
+		},
+		{
+			"parameters": {
+				"jsCode": "const data = {\n  entry1: {\n    id: 1,\n    info: 'some info 1',\n  },\n  entry2: {\n    id: 2,\n    info: 'some info 2',\n  },\n  entry3: {\n    id: 3,\n    info: 'some info 3',\n  },\n};\n\n\nconst data2 = [\n  'a', 'b', 'c'\n];\n\nconst data3 = {\n  a: 1,\n  b: 2,\n  c: 3,\n};\n\nreturn {data, data2, data3, data4: null, tag: 'bar'};"
+			},
+			"id": "faa78fac-468d-42b8-96e9-0fb62c312da3",
+			"name": "Code1",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [760, 800]
+		},
+		{
+			"parameters": {},
+			"id": "5baaf321-7e89-473d-a313-7cb90b3f13b3",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1380, 340]
+		},
+		{
+			"parameters": {
+				"fieldToSplitOut": "data3",
+				"include": "allOtherFields",
+				"options": {
+					"destinationFieldName": "extracted"
+				}
+			},
+			"id": "a786bea9-eb29-4c6d-aea6-a22aee622bc6",
+			"name": "Item Lists",
+			"type": "n8n-nodes-base.itemLists",
+			"typeVersion": 2,
+			"position": [1120, 720]
+		},
+		{
+			"parameters": {},
+			"id": "0521a24b-c74a-48fa-ae50-48a242b97806",
+			"name": "No Operation, do nothing1",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1380, 720]
+		},
+		{
+			"parameters": {
+				"fieldToSplitOut": "data3",
+				"options": {}
+			},
+			"id": "0c1c8827-72ab-4738-918c-d529e66505c6",
+			"name": "Item Lists2",
+			"type": "n8n-nodes-base.itemLists",
+			"typeVersion": 2,
+			"position": [1120, 540]
+		},
+		{
+			"parameters": {},
+			"id": "4c0dca36-c2ae-4d40-8952-0e728ac93fa3",
+			"name": "No Operation, do nothing2",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1380, 540]
+		},
+		{
+			"parameters": {
+				"fieldToSplitOut": "data2",
+				"options": {}
+			},
+			"id": "b2031380-b2a8-426d-8f7a-ab072d23b979",
+			"name": "Item Lists3",
+			"type": "n8n-nodes-base.itemLists",
+			"typeVersion": 2,
+			"position": [1120, 920]
+		},
+		{
+			"parameters": {},
+			"id": "617f7259-beee-42f1-bba2-4e75a83fe369",
+			"name": "No Operation, do nothing3",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1380, 920]
+		},
+		{
+			"parameters": {
+				"fieldToSplitOut": "data4",
+				"options": {}
+			},
+			"id": "8909b8eb-e5a9-4436-8e62-09d8c9670ac1",
+			"name": "Item Lists4",
+			"type": "n8n-nodes-base.itemLists",
+			"typeVersion": 2,
+			"position": [1120, 1140],
+			"continueOnFail": true
+		},
+		{
+			"parameters": {},
+			"id": "a9278f90-8ad9-42dc-85b6-28bf1b6764b7",
+			"name": "No Operation, do nothing4",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1380, 1140]
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"tag": "bar",
+					"data": {
+						"id": 1,
+						"info": "some info 1"
+					}
+				}
+			},
+			{
+				"json": {
+					"tag": "bar",
+					"data": {
+						"id": 2,
+						"info": "some info 2"
+					}
+				}
+			},
+			{
+				"json": {
+					"tag": "bar",
+					"data": {
+						"id": 3,
+						"info": "some info 3"
+					}
+				}
+			}
+		],
+		"No Operation, do nothing2": [
+			{
+				"json": {
+					"data3": 1
+				}
+			},
+			{
+				"json": {
+					"data3": 2
+				}
+			},
+			{
+				"json": {
+					"data3": 3
+				}
+			}
+		],
+		"No Operation, do nothing1": [
+			{
+				"json": {
+					"data": {
+						"entry1": {
+							"id": 1,
+							"info": "some info 1"
+						},
+						"entry2": {
+							"id": 2,
+							"info": "some info 2"
+						},
+						"entry3": {
+							"id": 3,
+							"info": "some info 3"
+						}
+					},
+					"data2": ["a", "b", "c"],
+					"data4": null,
+					"tag": "bar",
+					"extracted": 1
+				}
+			},
+			{
+				"json": {
+					"data": {
+						"entry1": {
+							"id": 1,
+							"info": "some info 1"
+						},
+						"entry2": {
+							"id": 2,
+							"info": "some info 2"
+						},
+						"entry3": {
+							"id": 3,
+							"info": "some info 3"
+						}
+					},
+					"data2": ["a", "b", "c"],
+					"data4": null,
+					"tag": "bar",
+					"extracted": 2
+				}
+			},
+			{
+				"json": {
+					"data": {
+						"entry1": {
+							"id": 1,
+							"info": "some info 1"
+						},
+						"entry2": {
+							"id": 2,
+							"info": "some info 2"
+						},
+						"entry3": {
+							"id": 3,
+							"info": "some info 3"
+						}
+					},
+					"data2": ["a", "b", "c"],
+					"data4": null,
+					"tag": "bar",
+					"extracted": 3
+				}
+			}
+		],
+		"No Operation, do nothing3": [
+			{
+				"json": {
+					"data2": "a"
+				}
+			},
+			{
+				"json": {
+					"data2": "b"
+				}
+			},
+			{
+				"json": {
+					"data2": "c"
+				}
+			}
+		],
+		"No Operation, do nothing4": [
+			{
+				"json": {
+					"data": {
+						"entry1": {
+							"id": 1,
+							"info": "some info 1"
+						},
+						"entry2": {
+							"id": 2,
+							"info": "some info 2"
+						},
+						"entry3": {
+							"id": 3,
+							"info": "some info 3"
+						}
+					},
+					"data2": ["a", "b", "c"],
+					"data3": {
+						"a": 1,
+						"b": 2,
+						"c": 3
+					},
+					"data4": null,
+					"tag": "bar"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Code1",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code1": {
+			"main": [
+				[
+					{
+						"node": "Item Lists1",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Item Lists2",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Item Lists",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Item Lists3",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Item Lists4",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Item Lists1": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Item Lists": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing1",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Item Lists2": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing2",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Item Lists3": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing3",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Item Lists4": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing4",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false
+}
diff --git a/packages/nodes-base/nodes/ItemLists/test/node/workflow.update_2_1.json b/packages/nodes-base/nodes/ItemLists/test/node/workflow.update_2_1.json
new file mode 100644
index 0000000000000..283ce35d14269
--- /dev/null
+++ b/packages/nodes-base/nodes/ItemLists/test/node/workflow.update_2_1.json
@@ -0,0 +1,695 @@
+{
+	"name": "My workflow 4",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "037f477b-6775-47e9-b735-71c1d984ceb6",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [440, 1300]
+		},
+		{
+			"parameters": {
+				"fieldToSplitOut": "dataa",
+				"options": {}
+			},
+			"id": "b9f156e1-ffb0-4121-abf3-8813b8cc738e",
+			"name": "Item Lists4",
+			"type": "n8n-nodes-base.itemLists",
+			"typeVersion": 2,
+			"position": [920, 260],
+			"continueOnFail": true
+		},
+		{
+			"parameters": {
+				"fieldToSplitOut": "dataa",
+				"options": {}
+			},
+			"id": "c8ed5ebc-18f2-4d94-8f19-c019278e5d0d",
+			"name": "Item Lists5",
+			"type": "n8n-nodes-base.itemLists",
+			"typeVersion": 2.1,
+			"position": [920, 420],
+			"alwaysOutputData": true
+		},
+		{
+			"parameters": {},
+			"id": "e2c1fc7c-3333-4849-a084-dac2c6edc1a7",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1140, 240]
+		},
+		{
+			"parameters": {},
+			"id": "c8c9727d-232d-4ae2-a7cc-3dcf00b32474",
+			"name": "No Operation, do nothing1",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1140, 420]
+		},
+		{
+			"parameters": {
+				"operation": "aggregateItems",
+				"fieldsToAggregate": {
+					"fieldToAggregate": [
+						{
+							"fieldToAggregate": "idd"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "88c02d0a-0680-4564-8b2e-48ebfabe4864",
+			"name": "Item Lists",
+			"type": "n8n-nodes-base.itemLists",
+			"typeVersion": 2,
+			"position": [920, 1080],
+			"continueOnFail": true
+		},
+		{
+			"parameters": {
+				"operation": "aggregateItems",
+				"fieldsToAggregate": {
+					"fieldToAggregate": [
+						{
+							"fieldToAggregate": "idd"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "327ace17-571f-4aea-98bf-3cad71449f56",
+			"name": "Item Lists6",
+			"type": "n8n-nodes-base.itemLists",
+			"typeVersion": 2.1,
+			"position": [920, 1240]
+		},
+		{
+			"parameters": {},
+			"id": "38a5b83a-0f71-4788-983b-9f7719d59190",
+			"name": "No Operation, do nothing2",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1140, 1060]
+		},
+		{
+			"parameters": {},
+			"id": "aa76c9fb-5a15-4239-903f-570aeca80453",
+			"name": "No Operation, do nothing3",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1140, 1240]
+		},
+		{
+			"parameters": {
+				"operation": "summarize",
+				"fieldsToSummarize": {
+					"values": [
+						{
+							"field": "idd"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "246e42b2-62ab-4ef4-acf1-031ac6236052",
+			"name": "Item Lists7",
+			"type": "n8n-nodes-base.itemLists",
+			"typeVersion": 2,
+			"position": [920, 1880],
+			"continueOnFail": true
+		},
+		{
+			"parameters": {
+				"operation": "summarize",
+				"fieldsToSummarize": {
+					"values": [
+						{
+							"field": "idd"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "3145a0dd-035a-477b-8d5a-98a2106b46c8",
+			"name": "Item Lists8",
+			"type": "n8n-nodes-base.itemLists",
+			"typeVersion": 2.1,
+			"position": [920, 2040]
+		},
+		{
+			"parameters": {},
+			"id": "71bc9c78-cf27-4628-9f64-19a9bef353c3",
+			"name": "No Operation, do nothing4",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1140, 1860]
+		},
+		{
+			"parameters": {},
+			"id": "1ee8497c-e721-4741-b059-ff4b85cb0e73",
+			"name": "No Operation, do nothing5",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1140, 2040]
+		},
+		{
+			"parameters": {
+				"jsCode": "return {data:[\n  {id: 1},\n  {id: 2},\n  {id: 3},\n  {id: 4},\n]};"
+			},
+			"id": "b97e2dd3-8934-4f61-a217-e4251c3c018f",
+			"name": "Code2",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [600, 500]
+		},
+		{
+			"parameters": {
+				"jsCode": "return [\n  {id: 1},\n  {id: 2},\n  {id: 3},\n  {id: 4},\n];"
+			},
+			"id": "cc63d7e0-0ecb-4aa8-ae15-69c6b32ce6d9",
+			"name": "Code",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [660, 1260]
+		},
+		{
+			"parameters": {
+				"operation": "summarize",
+				"fieldsToSummarize": {
+					"values": [
+						{
+							"field": "id"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "50df7038-52d2-4b07-a729-a683ebbd769d",
+			"name": "Item Lists9",
+			"type": "n8n-nodes-base.itemLists",
+			"typeVersion": 2,
+			"position": [920, 2260],
+			"continueOnFail": true
+		},
+		{
+			"parameters": {
+				"operation": "summarize",
+				"fieldsToSummarize": {
+					"values": [
+						{
+							"field": "id"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "15347d3e-0e4a-4c48-ad24-80730f7015c8",
+			"name": "Item Lists10",
+			"type": "n8n-nodes-base.itemLists",
+			"typeVersion": 2.1,
+			"position": [920, 2420]
+		},
+		{
+			"parameters": {},
+			"id": "aa2bfbc8-bdfd-41fd-83f8-181bcd2fa9be",
+			"name": "No Operation, do nothing6",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1140, 2240]
+		},
+		{
+			"parameters": {},
+			"id": "9ca712dc-dd5a-474e-808b-224bf4149f85",
+			"name": "No Operation, do nothing7",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1140, 2420]
+		},
+		{
+			"parameters": {
+				"operation": "aggregateItems",
+				"fieldsToAggregate": {
+					"fieldToAggregate": [
+						{
+							"fieldToAggregate": "id"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "1cf43271-c87b-4523-9d8d-ed72b4ad49fa",
+			"name": "Item Lists1",
+			"type": "n8n-nodes-base.itemLists",
+			"typeVersion": 2,
+			"position": [920, 1460],
+			"continueOnFail": true
+		},
+		{
+			"parameters": {
+				"operation": "aggregateItems",
+				"fieldsToAggregate": {
+					"fieldToAggregate": [
+						{
+							"fieldToAggregate": "id"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "d1153bd8-a546-4ae2-a7ba-6f3ed4c41ba5",
+			"name": "Item Lists11",
+			"type": "n8n-nodes-base.itemLists",
+			"typeVersion": 2.1,
+			"position": [920, 1620]
+		},
+		{
+			"parameters": {},
+			"id": "32fa0e78-35ef-4a84-bc09-b94141db2bab",
+			"name": "No Operation, do nothing8",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1140, 1440]
+		},
+		{
+			"parameters": {},
+			"id": "d3c43cd0-7544-4cb9-8fad-6e8e8c8676bc",
+			"name": "No Operation, do nothing9",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1140, 1620]
+		},
+		{
+			"parameters": {
+				"fieldToSplitOut": "data",
+				"options": {}
+			},
+			"id": "94c419a1-a941-472b-8142-39ca1c428390",
+			"name": "Item Lists12",
+			"type": "n8n-nodes-base.itemLists",
+			"typeVersion": 2,
+			"position": [920, 660],
+			"continueOnFail": true
+		},
+		{
+			"parameters": {
+				"fieldToSplitOut": "dataa",
+				"options": {}
+			},
+			"id": "482d5523-a4d1-4bee-8717-c5949674a246",
+			"name": "Item Lists13",
+			"type": "n8n-nodes-base.itemLists",
+			"typeVersion": 2.1,
+			"position": [920, 820],
+			"alwaysOutputData": true
+		},
+		{
+			"parameters": {},
+			"id": "9dd44dc5-3525-4a22-b1dd-5d369db28759",
+			"name": "No Operation, do nothing10",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1140, 640]
+		},
+		{
+			"parameters": {},
+			"id": "f23f7fed-e7e9-4e9d-abdd-056973fc0bbc",
+			"name": "No Operation, do nothing11",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1140, 820]
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing1": [
+			{
+				"json": {}
+			}
+		],
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"data": [
+						{
+							"id": 1
+						},
+						{
+							"id": 2
+						},
+						{
+							"id": 3
+						},
+						{
+							"id": 4
+						}
+					]
+				}
+			}
+		],
+		"No Operation, do nothing10": [
+			{
+				"json": {
+					"id": 1
+				}
+			},
+			{
+				"json": {
+					"id": 2
+				}
+			},
+			{
+				"json": {
+					"id": 3
+				}
+			},
+			{
+				"json": {
+					"id": 4
+				}
+			}
+		],
+		"No Operation, do nothing11": [
+			{
+				"json": {}
+			}
+		],
+		"No Operation, do nothing2": [
+			{
+				"json": {
+					"id": 1
+				}
+			},
+			{
+				"json": {
+					"id": 2
+				}
+			},
+			{
+				"json": {
+					"id": 3
+				}
+			},
+			{
+				"json": {
+					"id": 4
+				}
+			}
+		],
+		"No Operation, do nothing3": [
+			{
+				"json": {
+					"idd": []
+				}
+			}
+		],
+		"No Operation, do nothing8": [
+			{
+				"json": {
+					"id": [1, 2, 3, 4]
+				}
+			}
+		],
+		"No Operation, do nothing9": [
+			{
+				"json": {
+					"id": [1, 2, 3, 4]
+				}
+			}
+		],
+		"No Operation, do nothing4": [
+			{
+				"json": {
+					"id": 1
+				}
+			},
+			{
+				"json": {
+					"id": 2
+				}
+			},
+			{
+				"json": {
+					"id": 3
+				}
+			},
+			{
+				"json": {
+					"id": 4
+				}
+			}
+		],
+		"No Operation, do nothing5": [
+			{
+				"json": {
+					"count_idd": 0
+				}
+			}
+		],
+		"No Operation, do nothing6": [
+			{
+				"json": {
+					"count_id": 4
+				}
+			}
+		],
+		"No Operation, do nothing7": [
+			{
+				"json": {
+					"count_id": 4
+				}
+			}
+		]
+	},
+	"connections": {
+		"Item Lists4": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Item Lists5": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing1",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Code2",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Code",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Item Lists": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing2",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Item Lists6": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing3",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Item Lists7": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing4",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Item Lists8": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing5",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code2": {
+			"main": [
+				[
+					{
+						"node": "Item Lists4",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Item Lists5",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Item Lists12",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Item Lists13",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code": {
+			"main": [
+				[
+					{
+						"node": "Item Lists",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Item Lists6",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Item Lists7",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Item Lists8",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Item Lists9",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Item Lists10",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Item Lists1",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Item Lists11",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Item Lists9": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing6",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Item Lists10": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing7",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Item Lists1": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing8",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Item Lists11": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing9",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Item Lists12": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing10",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Item Lists13": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing11",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {},
+	"versionId": "5d3c6a6b-df81-42e6-ae4c-2b297024a298",
+	"id": "9",
+	"meta": {
+		"instanceId": "6ebec4953fe56f1c009e7c3b107578b375137523af057073c0b5da17350651bd"
+	},
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/ItemLists/test/node/workflow.update_2_2.json b/packages/nodes-base/nodes/ItemLists/test/node/workflow.update_2_2.json
new file mode 100644
index 0000000000000..f1c97ee32ca5f
--- /dev/null
+++ b/packages/nodes-base/nodes/ItemLists/test/node/workflow.update_2_2.json
@@ -0,0 +1,361 @@
+{
+	"name": "item_list 2.2",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "f2d01806-a457-4a3a-8bd9-aeb005aecb99",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [-80, 820]
+		},
+		{
+			"parameters": {
+				"fieldToSplitOut": "data, data2",
+				"include": "selectedOtherFields",
+				"fieldsToInclude": {
+					"fields": [
+						{
+							"fieldName": "tag"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "b0dbb504-d111-49ee-a904-1ece920a2e7a",
+			"name": "Item Lists1",
+			"type": "n8n-nodes-base.itemLists",
+			"typeVersion": 2.2,
+			"position": [520, 360]
+		},
+		{
+			"parameters": {
+				"jsCode": "const data = {\n  entry1: {\n    id: 1,\n    info: 'some info 1',\n  },\n  entry2: {\n    id: 2,\n    info: 'some info 2',\n  },\n  entry3: {\n    id: 3,\n    info: 'some info 3',\n  },\n};\n\n\nconst data2 = [\n  'a', 'b', 'c'\n];\n\nconst data3 = {\n  a: 1,\n  b: 2,\n  c: 3,\n};\n\nreturn {data, data2, data3, data4: null, tag: 'bar'};"
+			},
+			"id": "64fa7b5c-c85c-4dd8-8863-11d6e0ee8426",
+			"name": "Code1",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [160, 820]
+		},
+		{
+			"parameters": {
+				"fieldToSplitOut": "data2, tag",
+				"include": "selectedOtherFields",
+				"fieldsToInclude": {
+					"fields": [
+						{
+							"fieldName": "data4"
+						}
+					]
+				},
+				"options": {
+					"destinationFieldName": "fromArray, singleField"
+				}
+			},
+			"id": "80b46f60-19c2-4aec-a232-901b54bdb7c0",
+			"name": "Item Lists",
+			"type": "n8n-nodes-base.itemLists",
+			"typeVersion": 2.2,
+			"position": [520, 780]
+		},
+		{
+			"parameters": {
+				"fieldToSplitOut": "data3, data2, data",
+				"options": {}
+			},
+			"id": "c2bbf08c-4571-4d28-a95d-82b0dd22edd9",
+			"name": "Item Lists2",
+			"type": "n8n-nodes-base.itemLists",
+			"typeVersion": 2.2,
+			"position": [520, 560]
+		},
+		{
+			"parameters": {
+				"fieldToSplitOut": "data2, data3",
+				"include": "allOtherFields",
+				"options": {}
+			},
+			"id": "ef10bb23-43e1-4e48-b8b7-c634e4c41b56",
+			"name": "Item Lists3",
+			"type": "n8n-nodes-base.itemLists",
+			"typeVersion": 2.2,
+			"position": [520, 1180]
+		},
+		{
+			"parameters": {
+				"fieldToSplitOut": " tag, data4",
+				"options": {
+					"destinationFieldName": "entry1, entry2"
+				}
+			},
+			"id": "cd083969-5c27-47f6-9eb2-aa52fc2f5cb2",
+			"name": "Item Lists4",
+			"type": "n8n-nodes-base.itemLists",
+			"typeVersion": 2.2,
+			"position": [520, 1400],
+			"continueOnFail": true
+		},
+		{
+			"parameters": {
+				"fieldToSplitOut": "data2",
+				"include": "selectedOtherFields",
+				"fieldsToInclude": {
+					"fields": [
+						{
+							"fieldName": "data4"
+						}
+					]
+				},
+				"options": {
+					"destinationFieldName": "fromArray"
+				}
+			},
+			"id": "866154c7-2967-44d7-a278-1600752749d3",
+			"name": "Item Lists5",
+			"type": "n8n-nodes-base.itemLists",
+			"typeVersion": 2.2,
+			"position": [520, 960]
+		}
+	],
+	"pinData": {
+		"Item Lists1": [
+			{
+				"json": {
+					"data": {
+						"id": 1,
+						"info": "some info 1"
+					},
+					"data2": "a",
+					"tag": "bar"
+				}
+			},
+			{
+				"json": {
+					"data": {
+						"id": 2,
+						"info": "some info 2"
+					},
+					"data2": "b",
+					"tag": "bar"
+				}
+			},
+			{
+				"json": {
+					"data": {
+						"id": 3,
+						"info": "some info 3"
+					},
+					"data2": "c",
+					"tag": "bar"
+				}
+			}
+		],
+		"Item Lists2": [
+			{
+				"json": {
+					"data3": 1,
+					"data2": "a",
+					"data": {
+						"id": 1,
+						"info": "some info 1"
+					}
+				}
+			},
+			{
+				"json": {
+					"data3": 2,
+					"data2": "b",
+					"data": {
+						"id": 2,
+						"info": "some info 2"
+					}
+				}
+			},
+			{
+				"json": {
+					"data3": 3,
+					"data2": "c",
+					"data": {
+						"id": 3,
+						"info": "some info 3"
+					}
+				}
+			}
+		],
+		"Item Lists": [
+			{
+				"json": {
+					"fromArray": "a",
+					"singleField": "bar",
+					"data4": null
+				}
+			},
+			{
+				"json": {
+					"fromArray": "b",
+					"data4": null
+				}
+			},
+			{
+				"json": {
+					"fromArray": "c",
+					"data4": null
+				}
+			}
+		],
+		"Item Lists5": [
+			{
+				"json": {
+					"fromArray": "a",
+					"data4": null
+				}
+			},
+			{
+				"json": {
+					"fromArray": "b",
+					"data4": null
+				}
+			},
+			{
+				"json": {
+					"fromArray": "c",
+					"data4": null
+				}
+			}
+		],
+		"Item Lists3": [
+			{
+				"json": {
+					"data": {
+						"entry1": {
+							"id": 1,
+							"info": "some info 1"
+						},
+						"entry2": {
+							"id": 2,
+							"info": "some info 2"
+						},
+						"entry3": {
+							"id": 3,
+							"info": "some info 3"
+						}
+					},
+					"data4": null,
+					"tag": "bar",
+					"data2": "a",
+					"data3": 1
+				}
+			},
+			{
+				"json": {
+					"data": {
+						"entry1": {
+							"id": 1,
+							"info": "some info 1"
+						},
+						"entry2": {
+							"id": 2,
+							"info": "some info 2"
+						},
+						"entry3": {
+							"id": 3,
+							"info": "some info 3"
+						}
+					},
+					"data4": null,
+					"tag": "bar",
+					"data2": "b",
+					"data3": 2
+				}
+			},
+			{
+				"json": {
+					"data": {
+						"entry1": {
+							"id": 1,
+							"info": "some info 1"
+						},
+						"entry2": {
+							"id": 2,
+							"info": "some info 2"
+						},
+						"entry3": {
+							"id": 3,
+							"info": "some info 3"
+						}
+					},
+					"data4": null,
+					"tag": "bar",
+					"data2": "c",
+					"data3": 3
+				}
+			}
+		],
+		"Item Lists4": [
+			{
+				"json": {
+					"entry1": "bar",
+					"entry2": null
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Code1",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code1": {
+			"main": [
+				[
+					{
+						"node": "Item Lists1",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Item Lists2",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Item Lists",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Item Lists3",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Item Lists4",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Item Lists5",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {},
+	"versionId": "1f311937-f825-4bda-a39e-e27c6ffe5906",
+	"id": "170",
+	"meta": {
+		"instanceId": "36203ea1ce3cef713fa25999bd9874ae26b9e4c2c3a90a365f2882a154d031d0"
+	},
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/ItemLists/test/node/workflow.update_3.json b/packages/nodes-base/nodes/ItemLists/test/node/workflow.update_3.json
new file mode 100644
index 0000000000000..3bbd2517f8355
--- /dev/null
+++ b/packages/nodes-base/nodes/ItemLists/test/node/workflow.update_3.json
@@ -0,0 +1,606 @@
+{
+	"name": "itemList refactor",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "e7ecaa9c-e35d-4095-a85b-85b83f807c2a",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [420, 400]
+		},
+		{
+			"parameters": {
+				"operation": "getAllPeople",
+				"returnAll": true
+			},
+			"id": "7d925077-afaa-46d5-ba2f-0c19d93afecc",
+			"name": "Customer Datastore (n8n training)",
+			"type": "n8n-nodes-base.n8nTrainingCustomerDatastore",
+			"typeVersion": 1,
+			"position": [640, 400]
+		},
+		{
+			"parameters": {
+				"operation": "concatenateItems",
+				"fieldsToAggregate": {
+					"fieldToAggregate": [
+						{
+							"fieldToAggregate": "email"
+						},
+						{
+							"fieldToAggregate": "notes"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "f80182d8-54f6-4a26-82b3-27d67e4ca39b",
+			"name": "Item Lists1",
+			"type": "n8n-nodes-base.itemLists",
+			"typeVersion": 3,
+			"position": [1120, -120]
+		},
+		{
+			"parameters": {
+				"operation": "concatenateItems",
+				"aggregate": "aggregateAllItemData",
+				"destinationFieldName": "data2"
+			},
+			"id": "23eefe2c-6394-4b53-a791-852dcd671ea0",
+			"name": "Item Lists",
+			"type": "n8n-nodes-base.itemLists",
+			"typeVersion": 3,
+			"position": [1120, 40]
+		},
+		{
+			"parameters": {
+				"operation": "limit",
+				"maxItems": 2
+			},
+			"id": "676dc72f-9766-43c0-aab7-2f8a93ed46e5",
+			"name": "Item Lists2",
+			"type": "n8n-nodes-base.itemLists",
+			"typeVersion": 3,
+			"position": [1120, 200]
+		},
+		{
+			"parameters": {
+				"operation": "limit",
+				"keep": "lastItems"
+			},
+			"id": "9615299b-5acc-4459-a7d3-2cb23c3224ab",
+			"name": "Item Lists3",
+			"type": "n8n-nodes-base.itemLists",
+			"typeVersion": 3,
+			"position": [1120, 360]
+		},
+		{
+			"parameters": {
+				"operation": "sort",
+				"sortFieldsUi": {
+					"sortField": [
+						{
+							"fieldName": "country"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "fd2f190a-b161-48ff-93e1-0f30efce051a",
+			"name": "Item Lists4",
+			"type": "n8n-nodes-base.itemLists",
+			"typeVersion": 3,
+			"position": [1120, 540]
+		},
+		{
+			"parameters": {
+				"operation": "limit",
+				"maxItems": 4
+			},
+			"id": "14759521-76ad-46d8-8add-1d7361788fe1",
+			"name": "Item Lists5",
+			"type": "n8n-nodes-base.itemLists",
+			"typeVersion": 3,
+			"position": [1360, 540]
+		},
+		{
+			"parameters": {
+				"operation": "removeDuplicates",
+				"compare": "selectedFields",
+				"fieldsToCompare": "country",
+				"options": {}
+			},
+			"id": "c0eba4d0-f975-4987-8bb2-853e8a98665e",
+			"name": "Item Lists6",
+			"type": "n8n-nodes-base.itemLists",
+			"typeVersion": 3,
+			"position": [1560, 540]
+		},
+		{
+			"parameters": {
+				"operation": "concatenateItems",
+				"aggregate": "aggregateAllItemData",
+				"include": "specifiedFields",
+				"fieldsToInclude": "country, notes, name, created"
+			},
+			"id": "b5962f40-a891-4b02-8fec-c2d76f85375f",
+			"name": "Item Lists7",
+			"type": "n8n-nodes-base.itemLists",
+			"typeVersion": 3,
+			"position": [1120, 740]
+		},
+		{
+			"parameters": {
+				"fieldToSplitOut": "data",
+				"include": "allOtherFields",
+				"options": {
+					"destinationFieldName": "newData"
+				}
+			},
+			"id": "15c6fc86-7e38-4d76-836a-8f8426ca05e3",
+			"name": "Item Lists8",
+			"type": "n8n-nodes-base.itemLists",
+			"typeVersion": 3,
+			"position": [1380, 740]
+		},
+		{
+			"parameters": {
+				"operation": "summarize",
+				"fieldsToSummarize": {
+					"values": [
+						{
+							"aggregation": "append",
+							"field": "newData.notes"
+						},
+						{
+							"aggregation": "max",
+							"field": "newData.created"
+						},
+						{
+							"aggregation": "min",
+							"field": "newData.created"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "8c51ae57-487e-472a-b268-6e8ad347edbb",
+			"name": "Item Lists9",
+			"type": "n8n-nodes-base.itemLists",
+			"typeVersion": 3,
+			"position": [1560, 940]
+		},
+		{
+			"parameters": {},
+			"id": "e859b082-284c-4bb3-96b6-39a86152d8f6",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1760, -120]
+		},
+		{
+			"parameters": {},
+			"id": "9da56c21-739d-4f2f-adf7-953cf0550d97",
+			"name": "No Operation, do nothing1",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1760, 40]
+		},
+		{
+			"parameters": {},
+			"id": "f85ac031-24de-4701-bb3d-76c684924002",
+			"name": "No Operation, do nothing2",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1760, 200]
+		},
+		{
+			"parameters": {},
+			"id": "e7faff14-55d6-4d78-983d-027fd56bcd5a",
+			"name": "No Operation, do nothing3",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1760, 360]
+		},
+		{
+			"parameters": {},
+			"id": "dc8b7bbc-b1a8-4ba8-b214-d73341cb9f85",
+			"name": "No Operation, do nothing4",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1760, 740]
+		},
+		{
+			"parameters": {},
+			"id": "09bdeca1-6a9e-4668-b9d1-14ed6139e047",
+			"name": "No Operation, do nothing5",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1760, 540]
+		},
+		{
+			"parameters": {},
+			"id": "7d508889-d94e-4818-abc8-b669a0fe64ea",
+			"name": "No Operation, do nothing6",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1760, 940]
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"email": [
+						"gatsby@west-egg.com",
+						"jab@macondo.co",
+						"info@in-and-out-of-weeks.org",
+						"captain@heartofgold.com",
+						"edmund@narnia.gov"
+					],
+					"notes": [
+						"Keeps asking about a green light??",
+						"Lots of people named after him. Very confusing",
+						"Keeps rolling his terrible eyes",
+						"Felt like I was talking to more than one person",
+						"Passionate sailor"
+					]
+				}
+			}
+		],
+		"No Operation, do nothing1": [
+			{
+				"json": {
+					"data2": [
+						{
+							"id": "23423532",
+							"name": "Jay Gatsby",
+							"email": "gatsby@west-egg.com",
+							"notes": "Keeps asking about a green light??",
+							"country": "US",
+							"created": "1925-04-10"
+						},
+						{
+							"id": "23423533",
+							"name": "José Arcadio Buendía",
+							"email": "jab@macondo.co",
+							"notes": "Lots of people named after him. Very confusing",
+							"country": "CO",
+							"created": "1967-05-05"
+						},
+						{
+							"id": "23423534",
+							"name": "Max Sendak",
+							"email": "info@in-and-out-of-weeks.org",
+							"notes": "Keeps rolling his terrible eyes",
+							"country": "US",
+							"created": "1963-04-09"
+						},
+						{
+							"id": "23423535",
+							"name": "Zaphod Beeblebrox",
+							"email": "captain@heartofgold.com",
+							"notes": "Felt like I was talking to more than one person",
+							"country": null,
+							"created": "1979-10-12"
+						},
+						{
+							"id": "23423536",
+							"name": "Edmund Pevensie",
+							"email": "edmund@narnia.gov",
+							"notes": "Passionate sailor",
+							"country": "UK",
+							"created": "1950-10-16"
+						}
+					]
+				}
+			}
+		],
+		"No Operation, do nothing2": [
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10"
+				}
+			},
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05"
+				}
+			}
+		],
+		"No Operation, do nothing3": [
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16"
+				}
+			}
+		],
+		"No Operation, do nothing5": [
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05"
+				}
+			},
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16"
+				}
+			},
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10"
+				}
+			}
+		],
+		"No Operation, do nothing4": [
+			{
+				"json": {
+					"newData": {
+						"name": "Jay Gatsby",
+						"notes": "Keeps asking about a green light??",
+						"country": "US",
+						"created": "1925-04-10"
+					}
+				}
+			},
+			{
+				"json": {
+					"newData": {
+						"name": "José Arcadio Buendía",
+						"notes": "Lots of people named after him. Very confusing",
+						"country": "CO",
+						"created": "1967-05-05"
+					}
+				}
+			},
+			{
+				"json": {
+					"newData": {
+						"name": "Max Sendak",
+						"notes": "Keeps rolling his terrible eyes",
+						"country": "US",
+						"created": "1963-04-09"
+					}
+				}
+			},
+			{
+				"json": {
+					"newData": {
+						"name": "Zaphod Beeblebrox",
+						"notes": "Felt like I was talking to more than one person",
+						"country": null,
+						"created": "1979-10-12"
+					}
+				}
+			},
+			{
+				"json": {
+					"newData": {
+						"name": "Edmund Pevensie",
+						"notes": "Passionate sailor",
+						"country": "UK",
+						"created": "1950-10-16"
+					}
+				}
+			}
+		],
+		"No Operation, do nothing6": [
+			{
+				"json": {
+					"appended_newData_notes": [
+						"Keeps asking about a green light??",
+						"Lots of people named after him. Very confusing",
+						"Keeps rolling his terrible eyes",
+						"Felt like I was talking to more than one person",
+						"Passionate sailor"
+					],
+					"max_newData_created": "1979-10-12",
+					"min_newData_created": "1925-04-10"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Customer Datastore (n8n training)",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Customer Datastore (n8n training)": {
+			"main": [
+				[
+					{
+						"node": "Item Lists1",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Item Lists",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Item Lists2",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Item Lists3",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Item Lists4",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Item Lists7",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Item Lists1": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Item Lists4": {
+			"main": [
+				[
+					{
+						"node": "Item Lists5",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Item Lists5": {
+			"main": [
+				[
+					{
+						"node": "Item Lists6",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Item Lists7": {
+			"main": [
+				[
+					{
+						"node": "Item Lists8",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Item Lists8": {
+			"main": [
+				[
+					{
+						"node": "Item Lists9",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "No Operation, do nothing4",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Item Lists": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing1",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Item Lists2": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing2",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Item Lists3": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing3",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Item Lists6": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing5",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Item Lists9": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing6",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {},
+	"versionId": "ce3e0124-aa56-497c-a2e1-24158837c7f9",
+	"id": "m7QDuxo599dkZ0Ex",
+	"meta": {
+		"instanceId": "e34acda144ba98351e38adb4db781751ca8cd64a8248aef8b65608fc9a49008c"
+	},
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Iterable/GenericFunctions.ts b/packages/nodes-base/nodes/Iterable/GenericFunctions.ts
index 1b488ab5e7a28..7ecc3cae029fd 100644
--- a/packages/nodes-base/nodes/Iterable/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Iterable/GenericFunctions.ts
@@ -1,17 +1,16 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
+	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
-	IDataObject,
+	IRequestOptions,
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function iterableApiRequest(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -21,7 +20,7 @@ export async function iterableApiRequest(
 ): Promise<any> {
 	const credentials = await this.getCredentials('iterableApi');
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			'Content-Type': 'application/json',
 			Api_Key: credentials.apiKey,
@@ -49,7 +48,7 @@ export async function iterableApiRequest(
 export async function iterableApiRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: any = {},
diff --git a/packages/nodes-base/nodes/Iterable/Iterable.node.json b/packages/nodes-base/nodes/Iterable/Iterable.node.json
index 8c759c8017937..bcba64b39fc8c 100644
--- a/packages/nodes-base/nodes/Iterable/Iterable.node.json
+++ b/packages/nodes-base/nodes/Iterable/Iterable.node.json
@@ -2,7 +2,7 @@
 	"node": "n8n-nodes-base.iterable",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Communication", "Marketing & Content"],
+	"categories": ["Communication", "Marketing"],
 	"resources": {
 		"credentialDocumentation": [
 			{
diff --git a/packages/nodes-base/nodes/Iterable/Iterable.node.ts b/packages/nodes-base/nodes/Iterable/Iterable.node.ts
index e4d48b983afdc..ddc10590ba21d 100644
--- a/packages/nodes-base/nodes/Iterable/Iterable.node.ts
+++ b/packages/nodes-base/nodes/Iterable/Iterable.node.ts
@@ -10,6 +10,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
+import moment from 'moment-timezone';
 import { iterableApiRequest } from './GenericFunctions';
 
 import { eventFields, eventOperations } from './EventDescription';
@@ -18,8 +19,6 @@ import { userFields, userOperations } from './UserDescription';
 
 import { userListFields, userListOperations } from './UserListDescription';
 
-import moment from 'moment-timezone';
-
 export class Iterable implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Iterable',
diff --git a/packages/nodes-base/nodes/Jenkins/GenericFunctions.ts b/packages/nodes-base/nodes/Jenkins/GenericFunctions.ts
index 04e471bee6706..16bfe735b94b0 100644
--- a/packages/nodes-base/nodes/Jenkins/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Jenkins/GenericFunctions.ts
@@ -1,12 +1,11 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	JsonObject,
+	IRequestOptions,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
@@ -15,8 +14,8 @@ export function tolerateTrailingSlash(baseUrl: string) {
 }
 
 export async function jenkinsApiRequest(
-	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	uri: string,
 	qs: IDataObject = {},
 
@@ -24,7 +23,7 @@ export async function jenkinsApiRequest(
 	option: IDataObject = {},
 ): Promise<any> {
 	const credentials = await this.getCredentials('jenkinsApi');
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		headers: {
 			Accept: 'application/json',
 		},
diff --git a/packages/nodes-base/nodes/Jenkins/jenkins.svg b/packages/nodes-base/nodes/Jenkins/jenkins.svg
index ed609c41d5a19..59187b8c5701b 100644
--- a/packages/nodes-base/nodes/Jenkins/jenkins.svg
+++ b/packages/nodes-base/nodes/Jenkins/jenkins.svg
@@ -1,72 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="256px" height="417px" viewBox="0 0 256 417" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMidYMid">
-	<g>
-		<path d="M250.741085,169.277519 C250.741085,238.734884 195.671318,295.094574 127.702326,295.094574 C59.7333333,295.094574 4.66356589,238.734884 4.66356589,169.277519 C4.66356589,99.820155 59.7333333,43.4604651 127.702326,43.4604651 C195.671318,43.4604651 250.741085,99.820155 250.741085,169.277519" fill="#D33833"></path>
-		<path d="M9.72403101,200.434109 C9.72403101,200.434109 0.79379845,69.2589147 121.748837,65.4883721 L113.314729,51.3984496 L47.7271318,73.4263566 L28.9736434,94.9581395 L12.6015504,126.313178 L3.2744186,162.827907 L6.05271318,187.237209" fill="#EF3D3A"></path>
-		<path d="M43.4604651,83.448062 C21.9286822,105.575194 8.53333333,136.037209 8.53333333,169.773643 L8.53333333,169.773643 C8.53333333,203.510078 21.9286822,233.972093 43.4604651,256.099225 L43.4604651,256.099225 C65.0914729,278.226357 94.7596899,291.820155 127.702326,291.820155 L127.702326,291.820155 C160.644961,291.820155 190.313178,278.226357 211.944186,256.099225 L211.944186,256.099225 C233.475969,233.972093 246.871318,203.510078 246.871318,169.773643 L246.871318,169.773643 C246.871318,136.037209 233.475969,105.575194 211.944186,83.448062 L211.944186,83.448062 C190.313178,61.420155 160.644961,47.7271318 127.702326,47.7271318 L127.702326,47.7271318 C94.8589147,47.7271318 65.0914729,61.3209302 43.4604651,83.448062 L43.4604651,83.448062 L43.4604651,83.448062 Z M38.0031008,261.35814 C15.0821705,237.941085 0.893023256,205.494574 0.893023256,169.773643 L0.893023256,169.773643 C0.893023256,134.052713 15.0821705,101.606202 38.0031008,78.0899225 L38.0031008,78.0899225 C60.924031,54.6728682 92.675969,40.0868217 127.702326,40.0868217 L127.702326,40.0868217 C162.728682,40.0868217 194.48062,54.6728682 217.40155,78.0899225 L217.40155,78.0899225 C240.322481,101.506977 254.511628,133.953488 254.511628,169.773643 L254.511628,169.773643 C254.511628,205.494574 240.322481,237.941085 217.40155,261.35814 L217.40155,261.35814 C194.48062,284.874419 162.728682,299.36124 127.702326,299.36124 L127.702326,299.36124 C92.675969,299.36124 60.924031,284.874419 38.0031008,261.35814 L38.0031008,261.35814 L38.0031008,261.35814 Z" fill="#231F20"></path>
-		<path d="M179.497674,169.972093 L160.744186,172.750388 L135.44186,175.627907 L119.069767,176.024806 L103.094574,175.528682 L90.8899225,171.75814 L80.0744186,160.049612 L71.6403101,136.136434 L69.7550388,130.976744 L58.5426357,127.206202 L51.9937984,116.390698 L47.3302326,100.911628 L52.4899225,87.3178295 L64.6945736,83.0511628 L74.5178295,87.7147287 L79.1813953,98.0341085 L84.8372093,97.1410853 L86.7224806,94.7596899 L84.8372093,83.944186 L84.3410853,70.3503876 L87.1193798,51.5968992 L87.020155,40.8806202 L95.5534884,27.1875969 L110.536434,16.372093 L136.731783,5.15968992 L165.804651,9.42635659 L191.106977,27.6837209 L202.815504,46.4372093 L210.356589,60.0310078 L212.24186,93.7674419 L206.586047,122.84031 L196.266667,148.63876 L186.542636,162.431008" fill="#F0D6B7"></path>
-		<path d="M163.621705,251.03876 L96.6449612,253.817054 L96.6449612,265.029457 L102.300775,304.421705 L99.5224806,307.696124 L52.6883721,291.72093 L49.4139535,286.065116 L44.7503876,233.07907 L33.7364341,201.327132 L31.3550388,193.786047 L68.8620155,167.987597 L80.5705426,163.324031 L90.8899225,176.024806 L99.820155,183.962791 L110.139535,187.237209 L114.803101,188.626357 L120.458915,213.035659 L124.725581,218.195349 L135.541085,214.424806 L128,229.010853 L168.682171,248.260465 L163.621705,251.03876" fill="#335061"></path>
-		<path d="M52.4899225,87.5162791 L64.6945736,83.2496124 L74.5178295,87.9131783 L79.1813953,98.2325581 L84.8372093,97.3395349 L86.2263566,91.6837209 L83.448062,80.8682171 L86.2263566,55.0697674 L83.8449612,40.979845 L92.2790698,31.1565891 L110.536434,16.6697674 L105.376744,9.6248062 L79.5782946,22.3255814 L68.7627907,30.7596899 L62.7100775,43.8573643 L53.3829457,56.5581395 L50.6046512,71.5410853 L52.4899225,87.5162791" fill="#6D6B6D"></path>
-		<path d="M71.7395349,43.4604651 C71.7395349,43.4604651 78.7844961,26.096124 106.865116,17.6620155 C134.945736,9.22790698 108.254264,11.6093023 108.254264,11.6093023 L77.7922481,23.3178295 L66.0837209,35.0263566 L60.924031,44.3534884 L71.7395349,43.4604651" fill="#DCD9D8"></path>
-		<path d="M57.6496124,84.2418605 C57.6496124,84.2418605 47.8263566,51.3984496 85.3333333,46.7348837 L83.944186,41.0790698 L58.1457364,47.1317829 L50.6046512,71.5410853 L52.4899225,87.5162791 L57.6496124,84.2418605" fill="#DCD9D8"></path>
-		<path d="M72.6325581,127.80155 L78.7844961,121.848062 C78.7844961,121.848062 81.5627907,122.145736 82.0589147,125.420155 C82.5550388,128.694574 83.944186,158.263566 104.086822,174.139535 C105.972093,175.627907 89.103876,171.75814 89.103876,171.75814 L74.1209302,148.341085" fill="#F7E4CD"></path>
-		<path d="M158.858915,118.871318 C158.858915,118.871318 159.950388,104.682171 163.820155,105.773643 C167.689922,106.865116 167.689922,110.734884 167.689922,110.734884 C167.689922,110.734884 158.362791,116.688372 158.858915,118.871318" fill="#F7E4CD"></path>
-		<path d="M197.755039,66.8775194 C197.755039,66.8775194 190.015504,68.4651163 189.32093,75.3116279 C188.626357,82.1581395 197.755039,76.7007752 199.144186,76.2046512" fill="#F7E4CD"></path>
-		<path d="M141.097674,67.3736434 C141.097674,67.3736434 130.778295,68.7627907 130.778295,75.3116279 C130.778295,81.8604651 142.486822,81.3643411 145.76124,78.5860465" fill="#F7E4CD"></path>
-		<path d="M77.3953488,97.8356589 C77.3953488,97.8356589 59.6341085,87.020155 57.7488372,97.3395349 C55.8635659,107.658915 51.696124,115.100775 60.5271318,125.916279 L54.4744186,124.031008 L48.8186047,109.544186 L46.9333333,95.4542636 L57.7488372,84.2418605 L69.9534884,85.1348837 L76.9984496,90.7906977 L77.3953488,97.8356589" fill="#F7E4CD"></path>
-		<path d="M85.8294574,68.2666667 C85.8294574,68.2666667 93.7674419,26.9891473 134.052713,19.0511628 C167.193798,12.5023256 184.657364,20.4403101 191.206202,27.9813953 C191.206202,27.9813953 161.637209,-7.14418605 133.556589,3.57209302 C105.475969,14.3875969 84.8372093,34.0341085 85.3333333,46.6356589 C86.1271318,68.2666667 85.8294574,68.2666667 85.8294574,68.2666667" fill="#F7E4CD"></path>
-		<path d="M194.48062,32.6449612 C194.48062,32.6449612 180.886822,32.1488372 180.390698,44.3534884 C180.390698,44.3534884 180.390698,46.2387597 181.283721,48.124031 C181.283721,48.124031 192.099225,35.9193798 198.648062,42.4682171" fill="#F7E4CD"></path>
-		<path d="M135.044961,49.4139535 C135.044961,49.4139535 132.663566,30.7596899 116.787597,41.5751938 C106.468217,48.620155 107.460465,58.4434109 109.246512,60.3286822 C111.131783,62.2139535 110.635659,65.9844961 112.024806,63.4046512 C113.413953,60.8248062 113.017054,52.3906977 118.176744,50.0093023 C123.237209,47.627907 131.770543,45.048062 135.044961,49.4139535" fill="#F7E4CD"></path>
-		<path d="M90.9891473,176.024806 L46.9333333,195.671318 C46.9333333,195.671318 65.1906977,268.303876 55.8635659,290.827907 L49.3147287,288.446512 L48.8186047,260.762791 L36.6139535,208.372093 L31.4542636,193.885271 L77.3953488,162.927132 L90.9891473,176.024806" fill="#49728B"></path>
-		<path d="M95.4542636,216.210853 L101.705426,223.851163 L101.705426,251.931783 L94.2635659,251.931783 C94.2635659,251.931783 93.3705426,232.285271 93.3705426,229.903876 C93.3705426,227.522481 94.2635659,219.088372 94.2635659,219.088372" fill="#49728B"></path>
-		<path d="M95.6527132,256.19845 L74.5178295,257.091473 L80.5705426,261.35814 L95.5534884,263.739535" fill="#49728B"></path>
-		<path d="M167.789147,251.534884 L185.153488,251.03876 L189.420155,294.102326 L171.658915,296.483721 L167.789147,251.534884" fill="#335061"></path>
-		<path d="M172.452713,251.534884 L198.648062,250.145736 C198.648062,250.145736 209.463566,222.95814 209.463566,221.568992 C209.463566,220.179845 218.790698,182.176744 218.790698,182.176744 L197.655814,160.148837 L193.389147,156.378295 L182.176744,167.590698 L182.176744,211.150388 L172.452713,251.534884" fill="#335061"></path>
-		<path d="M184.16124,248.260465 L167.789147,251.534884 L170.170543,264.632558 C176.223256,267.410853 186.542636,259.968992 186.542636,259.968992" fill="#49728B"></path>
-		<path d="M184.657364,166.20155 L217.500775,190.610853 L218.393798,179.39845 L193.587597,156.477519 L184.657364,166.20155" fill="#49728B"></path>
-		<path d="M111.925581,343.813953 L102.20155,304.421705 L97.3395349,275.348837 L96.5457364,253.817054 L140.502326,251.435659 L167.789147,251.435659 L165.308527,300.651163 L169.575194,338.654264 L169.07907,345.699225 L133.457364,348.477519 L111.925581,343.813953" fill="#FFFFFF"></path>
-		<path d="M161.736434,251.03876 C161.736434,251.03876 159.355039,299.75814 166.4,334.486822 C166.4,334.486822 152.310078,343.417054 131.770543,345.699225 L171.162791,344.310078 L175.826357,341.531783 L170.170543,264.731783 L168.682171,248.260465" fill="#DCD9D8"></path>
-		<path d="M190.114729,290.431008 L208.372093,285.271318 L243.00155,283.386047 L248.16124,267.410853 L238.834109,239.727132 L228.018605,238.337984 L213.035659,243.00155 L198.747287,250.046512 L191.106977,248.657364 L185.153488,251.03876" fill="#FFFFFF"></path>
-		<path d="M189.817054,281.004651 C189.817054,281.004651 202.021705,275.348837 203.906977,275.844961 L198.747287,250.046512 L204.8,247.665116 C204.8,247.665116 209.066667,272.074419 209.066667,274.852713 C209.066667,274.852713 235.262016,276.24186 237.643411,276.24186 C237.643411,276.24186 243.299225,265.426357 241.910078,254.213953 L247.069767,269.196899 L247.565891,277.631008 L240.024806,288.843411 L231.590698,290.728682 L217.500775,290.232558 L212.837209,284.179845 L196.465116,286.56124 L191.305426,288.446512" fill="#DCD9D8"></path>
-		<path d="M171.36124,247.764341 L161.04186,221.568992 L150.226357,206.089922 C150.226357,206.089922 152.607752,199.541085 155.882171,199.541085 L166.697674,199.541085 L177.017054,203.311628 L176.124031,220.675969 L171.36124,247.764341" fill="#FFFFFF"></path>
-		<path d="M173.444961,238.834109 C173.444961,238.834109 160.347287,213.531783 160.347287,209.76124 C160.347287,209.76124 162.728682,204.105426 166.003101,205.494574 C169.277519,206.883721 176.322481,210.654264 176.322481,210.654264 L176.322481,201.724031 L160.347287,198.449612 L149.531783,199.83876 L167.789147,243.100775 L171.55969,243.596899" fill="#DCD9D8"></path>
-		<path d="M116.093023,177.017054 L103.094574,175.627907 L90.8899225,171.857364 L90.8899225,176.124031 L96.8434109,182.672868 L115.596899,191.106977" fill="#FFFFFF"></path>
-		<path d="M95.1565891,178.406202 C95.1565891,178.406202 109.643411,184.458915 114.406202,183.069767 L114.902326,188.725581 L101.804651,185.947287 L93.8666667,180.291473 L95.1565891,178.406202" fill="#DCD9D8"></path>
-		<path d="M190.114729,201.128682 C182.176744,200.930233 174.933333,199.937984 168.682171,198.151938 C169.07907,195.572093 168.285271,193.091473 168.979845,191.206202 C170.765891,189.916279 173.643411,189.916279 176.322481,189.618605 C174.04031,188.527132 170.765891,188.031008 168.186047,188.725581 C168.086822,186.939535 167.293023,185.848062 166.796899,184.458915 C171.262016,182.871318 181.779845,172.452713 187.733333,175.826357 C190.610853,177.513178 191.80155,186.84031 192,191.503876 C192.19845,195.274419 191.603101,199.044961 190.114729,201.128682" fill="#D33833"></path>
-		<path d="M190.114729,201.128682 C182.176744,200.930233 174.933333,199.937984 168.682171,198.151938 C169.07907,195.572093 168.285271,193.091473 168.979845,191.206202 C170.765891,189.916279 173.643411,189.916279 176.322481,189.618605 C174.04031,188.527132 170.765891,188.031008 168.186047,188.725581 C168.086822,186.939535 167.293023,185.848062 166.796899,184.458915 C171.262016,182.871318 181.779845,172.452713 187.733333,175.826357 C190.610853,177.513178 191.80155,186.84031 192,191.503876 C192.19845,195.274419 191.603101,199.044961 190.114729,201.128682 L190.114729,201.128682 Z" stroke="#D33833" stroke-width="2"></path>
-		<path d="M152.111628,188.130233 C152.111628,188.725581 152.111628,189.32093 152.012403,189.916279 C149.531783,191.503876 145.562791,191.503876 142.784496,192.893023 C146.753488,193.091473 149.928682,194.083721 152.706977,195.373643 C152.607752,196.862016 152.607752,198.449612 152.508527,199.937984 C147.944186,203.013953 143.776744,207.677519 138.418605,210.654264 C135.83876,212.043411 127.007752,215.615504 124.328682,214.92093 C122.84031,214.524031 122.64186,212.63876 122.046512,210.852713 C120.756589,207.082171 117.779845,200.930233 117.482171,195.175194 C117.184496,187.931783 116.390698,175.727132 124.229457,177.215504 C130.579845,178.406202 137.922481,181.283721 142.784496,183.962791 C145.860465,185.748837 147.547287,187.733333 152.111628,188.130233" fill="#D33833"></path>
-		<path d="M152.111628,188.130233 C152.111628,188.725581 152.111628,189.32093 152.012403,189.916279 C149.531783,191.503876 145.562791,191.503876 142.784496,192.893023 C146.753488,193.091473 149.928682,194.083721 152.706977,195.373643 C152.607752,196.862016 152.607752,198.449612 152.508527,199.937984 C147.944186,203.013953 143.776744,207.677519 138.418605,210.654264 C135.83876,212.043411 127.007752,215.615504 124.328682,214.92093 C122.84031,214.524031 122.64186,212.63876 122.046512,210.852713 C120.756589,207.082171 117.779845,200.930233 117.482171,195.175194 C117.184496,187.931783 116.390698,175.727132 124.229457,177.215504 C130.579845,178.406202 137.922481,181.283721 142.784496,183.962791 C145.860465,185.748837 147.547287,187.733333 152.111628,188.130233 L152.111628,188.130233 Z" stroke="#D33833" stroke-width="2"></path>
-		<path d="M156.576744,196.762791 C155.882171,192.793798 155.088372,191.702326 155.386047,188.229457 C166.003101,181.184496 167.888372,200.334884 156.576744,196.762791" fill="#D33833"></path>
-		<path d="M156.576744,196.762791 C155.882171,192.793798 155.088372,191.702326 155.386047,188.229457 C166.003101,181.184496 167.888372,200.334884 156.576744,196.762791 L156.576744,196.762791 Z" stroke="#D33833" stroke-width="2"></path>
-		<path d="M171.857364,199.937984 C171.857364,199.937984 168.582946,195.274419 170.964341,193.885271 C173.345736,192.496124 175.627907,193.885271 177.017054,191.503876 C178.406202,189.122481 177.017054,187.733333 177.513178,184.955039 C178.009302,182.176744 180.291473,181.68062 182.672868,181.184496 C185.054264,180.688372 191.603101,179.795349 192.496124,182.077519 L189.717829,173.643411 L184.062016,171.75814 L166.300775,182.077519 L165.407752,187.237209 L165.407752,197.556589" fill="#EF3D3A"></path>
-		<path d="M122.64186,215.417054 C122.046512,208.074419 121.451163,200.831008 120.855814,193.488372 C119.863566,182.573643 123.435659,184.458915 132.96124,184.458915 C134.449612,184.458915 141.891473,186.145736 142.387597,187.237209 C144.967442,192.496124 138.12093,191.305426 145.364341,195.274419 C151.417054,198.548837 162.232558,193.289922 159.751938,185.848062 C158.362791,184.16124 152.607752,185.351938 150.524031,184.260465 C146.852713,182.375194 143.181395,180.489922 139.510078,178.604651 C134.846512,176.223256 124.130233,172.651163 119.168992,176.024806 C106.567442,184.55814 119.962791,205.990698 124.427907,214.92093" fill="#EF3D3A"></path>
-		<path d="M135.044961,49.4139535 C122.244961,46.4372093 115.894574,54.772093 112.024806,63.4046512 C108.551938,62.6108527 109.941085,57.848062 110.834109,55.4666667 C113.116279,49.2155039 122.344186,40.7813953 129.885271,41.972093 C133.060465,42.3689922 137.426357,45.3457364 135.044961,49.4139535" fill="#231F20"></path>
-		<path d="M197.258915,63.9007752 L197.854264,63.9007752 C200.731783,69.8542636 203.212403,76.2046512 206.883721,81.5627907 C204.403101,87.3178295 188.427907,92.2790698 188.626357,82.1581395 C192.099225,80.6697674 198.052713,81.8604651 201.128682,79.875969 C199.342636,75.0139535 196.862016,70.8465116 197.258915,63.9007752" fill="#231F20"></path>
-		<path d="M141.494574,64.0992248 C144.272868,69.1596899 145.165891,74.4186047 149.035659,78.1891473 C150.821705,79.875969 154.195349,81.9596899 152.508527,86.7224806 C152.111628,87.8139535 149.234109,90.2945736 147.547287,90.7906977 C141.494574,92.5767442 127.305426,91.1875969 132.068217,83.5472868 C137.128682,83.7457364 143.875969,86.8217054 147.646512,83.1503876 C144.768992,78.5860465 139.609302,69.4573643 141.494574,64.0992248" fill="#231F20"></path>
-		<path d="M194.976744,115.100775 C185.848062,120.955039 175.627907,127.404651 160.545736,125.916279 C157.370543,123.137984 156.08062,116.886822 159.255814,112.818605 C160.843411,115.596899 159.851163,120.756589 164.415504,121.550388 C172.948837,123.03876 182.871318,116.291473 189.023256,114.009302 C192.793798,107.55969 188.725581,105.277519 185.252713,101.110078 C178.207752,92.675969 168.88062,82.1581395 169.178295,69.5565891 C172.055814,67.4728682 172.254264,72.7317829 172.651163,73.6248062 C176.322481,82.1581395 185.550388,93.172093 192.19845,100.514729 C193.885271,102.300775 196.564341,104.086822 196.862016,105.277519 C197.755039,108.651163 194.579845,112.818605 194.976744,115.100775" fill="#231F20"></path>
-		<path d="M74.1209302,108.948837 C71.2434109,107.262016 70.5488372,100.117829 67.1751938,99.9193798 C62.3131783,99.6217054 63.2062016,109.246512 63.2062016,114.902326 C59.9317829,111.925581 59.3364341,102.59845 61.7178295,97.8356589 C58.9395349,96.4465116 57.7488372,99.324031 56.1612403,100.316279 C58.2449612,85.9286822 77.296124,93.6682171 74.1209302,108.948837" fill="#231F20"></path>
-		<path d="M200.731783,121.153488 C196.465116,129.289922 190.412403,138.220155 177.910078,138.517829 C177.612403,135.937984 177.413953,131.869767 177.910078,130.282171 C187.534884,129.289922 193.488372,124.427907 200.731783,121.153488" fill="#231F20"></path>
-		<path d="M140.8,126.412403 C148.737984,130.579845 163.423256,131.075969 174.337984,130.778295 C174.933333,133.15969 174.933333,136.136434 174.933333,139.013953 C160.942636,139.609302 144.471318,136.136434 140.8,126.412403" fill="#231F20"></path>
-		<path d="M139.311628,134.151938 C144.868217,148.043411 163.820155,146.455814 179.795349,146.058915 C179.100775,147.844961 177.612403,150.027907 175.627907,150.722481 C170.468217,152.806202 156.378295,154.393798 149.234109,150.623256 C144.768992,148.24186 141.792248,142.784496 139.311628,139.609302 C138.220155,138.12093 132.266667,134.251163 139.311628,134.151938" fill="#231F20"></path>
-		<path d="M194.282171,210.654264 C187.832558,221.767442 181.581395,233.178295 173.941085,242.902326 C177.116279,233.475969 178.505426,217.6 179.00155,205.494574 C185.748837,202.31938 191.503876,206.189147 194.282171,210.654264" fill="#81B0C4"></path>
-		<path d="M229.110078,250.542636 C221.866667,252.031008 216.806202,259.075969 209.662016,258.579845 C213.631008,253.122481 220.378295,250.741085 229.110078,250.542636" fill="#231F20"></path>
-		<path d="M232.285271,261.854264 C226.331783,262.449612 219.386047,263.44186 213.432558,262.945736 C216.310078,258.579845 227.224806,260.167442 232.285271,261.854264" fill="#231F20"></path>
-		<path d="M234.368992,271.677519 C227.72093,271.776744 219.485271,271.677519 213.134884,271.181395 C216.905426,267.113178 230.102326,269.693023 234.368992,271.677519" fill="#231F20"></path>
-		<path d="M181.779845,298.468217 C182.772093,306.803101 186.046512,315.237209 185.649612,324.365891 C181.978295,325.556589 179.894574,326.648062 174.933333,326.648062 C174.635659,318.908527 173.544186,307.00155 173.84186,299.55969 C176.223256,299.75814 179.795349,297.872868 181.779845,298.468217" fill="#DCD9D8"></path>
-		<path d="M171.063566,175.429457 C167.689922,177.612403 164.911628,180.291473 161.637209,182.672868 C154.493023,183.069767 150.623256,182.176744 145.463566,178.108527 C145.562791,177.810853 146.058915,177.910078 146.058915,177.513178 C153.699225,180.886822 163.423256,176.124031 171.063566,175.429457" fill="#F0D6B7"></path>
-		<path d="M131.175194,227.324031 C133.258915,218.294574 141.494574,213.531783 148.936434,208.570543 C156.576744,218.294574 161.24031,230.796899 166.4,242.902326 C154.195349,239.231008 141.792248,233.376744 131.175194,227.324031" fill="#81B0C4"></path>
-		<path d="M173.84186,299.658915 C173.544186,307.100775 174.536434,318.908527 174.933333,326.747287 C179.894574,326.747287 181.978295,325.655814 185.649612,324.465116 C186.046512,315.336434 182.772093,306.902326 181.779845,298.567442 C179.795349,297.872868 176.223256,299.75814 173.84186,299.658915 L173.84186,299.658915 Z M97.2403101,257.587597 C100.514729,287.454264 105.178295,312.458915 113.810853,338.951938 C132.96124,344.806202 155.981395,345.302326 172.948837,340.043411 C169.872868,325.15969 171.162791,307.00155 169.376744,291.026357 C167.987597,279.020155 168.682171,267.013953 166.796899,254.809302 C146.257364,250.542636 117.283721,253.817054 97.2403101,257.587597 L97.2403101,257.587597 Z M171.658915,255.007752 C171.460465,267.807752 172.254264,280.508527 173.246512,293.308527 C178.207752,292.613953 181.482171,292.117829 186.046512,291.026357 C184.55814,278.722481 184.756589,264.731783 181.68062,253.817054 C178.207752,253.916279 175.131783,253.817054 171.658915,255.007752 L171.658915,255.007752 Z M196.564341,252.924031 C194.182946,252.427907 191.503876,252.924031 189.32093,252.924031 C190.412403,263.342636 192.893023,274.852713 193.786047,285.866667 C197.258915,285.965891 199.144186,284.27907 202.021705,283.782946 C202.220155,274.15814 201.227907,260.862016 196.564341,252.924031 L196.564341,252.924031 L196.564341,252.924031 Z M234.368992,287.454264 C241.711628,285.668217 246.275969,276.737984 244.192248,267.510078 C242.803101,261.35814 240.421705,249.649612 237.742636,245.68062 C235.857364,242.803101 230.59845,238.933333 226.331783,241.612403 C219.485271,245.978295 207.47907,247.268217 202.517829,252.527132 C204.99845,260.862016 205.792248,272.173643 206.784496,282.691473 C215.317829,283.187597 225.736434,280.310078 232.88062,283.386047 C227.91938,284.973643 221.568992,284.973643 217.302326,287.355039 C220.874419,289.04186 229.010853,288.744186 234.368992,287.454264 L234.368992,287.454264 L234.368992,287.454264 Z M166.300775,242.902326 C161.141085,230.796899 156.477519,218.294574 148.837209,208.570543 C141.395349,213.531783 133.258915,218.294574 131.075969,227.324031 C141.792248,233.376744 154.195349,239.231008 166.300775,242.902326 L166.300775,242.902326 Z M179.00155,205.494574 C178.505426,217.6 177.116279,233.475969 173.941085,242.902326 C181.581395,233.07907 187.832558,221.767442 194.282171,210.654264 C191.503876,206.189147 185.748837,202.31938 179.00155,205.494574 L179.00155,205.494574 Z M164.613953,200.434109 C161.736434,200.136434 159.255814,203.807752 155.485271,202.220155 C154.592248,203.212403 153.79845,204.204651 152.905426,205.196899 C161.24031,215.317829 165.110078,229.606202 171.55969,241.413953 C175.032558,230.003101 174.635659,217.6 175.429457,205.196899 C170.666667,205.395349 167.987597,200.731783 164.613953,200.434109 L164.613953,200.434109 Z M155.386047,188.229457 C155.088372,191.702326 155.882171,192.793798 156.576744,196.762791 C167.888372,200.334884 166.003101,181.184496 155.386047,188.229457 L155.386047,188.229457 Z M142.784496,184.062016 C137.922481,181.382946 130.579845,178.505426 124.229457,177.314729 C116.390698,175.826357 117.184496,188.031008 117.482171,195.274419 C117.779845,201.029457 120.756589,207.082171 122.046512,210.951938 C122.64186,212.737984 122.84031,214.623256 124.328682,215.020155 C127.007752,215.615504 135.937984,212.142636 138.418605,210.753488 C143.776744,207.875969 147.944186,203.212403 152.508527,200.037209 C152.607752,198.548837 152.607752,196.96124 152.706977,195.472868 C149.928682,194.083721 146.852713,193.190698 142.784496,192.992248 C145.463566,191.603101 149.531783,191.603101 152.012403,190.015504 C152.012403,189.420155 152.012403,188.824806 152.111628,188.229457 C147.547287,187.733333 145.860465,185.748837 142.784496,184.062016 L142.784496,184.062016 Z M96.1488372,175.627907 C92.0806202,179.795349 107.55969,185.351938 112.421705,185.649612 C112.421705,183.069767 113.910078,180.589147 113.612403,178.703876 C107.75814,177.711628 100.117829,178.406202 96.1488372,175.627907 L96.1488372,175.627907 Z M146.15814,177.513178 C146.15814,177.910078 145.662016,177.810853 145.562791,178.108527 C150.821705,182.176744 154.691473,183.069767 161.736434,182.672868 C164.911628,180.390698 167.789147,177.612403 171.162791,175.429457 C163.423256,176.124031 153.699225,180.886822 146.15814,177.513178 L146.15814,177.513178 Z M192,191.404651 C191.80155,186.84031 190.610853,177.413953 187.733333,175.727132 C181.779845,172.254264 171.262016,182.772093 166.796899,184.35969 C167.293023,185.748837 168.086822,186.84031 168.186047,188.626357 C170.865116,187.931783 174.04031,188.427907 176.322481,189.51938 C173.643411,189.817054 170.765891,189.817054 168.979845,191.106977 C168.384496,192.992248 169.178295,195.472868 168.682171,198.052713 C174.933333,199.83876 182.176744,200.731783 190.114729,201.029457 C191.603101,199.044961 192.19845,195.274419 192,191.404651 L192,191.404651 Z M89.3023256,179.596899 C88.0124031,178.703876 79.379845,167.491473 78.1891473,167.987597 C62.6108527,174.139535 48.0248062,184.756589 35.0263566,194.877519 C47.4294574,221.568992 52.4899225,254.213953 53.3829457,285.668217 C67.572093,292.316279 80.0744186,301.941085 99.4232558,302.933333 C97.1410853,287.156589 95.1565891,272.967442 93.8666667,258.083721 C89.0046512,256 82.0589147,258.182946 77.4945736,257.488372 C77.4945736,252.031008 84.4403101,255.106977 85.0356589,251.435659 C85.4325581,248.657364 81.1658915,248.458915 82.5550388,244.093023 C86.1271318,245.382946 88.0124031,248.260465 91.7829457,249.351938 C95.255814,241.810853 91.7829457,228.415504 92.2790698,222.065116 C92.3782946,220.874419 92.8744186,215.516279 95.5534884,216.409302 C97.9348837,217.203101 95.4542636,230.796899 95.6527132,236.750388 C95.8511628,242.306977 94.9581395,247.565891 97.2403101,251.03876 C115.894574,248.458915 134.846512,246.871318 155.088372,246.275969 C150.623256,244.390698 145.364341,242.604651 139.609302,239.330233 C136.434109,237.544186 126.610853,233.872868 125.717829,230.896124 C124.229457,226.133333 129.488372,223.652713 130.381395,219.584496 C120.955039,224.744186 119.168992,214.623256 116.886822,207.578295 C114.902326,201.128682 113.711628,196.266667 113.215504,192.595349 C104.979845,188.427907 96.248062,184.55814 89.3023256,179.596899 L89.3023256,179.596899 L89.3023256,179.596899 Z M183.764341,169.277519 C196.762791,163.026357 199.144186,192.793798 193.984496,202.418605 C194.778295,205.296124 197.457364,206.387597 198.548837,208.967442 C191.305426,221.965891 183.268217,234.071318 175.826357,246.871318 C181.283721,243.39845 189.221705,246.275969 195.671318,243.696124 C198.052713,242.803101 199.739535,237.345736 201.525581,232.979845 C206.486822,221.072868 211.646512,205.990698 213.928682,194.67907 C214.424806,192.099225 215.913178,186.443411 215.516279,184.16124 C214.92093,179.993798 209.364341,176.917829 206.486822,174.437209 C201.227907,169.674419 197.953488,165.606202 192.396899,161.141085 C190.313178,164.415504 185.550388,166.59845 183.764341,169.277519 L183.764341,169.277519 L183.764341,169.277519 Z M59.6341085,54.0775194 C53.4821705,60.924031 54.772093,73.6248062 55.4666667,82.7534884 C66.6790698,75.7085271 81.4635659,83.3488372 81.3643411,95.255814 C86.7224806,95.1565891 83.3488372,88.6077519 82.3565891,84.3410853 C79.1813953,70.5488372 87.7147287,55.6651163 82.7534884,43.0635659 C73.1286822,43.8573643 65.2899225,47.7271318 59.6341085,54.0775194 L59.6341085,54.0775194 L59.6341085,54.0775194 Z M103.888372,14.4868217 C89.8976744,18.455814 71.9379845,28.675969 66.1829457,41.2775194 C70.648062,40.5829457 73.724031,38.4 78.0899225,38.1023256 C79.7767442,38.0031008 81.9596899,38.7968992 83.8449612,38.3007752 C87.6155039,37.3085271 90.8899225,28.7751938 93.7674419,25.6 C96.5457364,22.524031 99.9193798,21.1348837 102.20155,18.3565891 C103.689922,17.6620155 105.872868,17.6620155 105.972093,15.4790698 C105.376744,14.7844961 104.682171,14.2883721 103.888372,14.4868217 L103.888372,14.4868217 Z M176.818605,18.2573643 C162.232558,10.0217054 137.624806,3.86976744 122.145736,11.6093023 C109.643411,17.8604651 92.7751938,28.179845 87.020155,41.1782946 C92.3782946,53.779845 85.4325581,65.2899225 84.9364341,78.0899225 C84.7379845,84.9364341 88.1116279,90.7906977 88.4093023,98.2325581 C86.524031,101.308527 80.9674419,101.606202 77.0976744,101.407752 C75.8077519,94.8589147 73.5255814,87.5162791 66.7782946,86.7224806 C57.2527132,85.6310078 50.2077519,93.5689922 49.8108527,101.804651 C49.3147287,111.528682 57.2527132,127.603101 68.5643411,126.511628 C72.9302326,126.114729 74.0217054,121.748837 78.7844961,121.748837 C81.3643411,126.908527 74.8155039,128.496124 74.1209302,132.167442 C73.9224806,133.15969 74.6170543,136.831008 75.1131783,138.617054 C77.1968992,147.051163 81.7612403,158.065116 86.2263566,164.514729 C91.9813953,172.750388 103.193798,173.941085 115.299225,174.734884 C117.482171,170.071318 125.420155,170.468217 130.579845,171.658915 C124.328682,169.178295 118.573643,163.224806 113.810853,157.965891 C108.353488,151.913178 102.796899,145.463566 102.499225,137.525581 C112.917829,151.913178 121.451163,164.514729 140.303876,170.865116 C154.592248,175.627907 171.262016,168.682171 182.275969,160.942636 C186.84031,157.767442 189.51938,152.607752 192.793798,148.043411 C204.899225,130.579845 210.555039,105.773643 209.364341,81.6620155 C208.868217,71.7395349 208.868217,61.8170543 205.494574,55.1689922 C202.021705,48.2232558 190.213953,41.8728682 183.268217,48.2232558 C181.978295,41.3767442 189.023256,37.2093023 197.258915,39.6899225 C191.404651,32.0496124 185.252713,23.020155 176.818605,18.2573643 L176.818605,18.2573643 L176.818605,18.2573643 Z M204.006202,242.604651 C215.417054,236.948837 236.651163,227.423256 243.696124,242.604651 C246.375194,248.260465 249.451163,257.686822 250.741085,263.541085 C252.626357,271.677519 248.657364,288.942636 240.223256,291.621705 C232.781395,294.003101 224.148837,293.903876 215.218605,292.117829 C214.127132,291.224806 213.035659,289.736434 212.142636,288.148837 C205.792248,287.950388 199.739535,288.446512 194.778295,291.125581 C195.274419,295.888372 192.099225,296.582946 189.023256,297.575194 C186.84031,306.406202 193.488372,317.916279 191.900775,325.854264 C190.809302,331.609302 183.764341,332.502326 178.604651,333.494574 C178.406202,336.669767 178.803101,339.348837 179.2,342.027907 C178.009302,346.393798 172.750388,348.874419 167.689922,349.469767 C151.11938,351.454264 126.015504,352.347287 110.139535,346.592248 C105.674419,335.677519 102.20155,322.48062 98.5302326,310.077519 C83.0511628,311.764341 70.4496124,303.429457 58.6418605,297.872868 C54.5736434,295.987597 48.9178295,294.896124 47.3302326,291.621705 C45.8418605,288.446512 46.4372093,282.393798 46.0403101,276.737984 C45.1472868,262.151938 44.2542636,248.062016 40.4837209,233.178295 C38.7968992,226.431008 35.7209302,220.576744 33.6372093,214.127132 C31.6527132,208.173643 28.2790698,200.731783 27.3860465,194.778295 C26.096124,185.947287 34.4310078,185.451163 39.6899225,181.581395 C47.9255814,175.627907 54.3751938,172.353488 63.3054264,166.995349 C65.9844961,165.407752 73.9224806,161.43876 74.8155039,159.553488 C76.6015504,155.882171 71.7395349,150.722481 70.4496124,147.844961 C68.3658915,143.28062 67.2744186,139.410853 66.9767442,134.945736 C59.5348837,133.755039 53.779845,129.289922 50.4062016,124.328682 C44.7503876,115.993798 40.7813953,100.613953 45.7426357,89.0046512 C46.1395349,88.1116279 48.0248062,86.2263566 48.3224806,84.8372093 C48.9178295,82.0589147 47.2310078,78.3875969 47.1317829,75.4108527 C46.6356589,60.2294574 49.7116279,47.1317829 59.9317829,42.5674419 C64.0992248,25.9968992 78.9829457,20.5395349 92.9736434,12.303876 C98.2325581,9.22790698 103.987597,7.24341085 109.941085,5.06046512 C131.274419,-2.77829457 164.117829,-1.28992248 181.87907,12.1054264 C189.420155,17.7612403 201.426357,29.7674419 205.693023,38.4992248 C217.103876,61.420155 216.210853,99.820155 208.272868,127.80155 C207.181395,131.572093 205.693023,137.029457 203.510078,141.593798 C202.021705,144.768992 197.35814,151.020155 197.854264,153.79845 C198.449612,156.675969 208.570543,164.316279 210.753488,166.4 C214.623256,170.170543 222.065116,175.131783 222.660465,179.894574 C223.355039,184.955039 220.477519,191.900775 218.989147,196.762791 C214.226357,213.035659 209.463566,228.018605 204.006202,242.604651 L204.006202,242.604651 Z" fill="#231F20"></path>
-		<path d="M128.099225,129.885271 C128.694574,129.091473 132.068217,127.80155 136.831008,130.083721 C136.831008,130.083721 131.175194,130.976744 131.671318,140.403101 L129.289922,139.906977 C129.389147,140.006202 126.908527,131.472868 128.099225,129.885271" fill="#F7E4CD"></path>
-		<path d="M169.178295,210.455814 C169.178295,211.844961 167.987597,213.035659 166.59845,213.035659 C165.209302,213.035659 164.018605,211.844961 164.018605,210.455814 C164.018605,209.066667 165.209302,207.875969 166.59845,207.875969 C168.086822,207.875969 169.178295,209.066667 169.178295,210.455814" fill="#1D1919"></path>
-		<path d="M171.75814,222.462016 C171.75814,223.851163 170.567442,225.04186 169.178295,225.04186 C167.789147,225.04186 166.59845,223.851163 166.59845,222.462016 C166.59845,221.072868 167.789147,219.882171 169.178295,219.882171 C170.666667,219.882171 171.75814,220.973643 171.75814,222.462016" fill="#1D1919"></path>
-		<g transform="translate(0.992248, 367.131783)" fill="#231F20">
-			<path d="M35.6217054,7.14418605 C34.827907,7.24341085 34.1333333,7.34263566 33.5379845,7.44186047 C32.9426357,7.54108527 32.3472868,7.64031008 31.5534884,7.83875969 C30.6604651,8.0372093 30.1643411,8.43410853 29.9658915,9.02945736 C29.7674419,9.6248062 29.5689922,10.220155 29.5689922,11.0139535 L29.5689922,35.2248062 C29.5689922,37.4077519 29.0728682,39.4914729 28.179845,41.3767442 C27.2868217,43.2620155 26.096124,44.7503876 24.5085271,46.0403101 C22.9209302,47.2310078 21.1348837,48.2232558 19.1503876,48.8186047 C17.1658915,49.4139535 15.0821705,49.8108527 12.8992248,49.8108527 C9.02945736,49.8108527 5.95348837,48.9178295 3.57209302,47.0325581 C1.19069767,45.1472868 0,42.6666667 0,39.3922481 C0,37.5069767 0.496124031,35.9193798 1.5875969,34.6294574 C2.67906977,33.3395349 4.16744186,32.744186 6.05271318,32.744186 C7.83875969,32.744186 9.22790698,33.2403101 10.3193798,34.3317829 C11.4108527,35.4232558 11.9069767,36.7131783 11.9069767,38.2015504 C11.9069767,39.4914729 11.4108527,40.7813953 10.5178295,41.8728682 C9.6248062,42.9643411 8.53333333,44.055814 7.34263566,44.9488372 L7.34263566,45.3457364 C7.54108527,45.7426357 7.9379845,46.1395349 8.53333333,46.4372093 C9.12868217,46.7348837 9.82325581,46.8341085 10.4186047,46.8341085 C12.8992248,46.8341085 14.8837209,45.9410853 16.2728682,44.1550388 C17.6620155,42.3689922 18.3565891,39.6899225 18.3565891,36.1178295 L18.3565891,11.3116279 C18.3565891,10.6170543 18.2573643,9.92248062 18.0589147,9.42635659 C17.8604651,8.93023256 17.2651163,8.53333333 16.372093,8.13643411 C15.7767442,7.83875969 14.9829457,7.64031008 14.0899225,7.44186047 C13.1968992,7.24341085 12.5023256,7.14418605 11.9069767,7.04496124 L11.9069767,4.66356589 L35.324031,4.66356589 L35.324031,7.14418605 L35.6217054,7.14418605 Z"></path>
-			<path d="M72.3348837,41.2775194 C71.6403101,42.4682171 70.7472868,43.5596899 69.7550388,44.6511628 C68.7627907,45.7426357 67.572093,46.5364341 66.2821705,47.3302326 C64.8930233,48.124031 63.503876,48.7193798 62.1147287,49.1162791 C60.7255814,49.5131783 59.0387597,49.7116279 57.2527132,49.7116279 C54.1767442,49.7116279 51.5968992,49.3147287 49.3147287,48.4217054 C47.1317829,47.5286822 45.2465116,46.4372093 43.8573643,44.9488372 C42.3689922,43.4604651 41.3767442,41.7736434 40.5829457,39.7891473 C39.8883721,37.8046512 39.4914729,35.6217054 39.4914729,33.3395349 C39.4914729,31.255814 39.8883721,29.172093 40.6821705,27.2868217 C41.475969,25.4015504 42.5674419,23.6155039 43.9565891,22.1271318 C45.3457364,20.6387597 47.1317829,19.448062 49.3147287,18.5550388 C51.4976744,17.6620155 53.8790698,17.1658915 56.4589147,17.1658915 C59.3364341,17.1658915 61.7178295,17.5627907 63.6031008,18.2573643 C65.4883721,18.951938 66.9767442,19.944186 68.1674419,21.1348837 C69.3581395,22.3255814 70.151938,23.7147287 70.7472868,25.3023256 C71.2434109,26.8899225 71.5410853,28.5767442 71.5410853,30.3627907 L71.5410853,32.3472868 L50.6046512,32.3472868 C50.6046512,36.6139535 51.3984496,39.7891473 53.0852713,41.972093 C54.6728682,44.1550388 57.351938,45.2465116 60.8248062,45.2465116 C62.8093023,45.2465116 64.496124,44.7503876 66.0837209,43.6589147 C67.6713178,42.5674419 68.9612403,41.2775194 70.0527132,39.5906977 L72.3348837,41.2775194 L72.3348837,41.2775194 Z M60.5271318,29.4697674 C60.5271318,28.2790698 60.427907,26.9891473 60.3286822,25.6992248 C60.2294574,24.4093023 60.0310078,23.3178295 59.6341085,22.524031 C59.2372093,21.5317829 58.8403101,20.8372093 58.1457364,20.3410853 C57.5503876,19.8449612 56.7565891,19.6465116 55.8635659,19.6465116 C54.275969,19.6465116 52.9860465,20.4403101 52.0930233,22.027907 C51.1007752,23.6155039 50.6046512,26.1953488 50.5054264,29.6682171 L60.5271318,29.4697674 L60.5271318,29.4697674 Z"></path>
-			<path d="M116.093023,48.620155 L97.4387597,48.620155 L97.4387597,46.3379845 C97.8356589,46.3379845 98.3317829,46.2387597 98.827907,46.1395349 C99.4232558,46.0403101 99.820155,45.9410853 100.117829,45.8418605 C100.514729,45.6434109 100.812403,45.2465116 101.010853,44.8496124 C101.209302,44.4527132 101.308527,43.7581395 101.308527,42.9643411 L101.308527,28.4775194 C101.308527,26.3937984 100.911628,24.8062016 100.117829,23.7147287 C99.324031,22.6232558 98.2325581,22.1271318 96.6449612,22.1271318 C95.8511628,22.1271318 95.0573643,22.2263566 94.3627907,22.524031 C93.6682171,22.7224806 92.9736434,23.1193798 92.2790698,23.6155039 C91.6837209,24.0124031 91.1875969,24.4093023 90.7906977,24.9054264 C90.3937984,25.3023256 90.096124,25.6992248 89.8976744,26.096124 L89.8976744,42.6666667 C89.8976744,43.3612403 89.9968992,43.9565891 90.1953488,44.4527132 C90.3937984,44.9488372 90.7906977,45.3457364 91.1875969,45.544186 C91.4852713,45.7426357 91.8821705,45.9410853 92.3782946,46.0403101 C92.8744186,46.1395349 93.3705426,46.2387597 93.8666667,46.3379845 L93.8666667,48.620155 L75.0139535,48.620155 L75.0139535,46.3379845 C75.5100775,46.3379845 76.0062016,46.2387597 76.6015504,46.1395349 C77.0976744,46.0403101 77.5937984,45.9410853 77.9906977,45.8418605 C78.6852713,45.6434109 79.0821705,45.2465116 79.379845,44.7503876 C79.5782946,44.2542636 79.7767442,43.6589147 79.7767442,42.8651163 L79.7767442,24.8062016 C79.7767442,24.2108527 79.5782946,23.5162791 79.2806202,22.9209302 C78.9829457,22.3255814 78.4868217,21.8294574 77.9906977,21.4325581 C77.5937984,21.2341085 77.1968992,20.9364341 76.6015504,20.8372093 C76.0062016,20.6387597 75.4108527,20.5395349 74.7162791,20.5395349 L74.7162791,18.2573643 L89.5007752,17.4635659 L89.9968992,17.9596899 L89.9968992,22.4248062 L90.096124,22.4248062 C90.6914729,21.9286822 91.3860465,21.3333333 92.179845,20.5395349 C92.9736434,19.8449612 93.7674419,19.2496124 94.4620155,18.7534884 C95.255814,18.2573643 96.248062,17.8604651 97.4387597,17.4635659 C98.6294574,17.0666667 100.018605,16.9674419 101.407752,16.9674419 C104.781395,16.9674419 107.262016,17.9596899 108.948837,19.8449612 C110.635659,21.7302326 111.429457,24.3100775 111.429457,27.4852713 L111.429457,42.6666667 C111.429457,43.4604651 111.528682,44.055814 111.727132,44.4527132 C111.925581,44.9488372 112.421705,45.2465116 113.017054,45.544186 C113.314729,45.6434109 113.711628,45.8418605 114.207752,45.9410853 C114.703876,46.0403101 115.2,46.1395349 115.894574,46.2387597 L115.894574,48.620155 L116.093023,48.620155 Z"></path>
-			<path d="M158.75969,48.620155 L144.173643,48.620155 C142.387597,45.4449612 140.700775,42.7658915 139.212403,40.5829457 C137.724031,38.4 136.334884,36.3162791 135.044961,34.5302326 L133.258915,36.1178295 L133.258915,42.8651163 C133.258915,43.5596899 133.35814,44.2542636 133.556589,44.6511628 C133.755039,45.1472868 134.151938,45.4449612 134.846512,45.7426357 C135.243411,45.9410853 135.64031,46.0403101 136.136434,46.1395349 C136.632558,46.2387597 137.128682,46.3379845 137.624806,46.3379845 L137.624806,48.620155 L118.375194,48.620155 L118.375194,46.3379845 C118.871318,46.3379845 119.367442,46.2387597 119.962791,46.1395349 C120.458915,46.0403101 120.955039,45.9410853 121.351938,45.8418605 C122.046512,45.6434109 122.443411,45.2465116 122.741085,44.7503876 C122.939535,44.2542636 123.137984,43.6589147 123.137984,42.8651163 L123.137984,8.33488372 C123.137984,7.64031008 122.939535,6.94573643 122.64186,6.25116279 C122.344186,5.55658915 121.947287,4.96124031 121.351938,4.56434109 C120.955039,4.36589147 120.35969,4.06821705 119.565891,3.96899225 C118.772093,3.77054264 118.077519,3.67131783 117.382946,3.67131783 L117.382946,1.38914729 L132.762791,0.595348837 L133.258915,1.09147287 L133.258915,33.0418605 C134.747287,31.6527132 136.533333,30.0651163 138.418605,28.2790698 C140.303876,26.4930233 141.891473,25.0046512 142.982946,23.8139535 C143.677519,23.1193798 144.074419,22.6232558 144.074419,22.2263566 C144.173643,21.8294574 144.173643,21.6310078 144.173643,21.5317829 C144.173643,21.1348837 143.875969,20.8372093 143.181395,20.6387597 C142.486822,20.4403101 141.593798,20.1426357 140.204651,19.944186 L140.204651,17.7612403 L155.882171,17.7612403 L155.882171,19.944186 C153.79845,20.5395349 152.210853,21.0356589 151.11938,21.5317829 C150.027907,22.027907 148.837209,22.7224806 147.547287,23.5162791 C146.654264,24.1116279 145.860465,24.7069767 145.066667,25.3023256 C144.272868,25.8976744 143.379845,26.6914729 142.288372,27.5844961 C144.272868,30.5612403 146.15814,33.2403101 147.844961,35.7209302 C149.531783,38.2015504 151.317829,40.8806202 153.203101,43.6589147 C153.79845,44.6511628 154.592248,45.2465116 155.584496,45.6434109 C156.576744,45.9410853 157.469767,46.1395349 158.462016,46.2387597 L158.462016,48.620155 L158.75969,48.620155 Z"></path>
-			<path d="M178.604651,48.620155 L159.057364,48.620155 L159.057364,46.3379845 C159.553488,46.3379845 160.148837,46.2387597 160.644961,46.1395349 C161.141085,46.0403101 161.637209,45.9410853 161.934884,45.8418605 C162.629457,45.6434109 163.026357,45.2465116 163.324031,44.7503876 C163.621705,44.2542636 163.72093,43.6589147 163.72093,42.8651163 L163.72093,24.8062016 C163.72093,24.1116279 163.522481,23.4170543 163.224806,22.9209302 C162.927132,22.3255814 162.530233,21.9286822 162.034109,21.6310078 C161.637209,21.4325581 161.141085,21.1348837 160.347287,20.9364341 C159.553488,20.7379845 158.858915,20.5395349 158.263566,20.5395349 L158.263566,18.2573643 L173.444961,17.4635659 L173.941085,17.9596899 L173.941085,42.5674419 C173.941085,43.2620155 174.139535,43.8573643 174.437209,44.4527132 C174.734884,44.9488372 175.231008,45.3457364 175.727132,45.544186 C176.124031,45.7426357 176.620155,45.9410853 177.116279,46.0403101 C177.612403,46.1395349 178.108527,46.2387597 178.703876,46.3379845 L178.703876,48.620155 L178.604651,48.620155 Z M174.139535,6.4496124 C174.139535,8.0372093 173.544186,9.32713178 172.353488,10.4186047 C171.162791,11.5100775 169.674419,12.1054264 168.086822,12.1054264 C166.4,12.1054264 165.010853,11.5100775 163.72093,10.4186047 C162.530233,9.32713178 161.934884,7.9379845 161.934884,6.4496124 C161.934884,4.8620155 162.530233,3.57209302 163.72093,2.38139535 C164.911628,1.28992248 166.4,0.694573643 168.086822,0.694573643 C169.773643,0.694573643 171.162791,1.28992248 172.353488,2.38139535 C173.544186,3.47286822 174.139535,4.8620155 174.139535,6.4496124 L174.139535,6.4496124 Z"></path>
-			<path d="M222.362791,48.620155 L203.708527,48.620155 L203.708527,46.3379845 C204.105426,46.3379845 204.60155,46.2387597 205.097674,46.1395349 C205.693023,46.0403101 206.089922,45.9410853 206.387597,45.8418605 C206.784496,45.6434109 207.082171,45.2465116 207.28062,44.8496124 C207.47907,44.4527132 207.578295,43.7581395 207.578295,42.9643411 L207.578295,28.4775194 C207.578295,26.3937984 207.181395,24.8062016 206.387597,23.7147287 C205.593798,22.6232558 204.502326,22.1271318 202.914729,22.1271318 C202.12093,22.1271318 201.327132,22.2263566 200.632558,22.524031 C199.937984,22.8217054 199.243411,23.1193798 198.548837,23.6155039 C197.953488,24.0124031 197.457364,24.4093023 197.060465,24.9054264 C196.663566,25.3023256 196.365891,25.6992248 196.167442,26.096124 L196.167442,42.6666667 C196.167442,43.3612403 196.266667,43.9565891 196.465116,44.4527132 C196.663566,44.9488372 197.060465,45.3457364 197.457364,45.544186 C197.755039,45.7426357 198.151938,45.9410853 198.648062,46.0403101 C199.144186,46.1395349 199.64031,46.2387597 200.136434,46.3379845 L200.136434,48.620155 L181.283721,48.620155 L181.283721,46.3379845 C181.779845,46.3379845 182.275969,46.2387597 182.871318,46.1395349 C183.367442,46.0403101 183.863566,45.9410853 184.260465,45.8418605 C184.955039,45.6434109 185.351938,45.2465116 185.649612,44.7503876 C185.848062,44.2542636 186.046512,43.6589147 186.046512,42.8651163 L186.046512,24.8062016 C186.046512,24.2108527 185.848062,23.5162791 185.550388,22.9209302 C185.252713,22.3255814 184.756589,21.8294574 184.260465,21.4325581 C183.863566,21.2341085 183.466667,20.9364341 182.871318,20.8372093 C182.275969,20.6387597 181.68062,20.5395349 180.986047,20.5395349 L180.986047,18.2573643 L195.770543,17.4635659 L196.266667,17.9596899 L196.266667,22.4248062 L196.365891,22.4248062 C196.96124,21.9286822 197.655814,21.3333333 198.449612,20.5395349 C199.243411,19.8449612 200.037209,19.2496124 200.731783,18.7534884 C201.525581,18.2573643 202.517829,17.8604651 203.708527,17.4635659 C204.899225,17.0666667 206.288372,16.9674419 207.677519,16.9674419 C211.051163,16.9674419 213.531783,17.9596899 215.218605,19.8449612 C216.905426,21.7302326 217.699225,24.3100775 217.699225,27.4852713 L217.699225,42.6666667 C217.699225,43.4604651 217.79845,44.055814 217.996899,44.4527132 C218.195349,44.9488372 218.691473,45.2465116 219.286822,45.544186 C219.584496,45.6434109 219.981395,45.8418605 220.477519,45.9410853 C220.973643,46.0403101 221.469767,46.1395349 222.164341,46.2387597 L222.164341,48.620155 L222.362791,48.620155 Z"></path>
-			<path d="M239.528682,49.7116279 C237.544186,49.7116279 235.55969,49.4139535 233.674419,48.8186047 C231.789147,48.2232558 230.300775,47.627907 229.209302,46.9333333 L228.316279,49.0170543 L225.934884,49.0170543 L225.537984,37.5069767 L227.820155,37.5069767 C228.117829,38.4 228.613953,39.4914729 229.407752,40.6821705 C230.102326,41.8728682 230.995349,42.8651163 231.888372,43.8573643 C232.88062,44.7503876 233.972093,45.544186 235.262016,46.2387597 C236.551938,46.8341085 237.84186,47.2310078 239.231008,47.2310078 C241.116279,47.2310078 242.505426,46.8341085 243.39845,46.1395349 C244.291473,45.4449612 244.787597,44.2542636 244.787597,42.7658915 C244.787597,41.972093 244.589147,41.2775194 244.192248,40.6821705 C243.795349,40.1860465 243.2,39.6899225 242.505426,39.2930233 C241.711628,38.896124 240.818605,38.4992248 239.826357,38.2015504 C238.834109,37.903876 237.643411,37.6062016 236.254264,37.1100775 C234.865116,36.7131783 233.674419,36.3162791 232.682171,35.820155 C231.689922,35.4232558 230.59845,34.7286822 229.606202,33.8356589 C228.713178,33.0418605 227.91938,32.0496124 227.423256,30.9581395 C226.827907,29.8666667 226.629457,28.4775194 226.629457,26.8899225 C226.629457,24.0124031 227.820155,21.6310078 230.300775,19.8449612 C232.781395,18.0589147 235.956589,17.1658915 239.925581,17.1658915 C241.810853,17.1658915 243.497674,17.3643411 245.085271,17.7612403 C246.672868,18.1581395 247.962791,18.5550388 249.054264,19.0511628 L249.748837,17.2651163 L252.130233,17.2651163 L252.626357,27.7829457 L250.443411,27.7829457 C249.748837,25.6 248.458915,23.8139535 246.772093,22.2263566 C244.986047,20.6387597 243.100775,19.8449612 241.116279,19.8449612 C239.528682,19.8449612 238.23876,20.1426357 237.345736,20.8372093 C236.452713,21.5317829 235.956589,22.4248062 235.956589,23.6155039 C235.956589,25.2031008 236.651163,26.2945736 237.941085,26.9891473 C239.231008,27.6837209 241.116279,28.3782946 243.497674,28.9736434 C247.168992,29.9658915 249.848062,31.255814 251.634109,32.8434109 C253.32093,34.5302326 254.213953,36.6139535 254.213953,39.0945736 C254.213953,42.4682171 252.924031,45.1472868 250.244961,46.9333333 C247.268217,48.7193798 243.795349,49.7116279 239.528682,49.7116279 L239.528682,49.7116279 Z"></path>
-		</g>
-	</g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="417" preserveAspectRatio="xMidYMid"><path fill="#D33833" d="M250.741 169.278c0 69.457-55.07 125.817-123.039 125.817S4.664 238.735 4.664 169.278c0-69.458 55.07-125.818 123.038-125.818 67.97 0 123.04 56.36 123.04 125.818"/><path fill="#EF3D3A" d="M9.724 200.434S.794 69.26 121.749 65.488l-8.434-14.09-65.588 22.028-18.753 21.532-16.372 31.355-9.328 36.515 2.779 24.41"/><path fill="#231F20" d="M43.46 83.448c-21.531 22.127-34.927 52.59-34.927 86.326s13.396 64.198 34.927 86.325c21.631 22.127 51.3 35.721 84.242 35.721s62.611-13.594 84.242-35.72c21.532-22.128 34.927-52.59 34.927-86.326 0-33.737-13.395-64.199-34.927-86.326-21.63-22.028-51.299-35.72-84.242-35.72-32.843 0-62.61 13.593-84.242 35.72m-5.457 177.91C15.083 237.941.893 205.495.893 169.774s14.19-68.168 37.11-91.684c22.921-23.417 54.673-38.003 89.7-38.003s66.778 14.586 89.699 38.003 37.11 55.863 37.11 91.684c0 35.72-14.19 68.167-37.11 91.584-22.921 23.516-54.673 38.003-89.7 38.003s-66.778-14.487-89.699-38.003"/><path fill="#F0D6B7" d="m179.498 169.972-18.754 2.778-25.302 2.878-16.372.397-15.975-.496-12.205-3.77-10.816-11.71-8.434-23.913-1.885-5.16-11.212-3.77-6.55-10.815-4.663-15.48 5.16-13.593 12.205-4.267 9.823 4.664 4.663 10.32 5.656-.894 1.885-2.381-1.885-10.816-.496-13.594 2.778-18.753-.099-10.716 8.533-13.693 14.983-10.816L136.732 5.16l29.073 4.266 25.302 18.258 11.709 18.753 7.54 13.594 1.886 33.736-5.656 29.073-10.32 25.799-9.723 13.792"/><path fill="#335061" d="m163.622 251.039-66.977 2.778v11.212l5.656 39.393-2.779 3.274-46.834-15.975-3.274-5.656-4.664-52.986-11.014-31.752-2.381-7.541 37.507-25.798 11.709-4.664 10.319 12.7 8.93 7.939 10.32 3.274 4.663 1.39 5.656 24.409 4.267 5.16 10.815-3.771L128 229.01l40.682 19.25z"/><path fill="#6D6B6D" d="m52.49 87.516 12.205-4.266 9.823 4.663 4.663 10.32 5.656-.893 1.39-5.656-2.779-10.816 2.778-25.798-2.381-14.09 8.434-9.823 18.257-14.487-5.16-7.045-25.798 12.7-10.815 8.435-6.053 13.097-9.327 12.701-2.778 14.983z"/><path fill="#DCD9D8" d="M71.74 43.46s7.044-17.364 35.125-25.798c28.08-8.434 1.39-6.053 1.39-6.053L77.791 23.318 66.084 35.026l-5.16 9.327zM57.65 84.242s-9.824-32.844 27.683-37.507l-1.389-5.656-25.798 6.053-7.541 24.41 1.885 15.974z"/><path fill="#F7E4CD" d="m72.633 127.802 6.151-5.954s2.779.298 3.275 3.572 1.885 32.844 22.028 48.72c1.885 1.488-14.983-2.382-14.983-2.382L74.12 148.341m84.739-29.47s1.091-14.189 4.961-13.097c3.87 1.091 3.87 4.96 3.87 4.96s-9.327 5.954-8.831 8.137m38.896-51.993s-7.74 1.587-8.434 8.434c-.695 6.846 8.434 1.389 9.823.893m-58.046-8.831s-10.32 1.389-10.32 7.938 11.709 6.052 14.983 3.274m-68.366 19.25S59.635 87.02 57.75 97.34s-6.053 17.76 2.778 28.576l-6.053-1.885-5.655-14.487-1.886-14.09L57.75 84.242l12.204.893 7.045 5.656zm8.435-29.569s7.937-41.278 48.223-49.216c33.14-6.549 50.604 1.39 57.153 8.93 0 0-29.569-35.125-57.65-24.409-28.08 10.816-48.719 30.462-48.223 43.064.794 21.63.496 21.63.496 21.63M194.48 32.645s-13.593-.496-14.09 11.708c0 0 0 1.886.894 3.771 0 0 10.815-12.205 17.364-5.656"/><path fill="#F7E4CD" d="M135.045 49.414s-2.381-18.654-18.257-7.839c-10.32 7.045-9.328 16.868-7.541 18.754 1.885 1.885 1.389 5.655 2.778 3.076s.992-11.014 6.152-13.396c5.06-2.381 13.594-4.96 16.868-.595"/><path fill="#49728B" d="M90.99 176.025 46.932 195.67s18.258 72.633 8.93 95.157l-6.548-2.381-.496-27.684-12.205-52.39-5.16-14.488 45.941-30.958zm4.464 40.185 6.251 7.641v28.08h-7.441s-.893-19.646-.893-22.027.893-10.816.893-10.816m1.389 37.11-21.135.893 6.053 4.267 14.982 2.382"/><path fill="#335061" d="m167.79 251.535 17.363-.496 4.267 43.063-17.761 2.382z"/><path fill="#335061" d="m172.453 251.535 26.195-1.39s10.816-27.187 10.816-28.576c0-1.39 9.327-39.392 9.327-39.392l-21.135-22.028-4.267-3.77-11.212 11.212v43.56z"/><path fill="#49728B" d="m184.161 248.26-16.372 3.275 2.382 13.098c6.052 2.778 16.372-4.664 16.372-4.664m-1.886-93.767 32.844 24.409.893-11.213-24.806-22.92z"/><path fill="#FFF" d="m111.926 343.814-9.724-39.392-4.862-29.073-.794-21.532 43.956-2.381h27.287l-2.48 49.215 4.266 38.003-.496 7.045-35.622 2.779z"/><path fill="#DCD9D8" d="M161.736 251.039s-2.381 48.72 4.664 83.448c0 0-14.09 8.93-34.63 11.212l39.393-1.389 4.663-2.778-5.655-76.8-1.489-16.472"/><path fill="#FFF" d="m190.115 290.431 18.257-5.16 34.63-1.885 5.16-15.975-9.328-27.684-10.815-1.389-14.983 4.664-14.289 7.045-7.64-1.39-5.954 2.382"/><path fill="#DCD9D8" d="M189.817 281.005s12.205-5.656 14.09-5.16l-5.16-25.798 6.053-2.382s4.267 24.41 4.267 27.188c0 0 26.195 1.389 28.576 1.389 0 0 5.656-10.816 4.267-22.028l5.16 14.983.496 8.434-7.541 11.212-8.434 1.886-14.09-.496-4.664-6.053-16.372 2.381-5.16 1.886"/><path fill="#FFF" d="m171.361 247.764-10.32-26.195-10.815-15.48s2.382-6.548 5.656-6.548h10.816l10.32 3.77-.894 17.365z"/><path fill="#DCD9D8" d="M173.445 238.834s-13.098-25.302-13.098-29.073c0 0 2.382-5.656 5.656-4.266 3.275 1.389 10.32 5.16 10.32 5.16v-8.931l-15.976-3.274-10.815 1.389 18.257 43.262 3.77.496"/><path fill="#FFF" d="m116.093 177.017-12.998-1.39-12.205-3.77v4.267l5.953 6.549 18.754 8.434"/><path fill="#DCD9D8" d="M95.157 178.406s14.486 6.053 19.25 4.664l.495 5.656-13.097-2.779-7.938-5.656z"/><path fill="#D33833" d="M190.115 201.129c-7.938-.199-15.182-1.191-21.433-2.977.397-2.58-.397-5.06.298-6.946 1.786-1.29 4.663-1.29 7.342-1.587-2.282-1.092-5.556-1.588-8.136-.893-.1-1.786-.893-2.878-1.39-4.267 4.466-1.588 14.984-12.006 20.937-8.633 2.878 1.687 4.069 11.014 4.267 15.678.198 3.77-.397 7.541-1.885 9.625"/><path stroke="#D33833" stroke-width="2" d="M190.115 201.129c-7.938-.199-15.182-1.191-21.433-2.977.397-2.58-.397-5.06.298-6.946 1.786-1.29 4.663-1.29 7.342-1.587-2.282-1.092-5.556-1.588-8.136-.893-.1-1.786-.893-2.878-1.39-4.267 4.466-1.588 14.984-12.006 20.937-8.633 2.878 1.687 4.069 11.014 4.267 15.678.198 3.77-.397 7.541-1.885 9.625Z"/><path fill="#D33833" d="M152.112 188.13c0 .596 0 1.19-.1 1.786-2.48 1.588-6.45 1.588-9.228 2.977 3.97.198 7.145 1.19 9.923 2.48-.1 1.489-.1 3.077-.198 4.565-4.565 3.076-8.732 7.74-14.09 10.716-2.58 1.39-11.411 4.962-14.09 4.267-1.489-.397-1.687-2.282-2.282-4.068-1.29-3.77-4.267-9.923-4.565-15.678-.298-7.243-1.091-19.448 6.747-17.96 6.35 1.191 13.693 4.069 18.555 6.748 3.076 1.786 4.763 3.77 9.328 4.167"/><path stroke="#D33833" stroke-width="2" d="M152.112 188.13c0 .596 0 1.19-.1 1.786-2.48 1.588-6.45 1.588-9.228 2.977 3.97.198 7.145 1.19 9.923 2.48-.1 1.489-.1 3.077-.198 4.565-4.565 3.076-8.732 7.74-14.09 10.716-2.58 1.39-11.411 4.962-14.09 4.267-1.489-.397-1.687-2.282-2.282-4.068-1.29-3.77-4.267-9.923-4.565-15.678-.298-7.243-1.091-19.448 6.747-17.96 6.35 1.191 13.693 4.069 18.555 6.748 3.076 1.786 4.763 3.77 9.328 4.167Z"/><path fill="#D33833" d="M156.577 196.763c-.695-3.97-1.489-5.06-1.191-8.534 10.617-7.045 12.502 12.106 1.19 8.534"/><path stroke="#D33833" stroke-width="2" d="M156.577 196.763c-.695-3.97-1.489-5.06-1.191-8.534 10.617-7.045 12.502 12.106 1.19 8.534Z"/><path fill="#EF3D3A" d="M171.857 199.938s-3.274-4.664-.893-6.053 4.664 0 6.053-2.381c1.39-2.382 0-3.77.496-6.549.496-2.778 2.778-3.274 5.16-3.77 2.381-.497 8.93-1.39 9.823.893l-2.778-8.435-5.656-1.885-17.761 10.32-.893 5.16v10.319m-42.766 17.86c-.595-7.343-1.19-14.586-1.786-21.929-.992-10.914 2.58-9.03 12.105-9.03 1.489 0 8.93 1.688 9.427 2.78 2.58 5.258-4.267 4.067 2.976 8.036 6.053 3.275 16.869-1.984 14.388-9.426-1.39-1.687-7.144-.496-9.228-1.588l-11.014-5.655c-4.663-2.382-15.38-5.954-20.341-2.58-12.602 8.533.794 29.966 5.259 38.896"/><path fill="#231F20" d="M135.045 49.414c-12.8-2.977-19.15 5.358-23.02 13.99-3.473-.793-2.084-5.556-1.19-7.937 2.281-6.251 11.51-14.686 19.05-13.495 3.175.397 7.541 3.374 5.16 7.442M197.259 63.9h.595c2.878 5.954 5.358 12.305 9.03 17.663-2.48 5.755-18.456 10.716-18.258.595 3.473-1.488 9.427-.298 12.503-2.282-1.786-4.862-4.267-9.03-3.87-15.975m-55.764.199c2.778 5.06 3.67 10.319 7.54 14.09 1.787 1.686 5.16 3.77 3.474 8.532-.397 1.092-3.275 3.573-4.962 4.069-6.052 1.786-20.242.397-15.479-7.244 5.06.199 11.808 3.275 15.579-.397-2.878-4.564-8.038-13.693-6.152-19.05m53.482 51c-9.129 5.855-19.35 12.305-34.431 10.816-3.175-2.778-4.465-9.03-1.29-13.097 1.587 2.778.595 7.938 5.16 8.731 8.533 1.489 18.455-5.259 24.607-7.54 3.77-6.45-.297-8.732-3.77-12.9-7.045-8.434-16.372-18.952-16.075-31.553 2.878-2.084 3.076 3.175 3.473 4.068 3.671 8.533 12.9 19.547 19.547 26.89 1.687 1.786 4.366 3.572 4.664 4.763.893 3.373-2.282 7.54-1.885 9.823M74.12 108.949c-2.877-1.687-3.571-8.831-6.945-9.03-4.862-.297-3.969 9.328-3.969 14.983-3.274-2.976-3.87-12.304-1.488-17.066-2.778-1.39-3.97 1.488-5.557 2.48 2.084-14.387 21.135-6.648 17.96 8.633m126.611 12.204c-4.267 8.137-10.32 17.067-22.822 17.365-.298-2.58-.496-6.648 0-8.236 9.625-.992 15.578-5.854 22.822-9.129m-59.932 5.259c7.938 4.168 22.623 4.664 33.538 4.366.595 2.382.595 5.358.595 8.236-13.99.595-30.462-2.878-34.133-12.602m-1.488 7.74c5.556 13.891 24.508 12.304 40.483 11.907-.694 1.786-2.183 3.969-4.167 4.663-5.16 2.084-19.25 3.672-26.394-.099-4.465-2.381-7.442-7.839-9.922-11.014-1.092-1.488-7.045-5.358 0-5.457"/><path fill="#81B0C4" d="M194.282 210.654c-6.45 11.113-12.7 22.524-20.34 32.248 3.174-9.426 4.563-25.302 5.06-37.407 6.747-3.176 12.502.694 15.28 5.16"/><path fill="#231F20" d="M229.11 250.543c-7.243 1.488-12.304 8.533-19.448 8.037 3.969-5.458 10.716-7.839 19.448-8.037m3.175 11.311c-5.953.596-12.899 1.588-18.852 1.092 2.877-4.366 13.792-2.779 18.852-1.092m2.084 9.824c-6.648.099-14.884 0-21.234-.497 3.77-4.068 16.967-1.488 21.234.497"/><path fill="#DCD9D8" d="M181.78 298.468c.992 8.335 4.267 16.77 3.87 25.898-3.672 1.19-5.755 2.282-10.717 2.282-.297-7.74-1.389-19.646-1.091-27.088 2.381.198 5.953-1.687 7.938-1.092"/><path fill="#F0D6B7" d="M171.064 175.43c-3.374 2.182-6.152 4.861-9.427 7.243-7.144.397-11.014-.496-16.173-4.564.099-.298.595-.199.595-.596 7.64 3.374 17.364-1.389 25.005-2.084"/><path fill="#81B0C4" d="M131.175 227.324c2.084-9.03 10.32-13.792 17.761-18.753 7.64 9.724 12.304 22.226 17.464 34.331-12.205-3.671-24.608-9.525-35.225-15.578"/><path fill="#231F20" d="M173.842 299.659c-.298 7.442.694 19.25 1.091 27.088 4.962 0 7.045-1.091 10.717-2.282.397-9.129-2.878-17.563-3.87-25.898-1.985-.694-5.557 1.191-7.938 1.092M97.24 257.588c3.275 29.866 7.938 54.87 16.57 81.364 19.151 5.854 42.171 6.35 59.139 1.091-3.076-14.883-1.786-33.041-3.572-49.017-1.39-12.006-.695-24.012-2.58-36.217-20.54-4.266-49.513-.992-69.557 2.779m74.419-2.58c-.199 12.8.595 25.5 1.588 38.3 4.96-.694 8.235-1.19 12.8-2.282-1.489-12.304-1.29-26.294-4.366-37.209-3.473.1-6.55 0-10.022 1.19m24.905-2.084c-2.381-.496-5.06 0-7.243 0 1.091 10.419 3.572 21.929 4.465 32.943 3.473.099 5.358-1.588 8.236-2.084.198-9.625-.794-22.921-5.458-30.859m37.805 34.53c7.343-1.786 11.907-10.716 9.823-19.944-1.389-6.152-3.77-17.86-6.45-21.83-1.885-2.877-7.144-6.747-11.41-4.068-6.847 4.366-18.853 5.656-23.814 10.915 2.48 8.335 3.274 19.647 4.266 30.164 8.534.497 18.952-2.38 26.097.695-4.962 1.588-11.312 1.588-15.579 3.969 3.572 1.687 11.709 1.39 17.067.1m-68.068-44.552c-5.16-12.105-9.823-24.607-17.464-34.331-7.442 4.96-15.578 9.724-17.761 18.753 10.716 6.053 23.12 11.907 35.225 15.578m12.7-37.407c-.496 12.105-1.885 27.981-5.06 37.407 7.64-9.823 13.892-21.135 20.341-32.248-2.778-4.465-8.533-8.335-15.28-5.16m-14.387-5.06c-2.878-.299-5.358 3.373-9.129 1.785-.893.992-1.687 1.985-2.58 2.977 8.335 10.12 12.205 24.41 18.655 36.217 3.473-11.41 3.076-23.814 3.87-36.217-4.763.198-7.442-4.465-10.816-4.763m-9.228-12.206c-.298 3.473.496 4.565 1.19 8.534 11.312 3.572 9.427-15.579-1.19-8.534m-12.602-4.167c-4.862-2.68-12.204-5.557-18.555-6.747-7.838-1.489-7.045 10.716-6.747 17.96.298 5.754 3.275 11.807 4.565 15.677.595 1.786.793 3.671 2.282 4.068 2.679.596 11.609-2.877 14.09-4.267 5.358-2.877 9.525-7.54 14.09-10.716.099-1.488.099-3.076.198-4.564-2.778-1.39-5.854-2.282-9.923-2.48 2.68-1.39 6.748-1.39 9.228-2.977 0-.596 0-1.191.1-1.787-4.565-.496-6.252-2.48-9.328-4.167m-46.635-8.434c-4.068 4.167 11.41 9.724 16.273 10.022 0-2.58 1.488-5.06 1.19-6.946-5.854-.992-13.494-.298-17.463-3.076m50.01 1.885c0 .397-.497.298-.596.596 5.259 4.068 9.128 4.96 16.173 4.564 3.176-2.282 6.053-5.06 9.427-7.244-7.74.695-17.464 5.458-25.005 2.084M192 191.405c-.198-4.565-1.39-13.991-4.267-15.678-5.953-3.473-16.471 7.045-20.936 8.633.496 1.389 1.29 2.48 1.389 4.266 2.68-.694 5.854-.198 8.136.893-2.679.298-5.556.298-7.342 1.588-.596 1.885.198 4.366-.298 6.946 6.251 1.786 13.495 2.679 21.433 2.976 1.488-1.984 2.083-5.755 1.885-9.624M89.302 179.597c-1.29-.893-9.922-12.106-11.113-11.61-15.578 6.153-30.164 16.77-43.163 26.89 12.403 26.692 17.464 59.337 18.357 90.791 14.19 6.648 26.691 16.273 46.04 17.265-2.282-15.776-4.266-29.966-5.556-44.85-4.862-2.083-11.808.1-16.372-.595 0-5.457 6.945-2.381 7.54-6.052.398-2.779-3.87-2.977-2.48-7.343 3.572 1.29 5.457 4.167 9.228 5.259 3.473-7.541 0-20.936.496-27.287.1-1.19.595-6.549 3.274-5.656 2.382.794-.099 14.388.1 20.341.198 5.557-.695 10.816 1.587 14.289 18.655-2.58 37.607-4.168 57.848-4.763-4.465-1.885-9.724-3.671-15.479-6.946-3.175-1.786-12.998-5.457-13.891-8.434-1.489-4.763 3.77-7.243 4.663-11.312-9.426 5.16-11.212-4.96-13.494-12.006-1.985-6.45-3.175-11.311-3.671-14.983-8.236-4.167-16.968-8.037-23.914-12.998m94.462-10.32c12.999-6.25 15.38 23.517 10.22 33.142.794 2.877 3.473 3.969 4.565 6.548-7.244 12.999-15.28 25.104-22.723 37.904 5.458-3.473 13.396-.595 19.845-3.175 2.382-.893 4.069-6.35 5.855-10.716 4.96-11.907 10.12-26.99 12.403-38.3.496-2.58 1.984-8.237 1.587-10.519-.595-4.167-6.152-7.243-9.03-9.724-5.258-4.763-8.533-8.83-14.09-13.296-2.083 3.275-6.846 5.457-8.632 8.137m-124.13-115.2c-6.152 6.847-4.862 19.548-4.167 28.676 11.212-7.044 25.997.596 25.897 12.503 5.358-.1 1.985-6.648.993-10.915-3.176-13.792 5.358-28.676.396-41.277-9.624.793-17.463 4.663-23.119 11.014m44.254-39.59c-13.99 3.969-31.95 14.189-37.705 26.79 4.465-.694 7.541-2.877 11.907-3.175 1.687-.099 3.87.695 5.755.199 3.77-.992 7.045-9.526 9.922-12.701 2.779-3.076 6.152-4.465 8.435-7.243 1.488-.695 3.67-.695 3.77-2.878-.595-.695-1.29-1.19-2.084-.992m72.93 3.77c-14.585-8.235-39.193-14.387-54.672-6.648-12.503 6.251-29.37 16.57-35.126 29.57 5.358 12.6-1.587 24.11-2.084 36.91-.198 6.847 3.176 12.702 3.473 20.144-1.885 3.076-7.442 3.373-11.311 3.175-1.29-6.55-3.572-13.892-10.32-14.686-9.525-1.091-16.57 6.847-16.967 15.083-.496 9.724 7.442 25.798 18.753 24.707 4.366-.397 5.458-4.763 10.22-4.763 2.58 5.16-3.968 6.747-4.663 10.418-.199.993.496 4.664.992 6.45 2.084 8.434 6.648 19.448 11.113 25.898 5.755 8.235 16.968 9.426 29.073 10.22 2.183-4.664 10.121-4.267 15.28-3.076-6.25-2.48-12.005-8.434-16.768-13.693-5.458-6.053-11.014-12.502-11.312-20.44 10.419 14.387 18.952 26.989 37.805 33.34 14.288 4.762 30.958-2.184 41.972-9.923 4.564-3.176 7.243-8.335 10.518-12.9 12.105-17.463 17.761-42.27 16.57-66.381-.496-9.922-.496-19.845-3.87-26.493-3.472-6.946-15.28-13.296-22.226-6.946-1.29-6.846 5.755-11.014 13.99-8.533-5.853-7.64-12.005-16.67-20.44-21.433m27.188 224.348c11.411-5.656 32.645-15.182 39.69 0 2.68 5.655 5.755 15.082 7.045 20.936 1.885 8.137-2.084 25.402-10.518 28.08-7.442 2.382-16.074 2.283-25.004.497-1.092-.893-2.183-2.382-3.076-3.97-6.35-.198-12.403.299-17.365 2.978.496 4.762-2.679 5.457-5.755 6.45-2.183 8.83 4.465 20.34 2.878 28.278-1.092 5.755-8.137 6.648-13.296 7.64-.199 3.176.198 5.855.595 8.534-1.19 4.366-6.45 6.846-11.51 7.442-16.57 1.984-41.674 2.877-57.55-2.878-4.466-10.914-7.938-24.111-11.61-36.514-15.479 1.686-28.08-6.649-39.888-12.205-4.068-1.885-9.724-2.977-11.312-6.251-1.488-3.175-.893-9.228-1.29-14.884-.893-14.586-1.786-28.676-5.556-43.56-1.687-6.747-4.763-12.601-6.847-19.05-1.984-5.954-5.358-13.396-6.251-19.35-1.29-8.83 7.045-9.327 12.304-13.197 8.236-5.953 14.685-9.228 23.615-14.586 2.68-1.587 10.617-5.556 11.51-7.442 1.787-3.67-3.075-8.83-4.365-11.708-2.084-4.564-3.176-8.434-3.473-12.9-7.442-1.19-13.197-5.655-16.57-10.616-5.657-8.335-9.626-23.715-4.664-35.324.397-.893 2.282-2.779 2.58-4.168.595-2.778-1.092-6.45-1.191-9.426-.496-15.182 2.58-28.28 12.8-32.844 4.167-16.57 19.05-22.027 33.042-30.263 5.259-3.076 11.014-5.06 16.967-7.244 21.333-7.838 54.177-6.35 71.938 7.045 7.541 5.656 19.547 17.662 23.814 26.394 11.41 22.921 10.518 61.321 2.58 89.303-1.092 3.77-2.58 9.227-4.763 13.792-1.488 3.175-6.152 9.426-5.656 12.204.596 2.878 10.717 10.518 12.9 12.602 3.87 3.77 11.311 8.732 11.906 13.495.695 5.06-2.182 12.006-3.67 16.868-4.764 16.273-9.526 31.256-14.984 45.842"/><path fill="#F7E4CD" d="M128.1 129.885c.595-.794 3.968-2.083 8.731.199 0 0-5.656.893-5.16 10.32l-2.381-.497c.1.1-2.381-8.434-1.19-10.022"/><path fill="#1D1919" d="M169.178 210.456c0 1.389-1.19 2.58-2.58 2.58-1.389 0-2.58-1.191-2.58-2.58s1.191-2.58 2.58-2.58c1.489 0 2.58 1.19 2.58 2.58m2.58 12.006c0 1.39-1.19 2.58-2.58 2.58-1.389 0-2.58-1.19-2.58-2.58s1.191-2.58 2.58-2.58c1.489 0 2.58 1.092 2.58 2.58"/><path fill="#231F20" d="M36.614 374.276q-1.19.149-2.084.298c-.595.099-1.19.198-1.984.397-.893.198-1.39.595-1.588 1.19-.198.596-.397 1.19-.397 1.985v24.21a14.3 14.3 0 0 1-1.389 6.153c-.893 1.885-2.084 3.373-3.671 4.663-1.588 1.19-3.374 2.183-5.358 2.778-1.985.596-4.069.993-6.252.993-3.87 0-6.945-.893-9.327-2.779s-3.572-4.366-3.572-7.64c0-1.885.496-3.473 1.588-4.763 1.091-1.29 2.58-1.885 4.465-1.885 1.786 0 3.175.496 4.267 1.588 1.091 1.091 1.587 2.381 1.587 3.87 0 1.29-.496 2.58-1.389 3.67-.893 1.092-1.984 2.184-3.175 3.077v.397c.198.396.595.793 1.19 1.091.596.298 1.29.397 1.886.397 2.48 0 4.465-.893 5.854-2.68q2.085-2.678 2.084-8.036v-24.807c0-.694-.1-1.389-.298-1.885s-.794-.893-1.687-1.29c-.595-.297-1.389-.496-2.282-.694-.893-.199-1.587-.298-2.183-.397v-2.382h23.417v2.481zm36.713 34.134c-.694 1.19-1.587 2.281-2.58 3.373-.992 1.091-2.183 1.885-3.473 2.679q-2.084 1.192-4.167 1.786c-1.39.397-3.076.595-4.862.595-3.076 0-5.656-.396-7.938-1.29-2.183-.893-4.068-1.984-5.457-3.472-1.489-1.489-2.481-3.176-3.275-5.16a19.6 19.6 0 0 1-1.091-6.45c0-2.083.397-4.167 1.19-6.052.794-1.886 1.886-3.672 3.275-5.16q2.084-2.233 5.358-3.572a18.7 18.7 0 0 1 7.144-1.39c2.878 0 5.26.398 7.144 1.092 1.886.695 3.374 1.687 4.565 2.878 1.19 1.19 1.984 2.58 2.58 4.167.496 1.588.793 3.275.793 5.06v1.985H51.597c0 4.267.794 7.442 2.48 9.625 1.588 2.183 4.267 3.274 7.74 3.274 1.985 0 3.671-.496 5.259-1.587a14.1 14.1 0 0 0 3.969-4.069zM61.52 396.601c0-1.191-.099-2.481-.198-3.771-.1-1.29-.298-2.381-.695-3.175-.397-.992-.793-1.687-1.488-2.183-.595-.496-1.39-.695-2.282-.695-1.588 0-2.878.794-3.77 2.382-.993 1.587-1.49 4.167-1.588 7.64zm55.565 19.151H98.431v-2.282c.397 0 .893-.1 1.39-.199a8.6 8.6 0 0 0 1.29-.297c.396-.199.694-.596.892-.993s.298-1.091.298-1.885V395.61q0-3.125-1.19-4.762c-.795-1.092-1.886-1.588-3.474-1.588-.794 0-1.587.1-2.282.397-.695.198-1.39.595-2.084 1.091-.595.397-1.091.794-1.488 1.29q-.596.596-.893 1.19v16.571q0 1.042.298 1.786c.198.497.595.894.992 1.092.298.198.694.397 1.19.496l1.489.298v2.282H76.006v-2.282c.496 0 .992-.1 1.588-.199.496-.099.992-.198 1.389-.297.695-.199 1.091-.596 1.39-1.092.198-.496.396-1.091.396-1.885v-18.059c0-.595-.198-1.29-.496-1.885-.298-.596-.794-1.092-1.29-1.489-.397-.198-.794-.496-1.39-.595a5.8 5.8 0 0 0-1.884-.298v-2.282l14.784-.794.496.496v4.466h.1a30 30 0 0 0 2.083-1.886 29 29 0 0 1 2.282-1.786c.794-.496 1.786-.893 2.977-1.29s2.58-.496 3.969-.496c3.374 0 5.854.992 7.541 2.878 1.687 1.885 2.48 4.465 2.48 7.64v15.181q0 1.191.298 1.786c.199.497.695.794 1.29 1.092.298.1.695.298 1.191.397s.992.198 1.687.298v2.38zm42.667 0h-14.586a110 110 0 0 0-4.961-8.037c-1.489-2.183-2.878-4.267-4.168-6.053l-1.786 1.588v6.747c0 .694.1 1.389.298 1.786.198.496.595.794 1.29 1.091.397.199.794.298 1.29.397s.992.199 1.488.199v2.282h-19.25v-2.282c.497 0 .993-.1 1.588-.199.496-.099.992-.198 1.39-.297.694-.199 1.09-.596 1.388-1.092.199-.496.397-1.091.397-1.885v-34.53c0-.695-.198-1.39-.496-2.084s-.694-1.29-1.29-1.687c-.397-.198-.992-.496-1.786-.595-.794-.199-1.488-.298-2.183-.298v-2.282l15.38-.794.496.496v31.95c1.489-1.389 3.275-2.976 5.16-4.762s3.473-3.275 4.564-4.465c.695-.695 1.092-1.191 1.092-1.588.099-.397.099-.595.099-.694 0-.397-.298-.695-.992-.893-.695-.199-1.588-.497-2.977-.695v-2.183h15.677v2.183c-2.083.595-3.67 1.091-4.762 1.588-1.092.496-2.283 1.19-3.572 1.984a54 54 0 0 0-2.481 1.786c-.794.595-1.687 1.39-2.778 2.282 1.984 2.977 3.87 5.656 5.556 8.137 1.687 2.48 3.473 5.16 5.358 7.938.596.992 1.39 1.587 2.382 1.984.992.298 1.885.496 2.877.596v2.38zm19.845 0H160.05v-2.282c.496 0 1.091-.1 1.587-.199s.992-.198 1.29-.297c.695-.199 1.092-.596 1.39-1.092s.396-1.091.396-1.885v-18.059c0-.695-.198-1.39-.496-1.885a3 3 0 0 0-1.19-1.29c-.398-.199-.894-.496-1.687-.695-.794-.198-1.489-.397-2.084-.397v-2.282l15.181-.794.496.496V409.7c0 .695.199 1.29.496 1.885a2.74 2.74 0 0 0 1.29 1.092c.397.198.893.397 1.39.496.496.1.992.199 1.587.298v2.282zm-4.465-42.17c0 1.587-.596 2.877-1.786 3.968-1.191 1.092-2.68 1.687-4.267 1.687-1.687 0-3.076-.595-4.366-1.687-1.19-1.091-1.786-2.48-1.786-3.969 0-1.587.595-2.877 1.786-4.068 1.19-1.091 2.68-1.687 4.366-1.687 1.687 0 3.076.596 4.267 1.687 1.19 1.092 1.786 2.48 1.786 4.068m48.223 42.171h-18.654v-2.282c.397 0 .893-.1 1.389-.199a8.5 8.5 0 0 0 1.29-.297c.397-.199.694-.596.893-.993.198-.397.298-1.091.298-1.885V395.61q0-3.125-1.191-4.762c-.794-1.092-1.885-1.588-3.473-1.588-.794 0-1.588.1-2.282.397-.695.297-1.39.595-2.084 1.091-.595.397-1.091.794-1.488 1.29q-.596.596-.893 1.19v16.571q0 1.042.297 1.786c.199.497.596.894.993 1.092.297.198.694.397 1.19.496l1.489.298v2.282h-18.853v-2.282c.496 0 .992-.1 1.588-.199.496-.099.992-.198 1.389-.297.694-.199 1.091-.596 1.389-1.092.198-.496.397-1.091.397-1.885v-18.059c0-.595-.199-1.29-.496-1.885-.298-.596-.794-1.092-1.29-1.489-.397-.198-.794-.496-1.39-.595a5.8 5.8 0 0 0-1.885-.298v-2.282l14.785-.794.496.496v4.466h.1a30 30 0 0 0 2.083-1.886 29 29 0 0 1 2.282-1.786c.794-.496 1.786-.893 2.977-1.29s2.58-.496 3.969-.496c3.373 0 5.854.992 7.54 2.878 1.688 1.885 2.481 4.465 2.481 7.64v15.181q0 1.191.298 1.786c.199.497.695.794 1.29 1.092.298.1.695.298 1.19.397.497.1.993.198 1.688.298v2.38zm17.165 1.091c-1.984 0-3.968-.297-5.853-.893-1.886-.595-3.374-1.19-4.465-1.885l-.893 2.084h-2.382l-.397-11.51h2.282c.298.893.794 1.984 1.588 3.175.695 1.19 1.588 2.183 2.48 3.175a17 17 0 0 0 3.374 2.382c1.29.595 2.58.992 3.97.992 1.885 0 3.274-.397 4.167-1.092.893-.694 1.389-1.885 1.389-3.373q0-1.191-.596-2.084c-.396-.496-.992-.992-1.686-1.39-.794-.396-1.687-.793-2.68-1.09-.992-.298-2.182-.596-3.571-1.092-1.39-.397-2.58-.794-3.573-1.29-.992-.397-2.083-1.092-3.076-1.985-.893-.793-1.686-1.786-2.182-2.877-.596-1.092-.794-2.48-.794-4.068 0-2.878 1.19-5.26 3.671-7.045s5.656-2.68 9.625-2.68c1.885 0 3.572.2 5.16.596 1.587.397 2.877.794 3.969 1.29l.694-1.786h2.381l.497 10.518h-2.183c-.695-2.183-1.985-3.97-3.672-5.557q-2.679-2.38-5.655-2.381c-1.588 0-2.878.297-3.771.992s-1.39 1.588-1.39 2.778c0 1.588.695 2.68 1.985 3.374 1.29.695 3.176 1.39 5.557 1.984 3.671.993 6.35 2.283 8.136 3.87 1.687 1.687 2.58 3.77 2.58 6.251 0 3.374-1.29 6.053-3.969 7.84-2.977 1.785-6.45 2.777-10.716 2.777"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Jira/GenericFunctions.ts b/packages/nodes-base/nodes/Jira/GenericFunctions.ts
index 6f7d70ad317b0..b5ea100ca1e77 100644
--- a/packages/nodes-base/nodes/Jira/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Jira/GenericFunctions.ts
@@ -1,20 +1,20 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
 	INodeListSearchItems,
+	INodePropertyOptions,
+	IRequestOptions,
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function jiraSoftwareCloudApiRequest(
-	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	endpoint: string,
-	method: string,
+	method: IHttpRequestMethods,
 	body: any = {},
 	query?: IDataObject,
 	uri?: string,
@@ -33,7 +33,7 @@ export async function jiraSoftwareCloudApiRequest(
 		credentialType = 'jiraSoftwareCloudApi';
 	}
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			Accept: 'application/json',
 			'Content-Type': 'application/json',
@@ -60,10 +60,7 @@ export async function jiraSoftwareCloudApiRequest(
 	try {
 		return await this.helpers.requestWithAuthentication.call(this, credentialType, options);
 	} catch (error) {
-		if (
-			error.description?.includes &&
-			error.description.includes("Field 'priority' cannot be set")
-		) {
+		if (error.description?.includes?.("Field 'priority' cannot be set")) {
 			throw new NodeApiError(this.getNode(), error as JsonObject, {
 				message:
 					"Field 'priority' cannot be set. You need to add the Priority field to your Jira Project's Issue Types.",
@@ -77,7 +74,7 @@ export async function jiraSoftwareCloudApiRequestAllItems(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	propertyName: string,
 	endpoint: string,
-	method: string,
+	method: IHttpRequestMethods,
 	body: any = {},
 	query: IDataObject = {},
 ): Promise<any> {
@@ -229,3 +226,40 @@ export function filterSortSearchListItems(items: INodeListSearchItems[], filter?
 			return 0;
 		});
 }
+
+export async function getUsers(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+	const jiraVersion = this.getCurrentNodeParameter('jiraVersion') as string;
+	const maxResults = 1000;
+	const query: IDataObject = { maxResults };
+	let endpoint = '/api/2/users/search';
+
+	if (jiraVersion === 'server') {
+		endpoint = '/api/2/user/search';
+		query.username = "'";
+	}
+
+	const users = [];
+	let hasNextPage: boolean;
+
+	do {
+		const usersPage = (await jiraSoftwareCloudApiRequest.call(
+			this,
+			endpoint,
+			'GET',
+			{},
+			{ ...query, startAt: users.length },
+		)) as IDataObject[];
+		users.push(...usersPage);
+		hasNextPage = usersPage.length === maxResults;
+	} while (hasNextPage);
+
+	return users
+		.filter((user) => user.active)
+		.map((user) => ({
+			name: user.displayName as string,
+			value: (user.accountId ?? user.name) as string,
+		}))
+		.sort((a: INodePropertyOptions, b: INodePropertyOptions) => {
+			return a.name.toLowerCase() > b.name.toLowerCase() ? 1 : -1;
+		});
+}
diff --git a/packages/nodes-base/nodes/Jira/IssueAttachmentDescription.ts b/packages/nodes-base/nodes/Jira/IssueAttachmentDescription.ts
index c0b17190336f5..d46a86235b1ed 100644
--- a/packages/nodes-base/nodes/Jira/IssueAttachmentDescription.ts
+++ b/packages/nodes-base/nodes/Jira/IssueAttachmentDescription.ts
@@ -59,7 +59,7 @@ export const issueAttachmentFields: INodeProperties[] = [
 		default: '',
 	},
 	{
-		displayName: 'Binary Property',
+		displayName: 'Input Binary Field',
 		displayOptions: {
 			show: {
 				resource: ['issueAttachment'],
@@ -69,7 +69,7 @@ export const issueAttachmentFields: INodeProperties[] = [
 		name: 'binaryPropertyName',
 		type: 'string',
 		default: 'data',
-		description: 'Object property name which holds binary data',
+		hint: 'The name of the input binary field containing the file to be written',
 		required: true,
 	},
 
@@ -104,7 +104,7 @@ export const issueAttachmentFields: INodeProperties[] = [
 		},
 	},
 	{
-		displayName: 'Binary Property',
+		displayName: 'Put Output File in Field',
 		name: 'binaryProperty',
 		type: 'string',
 		default: 'data',
@@ -115,7 +115,7 @@ export const issueAttachmentFields: INodeProperties[] = [
 				download: [true],
 			},
 		},
-		description: 'Object property name which holds binary data',
+		hint: 'The name of the output binary field to put the file in',
 		required: true,
 	},
 	/* -------------------------------------------------------------------------- */
@@ -179,7 +179,7 @@ export const issueAttachmentFields: INodeProperties[] = [
 		},
 	},
 	{
-		displayName: 'Binary Property',
+		displayName: 'Put Output File in Field',
 		name: 'binaryProperty',
 		type: 'string',
 		default: 'data',
@@ -190,7 +190,7 @@ export const issueAttachmentFields: INodeProperties[] = [
 				download: [true],
 			},
 		},
-		description: 'Object property name which holds binary data',
+		hint: 'The name of the output binary field to put the file in',
 		required: true,
 	},
 	/* -------------------------------------------------------------------------- */
diff --git a/packages/nodes-base/nodes/Jira/IssueCommentDescription.ts b/packages/nodes-base/nodes/Jira/IssueCommentDescription.ts
index e5bbe90891d02..a6956b2f645a1 100644
--- a/packages/nodes-base/nodes/Jira/IssueCommentDescription.ts
+++ b/packages/nodes-base/nodes/Jira/IssueCommentDescription.ts
@@ -111,7 +111,7 @@ export const issueCommentFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Field',
+		placeholder: 'Add Option',
 		default: {},
 		displayOptions: {
 			show: {
@@ -130,10 +130,23 @@ export const issueCommentFields: INodeProperties[] = [
 						value: 'renderedBody',
 					},
 				],
-				default: '',
+				default: [],
 				description:
 					'Use expand to include additional information about comments in the response. This parameter accepts Rendered Body, which returns the comment body rendered in HTML.',
 			},
+			{
+				displayName: 'Use Wiki Markup',
+				name: 'wikiMarkup',
+				type: 'boolean',
+				default: false,
+				displayOptions: {
+					show: {
+						'/jiraVersion': ['cloud'],
+					},
+				},
+				description:
+					'Whether to enable parsing of wikiformatting for this comment. Default is false.',
+			},
 		],
 	},
 
@@ -269,7 +282,7 @@ export const issueCommentFields: INodeProperties[] = [
 						value: 'renderedBody',
 					},
 				],
-				default: '',
+				default: 'renderedBody',
 				description:
 					'Use expand to include additional information about comments in the response. This parameter accepts Rendered Body, which returns the comment body rendered in HTML.',
 			},
@@ -384,7 +397,7 @@ export const issueCommentFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Field',
+		placeholder: 'Add Option',
 		default: {},
 		displayOptions: {
 			show: {
@@ -403,10 +416,23 @@ export const issueCommentFields: INodeProperties[] = [
 						value: 'renderedBody',
 					},
 				],
-				default: '',
+				default: 'renderedBody',
 				description:
 					'Use expand to include additional information about comments in the response. This parameter accepts Rendered Body, which returns the comment body rendered in HTML.',
 			},
+			{
+				displayName: 'Use Wiki Markup',
+				name: 'wikiMarkup',
+				type: 'boolean',
+				default: false,
+				displayOptions: {
+					show: {
+						'/jiraVersion': ['cloud'],
+					},
+				},
+				description:
+					'Whether to enable parsing of wikiformatting for this comment. Default is false.',
+			},
 		],
 	},
 ];
diff --git a/packages/nodes-base/nodes/Jira/IssueDescription.ts b/packages/nodes-base/nodes/Jira/IssueDescription.ts
index d67d64fa42669..f2364cf59b727 100644
--- a/packages/nodes-base/nodes/Jira/IssueDescription.ts
+++ b/packages/nodes-base/nodes/Jira/IssueDescription.ts
@@ -141,14 +141,14 @@ export const issueFields: INodeProperties[] = [
 					{
 						type: 'regex',
 						properties: {
-							regex: '([0-9]{2,})[ \t]*',
+							regex: '([0-9]{1,})[ \t]*',
 							errorMessage: 'Not a valid Jira Issue Type ID',
 						},
 					},
 				],
 				extractValue: {
 					type: 'regex',
-					regex: '^([0-9]{2,})',
+					regex: '^([0-9]{1,})',
 				},
 			},
 		],
diff --git a/packages/nodes-base/nodes/Jira/Jira.node.ts b/packages/nodes-base/nodes/Jira/Jira.node.ts
index 0fd6076b4c70c..c66e194727539 100644
--- a/packages/nodes-base/nodes/Jira/Jira.node.ts
+++ b/packages/nodes-base/nodes/Jira/Jira.node.ts
@@ -1,5 +1,5 @@
 import type { Readable } from 'stream';
-import mergeWith from 'lodash.mergewith';
+import mergeWith from 'lodash/mergeWith';
 
 import type {
 	IBinaryKeyData,
@@ -17,6 +17,7 @@ import { BINARY_ENCODING, NodeOperationError } from 'n8n-workflow';
 
 import {
 	filterSortSearchListItems,
+	getUsers,
 	jiraSoftwareCloudApiRequest,
 	jiraSoftwareCloudApiRequestAllItems,
 	simplifyIssueOutput,
@@ -182,6 +183,9 @@ export class Jira implements INodeType {
 					`/api/2/project/${projectId}`,
 					'GET',
 				);
+
+				if (!issueTypes) return { results: [] };
+
 				for (const issueType of issueTypes) {
 					const issueTypeName = issueType.name;
 					const issueTypeId = issueType.id;
@@ -206,30 +210,9 @@ export class Jira implements INodeType {
 			// Get all the users to display them to user so that they can
 			// select them easily
 			async getUsers(this: ILoadOptionsFunctions, filter?: string): Promise<INodeListSearchResult> {
-				const jiraVersion = this.getCurrentNodeParameter('jiraVersion') as string;
-				const query: IDataObject = {};
-				let endpoint = '/api/2/users/search';
-
-				if (jiraVersion === 'server') {
-					endpoint = '/api/2/user/search';
-					query.username = "'";
-				}
-
-				const users = await jiraSoftwareCloudApiRequest.call(this, endpoint, 'GET', {}, query);
-				const returnData: INodeListSearchItems[] = users.reduce(
-					(activeUsers: INodeListSearchItems[], user: IDataObject) => {
-						if (user.active) {
-							activeUsers.push({
-								name: user.displayName as string,
-								value: (user.accountId ?? user.name) as string,
-							});
-						}
-						return activeUsers;
-					},
-					[],
-				);
+				const users = await getUsers.call(this);
 
-				return { results: filterSortSearchListItems(returnData, filter) };
+				return { results: filterSortSearchListItems(users, filter) };
 			},
 
 			// Get all the priorities to display them to user so that they can
@@ -373,30 +356,7 @@ export class Jira implements INodeType {
 			// Get all the users to display them to user so that they can
 			// select them easily
 			async getUsers(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const jiraVersion = this.getCurrentNodeParameter('jiraVersion') as string;
-				const query: IDataObject = {};
-				let endpoint = '/api/2/users/search';
-
-				if (jiraVersion === 'server') {
-					endpoint = '/api/2/user/search';
-					query.username = "'";
-				}
-
-				const users = await jiraSoftwareCloudApiRequest.call(this, endpoint, 'GET', {}, query);
-
-				return users
-					.reduce((activeUsers: INodePropertyOptions[], user: IDataObject) => {
-						if (user.active) {
-							activeUsers.push({
-								name: user.displayName as string,
-								value: (user.accountId || user.name) as string,
-							});
-						}
-						return activeUsers;
-					}, [])
-					.sort((a: INodePropertyOptions, b: INodePropertyOptions) => {
-						return a.name.toLowerCase() > b.name.toLowerCase() ? 1 : -1;
-					});
+				return await getUsers.call(this);
 			},
 
 			// Get all the groups to display them to user so that they can
@@ -793,7 +753,6 @@ export class Jira implements INodeType {
 							);
 						}
 						const executionData = this.helpers.constructExecutionMetaData(
-							// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
 							this.helpers.returnJsonArray(simplifyIssueOutput(responseData)),
 							{ itemData: { item: i } },
 						);
@@ -986,7 +945,7 @@ export class Jira implements INodeType {
 					);
 
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData as IDataObject[]),
+						this.helpers.returnJsonArray({ success: true }), //endpoint returns no content
 						{ itemData: { item: i } },
 					);
 
@@ -1059,7 +1018,7 @@ export class Jira implements INodeType {
 
 					let uploadData: Buffer | Readable;
 					if (binaryData.id) {
-						uploadData = this.helpers.getBinaryStream(binaryData.id);
+						uploadData = await this.helpers.getBinaryStream(binaryData.id);
 					} else {
 						uploadData = Buffer.from(binaryData.data, BINARY_ENCODING);
 					}
@@ -1208,7 +1167,7 @@ export class Jira implements INodeType {
 		}
 
 		if (resource === 'issueComment') {
-			const apiVersion = jiraVersion === 'server' ? '2' : ('3' as string);
+			let apiVersion = jiraVersion === 'server' ? '2' : ('3' as string);
 
 			//https://developer.atlassian.com/cloud/jira/platform/rest/v3/api-group-issue-comments/#api-rest-api-3-issue-issueidorkey-comment-post
 			if (operation === 'add') {
@@ -1216,6 +1175,11 @@ export class Jira implements INodeType {
 					const jsonParameters = this.getNodeParameter('jsonParameters', 0);
 					const issueKey = this.getNodeParameter('issueKey', i) as string;
 					const options = this.getNodeParameter('options', i);
+
+					if (options.wikiMarkup) {
+						apiVersion = '2';
+					}
+
 					const body: IDataObject = {};
 					if (options.expand) {
 						qs.expand = options.expand as string;
@@ -1225,7 +1189,7 @@ export class Jira implements INodeType {
 					Object.assign(body, options);
 					if (!jsonParameters) {
 						const comment = this.getNodeParameter('comment', i) as string;
-						if (jiraVersion === 'server') {
+						if (jiraVersion === 'server' || options.wikiMarkup) {
 							Object.assign(body, { body: comment });
 						} else {
 							Object.assign(body, {
@@ -1368,10 +1332,15 @@ export class Jira implements INodeType {
 						qs.expand = options.expand as string;
 						delete options.expand;
 					}
+
+					if (options.wikiMarkup) {
+						apiVersion = '2';
+					}
+
 					Object.assign(qs, options);
 					if (!jsonParameters) {
 						const comment = this.getNodeParameter('comment', i) as string;
-						if (jiraVersion === 'server') {
+						if (jiraVersion === 'server' || options.wikiMarkup) {
 							Object.assign(body, { body: comment });
 						} else {
 							Object.assign(body, {
@@ -1500,6 +1469,6 @@ export class Jira implements INodeType {
 			}
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Jira/JiraTrigger.node.ts b/packages/nodes-base/nodes/Jira/JiraTrigger.node.ts
index 8a2e1113d4456..bfd869f7d20e8 100644
--- a/packages/nodes-base/nodes/Jira/JiraTrigger.node.ts
+++ b/packages/nodes-base/nodes/Jira/JiraTrigger.node.ts
@@ -17,7 +17,7 @@ export class JiraTrigger implements INodeType {
 		name: 'jiraTrigger',
 		icon: 'file:jira.svg',
 		group: ['trigger'],
-		version: 1,
+		version: [1, 1.1],
 		description: 'Starts the workflow when Jira events occur',
 		defaults: {
 			name: 'Jira Trigger',
@@ -26,6 +26,7 @@ export class JiraTrigger implements INodeType {
 		outputs: ['main'],
 		credentials: [
 			{
+				displayName: 'Credentials to Connect to Jira',
 				name: 'jiraSoftwareCloudApi',
 				required: true,
 				displayOptions: {
@@ -35,6 +36,7 @@ export class JiraTrigger implements INodeType {
 				},
 			},
 			{
+				displayName: 'Credentials to Connect to Jira',
 				name: 'jiraSoftwareServerApi',
 				required: true,
 				displayOptions: {
@@ -46,7 +48,17 @@ export class JiraTrigger implements INodeType {
 			{
 				// eslint-disable-next-line n8n-nodes-base/node-class-description-credentials-name-unsuffixed
 				name: 'httpQueryAuth',
-				required: true,
+				displayName: 'Credentials to Authenticate Webhook',
+				displayOptions: {
+					show: {
+						authenticateWebhook: [true],
+					},
+				},
+			},
+			{
+				// eslint-disable-next-line n8n-nodes-base/node-class-description-credentials-name-unsuffixed
+				name: 'httpQueryAuth',
+				displayName: 'Credentials to Authenticate Webhook',
 				displayOptions: {
 					show: {
 						incomingAuthentication: ['queryAuth'],
@@ -80,7 +92,20 @@ export class JiraTrigger implements INodeType {
 				default: 'cloud',
 			},
 			{
-				displayName: 'Incoming Authentication',
+				displayName: 'Authenticate Incoming Webhook',
+				name: 'authenticateWebhook',
+				type: 'boolean',
+				default: false,
+				description:
+					'Whether authentication should be activated for the incoming webhooks (makes it more secure)',
+				displayOptions: {
+					show: {
+						'@version': [{ _cnd: { gte: 1.1 } }],
+					},
+				},
+			},
+			{
+				displayName: 'Authenticate Webhook With',
 				name: 'incomingAuthentication',
 				type: 'options',
 				options: [
@@ -95,6 +120,11 @@ export class JiraTrigger implements INodeType {
 				],
 				default: 'none',
 				description: 'If authentication should be activated for the webhook (makes it more secure)',
+				displayOptions: {
+					show: {
+						'@version': [1],
+					},
+				},
 			},
 			{
 				displayName: 'Events',
@@ -382,17 +412,24 @@ export class JiraTrigger implements INodeType {
 				return false;
 			},
 			async create(this: IHookFunctions): Promise<boolean> {
+				const nodeVersion = this.getNode().typeVersion;
 				const webhookUrl = this.getNodeWebhookUrl('default') as string;
-
 				let events = this.getNodeParameter('events', []) as string[];
-
 				const additionalFields = this.getNodeParameter('additionalFields') as IDataObject;
-
 				const endpoint = '/webhooks/1.0/webhook';
-
 				const webhookData = this.getWorkflowStaticData('node');
 
-				const incomingAuthentication = this.getNodeParameter('incomingAuthentication') as string;
+				let authenticateWebhook = false;
+
+				if (nodeVersion === 1) {
+					const incomingAuthentication = this.getNodeParameter('incomingAuthentication') as string;
+
+					if (incomingAuthentication === 'queryAuth') {
+						authenticateWebhook = true;
+					}
+				} else {
+					authenticateWebhook = this.getNodeParameter('authenticateWebhook') as boolean;
+				}
 
 				if (events.includes('*')) {
 					events = allEvents;
@@ -418,7 +455,7 @@ export class JiraTrigger implements INodeType {
 
 				const parameters: any = {};
 
-				if (incomingAuthentication === 'queryAuth') {
+				if (authenticateWebhook) {
 					let httpQueryAuth;
 					try {
 						httpQueryAuth = await this.getCredentials('httpQueryAuth');
@@ -477,13 +514,24 @@ export class JiraTrigger implements INodeType {
 	};
 
 	async webhook(this: IWebhookFunctions): Promise<IWebhookResponseData> {
+		const nodeVersion = this.getNode().typeVersion;
 		const bodyData = this.getBodyData();
 		const queryData = this.getQueryData() as IDataObject;
 		const response = this.getResponseObject();
 
-		const incomingAuthentication = this.getNodeParameter('incomingAuthentication') as string;
+		let authenticateWebhook = false;
+
+		if (nodeVersion === 1) {
+			const incomingAuthentication = this.getNodeParameter('incomingAuthentication') as string;
+
+			if (incomingAuthentication === 'queryAuth') {
+				authenticateWebhook = true;
+			}
+		} else {
+			authenticateWebhook = this.getNodeParameter('authenticateWebhook') as boolean;
+		}
 
-		if (incomingAuthentication === 'queryAuth') {
+		if (authenticateWebhook) {
 			let httpQueryAuth: ICredentialDataDecryptedObject | undefined;
 
 			try {
diff --git a/packages/nodes-base/nodes/Jira/jira.svg b/packages/nodes-base/nodes/Jira/jira.svg
index 760d690dac03c..9f50ef6ef008f 100644
--- a/packages/nodes-base/nodes/Jira/jira.svg
+++ b/packages/nodes-base/nodes/Jira/jira.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 68.25 71.25" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x="3.125" y="3.125"/><defs><linearGradient id="b" x1="91.9%" y1="40.22%" x2="28.49%" y2="81.63%"><stop offset="18%" stop-color="#0052cc"/><stop offset="100%" stop-color="#2684ff"/></linearGradient><linearGradient id="c" x1="8.7%" y1="59.17%" x2="72.26%" y2="17.99%"><stop offset="18%" stop-color="#0052cc"/><stop offset="100%" stop-color="#2684ff"/></linearGradient></defs><symbol id="a" overflow="visible"><g stroke="none" fill-rule="nonzero"><path d="M61.161 30.211L30.95 0 .74 30.211a2.54 2.54 0 000 3.581l30.211 30.21 30.211-30.21a2.54 2.54 0 000-3.581zM30.95 41.46l-9.462-9.462 9.462-9.462 9.462 9.462z" fill="#2684ff"/><path d="M30.95 22.599C24.755 16.405 24.724 6.37 30.881.138L10.114 20.774l11.268 11.268z" fill="url(#b)"/><path d="M40.437 31.973L30.95 41.46a15.93 15.93 0 010 22.536l20.749-20.749z" fill="url(#c)"/></g></symbol></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round" viewBox="0 0 68.25 71.25"><use xlink:href="#a" x="3.125" y="3.125"/><defs><linearGradient id="b" x1="91.9%" x2="28.49%" y1="40.22%" y2="81.63%"><stop offset="18%" stop-color="#0052cc"/><stop offset="100%" stop-color="#2684ff"/></linearGradient><linearGradient id="c" x1="8.7%" x2="72.26%" y1="59.17%" y2="17.99%"><stop offset="18%" stop-color="#0052cc"/><stop offset="100%" stop-color="#2684ff"/></linearGradient></defs><symbol id="a" overflow="visible"><g fill-rule="nonzero" stroke="none"><path fill="#2684ff" d="M61.161 30.211 30.95 0 .74 30.211a2.54 2.54 0 0 0 0 3.581l30.211 30.21 30.211-30.21a2.54 2.54 0 0 0 0-3.581zM30.95 41.46l-9.462-9.462 9.462-9.462 9.462 9.462z"/><path fill="url(#b)" d="M30.95 22.599C24.755 16.405 24.724 6.37 30.881.138L10.114 20.774l11.268 11.268z"/><path fill="url(#c)" d="M40.437 31.973 30.95 41.46a15.93 15.93 0 0 1 0 22.536l20.749-20.749z"/></g></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/JotForm/GenericFunctions.ts b/packages/nodes-base/nodes/JotForm/GenericFunctions.ts
index 863a75596a73b..bd6292840dc90 100644
--- a/packages/nodes-base/nodes/JotForm/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/JotForm/GenericFunctions.ts
@@ -1,23 +1,18 @@
-import type { OptionsWithUri } from 'request';
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
+	IRequestOptions,
 	IWebhookFunctions,
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function jotformApiRequest(
-	this:
-		| IHookFunctions
-		| IExecuteFunctions
-		| IExecuteSingleFunctions
-		| ILoadOptionsFunctions
-		| IWebhookFunctions,
-	method: string,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -26,7 +21,7 @@ export async function jotformApiRequest(
 	option: IDataObject = {},
 ): Promise<any> {
 	const credentials = await this.getCredentials('jotFormApi');
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		headers: {
 			APIKEY: credentials.apiKey,
 			'Content-Type': 'application/x-www-form-urlencoded',
diff --git a/packages/nodes-base/nodes/JotForm/JotFormTrigger.node.ts b/packages/nodes-base/nodes/JotForm/JotFormTrigger.node.ts
index bb2b31b60211f..0caf61d5183ca 100644
--- a/packages/nodes-base/nodes/JotForm/JotFormTrigger.node.ts
+++ b/packages/nodes-base/nodes/JotForm/JotFormTrigger.node.ts
@@ -1,5 +1,3 @@
-import * as formidable from 'formidable';
-
 import type {
 	IHookFunctions,
 	IWebhookFunctions,
@@ -9,6 +7,7 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 	IWebhookResponseData,
+	MultiPartFormData,
 } from 'n8n-workflow';
 import { jsonParse } from 'n8n-workflow';
 
@@ -89,6 +88,9 @@ export class JotFormTrigger implements INodeType {
 					limit: 1000,
 				};
 				const forms = await jotformApiRequest.call(this, 'GET', '/user/forms', {}, qs);
+
+				if (!Array.isArray(forms?.content)) return [];
+
 				for (const form of forms.content) {
 					const formName = form.title;
 					const formId = form.id;
@@ -132,7 +134,6 @@ export class JotFormTrigger implements INodeType {
 				const endpoint = `/form/${formId}/webhooks`;
 				const body: IDataObject = {
 					webhookURL: webhookUrl,
-					//webhookURL: 'https://en0xsizp3qyt7f.x.pipedream.net/',
 				};
 				const { content } = await jotformApiRequest.call(this, 'POST', endpoint, body);
 				webhookData.webhookId = Object.keys(content as IDataObject)[0];
@@ -158,71 +159,65 @@ export class JotFormTrigger implements INodeType {
 	};
 
 	async webhook(this: IWebhookFunctions): Promise<IWebhookResponseData> {
-		const req = this.getRequestObject();
+		const req = this.getRequestObject() as MultiPartFormData.Request;
 		const formId = this.getNodeParameter('form') as string;
 		const resolveData = this.getNodeParameter('resolveData', false) as boolean;
 		const onlyAnswers = this.getNodeParameter('onlyAnswers', false) as boolean;
 
-		const form = new formidable.IncomingForm({});
-
-		return new Promise((resolve, _reject) => {
-			form.parse(req, async (err, data, _files) => {
-				const rawRequest = jsonParse<any>(data.rawRequest as string);
-				data.rawRequest = rawRequest;
-
-				let returnData: IDataObject;
-				if (!resolveData) {
-					if (onlyAnswers) {
-						returnData = data.rawRequest as unknown as IDataObject;
-					} else {
-						returnData = data;
-					}
-
-					resolve({
-						workflowData: [this.helpers.returnJsonArray(returnData)],
-					});
-				}
-
-				// Resolve the data by requesting the information via API
-				const endpoint = `/form/${formId}/questions`;
-				const responseData = await jotformApiRequest.call(this, 'GET', endpoint, {});
-
-				// Create a dictionary to resolve the keys
-				const questionNames: IDataObject = {};
-				for (const question of Object.values<IQuestionData>(
-					responseData.content as IQuestionData[],
-				)) {
-					questionNames[question.name] = question.text;
-				}
-
-				// Resolve the keys
-				let questionKey: string;
-				const questionsData: IDataObject = {};
-				for (const key of Object.keys(rawRequest as IDataObject)) {
-					if (!key.includes('_')) {
-						continue;
-					}
-
-					questionKey = key.split('_').slice(1).join('_');
-					if (questionNames[questionKey] === undefined) {
-						continue;
-					}
-
-					questionsData[questionNames[questionKey] as string] = rawRequest[key];
-				}
-
-				if (onlyAnswers) {
-					returnData = questionsData as unknown as IDataObject;
-				} else {
-					// @ts-ignore
-					data.rawRequest = questionsData;
-					returnData = data;
-				}
-
-				resolve({
-					workflowData: [this.helpers.returnJsonArray(returnData)],
-				});
-			});
-		});
+		const { data } = req.body;
+
+		const rawRequest = jsonParse<any>(data.rawRequest as string);
+		data.rawRequest = rawRequest;
+
+		let returnData: IDataObject;
+		if (!resolveData) {
+			if (onlyAnswers) {
+				returnData = data.rawRequest as unknown as IDataObject;
+			} else {
+				returnData = data;
+			}
+
+			return {
+				workflowData: [this.helpers.returnJsonArray(returnData)],
+			};
+		}
+
+		// Resolve the data by requesting the information via API
+		const endpoint = `/form/${formId}/questions`;
+		const responseData = await jotformApiRequest.call(this, 'GET', endpoint, {});
+
+		// Create a dictionary to resolve the keys
+		const questionNames: IDataObject = {};
+		for (const question of Object.values<IQuestionData>(responseData.content as IQuestionData[])) {
+			questionNames[question.name] = question.text;
+		}
+
+		// Resolve the keys
+		let questionKey: string;
+		const questionsData: IDataObject = {};
+		for (const key of Object.keys(rawRequest as IDataObject)) {
+			if (!key.includes('_')) {
+				continue;
+			}
+
+			questionKey = key.split('_').slice(1).join('_');
+			if (questionNames[questionKey] === undefined) {
+				continue;
+			}
+
+			questionsData[questionNames[questionKey] as string] = rawRequest[key];
+		}
+
+		if (onlyAnswers) {
+			returnData = questionsData as unknown as IDataObject;
+		} else {
+			// @ts-ignore
+			data.rawRequest = questionsData;
+			returnData = data;
+		}
+
+		return {
+			workflowData: [this.helpers.returnJsonArray(returnData)],
+		};
 	}
 }
diff --git a/packages/nodes-base/nodes/Jwt/Jwt.node.json b/packages/nodes-base/nodes/Jwt/Jwt.node.json
new file mode 100644
index 0000000000000..83d0cad2b5338
--- /dev/null
+++ b/packages/nodes-base/nodes/Jwt/Jwt.node.json
@@ -0,0 +1,19 @@
+{
+	"node": "n8n-nodes-base.jwt",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"categories": ["Development"],
+	"alias": ["Token", "Key", "JSON", "Payload", "Sign", "Verify", "Decode"],
+	"resources": {
+		"credentialDocumentation": [
+			{
+				"url": "https://docs.n8n.io/credentials/jwt"
+			}
+		],
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.jwt/"
+			}
+		]
+	}
+}
diff --git a/packages/nodes-base/nodes/Jwt/Jwt.node.ts b/packages/nodes-base/nodes/Jwt/Jwt.node.ts
new file mode 100644
index 0000000000000..816a48da13239
--- /dev/null
+++ b/packages/nodes-base/nodes/Jwt/Jwt.node.ts
@@ -0,0 +1,457 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+import { NodeOperationError } from 'n8n-workflow';
+
+import jwt from 'jsonwebtoken';
+
+import { formatPrivateKey } from '../../utils/utilities';
+import { parseJsonParameter } from '../Set/v2/helpers/utils';
+
+const prettifyOperation = (operation: string) => {
+	if (operation === 'sign') {
+		return 'Sign a JWT';
+	}
+
+	if (operation === 'decode') {
+		return 'Decode a JWT';
+	}
+
+	if (operation === 'verify') {
+		return 'Verify a JWT';
+	}
+
+	return operation;
+};
+
+const getToken = (ctx: IExecuteFunctions, itemIndex = 0) => {
+	const token = ctx.getNodeParameter('token', itemIndex) as string;
+
+	if (!token) {
+		throw new NodeOperationError(ctx.getNode(), 'The JWT token was not provided', {
+			itemIndex,
+			description: "Be sure to add a valid JWT token to the 'Token' parameter",
+		});
+	}
+
+	return token;
+};
+
+export class Jwt implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'JWT',
+		name: 'jwt',
+		icon: 'file:jwt.svg',
+		group: ['transform'],
+		version: 1,
+		description: 'JWT',
+		subtitle: `={{(${prettifyOperation})($parameter.operation)}}`,
+		defaults: {
+			name: 'JWT',
+		},
+		inputs: ['main'],
+		outputs: ['main'],
+		credentials: [
+			{
+				// eslint-disable-next-line n8n-nodes-base/node-class-description-credentials-name-unsuffixed
+				name: 'jwtAuth',
+				required: true,
+			},
+		],
+		properties: [
+			{
+				displayName: 'Operation',
+				name: 'operation',
+				type: 'options',
+				noDataExpression: true,
+				options: [
+					{
+						name: 'Decode',
+						value: 'decode',
+						action: 'Decode a JWT',
+					},
+					{
+						name: 'Sign',
+						value: 'sign',
+						action: 'Sign a JWT',
+					},
+					{
+						name: 'Verify',
+						value: 'verify',
+						action: 'Verify a JWT',
+					},
+				],
+				default: 'sign',
+			},
+			{
+				displayName: 'Use JSON to Build Payload',
+				name: 'useJson',
+				type: 'boolean',
+				default: false,
+				description: 'Whether to use JSON to build the claims',
+				displayOptions: {
+					show: {
+						operation: ['sign'],
+					},
+				},
+			},
+			{
+				displayName: 'Payload Claims',
+				name: 'claims',
+				type: 'collection',
+				placeholder: 'Add Claim',
+				default: {},
+				options: [
+					{
+						displayName: 'Audience',
+						name: 'audience',
+						type: 'string',
+						placeholder: 'e.g. https://example.com',
+						default: '',
+						description: 'Identifies the recipients that the JWT is intended for',
+					},
+					{
+						displayName: 'Expires In',
+						name: 'expiresIn',
+						type: 'number',
+						placeholder: 'e.g. 3600',
+						default: 3600,
+						description: 'The lifetime of the token in seconds',
+						typeOptions: {
+							minValue: 0,
+						},
+					},
+					{
+						displayName: 'Issuer',
+						name: 'issuer',
+						type: 'string',
+						placeholder: 'e.g. https://example.com',
+						default: '',
+						description: 'Identifies the principal that issued the JWT',
+					},
+					{
+						displayName: 'JWT ID',
+						name: 'jwtid',
+						type: 'string',
+						placeholder: 'e.g. 123456',
+						default: '',
+						description: 'Unique identifier for the JWT',
+					},
+					{
+						displayName: 'Not Before',
+						name: 'notBefore',
+						type: 'number',
+						default: 0,
+						description: 'The time before which the JWT must not be accepted for processing',
+						typeOptions: {
+							minValue: 0,
+						},
+					},
+					{
+						displayName: 'Subject',
+						name: 'subject',
+						type: 'string',
+						default: '',
+						description: 'Identifies the principal that is the subject of the JWT',
+					},
+				],
+				displayOptions: {
+					show: {
+						operation: ['sign'],
+						useJson: [false],
+					},
+				},
+			},
+			{
+				displayName: 'Payload Claims (JSON)',
+				name: 'claimsJson',
+				type: 'json',
+				description: 'Claims to add to the token in JSON format',
+				default: '{\n  "my_field_1": "value 1",\n  "my_field_2": "value 2"\n}\n',
+				validateType: 'object',
+				ignoreValidationDuringExecution: true,
+				typeOptions: {
+					rows: 5,
+				},
+				displayOptions: {
+					show: {
+						operation: ['sign'],
+						useJson: [true],
+					},
+				},
+			},
+			{
+				displayName: 'Token',
+				name: 'token',
+				type: 'string',
+				typeOptions: { password: true },
+				required: true,
+				validateType: 'jwt',
+				default: '',
+				description: 'The token to verify or decode',
+				displayOptions: {
+					show: {
+						operation: ['verify', 'decode'],
+					},
+				},
+			},
+
+			{
+				displayName: 'Options',
+				name: 'options',
+				type: 'collection',
+				placeholder: 'Add Option',
+				default: {},
+				options: [
+					{
+						displayName: 'Return Additional Info',
+						name: 'complete',
+						type: 'boolean',
+						default: false,
+						description:
+							'Whether to return the complete decoded token with information about the header and signature or just the payload',
+						displayOptions: {
+							show: {
+								'/operation': ['verify', 'decode'],
+							},
+						},
+					},
+					{
+						displayName: 'Ignore Expiration',
+						name: 'ignoreExpiration',
+						type: 'boolean',
+						default: false,
+						description: 'Whether to ignore the expiration of the token',
+						displayOptions: {
+							show: {
+								'/operation': ['verify'],
+							},
+						},
+					},
+					{
+						displayName: 'Ignore Not Before Claim',
+						name: 'ignoreNotBefore',
+						type: 'boolean',
+						default: false,
+						description: 'Whether to ignore the not before claim of the token',
+						displayOptions: {
+							show: {
+								'/operation': ['verify'],
+							},
+						},
+					},
+					{
+						displayName: 'Clock Tolerance',
+						name: 'clockTolerance',
+						type: 'number',
+						default: 0,
+						description:
+							'Number of seconds to tolerate when checking the nbf and exp claims, to deal with small clock differences among different servers',
+						typeOptions: {
+							minValue: 0,
+						},
+						displayOptions: {
+							show: {
+								'/operation': ['verify'],
+							},
+						},
+					},
+					{
+						displayName: 'Override Algorithm',
+						name: 'algorithm',
+						type: 'options',
+						options: [
+							{
+								name: 'ES256',
+								value: 'ES256',
+							},
+							{
+								name: 'ES384',
+								value: 'ES384',
+							},
+							{
+								name: 'ES512',
+								value: 'ES512',
+							},
+							{
+								name: 'HS256',
+								value: 'HS256',
+							},
+							{
+								name: 'HS384',
+								value: 'HS384',
+							},
+							{
+								name: 'HS512',
+								value: 'HS512',
+							},
+							{
+								name: 'PS256',
+								value: 'PS256',
+							},
+							{
+								name: 'PS384',
+								value: 'PS384',
+							},
+							{
+								name: 'PS512',
+								value: 'PS512',
+							},
+							{
+								name: 'RS256',
+								value: 'RS256',
+							},
+							{
+								name: 'RS384',
+								value: 'RS384',
+							},
+							{
+								name: 'RS512',
+								value: 'RS512',
+							},
+						],
+						default: 'HS256',
+						description:
+							'The algorithm to use for signing or verifying the token, overrides algorithm in credentials',
+						displayOptions: {
+							show: {
+								'/operation': ['sign', 'verify'],
+							},
+						},
+					},
+				],
+			},
+		],
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = this.getInputData();
+		const returnData: INodeExecutionData[] = [];
+
+		const operation = this.getNodeParameter('operation', 0);
+
+		const credentials = (await this.getCredentials('jwtAuth')) as {
+			keyType: 'passphrase' | 'pemKey';
+			publicKey: string;
+			privateKey: string;
+			secret: string;
+			algorithm: jwt.Algorithm;
+		};
+
+		for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
+			const options = this.getNodeParameter('options', itemIndex, {}) as {
+				algorithm?: jwt.Algorithm;
+				complete?: boolean;
+				ignoreExpiration?: boolean;
+				ignoreNotBefore?: boolean;
+				clockTolerance?: number;
+			};
+
+			try {
+				if (operation === 'sign') {
+					const useJson = this.getNodeParameter('useJson', itemIndex) as boolean;
+
+					let payload: IDataObject = {};
+
+					if (useJson) {
+						payload = parseJsonParameter(
+							this.getNodeParameter('claimsJson', itemIndex) as IDataObject,
+							this.getNode(),
+							itemIndex,
+						);
+					} else {
+						payload = this.getNodeParameter('claims', itemIndex) as IDataObject;
+					}
+
+					let secretOrPrivateKey;
+
+					if (credentials.keyType === 'passphrase') {
+						secretOrPrivateKey = credentials.secret;
+					} else {
+						secretOrPrivateKey = formatPrivateKey(credentials.privateKey);
+					}
+
+					const token = jwt.sign(payload, secretOrPrivateKey, {
+						algorithm: options.algorithm ?? credentials.algorithm,
+					});
+
+					returnData.push({
+						json: { token },
+						pairedItem: itemIndex,
+					});
+				}
+
+				if (operation === 'verify') {
+					const token = getToken(this, itemIndex);
+
+					let secretOrPublicKey;
+
+					if (credentials.keyType === 'passphrase') {
+						secretOrPublicKey = credentials.secret;
+					} else {
+						secretOrPublicKey = formatPrivateKey(credentials.publicKey, true);
+					}
+
+					const { ignoreExpiration, ignoreNotBefore, clockTolerance, complete } = options;
+
+					const data = jwt.verify(token, secretOrPublicKey, {
+						algorithms: [options.algorithm ?? credentials.algorithm],
+						ignoreExpiration,
+						ignoreNotBefore,
+						clockTolerance,
+						complete,
+					});
+
+					const json = options.complete && data ? (data as IDataObject) : { payload: data };
+
+					returnData.push({
+						json,
+						pairedItem: itemIndex,
+					});
+				}
+
+				if (operation === 'decode') {
+					const token = getToken(this, itemIndex);
+
+					const data = jwt.decode(token, { complete: options.complete });
+
+					const json = options.complete && data ? (data as IDataObject) : { payload: data };
+
+					returnData.push({
+						json,
+						pairedItem: itemIndex,
+					});
+				}
+			} catch (error) {
+				if (error.message === 'invalid signature') {
+					error = new NodeOperationError(this.getNode(), "The JWT token can't be verified", {
+						itemIndex,
+						description:
+							'Be sure that the provided JWT token is correctly encoded and matches the selected credentials',
+					});
+				}
+				if (this.continueOnFail()) {
+					returnData.push({
+						json: this.getInputData(itemIndex)[0].json,
+						error,
+						pairedItem: itemIndex,
+					});
+					continue;
+				}
+				if (error.context) {
+					error.context.itemIndex = itemIndex;
+					throw error;
+				}
+				throw new NodeOperationError(this.getNode(), error, {
+					itemIndex,
+				});
+			}
+		}
+
+		return [returnData];
+	}
+}
diff --git a/packages/nodes-base/nodes/Jwt/jwt.svg b/packages/nodes-base/nodes/Jwt/jwt.svg
new file mode 100644
index 0000000000000..f29c89d2bdd77
--- /dev/null
+++ b/packages/nodes-base/nodes/Jwt/jwt.svg
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="200px"
+   height="200px"
+   viewBox="0 0 200 200"
+   version="1.1"
+   id="svg10"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <!-- Generator: Sketch 3.3.2 (12043) - http://www.bohemiancoding.com/sketch -->
+  <title
+     id="title1">Group</title>
+  <desc
+     id="desc1">Created with Sketch.</desc>
+  <defs
+     id="defs1">
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter11"
+       x="-0.18346753"
+       y="-0.076523014"
+       width="1.3669351"
+       height="1.153046">
+      <feGaussianBlur
+         stdDeviation="1.2230926"
+         id="feGaussianBlur11" />
+    </filter>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter12"
+       x="-0.18346753"
+       y="-0.076523014"
+       width="1.3669351"
+       height="1.153046">
+      <feGaussianBlur
+         stdDeviation="1.2230926"
+         id="feGaussianBlur12" />
+    </filter>
+  </defs>
+  <g
+     id="layer1" />
+  <g
+     transform="translate(57.626456,48.948311)"
+     id="Shape-6">
+    <g
+       id="g12"
+       transform="matrix(1.8791546,0,0,1.8791546,-51.584186,-42.862227)">
+      <path
+         d="M 42.223544,27.435493 V -0.303311 H 58.223226 V 27.435493 L 50.223385,38.05668 Z"
+         fill="#ffffff"
+         id="path11"
+         style="fill:#ececec;stroke-width:1.04876;filter:url(#filter12)" />
+      <path
+         d="M 57.5,26.9 V 0 h -15 V 26.9 L 50,37.2 Z"
+         fill="#ffffff"
+         id="path1-7" />
+      <path
+         d="M 42.223544,72.517876 V 100.25668 H 58.223226 V 72.517876 L 50.223385,61.896689 Z"
+         fill="#ffffff"
+         id="path10"
+         style="fill:#ececec;stroke-width:1.04876;filter:url(#filter11)" />
+      <path
+         d="m 42.623319,73.156936 v 26.900004 h 15 V 73.156936 l -7.5,-10.3 z"
+         fill="#ffffff"
+         id="path2-5" />
+      <path
+         d="M 57.5,73.1 73.3,94.9 85.5,86 69.6,64.3 57.5,60.3 Z"
+         fill="#00f2e6"
+         id="path3-3" />
+      <path
+         d="M 42.5,26.9 26.7,5.1 14.5,14 l 15.9,21.7 12.1,4 z"
+         fill="#00f2e6"
+         id="path4-5" />
+      <path
+         d="M 30.4,35.7 4.8,27.4 0.1,41.7 25.7,50 37.9,46.1 Z"
+         fill="#00b9f1"
+         id="path5-6" />
+      <path
+         d="M 62.1,53.9 69.6,64.3 95.2,72.6 99.9,58.3 74.3,50 Z"
+         fill="#00b9f1"
+         id="path6-2" />
+      <path
+         d="M 74.3,50 99.9,41.7 95.2,27.4 69.6,35.7 62.1,46.1 Z"
+         fill="#d63aff"
+         id="path7-9" />
+      <path
+         d="M 25.7,50 0.1,58.3 4.8,72.6 30.4,64.3 37.9,53.9 Z"
+         fill="#d63aff"
+         id="path8-1" />
+      <path
+         d="M 30.4,64.3 14.5,86 26.7,94.9 42.5,73.1 V 60.3 Z"
+         fill="#fb015b"
+         id="path9-2" />
+      <path
+         d="M 69.6,35.7 85.5,14 73.3,5.1 57.5,26.9 v 12.8 z"
+         fill="#fb015b"
+         id="path10-7" />
+    </g>
+  </g>
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:title>Group</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+</svg>
diff --git a/packages/nodes-base/nodes/Jwt/test/Jwt.node.test.ts b/packages/nodes-base/nodes/Jwt/test/Jwt.node.test.ts
new file mode 100644
index 0000000000000..5757cd2a2bb56
--- /dev/null
+++ b/packages/nodes-base/nodes/Jwt/test/Jwt.node.test.ts
@@ -0,0 +1,4 @@
+import { testWorkflows, getWorkflowFilenames } from '@test/nodes/Helpers';
+const workflows = getWorkflowFilenames(__dirname);
+
+describe('Test Jwt Node', () => testWorkflows(workflows));
diff --git a/packages/nodes-base/nodes/Jwt/test/jwt.workflow.json b/packages/nodes-base/nodes/Jwt/test/jwt.workflow.json
new file mode 100644
index 0000000000000..12cba9fefc148
--- /dev/null
+++ b/packages/nodes-base/nodes/Jwt/test/jwt.workflow.json
@@ -0,0 +1,412 @@
+{
+  "name": "My workflow 31",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "fcc3e9dc-90c9-4b26-9b44-e661e0ebf658",
+      "name": "When clicking \"Test workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        780,
+        380
+      ]
+    },
+    {
+      "parameters": {
+        "claims": {
+          "audience": "test",
+          "issuer": "test",
+          "jwtid": "123",
+          "subject": "test"
+        },
+        "options": {}
+      },
+      "id": "6b1ba38f-60d8-482a-a7d4-4fee7054334b",
+      "name": "JWT",
+      "type": "n8n-nodes-base.jwt",
+      "typeVersion": 1,
+      "position": [
+        1000,
+        380
+      ],
+      "credentials": {
+        "jwtAuth": {
+          "id": "AosB7WdhmVA3be8t",
+          "name": "JWT Auth test"
+        }
+      }
+    },
+    {
+      "parameters": {
+        "operation": "decode",
+        "token": "={{ $json.token }}",
+        "options": {}
+      },
+      "id": "d07b9335-29a0-41bc-a6c4-0232d94a0559",
+      "name": "JWT1",
+      "type": "n8n-nodes-base.jwt",
+      "typeVersion": 1,
+      "position": [
+        1260,
+        220
+      ],
+      "credentials": {
+        "jwtAuth": {
+          "id": "AosB7WdhmVA3be8t",
+          "name": "JWT Auth test"
+        }
+      }
+    },
+    {
+      "parameters": {
+        "operation": "verify",
+        "token": "={{ $json.token }}",
+        "options": {
+          "complete": true,
+          "ignoreExpiration": true,
+          "ignoreNotBefore": true
+        }
+      },
+      "id": "b6228805-f0c1-479d-bbec-cefcde7298e3",
+      "name": "JWT2",
+      "type": "n8n-nodes-base.jwt",
+      "typeVersion": 1,
+      "position": [
+        1280,
+        440
+      ],
+      "credentials": {
+        "jwtAuth": {
+          "id": "AosB7WdhmVA3be8t",
+          "name": "JWT Auth test"
+        }
+      }
+    },
+    {
+      "parameters": {
+        "useJson": true,
+        "options": {}
+      },
+      "id": "56ede43f-6771-4341-8c17-ba4b9185711a",
+      "name": "JWT3",
+      "type": "n8n-nodes-base.jwt",
+      "typeVersion": 1,
+      "position": [
+        1000,
+        640
+      ],
+      "credentials": {
+        "jwtAuth": {
+          "id": "G45TOKX5kBEraTr1",
+          "name": "JWT Auth test PEM"
+        }
+      }
+    },
+    {
+      "parameters": {
+        "operation": "decode",
+        "token": "={{ $json.token }}",
+        "options": {}
+      },
+      "id": "1b57af10-710f-4b86-9020-e1fc43a222cd",
+      "name": "JWT4",
+      "type": "n8n-nodes-base.jwt",
+      "typeVersion": 1,
+      "position": [
+        1280,
+        640
+      ],
+      "credentials": {
+        "jwtAuth": {
+          "id": "G45TOKX5kBEraTr1",
+          "name": "JWT Auth test PEM"
+        }
+      }
+    },
+    {
+      "parameters": {
+        "operation": "verify",
+        "token": "={{ $json.token }}",
+        "options": {}
+      },
+      "id": "9a658330-ecc3-4007-9524-534ad15a3a40",
+      "name": "JWT5",
+      "type": "n8n-nodes-base.jwt",
+      "typeVersion": 1,
+      "position": [
+        1280,
+        860
+      ],
+      "credentials": {
+        "jwtAuth": {
+          "id": "G45TOKX5kBEraTr1",
+          "name": "JWT Auth test PEM"
+        }
+      }
+    },
+    {
+      "parameters": {
+        "assignments": {
+          "assignments": [
+            {
+              "id": "1289f607-d46f-45f5-953a-1492f3b50bbd",
+              "name": "payload.audience",
+              "value": "={{ $json.payload.audience }}",
+              "type": "string"
+            },
+            {
+              "id": "e32ae71b-62ca-45e5-8351-2fd9ab7451ef",
+              "name": "payload.jwtid",
+              "value": "={{ $json.payload.jwtid }}",
+              "type": "string"
+            }
+          ]
+        },
+        "options": {}
+      },
+      "id": "51a6c4b9-ebae-4ffa-a870-9915c3304cd5",
+      "name": "Edit Fields",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.3,
+      "position": [
+        1500,
+        220
+      ]
+    },
+    {
+      "parameters": {
+        "assignments": {
+          "assignments": [
+            {
+              "id": "3ff845d5-9c2c-4744-bc33-a7318b4741fc",
+              "name": "payload.audience",
+              "value": "={{ $json.payload.audience }}",
+              "type": "string"
+            },
+            {
+              "id": "d1206579-634e-472a-9190-a176cf2477a1",
+              "name": "payload.jwtid",
+              "value": "={{ $json.payload.jwtid }}",
+              "type": "string"
+            }
+          ]
+        },
+        "options": {}
+      },
+      "id": "9e97ea34-ec32-4935-b116-e40815567e1c",
+      "name": "Edit Fields1",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.3,
+      "position": [
+        1520,
+        440
+      ]
+    },
+    {
+      "parameters": {
+        "assignments": {
+          "assignments": [
+            {
+              "id": "46ed5c03-d41a-4387-988e-2ed3821f32d4",
+              "name": "payload.my_field_1",
+              "value": "={{ $json.payload.my_field_1 }}",
+              "type": "string"
+            },
+            {
+              "id": "0007786e-3f93-4146-8e10-32ab8e088b81",
+              "name": "payload.my_field_2",
+              "value": "={{ $json.payload.my_field_2 }}",
+              "type": "string"
+            }
+          ]
+        },
+        "options": {}
+      },
+      "id": "f205e447-2a98-48ef-bba5-12e9aecab90e",
+      "name": "Edit Fields2",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.3,
+      "position": [
+        1520,
+        860
+      ]
+    },
+    {
+      "parameters": {
+        "assignments": {
+          "assignments": [
+            {
+              "id": "fe90f817-1b89-409c-992c-e42070fc67bf",
+              "name": "payload.my_field_1",
+              "value": "={{ $json.payload.my_field_1 }}",
+              "type": "string"
+            },
+            {
+              "id": "1b80e8b3-3004-4959-8c6c-0d36176579ea",
+              "name": "payload.my_field_2",
+              "value": "={{ $json.payload.my_field_2 }}",
+              "type": "string"
+            }
+          ]
+        },
+        "options": {}
+      },
+      "id": "0788f03e-0c1c-4e21-a408-9441930cd82f",
+      "name": "Edit Fields3",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.3,
+      "position": [
+        1520,
+        640
+      ]
+    }
+  ],
+  "pinData": {
+    "Edit Fields": [
+      {
+        "json": {
+          "payload": {
+            "audience": "test",
+            "jwtid": "123"
+          }
+        }
+      }
+    ],
+    "Edit Fields1": [
+      {
+        "json": {
+          "payload": {
+            "audience": "test",
+            "jwtid": "123"
+          }
+        }
+      }
+    ],
+    "Edit Fields3": [
+      {
+        "json": {
+          "payload": {
+            "my_field_1": "value 1",
+            "my_field_2": "value 2"
+          }
+        }
+      }
+    ],
+    "Edit Fields2": [
+      {
+        "json": {
+          "payload": {
+            "my_field_1": "value 1",
+            "my_field_2": "value 2"
+          }
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Test workflow\"": {
+      "main": [
+        [
+          {
+            "node": "JWT",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "JWT3",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "JWT": {
+      "main": [
+        [
+          {
+            "node": "JWT1",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "JWT2",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "JWT3": {
+      "main": [
+        [
+          {
+            "node": "JWT4",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "JWT5",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "JWT1": {
+      "main": [
+        [
+          {
+            "node": "Edit Fields",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "JWT2": {
+      "main": [
+        [
+          {
+            "node": "Edit Fields1",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "JWT4": {
+      "main": [
+        [
+          {
+            "node": "Edit Fields3",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "JWT5": {
+      "main": [
+        [
+          {
+            "node": "Edit Fields2",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "f70ffef1-3c5d-4991-a3aa-b4141b93e4cb",
+  "meta": {
+    "templateCredsSetupCompleted": true,
+    "instanceId": "be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd"
+  },
+  "id": "H0sZEXDuE7VIP5vz",
+  "tags": []
+}
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Kafka/Kafka.node.ts b/packages/nodes-base/nodes/Kafka/Kafka.node.ts
index 3b06faca2edb2..331333fd63375 100644
--- a/packages/nodes-base/nodes/Kafka/Kafka.node.ts
+++ b/packages/nodes-base/nodes/Kafka/Kafka.node.ts
@@ -14,7 +14,8 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { NodeOperationError } from 'n8n-workflow';
+import { ApplicationError, NodeOperationError } from 'n8n-workflow';
+import { generatePairedItemData } from '../../utils/utilities';
 
 export class Kafka implements INodeType {
 	description: INodeTypeDescription = {
@@ -50,7 +51,7 @@ export class Kafka implements INodeType {
 				name: 'sendInputData',
 				type: 'boolean',
 				default: true,
-				description: 'Whether to send the the data the node receives as JSON to Kafka',
+				description: 'Whether to send the data the node receives as JSON to Kafka',
 			},
 			{
 				displayName: 'Message',
@@ -228,7 +229,10 @@ export class Kafka implements INodeType {
 					};
 					if (credentials.authentication === true) {
 						if (!(credentials.username && credentials.password)) {
-							throw Error('Username and password are required for authentication');
+							// eslint-disable-next-line n8n-nodes-base/node-execute-block-wrong-error-thrown
+							throw new ApplicationError('Username and password are required for authentication', {
+								level: 'warning',
+							});
 						}
 						config.sasl = {
 							username: credentials.username as string,
@@ -257,6 +261,7 @@ export class Kafka implements INodeType {
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const items = this.getInputData();
+		const itemData = generatePairedItemData(items.length);
 
 		const length = items.length;
 
@@ -396,10 +401,15 @@ export class Kafka implements INodeType {
 
 			await producer.disconnect();
 
-			return [this.helpers.returnJsonArray(responseData)];
+			const executionData = this.helpers.constructExecutionMetaData(
+				this.helpers.returnJsonArray(responseData),
+				{ itemData },
+			);
+
+			return [executionData];
 		} catch (error) {
 			if (this.continueOnFail()) {
-				return [this.helpers.returnJsonArray({ error: error.message })];
+				return [[{ json: { error: error.message }, pairedItem: itemData }]];
 			} else {
 				throw error;
 			}
diff --git a/packages/nodes-base/nodes/Kafka/KafkaTrigger.node.ts b/packages/nodes-base/nodes/Kafka/KafkaTrigger.node.ts
index 1ff27bd302ec3..a3d871eaaa607 100644
--- a/packages/nodes-base/nodes/Kafka/KafkaTrigger.node.ts
+++ b/packages/nodes-base/nodes/Kafka/KafkaTrigger.node.ts
@@ -9,8 +9,9 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 	ITriggerResponse,
+	IRun,
 } from 'n8n-workflow';
-import { NodeOperationError } from 'n8n-workflow';
+import { createDeferredPromise, NodeOperationError } from 'n8n-workflow';
 
 export class KafkaTrigger implements INodeType {
 	description: INodeTypeDescription = {
@@ -18,7 +19,7 @@ export class KafkaTrigger implements INodeType {
 		name: 'kafkaTrigger',
 		icon: 'file:kafka.svg',
 		group: ['trigger'],
-		version: 1,
+		version: [1, 1.1],
 		description: 'Consume messages from a Kafka topic',
 		defaults: {
 			name: 'Kafka Trigger',
@@ -116,7 +117,7 @@ export class KafkaTrigger implements INodeType {
 						type: 'number',
 						default: 1,
 						description:
-							'Max number of requests that may be in progress at any time. If falsey then no limit.',
+							'The maximum number of unacknowledged requests the client will send on a single connection',
 					},
 					{
 						displayName: 'Read Messages From Beginning',
@@ -132,6 +133,19 @@ export class KafkaTrigger implements INodeType {
 						default: false,
 						description: 'Whether to try to parse the message to an object',
 					},
+					{
+						displayName: 'Parallel Processing',
+						name: 'parallelProcessing',
+						type: 'boolean',
+						default: true,
+						displayOptions: {
+							hide: {
+								'@version': [1],
+							},
+						},
+						description:
+							'Whether to process messages in parallel or by keeping the message in order',
+					},
 					{
 						displayName: 'Only Message',
 						name: 'onlyMessage',
@@ -177,6 +191,10 @@ export class KafkaTrigger implements INodeType {
 
 		const ssl = credentials.ssl as boolean;
 
+		const options = this.getNodeParameter('options', {}) as IDataObject;
+
+		options.nodeVersion = this.getNode().typeVersion;
+
 		const config: KafkaConfig = {
 			clientId,
 			brokers,
@@ -213,9 +231,9 @@ export class KafkaTrigger implements INodeType {
 			heartbeatInterval: this.getNodeParameter('options.heartbeatInterval', 3000) as number,
 		});
 
-		await consumer.connect();
+		const parallelProcessing = options.parallelProcessing as boolean;
 
-		const options = this.getNodeParameter('options', {}) as IDataObject;
+		await consumer.connect();
 
 		await consumer.subscribe({ topic, fromBeginning: options.fromBeginning ? true : false });
 
@@ -261,8 +279,16 @@ export class KafkaTrigger implements INodeType {
 						//@ts-ignore
 						data = value;
 					}
-
-					this.emit([this.helpers.returnJsonArray([data])]);
+					let responsePromise = undefined;
+					if (!parallelProcessing && (options.nodeVersion as number) > 1) {
+						responsePromise = await createDeferredPromise<IRun>();
+						this.emit([this.helpers.returnJsonArray([data])], undefined, responsePromise);
+					} else {
+						this.emit([this.helpers.returnJsonArray([data])]);
+					}
+					if (responsePromise) {
+						await responsePromise.promise();
+					}
 				},
 			});
 		};
diff --git a/packages/nodes-base/nodes/Kafka/kafka.svg b/packages/nodes-base/nodes/Kafka/kafka.svg
index 4499e6a9cde35..9ef827e234dbd 100644
--- a/packages/nodes-base/nodes/Kafka/kafka.svg
+++ b/packages/nodes-base/nodes/Kafka/kafka.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 32 32" preserveAspectRatio="xMidYMid"><path d="M21.538 17.724a4.16 4.16 0 00-3.128 1.42l-1.96-1.388a5.354 5.354 0 00.328-1.832 5.35 5.35 0 00-.317-1.802l1.956-1.373a4.16 4.16 0 003.122 1.414 4.18 4.18 0 004.172-4.172 4.18 4.18 0 00-4.172-4.172 4.18 4.18 0 00-4.172 4.172c0 .412.062.8.174 1.185l-1.957 1.374a5.393 5.393 0 00-3.336-1.94V8.25a4.18 4.18 0 003.313-4.082A4.18 4.18 0 0011.388 0a4.18 4.18 0 00-4.172 4.172 4.177 4.177 0 003.24 4.063v2.4A5.371 5.371 0 006 15.925c0 2.665 1.947 4.88 4.493 5.308v2.523a4.169 4.169 0 00-3.276 4.072A4.18 4.18 0 0011.388 32a4.18 4.18 0 004.172-4.172 4.177 4.177 0 00-3.276-4.072v-2.523a5.386 5.386 0 003.28-1.907l1.973 1.397a4.15 4.15 0 00-.171 1.173 4.18 4.18 0 004.172 4.172 4.18 4.18 0 004.172-4.172 4.18 4.18 0 00-4.172-4.172zm0-9.754c1.115 0 2.022.908 2.022 2.023s-.907 2.022-2.022 2.022-2.022-.907-2.022-2.022.907-2.023 2.022-2.023zM9.366 4.172a2.024 2.024 0 014.045 0c0 1.115-.907 2.022-2.022 2.022s-2.023-.907-2.023-2.022zM13.41 27.83c0 1.115-.907 2.022-2.022 2.022s-2.023-.907-2.023-2.022.907-2.022 2.023-2.022 2.022.907 2.022 2.022zm-2.023-9.082c-1.556 0-2.82-1.265-2.82-2.82s1.265-2.82 2.82-2.82 2.82 1.265 2.82 2.82-1.265 2.82-2.82 2.82zm10.15 5.172c-1.115 0-2.022-.908-2.022-2.023s.907-2.022 2.022-2.022 2.022.907 2.022 2.022-.907 2.023-2.022 2.023z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" preserveAspectRatio="xMidYMid" viewBox="0 0 32 32"><path d="M21.538 17.724a4.16 4.16 0 0 0-3.128 1.42l-1.96-1.388a5.4 5.4 0 0 0 .328-1.832 5.4 5.4 0 0 0-.317-1.802l1.956-1.373a4.16 4.16 0 0 0 3.122 1.414 4.18 4.18 0 0 0 4.172-4.172 4.18 4.18 0 0 0-4.172-4.172 4.18 4.18 0 0 0-4.172 4.172c0 .412.062.8.174 1.185l-1.957 1.374a5.4 5.4 0 0 0-3.336-1.94V8.25a4.18 4.18 0 0 0 3.313-4.082A4.18 4.18 0 0 0 11.388 0a4.18 4.18 0 0 0-4.172 4.172 4.18 4.18 0 0 0 3.24 4.063v2.4A5.37 5.37 0 0 0 6 15.925c0 2.665 1.947 4.88 4.493 5.308v2.523a4.17 4.17 0 0 0-3.276 4.072A4.18 4.18 0 0 0 11.388 32a4.18 4.18 0 0 0 4.172-4.172 4.18 4.18 0 0 0-3.276-4.072v-2.523a5.4 5.4 0 0 0 3.28-1.907l1.973 1.397a4.2 4.2 0 0 0-.171 1.173 4.18 4.18 0 0 0 4.172 4.172 4.18 4.18 0 0 0 4.172-4.172 4.18 4.18 0 0 0-4.172-4.172m0-9.754c1.115 0 2.022.908 2.022 2.023s-.907 2.022-2.022 2.022-2.022-.907-2.022-2.022.907-2.023 2.022-2.023M9.366 4.172a2.024 2.024 0 0 1 4.045 0c0 1.115-.907 2.022-2.022 2.022s-2.023-.907-2.023-2.022M13.41 27.83c0 1.115-.907 2.022-2.022 2.022s-2.023-.907-2.023-2.022.907-2.022 2.023-2.022 2.022.907 2.022 2.022m-2.023-9.082c-1.556 0-2.82-1.265-2.82-2.82s1.265-2.82 2.82-2.82 2.82 1.265 2.82 2.82-1.265 2.82-2.82 2.82m10.15 5.172c-1.115 0-2.022-.908-2.022-2.023s.907-2.022 2.022-2.022 2.022.907 2.022 2.022-.907 2.023-2.022 2.023"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Keap/FileDescription.ts b/packages/nodes-base/nodes/Keap/FileDescription.ts
index 7a9cdb1239b55..6471c1e5dc093 100644
--- a/packages/nodes-base/nodes/Keap/FileDescription.ts
+++ b/packages/nodes-base/nodes/Keap/FileDescription.ts
@@ -40,7 +40,7 @@ export const fileFields: INodeProperties[] = [
 	/*                                 file:upload                                */
 	/* -------------------------------------------------------------------------- */
 	{
-		displayName: 'Binary Data',
+		displayName: 'Binary File',
 		name: 'binaryData',
 		type: 'boolean',
 		default: false,
@@ -53,7 +53,7 @@ export const fileFields: INodeProperties[] = [
 		description: 'Whether the data to upload should be taken from binary field',
 	},
 	{
-		displayName: 'Binary Property',
+		displayName: 'Input Binary Field',
 		name: 'binaryPropertyName',
 		type: 'string',
 		default: 'data',
@@ -65,7 +65,7 @@ export const fileFields: INodeProperties[] = [
 				binaryData: [true],
 			},
 		},
-		description: 'Name of the binary property which contains the data for the file to be uploaded',
+		hint: 'The name of the input binary field containing the file to be uploaded',
 	},
 	{
 		displayName: 'File Association',
diff --git a/packages/nodes-base/nodes/Keap/GenericFunctions.ts b/packages/nodes-base/nodes/Keap/GenericFunctions.ts
index 15adc3ea8a16c..896c4449a9c45 100644
--- a/packages/nodes-base/nodes/Keap/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Keap/GenericFunctions.ts
@@ -1,10 +1,10 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
 	IHookFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
+	IRequestOptions,
 	IWebhookFunctions,
 	JsonObject,
 } from 'n8n-workflow';
@@ -14,7 +14,7 @@ import { snakeCase } from 'change-case';
 
 export async function keapApiRequest(
 	this: IWebhookFunctions | IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -23,7 +23,7 @@ export async function keapApiRequest(
 	headers: IDataObject = {},
 	option: IDataObject = {},
 ): Promise<any> {
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		headers: {
 			'Content-Type': 'application/json',
 		},
@@ -51,7 +51,7 @@ export async function keapApiRequest(
 export async function keapApiRequestAllItems(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: any = {},
diff --git a/packages/nodes-base/nodes/Keap/Keap.node.ts b/packages/nodes-base/nodes/Keap/Keap.node.ts
index 3804350e7ccbe..8c358f5fc65c2 100644
--- a/packages/nodes-base/nodes/Keap/Keap.node.ts
+++ b/packages/nodes-base/nodes/Keap/Keap.node.ts
@@ -8,6 +8,8 @@ import type {
 	INodeTypeDescription,
 } 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';
@@ -47,10 +49,6 @@ import type { IFile } from './FileInterface';
 
 import type { ICompany } from './CompanyInterface';
 
-import { capitalCase, pascalCase } from 'change-case';
-
-import moment from 'moment-timezone';
-
 export class Keap implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Keap',
@@ -606,7 +604,7 @@ export class Keap implements INodeType {
 				//https://developer.infusionsoft.com/docs/rest/#!/E-Commerce/getOrderUsingGET
 				if (operation === 'get') {
 					const orderId = parseInt(this.getNodeParameter('orderId', i) as string, 10);
-					responseData = await keapApiRequest.call(this, 'get', `/orders/${orderId}`);
+					responseData = await keapApiRequest.call(this, 'GET', `/orders/${orderId}`);
 				}
 				//https://developer.infusionsoft.com/docs/rest/#!/E-Commerce/listOrdersUsingGET
 				if (operation === 'getAll') {
@@ -651,7 +649,7 @@ export class Keap implements INodeType {
 				//https://developer.infusionsoft.com/docs/rest/#!/Product/retrieveProductUsingGET
 				if (operation === 'get') {
 					const productId = this.getNodeParameter('productId', i) as string;
-					responseData = await keapApiRequest.call(this, 'get', `/products/${productId}`);
+					responseData = await keapApiRequest.call(this, 'GET', `/products/${productId}`);
 				}
 				//https://developer.infusionsoft.com/docs/rest/#!/Product/listProductsUsingGET
 				if (operation === 'getAll') {
@@ -830,6 +828,6 @@ export class Keap implements INodeType {
 			returnData.push(...executionData);
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Keap/KeapTrigger.node.ts b/packages/nodes-base/nodes/Keap/KeapTrigger.node.ts
index 8933f9c6c743f..9fd1f6fd7ffed 100644
--- a/packages/nodes-base/nodes/Keap/KeapTrigger.node.ts
+++ b/packages/nodes-base/nodes/Keap/KeapTrigger.node.ts
@@ -9,9 +9,8 @@ import type {
 	IWebhookResponseData,
 } from 'n8n-workflow';
 
-import { keapApiRequest } from './GenericFunctions';
-
 import { capitalCase } from 'change-case';
+import { keapApiRequest } from './GenericFunctions';
 
 export class KeapTrigger implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Kitemaker/GenericFunctions.ts b/packages/nodes-base/nodes/Kitemaker/GenericFunctions.ts
index e668293b68112..b1ee217308436 100644
--- a/packages/nodes-base/nodes/Kitemaker/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Kitemaker/GenericFunctions.ts
@@ -4,6 +4,7 @@ import type {
 	IDataObject,
 	IHookFunctions,
 	JsonObject,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
@@ -23,7 +24,7 @@ export async function kitemakerRequest(
 		body,
 		uri: 'https://toil.kitemaker.co/developers/graphql',
 		json: true,
-	};
+	} satisfies IRequestOptions;
 
 	const responseData = await this.helpers.request.call(this, options);
 
diff --git a/packages/nodes-base/nodes/Kitemaker/Kitemaker.node.ts b/packages/nodes-base/nodes/Kitemaker/Kitemaker.node.ts
index 94714f6866324..0f6bb768b9545 100644
--- a/packages/nodes-base/nodes/Kitemaker/Kitemaker.node.ts
+++ b/packages/nodes-base/nodes/Kitemaker/Kitemaker.node.ts
@@ -328,6 +328,6 @@ export class Kitemaker implements INodeType {
 			returnData.push(...executionData);
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Kitemaker/kitemaker.svg b/packages/nodes-base/nodes/Kitemaker/kitemaker.svg
index 1e26da9261974..db36157041079 100644
--- a/packages/nodes-base/nodes/Kitemaker/kitemaker.svg
+++ b/packages/nodes-base/nodes/Kitemaker/kitemaker.svg
@@ -1 +1 @@
-<svg version="1.0" xmlns="http://www.w3.org/2000/svg" width="226.667" height="226.667" viewBox="-30 -25 220 220"><path fill="#662482" d="M106.5 25.5c-30.2 14-56 25.4-57.2 25.4-1.7.1-6.1-5-20-22.9C11.5 5.1 8.7 2.4 5.1 4.7c-1.4.9-1.6 8.9-1.9 79.3-.1 57 .1 78.6.9 79.6 3.5 4.3 3.3 4.6 85.2-77.4C145.1 30.4 168 6.8 168 5.3c0-2.6-2.5-5.3-4.8-5.2-.9 0-26.4 11.5-56.7 25.4z"/><path fill="#e61b73" d="M69.4 125.2c-13.3 13.4-24.4 25.1-24.7 26-.3.9.2 2.6 1.1 3.8 1.6 1.8 6.7 2.6 59.9 8.5 32 3.5 58.9 6.2 59.7 5.9 1.9-.7 2.9-3.8 2.1-6.2-.3-.9-15.9-15.2-34.6-31.7-24.1-21.2-34.8-30.1-36.7-30.3-2.3-.2-5.9 3-26.8 24z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="226.667" height="226.667" version="1.0" viewBox="-30 -25 220 220"><path fill="#662482" d="M106.5 25.5c-30.2 14-56 25.4-57.2 25.4-1.7.1-6.1-5-20-22.9C11.5 5.1 8.7 2.4 5.1 4.7c-1.4.9-1.6 8.9-1.9 79.3-.1 57 .1 78.6.9 79.6 3.5 4.3 3.3 4.6 85.2-77.4C145.1 30.4 168 6.8 168 5.3c0-2.6-2.5-5.3-4.8-5.2-.9 0-26.4 11.5-56.7 25.4"/><path fill="#e61b73" d="M69.4 125.2c-13.3 13.4-24.4 25.1-24.7 26s.2 2.6 1.1 3.8c1.6 1.8 6.7 2.6 59.9 8.5 32 3.5 58.9 6.2 59.7 5.9 1.9-.7 2.9-3.8 2.1-6.2-.3-.9-15.9-15.2-34.6-31.7-24.1-21.2-34.8-30.1-36.7-30.3-2.3-.2-5.9 3-26.8 24"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/KoBoToolbox/FileDescription.ts b/packages/nodes-base/nodes/KoBoToolbox/FileDescription.ts
index 8e15042e722a7..868d1538d7fdd 100644
--- a/packages/nodes-base/nodes/KoBoToolbox/FileDescription.ts
+++ b/packages/nodes-base/nodes/KoBoToolbox/FileDescription.ts
@@ -121,7 +121,7 @@ export const fileFields: INodeProperties[] = [
 		},
 		options: [
 			{
-				name: 'Binary Data',
+				name: 'Binary File',
 				value: 'binary',
 			},
 			{
diff --git a/packages/nodes-base/nodes/KoBoToolbox/GenericFunctions.ts b/packages/nodes-base/nodes/KoBoToolbox/GenericFunctions.ts
index 4cf3d01311618..cb9b6b6a2c7d6 100644
--- a/packages/nodes-base/nodes/KoBoToolbox/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/KoBoToolbox/GenericFunctions.ts
@@ -9,21 +9,21 @@ 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';
+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,
@@ -84,7 +84,7 @@ export async function koBoToolboxRawRequest(
 		option.url = (credentials.URL as string) + option.url;
 	}
 
-	return this.helpers.httpRequestWithAuthentication.call(this, 'koBoToolboxApi', option);
+	return await this.helpers.httpRequestWithAuthentication.call(this, 'koBoToolboxApi', option);
 }
 
 function parseGeoPoint(geoPoint: string): null | number[] {
@@ -132,7 +132,7 @@ const formatValue = (value: any, format: string): any => {
 			// Only return if all values are properly parsed
 			if (coordinates.length === points.length) {
 				// If the shape is closed, declare it as Polygon, otherwise as LineString
-				// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+
 				if (first(points) === last(points)) {
 					return {
 						type: 'Polygon',
diff --git a/packages/nodes-base/nodes/KoBoToolbox/koBoToolbox.svg b/packages/nodes-base/nodes/KoBoToolbox/koBoToolbox.svg
index a26f0eb303a81..e1e33e56e9de2 100644
--- a/packages/nodes-base/nodes/KoBoToolbox/koBoToolbox.svg
+++ b/packages/nodes-base/nodes/KoBoToolbox/koBoToolbox.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="23.17 23.5 19.18 28.6"><style>.st79{fill:#64c0ff}</style><g id="Layer_4"><path class="st79" d="M38.6 42.8v2.8c0 1.6-1.3 2.8-2.8 2.8h-6.1c-1.6 0-2.8-1.3-2.8-2.8V30c0-1.6 1.3-2.8 2.8-2.8h6.1c1.6 0 2.8 1.3 2.8 2.8v.4c.5-.2 1.1-.3 1.7-.3.7 0 1.4.1 2 .4V30c0-3.6-2.9-6.5-6.5-6.5h-6.1c-3.6 0-6.5 2.9-6.5 6.5v15.6c0 3.6 2.9 6.5 6.5 6.5h6.1c3.6 0 6.5-2.9 6.5-6.5v-7.1l-3.7 4.3z"/><path class="st79" d="M35.6 41.9l6.6-7.6c.2-.2.2-.6-.1-.8-1.2-1-2.9-.9-3.9.3l-4.1 4.7c-.1.1-.3.1-.3 0l-1.5-1.9c-.3-.4-.8-.4-1.2 0-1 1-1 2.6-.1 3.7l1.2 1.5c.8 1.2 2.5 1.2 3.4.1z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="23.17 23.5 19.18 28.6"><style>.st79{fill:#64c0ff}</style><g id="Layer_4"><path d="M38.6 42.8v2.8c0 1.6-1.3 2.8-2.8 2.8h-6.1c-1.6 0-2.8-1.3-2.8-2.8V30c0-1.6 1.3-2.8 2.8-2.8h6.1c1.6 0 2.8 1.3 2.8 2.8v.4c.5-.2 1.1-.3 1.7-.3.7 0 1.4.1 2 .4V30c0-3.6-2.9-6.5-6.5-6.5h-6.1c-3.6 0-6.5 2.9-6.5 6.5v15.6c0 3.6 2.9 6.5 6.5 6.5h6.1c3.6 0 6.5-2.9 6.5-6.5v-7.1z" class="st79"/><path d="m35.6 41.9 6.6-7.6c.2-.2.2-.6-.1-.8-1.2-1-2.9-.9-3.9.3l-4.1 4.7c-.1.1-.3.1-.3 0l-1.5-1.9c-.3-.4-.8-.4-1.2 0-1 1-1 2.6-.1 3.7l1.2 1.5c.8 1.2 2.5 1.2 3.4.1" class="st79"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Ldap/Helpers.ts b/packages/nodes-base/nodes/Ldap/Helpers.ts
new file mode 100644
index 0000000000000..5e4447fa8463e
--- /dev/null
+++ b/packages/nodes-base/nodes/Ldap/Helpers.ts
@@ -0,0 +1,58 @@
+import { Client } from 'ldapts';
+import type { ClientOptions, Entry } from 'ldapts';
+import type { ICredentialDataDecryptedObject, IDataObject } from 'n8n-workflow';
+import { LoggerProxy as Logger } from 'n8n-workflow';
+export const BINARY_AD_ATTRIBUTES = ['objectGUID', 'objectSid'];
+
+const resolveEntryBinaryAttributes = (entry: Entry): Entry => {
+	Object.entries(entry)
+		.filter(([k]) => BINARY_AD_ATTRIBUTES.includes(k))
+		.forEach(([k]) => {
+			entry[k] = (entry[k] as Buffer).toString('hex');
+		});
+	return entry;
+};
+
+export const resolveBinaryAttributes = (entries: Entry[]): void => {
+	entries.forEach((entry) => resolveEntryBinaryAttributes(entry));
+};
+
+export async function createLdapClient(
+	credentials: ICredentialDataDecryptedObject,
+	nodeDebug?: boolean,
+	nodeType?: string,
+	nodeName?: string,
+): Promise<Client> {
+	const protocol = credentials.connectionSecurity === 'tls' ? 'ldaps' : 'ldap';
+	const url = `${protocol}://${credentials.hostname}:${credentials.port}`;
+
+	const ldapOptions: ClientOptions = { url };
+	const tlsOptions: IDataObject = {};
+
+	if (credentials.connectionSecurity !== 'none') {
+		tlsOptions.rejectUnauthorized = credentials.allowUnauthorizedCerts === false;
+		if (credentials.caCertificate) {
+			tlsOptions.ca = [credentials.caCertificate as string];
+		}
+		if (credentials.connectionSecurity !== 'startTls') {
+			ldapOptions.tlsOptions = tlsOptions;
+		}
+	}
+
+	if (credentials.timeout) {
+		// Convert seconds to milliseconds
+		ldapOptions.timeout = (credentials.timeout as number) * 1000;
+	}
+
+	if (nodeDebug) {
+		Logger.info(
+			`[${nodeType} | ${nodeName}] - LDAP Options: ${JSON.stringify(ldapOptions, null, 2)}`,
+		);
+	}
+
+	const client = new Client(ldapOptions);
+	if (credentials.connectionSecurity === 'startTls') {
+		await client.startTLS(tlsOptions);
+	}
+	return client;
+}
diff --git a/packages/nodes-base/nodes/Ldap/Ldap.node.json b/packages/nodes-base/nodes/Ldap/Ldap.node.json
new file mode 100644
index 0000000000000..864cb53de4cbb
--- /dev/null
+++ b/packages/nodes-base/nodes/Ldap/Ldap.node.json
@@ -0,0 +1,19 @@
+{
+	"node": "n8n-nodes-base.ldap",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"categories": ["Development", "Developer Tools"],
+	"resources": {
+		"credentialDocumentation": [
+			{
+				"url": "https://docs.n8n.io/credentials/ldap"
+			}
+		],
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.ldap/"
+			}
+		]
+	},
+	"alias": ["ad", "active directory"]
+}
diff --git a/packages/nodes-base/nodes/Ldap/Ldap.node.ts b/packages/nodes-base/nodes/Ldap/Ldap.node.ts
new file mode 100644
index 0000000000000..3f62afa729e40
--- /dev/null
+++ b/packages/nodes-base/nodes/Ldap/Ldap.node.ts
@@ -0,0 +1,443 @@
+import type {
+	ICredentialDataDecryptedObject,
+	ICredentialsDecrypted,
+	ICredentialTestFunctions,
+	IDataObject,
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
+	INodeCredentialTestResult,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+import { NodeOperationError } from 'n8n-workflow';
+
+import { Attribute, Change } from 'ldapts';
+import { ldapFields } from './LdapDescription';
+import { BINARY_AD_ATTRIBUTES, createLdapClient, resolveBinaryAttributes } from './Helpers';
+
+export class Ldap implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Ldap',
+		name: 'ldap',
+		icon: 'file:ldap.svg',
+		group: ['transform'],
+		version: 1,
+		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+		description: 'Interact with LDAP servers',
+		defaults: {
+			name: 'LDAP',
+		},
+		inputs: ['main'],
+		outputs: ['main'],
+		credentials: [
+			{
+				// eslint-disable-next-line n8n-nodes-base/node-class-description-credentials-name-unsuffixed
+				name: 'ldap',
+				required: true,
+				testedBy: 'ldapConnectionTest',
+			},
+		],
+		properties: [
+			{
+				displayName: 'Operation',
+				name: 'operation',
+				type: 'options',
+				noDataExpression: true,
+				options: [
+					{
+						name: 'Compare',
+						value: 'compare',
+						description: 'Compare an attribute',
+						action: 'Compare an attribute',
+					},
+					{
+						name: 'Create',
+						value: 'create',
+						description: 'Create a new entry',
+						action: 'Create a new entry',
+					},
+					{
+						name: 'Delete',
+						value: 'delete',
+						description: 'Delete an entry',
+						action: 'Delete an entry',
+					},
+					{
+						name: 'Rename',
+						value: 'rename',
+						description: 'Rename the DN of an existing entry',
+						action: 'Rename the DN of an existing entry',
+					},
+					{
+						name: 'Search',
+						value: 'search',
+						description: 'Search LDAP',
+						action: 'Search LDAP',
+					},
+					{
+						name: 'Update',
+						value: 'update',
+						description: 'Update attributes',
+						action: 'Update attributes',
+					},
+				],
+				default: 'search',
+			},
+			{
+				displayName: 'Debug',
+				name: 'nodeDebug',
+				type: 'boolean',
+				isNodeSetting: true,
+				default: false,
+				noDataExpression: true,
+			},
+			...ldapFields,
+		],
+	};
+
+	methods = {
+		credentialTest: {
+			async ldapConnectionTest(
+				this: ICredentialTestFunctions,
+				credential: ICredentialsDecrypted,
+			): Promise<INodeCredentialTestResult> {
+				const credentials = credential.data as ICredentialDataDecryptedObject;
+				const client = await createLdapClient(credentials);
+				try {
+					await client.bind(credentials.bindDN as string, credentials.bindPassword as string);
+				} catch (error) {
+					return {
+						status: 'Error',
+						message: error.message,
+					};
+				} finally {
+					await client.unbind();
+				}
+				return {
+					status: 'OK',
+					message: 'Connection successful!',
+				};
+			},
+		},
+		loadOptions: {
+			async getAttributes(this: ILoadOptionsFunctions) {
+				const credentials = await this.getCredentials('ldap');
+				const client = await createLdapClient(credentials);
+
+				try {
+					await client.bind(credentials.bindDN as string, credentials.bindPassword as string);
+				} catch (error) {
+					await client.unbind();
+					console.log(error);
+					return [];
+				}
+
+				let results;
+				const baseDN = this.getNodeParameter('baseDN', 0) as string;
+				try {
+					results = await client.search(baseDN, { sizeLimit: 200, paged: false }); // should this size limit be set in credentials?
+				} catch (error) {
+					console.log(error);
+					return [];
+				} finally {
+					await client.unbind();
+				}
+
+				const unique = Object.keys(Object.assign({}, ...results.searchEntries));
+				return unique.map((x) => ({
+					name: x,
+					value: x,
+				}));
+			},
+
+			async getObjectClasses(this: ILoadOptionsFunctions) {
+				const credentials = await this.getCredentials('ldap');
+				const client = await createLdapClient(credentials);
+				try {
+					await client.bind(credentials.bindDN as string, credentials.bindPassword as string);
+				} catch (error) {
+					await client.unbind();
+					console.log(error);
+					return [];
+				}
+
+				const baseDN = this.getNodeParameter('baseDN', 0) as string;
+
+				let results;
+				try {
+					results = await client.search(baseDN, { sizeLimit: 10, paged: false }); // should this size limit be set in credentials?
+				} catch (error) {
+					console.log(error);
+					return [];
+				} finally {
+					await client.unbind();
+				}
+
+				const objects = [];
+				for (const entry of results.searchEntries) {
+					if (typeof entry.objectClass === 'string') {
+						objects.push(entry.objectClass);
+					} else {
+						objects.push(...entry.objectClass);
+					}
+				}
+
+				const unique = [...new Set(objects)];
+				unique.push('custom');
+				const result = [];
+				for (const value of unique) {
+					if (value === 'custom') {
+						result.push({ name: 'custom', value: 'custom' });
+					} else result.push({ name: value as string, value: `(objectclass=${value})` });
+				}
+				return result;
+			},
+
+			async getAttributesForDn(this: ILoadOptionsFunctions) {
+				const credentials = await this.getCredentials('ldap');
+				const client = await createLdapClient(credentials);
+
+				try {
+					await client.bind(credentials.bindDN as string, credentials.bindPassword as string);
+				} catch (error) {
+					await client.unbind();
+					console.log(error);
+					return [];
+				}
+
+				let results;
+				const baseDN = this.getNodeParameter('dn', 0) as string;
+				try {
+					results = await client.search(baseDN, { sizeLimit: 1, paged: false });
+				} catch (error) {
+					console.log(error);
+					return [];
+				} finally {
+					await client.unbind();
+				}
+
+				const unique = Object.keys(Object.assign({}, ...results.searchEntries));
+				return unique.map((x) => ({
+					name: x,
+					value: x,
+				}));
+			},
+		},
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const nodeDebug = this.getNodeParameter('nodeDebug', 0) as boolean;
+
+		const items = this.getInputData();
+		const returnItems: INodeExecutionData[] = [];
+
+		if (nodeDebug) {
+			this.logger.info(
+				`[${this.getNode().type} | ${this.getNode().name}] - Starting with ${
+					items.length
+				} input items`,
+			);
+		}
+
+		const credentials = await this.getCredentials('ldap');
+		const client = await createLdapClient(
+			credentials,
+			nodeDebug,
+			this.getNode().type,
+			this.getNode().name,
+		);
+
+		try {
+			await client.bind(credentials.bindDN as string, credentials.bindPassword as string);
+		} catch (error) {
+			delete error.cert;
+			await client.unbind();
+			if (this.continueOnFail()) {
+				return [
+					items.map((x) => {
+						x.json.error = error.reason || 'LDAP connection error occurred';
+						return x;
+					}),
+				];
+			} else {
+				throw new NodeOperationError(this.getNode(), error as Error, {});
+			}
+		}
+
+		const operation = this.getNodeParameter('operation', 0);
+
+		for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
+			try {
+				if (operation === 'compare') {
+					const dn = this.getNodeParameter('dn', itemIndex) as string;
+					const attributeId = this.getNodeParameter('id', itemIndex) as string;
+					const value = this.getNodeParameter('value', itemIndex, '') as string;
+
+					const res = await client.compare(dn, attributeId, value);
+
+					returnItems.push({
+						json: { dn, attribute: attributeId, result: res },
+						pairedItem: { item: itemIndex },
+					});
+				} else if (operation === 'create') {
+					const dn = this.getNodeParameter('dn', itemIndex) as string;
+					const attributeFields = this.getNodeParameter('attributes', itemIndex) as IDataObject;
+
+					const attributes: IDataObject = {};
+
+					if (Object.keys(attributeFields).length) {
+						//@ts-ignore
+						attributeFields.attribute.map((attr) => {
+							attributes[attr.id as string] = attr.value;
+						});
+					}
+
+					await client.add(dn, attributes as unknown as Attribute[]);
+
+					returnItems.push({
+						json: { dn, result: 'success' },
+						pairedItem: { item: itemIndex },
+					});
+				} else if (operation === 'delete') {
+					const dn = this.getNodeParameter('dn', itemIndex) as string;
+
+					await client.del(dn);
+
+					returnItems.push({
+						json: { dn, result: 'success' },
+						pairedItem: { item: itemIndex },
+					});
+				} else if (operation === 'rename') {
+					const dn = this.getNodeParameter('dn', itemIndex) as string;
+					const targetDn = this.getNodeParameter('targetDn', itemIndex) as string;
+
+					await client.modifyDN(dn, targetDn);
+
+					returnItems.push({
+						json: { dn: targetDn, result: 'success' },
+						pairedItem: { item: itemIndex },
+					});
+				} else if (operation === 'update') {
+					const dn = this.getNodeParameter('dn', itemIndex) as string;
+					const attributes = this.getNodeParameter('attributes', itemIndex, {}) as IDataObject;
+					const changes: Change[] = [];
+
+					for (const [action, attrs] of Object.entries(attributes)) {
+						//@ts-ignore
+						attrs.map((attr) =>
+							changes.push(
+								new Change({
+									// @ts-ignore
+									operation: action,
+									modification: new Attribute({
+										type: attr.id as string,
+										values: [attr.value],
+									}),
+								}),
+							),
+						);
+					}
+
+					await client.modify(dn, changes);
+
+					returnItems.push({
+						json: { dn, result: 'success', changes },
+						pairedItem: { item: itemIndex },
+					});
+				} else if (operation === 'search') {
+					const baseDN = this.getNodeParameter('baseDN', itemIndex) as string;
+					let searchFor = this.getNodeParameter('searchFor', itemIndex) as string;
+					const returnAll = this.getNodeParameter('returnAll', itemIndex);
+					const limit = this.getNodeParameter('limit', itemIndex, 0);
+					const options = this.getNodeParameter('options', itemIndex);
+					const pageSize = this.getNodeParameter(
+						'options.pageSize',
+						itemIndex,
+						1000,
+					) as IDataObject;
+
+					// Set paging settings
+					delete options.pageSize;
+					options.sizeLimit = returnAll ? 0 : limit;
+					if (pageSize) {
+						options.paged = { pageSize };
+					}
+
+					// Set attributes to retrieve
+					if (typeof options.attributes === 'string') {
+						options.attributes = options.attributes.split(',').map((attribute) => attribute.trim());
+					}
+					options.explicitBufferAttributes = BINARY_AD_ATTRIBUTES;
+
+					if (searchFor === 'custom') {
+						searchFor = this.getNodeParameter('customFilter', itemIndex) as string;
+					} else {
+						const searchText = this.getNodeParameter('searchText', itemIndex) as string;
+						const attribute = this.getNodeParameter('attribute', itemIndex) as string;
+						searchFor = `(&${searchFor}(${attribute}=${searchText}))`;
+					}
+
+					// Replace escaped filter special chars for ease of use
+					// Character       ASCII value
+					// ---------------------------
+					// *               0x2a
+					// (               0x28
+					// )               0x29
+					// \               0x5c
+					searchFor = searchFor.replace(/\\\\/g, '\\5c');
+					searchFor = searchFor.replace(/\\\*/g, '\\2a');
+					searchFor = searchFor.replace(/\\\(/g, '\\28');
+					searchFor = searchFor.replace(/\\\)/g, '\\29');
+					options.filter = searchFor;
+
+					if (nodeDebug) {
+						this.logger.info(
+							`[${this.getNode().type} | ${this.getNode().name}] - Search Options ${JSON.stringify(
+								options,
+								null,
+								2,
+							)}`,
+						);
+					}
+
+					const results = await client.search(baseDN, options);
+
+					// Not all LDAP servers respect the sizeLimit
+					if (!returnAll) {
+						results.searchEntries = results.searchEntries.slice(0, limit);
+					}
+					resolveBinaryAttributes(results.searchEntries);
+
+					returnItems.push.apply(
+						returnItems,
+						results.searchEntries.map((result) => ({
+							json: result,
+							pairedItem: { item: itemIndex },
+						})),
+					);
+				}
+			} catch (error) {
+				if (this.continueOnFail()) {
+					returnItems.push({ json: items[itemIndex].json, error, pairedItem: itemIndex });
+				} else {
+					await client.unbind();
+					if (error.context) {
+						error.context.itemIndex = itemIndex;
+						throw error;
+					}
+					throw new NodeOperationError(this.getNode(), error as Error, {
+						itemIndex,
+					});
+				}
+			}
+		}
+		if (nodeDebug) {
+			this.logger.info(`[${this.getNode().type} | ${this.getNode().name}] - Finished`);
+		}
+
+		await client.unbind();
+
+		return [returnItems];
+	}
+}
diff --git a/packages/nodes-base/nodes/Ldap/LdapDescription.ts b/packages/nodes-base/nodes/Ldap/LdapDescription.ts
new file mode 100644
index 0000000000000..0f523accb77e1
--- /dev/null
+++ b/packages/nodes-base/nodes/Ldap/LdapDescription.ts
@@ -0,0 +1,456 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+export const ldapFields: INodeProperties[] = [
+	// ----------------------------------
+	//         Common
+	// ----------------------------------
+	{
+		displayName: 'DN',
+		name: 'dn',
+		type: 'string',
+		default: '',
+		placeholder: 'e.g. ou=users,dc=n8n,dc=io',
+		required: true,
+		typeOptions: {
+			alwaysOpenEditWindow: false,
+		},
+		displayOptions: {
+			show: {
+				operation: ['compare'],
+			},
+		},
+		description: 'The distinguished name of the entry to compare',
+	},
+	{
+		displayName: 'DN',
+		name: 'dn',
+		type: 'string',
+		default: '',
+		placeholder: 'e.g. ou=users,dc=n8n,dc=io',
+		required: true,
+		typeOptions: {
+			alwaysOpenEditWindow: false,
+		},
+		displayOptions: {
+			show: {
+				operation: ['create'],
+			},
+		},
+		description: 'The distinguished name of the entry to create',
+	},
+	{
+		displayName: 'DN',
+		name: 'dn',
+		type: 'string',
+		default: '',
+		placeholder: 'e.g. ou=users,dc=n8n,dc=io',
+		required: true,
+		typeOptions: {
+			alwaysOpenEditWindow: false,
+		},
+		displayOptions: {
+			show: {
+				operation: ['delete'],
+			},
+		},
+		description: 'The distinguished name of the entry to delete',
+	},
+	{
+		displayName: 'DN',
+		name: 'dn',
+		type: 'string',
+		default: '',
+		placeholder: 'e.g. cn=john,ou=users,dc=n8n,dc=io',
+		required: true,
+		typeOptions: {
+			alwaysOpenEditWindow: false,
+		},
+		displayOptions: {
+			show: {
+				operation: ['rename'],
+			},
+		},
+		description: 'The distinguished name of the entry to rename',
+	},
+	{
+		displayName: 'DN',
+		name: 'dn',
+		type: 'string',
+		default: '',
+		placeholder: 'e.g. ou=users,dc=n8n,dc=io',
+		required: true,
+		typeOptions: {
+			alwaysOpenEditWindow: false,
+		},
+		displayOptions: {
+			show: {
+				operation: ['modify'],
+			},
+		},
+		description: 'The distinguished name of the entry to modify',
+	},
+	{
+		displayName: 'DN',
+		name: 'dn',
+		type: 'string',
+		default: '',
+		placeholder: 'e.g. ou=users,dc=n8n,dc=io',
+		required: true,
+		typeOptions: {
+			alwaysOpenEditWindow: false,
+		},
+		displayOptions: {
+			show: {
+				operation: ['update'],
+			},
+		},
+		description: 'The distinguished name of the entry to update',
+	},
+	// ----------------------------------
+	//         Compare
+	// ----------------------------------
+	{
+		// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-options
+		displayName: 'Attribute ID',
+		name: 'id',
+		type: 'options',
+		required: true,
+		default: [],
+		typeOptions: {
+			loadOptionsMethod: 'getAttributesForDn',
+		},
+		// eslint-disable-next-line n8n-nodes-base/node-param-description-wrong-for-dynamic-options
+		description: 'The ID of the attribute to compare',
+		displayOptions: {
+			show: {
+				operation: ['compare'],
+			},
+		},
+	},
+	{
+		displayName: 'Value',
+		name: 'value',
+		type: 'string',
+		default: '',
+		description: 'The value to compare',
+		displayOptions: {
+			show: {
+				operation: ['compare'],
+			},
+		},
+	},
+	// ----------------------------------
+	//         Rename
+	// ----------------------------------
+	{
+		displayName: 'New DN',
+		name: 'targetDn',
+		type: 'string',
+		default: '',
+		placeholder: 'e.g. cn=nathan,ou=users,dc=n8n,dc=io',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: ['rename'],
+			},
+		},
+		description: 'The new distinguished name for the entry',
+	},
+	// ----------------------------------
+	//         Create
+	// ----------------------------------
+	{
+		displayName: 'Attributes',
+		name: 'attributes',
+		placeholder: 'Add Attributes',
+		description: 'Attributes to add to the entry',
+		type: 'fixedCollection',
+		typeOptions: {
+			multipleValues: true,
+		},
+		displayOptions: {
+			show: {
+				operation: ['create'],
+			},
+		},
+		default: {},
+		options: [
+			{
+				name: 'attribute',
+				displayName: 'Attribute',
+				values: [
+					{
+						displayName: 'Attribute ID',
+						name: 'id',
+						type: 'string',
+						default: '',
+						description: 'The ID of the attribute to add',
+						required: true,
+					},
+					{
+						displayName: 'Value',
+						name: 'value',
+						type: 'string',
+						default: '',
+						description: 'Value of the attribute to set',
+					},
+				],
+			},
+		],
+	},
+	// ----------------------------------
+	//         Update
+	// ----------------------------------
+	{
+		displayName: 'Update Attributes',
+		name: 'attributes',
+		placeholder: 'Update Attributes',
+		type: 'fixedCollection',
+		typeOptions: {
+			multipleValues: true,
+			sortable: true,
+		},
+		displayOptions: {
+			show: {
+				operation: ['update'],
+			},
+		},
+		description: 'Update entry attributes',
+		default: {},
+		options: [
+			{
+				name: 'add',
+				displayName: 'Add',
+				values: [
+					{
+						displayName: 'Attribute ID',
+						name: 'id',
+						type: 'string',
+						default: '',
+						description: 'The ID of the attribute to add',
+						required: true,
+					},
+					{
+						displayName: 'Value',
+						name: 'value',
+						type: 'string',
+						default: '',
+						description: 'Value of the attribute to set',
+					},
+				],
+			},
+			{
+				name: 'replace',
+				displayName: 'Replace',
+				values: [
+					{
+						displayName: 'Attribute ID',
+						name: 'id',
+						type: 'string',
+						default: '',
+						description: 'The ID of the attribute to replace',
+						required: true,
+					},
+					{
+						displayName: 'Value',
+						name: 'value',
+						type: 'string',
+						default: '',
+						description: 'Value of the attribute to replace',
+					},
+				],
+			},
+			{
+				name: 'delete',
+				displayName: 'Remove',
+				values: [
+					{
+						displayName: 'Attribute ID',
+						name: 'id',
+						type: 'string',
+						default: '',
+						description: 'The ID of the attribute to remove',
+						required: true,
+					},
+					{
+						displayName: 'Value',
+						name: 'value',
+						type: 'string',
+						default: '',
+						description: 'Value of the attribute to remove',
+					},
+				],
+			},
+		],
+	},
+	// ----------------------------------
+	//         Search
+	// ----------------------------------
+	{
+		displayName: 'Base DN',
+		name: 'baseDN',
+		type: 'string',
+		default: '',
+		placeholder: 'e.g. ou=users, dc=n8n, dc=io',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: ['search'],
+			},
+		},
+		description: 'The distinguished name of the subtree to search in',
+	},
+	{
+		// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-options
+		displayName: 'Search For',
+		name: 'searchFor',
+		type: 'options',
+		default: [],
+		typeOptions: {
+			loadOptionsMethod: 'getObjectClasses',
+		},
+		displayOptions: {
+			show: {
+				operation: ['search'],
+			},
+		},
+		// eslint-disable-next-line n8n-nodes-base/node-param-description-wrong-for-dynamic-options
+		description: 'Directory object class to search for',
+	},
+	{
+		displayName: 'Custom Filter',
+		name: 'customFilter',
+		type: 'string',
+		default: '(objectclass=*)',
+		displayOptions: {
+			show: {
+				operation: ['search'],
+				searchFor: ['custom'],
+			},
+		},
+		description: 'Custom LDAP filter. Escape these chars * ( ) \\ with a backslash "\\".',
+	},
+	{
+		// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-options
+		displayName: 'Attribute',
+		name: 'attribute',
+		type: 'options',
+		required: true,
+		default: [],
+		typeOptions: {
+			loadOptionsMethod: 'getAttributes',
+		},
+		// eslint-disable-next-line n8n-nodes-base/node-param-description-wrong-for-dynamic-options
+		description: 'Attribute to search for',
+		displayOptions: {
+			show: {
+				operation: ['search'],
+			},
+			hide: {
+				searchFor: ['custom'],
+			},
+		},
+	},
+	{
+		displayName: 'Search Text',
+		name: 'searchText',
+		type: 'string',
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: ['search'],
+			},
+			hide: {
+				searchFor: ['custom'],
+			},
+		},
+		description: 'Text to search for, Use * for a wildcard',
+	},
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		default: false,
+		description: 'Whether to return all results or only up to a given limit',
+		displayOptions: {
+			show: {
+				operation: ['search'],
+			},
+		},
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		default: 50,
+		description: 'Max number of results to return',
+		typeOptions: {
+			minValue: 1,
+		},
+		displayOptions: {
+			show: {
+				operation: ['search'],
+				returnAll: [false],
+			},
+		},
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		displayOptions: {
+			show: {
+				operation: ['search'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Attribute Names or IDs',
+				name: 'attributes',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getAttributes',
+				},
+				default: [],
+				description:
+					'Comma-separated list of attributes to return. Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Page Size',
+				name: 'pageSize',
+				type: 'number',
+				default: 1000,
+				typeOptions: {
+					minValue: 0,
+				},
+				description:
+					'Maximum number of results to request at one time. Set to 0 to disable paging.',
+			},
+			{
+				displayName: 'Scope',
+				name: 'scope',
+				default: 'sub',
+				description:
+					'The set of entries at or below the BaseDN that may be considered potential matches',
+				type: 'options',
+				options: [
+					{
+						name: 'Base Object',
+						value: 'base',
+					},
+					{
+						name: 'Single Level',
+						value: 'one',
+					},
+					{
+						name: 'Whole Subtree',
+						value: 'sub',
+					},
+				],
+			},
+		],
+	},
+];
diff --git a/packages/nodes-base/nodes/Ldap/ldap.svg b/packages/nodes-base/nodes/Ldap/ldap.svg
new file mode 100644
index 0000000000000..116934012edbc
--- /dev/null
+++ b/packages/nodes-base/nodes/Ldap/ldap.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" class="svg-icon" style="width:1em;height:1em;vertical-align:middle;fill:currentColor;overflow:hidden" viewBox="0 0 1024 1024"><path d="M206.9 564.6c17.7 0 32-14.3 32-32V188.8c0-16.4 13.3-29.6 29.6-29.6h467.4c16.4 0 29.6 13.3 29.6 29.6v345.3c0 3.9.7 7.8 2.1 11.4 12.6 33.2 61.9 24.1 61.9-11.4V188.8c0-51.7-41.9-93.6-93.6-93.6H268.5c-51.7 0-93.6 41.9-93.6 93.6v343.8c0 17.7 14.3 32 32 32"/><path d="M671.4 294c0-17.7-14.3-32-32-32H363.1c-17.7 0-32 14.3-32 32s14.3 32 32 32h276.3c17.6 0 32-14.3 32-32m-32 118.7H363.1c-17.7 0-32 14.3-32 32s14.3 32 32 32h276.3c17.7 0 32-14.3 32-32s-14.4-32-32-32M40.9 645.5h-1.8c-16.2 0-29.4 13.2-29.4 29.4v261.4c0 16.2 13.2 29.4 29.4 29.4h160.2c16.2 0 29.4-13.2 29.4-29.4s-13.2-29.4-29.4-29.4h-129v-232c0-16.2-13.1-29.4-29.4-29.4m461.3 160.1c0-51.1-12.7-90.1-37.5-117-26.2-28.7-64.1-43.1-114.7-43.1h-84.4c-16.2 0-29.4 13.2-29.4 29.4v261.4c0 16.2 13.2 29.4 29.4 29.4H350c50.6 0 88.6-14.4 114.7-43.1 24.9-27.3 37.5-66.3 37.5-117m-81.1 77c-17.4 17.1-49.6 24.7-76.7 24.7h-47.3v-205h47.3c34.5 0 60.8 8 76.7 24.3 15.5 15.9 23.3 35.5 23.3 71.4 0 44.4-9.4 71-23.3 84.6m164.4-217.9-97.2 261.4c-7.2 19.2 7.1 39.7 27.6 39.7h2.4c12.5 0 23.6-7.9 27.7-19.6l21.4-60.7h109.4l21.4 60.7c4.2 11.8 15.3 19.6 27.7 19.6h1.4c20.5 0 34.7-20.5 27.6-39.7l-97.2-261.4c-4.3-11.5-15.3-19.2-27.6-19.2H613c-12.2 0-23.2 7.6-27.5 19.2m.1 169.5 35.3-100.6h1.3l35 100.6zm310.7-188.7h-99.7c-16.2 0-29.4 13.2-29.4 29.4v261.4c0 16.2 13.2 29.4 29.4 29.4h2.2c16.2 0 29.4-13.2 29.4-29.4v-93.5h67.2c75.9 0 113.9-33.2 113.9-99.1 0-65.5-38-98.2-113-98.2m45.8 131.9c-10.5 8.1-27 12.6-49.7 12.6h-64.2v-90.6h64.2c22.2 0 38.8 4 49.3 12.6 10.5 8.1 16.1 17.9 16.1 31.8 0 16.7-5.2 25.1-15.7 33.6"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Lemlist/GenericFunctions.ts b/packages/nodes-base/nodes/Lemlist/GenericFunctions.ts
index 70e6e5c46501b..8a587a939044f 100644
--- a/packages/nodes-base/nodes/Lemlist/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Lemlist/GenericFunctions.ts
@@ -3,10 +3,10 @@ import type {
 	IHookFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 
-import type { OptionsWithUri } from 'request';
-
 import { capitalCase } from 'change-case';
 
 /**
@@ -14,13 +14,13 @@ import { capitalCase } from 'change-case';
  */
 export async function lemlistApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject = {},
 	qs: IDataObject = {},
 	option: IDataObject = {},
 ) {
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {},
 		method,
 		uri: `https://api.lemlist.com/api${endpoint}`,
@@ -41,7 +41,7 @@ export async function lemlistApiRequest(
 		Object.assign(options, option);
 	}
 
-	return this.helpers.requestWithAuthentication.call(this, 'lemlistApi', options);
+	return await this.helpers.requestWithAuthentication.call(this, 'lemlistApi', options);
 }
 
 /**
@@ -49,13 +49,13 @@ export async function lemlistApiRequest(
  */
 export async function lemlistApiRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
+	qs: IDataObject = {},
 ) {
 	const returnData: IDataObject[] = [];
 
 	let responseData;
-	const qs: IDataObject = {};
 
 	qs.limit = 100;
 	qs.offset = 0;
diff --git a/packages/nodes-base/nodes/Lemlist/Lemlist.node.json b/packages/nodes-base/nodes/Lemlist/Lemlist.node.json
index ea5db735355b8..ad4187c070fd3 100644
--- a/packages/nodes-base/nodes/Lemlist/Lemlist.node.json
+++ b/packages/nodes-base/nodes/Lemlist/Lemlist.node.json
@@ -2,7 +2,7 @@
 	"node": "n8n-nodes-base.lemlist",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Communication", "Marketing & Content"],
+	"categories": ["Communication", "Marketing"],
 	"resources": {
 		"credentialDocumentation": [
 			{
diff --git a/packages/nodes-base/nodes/Lemlist/Lemlist.node.ts b/packages/nodes-base/nodes/Lemlist/Lemlist.node.ts
index 06de58a088ac3..2f8652655cc94 100644
--- a/packages/nodes-base/nodes/Lemlist/Lemlist.node.ts
+++ b/packages/nodes-base/nodes/Lemlist/Lemlist.node.ts
@@ -7,6 +7,8 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
+import isEmpty from 'lodash/isEmpty';
+import omit from 'lodash/omit';
 import {
 	activityFields,
 	activityOperations,
@@ -22,9 +24,6 @@ import {
 
 import { lemlistApiRequest, lemlistApiRequestAllItems } from './GenericFunctions';
 
-import isEmpty from 'lodash.isempty';
-import omit from 'lodash.omit';
-
 export class Lemlist implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Lemlist',
@@ -123,7 +122,7 @@ export class Lemlist implements INodeType {
 
 						// https://developer.lemlist.com/#activities
 
-						const returnAll = this.getNodeParameter('returnAll', 0);
+						const returnAll = this.getNodeParameter('returnAll', i);
 
 						const qs = {} as IDataObject;
 						const filters = this.getNodeParameter('filters', i);
@@ -132,11 +131,11 @@ export class Lemlist implements INodeType {
 							Object.assign(qs, filters);
 						}
 
-						responseData = await lemlistApiRequest.call(this, 'GET', '/activities', {}, qs);
-
-						if (!returnAll) {
-							const limit = this.getNodeParameter('limit', 0);
-							responseData = responseData.slice(0, limit);
+						if (returnAll) {
+							responseData = await lemlistApiRequestAllItems.call(this, 'GET', '/activities', qs);
+						} else {
+							qs.limit = this.getNodeParameter('limit', i);
+							responseData = await lemlistApiRequest.call(this, 'GET', '/activities', {}, qs);
 						}
 					}
 				} else if (resource === 'campaign') {
@@ -151,13 +150,15 @@ export class Lemlist implements INodeType {
 
 						// https://developer.lemlist.com/#list-all-campaigns
 
-						responseData = await lemlistApiRequest.call(this, 'GET', '/campaigns');
-
 						const returnAll = this.getNodeParameter('returnAll', i);
 
-						if (!returnAll) {
-							const limit = this.getNodeParameter('limit', i);
-							responseData = responseData.slice(0, limit);
+						if (returnAll) {
+							responseData = await lemlistApiRequestAllItems.call(this, 'GET', '/campaigns', {});
+						} else {
+							const qs = {
+								limit: this.getNodeParameter('limit', i),
+							};
+							responseData = await lemlistApiRequest.call(this, 'GET', '/campaigns', {}, qs);
 						}
 					}
 				} else if (resource === 'lead') {
@@ -277,7 +278,7 @@ export class Lemlist implements INodeType {
 						const returnAll = this.getNodeParameter('returnAll', i);
 
 						if (returnAll) {
-							responseData = await lemlistApiRequestAllItems.call(this, 'GET', '/unsubscribes');
+							responseData = await lemlistApiRequestAllItems.call(this, 'GET', '/unsubscribes', {});
 						} else {
 							const qs = {
 								limit: this.getNodeParameter('limit', i),
@@ -307,6 +308,6 @@ export class Lemlist implements INodeType {
 			returnData.push(...executionData);
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Lemlist/LemlistTrigger.node.json b/packages/nodes-base/nodes/Lemlist/LemlistTrigger.node.json
index e6940412d6bd2..35a65a1950f6d 100644
--- a/packages/nodes-base/nodes/Lemlist/LemlistTrigger.node.json
+++ b/packages/nodes-base/nodes/Lemlist/LemlistTrigger.node.json
@@ -2,7 +2,7 @@
 	"node": "n8n-nodes-base.lemlistTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Communication", "Marketing & Content"],
+	"categories": ["Communication", "Marketing"],
 	"resources": {
 		"credentialDocumentation": [
 			{
diff --git a/packages/nodes-base/nodes/Lemlist/lemlist.svg b/packages/nodes-base/nodes/Lemlist/lemlist.svg
index b96f4b0d70142..990519775060f 100644
--- a/packages/nodes-base/nodes/Lemlist/lemlist.svg
+++ b/packages/nodes-base/nodes/Lemlist/lemlist.svg
@@ -1 +1 @@
-<svg version="1.0" xmlns="http://www.w3.org/2000/svg" width="266.667" height="266.667" viewBox="0 0 200 200"><path d="M31.5 1.4C18.8 5.4 9.7 13.3 4.1 25L.5 32.5V74c0 40.3.1 41.8 2.3 50 2.7 10 9.3 24.2 15.2 33.1 2.4 3.5 8.2 10.2 13 14.9 13.5 13.3 29.6 21.5 52 26.4 6.4 1.5 13.1 1.6 46.5 1.4l39-.3 7-3.4c8.8-4.3 16.3-11.9 20.7-20.8l3.3-6.8.3-65.5c.3-69.7.3-69.6-4.6-79.5C190 13 183 6.8 171.6 2.5L165 0l-64.8.1C50.8.1 34.6.4 31.5 1.4zm40.2 59l2.8 2.4.5 24.9c.8 37.7-.3 36.6 37.1 37.1 22.9.3 24.8.4 26.8 2.3 2.7 2.5 3.5 6 2.4 9.6-1.7 5.1-3.4 5.4-32.3 5.1l-26.5-.3-5.3-3c-7.3-4-14.7-12.3-16.9-18.8-1.3-4.1-1.7-10.1-2.1-28.5-.4-25.2 0-27.6 4.6-31.2 3.3-2.6 5.5-2.5 8.9.4zm65.4-.9c5.7 3 6.2 11.2.9 14-2.3 1.2-7.1 1.5-21.8 1.5-17.6 0-19.1-.1-21.6-2.1-4.8-3.8-2.9-11.9 3.4-14.2.8-.3 9.3-.6 18.8-.6 13.8-.1 17.9.2 20.3 1.4zM131 94c1.3 1.3 2 3.3 2 6s-.7 4.7-2 6c-1.8 1.8-3.3 2-18.2 2-15.2 0-16.3-.1-18.5-2.2-3-2.8-3.1-8.3-.1-11.5 2.1-2.2 2.7-2.3 18.5-2.3 15 0 16.5.2 18.3 2z" fill="#4d19ff"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="266.667" height="266.667" version="1.0" viewBox="0 0 200 200"><path fill="#4d19ff" d="M31.5 1.4C18.8 5.4 9.7 13.3 4.1 25L.5 32.5V74c0 40.3.1 41.8 2.3 50 2.7 10 9.3 24.2 15.2 33.1 2.4 3.5 8.2 10.2 13 14.9 13.5 13.3 29.6 21.5 52 26.4 6.4 1.5 13.1 1.6 46.5 1.4l39-.3 7-3.4c8.8-4.3 16.3-11.9 20.7-20.8l3.3-6.8.3-65.5c.3-69.7.3-69.6-4.6-79.5C190 13 183 6.8 171.6 2.5L165 0l-64.8.1C50.8.1 34.6.4 31.5 1.4m40.2 59 2.8 2.4.5 24.9c.8 37.7-.3 36.6 37.1 37.1 22.9.3 24.8.4 26.8 2.3 2.7 2.5 3.5 6 2.4 9.6-1.7 5.1-3.4 5.4-32.3 5.1l-26.5-.3-5.3-3c-7.3-4-14.7-12.3-16.9-18.8-1.3-4.1-1.7-10.1-2.1-28.5-.4-25.2 0-27.6 4.6-31.2 3.3-2.6 5.5-2.5 8.9.4m65.4-.9c5.7 3 6.2 11.2.9 14-2.3 1.2-7.1 1.5-21.8 1.5-17.6 0-19.1-.1-21.6-2.1-4.8-3.8-2.9-11.9 3.4-14.2.8-.3 9.3-.6 18.8-.6 13.8-.1 17.9.2 20.3 1.4M131 94c1.3 1.3 2 3.3 2 6s-.7 4.7-2 6c-1.8 1.8-3.3 2-18.2 2-15.2 0-16.3-.1-18.5-2.2-3-2.8-3.1-8.3-.1-11.5 2.1-2.2 2.7-2.3 18.5-2.3 15 0 16.5.2 18.3 2"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Line/GenericFunctions.ts b/packages/nodes-base/nodes/Line/GenericFunctions.ts
index 0b57cbbfc1e7d..d779bdd3b9457 100644
--- a/packages/nodes-base/nodes/Line/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Line/GenericFunctions.ts
@@ -1,18 +1,17 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	JsonObject,
+	IRequestOptions,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function lineApiRequest(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IHookFunctions,
-	method: string,
+	this: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -20,7 +19,7 @@ export async function lineApiRequest(
 	uri?: string,
 	option: IDataObject = {},
 ): Promise<any> {
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		headers: {
 			'Content-Type': 'application/json',
 		},
diff --git a/packages/nodes-base/nodes/Line/Line.node.ts b/packages/nodes-base/nodes/Line/Line.node.ts
index 160bfd961f2d6..1d157670eff6b 100644
--- a/packages/nodes-base/nodes/Line/Line.node.ts
+++ b/packages/nodes-base/nodes/Line/Line.node.ts
@@ -139,6 +139,6 @@ export class Line implements INodeType {
 				throw error;
 			}
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Line/NotificationDescription.ts b/packages/nodes-base/nodes/Line/NotificationDescription.ts
index 289a01ceb2643..b4ce909de0614 100644
--- a/packages/nodes-base/nodes/Line/NotificationDescription.ts
+++ b/packages/nodes-base/nodes/Line/NotificationDescription.ts
@@ -68,7 +68,7 @@ export const notificationFields: INodeProperties[] = [
 						displayName: 'Image',
 						values: [
 							{
-								displayName: 'Binary Data',
+								displayName: 'Binary File',
 								name: 'binaryData',
 								type: 'boolean',
 								default: false,
@@ -98,7 +98,7 @@ export const notificationFields: INodeProperties[] = [
 								description: 'HTTP/HTTPS URL. Maximum size of 240×240px JPEG.',
 							},
 							{
-								displayName: 'Binary Property',
+								displayName: 'Input Binary Field',
 								name: 'binaryProperty',
 								type: 'string',
 								displayOptions: {
@@ -107,7 +107,7 @@ export const notificationFields: INodeProperties[] = [
 									},
 								},
 								default: 'data',
-								description: 'Name of the property that holds the binary data',
+								hint: 'The name of the input binary field containing the file to be written',
 							},
 						],
 					},
diff --git a/packages/nodes-base/nodes/Linear/GenericFunctions.ts b/packages/nodes-base/nodes/Linear/GenericFunctions.ts
index 21fed19e1c8dd..4d008f2ac5d87 100644
--- a/packages/nodes-base/nodes/Linear/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Linear/GenericFunctions.ts
@@ -1,5 +1,3 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	ICredentialDataDecryptedObject,
 	ICredentialTestFunctions,
@@ -9,10 +7,11 @@ import type {
 	IHookFunctions,
 	IWebhookFunctions,
 	JsonObject,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import get from 'lodash.get';
+import get from 'lodash/get';
 
 import { query } from './Queries';
 
@@ -23,8 +22,9 @@ export async function linearApiRequest(
 	option: IDataObject = {},
 ): Promise<any> {
 	const endpoint = 'https://api.linear.app/graphql';
+	const authenticationMethod = this.getNodeParameter('authentication', 0, 'apiToken') as string;
 
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		headers: {
 			'Content-Type': 'application/json',
 		},
@@ -35,7 +35,11 @@ export async function linearApiRequest(
 	};
 	options = Object.assign({}, options, option);
 	try {
-		return await this.helpers.requestWithAuthentication.call(this, 'linearApi', options);
+		return await this.helpers.requestWithAuthentication.call(
+			this,
+			authenticationMethod === 'apiToken' ? 'linearApi' : 'linearOAuth2Api',
+			options,
+		);
 	} catch (error) {
 		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
@@ -48,20 +52,30 @@ export function capitalizeFirstLetter(data: string) {
 export async function linearApiRequestAllItems(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	propertyName: string,
-
 	body: any = {},
+	limit?: number,
 ): Promise<any> {
 	const returnData: IDataObject[] = [];
 
 	let responseData;
-	body.variables.first = 50;
+	body.variables.first = limit && limit < 50 ? limit : 50;
 	body.variables.after = null;
 
+	const propertyPath = propertyName.split('.');
+	const nodesPath = [...propertyPath, 'nodes'];
+	const endCursorPath = [...propertyPath, 'pageInfo', 'endCursor'];
+	const hasNextPagePath = [...propertyPath, 'pageInfo', 'hasNextPage'];
+
 	do {
 		responseData = await linearApiRequest.call(this, body);
-		returnData.push.apply(returnData, get(responseData, `${propertyName}.nodes`) as IDataObject[]);
-		body.variables.after = get(responseData, `${propertyName}.pageInfo.endCursor`);
-	} while (get(responseData, `${propertyName}.pageInfo.hasNextPage`));
+		const nodes = get(responseData, nodesPath) as IDataObject[];
+		returnData.push(...nodes);
+		body.variables.after = get(responseData, endCursorPath);
+		if (limit && returnData.length >= limit) {
+			return returnData;
+		}
+	} while (get(responseData, hasNextPagePath));
+
 	return returnData;
 }
 
@@ -71,7 +85,7 @@ export async function validateCredentials(
 ): Promise<any> {
 	const credentials = decryptedCredentials;
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			'Content-Type': 'application/json',
 			Authorization: credentials.apiKey,
@@ -87,7 +101,7 @@ export async function validateCredentials(
 		json: true,
 	};
 
-	return this.helpers.request(options);
+	return await this.helpers.request(options);
 }
 
 //@ts-ignore
diff --git a/packages/nodes-base/nodes/Linear/IssueDescription.ts b/packages/nodes-base/nodes/Linear/IssueDescription.ts
index 0ac3e00300d93..207bfd6028522 100644
--- a/packages/nodes-base/nodes/Linear/IssueDescription.ts
+++ b/packages/nodes-base/nodes/Linear/IssueDescription.ts
@@ -113,10 +113,9 @@ export const issueFields: INodeProperties[] = [
 				default: '',
 			},
 			{
-				displayName: 'Priority Name/ID',
+				displayName: 'Priority',
 				name: 'priorityId',
 				type: 'options',
-				// eslint-disable-next-line n8n-nodes-base/node-param-options-type-unsorted-items
 				options: [
 					{
 						name: 'Urgent',
@@ -127,12 +126,12 @@ export const issueFields: INodeProperties[] = [
 						value: 2,
 					},
 					{
-						name: 'Medium',
+						name: 'Normal',
 						value: 3,
 					},
 					{
 						name: 'Low',
-						value: 3,
+						value: 4,
 					},
 					{
 						name: 'No Priority',
@@ -193,7 +192,6 @@ export const issueFields: INodeProperties[] = [
 		default: 50,
 		typeOptions: {
 			minValue: 1,
-			maxValue: 300,
 		},
 		displayOptions: {
 			show: {
@@ -254,7 +252,7 @@ export const issueFields: INodeProperties[] = [
 				displayName: 'Priority Name/ID',
 				name: 'priorityId',
 				type: 'options',
-				// eslint-disable-next-line n8n-nodes-base/node-param-options-type-unsorted-items
+
 				options: [
 					{
 						name: 'Urgent',
diff --git a/packages/nodes-base/nodes/Linear/Linear.node.ts b/packages/nodes-base/nodes/Linear/Linear.node.ts
index 644d6a8142a82..6bbc784fe3248 100644
--- a/packages/nodes-base/nodes/Linear/Linear.node.ts
+++ b/packages/nodes-base/nodes/Linear/Linear.node.ts
@@ -46,9 +46,39 @@ export class Linear implements INodeType {
 				name: 'linearApi',
 				required: true,
 				testedBy: 'linearApiTest',
+				displayOptions: {
+					show: {
+						authentication: ['apiToken'],
+					},
+				},
+			},
+			{
+				name: 'linearOAuth2Api',
+				required: true,
+				displayOptions: {
+					show: {
+						authentication: ['oAuth2'],
+					},
+				},
 			},
 		],
 		properties: [
+			{
+				displayName: 'Authentication',
+				name: 'authentication',
+				type: 'options',
+				options: [
+					{
+						name: 'API Token',
+						value: 'apiToken',
+					},
+					{
+						name: 'OAuth2',
+						value: 'oAuth2',
+					},
+				],
+				default: 'apiToken',
+			},
 			{
 				displayName: 'Resource',
 				name: 'resource',
@@ -242,9 +272,7 @@ export class Linear implements INodeType {
 							responseData = await linearApiRequestAllItems.call(this, 'data.issues', body);
 						} else {
 							const limit = this.getNodeParameter('limit', 0);
-							body.variables.first = limit;
-							responseData = await linearApiRequest.call(this, body);
-							responseData = responseData.data.issues.nodes;
+							responseData = await linearApiRequestAllItems.call(this, 'data.issues', body, limit);
 						}
 					}
 					if (operation === 'update') {
@@ -281,6 +309,6 @@ export class Linear implements INodeType {
 				throw error;
 			}
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Linear/LinearTrigger.node.ts b/packages/nodes-base/nodes/Linear/LinearTrigger.node.ts
index 273a2c11b7e24..643f6b70b8e93 100644
--- a/packages/nodes-base/nodes/Linear/LinearTrigger.node.ts
+++ b/packages/nodes-base/nodes/Linear/LinearTrigger.node.ts
@@ -29,6 +29,20 @@ export class LinearTrigger implements INodeType {
 				name: 'linearApi',
 				required: true,
 				testedBy: 'linearApiTest',
+				displayOptions: {
+					show: {
+						authentication: ['apiToken'],
+					},
+				},
+			},
+			{
+				name: 'linearOAuth2Api',
+				required: true,
+				displayOptions: {
+					show: {
+						authentication: ['oAuth2'],
+					},
+				},
 			},
 		],
 		webhooks: [
@@ -40,6 +54,22 @@ export class LinearTrigger implements INodeType {
 			},
 		],
 		properties: [
+			{
+				displayName: 'Authentication',
+				name: 'authentication',
+				type: 'options',
+				options: [
+					{
+						name: 'API Token',
+						value: 'apiToken',
+					},
+					{
+						name: 'OAuth2',
+						value: 'oAuth2',
+					},
+				],
+				default: 'apiToken',
+			},
 			{
 				displayName: 'Team Name or ID',
 				name: 'teamId',
diff --git a/packages/nodes-base/nodes/Linear/linear.svg b/packages/nodes-base/nodes/Linear/linear.svg
index 48f134ba9e7cd..0a52e7ddb8cca 100644
--- a/packages/nodes-base/nodes/Linear/linear.svg
+++ b/packages/nodes-base/nodes/Linear/linear.svg
@@ -1 +1 @@
-<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg" style="width:24px;height:24px;margin-right:12px"><path d="M0.403013 37.3991L26.6009 63.597C13.2225 61.3356 2.66442 50.7775 0.403013 37.3991Z" fill="#5E6AD2"></path><path d="M0 30.2868L33.7132 64C35.7182 63.8929 37.6742 63.6013 39.5645 63.142L0.85799 24.4355C0.398679 26.3259 0.10713 28.2818 0 30.2868Z" fill="#5E6AD2"></path><path d="M2.53593 19.4042L44.5958 61.4641C46.1277 60.8066 47.598 60.0331 48.9956 59.1546L4.84543 15.0044C3.96691 16.402 3.19339 17.8723 2.53593 19.4042Z" fill="#5E6AD2"></path><path d="M7.69501 11.1447C13.5677 4.32093 22.2677 0 31.9769 0C49.6628 0 64 14.3372 64 32.0231C64 41.7323 59.6791 50.4323 52.8553 56.305L7.69501 11.1447Z" fill="#5E6AD2"></path></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" fill="none" style="width:24px;height:24px;margin-right:12px"><path fill="#5E6AD2" d="m.403 37.4 26.198 26.197C13.223 61.336 2.664 50.777.403 37.399M0 30.287 33.713 64a32 32 0 0 0 5.852-.858L.858 24.435c-.46 1.89-.75 3.847-.858 5.852M2.536 19.404l42.06 42.06a32 32 0 0 0 4.4-2.31l-44.15-44.15a32 32 0 0 0-2.31 4.4M7.695 11.145C13.568 4.32 22.268 0 31.977 0 49.663 0 64 14.337 64 32.023c0 9.71-4.32 18.41-11.145 24.282z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/LingvaNex/GenericFunctions.ts b/packages/nodes-base/nodes/LingvaNex/GenericFunctions.ts
index 895a7bd83136f..ef41a8806154e 100644
--- a/packages/nodes-base/nodes/LingvaNex/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/LingvaNex/GenericFunctions.ts
@@ -1,18 +1,17 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	JsonObject,
+	IRequestOptions,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function lingvaNexApiRequest(
-	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -22,7 +21,7 @@ export async function lingvaNexApiRequest(
 ): Promise<any> {
 	try {
 		const credentials = await this.getCredentials('lingvaNexApi');
-		let options: OptionsWithUri = {
+		let options: IRequestOptions = {
 			headers: {
 				Authorization: `Bearer ${credentials.apiKey}`,
 			},
diff --git a/packages/nodes-base/nodes/LinkedIn/GenericFunctions.ts b/packages/nodes-base/nodes/LinkedIn/GenericFunctions.ts
index 1c1caf9047b9e..45c941b3edd44 100644
--- a/packages/nodes-base/nodes/LinkedIn/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/LinkedIn/GenericFunctions.ts
@@ -1,11 +1,11 @@
-import type { OptionsWithUrl } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	JsonObject,
+	IRequestOptions,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 function resolveHeaderData(fullResponse: any) {
@@ -18,24 +18,33 @@ function resolveHeaderData(fullResponse: any) {
 
 export async function linkedInApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: any = {},
 	binary?: boolean,
 	_headers?: object,
 ): Promise<any> {
-	let options: OptionsWithUrl = {
+	const authenticationMethod = this.getNodeParameter('authentication', 0);
+	const credentialType =
+		authenticationMethod === 'standard'
+			? 'linkedInOAuth2Api'
+			: 'linkedInCommunityManagementOAuth2Api';
+
+	const baseUrl = 'https://api.linkedin.com';
+
+	let options: IRequestOptions = {
 		headers: {
 			Accept: 'application/json',
 			'X-Restli-Protocol-Version': '2.0.0',
-			'LinkedIn-Version': '202301',
+			'LinkedIn-Version': '202404',
 		},
 		method,
 		body,
-		url: binary ? endpoint : `https://api.linkedin.com/rest${endpoint}`,
+		url: binary ? endpoint : `${baseUrl}${endpoint.includes('v2') ? '' : '/rest'}${endpoint}`,
 		json: true,
 	};
+
 	options = Object.assign({}, options, {
 		resolveWithFullResponse: true,
 	});
@@ -43,6 +52,9 @@ export async function linkedInApiRequest(
 	if (binary) {
 		delete options.json;
 		options.encoding = null;
+		if (Object.keys(_headers as object).length > 0) {
+			Object.assign(options.headers as object, _headers);
+		}
 	}
 
 	if (Object.keys(body as IDataObject).length === 0) {
@@ -51,7 +63,7 @@ export async function linkedInApiRequest(
 
 	try {
 		return resolveHeaderData(
-			await this.helpers.requestOAuth2.call(this, 'linkedInOAuth2Api', options, {
+			await this.helpers.requestOAuth2.call(this, credentialType, options, {
 				tokenType: 'Bearer',
 			}),
 		);
diff --git a/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.json b/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.json
index a3db83c26be38..01509a97afc3d 100644
--- a/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.json
+++ b/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.json
@@ -2,7 +2,7 @@
 	"node": "n8n-nodes-base.linkedIn",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Marketing & Content", "Communication"],
+	"categories": ["Marketing", "Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
diff --git a/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.ts b/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.ts
index 434fa2cc8c8f9..cbccc2763131c 100644
--- a/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.ts
+++ b/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.ts
@@ -11,7 +11,6 @@ import { linkedInApiRequest } from './GenericFunctions';
 import { postFields, postOperations } from './PostDescription';
 
 export class LinkedIn implements INodeType {
-	// eslint-disable-next-line n8n-nodes-base/node-class-description-missing-subtitle
 	description: INodeTypeDescription = {
 		displayName: 'LinkedIn',
 		name: 'linkedIn',
@@ -29,9 +28,39 @@ export class LinkedIn implements INodeType {
 			{
 				name: 'linkedInOAuth2Api',
 				required: true,
+				displayOptions: {
+					show: {
+						authentication: ['standard'],
+					},
+				},
+			},
+			{
+				name: 'linkedInCommunityManagementOAuth2Api',
+				required: true,
+				displayOptions: {
+					show: {
+						authentication: ['communityManagement'],
+					},
+				},
 			},
 		],
 		properties: [
+			{
+				displayName: 'Authentication',
+				name: 'authentication',
+				type: 'options',
+				options: [
+					{
+						name: 'Standard',
+						value: 'standard',
+					},
+					{
+						name: 'Community Management',
+						value: 'communityManagement',
+					},
+				],
+				default: 'standard',
+			},
 			{
 				displayName: 'Resource',
 				name: 'resource',
@@ -56,12 +85,24 @@ export class LinkedIn implements INodeType {
 			// Get Person URN which has to be used with other LinkedIn API Requests
 			// https://docs.microsoft.com/en-us/linkedin/consumer/integrations/self-serve/sign-in-with-linkedin
 			async getPersonUrn(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const person = await linkedInApiRequest.call(this, 'GET', '/me', {});
-				returnData.push({
-					name: `${person.localizedFirstName} ${person.localizedLastName}`,
-					value: person.id,
-				});
+				const authentication = this.getNodeParameter('authentication', 0);
+				let endpoint = '/me';
+				if (authentication === 'standard') {
+					const { legacy } = await this.getCredentials('linkedInOAuth2Api');
+					if (!legacy) {
+						endpoint = '/v2/userinfo';
+					}
+				}
+				const person = await linkedInApiRequest.call(this, 'GET', endpoint, {});
+				const firstName = person.localizedFirstName ?? person.given_name;
+				const lastName = person.localizedLastName ?? person.family_name;
+				const name = `${firstName} ${lastName}`;
+				const returnData: INodePropertyOptions[] = [
+					{
+						name,
+						value: person.id ?? person.sub,
+					},
+				];
 				return returnData;
 			},
 		},
@@ -107,16 +148,12 @@ export class LinkedIn implements INodeType {
 							lifecycleState: 'PUBLISHED',
 							distribution: {
 								feedDistribution: 'MAIN_FEED',
-								targetEnties: [],
 								thirdPartyDistributionChannels: [],
 							},
 							visibility,
 						};
 
 						if (shareMediaCategory === 'IMAGE') {
-							if (additionalFields.description) {
-								description = additionalFields.description as string;
-							}
 							if (additionalFields.title) {
 								title = additionalFields.title as string;
 							}
@@ -135,18 +172,28 @@ export class LinkedIn implements INodeType {
 							);
 
 							const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i);
-							this.helpers.assertBinaryData(i, binaryPropertyName);
+							const imageMetadata = this.helpers.assertBinaryData(i, binaryPropertyName);
 
 							const buffer = await this.helpers.getBinaryDataBuffer(i, binaryPropertyName);
 							const { uploadUrl, image } = registerObject.value;
-							await linkedInApiRequest.call(this, 'POST', uploadUrl as string, buffer, true);
+
+							const headers = {};
+							Object.assign(headers, { 'Content-Type': imageMetadata.mimeType });
+
+							await linkedInApiRequest.call(
+								this,
+								'POST',
+								uploadUrl as string,
+								buffer,
+								true,
+								headers,
+							);
 
 							const imageBody = {
 								content: {
 									media: {
 										title,
 										id: image,
-										description,
 									},
 								},
 								commentary: text,
@@ -173,6 +220,41 @@ export class LinkedIn implements INodeType {
 								},
 								commentary: text,
 							};
+
+							if (additionalFields.thumbnailBinaryPropertyName) {
+								const registerRequest = {
+									initializeUploadRequest: {
+										owner: authorUrn,
+									},
+								};
+
+								const registerObject = await linkedInApiRequest.call(
+									this,
+									'POST',
+									'/images?action=initializeUpload',
+									registerRequest,
+								);
+
+								const binaryPropertyName = additionalFields.thumbnailBinaryPropertyName as string;
+								const imageMetadata = this.helpers.assertBinaryData(i, binaryPropertyName);
+
+								const buffer = await this.helpers.getBinaryDataBuffer(i, binaryPropertyName);
+								const { uploadUrl, image } = registerObject.value;
+
+								const headers = {};
+								Object.assign(headers, { 'Content-Type': imageMetadata.mimeType });
+
+								await linkedInApiRequest.call(
+									this,
+									'POST',
+									uploadUrl as string,
+									buffer,
+									true,
+									headers,
+								);
+								Object.assign(articleBody.content.article, { thumbnail: image });
+							}
+
 							Object.assign(body, articleBody);
 							if (description === '') {
 								delete body.description;
@@ -206,6 +288,6 @@ export class LinkedIn implements INodeType {
 			}
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/LinkedIn/PostDescription.ts b/packages/nodes-base/nodes/LinkedIn/PostDescription.ts
index 8eddd70bb1c7b..8f2512f09fcc1 100644
--- a/packages/nodes-base/nodes/LinkedIn/PostDescription.ts
+++ b/packages/nodes-base/nodes/LinkedIn/PostDescription.ts
@@ -121,7 +121,7 @@ export const postFields: INodeProperties[] = [
 		},
 	},
 	{
-		displayName: 'Binary Property',
+		displayName: 'Input Binary Field',
 		displayOptions: {
 			show: {
 				operation: ['create'],
@@ -132,7 +132,7 @@ export const postFields: INodeProperties[] = [
 		name: 'binaryPropertyName',
 		type: 'string',
 		default: 'data',
-		description: 'Object property name which holds binary data',
+		hint: 'The name of the input binary field containing the file to be written',
 		required: true,
 	},
 	{
@@ -156,7 +156,7 @@ export const postFields: INodeProperties[] = [
 				description: 'Provide a short description for your image or article',
 				displayOptions: {
 					show: {
-						'/shareMediaCategory': ['ARTICLE', 'IMAGE'],
+						'/shareMediaCategory': ['ARTICLE'],
 					},
 				},
 			},
@@ -172,6 +172,18 @@ export const postFields: INodeProperties[] = [
 					},
 				},
 			},
+			{
+				displayName: 'Input Binary Field',
+				name: 'thumbnailBinaryPropertyName',
+				type: 'string',
+				default: 'data',
+				hint: 'The name of the input binary field containing the file for the article thumbnail',
+				displayOptions: {
+					show: {
+						'/shareMediaCategory': ['ARTICLE'],
+					},
+				},
+			},
 			{
 				displayName: 'Title',
 				name: 'title',
diff --git a/packages/nodes-base/nodes/LinkedIn/linkedin.svg b/packages/nodes-base/nodes/LinkedIn/linkedin.svg
index 1f2df785d3f8d..f2101a8611607 100644
--- a/packages/nodes-base/nodes/LinkedIn/linkedin.svg
+++ b/packages/nodes-base/nodes/LinkedIn/linkedin.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 67 66" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#A" x="1" y="1"/><symbol id="A" overflow="visible"><g stroke="none" fill-rule="nonzero"><path d="M59.26 0H4.724C2.12 0 0 2.066 0 4.61v54.788c0 2.53 2.12 4.6 4.724 4.6h54.54c2.61 0 4.736-2.07 4.736-4.6V4.61C64 2.066 61.874 0 59.26 0z" fill="#0177b5"/><path d="M9.49 23.992H19v30.54H9.49zm4.748-15.2c3.034 0 5.5 2.466 5.5 5.5a5.51 5.51 0 0 1-5.498 5.506 5.52 5.52 0 0 1-5.508-5.506 5.5 5.5 0 0 1 5.506-5.5m10.7 15.2h9.104v4.174h.126c1.268-2.4 4.364-4.932 9-4.932 9.612 0 11.386 6.326 11.386 14.548v16.752h-9.486V39.678c0-3.54-.064-8.1-4.932-8.1-4.94 0-5.7 3.86-5.7 7.84v15.108h-9.484v-30.54z"/></g></symbol></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round" viewBox="0 0 67 66"><use xlink:href="#a" x="1" y="1"/><symbol id="a" overflow="visible"><g fill-rule="nonzero" stroke="none"><path fill="#0177b5" d="M59.26 0H4.724C2.12 0 0 2.066 0 4.61v54.788c0 2.53 2.12 4.6 4.724 4.6h54.54c2.61 0 4.736-2.07 4.736-4.6V4.61C64 2.066 61.874 0 59.26 0"/><path d="M9.49 23.992H19v30.54H9.49zm4.748-15.2c3.034 0 5.5 2.466 5.5 5.5a5.51 5.51 0 0 1-5.498 5.506 5.52 5.52 0 0 1-5.508-5.506 5.5 5.5 0 0 1 5.506-5.5m10.7 15.2h9.104v4.174h.126c1.268-2.4 4.364-4.932 9-4.932 9.612 0 11.386 6.326 11.386 14.548v16.752h-9.486V39.678c0-3.54-.064-8.1-4.932-8.1-4.94 0-5.7 3.86-5.7 7.84v15.108h-9.484v-30.54z"/></g></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/LocalFileTrigger/LocalFileTrigger.node.ts b/packages/nodes-base/nodes/LocalFileTrigger/LocalFileTrigger.node.ts
index 7bfea916c6f5c..1acb8d4c475ae 100644
--- a/packages/nodes-base/nodes/LocalFileTrigger/LocalFileTrigger.node.ts
+++ b/packages/nodes-base/nodes/LocalFileTrigger/LocalFileTrigger.node.ts
@@ -22,6 +22,17 @@ export class LocalFileTrigger implements INodeType {
 			name: 'Local File Trigger',
 			color: '#404040',
 		},
+		triggerPanel: {
+			header: '',
+			executionsHelp: {
+				inactive:
+					"<b>While building your workflow</b>, click the 'listen' button, then make a change to your watched file or folder. This will trigger an execution, which will show up in this editor.<br /> <br /><b>Once you're happy with your workflow</b>, <a data-key='activate'>activate</a> it. Then every time a change is detected, the workflow will execute. These executions will show up in the <a data-key='executions'>executions list</a>, but not in the editor.",
+				active:
+					"<b>While building your workflow</b>, click the 'listen' button, then make a change to your watched file or folder. This will trigger an execution, which will show up in this editor.<br /> <br /><b>Your workflow will also execute automatically</b>, since it's activated. Every time a change is detected, this node will trigger an execution. These executions will show up in the <a data-key='executions'>executions list</a>, but not in the editor.",
+			},
+			activationHint:
+				"Once you’ve finished building your workflow, <a data-key='activate'>activate</a> it to have it also listen continuously (you just won’t see those executions here).",
+		},
 		inputs: [],
 		outputs: ['main'],
 		properties: [
@@ -114,6 +125,13 @@ export class LocalFileTrigger implements INodeType {
 				placeholder: 'Add Option',
 				default: {},
 				options: [
+					{
+						displayName: 'Await Write Finish',
+						name: 'awaitWriteFinish',
+						type: 'boolean',
+						default: false,
+						description: 'Whether to wait until files finished writing to avoid partially read',
+					},
 					{
 						displayName: 'Include Linked Files/Folders',
 						name: 'followSymlinks',
@@ -131,7 +149,13 @@ export class LocalFileTrigger implements INodeType {
 						description:
 							'Files or paths to ignore. The whole path is tested, not just the filename. Supports <a href="https://github.com/micromatch/anymatch">Anymatch</a>- syntax.',
 					},
-					// eslint-disable-next-line n8n-nodes-base/node-param-default-missing
+					{
+						displayName: 'Ignore Existing Files/Folders',
+						name: 'ignoreInitial',
+						type: 'boolean',
+						default: true,
+						description: 'Whether to ignore existing files/folders to not trigger an event',
+					},
 					{
 						displayName: 'Max Folder Depth',
 						name: 'depth',
@@ -169,6 +193,14 @@ export class LocalFileTrigger implements INodeType {
 						default: -1,
 						description: 'How deep into the folder structure to watch for changes',
 					},
+					{
+						displayName: 'Use Polling',
+						name: 'usePolling',
+						type: 'boolean',
+						default: false,
+						description:
+							'Whether to use polling for watching. Typically necessary to successfully watch files over a network.',
+					},
 				],
 			},
 		],
@@ -189,12 +221,15 @@ export class LocalFileTrigger implements INodeType {
 		const watcher = watch(path, {
 			ignored: options.ignored === '' ? undefined : options.ignored,
 			persistent: true,
-			ignoreInitial: true,
+			ignoreInitial:
+				options.ignoreInitial === undefined ? true : (options.ignoreInitial as boolean),
 			followSymlinks:
 				options.followSymlinks === undefined ? true : (options.followSymlinks as boolean),
 			depth: [-1, undefined].includes(options.depth as number)
 				? undefined
 				: (options.depth as number),
+			usePolling: options.usePolling as boolean,
+			awaitWriteFinish: options.awaitWriteFinish as boolean,
 		});
 
 		const executeTrigger = (event: string, pathString: string) => {
@@ -206,7 +241,7 @@ export class LocalFileTrigger implements INodeType {
 		}
 
 		async function closeFunction() {
-			return watcher.close();
+			return await watcher.close();
 		}
 
 		return {
diff --git a/packages/nodes-base/nodes/LoneScale/GenericFunctions.ts b/packages/nodes-base/nodes/LoneScale/GenericFunctions.ts
new file mode 100644
index 0000000000000..b237024c81f67
--- /dev/null
+++ b/packages/nodes-base/nodes/LoneScale/GenericFunctions.ts
@@ -0,0 +1,54 @@
+import {
+	ApplicationError,
+	type IHttpRequestMethods,
+	type IDataObject,
+	type IExecuteFunctions,
+	type IHookFunctions,
+	type ILoadOptionsFunctions,
+	type IWebhookFunctions,
+	type IRequestOptions,
+} from 'n8n-workflow';
+import { BASE_URL } from './constants';
+
+export async function lonescaleApiRequest(
+	this: IExecuteFunctions | IWebhookFunctions | IHookFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
+	resource: string,
+	body: IDataObject = {},
+	query: IDataObject = {},
+	uri?: string,
+) {
+	const endpoint = `${BASE_URL}`;
+	const credentials = await this.getCredentials('loneScaleApi');
+	const options: IRequestOptions = {
+		headers: {
+			'Content-Type': 'application/json',
+			'X-API-KEY': credentials?.apiKey,
+		},
+		method,
+		body,
+		qs: query,
+		uri: uri || `${endpoint}${resource}`,
+		json: true,
+	};
+	if (!Object.keys(body).length) {
+		delete options.body;
+	}
+	if (!Object.keys(query).length) {
+		delete options.qs;
+	}
+
+	try {
+		return await this.helpers.requestWithAuthentication.call(this, 'loneScaleApi', options);
+	} catch (error) {
+		if (error.response) {
+			const errorMessage =
+				error.response.body.message || error.response.body.description || error.message;
+			throw new ApplicationError(
+				`Autopilot error response [${error.statusCode}]: ${errorMessage}`,
+				{ level: 'warning' },
+			);
+		}
+		throw error;
+	}
+}
diff --git a/packages/nodes-base/nodes/LoneScale/LoneScale.node.json b/packages/nodes-base/nodes/LoneScale/LoneScale.node.json
new file mode 100644
index 0000000000000..06cc5f1531290
--- /dev/null
+++ b/packages/nodes-base/nodes/LoneScale/LoneScale.node.json
@@ -0,0 +1,18 @@
+{
+	"node": "n8n-nodes-base.lonescale",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"categories": ["Sales"],
+	"resources": {
+		"credentialDocumentation": [
+			{
+				"url": "https://docs.n8n.io/credentials/lonescale"
+			}
+		],
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.lonescale/"
+			}
+		]
+	}
+}
diff --git a/packages/nodes-base/nodes/LoneScale/LoneScale.node.ts b/packages/nodes-base/nodes/LoneScale/LoneScale.node.ts
new file mode 100644
index 0000000000000..713d3bb84abe2
--- /dev/null
+++ b/packages/nodes-base/nodes/LoneScale/LoneScale.node.ts
@@ -0,0 +1,481 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
+	INodeExecutionData,
+	INodePropertyOptions,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+
+import { lonescaleApiRequest } from './GenericFunctions';
+
+export class LoneScale implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'LoneScale',
+		name: 'loneScale',
+		group: ['transform'],
+		icon: 'file:lonescale-logo.svg',
+		version: 1,
+		description: 'Create List, add / delete items',
+		subtitle: '={{$parameter["resource"] + ": " + $parameter["operation"]}}',
+		defaults: {
+			name: 'LoneScale',
+		},
+		inputs: ['main'],
+		outputs: ['main'],
+		credentials: [
+			{
+				name: 'loneScaleApi',
+				required: true,
+			},
+		],
+		properties: [
+			{
+				displayName: 'Resource',
+				name: 'resource',
+				type: 'options',
+				options: [
+					{
+						name: 'List',
+						value: 'list',
+						description: 'Manipulate list',
+					},
+					{
+						name: 'Item',
+						value: 'item',
+						description: 'Manipulate item',
+					},
+				],
+				default: 'list',
+				noDataExpression: true,
+				required: true,
+				description: 'Create a new list',
+			},
+			{
+				displayName: 'Operation',
+				name: 'operation',
+				type: 'options',
+				displayOptions: {
+					show: {
+						resource: ['list'],
+					},
+				},
+				options: [
+					{
+						name: 'Create',
+						value: 'create',
+						description: 'Create a list',
+						action: 'Create a list',
+					},
+				],
+				default: 'create',
+				noDataExpression: true,
+			},
+			{
+				displayName: 'Operation',
+				name: 'operation',
+				type: 'options',
+				displayOptions: {
+					show: {
+						resource: ['item'],
+					},
+				},
+				options: [
+					{
+						name: 'Create',
+						value: 'add',
+						description: 'Create an item',
+						action: 'Create a item',
+					},
+				],
+				default: 'add',
+				noDataExpression: true,
+			},
+			{
+				displayName: 'Type',
+				name: 'type',
+				type: 'options',
+				required: true,
+				displayOptions: {
+					show: {
+						resource: ['item'],
+					},
+				},
+				options: [
+					{
+						name: 'Company',
+						value: 'COMPANY',
+						description: 'List of company',
+					},
+					{
+						name: 'Contact',
+						value: 'PEOPLE',
+						description: 'List of contact',
+					},
+				],
+				default: 'PEOPLE',
+				description: 'Type of your list',
+				noDataExpression: true,
+			},
+			{
+				displayName: 'List Name or ID',
+				name: 'list',
+				type: 'options',
+				displayOptions: {
+					show: {
+						resource: ['item'],
+					},
+				},
+				typeOptions: {
+					loadOptionsMethod: 'getLists',
+					loadOptionsDependsOn: ['type'],
+				},
+				default: '',
+				description:
+					'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
+				required: true,
+			},
+			{
+				displayName: 'First Name',
+				name: 'first_name',
+				type: 'string',
+				displayOptions: {
+					show: {
+						operation: ['add'],
+						resource: ['item'],
+						type: ['PEOPLE'],
+					},
+				},
+				default: '',
+				description: 'Contact first name',
+				required: true,
+			},
+			{
+				displayName: 'Last Name',
+				name: 'last_name',
+				type: 'string',
+				displayOptions: {
+					show: {
+						operation: ['add'],
+						resource: ['item'],
+						type: ['PEOPLE'],
+					},
+				},
+				default: '',
+				description: 'Contact last name',
+				required: true,
+			},
+
+			{
+				displayName: 'Company Name',
+				name: 'company_name',
+				type: 'string',
+				displayOptions: {
+					show: {
+						operation: ['add'],
+						resource: ['item'],
+						type: ['COMPANY'],
+					},
+				},
+				default: '',
+				description: 'Contact company name',
+			},
+
+			{
+				displayName: 'Additional Fields',
+				name: 'peopleAdditionalFields',
+				type: 'collection',
+				placeholder: 'Add Field',
+				default: {},
+				displayOptions: {
+					show: {
+						operation: ['add'],
+						resource: ['item'],
+						type: ['PEOPLE'],
+					},
+				},
+				options: [
+					{
+						displayName: 'Full Name',
+						name: 'full_name',
+						type: 'string',
+						default: '',
+						description: 'Contact full name',
+					},
+					{
+						displayName: 'Contact Email',
+						name: 'email',
+						type: 'string',
+						placeholder: 'name@email.com',
+						default: '',
+					},
+					{
+						displayName: 'Company Name',
+						name: 'company_name',
+						type: 'string',
+						default: '',
+						description: 'Contact company name',
+					},
+					{
+						displayName: 'Current Position',
+						name: 'current_position',
+						type: 'string',
+						default: '',
+						description: 'Contact current position',
+					},
+					{
+						displayName: 'Company Domain',
+						name: 'domain',
+						type: 'string',
+						default: '',
+						description: 'Contact company domain',
+					},
+					{
+						displayName: 'Linkedin Url',
+						name: 'linkedin_url',
+						type: 'string',
+						default: '',
+						description: 'Contact Linkedin URL',
+					},
+					{
+						displayName: 'Contact Location',
+						name: 'location',
+						type: 'string',
+						default: '',
+					},
+					{
+						displayName: 'Contact ID',
+						name: 'contact_id',
+						type: 'string',
+						default: '',
+						description: 'Contact ID from your source',
+					},
+				],
+			},
+			{
+				displayName: 'Additional Fields',
+				name: 'companyAdditionalFields',
+				type: 'collection',
+				placeholder: 'Add Field',
+				default: {},
+				displayOptions: {
+					show: {
+						operation: ['add'],
+						resource: ['item'],
+						type: ['COMPANY'],
+					},
+				},
+				options: [
+					{
+						displayName: 'Linkedin Url',
+						name: 'linkedin_url',
+						type: 'string',
+						default: '',
+						description: 'Company Linkedin URL',
+					},
+					{
+						displayName: 'Company Domain',
+						name: 'domain',
+						type: 'string',
+						default: '',
+						description: 'Company company domain',
+					},
+					{
+						displayName: 'Contact Location',
+						name: 'location',
+						type: 'string',
+						default: '',
+					},
+					{
+						displayName: 'Contact ID',
+						name: 'contact_id',
+						type: 'string',
+						default: '',
+						description: 'Contact ID from your source',
+					},
+				],
+			},
+			{
+				displayName: 'Name',
+				name: 'name',
+				type: 'string',
+				required: true,
+				displayOptions: {
+					show: {
+						operation: ['create'],
+						resource: ['list'],
+					},
+				},
+				default: '',
+				placeholder: 'list name',
+				description: 'Name of your list',
+			},
+			{
+				displayName: 'Type',
+				name: 'type',
+				type: 'options',
+				required: true,
+				displayOptions: {
+					show: {
+						operation: ['create'],
+						resource: ['list'],
+					},
+				},
+				options: [
+					{
+						name: 'Company',
+						value: 'COMPANY',
+						description: 'Create a list of companies',
+						action: 'Create a list of companies',
+					},
+					{
+						name: 'Contact',
+						value: 'PEOPLE',
+						description: 'Create a list of contacts',
+						action: 'Create a list of contacts',
+					},
+				],
+				default: 'COMPANY',
+				description: 'Type of your list',
+				noDataExpression: true,
+			},
+		],
+	};
+
+	methods = {
+		loadOptions: {
+			async getLists(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const type = this.getNodeParameter('type') as string;
+				const data = await lonescaleApiRequest.call(this, 'GET', '/lists', {}, { entity: type });
+				return (data as { list: Array<{ name: string; id: string; entity: string }> })?.list
+					?.filter((l) => l.entity === type)
+					.map((d) => ({
+						name: d.name,
+						value: d.id,
+					}));
+			},
+		},
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = this.getInputData();
+		let responseData;
+		const returnData = [];
+		const resource = this.getNodeParameter('resource', 0);
+		const operation = this.getNodeParameter('operation', 0);
+
+		for (let i = 0; i < items.length; i++) {
+			try {
+				if (resource === 'list') {
+					if (operation === 'create') {
+						const name = this.getNodeParameter('name', i) as string;
+						const entity = this.getNodeParameter('type', i) as string;
+						const body: IDataObject = {
+							name,
+							entity,
+						};
+
+						responseData = await lonescaleApiRequest.call(this, 'POST', '/lists', body);
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(responseData),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
+					}
+				}
+				if (resource === 'item') {
+					if (operation === 'add') {
+						let firstName = '';
+						let lastName = '';
+						let currentPosition = '';
+						let fullName = '';
+						let email = '';
+						let linkedinUrl = '';
+						let companyName = '';
+						let domain = '';
+						let location = '';
+						let contactId = '';
+
+						const entity = this.getNodeParameter('type', i) as string;
+						const listId = this.getNodeParameter('list', i) as string;
+						if (entity === 'PEOPLE') {
+							const peopleAdditionalFields = this.getNodeParameter('peopleAdditionalFields', i) as {
+								email: string;
+								full_name: string;
+								current_position: string;
+								linkedin_url: string;
+								company_name: string;
+								domain: string;
+								location: string;
+								contact_id: string;
+							};
+							firstName = this.getNodeParameter('first_name', i) as string;
+							lastName = this.getNodeParameter('last_name', i) as string;
+							fullName = peopleAdditionalFields?.full_name;
+							currentPosition = peopleAdditionalFields?.current_position;
+							email = peopleAdditionalFields?.email;
+							linkedinUrl = peopleAdditionalFields?.linkedin_url;
+							companyName = peopleAdditionalFields?.company_name;
+							domain = peopleAdditionalFields?.domain;
+							location = peopleAdditionalFields?.location;
+							contactId = peopleAdditionalFields?.contact_id;
+						}
+						if (entity === 'COMPANY') {
+							const companyAdditionalFields = this.getNodeParameter(
+								'companyAdditionalFields',
+								i,
+							) as {
+								linkedin_url: string;
+								domain: string;
+								location: string;
+								contact_id: string;
+							};
+							companyName = this.getNodeParameter('company_name', i) as string;
+							linkedinUrl = companyAdditionalFields?.linkedin_url;
+							domain = companyAdditionalFields?.domain;
+							location = companyAdditionalFields?.location;
+							contactId = companyAdditionalFields?.contact_id;
+						}
+
+						const body: IDataObject = {
+							...(firstName && { first_name: firstName }),
+							...(lastName && { last_name: lastName }),
+							...(fullName && { full_name: fullName }),
+							...(linkedinUrl && { linkedin_url: linkedinUrl }),
+							...(companyName && { company_name: companyName }),
+							...(currentPosition && { current_position: currentPosition }),
+							...(domain && { domain }),
+							...(location && { location }),
+							...(email && { email }),
+							...(contactId && { contact_id: contactId }),
+						};
+
+						responseData = await lonescaleApiRequest.call(
+							this,
+							'POST',
+							`/lists/${listId}/item`,
+							body,
+						);
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(responseData),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
+					}
+				}
+			} catch (error) {
+				if (this.continueOnFail()) {
+					const executionData = this.helpers.constructExecutionMetaData(
+						this.helpers.returnJsonArray({ error: error.message }),
+						{ itemData: { item: i } },
+					);
+					returnData.push(...executionData);
+					continue;
+				}
+				throw error;
+			}
+		}
+		return [returnData];
+	}
+}
diff --git a/packages/nodes-base/nodes/LoneScale/LoneScaleTrigger.node.json b/packages/nodes-base/nodes/LoneScale/LoneScaleTrigger.node.json
new file mode 100644
index 0000000000000..1870fed507291
--- /dev/null
+++ b/packages/nodes-base/nodes/LoneScale/LoneScaleTrigger.node.json
@@ -0,0 +1,18 @@
+{
+	"node": "n8n-nodes-base.lonescaleTrigger",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"categories": ["Sales"],
+	"resources": {
+		"credentialDocumentation": [
+			{
+				"url": "https://docs.n8n.io/credentials/lonescale"
+			}
+		],
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.lonescaletrigger/"
+			}
+		]
+	}
+}
diff --git a/packages/nodes-base/nodes/LoneScale/LoneScaleTrigger.node.ts b/packages/nodes-base/nodes/LoneScale/LoneScaleTrigger.node.ts
new file mode 100644
index 0000000000000..766e73aa5861c
--- /dev/null
+++ b/packages/nodes-base/nodes/LoneScale/LoneScaleTrigger.node.ts
@@ -0,0 +1,130 @@
+import type {
+	IDataObject,
+	IHookFunctions,
+	ILoadOptionsFunctions,
+	INodePropertyOptions,
+	INodeType,
+	INodeTypeDescription,
+	IWebhookFunctions,
+	IWebhookResponseData,
+} from 'n8n-workflow';
+
+import { lonescaleApiRequest } from './GenericFunctions';
+
+export class LoneScaleTrigger implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'LoneScale Trigger',
+		name: 'loneScaleTrigger',
+		icon: 'file:lonescale-logo.svg',
+		group: ['trigger'],
+		version: 1,
+		description: 'Trigger LoneScale Workflow',
+		defaults: {
+			name: 'LoneScale Trigger',
+		},
+		inputs: [],
+		outputs: ['main'],
+		credentials: [
+			{
+				name: 'loneScaleApi',
+				required: true,
+			},
+		],
+		webhooks: [
+			{
+				name: 'default',
+				httpMethod: 'POST',
+				responseMode: 'onReceived',
+				path: 'webhook',
+			},
+		],
+
+		properties: [
+			{
+				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-options
+				displayName: 'Workflow Name',
+				name: 'workflow',
+				type: 'options',
+				noDataExpression: true,
+				typeOptions: {
+					loadOptionsMethod: 'getWorkflows',
+				},
+				default: '',
+				// eslint-disable-next-line n8n-nodes-base/node-param-description-missing-final-period, n8n-nodes-base/node-param-description-wrong-for-dynamic-options
+				description: 'Select one workflow. Choose from the list',
+				required: true,
+			},
+		],
+	};
+
+	methods = {
+		loadOptions: {
+			async getWorkflows(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const data = await lonescaleApiRequest.call(this, 'GET', '/workflows');
+				return (data as Array<{ title: string; id: string }>)?.map((d) => ({
+					name: d.title,
+					value: d.id,
+				}));
+			},
+		},
+	};
+
+	webhookMethods = {
+		default: {
+			async checkExists(this: IHookFunctions): Promise<boolean> {
+				const webhookData = this.getWorkflowStaticData('node');
+				const webhookUrl = this.getNodeWebhookUrl('default');
+				const workflowId = this.getNodeParameter('workflow') as string;
+				const webhook = await lonescaleApiRequest.call(
+					this,
+					'GET',
+					`/workflows/${workflowId}/hook?type=n8n`,
+				);
+				if (webhook.target_url === webhookUrl) {
+					webhookData.webhookId = webhook.webhook_id;
+					return true;
+				}
+				return false;
+			},
+			async create(this: IHookFunctions): Promise<boolean> {
+				const webhookUrl = this.getNodeWebhookUrl('default');
+				const webhookData = this.getWorkflowStaticData('node');
+				const workflowId = this.getNodeParameter('workflow') as string;
+				const body: IDataObject = {
+					type: 'n8n',
+					target_url: webhookUrl,
+				};
+				const webhook = await lonescaleApiRequest.call(
+					this,
+					'POST',
+					`/workflows/${workflowId}/hook`,
+					body,
+				);
+				webhookData.webhookId = webhook.webhook_id;
+				return true;
+			},
+			async delete(this: IHookFunctions): Promise<boolean> {
+				const webhookData = this.getWorkflowStaticData('node');
+				try {
+					await lonescaleApiRequest.call(
+						this,
+						'DELETE',
+						`/workflows/${webhookData.webhookId}/hook?type=n8n`,
+					);
+				} catch (error) {
+					return false;
+				}
+				delete webhookData.webhookId;
+				return true;
+			},
+		},
+	};
+
+	async webhook(this: IWebhookFunctions): Promise<IWebhookResponseData> {
+		const req = this.getRequestObject();
+
+		return {
+			workflowData: [this.helpers.returnJsonArray(req.body)],
+		};
+	}
+}
diff --git a/packages/nodes-base/nodes/LoneScale/constants.ts b/packages/nodes-base/nodes/LoneScale/constants.ts
new file mode 100644
index 0000000000000..0f25710c86a75
--- /dev/null
+++ b/packages/nodes-base/nodes/LoneScale/constants.ts
@@ -0,0 +1 @@
+export const BASE_URL = 'https://public-api.lonescale.com';
diff --git a/packages/nodes-base/nodes/LoneScale/lonescale-logo.svg b/packages/nodes-base/nodes/LoneScale/lonescale-logo.svg
new file mode 100644
index 0000000000000..b8a15e626094a
--- /dev/null
+++ b/packages/nodes-base/nodes/LoneScale/lonescale-logo.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="42" height="43" fill="none"><path fill="#4157FF" d="M13.169 29.314c-1.016-1.072-2.059-1.613-3.101-1.613-.284 0-.567.04-.84.115-1.753.477-3.154 2.445-4.2 4.595a24 24 0 0 0-.628 1.411 35 35 0 0 0-1.608 5.04.664.664 0 0 0 .784.805 33 33 0 0 0 5.171-1.557c.478-.194.958-.405 1.43-.636 1.98-.967 3.767-2.27 4.305-3.94.443-1.378.001-2.799-1.313-4.22m.045 3.816c-.454 1.421-2.384 2.597-4.3 3.442-.478.21-.953.4-1.405.57a33 33 0 0 1-2.701.861l-.454.123.13-.454a33 33 0 0 1 1.461-4.031c.909-2.045 2.18-4.144 3.634-4.543a1.7 1.7 0 0 1 .472-.066c.672 0 1.392.4 2.144 1.192 1.448 1.564 1.125 2.573 1.02 2.903zM29.959 9.688a2.846 2.846 0 1 0 0 5.692 2.846 2.846 0 0 0 0-5.693m0 4.417a1.573 1.573 0 1 1 0-3.146 1.573 1.573 0 0 1 0 3.146"/><path fill="#090F47" d="m31.369 22.582.004-.09.064-.068c2.971-3.142 4.972-5.95 6.3-8.386q.408-.75.734-1.447c2.655-5.673 1.565-9.032 1.363-9.554a.64.64 0 0 0-.556-.41c-.347-.02-.699-.03-1.046-.03-2.538 0-5.163.554-7.82 1.634q-.75.306-1.505.667c-2.966 1.423-5.955 3.493-8.892 6.178q-.373.341-.727.683l-.062.058-.085.009c-8.85 1.022-12.345 5.14-12.492 5.312a.64.64 0 0 0 .085.899.63.63 0 0 0 .3.135l5.737.956-.24.334c-.285.396-.445.636-.472.675a.635.635 0 0 0 .081.803l3.228 3.228a.72.72 0 0 0 .937.066l.528-.4-3.417-3.415.127-.175C15.08 18.122 21.739 9.437 30.339 5.65q.723-.321 1.465-.59c2.054-.748 4.202-1.194 6.407-1.194l.334.006h.209l.039.206c.194 1.104.322 3.53-1.115 7.054q-.278.691-.644 1.438c-1.587 3.236-4.452 7.25-9.498 11.9 0 0-2.34-2.432-3.41-3.551a.776.776 0 0 0-1.091-.036c-.757.698-1.888 1.745-1.888 1.745l-.06.066v-.005c-.023.023-.488.53-.533.784v.008a.82.82 0 0 0 .215.69c.266.294 2.378 2.504 3.206 3.342l.02.02c-.521.427-1.947 1.545-1.947 1.545-.555-.553-3.877-4.027-3.88-4.052-.023.024-.488.529-.534.783v.007a.83.83 0 0 0 .216.693c.266.292 2.378 2.503 3.205 3.34l.509.508a.62.62 0 0 0 .449.188.64.64 0 0 0 .384-.13l.532-.409.454-.352.946 5.808a.636.636 0 0 0 .625.535.73.73 0 0 0 .501-.239c5.3-5.346 5.914-13.1 5.914-13.176M8.49 17.126l.478-.36c1.437-1.067 3.985-2.51 7.964-3.307l.785-.159-.552.582a58 58 0 0 0-3.431 3.982l-.091.12zm16.036 11.62.721-.596a.735.735 0 0 0 .06-1.079l-3.36-3.474a79 79 0 0 1 1.584-1.47c.267.29 3.93 4.106 3.942 4.094l2.071-1.89-.073.687c-.333 3.08-2.499 6.523-3.757 8.302l-.363.507z"/><path fill="#4157FF" d="m19.112 32.467-9.027-9.028a.43.43 0 0 1-.046-.553l.345-.48a.428.428 0 0 1 .653-.053l9.148 9.15a.43.43 0 0 1-.042.644l-.467.355a.43.43 0 0 1-.564-.035"/><path fill="#090F47" d="M38.994 14.46a19.4 19.4 0 0 1 1.362 7.156c0 10.742-8.737 19.48-19.481 19.48a19.35 19.35 0 0 1-9.528-2.495q-.304.16-.613.31-.446.217-.897.417a20.74 20.74 0 0 0 11.038 3.167c11.512 0 20.88-9.364 20.88-20.877a20.7 20.7 0 0 0-1.96-8.818q-.347.856-.801 1.66"/><path fill="#4157FF" d="M29.962 2.825a20.7 20.7 0 0 0-9.085-2.09C9.367.736 0 10.1 0 21.614a20.73 20.73 0 0 0 3.237 11.162 30 30 0 0 1 .726-1.504 19.35 19.35 0 0 1-2.568-9.655c0-10.736 8.738-19.479 19.48-19.479a19.4 19.4 0 0 1 7.211 1.384 38 38 0 0 1 1.876-.696"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/MQTT/Mqtt.node.ts b/packages/nodes-base/nodes/MQTT/Mqtt.node.ts
index 8110c04d05930..3822fa103772e 100644
--- a/packages/nodes-base/nodes/MQTT/Mqtt.node.ts
+++ b/packages/nodes-base/nodes/MQTT/Mqtt.node.ts
@@ -9,7 +9,8 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
-import mqtt from 'mqtt';
+import * as mqtt from 'mqtt';
+import { formatPrivateKey } from '@utils/utilities';
 
 export class Mqtt implements INodeType {
 	description: INodeTypeDescription = {
@@ -45,7 +46,7 @@ export class Mqtt implements INodeType {
 				name: 'sendInputData',
 				type: 'boolean',
 				default: true,
-				description: 'Whether to send the the data the node receives as JSON',
+				description: 'Whether to send the data the node receives as JSON',
 			},
 			{
 				displayName: 'Message',
@@ -118,9 +119,9 @@ export class Mqtt implements INodeType {
 						(credentials.clientId as string) || `mqttjs_${Math.random().toString(16).substr(2, 8)}`;
 					const clean = credentials.clean as boolean;
 					const ssl = credentials.ssl as boolean;
-					const ca = credentials.ca as string;
-					const cert = credentials.cert as string;
-					const key = credentials.key as string;
+					const ca = formatPrivateKey(credentials.ca as string);
+					const cert = formatPrivateKey(credentials.cert as string);
+					const key = formatPrivateKey(credentials.key as string);
 					const rejectUnauthorized = credentials.rejectUnauthorized as boolean;
 
 					let client: mqtt.MqttClient;
@@ -155,7 +156,7 @@ export class Mqtt implements INodeType {
 						client = mqtt.connect(brokerUrl, clientOptions);
 					}
 
-					await new Promise((resolve, reject): any => {
+					await new Promise((resolve, reject) => {
 						client.on('connect', (test) => {
 							resolve(test);
 							client.end();
@@ -168,7 +169,7 @@ export class Mqtt implements INodeType {
 				} catch (error) {
 					return {
 						status: 'Error',
-						message: error.message,
+						message: (error as Error).message,
 					};
 				}
 				return {
@@ -232,7 +233,7 @@ export class Mqtt implements INodeType {
 
 		const sendInputData = this.getNodeParameter('sendInputData', 0) as boolean;
 
-		const data = await new Promise((resolve, reject): any => {
+		const data = await new Promise((resolve, reject) => {
 			client.on('connect', () => {
 				for (let i = 0; i < length; i++) {
 					let message;
@@ -256,7 +257,7 @@ export class Mqtt implements INodeType {
 					resolve([items]);
 				});
 
-				client.on('error', (e: string | undefined) => {
+				client.on('error', (e) => {
 					reject(e);
 				});
 			});
diff --git a/packages/nodes-base/nodes/MQTT/MqttTrigger.node.ts b/packages/nodes-base/nodes/MQTT/MqttTrigger.node.ts
index 18336afd91863..f4209c0822689 100644
--- a/packages/nodes-base/nodes/MQTT/MqttTrigger.node.ts
+++ b/packages/nodes-base/nodes/MQTT/MqttTrigger.node.ts
@@ -4,10 +4,13 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 	ITriggerResponse,
+	IDeferredPromise,
+	IRun,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import mqtt from 'mqtt';
+import * as mqtt from 'mqtt';
+import { formatPrivateKey } from '@utils/utilities';
 
 export class MqttTrigger implements INodeType {
 	description: INodeTypeDescription = {
@@ -17,9 +20,21 @@ export class MqttTrigger implements INodeType {
 		group: ['trigger'],
 		version: 1,
 		description: 'Listens to MQTT events',
+		eventTriggerDescription: '',
 		defaults: {
 			name: 'MQTT Trigger',
 		},
+		triggerPanel: {
+			header: '',
+			executionsHelp: {
+				inactive:
+					"<b>While building your workflow</b>, click the 'listen' button, then trigger an MQTT event. This will trigger an execution, which will show up in this editor.<br /> <br /><b>Once you're happy with your workflow</b>, <a data-key='activate'>activate</a> it. Then every time a change is detected, the workflow will execute. These executions will show up in the <a data-key='executions'>executions list</a>, but not in the editor.",
+				active:
+					"<b>While building your workflow</b>, click the 'listen' button, then trigger an MQTT event. This will trigger an execution, which will show up in this editor.<br /> <br /><b>Your workflow will also execute automatically</b>, since it's activated. Every time a change is detected, this node will trigger an execution. These executions will show up in the <a data-key='executions'>executions list</a>, but not in the editor.",
+			},
+			activationHint:
+				"Once you’ve finished building your workflow, <a data-key='activate'>activate</a> it to have it also listen continuously (you just won’t see those executions here).",
+		},
 		inputs: [],
 		outputs: ['main'],
 		credentials: [
@@ -58,6 +73,14 @@ export class MqttTrigger implements INodeType {
 						default: false,
 						description: 'Whether to return only the message property',
 					},
+					{
+						displayName: 'Parallel Processing',
+						name: 'parallelProcessing',
+						type: 'boolean',
+						default: true,
+						description:
+							'Whether to process messages in parallel or by keeping the message in order',
+					},
 				],
 			},
 		],
@@ -76,6 +99,7 @@ export class MqttTrigger implements INodeType {
 		}
 
 		const options = this.getNodeParameter('options') as IDataObject;
+		const parallelProcessing = this.getNodeParameter('options.parallelProcessing', true) as boolean;
 
 		if (!topics) {
 			throw new NodeOperationError(this.getNode(), 'Topics are mandatory!');
@@ -89,9 +113,9 @@ export class MqttTrigger implements INodeType {
 			(credentials.clientId as string) || `mqttjs_${Math.random().toString(16).substr(2, 8)}`;
 		const clean = credentials.clean as boolean;
 		const ssl = credentials.ssl as boolean;
-		const ca = credentials.ca as string;
-		const cert = credentials.cert as string;
-		const key = credentials.key as string;
+		const ca = formatPrivateKey(credentials.ca as string);
+		const cert = formatPrivateKey(credentials.cert as string);
+		const key = formatPrivateKey(credentials.key as string);
 		const rejectUnauthorized = credentials.rejectUnauthorized as boolean;
 
 		let client: mqtt.MqttClient;
@@ -130,11 +154,11 @@ export class MqttTrigger implements INodeType {
 		const manualTriggerFunction = async () => {
 			await new Promise((resolve, reject) => {
 				client.on('connect', () => {
-					client.subscribe(topicsQoS as mqtt.ISubscriptionMap, (err, _granted) => {
-						if (err) {
-							reject(err);
+					client.subscribe(topicsQoS as mqtt.ISubscriptionMap, (error, _granted) => {
+						if (error) {
+							reject(error);
 						}
-						client.on('message', (topic: string, message: Buffer | string) => {
+						client.on('message', async (topic: string, message: Buffer | string) => {
 							let result: IDataObject = {};
 
 							message = message.toString();
@@ -142,7 +166,7 @@ export class MqttTrigger implements INodeType {
 							if (options.jsonParseBody) {
 								try {
 									message = JSON.parse(message.toString());
-								} catch (error) {}
+								} catch (e) {}
 							}
 
 							result.message = message;
@@ -152,7 +176,15 @@ export class MqttTrigger implements INodeType {
 								//@ts-ignore
 								result = [message as string];
 							}
-							this.emit([this.helpers.returnJsonArray(result)]);
+
+							let responsePromise: IDeferredPromise<IRun> | undefined;
+							if (!parallelProcessing) {
+								responsePromise = await this.helpers.createDeferredPromise();
+							}
+							this.emit([this.helpers.returnJsonArray([result])], undefined, responsePromise);
+							if (responsePromise) {
+								await responsePromise.promise();
+							}
 							resolve(true);
 						});
 					});
@@ -165,7 +197,7 @@ export class MqttTrigger implements INodeType {
 		};
 
 		if (this.getMode() === 'trigger') {
-			await manualTriggerFunction();
+			void manualTriggerFunction();
 		}
 
 		async function closeFunction() {
diff --git a/packages/nodes-base/nodes/MQTT/mqtt.svg b/packages/nodes-base/nodes/MQTT/mqtt.svg
index 064a66a61a5b0..acc6eddbd4fe3 100644
--- a/packages/nodes-base/nodes/MQTT/mqtt.svg
+++ b/packages/nodes-base/nodes/MQTT/mqtt.svg
@@ -1 +1 @@
-<svg version="1.2" baseProfile="tiny" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 320 320" overflow="visible"><path fill="#FFF" d="M7.1 133.9v46.7c73.8.1 134 59.3 135 132.4h45.5c-1.1-98.4-81.5-178.2-180.5-179.1z"/><path fill="#FFF" d="M7.1 37.3V84c127.4.1 231.1 102.5 232.1 228.9h45.5c-1-151.5-125-274.6-277.6-275.6z"/><path fill="#FFF" d="M312.9 193.5V97.6c-11.8-16.1-25.9-33.4-40.4-47.8-16-15.9-34.1-30.1-52.3-42.7H119c88.3 31.8 159.1 100.1 193.9 186.4z"/><path fill="#606" d="M7.1 180.6v117.1c0 8.4 6.8 15.3 15.3 15.3H142c-1-73.2-61.1-132.3-134.9-132.4zm0-96.5v49.8c99 .9 179.4 80.7 180.4 179.1h51.7C238.2 186.6 134.5 84.2 7.1 84.1z"/><path fill="#606" d="M312.9 297.6V193.5C278.1 107.2 207.3 38.9 119 7.1H22.4C14 7.1 7.1 13.9 7.1 22.4v15c152.6.9 276.6 124 277.6 275.6h13c8.4-.1 15.2-6.9 15.2-15.4zM272.6 49.8c14.5 14.4 28.6 31.7 40.4 47.8V22.4c0-8.4-6.8-15.3-15.3-15.3h-77.3c18 12.6 36.2 26.8 52.2 42.7z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" baseProfile="tiny" overflow="visible" version="1.2" viewBox="0 0 320 320"><path fill="#FFF" d="M7.1 133.9v46.7c73.8.1 134 59.3 135 132.4h45.5c-1.1-98.4-81.5-178.2-180.5-179.1"/><path fill="#FFF" d="M7.1 37.3V84c127.4.1 231.1 102.5 232.1 228.9h45.5c-1-151.5-125-274.6-277.6-275.6"/><path fill="#FFF" d="M312.9 193.5V97.6c-11.8-16.1-25.9-33.4-40.4-47.8-16-15.9-34.1-30.1-52.3-42.7H119c88.3 31.8 159.1 100.1 193.9 186.4"/><path fill="#606" d="M7.1 180.6v117.1c0 8.4 6.8 15.3 15.3 15.3H142c-1-73.2-61.1-132.3-134.9-132.4m0-96.5v49.8c99 .9 179.4 80.7 180.4 179.1h51.7C238.2 186.6 134.5 84.2 7.1 84.1m305.8 213.5V193.5C278.1 107.2 207.3 38.9 119 7.1H22.4C14 7.1 7.1 13.9 7.1 22.4v15c152.6.9 276.6 124 277.6 275.6h13c8.4-.1 15.2-6.9 15.2-15.4M272.6 49.8c14.5 14.4 28.6 31.7 40.4 47.8V22.4c0-8.4-6.8-15.3-15.3-15.3h-77.3c18 12.6 36.2 26.8 52.2 42.7"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Magento/GenericFunctions.ts b/packages/nodes-base/nodes/Magento/GenericFunctions.ts
index b076fe13e7e5f..f4255a3194155 100644
--- a/packages/nodes-base/nodes/Magento/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Magento/GenericFunctions.ts
@@ -1,5 +1,3 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -9,14 +7,15 @@ import type {
 	INodeProperties,
 	INodePropertyOptions,
 	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
-import { NodeApiError } from 'n8n-workflow';
-
-import type { Address, Filter, FilterGroup, ProductAttribute, Search } from './Types';
+import { ApplicationError, NodeApiError } from 'n8n-workflow';
+import type { Filter, Address, Search, FilterGroup, ProductAttribute } from './types';
 
 export async function magentoApiRequest(
 	this: IWebhookFunctions | IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -27,7 +26,7 @@ export async function magentoApiRequest(
 ): Promise<any> {
 	const credentials = await this.getCredentials('magento2Api');
 
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		method,
 		body,
 		qs,
@@ -50,7 +49,7 @@ export async function magentoApiRequest(
 export async function magentoApiRequestAllItems(
 	this: IHookFunctions | ILoadOptionsFunctions | IExecuteFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -481,7 +480,7 @@ export function getFilterQuery(data: {
 	sort: [{ direction: string; field: string }];
 }): Search {
 	if (!data.hasOwnProperty('conditions') || data.conditions?.length === 0) {
-		throw new Error('At least one filter has to be set');
+		throw new ApplicationError('At least one filter has to be set', { level: 'warning' });
 	}
 
 	if (data.matchType === 'anyFilter') {
diff --git a/packages/nodes-base/nodes/Magento/Magento2.node.ts b/packages/nodes-base/nodes/Magento/Magento2.node.ts
index 1ea5f95228a02..c9daf7e795b3e 100644
--- a/packages/nodes-base/nodes/Magento/Magento2.node.ts
+++ b/packages/nodes-base/nodes/Magento/Magento2.node.ts
@@ -9,6 +9,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
+import { capitalCase } from 'change-case';
 import {
 	adjustAddresses,
 	getFilterQuery,
@@ -35,9 +36,7 @@ import type {
 	NewCustomer,
 	NewProduct,
 	Search,
-} from './Types';
-
-import { capitalCase } from 'change-case';
+} from './types';
 
 export class Magento2 implements INodeType {
 	description: INodeTypeDescription = {
@@ -278,10 +277,10 @@ export class Magento2 implements INodeType {
 			async getFilterableCustomerAttributes(
 				this: ILoadOptionsFunctions,
 			): Promise<INodePropertyOptions[]> {
-				return getProductAttributes.call(this, (attribute) => attribute.is_filterable);
+				return await getProductAttributes.call(this, (attribute) => attribute.is_filterable);
 			},
 			async getProductAttributes(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				return getProductAttributes.call(this);
+				return await getProductAttributes.call(this);
 			},
 			// async getProductAttributesFields(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
 			// 	return getProductAttributes.call(this, undefined, { name: '*', value: '*', description: 'All properties' });
@@ -289,12 +288,15 @@ export class Magento2 implements INodeType {
 			async getFilterableProductAttributes(
 				this: ILoadOptionsFunctions,
 			): Promise<INodePropertyOptions[]> {
-				return getProductAttributes.call(this, (attribute) => attribute.is_searchable === '1');
+				return await getProductAttributes.call(
+					this,
+					(attribute) => attribute.is_searchable === '1',
+				);
 			},
 			async getSortableProductAttributes(
 				this: ILoadOptionsFunctions,
 			): Promise<INodePropertyOptions[]> {
-				return getProductAttributes.call(this, (attribute) => attribute.used_for_sort_by);
+				return await getProductAttributes.call(this, (attribute) => attribute.used_for_sort_by);
 			},
 			async getOrderAttributes(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
 				return getOrderFields()
@@ -810,6 +812,6 @@ export class Magento2 implements INodeType {
 			}
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Magento/magento.svg b/packages/nodes-base/nodes/Magento/magento.svg
index 7f18f4eeb8130..6d4effc0cf799 100644
--- a/packages/nodes-base/nodes/Magento/magento.svg
+++ b/packages/nodes-base/nodes/Magento/magento.svg
@@ -1,6 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="256px" height="303px" viewBox="0 0 256 303" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMidYMid">
-    <g>
-        <path d="M144.852,90.67 L144.852,262.862 L127.919,273.211 L110.973,262.807 L110.973,90.803 L67.095,117.819 L67.095,265.074 L127.919,302.291 L189.258,264.809 L189.258,117.725 L144.852,90.67 L144.852,90.67 Z M127.919,0 L0,77.502 L0,224.776 L33.223,244.348 L33.223,97.06 L127.945,39.464 L222.755,96.976 L223.146,97.199 L223.104,244.128 L256,224.776 L256,77.502 L127.919,0 L127.919,0 Z" fill="#EC6737"></path>
-    </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="303" preserveAspectRatio="xMidYMid"><path fill="#EC6737" d="M144.852 90.67v172.192l-16.933 10.349-16.946-10.404V90.803l-43.878 27.016v147.255l60.824 37.217 61.339-37.482V117.725zM127.919 0 0 77.502v147.274l33.223 19.572V97.06l94.722-57.596 94.81 57.512.391.223-.042 146.929L256 224.776V77.502z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Magento/Types.d.ts b/packages/nodes-base/nodes/Magento/types.ts
similarity index 100%
rename from packages/nodes-base/nodes/Magento/Types.d.ts
rename to packages/nodes-base/nodes/Magento/types.ts
diff --git a/packages/nodes-base/nodes/Mailcheck/GenericFunctions.ts b/packages/nodes-base/nodes/Mailcheck/GenericFunctions.ts
index 657c4d077f6af..ae014ceed5f1c 100644
--- a/packages/nodes-base/nodes/Mailcheck/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Mailcheck/GenericFunctions.ts
@@ -1,16 +1,18 @@
-import type { OptionsWithUri } from 'request';
+import { ApplicationError } from 'n8n-workflow';
 
 import type {
 	IDataObject,
 	IExecuteFunctions,
 	IHookFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
+	IRequestOptions,
 	IWebhookFunctions,
 } from 'n8n-workflow';
 
 export async function mailCheckApiRequest(
 	this: IWebhookFunctions | IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -21,7 +23,7 @@ export async function mailCheckApiRequest(
 ): Promise<any> {
 	const credentials = await this.getCredentials('mailcheckApi');
 
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		headers: {
 			'Content-Type': 'application/json',
 			Authorization: `Bearer ${credentials.apiKey}`,
@@ -44,8 +46,9 @@ export async function mailCheckApiRequest(
 	} catch (error) {
 		if (error.response?.body?.message) {
 			// Try to return the error prettier
-			throw new Error(
+			throw new ApplicationError(
 				`Mailcheck error response [${error.statusCode}]: ${error.response.body.message}`,
+				{ level: 'warning' },
 			);
 		}
 		throw error;
diff --git a/packages/nodes-base/nodes/Mailcheck/Mailcheck.node.json b/packages/nodes-base/nodes/Mailcheck/Mailcheck.node.json
index e813ecc09beac..5c90a04db80c4 100644
--- a/packages/nodes-base/nodes/Mailcheck/Mailcheck.node.json
+++ b/packages/nodes-base/nodes/Mailcheck/Mailcheck.node.json
@@ -2,7 +2,7 @@
 	"node": "n8n-nodes-base.mailcheck",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Utility", "Marketing & Content"],
+	"categories": ["Utility", "Marketing"],
 	"resources": {
 		"credentialDocumentation": [
 			{
diff --git a/packages/nodes-base/nodes/Mailcheck/mailcheck.svg b/packages/nodes-base/nodes/Mailcheck/mailcheck.svg
index 4a2a11d88dc7a..3ff692daab773 100644
--- a/packages/nodes-base/nodes/Mailcheck/mailcheck.svg
+++ b/packages/nodes-base/nodes/Mailcheck/mailcheck.svg
@@ -1 +1 @@
-<svg width="60" height="60" fill="none" xmlns="http://www.w3.org/2000/svg"><rect width="60" height="60" rx="8" fill="url(#a)"/><path fill-rule="evenodd" clip-rule="evenodd" d="M9.524 25l1.175-7.483L13.753 25h1.41l3.217-7.483L19.555 25h3.524l-2.314-13H17.26l-2.71 6.931L11.818 12H8.313L6 25h3.524zm20.025-4.828l1.59-4.327 1.59 4.327h-3.18zM34.483 25h3.777l-5.187-13h-3.868L24.02 25h3.777l.813-2.259h5.06L34.483 25zm5.331-13v13h3.542V12h-3.542zm6.397 0v13H54v-2.862h-4.247V12H46.21zM13.968 37.539a7.359 7.359 0 00-1.265-.41 5.792 5.792 0 00-1.22-.129c-.727 0-1.423.135-2.086.406a5.447 5.447 0 00-2.947 2.86A5.312 5.312 0 006 42.473c0 .802.152 1.543.456 2.22a5.683 5.683 0 001.21 1.755A5.416 5.416 0 0011.47 48a5.4 5.4 0 001.063-.105 8.472 8.472 0 001.16-.323l.276-.097v-3.206c-.69.738-1.469 1.105-2.333 1.105a2.769 2.769 0 01-2.59-1.74 2.997 2.997 0 01-.216-1.148c0-.406.072-.782.215-1.133.144-.351.337-.652.586-.907.248-.254.544-.453.89-.602.344-.147.72-.221 1.126-.221.92 0 1.693.381 2.32 1.147v-3.231zm4.419-.249H15.68v10.42h2.707v-4.298h3.908v4.298H25V37.29h-2.706v4.022h-3.908V37.29zm14.72 0h-5.924v10.42h5.924v-2.294H29.89v-1.797h3.038v-2.294H29.89v-1.74h3.217V37.29zm9.445.249a7.41 7.41 0 00-1.262-.41A5.857 5.857 0 0040.067 37c-.727 0-1.423.135-2.085.406a5.514 5.514 0 00-1.749 1.133 5.446 5.446 0 00-1.201 1.728 5.341 5.341 0 00-.447 2.203c0 .801.151 1.542.455 2.219a5.684 5.684 0 001.21 1.755 5.42 5.42 0 004.866 1.448c.36-.069.746-.177 1.16-.323l.276-.097V44.27c-.69.738-1.469 1.105-2.333 1.105a2.769 2.769 0 01-2.59-1.74 2.997 2.997 0 01-.216-1.148c0-.406.072-.782.215-1.133.144-.351.337-.652.586-.907.248-.254.544-.453.889-.602.345-.147.72-.221 1.127-.221.92 0 1.693.381 2.32 1.147V37.54h.002zm4.42-.249h-2.707v10.42h2.706v-4.52l3.522 4.519H54l-4.516-5.486 4.13-4.934h-3.342l-3.3 4.298V37.29zM54 29.5H6v3h48v-3z" fill="#fff"/><defs><linearGradient id="a" x1="0" y1="-1" x2="60" y2="60" gradientUnits="userSpaceOnUse"><stop stop-color="#4849C2"/><stop offset="1" stop-color="#2327A5"/></linearGradient></defs></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="60" height="60" fill="none"><rect width="60" height="60" fill="url(#a)" rx="8"/><path fill="#fff" fill-rule="evenodd" d="m9.524 25 1.175-7.483L13.753 25h1.41l3.217-7.483L19.555 25h3.524l-2.314-13H17.26l-2.71 6.931L11.818 12H8.313L6 25zm20.025-4.828 1.59-4.327 1.59 4.327zM34.483 25h3.777l-5.187-13h-3.868L24.02 25h3.777l.813-2.259h5.06zm5.331-13v13h3.542V12zm6.397 0v13H54v-2.862h-4.247V12zM13.968 37.539a7.4 7.4 0 0 0-1.265-.41 5.8 5.8 0 0 0-1.22-.129q-1.091 0-2.086.406a5.45 5.45 0 0 0-2.947 2.86A5.3 5.3 0 0 0 6 42.473q0 1.204.456 2.22a5.7 5.7 0 0 0 1.21 1.755A5.42 5.42 0 0 0 11.47 48a5.4 5.4 0 0 0 1.063-.105 8.5 8.5 0 0 0 1.16-.323l.276-.097v-3.206q-1.036 1.106-2.333 1.105a2.77 2.77 0 0 1-2.59-1.74 3 3 0 0 1-.216-1.148q0-.608.215-1.133.214-.526.586-.907.371-.38.89-.602.517-.22 1.126-.221 1.38-.001 2.32 1.147zm4.419-.249H15.68v10.42h2.707v-4.298h3.908v4.298H25V37.29h-2.706v4.022h-3.908V37.29zm14.72 0h-5.924v10.42h5.924v-2.294H29.89v-1.797h3.038v-2.294H29.89v-1.74h3.217zm9.445.249a7.4 7.4 0 0 0-1.262-.41A6 6 0 0 0 40.067 37q-1.091 0-2.085.406a5.5 5.5 0 0 0-1.749 1.133 5.5 5.5 0 0 0-1.201 1.728 5.3 5.3 0 0 0-.447 2.203q0 1.203.455 2.219a5.7 5.7 0 0 0 1.21 1.755 5.42 5.42 0 0 0 4.866 1.448q.54-.104 1.16-.323l.276-.097V44.27q-1.036 1.106-2.333 1.105a2.77 2.77 0 0 1-2.59-1.74 3 3 0 0 1-.216-1.148q0-.608.215-1.133.214-.526.586-.907.372-.38.889-.602.517-.22 1.127-.221 1.38-.001 2.32 1.147V37.54zm4.42-.249h-2.707v10.42h2.706v-4.52l3.522 4.519H54l-4.516-5.486 4.13-4.934h-3.342l-3.3 4.298zM54 29.5H6v3h48z" clip-rule="evenodd"/><defs><linearGradient id="a" x1="0" x2="60" y1="-1" y2="60" gradientUnits="userSpaceOnUse"><stop stop-color="#4849C2"/><stop offset="1" stop-color="#2327A5"/></linearGradient></defs></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Mailchimp/GenericFunctions.ts b/packages/nodes-base/nodes/Mailchimp/GenericFunctions.ts
index f73b7a3d22186..3c9627ef7d35d 100644
--- a/packages/nodes-base/nodes/Mailchimp/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Mailchimp/GenericFunctions.ts
@@ -1,21 +1,20 @@
-import type { OptionsWithUrl } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	JsonObject,
+	IRequestOptions,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 async function getMetadata(
-	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	oauthTokenData: IDataObject,
 ) {
 	const credentials = await this.getCredentials('mailchimpOAuth2Api');
-	const options: OptionsWithUrl = {
+	const options: IRequestOptions = {
 		headers: {
 			Accept: 'application/json',
 			Authorization: `OAuth ${oauthTokenData.access_token}`,
@@ -24,13 +23,13 @@ async function getMetadata(
 		url: credentials.metadataUrl as string,
 		json: true,
 	};
-	return this.helpers.request(options);
+	return await this.helpers.request(options);
 }
 
 export async function mailchimpApiRequest(
-	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	endpoint: string,
-	method: string,
+	method: IHttpRequestMethods,
 
 	body: any = {},
 	qs: IDataObject = {},
@@ -40,7 +39,7 @@ export async function mailchimpApiRequest(
 
 	const host = 'api.mailchimp.com/3.0';
 
-	const options: OptionsWithUrl = {
+	const options: IRequestOptions = {
 		headers: {
 			Accept: 'application/json',
 		},
@@ -85,7 +84,7 @@ export async function mailchimpApiRequest(
 export async function mailchimpApiRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
 	endpoint: string,
-	method: string,
+	method: IHttpRequestMethods,
 	propertyName: string,
 
 	body: any = {},
diff --git a/packages/nodes-base/nodes/Mailchimp/Mailchimp.node.json b/packages/nodes-base/nodes/Mailchimp/Mailchimp.node.json
index 25660115fc518..9706e68aa6172 100644
--- a/packages/nodes-base/nodes/Mailchimp/Mailchimp.node.json
+++ b/packages/nodes-base/nodes/Mailchimp/Mailchimp.node.json
@@ -2,7 +2,7 @@
 	"node": "n8n-nodes-base.mailchimp",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Marketing & Content", "Communication"],
+	"categories": ["Marketing", "Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
diff --git a/packages/nodes-base/nodes/Mailchimp/Mailchimp.node.ts b/packages/nodes-base/nodes/Mailchimp/Mailchimp.node.ts
index 0d3728ad2cdc5..07d8345826c8d 100644
--- a/packages/nodes-base/nodes/Mailchimp/Mailchimp.node.ts
+++ b/packages/nodes-base/nodes/Mailchimp/Mailchimp.node.ts
@@ -8,6 +8,7 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
+import moment from 'moment-timezone';
 import {
 	campaignFieldsMetadata,
 	mailchimpApiRequest,
@@ -15,8 +16,6 @@ import {
 	validateJSON,
 } from './GenericFunctions';
 
-import moment from 'moment';
-
 const enum Status {
 	subscribe = 'subscribe',
 	unsubscribed = 'unsubscribe',
@@ -2197,6 +2196,6 @@ export class Mailchimp implements INodeType {
 				throw error;
 			}
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Mailchimp/MailchimpTrigger.node.json b/packages/nodes-base/nodes/Mailchimp/MailchimpTrigger.node.json
index 8974b1eb2a96c..7adc9fa0141ef 100644
--- a/packages/nodes-base/nodes/Mailchimp/MailchimpTrigger.node.json
+++ b/packages/nodes-base/nodes/Mailchimp/MailchimpTrigger.node.json
@@ -2,7 +2,7 @@
 	"node": "n8n-nodes-base.mailchimpTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Marketing & Content", "Communication"],
+	"categories": ["Marketing", "Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
diff --git a/packages/nodes-base/nodes/Mailchimp/MailchimpTrigger.node.ts b/packages/nodes-base/nodes/Mailchimp/MailchimpTrigger.node.ts
index 15cea1fa9f246..e2edbe41e0574 100644
--- a/packages/nodes-base/nodes/Mailchimp/MailchimpTrigger.node.ts
+++ b/packages/nodes-base/nodes/Mailchimp/MailchimpTrigger.node.ts
@@ -196,7 +196,12 @@ export class MailchimpTrigger implements INodeType {
 				try {
 					await mailchimpApiRequest.call(this, endpoint, 'GET');
 				} catch (error) {
-					if (error instanceof NodeApiError && error.cause && 'isAxiosError' in error.cause) {
+					if (
+						error instanceof NodeApiError &&
+						error.cause &&
+						'isAxiosError' in error.cause &&
+						'statusCode' in error.cause
+					) {
 						if (error.cause.statusCode === 404) {
 							return false;
 						}
diff --git a/packages/nodes-base/nodes/Mailchimp/mailchimp.svg b/packages/nodes-base/nodes/Mailchimp/mailchimp.svg
index a3ed0a59c7a9f..959a3d2a1b3d5 100644
--- a/packages/nodes-base/nodes/Mailchimp/mailchimp.svg
+++ b/packages/nodes-base/nodes/Mailchimp/mailchimp.svg
@@ -1 +1 @@
-<svg width="60" height="60" xmlns="http://www.w3.org/2000/svg"><g transform="translate(2)"><path d="M56.798 39.115c-.36-.845-1.197-1.449-2.155-1.69-.36-1.57-.838-2.294-.838-2.415.12-.241.359-.362.359-.483 1.437-1.69.479-4.225-1.915-4.829-1.317-1.328-2.515-1.931-3.592-2.414-.958-.483-.599-.242-1.437-.725-.24-1.207-.359-3.863-.718-5.794-.36-1.69-1.078-3.019-2.035-3.743-.48-.966-.958-1.81-1.676-2.535 3.352-5.07 4.19-10.14 1.795-12.797C43.51.483 41.953 0 40.037 0c-2.754 0-5.986 1.087-9.338 3.139 0 0-2.155-1.811-2.275-1.811C19.086-6.036-7.373 26.68 1.966 33.803l2.394 1.81c-1.556 4.227.6 9.297 5.028 10.867.958.362 2.036.483 3.113.483 0 0 7.064 13.038 22.029 13.038C51.77 60 56.2 42.978 56.2 42.857c-.12.12 1.316-2.052.598-3.742zM2.564 31.63C.77 28.37 4.001 21.85 6.395 17.988 12.142 8.692 21.84 1.328 26.27 2.414l1.197-.482s3.233 2.776 3.352 2.776C33.093 3.38 35.966 1.932 38.6 1.69c-1.676.362-3.591 1.207-5.986 2.656 0 0-5.627 3.863-8.979 7.244-1.796 1.81-9.218 10.865-9.218 10.744 1.317-2.535 2.274-3.863 4.43-6.52 1.197-1.569 2.514-3.017 3.83-4.466.599-.604 1.198-1.207 1.916-1.81.479-.363.838-.846 1.317-1.208.24-.12.36-.362.599-.483l-4.31-3.622.239 1.57 3.113 2.776s-2.754 1.932-4.19 3.14c-5.627 4.828-11.015 12.192-13.05 19.315h.12c-.958.604-2.036 1.449-2.874 2.656-.359.12-2.634-1.449-2.993-2.052zm9.219 13.4c-3.352 0-5.986-2.897-5.986-6.398s2.753-6.399 5.986-6.399c.838 0 1.676.242 2.394.483 0 0 1.317.604 1.676 3.743.36-.966.599-1.811.599-1.811.479 1.328.599 2.777.599 4.105.359-.483.718-1.328.718-1.328.718 4.104-2.155 7.605-5.986 7.605zm7.423-22.575s2.633-4.95 8.26-8.33c-.479-.121-1.436.12-1.676.12 1.078-.845 2.993-1.448 4.31-1.81-.359-.242-1.317-.363-1.796-.363h-.24c1.198-.724 3.593-1.086 5.628-.724-.24-.362-.838-.604-1.317-.724h-.24.12c1.317-.242 2.754 0 3.95.483-.119-.363-.478-.725-.717-.966l-.12-.12c1.197.24 2.394.844 3.352 1.448a3.668 3.668 0 00-.599-.845c1.198.362 2.515 1.207 3.113 2.414v.121c-2.275-1.69-8.74-1.207-15.204 3.018-2.874 1.932-5.148 3.984-6.824 6.278zm35.197 19.678c-.12.12-.838 4.587-5.626 8.33-5.867 4.708-13.649 4.225-16.642 1.57-1.556-1.45-2.274-3.623-2.274-3.623s-.12 1.208-.24 1.69c-1.197-2.052-1.077-4.466-1.077-4.466s-.599 1.207-.958 1.81c-.838-2.293-.479-4.587-.479-4.587l-.718 1.087s-.36-2.536.479-4.588c.838-2.294 2.514-3.863 2.873-4.104-1.197-.363-2.634-1.57-2.634-1.57h.958s-2.514-1.81-2.993-4.587c.359.482 1.077.965 1.077.965-.24-.724-.359-2.293-.12-3.984.48-3.018 2.994-5.07 5.747-5.07 2.993 0 5.029.604 7.543-1.69.479-.483.957-.966 1.676-1.087.12 0 .24-.12.718-.12.36 0 .838.12 1.197.362 1.317.845 1.676 3.018 1.796 4.587.599 5.795.36 4.83 2.634 6.037 1.077.603 2.394 1.086 3.831 2.656 1.197 0 1.796.965 1.317 1.69-4.07 4.829-9.697 7.122-15.923 7.364h-.838c-2.514.12-3.352 3.38-1.796 5.312.958 1.207 2.993 1.69 4.55 1.69 6.824.12 13.768-4.708 14.965-7.485l.12-.242c-.24.363-6.944 6.64-15.085 6.399 0 0-.838 0-1.676-.242-1.078-.241-1.916-.724-2.275-1.81.718.12 1.556.241 2.514.241 5.866 0 10.057-2.656 9.697-2.777h-.12c-.718.121-7.781 2.898-12.21 1.449 0-.12 0-.241.119-.362.359-1.328 1.077-1.207 2.275-1.207 4.07-.121 7.302-1.208 9.817-2.294 2.633-1.207 4.669-2.898 5.387-3.743.958 1.57.958 3.622.958 3.622s.359-.12.838-.12c1.437.12 1.676 1.448.598 2.897z"/><path d="M25.25 4.8l.7.2-.6-2-.3 1zm4.75.486L29 4l.364 2c.181-.286.363-.429.636-.714zm12.222 21.383c.667 0 1.222.11 1.778.331 0-1.545-.889-3.2-1.556-2.98-.444.11-.444.773-.444 1.214 0 .552 0 .993.222 1.435zM28 7.538L25 7l1.957 1c.39-.154.652-.308 1.043-.462zM34.939 29.5c.663.25 1.061.375 1.061.25 0 0 0-.25-.133-.375-.398-.5-1.06-1-1.724-1.125-1.46-.5-3.184-.25-4.378.75-.663.5-.929 1-.663 1 .132 0 .53-.125 1.061-.25 2.123-.875 3.184-.875 4.776-.25zm.576 2.081h.476c.095-.19-.572-.663-1.62-.569-.095 0-.19.095-.38.095h-.096c-.19.095-.477.19-.667.38-.19.19-.286.379-.19.474.095.095.19 0 .476-.095.857-.285 1.429-.285 2-.285zM13.15 36.562c.365.527.243.791.365.923 0 0 .12.132.242 0 .243-.132.243-.396.243-.66 0-.527-.243-1.187-.607-1.583-.485-.528-1.092-1.055-1.942-1.187-.728-.132-1.456 0-1.577.132-.122 0-.243 0-.364.132-1.942.791-2.792 2.902-2.428 4.882a5.09 5.09 0 00.607 1.45c.364.529.85.397.607 0 0-.131-.243-.659-.364-1.45 0-.924.121-1.848.728-2.64.364-.527.85-.791.97-.791.122 0 .122-.132.244-.132h.121c.243-.132.121 0 .364-.132 1.456-.264 2.427.396 2.791 1.056z"/><path d="M13.28 38.039c-.104-.104-.21-.208-.21-.312 0-.208 0-.311.21-.415.106-.104.212-.104.212-.208s-.422-.208-.844.104c-.316.311-.316.935.106 1.35.527.52 1.265.624 1.37 1.247v.623c-.105.623-.738 1.247-1.792 1.039h-.316c-.105.104.316.623 1.16.52 1.16 0 2.002-1.143 1.792-2.39-.106-1.039-1.265-1.247-1.687-1.558z"/><circle transform="rotate(-81.136 43.66 29.98)" cx="43.66" cy="29.981" r="1"/><circle transform="rotate(-61.277 40.817 30.927)" cx="40.817" cy="30.927" r="1"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="60" height="60"><g transform="translate(2)"><path d="M56.798 39.115c-.36-.845-1.197-1.449-2.155-1.69-.36-1.57-.838-2.294-.838-2.415.12-.241.359-.362.359-.483 1.437-1.69.479-4.225-1.915-4.829-1.317-1.328-2.515-1.931-3.592-2.414-.958-.483-.599-.242-1.437-.725-.24-1.207-.359-3.863-.718-5.794-.36-1.69-1.078-3.019-2.035-3.743-.48-.966-.958-1.81-1.676-2.535 3.352-5.07 4.19-10.14 1.795-12.797C43.51.483 41.953 0 40.037 0c-2.754 0-5.986 1.087-9.338 3.139 0 0-2.155-1.811-2.275-1.811C19.086-6.036-7.373 26.68 1.966 33.803l2.394 1.81c-1.556 4.227.6 9.297 5.028 10.867.958.362 2.036.483 3.113.483 0 0 7.064 13.038 22.029 13.038C51.77 60 56.2 42.978 56.2 42.857c-.12.12 1.316-2.052.598-3.742M2.564 31.63C.77 28.37 4.001 21.85 6.395 17.988 12.142 8.692 21.84 1.328 26.27 2.414l1.197-.482s3.233 2.776 3.352 2.776C33.093 3.38 35.966 1.932 38.6 1.69c-1.676.362-3.591 1.207-5.986 2.656 0 0-5.627 3.863-8.979 7.244-1.796 1.81-9.218 10.865-9.218 10.744 1.317-2.535 2.274-3.863 4.43-6.52 1.197-1.569 2.514-3.017 3.83-4.466.599-.604 1.198-1.207 1.916-1.81.479-.363.838-.846 1.317-1.208.24-.12.36-.362.599-.483l-4.31-3.622.239 1.57 3.113 2.776s-2.754 1.932-4.19 3.14c-5.627 4.828-11.015 12.192-13.05 19.315h.12c-.958.604-2.036 1.449-2.874 2.656-.359.12-2.634-1.449-2.993-2.052m9.219 13.4c-3.352 0-5.986-2.897-5.986-6.398s2.753-6.399 5.986-6.399c.838 0 1.676.242 2.394.483 0 0 1.317.604 1.676 3.743.36-.966.599-1.811.599-1.811.479 1.328.599 2.777.599 4.105.359-.483.718-1.328.718-1.328.718 4.104-2.155 7.605-5.986 7.605m7.423-22.575s2.633-4.95 8.26-8.33c-.479-.121-1.436.12-1.676.12 1.078-.845 2.993-1.448 4.31-1.81-.359-.242-1.317-.363-1.796-.363h-.24c1.198-.724 3.593-1.086 5.628-.724-.24-.362-.838-.604-1.317-.724h-.24.12c1.317-.242 2.754 0 3.95.483-.119-.363-.478-.725-.717-.966l-.12-.12c1.197.24 2.394.844 3.352 1.448a3.7 3.7 0 0 0-.599-.845c1.198.362 2.515 1.207 3.113 2.414v.121c-2.275-1.69-8.74-1.207-15.204 3.018-2.874 1.932-5.148 3.984-6.824 6.278m35.197 19.678c-.12.12-.838 4.587-5.626 8.33-5.867 4.708-13.649 4.225-16.642 1.57-1.556-1.45-2.274-3.623-2.274-3.623s-.12 1.208-.24 1.69c-1.197-2.052-1.077-4.466-1.077-4.466s-.599 1.207-.958 1.81c-.838-2.293-.479-4.587-.479-4.587l-.718 1.087s-.36-2.536.479-4.588c.838-2.294 2.514-3.863 2.873-4.104-1.197-.363-2.634-1.57-2.634-1.57h.958s-2.514-1.81-2.993-4.587c.359.482 1.077.965 1.077.965-.24-.724-.359-2.293-.12-3.984.48-3.018 2.994-5.07 5.747-5.07 2.993 0 5.029.604 7.543-1.69.479-.483.957-.966 1.676-1.087.12 0 .24-.12.718-.12.36 0 .838.12 1.197.362 1.317.845 1.676 3.018 1.796 4.587.599 5.795.36 4.83 2.634 6.037 1.077.603 2.394 1.086 3.831 2.656 1.197 0 1.796.965 1.317 1.69-4.07 4.829-9.697 7.122-15.923 7.364h-.838c-2.514.12-3.352 3.38-1.796 5.312.958 1.207 2.993 1.69 4.55 1.69 6.824.12 13.768-4.708 14.965-7.485l.12-.242c-.24.363-6.944 6.64-15.085 6.399 0 0-.838 0-1.676-.242-1.078-.241-1.916-.724-2.275-1.81.718.12 1.556.241 2.514.241 5.866 0 10.057-2.656 9.697-2.777h-.12c-.718.121-7.781 2.898-12.21 1.449 0-.12 0-.241.119-.362.359-1.328 1.077-1.207 2.275-1.207 4.07-.121 7.302-1.208 9.817-2.294 2.633-1.207 4.669-2.898 5.387-3.743.958 1.57.958 3.622.958 3.622s.359-.12.838-.12c1.437.12 1.676 1.448.598 2.897"/><path d="m25.25 4.8.7.2-.6-2-.3 1zm4.75.486L29 4l.364 2c.181-.286.363-.429.636-.714m12.222 21.383c.667 0 1.222.11 1.778.331 0-1.545-.889-3.2-1.556-2.98-.444.11-.444.773-.444 1.214 0 .552 0 .993.222 1.435M28 7.538 25 7l1.957 1c.39-.154.652-.308 1.043-.462M34.939 29.5c.663.25 1.061.375 1.061.25 0 0 0-.25-.133-.375-.398-.5-1.06-1-1.724-1.125-1.46-.5-3.184-.25-4.378.75-.663.5-.929 1-.663 1 .132 0 .53-.125 1.061-.25 2.123-.875 3.184-.875 4.776-.25m.576 2.081h.476c.095-.19-.572-.663-1.62-.569-.095 0-.19.095-.38.095h-.096c-.19.095-.477.19-.667.38s-.286.379-.19.474.19 0 .476-.095c.857-.285 1.429-.285 2-.285zM13.15 36.562c.365.527.243.791.365.923 0 0 .12.132.242 0 .243-.132.243-.396.243-.66 0-.527-.243-1.187-.607-1.583-.485-.528-1.092-1.055-1.942-1.187-.728-.132-1.456 0-1.577.132-.122 0-.243 0-.364.132-1.942.791-2.792 2.902-2.428 4.882a5.1 5.1 0 0 0 .607 1.45c.364.529.85.397.607 0 0-.131-.243-.659-.364-1.45 0-.924.121-1.848.728-2.64.364-.527.85-.791.97-.791.122 0 .122-.132.244-.132h.121c.243-.132.121 0 .364-.132 1.456-.264 2.427.396 2.791 1.056"/><path d="M13.28 38.039c-.104-.104-.21-.208-.21-.312 0-.208 0-.311.21-.415.106-.104.212-.104.212-.208s-.422-.208-.844.104c-.316.311-.316.935.106 1.35.527.52 1.265.624 1.37 1.247v.623c-.105.623-.738 1.247-1.792 1.039h-.316c-.105.104.316.623 1.16.52 1.16 0 2.002-1.143 1.792-2.39-.106-1.039-1.265-1.247-1.687-1.558z"/><circle cx="43.66" cy="29.981" r="1" transform="rotate(-81.136 43.66 29.98)"/><circle cx="40.817" cy="30.927" r="1" transform="rotate(-61.277 40.817 30.927)"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/MailerLite/GenericFunctions.ts b/packages/nodes-base/nodes/MailerLite/GenericFunctions.ts
index d27d7a38822dc..2459f349d1279 100644
--- a/packages/nodes-base/nodes/MailerLite/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/MailerLite/GenericFunctions.ts
@@ -1,18 +1,17 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	JsonObject,
+	IRequestOptions,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function mailerliteApiRequest(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IHookFunctions,
-	method: string,
+	this: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions,
+	method: IHttpRequestMethods,
 	path: string,
 
 	body: any = {},
@@ -21,7 +20,7 @@ export async function mailerliteApiRequest(
 ): Promise<any> {
 	const credentials = await this.getCredentials('mailerLiteApi');
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			'X-MailerLite-ApiKey': credentials.apiKey,
 		},
@@ -44,7 +43,7 @@ export async function mailerliteApiRequest(
 
 export async function mailerliteApiRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: any = {},
diff --git a/packages/nodes-base/nodes/MailerLite/MailerLite.node.json b/packages/nodes-base/nodes/MailerLite/MailerLite.node.json
index a95b8072dc94c..2da2b124042e3 100644
--- a/packages/nodes-base/nodes/MailerLite/MailerLite.node.json
+++ b/packages/nodes-base/nodes/MailerLite/MailerLite.node.json
@@ -2,7 +2,7 @@
 	"node": "n8n-nodes-base.mailerLite",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Communication", "Marketing & Content"],
+	"categories": ["Communication", "Marketing"],
 	"resources": {
 		"credentialDocumentation": [
 			{
diff --git a/packages/nodes-base/nodes/MailerLite/MailerLite.node.ts b/packages/nodes-base/nodes/MailerLite/MailerLite.node.ts
index f7adc07c4450c..40a1f976ea4eb 100644
--- a/packages/nodes-base/nodes/MailerLite/MailerLite.node.ts
+++ b/packages/nodes-base/nodes/MailerLite/MailerLite.node.ts
@@ -200,6 +200,6 @@ export class MailerLite implements INodeType {
 			returnData.push(...executionData);
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/MailerLite/MailerLiteTrigger.node.json b/packages/nodes-base/nodes/MailerLite/MailerLiteTrigger.node.json
index e5b80786cf1da..94abbee715301 100644
--- a/packages/nodes-base/nodes/MailerLite/MailerLiteTrigger.node.json
+++ b/packages/nodes-base/nodes/MailerLite/MailerLiteTrigger.node.json
@@ -2,7 +2,7 @@
 	"node": "n8n-nodes-base.mailerLiteTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Communication", "Marketing & Content"],
+	"categories": ["Communication", "Marketing"],
 	"resources": {
 		"credentialDocumentation": [
 			{
diff --git a/packages/nodes-base/nodes/Mailgun/Mailgun.node.ts b/packages/nodes-base/nodes/Mailgun/Mailgun.node.ts
index 7305f5c5a200d..24e151d349154 100644
--- a/packages/nodes-base/nodes/Mailgun/Mailgun.node.ts
+++ b/packages/nodes-base/nodes/Mailgun/Mailgun.node.ts
@@ -5,6 +5,7 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 	JsonObject,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
@@ -172,7 +173,7 @@ export class Mailgun implements INodeType {
 					formData,
 					uri: `https://${credentials.apiDomain}/v3/${credentials.emailDomain}/messages`,
 					json: true,
-				};
+				} satisfies IRequestOptions;
 
 				let responseData;
 
@@ -204,6 +205,6 @@ export class Mailgun implements INodeType {
 				throw error;
 			}
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Mailgun/mailgun.svg b/packages/nodes-base/nodes/Mailgun/mailgun.svg
index 88267bf086221..09def73c531fc 100644
--- a/packages/nodes-base/nodes/Mailgun/mailgun.svg
+++ b/packages/nodes-base/nodes/Mailgun/mailgun.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 66 65" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><path d="M32.066 19.9c-6.7 0-12.13 5.433-12.13 12.1s5.443 12.1 12.13 12.1 12.13-5.433 12.13-12.1-5.443-12.1-12.13-12.1zM13.181 32c0-10.408 8.46-18.852 18.885-18.852s18.884 8.454 18.884 18.86c0 .72-.066 1.375-.13 2.03-.13 1.833 1.18 3.207 3.016 3.207 3.082 0 3.4-3.993 3.4-5.302 0-13.943-11.28-25.2-25.246-25.2S6.754 18.001 6.754 31.944s11.279 25.2 25.246 25.2c7.4 0 14.033-3.207 18.7-8.248l5.18 4.32A31.928 31.928 0 0132 63.886c-17.705.002-32-14.334-32-31.942C0 14.27 14.36 0 32 0c17.705 0 32 14.336 32 31.944 0 7.07-3.4 12.83-10.164 12.83-3.016 0-4.787-1.375-5.836-2.88-3.344 5.368-9.246 8.902-16.066 8.902-10.295.065-18.754-8.38-18.754-18.786zm18.885-5.564c3.082 0 5.574 2.487 5.574 5.498 0 3.077-2.492 5.564-5.574 5.564s-5.574-2.477-5.574-5.554c.066-3 2.492-5.498 5.574-5.498z" stroke="none" fill="#c02126" fill-rule="nonzero"/></symbol></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round" viewBox="0 0 66 65"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><path fill="#c02126" fill-rule="nonzero" stroke="none" d="M32.066 19.9c-6.7 0-12.13 5.433-12.13 12.1s5.443 12.1 12.13 12.1 12.13-5.433 12.13-12.1-5.443-12.1-12.13-12.1M13.181 32c0-10.408 8.46-18.852 18.885-18.852s18.884 8.454 18.884 18.86c0 .72-.066 1.375-.13 2.03-.13 1.833 1.18 3.207 3.016 3.207 3.082 0 3.4-3.993 3.4-5.302 0-13.943-11.28-25.2-25.246-25.2S6.754 18.001 6.754 31.944s11.279 25.2 25.246 25.2c7.4 0 14.033-3.207 18.7-8.248l5.18 4.32A31.93 31.93 0 0 1 32 63.886c-17.705.002-32-14.334-32-31.942C0 14.27 14.36 0 32 0c17.705 0 32 14.336 32 31.944 0 7.07-3.4 12.83-10.164 12.83-3.016 0-4.787-1.375-5.836-2.88-3.344 5.368-9.246 8.902-16.066 8.902-10.295.065-18.754-8.38-18.754-18.786zm18.885-5.564c3.082 0 5.574 2.487 5.574 5.498 0 3.077-2.492 5.564-5.574 5.564s-5.574-2.477-5.574-5.554c.066-3 2.492-5.498 5.574-5.498z"/></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Mailjet/GenericFunctions.ts b/packages/nodes-base/nodes/Mailjet/GenericFunctions.ts
index 89e5c44e1ac64..d25b301b2b3b6 100644
--- a/packages/nodes-base/nodes/Mailjet/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Mailjet/GenericFunctions.ts
@@ -1,16 +1,15 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	ILoadOptionsFunctions,
 	IDataObject,
 	IHookFunctions,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 
 export async function mailjetApiRequest(
-	this: IExecuteFunctions | IExecuteSingleFunctions | IHookFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IExecuteFunctions | IHookFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	path: string,
 
 	body: any = {},
@@ -35,7 +34,7 @@ export async function mailjetApiRequest(
 		credentialType = 'mailjetSmsApi';
 	}
 
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		headers: {
 			Accept: 'application/json',
 			'Content-Type': 'application/json',
@@ -51,12 +50,12 @@ export async function mailjetApiRequest(
 		delete options.body;
 	}
 
-	return this.helpers.requestWithAuthentication.call(this, credentialType, options);
+	return await this.helpers.requestWithAuthentication.call(this, credentialType, options);
 }
 
 export async function mailjetApiRequestAllItems(
 	this: IExecuteFunctions | IHookFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: any = {},
diff --git a/packages/nodes-base/nodes/Mailjet/Mailjet.node.ts b/packages/nodes-base/nodes/Mailjet/Mailjet.node.ts
index f0e64efd56c45..b374292333dd0 100644
--- a/packages/nodes-base/nodes/Mailjet/Mailjet.node.ts
+++ b/packages/nodes-base/nodes/Mailjet/Mailjet.node.ts
@@ -322,6 +322,6 @@ export class Mailjet implements INodeType {
 			}
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Mailjet/mailjet.svg b/packages/nodes-base/nodes/Mailjet/mailjet.svg
index 21fd08581d8b9..86c3ae8d9d89c 100644
--- a/packages/nodes-base/nodes/Mailjet/mailjet.svg
+++ b/packages/nodes-base/nodes/Mailjet/mailjet.svg
@@ -1 +1 @@
-<svg height="2500" viewBox="0.5 90 402.6 222.2" width="2500" xmlns="http://www.w3.org/2000/svg"><path d="M129.1 195.5l-7 46.5-48 70.2 16.2-8.9L354 158.1l49.1-27zm-1.7-12.3l206.8-47-13.4-1.8-54.3-7.6-115.2-15.9L.5 90l55.3 40.6 69.5 51.1z" fill="#fead0c"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="2500" height="2500" viewBox="0.5 90 402.6 222.2"><path fill="#fead0c" d="m129.1 195.5-7 46.5-48 70.2 16.2-8.9L354 158.1l49.1-27zm-1.7-12.3 206.8-47-13.4-1.8-54.3-7.6-115.2-15.9L.5 90l55.3 40.6 69.5 51.1z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Mandrill/GenericFunctions.ts b/packages/nodes-base/nodes/Mandrill/GenericFunctions.ts
index 60c89b140b92b..b2b08ce01a0a0 100644
--- a/packages/nodes-base/nodes/Mandrill/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Mandrill/GenericFunctions.ts
@@ -1,10 +1,11 @@
-import type { OptionsWithUri } from 'request';
-
-import map from 'lodash.map';
+import map from 'lodash/map';
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IHookFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
+	IRequestOptions,
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
@@ -12,11 +13,11 @@ import { NodeApiError } from 'n8n-workflow';
 export async function mandrillApiRequest(
 	this: IExecuteFunctions | IHookFunctions | ILoadOptionsFunctions,
 	resource: string,
-	method: string,
+	method: IHttpRequestMethods,
 	action: string,
 
 	body: any = {},
-	headers?: object,
+	headers?: IDataObject,
 ): Promise<any> {
 	const credentials = await this.getCredentials('mandrillApi');
 
@@ -24,7 +25,7 @@ export async function mandrillApiRequest(
 
 	const endpoint = 'mandrillapp.com/api/1.0';
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers,
 		method,
 		uri: `https://${endpoint}${resource}${action}.json`,
diff --git a/packages/nodes-base/nodes/Mandrill/Mandrill.node.ts b/packages/nodes-base/nodes/Mandrill/Mandrill.node.ts
index da49ec2442ac9..ab740ed87dafd 100644
--- a/packages/nodes-base/nodes/Mandrill/Mandrill.node.ts
+++ b/packages/nodes-base/nodes/Mandrill/Mandrill.node.ts
@@ -10,6 +10,10 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
+import moment from 'moment-timezone';
+
+import map from 'lodash/map';
+import isEmpty from 'lodash/isEmpty';
 import {
 	getGoogleAnalyticsDomainsArray,
 	getTags,
@@ -18,11 +22,6 @@ import {
 	validateJSON,
 } from './GenericFunctions';
 
-import moment from 'moment';
-
-import map from 'lodash.map';
-import isEmpty from 'lodash.isempty';
-
 interface Attachments {
 	type: string;
 	name: string;
@@ -903,6 +902,6 @@ export class Mandrill implements INodeType {
 				throw error;
 			}
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Mandrill/mandrill.svg b/packages/nodes-base/nodes/Mandrill/mandrill.svg
index fb88f6f30293f..3ec59131b4dd8 100644
--- a/packages/nodes-base/nodes/Mandrill/mandrill.svg
+++ b/packages/nodes-base/nodes/Mandrill/mandrill.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 66 53" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><g stroke="none" fill-rule="nonzero"><path d="M32.05 27.487L13.287 0v23.53l10.65 15.72 8.114-11.765" fill="#1a1918"/><path d="M32.05 27.487l8.013 11.867 10.65-15.518V0L32.05 27.487" fill="#ed9d4a"/><path d="M31.95 27.487l-8.013 11.765 8.013 11.765 8.013-11.765-8.013-11.765" fill="#ba7730"/><path d="M0 51.12h13.287V23.633L0 4.058V51.12" fill="#4cb2d4"/><path d="M0 0v4.057L13.287 23.53V0H0" fill="#1c82ad"/><path d="M50.713 23.836V51.12H64V4.362L50.713 23.836" fill="#c02439"/><path d="M64 0H50.713v23.734L64 4.26V0" fill="#8f212f"/></g></symbol></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round" viewBox="0 0 66 53"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><g fill-rule="nonzero" stroke="none"><path fill="#1a1918" d="M32.05 27.487 13.287 0v23.53l10.65 15.72 8.114-11.765"/><path fill="#ed9d4a" d="m32.05 27.487 8.013 11.867 10.65-15.518V0z"/><path fill="#ba7730" d="m31.95 27.487-8.013 11.765 8.013 11.765 8.013-11.765z"/><path fill="#4cb2d4" d="M0 51.12h13.287V23.633L0 4.058z"/><path fill="#1c82ad" d="M0 0v4.057L13.287 23.53V0z"/><path fill="#c02439" d="M50.713 23.836V51.12H64V4.362z"/><path fill="#8f212f" d="M64 0H50.713v23.734L64 4.26z"/></g></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/ManualTrigger/ManualTrigger.node.ts b/packages/nodes-base/nodes/ManualTrigger/ManualTrigger.node.ts
index 66b47a5d7ea1a..4072f6f69fc63 100644
--- a/packages/nodes-base/nodes/ManualTrigger/ManualTrigger.node.ts
+++ b/packages/nodes-base/nodes/ManualTrigger/ManualTrigger.node.ts
@@ -16,16 +16,16 @@ export class ManualTrigger implements INodeType {
 		eventTriggerDescription: '',
 		maxNodes: 1,
 		defaults: {
-			name: 'When clicking "Execute Workflow"',
+			name: 'When clicking "Test workflow"',
 			color: '#909298',
 		},
-		// eslint-disable-next-line n8n-nodes-base/node-class-description-inputs-wrong-regular-node
+
 		inputs: [],
 		outputs: ['main'],
 		properties: [
 			{
 				displayName:
-					'This node is where a manual workflow execution starts. To make one, go back to the canvas and click ‘execute workflow’',
+					'This node is where a manual workflow execution starts. To make one, go back to the canvas and click test workflow’',
 				name: 'notice',
 				type: 'notice',
 				default: '',
diff --git a/packages/nodes-base/nodes/Markdown/Markdown.node.json b/packages/nodes-base/nodes/Markdown/Markdown.node.json
index c4bde73bf051c..1c75d1093f6bd 100644
--- a/packages/nodes-base/nodes/Markdown/Markdown.node.json
+++ b/packages/nodes-base/nodes/Markdown/Markdown.node.json
@@ -11,6 +11,6 @@
 		]
 	},
 	"subcategories": {
-		"Core Nodes": ["Helpers", "Data Transformation"]
+		"Core Nodes": ["Data Transformation"]
 	}
 }
diff --git a/packages/nodes-base/nodes/Markdown/Markdown.node.ts b/packages/nodes-base/nodes/Markdown/Markdown.node.ts
index a0b7d2b13baa1..e3b7fc79ada4f 100644
--- a/packages/nodes-base/nodes/Markdown/Markdown.node.ts
+++ b/packages/nodes-base/nodes/Markdown/Markdown.node.ts
@@ -12,8 +12,8 @@ import { Converter } from 'showdown';
 
 import { NodeHtmlMarkdown } from 'node-html-markdown';
 
-import isEmpty from 'lodash.isempty';
-import set from 'lodash.set';
+import isEmpty from 'lodash/isEmpty';
+import set from 'lodash/set';
 
 export class Markdown implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Markdown/markdown.svg b/packages/nodes-base/nodes/Markdown/markdown.svg
index 24f62fb3298bf..98de0464e12e6 100644
--- a/packages/nodes-base/nodes/Markdown/markdown.svg
+++ b/packages/nodes-base/nodes/Markdown/markdown.svg
@@ -1,6 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<svg width="256px" height="158px" viewBox="0 0 256 158" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMidYMid">
-    <g>
-        <path d="M238.371257,157.892216 L18.3952096,157.892216 C8.43113772,157.892216 0,149.461078 0,139.497006 L0,18.3952096 C0,8.43113772 8.43113772,0 18.3952096,0 L237.60479,0 C247.568862,0 256,8.43113772 256,18.3952096 L256,139.497006 C256,149.461078 248.335329,157.892216 238.371257,157.892216 L238.371257,157.892216 Z M18.3952096,12.2634731 C15.3293413,12.2634731 12.2634731,15.3293413 12.2634731,18.3952096 L12.2634731,139.497006 C12.2634731,143.329341 15.3293413,145.628743 18.3952096,145.628743 L237.60479,145.628743 C241.437126,145.628743 243.736527,142.562874 243.736527,139.497006 L243.736527,18.3952096 C243.736527,14.5628743 240.670659,12.2634731 237.60479,12.2634731 C238.371257,12.2634731 18.3952096,12.2634731 18.3952096,12.2634731 L18.3952096,12.2634731 Z M36.7904192,121.101796 L36.7904192,36.7904192 L61.3173653,36.7904192 L85.8443114,67.4491018 L110.371257,36.7904192 L134.898204,36.7904192 L134.898204,121.101796 L110.371257,121.101796 L110.371257,72.8143713 L85.8443114,103.473054 L61.3173653,72.8143713 L61.3173653,121.101796 L36.7904192,121.101796 L36.7904192,121.101796 Z M190.850299,121.101796 L154.05988,80.4790419 L178.586826,80.4790419 L178.586826,36.7904192 L203.113772,36.7904192 L203.113772,79.7125749 L227.640719,79.7125749 L190.850299,121.101796 L190.850299,121.101796 Z" fill="#000000"></path>
-    </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="158" preserveAspectRatio="xMidYMid"><path d="M238.371 157.892H18.395C8.431 157.892 0 149.462 0 139.497V18.395C0 8.431 8.431 0 18.395 0h219.21C247.569 0 256 8.431 256 18.395v121.102c0 9.964-7.665 18.395-17.629 18.395M18.395 12.263c-3.066 0-6.132 3.066-6.132 6.132v121.102c0 3.832 3.066 6.132 6.132 6.132h219.21c3.832 0 6.132-3.066 6.132-6.132V18.395c0-3.832-3.066-6.132-6.132-6.132zM36.79 121.102V36.79h24.527l24.527 30.66 24.527-30.66h24.527v84.312h-24.527V72.814l-24.527 30.66-24.527-30.66v48.288zm154.06 0-36.79-40.623h24.527V36.79h24.527v42.923h24.527z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Markdown/test/node/Markdown.test.ts b/packages/nodes-base/nodes/Markdown/test/node/Markdown.test.ts
index 5edd9dd6dd66d..dc8b584dca742 100644
--- a/packages/nodes-base/nodes/Markdown/test/node/Markdown.test.ts
+++ b/packages/nodes-base/nodes/Markdown/test/node/Markdown.test.ts
@@ -1,4 +1,4 @@
-import { testWorkflows, getWorkflowFilenames } from '../../../../test/nodes/Helpers';
+import { testWorkflows, getWorkflowFilenames } from '@test/nodes/Helpers';
 
 const workflows = getWorkflowFilenames(__dirname);
 
diff --git a/packages/nodes-base/nodes/Marketstack/GenericFunctions.ts b/packages/nodes-base/nodes/Marketstack/GenericFunctions.ts
index c20a7657917f4..6e8511967a61f 100644
--- a/packages/nodes-base/nodes/Marketstack/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Marketstack/GenericFunctions.ts
@@ -1,11 +1,15 @@
-import type { OptionsWithUri } from 'request';
-
-import type { IExecuteFunctions, IDataObject, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IDataObject,
+	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
+} from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 export async function marketstackApiRequest(
 	this: IExecuteFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject = {},
 	qs: IDataObject = {},
@@ -13,7 +17,7 @@ export async function marketstackApiRequest(
 	const credentials = await this.getCredentials('marketstackApi');
 	const protocol = credentials.useHttps ? 'https' : 'http'; // Free API does not support HTTPS
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		method,
 		uri: `${protocol}://api.marketstack.com/v1${endpoint}`,
 		qs: {
@@ -36,7 +40,7 @@ export async function marketstackApiRequest(
 
 export async function marketstackApiRequestAllItems(
 	this: IExecuteFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject = {},
 	qs: IDataObject = {},
diff --git a/packages/nodes-base/nodes/Marketstack/Marketstack.node.ts b/packages/nodes-base/nodes/Marketstack/Marketstack.node.ts
index 079c1f5fc9e73..1a4b87a877c50 100644
--- a/packages/nodes-base/nodes/Marketstack/Marketstack.node.ts
+++ b/packages/nodes-base/nodes/Marketstack/Marketstack.node.ts
@@ -180,6 +180,6 @@ export class Marketstack implements INodeType {
 			returnData.push(...executionData);
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Marketstack/marketstack.svg b/packages/nodes-base/nodes/Marketstack/marketstack.svg
index 25ad681cc91c5..8e55325a3df1e 100644
--- a/packages/nodes-base/nodes/Marketstack/marketstack.svg
+++ b/packages/nodes-base/nodes/Marketstack/marketstack.svg
@@ -1,57 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 24.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   viewBox="-2457.7 882.5 59.999998 60"
-   xml:space="preserve"
-   sodipodi:docname="marketstack.svg"
-   width="60"
-   height="60"
-   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"><defs
-   id="defs77" /><sodipodi:namedview
-   id="namedview75"
-   pagecolor="#ffffff"
-   bordercolor="#666666"
-   borderopacity="1.0"
-   inkscape:pageshadow="2"
-   inkscape:pageopacity="0.0"
-   inkscape:pagecheckerboard="0"
-   showgrid="false"
-   width="60px"
-   inkscape:zoom="6.8111408"
-   inkscape:cx="145.49692"
-   inkscape:cy="32.44684"
-   inkscape:window-width="3840"
-   inkscape:window-height="2066"
-   inkscape:window-x="-11"
-   inkscape:window-y="-11"
-   inkscape:window-maximized="1"
-   inkscape:current-layer="Layer_1" />
-<style
-   type="text/css"
-   id="style44">
-	.st0{enable-background:new    ;}
-	.st1{fill:#FFFFFF;}
-</style>
-<title
-   id="title46">Marketstack</title>
-
-<path
-   class="st1"
-   d="m -2398.9017,942.5 c 0,-0.38462 0.096,-0.67308 0.096,-0.86538 0,-1.63462 0,-3.36539 0,-5 0,-17.69231 0,-35.48077 0,-53.17308 0,-0.96154 0,-0.96154 -0.9616,-0.96154 -7.1154,0 -14.2307,0 -21.3461,0 -0.6731,0 -0.8654,0.19231 -0.8654,0.86538 0,3.36539 0,6.63462 0,10 0,0.67308 0.2884,0.86539 0.8654,0.86539 3.2692,0 6.5384,0 9.7115,0 0.9615,0 0.9615,0 0.9615,0.96154 0,6.53846 0,13.07692 0,19.61538 0,7.30769 0,14.51923 0,21.82693 0,0.48076 0,0.86538 0.577,1.15384 2.8846,1.25 5.7692,2.59616 8.5577,3.84616 0.7692,0.1923 1.5384,0.48076 2.4038,0.86538 z m -17.2115,-21.44231 c 0,0 0,0 0,0 0,-6.82692 0,-13.65384 0,-20.48077 0,-0.86538 0,-0.86538 -0.8654,-0.86538 -7.2116,0 -14.3269,0 -21.5385,0 -0.6731,0 -0.8654,0.19231 -0.8654,0.86538 0,3.36539 0,6.63462 0,10 0,0.67308 0.2885,0.86539 0.8654,0.86539 3.1731,0 6.3462,0 9.5193,0 1.25,0 1.25,-0.19231 1.25,1.25 0,7.98077 0,15.86538 0,23.84615 0,0.67308 0.1923,1.05769 0.8653,1.25 1.4423,0.57692 2.7885,1.25 4.2308,1.92308 2.0192,0.86538 3.9423,1.73077 5.9615,2.69231 0.4808,0.1923 0.6731,0.0961 0.6731,-0.38462 0,-0.19231 0,-0.38461 0,-0.57692 -0.096,-6.92308 -0.096,-13.65385 -0.096,-20.38462 z m -17.3077,8.75 c 0,0 0,0 0,0 0,-3.94231 0,-7.98077 0,-11.92307 0,-0.57693 -0.1923,-0.86539 -0.8654,-0.86539 -7.1154,0 -14.3269,0 -21.4423,0 -0.8654,0 -0.8654,0 -0.8654,0.86539 0,5.1923 0,10.48076 0,15.67307 0,0.67308 0.1923,0.96154 0.7692,1.15385 2.1154,0.67308 4.1346,1.44231 6.25,2.21154 5.0962,1.73077 10.1923,3.55769 15.2885,5.28846 0.8654,0.28846 0.8654,0.28846 0.8654,-0.67308 0,-3.84615 0,-7.78846 0,-11.73077 z"
-   id="path72"
-   style="fill:#02283e;fill-opacity:1;stroke-width:0.961538" />
-<metadata
-   id="metadata1072"><rdf:RDF><cc:Work
-       rdf:about=""><dc:title>Marketstack</dc:title></cc:Work></rdf:RDF></metadata></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="60" height="60" viewBox="-2457.7 882.5 60 60"><path d="M-2398.902 942.5c0-.385.096-.673.096-.865v-58.173c0-.962 0-.962-.961-.962h-21.346c-.674 0-.866.192-.866.865v10c0 .673.289.866.866.866h9.711c.962 0 .962 0 .962.961v41.443c0 .48 0 .865.577 1.153 2.884 1.25 5.769 2.597 8.557 3.847.77.192 1.539.48 2.404.865m-17.211-21.442v-20.481c0-.865 0-.865-.866-.865h-21.538c-.673 0-.866.192-.866.865v10c0 .673.289.865.866.865h9.52c1.25 0 1.25-.192 1.25 1.25v23.846c0 .674.191 1.058.864 1.25 1.443.577 2.789 1.25 4.231 1.924 2.02.865 3.943 1.73 5.962 2.692.48.192.673.096.673-.385v-.577c-.096-6.923-.096-13.654-.096-20.384m-17.308 8.75v-11.923c0-.577-.192-.866-.865-.866h-21.443c-.865 0-.865 0-.865.866v15.673c0 .673.192.961.77 1.154 2.115.673 4.134 1.442 6.25 2.211 5.095 1.73 10.192 3.558 15.288 5.289.865.288.865.288.865-.674z" style="fill:#02283e;fill-opacity:1;stroke-width:.961538"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Marketstack/types.d.ts b/packages/nodes-base/nodes/Marketstack/types.ts
similarity index 100%
rename from packages/nodes-base/nodes/Marketstack/types.d.ts
rename to packages/nodes-base/nodes/Marketstack/types.ts
diff --git a/packages/nodes-base/nodes/Matrix/GenericFunctions.ts b/packages/nodes-base/nodes/Matrix/GenericFunctions.ts
index a01b846934e68..cb8370f6bd1dd 100644
--- a/packages/nodes-base/nodes/Matrix/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Matrix/GenericFunctions.ts
@@ -1,10 +1,9 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
+	IRequestOptions,
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
@@ -12,15 +11,15 @@ import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 import { v4 as uuid } from 'uuid';
 
 export async function matrixApiRequest(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 	body: string | object = {},
-	query: object = {},
+	query: IDataObject = {},
 	headers: IDataObject | undefined = undefined,
 	option: IDataObject = {},
 ) {
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		method,
 		headers: headers || {
 			'Content-Type': 'application/json; charset=utf-8',
@@ -65,7 +64,7 @@ export async function handleMatrixCall(
 ): Promise<any> {
 	if (resource === 'account') {
 		if (operation === 'me') {
-			return matrixApiRequest.call(this, 'GET', '/account/whoami');
+			return await matrixApiRequest.call(this, 'GET', '/account/whoami');
 		}
 	} else if (resource === 'room') {
 		if (operation === 'create') {
@@ -79,20 +78,20 @@ export async function handleMatrixCall(
 			if (roomAlias) {
 				body.room_alias_name = roomAlias;
 			}
-			return matrixApiRequest.call(this, 'POST', '/createRoom', body);
+			return await matrixApiRequest.call(this, 'POST', '/createRoom', body);
 		} else if (operation === 'join') {
 			const roomIdOrAlias = this.getNodeParameter('roomIdOrAlias', index) as string;
-			return matrixApiRequest.call(this, 'POST', `/rooms/${roomIdOrAlias}/join`);
+			return await matrixApiRequest.call(this, 'POST', `/rooms/${roomIdOrAlias}/join`);
 		} else if (operation === 'leave') {
 			const roomId = this.getNodeParameter('roomId', index) as string;
-			return matrixApiRequest.call(this, 'POST', `/rooms/${roomId}/leave`);
+			return await matrixApiRequest.call(this, 'POST', `/rooms/${roomId}/leave`);
 		} else if (operation === 'invite') {
 			const roomId = this.getNodeParameter('roomId', index) as string;
 			const userId = this.getNodeParameter('userId', index) as string;
 			const body: IDataObject = {
 				user_id: userId,
 			};
-			return matrixApiRequest.call(this, 'POST', `/rooms/${roomId}/invite`, body);
+			return await matrixApiRequest.call(this, 'POST', `/rooms/${roomId}/invite`, body);
 		} else if (operation === 'kick') {
 			const roomId = this.getNodeParameter('roomId', index) as string;
 			const userId = this.getNodeParameter('userId', index) as string;
@@ -101,7 +100,7 @@ export async function handleMatrixCall(
 				user_id: userId,
 				reason,
 			};
-			return matrixApiRequest.call(this, 'POST', `/rooms/${roomId}/kick`, body);
+			return await matrixApiRequest.call(this, 'POST', `/rooms/${roomId}/kick`, body);
 		}
 	} else if (resource === 'message') {
 		if (operation === 'create') {
@@ -120,7 +119,7 @@ export async function handleMatrixCall(
 				body.body = fallbackText;
 			}
 			const messageId = uuid();
-			return matrixApiRequest.call(
+			return await matrixApiRequest.call(
 				this,
 				'PUT',
 				`/rooms/${roomId}/send/m.room.message/${messageId}`,
@@ -182,13 +181,14 @@ export async function handleMatrixCall(
 		if (operation === 'get') {
 			const roomId = this.getNodeParameter('roomId', index) as string;
 			const eventId = this.getNodeParameter('eventId', index) as string;
-			return matrixApiRequest.call(this, 'GET', `/rooms/${roomId}/event/${eventId}`);
+			return await matrixApiRequest.call(this, 'GET', `/rooms/${roomId}/event/${eventId}`);
 		}
 	} else if (resource === 'media') {
 		if (operation === 'upload') {
 			const roomId = this.getNodeParameter('roomId', index) as string;
 			const mediaType = this.getNodeParameter('mediaType', index) as string;
 			const binaryPropertyName = this.getNodeParameter('binaryPropertyName', index);
+			const additionalFields = this.getNodeParameter('additionalFields', index);
 
 			let body;
 			const qs: IDataObject = {};
@@ -197,7 +197,12 @@ export async function handleMatrixCall(
 			const { fileName, mimeType } = this.helpers.assertBinaryData(index, binaryPropertyName);
 			body = await this.helpers.getBinaryDataBuffer(index, binaryPropertyName);
 
-			qs.filename = fileName;
+			if (additionalFields.fileName) {
+				qs.filename = additionalFields.fileName as string;
+			} else {
+				qs.filename = fileName;
+			}
+
 			headers['Content-Type'] = mimeType;
 			headers.accept = 'application/json,text/*;q=0.99';
 
@@ -216,11 +221,11 @@ export async function handleMatrixCall(
 
 			body = {
 				msgtype: `m.${mediaType}`,
-				body: fileName,
+				body: qs.filename,
 				url: uploadRequestResult.content_uri,
 			};
 			const messageId = uuid();
-			return matrixApiRequest.call(
+			return await matrixApiRequest.call(
 				this,
 				'PUT',
 				`/rooms/${roomId}/send/m.room.message/${messageId}`,
diff --git a/packages/nodes-base/nodes/Matrix/Matrix.node.ts b/packages/nodes-base/nodes/Matrix/Matrix.node.ts
index a4addebb62573..4f744252e6eba 100644
--- a/packages/nodes-base/nodes/Matrix/Matrix.node.ts
+++ b/packages/nodes-base/nodes/Matrix/Matrix.node.ts
@@ -161,6 +161,6 @@ export class Matrix implements INodeType {
 				throw error;
 			}
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Matrix/MediaDescription.ts b/packages/nodes-base/nodes/Matrix/MediaDescription.ts
index 22af3a068b974..23f6ddeb0b9a7 100644
--- a/packages/nodes-base/nodes/Matrix/MediaDescription.ts
+++ b/packages/nodes-base/nodes/Matrix/MediaDescription.ts
@@ -46,11 +46,12 @@ export const mediaFields: INodeProperties[] = [
 		required: true,
 	},
 	{
-		displayName: 'Binary Property',
+		displayName: 'Input Binary Field',
 		name: 'binaryPropertyName',
 		type: 'string',
 		default: 'data',
 		required: true,
+		hint: 'The name of the input binary field containing the file to be uploaded',
 		displayOptions: {
 			show: {
 				resource: ['media'],
@@ -81,8 +82,30 @@ export const mediaFields: INodeProperties[] = [
 				description: 'Image media type',
 			},
 		],
-		description: 'Name of the uploaded file',
+		description: 'Type of file being uploaded',
 		placeholder: 'mxc://matrix.org/uploaded-media-uri',
 		required: true,
 	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['media'],
+				operation: ['upload'],
+			},
+		},
+		options: [
+			{
+				displayName: 'File Name',
+				name: 'fileName',
+				type: 'string',
+				default: '',
+				description: 'Name of the file being uploaded',
+			},
+		],
+	},
 ];
diff --git a/packages/nodes-base/nodes/Mattermost/mattermost.svg b/packages/nodes-base/nodes/Mattermost/mattermost.svg
index 9dc28e268725b..d9392b30a893a 100644
--- a/packages/nodes-base/nodes/Mattermost/mattermost.svg
+++ b/packages/nodes-base/nodes/Mattermost/mattermost.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="85" height="85" style="-ms-transform:rotate(360deg);-webkit-transform:rotate(360deg)" transform="rotate(360)"><path d="M42.642.004l.538.011-5.753 6.8c-10.65 1.925-19.847 9.197-23.46 19.874-5.378 15.885 3.635 33.29 20.131 38.874 16.496 5.584 34.228-2.767 39.605-18.651 3.55-10.487.828-21.636-6.179-29.61l-.312-.349-.442-8.926c14.507 10.53 21.161 29.638 15.111 47.51-7.446 21.995-31.312 33.788-53.306 26.343C6.58 74.434-5.215 50.568 2.23 28.574 8.23 10.852 24.89-.247 42.641.004zM190.4 28.314c5.554 0 9.893 1.335 13.017 4.006 3.124 2.67 4.686 6.941 4.686 12.815v24.03c-1.87.588-4.14 1.149-6.81 1.683-2.669.534-5.686.8-9.05.8-2.724 0-5.22-.239-7.49-.72-2.27-.48-4.22-1.282-5.846-2.403a11.318 11.318 0 01-3.767-4.325c-.88-1.763-1.32-3.925-1.32-6.489 0-2.563.547-4.712 1.641-6.448a12.659 12.659 0 014.245-4.165c1.736-1.042 3.672-1.789 5.808-2.243a30.728 30.728 0 016.408-.68c1.549 0 3.257.08 5.127.24v-.962c0-1.28-.214-2.323-.641-3.124a4.783 4.783 0 00-1.762-1.881c-.748-.455-1.67-.762-2.763-.922a25.3 25.3 0 00-3.646-.24c-2.883 0-5.954.56-9.21 1.682-.75-1.389-1.31-2.698-1.683-3.926-.373-1.228-.561-2.696-.561-4.406 2.35-.8 4.7-1.387 7.048-1.76 2.35-.375 4.54-.562 6.569-.562zm-30.328-12.202c2.198 0 4.309.161 6.334.483l2.95 54.57c-2.197.323-4.28.484-6.247.484a34.82 34.82 0 01-5.813-.483l-1.563-39.455-12.67 27.27c-.81.107-1.648.202-2.517.281-.867.081-1.734.12-2.603.12-.752 0-1.503-.025-2.255-.08a18.942 18.942 0 01-2.344-.322l-11.8-27.835-1.215 40.02a31.291 31.291 0 01-5.381.484c-1.851 0-3.76-.16-5.727-.483l2.43-54.57a48.504 48.504 0 016.681-.484c2.257 0 4.484.161 6.682.483l14.319 29.718 14.751-29.718c1.794-.322 3.789-.483 5.988-.483zm130.834 12.202c2.883 0 5.447.507 7.689 1.522 2.243 1.014 4.152 2.404 5.727 4.166 1.576 1.761 2.765 3.858 3.566 6.287.8 2.43 1.2 5.034 1.2 7.81 0 1.015-.039 2.017-.12 3.005a25.251 25.251 0 01-.28 2.363h-26.594c.215 3.203 1.335 5.526 3.365 6.968 2.029 1.442 4.699 2.163 8.01 2.163 1.816 0 3.671-.174 5.567-.522a31.577 31.577 0 005.407-1.48c.588 1.068 1.095 2.348 1.522 3.844.427 1.494.667 3.097.72 4.806-4.165 1.602-8.864 2.403-14.098 2.403-3.844 0-7.141-.534-9.892-1.602-2.75-1.068-4.992-2.55-6.728-4.446-1.736-1.895-3.018-4.151-3.845-6.769-.828-2.616-1.24-5.472-1.24-8.57 0-3.043.425-5.9 1.28-8.57.853-2.672 2.122-4.994 3.805-6.97 1.682-1.976 3.765-3.538 6.248-4.686 2.483-1.148 5.38-1.722 8.69-1.722zm136.092 0c3.364 0 6.3.561 8.81 1.682 2.51 1.123 4.592 2.657 6.25 4.606 1.654 1.95 2.882 4.26 3.684 6.929.8 2.67 1.201 5.527 1.201 8.57 0 3.045-.4 5.874-1.201 8.491-.802 2.617-2.03 4.9-3.685 6.848-1.657 1.95-3.739 3.473-6.249 4.567-2.51 1.094-5.446 1.642-8.81 1.642-3.365 0-6.289-.548-8.77-1.642-2.485-1.094-4.54-2.617-6.17-4.567-1.628-1.948-2.856-4.231-3.684-6.848-.828-2.617-1.241-5.446-1.241-8.49 0-3.044.413-5.902 1.241-8.571.828-2.67 2.056-4.98 3.685-6.929 1.628-1.95 3.684-3.483 6.168-4.606 2.482-1.12 5.406-1.682 8.77-1.682zm41.277 0c2.082 0 4.138.187 6.167.561a39.33 39.33 0 016.168 1.682 21.827 21.827 0 01-.802 4.325c-.426 1.496-.933 2.804-1.52 3.926a31.632 31.632 0 00-4.247-1.402 19.458 19.458 0 00-4.885-.601c-1.816 0-3.23.28-4.246.841-1.015.56-1.521 1.455-1.521 2.683 0 1.175.36 2.003 1.08 2.484.721.48 1.75.935 3.084 1.361l4.566 1.363c1.496.426 2.844.947 4.045 1.561 1.201.615 2.23 1.376 3.084 2.283.855.908 1.522 2.03 2.002 3.364.481 1.335.722 2.964.722 4.886 0 1.976-.414 3.819-1.242 5.527-.827 1.71-2.03 3.191-3.604 4.445-1.576 1.256-3.485 2.244-5.728 2.964-2.242.722-4.78 1.082-7.61 1.082a47.4 47.4 0 01-3.523-.12 28.05 28.05 0 01-3.084-.4 36.158 36.158 0 01-2.924-.681 35.455 35.455 0 01-3.124-1.042 23.06 23.06 0 01.76-4.365 27.54 27.54 0 011.563-4.286c1.763.695 3.431 1.215 5.007 1.562 1.575.348 3.217.521 4.926.521.748 0 1.561-.067 2.442-.2a8.974 8.974 0 002.444-.72 5.791 5.791 0 001.882-1.363c.508-.56.76-1.295.76-2.203 0-1.281-.387-2.203-1.16-2.764-.776-.56-1.857-1.055-3.244-1.481l-4.967-1.442c-2.991-.855-5.327-2.123-7.008-3.805-1.683-1.681-2.524-4.206-2.524-7.57 0-4.058 1.455-7.234 4.365-9.531 2.911-2.297 6.876-3.445 11.896-3.445zM256.952 17.18v12.095h9.693c.16.801.267 1.522.32 2.163.054.641.08 1.308.08 2.003 0 .747-.026 1.468-.08 2.162a21.984 21.984 0 01-.32 2.323h-9.693v16.261c0 1.655.135 2.99.402 4.005.267 1.014.654 1.815 1.16 2.404a3.828 3.828 0 001.883 1.2c.747.214 1.63.321 2.643.321.802 0 1.59-.067 2.364-.2.774-.134 1.455-.253 2.042-.36a15.65 15.65 0 01.8 3.163c.162 1.095.242 2.07.242 2.924 0 .588-.014 1.081-.04 1.483a15.83 15.83 0 01-.12 1.16c-2.457.589-4.993.88-7.61.88-4.86 0-8.571-1.134-11.134-3.402-2.564-2.27-3.846-5.969-3.846-11.095V37.926h-5.206l-.401-1.602 14.98-19.144h1.841zm-30.052 0v12.095h9.692c.16.801.267 1.522.321 2.163.052.641.079 1.308.079 2.003 0 .747-.027 1.468-.079 2.162a22.255 22.255 0 01-.321 2.323H226.9v16.261c0 1.655.134 2.99.401 4.005.266 1.014.654 1.815 1.16 2.404a3.832 3.832 0 001.883 1.2c.748.214 1.63.321 2.643.321.802 0 1.589-.067 2.364-.2.774-.134 1.455-.253 2.042-.36a15.69 15.69 0 01.802 3.163c.16 1.095.24 2.07.24 2.924 0 .588-.014 1.081-.04 1.483-.027.399-.067.788-.121 1.16a32.55 32.55 0 01-7.609.88c-4.86 0-8.572-1.134-11.134-3.402-2.563-2.27-3.845-5.969-3.845-11.095V37.926h-5.207l-.4-1.602 14.979-19.144h1.842zm107.84 11.614c.534 0 1.148.027 1.842.081.694.053 1.201.133 1.522.24.106.534.187 1.148.24 1.842.055.694.08 1.416.08 2.164 0 .907-.04 1.895-.12 2.963a21.374 21.374 0 01-.44 3.043 11.003 11.003 0 00-1.962-.16h-1.322c-.909 0-1.922.094-3.045.28-1.12.188-2.189.682-3.204 1.484-1.015.8-1.855 2.001-2.522 3.604-.668 1.602-1.002 3.845-1.002 6.729v19.705c-.961.159-1.922.266-2.884.319a48.116 48.116 0 01-5.567 0 29.813 29.813 0 01-2.923-.32V29.276c.8-.16 1.562-.28 2.282-.36.722-.08 1.509-.12 2.364-.12.801 0 1.59.054 2.362.16.775.107 1.536.24 2.283.4.161.268.308.654.441 1.162.134.508.254 1.042.361 1.602.107.561.199 1.121.28 1.683l.2 1.401c1.175-1.655 2.618-3.138 4.325-4.445 1.71-1.309 3.846-1.964 6.408-1.964zm55.395-.48c4.7 0 8.157 1.296 10.373 3.886 2.216 2.589 3.324 6.635 3.324 12.135v26.353c-1.922.32-3.818.48-5.687.48-1.869 0-3.765-.16-5.686-.48v-23.39c0-2.884-.362-5.1-1.083-6.647-.72-1.55-2.175-2.324-4.365-2.324-.908 0-1.802.134-2.682.4-.883.267-1.683.76-2.404 1.482-.72.72-1.308 1.736-1.763 3.045-.454 1.306-.68 3.004-.68 5.085v22.349a34.61 34.61 0 01-5.688.48 34.61 34.61 0 01-5.688-.48v-23.39c0-2.884-.36-5.1-1.08-6.647-.722-1.55-2.176-2.324-4.366-2.324a9.66 9.66 0 00-2.724.4c-.907.267-1.721.788-2.443 1.562-.72.774-1.295 1.856-1.721 3.245-.428 1.387-.642 3.203-.642 5.446v21.708c-1.922.32-3.817.48-5.687.48-1.869 0-3.764-.16-5.686-.48V29.275a21.73 21.73 0 012.242-.36c.748-.08 1.575-.12 2.484-.12a21 21 0 012.402.12c.695.08 1.415.2 2.163.36.16.267.307.655.44 1.162.134.507.254 1.042.361 1.602.107.56.2 1.108.28 1.642.081.534.147.988.201 1.361.427-.8.988-1.601 1.682-2.403.694-.8 1.522-1.52 2.483-2.162a13.483 13.483 0 013.244-1.562c1.201-.4 2.55-.601 4.045-.601 6.461 0 10.6 2.457 12.416 7.37 1.067-1.977 2.576-3.698 4.526-5.167 1.948-1.469 4.419-2.203 7.41-2.203zm110.33-11.134v12.095h9.692a19.3 19.3 0 01.321 2.163c.053.641.08 1.308.08 2.003a28.3 28.3 0 01-.08 2.162 21.72 21.72 0 01-.32 2.323h-9.692v16.261c0 1.655.134 2.99.4 4.005.267 1.014.654 1.815 1.161 2.404a3.832 3.832 0 001.883 1.2c.747.214 1.63.321 2.643.321.801 0 1.588-.067 2.364-.2.773-.134 1.454-.253 2.041-.36a15.52 15.52 0 01.801 3.163 20.184 20.184 0 01.2 4.407 14.81 14.81 0 01-.119 1.16c-2.456.589-4.992.88-7.61.88-4.86 0-8.57-1.134-11.134-3.402-2.563-2.27-3.845-5.969-3.845-11.095V37.926h-5.206l-.401-1.602 14.979-19.144h1.843zm-73.467 20.025c-2.937 0-5.06 1.108-6.368 3.325-1.31 2.216-1.964 5.407-1.964 9.572 0 4.165.655 7.356 1.964 9.572 1.309 2.216 3.43 3.324 6.368 3.324 2.99 0 5.14-1.108 6.447-3.324 1.309-2.216 1.963-5.407 1.963-9.572 0-4.165-.654-7.356-1.963-9.572-1.307-2.217-3.457-3.325-6.447-3.325zM192.963 51.304c-2.616 0-4.686.466-6.208 1.401-1.522.935-2.283 2.443-2.283 4.526 0 1.389.295 2.456.882 3.204.587.747 1.295 1.295 2.122 1.641a8.705 8.705 0 002.643.642c.936.08 1.75.12 2.443.12.802 0 1.603-.067 2.403-.2a135.91 135.91 0 002.084-.361V51.704c-.641-.107-1.335-.2-2.084-.28-.747-.08-1.413-.12-2.002-.12zM54.976 3.885c.195.067.353.19.467.343l.063.096.024.038.02.044c.056.106.103.226.125.375.04.271.06.882.07 1.53l.003.392.002.386v.699c-.001.368-.004.633-.004.687v.01l.165 6.222.244 7.18.305 12.48v.084c-.003.726-.154 5.933-3.85 9.553-3.98 3.9-8.868 3.542-12.048 2.466-3.18-1.077-7.28-3.763-8.074-9.278-.778-5.41 2.663-9.825 2.793-9.99l.003-.004 7.823-9.728 4.556-5.555 3.91-4.842s1.795-2.404 2.306-2.9c.068-.066.137-.116.205-.157l.102-.055.075-.038.013-.005a.973.973 0 01.702-.033zm235.77 33.08c-2.67 0-4.7.747-6.088 2.243-1.388 1.495-2.215 3.605-2.483 6.329h16.18c-.106-2.564-.814-4.633-2.123-6.208-1.308-1.576-3.137-2.365-5.487-2.365z" fill="#0058CC"/><path fill="rgba(0, 0, 0, 0)" d="M0 0h512v85H0z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="85" height="85" style="-ms-transform:rotate(360deg);-webkit-transform:rotate(360deg)" transform="rotate(360)"><path fill="#0058CC" d="m42.642.004.538.011-5.753 6.8c-10.65 1.925-19.847 9.197-23.46 19.874-5.378 15.885 3.635 33.29 20.131 38.874s34.228-2.767 39.605-18.651c3.55-10.487.828-21.636-6.179-29.61l-.312-.349-.442-8.926c14.507 10.53 21.161 29.638 15.111 47.51-7.446 21.995-31.312 33.788-53.306 26.343C6.58 74.434-5.215 50.568 2.23 28.574 8.23 10.852 24.89-.247 42.641.004zM190.4 28.314q8.331 0 13.017 4.006 4.686 4.005 4.686 12.815v24.03q-2.805.882-6.81 1.683-4.004.8-9.05.8-4.085 0-7.49-.72t-5.846-2.403a11.3 11.3 0 0 1-3.767-4.325q-1.32-2.644-1.32-6.489t1.641-6.448a12.66 12.66 0 0 1 4.245-4.165q2.604-1.562 5.808-2.243a30.7 30.7 0 0 1 6.408-.68q2.323 0 5.127.24v-.962q0-1.921-.641-3.124a4.8 4.8 0 0 0-1.762-1.881q-1.123-.682-2.763-.922a25 25 0 0 0-3.646-.24q-4.325 0-9.21 1.682-1.124-2.084-1.683-3.926-.56-1.841-.561-4.406 3.525-1.2 7.048-1.76 3.525-.562 6.569-.562m-30.328-12.202q3.297 0 6.334.483l2.95 54.57q-3.296.484-6.247.484a35 35 0 0 1-5.813-.483l-1.563-39.455-12.67 27.27q-1.214.161-2.517.281-1.3.12-2.603.12-1.127.001-2.255-.08a19 19 0 0 1-2.344-.322l-11.8-27.835-1.215 40.02a31.3 31.3 0 0 1-5.381.484q-2.776 0-5.727-.483l2.43-54.57a48.5 48.5 0 0 1 6.681-.484q3.385 0 6.682.483l14.319 29.718 14.751-29.718q2.69-.483 5.988-.483m130.834 12.202q4.325 0 7.689 1.522 3.365 1.522 5.727 4.166 2.364 2.642 3.566 6.287 1.2 3.646 1.2 7.81 0 1.523-.12 3.005a25 25 0 0 1-.28 2.363h-26.594q.321 4.805 3.365 6.968t8.01 2.163q2.724 0 5.567-.522a31.6 31.6 0 0 0 5.407-1.48q.882 1.601 1.522 3.844t.72 4.806q-6.247 2.403-14.098 2.403-5.766 0-9.892-1.602-4.124-1.602-6.728-4.446-2.604-2.842-3.845-6.769-1.241-3.924-1.24-8.57-.001-4.565 1.28-8.57 1.28-4.007 3.805-6.97 2.523-2.964 6.248-4.686t8.69-1.722zm136.092 0q5.046 0 8.81 1.682 3.764 1.684 6.25 4.606 2.481 2.925 3.684 6.929 1.2 4.005 1.201 8.57 0 4.567-1.201 8.491-1.203 3.926-3.685 6.848-2.485 2.925-6.249 4.567-3.764 1.641-8.81 1.642-5.048 0-8.77-1.642-3.726-1.641-6.17-4.567-2.442-2.922-3.684-6.848t-1.241-8.49q0-4.567 1.241-8.571 1.242-4.005 3.685-6.929 2.442-2.923 6.168-4.606 3.724-1.681 8.77-1.682zm41.277 0q3.123 0 6.167.561a39.3 39.3 0 0 1 6.168 1.682 22 22 0 0 1-.802 4.325q-.64 2.244-1.52 3.926a32 32 0 0 0-4.247-1.402 19.5 19.5 0 0 0-4.885-.601q-2.723 0-4.246.841-1.522.84-1.521 2.683 0 1.762 1.08 2.484 1.082.721 3.084 1.361l4.566 1.363q2.244.64 4.045 1.561 1.802.922 3.084 2.283 1.282 1.363 2.002 3.364.722 2.003.722 4.886 0 2.965-1.242 5.527-1.242 2.564-3.604 4.445-2.364 1.884-5.728 2.964-3.364 1.082-7.61 1.082a47 47 0 0 1-3.523-.12 28 28 0 0 1-3.084-.4 36 36 0 0 1-2.924-.681 36 36 0 0 1-3.124-1.042 23 23 0 0 1 .76-4.365 27.5 27.5 0 0 1 1.563-4.286q2.644 1.042 5.007 1.562 2.362.522 4.926.521 1.121 0 2.442-.2a9 9 0 0 0 2.444-.72 5.8 5.8 0 0 0 1.882-1.363q.761-.84.76-2.203 0-1.922-1.16-2.764-1.164-.841-3.244-1.481l-4.967-1.442q-4.486-1.282-7.008-3.805-2.524-2.523-2.524-7.57 0-6.086 4.365-9.531t11.896-3.445M256.952 17.18v12.095h9.693q.24 1.201.32 2.163t.08 2.003q0 1.12-.08 2.162a22 22 0 0 1-.32 2.323h-9.693v16.261q0 2.483.402 4.005.4 1.52 1.16 2.404a3.83 3.83 0 0 0 1.883 1.2q1.122.321 2.643.321 1.203 0 2.364-.2t2.042-.36a15.7 15.7 0 0 1 .8 3.163q.243 1.643.242 2.924 0 .881-.04 1.483a16 16 0 0 1-.12 1.16q-3.685.882-7.61.88-7.29 0-11.134-3.402-3.846-3.405-3.846-11.095V37.926h-5.206l-.401-1.602 14.98-19.144zm-30.052 0v12.095h9.692q.24 1.201.321 2.163.079.961.079 2.003 0 1.12-.079 2.162a22 22 0 0 1-.321 2.323H226.9v16.261q0 2.483.401 4.005.4 1.52 1.16 2.404a3.83 3.83 0 0 0 1.883 1.2q1.123.321 2.643.321 1.202 0 2.364-.2t2.042-.36a15.7 15.7 0 0 1 .802 3.163q.24 1.643.24 2.924 0 .881-.04 1.483-.04.6-.121 1.16a32.6 32.6 0 0 1-7.609.88q-7.29 0-11.134-3.402-3.845-3.405-3.845-11.095V37.926h-5.207l-.4-1.602 14.979-19.144zm107.84 11.614q.801 0 1.842.081 1.04.08 1.522.24.16.801.24 1.842.081 1.042.08 2.164 0 1.36-.12 2.963a21 21 0 0 1-.44 3.043 11 11 0 0 0-1.962-.16h-1.322q-1.362 0-3.045.28-1.68.282-3.204 1.484-1.522 1.2-2.522 3.604-1.002 2.403-1.002 6.729v19.705q-1.441.239-2.884.319a48 48 0 0 1-5.567 0 30 30 0 0 1-2.923-.32V29.276q1.201-.24 2.282-.36 1.082-.12 2.364-.12 1.203 0 2.362.16 1.163.16 2.283.4.241.401.441 1.162.2.762.361 1.602t.28 1.683l.2 1.401q1.764-2.483 4.325-4.445 2.565-1.964 6.408-1.964zm55.395-.48q7.05 0 10.373 3.886 3.324 3.884 3.324 12.135v26.353q-2.883.48-5.687.48t-5.686-.48v-23.39q0-4.326-1.083-6.647-1.08-2.324-4.365-2.324-1.362 0-2.682.4-1.323.4-2.404 1.482-1.08 1.08-1.763 3.045c-.454 1.306-.68 3.004-.68 5.085v22.349a34.6 34.6 0 0 1-5.688.48 34.6 34.6 0 0 1-5.688-.48v-23.39q0-4.326-1.08-6.647-1.082-2.324-4.366-2.324a9.7 9.7 0 0 0-2.724.4q-1.36.4-2.443 1.562-1.081 1.161-1.721 3.245-.642 2.081-.642 5.446v21.708q-2.883.48-5.687.48-2.803 0-5.686-.48V29.275a22 22 0 0 1 2.242-.36q1.121-.12 2.484-.12a21 21 0 0 1 2.402.12q1.042.12 2.163.36.24.401.44 1.162t.361 1.602.28 1.642q.12.801.201 1.361.64-1.2 1.682-2.403 1.041-1.2 2.483-2.162a13.5 13.5 0 0 1 3.244-1.562q1.802-.6 4.045-.601 9.692 0 12.416 7.37 1.6-2.964 4.526-5.167 2.923-2.203 7.41-2.203zm110.33-11.134v12.095h9.692a19 19 0 0 1 .321 2.163q.08.961.08 2.003a28 28 0 0 1-.08 2.162 22 22 0 0 1-.32 2.323h-9.692v16.261q0 2.483.4 4.005.4 1.52 1.161 2.404a3.83 3.83 0 0 0 1.883 1.2q1.122.321 2.643.321 1.2 0 2.364-.2 1.16-.2 2.041-.36a15.5 15.5 0 0 1 .801 3.163 20.2 20.2 0 0 1 .2 4.407 15 15 0 0 1-.119 1.16q-3.684.882-7.61.88-7.289 0-11.134-3.402-3.845-3.406-3.845-11.095V37.926h-5.206l-.401-1.602 14.979-19.144zm-73.467 20.025q-4.406 0-6.368 3.325-1.964 3.324-1.964 9.572t1.964 9.572q1.962 3.324 6.368 3.324 4.486 0 6.447-3.324 1.963-3.324 1.963-9.572t-1.963-9.572q-1.961-3.325-6.447-3.325M192.963 51.304q-3.925 0-6.208 1.401t-2.283 4.526q0 2.083.882 3.204.881 1.121 2.122 1.641a8.7 8.7 0 0 0 2.643.642q1.404.12 2.443.12 1.203 0 2.403-.2a136 136 0 0 0 2.084-.361V51.704q-.961-.16-2.084-.28-1.12-.12-2.002-.12M54.976 3.885c.195.067.353.19.467.343l.063.096.024.038.02.044c.056.106.103.226.125.375.04.271.06.882.07 1.53l.003.392.002.386v.699c-.001.368-.004.633-.004.687v.01l.165 6.222.244 7.18.305 12.48v.084c-.003.726-.154 5.933-3.85 9.553-3.98 3.9-8.868 3.542-12.048 2.466-3.18-1.077-7.28-3.763-8.074-9.278-.778-5.41 2.663-9.825 2.793-9.99l.003-.004 7.823-9.728 4.556-5.555 3.91-4.842s1.795-2.404 2.306-2.9q.102-.097.205-.157l.102-.055.075-.038.013-.005a.97.97 0 0 1 .702-.033m235.77 33.08q-4.005 0-6.088 2.243-2.081 2.243-2.483 6.329h16.18q-.16-3.846-2.123-6.208-1.962-2.364-5.487-2.365z"/><path fill="rgba(0, 0, 0, 0)" d="M0 0h512v85H0z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Mattermost/v1/MattermostV1.node.ts b/packages/nodes-base/nodes/Mattermost/v1/MattermostV1.node.ts
index c099142f03f0d..744a6f37095e4 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/MattermostV1.node.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/MattermostV1.node.ts
@@ -22,6 +22,6 @@ export class MattermostV1 implements INodeType {
 	methods = { loadOptions };
 
 	async execute(this: IExecuteFunctions) {
-		return router.call(this);
+		return await router.call(this);
 	}
 }
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 08393603ed26c..26cf5301a3eef 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/index.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/index.ts
@@ -1,3 +1,4 @@
+import type { INodeProperties } from 'n8n-workflow';
 import * as create from './create';
 import * as del from './del';
 import * as members from './members';
@@ -5,7 +6,6 @@ import * as restore from './restore';
 import * as addUser from './addUser';
 import * as statistics from './statistics';
 import * as search from './search';
-import type { INodeProperties } from 'n8n-workflow';
 
 export { create, del as delete, members, restore, addUser, statistics, search };
 
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 efa2fcf1fe8c4..433e0e95e19ec 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/message/index.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/message/index.ts
@@ -1,9 +1,8 @@
+import type { INodeProperties } from 'n8n-workflow';
 import * as del from './del';
 import * as post from './post';
 import * as postEphemeral from './postEphemeral';
 
-import type { INodeProperties } from 'n8n-workflow';
-
 export { del as delete, post, postEphemeral };
 
 export const descriptions: INodeProperties[] = [
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 60ba78541cdcc..e1da062e19731 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/reaction/index.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/reaction/index.ts
@@ -1,9 +1,8 @@
+import type { INodeProperties } from 'n8n-workflow';
 import * as create from './create';
 import * as del from './del';
 import * as getAll from './getAll';
 
-import type { INodeProperties } from 'n8n-workflow';
-
 export { create, del as delete, getAll };
 
 export const descriptions: INodeProperties[] = [
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 65c25d8da6e87..099de6e0cdf4b 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,9 +1,8 @@
 import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import { apiRequest, apiRequestAllItems } from '../../../transport';
-
 import { snakeCase } from 'change-case';
+import { apiRequest, apiRequestAllItems } from '../../../transport';
 
 export async function getAll(
 	this: IExecuteFunctions,
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 e0f1c0d943ee4..7ac78aea128eb 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/user/index.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/user/index.ts
@@ -1,3 +1,4 @@
+import type { INodeProperties } from 'n8n-workflow';
 import * as create from './create';
 import * as deactive from './deactive';
 import * as getAll from './getAll';
@@ -5,8 +6,6 @@ import * as getByEmail from './getByEmail';
 import * as getById from './getById';
 import * as invite from './invite';
 
-import type { INodeProperties } from 'n8n-workflow';
-
 export { create, deactive, getAll, getByEmail, getById, invite };
 
 export const descriptions: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/Mattermost/v1/mattermost.svg b/packages/nodes-base/nodes/Mattermost/v1/mattermost.svg
index 9dc28e268725b..d9392b30a893a 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/mattermost.svg
+++ b/packages/nodes-base/nodes/Mattermost/v1/mattermost.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="85" height="85" style="-ms-transform:rotate(360deg);-webkit-transform:rotate(360deg)" transform="rotate(360)"><path d="M42.642.004l.538.011-5.753 6.8c-10.65 1.925-19.847 9.197-23.46 19.874-5.378 15.885 3.635 33.29 20.131 38.874 16.496 5.584 34.228-2.767 39.605-18.651 3.55-10.487.828-21.636-6.179-29.61l-.312-.349-.442-8.926c14.507 10.53 21.161 29.638 15.111 47.51-7.446 21.995-31.312 33.788-53.306 26.343C6.58 74.434-5.215 50.568 2.23 28.574 8.23 10.852 24.89-.247 42.641.004zM190.4 28.314c5.554 0 9.893 1.335 13.017 4.006 3.124 2.67 4.686 6.941 4.686 12.815v24.03c-1.87.588-4.14 1.149-6.81 1.683-2.669.534-5.686.8-9.05.8-2.724 0-5.22-.239-7.49-.72-2.27-.48-4.22-1.282-5.846-2.403a11.318 11.318 0 01-3.767-4.325c-.88-1.763-1.32-3.925-1.32-6.489 0-2.563.547-4.712 1.641-6.448a12.659 12.659 0 014.245-4.165c1.736-1.042 3.672-1.789 5.808-2.243a30.728 30.728 0 016.408-.68c1.549 0 3.257.08 5.127.24v-.962c0-1.28-.214-2.323-.641-3.124a4.783 4.783 0 00-1.762-1.881c-.748-.455-1.67-.762-2.763-.922a25.3 25.3 0 00-3.646-.24c-2.883 0-5.954.56-9.21 1.682-.75-1.389-1.31-2.698-1.683-3.926-.373-1.228-.561-2.696-.561-4.406 2.35-.8 4.7-1.387 7.048-1.76 2.35-.375 4.54-.562 6.569-.562zm-30.328-12.202c2.198 0 4.309.161 6.334.483l2.95 54.57c-2.197.323-4.28.484-6.247.484a34.82 34.82 0 01-5.813-.483l-1.563-39.455-12.67 27.27c-.81.107-1.648.202-2.517.281-.867.081-1.734.12-2.603.12-.752 0-1.503-.025-2.255-.08a18.942 18.942 0 01-2.344-.322l-11.8-27.835-1.215 40.02a31.291 31.291 0 01-5.381.484c-1.851 0-3.76-.16-5.727-.483l2.43-54.57a48.504 48.504 0 016.681-.484c2.257 0 4.484.161 6.682.483l14.319 29.718 14.751-29.718c1.794-.322 3.789-.483 5.988-.483zm130.834 12.202c2.883 0 5.447.507 7.689 1.522 2.243 1.014 4.152 2.404 5.727 4.166 1.576 1.761 2.765 3.858 3.566 6.287.8 2.43 1.2 5.034 1.2 7.81 0 1.015-.039 2.017-.12 3.005a25.251 25.251 0 01-.28 2.363h-26.594c.215 3.203 1.335 5.526 3.365 6.968 2.029 1.442 4.699 2.163 8.01 2.163 1.816 0 3.671-.174 5.567-.522a31.577 31.577 0 005.407-1.48c.588 1.068 1.095 2.348 1.522 3.844.427 1.494.667 3.097.72 4.806-4.165 1.602-8.864 2.403-14.098 2.403-3.844 0-7.141-.534-9.892-1.602-2.75-1.068-4.992-2.55-6.728-4.446-1.736-1.895-3.018-4.151-3.845-6.769-.828-2.616-1.24-5.472-1.24-8.57 0-3.043.425-5.9 1.28-8.57.853-2.672 2.122-4.994 3.805-6.97 1.682-1.976 3.765-3.538 6.248-4.686 2.483-1.148 5.38-1.722 8.69-1.722zm136.092 0c3.364 0 6.3.561 8.81 1.682 2.51 1.123 4.592 2.657 6.25 4.606 1.654 1.95 2.882 4.26 3.684 6.929.8 2.67 1.201 5.527 1.201 8.57 0 3.045-.4 5.874-1.201 8.491-.802 2.617-2.03 4.9-3.685 6.848-1.657 1.95-3.739 3.473-6.249 4.567-2.51 1.094-5.446 1.642-8.81 1.642-3.365 0-6.289-.548-8.77-1.642-2.485-1.094-4.54-2.617-6.17-4.567-1.628-1.948-2.856-4.231-3.684-6.848-.828-2.617-1.241-5.446-1.241-8.49 0-3.044.413-5.902 1.241-8.571.828-2.67 2.056-4.98 3.685-6.929 1.628-1.95 3.684-3.483 6.168-4.606 2.482-1.12 5.406-1.682 8.77-1.682zm41.277 0c2.082 0 4.138.187 6.167.561a39.33 39.33 0 016.168 1.682 21.827 21.827 0 01-.802 4.325c-.426 1.496-.933 2.804-1.52 3.926a31.632 31.632 0 00-4.247-1.402 19.458 19.458 0 00-4.885-.601c-1.816 0-3.23.28-4.246.841-1.015.56-1.521 1.455-1.521 2.683 0 1.175.36 2.003 1.08 2.484.721.48 1.75.935 3.084 1.361l4.566 1.363c1.496.426 2.844.947 4.045 1.561 1.201.615 2.23 1.376 3.084 2.283.855.908 1.522 2.03 2.002 3.364.481 1.335.722 2.964.722 4.886 0 1.976-.414 3.819-1.242 5.527-.827 1.71-2.03 3.191-3.604 4.445-1.576 1.256-3.485 2.244-5.728 2.964-2.242.722-4.78 1.082-7.61 1.082a47.4 47.4 0 01-3.523-.12 28.05 28.05 0 01-3.084-.4 36.158 36.158 0 01-2.924-.681 35.455 35.455 0 01-3.124-1.042 23.06 23.06 0 01.76-4.365 27.54 27.54 0 011.563-4.286c1.763.695 3.431 1.215 5.007 1.562 1.575.348 3.217.521 4.926.521.748 0 1.561-.067 2.442-.2a8.974 8.974 0 002.444-.72 5.791 5.791 0 001.882-1.363c.508-.56.76-1.295.76-2.203 0-1.281-.387-2.203-1.16-2.764-.776-.56-1.857-1.055-3.244-1.481l-4.967-1.442c-2.991-.855-5.327-2.123-7.008-3.805-1.683-1.681-2.524-4.206-2.524-7.57 0-4.058 1.455-7.234 4.365-9.531 2.911-2.297 6.876-3.445 11.896-3.445zM256.952 17.18v12.095h9.693c.16.801.267 1.522.32 2.163.054.641.08 1.308.08 2.003 0 .747-.026 1.468-.08 2.162a21.984 21.984 0 01-.32 2.323h-9.693v16.261c0 1.655.135 2.99.402 4.005.267 1.014.654 1.815 1.16 2.404a3.828 3.828 0 001.883 1.2c.747.214 1.63.321 2.643.321.802 0 1.59-.067 2.364-.2.774-.134 1.455-.253 2.042-.36a15.65 15.65 0 01.8 3.163c.162 1.095.242 2.07.242 2.924 0 .588-.014 1.081-.04 1.483a15.83 15.83 0 01-.12 1.16c-2.457.589-4.993.88-7.61.88-4.86 0-8.571-1.134-11.134-3.402-2.564-2.27-3.846-5.969-3.846-11.095V37.926h-5.206l-.401-1.602 14.98-19.144h1.841zm-30.052 0v12.095h9.692c.16.801.267 1.522.321 2.163.052.641.079 1.308.079 2.003 0 .747-.027 1.468-.079 2.162a22.255 22.255 0 01-.321 2.323H226.9v16.261c0 1.655.134 2.99.401 4.005.266 1.014.654 1.815 1.16 2.404a3.832 3.832 0 001.883 1.2c.748.214 1.63.321 2.643.321.802 0 1.589-.067 2.364-.2.774-.134 1.455-.253 2.042-.36a15.69 15.69 0 01.802 3.163c.16 1.095.24 2.07.24 2.924 0 .588-.014 1.081-.04 1.483-.027.399-.067.788-.121 1.16a32.55 32.55 0 01-7.609.88c-4.86 0-8.572-1.134-11.134-3.402-2.563-2.27-3.845-5.969-3.845-11.095V37.926h-5.207l-.4-1.602 14.979-19.144h1.842zm107.84 11.614c.534 0 1.148.027 1.842.081.694.053 1.201.133 1.522.24.106.534.187 1.148.24 1.842.055.694.08 1.416.08 2.164 0 .907-.04 1.895-.12 2.963a21.374 21.374 0 01-.44 3.043 11.003 11.003 0 00-1.962-.16h-1.322c-.909 0-1.922.094-3.045.28-1.12.188-2.189.682-3.204 1.484-1.015.8-1.855 2.001-2.522 3.604-.668 1.602-1.002 3.845-1.002 6.729v19.705c-.961.159-1.922.266-2.884.319a48.116 48.116 0 01-5.567 0 29.813 29.813 0 01-2.923-.32V29.276c.8-.16 1.562-.28 2.282-.36.722-.08 1.509-.12 2.364-.12.801 0 1.59.054 2.362.16.775.107 1.536.24 2.283.4.161.268.308.654.441 1.162.134.508.254 1.042.361 1.602.107.561.199 1.121.28 1.683l.2 1.401c1.175-1.655 2.618-3.138 4.325-4.445 1.71-1.309 3.846-1.964 6.408-1.964zm55.395-.48c4.7 0 8.157 1.296 10.373 3.886 2.216 2.589 3.324 6.635 3.324 12.135v26.353c-1.922.32-3.818.48-5.687.48-1.869 0-3.765-.16-5.686-.48v-23.39c0-2.884-.362-5.1-1.083-6.647-.72-1.55-2.175-2.324-4.365-2.324-.908 0-1.802.134-2.682.4-.883.267-1.683.76-2.404 1.482-.72.72-1.308 1.736-1.763 3.045-.454 1.306-.68 3.004-.68 5.085v22.349a34.61 34.61 0 01-5.688.48 34.61 34.61 0 01-5.688-.48v-23.39c0-2.884-.36-5.1-1.08-6.647-.722-1.55-2.176-2.324-4.366-2.324a9.66 9.66 0 00-2.724.4c-.907.267-1.721.788-2.443 1.562-.72.774-1.295 1.856-1.721 3.245-.428 1.387-.642 3.203-.642 5.446v21.708c-1.922.32-3.817.48-5.687.48-1.869 0-3.764-.16-5.686-.48V29.275a21.73 21.73 0 012.242-.36c.748-.08 1.575-.12 2.484-.12a21 21 0 012.402.12c.695.08 1.415.2 2.163.36.16.267.307.655.44 1.162.134.507.254 1.042.361 1.602.107.56.2 1.108.28 1.642.081.534.147.988.201 1.361.427-.8.988-1.601 1.682-2.403.694-.8 1.522-1.52 2.483-2.162a13.483 13.483 0 013.244-1.562c1.201-.4 2.55-.601 4.045-.601 6.461 0 10.6 2.457 12.416 7.37 1.067-1.977 2.576-3.698 4.526-5.167 1.948-1.469 4.419-2.203 7.41-2.203zm110.33-11.134v12.095h9.692a19.3 19.3 0 01.321 2.163c.053.641.08 1.308.08 2.003a28.3 28.3 0 01-.08 2.162 21.72 21.72 0 01-.32 2.323h-9.692v16.261c0 1.655.134 2.99.4 4.005.267 1.014.654 1.815 1.161 2.404a3.832 3.832 0 001.883 1.2c.747.214 1.63.321 2.643.321.801 0 1.588-.067 2.364-.2.773-.134 1.454-.253 2.041-.36a15.52 15.52 0 01.801 3.163 20.184 20.184 0 01.2 4.407 14.81 14.81 0 01-.119 1.16c-2.456.589-4.992.88-7.61.88-4.86 0-8.57-1.134-11.134-3.402-2.563-2.27-3.845-5.969-3.845-11.095V37.926h-5.206l-.401-1.602 14.979-19.144h1.843zm-73.467 20.025c-2.937 0-5.06 1.108-6.368 3.325-1.31 2.216-1.964 5.407-1.964 9.572 0 4.165.655 7.356 1.964 9.572 1.309 2.216 3.43 3.324 6.368 3.324 2.99 0 5.14-1.108 6.447-3.324 1.309-2.216 1.963-5.407 1.963-9.572 0-4.165-.654-7.356-1.963-9.572-1.307-2.217-3.457-3.325-6.447-3.325zM192.963 51.304c-2.616 0-4.686.466-6.208 1.401-1.522.935-2.283 2.443-2.283 4.526 0 1.389.295 2.456.882 3.204.587.747 1.295 1.295 2.122 1.641a8.705 8.705 0 002.643.642c.936.08 1.75.12 2.443.12.802 0 1.603-.067 2.403-.2a135.91 135.91 0 002.084-.361V51.704c-.641-.107-1.335-.2-2.084-.28-.747-.08-1.413-.12-2.002-.12zM54.976 3.885c.195.067.353.19.467.343l.063.096.024.038.02.044c.056.106.103.226.125.375.04.271.06.882.07 1.53l.003.392.002.386v.699c-.001.368-.004.633-.004.687v.01l.165 6.222.244 7.18.305 12.48v.084c-.003.726-.154 5.933-3.85 9.553-3.98 3.9-8.868 3.542-12.048 2.466-3.18-1.077-7.28-3.763-8.074-9.278-.778-5.41 2.663-9.825 2.793-9.99l.003-.004 7.823-9.728 4.556-5.555 3.91-4.842s1.795-2.404 2.306-2.9c.068-.066.137-.116.205-.157l.102-.055.075-.038.013-.005a.973.973 0 01.702-.033zm235.77 33.08c-2.67 0-4.7.747-6.088 2.243-1.388 1.495-2.215 3.605-2.483 6.329h16.18c-.106-2.564-.814-4.633-2.123-6.208-1.308-1.576-3.137-2.365-5.487-2.365z" fill="#0058CC"/><path fill="rgba(0, 0, 0, 0)" d="M0 0h512v85H0z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="85" height="85" style="-ms-transform:rotate(360deg);-webkit-transform:rotate(360deg)" transform="rotate(360)"><path fill="#0058CC" d="m42.642.004.538.011-5.753 6.8c-10.65 1.925-19.847 9.197-23.46 19.874-5.378 15.885 3.635 33.29 20.131 38.874s34.228-2.767 39.605-18.651c3.55-10.487.828-21.636-6.179-29.61l-.312-.349-.442-8.926c14.507 10.53 21.161 29.638 15.111 47.51-7.446 21.995-31.312 33.788-53.306 26.343C6.58 74.434-5.215 50.568 2.23 28.574 8.23 10.852 24.89-.247 42.641.004zM190.4 28.314q8.331 0 13.017 4.006 4.686 4.005 4.686 12.815v24.03q-2.805.882-6.81 1.683-4.004.8-9.05.8-4.085 0-7.49-.72t-5.846-2.403a11.3 11.3 0 0 1-3.767-4.325q-1.32-2.644-1.32-6.489t1.641-6.448a12.66 12.66 0 0 1 4.245-4.165q2.604-1.562 5.808-2.243a30.7 30.7 0 0 1 6.408-.68q2.323 0 5.127.24v-.962q0-1.921-.641-3.124a4.8 4.8 0 0 0-1.762-1.881q-1.123-.682-2.763-.922a25 25 0 0 0-3.646-.24q-4.325 0-9.21 1.682-1.124-2.084-1.683-3.926-.56-1.841-.561-4.406 3.525-1.2 7.048-1.76 3.525-.562 6.569-.562m-30.328-12.202q3.297 0 6.334.483l2.95 54.57q-3.296.484-6.247.484a35 35 0 0 1-5.813-.483l-1.563-39.455-12.67 27.27q-1.214.161-2.517.281-1.3.12-2.603.12-1.127.001-2.255-.08a19 19 0 0 1-2.344-.322l-11.8-27.835-1.215 40.02a31.3 31.3 0 0 1-5.381.484q-2.776 0-5.727-.483l2.43-54.57a48.5 48.5 0 0 1 6.681-.484q3.385 0 6.682.483l14.319 29.718 14.751-29.718q2.69-.483 5.988-.483m130.834 12.202q4.325 0 7.689 1.522 3.365 1.522 5.727 4.166 2.364 2.642 3.566 6.287 1.2 3.646 1.2 7.81 0 1.523-.12 3.005a25 25 0 0 1-.28 2.363h-26.594q.321 4.805 3.365 6.968t8.01 2.163q2.724 0 5.567-.522a31.6 31.6 0 0 0 5.407-1.48q.882 1.601 1.522 3.844t.72 4.806q-6.247 2.403-14.098 2.403-5.766 0-9.892-1.602-4.124-1.602-6.728-4.446-2.604-2.842-3.845-6.769-1.241-3.924-1.24-8.57-.001-4.565 1.28-8.57 1.28-4.007 3.805-6.97 2.523-2.964 6.248-4.686t8.69-1.722zm136.092 0q5.046 0 8.81 1.682 3.764 1.684 6.25 4.606 2.481 2.925 3.684 6.929 1.2 4.005 1.201 8.57 0 4.567-1.201 8.491-1.203 3.926-3.685 6.848-2.485 2.925-6.249 4.567-3.764 1.641-8.81 1.642-5.048 0-8.77-1.642-3.726-1.641-6.17-4.567-2.442-2.922-3.684-6.848t-1.241-8.49q0-4.567 1.241-8.571 1.242-4.005 3.685-6.929 2.442-2.923 6.168-4.606 3.724-1.681 8.77-1.682zm41.277 0q3.123 0 6.167.561a39.3 39.3 0 0 1 6.168 1.682 22 22 0 0 1-.802 4.325q-.64 2.244-1.52 3.926a32 32 0 0 0-4.247-1.402 19.5 19.5 0 0 0-4.885-.601q-2.723 0-4.246.841-1.522.84-1.521 2.683 0 1.762 1.08 2.484 1.082.721 3.084 1.361l4.566 1.363q2.244.64 4.045 1.561 1.802.922 3.084 2.283 1.282 1.363 2.002 3.364.722 2.003.722 4.886 0 2.965-1.242 5.527-1.242 2.564-3.604 4.445-2.364 1.884-5.728 2.964-3.364 1.082-7.61 1.082a47 47 0 0 1-3.523-.12 28 28 0 0 1-3.084-.4 36 36 0 0 1-2.924-.681 36 36 0 0 1-3.124-1.042 23 23 0 0 1 .76-4.365 27.5 27.5 0 0 1 1.563-4.286q2.644 1.042 5.007 1.562 2.362.522 4.926.521 1.121 0 2.442-.2a9 9 0 0 0 2.444-.72 5.8 5.8 0 0 0 1.882-1.363q.761-.84.76-2.203 0-1.922-1.16-2.764-1.164-.841-3.244-1.481l-4.967-1.442q-4.486-1.282-7.008-3.805-2.524-2.523-2.524-7.57 0-6.086 4.365-9.531t11.896-3.445M256.952 17.18v12.095h9.693q.24 1.201.32 2.163t.08 2.003q0 1.12-.08 2.162a22 22 0 0 1-.32 2.323h-9.693v16.261q0 2.483.402 4.005.4 1.52 1.16 2.404a3.83 3.83 0 0 0 1.883 1.2q1.122.321 2.643.321 1.203 0 2.364-.2t2.042-.36a15.7 15.7 0 0 1 .8 3.163q.243 1.643.242 2.924 0 .881-.04 1.483a16 16 0 0 1-.12 1.16q-3.685.882-7.61.88-7.29 0-11.134-3.402-3.846-3.405-3.846-11.095V37.926h-5.206l-.401-1.602 14.98-19.144zm-30.052 0v12.095h9.692q.24 1.201.321 2.163.079.961.079 2.003 0 1.12-.079 2.162a22 22 0 0 1-.321 2.323H226.9v16.261q0 2.483.401 4.005.4 1.52 1.16 2.404a3.83 3.83 0 0 0 1.883 1.2q1.123.321 2.643.321 1.202 0 2.364-.2t2.042-.36a15.7 15.7 0 0 1 .802 3.163q.24 1.643.24 2.924 0 .881-.04 1.483-.04.6-.121 1.16a32.6 32.6 0 0 1-7.609.88q-7.29 0-11.134-3.402-3.845-3.405-3.845-11.095V37.926h-5.207l-.4-1.602 14.979-19.144zm107.84 11.614q.801 0 1.842.081 1.04.08 1.522.24.16.801.24 1.842.081 1.042.08 2.164 0 1.36-.12 2.963a21 21 0 0 1-.44 3.043 11 11 0 0 0-1.962-.16h-1.322q-1.362 0-3.045.28-1.68.282-3.204 1.484-1.522 1.2-2.522 3.604-1.002 2.403-1.002 6.729v19.705q-1.441.239-2.884.319a48 48 0 0 1-5.567 0 30 30 0 0 1-2.923-.32V29.276q1.201-.24 2.282-.36 1.082-.12 2.364-.12 1.203 0 2.362.16 1.163.16 2.283.4.241.401.441 1.162.2.762.361 1.602t.28 1.683l.2 1.401q1.764-2.483 4.325-4.445 2.565-1.964 6.408-1.964zm55.395-.48q7.05 0 10.373 3.886 3.324 3.884 3.324 12.135v26.353q-2.883.48-5.687.48t-5.686-.48v-23.39q0-4.326-1.083-6.647-1.08-2.324-4.365-2.324-1.362 0-2.682.4-1.323.4-2.404 1.482-1.08 1.08-1.763 3.045c-.454 1.306-.68 3.004-.68 5.085v22.349a34.6 34.6 0 0 1-5.688.48 34.6 34.6 0 0 1-5.688-.48v-23.39q0-4.326-1.08-6.647-1.082-2.324-4.366-2.324a9.7 9.7 0 0 0-2.724.4q-1.36.4-2.443 1.562-1.081 1.161-1.721 3.245-.642 2.081-.642 5.446v21.708q-2.883.48-5.687.48-2.803 0-5.686-.48V29.275a22 22 0 0 1 2.242-.36q1.121-.12 2.484-.12a21 21 0 0 1 2.402.12q1.042.12 2.163.36.24.401.44 1.162t.361 1.602.28 1.642q.12.801.201 1.361.64-1.2 1.682-2.403 1.041-1.2 2.483-2.162a13.5 13.5 0 0 1 3.244-1.562q1.802-.6 4.045-.601 9.692 0 12.416 7.37 1.6-2.964 4.526-5.167 2.923-2.203 7.41-2.203zm110.33-11.134v12.095h9.692a19 19 0 0 1 .321 2.163q.08.961.08 2.003a28 28 0 0 1-.08 2.162 22 22 0 0 1-.32 2.323h-9.692v16.261q0 2.483.4 4.005.4 1.52 1.161 2.404a3.83 3.83 0 0 0 1.883 1.2q1.122.321 2.643.321 1.2 0 2.364-.2 1.16-.2 2.041-.36a15.5 15.5 0 0 1 .801 3.163 20.2 20.2 0 0 1 .2 4.407 15 15 0 0 1-.119 1.16q-3.684.882-7.61.88-7.289 0-11.134-3.402-3.845-3.406-3.845-11.095V37.926h-5.206l-.401-1.602 14.979-19.144zm-73.467 20.025q-4.406 0-6.368 3.325-1.964 3.324-1.964 9.572t1.964 9.572q1.962 3.324 6.368 3.324 4.486 0 6.447-3.324 1.963-3.324 1.963-9.572t-1.963-9.572q-1.961-3.325-6.447-3.325M192.963 51.304q-3.925 0-6.208 1.401t-2.283 4.526q0 2.083.882 3.204.881 1.121 2.122 1.641a8.7 8.7 0 0 0 2.643.642q1.404.12 2.443.12 1.203 0 2.403-.2a136 136 0 0 0 2.084-.361V51.704q-.961-.16-2.084-.28-1.12-.12-2.002-.12M54.976 3.885c.195.067.353.19.467.343l.063.096.024.038.02.044c.056.106.103.226.125.375.04.271.06.882.07 1.53l.003.392.002.386v.699c-.001.368-.004.633-.004.687v.01l.165 6.222.244 7.18.305 12.48v.084c-.003.726-.154 5.933-3.85 9.553-3.98 3.9-8.868 3.542-12.048 2.466-3.18-1.077-7.28-3.763-8.074-9.278-.778-5.41 2.663-9.825 2.793-9.99l.003-.004 7.823-9.728 4.556-5.555 3.91-4.842s1.795-2.404 2.306-2.9q.102-.097.205-.157l.102-.055.075-.038.013-.005a.97.97 0 0 1 .702-.033m235.77 33.08q-4.005 0-6.088 2.243-2.081 2.243-2.483 6.329h16.18q-.16-3.846-2.123-6.208-1.962-2.364-5.487-2.365z"/><path fill="rgba(0, 0, 0, 0)" d="M0 0h512v85H0z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Mattermost/v1/transport/index.ts b/packages/nodes-base/nodes/Mattermost/v1/transport/index.ts
index 53433954a17a2..9d5e3d8c54449 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/transport/index.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/transport/index.ts
@@ -19,19 +19,20 @@ export async function apiRequest(
 	query: IDataObject = {},
 ) {
 	const credentials = await this.getCredentials('mattermostApi');
+	const baseUrl = (credentials.baseUrl as string).replace(/\/$/, '');
 
 	const options: IHttpRequestOptions = {
 		method,
 		body,
 		qs: query,
-		url: `${credentials.baseUrl}/api/v4/${endpoint}`,
+		url: `${baseUrl}/api/v4/${endpoint}`,
 		headers: {
 			'content-type': 'application/json; charset=utf-8',
 		},
 		skipSslCertificateValidation: credentials.allowUnauthorizedCerts as boolean,
 	};
 
-	return this.helpers.httpRequestWithAuthentication.call(this, 'mattermostApi', options);
+	return await this.helpers.httpRequestWithAuthentication.call(this, 'mattermostApi', options);
 }
 
 export async function apiRequestAllItems(
diff --git a/packages/nodes-base/nodes/Mautic/GenericFunctions.ts b/packages/nodes-base/nodes/Mautic/GenericFunctions.ts
index 63add5325a8de..415c70afc0f07 100644
--- a/packages/nodes-base/nodes/Mautic/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Mautic/GenericFunctions.ts
@@ -1,17 +1,17 @@
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
+	IRequestOptions,
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
-import type { OptionsWithUri } from 'request';
 
 export async function mauticApiRequest(
-	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: any = {},
@@ -20,7 +20,7 @@ export async function mauticApiRequest(
 ): Promise<any> {
 	const authenticationMethod = this.getNodeParameter('authentication', 0, 'credentials') as string;
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {},
 		method,
 		qs: query,
@@ -51,7 +51,7 @@ export async function mauticApiRequest(
 		}
 
 		if (returnData.errors) {
-			// They seem to to sometimes return 200 status but still error.
+			// They seem to sometimes return 200 status but still error.
 			throw new NodeApiError(this.getNode(), returnData as JsonObject);
 		}
 
@@ -68,7 +68,7 @@ export async function mauticApiRequest(
 export async function mauticApiRequestAllItems(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: any = {},
diff --git a/packages/nodes-base/nodes/Mautic/Mautic.node.json b/packages/nodes-base/nodes/Mautic/Mautic.node.json
index c05d7f16cb9ce..e9f83fc7779f0 100644
--- a/packages/nodes-base/nodes/Mautic/Mautic.node.json
+++ b/packages/nodes-base/nodes/Mautic/Mautic.node.json
@@ -2,7 +2,7 @@
 	"node": "n8n-nodes-base.mautic",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Marketing & Content", "Communication"],
+	"categories": ["Marketing", "Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
diff --git a/packages/nodes-base/nodes/Mautic/Mautic.node.ts b/packages/nodes-base/nodes/Mautic/Mautic.node.ts
index b820e4570f372..4925d409cc256 100644
--- a/packages/nodes-base/nodes/Mautic/Mautic.node.ts
+++ b/packages/nodes-base/nodes/Mautic/Mautic.node.ts
@@ -10,6 +10,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
+import { snakeCase } from 'change-case';
 import { mauticApiRequest, mauticApiRequestAllItems, validateJSON } from './GenericFunctions';
 
 import { contactFields, contactOperations } from './ContactDescription';
@@ -24,8 +25,6 @@ import { contactSegmentFields, contactSegmentOperations } from './ContactSegment
 
 import { campaignContactFields, campaignContactOperations } from './CampaignContactDescription';
 
-import { snakeCase } from 'change-case';
-
 export class Mautic implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Mautic',
@@ -623,7 +622,7 @@ export class Mautic implements INodeType {
 							body.lastActive = additionalFields.lastActive as string;
 						}
 						if (additionalFields.ownerId) {
-							body.ownerId = additionalFields.ownerId as string;
+							body.owner = additionalFields.ownerId as string;
 						}
 						if (additionalFields.addressUi) {
 							const addressValues = (additionalFields.addressUi as IDataObject)
@@ -738,7 +737,7 @@ export class Mautic implements INodeType {
 							body.lastActive = updateFields.lastActive as string;
 						}
 						if (updateFields.ownerId) {
-							body.ownerId = updateFields.ownerId as string;
+							body.owner = updateFields.ownerId as string;
 						}
 						if (updateFields.addressUi) {
 							const addressValues = (updateFields.addressUi as IDataObject)
@@ -1029,6 +1028,6 @@ export class Mautic implements INodeType {
 			}
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Mautic/MauticTrigger.node.json b/packages/nodes-base/nodes/Mautic/MauticTrigger.node.json
index eff930493cf4e..2becfe6148143 100644
--- a/packages/nodes-base/nodes/Mautic/MauticTrigger.node.json
+++ b/packages/nodes-base/nodes/Mautic/MauticTrigger.node.json
@@ -2,7 +2,7 @@
 	"node": "n8n-nodes-base.mauticTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Marketing & Content", "Communication"],
+	"categories": ["Marketing", "Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
diff --git a/packages/nodes-base/nodes/Mautic/mautic.svg b/packages/nodes-base/nodes/Mautic/mautic.svg
index 0a0ac69608ac5..ad01a3b0d39d0 100644
--- a/packages/nodes-base/nodes/Mautic/mautic.svg
+++ b/packages/nodes-base/nodes/Mautic/mautic.svg
@@ -1,17 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<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"
-	 width="349.779px" height="349.779px" viewBox="0 0 349.779 349.779" enable-background="new 0 0 349.779 349.779"
-	 xml:space="preserve">
-<path fill="#FFFFFF" d="M174.89,349.779C78.612,349.779,0,271.462,0,174.89S78.612,0,174.89,0c23.26,0,45.931,4.417,67.129,13.543
-	c5.889,2.65,8.833,9.422,6.478,15.605c-2.649,5.888-9.421,8.833-15.604,6.477c-18.549-7.655-37.98-11.482-58.002-11.482
-	c-83.323,0-151.041,67.718-151.041,151.041S91.567,326.225,174.89,326.225c83.323,0,151.041-67.718,151.041-151.041
-	c0-17.96-2.944-35.332-9.127-51.819c-2.355-6.183,0.883-12.955,7.066-15.31c6.183-2.355,12.954,0.883,15.31,7.066
-	c7.066,19.138,10.6,39.453,10.6,60.063C349.779,271.167,271.462,349.779,174.89,349.779"/>
-<g>
-	<polygon fill="#FDB933" points="251.44,156.93 224.354,185.194 239.369,248.496 273.522,248.496 	"/>
-</g>
-<polygon fill="#FDB933" points="240.253,73.312 249.674,82.734 174.89,161.935 110.999,96.277 74.196,248.496 108.35,248.496 
-	128.665,163.996 174.89,214.343 273.817,106.583 283.239,116.299 292.66,63.007 "/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="349.779" height="349.779"><path fill="#FFF" d="M174.89 349.779C78.612 349.779 0 271.462 0 174.89S78.612 0 174.89 0c23.26 0 45.931 4.417 67.129 13.543 5.889 2.65 8.833 9.422 6.478 15.605-2.649 5.888-9.421 8.833-15.604 6.477-18.549-7.655-37.98-11.482-58.002-11.482-83.323 0-151.041 67.718-151.041 151.041s67.717 151.041 151.04 151.041 151.041-67.718 151.041-151.041c0-17.96-2.944-35.332-9.127-51.819-2.355-6.183.883-12.955 7.066-15.31s12.954.883 15.31 7.066c7.066 19.138 10.6 39.453 10.6 60.063-.001 95.983-78.318 174.595-174.89 174.595"/><path fill="#FDB933" d="m251.44 156.93-27.086 28.264 15.015 63.302h34.153zm-11.187-83.618 9.421 9.422-74.784 79.201-63.891-65.658-36.803 152.219h34.154l20.315-84.5 46.225 50.347 98.927-107.76 9.422 9.716 9.421-53.292z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Medium/GenericFunctions.ts b/packages/nodes-base/nodes/Medium/GenericFunctions.ts
index 5ac51fed315d2..5952c07485b63 100644
--- a/packages/nodes-base/nodes/Medium/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Medium/GenericFunctions.ts
@@ -1,18 +1,17 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	JsonObject,
+	IRequestOptions,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function mediumApiRequest(
-	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: any = {},
@@ -21,7 +20,7 @@ export async function mediumApiRequest(
 ): Promise<any> {
 	const authenticationMethod = this.getNodeParameter('authentication', 0);
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		method,
 		headers: {
 			Accept: 'application/json',
diff --git a/packages/nodes-base/nodes/Medium/Medium.node.json b/packages/nodes-base/nodes/Medium/Medium.node.json
index f3a299c3a2c35..6280f35f4df34 100644
--- a/packages/nodes-base/nodes/Medium/Medium.node.json
+++ b/packages/nodes-base/nodes/Medium/Medium.node.json
@@ -2,7 +2,7 @@
 	"node": "n8n-nodes-base.medium",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Marketing & Content"],
+	"categories": ["Marketing"],
 	"resources": {
 		"credentialDocumentation": [
 			{
diff --git a/packages/nodes-base/nodes/Merge/Merge.node.json b/packages/nodes-base/nodes/Merge/Merge.node.json
index 90e758befdc78..1ea661f4f4220 100644
--- a/packages/nodes-base/nodes/Merge/Merge.node.json
+++ b/packages/nodes-base/nodes/Merge/Merge.node.json
@@ -43,6 +43,6 @@
 	},
 	"alias": ["Join", "Concatenate", "Wait"],
 	"subcategories": {
-		"Core Nodes": ["Flow"]
+		"Core Nodes": ["Flow", "Data Transformation"]
 	}
 }
diff --git a/packages/nodes-base/nodes/Merge/Merge.node.ts b/packages/nodes-base/nodes/Merge/Merge.node.ts
index e00220f26079d..d20883d2bd4e5 100644
--- a/packages/nodes-base/nodes/Merge/Merge.node.ts
+++ b/packages/nodes-base/nodes/Merge/Merge.node.ts
@@ -9,16 +9,17 @@ export class Merge extends VersionedNodeType {
 		const baseDescription: INodeTypeBaseDescription = {
 			displayName: 'Merge',
 			name: 'merge',
-			icon: 'fa:code-branch',
+			icon: 'file:merge.svg',
 			group: ['transform'],
 			subtitle: '={{$parameter["mode"]}}',
 			description: 'Merges data of multiple streams once data from both is available',
-			defaultVersion: 2,
+			defaultVersion: 2.1,
 		};
 
 		const nodeVersions: IVersionedNodeType['nodeVersions'] = {
 			1: new MergeV1(baseDescription),
 			2: new MergeV2(baseDescription),
+			2.1: new MergeV2(baseDescription),
 		};
 
 		super(nodeVersions, baseDescription);
diff --git a/packages/nodes-base/nodes/Merge/merge.svg b/packages/nodes-base/nodes/Merge/merge.svg
new file mode 100644
index 0000000000000..e01df70aae0a1
--- /dev/null
+++ b/packages/nodes-base/nodes/Merge/merge.svg
@@ -0,0 +1,10 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1177_518)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0 48C0 21.4903 21.4903 0 48 0H112C138.51 0 160 21.4903 160 48V56H196.252C240.435 56 276.252 91.8172 276.252 136V192C276.252 214.091 294.161 232 316.252 232H352V224C352 197.49 373.49 176 400 176H464C490.51 176 512 197.49 512 224V288C512 314.51 490.51 336 464 336H400C373.49 336 352 314.51 352 288V280H316.252C294.161 280 276.252 297.909 276.252 320V376C276.252 420.183 240.435 456 196.252 456H160V464C160 490.51 138.51 512 112 512H48C21.4903 512 0 490.51 0 464V400C0 373.49 21.4903 352 48 352H112C138.51 352 160 373.49 160 400V408H196.252C213.925 408 228.252 393.673 228.252 376V320C228.252 294.784 238.859 272.044 255.853 256C238.859 239.956 228.252 217.216 228.252 192V136C228.252 118.327 213.925 104 196.252 104H160V112C160 138.51 138.51 160 112 160H48C21.4903 160 0 138.51 0 112V48ZM104 48C108.418 48 112 51.5817 112 56V104C112 108.418 108.418 112 104 112H56C51.5817 112 48 108.418 48 104V56C48 51.5817 51.5817 48 56 48H104ZM456 224C460.418 224 464 227.582 464 232V280C464 284.418 460.418 288 456 288H408C403.582 288 400 284.418 400 280V232C400 227.582 403.582 224 408 224H456ZM112 408C112 403.582 108.418 400 104 400H56C51.5817 400 48 403.582 48 408V456C48 460.418 51.5817 464 56 464H104C108.418 464 112 460.418 112 456V408Z" fill="#54B8C9"/>
+</g>
+<defs>
+<clipPath id="clip0_1177_518">
+<rect width="512" height="512" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/packages/nodes-base/nodes/Merge/test/node/Merge.test.ts b/packages/nodes-base/nodes/Merge/test/node/Merge.test.ts
index 207f2af495313..5edb910df9967 100644
--- a/packages/nodes-base/nodes/Merge/test/node/Merge.test.ts
+++ b/packages/nodes-base/nodes/Merge/test/node/Merge.test.ts
@@ -1,4 +1,4 @@
-import { testWorkflows, getWorkflowFilenames } from '../../../../test/nodes/Helpers';
+import { testWorkflows, getWorkflowFilenames } from '@test/nodes/Helpers';
 
 const workflows = getWorkflowFilenames(__dirname);
 
diff --git a/packages/nodes-base/nodes/Merge/test/node/workflow.chooseBranch.empty.paired.items.json b/packages/nodes-base/nodes/Merge/test/node/workflow.chooseBranch.empty.paired.items.json
new file mode 100644
index 0000000000000..a94633c43e3d6
--- /dev/null
+++ b/packages/nodes-base/nodes/Merge/test/node/workflow.chooseBranch.empty.paired.items.json
@@ -0,0 +1,145 @@
+{
+  "meta": {
+    "templateCredsSetupCompleted": true,
+    "instanceId": "8d731d98fab18fb8e68289d44c50faa5d5c5378aedc3f892abdd7d5d3b7061c5"
+  },
+  "nodes": [
+    {
+      "parameters": {
+        "fields": {
+          "values": [
+            {
+              "name": "one",
+              "stringValue": "={{ $('Code').item.json.id }}"
+            },
+            {
+              "name": "two",
+              "stringValue": "={{ $('Code1').item.json.id }}"
+            }
+          ]
+        },
+        "options": {}
+      },
+      "id": "853f9e11-e59b-4f21-81ba-08ec2d69c87a",
+      "name": "Edit Fields",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.2,
+      "position": [
+        900,
+        580
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "8310a9da-b02b-4a77-80d4-7c2de5bcbae8",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        180,
+        600
+      ]
+    },
+    {
+      "parameters": {
+        "jsCode": "return [\n  {id: 1},\n];"
+      },
+      "id": "0f1fb40d-0c6c-455d-bb3b-0c0fa818e063",
+      "name": "Code",
+      "type": "n8n-nodes-base.code",
+      "typeVersion": 1,
+      "position": [
+        420,
+        520
+      ]
+    },
+    {
+      "parameters": {
+        "jsCode": "return [\n  {id: 2},\n];"
+      },
+      "id": "873fcccc-86c1-40fd-bdae-2bb31e971382",
+      "name": "Code1",
+      "type": "n8n-nodes-base.code",
+      "typeVersion": 1,
+      "position": [
+        420,
+        680
+      ]
+    },
+    {
+      "parameters": {
+        "mode": "chooseBranch",
+        "output": "empty"
+      },
+      "id": "b81a2372-9f8b-4899-b2fd-c581bcf930d8",
+      "name": "Merge3",
+      "type": "n8n-nodes-base.merge",
+      "typeVersion": 2,
+      "position": [
+        700,
+        580
+      ]
+    }
+  ],
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Code",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Code1",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Code": {
+      "main": [
+        [
+          {
+            "node": "Merge3",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Code1": {
+      "main": [
+        [
+          {
+            "node": "Merge3",
+            "type": "main",
+            "index": 1
+          }
+        ]
+      ]
+    },
+    "Merge3": {
+      "main": [
+        [
+          {
+            "node": "Edit Fields",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "pinData": {
+    "Edit Fields": [
+			{
+				"json": {
+					"one": "1",
+					"two": "2"
+				}
+			}
+    ]
+  }
+}
diff --git a/packages/nodes-base/nodes/Merge/test/node/workflow.combine.mergeByFields.json b/packages/nodes-base/nodes/Merge/test/node/workflow.combine.mergeByFields.json
index aecdcd27126b0..f31d72e8f0393 100644
--- a/packages/nodes-base/nodes/Merge/test/node/workflow.combine.mergeByFields.json
+++ b/packages/nodes-base/nodes/Merge/test/node/workflow.combine.mergeByFields.json
@@ -278,8 +278,8 @@
 			{
 				"json": {
 					"id": 1,
-					"data": "c",
-					"input": 2,
+					"data": "a",
+					"input": 1,
 					"text": "foo",
 					"tag": "second"
 				}
@@ -287,8 +287,8 @@
 			{
 				"json": {
 					"id": 2,
-					"data": "d",
-					"input": 2,
+					"data": "b",
+					"input": 1,
 					"text": "foo",
 					"tag": "second"
 				}
diff --git a/packages/nodes-base/nodes/Merge/test/node/workflow.keep_non_matches.json b/packages/nodes-base/nodes/Merge/test/node/workflow.keep_non_matches.json
new file mode 100644
index 0000000000000..8c2f85552a14b
--- /dev/null
+++ b/packages/nodes-base/nodes/Merge/test/node/workflow.keep_non_matches.json
@@ -0,0 +1,588 @@
+{
+  "name": "merge fix",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "94003e55-6c4e-492f-802a-49f4fb5b5f4b",
+      "name": "When clicking \"Test Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        120,
+        940
+      ]
+    },
+    {
+      "parameters": {
+        "jsCode": "return [\n  {\n    \"id\": 1,\n    \"first_name\": \"John\",\n    \"last_name\": \"Doe\"\n  },\n  {\n    \"id\": 2,\n    \"first_name\": \"Jane\",\n    \"last_name\": \"Smith\"\n  },\n  {\n    \"id\": 3,\n    \"first_name\": \"Michael\",\n    \"last_name\": \"Johnson\"\n  },\n  {\n    \"id\": 4,\n    \"first_name\": \"Emily\",\n    \"last_name\": \"Davis\"\n  },\n  {\n    \"id\": 5,\n    \"first_name\": \"Robert\",\n    \"last_name\": \"Taylor\"\n  },\n  {\n    \"id\": 6,\n    \"first_name\": \"Olivia\",\n    \"last_name\": \"Martin\"\n  },\n  {\n    \"id\": 7,\n    \"first_name\": \"William\",\n    \"last_name\": \"Brown\"\n  },\n  {\n    \"id\": 8,\n    \"first_name\": \"Sophia\",\n    \"last_name\": \"Anderson\"\n  },\n  {\n    \"id\": 9,\n    \"first_name\": \"Daniel\",\n    \"last_name\": \"Wilson\"\n  },\n  {\n    \"id\": 10,\n    \"first_name\": \"Ava\",\n    \"last_name\": \"Miller\"\n  }\n];"
+      },
+      "id": "da82fbb0-b689-4c4e-b310-303361e8411c",
+      "name": "Mock data A",
+      "type": "n8n-nodes-base.code",
+      "typeVersion": 2,
+      "position": [
+        340,
+        840
+      ]
+    },
+    {
+      "parameters": {
+        "jsCode": "return [\n];"
+      },
+      "id": "493ecb02-52e7-43b7-8c73-d45a3f7e76f6",
+      "name": "Mock data B",
+      "type": "n8n-nodes-base.code",
+      "typeVersion": 2,
+      "position": [
+        340,
+        1040
+      ]
+    },
+    {
+      "parameters": {
+        "mode": "combine",
+        "mergeByFields": {
+          "values": [
+            {
+              "field1": "id",
+              "field2": "id"
+            }
+          ]
+        },
+        "joinMode": "keepNonMatches",
+        "options": {}
+      },
+      "id": "d0c0f123-1461-4b78-9cf8-6410440430d3",
+      "name": "Merge",
+      "type": "n8n-nodes-base.merge",
+      "typeVersion": 2.1,
+      "position": [
+        700,
+        500
+      ]
+    },
+    {
+      "parameters": {
+        "mode": "combine",
+        "mergeByFields": {
+          "values": [
+            {
+              "field1": "id",
+              "field2": "id"
+            }
+          ]
+        },
+        "joinMode": "keepNonMatches",
+        "options": {}
+      },
+      "id": "5093ec3e-c987-44c7-815f-279ea7842db5",
+      "name": "Merge1",
+      "type": "n8n-nodes-base.merge",
+      "typeVersion": 2.1,
+      "position": [
+        700,
+        680
+      ]
+    },
+    {
+      "parameters": {
+        "mode": "combine",
+        "mergeByFields": {
+          "values": [
+            {
+              "field1": "id",
+              "field2": "id"
+            }
+          ]
+        },
+        "joinMode": "keepNonMatches",
+        "outputDataFrom": "input1",
+        "options": {}
+      },
+      "id": "0453bb35-3971-4a23-93b7-31853e4634fb",
+      "name": "Merge2",
+      "type": "n8n-nodes-base.merge",
+      "typeVersion": 2.1,
+      "position": [
+        700,
+        880
+      ]
+    },
+    {
+      "parameters": {
+        "mode": "combine",
+        "mergeByFields": {
+          "values": [
+            {
+              "field1": "id",
+              "field2": "id"
+            }
+          ]
+        },
+        "joinMode": "keepNonMatches",
+        "outputDataFrom": "input1",
+        "options": {}
+      },
+      "id": "f09c9327-4557-406b-8ae0-db851055dd08",
+      "name": "Merge3",
+      "type": "n8n-nodes-base.merge",
+      "typeVersion": 2.1,
+      "position": [
+        700,
+        1060
+      ],
+      "alwaysOutputData": true
+    },
+    {
+      "parameters": {
+        "mode": "combine",
+        "mergeByFields": {
+          "values": [
+            {
+              "field1": "id",
+              "field2": "id"
+            }
+          ]
+        },
+        "joinMode": "keepNonMatches",
+        "outputDataFrom": "input2",
+        "options": {}
+      },
+      "id": "d5bc6ee7-141e-4eba-a9aa-cb866b177b89",
+      "name": "Merge4",
+      "type": "n8n-nodes-base.merge",
+      "typeVersion": 2.1,
+      "position": [
+        700,
+        1280
+      ],
+      "alwaysOutputData": true
+    },
+    {
+      "parameters": {
+        "mode": "combine",
+        "mergeByFields": {
+          "values": [
+            {
+              "field1": "id",
+              "field2": "id"
+            }
+          ]
+        },
+        "joinMode": "keepNonMatches",
+        "outputDataFrom": "input2",
+        "options": {}
+      },
+      "id": "4c881679-3f76-491a-a2c9-e35e4c9e28ff",
+      "name": "Merge5",
+      "type": "n8n-nodes-base.merge",
+      "typeVersion": 2.1,
+      "position": [
+        700,
+        1460
+      ],
+      "alwaysOutputData": true
+    }
+  ],
+  "pinData": {
+    "Merge": [
+      {
+        "json": {
+          "id": 1,
+          "first_name": "John",
+          "last_name": "Doe"
+        }
+      },
+      {
+        "json": {
+          "id": 2,
+          "first_name": "Jane",
+          "last_name": "Smith"
+        }
+      },
+      {
+        "json": {
+          "id": 3,
+          "first_name": "Michael",
+          "last_name": "Johnson"
+        }
+      },
+      {
+        "json": {
+          "id": 4,
+          "first_name": "Emily",
+          "last_name": "Davis"
+        }
+      },
+      {
+        "json": {
+          "id": 5,
+          "first_name": "Robert",
+          "last_name": "Taylor"
+        }
+      },
+      {
+        "json": {
+          "id": 6,
+          "first_name": "Olivia",
+          "last_name": "Martin"
+        }
+      },
+      {
+        "json": {
+          "id": 7,
+          "first_name": "William",
+          "last_name": "Brown"
+        }
+      },
+      {
+        "json": {
+          "id": 8,
+          "first_name": "Sophia",
+          "last_name": "Anderson"
+        }
+      },
+      {
+        "json": {
+          "id": 9,
+          "first_name": "Daniel",
+          "last_name": "Wilson"
+        }
+      },
+      {
+        "json": {
+          "id": 10,
+          "first_name": "Ava",
+          "last_name": "Miller"
+        }
+      }
+    ],
+    "Merge1": [
+      {
+        "json": {
+          "id": 1,
+          "first_name": "John",
+          "last_name": "Doe"
+        }
+      },
+      {
+        "json": {
+          "id": 2,
+          "first_name": "Jane",
+          "last_name": "Smith"
+        }
+      },
+      {
+        "json": {
+          "id": 3,
+          "first_name": "Michael",
+          "last_name": "Johnson"
+        }
+      },
+      {
+        "json": {
+          "id": 4,
+          "first_name": "Emily",
+          "last_name": "Davis"
+        }
+      },
+      {
+        "json": {
+          "id": 5,
+          "first_name": "Robert",
+          "last_name": "Taylor"
+        }
+      },
+      {
+        "json": {
+          "id": 6,
+          "first_name": "Olivia",
+          "last_name": "Martin"
+        }
+      },
+      {
+        "json": {
+          "id": 7,
+          "first_name": "William",
+          "last_name": "Brown"
+        }
+      },
+      {
+        "json": {
+          "id": 8,
+          "first_name": "Sophia",
+          "last_name": "Anderson"
+        }
+      },
+      {
+        "json": {
+          "id": 9,
+          "first_name": "Daniel",
+          "last_name": "Wilson"
+        }
+      },
+      {
+        "json": {
+          "id": 10,
+          "first_name": "Ava",
+          "last_name": "Miller"
+        }
+      }
+    ],
+    "Merge2": [
+      {
+        "json": {
+          "id": 1,
+          "first_name": "John",
+          "last_name": "Doe"
+        }
+      },
+      {
+        "json": {
+          "id": 2,
+          "first_name": "Jane",
+          "last_name": "Smith"
+        }
+      },
+      {
+        "json": {
+          "id": 3,
+          "first_name": "Michael",
+          "last_name": "Johnson"
+        }
+      },
+      {
+        "json": {
+          "id": 4,
+          "first_name": "Emily",
+          "last_name": "Davis"
+        }
+      },
+      {
+        "json": {
+          "id": 5,
+          "first_name": "Robert",
+          "last_name": "Taylor"
+        }
+      },
+      {
+        "json": {
+          "id": 6,
+          "first_name": "Olivia",
+          "last_name": "Martin"
+        }
+      },
+      {
+        "json": {
+          "id": 7,
+          "first_name": "William",
+          "last_name": "Brown"
+        }
+      },
+      {
+        "json": {
+          "id": 8,
+          "first_name": "Sophia",
+          "last_name": "Anderson"
+        }
+      },
+      {
+        "json": {
+          "id": 9,
+          "first_name": "Daniel",
+          "last_name": "Wilson"
+        }
+      },
+      {
+        "json": {
+          "id": 10,
+          "first_name": "Ava",
+          "last_name": "Miller"
+        }
+      }
+    ],
+    "Merge3": [
+      {
+        "json": {}
+      }
+    ],
+    "Merge4": [
+      {
+        "json": {}
+      }
+    ],
+    "Merge5": [
+      {
+        "json": {
+          "id": 1,
+          "first_name": "John",
+          "last_name": "Doe"
+        }
+      },
+      {
+        "json": {
+          "id": 2,
+          "first_name": "Jane",
+          "last_name": "Smith"
+        }
+      },
+      {
+        "json": {
+          "id": 3,
+          "first_name": "Michael",
+          "last_name": "Johnson"
+        }
+      },
+      {
+        "json": {
+          "id": 4,
+          "first_name": "Emily",
+          "last_name": "Davis"
+        }
+      },
+      {
+        "json": {
+          "id": 5,
+          "first_name": "Robert",
+          "last_name": "Taylor"
+        }
+      },
+      {
+        "json": {
+          "id": 6,
+          "first_name": "Olivia",
+          "last_name": "Martin"
+        }
+      },
+      {
+        "json": {
+          "id": 7,
+          "first_name": "William",
+          "last_name": "Brown"
+        }
+      },
+      {
+        "json": {
+          "id": 8,
+          "first_name": "Sophia",
+          "last_name": "Anderson"
+        }
+      },
+      {
+        "json": {
+          "id": 9,
+          "first_name": "Daniel",
+          "last_name": "Wilson"
+        }
+      },
+      {
+        "json": {
+          "id": 10,
+          "first_name": "Ava",
+          "last_name": "Miller"
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Test Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Mock data A",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Mock data B",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Mock data A": {
+      "main": [
+        [
+          {
+            "node": "Merge",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Merge1",
+            "type": "main",
+            "index": 1
+          },
+          {
+            "node": "Merge2",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Merge3",
+            "type": "main",
+            "index": 1
+          },
+          {
+            "node": "Merge4",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Merge5",
+            "type": "main",
+            "index": 1
+          }
+        ]
+      ]
+    },
+    "Mock data B": {
+      "main": [
+        [
+          {
+            "node": "Merge",
+            "type": "main",
+            "index": 1
+          },
+          {
+            "node": "Merge1",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Merge2",
+            "type": "main",
+            "index": 1
+          },
+          {
+            "node": "Merge3",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Merge4",
+            "type": "main",
+            "index": 1
+          },
+          {
+            "node": "Merge5",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "54329e46-4d05-491a-919c-e156e77d6d11",
+  "meta": {
+    "templateCredsSetupCompleted": true,
+    "instanceId": "b888bd11cd1ddbb95450babf3e199556799d999b896f650de768b8370ee50363"
+  },
+  "id": "WbgpQNak2tO6spx2",
+  "tags": []
+}
diff --git a/packages/nodes-base/nodes/Merge/test/node/workflow.mixed.forceInputNodeExecution.json b/packages/nodes-base/nodes/Merge/test/node/workflow.mixed.forceInputNodeExecution.json
new file mode 100644
index 0000000000000..c297880c19d12
--- /dev/null
+++ b/packages/nodes-base/nodes/Merge/test/node/workflow.mixed.forceInputNodeExecution.json
@@ -0,0 +1,2440 @@
+{
+	"name": "Merge 2",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "8d0ffac0-dfbf-4407-91db-0756041b0894",
+			"name": "Start",
+			"type": "n8n-nodes-base.start",
+			"typeVersion": 1,
+			"position": [-320, 1640]
+		},
+		{
+			"parameters": {
+				"conditions": {
+					"string": [
+						{
+							"value1": "={{ $json[\"test\"] }}",
+							"value2": "b"
+						}
+					]
+				}
+			},
+			"id": "8bc8719a-4e79-4df0-bd34-e67b4aaa7823",
+			"name": "IF",
+			"type": "n8n-nodes-base.if",
+			"typeVersion": 1,
+			"position": [140, 1180]
+		},
+		{
+			"parameters": {},
+			"id": "26ceab02-97d2-4e4b-b27f-d5a5584e697e",
+			"name": "Merge",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2,
+			"position": [900, 1260]
+		},
+		{
+			"parameters": {},
+			"id": "2b3f9309-8c75-4dc6-bf02-ab19f17983d7",
+			"name": "Merge1",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2,
+			"position": [640, 1260]
+		},
+		{
+			"parameters": {
+				"mode": "combine",
+				"combinationMode": "mergeByPosition",
+				"options": {}
+			},
+			"id": "a0456576-8dbb-437f-81e5-5fe331eb45f6",
+			"name": "Merge3",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2,
+			"position": [640, 1100]
+		},
+		{
+			"parameters": {
+				"mode": "combine",
+				"combinationMode": "mergeByPosition",
+				"options": {}
+			},
+			"id": "66c801a7-c020-42b1-bedb-f5104a792e0c",
+			"name": "Merge4",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2,
+			"position": [900, 1100]
+		},
+		{
+			"parameters": {
+				"operation": "getAllPeople"
+			},
+			"id": "e8e83cef-c782-490c-9a0e-206435e3b71c",
+			"name": "Customer Datastore (n8n training)",
+			"type": "n8n-nodes-base.n8nTrainingCustomerDatastore",
+			"typeVersion": 1,
+			"position": [-100, 1640]
+		},
+		{
+			"parameters": {
+				"mode": "chooseBranch"
+			},
+			"id": "f8b779dc-992d-49db-9fc2-d8b76b0f3419",
+			"name": "Merge2",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2,
+			"position": [640, 1440]
+		},
+		{
+			"parameters": {
+				"mode": "chooseBranch"
+			},
+			"id": "e6136b98-ab2c-4c44-bc14-6af3fa39ed01",
+			"name": "Merge5",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2,
+			"position": [900, 1440]
+		},
+		{
+			"parameters": {
+				"values": {
+					"string": [
+						{
+							"name": "nameB",
+							"value": "B"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "c97cba6c-5a4e-4929-81d1-da20be216900",
+			"name": "Set1B",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 2,
+			"position": [380, 1260]
+		},
+		{
+			"parameters": {
+				"values": {
+					"string": [
+						{
+							"name": "nameA",
+							"value": "A"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "87fdfaf7-dafc-427e-ad89-3839ea9718aa",
+			"name": "Set1A",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 2,
+			"position": [380, 1120]
+		},
+		{
+			"parameters": {
+				"mode": "combine",
+				"mergeByFields": {
+					"values": [
+						{
+							"field1": "id",
+							"field2": "id"
+						}
+					]
+				},
+				"joinMode": "keepEverything",
+				"options": {}
+			},
+			"id": "f5e4aabd-93f8-405c-804a-9487393467e6",
+			"name": "Merge6",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2,
+			"position": [900, 940],
+			"disabled": true
+		},
+		{
+			"parameters": {
+				"mode": "combine",
+				"mergeByFields": {
+					"values": [
+						{
+							"field1": "id",
+							"field2": "id"
+						}
+					]
+				},
+				"joinMode": "keepEverything",
+				"options": {}
+			},
+			"id": "b713a005-f140-4565-b30a-3136d892a8c3",
+			"name": "Merge8",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2,
+			"position": [640, 940],
+			"disabled": true
+		},
+		{
+			"parameters": {
+				"mode": "combine",
+				"combinationMode": "multiplex",
+				"options": {}
+			},
+			"id": "868d4a27-7192-4252-826b-dcc20b42948a",
+			"name": "Merge9",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2,
+			"position": [900, 780]
+		},
+		{
+			"parameters": {
+				"mode": "combine",
+				"combinationMode": "multiplex",
+				"options": {}
+			},
+			"id": "b8e770e8-c0a0-413b-a887-4e6395787d76",
+			"name": "Merge10",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2,
+			"position": [640, 780]
+		},
+		{
+			"parameters": {
+				"mode": "chooseBranch",
+				"output": "input2"
+			},
+			"id": "925a9e9e-2628-4561-a7d7-89f55248e1d4",
+			"name": "Merge7",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2,
+			"position": [640, 1620]
+		},
+		{
+			"parameters": {
+				"mode": "chooseBranch",
+				"output": "input2"
+			},
+			"id": "fed3c762-9171-4d7e-85b9-c2c100eba9f9",
+			"name": "Merge11",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2,
+			"position": [900, 1620]
+		},
+		{
+			"parameters": {},
+			"id": "8f3b781a-c82b-40a0-a896-d459e25f9b79",
+			"name": "Merge12",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2,
+			"position": [900, 2360]
+		},
+		{
+			"parameters": {},
+			"id": "65c4b385-cf4c-4a6e-98bb-797dbfdf67a0",
+			"name": "Merge13",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2,
+			"position": [640, 2360]
+		},
+		{
+			"parameters": {
+				"mode": "combine",
+				"combinationMode": "mergeByPosition",
+				"options": {}
+			},
+			"id": "5260edf9-c448-4790-ac0a-6f1bc9845c56",
+			"name": "Merge14",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2,
+			"position": [640, 2200]
+		},
+		{
+			"parameters": {
+				"mode": "combine",
+				"combinationMode": "mergeByPosition",
+				"options": {}
+			},
+			"id": "1d60a9d0-cd9e-418e-85e7-19726f6dfc27",
+			"name": "Merge15",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2,
+			"position": [900, 2200]
+		},
+		{
+			"parameters": {
+				"mode": "chooseBranch"
+			},
+			"id": "0432532f-7ab6-428e-8a09-5473ea43da9e",
+			"name": "Merge16",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2,
+			"position": [640, 2540]
+		},
+		{
+			"parameters": {
+				"mode": "chooseBranch"
+			},
+			"id": "0ffc7240-3225-4223-a8c9-f76327dfbe02",
+			"name": "Merge17",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2,
+			"position": [900, 2540]
+		},
+		{
+			"parameters": {
+				"mode": "combine",
+				"mergeByFields": {
+					"values": [
+						{
+							"field1": "id",
+							"field2": "id"
+						}
+					]
+				},
+				"joinMode": "keepEverything",
+				"options": {}
+			},
+			"id": "5b139ae2-f46d-4149-9e63-b50acaac2be7",
+			"name": "Merge18",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2,
+			"position": [900, 2040]
+		},
+		{
+			"parameters": {
+				"mode": "combine",
+				"mergeByFields": {
+					"values": [
+						{
+							"field1": "id",
+							"field2": "id"
+						}
+					]
+				},
+				"joinMode": "keepEverything",
+				"options": {}
+			},
+			"id": "49132c5a-a0bb-4254-a693-9a243ef13ca8",
+			"name": "Merge19",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2,
+			"position": [640, 2040]
+		},
+		{
+			"parameters": {
+				"mode": "combine",
+				"combinationMode": "multiplex",
+				"options": {}
+			},
+			"id": "2856e67f-d640-45b6-8d2d-7264bf419b2f",
+			"name": "Merge20",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2,
+			"position": [900, 1880]
+		},
+		{
+			"parameters": {
+				"mode": "combine",
+				"combinationMode": "multiplex",
+				"options": {}
+			},
+			"id": "a8fb6c81-fdc0-4da3-a3d7-21f8d901d5f2",
+			"name": "Merge21",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2,
+			"position": [640, 1880]
+		},
+		{
+			"parameters": {
+				"mode": "chooseBranch",
+				"output": "input2"
+			},
+			"id": "922005a8-9d49-4e63-9b53-22aedcc5577d",
+			"name": "Merge22",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2,
+			"position": [640, 2720]
+		},
+		{
+			"parameters": {
+				"mode": "chooseBranch",
+				"output": "input2"
+			},
+			"id": "6d0d4e32-a7e8-447b-929f-7faaa3044a5f",
+			"name": "Merge23",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2,
+			"position": [900, 2720]
+		},
+		{
+			"parameters": {
+				"values": {
+					"string": [
+						{
+							"name": "nameA",
+							"value": "A"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "c60a9307-efbf-444e-899c-33002e80d9f0",
+			"name": "Set2A",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 2,
+			"position": [380, 2220]
+		},
+		{
+			"parameters": {
+				"values": {
+					"string": [
+						{
+							"name": "nameB",
+							"value": "B"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "df76be2b-5e4f-48bf-b779-aacfffb8c2ba",
+			"name": "Set2B",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 2,
+			"position": [380, 2360]
+		}
+	],
+	"pinData": {
+		"Merge10": [
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423534",
+					"name": "Max Sendak",
+					"email": "info@in-and-out-of-weeks.org",
+					"notes": "Keeps rolling his terrible eyes",
+					"country": "US",
+					"created": "1963-04-09",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423535",
+					"name": "Zaphod Beeblebrox",
+					"email": "captain@heartofgold.com",
+					"notes": "Felt like I was talking to more than one person",
+					"country": null,
+					"created": "1979-10-12",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			}
+		],
+		"Merge9": [
+			{
+				"json": {
+					"nameA": "A",
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"nameA": "A",
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"nameA": "A",
+					"id": "23423534",
+					"name": "Max Sendak",
+					"email": "info@in-and-out-of-weeks.org",
+					"notes": "Keeps rolling his terrible eyes",
+					"country": "US",
+					"created": "1963-04-09",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"nameA": "A",
+					"id": "23423535",
+					"name": "Zaphod Beeblebrox",
+					"email": "captain@heartofgold.com",
+					"notes": "Felt like I was talking to more than one person",
+					"country": null,
+					"created": "1979-10-12",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"nameA": "A",
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
+					"nameB": "B"
+				}
+			}
+		],
+		"Merge3": [
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			}
+		],
+		"Merge4": [
+			{
+				"json": {
+					"nameA": "A",
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"nameB": "B"
+				}
+			}
+		],
+		"Merge1": [
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423534",
+					"name": "Max Sendak",
+					"email": "info@in-and-out-of-weeks.org",
+					"notes": "Keeps rolling his terrible eyes",
+					"country": "US",
+					"created": "1963-04-09",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423535",
+					"name": "Zaphod Beeblebrox",
+					"email": "captain@heartofgold.com",
+					"notes": "Felt like I was talking to more than one person",
+					"country": null,
+					"created": "1979-10-12",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"nameA": "A"
+				}
+			}
+		],
+		"Merge": [
+			{
+				"json": {
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423534",
+					"name": "Max Sendak",
+					"email": "info@in-and-out-of-weeks.org",
+					"notes": "Keeps rolling his terrible eyes",
+					"country": "US",
+					"created": "1963-04-09",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423535",
+					"name": "Zaphod Beeblebrox",
+					"email": "captain@heartofgold.com",
+					"notes": "Felt like I was talking to more than one person",
+					"country": null,
+					"created": "1979-10-12",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
+					"nameB": "B"
+				}
+			}
+		],
+		"Merge2": [
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423534",
+					"name": "Max Sendak",
+					"email": "info@in-and-out-of-weeks.org",
+					"notes": "Keeps rolling his terrible eyes",
+					"country": "US",
+					"created": "1963-04-09",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423535",
+					"name": "Zaphod Beeblebrox",
+					"email": "captain@heartofgold.com",
+					"notes": "Felt like I was talking to more than one person",
+					"country": null,
+					"created": "1979-10-12",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
+					"nameB": "B"
+				}
+			}
+		],
+		"Merge5": [
+			{
+				"json": {
+					"nameA": "A"
+				}
+			}
+		],
+		"Merge7": [
+			{
+				"json": {
+					"nameA": "A"
+				}
+			}
+		],
+		"Merge11": [
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423534",
+					"name": "Max Sendak",
+					"email": "info@in-and-out-of-weeks.org",
+					"notes": "Keeps rolling his terrible eyes",
+					"country": "US",
+					"created": "1963-04-09",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423535",
+					"name": "Zaphod Beeblebrox",
+					"email": "captain@heartofgold.com",
+					"notes": "Felt like I was talking to more than one person",
+					"country": null,
+					"created": "1979-10-12",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
+					"nameB": "B"
+				}
+			}
+		],
+		"Merge21": [
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423534",
+					"name": "Max Sendak",
+					"email": "info@in-and-out-of-weeks.org",
+					"notes": "Keeps rolling his terrible eyes",
+					"country": "US",
+					"created": "1963-04-09",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423535",
+					"name": "Zaphod Beeblebrox",
+					"email": "captain@heartofgold.com",
+					"notes": "Felt like I was talking to more than one person",
+					"country": null,
+					"created": "1979-10-12",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423534",
+					"name": "Max Sendak",
+					"email": "info@in-and-out-of-weeks.org",
+					"notes": "Keeps rolling his terrible eyes",
+					"country": "US",
+					"created": "1963-04-09",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423535",
+					"name": "Zaphod Beeblebrox",
+					"email": "captain@heartofgold.com",
+					"notes": "Felt like I was talking to more than one person",
+					"country": null,
+					"created": "1979-10-12",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423534",
+					"name": "Max Sendak",
+					"email": "info@in-and-out-of-weeks.org",
+					"notes": "Keeps rolling his terrible eyes",
+					"country": "US",
+					"created": "1963-04-09",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423535",
+					"name": "Zaphod Beeblebrox",
+					"email": "captain@heartofgold.com",
+					"notes": "Felt like I was talking to more than one person",
+					"country": null,
+					"created": "1979-10-12",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423534",
+					"name": "Max Sendak",
+					"email": "info@in-and-out-of-weeks.org",
+					"notes": "Keeps rolling his terrible eyes",
+					"country": "US",
+					"created": "1963-04-09",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423535",
+					"name": "Zaphod Beeblebrox",
+					"email": "captain@heartofgold.com",
+					"notes": "Felt like I was talking to more than one person",
+					"country": null,
+					"created": "1979-10-12",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423534",
+					"name": "Max Sendak",
+					"email": "info@in-and-out-of-weeks.org",
+					"notes": "Keeps rolling his terrible eyes",
+					"country": "US",
+					"created": "1963-04-09",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423535",
+					"name": "Zaphod Beeblebrox",
+					"email": "captain@heartofgold.com",
+					"notes": "Felt like I was talking to more than one person",
+					"country": null,
+					"created": "1979-10-12",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			}
+		],
+		"Merge20": [
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423534",
+					"name": "Max Sendak",
+					"email": "info@in-and-out-of-weeks.org",
+					"notes": "Keeps rolling his terrible eyes",
+					"country": "US",
+					"created": "1963-04-09",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423535",
+					"name": "Zaphod Beeblebrox",
+					"email": "captain@heartofgold.com",
+					"notes": "Felt like I was talking to more than one person",
+					"country": null,
+					"created": "1979-10-12",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423534",
+					"name": "Max Sendak",
+					"email": "info@in-and-out-of-weeks.org",
+					"notes": "Keeps rolling his terrible eyes",
+					"country": "US",
+					"created": "1963-04-09",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423535",
+					"name": "Zaphod Beeblebrox",
+					"email": "captain@heartofgold.com",
+					"notes": "Felt like I was talking to more than one person",
+					"country": null,
+					"created": "1979-10-12",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423534",
+					"name": "Max Sendak",
+					"email": "info@in-and-out-of-weeks.org",
+					"notes": "Keeps rolling his terrible eyes",
+					"country": "US",
+					"created": "1963-04-09",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423535",
+					"name": "Zaphod Beeblebrox",
+					"email": "captain@heartofgold.com",
+					"notes": "Felt like I was talking to more than one person",
+					"country": null,
+					"created": "1979-10-12",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423534",
+					"name": "Max Sendak",
+					"email": "info@in-and-out-of-weeks.org",
+					"notes": "Keeps rolling his terrible eyes",
+					"country": "US",
+					"created": "1963-04-09",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423535",
+					"name": "Zaphod Beeblebrox",
+					"email": "captain@heartofgold.com",
+					"notes": "Felt like I was talking to more than one person",
+					"country": null,
+					"created": "1979-10-12",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423534",
+					"name": "Max Sendak",
+					"email": "info@in-and-out-of-weeks.org",
+					"notes": "Keeps rolling his terrible eyes",
+					"country": "US",
+					"created": "1963-04-09",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423535",
+					"name": "Zaphod Beeblebrox",
+					"email": "captain@heartofgold.com",
+					"notes": "Felt like I was talking to more than one person",
+					"country": null,
+					"created": "1979-10-12",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			}
+		],
+		"Merge19": [
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423534",
+					"name": "Max Sendak",
+					"email": "info@in-and-out-of-weeks.org",
+					"notes": "Keeps rolling his terrible eyes",
+					"country": "US",
+					"created": "1963-04-09",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423535",
+					"name": "Zaphod Beeblebrox",
+					"email": "captain@heartofgold.com",
+					"notes": "Felt like I was talking to more than one person",
+					"country": null,
+					"created": "1979-10-12",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			}
+		],
+		"Merge18": [
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423534",
+					"name": "Max Sendak",
+					"email": "info@in-and-out-of-weeks.org",
+					"notes": "Keeps rolling his terrible eyes",
+					"country": "US",
+					"created": "1963-04-09",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423535",
+					"name": "Zaphod Beeblebrox",
+					"email": "captain@heartofgold.com",
+					"notes": "Felt like I was talking to more than one person",
+					"country": null,
+					"created": "1979-10-12",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			}
+		],
+		"Merge14": [
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423534",
+					"name": "Max Sendak",
+					"email": "info@in-and-out-of-weeks.org",
+					"notes": "Keeps rolling his terrible eyes",
+					"country": "US",
+					"created": "1963-04-09",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423535",
+					"name": "Zaphod Beeblebrox",
+					"email": "captain@heartofgold.com",
+					"notes": "Felt like I was talking to more than one person",
+					"country": null,
+					"created": "1979-10-12",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			}
+		],
+		"Merge15": [
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423534",
+					"name": "Max Sendak",
+					"email": "info@in-and-out-of-weeks.org",
+					"notes": "Keeps rolling his terrible eyes",
+					"country": "US",
+					"created": "1963-04-09",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423535",
+					"name": "Zaphod Beeblebrox",
+					"email": "captain@heartofgold.com",
+					"notes": "Felt like I was talking to more than one person",
+					"country": null,
+					"created": "1979-10-12",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			}
+		],
+		"Merge13": [
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423534",
+					"name": "Max Sendak",
+					"email": "info@in-and-out-of-weeks.org",
+					"notes": "Keeps rolling his terrible eyes",
+					"country": "US",
+					"created": "1963-04-09",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423535",
+					"name": "Zaphod Beeblebrox",
+					"email": "captain@heartofgold.com",
+					"notes": "Felt like I was talking to more than one person",
+					"country": null,
+					"created": "1979-10-12",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423534",
+					"name": "Max Sendak",
+					"email": "info@in-and-out-of-weeks.org",
+					"notes": "Keeps rolling his terrible eyes",
+					"country": "US",
+					"created": "1963-04-09",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423535",
+					"name": "Zaphod Beeblebrox",
+					"email": "captain@heartofgold.com",
+					"notes": "Felt like I was talking to more than one person",
+					"country": null,
+					"created": "1979-10-12",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
+					"nameA": "A"
+				}
+			}
+		],
+		"Merge12": [
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423534",
+					"name": "Max Sendak",
+					"email": "info@in-and-out-of-weeks.org",
+					"notes": "Keeps rolling his terrible eyes",
+					"country": "US",
+					"created": "1963-04-09",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423535",
+					"name": "Zaphod Beeblebrox",
+					"email": "captain@heartofgold.com",
+					"notes": "Felt like I was talking to more than one person",
+					"country": null,
+					"created": "1979-10-12",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423534",
+					"name": "Max Sendak",
+					"email": "info@in-and-out-of-weeks.org",
+					"notes": "Keeps rolling his terrible eyes",
+					"country": "US",
+					"created": "1963-04-09",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423535",
+					"name": "Zaphod Beeblebrox",
+					"email": "captain@heartofgold.com",
+					"notes": "Felt like I was talking to more than one person",
+					"country": null,
+					"created": "1979-10-12",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
+					"nameB": "B"
+				}
+			}
+		],
+		"Merge16": [
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423534",
+					"name": "Max Sendak",
+					"email": "info@in-and-out-of-weeks.org",
+					"notes": "Keeps rolling his terrible eyes",
+					"country": "US",
+					"created": "1963-04-09",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423535",
+					"name": "Zaphod Beeblebrox",
+					"email": "captain@heartofgold.com",
+					"notes": "Felt like I was talking to more than one person",
+					"country": null,
+					"created": "1979-10-12",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
+					"nameB": "B"
+				}
+			}
+		],
+		"Merge17": [
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423534",
+					"name": "Max Sendak",
+					"email": "info@in-and-out-of-weeks.org",
+					"notes": "Keeps rolling his terrible eyes",
+					"country": "US",
+					"created": "1963-04-09",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423535",
+					"name": "Zaphod Beeblebrox",
+					"email": "captain@heartofgold.com",
+					"notes": "Felt like I was talking to more than one person",
+					"country": null,
+					"created": "1979-10-12",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
+					"nameA": "A"
+				}
+			}
+		],
+		"Merge22": [
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423534",
+					"name": "Max Sendak",
+					"email": "info@in-and-out-of-weeks.org",
+					"notes": "Keeps rolling his terrible eyes",
+					"country": "US",
+					"created": "1963-04-09",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423535",
+					"name": "Zaphod Beeblebrox",
+					"email": "captain@heartofgold.com",
+					"notes": "Felt like I was talking to more than one person",
+					"country": null,
+					"created": "1979-10-12",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
+					"nameA": "A"
+				}
+			}
+		],
+		"Merge23": [
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423534",
+					"name": "Max Sendak",
+					"email": "info@in-and-out-of-weeks.org",
+					"notes": "Keeps rolling his terrible eyes",
+					"country": "US",
+					"created": "1963-04-09",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423535",
+					"name": "Zaphod Beeblebrox",
+					"email": "captain@heartofgold.com",
+					"notes": "Felt like I was talking to more than one person",
+					"country": null,
+					"created": "1979-10-12",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
+					"nameB": "B"
+				}
+			}
+		]
+	},
+	"connections": {
+		"Start": {
+			"main": [
+				[
+					{
+						"node": "Customer Datastore (n8n training)",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"IF": {
+			"main": [
+				[
+					{
+						"node": "Set1A",
+						"type": "main",
+						"index": 0
+					}
+				],
+				[
+					{
+						"node": "Set1B",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Customer Datastore (n8n training)": {
+			"main": [
+				[
+					{
+						"node": "IF",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Set2A",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Set2B",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Set1B": {
+			"main": [
+				[
+					{
+						"node": "Merge",
+						"type": "main",
+						"index": 1
+					},
+					{
+						"node": "Merge1",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Merge4",
+						"type": "main",
+						"index": 1
+					},
+					{
+						"node": "Merge3",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Merge2",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Merge5",
+						"type": "main",
+						"index": 1
+					},
+					{
+						"node": "Merge6",
+						"type": "main",
+						"index": 1
+					},
+					{
+						"node": "Merge8",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Merge10",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Merge9",
+						"type": "main",
+						"index": 1
+					},
+					{
+						"node": "Merge7",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Merge11",
+						"type": "main",
+						"index": 1
+					}
+				]
+			]
+		},
+		"Set1A": {
+			"main": [
+				[
+					{
+						"node": "Merge",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Merge1",
+						"type": "main",
+						"index": 1
+					},
+					{
+						"node": "Merge3",
+						"type": "main",
+						"index": 1
+					},
+					{
+						"node": "Merge4",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Merge2",
+						"type": "main",
+						"index": 1
+					},
+					{
+						"node": "Merge5",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Merge6",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Merge8",
+						"type": "main",
+						"index": 1
+					},
+					{
+						"node": "Merge10",
+						"type": "main",
+						"index": 1
+					},
+					{
+						"node": "Merge9",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Merge7",
+						"type": "main",
+						"index": 1
+					},
+					{
+						"node": "Merge11",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Set2A": {
+			"main": [
+				[
+					{
+						"node": "Merge12",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Merge13",
+						"type": "main",
+						"index": 1
+					},
+					{
+						"node": "Merge14",
+						"type": "main",
+						"index": 1
+					},
+					{
+						"node": "Merge15",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Merge16",
+						"type": "main",
+						"index": 1
+					},
+					{
+						"node": "Merge17",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Merge18",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Merge19",
+						"type": "main",
+						"index": 1
+					},
+					{
+						"node": "Merge21",
+						"type": "main",
+						"index": 1
+					},
+					{
+						"node": "Merge20",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Merge22",
+						"type": "main",
+						"index": 1
+					},
+					{
+						"node": "Merge23",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Set2B": {
+			"main": [
+				[
+					{
+						"node": "Merge12",
+						"type": "main",
+						"index": 1
+					},
+					{
+						"node": "Merge13",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Merge15",
+						"type": "main",
+						"index": 1
+					},
+					{
+						"node": "Merge14",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Merge16",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Merge17",
+						"type": "main",
+						"index": 1
+					},
+					{
+						"node": "Merge18",
+						"type": "main",
+						"index": 1
+					},
+					{
+						"node": "Merge19",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Merge21",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Merge20",
+						"type": "main",
+						"index": 1
+					},
+					{
+						"node": "Merge22",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Merge23",
+						"type": "main",
+						"index": 1
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {},
+	"versionId": "4548f6c2-c043-4184-946d-0a6a89112ef1",
+	"id": "1108",
+	"meta": {
+		"instanceId": "021d3c82ba2d3bc090cbf4fc81c9312668bcc34297e022bb3438c5c88a43a5ff"
+	},
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Merge/test/node/workflow.mixed.not.forceInputNodeExecution.json b/packages/nodes-base/nodes/Merge/test/node/workflow.mixed.not.forceInputNodeExecution.json
new file mode 100644
index 0000000000000..5517b02687a59
--- /dev/null
+++ b/packages/nodes-base/nodes/Merge/test/node/workflow.mixed.not.forceInputNodeExecution.json
@@ -0,0 +1,2378 @@
+{
+	"name": "My workflow 89",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "6a251178-c1c2-4377-9df0-08a5bb218f11",
+			"name": "Start",
+			"type": "n8n-nodes-base.start",
+			"typeVersion": 1,
+			"position": [-140, 480]
+		},
+		{
+			"parameters": {
+				"conditions": {
+					"string": [
+						{
+							"value1": "={{ $json[\"test\"] }}",
+							"value2": "b"
+						}
+					]
+				}
+			},
+			"id": "b8b9540e-d7e3-4e12-92b2-4bf124116217",
+			"name": "IF",
+			"type": "n8n-nodes-base.if",
+			"typeVersion": 1,
+			"position": [320, 20]
+		},
+		{
+			"parameters": {},
+			"id": "0cc8ce9e-6c16-4fc9-a1b4-589a33dca5e8",
+			"name": "Merge",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2.1,
+			"position": [1080, 100]
+		},
+		{
+			"parameters": {},
+			"id": "5ba18ff2-a5b4-4515-a055-1c26fe7e5c02",
+			"name": "Merge1",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2.1,
+			"position": [820, 100]
+		},
+		{
+			"parameters": {
+				"mode": "combine",
+				"combinationMode": "mergeByPosition",
+				"options": {}
+			},
+			"id": "cba07480-4ad6-4238-b786-61bacf7660f4",
+			"name": "Merge3",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2.1,
+			"position": [820, -60]
+		},
+		{
+			"parameters": {
+				"mode": "combine",
+				"combinationMode": "mergeByPosition",
+				"options": {}
+			},
+			"id": "6f6b87fa-2c63-46ab-9f50-d26a376fc4b4",
+			"name": "Merge4",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2.1,
+			"position": [1080, -60]
+		},
+		{
+			"parameters": {
+				"operation": "getAllPeople"
+			},
+			"id": "fa7d5e97-7809-4065-9b6e-d47892c47c91",
+			"name": "Customer Datastore (n8n training)",
+			"type": "n8n-nodes-base.n8nTrainingCustomerDatastore",
+			"typeVersion": 1,
+			"position": [80, 480]
+		},
+		{
+			"parameters": {
+				"mode": "chooseBranch"
+			},
+			"id": "e4aef8cb-3733-43c5-a615-0d1e64393316",
+			"name": "Merge2",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2.1,
+			"position": [820, 280]
+		},
+		{
+			"parameters": {
+				"mode": "chooseBranch"
+			},
+			"id": "10c4f897-503b-4fdc-93c8-577bad12d8f0",
+			"name": "Merge5",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2.1,
+			"position": [1080, 280]
+		},
+		{
+			"parameters": {
+				"values": {
+					"string": [
+						{
+							"name": "nameB",
+							"value": "B"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "cfbe8fe8-cc82-42b8-a24f-c584a83a274e",
+			"name": "Set1B",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 2,
+			"position": [560, 100]
+		},
+		{
+			"parameters": {
+				"values": {
+					"string": [
+						{
+							"name": "nameA",
+							"value": "A"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "a77facf7-c0fa-453b-a9a7-66c39d7bbe8c",
+			"name": "Set1A",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 2,
+			"position": [560, -40]
+		},
+		{
+			"parameters": {
+				"mode": "combine",
+				"mergeByFields": {
+					"values": [
+						{
+							"field1": "id",
+							"field2": "id"
+						}
+					]
+				},
+				"joinMode": "keepEverything",
+				"options": {}
+			},
+			"id": "aafbba65-a18d-43b8-8150-88c300992f1d",
+			"name": "Merge6",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2.1,
+			"position": [1080, -220]
+		},
+		{
+			"parameters": {
+				"mode": "combine",
+				"mergeByFields": {
+					"values": [
+						{
+							"field1": "id",
+							"field2": "id"
+						}
+					]
+				},
+				"joinMode": "keepEverything",
+				"options": {}
+			},
+			"id": "9098d926-6006-4aed-ad5d-8128128ce6dc",
+			"name": "Merge8",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2.1,
+			"position": [820, -220]
+		},
+		{
+			"parameters": {
+				"mode": "combine",
+				"combinationMode": "multiplex",
+				"options": {}
+			},
+			"id": "eeece670-291f-4c50-977a-6f3608e8b815",
+			"name": "Merge9",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2.1,
+			"position": [1080, -380]
+		},
+		{
+			"parameters": {
+				"mode": "combine",
+				"combinationMode": "multiplex",
+				"options": {}
+			},
+			"id": "c5ddf991-a05f-441d-9fdf-d4ba0db55894",
+			"name": "Merge10",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2.1,
+			"position": [820, -380]
+		},
+		{
+			"parameters": {
+				"mode": "chooseBranch",
+				"output": "input2"
+			},
+			"id": "2bbdfe57-5541-4634-922b-230b03394ee7",
+			"name": "Merge7",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2.1,
+			"position": [820, 460]
+		},
+		{
+			"parameters": {
+				"mode": "chooseBranch",
+				"output": "input2"
+			},
+			"id": "fbf20a2d-4d08-4302-8289-c0149d5d804f",
+			"name": "Merge11",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2.1,
+			"position": [1080, 460]
+		},
+		{
+			"parameters": {},
+			"id": "9729a369-5bc7-49c7-9156-1cef519c2744",
+			"name": "Merge12",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2.1,
+			"position": [1080, 1200]
+		},
+		{
+			"parameters": {},
+			"id": "068c9d3c-f186-4b00-9d96-1de60ce7a92a",
+			"name": "Merge13",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2.1,
+			"position": [820, 1200]
+		},
+		{
+			"parameters": {
+				"mode": "combine",
+				"combinationMode": "mergeByPosition",
+				"options": {}
+			},
+			"id": "6d2de385-9e01-416b-b9b9-948c1ba77e4f",
+			"name": "Merge14",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2.1,
+			"position": [820, 1040]
+		},
+		{
+			"parameters": {
+				"mode": "combine",
+				"combinationMode": "mergeByPosition",
+				"options": {}
+			},
+			"id": "d4b34831-3757-42b7-93e0-53630a46b734",
+			"name": "Merge15",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2.1,
+			"position": [1080, 1040]
+		},
+		{
+			"parameters": {
+				"mode": "chooseBranch"
+			},
+			"id": "c51a1ec8-d104-4803-9eb1-83630166c749",
+			"name": "Merge16",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2.1,
+			"position": [820, 1380]
+		},
+		{
+			"parameters": {
+				"mode": "chooseBranch"
+			},
+			"id": "af935dce-fc44-4075-b3c6-4629fe796f16",
+			"name": "Merge17",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2.1,
+			"position": [1080, 1380]
+		},
+		{
+			"parameters": {
+				"mode": "combine",
+				"mergeByFields": {
+					"values": [
+						{
+							"field1": "id",
+							"field2": "id"
+						}
+					]
+				},
+				"joinMode": "keepEverything",
+				"options": {}
+			},
+			"id": "bf586064-63aa-4f0e-9fad-c5e97fa23fb8",
+			"name": "Merge18",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2.1,
+			"position": [1080, 880]
+		},
+		{
+			"parameters": {
+				"mode": "combine",
+				"mergeByFields": {
+					"values": [
+						{
+							"field1": "id",
+							"field2": "id"
+						}
+					]
+				},
+				"joinMode": "keepEverything",
+				"options": {}
+			},
+			"id": "9908bca5-067a-4184-8333-2e48f74f34a1",
+			"name": "Merge19",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2.1,
+			"position": [820, 880]
+		},
+		{
+			"parameters": {
+				"mode": "combine",
+				"combinationMode": "multiplex",
+				"options": {}
+			},
+			"id": "5fcdc9b3-a0c6-424e-a325-d0e83e27e4f1",
+			"name": "Merge20",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2.1,
+			"position": [1080, 720]
+		},
+		{
+			"parameters": {
+				"mode": "combine",
+				"combinationMode": "multiplex",
+				"options": {}
+			},
+			"id": "5a8d7598-e88b-4e81-ac57-5c3b6eadfe5a",
+			"name": "Merge21",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2.1,
+			"position": [820, 720]
+		},
+		{
+			"parameters": {
+				"mode": "chooseBranch",
+				"output": "input2"
+			},
+			"id": "32797fb4-ed6d-4127-823f-982c72d859a8",
+			"name": "Merge22",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2.1,
+			"position": [820, 1560]
+		},
+		{
+			"parameters": {
+				"mode": "chooseBranch",
+				"output": "input2"
+			},
+			"id": "5299797d-2aa8-4f6b-a5d8-2a3c2bb0295d",
+			"name": "Merge23",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2.1,
+			"position": [1080, 1560]
+		},
+		{
+			"parameters": {
+				"values": {
+					"string": [
+						{
+							"name": "nameA",
+							"value": "A"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "eea959a8-3d62-47a8-a752-717302341f8c",
+			"name": "Set2A",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 2,
+			"position": [560, 1060]
+		},
+		{
+			"parameters": {
+				"values": {
+					"string": [
+						{
+							"name": "nameB",
+							"value": "B"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "cb4f703a-a027-4beb-8e47-81bf15875678",
+			"name": "Set2B",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 2,
+			"position": [560, 1200]
+		}
+	],
+	"pinData": {
+		"Merge21": [
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423534",
+					"name": "Max Sendak",
+					"email": "info@in-and-out-of-weeks.org",
+					"notes": "Keeps rolling his terrible eyes",
+					"country": "US",
+					"created": "1963-04-09",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423535",
+					"name": "Zaphod Beeblebrox",
+					"email": "captain@heartofgold.com",
+					"notes": "Felt like I was talking to more than one person",
+					"country": null,
+					"created": "1979-10-12",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423534",
+					"name": "Max Sendak",
+					"email": "info@in-and-out-of-weeks.org",
+					"notes": "Keeps rolling his terrible eyes",
+					"country": "US",
+					"created": "1963-04-09",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423535",
+					"name": "Zaphod Beeblebrox",
+					"email": "captain@heartofgold.com",
+					"notes": "Felt like I was talking to more than one person",
+					"country": null,
+					"created": "1979-10-12",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423534",
+					"name": "Max Sendak",
+					"email": "info@in-and-out-of-weeks.org",
+					"notes": "Keeps rolling his terrible eyes",
+					"country": "US",
+					"created": "1963-04-09",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423535",
+					"name": "Zaphod Beeblebrox",
+					"email": "captain@heartofgold.com",
+					"notes": "Felt like I was talking to more than one person",
+					"country": null,
+					"created": "1979-10-12",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423534",
+					"name": "Max Sendak",
+					"email": "info@in-and-out-of-weeks.org",
+					"notes": "Keeps rolling his terrible eyes",
+					"country": "US",
+					"created": "1963-04-09",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423535",
+					"name": "Zaphod Beeblebrox",
+					"email": "captain@heartofgold.com",
+					"notes": "Felt like I was talking to more than one person",
+					"country": null,
+					"created": "1979-10-12",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423534",
+					"name": "Max Sendak",
+					"email": "info@in-and-out-of-weeks.org",
+					"notes": "Keeps rolling his terrible eyes",
+					"country": "US",
+					"created": "1963-04-09",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423535",
+					"name": "Zaphod Beeblebrox",
+					"email": "captain@heartofgold.com",
+					"notes": "Felt like I was talking to more than one person",
+					"country": null,
+					"created": "1979-10-12",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			}
+		],
+		"Merge20": [
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423534",
+					"name": "Max Sendak",
+					"email": "info@in-and-out-of-weeks.org",
+					"notes": "Keeps rolling his terrible eyes",
+					"country": "US",
+					"created": "1963-04-09",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423535",
+					"name": "Zaphod Beeblebrox",
+					"email": "captain@heartofgold.com",
+					"notes": "Felt like I was talking to more than one person",
+					"country": null,
+					"created": "1979-10-12",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423534",
+					"name": "Max Sendak",
+					"email": "info@in-and-out-of-weeks.org",
+					"notes": "Keeps rolling his terrible eyes",
+					"country": "US",
+					"created": "1963-04-09",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423535",
+					"name": "Zaphod Beeblebrox",
+					"email": "captain@heartofgold.com",
+					"notes": "Felt like I was talking to more than one person",
+					"country": null,
+					"created": "1979-10-12",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423534",
+					"name": "Max Sendak",
+					"email": "info@in-and-out-of-weeks.org",
+					"notes": "Keeps rolling his terrible eyes",
+					"country": "US",
+					"created": "1963-04-09",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423535",
+					"name": "Zaphod Beeblebrox",
+					"email": "captain@heartofgold.com",
+					"notes": "Felt like I was talking to more than one person",
+					"country": null,
+					"created": "1979-10-12",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423534",
+					"name": "Max Sendak",
+					"email": "info@in-and-out-of-weeks.org",
+					"notes": "Keeps rolling his terrible eyes",
+					"country": "US",
+					"created": "1963-04-09",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423535",
+					"name": "Zaphod Beeblebrox",
+					"email": "captain@heartofgold.com",
+					"notes": "Felt like I was talking to more than one person",
+					"country": null,
+					"created": "1979-10-12",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423534",
+					"name": "Max Sendak",
+					"email": "info@in-and-out-of-weeks.org",
+					"notes": "Keeps rolling his terrible eyes",
+					"country": "US",
+					"created": "1963-04-09",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423535",
+					"name": "Zaphod Beeblebrox",
+					"email": "captain@heartofgold.com",
+					"notes": "Felt like I was talking to more than one person",
+					"country": null,
+					"created": "1979-10-12",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			}
+		],
+		"Merge19": [
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423534",
+					"name": "Max Sendak",
+					"email": "info@in-and-out-of-weeks.org",
+					"notes": "Keeps rolling his terrible eyes",
+					"country": "US",
+					"created": "1963-04-09",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423535",
+					"name": "Zaphod Beeblebrox",
+					"email": "captain@heartofgold.com",
+					"notes": "Felt like I was talking to more than one person",
+					"country": null,
+					"created": "1979-10-12",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			}
+		],
+		"Merge18": [
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423534",
+					"name": "Max Sendak",
+					"email": "info@in-and-out-of-weeks.org",
+					"notes": "Keeps rolling his terrible eyes",
+					"country": "US",
+					"created": "1963-04-09",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423535",
+					"name": "Zaphod Beeblebrox",
+					"email": "captain@heartofgold.com",
+					"notes": "Felt like I was talking to more than one person",
+					"country": null,
+					"created": "1979-10-12",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			}
+		],
+		"Merge14": [
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423534",
+					"name": "Max Sendak",
+					"email": "info@in-and-out-of-weeks.org",
+					"notes": "Keeps rolling his terrible eyes",
+					"country": "US",
+					"created": "1963-04-09",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423535",
+					"name": "Zaphod Beeblebrox",
+					"email": "captain@heartofgold.com",
+					"notes": "Felt like I was talking to more than one person",
+					"country": null,
+					"created": "1979-10-12",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
+					"nameB": "B",
+					"nameA": "A"
+				}
+			}
+		],
+		"Merge15": [
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423534",
+					"name": "Max Sendak",
+					"email": "info@in-and-out-of-weeks.org",
+					"notes": "Keeps rolling his terrible eyes",
+					"country": "US",
+					"created": "1963-04-09",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423535",
+					"name": "Zaphod Beeblebrox",
+					"email": "captain@heartofgold.com",
+					"notes": "Felt like I was talking to more than one person",
+					"country": null,
+					"created": "1979-10-12",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
+					"nameA": "A",
+					"nameB": "B"
+				}
+			}
+		],
+		"Merge13": [
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423534",
+					"name": "Max Sendak",
+					"email": "info@in-and-out-of-weeks.org",
+					"notes": "Keeps rolling his terrible eyes",
+					"country": "US",
+					"created": "1963-04-09",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423535",
+					"name": "Zaphod Beeblebrox",
+					"email": "captain@heartofgold.com",
+					"notes": "Felt like I was talking to more than one person",
+					"country": null,
+					"created": "1979-10-12",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423534",
+					"name": "Max Sendak",
+					"email": "info@in-and-out-of-weeks.org",
+					"notes": "Keeps rolling his terrible eyes",
+					"country": "US",
+					"created": "1963-04-09",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423535",
+					"name": "Zaphod Beeblebrox",
+					"email": "captain@heartofgold.com",
+					"notes": "Felt like I was talking to more than one person",
+					"country": null,
+					"created": "1979-10-12",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
+					"nameA": "A"
+				}
+			}
+		],
+		"Merge12": [
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423534",
+					"name": "Max Sendak",
+					"email": "info@in-and-out-of-weeks.org",
+					"notes": "Keeps rolling his terrible eyes",
+					"country": "US",
+					"created": "1963-04-09",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423535",
+					"name": "Zaphod Beeblebrox",
+					"email": "captain@heartofgold.com",
+					"notes": "Felt like I was talking to more than one person",
+					"country": null,
+					"created": "1979-10-12",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423534",
+					"name": "Max Sendak",
+					"email": "info@in-and-out-of-weeks.org",
+					"notes": "Keeps rolling his terrible eyes",
+					"country": "US",
+					"created": "1963-04-09",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423535",
+					"name": "Zaphod Beeblebrox",
+					"email": "captain@heartofgold.com",
+					"notes": "Felt like I was talking to more than one person",
+					"country": null,
+					"created": "1979-10-12",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
+					"nameB": "B"
+				}
+			}
+		],
+		"Merge16": [
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423534",
+					"name": "Max Sendak",
+					"email": "info@in-and-out-of-weeks.org",
+					"notes": "Keeps rolling his terrible eyes",
+					"country": "US",
+					"created": "1963-04-09",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423535",
+					"name": "Zaphod Beeblebrox",
+					"email": "captain@heartofgold.com",
+					"notes": "Felt like I was talking to more than one person",
+					"country": null,
+					"created": "1979-10-12",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
+					"nameB": "B"
+				}
+			}
+		],
+		"Merge17": [
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423534",
+					"name": "Max Sendak",
+					"email": "info@in-and-out-of-weeks.org",
+					"notes": "Keeps rolling his terrible eyes",
+					"country": "US",
+					"created": "1963-04-09",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423535",
+					"name": "Zaphod Beeblebrox",
+					"email": "captain@heartofgold.com",
+					"notes": "Felt like I was talking to more than one person",
+					"country": null,
+					"created": "1979-10-12",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
+					"nameA": "A"
+				}
+			}
+		],
+		"Merge22": [
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423534",
+					"name": "Max Sendak",
+					"email": "info@in-and-out-of-weeks.org",
+					"notes": "Keeps rolling his terrible eyes",
+					"country": "US",
+					"created": "1963-04-09",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423535",
+					"name": "Zaphod Beeblebrox",
+					"email": "captain@heartofgold.com",
+					"notes": "Felt like I was talking to more than one person",
+					"country": null,
+					"created": "1979-10-12",
+					"nameA": "A"
+				}
+			},
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
+					"nameA": "A"
+				}
+			}
+		],
+		"Merge23": [
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423534",
+					"name": "Max Sendak",
+					"email": "info@in-and-out-of-weeks.org",
+					"notes": "Keeps rolling his terrible eyes",
+					"country": "US",
+					"created": "1963-04-09",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423535",
+					"name": "Zaphod Beeblebrox",
+					"email": "captain@heartofgold.com",
+					"notes": "Felt like I was talking to more than one person",
+					"country": null,
+					"created": "1979-10-12",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
+					"nameB": "B"
+				}
+			}
+		],
+		"Merge8": [
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423534",
+					"name": "Max Sendak",
+					"email": "info@in-and-out-of-weeks.org",
+					"notes": "Keeps rolling his terrible eyes",
+					"country": "US",
+					"created": "1963-04-09",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423535",
+					"name": "Zaphod Beeblebrox",
+					"email": "captain@heartofgold.com",
+					"notes": "Felt like I was talking to more than one person",
+					"country": null,
+					"created": "1979-10-12",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
+					"nameB": "B"
+				}
+			}
+		],
+		"Merge6": [
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423534",
+					"name": "Max Sendak",
+					"email": "info@in-and-out-of-weeks.org",
+					"notes": "Keeps rolling his terrible eyes",
+					"country": "US",
+					"created": "1963-04-09",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423535",
+					"name": "Zaphod Beeblebrox",
+					"email": "captain@heartofgold.com",
+					"notes": "Felt like I was talking to more than one person",
+					"country": null,
+					"created": "1979-10-12",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
+					"nameB": "B"
+				}
+			}
+		],
+		"Merge3": [
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423534",
+					"name": "Max Sendak",
+					"email": "info@in-and-out-of-weeks.org",
+					"notes": "Keeps rolling his terrible eyes",
+					"country": "US",
+					"created": "1963-04-09",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423535",
+					"name": "Zaphod Beeblebrox",
+					"email": "captain@heartofgold.com",
+					"notes": "Felt like I was talking to more than one person",
+					"country": null,
+					"created": "1979-10-12",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
+					"nameB": "B"
+				}
+			}
+		],
+		"Merge4": [
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423534",
+					"name": "Max Sendak",
+					"email": "info@in-and-out-of-weeks.org",
+					"notes": "Keeps rolling his terrible eyes",
+					"country": "US",
+					"created": "1963-04-09",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423535",
+					"name": "Zaphod Beeblebrox",
+					"email": "captain@heartofgold.com",
+					"notes": "Felt like I was talking to more than one person",
+					"country": null,
+					"created": "1979-10-12",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
+					"nameB": "B"
+				}
+			}
+		],
+		"Merge1": [
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423534",
+					"name": "Max Sendak",
+					"email": "info@in-and-out-of-weeks.org",
+					"notes": "Keeps rolling his terrible eyes",
+					"country": "US",
+					"created": "1963-04-09",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423535",
+					"name": "Zaphod Beeblebrox",
+					"email": "captain@heartofgold.com",
+					"notes": "Felt like I was talking to more than one person",
+					"country": null,
+					"created": "1979-10-12",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
+					"nameB": "B"
+				}
+			}
+		],
+		"Merge": [
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423534",
+					"name": "Max Sendak",
+					"email": "info@in-and-out-of-weeks.org",
+					"notes": "Keeps rolling his terrible eyes",
+					"country": "US",
+					"created": "1963-04-09",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423535",
+					"name": "Zaphod Beeblebrox",
+					"email": "captain@heartofgold.com",
+					"notes": "Felt like I was talking to more than one person",
+					"country": null,
+					"created": "1979-10-12",
+					"nameB": "B"
+				}
+			},
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
+					"nameB": "B"
+				}
+			}
+		]
+	},
+	"connections": {
+		"Start": {
+			"main": [
+				[
+					{
+						"node": "Customer Datastore (n8n training)",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"IF": {
+			"main": [
+				[
+					{
+						"node": "Set1A",
+						"type": "main",
+						"index": 0
+					}
+				],
+				[
+					{
+						"node": "Set1B",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Customer Datastore (n8n training)": {
+			"main": [
+				[
+					{
+						"node": "IF",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Set2A",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Set2B",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Set1B": {
+			"main": [
+				[
+					{
+						"node": "Merge",
+						"type": "main",
+						"index": 1
+					},
+					{
+						"node": "Merge1",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Merge4",
+						"type": "main",
+						"index": 1
+					},
+					{
+						"node": "Merge3",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Merge2",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Merge5",
+						"type": "main",
+						"index": 1
+					},
+					{
+						"node": "Merge6",
+						"type": "main",
+						"index": 1
+					},
+					{
+						"node": "Merge8",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Merge10",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Merge9",
+						"type": "main",
+						"index": 1
+					},
+					{
+						"node": "Merge7",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Merge11",
+						"type": "main",
+						"index": 1
+					}
+				]
+			]
+		},
+		"Set1A": {
+			"main": [
+				[
+					{
+						"node": "Merge",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Merge1",
+						"type": "main",
+						"index": 1
+					},
+					{
+						"node": "Merge3",
+						"type": "main",
+						"index": 1
+					},
+					{
+						"node": "Merge4",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Merge2",
+						"type": "main",
+						"index": 1
+					},
+					{
+						"node": "Merge5",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Merge6",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Merge8",
+						"type": "main",
+						"index": 1
+					},
+					{
+						"node": "Merge10",
+						"type": "main",
+						"index": 1
+					},
+					{
+						"node": "Merge9",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Merge7",
+						"type": "main",
+						"index": 1
+					},
+					{
+						"node": "Merge11",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Set2A": {
+			"main": [
+				[
+					{
+						"node": "Merge12",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Merge13",
+						"type": "main",
+						"index": 1
+					},
+					{
+						"node": "Merge14",
+						"type": "main",
+						"index": 1
+					},
+					{
+						"node": "Merge15",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Merge16",
+						"type": "main",
+						"index": 1
+					},
+					{
+						"node": "Merge17",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Merge18",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Merge19",
+						"type": "main",
+						"index": 1
+					},
+					{
+						"node": "Merge21",
+						"type": "main",
+						"index": 1
+					},
+					{
+						"node": "Merge20",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Merge22",
+						"type": "main",
+						"index": 1
+					},
+					{
+						"node": "Merge23",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Set2B": {
+			"main": [
+				[
+					{
+						"node": "Merge12",
+						"type": "main",
+						"index": 1
+					},
+					{
+						"node": "Merge13",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Merge15",
+						"type": "main",
+						"index": 1
+					},
+					{
+						"node": "Merge14",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Merge16",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Merge17",
+						"type": "main",
+						"index": 1
+					},
+					{
+						"node": "Merge18",
+						"type": "main",
+						"index": 1
+					},
+					{
+						"node": "Merge19",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Merge21",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Merge20",
+						"type": "main",
+						"index": 1
+					},
+					{
+						"node": "Merge22",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Merge23",
+						"type": "main",
+						"index": 1
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "6b37555c-fd78-4135-9c59-4912a71e18db",
+	"id": "1107",
+	"meta": {
+		"instanceId": "021d3c82ba2d3bc090cbf4fc81c9312668bcc34297e022bb3438c5c88a43a5ff"
+	},
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Merge/test/node/workflow.update_2_1.json b/packages/nodes-base/nodes/Merge/test/node/workflow.update_2_1.json
new file mode 100644
index 0000000000000..a728473e27c82
--- /dev/null
+++ b/packages/nodes-base/nodes/Merge/test/node/workflow.update_2_1.json
@@ -0,0 +1,201 @@
+{
+	"name": "do not error on missing keys",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "c7c0cf66-790a-4da7-81c8-ba9e4bbcec9a",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [720, 300]
+		},
+		{
+			"parameters": {
+				"jsCode": "return [\n  {id: 1},\n  {id: 2},\n  {id: 3},\n  {id: 4},\n];"
+			},
+			"id": "cec18624-ced0-4de1-8987-d4b184b136b9",
+			"name": "Code",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [1020, 200]
+		},
+		{
+			"parameters": {
+				"jsCode": "return [\n];"
+			},
+			"id": "754d549c-82ce-4625-ba2b-6f8edcbf715e",
+			"name": "Code1",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [1020, 400]
+		},
+		{
+			"parameters": {},
+			"id": "551ed574-607a-4d98-9b06-350df92c805e",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1540, 200]
+		},
+		{
+			"parameters": {},
+			"id": "00e75760-d88e-413c-b276-c759db72411f",
+			"name": "No Operation, do nothing1",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1540, 380]
+		},
+		{
+			"parameters": {
+				"mode": "combine",
+				"mergeByFields": {
+					"values": [
+						{
+							"field1": "idd",
+							"field2": "idd"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "2d412290-4c43-40a6-be78-946602749aa1",
+			"name": "Merge1",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2.1,
+			"position": [1340, 520],
+			"alwaysOutputData": true
+		},
+		{
+			"parameters": {
+				"mode": "combine",
+				"mergeByFields": {
+					"values": [
+						{
+							"field1": "idd",
+							"field2": "idd"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "b6f05b31-3ca0-48c4-a5ec-c7f81dc7957f",
+			"name": "Merge2",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2,
+			"position": [1320, 160],
+			"continueOnFail": true
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing1": [
+			{
+				"json": {}
+			}
+		],
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"id": 1
+				}
+			},
+			{
+				"json": {
+					"id": 2
+				}
+			},
+			{
+				"json": {
+					"id": 3
+				}
+			},
+			{
+				"json": {
+					"id": 4
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Code",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Code1",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code": {
+			"main": [
+				[
+					{
+						"node": "Merge1",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Merge2",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code1": {
+			"main": [
+				[
+					{
+						"node": "Merge1",
+						"type": "main",
+						"index": 1
+					},
+					{
+						"node": "Merge2",
+						"type": "main",
+						"index": 1
+					}
+				]
+			]
+		},
+		"No Operation, do nothing1": {
+			"main": [[]]
+		},
+		"Merge1": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing1",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Merge2": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {},
+	"versionId": "d0ebcbdd-b57d-495e-8f84-b9500d25c384",
+	"id": "8",
+	"meta": {
+		"instanceId": "6ebec4953fe56f1c009e7c3b107578b375137523af057073c0b5da17350651bd"
+	},
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Merge/v1/MergeV1.node.ts b/packages/nodes-base/nodes/Merge/v1/MergeV1.node.ts
index 1e928c6ce610e..0309df1d44cb1 100644
--- a/packages/nodes-base/nodes/Merge/v1/MergeV1.node.ts
+++ b/packages/nodes-base/nodes/Merge/v1/MergeV1.node.ts
@@ -1,5 +1,5 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
-import get from 'lodash.get';
+import get from 'lodash/get';
 
 import type {
 	IExecuteFunctions,
@@ -12,200 +12,195 @@ import type {
 } from 'n8n-workflow';
 import { deepCopy } from 'n8n-workflow';
 
-const versionDescription: INodeTypeDescription = {
-	displayName: 'Merge',
-	name: 'merge',
-	icon: 'fa:code-branch',
-	group: ['transform'],
-	version: 1,
-	subtitle: '={{$parameter["mode"]}}',
-	description: 'Merges data of multiple streams once data from both is available',
-	defaults: {
-		name: 'Merge',
-		color: '#00bbcc',
-	},
-	// eslint-disable-next-line n8n-nodes-base/node-class-description-inputs-wrong-regular-node
-	inputs: ['main', 'main'],
-	outputs: ['main'],
-	inputNames: ['Input 1', 'Input 2'],
-	properties: [
-		{
-			displayName: 'Mode',
-			name: 'mode',
-			type: 'options',
-			options: [
-				{
-					name: 'Append',
-					value: 'append',
-					description:
-						'Combines data of both inputs. The output will contain items of input 1 and input 2.',
-				},
-				{
-					name: 'Keep Key Matches',
-					value: 'keepKeyMatches',
-					description: 'Keeps data of input 1 if it does find a match with data of input 2',
-				},
-				{
-					name: 'Merge By Index',
-					value: 'mergeByIndex',
-					description:
-						'Merges data of both inputs. The output will contain items of input 1 merged with data of input 2. Merge happens depending on the index of the items. So first item of input 1 will be merged with first item of input 2 and so on.',
-				},
-				{
-					name: 'Merge By Key',
-					value: 'mergeByKey',
-					description:
-						'Merges data of both inputs. The output will contain items of input 1 merged with data of input 2. Merge happens depending on a defined key.',
-				},
-				{
-					name: 'Multiplex',
-					value: 'multiplex',
-					description:
-						'Merges each value of one input with each value of the other input. The output will contain (m * n) items where (m) and (n) are lengths of the inputs.',
-				},
-				{
-					name: 'Pass-Through',
-					value: 'passThrough',
-					description:
-						'Passes through data of one input. The output will contain only items of the defined input.',
-				},
-				{
-					name: 'Remove Key Matches',
-					value: 'removeKeyMatches',
-					description: 'Keeps data of input 1 if it does NOT find match with data of input 2',
-				},
-				{
-					name: 'Wait',
-					value: 'wait',
-					description:
-						'Waits till data of both inputs is available and will then output a single empty item. Source Nodes must connect to both Input 1 and 2. This node only supports 2 Sources, if you need more Sources, connect multiple Merge nodes in series. This node will not output any data.',
-				},
-			],
-			default: 'append',
-			description: 'How data of branches should be merged',
-		},
-		{
-			displayName: 'Join',
-			name: 'join',
-			type: 'options',
-			displayOptions: {
-				show: {
-					mode: ['mergeByIndex'],
-				},
+import { generatePairedItemData } from '../../../utils/utilities';
+import { oldVersionNotice } from '@utils/descriptions';
+
+export class MergeV1 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			icon: 'fa:code-branch',
+			version: 1,
+			defaults: {
+				name: 'Merge',
+				color: '#00bbcc',
 			},
-			options: [
+			// eslint-disable-next-line n8n-nodes-base/node-class-description-inputs-wrong-regular-node
+			inputs: ['main', 'main'],
+			outputs: ['main'],
+			inputNames: ['Input 1', 'Input 2'],
+			properties: [
+				oldVersionNotice,
 				{
-					name: 'Inner Join',
-					value: 'inner',
-					description:
-						'Merges as many items as both inputs contain. (Example: Input1 = 5 items, Input2 = 3 items | Output will contain 3 items).',
-				},
-				{
-					name: 'Left Join',
-					value: 'left',
-					description:
-						'Merges as many items as first input contains. (Example: Input1 = 3 items, Input2 = 5 items | Output will contain 3 items).',
+					displayName: 'Mode',
+					name: 'mode',
+					type: 'options',
+					options: [
+						{
+							name: 'Append',
+							value: 'append',
+							description:
+								'Combines data of both inputs. The output will contain items of input 1 and input 2.',
+						},
+						{
+							name: 'Keep Key Matches',
+							value: 'keepKeyMatches',
+							description: 'Keeps data of input 1 if it does find a match with data of input 2',
+						},
+						{
+							name: 'Merge By Index',
+							value: 'mergeByIndex',
+							description:
+								'Merges data of both inputs. The output will contain items of input 1 merged with data of input 2. Merge happens depending on the index of the items. So first item of input 1 will be merged with first item of input 2 and so on.',
+						},
+						{
+							name: 'Merge By Key',
+							value: 'mergeByKey',
+							description:
+								'Merges data of both inputs. The output will contain items of input 1 merged with data of input 2. Merge happens depending on a defined key.',
+						},
+						{
+							name: 'Multiplex',
+							value: 'multiplex',
+							description:
+								'Merges each value of one input with each value of the other input. The output will contain (m * n) items where (m) and (n) are lengths of the inputs.',
+						},
+						{
+							name: 'Pass-Through',
+							value: 'passThrough',
+							description:
+								'Passes through data of one input. The output will contain only items of the defined input.',
+						},
+						{
+							name: 'Remove Key Matches',
+							value: 'removeKeyMatches',
+							description: 'Keeps data of input 1 if it does NOT find match with data of input 2',
+						},
+						{
+							name: 'Wait',
+							value: 'wait',
+							description:
+								'Waits till data of both inputs is available and will then output a single empty item. Source Nodes must connect to both Input 1 and 2. This node only supports 2 Sources, if you need more Sources, connect multiple Merge nodes in series. This node will not output any data.',
+						},
+					],
+					default: 'append',
+					description: 'How data of branches should be merged',
 				},
 				{
-					name: 'Outer Join',
-					value: 'outer',
+					displayName: 'Join',
+					name: 'join',
+					type: 'options',
+					displayOptions: {
+						show: {
+							mode: ['mergeByIndex'],
+						},
+					},
+					options: [
+						{
+							name: 'Inner Join',
+							value: 'inner',
+							description:
+								'Merges as many items as both inputs contain. (Example: Input1 = 5 items, Input2 = 3 items | Output will contain 3 items).',
+						},
+						{
+							name: 'Left Join',
+							value: 'left',
+							description:
+								'Merges as many items as first input contains. (Example: Input1 = 3 items, Input2 = 5 items | Output will contain 3 items).',
+						},
+						{
+							name: 'Outer Join',
+							value: 'outer',
+							description:
+								'Merges as many items as input contains with most items. (Example: Input1 = 3 items, Input2 = 5 items | Output will contain 5 items).',
+						},
+					],
+					default: 'left',
 					description:
-						'Merges as many items as input contains with most items. (Example: Input1 = 3 items, Input2 = 5 items | Output will contain 5 items).',
-				},
-			],
-			default: 'left',
-			description:
-				'How many items the output will contain if inputs contain different amount of items',
-		},
-		{
-			displayName: 'Property Input 1',
-			name: 'propertyName1',
-			type: 'string',
-			default: '',
-			hint: 'The name of the field as text (e.g. “id”)',
-			required: true,
-			displayOptions: {
-				show: {
-					mode: ['keepKeyMatches', 'mergeByKey', 'removeKeyMatches'],
-				},
-			},
-			description: 'Name of property which decides which items to merge of input 1',
-		},
-		{
-			displayName: 'Property Input 2',
-			name: 'propertyName2',
-			type: 'string',
-			default: '',
-			hint: 'The name of the field as text (e.g. “id”)',
-			required: true,
-			displayOptions: {
-				show: {
-					mode: ['keepKeyMatches', 'mergeByKey', 'removeKeyMatches'],
-				},
-			},
-			description: 'Name of property which decides which items to merge of input 2',
-		},
-		{
-			displayName: 'Output Data',
-			name: 'output',
-			type: 'options',
-			displayOptions: {
-				show: {
-					mode: ['passThrough'],
-				},
-			},
-			options: [
-				{
-					name: 'Input 1',
-					value: 'input1',
+						'How many items the output will contain if inputs contain different amount of items',
 				},
 				{
-					name: 'Input 2',
-					value: 'input2',
-				},
-			],
-			default: 'input1',
-			description: 'Defines of which input the data should be used as output of node',
-		},
-		{
-			displayName: 'Overwrite',
-			name: 'overwrite',
-			type: 'options',
-			displayOptions: {
-				show: {
-					mode: ['mergeByKey'],
+					displayName: 'Property Input 1',
+					name: 'propertyName1',
+					type: 'string',
+					default: '',
+					hint: 'The name of the field as text (e.g. “id”)',
+					required: true,
+					displayOptions: {
+						show: {
+							mode: ['keepKeyMatches', 'mergeByKey', 'removeKeyMatches'],
+						},
+					},
+					description: 'Name of property which decides which items to merge of input 1',
 				},
-			},
-			options: [
 				{
-					name: 'Always',
-					value: 'always',
-					description: 'Always overwrites everything',
+					displayName: 'Property Input 2',
+					name: 'propertyName2',
+					type: 'string',
+					default: '',
+					hint: 'The name of the field as text (e.g. “id”)',
+					required: true,
+					displayOptions: {
+						show: {
+							mode: ['keepKeyMatches', 'mergeByKey', 'removeKeyMatches'],
+						},
+					},
+					description: 'Name of property which decides which items to merge of input 2',
 				},
 				{
-					name: 'If Blank',
-					value: 'blank',
-					description: 'Overwrites only values of "null", "undefined" or empty string',
+					displayName: 'Output Data',
+					name: 'output',
+					type: 'options',
+					displayOptions: {
+						show: {
+							mode: ['passThrough'],
+						},
+					},
+					options: [
+						{
+							name: 'Input 1',
+							value: 'input1',
+						},
+						{
+							name: 'Input 2',
+							value: 'input2',
+						},
+					],
+					default: 'input1',
+					description: 'Defines of which input the data should be used as output of node',
 				},
 				{
-					name: 'If Missing',
-					value: 'undefined',
-					description: 'Only adds values which do not exist yet',
+					displayName: 'Overwrite',
+					name: 'overwrite',
+					type: 'options',
+					displayOptions: {
+						show: {
+							mode: ['mergeByKey'],
+						},
+					},
+					options: [
+						{
+							name: 'Always',
+							value: 'always',
+							description: 'Always overwrites everything',
+						},
+						{
+							name: 'If Blank',
+							value: 'blank',
+							description: 'Overwrites only values of "null", "undefined" or empty string',
+						},
+						{
+							name: 'If Missing',
+							value: 'undefined',
+							description: 'Only adds values which do not exist yet',
+						},
+					],
+					default: 'always',
+					description: 'Select when to overwrite the values from Input1 with values from Input 2',
 				},
 			],
-			default: 'always',
-			description: 'Select when to overwrite the values from Input1 with values from Input 2',
-		},
-	],
-};
-
-export class MergeV1 implements INodeType {
-	description: INodeTypeDescription;
-
-	constructor(baseDescription: INodeTypeBaseDescription) {
-		this.description = {
-			...baseDescription,
-			...versionDescription,
 		};
 	}
 
@@ -474,7 +469,8 @@ export class MergeV1 implements INodeType {
 				returnData.push.apply(returnData, this.getInputData(1));
 			}
 		} else if (mode === 'wait') {
-			returnData.push({ json: {} });
+			const pairedItem = generatePairedItemData(this.getInputData(0).length);
+			returnData.push({ json: {}, pairedItem });
 		}
 
 		return [returnData];
diff --git a/packages/nodes-base/nodes/Merge/v2/GenericFunctions.ts b/packages/nodes-base/nodes/Merge/v2/GenericFunctions.ts
index a3448fb6787e3..5255ffa3922b8 100644
--- a/packages/nodes-base/nodes/Merge/v2/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Merge/v2/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import { ApplicationError } from 'n8n-workflow';
 import type {
 	GenericValue,
 	IBinaryKeyData,
@@ -6,12 +7,12 @@ import type {
 	IPairedItemData,
 } 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 } from '../../../utils/utilities';
+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';
 
 type PairToMatch = {
 	field1: string;
@@ -132,12 +133,8 @@ export function findMatches(
 	fieldsToMatch: PairToMatch[],
 	options: MatchFieldsOptions,
 ) {
-	let data1 = [...input1];
-	let data2 = [...input2];
-
-	if (options.joinMode === 'enrichInput2') {
-		[data1, data2] = [data2, data1];
-	}
+	const data1 = [...input1];
+	const data2 = [...input2];
 
 	const isEntriesEqual = fuzzyCompare(options.fuzzyCompare as boolean);
 	const disableDotNotation = options.disableDotNotation || false;
@@ -261,14 +258,11 @@ export function mergeMatched(
 
 		let json: IDataObject = {};
 		let binary: IBinaryKeyData = {};
+		let pairedItem: IPairedItemData[] = [];
 
 		if (resolveClash === 'addSuffix') {
-			let suffix1 = '1';
-			let suffix2 = '2';
-
-			if (joinMode === 'enrichInput2') {
-				[suffix1, suffix2] = [suffix2, suffix1];
-			}
+			const suffix1 = '1';
+			const suffix2 = '2';
 
 			[entry] = addSuffixToEntriesKeys([entry], suffix1);
 			matches = addSuffixToEntriesKeys(matches, suffix2);
@@ -278,16 +272,20 @@ export function mergeMatched(
 				{ ...entry.binary },
 				...matches.map((item) => item.binary as IDataObject),
 			);
+			pairedItem = [
+				...preparePairedItemDataArray(entry.pairedItem),
+				...matches.map((item) => preparePairedItemDataArray(item.pairedItem)).flat(),
+			];
 		} else {
-			let preferInput1 = 'preferInput1';
-			let preferInput2 = 'preferInput2';
-
-			if (joinMode === 'enrichInput2') {
-				[preferInput1, preferInput2] = [preferInput2, preferInput1];
-			}
+			const preferInput1 = 'preferInput1';
+			const preferInput2 = 'preferInput2';
 
 			if (resolveClash === undefined) {
-				resolveClash = 'preferInput2';
+				if (joinMode !== 'enrichInput2') {
+					resolveClash = 'preferInput2';
+				} else {
+					resolveClash = 'preferInput1';
+				}
 			}
 
 			if (resolveClash === preferInput1) {
@@ -302,6 +300,12 @@ export function mergeMatched(
 					...restMatches.map((item) => item.binary as IDataObject),
 					entry.binary as IDataObject,
 				);
+
+				pairedItem = [
+					...preparePairedItemDataArray(firstMatch.pairedItem),
+					...restMatches.map((item) => preparePairedItemDataArray(item.pairedItem)).flat(),
+					...preparePairedItemDataArray(entry.pairedItem),
+				];
 			}
 
 			if (resolveClash === preferInput2) {
@@ -310,14 +314,13 @@ export function mergeMatched(
 					{ ...entry.binary },
 					...matches.map((item) => item.binary as IDataObject),
 				);
+				pairedItem = [
+					...preparePairedItemDataArray(entry.pairedItem),
+					...matches.map((item) => preparePairedItemDataArray(item.pairedItem)).flat(),
+				];
 			}
 		}
 
-		const pairedItem = [
-			entry.pairedItem as IPairedItemData,
-			...matches.map((m) => m.pairedItem as IPairedItemData),
-		];
-
 		returnData.push({
 			json,
 			binary,
@@ -330,16 +333,18 @@ export function mergeMatched(
 
 export function checkMatchFieldsInput(data: IDataObject[]) {
 	if (data.length === 1 && data[0].field1 === '' && data[0].field2 === '') {
-		throw new Error(
+		throw new ApplicationError(
 			'You need to define at least one pair of fields in "Fields to Match" to match on',
+			{ level: 'warning' },
 		);
 	}
 	for (const [index, pair] of data.entries()) {
 		if (pair.field1 === '' || pair.field2 === '') {
-			throw new Error(
+			throw new ApplicationError(
 				`You need to define both fields in "Fields to Match" for pair ${index + 1},
 				 field 1 = '${pair.field1}'
 				 field 2 = '${pair.field2}'`,
+				{ level: 'warning' },
 			);
 		}
 	}
@@ -360,7 +365,10 @@ export function checkInput(
 			return get(entry.json, field, undefined) !== undefined;
 		});
 		if (!isPresent) {
-			throw new Error(`Field '${field}' is not present in any of items in '${inputLabel}'`);
+			throw new ApplicationError(
+				`Field '${field}' is not present in any of items in '${inputLabel}'`,
+				{ level: 'warning' },
+			);
 		}
 	}
 	return input;
diff --git a/packages/nodes-base/nodes/Merge/v2/MergeV2.node.ts b/packages/nodes-base/nodes/Merge/v2/MergeV2.node.ts
index 5b8593bd9e590..ffdfcfe545f8a 100644
--- a/packages/nodes-base/nodes/Merge/v2/MergeV2.node.ts
+++ b/packages/nodes-base/nodes/Merge/v2/MergeV2.node.ts
@@ -1,6 +1,6 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
 
-import merge from 'lodash.merge';
+import merge from 'lodash/merge';
 
 import type {
 	IExecuteFunctions,
@@ -29,272 +29,266 @@ import {
 } from './GenericFunctions';
 
 import { optionsDescription } from './OptionsDescription';
+import { preparePairedItemDataArray } from '@utils/utilities';
 
-const versionDescription: INodeTypeDescription = {
-	displayName: 'Merge',
-	name: 'merge',
-	icon: 'fa:code-branch',
-	group: ['transform'],
-	version: 2,
-	subtitle: '={{$parameter["mode"]}}',
-	description: 'Merges data of multiple streams once data from both is available',
-	defaults: {
-		name: 'Merge',
-		color: '#00bbcc',
-	},
-	// eslint-disable-next-line n8n-nodes-base/node-class-description-inputs-wrong-regular-node
-	inputs: ['main', 'main'],
-	outputs: ['main'],
-	inputNames: ['Input 1', 'Input 2'],
-	properties: [
-		{
-			displayName: 'Mode',
-			name: 'mode',
-			type: 'options',
-			options: [
-				{
-					name: 'Append',
-					value: 'append',
-					description: 'All items of input 1, then all items of input 2',
-				},
-				{
-					name: 'Combine',
-					value: 'combine',
-					description: 'Merge matching items together',
-				},
-				{
-					name: 'Choose Branch',
-					value: 'chooseBranch',
-					description: 'Output input data, without modifying it',
-				},
-			],
-			default: 'append',
-			description: 'How data of branches should be merged',
-		},
-		{
-			displayName: 'Combination Mode',
-			name: 'combinationMode',
-			type: 'options',
-			options: [
-				{
-					name: 'Merge By Fields',
-					value: 'mergeByFields',
-					description: 'Combine items with the same field values',
-				},
-				{
-					name: 'Merge By Position',
-					value: 'mergeByPosition',
-					description: 'Combine items based on their order',
-				},
-				{
-					name: 'Multiplex',
-					value: 'multiplex',
-					description: 'All possible item combinations (cross join)',
-				},
-			],
-			default: 'mergeByFields',
-			displayOptions: {
-				show: {
-					mode: ['combine'],
-				},
-			},
-		},
-		// mergeByFields ------------------------------------------------------------------
-		{
-			displayName: 'Fields to Match',
-			name: 'mergeByFields',
-			type: 'fixedCollection',
-			placeholder: 'Add Fields to Match',
-			default: { values: [{ field1: '', field2: '' }] },
-			typeOptions: {
-				multipleValues: true,
+export class MergeV2 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			version: [2, 2.1],
+			defaults: {
+				name: 'Merge',
 			},
-			options: [
+			// eslint-disable-next-line n8n-nodes-base/node-class-description-inputs-wrong-regular-node
+			inputs: ['main', 'main'],
+			outputs: ['main'],
+			inputNames: ['Input 1', 'Input 2'],
+			// If mode is chooseBranch data from both branches is required
+			// to continue, else data from any input suffices
+			requiredInputs: '={{ $parameter["mode"] === "chooseBranch" ? [0, 1] : 1 }}',
+			properties: [
 				{
-					displayName: 'Values',
-					name: 'values',
-					values: [
+					displayName: 'Mode',
+					name: 'mode',
+					type: 'options',
+					options: [
+						{
+							name: 'Append',
+							value: 'append',
+							description: 'All items of input 1, then all items of input 2',
+						},
 						{
-							displayName: 'Input 1 Field',
-							name: 'field1',
-							type: 'string',
-							default: '',
-							// eslint-disable-next-line n8n-nodes-base/node-param-placeholder-miscased-id
-							placeholder: 'e.g. id',
-							hint: ' Enter the field name as text',
-							requiresDataPath: 'single',
+							name: 'Combine',
+							value: 'combine',
+							description: 'Merge matching items together',
 						},
 						{
-							displayName: 'Input 2 Field',
-							name: 'field2',
-							type: 'string',
-							default: '',
-							// eslint-disable-next-line n8n-nodes-base/node-param-placeholder-miscased-id
-							placeholder: 'e.g. id',
-							hint: ' Enter the field name as text',
-							requiresDataPath: 'single',
+							name: 'Choose Branch',
+							value: 'chooseBranch',
+							description: 'Output input data, without modifying it',
 						},
 					],
-				},
-			],
-			displayOptions: {
-				show: {
-					mode: ['combine'],
-					combinationMode: ['mergeByFields'],
-				},
-			},
-		},
-		{
-			displayName: 'Output Type',
-			name: 'joinMode',
-			type: 'options',
-			// eslint-disable-next-line n8n-nodes-base/node-param-options-type-unsorted-items
-			options: [
-				{
-					name: 'Keep Matches',
-					value: 'keepMatches',
-					description: 'Items that match, merged together (inner join)',
-				},
-				{
-					name: 'Keep Non-Matches',
-					value: 'keepNonMatches',
-					description: "Items that don't match",
-				},
-				{
-					name: 'Keep Everything',
-					value: 'keepEverything',
-					description: "Items that match merged together, plus items that don't match (outer join)",
+					default: 'append',
+					description: 'How data of branches should be merged',
 				},
 				{
-					name: 'Enrich Input 1',
-					value: 'enrichInput1',
-					description: 'All of input 1, with data from input 2 added in (left join)',
-				},
-				{
-					name: 'Enrich Input 2',
-					value: 'enrichInput2',
-					description: 'All of input 2, with data from input 1 added in (right join)',
-				},
-			],
-			default: 'keepMatches',
-			displayOptions: {
-				show: {
-					mode: ['combine'],
-					combinationMode: ['mergeByFields'],
-				},
-			},
-		},
-		{
-			displayName: 'Output Data From',
-			name: 'outputDataFrom',
-			type: 'options',
-			options: [
-				{
-					name: 'Both Inputs Merged Together',
-					value: 'both',
-				},
-				{
-					name: 'Input 1',
-					value: 'input1',
-				},
-				{
-					name: 'Input 2',
-					value: 'input2',
-				},
-			],
-			default: 'both',
-			displayOptions: {
-				show: {
-					mode: ['combine'],
-					combinationMode: ['mergeByFields'],
-					joinMode: ['keepMatches'],
-				},
-			},
-		},
-		{
-			displayName: 'Output Data From',
-			name: 'outputDataFrom',
-			type: 'options',
-			options: [
-				{
-					name: 'Both Inputs Appended Together',
-					value: 'both',
+					displayName: 'Combination Mode',
+					name: 'combinationMode',
+					type: 'options',
+					options: [
+						{
+							name: 'Merge By Fields',
+							value: 'mergeByFields',
+							description: 'Combine items with the same field values',
+						},
+						{
+							name: 'Merge By Position',
+							value: 'mergeByPosition',
+							description: 'Combine items based on their order',
+						},
+						{
+							name: 'Multiplex',
+							value: 'multiplex',
+							description: 'All possible item combinations (cross join)',
+						},
+					],
+					default: 'mergeByFields',
+					displayOptions: {
+						show: {
+							mode: ['combine'],
+						},
+					},
 				},
+				// mergeByFields ------------------------------------------------------------------
 				{
-					name: 'Input 1',
-					value: 'input1',
+					displayName: 'Fields to Match',
+					name: 'mergeByFields',
+					type: 'fixedCollection',
+					placeholder: 'Add Fields to Match',
+					default: { values: [{ field1: '', field2: '' }] },
+					typeOptions: {
+						multipleValues: true,
+					},
+					options: [
+						{
+							displayName: 'Values',
+							name: 'values',
+							values: [
+								{
+									displayName: 'Input 1 Field',
+									name: 'field1',
+									type: 'string',
+									default: '',
+									// eslint-disable-next-line n8n-nodes-base/node-param-placeholder-miscased-id
+									placeholder: 'e.g. id',
+									hint: ' Enter the field name as text',
+									requiresDataPath: 'single',
+								},
+								{
+									displayName: 'Input 2 Field',
+									name: 'field2',
+									type: 'string',
+									default: '',
+									// eslint-disable-next-line n8n-nodes-base/node-param-placeholder-miscased-id
+									placeholder: 'e.g. id',
+									hint: ' Enter the field name as text',
+									requiresDataPath: 'single',
+								},
+							],
+						},
+					],
+					displayOptions: {
+						show: {
+							mode: ['combine'],
+							combinationMode: ['mergeByFields'],
+						},
+					},
 				},
 				{
-					name: 'Input 2',
-					value: 'input2',
-				},
-			],
-			default: 'both',
-			displayOptions: {
-				show: {
-					mode: ['combine'],
-					combinationMode: ['mergeByFields'],
-					joinMode: ['keepNonMatches'],
+					displayName: 'Output Type',
+					name: 'joinMode',
+					type: 'options',
+					// eslint-disable-next-line n8n-nodes-base/node-param-options-type-unsorted-items
+					options: [
+						{
+							name: 'Keep Matches',
+							value: 'keepMatches',
+							description: 'Items that match, merged together (inner join)',
+						},
+						{
+							name: 'Keep Non-Matches',
+							value: 'keepNonMatches',
+							description: "Items that don't match",
+						},
+						{
+							name: 'Keep Everything',
+							value: 'keepEverything',
+							description:
+								"Items that match merged together, plus items that don't match (outer join)",
+						},
+						{
+							name: 'Enrich Input 1',
+							value: 'enrichInput1',
+							description: 'All of input 1, with data from input 2 added in (left join)',
+						},
+						{
+							name: 'Enrich Input 2',
+							value: 'enrichInput2',
+							description: 'All of input 2, with data from input 1 added in (right join)',
+						},
+					],
+					default: 'keepMatches',
+					displayOptions: {
+						show: {
+							mode: ['combine'],
+							combinationMode: ['mergeByFields'],
+						},
+					},
 				},
-			},
-		},
-
-		// chooseBranch -----------------------------------------------------------------
-		{
-			displayName: 'Output Type',
-			name: 'chooseBranchMode',
-			type: 'options',
-			options: [
 				{
-					name: 'Wait for Both Inputs to Arrive',
-					value: 'waitForBoth',
-				},
-			],
-			default: 'waitForBoth',
-			displayOptions: {
-				show: {
-					mode: ['chooseBranch'],
+					displayName: 'Output Data From',
+					name: 'outputDataFrom',
+					type: 'options',
+					options: [
+						{
+							name: 'Both Inputs Merged Together',
+							value: 'both',
+						},
+						{
+							name: 'Input 1',
+							value: 'input1',
+						},
+						{
+							name: 'Input 2',
+							value: 'input2',
+						},
+					],
+					default: 'both',
+					displayOptions: {
+						show: {
+							mode: ['combine'],
+							combinationMode: ['mergeByFields'],
+							joinMode: ['keepMatches'],
+						},
+					},
 				},
-			},
-		},
-		{
-			displayName: 'Output',
-			name: 'output',
-			type: 'options',
-			options: [
 				{
-					name: 'Input 1 Data',
-					value: 'input1',
+					displayName: 'Output Data From',
+					name: 'outputDataFrom',
+					type: 'options',
+					options: [
+						{
+							name: 'Both Inputs Appended Together',
+							value: 'both',
+						},
+						{
+							name: 'Input 1',
+							value: 'input1',
+						},
+						{
+							name: 'Input 2',
+							value: 'input2',
+						},
+					],
+					default: 'both',
+					displayOptions: {
+						show: {
+							mode: ['combine'],
+							combinationMode: ['mergeByFields'],
+							joinMode: ['keepNonMatches'],
+						},
+					},
 				},
+
+				// chooseBranch -----------------------------------------------------------------
 				{
-					name: 'Input 2 Data',
-					value: 'input2',
+					displayName: 'Output Type',
+					name: 'chooseBranchMode',
+					type: 'options',
+					options: [
+						{
+							name: 'Wait for Both Inputs to Arrive',
+							value: 'waitForBoth',
+						},
+					],
+					default: 'waitForBoth',
+					displayOptions: {
+						show: {
+							mode: ['chooseBranch'],
+						},
+					},
 				},
 				{
-					name: 'A Single, Empty Item',
-					value: 'empty',
-				},
-			],
-			default: 'input1',
-			displayOptions: {
-				show: {
-					mode: ['chooseBranch'],
-					chooseBranchMode: ['waitForBoth'],
+					displayName: 'Output',
+					name: 'output',
+					type: 'options',
+					options: [
+						{
+							name: 'Input 1 Data',
+							value: 'input1',
+						},
+						{
+							name: 'Input 2 Data',
+							value: 'input2',
+						},
+						{
+							name: 'A Single, Empty Item',
+							value: 'empty',
+						},
+					],
+					default: 'input1',
+					displayOptions: {
+						show: {
+							mode: ['chooseBranch'],
+							chooseBranchMode: ['waitForBoth'],
+						},
+					},
 				},
-			},
-		},
-
-		...optionsDescription,
-	],
-};
 
-export class MergeV2 implements INodeType {
-	description: INodeTypeDescription;
-
-	constructor(baseDescription: INodeTypeBaseDescription) {
-		this.description = {
-			...baseDescription,
-			...versionDescription,
+				...optionsDescription,
+			],
 		};
 	}
 
@@ -374,6 +368,12 @@ export class MergeV2 implements INodeType {
 				let input1 = this.getInputData(0);
 				let input2 = this.getInputData(1);
 
+				if (input1.length === 0 || input2.length === 0) {
+					// If data of any input is missing, return the data of
+					// the input that contains data
+					return [[...input1, ...input2]];
+				}
+
 				if (clashHandling.resolveClash === 'preferInput1') {
 					[input1, input2] = [input2, input1];
 				}
@@ -450,20 +450,52 @@ export class MergeV2 implements INodeType {
 				options.joinMode = joinMode;
 				options.outputDataFrom = outputDataFrom;
 
-				const input1 = checkInput(
-					this.getInputData(0),
-					matchFields.map((pair) => pair.field1),
-					options.disableDotNotation || false,
-					'Input 1',
-				);
-				if (!input1) return [returnData];
+				const nodeVersion = this.getNode().typeVersion;
 
-				const input2 = checkInput(
-					this.getInputData(1),
-					matchFields.map((pair) => pair.field2),
-					options.disableDotNotation || false,
-					'Input 2',
-				);
+				let input1 = this.getInputData(0);
+				let input2 = this.getInputData(1);
+
+				if (nodeVersion < 2.1) {
+					input1 = checkInput(
+						this.getInputData(0),
+						matchFields.map((pair) => pair.field1),
+						options.disableDotNotation || false,
+						'Input 1',
+					);
+					if (!input1) return [returnData];
+
+					input2 = checkInput(
+						this.getInputData(1),
+						matchFields.map((pair) => pair.field2),
+						options.disableDotNotation || false,
+						'Input 2',
+					);
+				} else {
+					if (!input1) return [returnData];
+				}
+
+				if (input1.length === 0 || input2.length === 0) {
+					if (!input1.length && joinMode === 'keepNonMatches' && outputDataFrom === 'input1')
+						return [returnData];
+					if (!input2.length && joinMode === 'keepNonMatches' && outputDataFrom === 'input2')
+						return [returnData];
+
+					if (joinMode === 'keepMatches') {
+						// Stop the execution
+						return [[]];
+					} else if (joinMode === 'enrichInput1' && input1.length === 0) {
+						// No data to enrich so stop
+						return [[]];
+					} else if (joinMode === 'enrichInput2' && input2.length === 0) {
+						// No data to enrich so stop
+						return [[]];
+					} else {
+						// Return the data of any of the inputs that contains data
+						return [[...input1, ...input2]];
+					}
+				}
+
+				if (!input1) return [returnData];
 
 				if (!input2 || !matchFields.length) {
 					if (
@@ -533,14 +565,18 @@ export class MergeV2 implements INodeType {
 
 					const mergedEntries = mergeMatched(matches.matched, clashResolveOptions, joinMode);
 
-					if (clashResolveOptions.resolveClash === 'addSuffix') {
-						const suffix = joinMode === 'enrichInput1' ? '1' : '2';
-						returnData.push(
-							...mergedEntries,
-							...addSuffixToEntriesKeys(matches.unmatched1, suffix),
-						);
+					if (joinMode === 'enrichInput1') {
+						if (clashResolveOptions.resolveClash === 'addSuffix') {
+							returnData.push(...mergedEntries, ...addSuffixToEntriesKeys(matches.unmatched1, '1'));
+						} else {
+							returnData.push(...mergedEntries, ...matches.unmatched1);
+						}
 					} else {
-						returnData.push(...mergedEntries, ...matches.unmatched1);
+						if (clashResolveOptions.resolveClash === 'addSuffix') {
+							returnData.push(...mergedEntries, ...addSuffixToEntriesKeys(matches.unmatched2, '2'));
+						} else {
+							returnData.push(...mergedEntries, ...matches.unmatched2);
+						}
 					}
 				}
 			}
@@ -559,7 +595,15 @@ export class MergeV2 implements INodeType {
 					returnData.push.apply(returnData, this.getInputData(1));
 				}
 				if (output === 'empty') {
-					returnData.push({ json: {} });
+					const pairedItem = [
+						...this.getInputData(0).map((inputData) => inputData.pairedItem),
+						...this.getInputData(1).map((inputData) => inputData.pairedItem),
+					].flatMap(preparePairedItemDataArray);
+
+					returnData.push({
+						json: {},
+						pairedItem,
+					});
 				}
 			}
 		}
diff --git a/packages/nodes-base/nodes/MessageBird/GenericFunctions.ts b/packages/nodes-base/nodes/MessageBird/GenericFunctions.ts
index 8ad09e74bb173..b8183d08c3c73 100644
--- a/packages/nodes-base/nodes/MessageBird/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/MessageBird/GenericFunctions.ts
@@ -1,6 +1,11 @@
-import type { OptionsWithUri } from 'request';
-
-import type { IExecuteFunctions, IHookFunctions, IDataObject, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IHookFunctions,
+	IDataObject,
+	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 /**
@@ -9,14 +14,14 @@ import { NodeApiError } from 'n8n-workflow';
  */
 export async function messageBirdApiRequest(
 	this: IHookFunctions | IExecuteFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 	body: IDataObject,
 	query: IDataObject = {},
 ): Promise<any> {
 	const credentials = await this.getCredentials('messageBirdApi');
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			Accept: 'application/json',
 			Authorization: `AccessKey ${credentials.accessKey}`,
diff --git a/packages/nodes-base/nodes/MessageBird/MessageBird.node.ts b/packages/nodes-base/nodes/MessageBird/MessageBird.node.ts
index b9245753f6035..c4a78b40bda84 100644
--- a/packages/nodes-base/nodes/MessageBird/MessageBird.node.ts
+++ b/packages/nodes-base/nodes/MessageBird/MessageBird.node.ts
@@ -4,6 +4,7 @@ import type {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
@@ -290,7 +291,7 @@ export class MessageBird implements INodeType {
 		// For Query string
 		let qs: IDataObject;
 
-		let requestMethod;
+		let requestMethod: IHttpRequestMethods;
 		let requestPath;
 
 		for (let i = 0; i < items.length; i++) {
diff --git a/packages/nodes-base/nodes/MessageBird/messagebird.svg b/packages/nodes-base/nodes/MessageBird/messagebird.svg
index 6c4caa7ff3589..52b9d8fbedf65 100644
--- a/packages/nodes-base/nodes/MessageBird/messagebird.svg
+++ b/packages/nodes-base/nodes/MessageBird/messagebird.svg
@@ -1 +1 @@
-<svg width="60" height="60" xmlns="http://www.w3.org/2000/svg"><path d="M53.47 14.295c-2.371 0-4.49 1.186-5.783 2.982l-8.727 12.21a1.754 1.754 0 01-1.436.755 1.763 1.763 0 01-1.76-1.76c0-.37.109-.718.278-.97l7.361-11.025c.754-1.113 1.185-2.478 1.185-3.951a7.046 7.046 0 00-7.065-7.074H.462v7.074h31.747a3.564 3.564 0 01-3.556 3.556H.462c0 2.513.539 4.92 1.472 7.074h23.174a3.564 3.564 0 01-3.556 3.556H4.017a17.65 17.65 0 0014.186 7.074h8.727c.97.002 1.757.789 1.76 1.76a1.763 1.763 0 01-1.76 1.76h-8.764L6.314 55.02h21.44c9.803 0 18.136-6.393 21.046-15.227L52.788 27.7a22.305 22.305 0 016.751-9.984 7.044 7.044 0 00-6.069-3.411v-.01zm0 4.848c-.719 0-1.33-.609-1.33-1.329.01-.73.6-1.32 1.33-1.33.73.01 1.319.6 1.328 1.33 0 .754-.609 1.33-1.329 1.33z" fill="#2481D7"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="60" height="60"><path fill="#2481D7" d="M53.47 14.295c-2.371 0-4.49 1.186-5.783 2.982l-8.727 12.21a1.75 1.75 0 0 1-1.436.755 1.763 1.763 0 0 1-1.76-1.76c0-.37.109-.718.278-.97l7.361-11.025c.754-1.113 1.185-2.478 1.185-3.951a7.046 7.046 0 0 0-7.065-7.074H.462v7.074h31.747a3.564 3.564 0 0 1-3.556 3.556H.462c0 2.513.539 4.92 1.472 7.074h23.174a3.564 3.564 0 0 1-3.556 3.556H4.017a17.65 17.65 0 0 0 14.186 7.074h8.727c.97.002 1.757.789 1.76 1.76a1.763 1.763 0 0 1-1.76 1.76h-8.764L6.314 55.02h21.44c9.803 0 18.136-6.393 21.046-15.227L52.788 27.7a22.3 22.3 0 0 1 6.751-9.984 7.04 7.04 0 0 0-6.069-3.411zm0 4.848c-.719 0-1.33-.609-1.33-1.329.01-.73.6-1.32 1.33-1.33.73.01 1.319.6 1.328 1.33 0 .754-.609 1.33-1.329 1.33z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Metabase/metabase.svg b/packages/nodes-base/nodes/Metabase/metabase.svg
index 6771aaff68ab0..c533dc74c7544 100644
--- a/packages/nodes-base/nodes/Metabase/metabase.svg
+++ b/packages/nodes-base/nodes/Metabase/metabase.svg
@@ -1,27 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="256px" height="324px" viewBox="0 0 256 324" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMidYMid">
-	<g fill="#509EE3">
-		<ellipse cx="19.3939396" cy="82.7565395" rx="19.3939394" ry="19.703938"></ellipse>
-		<ellipse cx="19.3939396" cy="137.927566" rx="19.3939394" ry="19.703938"></ellipse>
-		<ellipse opacity="0.2" cx="73.6969698" cy="82.7565395" rx="19.3939394" ry="19.703938"></ellipse>
-		<ellipse cx="73.6969698" cy="138.463513" rx="19.3939394" ry="19.703938"></ellipse>
-		<ellipse opacity="0.2" cx="128" cy="82.7565395" rx="19.3939394" ry="19.703938"></ellipse>
-		<ellipse opacity="0.2" cx="128" cy="19.703938" rx="19.3939394" ry="19.703938"></ellipse>
-		<ellipse opacity="0.2" cx="128" cy="138.463513" rx="19.3939394" ry="19.703938"></ellipse>
-		<ellipse opacity="0.2" cx="182.30303" cy="82.7565395" rx="19.3939394" ry="19.703938"></ellipse>
-		<ellipse cx="236.60606" cy="82.7565395" rx="19.3939394" ry="19.703938"></ellipse>
-		<ellipse cx="182.30303" cy="138.463513" rx="19.3939394" ry="19.703938"></ellipse>
-		<ellipse cx="236.60606" cy="138.463513" rx="19.3939394" ry="19.703938"></ellipse>
-		<ellipse cx="19.3939396" cy="193.098592" rx="19.3939394" ry="19.703938"></ellipse>
-		<ellipse opacity="0.2" cx="73.6969698" cy="193.634539" rx="19.3939394" ry="19.703938"></ellipse>
-		<ellipse cx="128" cy="193.634539" rx="19.3939394" ry="19.703938"></ellipse>
-		<ellipse opacity="0.2" cx="182.30303" cy="193.634539" rx="19.3939394" ry="19.703938"></ellipse>
-		<ellipse cx="236.60606" cy="193.634539" rx="19.3939394" ry="19.703938"></ellipse>
-		<ellipse cx="19.3939396" cy="248.269618" rx="19.3939394" ry="19.703938"></ellipse>
-		<ellipse opacity="0.2" cx="73.6969698" cy="248.805565" rx="19.3939394" ry="19.703938"></ellipse>
-		<ellipse opacity="0.2" cx="128" cy="248.805565" rx="19.3939394" ry="19.703938"></ellipse>
-		<ellipse opacity="0.2" cx="128" cy="303.976591" rx="19.3939394" ry="19.703938"></ellipse>
-		<ellipse opacity="0.2" cx="182.30303" cy="248.805565" rx="19.3939394" ry="19.703938"></ellipse>
-		<ellipse cx="236.60606" cy="248.805565" rx="19.3939394" ry="19.703938"></ellipse>
-	</g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="324" preserveAspectRatio="xMidYMid"><g fill="#509EE3"><ellipse cx="19.394" cy="82.757" rx="19.394" ry="19.704"/><ellipse cx="19.394" cy="137.928" rx="19.394" ry="19.704"/><ellipse cx="73.697" cy="82.757" opacity=".2" rx="19.394" ry="19.704"/><ellipse cx="73.697" cy="138.464" rx="19.394" ry="19.704"/><ellipse cx="128" cy="82.757" opacity=".2" rx="19.394" ry="19.704"/><ellipse cx="128" cy="19.704" opacity=".2" rx="19.394" ry="19.704"/><ellipse cx="128" cy="138.464" opacity=".2" rx="19.394" ry="19.704"/><ellipse cx="182.303" cy="82.757" opacity=".2" rx="19.394" ry="19.704"/><ellipse cx="236.606" cy="82.757" rx="19.394" ry="19.704"/><ellipse cx="182.303" cy="138.464" rx="19.394" ry="19.704"/><ellipse cx="236.606" cy="138.464" rx="19.394" ry="19.704"/><ellipse cx="19.394" cy="193.099" rx="19.394" ry="19.704"/><ellipse cx="73.697" cy="193.635" opacity=".2" rx="19.394" ry="19.704"/><ellipse cx="128" cy="193.635" rx="19.394" ry="19.704"/><ellipse cx="182.303" cy="193.635" opacity=".2" rx="19.394" ry="19.704"/><ellipse cx="236.606" cy="193.635" rx="19.394" ry="19.704"/><ellipse cx="19.394" cy="248.27" rx="19.394" ry="19.704"/><ellipse cx="73.697" cy="248.806" opacity=".2" rx="19.394" ry="19.704"/><ellipse cx="128" cy="248.806" opacity=".2" rx="19.394" ry="19.704"/><ellipse cx="128" cy="303.977" opacity=".2" rx="19.394" ry="19.704"/><ellipse cx="182.303" cy="248.806" opacity=".2" rx="19.394" ry="19.704"/><ellipse cx="236.606" cy="248.806" rx="19.394" ry="19.704"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Microsoft/Dynamics/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/Dynamics/GenericFunctions.ts
index dba23f3953f1a..c4ec69687855f 100644
--- a/packages/nodes-base/nodes/Microsoft/Dynamics/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Microsoft/Dynamics/GenericFunctions.ts
@@ -1,19 +1,18 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	ILoadOptionsFunctions,
 	IDataObject,
 	INodeProperties,
 	INodePropertyOptions,
 	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function microsoftApiRequest(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -26,7 +25,7 @@ export async function microsoftApiRequest(
 		region: string;
 	};
 
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		headers: {
 			'Content-Type': 'application/json',
 			accept: 'application/json',
@@ -55,7 +54,7 @@ export async function microsoftApiRequest(
 export async function microsoftApiRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: any = {},
diff --git a/packages/nodes-base/nodes/Microsoft/Dynamics/MicrosoftDynamicsCrm.node.json b/packages/nodes-base/nodes/Microsoft/Dynamics/MicrosoftDynamicsCrm.node.json
index 7709b0d0bc0c2..48483e176729e 100644
--- a/packages/nodes-base/nodes/Microsoft/Dynamics/MicrosoftDynamicsCrm.node.json
+++ b/packages/nodes-base/nodes/Microsoft/Dynamics/MicrosoftDynamicsCrm.node.json
@@ -2,7 +2,7 @@
 	"node": "n8n-nodes-base.microsoftDynamicsCrm",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Marketing & Content", "Sales"],
+	"categories": ["Marketing", "Sales"],
 	"resources": {
 		"credentialDocumentation": [
 			{
diff --git a/packages/nodes-base/nodes/Microsoft/Dynamics/MicrosoftDynamicsCrm.node.ts b/packages/nodes-base/nodes/Microsoft/Dynamics/MicrosoftDynamicsCrm.node.ts
index 6df1d682dd9f2..37f39b04984bd 100644
--- a/packages/nodes-base/nodes/Microsoft/Dynamics/MicrosoftDynamicsCrm.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/Dynamics/MicrosoftDynamicsCrm.node.ts
@@ -62,49 +62,49 @@ export class MicrosoftDynamicsCrm implements INodeType {
 	methods = {
 		loadOptions: {
 			async getAccountCategories(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				return getPicklistOptions.call(this, 'account', 'accountcategorycode');
+				return await getPicklistOptions.call(this, 'account', 'accountcategorycode');
 			},
 			async getAccountRatingCodes(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				return getPicklistOptions.call(this, 'account', 'accountratingcode');
+				return await getPicklistOptions.call(this, 'account', 'accountratingcode');
 			},
 			async getAddressTypes(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				return getPicklistOptions.call(this, 'account', 'address1_addresstypecode');
+				return await getPicklistOptions.call(this, 'account', 'address1_addresstypecode');
 			},
 			async getBusinessTypes(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				return getPicklistOptions.call(this, 'account', 'businesstypecode');
+				return await getPicklistOptions.call(this, 'account', 'businesstypecode');
 			},
 			async getCustomerSizeCodes(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				return getPicklistOptions.call(this, 'account', 'customersizecode');
+				return await getPicklistOptions.call(this, 'account', 'customersizecode');
 			},
 			async getCustomerTypeCodes(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				return getPicklistOptions.call(this, 'account', 'customertypecode');
+				return await getPicklistOptions.call(this, 'account', 'customertypecode');
 			},
 			async getIndustryCodes(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				return getPicklistOptions.call(this, 'account', 'industrycode');
+				return await getPicklistOptions.call(this, 'account', 'industrycode');
 			},
 			async getPaymentTermsCodes(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				return getPicklistOptions.call(this, 'account', 'paymenttermscode');
+				return await getPicklistOptions.call(this, 'account', 'paymenttermscode');
 			},
 			async getPreferredAppointmentDayCodes(
 				this: ILoadOptionsFunctions,
 			): Promise<INodePropertyOptions[]> {
-				return getPicklistOptions.call(this, 'account', 'preferredappointmentdaycode');
+				return await getPicklistOptions.call(this, 'account', 'preferredappointmentdaycode');
 			},
 			async getPreferredAppointmentTimeCodes(
 				this: ILoadOptionsFunctions,
 			): Promise<INodePropertyOptions[]> {
-				return getPicklistOptions.call(this, 'account', 'preferredappointmenttimecode');
+				return await getPicklistOptions.call(this, 'account', 'preferredappointmenttimecode');
 			},
 			async getPreferredContactMethodCodes(
 				this: ILoadOptionsFunctions,
 			): Promise<INodePropertyOptions[]> {
-				return getPicklistOptions.call(this, 'account', 'preferredcontactmethodcode');
+				return await getPicklistOptions.call(this, 'account', 'preferredcontactmethodcode');
 			},
 			async getShippingMethodCodes(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				return getPicklistOptions.call(this, 'account', 'shippingmethodcode');
+				return await getPicklistOptions.call(this, 'account', 'shippingmethodcode');
 			},
 			async getTerritoryCodes(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				return getPicklistOptions.call(this, 'account', 'territorycode');
+				return await getPicklistOptions.call(this, 'account', 'territorycode');
 			},
 			async getAccountFields(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
 				const fields = await getEntityFields.call(this, 'account');
@@ -293,6 +293,6 @@ export class MicrosoftDynamicsCrm implements INodeType {
 			}
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Microsoft/Dynamics/dynamicsCrm.svg b/packages/nodes-base/nodes/Microsoft/Dynamics/dynamicsCrm.svg
index 7df712843cc21..03652f8c9ba12 100644
--- a/packages/nodes-base/nodes/Microsoft/Dynamics/dynamicsCrm.svg
+++ b/packages/nodes-base/nodes/Microsoft/Dynamics/dynamicsCrm.svg
@@ -1 +1 @@
-<svg fill="#000000" xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 50 50" width="50px" height="50px"><path d="M 11.986328 0 C 11.815078 0.002 11.645188 0.048671875 11.492188 0.13867188 C 11.188188 0.31867188 11 0.646 11 1 L 11 13.353516 C 11 13.737516 11.219406 14.089859 11.566406 14.255859 L 29.566406 22.900391 C 29.703406 22.966391 29.853 23 30 23 C 30.194 23 30.387688 22.943031 30.554688 22.832031 L 39.554688 16.832031 C 39.844687 16.639031 40.013047 16.307984 39.998047 15.958984 C 39.984047 15.610984 39.789375 15.295953 39.484375 15.126953 L 12.484375 0.12695312 C 12.329375 0.040953125 12.157578 -0.002 11.986328 0 z M 12.025391 17 C 11.850016 16.9955 11.674625 17.038453 11.515625 17.126953 C 11.197625 17.302953 11 17.636 11 18 L 11 48.998047 C 11 49.758047 11.813469 50.241953 12.480469 49.876953 L 40.496094 33.867188 C 40.808094 33.689188 41 33.359 41 33 L 41 20 C 41 19.592 40.753 19.225266 40.375 19.072266 C 39.995 18.920266 39.562297 19.011688 39.279297 19.304688 L 13 47 L 20.955078 23.294922 C 21.088078 22.861922 20.913297 22.392344 20.529297 22.152344 L 12.529297 17.152344 C 12.374797 17.055844 12.200766 17.0045 12.025391 17 z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="50" height="50"><path d="M11.986 0A1 1 0 0 0 11 1v12.354a1 1 0 0 0 .566.902l18 8.644a1 1 0 0 0 .989-.068l9-6a.997.997 0 0 0-.07-1.705l-27-15a1 1 0 0 0-.5-.127m.04 17a1 1 0 0 0-.51.127A1 1 0 0 0 11 18v30.998a1 1 0 0 0 1.48.879l28.016-16.01A1 1 0 0 0 41 33V20a1 1 0 0 0-1.72-.695L13 47l7.955-23.705a1 1 0 0 0-.426-1.143l-8-5a1 1 0 0 0-.504-.152"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/Excel/GenericFunctions.ts
deleted file mode 100644
index f29ed80272cb8..0000000000000
--- a/packages/nodes-base/nodes/Microsoft/Excel/GenericFunctions.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-import type { OptionsWithUri } from 'request';
-import type {
-	IDataObject,
-	IExecuteFunctions,
-	IExecuteSingleFunctions,
-	ILoadOptionsFunctions,
-	JsonObject,
-} from 'n8n-workflow';
-import { NodeApiError } from 'n8n-workflow';
-
-export async function microsoftApiRequest(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
-	resource: string,
-
-	body: any = {},
-	qs: IDataObject = {},
-	uri?: string,
-	headers: IDataObject = {},
-): Promise<any> {
-	const options: OptionsWithUri = {
-		headers: {
-			'Content-Type': 'application/json',
-		},
-		method,
-		body,
-		qs,
-		uri: uri || `https://graph.microsoft.com/v1.0/me${resource}`,
-		json: true,
-	};
-	try {
-		if (Object.keys(headers).length !== 0) {
-			options.headers = Object.assign({}, options.headers, headers);
-		}
-		//@ts-ignore
-		return await this.helpers.requestOAuth2.call(this, 'microsoftExcelOAuth2Api', options);
-	} catch (error) {
-		throw new NodeApiError(this.getNode(), error as JsonObject);
-	}
-}
-
-export async function microsoftApiRequestAllItems(
-	this: IExecuteFunctions | ILoadOptionsFunctions,
-	propertyName: string,
-	method: string,
-	endpoint: string,
-
-	body: any = {},
-	query: IDataObject = {},
-): Promise<any> {
-	const returnData: IDataObject[] = [];
-
-	let responseData;
-	let uri: string | undefined;
-	query.$top = 100;
-
-	do {
-		responseData = await microsoftApiRequest.call(this, method, endpoint, body, query, uri);
-		uri = responseData['@odata.nextLink'];
-		if (uri?.includes('$top')) {
-			delete query.$top;
-		}
-		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
-	} while (responseData['@odata.nextLink'] !== undefined);
-
-	return returnData;
-}
-
-export async function microsoftApiRequestAllItemsSkip(
-	this: IExecuteFunctions | ILoadOptionsFunctions,
-	propertyName: string,
-	method: string,
-	endpoint: string,
-
-	body: any = {},
-	query: IDataObject = {},
-): Promise<any> {
-	const returnData: IDataObject[] = [];
-
-	let responseData;
-	query.$top = 100;
-	query.$skip = 0;
-
-	do {
-		responseData = await microsoftApiRequest.call(this, method, endpoint, body, query);
-		query.$skip += query.$top;
-		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
-	} while (responseData.value.length !== 0);
-
-	return returnData;
-}
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/MicrosoftExcel.node.json b/packages/nodes-base/nodes/Microsoft/Excel/MicrosoftExcel.node.json
index b915e85f90ceb..10fbad6b1ad47 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/MicrosoftExcel.node.json
+++ b/packages/nodes-base/nodes/Microsoft/Excel/MicrosoftExcel.node.json
@@ -15,5 +15,5 @@
 			}
 		]
 	},
-	"alias": ["CSV", "Spreadsheet"]
+	"alias": ["_Excel", "Excel", "Sheet", "CSV", "Spreadsheet"]
 }
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/MicrosoftExcel.node.ts b/packages/nodes-base/nodes/Microsoft/Excel/MicrosoftExcel.node.ts
index 086bbfdce760b..1963970ed7088 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/MicrosoftExcel.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/MicrosoftExcel.node.ts
@@ -1,678 +1,27 @@
-import type {
-	IExecuteFunctions,
-	IDataObject,
-	ILoadOptionsFunctions,
-	INodeExecutionData,
-	INodePropertyOptions,
-	INodeType,
-	INodeTypeDescription,
-	JsonObject,
-} from 'n8n-workflow';
-import { NodeApiError } from 'n8n-workflow';
-
-import {
-	microsoftApiRequest,
-	microsoftApiRequestAllItems,
-	microsoftApiRequestAllItemsSkip,
-} from './GenericFunctions';
-
-import { workbookFields, workbookOperations } from './WorkbookDescription';
-
-import { worksheetFields, worksheetOperations } from './WorksheetDescription';
-
-import { tableFields, tableOperations } from './TableDescription';
-
-export class MicrosoftExcel implements INodeType {
-	description: INodeTypeDescription = {
-		displayName: 'Microsoft Excel',
-		name: 'microsoftExcel',
-		icon: 'file:excel.svg',
-		group: ['input'],
-		version: 1,
-		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume Microsoft Excel API',
-		defaults: {
-			name: 'Microsoft Excel',
-		},
-		inputs: ['main'],
-		outputs: ['main'],
-		credentials: [
-			{
-				name: 'microsoftExcelOAuth2Api',
-				required: true,
-			},
-		],
-		properties: [
-			{
-				displayName: 'Resource',
-				name: 'resource',
-				type: 'options',
-				noDataExpression: true,
-				options: [
-					{
-						name: 'Table',
-						value: 'table',
-						description: 'Represents an Excel table',
-					},
-					{
-						name: 'Workbook',
-						value: 'workbook',
-						description:
-							'Workbook is the top level object which contains related workbook objects such as worksheets, tables, ranges, etc',
-					},
-					{
-						name: 'Worksheet',
-						value: 'worksheet',
-						description:
-							'An Excel worksheet is a grid of cells. It can contain data, tables, charts, etc.',
-					},
-				],
-				default: 'workbook',
-			},
-			...workbookOperations,
-			...workbookFields,
-			...worksheetOperations,
-			...worksheetFields,
-			...tableOperations,
-			...tableFields,
-		],
-	};
-
-	methods = {
-		loadOptions: {
-			// Get all the workbooks to display them to user so that they can
-			// select them easily
-			async getWorkbooks(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const qs: IDataObject = {
-					select: 'id,name',
-				};
-				const returnData: INodePropertyOptions[] = [];
-				const workbooks = await microsoftApiRequestAllItems.call(
-					this,
-					'value',
-					'GET',
-					"/drive/root/search(q='.xlsx')",
-					{},
-					qs,
-				);
-				for (const workbook of workbooks) {
-					const workbookName = workbook.name;
-					const workbookId = workbook.id;
-					returnData.push({
-						name: workbookName,
-						value: workbookId,
-					});
-				}
-				return returnData;
-			},
-			// Get all the worksheets to display them to user so that they can
-			// select them easily
-			async getworksheets(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const workbookId = this.getCurrentNodeParameter('workbook');
-				const qs: IDataObject = {
-					select: 'id,name',
-				};
-				const returnData: INodePropertyOptions[] = [];
-				const worksheets = await microsoftApiRequestAllItems.call(
-					this,
-					'value',
-					'GET',
-					`/drive/items/${workbookId}/workbook/worksheets`,
-					{},
-					qs,
-				);
-				for (const worksheet of worksheets) {
-					const worksheetName = worksheet.name;
-					const worksheetId = worksheet.id;
-					returnData.push({
-						name: worksheetName,
-						value: worksheetId,
-					});
-				}
-				return returnData;
-			},
-			// Get all the tables to display them to user so that they can
-			// select them easily
-			async getTables(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const workbookId = this.getCurrentNodeParameter('workbook');
-				const worksheetId = this.getCurrentNodeParameter('worksheet');
-				const qs: IDataObject = {
-					select: 'id,name',
-				};
-				const returnData: INodePropertyOptions[] = [];
-				const tables = await microsoftApiRequestAllItems.call(
-					this,
-					'value',
-					'GET',
-					`/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/tables`,
-					{},
-					qs,
-				);
-				for (const table of tables) {
-					const tableName = table.name;
-					const tableId = table.id;
-					returnData.push({
-						name: tableName,
-						value: tableId,
-					});
-				}
-				return returnData;
-			},
-		},
-	};
-
-	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
-		const items = this.getInputData();
-		const returnData: INodeExecutionData[] = [];
-		const length = items.length;
-		let qs: IDataObject = {};
-		const result: IDataObject[] = [];
-		let responseData;
-		const resource = this.getNodeParameter('resource', 0);
-		const operation = this.getNodeParameter('operation', 0);
-
-		if (resource === 'table') {
-			//https://docs.microsoft.com/en-us/graph/api/table-post-rows?view=graph-rest-1.0&tabs=http
-			if (operation === 'addRow') {
-				try {
-					// TODO: At some point it should be possible to use item dependent parameters.
-					//       Is however important to then not make one separate request each.
-					const workbookId = this.getNodeParameter('workbook', 0) as string;
-					const worksheetId = this.getNodeParameter('worksheet', 0) as string;
-					const tableId = this.getNodeParameter('table', 0) as string;
-					const additionalFields = this.getNodeParameter('additionalFields', 0);
-					const body: IDataObject = {};
-
-					if (additionalFields.index) {
-						body.index = additionalFields.index as number;
-					}
-
-					// Get table columns to eliminate any columns not needed on the input
-					responseData = await microsoftApiRequest.call(
-						this,
-						'GET',
-						`/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/tables/${tableId}/columns`,
-						{},
-						qs,
-					);
-					const columns = responseData.value.map((column: IDataObject) => column.name);
-
-					const rows: any[][] = [];
-
-					// Bring the items into the correct format
-					for (const item of items) {
-						const row = [];
-						for (const column of columns) {
-							row.push(item.json[column]);
-						}
-						rows.push(row);
-					}
-
-					body.values = rows;
-					const { id } = await microsoftApiRequest.call(
-						this,
-						'POST',
-						`/drive/items/${workbookId}/workbook/createSession`,
-						{ persistChanges: true },
-					);
-					responseData = await microsoftApiRequest.call(
-						this,
-						'POST',
-						`/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/tables/${tableId}/rows/add`,
-						body,
-						{},
-						'',
-						{ 'workbook-session-id': id },
-					);
-					await microsoftApiRequest.call(
-						this,
-						'POST',
-						`/drive/items/${workbookId}/workbook/closeSession`,
-						{},
-						{},
-						'',
-						{ 'workbook-session-id': id },
-					);
-
-					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData as IDataObject[]),
-						{ itemData: { item: 0 } },
-					);
-
-					returnData.push(...executionData);
-				} catch (error) {
-					if (this.continueOnFail()) {
-						const executionErrorData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray({ error: error.message }),
-							{ itemData: { item: 0 } },
-						);
-						returnData.push(...executionErrorData);
-					} else {
-						throw error;
-					}
-				}
-			}
-			//https://docs.microsoft.com/en-us/graph/api/table-list-columns?view=graph-rest-1.0&tabs=http
-			if (operation === 'getColumns') {
-				for (let i = 0; i < length; i++) {
-					try {
-						qs = {};
-						const workbookId = this.getNodeParameter('workbook', i) as string;
-						const worksheetId = this.getNodeParameter('worksheet', i) as string;
-						const tableId = this.getNodeParameter('table', i) as string;
-						const returnAll = this.getNodeParameter('returnAll', i);
-						const rawData = this.getNodeParameter('rawData', i);
-						if (rawData) {
-							const filters = this.getNodeParameter('filters', i);
-							if (filters.fields) {
-								qs.$select = filters.fields;
-							}
-						}
-						if (returnAll) {
-							responseData = await microsoftApiRequestAllItemsSkip.call(
-								this,
-								'value',
-								'GET',
-								`/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/tables/${tableId}/columns`,
-								{},
-								qs,
-							);
-						} else {
-							qs.$top = this.getNodeParameter('limit', i);
-							responseData = await microsoftApiRequest.call(
-								this,
-								'GET',
-								`/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/tables/${tableId}/columns`,
-								{},
-								qs,
-							);
-							responseData = responseData.value;
-						}
-						if (!rawData) {
-							responseData = responseData.map((column: IDataObject) => ({ name: column.name }));
-						} else {
-							const dataProperty = this.getNodeParameter('dataProperty', i) as string;
-							responseData = { [dataProperty]: responseData };
-						}
-
-						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData as IDataObject[]),
-							{ itemData: { item: i } },
-						);
-
-						returnData.push(...executionData);
-					} 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;
-					}
-				}
-			}
-			//https://docs.microsoft.com/en-us/graph/api/table-list-rows?view=graph-rest-1.0&tabs=http
-			if (operation === 'getRows') {
-				for (let i = 0; i < length; i++) {
-					qs = {};
-					try {
-						const workbookId = this.getNodeParameter('workbook', i) as string;
-						const worksheetId = this.getNodeParameter('worksheet', i) as string;
-						const tableId = this.getNodeParameter('table', i) as string;
-						const returnAll = this.getNodeParameter('returnAll', i);
-						const rawData = this.getNodeParameter('rawData', i);
-						if (rawData) {
-							const filters = this.getNodeParameter('filters', i);
-							if (filters.fields) {
-								qs.$select = filters.fields;
-							}
-						}
-						if (returnAll) {
-							responseData = await microsoftApiRequestAllItemsSkip.call(
-								this,
-								'value',
-								'GET',
-								`/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/tables/${tableId}/rows`,
-								{},
-								qs,
-							);
-						} else {
-							const rowsQs = { ...qs };
-							rowsQs.$top = this.getNodeParameter('limit', i);
-							responseData = await microsoftApiRequest.call(
-								this,
-								'GET',
-								`/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/tables/${tableId}/rows`,
-								{},
-								rowsQs,
-							);
-							responseData = responseData.value;
-						}
-						if (!rawData) {
-							const columnsQs = { ...qs };
-							columnsQs.$select = 'name';
-							// TODO: That should probably be cached in the future
-							let columns = await microsoftApiRequestAllItemsSkip.call(
-								this,
-								'value',
-								'GET',
-								`/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/tables/${tableId}/columns`,
-								{},
-								columnsQs,
-							);
-							//@ts-ignore
-							columns = columns.map((column) => column.name);
-							for (let index = 0; index < responseData.length; index++) {
-								const object: IDataObject = {};
-								for (let y = 0; y < columns.length; y++) {
-									object[columns[y]] = responseData[index].values[0][y];
-								}
-								const executionData = this.helpers.constructExecutionMetaData(
-									this.helpers.returnJsonArray({ ...object }),
-									{ itemData: { item: index } },
-								);
-
-								returnData.push(...executionData);
-							}
-						} else {
-							const dataProperty = this.getNodeParameter('dataProperty', i) as string;
-							const executionData = this.helpers.constructExecutionMetaData(
-								this.helpers.returnJsonArray({ [dataProperty]: responseData }),
-								{ itemData: { item: i } },
-							);
-
-							returnData.push(...executionData);
-						}
-					} 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;
-					}
-				}
-			}
-			if (operation === 'lookup') {
-				for (let i = 0; i < length; i++) {
-					qs = {};
-					try {
-						const workbookId = this.getNodeParameter('workbook', i) as string;
-						const worksheetId = this.getNodeParameter('worksheet', i) as string;
-						const tableId = this.getNodeParameter('table', i) as string;
-						const lookupColumn = this.getNodeParameter('lookupColumn', i) as string;
-						const lookupValue = this.getNodeParameter('lookupValue', i) as string;
-						const options = this.getNodeParameter('options', i);
-
-						responseData = await microsoftApiRequestAllItemsSkip.call(
-							this,
-							'value',
-							'GET',
-							`/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/tables/${tableId}/rows`,
-							{},
-							{},
-						);
-
-						qs.$select = 'name';
-						// TODO: That should probably be cached in the future
-						let columns = await microsoftApiRequestAllItemsSkip.call(
-							this,
-							'value',
-							'GET',
-							`/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/tables/${tableId}/columns`,
-							{},
-							qs,
-						);
-						columns = columns.map((column: IDataObject) => column.name);
-
-						if (!columns.includes(lookupColumn)) {
-							throw new NodeApiError(this.getNode(), responseData as JsonObject, {
-								message: `Column ${lookupColumn} does not exist on the table selected`,
-							});
-						}
-
-						result.length = 0;
-						for (let index = 0; index < responseData.length; index++) {
-							const object: IDataObject = {};
-							for (let y = 0; y < columns.length; y++) {
-								object[columns[y]] = responseData[index].values[0][y];
-							}
-							result.push({ ...object });
-						}
-
-						if (options.returnAllMatches) {
-							responseData = result.filter((data: IDataObject) => {
-								return data[lookupColumn]?.toString() === lookupValue;
-							});
-							const executionData = this.helpers.constructExecutionMetaData(
-								this.helpers.returnJsonArray(responseData),
-								{ itemData: { item: i } },
-							);
-
-							returnData.push(...executionData);
-						} else {
-							responseData = result.find((data: IDataObject) => {
-								return data[lookupColumn]?.toString() === lookupValue;
-							});
-							const executionData = this.helpers.constructExecutionMetaData(
-								this.helpers.returnJsonArray(responseData as IDataObject),
-								{ itemData: { item: i } },
-							);
-
-							returnData.push(...executionData);
-						}
-					} 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;
-					}
-				}
-			}
-		}
-		if (resource === 'workbook') {
-			for (let i = 0; i < length; i++) {
-				qs = {};
-				try {
-					//https://docs.microsoft.com/en-us/graph/api/worksheetcollection-add?view=graph-rest-1.0&tabs=http
-					if (operation === 'addWorksheet') {
-						const workbookId = this.getNodeParameter('workbook', i) as string;
-						const additionalFields = this.getNodeParameter('additionalFields', i);
-						const body: IDataObject = {};
-						if (additionalFields.name) {
-							body.name = additionalFields.name;
-						}
-						const { id } = await microsoftApiRequest.call(
-							this,
-							'POST',
-							`/drive/items/${workbookId}/workbook/createSession`,
-							{ persistChanges: true },
-						);
-						responseData = await microsoftApiRequest.call(
-							this,
-							'POST',
-							`/drive/items/${workbookId}/workbook/worksheets/add`,
-							body,
-							{},
-							'',
-							{ 'workbook-session-id': id },
-						);
-						await microsoftApiRequest.call(
-							this,
-							'POST',
-							`/drive/items/${workbookId}/workbook/closeSession`,
-							{},
-							{},
-							'',
-							{ 'workbook-session-id': id },
-						);
-					}
-					if (operation === 'getAll') {
-						const returnAll = this.getNodeParameter('returnAll', i);
-						const filters = this.getNodeParameter('filters', i);
-						if (filters.fields) {
-							qs.$select = filters.fields;
-						}
-						if (returnAll) {
-							responseData = await microsoftApiRequestAllItems.call(
-								this,
-								'value',
-								'GET',
-								"/drive/root/search(q='.xlsx')",
-								{},
-								qs,
-							);
-						} else {
-							qs.$top = this.getNodeParameter('limit', i);
-							responseData = await microsoftApiRequest.call(
-								this,
-								'GET',
-								"/drive/root/search(q='.xlsx')",
-								{},
-								qs,
-							);
-							responseData = responseData.value;
-						}
-					}
-
-					if (Array.isArray(responseData)) {
-						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
-							{ itemData: { item: i } },
-						);
-
-						returnData.push(...executionData);
-					} else if (responseData !== undefined) {
-						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData as IDataObject),
-							{ itemData: { item: i } },
-						);
-
-						returnData.push(...executionData);
-					}
-				} 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;
-				}
-			}
-		}
-		if (resource === 'worksheet') {
-			for (let i = 0; i < length; i++) {
-				qs = {};
-				try {
-					//https://docs.microsoft.com/en-us/graph/api/workbook-list-worksheets?view=graph-rest-1.0&tabs=http
-					if (operation === 'getAll') {
-						const returnAll = this.getNodeParameter('returnAll', i);
-						const workbookId = this.getNodeParameter('workbook', i) as string;
-						const filters = this.getNodeParameter('filters', i);
-						if (filters.fields) {
-							qs.$select = filters.fields;
-						}
-						if (returnAll) {
-							responseData = await microsoftApiRequestAllItems.call(
-								this,
-								'value',
-								'GET',
-								`/drive/items/${workbookId}/workbook/worksheets`,
-								{},
-								qs,
-							);
-						} else {
-							qs.$top = this.getNodeParameter('limit', i);
-							responseData = await microsoftApiRequest.call(
-								this,
-								'GET',
-								`/drive/items/${workbookId}/workbook/worksheets`,
-								{},
-								qs,
-							);
-							responseData = responseData.value;
-						}
-					}
-					//https://docs.microsoft.com/en-us/graph/api/worksheet-range?view=graph-rest-1.0&tabs=http
-					if (operation === 'getContent') {
-						const workbookId = this.getNodeParameter('workbook', i) as string;
-						const worksheetId = this.getNodeParameter('worksheet', i) as string;
-						const range = this.getNodeParameter('range', i) as string;
-						const rawData = this.getNodeParameter('rawData', i);
-						if (rawData) {
-							const filters = this.getNodeParameter('filters', i);
-							if (filters.fields) {
-								qs.$select = filters.fields;
-							}
-						}
-
-						responseData = await microsoftApiRequest.call(
-							this,
-							'GET',
-							`/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/range(address='${range}')`,
-							{},
-							qs,
-						);
-
-						if (!rawData) {
-							const keyRow = this.getNodeParameter('keyRow', i) as number;
-							const dataStartRow = this.getNodeParameter('dataStartRow', i) as number;
-							if (responseData.values === null) {
-								throw new NodeApiError(this.getNode(), responseData as JsonObject, {
-									message: 'Range did not return data',
-								});
-							}
-							const keyValues = responseData.values[keyRow];
-							for (let index = dataStartRow; index < responseData.values.length; index++) {
-								const object: IDataObject = {};
-								for (let y = 0; y < keyValues.length; y++) {
-									object[keyValues[y]] = responseData.values[index][y];
-								}
-								const executionData = this.helpers.constructExecutionMetaData(
-									this.helpers.returnJsonArray({ ...object }),
-									{ itemData: { item: index } },
-								);
-
-								returnData.push(...executionData);
-							}
-						} else {
-							const dataProperty = this.getNodeParameter('dataProperty', i) as string;
-							const executionData = this.helpers.constructExecutionMetaData(
-								this.helpers.returnJsonArray({ [dataProperty]: responseData }),
-								{ itemData: { item: i } },
-							);
-
-							returnData.push(...executionData);
-						}
-					}
-				} 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;
-				}
-			}
-		}
-
-		return this.prepareOutputData(returnData);
+import type { INodeTypeBaseDescription, IVersionedNodeType } from 'n8n-workflow';
+import { VersionedNodeType } from 'n8n-workflow';
+
+import { MicrosoftExcelV1 } from './v1/MicrosoftExcelV1.node';
+import { MicrosoftExcelV2 } from './v2/MicrosoftExcelV2.node';
+
+export class MicrosoftExcel extends VersionedNodeType {
+	constructor() {
+		const baseDescription: INodeTypeBaseDescription = {
+			displayName: 'Microsoft Excel 365',
+			name: 'microsoftExcel',
+			icon: 'file:excel.svg',
+			group: ['input'],
+			subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+			description: 'Consume Microsoft Excel API',
+			defaultVersion: 2.1,
+		};
+
+		const nodeVersions: IVersionedNodeType['nodeVersions'] = {
+			1: new MicrosoftExcelV1(baseDescription),
+			2: new MicrosoftExcelV2(baseDescription),
+			2.1: new MicrosoftExcelV2(baseDescription),
+		};
+
+		super(nodeVersions, baseDescription);
 	}
 }
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/excel.svg b/packages/nodes-base/nodes/Microsoft/Excel/excel.svg
index d6a2e5117ee7f..58629f15d6498 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/excel.svg
+++ b/packages/nodes-base/nodes/Microsoft/Excel/excel.svg
@@ -1 +1 @@
-<svg width="60" height="60" xmlns="http://www.w3.org/2000/svg"><g fill="#02723B" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round"><path d="M43.1 20.227h9.512v4.692h-9.513zm0-7.034h9.512v4.69h-9.513zm0 14.227h9.512v4.691h-9.513zm0 7.036h9.512v4.691h-9.513z"/><path d="M43.1 41.649h9.512v4.69h-9.513v-4.69zM58.07 6.78H35.146V.37L.37 6.467v47.22l34.776 5.942v-7.186H58.07c.935 0 1.559-.781 1.559-1.555V8.344c0-.781-.624-1.555-1.56-1.555V6.78zM20.018 40.554l-3.274-8.593h-.148c0 .149-3.275 8.13-3.275 8.13l-4.366-.312L14.1 29.616 9.422 19.453l4.367-.312 2.963 7.974h.148c0-.148 3.274-8.287 3.274-8.287l4.522-.312-5.457 11.101 5.614 11.102-4.834-.149-.001-.016zM57.6 50.717H35.146v-4.37h5.458v-4.691h-5.458v-2.352h5.458v-4.69h-5.458v-2.347h5.458v-4.69h-5.458V25.23h5.458v-4.69h-5.458v-2.345h5.458v-4.692h-5.458v-4.69h22.456v41.903h-.001z"/><path d="M42.729 19.857h9.512v4.691H42.73zm0-7.035h9.512v4.691H42.73zm0 14.228h9.512v4.69H42.73zm0 7.036h9.512v4.691H42.73z"/><path d="M42.729 41.279h9.512v4.69H42.73v-4.69zM57.699 6.41H34.776V0L0 6.098v47.22l34.776 5.941v-7.185h22.923c.936 0 1.56-.781 1.56-1.555V7.974c0-.781-.624-1.555-1.56-1.555V6.41zM19.647 40.184l-3.274-8.593h-.148c0 .148-3.274 8.13-3.274 8.13l-4.367-.312 5.146-10.163-4.678-10.163 4.367-.313 2.962 7.974h.149c0-.148 3.274-8.286 3.274-8.286l4.522-.313-5.458 11.102 5.615 11.101-4.834-.148-.002-.016zM57.23 50.347H34.776v-4.37h5.457v-4.692h-5.457v-2.352h5.457v-4.69h-5.457v-2.347h5.457v-4.69h-5.457V24.86h5.457v-4.69h-5.457v-2.346h5.457v-4.692h-5.457v-4.69h22.456v41.904h-.002z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="60" height="60"><g fill="#02723B" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round"><path d="M43.1 20.227h9.512v4.692h-9.513zm0-7.034h9.512v4.69h-9.513zm0 14.227h9.512v4.691h-9.513zm0 7.036h9.512v4.691h-9.513z"/><path d="M43.1 41.649h9.512v4.69h-9.513zM58.07 6.78H35.146V.37L.37 6.467v47.22l34.776 5.942v-7.186H58.07c.935 0 1.559-.781 1.559-1.555V8.344c0-.781-.624-1.555-1.56-1.555V6.78zM20.018 40.554l-3.274-8.593h-.148c0 .149-3.275 8.13-3.275 8.13l-4.366-.312L14.1 29.616 9.422 19.453l4.367-.312 2.963 7.974h.148c0-.148 3.274-8.287 3.274-8.287l4.522-.312-5.457 11.101 5.614 11.102-4.834-.149zM57.6 50.717H35.146v-4.37h5.458v-4.691h-5.458v-2.352h5.458v-4.69h-5.458v-2.347h5.458v-4.69h-5.458V25.23h5.458v-4.69h-5.458v-2.345h5.458v-4.692h-5.458v-4.69h22.456v41.903h-.001z"/><path d="M42.729 19.857h9.512v4.691H42.73zm0-7.035h9.512v4.691H42.73zm0 14.228h9.512v4.69H42.73zm0 7.036h9.512v4.691H42.73z"/><path d="M42.729 41.279h9.512v4.69H42.73zM57.699 6.41H34.776V0L0 6.098v47.22l34.776 5.941v-7.185h22.923c.936 0 1.56-.781 1.56-1.555V7.974c0-.781-.624-1.555-1.56-1.555zM19.647 40.184l-3.274-8.593h-.148c0 .148-3.274 8.13-3.274 8.13l-4.367-.312 5.146-10.163-4.678-10.163 4.367-.313 2.962 7.974h.149c0-.148 3.274-8.286 3.274-8.286l4.522-.313-5.458 11.102 5.615 11.101-4.834-.148zM57.23 50.347H34.776v-4.37h5.457v-4.692h-5.457v-2.352h5.457v-4.69h-5.457v-2.347h5.457v-4.69h-5.457V24.86h5.457v-4.69h-5.457v-2.346h5.457v-4.692h-5.457v-4.69h22.456v41.904z"/></g></svg>
\ No newline at end of file
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
new file mode 100644
index 0000000000000..44165a998b4e5
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/addTable.test.ts
@@ -0,0 +1,70 @@
+import type { INodeTypes } from 'n8n-workflow';
+
+import nock from 'nock';
+import * as transport from '../../../../v2/transport';
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+jest.mock('../../../../v2/transport', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		microsoftApiRequest: jest.fn(async function (method: IHttpRequestMethods) {
+			if (method === 'POST') {
+				return {
+					style: 'TableStyleMedium2',
+					name: 'Table3',
+					showFilterButton: true,
+					id: '{317CA469-7D1C-4A5D-9B0B-424444BF0336}',
+					highlightLastColumn: false,
+					highlightFirstColumn: false,
+					legacyId: '3',
+					showBandedColumns: false,
+					showBandedRows: true,
+					showHeaders: true,
+					showTotals: false,
+				};
+			}
+		}),
+	};
+});
+
+describe('Test MicrosoftExcelV2, table => addTable', () => {
+	const workflows = ['nodes/Microsoft/Excel/test/v2/node/table/addTable.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	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(transport.microsoftApiRequest).toHaveBeenCalledTimes(1);
+		expect(transport.microsoftApiRequest).toHaveBeenCalledWith(
+			'POST',
+			'/drive/items/01FUWX3BQ4ATCOZNR265GLA6IJEZDQUE4I/workbook/worksheets/{A0883CFE-D27E-4ECC-B94B-981830AAD55B}/tables/add',
+			{ address: 'A1:D4', hasHeaders: true },
+		);
+
+		expect(result.finished).toEqual(true);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/addTable.workflow.json b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/addTable.workflow.json
new file mode 100644
index 0000000000000..eb8fbbd3fe5cf
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/addTable.workflow.json
@@ -0,0 +1,78 @@
+{
+	"name": "My workflow 5",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "875e8784-eb59-40d8-ba45-129a5e29881c",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [380, 140]
+		},
+		{
+			"parameters": {
+				"resource": "table",
+				"operation": "addTable",
+				"workbook": {
+					"__rl": true,
+					"value": "01FUWX3BQ4ATCOZNR265GLA6IJEZDQUE4I",
+					"mode": "list",
+					"cachedResultName": "ПРРО копія"
+				},
+				"worksheet": {
+					"__rl": true,
+					"value": "{A0883CFE-D27E-4ECC-B94B-981830AAD55B}",
+					"mode": "list",
+					"cachedResultName": "Sheet4"
+				},
+				"selectRange": "manual",
+				"range": "A1:D4"
+			},
+			"id": "0e0ac1d2-242c-486a-9287-c70307645acc",
+			"name": "Microsoft Excel 365",
+			"type": "n8n-nodes-base.microsoftExcel",
+			"typeVersion": 2,
+			"position": [860, 140],
+			"credentials": {
+				"microsoftExcelOAuth2Api": {
+					"id": "70",
+					"name": "Microsoft Excel account"
+				}
+			}
+		}
+	],
+	"pinData": {
+		"Microsoft Excel 365": [
+			{
+				"json": {
+					"style": "TableStyleMedium2",
+					"name": "Table3",
+					"showFilterButton": true,
+					"id": "{317CA469-7D1C-4A5D-9B0B-424444BF0336}",
+					"highlightLastColumn": false,
+					"highlightFirstColumn": false,
+					"legacyId": "3",
+					"showBandedColumns": false,
+					"showBandedRows": true,
+					"showHeaders": true,
+					"showTotals": false
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Microsoft Excel 365",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {}
+}
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
new file mode 100644
index 0000000000000..7762ed48947cd
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/append.test.ts
@@ -0,0 +1,91 @@
+import type { INodeTypes } from 'n8n-workflow';
+
+import nock from 'nock';
+import * as transport from '../../../../v2/transport';
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+jest.mock('../../../../v2/transport', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		microsoftApiRequest: jest.fn(async function (method: IHttpRequestMethods, resource: string) {
+			if (method === 'GET') {
+				return {
+					value: [
+						{
+							name: 'id',
+						},
+						{
+							name: 'name',
+						},
+						{
+							name: 'age',
+						},
+						{
+							name: 'data',
+						},
+					],
+				};
+			}
+			if (method === 'POST' && resource.includes('createSession')) {
+				return {
+					id: 12345,
+				};
+			}
+			if (method === 'POST' && resource.includes('add')) {
+				return {
+					index: 3,
+					values: [[3, 'Donald', 99, 'data 5']],
+				};
+			}
+			if (method === 'POST' && resource.includes('closeSession')) {
+				return;
+			}
+		}),
+	};
+});
+
+describe('Test MicrosoftExcelV2, table => append', () => {
+	const workflows = ['nodes/Microsoft/Excel/test/v2/node/table/append.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	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(transport.microsoftApiRequest).toHaveBeenCalledTimes(4);
+
+		expect(transport.microsoftApiRequest).toHaveBeenCalledWith(
+			'POST',
+			'/drive/items/01FUWX3BQ4ATCOZNR265GLA6IJEZDQUE4I/workbook/worksheets/{A0883CFE-D27E-4ECC-B94B-981830AAD55B}/tables/{317CA469-7D1C-4A5D-9B0B-424444BF0336}/rows/add',
+			{ values: [['3', 'Donald', '99', 'data 5']] },
+			{},
+			'',
+			{ 'workbook-session-id': 12345 },
+		);
+
+		expect(result.finished).toEqual(true);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/append.workflow.json b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/append.workflow.json
new file mode 100644
index 0000000000000..1a69bac4dd087
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/append.workflow.json
@@ -0,0 +1,104 @@
+{
+	"name": "My workflow 5",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "875e8784-eb59-40d8-ba45-129a5e29881c",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [380, 140]
+		},
+		{
+			"parameters": {
+				"resource": "table",
+				"workbook": {
+					"__rl": true,
+					"value": "01FUWX3BQ4ATCOZNR265GLA6IJEZDQUE4I",
+					"mode": "list",
+					"cachedResultName": "ПРРО копія",
+					"cachedResultUrl": "https://5w1hb7-my.sharepoint.com/personal/michaeldevsandbox_5w1hb7_onmicrosoft_com/_layouts/15/Doc.aspx?sourcedoc=%7BECC4041C-3AB6-4CF7-B079-0926470A1388%7D&file=%D0%9F%D0%A0%D0%A0%D0%9E%20%D0%BA%D0%BE%D0%BF%D1%96%D1%8F.xlsx&action=default&mobileredirect=true&DefaultItemOpen=1"
+				},
+				"worksheet": {
+					"__rl": true,
+					"value": "{A0883CFE-D27E-4ECC-B94B-981830AAD55B}",
+					"mode": "list",
+					"cachedResultName": "Sheet4",
+					"cachedResultUrl": "https://5w1hb7-my.sharepoint.com/personal/michaeldevsandbox_5w1hb7_onmicrosoft_com/_layouts/15/Doc.aspx?sourcedoc=%7BECC4041C-3AB6-4CF7-B079-0926470A1388%7D&file=%D0%9F%D0%A0%D0%A0%D0%9E%20%D0%BA%D0%BE%D0%BF%D1%96%D1%8F.xlsx&action=default&mobileredirect=true&DefaultItemOpen=1&activeCell=Sheet4!A1"
+				},
+				"table": {
+					"__rl": true,
+					"value": "{317CA469-7D1C-4A5D-9B0B-424444BF0336}",
+					"mode": "list",
+					"cachedResultName": "Table3",
+					"cachedResultUrl": "https://5w1hb7-my.sharepoint.com/personal/michaeldevsandbox_5w1hb7_onmicrosoft_com/_layouts/15/Doc.aspx?sourcedoc=%7BECC4041C-3AB6-4CF7-B079-0926470A1388%7D&file=%D0%9F%D0%A0%D0%A0%D0%9E%20%D0%BA%D0%BE%D0%BF%D1%96%D1%8F.xlsx&action=default&mobileredirect=true&DefaultItemOpen=1&activeCell=Sheet4!A1:D4"
+				},
+				"fieldsUi": {
+					"values": [
+						{
+							"column": "id",
+							"fieldValue": "3"
+						},
+						{
+							"column": "name",
+							"fieldValue": "Donald"
+						},
+						{
+							"column": "age",
+							"fieldValue": "99"
+						},
+						{
+							"column": "data",
+							"fieldValue": "data 5"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "0e0ac1d2-242c-486a-9287-c70307645acc",
+			"name": "Microsoft Excel 365",
+			"type": "n8n-nodes-base.microsoftExcel",
+			"typeVersion": 2,
+			"position": [860, 140],
+			"credentials": {
+				"microsoftExcelOAuth2Api": {
+					"id": "70",
+					"name": "Microsoft Excel account"
+				}
+			}
+		}
+	],
+	"pinData": {
+		"Microsoft Excel 365": [
+			{
+				"json": {
+					"id": 3,
+					"name": "Donald",
+					"age": 99,
+					"data": "data 5"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Microsoft Excel 365",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {},
+	"versionId": "b9eda2d8-e1a5-4a54-aaa9-5e81adaae909",
+	"id": "135",
+	"meta": {
+		"instanceId": "36203ea1ce3cef713fa25999bd9874ae26b9e4c2c3a90a365f2882a154d031d0"
+	},
+	"tags": []
+}
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
new file mode 100644
index 0000000000000..636d991408624
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/convertToRange.test.ts
@@ -0,0 +1,66 @@
+import type { INodeTypes } from 'n8n-workflow';
+
+import nock from 'nock';
+import * as transport from '../../../../v2/transport';
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+jest.mock('../../../../v2/transport', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		microsoftApiRequest: jest.fn(async function (method: IHttpRequestMethods) {
+			if (method === 'POST') {
+				return {
+					address: 'Sheet4!A1:D5',
+					values: [
+						['id', 'name', 'age', 'data'],
+						[1, 'Sam', 33, 'data 1'],
+						[2, 'Jon', 44, 'data 2'],
+						[3, 'Sam', 34, 'data 4'],
+						[3, 'Donald', 99, 'data 5'],
+					],
+				};
+			}
+		}),
+	};
+});
+
+describe('Test MicrosoftExcelV2, table => convertToRange', () => {
+	const workflows = ['nodes/Microsoft/Excel/test/v2/node/table/convertToRange.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	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(transport.microsoftApiRequest).toHaveBeenCalledTimes(1);
+		expect(transport.microsoftApiRequest).toHaveBeenCalledWith(
+			'POST',
+			'/drive/items/01FUWX3BQ4ATCOZNR265GLA6IJEZDQUE4I/workbook/worksheets/{A0883CFE-D27E-4ECC-B94B-981830AAD55B}/tables/{6321EE4A-AC21-48AD-87D9-B527637D94B3}/convertToRange',
+		);
+
+		expect(result.finished).toEqual(true);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/convertToRange.workflow.json b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/convertToRange.workflow.json
new file mode 100644
index 0000000000000..e5a02b985bbd4
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/convertToRange.workflow.json
@@ -0,0 +1,79 @@
+{
+	"name": "My workflow 5",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "875e8784-eb59-40d8-ba45-129a5e29881c",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [580, 140]
+		},
+		{
+			"parameters": {
+				"resource": "table",
+				"operation": "convertToRange",
+				"workbook": {
+					"__rl": true,
+					"value": "01FUWX3BQ4ATCOZNR265GLA6IJEZDQUE4I",
+					"mode": "list",
+					"cachedResultName": "ПРРО копія"
+				},
+				"worksheet": {
+					"__rl": true,
+					"value": "{A0883CFE-D27E-4ECC-B94B-981830AAD55B}",
+					"mode": "list",
+					"cachedResultName": "Sheet4"
+				},
+				"table": {
+					"__rl": true,
+					"value": "{6321EE4A-AC21-48AD-87D9-B527637D94B3}",
+					"mode": "list",
+					"cachedResultName": "Table3"
+				}
+			},
+			"id": "0e0ac1d2-242c-486a-9287-c70307645acc",
+			"name": "Microsoft Excel 365",
+			"type": "n8n-nodes-base.microsoftExcel",
+			"typeVersion": 2,
+			"position": [860, 140],
+			"credentials": {
+				"microsoftExcelOAuth2Api": {
+					"id": "70",
+					"name": "Microsoft Excel account"
+				}
+			}
+		}
+	],
+	"pinData": {
+		"Microsoft Excel 365": [
+			{
+				"json": {
+					"address": "Sheet4!A1:D5",
+					"values": [
+						["id", "name", "age", "data"],
+						[1, "Sam", 33, "data 1"],
+						[2, "Jon", 44, "data 2"],
+						[3, "Sam", 34, "data 4"],
+						[3, "Donald", 99, "data 5"]
+					]
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Microsoft Excel 365",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {}
+}
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
new file mode 100644
index 0000000000000..15f7943c8eae9
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/deleteTable.test.ts
@@ -0,0 +1,57 @@
+import type { INodeTypes } from 'n8n-workflow';
+
+import nock from 'nock';
+import * as transport from '../../../../v2/transport';
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+jest.mock('../../../../v2/transport', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		microsoftApiRequest: jest.fn(async function (method: IHttpRequestMethods) {
+			if (method === 'DELETE') {
+				return;
+			}
+		}),
+	};
+});
+
+describe('Test MicrosoftExcelV2, table => deleteTable', () => {
+	const workflows = ['nodes/Microsoft/Excel/test/v2/node/table/deleteTable.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	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(transport.microsoftApiRequest).toHaveBeenCalledTimes(1);
+		expect(transport.microsoftApiRequest).toHaveBeenCalledWith(
+			'DELETE',
+			'/drive/items/01FUWX3BQ4ATCOZNR265GLA6IJEZDQUE4I/workbook/worksheets/{A0883CFE-D27E-4ECC-B94B-981830AAD55B}/tables/{92FBE3F5-3180-47EE-8549-40892C38DA7F}',
+		);
+
+		expect(result.finished).toEqual(true);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/deleteTable.workflow.json b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/deleteTable.workflow.json
new file mode 100644
index 0000000000000..2a9c585e613d4
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/deleteTable.workflow.json
@@ -0,0 +1,72 @@
+{
+	"name": "My workflow 5",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "875e8784-eb59-40d8-ba45-129a5e29881c",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [580, 140]
+		},
+		{
+			"parameters": {
+				"resource": "table",
+				"operation": "deleteTable",
+				"workbook": {
+					"__rl": true,
+					"value": "01FUWX3BQ4ATCOZNR265GLA6IJEZDQUE4I",
+					"mode": "list",
+					"cachedResultName": "ПРРО копія"
+				},
+				"worksheet": {
+					"__rl": true,
+					"value": "{A0883CFE-D27E-4ECC-B94B-981830AAD55B}",
+					"mode": "list",
+					"cachedResultName": "Sheet4"
+				},
+				"table": {
+					"__rl": true,
+					"value": "{92FBE3F5-3180-47EE-8549-40892C38DA7F}",
+					"mode": "list",
+					"cachedResultName": "Table3"
+				}
+			},
+			"id": "0e0ac1d2-242c-486a-9287-c70307645acc",
+			"name": "Microsoft Excel 365",
+			"type": "n8n-nodes-base.microsoftExcel",
+			"typeVersion": 2,
+			"position": [860, 140],
+			"credentials": {
+				"microsoftExcelOAuth2Api": {
+					"id": "70",
+					"name": "Microsoft Excel account"
+				}
+			}
+		}
+	],
+	"pinData": {
+		"Microsoft Excel 365": [
+			{
+				"json": {
+					"success": true
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Microsoft Excel 365",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {}
+}
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
new file mode 100644
index 0000000000000..e69bd72165948
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/getColumns.test.ts
@@ -0,0 +1,71 @@
+import type { INodeTypes } from 'n8n-workflow';
+
+import nock from 'nock';
+import * as transport from '../../../../v2/transport';
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+jest.mock('../../../../v2/transport', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		microsoftApiRequestAllItemsSkip: jest.fn(async function () {
+			return [
+				{
+					name: 'country',
+				},
+				{
+					name: 'browser',
+				},
+				{
+					name: 'session_duration',
+				},
+				{
+					name: 'visits',
+				},
+			];
+		}),
+	};
+});
+
+describe('Test MicrosoftExcelV2, table => getColumns', () => {
+	const workflows = ['nodes/Microsoft/Excel/test/v2/node/table/getColumns.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	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(transport.microsoftApiRequestAllItemsSkip).toHaveBeenCalledTimes(1);
+		expect(transport.microsoftApiRequestAllItemsSkip).toHaveBeenCalledWith(
+			'value',
+			'GET',
+			'/drive/items/01FUWX3BQ4ATCOZNR265GLA6IJEZDQUE4I/workbook/worksheets/{00000000-0001-0000-0000-000000000000}/tables/{613E8967-D581-44ED-81D3-82A01AA6A05C}/columns',
+			{},
+			{},
+		);
+
+		expect(result.finished).toEqual(true);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/getColumns.workflow.json b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/getColumns.workflow.json
new file mode 100644
index 0000000000000..ec2094099a147
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/getColumns.workflow.json
@@ -0,0 +1,88 @@
+{
+	"name": "My workflow 5",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "875e8784-eb59-40d8-ba45-129a5e29881c",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [580, 140]
+		},
+		{
+			"parameters": {
+				"resource": "table",
+				"operation": "getColumns",
+				"workbook": {
+					"__rl": true,
+					"value": "01FUWX3BQ4ATCOZNR265GLA6IJEZDQUE4I",
+					"mode": "list",
+					"cachedResultName": "ПРРО копія"
+				},
+				"worksheet": {
+					"__rl": true,
+					"value": "{00000000-0001-0000-0000-000000000000}",
+					"mode": "list",
+					"cachedResultName": "Sheet1"
+				},
+				"table": {
+					"__rl": true,
+					"value": "{613E8967-D581-44ED-81D3-82A01AA6A05C}",
+					"mode": "list",
+					"cachedResultName": "Table1"
+				},
+				"returnAll": true
+			},
+			"id": "0e0ac1d2-242c-486a-9287-c70307645acc",
+			"name": "Microsoft Excel 365",
+			"type": "n8n-nodes-base.microsoftExcel",
+			"typeVersion": 2,
+			"position": [860, 140],
+			"credentials": {
+				"microsoftExcelOAuth2Api": {
+					"id": "70",
+					"name": "Microsoft Excel account"
+				}
+			}
+		}
+	],
+	"pinData": {
+		"Microsoft Excel 365": [
+			{
+				"json": {
+					"name": "country"
+				}
+			},
+			{
+				"json": {
+					"name": "browser"
+				}
+			},
+			{
+				"json": {
+					"name": "session_duration"
+				}
+			},
+			{
+				"json": {
+					"name": "visits"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Microsoft Excel 365",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {}
+}
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
new file mode 100644
index 0000000000000..78366e91644c8
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/getRows.test.ts
@@ -0,0 +1,95 @@
+import type { INodeTypes } from 'n8n-workflow';
+
+import nock from 'nock';
+import * as transport from '../../../../v2/transport';
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+jest.mock('../../../../v2/transport', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		microsoftApiRequest: jest.fn(async function (method: IHttpRequestMethods) {
+			if (method === 'GET') {
+				return {
+					value: [
+						{
+							index: 0,
+							values: [['uk', 'firefox', 1, 1]],
+						},
+						{
+							index: 1,
+							values: [['us', 'chrome', 1, 12]],
+						},
+					],
+				};
+			}
+		}),
+		microsoftApiRequestAllItemsSkip: jest.fn(async function () {
+			return [
+				{
+					name: 'country',
+				},
+				{
+					name: 'browser',
+				},
+				{
+					name: 'session_duration',
+				},
+				{
+					name: 'visits',
+				},
+			];
+		}),
+	};
+});
+
+describe('Test MicrosoftExcelV2, table => getRows', () => {
+	const workflows = ['nodes/Microsoft/Excel/test/v2/node/table/getRows.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	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(transport.microsoftApiRequest).toHaveBeenCalledTimes(1);
+		expect(transport.microsoftApiRequest).toHaveBeenCalledWith(
+			'GET',
+			'/drive/items/01FUWX3BQ4ATCOZNR265GLA6IJEZDQUE4I/workbook/worksheets/{00000000-0001-0000-0000-000000000000}/tables/{613E8967-D581-44ED-81D3-82A01AA6A05C}/rows',
+			{},
+			{ $top: 2 },
+		);
+
+		expect(transport.microsoftApiRequestAllItemsSkip).toHaveBeenCalledTimes(1);
+		expect(transport.microsoftApiRequestAllItemsSkip).toHaveBeenCalledWith(
+			'value',
+			'GET',
+			'/drive/items/01FUWX3BQ4ATCOZNR265GLA6IJEZDQUE4I/workbook/worksheets/{00000000-0001-0000-0000-000000000000}/tables/{613E8967-D581-44ED-81D3-82A01AA6A05C}/columns',
+			{},
+			{ $select: 'name' },
+		);
+
+		expect(result.finished).toEqual(true);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/getRows.workflow.json b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/getRows.workflow.json
new file mode 100644
index 0000000000000..77836894d1401
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/getRows.workflow.json
@@ -0,0 +1,85 @@
+{
+	"name": "My workflow 5",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "875e8784-eb59-40d8-ba45-129a5e29881c",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [580, 140]
+		},
+		{
+			"parameters": {
+				"resource": "table",
+				"operation": "getRows",
+				"workbook": {
+					"__rl": true,
+					"value": "01FUWX3BQ4ATCOZNR265GLA6IJEZDQUE4I",
+					"mode": "list",
+					"cachedResultName": "ПРРО копія"
+				},
+				"worksheet": {
+					"__rl": true,
+					"value": "{00000000-0001-0000-0000-000000000000}",
+					"mode": "list",
+					"cachedResultName": "Sheet1"
+				},
+				"table": {
+					"__rl": true,
+					"value": "{613E8967-D581-44ED-81D3-82A01AA6A05C}",
+					"mode": "list",
+					"cachedResultName": "Table1"
+				},
+				"limit": 2,
+				"filters": {}
+			},
+			"id": "0e0ac1d2-242c-486a-9287-c70307645acc",
+			"name": "Microsoft Excel 365",
+			"type": "n8n-nodes-base.microsoftExcel",
+			"typeVersion": 2,
+			"position": [860, 140],
+			"credentials": {
+				"microsoftExcelOAuth2Api": {
+					"id": "70",
+					"name": "Microsoft Excel account"
+				}
+			}
+		}
+	],
+	"pinData": {
+		"Microsoft Excel 365": [
+			{
+				"json": {
+					"country": "uk",
+					"browser": "firefox",
+					"session_duration": 1,
+					"visits": 1
+				}
+			},
+			{
+				"json": {
+					"country": "us",
+					"browser": "chrome",
+					"session_duration": 1,
+					"visits": 12
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Microsoft Excel 365",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {}
+}
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
new file mode 100644
index 0000000000000..ef2b667d5b0cb
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/lookup.test.ts
@@ -0,0 +1,112 @@
+import type { INodeTypes } from 'n8n-workflow';
+
+import nock from 'nock';
+import * as transport from '../../../../v2/transport';
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+jest.mock('../../../../v2/transport', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		microsoftApiRequestAllItemsSkip: jest.fn(async function (
+			_property: string,
+			_method: IHttpRequestMethods,
+			endpoint: string,
+		) {
+			if (endpoint.includes('columns')) {
+				return [
+					{
+						name: 'country',
+					},
+					{
+						name: 'browser',
+					},
+					{
+						name: 'session_duration',
+					},
+					{
+						name: 'visits',
+					},
+				];
+			}
+			if (endpoint.includes('rows')) {
+				return [
+					{
+						index: 0,
+						values: [['uk', 'firefox', 1, 1]],
+					},
+					{
+						index: 1,
+						values: [['us', 'chrome', 1, 12]],
+					},
+					{
+						index: 2,
+						values: [['test', 'test', 55, 123]],
+					},
+					{
+						index: 3,
+						values: [['ua', 'chrome', 1, 3]],
+					},
+					{
+						index: 4,
+						values: [['ua', 'firefox', 1, 4]],
+					},
+					{
+						index: 5,
+						values: [['uk', 'chrome', 1, 55]],
+					},
+				];
+			}
+		}),
+	};
+});
+
+describe('Test MicrosoftExcelV2, table => lookup', () => {
+	const workflows = ['nodes/Microsoft/Excel/test/v2/node/table/lookup.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	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(transport.microsoftApiRequestAllItemsSkip).toHaveBeenCalledTimes(2);
+		expect(transport.microsoftApiRequestAllItemsSkip).toHaveBeenCalledWith(
+			'value',
+			'GET',
+			'/drive/items/01FUWX3BQ4ATCOZNR265GLA6IJEZDQUE4I/workbook/worksheets/{00000000-0001-0000-0000-000000000000}/tables/{613E8967-D581-44ED-81D3-82A01AA6A05C}/rows',
+			{},
+			{},
+		);
+		expect(transport.microsoftApiRequestAllItemsSkip).toHaveBeenCalledWith(
+			'value',
+			'GET',
+			'/drive/items/01FUWX3BQ4ATCOZNR265GLA6IJEZDQUE4I/workbook/worksheets/{00000000-0001-0000-0000-000000000000}/tables/{613E8967-D581-44ED-81D3-82A01AA6A05C}/columns',
+			{},
+			{ $select: 'name' },
+		);
+
+		expect(result.finished).toEqual(true);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/lookup.workflow.json b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/lookup.workflow.json
new file mode 100644
index 0000000000000..339c927fdc77a
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/lookup.workflow.json
@@ -0,0 +1,88 @@
+{
+	"name": "My workflow 5",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "875e8784-eb59-40d8-ba45-129a5e29881c",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [580, 140]
+		},
+		{
+			"parameters": {
+				"resource": "table",
+				"operation": "lookup",
+				"workbook": {
+					"__rl": true,
+					"value": "01FUWX3BQ4ATCOZNR265GLA6IJEZDQUE4I",
+					"mode": "list",
+					"cachedResultName": "ПРРО копія"
+				},
+				"worksheet": {
+					"__rl": true,
+					"value": "{00000000-0001-0000-0000-000000000000}",
+					"mode": "list",
+					"cachedResultName": "Sheet1"
+				},
+				"table": {
+					"__rl": true,
+					"value": "{613E8967-D581-44ED-81D3-82A01AA6A05C}",
+					"mode": "list",
+					"cachedResultName": "Table1"
+				},
+				"lookupColumn": "country",
+				"lookupValue": "uk",
+				"options": {
+					"returnAllMatches": true
+				}
+			},
+			"id": "0e0ac1d2-242c-486a-9287-c70307645acc",
+			"name": "Microsoft Excel 365",
+			"type": "n8n-nodes-base.microsoftExcel",
+			"typeVersion": 2,
+			"position": [860, 140],
+			"credentials": {
+				"microsoftExcelOAuth2Api": {
+					"id": "70",
+					"name": "Microsoft Excel account"
+				}
+			}
+		}
+	],
+	"pinData": {
+		"Microsoft Excel 365": [
+			{
+				"json": {
+					"country": "uk",
+					"browser": "firefox",
+					"session_duration": 1,
+					"visits": 1
+				}
+			},
+			{
+				"json": {
+					"country": "uk",
+					"browser": "chrome",
+					"session_duration": 1,
+					"visits": 55
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Microsoft Excel 365",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {}
+}
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
new file mode 100644
index 0000000000000..b939b19b97faf
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/addWorksheet.test.ts
@@ -0,0 +1,87 @@
+import type { INodeTypes } from 'n8n-workflow';
+
+import nock from 'nock';
+import * as transport from '../../../../v2/transport';
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+jest.mock('../../../../v2/transport', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		microsoftApiRequest: jest.fn(async function (method: IHttpRequestMethods, resource: string) {
+			if (method === 'POST' && resource.includes('createSession')) {
+				return {
+					id: 12345,
+				};
+			}
+			if (method === 'POST' && resource.includes('add')) {
+				return {
+					id: '{266ADAB7-25B6-4F28-A2D1-FD5BFBD7A4F0}',
+					name: 'Sheet42',
+					position: 8,
+					visibility: 'Visible',
+				};
+			}
+			if (method === 'POST' && resource.includes('closeSession')) {
+				return;
+			}
+		}),
+	};
+});
+
+describe('Test MicrosoftExcelV2, workbook => addWorksheet', () => {
+	const workflows = ['nodes/Microsoft/Excel/test/v2/node/workbook/addWorksheet.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	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(transport.microsoftApiRequest).toHaveBeenCalledTimes(3);
+		expect(transport.microsoftApiRequest).toHaveBeenCalledWith(
+			'POST',
+			'/drive/items/01FUWX3BQ4ATCOZNR265GLA6IJEZDQUE4I/workbook/createSession',
+			{ persistChanges: true },
+		);
+		expect(transport.microsoftApiRequest).toHaveBeenCalledWith(
+			'POST',
+			'/drive/items/01FUWX3BQ4ATCOZNR265GLA6IJEZDQUE4I/workbook/worksheets/add',
+			{ name: 'Sheet42' },
+			{},
+			'',
+			{ 'workbook-session-id': 12345 },
+		);
+		expect(transport.microsoftApiRequest).toHaveBeenCalledWith(
+			'POST',
+			'/drive/items/01FUWX3BQ4ATCOZNR265GLA6IJEZDQUE4I/workbook/closeSession',
+			{},
+			{},
+			'',
+			{ 'workbook-session-id': 12345 },
+		);
+
+		expect(result.finished).toEqual(true);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/addWorksheet.workflow.json b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/addWorksheet.workflow.json
new file mode 100644
index 0000000000000..0744375981399
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/addWorksheet.workflow.json
@@ -0,0 +1,65 @@
+{
+	"name": "My workflow 5",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "875e8784-eb59-40d8-ba45-129a5e29881c",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [380, 140]
+		},
+		{
+			"parameters": {
+				"operation": "addWorksheet",
+				"workbook": {
+					"__rl": true,
+					"value": "01FUWX3BQ4ATCOZNR265GLA6IJEZDQUE4I",
+					"mode": "list",
+					"cachedResultName": "ПРРО копія"
+				},
+				"additionalFields": {
+					"name": "Sheet42"
+				}
+			},
+			"id": "0e0ac1d2-242c-486a-9287-c70307645acc",
+			"name": "Microsoft Excel 365",
+			"type": "n8n-nodes-base.microsoftExcel",
+			"typeVersion": 2,
+			"position": [860, 140],
+			"credentials": {
+				"microsoftExcelOAuth2Api": {
+					"id": "70",
+					"name": "Microsoft Excel account"
+				}
+			}
+		}
+	],
+	"pinData": {
+		"Microsoft Excel 365": [
+			{
+				"json": {
+					"id": "{266ADAB7-25B6-4F28-A2D1-FD5BFBD7A4F0}",
+					"name": "Sheet42",
+					"position": 8,
+					"visibility": "Visible"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Microsoft Excel 365",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {}
+}
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
new file mode 100644
index 0000000000000..126dad3093624
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/deleteWorkbook.test.ts
@@ -0,0 +1,57 @@
+import type { INodeTypes } from 'n8n-workflow';
+
+import nock from 'nock';
+import * as transport from '../../../../v2/transport';
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+jest.mock('../../../../v2/transport', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		microsoftApiRequest: jest.fn(async function (method: IHttpRequestMethods) {
+			if (method === 'DELETE') {
+				return;
+			}
+		}),
+	};
+});
+
+describe('Test MicrosoftExcelV2, workbook => deleteWorkbook', () => {
+	const workflows = ['nodes/Microsoft/Excel/test/v2/node/workbook/deleteWorkbook.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	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(transport.microsoftApiRequest).toHaveBeenCalledTimes(1);
+		expect(transport.microsoftApiRequest).toHaveBeenCalledWith(
+			'DELETE',
+			'/drive/items/01FUWX3BXJLISGF2CFWBGYPHXFCXPXOJUK',
+		);
+
+		expect(result.finished).toEqual(true);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/deleteWorkbook.workflow.json b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/deleteWorkbook.workflow.json
new file mode 100644
index 0000000000000..1ac63b01748fa
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/deleteWorkbook.workflow.json
@@ -0,0 +1,59 @@
+{
+	"name": "My workflow 5",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "875e8784-eb59-40d8-ba45-129a5e29881c",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [380, 140]
+		},
+		{
+			"parameters": {
+				"operation": "deleteWorkbook",
+				"workbook": {
+					"__rl": true,
+					"value": "01FUWX3BXJLISGF2CFWBGYPHXFCXPXOJUK",
+					"mode": "list",
+					"cachedResultName": "Book"
+				}
+			},
+			"id": "0e0ac1d2-242c-486a-9287-c70307645acc",
+			"name": "Microsoft Excel 365",
+			"type": "n8n-nodes-base.microsoftExcel",
+			"typeVersion": 2,
+			"position": [860, 140],
+			"credentials": {
+				"microsoftExcelOAuth2Api": {
+					"id": "70",
+					"name": "Microsoft Excel account"
+				}
+			}
+		}
+	],
+	"pinData": {
+		"Microsoft Excel 365": [
+			{
+				"json": {
+					"success": true
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Microsoft Excel 365",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {}
+}
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
new file mode 100644
index 0000000000000..cdb1138e0fb6f
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/getAll.test.ts
@@ -0,0 +1,72 @@
+import type { INodeTypes } from 'n8n-workflow';
+
+import nock from 'nock';
+import * as transport from '../../../../v2/transport';
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+jest.mock('../../../../v2/transport', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		microsoftApiRequest: jest.fn(async function (method: IHttpRequestMethods) {
+			if (method === 'GET') {
+				return {
+					value: [
+						{
+							'@odata.type': '#microsoft.graph.driveItem',
+							name: 'ПРРО копія.xlsx',
+						},
+						,
+						{
+							'@odata.type': '#microsoft.graph.driveItem',
+							name: 'Book 3.xlsx',
+						},
+						,
+					],
+				};
+			}
+		}),
+	};
+});
+
+describe('Test MicrosoftExcelV2, workbook => getAll', () => {
+	const workflows = ['nodes/Microsoft/Excel/test/v2/node/workbook/getAll.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	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(transport.microsoftApiRequest).toHaveBeenCalledTimes(1);
+		expect(transport.microsoftApiRequest).toHaveBeenCalledWith(
+			'GET',
+			"/drive/root/search(q='.xlsx')",
+			{},
+			{ $select: 'name', $top: 2 },
+		);
+
+		expect(result.finished).toEqual(true);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/getAll.workflow.json b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/getAll.workflow.json
new file mode 100644
index 0000000000000..5499173661842
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/getAll.workflow.json
@@ -0,0 +1,63 @@
+{
+	"name": "My workflow 5",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "875e8784-eb59-40d8-ba45-129a5e29881c",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [380, 140]
+		},
+		{
+			"parameters": {
+				"limit": 2,
+				"filters": {
+					"fields": "name"
+				}
+			},
+			"id": "0e0ac1d2-242c-486a-9287-c70307645acc",
+			"name": "Microsoft Excel 365",
+			"type": "n8n-nodes-base.microsoftExcel",
+			"typeVersion": 2,
+			"position": [860, 140],
+			"credentials": {
+				"microsoftExcelOAuth2Api": {
+					"id": "70",
+					"name": "Microsoft Excel account"
+				}
+			}
+		}
+	],
+	"pinData": {
+		"Microsoft Excel 365": [
+			{
+				"json": {
+					"@odata.type": "#microsoft.graph.driveItem",
+					"name": "ПРРО копія.xlsx"
+				}
+			},
+			{
+				"json": {
+					"@odata.type": "#microsoft.graph.driveItem",
+					"name": "Book 3.xlsx"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Microsoft Excel 365",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {}
+}
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
new file mode 100644
index 0000000000000..d6fc5b4cab310
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/append.test.ts
@@ -0,0 +1,54 @@
+import nock from 'nock';
+import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
+
+jest.mock('../../../../v2/transport', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		microsoftApiRequest: jest.fn(async function (method: IHttpRequestMethods, resource: string) {
+			if (method === 'GET' && resource.includes('usedRange')) {
+				return {
+					address: 'Sheet4!A1:D6',
+					values: [
+						['id', 'name', 'age', 'data'],
+						[1, 'Sam', 33, 'data 1'],
+						[2, 'Jon', 44, 'data 2'],
+						[3, 'Ron', 55, 'data 3'],
+					],
+				};
+			}
+
+			if (method === 'PATCH' && resource.includes('{A0883CFE-D27E-4ECC-B94B-981830AAD55B}')) {
+				return {
+					values: [[4, 'Sam', 34, 'data 4']],
+				};
+			}
+
+			if (method === 'PATCH' && resource.includes('{426949D7-797F-43A9-A8A4-8FE283495A82}')) {
+				return {
+					values: [[4, 'Don', 37, 'data 44']],
+				};
+			}
+		}),
+	};
+});
+
+describe('Test MicrosoftExcelV2, worksheet => append', () => {
+	const workflows = ['nodes/Microsoft/Excel/test/v2/node/worksheet/append.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	const nodeTypes = setup(tests);
+
+	for (const testData of tests) {
+		test(testData.description, async () => await equalityTest(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/append.workflow.json b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/append.workflow.json
new file mode 100644
index 0000000000000..73d2a1f2d9649
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/append.workflow.json
@@ -0,0 +1,166 @@
+{
+	"name": "microsoft excel 365 - tests",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "2e1ec8f6-a2e2-4aa9-909c-d0a279584131",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [800, 260]
+		},
+		{
+			"parameters": {
+				"resource": "worksheet",
+				"operation": "append",
+				"workbook": {
+					"__rl": true,
+					"value": "01FUWX3BQ4ATCOZNR265GLA6IJEZDQUE4I",
+					"mode": "list",
+					"cachedResultName": "ПРРО копія"
+				},
+				"worksheet": {
+					"__rl": true,
+					"value": "={A0883CFE-D27E-4ECC-B94B-981830AAD55B}",
+					"mode": "id"
+				},
+				"fieldsUi": {
+					"values": [
+						{
+							"column": "id",
+							"fieldValue": "4"
+						},
+						{
+							"column": "name",
+							"fieldValue": "Sam"
+						},
+						{
+							"column": "age",
+							"fieldValue": "34"
+						},
+						{
+							"column": "data",
+							"fieldValue": "data 4"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "86f2a240-3acf-45c2-b97f-63dd655d296b",
+			"name": "Microsoft Excel 365",
+			"type": "n8n-nodes-base.microsoftExcel",
+			"typeVersion": 2,
+			"position": [1280, 260],
+			"credentials": {
+				"microsoftExcelOAuth2Api": {
+					"id": "70",
+					"name": "Microsoft Excel account"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"resource": "worksheet",
+				"operation": "append",
+				"workbook": {
+					"__rl": true,
+					"value": "01FUWX3BQ4ATCOZNR265GLA6IJEZDQUE4I",
+					"mode": "list",
+					"cachedResultName": "ПРРО копія"
+				},
+				"worksheet": {
+					"__rl": true,
+					"value": "{426949D7-797F-43A9-A8A4-8FE283495A82}",
+					"mode": "list",
+					"cachedResultName": "Sheet5"
+				},
+				"dataMode": "autoMap",
+				"options": {}
+			},
+			"id": "531949d8-1ffa-4e1c-ae3e-032360b74f06",
+			"name": "Microsoft Excel 3651",
+			"type": "n8n-nodes-base.microsoftExcel",
+			"typeVersion": 2,
+			"position": [1280, 500],
+			"credentials": {
+				"microsoftExcelOAuth2Api": {
+					"id": "70",
+					"name": "Microsoft Excel account"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"jsCode": "return {\n  id: 4,\n  name: 'Don',\n  age: 37,\n  data: 'data 44',\n};"
+			},
+			"id": "2919f9b9-e3ac-42cd-a792-774738fd2195",
+			"name": "Code",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [1080, 500]
+		}
+	],
+	"pinData": {
+		"Microsoft Excel 3651": [
+			{
+				"json": {
+					"id": 4,
+					"name": "Don",
+					"age": 37,
+					"data": "data 44"
+				}
+			}
+		],
+		"Microsoft Excel 365": [
+			{
+				"json": {
+					"id": 4,
+					"name": "Sam",
+					"age": 34,
+					"data": "data 4"
+				}
+			}
+		],
+		"Code": [
+			{
+				"json": {
+					"id": 4,
+					"name": "Don",
+					"age": 37,
+					"data": "data 44"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Microsoft Excel 365",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Code",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code": {
+			"main": [
+				[
+					{
+						"node": "Microsoft Excel 3651",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {}
+}
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
new file mode 100644
index 0000000000000..dbb3a0d96dd56
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/clear.test.ts
@@ -0,0 +1,66 @@
+import type { INodeTypes } from 'n8n-workflow';
+
+import nock from 'nock';
+import * as transport from '../../../../v2/transport';
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+jest.mock('../../../../v2/transport', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		microsoftApiRequest: jest.fn(async function (method: IHttpRequestMethods) {
+			if (method === 'POST') {
+				return {
+					values: [
+						{
+							json: {
+								success: true,
+							},
+						},
+					],
+				};
+			}
+		}),
+	};
+});
+
+describe('Test MicrosoftExcelV2, worksheet => clear', () => {
+	const workflows = ['nodes/Microsoft/Excel/test/v2/node/worksheet/clear.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	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(transport.microsoftApiRequest).toHaveBeenCalledTimes(1);
+		expect(transport.microsoftApiRequest).toHaveBeenCalledWith(
+			'POST',
+			'/drive/items/01FUWX3BQ4ATCOZNR265GLA6IJEZDQUE4I/workbook/worksheets/{F7AF92FE-D42D-452F-8E4A-901B1D1EBF3F}/range/clear',
+			{ applyTo: 'All' },
+		);
+
+		expect(result.finished).toEqual(true);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/clear.workflow.json b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/clear.workflow.json
new file mode 100644
index 0000000000000..0578a49a68da4
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/clear.workflow.json
@@ -0,0 +1,66 @@
+{
+	"name": "My workflow 5",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "f0857ec9-0709-4657-a2f4-059837c94060",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [540, 220]
+		},
+		{
+			"parameters": {
+				"resource": "worksheet",
+				"operation": "clear",
+				"workbook": {
+					"__rl": true,
+					"value": "01FUWX3BQ4ATCOZNR265GLA6IJEZDQUE4I",
+					"mode": "list",
+					"cachedResultName": "ПРРО копія"
+				},
+				"worksheet": {
+					"__rl": true,
+					"value": "{F7AF92FE-D42D-452F-8E4A-901B1D1EBF3F}",
+					"mode": "list",
+					"cachedResultName": "Sheet2"
+				}
+			},
+			"id": "426ed055-0c9b-4ae2-a9fe-a6cce875d5ee",
+			"name": "Microsoft Excel 365",
+			"type": "n8n-nodes-base.microsoftExcel",
+			"typeVersion": 2,
+			"position": [1020, 220],
+			"credentials": {
+				"microsoftExcelOAuth2Api": {
+					"id": "70",
+					"name": "Microsoft Excel account"
+				}
+			}
+		}
+	],
+	"pinData": {
+		"Microsoft Excel 365": [
+			{
+				"json": {
+					"success": true
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Microsoft Excel 365",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {}
+}
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
new file mode 100644
index 0000000000000..e53b95d668d80
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/deleteWorksheet.test.ts
@@ -0,0 +1,65 @@
+import type { INodeTypes } from 'n8n-workflow';
+
+import nock from 'nock';
+import * as transport from '../../../../v2/transport';
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+jest.mock('../../../../v2/transport', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		microsoftApiRequest: jest.fn(async function (method: IHttpRequestMethods) {
+			if (method === 'DELETE') {
+				return {
+					values: [
+						{
+							json: {
+								success: true,
+							},
+						},
+					],
+				};
+			}
+		}),
+	};
+});
+
+describe('Test MicrosoftExcelV2, worksheet => deleteWorksheet', () => {
+	const workflows = ['nodes/Microsoft/Excel/test/v2/node/worksheet/deleteWorksheet.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	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(transport.microsoftApiRequest).toHaveBeenCalledTimes(1);
+		expect(transport.microsoftApiRequest).toHaveBeenCalledWith(
+			'DELETE',
+			'/drive/items/01FUWX3BQ4ATCOZNR265GLA6IJEZDQUE4I/workbook/worksheets/{88D9C37A-4180-4B23-8996-BF11F32EB63C}',
+		);
+
+		expect(result.finished).toEqual(true);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/deleteWorksheet.workflow.json b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/deleteWorksheet.workflow.json
new file mode 100644
index 0000000000000..1446f9a89a937
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/deleteWorksheet.workflow.json
@@ -0,0 +1,66 @@
+{
+	"name": "My workflow 5",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "f0857ec9-0709-4657-a2f4-059837c94060",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [540, 220]
+		},
+		{
+			"parameters": {
+				"resource": "worksheet",
+				"operation": "deleteWorksheet",
+				"workbook": {
+					"__rl": true,
+					"value": "01FUWX3BQ4ATCOZNR265GLA6IJEZDQUE4I",
+					"mode": "list",
+					"cachedResultName": "ПРРО копія"
+				},
+				"worksheet": {
+					"__rl": true,
+					"value": "{88D9C37A-4180-4B23-8996-BF11F32EB63C}",
+					"mode": "list",
+					"cachedResultName": "188"
+				}
+			},
+			"id": "426ed055-0c9b-4ae2-a9fe-a6cce875d5ee",
+			"name": "Microsoft Excel 365",
+			"type": "n8n-nodes-base.microsoftExcel",
+			"typeVersion": 2,
+			"position": [1020, 220],
+			"credentials": {
+				"microsoftExcelOAuth2Api": {
+					"id": "70",
+					"name": "Microsoft Excel account"
+				}
+			}
+		}
+	],
+	"pinData": {
+		"Microsoft Excel 365": [
+			{
+				"json": {
+					"success": true
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Microsoft Excel 365",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {}
+}
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
new file mode 100644
index 0000000000000..445ca6f43431d
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/getAll.test.ts
@@ -0,0 +1,74 @@
+import type { INodeTypes } from 'n8n-workflow';
+
+import nock from 'nock';
+import * as transport from '../../../../v2/transport';
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+jest.mock('../../../../v2/transport', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		microsoftApiRequest: jest.fn(async function (method: IHttpRequestMethods) {
+			if (method === 'GET') {
+				return {
+					value: [
+						{
+							id: '{00000000-0001-0000-0000-000000000000}',
+							name: 'Sheet1',
+						},
+						{
+							id: '{F7AF92FE-D42D-452F-8E4A-901B1D1EBF3F}',
+							name: 'Sheet2',
+						},
+						{
+							id: '{BF7BD843-4912-4B81-A0AC-4FBBC2783E20}',
+							name: 'foo2',
+						},
+					],
+				};
+			}
+		}),
+	};
+});
+
+describe('Test MicrosoftExcelV2, worksheet => getAll', () => {
+	const workflows = ['nodes/Microsoft/Excel/test/v2/node/worksheet/getAll.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	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(transport.microsoftApiRequest).toHaveBeenCalledTimes(1);
+		expect(transport.microsoftApiRequest).toHaveBeenCalledWith(
+			'GET',
+			'/drive/items/01FUWX3BQ4ATCOZNR265GLA6IJEZDQUE4I/workbook/worksheets',
+			{},
+			{ $select: 'name', $top: 3 },
+		);
+
+		expect(result.finished).toEqual(true);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/getAll.workflow.json b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/getAll.workflow.json
new file mode 100644
index 0000000000000..ef2f7bfe5a68c
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/getAll.workflow.json
@@ -0,0 +1,76 @@
+{
+	"name": "My workflow 5",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "f0857ec9-0709-4657-a2f4-059837c94060",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [540, 220]
+		},
+		{
+			"parameters": {
+				"resource": "worksheet",
+				"workbook": {
+					"__rl": true,
+					"value": "01FUWX3BQ4ATCOZNR265GLA6IJEZDQUE4I",
+					"mode": "list",
+					"cachedResultName": "ПРРО копія"
+				},
+				"limit": 3,
+				"filters": {
+					"fields": "name"
+				}
+			},
+			"id": "426ed055-0c9b-4ae2-a9fe-a6cce875d5ee",
+			"name": "Microsoft Excel 365",
+			"type": "n8n-nodes-base.microsoftExcel",
+			"typeVersion": 2,
+			"position": [1020, 220],
+			"credentials": {
+				"microsoftExcelOAuth2Api": {
+					"id": "70",
+					"name": "Microsoft Excel account"
+				}
+			}
+		}
+	],
+	"pinData": {
+		"Microsoft Excel 365": [
+			{
+				"json": {
+					"id": "{00000000-0001-0000-0000-000000000000}",
+					"name": "Sheet1"
+				}
+			},
+			{
+				"json": {
+					"id": "{F7AF92FE-D42D-452F-8E4A-901B1D1EBF3F}",
+					"name": "Sheet2"
+				}
+			},
+			{
+				"json": {
+					"id": "{BF7BD843-4912-4B81-A0AC-4FBBC2783E20}",
+					"name": "foo2"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Microsoft Excel 365",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {}
+}
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
new file mode 100644
index 0000000000000..16b90626e8f79
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/readRows.test.ts
@@ -0,0 +1,51 @@
+import nock from 'nock';
+import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
+
+jest.mock('../../../../v2/transport', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		microsoftApiRequest: jest.fn(async function (method: IHttpRequestMethods, resource: string) {
+			{
+				if (method === 'GET' && resource.includes('usedRange')) {
+					return {
+						values: [
+							['id', 'name', 'age', 'data'],
+							[1, 'Sam', 33, 'data 1'],
+							[2, 'Jon', 44, 'data 2'],
+							[3, 'Ron', 55, 'data 3'],
+						],
+					};
+				}
+
+				return {
+					values: [
+						['id', 'name', 'age', 'data'],
+						[1, 'Sam', 33, 'data 1'],
+						[2, 'Jon', 44, 'data 2'],
+					],
+				};
+			}
+		}),
+	};
+});
+
+describe('Test MicrosoftExcelV2, worksheet => readRows', () => {
+	const workflows = ['nodes/Microsoft/Excel/test/v2/node/worksheet/readRows.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	const nodeTypes = setup(tests);
+
+	for (const testData of tests) {
+		test(testData.description, async () => await equalityTest(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/readRows.workflow.json b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/readRows.workflow.json
new file mode 100644
index 0000000000000..8ea8e6bdb8a86
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/readRows.workflow.json
@@ -0,0 +1,137 @@
+{
+	"name": "microsoft excel 365 - read rows",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "2e1ec8f6-a2e2-4aa9-909c-d0a279584131",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [820, 380]
+		},
+		{
+			"parameters": {
+				"resource": "worksheet",
+				"operation": "readRows",
+				"workbook": {
+					"__rl": true,
+					"value": "01FUWX3BQ4ATCOZNR265GLA6IJEZDQUE4I",
+					"mode": "list",
+					"cachedResultName": "ПРРО копія"
+				},
+				"worksheet": {
+					"__rl": true,
+					"value": "{A0883CFE-D27E-4ECC-B94B-981830AAD55B}",
+					"mode": "list",
+					"cachedResultName": "Sheet4"
+				},
+				"options": {}
+			},
+			"id": "86f2a240-3acf-45c2-b97f-63dd655d296b",
+			"name": "Microsoft Excel 365",
+			"type": "n8n-nodes-base.microsoftExcel",
+			"typeVersion": 2,
+			"position": [1100, 260],
+			"credentials": {
+				"microsoftExcelOAuth2Api": {
+					"id": "70",
+					"name": "Microsoft Excel account"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"resource": "worksheet",
+				"operation": "readRows",
+				"workbook": {
+					"__rl": true,
+					"value": "01FUWX3BQ4ATCOZNR265GLA6IJEZDQUE4I",
+					"mode": "list",
+					"cachedResultName": "ПРРО копія",
+					"cachedResultUrl": "https://5w1hb7-my.sharepoint.com/personal/michaeldevsandbox_5w1hb7_onmicrosoft_com/_layouts/15/Doc.aspx?sourcedoc=%7BECC4041C-3AB6-4CF7-B079-0926470A1388%7D&file=%D0%9F%D0%A0%D0%A0%D0%9E%20%D0%BA%D0%BE%D0%BF%D1%96%D1%8F.xlsx&action=default&mobileredirect=true&DefaultItemOpen=1"
+				},
+				"worksheet": {
+					"__rl": true,
+					"value": "{A0883CFE-D27E-4ECC-B94B-981830AAD55B}",
+					"mode": "list",
+					"cachedResultName": "Sheet4",
+					"cachedResultUrl": "https://5w1hb7-my.sharepoint.com/personal/michaeldevsandbox_5w1hb7_onmicrosoft_com/_layouts/15/Doc.aspx?sourcedoc=%7BECC4041C-3AB6-4CF7-B079-0926470A1388%7D&file=%D0%9F%D0%A0%D0%A0%D0%9E%20%D0%BA%D0%BE%D0%BF%D1%96%D1%8F.xlsx&action=default&mobileredirect=true&DefaultItemOpen=1&activeCell=Sheet4!A1"
+				},
+				"useRange": true,
+				"range": "A1:D3",
+				"dataStartRow": 2,
+				"options": {}
+			},
+			"id": "8ce6ab42-8f38-452b-90da-598d8a958c2b",
+			"name": "Microsoft Excel 3651",
+			"type": "n8n-nodes-base.microsoftExcel",
+			"typeVersion": 2,
+			"position": [1100, 520],
+			"credentials": {
+				"microsoftExcelOAuth2Api": {
+					"id": "70",
+					"name": "Microsoft Excel account"
+				}
+			}
+		}
+	],
+	"pinData": {
+		"Microsoft Excel 365": [
+			{
+				"json": {
+					"id": 1,
+					"name": "Sam",
+					"age": 33,
+					"data": "data 1"
+				}
+			},
+			{
+				"json": {
+					"id": 2,
+					"name": "Jon",
+					"age": 44,
+					"data": "data 2"
+				}
+			},
+			{
+				"json": {
+					"id": 3,
+					"name": "Ron",
+					"age": 55,
+					"data": "data 3"
+				}
+			}
+		],
+		"Microsoft Excel 3651": [
+			{
+				"json": {
+					"id": 2,
+					"name": "Jon",
+					"age": 44,
+					"data": "data 2"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Microsoft Excel 365",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Microsoft Excel 3651",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {},
+	"tags": []
+}
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
new file mode 100644
index 0000000000000..4da95e1302bfa
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/update.test.ts
@@ -0,0 +1,64 @@
+import nock from 'nock';
+import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
+
+jest.mock('../../../../v2/transport', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		microsoftApiRequest: jest.fn(async function (method: IHttpRequestMethods, resource: string) {
+			if (method === 'GET' && resource.includes('usedRange')) {
+				return {
+					address: 'Sheet4!A1:D6',
+					values: [
+						['id', 'name', 'age', 'data'],
+						[1, 'Sam', 33, 'data 1'],
+						[2, 'Jon', 44, 'data 2'],
+						[3, 'Ron', 55, 'data 3'],
+					],
+				};
+			}
+
+			if (method === 'PATCH' && resource.includes('{A0883CFE-D27E-4ECC-B94B-981830AAD55B}')) {
+				return {
+					values: [
+						['id', 'name', 'age', 'data'],
+						[1, 'Sam', 33, 'data 1'],
+						[2, 'Jon', 44, 'data 2'],
+						[3, 'Sam', 34, 'data 4'],
+					],
+				};
+			}
+
+			if (method === 'PATCH' && resource.includes('{426949D7-797F-43A9-A8A4-8FE283495A82}')) {
+				return {
+					values: [
+						['id', 'name', 'age', 'data'],
+						[1, 'Sam', 33, 'data 1'],
+						[2, 'Jon', 44, 'data 2'],
+						[3, 'Don', 37, 'data 44'],
+					],
+				};
+			}
+		}),
+	};
+});
+
+describe('Test MicrosoftExcelV2, worksheet => update', () => {
+	const workflows = ['nodes/Microsoft/Excel/test/v2/node/worksheet/update.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	const nodeTypes = setup(tests);
+
+	for (const testData of tests) {
+		test(testData.description, async () => await equalityTest(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/update.workflow.json b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/update.workflow.json
new file mode 100644
index 0000000000000..5c94f2b42e28b
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/update.workflow.json
@@ -0,0 +1,154 @@
+{
+	"name": "My workflow 5",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "875e8784-eb59-40d8-ba45-129a5e29881c",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [380, 140]
+		},
+		{
+			"parameters": {
+				"resource": "worksheet",
+				"operation": "update",
+				"workbook": {
+					"__rl": true,
+					"value": "01FUWX3BQ4ATCOZNR265GLA6IJEZDQUE4I",
+					"mode": "list",
+					"cachedResultName": "ПРРО копія"
+				},
+				"worksheet": {
+					"__rl": true,
+					"value": "={A0883CFE-D27E-4ECC-B94B-981830AAD55B}",
+					"mode": "id"
+				},
+				"columnToMatchOn": "id",
+				"valueToMatchOn": "3",
+				"fieldsUi": {
+					"values": [
+						{
+							"column": "name",
+							"fieldValue": "Sam"
+						},
+						{
+							"column": "age",
+							"fieldValue": "34"
+						},
+						{
+							"column": "data",
+							"fieldValue": "data 4"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "0e0ac1d2-242c-486a-9287-c70307645acc",
+			"name": "Microsoft Excel 365",
+			"type": "n8n-nodes-base.microsoftExcel",
+			"typeVersion": 2,
+			"position": [860, 140],
+			"credentials": {
+				"microsoftExcelOAuth2Api": {
+					"id": "70",
+					"name": "Microsoft Excel account"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"resource": "worksheet",
+				"operation": "update",
+				"workbook": {
+					"__rl": true,
+					"value": "01FUWX3BQ4ATCOZNR265GLA6IJEZDQUE4I",
+					"mode": "list",
+					"cachedResultName": "ПРРО копія"
+				},
+				"worksheet": {
+					"__rl": true,
+					"value": "={426949D7-797F-43A9-A8A4-8FE283495A82}",
+					"mode": "id"
+				},
+				"dataMode": "autoMap",
+				"columnToMatchOn": "id",
+				"options": {}
+			},
+			"id": "d3209da3-cfaf-40a6-a318-c66c2931a28a",
+			"name": "Microsoft Excel 3651",
+			"type": "n8n-nodes-base.microsoftExcel",
+			"typeVersion": 2,
+			"position": [860, 380],
+			"credentials": {
+				"microsoftExcelOAuth2Api": {
+					"id": "70",
+					"name": "Microsoft Excel account"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"jsCode": "return {\n  id: 3,\n  name: 'Don',\n  age: 37,\n  data: 'data 44',\n};"
+			},
+			"id": "eb908630-7324-46a5-890d-b5cfccf17cb2",
+			"name": "Code",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [660, 380]
+		}
+	],
+	"pinData": {
+		"Microsoft Excel 365": [
+			{
+				"json": {
+					"id": 3,
+					"name": "Sam",
+					"age": 34,
+					"data": "data 4"
+				}
+			}
+		],
+		"Microsoft Excel 3651": [
+			{
+				"json": {
+					"id": 3,
+					"name": "Don",
+					"age": 37,
+					"data": "data 44"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Microsoft Excel 365",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Code",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code": {
+			"main": [
+				[
+					{
+						"node": "Microsoft Excel 3651",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {}
+}
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
new file mode 100644
index 0000000000000..d370fcbdab143
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/upsert.test.ts
@@ -0,0 +1,66 @@
+import nock from 'nock';
+import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
+
+jest.mock('../../../../v2/transport', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		microsoftApiRequest: jest.fn(async function (method: IHttpRequestMethods, resource: string) {
+			if (method === 'GET' && resource.includes('usedRange')) {
+				return {
+					address: 'Sheet4!A1:D6',
+					values: [
+						['id', 'name', 'age', 'data'],
+						[1, 'Sam', 33, 'data 1'],
+						[2, 'Jon', 44, 'data 2'],
+						[3, 'Ron', 55, 'data 3'],
+					],
+				};
+			}
+
+			if (method === 'PATCH' && resource.includes('{A0883CFE-D27E-4ECC-B94B-981830AAD55B}')) {
+				return {
+					values: [
+						['id', 'name', 'age', 'data'],
+						[1, 'Sam', 33, 'data 1'],
+						[2, 'Jon', 44, 'data 2'],
+						[3, 'Ron', 55, 'data 3'],
+						[4, 'Sam', 34, 'data 4'],
+					],
+				};
+			}
+
+			if (method === 'PATCH' && resource.includes('{426949D7-797F-43A9-A8A4-8FE283495A82}')) {
+				return {
+					values: [
+						['id', 'name', 'age', 'data'],
+						[1, 'Sam', 33, 'data 1'],
+						[2, 'Jon', 44, 'data 2'],
+						[3, 'Ron', 55, 'data 3'],
+						[4, 'Don', 37, 'data 44'],
+					],
+				};
+			}
+		}),
+	};
+});
+
+describe('Test MicrosoftExcelV2, worksheet => upsert', () => {
+	const workflows = ['nodes/Microsoft/Excel/test/v2/node/worksheet/upsert.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	const nodeTypes = setup(tests);
+
+	for (const testData of tests) {
+		test(testData.description, async () => await equalityTest(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/upsert.workflow.json b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/upsert.workflow.json
new file mode 100644
index 0000000000000..2e8a762c02984
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/upsert.workflow.json
@@ -0,0 +1,162 @@
+{
+	"name": "My workflow 5",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "f0857ec9-0709-4657-a2f4-059837c94060",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [540, 220]
+		},
+		{
+			"parameters": {
+				"resource": "worksheet",
+				"operation": "upsert",
+				"workbook": {
+					"__rl": true,
+					"value": "01FUWX3BQ4ATCOZNR265GLA6IJEZDQUE4I",
+					"mode": "list",
+					"cachedResultName": "ПРРО копія",
+					"cachedResultUrl": "https://5w1hb7-my.sharepoint.com/personal/michaeldevsandbox_5w1hb7_onmicrosoft_com/_layouts/15/Doc.aspx?sourcedoc=%7BECC4041C-3AB6-4CF7-B079-0926470A1388%7D&file=%D0%9F%D0%A0%D0%A0%D0%9E%20%D0%BA%D0%BE%D0%BF%D1%96%D1%8F.xlsx&action=default&mobileredirect=true&DefaultItemOpen=1"
+				},
+				"worksheet": {
+					"__rl": true,
+					"value": "={A0883CFE-D27E-4ECC-B94B-981830AAD55B}",
+					"mode": "id"
+				},
+				"columnToMatchOn": "id",
+				"valueToMatchOn": "4",
+				"fieldsUi": {
+					"values": [
+						{
+							"column": "name",
+							"fieldValue": "Sam"
+						},
+						{
+							"column": "age",
+							"fieldValue": "34"
+						},
+						{
+							"column": "data",
+							"fieldValue": "data 4"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "426ed055-0c9b-4ae2-a9fe-a6cce875d5ee",
+			"name": "Microsoft Excel 365",
+			"type": "n8n-nodes-base.microsoftExcel",
+			"typeVersion": 2,
+			"position": [1020, 220],
+			"credentials": {
+				"microsoftExcelOAuth2Api": {
+					"id": "70",
+					"name": "Microsoft Excel account"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"resource": "worksheet",
+				"operation": "upsert",
+				"workbook": {
+					"__rl": true,
+					"value": "01FUWX3BQ4ATCOZNR265GLA6IJEZDQUE4I",
+					"mode": "list",
+					"cachedResultName": "ПРРО копія",
+					"cachedResultUrl": "https://5w1hb7-my.sharepoint.com/personal/michaeldevsandbox_5w1hb7_onmicrosoft_com/_layouts/15/Doc.aspx?sourcedoc=%7BECC4041C-3AB6-4CF7-B079-0926470A1388%7D&file=%D0%9F%D0%A0%D0%A0%D0%9E%20%D0%BA%D0%BE%D0%BF%D1%96%D1%8F.xlsx&action=default&mobileredirect=true&DefaultItemOpen=1"
+				},
+				"worksheet": {
+					"__rl": true,
+					"value": "={426949D7-797F-43A9-A8A4-8FE283495A82}",
+					"mode": "id"
+				},
+				"dataMode": "autoMap",
+				"columnToMatchOn": "id",
+				"options": {}
+			},
+			"id": "0b10bfae-4e15-48c5-a2e6-7bec1c2687ec",
+			"name": "Microsoft Excel 3651",
+			"type": "n8n-nodes-base.microsoftExcel",
+			"typeVersion": 2,
+			"position": [1020, 460],
+			"credentials": {
+				"microsoftExcelOAuth2Api": {
+					"id": "70",
+					"name": "Microsoft Excel account"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"jsCode": "return {\n  id: 4,\n  name: 'Don',\n  age: 37,\n  data: 'data 44',\n};"
+			},
+			"id": "93453ccb-5ac3-425b-8ac4-d20f0dfe9bab",
+			"name": "Code",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [820, 460]
+		}
+	],
+	"pinData": {
+		"Microsoft Excel 365": [
+			{
+				"json": {
+					"id": 4,
+					"name": "Sam",
+					"age": 34,
+					"data": "data 4"
+				}
+			}
+		],
+		"Microsoft Excel 3651": [
+			{
+				"json": {
+					"id": 4,
+					"name": "Don",
+					"age": 37,
+					"data": "data 44"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Microsoft Excel 365",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Code",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code": {
+			"main": [
+				[
+					{
+						"node": "Microsoft Excel 3651",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {},
+	"versionId": "f24273bf-ef07-49da-960b-a68b63961d4a",
+	"id": "135",
+	"meta": {
+		"instanceId": "36203ea1ce3cef713fa25999bd9874ae26b9e4c2c3a90a365f2882a154d031d0"
+	},
+	"tags": []
+}
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
new file mode 100644
index 0000000000000..8a67dbcf18589
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/utils/utils.test.ts
@@ -0,0 +1,575 @@
+import { get } from 'lodash';
+import { mock } from 'jest-mock-extended';
+import type { IDataObject, IExecuteFunctions, IGetNodeParameterOptions, INode } from 'n8n-workflow';
+import { constructExecutionMetaData } from 'n8n-core';
+import {
+	checkRange,
+	prepareOutput,
+	updateByAutoMaping,
+	updateByDefinedValues,
+} from '../../../v2/helpers/utils';
+
+const node: INode = {
+	id: '1',
+	name: 'Microsoft Excel 365',
+	typeVersion: 2,
+	type: 'n8n-nodes-base.microsoftExcel',
+	position: [60, 760],
+	parameters: {},
+};
+
+const fakeExecute = (nodeParameters: IDataObject[]) => {
+	const fakeExecuteFunction = {
+		getInputData() {
+			return [{ json: {} }];
+		},
+		getNodeParameter(
+			parameterName: string,
+			itemIndex: number,
+			fallbackValue?: IDataObject | undefined,
+			options?: IGetNodeParameterOptions | undefined,
+		) {
+			const parameter = options?.extractValue ? `${parameterName}.value` : parameterName;
+			return get(nodeParameters[itemIndex], parameter, fallbackValue);
+		},
+	} as unknown as IExecuteFunctions;
+	return fakeExecuteFunction;
+};
+
+const responseData = {
+	address: 'Sheet4!A1:D4',
+	addressLocal: 'Sheet4!A1:D4',
+	columnCount: 4,
+	cellCount: 16,
+	columnHidden: false,
+	rowHidden: false,
+	numberFormat: [
+		['General', 'General', 'General', 'General'],
+		['General', 'General', 'General', 'General'],
+		['General', 'General', 'General', 'General'],
+		['General', 'General', 'General', 'General'],
+	],
+	columnIndex: 0,
+	text: [
+		['id', 'name', 'age', 'data'],
+		['1', 'Sam', '33', 'data 1'],
+		['2', 'Jon', '44', 'data 2'],
+		['3', 'Ron', '55', 'data 3'],
+	],
+	formulas: [
+		['id', 'name', 'age', 'data'],
+		[1, 'Sam', 33, 'data 1'],
+		[2, 'Jon', 44, 'data 2'],
+		[3, 'Ron', 55, 'data 3'],
+	],
+	formulasLocal: [
+		['id', 'name', 'age', 'data'],
+		[1, 'Sam', 33, 'data 1'],
+		[2, 'Jon', 44, 'data 2'],
+		[3, 'Ron', 55, 'data 3'],
+	],
+	formulasR1C1: [
+		['id', 'name', 'age', 'data'],
+		[1, 'Sam', 33, 'data 1'],
+		[2, 'Jon', 44, 'data 2'],
+		[3, 'Ron', 55, 'data 3'],
+	],
+	hidden: false,
+	rowCount: 4,
+	rowIndex: 0,
+	valueTypes: [
+		['String', 'String', 'String', 'String'],
+		['Double', 'String', 'Double', 'String'],
+		['Double', 'String', 'Double', 'String'],
+		['Double', 'String', 'Double', 'String'],
+	],
+	values: [
+		['id', 'name', 'age', 'data'],
+		[1, 'Sam', 33, 'data 1'],
+		[2, 'Jon', 44, 'data 2'],
+		[3, 'Ron', 55, 'data 3'],
+	],
+};
+
+describe('Test MicrosoftExcelV2, prepareOutput', () => {
+	const thisArg = mock<IExecuteFunctions>({
+		helpers: mock({ constructExecutionMetaData }),
+		getInputData() {
+			return [{ json: {} }];
+		},
+	});
+
+	it('should return empty array', () => {
+		const output = prepareOutput.call(thisArg, node, { values: [] }, { rawData: false });
+		expect(output).toBeDefined();
+		expect(output).toEqual([]);
+	});
+
+	it('should return raw response', () => {
+		const output = prepareOutput.call(thisArg, node, responseData, { rawData: true });
+		expect(output).toBeDefined();
+		expect(output[0].json.data).toEqual(responseData);
+	});
+
+	it('should return raw response in custom property', () => {
+		const customKey = 'customKey';
+		const output = prepareOutput.call(thisArg, node, responseData, {
+			rawData: true,
+			dataProperty: customKey,
+		});
+		expect(output).toBeDefined();
+		expect(output[0].json.customKey).toEqual(responseData);
+	});
+
+	it('should return formated response', () => {
+		const output = prepareOutput.call(thisArg, node, responseData, { rawData: false });
+		expect(output).toBeDefined();
+		expect(output.length).toEqual(3);
+		expect(output[0].json).toEqual({
+			id: 1,
+			name: 'Sam',
+			age: 33,
+			data: 'data 1',
+		});
+	});
+
+	it('should return response with selected first data row', () => {
+		const output = prepareOutput.call(thisArg, node, responseData, {
+			rawData: false,
+			firstDataRow: 3,
+		});
+		expect(output).toBeDefined();
+		expect(output.length).toEqual(1);
+		expect(output[0].json).toEqual({
+			id: 3,
+			name: 'Ron',
+			age: 55,
+			data: 'data 3',
+		});
+	});
+
+	it('should return response with selected first data row', () => {
+		const [firstRow, ...rest] = responseData.values;
+		const response = { values: [...rest, firstRow] };
+		const output = prepareOutput.call(thisArg, node, response, {
+			rawData: false,
+			keyRow: 3,
+			firstDataRow: 0,
+		});
+		expect(output).toBeDefined();
+		expect(output.length).toEqual(3);
+		expect(output[0].json).toEqual({
+			id: 1,
+			name: 'Sam',
+			age: 33,
+			data: 'data 1',
+		});
+	});
+});
+
+describe('Test MicrosoftExcelV2, updateByDefinedValues', () => {
+	it('should update single row', () => {
+		const nodeParameters = [
+			{
+				columnToMatchOn: 'id',
+				valueToMatchOn: 2,
+				fieldsUi: {
+					values: [
+						{
+							column: 'name',
+							fieldValue: 'Donald',
+						},
+					],
+				},
+			},
+		];
+
+		const sheetData = responseData.values;
+
+		const updateSummary = updateByDefinedValues.call(
+			fakeExecute(nodeParameters),
+			nodeParameters.length,
+			sheetData,
+			false,
+		);
+
+		expect(updateSummary).toBeDefined();
+		expect(updateSummary.updatedRows).toContain(0); //header row
+		expect(updateSummary.updatedRows).toContain(2); //updated row
+		expect(updateSummary.updatedRows).toHaveLength(2);
+		expect(updateSummary.updatedData[2][1]).toEqual('Donald'); // updated value
+	});
+
+	it('should update multiple rows', () => {
+		const nodeParameters = [
+			{
+				columnToMatchOn: 'id',
+				valueToMatchOn: 2,
+				fieldsUi: {
+					values: [
+						{
+							column: 'name',
+							fieldValue: 'Donald',
+						},
+					],
+				},
+			},
+			{
+				columnToMatchOn: 'id',
+				valueToMatchOn: 3,
+				fieldsUi: {
+					values: [
+						{
+							column: 'name',
+							fieldValue: 'Eduard',
+						},
+					],
+				},
+			},
+			{
+				columnToMatchOn: 'id',
+				valueToMatchOn: 4,
+				fieldsUi: {
+					values: [
+						{
+							column: 'name',
+							fieldValue: 'Ismael',
+						},
+					],
+				},
+			},
+		];
+
+		const sheetData = [
+			['id', 'name', 'age', 'data'],
+			[1, 'Sam', 33, 'data 1'],
+			[2, 'Jon', 44, 'data 2'],
+			[3, 'Ron', 55, 'data 3'],
+			[4, 'Ron', 55, 'data 3'],
+		];
+
+		const updateSummary = updateByDefinedValues.call(
+			fakeExecute(nodeParameters),
+			nodeParameters.length,
+			sheetData,
+			false,
+		);
+
+		expect(updateSummary).toBeDefined();
+		expect(updateSummary.updatedRows).toContain(0); //header row
+		expect(updateSummary.updatedRows).toContain(2); //updated row
+		expect(updateSummary.updatedRows).toContain(3); //updated row
+		expect(updateSummary.updatedRows).toContain(4); //updated row
+		expect(updateSummary.updatedRows).toHaveLength(4);
+		expect(updateSummary.updatedData[2][1]).toEqual('Donald'); // updated value
+		expect(updateSummary.updatedData[3][1]).toEqual('Eduard'); // updated value
+		expect(updateSummary.updatedData[4][1]).toEqual('Ismael'); // updated value
+	});
+
+	it('should update all occurances', () => {
+		const nodeParameters = [
+			{
+				columnToMatchOn: 'data',
+				valueToMatchOn: 'data 3',
+				fieldsUi: {
+					values: [
+						{
+							column: 'name',
+							fieldValue: 'Donald',
+						},
+					],
+				},
+			},
+		];
+
+		const sheetData = [
+			['id', 'name', 'age', 'data'],
+			[1, 'Sam', 55, 'data 3'],
+			[2, 'Jon', 77, 'data 3'],
+			[3, 'Ron', 44, 'data 3'],
+			[4, 'Ron', 33, 'data 3'],
+		];
+
+		const updateSummary = updateByDefinedValues.call(
+			fakeExecute(nodeParameters),
+			nodeParameters.length,
+			sheetData,
+			true,
+		);
+
+		expect(updateSummary).toBeDefined();
+		expect(updateSummary.updatedRows).toContain(0); //header row
+		expect(updateSummary.updatedRows).toHaveLength(5);
+
+		for (let i = 1; i < updateSummary.updatedRows.length; i++) {
+			expect(updateSummary.updatedData[i][1]).toEqual('Donald'); // updated value
+		}
+	});
+
+	it('should append rows', () => {
+		const nodeParameters = [
+			{
+				columnToMatchOn: 'id',
+				valueToMatchOn: 4,
+				fieldsUi: {
+					values: [
+						{
+							column: 'name',
+							fieldValue: 'Donald',
+						},
+						{
+							column: 'age',
+							fieldValue: 45,
+						},
+						{
+							column: 'data',
+							fieldValue: 'data 4',
+						},
+					],
+				},
+			},
+			{
+				columnToMatchOn: 'id',
+				valueToMatchOn: 5,
+				fieldsUi: {
+					values: [
+						{
+							column: 'name',
+							fieldValue: 'Victor',
+						},
+						{
+							column: 'age',
+							fieldValue: 67,
+						},
+						{
+							column: 'data',
+							fieldValue: 'data 5',
+						},
+					],
+				},
+			},
+		];
+
+		const sheetData = [
+			['id', 'name', 'age', 'data'],
+			[1, 'Sam', 55, 'data 3'],
+			[2, 'Jon', 77, 'data 3'],
+			[3, 'Ron', 44, 'data 3'],
+		];
+
+		const updateSummary = updateByDefinedValues.call(
+			fakeExecute(nodeParameters),
+			nodeParameters.length,
+			sheetData,
+			true,
+		);
+
+		expect(updateSummary).toBeDefined();
+		expect(updateSummary.updatedRows).toContain(0);
+		expect(updateSummary.updatedRows.length).toEqual(1);
+		expect(updateSummary.appendData[0]).toEqual({ id: 4, name: 'Donald', age: 45, data: 'data 4' });
+		expect(updateSummary.appendData[1]).toEqual({ id: 5, name: 'Victor', age: 67, data: 'data 5' });
+	});
+});
+
+describe('Test MicrosoftExcelV2, updateByAutoMaping', () => {
+	it('should update single row', () => {
+		const items = [
+			{
+				json: {
+					id: 2,
+					name: 'Donald',
+				},
+			},
+		];
+
+		const sheetData = [
+			['id', 'name', 'age', 'data'],
+			[1, 'Sam', 33, 'data 1'],
+			[2, 'Jon', 44, 'data 2'],
+			[3, 'Ron', 55, 'data 3'],
+		];
+
+		const updateSummary = updateByAutoMaping(items, sheetData, 'id');
+
+		expect(updateSummary).toBeDefined();
+		expect(updateSummary.updatedRows).toHaveLength(2);
+		expect(updateSummary.updatedRows).toContain(0); //header row
+		expect(updateSummary.updatedRows).toContain(2); //updated row
+		expect(updateSummary.updatedData[2][1]).toEqual('Donald'); // updated value
+	});
+
+	it('should append single row', () => {
+		const items = [
+			{
+				json: {
+					id: 5,
+					name: 'Donald',
+				},
+			},
+		];
+
+		const sheetData = [
+			['id', 'name', 'age', 'data'],
+			[1, 'Sam', 33, 'data 1'],
+			[2, 'Jon', 44, 'data 2'],
+			[3, 'Ron', 55, 'data 3'],
+		];
+
+		const updateSummary = updateByAutoMaping(items, sheetData, 'id');
+
+		expect(updateSummary).toBeDefined();
+		expect(updateSummary.updatedRows).toHaveLength(1);
+		expect(updateSummary.updatedRows).toContain(0); //header row
+		expect(updateSummary.appendData[0]).toEqual({ id: 5, name: 'Donald' });
+	});
+
+	it('should append skip row with match column undefined', () => {
+		const items = [
+			{
+				json: {
+					id: 5,
+					name: 'Donald',
+				},
+			},
+		];
+
+		const sheetData = [
+			['id', 'name', 'age', 'data'],
+			[1, 'Sam', 33, 'data 1'],
+			[2, 'Jon', 44, 'data 2'],
+			[3, 'Ron', 55, 'data 3'],
+		];
+
+		const updateSummary = updateByAutoMaping(items, sheetData, 'idd');
+
+		expect(updateSummary).toBeDefined();
+		expect(updateSummary.updatedRows).toHaveLength(1);
+		expect(updateSummary.updatedRows).toContain(0); //header row
+		expect(updateSummary.appendData.length).toEqual(0);
+	});
+
+	it('should update multiple rows', () => {
+		const items = [
+			{
+				json: {
+					id: 2,
+					name: 'Donald',
+				},
+			},
+			{
+				json: {
+					id: 3,
+					name: 'Eduard',
+				},
+			},
+			{
+				json: {
+					id: 4,
+					name: 'Ismael',
+				},
+			},
+		];
+
+		const sheetData = [
+			['id', 'name', 'age', 'data'],
+			[1, 'Sam', 33, 'data 1'],
+			[2, 'Jon', 44, 'data 2'],
+			[3, 'Ron', 55, 'data 3'],
+			[4, 'Ron', 55, 'data 3'],
+		];
+
+		const updateSummary = updateByAutoMaping(items, sheetData, 'id');
+
+		expect(updateSummary).toBeDefined();
+		expect(updateSummary.updatedRows).toContain(0); //header row
+		expect(updateSummary.updatedRows).toContain(2); //updated row
+		expect(updateSummary.updatedRows).toContain(3); //updated row
+		expect(updateSummary.updatedRows).toContain(4); //updated row
+		expect(updateSummary.updatedRows).toHaveLength(4);
+		expect(updateSummary.updatedData[2][1]).toEqual('Donald'); // updated value
+		expect(updateSummary.updatedData[3][1]).toEqual('Eduard'); // updated value
+		expect(updateSummary.updatedData[4][1]).toEqual('Ismael'); // updated value
+	});
+
+	it('should update all occurrences', () => {
+		const items = [
+			{
+				json: {
+					data: 'data 3',
+					name: 'Donald',
+				},
+			},
+		];
+
+		const sheetData = [
+			['id', 'name', 'age', 'data'],
+			[1, 'Sam', 55, 'data 3'],
+			[2, 'Jon', 77, 'data 3'],
+			[3, 'Ron', 44, 'data 3'],
+			[4, 'Ron', 33, 'data 3'],
+		];
+
+		const updateSummary = updateByAutoMaping(items, sheetData, 'data', true);
+
+		expect(updateSummary).toBeDefined();
+		expect(updateSummary.updatedRows).toContain(0); //header row
+		expect(updateSummary.updatedRows).toHaveLength(5);
+
+		for (let i = 1; i < updateSummary.updatedRows.length; i++) {
+			expect(updateSummary.updatedData[i][1]).toEqual('Donald'); // updated value
+		}
+	});
+
+	it('should append rows', () => {
+		const items = [
+			{
+				json: {
+					id: 4,
+					data: 'data 4',
+					name: 'Donald',
+					age: 45,
+				},
+			},
+			{
+				json: {
+					id: 5,
+					data: 'data 5',
+					name: 'Victor',
+					age: 67,
+				},
+			},
+		];
+
+		const sheetData = [
+			['id', 'name', 'age', 'data'],
+			[1, 'Sam', 55, 'data 3'],
+			[2, 'Jon', 77, 'data 3'],
+			[3, 'Ron', 44, 'data 3'],
+		];
+
+		const updateSummary = updateByAutoMaping(items, sheetData, 'data', true);
+
+		expect(updateSummary).toBeDefined();
+		expect(updateSummary.updatedRows).toContain(0);
+		expect(updateSummary.updatedRows.length).toEqual(1);
+		expect(updateSummary.appendData[0]).toEqual({ id: 4, name: 'Donald', age: 45, data: 'data 4' });
+		expect(updateSummary.appendData[1]).toEqual({ id: 5, name: 'Victor', age: 67, data: 'data 5' });
+	});
+});
+
+describe('Test MicrosoftExcelV2, checkRange', () => {
+	it('should not throw error', () => {
+		const range = 'A1:D4';
+		expect(() => {
+			checkRange(node, range);
+		}).not.toThrow();
+	});
+
+	it('should throw error', () => {
+		const range = 'A:D';
+		expect(() => {
+			checkRange(node, range);
+		}).toThrow();
+	});
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v1/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/Excel/v1/GenericFunctions.ts
new file mode 100644
index 0000000000000..de358224381a1
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v1/GenericFunctions.ts
@@ -0,0 +1,91 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	IHttpRequestMethods,
+	ILoadOptionsFunctions,
+	IRequestOptions,
+	JsonObject,
+} from 'n8n-workflow';
+import { NodeApiError } from 'n8n-workflow';
+
+export async function microsoftApiRequest(
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
+	resource: string,
+
+	body: any = {},
+	qs: IDataObject = {},
+	uri?: string,
+	headers: IDataObject = {},
+): Promise<any> {
+	const options: IRequestOptions = {
+		headers: {
+			'Content-Type': 'application/json',
+		},
+		method,
+		body,
+		qs,
+		uri: uri || `https://graph.microsoft.com/v1.0/me${resource}`,
+		json: true,
+	};
+	try {
+		if (Object.keys(headers).length !== 0) {
+			options.headers = Object.assign({}, options.headers, headers);
+		}
+
+		return await this.helpers.requestOAuth2.call(this, 'microsoftExcelOAuth2Api', options);
+	} catch (error) {
+		throw new NodeApiError(this.getNode(), error as JsonObject);
+	}
+}
+
+export async function microsoftApiRequestAllItems(
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	propertyName: string,
+	method: IHttpRequestMethods,
+	endpoint: string,
+
+	body: any = {},
+	query: IDataObject = {},
+): Promise<any> {
+	const returnData: IDataObject[] = [];
+
+	let responseData;
+	let uri: string | undefined;
+	query.$top = 100;
+
+	do {
+		responseData = await microsoftApiRequest.call(this, method, endpoint, body, query, uri);
+		uri = responseData['@odata.nextLink'];
+		if (uri?.includes('$top')) {
+			delete query.$top;
+		}
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
+	} while (responseData['@odata.nextLink'] !== undefined);
+
+	return returnData;
+}
+
+export async function microsoftApiRequestAllItemsSkip(
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	propertyName: string,
+	method: IHttpRequestMethods,
+	endpoint: string,
+
+	body: any = {},
+	query: IDataObject = {},
+): Promise<any> {
+	const returnData: IDataObject[] = [];
+
+	let responseData;
+	query.$top = 100;
+	query.$skip = 0;
+
+	do {
+		responseData = await microsoftApiRequest.call(this, method, endpoint, body, query);
+		query.$skip += query.$top;
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
+	} while (responseData.value.length !== 0);
+
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v1/MicrosoftExcelV1.node.ts b/packages/nodes-base/nodes/Microsoft/Excel/v1/MicrosoftExcelV1.node.ts
new file mode 100644
index 0000000000000..6f9c2a3f816be
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v1/MicrosoftExcelV1.node.ts
@@ -0,0 +1,693 @@
+/* eslint-disable n8n-nodes-base/node-filename-against-convention */
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
+	INodeExecutionData,
+	INodePropertyOptions,
+	INodeType,
+	INodeTypeBaseDescription,
+	INodeTypeDescription,
+	JsonObject,
+} from 'n8n-workflow';
+import { NodeApiError } from 'n8n-workflow';
+
+import { generatePairedItemData } from '../../../../utils/utilities';
+import {
+	microsoftApiRequest,
+	microsoftApiRequestAllItems,
+	microsoftApiRequestAllItemsSkip,
+} from './GenericFunctions';
+
+import { workbookFields, workbookOperations } from './WorkbookDescription';
+
+import { worksheetFields, worksheetOperations } from './WorksheetDescription';
+
+import { tableFields, tableOperations } from './TableDescription';
+
+import { oldVersionNotice } from '@utils/descriptions';
+
+const versionDescription: INodeTypeDescription = {
+	displayName: 'Microsoft Excel',
+	name: 'microsoftExcel',
+	icon: 'file:excel.svg',
+	group: ['input'],
+	version: 1,
+	subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+	description: 'Consume Microsoft Excel API',
+	defaults: {
+		name: 'Microsoft Excel',
+	},
+	inputs: ['main'],
+	outputs: ['main'],
+	credentials: [
+		{
+			name: 'microsoftExcelOAuth2Api',
+			required: true,
+		},
+	],
+	properties: [
+		oldVersionNotice,
+		{
+			displayName: 'Resource',
+			name: 'resource',
+			type: 'options',
+			noDataExpression: true,
+			options: [
+				{
+					name: 'Table',
+					value: 'table',
+					description: 'Represents an Excel table',
+				},
+				{
+					name: 'Workbook',
+					value: 'workbook',
+					description:
+						'Workbook is the top level object which contains related workbook objects such as worksheets, tables, ranges, etc',
+				},
+				{
+					name: 'Worksheet',
+					value: 'worksheet',
+					description:
+						'An Excel worksheet is a grid of cells. It can contain data, tables, charts, etc.',
+				},
+			],
+			default: 'workbook',
+		},
+		...workbookOperations,
+		...workbookFields,
+		...worksheetOperations,
+		...worksheetFields,
+		...tableOperations,
+		...tableFields,
+	],
+};
+export class MicrosoftExcelV1 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			...versionDescription,
+		};
+	}
+
+	methods = {
+		loadOptions: {
+			// Get all the workbooks to display them to user so that he can
+			// select them easily
+			async getWorkbooks(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const qs: IDataObject = {
+					select: 'id,name',
+				};
+				const returnData: INodePropertyOptions[] = [];
+				const workbooks = await microsoftApiRequestAllItems.call(
+					this,
+					'value',
+					'GET',
+					"/drive/root/search(q='.xlsx')",
+					{},
+					qs,
+				);
+				for (const workbook of workbooks) {
+					const workbookName = workbook.name;
+					const workbookId = workbook.id;
+					returnData.push({
+						name: workbookName,
+						value: workbookId,
+					});
+				}
+				return returnData;
+			},
+			// Get all the worksheets to display them to user so that he can
+			// select them easily
+			async getworksheets(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const workbookId = this.getCurrentNodeParameter('workbook');
+				const qs: IDataObject = {
+					select: 'id,name',
+				};
+				const returnData: INodePropertyOptions[] = [];
+				const worksheets = await microsoftApiRequestAllItems.call(
+					this,
+					'value',
+					'GET',
+					`/drive/items/${workbookId}/workbook/worksheets`,
+					{},
+					qs,
+				);
+				for (const worksheet of worksheets) {
+					const worksheetName = worksheet.name;
+					const worksheetId = worksheet.id;
+					returnData.push({
+						name: worksheetName,
+						value: worksheetId,
+					});
+				}
+				return returnData;
+			},
+			// Get all the tables to display them to user so that he can
+			// select them easily
+			async getTables(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const workbookId = this.getCurrentNodeParameter('workbook');
+				const worksheetId = this.getCurrentNodeParameter('worksheet');
+				const qs: IDataObject = {
+					select: 'id,name',
+				};
+				const returnData: INodePropertyOptions[] = [];
+				const tables = await microsoftApiRequestAllItems.call(
+					this,
+					'value',
+					'GET',
+					`/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/tables`,
+					{},
+					qs,
+				);
+				for (const table of tables) {
+					const tableName = table.name;
+					const tableId = table.id;
+					returnData.push({
+						name: tableName,
+						value: tableId,
+					});
+				}
+				return returnData;
+			},
+		},
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = this.getInputData();
+		const itemData = generatePairedItemData(items.length);
+		const returnData: INodeExecutionData[] = [];
+		const length = items.length;
+		let qs: IDataObject = {};
+		const result: IDataObject[] = [];
+		let responseData;
+		const resource = this.getNodeParameter('resource', 0);
+		const operation = this.getNodeParameter('operation', 0);
+
+		if (resource === 'table') {
+			//https://docs.microsoft.com/en-us/graph/api/table-post-rows?view=graph-rest-1.0&tabs=http
+			if (operation === 'addRow') {
+				try {
+					// TODO: At some point it should be possible to use item dependent parameters.
+					//       Is however important to then not make one separate request each.
+					const workbookId = this.getNodeParameter('workbook', 0) as string;
+					const worksheetId = this.getNodeParameter('worksheet', 0) as string;
+					const tableId = this.getNodeParameter('table', 0) as string;
+					const additionalFields = this.getNodeParameter('additionalFields', 0);
+					const body: IDataObject = {};
+
+					if (additionalFields.index) {
+						body.index = additionalFields.index as number;
+					}
+
+					// Get table columns to eliminate any columns not needed on the input
+					responseData = await microsoftApiRequest.call(
+						this,
+						'GET',
+						`/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/tables/${tableId}/columns`,
+						{},
+						qs,
+					);
+					const columns = responseData.value.map((column: IDataObject) => column.name);
+
+					const rows: any[][] = [];
+
+					// Bring the items into the correct format
+					for (const item of items) {
+						const row = [];
+						for (const column of columns) {
+							row.push(item.json[column]);
+						}
+						rows.push(row);
+					}
+
+					body.values = rows;
+					const { id } = await microsoftApiRequest.call(
+						this,
+						'POST',
+						`/drive/items/${workbookId}/workbook/createSession`,
+						{ persistChanges: true },
+					);
+					responseData = await microsoftApiRequest.call(
+						this,
+						'POST',
+						`/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/tables/${tableId}/rows/add`,
+						body,
+						{},
+						'',
+						{ 'workbook-session-id': id },
+					);
+					await microsoftApiRequest.call(
+						this,
+						'POST',
+						`/drive/items/${workbookId}/workbook/closeSession`,
+						{},
+						{},
+						'',
+						{ 'workbook-session-id': id },
+					);
+
+					const executionData = this.helpers.constructExecutionMetaData(
+						this.helpers.returnJsonArray(responseData as IDataObject[]),
+						{ itemData },
+					);
+
+					returnData.push(...executionData);
+				} catch (error) {
+					if (this.continueOnFail()) {
+						const executionErrorData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray({ error: error.message }),
+							{ itemData },
+						);
+						returnData.push(...executionErrorData);
+					} else {
+						throw error;
+					}
+				}
+			}
+			//https://docs.microsoft.com/en-us/graph/api/table-list-columns?view=graph-rest-1.0&tabs=http
+			if (operation === 'getColumns') {
+				for (let i = 0; i < length; i++) {
+					try {
+						qs = {};
+						const workbookId = this.getNodeParameter('workbook', i) as string;
+						const worksheetId = this.getNodeParameter('worksheet', i) as string;
+						const tableId = this.getNodeParameter('table', i) as string;
+						const returnAll = this.getNodeParameter('returnAll', i);
+						const rawData = this.getNodeParameter('rawData', i);
+						if (rawData) {
+							const filters = this.getNodeParameter('filters', i);
+							if (filters.fields) {
+								qs.$select = filters.fields;
+							}
+						}
+						if (returnAll) {
+							responseData = await microsoftApiRequestAllItemsSkip.call(
+								this,
+								'value',
+								'GET',
+								`/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/tables/${tableId}/columns`,
+								{},
+								qs,
+							);
+						} else {
+							qs.$top = this.getNodeParameter('limit', i);
+							responseData = await microsoftApiRequest.call(
+								this,
+								'GET',
+								`/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/tables/${tableId}/columns`,
+								{},
+								qs,
+							);
+							responseData = responseData.value;
+						}
+						if (!rawData) {
+							responseData = responseData.map((column: IDataObject) => ({ name: column.name }));
+						} else {
+							const dataProperty = this.getNodeParameter('dataProperty', i) as string;
+							responseData = { [dataProperty]: responseData };
+						}
+
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
+							{ itemData: { item: i } },
+						);
+
+						returnData.push(...executionData);
+					} 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;
+					}
+				}
+			}
+			//https://docs.microsoft.com/en-us/graph/api/table-list-rows?view=graph-rest-1.0&tabs=http
+			if (operation === 'getRows') {
+				for (let i = 0; i < length; i++) {
+					qs = {};
+					try {
+						const workbookId = this.getNodeParameter('workbook', i) as string;
+						const worksheetId = this.getNodeParameter('worksheet', i) as string;
+						const tableId = this.getNodeParameter('table', i) as string;
+						const returnAll = this.getNodeParameter('returnAll', i);
+						const rawData = this.getNodeParameter('rawData', i);
+						if (rawData) {
+							const filters = this.getNodeParameter('filters', i);
+							if (filters.fields) {
+								qs.$select = filters.fields;
+							}
+						}
+						if (returnAll) {
+							responseData = await microsoftApiRequestAllItemsSkip.call(
+								this,
+								'value',
+								'GET',
+								`/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/tables/${tableId}/rows`,
+								{},
+								qs,
+							);
+						} else {
+							const rowsQs = { ...qs };
+							rowsQs.$top = this.getNodeParameter('limit', i);
+							responseData = await microsoftApiRequest.call(
+								this,
+								'GET',
+								`/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/tables/${tableId}/rows`,
+								{},
+								rowsQs,
+							);
+							responseData = responseData.value;
+						}
+						if (!rawData) {
+							const columnsQs = { ...qs };
+							columnsQs.$select = 'name';
+							// TODO: That should probably be cached in the future
+							let columns = await microsoftApiRequestAllItemsSkip.call(
+								this,
+								'value',
+								'GET',
+								`/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/tables/${tableId}/columns`,
+								{},
+								columnsQs,
+							);
+
+							columns = (columns as IDataObject[]).map((column) => column.name);
+							for (let index = 0; index < responseData.length; index++) {
+								const object: IDataObject = {};
+								for (let y = 0; y < columns.length; y++) {
+									object[columns[y]] = responseData[index].values[0][y];
+								}
+								const executionData = this.helpers.constructExecutionMetaData(
+									this.helpers.returnJsonArray({ ...object }),
+									{ itemData: { item: index } },
+								);
+
+								returnData.push(...executionData);
+							}
+						} else {
+							const dataProperty = this.getNodeParameter('dataProperty', i) as string;
+							const executionData = this.helpers.constructExecutionMetaData(
+								this.helpers.returnJsonArray({ [dataProperty]: responseData }),
+								{ itemData: { item: i } },
+							);
+
+							returnData.push(...executionData);
+						}
+					} 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;
+					}
+				}
+			}
+			if (operation === 'lookup') {
+				for (let i = 0; i < length; i++) {
+					qs = {};
+					try {
+						const workbookId = this.getNodeParameter('workbook', i) as string;
+						const worksheetId = this.getNodeParameter('worksheet', i) as string;
+						const tableId = this.getNodeParameter('table', i) as string;
+						const lookupColumn = this.getNodeParameter('lookupColumn', i) as string;
+						const lookupValue = this.getNodeParameter('lookupValue', i) as string;
+						const options = this.getNodeParameter('options', i);
+
+						responseData = await microsoftApiRequestAllItemsSkip.call(
+							this,
+							'value',
+							'GET',
+							`/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/tables/${tableId}/rows`,
+							{},
+							{},
+						);
+
+						qs.$select = 'name';
+						// TODO: That should probably be cached in the future
+						let columns = await microsoftApiRequestAllItemsSkip.call(
+							this,
+							'value',
+							'GET',
+							`/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/tables/${tableId}/columns`,
+							{},
+							qs,
+						);
+						columns = columns.map((column: IDataObject) => column.name);
+
+						if (!columns.includes(lookupColumn)) {
+							throw new NodeApiError(this.getNode(), responseData as JsonObject, {
+								message: `Column ${lookupColumn} does not exist on the table selected`,
+							});
+						}
+
+						result.length = 0;
+						for (let index = 0; index < responseData.length; index++) {
+							const object: IDataObject = {};
+							for (let y = 0; y < columns.length; y++) {
+								object[columns[y]] = responseData[index].values[0][y];
+							}
+							result.push({ ...object });
+						}
+
+						if (options.returnAllMatches) {
+							responseData = result.filter((data: IDataObject) => {
+								return data[lookupColumn]?.toString() === lookupValue;
+							});
+							const executionData = this.helpers.constructExecutionMetaData(
+								this.helpers.returnJsonArray(responseData),
+								{ itemData: { item: i } },
+							);
+
+							returnData.push(...executionData);
+						} else {
+							responseData = result.find((data: IDataObject) => {
+								return data[lookupColumn]?.toString() === lookupValue;
+							});
+							const executionData = this.helpers.constructExecutionMetaData(
+								this.helpers.returnJsonArray(responseData as IDataObject),
+								{ itemData: { item: i } },
+							);
+
+							returnData.push(...executionData);
+						}
+					} 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;
+					}
+				}
+			}
+		}
+		if (resource === 'workbook') {
+			for (let i = 0; i < length; i++) {
+				qs = {};
+				try {
+					//https://docs.microsoft.com/en-us/graph/api/worksheetcollection-add?view=graph-rest-1.0&tabs=http
+					if (operation === 'addWorksheet') {
+						const workbookId = this.getNodeParameter('workbook', i) as string;
+						const additionalFields = this.getNodeParameter('additionalFields', i);
+						const body: IDataObject = {};
+						if (additionalFields.name) {
+							body.name = additionalFields.name;
+						}
+						const { id } = await microsoftApiRequest.call(
+							this,
+							'POST',
+							`/drive/items/${workbookId}/workbook/createSession`,
+							{ persistChanges: true },
+						);
+						responseData = await microsoftApiRequest.call(
+							this,
+							'POST',
+							`/drive/items/${workbookId}/workbook/worksheets/add`,
+							body,
+							{},
+							'',
+							{ 'workbook-session-id': id },
+						);
+						await microsoftApiRequest.call(
+							this,
+							'POST',
+							`/drive/items/${workbookId}/workbook/closeSession`,
+							{},
+							{},
+							'',
+							{ 'workbook-session-id': id },
+						);
+					}
+					if (operation === 'getAll') {
+						const returnAll = this.getNodeParameter('returnAll', i);
+						const filters = this.getNodeParameter('filters', i);
+						if (filters.fields) {
+							qs.$select = filters.fields;
+						}
+						if (returnAll) {
+							responseData = await microsoftApiRequestAllItems.call(
+								this,
+								'value',
+								'GET',
+								"/drive/root/search(q='.xlsx')",
+								{},
+								qs,
+							);
+						} else {
+							qs.$top = this.getNodeParameter('limit', i);
+							responseData = await microsoftApiRequest.call(
+								this,
+								'GET',
+								"/drive/root/search(q='.xlsx')",
+								{},
+								qs,
+							);
+							responseData = responseData.value;
+						}
+					}
+
+					if (Array.isArray(responseData)) {
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(responseData),
+							{ itemData: { item: i } },
+						);
+
+						returnData.push(...executionData);
+					} else if (responseData !== undefined) {
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
+							{ itemData: { item: i } },
+						);
+
+						returnData.push(...executionData);
+					}
+				} 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;
+				}
+			}
+		}
+		if (resource === 'worksheet') {
+			for (let i = 0; i < length; i++) {
+				qs = {};
+				try {
+					//https://docs.microsoft.com/en-us/graph/api/workbook-list-worksheets?view=graph-rest-1.0&tabs=http
+					if (operation === 'getAll') {
+						const returnAll = this.getNodeParameter('returnAll', i);
+						const workbookId = this.getNodeParameter('workbook', i) as string;
+						const filters = this.getNodeParameter('filters', i);
+						if (filters.fields) {
+							qs.$select = filters.fields;
+						}
+						if (returnAll) {
+							responseData = await microsoftApiRequestAllItems.call(
+								this,
+								'value',
+								'GET',
+								`/drive/items/${workbookId}/workbook/worksheets`,
+								{},
+								qs,
+							);
+						} else {
+							qs.$top = this.getNodeParameter('limit', i);
+							responseData = await microsoftApiRequest.call(
+								this,
+								'GET',
+								`/drive/items/${workbookId}/workbook/worksheets`,
+								{},
+								qs,
+							);
+							responseData = responseData.value;
+						}
+					}
+					//https://docs.microsoft.com/en-us/graph/api/worksheet-range?view=graph-rest-1.0&tabs=http
+					if (operation === 'getContent') {
+						const workbookId = this.getNodeParameter('workbook', i) as string;
+						const worksheetId = this.getNodeParameter('worksheet', i) as string;
+						const range = this.getNodeParameter('range', i) as string;
+						const rawData = this.getNodeParameter('rawData', i);
+						if (rawData) {
+							const filters = this.getNodeParameter('filters', i);
+							if (filters.fields) {
+								qs.$select = filters.fields;
+							}
+						}
+
+						responseData = await microsoftApiRequest.call(
+							this,
+							'GET',
+							`/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/range(address='${range}')`,
+							{},
+							qs,
+						);
+
+						if (!rawData) {
+							const keyRow = this.getNodeParameter('keyRow', i) as number;
+							const dataStartRow = this.getNodeParameter('dataStartRow', i) as number;
+							if (responseData.values === null) {
+								throw new NodeApiError(this.getNode(), responseData as JsonObject, {
+									message: 'Range did not return data',
+								});
+							}
+							const keyValues = responseData.values[keyRow];
+							for (let index = dataStartRow; index < responseData.values.length; index++) {
+								const object: IDataObject = {};
+								for (let y = 0; y < keyValues.length; y++) {
+									object[keyValues[y]] = responseData.values[index][y];
+								}
+								const executionData = this.helpers.constructExecutionMetaData(
+									this.helpers.returnJsonArray({ ...object }),
+									{ itemData: { item: index } },
+								);
+
+								returnData.push(...executionData);
+							}
+						} else {
+							const dataProperty = this.getNodeParameter('dataProperty', i) as string;
+							const executionData = this.helpers.constructExecutionMetaData(
+								this.helpers.returnJsonArray({ [dataProperty]: responseData }),
+								{ itemData: { item: i } },
+							);
+
+							returnData.push(...executionData);
+						}
+					}
+				} 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;
+				}
+			}
+		}
+
+		return [returnData];
+	}
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/TableDescription.ts b/packages/nodes-base/nodes/Microsoft/Excel/v1/TableDescription.ts
similarity index 100%
rename from packages/nodes-base/nodes/Microsoft/Excel/TableDescription.ts
rename to packages/nodes-base/nodes/Microsoft/Excel/v1/TableDescription.ts
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/WorkbookDescription.ts b/packages/nodes-base/nodes/Microsoft/Excel/v1/WorkbookDescription.ts
similarity index 100%
rename from packages/nodes-base/nodes/Microsoft/Excel/WorkbookDescription.ts
rename to packages/nodes-base/nodes/Microsoft/Excel/v1/WorkbookDescription.ts
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/WorksheetDescription.ts b/packages/nodes-base/nodes/Microsoft/Excel/v1/WorksheetDescription.ts
similarity index 100%
rename from packages/nodes-base/nodes/Microsoft/Excel/WorksheetDescription.ts
rename to packages/nodes-base/nodes/Microsoft/Excel/v1/WorksheetDescription.ts
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/MicrosoftExcelV2.node.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/MicrosoftExcelV2.node.ts
new file mode 100644
index 0000000000000..e3bfcbac95e69
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/MicrosoftExcelV2.node.ts
@@ -0,0 +1,27 @@
+import type {
+	IExecuteFunctions,
+	INodeType,
+	INodeTypeBaseDescription,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+
+import { listSearch, loadOptions } from './methods';
+import { versionDescription } from './actions/versionDescription';
+import { router } from './actions/router';
+
+export class MicrosoftExcelV2 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			...versionDescription,
+		};
+	}
+
+	methods = { listSearch, loadOptions };
+
+	async execute(this: IExecuteFunctions) {
+		return await router.call(this);
+	}
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/common.descriptions.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/common.descriptions.ts
new file mode 100644
index 0000000000000..adad75623e1d3
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/common.descriptions.ts
@@ -0,0 +1,140 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+export const workbookRLC: INodeProperties = {
+	displayName: 'Workbook',
+	name: 'workbook',
+	type: 'resourceLocator',
+	default: { mode: 'list', value: '' },
+	required: true,
+	modes: [
+		{
+			displayName: 'From List',
+			name: 'list',
+			type: 'list',
+			typeOptions: {
+				searchListMethod: 'searchWorkbooks',
+				searchable: true,
+			},
+		},
+		{
+			displayName: 'By ID',
+			name: 'id',
+			type: 'string',
+			validation: [
+				{
+					type: 'regex',
+					properties: {
+						regex: '[a-zA-Z0-9]{2,}',
+						errorMessage: 'Not a valid Workbook ID',
+					},
+				},
+			],
+		},
+	],
+};
+
+export const worksheetRLC: INodeProperties = {
+	displayName: 'Sheet',
+	name: 'worksheet',
+	type: 'resourceLocator',
+	default: { mode: 'list', value: '' },
+	required: true,
+	modes: [
+		{
+			displayName: 'From List',
+			name: 'list',
+			type: 'list',
+			typeOptions: {
+				searchListMethod: 'getWorksheetsList',
+			},
+		},
+		{
+			displayName: 'By ID',
+			name: 'id',
+			type: 'string',
+			validation: [
+				{
+					type: 'regex',
+					properties: {
+						regex: '{[a-zA-Z0-9\\-_]{2,}}',
+						errorMessage: 'Not a valid Sheet ID',
+					},
+				},
+			],
+		},
+	],
+};
+
+export const tableRLC: INodeProperties = {
+	displayName: 'Table',
+	name: 'table',
+	type: 'resourceLocator',
+	default: { mode: 'list', value: '' },
+	required: true,
+	modes: [
+		{
+			displayName: 'From List',
+			name: 'list',
+			type: 'list',
+			typeOptions: {
+				searchListMethod: 'getWorksheetTables',
+			},
+		},
+		{
+			displayName: 'By ID',
+			name: 'id',
+			type: 'string',
+			validation: [
+				{
+					type: 'regex',
+					properties: {
+						regex: '{[a-zA-Z0-9\\-_]{2,}}',
+						errorMessage: 'Not a valid Table ID',
+					},
+				},
+			],
+		},
+	],
+};
+
+export const rawDataOutput: INodeProperties = {
+	displayName: 'Raw Data Output',
+	name: 'rawDataOutput',
+	type: 'fixedCollection',
+	default: { values: { rawData: false } },
+	options: [
+		{
+			displayName: 'Values',
+			name: 'values',
+			values: [
+				{
+					displayName: 'RAW Data',
+					name: 'rawData',
+					type: 'boolean',
+					// eslint-disable-next-line n8n-nodes-base/node-param-default-wrong-for-boolean
+					default: 0,
+					description:
+						'Whether the data should be returned RAW instead of parsed into keys according to their header',
+				},
+				{
+					displayName: 'Data Property',
+					name: 'dataProperty',
+					type: 'string',
+					default: 'data',
+					required: true,
+					displayOptions: {
+						show: {
+							rawData: [true],
+						},
+					},
+					description: 'The name of the property into which to write the RAW data',
+				},
+			],
+		},
+	],
+	displayOptions: {
+		hide: {
+			'/dataMode': ['nothing'],
+		},
+	},
+};
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/node.type.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/node.type.ts
new file mode 100644
index 0000000000000..dcf09d02eec04
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/node.type.ts
@@ -0,0 +1,20 @@
+import type { AllEntities, Entity } from 'n8n-workflow';
+
+type MicrosoftExcelMap = {
+	table:
+		| 'append'
+		| 'addTable'
+		| 'convertToRange'
+		| 'deleteTable'
+		| 'getColumns'
+		| 'getRows'
+		| 'lookup';
+	workbook: 'addWorksheet' | 'deleteWorkbook' | 'getAll';
+	worksheet: 'append' | 'clear' | 'deleteWorksheet' | 'getAll' | 'readRows' | 'update' | 'upsert';
+};
+
+export type MicrosoftExcel = AllEntities<MicrosoftExcelMap>;
+
+export type MicrosoftExcelChannel = Entity<MicrosoftExcelMap, 'table'>;
+export type MicrosoftExcelMessage = Entity<MicrosoftExcelMap, 'workbook'>;
+export type MicrosoftExcelMember = Entity<MicrosoftExcelMap, 'worksheet'>;
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/router.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/router.ts
new file mode 100644
index 0000000000000..a868bfa2c7bf8
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/router.ts
@@ -0,0 +1,36 @@
+import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
+import { NodeOperationError } from 'n8n-workflow';
+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';
+
+export async function router(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+	const items = this.getInputData();
+	let returnData: INodeExecutionData[] = [];
+
+	const resource = this.getNodeParameter<MicrosoftExcel>('resource', 0);
+	const operation = this.getNodeParameter('operation', 0);
+
+	const microsoftExcel = {
+		resource,
+		operation,
+	} as MicrosoftExcel;
+
+	switch (microsoftExcel.resource) {
+		case 'table':
+			returnData = await table[microsoftExcel.operation].execute.call(this, items);
+			break;
+		case 'workbook':
+			returnData = await workbook[microsoftExcel.operation].execute.call(this, items);
+			break;
+		case 'worksheet':
+			returnData = await worksheet[microsoftExcel.operation].execute.call(this, items);
+			break;
+		default:
+			throw new NodeOperationError(this.getNode(), `The resource "${resource}" is not known`);
+	}
+
+	return [returnData];
+}
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
new file mode 100644
index 0000000000000..6fc4497805454
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/Table.resource.ts
@@ -0,0 +1,77 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+import * as append from './append.operation';
+import * as addTable from './addTable.operation';
+import * as convertToRange from './convertToRange.operation';
+import * as deleteTable from './deleteTable.operation';
+import * as getColumns from './getColumns.operation';
+import * as getRows from './getRows.operation';
+import * as lookup from './lookup.operation';
+
+export { append, addTable, convertToRange, deleteTable, getColumns, getRows, lookup };
+
+export const description: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				resource: ['table'],
+			},
+		},
+		options: [
+			{
+				name: 'Append',
+				value: 'append',
+				description: 'Add rows to the end of the table',
+				action: 'Append rows to table',
+			},
+			{
+				name: 'Convert to Range',
+				value: 'convertToRange',
+				description: 'Convert a table to a range',
+				action: 'Convert to range',
+			},
+			{
+				name: 'Create',
+				value: 'addTable',
+				description: 'Add a table based on range',
+				action: 'Create a table',
+			},
+			{
+				name: 'Delete',
+				value: 'deleteTable',
+				description: 'Delete a table',
+				action: 'Delete a table',
+			},
+			{
+				name: 'Get Columns',
+				value: 'getColumns',
+				description: 'Retrieve a list of table columns',
+				action: 'Get columns',
+			},
+			{
+				name: 'Get Rows',
+				value: 'getRows',
+				description: 'Retrieve a list of table rows',
+				action: 'Get rows',
+			},
+			{
+				name: 'Lookup',
+				value: 'lookup',
+				description: 'Look for rows that match a given value in a column',
+				action: 'Lookup a column',
+			},
+		],
+		default: 'append',
+	},
+	...append.description,
+	...addTable.description,
+	...convertToRange.description,
+	...deleteTable.description,
+	...getColumns.description,
+	...getRows.description,
+	...lookup.description,
+];
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
new file mode 100644
index 0000000000000..6ab2109211cff
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/addTable.operation.ts
@@ -0,0 +1,131 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+import { microsoftApiRequest } from '../../transport';
+import { workbookRLC, worksheetRLC } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	workbookRLC,
+	worksheetRLC,
+	{
+		displayName: 'Select Range',
+		name: 'selectRange',
+		type: 'options',
+		options: [
+			{
+				name: 'Automatically',
+				value: 'auto',
+				description: 'The whole used range on the selected sheet will be converted into a table',
+			},
+			{
+				name: 'Manually',
+				value: 'manual',
+				description: 'Select a range that will be converted into a table',
+			},
+		],
+		default: 'auto',
+	},
+	{
+		displayName: 'Range',
+		name: 'range',
+		type: 'string',
+		default: '',
+		placeholder: 'A1:B2',
+		description: 'The range of cells that will be converted to a table',
+		displayOptions: {
+			show: {
+				selectRange: ['manual'],
+			},
+		},
+	},
+	{
+		displayName: 'Has Headers',
+		name: 'hasHeaders',
+		type: 'boolean',
+		default: true,
+		description:
+			'Whether the range has column labels. When this property set to false Excel will automatically generate header shifting the data down by one row.',
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['table'],
+		operation: ['addTable'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	items: INodeExecutionData[],
+): Promise<INodeExecutionData[]> {
+	//https://learn.microsoft.com/en-us/graph/api/worksheet-post-tables?view=graph-rest-1.0
+	const returnData: INodeExecutionData[] = [];
+
+	for (let i = 0; i < items.length; i++) {
+		try {
+			const workbookId = this.getNodeParameter('workbook', i, undefined, {
+				extractValue: true,
+			}) as string;
+
+			const worksheetId = this.getNodeParameter('worksheet', i, undefined, {
+				extractValue: true,
+			}) as string;
+
+			const selectRange = this.getNodeParameter('selectRange', i) as string;
+
+			const hasHeaders = this.getNodeParameter('hasHeaders', i) as boolean;
+
+			let range = '';
+			if (selectRange === 'auto') {
+				const { address } = await microsoftApiRequest.call(
+					this,
+					'GET',
+					`/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/usedRange`,
+					undefined,
+					{
+						select: 'address',
+					},
+				);
+				range = address.split('!')[1];
+			} else {
+				range = this.getNodeParameter('range', i) as string;
+			}
+
+			const responseData = await microsoftApiRequest.call(
+				this,
+				'POST',
+				`/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/tables/add`,
+				{
+					address: range,
+					hasHeaders,
+				},
+			);
+
+			const executionData = this.helpers.constructExecutionMetaData(
+				this.helpers.returnJsonArray(responseData as IDataObject),
+				{ itemData: { item: i } },
+			);
+
+			returnData.push(...executionData);
+		} 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;
+		}
+	}
+
+	return returnData;
+}
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
new file mode 100644
index 0000000000000..0e542e0d909d4
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/append.operation.ts
@@ -0,0 +1,287 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+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,
+	worksheetRLC,
+	tableRLC,
+	{
+		displayName: 'Data Mode',
+		name: 'dataMode',
+		type: 'options',
+		default: 'define',
+		options: [
+			{
+				name: 'Auto-Map Input Data to Columns',
+				value: 'autoMap',
+				description: 'Use when node input properties match destination column names',
+			},
+			{
+				name: 'Map Each Column Below',
+				value: 'define',
+				description: 'Set the value for each destination column',
+			},
+			{
+				name: 'Raw',
+				value: 'raw',
+				description: 'Send raw data as JSON',
+			},
+		],
+	},
+	{
+		displayName: 'Data',
+		name: 'data',
+		type: 'json',
+		default: '',
+		required: true,
+		placeholder: 'e.g. [["Sara","1/2/2006","Berlin"],["George","5/3/2010","Paris"]]',
+		description: 'Raw values for the specified range as array of string arrays in JSON format',
+		displayOptions: {
+			show: {
+				dataMode: ['raw'],
+			},
+		},
+	},
+	{
+		displayName: 'Values to Send',
+		name: 'fieldsUi',
+		placeholder: 'Add Field',
+		type: 'fixedCollection',
+		typeOptions: {
+			multipleValues: true,
+		},
+		displayOptions: {
+			show: {
+				dataMode: ['define'],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Field',
+				name: 'values',
+				values: [
+					{
+						// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-options
+						displayName: 'Column',
+						name: 'column',
+						type: 'options',
+						description:
+							'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
+						typeOptions: {
+							loadOptionsDependsOn: ['table.value', 'worksheet.value', 'workbook.value'],
+							loadOptionsMethod: 'getTableColumns',
+						},
+						default: '',
+					},
+					{
+						displayName: 'Value',
+						name: 'fieldValue',
+						type: 'string',
+						default: '',
+						requiresDataPath: 'single',
+					},
+				],
+			},
+		],
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			{
+				displayName: 'Index',
+				name: 'index',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description:
+					'Specifies the relative position of the new row. If not defined, the addition happens at the end. Any row below the inserted row will be shifted downwards. First row index is 0.',
+			},
+			{
+				displayName: 'RAW Data',
+				name: 'rawData',
+				type: 'boolean',
+				// eslint-disable-next-line n8n-nodes-base/node-param-default-wrong-for-boolean
+				default: 0,
+				description:
+					'Whether the data should be returned RAW instead of parsed into keys according to their header',
+			},
+			{
+				displayName: 'Data Property',
+				name: 'dataProperty',
+				type: 'string',
+				default: 'data',
+				required: true,
+				displayOptions: {
+					show: {
+						rawData: [true],
+					},
+				},
+				description: 'The name of the property into which to write the RAW data',
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['table'],
+		operation: ['append'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	items: INodeExecutionData[],
+): Promise<INodeExecutionData[]> {
+	//https://docs.microsoft.com/en-us/graph/api/table-post-rows?view=graph-rest-1.0&tabs=http
+	const returnData: INodeExecutionData[] = [];
+
+	try {
+		// TODO: At some point it should be possible to use item dependent parameters.
+		//       Is however important to then not make one separate request each.
+		const workbookId = this.getNodeParameter('workbook', 0, undefined, {
+			extractValue: true,
+		}) as string;
+
+		const worksheetId = this.getNodeParameter('worksheet', 0, undefined, {
+			extractValue: true,
+		}) as string;
+
+		const tableId = this.getNodeParameter('table', 0, undefined, {
+			extractValue: true,
+		}) as string;
+
+		const dataMode = this.getNodeParameter('dataMode', 0) as string;
+
+		// Get table columns to eliminate any columns not needed on the input
+		const columnsData = await microsoftApiRequest.call(
+			this,
+			'GET',
+			`/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/tables/${tableId}/columns`,
+			{},
+		);
+		const columnsRow = columnsData.value.map((column: IDataObject) => column.name);
+
+		const body: IDataObject = {};
+
+		let values: string[][] = [];
+
+		if (dataMode === 'raw') {
+			const data = this.getNodeParameter('data', 0);
+			values = processJsonInput(data, 'Data') as string[][];
+		}
+
+		if (dataMode === 'autoMap') {
+			const itemsData = items.map((item) => item.json);
+			for (const item of itemsData) {
+				const updateRow: string[] = [];
+
+				for (const column of columnsRow) {
+					updateRow.push(item[column] as string);
+				}
+
+				values.push(updateRow);
+			}
+		}
+
+		if (dataMode === 'define') {
+			const itemsData: IDataObject[] = [];
+			for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
+				const updateData: IDataObject = {};
+				const definedFields = this.getNodeParameter('fieldsUi.values', itemIndex, []) as Array<{
+					column: string;
+					fieldValue: string;
+				}>;
+				for (const entry of definedFields) {
+					updateData[entry.column] = entry.fieldValue;
+				}
+				itemsData.push(updateData);
+			}
+
+			for (const item of itemsData) {
+				const updateRow: string[] = [];
+
+				for (const column of columnsRow) {
+					updateRow.push(item[column] as string);
+				}
+
+				values.push(updateRow);
+			}
+		}
+
+		body.values = values;
+
+		const options = this.getNodeParameter('options', 0);
+
+		if (options.index) {
+			body.index = options.index as number;
+		}
+
+		const { id } = await microsoftApiRequest.call(
+			this,
+			'POST',
+			`/drive/items/${workbookId}/workbook/createSession`,
+			{ persistChanges: true },
+		);
+		const responseData = await microsoftApiRequest.call(
+			this,
+			'POST',
+			`/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/tables/${tableId}/rows/add`,
+			body,
+			{},
+			'',
+			{ 'workbook-session-id': id },
+		);
+		await microsoftApiRequest.call(
+			this,
+			'POST',
+			`/drive/items/${workbookId}/workbook/closeSession`,
+			{},
+			{},
+			'',
+			{ 'workbook-session-id': id },
+		);
+
+		const rawData = options.rawData as boolean;
+		const dataProperty = (options.dataProperty as string) || 'data';
+
+		returnData.push(
+			...prepareOutput.call(this, this.getNode(), responseData as ExcelResponse, {
+				columnsRow,
+				dataProperty,
+				rawData,
+			}),
+		);
+	} catch (error) {
+		if (this.continueOnFail()) {
+			const itemData = generatePairedItemData(this.getInputData().length);
+			const executionErrorData = this.helpers.constructExecutionMetaData(
+				this.helpers.returnJsonArray({ error: error.message }),
+				{ itemData },
+			);
+			returnData.push(...executionErrorData);
+		} else {
+			throw error;
+		}
+	}
+
+	return returnData;
+}
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
new file mode 100644
index 0000000000000..9b20ab77c38d7
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/convertToRange.operation.ts
@@ -0,0 +1,68 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+import { microsoftApiRequest } from '../../transport';
+import { tableRLC, workbookRLC, worksheetRLC } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+const properties: INodeProperties[] = [workbookRLC, worksheetRLC, tableRLC];
+
+const displayOptions = {
+	show: {
+		resource: ['table'],
+		operation: ['convertToRange'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	items: INodeExecutionData[],
+): Promise<INodeExecutionData[]> {
+	const returnData: INodeExecutionData[] = [];
+
+	for (let i = 0; i < items.length; i++) {
+		try {
+			const workbookId = this.getNodeParameter('workbook', i, undefined, {
+				extractValue: true,
+			}) as string;
+
+			const worksheetId = this.getNodeParameter('worksheet', i, undefined, {
+				extractValue: true,
+			}) as string;
+
+			const tableId = this.getNodeParameter('table', i, undefined, {
+				extractValue: true,
+			}) as string;
+
+			const responseData = await microsoftApiRequest.call(
+				this,
+				'POST',
+				`/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/tables/${tableId}/convertToRange`,
+			);
+
+			const executionData = this.helpers.constructExecutionMetaData(
+				this.helpers.returnJsonArray(responseData as IDataObject),
+				{ itemData: { item: i } },
+			);
+
+			returnData.push(...executionData);
+		} 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;
+		}
+	}
+
+	return returnData;
+}
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
new file mode 100644
index 0000000000000..5e1ec86f4f002
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/deleteTable.operation.ts
@@ -0,0 +1,63 @@
+import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
+import { microsoftApiRequest } from '../../transport';
+import { tableRLC, workbookRLC, worksheetRLC } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+const properties: INodeProperties[] = [workbookRLC, worksheetRLC, tableRLC];
+
+const displayOptions = {
+	show: {
+		resource: ['table'],
+		operation: ['deleteTable'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	items: INodeExecutionData[],
+): Promise<INodeExecutionData[]> {
+	const returnData: INodeExecutionData[] = [];
+
+	for (let i = 0; i < items.length; i++) {
+		try {
+			const workbookId = this.getNodeParameter('workbook', i, undefined, {
+				extractValue: true,
+			}) as string;
+
+			const worksheetId = this.getNodeParameter('worksheet', i, undefined, {
+				extractValue: true,
+			}) as string;
+
+			const tableId = this.getNodeParameter('table', i, undefined, {
+				extractValue: true,
+			}) as string;
+
+			await microsoftApiRequest.call(
+				this,
+				'DELETE',
+				`/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/tables/${tableId}`,
+			);
+
+			const executionData = this.helpers.constructExecutionMetaData(
+				this.helpers.returnJsonArray({ success: true }),
+				{ itemData: { item: i } },
+			);
+
+			returnData.push(...executionData);
+		} 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;
+		}
+	}
+
+	return returnData;
+}
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
new file mode 100644
index 0000000000000..e91596a4021c0
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/getColumns.operation.ts
@@ -0,0 +1,169 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+import { microsoftApiRequest, microsoftApiRequestAllItemsSkip } from '../../transport';
+import { tableRLC, workbookRLC, worksheetRLC } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	workbookRLC,
+	worksheetRLC,
+	tableRLC,
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		default: false,
+		description: 'Whether to return all results or only up to a given limit',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				returnAll: [false],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 500,
+		},
+		default: 100,
+		description: 'Max number of results to return',
+	},
+	{
+		displayName: 'RAW Data',
+		name: 'rawData',
+		type: 'boolean',
+		default: false,
+		description:
+			'Whether the data should be returned RAW instead of parsed into keys according to their header',
+	},
+	{
+		displayName: 'Data Property',
+		name: 'dataProperty',
+		type: 'string',
+		default: 'data',
+		displayOptions: {
+			show: {
+				rawData: [true],
+			},
+		},
+		description: 'The name of the property into which to write the RAW data',
+	},
+	{
+		displayName: 'Filters',
+		name: 'filters',
+		type: 'collection',
+		placeholder: 'Add Filter',
+		default: {},
+		displayOptions: {
+			show: {
+				rawData: [true],
+			},
+		},
+		options: [
+			{
+				displayName: 'Fields',
+				name: 'fields',
+				type: 'string',
+				default: '',
+				description: 'A comma-separated list of the fields to include in the response',
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['table'],
+		operation: ['getColumns'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	items: INodeExecutionData[],
+): Promise<INodeExecutionData[]> {
+	//https://docs.microsoft.com/en-us/graph/api/table-list-columns?view=graph-rest-1.0&tabs=http
+	const returnData: INodeExecutionData[] = [];
+
+	for (let i = 0; i < items.length; i++) {
+		try {
+			const qs: IDataObject = {};
+			const workbookId = this.getNodeParameter('workbook', i, undefined, {
+				extractValue: true,
+			}) as string;
+
+			const worksheetId = this.getNodeParameter('worksheet', i, undefined, {
+				extractValue: true,
+			}) as string;
+
+			const tableId = this.getNodeParameter('table', i, undefined, {
+				extractValue: true,
+			}) as string;
+
+			const returnAll = this.getNodeParameter('returnAll', i);
+			const rawData = this.getNodeParameter('rawData', i);
+			if (rawData) {
+				const filters = this.getNodeParameter('filters', i);
+				if (filters.fields) {
+					qs.$select = filters.fields;
+				}
+			}
+
+			let responseData;
+			if (returnAll) {
+				responseData = await microsoftApiRequestAllItemsSkip.call(
+					this,
+					'value',
+					'GET',
+					`/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/tables/${tableId}/columns`,
+					{},
+					qs,
+				);
+			} else {
+				qs.$top = this.getNodeParameter('limit', i);
+				responseData = await microsoftApiRequest.call(
+					this,
+					'GET',
+					`/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/tables/${tableId}/columns`,
+					{},
+					qs,
+				);
+				responseData = responseData.value;
+			}
+			if (!rawData) {
+				responseData = responseData.map((column: IDataObject) => ({ name: column.name }));
+			} else {
+				const dataProperty = this.getNodeParameter('dataProperty', i) as string;
+				responseData = { [dataProperty]: responseData };
+			}
+
+			const executionData = this.helpers.constructExecutionMetaData(
+				this.helpers.returnJsonArray(responseData as IDataObject[]),
+				{ itemData: { item: i } },
+			);
+
+			returnData.push(...executionData);
+		} 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;
+		}
+	}
+
+	return returnData;
+}
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
new file mode 100644
index 0000000000000..4d87b7129211d
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/getRows.operation.ts
@@ -0,0 +1,226 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+import { microsoftApiRequest, microsoftApiRequestAllItemsSkip } from '../../transport';
+import { tableRLC, workbookRLC, worksheetRLC } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	workbookRLC,
+	worksheetRLC,
+	tableRLC,
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		default: false,
+		description: 'Whether to return all results or only up to a given limit',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				returnAll: [false],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 500,
+		},
+		default: 100,
+		description: 'Max number of results to return',
+	},
+	{
+		displayName: 'RAW Data',
+		name: 'rawData',
+		type: 'boolean',
+		default: false,
+		description:
+			'Whether the data should be returned RAW instead of parsed into keys according to their header',
+	},
+	{
+		displayName: 'Data Property',
+		name: 'dataProperty',
+		type: 'string',
+		default: 'data',
+		displayOptions: {
+			show: {
+				rawData: [true],
+			},
+		},
+		description: 'The name of the property into which to write the RAW data',
+	},
+	{
+		displayName: 'Filters',
+		name: 'filters',
+		type: 'collection',
+		placeholder: 'Add Filter',
+		default: {},
+		options: [
+			{
+				displayName: 'Fields',
+				name: 'fields',
+				type: 'string',
+				default: '',
+				description: 'A comma-separated list of the fields to include in the response',
+				displayOptions: {
+					show: {
+						'/rawData': [true],
+					},
+				},
+			},
+			{
+				displayName: 'Column Names or IDs',
+				name: 'column',
+				type: 'multiOptions',
+				description:
+					'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>. Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+				typeOptions: {
+					loadOptionsDependsOn: ['table.value', 'worksheet.value', 'workbook.value'],
+					loadOptionsMethod: 'getTableColumns',
+				},
+				default: [],
+				displayOptions: {
+					show: {
+						'/rawData': [false],
+					},
+				},
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['table'],
+		operation: ['getRows'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	items: INodeExecutionData[],
+): Promise<INodeExecutionData[]> {
+	//https://docs.microsoft.com/en-us/graph/api/table-list-rows?view=graph-rest-1.0&tabs=http
+	const returnData: INodeExecutionData[] = [];
+
+	for (let i = 0; i < items.length; i++) {
+		const qs: IDataObject = {};
+		try {
+			const workbookId = this.getNodeParameter('workbook', i, undefined, {
+				extractValue: true,
+			}) as string;
+
+			const worksheetId = this.getNodeParameter('worksheet', i, undefined, {
+				extractValue: true,
+			}) as string;
+
+			const tableId = this.getNodeParameter('table', i, undefined, {
+				extractValue: true,
+			}) as string;
+
+			const filters = this.getNodeParameter('filters', i);
+			const returnAll = this.getNodeParameter('returnAll', i);
+			const rawData = this.getNodeParameter('rawData', i);
+
+			if (rawData) {
+				if (filters.fields) {
+					qs.$select = filters.fields;
+				}
+			}
+
+			let responseData;
+			if (returnAll) {
+				responseData = await microsoftApiRequestAllItemsSkip.call(
+					this,
+					'value',
+					'GET',
+					`/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/tables/${tableId}/rows`,
+					{},
+					qs,
+				);
+			} else {
+				const rowsQs = { ...qs };
+				rowsQs.$top = this.getNodeParameter('limit', i);
+				responseData = await microsoftApiRequest.call(
+					this,
+					'GET',
+					`/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/tables/${tableId}/rows`,
+					{},
+					rowsQs,
+				);
+				responseData = responseData.value;
+			}
+			if (!rawData) {
+				const columnsQs = { ...qs };
+				columnsQs.$select = 'name';
+				// TODO: That should probably be cached in the future
+				let columns = await microsoftApiRequestAllItemsSkip.call(
+					this,
+					'value',
+					'GET',
+					`/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/tables/${tableId}/columns`,
+					{},
+					columnsQs,
+				);
+
+				columns = (columns as IDataObject[]).map((column) => column.name);
+
+				let rows: INodeExecutionData[] = [];
+				for (let index = 0; index < responseData.length; index++) {
+					const object: IDataObject = {};
+					for (let y = 0; y < columns.length; y++) {
+						object[columns[y]] = responseData[index].values[0][y];
+					}
+					const executionData = this.helpers.constructExecutionMetaData(
+						this.helpers.returnJsonArray({ ...object }),
+						{ itemData: { item: index } },
+					);
+
+					rows.push(...executionData);
+				}
+
+				if ((filters?.column as string[])?.length) {
+					rows = rows.map((row) => {
+						const rowData: IDataObject = {};
+						Object.keys(row.json).forEach((key) => {
+							if ((filters.column as string[]).includes(key)) {
+								rowData[key] = row.json[key];
+							}
+						});
+						return { ...rowData, json: rowData };
+					});
+				}
+
+				returnData.push(...rows);
+			} else {
+				const dataProperty = this.getNodeParameter('dataProperty', i) as string;
+				const executionData = this.helpers.constructExecutionMetaData(
+					this.helpers.returnJsonArray({ [dataProperty]: responseData }),
+					{ itemData: { item: i } },
+				);
+
+				returnData.push(...executionData);
+			}
+		} 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;
+		}
+	}
+
+	return returnData;
+}
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
new file mode 100644
index 0000000000000..1c3ed93e58d7b
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/lookup.operation.ts
@@ -0,0 +1,161 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+	JsonObject,
+} from 'n8n-workflow';
+import { NodeApiError } from 'n8n-workflow';
+import { microsoftApiRequestAllItemsSkip } from '../../transport';
+import { tableRLC, workbookRLC, worksheetRLC } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	workbookRLC,
+	worksheetRLC,
+	tableRLC,
+	{
+		displayName: 'Lookup Column',
+		name: 'lookupColumn',
+		type: 'string',
+		default: '',
+		placeholder: 'Email',
+		required: true,
+		description: 'The name of the column in which to look for value',
+	},
+	{
+		displayName: 'Lookup Value',
+		name: 'lookupValue',
+		type: 'string',
+		default: '',
+		placeholder: 'frank@example.com',
+		required: true,
+		description: 'The value to look for in column',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			{
+				displayName: 'Return All Matches',
+				name: 'returnAllMatches',
+				type: 'boolean',
+				default: false,
+				// eslint-disable-next-line n8n-nodes-base/node-param-description-boolean-without-whether
+				description:
+					'By default only the first result gets returned. If options gets set all found matches get returned.',
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['table'],
+		operation: ['lookup'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	items: INodeExecutionData[],
+): Promise<INodeExecutionData[]> {
+	const returnData: INodeExecutionData[] = [];
+
+	for (let i = 0; i < items.length; i++) {
+		const qs: IDataObject = {};
+		try {
+			const workbookId = this.getNodeParameter('workbook', i, undefined, {
+				extractValue: true,
+			}) as string;
+
+			const worksheetId = this.getNodeParameter('worksheet', i, undefined, {
+				extractValue: true,
+			}) as string;
+
+			const tableId = this.getNodeParameter('table', i, undefined, {
+				extractValue: true,
+			}) as string;
+
+			const lookupColumn = this.getNodeParameter('lookupColumn', i) as string;
+			const lookupValue = this.getNodeParameter('lookupValue', i) as string;
+			const options = this.getNodeParameter('options', i);
+
+			let responseData = await microsoftApiRequestAllItemsSkip.call(
+				this,
+				'value',
+				'GET',
+				`/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/tables/${tableId}/rows`,
+				{},
+				{},
+			);
+
+			qs.$select = 'name';
+			// TODO: That should probably be cached in the future
+			let columns = await microsoftApiRequestAllItemsSkip.call(
+				this,
+				'value',
+				'GET',
+				`/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/tables/${tableId}/columns`,
+				{},
+				qs,
+			);
+			columns = columns.map((column: IDataObject) => column.name);
+
+			if (!columns.includes(lookupColumn)) {
+				throw new NodeApiError(this.getNode(), responseData as JsonObject, {
+					message: `Column ${lookupColumn} does not exist on the table selected`,
+				});
+			}
+
+			const result: IDataObject[] = [];
+
+			for (let index = 0; index < responseData.length; index++) {
+				const object: IDataObject = {};
+				for (let y = 0; y < columns.length; y++) {
+					object[columns[y]] = responseData[index].values[0][y];
+				}
+				result.push({ ...object });
+			}
+
+			if (options.returnAllMatches) {
+				responseData = result.filter((data: IDataObject) => {
+					return data[lookupColumn]?.toString() === lookupValue;
+				});
+				const executionData = this.helpers.constructExecutionMetaData(
+					this.helpers.returnJsonArray(responseData as IDataObject),
+					{ itemData: { item: i } },
+				);
+
+				returnData.push(...executionData);
+			} else {
+				responseData = result.find((data: IDataObject) => {
+					return data[lookupColumn]?.toString() === lookupValue;
+				});
+				const executionData = this.helpers.constructExecutionMetaData(
+					this.helpers.returnJsonArray(responseData as IDataObject),
+					{ itemData: { item: i } },
+				);
+
+				returnData.push(...executionData);
+			}
+		} 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;
+		}
+	}
+
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/versionDescription.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/versionDescription.ts
new file mode 100644
index 0000000000000..f0b31b9d0a350
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/versionDescription.ts
@@ -0,0 +1,63 @@
+/* eslint-disable n8n-nodes-base/node-filename-against-convention */
+import type { INodeTypeDescription } from 'n8n-workflow';
+
+import * as table from './table/Table.resource';
+import * as workbook from './workbook/Workbook.resource';
+import * as worksheet from './worksheet/Worksheet.resource';
+
+export const versionDescription: INodeTypeDescription = {
+	displayName: 'Microsoft Excel 365',
+	name: 'microsoftExcel',
+	icon: 'file:excel.svg',
+	group: ['input'],
+	version: [2, 2.1],
+	subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+	description: 'Consume Microsoft Excel API',
+	defaults: {
+		name: 'Microsoft Excel 365',
+	},
+	inputs: ['main'],
+	outputs: ['main'],
+	credentials: [
+		{
+			name: 'microsoftExcelOAuth2Api',
+			required: true,
+		},
+	],
+	properties: [
+		{
+			displayName:
+				'This node connects to the Microsoft 365 cloud platform. Use the \'Extract from File\' and \'Convert to File\' nodes to directly manipulate spreadsheet files (.xls, .csv, etc). <a href="/templates/890" target="_blank">More info</a>.',
+			name: 'notice',
+			type: 'notice',
+			default: '',
+		},
+		{
+			displayName: 'Resource',
+			name: 'resource',
+			type: 'options',
+			noDataExpression: true,
+			options: [
+				{
+					name: 'Table',
+					value: 'table',
+					description: 'Represents an Excel table',
+				},
+				{
+					name: 'Workbook',
+					value: 'workbook',
+					description: 'A workbook is the top level object which contains one or more worksheets',
+				},
+				{
+					name: 'Sheet',
+					value: 'worksheet',
+					description: 'A sheet is a grid of cells which can contain data, tables, charts, etc',
+				},
+			],
+			default: 'workbook',
+		},
+		...table.description,
+		...workbook.description,
+		...worksheet.description,
+	],
+};
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/workbook/Workbook.resource.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/workbook/Workbook.resource.ts
new file mode 100644
index 0000000000000..be20b4c444e5c
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/workbook/Workbook.resource.ts
@@ -0,0 +1,45 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+import * as addWorksheet from './addWorksheet.operation';
+import * as deleteWorkbook from './deleteWorkbook.operation';
+import * as getAll from './getAll.operation';
+
+export { addWorksheet, deleteWorkbook, getAll };
+
+export const description: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				resource: ['workbook'],
+			},
+		},
+		options: [
+			{
+				name: 'Add Sheet',
+				value: 'addWorksheet',
+				description: 'Add a new sheet to the workbook',
+				action: 'Add a sheet to a workbook',
+			},
+			{
+				name: 'Delete',
+				value: 'deleteWorkbook',
+				description: 'Delete workbook',
+				action: 'Delete workbook',
+			},
+			{
+				name: 'Get Many',
+				value: 'getAll',
+				description: 'Get workbooks',
+				action: 'Get workbooks',
+			},
+		],
+		default: 'getAll',
+	},
+	...addWorksheet.description,
+	...deleteWorkbook.description,
+	...getAll.description,
+];
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
new file mode 100644
index 0000000000000..7b93949c531de
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/workbook/addWorksheet.operation.ts
@@ -0,0 +1,113 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+import { microsoftApiRequest } from '../../transport';
+import { workbookRLC } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	workbookRLC,
+	{
+		displayName: 'Options',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			{
+				displayName: 'Name',
+				name: 'name',
+				type: 'string',
+				default: '',
+				description:
+					'The name of the sheet to be added. The name should be unique. If not specified, Excel will determine the name of the new worksheet.',
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['workbook'],
+		operation: ['addWorksheet'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	items: INodeExecutionData[],
+): Promise<INodeExecutionData[]> {
+	//https://docs.microsoft.com/en-us/graph/api/worksheetcollection-add?view=graph-rest-1.0&tabs=http
+	const returnData: INodeExecutionData[] = [];
+
+	for (let i = 0; i < items.length; i++) {
+		try {
+			const workbookId = this.getNodeParameter('workbook', i, undefined, {
+				extractValue: true,
+			}) as string;
+
+			const additionalFields = this.getNodeParameter('additionalFields', i);
+			const body: IDataObject = {};
+			if (additionalFields.name) {
+				body.name = additionalFields.name;
+			}
+			const { id } = await microsoftApiRequest.call(
+				this,
+				'POST',
+				`/drive/items/${workbookId}/workbook/createSession`,
+				{ persistChanges: true },
+			);
+			const responseData = await microsoftApiRequest.call(
+				this,
+				'POST',
+				`/drive/items/${workbookId}/workbook/worksheets/add`,
+				body,
+				{},
+				'',
+				{ 'workbook-session-id': id },
+			);
+			await microsoftApiRequest.call(
+				this,
+				'POST',
+				`/drive/items/${workbookId}/workbook/closeSession`,
+				{},
+				{},
+				'',
+				{ 'workbook-session-id': id },
+			);
+
+			if (Array.isArray(responseData)) {
+				const executionData = this.helpers.constructExecutionMetaData(
+					this.helpers.returnJsonArray(responseData),
+					{ itemData: { item: i } },
+				);
+
+				returnData.push(...executionData);
+			} else if (responseData !== undefined) {
+				const executionData = this.helpers.constructExecutionMetaData(
+					this.helpers.returnJsonArray(responseData as IDataObject),
+					{ itemData: { item: i } },
+				);
+
+				returnData.push(...executionData);
+			}
+		} 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;
+		}
+	}
+
+	return returnData;
+}
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
new file mode 100644
index 0000000000000..297fbc37c49ca
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/workbook/deleteWorkbook.operation.ts
@@ -0,0 +1,76 @@
+import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
+import { NodeOperationError } from 'n8n-workflow';
+import { microsoftApiRequest } from '../../transport';
+import { workbookRLC } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+const properties: INodeProperties[] = [workbookRLC];
+
+const displayOptions = {
+	show: {
+		resource: ['workbook'],
+		operation: ['deleteWorkbook'],
+	},
+};
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	items: INodeExecutionData[],
+): Promise<INodeExecutionData[]> {
+	const returnData: INodeExecutionData[] = [];
+
+	for (let i = 0; i < items.length; i++) {
+		try {
+			const workbookId = this.getNodeParameter('workbook', i, undefined, {
+				extractValue: true,
+			}) as string;
+
+			try {
+				await microsoftApiRequest.call(this, 'DELETE', `/drive/items/${workbookId}`);
+			} catch (error) {
+				if (error?.description.includes('Lock token does not match existing lock')) {
+					const errorDescription =
+						'Lock token does not match existing lock, this error could happen if the file is opened in the browser or the Office client, please close file and try again.';
+
+					throw new NodeOperationError(this.getNode(), error as Error, {
+						itemIndex: i,
+						description: errorDescription,
+					});
+				} else {
+					throw error;
+				}
+			}
+
+			const responseData = { success: true };
+
+			if (Array.isArray(responseData)) {
+				const executionData = this.helpers.constructExecutionMetaData(
+					this.helpers.returnJsonArray(responseData),
+					{ itemData: { item: i } },
+				);
+
+				returnData.push(...executionData);
+			} else if (responseData !== undefined) {
+				const executionData = this.helpers.constructExecutionMetaData(
+					this.helpers.returnJsonArray(responseData),
+					{ itemData: { item: i } },
+				);
+
+				returnData.push(...executionData);
+			}
+		} 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;
+		}
+	}
+
+	return returnData;
+}
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
new file mode 100644
index 0000000000000..81a2081572674
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/workbook/getAll.operation.ts
@@ -0,0 +1,126 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+import { microsoftApiRequest, microsoftApiRequestAllItems } from '../../transport';
+import { updateDisplayOptions } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		default: false,
+		description: 'Whether to return all results or only up to a given limit',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				returnAll: [false],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 500,
+		},
+		default: 100,
+		description: 'Max number of results to return',
+	},
+	{
+		displayName: 'Filters',
+		name: 'filters',
+		type: 'collection',
+		placeholder: 'Add Filter',
+		default: {},
+		options: [
+			{
+				displayName: 'Fields',
+				name: 'fields',
+				type: 'string',
+				default: '',
+				description: 'A comma-separated list of the fields to include in the response',
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['workbook'],
+		operation: ['getAll'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	items: INodeExecutionData[],
+): Promise<INodeExecutionData[]> {
+	const returnData: INodeExecutionData[] = [];
+
+	for (let i = 0; i < items.length; i++) {
+		try {
+			const returnAll = this.getNodeParameter('returnAll', i);
+			const filters = this.getNodeParameter('filters', i);
+			const qs: IDataObject = {};
+			if (filters.fields) {
+				qs.$select = filters.fields;
+			}
+			let responseData;
+			if (returnAll) {
+				responseData = await microsoftApiRequestAllItems.call(
+					this,
+					'value',
+					'GET',
+					"/drive/root/search(q='.xlsx')",
+					{},
+					qs,
+				);
+			} else {
+				qs.$top = this.getNodeParameter('limit', i);
+				responseData = await microsoftApiRequest.call(
+					this,
+					'GET',
+					"/drive/root/search(q='.xlsx')",
+					{},
+					qs,
+				);
+				responseData = responseData.value;
+			}
+
+			if (Array.isArray(responseData)) {
+				const executionData = this.helpers.constructExecutionMetaData(
+					this.helpers.returnJsonArray(responseData),
+					{ itemData: { item: i } },
+				);
+
+				returnData.push(...executionData);
+			} else if (responseData !== undefined) {
+				const executionData = this.helpers.constructExecutionMetaData(
+					this.helpers.returnJsonArray(responseData as IDataObject),
+					{ itemData: { item: i } },
+				);
+
+				returnData.push(...executionData);
+			}
+		} 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;
+		}
+	}
+
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/Worksheet.resource.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/Worksheet.resource.ts
new file mode 100644
index 0000000000000..7f8a901b55f81
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/Worksheet.resource.ts
@@ -0,0 +1,79 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+import * as append from './append.operation';
+import * as clear from './clear.operation';
+import * as deleteWorksheet from './deleteWorksheet.operation';
+import * as getAll from './getAll.operation';
+import * as readRows from './readRows.operation';
+import * as update from './update.operation';
+import * as upsert from './upsert.operation';
+
+export { append, clear, deleteWorksheet, getAll, readRows, update, upsert };
+
+export const description: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				resource: ['worksheet'],
+			},
+		},
+		options: [
+			{
+				name: 'Append',
+				value: 'append',
+				description: 'Append data to sheet',
+				action: 'Append data to sheet',
+			},
+			{
+				// eslint-disable-next-line n8n-nodes-base/node-param-option-name-wrong-for-upsert
+				name: 'Append or Update',
+				value: 'upsert',
+				// eslint-disable-next-line n8n-nodes-base/node-param-description-wrong-for-upsert
+				description: 'Append a new row or update the current one if it already exists (upsert)',
+				action: 'Append or update a sheet',
+			},
+			{
+				name: 'Clear',
+				value: 'clear',
+				description: 'Clear sheet',
+				action: 'Clear sheet',
+			},
+			{
+				name: 'Delete',
+				value: 'deleteWorksheet',
+				description: 'Delete sheet',
+				action: 'Delete sheet',
+			},
+			{
+				name: 'Get Many',
+				value: 'getAll',
+				description: 'Get a list of sheets',
+				action: 'Get sheets',
+			},
+			{
+				name: 'Get Rows',
+				value: 'readRows',
+				description: 'Retrieve a list of sheet rows',
+				action: 'Get rows from sheet',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update rows of a sheet or sheet range',
+				action: 'Update sheet',
+			},
+		],
+		default: 'getAll',
+	},
+	...append.description,
+	...clear.description,
+	...deleteWorksheet.description,
+	...getAll.description,
+	...readRows.description,
+	...update.description,
+	...upsert.description,
+];
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
new file mode 100644
index 0000000000000..05247e6780d0f
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/append.operation.ts
@@ -0,0 +1,235 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+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,
+	worksheetRLC,
+	{
+		displayName: 'Data Mode',
+		name: 'dataMode',
+		type: 'options',
+		default: 'define',
+		options: [
+			{
+				name: 'Auto-Map Input Data to Columns',
+				value: 'autoMap',
+				description: 'Use when node input properties match destination column names',
+			},
+			{
+				name: 'Map Each Column Below',
+				value: 'define',
+				description: 'Set the value for each destination column',
+			},
+			{
+				name: 'Raw',
+				value: 'raw',
+				description: 'Send raw data as JSON',
+			},
+		],
+	},
+	{
+		displayName: 'Data',
+		name: 'data',
+		type: 'json',
+		default: '',
+		required: true,
+		placeholder: 'e.g. [["Sara","1/2/2006","Berlin"],["George","5/3/2010","Paris"]]',
+		description: 'Raw values for the specified range as array of string arrays in JSON format',
+		displayOptions: {
+			show: {
+				dataMode: ['raw'],
+			},
+		},
+	},
+	{
+		displayName: 'Values to Send',
+		name: 'fieldsUi',
+		placeholder: 'Add Field',
+		type: 'fixedCollection',
+		typeOptions: {
+			multipleValues: true,
+		},
+		displayOptions: {
+			show: {
+				dataMode: ['define'],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Field',
+				name: 'values',
+				values: [
+					{
+						// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-options
+						displayName: 'Column',
+						name: 'column',
+						type: 'options',
+						description:
+							'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
+						typeOptions: {
+							loadOptionsDependsOn: ['worksheet.value'],
+							loadOptionsMethod: 'getWorksheetColumnRow',
+						},
+						default: '',
+					},
+					{
+						displayName: 'Value',
+						name: 'fieldValue',
+						type: 'string',
+						default: '',
+					},
+				],
+			},
+		],
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			{
+				displayName: 'RAW Data',
+				name: 'rawData',
+				type: 'boolean',
+				// eslint-disable-next-line n8n-nodes-base/node-param-default-wrong-for-boolean
+				default: 0,
+				description:
+					'Whether the data should be returned RAW instead of parsed into keys according to their header',
+			},
+			{
+				displayName: 'Data Property',
+				name: 'dataProperty',
+				type: 'string',
+				default: 'data',
+				required: true,
+				displayOptions: {
+					show: {
+						rawData: [true],
+					},
+				},
+				description: 'The name of the property into which to write the RAW data',
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['worksheet'],
+		operation: ['append'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	items: INodeExecutionData[],
+): Promise<INodeExecutionData[]> {
+	const returnData: INodeExecutionData[] = [];
+
+	const workbookId = this.getNodeParameter('workbook', 0, undefined, {
+		extractValue: true,
+	}) as string;
+
+	const worksheetId = this.getNodeParameter('worksheet', 0, undefined, {
+		extractValue: true,
+	}) as string;
+
+	const dataMode = this.getNodeParameter('dataMode', 0) as string;
+
+	const worksheetData = await microsoftApiRequest.call(
+		this,
+		'GET',
+		`/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/usedRange`,
+	);
+
+	let values: string[][] = [];
+
+	if (dataMode === 'raw') {
+		const data = this.getNodeParameter('data', 0);
+		values = processJsonInput(data, 'Data') as string[][];
+	}
+
+	const columnsRow = (worksheetData.values as string[][])[0];
+
+	if (dataMode === 'autoMap') {
+		const itemsData = items.map((item) => item.json);
+		for (const item of itemsData) {
+			const updateRow: string[] = [];
+
+			for (const column of columnsRow) {
+				updateRow.push(item[column] as string);
+			}
+
+			values.push(updateRow);
+		}
+	}
+
+	if (dataMode === 'define') {
+		const itemsData: IDataObject[] = [];
+		for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
+			const updateData: IDataObject = {};
+			const definedFields = this.getNodeParameter('fieldsUi.values', itemIndex, []) as Array<{
+				column: string;
+				fieldValue: string;
+			}>;
+			for (const entry of definedFields) {
+				updateData[entry.column] = entry.fieldValue;
+			}
+			itemsData.push(updateData);
+		}
+
+		for (const item of itemsData) {
+			const updateRow: string[] = [];
+
+			for (const column of columnsRow) {
+				updateRow.push(item[column] as string);
+			}
+
+			values.push(updateRow);
+		}
+	}
+
+	const { address } = worksheetData;
+	const usedRange = address.split('!')[1];
+
+	const [rangeFrom, rangeTo] = usedRange.split(':');
+	const cellDataFrom = rangeFrom.match(/([a-zA-Z]{1,10})([0-9]{0,10})/) || [];
+	const cellDataTo = rangeTo.match(/([a-zA-Z]{1,10})([0-9]{0,10})/) || [];
+
+	const from = `${cellDataFrom[1]}${Number(cellDataTo[2]) + 1}`;
+	const to = `${cellDataTo[1]}${Number(cellDataTo[2]) + Number(values.length)}`;
+
+	const responseData: ExcelResponse = await microsoftApiRequest.call(
+		this,
+		'PATCH',
+		`/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/range(address='${from}:${to}')`,
+		{ values },
+	);
+
+	const rawData = this.getNodeParameter('options.rawData', 0, false) as boolean;
+	const dataProperty = this.getNodeParameter('options.dataProperty', 0, 'data') as string;
+
+	returnData.push(
+		...prepareOutput.call(this, this.getNode(), responseData, {
+			columnsRow,
+			dataProperty,
+			rawData,
+		}),
+	);
+
+	return returnData;
+}
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
new file mode 100644
index 0000000000000..8299ee18b115c
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/clear.operation.ts
@@ -0,0 +1,120 @@
+import type { INodeExecutionData, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
+import { microsoftApiRequest } from '../../transport';
+import { workbookRLC, worksheetRLC } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	workbookRLC,
+	worksheetRLC,
+	{
+		displayName: 'Apply To',
+		name: 'applyTo',
+		type: 'options',
+		//values in capital case as required by api
+		options: [
+			{
+				name: 'All',
+				value: 'All',
+				description: 'Clear data in cells and remove all formatting',
+			},
+			{
+				name: 'Formats',
+				value: 'Formats',
+				description: 'Clear formatting(e.g. font size, color) of cells',
+			},
+			{
+				name: 'Contents',
+				value: 'Contents',
+				description: 'Clear data contained in cells',
+			},
+		],
+		default: 'All',
+	},
+	{
+		displayName: 'Select a Range',
+		name: 'useRange',
+		type: 'boolean',
+		default: false,
+	},
+	{
+		displayName: 'Range',
+		name: 'range',
+		type: 'string',
+		displayOptions: {
+			show: {
+				useRange: [true],
+			},
+		},
+		placeholder: 'e.g. A1:B2',
+		default: '',
+		description: 'The sheet range that would be cleared, specified using a A1-style notation',
+		hint: 'Leave blank for entire worksheet',
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['worksheet'],
+		operation: ['clear'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	items: INodeExecutionData[],
+): Promise<INodeExecutionData[]> {
+	const returnData: INodeExecutionData[] = [];
+
+	for (let i = 0; i < items.length; i++) {
+		try {
+			const workbookId = this.getNodeParameter('workbook', i, undefined, {
+				extractValue: true,
+			}) as string;
+
+			const worksheetId = this.getNodeParameter('worksheet', i, undefined, {
+				extractValue: true,
+			}) as string;
+
+			const applyTo = this.getNodeParameter('applyTo', i) as string;
+			const useRange = this.getNodeParameter('useRange', i, false) as boolean;
+
+			if (!useRange) {
+				await microsoftApiRequest.call(
+					this,
+					'POST',
+					`/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/range/clear`,
+					{ applyTo },
+				);
+			} else {
+				const range = this.getNodeParameter('range', i, '') as string;
+				await microsoftApiRequest.call(
+					this,
+					'POST',
+					`/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/range(address='${range}')/clear`,
+					{ applyTo },
+				);
+			}
+
+			const executionData = this.helpers.constructExecutionMetaData(
+				this.helpers.returnJsonArray({ success: true }),
+				{ itemData: { item: i } },
+			);
+
+			returnData.push(...executionData);
+		} 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;
+		}
+	}
+
+	return returnData;
+}
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
new file mode 100644
index 0000000000000..0ecae73b4615a
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/deleteWorksheet.operation.ts
@@ -0,0 +1,59 @@
+import type { INodeExecutionData, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
+import { microsoftApiRequest } from '../../transport';
+import { workbookRLC, worksheetRLC } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+const properties: INodeProperties[] = [workbookRLC, worksheetRLC];
+
+const displayOptions = {
+	show: {
+		resource: ['worksheet'],
+		operation: ['deleteWorksheet'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	items: INodeExecutionData[],
+): Promise<INodeExecutionData[]> {
+	const returnData: INodeExecutionData[] = [];
+
+	for (let i = 0; i < items.length; i++) {
+		try {
+			const workbookId = this.getNodeParameter('workbook', i, undefined, {
+				extractValue: true,
+			}) as string;
+
+			const worksheetId = this.getNodeParameter('worksheet', i, undefined, {
+				extractValue: true,
+			}) as string;
+
+			await microsoftApiRequest.call(
+				this,
+				'DELETE',
+				`/drive/items/${workbookId}/workbook/worksheets/${worksheetId}`,
+			);
+
+			const executionData = this.helpers.constructExecutionMetaData(
+				this.helpers.returnJsonArray({ success: true }),
+				{ itemData: { item: i } },
+			);
+
+			returnData.push(...executionData);
+		} 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;
+		}
+	}
+
+	return returnData;
+}
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
new file mode 100644
index 0000000000000..3681b60270d13
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/getAll.operation.ts
@@ -0,0 +1,123 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+import { microsoftApiRequest, microsoftApiRequestAllItems } from '../../transport';
+import { workbookRLC } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	workbookRLC,
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		default: false,
+		description: 'Whether to return all results or only up to a given limit',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				returnAll: [false],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 500,
+		},
+		default: 100,
+		description: 'Max number of results to return',
+	},
+	{
+		displayName: 'Filters',
+		name: 'filters',
+		type: 'collection',
+		placeholder: 'Add Filter',
+		default: {},
+		options: [
+			{
+				displayName: 'Fields',
+				name: 'fields',
+				type: 'string',
+				default: '',
+				description: 'A comma-separated list of the fields to include in the response',
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['worksheet'],
+		operation: ['getAll'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	items: INodeExecutionData[],
+): Promise<INodeExecutionData[]> {
+	//https://docs.microsoft.com/en-us/graph/api/workbook-list-worksheets?view=graph-rest-1.0&tabs=http
+	const returnData: INodeExecutionData[] = [];
+
+	for (let i = 0; i < items.length; i++) {
+		const qs: IDataObject = {};
+		try {
+			const returnAll = this.getNodeParameter('returnAll', i);
+			const workbookId = this.getNodeParameter('workbook', i, undefined, {
+				extractValue: true,
+			}) as string;
+			const filters = this.getNodeParameter('filters', i);
+			if (filters.fields) {
+				qs.$select = filters.fields;
+			}
+
+			let responseData;
+			if (returnAll) {
+				responseData = await microsoftApiRequestAllItems.call(
+					this,
+					'value',
+					'GET',
+					`/drive/items/${workbookId}/workbook/worksheets`,
+					{},
+					qs,
+				);
+			} else {
+				qs.$top = this.getNodeParameter('limit', i);
+				responseData = await microsoftApiRequest.call(
+					this,
+					'GET',
+					`/drive/items/${workbookId}/workbook/worksheets`,
+					{},
+					qs,
+				);
+				responseData = responseData.value;
+			}
+			const executionData = this.helpers.constructExecutionMetaData(
+				this.helpers.returnJsonArray(responseData as IDataObject[]),
+				{ itemData: { item: i } },
+			);
+
+			returnData.push(...executionData);
+		} 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;
+		}
+	}
+
+	return returnData;
+}
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
new file mode 100644
index 0000000000000..a91fc32a78bb7
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/readRows.operation.ts
@@ -0,0 +1,205 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+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,
+	worksheetRLC,
+	{
+		displayName: 'Select a Range',
+		name: 'useRange',
+		type: 'boolean',
+		default: false,
+	},
+	{
+		displayName: 'Range',
+		name: 'range',
+		type: 'string',
+		placeholder: 'e.g. A1:B2',
+		default: '',
+		description:
+			'The sheet range to read the data from specified using a A1-style notation, has to be specific e.g A1:B5, generic ranges like A:B are not supported',
+		hint: 'Leave blank to return entire sheet',
+		displayOptions: {
+			show: {
+				useRange: [true],
+			},
+		},
+	},
+	{
+		displayName: 'Header Row',
+		name: 'keyRow',
+		type: 'number',
+		typeOptions: {
+			minValue: 0,
+		},
+		default: 0,
+		hint: 'Index of the row which contains the column names',
+		description: "Relative to selected 'Range', first row index is 0",
+		displayOptions: {
+			show: {
+				useRange: [true],
+			},
+		},
+	},
+	{
+		displayName: 'First Data Row',
+		name: 'dataStartRow',
+		type: 'number',
+		typeOptions: {
+			minValue: 0,
+		},
+		default: 1,
+		hint: 'Index of first row which contains the actual data',
+		description: "Relative to selected 'Range', first row index is 0",
+		displayOptions: {
+			show: {
+				useRange: [true],
+			},
+		},
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			{
+				displayName: 'RAW Data',
+				name: 'rawData',
+				type: 'boolean',
+				// eslint-disable-next-line n8n-nodes-base/node-param-default-wrong-for-boolean
+				default: 0,
+				description:
+					'Whether the data should be returned RAW instead of parsed into keys according to their header',
+			},
+			{
+				displayName: 'Data Property',
+				name: 'dataProperty',
+				type: 'string',
+				default: 'data',
+				required: true,
+				displayOptions: {
+					show: {
+						rawData: [true],
+					},
+				},
+				description: 'The name of the property into which to write the RAW data',
+			},
+			{
+				displayName: 'Fields',
+				name: 'fields',
+				type: 'string',
+				default: '',
+				description: 'Fields the response will containt. Multiple can be added separated by ,.',
+				displayOptions: {
+					show: {
+						rawData: [true],
+					},
+				},
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['worksheet'],
+		operation: ['readRows'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	items: INodeExecutionData[],
+): Promise<INodeExecutionData[]> {
+	//https://docs.microsoft.com/en-us/graph/api/worksheet-range?view=graph-rest-1.0&tabs=http
+	const returnData: INodeExecutionData[] = [];
+
+	for (let i = 0; i < items.length; i++) {
+		const qs: IDataObject = {};
+		try {
+			const workbookId = this.getNodeParameter('workbook', i, undefined, {
+				extractValue: true,
+			}) as string;
+
+			const worksheetId = this.getNodeParameter('worksheet', i, undefined, {
+				extractValue: true,
+			}) as string;
+
+			const options = this.getNodeParameter('options', i, {});
+
+			const range = this.getNodeParameter('range', i, '') as string;
+			checkRange(this.getNode(), range);
+
+			const rawData = (options.rawData as boolean) || false;
+
+			if (rawData && options.fields) {
+				qs.$select = options.fields;
+			}
+
+			let responseData;
+			if (range) {
+				responseData = await microsoftApiRequest.call(
+					this,
+					'GET',
+					`/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/range(address='${range}')`,
+					{},
+					qs,
+				);
+			} else {
+				responseData = await microsoftApiRequest.call(
+					this,
+					'GET',
+					`/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/usedRange`,
+					{},
+					qs,
+				);
+			}
+
+			if (!rawData) {
+				const keyRow = this.getNodeParameter('keyRow', i, 0) as number;
+				const firstDataRow = this.getNodeParameter('dataStartRow', i, 1) as number;
+
+				returnData.push(
+					...prepareOutput.call(this, this.getNode(), responseData as ExcelResponse, {
+						rawData,
+						keyRow,
+						firstDataRow,
+					}),
+				);
+			} else {
+				const dataProperty = (options.dataProperty as string) || 'data';
+				returnData.push(
+					...prepareOutput.call(this, this.getNode(), responseData as ExcelResponse, {
+						rawData,
+						dataProperty,
+					}),
+				);
+			}
+		} 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;
+		}
+	}
+
+	return returnData;
+}
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
new file mode 100644
index 0000000000000..035b876178eb6
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/update.operation.ts
@@ -0,0 +1,388 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+import { NodeOperationError } from 'n8n-workflow';
+import type { ExcelResponse, UpdateSummary } from '../../helpers/interfaces';
+import {
+	checkRange,
+	prepareOutput,
+	updateByAutoMaping,
+	updateByDefinedValues,
+} from '../../helpers/utils';
+import { microsoftApiRequest } from '../../transport';
+import { workbookRLC, worksheetRLC } from '../common.descriptions';
+import { generatePairedItemData, processJsonInput, updateDisplayOptions } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	workbookRLC,
+	worksheetRLC,
+	{
+		displayName: 'Select a Range',
+		name: 'useRange',
+		type: 'boolean',
+		default: false,
+	},
+	{
+		displayName: 'Range',
+		name: 'range',
+		type: 'string',
+		displayOptions: {
+			show: {
+				dataMode: ['autoMap', 'define'],
+				useRange: [true],
+			},
+		},
+		placeholder: 'e.g. A1:B2',
+		default: '',
+		description:
+			'The sheet range to read the data from specified using a A1-style notation, has to be specific e.g A1:B5, generic ranges like A:B are not supported. Leave blank to use whole used range in the sheet.',
+		hint: 'First row must contain column names',
+	},
+	{
+		displayName: 'Range',
+		name: 'range',
+		type: 'string',
+		displayOptions: {
+			show: {
+				dataMode: ['raw'],
+				useRange: [true],
+			},
+		},
+		placeholder: 'e.g. A1:B2',
+		default: '',
+		description: 'The sheet range to read the data from specified using a A1-style notation',
+		hint: 'Leave blank for entire worksheet',
+	},
+	{
+		displayName: 'Data Mode',
+		name: 'dataMode',
+		type: 'options',
+		default: 'define',
+		options: [
+			{
+				name: 'Auto-Map Input Data to Columns',
+				value: 'autoMap',
+				description: 'Use when node input properties match destination column names',
+			},
+			{
+				name: 'Map Each Column Below',
+				value: 'define',
+				description: 'Set the value for each destination column',
+			},
+			{
+				name: 'Raw',
+				value: 'raw',
+				description:
+					'Send raw data as JSON, the whole selected range would be updated with the new values',
+			},
+		],
+	},
+	{
+		displayName: 'Data',
+		name: 'data',
+		type: 'json',
+		default: '',
+		required: true,
+		placeholder: 'e.g. [["Sara","1/2/2006","Berlin"],["George","5/3/2010","Paris"]]',
+		description:
+			'Raw values for the specified range as array of string arrays in JSON format. Should match the specified range: one array item for each row.',
+		displayOptions: {
+			show: {
+				dataMode: ['raw'],
+			},
+		},
+	},
+	{
+		// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased, n8n-nodes-base/node-param-display-name-wrong-for-dynamic-options
+		displayName: 'Column to match on',
+		name: 'columnToMatchOn',
+		type: 'options',
+		description:
+			'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
+		typeOptions: {
+			loadOptionsDependsOn: ['worksheet.value', 'workbook.value', 'range'],
+			loadOptionsMethod: 'getWorksheetColumnRow',
+		},
+		default: '',
+		hint: "Used to find the correct row to update. Doesn't get changed.",
+		displayOptions: {
+			show: {
+				dataMode: ['autoMap', 'define'],
+			},
+		},
+	},
+	{
+		displayName: 'Value of Column to Match On',
+		name: 'valueToMatchOn',
+		type: 'string',
+		default: '',
+		displayOptions: {
+			show: {
+				dataMode: ['define'],
+			},
+		},
+	},
+	{
+		displayName: 'Values to Send',
+		name: 'fieldsUi',
+		placeholder: 'Add Field',
+		type: 'fixedCollection',
+		typeOptions: {
+			multipleValues: true,
+		},
+		displayOptions: {
+			show: {
+				dataMode: ['define'],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Field',
+				name: 'values',
+				values: [
+					{
+						// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-options
+						displayName: 'Column',
+						name: 'column',
+						type: 'options',
+						description:
+							'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
+						typeOptions: {
+							loadOptionsDependsOn: ['columnToMatchOn', 'range'],
+							loadOptionsMethod: 'getWorksheetColumnRowSkipColumnToMatchOn',
+						},
+						default: '',
+					},
+					{
+						displayName: 'Value',
+						name: 'fieldValue',
+						type: 'string',
+						default: '',
+					},
+				],
+			},
+		],
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			{
+				displayName: 'RAW Data',
+				name: 'rawData',
+				type: 'boolean',
+				// eslint-disable-next-line n8n-nodes-base/node-param-default-wrong-for-boolean
+				default: 0,
+				description:
+					'Whether the data should be returned RAW instead of parsed into keys according to their header',
+			},
+			{
+				displayName: 'Data Property',
+				name: 'dataProperty',
+				type: 'string',
+				default: 'data',
+				required: true,
+				displayOptions: {
+					show: {
+						rawData: [true],
+					},
+				},
+				description: 'The name of the property into which to write the RAW data',
+			},
+			{
+				displayName: 'Fields',
+				name: 'fields',
+				type: 'string',
+				default: '',
+				description: 'Fields the response will containt. Multiple can be added separated by ,.',
+				displayOptions: {
+					show: {
+						rawData: [true],
+					},
+				},
+			},
+			{
+				displayName: 'Update All Matches',
+				name: 'updateAll',
+				type: 'boolean',
+				default: false,
+				description: 'Whether to update all matching rows or just the first match',
+				displayOptions: {
+					hide: {
+						'/dataMode': ['raw'],
+					},
+				},
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['worksheet'],
+		operation: ['update'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	items: INodeExecutionData[],
+): Promise<INodeExecutionData[]> {
+	const returnData: INodeExecutionData[] = [];
+
+	try {
+		const options = this.getNodeParameter('options', 0, {});
+
+		const rawData = options.rawData as boolean;
+		const dataProperty = options.dataProperty ? (options.dataProperty as string) : 'data';
+
+		const qs: IDataObject = {};
+		if (rawData && options.fields) {
+			qs.$select = options.fields;
+		}
+
+		const workbookId = this.getNodeParameter('workbook', 0, undefined, {
+			extractValue: true,
+		}) as string;
+
+		const worksheetId = this.getNodeParameter('worksheet', 0, undefined, {
+			extractValue: true,
+		}) as string;
+
+		let range = this.getNodeParameter('range', 0, '') as string;
+		checkRange(this.getNode(), range);
+
+		const dataMode = this.getNodeParameter('dataMode', 0) as string;
+
+		let worksheetData: IDataObject = {};
+
+		if (range && dataMode !== 'raw') {
+			worksheetData = await microsoftApiRequest.call(
+				this,
+				'PATCH',
+				`/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/range(address='${range}')`,
+			);
+		}
+
+		//get used range if range not provided; if 'raw' mode fetch only address information
+		if (range === '') {
+			const query: IDataObject = {};
+			if (dataMode === 'raw') {
+				query.select = 'address';
+			}
+
+			worksheetData = await microsoftApiRequest.call(
+				this,
+				'GET',
+				`/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/usedRange`,
+				undefined,
+				query,
+			);
+
+			range = (worksheetData.address as string).split('!')[1];
+		}
+
+		let responseData;
+		if (dataMode === 'raw') {
+			const data = this.getNodeParameter('data', 0);
+
+			const values = processJsonInput(data, 'Data') as string[][];
+
+			responseData = await microsoftApiRequest.call(
+				this,
+				'PATCH',
+				`/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/range(address='${range}')`,
+				{ values },
+				qs,
+			);
+
+			returnData.push(
+				...prepareOutput.call(this, this.getNode(), responseData as ExcelResponse, {
+					rawData,
+					dataProperty,
+				}),
+			);
+		} else {
+			if (worksheetData.values === undefined || (worksheetData.values as string[][]).length <= 1) {
+				throw new NodeOperationError(
+					this.getNode(),
+					'No data found in the specified range, mapping not possible, you can use raw mode instead to update selected range',
+				);
+			}
+
+			const updateAll = this.getNodeParameter('options.updateAll', 0, false) as boolean;
+
+			let updateSummary: UpdateSummary = {
+				updatedData: [],
+				updatedRows: [],
+				appendData: [],
+			};
+
+			if (dataMode === 'define') {
+				updateSummary = updateByDefinedValues.call(
+					this,
+					items.length,
+					worksheetData.values as string[][],
+					updateAll,
+				);
+			}
+
+			if (dataMode === 'autoMap') {
+				const columnToMatchOn = this.getNodeParameter('columnToMatchOn', 0) as string;
+
+				if (!items.some(({ json }) => json[columnToMatchOn] !== undefined)) {
+					throw new NodeOperationError(
+						this.getNode(),
+						`Any item in input data contains column '${columnToMatchOn}', that is selected to match on`,
+					);
+				}
+
+				updateSummary = updateByAutoMaping(
+					items,
+					worksheetData.values as string[][],
+					columnToMatchOn,
+					updateAll,
+				);
+			}
+
+			responseData = await microsoftApiRequest.call(
+				this,
+				'PATCH',
+				`/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/range(address='${range}')`,
+				{ values: updateSummary.updatedData },
+			);
+
+			const { updatedRows } = updateSummary;
+
+			returnData.push(
+				...prepareOutput.call(this, this.getNode(), responseData as ExcelResponse, {
+					updatedRows,
+					rawData,
+					dataProperty,
+				}),
+			);
+		}
+	} catch (error) {
+		if (this.continueOnFail()) {
+			const itemData = generatePairedItemData(this.getInputData().length);
+			const executionErrorData = this.helpers.constructExecutionMetaData(
+				this.helpers.returnJsonArray({ error: error.message }),
+				{ itemData },
+			);
+			returnData.push(...executionErrorData);
+		} else {
+			throw error;
+		}
+	}
+
+	return returnData;
+}
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
new file mode 100644
index 0000000000000..fc615c349434f
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/upsert.operation.ts
@@ -0,0 +1,395 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+import { NodeOperationError } from 'n8n-workflow';
+import type { ExcelResponse, UpdateSummary } from '../../helpers/interfaces';
+import {
+	checkRange,
+	prepareOutput,
+	updateByAutoMaping,
+	updateByDefinedValues,
+} from '../../helpers/utils';
+import { microsoftApiRequest } from '../../transport';
+import { workbookRLC, worksheetRLC } from '../common.descriptions';
+import { generatePairedItemData, processJsonInput, updateDisplayOptions } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	workbookRLC,
+	worksheetRLC,
+	{
+		displayName: 'Select a Range',
+		name: 'useRange',
+		type: 'boolean',
+		default: false,
+	},
+	{
+		displayName: 'Range',
+		name: 'range',
+		type: 'string',
+		displayOptions: {
+			show: {
+				dataMode: ['autoMap', 'define'],
+				useRange: [true],
+			},
+		},
+		placeholder: 'e.g. A1:B2',
+		default: '',
+		description:
+			'The sheet range to read the data from specified using a A1-style notation, has to be specific e.g A1:B5, generic ranges like A:B are not supported. Leave blank to use whole used range in the sheet.',
+		hint: 'First row must contain column names',
+	},
+	{
+		displayName: 'Data Mode',
+		name: 'dataMode',
+		type: 'options',
+		default: 'define',
+		options: [
+			{
+				name: 'Auto-Map Input Data to Columns',
+				value: 'autoMap',
+				description: 'Use when node input properties match destination column names',
+			},
+			{
+				name: 'Map Each Column Below',
+				value: 'define',
+				description: 'Set the value for each destination column',
+			},
+		],
+	},
+	{
+		// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased, n8n-nodes-base/node-param-display-name-wrong-for-dynamic-options
+		displayName: 'Column to match on',
+		name: 'columnToMatchOn',
+		type: 'options',
+		description:
+			'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
+		typeOptions: {
+			loadOptionsDependsOn: ['worksheet.value', 'workbook.value', 'range'],
+			loadOptionsMethod: 'getWorksheetColumnRow',
+		},
+		default: '',
+		hint: "Used to find the correct row to update. Doesn't get changed.",
+		displayOptions: {
+			show: {
+				dataMode: ['autoMap', 'define'],
+			},
+		},
+	},
+	{
+		displayName: 'Value of Column to Match On',
+		name: 'valueToMatchOn',
+		type: 'string',
+		default: '',
+		displayOptions: {
+			show: {
+				dataMode: ['define'],
+			},
+		},
+	},
+	{
+		displayName: 'Values to Send',
+		name: 'fieldsUi',
+		placeholder: 'Add Field',
+		type: 'fixedCollection',
+		typeOptions: {
+			multipleValues: true,
+		},
+		displayOptions: {
+			show: {
+				dataMode: ['define'],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Field',
+				name: 'values',
+				values: [
+					{
+						// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-options
+						displayName: 'Column',
+						name: 'column',
+						type: 'options',
+						description:
+							'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
+						typeOptions: {
+							loadOptionsDependsOn: ['columnToMatchOn', 'range'],
+							loadOptionsMethod: 'getWorksheetColumnRowSkipColumnToMatchOn',
+						},
+						default: '',
+					},
+					{
+						displayName: 'Value',
+						name: 'fieldValue',
+						type: 'string',
+						default: '',
+					},
+				],
+			},
+		],
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			{
+				displayName: 'Append After Selected Range',
+				name: 'appendAfterSelectedRange',
+				type: 'boolean',
+				default: false,
+				description: 'Whether to append data after the selected range or used range',
+				displayOptions: {
+					show: {
+						'/dataMode': ['autoMap', 'define'],
+						'/useRange': [true],
+					},
+				},
+			},
+			{
+				displayName: 'RAW Data',
+				name: 'rawData',
+				type: 'boolean',
+				// eslint-disable-next-line n8n-nodes-base/node-param-default-wrong-for-boolean
+				default: 0,
+				description:
+					'Whether the data should be returned RAW instead of parsed into keys according to their header',
+			},
+			{
+				displayName: 'Data Property',
+				name: 'dataProperty',
+				type: 'string',
+				default: 'data',
+				required: true,
+				displayOptions: {
+					show: {
+						rawData: [true],
+					},
+				},
+				description: 'The name of the property into which to write the RAW data',
+			},
+			{
+				displayName: 'Update All Matches',
+				name: 'updateAll',
+				type: 'boolean',
+				default: false,
+				description: 'Whether to update all matching rows or just the first match',
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['worksheet'],
+		operation: ['upsert'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	items: INodeExecutionData[],
+): Promise<INodeExecutionData[]> {
+	const returnData: INodeExecutionData[] = [];
+	const nodeVersion = this.getNode().typeVersion;
+
+	try {
+		const workbookId = this.getNodeParameter('workbook', 0, undefined, {
+			extractValue: true,
+		}) as string;
+
+		const worksheetId = this.getNodeParameter('worksheet', 0, undefined, {
+			extractValue: true,
+		}) as string;
+
+		let range = this.getNodeParameter('range', 0, '') as string;
+		checkRange(this.getNode(), range);
+
+		const dataMode = this.getNodeParameter('dataMode', 0) as string;
+
+		let worksheetData: IDataObject = {};
+
+		if (range && dataMode !== 'raw') {
+			worksheetData = await microsoftApiRequest.call(
+				this,
+				'PATCH',
+				`/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/range(address='${range}')`,
+			);
+		}
+
+		//get used range if range not provided; if 'raw' mode fetch only address information
+		if (range === '') {
+			const query: IDataObject = {};
+			if (dataMode === 'raw') {
+				query.select = 'address';
+			}
+
+			worksheetData = await microsoftApiRequest.call(
+				this,
+				'GET',
+				`/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/usedRange`,
+				undefined,
+				query,
+			);
+
+			range = (worksheetData.address as string).split('!')[1];
+		}
+
+		let responseData;
+		if (dataMode === 'raw') {
+			const data = this.getNodeParameter('data', 0);
+
+			const values = processJsonInput(data, 'Data') as string[][];
+
+			responseData = await microsoftApiRequest.call(
+				this,
+				'PATCH',
+				`/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/range(address='${range}')`,
+				{ values },
+			);
+		}
+
+		if (
+			dataMode !== 'raw' &&
+			(worksheetData.values === undefined || (worksheetData.values as string[][]).length <= 1)
+		) {
+			throw new NodeOperationError(
+				this.getNode(),
+				'No data found in the specified range, mapping not possible, you can use raw mode instead to update selected range',
+			);
+		}
+
+		const updateAll = this.getNodeParameter('options.updateAll', 0, false) as boolean;
+
+		let updateSummary: UpdateSummary = {
+			updatedData: [],
+			updatedRows: [],
+			appendData: [],
+		};
+
+		if (dataMode === 'define') {
+			updateSummary = updateByDefinedValues.call(
+				this,
+				items.length,
+				worksheetData.values as string[][],
+				updateAll,
+			);
+		}
+
+		if (dataMode === 'autoMap') {
+			const columnToMatchOn = this.getNodeParameter('columnToMatchOn', 0) as string;
+
+			if (!items.some(({ json }) => json[columnToMatchOn] !== undefined)) {
+				throw new NodeOperationError(
+					this.getNode(),
+					`Any item in input data contains column '${columnToMatchOn}', that is selected to match on`,
+				);
+			}
+
+			updateSummary = updateByAutoMaping(
+				items,
+				worksheetData.values as string[][],
+				columnToMatchOn,
+				updateAll,
+			);
+		}
+
+		const appendAfterSelectedRange = this.getNodeParameter(
+			'options.appendAfterSelectedRange',
+			0,
+			false,
+		) as boolean;
+
+		//remove empty rows from the end
+		if (nodeVersion > 2 && !appendAfterSelectedRange && updateSummary.updatedData.length) {
+			for (let i = updateSummary.updatedData.length - 1; i >= 0; i--) {
+				if (
+					updateSummary.updatedData[i].every(
+						(item) => item === '' || item === undefined || item === null,
+					)
+				) {
+					updateSummary.updatedData.pop();
+				} else {
+					break;
+				}
+			}
+		}
+
+		if (updateSummary.appendData.length) {
+			const appendValues: string[][] = [];
+			const columnsRow = (worksheetData.values as string[][])[0];
+
+			for (const [index, item] of updateSummary.appendData.entries()) {
+				const updateRow: string[] = [];
+
+				for (const column of columnsRow) {
+					updateRow.push(item[column] as string);
+				}
+
+				appendValues.push(updateRow);
+				updateSummary.updatedRows.push(index + updateSummary.updatedData.length);
+			}
+
+			updateSummary.updatedData = updateSummary.updatedData.concat(appendValues);
+			const [rangeFrom, rangeTo] = range.split(':');
+
+			const cellDataTo = rangeTo.match(/([a-zA-Z]{1,10})([0-9]{0,10})/) || [];
+			let lastRow = cellDataTo[2];
+
+			if (nodeVersion > 2 && !appendAfterSelectedRange) {
+				const { address } = await microsoftApiRequest.call(
+					this,
+					'GET',
+					`/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/usedRange`,
+					undefined,
+					{ select: 'address' },
+				);
+
+				const addressTo = (address as string).split('!')[1].split(':')[1];
+				lastRow = addressTo.match(/([a-zA-Z]{1,10})([0-9]{0,10})/)![2];
+			}
+
+			range = `${rangeFrom}:${cellDataTo[1]}${Number(lastRow) + appendValues.length}`;
+		}
+
+		responseData = await microsoftApiRequest.call(
+			this,
+			'PATCH',
+			`/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/range(address='${range}')`,
+			{ values: updateSummary.updatedData },
+		);
+
+		const { updatedRows } = updateSummary;
+
+		const rawData = this.getNodeParameter('options.rawData', 0, false) as boolean;
+		const dataProperty = this.getNodeParameter('options.dataProperty', 0, 'data') as string;
+
+		returnData.push(
+			...prepareOutput.call(this, this.getNode(), responseData as ExcelResponse, {
+				updatedRows,
+				rawData,
+				dataProperty,
+			}),
+		);
+	} catch (error) {
+		if (this.continueOnFail()) {
+			const itemData = generatePairedItemData(this.getInputData().length);
+			const executionErrorData = this.helpers.constructExecutionMetaData(
+				this.helpers.returnJsonArray({ error: error.message }),
+				{ itemData },
+			);
+			returnData.push(...executionErrorData);
+		} else {
+			throw error;
+		}
+	}
+
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/helpers/interfaces.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/helpers/interfaces.ts
new file mode 100644
index 0000000000000..f3d84f3869b0f
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/helpers/interfaces.ts
@@ -0,0 +1,14 @@
+import type { IDataObject } from 'n8n-workflow';
+
+export type SheetRow = Array<string | number | null>;
+export type SheetData = SheetRow[];
+
+export type ExcelResponse = {
+	values: SheetData;
+};
+
+export type UpdateSummary = {
+	updatedData: SheetData;
+	appendData: IDataObject[];
+	updatedRows: number[];
+};
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/helpers/utils.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/helpers/utils.ts
new file mode 100644
index 0000000000000..2303147ab3892
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/helpers/utils.ts
@@ -0,0 +1,219 @@
+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';
+
+type PrepareOutputConfig = {
+	rawData: boolean;
+	dataProperty?: string;
+	keyRow?: number;
+	firstDataRow?: number;
+	columnsRow?: string[];
+	updatedRows?: number[];
+};
+
+export function prepareOutput(
+	this: IExecuteFunctions,
+	node: INode,
+	responseData: ExcelResponse,
+	config: PrepareOutputConfig,
+) {
+	const returnData: INodeExecutionData[] = [];
+
+	const { rawData, keyRow, firstDataRow, columnsRow, updatedRows } = {
+		keyRow: 0,
+		firstDataRow: 1,
+		columnsRow: undefined,
+		updatedRows: undefined,
+		...config,
+	};
+
+	if (!rawData) {
+		let values = responseData.values;
+		if (values === null) {
+			throw new NodeOperationError(node, 'Operation did not return data');
+		}
+
+		let columns = [];
+
+		if (columnsRow?.length) {
+			columns = columnsRow;
+			values = [columns, ...values];
+		} else {
+			columns = values[keyRow];
+		}
+
+		if (updatedRows) {
+			values = values.filter((_, index) => updatedRows.includes(index));
+		}
+
+		for (let rowIndex = firstDataRow; rowIndex < values.length; rowIndex++) {
+			if (rowIndex === keyRow) continue;
+			const data: IDataObject = {};
+			for (let columnIndex = 0; columnIndex < columns.length; columnIndex++) {
+				data[columns[columnIndex] as string] = values[rowIndex][columnIndex];
+			}
+			const executionData = this.helpers.constructExecutionMetaData(wrapData({ ...data }), {
+				itemData: { item: rowIndex },
+			});
+
+			returnData.push(...executionData);
+		}
+	} else {
+		const itemData = generatePairedItemData(this.getInputData().length);
+		const executionData = this.helpers.constructExecutionMetaData(
+			wrapData({ [config.dataProperty || 'data']: responseData }),
+			{ itemData },
+		);
+
+		returnData.push(...executionData);
+	}
+
+	return returnData;
+}
+// update values of spreadsheet when update mode is 'define'
+export function updateByDefinedValues(
+	this: IExecuteFunctions,
+	itemslength: number,
+	sheetData: SheetData,
+	updateAllOccurences: boolean,
+): UpdateSummary {
+	const [columns, ...originalValues] = sheetData;
+	const updateValues: SheetData = originalValues.map((row) => row.map(() => null));
+
+	const updatedRowsIndexes = new Set<number>();
+	const appendData: IDataObject[] = [];
+
+	for (let itemIndex = 0; itemIndex < itemslength; itemIndex++) {
+		const columnToMatchOn = this.getNodeParameter('columnToMatchOn', itemIndex) as string;
+		const valueToMatchOn = this.getNodeParameter('valueToMatchOn', itemIndex) as string;
+
+		const definedFields = this.getNodeParameter('fieldsUi.values', itemIndex, []) as Array<{
+			column: string;
+			fieldValue: string;
+		}>;
+
+		const columnToMatchOnIndex = columns.indexOf(columnToMatchOn);
+
+		const rowIndexes: number[] = [];
+		if (updateAllOccurences) {
+			for (const [index, row] of originalValues.entries()) {
+				if (
+					row[columnToMatchOnIndex] === valueToMatchOn ||
+					Number(row[columnToMatchOnIndex]) === Number(valueToMatchOn)
+				) {
+					rowIndexes.push(index);
+				}
+			}
+		} else {
+			const rowIndex = originalValues.findIndex(
+				(row) =>
+					row[columnToMatchOnIndex] === valueToMatchOn ||
+					Number(row[columnToMatchOnIndex]) === Number(valueToMatchOn),
+			);
+
+			if (rowIndex !== -1) {
+				rowIndexes.push(rowIndex);
+			}
+		}
+
+		if (!rowIndexes.length) {
+			const appendItem: IDataObject = {};
+			appendItem[columnToMatchOn] = valueToMatchOn;
+
+			for (const entry of definedFields) {
+				appendItem[entry.column] = entry.fieldValue;
+			}
+			appendData.push(appendItem);
+			continue;
+		}
+
+		for (const rowIndex of rowIndexes) {
+			for (const entry of definedFields) {
+				const columnIndex = columns.indexOf(entry.column);
+				if (rowIndex === -1) continue;
+				updateValues[rowIndex][columnIndex] = entry.fieldValue;
+				//add rows index and shift by 1 to account for header row
+				updatedRowsIndexes.add(rowIndex + 1);
+			}
+		}
+	}
+
+	const updatedData = [columns, ...updateValues];
+	const updatedRows = [0, ...Array.from(updatedRowsIndexes)];
+
+	const summary: UpdateSummary = { updatedData, appendData, updatedRows };
+
+	return summary;
+}
+
+// update values of spreadsheet when update mode is 'autoMap'
+export function updateByAutoMaping(
+	items: INodeExecutionData[],
+	sheetData: SheetData,
+	columnToMatchOn: string,
+	updateAllOccurences = false,
+): UpdateSummary {
+	const [columns, ...values] = sheetData;
+	const matchColumnIndex = columns.indexOf(columnToMatchOn);
+	const matchValuesMap = values.map((row) => row[matchColumnIndex]);
+
+	const updatedRowsIndexes = new Set<number>();
+	const appendData: IDataObject[] = [];
+
+	for (const { json } of items) {
+		const columnValue = json[columnToMatchOn] as string;
+		if (columnValue === undefined) continue;
+
+		const rowIndexes: number[] = [];
+		if (updateAllOccurences) {
+			matchValuesMap.forEach((value, index) => {
+				if (value === columnValue || Number(value) === Number(columnValue)) {
+					rowIndexes.push(index);
+				}
+			});
+		} else {
+			const rowIndex = matchValuesMap.findIndex(
+				(value) => value === columnValue || Number(value) === Number(columnValue),
+			);
+
+			if (rowIndex !== -1) rowIndexes.push(rowIndex);
+		}
+
+		if (!rowIndexes.length) {
+			appendData.push(json);
+			continue;
+		}
+
+		const updatedRow: Array<string | null> = [];
+
+		for (const columnName of columns as string[]) {
+			const updateValue = json[columnName] === undefined ? null : (json[columnName] as string);
+			updatedRow.push(updateValue);
+		}
+
+		for (const rowIndex of rowIndexes) {
+			values[rowIndex] = updatedRow as string[];
+			//add rows index and shift by 1 to account for header row
+			updatedRowsIndexes.add(rowIndex + 1);
+		}
+	}
+
+	const updatedData = [columns, ...values];
+	const updatedRows = [0, ...Array.from(updatedRowsIndexes)];
+
+	const summary: UpdateSummary = { updatedData, appendData, updatedRows };
+
+	return summary;
+}
+
+export const checkRange = (node: INode, range: string) => {
+	const rangeRegex = /^[A-Z]+:[A-Z]+$/i;
+
+	if (rangeRegex.test(range)) {
+		throw new NodeOperationError(
+			node,
+			`Specify the range more precisely e.g. A1:B5, generic ranges like ${range} are not supported`,
+		);
+	}
+};
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/methods/index.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/methods/index.ts
new file mode 100644
index 0000000000000..a5508a3e0fa86
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/methods/index.ts
@@ -0,0 +1,2 @@
+export * as loadOptions from './loadOptions';
+export * as listSearch from './listSearch';
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/methods/listSearch.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/methods/listSearch.ts
new file mode 100644
index 0000000000000..fa30a1ead54f9
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/methods/listSearch.ts
@@ -0,0 +1,154 @@
+import type {
+	IDataObject,
+	ILoadOptionsFunctions,
+	INodeListSearchItems,
+	INodeListSearchResult,
+} from 'n8n-workflow';
+import { microsoftApiRequest } from '../transport';
+
+export async function searchWorkbooks(
+	this: ILoadOptionsFunctions,
+	filter?: string,
+	paginationToken?: string,
+): Promise<INodeListSearchResult> {
+	const fileExtensions = ['.xlsx', '.xlsm', '.xlst'];
+	const extensionFilter = fileExtensions.join(' OR ');
+
+	const q = filter || extensionFilter;
+
+	let response: IDataObject = {};
+
+	if (paginationToken) {
+		response = await microsoftApiRequest.call(
+			this,
+			'GET',
+			'',
+			undefined,
+			undefined,
+			paginationToken, // paginationToken contains the full URL
+		);
+	} else {
+		response = await microsoftApiRequest.call(
+			this,
+			'GET',
+			`/drive/root/search(q='${q}')`,
+			undefined,
+			{
+				select: 'id,name,webUrl',
+				$top: 100,
+			},
+		);
+	}
+
+	if (response.value && filter) {
+		response.value = (response.value as IDataObject[]).filter((workbook: IDataObject) => {
+			return fileExtensions.some((extension) => (workbook.name as string).includes(extension));
+		});
+	}
+
+	return {
+		results: (response.value as IDataObject[]).map((workbook: IDataObject) => {
+			for (const extension of fileExtensions) {
+				if ((workbook.name as string).includes(extension)) {
+					workbook.name = (workbook.name as string).replace(extension, '');
+					break;
+				}
+			}
+			return {
+				name: workbook.name as string,
+				value: workbook.id as string,
+				url: workbook.webUrl as string,
+			};
+		}),
+		paginationToken: response['@odata.nextLink'],
+	};
+}
+
+export async function getWorksheetsList(
+	this: ILoadOptionsFunctions,
+): Promise<INodeListSearchResult> {
+	const workbookRLC = this.getNodeParameter('workbook') as IDataObject;
+	const workbookId = workbookRLC.value as string;
+	let workbookURL = (workbookRLC.cachedResultUrl as string) ?? '';
+
+	if (workbookURL.includes('1drv.ms')) {
+		workbookURL = `https://onedrive.live.com/edit.aspx?resid=${workbookId}`;
+	}
+
+	let response: IDataObject = {};
+
+	response = await microsoftApiRequest.call(
+		this,
+		'GET',
+		`/drive/items/${workbookId}/workbook/worksheets`,
+		undefined,
+		{
+			select: 'id,name',
+		},
+	);
+
+	return {
+		results: (response.value as IDataObject[]).map((worksheet: IDataObject) => ({
+			name: worksheet.name as string,
+			value: worksheet.id as string,
+			url: workbookURL
+				? `${workbookURL}&activeCell=${encodeURIComponent(worksheet.name as string)}!A1`
+				: undefined,
+		})),
+	};
+}
+
+export async function getWorksheetTables(
+	this: ILoadOptionsFunctions,
+): Promise<INodeListSearchResult> {
+	const workbookRLC = this.getNodeParameter('workbook') as IDataObject;
+	const workbookId = workbookRLC.value as string;
+	let workbookURL = (workbookRLC.cachedResultUrl as string) ?? '';
+
+	if (workbookURL.includes('1drv.ms')) {
+		workbookURL = `https://onedrive.live.com/edit.aspx?resid=${workbookId}`;
+	}
+
+	const worksheetId = this.getNodeParameter('worksheet', undefined, {
+		extractValue: true,
+	}) as string;
+
+	let response: IDataObject = {};
+
+	response = await microsoftApiRequest.call(
+		this,
+		'GET',
+		`/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/tables`,
+		undefined,
+	);
+
+	const results: INodeListSearchItems[] = [];
+
+	for (const table of response.value as IDataObject[]) {
+		const name = table.name as string;
+		const value = table.id as string;
+
+		const { address } = await microsoftApiRequest.call(
+			this,
+			'GET',
+			`/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/tables/${value}/range`,
+			undefined,
+			{
+				select: 'address',
+			},
+		);
+
+		const [sheetName, sheetRange] = address.split('!' as string);
+
+		let url;
+		if (workbookURL) {
+			url = `${workbookURL}&activeCell=${encodeURIComponent(sheetName as string)}${
+				sheetRange ? '!' + (sheetRange as string) : ''
+			}`;
+		}
+
+		results.push({ name, value, url });
+	}
+
+	return { results };
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/methods/loadOptions.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/methods/loadOptions.ts
new file mode 100644
index 0000000000000..576f02c8c293c
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/methods/loadOptions.ts
@@ -0,0 +1,89 @@
+import type { IDataObject, ILoadOptionsFunctions, INodePropertyOptions } from 'n8n-workflow';
+import { microsoftApiRequest } from '../transport';
+
+export async function getWorksheetColumnRow(
+	this: ILoadOptionsFunctions,
+): Promise<INodePropertyOptions[]> {
+	const workbookId = this.getNodeParameter('workbook', undefined, {
+		extractValue: true,
+	}) as string;
+
+	const worksheetId = this.getNodeParameter('worksheet', undefined, {
+		extractValue: true,
+	}) as string;
+
+	let range = this.getNodeParameter('range', '') as string;
+	let columns: string[] = [];
+
+	if (range === '') {
+		const worksheetData = await microsoftApiRequest.call(
+			this,
+			'GET',
+			`/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/usedRange`,
+			undefined,
+			{ select: 'values' },
+		);
+
+		columns = worksheetData.values[0] as string[];
+	} else {
+		const [rangeFrom, rangeTo] = range.split(':');
+		const cellDataFrom = rangeFrom.match(/([a-zA-Z]{1,10})([0-9]{0,10})/) || [];
+		const cellDataTo = rangeTo.match(/([a-zA-Z]{1,10})([0-9]{0,10})/) || [];
+
+		range = `${rangeFrom}:${cellDataTo[1]}${cellDataFrom[2]}`;
+
+		const worksheetData = await microsoftApiRequest.call(
+			this,
+			'PATCH',
+			`/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/range(address='${range}')`,
+			{ select: 'values' },
+		);
+
+		columns = worksheetData.values[0] as string[];
+	}
+
+	const returnData: INodePropertyOptions[] = [];
+	for (const column of columns) {
+		returnData.push({
+			name: column,
+			value: column,
+		});
+	}
+	return returnData;
+}
+
+export async function getWorksheetColumnRowSkipColumnToMatchOn(
+	this: ILoadOptionsFunctions,
+): Promise<INodePropertyOptions[]> {
+	const returnData = await getWorksheetColumnRow.call(this);
+	const columnToMatchOn = this.getNodeParameter('columnToMatchOn', 0) as string;
+	return returnData.filter((column) => column.value !== columnToMatchOn);
+}
+
+export async function getTableColumns(
+	this: ILoadOptionsFunctions,
+): Promise<INodePropertyOptions[]> {
+	const workbookId = this.getNodeParameter('workbook', undefined, {
+		extractValue: true,
+	}) as string;
+
+	const worksheetId = this.getNodeParameter('worksheet', undefined, {
+		extractValue: true,
+	}) as string;
+
+	const tableId = this.getNodeParameter('table', undefined, {
+		extractValue: true,
+	}) as string;
+
+	const response = await microsoftApiRequest.call(
+		this,
+		'GET',
+		`/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/tables/${tableId}/columns`,
+		{},
+	);
+
+	return (response.value as IDataObject[]).map((column) => ({
+		name: column.name as string,
+		value: column.name as string,
+	}));
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/transport/index.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/transport/index.ts
new file mode 100644
index 0000000000000..61d0c4b1c4ac4
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/transport/index.ts
@@ -0,0 +1,87 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	IHttpRequestMethods,
+	ILoadOptionsFunctions,
+	IRequestOptions,
+	JsonObject,
+} from 'n8n-workflow';
+import { NodeApiError } from 'n8n-workflow';
+
+export async function microsoftApiRequest(
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
+	resource: string,
+	body: any = {},
+	qs: IDataObject = {},
+	uri?: string,
+	headers: IDataObject = {},
+): Promise<any> {
+	const options: IRequestOptions = {
+		headers: {
+			'Content-Type': 'application/json',
+		},
+		method,
+		body,
+		qs,
+		uri: uri || `https://graph.microsoft.com/v1.0/me${resource}`,
+		json: true,
+	};
+	try {
+		if (Object.keys(headers).length !== 0) {
+			options.headers = Object.assign({}, options.headers, headers);
+		}
+		return await this.helpers.requestOAuth2.call(this, 'microsoftExcelOAuth2Api', options);
+	} catch (error) {
+		throw new NodeApiError(this.getNode(), error as JsonObject);
+	}
+}
+
+export async function microsoftApiRequestAllItems(
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	propertyName: string,
+	method: IHttpRequestMethods,
+	endpoint: string,
+	body: any = {},
+	query: IDataObject = {},
+): Promise<any> {
+	const returnData: IDataObject[] = [];
+
+	let responseData;
+	let uri: string | undefined;
+	query.$top = 100;
+
+	do {
+		responseData = await microsoftApiRequest.call(this, method, endpoint, body, query, uri);
+		uri = responseData['@odata.nextLink'];
+		if (uri?.includes('$top')) {
+			delete query.$top;
+		}
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
+	} while (responseData['@odata.nextLink'] !== undefined);
+
+	return returnData;
+}
+
+export async function microsoftApiRequestAllItemsSkip(
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	propertyName: string,
+	method: IHttpRequestMethods,
+	endpoint: string,
+	body: any = {},
+	query: IDataObject = {},
+): Promise<any> {
+	const returnData: IDataObject[] = [];
+
+	let responseData;
+	query.$top = 100;
+	query.$skip = 0;
+
+	do {
+		responseData = await microsoftApiRequest.call(this, method, endpoint, body, query);
+		query.$skip += query.$top;
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
+	} while (responseData.value.length !== 0);
+
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/Microsoft/GraphSecurity/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/GraphSecurity/GenericFunctions.ts
index fd6b94a8668ac..dbc1c40661f6b 100644
--- a/packages/nodes-base/nodes/Microsoft/GraphSecurity/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Microsoft/GraphSecurity/GenericFunctions.ts
@@ -1,11 +1,15 @@
-import type { IExecuteFunctions, IDataObject, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IDataObject,
+	JsonObject,
+	IRequestOptions,
+	IHttpRequestMethods,
+} from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
-import type { OptionsWithUri } from 'request';
-
 export async function msGraphSecurityApiRequest(
 	this: IExecuteFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject = {},
 	qs: IDataObject = {},
@@ -19,7 +23,7 @@ export async function msGraphSecurityApiRequest(
 		};
 	};
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			Authorization: `Bearer ${access_token}`,
 		},
diff --git a/packages/nodes-base/nodes/Microsoft/GraphSecurity/microsoftGraph.svg b/packages/nodes-base/nodes/Microsoft/GraphSecurity/microsoftGraph.svg
index a490f454d3930..76837d5539b93 100644
--- a/packages/nodes-base/nodes/Microsoft/GraphSecurity/microsoftGraph.svg
+++ b/packages/nodes-base/nodes/Microsoft/GraphSecurity/microsoftGraph.svg
@@ -1,45 +1 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 374.85 330">
-  <defs>
-    <style>
-      .cls-1 {
-        fill: #0078d4;
-      }
-
-      .cls-2 {
-        fill: #28a8ea;
-      }
-
-      .cls-3 {
-        fill: #14447d;
-      }
-
-      .cls-4 {
-        fill: #50d9ff;
-      }
-
-      .cls-5 {
-        fill: #0364b8;
-      }
-
-      .cls-6 {
-        fill: #0f335e;
-      }
-    </style>
-  </defs>
-  <g>
-    <path class="cls-1" d="M1043.7,375H876.3A20,20,0,0,0,859,385L775.26,530a20,20,0,0,0,0,20L859,695a20,20,0,0,0,17.35,10h167.4a20,20,0,0,0,17.35-10l83.69-145a20,20,0,0,0,0-20l-83.69-145A20,20,0,0,0,1043.7,375Z" transform="translate(-772.57 -375)"/>
-    <g>
-      <path class="cls-2" d="M1144.74,530,1061,385a19.87,19.87,0,0,0-6-6.5l6.77,161.17,85.63.27A20,20,0,0,0,1144.74,530Z" transform="translate(-772.57 -375)"/>
-      <path class="cls-3" d="M775.26,550,859,695a20.09,20.09,0,0,0,5.43,6.08l36.39-58.56L774.15,547.78A20.26,20.26,0,0,0,775.26,550Z" transform="translate(-772.57 -375)"/>
-      <path class="cls-1" d="M859,385,775.26,530a19.18,19.18,0,0,0-1.46,3.12l120.66-95.83-30.35-58.13A19.89,19.89,0,0,0,859,385Z" transform="translate(-772.57 -375)"/>
-      <path class="cls-2" d="M1043.7,375H876.3a20,20,0,0,0-12.19,4.14l30.35,58.13,153.91-61.71A20.16,20.16,0,0,0,1043.7,375Z" transform="translate(-772.57 -375)"/>
-      <polygon class="cls-2" points="128.19 267.5 289.22 164.69 121.89 62.27 128.19 267.5"/>
-      <path class="cls-4" d="M1048.37,375.56,894.46,437.27l167.33,102.42L1055,378.52A20,20,0,0,0,1048.37,375.56Z" transform="translate(-772.57 -375)"/>
-      <path class="cls-5" d="M773.8,533.1a20.07,20.07,0,0,0,.35,14.68L900.77,642.5l-6.31-205.23Z" transform="translate(-772.57 -375)"/>
-      <polygon class="cls-1" points="128.19 267.5 128.19 267.5 128.19 267.5 128.19 267.5"/>
-      <path class="cls-6" d="M864.38,701.06A20.07,20.07,0,0,0,876.3,705h167.4a20,20,0,0,0,3.8-.38L900.77,642.5Z" transform="translate(-772.57 -375)"/>
-      <path class="cls-5" d="M900.77,642.5l146.73,62.12a20,20,0,0,0,7.54-3.15l6.75-161.78Z" transform="translate(-772.57 -375)"/>
-      <path class="cls-1" d="M1061.79,539.69,1055,701.47a19.88,19.88,0,0,0,6-6.49l83.7-145a20,20,0,0,0,2.68-10.06Z" transform="translate(-772.57 -375)"/>
-    </g>
-  </g>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" data-name="Layer 1" viewBox="0 0 374.85 330"><defs><style>.cls-1{fill:#0078d4}.cls-2{fill:#28a8ea}.cls-5{fill:#0364b8}</style></defs><path d="M271.13 0h-167.4a20 20 0 0 0-17.3 10L2.69 155a20 20 0 0 0 0 20l83.74 145a20 20 0 0 0 17.35 10h167.4a20 20 0 0 0 17.35-10l83.69-145a20 20 0 0 0 0-20L288.53 10a20 20 0 0 0-17.4-10" class="cls-1"/><path d="M372.17 155 288.43 10a19.9 19.9 0 0 0-6-6.5l6.77 161.17 85.63.27a20 20 0 0 0-2.66-9.94" class="cls-2"/><path d="M775.26 550 859 695a20.1 20.1 0 0 0 5.43 6.08l36.39-58.56-126.67-94.74a20 20 0 0 0 1.11 2.22" style="fill:#14447d" transform="translate(-772.57 -375)"/><path d="M86.43 10 2.69 155a19 19 0 0 0-1.46 3.12l120.66-95.83L91.54 4.16A19.9 19.9 0 0 0 86.43 10" class="cls-1"/><path d="M271.13 0h-167.4a20 20 0 0 0-12.19 4.14l30.35 58.13L275.8.56a20.2 20.2 0 0 0-4.67-.56M128.19 267.5l161.03-102.81L121.89 62.27z" class="cls-2"/><path d="m1048.37 375.56-153.91 61.71 167.33 102.42-6.79-161.17a20 20 0 0 0-6.63-2.96" style="fill:#50d9ff" transform="translate(-772.57 -375)"/><path d="M1.23 158.1a20.07 20.07 0 0 0 .35 14.68L128.2 267.5l-6.31-205.23Z" class="cls-5"/><path d="M864.38 701.06A20.07 20.07 0 0 0 876.3 705h167.4a20 20 0 0 0 3.8-.38L900.77 642.5Z" style="fill:#0f335e" transform="translate(-772.57 -375)"/><path d="m128.2 267.5 146.73 62.12a20 20 0 0 0 7.54-3.15l6.75-161.78Z" class="cls-5"/><path d="m289.22 164.69-6.79 161.78a19.9 19.9 0 0 0 6-6.49l83.7-145a20 20 0 0 0 2.68-10.06Z" class="cls-1"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Microsoft/OneDrive/FileDescription.ts b/packages/nodes-base/nodes/Microsoft/OneDrive/FileDescription.ts
index 93b1dbcefd6e7..80e6a71bc5a12 100644
--- a/packages/nodes-base/nodes/Microsoft/OneDrive/FileDescription.ts
+++ b/packages/nodes-base/nodes/Microsoft/OneDrive/FileDescription.ts
@@ -209,7 +209,7 @@ export const fileFields: INodeProperties[] = [
 		default: '',
 	},
 	{
-		displayName: 'Binary Property',
+		displayName: 'Put Output File in Field',
 		name: 'binaryPropertyName',
 		type: 'string',
 		required: true,
@@ -220,7 +220,7 @@ export const fileFields: INodeProperties[] = [
 				resource: ['file'],
 			},
 		},
-		description: 'Name of the binary property to which to write the data of the read file',
+		hint: 'The name of the output binary field to put the file in',
 	},
 	/* -------------------------------------------------------------------------- */
 	/*                                 file:get                                   */
@@ -380,7 +380,7 @@ export const fileFields: INodeProperties[] = [
 		description: 'ID of the parent folder that will contain the file',
 	},
 	{
-		displayName: 'Binary Data',
+		displayName: 'Binary File',
 		name: 'binaryData',
 		type: 'boolean',
 		default: false,
@@ -410,7 +410,7 @@ export const fileFields: INodeProperties[] = [
 		description: 'The text content of the file',
 	},
 	{
-		displayName: 'Binary Property',
+		displayName: 'Input Binary Field',
 		name: 'binaryPropertyName',
 		type: 'string',
 		default: 'data',
@@ -423,6 +423,6 @@ export const fileFields: INodeProperties[] = [
 			},
 		},
 		placeholder: '',
-		description: 'Name of the binary property which contains the data for the file',
+		hint: 'The name of the input binary field containing the file to be written',
 	},
 ];
diff --git a/packages/nodes-base/nodes/Microsoft/OneDrive/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/OneDrive/GenericFunctions.ts
index 881cde156fea5..b709cb0e685fc 100644
--- a/packages/nodes-base/nodes/Microsoft/OneDrive/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Microsoft/OneDrive/GenericFunctions.ts
@@ -1,17 +1,18 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	ILoadOptionsFunctions,
 	IDataObject,
 	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
+	IPollFunctions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
+import { DateTime } from 'luxon';
 
 export async function microsoftApiRequest(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -20,7 +21,7 @@ export async function microsoftApiRequest(
 	headers: IDataObject = {},
 	option: IDataObject = { json: true },
 ): Promise<any> {
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			'Content-Type': 'application/json',
 		},
@@ -48,9 +49,9 @@ export async function microsoftApiRequest(
 }
 
 export async function microsoftApiRequestAllItems(
-	this: IExecuteFunctions | ILoadOptionsFunctions,
+	this: IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: any = {},
@@ -75,9 +76,9 @@ export async function microsoftApiRequestAllItems(
 }
 
 export async function microsoftApiRequestAllItemsSkip(
-	this: IExecuteFunctions | ILoadOptionsFunctions,
+	this: IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: any = {},
@@ -97,3 +98,77 @@ export async function microsoftApiRequestAllItemsSkip(
 
 	return returnData;
 }
+
+export async function microsoftApiRequestAllItemsDelta(
+	this: IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions,
+	link: string,
+	lastDate: DateTime,
+	eventType: string,
+): Promise<any> {
+	const returnData: IDataObject[] = [];
+
+	let responseData;
+	let deltaLink: string = '';
+	let uri: string = link;
+
+	do {
+		responseData = (await microsoftApiRequest.call(this, 'GET', '', {}, {}, uri)) as IDataObject;
+		uri = responseData['@odata.nextLink'] as string;
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+		for (const value of responseData.value as IDataObject[]) {
+			if (value.fileSystemInfo as IDataObject) {
+				const updatedTimeStamp = (value.fileSystemInfo as IDataObject)
+					?.lastModifiedDateTime as string;
+				const createdTimeStamp = (value.fileSystemInfo as IDataObject)?.createdDateTime as string;
+				if (eventType === 'created') {
+					if (DateTime.fromISO(createdTimeStamp) >= lastDate) {
+						returnData.push(value);
+					}
+				}
+				if (eventType === 'updated') {
+					if (
+						DateTime.fromISO(updatedTimeStamp) >= lastDate &&
+						DateTime.fromISO(createdTimeStamp) < lastDate
+					) {
+						returnData.push(value);
+					}
+				}
+			}
+		}
+		//returnData.push.apply(returnData, responseData.value as IDataObject[]);
+		deltaLink = (responseData['@odata.deltaLink'] as string) || '';
+	} while (responseData['@odata.nextLink'] !== undefined);
+
+	return { deltaLink, returnData };
+}
+
+export async function getPath(
+	this: IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions,
+	itemId: string,
+): Promise<string> {
+	const responseData = (await microsoftApiRequest.call(
+		this,
+		'GET',
+		'',
+		{},
+		{},
+		`https://graph.microsoft.com/v1.0/me/drive/items/${itemId}`,
+	)) as IDataObject;
+	if (responseData.folder) {
+		return (responseData?.parentReference as IDataObject)?.path + `/${responseData?.name}`;
+	} else {
+		const workflow = this.getWorkflow();
+		const node = this.getNode();
+		this.logger.error(
+			`There was a problem in '${node.name}' node in workflow '${workflow.id}': 'Item to watch is not a folder'`,
+			{
+				node: node.name,
+				workflowId: workflow.id,
+				error: 'Item to watch is not a folder',
+			},
+		);
+		throw new NodeApiError(this.getNode(), {
+			error: 'Item to watch is not a folder',
+		} 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 0b17f7a25ed6b..82aefdce3f53d 100644
--- a/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.ts
@@ -348,9 +348,9 @@ export class MicrosoftOneDrive implements INodeType {
 		}
 		if (resource === 'file' && operation === 'download') {
 			// For file downloads the files get attached to the existing items
-			return this.prepareOutputData(items);
+			return [items];
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDriveTrigger.node.json b/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDriveTrigger.node.json
new file mode 100644
index 0000000000000..90b99c598f981
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDriveTrigger.node.json
@@ -0,0 +1,25 @@
+{
+	"node": "n8n-nodes-base.microsoftOneDriveTrigger",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"categories": ["Data & Storage"],
+	"resources": {
+		"credentialDocumentation": [
+			{
+				"url": "https://docs.n8n.io/credentials/microsoft"
+			}
+		],
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.microsoftonedrivetrigger/"
+			}
+		],
+		"generic": [
+			{
+				"label": "Hey founders! Your business doesn't need you to operate",
+				"icon": " 🖥️",
+				"url": "https://n8n.io/blog/your-business-doesnt-need-you-to-operate/"
+			}
+		]
+	}
+}
diff --git a/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDriveTrigger.node.ts b/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDriveTrigger.node.ts
new file mode 100644
index 0000000000000..111b7b5146760
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDriveTrigger.node.ts
@@ -0,0 +1,173 @@
+import type {
+	IPollFunctions,
+	IDataObject,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+
+import { DateTime } from 'luxon';
+import { triggerDescription } from './TriggerDescription';
+import { getPath, microsoftApiRequest, microsoftApiRequestAllItemsDelta } from './GenericFunctions';
+
+export class MicrosoftOneDriveTrigger implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Microsoft OneDrive Trigger',
+		name: 'microsoftOneDriveTrigger',
+		icon: 'file:oneDrive.svg',
+		group: ['trigger'],
+		version: 1,
+		description: 'Trigger for Microsoft OneDrive API.',
+		subtitle: '={{($parameter["event"])}}',
+		defaults: {
+			name: 'Microsoft OneDrive Trigger',
+		},
+		credentials: [
+			{
+				name: 'microsoftOneDriveOAuth2Api',
+				required: true,
+			},
+		],
+		polling: true,
+		inputs: [],
+		outputs: ['main'],
+		properties: [...triggerDescription],
+	};
+
+	methods = {
+		loadOptions: {},
+	};
+
+	async poll(this: IPollFunctions): Promise<INodeExecutionData[][] | null> {
+		const workflowData = this.getWorkflowStaticData('node');
+		let responseData: IDataObject[];
+
+		const lastLink: string =
+			(workflowData.LastLink as string) ||
+			'https://graph.microsoft.com/v1.0/me/drive/root/delta?token=latest';
+
+		const now = DateTime.now().toUTC();
+		const start = DateTime.fromISO(workflowData.lastTimeChecked as string) || now;
+		const end = now;
+		const event = this.getNodeParameter('event', 'fileCreated') as string;
+		const watch = this.getNodeParameter('watch', 'anyFile') as string;
+		const watchFolder = (this.getNodeParameter('watchFolder', false) as boolean) || false;
+		const folderChild = (this.getNodeParameter('options.folderChild', false) as boolean) || false;
+
+		let eventType = 'created';
+		let eventResource = 'file';
+		if (event.includes('Updated')) {
+			eventType = 'updated';
+		}
+		if (event.includes('folder')) {
+			eventResource = 'folder';
+		}
+		try {
+			if (this.getMode() === 'manual') {
+				responseData = (
+					await microsoftApiRequest.call(
+						this,
+						'GET',
+						'',
+						{},
+						{},
+						'https://graph.microsoft.com/v1.0/me/drive/root/delta',
+					)
+				).value as IDataObject[];
+			} else {
+				const response: IDataObject = (await microsoftApiRequestAllItemsDelta.call(
+					this,
+					lastLink,
+					start,
+					eventType,
+				)) as IDataObject;
+				responseData = response.returnData as IDataObject[];
+				workflowData.LastLink = response.deltaLink;
+			}
+
+			workflowData.lastTimeChecked = end.toISO();
+			if (watch === 'selectedFile') {
+				const fileId = (
+					this.getNodeParameter('fileId', '', {
+						extractValue: true,
+					}) as string
+				).replace('%21', '!');
+				if (fileId) {
+					responseData = responseData.filter((item: IDataObject) => item.id === fileId);
+				}
+			}
+
+			if (
+				!folderChild &&
+				(watch === 'oneSelectedFolder' || watch === 'selectedFolder' || watchFolder)
+			) {
+				const folderId = (
+					this.getNodeParameter('folderId', '', {
+						extractValue: true,
+					}) as string
+				).replace('%21', '!');
+				if (folderId) {
+					if (watch === 'oneSelectedFolder') {
+						responseData = responseData.filter((item: IDataObject) => item.id === folderId);
+					} else {
+						responseData = responseData.filter(
+							(item: IDataObject) => (item.parentReference as IDataObject).id === folderId,
+						);
+					}
+				}
+			}
+			if (folderChild && (watch === 'selectedFolder' || watchFolder)) {
+				const folderId = (
+					this.getNodeParameter('folderId', '', {
+						extractValue: true,
+					}) as string
+				).replace('%21', '!');
+				const folderPath = await getPath.call(this, folderId);
+				responseData = responseData.filter((item: IDataObject) =>
+					((item.parentReference as IDataObject).path as string).startsWith(folderPath),
+				);
+			}
+			responseData = responseData.filter((item: IDataObject) => item[eventResource]);
+			if (!responseData?.length) {
+				return null;
+			}
+
+			const simplify = this.getNodeParameter('simple') as boolean;
+			if (simplify) {
+				responseData = responseData.map((x) => ({
+					id: x.id,
+					createdDateTime: (x.fileSystemInfo as IDataObject)?.createdDateTime,
+					lastModifiedDateTime: (x.fileSystemInfo as IDataObject)?.lastModifiedDateTime,
+					name: x.name,
+					webUrl: x.webUrl,
+					size: x.size,
+					path: (x.parentReference as IDataObject)?.path || '',
+					mimeType: (x.file as IDataObject)?.mimeType || '',
+				}));
+			}
+
+			if (this.getMode() === 'manual') {
+				return [this.helpers.returnJsonArray(responseData[0])];
+			} else {
+				return [this.helpers.returnJsonArray(responseData)];
+			}
+		} catch (error) {
+			if (this.getMode() === 'manual' || !workflowData.lastTimeChecked) {
+				throw error;
+			}
+			const workflow = this.getWorkflow();
+			const node = this.getNode();
+			this.logger.error(
+				`There was a problem in '${node.name}' node in workflow '${workflow.id}': '${error.description}'`,
+				{
+					node: node.name,
+					workflowId: workflow.id,
+					error,
+				},
+			);
+			throw error;
+		}
+
+		return null;
+	}
+}
diff --git a/packages/nodes-base/nodes/Microsoft/OneDrive/TriggerDescription.ts b/packages/nodes-base/nodes/Microsoft/OneDrive/TriggerDescription.ts
new file mode 100644
index 0000000000000..0a1a713b3dc81
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/OneDrive/TriggerDescription.ts
@@ -0,0 +1,288 @@
+import type { INodeProperties } from 'n8n-workflow';
+import { MICROSOFT_DRIVE_FILE_URL_REGEX, MICROSOFT_DRIVE_FOLDER_URL_REGEX } from './constants';
+
+export const fileRLC: INodeProperties = {
+	displayName: 'File',
+	name: 'fileId',
+	type: 'resourceLocator',
+	default: { mode: 'id', value: '' },
+	required: true,
+	modes: [
+		{
+			displayName: 'Link',
+			name: 'url',
+			type: 'string',
+			placeholder:
+				'e.g. https://onedrive.live.com/edit.aspx?resid=170B5C65E30736A3!257&cid=170b5c65e30736a3&CT=1708697995542&OR=ItemsView',
+			extractValue: {
+				type: 'regex',
+				regex: MICROSOFT_DRIVE_FILE_URL_REGEX,
+			},
+			validation: [
+				{
+					type: 'regex',
+					properties: {
+						regex: MICROSOFT_DRIVE_FILE_URL_REGEX,
+						errorMessage: 'Not a valid Microsoft Drive File URL',
+					},
+				},
+			],
+		},
+		{
+			displayName: 'ID',
+			name: 'id',
+			type: 'string',
+			placeholder: 'e.g. 170B5C65E30736A3!257',
+			validation: [
+				{
+					type: 'regex',
+					properties: {
+						regex: '[a-zA-Z0-9\\!%21]{5,}',
+						errorMessage: 'Not a valid Microsoft Drive File ID',
+					},
+				},
+			],
+			url: '=https://onedrive.live.com/?id={{$value}}',
+		},
+	],
+	description:
+		"The file to operate on. The 'By URL' option only accepts URLs that start with 'https://onedrive.live.com'.",
+};
+
+export const folderRLC: INodeProperties = {
+	displayName: 'Folder',
+	name: 'folderId',
+	type: 'resourceLocator',
+	default: { mode: 'id', value: '', cachedResultName: '' },
+	required: true,
+	modes: [
+		{
+			displayName: 'Link',
+			name: 'url',
+			type: 'string',
+			placeholder: 'e.g. https://onedrive.live.com/?id=170B5C65E30736A3%21103&cid=170B5C65E30736A3',
+			extractValue: {
+				type: 'regex',
+				regex: MICROSOFT_DRIVE_FOLDER_URL_REGEX,
+			},
+			validation: [
+				{
+					type: 'regex',
+					properties: {
+						regex: MICROSOFT_DRIVE_FOLDER_URL_REGEX,
+						errorMessage: 'Not a valid Microsoft Drive Folder URL',
+					},
+				},
+			],
+		},
+		{
+			displayName: 'ID',
+			name: 'id',
+			type: 'string',
+			placeholder: 'e.g. 170B5C65E30736A3%21136',
+			validation: [
+				{
+					type: 'regex',
+					properties: {
+						regex: '[a-zA-Z0-9\\!%21]{5,}',
+						errorMessage: 'Not a valid Microsoft Drive Folder ID',
+					},
+				},
+			],
+			url: '=https://onedrive.live.com/?id={{$value}}',
+		},
+	],
+	description:
+		"The folder to operate on. The 'By URL' option only accepts URLs that start with 'https://onedrive.live.com'.",
+};
+
+export const triggerDescription: INodeProperties[] = [
+	{
+		displayName: 'Trigger On',
+		name: 'event',
+		type: 'options',
+		default: 'fileCreated',
+		options: [
+			{
+				name: 'File Created',
+				value: 'fileCreated',
+				description: 'When a new file is created',
+			},
+			{
+				name: 'File Updated',
+				value: 'fileUpdated',
+				description: 'When an existing file is modified',
+			},
+			{
+				name: 'Folder Created',
+				value: 'folderCreated',
+				description: 'When a new folder is created',
+			},
+			{
+				name: 'Folder Updated',
+				value: 'folderUpdated',
+				description: 'When an existing folder is modified',
+			},
+		],
+	},
+	{
+		displayName: 'Simplify',
+		name: 'simple',
+		description: 'Whether to return a simplified version of the response instead of the raw data',
+		type: 'boolean',
+		default: true,
+	},
+	{
+		displayName: 'Watch Folder',
+		name: 'watchFolder',
+		description:
+			'Whether to watch for the created file in a given folder, rather than the entire OneDrive',
+		type: 'boolean',
+		default: false,
+		displayOptions: {
+			show: {
+				event: ['fileCreated'],
+			},
+		},
+	},
+	{
+		displayName: 'Watch',
+		name: 'watch',
+		description: 'How to select which file to watch',
+		type: 'options',
+		default: 'anyFile',
+		displayOptions: {
+			show: {
+				event: ['fileUpdated'],
+			},
+		},
+		options: [
+			{
+				name: 'Any File',
+				value: 'anyFile',
+				description: 'Watch for updated files in the entire OneDrive',
+			},
+			{
+				name: 'Inside a Folder',
+				value: 'selectedFolder',
+				description: 'Watch for updated files inside a selected folder',
+			},
+			{
+				name: 'A Selected File',
+				value: 'selectedFile',
+				description: 'Watch a specific file for updates',
+			},
+		],
+	},
+	{
+		displayName: 'Watch Folder',
+		name: 'watchFolder',
+		description:
+			'Whether to watch for the created folder in a given folder, rather than the entire OneDrive',
+		type: 'boolean',
+		default: false,
+		displayOptions: {
+			show: {
+				event: ['folderCreated'],
+			},
+		},
+	},
+	{
+		displayName: 'Watch',
+		name: 'watch',
+		description: 'How to select which folder to watch',
+		type: 'options',
+		default: 'anyFolder',
+		displayOptions: {
+			show: {
+				event: ['folderUpdated'],
+			},
+		},
+		options: [
+			{
+				name: 'Any Folder',
+				value: 'anyFolder',
+				description: 'Watch for updated folders in the entire OneDrive',
+			},
+			{
+				name: 'Inside a Folder',
+				value: 'selectedFolder',
+				description: 'Watch for updated folders inside a selected folder',
+			},
+			{
+				name: 'A Selected Folder',
+				value: 'oneSelectedFolder',
+				description: 'Watch a specific folder for updates',
+			},
+		],
+	},
+	{
+		...fileRLC,
+		displayOptions: {
+			show: {
+				event: ['fileUpdated'],
+				watch: ['selectedFile'],
+			},
+		},
+	},
+	{
+		...folderRLC,
+		displayOptions: {
+			show: {
+				watch: ['selectedFolder', 'oneSelectedFolder'],
+			},
+		},
+	},
+	{
+		...folderRLC,
+		displayOptions: {
+			show: {
+				watchFolder: [true],
+			},
+		},
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		displayOptions: {
+			show: {
+				watch: ['selectedFolder'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Watch Nested Folders',
+				name: 'folderChild',
+				type: 'boolean',
+				default: false,
+				description:
+					'Whether to look for modified files/folders in all nested folders, rather than only direct descendants',
+			},
+		],
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		displayOptions: {
+			show: {
+				watchFolder: [true],
+			},
+		},
+		options: [
+			{
+				displayName: 'Watch Nested Folders',
+				name: 'folderChild',
+				type: 'boolean',
+				default: false,
+				description:
+					'Whether to look for modified files/folders in all nested folders, rather than only direct descendants',
+			},
+		],
+	},
+];
diff --git a/packages/nodes-base/nodes/Microsoft/OneDrive/constants.ts b/packages/nodes-base/nodes/Microsoft/OneDrive/constants.ts
new file mode 100644
index 0000000000000..ef620940b1679
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/OneDrive/constants.ts
@@ -0,0 +1,5 @@
+export const MICROSOFT_DRIVE_FILE_URL_REGEX =
+	'https:\\/\\/onedrive.live.com(?:\\/.*?(?:\\&|\\?)(?:id=|resid=))(.+?)(?:\\&.*)';
+
+export const MICROSOFT_DRIVE_FOLDER_URL_REGEX =
+	'https:\\/\\/onedrive.live.com(?:\\/.*id=)(.+)(?:\\&cid.*)';
diff --git a/packages/nodes-base/nodes/Microsoft/OneDrive/oneDrive.svg b/packages/nodes-base/nodes/Microsoft/OneDrive/oneDrive.svg
index 915d439ed2c9f..ac97d110a841c 100644
--- a/packages/nodes-base/nodes/Microsoft/OneDrive/oneDrive.svg
+++ b/packages/nodes-base/nodes/Microsoft/OneDrive/oneDrive.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 81 81" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><g stroke="none"><path d="M6.667 0Q0 0 0 6.667v66.667Q0 80 6.667 80h66.667Q80 80 80 73.333V6.667Q80 0 73.333 0z" fill="#094ab2"/><path d="M60.256 42.023c2.87.405 4.965 2.975 4.832 5.929 0 2.594-1.421 5.655-4.832 5.655H32.574c-5.306 0-7.232-3.706-7.232-7.524 0-6.444 6.979-6.621 6.979-6.621s.569-6.992 6.664-8.41c3.806-1.113 7.875.477 9.98 3.899a8.205 8.205 0 017.058-.258c2.812 1.257 4.518 4.212 4.232 7.33z"/><path d="M23.583 45.605c0-7.082 7.412-8.139 7.412-8.139.707-4.108 3.699-7.435 7.682-8.54 4.021-1.286 8.404.189 10.856 3.653a6.3 6.3 0 013.635-.737c-.513-4.177-3.247-7.736-7.126-9.277-5.141-2.153-11.058.026-13.618 5.015a8.403 8.403 0 00-8.126-.16c-3.181 1.763-5.002 5.282-4.619 8.924-3.675.323-6.438 3.523-6.254 7.242.114 3.817 3.139 6.892 6.92 7.034h4.65a9.084 9.084 0 01-1.413-5.015z" fill="#f9f9f9"/><path d="M.84 2.69l77.753 75.816A4.39 4.39 0 0080 75.279V4.398A4.392 4.392 0 0075.612 0H4.885A4.39 4.39 0 00.84 2.69z" fill-opacity=".19"/></g></symbol></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round" viewBox="0 0 81 81"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><g stroke="none"><path fill="#094ab2" d="M6.667 0Q0 0 0 6.667v66.667Q0 80 6.667 80h66.667Q80 80 80 73.333V6.667Q80 0 73.333 0z"/><path d="M60.256 42.023c2.87.405 4.965 2.975 4.832 5.929 0 2.594-1.421 5.655-4.832 5.655H32.574c-5.306 0-7.232-3.706-7.232-7.524 0-6.444 6.979-6.621 6.979-6.621s.569-6.992 6.664-8.41c3.806-1.113 7.875.477 9.98 3.899a8.2 8.2 0 0 1 7.058-.258c2.812 1.257 4.518 4.212 4.232 7.33z"/><path fill="#f9f9f9" d="M23.583 45.605c0-7.082 7.412-8.139 7.412-8.139.707-4.108 3.699-7.435 7.682-8.54 4.021-1.286 8.404.189 10.856 3.653a6.3 6.3 0 0 1 3.635-.737c-.513-4.177-3.247-7.736-7.126-9.277-5.141-2.153-11.058.026-13.618 5.015a8.4 8.4 0 0 0-8.126-.16c-3.181 1.763-5.002 5.282-4.619 8.924-3.675.323-6.438 3.523-6.254 7.242.114 3.817 3.139 6.892 6.92 7.034h4.65a9.1 9.1 0 0 1-1.413-5.015z"/><path fill-opacity=".19" d="m.84 2.69 77.753 75.816A4.4 4.4 0 0 0 80 75.279V4.398A4.39 4.39 0 0 0 75.612 0H4.885A4.39 4.39 0 0 0 .84 2.69"/></g></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/Outlook/GenericFunctions.ts
deleted file mode 100644
index 2f76822be1f38..0000000000000
--- a/packages/nodes-base/nodes/Microsoft/Outlook/GenericFunctions.ts
+++ /dev/null
@@ -1,245 +0,0 @@
-import type { OptionsWithUri } from 'request';
-
-import type {
-	IDataObject,
-	IExecuteFunctions,
-	IExecuteSingleFunctions,
-	ILoadOptionsFunctions,
-	INodeExecutionData,
-	JsonObject,
-} from 'n8n-workflow';
-import { BINARY_ENCODING, NodeApiError } from 'n8n-workflow';
-
-export async function microsoftApiRequest(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
-	resource: string,
-
-	body: any = {},
-	qs: IDataObject = {},
-	uri?: string,
-	headers: IDataObject = {},
-	option: IDataObject = { json: true },
-): Promise<any> {
-	const credentials = await this.getCredentials('microsoftOutlookOAuth2Api');
-
-	let apiUrl = `https://graph.microsoft.com/v1.0/me${resource}`;
-	// If accessing shared mailbox
-	if (credentials.useShared && credentials.userPrincipalName) {
-		apiUrl = `https://graph.microsoft.com/v1.0/users/${credentials.userPrincipalName}${resource}`;
-	}
-
-	const options: OptionsWithUri = {
-		headers: {
-			'Content-Type': 'application/json',
-		},
-		method,
-		body,
-		qs,
-		uri: uri || apiUrl,
-	};
-	try {
-		Object.assign(options, option);
-
-		if (Object.keys(headers).length !== 0) {
-			options.headers = Object.assign({}, options.headers, headers);
-		}
-
-		if (Object.keys(body as IDataObject).length === 0) {
-			delete options.body;
-		}
-
-		return await this.helpers.requestOAuth2.call(this, 'microsoftOutlookOAuth2Api', options);
-	} catch (error) {
-		throw new NodeApiError(this.getNode(), error as JsonObject);
-	}
-}
-
-export async function microsoftApiRequestAllItems(
-	this: IExecuteFunctions | ILoadOptionsFunctions,
-	propertyName: string,
-	method: string,
-	endpoint: string,
-
-	body: any = {},
-	query: IDataObject = {},
-	headers: IDataObject = {},
-): Promise<any> {
-	const returnData: IDataObject[] = [];
-
-	let responseData;
-	let uri: string | undefined;
-	query.$top = 100;
-
-	do {
-		responseData = await microsoftApiRequest.call(
-			this,
-			method,
-			endpoint,
-			body,
-			query,
-			uri,
-			headers,
-		);
-		uri = responseData['@odata.nextLink'];
-		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
-	} while (responseData['@odata.nextLink'] !== undefined);
-
-	return returnData;
-}
-
-export async function microsoftApiRequestAllItemsSkip(
-	this: IExecuteFunctions | ILoadOptionsFunctions,
-	propertyName: string,
-	method: string,
-	endpoint: string,
-
-	body: any = {},
-	query: IDataObject = {},
-	headers: IDataObject = {},
-): Promise<any> {
-	const returnData: IDataObject[] = [];
-
-	let responseData;
-	query.$top = 100;
-	query.$skip = 0;
-
-	do {
-		responseData = await microsoftApiRequest.call(
-			this,
-			method,
-			endpoint,
-			body,
-			query,
-			undefined,
-			headers,
-		);
-		query.$skip += query.$top;
-		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
-	} while (responseData.value.length !== 0);
-
-	return returnData;
-}
-
-export function makeRecipient(email: string) {
-	return {
-		emailAddress: {
-			address: email,
-		},
-	};
-}
-
-export function createMessage(fields: IDataObject) {
-	const message: IDataObject = {};
-
-	// Create body object
-	if (fields.bodyContent || fields.bodyContentType) {
-		const bodyObject = {
-			content: fields.bodyContent,
-			contentType: fields.bodyContentType,
-		};
-
-		message.body = bodyObject;
-		delete fields.bodyContent;
-		delete fields.bodyContentType;
-	}
-
-	// Handle custom headers
-	if (
-		'internetMessageHeaders' in fields &&
-		'headers' in (fields.internetMessageHeaders as IDataObject)
-	) {
-		fields.internetMessageHeaders = (fields.internetMessageHeaders as IDataObject).headers;
-	}
-
-	// Handle recipient fields
-	['bccRecipients', 'ccRecipients', 'replyTo', 'sender', 'toRecipients'].forEach((key) => {
-		if (Array.isArray(fields[key])) {
-			fields[key] = (fields[key] as string[]).map((email) => makeRecipient(email));
-		} else if (fields[key] !== undefined) {
-			fields[key] = (fields[key] as string)
-				.split(',')
-				.map((recipient: string) => makeRecipient(recipient));
-		}
-	});
-
-	['from', 'sender'].forEach((key) => {
-		if (fields[key] !== undefined) {
-			fields[key] = makeRecipient(fields[key] as string);
-		}
-	});
-
-	Object.assign(message, fields);
-
-	return message;
-}
-
-export async function downloadAttachments(
-	this: IExecuteFunctions,
-	messages: IDataObject[] | IDataObject,
-	prefix: string,
-) {
-	const elements: INodeExecutionData[] = [];
-	if (!Array.isArray(messages)) {
-		messages = [messages];
-	}
-	for (const message of messages) {
-		const element: INodeExecutionData = {
-			json: message,
-			binary: {},
-		};
-		if (message.hasAttachments === true) {
-			const attachments = await microsoftApiRequestAllItems.call(
-				this,
-				'value',
-				'GET',
-				`/messages/${message.id}/attachments`,
-				{},
-			);
-			for (const [index, attachment] of attachments.entries()) {
-				const response = await microsoftApiRequest.call(
-					this,
-					'GET',
-					`/messages/${message.id}/attachments/${attachment.id}/$value`,
-					undefined,
-					{},
-					undefined,
-					{},
-					{ encoding: null, resolveWithFullResponse: true },
-				);
-
-				const data = Buffer.from(response.body as string, 'utf8');
-				element.binary![`${prefix}${index}`] = await this.helpers.prepareBinaryData(
-					data as unknown as Buffer,
-					attachment.name as string,
-					attachment.contentType as string,
-				);
-			}
-		}
-		if (Object.keys(element.binary!).length === 0) {
-			delete element.binary;
-		}
-		elements.push(element);
-	}
-	return elements;
-}
-
-export async function binaryToAttachments(
-	this: IExecuteFunctions,
-	attachments: IDataObject[],
-	items: INodeExecutionData[],
-	i: number,
-) {
-	return Promise.all(
-		attachments.map(async (attachment) => {
-			const binaryPropertyName = attachment.binaryPropertyName as string;
-			const binaryData = this.helpers.assertBinaryData(i, binaryPropertyName);
-			const dataBuffer = await this.helpers.getBinaryDataBuffer(i, binaryPropertyName);
-			return {
-				'@odata.type': '#microsoft.graph.fileAttachment',
-				name: binaryData.fileName,
-				contentBytes: dataBuffer.toString(BINARY_ENCODING),
-			};
-		}),
-	);
-}
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/MessageDescription.ts b/packages/nodes-base/nodes/Microsoft/Outlook/MessageDescription.ts
deleted file mode 100644
index fa5b5d53e5675..0000000000000
--- a/packages/nodes-base/nodes/Microsoft/Outlook/MessageDescription.ts
+++ /dev/null
@@ -1,591 +0,0 @@
-import type { INodeProperties } from 'n8n-workflow';
-
-export const messageOperations: INodeProperties[] = [
-	{
-		displayName: 'Operation',
-		name: 'operation',
-		type: 'options',
-		noDataExpression: true,
-		displayOptions: {
-			show: {
-				resource: ['message'],
-			},
-		},
-		options: [
-			{
-				name: 'Delete',
-				value: 'delete',
-				description: 'Delete a message',
-				action: 'Delete a message',
-			},
-			{
-				name: 'Get',
-				value: 'get',
-				description: 'Get a single message',
-				action: 'Get a message',
-			},
-			{
-				name: 'Get Many',
-				value: 'getAll',
-				description: "Get many messages in the signed-in user's mailbox",
-				action: 'Get many messages',
-			},
-			{
-				name: 'Get MIME Content',
-				value: 'getMime',
-				description: 'Get MIME content of a message',
-				action: 'Get MIME Content of a message',
-			},
-			{
-				name: 'Move',
-				value: 'move',
-				description: 'Move a message',
-				action: 'Move a message',
-			},
-			{
-				name: 'Reply',
-				value: 'reply',
-				description: 'Create reply to a message',
-				action: 'Reply to a message',
-			},
-			{
-				name: 'Send',
-				value: 'send',
-				description: 'Send a message',
-				action: 'Send a message',
-			},
-			{
-				name: 'Update',
-				value: 'update',
-				description: 'Update a message',
-				action: 'Update a message',
-			},
-		],
-		default: 'send',
-	},
-];
-
-export const messageFields: INodeProperties[] = [
-	{
-		displayName: 'Message ID',
-		name: 'messageId',
-		type: 'string',
-		required: true,
-		default: '',
-		displayOptions: {
-			show: {
-				resource: ['message'],
-				operation: [
-					'addAttachment',
-					'delete',
-					'get',
-					'getAttachment',
-					'getMime',
-					'move',
-					'update',
-					'reply',
-				],
-			},
-		},
-	},
-
-	// message:reply
-	{
-		displayName: 'Reply Type',
-		name: 'replyType',
-		type: 'options',
-		options: [
-			{
-				name: 'Reply',
-				value: 'reply',
-			},
-			{
-				name: 'Reply All',
-				value: 'replyAll',
-			},
-		],
-		default: 'reply',
-		required: true,
-		displayOptions: {
-			show: {
-				resource: ['message'],
-				operation: ['reply'],
-			},
-		},
-	},
-	{
-		displayName: 'Comment',
-		name: 'comment',
-		description: 'A comment to include. Can be an empty string.',
-		displayOptions: {
-			show: {
-				resource: ['message'],
-				operation: ['reply'],
-			},
-		},
-		type: 'string',
-		default: '',
-	},
-	{
-		displayName: 'Send',
-		name: 'send',
-		description:
-			'Whether to send the reply message directly. If not set, it will be saved as draft.',
-		displayOptions: {
-			show: {
-				resource: ['message'],
-				operation: ['reply'],
-			},
-		},
-		type: 'boolean',
-		default: true,
-	},
-	{
-		displayName: 'Additional Fields',
-		name: 'additionalFields',
-		type: 'collection',
-		placeholder: 'Add Field',
-		default: {},
-		displayOptions: {
-			show: {
-				resource: ['message'],
-				operation: ['reply'],
-				replyType: ['reply'],
-			},
-		},
-		options: [
-			{
-				displayName: 'Attachments',
-				name: 'attachments',
-				type: 'fixedCollection',
-				placeholder: 'Add Attachment',
-				default: {},
-				typeOptions: {
-					multipleValues: true,
-				},
-				options: [
-					{
-						name: 'attachments',
-						displayName: 'Attachment',
-						values: [
-							{
-								displayName: 'Binary Property Name',
-								name: 'binaryPropertyName',
-								type: 'string',
-								default: '',
-								description:
-									'Name of the binary property containing the data to be added to the email as an attachment',
-							},
-						],
-					},
-				],
-			},
-			{
-				displayName: 'BCC Recipients',
-				name: 'bccRecipients',
-				description: 'Email addresses of BCC recipients',
-				type: 'string',
-				default: '',
-			},
-			{
-				displayName: 'Body Content',
-				name: 'bodyContent',
-				description: 'Message body content',
-				type: 'string',
-				default: '',
-			},
-			{
-				displayName: 'Body Content Type',
-				name: 'bodyContentType',
-				description: 'Message body content type',
-				type: 'options',
-				options: [
-					{
-						name: 'HTML',
-						value: 'html',
-					},
-					{
-						name: 'Text',
-						value: 'Text',
-					},
-				],
-				default: 'html',
-			},
-			{
-				displayName: 'CC Recipients',
-				name: 'ccRecipients',
-				description: 'Email addresses of CC recipients',
-				type: 'string',
-				default: '',
-			},
-			{
-				displayName: 'Custom Headers',
-				name: 'internetMessageHeaders',
-				placeholder: 'Add Header',
-				type: 'fixedCollection',
-				typeOptions: {
-					multipleValues: true,
-				},
-				default: {},
-				options: [
-					{
-						name: 'headers',
-						displayName: 'Header',
-						values: [
-							{
-								displayName: 'Name',
-								name: 'name',
-								type: 'string',
-								default: '',
-								description: 'Name of the header',
-							},
-							{
-								displayName: 'Value',
-								name: 'value',
-								type: 'string',
-								default: '',
-								description: 'Value to set for the header',
-							},
-						],
-					},
-				],
-			},
-			{
-				displayName: 'From',
-				name: 'from',
-				description:
-					'The owner of the mailbox which the message is sent. Must correspond to the actual mailbox used.',
-				type: 'string',
-				default: '',
-			},
-			{
-				displayName: 'Importance',
-				name: 'importance',
-				description: 'The importance of the message',
-				type: 'options',
-				options: [
-					{
-						name: 'Low',
-						value: 'Low',
-					},
-					{
-						name: 'Normal',
-						value: 'Normal',
-					},
-					{
-						name: 'High',
-						value: 'High',
-					},
-				],
-				default: 'Low',
-			},
-			{
-				displayName: 'Read Receipt Requested',
-				name: 'isReadReceiptRequested',
-				description: 'Whether a read receipt is requested for the message',
-				type: 'boolean',
-				default: false,
-			},
-			{
-				displayName: 'Recipients',
-				name: 'toRecipients',
-				description: 'Email addresses of recipients. Multiple can be added separated by comma.',
-				type: 'string',
-				default: '',
-			},
-			{
-				displayName: 'Reply To',
-				name: 'replyTo',
-				description: 'Email addresses to use when replying',
-				type: 'string',
-				default: '',
-			},
-			{
-				displayName: 'Subject',
-				name: 'subject',
-				description: 'The subject of the message',
-				type: 'string',
-				default: '',
-			},
-		],
-	},
-
-	// message:getAll
-	{
-		displayName: 'Return All',
-		name: 'returnAll',
-		type: 'boolean',
-		displayOptions: {
-			show: {
-				resource: ['message'],
-				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: ['message'],
-				operation: ['getAll'],
-				returnAll: [false],
-			},
-		},
-		typeOptions: {
-			minValue: 1,
-			maxValue: 500,
-		},
-		default: 100,
-		description: 'Max number of results to return',
-	},
-
-	// message:create, message:update, message:send
-	{
-		displayName: 'Subject',
-		name: 'subject',
-		description: 'The subject of the message',
-		displayOptions: {
-			show: {
-				resource: ['message'],
-				operation: ['create', 'send'],
-			},
-		},
-		type: 'string',
-		default: '',
-	},
-	{
-		displayName: 'Body Content',
-		name: 'bodyContent',
-		description: 'Message body content',
-		type: 'string',
-		displayOptions: {
-			show: {
-				resource: ['message'],
-				operation: ['create', 'send'],
-			},
-		},
-		default: '',
-	},
-	{
-		displayName: 'Recipients',
-		name: 'toRecipients',
-		description: 'Email addresses of recipients. Multiple can be added separated by comma.',
-		type: 'string',
-		displayOptions: {
-			show: {
-				resource: ['message'],
-				operation: ['send'],
-			},
-		},
-		required: true,
-		default: '',
-	},
-	{
-		displayName: 'Additional Fields',
-		name: 'additionalFields',
-		type: 'collection',
-		placeholder: 'Add Field',
-		default: {},
-		displayOptions: {
-			show: {
-				resource: ['message'],
-				operation: ['send'],
-			},
-		},
-		options: [
-			{
-				displayName: 'Attachments',
-				name: 'attachments',
-				type: 'fixedCollection',
-				placeholder: 'Add Attachment',
-				default: {},
-				typeOptions: {
-					multipleValues: true,
-				},
-				options: [
-					{
-						name: 'attachments',
-						displayName: 'Attachment',
-						values: [
-							{
-								displayName: 'Binary Property Name',
-								name: 'binaryPropertyName',
-								type: 'string',
-								default: '',
-								description:
-									'Name of the binary property containing the data to be added to the email as an attachment',
-							},
-						],
-					},
-				],
-			},
-			{
-				displayName: 'BCC Recipients',
-				name: 'bccRecipients',
-				description: 'Email addresses of BCC recipients',
-				type: 'string',
-				default: '',
-			},
-			{
-				displayName: 'Body Content Type',
-				name: 'bodyContentType',
-				description: 'Message body content type',
-				type: 'options',
-				options: [
-					{
-						name: 'HTML',
-						value: 'html',
-					},
-					{
-						name: 'Text',
-						value: 'Text',
-					},
-				],
-				default: 'html',
-			},
-			{
-				displayName: 'Category Names or IDs',
-				name: 'categories',
-				type: 'multiOptions',
-				description:
-					'Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
-				typeOptions: {
-					loadOptionsMethod: 'getCategories',
-				},
-				default: [],
-			},
-			{
-				displayName: 'CC Recipients',
-				name: 'ccRecipients',
-				description: 'Email addresses of CC recipients',
-				type: 'string',
-				default: '',
-			},
-			{
-				displayName: 'Custom Headers',
-				name: 'internetMessageHeaders',
-				placeholder: 'Add Header',
-				type: 'fixedCollection',
-				typeOptions: {
-					multipleValues: true,
-				},
-				default: {},
-				options: [
-					{
-						name: 'headers',
-						displayName: 'Header',
-						values: [
-							{
-								displayName: 'Name',
-								name: 'name',
-								type: 'string',
-								default: '',
-								description: 'Name of the header',
-							},
-							{
-								displayName: 'Value',
-								name: 'value',
-								type: 'string',
-								default: '',
-								description: 'Value to set for the header',
-							},
-						],
-					},
-				],
-			},
-			{
-				displayName: 'From',
-				name: 'from',
-				description:
-					'The owner of the mailbox which the message is sent. Must correspond to the actual mailbox used.',
-				type: 'string',
-				default: '',
-			},
-			{
-				displayName: 'Importance',
-				name: 'importance',
-				description: 'The importance of the message',
-				type: 'options',
-				options: [
-					{
-						name: 'Low',
-						value: 'Low',
-					},
-					{
-						name: 'Normal',
-						value: 'Normal',
-					},
-					{
-						name: 'High',
-						value: 'High',
-					},
-				],
-				default: 'Low',
-			},
-			{
-				displayName: 'Read Receipt Requested',
-				name: 'isReadReceiptRequested',
-				description: 'Whether a read receipt is requested for the message',
-				type: 'boolean',
-				default: false,
-			},
-			{
-				displayName: 'Recipients',
-				name: 'toRecipients',
-				description: 'Email addresses of recipients. Multiple can be added separated by comma.',
-				type: 'string',
-				default: '',
-			},
-			{
-				displayName: 'Reply To',
-				name: 'replyTo',
-				description: 'Email addresses to use when replying',
-				type: 'string',
-				default: '',
-			},
-			{
-				displayName: 'Save To Sent Items',
-				name: 'saveToSentItems',
-				description: 'Whether to save the message in Sent Items',
-				type: 'boolean',
-				default: true,
-			},
-		],
-	},
-
-	// File operations
-	{
-		displayName: 'Binary Property',
-		name: 'binaryPropertyName',
-		description: 'Name of the binary property to which to write the data of the read file',
-		type: 'string',
-		required: true,
-		default: 'data',
-		displayOptions: {
-			show: {
-				resource: ['message'],
-				operation: ['getMime'],
-			},
-		},
-	},
-
-	// message:move
-	{
-		displayName: 'Folder ID',
-		name: 'folderId',
-		description: 'Target Folder ID',
-		type: 'string',
-		default: '',
-		required: true,
-		displayOptions: {
-			show: {
-				resource: ['message'],
-				operation: ['move'],
-			},
-		},
-	},
-];
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/MicrosoftOutlook.node.json b/packages/nodes-base/nodes/Microsoft/Outlook/MicrosoftOutlook.node.json
index 4d2d75972feb0..7cb73e35b1f0e 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/MicrosoftOutlook.node.json
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/MicrosoftOutlook.node.json
@@ -14,5 +14,6 @@
 				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.microsoftoutlook/"
 			}
 		]
-	}
+	},
+	"alias": ["email"]
 }
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/MicrosoftOutlook.node.ts b/packages/nodes-base/nodes/Microsoft/Outlook/MicrosoftOutlook.node.ts
index bbbe54d857892..ead49195f8447 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/MicrosoftOutlook.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/MicrosoftOutlook.node.ts
@@ -1,1202 +1,26 @@
-import type {
-	IDataObject,
-	IExecuteFunctions,
-	ILoadOptionsFunctions,
-	INodeExecutionData,
-	INodePropertyOptions,
-	INodeType,
-	INodeTypeDescription,
-	JsonObject,
-} from 'n8n-workflow';
-import { NodeApiError, NodeOperationError } from 'n8n-workflow';
-
-import {
-	binaryToAttachments,
-	createMessage,
-	downloadAttachments,
-	makeRecipient,
-	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';
-
-export class MicrosoftOutlook implements INodeType {
-	description: INodeTypeDescription = {
-		displayName: 'Microsoft Outlook',
-		name: 'microsoftOutlook',
-		group: ['transform'],
-		icon: 'file:outlook.svg',
-		version: 1,
-		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume Microsoft Outlook API',
-		defaults: {
-			name: 'Microsoft Outlook',
-		},
-		inputs: ['main'],
-		outputs: ['main'],
-		credentials: [
-			{
-				name: 'microsoftOutlookOAuth2Api',
-				required: true,
-			},
-		],
-		properties: [
-			{
-				displayName: 'Resource',
-				name: 'resource',
-				type: 'options',
-				noDataExpression: true,
-				default: 'message',
-				options: [
-					{
-						name: 'Draft',
-						value: 'draft',
-					},
-					{
-						name: 'Folder',
-						value: 'folder',
-					},
-					{
-						name: 'Folder Message',
-						value: 'folderMessage',
-					},
-					{
-						name: 'Message',
-						value: 'message',
-					},
-					{
-						name: 'Message Attachment',
-						value: 'messageAttachment',
-					},
-				],
-			},
-			// Draft
-			...draftOperations,
-			...draftFields,
-			// Message
-			...messageOperations,
-			...messageFields,
-			// Message Attachment
-			...messageAttachmentOperations,
-			...messageAttachmentFields,
-			// Folder
-			...folderOperations,
-			...folderFields,
-			// Folder Message
-			...folderMessageOperations,
-			...folderMessageFields,
-
-			// Draft & Message
-			...draftMessageSharedFields,
-		],
-	};
-
-	methods = {
-		loadOptions: {
-			// Get all the categories to display them to user so that they can
-			// select them easily
-			async getCategories(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const categories = await microsoftApiRequestAllItems.call(
-					this,
-					'value',
-					'GET',
-					'/outlook/masterCategories',
-				);
-				for (const category of categories) {
-					returnData.push({
-						name: category.displayName as string,
-						value: category.id as string,
-					});
-				}
-				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);
-
-		if (['draft', 'message'].includes(resource)) {
-			if (operation === 'delete') {
-				for (let i = 0; i < length; i++) {
-					try {
-						const messageId = this.getNodeParameter('messageId', i) as string;
-						responseData = await microsoftApiRequest.call(this, 'DELETE', `/messages/${messageId}`);
-						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray({ success: true }),
-							{ itemData: { item: i } },
-						);
-						returnData.push(...executionData);
-					} catch (error) {
-						if (this.continueOnFail()) {
-							const executionData = this.helpers.constructExecutionMetaData(
-								this.helpers.returnJsonArray({ error: error.message }),
-								{ itemData: { item: i } },
-							);
-							returnData.push(...executionData);
-							continue;
-						}
-						throw error;
-					}
-				}
-			}
-
-			if (operation === 'get') {
-				for (let i = 0; i < length; i++) {
-					try {
-						const messageId = this.getNodeParameter('messageId', i) as string;
-						const additionalFields = this.getNodeParameter('additionalFields', i);
-
-						if (additionalFields.fields) {
-							qs.$select = additionalFields.fields;
-						}
-
-						if (additionalFields.filter) {
-							qs.$filter = additionalFields.filter;
-						}
-
-						responseData = await microsoftApiRequest.call(
-							this,
-							'GET',
-							`/messages/${messageId}`,
-							undefined,
-							qs,
-						);
-
-						if (additionalFields.dataPropertyAttachmentsPrefixName) {
-							const prefix = additionalFields.dataPropertyAttachmentsPrefixName as string;
-							const data = await downloadAttachments.call(
-								this,
-								responseData as IDataObject,
-								prefix,
-							);
-							const executionData = this.helpers.constructExecutionMetaData(
-								this.helpers.returnJsonArray(data),
-								{ itemData: { item: i } },
-							);
-							returnData.push(...executionData);
-						} else {
-							const executionData = this.helpers.constructExecutionMetaData(
-								this.helpers.returnJsonArray(responseData as IDataObject),
-								{ itemData: { item: i } },
-							);
-							returnData.push(...executionData);
-						}
-
-						if (additionalFields.dataPropertyAttachmentsPrefixName) {
-							return [returnData];
-						}
-					} catch (error) {
-						if (this.continueOnFail()) {
-							const executionData = this.helpers.constructExecutionMetaData(
-								this.helpers.returnJsonArray({ error: error.message }),
-								{ itemData: { item: i } },
-							);
-							returnData.push(...executionData);
-							continue;
-						}
-						throw error;
-					}
-				}
-			}
-
-			if (operation === 'update') {
-				for (let i = 0; i < length; i++) {
-					try {
-						const messageId = this.getNodeParameter('messageId', i) as string;
-
-						const updateFields = this.getNodeParameter('updateFields', i);
-
-						// Create message from optional fields
-						const body: IDataObject = createMessage(updateFields);
-
-						responseData = await microsoftApiRequest.call(
-							this,
-							'PATCH',
-							`/messages/${messageId}`,
-							body,
-							{},
-						);
-						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData as IDataObject[]),
-							{ itemData: { item: i } },
-						);
-						returnData.push(...executionData);
-					} catch (error) {
-						if (this.continueOnFail()) {
-							const executionData = this.helpers.constructExecutionMetaData(
-								this.helpers.returnJsonArray({ error: error.message }),
-								{ itemData: { item: i } },
-							);
-							returnData.push(...executionData);
-							continue;
-						}
-						throw error;
-					}
-				}
-			}
-		}
-
-		if (resource === 'draft') {
-			if (operation === 'create') {
-				for (let i = 0; i < length; i++) {
-					try {
-						const additionalFields = this.getNodeParameter('additionalFields', i);
-
-						const subject = this.getNodeParameter('subject', i) as string;
-
-						const bodyContent = this.getNodeParameter('bodyContent', i, '') as string;
-
-						additionalFields.subject = subject;
-
-						additionalFields.bodyContent = bodyContent || ' ';
-
-						// Create message object from optional fields
-						const body: IDataObject = createMessage(additionalFields);
-
-						if (additionalFields.attachments) {
-							const attachments = (additionalFields.attachments as IDataObject)
-								.attachments as IDataObject[];
-
-							// Handle attachments
-							body.attachments = await binaryToAttachments.call(this, attachments, items, i);
-						}
-
-						responseData = await microsoftApiRequest.call(this, 'POST', '/messages', body, {});
-
-						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData as IDataObject[]),
-							{ itemData: { item: i } },
-						);
-						returnData.push(...executionData);
-					} catch (error) {
-						if (this.continueOnFail()) {
-							const executionData = this.helpers.constructExecutionMetaData(
-								this.helpers.returnJsonArray({ error: error.message }),
-								{ itemData: { item: i } },
-							);
-							returnData.push(...executionData);
-							continue;
-						}
-						throw error;
-					}
-				}
-			}
-
-			if (operation === 'send') {
-				for (let i = 0; i < length; i++) {
-					try {
-						const messageId = this.getNodeParameter('messageId', i);
-						const additionalFields = this.getNodeParameter('additionalFields', i, {});
-
-						if (additionalFields?.recipients) {
-							const recipients = (additionalFields.recipients as string)
-								.split(',')
-								.filter((email) => !!email);
-							if (recipients.length !== 0) {
-								await microsoftApiRequest.call(this, 'PATCH', `/messages/${messageId}`, {
-									toRecipients: recipients.map((recipient: string) => makeRecipient(recipient)),
-								});
-							}
-						}
-
-						responseData = await microsoftApiRequest.call(
-							this,
-							'POST',
-							`/messages/${messageId}/send`,
-						);
-						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray({ success: true }),
-							{ itemData: { item: i } },
-						);
-						returnData.push(...executionData);
-					} catch (error) {
-						if (this.continueOnFail()) {
-							const executionData = this.helpers.constructExecutionMetaData(
-								this.helpers.returnJsonArray({ error: error.message }),
-								{ itemData: { item: i } },
-							);
-							returnData.push(...executionData);
-							continue;
-						}
-						throw error;
-					}
-				}
-			}
-		}
-
-		if (resource === 'message') {
-			if (operation === 'reply') {
-				for (let i = 0; i < length; i++) {
-					try {
-						const messageId = this.getNodeParameter('messageId', i) as string;
-						const replyType = this.getNodeParameter('replyType', i) as string;
-						const comment = this.getNodeParameter('comment', i) as string;
-						const send = this.getNodeParameter('send', i, false) as boolean;
-						const additionalFields = this.getNodeParameter('additionalFields', i, {});
-
-						const body: IDataObject = {};
-
-						let action = 'createReply';
-						if (replyType === 'replyAll') {
-							body.comment = comment;
-							action = 'createReplyAll';
-						} else {
-							body.comment = comment;
-							body.message = {};
-							Object.assign(body.message, createMessage(additionalFields));
-							//@ts-ignore
-							delete body.message.attachments;
-						}
-
-						responseData = await microsoftApiRequest.call(
-							this,
-							'POST',
-							`/messages/${messageId}/${action}`,
-							body,
-						);
-
-						if (additionalFields.attachments) {
-							const attachments = (additionalFields.attachments as IDataObject)
-								.attachments as IDataObject[];
-							// Handle attachments
-							const data = await binaryToAttachments.call(this, attachments, items, i);
-
-							for (const attachment of data) {
-								await microsoftApiRequest.call(
-									this,
-									'POST',
-									`/messages/${responseData.id}/attachments`,
-									attachment,
-									{},
-								);
-							}
-						}
-
-						if (send) {
-							await microsoftApiRequest.call(this, 'POST', `/messages/${responseData.id}/send`);
-						}
-
-						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData as IDataObject[]),
-							{ itemData: { item: i } },
-						);
-						returnData.push(...executionData);
-					} catch (error) {
-						if (this.continueOnFail()) {
-							const executionData = this.helpers.constructExecutionMetaData(
-								this.helpers.returnJsonArray({ error: error.message }),
-								{ itemData: { item: i } },
-							);
-							returnData.push(...executionData);
-							continue;
-						}
-						throw error;
-					}
-				}
-			}
-
-			if (operation === 'getMime') {
-				for (let i = 0; i < length; i++) {
-					try {
-						const messageId = this.getNodeParameter('messageId', i) as string;
-						const dataPropertyNameDownload = this.getNodeParameter('binaryPropertyName', i);
-						const response = await microsoftApiRequest.call(
-							this,
-							'GET',
-							`/messages/${messageId}/$value`,
-							undefined,
-							{},
-							undefined,
-							{},
-							{ encoding: null, resolveWithFullResponse: true },
-						);
-
-						let mimeType: string | undefined;
-						if (response.headers['content-type']) {
-							mimeType = response.headers['content-type'];
-						}
-
-						const newItem: INodeExecutionData = {
-							json: items[i].json,
-							binary: {},
-						};
-
-						if (items[i].binary !== undefined) {
-							// Create a shallow copy of the binary data so that the old
-							// data references which do not get changed still stay behind
-							// but the incoming data does not get changed.
-							Object.assign(newItem.binary!, items[i].binary);
-						}
-
-						items[i] = newItem;
-
-						const fileName = `${messageId}.eml`;
-						const data = Buffer.from(response.body as string, 'utf8');
-						items[i].binary![dataPropertyNameDownload] = await this.helpers.prepareBinaryData(
-							data as unknown as Buffer,
-							fileName,
-							mimeType,
-						);
-					} catch (error) {
-						if (this.continueOnFail()) {
-							items[i].json = { error: error.message };
-							continue;
-						}
-						throw error;
-					}
-				}
-			}
-
-			if (operation === 'getAll') {
-				let additionalFields: IDataObject = {};
-				for (let i = 0; i < length; i++) {
-					try {
-						const returnAll = this.getNodeParameter('returnAll', i);
-						additionalFields = this.getNodeParameter('additionalFields', i);
-
-						if (additionalFields.fields) {
-							qs.$select = additionalFields.fields;
-						}
-
-						if (additionalFields.filter) {
-							qs.$filter = additionalFields.filter;
-						}
-
-						const endpoint = '/messages';
-
-						if (returnAll) {
-							responseData = await microsoftApiRequestAllItems.call(
-								this,
-								'value',
-								'GET',
-								endpoint,
-								undefined,
-								qs,
-							);
-						} else {
-							qs.$top = this.getNodeParameter('limit', i);
-							responseData = await microsoftApiRequest.call(this, 'GET', endpoint, undefined, qs);
-							responseData = responseData.value;
-						}
-
-						if (additionalFields.dataPropertyAttachmentsPrefixName) {
-							const prefix = additionalFields.dataPropertyAttachmentsPrefixName as string;
-							const data = await downloadAttachments.call(
-								this,
-								responseData as IDataObject,
-								prefix,
-							);
-							const executionData = this.helpers.constructExecutionMetaData(
-								this.helpers.returnJsonArray(data),
-								{ itemData: { item: i } },
-							);
-							returnData.push(...executionData);
-						} else {
-							const executionData = this.helpers.constructExecutionMetaData(
-								this.helpers.returnJsonArray(responseData as IDataObject[]),
-								{ itemData: { item: i } },
-							);
-							returnData.push(...executionData);
-						}
-					} catch (error) {
-						if (this.continueOnFail()) {
-							const executionData = this.helpers.constructExecutionMetaData(
-								this.helpers.returnJsonArray({ error: error.message }),
-								{ itemData: { item: i } },
-							);
-							returnData.push(...executionData);
-							continue;
-						}
-						throw error;
-					}
-				}
-
-				if (additionalFields.dataPropertyAttachmentsPrefixName) {
-					return [returnData];
-				}
-			}
-
-			if (operation === 'move') {
-				for (let i = 0; i < length; i++) {
-					try {
-						const messageId = this.getNodeParameter('messageId', i) as string;
-						const destinationId = this.getNodeParameter('folderId', i) as string;
-						const body: IDataObject = {
-							destinationId,
-						};
-
-						responseData = await microsoftApiRequest.call(
-							this,
-							'POST',
-							`/messages/${messageId}/move`,
-							body,
-						);
-						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray({ success: true }),
-							{ itemData: { item: i } },
-						);
-						returnData.push(...executionData);
-					} catch (error) {
-						if (this.continueOnFail()) {
-							const executionData = this.helpers.constructExecutionMetaData(
-								this.helpers.returnJsonArray({ error: error.message }),
-								{ itemData: { item: i } },
-							);
-							returnData.push(...executionData);
-							continue;
-						}
-						throw error;
-					}
-				}
-			}
-
-			if (operation === 'send') {
-				for (let i = 0; i < length; i++) {
-					try {
-						const additionalFields = this.getNodeParameter('additionalFields', i);
-
-						const toRecipients = this.getNodeParameter('toRecipients', i) as string;
-
-						const subject = this.getNodeParameter('subject', i) as string;
-
-						const bodyContent = this.getNodeParameter('bodyContent', i, '') as string;
-
-						additionalFields.subject = subject;
-
-						additionalFields.bodyContent = bodyContent || ' ';
-
-						additionalFields.toRecipients = toRecipients;
-
-						const saveToSentItems =
-							additionalFields.saveToSentItems === undefined
-								? true
-								: additionalFields.saveToSentItems;
-						delete additionalFields.saveToSentItems;
-
-						// Create message object from optional fields
-						const message: IDataObject = createMessage(additionalFields);
-
-						if (additionalFields.attachments) {
-							const attachments = (additionalFields.attachments as IDataObject)
-								.attachments as IDataObject[];
-
-							// Handle attachments
-							message.attachments = await binaryToAttachments.call(this, attachments, items, i);
-						}
-
-						const body: IDataObject = {
-							message,
-							saveToSentItems,
-						};
-
-						responseData = await microsoftApiRequest.call(this, 'POST', '/sendMail', body, {});
-						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray({ success: true }),
-							{ itemData: { item: i } },
-						);
-						returnData.push(...executionData);
-					} catch (error) {
-						if (this.continueOnFail()) {
-							const executionData = this.helpers.constructExecutionMetaData(
-								this.helpers.returnJsonArray({ error: error.message }),
-								{ itemData: { item: i } },
-							);
-							returnData.push(...executionData);
-							continue;
-						}
-						throw error;
-					}
-				}
-			}
-		}
-
-		if (resource === 'messageAttachment') {
-			if (operation === 'add') {
-				for (let i = 0; i < length; i++) {
-					try {
-						const messageId = this.getNodeParameter('messageId', i) as string;
-						const binaryPropertyName = this.getNodeParameter('binaryPropertyName', 0);
-						const additionalFields = this.getNodeParameter('additionalFields', i);
-
-						const binaryData = this.helpers.assertBinaryData(i, binaryPropertyName);
-						const dataBuffer = await this.helpers.getBinaryDataBuffer(i, binaryPropertyName);
-
-						const fileName =
-							additionalFields.fileName === undefined
-								? binaryData.fileName
-								: additionalFields.fileName;
-
-						if (!fileName) {
-							throw new NodeOperationError(
-								this.getNode(),
-								'File name is not set. It has either to be set via "Additional Fields" or has to be set on the binary property!',
-								{ itemIndex: i },
-							);
-						}
-
-						// Check if the file is over 3MB big
-						if (dataBuffer.length > 3e6) {
-							// Maximum chunk size is 4MB
-							const chunkSize = 4e6;
-							const body: IDataObject = {
-								AttachmentItem: {
-									attachmentType: 'file',
-									name: fileName,
-									size: dataBuffer.length,
-								},
-							};
-
-							// Create upload session
-							responseData = await microsoftApiRequest.call(
-								this,
-								'POST',
-								`/messages/${messageId}/attachments/createUploadSession`,
-								body,
-							);
-							const uploadUrl = responseData.uploadUrl;
-
-							if (uploadUrl === undefined) {
-								throw new NodeApiError(this.getNode(), responseData as JsonObject, {
-									message: 'Failed to get upload session',
-								});
-							}
-
-							for (
-								let bytesUploaded = 0;
-								bytesUploaded < dataBuffer.length;
-								bytesUploaded += chunkSize
-							) {
-								// Upload the file chunk by chunk
-								const nextChunk = Math.min(bytesUploaded + chunkSize, dataBuffer.length);
-								const contentRange = `bytes ${bytesUploaded}-${nextChunk - 1}/${dataBuffer.length}`;
-
-								const data = dataBuffer.subarray(bytesUploaded, nextChunk);
-
-								responseData = await this.helpers.request(uploadUrl, {
-									method: 'PUT',
-									headers: {
-										'Content-Type': 'application/octet-stream',
-										'Content-Length': data.length,
-										'Content-Range': contentRange,
-									},
-									body: data,
-								});
-							}
-						} else {
-							const body: IDataObject = {
-								'@odata.type': '#microsoft.graph.fileAttachment',
-								name: fileName,
-								contentBytes: dataBuffer.toString('base64'),
-							};
-
-							responseData = await microsoftApiRequest.call(
-								this,
-								'POST',
-								`/messages/${messageId}/attachments`,
-								body,
-								{},
-							);
-						}
-						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray({ success: true }),
-							{ itemData: { item: i } },
-						);
-						returnData.push(...executionData);
-					} catch (error) {
-						if (this.continueOnFail()) {
-							const executionData = this.helpers.constructExecutionMetaData(
-								this.helpers.returnJsonArray({ error: error.message }),
-								{ itemData: { item: i } },
-							);
-							returnData.push(...executionData);
-							continue;
-						}
-						throw error;
-					}
-				}
-			}
-
-			if (operation === 'download') {
-				for (let i = 0; i < length; i++) {
-					try {
-						const messageId = this.getNodeParameter('messageId', i) as string;
-						const attachmentId = this.getNodeParameter('attachmentId', i) as string;
-						const dataPropertyNameDownload = this.getNodeParameter('binaryPropertyName', i);
-
-						// Get attachment details first
-						const attachmentDetails = await microsoftApiRequest.call(
-							this,
-							'GET',
-							`/messages/${messageId}/attachments/${attachmentId}`,
-							undefined,
-							{ $select: 'id,name,contentType' },
-						);
-
-						let mimeType: string | undefined;
-						if (attachmentDetails.contentType) {
-							mimeType = attachmentDetails.contentType;
-						}
-						const fileName = attachmentDetails.name;
-
-						const response = await microsoftApiRequest.call(
-							this,
-							'GET',
-							`/messages/${messageId}/attachments/${attachmentId}/$value`,
-							undefined,
-							{},
-							undefined,
-							{},
-							{ encoding: null, resolveWithFullResponse: true },
-						);
-
-						const newItem: INodeExecutionData = {
-							json: items[i].json,
-							binary: {},
-						};
-
-						if (items[i].binary !== undefined) {
-							// Create a shallow copy of the binary data so that the old
-							// data references which do not get changed still stay behind
-							// but the incoming data does not get changed.
-							Object.assign(newItem.binary!, items[i].binary);
-						}
-
-						items[i] = newItem;
-						const data = Buffer.from(response.body as string, 'utf8');
-						items[i].binary![dataPropertyNameDownload] = await this.helpers.prepareBinaryData(
-							data as unknown as Buffer,
-							fileName as string,
-							mimeType,
-						);
-					} catch (error) {
-						if (this.continueOnFail()) {
-							items[i].json = { error: error.message };
-							continue;
-						}
-						throw error;
-					}
-				}
-			}
-
-			if (operation === 'get') {
-				for (let i = 0; i < length; i++) {
-					try {
-						const messageId = this.getNodeParameter('messageId', i) as string;
-						const attachmentId = this.getNodeParameter('attachmentId', i) as string;
-						const additionalFields = this.getNodeParameter('additionalFields', i);
-
-						// Have sane defaults so we don't fetch attachment data in this operation
-						qs.$select = 'id,lastModifiedDateTime,name,contentType,size,isInline';
-						if (additionalFields.fields) {
-							qs.$select = additionalFields.fields;
-						}
-
-						responseData = await microsoftApiRequest.call(
-							this,
-							'GET',
-							`/messages/${messageId}/attachments/${attachmentId}`,
-							undefined,
-							qs,
-						);
-						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData as IDataObject[]),
-							{ itemData: { item: i } },
-						);
-						returnData.push(...executionData);
-					} catch (error) {
-						if (this.continueOnFail()) {
-							const executionData = this.helpers.constructExecutionMetaData(
-								this.helpers.returnJsonArray({ error: error.message }),
-								{ itemData: { item: i } },
-							);
-							returnData.push(...executionData);
-							continue;
-						}
-						throw error;
-					}
-				}
-			}
-
-			if (operation === 'getAll') {
-				for (let i = 0; i < length; i++) {
-					try {
-						const messageId = this.getNodeParameter('messageId', i) as string;
-						const returnAll = this.getNodeParameter('returnAll', i);
-						const additionalFields = this.getNodeParameter('additionalFields', i);
-
-						// Have sane defaults so we don't fetch attachment data in this operation
-						qs.$select = 'id,lastModifiedDateTime,name,contentType,size,isInline';
-						if (additionalFields.fields) {
-							qs.$select = additionalFields.fields;
-						}
-
-						if (additionalFields.filter) {
-							qs.$filter = additionalFields.filter;
-						}
-
-						const endpoint = `/messages/${messageId}/attachments`;
-						if (returnAll) {
-							responseData = await microsoftApiRequestAllItems.call(
-								this,
-								'value',
-								'GET',
-								endpoint,
-								undefined,
-								qs,
-							);
-						} else {
-							qs.$top = this.getNodeParameter('limit', i);
-							responseData = await microsoftApiRequest.call(this, 'GET', endpoint, undefined, qs);
-							responseData = responseData.value;
-						}
-						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData as IDataObject[]),
-							{ itemData: { item: i } },
-						);
-						returnData.push(...executionData);
-					} catch (error) {
-						if (this.continueOnFail()) {
-							const executionData = this.helpers.constructExecutionMetaData(
-								this.helpers.returnJsonArray({ error: error.message }),
-								{ itemData: { item: i } },
-							);
-							returnData.push(...executionData);
-							continue;
-						}
-						throw error;
-					}
-				}
-			}
-		}
-
-		if (resource === 'folder') {
-			if (operation === 'create') {
-				for (let i = 0; i < length; i++) {
-					try {
-						const displayName = this.getNodeParameter('displayName', i) as string;
-						const folderType = this.getNodeParameter('folderType', i) as string;
-						const body: IDataObject = {
-							displayName,
-						};
-
-						let endpoint = '/mailFolders';
-
-						if (folderType === 'searchFolder') {
-							endpoint = '/mailFolders/searchfolders/childFolders';
-							const includeNestedFolders = this.getNodeParameter('includeNestedFolders', i);
-							const sourceFolderIds = this.getNodeParameter('sourceFolderIds', i);
-							const filterQuery = this.getNodeParameter('filterQuery', i);
-							Object.assign(body, {
-								'@odata.type': 'microsoft.graph.mailSearchFolder',
-								includeNestedFolders,
-								sourceFolderIds,
-								filterQuery,
-							});
-						}
-
-						responseData = await microsoftApiRequest.call(this, 'POST', endpoint, body);
-						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData as IDataObject[]),
-							{ itemData: { item: i } },
-						);
-						returnData.push(...executionData);
-					} catch (error) {
-						if (this.continueOnFail()) {
-							const executionData = this.helpers.constructExecutionMetaData(
-								this.helpers.returnJsonArray({ error: error.message }),
-								{ itemData: { item: i } },
-							);
-							returnData.push(...executionData);
-							continue;
-						}
-						throw error;
-					}
-				}
-			}
-
-			if (operation === 'delete') {
-				for (let i = 0; i < length; i++) {
-					try {
-						const folderId = this.getNodeParameter('folderId', i) as string;
-						responseData = await microsoftApiRequest.call(
-							this,
-							'DELETE',
-							`/mailFolders/${folderId}`,
-						);
-						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray({ success: true }),
-							{ itemData: { item: i } },
-						);
-						returnData.push(...executionData);
-					} catch (error) {
-						if (this.continueOnFail()) {
-							const executionData = this.helpers.constructExecutionMetaData(
-								this.helpers.returnJsonArray({ error: error.message }),
-								{ itemData: { item: i } },
-							);
-							returnData.push(...executionData);
-							continue;
-						}
-						throw error;
-					}
-				}
-			}
-
-			if (operation === 'get') {
-				for (let i = 0; i < length; i++) {
-					try {
-						const folderId = this.getNodeParameter('folderId', i) as string;
-						const additionalFields = this.getNodeParameter('additionalFields', i);
-
-						if (additionalFields.fields) {
-							qs.$select = additionalFields.fields;
-						}
-
-						if (additionalFields.filter) {
-							qs.$filter = additionalFields.filter;
-						}
-						responseData = await microsoftApiRequest.call(
-							this,
-							'GET',
-							`/mailFolders/${folderId}`,
-							{},
-							qs,
-						);
-						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData as IDataObject[]),
-							{ itemData: { item: i } },
-						);
-						returnData.push(...executionData);
-					} catch (error) {
-						if (this.continueOnFail()) {
-							const executionData = this.helpers.constructExecutionMetaData(
-								this.helpers.returnJsonArray({ error: error.message }),
-								{ itemData: { item: i } },
-							);
-							returnData.push(...executionData);
-							continue;
-						}
-						throw error;
-					}
-				}
-			}
-
-			if (operation === 'getAll') {
-				for (let i = 0; i < length; i++) {
-					try {
-						const returnAll = this.getNodeParameter('returnAll', i);
-						const additionalFields = this.getNodeParameter('additionalFields', i);
-
-						if (additionalFields.fields) {
-							qs.$select = additionalFields.fields;
-						}
-
-						if (additionalFields.filter) {
-							qs.$filter = additionalFields.filter;
-						}
-
-						if (returnAll) {
-							responseData = await microsoftApiRequestAllItems.call(
-								this,
-								'value',
-								'GET',
-								'/mailFolders',
-								{},
-								qs,
-							);
-						} else {
-							qs.$top = this.getNodeParameter('limit', i);
-							responseData = await microsoftApiRequest.call(this, 'GET', '/mailFolders', {}, qs);
-							responseData = responseData.value;
-						}
-						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData as IDataObject[]),
-							{ itemData: { item: i } },
-						);
-						returnData.push(...executionData);
-					} catch (error) {
-						if (this.continueOnFail()) {
-							const executionData = this.helpers.constructExecutionMetaData(
-								this.helpers.returnJsonArray({ error: error.message }),
-								{ itemData: { item: i } },
-							);
-							returnData.push(...executionData);
-							continue;
-						}
-						throw error;
-					}
-				}
-			}
-
-			if (operation === 'getChildren') {
-				for (let i = 0; i < length; i++) {
-					try {
-						const folderId = this.getNodeParameter('folderId', i) as string;
-						const returnAll = this.getNodeParameter('returnAll', i);
-						const additionalFields = this.getNodeParameter('additionalFields', i);
-
-						if (additionalFields.fields) {
-							qs.$select = additionalFields.fields;
-						}
-
-						if (additionalFields.filter) {
-							qs.$filter = additionalFields.filter;
-						}
-
-						if (returnAll) {
-							responseData = await microsoftApiRequestAllItems.call(
-								this,
-								'value',
-								'GET',
-								`/mailFolders/${folderId}/childFolders`,
-								qs,
-							);
-						} else {
-							qs.$top = this.getNodeParameter('limit', i);
-							responseData = await microsoftApiRequest.call(
-								this,
-								'GET',
-								`/mailFolders/${folderId}/childFolders`,
-								undefined,
-								qs,
-							);
-							responseData = responseData.value;
-						}
-						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData as IDataObject[]),
-							{ itemData: { item: i } },
-						);
-						returnData.push(...executionData);
-					} catch (error) {
-						if (this.continueOnFail()) {
-							const executionData = this.helpers.constructExecutionMetaData(
-								this.helpers.returnJsonArray({ error: error.message }),
-								{ itemData: { item: i } },
-							);
-							returnData.push(...executionData);
-							continue;
-						}
-						throw error;
-					}
-				}
-			}
-
-			if (operation === 'update') {
-				for (let i = 0; i < length; i++) {
-					try {
-						const folderId = this.getNodeParameter('folderId', i) as string;
-						const updateFields = this.getNodeParameter('updateFields', i);
-
-						const body: IDataObject = {
-							...updateFields,
-						};
-
-						responseData = await microsoftApiRequest.call(
-							this,
-							'PATCH',
-							`/mailFolders/${folderId}`,
-							body,
-						);
-						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData as IDataObject[]),
-							{ itemData: { item: i } },
-						);
-						returnData.push(...executionData);
-					} catch (error) {
-						if (this.continueOnFail()) {
-							const executionData = this.helpers.constructExecutionMetaData(
-								this.helpers.returnJsonArray({ error: error.message }),
-								{ itemData: { item: i } },
-							);
-							returnData.push(...executionData);
-							continue;
-						}
-						throw error;
-					}
-				}
-			}
-		}
-
-		if (resource === 'folderMessage') {
-			for (let i = 0; i < length; i++) {
-				try {
-					if (operation === 'getAll') {
-						const folderId = this.getNodeParameter('folderId', i) as string;
-						const returnAll = this.getNodeParameter('returnAll', i);
-						const additionalFields = this.getNodeParameter('additionalFields', i);
-
-						if (additionalFields.fields) {
-							qs.$select = additionalFields.fields;
-						}
-
-						if (additionalFields.filter) {
-							qs.$filter = additionalFields.filter;
-						}
-
-						const endpoint = `/mailFolders/${folderId}/messages`;
-						if (returnAll) {
-							responseData = await microsoftApiRequestAllItems.call(
-								this,
-								'value',
-								'GET',
-								endpoint,
-								qs,
-							);
-						} else {
-							qs.$top = this.getNodeParameter('limit', i);
-							responseData = await microsoftApiRequest.call(this, 'GET', endpoint, undefined, qs);
-							responseData = responseData.value;
-						}
-						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData as IDataObject[]),
-							{ itemData: { item: i } },
-						);
-						returnData.push(...executionData);
-					}
-				} catch (error) {
-					if (this.continueOnFail()) {
-						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray({ error: error.message }),
-							{ itemData: { item: i } },
-						);
-						returnData.push(...executionData);
-						continue;
-					}
-					throw error;
-				}
-			}
-		}
-
-		if (
-			(resource === 'message' && operation === 'getMime') ||
-			(resource === 'messageAttachment' && operation === 'download')
-		) {
-			return this.prepareOutputData(items);
-		} else {
-			return this.prepareOutputData(returnData);
-		}
+import type { INodeTypeBaseDescription, IVersionedNodeType } from 'n8n-workflow';
+import { VersionedNodeType } from 'n8n-workflow';
+
+import { MicrosoftOutlookV1 } from './v1/MicrosoftOutlookV1.node';
+import { MicrosoftOutlookV2 } from './v2/MicrosoftOutlookV2.node';
+
+export class MicrosoftOutlook extends VersionedNodeType {
+	constructor() {
+		const baseDescription: INodeTypeBaseDescription = {
+			displayName: 'Microsoft Outlook',
+			name: 'microsoftOutlook',
+			group: ['transform'],
+			icon: 'file:outlook.svg',
+			subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+			description: 'Consume Microsoft Outlook API',
+			defaultVersion: 2,
+		};
+
+		const nodeVersions: IVersionedNodeType['nodeVersions'] = {
+			1: new MicrosoftOutlookV1(baseDescription),
+			2: new MicrosoftOutlookV2(baseDescription),
+		};
+
+		super(nodeVersions, baseDescription);
 	}
 }
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/MicrosoftOutlookTrigger.node.json b/packages/nodes-base/nodes/Microsoft/Outlook/MicrosoftOutlookTrigger.node.json
new file mode 100644
index 0000000000000..66c21892ae7e5
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/MicrosoftOutlookTrigger.node.json
@@ -0,0 +1,19 @@
+{
+	"node": "n8n-nodes-base.microsoftOutlookTrigger",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"categories": ["Communication"],
+	"resources": {
+		"credentialDocumentation": [
+			{
+				"url": "https://docs.n8n.io/credentials/microsoft"
+			}
+		],
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.microsoftoutlooktrigger/"
+			}
+		]
+	},
+	"alias": ["email"]
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/MicrosoftOutlookTrigger.node.ts b/packages/nodes-base/nodes/Microsoft/Outlook/MicrosoftOutlookTrigger.node.ts
new file mode 100644
index 0000000000000..d0845710af022
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/MicrosoftOutlookTrigger.node.ts
@@ -0,0 +1,97 @@
+import type {
+	IPollFunctions,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+
+import { DateTime } from 'luxon';
+
+import { properties as messageProperties } from './trigger/MessageDescription';
+
+import { getPollResponse } from './trigger/GenericFunctions';
+import { loadOptions } from './v2/methods';
+
+export class MicrosoftOutlookTrigger implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Microsoft Outlook Trigger',
+		name: 'microsoftOutlookTrigger',
+		icon: 'file:outlook.svg',
+		group: ['trigger'],
+		version: 1,
+		description:
+			'Fetches emails from Microsoft Outlook and starts the workflow on specified polling intervals.',
+		subtitle: '={{"Microsoft Outlook Trigger"}}',
+		defaults: {
+			name: 'Microsoft Outlook Trigger',
+		},
+		credentials: [
+			{
+				name: 'microsoftOutlookOAuth2Api',
+				required: true,
+			},
+		],
+		polling: true,
+		inputs: [],
+		outputs: ['main'],
+		properties: [
+			{
+				displayName: 'Trigger On',
+				name: 'event',
+				type: 'options',
+				default: 'messageReceived',
+				options: [
+					{
+						name: 'Message Received',
+						value: 'messageReceived',
+					},
+				],
+			},
+			...messageProperties,
+		],
+	};
+
+	methods = { loadOptions };
+
+	async poll(this: IPollFunctions): Promise<INodeExecutionData[][] | null> {
+		const webhookData = this.getWorkflowStaticData('node');
+		let responseData;
+
+		const now = DateTime.now().toISO();
+		const startDate = (webhookData.lastTimeChecked as string) || now;
+		const endDate = now;
+		try {
+			const pollStartDate = startDate;
+			const pollEndDate = endDate;
+
+			responseData = await getPollResponse.call(this, pollStartDate, pollEndDate);
+
+			if (!responseData?.length) {
+				webhookData.lastTimeChecked = endDate;
+				return null;
+			}
+		} catch (error) {
+			if (this.getMode() === 'manual' || !webhookData.lastTimeChecked) {
+				throw error;
+			}
+			const workflow = this.getWorkflow();
+			const node = this.getNode();
+			this.logger.error(
+				`There was a problem in '${node.name}' node in workflow '${workflow.id}': '${error.description}'`,
+				{
+					node: node.name,
+					workflowId: workflow.id,
+					error,
+				},
+			);
+		}
+
+		webhookData.lastTimeChecked = endDate;
+
+		if (Array.isArray(responseData) && responseData.length) {
+			return [responseData];
+		}
+
+		return null;
+	}
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/outlook.svg b/packages/nodes-base/nodes/Microsoft/Outlook/outlook.svg
index 6dc221484f4fd..9272b53503d19 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/outlook.svg
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/outlook.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 81 81" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><path d="M77.9 19.2H46.86V0L0 8.232V71.98L46.86 80V61.847H77.9c1.266 0 2.1-1.055 2.1-2.1V21.32c0-1.266-.844-2.1-2.1-2.1zM21.952 54.46c-15.4-1.055-14.776-29.13.422-29.974 16.675-.844 16.253 31.03-.422 29.974zm55.515 4.644H46.86V35.04l9.5 9.077c.422.422.844.633 1.477.633s1.055-.2 1.478-.633L77.467 27.23v31.873zm0-35.462l-19.63 18.153L46.86 31.45v-9.7h30.396v1.9h.2zm-55.092 6.543c-8.232.422-8.443 18.364-.2 18.575 8.654.422 8.654-18.997.2-18.575z" fill="#2372ba" stroke="none"/></symbol></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round" viewBox="0 0 81 81"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><path fill="#2372ba" stroke="none" d="M77.9 19.2H46.86V0L0 8.232V71.98L46.86 80V61.847H77.9c1.266 0 2.1-1.055 2.1-2.1V21.32c0-1.266-.844-2.1-2.1-2.1zM21.952 54.46c-15.4-1.055-14.776-29.13.422-29.974 16.675-.844 16.253 31.03-.422 29.974m55.515 4.644H46.86V35.04l9.5 9.077c.422.422.844.633 1.477.633s1.055-.2 1.478-.633L77.467 27.23zm0-35.462-19.63 18.153L46.86 31.45v-9.7h30.396v1.9h.2zm-55.092 6.543c-8.232.422-8.443 18.364-.2 18.575 8.654.422 8.654-18.997.2-18.575"/></symbol></svg>
\ No newline at end of file
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
new file mode 100644
index 0000000000000..234d008fe736f
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/create.test.ts
@@ -0,0 +1,78 @@
+import type { INodeTypes } from 'n8n-workflow';
+
+import nock from 'nock';
+import * as transport from '../../../../v2/transport';
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+jest.mock('../../../../v2/transport', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		microsoftApiRequest: jest.fn(async function (method: string) {
+			if (method === 'POST') {
+				return {
+					'@odata.context':
+						"https://graph.microsoft.com/v1.0/$metadata#users('b834447b-6848-4af9-8390-d2259ce46b74')/calendarGroups('AAAXXXYYYnnnT6b9RLP0CKzHiJrRBwBZf4De-LkrSqpPI8eyjUmAAAAAAAEGAABZf4De-LkrSqpPI8eyjUmAAACLtRu_AAA%3D')/calendars/$entity",
+					id: 'AAAXXXYYYnnnT6b9RLP0CKzHiJrRBwBZf4De-LkrSqpPI8eyjUmAAAAAAAEGAABZf4De-LkrSqpPI8eyjUmAAAFXBBZ_AAA=',
+					name: 'New Calendar',
+					color: 'lightOrange',
+					hexColor: '#fcab73',
+					isDefaultCalendar: false,
+					changeKey: 'WX+A3vy5K0qqTyPHso1JgAABVtwWTA==',
+					canShare: true,
+					canViewPrivateItems: true,
+					canEdit: true,
+					allowedOnlineMeetingProviders: ['teamsForBusiness'],
+					defaultOnlineMeetingProvider: 'teamsForBusiness',
+					isTallyingResponses: false,
+					isRemovable: true,
+					owner: {
+						name: 'User Name',
+						address: 'test@mail.com',
+					},
+				};
+			}
+		}),
+	};
+});
+
+describe('Test MicrosoftOutlookV2, calendar => create', () => {
+	const workflows = ['nodes/Microsoft/Outlook/test/v2/node/calendar/create.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	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(transport.microsoftApiRequest).toHaveBeenCalledTimes(1);
+		expect(transport.microsoftApiRequest).toHaveBeenCalledWith(
+			'POST',
+			'/calendarGroups/AAAXXXYYYnnnT6b9RLP0CKzHiJrRBwBZf4De-LkrSqpPI8eyjUmAAAAAAAEGAABZf4De-LkrSqpPI8eyjUmAAACLtRu_AAA=/calendars',
+			{ color: 'lightOrange', name: 'New Calendar' },
+		);
+
+		expect(result.finished).toEqual(true);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/create.workflow.json b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/create.workflow.json
new file mode 100644
index 0000000000000..705155d78751c
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/create.workflow.json
@@ -0,0 +1,92 @@
+{
+  "name": "My workflow 21",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "e524f588-b6a3-4849-8777-b32a8a755ae5",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        820,
+        360
+      ]
+    },
+    {
+      "parameters": {
+        "resource": "calendar",
+        "operation": "create",
+        "name": "New Calendar",
+        "additionalFields": {
+          "calendarGroup": "AAAXXXYYYnnnT6b9RLP0CKzHiJrRBwBZf4De-LkrSqpPI8eyjUmAAAAAAAEGAABZf4De-LkrSqpPI8eyjUmAAACLtRu_AAA=",
+          "color": "lightOrange"
+        }
+      },
+      "id": "baff6798-0304-4255-bdb0-dd3f2659373b",
+      "name": "Microsoft Outlook",
+      "type": "n8n-nodes-base.microsoftOutlook",
+      "typeVersion": 2,
+      "position": [
+        1040,
+        360
+      ],
+      "credentials": {
+        "microsoftOutlookOAuth2Api": {
+          "id": "iXJCki7i5Vz0bdks",
+          "name": "Microsoft Outlook account 2"
+        }
+      }
+    }
+  ],
+  "pinData": {
+    "Microsoft Outlook": [
+      {
+        "json": {
+          "@odata.context": "https://graph.microsoft.com/v1.0/$metadata#users('b834447b-6848-4af9-8390-d2259ce46b74')/calendarGroups('AAAXXXYYYnnnT6b9RLP0CKzHiJrRBwBZf4De-LkrSqpPI8eyjUmAAAAAAAEGAABZf4De-LkrSqpPI8eyjUmAAACLtRu_AAA%3D')/calendars/$entity",
+          "id": "AAAXXXYYYnnnT6b9RLP0CKzHiJrRBwBZf4De-LkrSqpPI8eyjUmAAAAAAAEGAABZf4De-LkrSqpPI8eyjUmAAAFXBBZ_AAA=",
+          "name": "New Calendar",
+          "color": "lightOrange",
+          "hexColor": "#fcab73",
+          "isDefaultCalendar": false,
+          "changeKey": "WX+A3vy5K0qqTyPHso1JgAABVtwWTA==",
+          "canShare": true,
+          "canViewPrivateItems": true,
+          "canEdit": true,
+          "allowedOnlineMeetingProviders": [
+            "teamsForBusiness"
+          ],
+          "defaultOnlineMeetingProvider": "teamsForBusiness",
+          "isTallyingResponses": false,
+          "isRemovable": true,
+          "owner": {
+            "name": "User Name",
+            "address": "test@mail.com"
+          }
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Microsoft Outlook",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "074cdbef-4193-45b8-970a-9f55b8a0999b",
+  "id": "1CYHzBXQw1nfPGtB",
+  "meta": {
+    "instanceId": "b888bd11cd1ddbb95450babf3e199556799d999b896f650de768b8370ee50363"
+  },
+  "tags": []
+}
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
new file mode 100644
index 0000000000000..8ec751632f9d3
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/delete.test.ts
@@ -0,0 +1,57 @@
+import type { INodeTypes } from 'n8n-workflow';
+
+import nock from 'nock';
+import * as transport from '../../../../v2/transport';
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+jest.mock('../../../../v2/transport', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		microsoftApiRequest: jest.fn(async function (method: string) {
+			if (method === 'DELETE') {
+				return {};
+			}
+		}),
+	};
+});
+
+describe('Test MicrosoftOutlookV2, calendar => delete', () => {
+	const workflows = ['nodes/Microsoft/Outlook/test/v2/node/calendar/delete.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	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(transport.microsoftApiRequest).toHaveBeenCalledTimes(1);
+		expect(transport.microsoftApiRequest).toHaveBeenCalledWith(
+			'DELETE',
+			'/calendars/AAAXXXYYYnnnT6b9RLP0CKzHiJrRBwBZf4De-LkrSqpPI8eyjUmAAAAAAAEGAABZf4De-LkrSqpPI8eyjUmAAACLtRvIAAA=',
+		);
+
+		expect(result.finished).toEqual(true);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/delete.workflow.json b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/delete.workflow.json
new file mode 100644
index 0000000000000..739d7e5a4c359
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/delete.workflow.json
@@ -0,0 +1,74 @@
+{
+  "name": "My workflow 21",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "e524f588-b6a3-4849-8777-b32a8a755ae5",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        820,
+        360
+      ]
+    },
+    {
+      "parameters": {
+        "resource": "calendar",
+        "operation": "delete",
+        "calendarId": {
+          "__rl": true,
+          "value": "AAAXXXYYYnnnT6b9RLP0CKzHiJrRBwBZf4De-LkrSqpPI8eyjUmAAAAAAAEGAABZf4De-LkrSqpPI8eyjUmAAACLtRvIAAA=",
+          "mode": "list",
+          "cachedResultName": "Foo"
+        }
+      },
+      "id": "baff6798-0304-4255-bdb0-dd3f2659373b",
+      "name": "Microsoft Outlook",
+      "type": "n8n-nodes-base.microsoftOutlook",
+      "typeVersion": 2,
+      "position": [
+        1040,
+        360
+      ],
+      "credentials": {
+        "microsoftOutlookOAuth2Api": {
+          "id": "iXJCki7i5Vz0bdks",
+          "name": "Microsoft Outlook account 2"
+        }
+      }
+    }
+  ],
+  "pinData": {
+    "Microsoft Outlook": [
+      {
+        "json": {
+          "success": true
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Microsoft Outlook",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "888e5578-c726-4a84-9658-321ba04fd0c7",
+  "id": "1CYHzBXQw1nfPGtB",
+  "meta": {
+    "instanceId": "b888bd11cd1ddbb95450babf3e199556799d999b896f650de768b8370ee50363"
+  },
+  "tags": []
+}
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
new file mode 100644
index 0000000000000..b579d899550a4
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/get.test.ts
@@ -0,0 +1,79 @@
+import type { INodeTypes } from 'n8n-workflow';
+
+import nock from 'nock';
+import * as transport from '../../../../v2/transport';
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+jest.mock('../../../../v2/transport', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		microsoftApiRequest: jest.fn(async function (method: string) {
+			if (method === 'GET') {
+				return {
+					'@odata.context':
+						"https://graph.microsoft.com/v1.0/$metadata#users('b834447b-6848-4af9-8390-d2259ce46b74')/calendars/$entity",
+					id: 'AAAXXXYYYnnnT6b9RLP0CKzHiJrRBwBZf4De-LkrSqpPI8eyjUmAAAAAAAEGAABZf4De-LkrSqpPI8eyjUmAAACLtRvGAAA=',
+					name: 'Foo Calendar',
+					color: 'lightGreen',
+					hexColor: '#87d28e',
+					isDefaultCalendar: false,
+					changeKey: 'WX+A3vy5K0qqTyPHso1JgAAAi67hiw==',
+					canShare: true,
+					canViewPrivateItems: true,
+					canEdit: true,
+					allowedOnlineMeetingProviders: ['teamsForBusiness'],
+					defaultOnlineMeetingProvider: 'teamsForBusiness',
+					isTallyingResponses: false,
+					isRemovable: true,
+					owner: {
+						name: 'User Name',
+						address: 'test@mail.com',
+					},
+				};
+			}
+		}),
+	};
+});
+
+describe('Test MicrosoftOutlookV2, calendar => get', () => {
+	const workflows = ['nodes/Microsoft/Outlook/test/v2/node/calendar/get.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	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(transport.microsoftApiRequest).toHaveBeenCalledTimes(1);
+		expect(transport.microsoftApiRequest).toHaveBeenCalledWith(
+			'GET',
+			'/calendars/AAAXXXYYYnnnT6b9RLP0CKzHiJrRBwBZf4De-LkrSqpPI8eyjUmAAAAAAAEGAABZf4De-LkrSqpPI8eyjUmAAACLtRvGAAA=',
+			undefined,
+			{},
+		);
+
+		expect(result.finished).toEqual(true);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/get.workflow.json b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/get.workflow.json
new file mode 100644
index 0000000000000..0657fca3af447
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/get.workflow.json
@@ -0,0 +1,93 @@
+{
+  "name": "My workflow 21",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "e524f588-b6a3-4849-8777-b32a8a755ae5",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        820,
+        360
+      ]
+    },
+    {
+      "parameters": {
+        "resource": "calendar",
+        "operation": "get",
+        "calendarId": {
+          "__rl": true,
+          "value": "AAAXXXYYYnnnT6b9RLP0CKzHiJrRBwBZf4De-LkrSqpPI8eyjUmAAAAAAAEGAABZf4De-LkrSqpPI8eyjUmAAACLtRvGAAA=",
+          "mode": "list",
+          "cachedResultName": "Foo Calendar"
+        }
+      },
+      "id": "baff6798-0304-4255-bdb0-dd3f2659373b",
+      "name": "Microsoft Outlook",
+      "type": "n8n-nodes-base.microsoftOutlook",
+      "typeVersion": 2,
+      "position": [
+        1040,
+        360
+      ],
+      "credentials": {
+        "microsoftOutlookOAuth2Api": {
+          "id": "iXJCki7i5Vz0bdks",
+          "name": "Microsoft Outlook account 2"
+        }
+      }
+    }
+  ],
+  "pinData": {
+    "Microsoft Outlook": [
+      {
+        "json": {
+          "@odata.context": "https://graph.microsoft.com/v1.0/$metadata#users('b834447b-6848-4af9-8390-d2259ce46b74')/calendars/$entity",
+          "id": "AAAXXXYYYnnnT6b9RLP0CKzHiJrRBwBZf4De-LkrSqpPI8eyjUmAAAAAAAEGAABZf4De-LkrSqpPI8eyjUmAAACLtRvGAAA=",
+          "name": "Foo Calendar",
+          "color": "lightGreen",
+          "hexColor": "#87d28e",
+          "isDefaultCalendar": false,
+          "changeKey": "WX+A3vy5K0qqTyPHso1JgAAAi67hiw==",
+          "canShare": true,
+          "canViewPrivateItems": true,
+          "canEdit": true,
+          "allowedOnlineMeetingProviders": [
+            "teamsForBusiness"
+          ],
+          "defaultOnlineMeetingProvider": "teamsForBusiness",
+          "isTallyingResponses": false,
+          "isRemovable": true,
+          "owner": {
+            "name": "User Name",
+            "address": "test@mail.com"
+          }
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Microsoft Outlook",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "33e1fc57-ac36-453b-b01e-d79784b4a4bb",
+  "id": "1CYHzBXQw1nfPGtB",
+  "meta": {
+    "instanceId": "b888bd11cd1ddbb95450babf3e199556799d999b896f650de768b8370ee50363"
+  },
+  "tags": []
+}
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
new file mode 100644
index 0000000000000..1e85bc12b76d0
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/getAll.test.ts
@@ -0,0 +1,98 @@
+import type { INodeTypes } from 'n8n-workflow';
+
+import nock from 'nock';
+import * as transport from '../../../../v2/transport';
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+jest.mock('../../../../v2/transport', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		microsoftApiRequest: jest.fn(async function (method: string) {
+			if (method === 'GET') {
+				return {
+					value: [
+						{
+							id: 'AAAXXXYYYnnnT6b9RLP0CKzHiJrRBwBZf4De-LkrSqpPI8eyjUmAAAAAAAEGAABZf4De-LkrSqpPI8eyjUmAAAAJ9-JDAAA=',
+							name: 'Calendar',
+							color: 'auto',
+							hexColor: '',
+							isDefaultCalendar: true,
+							changeKey: 'WX+A3vy5K0qqTyPHso1JgAAACfdHfw==',
+							canShare: true,
+							canViewPrivateItems: true,
+							canEdit: true,
+							allowedOnlineMeetingProviders: ['teamsForBusiness'],
+							defaultOnlineMeetingProvider: 'teamsForBusiness',
+							isTallyingResponses: true,
+							isRemovable: false,
+							owner: {
+								name: 'User Name',
+								address: 'test@mail.com',
+							},
+						},
+						{
+							id: 'AAAXXXYYYnnnT6b9RLP0CKzHiJrRBwBZf4De-LkrSqpPI8eyjUmAAAAAAAEGAABZf4De-LkrSqpPI8eyjUmAAACLtRvBAAA=',
+							name: 'Third calendar',
+							color: 'lightYellow',
+							hexColor: '#fde300',
+							isDefaultCalendar: false,
+							changeKey: 'WX+A3vy5K0qqTyPHso1JgAAAi67hIw==',
+							canShare: true,
+							canViewPrivateItems: true,
+							canEdit: true,
+							allowedOnlineMeetingProviders: ['teamsForBusiness'],
+							defaultOnlineMeetingProvider: 'teamsForBusiness',
+							isTallyingResponses: false,
+							isRemovable: true,
+							owner: {
+								name: 'User Name',
+								address: 'test@mail.com',
+							},
+						},
+					],
+				};
+			}
+		}),
+	};
+});
+
+describe('Test MicrosoftOutlookV2, calendar => getAll', () => {
+	const workflows = ['nodes/Microsoft/Outlook/test/v2/node/calendar/getAll.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	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(transport.microsoftApiRequest).toHaveBeenCalledTimes(1);
+		expect(transport.microsoftApiRequest).toHaveBeenCalledWith('GET', '/calendars', undefined, {
+			$filter: 'canEdit eq true',
+			$top: 2,
+		});
+
+		expect(result.finished).toEqual(true);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/getAll.workflow.json b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/getAll.workflow.json
new file mode 100644
index 0000000000000..0b189aefc1f8b
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/getAll.workflow.json
@@ -0,0 +1,112 @@
+{
+  "name": "My workflow 21",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "e524f588-b6a3-4849-8777-b32a8a755ae5",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        820,
+        360
+      ]
+    },
+    {
+      "parameters": {
+        "resource": "calendar",
+        "limit": 2,
+        "filters": {
+          "custom": "canEdit eq true"
+        }
+      },
+      "id": "baff6798-0304-4255-bdb0-dd3f2659373b",
+      "name": "Microsoft Outlook",
+      "type": "n8n-nodes-base.microsoftOutlook",
+      "typeVersion": 2,
+      "position": [
+        1040,
+        360
+      ],
+      "credentials": {
+        "microsoftOutlookOAuth2Api": {
+          "id": "iXJCki7i5Vz0bdks",
+          "name": "Microsoft Outlook account 2"
+        }
+      }
+    }
+  ],
+  "pinData": {
+    "Microsoft Outlook": [
+      {
+        "json": {
+          "id": "AAAXXXYYYnnnT6b9RLP0CKzHiJrRBwBZf4De-LkrSqpPI8eyjUmAAAAAAAEGAABZf4De-LkrSqpPI8eyjUmAAAAJ9-JDAAA=",
+          "name": "Calendar",
+          "color": "auto",
+          "hexColor": "",
+          "isDefaultCalendar": true,
+          "changeKey": "WX+A3vy5K0qqTyPHso1JgAAACfdHfw==",
+          "canShare": true,
+          "canViewPrivateItems": true,
+          "canEdit": true,
+          "allowedOnlineMeetingProviders": [
+            "teamsForBusiness"
+          ],
+          "defaultOnlineMeetingProvider": "teamsForBusiness",
+          "isTallyingResponses": true,
+          "isRemovable": false,
+          "owner": {
+            "name": "User Name",
+            "address": "test@mail.com"
+          }
+        }
+      },
+      {
+        "json": {
+          "id": "AAAXXXYYYnnnT6b9RLP0CKzHiJrRBwBZf4De-LkrSqpPI8eyjUmAAAAAAAEGAABZf4De-LkrSqpPI8eyjUmAAACLtRvBAAA=",
+          "name": "Third calendar",
+          "color": "lightYellow",
+          "hexColor": "#fde300",
+          "isDefaultCalendar": false,
+          "changeKey": "WX+A3vy5K0qqTyPHso1JgAAAi67hIw==",
+          "canShare": true,
+          "canViewPrivateItems": true,
+          "canEdit": true,
+          "allowedOnlineMeetingProviders": [
+            "teamsForBusiness"
+          ],
+          "defaultOnlineMeetingProvider": "teamsForBusiness",
+          "isTallyingResponses": false,
+          "isRemovable": true,
+          "owner": {
+            "name": "User Name",
+            "address": "test@mail.com"
+          }
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Microsoft Outlook",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "8f4e7775-0476-4506-a183-1365265b446a",
+  "id": "1CYHzBXQw1nfPGtB",
+  "meta": {
+    "instanceId": "b888bd11cd1ddbb95450babf3e199556799d999b896f650de768b8370ee50363"
+  },
+  "tags": []
+}
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
new file mode 100644
index 0000000000000..2ebea471cf20e
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/update.test.ts
@@ -0,0 +1,78 @@
+import type { INodeTypes } from 'n8n-workflow';
+
+import nock from 'nock';
+import * as transport from '../../../../v2/transport';
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+jest.mock('../../../../v2/transport', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		microsoftApiRequest: jest.fn(async function (method: string) {
+			if (method === 'PATCH') {
+				return {
+					'@odata.context':
+						"https://graph.microsoft.com/v1.0/$metadata#users('b834447b-6848-4af9-8390-d2259ce46b74')/calendars/$entity",
+					id: 'AAAXXXYYYnnnT6b9RLP0CKzHiJrRBwBZf4De-LkrSqpPI8eyjUmAAAAAAAEGAABZf4De-LkrSqpPI8eyjUmAAACLtRvGAAA=',
+					name: 'Foo',
+					color: 'lightOrange',
+					hexColor: '#fcab73',
+					isDefaultCalendar: false,
+					changeKey: 'WX+A3vy5K0qqTyPHso1JgAABVtwYKA==',
+					canShare: true,
+					canViewPrivateItems: true,
+					canEdit: true,
+					allowedOnlineMeetingProviders: ['teamsForBusiness'],
+					defaultOnlineMeetingProvider: 'teamsForBusiness',
+					isTallyingResponses: false,
+					isRemovable: true,
+					owner: {
+						name: 'User Name',
+						address: 'test@mail.com',
+					},
+				};
+			}
+		}),
+	};
+});
+
+describe('Test MicrosoftOutlookV2, calendar => update', () => {
+	const workflows = ['nodes/Microsoft/Outlook/test/v2/node/calendar/update.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	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(transport.microsoftApiRequest).toHaveBeenCalledTimes(1);
+		expect(transport.microsoftApiRequest).toHaveBeenCalledWith(
+			'PATCH',
+			'/calendars/AAAXXXYYYnnnT6b9RLP0CKzHiJrRBwBZf4De-LkrSqpPI8eyjUmAAAAAAAEGAABZf4De-LkrSqpPI8eyjUmAAACLtRvGAAA=',
+			{ color: 'lightOrange', isDefaultCalendar: false, name: 'Foo' },
+		);
+
+		expect(result.finished).toEqual(true);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/update.workflow.json b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/update.workflow.json
new file mode 100644
index 0000000000000..6ab4347c87d26
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/update.workflow.json
@@ -0,0 +1,98 @@
+{
+  "name": "My workflow 21",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "e524f588-b6a3-4849-8777-b32a8a755ae5",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        820,
+        360
+      ]
+    },
+    {
+      "parameters": {
+        "resource": "calendar",
+        "operation": "update",
+        "calendarId": {
+          "__rl": true,
+          "value": "AAAXXXYYYnnnT6b9RLP0CKzHiJrRBwBZf4De-LkrSqpPI8eyjUmAAAAAAAEGAABZf4De-LkrSqpPI8eyjUmAAACLtRvGAAA=",
+          "mode": "list",
+          "cachedResultName": "Foo Calendar"
+        },
+        "updateFields": {
+          "color": "lightOrange",
+          "isDefaultCalendar": false,
+          "name": "Foo"
+        }
+      },
+      "id": "baff6798-0304-4255-bdb0-dd3f2659373b",
+      "name": "Microsoft Outlook",
+      "type": "n8n-nodes-base.microsoftOutlook",
+      "typeVersion": 2,
+      "position": [
+        1040,
+        360
+      ],
+      "credentials": {
+        "microsoftOutlookOAuth2Api": {
+          "id": "iXJCki7i5Vz0bdks",
+          "name": "Microsoft Outlook account 2"
+        }
+      }
+    }
+  ],
+  "pinData": {
+    "Microsoft Outlook": [
+      {
+        "json": {
+          "@odata.context": "https://graph.microsoft.com/v1.0/$metadata#users('b834447b-6848-4af9-8390-d2259ce46b74')/calendars/$entity",
+          "id": "AAAXXXYYYnnnT6b9RLP0CKzHiJrRBwBZf4De-LkrSqpPI8eyjUmAAAAAAAEGAABZf4De-LkrSqpPI8eyjUmAAACLtRvGAAA=",
+          "name": "Foo",
+          "color": "lightOrange",
+          "hexColor": "#fcab73",
+          "isDefaultCalendar": false,
+          "changeKey": "WX+A3vy5K0qqTyPHso1JgAABVtwYKA==",
+          "canShare": true,
+          "canViewPrivateItems": true,
+          "canEdit": true,
+          "allowedOnlineMeetingProviders": [
+            "teamsForBusiness"
+          ],
+          "defaultOnlineMeetingProvider": "teamsForBusiness",
+          "isTallyingResponses": false,
+          "isRemovable": true,
+          "owner": {
+            "name": "User Name",
+            "address": "test@mail.com"
+          }
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Microsoft Outlook",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "f8e68e5f-8c26-4c1f-b11b-8b4e4aeaa61f",
+  "id": "1CYHzBXQw1nfPGtB",
+  "meta": {
+    "instanceId": "b888bd11cd1ddbb95450babf3e199556799d999b896f650de768b8370ee50363"
+  },
+  "tags": []
+}
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
new file mode 100644
index 0000000000000..364da5918d5b0
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/contact/create.test.ts
@@ -0,0 +1,107 @@
+import type { INodeTypes } from 'n8n-workflow';
+
+import nock from 'nock';
+import * as transport from '../../../../v2/transport';
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+jest.mock('../../../../v2/transport', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		microsoftApiRequest: jest.fn(async function (method: string) {
+			if (method === 'POST') {
+				return {
+					'@odata.context':
+						"https://graph.microsoft.com/v1.0/$metadata#users('b834447b-6848-4af9-8390-d2259ce46b74')/contacts/$entity",
+					'@odata.etag': 'W/"EQAAABYAAABZf4De/LkrSqpPI8eyjUmAAAFW3Bob"',
+					id: 'AAMkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OABGAAAAAABPLqzvT6b9RLP0CKzHiJrRBwBZf4De-LkrSqpPI8eyjUmAAAAAAAEOAABZf4De-LkrSqpPI8eyjUmAAAFXBCQuAAA=',
+					createdDateTime: '2023-09-04T08:48:39Z',
+					lastModifiedDateTime: '2023-09-04T08:48:39Z',
+					changeKey: 'EQAAABYAAABZf4De/LkrSqpPI8eyjUmAAAFW3Bob',
+					categories: ['blue', 'green'],
+					parentFolderId:
+						'AAMkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OAAuAAAAAABPLqzvT6b9RLP0CKzHiJrRAQBZf4De-LkrSqpPI8eyjUmAAAAAAAEOAAA=',
+					birthday: '1991-09-19T11:59:00Z',
+					fileAs: '',
+					displayName: 'User Name',
+					givenName: 'User',
+					initials: null,
+					middleName: null,
+					nickName: null,
+					surname: 'Name',
+					title: 'Title',
+					yomiGivenName: null,
+					yomiSurname: null,
+					yomiCompanyName: null,
+					generation: null,
+					imAddresses: [],
+					jobTitle: null,
+					companyName: 'Company',
+					department: 'IT',
+					officeLocation: null,
+					profession: null,
+					businessHomePage: null,
+					assistantName: 'Assistant',
+					manager: null,
+					homePhones: [],
+					mobilePhone: null,
+					businessPhones: [],
+					spouseName: null,
+					personalNotes: '',
+					children: [],
+					emailAddresses: [],
+					homeAddress: {},
+					businessAddress: {},
+					otherAddress: {},
+				};
+			}
+		}),
+	};
+});
+
+describe('Test MicrosoftOutlookV2, contact => create', () => {
+	const workflows = ['nodes/Microsoft/Outlook/test/v2/node/contact/create.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	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(transport.microsoftApiRequest).toHaveBeenCalledTimes(1);
+		expect(transport.microsoftApiRequest).toHaveBeenCalledWith('POST', '/contacts', {
+			assistantName: 'Assistant',
+			birthday: '1991-09-19T21:00:00.000Z',
+			categories: ['blue', 'green'],
+			companyName: 'Company',
+			department: 'IT',
+			displayName: 'User Name',
+			givenName: 'User',
+			surname: 'Name',
+			title: 'Title',
+		});
+
+		expect(result.finished).toEqual(true);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/contact/create.workflow.json b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/contact/create.workflow.json
new file mode 100644
index 0000000000000..cc5893cb51fa5
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/contact/create.workflow.json
@@ -0,0 +1,121 @@
+{
+  "name": "My workflow 21",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "e524f588-b6a3-4849-8777-b32a8a755ae5",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        820,
+        360
+      ]
+    },
+    {
+      "parameters": {
+        "resource": "contact",
+        "operation": "create",
+        "givenName": "User",
+        "surname": "Name",
+        "additionalFields": {
+          "assistantName": "Assistant",
+          "birthday": "1991-09-19T21:00:00.000Z",
+          "categories": "blue, green",
+          "companyName": "Company",
+          "department": "IT",
+          "displayName": "User Name",
+          "title": "Title"
+        }
+      },
+      "id": "baff6798-0304-4255-bdb0-dd3f2659373b",
+      "name": "Microsoft Outlook",
+      "type": "n8n-nodes-base.microsoftOutlook",
+      "typeVersion": 2,
+      "position": [
+        1040,
+        360
+      ],
+      "credentials": {
+        "microsoftOutlookOAuth2Api": {
+          "id": "iXJCki7i5Vz0bdks",
+          "name": "Microsoft Outlook account 2"
+        }
+      }
+    }
+  ],
+  "pinData": {
+    "Microsoft Outlook": [
+      {
+        "json": {
+          "@odata.context": "https://graph.microsoft.com/v1.0/$metadata#users('b834447b-6848-4af9-8390-d2259ce46b74')/contacts/$entity",
+          "@odata.etag": "W/\"EQAAABYAAABZf4De/LkrSqpPI8eyjUmAAAFW3Bob\"",
+          "id": "AAMkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OABGAAAAAABPLqzvT6b9RLP0CKzHiJrRBwBZf4De-LkrSqpPI8eyjUmAAAAAAAEOAABZf4De-LkrSqpPI8eyjUmAAAFXBCQuAAA=",
+          "createdDateTime": "2023-09-04T08:48:39Z",
+          "lastModifiedDateTime": "2023-09-04T08:48:39Z",
+          "changeKey": "EQAAABYAAABZf4De/LkrSqpPI8eyjUmAAAFW3Bob",
+          "categories": [
+            "blue",
+            "green"
+          ],
+          "parentFolderId": "AAMkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OAAuAAAAAABPLqzvT6b9RLP0CKzHiJrRAQBZf4De-LkrSqpPI8eyjUmAAAAAAAEOAAA=",
+          "birthday": "1991-09-19T11:59:00Z",
+          "fileAs": "",
+          "displayName": "User Name",
+          "givenName": "User",
+          "initials": null,
+          "middleName": null,
+          "nickName": null,
+          "surname": "Name",
+          "title": "Title",
+          "yomiGivenName": null,
+          "yomiSurname": null,
+          "yomiCompanyName": null,
+          "generation": null,
+          "imAddresses": [],
+          "jobTitle": null,
+          "companyName": "Company",
+          "department": "IT",
+          "officeLocation": null,
+          "profession": null,
+          "businessHomePage": null,
+          "assistantName": "Assistant",
+          "manager": null,
+          "homePhones": [],
+          "mobilePhone": null,
+          "businessPhones": [],
+          "spouseName": null,
+          "personalNotes": "",
+          "children": [],
+          "emailAddresses": [],
+          "homeAddress": {},
+          "businessAddress": {},
+          "otherAddress": {}
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Microsoft Outlook",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "51df88ff-b679-43df-9129-d1b26ea6b82d",
+  "id": "1CYHzBXQw1nfPGtB",
+  "meta": {
+    "instanceId": "b888bd11cd1ddbb95450babf3e199556799d999b896f650de768b8370ee50363"
+  },
+  "tags": []
+}
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
new file mode 100644
index 0000000000000..13832486e041e
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/contact/update.test.ts
@@ -0,0 +1,118 @@
+import type { INodeTypes } from 'n8n-workflow';
+
+import nock from 'nock';
+import * as transport from '../../../../v2/transport';
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+jest.mock('../../../../v2/transport', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		microsoftApiRequest: jest.fn(async function (method: string) {
+			if (method === 'PATCH') {
+				return {
+					'@odata.context':
+						"https://graph.microsoft.com/v1.0/$metadata#users('b834447b-6848-4af9-8390-d2259ce46b74')/contacts/$entity",
+					'@odata.etag': 'W/"EQAAABYAAABZf4De/LkrSqpPI8eyjUmAAAFW3Bou"',
+					id: 'AAMkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OABGAAAAAABPLqzvT6b9RLP0CKzHiJrRBwBZf4De-LkrSqpPI8eyjUmAAAAAAAEOAABZf4De-LkrSqpPI8eyjUmAAAFXBCQuAAA=',
+					createdDateTime: '2023-09-04T08:48:39Z',
+					lastModifiedDateTime: '2023-09-04T09:06:21Z',
+					changeKey: 'EQAAABYAAABZf4De/LkrSqpPI8eyjUmAAAFW3Bou',
+					categories: ['blue', 'green'],
+					parentFolderId:
+						'AAMkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OAAuAAAAAABPLqzvT6b9RLP0CKzHiJrRAQBZf4De-LkrSqpPI8eyjUmAAAAAAAEOAAA=',
+					birthday: '1991-09-19T11:59:00Z',
+					fileAs: '',
+					displayName: 'Username',
+					givenName: 'User',
+					initials: null,
+					middleName: null,
+					nickName: null,
+					surname: 'Name',
+					title: 'Title',
+					yomiGivenName: null,
+					yomiSurname: null,
+					yomiCompanyName: null,
+					generation: null,
+					imAddresses: [],
+					jobTitle: null,
+					companyName: 'Company',
+					department: 'IT',
+					officeLocation: null,
+					profession: null,
+					businessHomePage: null,
+					assistantName: 'Assistant',
+					manager: 'Manager',
+					homePhones: [],
+					mobilePhone: '',
+					businessPhones: ['999000555777'],
+					spouseName: '',
+					personalNotes: '',
+					children: [],
+					emailAddresses: [],
+					homeAddress: {},
+					businessAddress: {
+						street: 'Street',
+						city: 'City',
+						state: 'State',
+						countryOrRegion: 'Country',
+						postalCode: '777777',
+					},
+					otherAddress: {},
+				};
+			}
+		}),
+	};
+});
+
+describe('Test MicrosoftOutlookV2, contact => update', () => {
+	const workflows = ['nodes/Microsoft/Outlook/test/v2/node/contact/update.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	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(transport.microsoftApiRequest).toHaveBeenCalledTimes(1);
+		expect(transport.microsoftApiRequest).toHaveBeenCalledWith(
+			'PATCH',
+			'/contacts/AAMkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OABGAAAAAABPLqzvT6b9RLP0CKzHiJrRBwBZf4De-LkrSqpPI8eyjUmAAAAAAAEOAABZf4De-LkrSqpPI8eyjUmAAAFXBCQuAAA=',
+			{
+				businessAddress: {
+					city: 'City',
+					countryOrRegion: 'Country',
+					postalCode: '777777',
+					state: 'State',
+					street: 'Street',
+				},
+				businessPhones: ['999000555777'],
+				displayName: 'Username',
+				manager: 'Manager',
+			},
+		);
+
+		expect(result.finished).toEqual(true);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/contact/update.workflow.json b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/contact/update.workflow.json
new file mode 100644
index 0000000000000..82f66ff1cd0fa
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/contact/update.workflow.json
@@ -0,0 +1,138 @@
+{
+  "name": "My workflow 21",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "e524f588-b6a3-4849-8777-b32a8a755ae5",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        820,
+        360
+      ]
+    },
+    {
+      "parameters": {
+        "resource": "contact",
+        "operation": "update",
+        "contactId": {
+          "__rl": true,
+          "value": "AAMkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OABGAAAAAABPLqzvT6b9RLP0CKzHiJrRBwBZf4De-LkrSqpPI8eyjUmAAAAAAAEOAABZf4De-LkrSqpPI8eyjUmAAAFXBCQuAAA=",
+          "mode": "list",
+          "cachedResultName": "User Name"
+        },
+        "additionalFields": {
+          "businessAddress": {
+            "values": {
+              "city": "City",
+              "countryOrRegion": "Country",
+              "postalCode": "777777",
+              "state": "State",
+              "street": "Street"
+            }
+          },
+          "businessPhones": "999000555777",
+          "displayName": "Username",
+          "manager": "Manager"
+        }
+      },
+      "id": "baff6798-0304-4255-bdb0-dd3f2659373b",
+      "name": "Microsoft Outlook",
+      "type": "n8n-nodes-base.microsoftOutlook",
+      "typeVersion": 2,
+      "position": [
+        1040,
+        360
+      ],
+      "credentials": {
+        "microsoftOutlookOAuth2Api": {
+          "id": "iXJCki7i5Vz0bdks",
+          "name": "Microsoft Outlook account 2"
+        }
+      }
+    }
+  ],
+  "pinData": {
+    "Microsoft Outlook": [
+      {
+        "json": {
+          "@odata.context": "https://graph.microsoft.com/v1.0/$metadata#users('b834447b-6848-4af9-8390-d2259ce46b74')/contacts/$entity",
+          "@odata.etag": "W/\"EQAAABYAAABZf4De/LkrSqpPI8eyjUmAAAFW3Bou\"",
+          "id": "AAMkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OABGAAAAAABPLqzvT6b9RLP0CKzHiJrRBwBZf4De-LkrSqpPI8eyjUmAAAAAAAEOAABZf4De-LkrSqpPI8eyjUmAAAFXBCQuAAA=",
+          "createdDateTime": "2023-09-04T08:48:39Z",
+          "lastModifiedDateTime": "2023-09-04T09:06:21Z",
+          "changeKey": "EQAAABYAAABZf4De/LkrSqpPI8eyjUmAAAFW3Bou",
+          "categories": [
+            "blue",
+            "green"
+          ],
+          "parentFolderId": "AAMkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OAAuAAAAAABPLqzvT6b9RLP0CKzHiJrRAQBZf4De-LkrSqpPI8eyjUmAAAAAAAEOAAA=",
+          "birthday": "1991-09-19T11:59:00Z",
+          "fileAs": "",
+          "displayName": "Username",
+          "givenName": "User",
+          "initials": null,
+          "middleName": null,
+          "nickName": null,
+          "surname": "Name",
+          "title": "Title",
+          "yomiGivenName": null,
+          "yomiSurname": null,
+          "yomiCompanyName": null,
+          "generation": null,
+          "imAddresses": [],
+          "jobTitle": null,
+          "companyName": "Company",
+          "department": "IT",
+          "officeLocation": null,
+          "profession": null,
+          "businessHomePage": null,
+          "assistantName": "Assistant",
+          "manager": "Manager",
+          "homePhones": [],
+          "mobilePhone": "",
+          "businessPhones": [
+            "999000555777"
+          ],
+          "spouseName": "",
+          "personalNotes": "",
+          "children": [],
+          "emailAddresses": [],
+          "homeAddress": {},
+          "businessAddress": {
+            "street": "Street",
+            "city": "City",
+            "state": "State",
+            "countryOrRegion": "Country",
+            "postalCode": "777777"
+          },
+          "otherAddress": {}
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Microsoft Outlook",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "842587ce-f153-49ac-8818-d173d4d6aac6",
+  "id": "1CYHzBXQw1nfPGtB",
+  "meta": {
+    "instanceId": "b888bd11cd1ddbb95450babf3e199556799d999b896f650de768b8370ee50363"
+  },
+  "tags": []
+}
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
new file mode 100644
index 0000000000000..b9ca16b504be9
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/draft/create.test.ts
@@ -0,0 +1,147 @@
+import type { INodeTypes } from 'n8n-workflow';
+
+import nock from 'nock';
+import * as transport from '../../../../v2/transport';
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+jest.mock('../../../../v2/transport', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		microsoftApiRequest: jest.fn(async function (method: string) {
+			if (method === 'POST') {
+				return {
+					'@odata.context':
+						"https://graph.microsoft.com/v1.0/$metadata#users('b834447b-6848-4af9-8390-d2259ce46b74')/messages/$entity",
+					'@odata.etag': 'W/"CQAAABYAAABZf4De/LkrSqpPI8eyjUmAAAFW3Bo2"',
+					id: 'AAMkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OABGAAAAAABPLqzvT6b9RLP0CKzHiJrRBwBZf4De-LkrSqpPI8eyjUmAAAAAAAEPAABZf4De-LkrSqpPI8eyjUmAAAFXBDupAAA=',
+					createdDateTime: '2023-09-04T09:18:35Z',
+					lastModifiedDateTime: '2023-09-04T09:18:35Z',
+					changeKey: 'CQAAABYAAABZf4De/LkrSqpPI8eyjUmAAAFW3Bo2',
+					categories: [
+						'd10cd8f9-14ac-460e-a6ec-c40dd1876ea2',
+						'6844a34e-4d23-4805-9fec-38b7f6e1a780',
+						'fbf44fcd-7689-43a0-99c8-2c9faf6d825a',
+					],
+					receivedDateTime: '2023-09-04T09:18:35Z',
+					sentDateTime: '2023-09-04T09:18:35Z',
+					hasAttachments: false,
+					internetMessageId:
+						'<AM0PR10MB21003DD359041CBE7D64DDB6DDE9A@AM0PR10MB2100.EURPRD10.PROD.OUTLOOK.COM>',
+					subject: 'New Draft',
+					bodyPreview: 'draft message',
+					importance: 'normal',
+					parentFolderId:
+						'AAMkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OAAuAAAAAABPLqzvT6b9RLP0CKzHiJrRAQBZf4De-LkrSqpPI8eyjUmAAAAAAAEPAAA=',
+					conversationId:
+						'AAQkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OAAQAKELKTNBg5JJuTnBGaTDyl0=',
+					conversationIndex: 'AQHZ3xDIoQspM0GDkkm5OcEZpMPKXQ==',
+					isDeliveryReceiptRequested: false,
+					isReadReceiptRequested: true,
+					isRead: true,
+					isDraft: true,
+					webLink:
+						'https://outlook.office365.com/owa/?ItemID=AAMkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OABGAAAAAABPLqzvT6b9RLP0CKzHiJrRBwBZf4De%2FLkrSqpPI8eyjUmAAAAAAAEPAABZf4De%2FLkrSqpPI8eyjUmAAAFXBDupAAA%3D&exvsurl=1&viewmodel=ReadMessageItem',
+					inferenceClassification: 'focused',
+					body: {
+						contentType: 'text',
+						content: 'draft message',
+					},
+					toRecipients: [
+						{
+							emailAddress: {
+								name: 'some@mail.com',
+								address: 'some@mail.com',
+							},
+						},
+					],
+					ccRecipients: [],
+					bccRecipients: [
+						{
+							emailAddress: {
+								name: 'name1@mail.com',
+								address: 'name1@mail.com',
+							},
+						},
+						{
+							emailAddress: {
+								name: 'name2@mail.com',
+								address: 'name2@mail.com',
+							},
+						},
+					],
+					replyTo: [
+						{
+							emailAddress: {
+								name: 'reply@mail.com',
+								address: 'reply@mail.com',
+							},
+						},
+					],
+					flag: {
+						flagStatus: 'notFlagged',
+					},
+				};
+			}
+		}),
+	};
+});
+
+describe('Test MicrosoftOutlookV2, draft => create', () => {
+	const workflows = ['nodes/Microsoft/Outlook/test/v2/node/draft/create.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	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(transport.microsoftApiRequest).toHaveBeenCalledTimes(1);
+		expect(transport.microsoftApiRequest).toHaveBeenCalledWith(
+			'POST',
+			'/messages',
+			{
+				bccRecipients: [
+					{ emailAddress: { address: 'name1@mail.com' } },
+					{ emailAddress: { address: 'name2@mail.com' } },
+				],
+				body: { content: 'draft message', contentType: 'Text' },
+				categories: [
+					'd10cd8f9-14ac-460e-a6ec-c40dd1876ea2',
+					'6844a34e-4d23-4805-9fec-38b7f6e1a780',
+					'fbf44fcd-7689-43a0-99c8-2c9faf6d825a',
+				],
+				importance: 'Normal',
+				internetMessageHeaders: [{ name: 'x-my-header', value: 'header value' }],
+				isReadReceiptRequested: true,
+				replyTo: [{ emailAddress: { address: 'reply@mail.com' } }],
+				subject: 'New Draft',
+				toRecipients: [{ emailAddress: { address: 'some@mail.com' } }],
+			},
+			{},
+		);
+
+		expect(result.finished).toEqual(true);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/draft/create.workflow.json b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/draft/create.workflow.json
new file mode 100644
index 0000000000000..d4691956bae93
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/draft/create.workflow.json
@@ -0,0 +1,154 @@
+{
+  "name": "My workflow 21",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "e524f588-b6a3-4849-8777-b32a8a755ae5",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        820,
+        360
+      ]
+    },
+    {
+      "parameters": {
+        "resource": "draft",
+        "subject": "New Draft",
+        "bodyContent": "draft message",
+        "additionalFields": {
+          "bccRecipients": "name1@mail.com, name2@mail.com",
+          "categories": [
+            "d10cd8f9-14ac-460e-a6ec-c40dd1876ea2",
+            "6844a34e-4d23-4805-9fec-38b7f6e1a780",
+            "fbf44fcd-7689-43a0-99c8-2c9faf6d825a"
+          ],
+          "internetMessageHeaders": {
+            "headers": [
+              {
+                "name": "x-my-header",
+                "value": "header value"
+              }
+            ]
+          },
+          "importance": "Normal",
+          "bodyContentType": "Text",
+          "isReadReceiptRequested": true,
+          "replyTo": "reply@mail.com",
+          "toRecipients": "some@mail.com"
+        }
+      },
+      "id": "baff6798-0304-4255-bdb0-dd3f2659373b",
+      "name": "Microsoft Outlook",
+      "type": "n8n-nodes-base.microsoftOutlook",
+      "typeVersion": 2,
+      "position": [
+        1040,
+        360
+      ],
+      "credentials": {
+        "microsoftOutlookOAuth2Api": {
+          "id": "iXJCki7i5Vz0bdks",
+          "name": "Microsoft Outlook account 2"
+        }
+      }
+    }
+  ],
+  "pinData": {
+    "Microsoft Outlook": [
+      {
+        "json": {
+          "@odata.context": "https://graph.microsoft.com/v1.0/$metadata#users('b834447b-6848-4af9-8390-d2259ce46b74')/messages/$entity",
+          "@odata.etag": "W/\"CQAAABYAAABZf4De/LkrSqpPI8eyjUmAAAFW3Bo2\"",
+          "id": "AAMkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OABGAAAAAABPLqzvT6b9RLP0CKzHiJrRBwBZf4De-LkrSqpPI8eyjUmAAAAAAAEPAABZf4De-LkrSqpPI8eyjUmAAAFXBDupAAA=",
+          "createdDateTime": "2023-09-04T09:18:35Z",
+          "lastModifiedDateTime": "2023-09-04T09:18:35Z",
+          "changeKey": "CQAAABYAAABZf4De/LkrSqpPI8eyjUmAAAFW3Bo2",
+          "categories": [
+            "d10cd8f9-14ac-460e-a6ec-c40dd1876ea2",
+            "6844a34e-4d23-4805-9fec-38b7f6e1a780",
+            "fbf44fcd-7689-43a0-99c8-2c9faf6d825a"
+          ],
+          "receivedDateTime": "2023-09-04T09:18:35Z",
+          "sentDateTime": "2023-09-04T09:18:35Z",
+          "hasAttachments": false,
+          "internetMessageId": "<AM0PR10MB21003DD359041CBE7D64DDB6DDE9A@AM0PR10MB2100.EURPRD10.PROD.OUTLOOK.COM>",
+          "subject": "New Draft",
+          "bodyPreview": "draft message",
+          "importance": "normal",
+          "parentFolderId": "AAMkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OAAuAAAAAABPLqzvT6b9RLP0CKzHiJrRAQBZf4De-LkrSqpPI8eyjUmAAAAAAAEPAAA=",
+          "conversationId": "AAQkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OAAQAKELKTNBg5JJuTnBGaTDyl0=",
+          "conversationIndex": "AQHZ3xDIoQspM0GDkkm5OcEZpMPKXQ==",
+          "isDeliveryReceiptRequested": false,
+          "isReadReceiptRequested": true,
+          "isRead": true,
+          "isDraft": true,
+          "webLink": "https://outlook.office365.com/owa/?ItemID=AAMkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OABGAAAAAABPLqzvT6b9RLP0CKzHiJrRBwBZf4De%2FLkrSqpPI8eyjUmAAAAAAAEPAABZf4De%2FLkrSqpPI8eyjUmAAAFXBDupAAA%3D&exvsurl=1&viewmodel=ReadMessageItem",
+          "inferenceClassification": "focused",
+          "body": {
+            "contentType": "text",
+            "content": "draft message"
+          },
+          "toRecipients": [
+            {
+              "emailAddress": {
+                "name": "some@mail.com",
+                "address": "some@mail.com"
+              }
+            }
+          ],
+          "ccRecipients": [],
+          "bccRecipients": [
+            {
+              "emailAddress": {
+                "name": "name1@mail.com",
+                "address": "name1@mail.com"
+              }
+            },
+            {
+              "emailAddress": {
+                "name": "name2@mail.com",
+                "address": "name2@mail.com"
+              }
+            }
+          ],
+          "replyTo": [
+            {
+              "emailAddress": {
+                "name": "reply@mail.com",
+                "address": "reply@mail.com"
+              }
+            }
+          ],
+          "flag": {
+            "flagStatus": "notFlagged"
+          }
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Microsoft Outlook",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "7c801e19-1108-4bae-85f1-902820df8c5e",
+  "id": "1CYHzBXQw1nfPGtB",
+  "meta": {
+    "instanceId": "b888bd11cd1ddbb95450babf3e199556799d999b896f650de768b8370ee50363"
+  },
+  "tags": []
+}
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
new file mode 100644
index 0000000000000..d87f1b66fef05
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/draft/send.test.ts
@@ -0,0 +1,62 @@
+import type { INodeTypes } from 'n8n-workflow';
+
+import nock from 'nock';
+import * as transport from '../../../../v2/transport';
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+jest.mock('../../../../v2/transport', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		microsoftApiRequest: jest.fn(async function (method: string) {
+			if (method === 'POST') {
+				return {};
+			}
+		}),
+	};
+});
+
+describe('Test MicrosoftOutlookV2, draft => send', () => {
+	const workflows = ['nodes/Microsoft/Outlook/test/v2/node/draft/send.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	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(transport.microsoftApiRequest).toHaveBeenCalledTimes(2);
+		expect(transport.microsoftApiRequest).toHaveBeenCalledWith(
+			'PATCH',
+			'/messages/AAMkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OABGAAAAAABPLqzvT6b9RLP0CKzHiJrRBwBZf4De-LkrSqpPI8eyjUmAAAAAAAEPAABZf4De-LkrSqpPI8eyjUmAAAFXBDupAAA=',
+			{ toRecipients: [{ emailAddress: { address: 'michael.k@radency.com' } }] },
+		);
+		expect(transport.microsoftApiRequest).toHaveBeenCalledWith(
+			'POST',
+			'/messages/AAMkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OABGAAAAAABPLqzvT6b9RLP0CKzHiJrRBwBZf4De-LkrSqpPI8eyjUmAAAAAAAEPAABZf4De-LkrSqpPI8eyjUmAAAFXBDupAAA=/send',
+		);
+
+		expect(result.finished).toEqual(true);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/draft/send.workflow.json b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/draft/send.workflow.json
new file mode 100644
index 0000000000000..9d626d76488eb
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/draft/send.workflow.json
@@ -0,0 +1,76 @@
+{
+  "name": "My workflow 21",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "e524f588-b6a3-4849-8777-b32a8a755ae5",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        820,
+        360
+      ]
+    },
+    {
+      "parameters": {
+        "resource": "draft",
+        "operation": "send",
+        "draftId": {
+          "__rl": true,
+          "value": "AAMkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OABGAAAAAABPLqzvT6b9RLP0CKzHiJrRBwBZf4De-LkrSqpPI8eyjUmAAAAAAAEPAABZf4De-LkrSqpPI8eyjUmAAAFXBDupAAA=",
+          "mode": "list",
+          "cachedResultName": "New Draft",
+          "cachedResultUrl": "https://outlook.office365.com/owa/?ItemID=AAMkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OABGAAAAAABPLqzvT6b9RLP0CKzHiJrRBwBZf4De%2FLkrSqpPI8eyjUmAAAAAAAEPAABZf4De%2FLkrSqpPI8eyjUmAAAFXBDupAAA%3D&exvsurl=1&viewmodel=ReadMessageItem"
+        },
+        "to": "michael.k@radency.com"
+      },
+      "id": "baff6798-0304-4255-bdb0-dd3f2659373b",
+      "name": "Microsoft Outlook",
+      "type": "n8n-nodes-base.microsoftOutlook",
+      "typeVersion": 2,
+      "position": [
+        1040,
+        360
+      ],
+      "credentials": {
+        "microsoftOutlookOAuth2Api": {
+          "id": "iXJCki7i5Vz0bdks",
+          "name": "Microsoft Outlook account 2"
+        }
+      }
+    }
+  ],
+  "pinData": {
+    "Microsoft Outlook": [
+      {
+        "json": {
+          "success": true
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Microsoft Outlook",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "4bbe3403-3da7-4e6e-8341-7da5e8433330",
+  "id": "1CYHzBXQw1nfPGtB",
+  "meta": {
+    "instanceId": "b888bd11cd1ddbb95450babf3e199556799d999b896f650de768b8370ee50363"
+  },
+  "tags": []
+}
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
new file mode 100644
index 0000000000000..9ac1296aa4aa7
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/event/create.test.ts
@@ -0,0 +1,155 @@
+import type { INodeTypes } from 'n8n-workflow';
+
+import nock from 'nock';
+import * as transport from '../../../../v2/transport';
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+jest.mock('../../../../v2/transport', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		microsoftApiRequest: jest.fn(async function (method: string) {
+			if (method === 'POST') {
+				return {
+					'@odata.context':
+						"https://graph.microsoft.com/v1.0/$metadata#users('b834447b-6848-4af9-8390-d2259ce46b74')/calendars('AAMkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OABGAAAAAABPLqzvT6b9RLP0CKzHiJrRBwBZf4De-LkrSqpPI8eyjUmAAAAAAAEGAABZf4De-LkrSqpPI8eyjUmAAAAJ9-JDAAA%3D')/events/$entity",
+					'@odata.etag': 'W/"WX+A3vy5K0qqTyPHso1JgAABVtwgEQ=="',
+					id: 'AAMkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OABGAAAAAABPLqzvT6b9RLP0CKzHiJrRBwBZf4De-LkrSqpPI8eyjUmAAAAAAAENAABZf4De-LkrSqpPI8eyjUmAAAFXBFUSAAA=',
+					createdDateTime: '2023-09-04T10:12:47.1985121Z',
+					lastModifiedDateTime: '2023-09-04T10:12:48.2173253Z',
+					changeKey: 'WX+A3vy5K0qqTyPHso1JgAABVtwgEQ==',
+					categories: ['Yellow category', 'Orange category'],
+					transactionId: null,
+					originalStartTimeZone: 'UTC',
+					originalEndTimeZone: 'UTC',
+					iCalUId:
+						'040000008200E00074C5B7101A82E0080000000062DD545A18DFD90100000000000000001000000004C50947C7B42140B29018ABAB42C965',
+					reminderMinutesBeforeStart: 15,
+					isReminderOn: true,
+					hasAttachments: false,
+					subject: 'New Event',
+					bodyPreview:
+						'event description\r\n________________________________________________________________________________\r\nMicrosoft Teams meeting\r\nJoin on your computer, mobile app or room device\r\nClick here to join the meeting\r\nMeeting ID: 355 132 640 047\r\nPasscode: xgUo7v',
+					importance: 'normal',
+					sensitivity: 'personal',
+					isAllDay: false,
+					isCancelled: false,
+					isOrganizer: true,
+					responseRequested: true,
+					seriesMasterId: null,
+					showAs: 'busy',
+					type: 'singleInstance',
+					webLink:
+						'https://outlook.office365.com/owa/?itemid=AAMkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OABGAAAAAABPLqzvT6b9RLP0CKzHiJrRBwBZf4De%2FLkrSqpPI8eyjUmAAAAAAAENAABZf4De%2FLkrSqpPI8eyjUmAAAFXBFUSAAA%3D&exvsurl=1&path=/calendar/item',
+					onlineMeetingUrl: null,
+					isOnlineMeeting: true,
+					onlineMeetingProvider: 'teamsForBusiness',
+					allowNewTimeProposals: true,
+					occurrenceId: null,
+					isDraft: false,
+					hideAttendees: true,
+					responseStatus: {
+						response: 'organizer',
+						time: '0001-01-01T00:00:00Z',
+					},
+					body: {
+						contentType: 'html',
+						content:
+							'<html>\r\n<head>\r\n<meta http-equiv="Content-Type" content="text/html; charset=utf-8">\r\n</head>\r\n<body>\r\nevent description<br>\r\n<div style="width:100%"><span style="white-space:nowrap; color:#5F5F5F; opacity:.36">________________________________________________________________________________</span>\r\n</div>\r\n<div class="me-email-text" lang="en-US" style="color:#252424; font-family:\'Segoe UI\',\'Helvetica Neue\',Helvetica,Arial,sans-serif">\r\n<div style="margin-top:24px; margin-bottom:20px"><span style="font-size:24px; color:#252424">Microsoft Teams meeting</span>\r\n</div>\r\n<div style="margin-bottom:20px">\r\n<div style="margin-top:0px; margin-bottom:0px; font-weight:bold"><span style="font-size:14px; color:#252424">Join on your computer, mobile app or room device</span>\r\n</div>\r\n<a href="https://teams.microsoft.com/l/meetup-join/19%3ameeting_MDZmMzZmYzYtMDc4Yi00NTA2LWE3MTMtZDc5ZDI1M2JmY2M3%40thread.v2/0?context=%7b%22Tid%22%3a%2223786ca6-7ff2-4672-87d0-5c649ee0a337%22%2c%22Oid%22%3a%22b834447b-6848-4af9-8390-d2259ce46b74%22%7d" class="me-email-headline" style="font-size:14px; font-family:\'Segoe UI Semibold\',\'Segoe UI\',\'Helvetica Neue\',Helvetica,Arial,sans-serif; text-decoration:underline; color:#6264a7">Click\r\n here to join the meeting</a> </div>\r\n<div style="margin-bottom:20px; margin-top:20px">\r\n<div style="margin-bottom:4px"><span data-tid="meeting-code" style="font-size:14px; color:#252424">Meeting ID:\r\n<span style="font-size:16px; color:#252424">355 132 640 047</span> </span><br>\r\n<span style="font-size:14px; color:#252424">Passcode: </span><span style="font-size:16px; color:#252424">xgUo7v\r\n</span>\r\n<div style="font-size:14px"><a href="https://www.microsoft.com/en-us/microsoft-teams/download-app" class="me-email-link" style="font-size:14px; text-decoration:underline; color:#6264a7; font-family:\'Segoe UI\',\'Helvetica Neue\',Helvetica,Arial,sans-serif">Download\r\n Teams</a> | <a href="https://www.microsoft.com/microsoft-teams/join-a-meeting" class="me-email-link" style="font-size:14px; text-decoration:underline; color:#6264a7; font-family:\'Segoe UI\',\'Helvetica Neue\',Helvetica,Arial,sans-serif">\r\nJoin on the web</a></div>\r\n</div>\r\n</div>\r\n<div style="margin-bottom:24px; margin-top:20px"><a href="https://aka.ms/JoinTeamsMeeting" class="me-email-link" style="font-size:14px; text-decoration:underline; color:#6264a7; font-family:\'Segoe UI\',\'Helvetica Neue\',Helvetica,Arial,sans-serif">Learn More</a>\r\n | <a href="https://teams.microsoft.com/meetingOptions/?organizerId=b834447b-6848-4af9-8390-d2259ce46b74&amp;tenantId=23786ca6-7ff2-4672-87d0-5c649ee0a337&amp;threadId=19_meeting_MDZmMzZmYzYtMDc4Yi00NTA2LWE3MTMtZDc5ZDI1M2JmY2M3@thread.v2&amp;messageId=0&amp;language=en-US" class="me-email-link" style="font-size:14px; text-decoration:underline; color:#6264a7; font-family:\'Segoe UI\',\'Helvetica Neue\',Helvetica,Arial,sans-serif">\r\nMeeting options</a> </div>\r\n</div>\r\n<div style="font-size:14px; margin-bottom:4px; font-family:\'Segoe UI\',\'Helvetica Neue\',Helvetica,Arial,sans-serif">\r\n</div>\r\n<div style="font-size:12px"></div>\r\n<div></div>\r\n<div style="width:100%"><span style="white-space:nowrap; color:#5F5F5F; opacity:.36">________________________________________________________________________________</span>\r\n</div>\r\n</body>\r\n</html>\r\n',
+					},
+					start: {
+						dateTime: '2023-09-05T07:26:47.0000000',
+						timeZone: 'UTC',
+					},
+					end: {
+						dateTime: '2023-09-06T07:56:47.0000000',
+						timeZone: 'UTC',
+					},
+					location: {
+						displayName: 'Microsoft Teams Meeting',
+						locationType: 'default',
+						uniqueId: 'Microsoft Teams Meeting',
+						uniqueIdType: 'private',
+					},
+					locations: [
+						{
+							displayName: 'Microsoft Teams Meeting',
+							locationType: 'default',
+							uniqueId: 'Microsoft Teams Meeting',
+							uniqueIdType: 'private',
+						},
+					],
+					recurrence: null,
+					attendees: [],
+					organizer: {
+						emailAddress: {
+							name: 'Michael Kret',
+							address: 'MichaelDevSandbox@5w1hb7.onmicrosoft.com',
+						},
+					},
+					onlineMeeting: {
+						joinUrl:
+							'https://teams.microsoft.com/l/meetup-join/19%3ameeting_MDZmMzZmYzYtMDc4Yi00NTA2LWE3MTMtZDc5ZDI1M2JmY2M3%40thread.v2/0?context=%7b%22Tid%22%3a%2223786ca6-7ff2-4672-87d0-5c649ee0a337%22%2c%22Oid%22%3a%22b834447b-6848-4af9-8390-d2259ce46b74%22%7d',
+					},
+				};
+			}
+		}),
+	};
+});
+
+describe('Test MicrosoftOutlookV2, contact => event', () => {
+	const workflows = ['nodes/Microsoft/Outlook/test/v2/node/event/create.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	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(transport.microsoftApiRequest).toHaveBeenCalledTimes(1);
+		expect(transport.microsoftApiRequest).toHaveBeenCalledWith(
+			'POST',
+			'/calendars/AAMkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OABGAAAAAABPLqzvT6b9RLP0CKzHiJrRBwBZf4De-LkrSqpPI8eyjUmAAAAAAAEGAABZf4De-LkrSqpPI8eyjUmAAAAJ9-JDAAA=/events',
+			{
+				body: { content: 'event description', contentType: 'html' },
+				bodyPreview: 'preview',
+				categories: ['Yellow category', 'Orange category'],
+				end: { dateTime: '2023-09-06T07:56:47.000Z', timeZone: 'UTC' },
+				hideAttendees: true,
+				importance: 'normal',
+				isAllDay: false,
+				isCancelled: false,
+				isDraft: false,
+				isOnlineMeeting: true,
+				sensitivity: 'personal',
+				showAs: 'busy',
+				start: { dateTime: '2023-09-05T07:26:47.000Z', timeZone: 'UTC' },
+				subject: 'New Event',
+				type: 'occurrence',
+			},
+		);
+
+		expect(result.finished).toEqual(true);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/event/create.workflow.json b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/event/create.workflow.json
new file mode 100644
index 0000000000000..78ac7a7781c06
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/event/create.workflow.json
@@ -0,0 +1,170 @@
+{
+  "name": "My workflow 21",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "e524f588-b6a3-4849-8777-b32a8a755ae5",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        820,
+        360
+      ]
+    },
+    {
+      "parameters": {
+        "resource": "event",
+        "operation": "create",
+        "calendarId": {
+          "__rl": true,
+          "value": "AAMkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OABGAAAAAABPLqzvT6b9RLP0CKzHiJrRBwBZf4De-LkrSqpPI8eyjUmAAAAAAAEGAABZf4De-LkrSqpPI8eyjUmAAAAJ9-JDAAA=",
+          "mode": "list",
+          "cachedResultName": "Calendar"
+        },
+        "subject": "New Event",
+        "startDateTime": "2023-09-05T07:26:47.000Z",
+        "endDateTime": "2023-09-06T07:56:47.000Z",
+        "additionalFields": {
+          "categories": [
+            "Yellow category",
+            "Orange category"
+          ],
+          "body": "event description",
+          "bodyPreview": "preview",
+          "hideAttendees": true,
+          "importance": "normal",
+          "isAllDay": false,
+          "isCancelled": false,
+          "isDraft": false,
+          "isOnlineMeeting": true,
+          "sensitivity": "personal",
+          "showAs": "busy",
+          "type": "occurrence"
+        }
+      },
+      "id": "baff6798-0304-4255-bdb0-dd3f2659373b",
+      "name": "Microsoft Outlook",
+      "type": "n8n-nodes-base.microsoftOutlook",
+      "typeVersion": 2,
+      "position": [
+        1040,
+        360
+      ],
+      "credentials": {
+        "microsoftOutlookOAuth2Api": {
+          "id": "iXJCki7i5Vz0bdks",
+          "name": "Microsoft Outlook account 2"
+        }
+      }
+    }
+  ],
+  "pinData": {
+    "Microsoft Outlook": [
+      {
+        "json": {
+          "@odata.context": "https://graph.microsoft.com/v1.0/$metadata#users('b834447b-6848-4af9-8390-d2259ce46b74')/calendars('AAMkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OABGAAAAAABPLqzvT6b9RLP0CKzHiJrRBwBZf4De-LkrSqpPI8eyjUmAAAAAAAEGAABZf4De-LkrSqpPI8eyjUmAAAAJ9-JDAAA%3D')/events/$entity",
+          "@odata.etag": "W/\"WX+A3vy5K0qqTyPHso1JgAABVtwgEQ==\"",
+          "id": "AAMkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OABGAAAAAABPLqzvT6b9RLP0CKzHiJrRBwBZf4De-LkrSqpPI8eyjUmAAAAAAAENAABZf4De-LkrSqpPI8eyjUmAAAFXBFUSAAA=",
+          "createdDateTime": "2023-09-04T10:12:47.1985121Z",
+          "lastModifiedDateTime": "2023-09-04T10:12:48.2173253Z",
+          "changeKey": "WX+A3vy5K0qqTyPHso1JgAABVtwgEQ==",
+          "categories": [
+            "Yellow category",
+            "Orange category"
+          ],
+          "transactionId": null,
+          "originalStartTimeZone": "UTC",
+          "originalEndTimeZone": "UTC",
+          "iCalUId": "040000008200E00074C5B7101A82E0080000000062DD545A18DFD90100000000000000001000000004C50947C7B42140B29018ABAB42C965",
+          "reminderMinutesBeforeStart": 15,
+          "isReminderOn": true,
+          "hasAttachments": false,
+          "subject": "New Event",
+          "bodyPreview": "event description\r\n________________________________________________________________________________\r\nMicrosoft Teams meeting\r\nJoin on your computer, mobile app or room device\r\nClick here to join the meeting\r\nMeeting ID: 355 132 640 047\r\nPasscode: xgUo7v",
+          "importance": "normal",
+          "sensitivity": "personal",
+          "isAllDay": false,
+          "isCancelled": false,
+          "isOrganizer": true,
+          "responseRequested": true,
+          "seriesMasterId": null,
+          "showAs": "busy",
+          "type": "singleInstance",
+          "webLink": "https://outlook.office365.com/owa/?itemid=AAMkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OABGAAAAAABPLqzvT6b9RLP0CKzHiJrRBwBZf4De%2FLkrSqpPI8eyjUmAAAAAAAENAABZf4De%2FLkrSqpPI8eyjUmAAAFXBFUSAAA%3D&exvsurl=1&path=/calendar/item",
+          "onlineMeetingUrl": null,
+          "isOnlineMeeting": true,
+          "onlineMeetingProvider": "teamsForBusiness",
+          "allowNewTimeProposals": true,
+          "occurrenceId": null,
+          "isDraft": false,
+          "hideAttendees": true,
+          "responseStatus": {
+            "response": "organizer",
+            "time": "0001-01-01T00:00:00Z"
+          },
+          "body": {
+            "contentType": "html",
+            "content": "<html>\r\n<head>\r\n<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">\r\n</head>\r\n<body>\r\nevent description<br>\r\n<div style=\"width:100%\"><span style=\"white-space:nowrap; color:#5F5F5F; opacity:.36\">________________________________________________________________________________</span>\r\n</div>\r\n<div class=\"me-email-text\" lang=\"en-US\" style=\"color:#252424; font-family:'Segoe UI','Helvetica Neue',Helvetica,Arial,sans-serif\">\r\n<div style=\"margin-top:24px; margin-bottom:20px\"><span style=\"font-size:24px; color:#252424\">Microsoft Teams meeting</span>\r\n</div>\r\n<div style=\"margin-bottom:20px\">\r\n<div style=\"margin-top:0px; margin-bottom:0px; font-weight:bold\"><span style=\"font-size:14px; color:#252424\">Join on your computer, mobile app or room device</span>\r\n</div>\r\n<a href=\"https://teams.microsoft.com/l/meetup-join/19%3ameeting_MDZmMzZmYzYtMDc4Yi00NTA2LWE3MTMtZDc5ZDI1M2JmY2M3%40thread.v2/0?context=%7b%22Tid%22%3a%2223786ca6-7ff2-4672-87d0-5c649ee0a337%22%2c%22Oid%22%3a%22b834447b-6848-4af9-8390-d2259ce46b74%22%7d\" class=\"me-email-headline\" style=\"font-size:14px; font-family:'Segoe UI Semibold','Segoe UI','Helvetica Neue',Helvetica,Arial,sans-serif; text-decoration:underline; color:#6264a7\">Click\r\n here to join the meeting</a> </div>\r\n<div style=\"margin-bottom:20px; margin-top:20px\">\r\n<div style=\"margin-bottom:4px\"><span data-tid=\"meeting-code\" style=\"font-size:14px; color:#252424\">Meeting ID:\r\n<span style=\"font-size:16px; color:#252424\">355 132 640 047</span> </span><br>\r\n<span style=\"font-size:14px; color:#252424\">Passcode: </span><span style=\"font-size:16px; color:#252424\">xgUo7v\r\n</span>\r\n<div style=\"font-size:14px\"><a href=\"https://www.microsoft.com/en-us/microsoft-teams/download-app\" class=\"me-email-link\" style=\"font-size:14px; text-decoration:underline; color:#6264a7; font-family:'Segoe UI','Helvetica Neue',Helvetica,Arial,sans-serif\">Download\r\n Teams</a> | <a href=\"https://www.microsoft.com/microsoft-teams/join-a-meeting\" class=\"me-email-link\" style=\"font-size:14px; text-decoration:underline; color:#6264a7; font-family:'Segoe UI','Helvetica Neue',Helvetica,Arial,sans-serif\">\r\nJoin on the web</a></div>\r\n</div>\r\n</div>\r\n<div style=\"margin-bottom:24px; margin-top:20px\"><a href=\"https://aka.ms/JoinTeamsMeeting\" class=\"me-email-link\" style=\"font-size:14px; text-decoration:underline; color:#6264a7; font-family:'Segoe UI','Helvetica Neue',Helvetica,Arial,sans-serif\">Learn More</a>\r\n | <a href=\"https://teams.microsoft.com/meetingOptions/?organizerId=b834447b-6848-4af9-8390-d2259ce46b74&amp;tenantId=23786ca6-7ff2-4672-87d0-5c649ee0a337&amp;threadId=19_meeting_MDZmMzZmYzYtMDc4Yi00NTA2LWE3MTMtZDc5ZDI1M2JmY2M3@thread.v2&amp;messageId=0&amp;language=en-US\" class=\"me-email-link\" style=\"font-size:14px; text-decoration:underline; color:#6264a7; font-family:'Segoe UI','Helvetica Neue',Helvetica,Arial,sans-serif\">\r\nMeeting options</a> </div>\r\n</div>\r\n<div style=\"font-size:14px; margin-bottom:4px; font-family:'Segoe UI','Helvetica Neue',Helvetica,Arial,sans-serif\">\r\n</div>\r\n<div style=\"font-size:12px\"></div>\r\n<div></div>\r\n<div style=\"width:100%\"><span style=\"white-space:nowrap; color:#5F5F5F; opacity:.36\">________________________________________________________________________________</span>\r\n</div>\r\n</body>\r\n</html>\r\n"
+          },
+          "start": {
+            "dateTime": "2023-09-05T07:26:47.0000000",
+            "timeZone": "UTC"
+          },
+          "end": {
+            "dateTime": "2023-09-06T07:56:47.0000000",
+            "timeZone": "UTC"
+          },
+          "location": {
+            "displayName": "Microsoft Teams Meeting",
+            "locationType": "default",
+            "uniqueId": "Microsoft Teams Meeting",
+            "uniqueIdType": "private"
+          },
+          "locations": [
+            {
+              "displayName": "Microsoft Teams Meeting",
+              "locationType": "default",
+              "uniqueId": "Microsoft Teams Meeting",
+              "uniqueIdType": "private"
+            }
+          ],
+          "recurrence": null,
+          "attendees": [],
+          "organizer": {
+            "emailAddress": {
+              "name": "Michael Kret",
+              "address": "MichaelDevSandbox@5w1hb7.onmicrosoft.com"
+            }
+          },
+          "onlineMeeting": {
+            "joinUrl": "https://teams.microsoft.com/l/meetup-join/19%3ameeting_MDZmMzZmYzYtMDc4Yi00NTA2LWE3MTMtZDc5ZDI1M2JmY2M3%40thread.v2/0?context=%7b%22Tid%22%3a%2223786ca6-7ff2-4672-87d0-5c649ee0a337%22%2c%22Oid%22%3a%22b834447b-6848-4af9-8390-d2259ce46b74%22%7d"
+          }
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Microsoft Outlook",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "dceb08aa-5897-44d1-afbc-748d1e8a2626",
+  "id": "1CYHzBXQw1nfPGtB",
+  "meta": {
+    "instanceId": "b888bd11cd1ddbb95450babf3e199556799d999b896f650de768b8370ee50363"
+  },
+  "tags": []
+}
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
new file mode 100644
index 0000000000000..bcc5826bea751
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/folder/create.test.ts
@@ -0,0 +1,70 @@
+import type { INodeTypes } from 'n8n-workflow';
+
+import nock from 'nock';
+import * as transport from '../../../../v2/transport';
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+jest.mock('../../../../v2/transport', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		microsoftApiRequest: jest.fn(async function (method: string) {
+			if (method === 'POST') {
+				return {
+					'@odata.context':
+						"https://graph.microsoft.com/v1.0/$metadata#users('b834447b-6848-4af9-8390-d2259ce46b74')/mailFolders('AAMkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OAAuAAAAAABPLqzvT6b9RLP0CKzHiJrRAQBZf4De-LkrSqpPI8eyjUmAAAFXBAEGAAA%3D')/childFolders/$entity",
+					id: 'AAMkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OAAuAAAAAABPLqzvT6b9RLP0CKzHiJrRAQBZf4De-LkrSqpPI8eyjUmAAAFXBAEHAAA=',
+					displayName: 'Folder 42',
+					parentFolderId:
+						'AAMkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OAAuAAAAAABPLqzvT6b9RLP0CKzHiJrRAQBZf4De-LkrSqpPI8eyjUmAAAFXBAEGAAA=',
+					childFolderCount: 0,
+					unreadItemCount: 0,
+					totalItemCount: 0,
+					sizeInBytes: 0,
+					isHidden: false,
+				};
+			}
+		}),
+	};
+});
+
+describe('Test MicrosoftOutlookV2, contact => folder', () => {
+	const workflows = ['nodes/Microsoft/Outlook/test/v2/node/folder/create.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	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(transport.microsoftApiRequest).toHaveBeenCalledTimes(1);
+		expect(transport.microsoftApiRequest).toHaveBeenCalledWith(
+			'POST',
+			'/mailFolders/AAMkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OAAuAAAAAABPLqzvT6b9RLP0CKzHiJrRAQBZf4De-LkrSqpPI8eyjUmAAAFXBAEGAAA=/childFolders',
+			{ displayName: 'Folder 42' },
+		);
+
+		expect(result.finished).toEqual(true);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/folder/create.workflow.json b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/folder/create.workflow.json
new file mode 100644
index 0000000000000..43a0032b71da0
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/folder/create.workflow.json
@@ -0,0 +1,85 @@
+{
+  "name": "My workflow 21",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "e524f588-b6a3-4849-8777-b32a8a755ae5",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        820,
+        360
+      ]
+    },
+    {
+      "parameters": {
+        "resource": "folder",
+        "displayName": "Folder 42",
+        "options": {
+          "folderId": {
+            "__rl": true,
+            "value": "AAMkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OAAuAAAAAABPLqzvT6b9RLP0CKzHiJrRAQBZf4De-LkrSqpPI8eyjUmAAAFXBAEGAAA=",
+            "mode": "list",
+            "cachedResultName": "New folder",
+            "cachedResultUrl": "https://outlook.office365.com/mail/AAMkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OAAuAAAAAABPLqzvT6b9RLP0CKzHiJrRAQBZf4De%2FLkrSqpPI8eyjUmAAAFXBAEGAAA%3D"
+          }
+        }
+      },
+      "id": "baff6798-0304-4255-bdb0-dd3f2659373b",
+      "name": "Microsoft Outlook",
+      "type": "n8n-nodes-base.microsoftOutlook",
+      "typeVersion": 2,
+      "position": [
+        1040,
+        360
+      ],
+      "credentials": {
+        "microsoftOutlookOAuth2Api": {
+          "id": "iXJCki7i5Vz0bdks",
+          "name": "Microsoft Outlook account 2"
+        }
+      }
+    }
+  ],
+  "pinData": {
+    "Microsoft Outlook": [
+      {
+        "json": {
+          "@odata.context": "https://graph.microsoft.com/v1.0/$metadata#users('b834447b-6848-4af9-8390-d2259ce46b74')/mailFolders('AAMkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OAAuAAAAAABPLqzvT6b9RLP0CKzHiJrRAQBZf4De-LkrSqpPI8eyjUmAAAFXBAEGAAA%3D')/childFolders/$entity",
+          "id": "AAMkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OAAuAAAAAABPLqzvT6b9RLP0CKzHiJrRAQBZf4De-LkrSqpPI8eyjUmAAAFXBAEHAAA=",
+          "displayName": "Folder 42",
+          "parentFolderId": "AAMkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OAAuAAAAAABPLqzvT6b9RLP0CKzHiJrRAQBZf4De-LkrSqpPI8eyjUmAAAFXBAEGAAA=",
+          "childFolderCount": 0,
+          "unreadItemCount": 0,
+          "totalItemCount": 0,
+          "sizeInBytes": 0,
+          "isHidden": false
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Microsoft Outlook",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "6f7a33a8-d48a-4ae2-ab1c-bbe0a83d376f",
+  "id": "1CYHzBXQw1nfPGtB",
+  "meta": {
+    "instanceId": "b888bd11cd1ddbb95450babf3e199556799d999b896f650de768b8370ee50363"
+  },
+  "tags": []
+}
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
new file mode 100644
index 0000000000000..aff8f0c203e9c
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/folderMessage/getAll.test.ts
@@ -0,0 +1,65 @@
+import type { INodeTypes } from 'n8n-workflow';
+
+import nock from 'nock';
+import * as transport from '../../../../v2/transport';
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+jest.mock('../../../../v2/transport', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		microsoftApiRequestAllItems: jest.fn(async function (method: string) {
+			return [
+				{
+					'@odata.etag': 'W/"CQAAABYAAABZf4De/LkrSqpPI8eyjUmAAAFW3CAj"',
+					id: 'AAMkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OABGAAAAAABPLqzvT6b9RLP0CKzHiJrRBwBZf4De-LkrSqpPI8eyjUmAAAFXBAEHAABZf4De-LkrSqpPI8eyjUmAAAFXBGDUAAA=',
+					subject: 'XXXX',
+					bodyPreview: 'test',
+				},
+			];
+		}),
+	};
+});
+
+describe('Test MicrosoftOutlookV2, folderMessage => getAll', () => {
+	const workflows = ['nodes/Microsoft/Outlook/test/v2/node/folderMessage/getAll.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	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(transport.microsoftApiRequestAllItems).toHaveBeenCalledTimes(1);
+		expect(transport.microsoftApiRequestAllItems).toHaveBeenCalledWith(
+			'value',
+			'GET',
+			'/mailFolders/AAMkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OAAuAAAAAABPLqzvT6b9RLP0CKzHiJrRAQBZf4De-LkrSqpPI8eyjUmAAAFXBAEHAAA=/messages',
+			undefined,
+			{ $select: 'bodyPreview,subject' },
+		);
+
+		expect(result.finished).toEqual(true);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/folderMessage/getAll.workflow.json b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/folderMessage/getAll.workflow.json
new file mode 100644
index 0000000000000..2c451ead0a352
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/folderMessage/getAll.workflow.json
@@ -0,0 +1,84 @@
+{
+  "name": "My workflow 21",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "e524f588-b6a3-4849-8777-b32a8a755ae5",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        820,
+        360
+      ]
+    },
+    {
+      "parameters": {
+        "resource": "folderMessage",
+        "folderId": {
+          "__rl": true,
+          "value": "AAMkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OAAuAAAAAABPLqzvT6b9RLP0CKzHiJrRAQBZf4De-LkrSqpPI8eyjUmAAAFXBAEHAAA=",
+          "mode": "list",
+          "cachedResultName": "Folder 42",
+          "cachedResultUrl": "https://outlook.office365.com/mail/AAMkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OAAuAAAAAABPLqzvT6b9RLP0CKzHiJrRAQBZf4De%2FLkrSqpPI8eyjUmAAAFXBAEHAAA%3D"
+        },
+        "returnAll": true,
+        "output": "fields",
+        "fields": [
+          "bodyPreview",
+          "subject"
+        ],
+        "options": {}
+      },
+      "id": "baff6798-0304-4255-bdb0-dd3f2659373b",
+      "name": "Microsoft Outlook",
+      "type": "n8n-nodes-base.microsoftOutlook",
+      "typeVersion": 2,
+      "position": [
+        1040,
+        360
+      ],
+      "credentials": {
+        "microsoftOutlookOAuth2Api": {
+          "id": "iXJCki7i5Vz0bdks",
+          "name": "Microsoft Outlook account 2"
+        }
+      }
+    }
+  ],
+  "pinData": {
+    "Microsoft Outlook": [
+      {
+        "json": {
+          "@odata.etag": "W/\"CQAAABYAAABZf4De/LkrSqpPI8eyjUmAAAFW3CAj\"",
+          "id": "AAMkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OABGAAAAAABPLqzvT6b9RLP0CKzHiJrRBwBZf4De-LkrSqpPI8eyjUmAAAFXBAEHAABZf4De-LkrSqpPI8eyjUmAAAFXBGDUAAA=",
+          "subject": "XXXX",
+          "bodyPreview": "test"
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Microsoft Outlook",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "63e4c95c-2998-4f3a-bcbc-1dfea015fecb",
+  "id": "1CYHzBXQw1nfPGtB",
+  "meta": {
+    "instanceId": "b888bd11cd1ddbb95450babf3e199556799d999b896f650de768b8370ee50363"
+  },
+  "tags": []
+}
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
new file mode 100644
index 0000000000000..ac1415d23c4e3
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/move.test.ts
@@ -0,0 +1,61 @@
+import type { INodeTypes } from 'n8n-workflow';
+
+import nock from 'nock';
+import * as transport from '../../../../v2/transport';
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+jest.mock('../../../../v2/transport', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		microsoftApiRequest: jest.fn(async function (method: string) {
+			if (method === 'POST') {
+				return {};
+			}
+		}),
+	};
+});
+
+describe('Test MicrosoftOutlookV2, message => move', () => {
+	const workflows = ['nodes/Microsoft/Outlook/test/v2/node/message/move.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	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(transport.microsoftApiRequest).toHaveBeenCalledTimes(1);
+		expect(transport.microsoftApiRequest).toHaveBeenCalledWith(
+			'POST',
+			'/messages/AAMkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OABGAAAAAABPLqzvT6b9RLP0CKzHiJrRBwBZf4De-LkrSqpPI8eyjUmAAAAAAAEJAABZf4De-LkrSqpPI8eyjUmAAAFXBEVwAAA=/move',
+			{
+				destinationId:
+					'AAMkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OAAuAAAAAABPLqzvT6b9RLP0CKzHiJrRAQBZf4De-LkrSqpPI8eyjUmAAAFXBAEHAAA=',
+			},
+		);
+
+		expect(result.finished).toEqual(true);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/move.workflow.json b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/move.workflow.json
new file mode 100644
index 0000000000000..b171498cd5d76
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/move.workflow.json
@@ -0,0 +1,81 @@
+{
+  "name": "My workflow 21",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "e524f588-b6a3-4849-8777-b32a8a755ae5",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        820,
+        360
+      ]
+    },
+    {
+      "parameters": {
+        "operation": "move",
+        "messageId": {
+          "__rl": true,
+          "value": "AAMkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OABGAAAAAABPLqzvT6b9RLP0CKzHiJrRBwBZf4De-LkrSqpPI8eyjUmAAAAAAAEJAABZf4De-LkrSqpPI8eyjUmAAAFXBEVwAAA=",
+          "mode": "list",
+          "cachedResultName": "Hello",
+          "cachedResultUrl": "https://outlook.office365.com/owa/?ItemID=AAMkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OABGAAAAAABPLqzvT6b9RLP0CKzHiJrRBwBZf4De%2FLkrSqpPI8eyjUmAAAAAAAEJAABZf4De%2FLkrSqpPI8eyjUmAAAFXBEVwAAA%3D&exvsurl=1&viewmodel=ReadMessageItem"
+        },
+        "folderId": {
+          "__rl": true,
+          "value": "AAMkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OAAuAAAAAABPLqzvT6b9RLP0CKzHiJrRAQBZf4De-LkrSqpPI8eyjUmAAAFXBAEHAAA=",
+          "mode": "list",
+          "cachedResultName": "Folder 42",
+          "cachedResultUrl": "https://outlook.office365.com/mail/AAMkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OAAuAAAAAABPLqzvT6b9RLP0CKzHiJrRAQBZf4De%2FLkrSqpPI8eyjUmAAAFXBAEHAAA%3D"
+        }
+      },
+      "id": "baff6798-0304-4255-bdb0-dd3f2659373b",
+      "name": "Microsoft Outlook",
+      "type": "n8n-nodes-base.microsoftOutlook",
+      "typeVersion": 2,
+      "position": [
+        1040,
+        360
+      ],
+      "credentials": {
+        "microsoftOutlookOAuth2Api": {
+          "id": "iXJCki7i5Vz0bdks",
+          "name": "Microsoft Outlook account 2"
+        }
+      }
+    }
+  ],
+  "pinData": {
+    "Microsoft Outlook": [
+      {
+        "json": {
+          "success": true
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Microsoft Outlook",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "1434b547-7141-4650-8dce-333dda26e092",
+  "id": "1CYHzBXQw1nfPGtB",
+  "meta": {
+    "instanceId": "b888bd11cd1ddbb95450babf3e199556799d999b896f650de768b8370ee50363"
+  },
+  "tags": []
+}
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
new file mode 100644
index 0000000000000..2f4af23db7d76
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/reply.test.ts
@@ -0,0 +1,128 @@
+import type { INodeTypes } from 'n8n-workflow';
+
+import nock from 'nock';
+import * as transport from '../../../../v2/transport';
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+jest.mock('../../../../v2/transport', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		microsoftApiRequest: jest.fn(async function (method: string) {
+			if (method === 'POST') {
+				return {
+					'@odata.context':
+						"https://graph.microsoft.com/v1.0/$metadata#users('b834447b-6848-4af9-8390-d2259ce46b74')/messages/$entity",
+					'@odata.etag': 'W/"CQAAABYAAABZf4De/LkrSqpPI8eyjUmAAAFW3CX+"',
+					id: 'AAMkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OABGAAAAAABPLqzvT6b9RLP0CKzHiJrRBwBZf4De-LkrSqpPI8eyjUmAAAAAAAEPAABZf4De-LkrSqpPI8eyjUmAAAFXBDurAAA=',
+					createdDateTime: '2023-09-04T12:29:59Z',
+					lastModifiedDateTime: '2023-09-04T12:29:59Z',
+					changeKey: 'CQAAABYAAABZf4De/LkrSqpPI8eyjUmAAAFW3CX+',
+					categories: [],
+					receivedDateTime: '2023-09-04T12:29:59Z',
+					sentDateTime: '2023-09-04T12:29:59Z',
+					hasAttachments: false,
+					internetMessageId:
+						'<AM0PR10MB2100903A148F1623165004E3DDE9A@AM0PR10MB2100.EURPRD10.PROD.OUTLOOK.COM>',
+					subject: 'Reply Subject',
+					bodyPreview: 'Reply message',
+					importance: 'high',
+					parentFolderId:
+						'AAMkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OAAuAAAAAABPLqzvT6b9RLP0CKzHiJrRAQBZf4De-LkrSqpPI8eyjUmAAAAAAAEPAAA=',
+					conversationId:
+						'AAQkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OAAQAKwkQLinj69KtoFOxMG2lVY=',
+					conversationIndex: 'AQHZ3yq3rCRAuKePr0q2gU7EwbaVVrAKmLQ4',
+					isDeliveryReceiptRequested: false,
+					isReadReceiptRequested: false,
+					isRead: true,
+					isDraft: true,
+					webLink:
+						'https://outlook.office365.com/owa/?ItemID=AAMkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OABGAAAAAABPLqzvT6b9RLP0CKzHiJrRBwBZf4De%2FLkrSqpPI8eyjUmAAAAAAAEPAABZf4De%2FLkrSqpPI8eyjUmAAAFXBDurAAA%3D&exvsurl=1&viewmodel=ReadMessageItem',
+					inferenceClassification: 'focused',
+					body: {
+						contentType: 'html',
+						content:
+							'<html><head>\r\n<meta http-equiv="Content-Type" content="text/html; charset=utf-8"></head><body>Reply message </body></html>',
+					},
+					sender: {
+						emailAddress: {
+							name: 'Michael Kret',
+							address: 'MichaelDevSandbox@5w1hb7.onmicrosoft.com',
+						},
+					},
+					from: {
+						emailAddress: {
+							name: 'Michael Kret',
+							address: 'MichaelDevSandbox@5w1hb7.onmicrosoft.com',
+						},
+					},
+					toRecipients: [
+						{
+							emailAddress: {
+								name: 'reply@mail.com',
+								address: 'reply@mail.com',
+							},
+						},
+					],
+					ccRecipients: [],
+					bccRecipients: [],
+					replyTo: [],
+					flag: {
+						flagStatus: 'notFlagged',
+					},
+				};
+			}
+		}),
+	};
+});
+
+describe('Test MicrosoftOutlookV2, message => reply', () => {
+	const workflows = ['nodes/Microsoft/Outlook/test/v2/node/message/reply.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	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(transport.microsoftApiRequest).toHaveBeenCalledTimes(2);
+		expect(transport.microsoftApiRequest).toHaveBeenCalledWith(
+			'POST',
+			'/messages/AAMkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OABGAAAAAABPLqzvT6b9RLP0CKzHiJrRBwBZf4De-LkrSqpPI8eyjUmAAAAAAAEJAABZf4De-LkrSqpPI8eyjUmAAAFXBEVwAAA=/createReply',
+			{
+				message: {
+					body: { content: 'Reply message', contentType: 'html' },
+					importance: 'High',
+					subject: 'Reply Subject',
+				},
+			},
+		);
+		expect(transport.microsoftApiRequest).toHaveBeenCalledWith(
+			'POST',
+			'/messages/AAMkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OABGAAAAAABPLqzvT6b9RLP0CKzHiJrRBwBZf4De-LkrSqpPI8eyjUmAAAAAAAEPAABZf4De-LkrSqpPI8eyjUmAAAFXBDurAAA=/send',
+		);
+
+		expect(result.finished).toEqual(true);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/reply.workflow.json b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/reply.workflow.json
new file mode 100644
index 0000000000000..9df40c729f040
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/reply.workflow.json
@@ -0,0 +1,134 @@
+{
+  "name": "My workflow 21",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "e524f588-b6a3-4849-8777-b32a8a755ae5",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        820,
+        360
+      ]
+    },
+    {
+      "parameters": {
+        "operation": "reply",
+        "messageId": {
+          "__rl": true,
+          "value": "AAMkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OABGAAAAAABPLqzvT6b9RLP0CKzHiJrRBwBZf4De-LkrSqpPI8eyjUmAAAAAAAEJAABZf4De-LkrSqpPI8eyjUmAAAFXBEVwAAA=",
+          "mode": "list",
+          "cachedResultName": "Hello",
+          "cachedResultUrl": "https://outlook.office365.com/owa/?ItemID=AAMkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OABGAAAAAABPLqzvT6b9RLP0CKzHiJrRBwBZf4De%2FLkrSqpPI8eyjUmAAAAAAAEJAABZf4De%2FLkrSqpPI8eyjUmAAAFXBEVwAAA%3D&exvsurl=1&viewmodel=ReadMessageItem"
+        },
+        "replyToSenderOnly": true,
+        "message": "Reply message",
+        "additionalFields": {
+          "importance": "High",
+          "bodyContentType": "html",
+          "subject": "Reply Subject"
+        },
+        "options": {}
+      },
+      "id": "baff6798-0304-4255-bdb0-dd3f2659373b",
+      "name": "Microsoft Outlook",
+      "type": "n8n-nodes-base.microsoftOutlook",
+      "typeVersion": 2,
+      "position": [
+        1040,
+        360
+      ],
+      "credentials": {
+        "microsoftOutlookOAuth2Api": {
+          "id": "iXJCki7i5Vz0bdks",
+          "name": "Microsoft Outlook account 2"
+        }
+      }
+    }
+  ],
+  "pinData": {
+    "Microsoft Outlook": [
+      {
+        "json": {
+          "@odata.context": "https://graph.microsoft.com/v1.0/$metadata#users('b834447b-6848-4af9-8390-d2259ce46b74')/messages/$entity",
+          "@odata.etag": "W/\"CQAAABYAAABZf4De/LkrSqpPI8eyjUmAAAFW3CX+\"",
+          "id": "AAMkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OABGAAAAAABPLqzvT6b9RLP0CKzHiJrRBwBZf4De-LkrSqpPI8eyjUmAAAAAAAEPAABZf4De-LkrSqpPI8eyjUmAAAFXBDurAAA=",
+          "createdDateTime": "2023-09-04T12:29:59Z",
+          "lastModifiedDateTime": "2023-09-04T12:29:59Z",
+          "changeKey": "CQAAABYAAABZf4De/LkrSqpPI8eyjUmAAAFW3CX+",
+          "categories": [],
+          "receivedDateTime": "2023-09-04T12:29:59Z",
+          "sentDateTime": "2023-09-04T12:29:59Z",
+          "hasAttachments": false,
+          "internetMessageId": "<AM0PR10MB2100903A148F1623165004E3DDE9A@AM0PR10MB2100.EURPRD10.PROD.OUTLOOK.COM>",
+          "subject": "Reply Subject",
+          "bodyPreview": "Reply message",
+          "importance": "high",
+          "parentFolderId": "AAMkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OAAuAAAAAABPLqzvT6b9RLP0CKzHiJrRAQBZf4De-LkrSqpPI8eyjUmAAAAAAAEPAAA=",
+          "conversationId": "AAQkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OAAQAKwkQLinj69KtoFOxMG2lVY=",
+          "conversationIndex": "AQHZ3yq3rCRAuKePr0q2gU7EwbaVVrAKmLQ4",
+          "isDeliveryReceiptRequested": false,
+          "isReadReceiptRequested": false,
+          "isRead": true,
+          "isDraft": true,
+          "webLink": "https://outlook.office365.com/owa/?ItemID=AAMkADlhOTA0MTc5LWUwOTMtNDRkZS05NzE0LTNlYmI0ZWM5OWI5OABGAAAAAABPLqzvT6b9RLP0CKzHiJrRBwBZf4De%2FLkrSqpPI8eyjUmAAAAAAAEPAABZf4De%2FLkrSqpPI8eyjUmAAAFXBDurAAA%3D&exvsurl=1&viewmodel=ReadMessageItem",
+          "inferenceClassification": "focused",
+          "body": {
+            "contentType": "html",
+            "content": "<html><head>\r\n<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"></head><body>Reply message </body></html>"
+          },
+          "sender": {
+            "emailAddress": {
+              "name": "Michael Kret",
+              "address": "MichaelDevSandbox@5w1hb7.onmicrosoft.com"
+            }
+          },
+          "from": {
+            "emailAddress": {
+              "name": "Michael Kret",
+              "address": "MichaelDevSandbox@5w1hb7.onmicrosoft.com"
+            }
+          },
+          "toRecipients": [
+            {
+              "emailAddress": {
+                "name": "reply@mail.com",
+                "address": "reply@mail.com"
+              }
+            }
+          ],
+          "ccRecipients": [],
+          "bccRecipients": [],
+          "replyTo": [],
+          "flag": {
+            "flagStatus": "notFlagged"
+          }
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Microsoft Outlook",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "edd34dd1-0321-4d5b-a935-0c47d4c746b8",
+  "id": "1CYHzBXQw1nfPGtB",
+  "meta": {
+    "instanceId": "b888bd11cd1ddbb95450babf3e199556799d999b896f650de768b8370ee50363"
+  },
+  "tags": []
+}
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
new file mode 100644
index 0000000000000..cc5b6e5a43dc0
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/send.test.ts
@@ -0,0 +1,67 @@
+import type { INodeTypes } from 'n8n-workflow';
+
+import nock from 'nock';
+import * as transport from '../../../../v2/transport';
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+jest.mock('../../../../v2/transport', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		microsoftApiRequest: jest.fn(async function (method: string) {
+			if (method === 'POST') {
+				return {};
+			}
+		}),
+	};
+});
+
+describe('Test MicrosoftOutlookV2, message => send', () => {
+	const workflows = ['nodes/Microsoft/Outlook/test/v2/node/message/send.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	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(transport.microsoftApiRequest).toHaveBeenCalledTimes(1);
+		expect(transport.microsoftApiRequest).toHaveBeenCalledWith(
+			'POST',
+			'/sendMail',
+			{
+				message: {
+					body: { content: 'message description', contentType: 'Text' },
+					replyTo: [{ emailAddress: { address: 'reply@mail.com' } }],
+					subject: 'Hello',
+					toRecipients: [{ emailAddress: { address: 'to@mail.com' } }],
+				},
+				saveToSentItems: true,
+			},
+			{},
+		);
+
+		expect(result.finished).toEqual(true);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/send.workflow.json b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/send.workflow.json
new file mode 100644
index 0000000000000..62c3d999f8bd3
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/send.workflow.json
@@ -0,0 +1,73 @@
+{
+  "name": "My workflow 21",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "e524f588-b6a3-4849-8777-b32a8a755ae5",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        820,
+        360
+      ]
+    },
+    {
+      "parameters": {
+        "toRecipients": "to@mail.com",
+        "subject": "Hello",
+        "bodyContent": "message description",
+        "additionalFields": {
+          "bodyContentType": "Text",
+          "replyTo": "reply@mail.com"
+        }
+      },
+      "id": "baff6798-0304-4255-bdb0-dd3f2659373b",
+      "name": "Microsoft Outlook",
+      "type": "n8n-nodes-base.microsoftOutlook",
+      "typeVersion": 2,
+      "position": [
+        1040,
+        360
+      ],
+      "credentials": {
+        "microsoftOutlookOAuth2Api": {
+          "id": "iXJCki7i5Vz0bdks",
+          "name": "Microsoft Outlook account 2"
+        }
+      }
+    }
+  ],
+  "pinData": {
+    "Microsoft Outlook": [
+      {
+        "json": {
+          "success": true
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Microsoft Outlook",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "fed8ec2e-8663-4dfc-8234-33eb83257260",
+  "id": "1CYHzBXQw1nfPGtB",
+  "meta": {
+    "instanceId": "b888bd11cd1ddbb95450babf3e199556799d999b896f650de768b8370ee50363"
+  },
+  "tags": []
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/utils/utils.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/utils/utils.test.ts
new file mode 100644
index 0000000000000..9d3da8937fe99
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/utils/utils.test.ts
@@ -0,0 +1,231 @@
+import {
+	createMessage,
+	makeRecipient,
+	prepareContactFields,
+	prepareFilterString,
+	simplifyOutputMessages,
+} from '../../../v2/helpers/utils';
+
+describe('Test MicrosoftOutlookV2, makeRecipient', () => {
+	it('should create recipient object', () => {
+		const replyTo = 'test1@mail.com, test2@mail.com';
+		const result = replyTo.split(',').map((recipient: string) => {
+			return makeRecipient(recipient.trim());
+		});
+
+		expect(result).toEqual([
+			{
+				emailAddress: {
+					address: 'test1@mail.com',
+				},
+			},
+			{
+				emailAddress: {
+					address: 'test2@mail.com',
+				},
+			},
+		]);
+	});
+});
+
+describe('Test MicrosoftOutlookV2, prepareContactFields', () => {
+	it('should create contact object', () => {
+		const fields = {
+			assistantName: 'Assistant',
+			birthday: '2023-07-31T21:00:00.000Z',
+			businessAddress: {
+				values: {
+					city: 'City',
+					countryOrRegion: 'Country',
+					postalCode: '777777',
+					state: 'State',
+					street: 'Street',
+				},
+			},
+			businessHomePage: 'page.com',
+			categories: 'cat1,cat2',
+			companyName: 'Company',
+		};
+		const result = {
+			assistantName: 'Assistant',
+			birthday: '2023-07-31T21:00:00.000Z',
+			businessAddress: {
+				city: 'City',
+				countryOrRegion: 'Country',
+				postalCode: '777777',
+				state: 'State',
+				street: 'Street',
+			},
+			businessHomePage: 'page.com',
+			categories: ['cat1', 'cat2'],
+			companyName: 'Company',
+		};
+
+		const data = prepareContactFields(fields);
+
+		expect(data).toEqual(result);
+	});
+});
+
+describe('Test MicrosoftOutlookV2, prepareFilterString', () => {
+	it('should create filter string', () => {
+		const filters = {
+			filterBy: 'filters',
+			filters: {
+				custom: 'isRead eq false',
+				hasAttachments: true,
+				foldersToExclude: ['AAAxBBB...='],
+				foldersToInclude: ['DDDxCCC...='],
+				readStatus: 'unread',
+				receivedAfter: '2023-07-31T21:00:00.000Z',
+				receivedBefore: '2023-08-14T21:00:00.000Z',
+				sender: 'test@mail.com',
+			},
+		};
+		const result =
+			"parentFolderId eq 'DDDxCCC...=' and parentFolderId ne 'AAAxBBB...=' and (from/emailAddress/address eq 'test@mail.com' or from/emailAddress/name eq 'test@mail.com') and hasAttachments eq true and isRead eq false and receivedDateTime ge 2023-07-31T21:00:00.000Z and receivedDateTime le 2023-08-14T21:00:00.000Z and isRead eq false";
+
+		const data = prepareFilterString(filters);
+
+		expect(data).toEqual(result);
+	});
+});
+
+describe('Test MicrosoftOutlookV2, simplifyOutputMessages', () => {
+	it('should create recipient object', () => {
+		const responseData = {
+			'@odata.context':
+				"https://graph.microsoft.com/v1.0/$metadata#users('')/messages(id,conversationId,subject,bodyPreview,from,toRecipients,categories,hasAttachments)/$entity",
+			'@odata.etag': 'W/"CQAAABYAAABZf4De/LkrSqpPI8eyjUmAAAFSpKec"',
+			id: 'AAAxBBBxCCC...=',
+			categories: [],
+			hasAttachments: false,
+			subject: 'My draft',
+			bodyPreview:
+				'test\r\n________________________________\r\nFrom: Me\r\nSent: Tuesday, August 29, 2023 7:33:28 AM\r\nTo: from@mail.com <from@mail.com>\r\nSubject: My draft\r\n\r\nthis is a draft',
+			conversationId: 'AAAQQQMMM..=',
+			from: {
+				emailAddress: {
+					name: 'Me',
+					address: 'test@mail.com',
+				},
+			},
+			toRecipients: [
+				{
+					emailAddress: {
+						name: 'Me',
+						address: 'test@mail.com',
+					},
+				},
+			],
+		};
+		const result = [
+			{
+				id: 'AAAxBBBxCCC...=',
+				conversationId: 'AAAQQQMMM..=',
+				subject: 'My draft',
+				bodyPreview:
+					'test\r\n________________________________\r\nFrom: Me\r\nSent: Tuesday, August 29, 2023 7:33:28 AM\r\nTo: from@mail.com <from@mail.com>\r\nSubject: My draft\r\n\r\nthis is a draft',
+				from: 'test@mail.com',
+				to: ['test@mail.com'],
+				categories: [],
+				hasAttachments: false,
+			},
+		];
+
+		const data = simplifyOutputMessages([responseData]);
+
+		expect(data).toEqual(result);
+	});
+});
+
+describe('Test MicrosoftOutlookV2, createMessage', () => {
+	it('should create message object', () => {
+		const fields = {
+			bodyContent: 'Test message',
+			bodyContentType: 'Text',
+			bccRecipients: 'test1@mail.com, test2@mail.com',
+			categories: ['cat1', 'cat2', 'cat3'],
+			ccRecipients: 'test3@mail.com',
+			internetMessageHeaders: [
+				{
+					name: 'customHeader',
+					value: 'customValue',
+				},
+				{
+					name: 'customHeader2',
+					value: 'customValue2',
+				},
+			],
+			from: 'me@mail.com',
+			importance: 'Normal',
+			isReadReceiptRequested: true,
+			replyTo: 'test4@mail.com',
+			subject: 'Test Subject',
+			toRecipients: 'to@mail.com',
+		};
+
+		const result = {
+			body: {
+				content: 'Test message',
+				contentType: 'Text',
+			},
+			bccRecipients: [
+				{
+					emailAddress: {
+						address: 'test1@mail.com',
+					},
+				},
+				{
+					emailAddress: {
+						address: 'test2@mail.com',
+					},
+				},
+			],
+			categories: ['cat1', 'cat2', 'cat3'],
+			ccRecipients: [
+				{
+					emailAddress: {
+						address: 'test3@mail.com',
+					},
+				},
+			],
+			internetMessageHeaders: [
+				{
+					name: 'customHeader',
+					value: 'customValue',
+				},
+				{
+					name: 'customHeader2',
+					value: 'customValue2',
+				},
+			],
+			from: {
+				emailAddress: {
+					address: 'me@mail.com',
+				},
+			},
+			importance: 'Normal',
+			isReadReceiptRequested: true,
+			replyTo: [
+				{
+					emailAddress: {
+						address: 'test4@mail.com',
+					},
+				},
+			],
+			subject: 'Test Subject',
+			toRecipients: [
+				{
+					emailAddress: {
+						address: 'to@mail.com',
+					},
+				},
+			],
+		};
+
+		const message = createMessage(fields);
+
+		expect(message).toEqual(result);
+	});
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/trigger/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/Outlook/trigger/GenericFunctions.ts
new file mode 100644
index 0000000000000..7999c1b8a56dc
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/trigger/GenericFunctions.ts
@@ -0,0 +1,85 @@
+import { NodeApiError } from 'n8n-workflow';
+import type { JsonObject, IDataObject, INodeExecutionData, IPollFunctions } from 'n8n-workflow';
+
+import {
+	downloadAttachments,
+	microsoftApiRequest,
+	microsoftApiRequestAllItems,
+} from '../v2/transport';
+
+import { prepareFilterString, simplifyOutputMessages } from '../v2/helpers/utils';
+
+export async function getPollResponse(
+	this: IPollFunctions,
+	pollStartDate: string,
+	pollEndDate: string,
+) {
+	let responseData;
+	const qs = {} as IDataObject;
+	try {
+		const filters = this.getNodeParameter('filters', {}) as IDataObject;
+		const options = this.getNodeParameter('options', {}) as IDataObject;
+		const output = this.getNodeParameter('output') as string;
+		if (output === 'fields') {
+			const fields = this.getNodeParameter('fields') as string[];
+
+			if (options.downloadAttachments) {
+				fields.push('hasAttachments');
+			}
+
+			qs.$select = fields.join(',');
+		}
+
+		if (output === 'simple') {
+			qs.$select =
+				'id,conversationId,subject,bodyPreview,from,toRecipients,categories,hasAttachments';
+		}
+
+		const filterString = prepareFilterString({ filters });
+
+		if (filterString) {
+			qs.$filter = filterString;
+		}
+
+		const endpoint = '/messages';
+		if (this.getMode() !== 'manual') {
+			if (qs.$filter) {
+				qs.$filter = `${qs.$filter} and receivedDateTime ge ${pollStartDate} and receivedDateTime lt ${pollEndDate}`;
+			} else {
+				qs.$filter = `receivedDateTime ge ${pollStartDate} and receivedDateTime lt ${pollEndDate}`;
+			}
+			responseData = await microsoftApiRequestAllItems.call(
+				this,
+				'value',
+				'GET',
+				endpoint,
+				undefined,
+				qs,
+			);
+		} else {
+			qs.$top = 1;
+			responseData = await microsoftApiRequest.call(this, 'GET', endpoint, undefined, qs);
+			responseData = responseData.value;
+		}
+
+		if (output === 'simple') {
+			responseData = simplifyOutputMessages(responseData as IDataObject[]);
+		}
+
+		let executionData: INodeExecutionData[] = [];
+
+		if (options.downloadAttachments) {
+			const prefix = (options.attachmentsPrefix as string) || 'attachment_';
+			executionData = await downloadAttachments.call(this, responseData as IDataObject[], prefix);
+		} else {
+			executionData = this.helpers.returnJsonArray(responseData as IDataObject[]);
+		}
+
+		return executionData;
+	} catch (error) {
+		throw new NodeApiError(this.getNode(), error as JsonObject, {
+			message: error.message,
+			description: error.description,
+		});
+	}
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/trigger/MessageDescription.ts b/packages/nodes-base/nodes/Microsoft/Outlook/trigger/MessageDescription.ts
new file mode 100644
index 0000000000000..9ff9af88bf6c0
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/trigger/MessageDescription.ts
@@ -0,0 +1,139 @@
+import type { INodeProperties } from 'n8n-workflow';
+import { messageFields } from '../v2/helpers/utils';
+
+export const properties: INodeProperties[] = [
+	{
+		displayName: 'Output',
+		name: 'output',
+		type: 'options',
+		default: 'simple',
+		options: [
+			{
+				name: 'Simplified',
+				value: 'simple',
+			},
+			{
+				name: 'Raw',
+				value: 'raw',
+			},
+			{
+				name: 'Select Included Fields',
+				value: 'fields',
+			},
+		],
+	},
+	{
+		displayName: 'Fields',
+		name: 'fields',
+		type: 'multiOptions',
+		description: 'The fields to add to the output',
+		displayOptions: {
+			show: {
+				output: ['fields'],
+			},
+		},
+		options: messageFields,
+		default: [],
+	},
+	{
+		displayName: 'Filters',
+		name: 'filters',
+		type: 'collection',
+		placeholder: 'Add Filter',
+		default: {},
+		options: [
+			{
+				displayName: 'Filter Query',
+				name: 'custom',
+				type: 'string',
+				default: '',
+				placeholder: 'e.g. isRead eq false',
+				hint: 'Search query to filter messages. <a href="https://learn.microsoft.com/en-us/graph/filter-query-parameter">More info</a>.',
+			},
+			{
+				displayName: 'Has Attachments',
+				name: 'hasAttachments',
+				type: 'boolean',
+				default: false,
+			},
+			{
+				displayName: 'Folders to Exclude',
+				name: 'foldersToExclude',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getFolders',
+				},
+				default: [],
+				description:
+					'Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
+			},
+			{
+				displayName: 'Folders to Include',
+				name: 'foldersToInclude',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getFolders',
+				},
+				default: [],
+				description:
+					'Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
+			},
+			{
+				displayName: 'Read Status',
+				name: 'readStatus',
+				type: 'options',
+				default: 'unread',
+				hint: 'Filter messages by whether they have been read or not',
+				options: [
+					{
+						// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+						name: 'Unread and read messages',
+						value: 'both',
+					},
+					{
+						// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+						name: 'Unread messages only',
+						value: 'unread',
+					},
+					{
+						// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+						name: 'Read messages only',
+						value: 'read',
+					},
+				],
+			},
+			{
+				displayName: 'Sender',
+				name: 'sender',
+				type: 'string',
+				default: '',
+				description: 'Sender name or email to filter by',
+			},
+		],
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			{
+				displayName: 'Attachments Prefix',
+				name: 'attachmentsPrefix',
+				type: 'string',
+				default: 'attachment_',
+				description:
+					'Prefix for name of the output fields to put the binary files data in. An index starting from 0 will be added. So if name is "attachment_" the first attachment is saved to "attachment_0".',
+			},
+			{
+				displayName: 'Download Attachments',
+				name: 'downloadAttachments',
+				type: 'boolean',
+				default: false,
+				description:
+					"Whether the message's attachments will be downloaded and included in the output",
+			},
+		],
+	},
+];
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/DraftDescription.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v1/DraftDescription.ts
similarity index 100%
rename from packages/nodes-base/nodes/Microsoft/Outlook/DraftDescription.ts
rename to packages/nodes-base/nodes/Microsoft/Outlook/v1/DraftDescription.ts
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/DraftMessageSharedDescription.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v1/DraftMessageSharedDescription.ts
similarity index 100%
rename from packages/nodes-base/nodes/Microsoft/Outlook/DraftMessageSharedDescription.ts
rename to packages/nodes-base/nodes/Microsoft/Outlook/v1/DraftMessageSharedDescription.ts
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/FolderDescription.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v1/FolderDescription.ts
similarity index 100%
rename from packages/nodes-base/nodes/Microsoft/Outlook/FolderDescription.ts
rename to packages/nodes-base/nodes/Microsoft/Outlook/v1/FolderDescription.ts
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/FolderMessageDecription.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v1/FolderMessageDecription.ts
similarity index 100%
rename from packages/nodes-base/nodes/Microsoft/Outlook/FolderMessageDecription.ts
rename to packages/nodes-base/nodes/Microsoft/Outlook/v1/FolderMessageDecription.ts
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v1/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v1/GenericFunctions.ts
new file mode 100644
index 0000000000000..b29c295f98c19
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v1/GenericFunctions.ts
@@ -0,0 +1,244 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	IHttpRequestMethods,
+	ILoadOptionsFunctions,
+	INodeExecutionData,
+	IRequestOptions,
+	JsonObject,
+} from 'n8n-workflow';
+import { BINARY_ENCODING, NodeApiError } from 'n8n-workflow';
+
+export async function microsoftApiRequest(
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
+	resource: string,
+
+	body: any = {},
+	qs: IDataObject = {},
+	uri?: string,
+	headers: IDataObject = {},
+	option: IDataObject = { json: true },
+): Promise<any> {
+	const credentials = await this.getCredentials('microsoftOutlookOAuth2Api');
+
+	let apiUrl = `https://graph.microsoft.com/v1.0/me${resource}`;
+	// If accessing shared mailbox
+	if (credentials.useShared && credentials.userPrincipalName) {
+		apiUrl = `https://graph.microsoft.com/v1.0/users/${credentials.userPrincipalName}${resource}`;
+	}
+
+	const options: IRequestOptions = {
+		headers: {
+			'Content-Type': 'application/json',
+		},
+		method,
+		body,
+		qs,
+		uri: uri || apiUrl,
+	};
+	try {
+		Object.assign(options, option);
+
+		if (Object.keys(headers).length !== 0) {
+			options.headers = Object.assign({}, options.headers, headers);
+		}
+
+		if (Object.keys(body as IDataObject).length === 0) {
+			delete options.body;
+		}
+
+		return await this.helpers.requestOAuth2.call(this, 'microsoftOutlookOAuth2Api', options);
+	} catch (error) {
+		throw new NodeApiError(this.getNode(), error as JsonObject);
+	}
+}
+
+export async function microsoftApiRequestAllItems(
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	propertyName: string,
+	method: IHttpRequestMethods,
+	endpoint: string,
+
+	body: any = {},
+	query: IDataObject = {},
+	headers: IDataObject = {},
+): Promise<any> {
+	const returnData: IDataObject[] = [];
+
+	let responseData;
+	let uri: string | undefined;
+	query.$top = 100;
+
+	do {
+		responseData = await microsoftApiRequest.call(
+			this,
+			method,
+			endpoint,
+			body,
+			query,
+			uri,
+			headers,
+		);
+		uri = responseData['@odata.nextLink'];
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
+	} while (responseData['@odata.nextLink'] !== undefined);
+
+	return returnData;
+}
+
+export async function microsoftApiRequestAllItemsSkip(
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	propertyName: string,
+	method: IHttpRequestMethods,
+	endpoint: string,
+
+	body: any = {},
+	query: IDataObject = {},
+	headers: IDataObject = {},
+): Promise<any> {
+	const returnData: IDataObject[] = [];
+
+	let responseData;
+	query.$top = 100;
+	query.$skip = 0;
+
+	do {
+		responseData = await microsoftApiRequest.call(
+			this,
+			method,
+			endpoint,
+			body,
+			query,
+			undefined,
+			headers,
+		);
+		query.$skip += query.$top;
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
+	} while (responseData.value.length !== 0);
+
+	return returnData;
+}
+
+export function makeRecipient(email: string) {
+	return {
+		emailAddress: {
+			address: email,
+		},
+	};
+}
+
+export function createMessage(fields: IDataObject) {
+	const message: IDataObject = {};
+
+	// Create body object
+	if (fields.bodyContent || fields.bodyContentType) {
+		const bodyObject = {
+			content: fields.bodyContent,
+			contentType: fields.bodyContentType,
+		};
+
+		message.body = bodyObject;
+		delete fields.bodyContent;
+		delete fields.bodyContentType;
+	}
+
+	// Handle custom headers
+	if (
+		'internetMessageHeaders' in fields &&
+		'headers' in (fields.internetMessageHeaders as IDataObject)
+	) {
+		fields.internetMessageHeaders = (fields.internetMessageHeaders as IDataObject).headers;
+	}
+
+	// Handle recipient fields
+	['bccRecipients', 'ccRecipients', 'replyTo', 'sender', 'toRecipients'].forEach((key) => {
+		if (Array.isArray(fields[key])) {
+			fields[key] = (fields[key] as string[]).map((email) => makeRecipient(email));
+		} else if (fields[key] !== undefined) {
+			fields[key] = (fields[key] as string)
+				.split(',')
+				.map((recipient: string) => makeRecipient(recipient));
+		}
+	});
+
+	['from', 'sender'].forEach((key) => {
+		if (fields[key] !== undefined) {
+			fields[key] = makeRecipient(fields[key] as string);
+		}
+	});
+
+	Object.assign(message, fields);
+
+	return message;
+}
+
+export async function downloadAttachments(
+	this: IExecuteFunctions,
+	messages: IDataObject[] | IDataObject,
+	prefix: string,
+) {
+	const elements: INodeExecutionData[] = [];
+	if (!Array.isArray(messages)) {
+		messages = [messages];
+	}
+	for (const message of messages) {
+		const element: INodeExecutionData = {
+			json: message,
+			binary: {},
+		};
+		if (message.hasAttachments === true) {
+			const attachments = await microsoftApiRequestAllItems.call(
+				this,
+				'value',
+				'GET',
+				`/messages/${message.id}/attachments`,
+				{},
+			);
+			for (const [index, attachment] of attachments.entries()) {
+				const response = await microsoftApiRequest.call(
+					this,
+					'GET',
+					`/messages/${message.id}/attachments/${attachment.id}/$value`,
+					undefined,
+					{},
+					undefined,
+					{},
+					{ encoding: null, resolveWithFullResponse: true },
+				);
+
+				const data = Buffer.from(response.body as string, 'utf8');
+				element.binary![`${prefix}${index}`] = await this.helpers.prepareBinaryData(
+					data as unknown as Buffer,
+					attachment.name as string,
+					attachment.contentType as string,
+				);
+			}
+		}
+		if (Object.keys(element.binary!).length === 0) {
+			delete element.binary;
+		}
+		elements.push(element);
+	}
+	return elements;
+}
+
+export async function binaryToAttachments(
+	this: IExecuteFunctions,
+	attachments: IDataObject[],
+	items: INodeExecutionData[],
+	i: number,
+) {
+	return await Promise.all(
+		attachments.map(async (attachment) => {
+			const binaryPropertyName = attachment.binaryPropertyName as string;
+			const binaryData = this.helpers.assertBinaryData(i, binaryPropertyName);
+			const dataBuffer = await this.helpers.getBinaryDataBuffer(i, binaryPropertyName);
+			return {
+				'@odata.type': '#microsoft.graph.fileAttachment',
+				name: binaryData.fileName,
+				contentBytes: dataBuffer.toString(BINARY_ENCODING),
+			};
+		}),
+	);
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/MessageAttachmentDescription.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v1/MessageAttachmentDescription.ts
similarity index 96%
rename from packages/nodes-base/nodes/Microsoft/Outlook/MessageAttachmentDescription.ts
rename to packages/nodes-base/nodes/Microsoft/Outlook/v1/MessageAttachmentDescription.ts
index 7669c2d890300..b374a7c1f7e48 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/MessageAttachmentDescription.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v1/MessageAttachmentDescription.ts
@@ -106,9 +106,9 @@ export const messageAttachmentFields: INodeProperties[] = [
 
 	// File operations
 	{
-		displayName: 'Binary Property',
+		displayName: 'Put Output File in Field',
 		name: 'binaryPropertyName',
-		description: 'Name of the binary property to which to write the data of the read file',
+		hint: 'The name of the output binary field to put the file in',
 		type: 'string',
 		required: true,
 		default: 'data',
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v1/MessageDescription.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v1/MessageDescription.ts
new file mode 100644
index 0000000000000..a490489c723ba
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v1/MessageDescription.ts
@@ -0,0 +1,591 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+export const messageOperations: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				resource: ['message'],
+			},
+		},
+		options: [
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a message',
+				action: 'Delete a message',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get a single message',
+				action: 'Get a message',
+			},
+			{
+				name: 'Get Many',
+				value: 'getAll',
+				description: "Get many messages in the signed-in user's mailbox",
+				action: 'Get many messages',
+			},
+			{
+				name: 'Get MIME Content',
+				value: 'getMime',
+				description: 'Get MIME content of a message',
+				action: 'Get MIME Content of a message',
+			},
+			{
+				name: 'Move',
+				value: 'move',
+				description: 'Move a message',
+				action: 'Move a message',
+			},
+			{
+				name: 'Reply',
+				value: 'reply',
+				description: 'Create reply to a message',
+				action: 'Reply to a message',
+			},
+			{
+				name: 'Send',
+				value: 'send',
+				description: 'Send a message',
+				action: 'Send a message',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update a message',
+				action: 'Update a message',
+			},
+		],
+		default: 'send',
+	},
+];
+
+export const messageFields: INodeProperties[] = [
+	{
+		displayName: 'Message ID',
+		name: 'messageId',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: ['message'],
+				operation: [
+					'addAttachment',
+					'delete',
+					'get',
+					'getAttachment',
+					'getMime',
+					'move',
+					'update',
+					'reply',
+				],
+			},
+		},
+	},
+
+	// message:reply
+	{
+		displayName: 'Reply Type',
+		name: 'replyType',
+		type: 'options',
+		options: [
+			{
+				name: 'Reply',
+				value: 'reply',
+			},
+			{
+				name: 'Reply All',
+				value: 'replyAll',
+			},
+		],
+		default: 'reply',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: ['message'],
+				operation: ['reply'],
+			},
+		},
+	},
+	{
+		displayName: 'Comment',
+		name: 'comment',
+		description: 'A comment to include. Can be an empty string.',
+		displayOptions: {
+			show: {
+				resource: ['message'],
+				operation: ['reply'],
+			},
+		},
+		type: 'string',
+		default: '',
+	},
+	{
+		displayName: 'Send',
+		name: 'send',
+		description:
+			'Whether to send the reply message directly. If not set, it will be saved as draft.',
+		displayOptions: {
+			show: {
+				resource: ['message'],
+				operation: ['reply'],
+			},
+		},
+		type: 'boolean',
+		default: true,
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['message'],
+				operation: ['reply'],
+				replyType: ['reply'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Attachments',
+				name: 'attachments',
+				type: 'fixedCollection',
+				placeholder: 'Add Attachment',
+				default: {},
+				typeOptions: {
+					multipleValues: true,
+				},
+				options: [
+					{
+						name: 'attachments',
+						displayName: 'Attachment',
+						values: [
+							{
+								displayName: 'Binary Property Name',
+								name: 'binaryPropertyName',
+								type: 'string',
+								default: '',
+								description:
+									'Name of the binary property containing the data to be added to the email as an attachment',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'BCC Recipients',
+				name: 'bccRecipients',
+				description: 'Email addresses of BCC recipients',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Body Content',
+				name: 'bodyContent',
+				description: 'Message body content',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Body Content Type',
+				name: 'bodyContentType',
+				description: 'Message body content type',
+				type: 'options',
+				options: [
+					{
+						name: 'HTML',
+						value: 'html',
+					},
+					{
+						name: 'Text',
+						value: 'Text',
+					},
+				],
+				default: 'html',
+			},
+			{
+				displayName: 'CC Recipients',
+				name: 'ccRecipients',
+				description: 'Email addresses of CC recipients',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Custom Headers',
+				name: 'internetMessageHeaders',
+				placeholder: 'Add Header',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: true,
+				},
+				default: {},
+				options: [
+					{
+						name: 'headers',
+						displayName: 'Header',
+						values: [
+							{
+								displayName: 'Name',
+								name: 'name',
+								type: 'string',
+								default: '',
+								description: 'Name of the header',
+							},
+							{
+								displayName: 'Value',
+								name: 'value',
+								type: 'string',
+								default: '',
+								description: 'Value to set for the header',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'From',
+				name: 'from',
+				description:
+					'The owner of the mailbox which the message is sent. Must correspond to the actual mailbox used.',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Importance',
+				name: 'importance',
+				description: 'The importance of the message',
+				type: 'options',
+				options: [
+					{
+						name: 'Low',
+						value: 'Low',
+					},
+					{
+						name: 'Normal',
+						value: 'Normal',
+					},
+					{
+						name: 'High',
+						value: 'High',
+					},
+				],
+				default: 'Low',
+			},
+			{
+				displayName: 'Read Receipt Requested',
+				name: 'isReadReceiptRequested',
+				description: 'Whether a read receipt is requested for the message',
+				type: 'boolean',
+				default: false,
+			},
+			{
+				displayName: 'Recipients',
+				name: 'toRecipients',
+				description: 'Email addresses of recipients. Multiple can be added separated by comma.',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Reply To',
+				name: 'replyTo',
+				description: 'Email addresses to use when replying',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Subject',
+				name: 'subject',
+				description: 'The subject of the message',
+				type: 'string',
+				default: '',
+			},
+		],
+	},
+
+	// message:getAll
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: ['message'],
+				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: ['message'],
+				operation: ['getAll'],
+				returnAll: [false],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 500,
+		},
+		default: 100,
+		description: 'Max number of results to return',
+	},
+
+	// message:create, message:update, message:send
+	{
+		displayName: 'Subject',
+		name: 'subject',
+		description: 'The subject of the message',
+		displayOptions: {
+			show: {
+				resource: ['message'],
+				operation: ['create', 'send'],
+			},
+		},
+		type: 'string',
+		default: '',
+	},
+	{
+		displayName: 'Body Content',
+		name: 'bodyContent',
+		description: 'Message body content',
+		type: 'string',
+		displayOptions: {
+			show: {
+				resource: ['message'],
+				operation: ['create', 'send'],
+			},
+		},
+		default: '',
+	},
+	{
+		displayName: 'Recipients',
+		name: 'toRecipients',
+		description: 'Email addresses of recipients. Multiple can be added separated by comma.',
+		type: 'string',
+		displayOptions: {
+			show: {
+				resource: ['message'],
+				operation: ['send'],
+			},
+		},
+		required: true,
+		default: '',
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['message'],
+				operation: ['send'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Attachments',
+				name: 'attachments',
+				type: 'fixedCollection',
+				placeholder: 'Add Attachment',
+				default: {},
+				typeOptions: {
+					multipleValues: true,
+				},
+				options: [
+					{
+						name: 'attachments',
+						displayName: 'Attachment',
+						values: [
+							{
+								displayName: 'Binary Property Name',
+								name: 'binaryPropertyName',
+								type: 'string',
+								default: '',
+								description:
+									'Name of the binary property containing the data to be added to the email as an attachment',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'BCC Recipients',
+				name: 'bccRecipients',
+				description: 'Email addresses of BCC recipients',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Body Content Type',
+				name: 'bodyContentType',
+				description: 'Message body content type',
+				type: 'options',
+				options: [
+					{
+						name: 'HTML',
+						value: 'html',
+					},
+					{
+						name: 'Text',
+						value: 'Text',
+					},
+				],
+				default: 'html',
+			},
+			{
+				displayName: 'Category Names or IDs',
+				name: 'categories',
+				type: 'multiOptions',
+				description:
+					'Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
+				typeOptions: {
+					loadOptionsMethod: 'getCategories',
+				},
+				default: [],
+			},
+			{
+				displayName: 'CC Recipients',
+				name: 'ccRecipients',
+				description: 'Email addresses of CC recipients',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Custom Headers',
+				name: 'internetMessageHeaders',
+				placeholder: 'Add Header',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: true,
+				},
+				default: {},
+				options: [
+					{
+						name: 'headers',
+						displayName: 'Header',
+						values: [
+							{
+								displayName: 'Name',
+								name: 'name',
+								type: 'string',
+								default: '',
+								description: 'Name of the header',
+							},
+							{
+								displayName: 'Value',
+								name: 'value',
+								type: 'string',
+								default: '',
+								description: 'Value to set for the header',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'From',
+				name: 'from',
+				description:
+					'The owner of the mailbox which the message is sent. Must correspond to the actual mailbox used.',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Importance',
+				name: 'importance',
+				description: 'The importance of the message',
+				type: 'options',
+				options: [
+					{
+						name: 'Low',
+						value: 'Low',
+					},
+					{
+						name: 'Normal',
+						value: 'Normal',
+					},
+					{
+						name: 'High',
+						value: 'High',
+					},
+				],
+				default: 'Low',
+			},
+			{
+				displayName: 'Read Receipt Requested',
+				name: 'isReadReceiptRequested',
+				description: 'Whether a read receipt is requested for the message',
+				type: 'boolean',
+				default: false,
+			},
+			{
+				displayName: 'Recipients',
+				name: 'toRecipients',
+				description: 'Email addresses of recipients. Multiple can be added separated by comma.',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Reply To',
+				name: 'replyTo',
+				description: 'Email addresses to use when replying',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Save To Sent Items',
+				name: 'saveToSentItems',
+				description: 'Whether to save the message in Sent Items',
+				type: 'boolean',
+				default: true,
+			},
+		],
+	},
+
+	// File operations
+	{
+		displayName: 'Put Output File in Field',
+		name: 'binaryPropertyName',
+		hint: 'The name of the output binary field to put the file in',
+		type: 'string',
+		required: true,
+		default: 'data',
+		displayOptions: {
+			show: {
+				resource: ['message'],
+				operation: ['getMime'],
+			},
+		},
+	},
+
+	// message:move
+	{
+		displayName: 'Folder ID',
+		name: 'folderId',
+		description: 'Target Folder ID',
+		type: 'string',
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: ['message'],
+				operation: ['move'],
+			},
+		},
+	},
+];
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v1/MicrosoftOutlookV1.node.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v1/MicrosoftOutlookV1.node.ts
new file mode 100644
index 0000000000000..ef8b39a18d011
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v1/MicrosoftOutlookV1.node.ts
@@ -0,0 +1,1138 @@
+/* eslint-disable n8n-nodes-base/node-filename-against-convention */
+
+import type {
+	IBinaryKeyData,
+	IDataObject,
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
+	INodeExecutionData,
+	INodePropertyOptions,
+	INodeType,
+	INodeTypeBaseDescription,
+	INodeTypeDescription,
+	JsonObject,
+} from 'n8n-workflow';
+import { NodeApiError, NodeOperationError } from 'n8n-workflow';
+
+import {
+	createMessage,
+	downloadAttachments,
+	makeRecipient,
+	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';
+
+const versionDescription: INodeTypeDescription = {
+	displayName: 'Microsoft Outlook',
+	name: 'microsoftOutlook',
+	group: ['transform'],
+	icon: 'file:outlook.svg',
+	version: 1,
+	subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+	description: 'Consume Microsoft Outlook API',
+	defaults: {
+		name: 'Microsoft Outlook',
+	},
+	inputs: ['main'],
+	outputs: ['main'],
+	credentials: [
+		{
+			name: 'microsoftOutlookOAuth2Api',
+			required: true,
+		},
+	],
+	properties: [
+		oldVersionNotice,
+		{
+			displayName: 'Resource',
+			name: 'resource',
+			type: 'options',
+			noDataExpression: true,
+			default: 'message',
+			options: [
+				{
+					name: 'Draft',
+					value: 'draft',
+				},
+				{
+					name: 'Folder',
+					value: 'folder',
+				},
+				{
+					name: 'Folder Message',
+					value: 'folderMessage',
+				},
+				{
+					name: 'Message',
+					value: 'message',
+				},
+				{
+					name: 'Message Attachment',
+					value: 'messageAttachment',
+				},
+			],
+		},
+		// Draft
+		...draftOperations,
+		...draftFields,
+		// Message
+		...messageOperations,
+		...messageFields,
+		// Message Attachment
+		...messageAttachmentOperations,
+		...messageAttachmentFields,
+		// Folder
+		...folderOperations,
+		...folderFields,
+		// Folder Message
+		...folderMessageOperations,
+		...folderMessageFields,
+
+		// Draft & Message
+		...draftMessageSharedFields,
+	],
+};
+
+export class MicrosoftOutlookV1 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			...versionDescription,
+		};
+	}
+
+	methods = {
+		loadOptions: {
+			// Get all the categories to display them to user so that he can
+			// select them easily
+			async getCategories(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const categories = await microsoftApiRequestAllItems.call(
+					this,
+					'value',
+					'GET',
+					'/outlook/masterCategories',
+				);
+				for (const category of categories) {
+					returnData.push({
+						name: category.displayName as string,
+						value: category.id as string,
+					});
+				}
+				return returnData;
+			},
+		},
+	};
+
+	async execute(this: IExecuteFunctions) {
+		const items = this.getInputData();
+		const returnData: IDataObject[] = [];
+		const length = items.length;
+		const qs: IDataObject = {};
+		let responseData;
+
+		const resource = this.getNodeParameter('resource', 0);
+		const operation = this.getNodeParameter('operation', 0);
+
+		if (['draft', 'message'].includes(resource)) {
+			if (operation === 'delete') {
+				for (let i = 0; i < length; i++) {
+					try {
+						const messageId = this.getNodeParameter('messageId', i) as string;
+						responseData = await microsoftApiRequest.call(this, 'DELETE', `/messages/${messageId}`);
+
+						returnData.push({ success: true });
+					} catch (error) {
+						if (this.continueOnFail()) {
+							returnData.push({ error: error.message });
+							continue;
+						}
+						throw error;
+					}
+				}
+			}
+
+			if (operation === 'get') {
+				for (let i = 0; i < length; i++) {
+					try {
+						const messageId = this.getNodeParameter('messageId', i) as string;
+						const additionalFields = this.getNodeParameter('additionalFields', i);
+
+						if (additionalFields.fields) {
+							qs.$select = additionalFields.fields;
+						}
+
+						if (additionalFields.filter) {
+							qs.$filter = additionalFields.filter;
+						}
+
+						responseData = await microsoftApiRequest.call(
+							this,
+							'GET',
+							`/messages/${messageId}`,
+							undefined,
+							qs,
+						);
+
+						if (additionalFields.dataPropertyAttachmentsPrefixName) {
+							const prefix = additionalFields.dataPropertyAttachmentsPrefixName as string;
+							const data = await downloadAttachments.call(
+								this,
+								responseData as IDataObject[],
+								prefix,
+							);
+							returnData.push.apply(returnData, data as unknown as IDataObject[]);
+						} else {
+							returnData.push(responseData as IDataObject);
+						}
+
+						if (additionalFields.dataPropertyAttachmentsPrefixName) {
+							return [returnData as INodeExecutionData[]];
+						}
+					} catch (error) {
+						if (this.continueOnFail()) {
+							returnData.push({ error: error.message });
+							continue;
+						}
+						throw error;
+					}
+				}
+			}
+
+			if (operation === 'update') {
+				for (let i = 0; i < length; i++) {
+					try {
+						const messageId = this.getNodeParameter('messageId', i) as string;
+
+						const updateFields = this.getNodeParameter('updateFields', i);
+
+						// Create message from optional fields
+						const body: IDataObject = createMessage(updateFields);
+
+						responseData = await microsoftApiRequest.call(
+							this,
+							'PATCH',
+							`/messages/${messageId}`,
+							body,
+							{},
+						);
+						returnData.push(responseData as IDataObject);
+					} catch (error) {
+						if (this.continueOnFail()) {
+							returnData.push({ error: error.message });
+							continue;
+						}
+						throw error;
+					}
+				}
+			}
+		}
+
+		if (resource === 'draft') {
+			if (operation === 'create') {
+				for (let i = 0; i < length; i++) {
+					try {
+						const additionalFields = this.getNodeParameter('additionalFields', i);
+
+						const subject = this.getNodeParameter('subject', i) as string;
+
+						const bodyContent = this.getNodeParameter('bodyContent', i, '') as string;
+
+						additionalFields.subject = subject;
+
+						additionalFields.bodyContent = bodyContent || ' ';
+
+						// Create message object from optional fields
+						const body: IDataObject = createMessage(additionalFields);
+
+						if (additionalFields.attachments) {
+							const attachments = (additionalFields.attachments as IDataObject)
+								.attachments as IDataObject[];
+
+							// // Handle attachments
+							body.attachments = attachments.map((attachment) => {
+								const binaryPropertyName = attachment.binaryPropertyName as string;
+
+								if (items[i].binary === undefined) {
+									throw new NodeOperationError(this.getNode(), 'No binary data exists on item!', {
+										itemIndex: i,
+									});
+								}
+
+								if ((items[i].binary as IDataObject)[binaryPropertyName] === undefined) {
+									throw new NodeOperationError(
+										this.getNode(),
+										`No binary data property "${binaryPropertyName}" does not exists on item!`,
+										{ itemIndex: i },
+									);
+								}
+
+								const binaryData = (items[i].binary as IBinaryKeyData)[binaryPropertyName];
+								return {
+									'@odata.type': '#microsoft.graph.fileAttachment',
+									name: binaryData.fileName,
+									contentBytes: binaryData.data,
+								};
+							});
+						}
+
+						responseData = await microsoftApiRequest.call(this, 'POST', '/messages', body, {});
+
+						returnData.push(responseData as IDataObject);
+					} catch (error) {
+						if (this.continueOnFail()) {
+							returnData.push({ error: error.message });
+							continue;
+						}
+						throw error;
+					}
+				}
+			}
+
+			if (operation === 'send') {
+				for (let i = 0; i < length; i++) {
+					try {
+						const messageId = this.getNodeParameter('messageId', i);
+						const additionalFields = this.getNodeParameter('additionalFields', i, {});
+
+						if (additionalFields?.recipients) {
+							const recipients = (additionalFields.recipients as string)
+								.split(',')
+								.filter((email) => !!email);
+							if (recipients.length !== 0) {
+								await microsoftApiRequest.call(this, 'PATCH', `/messages/${messageId}`, {
+									toRecipients: recipients.map((recipient: string) => makeRecipient(recipient)),
+								});
+							}
+						}
+
+						responseData = await microsoftApiRequest.call(
+							this,
+							'POST',
+							`/messages/${messageId}/send`,
+						);
+
+						returnData.push({ success: true });
+					} catch (error) {
+						if (this.continueOnFail()) {
+							returnData.push({ error: error.message });
+							continue;
+						}
+						throw error;
+					}
+				}
+			}
+		}
+
+		if (resource === 'message') {
+			if (operation === 'reply') {
+				for (let i = 0; i < length; i++) {
+					try {
+						const messageId = this.getNodeParameter('messageId', i) as string;
+						const replyType = this.getNodeParameter('replyType', i) as string;
+						const comment = this.getNodeParameter('comment', i) as string;
+						const send = this.getNodeParameter('send', i, false) as boolean;
+						const additionalFields = this.getNodeParameter('additionalFields', i, {});
+
+						const body: IDataObject = {};
+
+						let action = 'createReply';
+						if (replyType === 'replyAll') {
+							body.comment = comment;
+							action = 'createReplyAll';
+						} else {
+							body.comment = comment;
+							body.message = {};
+							Object.assign(body.message, createMessage(additionalFields));
+							delete (body.message as IDataObject).attachments;
+						}
+
+						responseData = await microsoftApiRequest.call(
+							this,
+							'POST',
+							`/messages/${messageId}/${action}`,
+							body,
+						);
+
+						if (additionalFields.attachments) {
+							const attachments = (additionalFields.attachments as IDataObject)
+								.attachments as IDataObject[];
+							// // Handle attachments
+							const data = attachments.map((attachment) => {
+								const binaryPropertyName = attachment.binaryPropertyName as string;
+
+								if (items[i].binary === undefined) {
+									throw new NodeOperationError(this.getNode(), 'No binary data exists on item!', {
+										itemIndex: i,
+									});
+								}
+
+								if ((items[i].binary as IDataObject)[binaryPropertyName] === undefined) {
+									throw new NodeOperationError(
+										this.getNode(),
+										`No binary data property "${binaryPropertyName}" does not exists on item!`,
+										{ itemIndex: i },
+									);
+								}
+
+								const binaryData = (items[i].binary as IBinaryKeyData)[binaryPropertyName];
+								return {
+									'@odata.type': '#microsoft.graph.fileAttachment',
+									name: binaryData.fileName,
+									contentBytes: binaryData.data,
+								};
+							});
+
+							for (const attachment of data) {
+								await microsoftApiRequest.call(
+									this,
+									'POST',
+									`/messages/${responseData.id}/attachments`,
+									attachment,
+									{},
+								);
+							}
+						}
+
+						if (send) {
+							await microsoftApiRequest.call(this, 'POST', `/messages/${responseData.id}/send`);
+						}
+
+						returnData.push(responseData as IDataObject);
+					} catch (error) {
+						if (this.continueOnFail()) {
+							returnData.push({ error: error.message });
+							continue;
+						}
+						throw error;
+					}
+				}
+			}
+
+			if (operation === 'getMime') {
+				for (let i = 0; i < length; i++) {
+					try {
+						const messageId = this.getNodeParameter('messageId', i) as string;
+						const dataPropertyNameDownload = this.getNodeParameter('binaryPropertyName', i);
+						const response = await microsoftApiRequest.call(
+							this,
+							'GET',
+							`/messages/${messageId}/$value`,
+							undefined,
+							{},
+							undefined,
+							{},
+							{ encoding: null, resolveWithFullResponse: true },
+						);
+
+						let mimeType: string | undefined;
+						if (response.headers['content-type']) {
+							mimeType = response.headers['content-type'];
+						}
+
+						const newItem: INodeExecutionData = {
+							json: items[i].json,
+							binary: {},
+						};
+
+						if (items[i].binary !== undefined) {
+							// Create a shallow copy of the binary data so that the old
+							// data references which do not get changed still stay behind
+							// but the incoming data does not get changed.
+							Object.assign(newItem.binary!, items[i].binary);
+						}
+
+						items[i] = newItem;
+
+						const fileName = `${messageId}.eml`;
+						const data = Buffer.from(response.body as string, 'utf8');
+						items[i].binary![dataPropertyNameDownload] = await this.helpers.prepareBinaryData(
+							data as unknown as Buffer,
+							fileName,
+							mimeType,
+						);
+					} catch (error) {
+						if (this.continueOnFail()) {
+							items[i].json = { error: error.message };
+							continue;
+						}
+						throw error;
+					}
+				}
+			}
+
+			if (operation === 'getAll') {
+				let additionalFields: IDataObject = {};
+				for (let i = 0; i < length; i++) {
+					try {
+						const returnAll = this.getNodeParameter('returnAll', i);
+						additionalFields = this.getNodeParameter('additionalFields', i);
+
+						if (additionalFields.fields) {
+							qs.$select = additionalFields.fields;
+						}
+
+						if (additionalFields.filter) {
+							qs.$filter = additionalFields.filter;
+						}
+
+						const endpoint = '/messages';
+
+						if (returnAll) {
+							responseData = await microsoftApiRequestAllItems.call(
+								this,
+								'value',
+								'GET',
+								endpoint,
+								undefined,
+								qs,
+							);
+						} else {
+							qs.$top = this.getNodeParameter('limit', i);
+							responseData = await microsoftApiRequest.call(this, 'GET', endpoint, undefined, qs);
+							responseData = responseData.value;
+						}
+
+						if (additionalFields.dataPropertyAttachmentsPrefixName) {
+							const prefix = additionalFields.dataPropertyAttachmentsPrefixName as string;
+							const data = await downloadAttachments.call(
+								this,
+								responseData as IDataObject[],
+								prefix,
+							);
+							returnData.push.apply(returnData, data as unknown as IDataObject[]);
+						} else {
+							returnData.push.apply(returnData, responseData as IDataObject[]);
+						}
+					} catch (error) {
+						if (this.continueOnFail()) {
+							returnData.push({ error: error.message });
+							continue;
+						}
+						throw error;
+					}
+				}
+
+				if (additionalFields.dataPropertyAttachmentsPrefixName) {
+					return [returnData as INodeExecutionData[]];
+				}
+			}
+
+			if (operation === 'move') {
+				for (let i = 0; i < length; i++) {
+					try {
+						const messageId = this.getNodeParameter('messageId', i) as string;
+						const destinationId = this.getNodeParameter('folderId', i) as string;
+						const body: IDataObject = {
+							destinationId,
+						};
+
+						responseData = await microsoftApiRequest.call(
+							this,
+							'POST',
+							`/messages/${messageId}/move`,
+							body,
+						);
+						returnData.push({ success: true });
+					} catch (error) {
+						if (this.continueOnFail()) {
+							returnData.push({ error: error.message });
+							continue;
+						}
+						throw error;
+					}
+				}
+			}
+
+			if (operation === 'send') {
+				for (let i = 0; i < length; i++) {
+					try {
+						const additionalFields = this.getNodeParameter('additionalFields', i);
+
+						const toRecipients = this.getNodeParameter('toRecipients', i) as string;
+
+						const subject = this.getNodeParameter('subject', i) as string;
+
+						const bodyContent = this.getNodeParameter('bodyContent', i, '') as string;
+
+						additionalFields.subject = subject;
+
+						additionalFields.bodyContent = bodyContent || ' ';
+
+						additionalFields.toRecipients = toRecipients;
+
+						const saveToSentItems =
+							additionalFields.saveToSentItems === undefined
+								? true
+								: additionalFields.saveToSentItems;
+						delete additionalFields.saveToSentItems;
+
+						// Create message object from optional fields
+						const message: IDataObject = createMessage(additionalFields);
+
+						if (additionalFields.attachments) {
+							const attachments = (additionalFields.attachments as IDataObject)
+								.attachments as IDataObject[];
+
+							// // Handle attachments
+							message.attachments = attachments.map((attachment) => {
+								const binaryPropertyName = attachment.binaryPropertyName as string;
+
+								if (items[i].binary === undefined) {
+									throw new NodeOperationError(this.getNode(), 'No binary data exists on item!', {
+										itemIndex: i,
+									});
+								}
+								if ((items[i].binary as IDataObject)[binaryPropertyName] === undefined) {
+									throw new NodeOperationError(
+										this.getNode(),
+										`No binary data property "${binaryPropertyName}" does not exists on item!`,
+										{ itemIndex: i },
+									);
+								}
+
+								const binaryData = (items[i].binary as IBinaryKeyData)[binaryPropertyName];
+								return {
+									'@odata.type': '#microsoft.graph.fileAttachment',
+									name: binaryData.fileName,
+									contentBytes: binaryData.data,
+								};
+							});
+						}
+
+						const body: IDataObject = {
+							message,
+							saveToSentItems,
+						};
+
+						responseData = await microsoftApiRequest.call(this, 'POST', '/sendMail', body, {});
+						returnData.push({ success: true });
+					} catch (error) {
+						if (this.continueOnFail()) {
+							returnData.push({ error: error.message });
+							continue;
+						}
+						throw error;
+					}
+				}
+			}
+		}
+
+		if (resource === 'messageAttachment') {
+			if (operation === 'add') {
+				for (let i = 0; i < length; i++) {
+					try {
+						const messageId = this.getNodeParameter('messageId', i) as string;
+						const binaryPropertyName = this.getNodeParameter('binaryPropertyName', 0);
+						const additionalFields = this.getNodeParameter('additionalFields', i);
+
+						if (items[i].binary === undefined) {
+							throw new NodeOperationError(this.getNode(), 'No binary data exists on item!');
+						}
+
+						if ((items[i].binary as IDataObject)[binaryPropertyName] === undefined) {
+							throw new NodeOperationError(
+								this.getNode(),
+								`No binary data property "${binaryPropertyName}" does not exists on item!`,
+								{ itemIndex: i },
+							);
+						}
+
+						const binaryData = (items[i].binary as IBinaryKeyData)[binaryPropertyName];
+						const dataBuffer = await this.helpers.getBinaryDataBuffer(i, binaryPropertyName);
+
+						const fileName =
+							additionalFields.fileName === undefined
+								? binaryData.fileName
+								: additionalFields.fileName;
+
+						if (!fileName) {
+							throw new NodeOperationError(
+								this.getNode(),
+								'File name is not set. It has either to be set via "Additional Fields" or has to be set on the binary property!',
+								{ itemIndex: i },
+							);
+						}
+
+						// Check if the file is over 3MB big
+						if (dataBuffer.length > 3e6) {
+							// Maximum chunk size is 4MB
+							const chunkSize = 4e6;
+							const body: IDataObject = {
+								AttachmentItem: {
+									attachmentType: 'file',
+									name: fileName,
+									size: dataBuffer.length,
+								},
+							};
+
+							// Create upload session
+							responseData = await microsoftApiRequest.call(
+								this,
+								'POST',
+								`/messages/${messageId}/attachments/createUploadSession`,
+								body,
+							);
+							const uploadUrl = responseData.uploadUrl;
+
+							if (uploadUrl === undefined) {
+								throw new NodeApiError(this.getNode(), responseData as JsonObject, {
+									message: 'Failed to get upload session',
+								});
+							}
+
+							for (
+								let bytesUploaded = 0;
+								bytesUploaded < dataBuffer.length;
+								bytesUploaded += chunkSize
+							) {
+								// Upload the file chunk by chunk
+								const nextChunk = Math.min(bytesUploaded + chunkSize, dataBuffer.length);
+								const contentRange = `bytes ${bytesUploaded}-${nextChunk - 1}/${dataBuffer.length}`;
+
+								const data = dataBuffer.subarray(bytesUploaded, nextChunk);
+
+								responseData = await this.helpers.request(uploadUrl, {
+									method: 'PUT',
+									headers: {
+										'Content-Type': 'application/octet-stream',
+										'Content-Length': data.length,
+										'Content-Range': contentRange,
+									},
+									body: data,
+								});
+							}
+						} else {
+							const body: IDataObject = {
+								'@odata.type': '#microsoft.graph.fileAttachment',
+								name: fileName,
+								contentBytes: binaryData.data,
+							};
+
+							responseData = await microsoftApiRequest.call(
+								this,
+								'POST',
+								`/messages/${messageId}/attachments`,
+								body,
+								{},
+							);
+						}
+						returnData.push({ success: true });
+					} catch (error) {
+						if (this.continueOnFail()) {
+							returnData.push({ error: error.message });
+							continue;
+						}
+						throw error;
+					}
+				}
+			}
+
+			if (operation === 'download') {
+				for (let i = 0; i < length; i++) {
+					try {
+						const messageId = this.getNodeParameter('messageId', i) as string;
+						const attachmentId = this.getNodeParameter('attachmentId', i) as string;
+						const dataPropertyNameDownload = this.getNodeParameter('binaryPropertyName', i);
+
+						// Get attachment details first
+						const attachmentDetails = await microsoftApiRequest.call(
+							this,
+							'GET',
+							`/messages/${messageId}/attachments/${attachmentId}`,
+							undefined,
+							{ $select: 'id,name,contentType' },
+						);
+
+						let mimeType: string | undefined;
+						if (attachmentDetails.contentType) {
+							mimeType = attachmentDetails.contentType;
+						}
+						const fileName = attachmentDetails.name;
+
+						const response = await microsoftApiRequest.call(
+							this,
+							'GET',
+							`/messages/${messageId}/attachments/${attachmentId}/$value`,
+							undefined,
+							{},
+							undefined,
+							{},
+							{ encoding: null, resolveWithFullResponse: true },
+						);
+
+						const newItem: INodeExecutionData = {
+							json: items[i].json,
+							binary: {},
+						};
+
+						if (items[i].binary !== undefined) {
+							// Create a shallow copy of the binary data so that the old
+							// data references which do not get changed still stay behind
+							// but the incoming data does not get changed.
+							Object.assign(newItem.binary!, items[i].binary);
+						}
+
+						items[i] = newItem;
+						const data = Buffer.from(response.body as string, 'utf8');
+						items[i].binary![dataPropertyNameDownload] = await this.helpers.prepareBinaryData(
+							data as unknown as Buffer,
+							fileName as string,
+							mimeType,
+						);
+					} catch (error) {
+						if (this.continueOnFail()) {
+							items[i].json = { error: error.message };
+							continue;
+						}
+						throw error;
+					}
+				}
+			}
+
+			if (operation === 'get') {
+				for (let i = 0; i < length; i++) {
+					try {
+						const messageId = this.getNodeParameter('messageId', i) as string;
+						const attachmentId = this.getNodeParameter('attachmentId', i) as string;
+						const additionalFields = this.getNodeParameter('additionalFields', i);
+
+						// Have sane defaults so we don't fetch attachment data in this operation
+						qs.$select = 'id,lastModifiedDateTime,name,contentType,size,isInline';
+						if (additionalFields.fields) {
+							qs.$select = additionalFields.fields;
+						}
+
+						responseData = await microsoftApiRequest.call(
+							this,
+							'GET',
+							`/messages/${messageId}/attachments/${attachmentId}`,
+							undefined,
+							qs,
+						);
+						returnData.push(responseData as IDataObject);
+					} catch (error) {
+						if (this.continueOnFail()) {
+							returnData.push({ error: error.message });
+							continue;
+						}
+						throw error;
+					}
+				}
+			}
+
+			if (operation === 'getAll') {
+				for (let i = 0; i < length; i++) {
+					try {
+						const messageId = this.getNodeParameter('messageId', i) as string;
+						const returnAll = this.getNodeParameter('returnAll', i);
+						const additionalFields = this.getNodeParameter('additionalFields', i);
+
+						// Have sane defaults so we don't fetch attachment data in this operation
+						qs.$select = 'id,lastModifiedDateTime,name,contentType,size,isInline';
+						if (additionalFields.fields) {
+							qs.$select = additionalFields.fields;
+						}
+
+						if (additionalFields.filter) {
+							qs.$filter = additionalFields.filter;
+						}
+
+						const endpoint = `/messages/${messageId}/attachments`;
+						if (returnAll) {
+							responseData = await microsoftApiRequestAllItems.call(
+								this,
+								'value',
+								'GET',
+								endpoint,
+								undefined,
+								qs,
+							);
+						} else {
+							qs.$top = this.getNodeParameter('limit', i);
+							responseData = await microsoftApiRequest.call(this, 'GET', endpoint, undefined, qs);
+							responseData = responseData.value;
+						}
+						returnData.push.apply(returnData, responseData as IDataObject[]);
+					} catch (error) {
+						if (this.continueOnFail()) {
+							returnData.push({ error: error.message });
+							continue;
+						}
+						throw error;
+					}
+				}
+			}
+		}
+
+		if (resource === 'folder') {
+			if (operation === 'create') {
+				for (let i = 0; i < length; i++) {
+					try {
+						const displayName = this.getNodeParameter('displayName', i) as string;
+						const folderType = this.getNodeParameter('folderType', i) as string;
+						const body: IDataObject = {
+							displayName,
+						};
+
+						let endpoint = '/mailFolders';
+
+						if (folderType === 'searchFolder') {
+							endpoint = '/mailFolders/searchfolders/childFolders';
+							const includeNestedFolders = this.getNodeParameter('includeNestedFolders', i);
+							const sourceFolderIds = this.getNodeParameter('sourceFolderIds', i);
+							const filterQuery = this.getNodeParameter('filterQuery', i);
+							Object.assign(body, {
+								'@odata.type': 'microsoft.graph.mailSearchFolder',
+								includeNestedFolders,
+								sourceFolderIds,
+								filterQuery,
+							});
+						}
+
+						responseData = await microsoftApiRequest.call(this, 'POST', endpoint, body);
+						returnData.push(responseData as IDataObject);
+					} catch (error) {
+						if (this.continueOnFail()) {
+							returnData.push({ error: error.message });
+							continue;
+						}
+						throw error;
+					}
+				}
+			}
+
+			if (operation === 'delete') {
+				for (let i = 0; i < length; i++) {
+					try {
+						const folderId = this.getNodeParameter('folderId', i) as string;
+						responseData = await microsoftApiRequest.call(
+							this,
+							'DELETE',
+							`/mailFolders/${folderId}`,
+						);
+						returnData.push({ success: true });
+					} catch (error) {
+						if (this.continueOnFail()) {
+							returnData.push({ error: error.message });
+							continue;
+						}
+						throw error;
+					}
+				}
+			}
+
+			if (operation === 'get') {
+				for (let i = 0; i < length; i++) {
+					try {
+						const folderId = this.getNodeParameter('folderId', i) as string;
+						const additionalFields = this.getNodeParameter('additionalFields', i);
+
+						if (additionalFields.fields) {
+							qs.$select = additionalFields.fields;
+						}
+
+						if (additionalFields.filter) {
+							qs.$filter = additionalFields.filter;
+						}
+						responseData = await microsoftApiRequest.call(
+							this,
+							'GET',
+							`/mailFolders/${folderId}`,
+							{},
+							qs,
+						);
+						returnData.push(responseData as IDataObject);
+					} catch (error) {
+						if (this.continueOnFail()) {
+							returnData.push({ error: error.message });
+							continue;
+						}
+						throw error;
+					}
+				}
+			}
+
+			if (operation === 'getAll') {
+				for (let i = 0; i < length; i++) {
+					try {
+						const returnAll = this.getNodeParameter('returnAll', i);
+						const additionalFields = this.getNodeParameter('additionalFields', i);
+
+						if (additionalFields.fields) {
+							qs.$select = additionalFields.fields;
+						}
+
+						if (additionalFields.filter) {
+							qs.$filter = additionalFields.filter;
+						}
+
+						if (returnAll) {
+							responseData = await microsoftApiRequestAllItems.call(
+								this,
+								'value',
+								'GET',
+								'/mailFolders',
+								{},
+								qs,
+							);
+						} else {
+							qs.$top = this.getNodeParameter('limit', i);
+							responseData = await microsoftApiRequest.call(this, 'GET', '/mailFolders', {}, qs);
+							responseData = responseData.value;
+						}
+						returnData.push.apply(returnData, responseData as IDataObject[]);
+					} catch (error) {
+						if (this.continueOnFail()) {
+							returnData.push({ error: error.message });
+							continue;
+						}
+						throw error;
+					}
+				}
+			}
+
+			if (operation === 'getChildren') {
+				for (let i = 0; i < length; i++) {
+					try {
+						const folderId = this.getNodeParameter('folderId', i) as string;
+						const returnAll = this.getNodeParameter('returnAll', i);
+						const additionalFields = this.getNodeParameter('additionalFields', i);
+
+						if (additionalFields.fields) {
+							qs.$select = additionalFields.fields;
+						}
+
+						if (additionalFields.filter) {
+							qs.$filter = additionalFields.filter;
+						}
+
+						if (returnAll) {
+							responseData = await microsoftApiRequestAllItems.call(
+								this,
+								'value',
+								'GET',
+								`/mailFolders/${folderId}/childFolders`,
+								qs,
+							);
+						} else {
+							qs.$top = this.getNodeParameter('limit', i);
+							responseData = await microsoftApiRequest.call(
+								this,
+								'GET',
+								`/mailFolders/${folderId}/childFolders`,
+								undefined,
+								qs,
+							);
+							responseData = responseData.value;
+						}
+						returnData.push.apply(returnData, responseData as IDataObject[]);
+					} catch (error) {
+						if (this.continueOnFail()) {
+							returnData.push({ error: error.message });
+							continue;
+						}
+						throw error;
+					}
+				}
+			}
+
+			if (operation === 'update') {
+				for (let i = 0; i < length; i++) {
+					try {
+						const folderId = this.getNodeParameter('folderId', i) as string;
+						const updateFields = this.getNodeParameter('updateFields', i);
+
+						const body: IDataObject = {
+							...updateFields,
+						};
+
+						responseData = await microsoftApiRequest.call(
+							this,
+							'PATCH',
+							`/mailFolders/${folderId}`,
+							body,
+						);
+						returnData.push(responseData as IDataObject);
+					} catch (error) {
+						if (this.continueOnFail()) {
+							returnData.push({ error: error.message });
+							continue;
+						}
+						throw error;
+					}
+				}
+			}
+		}
+
+		if (resource === 'folderMessage') {
+			for (let i = 0; i < length; i++) {
+				try {
+					if (operation === 'getAll') {
+						const folderId = this.getNodeParameter('folderId', i) as string;
+						const returnAll = this.getNodeParameter('returnAll', i);
+						const additionalFields = this.getNodeParameter('additionalFields', i);
+
+						if (additionalFields.fields) {
+							qs.$select = additionalFields.fields;
+						}
+
+						if (additionalFields.filter) {
+							qs.$filter = additionalFields.filter;
+						}
+
+						const endpoint = `/mailFolders/${folderId}/messages`;
+						if (returnAll) {
+							responseData = await microsoftApiRequestAllItems.call(
+								this,
+								'value',
+								'GET',
+								endpoint,
+								qs,
+							);
+						} else {
+							qs.$top = this.getNodeParameter('limit', i);
+							responseData = await microsoftApiRequest.call(this, 'GET', endpoint, undefined, qs);
+							responseData = responseData.value;
+						}
+						returnData.push.apply(returnData, responseData as IDataObject[]);
+					}
+				} catch (error) {
+					if (this.continueOnFail()) {
+						returnData.push({ error: error.message });
+						continue;
+					}
+					throw error;
+				}
+			}
+		}
+
+		if (
+			(resource === 'message' && operation === 'getMime') ||
+			(resource === 'messageAttachment' && operation === 'download')
+		) {
+			return [items];
+		} else {
+			return [this.helpers.returnJsonArray(returnData)];
+		}
+	}
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/MicrosoftOutlookV2.node.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/MicrosoftOutlookV2.node.ts
new file mode 100644
index 0000000000000..7ac465f0b2212
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/MicrosoftOutlookV2.node.ts
@@ -0,0 +1,27 @@
+import type {
+	IExecuteFunctions,
+	INodeType,
+	INodeTypeBaseDescription,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+
+import { loadOptions, listSearch } from './methods';
+import { description } from './actions/node.description';
+import { router } from './actions/router';
+
+export class MicrosoftOutlookV2 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			...description,
+		};
+	}
+
+	methods = { loadOptions, listSearch };
+
+	async execute(this: IExecuteFunctions) {
+		return await router.call(this);
+	}
+}
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
new file mode 100644
index 0000000000000..76021094818ca
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/create.operation.ts
@@ -0,0 +1,116 @@
+import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
+import { microsoftApiRequest } from '../../transport';
+import { updateDisplayOptions } from '@utils/utilities';
+
+export const properties: INodeProperties[] = [
+	{
+		displayName: 'Name',
+		name: 'name',
+		type: 'string',
+		default: '',
+		required: true,
+		description: 'The name of the calendar to create',
+		placeholder: 'e.g. My Calendar',
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		options: [
+			{
+				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-options
+				displayName: 'Calendar Group',
+				name: 'calendarGroup',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getCalendarGroups',
+				},
+				default: [],
+				description:
+					'If set, the calendar will be created in the specified calendar group. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Color',
+				name: 'color',
+				type: 'options',
+				default: 'lightBlue',
+				options: [
+					{
+						name: 'Light Blue',
+						value: 'lightBlue',
+					},
+					{
+						name: 'Light Brown',
+						value: 'lightBrown',
+					},
+					{
+						name: 'Light Gray',
+						value: 'lightGray',
+					},
+					{
+						name: 'Light Green',
+						value: 'lightGreen',
+					},
+					{
+						name: 'Light Orange',
+						value: 'lightOrange',
+					},
+					{
+						name: 'Light Pink',
+						value: 'lightPink',
+					},
+					{
+						name: 'Light Red',
+						value: 'lightRed',
+					},
+					{
+						name: 'Light Teal',
+						value: 'lightTeal',
+					},
+					{
+						name: 'Light Yellow',
+						value: 'lightYellow',
+					},
+				],
+				description: 'Specify the color to distinguish the calendar from the others',
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['calendar'],
+		operation: ['create'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, index: number) {
+	const additionalFields = this.getNodeParameter('additionalFields', index);
+	const name = this.getNodeParameter('name', index) as string;
+
+	let endpoint = '/calendars';
+
+	if (additionalFields.calendarGroup) {
+		endpoint = `/calendarGroups/${additionalFields.calendarGroup}/calendars`;
+		delete additionalFields.calendarGroup;
+	}
+
+	const body: IDataObject = {
+		name,
+		...additionalFields,
+	};
+
+	const responseData = await microsoftApiRequest.call(this, 'POST', endpoint, body);
+
+	const executionData = this.helpers.constructExecutionMetaData(
+		this.helpers.returnJsonArray(responseData as IDataObject),
+		{ itemData: { item: index } },
+	);
+
+	return executionData;
+}
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
new file mode 100644
index 0000000000000..11100776764f0
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/delete.operation.ts
@@ -0,0 +1,30 @@
+import type { IExecuteFunctions, INodeProperties } from 'n8n-workflow';
+import { microsoftApiRequest } from '../../transport';
+import { calendarRLC } from '../../descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+export const properties: INodeProperties[] = [calendarRLC];
+
+const displayOptions = {
+	show: {
+		resource: ['calendar'],
+		operation: ['delete'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, index: number) {
+	const calendarId = this.getNodeParameter('calendarId', index, undefined, {
+		extractValue: true,
+	}) as string;
+
+	await microsoftApiRequest.call(this, 'DELETE', `/calendars/${calendarId}`);
+
+	const executionData = this.helpers.constructExecutionMetaData(
+		this.helpers.returnJsonArray({ success: true }),
+		{ itemData: { item: index } },
+	);
+
+	return executionData;
+}
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
new file mode 100644
index 0000000000000..826147db039d2
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/get.operation.ts
@@ -0,0 +1,38 @@
+import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
+import { microsoftApiRequest } from '../../transport';
+import { calendarRLC } from '../../descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+export const properties: INodeProperties[] = [calendarRLC];
+
+const displayOptions = {
+	show: {
+		resource: ['calendar'],
+		operation: ['get'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, index: number) {
+	const qs: IDataObject = {};
+
+	const calendarId = this.getNodeParameter('calendarId', index, undefined, {
+		extractValue: true,
+	}) as string;
+
+	const responseData = await microsoftApiRequest.call(
+		this,
+		'GET',
+		`/calendars/${calendarId}`,
+		undefined,
+		qs,
+	);
+
+	const executionData = this.helpers.constructExecutionMetaData(
+		this.helpers.returnJsonArray(responseData as IDataObject),
+		{ itemData: { item: index } },
+	);
+
+	return executionData;
+}
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
new file mode 100644
index 0000000000000..e122863905830
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/getAll.operation.ts
@@ -0,0 +1,78 @@
+import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
+import { microsoftApiRequest, microsoftApiRequestAllItems } from '../../transport';
+import { returnAllOrLimit } from '../../descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+export const properties: INodeProperties[] = [
+	...returnAllOrLimit,
+	{
+		displayName: 'Filters',
+		name: 'filters',
+		type: 'collection',
+		placeholder: 'Add Filter',
+		default: {},
+		options: [
+			{
+				displayName: 'Filter Query',
+				name: 'custom',
+				type: 'string',
+				default: '',
+				placeholder: 'e.g. canShare eq true',
+				hint: 'Search query to filter calendars. <a href="https://learn.microsoft.com/en-us/graph/filter-query-parameter">More info</a>.',
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['calendar'],
+		operation: ['getAll'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, index: number) {
+	let responseData;
+	const qs = {} as IDataObject;
+
+	const returnAll = this.getNodeParameter('returnAll', index);
+	const filters = this.getNodeParameter('filters', index, {});
+
+	if (Object.keys(filters).length) {
+		const filterString: string[] = [];
+
+		if (filters.custom) {
+			filterString.push(filters.custom as string);
+		}
+
+		if (filterString.length) {
+			qs.$filter = filterString.join(' and ');
+		}
+	}
+
+	const endpoint = '/calendars';
+
+	if (returnAll) {
+		responseData = await microsoftApiRequestAllItems.call(
+			this,
+			'value',
+			'GET',
+			endpoint,
+			undefined,
+			qs,
+		);
+	} else {
+		qs.$top = this.getNodeParameter('limit', index);
+		responseData = await microsoftApiRequest.call(this, 'GET', endpoint, undefined, qs);
+		responseData = responseData.value;
+	}
+
+	const executionData = this.helpers.constructExecutionMetaData(
+		this.helpers.returnJsonArray(responseData as IDataObject),
+		{ itemData: { item: index } },
+	);
+
+	return executionData;
+}
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
new file mode 100644
index 0000000000000..132fa72b4e862
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/index.ts
@@ -0,0 +1,61 @@
+import type { INodeProperties } from 'n8n-workflow';
+import * as create from './create.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 };
+
+export const description: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				resource: ['calendar'],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a new calendar',
+				action: 'Create a calendar',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a calendar',
+				action: 'Delete a calendar',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Retrieve a calendar',
+				action: 'Get a calendar',
+			},
+			{
+				name: 'Get Many',
+				value: 'getAll',
+				description: 'List and search calendars',
+				action: 'Get many calendars',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update a calendar',
+				action: 'Update a calendar',
+			},
+		],
+		default: 'getAll',
+	},
+
+	...create.description,
+	...del.description,
+	...get.description,
+	...getAll.description,
+	...update.description,
+];
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
new file mode 100644
index 0000000000000..0564a5dc9effe
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/update.operation.ts
@@ -0,0 +1,108 @@
+import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
+import { microsoftApiRequest } from '../../transport';
+import { calendarRLC } from '../../descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+export const properties: INodeProperties[] = [
+	calendarRLC,
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		options: [
+			{
+				displayName: 'Color',
+				name: 'color',
+				type: 'options',
+				default: 'lightBlue',
+				options: [
+					{
+						name: 'Light Blue',
+						value: 'lightBlue',
+					},
+					{
+						name: 'Light Brown',
+						value: 'lightBrown',
+					},
+					{
+						name: 'Light Gray',
+						value: 'lightGray',
+					},
+					{
+						name: 'Light Green',
+						value: 'lightGreen',
+					},
+					{
+						name: 'Light Orange',
+						value: 'lightOrange',
+					},
+					{
+						name: 'Light Pink',
+						value: 'lightPink',
+					},
+					{
+						name: 'Light Red',
+						value: 'lightRed',
+					},
+					{
+						name: 'Light Teal',
+						value: 'lightTeal',
+					},
+					{
+						name: 'Light Yellow',
+						value: 'lightYellow',
+					},
+				],
+				description: 'Specify the color to distinguish the calendar from the others',
+			},
+			{
+				displayName: 'Default Calendar',
+				name: 'isDefaultCalendar',
+				type: 'boolean',
+				default: false,
+			},
+			{
+				displayName: 'Name',
+				name: 'name',
+				type: 'string',
+				default: '',
+				placeholder: 'e.g. My Calendar',
+				description: 'The name of the calendar',
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['calendar'],
+		operation: ['update'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, index: number) {
+	const updateFields = this.getNodeParameter('updateFields', index);
+
+	const calendarId = this.getNodeParameter('calendarId', index, undefined, {
+		extractValue: true,
+	}) as string;
+
+	const endpoint = `/calendars/${calendarId}`;
+
+	const body: IDataObject = {
+		...updateFields,
+	};
+
+	const responseData = await microsoftApiRequest.call(this, 'PATCH', endpoint, body);
+
+	const executionData = this.helpers.constructExecutionMetaData(
+		this.helpers.returnJsonArray(responseData as IDataObject),
+		{ itemData: { item: index } },
+	);
+
+	return executionData;
+}
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
new file mode 100644
index 0000000000000..223dbfb378c78
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/create.operation.ts
@@ -0,0 +1,62 @@
+import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
+import { prepareContactFields } from '../../helpers/utils';
+import { microsoftApiRequest } from '../../transport';
+import { contactFields } from '../../descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+export const properties: INodeProperties[] = [
+	{
+		displayName: 'First Name',
+		name: 'givenName',
+		type: 'string',
+		default: '',
+		required: true,
+	},
+	{
+		displayName: 'Last Name',
+		name: 'surname',
+		type: 'string',
+		default: '',
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		options: contactFields,
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['contact'],
+		operation: ['create'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, index: number) {
+	const additionalFields = this.getNodeParameter('additionalFields', index);
+	const givenName = this.getNodeParameter('givenName', index) as string;
+	const surname = this.getNodeParameter('surname', index) as string;
+
+	const body: IDataObject = {
+		givenName,
+		...prepareContactFields(additionalFields),
+	};
+
+	if (surname) {
+		body.surname = surname;
+	}
+
+	const responseData = await microsoftApiRequest.call(this, 'POST', '/contacts', body);
+
+	const executionData = this.helpers.constructExecutionMetaData(
+		this.helpers.returnJsonArray(responseData as IDataObject),
+		{ itemData: { item: index } },
+	);
+
+	return executionData;
+}
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
new file mode 100644
index 0000000000000..1037021149a93
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/delete.operation.ts
@@ -0,0 +1,29 @@
+import type { IExecuteFunctions, INodeProperties } from 'n8n-workflow';
+import { microsoftApiRequest } from '../../transport';
+import { contactRLC } from '../../descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+export const properties: INodeProperties[] = [contactRLC];
+
+const displayOptions = {
+	show: {
+		resource: ['contact'],
+		operation: ['delete'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, index: number) {
+	const contactId = this.getNodeParameter('contactId', index, undefined, {
+		extractValue: true,
+	}) as string;
+	await microsoftApiRequest.call(this, 'DELETE', `/contacts/${contactId}`);
+
+	const executionData = this.helpers.constructExecutionMetaData(
+		this.helpers.returnJsonArray({ success: true }),
+		{ itemData: { item: index } },
+	);
+
+	return executionData;
+}
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
new file mode 100644
index 0000000000000..6849d04d4644b
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/get.operation.ts
@@ -0,0 +1,85 @@
+import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
+import { contactFields } from '../../helpers/utils';
+import { microsoftApiRequest } from '../../transport';
+import { contactRLC } from '../../descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+export const properties: INodeProperties[] = [
+	contactRLC,
+	{
+		displayName: 'Output',
+		name: 'output',
+		type: 'options',
+		default: 'simple',
+		options: [
+			{
+				name: 'Simplified',
+				value: 'simple',
+			},
+			{
+				name: 'Raw',
+				value: 'raw',
+			},
+			{
+				name: 'Select Included Fields',
+				value: 'fields',
+			},
+		],
+	},
+	{
+		displayName: 'Fields',
+		name: 'fields',
+		type: 'multiOptions',
+		description: 'The fields to add to the output',
+		displayOptions: {
+			show: {
+				output: ['fields'],
+			},
+		},
+		options: contactFields,
+		default: [],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['contact'],
+		operation: ['get'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, index: number) {
+	const qs: IDataObject = {};
+
+	const contactId = this.getNodeParameter('contactId', index, undefined, {
+		extractValue: true,
+	}) as string;
+
+	const output = this.getNodeParameter('output', index) as string;
+
+	if (output === 'fields') {
+		const fields = this.getNodeParameter('fields', index) as string[];
+		qs.$select = fields.join(',');
+	}
+
+	if (output === 'simple') {
+		qs.$select = 'id,displayName,emailAddresses,businessPhones,mobilePhone';
+	}
+
+	const responseData = await microsoftApiRequest.call(
+		this,
+		'GET',
+		`/contacts/${contactId}`,
+		undefined,
+		qs,
+	);
+
+	const executionData = this.helpers.constructExecutionMetaData(
+		this.helpers.returnJsonArray(responseData as IDataObject),
+		{ itemData: { item: index } },
+	);
+
+	return executionData;
+}
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
new file mode 100644
index 0000000000000..dec28b9dd73e0
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/getAll.operation.ts
@@ -0,0 +1,137 @@
+import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
+import { contactFields } from '../../helpers/utils';
+import { microsoftApiRequest, microsoftApiRequestAllItems } from '../../transport';
+import { returnAllOrLimit } from '../../descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+export const properties: INodeProperties[] = [
+	...returnAllOrLimit,
+	{
+		displayName: 'Output',
+		name: 'output',
+		type: 'options',
+		default: 'simple',
+		options: [
+			{
+				name: 'Simplified',
+				value: 'simple',
+			},
+			{
+				name: 'Raw',
+				value: 'raw',
+			},
+			{
+				name: 'Select Included Fields',
+				value: 'fields',
+			},
+		],
+	},
+	{
+		displayName: 'Fields',
+		name: 'fields',
+		type: 'multiOptions',
+		description: 'The fields to add to the output',
+		displayOptions: {
+			show: {
+				output: ['fields'],
+			},
+		},
+		options: contactFields,
+		default: [],
+	},
+	{
+		displayName: 'Filters',
+		name: 'filters',
+		type: 'collection',
+		placeholder: 'Add Filter',
+		default: {},
+		options: [
+			{
+				displayName: 'Filter Query',
+				name: 'custom',
+				type: 'string',
+				default: '',
+				placeholder: "e.g. displayName eq 'John Doe'",
+				hint: 'Search query to filter contacts. <a href="https://learn.microsoft.com/en-us/graph/filter-query-parameter">More info</a>.',
+			},
+			{
+				displayName: 'Email Address',
+				name: 'emailAddress',
+				type: 'string',
+				default: '',
+				description:
+					'If contacts that you want to retrieve have multiple email addresses, you can enter them separated by commas',
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['contact'],
+		operation: ['getAll'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, index: number) {
+	let responseData;
+	const qs = {} as IDataObject;
+
+	const returnAll = this.getNodeParameter('returnAll', index);
+	const filters = this.getNodeParameter('filters', index, {});
+	const output = this.getNodeParameter('output', index) as string;
+
+	if (output === 'fields') {
+		const fields = this.getNodeParameter('fields', index) as string[];
+		qs.$select = fields.join(',');
+	}
+
+	if (output === 'simple') {
+		qs.$select = 'id,displayName,emailAddresses,businessPhones,mobilePhone';
+	}
+
+	if (Object.keys(filters).length) {
+		const filterString: string[] = [];
+
+		if (filters.emailAddress) {
+			const emails = (filters.emailAddress as string)
+				.split(',')
+				.map((email) => `emailAddresses/any(a:a/address eq '${email.trim()}')`);
+			filterString.push(emails.join(' and '));
+		}
+
+		if (filters.custom) {
+			filterString.push(filters.custom as string);
+		}
+
+		if (filterString.length) {
+			qs.$filter = filterString.join(' and ');
+		}
+	}
+
+	const endpoint = '/contacts';
+
+	if (returnAll) {
+		responseData = await microsoftApiRequestAllItems.call(
+			this,
+			'value',
+			'GET',
+			endpoint,
+			undefined,
+			qs,
+		);
+	} else {
+		qs.$top = this.getNodeParameter('limit', index);
+		responseData = await microsoftApiRequest.call(this, 'GET', endpoint, undefined, qs);
+		responseData = responseData.value;
+	}
+
+	const executionData = this.helpers.constructExecutionMetaData(
+		this.helpers.returnJsonArray(responseData as IDataObject[]),
+		{ itemData: { item: index } },
+	);
+
+	return executionData;
+}
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
new file mode 100644
index 0000000000000..81d2bbcf4ed96
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/index.ts
@@ -0,0 +1,60 @@
+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 update from './update.operation';
+
+export { create, del as delete, get, getAll, update };
+
+export const description: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				resource: ['contact'],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a new contact',
+				action: 'Create a contact',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a contact',
+				action: 'Delete a contact',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Retrieve a contact',
+				action: 'Get a contact',
+			},
+			{
+				name: 'Get Many',
+				value: 'getAll',
+				description: 'List and search contacts',
+				action: 'Get many contacts',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update a contact',
+				action: 'Update a contact',
+			},
+		],
+		default: 'getAll',
+	},
+	...create.description,
+	...del.description,
+	...get.description,
+	...getAll.description,
+	...update.description,
+];
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
new file mode 100644
index 0000000000000..07ffde1fda04b
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/update.operation.ts
@@ -0,0 +1,49 @@
+import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
+import { prepareContactFields } from '../../helpers/utils';
+import { microsoftApiRequest } from '../../transport';
+import { contactFields, contactRLC } from '../../descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+export const properties: INodeProperties[] = [
+	contactRLC,
+	{
+		displayName: 'Update Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		options: contactFields,
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['contact'],
+		operation: ['update'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, index: number) {
+	const additionalFields = this.getNodeParameter('additionalFields', index);
+	const contactId = this.getNodeParameter('contactId', index, undefined, {
+		extractValue: true,
+	}) as string;
+
+	const body: IDataObject = prepareContactFields(additionalFields);
+
+	const responseData = await microsoftApiRequest.call(
+		this,
+		'PATCH',
+		`/contacts/${contactId}`,
+		body,
+	);
+
+	const executionData = this.helpers.constructExecutionMetaData(
+		this.helpers.returnJsonArray(responseData as IDataObject),
+		{ itemData: { item: index } },
+	);
+
+	return executionData;
+}
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
new file mode 100644
index 0000000000000..f7f6bb3c48268
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/create.operation.ts
@@ -0,0 +1,259 @@
+import type {
+	IBinaryKeyData,
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+import { NodeOperationError } from 'n8n-workflow';
+import { createMessage } from '../../helpers/utils';
+import { microsoftApiRequest } from '../../transport';
+import { updateDisplayOptions } from '@utils/utilities';
+
+export const properties: INodeProperties[] = [
+	{
+		displayName: 'Subject',
+		name: 'subject',
+		description: 'The subject of the message',
+		type: 'string',
+		default: '',
+	},
+	{
+		displayName: 'Message',
+		name: 'bodyContent',
+		description: 'Message body content',
+		type: 'string',
+		typeOptions: {
+			rows: 2,
+		},
+		default: '',
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		options: [
+			{
+				displayName: 'Attachments',
+				name: 'attachments',
+				type: 'fixedCollection',
+				placeholder: 'Add Attachment',
+				default: {},
+				typeOptions: {
+					multipleValues: true,
+				},
+				options: [
+					{
+						name: 'attachments',
+						displayName: 'Attachment',
+						values: [
+							{
+								displayName: 'Input Data Field Name',
+								name: 'binaryPropertyName',
+								type: 'string',
+								default: '',
+								placeholder: 'e.g. data',
+								hint: 'The name of the input field containing the binary file data to be attached',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'BCC Recipients',
+				name: 'bccRecipients',
+				description: 'Comma-separated list of email addresses of BCC recipients',
+				type: 'string',
+				placeholder: 'e.g. john@example.com',
+				default: '',
+			},
+			{
+				displayName: 'Category Names or IDs',
+				name: 'categories',
+				type: 'multiOptions',
+				description:
+					'Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
+				typeOptions: {
+					loadOptionsMethod: 'getCategoriesNames',
+				},
+				default: [],
+			},
+			{
+				displayName: 'CC Recipients',
+				name: 'ccRecipients',
+				description: 'Comma-separated list of email addresses of CC recipients',
+				type: 'string',
+				placeholder: 'e.g. john@example.com',
+				default: '',
+			},
+			{
+				displayName: 'Custom Headers',
+				name: 'internetMessageHeaders',
+				placeholder: 'Add Header',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: true,
+				},
+				default: {},
+				options: [
+					{
+						name: 'headers',
+						displayName: 'Header',
+						values: [
+							{
+								displayName: 'Name',
+								name: 'name',
+								type: 'string',
+								default: '',
+								description: 'Name of the header',
+							},
+							{
+								displayName: 'Value',
+								name: 'value',
+								type: 'string',
+								default: '',
+								description: 'Value to set for the header',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'From',
+				name: 'from',
+				description:
+					'The owner of the mailbox from which the message is sent. Must correspond to the actual mailbox used.',
+				type: 'string',
+				placeholder: 'e.g. john@example.com',
+				default: '',
+			},
+			{
+				displayName: 'Importance',
+				name: 'importance',
+				description: 'The importance of the message',
+				type: 'options',
+				options: [
+					{
+						name: 'Low',
+						value: 'Low',
+					},
+					{
+						name: 'Normal',
+						value: 'Normal',
+					},
+					{
+						name: 'High',
+						value: 'High',
+					},
+				],
+				default: 'Normal',
+			},
+			{
+				displayName: 'Message Type',
+				name: 'bodyContentType',
+				description: 'Message body content type',
+				type: 'options',
+				options: [
+					{
+						name: 'HTML',
+						value: 'html',
+					},
+					{
+						name: 'Text',
+						value: 'Text',
+					},
+				],
+				default: 'html',
+			},
+			{
+				displayName: 'Read Receipt Requested',
+				name: 'isReadReceiptRequested',
+				description: 'Whether a read receipt is requested for the message',
+				type: 'boolean',
+				default: false,
+			},
+			{
+				displayName: 'Reply To',
+				name: 'replyTo',
+				description: 'Email address to use when replying',
+				type: 'string',
+				placeholder: 'e.g. replyto@example.com',
+				default: '',
+			},
+			{
+				displayName: 'To',
+				name: 'toRecipients',
+				description: 'Comma-separated list of email addresses of recipients',
+				type: 'string',
+				placeholder: 'e.g. john@example.com',
+				default: '',
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['draft'],
+		operation: ['create'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, index: number, items: INodeExecutionData[]) {
+	const additionalFields = this.getNodeParameter('additionalFields', index);
+	const subject = this.getNodeParameter('subject', index) as string;
+	const bodyContent = this.getNodeParameter('bodyContent', index, '') as string;
+
+	additionalFields.subject = subject;
+
+	additionalFields.bodyContent = bodyContent || ' ';
+
+	// Create message object from optional fields
+	const body: IDataObject = createMessage(additionalFields);
+
+	if (additionalFields.attachments) {
+		const attachments = (additionalFields.attachments as IDataObject).attachments as IDataObject[];
+
+		// // Handle attachments
+		body.attachments = attachments.map((attachment) => {
+			const binaryPropertyName = attachment.binaryPropertyName as string;
+
+			if (items[index].binary === undefined) {
+				throw new NodeOperationError(this.getNode(), 'No binary data exists on item!', {
+					itemIndex: index,
+				});
+			}
+
+			if (
+				items[index].binary &&
+				(items[index].binary as IDataObject)[binaryPropertyName] === undefined
+			) {
+				throw new NodeOperationError(
+					this.getNode(),
+					`No binary data property "${binaryPropertyName}" does not exists on item!`,
+					{ itemIndex: index },
+				);
+			}
+
+			const binaryData = (items[index].binary as IBinaryKeyData)[binaryPropertyName];
+			return {
+				'@odata.type': '#microsoft.graph.fileAttachment',
+				name: binaryData.fileName,
+				contentBytes: binaryData.data,
+			};
+		});
+	}
+
+	const responseData = await microsoftApiRequest.call(this, 'POST', '/messages', body, {});
+
+	const executionData = this.helpers.constructExecutionMetaData(
+		this.helpers.returnJsonArray(responseData as IDataObject),
+		{ itemData: { item: index } },
+	);
+
+	return executionData;
+}
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
new file mode 100644
index 0000000000000..1ff992d821450
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/delete.operation.ts
@@ -0,0 +1,29 @@
+import type { IExecuteFunctions, INodeProperties } from 'n8n-workflow';
+import { microsoftApiRequest } from '../../transport';
+import { draftRLC } from '../../descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+export const properties: INodeProperties[] = [draftRLC];
+
+const displayOptions = {
+	show: {
+		resource: ['draft'],
+		operation: ['delete'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, index: number) {
+	const draftId = this.getNodeParameter('draftId', index, undefined, {
+		extractValue: true,
+	}) as string;
+	await microsoftApiRequest.call(this, 'DELETE', `/messages/${draftId}`);
+
+	const executionData = this.helpers.constructExecutionMetaData(
+		this.helpers.returnJsonArray({ success: true }),
+		{ itemData: { item: index } },
+	);
+
+	return executionData;
+}
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
new file mode 100644
index 0000000000000..3e69d91f5b68e
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/get.operation.ts
@@ -0,0 +1,127 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+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,
+	{
+		displayName: 'Output',
+		name: 'output',
+		type: 'options',
+		default: 'simple',
+		options: [
+			{
+				name: 'Simplified',
+				value: 'simple',
+			},
+			{
+				name: 'Raw',
+				value: 'raw',
+			},
+			{
+				name: 'Select Included Fields',
+				value: 'fields',
+			},
+		],
+	},
+	{
+		displayName: 'Fields',
+		name: 'fields',
+		type: 'multiOptions',
+		description: 'The fields to add to the output',
+		displayOptions: {
+			show: {
+				output: ['fields'],
+			},
+		},
+		options: messageFields,
+		default: [],
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			{
+				displayName: 'Attachments Prefix',
+				name: 'attachmentsPrefix',
+				type: 'string',
+				default: 'attachment_',
+				description:
+					'Prefix for name of the output fields to put the binary files data in. An index starting from 0 will be added. So if name is "attachment_" the first attachment is saved to "attachment_0".',
+			},
+			{
+				displayName: 'Download Attachments',
+				name: 'downloadAttachments',
+				type: 'boolean',
+				default: false,
+				description:
+					"Whether the message's attachments will be downloaded and included in the output",
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['draft'],
+		operation: ['get'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, index: number) {
+	let responseData;
+	const qs: IDataObject = {};
+
+	const draftId = this.getNodeParameter('draftId', index, undefined, {
+		extractValue: true,
+	}) as string;
+	const options = this.getNodeParameter('options', index, {});
+	const output = this.getNodeParameter('output', index) as string;
+
+	if (output === 'fields') {
+		const fields = this.getNodeParameter('fields', index) as string[];
+
+		if (options.downloadAttachments) {
+			fields.push('hasAttachments');
+		}
+
+		qs.$select = fields.join(',');
+	}
+
+	if (output === 'simple') {
+		qs.$select =
+			'id,conversationId,subject,bodyPreview,from,toRecipients,categories,hasAttachments';
+	}
+
+	responseData = await microsoftApiRequest.call(this, 'GET', `/messages/${draftId}`, undefined, qs);
+
+	if (output === 'simple') {
+		responseData = simplifyOutputMessages([responseData as IDataObject]);
+	}
+
+	let executionData: INodeExecutionData[] = [];
+
+	if (options.downloadAttachments) {
+		const prefix = (options.attachmentsPrefix as string) || 'attachment_';
+		executionData = await downloadAttachments.call(this, responseData as IDataObject, prefix);
+	} else {
+		executionData = this.helpers.constructExecutionMetaData(
+			this.helpers.returnJsonArray(responseData as IDataObject),
+			{ itemData: { item: index } },
+		);
+	}
+
+	return executionData;
+}
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
new file mode 100644
index 0000000000000..9e8cc5cd1118d
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/index.ts
@@ -0,0 +1,61 @@
+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 send from './send.operation';
+import * as update from './update.operation';
+
+export { create, del as delete, get, send, update };
+
+export const description: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				resource: ['draft'],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a new email draft',
+				action: 'Create a draft',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete an email draft',
+				action: 'Delete a draft',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Retrieve an email draft',
+				action: 'Get a draft',
+			},
+			{
+				name: 'Send',
+				value: 'send',
+				description: 'Send an existing email draft',
+				action: 'Send a draft',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update an email draft',
+				action: 'Update a draft',
+			},
+		],
+		default: 'create',
+	},
+
+	...create.description,
+	...del.description,
+	...get.description,
+	...send.description,
+	...update.description,
+];
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
new file mode 100644
index 0000000000000..a97d8a12c59e9
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/send.operation.ts
@@ -0,0 +1,52 @@
+import type { IExecuteFunctions, INodeProperties } from 'n8n-workflow';
+import { makeRecipient } from '../../helpers/utils';
+import { microsoftApiRequest } from '../../transport';
+import { draftRLC } from '../../descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+export const properties: INodeProperties[] = [
+	draftRLC,
+	{
+		displayName: 'To',
+		name: 'to',
+		description: 'Comma-separated list of email addresses of recipients',
+		type: 'string',
+		default: '',
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['draft'],
+		operation: ['send'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, index: number) {
+	const draftId = this.getNodeParameter('draftId', index, undefined, { extractValue: true });
+	const to = this.getNodeParameter('to', index) as string;
+
+	if (to) {
+		const recipients = to
+			.split(',')
+			.map((s) => s.trim())
+			.filter((email) => email);
+
+		if (recipients.length !== 0) {
+			await microsoftApiRequest.call(this, 'PATCH', `/messages/${draftId}`, {
+				toRecipients: recipients.map((recipient: string) => makeRecipient(recipient)),
+			});
+		}
+	}
+
+	await microsoftApiRequest.call(this, 'POST', `/messages/${draftId}/send`);
+
+	const executionData = this.helpers.constructExecutionMetaData(
+		this.helpers.returnJsonArray({ success: true }),
+		{ itemData: { item: index } },
+	);
+
+	return executionData;
+}
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
new file mode 100644
index 0000000000000..bc5a03564e996
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/update.operation.ts
@@ -0,0 +1,206 @@
+import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
+import { createMessage } from '../../helpers/utils';
+import { microsoftApiRequest } from '../../transport';
+import { draftRLC } from '../../descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+export const properties: INodeProperties[] = [
+	draftRLC,
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		options: [
+			{
+				displayName: 'BCC Recipients',
+				name: 'bccRecipients',
+				description: 'Comma-separated list of email addresses of BCC recipients',
+				type: 'string',
+				placeholder: 'e.g. john@example.com',
+				default: '',
+			},
+			{
+				displayName: 'Category Names or IDs',
+				name: 'categories',
+				type: 'multiOptions',
+				description:
+					'Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
+				typeOptions: {
+					loadOptionsMethod: 'getCategoriesNames',
+				},
+				default: [],
+			},
+			{
+				displayName: 'CC Recipients',
+				name: 'ccRecipients',
+				description: 'Comma-separated list of email addresses of CC recipients',
+				type: 'string',
+				placeholder: 'e.g. john@example.com',
+				default: '',
+			},
+			{
+				displayName: 'Custom Headers',
+				name: 'internetMessageHeaders',
+				placeholder: 'Add Header',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: true,
+				},
+				default: {},
+				options: [
+					{
+						name: 'headers',
+						displayName: 'Header',
+						values: [
+							{
+								displayName: 'Name',
+								name: 'name',
+								type: 'string',
+								default: '',
+								description: 'Name of the header',
+							},
+							{
+								displayName: 'Value',
+								name: 'value',
+								type: 'string',
+								default: '',
+								description: 'Value to set for the header',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'From',
+				name: 'from',
+				description:
+					'The owner of the mailbox from which the message is sent. Must correspond to the actual mailbox used.',
+				type: 'string',
+				placeholder: 'e.g. john@example.com',
+				default: '',
+			},
+			{
+				displayName: 'Importance',
+				name: 'importance',
+				description: 'The importance of the message',
+				type: 'options',
+				options: [
+					{
+						name: 'Low',
+						value: 'Low',
+					},
+					{
+						name: 'Normal',
+						value: 'Normal',
+					},
+					{
+						name: 'High',
+						value: 'High',
+					},
+				],
+				default: 'Normal',
+			},
+			{
+				displayName: 'Is Read',
+				name: 'isRead',
+				description: 'Whether the message must be marked as read',
+				type: 'boolean',
+				default: false,
+			},
+			{
+				displayName: 'Message',
+				name: 'bodyContent',
+				description: 'Message body content',
+				type: 'string',
+				typeOptions: {
+					rows: 2,
+				},
+				default: '',
+			},
+			{
+				displayName: 'Message Type',
+				name: 'bodyContentType',
+				description: 'Message body content type',
+				type: 'options',
+				options: [
+					{
+						name: 'HTML',
+						value: 'html',
+					},
+					{
+						name: 'Text',
+						value: 'Text',
+					},
+				],
+				default: 'html',
+			},
+			{
+				displayName: 'Read Receipt Requested',
+				name: 'isReadReceiptRequested',
+				description: 'Whether a read receipt is requested for the message',
+				type: 'boolean',
+				default: false,
+			},
+			{
+				displayName: 'Reply To',
+				name: 'replyTo',
+				description: 'Email address to use when replying',
+				type: 'string',
+				placeholder: 'e.g. replyto@example.com',
+				default: '',
+			},
+			{
+				displayName: 'Subject',
+				name: 'subject',
+				description: 'The subject of the message',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'To',
+				name: 'toRecipients',
+				description: 'Comma-separated list of email addresses of recipients',
+				type: 'string',
+				placeholder: 'e.g. john@example.com',
+				default: '',
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['draft'],
+		operation: ['update'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, index: number) {
+	const draftId = this.getNodeParameter('draftId', index, undefined, {
+		extractValue: true,
+	}) as string;
+
+	const updateFields = this.getNodeParameter('updateFields', index);
+
+	// Create message from optional fields
+	const body: IDataObject = createMessage(updateFields);
+
+	const responseData = await microsoftApiRequest.call(
+		this,
+		'PATCH',
+		`/messages/${draftId}`,
+		body,
+		{},
+	);
+
+	const executionData = this.helpers.constructExecutionMetaData(
+		this.helpers.returnJsonArray(responseData as IDataObject),
+		{ itemData: { item: index } },
+	);
+
+	return executionData;
+}
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
new file mode 100644
index 0000000000000..dd4c7f7bc4060
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/create.operation.ts
@@ -0,0 +1,290 @@
+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 { updateDisplayOptions } from '@utils/utilities';
+
+export const properties: INodeProperties[] = [
+	calendarRLC,
+	{
+		displayName: 'Title',
+		name: 'subject',
+		type: 'string',
+		default: '',
+		required: true,
+	},
+	{
+		displayName: 'Start',
+		name: 'startDateTime',
+		type: 'dateTime',
+		default: DateTime.now().toISO(),
+		required: true,
+	},
+	{
+		displayName: 'End',
+		name: 'endDateTime',
+		type: 'dateTime',
+		required: true,
+		default: DateTime.now().plus({ minutes: 30 }).toISO(),
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		options: [
+			{
+				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-multi-options
+				displayName: 'Categories',
+				name: 'categories',
+				type: 'multiOptions',
+				description:
+					'Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
+				typeOptions: {
+					loadOptionsMethod: 'getCategoriesNames',
+				},
+				default: [],
+			},
+			{
+				displayName: 'Description',
+				name: 'body',
+				type: 'string',
+				typeOptions: {
+					rows: 2,
+				},
+				default: '',
+			},
+			{
+				displayName: 'Description Preview',
+				name: 'bodyPreview',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Hide Attendees',
+				name: 'hideAttendees',
+				type: 'boolean',
+				default: false,
+				description:
+					'Whether to allow each attendee to only see themselves in the meeting request and meeting tracking list',
+			},
+			{
+				displayName: 'Importance',
+				name: 'importance',
+				type: 'options',
+				options: [
+					{
+						name: 'Low',
+						value: 'low',
+					},
+					{
+						name: 'Normal',
+						value: 'normal',
+					},
+					{
+						name: 'High',
+						value: 'high',
+					},
+				],
+				default: 'normal',
+			},
+			{
+				displayName: 'Is All Day',
+				name: 'isAllDay',
+				type: 'boolean',
+				default: false,
+			},
+			{
+				displayName: 'Is Cancelled',
+				name: 'isCancelled',
+				type: 'boolean',
+				default: false,
+			},
+			{
+				displayName: 'Is Draft',
+				name: 'isDraft',
+				type: 'boolean',
+				default: false,
+			},
+			{
+				displayName: 'Is Online Meeting',
+				name: 'isOnlineMeeting',
+				type: 'boolean',
+				default: false,
+			},
+			{
+				displayName: 'Sensitivity',
+				name: 'sensitivity',
+				type: 'options',
+				default: 'normal',
+				options: [
+					{
+						name: 'Normal',
+						value: 'normal',
+					},
+					{
+						name: 'Personal',
+						value: 'personal',
+					},
+					{
+						name: 'Private',
+						value: 'private',
+					},
+					{
+						name: 'Confidential',
+						value: 'confidential',
+					},
+				],
+			},
+			{
+				displayName: 'Show As',
+				name: 'showAs',
+				type: 'options',
+				default: 'free',
+				options: [
+					{
+						name: 'Busy',
+						value: 'busy',
+					},
+					{
+						name: 'Free',
+						value: 'free',
+					},
+					{
+						name: 'Oof',
+						value: 'oof',
+					},
+					{
+						name: 'Tentative',
+						value: 'tentative',
+					},
+					{
+						name: 'Working Elsewhere',
+						value: 'workingElsewhere',
+					},
+				],
+			},
+			{
+				displayName: 'Timezone',
+				name: 'timeZone',
+				type: 'options',
+				default: 'UTC',
+				options: moment.tz.names().map((name) => ({
+					name,
+					value: name,
+				})),
+			},
+			{
+				displayName: 'Type',
+				name: 'type',
+				type: 'options',
+				default: 'singleInstance',
+				options: [
+					{
+						name: 'Single Instance',
+						value: 'singleInstance',
+					},
+					{
+						name: 'Occurrence',
+						value: 'occurrence',
+					},
+					{
+						name: 'Exception',
+						value: 'exception',
+					},
+					{
+						name: 'Series Master',
+						value: 'seriesMaster',
+					},
+				],
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['event'],
+		operation: ['create'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, index: number) {
+	let additionalFields = this.getNodeParameter('additionalFields', index);
+
+	additionalFields = Object.keys(additionalFields).reduce((acc: IDataObject, key: string) => {
+		if (additionalFields[key] !== '' || additionalFields[key] !== undefined) {
+			acc[key] = additionalFields[key];
+		}
+		return acc;
+	}, {});
+
+	const calendarId = this.getNodeParameter('calendarId', index, '', {
+		extractValue: true,
+	}) as string;
+
+	if (calendarId === '') {
+		throw new NodeOperationError(this.getNode(), 'Calendar ID is required');
+	}
+	const subject = this.getNodeParameter('subject', index) as string;
+
+	const endpoint = `/calendars/${calendarId}/events`;
+
+	let timeZone = 'UTC';
+
+	if (additionalFields.timeZone) {
+		timeZone = additionalFields.timeZone as string;
+		delete additionalFields.timeZone;
+	}
+
+	if (additionalFields.body) {
+		additionalFields.body = {
+			content: additionalFields.body,
+			contentType: 'html',
+		};
+	}
+
+	let startDateTime = this.getNodeParameter('startDateTime', index) as string;
+	let endDateTime = this.getNodeParameter('endDateTime', index) as string;
+
+	if (additionalFields.isAllDay) {
+		startDateTime = DateTime.fromISO(startDateTime, { zone: timeZone }).toFormat('yyyy-MM-dd');
+		endDateTime = DateTime.fromISO(endDateTime, { zone: timeZone }).toFormat('yyyy-MM-dd');
+
+		const minimalWholeDayDuration = 24;
+		const duration = DateTime.fromISO(startDateTime, { zone: timeZone }).diff(
+			DateTime.fromISO(endDateTime, { zone: timeZone }),
+		).hours;
+
+		if (duration < minimalWholeDayDuration) {
+			endDateTime = DateTime.fromISO(startDateTime, { zone: timeZone }).plus({ hours: 24 }).toISO();
+		}
+	}
+
+	const body: IDataObject = {
+		subject,
+		start: {
+			dateTime: startDateTime,
+			timeZone,
+		},
+		end: {
+			dateTime: endDateTime,
+			timeZone,
+		},
+		...additionalFields,
+	};
+
+	const responseData = await microsoftApiRequest.call(this, 'POST', endpoint, body);
+
+	const executionData = this.helpers.constructExecutionMetaData(
+		this.helpers.returnJsonArray(responseData as IDataObject),
+		{ itemData: { item: index } },
+	);
+
+	return executionData;
+}
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
new file mode 100644
index 0000000000000..b211ef8c1c06a
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/delete.operation.ts
@@ -0,0 +1,33 @@
+import type { IExecuteFunctions, INodeProperties } from 'n8n-workflow';
+import { microsoftApiRequest } from '../../transport';
+import { calendarRLC, eventRLC } from '../../descriptions';
+import { decodeOutlookId } from '../../helpers/utils';
+import { updateDisplayOptions } from '@utils/utilities';
+
+export const properties: INodeProperties[] = [calendarRLC, eventRLC];
+
+const displayOptions = {
+	show: {
+		resource: ['event'],
+		operation: ['delete'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, index: number) {
+	const eventId = decodeOutlookId(
+		this.getNodeParameter('eventId', index, undefined, {
+			extractValue: true,
+		}) as string,
+	);
+
+	await microsoftApiRequest.call(this, 'DELETE', `/calendar/events/${eventId}`);
+
+	const executionData = this.helpers.constructExecutionMetaData(
+		this.helpers.returnJsonArray({ success: true }),
+		{ itemData: { item: index } },
+	);
+
+	return executionData;
+}
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
new file mode 100644
index 0000000000000..54f32d7935509
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/get.operation.ts
@@ -0,0 +1,84 @@
+import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
+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,
+	eventRLC,
+	{
+		displayName: 'Output',
+		name: 'output',
+		type: 'options',
+		default: 'simple',
+		options: [
+			{
+				name: 'Simplified',
+				value: 'simple',
+			},
+			{
+				name: 'Raw',
+				value: 'raw',
+			},
+			{
+				name: 'Select Included Fields',
+				value: 'fields',
+			},
+		],
+	},
+	{
+		displayName: 'Fields',
+		name: 'fields',
+		type: 'multiOptions',
+		description: 'The fields to add to the output',
+		displayOptions: {
+			show: {
+				output: ['fields'],
+			},
+		},
+		options: eventfields,
+		default: [],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['event'],
+		operation: ['get'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, index: number) {
+	const qs = {} as IDataObject;
+
+	const eventId = decodeOutlookId(
+		this.getNodeParameter('eventId', index, undefined, {
+			extractValue: true,
+		}) as string,
+	);
+
+	const output = this.getNodeParameter('output', index) as string;
+
+	if (output === 'fields') {
+		const fields = this.getNodeParameter('fields', index) as string[];
+		qs.$select = fields.join(',');
+	}
+
+	if (output === 'simple') {
+		qs.$select = 'id,subject,bodyPreview,start,end,organizer,attendees,webLink';
+	}
+
+	const endpoint = `/calendar/events/${eventId}`;
+
+	const responseData = await microsoftApiRequest.call(this, 'GET', endpoint, undefined, qs);
+
+	const executionData = this.helpers.constructExecutionMetaData(
+		this.helpers.returnJsonArray(responseData as IDataObject[]),
+		{ itemData: { item: index } },
+	);
+
+	return executionData;
+}
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
new file mode 100644
index 0000000000000..60246daffafc0
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/getAll.operation.ts
@@ -0,0 +1,162 @@
+import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
+import { eventfields } from '../../helpers/utils';
+import { microsoftApiRequest, microsoftApiRequestAllItems } from '../../transport';
+import { calendarRLC, returnAllOrLimit } from '../../descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+export const properties: INodeProperties[] = [
+	{
+		displayName: 'From All Calendars',
+		name: 'fromAllCalendars',
+		type: 'boolean',
+		default: true,
+	},
+	{
+		...calendarRLC,
+		displayOptions: {
+			show: {
+				fromAllCalendars: [false],
+			},
+		},
+	},
+	...returnAllOrLimit,
+	{
+		displayName: 'Output',
+		name: 'output',
+		type: 'options',
+		default: 'simple',
+		options: [
+			{
+				name: 'Simplified',
+				value: 'simple',
+			},
+			{
+				name: 'Raw',
+				value: 'raw',
+			},
+			{
+				name: 'Select Included Fields',
+				value: 'fields',
+			},
+		],
+	},
+	{
+		displayName: 'Fields',
+		name: 'fields',
+		type: 'multiOptions',
+		description: 'The fields to add to the output',
+		displayOptions: {
+			show: {
+				output: ['fields'],
+			},
+		},
+		options: eventfields,
+		default: [],
+	},
+	{
+		displayName: 'Filters',
+		name: 'filters',
+		type: 'collection',
+		placeholder: 'Add Filter',
+		default: {},
+		options: [
+			{
+				displayName: 'Filter Query',
+				name: 'custom',
+				type: 'string',
+				default: '',
+				placeholder: "e.g. contains(subject,'Hello')",
+				hint: 'Search query to filter events. <a href="https://learn.microsoft.com/en-us/graph/filter-query-parameter">More info</a>.',
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['event'],
+		operation: ['getAll'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, index: number) {
+	const responseData: IDataObject[] = [];
+	const qs = {} as IDataObject;
+
+	const returnAll = this.getNodeParameter('returnAll', index);
+	const filters = this.getNodeParameter('filters', index, {});
+	const output = this.getNodeParameter('output', index) as string;
+
+	if (output === 'fields') {
+		const fields = this.getNodeParameter('fields', index) as string[];
+		qs.$select = fields.join(',');
+	}
+
+	if (output === 'simple') {
+		qs.$select = 'id,subject,bodyPreview,start,end,organizer,attendees,webLink';
+	}
+
+	if (Object.keys(filters).length) {
+		const filterString: string[] = [];
+
+		if (filters.custom) {
+			filterString.push(filters.custom as string);
+		}
+
+		if (filterString.length) {
+			qs.$filter = filterString.join(' and ');
+		}
+	}
+
+	const calendars: string[] = [];
+
+	const fromAllCalendars = this.getNodeParameter('fromAllCalendars', index) as boolean;
+
+	if (fromAllCalendars) {
+		const response = await microsoftApiRequest.call(this, 'GET', '/calendars', undefined, {
+			$select: 'id',
+		});
+		for (const calendar of response.value) {
+			calendars.push(calendar.id as string);
+		}
+	} else {
+		const calendarId = this.getNodeParameter('calendarId', index, undefined, {
+			extractValue: true,
+		}) as string;
+
+		calendars.push(calendarId);
+	}
+	const limit = this.getNodeParameter('limit', index, 0);
+
+	for (const calendarId of calendars) {
+		const endpoint = `/calendars/${calendarId}/events`;
+
+		if (returnAll) {
+			const response = await microsoftApiRequestAllItems.call(
+				this,
+				'value',
+				'GET',
+				endpoint,
+				undefined,
+				qs,
+			);
+			responseData.push(...response);
+		} else {
+			qs.$top = limit - responseData.length;
+
+			if (qs.$top <= 0) break;
+
+			const response = await microsoftApiRequest.call(this, 'GET', endpoint, undefined, qs);
+			responseData.push(...response.value);
+		}
+	}
+
+	const executionData = this.helpers.constructExecutionMetaData(
+		this.helpers.returnJsonArray(responseData),
+		{ itemData: { item: index } },
+	);
+
+	return executionData;
+}
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
new file mode 100644
index 0000000000000..d2881a1858b2a
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/index.ts
@@ -0,0 +1,61 @@
+import type { INodeProperties } from 'n8n-workflow';
+import * as create from './create.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 };
+
+export const description: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				resource: ['event'],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a new event',
+				action: 'Create an event',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete an event',
+				action: 'Delete an event',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Retrieve an event',
+				action: 'Get an event',
+			},
+			{
+				name: 'Get Many',
+				value: 'getAll',
+				description: 'List and search events',
+				action: 'Get many events',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update an event',
+				action: 'Update an event',
+			},
+		],
+		default: 'getAll',
+	},
+
+	...create.description,
+	...del.description,
+	...get.description,
+	...getAll.description,
+	...update.description,
+];
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
new file mode 100644
index 0000000000000..ab3336fd8ba8c
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/update.operation.ts
@@ -0,0 +1,283 @@
+import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
+
+import { DateTime } from 'luxon';
+import { microsoftApiRequest } from '../../transport';
+import { calendarRLC, eventRLC } from '../../descriptions';
+import { decodeOutlookId } from '../../helpers/utils';
+import { updateDisplayOptions } from '@utils/utilities';
+
+export const properties: INodeProperties[] = [
+	calendarRLC,
+	eventRLC,
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		options: [
+			{
+				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-multi-options
+				displayName: 'Categories',
+				name: 'categories',
+				type: 'multiOptions',
+				description:
+					'Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
+				typeOptions: {
+					loadOptionsMethod: 'getCategoriesNames',
+				},
+				default: [],
+			},
+			{
+				displayName: 'Description',
+				name: 'body',
+				type: 'string',
+				typeOptions: {
+					rows: 2,
+				},
+				default: '',
+			},
+			{
+				displayName: 'Description Preview',
+				name: 'bodyPreview',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'End',
+				name: 'end',
+				type: 'dateTime',
+				default: '',
+			},
+			{
+				displayName: 'Hide Attendees',
+				name: 'hideAttendees',
+				type: 'boolean',
+				default: false,
+				description:
+					'Whether to allow each attendee to only see themselves in the meeting request and meeting tracking list',
+			},
+			{
+				displayName: 'Importance',
+				name: 'importance',
+				type: 'options',
+				default: 'low',
+				options: [
+					{
+						name: 'Low',
+						value: 'low',
+					},
+					{
+						name: 'Normal',
+						value: 'normal',
+					},
+					{
+						name: 'High',
+						value: 'high',
+					},
+				],
+			},
+			{
+				displayName: 'Is All Day',
+				name: 'isAllDay',
+				type: 'boolean',
+				default: false,
+			},
+			{
+				displayName: 'Is Cancelled',
+				name: 'isCancelled',
+				type: 'boolean',
+				default: false,
+			},
+			{
+				displayName: 'Is Draft',
+				name: 'isDraft',
+				type: 'boolean',
+				default: false,
+			},
+			{
+				displayName: 'Is Online Meeting',
+				name: 'isOnlineMeeting',
+				type: 'boolean',
+				default: true,
+			},
+			{
+				displayName: 'Sensitivity',
+				name: 'sensitivity',
+				type: 'options',
+				default: 'normal',
+				options: [
+					{
+						name: 'Normal',
+						value: 'normal',
+					},
+					{
+						name: 'Personal',
+						value: 'personal',
+					},
+					{
+						name: 'Private',
+						value: 'private',
+					},
+					{
+						name: 'Confidential',
+						value: 'confidential',
+					},
+				],
+			},
+			{
+				displayName: 'Show As',
+				name: 'showAs',
+				type: 'options',
+				default: 'free',
+				options: [
+					{
+						name: 'Busy',
+						value: 'busy',
+					},
+					{
+						name: 'Free',
+						value: 'free',
+					},
+					{
+						name: 'Oof',
+						value: 'oof',
+					},
+					{
+						name: 'Tentative',
+						value: 'tentative',
+					},
+					{
+						name: 'Working Elsewhere',
+						value: 'workingElsewhere',
+					},
+				],
+			},
+			{
+				displayName: 'Start',
+				name: 'start',
+				type: 'dateTime',
+				default: '',
+			},
+			{
+				displayName: 'Timezone',
+				name: 'timeZone',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Title',
+				name: 'subject',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Type',
+				name: 'type',
+				type: 'options',
+				default: 'singleInstance',
+				options: [
+					{
+						name: 'Single Instance',
+						value: 'singleInstance',
+					},
+					{
+						name: 'Occurrence',
+						value: 'occurrence',
+					},
+					{
+						name: 'Exception',
+						value: 'exception',
+					},
+					{
+						name: 'Series Master',
+						value: 'seriesMaster',
+					},
+				],
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['event'],
+		operation: ['update'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, index: number) {
+	const additionalFields = this.getNodeParameter('additionalFields', index);
+
+	const eventId = decodeOutlookId(
+		this.getNodeParameter('eventId', index, undefined, {
+			extractValue: true,
+		}) as string,
+	);
+
+	let timeZone = 'UTC';
+
+	if (additionalFields.timeZone) {
+		timeZone = additionalFields.timeZone as string;
+		delete additionalFields.timeZone;
+	}
+
+	if (additionalFields.body) {
+		additionalFields.body = {
+			content: additionalFields.body,
+			contentType: 'html',
+		};
+	}
+
+	let startDateTime = additionalFields.start as string;
+	let endDateTime = additionalFields.end as string;
+
+	if (additionalFields.isAllDay) {
+		startDateTime =
+			DateTime.fromISO(startDateTime, { zone: timeZone }).toFormat('yyyy-MM-dd') ||
+			DateTime.utc().toFormat('yyyy-MM-dd');
+		endDateTime =
+			DateTime.fromISO(endDateTime, { zone: timeZone }).toFormat('yyyy-MM-dd') ||
+			DateTime.utc().toFormat('yyyy-MM-dd');
+
+		const minimalWholeDayDuration = 24;
+		const duration = DateTime.fromISO(startDateTime, { zone: timeZone }).diff(
+			DateTime.fromISO(endDateTime, { zone: timeZone }),
+		).hours;
+
+		if (duration < minimalWholeDayDuration) {
+			endDateTime = DateTime.fromISO(startDateTime, { zone: timeZone }).plus({ hours: 24 }).toISO();
+		}
+	}
+
+	const body: IDataObject = {
+		...additionalFields,
+	};
+
+	if (startDateTime) {
+		body.start = {
+			dateTime: startDateTime,
+			timeZone,
+		};
+	}
+
+	if (endDateTime) {
+		body.end = {
+			dateTime: endDateTime,
+			timeZone,
+		};
+	}
+
+	const endpoint = `/calendar/events/${eventId}`;
+
+	const responseData = await microsoftApiRequest.call(this, 'PATCH', endpoint, body);
+
+	const executionData = this.helpers.constructExecutionMetaData(
+		this.helpers.returnJsonArray(responseData as IDataObject),
+		{ itemData: { item: index } },
+	);
+
+	return executionData;
+}
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
new file mode 100644
index 0000000000000..ad4d1ef4f1b02
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/create.operation.ts
@@ -0,0 +1,65 @@
+import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
+import { microsoftApiRequest } from '../../transport';
+import { folderRLC } from '../../descriptions';
+import { decodeOutlookId } from '../../helpers/utils';
+import { updateDisplayOptions } from '@utils/utilities';
+
+export const properties: INodeProperties[] = [
+	{
+		displayName: 'Name',
+		name: 'displayName',
+		description: 'Name of the folder',
+		type: 'string',
+		required: true,
+		default: '',
+		placeholder: 'e.g. My Folder',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [{ ...folderRLC, displayName: 'Parent Folder', required: false }],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['folder'],
+		operation: ['create'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, index: number) {
+	const displayName = this.getNodeParameter('displayName', index) as string;
+
+	const folderId = decodeOutlookId(
+		this.getNodeParameter('options.folderId', index, '', {
+			extractValue: true,
+		}) as string,
+	);
+
+	const body: IDataObject = {
+		displayName,
+	};
+
+	let endpoint;
+
+	if (folderId) {
+		endpoint = `/mailFolders/${folderId}/childFolders`;
+	} else {
+		endpoint = '/mailFolders';
+	}
+
+	const responseData = await microsoftApiRequest.call(this, 'POST', endpoint, body);
+
+	const executionData = this.helpers.constructExecutionMetaData(
+		this.helpers.returnJsonArray(responseData as IDataObject[]),
+		{ itemData: { item: index } },
+	);
+
+	return executionData;
+}
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
new file mode 100644
index 0000000000000..2441cf69e4b95
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/delete.operation.ts
@@ -0,0 +1,33 @@
+import type { IExecuteFunctions, INodeProperties } from 'n8n-workflow';
+import { microsoftApiRequest } from '../../transport';
+import { folderRLC } from '../../descriptions';
+import { decodeOutlookId } from '../../helpers/utils';
+import { updateDisplayOptions } from '@utils/utilities';
+
+export const properties: INodeProperties[] = [folderRLC];
+
+const displayOptions = {
+	show: {
+		resource: ['folder'],
+		operation: ['delete'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, index: number) {
+	const folderId = decodeOutlookId(
+		this.getNodeParameter('folderId', index, undefined, {
+			extractValue: true,
+		}) as string,
+	);
+
+	await microsoftApiRequest.call(this, 'DELETE', `/mailFolders/${folderId}`);
+
+	const executionData = this.helpers.constructExecutionMetaData(
+		this.helpers.returnJsonArray({ success: true }),
+		{ itemData: { item: index } },
+	);
+
+	return executionData;
+}
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
new file mode 100644
index 0000000000000..6ea2867a4ff97
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/get.operation.ts
@@ -0,0 +1,69 @@
+import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
+import { microsoftApiRequest } from '../../transport';
+import { folderFields, folderRLC } from '../../descriptions';
+import { decodeOutlookId } from '../../helpers/utils';
+import { updateDisplayOptions } from '@utils/utilities';
+
+export const properties: INodeProperties[] = [
+	folderRLC,
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			{
+				displayName: 'Fields',
+				name: 'fields',
+				type: 'multiOptions',
+				description: 'The fields to add to the output',
+				options: folderFields,
+				default: [],
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['folder'],
+		operation: ['get'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, index: number) {
+	const qs: IDataObject = {};
+
+	const folderId = decodeOutlookId(
+		this.getNodeParameter('folderId', index, undefined, {
+			extractValue: true,
+		}) as string,
+	);
+
+	const options = this.getNodeParameter('options', index);
+
+	if (options.fields) {
+		qs.$select = (options.fields as string[]).join(',');
+	}
+
+	if (options.filter) {
+		qs.$filter = options.filter;
+	}
+	const responseData = await microsoftApiRequest.call(
+		this,
+		'GET',
+		`/mailFolders/${folderId}`,
+		{},
+		qs,
+	);
+
+	const executionData = this.helpers.constructExecutionMetaData(
+		this.helpers.returnJsonArray(responseData as IDataObject),
+		{ itemData: { item: index } },
+	);
+
+	return executionData;
+}
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
new file mode 100644
index 0000000000000..91df451340214
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/getAll.operation.ts
@@ -0,0 +1,111 @@
+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';
+
+export const properties: INodeProperties[] = [
+	...returnAllOrLimit,
+	{
+		displayName: 'Filters',
+		name: 'filters',
+		type: 'collection',
+		placeholder: 'Add Filter',
+		default: {},
+		options: [
+			{
+				displayName: 'Filter Query',
+				name: 'filter',
+				type: 'string',
+				default: '',
+				placeholder: "e.g. displayName eq 'My Folder'",
+				hint: 'Search query to filter folders. <a href="https://docs.microsoft.com/en-us/graph/query-parameters#filter-parameter">More info</a>.',
+			},
+		],
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		options: [
+			{
+				displayName: 'Fields',
+				name: 'fields',
+				type: 'multiOptions',
+				description: 'The fields to add to the output',
+				options: folderFields,
+				default: [],
+			},
+			{
+				displayName: 'Include Child Folders',
+				name: 'includeChildFolders',
+				type: 'boolean',
+				default: false,
+				description: 'Whether to include child folders in the response',
+			},
+			{
+				...folderRLC,
+				displayName: 'Parent Folder',
+				required: false,
+				description: 'The folder you want to search in',
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['folder'],
+		operation: ['getAll'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, index: number) {
+	let responseData;
+	const qs: IDataObject = {};
+
+	const returnAll = this.getNodeParameter('returnAll', index);
+	const options = this.getNodeParameter('options', index);
+	const filter = this.getNodeParameter('filters.filter', index, '') as string;
+
+	const parentFolderId = this.getNodeParameter('options.folderId', index, '', {
+		extractValue: true,
+	}) as string;
+
+	if (options.fields) {
+		qs.$select = (options.fields as string[]).join(',');
+	}
+
+	if (filter) {
+		qs.$filter = filter;
+	}
+
+	let endpoint;
+	if (parentFolderId) {
+		endpoint = `/mailFolders/${parentFolderId}/childFolders`;
+	} else {
+		endpoint = '/mailFolders';
+	}
+
+	if (returnAll) {
+		responseData = await microsoftApiRequestAllItems.call(this, 'value', 'GET', endpoint, {}, qs);
+	} else {
+		qs.$top = this.getNodeParameter('limit', index);
+		responseData = await microsoftApiRequest.call(this, 'GET', endpoint, {}, qs);
+		responseData = responseData.value;
+	}
+
+	if (options.includeChildFolders) {
+		responseData = await getSubfolders.call(this, responseData as IDataObject[]);
+	}
+
+	const executionData = this.helpers.constructExecutionMetaData(
+		this.helpers.returnJsonArray(responseData as IDataObject[]),
+		{ itemData: { item: index } },
+	);
+
+	return executionData;
+}
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
new file mode 100644
index 0000000000000..46fd4c038ffe2
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/index.ts
@@ -0,0 +1,60 @@
+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 update from './update.operation';
+
+export { create, del as delete, get, getAll, update };
+
+export const description: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				resource: ['folder'],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: "Create a mail folder in the root folder of the user's mailbox",
+				action: 'Create a folder',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a folder',
+				action: 'Delete a folder',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Retrieve a folder',
+				action: 'Get a folder',
+			},
+			{
+				name: 'Get Many',
+				value: 'getAll',
+				description: 'Get many folders',
+				action: 'Get many folders',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update a folder',
+				action: 'Update a folder',
+			},
+		],
+		default: 'create',
+	},
+	...create.description,
+	...del.description,
+	...get.description,
+	...getAll.description,
+	...update.description,
+];
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
new file mode 100644
index 0000000000000..41322e4961ff7
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/update.operation.ts
@@ -0,0 +1,46 @@
+import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
+import { microsoftApiRequest } from '../../transport';
+import { folderRLC } from '../../descriptions';
+import { decodeOutlookId } from '../../helpers/utils';
+import { updateDisplayOptions } from '@utils/utilities';
+
+export const properties: INodeProperties[] = [
+	folderRLC,
+	{
+		displayName: 'Name',
+		name: 'displayName',
+		description: 'Name of the folder',
+		type: 'string',
+		default: '',
+		required: true,
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['folder'],
+		operation: ['update'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, index: number) {
+	const folderId = decodeOutlookId(
+		this.getNodeParameter('folderId', index, undefined, {
+			extractValue: true,
+		}) as string,
+	);
+	const displayName = this.getNodeParameter('displayName', index, undefined) as string;
+
+	const responseData = await microsoftApiRequest.call(this, 'PATCH', `/mailFolders/${folderId}`, {
+		displayName,
+	});
+
+	const executionData = this.helpers.constructExecutionMetaData(
+		this.helpers.returnJsonArray(responseData as IDataObject),
+		{ itemData: { item: index } },
+	);
+
+	return executionData;
+}
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
new file mode 100644
index 0000000000000..7d3b57c7e0630
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folderMessage/getAll.operation.ts
@@ -0,0 +1,302 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+import {
+	decodeOutlookId,
+	messageFields,
+	prepareFilterString,
+	simplifyOutputMessages,
+} from '../../helpers/utils';
+import {
+	downloadAttachments,
+	microsoftApiRequest,
+	microsoftApiRequestAllItems,
+} from '../../transport';
+
+import { folderRLC, returnAllOrLimit } from '../../descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+export const properties: INodeProperties[] = [
+	folderRLC,
+	...returnAllOrLimit,
+	{
+		displayName: 'Output',
+		name: 'output',
+		type: 'options',
+		default: 'simple',
+		options: [
+			{
+				name: 'Simplified',
+				value: 'simple',
+			},
+			{
+				name: 'Raw',
+				value: 'raw',
+			},
+			{
+				name: 'Select Included Fields',
+				value: 'fields',
+			},
+		],
+	},
+	{
+		displayName: 'Fields',
+		name: 'fields',
+		type: 'multiOptions',
+		description: 'The fields to add to the output',
+		displayOptions: {
+			show: {
+				output: ['fields'],
+			},
+		},
+		options: messageFields,
+		default: [],
+	},
+	{
+		displayName:
+			'Fetching a lot of messages may take a long time. Consider using filters to speed things up',
+		name: 'filtersNotice',
+		type: 'notice',
+		default: '',
+		displayOptions: {
+			show: {
+				returnAll: [true],
+			},
+		},
+	},
+	{
+		displayName: 'Filters',
+		name: 'filtersUI',
+		type: 'fixedCollection',
+		placeholder: 'Add Filters',
+		default: {},
+		options: [
+			{
+				displayName: 'Values',
+				name: 'values',
+				values: [
+					{
+						displayName: 'Filter By',
+						name: 'filterBy',
+						type: 'options',
+						options: [
+							{
+								name: 'Filters',
+								value: 'filters',
+							},
+							{
+								name: 'Search',
+								value: 'search',
+							},
+						],
+						default: 'filters',
+					},
+					{
+						displayName: 'Search',
+						name: 'search',
+						type: 'string',
+						default: '',
+						placeholder: 'e.g. automation',
+						description:
+							'Only return messages that contains search term. Without specific message properties, the search is carried out on the default search properties of from, subject, and body. <a href="https://docs.microsoft.com/en-us/graph/query-parameters#search-parameter target="_blank">More info</a>.',
+						displayOptions: {
+							show: {
+								filterBy: ['search'],
+							},
+						},
+					},
+					{
+						displayName: 'Filters',
+						name: 'filters',
+						type: 'collection',
+						placeholder: 'Add Filter',
+						default: {},
+						displayOptions: {
+							show: {
+								filterBy: ['filters'],
+							},
+						},
+						options: [
+							{
+								displayName: 'Filter Query',
+								name: 'custom',
+								type: 'string',
+								default: '',
+								placeholder: 'e.g. isRead eq false',
+								hint: 'Search query to filter messages. <a href="https://learn.microsoft.com/en-us/graph/filter-query-parameter">More info</a>.',
+							},
+							{
+								displayName: 'Has Attachments',
+								name: 'hasAttachments',
+								type: 'boolean',
+								default: false,
+							},
+							{
+								displayName: 'Read Status',
+								name: 'readStatus',
+								type: 'options',
+								default: 'unread',
+								hint: 'Filter messages by whether they have been read or not',
+								options: [
+									{
+										// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+										name: 'Unread and read messages',
+										value: 'both',
+									},
+									{
+										// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+										name: 'Unread messages only',
+										value: 'unread',
+									},
+									{
+										// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+										name: 'Read messages only',
+										value: 'read',
+									},
+								],
+							},
+							{
+								displayName: 'Received After',
+								name: 'receivedAfter',
+								type: 'dateTime',
+								default: '',
+								description:
+									'Get all messages received after the specified date. In an expression you can set date using string in ISO format or a timestamp in miliseconds.',
+							},
+							{
+								displayName: 'Received Before',
+								name: 'receivedBefore',
+								type: 'dateTime',
+								default: '',
+								description:
+									'Get all messages received before the specified date. In an expression you can set date using string in ISO format or a timestamp in miliseconds.',
+							},
+							{
+								displayName: 'Sender',
+								name: 'sender',
+								type: 'string',
+								default: '',
+								description: 'Sender name or email to filter by',
+							},
+						],
+					},
+				],
+			},
+		],
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			{
+				displayName: 'Attachments Prefix',
+				name: 'attachmentsPrefix',
+				type: 'string',
+				default: 'attachment_',
+				description:
+					'Prefix for name of the output fields to put the binary files data in. An index starting from 0 will be added. So if name is "attachment_" the first attachment is saved to "attachment_0".',
+			},
+			{
+				displayName: 'Download Attachments',
+				name: 'downloadAttachments',
+				type: 'boolean',
+				default: false,
+				description:
+					"Whether the message's attachments will be downloaded and included in the output",
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['folderMessage'],
+		operation: ['getAll'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, index: number) {
+	let responseData;
+	const qs: IDataObject = {};
+
+	const folderId = decodeOutlookId(
+		this.getNodeParameter('folderId', index, undefined, {
+			extractValue: true,
+		}) as string,
+	);
+
+	const returnAll = this.getNodeParameter('returnAll', index);
+	const filters = this.getNodeParameter('filtersUI.values', index, {}) as IDataObject;
+	const options = this.getNodeParameter('options', index, {});
+	const output = this.getNodeParameter('output', index) as string;
+
+	if (output === 'fields') {
+		const fields = this.getNodeParameter('fields', index) as string[];
+
+		if (options.downloadAttachments) {
+			fields.push('hasAttachments');
+		}
+
+		qs.$select = fields.join(',');
+	}
+
+	if (output === 'simple') {
+		qs.$select =
+			'id,conversationId,subject,bodyPreview,from,toRecipients,categories,hasAttachments';
+	}
+
+	if (filters.filterBy === 'search' && filters.search !== '') {
+		qs.$search = `"${filters.search}"`;
+	}
+
+	if (filters.filterBy === 'filters') {
+		const filterString = prepareFilterString(filters);
+
+		if (filterString) {
+			qs.$filter = filterString;
+		}
+	}
+
+	const endpoint = `/mailFolders/${folderId}/messages`;
+
+	if (returnAll) {
+		responseData = await microsoftApiRequestAllItems.call(
+			this,
+			'value',
+			'GET',
+			endpoint,
+			undefined,
+			qs,
+		);
+	} else {
+		qs.$top = this.getNodeParameter('limit', index);
+		responseData = await microsoftApiRequest.call(this, 'GET', endpoint, undefined, qs);
+		responseData = responseData.value;
+	}
+
+	if (output === 'simple') {
+		responseData = simplifyOutputMessages(responseData as IDataObject[]);
+	}
+
+	let executionData: INodeExecutionData[] = [];
+
+	if (options.downloadAttachments) {
+		const prefix = (options.attachmentsPrefix as string) || 'attachment_';
+		executionData = await downloadAttachments.call(this, responseData as IDataObject, prefix);
+	} else {
+		executionData = this.helpers.constructExecutionMetaData(
+			this.helpers.returnJsonArray(responseData as IDataObject[]),
+			{ itemData: { item: index } },
+		);
+	}
+
+	return executionData;
+}
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
new file mode 100644
index 0000000000000..6e206123789a7
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folderMessage/index.ts
@@ -0,0 +1,29 @@
+import type { INodeProperties } from 'n8n-workflow';
+import * as getAll from './getAll.operation';
+
+export { getAll };
+
+export const description: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				resource: ['folderMessage'],
+			},
+		},
+		options: [
+			{
+				name: 'Get Many',
+				value: 'getAll',
+				description: 'Retrieves the messages in a folder',
+				action: 'Get many folder messages',
+			},
+		],
+		default: 'getAll',
+	},
+
+	...getAll.description,
+];
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
new file mode 100644
index 0000000000000..8ee7511b417cd
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/delete.operation.ts
@@ -0,0 +1,29 @@
+import type { IExecuteFunctions, INodeProperties } from 'n8n-workflow';
+import { microsoftApiRequest } from '../../transport';
+import { messageRLC } from '../../descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+export const properties: INodeProperties[] = [messageRLC];
+
+const displayOptions = {
+	show: {
+		resource: ['message'],
+		operation: ['delete'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, index: number) {
+	const messageId = this.getNodeParameter('messageId', index, undefined, {
+		extractValue: true,
+	}) as string;
+	await microsoftApiRequest.call(this, 'DELETE', `/messages/${messageId}`);
+
+	const executionData = this.helpers.constructExecutionMetaData(
+		this.helpers.returnJsonArray({ success: true }),
+		{ itemData: { item: index } },
+	);
+
+	return executionData;
+}
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
new file mode 100644
index 0000000000000..b253659e434e0
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/get.operation.ts
@@ -0,0 +1,181 @@
+import type {
+	IBinaryKeyData,
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+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,
+	{
+		displayName: 'Output',
+		name: 'output',
+		type: 'options',
+		default: 'simple',
+		options: [
+			{
+				name: 'Simplified',
+				value: 'simple',
+			},
+			{
+				name: 'Raw',
+				value: 'raw',
+			},
+			{
+				name: 'Select Included Fields',
+				value: 'fields',
+			},
+		],
+	},
+	{
+		displayName: 'Fields',
+		name: 'fields',
+		type: 'multiOptions',
+		description: 'The fields to add to the output',
+		displayOptions: {
+			show: {
+				output: ['fields'],
+			},
+		},
+		options: messageFields,
+		default: [],
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			{
+				displayName: 'Attachments Prefix',
+				name: 'attachmentsPrefix',
+				type: 'string',
+				default: 'attachment_',
+				description:
+					'Prefix for name of the output fields to put the binary files data in. An index starting from 0 will be added. So if name is "attachment_" the first attachment is saved to "attachment_0".',
+			},
+			{
+				displayName: 'Download Attachments',
+				name: 'downloadAttachments',
+				type: 'boolean',
+				default: false,
+				description:
+					"Whether the message's attachments will be downloaded and included in the output",
+			},
+			{
+				displayName: 'Get MIME Content',
+				name: 'getMimeContent',
+				type: 'fixedCollection',
+				default: { values: { binaryPropertyName: 'data' } },
+				options: [
+					{
+						displayName: 'Values',
+						name: 'values',
+						values: [
+							{
+								displayName: 'Put Output in Field',
+								name: 'binaryPropertyName',
+								type: 'string',
+								default: '',
+								hint: 'The name of the output field to put the binary file data in',
+							},
+							{
+								displayName: 'File Name',
+								name: 'outputFileName',
+								type: 'string',
+								placeholder: 'message',
+								default: '',
+								description: 'Optional name of the output file, if not set message ID is used',
+							},
+						],
+					},
+				],
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['message'],
+		operation: ['get'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, index: number) {
+	let responseData;
+	const qs: IDataObject = {};
+
+	const messageId = this.getNodeParameter('messageId', index, undefined, {
+		extractValue: true,
+	}) as string;
+
+	const options = this.getNodeParameter('options', index, {});
+	const output = this.getNodeParameter('output', index) as string;
+
+	if (output === 'fields') {
+		const fields = this.getNodeParameter('fields', index) as string[];
+
+		if (options.downloadAttachments) {
+			fields.push('hasAttachments');
+		}
+
+		qs.$select = fields.join(',');
+	}
+
+	if (output === 'simple') {
+		qs.$select =
+			'id,conversationId,subject,bodyPreview,from,toRecipients,categories,hasAttachments';
+	}
+
+	responseData = await microsoftApiRequest.call(
+		this,
+		'GET',
+		`/messages/${messageId}`,
+		undefined,
+		qs,
+	);
+
+	if (output === 'simple') {
+		responseData = simplifyOutputMessages([responseData as IDataObject]);
+	}
+
+	let executionData: INodeExecutionData[] = [];
+
+	if (options.downloadAttachments) {
+		const prefix = (options.attachmentsPrefix as string) || 'attachment_';
+		executionData = await downloadAttachments.call(this, responseData as IDataObject, prefix);
+	} else {
+		executionData = this.helpers.constructExecutionMetaData(
+			this.helpers.returnJsonArray(responseData as IDataObject),
+			{ itemData: { item: index } },
+		);
+	}
+
+	if (options.getMimeContent) {
+		const { binaryPropertyName, outputFileName } = (options.getMimeContent as IDataObject)
+			.values as IDataObject;
+
+		const binary = await getMimeContent.call(
+			this,
+			messageId,
+			binaryPropertyName as string,
+			outputFileName as string,
+		);
+
+		executionData[0].binary = {
+			...(executionData[0].binary || {}),
+			...(binary as IBinaryKeyData),
+		};
+	}
+
+	return executionData;
+}
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
new file mode 100644
index 0000000000000..6991118e14a12
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/getAll.operation.ts
@@ -0,0 +1,311 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+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,
+	{
+		displayName: 'Output',
+		name: 'output',
+		type: 'options',
+		default: 'simple',
+		options: [
+			{
+				name: 'Simplified',
+				value: 'simple',
+			},
+			{
+				name: 'Raw',
+				value: 'raw',
+			},
+			{
+				name: 'Select Included Fields',
+				value: 'fields',
+			},
+		],
+	},
+	{
+		displayName: 'Fields',
+		name: 'fields',
+		type: 'multiOptions',
+		description: 'The fields to add to the output',
+		displayOptions: {
+			show: {
+				output: ['fields'],
+			},
+		},
+		options: messageFields,
+		default: [],
+	},
+	{
+		displayName:
+			'Fetching a lot of messages may take a long time. Consider using filters to speed things up',
+		name: 'filtersNotice',
+		type: 'notice',
+		default: '',
+		displayOptions: {
+			show: {
+				returnAll: [true],
+			},
+		},
+	},
+	{
+		displayName: 'Filters',
+		name: 'filtersUI',
+		type: 'fixedCollection',
+		placeholder: 'Add Filters',
+		default: {},
+		options: [
+			{
+				displayName: 'Values',
+				name: 'values',
+				values: [
+					{
+						displayName: 'Filter By',
+						name: 'filterBy',
+						type: 'options',
+						options: [
+							{
+								name: 'Filters',
+								value: 'filters',
+							},
+							{
+								name: 'Search',
+								value: 'search',
+							},
+						],
+						default: 'filters',
+					},
+					{
+						displayName: 'Search',
+						name: 'search',
+						type: 'string',
+						default: '',
+						placeholder: 'e.g. automation',
+						description:
+							'Only return messages that contains search term. Without specific message properties, the search is carried out on the default search properties of from, subject, and body. <a href="https://docs.microsoft.com/en-us/graph/query-parameters#search-parameter target="_blank">More info</a>.',
+						displayOptions: {
+							show: {
+								filterBy: ['search'],
+							},
+						},
+					},
+					{
+						displayName: 'Filters',
+						name: 'filters',
+						type: 'collection',
+						placeholder: 'Add Filter',
+						default: {},
+						displayOptions: {
+							show: {
+								filterBy: ['filters'],
+							},
+						},
+						options: [
+							{
+								displayName: 'Filter Query',
+								name: 'custom',
+								type: 'string',
+								default: '',
+								placeholder: 'e.g. isRead eq false',
+								hint: 'Search query to filter messages. <a href="https://learn.microsoft.com/en-us/graph/filter-query-parameter">More info</a>.',
+							},
+							{
+								displayName: 'Has Attachments',
+								name: 'hasAttachments',
+								type: 'boolean',
+								default: false,
+							},
+							{
+								displayName: 'Folders to Exclude',
+								name: 'foldersToExclude',
+								type: 'multiOptions',
+								typeOptions: {
+									loadOptionsMethod: 'getFolders',
+								},
+								default: [],
+								description:
+									'Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
+							},
+							{
+								displayName: 'Folders to Include',
+								name: 'foldersToInclude',
+								type: 'multiOptions',
+								typeOptions: {
+									loadOptionsMethod: 'getFolders',
+								},
+								default: [],
+								description:
+									'Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
+							},
+							{
+								displayName: 'Read Status',
+								name: 'readStatus',
+								type: 'options',
+								default: 'unread',
+								hint: 'Filter messages by whether they have been read or not',
+								options: [
+									{
+										// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+										name: 'Unread and read messages',
+										value: 'both',
+									},
+									{
+										// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+										name: 'Unread messages only',
+										value: 'unread',
+									},
+									{
+										// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+										name: 'Read messages only',
+										value: 'read',
+									},
+								],
+							},
+							{
+								displayName: 'Received After',
+								name: 'receivedAfter',
+								type: 'dateTime',
+								default: '',
+								description:
+									'Get all messages received after the specified date. In an expression you can set date using string in ISO format or a timestamp in miliseconds.',
+							},
+							{
+								displayName: 'Received Before',
+								name: 'receivedBefore',
+								type: 'dateTime',
+								default: '',
+								description:
+									'Get all messages received before the specified date. In an expression you can set date using string in ISO format or a timestamp in miliseconds.',
+							},
+							{
+								displayName: 'Sender',
+								name: 'sender',
+								type: 'string',
+								default: '',
+								description: 'Sender name or email to filter by',
+							},
+						],
+					},
+				],
+			},
+		],
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			{
+				displayName: 'Attachments Prefix',
+				name: 'attachmentsPrefix',
+				type: 'string',
+				default: 'attachment_',
+				description:
+					'Prefix for name of the output fields to put the binary files data in. An index starting from 0 will be added. So if name is "attachment_" the first attachment is saved to "attachment_0".',
+			},
+			{
+				displayName: 'Download Attachments',
+				name: 'downloadAttachments',
+				type: 'boolean',
+				default: false,
+				description:
+					"Whether the message's attachments will be downloaded and included in the output",
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['message'],
+		operation: ['getAll'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, index: number) {
+	let responseData;
+	const qs = {} as IDataObject;
+
+	const returnAll = this.getNodeParameter('returnAll', index);
+	const filters = this.getNodeParameter('filtersUI.values', index, {}) as IDataObject;
+	const options = this.getNodeParameter('options', index, {});
+	const output = this.getNodeParameter('output', index) as string;
+
+	if (output === 'fields') {
+		const fields = this.getNodeParameter('fields', index) as string[];
+
+		if (options.downloadAttachments) {
+			fields.push('hasAttachments');
+		}
+
+		qs.$select = fields.join(',');
+	}
+
+	if (output === 'simple') {
+		qs.$select =
+			'id,conversationId,subject,bodyPreview,from,toRecipients,categories,hasAttachments';
+	}
+
+	if (filters.filterBy === 'search' && filters.search !== '') {
+		qs.$search = `"${filters.search}"`;
+	}
+
+	if (filters.filterBy === 'filters') {
+		const filterString = prepareFilterString(filters);
+
+		if (filterString) {
+			qs.$filter = filterString;
+		}
+	}
+
+	const endpoint = '/messages';
+
+	if (returnAll) {
+		responseData = await microsoftApiRequestAllItems.call(
+			this,
+			'value',
+			'GET',
+			endpoint,
+			undefined,
+			qs,
+		);
+	} else {
+		qs.$top = this.getNodeParameter('limit', index);
+		responseData = await microsoftApiRequest.call(this, 'GET', endpoint, undefined, qs);
+		responseData = responseData.value;
+	}
+
+	if (output === 'simple') {
+		responseData = simplifyOutputMessages(responseData as IDataObject[]);
+	}
+
+	let executionData: INodeExecutionData[] = [];
+
+	if (options.downloadAttachments) {
+		const prefix = (options.attachmentsPrefix as string) || 'attachment_';
+		executionData = await downloadAttachments.call(this, responseData as IDataObject, prefix);
+	} else {
+		executionData = this.helpers.constructExecutionMetaData(
+			this.helpers.returnJsonArray(responseData as IDataObject[]),
+			{ itemData: { item: index } },
+		);
+	}
+
+	return executionData;
+}
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
new file mode 100644
index 0000000000000..bc81ba47d1503
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/index.ts
@@ -0,0 +1,77 @@
+import type { INodeProperties } from 'n8n-workflow';
+import * as del from './delete.operation';
+import * as get from './get.operation';
+import * as getAll from './getAll.operation';
+import * as move from './move.operation';
+import * as reply from './reply.operation';
+import * as send from './send.operation';
+import * as update from './update.operation';
+
+export { del as delete, get, getAll, move, reply, send, update };
+
+export const description: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				resource: ['message'],
+			},
+		},
+		options: [
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a message',
+				action: 'Delete a message',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Retrieve a single message',
+				action: 'Get a message',
+			},
+			{
+				name: 'Get Many',
+				value: 'getAll',
+				description: 'List and search messages',
+				action: 'Get many messages',
+			},
+			{
+				name: 'Move',
+				value: 'move',
+				description: 'Move a message to a folder',
+				action: 'Move a message',
+			},
+			{
+				name: 'Reply',
+				value: 'reply',
+				description: 'Create a reply to a message',
+				action: 'Reply to a message',
+			},
+			{
+				name: 'Send',
+				value: 'send',
+				description: 'Send a message',
+				action: 'Send a message',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update a message',
+				action: 'Update a message',
+			},
+		],
+		default: 'send',
+	},
+
+	...del.description,
+	...get.description,
+	...getAll.description,
+	...move.description,
+	...reply.description,
+	...send.description,
+	...update.description,
+];
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
new file mode 100644
index 0000000000000..55c0f634e4b7c
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/move.operation.ts
@@ -0,0 +1,41 @@
+import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
+import { microsoftApiRequest } from '../../transport';
+import { folderRLC, messageRLC } from '../../descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+export const properties: INodeProperties[] = [
+	messageRLC,
+	{ ...folderRLC, displayName: 'Parent Folder' },
+];
+
+const displayOptions = {
+	show: {
+		resource: ['message'],
+		operation: ['move'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, index: number) {
+	const messageId = this.getNodeParameter('messageId', index, undefined, {
+		extractValue: true,
+	}) as string;
+
+	const destinationId = this.getNodeParameter('folderId', index, undefined, {
+		extractValue: true,
+	}) as string;
+
+	const body: IDataObject = {
+		destinationId,
+	};
+
+	await microsoftApiRequest.call(this, 'POST', `/messages/${messageId}/move`, body);
+
+	const executionData = this.helpers.constructExecutionMetaData(
+		this.helpers.returnJsonArray({ success: true }),
+		{ itemData: { item: index } },
+	);
+
+	return executionData;
+}
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
new file mode 100644
index 0000000000000..c55f89c96502d
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/reply.operation.ts
@@ -0,0 +1,318 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+import { NodeOperationError } from 'n8n-workflow';
+import { createMessage } from '../../helpers/utils';
+import { microsoftApiRequest } from '../../transport';
+import { messageRLC } from '../../descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+export const properties: INodeProperties[] = [
+	messageRLC,
+	{
+		displayName: 'Reply to Sender Only',
+		name: 'replyToSenderOnly',
+		type: 'boolean',
+		default: false,
+		description: 'Whether to reply to the sender only or to the entire list of recipients',
+	},
+	{
+		displayName: 'Message',
+		name: 'message',
+		// name: 'bodyContent',
+		description: 'Message body content',
+		type: 'string',
+		typeOptions: {
+			rows: 2,
+		},
+		default: '',
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				replyToSenderOnly: [true],
+			},
+		},
+		options: [
+			{
+				displayName: 'Attachments',
+				name: 'attachments',
+				type: 'fixedCollection',
+				placeholder: 'Add Attachment',
+				default: {},
+				typeOptions: {
+					multipleValues: true,
+				},
+				options: [
+					{
+						name: 'attachments',
+						displayName: 'Attachment',
+						values: [
+							{
+								displayName: 'Input Data Field Name',
+								name: 'binaryPropertyName',
+								type: 'string',
+								default: '',
+								placeholder: 'e.g. data',
+								hint: 'The name of the input field containing the binary file data to be attached',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'BCC Recipients',
+				name: 'bccRecipients',
+				description: 'Comma-separated list of email addresses of BCC recipients',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'CC Recipients',
+				name: 'ccRecipients',
+				description: 'Comma-separated list of email addresses of CC recipients',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Custom Headers',
+				name: 'internetMessageHeaders',
+				placeholder: 'Add Header',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: true,
+				},
+				default: {},
+				options: [
+					{
+						name: 'headers',
+						displayName: 'Header',
+						values: [
+							{
+								displayName: 'Name',
+								name: 'name',
+								type: 'string',
+								default: '',
+								description: 'Name of the header',
+							},
+							{
+								displayName: 'Value',
+								name: 'value',
+								type: 'string',
+								default: '',
+								description: 'Value to set for the header',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'From',
+				name: 'from',
+				description:
+					'The owner of the mailbox from which the message is sent. Must correspond to the actual mailbox used.',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Importance',
+				name: 'importance',
+				description: 'The importance of the message',
+				type: 'options',
+				options: [
+					{
+						name: 'Low',
+						value: 'Low',
+					},
+					{
+						name: 'Normal',
+						value: 'Normal',
+					},
+					{
+						name: 'High',
+						value: 'High',
+					},
+				],
+				default: 'Normal',
+			},
+			{
+				displayName: 'Message Type',
+				name: 'bodyContentType',
+				description: 'Message body content type',
+				type: 'options',
+				options: [
+					{
+						name: 'HTML',
+						value: 'html',
+					},
+					{
+						name: 'Text',
+						value: 'Text',
+					},
+				],
+				default: 'html',
+			},
+			{
+				displayName: 'Read Receipt Requested',
+				name: 'isReadReceiptRequested',
+				description: 'Whether a read receipt is requested for the message',
+				type: 'boolean',
+				default: false,
+			},
+			{
+				displayName: 'To',
+				name: 'toRecipients',
+				description: 'Comma-separated list of email addresses of recipients',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Reply To',
+				name: 'replyTo',
+				description: 'Email address to use when replying',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Subject',
+				name: 'subject',
+				description: 'The subject of the message',
+				type: 'string',
+				default: '',
+			},
+		],
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		options: [
+			{
+				displayName: 'Save as Draft',
+				name: 'saveAsDraft',
+				description:
+					'Whether to save the message as a draft. If false, the message is sent immediately.',
+				type: 'boolean',
+				default: false,
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['message'],
+		operation: ['reply'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, index: number, items: INodeExecutionData[]) {
+	const messageId = this.getNodeParameter('messageId', index, undefined, {
+		extractValue: true,
+	}) as string;
+	const replyToSenderOnly = this.getNodeParameter('replyToSenderOnly', index, false) as string;
+	const message = this.getNodeParameter('message', index) as string;
+	const saveAsDraft = this.getNodeParameter('options.saveAsDraft', index, false) as boolean;
+	const additionalFields = this.getNodeParameter('additionalFields', index, {});
+
+	const body: IDataObject = {};
+
+	let action = 'createReply';
+
+	if (!replyToSenderOnly) {
+		body.comment = message;
+		action = 'createReplyAll';
+	} else {
+		// body.comment = comment;
+		body.message = {} as IDataObject;
+		additionalFields.bodyContent = message;
+		Object.assign(body.message, createMessage(additionalFields));
+
+		delete (body.message as IDataObject).attachments;
+	}
+
+	const responseData = await microsoftApiRequest.call(
+		this,
+		'POST',
+		`/messages/${messageId}/${action}`,
+		body,
+	);
+
+	if (additionalFields.attachments) {
+		const attachments = (additionalFields.attachments as IDataObject).attachments as IDataObject[];
+		// // Handle attachments
+		const data: IDataObject[] = [];
+
+		for (const attachment of attachments) {
+			const binaryPropertyName = attachment.binaryPropertyName as string;
+
+			if (items[index].binary === undefined) {
+				throw new NodeOperationError(this.getNode(), 'No binary data exists on item!', {
+					itemIndex: index,
+				});
+			}
+
+			if (
+				items[index].binary &&
+				(items[index].binary as IDataObject)[binaryPropertyName] === undefined
+			) {
+				throw new NodeOperationError(
+					this.getNode(),
+					`No binary data property "${binaryPropertyName}" does not exists on item!`,
+					{ itemIndex: index },
+				);
+			}
+
+			const binaryData = this.helpers.assertBinaryData(index, binaryPropertyName);
+
+			let fileBase64;
+			if (binaryData.id) {
+				const chunkSize = 256 * 1024;
+				const stream = await this.helpers.getBinaryStream(binaryData.id, chunkSize);
+				const buffer = await this.helpers.binaryToBuffer(stream);
+				fileBase64 = buffer.toString('base64');
+			} else {
+				fileBase64 = binaryData.data;
+			}
+
+			data.push({
+				'@odata.type': '#microsoft.graph.fileAttachment',
+				name: binaryData.fileName,
+				contentBytes: fileBase64,
+			});
+		}
+
+		for (const attachment of data) {
+			await microsoftApiRequest.call(
+				this,
+				'POST',
+				`/messages/${responseData.id}/attachments`,
+				attachment,
+				{},
+			);
+		}
+	}
+
+	if (!saveAsDraft) {
+		await microsoftApiRequest.call(this, 'POST', `/messages/${responseData.id}/send`);
+	}
+
+	const executionData = this.helpers.constructExecutionMetaData(
+		this.helpers.returnJsonArray(responseData as IDataObject),
+		{ itemData: { item: index } },
+	);
+
+	return executionData;
+}
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
new file mode 100644
index 0000000000000..0e45dbb8cf012
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/send.operation.ts
@@ -0,0 +1,285 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+import { NodeOperationError } from 'n8n-workflow';
+import { createMessage } from '../../helpers/utils';
+import { microsoftApiRequest } from '../../transport';
+import { updateDisplayOptions } from '@utils/utilities';
+
+export const properties: INodeProperties[] = [
+	{
+		displayName: 'To',
+		name: 'toRecipients',
+		description: 'Comma-separated list of email addresses of recipients',
+		type: 'string',
+		required: true,
+		default: '',
+	},
+	{
+		displayName: 'Subject',
+		name: 'subject',
+		description: 'The subject of the message',
+		type: 'string',
+		default: '',
+	},
+	{
+		displayName: 'Message',
+		name: 'bodyContent',
+		description: 'Message body content',
+		type: 'string',
+		typeOptions: {
+			rows: 2,
+		},
+		default: '',
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		options: [
+			{
+				displayName: 'Attachments',
+				name: 'attachments',
+				type: 'fixedCollection',
+				placeholder: 'Add Attachment',
+				default: {},
+				typeOptions: {
+					multipleValues: true,
+				},
+				options: [
+					{
+						name: 'attachments',
+						displayName: 'Attachment',
+						values: [
+							{
+								displayName: 'Input Data Field Name',
+								name: 'binaryPropertyName',
+								type: 'string',
+								default: '',
+								placeholder: 'e.g. data',
+								hint: 'The name of the input field containing the binary file data to be attached',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'BCC Recipients',
+				name: 'bccRecipients',
+				description: 'Comma-separated list of email addresses of BCC recipients',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Category Names or IDs',
+				name: 'categories',
+				type: 'multiOptions',
+				description:
+					'Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
+				typeOptions: {
+					loadOptionsMethod: 'getCategoriesNames',
+				},
+				default: [],
+			},
+			{
+				displayName: 'CC Recipients',
+				name: 'ccRecipients',
+				description: 'Comma-separated list of email addresses of CC recipients',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Custom Headers',
+				name: 'internetMessageHeaders',
+				placeholder: 'Add Header',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: true,
+				},
+				default: {},
+				options: [
+					{
+						name: 'headers',
+						displayName: 'Header',
+						values: [
+							{
+								displayName: 'Name',
+								name: 'name',
+								type: 'string',
+								default: '',
+								description: 'Name of the header',
+							},
+							{
+								displayName: 'Value',
+								name: 'value',
+								type: 'string',
+								default: '',
+								description: 'Value to set for the header',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'From',
+				name: 'from',
+				description:
+					'The owner of the mailbox from which the message is sent. Must correspond to the actual mailbox used.',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Importance',
+				name: 'importance',
+				description: 'The importance of the message',
+				type: 'options',
+				options: [
+					{
+						name: 'Low',
+						value: 'Low',
+					},
+					{
+						name: 'Normal',
+						value: 'Normal',
+					},
+					{
+						name: 'High',
+						value: 'High',
+					},
+				],
+				default: 'Normal',
+			},
+			{
+				displayName: 'Message Type',
+				name: 'bodyContentType',
+				description: 'Message body content type',
+				type: 'options',
+				options: [
+					{
+						name: 'HTML',
+						value: 'html',
+					},
+					{
+						name: 'Text',
+						value: 'Text',
+					},
+				],
+				default: 'html',
+			},
+			{
+				displayName: 'Read Receipt Requested',
+				name: 'isReadReceiptRequested',
+				description: 'Whether a read receipt is requested for the message',
+				type: 'boolean',
+				default: false,
+			},
+			{
+				displayName: 'Reply To',
+				name: 'replyTo',
+				description: 'Email address to use when replying',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Save To Sent Items',
+				name: 'saveToSentItems',
+				description: 'Whether to save the message in Sent Items',
+				type: 'boolean',
+				default: true,
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['message'],
+		operation: ['send'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, index: number, items: INodeExecutionData[]) {
+	const additionalFields = this.getNodeParameter('additionalFields', index);
+	const toRecipients = this.getNodeParameter('toRecipients', index) as string;
+	const subject = this.getNodeParameter('subject', index) as string;
+	const bodyContent = this.getNodeParameter('bodyContent', index, '') as string;
+
+	additionalFields.subject = subject;
+	additionalFields.bodyContent = bodyContent || ' ';
+	additionalFields.toRecipients = toRecipients;
+
+	const saveToSentItems =
+		additionalFields.saveToSentItems === undefined ? true : additionalFields.saveToSentItems;
+	delete additionalFields.saveToSentItems;
+
+	// Create message object from optional fields
+	const message: IDataObject = createMessage(additionalFields);
+
+	if (additionalFields.attachments) {
+		const attachments = (additionalFields.attachments as IDataObject).attachments as IDataObject[];
+
+		const messageAttachments: IDataObject[] = [];
+
+		for (const attachment of attachments) {
+			const binaryPropertyName = attachment.binaryPropertyName as string;
+
+			if (items[index].binary === undefined) {
+				throw new NodeOperationError(this.getNode(), 'No binary data exists on item!', {
+					itemIndex: index,
+				});
+			}
+
+			if (
+				items[index].binary &&
+				(items[index].binary as IDataObject)[binaryPropertyName] === undefined
+			) {
+				throw new NodeOperationError(
+					this.getNode(),
+					`No binary data property "${binaryPropertyName}" does not exists on item!`,
+					{ itemIndex: index },
+				);
+			}
+
+			const binaryData = this.helpers.assertBinaryData(index, binaryPropertyName);
+
+			let fileBase64;
+			if (binaryData.id) {
+				const chunkSize = 256 * 1024;
+				const stream = await this.helpers.getBinaryStream(binaryData.id, chunkSize);
+				const buffer = await this.helpers.binaryToBuffer(stream);
+				fileBase64 = buffer.toString('base64');
+			} else {
+				fileBase64 = binaryData.data;
+			}
+
+			messageAttachments.push({
+				'@odata.type': '#microsoft.graph.fileAttachment',
+				name: binaryData.fileName,
+				contentBytes: fileBase64,
+			});
+		}
+
+		message.attachments = messageAttachments;
+	}
+
+	const body: IDataObject = {
+		message,
+		saveToSentItems,
+	};
+
+	await microsoftApiRequest.call(this, 'POST', '/sendMail', body, {});
+
+	const executionData = this.helpers.constructExecutionMetaData(
+		this.helpers.returnJsonArray({ success: true }),
+		{ itemData: { item: index } },
+	);
+
+	return executionData;
+}
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
new file mode 100644
index 0000000000000..e6399489fc9af
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/update.operation.ts
@@ -0,0 +1,224 @@
+import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
+import { NodeOperationError } from 'n8n-workflow';
+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,
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		options: [
+			{
+				displayName: 'BCC Recipients',
+				name: 'bccRecipients',
+				description: 'Comma-separated list of email addresses of BCC recipients',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Category Names or IDs',
+				name: 'categories',
+				type: 'multiOptions',
+				description:
+					'Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
+				typeOptions: {
+					loadOptionsMethod: 'getCategoriesNames',
+				},
+				default: [],
+			},
+			{
+				displayName: 'CC Recipients',
+				name: 'ccRecipients',
+				description: 'Comma-separated list of email addresses of CC recipients',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Custom Headers',
+				name: 'internetMessageHeaders',
+				placeholder: 'Add Header',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: true,
+				},
+				default: {},
+				options: [
+					{
+						name: 'headers',
+						displayName: 'Header',
+						values: [
+							{
+								displayName: 'Name',
+								name: 'name',
+								type: 'string',
+								default: '',
+								description: 'Name of the header',
+							},
+							{
+								displayName: 'Value',
+								name: 'value',
+								type: 'string',
+								default: '',
+								description: 'Value to set for the header',
+							},
+						],
+					},
+				],
+			},
+			{ ...folderRLC, required: false },
+			{
+				displayName: 'Importance',
+				name: 'importance',
+				description: 'The importance of the message',
+				type: 'options',
+				options: [
+					{
+						name: 'Low',
+						value: 'Low',
+					},
+					{
+						name: 'Normal',
+						value: 'Normal',
+					},
+					{
+						name: 'High',
+						value: 'High',
+					},
+				],
+				default: 'Normal',
+			},
+			{
+				displayName: 'Is Read',
+				name: 'isRead',
+				description: 'Whether the message must be marked as read',
+				type: 'boolean',
+				default: false,
+			},
+			{
+				displayName: 'Message',
+				name: 'bodyContent',
+				description: 'Message body content',
+				type: 'string',
+				typeOptions: {
+					rows: 2,
+				},
+				default: '',
+			},
+			{
+				displayName: 'Message Type',
+				name: 'bodyContentType',
+				description: 'Message body content type',
+				type: 'options',
+				options: [
+					{
+						name: 'HTML',
+						value: 'html',
+					},
+					{
+						name: 'Text',
+						value: 'Text',
+					},
+				],
+				default: 'html',
+			},
+			{
+				displayName: 'Read Receipt Requested',
+				name: 'isReadReceiptRequested',
+				description: 'Whether a read receipt is requested for the message',
+				type: 'boolean',
+				default: false,
+			},
+			{
+				displayName: 'To',
+				name: 'toRecipients',
+				description: 'Comma-separated list of email addresses of recipients',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Reply To',
+				name: 'replyTo',
+				description: 'Email address to use when replying',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Subject',
+				name: 'subject',
+				description: 'The subject of the message',
+				type: 'string',
+				default: '',
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['message'],
+		operation: ['update'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, index: number) {
+	let responseData;
+
+	const messageId = this.getNodeParameter('messageId', index, undefined, {
+		extractValue: true,
+	}) as string;
+
+	const updateFields = this.getNodeParameter('updateFields', index);
+
+	const folderId = decodeOutlookId(
+		this.getNodeParameter('updateFields.folderId', index, '', {
+			extractValue: true,
+		}) as string,
+	);
+
+	if (folderId) {
+		const body: IDataObject = {
+			destinationId: folderId,
+		};
+
+		responseData = await microsoftApiRequest.call(
+			this,
+			'POST',
+			`/messages/${messageId}/move`,
+			body,
+		);
+
+		delete updateFields.folderId;
+
+		if (!Object.keys(updateFields).length) {
+			const executionData = this.helpers.constructExecutionMetaData(
+				this.helpers.returnJsonArray(responseData as IDataObject),
+				{ itemData: { item: index } },
+			);
+
+			return executionData;
+		}
+	}
+
+	const body: IDataObject = createMessage(updateFields);
+
+	if (!Object.keys(body).length) {
+		throw new NodeOperationError(this.getNode(), 'No fields to update got specified');
+	}
+
+	responseData = await microsoftApiRequest.call(this, 'PATCH', `/messages/${messageId}`, body, {});
+
+	const executionData = this.helpers.constructExecutionMetaData(
+		this.helpers.returnJsonArray(responseData as IDataObject),
+		{ itemData: { item: index } },
+	);
+
+	return executionData;
+}
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
new file mode 100644
index 0000000000000..dd3f596197cda
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/add.operation.ts
@@ -0,0 +1,157 @@
+import type {
+	IBinaryKeyData,
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+	JsonObject,
+} from 'n8n-workflow';
+import { NodeApiError, NodeOperationError } from 'n8n-workflow';
+import { microsoftApiRequest } from '../../transport';
+import { messageRLC } from '../../descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+export const properties: INodeProperties[] = [
+	messageRLC,
+	{
+		displayName: 'Input Data Field Name',
+		name: 'binaryPropertyName',
+		hint: 'The name of the input field containing the binary file data to be attached',
+		type: 'string',
+		required: true,
+		default: 'data',
+		placeholder: 'e.g. data',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			{
+				displayName: 'File Name',
+				name: 'fileName',
+				description:
+					'Filename of the attachment. If not set will the file-name of the binary property be used, if it exists.',
+				type: 'string',
+				default: '',
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['messageAttachment'],
+		operation: ['add'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, index: number, items: INodeExecutionData[]) {
+	let responseData;
+
+	const messageId = this.getNodeParameter('messageId', index, undefined, {
+		extractValue: true,
+	}) as string;
+
+	const binaryPropertyName = this.getNodeParameter('binaryPropertyName', 0);
+	const options = this.getNodeParameter('options', index);
+
+	if (items[index].binary === undefined) {
+		throw new NodeOperationError(this.getNode(), 'No binary data exists on item!');
+	}
+
+	if (
+		items[index].binary &&
+		(items[index].binary as IDataObject)[binaryPropertyName] === undefined
+	) {
+		throw new NodeOperationError(
+			this.getNode(),
+			`No binary data property "${binaryPropertyName}" does not exists on item!`,
+			{ itemIndex: index },
+		);
+	}
+
+	const binaryData = (items[index].binary as IBinaryKeyData)[binaryPropertyName];
+	const dataBuffer = await this.helpers.getBinaryDataBuffer(index, binaryPropertyName);
+
+	const fileName = options.fileName === undefined ? binaryData.fileName : options.fileName;
+
+	if (!fileName) {
+		throw new NodeOperationError(
+			this.getNode(),
+			'File name is not set. It has either to be set via "Additional Fields" or has to be set on the binary property!',
+			{ itemIndex: index },
+		);
+	}
+
+	// Check if the file is over 3MB big
+	if (dataBuffer.length > 3e6) {
+		// Maximum chunk size is 4MB
+		const chunkSize = 4e6;
+		const body: IDataObject = {
+			AttachmentItem: {
+				attachmentType: 'file',
+				name: fileName,
+				size: dataBuffer.length,
+			},
+		};
+
+		// Create upload session
+		responseData = await microsoftApiRequest.call(
+			this,
+			'POST',
+			`/messages/${messageId}/attachments/createUploadSession`,
+			body,
+		);
+		const uploadUrl = responseData.uploadUrl;
+
+		if (uploadUrl === undefined) {
+			throw new NodeApiError(this.getNode(), responseData as JsonObject, {
+				message: 'Failed to get upload session',
+			});
+		}
+
+		for (let bytesUploaded = 0; bytesUploaded < dataBuffer.length; bytesUploaded += chunkSize) {
+			// Upload the file chunk by chunk
+			const nextChunk = Math.min(bytesUploaded + chunkSize, dataBuffer.length);
+			const contentRange = `bytes ${bytesUploaded}-${nextChunk - 1}/${dataBuffer.length}`;
+
+			const data = dataBuffer.subarray(bytesUploaded, nextChunk);
+
+			responseData = await this.helpers.request(uploadUrl, {
+				method: 'PUT',
+				headers: {
+					'Content-Type': 'application/octet-stream',
+					'Content-Length': data.length,
+					'Content-Range': contentRange,
+				},
+				body: data,
+			});
+		}
+	} else {
+		const body: IDataObject = {
+			'@odata.type': '#microsoft.graph.fileAttachment',
+			name: fileName,
+			contentBytes: binaryData.data,
+		};
+
+		responseData = await microsoftApiRequest.call(
+			this,
+			'POST',
+			`/messages/${messageId}/attachments`,
+			body,
+			{},
+		);
+	}
+
+	const executionData = this.helpers.constructExecutionMetaData(
+		this.helpers.returnJsonArray({ success: true }),
+		{ itemData: { item: index } },
+	);
+
+	return executionData;
+}
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
new file mode 100644
index 0000000000000..7892b24ffaec8
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/download.operation.ts
@@ -0,0 +1,90 @@
+import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
+import { microsoftApiRequest } from '../../transport';
+import { attachmentRLC, messageRLC } from '../../descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+export const properties: INodeProperties[] = [
+	messageRLC,
+	attachmentRLC,
+	{
+		displayName: 'Put Output in Field',
+		name: 'binaryPropertyName',
+		hint: 'The name of the output field to put the binary file data in',
+		type: 'string',
+		required: true,
+		default: 'data',
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['messageAttachment'],
+		operation: ['download'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, index: number, items: INodeExecutionData[]) {
+	const messageId = this.getNodeParameter('messageId', index, undefined, {
+		extractValue: true,
+	}) as string;
+
+	const attachmentId = this.getNodeParameter('attachmentId', index, undefined, {
+		extractValue: true,
+	}) as string;
+
+	const dataPropertyNameDownload = this.getNodeParameter('binaryPropertyName', index);
+
+	// Get attachment details first
+	const attachmentDetails = await microsoftApiRequest.call(
+		this,
+		'GET',
+		`/messages/${messageId}/attachments/${attachmentId}`,
+		undefined,
+		{ $select: 'id,name,contentType' },
+	);
+
+	let mimeType: string | undefined;
+	if (attachmentDetails.contentType) {
+		mimeType = attachmentDetails.contentType;
+	}
+	const fileName = attachmentDetails.name as string;
+
+	const response = await microsoftApiRequest.call(
+		this,
+		'GET',
+		`/messages/${messageId}/attachments/${attachmentId}/$value`,
+		undefined,
+		{},
+		undefined,
+		{},
+		{ encoding: null, resolveWithFullResponse: true },
+	);
+
+	const newItem: INodeExecutionData = {
+		json: items[index].json,
+		binary: {},
+	};
+
+	if (items[index].binary !== undefined) {
+		// Create a shallow copy of the binary data so that the old
+		// data references which do not get changed still stay behind
+		// but the incoming data does not get changed.
+		Object.assign(newItem.binary!, items[index].binary);
+	}
+
+	const data = Buffer.from(response.body as string, 'utf8');
+	newItem.binary![dataPropertyNameDownload] = await this.helpers.prepareBinaryData(
+		data,
+		fileName,
+		mimeType,
+	);
+
+	const executionData = this.helpers.constructExecutionMetaData(
+		this.helpers.returnJsonArray(newItem),
+		{ itemData: { item: index } },
+	);
+
+	return executionData;
+}
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
new file mode 100644
index 0000000000000..16d1b4e749491
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/get.operation.ts
@@ -0,0 +1,94 @@
+import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
+import { microsoftApiRequest } from '../../transport';
+import { attachmentRLC, messageRLC } from '../../descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+export const properties: INodeProperties[] = [
+	messageRLC,
+	attachmentRLC,
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		options: [
+			{
+				displayName: 'Fields',
+				name: 'fields',
+				type: 'multiOptions',
+				description: 'The fields to add to the output',
+				default: [],
+				options: [
+					{
+						name: 'contentType',
+						value: 'contentType',
+					},
+					{
+						name: 'isInline',
+						value: 'isInline',
+					},
+					{
+						name: 'lastModifiedDateTime',
+						value: 'lastModifiedDateTime',
+					},
+					{
+						// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+						name: 'name',
+						value: 'name',
+					},
+					{
+						// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+						name: 'size',
+						value: 'size',
+					},
+				],
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['messageAttachment'],
+		operation: ['get'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, index: number) {
+	const qs: IDataObject = {};
+
+	const messageId = this.getNodeParameter('messageId', index, undefined, {
+		extractValue: true,
+	}) as string;
+
+	const attachmentId = this.getNodeParameter('attachmentId', index, undefined, {
+		extractValue: true,
+	}) as string;
+
+	const options = this.getNodeParameter('options', index);
+
+	// Have sane defaults so we don't fetch attachment data in this operation
+	qs.$select = 'id,lastModifiedDateTime,name,contentType,size,isInline';
+
+	if (options.fields && (options.fields as string[]).length) {
+		qs.$select = (options.fields as string[]).map((field) => field.trim()).join(',');
+	}
+
+	const responseData = await microsoftApiRequest.call(
+		this,
+		'GET',
+		`/messages/${messageId}/attachments/${attachmentId}`,
+		undefined,
+		qs,
+	);
+
+	const executionData = this.helpers.constructExecutionMetaData(
+		this.helpers.returnJsonArray(responseData as IDataObject),
+		{ itemData: { item: index } },
+	);
+
+	return executionData;
+}
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
new file mode 100644
index 0000000000000..81df8d111af0f
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/getAll.operation.ts
@@ -0,0 +1,100 @@
+import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
+import { microsoftApiRequest, microsoftApiRequestAllItems } from '../../transport';
+import { messageRLC, returnAllOrLimit } from '../../descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+export const properties: INodeProperties[] = [
+	messageRLC,
+	...returnAllOrLimit,
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			{
+				displayName: 'Fields',
+				name: 'fields',
+				type: 'multiOptions',
+				description: 'The fields to add to the output',
+				default: [],
+				options: [
+					{
+						name: 'contentType',
+						value: 'contentType',
+					},
+					{
+						name: 'isInline',
+						value: 'isInline',
+					},
+					{
+						name: 'lastModifiedDateTime',
+						value: 'lastModifiedDateTime',
+					},
+					{
+						// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+						name: 'name',
+						value: 'name',
+					},
+					{
+						// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+						name: 'size',
+						value: 'size',
+					},
+				],
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['messageAttachment'],
+		operation: ['getAll'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, index: number) {
+	let responseData;
+	const qs = {} as IDataObject;
+
+	const messageId = this.getNodeParameter('messageId', index, undefined, {
+		extractValue: true,
+	}) as string;
+
+	const returnAll = this.getNodeParameter('returnAll', index);
+	const options = this.getNodeParameter('options', index);
+
+	// Have sane defaults so we don't fetch attachment data in this operation
+	qs.$select = 'id,lastModifiedDateTime,name,contentType,size,isInline';
+
+	if (options.fields && (options.fields as string[]).length) {
+		qs.$select = (options.fields as string[]).map((field) => field.trim()).join(',');
+	}
+
+	const endpoint = `/messages/${messageId}/attachments`;
+	if (returnAll) {
+		responseData = await microsoftApiRequestAllItems.call(
+			this,
+			'value',
+			'GET',
+			endpoint,
+			undefined,
+			qs,
+		);
+	} else {
+		qs.$top = this.getNodeParameter('limit', index);
+		responseData = await microsoftApiRequest.call(this, 'GET', endpoint, undefined, qs);
+		responseData = responseData.value;
+	}
+
+	const executionData = this.helpers.constructExecutionMetaData(
+		this.helpers.returnJsonArray(responseData as IDataObject),
+		{ itemData: { item: index } },
+	);
+
+	return executionData;
+}
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
new file mode 100644
index 0000000000000..24beaf050ec6a
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/index.ts
@@ -0,0 +1,52 @@
+import type { INodeProperties } from 'n8n-workflow';
+import * as add from './add.operation';
+import * as download from './download.operation';
+import * as get from './get.operation';
+import * as getAll from './getAll.operation';
+
+export { add, download, get, getAll };
+
+export const description: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				resource: ['messageAttachment'],
+			},
+		},
+		options: [
+			{
+				name: 'Add',
+				value: 'add',
+				description: 'Add an attachment to a message',
+				action: 'Add an attachment',
+			},
+			{
+				name: 'Download',
+				value: 'download',
+				description: 'Download an attachment from a message',
+				action: 'Download an attachment',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Retrieve information about an attachment of a message',
+				action: 'Get an attachment',
+			},
+			{
+				name: 'Get Many',
+				value: 'getAll',
+				description: 'Retrieve information about the attachments of a message',
+				action: 'Get many attachments',
+			},
+		],
+		default: 'add',
+	},
+	...add.description,
+	...download.description,
+	...get.description,
+	...getAll.description,
+];
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
new file mode 100644
index 0000000000000..586f3860a5241
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/node.description.ts
@@ -0,0 +1,82 @@
+/* eslint-disable n8n-nodes-base/node-filename-against-convention */
+import type { INodeTypeDescription } from 'n8n-workflow';
+import * as calendar from './calendar';
+import * as contact from './contact';
+import * as draft from './draft';
+import * as event from './event';
+import * as folder from './folder';
+import * as folderMessage from './folderMessage';
+import * as message from './message';
+import * as messageAttachment from './messageAttachment';
+
+export const description: INodeTypeDescription = {
+	displayName: 'Microsoft Outlook',
+	name: 'microsoftOutlook',
+	group: ['transform'],
+	icon: 'file:outlook.svg',
+	version: 2,
+	subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+	description: 'Consume Microsoft Outlook API',
+	defaults: {
+		name: 'Microsoft Outlook',
+	},
+	inputs: ['main'],
+	outputs: ['main'],
+	credentials: [
+		{
+			name: 'microsoftOutlookOAuth2Api',
+			required: true,
+		},
+	],
+	properties: [
+		{
+			displayName: 'Resource',
+			name: 'resource',
+			type: 'options',
+			noDataExpression: true,
+			default: 'message',
+			options: [
+				{
+					name: 'Calendar',
+					value: 'calendar',
+				},
+				{
+					name: 'Contact',
+					value: 'contact',
+				},
+				{
+					name: 'Draft',
+					value: 'draft',
+				},
+				{
+					name: 'Event',
+					value: 'event',
+				},
+				{
+					name: 'Folder',
+					value: 'folder',
+				},
+				{
+					name: 'Folder Message',
+					value: 'folderMessage',
+				},
+				{
+					name: 'Message',
+					value: 'message',
+				},
+				{
+					name: 'Message Attachment',
+					value: 'messageAttachment',
+				},
+			],
+		},
+		...calendar.description,
+		...contact.description,
+		...draft.description,
+		...event.description,
+		...folder.description,
+		...folderMessage.description,
+		...message.description,
+		...messageAttachment.description,
+	],
+};
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/node.type.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/node.type.ts
new file mode 100644
index 0000000000000..19b6f02b5616c
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/node.type.ts
@@ -0,0 +1,14 @@
+import type { AllEntities } from 'n8n-workflow';
+
+type NodeMap = {
+	calendar: 'create' | 'delete' | 'get' | 'getAll' | 'update';
+	contact: 'create' | 'delete' | 'get' | 'getAll' | 'update';
+	draft: 'create' | 'delete' | 'get' | 'send' | 'update';
+	event: 'create' | 'delete' | 'get' | 'getAll' | 'update';
+	folder: 'create' | 'delete' | 'get' | 'getAll' | 'update';
+	folderMessage: 'getAll';
+	message: 'delete' | 'get' | 'getAll' | 'move' | 'update' | 'send' | 'reply';
+	messageAttachment: 'add' | 'download' | 'getAll' | 'get';
+};
+
+export type MicrosoftOutlook = AllEntities<NodeMap>;
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/router.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/router.ts
new file mode 100644
index 0000000000000..d6033e3ec8c0d
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/router.ts
@@ -0,0 +1,84 @@
+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';
+import * as event from './event';
+import * as folder from './folder';
+import * as folderMessage from './folderMessage';
+import * as message from './message';
+import * as messageAttachment from './messageAttachment';
+
+export async function router(this: IExecuteFunctions) {
+	const items = this.getInputData();
+	const returnData: INodeExecutionData[] = [];
+
+	const resource = this.getNodeParameter<MicrosoftOutlook>('resource', 0) as string;
+	const operation = this.getNodeParameter('operation', 0);
+
+	let responseData;
+
+	const microsoftOutlook = {
+		resource,
+		operation,
+	} as MicrosoftOutlook;
+
+	for (let i = 0; i < items.length; i++) {
+		try {
+			switch (microsoftOutlook.resource) {
+				case 'calendar':
+					responseData = await calendar[microsoftOutlook.operation].execute.call(this, i);
+					break;
+				case 'contact':
+					responseData = await contact[microsoftOutlook.operation].execute.call(this, i);
+					break;
+				case 'draft':
+					responseData = await draft[microsoftOutlook.operation].execute.call(this, i, items);
+					break;
+				case 'event':
+					responseData = await event[microsoftOutlook.operation].execute.call(this, i);
+					break;
+				case 'folder':
+					responseData = await folder[microsoftOutlook.operation].execute.call(this, i);
+					break;
+				case 'folderMessage':
+					responseData = await folderMessage[microsoftOutlook.operation].execute.call(this, i);
+					break;
+				case 'message':
+					responseData = await message[microsoftOutlook.operation].execute.call(this, i, items);
+					break;
+				case 'messageAttachment':
+					responseData = await messageAttachment[microsoftOutlook.operation].execute.call(
+						this,
+						i,
+						items,
+					);
+					break;
+				default:
+					throw new NodeOperationError(this.getNode(), `The resource "${resource}" is not known`);
+			}
+
+			returnData.push(...responseData);
+		} catch (error) {
+			if (this.continueOnFail()) {
+				const executionErrorData = this.helpers.constructExecutionMetaData(
+					this.helpers.returnJsonArray({ error: error.message }),
+					{ itemData: { item: i } },
+				);
+				returnData.push(...executionErrorData);
+				continue;
+			}
+			//NodeApiError will be missing the itemIndex, add it
+			if (error instanceof NodeApiError && error?.context?.itemIndex === undefined) {
+				if (error.context === undefined) {
+					error.context = {};
+				}
+				error.context.itemIndex = i;
+			}
+			throw error;
+		}
+	}
+	return [returnData];
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/descriptions/common.descriptions.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/descriptions/common.descriptions.ts
new file mode 100644
index 0000000000000..69b4f396cb52d
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/descriptions/common.descriptions.ts
@@ -0,0 +1,394 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+export const returnAllOrLimit: INodeProperties[] = [
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		default: false,
+		description: 'Whether to return all results or only up to a given limit',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				returnAll: [false],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+		},
+		default: 100,
+		description: 'Max number of results to return',
+	},
+];
+
+export const folderFields = [
+	{
+		name: 'Child Folder Count',
+		value: 'childFolderCount',
+	},
+	{
+		name: 'Display Name',
+		value: 'displayName',
+	},
+	{
+		name: 'Is Hidden',
+		value: 'isHidden',
+	},
+	{
+		name: 'Parent Folder ID',
+		value: 'parentFolderId',
+	},
+	{
+		name: 'Total Item Count',
+		value: 'totalItemCount',
+	},
+	{
+		name: 'Unread Item Count',
+		value: 'unreadItemCount',
+	},
+];
+
+export const contactFields: INodeProperties[] = [
+	{
+		displayName: 'Assistant Name',
+		name: 'assistantName',
+		type: 'string',
+		default: '',
+		description: "The name of the contact's assistant",
+	},
+	{
+		displayName: 'Birthday',
+		name: 'birthday',
+		type: 'dateTime',
+		default: '',
+	},
+	{
+		displayName: 'Business Address',
+		name: 'businessAddress',
+		type: 'fixedCollection',
+		placeholder: 'Add Address',
+		default: {
+			values: { sity: '', street: '', postalCode: '', countryOrRegion: '', state: '' },
+		},
+		options: [
+			{
+				displayName: 'Address',
+				name: 'values',
+				values: [
+					{
+						displayName: 'City',
+						name: 'city',
+						type: 'string',
+						default: '',
+					},
+					{
+						displayName: 'Country/Region',
+						name: 'countryOrRegion',
+						type: 'string',
+						default: '',
+					},
+					{
+						displayName: 'Postal Code',
+						name: 'postalCode',
+						type: 'string',
+						default: '',
+					},
+					{
+						displayName: 'State',
+						name: 'state',
+						type: 'string',
+						default: '',
+					},
+					{
+						displayName: 'Street',
+						name: 'street',
+						type: 'string',
+						default: '',
+					},
+				],
+			},
+		],
+	},
+	{
+		displayName: 'Business Home Page',
+		name: 'businessHomePage',
+		type: 'string',
+		default: '',
+	},
+	{
+		displayName: 'Business Phones',
+		name: 'businessPhones',
+		type: 'string',
+		description: 'Comma-separated list of business phone numbers',
+		default: '',
+	},
+	{
+		displayName: 'Categories',
+		name: 'categories',
+		description: 'Comma-separated list of categories associated with the contact',
+		type: 'string',
+		default: '',
+	},
+	{
+		displayName: 'Children',
+		name: 'children',
+		description: "Comma-separated list of names of the contact's children",
+		type: 'string',
+		default: '',
+	},
+	{
+		displayName: 'Company Name',
+		name: 'companyName',
+		type: 'string',
+		default: '',
+	},
+	{
+		displayName: 'Department',
+		name: 'department',
+		type: 'string',
+		default: '',
+	},
+	{
+		displayName: 'Display Name',
+		name: 'displayName',
+		type: 'string',
+		default: '',
+	},
+	{
+		displayName: 'Email Address',
+		name: 'emailAddresses',
+		type: 'fixedCollection',
+		placeholder: 'Add Email',
+		typeOptions: {
+			multipleValues: true,
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Email',
+				name: 'values',
+				values: [
+					{
+						displayName: 'Name',
+						name: 'name',
+						type: 'string',
+						default: '',
+					},
+					{
+						displayName: 'Address',
+						name: 'address',
+						type: 'string',
+						default: '',
+					},
+				],
+			},
+		],
+	},
+	{
+		displayName: 'File As',
+		name: 'fileAs',
+		type: 'string',
+		default: '',
+		description: 'The name the contact is filed under',
+	},
+	{
+		displayName: 'Home Address',
+		name: 'homeAddress',
+		type: 'fixedCollection',
+		placeholder: 'Add Address',
+		default: {
+			values: { sity: '', street: '', postalCode: '', countryOrRegion: '', state: '' },
+		},
+		options: [
+			{
+				displayName: 'Address',
+				name: 'values',
+				values: [
+					{
+						displayName: 'City',
+						name: 'city',
+						type: 'string',
+						default: '',
+					},
+					{
+						displayName: 'Country/Region',
+						name: 'countryOrRegion',
+						type: 'string',
+						default: '',
+					},
+					{
+						displayName: 'Postal Code',
+						name: 'postalCode',
+						type: 'string',
+						default: '',
+					},
+					{
+						displayName: 'State',
+						name: 'state',
+						type: 'string',
+						default: '',
+					},
+					{
+						displayName: 'Street',
+						name: 'street',
+						type: 'string',
+						default: '',
+					},
+				],
+			},
+		],
+	},
+	{
+		displayName: 'Home Phones',
+		name: 'homePhones',
+		type: 'string',
+		default: '',
+		hint: 'Multiple phones can be added separated by ,',
+	},
+	{
+		displayName: 'Instant Messaging Addresses',
+		name: 'imAddresses',
+		description: "The contact's instant messaging (IM) addresses",
+		type: 'string',
+		default: '',
+		hint: 'Multiple addresses can be added separated by ,',
+	},
+	{
+		displayName: 'Initials',
+		name: 'initials',
+		type: 'string',
+		default: '',
+	},
+	{
+		displayName: 'Job Title',
+		name: 'jobTitle',
+		type: 'string',
+		default: '',
+	},
+	{
+		displayName: 'Manager',
+		name: 'manager',
+		type: 'string',
+		default: '',
+		description: "The name of the contact's manager",
+	},
+	{
+		displayName: 'Middle Name',
+		name: 'middleName',
+		type: 'string',
+		default: '',
+	},
+	{
+		displayName: 'Mobile Phone',
+		name: 'mobilePhone',
+		type: 'string',
+		default: '',
+	},
+	{
+		displayName: 'Name',
+		name: 'givenName',
+		type: 'string',
+		default: '',
+		displayOptions: {
+			show: {
+				'/operation': ['update'],
+			},
+		},
+	},
+	{
+		displayName: 'Nickname',
+		name: 'nickName',
+		type: 'string',
+		default: '',
+	},
+	{
+		displayName: 'Office Location',
+		name: 'officeLocation',
+		type: 'string',
+		default: '',
+	},
+	{
+		displayName: 'Other Address',
+		name: 'otherAddress',
+		type: 'fixedCollection',
+		placeholder: 'Add Address',
+		default: {
+			values: { sity: '', street: '', postalCode: '', countryOrRegion: '', state: '' },
+		},
+		options: [
+			{
+				displayName: 'Address',
+				name: 'values',
+				values: [
+					{
+						displayName: 'City',
+						name: 'city',
+						type: 'string',
+						default: '',
+					},
+					{
+						displayName: 'Country/Region',
+						name: 'countryOrRegion',
+						type: 'string',
+						default: '',
+					},
+					{
+						displayName: 'Postal Code',
+						name: 'postalCode',
+						type: 'string',
+						default: '',
+					},
+					{
+						displayName: 'State',
+						name: 'state',
+						type: 'string',
+						default: '',
+					},
+					{
+						displayName: 'Street',
+						name: 'street',
+						type: 'string',
+						default: '',
+					},
+				],
+			},
+		],
+	},
+	{
+		displayName: 'Personal Notes',
+		name: 'personalNotes',
+		type: 'string',
+		default: '',
+		typeOptions: {
+			alwaysOpenEditWindow: true,
+		},
+	},
+	{
+		displayName: 'Profession',
+		name: 'profession',
+		type: 'string',
+		default: '',
+	},
+	{
+		displayName: 'Spouse Name',
+		name: 'spouseName',
+		type: 'string',
+		default: '',
+	},
+	{
+		displayName: 'Surname',
+		name: 'surname',
+		type: 'string',
+		default: '',
+	},
+	{
+		displayName: 'Title',
+		name: 'title',
+		type: 'string',
+		default: '',
+	},
+];
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/descriptions/index.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/descriptions/index.ts
new file mode 100644
index 0000000000000..d1d564cad8b9a
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/descriptions/index.ts
@@ -0,0 +1,2 @@
+export * from './rlc.description';
+export * from './common.descriptions';
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/descriptions/rlc.description.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/descriptions/rlc.description.ts
new file mode 100644
index 0000000000000..df3ce0fde045e
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/descriptions/rlc.description.ts
@@ -0,0 +1,229 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+export const calendarRLC: INodeProperties = {
+	displayName: 'Calendar',
+	name: 'calendarId',
+	type: 'resourceLocator',
+	default: { mode: 'list', value: '' },
+	required: true,
+	modes: [
+		{
+			displayName: 'From List',
+			name: 'list',
+			type: 'list',
+			placeholder: 'Select a calendar...',
+			typeOptions: {
+				searchListMethod: 'searchCalendars',
+				searchable: true,
+			},
+		},
+		{
+			displayName: 'ID',
+			name: 'id',
+			type: 'string',
+			placeholder: 'e.g. AAAkAAAhAAA0BBc5LLLwOOOtNNNkZS05Nz...',
+		},
+	],
+};
+
+export const contactRLC: INodeProperties = {
+	displayName: 'Contact',
+	name: 'contactId',
+	type: 'resourceLocator',
+	default: { mode: 'list', value: '' },
+	required: true,
+	modes: [
+		{
+			displayName: 'From List',
+			name: 'list',
+			type: 'list',
+			placeholder: 'Select a contact...',
+			typeOptions: {
+				searchListMethod: 'searchContacts',
+				searchable: true,
+			},
+		},
+		{
+			displayName: 'ID',
+			name: 'id',
+			type: 'string',
+			placeholder: 'e.g. AAAkAAAhAAA0BBc5LLLwOOOtNNNkZS05Nz...',
+		},
+	],
+};
+
+export const draftRLC: INodeProperties = {
+	displayName: 'Draft',
+	name: 'draftId',
+	type: 'resourceLocator',
+	default: { mode: 'list', value: '' },
+	required: true,
+	modes: [
+		{
+			displayName: 'From List',
+			name: 'list',
+			type: 'list',
+			placeholder: 'Select a draft...',
+			typeOptions: {
+				searchListMethod: 'searchDrafts',
+				searchable: true,
+			},
+		},
+		{
+			displayName: 'ID',
+			name: 'id',
+			type: 'string',
+			placeholder: 'e.g. AAAkAAAhAAA0BBc5LLLwOOOtNNNkZS05Nz...',
+		},
+	],
+};
+
+export const messageRLC: INodeProperties = {
+	displayName: 'Message',
+	name: 'messageId',
+	type: 'resourceLocator',
+	default: { mode: 'list', value: '' },
+	required: true,
+	modes: [
+		{
+			displayName: 'From List',
+			name: 'list',
+			type: 'list',
+			placeholder: 'Select a message...',
+			typeOptions: {
+				searchListMethod: 'searchMessages',
+				searchable: true,
+			},
+		},
+		{
+			displayName: 'ID',
+			name: 'id',
+			type: 'string',
+			placeholder: 'e.g. AAAkAAAhAAA0BBc5LLLwOOOtNNNkZS05Nz...',
+		},
+	],
+};
+
+export const eventRLC: INodeProperties = {
+	displayName: 'Event',
+	name: 'eventId',
+	type: 'resourceLocator',
+	default: { mode: 'list', value: '' },
+	required: true,
+	typeOptions: {
+		loadOptionsDependsOn: ['calendarId.value'],
+	},
+	modes: [
+		{
+			displayName: 'From List',
+			name: 'list',
+			type: 'list',
+			placeholder: 'Select a event...',
+			typeOptions: {
+				searchListMethod: 'searchEvents',
+				searchable: true,
+			},
+		},
+		{
+			displayName: 'Link',
+			name: 'url',
+			type: 'string',
+			placeholder: 'e.g. https://outlook.office365.com/calendar/item/AAMkADlhOTA0M...UAAA%3D',
+			extractValue: {
+				type: 'regex',
+				regex:
+					'https:\\/\\/outlook\\.office365\\.com\\/calendar\\/item\\/([A-Za-z0-9%]+)(?:\\/.*|)',
+			},
+			validation: [
+				{
+					type: 'regex',
+					properties: {
+						regex:
+							'https:\\/\\/outlook\\.office365\\.com\\/calendar\\/item\\/([A-Za-z0-9%]+)(?:\\/.*|)',
+						errorMessage: 'Not a valid Outlook Event URL',
+					},
+				},
+			],
+		},
+		{
+			displayName: 'ID',
+			name: 'id',
+			type: 'string',
+			placeholder: 'e.g. AAAkAAAhAAA0BBc5LLLwOOOtNNNkZS05Nz...',
+		},
+	],
+};
+
+export const folderRLC: INodeProperties = {
+	displayName: 'Folder',
+	name: 'folderId',
+	type: 'resourceLocator',
+	default: { mode: 'list', value: '' },
+	required: true,
+	modes: [
+		{
+			displayName: 'From List',
+			name: 'list',
+			type: 'list',
+			placeholder: 'Select a folder...',
+			typeOptions: {
+				searchListMethod: 'searchFolders',
+				searchable: true,
+			},
+		},
+		{
+			displayName: 'Link',
+			name: 'url',
+			type: 'string',
+			placeholder: 'e.g. https://outlook.office365.com/mail/AAMkADlhOT...AAA%3D',
+			extractValue: {
+				type: 'regex',
+				regex: 'https:\\/\\/outlook\\.office365\\.com\\/mail\\/([A-Za-z0-9%]+)(?:\\/.*|)',
+			},
+			validation: [
+				{
+					type: 'regex',
+					properties: {
+						regex: 'https:\\/\\/outlook\\.office365\\.com\\/mail\\/([A-Za-z0-9%]+)(?:\\/.*|)',
+						errorMessage: 'Not a valid Outlook Folder URL',
+					},
+				},
+			],
+		},
+		{
+			displayName: 'ID',
+			name: 'id',
+			type: 'string',
+			placeholder: 'e.g. AAAkAAAhAAA0BBc5LLLwOOOtNNNkZS05Nz...',
+		},
+	],
+};
+
+export const attachmentRLC: INodeProperties = {
+	displayName: 'Attachment',
+	name: 'attachmentId',
+	type: 'resourceLocator',
+	default: { mode: 'list', value: '' },
+	required: true,
+	typeOptions: {
+		loadOptionsDependsOn: ['messageId.value'],
+	},
+	modes: [
+		{
+			displayName: 'From List',
+			name: 'list',
+			type: 'list',
+			placeholder: 'Select a attachment...',
+			typeOptions: {
+				searchListMethod: 'searchAttachments',
+				searchable: false,
+			},
+		},
+		{
+			displayName: 'ID',
+			name: 'id',
+			type: 'string',
+			placeholder: 'e.g. AAAkAAAhAAA0BBc5LLLwOOOtNNNkZS05Nz...',
+		},
+	],
+};
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/helpers/utils.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/helpers/utils.ts
new file mode 100644
index 0000000000000..56bf596d40b7a
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/helpers/utils.ts
@@ -0,0 +1,305 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
+	IPollFunctions,
+	JsonObject,
+} from 'n8n-workflow';
+import { ApplicationError, jsonParse, NodeApiError } from 'n8n-workflow';
+
+export const messageFields = [
+	'bccRecipients',
+	'body',
+	'bodyPreview',
+	'categories',
+	'ccRecipients',
+	'changeKey',
+	'conversationId',
+	'createdDateTime',
+	'flag',
+	'from',
+	'hasAttachments',
+	'importance',
+	'inferenceClassification',
+	'internetMessageId',
+	'isDeliveryReceiptRequested',
+	'isDraft',
+	'isRead',
+	'isReadReceiptRequested',
+	'lastModifiedDateTime',
+	'parentFolderId',
+	'receivedDateTime',
+	'replyTo',
+	'sender',
+	'sentDateTime',
+	'subject',
+	'toRecipients',
+	'webLink',
+].map((field) => ({ name: field, value: field }));
+
+export const eventfields = [
+	'allowNewTimeProposals',
+	'attendees',
+	'body',
+	'bodyPreview',
+	'categories',
+	'changeKey',
+	'createdDateTime',
+	'end',
+	'hasAttachments',
+	'hideAttendees',
+	'iCalUId',
+	'importance',
+	'isAllDay',
+	'isCancelled',
+	'isDraft',
+	'isOnlineMeeting',
+	'isOrganizer',
+	'isReminderOn',
+	'lastModifiedDateTime',
+	'location',
+	'locations',
+	'onlineMeeting',
+	'onlineMeetingProvider',
+	'onlineMeetingUrl',
+	'organizer',
+	'originalEndTimeZone',
+	'originalStartTimeZone',
+	'recurrence',
+	'reminderMinutesBeforeStart',
+	'responseRequested',
+	'responseStatus',
+	'sensitivity',
+	'seriesMasterId',
+	'showAs',
+	'start',
+	'subject',
+	'transactionId',
+	'type',
+	'webLink',
+].map((field) => ({ name: field, value: field }));
+
+export const contactFields = [
+	'createdDateTime',
+	'lastModifiedDateTime',
+	'changeKey',
+	'categories',
+	'parentFolderId',
+	'birthday',
+	'fileAs',
+	'displayName',
+	'givenName',
+	'initials',
+	'middleName',
+	'nickName',
+	'surname',
+	'title',
+	'yomiGivenName',
+	'yomiSurname',
+	'yomiCompanyName',
+	'generation',
+	'imAddresses',
+	'jobTitle',
+	'companyName',
+	'department',
+	'officeLocation',
+	'profession',
+	'businessHomePage',
+	'assistantName',
+	'manager',
+	'homePhones',
+	'mobilePhone',
+	'businessPhones',
+	'spouseName',
+	'personalNotes',
+	'children',
+	'emailAddresses',
+	'homeAddress',
+	'businessAddress',
+	'otherAddress',
+].map((field) => ({ name: field, value: field }));
+
+export function makeRecipient(email: string) {
+	return {
+		emailAddress: {
+			address: email,
+		},
+	};
+}
+
+export function createMessage(fields: IDataObject) {
+	const message: IDataObject = {};
+
+	// Create body object
+	if (fields.bodyContent || fields.bodyContentType) {
+		const bodyObject = {
+			content: fields.bodyContent,
+			contentType: fields.bodyContentType,
+		};
+
+		message.body = bodyObject;
+		delete fields.bodyContent;
+		delete fields.bodyContentType;
+	}
+
+	// Handle custom headers
+	if (
+		'internetMessageHeaders' in fields &&
+		'headers' in (fields.internetMessageHeaders as IDataObject)
+	) {
+		fields.internetMessageHeaders = (fields.internetMessageHeaders as IDataObject).headers;
+	}
+
+	for (const [key, value] of Object.entries(fields)) {
+		if (['bccRecipients', 'ccRecipients', 'replyTo', 'sender', 'toRecipients'].includes(key)) {
+			if (Array.isArray(value)) {
+				message[key] = (value as string[]).map((email) => makeRecipient(email));
+			} else if (typeof value === 'string') {
+				message[key] = value.split(',').map((recipient: string) => makeRecipient(recipient.trim()));
+			} else {
+				throw new ApplicationError(`The "${key}" field must be a string or an array of strings`, {
+					level: 'warning',
+				});
+			}
+			continue;
+		}
+
+		if (['from', 'sender'].includes(key)) {
+			if (value) {
+				message[key] = makeRecipient(value as string);
+			}
+			continue;
+		}
+
+		message[key] = value;
+	}
+
+	return message;
+}
+
+export function simplifyOutputMessages(data: IDataObject[]) {
+	return data.map((item: IDataObject) => {
+		return {
+			id: item.id,
+			conversationId: item.conversationId,
+			subject: item.subject,
+			bodyPreview: item.bodyPreview,
+			from: ((item.from as IDataObject)?.emailAddress as IDataObject)?.address,
+			to: (item.toRecipients as IDataObject[]).map(
+				(recipient: IDataObject) => (recipient.emailAddress as IDataObject)?.address,
+			),
+			categories: item.categories,
+			hasAttachments: item.hasAttachments,
+		};
+	});
+}
+
+export function prepareContactFields(fields: IDataObject) {
+	const returnData: IDataObject = {};
+
+	const typeStringCollection = [
+		'businessPhones',
+		'categories',
+		'children',
+		'homePhones',
+		'imAddresses',
+	];
+	const typeValuesToExtract = ['businessAddress', 'emailAddresses', 'homePhones', 'otherAddress'];
+
+	for (const [key, value] of Object.entries(fields)) {
+		if (value === undefined || value === '') {
+			continue;
+		}
+
+		if (typeStringCollection.includes(key) && !Array.isArray(value)) {
+			returnData[key] = (value as string).split(',').map((item) => item.trim());
+			continue;
+		}
+
+		if (typeValuesToExtract.includes(key)) {
+			if ((value as IDataObject).values === undefined) continue;
+			returnData[key] = (value as IDataObject).values;
+			continue;
+		}
+
+		returnData[key] = value;
+	}
+
+	return returnData;
+}
+
+export function prepareFilterString(filters: IDataObject) {
+	const selectedFilters = filters.filters as IDataObject;
+	const filterString: string[] = [];
+
+	if (selectedFilters.foldersToInclude) {
+		const folders = (selectedFilters.foldersToInclude as string[])
+			.filter((folder) => folder !== '')
+			.map((folder) => `parentFolderId eq '${folder}'`)
+			.join(' or ');
+
+		filterString.push(folders);
+	}
+
+	if (selectedFilters.foldersToExclude) {
+		for (const folder of selectedFilters.foldersToExclude as string[]) {
+			filterString.push(`parentFolderId ne '${folder}'`);
+		}
+	}
+
+	if (selectedFilters.sender) {
+		const sender = selectedFilters.sender as string;
+		const byMailAddress = `from/emailAddress/address eq '${sender}'`;
+		const byName = `from/emailAddress/name eq '${sender}'`;
+		filterString.push(`(${byMailAddress} or ${byName})`);
+	}
+
+	if (selectedFilters.hasAttachments) {
+		filterString.push(`hasAttachments eq ${selectedFilters.hasAttachments}`);
+	}
+
+	if (selectedFilters.readStatus && selectedFilters.readStatus !== 'both') {
+		filterString.push(`isRead eq ${selectedFilters.readStatus === 'read'}`);
+	}
+
+	if (selectedFilters.receivedAfter) {
+		filterString.push(`receivedDateTime ge ${selectedFilters.receivedAfter}`);
+	}
+
+	if (selectedFilters.receivedBefore) {
+		filterString.push(`receivedDateTime le ${selectedFilters.receivedBefore}`);
+	}
+
+	if (selectedFilters.custom) {
+		filterString.push(selectedFilters.custom as string);
+	}
+
+	return filterString.length ? filterString.join(' and ') : undefined;
+}
+
+export function prepareApiError(
+	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IPollFunctions,
+	error: IDataObject,
+	itemIndex = 0,
+) {
+	const [httpCode, err, message] = (error.description as string).split(' - ');
+	const json = jsonParse(err);
+	return new NodeApiError(this.getNode(), json as JsonObject, {
+		itemIndex,
+		httpCode,
+		//In UI we are replacing some of the field names to make them more user friendly, updating error message to reflect that
+		message: message
+			.replace(/toRecipients/g, 'toRecipients (To)')
+			.replace(/bodyContent/g, 'bodyContent (Message)')
+			.replace(/bodyContentType/g, 'bodyContentType (Message Type)'),
+	});
+}
+
+export const encodeOutlookId = (id: string) => {
+	return id.replace(/-/g, '%2F').replace(/=/g, '%3D').replace(/\+/g, '%2B');
+};
+
+export const decodeOutlookId = (id: string) => {
+	return id.replace(/%2F/g, '-').replace(/%3D/g, '=').replace(/%2B/g, '+');
+};
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/methods/index.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/methods/index.ts
new file mode 100644
index 0000000000000..a5508a3e0fa86
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/methods/index.ts
@@ -0,0 +1,2 @@
+export * as loadOptions from './loadOptions';
+export * as listSearch from './listSearch';
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/methods/listSearch.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/methods/listSearch.ts
new file mode 100644
index 0000000000000..c0110ac8bc733
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/methods/listSearch.ts
@@ -0,0 +1,289 @@
+import type { IDataObject, ILoadOptionsFunctions, INodeListSearchResult } from 'n8n-workflow';
+import { getSubfolders, microsoftApiRequest } from '../transport';
+import { encodeOutlookId } from '../helpers/utils';
+
+async function search(
+	this: ILoadOptionsFunctions,
+	resource: string,
+	nameProperty: string,
+	filter?: string,
+	paginationToken?: string,
+): Promise<INodeListSearchResult> {
+	let response: IDataObject = {};
+
+	if (paginationToken) {
+		response = await microsoftApiRequest.call(
+			this,
+			'GET',
+			'',
+			undefined,
+			undefined,
+			paginationToken, // paginationToken contains the full URL
+		);
+	} else {
+		const qs: IDataObject = {
+			$select: `id,${nameProperty}`,
+			$top: 100,
+		};
+
+		if (filter) {
+			const filterValue = encodeURI(filter);
+			qs.$filter = `contains(${nameProperty}, '${filterValue}')`;
+		}
+
+		response = await microsoftApiRequest.call(this, 'GET', resource, undefined, qs);
+	}
+
+	return {
+		results: (response.value as IDataObject[]).map((entry: IDataObject) => {
+			return {
+				name: entry[nameProperty] as string,
+				value: entry.id as string,
+			};
+		}),
+		paginationToken: response['@odata.nextLink'],
+	};
+}
+
+export async function searchContacts(
+	this: ILoadOptionsFunctions,
+	filter?: string,
+	paginationToken?: string,
+): Promise<INodeListSearchResult> {
+	return await search.call(this, '/contacts', 'displayName', filter, paginationToken);
+}
+
+export async function searchCalendars(
+	this: ILoadOptionsFunctions,
+	filter?: string,
+	paginationToken?: string,
+): Promise<INodeListSearchResult> {
+	return await search.call(this, '/calendars', 'name', filter, paginationToken);
+}
+
+export async function searchDrafts(
+	this: ILoadOptionsFunctions,
+	filter?: string,
+	paginationToken?: string,
+): Promise<INodeListSearchResult> {
+	let response: IDataObject = {};
+
+	if (paginationToken) {
+		response = await microsoftApiRequest.call(
+			this,
+			'GET',
+			'',
+			undefined,
+			undefined,
+			paginationToken, // paginationToken contains the full URL
+		);
+	} else {
+		const qs: IDataObject = {
+			$select: 'id,subject,bodyPreview,webLink',
+			$top: 100,
+			$filter: 'isDraft eq true',
+		};
+
+		if (filter) {
+			const filterValue = encodeURI(filter);
+			qs.$filter += ` AND contains(${'subject'}, '${filterValue}')`;
+		}
+
+		response = await microsoftApiRequest.call(this, 'GET', '/messages', undefined, qs);
+	}
+
+	return {
+		results: (response.value as IDataObject[]).map((entry: IDataObject) => {
+			return {
+				name: (entry.subject || entry.bodyPreview) as string,
+				value: entry.id as string,
+				url: entry.webLink as string,
+			};
+		}),
+		paginationToken: response['@odata.nextLink'],
+	};
+}
+
+export async function searchMessages(
+	this: ILoadOptionsFunctions,
+	filter?: string,
+	paginationToken?: string,
+): Promise<INodeListSearchResult> {
+	let response: IDataObject = {};
+
+	if (paginationToken) {
+		response = await microsoftApiRequest.call(
+			this,
+			'GET',
+			'',
+			undefined,
+			undefined,
+			paginationToken, // paginationToken contains the full URL
+		);
+	} else {
+		const qs: IDataObject = {
+			$select: 'id,subject,bodyPreview,webLink',
+			$top: 100,
+		};
+
+		if (filter) {
+			const filterValue = encodeURI(filter);
+			qs.$filter = `contains(${'subject'}, '${filterValue}')`;
+		}
+
+		response = await microsoftApiRequest.call(this, 'GET', '/messages', undefined, qs);
+	}
+
+	return {
+		results: (response.value as IDataObject[]).map((entry: IDataObject) => {
+			return {
+				name: (entry.subject || entry.bodyPreview) as string,
+				value: entry.id as string,
+				url: entry.webLink as string,
+			};
+		}),
+		paginationToken: response['@odata.nextLink'],
+	};
+}
+
+export async function searchEvents(
+	this: ILoadOptionsFunctions,
+	filter?: string,
+	paginationToken?: string,
+): Promise<INodeListSearchResult> {
+	let response: IDataObject = {};
+
+	const calendarId = this.getNodeParameter('calendarId', undefined, {
+		extractValue: true,
+	}) as string;
+
+	if (paginationToken) {
+		response = await microsoftApiRequest.call(
+			this,
+			'GET',
+			'',
+			undefined,
+			undefined,
+			paginationToken, // paginationToken contains the full URL
+		);
+	} else {
+		const qs: IDataObject = {
+			$select: 'id,subject,bodyPreview',
+			$top: 100,
+		};
+
+		if (filter) {
+			const filterValue = encodeURI(filter);
+			qs.$filter = `contains(${'subject'}, '${filterValue}')`;
+		}
+
+		response = await microsoftApiRequest.call(
+			this,
+			'GET',
+			`/calendars/${calendarId}/events`,
+			undefined,
+			qs,
+		);
+	}
+
+	return {
+		results: (response.value as IDataObject[]).map((entry: IDataObject) => {
+			return {
+				name: (entry.subject || entry.bodyPreview) as string,
+				value: entry.id as string,
+				url: `https://outlook.office365.com/calendar/item/${encodeOutlookId(entry.id as string)}`,
+			};
+		}),
+		paginationToken: response['@odata.nextLink'],
+	};
+}
+
+export async function searchFolders(
+	this: ILoadOptionsFunctions,
+	filter?: string,
+	paginationToken?: string,
+): Promise<INodeListSearchResult> {
+	let response: IDataObject = {};
+
+	if (paginationToken) {
+		response = await microsoftApiRequest.call(
+			this,
+			'GET',
+			'',
+			undefined,
+			undefined,
+			paginationToken, // paginationToken contains the full URL
+		);
+	} else {
+		const qs: IDataObject = {
+			$top: 100,
+		};
+
+		response = await microsoftApiRequest.call(this, 'GET', '/mailFolders', undefined, qs);
+	}
+
+	let folders = await getSubfolders.call(this, response.value as IDataObject[]);
+
+	if (filter) {
+		filter = filter.toLowerCase();
+		folders = folders.filter((folder) =>
+			((folder.displayName as string) || '').toLowerCase().includes(filter as string),
+		);
+	}
+
+	return {
+		results: folders.map((entry: IDataObject) => {
+			return {
+				name: entry.displayName as string,
+				value: entry.id as string,
+				url: `https://outlook.office365.com/mail/${encodeOutlookId(entry.id as string)}`,
+			};
+		}),
+		paginationToken: response['@odata.nextLink'],
+	};
+}
+
+export async function searchAttachments(
+	this: ILoadOptionsFunctions,
+	paginationToken?: string,
+): Promise<INodeListSearchResult> {
+	let response: IDataObject = {};
+
+	const messageId = this.getNodeParameter('messageId', undefined, {
+		extractValue: true,
+	}) as string;
+
+	if (paginationToken) {
+		response = await microsoftApiRequest.call(
+			this,
+			'GET',
+			'',
+			undefined,
+			undefined,
+			paginationToken, // paginationToken contains the full URL
+		);
+	} else {
+		const qs: IDataObject = {
+			$select: 'id,name',
+			$top: 100,
+		};
+
+		response = await microsoftApiRequest.call(
+			this,
+			'GET',
+			`/messages/${messageId}/attachments`,
+			undefined,
+			qs,
+		);
+	}
+
+	return {
+		results: (response.value as IDataObject[]).map((entry: IDataObject) => {
+			return {
+				name: entry.name as string,
+				value: entry.id as string,
+			};
+		}),
+		paginationToken: response['@odata.nextLink'],
+	};
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/methods/loadOptions.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/methods/loadOptions.ts
new file mode 100644
index 0000000000000..389d8b49a041b
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/methods/loadOptions.ts
@@ -0,0 +1,54 @@
+import type { ILoadOptionsFunctions, INodePropertyOptions } from 'n8n-workflow';
+import { getSubfolders, microsoftApiRequestAllItems } from '../transport';
+
+export async function getCategoriesNames(
+	this: ILoadOptionsFunctions,
+): Promise<INodePropertyOptions[]> {
+	const returnData: INodePropertyOptions[] = [];
+	const categories = await microsoftApiRequestAllItems.call(
+		this,
+		'value',
+		'GET',
+		'/outlook/masterCategories',
+	);
+	for (const category of categories) {
+		returnData.push({
+			name: category.displayName as string,
+			value: category.displayName as string,
+		});
+	}
+	return returnData;
+}
+
+export async function getFolders(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+	const returnData: INodePropertyOptions[] = [];
+	const response = await microsoftApiRequestAllItems.call(this, 'value', 'GET', '/mailFolders', {});
+	const folders = await getSubfolders.call(this, response);
+	for (const folder of folders) {
+		returnData.push({
+			name: folder.displayName as string,
+			value: folder.id as string,
+		});
+	}
+	return returnData;
+}
+
+export async function getCalendarGroups(
+	this: ILoadOptionsFunctions,
+): Promise<INodePropertyOptions[]> {
+	const returnData: INodePropertyOptions[] = [];
+	const calendars = await microsoftApiRequestAllItems.call(
+		this,
+		'value',
+		'GET',
+		'/calendarGroups',
+		{},
+	);
+	for (const calendar of calendars) {
+		returnData.push({
+			name: calendar.name as string,
+			value: calendar.id as string,
+		});
+	}
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/transport/index.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/transport/index.ts
new file mode 100644
index 0000000000000..db85f5b60aa76
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/transport/index.ts
@@ -0,0 +1,225 @@
+import type {
+	IHttpRequestMethods,
+	IRequestOptions,
+	IDataObject,
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
+	INodeExecutionData,
+	IPollFunctions,
+} from 'n8n-workflow';
+import { prepareApiError } from '../helpers/utils';
+
+export async function microsoftApiRequest(
+	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IPollFunctions,
+	method: IHttpRequestMethods,
+	resource: string,
+	body: IDataObject = {},
+	qs: IDataObject = {},
+	uri?: string,
+	headers: IDataObject = {},
+	option: IDataObject = { json: true },
+) {
+	const credentials = await this.getCredentials('microsoftOutlookOAuth2Api');
+
+	let apiUrl = `https://graph.microsoft.com/v1.0/me${resource}`;
+	// If accessing shared mailbox
+	if (credentials.useShared && credentials.userPrincipalName) {
+		apiUrl = `https://graph.microsoft.com/v1.0/users/${credentials.userPrincipalName}${resource}`;
+	}
+
+	const options: IRequestOptions = {
+		headers: {
+			'Content-Type': 'application/json',
+		},
+		method,
+		body,
+		qs,
+		uri: uri || apiUrl,
+	};
+	try {
+		Object.assign(options, option);
+
+		if (Object.keys(headers).length !== 0) {
+			options.headers = Object.assign({}, options.headers, headers);
+		}
+
+		if (Object.keys(body).length === 0) {
+			delete options.body;
+		}
+
+		return await this.helpers.requestWithAuthentication.call(
+			this,
+			'microsoftOutlookOAuth2Api',
+			options,
+		);
+	} catch (error) {
+		if (
+			((error.message || '').toLowerCase().includes('bad request') ||
+				(error.message || '').toLowerCase().includes('unknown error')) &&
+			error.description
+		) {
+			let updatedError;
+			// Try to return the error prettier, otherwise return the original one replacing the message with the description
+			try {
+				updatedError = prepareApiError.call(this, error);
+			} catch (e) {}
+
+			if (updatedError) throw updatedError;
+
+			error.message = error.description;
+			error.description = '';
+		}
+
+		throw error;
+	}
+}
+
+export async function microsoftApiRequestAllItems(
+	this: IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions,
+	propertyName: string,
+	method: IHttpRequestMethods,
+	endpoint: string,
+	body: IDataObject = {},
+	query: IDataObject = {},
+	headers: IDataObject = {},
+) {
+	const returnData: IDataObject[] = [];
+
+	let responseData;
+	let nextLink: string | undefined;
+	query.$top = 100;
+
+	do {
+		responseData = await microsoftApiRequest.call(
+			this,
+			method,
+			endpoint,
+			body,
+			nextLink ? undefined : query, // Do not add query parameters as nextLink already contains them
+			nextLink,
+			headers,
+		);
+		nextLink = responseData['@odata.nextLink'];
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
+	} while (responseData['@odata.nextLink'] !== undefined);
+
+	return returnData;
+}
+
+export async function downloadAttachments(
+	this: IExecuteFunctions | IPollFunctions,
+	messages: IDataObject[] | IDataObject,
+	prefix: string,
+) {
+	const elements: INodeExecutionData[] = [];
+	if (!Array.isArray(messages)) {
+		messages = [messages];
+	}
+	for (const message of messages) {
+		const element: INodeExecutionData = {
+			json: message,
+			binary: {},
+		};
+		if (message.hasAttachments === true) {
+			const attachments = await microsoftApiRequestAllItems.call(
+				this,
+				'value',
+				'GET',
+				`/messages/${message.id}/attachments`,
+				{},
+			);
+			for (const [index, attachment] of attachments.entries()) {
+				const response = await microsoftApiRequest.call(
+					this,
+					'GET',
+					`/messages/${message.id}/attachments/${attachment.id}/$value`,
+					undefined,
+					{},
+					undefined,
+					{},
+					{ encoding: null, resolveWithFullResponse: true },
+				);
+
+				const data = Buffer.from(response.body as string, 'utf8');
+				element.binary![`${prefix}${index}`] = await this.helpers.prepareBinaryData(
+					data as unknown as Buffer,
+					attachment.name as string,
+					attachment.contentType as string,
+				);
+			}
+		}
+		if (Object.keys(element.binary!).length === 0) {
+			delete element.binary;
+		}
+		elements.push(element);
+	}
+	return elements;
+}
+
+export async function getMimeContent(
+	this: IExecuteFunctions,
+	messageId: string,
+	binaryPropertyName: string,
+	outputFileName?: string,
+) {
+	const response = await microsoftApiRequest.call(
+		this,
+		'GET',
+		`/messages/${messageId}/$value`,
+		undefined,
+		{},
+		undefined,
+		{},
+		{ encoding: null, resolveWithFullResponse: true },
+	);
+
+	let mimeType: string | undefined;
+	if (response.headers['content-type']) {
+		mimeType = response.headers['content-type'];
+	}
+
+	const fileName = `${outputFileName || messageId}.eml`;
+	const data = Buffer.from(response.body as string, 'utf8');
+	const binary: IDataObject = {};
+	binary[binaryPropertyName] = await this.helpers.prepareBinaryData(
+		data as unknown as Buffer,
+		fileName,
+		mimeType,
+	);
+
+	return binary;
+}
+
+export async function getSubfolders(
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	folders: IDataObject[],
+	addPathToDisplayName = false,
+) {
+	const returnData: IDataObject[] = [...folders];
+	for (const folder of folders) {
+		if ((folder.childFolderCount as number) > 0) {
+			let subfolders = await microsoftApiRequest.call(
+				this,
+				'GET',
+				`/mailFolders/${folder.id}/childFolders`,
+			);
+
+			if (addPathToDisplayName) {
+				subfolders = subfolders.value.map((subfolder: IDataObject) => {
+					return {
+						...subfolder,
+						displayName: `${folder.displayName}/${subfolder.displayName}`,
+					};
+				});
+			} else {
+				subfolders = subfolders.value;
+			}
+
+			returnData.push(
+				...(await getSubfolders.call(this, subfolders as IDataObject[], addPathToDisplayName)),
+			);
+		}
+	}
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Sql/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/Sql/GenericFunctions.ts
index 1b8e5322546b6..14e880bb04304 100644
--- a/packages/nodes-base/nodes/Microsoft/Sql/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Microsoft/Sql/GenericFunctions.ts
@@ -1,7 +1,8 @@
-/* eslint-disable @typescript-eslint/ban-types */
 import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
 import { deepCopy } from 'n8n-workflow';
-import type { ITables } from './TableInterface';
+import mssql from 'mssql';
+import type { ITables, OperationInputData } from './interfaces';
+import { chunk, flatten } from '@utils/utilities';
 
 /**
  * Returns a copy of the item which only contains the json data and
@@ -30,6 +31,7 @@ export function copyInputItem(item: INodeExecutionData, properties: string[]): I
  * @param {function} getNodeParam getter for the Node's Parameters
  */
 export function createTableStruct(
+	// eslint-disable-next-line @typescript-eslint/ban-types
 	getNodeParam: Function,
 	items: INodeExecutionData[],
 	additionalProperties: string[] = [],
@@ -61,15 +63,14 @@ export function createTableStruct(
  * @param {ITables} tables The ITables to be processed.
  * @param {function} buildQueryQueue function that builds the queue of promises
  */
-
 export async function executeQueryQueue(
 	tables: ITables,
-	buildQueryQueue: Function,
+	buildQueryQueue: (data: OperationInputData) => Array<Promise<object>>,
 ): Promise<any[]> {
-	return Promise.all(
+	return await Promise.all(
 		Object.keys(tables).map(async (table) => {
 			const columnsResults = Object.keys(tables[table]).map(async (columnString) => {
-				return Promise.all(
+				return await Promise.all(
 					buildQueryQueue({
 						table,
 						columnString,
@@ -77,73 +78,159 @@ export async function executeQueryQueue(
 					}),
 				);
 			});
-			return Promise.all(columnsResults);
+			return await Promise.all(columnsResults);
 		}),
 	);
 }
 
-/**
- * Extracts the values from the item for INSERT
- *
- * @param {IDataObject} item The item to extract
- */
-export function extractValues(item: IDataObject): string {
-	return `(${Object.values(item)
-		.map((val) => {
-			//the column cannot be found in the input
-			//so, set it to null in the sql query
-			if (val === null) {
-				return 'NULL';
-			} else if (typeof val === 'string') {
-				return `'${val.replace(/'/g, "''")}'`;
-			} else if (typeof val === 'boolean') {
-				return +!!val;
-			}
-			return val;
-		}) // maybe other types such as dates have to be handled as well
-		.join(',')})`;
+export function formatColumns(columns: string) {
+	return columns
+		.split(',')
+		.map((column) => `[${column.trim()}]`)
+		.join(', ');
 }
 
-/**
- * Extracts the SET from the item for UPDATE
- *
- * @param {IDataObject} item The item to extract from
- * @param {string[]} columns The columns to update
- */
-export function extractUpdateSet(item: IDataObject, columns: string[]): string {
-	return columns
-		.map(
-			(column) =>
-				`"${column}" = ${typeof item[column] === 'string' ? `'${item[column]}'` : item[column]}`,
-		)
-		.join(',');
+export function configurePool(credentials: IDataObject) {
+	const config = {
+		server: credentials.server as string,
+		port: credentials.port as number,
+		database: credentials.database as string,
+		user: credentials.user as string,
+		password: credentials.password as string,
+		domain: credentials.domain ? (credentials.domain as string) : undefined,
+		connectionTimeout: credentials.connectTimeout as number,
+		requestTimeout: credentials.requestTimeout as number,
+		options: {
+			encrypt: credentials.tls as boolean,
+			enableArithAbort: false,
+			tdsVersion: credentials.tdsVersion as string,
+			trustServerCertificate: credentials.allowUnauthorizedCerts as boolean,
+		},
+	};
+
+	return new mssql.ConnectionPool(config);
 }
 
-/**
- * Extracts the WHERE condition from the item for UPDATE
- *
- * @param {IDataObject} item The item to extract from
- * @param {string} key The column name to build the condition with
- */
-export function extractUpdateCondition(item: IDataObject, key: string): string {
-	return `${key} = ${typeof item[key] === 'string' ? `'${item[key]}'` : item[key]}`;
+const escapeTableName = (table: string) => {
+	table = table.trim();
+	if (table.startsWith('[') && table.endsWith(']')) {
+		return table;
+	} else {
+		return `[${table}]`;
+	}
+};
+
+const MSSQL_PARAMETER_LIMIT = 2100;
+
+export function mssqlChunk(rows: IDataObject[]): IDataObject[][] {
+	const chunked: IDataObject[][] = [[]];
+	let currentParamCount = 0;
+
+	for (const row of rows) {
+		const rowValues = Object.values(row);
+		const valueCount = rowValues.length;
+
+		if (currentParamCount + valueCount >= MSSQL_PARAMETER_LIMIT) {
+			chunked.push([]);
+			currentParamCount = 0;
+		}
+
+		chunked[chunked.length - 1].push(row);
+
+		currentParamCount += valueCount;
+	}
+
+	return chunked;
 }
 
-/**
- * Extracts the WHERE condition from the items for DELETE
- *
- * @param {IDataObject[]} items The items to extract the values from
- * @param {string} key The column name to extract the value from for the delete condition
- */
-export function extractDeleteValues(items: IDataObject[], key: string): string {
-	return `(${items
-		.map((item) => (typeof item[key] === 'string' ? `'${item[key]}'` : item[key]))
-		.join(',')})`;
+export async function insertOperation(tables: ITables, pool: mssql.ConnectionPool) {
+	return await executeQueryQueue(
+		tables,
+		({ table, columnString, items }: OperationInputData): Array<Promise<object>> => {
+			return mssqlChunk(items).map(async (insertValues) => {
+				const request = pool.request();
+
+				const valuesPlaceholder = [];
+
+				for (const [rIndex, entry] of insertValues.entries()) {
+					const row = Object.values(entry);
+					valuesPlaceholder.push(`(${row.map((_, vIndex) => `@r${rIndex}v${vIndex}`).join(', ')})`);
+					for (const [vIndex, value] of row.entries()) {
+						request.input(`r${rIndex}v${vIndex}`, value);
+					}
+				}
+
+				const query = `INSERT INTO ${escapeTableName(table)} (${formatColumns(
+					columnString,
+				)}) VALUES ${valuesPlaceholder.join(', ')};`;
+
+				return await request.query(query);
+			});
+		},
+	);
 }
 
-export function formatColumns(columns: string) {
-	return columns
-		.split(',')
-		.map((column) => `"${column.trim()}"`)
-		.join(',');
+export async function updateOperation(tables: ITables, pool: mssql.ConnectionPool) {
+	return await executeQueryQueue(
+		tables,
+		({ table, columnString, items }: OperationInputData): Array<Promise<object>> => {
+			return items.map(async (item) => {
+				const request = pool.request();
+				const columns = columnString.split(',').map((column) => column.trim());
+
+				const setValues: string[] = [];
+				const condition = `${item.updateKey} = @condition`;
+				request.input('condition', item[item.updateKey as string]);
+
+				for (const [index, col] of columns.entries()) {
+					setValues.push(`[${col}] = @v${index}`);
+					request.input(`v${index}`, item[col]);
+				}
+
+				const query = `UPDATE ${escapeTableName(table)} SET ${setValues.join(
+					', ',
+				)} WHERE ${condition};`;
+
+				return await request.query(query);
+			});
+		},
+	);
+}
+
+export async function deleteOperation(tables: ITables, pool: mssql.ConnectionPool) {
+	const queriesResults = await Promise.all(
+		Object.keys(tables).map(async (table) => {
+			const deleteKeyResults = Object.keys(tables[table]).map(async (deleteKey) => {
+				const deleteItemsList = chunk(
+					tables[table][deleteKey].map((item) =>
+						copyInputItem(item as INodeExecutionData, [deleteKey]),
+					),
+					1000,
+				);
+				const queryQueue = deleteItemsList.map(async (deleteValues) => {
+					const request = pool.request();
+					const valuesPlaceholder: string[] = [];
+
+					for (const [index, entry] of deleteValues.entries()) {
+						valuesPlaceholder.push(`@v${index}`);
+						request.input(`v${index}`, entry[deleteKey]);
+					}
+
+					const query = `DELETE FROM ${escapeTableName(
+						table,
+					)} WHERE [${deleteKey}] IN (${valuesPlaceholder.join(', ')});`;
+
+					return await request.query(query);
+				});
+				return await Promise.all(queryQueue);
+			});
+			return await Promise.all(deleteKeyResults);
+		}),
+	);
+
+	return flatten(queriesResults).reduce(
+		(acc: number, resp: mssql.IResult<object>): number =>
+			(acc += resp.rowsAffected.reduce((sum, val) => (sum += val))),
+		0,
+	);
 }
diff --git a/packages/nodes-base/nodes/Microsoft/Sql/MicrosoftSql.node.ts b/packages/nodes-base/nodes/Microsoft/Sql/MicrosoftSql.node.ts
index 8c7c00dee2787..e6c713cdcab3b 100644
--- a/packages/nodes-base/nodes/Microsoft/Sql/MicrosoftSql.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/Sql/MicrosoftSql.node.ts
@@ -1,3 +1,4 @@
+import type { IResult } from 'mssql';
 import type {
 	IExecuteFunctions,
 	ICredentialDataDecryptedObject,
@@ -11,23 +12,18 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import { chunk, flatten } from '../../../utils/utilities';
-
-import mssql from 'mssql';
-
-import type { ITables } from './TableInterface';
+import type { ITables } from './interfaces';
 
 import {
-	copyInputItem,
+	configurePool,
 	createTableStruct,
-	executeQueryQueue,
-	extractDeleteValues,
-	extractUpdateCondition,
-	extractUpdateSet,
-	extractValues,
-	formatColumns,
+	deleteOperation,
+	insertOperation,
+	updateOperation,
 } from './GenericFunctions';
 
+import { flatten, generatePairedItemData, getResolvables } from '@utils/utilities';
+
 export class MicrosoftSql implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Microsoft SQL',
@@ -41,6 +37,7 @@ export class MicrosoftSql implements INodeType {
 		},
 		inputs: ['main'],
 		outputs: ['main'],
+		parameterPane: 'wide',
 		credentials: [
 			{
 				name: 'microsoftSql',
@@ -90,13 +87,18 @@ export class MicrosoftSql implements INodeType {
 				displayName: 'Query',
 				name: 'query',
 				type: 'string',
+				noDataExpression: true,
+				typeOptions: {
+					editor: 'sqlEditor',
+					sqlDialect: 'MSSQL',
+				},
 				displayOptions: {
 					show: {
 						operation: ['executeQuery'],
 					},
 				},
 				default: '',
-				// eslint-disable-next-line n8n-nodes-base/node-param-placeholder-miscased-id
+
 				placeholder: 'SELECT id, name FROM product WHERE id < 40',
 				required: true,
 				description: 'The SQL query to execute',
@@ -122,13 +124,13 @@ export class MicrosoftSql implements INodeType {
 				displayName: 'Columns',
 				name: 'columns',
 				type: 'string',
+				requiresDataPath: 'multiple',
 				displayOptions: {
 					show: {
 						operation: ['insert'],
 					},
 				},
 				default: '',
-				// eslint-disable-next-line n8n-nodes-base/node-param-placeholder-miscased-id
 				placeholder: 'id,name,description',
 				description:
 					'Comma-separated list of the properties which should used as columns for the new rows',
@@ -154,6 +156,7 @@ export class MicrosoftSql implements INodeType {
 				displayName: 'Update Key',
 				name: 'updateKey',
 				type: 'string',
+				requiresDataPath: 'single',
 				displayOptions: {
 					show: {
 						operation: ['update'],
@@ -169,6 +172,7 @@ export class MicrosoftSql implements INodeType {
 				displayName: 'Columns',
 				name: 'columns',
 				type: 'string',
+				requiresDataPath: 'multiple',
 				displayOptions: {
 					show: {
 						operation: ['update'],
@@ -200,6 +204,7 @@ export class MicrosoftSql implements INodeType {
 				displayName: 'Delete Key',
 				name: 'deleteKey',
 				type: 'string',
+				requiresDataPath: 'single',
 				displayOptions: {
 					show: {
 						operation: ['delete'],
@@ -222,23 +227,7 @@ export class MicrosoftSql implements INodeType {
 			): Promise<INodeCredentialTestResult> {
 				const credentials = credential.data as ICredentialDataDecryptedObject;
 				try {
-					const config = {
-						server: credentials.server as string,
-						port: credentials.port as number,
-						database: credentials.database as string,
-						user: credentials.user as string,
-						password: credentials.password as string,
-						domain: credentials.domain ? (credentials.domain as string) : undefined,
-						connectionTimeout: credentials.connectTimeout as number,
-						requestTimeout: credentials.requestTimeout as number,
-						options: {
-							encrypt: credentials.tls as boolean,
-							enableArithAbort: false,
-							tdsVersion: credentials.tdsVersion as string,
-							trustServerCertificate: credentials.allowUnauthorizedCerts as boolean,
-						},
-					};
-					const pool = new mssql.ConnectionPool(config);
+					const pool = configurePool(credentials);
 					await pool.connect();
 				} catch (error) {
 					return {
@@ -257,27 +246,9 @@ export class MicrosoftSql implements INodeType {
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const credentials = await this.getCredentials('microsoftSql');
 
-		const config = {
-			server: credentials.server as string,
-			port: credentials.port as number,
-			database: credentials.database as string,
-			user: credentials.user as string,
-			password: credentials.password as string,
-			domain: credentials.domain ? (credentials.domain as string) : undefined,
-			connectionTimeout: credentials.connectTimeout as number,
-			requestTimeout: credentials.requestTimeout as number,
-			options: {
-				encrypt: credentials.tls as boolean,
-				enableArithAbort: false,
-				tdsVersion: credentials.tdsVersion as string,
-				trustServerCertificate: credentials.allowUnauthorizedCerts as boolean,
-			},
-		};
-
-		const pool = new mssql.ConnectionPool(config);
+		const pool = configurePool(credentials);
 		await pool.connect();
 
-		const returnItems: INodeExecutionData[] = [];
 		let responseData: IDataObject | IDataObject[] = [];
 
 		const items = this.getInputData();
@@ -285,91 +256,39 @@ export class MicrosoftSql implements INodeType {
 
 		try {
 			if (operation === 'executeQuery') {
-				// ----------------------------------
-				//         executeQuery
-				// ----------------------------------
+				let rawQuery = this.getNodeParameter('query', 0) as string;
 
-				const rawQuery = this.getNodeParameter('query', 0) as string;
+				for (const resolvable of getResolvables(rawQuery)) {
+					rawQuery = rawQuery.replace(resolvable, this.evaluateExpression(resolvable, 0) as string);
+				}
 
-				const queryResult = await pool.request().query(rawQuery);
+				const { recordsets }: IResult<any[]> = await pool.request().query(rawQuery);
 
-				const result =
-					queryResult.recordsets.length > 1
-						? flatten(queryResult.recordsets)
-						: queryResult.recordsets[0];
+				const result = recordsets.length > 1 ? flatten(recordsets) : recordsets[0];
 
 				responseData = result;
 			} else if (operation === 'insert') {
-				// ----------------------------------
-				//         insert
-				// ----------------------------------
-
 				const tables = createTableStruct(this.getNodeParameter, items);
-				await executeQueryQueue(
-					tables,
-					({
-						table,
-						columnString,
-						// eslint-disable-next-line @typescript-eslint/no-shadow
-						items,
-					}: {
-						table: string;
-						columnString: string;
-						items: IDataObject[];
-					}): Array<Promise<object>> => {
-						return chunk(items, 1000).map(async (insertValues) => {
-							const values = insertValues.map((item: IDataObject) => extractValues(item)).join(',');
-							return pool
-								.request()
-								.query(`INSERT INTO ${table}(${formatColumns(columnString)}) VALUES ${values};`);
-						});
-					},
-				);
+
+				await insertOperation(tables, pool);
 
 				responseData = items;
 			} else if (operation === 'update') {
-				// ----------------------------------
-				//         update
-				// ----------------------------------
-
 				const updateKeys = items.map(
 					(item, index) => this.getNodeParameter('updateKey', index) as string,
 				);
+
 				const tables = createTableStruct(
 					this.getNodeParameter,
 					items,
 					['updateKey'].concat(updateKeys),
 					'updateKey',
 				);
-				await executeQueryQueue(
-					tables,
-					({
-						table,
-						columnString,
-						// eslint-disable-next-line @typescript-eslint/no-shadow
-						items,
-					}: {
-						table: string;
-						columnString: string;
-						items: IDataObject[];
-					}): Array<Promise<object>> => {
-						return items.map(async (item) => {
-							const columns = columnString.split(',').map((column) => column.trim());
 
-							const setValues = extractUpdateSet(item, columns);
-							const condition = extractUpdateCondition(item, item.updateKey as string);
-
-							return pool.request().query(`UPDATE ${table} SET ${setValues} WHERE ${condition};`);
-						});
-					},
-				);
+				await updateOperation(tables, pool);
 
 				responseData = items;
 			} else if (operation === 'delete') {
-				// ----------------------------------
-				//         delete
-				// ----------------------------------
-
 				const tables = items.reduce((acc, item, index) => {
 					const table = this.getNodeParameter('table', index) as string;
 					const deleteKey = this.getNodeParameter('deleteKey', index) as string;
@@ -383,38 +302,7 @@ export class MicrosoftSql implements INodeType {
 					return acc;
 				}, {} as ITables);
 
-				const queriesResults = await Promise.all(
-					Object.keys(tables).map(async (table) => {
-						const deleteKeyResults = Object.keys(tables[table]).map(async (deleteKey) => {
-							const deleteItemsList = chunk(
-								tables[table][deleteKey].map((item) =>
-									copyInputItem(item as INodeExecutionData, [deleteKey]),
-								),
-								1000,
-							);
-							const queryQueue = deleteItemsList.map(async (deleteValues) => {
-								return pool
-									.request()
-									.query(
-										`DELETE FROM ${table} WHERE "${deleteKey}" IN ${extractDeleteValues(
-											deleteValues as IDataObject[],
-											deleteKey,
-										)};`,
-									);
-							});
-							return Promise.all(queryQueue);
-						});
-						return Promise.all(deleteKeyResults);
-					}),
-				);
-
-				const rowsDeleted = flatten(queriesResults).reduce(
-					(acc: number, resp: mssql.IResult<object>): number =>
-						(acc += resp.rowsAffected.reduce((sum, val) => (sum += val))),
-					0,
-				);
-
-				responseData = rowsDeleted;
+				responseData = await deleteOperation(tables, pool);
 			} else {
 				await pool.close();
 				throw new NodeOperationError(
@@ -431,14 +319,16 @@ export class MicrosoftSql implements INodeType {
 			}
 		}
 
-		// Close the connection
+		// shuts down the connection pool associated with the db object to allow the process to finish
 		await pool.close();
-		const executionData = this.helpers.constructExecutionMetaData(
+
+		const itemData = generatePairedItemData(items.length);
+
+		const returnItems = this.helpers.constructExecutionMetaData(
 			this.helpers.returnJsonArray(responseData),
-			{ itemData: { item: 0 } },
+			{ itemData },
 		);
 
-		returnItems.push(...executionData);
-		return this.prepareOutputData(returnItems);
+		return [returnItems];
 	}
 }
diff --git a/packages/nodes-base/nodes/Microsoft/Sql/TableInterface.ts b/packages/nodes-base/nodes/Microsoft/Sql/TableInterface.ts
deleted file mode 100644
index ec4b098ea5d3a..0000000000000
--- a/packages/nodes-base/nodes/Microsoft/Sql/TableInterface.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import type { IDataObject } from 'n8n-workflow';
-
-export interface ITables {
-	[key: string]: {
-		[key: string]: IDataObject[];
-	};
-}
diff --git a/packages/nodes-base/nodes/Microsoft/Sql/interfaces.ts b/packages/nodes-base/nodes/Microsoft/Sql/interfaces.ts
new file mode 100644
index 0000000000000..45bc3e2b3f8cd
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Sql/interfaces.ts
@@ -0,0 +1,13 @@
+import type { IDataObject } from 'n8n-workflow';
+
+export interface ITables {
+	[key: string]: {
+		[key: string]: IDataObject[];
+	};
+}
+
+export type OperationInputData = {
+	table: string;
+	columnString: string;
+	items: IDataObject[];
+};
diff --git a/packages/nodes-base/nodes/Microsoft/Sql/mssql.svg b/packages/nodes-base/nodes/Microsoft/Sql/mssql.svg
index 79f8183d8bd02..2baedc0208495 100644
--- a/packages/nodes-base/nodes/Microsoft/Sql/mssql.svg
+++ b/packages/nodes-base/nodes/Microsoft/Sql/mssql.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="385" height="385"><defs><linearGradient x1="-411.527" y1="-29.89" x2="-23.847" y2="-258.964" id="d" xlink:href="#a" gradientUnits="userSpaceOnUse" gradientTransform="translate(488.256 811.455) scale(.66978)"/><linearGradient id="a"><stop offset="0" stop-color="#909ca9"/><stop offset="1" stop-color="#ededee"/></linearGradient><linearGradient x1="-447.797" y1="-889.058" x2="-135.859" y2="-889.058" id="e" xlink:href="#b" gradientUnits="userSpaceOnUse" gradientTransform="translate(488.256 811.455) scale(.66978)"/><linearGradient id="b"><stop offset="0" stop-color="#939fab"/><stop offset="1" stop-color="#dcdee1"/></linearGradient><linearGradient id="c"><stop offset="0" stop-color="#ee352c"/><stop offset="1" stop-color="#a91d22"/></linearGradient><radialGradient cx="-1259.098" cy="-245.428" r="414.156" fx="-1259.098" fy="-245.428" id="f" xlink:href="#c" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-.64353 -.09731 .19436 -1.28527 -377.154 -44.777)"/></defs><path d="M469.04 461.903l-132.345 43.16-115.056 50.819-32.233 8.518a801.402 801.402 0 01-26.08 23.694c-10.151 8.834-19.698 16.84-26.958 22.626-8.084 6.443-20.103 18.37-26.247 26.017-9.14 11.377-16.287 23.51-19.36 32.84-5.53 16.786-2.836 33.788 7.827 49.48 13.622 20.044 40.738 40.409 72.274 54.273 16.086 7.071 43.232 16.188 63.587 21.328 33.922 8.566 99.482 17.873 135.588 19.256 7.323.28 17.071.254 17.52-.042.792-.523 6.413-11.166 12.934-24.489 22.19-45.33 38.245-87.824 46.885-124.118 5.231-21.976 9.31-51.28 11.951-86.025.74-9.733 1.009-42.193.44-53.226-.926-17.954-2.507-32.587-5.044-46.948-.373-2.104-.51-3.955-.314-4.123.368-.316 1.618-.717 17.874-5.442l-3.244-7.598zm-30.246 17.75c1.203 0 4.401 30.67 5.233 50.128.177 4.135.141 6.782-.105 6.782-.79 0-16.948-9.489-28.402-16.682-10.003-6.282-28.985-18.896-32.003-21.265-.953-.748-.852-.785 7.325-3.6 13.914-4.792 46.901-15.364 47.952-15.364zm-67.417 22.123c.855-.002 3.183 1.283 8.686 4.73 20.642 12.932 48.595 28.49 60.573 33.72 3.714 1.621 4.138.993-4.416 6.802-18.234 12.382-40.904 24.557-68.736 36.922-4.851 2.154-8.96 3.914-9.126 3.914-.166 0 .376-2.461 1.193-5.484 6.743-24.941 10.547-50.116 10.654-70.306.053-9.985.055-10.038 1.004-10.277a.756.756 0 01.168-.02zm-13.877 5.296c.597.6.165 22.975-.565 29.072-1.751 14.627-4.613 28.155-9.189 43.536-1.093 3.675-2.118 6.843-2.281 7.032-.398.461-14.08-12.87-18.628-18.146-7.772-9.015-13.92-17.97-18.398-26.792-2.277-4.483-5.907-13.338-5.568-13.584 1.537-1.116 54.253-21.496 54.629-21.118zm-65.366 25.765c.123.012.218.046.272.105.197.217.894 1.842 1.549 3.62 3.187 8.657 10.353 21.517 16.577 29.743 6.794 8.981 15.653 18.551 23.065 24.908 2.38 2.04 4.6 3.945 4.919 4.227.635.563.848.468-15.468 6.656-18.91 7.173-39.503 14.355-63.147 21.998-9.01 2.913-16.637 5.374-16.933 5.484-.9.334-.625-.22 2.01-4.332 11.748-18.342 29.545-54.222 39.495-79.6 1.726-4.4 3.368-8.81 3.663-9.795.433-1.448.86-1.94 2.219-2.553.752-.34 1.41-.498 1.779-.46zm-20.03 8.268c.265.234-4.807 10.945-9.796 20.68-9.678 18.879-20.348 37.458-34.515 60.133-2.444 3.912-4.697 7.489-5.002 7.932-.504.73-.71.49-2.26-2.595-3.392-6.745-6.234-15.256-7.703-23.17-1.455-7.833-1.207-21.394.544-29.805 1.301-6.25 1.244-6.111 4.186-7.62 12.722-6.519 54.13-25.92 54.545-25.555zm172.53 7.011v4.25c-.021 22.316-2.404 52.868-5.86 75.161-.607 3.912-1.133 7.14-1.173 7.18-.04.039-2.86-.788-6.258-1.843-15.016-4.661-31.297-11.626-45.984-19.674-9.727-5.33-23.795-13.964-23.4-14.359.106-.107 4.25-2.303 9.209-4.877 19.64-10.194 38.402-21.185 54.712-32.086 6.12-4.09 15.277-10.71 17.31-12.496l1.444-1.256zm-248.07 29.575c.408-.02.305.755-.334 4.438-.445 2.561-.947 7.4-1.13 10.737-.805 14.628 1.567 25.42 8.832 40.187 2.02 4.105 3.6 7.528 3.516 7.598-.727.608-66.88 19.967-87.678 25.66-6.165 1.688-11.553 3.175-11.993 3.308-.722.217-.786.06-.523-1.633 2.278-14.676 13.473-33.938 29.114-50.108 10.4-10.75 18.725-17.118 32.882-25.2 10.16-5.8 25.94-14.506 27.105-14.945a.685.685 0 01.21-.042zm156.038 27.943c.063-.076 2.514 1.236 5.442 2.93 21.368 12.357 51.185 23.948 76.606 29.763l2.302.524-3.16 1.758c-13.28 7.369-57.013 25.565-101.68 42.321-6.522 2.447-12.884 4.845-14.129 5.338-1.245.492-2.26.83-2.26.732 0-.098 1.842-3.644 4.102-7.87 12.54-23.446 25.056-51.938 31.48-71.708.654-2.015 1.234-3.713 1.297-3.788zm-15.907 5.211c.069.069-.713 2.17-1.737 4.647-8.718 21.08-20.14 44.076-34.703 69.908-3.706 6.574-6.83 11.941-6.95 11.93-.118-.01-3.132-1.794-6.697-3.976-21.213-12.987-39.982-28.973-52.306-44.52l-1.758-2.197 9.147-2.512c32.625-8.938 60.293-18.496 87.804-30.35 3.895-1.678 7.131-2.998 7.2-2.93zm98.813 34.494c.047.01.063.043.063.084 0 2.223-5.047 22.802-9.251 37.696-3.527 12.493-6.488 22.265-11.973 39.58-2.422 7.647-4.501 13.888-4.625 13.856a34.898 34.898 0 00-1.298-.252c-29.72-5.378-56.338-12.878-81.273-22.898-6.977-2.803-17.05-7.265-17.582-7.786-.18-.176 5.844-3.014 13.375-6.3 45.541-19.87 92.727-42.498 108.86-52.2 1.94-1.168 3.376-1.848 3.704-1.78zm-228.101 7.807c.244.231-12.495 18.467-30.287 43.368-6.184 8.655-13.448 18.856-16.137 22.668a476.901 476.901 0 00-9.063 13.417l-4.207 6.488-4.48-3.767c-5.255-4.413-14.455-13.782-18.628-18.984-8.587-10.705-14.406-21.97-16.702-32.317-1.06-4.777-1.092-7.21-.084-7.514 1.456-.439 28.172-6.728 53.226-12.538 13.917-3.227 30.007-7.004 35.77-8.393 5.764-1.389 10.535-2.481 10.592-2.428zm12.81 4.898l3.222 3.6c14.411 16.053 29.067 28.032 46.948 38.366 3.157 1.824 5.563 3.41 5.358 3.537-.744.46-61.833 22.18-90.085 32.024-15.933 5.551-29.022 10.078-29.094 10.067-.072-.01-.975-.6-1.988-1.318l-1.842-1.32 2.888-4.165c9.374-13.578 21.152-28.51 46.927-59.527l17.665-21.265zm79.828 57.057c.071-.088 4.537 1.495 9.942 3.516 13.029 4.872 23.254 8.049 37.09 11.512 16.993 4.253 41.55 8.507 56.094 9.733 2.232.188 3.372.443 3.014.67-.676.427-15.4 5.345-26.226 8.748-17.185 5.402-69.702 20.917-112.523 33.238-7.944 2.286-14.736 4.217-15.091 4.291-.96.2-4.312-.68-4.312-1.13 0-.214 2.401-3.253 5.316-6.74 14.393-17.216 28.692-36.445 40.627-54.629 3.264-4.973 5.999-9.121 6.07-9.21zm-17.686.502c.129.129-6.966 11.49-19.444 31.145a9616.419 9616.419 0 00-13.291 20.993c-2.048 3.247-5.048 8.182-6.656 10.989l-2.93 5.107-1.487-.398c-3.585-.97-28.88-9.906-35.56-12.558-8.282-3.287-16.912-7.257-23.276-10.696-7.952-4.297-18.037-10.675-17.246-10.926.227-.072 13.911-3.817 30.39-8.309 43.84-11.95 68.09-18.815 83.995-23.777 2.972-.927 5.448-1.627 5.505-1.57zm124.516 29.198c.095-.02.138-.02.147 0 .414 1.037-15.815 45.989-21.747 60.239-1.329 3.191-1.82 3.965-2.512 3.934-1.679-.073-25.211-3.363-39.454-5.525-24.933-3.785-66.695-11.078-77.234-13.48l-2.449-.544 14.945-3.37c32.032-7.217 47.415-11.087 63.022-15.865 19.682-6.025 39.172-13.538 58.857-22.689 3.112-1.446 5.764-2.556 6.425-2.7z" transform="translate(-29.397 -82.923) scale(.5693)" fill="url(#d)"/><path d="M332.647 153.475c-2.213-.258-37.732 12.539-60.552 21.81-30.922 12.563-54.93 24.6-69.74 34.996-5.514 3.87-12.446 10.83-13.46 13.5-.378 1-.556 2.168-.564 3.37l13.437 12.684 31.877 10.172 75.937 13.563 86.799 14.924.879-7.452c-.263-.04-.511-.084-.775-.125l-11.428-1.8-2.323-4.082c-11.797-20.816-24.834-46.575-32.4-64.005-5.86-13.5-11.488-29.05-14.61-40.313-1.854-6.688-2.047-7.121-3.077-7.242zm-1.674 5.15c.088-.017.132-.017.146 0 .07.083.474 2.875.88 6.195 1.708 13.98 4.836 27.54 9.732 42.133 3.69 10.997 3.742 10.351-.649 9.126-10.207-2.849-55.937-10.699-89.018-15.28-5.33-.738-9.767-1.394-9.837-1.465-.42-.42 23.857-13.14 34.62-18.147 13.802-6.422 51.389-22.07 54.126-22.563zm-96.386 44.77l3.872 1.318c21.239 7.23 74.474 17.399 103.9 19.843 3.32.275 6.11.571 6.195.648.085.078-2.735 1.585-6.258 3.35-14.195 7.11-29.819 15.777-40.626 22.542-3.174 1.986-6.085 3.588-6.468 3.558-.383-.03-2.476-.367-4.667-.733l-3.998-.649-10.047-9.753c-17.637-17.07-31.407-30.277-36.733-35.268l-5.17-4.856zm-3.935 3.14l14.066 17.56c7.743 9.66 15.503 19.245 17.225 21.308 1.723 2.062 3.056 3.81 2.973 3.872-.4.292-20.386-3.6-30.978-6.028-10.873-2.494-15.37-3.687-22.102-5.84l-5.484-1.758.02-1.36c.07-6.746 8.573-16.696 23.003-26.876l1.277-.879zm119.786 23.923c.422.033.867.89 2.114 3.621 3.412 7.474 14.03 27.729 16.598 31.647.845 1.29 2.186 1.377-11.91-.9-33.874-5.472-44.833-7.303-44.833-7.514 0-.129 1.016-.794 2.26-1.486 10.49-5.834 21.075-13.176 30.497-21.119 2.252-1.9 4.417-3.708 4.814-4.04.163-.136.32-.22.46-.209z" transform="translate(-29.397 -82.923) scale(.5693)" fill="url(#e)"/><path d="M189.496 222.43s-2.198 3.485-.125 8.666c1.282 3.205 5.133 7.056 9.377 11.135 0 0 44.452 43.361 49.898 49.647 24.63 28.426 35.327 56.41 36.315 95.046.634 24.793-4.148 46.587-15.761 71.917-20.815 45.4-64.672 95.467-132.407 151.14l9.942-3.286c6.39-4.787 15.069-9.9 35.54-21.098 47.145-25.787 100.087-49.508 165.122-73.948 93.568-35.163 247.48-76.42 335.057-89.834l9.125-1.402-1.402-2.198c-8.008-12.447-13.474-20.122-20.051-28.256-19.209-23.754-42.463-43.136-70.955-59.087-39.153-21.92-89.936-38.956-154.133-51.72-12.137-2.413-38.715-6.969-60.343-10.34-45.814-7.14-75.363-11.96-108.002-17.644-11.702-2.03-29.174-4.965-40.773-7.472-6.043-1.307-17.53-4.023-26.456-7.096-7.37-2.901-17.748-5.706-19.968-14.17zm25.766 25.012c.062-.056 1.732.46 3.767 1.152 3.752 1.273 8.702 2.764 14.463 4.374a618.885 618.885 0 0013.187 3.516c6.014 1.538 10.987 2.86 11.051 2.93.666.75 10.767 32.988 14.212 45.357 1.315 4.721 2.313 8.655 2.219 8.75-.095.093-1.215-1.645-2.47-3.852-11.686-20.551-30.193-41.45-51.594-58.27-2.668-2.097-4.835-3.877-4.835-3.957zm49.25 13.605c.514-.035 2.733.336 5.379.921 17.042 3.769 47.471 9.644 67.04 12.935 3.26.549 5.945 1.14 5.945 1.319 0 .18-1.218.95-2.7 1.695-3.284 1.652-16.57 9.604-21.015 12.58-11.097 7.427-21.074 15.377-28.34 22.605-2.92 2.904-5.363 5.274-5.442 5.274-.078 0-.589-1.693-1.13-3.767-3.633-13.925-11.143-34.486-17.875-48.957-1.083-2.329-1.967-4.382-1.967-4.563 0-.023.03-.037.105-.041zm86.631 16.473c.57.19 1.648 3.554 3.558 11.114 3.658 14.476 5.36 30.734 4.794 45.775-.158 4.186-.423 8.073-.587 8.644l-.313 1.047-5.17-1.675c-10.658-3.406-28.07-8.533-42.992-12.663-8.477-2.346-15.426-4.44-15.426-4.646 0-.62 12.37-12.986 17.687-17.687 10.156-8.978 37.48-30.232 38.45-29.91zm6.886.983c.309-.287 41.399 6.828 60.071 10.403 13.918 2.664 34.055 6.881 35.268 7.388.586.245-1.498 1.38-8.184 4.396-26.445 11.926-46.037 22.57-65.512 35.603-5.13 3.433-9.393 6.237-9.482 6.237-.089 0-.165-2.865-.167-6.363-.014-18.992-3.805-38.161-10.759-54.357-.748-1.743-1.31-3.237-1.235-3.307zm106.244 21.015c.318.318-1.03 8.42-2.198 13.207-3.635 14.897-13.27 37.007-25.158 57.79-2.095 3.661-3.969 6.715-4.186 6.78-.218.067-2.925-1.357-6.007-3.16-11.626-6.8-24.79-13.232-39.245-19.193-4.031-1.662-7.464-3.142-7.64-3.307-.66-.619 31.465-21.887 48.496-32.108 13.623-8.174 35.556-20.392 35.938-20.01zm7.598 1.193c.925 0 19.148 4.968 28.57 7.786 23.47 7.02 50.545 16.91 68.108 24.886l7.305 3.307-5.149 1.193c-42.975 9.873-79.809 21.266-115.285 35.666-2.948 1.197-5.514 2.177-5.694 2.177-.18 0 .761-2.28 2.072-5.065 10.665-22.658 17.552-46.434 19.34-66.622.163-1.838.495-3.328.733-3.328zm-181.133 41.63c.29-.287 14.16 2.963 21.726 5.087 11.37 3.192 35.566 11.289 35.582 11.91 0 .12-2.667 2.445-5.924 5.17-13.081 10.943-25.7 22.386-40.815 36.984-4.48 4.327-8.288 7.849-8.476 7.849-.189 0-.272-.632-.168-1.403 2.276-16.803 1.787-38.38-1.381-60.343-.402-2.784-.645-5.154-.544-5.253zm292.065.273c.208.208-6.435 10.59-10.57 16.514-6.033 8.643-14.779 19.99-34.703 45.043a15399.201 15399.201 0 00-26.247 33.09c-3.976 5.04-7.313 9.169-7.41 9.169-.095 0-1.378-1.805-2.846-3.998-11.231-16.78-24.559-31.518-40.459-44.75-2.967-2.47-6.314-5.177-7.43-6.007-1.116-.83-2.025-1.598-2.03-1.716-.01-.274 16.97-7.557 29.93-12.83 22.564-9.182 53.403-20.177 76.48-27.252 12.17-3.731 25.1-7.448 25.285-7.263zm7.66 2.01c.365-.075 2.787 1.097 5.694 2.762 24.305 13.923 48.123 31.803 66.852 50.192 5.328 5.23 18.361 18.788 18.168 18.9-.05.029-4.551.385-10.005.795-42.119 3.168-95.968 12.128-147.812 24.594-3.52.846-6.565 1.549-6.76 1.549-.196 0 3.658-3.869 8.56-8.582 30.446-29.27 44.336-47.752 60.678-80.771 2.434-4.918 4.498-9.16 4.584-9.419.005-.016.017-.016.042-.02zm-222.617 22.813c1.39.313 14.375 6.354 24.175 11.261 8.961 4.487 22.535 11.714 23.212 12.35.085.079-4.697 2.576-10.633 5.546-18.794 9.402-34.891 18.282-51.699 28.55-4.792 2.927-8.81 5.336-8.937 5.336-.42 0-.254-.362 2.428-5.274 8.95-16.393 16.17-35.964 20.324-55.09.37-1.706.816-2.749 1.13-2.679zm-13.082 2.345c.271.27-3.098 12.647-5.232 19.256-4.094 12.676-11.015 28.611-17.666 40.605a313.089 313.089 0 01-5.316 9.168l-2.47 4.04-5.61-5.422c-6.518-6.319-11.827-10.243-18.607-13.73-2.664-1.37-4.831-2.64-4.835-2.826-.012-.824 17.053-16.344 30.224-27.482 9.428-7.972 29.271-23.85 29.512-23.61zm79.495 32.693l4.877 3.16c11.187 7.265 24.434 17.036 34.535 25.452 5.66 4.717 16.66 14.567 18.921 16.954l1.214 1.277-8.1 2.26c-45.813 12.711-81.208 24.027-122.507 39.203-4.583 1.685-8.54 3.077-8.812 3.077-.57 0-1.135.524 9.168-8.958 26.415-24.31 49.75-51.093 67.187-77.15l3.517-5.275zm-20.89 5.233c.24.24-13.538 19.536-21.725 30.433-9.795 13.037-27.241 34.831-39.245 49.02-5.015 5.927-9.312 10.846-9.544 10.925-.255.087-.414-1.365-.419-3.663-.023-12.106-3.086-25.044-8.498-36-2.285-4.628-2.668-5.748-2.197-6.175 1.883-1.707 31.025-18.324 49.396-28.172 12.619-6.765 31.993-16.608 32.233-16.368zm-126.336 30.956c.25 0 2.588 1.175 5.19 2.617 6.379 3.533 12.109 7.42 17.164 11.637.195.163-2.423 2.301-5.819 4.751-9.48 6.84-23.914 17.734-32.275 24.384-8.82 7.017-9.113 7.232-8.121 5.714 6.606-10.102 9.927-15.822 13.396-23.128 3.083-6.494 6.156-14.203 8.35-20.91.913-2.786 1.865-5.065 2.115-5.065zm33.656 26.415c.456-.057 1.104.791 3.81 4.835 5.702 8.52 10.07 19.884 11.197 29.135l.23 1.988-13.667 5.296c-24.534 9.52-47.118 18.905-62.373 25.891a651.678 651.678 0 00-16.724 8.016c-4.92 2.462-8.937 4.397-8.937 4.291 0-.106 3.09-2.429 6.865-5.17 29.94-21.736 55.755-45.532 75.204-69.322 2.08-2.544 3.969-4.75 4.207-4.897a.446.446 0 01.188-.063zm-15.53 3.85c.396.397-11.047 13.338-18.754 21.204-19.289 19.686-38.412 35.121-62.101 50.15-2.964 1.88-5.673 3.58-6.028 3.788-.65.38.21-.598 10.612-11.93 6.554-7.142 11.571-13.07 17.267-20.47 3.752-4.874 4.468-5.558 9.963-9.524 14.803-10.685 48.647-33.61 49.04-33.217z" transform="translate(-29.397 -82.923) scale(.5693)" fill="url(#f)"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="385" height="385"><defs><linearGradient xlink:href="#a" id="d" x1="-411.527" x2="-23.847" y1="-29.89" y2="-258.964" gradientTransform="translate(488.256 811.455)scale(.66978)" gradientUnits="userSpaceOnUse"/><linearGradient id="a"><stop offset="0" stop-color="#909ca9"/><stop offset="1" stop-color="#ededee"/></linearGradient><linearGradient xlink:href="#b" id="e" x1="-447.797" x2="-135.859" y1="-889.058" y2="-889.058" gradientTransform="translate(488.256 811.455)scale(.66978)" gradientUnits="userSpaceOnUse"/><linearGradient id="b"><stop offset="0" stop-color="#939fab"/><stop offset="1" stop-color="#dcdee1"/></linearGradient><linearGradient id="c"><stop offset="0" stop-color="#ee352c"/><stop offset="1" stop-color="#a91d22"/></linearGradient><radialGradient xlink:href="#c" id="f" cx="-1259.098" cy="-245.428" r="414.156" fx="-1259.098" fy="-245.428" gradientTransform="matrix(-.64353 -.09731 .19436 -1.28527 -377.154 -44.777)" gradientUnits="userSpaceOnUse"/></defs><path fill="url(#d)" d="m469.04 461.903-132.345 43.16-115.056 50.819-32.233 8.518a801 801 0 0 1-26.08 23.694c-10.151 8.834-19.698 16.84-26.958 22.626-8.084 6.443-20.103 18.37-26.247 26.017-9.14 11.377-16.287 23.51-19.36 32.84-5.53 16.786-2.836 33.788 7.827 49.48 13.622 20.044 40.738 40.409 72.274 54.273 16.086 7.071 43.232 16.188 63.587 21.328 33.922 8.566 99.482 17.873 135.588 19.256 7.323.28 17.071.254 17.52-.042.792-.523 6.413-11.166 12.934-24.489 22.19-45.33 38.245-87.824 46.885-124.118 5.231-21.976 9.31-51.28 11.951-86.025.74-9.733 1.009-42.193.44-53.226-.926-17.954-2.507-32.587-5.044-46.948-.373-2.104-.51-3.955-.314-4.123.368-.316 1.618-.717 17.874-5.442zm-30.246 17.75c1.203 0 4.401 30.67 5.233 50.128.177 4.135.141 6.782-.105 6.782-.79 0-16.948-9.489-28.402-16.682-10.003-6.282-28.985-18.896-32.003-21.265-.953-.748-.852-.785 7.325-3.6 13.914-4.792 46.901-15.364 47.952-15.364zm-67.417 22.123c.855-.002 3.183 1.283 8.686 4.73 20.642 12.932 48.595 28.49 60.573 33.72 3.714 1.621 4.138.993-4.416 6.802-18.234 12.382-40.904 24.557-68.736 36.922-4.851 2.154-8.96 3.914-9.126 3.914s.376-2.461 1.193-5.484c6.743-24.941 10.547-50.116 10.654-70.306.053-9.985.055-10.038 1.004-10.277a1 1 0 0 1 .168-.02zm-13.877 5.296c.597.6.165 22.975-.565 29.072-1.751 14.627-4.613 28.155-9.189 43.536-1.093 3.675-2.118 6.843-2.281 7.032-.398.461-14.08-12.87-18.628-18.146-7.772-9.015-13.92-17.97-18.398-26.792-2.277-4.483-5.907-13.338-5.568-13.584 1.537-1.116 54.253-21.496 54.629-21.118m-65.366 25.765c.123.012.218.046.272.105.197.217.894 1.842 1.549 3.62 3.187 8.657 10.353 21.517 16.577 29.743 6.794 8.981 15.653 18.551 23.065 24.908 2.38 2.04 4.6 3.945 4.919 4.227.635.563.848.468-15.468 6.656-18.91 7.173-39.503 14.355-63.147 21.998-9.01 2.913-16.637 5.374-16.933 5.484-.9.334-.625-.22 2.01-4.332 11.748-18.342 29.545-54.222 39.495-79.6 1.726-4.4 3.368-8.81 3.663-9.795.433-1.448.86-1.94 2.219-2.553.752-.34 1.41-.498 1.779-.46zm-20.03 8.268c.265.234-4.807 10.945-9.796 20.68-9.678 18.879-20.348 37.458-34.515 60.133-2.444 3.912-4.697 7.489-5.002 7.932-.504.73-.71.49-2.26-2.595-3.392-6.745-6.234-15.256-7.703-23.17-1.455-7.833-1.207-21.394.544-29.805 1.301-6.25 1.244-6.111 4.186-7.62 12.722-6.519 54.13-25.92 54.545-25.555zm172.53 7.011v4.25c-.021 22.316-2.404 52.868-5.86 75.161-.607 3.912-1.133 7.14-1.173 7.18-.04.039-2.86-.788-6.258-1.843-15.016-4.661-31.297-11.626-45.984-19.674-9.727-5.33-23.795-13.964-23.4-14.359.106-.107 4.25-2.303 9.209-4.877 19.64-10.194 38.402-21.185 54.712-32.086 6.12-4.09 15.277-10.71 17.31-12.496zm-248.07 29.575c.408-.02.305.755-.334 4.438-.445 2.561-.947 7.4-1.13 10.737-.805 14.628 1.567 25.42 8.832 40.187 2.02 4.105 3.6 7.528 3.516 7.598-.727.608-66.88 19.967-87.678 25.66-6.165 1.688-11.553 3.175-11.993 3.308-.722.217-.786.06-.523-1.633 2.278-14.676 13.473-33.938 29.114-50.108 10.4-10.75 18.725-17.118 32.882-25.2 10.16-5.8 25.94-14.506 27.105-14.945a.7.7 0 0 1 .21-.042zm156.038 27.943c.063-.076 2.514 1.236 5.442 2.93 21.368 12.357 51.185 23.948 76.606 29.763l2.302.524-3.16 1.758c-13.28 7.369-57.013 25.565-101.68 42.321-6.522 2.447-12.884 4.845-14.129 5.338-1.245.492-2.26.83-2.26.732s1.842-3.644 4.102-7.87c12.54-23.446 25.056-51.938 31.48-71.708.654-2.015 1.234-3.713 1.297-3.788m-15.907 5.211c.069.069-.713 2.17-1.737 4.647-8.718 21.08-20.14 44.076-34.703 69.908-3.706 6.574-6.83 11.941-6.95 11.93-.118-.01-3.132-1.794-6.697-3.976-21.213-12.987-39.982-28.973-52.306-44.52l-1.758-2.197 9.147-2.512c32.625-8.938 60.293-18.496 87.804-30.35 3.895-1.678 7.131-2.998 7.2-2.93m98.813 34.494c.047.01.063.043.063.084 0 2.223-5.047 22.802-9.251 37.696-3.527 12.493-6.488 22.265-11.973 39.58-2.422 7.647-4.501 13.888-4.625 13.856a35 35 0 0 0-1.298-.252c-29.72-5.378-56.338-12.878-81.273-22.898-6.977-2.803-17.05-7.265-17.582-7.786-.18-.176 5.844-3.014 13.375-6.3 45.541-19.87 92.727-42.498 108.86-52.2 1.94-1.168 3.376-1.848 3.704-1.78m-228.101 7.807c.244.231-12.495 18.467-30.287 43.368-6.184 8.655-13.448 18.856-16.137 22.668a477 477 0 0 0-9.063 13.417l-4.207 6.488-4.48-3.767c-5.255-4.413-14.455-13.782-18.628-18.984-8.587-10.705-14.406-21.97-16.702-32.317-1.06-4.777-1.092-7.21-.084-7.514 1.456-.439 28.172-6.728 53.226-12.538 13.917-3.227 30.007-7.004 35.77-8.393s10.535-2.481 10.592-2.428m12.81 4.898 3.222 3.6c14.411 16.053 29.067 28.032 46.948 38.366 3.157 1.824 5.563 3.41 5.358 3.537-.744.46-61.833 22.18-90.085 32.024-15.933 5.551-29.022 10.078-29.094 10.067s-.975-.6-1.988-1.318l-1.842-1.32 2.888-4.165c9.374-13.578 21.152-28.51 46.927-59.527zm79.828 57.057c.071-.088 4.537 1.495 9.942 3.516 13.029 4.872 23.254 8.049 37.09 11.512 16.993 4.253 41.55 8.507 56.094 9.733 2.232.188 3.372.443 3.014.67-.676.427-15.4 5.345-26.226 8.748-17.185 5.402-69.702 20.917-112.523 33.238-7.944 2.286-14.736 4.217-15.091 4.291-.96.2-4.312-.68-4.312-1.13 0-.214 2.401-3.253 5.316-6.74 14.393-17.216 28.692-36.445 40.627-54.629 3.264-4.973 5.999-9.121 6.07-9.21zm-17.686.502c.129.129-6.966 11.49-19.444 31.145a9616 9616 0 0 0-13.291 20.993c-2.048 3.247-5.048 8.182-6.656 10.989l-2.93 5.107-1.487-.398c-3.585-.97-28.88-9.906-35.56-12.558-8.282-3.287-16.912-7.257-23.276-10.696-7.952-4.297-18.037-10.675-17.246-10.926.227-.072 13.911-3.817 30.39-8.309 43.84-11.95 68.09-18.815 83.995-23.777 2.972-.927 5.448-1.627 5.505-1.57m124.516 29.198c.095-.02.138-.02.147 0 .414 1.037-15.815 45.989-21.747 60.239-1.329 3.191-1.82 3.965-2.512 3.934-1.679-.073-25.211-3.363-39.454-5.525-24.933-3.785-66.695-11.078-77.234-13.48l-2.449-.544 14.945-3.37c32.032-7.217 47.415-11.087 63.022-15.865 19.682-6.025 39.172-13.538 58.857-22.689 3.112-1.446 5.764-2.556 6.425-2.7" transform="translate(-29.397 -82.923)scale(.5693)"/><path fill="url(#e)" d="M332.647 153.475c-2.213-.258-37.732 12.539-60.552 21.81-30.922 12.563-54.93 24.6-69.74 34.996-5.514 3.87-12.446 10.83-13.46 13.5-.378 1-.556 2.168-.564 3.37l13.437 12.684 31.877 10.172 75.937 13.563 86.799 14.924.879-7.452c-.263-.04-.511-.084-.775-.125l-11.428-1.8-2.323-4.082c-11.797-20.816-24.834-46.575-32.4-64.005-5.86-13.5-11.488-29.05-14.61-40.313-1.854-6.688-2.047-7.121-3.077-7.242m-1.674 5.15c.088-.017.132-.017.146 0 .07.083.474 2.875.88 6.195 1.708 13.98 4.836 27.54 9.732 42.133 3.69 10.997 3.742 10.351-.649 9.126-10.207-2.849-55.937-10.699-89.018-15.28-5.33-.738-9.767-1.394-9.837-1.465-.42-.42 23.857-13.14 34.62-18.147 13.802-6.422 51.389-22.07 54.126-22.563zm-96.386 44.77 3.872 1.318c21.239 7.23 74.474 17.399 103.9 19.843 3.32.275 6.11.571 6.195.648s-2.735 1.585-6.258 3.35c-14.195 7.11-29.819 15.777-40.626 22.542-3.174 1.986-6.085 3.588-6.468 3.558s-2.476-.367-4.667-.733l-3.998-.649-10.047-9.753c-17.637-17.07-31.407-30.277-36.733-35.268zm-3.935 3.14 14.066 17.56c7.743 9.66 15.503 19.245 17.225 21.308s3.056 3.81 2.973 3.872c-.4.292-20.386-3.6-30.978-6.028-10.873-2.494-15.37-3.687-22.102-5.84l-5.484-1.758.02-1.36c.07-6.746 8.573-16.696 23.003-26.876l1.277-.879zm119.786 23.923c.422.033.867.89 2.114 3.621 3.412 7.474 14.03 27.729 16.598 31.647.845 1.29 2.186 1.377-11.91-.9-33.874-5.472-44.833-7.303-44.833-7.514 0-.129 1.016-.794 2.26-1.486 10.49-5.834 21.075-13.176 30.497-21.119 2.252-1.9 4.417-3.708 4.814-4.04.163-.136.32-.22.46-.209" transform="translate(-29.397 -82.923)scale(.5693)"/><path fill="url(#f)" d="M189.496 222.43s-2.198 3.485-.125 8.666c1.282 3.205 5.133 7.056 9.377 11.135 0 0 44.452 43.361 49.898 49.647 24.63 28.426 35.327 56.41 36.315 95.046.634 24.793-4.148 46.587-15.761 71.917-20.815 45.4-64.672 95.467-132.407 151.14l9.942-3.286c6.39-4.787 15.069-9.9 35.54-21.098 47.145-25.787 100.087-49.508 165.122-73.948 93.568-35.163 247.48-76.42 335.057-89.834l9.125-1.402-1.402-2.198c-8.008-12.447-13.474-20.122-20.051-28.256-19.209-23.754-42.463-43.136-70.955-59.087-39.153-21.92-89.936-38.956-154.133-51.72-12.137-2.413-38.715-6.969-60.343-10.34-45.814-7.14-75.363-11.96-108.002-17.644-11.702-2.03-29.174-4.965-40.773-7.472-6.043-1.307-17.53-4.023-26.456-7.096-7.37-2.901-17.748-5.706-19.968-14.17m25.766 25.012c.062-.056 1.732.46 3.767 1.152 3.752 1.273 8.702 2.764 14.463 4.374a619 619 0 0 0 13.187 3.516c6.014 1.538 10.987 2.86 11.051 2.93.666.75 10.767 32.988 14.212 45.357 1.315 4.721 2.313 8.655 2.219 8.75-.095.093-1.215-1.645-2.47-3.852-11.686-20.551-30.193-41.45-51.594-58.27-2.668-2.097-4.835-3.877-4.835-3.957m49.25 13.605c.514-.035 2.733.336 5.379.921 17.042 3.769 47.471 9.644 67.04 12.935 3.26.549 5.945 1.14 5.945 1.319s-1.218.95-2.7 1.695c-3.284 1.652-16.57 9.604-21.015 12.58-11.097 7.427-21.074 15.377-28.34 22.605-2.92 2.904-5.363 5.274-5.442 5.274s-.589-1.693-1.13-3.767c-3.633-13.925-11.143-34.486-17.875-48.957-1.083-2.329-1.967-4.382-1.967-4.563 0-.023.03-.037.105-.041zm86.631 16.473c.57.19 1.648 3.554 3.558 11.114 3.658 14.476 5.36 30.734 4.794 45.775-.158 4.186-.423 8.073-.587 8.644l-.313 1.047-5.17-1.675c-10.658-3.406-28.07-8.533-42.992-12.663-8.477-2.346-15.426-4.44-15.426-4.646 0-.62 12.37-12.986 17.687-17.687 10.156-8.978 37.48-30.232 38.45-29.91zm6.886.983c.309-.287 41.399 6.828 60.071 10.403 13.918 2.664 34.055 6.881 35.268 7.388.586.245-1.498 1.38-8.184 4.396-26.445 11.926-46.037 22.57-65.512 35.603-5.13 3.433-9.393 6.237-9.482 6.237s-.165-2.865-.167-6.363c-.014-18.992-3.805-38.161-10.759-54.357-.748-1.743-1.31-3.237-1.235-3.307m106.244 21.015c.318.318-1.03 8.42-2.198 13.207-3.635 14.897-13.27 37.007-25.158 57.79-2.095 3.661-3.969 6.715-4.186 6.78-.218.067-2.925-1.357-6.007-3.16-11.626-6.8-24.79-13.232-39.245-19.193-4.031-1.662-7.464-3.142-7.64-3.307-.66-.619 31.465-21.887 48.496-32.108 13.623-8.174 35.556-20.392 35.938-20.01zm7.598 1.193c.925 0 19.148 4.968 28.57 7.786 23.47 7.02 50.545 16.91 68.108 24.886l7.305 3.307-5.149 1.193c-42.975 9.873-79.809 21.266-115.285 35.666-2.948 1.197-5.514 2.177-5.694 2.177s.761-2.28 2.072-5.065c10.665-22.658 17.552-46.434 19.34-66.622.163-1.838.495-3.328.733-3.328m-181.133 41.63c.29-.287 14.16 2.963 21.726 5.087 11.37 3.192 35.566 11.289 35.582 11.91 0 .12-2.667 2.445-5.924 5.17-13.081 10.943-25.7 22.386-40.815 36.984-4.48 4.327-8.288 7.849-8.476 7.849s-.272-.632-.168-1.403c2.276-16.803 1.787-38.38-1.381-60.343-.402-2.784-.645-5.154-.544-5.253zm292.065.273c.208.208-6.435 10.59-10.57 16.514-6.033 8.643-14.779 19.99-34.703 45.043a15399 15399 0 0 0-26.247 33.09c-3.976 5.04-7.313 9.169-7.41 9.169-.095 0-1.378-1.805-2.846-3.998-11.231-16.78-24.559-31.518-40.459-44.75-2.967-2.47-6.314-5.177-7.43-6.007s-2.025-1.598-2.03-1.716c-.01-.274 16.97-7.557 29.93-12.83 22.564-9.182 53.403-20.177 76.48-27.252 12.17-3.731 25.1-7.448 25.285-7.263m7.66 2.01c.365-.075 2.787 1.097 5.694 2.762 24.305 13.923 48.123 31.803 66.852 50.192 5.328 5.23 18.361 18.788 18.168 18.9-.05.029-4.551.385-10.005.795-42.119 3.168-95.968 12.128-147.812 24.594-3.52.846-6.565 1.549-6.76 1.549-.196 0 3.658-3.869 8.56-8.582 30.446-29.27 44.336-47.752 60.678-80.771 2.434-4.918 4.498-9.16 4.584-9.419.005-.016.017-.016.042-.02zm-222.617 22.813c1.39.313 14.375 6.354 24.175 11.261 8.961 4.487 22.535 11.714 23.212 12.35.085.079-4.697 2.576-10.633 5.546-18.794 9.402-34.891 18.282-51.699 28.55-4.792 2.927-8.81 5.336-8.937 5.336-.42 0-.254-.362 2.428-5.274 8.95-16.393 16.17-35.964 20.324-55.09.37-1.706.816-2.749 1.13-2.679m-13.082 2.345c.271.27-3.098 12.647-5.232 19.256-4.094 12.676-11.015 28.611-17.666 40.605a313 313 0 0 1-5.316 9.168l-2.47 4.04-5.61-5.422c-6.518-6.319-11.827-10.243-18.607-13.73-2.664-1.37-4.831-2.64-4.835-2.826-.012-.824 17.053-16.344 30.224-27.482 9.428-7.972 29.271-23.85 29.512-23.61zm79.495 32.693 4.877 3.16c11.187 7.265 24.434 17.036 34.535 25.452 5.66 4.717 16.66 14.567 18.921 16.954l1.214 1.277-8.1 2.26c-45.813 12.711-81.208 24.027-122.507 39.203-4.583 1.685-8.54 3.077-8.812 3.077-.57 0-1.135.524 9.168-8.958 26.415-24.31 49.75-51.093 67.187-77.15zm-20.89 5.233c.24.24-13.538 19.536-21.725 30.433-9.795 13.037-27.241 34.831-39.245 49.02-5.015 5.927-9.312 10.846-9.544 10.925-.255.087-.414-1.365-.419-3.663-.023-12.106-3.086-25.044-8.498-36-2.285-4.628-2.668-5.748-2.197-6.175 1.883-1.707 31.025-18.324 49.396-28.172 12.619-6.765 31.993-16.608 32.233-16.368zm-126.336 30.956c.25 0 2.588 1.175 5.19 2.617 6.379 3.533 12.109 7.42 17.164 11.637.195.163-2.423 2.301-5.819 4.751-9.48 6.84-23.914 17.734-32.275 24.384-8.82 7.017-9.113 7.232-8.121 5.714 6.606-10.102 9.927-15.822 13.396-23.128 3.083-6.494 6.156-14.203 8.35-20.91.913-2.786 1.865-5.065 2.115-5.065m33.656 26.415c.456-.057 1.104.791 3.81 4.835 5.702 8.52 10.07 19.884 11.197 29.135l.23 1.988-13.667 5.296c-24.534 9.52-47.118 18.905-62.373 25.891a652 652 0 0 0-16.724 8.016c-4.92 2.462-8.937 4.397-8.937 4.291s3.09-2.429 6.865-5.17c29.94-21.736 55.755-45.532 75.204-69.322 2.08-2.544 3.969-4.75 4.207-4.897a.45.45 0 0 1 .188-.063m-15.53 3.85c.396.397-11.047 13.338-18.754 21.204-19.289 19.686-38.412 35.121-62.101 50.15-2.964 1.88-5.673 3.58-6.028 3.788-.65.38.21-.598 10.612-11.93 6.554-7.142 11.571-13.07 17.267-20.47 3.752-4.874 4.468-5.558 9.963-9.524 14.803-10.685 48.647-33.61 49.04-33.217z" transform="translate(-29.397 -82.923)scale(.5693)"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Microsoft/Sql/test/utils.test.ts b/packages/nodes-base/nodes/Microsoft/Sql/test/utils.test.ts
new file mode 100644
index 0000000000000..12ecdd7998170
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Sql/test/utils.test.ts
@@ -0,0 +1,157 @@
+import { Request } from 'mssql';
+import type { IDataObject } from 'n8n-workflow';
+import {
+	configurePool,
+	deleteOperation,
+	insertOperation,
+	mssqlChunk,
+	updateOperation,
+} from '../GenericFunctions';
+
+describe('MSSQL tests', () => {
+	let querySpy: jest.SpyInstance<void, Parameters<Request['query']>>;
+	let request: Request;
+
+	const assertParameters = (parameters: unknown[][] | IDataObject) => {
+		if (Array.isArray(parameters)) {
+			parameters.forEach((values, rowIndex) => {
+				values.forEach((value, index) => {
+					const received = (request.parameters[`r${rowIndex}v${index}`] as IDataObject).value;
+					expect(received).toEqual(value);
+				});
+			});
+		} else {
+			for (const key in parameters) {
+				expect((request.parameters[key] as IDataObject).value).toEqual(parameters[key]);
+			}
+		}
+	};
+
+	beforeEach(() => {
+		jest.resetAllMocks();
+		querySpy = jest.spyOn(Request.prototype, 'query').mockImplementation(async function (
+			this: Request,
+		) {
+			// eslint-disable-next-line @typescript-eslint/no-this-alias
+			request = this;
+			return [
+				[
+					[
+						{
+							recordsets: [],
+							recordset: undefined,
+							output: {},
+							rowsAffected: [0],
+						},
+					],
+				],
+			];
+		});
+	});
+
+	it('should perform insert operation', async () => {
+		const pool = configurePool({});
+		const tables = {
+			users: {
+				'id, name, age, active': [
+					{
+						id: 1,
+						name: 'Sam',
+						age: 31,
+						active: false,
+					},
+					{
+						id: 3,
+						name: 'Jon',
+						age: null,
+						active: true,
+					},
+					{
+						id: 4,
+						name: undefined,
+						age: 25,
+						active: false,
+					},
+				],
+			},
+		};
+
+		await insertOperation(tables, pool);
+
+		expect(querySpy).toHaveBeenCalledTimes(1);
+		expect(querySpy).toHaveBeenCalledWith(
+			'INSERT INTO [users] ([id], [name], [age], [active]) VALUES (@r0v0, @r0v1, @r0v2, @r0v3), (@r1v0, @r1v1, @r1v2, @r1v3), (@r2v0, @r2v1, @r2v2, @r2v3);',
+		);
+		assertParameters([
+			[1, 'Sam', 31, false],
+			[3, 'Jon', null, true],
+			[4, null, 25, false],
+		]);
+	});
+
+	it('should perform update operation', async () => {
+		const pool = configurePool({});
+		const tables = {
+			users: {
+				'name, age, active': [
+					{
+						name: 'Greg',
+						age: 43,
+						active: 0,
+						updateKey: 'id',
+						id: 2,
+					},
+				],
+			},
+		};
+
+		await updateOperation(tables, pool);
+
+		expect(querySpy).toHaveBeenCalledTimes(1);
+		expect(querySpy).toHaveBeenCalledWith(
+			'UPDATE [users] SET [name] = @v0, [age] = @v1, [active] = @v2 WHERE id = @condition;',
+		);
+		assertParameters({
+			v0: 'Greg',
+			v1: 43,
+			v2: 0,
+			condition: 2,
+		});
+	});
+
+	it('should perform delete operation', async () => {
+		const pool = configurePool({});
+		const tables = {
+			users: {
+				id: [
+					{
+						json: {
+							id: 2,
+						},
+						pairedItem: {
+							item: 0,
+							input: undefined,
+						},
+					},
+				],
+			},
+		};
+
+		await deleteOperation(tables, pool);
+
+		expect(querySpy).toHaveBeenCalledTimes(1);
+		expect(querySpy).toHaveBeenCalledWith('DELETE FROM [users] WHERE [id] IN (@v0);');
+		assertParameters({ v0: 2 });
+	});
+
+	describe('mssqlChunk', () => {
+		it('should chunk insert values correctly', () => {
+			const chunks = mssqlChunk(
+				new Array(3000)
+					.fill(null)
+					.map((_, index) => ({ id: index, name: 'John Doe', verified: true })),
+			);
+			expect(chunks.map((chunk) => chunk.length)).toEqual([699, 699, 699, 699, 204]);
+		});
+	});
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/Teams/GenericFunctions.ts
deleted file mode 100644
index 7608e980d1cce..0000000000000
--- a/packages/nodes-base/nodes/Microsoft/Teams/GenericFunctions.ts
+++ /dev/null
@@ -1,92 +0,0 @@
-import type { OptionsWithUri } from 'request';
-
-import type {
-	IExecuteFunctions,
-	IExecuteSingleFunctions,
-	ILoadOptionsFunctions,
-	IDataObject,
-	JsonObject,
-} from 'n8n-workflow';
-import { NodeApiError } from 'n8n-workflow';
-
-export async function microsoftApiRequest(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
-	resource: string,
-
-	body: any = {},
-	qs: IDataObject = {},
-	uri?: string,
-	headers: IDataObject = {},
-): Promise<any> {
-	const options: OptionsWithUri = {
-		headers: {
-			'Content-Type': 'application/json',
-		},
-		method,
-		body,
-		qs,
-		uri: uri || `https://graph.microsoft.com${resource}`,
-		json: true,
-	};
-	try {
-		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);
-	}
-}
-
-export async function microsoftApiRequestAllItems(
-	this: IExecuteFunctions | ILoadOptionsFunctions,
-	propertyName: string,
-	method: string,
-	endpoint: string,
-
-	body: any = {},
-	query: IDataObject = {},
-): Promise<any> {
-	const returnData: IDataObject[] = [];
-
-	let responseData;
-	let uri: string | undefined;
-
-	do {
-		responseData = await microsoftApiRequest.call(this, method, endpoint, body, query, uri);
-		uri = responseData['@odata.nextLink'];
-		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
-		const limit = query.limit as number | undefined;
-		if (limit && limit <= returnData.length) {
-			return returnData;
-		}
-	} while (responseData['@odata.nextLink'] !== undefined);
-
-	return returnData;
-}
-
-export async function microsoftApiRequestAllItemsSkip(
-	this: IExecuteFunctions | ILoadOptionsFunctions,
-	propertyName: string,
-	method: string,
-	endpoint: string,
-
-	body: any = {},
-	query: IDataObject = {},
-): Promise<any> {
-	const returnData: IDataObject[] = [];
-
-	let responseData;
-	query.$top = 100;
-	query.$skip = 0;
-
-	do {
-		responseData = await microsoftApiRequest.call(this, method, endpoint, body, query);
-		query.$skip += query.$top;
-		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
-	} while (responseData.value.length !== 0);
-
-	return returnData;
-}
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/MicrosoftTeams.node.ts b/packages/nodes-base/nodes/Microsoft/Teams/MicrosoftTeams.node.ts
index 79d6da5a5315d..5912d7a0c8248 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/MicrosoftTeams.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/MicrosoftTeams.node.ts
@@ -1,650 +1,26 @@
-import type {
-	IExecuteFunctions,
-	IDataObject,
-	ILoadOptionsFunctions,
-	INodeExecutionData,
-	INodePropertyOptions,
-	INodeType,
-	INodeTypeDescription,
-} from 'n8n-workflow';
-
-import { microsoftApiRequest, microsoftApiRequestAllItems } from './GenericFunctions';
-
-import { channelFields, channelOperations } from './ChannelDescription';
-
-import { channelMessageFields, channelMessageOperations } from './ChannelMessageDescription';
-
-import { chatMessageFields, chatMessageOperations } from './ChatMessageDescription';
-
-import { taskFields, taskOperations } from './TaskDescription';
-
-export class MicrosoftTeams implements INodeType {
-	description: INodeTypeDescription = {
-		displayName: 'Microsoft Teams',
-		name: 'microsoftTeams',
-		icon: 'file:teams.svg',
-		group: ['input'],
-		version: 1,
-		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume Microsoft Teams API',
-		defaults: {
-			name: 'Microsoft Teams',
-		},
-		inputs: ['main'],
-		outputs: ['main'],
-		credentials: [
-			{
-				name: 'microsoftTeamsOAuth2Api',
-				required: true,
-			},
-		],
-		properties: [
-			{
-				displayName: 'Resource',
-				name: 'resource',
-				type: 'options',
-				noDataExpression: true,
-				options: [
-					{
-						name: 'Channel',
-						value: 'channel',
-					},
-					{
-						name: 'Channel Message (Beta)',
-						value: 'channelMessage',
-					},
-					{
-						name: 'Chat Message',
-						value: 'chatMessage',
-					},
-					{
-						name: 'Task',
-						value: 'task',
-					},
-				],
-				default: 'channel',
-			},
-			// CHANNEL
-			...channelOperations,
-			...channelFields,
-			/// MESSAGE
-			...channelMessageOperations,
-			...channelMessageFields,
-			...chatMessageOperations,
-			...chatMessageFields,
-			///TASK
-			...taskOperations,
-			...taskFields,
-		],
-	};
-
-	methods = {
-		loadOptions: {
-			// Get all the team's channels to display them to user so that they can
-			// select them easily
-			async getChannels(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const teamId = this.getCurrentNodeParameter('teamId') as string;
-				const { value } = await microsoftApiRequest.call(
-					this,
-					'GET',
-					`/v1.0/teams/${teamId}/channels`,
-				);
-				for (const channel of value) {
-					const channelName = channel.displayName;
-					const channelId = channel.id;
-					returnData.push({
-						name: channelName,
-						value: channelId,
-					});
-				}
-				return returnData;
-			},
-			// Get all the teams to display them to user so that they can
-			// select them easily
-			async getTeams(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const { value } = await microsoftApiRequest.call(this, 'GET', '/v1.0/me/joinedTeams');
-				for (const team of value) {
-					const teamName = team.displayName;
-					const teamId = team.id;
-					returnData.push({
-						name: teamName,
-						value: teamId,
-					});
-				}
-				return returnData;
-			},
-			// Get all the groups to display them to user so that they can
-			// select them easily
-			async getGroups(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const groupSource = this.getCurrentNodeParameter('groupSource') as string;
-				let requestUrl = '/v1.0/groups' as string;
-				if (groupSource === 'mine') {
-					requestUrl = '/v1.0/me/transitiveMemberOf';
-				}
-				const { value } = await microsoftApiRequest.call(this, 'GET', requestUrl);
-				for (const group of value) {
-					returnData.push({
-						name: group.displayName || group.mail || group.id,
-						value: group.id,
-						description: group.mail,
-					});
-				}
-				return returnData;
-			},
-			// Get all the plans to display them to user so that they can
-			// select them easily
-			async getPlans(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				let groupId = this.getCurrentNodeParameter('groupId') as string;
-				const operation = this.getNodeParameter('operation', 0);
-				if (operation === 'update' && (groupId === undefined || groupId === null)) {
-					// groupId not found at base, check updateFields for the groupId
-					groupId = this.getCurrentNodeParameter('updateFields.groupId') as string;
-				}
-				const { value } = await microsoftApiRequest.call(
-					this,
-					'GET',
-					`/v1.0/groups/${groupId}/planner/plans`,
-				);
-				for (const plan of value) {
-					returnData.push({
-						name: plan.title,
-						value: plan.id,
-					});
-				}
-				return returnData;
-			},
-			// Get all the plans to display them to user so that they can
-			// select them easily
-			async getBuckets(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				let planId = this.getCurrentNodeParameter('planId') as string;
-				const operation = this.getNodeParameter('operation', 0);
-				if (operation === 'update' && (planId === undefined || planId === null)) {
-					// planId not found at base, check updateFields for the planId
-					planId = this.getCurrentNodeParameter('updateFields.planId') as string;
-				}
-				const { value } = await microsoftApiRequest.call(
-					this,
-					'GET',
-					`/v1.0/planner/plans/${planId}/buckets`,
-				);
-				for (const bucket of value) {
-					returnData.push({
-						name: bucket.name,
-						value: bucket.id,
-					});
-				}
-				return returnData;
-			},
-			// Get all the plans to display them to user so that they can
-			// select them easily
-			async getMembers(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				let groupId = this.getCurrentNodeParameter('groupId') as string;
-				const operation = this.getNodeParameter('operation', 0);
-				if (operation === 'update' && (groupId === undefined || groupId === null)) {
-					// groupId not found at base, check updateFields for the groupId
-					groupId = this.getCurrentNodeParameter('updateFields.groupId') as string;
-				}
-				const { value } = await microsoftApiRequest.call(
-					this,
-					'GET',
-					`/v1.0/groups/${groupId}/members`,
-				);
-				for (const member of value) {
-					returnData.push({
-						name: member.displayName,
-						value: member.id,
-					});
-				}
-				return returnData;
-			},
-			// 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[] = [];
-
-				let planId = this.getCurrentNodeParameter('planId') as string;
-				const operation = this.getNodeParameter('operation', 0);
-				if (operation === 'update' && (planId === undefined || planId === null)) {
-					// planId not found at base, check updateFields for the planId
-					planId = this.getCurrentNodeParameter('updateFields.planId') as string;
-				}
-				const { categoryDescriptions } = await microsoftApiRequest.call(
-					this,
-					'GET',
-					`/v1.0/planner/plans/${planId}/details`,
-				);
-				for (const key of Object.keys(categoryDescriptions as IDataObject)) {
-					if (categoryDescriptions[key] !== null) {
-						returnData.push({
-							name: categoryDescriptions[key],
-							value: key,
-						});
-					}
-				}
-				return returnData;
-			},
-			// Get all the chats to display them to user so that they can
-			// select them easily
-			async getChats(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const qs: IDataObject = {
-					$expand: 'members',
-				};
-				const { value } = await microsoftApiRequest.call(this, 'GET', '/v1.0/chats', {}, qs);
-				for (const chat of value) {
-					if (!chat.topic) {
-						chat.topic = chat.members
-							.filter((member: IDataObject) => member.displayName)
-							.map((member: IDataObject) => member.displayName)
-							.join(', ');
-					}
-					const chatName = `${chat.topic || '(no title) - ' + (chat.id as string)} (${
-						chat.chatType
-					})`;
-					const chatId = chat.id;
-					returnData.push({
-						name: chatName,
-						value: chatId,
-					});
-				}
-				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 === 'channel') {
-					//https://docs.microsoft.com/en-us/graph/api/channel-post?view=graph-rest-beta&tabs=http
-					if (operation === 'create') {
-						const teamId = this.getNodeParameter('teamId', i) as string;
-						const name = this.getNodeParameter('name', i) as string;
-						const options = this.getNodeParameter('options', i);
-						const body: IDataObject = {
-							displayName: name,
-						};
-						if (options.description) {
-							body.description = options.description as string;
-						}
-						if (options.type) {
-							body.membershipType = options.type as string;
-						}
-						responseData = await microsoftApiRequest.call(
-							this,
-							'POST',
-							`/v1.0/teams/${teamId}/channels`,
-							body,
-						);
-					}
-					//https://docs.microsoft.com/en-us/graph/api/channel-delete?view=graph-rest-beta&tabs=http
-					if (operation === 'delete') {
-						const teamId = this.getNodeParameter('teamId', i) as string;
-						const channelId = this.getNodeParameter('channelId', i) as string;
-						responseData = await microsoftApiRequest.call(
-							this,
-							'DELETE',
-							`/v1.0/teams/${teamId}/channels/${channelId}`,
-						);
-						responseData = { success: true };
-					}
-					//https://docs.microsoft.com/en-us/graph/api/channel-get?view=graph-rest-beta&tabs=http
-					if (operation === 'get') {
-						const teamId = this.getNodeParameter('teamId', i) as string;
-						const channelId = this.getNodeParameter('channelId', i) as string;
-						responseData = await microsoftApiRequest.call(
-							this,
-							'GET',
-							`/v1.0/teams/${teamId}/channels/${channelId}`,
-						);
-					}
-					//https://docs.microsoft.com/en-us/graph/api/channel-list?view=graph-rest-beta&tabs=http
-					if (operation === 'getAll') {
-						const teamId = this.getNodeParameter('teamId', i) as string;
-						const returnAll = this.getNodeParameter('returnAll', i);
-						if (returnAll) {
-							responseData = await microsoftApiRequestAllItems.call(
-								this,
-								'value',
-								'GET',
-								`/v1.0/teams/${teamId}/channels`,
-							);
-						} else {
-							qs.limit = this.getNodeParameter('limit', i);
-							responseData = await microsoftApiRequestAllItems.call(
-								this,
-								'value',
-								'GET',
-								`/v1.0/teams/${teamId}/channels`,
-								{},
-							);
-							responseData = responseData.splice(0, qs.limit);
-						}
-					}
-					//https://docs.microsoft.com/en-us/graph/api/channel-patch?view=graph-rest-beta&tabs=http
-					if (operation === 'update') {
-						const teamId = this.getNodeParameter('teamId', i) as string;
-						const channelId = this.getNodeParameter('channelId', i) as string;
-						const updateFields = this.getNodeParameter('updateFields', i);
-						const body: IDataObject = {};
-						if (updateFields.name) {
-							body.displayName = updateFields.name as string;
-						}
-						if (updateFields.description) {
-							body.description = updateFields.description as string;
-						}
-						responseData = await microsoftApiRequest.call(
-							this,
-							'PATCH',
-							`/v1.0/teams/${teamId}/channels/${channelId}`,
-							body,
-						);
-						responseData = { success: true };
-					}
-				}
-				if (resource === 'channelMessage') {
-					//https://docs.microsoft.com/en-us/graph/api/channel-post-messages?view=graph-rest-beta&tabs=http
-					//https://docs.microsoft.com/en-us/graph/api/channel-post-messagereply?view=graph-rest-beta&tabs=http
-					if (operation === 'create') {
-						const teamId = this.getNodeParameter('teamId', i) as string;
-						const channelId = this.getNodeParameter('channelId', i) as string;
-						const messageType = this.getNodeParameter('messageType', i) as string;
-						const message = this.getNodeParameter('message', i) as string;
-						const options = this.getNodeParameter('options', i);
-
-						const body: IDataObject = {
-							body: {
-								contentType: messageType,
-								content: message,
-							},
-						};
-
-						if (options.makeReply) {
-							const replyToId = options.makeReply as string;
-							responseData = await microsoftApiRequest.call(
-								this,
-								'POST',
-								`/beta/teams/${teamId}/channels/${channelId}/messages/${replyToId}/replies`,
-								body,
-							);
-						} else {
-							responseData = await microsoftApiRequest.call(
-								this,
-								'POST',
-								`/beta/teams/${teamId}/channels/${channelId}/messages`,
-								body,
-							);
-						}
-					}
-					//https://docs.microsoft.com/en-us/graph/api/channel-list-messages?view=graph-rest-beta&tabs=http
-					if (operation === 'getAll') {
-						const teamId = this.getNodeParameter('teamId', i) as string;
-						const channelId = this.getNodeParameter('channelId', i) as string;
-						const returnAll = this.getNodeParameter('returnAll', i);
-						if (returnAll) {
-							responseData = await microsoftApiRequestAllItems.call(
-								this,
-								'value',
-								'GET',
-								`/beta/teams/${teamId}/channels/${channelId}/messages`,
-							);
-						} else {
-							qs.limit = this.getNodeParameter('limit', i);
-							responseData = await microsoftApiRequestAllItems.call(
-								this,
-								'value',
-								'GET',
-								`/beta/teams/${teamId}/channels/${channelId}/messages`,
-								{},
-							);
-							responseData = responseData.splice(0, qs.limit);
-						}
-					}
-				}
-				if (resource === 'chatMessage') {
-					// https://docs.microsoft.com/en-us/graph/api/channel-post-messages?view=graph-rest-1.0&tabs=http
-					if (operation === 'create') {
-						const chatId = this.getNodeParameter('chatId', i) as string;
-						const messageType = this.getNodeParameter('messageType', i) as string;
-						const message = this.getNodeParameter('message', i) as string;
-						const body: IDataObject = {
-							body: {
-								contentType: messageType,
-								content: message,
-							},
-						};
-						responseData = await microsoftApiRequest.call(
-							this,
-							'POST',
-							`/v1.0/chats/${chatId}/messages`,
-							body,
-						);
-					}
-					// https://docs.microsoft.com/en-us/graph/api/chat-list-messages?view=graph-rest-1.0&tabs=http
-					if (operation === 'get') {
-						const chatId = this.getNodeParameter('chatId', i) as string;
-						const messageId = this.getNodeParameter('messageId', i) as string;
-						responseData = await microsoftApiRequest.call(
-							this,
-							'GET',
-							`/v1.0/chats/${chatId}/messages/${messageId}`,
-						);
-					}
-					// https://docs.microsoft.com/en-us/graph/api/chat-list-messages?view=graph-rest-1.0&tabs=http
-					if (operation === 'getAll') {
-						const chatId = this.getNodeParameter('chatId', i) as string;
-						const returnAll = this.getNodeParameter('returnAll', i);
-						if (returnAll) {
-							responseData = await microsoftApiRequestAllItems.call(
-								this,
-								'value',
-								'GET',
-								`/v1.0/chats/${chatId}/messages`,
-							);
-						} else {
-							qs.limit = this.getNodeParameter('limit', i);
-							responseData = await microsoftApiRequestAllItems.call(
-								this,
-								'value',
-								'GET',
-								`/v1.0/chats/${chatId}/messages`,
-								{},
-							);
-							responseData = responseData.splice(0, qs.limit);
-						}
-					}
-				}
-				if (resource === 'task') {
-					//https://docs.microsoft.com/en-us/graph/api/planner-post-tasks?view=graph-rest-1.0&tabs=http
-					if (operation === 'create') {
-						const planId = this.getNodeParameter('planId', i) as string;
-						const bucketId = this.getNodeParameter('bucketId', i) as string;
-						const title = this.getNodeParameter('title', i) as string;
-						const additionalFields = this.getNodeParameter('additionalFields', i);
-						const body: IDataObject = {
-							planId,
-							bucketId,
-							title,
-						};
-						Object.assign(body, additionalFields);
-
-						if (body.assignedTo) {
-							body.assignments = {
-								[body.assignedTo as string]: {
-									'@odata.type': 'microsoft.graph.plannerAssignment',
-									orderHint: ' !',
-								},
-							};
-							delete body.assignedTo;
-						}
-
-						if (Array.isArray(body.labels)) {
-							body.appliedCategories = (body.labels as string[]).map((label) => ({
-								[label]: true,
-							}));
-						}
-
-						responseData = await microsoftApiRequest.call(
-							this,
-							'POST',
-							'/v1.0/planner/tasks',
-							body,
-						);
-					}
-					//https://docs.microsoft.com/en-us/graph/api/plannertask-delete?view=graph-rest-1.0&tabs=http
-					if (operation === 'delete') {
-						const taskId = this.getNodeParameter('taskId', i) as string;
-						const task = await microsoftApiRequest.call(
-							this,
-							'GET',
-							`/v1.0/planner/tasks/${taskId}`,
-						);
-						responseData = await microsoftApiRequest.call(
-							this,
-							'DELETE',
-							`/v1.0/planner/tasks/${taskId}`,
-							{},
-							{},
-							undefined,
-							{ 'If-Match': task['@odata.etag'] },
-						);
-						responseData = { success: true };
-					}
-					//https://docs.microsoft.com/en-us/graph/api/plannertask-get?view=graph-rest-1.0&tabs=http
-					if (operation === 'get') {
-						const taskId = this.getNodeParameter('taskId', i) as string;
-						responseData = await microsoftApiRequest.call(
-							this,
-							'GET',
-							`/v1.0/planner/tasks/${taskId}`,
-						);
-					}
-					if (operation === 'getAll') {
-						const tasksFor = this.getNodeParameter('tasksFor', i) as string;
-						const returnAll = this.getNodeParameter('returnAll', i);
-						if (tasksFor === 'member') {
-							//https://docs.microsoft.com/en-us/graph/api/planneruser-list-tasks?view=graph-rest-1.0&tabs=http
-							const memberId = this.getNodeParameter('memberId', i) as string;
-							if (returnAll) {
-								responseData = await microsoftApiRequestAllItems.call(
-									this,
-									'value',
-									'GET',
-									`/v1.0/users/${memberId}/planner/tasks`,
-								);
-							} else {
-								qs.limit = this.getNodeParameter('limit', i);
-								responseData = await microsoftApiRequestAllItems.call(
-									this,
-									'value',
-									'GET',
-									`/v1.0/users/${memberId}/planner/tasks`,
-									{},
-								);
-								responseData = responseData.splice(0, qs.limit);
-							}
-						} else {
-							//https://docs.microsoft.com/en-us/graph/api/plannerplan-list-tasks?view=graph-rest-1.0&tabs=http
-							const planId = this.getNodeParameter('planId', i) as string;
-							if (returnAll) {
-								responseData = await microsoftApiRequestAllItems.call(
-									this,
-									'value',
-									'GET',
-									`/v1.0/planner/plans/${planId}/tasks`,
-								);
-							} else {
-								qs.limit = this.getNodeParameter('limit', i);
-								responseData = await microsoftApiRequestAllItems.call(
-									this,
-									'value',
-									'GET',
-									`/v1.0/planner/plans/${planId}/tasks`,
-									{},
-								);
-								responseData = responseData.splice(0, qs.limit);
-							}
-						}
-					}
-					//https://docs.microsoft.com/en-us/graph/api/plannertask-update?view=graph-rest-1.0&tabs=http
-					if (operation === 'update') {
-						const taskId = this.getNodeParameter('taskId', i) as string;
-						const updateFields = this.getNodeParameter('updateFields', i);
-						const body: IDataObject = {};
-						Object.assign(body, updateFields);
-
-						if (body.assignedTo) {
-							body.assignments = {
-								[body.assignedTo as string]: {
-									'@odata.type': 'microsoft.graph.plannerAssignment',
-									orderHint: ' !',
-								},
-							};
-							delete body.assignedTo;
-						}
-
-						if (body.groupId) {
-							// tasks are assigned to a plan and bucket, group is used for filtering
-							delete body.groupId;
-						}
-
-						if (Array.isArray(body.labels)) {
-							body.appliedCategories = (body.labels as string[]).map((label) => ({
-								[label]: true,
-							}));
-						}
-
-						const task = await microsoftApiRequest.call(
-							this,
-							'GET',
-							`/v1.0/planner/tasks/${taskId}`,
-						);
-
-						responseData = await microsoftApiRequest.call(
-							this,
-							'PATCH',
-							`/v1.0/planner/tasks/${taskId}`,
-							body,
-							{},
-							undefined,
-							{ 'If-Match': task['@odata.etag'] },
-						);
-
-						responseData = { success: true };
-					}
-				}
-
-				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData as IDataObject),
-					{ itemData: { item: i } },
-				);
-
-				returnData.push(...executionData);
-			} 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;
-			}
-		}
-		return this.prepareOutputData(returnData);
+import type { INodeTypeBaseDescription, IVersionedNodeType } from 'n8n-workflow';
+import { VersionedNodeType } from 'n8n-workflow';
+
+import { MicrosoftTeamsV1 } from './v1/MicrosoftTeamsV1.node';
+import { MicrosoftTeamsV2 } from './v2/MicrosoftTeamsV2.node';
+
+export class MicrosoftTeams extends VersionedNodeType {
+	constructor() {
+		const baseDescription: INodeTypeBaseDescription = {
+			displayName: 'Microsoft Teams',
+			name: 'microsoftTeams',
+			icon: 'file:teams.svg',
+			group: ['input'],
+			description: 'Consume Microsoft Teams API',
+			defaultVersion: 2,
+		};
+
+		const nodeVersions: IVersionedNodeType['nodeVersions'] = {
+			1: new MicrosoftTeamsV1(baseDescription),
+			1.1: new MicrosoftTeamsV1(baseDescription),
+			2: new MicrosoftTeamsV2(baseDescription),
+		};
+
+		super(nodeVersions, baseDescription);
 	}
 }
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/teams.svg b/packages/nodes-base/nodes/Microsoft/Teams/teams.svg
index 33eb50158c44b..98d3ab7326bc3 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/teams.svg
+++ b/packages/nodes-base/nodes/Microsoft/Teams/teams.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2381.4 2354.5"><path d="M2015.6 899.2c19.5 19.5 42.5 35 67.9 45.8 53 22.2 112.7 22.2 165.8 0 51.2-21.8 92-62.5 113.7-113.7 22.2-53 22.2-112.7 0-165.8-21.8-51.2-62.5-92-113.7-113.7-53-22.2-112.7-22.2-165.8 0-51.2 21.8-92 62.5-113.7 113.7-22.2 53-22.2 112.7 0 165.8 10.8 25.3 26.4 48.4 45.8 67.9zm-62.4 197.8v642.1h107c36.8-.2 73.4-3.6 109.5-10.4 36.3-6.4 71.3-18.6 103.7-36.2 30.6-16.6 57-40 77.3-68.2 21.3-31.3 32-68.6 30.5-106.5V1097h-428zm-346.8-269.2c28.4.2 56.6-5.5 82.8-16.7 51.2-21.8 91.9-62.5 113.6-113.7 22.2-53 22.2-112.7-.1-165.8-21.8-51.2-62.5-92-113.7-113.7-26.2-11.2-54.4-16.9-82.9-16.7-28.3-.2-56.3 5.5-82.3 16.7-19.4 8.3-25.5 19.1-52.2 32.1v329c26.8 13.1 32.8 23.8 52.2 32.1 26.1 11.3 54.2 16.9 82.6 16.7zm-134.8 1081.1c26.8 5.8 36.4 10.3 55.4 12.9 20.8 3 41.8 4.5 62.8 4.6 32.4-.2 64.8-3.6 96.5-10.4 32.3-6.5 63.3-18.6 91.5-35.7 27.7-17 51-40.2 68.2-67.7 19-32.1 28.3-69.1 26.9-106.4v-743h-401.3v945.7zM0 2113.7l1391.3 240.8V0L0 240.8v1872.9z" fill="#5558af"/><path d="M1016.7 722.4l-642.1 39.1v148.1l240.8-9.7v686.7l160.5 9.4V893.6l240.8-10.7V722.4z" fill="#fff"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2381.4 2354.5"><path fill="#5558af" d="M2015.6 899.2c19.5 19.5 42.5 35 67.9 45.8 53 22.2 112.7 22.2 165.8 0 51.2-21.8 92-62.5 113.7-113.7 22.2-53 22.2-112.7 0-165.8-21.8-51.2-62.5-92-113.7-113.7-53-22.2-112.7-22.2-165.8 0-51.2 21.8-92 62.5-113.7 113.7-22.2 53-22.2 112.7 0 165.8 10.8 25.3 26.4 48.4 45.8 67.9m-62.4 197.8v642.1h107c36.8-.2 73.4-3.6 109.5-10.4 36.3-6.4 71.3-18.6 103.7-36.2 30.6-16.6 57-40 77.3-68.2 21.3-31.3 32-68.6 30.5-106.5V1097zm-346.8-269.2c28.4.2 56.6-5.5 82.8-16.7 51.2-21.8 91.9-62.5 113.6-113.7 22.2-53 22.2-112.7-.1-165.8-21.8-51.2-62.5-92-113.7-113.7-26.2-11.2-54.4-16.9-82.9-16.7-28.3-.2-56.3 5.5-82.3 16.7-19.4 8.3-25.5 19.1-52.2 32.1v329c26.8 13.1 32.8 23.8 52.2 32.1 26.1 11.3 54.2 16.9 82.6 16.7m-134.8 1081.1c26.8 5.8 36.4 10.3 55.4 12.9 20.8 3 41.8 4.5 62.8 4.6 32.4-.2 64.8-3.6 96.5-10.4 32.3-6.5 63.3-18.6 91.5-35.7 27.7-17 51-40.2 68.2-67.7 19-32.1 28.3-69.1 26.9-106.4v-743h-401.3zM0 2113.7l1391.3 240.8V0L0 240.8z"/><path fill="#fff" d="m1016.7 722.4-642.1 39.1v148.1l240.8-9.7v686.7l160.5 9.4V893.6l240.8-10.7z"/></svg>
\ No newline at end of file
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
new file mode 100644
index 0000000000000..41480285511dd
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/create.test.ts
@@ -0,0 +1,69 @@
+import type { INodeTypes } from 'n8n-workflow';
+import nock from 'nock';
+import * as transport from '../../../../v2/transport';
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+const microsoftApiRequestSpy = jest.spyOn(transport, 'microsoftApiRequest');
+
+microsoftApiRequestSpy.mockImplementation(async (method: string) => {
+	if (method === 'POST') {
+		return {
+			'@odata.context':
+				"https://graph.microsoft.com/v1.0/$metadata#teams('1644e7fe-547e-4223-a24f-922395865343')/channels/$entity",
+			id: '19:16259efabba44a66916d91dd91862a6f@thread.tacv2',
+			createdDateTime: '2023-10-26T05:37:43.4798824Z',
+			displayName: 'New Channel',
+			description: 'new channel description',
+			isFavoriteByDefault: null,
+			email: '',
+			webUrl:
+				'https://teams.microsoft.com/l/channel/19%3a16259efabba44a66916d91dd91862a6f%40thread.tacv2/New+Channel?groupId=1644e7fe-547e-4223-a24f-922395865343&tenantId=tenantId-111-222-333',
+			membershipType: 'private',
+		};
+	}
+});
+
+describe('Test MicrosoftTeamsV2, channel => create', () => {
+	const workflows = ['nodes/Microsoft/Teams/test/v2/node/channel/create.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.resetAllMocks();
+	});
+
+	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(microsoftApiRequestSpy).toHaveBeenCalledTimes(1);
+		expect(microsoftApiRequestSpy).toHaveBeenCalledWith(
+			'POST',
+			'/v1.0/teams/1644e7fe-547e-4223-a24f-922395865343/channels',
+			{
+				description: 'new channel description',
+				displayName: 'New Channel',
+				membershipType: 'private',
+			},
+		);
+
+		expect(result.finished).toEqual(true);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/create.workflow.json b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/create.workflow.json
new file mode 100644
index 0000000000000..75443299f2085
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/create.workflow.json
@@ -0,0 +1,107 @@
+{
+  "name": "My workflow 35",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "6666-9999-77777",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        880,
+        380
+      ]
+    },
+    {
+      "parameters": {
+        "teamId": {
+          "__rl": true,
+          "value": "1644e7fe-547e-4223-a24f-922395865343",
+          "mode": "list",
+          "cachedResultName": "5w1hb7"
+        },
+        "name": "New Channel",
+        "options": {
+          "description": "new channel description",
+          "type": "private"
+        }
+      },
+      "id": "6666-5555-77777",
+      "name": "Microsoft Teams",
+      "type": "n8n-nodes-base.microsoftTeams",
+      "typeVersion": 2,
+      "position": [
+        1100,
+        380
+      ],
+      "credentials": {
+        "microsoftTeamsOAuth2Api": {
+          "id": "6isd5ytvA0qV78eK",
+          "name": "Microsoft Teams account"
+        }
+      }
+    },
+    {
+      "parameters": {},
+      "id": "9d1a2e59-c71c-486c-b3ac-dec6adbc26b3",
+      "name": "No Operation, do nothing",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        1400,
+        380
+      ]
+    }
+  ],
+  "pinData": {
+    "No Operation, do nothing": [
+      {
+        "json": {
+          "@odata.context": "https://graph.microsoft.com/v1.0/$metadata#teams('1644e7fe-547e-4223-a24f-922395865343')/channels/$entity",
+          "id": "19:16259efabba44a66916d91dd91862a6f@thread.tacv2",
+          "createdDateTime": "2023-10-26T05:37:43.4798824Z",
+          "displayName": "New Channel",
+          "description": "new channel description",
+          "isFavoriteByDefault": null,
+          "email": "",
+          "webUrl": "https://teams.microsoft.com/l/channel/19%3a16259efabba44a66916d91dd91862a6f%40thread.tacv2/New+Channel?groupId=1644e7fe-547e-4223-a24f-922395865343&tenantId=tenantId-111-222-333",
+          "membershipType": "private"
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Microsoft Teams",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Microsoft Teams": {
+      "main": [
+        [
+          {
+            "node": "No Operation, do nothing",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "ec0b4e3d-2fd7-4fac-90e5-f18ecd620a8f",
+  "id": "i3NYGF0LXV4qDFV9",
+  "meta": {
+    "instanceId": "b888bd11cd1ddbb95450babf3e199556799d999b896f650de768b8370ee50363"
+  },
+  "tags": []
+}
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
new file mode 100644
index 0000000000000..8e972d8b0df75
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/deleteChannel.test.ts
@@ -0,0 +1,52 @@
+import type { INodeTypes } from 'n8n-workflow';
+import nock from 'nock';
+import * as transport from '../../../../v2/transport';
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+const microsoftApiRequestSpy = jest.spyOn(transport, 'microsoftApiRequest');
+
+microsoftApiRequestSpy.mockImplementation(async (method: string) => {
+	if (method === 'DELETE') {
+		return {};
+	}
+});
+
+describe('Test MicrosoftTeamsV2, channel => deleteChannel', () => {
+	const workflows = ['nodes/Microsoft/Teams/test/v2/node/channel/deleteChannel.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.resetAllMocks();
+	});
+
+	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(microsoftApiRequestSpy).toHaveBeenCalledTimes(1);
+		expect(microsoftApiRequestSpy).toHaveBeenCalledWith(
+			'DELETE',
+			'/v1.0/teams/1644e7fe-547e-4223-a24f-922395865343/channels/19:16259efabba44a66916d91dd91862a6f@thread.tacv2',
+		);
+
+		expect(result.finished).toEqual(true);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/deleteChannel.workflow.json b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/deleteChannel.workflow.json
new file mode 100644
index 0000000000000..2447b2dc25ac5
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/deleteChannel.workflow.json
@@ -0,0 +1,102 @@
+{
+  "name": "My workflow 35",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "6666-9999-77777",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        880,
+        380
+      ]
+    },
+    {
+      "parameters": {
+        "operation": "deleteChannel",
+        "teamId": {
+          "__rl": true,
+          "value": "1644e7fe-547e-4223-a24f-922395865343",
+          "mode": "list",
+          "cachedResultName": "5w1hb7"
+        },
+        "channelId": {
+          "__rl": true,
+          "value": "19:16259efabba44a66916d91dd91862a6f@thread.tacv2",
+          "mode": "list",
+          "cachedResultName": "New Channel",
+          "cachedResultUrl": "https://teams.microsoft.com/l/channel/19%3A16259efabba44a66916d91dd91862a6f%40thread.tacv2/New%20Channel?groupId=1644e7fe-547e-4223-a24f-922395865343&tenantId=tenantId-111-222-333&allowXTenantAccess=False"
+        }
+      },
+      "id": "6666-5555-77777",
+      "name": "Microsoft Teams",
+      "type": "n8n-nodes-base.microsoftTeams",
+      "typeVersion": 2,
+      "position": [
+        1100,
+        380
+      ],
+      "credentials": {
+        "microsoftTeamsOAuth2Api": {
+          "id": "6isd5ytvA0qV78eK",
+          "name": "Microsoft Teams account"
+        }
+      }
+    },
+    {
+      "parameters": {},
+      "id": "9d1a2e59-c71c-486c-b3ac-dec6adbc26b3",
+      "name": "No Operation, do nothing",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        1400,
+        380
+      ]
+    }
+  ],
+  "pinData": {
+    "No Operation, do nothing": [
+      {
+        "json": {
+          "success": true
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Microsoft Teams",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Microsoft Teams": {
+      "main": [
+        [
+          {
+            "node": "No Operation, do nothing",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "fb9028a2-b502-45f1-b907-825e8d754991",
+  "id": "i3NYGF0LXV4qDFV9",
+  "meta": {
+    "instanceId": "b888bd11cd1ddbb95450babf3e199556799d999b896f650de768b8370ee50363"
+  },
+  "tags": []
+}
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
new file mode 100644
index 0000000000000..b7ec5e9e0e2a0
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/get.test.ts
@@ -0,0 +1,65 @@
+import type { INodeTypes } from 'n8n-workflow';
+import nock from 'nock';
+import * as transport from '../../../../v2/transport';
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+const microsoftApiRequestSpy = jest.spyOn(transport, 'microsoftApiRequest');
+
+microsoftApiRequestSpy.mockImplementation(async (method: string) => {
+	if (method === 'GET') {
+		return {
+			'@odata.context':
+				"https://graph.microsoft.com/v1.0/$metadata#teams('e25bae35-7bcc-4fb7-b4f2-0d5caef251fd')/channels/$entity",
+			id: '19:dff84a49e5124cc89dff0192c621ea0f@thread.tacv2',
+			createdDateTime: '2022-03-26T17:16:51Z',
+			displayName: 'General',
+			description: 'Description of Retail',
+			isFavoriteByDefault: null,
+			email: 'Retail@5w1hb7.onmicrosoft.com',
+			tenantId: 'tenantId-111-222-333',
+			webUrl:
+				'https://teams.microsoft.com/l/channel/19%3Adff84a49e5124cc89dff0192c621ea0f%40thread.tacv2/General?groupId=e25bae35-7bcc-4fb7-b4f2-0d5caef251fd&tenantId=tenantId-111-222-333&allowXTenantAccess=True',
+			membershipType: 'standard',
+		};
+	}
+});
+
+describe('Test MicrosoftTeamsV2, channel => get', () => {
+	const workflows = ['nodes/Microsoft/Teams/test/v2/node/channel/get.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.resetAllMocks();
+	});
+
+	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(microsoftApiRequestSpy).toHaveBeenCalledTimes(1);
+		expect(microsoftApiRequestSpy).toHaveBeenCalledWith(
+			'GET',
+			'/v1.0/teams/e25bae35-7bcc-4fb7-b4f2-0d5caef251fd/channels/19:dff84a49e5124cc89dff0192c621ea0f@thread.tacv2',
+		);
+
+		expect(result.finished).toEqual(true);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/get.workflow.json b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/get.workflow.json
new file mode 100644
index 0000000000000..ecf6e6b9ade02
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/get.workflow.json
@@ -0,0 +1,111 @@
+{
+  "name": "My workflow 35",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "6666-9999-77777",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        880,
+        380
+      ]
+    },
+    {
+      "parameters": {
+        "operation": "get",
+        "teamId": {
+          "__rl": true,
+          "value": "e25bae35-7bcc-4fb7-b4f2-0d5caef251fd",
+          "mode": "list",
+          "cachedResultName": "Retail"
+        },
+        "channelId": {
+          "__rl": true,
+          "value": "19:dff84a49e5124cc89dff0192c621ea0f@thread.tacv2",
+          "mode": "list",
+          "cachedResultName": "General",
+          "cachedResultUrl": "https://teams.microsoft.com/l/channel/19%3Adff84a49e5124cc89dff0192c621ea0f%40thread.tacv2/Retail?groupId=e25bae35-7bcc-4fb7-b4f2-0d5caef251fd&tenantId=tenantId-111-222-333&allowXTenantAccess=False"
+        }
+      },
+      "id": "6666-5555-77777",
+      "name": "Microsoft Teams",
+      "type": "n8n-nodes-base.microsoftTeams",
+      "typeVersion": 2,
+      "position": [
+        1100,
+        380
+      ],
+      "credentials": {
+        "microsoftTeamsOAuth2Api": {
+          "id": "6isd5ytvA0qV78eK",
+          "name": "Microsoft Teams account"
+        }
+      }
+    },
+    {
+      "parameters": {},
+      "id": "9d1a2e59-c71c-486c-b3ac-dec6adbc26b3",
+      "name": "No Operation, do nothing",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        1400,
+        380
+      ]
+    }
+  ],
+  "pinData": {
+    "No Operation, do nothing": [
+      {
+        "json": {
+          "@odata.context": "https://graph.microsoft.com/v1.0/$metadata#teams('e25bae35-7bcc-4fb7-b4f2-0d5caef251fd')/channels/$entity",
+          "id": "19:dff84a49e5124cc89dff0192c621ea0f@thread.tacv2",
+          "createdDateTime": "2022-03-26T17:16:51Z",
+          "displayName": "General",
+          "description": "Description of Retail",
+          "isFavoriteByDefault": null,
+          "email": "Retail@5w1hb7.onmicrosoft.com",
+          "tenantId": "tenantId-111-222-333",
+          "webUrl": "https://teams.microsoft.com/l/channel/19%3Adff84a49e5124cc89dff0192c621ea0f%40thread.tacv2/General?groupId=e25bae35-7bcc-4fb7-b4f2-0d5caef251fd&tenantId=tenantId-111-222-333&allowXTenantAccess=True",
+          "membershipType": "standard"
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Microsoft Teams",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Microsoft Teams": {
+      "main": [
+        [
+          {
+            "node": "No Operation, do nothing",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "021e8e46-fd28-4dfb-bd94-b288a8541940",
+  "id": "i3NYGF0LXV4qDFV9",
+  "meta": {
+    "instanceId": "b888bd11cd1ddbb95450babf3e199556799d999b896f650de768b8370ee50363"
+  },
+  "tags": []
+}
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
new file mode 100644
index 0000000000000..1b26d0b8f8705
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/getAll.test.ts
@@ -0,0 +1,91 @@
+import type { INodeTypes } from 'n8n-workflow';
+import nock from 'nock';
+import * as transport from '../../../../v2/transport';
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+const microsoftApiRequestSpy = jest.spyOn(transport, 'microsoftApiRequestAllItems');
+
+microsoftApiRequestSpy.mockImplementation(async (_, method: string) => {
+	if (method === 'GET') {
+		return [
+			{
+				id: '42:aaabbbccc.tacv2',
+				createdDateTime: '2022-03-26T17:18:33Z',
+				displayName: 'Sales West',
+				description: 'Description of Sales West',
+				isFavoriteByDefault: null,
+				email: null,
+				tenantId: 'tenantId-111-222-333',
+				webUrl:
+					'https://teams.microsoft.com/l/channel/threadId/Sales%20West?groupId=1111-2222-3333&tenantId=tenantId-111-222-333&allowXTenantAccess=False',
+				membershipType: 'standard',
+			},
+			{
+				id: '19:8662cdf2d8ff49eabdcf6364bc0fe3a2@thread.tacv2',
+				createdDateTime: '2022-03-26T17:18:30Z',
+				displayName: 'Sales East',
+				description: 'Description of Sales West',
+				isFavoriteByDefault: null,
+				email: null,
+				tenantId: 'tenantId-111-222-333',
+				webUrl:
+					'https://teams.microsoft.com/l/channel/19%3A8662cdf2d8ff49eabdcf6364bc0fe3a2%40thread.tacv2/Sales%20East?groupId=1111-2222-3333&tenantId=tenantId-111-222-333&allowXTenantAccess=False',
+				membershipType: 'standard',
+			},
+			{
+				id: '19:a95209ede91f4d5595ac944aeb172124@thread.tacv2',
+				createdDateTime: '2022-03-26T17:18:16Z',
+				displayName: 'General',
+				description: 'Description of U.S. Sales',
+				isFavoriteByDefault: null,
+				email: 'U.S.Sales@5w1hb7.onmicrosoft.com',
+				tenantId: 'tenantId-111-222-333',
+				webUrl:
+					'https://teams.microsoft.com/l/channel/19%3Aa95209ede91f4d5595ac944aeb172124%40thread.tacv2/U.S.%20Sales?groupId=1111-2222-3333&tenantId=tenantId-111-222-333&allowXTenantAccess=False',
+				membershipType: 'standard',
+			},
+		];
+	}
+});
+
+describe('Test MicrosoftTeamsV2, channel => getAll', () => {
+	const workflows = ['nodes/Microsoft/Teams/test/v2/node/channel/getAll.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.resetAllMocks();
+	});
+
+	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(microsoftApiRequestSpy).toHaveBeenCalledTimes(1);
+		expect(microsoftApiRequestSpy).toHaveBeenCalledWith(
+			'value',
+			'GET',
+			'/v1.0/teams/1111-2222-3333/channels',
+			{},
+		);
+
+		expect(result.finished).toEqual(true);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/getAll.workflow.json b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/getAll.workflow.json
new file mode 100644
index 0000000000000..3b6796c5b15b9
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/getAll.workflow.json
@@ -0,0 +1,129 @@
+{
+  "name": "My workflow 35",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "6666-9999-77777",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        880,
+        380
+      ]
+    },
+    {
+      "parameters": {
+        "operation": "getAll",
+        "teamId": {
+          "__rl": true,
+          "value": "1111-2222-3333",
+          "mode": "list",
+          "cachedResultName": "U.S. Sales"
+        }
+      },
+      "id": "6666-5555-77777",
+      "name": "Microsoft Teams",
+      "type": "n8n-nodes-base.microsoftTeams",
+      "typeVersion": 2,
+      "position": [
+        1100,
+        380
+      ],
+      "credentials": {
+        "microsoftTeamsOAuth2Api": {
+          "id": "6isd5ytvA0qV78eK",
+          "name": "Microsoft Teams account"
+        }
+      }
+    },
+    {
+      "parameters": {},
+      "id": "9d1a2e59-c71c-486c-b3ac-dec6adbc26b3",
+      "name": "No Operation, do nothing",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        1400,
+        380
+      ]
+    }
+  ],
+  "pinData": {
+    "No Operation, do nothing": [
+      {
+        "json": {
+          "id": "42:aaabbbccc.tacv2",
+          "createdDateTime": "2022-03-26T17:18:33Z",
+          "displayName": "Sales West",
+          "description": "Description of Sales West",
+          "isFavoriteByDefault": null,
+          "email": null,
+          "tenantId": "tenantId-111-222-333",
+          "webUrl": "https://teams.microsoft.com/l/channel/threadId/Sales%20West?groupId=1111-2222-3333&tenantId=tenantId-111-222-333&allowXTenantAccess=False",
+          "membershipType": "standard"
+        }
+      },
+      {
+        "json": {
+          "id": "19:8662cdf2d8ff49eabdcf6364bc0fe3a2@thread.tacv2",
+          "createdDateTime": "2022-03-26T17:18:30Z",
+          "displayName": "Sales East",
+          "description": "Description of Sales West",
+          "isFavoriteByDefault": null,
+          "email": null,
+          "tenantId": "tenantId-111-222-333",
+          "webUrl": "https://teams.microsoft.com/l/channel/19%3A8662cdf2d8ff49eabdcf6364bc0fe3a2%40thread.tacv2/Sales%20East?groupId=1111-2222-3333&tenantId=tenantId-111-222-333&allowXTenantAccess=False",
+          "membershipType": "standard"
+        }
+      },
+      {
+        "json": {
+          "id": "19:a95209ede91f4d5595ac944aeb172124@thread.tacv2",
+          "createdDateTime": "2022-03-26T17:18:16Z",
+          "displayName": "General",
+          "description": "Description of U.S. Sales",
+          "isFavoriteByDefault": null,
+          "email": "U.S.Sales@5w1hb7.onmicrosoft.com",
+          "tenantId": "tenantId-111-222-333",
+          "webUrl": "https://teams.microsoft.com/l/channel/19%3Aa95209ede91f4d5595ac944aeb172124%40thread.tacv2/U.S.%20Sales?groupId=1111-2222-3333&tenantId=tenantId-111-222-333&allowXTenantAccess=False",
+          "membershipType": "standard"
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Microsoft Teams",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Microsoft Teams": {
+      "main": [
+        [
+          {
+            "node": "No Operation, do nothing",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "08f365b7-a03d-4d38-979e-edca8194d045",
+  "id": "i3NYGF0LXV4qDFV9",
+  "meta": {
+    "instanceId": "b888bd11cd1ddbb95450babf3e199556799d999b896f650de768b8370ee50363"
+  },
+  "tags": []
+}
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
new file mode 100644
index 0000000000000..f3114f5978660
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/update.test.ts
@@ -0,0 +1,53 @@
+import type { INodeTypes } from 'n8n-workflow';
+import nock from 'nock';
+import * as transport from '../../../../v2/transport';
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+const microsoftApiRequestSpy = jest.spyOn(transport, 'microsoftApiRequest');
+
+microsoftApiRequestSpy.mockImplementation(async (method: string) => {
+	if (method === 'PATCH') {
+		return {};
+	}
+});
+
+describe('Test MicrosoftTeamsV2, channel => update', () => {
+	const workflows = ['nodes/Microsoft/Teams/test/v2/node/channel/update.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.resetAllMocks();
+	});
+
+	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(microsoftApiRequestSpy).toHaveBeenCalledTimes(1);
+		expect(microsoftApiRequestSpy).toHaveBeenCalledWith(
+			'PATCH',
+			'/v1.0/teams/e25bae35-7bcc-4fb7-b4f2-0d5caef251fd/channels/19:b9daa3647ff8450bacaf39490d3e05e2@thread.tacv2',
+			{ description: 'new channel description', displayName: 'New Deals' },
+		);
+
+		expect(result.finished).toEqual(true);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/update.workflow.json b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/update.workflow.json
new file mode 100644
index 0000000000000..54530e4b62ab9
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/update.workflow.json
@@ -0,0 +1,106 @@
+{
+  "name": "My workflow 35",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "6666-9999-77777",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        880,
+        380
+      ]
+    },
+    {
+      "parameters": {
+        "operation": "update",
+        "teamId": {
+          "__rl": true,
+          "value": "e25bae35-7bcc-4fb7-b4f2-0d5caef251fd",
+          "mode": "list",
+          "cachedResultName": "Retail"
+        },
+        "channelId": {
+          "__rl": true,
+          "value": "19:b9daa3647ff8450bacaf39490d3e05e2@thread.tacv2",
+          "mode": "list",
+          "cachedResultName": "Deals",
+          "cachedResultUrl": "https://teams.microsoft.com/l/channel/19%3Ab9daa3647ff8450bacaf39490d3e05e2%40thread.tacv2/Deals?groupId=e25bae35-7bcc-4fb7-b4f2-0d5caef251fd&tenantId=tenantId-111-222-333&allowXTenantAccess=False"
+        },
+        "name": "New Deals",
+        "options": {
+          "description": "new channel description"
+        }
+      },
+      "id": "6666-5555-77777",
+      "name": "Microsoft Teams",
+      "type": "n8n-nodes-base.microsoftTeams",
+      "typeVersion": 2,
+      "position": [
+        1100,
+        380
+      ],
+      "credentials": {
+        "microsoftTeamsOAuth2Api": {
+          "id": "6isd5ytvA0qV78eK",
+          "name": "Microsoft Teams account"
+        }
+      }
+    },
+    {
+      "parameters": {},
+      "id": "9d1a2e59-c71c-486c-b3ac-dec6adbc26b3",
+      "name": "No Operation, do nothing",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        1400,
+        380
+      ]
+    }
+  ],
+  "pinData": {
+    "No Operation, do nothing": [
+      {
+        "json": {
+          "success": true
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Microsoft Teams",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Microsoft Teams": {
+      "main": [
+        [
+          {
+            "node": "No Operation, do nothing",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "75151dab-2cd1-42ee-9a01-e61cf6a1245e",
+  "id": "i3NYGF0LXV4qDFV9",
+  "meta": {
+    "instanceId": "b888bd11cd1ddbb95450babf3e199556799d999b896f650de768b8370ee50363"
+  },
+  "tags": []
+}
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
new file mode 100644
index 0000000000000..4cf330bf3e4fd
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channelMessage/create.test.ts
@@ -0,0 +1,95 @@
+import type { INodeTypes } from 'n8n-workflow';
+import nock from 'nock';
+import * as transport from '../../../../v2/transport';
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+const microsoftApiRequestSpy = jest.spyOn(transport, 'microsoftApiRequest');
+
+microsoftApiRequestSpy.mockImplementation(async (method: string) => {
+	if (method === 'POST') {
+		return {
+			'@odata.context':
+				"https://graph.microsoft.com/beta/$metadata#teams('1111-2222-3333')/channels('threadId')/messages/$entity",
+			id: '1698324478896',
+			replyToId: null,
+			etag: '1698324478896',
+			messageType: 'message',
+			createdDateTime: '2023-10-26T12:47:58.896Z',
+			lastModifiedDateTime: '2023-10-26T12:47:58.896Z',
+			lastEditedDateTime: null,
+			deletedDateTime: null,
+			subject: null,
+			summary: null,
+			chatId: null,
+			importance: 'normal',
+			locale: 'en-us',
+			webUrl:
+				'https://teams.microsoft.com/l/message/threadId/1698324478896?groupId=1111-2222-3333&tenantId=tenantId-111-222-333&createdTime=1698324478896&parentMessageId=1698324478896',
+			onBehalfOf: null,
+			policyViolation: null,
+			eventDetail: null,
+			from: {
+				application: null,
+				device: null,
+				user: {
+					'@odata.type': '#microsoft.graph.teamworkUserIdentity',
+					id: '11111-2222-3333',
+					displayName: 'My Name',
+					userIdentityType: 'aadUser',
+				},
+			},
+			body: {
+				contentType: 'html',
+				content: 'new sale',
+			},
+			channelIdentity: {
+				teamId: '1111-2222-3333',
+				channelId: '42:aaabbbccc.tacv2',
+			},
+			attachments: [],
+			mentions: [],
+			reactions: [],
+		};
+	}
+});
+
+describe('Test MicrosoftTeamsV2, channelMessage => create', () => {
+	const workflows = ['nodes/Microsoft/Teams/test/v2/node/channelMessage/create.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.resetAllMocks();
+	});
+
+	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(microsoftApiRequestSpy).toHaveBeenCalledTimes(1);
+		expect(microsoftApiRequestSpy).toHaveBeenCalledWith(
+			'POST',
+			'/beta/teams/1111-2222-3333/channels/42:aaabbbccc.tacv2/messages',
+			{ body: { content: 'new sale', contentType: 'html' } },
+		);
+
+		expect(result.finished).toEqual(true);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channelMessage/create.workflow.json b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channelMessage/create.workflow.json
new file mode 100644
index 0000000000000..863131d5b17b9
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channelMessage/create.workflow.json
@@ -0,0 +1,145 @@
+{
+  "name": "My workflow 35",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "6666-9999-77777",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        880,
+        380
+      ]
+    },
+    {
+      "parameters": {
+        "resource": "channelMessage",
+        "teamId": {
+          "__rl": true,
+          "value": "1111-2222-3333",
+          "mode": "list",
+          "cachedResultName": "U.S. Sales"
+        },
+        "channelId": {
+          "__rl": true,
+          "value": "42:aaabbbccc.tacv2",
+          "mode": "list",
+          "cachedResultName": "Sales West",
+          "cachedResultUrl": "https://teams.microsoft.com/l/channel/threadId/Sales%20West?groupId=1111-2222-3333&tenantId=tenantId-111-222-333&allowXTenantAccess=False"
+        },
+        "contentType": "html",
+        "message": "new sale",
+        "options": {
+          "includeLinkToWorkflow": false
+        }
+      },
+      "id": "6666-5555-77777",
+      "name": "Microsoft Teams",
+      "type": "n8n-nodes-base.microsoftTeams",
+      "typeVersion": 2,
+      "position": [
+        1100,
+        380
+      ],
+      "credentials": {
+        "microsoftTeamsOAuth2Api": {
+          "id": "6isd5ytvA0qV78eK",
+          "name": "Microsoft Teams account"
+        }
+      }
+    },
+    {
+      "parameters": {},
+      "id": "9d1a2e59-c71c-486c-b3ac-dec6adbc26b3",
+      "name": "No Operation, do nothing",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        1400,
+        380
+      ]
+    }
+  ],
+  "pinData": {
+    "No Operation, do nothing": [
+      {
+        "json": {
+          "@odata.context": "https://graph.microsoft.com/beta/$metadata#teams('1111-2222-3333')/channels('threadId')/messages/$entity",
+          "id": "1698324478896",
+          "replyToId": null,
+          "etag": "1698324478896",
+          "messageType": "message",
+          "createdDateTime": "2023-10-26T12:47:58.896Z",
+          "lastModifiedDateTime": "2023-10-26T12:47:58.896Z",
+          "lastEditedDateTime": null,
+          "deletedDateTime": null,
+          "subject": null,
+          "summary": null,
+          "chatId": null,
+          "importance": "normal",
+          "locale": "en-us",
+          "webUrl": "https://teams.microsoft.com/l/message/threadId/1698324478896?groupId=1111-2222-3333&tenantId=tenantId-111-222-333&createdTime=1698324478896&parentMessageId=1698324478896",
+          "onBehalfOf": null,
+          "policyViolation": null,
+          "eventDetail": null,
+          "from": {
+            "application": null,
+            "device": null,
+            "user": {
+              "@odata.type": "#microsoft.graph.teamworkUserIdentity",
+              "id": "11111-2222-3333",
+              "displayName": "My Name",
+              "userIdentityType": "aadUser"
+            }
+          },
+          "body": {
+            "contentType": "html",
+            "content": "new sale"
+          },
+          "channelIdentity": {
+            "teamId": "1111-2222-3333",
+            "channelId": "42:aaabbbccc.tacv2"
+          },
+          "attachments": [],
+          "mentions": [],
+          "reactions": []
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Microsoft Teams",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Microsoft Teams": {
+      "main": [
+        [
+          {
+            "node": "No Operation, do nothing",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "30cec397-a737-41b8-8da2-dff4d293ce70",
+  "id": "i3NYGF0LXV4qDFV9",
+  "meta": {
+    "instanceId": "b888bd11cd1ddbb95450babf3e199556799d999b896f650de768b8370ee50363"
+  },
+  "tags": []
+}
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
new file mode 100644
index 0000000000000..db13528329d29
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channelMessage/getAll.test.ts
@@ -0,0 +1,107 @@
+import type { INodeTypes } from 'n8n-workflow';
+import nock from 'nock';
+import * as transport from '../../../../v2/transport';
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+const microsoftApiRequestSpy = jest.spyOn(transport, 'microsoftApiRequestAllItems');
+
+microsoftApiRequestSpy.mockImplementation(async (_, method: string) => {
+	if (method === 'GET') {
+		return [
+			{
+				id: '1698130964682',
+				replyToId: null,
+				etag: '1698130964682',
+				messageType: 'message',
+				createdDateTime: '2023-10-24T07:02:44.682Z',
+				lastModifiedDateTime: '2023-10-24T07:02:44.682Z',
+				lastEditedDateTime: null,
+				deletedDateTime: null,
+				subject: '',
+				summary: null,
+				chatId: null,
+				importance: 'normal',
+				locale: 'en-us',
+				webUrl:
+					'https://teams.microsoft.com/l/message/threadId/1698130964682?groupId=1111-2222-3333&tenantId=tenantId-111-222-333&createdTime=1698130964682&parentMessageId=1698130964682',
+				onBehalfOf: null,
+				policyViolation: null,
+				eventDetail: null,
+				from: {
+					application: null,
+					device: null,
+					user: {
+						'@odata.type': '#microsoft.graph.teamworkUserIdentity',
+						id: '11111-2222-3333',
+						displayName: 'My Name',
+						userIdentityType: 'aadUser',
+						tenantId: 'tenantId-111-222-333',
+					},
+				},
+				body: {
+					contentType: 'html',
+					content:
+						'<div>I added a tab at the top of this channel. Check it out!</div><attachment id="tab::f22a0494-6f7c-4512-85c5-e4ce72ce142a"></attachment>',
+				},
+				channelIdentity: {
+					teamId: '1111-2222-3333',
+					channelId: '42:aaabbbccc.tacv2',
+				},
+				attachments: [
+					{
+						id: 'tab::f22a0494-6f7c-4512-85c5-e4ce72ce142a',
+						contentType: 'tabReference',
+						contentUrl: null,
+						content: null,
+						name: 'Tasks',
+						thumbnailUrl: null,
+						teamsAppId: null,
+					},
+				],
+				mentions: [],
+				reactions: [],
+			},
+		];
+	}
+});
+
+describe('Test MicrosoftTeamsV2, channelMessage => getAll', () => {
+	const workflows = ['nodes/Microsoft/Teams/test/v2/node/channelMessage/getAll.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.resetAllMocks();
+	});
+
+	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(microsoftApiRequestSpy).toHaveBeenCalledTimes(1);
+		expect(microsoftApiRequestSpy).toHaveBeenCalledWith(
+			'value',
+			'GET',
+			'/beta/teams/1111-2222-3333/channels/42:aaabbbccc.tacv2/messages',
+		);
+
+		expect(result.finished).toEqual(true);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channelMessage/getAll.workflow.json b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channelMessage/getAll.workflow.json
new file mode 100644
index 0000000000000..24e797f6847cd
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channelMessage/getAll.workflow.json
@@ -0,0 +1,152 @@
+{
+  "name": "My workflow 35",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "6666-9999-77777",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        880,
+        380
+      ]
+    },
+    {
+      "parameters": {
+        "resource": "channelMessage",
+        "operation": "getAll",
+        "teamId": {
+          "__rl": true,
+          "value": "1111-2222-3333",
+          "mode": "list",
+          "cachedResultName": "U.S. Sales"
+        },
+        "channelId": {
+          "__rl": true,
+          "value": "42:aaabbbccc.tacv2",
+          "mode": "list",
+          "cachedResultName": "Sales West",
+          "cachedResultUrl": "https://teams.microsoft.com/l/channel/threadId/Sales%20West?groupId=1111-2222-3333&tenantId=tenantId-111-222-333&allowXTenantAccess=False"
+        },
+        "returnAll": true
+      },
+      "id": "6666-5555-77777",
+      "name": "Microsoft Teams",
+      "type": "n8n-nodes-base.microsoftTeams",
+      "typeVersion": 2,
+      "position": [
+        1100,
+        380
+      ],
+      "credentials": {
+        "microsoftTeamsOAuth2Api": {
+          "id": "6isd5ytvA0qV78eK",
+          "name": "Microsoft Teams account"
+        }
+      }
+    },
+    {
+      "parameters": {},
+      "id": "9d1a2e59-c71c-486c-b3ac-dec6adbc26b3",
+      "name": "No Operation, do nothing",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        1400,
+        380
+      ]
+    }
+  ],
+  "pinData": {
+    "No Operation, do nothing": [
+      {
+        "json": {
+          "id": "1698130964682",
+          "replyToId": null,
+          "etag": "1698130964682",
+          "messageType": "message",
+          "createdDateTime": "2023-10-24T07:02:44.682Z",
+          "lastModifiedDateTime": "2023-10-24T07:02:44.682Z",
+          "lastEditedDateTime": null,
+          "deletedDateTime": null,
+          "subject": "",
+          "summary": null,
+          "chatId": null,
+          "importance": "normal",
+          "locale": "en-us",
+          "webUrl": "https://teams.microsoft.com/l/message/threadId/1698130964682?groupId=1111-2222-3333&tenantId=tenantId-111-222-333&createdTime=1698130964682&parentMessageId=1698130964682",
+          "onBehalfOf": null,
+          "policyViolation": null,
+          "eventDetail": null,
+          "from": {
+            "application": null,
+            "device": null,
+            "user": {
+              "@odata.type": "#microsoft.graph.teamworkUserIdentity",
+              "id": "11111-2222-3333",
+              "displayName": "My Name",
+              "userIdentityType": "aadUser",
+              "tenantId": "tenantId-111-222-333"
+            }
+          },
+          "body": {
+            "contentType": "html",
+            "content": "<div>I added a tab at the top of this channel. Check it out!</div><attachment id=\"tab::f22a0494-6f7c-4512-85c5-e4ce72ce142a\"></attachment>"
+          },
+          "channelIdentity": {
+            "teamId": "1111-2222-3333",
+            "channelId": "42:aaabbbccc.tacv2"
+          },
+          "attachments": [
+            {
+              "id": "tab::f22a0494-6f7c-4512-85c5-e4ce72ce142a",
+              "contentType": "tabReference",
+              "contentUrl": null,
+              "content": null,
+              "name": "Tasks",
+              "thumbnailUrl": null,
+              "teamsAppId": null
+            }
+          ],
+          "mentions": [],
+          "reactions": []
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Microsoft Teams",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Microsoft Teams": {
+      "main": [
+        [
+          {
+            "node": "No Operation, do nothing",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "d89de79a-1819-4d29-b781-a1f3f00b4a2e",
+  "id": "i3NYGF0LXV4qDFV9",
+  "meta": {
+    "instanceId": "b888bd11cd1ddbb95450babf3e199556799d999b896f650de768b8370ee50363"
+  },
+  "tags": []
+}
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
new file mode 100644
index 0000000000000..5fac7c0d662df
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/create.test.ts
@@ -0,0 +1,91 @@
+import type { INodeTypes } from 'n8n-workflow';
+import nock from 'nock';
+import * as transport from '../../../../v2/transport';
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+const microsoftApiRequestSpy = jest.spyOn(transport, 'microsoftApiRequest');
+
+microsoftApiRequestSpy.mockImplementation(async (method: string) => {
+	if (method === 'POST') {
+		return {
+			'@odata.context':
+				"https://graph.microsoft.com/v1.0/$metadata#chats('19%3Aebed9ad42c904d6c83adf0db360053ec%40thread.v2')/messages/$entity",
+			id: '1698378560692',
+			replyToId: null,
+			etag: '1698378560692',
+			messageType: 'message',
+			createdDateTime: '2023-10-27T03:49:20.692Z',
+			lastModifiedDateTime: '2023-10-27T03:49:20.692Z',
+			lastEditedDateTime: null,
+			deletedDateTime: null,
+			subject: null,
+			summary: null,
+			chatId: '19:ebed9ad42c904d6c83adf0db360053ec@thread.v2',
+			importance: 'normal',
+			locale: 'en-us',
+			webUrl: null,
+			channelIdentity: null,
+			policyViolation: null,
+			eventDetail: null,
+			from: {
+				application: null,
+				device: null,
+				user: {
+					'@odata.type': '#microsoft.graph.teamworkUserIdentity',
+					id: '11111-2222-3333',
+					displayName: 'Michael Kret',
+					userIdentityType: 'aadUser',
+				},
+			},
+			body: {
+				contentType: 'html',
+				content:
+					'Hello!<br>\n<br>\n<em> Powered by <a href="http://localhost:5678/workflow/i3NYGF0LXV4qDFV9?utm_source=n8n-internal&amp;utm_medium=powered_by&amp;utm_campaign=n8n-nodes-base.microsoftTeams_b888bd11cd1ddbb95450babf3e199556799d999b896f650de768b8370ee50363">this n8n workflow</a> </em>',
+			},
+			attachments: [],
+			mentions: [],
+			reactions: [],
+		};
+	}
+});
+
+describe('Test MicrosoftTeamsV2, chatMessage => create', () => {
+	const workflows = ['nodes/Microsoft/Teams/test/v2/node/chatMessage/create.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.resetAllMocks();
+	});
+
+	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(microsoftApiRequestSpy).toHaveBeenCalledTimes(1);
+		expect(microsoftApiRequestSpy).toHaveBeenCalledWith(
+			'POST',
+			'/v1.0/chats/19:ebed9ad42c904d6c83adf0db360053ec@thread.v2/messages',
+			expect.anything(),
+		);
+
+		expect(result.finished).toEqual(true);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/create.workflow.json b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/create.workflow.json
new file mode 100644
index 0000000000000..9398def87f089
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/create.workflow.json
@@ -0,0 +1,134 @@
+{
+  "name": "My workflow 35",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "6666-9999-77777",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        880,
+        380
+      ]
+    },
+    {
+      "parameters": {
+        "resource": "chatMessage",
+        "chatId": {
+          "__rl": true,
+          "value": "19:ebed9ad42c904d6c83adf0db360053ec@thread.v2",
+          "mode": "list",
+          "cachedResultName": "Grady Archie, Adele Vance, Henrietta Mueller, Patti Fernandez, Diego Siciliani, Michael Kret (group)",
+          "cachedResultUrl": "https://teams.microsoft.com/l/chat/19%3Aebed9ad42c904d6c83adf0db360053ec%40thread.v2/0?tenantId=23786ca6-7ff2-4672-87d0-5c649ee0a337"
+        },
+        "message": "Hello!",
+        "options": {
+          "includeLinkToWorkflow": true
+        }
+      },
+      "id": "6666-5555-77777",
+      "name": "Microsoft Teams",
+      "type": "n8n-nodes-base.microsoftTeams",
+      "typeVersion": 2,
+      "position": [
+        1100,
+        380
+      ],
+      "credentials": {
+        "microsoftTeamsOAuth2Api": {
+          "id": "6isd5ytvA0qV78eK",
+          "name": "Microsoft Teams account"
+        }
+      }
+    },
+    {
+      "parameters": {},
+      "id": "9d1a2e59-c71c-486c-b3ac-dec6adbc26b3",
+      "name": "No Operation, do nothing",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        1400,
+        380
+      ]
+    }
+  ],
+  "pinData": {
+    "No Operation, do nothing": [
+      {
+        "json": {
+          "@odata.context": "https://graph.microsoft.com/v1.0/$metadata#chats('19%3Aebed9ad42c904d6c83adf0db360053ec%40thread.v2')/messages/$entity",
+          "id": "1698378560692",
+          "replyToId": null,
+          "etag": "1698378560692",
+          "messageType": "message",
+          "createdDateTime": "2023-10-27T03:49:20.692Z",
+          "lastModifiedDateTime": "2023-10-27T03:49:20.692Z",
+          "lastEditedDateTime": null,
+          "deletedDateTime": null,
+          "subject": null,
+          "summary": null,
+          "chatId": "19:ebed9ad42c904d6c83adf0db360053ec@thread.v2",
+          "importance": "normal",
+          "locale": "en-us",
+          "webUrl": null,
+          "channelIdentity": null,
+          "policyViolation": null,
+          "eventDetail": null,
+          "from": {
+            "application": null,
+            "device": null,
+            "user": {
+              "@odata.type": "#microsoft.graph.teamworkUserIdentity",
+              "id": "11111-2222-3333",
+              "displayName": "Michael Kret",
+              "userIdentityType": "aadUser"
+            }
+          },
+          "body": {
+            "contentType": "html",
+            "content": "Hello!<br>\n<br>\n<em> Powered by <a href=\"http://localhost:5678/workflow/i3NYGF0LXV4qDFV9?utm_source=n8n-internal&amp;utm_medium=powered_by&amp;utm_campaign=n8n-nodes-base.microsoftTeams_b888bd11cd1ddbb95450babf3e199556799d999b896f650de768b8370ee50363\">this n8n workflow</a> </em>"
+          },
+          "attachments": [],
+          "mentions": [],
+          "reactions": []
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Microsoft Teams",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Microsoft Teams": {
+      "main": [
+        [
+          {
+            "node": "No Operation, do nothing",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "4b3813fc-dee5-4560-becc-9e2c7fe881d6",
+  "id": "i3NYGF0LXV4qDFV9",
+  "meta": {
+    "instanceId": "b888bd11cd1ddbb95450babf3e199556799d999b896f650de768b8370ee50363"
+  },
+  "tags": []
+}
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
new file mode 100644
index 0000000000000..8f9d2a660f90e
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/get.test.ts
@@ -0,0 +1,91 @@
+import type { INodeTypes } from 'n8n-workflow';
+import nock from 'nock';
+import * as transport from '../../../../v2/transport';
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+const microsoftApiRequestSpy = jest.spyOn(transport, 'microsoftApiRequest');
+
+microsoftApiRequestSpy.mockImplementation(async (method: string) => {
+	if (method === 'GET') {
+		return {
+			'@odata.context':
+				"https://graph.microsoft.com/v1.0/$metadata#chats('19%3Aebed9ad42c904d6c83adf0db360053ec%40thread.v2')/messages/$entity",
+			id: '1698378560692',
+			replyToId: null,
+			etag: '1698378560692',
+			messageType: 'message',
+			createdDateTime: '2023-10-27T03:49:20.692Z',
+			lastModifiedDateTime: '2023-10-27T03:49:20.692Z',
+			lastEditedDateTime: null,
+			deletedDateTime: null,
+			subject: null,
+			summary: null,
+			chatId: '19:ebed9ad42c904d6c83adf0db360053ec@thread.v2',
+			importance: 'normal',
+			locale: 'en-us',
+			webUrl: null,
+			channelIdentity: null,
+			policyViolation: null,
+			eventDetail: null,
+			from: {
+				application: null,
+				device: null,
+				user: {
+					'@odata.type': '#microsoft.graph.teamworkUserIdentity',
+					id: '11111-2222-3333',
+					displayName: 'Michael Kret',
+					userIdentityType: 'aadUser',
+					tenantId: '23786ca6-7ff2-4672-87d0-5c649ee0a337',
+				},
+			},
+			body: {
+				contentType: 'html',
+				content:
+					'Hello!<br>\n<br>\n<em> Powered by <a href="http://localhost:5678/workflow/i3NYGF0LXV4qDFV9?utm_source=n8n-internal&amp;utm_medium=powered_by&amp;utm_campaign=n8n-nodes-base.microsoftTeams_b888bd11cd1ddbb95450babf3e199556799d999b896f650de768b8370ee50363">this n8n workflow</a> </em>',
+			},
+			attachments: [],
+			mentions: [],
+			reactions: [],
+		};
+	}
+});
+
+describe('Test MicrosoftTeamsV2, chatMessage => get', () => {
+	const workflows = ['nodes/Microsoft/Teams/test/v2/node/chatMessage/get.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.resetAllMocks();
+	});
+
+	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(microsoftApiRequestSpy).toHaveBeenCalledTimes(1);
+		expect(microsoftApiRequestSpy).toHaveBeenCalledWith(
+			'GET',
+			'/v1.0/chats/19:ebed9ad42c904d6c83adf0db360053ec@thread.v2/messages/1698378560692',
+		);
+
+		expect(result.finished).toEqual(true);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/get.workflow.json b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/get.workflow.json
new file mode 100644
index 0000000000000..7c37bcdcb994c
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/get.workflow.json
@@ -0,0 +1,133 @@
+{
+  "name": "My workflow 35",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "6666-9999-77777",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        880,
+        380
+      ]
+    },
+    {
+      "parameters": {
+        "resource": "chatMessage",
+        "operation": "get",
+        "chatId": {
+          "__rl": true,
+          "value": "19:ebed9ad42c904d6c83adf0db360053ec@thread.v2",
+          "mode": "list",
+          "cachedResultName": "Grady Archie, Adele Vance, Henrietta Mueller, Patti Fernandez, Diego Siciliani, Michael Kret (group)",
+          "cachedResultUrl": "https://teams.microsoft.com/l/chat/19%3Aebed9ad42c904d6c83adf0db360053ec%40thread.v2/0?tenantId=23786ca6-7ff2-4672-87d0-5c649ee0a337"
+        },
+        "messageId": "1698378560692"
+      },
+      "id": "6666-5555-77777",
+      "name": "Microsoft Teams",
+      "type": "n8n-nodes-base.microsoftTeams",
+      "typeVersion": 2,
+      "position": [
+        1100,
+        380
+      ],
+      "credentials": {
+        "microsoftTeamsOAuth2Api": {
+          "id": "6isd5ytvA0qV78eK",
+          "name": "Microsoft Teams account"
+        }
+      }
+    },
+    {
+      "parameters": {},
+      "id": "9d1a2e59-c71c-486c-b3ac-dec6adbc26b3",
+      "name": "No Operation, do nothing",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        1400,
+        380
+      ]
+    }
+  ],
+  "pinData": {
+    "No Operation, do nothing": [
+      {
+        "json": {
+          "@odata.context": "https://graph.microsoft.com/v1.0/$metadata#chats('19%3Aebed9ad42c904d6c83adf0db360053ec%40thread.v2')/messages/$entity",
+          "id": "1698378560692",
+          "replyToId": null,
+          "etag": "1698378560692",
+          "messageType": "message",
+          "createdDateTime": "2023-10-27T03:49:20.692Z",
+          "lastModifiedDateTime": "2023-10-27T03:49:20.692Z",
+          "lastEditedDateTime": null,
+          "deletedDateTime": null,
+          "subject": null,
+          "summary": null,
+          "chatId": "19:ebed9ad42c904d6c83adf0db360053ec@thread.v2",
+          "importance": "normal",
+          "locale": "en-us",
+          "webUrl": null,
+          "channelIdentity": null,
+          "policyViolation": null,
+          "eventDetail": null,
+          "from": {
+            "application": null,
+            "device": null,
+            "user": {
+              "@odata.type": "#microsoft.graph.teamworkUserIdentity",
+              "id": "11111-2222-3333",
+              "displayName": "Michael Kret",
+              "userIdentityType": "aadUser",
+              "tenantId": "23786ca6-7ff2-4672-87d0-5c649ee0a337"
+            }
+          },
+          "body": {
+            "contentType": "html",
+            "content": "Hello!<br>\n<br>\n<em> Powered by <a href=\"http://localhost:5678/workflow/i3NYGF0LXV4qDFV9?utm_source=n8n-internal&amp;utm_medium=powered_by&amp;utm_campaign=n8n-nodes-base.microsoftTeams_b888bd11cd1ddbb95450babf3e199556799d999b896f650de768b8370ee50363\">this n8n workflow</a> </em>"
+          },
+          "attachments": [],
+          "mentions": [],
+          "reactions": []
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Microsoft Teams",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Microsoft Teams": {
+      "main": [
+        [
+          {
+            "node": "No Operation, do nothing",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "4de0815e-b1b7-463a-a627-c55ac71b70e4",
+  "id": "i3NYGF0LXV4qDFV9",
+  "meta": {
+    "instanceId": "b888bd11cd1ddbb95450babf3e199556799d999b896f650de768b8370ee50363"
+  },
+  "tags": []
+}
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
new file mode 100644
index 0000000000000..a4c89a077723c
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/getAll.test.ts
@@ -0,0 +1,131 @@
+import type { INodeTypes } from 'n8n-workflow';
+import nock from 'nock';
+import * as transport from '../../../../v2/transport';
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+const microsoftApiRequestSpy = jest.spyOn(transport, 'microsoftApiRequestAllItems');
+
+microsoftApiRequestSpy.mockImplementation(async (_, method: string) => {
+	if (method === 'GET') {
+		return [
+			{
+				id: '1698378560692',
+				replyToId: null,
+				etag: '1698378560692',
+				messageType: 'message',
+				createdDateTime: '2023-10-27T03:49:20.692Z',
+				lastModifiedDateTime: '2023-10-27T03:49:20.692Z',
+				lastEditedDateTime: null,
+				deletedDateTime: null,
+				subject: null,
+				summary: null,
+				chatId: '19:ebed9ad42c904d6c83adf0db360053ec@thread.v2',
+				importance: 'normal',
+				locale: 'en-us',
+				webUrl: null,
+				channelIdentity: null,
+				policyViolation: null,
+				eventDetail: null,
+				from: {
+					application: null,
+					device: null,
+					user: {
+						'@odata.type': '#microsoft.graph.teamworkUserIdentity',
+						id: '11111-2222-3333',
+						displayName: 'Michael Kret',
+						userIdentityType: 'aadUser',
+						tenantId: '23786ca6-7ff2-4672-87d0-5c649ee0a337',
+					},
+				},
+				body: {
+					contentType: 'html',
+					content:
+						'Hello!<br>\n<br>\n<em> Powered by <a href="http://localhost:5678/workflow/i3NYGF0LXV4qDFV9?utm_source=n8n-internal&amp;utm_medium=powered_by&amp;utm_campaign=n8n-nodes-base.microsoftTeams_b888bd11cd1ddbb95450babf3e199556799d999b896f650de768b8370ee50363">this n8n workflow</a> </em>',
+				},
+				attachments: [],
+				mentions: [],
+				reactions: [],
+			},
+			{
+				id: '1698129297101',
+				replyToId: null,
+				etag: '1698129297101',
+				messageType: 'message',
+				createdDateTime: '2023-10-24T06:34:57.101Z',
+				lastModifiedDateTime: '2023-10-24T06:34:57.101Z',
+				lastEditedDateTime: null,
+				deletedDateTime: null,
+				subject: null,
+				summary: null,
+				chatId: '19:ebed9ad42c904d6c83adf0db360053ec@thread.v2',
+				importance: 'normal',
+				locale: 'en-us',
+				webUrl: null,
+				channelIdentity: null,
+				policyViolation: null,
+				eventDetail: null,
+				from: {
+					application: null,
+					device: null,
+					user: {
+						'@odata.type': '#microsoft.graph.teamworkUserIdentity',
+						id: '11111-2222-3333',
+						displayName: 'Michael Kret',
+						userIdentityType: 'aadUser',
+						tenantId: '23786ca6-7ff2-4672-87d0-5c649ee0a337',
+					},
+				},
+				body: {
+					contentType: 'html',
+					content:
+						'tada<br>\n<br>\n<em> Powered by <a href="http://localhost:5678/workflow/5sTm8tp3j3niFewr?utm_source=n8n-internal&amp;utm_medium=powered_by&amp;utm_campaign=n8n-nodes-base.microsoftTeams_b888bd11cd1ddbb95450babf3e199556799d999b896f650de768b8370ee50363">this n8n workflow</a> </em>',
+				},
+				attachments: [],
+				mentions: [],
+				reactions: [],
+			},
+		];
+	}
+});
+
+describe('Test MicrosoftTeamsV2, chatMessage => getAll', () => {
+	const workflows = ['nodes/Microsoft/Teams/test/v2/node/chatMessage/getAll.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.resetAllMocks();
+	});
+
+	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(microsoftApiRequestSpy).toHaveBeenCalledTimes(1);
+		expect(microsoftApiRequestSpy).toHaveBeenCalledWith(
+			'value',
+			'GET',
+			'/v1.0/chats/19:ebed9ad42c904d6c83adf0db360053ec@thread.v2/messages',
+			{},
+		);
+
+		expect(result.finished).toEqual(true);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/getAll.workflow.json b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/getAll.workflow.json
new file mode 100644
index 0000000000000..a995cae609bcc
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/getAll.workflow.json
@@ -0,0 +1,171 @@
+{
+  "name": "My workflow 35",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "6666-9999-77777",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        880,
+        380
+      ]
+    },
+    {
+      "parameters": {
+        "resource": "chatMessage",
+        "operation": "getAll",
+        "chatId": {
+          "__rl": true,
+          "value": "19:ebed9ad42c904d6c83adf0db360053ec@thread.v2",
+          "mode": "list",
+          "cachedResultName": "Grady Archie, Adele Vance, Henrietta Mueller, Patti Fernandez, Diego Siciliani, Michael Kret (group)",
+          "cachedResultUrl": "https://teams.microsoft.com/l/chat/19%3Aebed9ad42c904d6c83adf0db360053ec%40thread.v2/0?tenantId=23786ca6-7ff2-4672-87d0-5c649ee0a337"
+        },
+        "limit": 2
+      },
+      "id": "6666-5555-77777",
+      "name": "Microsoft Teams",
+      "type": "n8n-nodes-base.microsoftTeams",
+      "typeVersion": 2,
+      "position": [
+        1100,
+        380
+      ],
+      "credentials": {
+        "microsoftTeamsOAuth2Api": {
+          "id": "6isd5ytvA0qV78eK",
+          "name": "Microsoft Teams account"
+        }
+      }
+    },
+    {
+      "parameters": {},
+      "id": "9d1a2e59-c71c-486c-b3ac-dec6adbc26b3",
+      "name": "No Operation, do nothing",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        1400,
+        380
+      ]
+    }
+  ],
+  "pinData": {
+    "No Operation, do nothing": [
+      {
+        "json": {
+          "id": "1698378560692",
+          "replyToId": null,
+          "etag": "1698378560692",
+          "messageType": "message",
+          "createdDateTime": "2023-10-27T03:49:20.692Z",
+          "lastModifiedDateTime": "2023-10-27T03:49:20.692Z",
+          "lastEditedDateTime": null,
+          "deletedDateTime": null,
+          "subject": null,
+          "summary": null,
+          "chatId": "19:ebed9ad42c904d6c83adf0db360053ec@thread.v2",
+          "importance": "normal",
+          "locale": "en-us",
+          "webUrl": null,
+          "channelIdentity": null,
+          "policyViolation": null,
+          "eventDetail": null,
+          "from": {
+            "application": null,
+            "device": null,
+            "user": {
+              "@odata.type": "#microsoft.graph.teamworkUserIdentity",
+              "id": "11111-2222-3333",
+              "displayName": "Michael Kret",
+              "userIdentityType": "aadUser",
+              "tenantId": "23786ca6-7ff2-4672-87d0-5c649ee0a337"
+            }
+          },
+          "body": {
+            "contentType": "html",
+            "content": "Hello!<br>\n<br>\n<em> Powered by <a href=\"http://localhost:5678/workflow/i3NYGF0LXV4qDFV9?utm_source=n8n-internal&amp;utm_medium=powered_by&amp;utm_campaign=n8n-nodes-base.microsoftTeams_b888bd11cd1ddbb95450babf3e199556799d999b896f650de768b8370ee50363\">this n8n workflow</a> </em>"
+          },
+          "attachments": [],
+          "mentions": [],
+          "reactions": []
+        }
+      },
+      {
+        "json": {
+          "id": "1698129297101",
+          "replyToId": null,
+          "etag": "1698129297101",
+          "messageType": "message",
+          "createdDateTime": "2023-10-24T06:34:57.101Z",
+          "lastModifiedDateTime": "2023-10-24T06:34:57.101Z",
+          "lastEditedDateTime": null,
+          "deletedDateTime": null,
+          "subject": null,
+          "summary": null,
+          "chatId": "19:ebed9ad42c904d6c83adf0db360053ec@thread.v2",
+          "importance": "normal",
+          "locale": "en-us",
+          "webUrl": null,
+          "channelIdentity": null,
+          "policyViolation": null,
+          "eventDetail": null,
+          "from": {
+            "application": null,
+            "device": null,
+            "user": {
+              "@odata.type": "#microsoft.graph.teamworkUserIdentity",
+              "id": "11111-2222-3333",
+              "displayName": "Michael Kret",
+              "userIdentityType": "aadUser",
+              "tenantId": "23786ca6-7ff2-4672-87d0-5c649ee0a337"
+            }
+          },
+          "body": {
+            "contentType": "html",
+            "content": "tada<br>\n<br>\n<em> Powered by <a href=\"http://localhost:5678/workflow/5sTm8tp3j3niFewr?utm_source=n8n-internal&amp;utm_medium=powered_by&amp;utm_campaign=n8n-nodes-base.microsoftTeams_b888bd11cd1ddbb95450babf3e199556799d999b896f650de768b8370ee50363\">this n8n workflow</a> </em>"
+          },
+          "attachments": [],
+          "mentions": [],
+          "reactions": []
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Microsoft Teams",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Microsoft Teams": {
+      "main": [
+        [
+          {
+            "node": "No Operation, do nothing",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "324b8a88-47a1-453e-906f-79f9be836e17",
+  "id": "i3NYGF0LXV4qDFV9",
+  "meta": {
+    "instanceId": "b888bd11cd1ddbb95450babf3e199556799d999b896f650de768b8370ee50363"
+  },
+  "tags": []
+}
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
new file mode 100644
index 0000000000000..2ee3a02f19b32
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/create.test.ts
@@ -0,0 +1,111 @@
+import type { INodeTypes } from 'n8n-workflow';
+import nock from 'nock';
+import * as transport from '../../../../v2/transport';
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+const microsoftApiRequestSpy = jest.spyOn(transport, 'microsoftApiRequest');
+
+microsoftApiRequestSpy.mockImplementation(async (method: string) => {
+	if (method === 'POST') {
+		return {
+			'@odata.context': 'https://graph.microsoft.com/v1.0/$metadata#planner/tasks/$entity',
+			'@odata.etag': 'W/"JzEtVGFzayAgQEBAQEBAQEBAQEBAQEBARCc="',
+			planId: 'THwgIivuyU26ki8qS7ufcJgAB6zf',
+			bucketId: 'CO-ZsX1s4kO7FtO6ZHZdDpgAFL1m',
+			title: 'do this',
+			orderHint: '8584964728139267910',
+			assigneePriority: '',
+			percentComplete: 25,
+			startDateTime: null,
+			createdDateTime: '2024-01-13T08:21:11.5507897Z',
+			dueDateTime: '2023-10-30T22:00:00Z',
+			hasDescription: false,
+			previewType: 'automatic',
+			completedDateTime: null,
+			completedBy: null,
+			referenceCount: 0,
+			checklistItemCount: 0,
+			activeChecklistItemCount: 0,
+			conversationThreadId: null,
+			priority: 5,
+			id: 'mYxTKaD9VkqWaBCJE5v4E5gAHcPB',
+			createdBy: {
+				user: {
+					displayName: null,
+					id: 'b834447b-6848-4af9-8390-d2259ce46b74',
+				},
+				application: {
+					displayName: null,
+					id: '66bdd989-4a29-465d-86fb-d94ed8fd86ed',
+				},
+			},
+			appliedCategories: {},
+			assignments: {
+				'ba4a422e-bdce-4795-b4b6-579287363f0e': {
+					'@odata.type': '#microsoft.graph.plannerAssignment',
+					assignedDateTime: '2024-01-13T08:21:11.5507897Z',
+					orderHint: '8584964728740986700PZ',
+					assignedBy: {
+						user: {
+							displayName: null,
+							id: 'b834447b-6848-4af9-8390-d2259ce46b74',
+						},
+						application: {
+							displayName: null,
+							id: '66bdd989-4a29-465d-86fb-d94ed8fd86ed',
+						},
+					},
+				},
+			},
+		};
+	}
+});
+
+describe('Test MicrosoftTeamsV2, task => create', () => {
+	const workflows = ['nodes/Microsoft/Teams/test/v2/node/task/create.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.resetAllMocks();
+	});
+
+	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(microsoftApiRequestSpy).toHaveBeenCalledTimes(1);
+		expect(microsoftApiRequestSpy).toHaveBeenCalledWith('POST', '/v1.0/planner/tasks', {
+			assignments: {
+				'ba4a422e-bdce-4795-b4b6-579287363f0e': {
+					'@odata.type': 'microsoft.graph.plannerAssignment',
+					orderHint: ' !',
+				},
+			},
+			bucketId: 'CO-ZsX1s4kO7FtO6ZHZdDpgAFL1m',
+			dueDateTime: '2023-10-30T22:00:00.000Z',
+			percentComplete: 25,
+			planId: 'THwgIivuyU26ki8qS7ufcJgAB6zf',
+			title: 'do this',
+		});
+
+		expect(result.finished).toEqual(true);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/create.workflow.json b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/create.workflow.json
new file mode 100644
index 0000000000000..5653628858f8a
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/create.workflow.json
@@ -0,0 +1,167 @@
+{
+  "name": "My workflow 69",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "28f1f78e-0d50-4bfe-aa16-1a53f0832793",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        520,
+        300
+      ]
+    },
+    {
+      "parameters": {
+        "resource": "task",
+        "groupId": {
+          "__rl": true,
+          "value": "1644e7fe-547e-4223-a24f-922395865343",
+          "mode": "list",
+          "cachedResultName": "5w1hb7"
+        },
+        "planId": {
+          "__rl": true,
+          "value": "THwgIivuyU26ki8qS7ufcJgAB6zf",
+          "mode": "list",
+          "cachedResultName": "my best plan"
+        },
+        "bucketId": {
+          "__rl": true,
+          "value": "CO-ZsX1s4kO7FtO6ZHZdDpgAFL1m",
+          "mode": "list",
+          "cachedResultName": "To do"
+        },
+        "title": "do this",
+        "options": {
+          "assignedTo": {
+            "__rl": true,
+            "value": "ba4a422e-bdce-4795-b4b6-579287363f0e",
+            "mode": "list",
+            "cachedResultName": "Henrietta Mueller"
+          },
+          "dueDateTime": "2023-10-30T22:00:00.000Z",
+          "percentComplete": 25
+        }
+      },
+      "id": "e1c2eafd-4a1e-48aa-bc0e-d5a03644fedc",
+      "name": "Microsoft Teams",
+      "type": "n8n-nodes-base.microsoftTeams",
+      "typeVersion": 2,
+      "position": [
+        740,
+        300
+      ],
+      "credentials": {
+        "microsoftTeamsOAuth2Api": {
+          "id": "6isd5ytvA0qV78eK",
+          "name": "Microsoft Teams account"
+        }
+      }
+    },
+    {
+      "parameters": {},
+      "id": "a05a3079-3431-44b8-a317-79e5d8babe25",
+      "name": "No Operation, do nothing",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        1040,
+        300
+      ]
+    }
+  ],
+  "pinData": {
+    "No Operation, do nothing": [
+      {
+        "json": {
+          "@odata.context": "https://graph.microsoft.com/v1.0/$metadata#planner/tasks/$entity",
+          "@odata.etag": "W/\"JzEtVGFzayAgQEBAQEBAQEBAQEBAQEBARCc=\"",
+          "planId": "THwgIivuyU26ki8qS7ufcJgAB6zf",
+          "bucketId": "CO-ZsX1s4kO7FtO6ZHZdDpgAFL1m",
+          "title": "do this",
+          "orderHint": "8584964728139267910",
+          "assigneePriority": "",
+          "percentComplete": 25,
+          "startDateTime": null,
+          "createdDateTime": "2024-01-13T08:21:11.5507897Z",
+          "dueDateTime": "2023-10-30T22:00:00Z",
+          "hasDescription": false,
+          "previewType": "automatic",
+          "completedDateTime": null,
+          "completedBy": null,
+          "referenceCount": 0,
+          "checklistItemCount": 0,
+          "activeChecklistItemCount": 0,
+          "conversationThreadId": null,
+          "priority": 5,
+          "id": "mYxTKaD9VkqWaBCJE5v4E5gAHcPB",
+          "createdBy": {
+            "user": {
+              "displayName": null,
+              "id": "b834447b-6848-4af9-8390-d2259ce46b74"
+            },
+            "application": {
+              "displayName": null,
+              "id": "66bdd989-4a29-465d-86fb-d94ed8fd86ed"
+            }
+          },
+          "appliedCategories": {},
+          "assignments": {
+            "ba4a422e-bdce-4795-b4b6-579287363f0e": {
+              "@odata.type": "#microsoft.graph.plannerAssignment",
+              "assignedDateTime": "2024-01-13T08:21:11.5507897Z",
+              "orderHint": "8584964728740986700PZ",
+              "assignedBy": {
+                "user": {
+                  "displayName": null,
+                  "id": "b834447b-6848-4af9-8390-d2259ce46b74"
+                },
+                "application": {
+                  "displayName": null,
+                  "id": "66bdd989-4a29-465d-86fb-d94ed8fd86ed"
+                }
+              }
+            }
+          }
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Microsoft Teams",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Microsoft Teams": {
+      "main": [
+        [
+          {
+            "node": "No Operation, do nothing",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "8cb42e14-a12c-4c24-8374-4105664065c3",
+  "meta": {
+    "templateCredsSetupCompleted": true,
+    "instanceId": "b888bd11cd1ddbb95450babf3e199556799d999b896f650de768b8370ee50363"
+  },
+  "id": "73ZPNCHsvTvFBx1V",
+  "tags": []
+}
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
new file mode 100644
index 0000000000000..f991d916978ff
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/deleteTask.test.ts
@@ -0,0 +1,65 @@
+import type { INodeTypes } from 'n8n-workflow';
+import nock from 'nock';
+import * as transport from '../../../../v2/transport';
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+const microsoftApiRequestSpy = jest.spyOn(transport, 'microsoftApiRequest');
+
+microsoftApiRequestSpy.mockImplementation(async (method: string) => {
+	if (method === 'DELETE') {
+		return {};
+	}
+	if (method === 'GET') {
+		return {
+			'@odata.etag': 'W/"JzEtVGFzayAgQEBAQEBAQEBAQEBAQEBARCc="',
+		};
+	}
+});
+
+describe('Test MicrosoftTeamsV2, task => deleteTask', () => {
+	const workflows = ['nodes/Microsoft/Teams/test/v2/node/task/deleteTask.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.resetAllMocks();
+	});
+
+	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(microsoftApiRequestSpy).toHaveBeenCalledTimes(2);
+		expect(microsoftApiRequestSpy).toHaveBeenCalledWith(
+			'GET',
+			'/v1.0/planner/tasks/lDrRJ7N_-06p_26iKBtJ6ZgAKffD',
+		);
+		expect(microsoftApiRequestSpy).toHaveBeenCalledWith(
+			'DELETE',
+			'/v1.0/planner/tasks/lDrRJ7N_-06p_26iKBtJ6ZgAKffD',
+			{},
+			{},
+			undefined,
+			{ 'If-Match': 'W/"JzEtVGFzayAgQEBAQEBAQEBAQEBAQEBARCc="' },
+		);
+
+		expect(result.finished).toEqual(true);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/deleteTask.workflow.json b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/deleteTask.workflow.json
new file mode 100644
index 0000000000000..084ae196e0da7
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/deleteTask.workflow.json
@@ -0,0 +1,91 @@
+{
+  "name": "My workflow 35",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "6666-9999-77777",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        880,
+        380
+      ]
+    },
+    {
+      "parameters": {
+        "resource": "task",
+        "operation": "deleteTask",
+        "taskId": "lDrRJ7N_-06p_26iKBtJ6ZgAKffD"
+      },
+      "id": "6666-5555-77777",
+      "name": "Microsoft Teams",
+      "type": "n8n-nodes-base.microsoftTeams",
+      "typeVersion": 2,
+      "position": [
+        1100,
+        380
+      ],
+      "credentials": {
+        "microsoftTeamsOAuth2Api": {
+          "id": "6isd5ytvA0qV78eK",
+          "name": "Microsoft Teams account"
+        }
+      }
+    },
+    {
+      "parameters": {},
+      "id": "9d1a2e59-c71c-486c-b3ac-dec6adbc26b3",
+      "name": "No Operation, do nothing",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        1400,
+        380
+      ]
+    }
+  ],
+  "pinData": {
+    "No Operation, do nothing": [
+      {
+        "json": {
+          "success": true
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Microsoft Teams",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Microsoft Teams": {
+      "main": [
+        [
+          {
+            "node": "No Operation, do nothing",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "ae5ed0d2-4513-457a-80a4-262126523553",
+  "id": "i3NYGF0LXV4qDFV9",
+  "meta": {
+    "instanceId": "b888bd11cd1ddbb95450babf3e199556799d999b896f650de768b8370ee50363"
+  },
+  "tags": []
+}
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
new file mode 100644
index 0000000000000..7d768ee2aef39
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/get.test.ts
@@ -0,0 +1,102 @@
+import type { INodeTypes } from 'n8n-workflow';
+import nock from 'nock';
+import * as transport from '../../../../v2/transport';
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+const microsoftApiRequestSpy = jest.spyOn(transport, 'microsoftApiRequest');
+
+microsoftApiRequestSpy.mockImplementation(async (method: string) => {
+	if (method === 'GET') {
+		return {
+			'@odata.context': 'https://graph.microsoft.com/v1.0/$metadata#planner/tasks/$entity',
+			'@odata.etag': 'W/"JzEtVGFzayAgQEBAQEBAQEBAQEBAQEBARCc="',
+			planId: 'THwgIivuyU26ki8qS7ufcJgAB6zf',
+			bucketId: 'CO-ZsX1s4kO7FtO6ZHZdDpgAFL1m',
+			title: 'do this',
+			orderHint: '8585032308935758184',
+			assigneePriority: '',
+			percentComplete: 25,
+			startDateTime: null,
+			createdDateTime: '2023-10-27T03:06:31.9017623Z',
+			dueDateTime: '2023-10-30T22:00:00Z',
+			hasDescription: false,
+			previewType: 'automatic',
+			completedDateTime: null,
+			completedBy: null,
+			referenceCount: 0,
+			checklistItemCount: 0,
+			activeChecklistItemCount: 0,
+			conversationThreadId: null,
+			priority: 5,
+			id: 'lDrRJ7N_-06p_26iKBtJ6ZgAKffD',
+			createdBy: {
+				user: {
+					displayName: null,
+					id: '11111-2222-3333',
+				},
+				application: {
+					displayName: null,
+					id: '11111-2222-3333-44444',
+				},
+			},
+			appliedCategories: {},
+			assignments: {
+				'ba4a422e-bdce-4795-b4b6-579287363f0e': {
+					'@odata.type': '#microsoft.graph.plannerAssignment',
+					assignedDateTime: '2023-10-27T03:06:31.9017623Z',
+					orderHint: '8585032309536070726PE',
+					assignedBy: {
+						user: {
+							displayName: null,
+							id: '11111-2222-3333',
+						},
+						application: {
+							displayName: null,
+							id: '11111-2222-3333-44444',
+						},
+					},
+				},
+			},
+		};
+	}
+});
+
+describe('Test MicrosoftTeamsV2, task => get', () => {
+	const workflows = ['nodes/Microsoft/Teams/test/v2/node/task/get.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.resetAllMocks();
+	});
+
+	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(microsoftApiRequestSpy).toHaveBeenCalledTimes(1);
+		expect(microsoftApiRequestSpy).toHaveBeenCalledWith(
+			'GET',
+			'/v1.0/planner/tasks/lDrRJ7N_-06p_26iKBtJ6ZgAKffD',
+		);
+
+		expect(result.finished).toEqual(true);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/get.workflow.json b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/get.workflow.json
new file mode 100644
index 0000000000000..001b14871e83b
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/get.workflow.json
@@ -0,0 +1,139 @@
+{
+  "name": "My workflow 35",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "6666-9999-77777",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        880,
+        380
+      ]
+    },
+    {
+      "parameters": {
+        "resource": "task",
+        "operation": "get",
+        "taskId": "lDrRJ7N_-06p_26iKBtJ6ZgAKffD"
+      },
+      "id": "6666-5555-77777",
+      "name": "Microsoft Teams",
+      "type": "n8n-nodes-base.microsoftTeams",
+      "typeVersion": 2,
+      "position": [
+        1100,
+        380
+      ],
+      "credentials": {
+        "microsoftTeamsOAuth2Api": {
+          "id": "6isd5ytvA0qV78eK",
+          "name": "Microsoft Teams account"
+        }
+      }
+    },
+    {
+      "parameters": {},
+      "id": "9d1a2e59-c71c-486c-b3ac-dec6adbc26b3",
+      "name": "No Operation, do nothing",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        1400,
+        380
+      ]
+    }
+  ],
+  "pinData": {
+    "No Operation, do nothing": [
+      {
+        "json": {
+          "@odata.context": "https://graph.microsoft.com/v1.0/$metadata#planner/tasks/$entity",
+          "@odata.etag": "W/\"JzEtVGFzayAgQEBAQEBAQEBAQEBAQEBARCc=\"",
+          "planId": "THwgIivuyU26ki8qS7ufcJgAB6zf",
+          "bucketId": "CO-ZsX1s4kO7FtO6ZHZdDpgAFL1m",
+          "title": "do this",
+          "orderHint": "8585032308935758184",
+          "assigneePriority": "",
+          "percentComplete": 25,
+          "startDateTime": null,
+          "createdDateTime": "2023-10-27T03:06:31.9017623Z",
+          "dueDateTime": "2023-10-30T22:00:00Z",
+          "hasDescription": false,
+          "previewType": "automatic",
+          "completedDateTime": null,
+          "completedBy": null,
+          "referenceCount": 0,
+          "checklistItemCount": 0,
+          "activeChecklistItemCount": 0,
+          "conversationThreadId": null,
+          "priority": 5,
+          "id": "lDrRJ7N_-06p_26iKBtJ6ZgAKffD",
+          "createdBy": {
+            "user": {
+              "displayName": null,
+              "id": "11111-2222-3333"
+            },
+            "application": {
+              "displayName": null,
+              "id": "11111-2222-3333-44444"
+            }
+          },
+          "appliedCategories": {},
+          "assignments": {
+            "ba4a422e-bdce-4795-b4b6-579287363f0e": {
+              "@odata.type": "#microsoft.graph.plannerAssignment",
+              "assignedDateTime": "2023-10-27T03:06:31.9017623Z",
+              "orderHint": "8585032309536070726PE",
+              "assignedBy": {
+                "user": {
+                  "displayName": null,
+                  "id": "11111-2222-3333"
+                },
+                "application": {
+                  "displayName": null,
+                  "id": "11111-2222-3333-44444"
+                }
+              }
+            }
+          }
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Microsoft Teams",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Microsoft Teams": {
+      "main": [
+        [
+          {
+            "node": "No Operation, do nothing",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "8147cd45-b1e6-44b3-abd2-232b44102660",
+  "id": "i3NYGF0LXV4qDFV9",
+  "meta": {
+    "instanceId": "b888bd11cd1ddbb95450babf3e199556799d999b896f650de768b8370ee50363"
+  },
+  "tags": []
+}
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
new file mode 100644
index 0000000000000..0e6f63804e2c0
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/getAll.test.ts
@@ -0,0 +1,201 @@
+import type { INodeTypes } from 'n8n-workflow';
+import nock from 'nock';
+import * as transport from '../../../../v2/transport';
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+const microsoftApiRequestAllItemsSpy = jest.spyOn(transport, 'microsoftApiRequestAllItems');
+
+microsoftApiRequestAllItemsSpy.mockImplementation(async (_, method: string) => {
+	if (method === 'GET') {
+		return [
+			{
+				'@odata.etag': 'W/"JzEtVGFzayAgQEBAQEBAQEBAQEBAQEBAZCc="',
+				planId: 'coJdCqzqNUKULQtTRWDa6pgACTln',
+				bucketId: null,
+				title: 'tada',
+				orderHint: '8585516884147534440',
+				assigneePriority: '8585516882706975451',
+				percentComplete: 10,
+				startDateTime: null,
+				createdDateTime: '2022-04-14T06:41:10.7241367Z',
+				dueDateTime: '2022-04-24T21:00:00Z',
+				hasDescription: false,
+				previewType: 'automatic',
+				completedDateTime: null,
+				completedBy: null,
+				referenceCount: 0,
+				checklistItemCount: 0,
+				activeChecklistItemCount: 0,
+				conversationThreadId: null,
+				priority: 5,
+				id: '1KgwUqOmbU2C9mZWiqxiv5gAPp8Q',
+				createdBy: {
+					user: {
+						displayName: null,
+						id: '11111-2222-3333',
+					},
+				},
+				appliedCategories: {},
+				assignments: {
+					'11111-2222-3333': {
+						'@odata.type': '#microsoft.graph.plannerAssignment',
+						assignedDateTime: '2022-04-14T06:43:34.7800356Z',
+						orderHint: '8585516882406130277PO',
+						assignedBy: {
+							user: {
+								displayName: null,
+								id: '11111-2222-3333',
+							},
+						},
+					},
+				},
+			},
+			{
+				'@odata.etag': 'W/"JzEtVGFzayAgQEBAQEBAQEBAQEBAQEBAWCc="',
+				planId: 'coJdCqzqNUKULQtTRWDa6pgACTln',
+				bucketId: '2avE1BwPmEKp7Lxh0E-EmZgALF72',
+				title: '1',
+				orderHint: '8585516897613076919P1',
+				assigneePriority: '8585516890164965803',
+				percentComplete: 0,
+				startDateTime: null,
+				createdDateTime: '2022-04-14T06:19:44.2011467Z',
+				dueDateTime: null,
+				hasDescription: false,
+				previewType: 'automatic',
+				completedDateTime: null,
+				completedBy: null,
+				referenceCount: 0,
+				checklistItemCount: 0,
+				activeChecklistItemCount: 0,
+				conversationThreadId: null,
+				priority: 5,
+				id: 'J3MLUgtmJ06YJgenyujiYpgANMF1',
+				createdBy: {
+					user: {
+						displayName: null,
+						id: '11111-2222-3333',
+					},
+				},
+				appliedCategories: {},
+				assignments: {
+					'11111-2222-3333': {
+						'@odata.type': '#microsoft.graph.plannerAssignment',
+						assignedDateTime: '2022-04-14T06:31:08.9810004Z',
+						orderHint: '8585516890765590890Pw',
+						assignedBy: {
+							user: {
+								displayName: null,
+								id: '11111-2222-3333',
+							},
+						},
+					},
+				},
+			},
+			{
+				'@odata.etag': 'W/"JzEtVGFzayAgQEBAQEBAQEBAQEBAQEBAVCc="',
+				planId: 'THwgIivuyU26ki8qS7ufcJgAB6zf',
+				bucketId: 'CO-ZsX1s4kO7FtO6ZHZdDpgAFL1m',
+				title: 'td 54',
+				orderHint: '8585034751365009589',
+				assigneePriority: '8585034751365009589',
+				percentComplete: 0,
+				startDateTime: null,
+				createdDateTime: '2023-10-24T07:15:48.9766218Z',
+				dueDateTime: null,
+				hasDescription: true,
+				previewType: 'automatic',
+				completedDateTime: null,
+				completedBy: null,
+				referenceCount: 0,
+				checklistItemCount: 0,
+				activeChecklistItemCount: 0,
+				conversationThreadId: null,
+				priority: 5,
+				id: 'silreUDQskqFYfrO4EObD5gAKt_G',
+				createdBy: {
+					user: {
+						displayName: null,
+						id: '11111-2222-3333',
+					},
+					application: {
+						displayName: null,
+						id: '11111-2222-3333-44444',
+					},
+				},
+				appliedCategories: {},
+				assignments: {
+					'11111-2222-3333': {
+						'@odata.type': '#microsoft.graph.plannerAssignment',
+						assignedDateTime: '2023-10-24T07:15:48.9766218Z',
+						orderHint: '8585034751965947109Pc',
+						assignedBy: {
+							user: {
+								displayName: null,
+								id: '11111-2222-3333',
+							},
+							application: {
+								displayName: null,
+								id: '11111-2222-3333-44444',
+							},
+						},
+					},
+				},
+			},
+		];
+	}
+});
+
+const microsoftApiRequestSpy = jest.spyOn(transport, 'microsoftApiRequest');
+
+microsoftApiRequestSpy.mockImplementation(async (method: string) => {
+	if (method === 'GET') {
+		return {
+			id: '123456789',
+		};
+	}
+});
+
+describe('Test MicrosoftTeamsV2, task => getAll', () => {
+	const workflows = ['nodes/Microsoft/Teams/test/v2/node/task/getAll.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.resetAllMocks();
+	});
+
+	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(microsoftApiRequestSpy).toHaveBeenCalledTimes(1);
+		expect(microsoftApiRequestSpy).toHaveBeenCalledWith('GET', '/v1.0/me');
+
+		expect(microsoftApiRequestAllItemsSpy).toHaveBeenCalledTimes(1);
+		expect(microsoftApiRequestAllItemsSpy).toHaveBeenCalledWith(
+			'value',
+			'GET',
+			'/v1.0/users/123456789/planner/tasks',
+		);
+
+		expect(result.finished).toEqual(true);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/getAll.workflow.json b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/getAll.workflow.json
new file mode 100644
index 0000000000000..3f277f31b023b
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/getAll.workflow.json
@@ -0,0 +1,232 @@
+{
+  "name": "My workflow 35",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "6666-9999-77777",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        880,
+        380
+      ]
+    },
+    {
+      "parameters": {
+        "resource": "task",
+        "operation": "getAll",
+        "groupId": {
+          "__rl": true,
+          "value": "1644e7fe-547e-4223-a24f-922395865343",
+          "mode": "list",
+          "cachedResultName": "5w1hb7"
+        },
+        "returnAll": true
+      },
+      "id": "6666-5555-77777",
+      "name": "Microsoft Teams",
+      "type": "n8n-nodes-base.microsoftTeams",
+      "typeVersion": 2,
+      "position": [
+        1100,
+        380
+      ],
+      "credentials": {
+        "microsoftTeamsOAuth2Api": {
+          "id": "6isd5ytvA0qV78eK",
+          "name": "Microsoft Teams account"
+        }
+      }
+    },
+    {
+      "parameters": {},
+      "id": "9d1a2e59-c71c-486c-b3ac-dec6adbc26b3",
+      "name": "No Operation, do nothing",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        1400,
+        380
+      ]
+    }
+  ],
+  "pinData": {
+    "No Operation, do nothing": [
+      {
+        "json": {
+          "@odata.etag": "W/\"JzEtVGFzayAgQEBAQEBAQEBAQEBAQEBAZCc=\"",
+          "planId": "coJdCqzqNUKULQtTRWDa6pgACTln",
+          "bucketId": null,
+          "title": "tada",
+          "orderHint": "8585516884147534440",
+          "assigneePriority": "8585516882706975451",
+          "percentComplete": 10,
+          "startDateTime": null,
+          "createdDateTime": "2022-04-14T06:41:10.7241367Z",
+          "dueDateTime": "2022-04-24T21:00:00Z",
+          "hasDescription": false,
+          "previewType": "automatic",
+          "completedDateTime": null,
+          "completedBy": null,
+          "referenceCount": 0,
+          "checklistItemCount": 0,
+          "activeChecklistItemCount": 0,
+          "conversationThreadId": null,
+          "priority": 5,
+          "id": "1KgwUqOmbU2C9mZWiqxiv5gAPp8Q",
+          "createdBy": {
+            "user": {
+              "displayName": null,
+              "id": "11111-2222-3333"
+            }
+          },
+          "appliedCategories": {},
+          "assignments": {
+            "11111-2222-3333": {
+              "@odata.type": "#microsoft.graph.plannerAssignment",
+              "assignedDateTime": "2022-04-14T06:43:34.7800356Z",
+              "orderHint": "8585516882406130277PO",
+              "assignedBy": {
+                "user": {
+                  "displayName": null,
+                  "id": "11111-2222-3333"
+                }
+              }
+            }
+          }
+        }
+      },
+      {
+        "json": {
+          "@odata.etag": "W/\"JzEtVGFzayAgQEBAQEBAQEBAQEBAQEBAWCc=\"",
+          "planId": "coJdCqzqNUKULQtTRWDa6pgACTln",
+          "bucketId": "2avE1BwPmEKp7Lxh0E-EmZgALF72",
+          "title": "1",
+          "orderHint": "8585516897613076919P1",
+          "assigneePriority": "8585516890164965803",
+          "percentComplete": 0,
+          "startDateTime": null,
+          "createdDateTime": "2022-04-14T06:19:44.2011467Z",
+          "dueDateTime": null,
+          "hasDescription": false,
+          "previewType": "automatic",
+          "completedDateTime": null,
+          "completedBy": null,
+          "referenceCount": 0,
+          "checklistItemCount": 0,
+          "activeChecklistItemCount": 0,
+          "conversationThreadId": null,
+          "priority": 5,
+          "id": "J3MLUgtmJ06YJgenyujiYpgANMF1",
+          "createdBy": {
+            "user": {
+              "displayName": null,
+              "id": "11111-2222-3333"
+            }
+          },
+          "appliedCategories": {},
+          "assignments": {
+            "11111-2222-3333": {
+              "@odata.type": "#microsoft.graph.plannerAssignment",
+              "assignedDateTime": "2022-04-14T06:31:08.9810004Z",
+              "orderHint": "8585516890765590890Pw",
+              "assignedBy": {
+                "user": {
+                  "displayName": null,
+                  "id": "11111-2222-3333"
+                }
+              }
+            }
+          }
+        }
+      },
+      {
+        "json": {
+          "@odata.etag": "W/\"JzEtVGFzayAgQEBAQEBAQEBAQEBAQEBAVCc=\"",
+          "planId": "THwgIivuyU26ki8qS7ufcJgAB6zf",
+          "bucketId": "CO-ZsX1s4kO7FtO6ZHZdDpgAFL1m",
+          "title": "td 54",
+          "orderHint": "8585034751365009589",
+          "assigneePriority": "8585034751365009589",
+          "percentComplete": 0,
+          "startDateTime": null,
+          "createdDateTime": "2023-10-24T07:15:48.9766218Z",
+          "dueDateTime": null,
+          "hasDescription": true,
+          "previewType": "automatic",
+          "completedDateTime": null,
+          "completedBy": null,
+          "referenceCount": 0,
+          "checklistItemCount": 0,
+          "activeChecklistItemCount": 0,
+          "conversationThreadId": null,
+          "priority": 5,
+          "id": "silreUDQskqFYfrO4EObD5gAKt_G",
+          "createdBy": {
+            "user": {
+              "displayName": null,
+              "id": "11111-2222-3333"
+            },
+            "application": {
+              "displayName": null,
+              "id": "11111-2222-3333-44444"
+            }
+          },
+          "appliedCategories": {},
+          "assignments": {
+            "11111-2222-3333": {
+              "@odata.type": "#microsoft.graph.plannerAssignment",
+              "assignedDateTime": "2023-10-24T07:15:48.9766218Z",
+              "orderHint": "8585034751965947109Pc",
+              "assignedBy": {
+                "user": {
+                  "displayName": null,
+                  "id": "11111-2222-3333"
+                },
+                "application": {
+                  "displayName": null,
+                  "id": "11111-2222-3333-44444"
+                }
+              }
+            }
+          }
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Microsoft Teams",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Microsoft Teams": {
+      "main": [
+        [
+          {
+            "node": "No Operation, do nothing",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "34bcdc66-9dad-4c93-8456-4019f94c2f88",
+  "id": "i3NYGF0LXV4qDFV9",
+  "meta": {
+    "instanceId": "b888bd11cd1ddbb95450babf3e199556799d999b896f650de768b8370ee50363"
+  },
+  "tags": []
+}
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
new file mode 100644
index 0000000000000..3f763dd307fd5
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/update.test.ts
@@ -0,0 +1,65 @@
+import type { INodeTypes } from 'n8n-workflow';
+import nock from 'nock';
+import * as transport from '../../../../v2/transport';
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+const microsoftApiRequestSpy = jest.spyOn(transport, 'microsoftApiRequest');
+
+microsoftApiRequestSpy.mockImplementation(async (method: string) => {
+	if (method === 'PATCH') {
+		return {};
+	}
+	if (method === 'GET') {
+		return {
+			'@odata.etag': 'W/"JzEtVGFzayAgQEBAQEBAQEBAQEBAQEBARCc="',
+		};
+	}
+});
+
+describe('Test MicrosoftTeamsV2, task => update', () => {
+	const workflows = ['nodes/Microsoft/Teams/test/v2/node/task/update.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.resetAllMocks();
+	});
+
+	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(microsoftApiRequestSpy).toHaveBeenCalledTimes(2);
+		expect(microsoftApiRequestSpy).toHaveBeenCalledWith(
+			'GET',
+			'/v1.0/planner/tasks/lDrRJ7N_-06p_26iKBtJ6ZgAKffD',
+		);
+		expect(microsoftApiRequestSpy).toHaveBeenCalledWith(
+			'PATCH',
+			'/v1.0/planner/tasks/lDrRJ7N_-06p_26iKBtJ6ZgAKffD',
+			{ dueDateTime: '2023-10-24T21:00:00.000Z', percentComplete: 78, title: 'do that' },
+			{},
+			undefined,
+			{ 'If-Match': 'W/"JzEtVGFzayAgQEBAQEBAQEBAQEBAQEBARCc="' },
+		);
+
+		expect(result.finished).toEqual(true);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/update.workflow.json b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/update.workflow.json
new file mode 100644
index 0000000000000..1a1d76b00aa50
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/update.workflow.json
@@ -0,0 +1,96 @@
+{
+  "name": "My workflow 35",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "6666-9999-77777",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        880,
+        380
+      ]
+    },
+    {
+      "parameters": {
+        "resource": "task",
+        "operation": "update",
+        "taskId": "lDrRJ7N_-06p_26iKBtJ6ZgAKffD",
+        "updateFields": {
+          "dueDateTime": "2023-10-24T21:00:00.000Z",
+          "percentComplete": 78,
+          "title": "do that"
+        }
+      },
+      "id": "6666-5555-77777",
+      "name": "Microsoft Teams",
+      "type": "n8n-nodes-base.microsoftTeams",
+      "typeVersion": 2,
+      "position": [
+        1100,
+        380
+      ],
+      "credentials": {
+        "microsoftTeamsOAuth2Api": {
+          "id": "6isd5ytvA0qV78eK",
+          "name": "Microsoft Teams account"
+        }
+      }
+    },
+    {
+      "parameters": {},
+      "id": "9d1a2e59-c71c-486c-b3ac-dec6adbc26b3",
+      "name": "No Operation, do nothing",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        1400,
+        380
+      ]
+    }
+  ],
+  "pinData": {
+    "No Operation, do nothing": [
+      {
+        "json": {
+          "success": true
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Microsoft Teams",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Microsoft Teams": {
+      "main": [
+        [
+          {
+            "node": "No Operation, do nothing",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "74d2873c-c1e1-4628-b398-e2a72c6eed9c",
+  "id": "i3NYGF0LXV4qDFV9",
+  "meta": {
+    "instanceId": "b888bd11cd1ddbb95450babf3e199556799d999b896f650de768b8370ee50363"
+  },
+  "tags": []
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/utils.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/utils.test.ts
new file mode 100644
index 0000000000000..fa7a3fb06e2ac
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/utils.test.ts
@@ -0,0 +1,25 @@
+import { filterSortSearchListItems } from '../../v2/helpers/utils';
+
+describe('Test MicrosoftTeamsV2, filterSortSearchListItems', () => {
+	it('should filter, sort and search list items', () => {
+		const items = [
+			{
+				name: 'Test1',
+				value: 'test1',
+			},
+			{
+				name: 'Test2',
+				value: 'test2',
+			},
+		];
+
+		const result = filterSortSearchListItems(items, 'test1');
+
+		expect(result).toEqual([
+			{
+				name: 'Test1',
+				value: 'test1',
+			},
+		]);
+	});
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/ChannelDescription.ts b/packages/nodes-base/nodes/Microsoft/Teams/v1/ChannelDescription.ts
similarity index 100%
rename from packages/nodes-base/nodes/Microsoft/Teams/ChannelDescription.ts
rename to packages/nodes-base/nodes/Microsoft/Teams/v1/ChannelDescription.ts
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/ChannelMessageDescription.ts b/packages/nodes-base/nodes/Microsoft/Teams/v1/ChannelMessageDescription.ts
similarity index 94%
rename from packages/nodes-base/nodes/Microsoft/Teams/ChannelMessageDescription.ts
rename to packages/nodes-base/nodes/Microsoft/Teams/v1/ChannelMessageDescription.ts
index 1daf7561824b0..1f3b469bd6677 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/ChannelMessageDescription.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v1/ChannelMessageDescription.ts
@@ -120,6 +120,14 @@ export const channelMessageFields: INodeProperties[] = [
 			},
 		},
 		options: [
+			{
+				displayName: 'Include Link to Workflow',
+				name: 'includeLinkToWorkflow',
+				type: 'boolean',
+				default: true,
+				description:
+					'Whether to append a link to this workflow at the end of the message. This is helpful if you have many workflows sending messages.',
+			},
 			{
 				displayName: 'Make Reply',
 				name: 'makeReply',
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/ChatMessageDescription.ts b/packages/nodes-base/nodes/Microsoft/Teams/v1/ChatMessageDescription.ts
similarity index 86%
rename from packages/nodes-base/nodes/Microsoft/Teams/ChatMessageDescription.ts
rename to packages/nodes-base/nodes/Microsoft/Teams/v1/ChatMessageDescription.ts
index 1a6aacd37128d..ccc309e565ca8 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/ChatMessageDescription.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v1/ChatMessageDescription.ts
@@ -95,6 +95,30 @@ export const chatMessageFields: INodeProperties[] = [
 		default: '',
 		description: 'The content of the item',
 	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		displayOptions: {
+			show: {
+				operation: ['create'],
+				resource: ['chatMessage'],
+			},
+		},
+		default: {},
+		description: 'Other options to set',
+		placeholder: 'Add options',
+		options: [
+			{
+				displayName: 'Include Link to Workflow',
+				name: 'includeLinkToWorkflow',
+				type: 'boolean',
+				default: true,
+				description:
+					'Whether to append a link to this workflow at the end of the message. This is helpful if you have many workflows sending messages.',
+			},
+		],
+	},
 
 	/* -------------------------------------------------------------------------- */
 	/*                                 chatMessage:get                            */
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v1/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/Teams/v1/GenericFunctions.ts
new file mode 100644
index 0000000000000..0449ead6cb947
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v1/GenericFunctions.ts
@@ -0,0 +1,115 @@
+import type {
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
+} from 'n8n-workflow';
+import { NodeApiError } from 'n8n-workflow';
+
+export async function microsoftApiRequest(
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
+	resource: string,
+
+	body: any = {},
+	qs: IDataObject = {},
+	uri?: string,
+	headers: IDataObject = {},
+): Promise<any> {
+	const options: IRequestOptions = {
+		headers: {
+			'Content-Type': 'application/json',
+		},
+		method,
+		body,
+		qs,
+		uri: uri || `https://graph.microsoft.com${resource}`,
+		json: true,
+	};
+	try {
+		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);
+	}
+}
+
+export async function microsoftApiRequestAllItems(
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	propertyName: string,
+	method: IHttpRequestMethods,
+	endpoint: string,
+
+	body: any = {},
+	query: IDataObject = {},
+): Promise<any> {
+	const returnData: IDataObject[] = [];
+
+	let responseData;
+	let uri: string | undefined;
+
+	do {
+		responseData = await microsoftApiRequest.call(this, method, endpoint, body, query, uri);
+		uri = responseData['@odata.nextLink'];
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
+		const limit = query.limit as number | undefined;
+		if (limit && limit <= returnData.length) {
+			return returnData;
+		}
+	} while (responseData['@odata.nextLink'] !== undefined);
+
+	return returnData;
+}
+
+export async function microsoftApiRequestAllItemsSkip(
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	propertyName: string,
+	method: IHttpRequestMethods,
+	endpoint: string,
+
+	body: any = {},
+	query: IDataObject = {},
+): Promise<any> {
+	const returnData: IDataObject[] = [];
+
+	let responseData;
+	query.$top = 100;
+	query.$skip = 0;
+
+	do {
+		responseData = await microsoftApiRequest.call(this, method, endpoint, body, query);
+		query.$skip += query.$top;
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
+	} while (responseData.value.length !== 0);
+
+	return returnData;
+}
+
+export function prepareMessage(
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	message: string,
+	messageType: string,
+	includeLinkToWorkflow: boolean,
+	instanceId?: string,
+) {
+	if (includeLinkToWorkflow) {
+		const { id } = this.getWorkflow();
+		const link = `${this.getInstanceBaseUrl()}workflow/${id}?utm_source=n8n-internal&utm_medium=powered_by&utm_campaign=${encodeURIComponent(
+			'n8n-nodes-base.microsoftTeams',
+		)}${instanceId ? '_' + instanceId : ''}`;
+		messageType = 'html';
+		message = `${message}<br><br><em> Powered by <a href="${link}">this n8n workflow</a> </em>`;
+	}
+
+	return {
+		body: {
+			contentType: messageType,
+			content: message,
+		},
+	};
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v1/MicrosoftTeamsV1.node.ts b/packages/nodes-base/nodes/Microsoft/Teams/v1/MicrosoftTeamsV1.node.ts
new file mode 100644
index 0000000000000..f736d545a3ded
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v1/MicrosoftTeamsV1.node.ts
@@ -0,0 +1,683 @@
+/* eslint-disable n8n-nodes-base/node-filename-against-convention */
+import type {
+	IExecuteFunctions,
+	IDataObject,
+	ILoadOptionsFunctions,
+	INodeExecutionData,
+	INodePropertyOptions,
+	INodeType,
+	INodeTypeDescription,
+	INodeTypeBaseDescription,
+} from 'n8n-workflow';
+
+import { oldVersionNotice } from '../../../../utils/descriptions';
+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';
+
+const versionDescription: INodeTypeDescription = {
+	displayName: 'Microsoft Teams',
+	name: 'microsoftTeams',
+	icon: 'file:teams.svg',
+	group: ['input'],
+	version: [1, 1.1],
+	subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+	description: 'Consume Microsoft Teams API',
+	defaults: {
+		name: 'Microsoft Teams',
+	},
+	inputs: ['main'],
+	outputs: ['main'],
+	credentials: [
+		{
+			name: 'microsoftTeamsOAuth2Api',
+			required: true,
+		},
+	],
+	properties: [
+		oldVersionNotice,
+		{
+			displayName: 'Resource',
+			name: 'resource',
+			type: 'options',
+			noDataExpression: true,
+			options: [
+				{
+					name: 'Channel',
+					value: 'channel',
+				},
+				{
+					name: 'Channel Message (Beta)',
+					value: 'channelMessage',
+				},
+				{
+					name: 'Chat Message',
+					value: 'chatMessage',
+				},
+				{
+					name: 'Task',
+					value: 'task',
+				},
+			],
+			default: 'channel',
+		},
+		// CHANNEL
+		...channelOperations,
+		...channelFields,
+		/// MESSAGE
+		...channelMessageOperations,
+		...channelMessageFields,
+		...chatMessageOperations,
+		...chatMessageFields,
+		///TASK
+		...taskOperations,
+		...taskFields,
+	],
+};
+
+export class MicrosoftTeamsV1 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			...versionDescription,
+		};
+	}
+
+	methods = {
+		loadOptions: {
+			// Get all the team's channels to display them to user so that they can
+			// select them easily
+			async getChannels(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const teamId = this.getCurrentNodeParameter('teamId') as string;
+				const { value } = await microsoftApiRequest.call(
+					this,
+					'GET',
+					`/v1.0/teams/${teamId}/channels`,
+				);
+				for (const channel of value) {
+					const channelName = channel.displayName;
+					const channelId = channel.id;
+					returnData.push({
+						name: channelName,
+						value: channelId,
+					});
+				}
+				return returnData;
+			},
+			// Get all the teams to display them to user so that they can
+			// select them easily
+			async getTeams(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const { value } = await microsoftApiRequest.call(this, 'GET', '/v1.0/me/joinedTeams');
+				for (const team of value) {
+					const teamName = team.displayName;
+					const teamId = team.id;
+					returnData.push({
+						name: teamName,
+						value: teamId,
+					});
+				}
+				return returnData;
+			},
+			// Get all the groups to display them to user so that they can
+			// select them easily
+			async getGroups(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const groupSource = this.getCurrentNodeParameter('groupSource') as string;
+				let requestUrl = '/v1.0/groups' as string;
+				if (groupSource === 'mine') {
+					requestUrl = '/v1.0/me/transitiveMemberOf';
+				}
+				const { value } = await microsoftApiRequest.call(this, 'GET', requestUrl);
+				for (const group of value) {
+					returnData.push({
+						name: group.displayName || group.mail || group.id,
+						value: group.id,
+						description: group.mail,
+					});
+				}
+				return returnData;
+			},
+			// Get all the plans to display them to user so that they can
+			// select them easily
+			async getPlans(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				let groupId = this.getCurrentNodeParameter('groupId') as string;
+				const operation = this.getNodeParameter('operation', 0);
+				if (operation === 'update' && (groupId === undefined || groupId === null)) {
+					// groupId not found at base, check updateFields for the groupId
+					groupId = this.getCurrentNodeParameter('updateFields.groupId') as string;
+				}
+				const { value } = await microsoftApiRequest.call(
+					this,
+					'GET',
+					`/v1.0/groups/${groupId}/planner/plans`,
+				);
+				for (const plan of value) {
+					returnData.push({
+						name: plan.title,
+						value: plan.id,
+					});
+				}
+				return returnData;
+			},
+			// Get all the plans to display them to user so that they can
+			// select them easily
+			async getBuckets(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				let planId = this.getCurrentNodeParameter('planId') as string;
+				const operation = this.getNodeParameter('operation', 0);
+				if (operation === 'update' && (planId === undefined || planId === null)) {
+					// planId not found at base, check updateFields for the planId
+					planId = this.getCurrentNodeParameter('updateFields.planId') as string;
+				}
+				const { value } = await microsoftApiRequest.call(
+					this,
+					'GET',
+					`/v1.0/planner/plans/${planId}/buckets`,
+				);
+				for (const bucket of value) {
+					returnData.push({
+						name: bucket.name,
+						value: bucket.id,
+					});
+				}
+				return returnData;
+			},
+			// Get all the plans to display them to user so that they can
+			// select them easily
+			async getMembers(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				let groupId = this.getCurrentNodeParameter('groupId') as string;
+				const operation = this.getNodeParameter('operation', 0);
+				if (operation === 'update' && (groupId === undefined || groupId === null)) {
+					// groupId not found at base, check updateFields for the groupId
+					groupId = this.getCurrentNodeParameter('updateFields.groupId') as string;
+				}
+				const { value } = await microsoftApiRequest.call(
+					this,
+					'GET',
+					`/v1.0/groups/${groupId}/members`,
+				);
+				for (const member of value) {
+					returnData.push({
+						name: member.displayName,
+						value: member.id,
+					});
+				}
+				return returnData;
+			},
+			// 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[] = [];
+
+				let planId = this.getCurrentNodeParameter('planId') as string;
+				const operation = this.getNodeParameter('operation', 0);
+				if (operation === 'update' && (planId === undefined || planId === null)) {
+					// planId not found at base, check updateFields for the planId
+					planId = this.getCurrentNodeParameter('updateFields.planId') as string;
+				}
+				const { categoryDescriptions } = await microsoftApiRequest.call(
+					this,
+					'GET',
+					`/v1.0/planner/plans/${planId}/details`,
+				);
+				for (const key of Object.keys(categoryDescriptions as IDataObject)) {
+					if (categoryDescriptions[key] !== null) {
+						returnData.push({
+							name: categoryDescriptions[key],
+							value: key,
+						});
+					}
+				}
+				return returnData;
+			},
+			// Get all the chats to display them to user so that they can
+			// select them easily
+			async getChats(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const qs: IDataObject = {
+					$expand: 'members',
+				};
+				const { value } = await microsoftApiRequest.call(this, 'GET', '/v1.0/chats', {}, qs);
+				for (const chat of value) {
+					if (!chat.topic) {
+						chat.topic = chat.members
+							.filter((member: IDataObject) => member.displayName)
+							.map((member: IDataObject) => member.displayName)
+							.join(', ');
+					}
+					const chatName = `${chat.topic || '(no title) - ' + (chat.id as string)} (${
+						chat.chatType
+					})`;
+					const chatId = chat.id;
+					returnData.push({
+						name: chatName,
+						value: chatId,
+					});
+				}
+				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);
+		const nodeVersion = this.getNode().typeVersion;
+		const instanceId = this.getInstanceId();
+
+		for (let i = 0; i < length; i++) {
+			try {
+				if (resource === 'channel') {
+					//https://docs.microsoft.com/en-us/graph/api/channel-post?view=graph-rest-beta&tabs=http
+					if (operation === 'create') {
+						const teamId = this.getNodeParameter('teamId', i) as string;
+						const name = this.getNodeParameter('name', i) as string;
+						const options = this.getNodeParameter('options', i);
+						const body: IDataObject = {
+							displayName: name,
+						};
+						if (options.description) {
+							body.description = options.description as string;
+						}
+						if (options.type) {
+							body.membershipType = options.type as string;
+						}
+						responseData = await microsoftApiRequest.call(
+							this,
+							'POST',
+							`/v1.0/teams/${teamId}/channels`,
+							body,
+						);
+					}
+					//https://docs.microsoft.com/en-us/graph/api/channel-delete?view=graph-rest-beta&tabs=http
+					if (operation === 'delete') {
+						const teamId = this.getNodeParameter('teamId', i) as string;
+						const channelId = this.getNodeParameter('channelId', i) as string;
+						responseData = await microsoftApiRequest.call(
+							this,
+							'DELETE',
+							`/v1.0/teams/${teamId}/channels/${channelId}`,
+						);
+						responseData = { success: true };
+					}
+					//https://docs.microsoft.com/en-us/graph/api/channel-get?view=graph-rest-beta&tabs=http
+					if (operation === 'get') {
+						const teamId = this.getNodeParameter('teamId', i) as string;
+						const channelId = this.getNodeParameter('channelId', i) as string;
+						responseData = await microsoftApiRequest.call(
+							this,
+							'GET',
+							`/v1.0/teams/${teamId}/channels/${channelId}`,
+						);
+					}
+					//https://docs.microsoft.com/en-us/graph/api/channel-list?view=graph-rest-beta&tabs=http
+					if (operation === 'getAll') {
+						const teamId = this.getNodeParameter('teamId', i) as string;
+						const returnAll = this.getNodeParameter('returnAll', i);
+						if (returnAll) {
+							responseData = await microsoftApiRequestAllItems.call(
+								this,
+								'value',
+								'GET',
+								`/v1.0/teams/${teamId}/channels`,
+							);
+						} else {
+							qs.limit = this.getNodeParameter('limit', i);
+							responseData = await microsoftApiRequestAllItems.call(
+								this,
+								'value',
+								'GET',
+								`/v1.0/teams/${teamId}/channels`,
+								{},
+							);
+							responseData = responseData.splice(0, qs.limit);
+						}
+					}
+					//https://docs.microsoft.com/en-us/graph/api/channel-patch?view=graph-rest-beta&tabs=http
+					if (operation === 'update') {
+						const teamId = this.getNodeParameter('teamId', i) as string;
+						const channelId = this.getNodeParameter('channelId', i) as string;
+						const updateFields = this.getNodeParameter('updateFields', i);
+						const body: IDataObject = {};
+						if (updateFields.name) {
+							body.displayName = updateFields.name as string;
+						}
+						if (updateFields.description) {
+							body.description = updateFields.description as string;
+						}
+						responseData = await microsoftApiRequest.call(
+							this,
+							'PATCH',
+							`/v1.0/teams/${teamId}/channels/${channelId}`,
+							body,
+						);
+						responseData = { success: true };
+					}
+				}
+				if (resource === 'channelMessage') {
+					//https://docs.microsoft.com/en-us/graph/api/channel-post-messages?view=graph-rest-beta&tabs=http
+					//https://docs.microsoft.com/en-us/graph/api/channel-post-messagereply?view=graph-rest-beta&tabs=http
+					if (operation === 'create') {
+						const teamId = this.getNodeParameter('teamId', i) as string;
+						const channelId = this.getNodeParameter('channelId', i) as string;
+						const messageType = this.getNodeParameter('messageType', i) as string;
+						const message = this.getNodeParameter('message', i) as string;
+						const options = this.getNodeParameter('options', i);
+
+						let includeLinkToWorkflow = options.includeLinkToWorkflow;
+						if (includeLinkToWorkflow === undefined) {
+							includeLinkToWorkflow = nodeVersion >= 1.1;
+						}
+
+						const body: IDataObject = prepareMessage.call(
+							this,
+							message,
+							messageType,
+							includeLinkToWorkflow as boolean,
+							instanceId,
+						);
+
+						if (options.makeReply) {
+							const replyToId = options.makeReply as string;
+							responseData = await microsoftApiRequest.call(
+								this,
+								'POST',
+								`/beta/teams/${teamId}/channels/${channelId}/messages/${replyToId}/replies`,
+								body,
+							);
+						} else {
+							responseData = await microsoftApiRequest.call(
+								this,
+								'POST',
+								`/beta/teams/${teamId}/channels/${channelId}/messages`,
+								body,
+							);
+						}
+					}
+					//https://docs.microsoft.com/en-us/graph/api/channel-list-messages?view=graph-rest-beta&tabs=http
+					if (operation === 'getAll') {
+						const teamId = this.getNodeParameter('teamId', i) as string;
+						const channelId = this.getNodeParameter('channelId', i) as string;
+						const returnAll = this.getNodeParameter('returnAll', i);
+						if (returnAll) {
+							responseData = await microsoftApiRequestAllItems.call(
+								this,
+								'value',
+								'GET',
+								`/beta/teams/${teamId}/channels/${channelId}/messages`,
+							);
+						} else {
+							qs.limit = this.getNodeParameter('limit', i);
+							responseData = await microsoftApiRequestAllItems.call(
+								this,
+								'value',
+								'GET',
+								`/beta/teams/${teamId}/channels/${channelId}/messages`,
+								{},
+							);
+							responseData = responseData.splice(0, qs.limit);
+						}
+					}
+				}
+				if (resource === 'chatMessage') {
+					// https://docs.microsoft.com/en-us/graph/api/channel-post-messages?view=graph-rest-1.0&tabs=http
+					if (operation === 'create') {
+						const chatId = this.getNodeParameter('chatId', i) as string;
+						const messageType = this.getNodeParameter('messageType', i) as string;
+						const message = this.getNodeParameter('message', i) as string;
+						const options = this.getNodeParameter('options', i, {});
+
+						const includeLinkToWorkflow =
+							options.includeLinkToWorkflow !== false && nodeVersion >= 1.1;
+
+						const body: IDataObject = prepareMessage.call(
+							this,
+							message,
+							messageType,
+							includeLinkToWorkflow,
+							instanceId,
+						);
+
+						responseData = await microsoftApiRequest.call(
+							this,
+							'POST',
+							`/v1.0/chats/${chatId}/messages`,
+							body,
+						);
+					}
+					// https://docs.microsoft.com/en-us/graph/api/chat-list-messages?view=graph-rest-1.0&tabs=http
+					if (operation === 'get') {
+						const chatId = this.getNodeParameter('chatId', i) as string;
+						const messageId = this.getNodeParameter('messageId', i) as string;
+						responseData = await microsoftApiRequest.call(
+							this,
+							'GET',
+							`/v1.0/chats/${chatId}/messages/${messageId}`,
+						);
+					}
+					// https://docs.microsoft.com/en-us/graph/api/chat-list-messages?view=graph-rest-1.0&tabs=http
+					if (operation === 'getAll') {
+						const chatId = this.getNodeParameter('chatId', i) as string;
+						const returnAll = this.getNodeParameter('returnAll', i);
+						if (returnAll) {
+							responseData = await microsoftApiRequestAllItems.call(
+								this,
+								'value',
+								'GET',
+								`/v1.0/chats/${chatId}/messages`,
+							);
+						} else {
+							qs.limit = this.getNodeParameter('limit', i);
+							responseData = await microsoftApiRequestAllItems.call(
+								this,
+								'value',
+								'GET',
+								`/v1.0/chats/${chatId}/messages`,
+								{},
+							);
+							responseData = responseData.splice(0, qs.limit);
+						}
+					}
+				}
+				if (resource === 'task') {
+					//https://docs.microsoft.com/en-us/graph/api/planner-post-tasks?view=graph-rest-1.0&tabs=http
+					if (operation === 'create') {
+						const planId = this.getNodeParameter('planId', i) as string;
+						const bucketId = this.getNodeParameter('bucketId', i) as string;
+						const title = this.getNodeParameter('title', i) as string;
+						const additionalFields = this.getNodeParameter('additionalFields', i);
+						const body: IDataObject = {
+							planId,
+							bucketId,
+							title,
+						};
+						Object.assign(body, additionalFields);
+
+						if (body.assignedTo) {
+							body.assignments = {
+								[body.assignedTo as string]: {
+									'@odata.type': 'microsoft.graph.plannerAssignment',
+									orderHint: ' !',
+								},
+							};
+							delete body.assignedTo;
+						}
+
+						if (Array.isArray(body.labels)) {
+							body.appliedCategories = (body.labels as string[]).map((label) => ({
+								[label]: true,
+							}));
+						}
+
+						responseData = await microsoftApiRequest.call(
+							this,
+							'POST',
+							'/v1.0/planner/tasks',
+							body,
+						);
+					}
+					//https://docs.microsoft.com/en-us/graph/api/plannertask-delete?view=graph-rest-1.0&tabs=http
+					if (operation === 'delete') {
+						const taskId = this.getNodeParameter('taskId', i) as string;
+						const task = await microsoftApiRequest.call(
+							this,
+							'GET',
+							`/v1.0/planner/tasks/${taskId}`,
+						);
+						responseData = await microsoftApiRequest.call(
+							this,
+							'DELETE',
+							`/v1.0/planner/tasks/${taskId}`,
+							{},
+							{},
+							undefined,
+							{ 'If-Match': task['@odata.etag'] },
+						);
+						responseData = { success: true };
+					}
+					//https://docs.microsoft.com/en-us/graph/api/plannertask-get?view=graph-rest-1.0&tabs=http
+					if (operation === 'get') {
+						const taskId = this.getNodeParameter('taskId', i) as string;
+						responseData = await microsoftApiRequest.call(
+							this,
+							'GET',
+							`/v1.0/planner/tasks/${taskId}`,
+						);
+					}
+					if (operation === 'getAll') {
+						const tasksFor = this.getNodeParameter('tasksFor', i) as string;
+						const returnAll = this.getNodeParameter('returnAll', i);
+						if (tasksFor === 'member') {
+							//https://docs.microsoft.com/en-us/graph/api/planneruser-list-tasks?view=graph-rest-1.0&tabs=http
+							const memberId = this.getNodeParameter('memberId', i) as string;
+							if (returnAll) {
+								responseData = await microsoftApiRequestAllItems.call(
+									this,
+									'value',
+									'GET',
+									`/v1.0/users/${memberId}/planner/tasks`,
+								);
+							} else {
+								qs.limit = this.getNodeParameter('limit', i);
+								responseData = await microsoftApiRequestAllItems.call(
+									this,
+									'value',
+									'GET',
+									`/v1.0/users/${memberId}/planner/tasks`,
+									{},
+								);
+								responseData = responseData.splice(0, qs.limit);
+							}
+						} else {
+							//https://docs.microsoft.com/en-us/graph/api/plannerplan-list-tasks?view=graph-rest-1.0&tabs=http
+							const planId = this.getNodeParameter('planId', i) as string;
+							if (returnAll) {
+								responseData = await microsoftApiRequestAllItems.call(
+									this,
+									'value',
+									'GET',
+									`/v1.0/planner/plans/${planId}/tasks`,
+								);
+							} else {
+								qs.limit = this.getNodeParameter('limit', i);
+								responseData = await microsoftApiRequestAllItems.call(
+									this,
+									'value',
+									'GET',
+									`/v1.0/planner/plans/${planId}/tasks`,
+									{},
+								);
+								responseData = responseData.splice(0, qs.limit);
+							}
+						}
+					}
+					//https://docs.microsoft.com/en-us/graph/api/plannertask-update?view=graph-rest-1.0&tabs=http
+					if (operation === 'update') {
+						const taskId = this.getNodeParameter('taskId', i) as string;
+						const updateFields = this.getNodeParameter('updateFields', i);
+						const body: IDataObject = {};
+						Object.assign(body, updateFields);
+
+						if (body.assignedTo) {
+							body.assignments = {
+								[body.assignedTo as string]: {
+									'@odata.type': 'microsoft.graph.plannerAssignment',
+									orderHint: ' !',
+								},
+							};
+							delete body.assignedTo;
+						}
+
+						if (body.groupId) {
+							// tasks are assigned to a plan and bucket, group is used for filtering
+							delete body.groupId;
+						}
+
+						if (Array.isArray(body.labels)) {
+							body.appliedCategories = (body.labels as string[]).map((label) => ({
+								[label]: true,
+							}));
+						}
+
+						const task = await microsoftApiRequest.call(
+							this,
+							'GET',
+							`/v1.0/planner/tasks/${taskId}`,
+						);
+
+						responseData = await microsoftApiRequest.call(
+							this,
+							'PATCH',
+							`/v1.0/planner/tasks/${taskId}`,
+							body,
+							{},
+							undefined,
+							{ 'If-Match': task['@odata.etag'] },
+						);
+
+						responseData = { success: true };
+					}
+				}
+
+				const executionData = this.helpers.constructExecutionMetaData(
+					this.helpers.returnJsonArray(responseData as IDataObject),
+					{ itemData: { item: i } },
+				);
+
+				returnData.push(...executionData);
+			} 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;
+			}
+		}
+		return [returnData];
+	}
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/TaskDescription.ts b/packages/nodes-base/nodes/Microsoft/Teams/v1/TaskDescription.ts
similarity index 100%
rename from packages/nodes-base/nodes/Microsoft/Teams/TaskDescription.ts
rename to packages/nodes-base/nodes/Microsoft/Teams/v1/TaskDescription.ts
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/MicrosoftTeamsV2.node.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/MicrosoftTeamsV2.node.ts
new file mode 100644
index 0000000000000..86124dc822c9a
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/MicrosoftTeamsV2.node.ts
@@ -0,0 +1,28 @@
+/* eslint-disable n8n-nodes-base/node-filename-against-convention */
+import type {
+	IExecuteFunctions,
+	INodeType,
+	INodeTypeDescription,
+	INodeTypeBaseDescription,
+} from 'n8n-workflow';
+
+import { listSearch } from './methods';
+import { router } from './actions/router';
+import { versionDescription } from './actions/versionDescription';
+
+export class MicrosoftTeamsV2 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			...versionDescription,
+		};
+	}
+
+	methods = { listSearch };
+
+	async execute(this: IExecuteFunctions) {
+		return await router.call(this);
+	}
+}
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
new file mode 100644
index 0000000000000..7635dfc905af0
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channel/create.operation.ts
@@ -0,0 +1,81 @@
+import type { INodeProperties, IExecuteFunctions, IDataObject } from 'n8n-workflow';
+import { microsoftApiRequest } from '../../transport';
+import { teamRLC } from '../../descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	teamRLC,
+	{
+		displayName: 'New Channel Name',
+		name: 'name',
+		required: true,
+		type: 'string',
+		default: '',
+		placeholder: 'e.g. My New Channel',
+		description: 'The name of the new channel you want to create',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		default: {},
+		placeholder: 'Add Option',
+		options: [
+			{
+				displayName: 'Description',
+				name: 'description',
+				type: 'string',
+				default: '',
+				description: 'The description of the channel',
+				typeOptions: {
+					rows: 2,
+				},
+			},
+			{
+				displayName: 'Type',
+				name: 'type',
+				type: 'options',
+				options: [
+					{
+						name: 'Private',
+						value: 'private',
+					},
+					{
+						name: 'Standard',
+						value: 'standard',
+					},
+				],
+				default: 'standard',
+				description:
+					'Standard: Accessible to everyone on the team. Private: Accessible only to a specific group of people within the team.',
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['channel'],
+		operation: ['create'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number) {
+	//https://docs.microsoft.com/en-us/graph/api/channel-post?view=graph-rest-beta&tabs=http
+	const teamId = this.getNodeParameter('teamId', i, '', { extractValue: true }) as string;
+	const name = this.getNodeParameter('name', i) as string;
+	const options = this.getNodeParameter('options', i);
+
+	const body: IDataObject = {
+		displayName: name,
+	};
+	if (options.description) {
+		body.description = options.description as string;
+	}
+	if (options.type) {
+		body.membershipType = options.type as string;
+	}
+	return await microsoftApiRequest.call(this, 'POST', `/v1.0/teams/${teamId}/channels`, body);
+}
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
new file mode 100644
index 0000000000000..29231702734fc
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channel/deleteChannel.operation.ts
@@ -0,0 +1,35 @@
+import { type INodeProperties, type IExecuteFunctions, NodeOperationError } from 'n8n-workflow';
+import { microsoftApiRequest } from '../../transport';
+import { channelRLC, teamRLC } from '../../descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+const properties: INodeProperties[] = [teamRLC, channelRLC];
+
+const displayOptions = {
+	show: {
+		resource: ['channel'],
+		operation: ['deleteChannel'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number) {
+	//https://docs.microsoft.com/en-us/graph/api/channel-delete?view=graph-rest-beta&tabs=http
+
+	try {
+		const teamId = this.getNodeParameter('teamId', i, '', { extractValue: true }) as string;
+		const channelId = this.getNodeParameter('channelId', i, '', { extractValue: true }) as string;
+
+		await microsoftApiRequest.call(this, 'DELETE', `/v1.0/teams/${teamId}/channels/${channelId}`);
+		return { success: true };
+	} catch (error) {
+		throw new NodeOperationError(
+			this.getNode(),
+			"The channel you are trying to delete doesn't exist",
+			{
+				description: "Check that the 'Channel' parameter is correctly set",
+			},
+		);
+	}
+}
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
new file mode 100644
index 0000000000000..a7954ade2828b
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channel/get.operation.ts
@@ -0,0 +1,38 @@
+import { type INodeProperties, type IExecuteFunctions, NodeOperationError } from 'n8n-workflow';
+import { microsoftApiRequest } from '../../transport';
+import { channelRLC, teamRLC } from '../../descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+const properties: INodeProperties[] = [teamRLC, channelRLC];
+
+const displayOptions = {
+	show: {
+		resource: ['channel'],
+		operation: ['get'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number) {
+	//https://docs.microsoft.com/en-us/graph/api/channel-get?view=graph-rest-beta&tabs=http
+
+	try {
+		const teamId = this.getNodeParameter('teamId', i, '', { extractValue: true }) as string;
+		const channelId = this.getNodeParameter('channelId', i, '', { extractValue: true }) as string;
+
+		return await microsoftApiRequest.call(
+			this,
+			'GET',
+			`/v1.0/teams/${teamId}/channels/${channelId}`,
+		);
+	} catch (error) {
+		throw new NodeOperationError(
+			this.getNode(),
+			"The channel you are trying to get doesn't exist",
+			{
+				description: "Check that the 'Channel' parameter is correctly set",
+			},
+		);
+	}
+}
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
new file mode 100644
index 0000000000000..3a9ecf1056e86
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channel/getAll.operation.ts
@@ -0,0 +1,41 @@
+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';
+
+const properties: INodeProperties[] = [teamRLC, ...returnAllOrLimit];
+
+const displayOptions = {
+	show: {
+		resource: ['channel'],
+		operation: ['getAll'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number) {
+	//https://docs.microsoft.com/en-us/graph/api/channel-list?view=graph-rest-beta&tabs=http
+
+	const teamId = this.getNodeParameter('teamId', i, '', { extractValue: true }) as string;
+	const returnAll = this.getNodeParameter('returnAll', i);
+	if (returnAll) {
+		return await microsoftApiRequestAllItems.call(
+			this,
+			'value',
+			'GET',
+			`/v1.0/teams/${teamId}/channels`,
+		);
+	} else {
+		const limit = this.getNodeParameter('limit', i);
+		const responseData = await microsoftApiRequestAllItems.call(
+			this,
+			'value',
+			'GET',
+			`/v1.0/teams/${teamId}/channels`,
+			{},
+		);
+		return responseData.splice(0, limit);
+	}
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channel/index.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channel/index.ts
new file mode 100644
index 0000000000000..e2e164df8a26c
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channel/index.ts
@@ -0,0 +1,62 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+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';
+
+export { create, deleteChannel, get, getAll, update };
+
+export const description: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				resource: ['channel'],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a channel',
+				action: 'Create channel',
+			},
+			{
+				name: 'Delete',
+				value: 'deleteChannel',
+				description: 'Delete a channel',
+				action: 'Delete channel',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get a channel',
+				action: 'Get channel',
+			},
+			{
+				name: 'Get Many',
+				value: 'getAll',
+				description: 'Get many channels',
+				action: 'Get many channels',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update a channel',
+				action: 'Update channel',
+			},
+		],
+		default: 'create',
+	},
+
+	...create.description,
+	...deleteChannel.description,
+	...get.description,
+	...getAll.description,
+	...update.description,
+];
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
new file mode 100644
index 0000000000000..3a60563b56176
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channel/update.operation.ts
@@ -0,0 +1,69 @@
+import type { INodeProperties, IExecuteFunctions, IDataObject } from 'n8n-workflow';
+import { microsoftApiRequest } from '../../transport';
+import { channelRLC, teamRLC } from '../../descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	teamRLC,
+	channelRLC,
+	{
+		displayName: 'Name',
+		name: 'name',
+		type: 'string',
+		default: '',
+		placeholder: 'e.g. My New Channel name',
+		description: 'The name of the channel',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		default: {},
+		placeholder: 'Add Option',
+		options: [
+			{
+				displayName: 'Description',
+				name: 'description',
+				type: 'string',
+				default: '',
+				description: 'The description of the channel',
+				typeOptions: {
+					rows: 2,
+				},
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['channel'],
+		operation: ['update'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number) {
+	//https://docs.microsoft.com/en-us/graph/api/channel-patch?view=graph-rest-beta&tabs=http
+
+	const teamId = this.getNodeParameter('teamId', i, '', { extractValue: true }) as string;
+	const channelId = this.getNodeParameter('channelId', i, '', { extractValue: true }) as string;
+	const newName = this.getNodeParameter('name', i) as string;
+	const newDescription = this.getNodeParameter('options.description', i, '') as string;
+
+	const body: IDataObject = {};
+	if (newName) {
+		body.displayName = newName;
+	}
+	if (newDescription) {
+		body.description = newDescription;
+	}
+	await microsoftApiRequest.call(
+		this,
+		'PATCH',
+		`/v1.0/teams/${teamId}/channels/${channelId}`,
+		body,
+	);
+	return { success: true };
+}
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
new file mode 100644
index 0000000000000..34c32341d9deb
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channelMessage/create.operation.ts
@@ -0,0 +1,120 @@
+import type { INodeProperties, IExecuteFunctions, IDataObject } from 'n8n-workflow';
+import { prepareMessage } from '../../helpers/utils';
+import { microsoftApiRequest } from '../../transport';
+import { channelRLC, teamRLC } from '../../descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	teamRLC,
+	channelRLC,
+	{
+		displayName: 'Content Type',
+		name: 'contentType',
+		required: true,
+		type: 'options',
+		options: [
+			{
+				name: 'Text',
+				value: 'text',
+			},
+			{
+				name: 'HTML',
+				value: 'html',
+			},
+		],
+		default: 'text',
+		description: 'Whether the message is plain text or HTML',
+	},
+	{
+		displayName: 'Message',
+		name: 'message',
+		required: true,
+		type: 'string',
+		default: '',
+		description: 'The content of the message to be sent',
+		typeOptions: {
+			rows: 2,
+		},
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			{
+				displayName: 'Include Link to Workflow',
+				name: 'includeLinkToWorkflow',
+				type: 'boolean',
+				default: true,
+				description:
+					'Whether to append a link to this workflow at the end of the message. This is helpful if you have many workflows sending messages.',
+			},
+			{
+				displayName: 'Reply to ID',
+				name: 'makeReply',
+				type: 'string',
+				default: '',
+				placeholder: 'e.g. 1673348720590',
+				description:
+					'An optional ID of the message you want to reply to. The message ID is the number before "?tenantId" in the message URL.',
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['channelMessage'],
+		operation: ['create'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	i: number,
+	nodeVersion: number,
+	instanceId: string,
+) {
+	//https://docs.microsoft.com/en-us/graph/api/channel-post-messages?view=graph-rest-beta&tabs=http
+	//https://docs.microsoft.com/en-us/graph/api/channel-post-messagereply?view=graph-rest-beta&tabs=http
+
+	const teamId = this.getNodeParameter('teamId', i, '', { extractValue: true }) as string;
+	const channelId = this.getNodeParameter('channelId', i, '', { extractValue: true }) as string;
+	const contentType = this.getNodeParameter('contentType', i) as string;
+	const message = this.getNodeParameter('message', i) as string;
+	const options = this.getNodeParameter('options', i);
+
+	let includeLinkToWorkflow = options.includeLinkToWorkflow;
+	if (includeLinkToWorkflow === undefined) {
+		includeLinkToWorkflow = nodeVersion >= 1.1;
+	}
+
+	const body: IDataObject = prepareMessage.call(
+		this,
+		message,
+		contentType,
+		includeLinkToWorkflow as boolean,
+		instanceId,
+	);
+
+	if (options.makeReply) {
+		const replyToId = options.makeReply as string;
+		return await microsoftApiRequest.call(
+			this,
+			'POST',
+			`/beta/teams/${teamId}/channels/${channelId}/messages/${replyToId}/replies`,
+			body,
+		);
+	} else {
+		return await microsoftApiRequest.call(
+			this,
+			'POST',
+			`/beta/teams/${teamId}/channels/${channelId}/messages`,
+			body,
+		);
+	}
+}
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
new file mode 100644
index 0000000000000..1384b508f34e3
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channelMessage/getAll.operation.ts
@@ -0,0 +1,43 @@
+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';
+
+const properties: INodeProperties[] = [teamRLC, channelRLC, ...returnAllOrLimit];
+
+const displayOptions = {
+	show: {
+		resource: ['channelMessage'],
+		operation: ['getAll'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number) {
+	//https://docs.microsoft.com/en-us/graph/api/channel-list-messages?view=graph-rest-beta&tabs=http
+
+	const teamId = this.getNodeParameter('teamId', i, '', { extractValue: true }) as string;
+	const channelId = this.getNodeParameter('channelId', i, '', { extractValue: true }) as string;
+	const returnAll = this.getNodeParameter('returnAll', i);
+
+	if (returnAll) {
+		return await microsoftApiRequestAllItems.call(
+			this,
+			'value',
+			'GET',
+			`/beta/teams/${teamId}/channels/${channelId}/messages`,
+		);
+	} else {
+		const limit = this.getNodeParameter('limit', i);
+		const responseData = await microsoftApiRequestAllItems.call(
+			this,
+			'value',
+			'GET',
+			`/beta/teams/${teamId}/channels/${channelId}/messages`,
+			{},
+		);
+		return responseData.splice(0, limit);
+	}
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channelMessage/index.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channelMessage/index.ts
new file mode 100644
index 0000000000000..402872b4ec0a6
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channelMessage/index.ts
@@ -0,0 +1,38 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+import * as create from './create.operation';
+import * as getAll from './getAll.operation';
+
+export { create, getAll };
+
+export const description: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				resource: ['channelMessage'],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a message in a channel',
+				action: 'Create message',
+			},
+			{
+				name: 'Get Many',
+				value: 'getAll',
+				description: 'Get many messages from a channel',
+				action: 'Get many messages',
+			},
+		],
+		default: 'create',
+	},
+
+	...create.description,
+	...getAll.description,
+];
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
new file mode 100644
index 0000000000000..2fbce171bf6d7
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/chatMessage/create.operation.ts
@@ -0,0 +1,91 @@
+import type { INodeProperties, IExecuteFunctions, IDataObject } from 'n8n-workflow';
+import { prepareMessage } from '../../helpers/utils';
+import { microsoftApiRequest } from '../../transport';
+import { chatRLC } from '../../descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	chatRLC,
+	{
+		displayName: 'Content Type',
+		name: 'contentType',
+		required: true,
+		type: 'options',
+		options: [
+			{
+				name: 'Text',
+				value: 'text',
+			},
+			{
+				name: 'HTML',
+				value: 'html',
+			},
+		],
+		default: 'text',
+		description: 'Whether the message is plain text or HTML',
+	},
+	{
+		displayName: 'Message',
+		name: 'message',
+		required: true,
+		type: 'string',
+		default: '',
+		description: 'The content of the message to be sent',
+		typeOptions: {
+			rows: 2,
+		},
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		default: {},
+		description: 'Other options to set',
+		placeholder: 'Add options',
+		options: [
+			{
+				displayName: 'Include Link to Workflow',
+				name: 'includeLinkToWorkflow',
+				type: 'boolean',
+				default: true,
+				description:
+					'Whether to append a link to this workflow at the end of the message. This is helpful if you have many workflows sending messages.',
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['chatMessage'],
+		operation: ['create'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	i: number,
+	nodeVersion: number,
+	instanceId: string,
+) {
+	// https://docs.microsoft.com/en-us/graph/api/channel-post-messages?view=graph-rest-1.0&tabs=http
+
+	const chatId = this.getNodeParameter('chatId', i, '', { extractValue: true }) as string;
+	const contentType = this.getNodeParameter('contentType', i) as string;
+	const message = this.getNodeParameter('message', i) as string;
+	const options = this.getNodeParameter('options', i, {});
+
+	const includeLinkToWorkflow = options.includeLinkToWorkflow !== false;
+
+	const body: IDataObject = prepareMessage.call(
+		this,
+		message,
+		contentType,
+		includeLinkToWorkflow,
+		instanceId,
+	);
+
+	return await microsoftApiRequest.call(this, 'POST', `/v1.0/chats/${chatId}/messages`, body);
+}
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
new file mode 100644
index 0000000000000..3aa27f7818af2
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/chatMessage/get.operation.ts
@@ -0,0 +1,49 @@
+import { type INodeProperties, type IExecuteFunctions, NodeOperationError } from 'n8n-workflow';
+import { microsoftApiRequest } from '../../transport';
+import { chatRLC } from '../../descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	chatRLC,
+	{
+		displayName: 'Message ID',
+		name: 'messageId',
+		required: true,
+		type: 'string',
+		default: '',
+		placeholder: 'e.g. 1673355049064',
+		description: 'The ID of the message to retrieve',
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['chatMessage'],
+		operation: ['get'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number) {
+	// https://docs.microsoft.com/en-us/graph/api/chat-list-messages?view=graph-rest-1.0&tabs=http
+
+	try {
+		const chatId = this.getNodeParameter('chatId', i, '', { extractValue: true }) as string;
+		const messageId = this.getNodeParameter('messageId', i) as string;
+
+		return await microsoftApiRequest.call(
+			this,
+			'GET',
+			`/v1.0/chats/${chatId}/messages/${messageId}`,
+		);
+	} catch (error) {
+		throw new NodeOperationError(
+			this.getNode(),
+			"The message you are trying to get doesn't exist",
+			{
+				description: "Check that the 'Message ID' parameter is correctly set",
+			},
+		);
+	}
+}
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
new file mode 100644
index 0000000000000..a9ab2767d7607
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/chatMessage/getAll.operation.ts
@@ -0,0 +1,42 @@
+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';
+
+const properties: INodeProperties[] = [chatRLC, ...returnAllOrLimit];
+
+const displayOptions = {
+	show: {
+		resource: ['chatMessage'],
+		operation: ['getAll'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number) {
+	// https://docs.microsoft.com/en-us/graph/api/chat-list-messages?view=graph-rest-1.0&tabs=http
+
+	const chatId = this.getNodeParameter('chatId', i, '', { extractValue: true }) as string;
+	const returnAll = this.getNodeParameter('returnAll', i);
+
+	if (returnAll) {
+		return await microsoftApiRequestAllItems.call(
+			this,
+			'value',
+			'GET',
+			`/v1.0/chats/${chatId}/messages`,
+		);
+	} else {
+		const limit = this.getNodeParameter('limit', i);
+		const responseData = await microsoftApiRequestAllItems.call(
+			this,
+			'value',
+			'GET',
+			`/v1.0/chats/${chatId}/messages`,
+			{},
+		);
+		return responseData.splice(0, limit);
+	}
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/chatMessage/index.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/chatMessage/index.ts
new file mode 100644
index 0000000000000..1ae403bddc84a
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/chatMessage/index.ts
@@ -0,0 +1,46 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+import * as create from './create.operation';
+import * as get from './get.operation';
+import * as getAll from './getAll.operation';
+
+export { create, get, getAll };
+
+export const description: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				resource: ['chatMessage'],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a message in a chat',
+				action: 'Create chat message',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get a message from a chat',
+				action: 'Get chat message',
+			},
+			{
+				name: 'Get Many',
+				value: 'getAll',
+				description: 'Get many messages from a chat',
+				action: 'Get many chat messages',
+			},
+		],
+		default: 'create',
+	},
+
+	...create.description,
+	...get.description,
+	...getAll.description,
+];
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/node.type.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/node.type.ts
new file mode 100644
index 0000000000000..f4c7753709d58
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/node.type.ts
@@ -0,0 +1,10 @@
+import type { AllEntities } from 'n8n-workflow';
+
+type NodeMap = {
+	channel: 'create' | 'deleteChannel' | 'get' | 'getAll' | 'update';
+	channelMessage: 'create' | 'getAll';
+	chatMessage: 'create' | 'get' | 'getAll';
+	task: 'create' | 'deleteTask' | 'get' | 'getAll' | 'update';
+};
+
+export type MicrosoftTeamsType = AllEntities<NodeMap>;
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/router.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/router.ts
new file mode 100644
index 0000000000000..8497958357fea
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/router.ts
@@ -0,0 +1,82 @@
+import {
+	type IExecuteFunctions,
+	type IDataObject,
+	type INodeExecutionData,
+	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 * as task from './task';
+
+export async function router(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+	const items = this.getInputData();
+	const returnData: INodeExecutionData[] = [];
+	let responseData;
+
+	const resource = this.getNodeParameter<MicrosoftTeamsType>('resource', 0);
+	const operation = this.getNodeParameter('operation', 0);
+
+	const nodeVersion = this.getNode().typeVersion;
+	const instanceId = this.getInstanceId();
+
+	const microsoftTeamsTypeData = {
+		resource,
+		operation,
+	} as MicrosoftTeamsType;
+
+	for (let i = 0; i < items.length; i++) {
+		try {
+			switch (microsoftTeamsTypeData.resource) {
+				case 'channel':
+					responseData = await channel[microsoftTeamsTypeData.operation].execute.call(this, i);
+					break;
+				case 'channelMessage':
+					responseData = await channelMessage[microsoftTeamsTypeData.operation].execute.call(
+						this,
+						i,
+						nodeVersion,
+						instanceId,
+					);
+					break;
+				case 'chatMessage':
+					responseData = await chatMessage[microsoftTeamsTypeData.operation].execute.call(
+						this,
+						i,
+						nodeVersion,
+						instanceId,
+					);
+					break;
+				case 'task':
+					responseData = await task[microsoftTeamsTypeData.operation].execute.call(this, i);
+					break;
+				default:
+					throw new NodeOperationError(
+						this.getNode(),
+						`The operation "${operation}" is not supported!`,
+					);
+			}
+
+			const executionData = this.helpers.constructExecutionMetaData(
+				this.helpers.returnJsonArray(responseData as IDataObject),
+				{ itemData: { item: i } },
+			);
+
+			returnData.push(...executionData);
+		} 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;
+		}
+	}
+	return [returnData];
+}
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
new file mode 100644
index 0000000000000..72cf7ccc76ac6
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/task/create.operation.ts
@@ -0,0 +1,109 @@
+import type { INodeProperties, IExecuteFunctions, IDataObject } from 'n8n-workflow';
+import { DateTime } from 'luxon';
+import { bucketRLC, groupRLC, memberRLC, planRLC } from '../../descriptions';
+import { microsoftApiRequest } from '../../transport';
+import { updateDisplayOptions } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	groupRLC,
+	planRLC,
+	bucketRLC,
+	{
+		displayName: 'Title',
+		name: 'title',
+		required: true,
+		type: 'string',
+		default: '',
+		placeholder: 'e.g. new task',
+		description: 'Title of the task',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		default: {},
+		placeholder: 'Add Option',
+		options: [
+			{
+				...memberRLC,
+				displayName: 'Assigned To',
+				name: 'assignedTo',
+				description: 'Who the task should be assigned to',
+				typeOptions: {
+					loadOptionsDependsOn: ['groupId.balue'],
+				},
+			},
+			{
+				displayName: 'Due Date Time',
+				name: 'dueDateTime',
+				type: 'string',
+				validateType: 'dateTime',
+				default: '',
+				description:
+					'Date and time at which the task is due. The Timestamp type represents date and time information using ISO 8601 format and is always in UTC time.',
+			},
+			{
+				displayName: 'Percent Complete',
+				name: 'percentComplete',
+				type: 'number',
+				typeOptions: {
+					minValue: 0,
+					maxValue: 100,
+				},
+				default: 0,
+				placeholder: 'e.g. 75',
+				description:
+					'Percentage of task completion. When set to 100, the task is considered completed.',
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['task'],
+		operation: ['create'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number) {
+	//https://docs.microsoft.com/en-us/graph/api/planner-post-tasks?view=graph-rest-1.0&tabs=http
+
+	const planId = this.getNodeParameter('planId', i, '', { extractValue: true }) as string;
+	const bucketId = this.getNodeParameter('bucketId', i, '', { extractValue: true }) as string;
+
+	const title = this.getNodeParameter('title', i) as string;
+	const options = this.getNodeParameter('options', i);
+
+	const body: IDataObject = {
+		planId,
+		bucketId,
+		title,
+	};
+
+	if (options.assignedTo) {
+		options.assignedTo = this.getNodeParameter('options.assignedTo', i, '', {
+			extractValue: true,
+		}) as string;
+	}
+
+	if (options.dueDateTime && options.dueDateTime instanceof DateTime) {
+		options.dueDateTime = options.dueDateTime.toISO();
+	}
+
+	Object.assign(body, options);
+
+	if (body.assignedTo) {
+		body.assignments = {
+			[body.assignedTo as string]: {
+				'@odata.type': 'microsoft.graph.plannerAssignment',
+				orderHint: ' !',
+			},
+		};
+		delete body.assignedTo;
+	}
+
+	return await microsoftApiRequest.call(this, 'POST', '/v1.0/planner/tasks', body);
+}
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
new file mode 100644
index 0000000000000..4873aa777b53f
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/task/deleteTask.operation.ts
@@ -0,0 +1,41 @@
+import type { INodeProperties, IExecuteFunctions } from 'n8n-workflow';
+import { microsoftApiRequest } from '../../transport';
+import { updateDisplayOptions } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	{
+		displayName: 'Task ID',
+		name: 'taskId',
+		required: true,
+		type: 'string',
+		placeholder: 'e.g. h3ufgLvXPkSRzYm-zO5cY5gANtBQ',
+		description: 'The ID of the task to delete',
+		default: '',
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['task'],
+		operation: ['deleteTask'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number) {
+	//https://docs.microsoft.com/en-us/graph/api/plannertask-delete?view=graph-rest-1.0&tabs=http
+
+	const taskId = this.getNodeParameter('taskId', i) as string;
+	const task = await microsoftApiRequest.call(this, 'GET', `/v1.0/planner/tasks/${taskId}`);
+	await microsoftApiRequest.call(
+		this,
+		'DELETE',
+		`/v1.0/planner/tasks/${taskId}`,
+		{},
+		{},
+		undefined,
+		{ 'If-Match': task['@odata.etag'] },
+	);
+	return { success: true };
+}
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
new file mode 100644
index 0000000000000..db48178f4d1a9
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/task/get.operation.ts
@@ -0,0 +1,31 @@
+import type { INodeProperties, IExecuteFunctions } from 'n8n-workflow';
+import { microsoftApiRequest } from '../../transport';
+import { updateDisplayOptions } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	{
+		displayName: 'Task ID',
+		name: 'taskId',
+		required: true,
+		type: 'string',
+		description: 'The ID of the task to retrieve',
+		placeholder: 'e.g. h3ufgLvXPkSRzYm-zO5cY5gANtBQ',
+		default: '',
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['task'],
+		operation: ['get'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number) {
+	//https://docs.microsoft.com/en-us/graph/api/plannertask-get?view=graph-rest-1.0&tabs=http
+
+	const taskId = this.getNodeParameter('taskId', i) as string;
+	return await microsoftApiRequest.call(this, 'GET', `/v1.0/planner/tasks/${taskId}`);
+}
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
new file mode 100644
index 0000000000000..d7a2894e19e31
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/task/getAll.operation.ts
@@ -0,0 +1,97 @@
+import type { INodeProperties, IExecuteFunctions } from 'n8n-workflow';
+import { groupRLC, planRLC } from '../../descriptions';
+import { microsoftApiRequest, microsoftApiRequestAllItems } from '../../transport';
+import { updateDisplayOptions } from '@utils/utilities';
+import { returnAllOrLimit } from '@utils/descriptions';
+
+const properties: INodeProperties[] = [
+	{
+		displayName: 'Tasks For',
+		name: 'tasksFor',
+		default: 'member',
+		required: true,
+		type: 'options',
+		description: 'Whether to retrieve the tasks for a user or for a plan',
+		options: [
+			{
+				name: 'Group Member',
+				value: 'member',
+				description: 'Tasks assigned to group member',
+			},
+			{
+				name: 'Plan',
+				value: 'plan',
+				description: 'Tasks in group plan',
+			},
+		],
+	},
+	groupRLC,
+	{
+		...planRLC,
+		displayOptions: {
+			show: {
+				tasksFor: ['plan'],
+			},
+		},
+	},
+	...returnAllOrLimit,
+];
+
+const displayOptions = {
+	show: {
+		resource: ['task'],
+		operation: ['getAll'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number) {
+	const tasksFor = this.getNodeParameter('tasksFor', i) as string;
+	const returnAll = this.getNodeParameter('returnAll', i);
+
+	if (tasksFor === 'member') {
+		//https://docs.microsoft.com/en-us/graph/api/planneruser-list-tasks?view=graph-rest-1.0&tabs=http
+		const memberId = ((await microsoftApiRequest.call(this, 'GET', '/v1.0/me')) as { id: string })
+			.id;
+		if (returnAll) {
+			return await microsoftApiRequestAllItems.call(
+				this,
+				'value',
+				'GET',
+				`/v1.0/users/${memberId}/planner/tasks`,
+			);
+		} else {
+			const limit = this.getNodeParameter('limit', i);
+			const responseData = await microsoftApiRequestAllItems.call(
+				this,
+				'value',
+				'GET',
+				`/v1.0/users/${memberId}/planner/tasks`,
+				{},
+			);
+			return responseData.splice(0, limit);
+		}
+	} else {
+		//https://docs.microsoft.com/en-us/graph/api/plannerplan-list-tasks?view=graph-rest-1.0&tabs=http
+		const planId = this.getNodeParameter('planId', i, '', { extractValue: true }) as string;
+		if (returnAll) {
+			return await microsoftApiRequestAllItems.call(
+				this,
+				'value',
+				'GET',
+				`/v1.0/planner/plans/${planId}/tasks`,
+			);
+		} else {
+			const limit = this.getNodeParameter('limit', i);
+			const responseData = await microsoftApiRequestAllItems.call(
+				this,
+				'value',
+				'GET',
+				`/v1.0/planner/plans/${planId}/tasks`,
+				{},
+			);
+			return responseData.splice(0, limit);
+		}
+	}
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/task/index.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/task/index.ts
new file mode 100644
index 0000000000000..b71c9d7731cdf
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/task/index.ts
@@ -0,0 +1,62 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+import * as create from './create.operation';
+import * as deleteTask from './deleteTask.operation';
+import * as get from './get.operation';
+import * as getAll from './getAll.operation';
+import * as update from './update.operation';
+
+export { create, deleteTask, get, getAll, update };
+
+export const description: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				resource: ['task'],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a task',
+				action: 'Create task',
+			},
+			{
+				name: 'Delete',
+				value: 'deleteTask',
+				description: 'Delete a task',
+				action: 'Delete task',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get a task',
+				action: 'Get task',
+			},
+			{
+				name: 'Get Many',
+				value: 'getAll',
+				description: 'Get many tasks',
+				action: 'Get many tasks',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update a task',
+				action: 'Update task',
+			},
+		],
+		default: 'create',
+	},
+
+	...create.description,
+	...deleteTask.description,
+	...get.description,
+	...getAll.description,
+	...update.description,
+];
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
new file mode 100644
index 0000000000000..56522b8a06f3e
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/task/update.operation.ts
@@ -0,0 +1,155 @@
+import type { INodeProperties, IExecuteFunctions, IDataObject } from 'n8n-workflow';
+import { DateTime } from 'luxon';
+import { bucketRLC, groupRLC, memberRLC, planRLC } from '../../descriptions';
+import { microsoftApiRequest } from '../../transport';
+import { updateDisplayOptions } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	{
+		displayName: 'Task ID',
+		name: 'taskId',
+		required: true,
+		type: 'string',
+		default: '',
+		placeholder: 'e.g. h3ufgLvXPkSRzYm-zO5cY5gANtBQ',
+		description: 'The ID of the task to update',
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		default: {},
+		placeholder: 'Add Field',
+		options: [
+			{
+				...memberRLC,
+				displayName: 'Assigned To',
+				name: 'assignedTo',
+				description: 'Who the task should be assigned to',
+				hint: "Select 'Team' from options first",
+				required: false,
+				typeOptions: {
+					loadOptionsDependsOn: ['updateFields.groupId.value'],
+				},
+			},
+			{
+				...bucketRLC,
+				required: false,
+				typeOptions: {
+					loadOptionsDependsOn: ['updateFields.planId.value'],
+				},
+			},
+			{
+				displayName: 'Due Date Time',
+				name: 'dueDateTime',
+				type: 'string',
+				validateType: 'dateTime',
+				default: '',
+				description:
+					'Date and time at which the task is due. The Timestamp type represents date and time information using ISO 8601 format and is always in UTC time.',
+			},
+			{
+				...groupRLC,
+				required: false,
+				typeOptions: {
+					loadOptionsDependsOn: ['/groupSource'],
+				},
+			},
+			{
+				displayName: 'Percent Complete',
+				name: 'percentComplete',
+				type: 'number',
+				typeOptions: {
+					minValue: 0,
+					maxValue: 100,
+				},
+				default: 0,
+				placeholder: 'e.g. 75',
+				description:
+					'Percentage of task completion. When set to 100, the task is considered completed.',
+			},
+			{
+				...planRLC,
+				required: false,
+				hint: "Select 'Team' from options first",
+				typeOptions: {
+					loadOptionsDependsOn: ['updateFields.groupId.value'],
+				},
+			},
+			{
+				displayName: 'Title',
+				name: 'title',
+				type: 'string',
+				default: '',
+				placeholder: 'e.g. my task',
+				description: 'Title of the task',
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['task'],
+		operation: ['update'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number) {
+	//https://docs.microsoft.com/en-us/graph/api/plannertask-update?view=graph-rest-1.0&tabs=http
+
+	const taskId = this.getNodeParameter('taskId', i, '', { extractValue: true }) as string;
+	const updateFields = this.getNodeParameter('updateFields', i);
+
+	for (const key of Object.keys(updateFields)) {
+		if (key === 'groupId') {
+			// tasks are assigned to a plan and bucket, group is used for filtering
+			delete updateFields.groupId;
+			continue;
+		}
+
+		if (key === 'assignedTo') {
+			const assignedTo = this.getNodeParameter('updateFields.assignedTo', i, '', {
+				extractValue: true,
+			}) as string;
+
+			updateFields.assignments = {
+				[assignedTo]: {
+					'@odata.type': 'microsoft.graph.plannerAssignment',
+					orderHint: ' !',
+				},
+			};
+			delete updateFields.assignedTo;
+			continue;
+		}
+
+		if (['bucketId', 'planId'].includes(key)) {
+			updateFields[key] = this.getNodeParameter(`updateFields.${key}`, i, '', {
+				extractValue: true,
+			}) as string;
+		}
+
+		if (key === 'dueDateTime' && updateFields.dueDateTime instanceof DateTime) {
+			updateFields.dueDateTime = updateFields.dueDateTime.toISO();
+		}
+	}
+
+	const body: IDataObject = {};
+	Object.assign(body, updateFields);
+
+	const task = await microsoftApiRequest.call(this, 'GET', `/v1.0/planner/tasks/${taskId}`);
+
+	await microsoftApiRequest.call(
+		this,
+		'PATCH',
+		`/v1.0/planner/tasks/${taskId}`,
+		body,
+		{},
+		undefined,
+		{ 'If-Match': task['@odata.etag'] },
+	);
+
+	return { success: true };
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/versionDescription.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/versionDescription.ts
new file mode 100644
index 0000000000000..a3d764687a927
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/versionDescription.ts
@@ -0,0 +1,60 @@
+/* eslint-disable n8n-nodes-base/node-filename-against-convention */
+import type { INodeTypeDescription } from 'n8n-workflow';
+
+import * as channel from './channel';
+import * as channelMessage from './channelMessage';
+import * as chatMessage from './chatMessage';
+import * as task from './task';
+
+export const versionDescription: INodeTypeDescription = {
+	displayName: 'Microsoft Teams',
+	name: 'microsoftTeams',
+	icon: 'file:teams.svg',
+	group: ['input'],
+	version: 2,
+	subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+	description: 'Consume Microsoft Teams API',
+	defaults: {
+		name: 'Microsoft Teams',
+	},
+	inputs: ['main'],
+	outputs: ['main'],
+	credentials: [
+		{
+			name: 'microsoftTeamsOAuth2Api',
+			required: true,
+		},
+	],
+	properties: [
+		{
+			displayName: 'Resource',
+			name: 'resource',
+			type: 'options',
+			noDataExpression: true,
+			options: [
+				{
+					name: 'Channel',
+					value: 'channel',
+				},
+				{
+					name: 'Channel Message',
+					value: 'channelMessage',
+				},
+				{
+					name: 'Chat Message',
+					value: 'chatMessage',
+				},
+				{
+					name: 'Task',
+					value: 'task',
+				},
+			],
+			default: 'channel',
+		},
+
+		...channel.description,
+		...channelMessage.description,
+		...chatMessage.description,
+		...task.description,
+	],
+};
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/descriptions/common.description.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/descriptions/common.description.ts
new file mode 100644
index 0000000000000..6736c70917636
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/descriptions/common.description.ts
@@ -0,0 +1,22 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+export const groupSourceOptions: INodeProperties = {
+	displayName: 'Group Source',
+	name: 'groupSource',
+	required: true,
+	type: 'options',
+	default: 'all',
+	description: 'From where to select groups and teams',
+	options: [
+		{
+			name: 'All Groups',
+			value: 'all',
+			description: 'From all groups',
+		},
+		{
+			name: 'My Groups',
+			value: 'mine',
+			description: 'Only load groups that account is member of',
+		},
+	],
+};
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/descriptions/index.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/descriptions/index.ts
new file mode 100644
index 0000000000000..74ac575de09e1
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/descriptions/index.ts
@@ -0,0 +1,2 @@
+export * from './rlc.description';
+export * from './common.description';
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/descriptions/rlc.description.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/descriptions/rlc.description.ts
new file mode 100644
index 0000000000000..37fcffc267cf8
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/descriptions/rlc.description.ts
@@ -0,0 +1,269 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+export const teamRLC: INodeProperties = {
+	displayName: 'Team',
+	name: 'teamId',
+	type: 'resourceLocator',
+	default: { mode: 'list', value: '' },
+	required: true,
+	description:
+		'Select the team from the list, by URL, or by ID (the ID is the "groupId" parameter in the URL you get from "Get a link to the team")',
+	modes: [
+		{
+			displayName: 'From List',
+			name: 'list',
+			type: 'list',
+			placeholder: 'e.g. My Team',
+			typeOptions: {
+				searchListMethod: 'getTeams',
+				searchable: true,
+			},
+		},
+		{
+			displayName: 'From URL',
+			name: 'url',
+			type: 'string',
+			placeholder: 'e.g. https://teams.microsoft.com/l/team/19%3AP8l9gXd6oqlgq…',
+			extractValue: {
+				type: 'regex',
+				regex: 'groupId=([a-f0-9-]+)\\&',
+			},
+			validation: [
+				{
+					type: 'regex',
+					properties: {
+						regex: 'https:\\/\\/teams.microsoft.com\\/.*groupId=[a-f0-9-]+\\&.*',
+						errorMessage: 'Not a valid Microsoft Teams URL',
+					},
+				},
+			],
+		},
+		{
+			displayName: 'By ID',
+			name: 'id',
+			type: 'string',
+			placeholder: 'e.g. 61165b04-e4cc-4026-b43f-926b4e2a7182',
+			validation: [
+				{
+					type: 'regex',
+					properties: {
+						regex: '^([0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12})[ \t]*',
+						errorMessage: 'Not a valid Microsoft Teams Team ID',
+					},
+				},
+			],
+			extractValue: {
+				type: 'regex',
+				regex: '^([0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12})',
+			},
+		},
+	],
+};
+
+export const channelRLC: INodeProperties = {
+	displayName: 'Channel',
+	name: 'channelId',
+	type: 'resourceLocator',
+	default: { mode: 'list', value: '' },
+	required: true,
+	description:
+		'Select the channel from the list, by URL, or by ID (the ID is the "threadId" in the URL)',
+	typeOptions: {
+		loadOptionsDependsOn: ['teamId.value'],
+	},
+	modes: [
+		{
+			displayName: 'From List',
+			name: 'list',
+			type: 'list',
+			placeholder: 'Select a Channel...',
+			typeOptions: {
+				searchListMethod: 'getChannels',
+				searchable: true,
+			},
+		},
+		{
+			displayName: 'By ID',
+			name: 'id',
+			type: 'string',
+			placeholder: '19:-xlxyqXNSCxpI1SDzgQ_L9ZvzSR26pgphq1BJ9y7QJE1@thread.tacv2',
+			// validation missing because no documentation found how these unique ids look like.
+		},
+	],
+};
+
+export const chatRLC: INodeProperties = {
+	displayName: 'Chat',
+	name: 'chatId',
+	type: 'resourceLocator',
+	default: { mode: 'list', value: '' },
+	required: true,
+	description:
+		'Select the chat from the list, by URL, or by ID (find the chat ID after "conversations/" in the URL)',
+	modes: [
+		{
+			displayName: 'From List',
+			name: 'list',
+			type: 'list',
+			placeholder: 'Select a Chat...',
+			typeOptions: {
+				searchListMethod: 'getChats',
+				searchable: true,
+			},
+		},
+		{
+			displayName: 'By ID',
+			name: 'id',
+			type: 'string',
+			placeholder:
+				'19:7e2f1174-e8ee-4859-b8b1-a8d1cc63d276_0c5cfdbb-596f-4d39-b557-5d9516c94107@unq.gbl.spaces',
+			// validation missing because no documentation found how these unique chat ids look like.
+			url: '=https://teams.microsoft.com/l/chat/{{encodeURIComponent($value)}}/0',
+		},
+	],
+};
+
+export const groupRLC: INodeProperties = {
+	displayName: 'Team',
+	name: 'groupId',
+	type: 'resourceLocator',
+	default: { mode: 'list', value: '' },
+	required: true,
+	typeOptions: {
+		loadOptionsDependsOn: ['groupSource'],
+	},
+	modes: [
+		{
+			displayName: 'From List',
+			name: 'list',
+			type: 'list',
+			placeholder: 'Select a Team...',
+			typeOptions: {
+				searchListMethod: 'getGroups',
+				searchable: true,
+			},
+		},
+		{
+			displayName: 'By ID',
+			name: 'id',
+			type: 'string',
+			placeholder: '12f0ca7d-b77f-4c4e-93d2-5cbdb4f464c6',
+			validation: [
+				{
+					type: 'regex',
+					properties: {
+						regex: '^([0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12})[ \t]*',
+						errorMessage: 'Not a valid Microsoft Teams Team ID',
+					},
+				},
+			],
+			extractValue: {
+				type: 'regex',
+				regex: '^([0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12})',
+			},
+		},
+	],
+};
+
+export const planRLC: INodeProperties = {
+	displayName: 'Plan',
+	name: 'planId',
+	type: 'resourceLocator',
+	default: { mode: 'list', value: '' },
+	required: true,
+	typeOptions: {
+		loadOptionsDependsOn: ['groupId.value'],
+	},
+	modes: [
+		{
+			displayName: 'From List',
+			name: 'list',
+			type: 'list',
+			placeholder: 'Select a Plan...',
+			typeOptions: {
+				searchListMethod: 'getPlans',
+				searchable: true,
+			},
+		},
+		{
+			displayName: 'By ID',
+			name: 'id',
+			type: 'string',
+			placeholder: 'rl1HYb0cUEiHPc7zgB_KWWUAA7Of',
+			// validation missing because no documentation found how these unique ids look like.
+		},
+	],
+	description: 'The plan for the task to belong to',
+};
+
+export const bucketRLC: INodeProperties = {
+	displayName: 'Bucket',
+	name: 'bucketId',
+	type: 'resourceLocator',
+	default: { mode: 'list', value: '' },
+	required: true,
+	typeOptions: {
+		loadOptionsDependsOn: ['planId.value'],
+	},
+	modes: [
+		{
+			displayName: 'From List',
+			name: 'list',
+			type: 'list',
+			placeholder: 'Select a Bucket...',
+			typeOptions: {
+				searchListMethod: 'getBuckets',
+				searchable: true,
+			},
+		},
+		{
+			displayName: 'By ID',
+			name: 'id',
+			type: 'string',
+			placeholder: 'rl1HYb0cUEiHPc7zgB_KWWUAA7Of',
+			// validation missing because no documentation found how these unique ids look like.
+		},
+	],
+	description: 'The bucket for the task to belong to',
+};
+
+export const memberRLC: INodeProperties = {
+	displayName: 'Member',
+	name: 'memberId',
+	type: 'resourceLocator',
+	default: { mode: 'list', value: '' },
+	typeOptions: {
+		loadOptionsDependsOn: ['groupId.value'],
+	},
+	modes: [
+		{
+			displayName: 'From List',
+			name: 'list',
+			type: 'list',
+			placeholder: 'Select a Member...',
+			typeOptions: {
+				searchListMethod: 'getMembers',
+				searchable: true,
+			},
+		},
+		{
+			displayName: 'By ID',
+			name: 'id',
+			type: 'string',
+			placeholder: '7e2f1174-e8ee-4859-b8b1-a8d1cc63d276',
+			validation: [
+				{
+					type: 'regex',
+					properties: {
+						regex: '^([0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12})[ \t]*',
+						errorMessage: 'Not a valid Microsoft Teams Team ID',
+					},
+				},
+			],
+			extractValue: {
+				type: 'regex',
+				regex: '^([0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12})',
+			},
+		},
+	],
+};
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/helpers/utils.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/helpers/utils.ts
new file mode 100644
index 0000000000000..6f0b9a9ab62c4
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/helpers/utils.ts
@@ -0,0 +1,44 @@
+import type { IExecuteFunctions, ILoadOptionsFunctions, INodeListSearchItems } from 'n8n-workflow';
+
+export function prepareMessage(
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	message: string,
+	contentType: string,
+	includeLinkToWorkflow: boolean,
+	instanceId?: string,
+) {
+	if (includeLinkToWorkflow) {
+		const { id } = this.getWorkflow();
+		const link = `${this.getInstanceBaseUrl()}workflow/${id}?utm_source=n8n-internal&utm_medium=powered_by&utm_campaign=${encodeURIComponent(
+			'n8n-nodes-base.microsoftTeams',
+		)}${instanceId ? '_' + instanceId : ''}`;
+		contentType = 'html';
+		message = `${message}<br><br><em> Powered by <a href="${link}">this n8n workflow</a> </em>`;
+	}
+
+	return {
+		body: {
+			contentType,
+			content: message,
+		},
+	};
+}
+
+export function filterSortSearchListItems(items: INodeListSearchItems[], filter?: string) {
+	return items
+		.filter(
+			(item) =>
+				!filter ||
+				item.name.toLowerCase().includes(filter.toLowerCase()) ||
+				item.value.toString().toLowerCase().includes(filter.toLowerCase()),
+		)
+		.sort((a, b) => {
+			if (a.name.toLocaleLowerCase() < b.name.toLocaleLowerCase()) {
+				return -1;
+			}
+			if (a.name.toLocaleLowerCase() > b.name.toLocaleLowerCase()) {
+				return 1;
+			}
+			return 0;
+		});
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/methods/index.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/methods/index.ts
new file mode 100644
index 0000000000000..c7fb720e474f5
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/methods/index.ts
@@ -0,0 +1 @@
+export * as listSearch from './listSearch';
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/methods/listSearch.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/methods/listSearch.ts
new file mode 100644
index 0000000000000..3b7c0ba125367
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/methods/listSearch.ts
@@ -0,0 +1,279 @@
+import {
+	NodeOperationError,
+	type IDataObject,
+	type ILoadOptionsFunctions,
+	type INodeListSearchItems,
+	type INodeListSearchResult,
+	sleep,
+} from 'n8n-workflow';
+import { microsoftApiRequest } from '../transport';
+import { filterSortSearchListItems } from '../helpers/utils';
+
+export async function getChats(
+	this: ILoadOptionsFunctions,
+	filter?: string,
+): Promise<INodeListSearchResult> {
+	const returnData: INodeListSearchItems[] = [];
+	const qs: IDataObject = {
+		$expand: 'members',
+	};
+
+	let value: IDataObject[] = [];
+	let attempts = 5;
+	do {
+		try {
+			value = ((await microsoftApiRequest.call(this, 'GET', '/v1.0/chats', {}, qs)) as IDataObject)
+				.value as IDataObject[];
+			break;
+		} catch (error) {
+			if (attempts > 0) {
+				await sleep(1000);
+				attempts--;
+			} else {
+				throw new NodeOperationError(this.getNode(), error);
+			}
+		}
+	} while (attempts > 0);
+
+	for (const chat of value) {
+		if (!chat.topic) {
+			chat.topic = (chat.members as IDataObject[])
+				.filter((member: IDataObject) => member.displayName)
+				.map((member: IDataObject) => member.displayName)
+				.join(', ');
+		}
+		const chatName = `${chat.topic || '(no title) - ' + chat.id} (${chat.chatType})`;
+		const chatId = chat.id;
+		const url = chat.webUrl as string;
+		returnData.push({
+			name: chatName,
+			value: chatId as string,
+			url,
+		});
+	}
+
+	const results = returnData
+		.filter(
+			(item) =>
+				!filter ||
+				item.name.toLowerCase().includes(filter.toLowerCase()) ||
+				item.value.toString().toLowerCase().includes(filter.toLowerCase()),
+		)
+		.sort((a, b) => {
+			if (a.name.toLocaleLowerCase() < b.name.toLocaleLowerCase()) {
+				return -1;
+			}
+			if (a.name.toLocaleLowerCase() > b.name.toLocaleLowerCase()) {
+				return 1;
+			}
+			return 0;
+		});
+
+	return { results };
+}
+
+export async function getTeams(
+	this: ILoadOptionsFunctions,
+	filter?: string,
+): Promise<INodeListSearchResult> {
+	const returnData: INodeListSearchItems[] = [];
+	const { value } = await microsoftApiRequest.call(this, 'GET', '/v1.0/me/joinedTeams');
+
+	for (const team of value) {
+		const teamName = team.displayName;
+		const teamId = team.id;
+		// let channelId: string = '';
+
+		// try {
+		// 	const channels = await microsoftApiRequestAllItems.call(
+		// 		this,
+		// 		'value',
+		// 		'GET',
+		// 		`/v1.0/teams/${teamId}/channels`,
+		// 		{},
+		// 	);
+
+		// 	if (channels.length > 0) {
+		// 		channelId = channels.find((channel: IDataObject) => channel.displayName === 'General').id;
+		// 		if (!channelId) {
+		// 			channelId = channels[0].id;
+		// 		}
+		// 	}
+		// } catch (error) {}
+
+		returnData.push({
+			name: teamName,
+			value: teamId,
+			// url: channelId
+			// 	? `https://teams.microsoft.com/l/team/${channelId}/conversations?groupId=${teamId}&tenantId=${team.tenantId}`
+			// 	: undefined,
+		});
+	}
+	const results = filterSortSearchListItems(returnData, filter);
+
+	return { results };
+}
+
+export async function getChannels(
+	this: ILoadOptionsFunctions,
+	filter?: string,
+): Promise<INodeListSearchResult> {
+	const returnData: INodeListSearchItems[] = [];
+	const teamId = this.getCurrentNodeParameter('teamId', { extractValue: true }) as string;
+	const operation = this.getNodeParameter('operation', 0) as string;
+	const resource = this.getNodeParameter('resource', 0) as string;
+
+	const excludeGeneralChannel = ['deleteChannel'];
+
+	if (resource === 'channel') excludeGeneralChannel.push('update');
+
+	const { value } = await microsoftApiRequest.call(this, 'GET', `/v1.0/teams/${teamId}/channels`);
+
+	for (const channel of value) {
+		if (channel.displayName === 'General' && excludeGeneralChannel.includes(operation)) {
+			continue;
+		}
+		const channelName = channel.displayName;
+		const channelId = channel.id;
+		const url = channel.webUrl;
+		returnData.push({
+			name: channelName,
+			value: channelId,
+			url,
+		});
+	}
+
+	const results = filterSortSearchListItems(returnData, filter);
+	return { results };
+}
+
+export async function getGroups(
+	this: ILoadOptionsFunctions,
+	filter?: string,
+): Promise<INodeListSearchResult> {
+	const returnData: INodeListSearchItems[] = [];
+	// const groupSource = this.getCurrentNodeParameter('groupSource') as string;
+	const requestUrl = '/v1.0/groups' as string;
+
+	// if (groupSource === 'mine') {
+	// 	requestUrl = '/v1.0/me/transitiveMemberOf';
+	// }
+
+	const { value } = await microsoftApiRequest.call(this, 'GET', requestUrl);
+
+	for (const group of value) {
+		if (group.displayName === 'All Company') continue;
+
+		const name = group.displayName || group.mail;
+
+		if (name === undefined) continue;
+
+		returnData.push({
+			name,
+			value: group.id,
+		});
+	}
+
+	const results = filterSortSearchListItems(returnData, filter);
+	return { results };
+}
+
+export async function getPlans(
+	this: ILoadOptionsFunctions,
+	filter?: string,
+): Promise<INodeListSearchResult> {
+	const returnData: INodeListSearchItems[] = [];
+
+	let groupId = '';
+
+	try {
+		groupId = this.getCurrentNodeParameter('groupId', { extractValue: true }) as string;
+	} catch (error) {}
+
+	const operation = this.getNodeParameter('operation', 0) as string;
+
+	if (operation === 'update' && !groupId) {
+		groupId = this.getCurrentNodeParameter('updateFields.groupId', {
+			extractValue: true,
+		}) as string;
+	}
+
+	const { value } = await microsoftApiRequest.call(
+		this,
+		'GET',
+		`/v1.0/groups/${groupId}/planner/plans`,
+	);
+	for (const plan of value) {
+		returnData.push({
+			name: plan.title,
+			value: plan.id,
+		});
+	}
+	const results = filterSortSearchListItems(returnData, filter);
+	return { results };
+}
+
+export async function getBuckets(
+	this: ILoadOptionsFunctions,
+	filter?: string,
+): Promise<INodeListSearchResult> {
+	const returnData: INodeListSearchItems[] = [];
+	let planId = '';
+
+	try {
+		planId = this.getCurrentNodeParameter('planId', { extractValue: true }) as string;
+	} catch (error) {}
+
+	const operation = this.getNodeParameter('operation', 0) as string;
+
+	if (operation === 'update' && !planId) {
+		planId = this.getCurrentNodeParameter('updateFields.planId', {
+			extractValue: true,
+		}) as string;
+	}
+
+	const { value } = await microsoftApiRequest.call(
+		this,
+		'GET',
+		`/v1.0/planner/plans/${planId}/buckets`,
+	);
+	for (const bucket of value) {
+		returnData.push({
+			name: bucket.name,
+			value: bucket.id,
+		});
+	}
+	const results = filterSortSearchListItems(returnData, filter);
+	return { results };
+}
+
+export async function getMembers(
+	this: ILoadOptionsFunctions,
+	filter?: string,
+): Promise<INodeListSearchResult> {
+	const returnData: INodeListSearchItems[] = [];
+	let groupId = '';
+
+	try {
+		groupId = this.getCurrentNodeParameter('groupId', { extractValue: true }) as string;
+	} catch (error) {}
+
+	const operation = this.getNodeParameter('operation', 0) as string;
+
+	if (operation === 'update' && !groupId) {
+		groupId = this.getCurrentNodeParameter('updateFields.groupId', {
+			extractValue: true,
+		}) as string;
+	}
+	const { value } = await microsoftApiRequest.call(this, 'GET', `/v1.0/groups/${groupId}/members`);
+
+	for (const member of value) {
+		returnData.push({
+			name: member.displayName,
+			value: member.id,
+		});
+	}
+
+	const results = filterSortSearchListItems(returnData, filter);
+	return { results };
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/transport/index.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/transport/index.ts
new file mode 100644
index 0000000000000..4b0e4fb1d4051
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/transport/index.ts
@@ -0,0 +1,103 @@
+import type {
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
+} from 'n8n-workflow';
+import { NodeApiError } from 'n8n-workflow';
+import { capitalize } from '../../../../../utils/utilities';
+
+export async function microsoftApiRequest(
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
+	resource: string,
+	body: any = {},
+	qs: IDataObject = {},
+	uri?: string,
+	headers: IDataObject = {},
+): Promise<any> {
+	const options: IRequestOptions = {
+		headers: {
+			'Content-Type': 'application/json',
+		},
+		method,
+		body,
+		qs,
+		uri: uri || `https://graph.microsoft.com${resource}`,
+		json: true,
+	};
+	try {
+		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 = {};
+		if (error.error?.error) {
+			const httpCode = error.statusCode;
+			error = error.error.error;
+			error.statusCode = httpCode;
+			errorOptions.message = error.message;
+
+			if (error.code === 'NotFound' && error.message === 'Resource not found') {
+				const nodeResource = capitalize(this.getNodeParameter('resource', 0) as string);
+				errorOptions.message = `${nodeResource} not found`;
+			}
+		}
+		throw new NodeApiError(this.getNode(), error as JsonObject, errorOptions);
+	}
+}
+
+export async function microsoftApiRequestAllItems(
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	propertyName: string,
+	method: IHttpRequestMethods,
+	endpoint: string,
+
+	body: any = {},
+	query: IDataObject = {},
+): Promise<any> {
+	const returnData: IDataObject[] = [];
+
+	let responseData;
+	let uri: string | undefined;
+
+	do {
+		responseData = await microsoftApiRequest.call(this, method, endpoint, body, query, uri);
+		uri = responseData['@odata.nextLink'];
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
+		const limit = query.limit as number | undefined;
+		if (limit && limit <= returnData.length) {
+			return returnData;
+		}
+	} while (responseData['@odata.nextLink'] !== undefined);
+
+	return returnData;
+}
+
+export async function microsoftApiRequestAllItemsSkip(
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	propertyName: string,
+	method: IHttpRequestMethods,
+	endpoint: string,
+
+	body: any = {},
+	query: IDataObject = {},
+): Promise<any> {
+	const returnData: IDataObject[] = [];
+
+	let responseData;
+	query.$top = 100;
+	query.$skip = 0;
+
+	do {
+		responseData = await microsoftApiRequest.call(this, method, endpoint, body, query);
+		query.$skip += query.$top;
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
+	} while (responseData.value.length !== 0);
+
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/Microsoft/ToDo/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/ToDo/GenericFunctions.ts
index a6fcff72637ea..4f5e4deb71302 100644
--- a/packages/nodes-base/nodes/Microsoft/ToDo/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Microsoft/ToDo/GenericFunctions.ts
@@ -1,16 +1,16 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function microsoftApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 	body: IDataObject = {},
 	qs: IDataObject = {},
@@ -18,7 +18,7 @@ export async function microsoftApiRequest(
 	_headers: IDataObject = {},
 	option: IDataObject = { json: true },
 ) {
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			'Content-Type': 'application/json',
 		},
@@ -45,7 +45,7 @@ export async function microsoftApiRequest(
 export async function microsoftApiRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject = {},
 	query: IDataObject = {},
@@ -71,7 +71,7 @@ export async function microsoftApiRequestAllItems(
 export async function microsoftApiRequestAllItemsSkip(
 	this: IExecuteFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject = {},
 	query: IDataObject = {},
diff --git a/packages/nodes-base/nodes/Microsoft/ToDo/MicrosoftToDo.node.ts b/packages/nodes-base/nodes/Microsoft/ToDo/MicrosoftToDo.node.ts
index c6ef0442cbb2d..94bec41fe7c00 100644
--- a/packages/nodes-base/nodes/Microsoft/ToDo/MicrosoftToDo.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/ToDo/MicrosoftToDo.node.ts
@@ -9,6 +9,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
+import moment from 'moment-timezone';
 import { microsoftApiRequest, microsoftApiRequestAllItems } from './GenericFunctions';
 
 import { linkedResourceFields, linkedResourceOperations } from './LinkedResourceDescription';
@@ -17,8 +18,6 @@ import { taskFields, taskOperations } from './TaskDescription';
 
 import { listFields, listOperations } from './ListDescription';
 
-import moment from 'moment-timezone';
-
 export class MicrosoftToDo implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Microsoft To Do',
@@ -221,6 +220,14 @@ export class MicrosoftToDo implements INodeType {
 							};
 						}
 
+						if (body.reminderDateTime) {
+							body.reminderDateTime = {
+								dateTime: moment.tz(body.reminderDateTime, timezone).format(),
+								timeZone: timezone,
+							};
+							body.isReminderOn = true;
+						}
+
 						responseData = await microsoftApiRequest.call(
 							this,
 							'POST',
@@ -304,6 +311,16 @@ export class MicrosoftToDo implements INodeType {
 							};
 						}
 
+						if (body.reminderDateTime) {
+							body.reminderDateTime = {
+								dateTime: moment.tz(body.reminderDateTime, timezone).format(),
+								timeZone: timezone,
+							};
+							body.isReminderOn = true;
+						} else {
+							body.isReminderOn = false;
+						}
+
 						responseData = await microsoftApiRequest.call(
 							this,
 							'PATCH',
@@ -415,6 +432,6 @@ export class MicrosoftToDo implements INodeType {
 
 			returnData.push(...executionData);
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Microsoft/ToDo/TaskDescription.ts b/packages/nodes-base/nodes/Microsoft/ToDo/TaskDescription.ts
index a04813988125a..f46177b56c1fa 100644
--- a/packages/nodes-base/nodes/Microsoft/ToDo/TaskDescription.ts
+++ b/packages/nodes-base/nodes/Microsoft/ToDo/TaskDescription.ts
@@ -105,6 +105,13 @@ export const taskFields: INodeProperties[] = [
 				default: '',
 				description: 'The date in the specified time zone that the task is to be finished',
 			},
+			{
+				displayName: 'Reminder',
+				name: 'reminderDateTime',
+				type: 'dateTime',
+				default: '',
+				description: 'The date in the specified time zone that the task is to be reminded',
+			},
 			{
 				displayName: 'Importance',
 				name: 'importance',
@@ -259,6 +266,13 @@ export const taskFields: INodeProperties[] = [
 				default: '',
 				description: 'The date in the specified time zone that the task is to be finished',
 			},
+			{
+				displayName: 'Reminder',
+				name: 'reminderDateTime',
+				type: 'dateTime',
+				default: '',
+				description: 'The date in the specified time zone that the task is to be reminded',
+			},
 			{
 				displayName: 'Importance',
 				name: 'importance',
diff --git a/packages/nodes-base/nodes/Microsoft/ToDo/todo.svg b/packages/nodes-base/nodes/Microsoft/ToDo/todo.svg
index b97f166e23cbb..d8aa68e87c7bc 100644
--- a/packages/nodes-base/nodes/Microsoft/ToDo/todo.svg
+++ b/packages/nodes-base/nodes/Microsoft/ToDo/todo.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M3.713 7.854L.394 11.172a1.17 1.17 0 000 1.655L5.367 17.8l4.974-4.974-4.974-4.972a1.169 1.169 0 00-1.654 0z" fill="#185abd"/><path d="M23.606 6.2l-3.318-3.32a1.17 1.17 0 00-1.655 0l-4.146 4.146L9.513 12l-4.146 4.146a1.17 1.17 0 000 1.655l3.319 3.318a1.17 1.17 0 001.655 0l4.146-4.146L19.46 12l4.146-4.146a1.17 1.17 0 000-1.654z" fill="#41a5ee"/><path fill="none" d="M0 0h24v24H0z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="#185abd" d="M3.713 7.854.394 11.172a1.17 1.17 0 0 0 0 1.655L5.367 17.8l4.974-4.974-4.974-4.972a1.17 1.17 0 0 0-1.654 0"/><path fill="#41a5ee" d="m23.606 6.2-3.318-3.32a1.17 1.17 0 0 0-1.655 0l-4.146 4.146L9.513 12l-4.146 4.146a1.17 1.17 0 0 0 0 1.655l3.319 3.318a1.17 1.17 0 0 0 1.655 0l4.146-4.146L19.46 12l4.146-4.146a1.17 1.17 0 0 0 0-1.654"/><path fill="none" d="M0 0h24v24H0z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Mindee/GenericFunctions.ts b/packages/nodes-base/nodes/Mindee/GenericFunctions.ts
index 1b69ff951bdd8..35b5e19742db3 100644
--- a/packages/nodes-base/nodes/Mindee/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Mindee/GenericFunctions.ts
@@ -1,17 +1,16 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	ILoadOptionsFunctions,
 	IDataObject,
 	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function mindeeApiRequest(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	path: string,
 	body: any = {},
 	qs: IDataObject = {},
@@ -34,7 +33,7 @@ export async function mindeeApiRequest(
 			? `https://api.mindee.net/products${path}`
 			: `https://api.mindee.net/v1/products/mindee${path}`;
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {},
 		method,
 		body,
diff --git a/packages/nodes-base/nodes/Mindee/Mindee.node.ts b/packages/nodes-base/nodes/Mindee/Mindee.node.ts
index d42b1f8f8c06a..e6fefcbd1b3f3 100644
--- a/packages/nodes-base/nodes/Mindee/Mindee.node.ts
+++ b/packages/nodes-base/nodes/Mindee/Mindee.node.ts
@@ -156,7 +156,7 @@ export class Mindee implements INodeType {
 				default: 'predict',
 			},
 			{
-				displayName: 'Binary Property',
+				displayName: 'Input Binary Field',
 				name: 'binaryPropertyName',
 				type: 'string',
 				required: true,
@@ -167,8 +167,7 @@ export class Mindee implements INodeType {
 						resource: ['receipt', 'invoice'],
 					},
 				},
-				description:
-					'Name of the binary property which containsthe data for the file to be uploaded',
+				hint: 'The name of the input binary field containing the file to be uploaded',
 			},
 			{
 				displayName: 'RAW Data',
diff --git a/packages/nodes-base/nodes/Mindee/mindee.svg b/packages/nodes-base/nodes/Mindee/mindee.svg
index d1c6951422adb..8b9022370b260 100644
--- a/packages/nodes-base/nodes/Mindee/mindee.svg
+++ b/packages/nodes-base/nodes/Mindee/mindee.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32"><path d="M18.329 0h13.746v32H18.33v-4.57h9.164V4.572H18.33V0zM4.582 13.714V27.43h9.165V32H0V0h13.747v4.571H4.582v9.143zm4.582 0v-4.57h13.747v4.57H9.164zm0 9.143v-4.571h4.583v4.571H9.164z" fill="#FD3246" fill-rule="evenodd"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32"><path fill="#FD3246" fill-rule="evenodd" d="M18.329 0h13.746v32H18.33v-4.57h9.164V4.572H18.33zM4.582 13.714V27.43h9.165V32H0V0h13.747v4.571H4.582zm4.582 0v-4.57h13.747v4.57zm0 9.143v-4.571h4.583v4.571z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Misp/GenericFunctions.ts b/packages/nodes-base/nodes/Misp/GenericFunctions.ts
index 0d798f3e0c647..bdf59bda34e08 100644
--- a/packages/nodes-base/nodes/Misp/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Misp/GenericFunctions.ts
@@ -1,32 +1,28 @@
+import { URL } from 'url';
 import type {
 	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
-import { NodeApiError, NodeOperationError } from 'n8n-workflow';
-
-import type { OptionsWithUri } from 'request';
+import { NodeApiError, NodeOperationError, jsonParse } from 'n8n-workflow';
 
 import type { MispCredentials } from './types';
 
-import { URL } from 'url';
-
 export async function mispApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject = {},
 	qs: IDataObject = {},
 ) {
-	const { baseUrl, apiKey, allowUnauthorizedCerts } = (await this.getCredentials(
+	const { baseUrl, allowUnauthorizedCerts } = (await this.getCredentials(
 		'mispApi',
 	)) as MispCredentials;
 
-	const options: OptionsWithUri = {
-		headers: {
-			Authorization: apiKey,
-		},
+	const options: IRequestOptions = {
 		method,
 		body,
 		qs,
@@ -44,7 +40,7 @@ export async function mispApiRequest(
 	}
 
 	try {
-		return await this.helpers.request(options);
+		return await this.helpers.requestWithAuthentication.call(this, 'mispApi', options);
 	} catch (error) {
 		// MISP API wrongly returns 403 for malformed requests
 		if (error.statusCode === 403) {
@@ -83,6 +79,57 @@ export async function mispApiRequestAllItems(this: IExecuteFunctions, endpoint:
 	return responseData;
 }
 
+export async function mispApiRestSearch(
+	this: IExecuteFunctions,
+	resource: 'attributes' | 'events' | 'objects',
+	itemIndex: number,
+) {
+	let body: IDataObject = {};
+	const useJson = this.getNodeParameter('useJson', itemIndex) as boolean;
+
+	if (useJson) {
+		const json = this.getNodeParameter('jsonOutput', itemIndex);
+		if (typeof json === 'string') {
+			body = jsonParse(json);
+		} else {
+			body = json as IDataObject;
+		}
+	} else {
+		const value = this.getNodeParameter('value', itemIndex) as string;
+		const additionalFields = this.getNodeParameter('additionalFields', itemIndex);
+
+		body.value = value;
+
+		if (Object.keys(additionalFields).length) {
+			if (additionalFields.tags) {
+				additionalFields.tags = (additionalFields.tags as string)
+					.split(',')
+					.map((tag) => tag.trim());
+			}
+			Object.assign(body, additionalFields);
+		}
+	}
+
+	const endpoint = `/${resource}/restSearch`;
+	const { response } = await mispApiRequest.call(this, 'POST', endpoint, body);
+
+	if (response) {
+		if (resource === 'attributes') {
+			return response.Attribute;
+		}
+
+		if (resource === 'events') {
+			return (response as IDataObject[]).map((event) => event.Event);
+		}
+
+		if (resource === 'objects') {
+			return (response as IDataObject[]).map((obj) => obj.Object);
+		}
+	} else {
+		return [];
+	}
+}
+
 export function throwOnEmptyUpdate(
 	this: IExecuteFunctions,
 	resource: string,
diff --git a/packages/nodes-base/nodes/Misp/Misp.node.ts b/packages/nodes-base/nodes/Misp/Misp.node.ts
index 3221508a291be..55ef467b57a4a 100644
--- a/packages/nodes-base/nodes/Misp/Misp.node.ts
+++ b/packages/nodes-base/nodes/Misp/Misp.node.ts
@@ -10,6 +10,7 @@ import type {
 import {
 	mispApiRequest,
 	mispApiRequestAllItems,
+	mispApiRestSearch,
 	throwOnEmptyUpdate,
 	throwOnInvalidUrl,
 	throwOnMissingSharingGroup,
@@ -28,6 +29,8 @@ import {
 	galaxyOperations,
 	noticelistFields,
 	noticelistOperations,
+	objectOperations,
+	objectFields,
 	organisationFields,
 	organisationOperations,
 	tagFields,
@@ -91,6 +94,10 @@ export class Misp implements INodeType {
 						name: 'Noticelist',
 						value: 'noticelist',
 					},
+					{
+						name: 'Object',
+						value: 'object',
+					},
 					{
 						name: 'Organisation',
 						value: 'organisation',
@@ -122,6 +129,8 @@ export class Misp implements INodeType {
 			...galaxyFields,
 			...noticelistOperations,
 			...noticelistFields,
+			...objectOperations,
+			...objectFields,
 			...organisationOperations,
 			...organisationFields,
 			...tagOperations,
@@ -233,6 +242,12 @@ export class Misp implements INodeType {
 						// ----------------------------------------
 
 						responseData = await mispApiRequestAllItems.call(this, '/attributes');
+					} else if (operation === 'search') {
+						// ----------------------------------------
+						//            attribute: search
+						// ----------------------------------------
+
+						responseData = await mispApiRestSearch.call(this, 'attributes', i);
 					} else if (operation === 'update') {
 						// ----------------------------------------
 						//            attribute: update
@@ -300,6 +315,12 @@ export class Misp implements INodeType {
 						// ----------------------------------------
 
 						responseData = await mispApiRequestAllItems.call(this, '/events');
+					} else if (operation === 'search') {
+						// ----------------------------------------
+						//            event: search
+						// ----------------------------------------
+
+						responseData = await mispApiRestSearch.call(this, 'events', i);
 					} else if (operation === 'publish') {
 						// ----------------------------------------
 						//              event: publish
@@ -500,6 +521,17 @@ export class Misp implements INodeType {
 						}>;
 						responseData = responseData.map((entry) => entry.Noticelist);
 					}
+				} else if (resource === 'object') {
+					// **********************************************************************
+					//                                    object
+					// **********************************************************************
+					if (operation === 'search') {
+						// ----------------------------------------
+						//            attribute: search
+						// ----------------------------------------
+
+						responseData = await mispApiRestSearch.call(this, 'objects', i);
+					}
 				} else if (resource === 'organisation') {
 					// **********************************************************************
 					//                              organisation
@@ -754,6 +786,6 @@ export class Misp implements INodeType {
 			returnData.push(...executionData);
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Misp/descriptions/AttributeDescription.ts b/packages/nodes-base/nodes/Misp/descriptions/AttributeDescription.ts
index 7462013d34f10..09e54912b4d64 100644
--- a/packages/nodes-base/nodes/Misp/descriptions/AttributeDescription.ts
+++ b/packages/nodes-base/nodes/Misp/descriptions/AttributeDescription.ts
@@ -1,4 +1,15 @@
 import type { INodeProperties } from 'n8n-workflow';
+import { updateDisplayOptions } from '../../../utils/utilities';
+import { searchProperties } from './common.descriptions';
+
+const searchDisplayOptions = {
+	show: {
+		resource: ['attribute'],
+		operation: ['search'],
+	},
+};
+
+const searchDescription = updateDisplayOptions(searchDisplayOptions, searchProperties);
 
 export const attributeOperations: INodeProperties[] = [
 	{
@@ -32,6 +43,11 @@ export const attributeOperations: INodeProperties[] = [
 				value: 'getAll',
 				action: 'Get many attributes',
 			},
+			{
+				name: 'Search',
+				value: 'search',
+				action: 'Get a filtered list of attributes',
+			},
 			{
 				name: 'Update',
 				value: 'update',
@@ -226,6 +242,11 @@ export const attributeFields: INodeProperties[] = [
 		},
 	},
 
+	// ----------------------------------------
+	//            attribute: search
+	// ----------------------------------------
+	...searchDescription,
+
 	// ----------------------------------------
 	//            attribute: update
 	// ----------------------------------------
diff --git a/packages/nodes-base/nodes/Misp/descriptions/EventDescription.ts b/packages/nodes-base/nodes/Misp/descriptions/EventDescription.ts
index 098d6c5553b74..ca46869f7f3ac 100644
--- a/packages/nodes-base/nodes/Misp/descriptions/EventDescription.ts
+++ b/packages/nodes-base/nodes/Misp/descriptions/EventDescription.ts
@@ -1,4 +1,15 @@
 import type { INodeProperties } from 'n8n-workflow';
+import { updateDisplayOptions } from '../../../utils/utilities';
+import { searchProperties } from './common.descriptions';
+
+const searchDisplayOptions = {
+	show: {
+		resource: ['event'],
+		operation: ['search'],
+	},
+};
+
+const searchDescription = updateDisplayOptions(searchDisplayOptions, searchProperties);
 
 export const eventOperations: INodeProperties[] = [
 	{
@@ -37,6 +48,11 @@ export const eventOperations: INodeProperties[] = [
 				value: 'publish',
 				action: 'Publish an event',
 			},
+			{
+				name: 'Search',
+				value: 'search',
+				action: 'Get a filtered list of events',
+			},
 			{
 				name: 'Unpublish',
 				value: 'unpublish',
@@ -295,6 +311,11 @@ export const eventFields: INodeProperties[] = [
 		},
 	},
 
+	// ----------------------------------------
+	//              event: search
+	// ----------------------------------------
+	...searchDescription,
+
 	// ----------------------------------------
 	//              event: update
 	// ----------------------------------------
diff --git a/packages/nodes-base/nodes/Misp/descriptions/ObjectDescription.ts b/packages/nodes-base/nodes/Misp/descriptions/ObjectDescription.ts
new file mode 100644
index 0000000000000..ad38ede1c8554
--- /dev/null
+++ b/packages/nodes-base/nodes/Misp/descriptions/ObjectDescription.ts
@@ -0,0 +1,41 @@
+import type { INodeProperties } from 'n8n-workflow';
+import { updateDisplayOptions } from '../../../utils/utilities';
+import { searchProperties } from './common.descriptions';
+
+const searchDisplayOptions = {
+	show: {
+		resource: ['object'],
+		operation: ['search'],
+	},
+};
+
+const searchDescription = updateDisplayOptions(searchDisplayOptions, searchProperties);
+
+export const objectOperations: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: ['object'],
+			},
+		},
+		noDataExpression: true,
+		options: [
+			{
+				name: 'Search',
+				value: 'search',
+				action: 'Get a filtered list of objects',
+			},
+		],
+		default: 'search',
+	},
+];
+
+export const objectFields: INodeProperties[] = [
+	// ----------------------------------------
+	//              event: search
+	// ----------------------------------------
+	...searchDescription,
+];
diff --git a/packages/nodes-base/nodes/Misp/descriptions/common.descriptions.ts b/packages/nodes-base/nodes/Misp/descriptions/common.descriptions.ts
new file mode 100644
index 0000000000000..ffa040e481b33
--- /dev/null
+++ b/packages/nodes-base/nodes/Misp/descriptions/common.descriptions.ts
@@ -0,0 +1,102 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+export const searchProperties: INodeProperties[] = [
+	{
+		displayName: 'Use JSON to Specify Fields',
+		name: 'useJson',
+		type: 'boolean',
+		default: false,
+		description: 'Whether to use JSON to specify the fields for the search request',
+	},
+	{
+		displayName: 'JSON',
+		name: 'jsonOutput',
+		type: 'json',
+		description:
+			'Get more info at {YOUR_BASE_URL_SPECIFIED_IN_CREDENTIALS}/api/openapi#operation/restSearchAttributes',
+		typeOptions: {
+			rows: 5,
+		},
+		default: '{\n  "value": "search value",\n  "type": "text"\n}\n',
+		validateType: 'object',
+		displayOptions: {
+			show: {
+				useJson: [true],
+			},
+		},
+	},
+	{
+		displayName: 'Value',
+		name: 'value',
+		type: 'string',
+		required: true,
+		placeholder: 'e.g. 127.0.0.1',
+		default: '',
+		displayOptions: {
+			show: {
+				useJson: [false],
+			},
+		},
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				useJson: [false],
+			},
+		},
+		options: [
+			{
+				displayName: 'Category',
+				name: 'category',
+				type: 'string',
+				placeholder: 'e.g. Internal reference',
+				default: '',
+			},
+			{
+				displayName: 'Deleted',
+				name: 'deleted',
+				type: 'boolean',
+				default: false,
+			},
+			{
+				displayName: 'Search All',
+				name: 'searchall',
+				type: 'string',
+				description:
+					'Search by matching any tag names, event descriptions, attribute values or attribute comments',
+				default: '',
+				displayOptions: {
+					hide: {
+						'/resource': ['attribute'],
+					},
+				},
+			},
+			{
+				displayName: 'Tags',
+				name: 'tags',
+				type: 'string',
+				placeholder: 'e.g. tag1,tag2',
+				hint: 'Comma-separated list of tags',
+				default: '',
+			},
+			{
+				displayName: 'Type',
+				name: 'type',
+				type: 'string',
+				placeholder: 'e.g. text',
+				default: '',
+			},
+			{
+				displayName: 'Published',
+				name: 'published',
+				type: 'boolean',
+				default: false,
+			},
+		],
+	},
+];
diff --git a/packages/nodes-base/nodes/Misp/descriptions/index.ts b/packages/nodes-base/nodes/Misp/descriptions/index.ts
index 9bd7d6ae364d2..a7800c3b30d71 100644
--- a/packages/nodes-base/nodes/Misp/descriptions/index.ts
+++ b/packages/nodes-base/nodes/Misp/descriptions/index.ts
@@ -4,6 +4,7 @@ export * from './EventTagDescription';
 export * from './FeedDescription';
 export * from './GalaxyDescription';
 export * from './NoticelistDescription';
+export * from './ObjectDescription';
 export * from './OrganisationDescription';
 export * from './TagDescription';
 export * from './UserDescription';
diff --git a/packages/nodes-base/nodes/Misp/misp.svg b/packages/nodes-base/nodes/Misp/misp.svg
index f7c43f77230c4..71559e344337f 100644
--- a/packages/nodes-base/nodes/Misp/misp.svg
+++ b/packages/nodes-base/nodes/Misp/misp.svg
@@ -1,41 +1 @@
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-	 viewBox="235 200 115 115"
-   id="svg4883"
-   version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="New document 5"
->
-	<g
-			id="g308"
-			transform="matrix(0.62542299,0,0,-0.62542299,101.24703,567.9731)">
-		<g
-				id="g310-5"
-				clip-path="url(#clipPath312-7)">
-			<g
-					id="g316"
-					transform="translate(385.579,529.5928)">
-				<path
-						d="m 0,0 -5.184,0 0,-56.985 c 0,-8.879 -5.16,-16.902 -15.523,-16.902 l -101.465,0 0,-2.709 c 0,-7.851 8.922,-15.763 18.084,-15.763 l 77.581,0 29.678,-17.449 -4.31,17.449 1.139,0 c 9.156,0 13.287,7.906 13.287,15.763 l 0,63.068 C 13.287,-5.683 9.156,0 0,0"
-						style="fill:#2fa1db;fill-opacity:1;fill-rule:nonzero;stroke:none"
-						id="path318"
-						inkscape:connector-curvature="0" />
-			</g>
-			<g
-					id="g320-4"
-					transform="translate(349.7253,569.1839)">
-				<path
-						d="m 0,0 -117.85,0 c -10.369,0 -22.301,-9.211 -22.301,-18.09 l 0,-71.424 c 0,-8.177 10.11,-14.082 19.807,-14.987 l -6.311,-23.958 40.441,23.786 86.214,0 c 10.363,0 19.937,6.286 19.937,15.159 l 0,57.786 0,13.638 C 19.937,-9.211 10.363,0 0,0 m -99.871,-60.292 c -5.88,0 -10.645,4.766 -10.645,10.646 0,5.88 4.765,10.646 10.645,10.646 5.874,0 10.646,-4.766 10.646,-10.646 0,-5.88 -4.772,-10.646 -10.646,-10.646 m 39.764,0 c -5.88,0 -10.646,4.766 -10.646,10.646 0,5.88 4.766,10.646 10.646,10.646 5.88,0 10.646,-4.766 10.646,-10.646 0,-5.88 -4.766,-10.646 -10.646,-10.646 m 39.77,0 c -5.881,0 -10.652,4.766 -10.652,10.646 0,5.88 4.771,10.646 10.652,10.646 5.868,0 10.645,-4.766 10.645,-10.646 0,-5.88 -4.777,-10.646 -10.645,-10.646"
-						style="fill:#2fa1db;fill-opacity:1;fill-rule:nonzero;stroke:none"
-						id="path322-8"
-						inkscape:connector-curvature="0" />
-			</g>
-		</g>
-	</g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="235 200 115 115"><g clip-path="url(#clipPath312-7)" transform="matrix(.62542 0 0 -.62542 101.247 567.973)"><path d="M0 0h-5.184v-56.985c0-8.879-5.16-16.902-15.523-16.902h-101.465v-2.709c0-7.851 8.922-15.763 18.084-15.763h77.581l29.678-17.449-4.31 17.449H0c9.156 0 13.287 7.906 13.287 15.763v63.068C13.287-5.683 9.156 0 0 0" style="fill:#2fa1db;fill-opacity:1;fill-rule:nonzero;stroke:none" transform="translate(385.579 529.593)"/><path d="M0 0h-117.85c-10.369 0-22.301-9.211-22.301-18.09v-71.424c0-8.177 10.11-14.082 19.807-14.987l-6.311-23.958 40.441 23.786H0c10.363 0 19.937 6.286 19.937 15.159v71.424C19.937-9.211 10.363 0 0 0m-99.871-60.292c-5.88 0-10.645 4.766-10.645 10.646S-105.751-39-99.871-39c5.874 0 10.646-4.766 10.646-10.646s-4.772-10.646-10.646-10.646m39.764 0c-5.88 0-10.646 4.766-10.646 10.646S-65.987-39-60.107-39s10.646-4.766 10.646-10.646-4.766-10.646-10.646-10.646m39.77 0c-5.881 0-10.652 4.766-10.652 10.646S-26.218-39-20.337-39c5.868 0 10.645-4.766 10.645-10.646s-4.777-10.646-10.645-10.646" style="fill:#2fa1db;fill-opacity:1;fill-rule:nonzero;stroke:none" transform="translate(349.725 569.184)"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Misp/types.d.ts b/packages/nodes-base/nodes/Misp/types.ts
similarity index 100%
rename from packages/nodes-base/nodes/Misp/types.d.ts
rename to packages/nodes-base/nodes/Misp/types.ts
diff --git a/packages/nodes-base/nodes/Mocean/GenericFunctions.ts b/packages/nodes-base/nodes/Mocean/GenericFunctions.ts
index 87868fc66006e..b6ef63be09a51 100644
--- a/packages/nodes-base/nodes/Mocean/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Mocean/GenericFunctions.ts
@@ -1,4 +1,10 @@
-import type { IExecuteFunctions, IHookFunctions, IDataObject, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IHookFunctions,
+	IDataObject,
+	JsonObject,
+	IHttpRequestMethods,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 /**
@@ -7,7 +13,7 @@ import { NodeApiError } from 'n8n-workflow';
  */
 export async function moceanApiRequest(
 	this: IHookFunctions | IExecuteFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject,
 	query?: IDataObject,
diff --git a/packages/nodes-base/nodes/Mocean/Mocean.node.ts b/packages/nodes-base/nodes/Mocean/Mocean.node.ts
index e027da5054060..137b47385cb72 100644
--- a/packages/nodes-base/nodes/Mocean/Mocean.node.ts
+++ b/packages/nodes-base/nodes/Mocean/Mocean.node.ts
@@ -8,6 +8,7 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 	JsonObject,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
@@ -220,7 +221,7 @@ export class Mocean implements INodeType {
 
 		let endpoint: string;
 		let operation: string;
-		let requestMethod: string;
+		let requestMethod: IHttpRequestMethods;
 		let resource: string;
 		let text: string;
 		let dlrUrl: string;
diff --git a/packages/nodes-base/nodes/Mocean/mocean.svg b/packages/nodes-base/nodes/Mocean/mocean.svg
index ed5d0de24ef70..406a00e517a0b 100644
--- a/packages/nodes-base/nodes/Mocean/mocean.svg
+++ b/packages/nodes-base/nodes/Mocean/mocean.svg
@@ -1,24 +1 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
- "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
- width="512.000000pt" height="512.000000pt" viewBox="0 0 512.000000 512.000000"
- preserveAspectRatio="xMidYMid meet">
-<metadata>
-Created by potrace 1.16, written by Peter Selinger 2001-2019
-</metadata>
-<g transform="translate(0.000000,512.000000) scale(0.100000,-0.100000)"
-fill="#0748A6" stroke="none">
-<path d="M0 2560 l0 -2560 2560 0 2560 0 0 2560 0 2560 -2560 0 -2560 0 0
--2560z m1544 1460 c204 -20 306 -107 374 -320 54 -167 640 -1761 648 -1762 5
-0 46 96 90 213 171 450 574 1519 590 1566 30 90 85 182 137 228 81 74 113 80
-447 80 l285 0 45 -25 c24 -14 58 -45 75 -68 l30 -44 3 -1375 c2 -1261 1 -1378
--14 -1394 -32 -35 -82 -44 -259 -44 -180 0 -227 8 -261 46 -18 20 -19 67 -24
-1233 l-5 1211 -47 -130 c-26 -71 -221 -615 -432 -1208 -212 -594 -393 -1088
--403 -1099 -44 -49 -66 -53 -268 -53 -174 0 -194 2 -237 22 -25 11 -53 32 -62
-45 -8 12 -82 219 -165 458 -329 959 -660 1916 -669 1940 -8 17 -11 -347 -11
--1181 -1 -1194 -1 -1207 -21 -1232 -34 -43 -79 -52 -270 -52 -155 0 -180 2
--215 20 -22 11 -45 31 -52 45 -10 20 -12 306 -10 1370 l2 1346 26 49 c31 62
-92 107 157 116 74 10 407 9 516 -1z"/>
-</g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="682.667" height="682.667" version="1.0" viewBox="0 0 512 512"><path fill="#0748A6" d="M0 256v256h512V0H0zm154.4-146c20.4 2 30.6 10.7 37.4 32 5.4 16.7 64 176.1 64.8 176.2.5 0 4.6-9.6 9-21.3 17.1-45 57.4-151.9 59-156.6 3-9 8.5-18.2 13.7-22.8 8.1-7.4 11.3-8 44.7-8h28.5l4.5 2.5c2.4 1.4 5.8 4.5 7.5 6.8l3 4.4.3 137.5c.2 126.1.1 137.8-1.4 139.4-3.2 3.5-8.2 4.4-25.9 4.4-18 0-22.7-.8-26.1-4.6-1.8-2-1.9-6.7-2.4-123.3l-.5-121.1-4.7 13c-2.6 7.1-22.1 61.5-43.2 120.8-21.2 59.4-39.3 108.8-40.3 109.9-4.4 4.9-6.6 5.3-26.8 5.3-17.4 0-19.4-.2-23.7-2.2-2.5-1.1-5.3-3.2-6.2-4.5-.8-1.2-8.2-21.9-16.5-45.8-32.9-95.9-66-191.6-66.9-194-.8-1.7-1.1 34.7-1.1 118.1-.1 119.4-.1 120.7-2.1 123.2-3.4 4.3-7.9 5.2-27 5.2-15.5 0-18-.2-21.5-2-2.2-1.1-4.5-3.1-5.2-4.5-1-2-1.2-30.6-1-137l.2-134.6 2.6-4.9c3.1-6.2 9.2-10.7 15.7-11.6 7.4-1 40.7-.9 51.6.1"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/MondayCom/BoardItemDescription.ts b/packages/nodes-base/nodes/MondayCom/BoardItemDescription.ts
index 4a9a7b9801677..e6a11ae0ac8cf 100644
--- a/packages/nodes-base/nodes/MondayCom/BoardItemDescription.ts
+++ b/packages/nodes-base/nodes/MondayCom/BoardItemDescription.ts
@@ -136,7 +136,7 @@ export const boardItemFields: INodeProperties[] = [
 				operation: ['changeColumnValue'],
 			},
 		},
-		description: 'The unique identifier of the item to to change column of',
+		description: 'The unique identifier of the item to change column of',
 	},
 	{
 		displayName: 'Column Name or ID',
diff --git a/packages/nodes-base/nodes/MondayCom/GenericFunctions.ts b/packages/nodes-base/nodes/MondayCom/GenericFunctions.ts
index 2c7831fe6578a..ff993c7d1c6ca 100644
--- a/packages/nodes-base/nodes/MondayCom/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/MondayCom/GenericFunctions.ts
@@ -1,5 +1,3 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IExecuteFunctions,
 	ILoadOptionsFunctions,
@@ -7,41 +5,39 @@ import type {
 	IHookFunctions,
 	IWebhookFunctions,
 	JsonObject,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import get from 'lodash.get';
+import get from 'lodash/get';
 
 export async function mondayComApiRequest(
 	this: IExecuteFunctions | IWebhookFunctions | IHookFunctions | ILoadOptionsFunctions,
-
 	body: any = {},
 	option: IDataObject = {},
 ): Promise<any> {
 	const authenticationMethod = this.getNodeParameter('authentication', 0) as string;
 
-	const endpoint = 'https://api.monday.com/v2/';
-
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		headers: {
+			'API-Version': '2023-10',
 			'Content-Type': 'application/json',
 		},
 		method: 'POST',
 		body,
-		uri: endpoint,
+		uri: 'https://api.monday.com/v2/',
 		json: true,
 	};
+
 	options = Object.assign({}, options, option);
-	try {
-		if (authenticationMethod === 'accessToken') {
-			const credentials = await this.getCredentials('mondayComApi');
 
-			options.headers = { Authorization: `Bearer ${credentials.apiToken}` };
+	try {
+		let credentialType = 'mondayComApi';
 
-			return await this.helpers.request(options);
-		} else {
-			return await this.helpers.requestOAuth2.call(this, 'mondayComOAuth2Api', options);
+		if (authenticationMethod === 'oAuth2') {
+			credentialType = 'mondayComOAuth2Api';
 		}
+		return await this.helpers.requestWithAuthentication.call(this, credentialType, options);
 	} catch (error) {
 		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
@@ -50,7 +46,6 @@ export async function mondayComApiRequest(
 export async function mondayComApiRequestAllItems(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	propertyName: string,
-
 	body: any = {},
 ): Promise<any> {
 	const returnData: IDataObject[] = [];
@@ -66,3 +61,41 @@ export async function mondayComApiRequestAllItems(
 	} while (get(responseData, propertyName).length > 0);
 	return returnData;
 }
+
+export async function mondayComApiPaginatedRequest(
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
+	itemsPath: string,
+	fieldsToReturn: string,
+	body: IDataObject = {},
+) {
+	const returnData: IDataObject[] = [];
+
+	const initialResponse = await mondayComApiRequest.call(this, body);
+	const data = get(initialResponse, itemsPath) as IDataObject;
+
+	if (data) {
+		returnData.push.apply(returnData, data.items as IDataObject[]);
+
+		let cursor: null | string = data.cursor as string;
+
+		while (cursor) {
+			const responseData = (
+				(await mondayComApiRequest.call(this, {
+					query: `query ( $cursor: String!) { next_items_page (cursor: $cursor, limit: 100) { cursor items ${fieldsToReturn} } }`,
+					variables: {
+						cursor,
+					},
+				})) as IDataObject
+			).data as { next_items_page: { cursor: string; items: IDataObject[] } };
+
+			if (responseData && responseData.next_items_page) {
+				returnData.push.apply(returnData, responseData.next_items_page.items);
+				cursor = responseData.next_items_page.cursor;
+			} else {
+				cursor = null;
+			}
+		}
+	}
+
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/MondayCom/MondayCom.node.ts b/packages/nodes-base/nodes/MondayCom/MondayCom.node.ts
index f35dc557e3544..2056616caa593 100644
--- a/packages/nodes-base/nodes/MondayCom/MondayCom.node.ts
+++ b/packages/nodes-base/nodes/MondayCom/MondayCom.node.ts
@@ -9,7 +9,12 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import { mondayComApiRequest, mondayComApiRequestAllItems } from './GenericFunctions';
+import { snakeCase } from 'change-case';
+import {
+	mondayComApiPaginatedRequest,
+	mondayComApiRequest,
+	mondayComApiRequestAllItems,
+} from './GenericFunctions';
 
 import { boardFields, boardOperations } from './BoardDescription';
 
@@ -19,8 +24,6 @@ import { boardGroupFields, boardGroupOperations } from './BoardGroupDescription'
 
 import { boardItemFields, boardItemOperations } from './BoardItemDescription';
 
-import { snakeCase } from 'change-case';
-
 interface IGraphqlBody {
 	query: string;
 	variables: IDataObject;
@@ -156,18 +159,17 @@ export class MondayCom implements INodeType {
 			// select them easily
 			async getColumns(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
 				const returnData: INodePropertyOptions[] = [];
-				const boardId = parseInt(this.getCurrentNodeParameter('boardId') as string, 10);
+				const boardId = this.getCurrentNodeParameter('boardId') as string;
 				const body: IGraphqlBody = {
-					query: `query ($boardId: [Int]) {
+					query: `query ($boardId: [ID!]) {
 							boards (ids: $boardId){
-								columns() {
+								columns {
 									id
 									title
 								}
 							}
 						}`,
 					variables: {
-						page: 1,
 						boardId,
 					},
 				};
@@ -191,11 +193,11 @@ export class MondayCom implements INodeType {
 			// select them easily
 			async getGroups(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
 				const returnData: INodePropertyOptions[] = [];
-				const boardId = parseInt(this.getCurrentNodeParameter('boardId') as string, 10);
+				const boardId = this.getCurrentNodeParameter('boardId') as string;
 				const body = {
-					query: `query ($boardId: Int!) {
+					query: `query ($boardId: ID!) {
 							boards ( ids: [$boardId]){
-								groups () {
+								groups {
 									id
 									title
 								}
@@ -235,10 +237,10 @@ export class MondayCom implements INodeType {
 			try {
 				if (resource === 'board') {
 					if (operation === 'archive') {
-						const boardId = parseInt(this.getNodeParameter('boardId', i) as string, 10);
+						const boardId = this.getNodeParameter('boardId', i);
 
 						const body: IGraphqlBody = {
-							query: `mutation ($id: Int!) {
+							query: `mutation ($id: ID!) {
 									archive_board (board_id: $id) {
 										id
 									}
@@ -257,7 +259,7 @@ export class MondayCom implements INodeType {
 						const additionalFields = this.getNodeParameter('additionalFields', i);
 
 						const body: IGraphqlBody = {
-							query: `mutation ($name: String!, $kind: BoardKind!, $templateId: Int) {
+							query: `mutation ($name: String!, $kind: BoardKind!, $templateId: ID) {
 									create_board (board_name: $name, board_kind: $kind, template_id: $templateId) {
 										id
 									}
@@ -276,10 +278,10 @@ export class MondayCom implements INodeType {
 						responseData = responseData.data.create_board;
 					}
 					if (operation === 'get') {
-						const boardId = parseInt(this.getNodeParameter('boardId', i) as string, 10);
+						const boardId = this.getNodeParameter('boardId', i);
 
 						const body: IGraphqlBody = {
-							query: `query ($id: [Int]) {
+							query: `query ($id: [ID!]) {
 									boards (ids: $id){
 										id
 										name
@@ -287,7 +289,7 @@ export class MondayCom implements INodeType {
 										state
 										board_folder_id
 										board_kind
-										owner() {
+										owners {
 											id
 										}
 									}
@@ -312,7 +314,7 @@ export class MondayCom implements INodeType {
 										state
 										board_folder_id
 										board_kind
-										owner() {
+										owners {
 											id
 										}
 									}
@@ -333,13 +335,13 @@ export class MondayCom implements INodeType {
 				}
 				if (resource === 'boardColumn') {
 					if (operation === 'create') {
-						const boardId = parseInt(this.getNodeParameter('boardId', i) as string, 10);
+						const boardId = this.getNodeParameter('boardId', i);
 						const title = this.getNodeParameter('title', i) as string;
 						const columnType = this.getNodeParameter('columnType', i) as string;
 						const additionalFields = this.getNodeParameter('additionalFields', i);
 
 						const body: IGraphqlBody = {
-							query: `mutation ($boardId: Int!, $title: String!, $columnType: ColumnType, $defaults: JSON ) {
+							query: `mutation ($boardId: ID!, $title: String!, $columnType: ColumnType!, $defaults: JSON ) {
 									create_column (board_id: $boardId, title: $title, column_type: $columnType, defaults: $defaults) {
 										id
 									}
@@ -368,12 +370,12 @@ export class MondayCom implements INodeType {
 						responseData = responseData.data.create_column;
 					}
 					if (operation === 'getAll') {
-						const boardId = parseInt(this.getNodeParameter('boardId', i) as string, 10);
+						const boardId = this.getNodeParameter('boardId', i);
 
 						const body: IGraphqlBody = {
-							query: `query ($boardId: [Int]) {
+							query: `query ($boardId: [ID!]) {
 									boards (ids: $boardId){
-										columns() {
+										columns {
 											id
 											title
 											type
@@ -394,11 +396,11 @@ export class MondayCom implements INodeType {
 				}
 				if (resource === 'boardGroup') {
 					if (operation === 'create') {
-						const boardId = parseInt(this.getNodeParameter('boardId', i) as string, 10);
+						const boardId = this.getNodeParameter('boardId', i);
 						const name = this.getNodeParameter('name', i) as string;
 
 						const body: IGraphqlBody = {
-							query: `mutation ($boardId: Int!, $groupName: String!) {
+							query: `mutation ($boardId: ID!, $groupName: String!) {
 									create_group (board_id: $boardId, group_name: $groupName) {
 										id
 									}
@@ -413,11 +415,11 @@ export class MondayCom implements INodeType {
 						responseData = responseData.data.create_group;
 					}
 					if (operation === 'delete') {
-						const boardId = parseInt(this.getNodeParameter('boardId', i) as string, 10);
+						const boardId = this.getNodeParameter('boardId', i);
 						const groupId = this.getNodeParameter('groupId', i) as string;
 
 						const body: IGraphqlBody = {
-							query: `mutation ($boardId: Int!, $groupId: String!) {
+							query: `mutation ($boardId: ID!, $groupId: String!) {
 									delete_group (board_id: $boardId, group_id: $groupId) {
 										id
 									}
@@ -432,13 +434,13 @@ export class MondayCom implements INodeType {
 						responseData = responseData.data.delete_group;
 					}
 					if (operation === 'getAll') {
-						const boardId = parseInt(this.getNodeParameter('boardId', i) as string, 10);
+						const boardId = this.getNodeParameter('boardId', i);
 
 						const body: IGraphqlBody = {
-							query: `query ($boardId: [Int]) {
+							query: `query ($boardId: [ID!]) {
 									boards (ids: $boardId, ){
 										id
-										groups() {
+										groups {
 											id
 											title
 											color
@@ -458,11 +460,11 @@ export class MondayCom implements INodeType {
 				}
 				if (resource === 'boardItem') {
 					if (operation === 'addUpdate') {
-						const itemId = parseInt(this.getNodeParameter('itemId', i) as string, 10);
+						const itemId = this.getNodeParameter('itemId', i);
 						const value = this.getNodeParameter('value', i) as string;
 
 						const body: IGraphqlBody = {
-							query: `mutation ($itemId: Int!, $value: String!) {
+							query: `mutation ($itemId: ID!, $value: String!) {
 									create_update (item_id: $itemId, body: $value) {
 										id
 									}
@@ -477,13 +479,13 @@ export class MondayCom implements INodeType {
 						responseData = responseData.data.create_update;
 					}
 					if (operation === 'changeColumnValue') {
-						const boardId = parseInt(this.getNodeParameter('boardId', i) as string, 10);
-						const itemId = parseInt(this.getNodeParameter('itemId', i) as string, 10);
+						const boardId = this.getNodeParameter('boardId', i);
+						const itemId = this.getNodeParameter('itemId', i);
 						const columnId = this.getNodeParameter('columnId', i) as string;
 						const value = this.getNodeParameter('value', i) as string;
 
 						const body: IGraphqlBody = {
-							query: `mutation ($boardId: Int!, $itemId: Int!, $columnId: String!, $value: JSON!) {
+							query: `mutation ($boardId: ID!, $itemId: ID!, $columnId: String!, $value: JSON!) {
 									change_column_value (board_id: $boardId, item_id: $itemId, column_id: $columnId, value: $value) {
 										id
 									}
@@ -508,12 +510,12 @@ export class MondayCom implements INodeType {
 						responseData = responseData.data.change_column_value;
 					}
 					if (operation === 'changeMultipleColumnValues') {
-						const boardId = parseInt(this.getNodeParameter('boardId', i) as string, 10);
-						const itemId = parseInt(this.getNodeParameter('itemId', i) as string, 10);
+						const boardId = this.getNodeParameter('boardId', i);
+						const itemId = this.getNodeParameter('itemId', i);
 						const columnValues = this.getNodeParameter('columnValues', i) as string;
 
 						const body: IGraphqlBody = {
-							query: `mutation ($boardId: Int!, $itemId: Int!, $columnValues: JSON!) {
+							query: `mutation ($boardId: ID!, $itemId: ID!, $columnValues: JSON!) {
 									change_multiple_column_values (board_id: $boardId, item_id: $itemId, column_values: $columnValues) {
 										id
 									}
@@ -537,13 +539,13 @@ export class MondayCom implements INodeType {
 						responseData = responseData.data.change_multiple_column_values;
 					}
 					if (operation === 'create') {
-						const boardId = parseInt(this.getNodeParameter('boardId', i) as string, 10);
+						const boardId = this.getNodeParameter('boardId', i);
 						const groupId = this.getNodeParameter('groupId', i) as string;
 						const itemName = this.getNodeParameter('name', i) as string;
 						const additionalFields = this.getNodeParameter('additionalFields', i);
 
 						const body: IGraphqlBody = {
-							query: `mutation ($boardId: Int!, $groupId: String!, $itemName: String!, $columnValues: JSON) {
+							query: `mutation ($boardId: ID!, $groupId: String!, $itemName: String!, $columnValues: JSON) {
 									create_item (board_id: $boardId, group_id: $groupId, item_name: $itemName, column_values: $columnValues) {
 										id
 									}
@@ -572,10 +574,10 @@ export class MondayCom implements INodeType {
 						responseData = responseData.data.create_item;
 					}
 					if (operation === 'delete') {
-						const itemId = parseInt(this.getNodeParameter('itemId', i) as string, 10);
+						const itemId = this.getNodeParameter('itemId', i);
 
 						const body: IGraphqlBody = {
-							query: `mutation ($itemId: Int!) {
+							query: `mutation ($itemId: ID!) {
 									delete_item (item_id: $itemId) {
 										id
 									}
@@ -588,24 +590,27 @@ export class MondayCom implements INodeType {
 						responseData = responseData.data.delete_item;
 					}
 					if (operation === 'get') {
-						const itemIds = (this.getNodeParameter('itemId', i) as string)
-							.split(',')
-							.map((n) => parseInt(n, 10));
+						const itemIds = (this.getNodeParameter('itemId', i) as string).split(',');
 
 						const body: IGraphqlBody = {
-							query: `query ($itemId: [Int!]){
+							query: `query ($itemId: [ID!]){
 									items (ids: $itemId) {
 										id
 										name
 										created_at
 										state
-										column_values() {
+										column_values {
 											id
 											text
-											title
 											type
 											value
-											additional_info
+											column {
+
+												title
+												archived
+												description
+												settings_str
+											}
 										}
 									}
 								}`,
@@ -617,101 +622,128 @@ export class MondayCom implements INodeType {
 						responseData = responseData.data.items;
 					}
 					if (operation === 'getAll') {
-						const boardId = parseInt(this.getNodeParameter('boardId', i) as string, 10);
+						const boardId = this.getNodeParameter('boardId', i);
 						const groupId = this.getNodeParameter('groupId', i) as string;
 						const returnAll = this.getNodeParameter('returnAll', i);
 
-						const body: IGraphqlBody = {
-							query: `query ($boardId: [Int], $groupId: [String], $page: Int, $limit: Int) {
-									boards (ids: $boardId) {
-										groups (ids: $groupId) {
-											id
-											items(limit: $limit, page: $page) {
-												id
-												name
-												created_at
-												state
-												column_values() {
-													id
-													text
-													title
-													type
-													value
-													additional_info
-												}
-											}
+						const fieldsToReturn = `
+						{
+							id
+							name
+							created_at
+							state
+							column_values {
+								id
+								text
+								type
+								value
+								column {
+									title
+									archived
+									description
+									settings_str
+								}
+							}
+						}
+						`;
+
+						const body = {
+							query: `query ($boardId: [ID!], $groupId: [String], $limit: Int) {
+								boards(ids: $boardId) {
+									groups(ids: $groupId) {
+										id
+										items_page(limit: $limit) {
+											cursor
+											items ${fieldsToReturn}
 										}
 									}
-								}`,
+								}
+							}`,
 							variables: {
 								boardId,
 								groupId,
+								limit: 100,
 							},
 						};
 
 						if (returnAll) {
-							responseData = await mondayComApiRequestAllItems.call(
+							responseData = await mondayComApiPaginatedRequest.call(
 								this,
-								'data.boards[0].groups[0].items',
-								body,
+								'data.boards[0].groups[0].items_page',
+								fieldsToReturn,
+								body as IDataObject,
 							);
 						} else {
 							body.variables.limit = this.getNodeParameter('limit', i);
 							responseData = await mondayComApiRequest.call(this, body);
-							responseData = responseData.data.boards[0].groups[0].items;
+							responseData = responseData.data.boards[0].groups[0].items_page.items;
 						}
 					}
 					if (operation === 'getByColumnValue') {
-						const boardId = parseInt(this.getNodeParameter('boardId', i) as string, 10);
+						const boardId = this.getNodeParameter('boardId', i);
 						const columnId = this.getNodeParameter('columnId', i) as string;
 						const columnValue = this.getNodeParameter('columnValue', i) as string;
 						const returnAll = this.getNodeParameter('returnAll', i);
 
-						const body: IGraphqlBody = {
-							query: `query ($boardId: Int!, $columnId: String!, $columnValue: String!, $page: Int, $limit: Int ){
-									items_by_column_values (board_id: $boardId, column_id: $columnId, column_value: $columnValue, page: $page, limit: $limit) {
-										id
-										name
-										created_at
-										state
-										board {
-											id
-										}
-										column_values() {
-											id
-											text
-											title
-											type
-											value
-											additional_info
-										}
-									}
-								}`,
+						const fieldsToReturn = `{
+							id
+							name
+							created_at
+							state
+							board {
+								id
+							}
+							column_values {
+								id
+								text
+								type
+								value
+								column {
+									title
+									archived
+									description
+									settings_str
+								}
+							}
+						}`;
+						const body = {
+							query: `query ($boardId: ID!, $columnId: String!, $columnValue: String!, $limit: Int) {
+								items_page_by_column_values(
+									limit: $limit
+									board_id: $boardId
+									columns: [{column_id: $columnId, column_values: [$columnValue]}]
+								) {
+									cursor
+									items ${fieldsToReturn}
+								}
+							}`,
 							variables: {
 								boardId,
 								columnId,
 								columnValue,
+								limit: 100,
 							},
 						};
 
 						if (returnAll) {
-							responseData = await mondayComApiRequestAllItems.call(
+							responseData = await mondayComApiPaginatedRequest.call(
 								this,
-								'data.items_by_column_values',
-								body,
+								'data.items_page_by_column_values',
+								fieldsToReturn,
+								body as IDataObject,
 							);
 						} else {
 							body.variables.limit = this.getNodeParameter('limit', i);
 							responseData = await mondayComApiRequest.call(this, body);
-							responseData = responseData.data.items_by_column_values;
+							responseData = responseData.data.items_page_by_column_values.items;
 						}
 					}
 					if (operation === 'move') {
 						const groupId = this.getNodeParameter('groupId', i) as string;
-						const itemId = parseInt(this.getNodeParameter('itemId', i) as string, 10);
+						const itemId = this.getNodeParameter('itemId', i);
 
 						const body: IGraphqlBody = {
-							query: `mutation ($groupId: String!, $itemId: Int!) {
+							query: `mutation ($groupId: String!, $itemId: ID!) {
 									move_item_to_group (group_id: $groupId, item_id: $itemId) {
 										id
 									}
@@ -745,6 +777,6 @@ export class MondayCom implements INodeType {
 			}
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/MondayCom/mondayCom.svg b/packages/nodes-base/nodes/MondayCom/mondayCom.svg
index e327f8e0c4792..ad1ba496e8d82 100644
--- a/packages/nodes-base/nodes/MondayCom/mondayCom.svg
+++ b/packages/nodes-base/nodes/MondayCom/mondayCom.svg
@@ -1 +1 @@
-<svg width="60" height="60" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round"><path d="M8.184 47.393A7.195 7.195 0 011.9 43.674a7.215 7.215 0 01.196-7.307l12.945-20.73a7.182 7.182 0 016.356-3.376 7.196 7.196 0 016.097 3.824 7.212 7.212 0 01-.258 7.2l-12.95 20.727a7.186 7.186 0 01-6.103 3.379l.001.002z" fill="#FF3D57"/><path d="M30.494 47.393a7.196 7.196 0 01-6.295-3.713 7.212 7.212 0 01.194-7.313l12.954-20.73a7.174 7.174 0 016.411-3.634A7.193 7.193 0 0150 15.923a7.211 7.211 0 01-.476 7.36l-12.93 20.73a7.186 7.186 0 01-6.102 3.378l.003.002z" fill="#FFCB00"/><path d="M45.591 40.357c0-3.895 3.214-7.034 7.205-7.034 3.99 0 7.204 3.137 7.204 7.034s-3.214 7.034-7.204 7.034c-3.991 0-7.205-3.137-7.205-7.034z" fill="#00D647"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="60" height="60"><g fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round"><path fill="#FF3D57" d="M8.184 47.393A7.2 7.2 0 0 1 1.9 43.674a7.22 7.22 0 0 1 .196-7.307l12.945-20.73a7.18 7.18 0 0 1 6.356-3.376 7.2 7.2 0 0 1 6.097 3.824 7.21 7.21 0 0 1-.258 7.2l-12.95 20.727a7.19 7.19 0 0 1-6.103 3.379z"/><path fill="#FFCB00" d="M30.494 47.393a7.2 7.2 0 0 1-6.295-3.713 7.21 7.21 0 0 1 .194-7.313l12.954-20.73a7.17 7.17 0 0 1 6.411-3.634A7.19 7.19 0 0 1 50 15.923a7.21 7.21 0 0 1-.476 7.36l-12.93 20.73a7.19 7.19 0 0 1-6.102 3.378l.003.002z"/><path fill="#00D647" d="M45.591 40.357c0-3.895 3.214-7.034 7.205-7.034S60 36.46 60 40.357s-3.214 7.034-7.204 7.034c-3.991 0-7.205-3.137-7.205-7.034"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/MongoDb/GenericFunctions.ts b/packages/nodes-base/nodes/MongoDb/GenericFunctions.ts
index ecf395b19766f..552ea52a38b68 100644
--- a/packages/nodes-base/nodes/MongoDb/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/MongoDb/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import { createSecureContext } from 'tls';
 import type {
 	ICredentialDataDecryptedObject,
 	IDataObject,
@@ -6,15 +7,16 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
+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 get from 'lodash.get';
-import set from 'lodash.set';
-
 /**
  * Standard way of building the MongoDB connection string, unless overridden with a provided string
  *
@@ -129,3 +131,41 @@ export function prepareFields(fields: string) {
 		.map((field) => field.trim())
 		.filter((field) => !!field);
 }
+
+export function stringifyObjectIDs(items: IDataObject[]) {
+	items.forEach((item) => {
+		if (item._id instanceof ObjectId) {
+			item._id = item._id.toString();
+		}
+		if (item.id instanceof ObjectId) {
+			item.id = item.id.toString();
+		}
+	});
+}
+
+export async function connectMongoClient(connectionString: string, credentials: IDataObject = {}) {
+	let client: MongoClient;
+
+	if (credentials.tls) {
+		const ca = credentials.ca ? formatPrivateKey(credentials.ca as string) : undefined;
+		const cert = credentials.cert ? formatPrivateKey(credentials.cert as string) : undefined;
+		const key = credentials.key ? formatPrivateKey(credentials.key as string) : undefined;
+		const passphrase = (credentials.passphrase as string) || undefined;
+
+		const secureContext = createSecureContext({
+			ca,
+			cert,
+			key,
+			passphrase,
+		});
+
+		client = await MongoClient.connect(connectionString, {
+			tls: true,
+			secureContext,
+		});
+	} else {
+		client = await MongoClient.connect(connectionString);
+	}
+
+	return client;
+}
diff --git a/packages/nodes-base/nodes/MongoDb/MongoDb.node.ts b/packages/nodes-base/nodes/MongoDb/MongoDb.node.ts
index 5bf7c723d2b7a..89e5e1ef0acc9 100644
--- a/packages/nodes-base/nodes/MongoDb/MongoDb.node.ts
+++ b/packages/nodes-base/nodes/MongoDb/MongoDb.node.ts
@@ -9,29 +9,51 @@ import type {
 	INodeTypeDescription,
 	JsonObject,
 } from 'n8n-workflow';
-import { NodeOperationError } from 'n8n-workflow';
+import { ApplicationError, NodeOperationError } from 'n8n-workflow';
 
-import { nodeDescription } from './MongoDbDescription';
+import type {
+	FindOneAndReplaceOptions,
+	FindOneAndUpdateOptions,
+	UpdateOptions,
+	Sort,
+} from 'mongodb';
+import { ObjectId } from 'mongodb';
+import { generatePairedItemData } from '../../utils/utilities';
+import { nodeProperties } from './MongoDbProperties';
 
 import {
 	buildParameterizedConnString,
+	connectMongoClient,
 	prepareFields,
 	prepareItems,
+	stringifyObjectIDs,
 	validateAndResolveMongoCredentials,
 } from './GenericFunctions';
 
-import type {
-	FindOneAndReplaceOptions,
-	FindOneAndUpdateOptions,
-	UpdateOptions,
-	Sort,
-} from 'mongodb';
-import { MongoClient, ObjectId } from 'mongodb';
-
 import type { IMongoParametricCredentials } from './mongoDb.types';
 
 export class MongoDb implements INodeType {
-	description: INodeTypeDescription = nodeDescription;
+	description: INodeTypeDescription = {
+		displayName: 'MongoDB',
+		name: 'mongoDb',
+		icon: 'file:mongodb.svg',
+		group: ['input'],
+		version: 1,
+		description: 'Find, insert and update documents in MongoDB',
+		defaults: {
+			name: 'MongoDB',
+		},
+		inputs: ['main'],
+		outputs: ['main'],
+		credentials: [
+			{
+				name: 'mongoDb',
+				required: true,
+				testedBy: 'mongoDbCredentialTest',
+			},
+		],
+		properties: nodeProperties,
+	};
 
 	methods = {
 		credentialTest: {
@@ -53,19 +75,21 @@ export class MongoDb implements INodeType {
 						);
 					}
 
-					const client: MongoClient = await MongoClient.connect(connectionString);
+					const client = await connectMongoClient(connectionString, credentials);
 
 					const { databases } = await client.db().admin().listDatabases();
 
 					if (!(databases as IDataObject[]).map((db) => db.name).includes(database)) {
 						// eslint-disable-next-line n8n-nodes-base/node-execute-block-wrong-error-thrown
-						throw new Error(`Database "${database}" does not exist`);
+						throw new ApplicationError(`Database "${database}" does not exist`, {
+							level: 'warning',
+						});
 					}
 					await client.close();
 				} catch (error) {
 					return {
 						status: 'Error',
-						message: error.message,
+						message: (error as Error).message,
 					};
 				}
 				return {
@@ -77,16 +101,13 @@ export class MongoDb implements INodeType {
 	};
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
-		const { database, connectionString } = validateAndResolveMongoCredentials(
-			this,
-			await this.getCredentials('mongoDb'),
-		);
+		const credentials = await this.getCredentials('mongoDb');
+		const { database, connectionString } = validateAndResolveMongoCredentials(this, credentials);
 
-		const client: MongoClient = await MongoClient.connect(connectionString);
+		const client = await connectMongoClient(connectionString, credentials);
 
 		const mdb = client.db(database);
 
-		const returnItems: INodeExecutionData[] = [];
 		let responseData: IDataObject | IDataObject[] = [];
 
 		const items = this.getInputData();
@@ -98,15 +119,17 @@ export class MongoDb implements INodeType {
 			// ----------------------------------
 
 			try {
-				const queryParameter = JSON.parse(this.getNodeParameter('query', 0) as string);
+				const queryParameter = JSON.parse(
+					this.getNodeParameter('query', 0) as string,
+				) as IDataObject;
 
 				if (queryParameter._id && typeof queryParameter._id === 'string') {
-					queryParameter._id = new ObjectId(queryParameter._id as string);
+					queryParameter._id = new ObjectId(queryParameter._id);
 				}
 
 				const query = mdb
 					.collection(this.getNodeParameter('collection', 0) as string)
-					.aggregate(queryParameter as Document[]);
+					.aggregate(queryParameter as unknown as Document[]);
 
 				responseData = await query.toArray();
 			} catch (error) {
@@ -140,20 +163,22 @@ export class MongoDb implements INodeType {
 			// ----------------------------------
 
 			try {
-				const queryParameter = JSON.parse(this.getNodeParameter('query', 0) as string);
+				const queryParameter = JSON.parse(
+					this.getNodeParameter('query', 0) as string,
+				) as IDataObject;
 
 				if (queryParameter._id && typeof queryParameter._id === 'string') {
-					queryParameter._id = new ObjectId(queryParameter._id as string);
+					queryParameter._id = new ObjectId(queryParameter._id);
 				}
 
 				let query = mdb
 					.collection(this.getNodeParameter('collection', 0) as string)
-					.find(queryParameter as Document);
+					.find(queryParameter as unknown as Document);
 
 				const options = this.getNodeParameter('options', 0);
 				const limit = options.limit as number;
 				const skip = options.skip as number;
-				const sort: Sort = options.sort && JSON.parse(options.sort as string);
+				const sort = options.sort && (JSON.parse(options.sort as string) as Sort);
 				if (skip > 0) {
 					query = query.skip(skip);
 				}
@@ -339,13 +364,15 @@ export class MongoDb implements INodeType {
 
 		await client.close();
 
-		const executionData = this.helpers.constructExecutionMetaData(
+		stringifyObjectIDs(responseData);
+
+		const itemData = generatePairedItemData(items.length);
+
+		const returnItems = this.helpers.constructExecutionMetaData(
 			this.helpers.returnJsonArray(responseData),
-			{ itemData: { item: 0 } },
+			{ itemData },
 		);
 
-		returnItems.push(...executionData);
-
-		return this.prepareOutputData(returnItems);
+		return [returnItems];
 	}
 }
diff --git a/packages/nodes-base/nodes/MongoDb/MongoDbDescription.ts b/packages/nodes-base/nodes/MongoDb/MongoDbDescription.ts
deleted file mode 100644
index c113f702e3961..0000000000000
--- a/packages/nodes-base/nodes/MongoDb/MongoDbDescription.ts
+++ /dev/null
@@ -1,286 +0,0 @@
-/* eslint-disable n8n-nodes-base/node-filename-against-convention */
-import type { INodeTypeDescription } from 'n8n-workflow';
-
-/**
- * Options to be displayed
- */
-export const nodeDescription: INodeTypeDescription = {
-	displayName: 'MongoDB',
-	name: 'mongoDb',
-	icon: 'file:mongodb.svg',
-	group: ['input'],
-	version: 1,
-	description: 'Find, insert and update documents in MongoDB',
-	defaults: {
-		name: 'MongoDB',
-	},
-	inputs: ['main'],
-	outputs: ['main'],
-	credentials: [
-		{
-			name: 'mongoDb',
-			required: true,
-			testedBy: 'mongoDbCredentialTest',
-		},
-	],
-	properties: [
-		{
-			displayName: 'Operation',
-			name: 'operation',
-			type: 'options',
-			noDataExpression: true,
-			options: [
-				{
-					name: 'Aggregate',
-					value: 'aggregate',
-					description: 'Aggregate documents',
-					action: 'Aggregate documents',
-				},
-				{
-					name: 'Delete',
-					value: 'delete',
-					description: 'Delete documents',
-					action: 'Delete documents',
-				},
-				{
-					name: 'Find',
-					value: 'find',
-					description: 'Find documents',
-					action: 'Find documents',
-				},
-				{
-					name: 'Find And Replace',
-					value: 'findOneAndReplace',
-					description: 'Find and replace documents',
-					action: 'Find and replace documents',
-				},
-				{
-					name: 'Find And Update',
-					value: 'findOneAndUpdate',
-					description: 'Find and update documents',
-					action: 'Find and update documents',
-				},
-				{
-					name: 'Insert',
-					value: 'insert',
-					description: 'Insert documents',
-					action: 'Insert documents',
-				},
-				{
-					name: 'Update',
-					value: 'update',
-					description: 'Update documents',
-					action: 'Update documents',
-				},
-			],
-			default: 'find',
-		},
-
-		{
-			displayName: 'Collection',
-			name: 'collection',
-			type: 'string',
-			required: true,
-			default: '',
-			description: 'MongoDB Collection',
-		},
-
-		// ----------------------------------
-		//         aggregate
-		// ----------------------------------
-		{
-			displayName: 'Query',
-			name: 'query',
-			type: 'json',
-			typeOptions: {
-				alwaysOpenEditWindow: true,
-			},
-			displayOptions: {
-				show: {
-					operation: ['aggregate'],
-				},
-			},
-			default: '',
-			placeholder: '[{ "$match": { "$gt": "1950-01-01" }, ... }]',
-			hint: 'Learn more about aggregation pipeline <a href="https://docs.mongodb.com/manual/core/aggregation-pipeline/">here</a>',
-			required: true,
-			description: 'MongoDB aggregation pipeline query in JSON format',
-		},
-
-		// ----------------------------------
-		//         delete
-		// ----------------------------------
-		{
-			displayName: 'Delete Query (JSON Format)',
-			name: 'query',
-			type: 'json',
-			typeOptions: {
-				rows: 5,
-			},
-			displayOptions: {
-				show: {
-					operation: ['delete'],
-				},
-			},
-			default: '{}',
-			placeholder: '{ "birth": { "$gt": "1950-01-01" } }',
-			required: true,
-			description: 'MongoDB Delete query',
-		},
-
-		// ----------------------------------
-		//         find
-		// ----------------------------------
-		{
-			displayName: 'Options',
-			name: 'options',
-			type: 'collection',
-			displayOptions: {
-				show: {
-					operation: ['find'],
-				},
-			},
-			default: {},
-			placeholder: 'Add options',
-			description: 'Add query options',
-			options: [
-				{
-					displayName: 'Limit',
-					name: 'limit',
-					type: 'number',
-					typeOptions: {
-						minValue: 1,
-					},
-					default: 0,
-					// eslint-disable-next-line n8n-nodes-base/node-param-description-wrong-for-limit
-					description:
-						'Use limit to specify the maximum number of documents or 0 for unlimited documents',
-				},
-				{
-					displayName: 'Skip',
-					name: 'skip',
-					type: 'number',
-					default: 0,
-					description: 'The number of documents to skip in the results set',
-				},
-				{
-					displayName: 'Sort (JSON Format)',
-					name: 'sort',
-					type: 'json',
-					typeOptions: {
-						rows: 2,
-					},
-					default: '{}',
-					placeholder: '{ "field": -1 }',
-					description: 'A JSON that defines the sort order of the result set',
-				},
-			],
-		},
-		{
-			displayName: 'Query (JSON Format)',
-			name: 'query',
-			type: 'json',
-			typeOptions: {
-				rows: 5,
-			},
-			displayOptions: {
-				show: {
-					operation: ['find'],
-				},
-			},
-			default: '{}',
-			placeholder: '{ "birth": { "$gt": "1950-01-01" } }',
-			required: true,
-			description: 'MongoDB Find query',
-		},
-
-		// ----------------------------------
-		//         insert
-		// ----------------------------------
-		{
-			displayName: 'Fields',
-			name: 'fields',
-			type: 'string',
-			displayOptions: {
-				show: {
-					operation: ['insert'],
-				},
-			},
-			default: '',
-			placeholder: 'name,description',
-			description: 'Comma-separated list of the fields to be included into the new document',
-		},
-
-		// ----------------------------------
-		//         update
-		// ----------------------------------
-		{
-			displayName: 'Update Key',
-			name: 'updateKey',
-			type: 'string',
-			displayOptions: {
-				show: {
-					operation: ['update', 'findOneAndReplace', 'findOneAndUpdate'],
-				},
-			},
-			default: 'id',
-			required: true,
-			// eslint-disable-next-line n8n-nodes-base/node-param-description-miscased-id
-			description:
-				'Name of the property which decides which rows in the database should be updated. Normally that would be "id".',
-		},
-		{
-			displayName: 'Fields',
-			name: 'fields',
-			type: 'string',
-			displayOptions: {
-				show: {
-					operation: ['update', 'findOneAndReplace', 'findOneAndUpdate'],
-				},
-			},
-			default: '',
-			placeholder: 'name,description',
-			description: 'Comma-separated list of the fields to be included into the new document',
-		},
-		{
-			displayName: 'Upsert',
-			name: 'upsert',
-			type: 'boolean',
-			displayOptions: {
-				show: {
-					operation: ['update', 'findOneAndReplace', 'findOneAndUpdate'],
-				},
-			},
-			default: false,
-			description: 'Whether to perform an insert if no documents match the update key',
-		},
-		{
-			displayName: 'Options',
-			name: 'options',
-			type: 'collection',
-			displayOptions: {
-				show: {
-					operation: ['update', 'insert', 'findOneAndReplace', 'findOneAndUpdate'],
-				},
-			},
-			placeholder: 'Add Option',
-			default: {},
-			options: [
-				{
-					displayName: 'Date Fields',
-					name: 'dateFields',
-					type: 'string',
-					default: '',
-					description: 'Comma separeted list of fields that will be parse as Mongo Date type',
-				},
-				{
-					displayName: 'Use Dot Notation',
-					name: 'useDotNotation',
-					type: 'boolean',
-					default: false,
-					description: 'Whether to use dot notation to access date fields',
-				},
-			],
-		},
-	],
-};
diff --git a/packages/nodes-base/nodes/MongoDb/MongoDbProperties.ts b/packages/nodes-base/nodes/MongoDb/MongoDbProperties.ts
new file mode 100644
index 0000000000000..467f019e03024
--- /dev/null
+++ b/packages/nodes-base/nodes/MongoDb/MongoDbProperties.ts
@@ -0,0 +1,262 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+export const nodeProperties: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		options: [
+			{
+				name: 'Aggregate',
+				value: 'aggregate',
+				description: 'Aggregate documents',
+				action: 'Aggregate documents',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete documents',
+				action: 'Delete documents',
+			},
+			{
+				name: 'Find',
+				value: 'find',
+				description: 'Find documents',
+				action: 'Find documents',
+			},
+			{
+				name: 'Find And Replace',
+				value: 'findOneAndReplace',
+				description: 'Find and replace documents',
+				action: 'Find and replace documents',
+			},
+			{
+				name: 'Find And Update',
+				value: 'findOneAndUpdate',
+				description: 'Find and update documents',
+				action: 'Find and update documents',
+			},
+			{
+				name: 'Insert',
+				value: 'insert',
+				description: 'Insert documents',
+				action: 'Insert documents',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update documents',
+				action: 'Update documents',
+			},
+		],
+		default: 'find',
+	},
+
+	{
+		displayName: 'Collection',
+		name: 'collection',
+		type: 'string',
+		required: true,
+		default: '',
+		description: 'MongoDB Collection',
+	},
+
+	// ----------------------------------
+	//         aggregate
+	// ----------------------------------
+	{
+		displayName: 'Query',
+		name: 'query',
+		type: 'json',
+		typeOptions: {
+			alwaysOpenEditWindow: true,
+		},
+		displayOptions: {
+			show: {
+				operation: ['aggregate'],
+			},
+		},
+		default: '',
+		placeholder: '[{ "$match": { "$gt": "1950-01-01" }, ... }]',
+		hint: 'Learn more about aggregation pipeline <a href="https://docs.mongodb.com/manual/core/aggregation-pipeline/">here</a>',
+		required: true,
+		description: 'MongoDB aggregation pipeline query in JSON format',
+	},
+
+	// ----------------------------------
+	//         delete
+	// ----------------------------------
+	{
+		displayName: 'Delete Query (JSON Format)',
+		name: 'query',
+		type: 'json',
+		typeOptions: {
+			rows: 5,
+		},
+		displayOptions: {
+			show: {
+				operation: ['delete'],
+			},
+		},
+		default: '{}',
+		placeholder: '{ "birth": { "$gt": "1950-01-01" } }',
+		required: true,
+		description: 'MongoDB Delete query',
+	},
+
+	// ----------------------------------
+	//         find
+	// ----------------------------------
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		displayOptions: {
+			show: {
+				operation: ['find'],
+			},
+		},
+		default: {},
+		placeholder: 'Add options',
+		description: 'Add query options',
+		options: [
+			{
+				displayName: 'Limit',
+				name: 'limit',
+				type: 'number',
+				typeOptions: {
+					minValue: 1,
+				},
+				default: 0,
+				// eslint-disable-next-line n8n-nodes-base/node-param-description-wrong-for-limit
+				description:
+					'Use limit to specify the maximum number of documents or 0 for unlimited documents',
+			},
+			{
+				displayName: 'Skip',
+				name: 'skip',
+				type: 'number',
+				default: 0,
+				description: 'The number of documents to skip in the results set',
+			},
+			{
+				displayName: 'Sort (JSON Format)',
+				name: 'sort',
+				type: 'json',
+				typeOptions: {
+					rows: 2,
+				},
+				default: '{}',
+				placeholder: '{ "field": -1 }',
+				description: 'A JSON that defines the sort order of the result set',
+			},
+		],
+	},
+	{
+		displayName: 'Query (JSON Format)',
+		name: 'query',
+		type: 'json',
+		typeOptions: {
+			rows: 5,
+		},
+		displayOptions: {
+			show: {
+				operation: ['find'],
+			},
+		},
+		default: '{}',
+		placeholder: '{ "birth": { "$gt": "1950-01-01" } }',
+		required: true,
+		description: 'MongoDB Find query',
+	},
+
+	// ----------------------------------
+	//         insert
+	// ----------------------------------
+	{
+		displayName: 'Fields',
+		name: 'fields',
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: ['insert'],
+			},
+		},
+		default: '',
+		placeholder: 'name,description',
+		description: 'Comma-separated list of the fields to be included into the new document',
+	},
+
+	// ----------------------------------
+	//         update
+	// ----------------------------------
+	{
+		displayName: 'Update Key',
+		name: 'updateKey',
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: ['update', 'findOneAndReplace', 'findOneAndUpdate'],
+			},
+		},
+		default: 'id',
+		required: true,
+		// eslint-disable-next-line n8n-nodes-base/node-param-description-miscased-id
+		description:
+			'Name of the property which decides which rows in the database should be updated. Normally that would be "id".',
+	},
+	{
+		displayName: 'Fields',
+		name: 'fields',
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: ['update', 'findOneAndReplace', 'findOneAndUpdate'],
+			},
+		},
+		default: '',
+		placeholder: 'name,description',
+		description: 'Comma-separated list of the fields to be included into the new document',
+	},
+	{
+		displayName: 'Upsert',
+		name: 'upsert',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				operation: ['update', 'findOneAndReplace', 'findOneAndUpdate'],
+			},
+		},
+		default: false,
+		description: 'Whether to perform an insert if no documents match the update key',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		displayOptions: {
+			show: {
+				operation: ['update', 'insert', 'findOneAndReplace', 'findOneAndUpdate'],
+			},
+		},
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			{
+				displayName: 'Date Fields',
+				name: 'dateFields',
+				type: 'string',
+				default: '',
+				description: 'Comma separeted list of fields that will be parse as Mongo Date type',
+			},
+			{
+				displayName: 'Use Dot Notation',
+				name: 'useDotNotation',
+				type: 'boolean',
+				default: false,
+				description: 'Whether to use dot notation to access date fields',
+			},
+		],
+	},
+];
diff --git a/packages/nodes-base/nodes/MongoDb/mongodb.svg b/packages/nodes-base/nodes/MongoDb/mongodb.svg
index d9f01442626b3..8a5e3e04cbb41 100644
--- a/packages/nodes-base/nodes/MongoDb/mongodb.svg
+++ b/packages/nodes-base/nodes/MongoDb/mongodb.svg
@@ -1 +1 @@
-<svg height="64" viewBox="0 0 32 32" width="64" xmlns="http://www.w3.org/2000/svg"><path d="M15.9.087l.854 1.604c.192.296.4.558.645.802a22.406 22.406 0 012.004 2.266c1.447 1.9 2.423 4.01 3.12 6.292.418 1.394.645 2.824.662 4.27.07 4.323-1.412 8.035-4.4 11.12a12.7 12.7 0 01-1.57 1.342c-.296 0-.436-.227-.558-.436a3.589 3.589 0 01-.436-1.255c-.105-.523-.174-1.046-.14-1.586v-.244C16.057 24.21 15.796.21 15.9.087z" fill="#599636"/><path d="M15.9.034c-.035-.07-.07-.017-.105.017.017.35-.105.662-.296.96-.21.296-.488.523-.767.767-1.55 1.342-2.77 2.963-3.747 4.776-1.3 2.44-1.97 5.055-2.16 7.808-.087.993.314 4.497.627 5.508.854 2.684 2.388 4.933 4.375 6.885.488.47 1.01.906 1.55 1.325.157 0 .174-.14.21-.244a4.78 4.78 0 00.157-.68l.35-2.614z" fill="#6cac48"/><path d="M16.754 28.845c.035-.4.227-.732.436-1.063-.21-.087-.366-.26-.488-.453a3.235 3.235 0 01-.26-.575c-.244-.732-.296-1.5-.366-2.248v-.453c-.087.07-.105.662-.105.75a17.37 17.37 0 01-.314 2.353c-.052.314-.087.627-.28.906 0 .035 0 .07.017.122.314.924.4 1.865.453 2.824v.35c0 .418-.017.33.33.47.14.052.296.07.436.174.105 0 .122-.087.122-.157l-.052-.575v-1.604c-.017-.28.035-.558.07-.82z" fill="#c2bfbf"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 32 32"><path fill="#599636" d="m15.9.087.854 1.604c.192.296.4.558.645.802a22 22 0 0 1 2.004 2.266c1.447 1.9 2.423 4.01 3.12 6.292.418 1.394.645 2.824.662 4.27.07 4.323-1.412 8.035-4.4 11.12a13 13 0 0 1-1.57 1.342c-.296 0-.436-.227-.558-.436a3.6 3.6 0 0 1-.436-1.255c-.105-.523-.174-1.046-.14-1.586v-.244C16.057 24.21 15.796.21 15.9.087"/><path fill="#6cac48" d="M15.9.034c-.035-.07-.07-.017-.105.017.017.35-.105.662-.296.96-.21.296-.488.523-.767.767-1.55 1.342-2.77 2.963-3.747 4.776-1.3 2.44-1.97 5.055-2.16 7.808-.087.993.314 4.497.627 5.508.854 2.684 2.388 4.933 4.375 6.885.488.47 1.01.906 1.55 1.325.157 0 .174-.14.21-.244a5 5 0 0 0 .157-.68l.35-2.614z"/><path fill="#c2bfbf" d="M16.754 28.845c.035-.4.227-.732.436-1.063-.21-.087-.366-.26-.488-.453a3.2 3.2 0 0 1-.26-.575c-.244-.732-.296-1.5-.366-2.248v-.453c-.087.07-.105.662-.105.75a17 17 0 0 1-.314 2.353c-.052.314-.087.627-.28.906 0 .035 0 .07.017.122.314.924.4 1.865.453 2.824v.35c0 .418-.017.33.33.47.14.052.296.07.436.174.105 0 .122-.087.122-.157l-.052-.575v-1.604c-.017-.28.035-.558.07-.82z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/MonicaCrm/GenericFunctions.ts b/packages/nodes-base/nodes/MonicaCrm/GenericFunctions.ts
index fc788a917011a..e8f9e66778a91 100644
--- a/packages/nodes-base/nodes/MonicaCrm/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/MonicaCrm/GenericFunctions.ts
@@ -3,16 +3,16 @@ import type {
 	IDataObject,
 	ILoadOptionsFunctions,
 	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
-import type { OptionsWithUri } from 'request';
-
 import type { LoaderGetResponse } from './types';
 
 export async function monicaCrmApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject = {},
 	qs: IDataObject = {},
@@ -33,7 +33,7 @@ export async function monicaCrmApiRequest(
 		baseUrl = credentials.domain;
 	}
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			Authorization: `Bearer ${credentials.apiToken}`,
 		},
@@ -61,7 +61,7 @@ export async function monicaCrmApiRequest(
 
 export async function monicaCrmApiRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject = {},
 	qs: IDataObject = {},
diff --git a/packages/nodes-base/nodes/MonicaCrm/MonicaCrm.node.ts b/packages/nodes-base/nodes/MonicaCrm/MonicaCrm.node.ts
index 84cefdbd55982..83c6bb660f467 100644
--- a/packages/nodes-base/nodes/MonicaCrm/MonicaCrm.node.ts
+++ b/packages/nodes-base/nodes/MonicaCrm/MonicaCrm.node.ts
@@ -1172,6 +1172,6 @@ export class MonicaCrm implements INodeType {
 			returnData.push(...executionData);
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/MonicaCrm/types.d.ts b/packages/nodes-base/nodes/MonicaCrm/types.ts
similarity index 100%
rename from packages/nodes-base/nodes/MonicaCrm/types.d.ts
rename to packages/nodes-base/nodes/MonicaCrm/types.ts
diff --git a/packages/nodes-base/nodes/MoveBinaryData/MoveBinaryData.node.json b/packages/nodes-base/nodes/MoveBinaryData/MoveBinaryData.node.json
index 0693d5b238a33..79435854ea634 100644
--- a/packages/nodes-base/nodes/MoveBinaryData/MoveBinaryData.node.json
+++ b/packages/nodes-base/nodes/MoveBinaryData/MoveBinaryData.node.json
@@ -6,11 +6,12 @@
 	"resources": {
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.movebinarydata/"
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.converttofile/"
 			}
 		]
 	},
 	"subcategories": {
 		"Core Nodes": ["Files"]
-	}
+	},
+	"alias": ["Move Binary Data"]
 }
diff --git a/packages/nodes-base/nodes/MoveBinaryData/MoveBinaryData.node.ts b/packages/nodes-base/nodes/MoveBinaryData/MoveBinaryData.node.ts
index 9effb343727e6..e4c536250aede 100644
--- a/packages/nodes-base/nodes/MoveBinaryData/MoveBinaryData.node.ts
+++ b/packages/nodes-base/nodes/MoveBinaryData/MoveBinaryData.node.ts
@@ -1,26 +1,19 @@
-import get from 'lodash.get';
-import set from 'lodash.set';
-import unset from 'lodash.unset';
-import prettyBytes from 'pretty-bytes';
+import get from 'lodash/get';
+import set from 'lodash/set';
+import unset from 'lodash/unset';
 
 import type {
 	IExecuteFunctions,
-	IBinaryData,
 	IDataObject,
 	INodeExecutionData,
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import {
-	BINARY_ENCODING,
-	deepCopy,
-	jsonParse,
-	NodeOperationError,
-	fileTypeFromMimeType,
-} from 'n8n-workflow';
+import { BINARY_ENCODING, deepCopy, jsonParse, NodeOperationError } from 'n8n-workflow';
 
 import iconv from 'iconv-lite';
+
 iconv.encodingExists('utf8');
 
 // Create options for bomAware and encoding
@@ -49,15 +42,16 @@ encodeDecodeOptions.sort((a, b) => {
 
 export class MoveBinaryData implements INodeType {
 	description: INodeTypeDescription = {
-		displayName: 'Move Binary Data',
+		hidden: true,
+		displayName: 'Convert to/from binary data',
 		name: 'moveBinaryData',
 		icon: 'fa:exchange-alt',
 		group: ['transform'],
-		version: 1,
+		version: [1, 1.1],
 		subtitle: '={{$parameter["mode"]==="binaryToJson" ? "Binary to JSON" : "JSON to Binary"}}',
 		description: 'Move data between binary and JSON properties',
 		defaults: {
-			name: 'Move Binary Data',
+			name: 'Convert to/from binary data',
 			color: '#7722CC',
 		},
 		inputs: ['main'],
@@ -186,6 +180,20 @@ export class MoveBinaryData implements INodeType {
 				placeholder: 'Add Option',
 				default: {},
 				options: [
+					{
+						displayName: 'Add Byte Order Mark (BOM)',
+						name: 'addBOM',
+						description:
+							'Whether to add special marker at the start of your text file. This marker helps some programs understand how to read the file correctly.',
+						displayOptions: {
+							show: {
+								'/mode': ['jsonToBinary'],
+								encoding: bomAware,
+							},
+						},
+						type: 'boolean',
+						default: false,
+					},
 					{
 						displayName: 'Data Is Base64',
 						name: 'dataIsBase64',
@@ -213,7 +221,7 @@ export class MoveBinaryData implements INodeType {
 							},
 						},
 						default: 'utf8',
-						description: 'Set the encoding of the data stream',
+						description: 'Choose the character set to use to encode the data',
 					},
 					{
 						displayName: 'Strip BOM',
@@ -227,18 +235,6 @@ export class MoveBinaryData implements INodeType {
 						type: 'boolean',
 						default: true,
 					},
-					{
-						displayName: 'Add BOM',
-						name: 'addBOM',
-						displayOptions: {
-							show: {
-								'/mode': ['jsonToBinary'],
-								encoding: bomAware,
-							},
-						},
-						type: 'boolean',
-						default: false,
-					},
 					{
 						displayName: 'File Name',
 						name: 'fileName',
@@ -292,7 +288,7 @@ export class MoveBinaryData implements INodeType {
 						description: 'Whether to keep the binary data as base64 string',
 					},
 					{
-						displayName: 'Mime Type',
+						displayName: 'MIME Type',
 						name: 'mimeType',
 						type: 'string',
 						displayOptions: {
@@ -326,9 +322,7 @@ export class MoveBinaryData implements INodeType {
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const items = this.getInputData();
-
 		const mode = this.getNodeParameter('mode', 0) as string;
-
 		const returnData: INodeExecutionData[] = [];
 
 		let item: INodeExecutionData;
@@ -421,29 +415,39 @@ export class MoveBinaryData implements INodeType {
 					newItem.binary = {};
 				}
 
-				const mimeType = (options.mimeType as string) || 'application/json';
-				const convertedValue: IBinaryData = {
-					data: '',
-					mimeType,
-					fileType: fileTypeFromMimeType(mimeType),
-				};
+				const nodeVersion = this.getNode().typeVersion;
+				let mimeType = options.mimeType as string;
 
+				let data: Buffer;
 				if (options.dataIsBase64 !== true) {
 					if (options.useRawData !== true || typeof value === 'object') {
 						value = JSON.stringify(value);
-					}
 
-					convertedValue.fileSize = prettyBytes(value.length);
+						if (!mimeType) {
+							mimeType = 'application/json';
+						}
+					}
 
-					convertedValue.data = iconv
-						.encode(value, encoding, { addBOM: options.addBOM as boolean })
-						.toString(BINARY_ENCODING);
+					data = iconv.encode(value, encoding, { addBOM: options.addBOM as boolean });
 				} else {
-					convertedValue.data = value as unknown as string;
+					data = Buffer.from(value as unknown as string, BINARY_ENCODING);
 				}
 
-				if (options.fileName) {
-					convertedValue.fileName = options.fileName as string;
+				if (!mimeType && nodeVersion === 1) {
+					mimeType = 'application/json';
+				}
+
+				const convertedValue = await this.helpers.prepareBinaryData(
+					data,
+					options.fileName as string,
+					mimeType,
+				);
+
+				if (!convertedValue.fileName && nodeVersion > 1) {
+					const fileExtension = convertedValue.fileExtension
+						? `.${convertedValue.fileExtension}`
+						: '';
+					convertedValue.fileName = `file${fileExtension}`;
 				}
 
 				set(newItem.binary, destinationKey, convertedValue);
diff --git a/packages/nodes-base/nodes/MoveBinaryData/test/MoveBinaryData.test.ts b/packages/nodes-base/nodes/MoveBinaryData/test/MoveBinaryData.test.ts
index c9c190b5cb50a..698284f9be081 100644
--- a/packages/nodes-base/nodes/MoveBinaryData/test/MoveBinaryData.test.ts
+++ b/packages/nodes-base/nodes/MoveBinaryData/test/MoveBinaryData.test.ts
@@ -1,12 +1,12 @@
 /* eslint-disable @typescript-eslint/no-loop-func */
-import * as Helpers from '../../../test/nodes/Helpers';
-import type { WorkflowTestData } from '../../../test/nodes/types';
-import { executeWorkflow } from '../../../test/nodes/ExecuteWorkflow';
 import path from 'path';
+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 () => {
-		await Helpers.initBinaryDataManager();
+		await Helpers.initBinaryDataService();
 	});
 
 	const workflow = Helpers.readJsonFileSync(
@@ -84,6 +84,7 @@ describe('Test Move Binary Data Node', () => {
 										mimeType: 'application/json',
 										fileType: 'json',
 										fileSize: '59 B',
+										fileExtension: 'json',
 									},
 								},
 							},
@@ -103,6 +104,7 @@ describe('Test Move Binary Data Node', () => {
 										fileType: 'json',
 										fileSize: '10 B',
 										fileName: 'example.json',
+										fileExtension: 'json',
 									},
 								},
 							},
diff --git a/packages/nodes-base/nodes/Msg91/GenericFunctions.ts b/packages/nodes-base/nodes/Msg91/GenericFunctions.ts
index cabc018cf64e4..35ef4e00ac5dc 100644
--- a/packages/nodes-base/nodes/Msg91/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Msg91/GenericFunctions.ts
@@ -1,4 +1,10 @@
-import type { IExecuteFunctions, IHookFunctions, IDataObject, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IHookFunctions,
+	IDataObject,
+	JsonObject,
+	IHttpRequestMethods,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 /**
@@ -7,7 +13,7 @@ import { NodeApiError } from 'n8n-workflow';
  */
 export async function msg91ApiRequest(
 	this: IHookFunctions | IExecuteFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject,
 	query?: IDataObject,
diff --git a/packages/nodes-base/nodes/Msg91/Msg91.node.ts b/packages/nodes-base/nodes/Msg91/Msg91.node.ts
index dd099e2f70f77..6f62c5eec1d04 100644
--- a/packages/nodes-base/nodes/Msg91/Msg91.node.ts
+++ b/packages/nodes-base/nodes/Msg91/Msg91.node.ts
@@ -4,6 +4,7 @@ import type {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
@@ -123,7 +124,7 @@ export class Msg91 implements INodeType {
 		// For Query string
 		let qs: IDataObject;
 
-		let requestMethod: string;
+		let requestMethod: IHttpRequestMethods;
 		let endpoint: string;
 
 		for (let i = 0; i < items.length; i++) {
diff --git a/packages/nodes-base/nodes/MySql/MySql.node.ts b/packages/nodes-base/nodes/MySql/MySql.node.ts
index 1d055b5ee5a80..30cbbaada0b12 100644
--- a/packages/nodes-base/nodes/MySql/MySql.node.ts
+++ b/packages/nodes-base/nodes/MySql/MySql.node.ts
@@ -11,13 +11,18 @@ export class MySql extends VersionedNodeType {
 			name: 'mySql',
 			icon: 'file:mysql.svg',
 			group: ['input'],
-			defaultVersion: 2,
+			defaultVersion: 2.4,
 			description: 'Get, add and update data in MySQL',
+			parameterPane: 'wide',
 		};
 
 		const nodeVersions: IVersionedNodeType['nodeVersions'] = {
 			1: new MySqlV1(baseDescription),
 			2: new MySqlV2(baseDescription),
+			2.1: new MySqlV2(baseDescription),
+			2.2: new MySqlV2(baseDescription),
+			2.3: new MySqlV2(baseDescription),
+			2.4: new MySqlV2(baseDescription),
 		};
 
 		super(nodeVersions, baseDescription);
diff --git a/packages/nodes-base/nodes/MySql/mysql.svg b/packages/nodes-base/nodes/MySql/mysql.svg
index aa7836e3a3abf..165fd30c82abd 100644
--- a/packages/nodes-base/nodes/MySql/mysql.svg
+++ b/packages/nodes-base/nodes/MySql/mysql.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 81 80" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><path d="M73.689 60.737c-4.353-.109-7.726.327-10.556 1.524-.816.326-2.122.327-2.231 1.36.436.436.49 1.143.871 1.741.653 1.088 1.795 2.557 2.829 3.319 1.142.87 2.285 1.741 3.482 2.503 2.122 1.306 4.516 2.068 6.584 3.373 1.197.761 2.394 1.741 3.591 2.557.599.435.979 1.142 1.741 1.415v-.163c-.381-.49-.49-1.197-.87-1.741-.544-.544-1.088-1.034-1.632-1.578-1.578-2.122-3.537-3.972-5.659-5.495-1.741-1.197-5.55-2.829-6.257-4.843l-.109-.109c1.197-.109 2.612-.544 3.754-.871 1.85-.49 3.537-.381 5.441-.87a47.87 47.87 0 002.612-.762v-.489c-.979-.98-1.687-2.285-2.72-3.21-2.775-2.395-5.822-4.734-8.978-6.692-1.687-1.088-3.863-1.796-5.659-2.721-.653-.327-1.741-.49-2.122-1.034-.98-1.197-1.524-2.775-2.231-4.19-1.577-2.993-3.101-6.311-4.462-9.467-.979-2.122-1.578-4.244-2.775-6.203-5.604-9.25-11.698-14.854-21.057-20.35-2.013-1.142-4.407-1.632-6.964-2.231l-4.081-.218c-.87-.381-1.741-1.415-2.503-1.904C10.627 1.43 2.629-2.813.343 2.791c-1.469 3.536 2.177 7.018 3.428 8.814.925 1.251 2.122 2.666 2.775 4.081.381.924.489 1.904.87 2.884.871 2.394 1.687 5.06 2.829 7.291.599 1.142 1.251 2.34 2.013 3.373.435.598 1.197.871 1.36 1.85-.762 1.088-.816 2.721-1.252 4.081-1.959 6.148-1.197 13.766 1.578 18.282.87 1.36 2.938 4.353 5.713 3.21 2.448-.979 1.904-4.081 2.612-6.801.164-.653.055-1.088.381-1.523v.109l2.231 4.516c1.687 2.666 4.625 5.441 7.073 7.291 1.306.979 2.34 2.666 3.972 3.265v-.164h-.109c-.327-.49-.816-.707-1.251-1.088-.979-.979-2.068-2.176-2.829-3.265-2.285-3.047-4.299-6.42-6.094-9.903-.87-1.687-1.632-3.537-2.34-5.223-.327-.653-.327-1.632-.871-1.959-.816 1.197-2.013 2.231-2.612 3.7-1.033 2.34-1.142 5.223-1.523 8.216-.217.055-.109 0-.218.109-1.741-.436-2.34-2.231-2.993-3.754-1.632-3.863-1.904-10.066-.489-14.527.381-1.143 2.013-4.734 1.36-5.822-.326-1.034-1.415-1.632-2.013-2.448-.707-1.034-1.469-2.34-1.959-3.482-1.306-3.047-1.959-6.42-3.373-9.468-.653-1.415-1.795-2.884-2.721-4.189-1.031-1.471-2.174-2.505-2.99-4.246-.272-.598-.653-1.578-.218-2.231.109-.435.326-.598.762-.707.707-.599 2.721.163 3.428.489 2.013.816 3.7 1.578 5.387 2.721.762.544 1.578 1.578 2.557 1.85h1.143c1.741.381 3.7.109 5.332.598 2.884.925 5.495 2.285 7.835 3.754 7.128 4.516 13.004 10.937 16.976 18.608.653 1.251.925 2.394 1.523 3.7 1.143 2.666 2.557 5.387 3.7 7.998 1.142 2.557 2.231 5.169 3.863 7.291.816 1.142 4.081 1.741 5.55 2.34 1.088.489 2.775.925 3.754 1.523 1.85 1.142 3.7 2.448 5.441 3.7.871.653 3.591 2.013 3.754 3.101zM18.19 13.455a8.61 8.61 0 00-2.231.272v.109h.109c.436.87 1.197 1.469 1.741 2.231l1.252 2.612.109-.109c.762-.544 1.143-1.415 1.143-2.721-.327-.381-.381-.762-.653-1.143-.326-.544-1.034-.816-1.469-1.252z" stroke="none" fill="#00546b" fill-rule="nonzero"/></symbol></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round" viewBox="0 0 81 80"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><path fill="#00546b" fill-rule="nonzero" stroke="none" d="M73.689 60.737c-4.353-.109-7.726.327-10.556 1.524-.816.326-2.122.327-2.231 1.36.436.436.49 1.143.871 1.741.653 1.088 1.795 2.557 2.829 3.319 1.142.87 2.285 1.741 3.482 2.503 2.122 1.306 4.516 2.068 6.584 3.373 1.197.761 2.394 1.741 3.591 2.557.599.435.979 1.142 1.741 1.415v-.163c-.381-.49-.49-1.197-.87-1.741-.544-.544-1.088-1.034-1.632-1.578-1.578-2.122-3.537-3.972-5.659-5.495-1.741-1.197-5.55-2.829-6.257-4.843l-.109-.109c1.197-.109 2.612-.544 3.754-.871 1.85-.49 3.537-.381 5.441-.87a48 48 0 0 0 2.612-.762v-.489c-.979-.98-1.687-2.285-2.72-3.21-2.775-2.395-5.822-4.734-8.978-6.692-1.687-1.088-3.863-1.796-5.659-2.721-.653-.327-1.741-.49-2.122-1.034-.98-1.197-1.524-2.775-2.231-4.19-1.577-2.993-3.101-6.311-4.462-9.467-.979-2.122-1.578-4.244-2.775-6.203-5.604-9.25-11.698-14.854-21.057-20.35-2.013-1.142-4.407-1.632-6.964-2.231l-4.081-.218c-.87-.381-1.741-1.415-2.503-1.904C10.627 1.43 2.629-2.813.343 2.791c-1.469 3.536 2.177 7.018 3.428 8.814.925 1.251 2.122 2.666 2.775 4.081.381.924.489 1.904.87 2.884.871 2.394 1.687 5.06 2.829 7.291.599 1.142 1.251 2.34 2.013 3.373.435.598 1.197.871 1.36 1.85-.762 1.088-.816 2.721-1.252 4.081-1.959 6.148-1.197 13.766 1.578 18.282.87 1.36 2.938 4.353 5.713 3.21 2.448-.979 1.904-4.081 2.612-6.801.164-.653.055-1.088.381-1.523v.109l2.231 4.516c1.687 2.666 4.625 5.441 7.073 7.291 1.306.979 2.34 2.666 3.972 3.265v-.164h-.109c-.327-.49-.816-.707-1.251-1.088-.979-.979-2.068-2.176-2.829-3.265-2.285-3.047-4.299-6.42-6.094-9.903-.87-1.687-1.632-3.537-2.34-5.223-.327-.653-.327-1.632-.871-1.959-.816 1.197-2.013 2.231-2.612 3.7-1.033 2.34-1.142 5.223-1.523 8.216-.217.055-.109 0-.218.109-1.741-.436-2.34-2.231-2.993-3.754-1.632-3.863-1.904-10.066-.489-14.527.381-1.143 2.013-4.734 1.36-5.822-.326-1.034-1.415-1.632-2.013-2.448-.707-1.034-1.469-2.34-1.959-3.482-1.306-3.047-1.959-6.42-3.373-9.468-.653-1.415-1.795-2.884-2.721-4.189-1.031-1.471-2.174-2.505-2.99-4.246-.272-.598-.653-1.578-.218-2.231.109-.435.326-.598.762-.707.707-.599 2.721.163 3.428.489 2.013.816 3.7 1.578 5.387 2.721.762.544 1.578 1.578 2.557 1.85h1.143c1.741.381 3.7.109 5.332.598 2.884.925 5.495 2.285 7.835 3.754 7.128 4.516 13.004 10.937 16.976 18.608.653 1.251.925 2.394 1.523 3.7 1.143 2.666 2.557 5.387 3.7 7.998 1.142 2.557 2.231 5.169 3.863 7.291.816 1.142 4.081 1.741 5.55 2.34 1.088.489 2.775.925 3.754 1.523 1.85 1.142 3.7 2.448 5.441 3.7.871.653 3.591 2.013 3.754 3.101zM18.19 13.455a8.6 8.6 0 0 0-2.231.272v.109h.109c.436.87 1.197 1.469 1.741 2.231l1.252 2.612.109-.109c.762-.544 1.143-1.415 1.143-2.721-.327-.381-.381-.762-.653-1.143-.326-.544-1.034-.816-1.469-1.252z"/></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/MySql/test/v1/executeQuery.test.ts b/packages/nodes-base/nodes/MySql/test/v1/executeQuery.test.ts
new file mode 100644
index 0000000000000..55c4007edae54
--- /dev/null
+++ b/packages/nodes-base/nodes/MySql/test/v1/executeQuery.test.ts
@@ -0,0 +1,60 @@
+import type { INodeTypes } from 'n8n-workflow';
+
+import nock from 'nock';
+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 }];
+});
+
+jest.mock('../../v1/GenericFunctions', () => {
+	const originalModule = jest.requireActual('../../v1/GenericFunctions');
+	return {
+		...originalModule,
+		createConnection: jest.fn(async function () {
+			return {
+				query: queryMock,
+				end: jest.fn(),
+			};
+		}),
+	};
+});
+
+describe('Test MySqlV1, executeQuery', () => {
+	const workflows = ['nodes/MySql/test/v1/executeQuery.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../v1/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(queryMock).toHaveBeenCalledTimes(1);
+		expect(queryMock).toHaveBeenCalledWith(
+			"select * from family_parents where (parent_email = 'parent1@mail.com' or parent_email = 'parent2@mail.com') and parent_email <> '';",
+		);
+
+		expect(result.finished).toEqual(true);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/MySql/test/v1/executeQuery.workflow.json b/packages/nodes-base/nodes/MySql/test/v1/executeQuery.workflow.json
new file mode 100644
index 0000000000000..add3572d40dea
--- /dev/null
+++ b/packages/nodes-base/nodes/MySql/test/v1/executeQuery.workflow.json
@@ -0,0 +1,127 @@
+{
+  "name": "mysql v1 resolve expression copy",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "d6d9fbcc-d8bc-4f79-8e00-3acf8ffb12de",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        460,
+        460
+      ]
+    },
+    {
+      "parameters": {
+        "operation": "executeQuery",
+        "query": "select * from family_parents where (parent_email = {{ \"'\" + $json['Parent 1 email'] + \"'\" }} or parent_email = {{ \"'\" + $json['Parent 2 email'] + \"'\"}}) and parent_email <> '';\n"
+      },
+      "id": "faefc24c-91b4-4b10-85a6-b3cecbceee08",
+      "name": "Get matching families",
+      "type": "n8n-nodes-base.mySql",
+      "typeVersion": 1,
+      "position": [
+        900,
+        460
+      ],
+      "credentials": {
+        "mySql": {
+          "id": "93",
+          "name": "MySQL account"
+        }
+      }
+    },
+    {
+      "parameters": {},
+      "id": "29c30f6e-9f5f-4b3a-80c4-2da762e96bd9",
+      "name": "No Operation, do nothing1",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        1120,
+        460
+      ]
+    },
+    {
+      "parameters": {
+        "fields": {
+          "values": [
+            {
+              "name": "Parent 1 email",
+              "stringValue": "parent1@mail.com"
+            },
+            {
+              "name": "Parent 2 email",
+              "stringValue": "parent2@mail.com"
+            }
+          ]
+        },
+        "include": "none",
+        "options": {}
+      },
+      "id": "54c7bbf9-dabc-421b-85b2-7c3006f5ee61",
+      "name": "Edit Fields",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.2,
+      "position": [
+        680,
+        460
+      ]
+    }
+  ],
+  "pinData": {
+    "No Operation, do nothing1": [
+      {
+        "json": {
+          "success": true
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Edit Fields",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Get matching families": {
+      "main": [
+        [
+          {
+            "node": "No Operation, do nothing1",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Edit Fields": {
+      "main": [
+        [
+          {
+            "node": "Get matching families",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "aeb01d24-c117-405a-875f-909ea8ccdc16",
+  "id": "GlTwlHZfQwNjbeqv",
+  "meta": {
+    "instanceId": "b888bd11cd1ddbb95450babf3e199556799d999b896f650de768b8370ee50363"
+  },
+  "tags": []
+}
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 a131e929be103..359c21c465c2f 100644
--- a/packages/nodes-base/nodes/MySql/test/v2/operations.test.ts
+++ b/packages/nodes-base/nodes/MySql/test/v2/operations.test.ts
@@ -1,8 +1,8 @@
 import type { IDataObject, INode } from 'n8n-workflow';
 
-import { createMockExecuteFunction } from '../../../../test/nodes/Helpers';
-
+import mysql2 from 'mysql2/promise';
 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';
@@ -11,8 +11,7 @@ import * as upsert from '../../v2/actions/database/upsert.operation';
 
 import type { Mysql2Pool, QueryRunner } from '../../v2/helpers/interfaces';
 import { configureQueryRunner } from '../../v2/helpers/utils';
-
-import mysql2 from 'mysql2/promise';
+import { createMockExecuteFunction } from '@test/nodes/Helpers';
 
 const mySqlMockNode: INode = {
 	id: '1',
@@ -97,7 +96,7 @@ describe('Test MySql V2, operations', () => {
 		const result = await deleteTable.execute.call(fakeExecuteFunction, emptyInputItems, runQueries);
 
 		expect(result).toBeDefined();
-		expect(result).toEqual([{ json: { success: true } }]);
+		expect(result).toEqual([{ json: { success: true }, pairedItem: [{ item: 0 }] }]);
 
 		expect(poolQuerySpy).toBeCalledTimes(1);
 		expect(poolQuerySpy).toBeCalledWith('DROP TABLE IF EXISTS `test_table`');
@@ -133,7 +132,7 @@ describe('Test MySql V2, operations', () => {
 		const result = await deleteTable.execute.call(fakeExecuteFunction, emptyInputItems, runQueries);
 
 		expect(result).toBeDefined();
-		expect(result).toEqual([{ json: { success: true } }]);
+		expect(result).toEqual([{ json: { success: true }, pairedItem: [{ item: 0 }] }]);
 
 		expect(poolQuerySpy).toBeCalledTimes(1);
 		expect(poolQuerySpy).toBeCalledWith('TRUNCATE TABLE `test_table`');
@@ -183,7 +182,7 @@ describe('Test MySql V2, operations', () => {
 		const result = await deleteTable.execute.call(fakeExecuteFunction, emptyInputItems, runQueries);
 
 		expect(result).toBeDefined();
-		expect(result).toEqual([{ json: { success: true } }]);
+		expect(result).toEqual([{ json: { success: true }, pairedItem: [{ item: 0 }] }]);
 
 		expect(poolQuerySpy).toBeCalledTimes(1);
 		expect(poolQuerySpy).toBeCalledWith(
@@ -208,7 +207,6 @@ describe('Test MySql V2, operations', () => {
 
 		fakeConnectionCopy.query = jest.fn(async (query?: string) => {
 			const result = [];
-			console.log(query);
 			if (query?.toLowerCase().includes('select')) {
 				result.push([{ id: 1, name: 'test 1' }]);
 			} else {
@@ -256,6 +254,47 @@ describe('Test MySql V2, operations', () => {
 		);
 		expect(connectionQuerySpy).toBeCalledWith('select * from `test_table`');
 	});
+	it('executeQuery, should parse numbers', async () => {
+		const nodeParameters: IDataObject = {
+			operation: 'executeQuery',
+			query: 'SELECT * FROM users LIMIT $1, $2',
+			options: {
+				queryBatching: 'independently',
+				queryReplacement: '2, 5',
+				nodeVersion: 2.3,
+			},
+		};
+
+		const nodeOptions = nodeParameters.options as IDataObject;
+
+		const fakeConnectionCopy = { ...fakeConnection };
+
+		fakeConnectionCopy.query = jest.fn(async (query?: string) => {
+			return [{ query }];
+		});
+		const pool = createFakePool(fakeConnectionCopy);
+
+		const connectionQuerySpy = jest.spyOn(fakeConnectionCopy, 'query');
+
+		const fakeExecuteFunction = createMockExecuteFunction(nodeParameters, mySqlMockNode);
+
+		const runQueries: QueryRunner = configureQueryRunner.call(
+			fakeExecuteFunction,
+			nodeOptions,
+			pool,
+		);
+
+		const result = await executeQuery.execute.call(
+			fakeExecuteFunction,
+			emptyInputItems,
+			runQueries,
+			nodeOptions,
+		);
+
+		expect(result).toBeDefined();
+
+		expect(connectionQuerySpy).toBeCalledWith('SELECT * FROM users LIMIT 2, 5');
+	});
 
 	it('select, should call runQueries with', async () => {
 		const nodeParameters: IDataObject = {
@@ -305,14 +344,14 @@ describe('Test MySql V2, operations', () => {
 
 		const runQueries: QueryRunner = configureQueryRunner.call(
 			fakeExecuteFunction,
-			nodeOptions,
+			{ ...nodeOptions, nodeVersion: 2 },
 			pool,
 		);
 
 		const result = await select.execute.call(fakeExecuteFunction, emptyInputItems, runQueries);
 
 		expect(result).toBeDefined();
-		expect(result).toEqual([{ json: { success: true } }]);
+		expect(result).toEqual([{ json: { success: true }, pairedItem: { item: 0 } }]);
 
 		const connectionBeginTransactionSpy = jest.spyOn(fakeConnection, 'beginTransaction');
 		const connectionCommitSpy = jest.spyOn(fakeConnection, 'commit');
@@ -378,7 +417,7 @@ describe('Test MySql V2, operations', () => {
 		);
 
 		expect(result).toBeDefined();
-		expect(result).toEqual([{ json: { success: true } }]);
+		expect(result).toEqual([{ json: { success: true }, pairedItem: { item: 0 } }]);
 
 		expect(connectionQuerySpy).toBeCalledTimes(1);
 		expect(connectionQuerySpy).toBeCalledWith(
@@ -439,7 +478,10 @@ describe('Test MySql V2, operations', () => {
 		);
 
 		expect(result).toBeDefined();
-		expect(result).toEqual([{ json: { success: true } }, { json: { success: true } }]);
+		expect(result).toEqual([
+			{ json: { success: true }, pairedItem: { item: 0 } },
+			{ json: { success: true }, pairedItem: { item: 1 } },
+		]);
 
 		expect(connectionQuerySpy).toBeCalledTimes(2);
 		expect(connectionQuerySpy).toBeCalledWith(
@@ -501,7 +543,7 @@ describe('Test MySql V2, operations', () => {
 		);
 
 		expect(result).toBeDefined();
-		expect(result).toEqual([{ json: { success: true } }]);
+		expect(result).toEqual([{ json: { success: true }, pairedItem: [{ item: 0 }, { item: 1 }] }]);
 
 		expect(poolQuerySpy).toBeCalledTimes(1);
 		expect(poolQuerySpy).toBeCalledWith(
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 3fd5ffce4eecb..9dc3f8d451d2b 100644
--- a/packages/nodes-base/nodes/MySql/test/v2/runQueries.test.ts
+++ b/packages/nodes-base/nodes/MySql/test/v2/runQueries.test.ts
@@ -1,12 +1,10 @@
-import { createMockExecuteFunction } from '../../../../test/nodes/Helpers';
-
+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 mysql2 from 'mysql2/promise';
+import { createMockExecuteFunction } from '@test/nodes/Helpers';
 
 const mySqlMockNode: INode = {
 	id: '1',
@@ -44,8 +42,40 @@ describe('Test MySql V2, runQueries', () => {
 		jest.clearAllMocks();
 	});
 
+	describe('in single query batch mode', () => {
+		it('should set paired items correctly', async () => {
+			const nodeOptions = { queryBatching: BATCH_MODE.SINGLE, nodeVersion: 2 };
+			const pool = createFakePool(fakeConnection);
+			const mockExecuteFns = createMockExecuteFunction({}, mySqlMockNode);
+
+			pool.query = jest.fn(async () => [
+				[[{ finishedAt: '2023-12-30' }], [{ finishedAt: '2023-12-31' }]],
+			]);
+
+			const result = await configureQueryRunner.call(
+				mockExecuteFns,
+				nodeOptions,
+				pool,
+			)([
+				{ query: 'SELECT finishedAt FROM my_table WHERE id = ?', values: [123] },
+				{ query: 'SELECT finishedAt FROM my_table WHERE id = ?', values: [456] },
+			]);
+
+			expect(result).toEqual([
+				{
+					json: { finishedAt: '2023-12-30' },
+					pairedItem: { item: 0 },
+				},
+				{
+					json: { finishedAt: '2023-12-31' },
+					pairedItem: { item: 1 },
+				},
+			]);
+		});
+	});
+
 	it('should execute in "Single" mode, should return success true', async () => {
-		const nodeOptions: IDataObject = { queryBatching: BATCH_MODE.SINGLE };
+		const nodeOptions: IDataObject = { queryBatching: BATCH_MODE.SINGLE, nodeVersion: 2 };
 
 		const pool = createFakePool(fakeConnection);
 		const fakeExecuteFunction = createMockExecuteFunction({}, mySqlMockNode);
@@ -67,7 +97,7 @@ describe('Test MySql V2, runQueries', () => {
 
 		expect(result).toBeDefined();
 		expect(result).toHaveLength(1);
-		expect(result).toEqual([{ json: { success: true } }]);
+		expect(result).toEqual([{ json: { success: true }, pairedItem: [{ item: 0 }] }]);
 
 		expect(poolGetConnectionSpy).toBeCalledTimes(1);
 
@@ -81,7 +111,7 @@ describe('Test MySql V2, runQueries', () => {
 	});
 
 	it('should execute in "independently" mode, should return success true', async () => {
-		const nodeOptions: IDataObject = { queryBatching: BATCH_MODE.INDEPENDENTLY };
+		const nodeOptions: IDataObject = { queryBatching: BATCH_MODE.INDEPENDENTLY, nodeVersion: 2 };
 
 		const pool = createFakePool(fakeConnection);
 
@@ -108,7 +138,7 @@ describe('Test MySql V2, runQueries', () => {
 
 		expect(result).toBeDefined();
 		expect(result).toHaveLength(1);
-		expect(result).toEqual([{ json: { success: true } }]);
+		expect(result).toEqual([{ json: { success: true }, pairedItem: { item: 0 } }]);
 
 		expect(poolGetConnectionSpy).toBeCalledTimes(1);
 
@@ -126,7 +156,7 @@ describe('Test MySql V2, runQueries', () => {
 	});
 
 	it('should execute in "transaction" mode, should return success true', async () => {
-		const nodeOptions: IDataObject = { queryBatching: BATCH_MODE.TRANSACTION };
+		const nodeOptions: IDataObject = { queryBatching: BATCH_MODE.TRANSACTION, nodeVersion: 2 };
 
 		const pool = createFakePool(fakeConnection);
 
@@ -155,7 +185,7 @@ describe('Test MySql V2, runQueries', () => {
 
 		expect(result).toBeDefined();
 		expect(result).toHaveLength(1);
-		expect(result).toEqual([{ json: { success: true } }]);
+		expect(result).toEqual([{ json: { success: true }, pairedItem: { item: 0 } }]);
 
 		expect(poolGetConnectionSpy).toBeCalledTimes(1);
 
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 15c7bd2847f28..92bfa58ed0862 100644
--- a/packages/nodes-base/nodes/MySql/test/v2/utils.test.ts
+++ b/packages/nodes-base/nodes/MySql/test/v2/utils.test.ts
@@ -7,6 +7,8 @@ import {
 	addWhereClauses,
 	addSortRules,
 	replaceEmptyStringsByNulls,
+	escapeSqlIdentifier,
+	splitQueryToStatements,
 } from '../../v2/helpers/utils';
 
 const mySqlMockNode: INode = {
@@ -148,3 +150,55 @@ describe('Test MySql V2, replaceEmptyStringsByNulls', () => {
 		expect(replacedData).toEqual([{ json: { id: 1, name: '' } }]);
 	});
 });
+
+describe('Test MySql V2, escapeSqlIdentifier', () => {
+	it('should escape fully qualified identifier', () => {
+		const input = 'db_name.tbl_name.col_name';
+		const escapedIdentifier = escapeSqlIdentifier(input);
+		expect(escapedIdentifier).toEqual('`db_name`.`tbl_name`.`col_name`');
+	});
+
+	it('should escape table name only', () => {
+		const input = 'tbl_name';
+		const escapedIdentifier = escapeSqlIdentifier(input);
+		expect(escapedIdentifier).toEqual('`tbl_name`');
+	});
+
+	it('should escape fully qualified identifier with backticks', () => {
+		const input = '`db_name`.`tbl_name`.`col_name`';
+		const escapedIdentifier = escapeSqlIdentifier(input);
+		expect(escapedIdentifier).toEqual('`db_name`.`tbl_name`.`col_name`');
+	});
+
+	it('should escape identifier with dots', () => {
+		const input = '`db_name`.`some.dotted.tbl_name`';
+		const escapedIdentifier = escapeSqlIdentifier(input);
+		expect(escapedIdentifier).toEqual('`db_name`.`some.dotted.tbl_name`');
+	});
+});
+
+describe('Test MySql V2, splitQueryToStatements', () => {
+	it('should split query into statements', () => {
+		const query =
+			"insert into models (`created_at`, custom_ship_time, id) values ('2023-09-07 10:26:20', 'some random; data with a semicolon', 1); insert into models (`created_at`, custom_ship_time, id) values ('2023-09-07 10:27:55', 'random data without semicolon\n', 2);";
+
+		const statements = splitQueryToStatements(query);
+
+		expect(statements).toBeDefined();
+		expect(statements).toEqual([
+			"insert into models (`created_at`, custom_ship_time, id) values ('2023-09-07 10:26:20', 'some random; data with a semicolon', 1)",
+			"insert into models (`created_at`, custom_ship_time, id) values ('2023-09-07 10:27:55', 'random data without semicolon', 2)",
+		]);
+	});
+	it('should not split by ; inside string literal', () => {
+		const query =
+			"SELECT custom_ship_time FROM models WHERE models.custom_ship_time LIKE CONCAT('%', ';', '%') LIMIT 10";
+
+		const statements = splitQueryToStatements(query);
+
+		expect(statements).toBeDefined();
+		expect(statements).toEqual([
+			"SELECT custom_ship_time FROM models WHERE models.custom_ship_time LIKE CONCAT('%', ';', '%') LIMIT 10",
+		]);
+	});
+});
diff --git a/packages/nodes-base/nodes/MySql/v1/GenericFunctions.ts b/packages/nodes-base/nodes/MySql/v1/GenericFunctions.ts
index fd2c9ba9345a5..0cdf6ce19d45e 100644
--- a/packages/nodes-base/nodes/MySql/v1/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/MySql/v1/GenericFunctions.ts
@@ -2,35 +2,10 @@ import type {
 	ICredentialDataDecryptedObject,
 	IDataObject,
 	ILoadOptionsFunctions,
-	INodeExecutionData,
 	INodeListSearchResult,
 } from 'n8n-workflow';
-import { deepCopy } from 'n8n-workflow';
 import mysql2 from 'mysql2/promise';
 
-/**
- * Returns of copy of the items which only contains the json data and
- * of that only the define properties
- *
- * @param {INodeExecutionData[]} items The items to copy
- * @param {string[]} properties The properties it should include
- */
-export function copyInputItems(items: INodeExecutionData[], properties: string[]): IDataObject[] {
-	// Prepare the data to insert and copy it to be returned
-	let newItem: IDataObject;
-	return items.map((item) => {
-		newItem = {};
-		for (const property of properties) {
-			if (item.json[property] === undefined) {
-				newItem[property] = null;
-			} else {
-				newItem[property] = deepCopy(item.json[property]);
-			}
-		}
-		return newItem;
-	});
-}
-
 export async function createConnection(
 	credentials: ICredentialDataDecryptedObject,
 ): Promise<mysql2.Connection> {
@@ -50,7 +25,7 @@ export async function createConnection(
 		}
 	}
 
-	return mysql2.createConnection(baseCredentials);
+	return await mysql2.createConnection(baseCredentials);
 }
 
 export async function searchTables(
diff --git a/packages/nodes-base/nodes/MySql/v1/MySqlV1.node.ts b/packages/nodes-base/nodes/MySql/v1/MySqlV1.node.ts
index 21759b3e45872..e3fd6a073f16a 100644
--- a/packages/nodes-base/nodes/MySql/v1/MySqlV1.node.ts
+++ b/packages/nodes-base/nodes/MySql/v1/MySqlV1.node.ts
@@ -4,6 +4,7 @@ import type {
 	ICredentialsDecrypted,
 	ICredentialTestFunctions,
 	IDataObject,
+	IExecuteFunctions,
 	INodeCredentialTestResult,
 	INodeExecutionData,
 	INodeType,
@@ -14,8 +15,10 @@ import { NodeOperationError } from 'n8n-workflow';
 
 import type mysql2 from 'mysql2/promise';
 
-import { copyInputItems, createConnection, searchTables } from './GenericFunctions';
-import type { IExecuteFunctions } from 'n8n-core';
+import { createConnection, searchTables } from './GenericFunctions';
+
+import { oldVersionNotice } from '@utils/descriptions';
+import { getResolvables } from '@utils/utilities';
 
 const versionDescription: INodeTypeDescription = {
 	displayName: 'MySQL',
@@ -37,6 +40,7 @@ const versionDescription: INodeTypeDescription = {
 		},
 	],
 	properties: [
+		oldVersionNotice,
 		{
 			displayName: 'Operation',
 			name: 'operation',
@@ -72,6 +76,11 @@ const versionDescription: INodeTypeDescription = {
 			displayName: 'Query',
 			name: 'query',
 			type: 'string',
+			noDataExpression: true,
+			typeOptions: {
+				editor: 'sqlEditor',
+				sqlDialect: 'MySQL',
+			},
 			displayOptions: {
 				show: {
 					operation: ['executeQuery'],
@@ -297,10 +306,17 @@ export class MySqlV1 implements INodeType {
 			// ----------------------------------
 
 			try {
-				const queryQueue = items.map(async (item, index) => {
-					const rawQuery = this.getNodeParameter('query', index) as string;
+				const queryQueue = items.map(async (_, index) => {
+					let rawQuery = (this.getNodeParameter('query', index) as string).trim();
+
+					for (const resolvable of getResolvables(rawQuery)) {
+						rawQuery = rawQuery.replace(
+							resolvable,
+							this.evaluateExpression(resolvable, index) as string,
+						);
+					}
 
-					return connection.query(rawQuery);
+					return await connection.query(rawQuery);
 				});
 
 				returnItems = ((await Promise.all(queryQueue)) as mysql2.OkPacket[][]).reduce(
@@ -335,7 +351,7 @@ export class MySqlV1 implements INodeType {
 				const table = this.getNodeParameter('table', 0, '', { extractValue: true }) as string;
 				const columnString = this.getNodeParameter('columns', 0) as string;
 				const columns = columnString.split(',').map((column) => column.trim());
-				const insertItems = copyInputItems(items, columns);
+				const insertItems = this.helpers.copyInputItems(items, columns);
 				const insertPlaceholder = `(${columns.map((_column) => '?').join(',')})`;
 				const options = this.getNodeParameter('options', 0);
 				const insertIgnore = options.ignore as boolean;
@@ -378,12 +394,13 @@ export class MySqlV1 implements INodeType {
 					columns.unshift(updateKey);
 				}
 
-				const updateItems = copyInputItems(items, columns);
+				const updateItems = this.helpers.copyInputItems(items, columns);
 				const updateSQL = `UPDATE ${table} SET ${columns
 					.map((column) => `${column} = ?`)
 					.join(',')} WHERE ${updateKey} = ?;`;
-				const queryQueue = updateItems.map(async (item) =>
-					connection.query(updateSQL, Object.values(item).concat(item[updateKey])),
+				const queryQueue = updateItems.map(
+					async (item) =>
+						await connection.query(updateSQL, Object.values(item).concat(item[updateKey])),
 				);
 				const queryResult = await Promise.all(queryQueue);
 				returnItems = this.helpers.returnJsonArray(
@@ -413,6 +430,6 @@ export class MySqlV1 implements INodeType {
 
 		await connection.end();
 
-		return this.prepareOutputData(returnItems);
+		return [returnItems];
 	}
 }
diff --git a/packages/nodes-base/nodes/MySql/v2/MySqlV2.node.ts b/packages/nodes-base/nodes/MySql/v2/MySqlV2.node.ts
index 13696dc46820c..2adf717a5c212 100644
--- a/packages/nodes-base/nodes/MySql/v2/MySqlV2.node.ts
+++ b/packages/nodes-base/nodes/MySql/v2/MySqlV2.node.ts
@@ -1,13 +1,11 @@
-/* eslint-disable n8n-nodes-base/node-filename-against-convention */
 import type {
+	IExecuteFunctions,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeBaseDescription,
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
-import type { IExecuteFunctions } from 'n8n-core';
-
 import { listSearch, credentialTest, loadOptions } from './methods';
 
 import { versionDescription } from './actions/versionDescription';
@@ -27,6 +25,6 @@ export class MySqlV2 implements INodeType {
 	methods = { listSearch, loadOptions, credentialTest };
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
-		return router.call(this);
+		return await router.call(this);
 	}
 }
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 69a41877311f8..3454f97562ffa 100644
--- a/packages/nodes-base/nodes/MySql/v2/actions/common.descriptions.ts
+++ b/packages/nodes-base/nodes/MySql/v2/actions/common.descriptions.ts
@@ -89,7 +89,7 @@ export const optionsCollection: INodeProperties = {
 			default: '',
 			placeholder: 'e.g. value1,value2,value3',
 			description:
-				'Comma-separated list of the values you want to use as query parameters. You can drag the values from the input panel on the left. <a href="https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.mysql/">More info</a>',
+				'Comma-separated list of the values you want to use as query parameters. You can drag the values from the input panel on the left. <a href="https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.mysql/" target="_blank">More info</a>',
 			hint: 'Comma-separated list of values: reference them in your query as $1, $2, $3…',
 			displayOptions: {
 				show: { '/operation': ['executeQuery'] },
@@ -100,8 +100,9 @@ export const optionsCollection: INodeProperties = {
 			displayName: 'Output Columns',
 			name: 'outputColumns',
 			type: 'multiOptions',
+			// eslint-disable-next-line n8n-nodes-base/node-param-description-wrong-for-dynamic-multi-options
 			description:
-				'Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
+				'Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/" target="_blank">expression</a>',
 			typeOptions: {
 				loadOptionsMethod: 'getColumnsMultiOptions',
 				loadOptionsDependsOn: ['table.value'],
@@ -228,8 +229,9 @@ export const selectRowsFixedCollection: INodeProperties = {
 					displayName: 'Column',
 					name: 'column',
 					type: 'options',
+					// eslint-disable-next-line n8n-nodes-base/node-param-description-wrong-for-dynamic-options
 					description:
-						'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
+						'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/" target="_blank">expression</a>',
 					default: '',
 					placeholder: 'e.g. ID',
 					typeOptions: {
@@ -277,6 +279,10 @@ export const selectRowsFixedCollection: INodeProperties = {
 							name: 'Is Null',
 							value: 'IS NULL',
 						},
+						{
+							name: 'Is Not Null',
+							value: 'IS NOT NULL',
+						},
 					],
 					default: 'equal',
 				},
@@ -284,6 +290,11 @@ export const selectRowsFixedCollection: INodeProperties = {
 					displayName: 'Value',
 					name: 'value',
 					type: 'string',
+					displayOptions: {
+						hide: {
+							condition: ['IS NULL', 'IS NOT NULL'],
+						},
+					},
 					default: '',
 				},
 			],
@@ -310,8 +321,9 @@ export const sortFixedCollection: INodeProperties = {
 					displayName: 'Column',
 					name: 'column',
 					type: 'options',
+					// eslint-disable-next-line n8n-nodes-base/node-param-description-wrong-for-dynamic-options
 					description:
-						'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
+						'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/" target="_blank">expression</a>',
 					default: '',
 					typeOptions: {
 						loadOptionsMethod: 'getColumns',
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 88e93664e036a..90e07ae7d27db 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 09cadea31344e..3b725739774c0 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
@@ -1,5 +1,9 @@
-import type { IExecuteFunctions } from 'n8n-core';
-import type { IDataObject, INodeExecutionData, INodeProperties } from 'n8n-workflow';
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
 import type {
@@ -9,15 +13,14 @@ import type {
 	WhereClause,
 } from '../../helpers/interfaces';
 
-import { updateDisplayOptions } from '../../../../../utils/utilities';
-
-import { addWhereClauses } from '../../helpers/utils';
+import { addWhereClauses, escapeSqlIdentifier } from '../../helpers/utils';
 
 import {
 	optionsCollection,
 	selectRowsFixedCollection,
 	combineConditionsCollection,
 } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
@@ -95,11 +98,11 @@ export async function execute(
 		let values: QueryValues = [];
 
 		if (deleteCommand === 'drop') {
-			query = `DROP TABLE IF EXISTS \`${table}\``;
+			query = `DROP TABLE IF EXISTS ${escapeSqlIdentifier(table)}`;
 		}
 
 		if (deleteCommand === 'truncate') {
-			query = `TRUNCATE TABLE \`${table}\``;
+			query = `TRUNCATE TABLE ${escapeSqlIdentifier(table)}`;
 		}
 
 		if (deleteCommand === 'delete') {
@@ -111,7 +114,7 @@ export async function execute(
 			[query, values] = addWhereClauses(
 				this.getNode(),
 				i,
-				`DELETE FROM \`${table}\``,
+				`DELETE FROM ${escapeSqlIdentifier(table)}`,
 				whereClauses,
 				values,
 				combineConditions,
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 bf247596d30a8..9af1b9eaa3872 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
@@ -1,14 +1,17 @@
-import type { IExecuteFunctions } from 'n8n-core';
-import type { IDataObject, INodeExecutionData, INodeProperties } from 'n8n-workflow';
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
 import type { QueryRunner, QueryWithValues } from '../../helpers/interfaces';
 
-import { updateDisplayOptions } from '../../../../../utils/utilities';
-
 import { prepareQueryAndReplacements, replaceEmptyStringsByNulls } from '../../helpers/utils';
 
 import { optionsCollection } from '../common.descriptions';
+import { getResolvables, updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
@@ -20,18 +23,12 @@ const properties: INodeProperties[] = [
 		required: true,
 		description:
 			"The SQL query to execute. You can use n8n expressions and $1, $2, $3, etc to refer to the 'Query Parameters' set in options below.",
+		noDataExpression: true,
 		typeOptions: {
-			rows: 3,
+			editor: 'sqlEditor',
+			sqlDialect: 'MySQL',
 		},
-		hint: 'Prefer using query parameters over n8n expressions to avoid SQL injection attacks',
-	},
-	{
-		displayName: `
-		To use query parameters in your SQL query, reference them as $1, $2, $3, etc in the corresponding order. <a target="_blank" href="https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.mysql/">More info</a>.
-		`,
-		name: 'notice',
-		type: 'notice',
-		default: '',
+		hint: 'Consider using query parameters to prevent SQL injection attacks. Add them in the options below',
 	},
 	optionsCollection,
 ];
@@ -57,7 +54,11 @@ export async function execute(
 	const queries: QueryWithValues[] = [];
 
 	for (let i = 0; i < items.length; i++) {
-		const rawQuery = this.getNodeParameter('query', i) as string;
+		let rawQuery = this.getNodeParameter('query', i) as string;
+
+		for (const resolvable of getResolvables(rawQuery)) {
+			rawQuery = rawQuery.replace(resolvable, this.evaluateExpression(resolvable, i) as string);
+		}
 
 		const options = this.getNodeParameter('options', i, {});
 
@@ -80,6 +81,13 @@ export async function execute(
 
 		const preparedQuery = prepareQueryAndReplacements(rawQuery, values);
 
+		if ((nodeOptions.nodeVersion as number) >= 2.3) {
+			const parsedNumbers = preparedQuery.values.map((value) => {
+				return Number(value) ? Number(value) : value;
+			});
+			preparedQuery.values = parsedNumbers;
+		}
+
 		queries.push(preparedQuery);
 	}
 
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 ce5c523c66ae4..f3578f8d99644 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
@@ -1,5 +1,9 @@
-import type { IExecuteFunctions } from 'n8n-core';
-import type { IDataObject, INodeExecutionData, INodeProperties } from 'n8n-workflow';
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
 
 import type {
 	QueryMode,
@@ -10,11 +14,10 @@ import type {
 
 import { AUTO_MAP, BATCH_MODE, DATA_MODE } from '../../helpers/interfaces';
 
-import { updateDisplayOptions } from '../../../../../utils/utilities';
-
-import { copyInputItems, replaceEmptyStringsByNulls } from '../../helpers/utils';
+import { escapeSqlIdentifier, replaceEmptyStringsByNulls } from '../../helpers/utils';
 
 import { optionsCollection } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
@@ -39,7 +42,7 @@ const properties: INodeProperties[] = [
 	},
 	{
 		displayName: `
-		In this mode, make sure incoming data fields are named the same as the columns in your table. If needed, use a 'Set' node before this node to change the field names.
+		In this mode, make sure incoming data fields are named the same as the columns in your table. If needed, use an 'Edit Fields' node before this node to change the field names.
 		`,
 		name: 'notice',
 		type: 'notice',
@@ -75,8 +78,9 @@ const properties: INodeProperties[] = [
 						displayName: 'Column',
 						name: 'column',
 						type: 'options',
+						// eslint-disable-next-line n8n-nodes-base/node-param-description-wrong-for-dynamic-options
 						description:
-							'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
+							'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/" target="_blank">expression</a>',
 						typeOptions: {
 							loadOptionsMethod: 'getColumns',
 							loadOptionsDependsOn: ['table.value'],
@@ -141,7 +145,7 @@ export async function execute(
 					}, [] as string[]),
 				),
 			];
-			insertItems = copyInputItems(items, columns);
+			insertItems = this.helpers.copyInputItems(items, columns);
 		}
 
 		if (dataMode === DATA_MODE.MANUAL) {
@@ -167,11 +171,13 @@ export async function execute(
 			];
 		}
 
-		const escapedColumns = columns.map((column) => `\`${column}\``).join(', ');
+		const escapedColumns = columns.map(escapeSqlIdentifier).join(', ');
 		const placeholder = `(${columns.map(() => '?').join(',')})`;
 		const replacements = items.map(() => placeholder).join(',');
 
-		const query = `INSERT ${priority} ${ignore} INTO \`${table}\` (${escapedColumns}) VALUES ${replacements}`;
+		const query = `INSERT ${priority} ${ignore} INTO ${escapeSqlIdentifier(
+			table,
+		)} (${escapedColumns}) VALUES ${replacements}`;
 
 		const values = insertItems.reduce(
 			(acc: IDataObject[], item) => acc.concat(Object.values(item) as IDataObject[]),
@@ -210,10 +216,12 @@ export async function execute(
 				columns = Object.keys(insertItem);
 			}
 
-			const escapedColumns = columns.map((column) => `\`${column}\``).join(', ');
+			const escapedColumns = columns.map(escapeSqlIdentifier).join(', ');
 			const placeholder = `(${columns.map(() => '?').join(',')})`;
 
-			const query = `INSERT ${priority} ${ignore} INTO \`${table}\` (${escapedColumns}) VALUES ${placeholder};`;
+			const query = `INSERT ${priority} ${ignore} INTO ${escapeSqlIdentifier(
+				table,
+			)} (${escapedColumns}) VALUES ${placeholder};`;
 
 			const values = Object.values(insertItem) as QueryValues;
 
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 5afbe3151321b..7b16574f7510f 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
@@ -1,5 +1,9 @@
-import type { IExecuteFunctions } from 'n8n-core';
-import type { IDataObject, INodeExecutionData, INodeProperties } from 'n8n-workflow';
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
 
 import type {
 	QueryRunner,
@@ -9,9 +13,7 @@ import type {
 	WhereClause,
 } from '../../helpers/interfaces';
 
-import { updateDisplayOptions } from '../../../../../utils/utilities';
-
-import { addSortRules, addWhereClauses } from '../../helpers/utils';
+import { addSortRules, addWhereClauses, escapeSqlIdentifier } from '../../helpers/utils';
 
 import {
 	optionsCollection,
@@ -19,6 +21,7 @@ import {
 	selectRowsFixedCollection,
 	combineConditionsCollection,
 } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
@@ -88,10 +91,10 @@ export async function execute(
 		const SELECT = selectDistinct ? 'SELECT DISTINCT' : 'SELECT';
 
 		if (outputColumns.includes('*')) {
-			query = `${SELECT} * FROM \`${table}\``;
+			query = `${SELECT} * FROM ${escapeSqlIdentifier(table)}`;
 		} else {
-			const escapedColumns = outputColumns.map((column) => `\`${column}\``).join(', ');
-			query = `${SELECT} ${escapedColumns} FROM \`${table}\``;
+			const escapedColumns = outputColumns.map(escapeSqlIdentifier).join(', ');
+			query = `${SELECT} ${escapedColumns} FROM ${escapeSqlIdentifier(table)}`;
 		}
 
 		let values: QueryValues = [];
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 b3620e0c4b122..22bc332548f4a 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
@@ -1,14 +1,17 @@
-import type { IExecuteFunctions } from 'n8n-core';
-import type { IDataObject, INodeExecutionData, INodeProperties } from 'n8n-workflow';
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
 
 import type { QueryRunner, QueryValues, QueryWithValues } from '../../helpers/interfaces';
 import { AUTO_MAP, DATA_MODE } from '../../helpers/interfaces';
 
-import { updateDisplayOptions } from '../../../../../utils/utilities';
-
-import { replaceEmptyStringsByNulls } from '../../helpers/utils';
+import { escapeSqlIdentifier, replaceEmptyStringsByNulls } from '../../helpers/utils';
 
 import { optionsCollection } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
@@ -33,7 +36,7 @@ const properties: INodeProperties[] = [
 	},
 	{
 		displayName: `
-		In this mode, make sure incoming data fields are named the same as the columns in your table. If needed, use a 'Set' node before this node to change the field names.
+		In this mode, make sure incoming data fields are named the same as the columns in your table. If needed, use an 'Edit Fields' node before this node to change the field names.
 		`,
 		name: 'notice',
 		type: 'notice',
@@ -45,13 +48,14 @@ const properties: INodeProperties[] = [
 		},
 	},
 	{
-		// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased, n8n-nodes-base/node-param-display-name-wrong-for-dynamic-options
+		// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-options
 		displayName: 'Column to Match On',
 		name: 'columnToMatchOn',
 		type: 'options',
 		required: true,
+		// eslint-disable-next-line n8n-nodes-base/node-param-description-wrong-for-dynamic-options
 		description:
-			'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
+			'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/" target="_blank">expression</a>',
 		typeOptions: {
 			loadOptionsMethod: 'getColumns',
 			loadOptionsDependsOn: ['schema.value', 'table.value'],
@@ -97,8 +101,9 @@ const properties: INodeProperties[] = [
 						displayName: 'Column',
 						name: 'column',
 						type: 'options',
+						// eslint-disable-next-line n8n-nodes-base/node-param-description-wrong-for-dynamic-options
 						description:
-							'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
+							'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/" target="_blank">expression</a>',
 						typeOptions: {
 							loadOptionsMethod: 'getColumnsWithoutColumnToMatchOn',
 							loadOptionsDependsOn: ['schema.value', 'table.value'],
@@ -177,14 +182,16 @@ export async function execute(
 		const updates: string[] = [];
 
 		for (const column of updateColumns) {
-			updates.push(`\`${column}\` = ?`);
+			updates.push(`${escapeSqlIdentifier(column)} = ?`);
 			values.push(item[column] as string);
 		}
 
-		const condition = `\`${columnToMatchOn}\` = ?`;
+		const condition = `${escapeSqlIdentifier(columnToMatchOn)} = ?`;
 		values.push(valueToMatchOn);
 
-		const query = `UPDATE \`${table}\` SET ${updates.join(', ')} WHERE ${condition}`;
+		const query = `UPDATE ${escapeSqlIdentifier(table)} SET ${updates.join(
+			', ',
+		)} WHERE ${condition}`;
 
 		queries.push({ query, values });
 	}
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 dd50f20ba17eb..eccc36c0feca8 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
@@ -1,14 +1,17 @@
-import type { IExecuteFunctions } from 'n8n-core';
-import type { IDataObject, INodeExecutionData, INodeProperties } from 'n8n-workflow';
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
 
 import type { QueryRunner, QueryValues, QueryWithValues } from '../../helpers/interfaces';
 import { AUTO_MAP, DATA_MODE } from '../../helpers/interfaces';
 
-import { updateDisplayOptions } from '../../../../../utils/utilities';
-
-import { replaceEmptyStringsByNulls } from '../../helpers/utils';
+import { escapeSqlIdentifier, replaceEmptyStringsByNulls } from '../../helpers/utils';
 
 import { optionsCollection } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
@@ -33,7 +36,7 @@ const properties: INodeProperties[] = [
 	},
 	{
 		displayName: `
-		In this mode, make sure incoming data fields are named the same as the columns in your table. If needed, use a 'Set' node before this node to change the field names.
+		In this mode, make sure incoming data fields are named the same as the columns in your table. If needed, use an 'Edit Fields' node before this node to change the field names.
 		`,
 		name: 'notice',
 		type: 'notice',
@@ -45,13 +48,14 @@ const properties: INodeProperties[] = [
 		},
 	},
 	{
-		// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased, n8n-nodes-base/node-param-display-name-wrong-for-dynamic-options
+		// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-options
 		displayName: 'Column to Match On',
 		name: 'columnToMatchOn',
 		type: 'options',
 		required: true,
+		// eslint-disable-next-line n8n-nodes-base/node-param-description-wrong-for-dynamic-options
 		description:
-			'The column to compare when finding the rows to update. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			'The column to compare when finding the rows to update. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/" target="_blank">expression</a>.',
 		typeOptions: {
 			loadOptionsMethod: 'getColumns',
 			loadOptionsDependsOn: ['schema.value', 'table.value'],
@@ -97,8 +101,9 @@ const properties: INodeProperties[] = [
 						displayName: 'Column',
 						name: 'column',
 						type: 'options',
+						// eslint-disable-next-line n8n-nodes-base/node-param-description-wrong-for-dynamic-options
 						description:
-							'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
+							'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/" target="_blank">expression</a>',
 						typeOptions: {
 							loadOptionsMethod: 'getColumnsWithoutColumnToMatchOn',
 							loadOptionsDependsOn: ['schema.value', 'table.value'],
@@ -172,10 +177,12 @@ export async function execute(
 		const onConflict = 'ON DUPLICATE KEY UPDATE';
 
 		const columns = Object.keys(item);
-		const escapedColumns = columns.map((column) => `\`${column}\``).join(', ');
+		const escapedColumns = columns.map(escapeSqlIdentifier).join(', ');
 		const placeholder = `${columns.map(() => '?').join(',')}`;
 
-		const insertQuery = `INSERT INTO \`${table}\`(${escapedColumns}) VALUES(${placeholder})`;
+		const insertQuery = `INSERT INTO ${escapeSqlIdentifier(
+			table,
+		)}(${escapedColumns}) VALUES(${placeholder})`;
 
 		const values = Object.values(item) as QueryValues;
 
@@ -184,7 +191,7 @@ export async function execute(
 		const updates: string[] = [];
 
 		for (const column of updateColumns) {
-			updates.push(`\`${column}\` = ?`);
+			updates.push(`${escapeSqlIdentifier(column)} = ?`);
 			values.push(item[column] as string);
 		}
 
diff --git a/packages/nodes-base/nodes/MySql/v2/actions/router.ts b/packages/nodes-base/nodes/MySql/v2/actions/router.ts
index 9aa57586720fe..f5d75347cdab0 100644
--- a/packages/nodes-base/nodes/MySql/v2/actions/router.ts
+++ b/packages/nodes-base/nodes/MySql/v2/actions/router.ts
@@ -1,16 +1,14 @@
-import type { INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
-import type { IExecuteFunctions } from 'n8n-core';
 
 import { Client } from 'ssh2';
 
-import type { MySqlType } from './node.type';
 import type { QueryRunner } from '../helpers/interfaces';
 
-import * as database from './database/Database.resource';
-
 import { createPool } from '../transport';
 import { configureQueryRunner } from '../helpers/utils';
+import * as database from './database/Database.resource';
+import type { MySqlType } from './node.type';
 
 export async function router(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 	let returnData: INodeExecutionData[] = [];
@@ -19,6 +17,8 @@ export async function router(this: IExecuteFunctions): Promise<INodeExecutionDat
 	const operation = this.getNodeParameter('operation', 0);
 	const nodeOptions = this.getNodeParameter('options', 0);
 
+	nodeOptions.nodeVersion = this.getNode().typeVersion;
+
 	const credentials = await this.getCredentials('mySql');
 
 	let sshClient: Client | undefined = undefined;
@@ -62,5 +62,5 @@ export async function router(this: IExecuteFunctions): Promise<INodeExecutionDat
 		await pool.end();
 	}
 
-	return this.prepareOutputData(returnData);
+	return [returnData];
 }
diff --git a/packages/nodes-base/nodes/MySql/v2/actions/versionDescription.ts b/packages/nodes-base/nodes/MySql/v2/actions/versionDescription.ts
index fd12c75352f66..2c1b7b3e7db70 100644
--- a/packages/nodes-base/nodes/MySql/v2/actions/versionDescription.ts
+++ b/packages/nodes-base/nodes/MySql/v2/actions/versionDescription.ts
@@ -8,7 +8,7 @@ export const versionDescription: INodeTypeDescription = {
 	name: 'mySql',
 	icon: 'file:mysql.svg',
 	group: ['input'],
-	version: 2,
+	version: [2, 2.1, 2.2, 2.3, 2.4],
 	subtitle: '={{ $parameter["operation"] }}',
 	description: 'Get, add and update data in MySQL',
 	defaults: {
diff --git a/packages/nodes-base/nodes/MySql/v2/helpers/utils.ts b/packages/nodes-base/nodes/MySql/v2/helpers/utils.ts
index 7c72e47332d8d..1e15ce71bb2ad 100644
--- a/packages/nodes-base/nodes/MySql/v2/helpers/utils.ts
+++ b/packages/nodes-base/nodes/MySql/v2/helpers/utils.ts
@@ -7,8 +7,9 @@ import type {
 	NodeExecutionWithMetadata,
 } from 'n8n-workflow';
 
-import { NodeOperationError, deepCopy } from 'n8n-workflow';
+import { NodeOperationError } from 'n8n-workflow';
 
+import { generatePairedItemData } from '../../../../utils/utilities';
 import type {
 	Mysql2Pool,
 	QueryMode,
@@ -20,20 +21,20 @@ import type {
 
 import { BATCH_MODE } from './interfaces';
 
-export function copyInputItems(items: INodeExecutionData[], properties: string[]): IDataObject[] {
-	// Prepare the data to insert and copy it to be returned
-	let newItem: IDataObject;
-	return items.map((item) => {
-		newItem = {};
-		for (const property of properties) {
-			if (item.json[property] === undefined) {
-				newItem[property] = null;
-			} else {
-				newItem[property] = deepCopy(item.json[property]);
+export function escapeSqlIdentifier(identifier: string): string {
+	const parts = identifier.match(/(`[^`]*`|[^.`]+)/g) ?? [];
+
+	return parts
+		.map((part) => {
+			const trimmedPart = part.trim();
+
+			if (trimmedPart.startsWith('`') && trimmedPart.endsWith('`')) {
+				return trimmedPart;
 			}
-		}
-		return newItem;
-	});
+
+			return `\`${trimmedPart}\``;
+		})
+		.join('.');
 }
 
 export const prepareQueryAndReplacements = (rawQuery: string, replacements?: QueryValues) => {
@@ -50,7 +51,7 @@ export const prepareQueryAndReplacements = (rawQuery: string, replacements?: Que
 	for (const match of matches) {
 		if (match.includes(':name')) {
 			const matchIndex = Number(match.replace('$', '').replace(':name', '')) - 1;
-			query = query.replace(match, `\`${replacements[matchIndex]}\``);
+			query = query.replace(match, escapeSqlIdentifier(replacements[matchIndex].toString()));
 		} else {
 			const matchIndex = Number(match.replace('$', '')) - 1;
 			query = query.replace(match, '?');
@@ -138,6 +139,7 @@ export function prepareOutput(
 			itemData: IPairedItemData | IPairedItemData[];
 		},
 	) => NodeExecutionWithMetadata[],
+	itemData: IPairedItemData | IPairedItemData[],
 ) {
 	const returnData: INodeExecutionData[] = [];
 
@@ -149,7 +151,7 @@ export function prepareOutput(
 			};
 
 			const executionData = constructExecutionHelper(wrapData(item), {
-				itemData: { item: index },
+				itemData,
 			});
 
 			returnData.push(...executionData);
@@ -159,7 +161,7 @@ export function prepareOutput(
 			.filter((entry) => Array.isArray(entry))
 			.forEach((entry, index) => {
 				const executionData = constructExecutionHelper(wrapData(entry), {
-					itemData: { item: index },
+					itemData: Array.isArray(itemData) ? itemData[index] : itemData,
 				});
 
 				returnData.push(...executionData);
@@ -167,11 +169,35 @@ export function prepareOutput(
 	}
 
 	if (!returnData.length) {
-		returnData.push({ json: { success: true } });
+		if ((options?.nodeVersion as number) < 2.2) {
+			returnData.push({ json: { success: true }, pairedItem: itemData });
+		} else {
+			const isSelectQuery = statements
+				.filter((statement) => !statement.startsWith('--'))
+				.every((statement) =>
+					statement
+						.replace(/\/\*.*?\*\//g, '') // remove multiline comments
+						.replace(/\n/g, '')
+						.toLowerCase()
+						.startsWith('select'),
+				);
+
+			if (!isSelectQuery) {
+				returnData.push({ json: { success: true }, pairedItem: itemData });
+			}
+		}
 	}
 
 	return returnData;
 }
+const END_OF_STATEMENT = /;(?=(?:[^'\\]|'[^']*?'|\\[\s\S])*?$)/g;
+export const splitQueryToStatements = (query: string, filterOutEmpty = true) => {
+	const statements = query
+		.replace(/\n/g, '')
+		.split(END_OF_STATEMENT)
+		.map((statement) => statement.trim());
+	return filterOutEmpty ? statements.filter((statement) => statement !== '') : statements;
+};
 
 export function configureQueryRunner(
 	this: IExecuteFunctions,
@@ -207,10 +233,15 @@ export function configureQueryRunner(
 
 				if (!response) return [];
 
-				const statements = singleQuery
-					.replace(/\n/g, '')
-					.split(';')
-					.filter((statement) => statement !== '');
+				let statements;
+				if ((options?.nodeVersion as number) <= 2.3) {
+					statements = singleQuery
+						.replace(/\n/g, '')
+						.split(';')
+						.filter((statement) => statement !== '');
+				} else {
+					statements = splitQueryToStatements(singleQuery);
+				}
 
 				if (Array.isArray(response)) {
 					if (statements.length === 1) response = [response];
@@ -218,8 +249,17 @@ export function configureQueryRunner(
 					response = [response];
 				}
 
+				//because single query is used in this mode mapping itemIndex not posible, setting all items as paired
+				const pairedItem = generatePairedItemData(queries.length);
+
 				returnData.push(
-					...prepareOutput(response, options, statements, this.helpers.constructExecutionMetaData),
+					...prepareOutput(
+						response,
+						options,
+						statements,
+						this.helpers.constructExecutionMetaData,
+						pairedItem,
+					),
 				);
 			} catch (err) {
 				const error = parseMySqlError.call(this, err, 0, formatedQueries);
@@ -234,7 +274,13 @@ export function configureQueryRunner(
 					try {
 						const { query, values } = queryWithValues;
 						formatedQuery = connection.format(query, values);
-						const statements = formatedQuery.split(';').map((q) => q.trim());
+
+						let statements;
+						if ((options?.nodeVersion as number) <= 2.3) {
+							statements = formatedQuery.split(';').map((q) => q.trim());
+						} else {
+							statements = splitQueryToStatements(formatedQuery, false);
+						}
 
 						const responses: IDataObject[] = [];
 						for (const statement of statements) {
@@ -250,6 +296,7 @@ export function configureQueryRunner(
 								options,
 								statements,
 								this.helpers.constructExecutionMetaData,
+								{ item: index },
 							),
 						);
 					} catch (err) {
@@ -272,7 +319,13 @@ export function configureQueryRunner(
 					try {
 						const { query, values } = queryWithValues;
 						formatedQuery = connection.format(query, values);
-						const statements = formatedQuery.split(';').map((q) => q.trim());
+
+						let statements;
+						if ((options?.nodeVersion as number) <= 2.3) {
+							statements = formatedQuery.split(';').map((q) => q.trim());
+						} else {
+							statements = splitQueryToStatements(formatedQuery, false);
+						}
 
 						const responses: IDataObject[] = [];
 						for (const statement of statements) {
@@ -288,6 +341,7 @@ export function configureQueryRunner(
 								options,
 								statements,
 								this.helpers.constructExecutionMetaData,
+								{ item: index },
 							),
 						);
 					} catch (err) {
@@ -359,14 +413,16 @@ export function addWhereClauses(
 		}
 
 		let valueReplacement = ' ';
-		if (clause.condition !== 'IS NULL') {
+		if (clause.condition !== 'IS NULL' && clause.condition !== 'IS NOT NULL') {
 			valueReplacement = ' ?';
 			values.push(clause.value);
 		}
 
 		const operator = index === clauses.length - 1 ? '' : ` ${combineWith}`;
 
-		whereQuery += ` \`${clause.column}\` ${clause.condition}${valueReplacement}${operator}`;
+		whereQuery += ` ${escapeSqlIdentifier(clause.column)} ${
+			clause.condition
+		}${valueReplacement}${operator}`;
 	});
 
 	return [`${query}${whereQuery}`, replacements.concat(...values)];
@@ -385,7 +441,7 @@ export function addSortRules(
 	rules.forEach((rule, index) => {
 		const endWith = index === rules.length - 1 ? '' : ',';
 
-		orderByQuery += ` \`${rule.column}\` ${rule.direction}${endWith}`;
+		orderByQuery += ` ${escapeSqlIdentifier(rule.column)} ${rule.direction}${endWith}`;
 	});
 
 	return [`${query}${orderByQuery}`, replacements.concat(...values)];
diff --git a/packages/nodes-base/nodes/MySql/v2/methods/credentialTest.ts b/packages/nodes-base/nodes/MySql/v2/methods/credentialTest.ts
index 916d87e7af341..b4310480d7ec7 100644
--- a/packages/nodes-base/nodes/MySql/v2/methods/credentialTest.ts
+++ b/packages/nodes-base/nodes/MySql/v2/methods/credentialTest.ts
@@ -5,9 +5,8 @@ import type {
 	INodeCredentialTestResult,
 } from 'n8n-workflow';
 
-import { createPool } from '../transport';
-
 import { Client } from 'ssh2';
+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 b5eb1526d12aa..2b6db1db0efc0 100644
--- a/packages/nodes-base/nodes/MySql/v2/methods/listSearch.ts
+++ b/packages/nodes-base/nodes/MySql/v2/methods/listSearch.ts
@@ -1,7 +1,6 @@
 import type { IDataObject, ILoadOptionsFunctions, INodeListSearchResult } from 'n8n-workflow';
-import { createPool } from '../transport';
-
 import { Client } from 'ssh2';
+import { createPool } from '../transport';
 
 export async function searchTables(this: ILoadOptionsFunctions): Promise<INodeListSearchResult> {
 	const credentials = await this.getCredentials('mySql');
diff --git a/packages/nodes-base/nodes/MySql/v2/methods/loadOptions.ts b/packages/nodes-base/nodes/MySql/v2/methods/loadOptions.ts
index 635329b6ef269..7576d7c85cdc2 100644
--- a/packages/nodes-base/nodes/MySql/v2/methods/loadOptions.ts
+++ b/packages/nodes-base/nodes/MySql/v2/methods/loadOptions.ts
@@ -1,7 +1,7 @@
 import type { IDataObject, ILoadOptionsFunctions, INodePropertyOptions } from 'n8n-workflow';
-import { createPool } from '../transport';
-
 import { Client } from 'ssh2';
+import { createPool } from '../transport';
+import { escapeSqlIdentifier } from '../helpers/utils';
 
 export async function getColumns(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
 	const credentials = await this.getCredentials('mySql');
@@ -23,7 +23,9 @@ export async function getColumns(this: ILoadOptionsFunctions): Promise<INodeProp
 
 		const columns = (
 			await connection.query(
-				`SHOW COLUMNS FROM \`${table}\` FROM \`${credentials.database as string}\``,
+				`SHOW COLUMNS FROM ${escapeSqlIdentifier(table)} FROM ${escapeSqlIdentifier(
+					credentials.database as string,
+				)}`,
 			)
 		)[0] as IDataObject[];
 
diff --git a/packages/nodes-base/nodes/MySql/v2/transport/index.ts b/packages/nodes-base/nodes/MySql/v2/transport/index.ts
index fd662c4b76a2b..47b7a8c57c6cc 100644
--- a/packages/nodes-base/nodes/MySql/v2/transport/index.ts
+++ b/packages/nodes-base/nodes/MySql/v2/transport/index.ts
@@ -1,11 +1,11 @@
+import { ApplicationError } from 'n8n-workflow';
 import type { ICredentialDataDecryptedObject, IDataObject } from 'n8n-workflow';
 
 import mysql2 from 'mysql2/promise';
 import type { Client, ConnectConfig } from 'ssh2';
-import { rm, writeFile } from 'fs/promises';
 
-import { file } from 'tmp-promise';
 import type { Mysql2Pool } from '../helpers/interfaces';
+import { formatPrivateKey } from '@utils/utilities';
 
 async function createSshConnectConfig(credentials: IDataObject) {
 	if (credentials.sshAuthenticateWith === 'password') {
@@ -16,14 +16,11 @@ async function createSshConnectConfig(credentials: IDataObject) {
 			password: credentials.sshPassword as string,
 		} as ConnectConfig;
 	} else {
-		const { path } = await file({ prefix: 'n8n-ssh-' });
-		await writeFile(path, credentials.privateKey as string);
-
 		const options: ConnectConfig = {
-			host: credentials.host as string,
-			username: credentials.username as string,
-			port: credentials.port as number,
-			privateKey: path,
+			host: credentials.sshHost as string,
+			username: credentials.sshUser as string,
+			port: credentials.sshPort as number,
+			privateKey: formatPrivateKey(credentials.privateKey as string),
 		};
 
 		if (credentials.passphrase) {
@@ -40,7 +37,9 @@ export async function createPool(
 	sshClient?: Client,
 ): Promise<Mysql2Pool> {
 	if (credentials === undefined) {
-		throw new Error('Credentials not selected, select or add new credentials');
+		throw new ApplicationError('Credentials not selected, select or add new credentials', {
+			level: 'warning',
+		});
 	}
 	const {
 		ssl,
@@ -63,12 +62,12 @@ export async function createPool(
 		baseCredentials.ssl = {};
 
 		if (caCertificate) {
-			baseCredentials.ssl.ca = caCertificate;
+			baseCredentials.ssl.ca = formatPrivateKey(caCertificate as string);
 		}
 
 		if (clientCertificate || clientPrivateKey) {
-			baseCredentials.ssl.cert = clientCertificate;
-			baseCredentials.ssl.key = clientPrivateKey;
+			baseCredentials.ssl.cert = formatPrivateKey(clientCertificate as string);
+			baseCredentials.ssl.key = formatPrivateKey(clientPrivateKey as string);
 		}
 	}
 
@@ -78,6 +77,10 @@ export async function createPool(
 		supportBigNumbers: true,
 	};
 
+	if (options?.nodeVersion && (options.nodeVersion as number) >= 2.1) {
+		connectionOptions.dateStrings = true;
+	}
+
 	if (options?.connectionLimit) {
 		connectionOptions.connectionLimit = options.connectionLimit as number;
 	}
@@ -94,7 +97,9 @@ export async function createPool(
 		return mysql2.createPool(connectionOptions);
 	} else {
 		if (!sshClient) {
-			throw new Error('SSH Tunnel is enabled but no SSH Client was provided');
+			throw new ApplicationError('SSH Tunnel is enabled but no SSH Client was provided', {
+				level: 'warning',
+			});
 		}
 
 		const tunnelConfig = await createSshConnectConfig(credentials);
@@ -106,12 +111,6 @@ export async function createPool(
 			dstPort: credentials.port as number,
 		};
 
-		if (sshAuthenticateWith === 'privateKey') {
-			sshClient.on('end', async () => {
-				await rm(tunnelConfig.privateKey as string);
-			});
-		}
-
 		const poolSetup = new Promise<mysql2.Pool>((resolve, reject) => {
 			sshClient
 				.on('ready', () => {
@@ -134,6 +133,6 @@ export async function createPool(
 				.connect(tunnelConfig);
 		});
 
-		return poolSetup;
+		return await poolSetup;
 	}
 }
diff --git a/packages/nodes-base/nodes/N8n/ExecutionDescription.ts b/packages/nodes-base/nodes/N8n/ExecutionDescription.ts
index 85f31b97fe96e..eb951e19c21b7 100644
--- a/packages/nodes-base/nodes/N8n/ExecutionDescription.ts
+++ b/packages/nodes-base/nodes/N8n/ExecutionDescription.ts
@@ -1,6 +1,5 @@
-/* eslint-disable n8n-nodes-base/node-param-default-missing */
-import { getCursorPaginator } from './GenericFunctions';
 import type { INodeProperties } from 'n8n-workflow';
+import { getCursorPaginator } from './GenericFunctions';
 import { workflowIdLocator } from './WorkflowLocator';
 
 export const executionOperations: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/N8n/GenericFunctions.ts b/packages/nodes-base/nodes/N8n/GenericFunctions.ts
index 585030ef46d7d..e190d8abb0406 100644
--- a/packages/nodes-base/nodes/N8n/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/N8n/GenericFunctions.ts
@@ -5,21 +5,22 @@ import type {
 	IExecutePaginationFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
+	IHttpRequestMethods,
 	IHttpRequestOptions,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
+	IRequestOptions,
 	JsonObject,
 	PreSendAction,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
-import type { OptionsWithUri } from 'request';
 
 /**
  * A custom API request function to be used with the resourceLocator lookup queries.
  */
 export async function apiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: object,
 	query?: IDataObject,
@@ -34,7 +35,7 @@ export async function apiRequest(
 	const credentials = (await this.getCredentials('n8nApi')) as N8nApiCredentials;
 	const baseUrl = credentials.baseUrl;
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		method,
 		body,
 		qs: query,
@@ -54,7 +55,7 @@ export async function apiRequest(
 
 export async function apiRequestAllItems(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: object,
 	query?: IDataObject,
diff --git a/packages/nodes-base/nodes/N8n/N8n.node.json b/packages/nodes-base/nodes/N8n/N8n.node.json
index 34fe5023617ed..b46b1cbfba464 100644
--- a/packages/nodes-base/nodes/N8n/N8n.node.json
+++ b/packages/nodes-base/nodes/N8n/N8n.node.json
@@ -17,6 +17,6 @@
 	},
 	"alias": ["Workflow", "Execution"],
 	"subcategories": {
-		"Core Nodes": ["Helpers", "Flow", "Other Trigger Nodes"]
+		"Core Nodes": ["Helpers", "Other Trigger Nodes"]
 	}
 }
diff --git a/packages/nodes-base/nodes/N8n/WorkflowLocator.ts b/packages/nodes-base/nodes/N8n/WorkflowLocator.ts
index b957841d33d64..612a12c275e9c 100644
--- a/packages/nodes-base/nodes/N8n/WorkflowLocator.ts
+++ b/packages/nodes-base/nodes/N8n/WorkflowLocator.ts
@@ -77,14 +77,14 @@ export const workflowIdLocator: INodeProperties = {
 				{
 					type: 'regex',
 					properties: {
-						regex: '.*/workflow/([0-9]{1,})',
+						regex: '.*/workflow/([0-9a-zA-Z]{1,})',
 						errorMessage: 'Not a valid Workflow URL',
 					},
 				},
 			],
 			extractValue: {
 				type: 'regex',
-				regex: '.*/workflow/([0-9]{1,})',
+				regex: '.*/workflow/([0-9a-zA-Z]{1,})',
 			},
 		},
 		{
@@ -95,7 +95,7 @@ export const workflowIdLocator: INodeProperties = {
 				{
 					type: 'regex',
 					properties: {
-						regex: '[0-9]{1,}',
+						regex: '[0-9a-zA-Z]{1,}',
 						errorMessage: 'Not a valid Workflow ID',
 					},
 				},
diff --git a/packages/nodes-base/nodes/N8n/n8n.svg b/packages/nodes-base/nodes/N8n/n8n.svg
index 17ba54479a678..bfee2f544b8a8 100644
--- a/packages/nodes-base/nodes/N8n/n8n.svg
+++ b/packages/nodes-base/nodes/N8n/n8n.svg
@@ -1,3 +1 @@
-<svg viewBox="0 0 230 120" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M204 48C192.817 48 183.42 40.3514 180.756 30H153.248C147.382 30 142.376 34.241 141.412 40.0272L140.425 45.9456C139.489 51.5648 136.646 56.4554 132.626 60C136.646 63.5446 139.489 68.4352 140.425 74.0544L141.412 79.9728C142.376 85.759 147.382 90 153.248 90H156.756C159.42 79.6486 168.817 72 180 72C193.255 72 204 82.7452 204 96C204 109.255 193.255 120 180 120C168.817 120 159.42 112.351 156.756 102H153.248C141.516 102 131.504 93.5181 129.575 81.9456L128.588 76.0272C127.624 70.241 122.618 66 116.752 66H107.244C104.58 76.3514 95.183 84 84 84C72.817 84 63.4204 76.3514 60.7561 66H47.2439C44.5796 76.3514 35.183 84 24 84C10.7452 84 0 73.2548 0 60C0 46.7452 10.7452 36 24 36C35.183 36 44.5796 43.6486 47.2439 54H60.7561C63.4204 43.6486 72.817 36 84 36C95.183 36 104.58 43.6486 107.244 54H116.752C122.618 54 127.624 49.759 128.588 43.9728L129.575 38.0544C131.504 26.4819 141.516 18 153.248 18L180.756 18C183.42 7.64864 192.817 0 204 0C217.255 0 228 10.7452 228 24C228 37.2548 217.255 48 204 48ZM204 36C210.627 36 216 30.6274 216 24C216 17.3726 210.627 12 204 12C197.373 12 192 17.3726 192 24C192 30.6274 197.373 36 204 36ZM24 72C30.6274 72 36 66.6274 36 60C36 53.3726 30.6274 48 24 48C17.3726 48 12 53.3726 12 60C12 66.6274 17.3726 72 24 72ZM96 60C96 66.6274 90.6274 72 84 72C77.3726 72 72 66.6274 72 60C72 53.3726 77.3726 48 84 48C90.6274 48 96 53.3726 96 60ZM192 96C192 102.627 186.627 108 180 108C173.373 108 168 102.627 168 96C168 89.3726 173.373 84 180 84C186.627 84 192 89.3726 192 96Z" fill="#EA4B71"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 230 120"><path fill="#EA4B71" fill-rule="evenodd" d="M204 48c-11.183 0-20.58-7.649-23.244-18h-27.508a12 12 0 0 0-11.836 10.027l-.987 5.919A23.94 23.94 0 0 1 132.626 60a23.94 23.94 0 0 1 7.799 14.054l.987 5.919A12 12 0 0 0 153.248 90h3.508C159.42 79.649 168.817 72 180 72c13.255 0 24 10.745 24 24s-10.745 24-24 24c-11.183 0-20.58-7.649-23.244-18h-3.508c-11.732 0-21.744-8.482-23.673-20.054l-.987-5.919A12 12 0 0 0 116.752 66h-9.508C104.58 76.351 95.183 84 84 84s-20.58-7.649-23.244-18H47.244C44.58 76.351 35.183 84 24 84 10.745 84 0 73.255 0 60s10.745-24 24-24c11.183 0 20.58 7.649 23.244 18h13.512C63.42 43.649 72.817 36 84 36s20.58 7.649 23.244 18h9.508a12 12 0 0 0 11.836-10.027l.987-5.919C131.504 26.482 141.516 18 153.248 18h27.508C183.42 7.649 192.817 0 204 0c13.255 0 24 10.745 24 24s-10.745 24-24 24m0-12c6.627 0 12-5.373 12-12s-5.373-12-12-12-12 5.373-12 12 5.373 12 12 12M24 72c6.627 0 12-5.373 12-12s-5.373-12-12-12-12 5.373-12 12 5.373 12 12 12m72-12c0 6.627-5.373 12-12 12s-12-5.373-12-12 5.373-12 12-12 12 5.373 12 12m96 36c0 6.627-5.373 12-12 12s-12-5.373-12-12 5.373-12 12-12 12 5.373 12 12" clip-rule="evenodd"/></svg>
\ No newline at end of file
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 6d863e43db74c..e4b0b4d930365 100644
--- a/packages/nodes-base/nodes/N8n/test/node/N8n.test.ts
+++ b/packages/nodes-base/nodes/N8n/test/node/N8n.test.ts
@@ -1,11 +1,10 @@
-import { setup, workflowToTests, getWorkflowFilenames } from '../../../../test/nodes/Helpers';
-
 import nock from 'nock';
-import { executeWorkflow } from '../../../../test/nodes/ExecuteWorkflow';
+import type { INodeTypes } from 'n8n-workflow';
+import { setup, workflowToTests, getWorkflowFilenames } from '@test/nodes/Helpers';
 
-import type { WorkflowTestData } from '../../../../test/nodes/types';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 
-import type { INodeTypes } from 'n8n-workflow';
+import type { WorkflowTestData } from '@test/nodes/types';
 
 describe('Test N8n Node, expect base_url to be received from credentials', () => {
 	const workflows = getWorkflowFilenames(__dirname);
@@ -32,6 +31,6 @@ describe('Test N8n Node, expect base_url to be received from credentials', () =>
 	};
 
 	for (const testData of tests) {
-		test(testData.description, async () => testNode(testData, nodeTypes));
+		test(testData.description, async () => await testNode(testData, nodeTypes));
 	}
 });
diff --git a/packages/nodes-base/nodes/N8nTrainingCustomerDatastore/N8nTrainingCustomerDatastore.node.ts b/packages/nodes-base/nodes/N8nTrainingCustomerDatastore/N8nTrainingCustomerDatastore.node.ts
index 1318b0bafcc61..a5fd20b0e94a1 100644
--- a/packages/nodes-base/nodes/N8nTrainingCustomerDatastore/N8nTrainingCustomerDatastore.node.ts
+++ b/packages/nodes-base/nodes/N8nTrainingCustomerDatastore/N8nTrainingCustomerDatastore.node.ts
@@ -145,6 +145,6 @@ export class N8nTrainingCustomerDatastore implements INodeType {
 				returnData.push({ json: responseData });
 			}
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/N8nTrainingCustomerDatastore/n8nTrainingCustomerDatastore.svg b/packages/nodes-base/nodes/N8nTrainingCustomerDatastore/n8nTrainingCustomerDatastore.svg
index 1b053772f7513..3e20ed4539712 100644
--- a/packages/nodes-base/nodes/N8nTrainingCustomerDatastore/n8nTrainingCustomerDatastore.svg
+++ b/packages/nodes-base/nodes/N8nTrainingCustomerDatastore/n8nTrainingCustomerDatastore.svg
@@ -1,13 +1 @@
-<svg width="200" height="200" viewBox="0 0 200 200" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0)">
-<path d="M39.44 104.77C38.6 104.26 37.53 104.85 37.53 105.83V132.23C37.53 143.47 65.52 152.64 100.03 152.64C134.54 152.64 162.53 143.47 162.53 132.23V105.83C162.53 104.85 161.46 104.26 160.62 104.77C146.86 113.17 123.41 117.09 100.03 117.09C76.65 117.09 53.2 113.16 39.44 104.77Z" fill="#717172"/>
-<path d="M39.44 149.41C38.6 148.9 37.53 149.49 37.53 150.47V176.87C37.53 188.11 65.52 197.28 100.03 197.28C134.54 197.28 162.53 188.11 162.53 176.87V150.47C162.53 149.49 161.46 148.9 160.62 149.41C146.86 157.81 123.41 161.73 100.03 161.73C76.65 161.73 53.2 157.81 39.44 149.41Z" fill="#717172"/>
-<path d="M109.51 82.54C106.43 83.49 103.24 83.97 100.03 83.97C96.78 83.97 93.57 83.49 90.49 82.55L39.65 66.93C39.05 66.75 38.39 67.03 38.14 67.6C37.73 68.54 37.52 69.49 37.52 70.46V87.59C37.52 98.83 65.51 108 100.02 108C134.53 108 162.52 98.83 162.52 87.59V70.46C162.52 69.48 162.31 68.52 161.9 67.58C161.65 67.01 160.99 66.73 160.39 66.91L109.51 82.54Z" fill="#717172"/>
-<path d="M194.48 30.59L107.31 3.81C102.56 2.35 97.43 2.35 92.69 3.81L5.52 30.59C-1.84 32.85 -1.84 42.58 5.52 44.84L20.72 49.51C17.39 53.63 15.34 58.66 15.13 64.17C12.12 65.89 10 69 10 72.72C10 76.09 11.78 78.92 14.33 80.74L6.35 116.64C5.66 119.76 8.03 122.72 11.23 122.72H28.76C31.96 122.72 34.34 119.76 33.64 116.64L25.66 80.74C28.22 78.93 29.99 76.09 29.99 72.72C29.99 69.1 27.97 66.08 25.1 64.32C25.34 59.63 27.74 55.48 31.57 52.84L92.69 71.62C95.52 72.49 100.95 73.57 107.31 71.62L194.48 44.84C201.84 42.58 201.84 32.86 194.48 30.59Z" fill="#FF6D5A"/>
-</g>
-<defs>
-<clipPath id="clip0">
-<rect width="200" height="200" fill="white"/>
-</clipPath>
-</defs>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="200" height="200" fill="none"><g clip-path="url(#a)"><path fill="#717172" d="M39.44 104.77c-.84-.51-1.91.08-1.91 1.06v26.4c0 11.24 27.99 20.41 62.5 20.41s62.5-9.17 62.5-20.41v-26.4c0-.98-1.07-1.57-1.91-1.06-13.76 8.4-37.21 12.32-60.59 12.32s-46.83-3.93-60.59-12.32"/><path fill="#717172" d="M39.44 149.41c-.84-.51-1.91.08-1.91 1.06v26.4c0 11.24 27.99 20.41 62.5 20.41s62.5-9.17 62.5-20.41v-26.4c0-.98-1.07-1.57-1.91-1.06-13.76 8.4-37.21 12.32-60.59 12.32s-46.83-3.92-60.59-12.32M109.51 82.54c-3.08.95-6.27 1.43-9.48 1.43-3.25 0-6.46-.48-9.54-1.42L39.65 66.93c-.6-.18-1.26.1-1.51.67-.41.94-.62 1.89-.62 2.86v17.13c0 11.24 27.99 20.41 62.5 20.41s62.5-9.17 62.5-20.41V70.46c0-.98-.21-1.94-.62-2.88-.25-.57-.91-.85-1.51-.67z"/><path fill="#FF6D5A" d="M194.48 30.59 107.31 3.81a24.95 24.95 0 0 0-14.62 0L5.52 30.59c-7.36 2.26-7.36 11.99 0 14.25l15.2 4.67c-3.33 4.12-5.38 9.15-5.59 14.66C12.12 65.89 10 69 10 72.72c0 3.37 1.78 6.2 4.33 8.02l-7.98 35.9c-.69 3.12 1.68 6.08 4.88 6.08h17.53c3.2 0 5.58-2.96 4.88-6.08l-7.98-35.9c2.56-1.81 4.33-4.65 4.33-8.02 0-3.62-2.02-6.64-4.89-8.4.24-4.69 2.64-8.84 6.47-11.48l61.12 18.78c2.83.87 8.26 1.95 14.62 0l87.17-26.78c7.36-2.26 7.36-11.98 0-14.25"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h200v200H0z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/N8nTrainingCustomerMessenger/N8nTrainingCustomerMessenger.node.ts b/packages/nodes-base/nodes/N8nTrainingCustomerMessenger/N8nTrainingCustomerMessenger.node.ts
index bc3dda5c211ce..975cd570394be 100644
--- a/packages/nodes-base/nodes/N8nTrainingCustomerMessenger/N8nTrainingCustomerMessenger.node.ts
+++ b/packages/nodes-base/nodes/N8nTrainingCustomerMessenger/N8nTrainingCustomerMessenger.node.ts
@@ -58,6 +58,6 @@ export class N8nTrainingCustomerMessenger implements INodeType {
 
 			returnData.push(...executionData);
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/N8nTrainingCustomerMessenger/n8nTrainingCustomerMessenger.svg b/packages/nodes-base/nodes/N8nTrainingCustomerMessenger/n8nTrainingCustomerMessenger.svg
index c3165491c1db2..800416c3b54b5 100644
--- a/packages/nodes-base/nodes/N8nTrainingCustomerMessenger/n8nTrainingCustomerMessenger.svg
+++ b/packages/nodes-base/nodes/N8nTrainingCustomerMessenger/n8nTrainingCustomerMessenger.svg
@@ -1,4 +1 @@
-<svg width="200" height="200" viewBox="0 0 200 200" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5.13001 36.125C-1.23999 38.085 -1.23999 46.495 5.13001 48.455L80.56 71.625C86.06 73.315 90.76 72.375 93.21 71.625L146.09 55.375C149.4 57.655 154.08 63.545 156.81 66.555C155.85 69.305 156.16 72.435 158.15 74.855C160 77.105 162.74 78.025 165.45 77.835L179.83 106.225C181.08 108.695 184.3 109.375 186.44 107.615L198.17 97.985C200.31 96.225 200.27 92.945 198.09 91.235L173.04 71.625C173.75 69.005 173.39 66.135 171.54 63.885C169.5 61.405 166.37 60.485 163.41 60.985C160.25 57.415 158.38 56.065 155.5 52.495L168.65 48.455C175.02 46.495 175.02 38.085 168.65 36.125L93.21 12.945C89.1 11.685 84.67 11.685 80.56 12.945L5.13001 36.125Z" fill="#FF6D5A"/>
-<path d="M134.621 70.931C133.536 70.6428 132.381 70.6515 131.278 70.9921L94.6157 82.2414C91.9644 83.0536 89.2081 83.4641 86.4431 83.4641C83.6431 83.4641 80.8781 83.0536 78.2268 82.2414L41.8703 71.0969C40.1815 70.5816 38.3615 70.8262 36.8827 71.7607C36.0077 72.3721 35.1502 73.0009 34.3189 73.6472C34.2052 73.7346 34.1002 73.8219 33.9864 73.9005C33.8202 74.0315 33.6627 74.1538 33.4964 74.2848C19.6101 85.403 11 100.853 11 117.937C11 132.566 17.3263 145.955 27.8439 156.488C24.1514 171.345 11.805 184.594 11.6563 184.742C11.0088 185.424 10.825 186.419 11.21 187.31C11.595 188.192 12.4175 188.725 13.3713 188.725C32.9627 188.725 47.6453 179.345 54.9166 173.563C64.5767 177.188 75.3043 179.284 86.6531 179.284C107.452 179.284 126.291 172.471 139.967 161.458C153.582 150.366 162 135.073 162 118.173C162 99.1677 151.351 82.189 134.621 70.931Z" fill="#717172"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="200" height="200" fill="none"><path fill="#FF6D5A" d="M5.13 36.125c-6.37 1.96-6.37 10.37 0 12.33l75.43 23.17c5.5 1.69 10.2.75 12.65 0l52.88-16.25c3.31 2.28 7.99 8.17 10.72 11.18-.96 2.75-.65 5.88 1.34 8.3 1.85 2.25 4.59 3.17 7.3 2.98l14.38 28.39c1.25 2.47 4.47 3.15 6.61 1.39l11.73-9.63a4.326 4.326 0 0 0-.08-6.75l-25.05-19.61c.71-2.62.35-5.49-1.5-7.74-2.04-2.48-5.17-3.4-8.13-2.9-3.16-3.57-5.03-4.92-7.91-8.49l13.15-4.04c6.37-1.96 6.37-10.37 0-12.33l-75.44-23.18a21.64 21.64 0 0 0-12.65 0z"/><path fill="#717172" d="M134.621 70.931a6.05 6.05 0 0 0-3.343.061l-36.662 11.25a28 28 0 0 1-8.173 1.222c-2.8 0-5.565-.41-8.216-1.223L41.87 71.097a6.04 6.04 0 0 0-4.987.664 63 63 0 0 0-2.564 1.886c-.114.088-.219.175-.333.253l-.49.385C19.61 85.403 11 100.853 11 117.937c0 14.629 6.326 28.018 16.844 38.551-3.693 14.857-16.039 28.106-16.188 28.254a2.35 2.35 0 0 0-.446 2.568 2.32 2.32 0 0 0 2.161 1.415c19.592 0 34.274-9.38 41.546-15.162 9.66 3.625 20.387 5.721 31.736 5.721 20.799 0 39.638-6.813 53.314-17.826C153.582 150.366 162 135.073 162 118.173c0-19.005-10.649-35.984-27.379-47.242"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/N8nTrigger/n8nTrigger.svg b/packages/nodes-base/nodes/N8nTrigger/n8nTrigger.svg
index 17ba54479a678..bfee2f544b8a8 100644
--- a/packages/nodes-base/nodes/N8nTrigger/n8nTrigger.svg
+++ b/packages/nodes-base/nodes/N8nTrigger/n8nTrigger.svg
@@ -1,3 +1 @@
-<svg viewBox="0 0 230 120" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M204 48C192.817 48 183.42 40.3514 180.756 30H153.248C147.382 30 142.376 34.241 141.412 40.0272L140.425 45.9456C139.489 51.5648 136.646 56.4554 132.626 60C136.646 63.5446 139.489 68.4352 140.425 74.0544L141.412 79.9728C142.376 85.759 147.382 90 153.248 90H156.756C159.42 79.6486 168.817 72 180 72C193.255 72 204 82.7452 204 96C204 109.255 193.255 120 180 120C168.817 120 159.42 112.351 156.756 102H153.248C141.516 102 131.504 93.5181 129.575 81.9456L128.588 76.0272C127.624 70.241 122.618 66 116.752 66H107.244C104.58 76.3514 95.183 84 84 84C72.817 84 63.4204 76.3514 60.7561 66H47.2439C44.5796 76.3514 35.183 84 24 84C10.7452 84 0 73.2548 0 60C0 46.7452 10.7452 36 24 36C35.183 36 44.5796 43.6486 47.2439 54H60.7561C63.4204 43.6486 72.817 36 84 36C95.183 36 104.58 43.6486 107.244 54H116.752C122.618 54 127.624 49.759 128.588 43.9728L129.575 38.0544C131.504 26.4819 141.516 18 153.248 18L180.756 18C183.42 7.64864 192.817 0 204 0C217.255 0 228 10.7452 228 24C228 37.2548 217.255 48 204 48ZM204 36C210.627 36 216 30.6274 216 24C216 17.3726 210.627 12 204 12C197.373 12 192 17.3726 192 24C192 30.6274 197.373 36 204 36ZM24 72C30.6274 72 36 66.6274 36 60C36 53.3726 30.6274 48 24 48C17.3726 48 12 53.3726 12 60C12 66.6274 17.3726 72 24 72ZM96 60C96 66.6274 90.6274 72 84 72C77.3726 72 72 66.6274 72 60C72 53.3726 77.3726 48 84 48C90.6274 48 96 53.3726 96 60ZM192 96C192 102.627 186.627 108 180 108C173.373 108 168 102.627 168 96C168 89.3726 173.373 84 180 84C186.627 84 192 89.3726 192 96Z" fill="#EA4B71"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 230 120"><path fill="#EA4B71" fill-rule="evenodd" d="M204 48c-11.183 0-20.58-7.649-23.244-18h-27.508a12 12 0 0 0-11.836 10.027l-.987 5.919A23.94 23.94 0 0 1 132.626 60a23.94 23.94 0 0 1 7.799 14.054l.987 5.919A12 12 0 0 0 153.248 90h3.508C159.42 79.649 168.817 72 180 72c13.255 0 24 10.745 24 24s-10.745 24-24 24c-11.183 0-20.58-7.649-23.244-18h-3.508c-11.732 0-21.744-8.482-23.673-20.054l-.987-5.919A12 12 0 0 0 116.752 66h-9.508C104.58 76.351 95.183 84 84 84s-20.58-7.649-23.244-18H47.244C44.58 76.351 35.183 84 24 84 10.745 84 0 73.255 0 60s10.745-24 24-24c11.183 0 20.58 7.649 23.244 18h13.512C63.42 43.649 72.817 36 84 36s20.58 7.649 23.244 18h9.508a12 12 0 0 0 11.836-10.027l.987-5.919C131.504 26.482 141.516 18 153.248 18h27.508C183.42 7.649 192.817 0 204 0c13.255 0 24 10.745 24 24s-10.745 24-24 24m0-12c6.627 0 12-5.373 12-12s-5.373-12-12-12-12 5.373-12 12 5.373 12 12 12M24 72c6.627 0 12-5.373 12-12s-5.373-12-12-12-12 5.373-12 12 5.373 12 12 12m72-12c0 6.627-5.373 12-12 12s-12-5.373-12-12 5.373-12 12-12 12 5.373 12 12m96 36c0 6.627-5.373 12-12 12s-12-5.373-12-12 5.373-12 12-12 12 5.373 12 12" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Nasa/GenericFunctions.ts b/packages/nodes-base/nodes/Nasa/GenericFunctions.ts
index c20cb3856d6e2..0b69c55a6f77d 100644
--- a/packages/nodes-base/nodes/Nasa/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Nasa/GenericFunctions.ts
@@ -1,11 +1,16 @@
-import type { OptionsWithUri } from 'request';
-
-import type { IExecuteFunctions, IHookFunctions, IDataObject, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IHookFunctions,
+	IDataObject,
+	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function nasaApiRequest(
 	this: IHookFunctions | IExecuteFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	qs: IDataObject,
 	option: IDataObject = {},
@@ -15,7 +20,7 @@ export async function nasaApiRequest(
 
 	qs.api_key = credentials.api_key as string;
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		method,
 		qs,
 		uri: uri || `https://api.nasa.gov${endpoint}`,
@@ -36,7 +41,7 @@ export async function nasaApiRequest(
 export async function nasaApiRequestAllItems(
 	this: IHookFunctions | IExecuteFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 	query: IDataObject = {},
 ): Promise<any> {
diff --git a/packages/nodes-base/nodes/Nasa/Nasa.node.ts b/packages/nodes-base/nodes/Nasa/Nasa.node.ts
index 373276dd8af8e..ed8c825154c2a 100644
--- a/packages/nodes-base/nodes/Nasa/Nasa.node.ts
+++ b/packages/nodes-base/nodes/Nasa/Nasa.node.ts
@@ -7,10 +7,9 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
+import moment from 'moment-timezone';
 import { nasaApiRequest, nasaApiRequestAllItems } from './GenericFunctions';
 
-import moment from 'moment';
-
 export class Nasa implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'NASA',
@@ -571,7 +570,7 @@ export class Nasa implements INodeType {
 					'By default just the URL of the image is returned. When set to true the image will be downloaded.',
 			},
 			{
-				displayName: 'Binary Property',
+				displayName: 'Put Output File in Field',
 				name: 'binaryPropertyName',
 				type: 'string',
 				required: true,
@@ -583,7 +582,7 @@ export class Nasa implements INodeType {
 						download: [true],
 					},
 				},
-				description: 'Name of the binary property to which to write to',
+				hint: 'The name of the output binary field to put the file in',
 			},
 
 			/* date for astronomyPictureOfTheDay */
@@ -767,7 +766,7 @@ export class Nasa implements INodeType {
 				},
 			},
 			{
-				displayName: 'Binary Property',
+				displayName: 'Put Output File in Field',
 				name: 'binaryPropertyName',
 				type: 'string',
 				required: true,
@@ -778,7 +777,7 @@ export class Nasa implements INodeType {
 						resource: ['earthImagery'],
 					},
 				},
-				description: 'Name of the binary property to which to write to',
+				hint: 'The name of the output binary field to put the file in',
 			},
 
 			//aqui
@@ -1130,11 +1129,11 @@ export class Nasa implements INodeType {
 		}
 
 		if (resource === 'earthImagery' && operation === 'get') {
-			return this.prepareOutputData(items);
+			return [items];
 		} else if (resource === 'astronomyPictureOfTheDay' && operation === 'get' && download) {
-			return this.prepareOutputData(items);
+			return [items];
 		} else {
-			return this.prepareOutputData(returnData);
+			return [returnData];
 		}
 	}
 }
diff --git a/packages/nodes-base/nodes/Netlify/GenericFunctions.ts b/packages/nodes-base/nodes/Netlify/GenericFunctions.ts
index 21bdd9241118e..1c17f44b308b5 100644
--- a/packages/nodes-base/nodes/Netlify/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Netlify/GenericFunctions.ts
@@ -1,18 +1,17 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	JsonObject,
+	IRequestOptions,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function netlifyApiRequest(
-	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: any = {},
@@ -20,7 +19,7 @@ export async function netlifyApiRequest(
 	uri?: string,
 	option: IDataObject = {},
 ): Promise<any> {
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		method,
 		headers: {
 			'Content-Type': 'application/json',
@@ -52,7 +51,7 @@ export async function netlifyApiRequest(
 
 export async function netlifyRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: any = {},
diff --git a/packages/nodes-base/nodes/Netlify/Netlify.node.ts b/packages/nodes-base/nodes/Netlify/Netlify.node.ts
index e9bed05212f09..2621ef1a6be49 100644
--- a/packages/nodes-base/nodes/Netlify/Netlify.node.ts
+++ b/packages/nodes-base/nodes/Netlify/Netlify.node.ts
@@ -206,6 +206,6 @@ export class Netlify implements INodeType {
 			}
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Netlify/NetlifyTrigger.node.ts b/packages/nodes-base/nodes/Netlify/NetlifyTrigger.node.ts
index 5a00a7f5baf15..fe506f1fb8c1d 100644
--- a/packages/nodes-base/nodes/Netlify/NetlifyTrigger.node.ts
+++ b/packages/nodes-base/nodes/Netlify/NetlifyTrigger.node.ts
@@ -9,9 +9,8 @@ import type {
 	IWebhookResponseData,
 } from 'n8n-workflow';
 
-import { netlifyApiRequest } from './GenericFunctions';
-
 import { snakeCase } from 'change-case';
+import { netlifyApiRequest } from './GenericFunctions';
 
 export class NetlifyTrigger implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Netlify/netlify.svg b/packages/nodes-base/nodes/Netlify/netlify.svg
index 5fb327b9d1c8a..9848c69653adb 100644
--- a/packages/nodes-base/nodes/Netlify/netlify.svg
+++ b/packages/nodes-base/nodes/Netlify/netlify.svg
@@ -1,9 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40">
-  <defs>
-    <radialGradient id="a" cy="0%" r="100.11%" fx="50%" fy="0%" gradientTransform="matrix(0 .9989 -1.152 0 .5 -.5)">
-      <stop offset="0%" stop-color="#20C6B7"/>
-      <stop offset="100%" stop-color="#4D9ABF"/>
-    </radialGradient>
-  </defs>
-  <path fill="url(#a)" d="M28.589 14.135l-.014-.006c-.008-.003-.016-.006-.023-.013a.11.11 0 0 1-.028-.093l.773-4.726 3.625 3.626-3.77 1.604a.083.083 0 0 1-.033.006h-.015c-.005-.003-.01-.007-.02-.017a1.716 1.716 0 0 0-.495-.381zm5.258-.288l3.876 3.876c.805.806 1.208 1.208 1.355 1.674.022.069.04.138.054.209l-9.263-3.923a.728.728 0 0 0-.015-.006c-.037-.015-.08-.032-.08-.07 0-.038.044-.056.081-.071l.012-.005 3.98-1.684zm5.127 7.003c-.2.376-.59.766-1.25 1.427l-4.37 4.369-5.652-1.177-.03-.006c-.05-.008-.103-.017-.103-.062a1.706 1.706 0 0 0-.655-1.193c-.023-.023-.017-.059-.01-.092 0-.005 0-.01.002-.014l1.063-6.526.004-.022c.006-.05.015-.108.06-.108a1.73 1.73 0 0 0 1.16-.665c.009-.01.015-.021.027-.027.032-.015.07 0 .103.014l9.65 4.082zm-6.625 6.801l-7.186 7.186 1.23-7.56.002-.01c.001-.01.003-.02.006-.029.01-.024.036-.034.061-.044l.012-.005a1.85 1.85 0 0 0 .695-.517c.024-.028.053-.055.09-.06a.09.09 0 0 1 .029 0l5.06 1.04zm-8.707 8.707l-.81.81-8.955-12.942a.424.424 0 0 0-.01-.014c-.014-.019-.029-.038-.026-.06.001-.016.011-.03.022-.042l.01-.013c.027-.04.05-.08.075-.123l.02-.035.003-.003c.014-.024.027-.047.051-.06.021-.01.05-.006.073-.001l9.921 2.046a.164.164 0 0 1 .076.033c.013.013.016.027.019.043a1.757 1.757 0 0 0 1.028 1.175c.028.014.016.045.003.078a.238.238 0 0 0-.015.045c-.125.76-1.197 7.298-1.485 9.063zm-1.692 1.691c-.597.591-.949.904-1.347 1.03a2 2 0 0 1-1.206 0c-.466-.148-.869-.55-1.674-1.356L8.73 28.73l2.349-3.643c.011-.018.022-.034.04-.047.025-.018.061-.01.091 0a2.434 2.434 0 0 0 1.638-.083c.027-.01.054-.017.075.002a.19.19 0 0 1 .028.032L21.95 38.05zM7.863 27.863L5.8 25.8l4.074-1.738a.084.084 0 0 1 .033-.007c.034 0 .054.034.072.065a2.91 2.91 0 0 0 .13.184l.013.016c.012.017.004.034-.008.05l-2.25 3.493zm-2.976-2.976l-2.61-2.61c-.444-.444-.766-.766-.99-1.043l7.936 1.646a.84.84 0 0 0 .03.005c.049.008.103.017.103.063 0 .05-.059.073-.109.092l-.023.01-4.337 1.837zM.831 19.892a2 2 0 0 1 .09-.495c.148-.466.55-.868 1.356-1.674l3.34-3.34a2175.525 2175.525 0 0 0 4.626 6.687c.027.036.057.076.026.106-.146.161-.292.337-.395.528a.16.16 0 0 1-.05.062c-.013.008-.027.005-.042.002H9.78L.831 19.891zm5.68-6.403l4.491-4.491c.422.185 1.958.834 3.332 1.414 1.04.44 1.988.84 2.286.97.03.012.057.024.07.054.008.018.004.041 0 .06a2.003 2.003 0 0 0 .523 1.828c.03.03 0 .073-.026.11l-.014.021-4.56 7.063c-.012.02-.023.037-.043.05-.024.015-.058.008-.086.001a2.274 2.274 0 0 0-.543-.074c-.164 0-.342.03-.522.063h-.001c-.02.003-.038.007-.054-.005a.21.21 0 0 1-.045-.051l-4.808-7.013zm5.398-5.398l5.814-5.814c.805-.805 1.208-1.208 1.674-1.355a2 2 0 0 1 1.206 0c.466.147.869.55 1.674 1.355l1.26 1.26-4.135 6.404a.155.155 0 0 1-.041.048c-.025.017-.06.01-.09 0a2.097 2.097 0 0 0-1.92.37c-.027.028-.067.012-.101-.003-.54-.235-4.74-2.01-5.341-2.265zm12.506-3.676l3.818 3.818-.92 5.698v.015a.135.135 0 0 1-.008.038c-.01.02-.03.024-.05.03a1.83 1.83 0 0 0-.548.273.154.154 0 0 0-.02.017c-.011.012-.022.023-.04.025a.114.114 0 0 1-.043-.007l-5.818-2.472-.011-.005c-.037-.015-.081-.033-.081-.071a2.198 2.198 0 0 0-.31-.915c-.028-.046-.059-.094-.035-.141l4.066-6.303zm-3.932 8.606l5.454 2.31c.03.014.063.027.076.058a.106.106 0 0 1 0 .057c-.016.08-.03.171-.03.263v.153c0 .038-.039.054-.075.069l-.011.004c-.864.369-12.13 5.173-12.147 5.173-.017 0-.035 0-.052-.017-.03-.03 0-.072.027-.11a.76.76 0 0 0 .014-.02l4.482-6.94.008-.012c.026-.042.056-.089.104-.089l.045.007c.102.014.192.027.283.027.68 0 1.31-.331 1.69-.897a.16.16 0 0 1 .034-.04c.027-.02.067-.01.098.004zm-6.246 9.185l12.28-5.237s.018 0 .035.017c.067.067.124.112.179.154l.027.017c.025.014.05.03.052.056 0 .01 0 .016-.002.025L25.756 23.7l-.004.026c-.007.05-.014.107-.061.107a1.729 1.729 0 0 0-1.373.847l-.005.008c-.014.023-.027.045-.05.057-.021.01-.048.006-.07.001l-9.793-2.02c-.01-.002-.152-.519-.163-.52z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="128" height="113" fill="none"><g clip-path="url(#a)"><path fill="#05BDBA" d="M34.593 94.05h-1.209l-6.033-6.032v-1.209l9.223-9.222h6.39l.852.852v6.39zm-7.242-68.234v-1.209l6.033-6.033h1.209l9.223 9.223v6.39l-.852.852h-6.39z"/><path fill="#014847" d="M80.46 74.605h-8.778l-.733-.733V53.326c0-3.656-1.436-6.489-5.844-6.588-2.269-.06-4.865 0-7.638.11l-.416.425v26.589l-.733.733H47.54l-.733-.733V38.764l.733-.733h19.753c7.677 0 13.898 6.22 13.898 13.898v21.943z"/><path fill="#05BDBA" d="M35.841 61.45H.733L0 60.715v-8.797l.733-.733h35.108l.733.733v8.797zm91.436 0H92.169l-.733-.734v-8.797l.733-.733h35.108l.733.733v8.797zM58.943 27.064V.734L59.676 0h8.797l.733.733v26.331l-.733.733h-8.797zm0 84.838v-26.33l.733-.734h8.797l.733.733v26.331l-.733.733h-8.797z"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h128v112.635H0z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/NextCloud/GenericFunctions.ts b/packages/nodes-base/nodes/NextCloud/GenericFunctions.ts
index e1ba3be8f8d7e..882df0d6581ac 100644
--- a/packages/nodes-base/nodes/NextCloud/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/NextCloud/GenericFunctions.ts
@@ -1,6 +1,11 @@
-import type { IExecuteFunctions, IHookFunctions } from 'n8n-workflow';
-
-import type { OptionsWithUri } from 'request';
+import {
+	NodeOperationError,
+	type IExecuteFunctions,
+	type IHookFunctions,
+	type IHttpRequestMethods,
+	type IRequestOptions,
+	type IDataObject,
+} from 'n8n-workflow';
 
 /**
  * Make an API request to NextCloud
@@ -8,12 +13,12 @@ import type { OptionsWithUri } from 'request';
  */
 export async function nextCloudApiRequest(
 	this: IHookFunctions | IExecuteFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: object | string | Buffer,
-	headers?: object,
+	headers?: IDataObject,
 	encoding?: null | undefined,
-	query?: object,
+	query?: IDataObject,
 ) {
 	const resource = this.getNodeParameter('resource', 0);
 	const operation = this.getNodeParameter('operation', 0);
@@ -27,7 +32,7 @@ export async function nextCloudApiRequest(
 		credentials = (await this.getCredentials('nextCloudOAuth2Api')) as { webDavUrl: string };
 	}
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers,
 		method,
 		body,
@@ -52,5 +57,18 @@ export async function nextCloudApiRequest(
 
 	const credentialType =
 		authenticationMethod === 'accessToken' ? 'nextCloudApi' : 'nextCloudOAuth2Api';
-	return this.helpers.requestWithAuthentication.call(this, credentialType, options);
+
+	const response = await this.helpers.requestWithAuthentication.call(this, credentialType, options);
+
+	if (typeof response === 'string' && response.includes('<b>Fatal error</b>')) {
+		throw new NodeOperationError(
+			this.getNode(),
+			"NextCloud responded with a 'Fatal error', check description for more details",
+			{
+				description: `Server response:\n${response}`,
+			},
+		);
+	}
+
+	return response;
 }
diff --git a/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts b/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts
index 09be2137e64a1..83df6b9795da9 100644
--- a/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts
+++ b/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts
@@ -1,7 +1,9 @@
+import { URLSearchParams } from 'url';
 import type {
 	IBinaryKeyData,
 	IDataObject,
 	IExecuteFunctions,
+	IHttpRequestMethods,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
@@ -9,10 +11,9 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
-import { URLSearchParams } from 'url';
-
 import { parseString } from 'xml2js';
 
+import { wrapData } from '../../utils/utilities';
 import { nextCloudApiRequest } from './GenericFunctions';
 
 export class NextCloud implements INodeType {
@@ -350,7 +351,7 @@ export class NextCloud implements INodeType {
 					'The file path of the file to download. Has to contain the full path. The path should start with "/".',
 			},
 			{
-				displayName: 'Binary Property',
+				displayName: 'Put Output File in Field',
 				name: 'binaryPropertyName',
 				type: 'string',
 				default: 'data',
@@ -361,7 +362,7 @@ export class NextCloud implements INodeType {
 						resource: ['file'],
 					},
 				},
-				description: 'Name of the binary property to which to write the data of the read file',
+				hint: 'The name of the output binary field to put the file in',
 			},
 
 			// ----------------------------------
@@ -384,7 +385,7 @@ export class NextCloud implements INodeType {
 					'The absolute file path of the file to upload. Has to contain the full path. The parent folder has to exist. Existing files get overwritten.',
 			},
 			{
-				displayName: 'Binary Data',
+				displayName: 'Binary File',
 				name: 'binaryDataUpload',
 				type: 'boolean',
 				default: false,
@@ -412,7 +413,7 @@ export class NextCloud implements INodeType {
 				description: 'The text content of the file to upload',
 			},
 			{
-				displayName: 'Binary Property',
+				displayName: 'Input Binary Field',
 				name: 'binaryPropertyName',
 				type: 'string',
 				default: 'data',
@@ -425,8 +426,7 @@ export class NextCloud implements INodeType {
 					},
 				},
 				placeholder: '',
-				description:
-					'Name of the binary property which contains the data for the file to be uploaded',
+				hint: 'The name of the input binary field containing the file to be uploaded',
 			},
 
 			// ----------------------------------
@@ -860,7 +860,7 @@ export class NextCloud implements INodeType {
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const items = this.getInputData().slice();
-		const returnData: IDataObject[] = [];
+		const returnData: INodeExecutionData[] = [];
 
 		const authenticationMethod = this.getNodeParameter('authentication', 0);
 		let credentials;
@@ -875,7 +875,7 @@ export class NextCloud implements INodeType {
 		const operation = this.getNodeParameter('operation', 0);
 
 		let endpoint = '';
-		let requestMethod = '';
+		let requestMethod: IHttpRequestMethods = 'GET';
 		let responseData: any;
 
 		let body: string | Buffer | IDataObject = '';
@@ -915,14 +915,14 @@ export class NextCloud implements INodeType {
 						//         create
 						// ----------------------------------
 
-						requestMethod = 'MKCOL';
+						requestMethod = 'MKCOL' as IHttpRequestMethods;
 						endpoint = this.getNodeParameter('path', i) as string;
 					} else if (operation === 'list') {
 						// ----------------------------------
 						//         list
 						// ----------------------------------
 
-						requestMethod = 'PROPFIND';
+						requestMethod = 'PROPFIND' as IHttpRequestMethods;
 						endpoint = this.getNodeParameter('path', i) as string;
 					}
 				}
@@ -933,7 +933,7 @@ export class NextCloud implements INodeType {
 						//         copy
 						// ----------------------------------
 
-						requestMethod = 'COPY';
+						requestMethod = 'COPY' as IHttpRequestMethods;
 						endpoint = this.getNodeParameter('path', i) as string;
 						const toPath = this.getNodeParameter('toPath', i) as string;
 						headers.Destination = `${credentials.webDavUrl}/${encodeURI(toPath)}`;
@@ -949,7 +949,7 @@ export class NextCloud implements INodeType {
 						//         move
 						// ----------------------------------
 
-						requestMethod = 'MOVE';
+						requestMethod = 'MOVE' as IHttpRequestMethods;
 						endpoint = this.getNodeParameter('path', i) as string;
 						const toPath = this.getNodeParameter('toPath', i) as string;
 						headers.Destination = `${credentials.webDavUrl}/${encodeURI(toPath)}`;
@@ -1103,7 +1103,7 @@ export class NextCloud implements INodeType {
 						if (resource === 'file' && operation === 'download') {
 							items[i].json = { error: error.message };
 						} else {
-							returnData.push({ error: error.message });
+							returnData.push({ json: { error: error.message }, pairedItem: { item: i } });
 						}
 						continue;
 					}
@@ -1114,6 +1114,7 @@ export class NextCloud implements INodeType {
 				if (resource === 'file' && operation === 'download') {
 					const newItem: INodeExecutionData = {
 						json: items[i].json,
+						pairedItem: { item: i },
 						binary: {},
 					};
 
@@ -1153,7 +1154,12 @@ export class NextCloud implements INodeType {
 						});
 					});
 
-					returnData.push(jsonResponseData);
+					const executionData = this.helpers.constructExecutionMetaData(
+						wrapData(jsonResponseData),
+						{ itemData: { item: i } },
+					);
+
+					returnData.push(...executionData);
 				} else if (resource === 'user') {
 					if (operation !== 'getAll') {
 						// eslint-disable-next-line @typescript-eslint/no-loop-func
@@ -1180,7 +1186,12 @@ export class NextCloud implements INodeType {
 							});
 						});
 
-						returnData.push(jsonResponseData);
+						const executionData = this.helpers.constructExecutionMetaData(
+							wrapData(jsonResponseData),
+							{ itemData: { item: i } },
+						);
+
+						returnData.push(...executionData);
 					} else {
 						// eslint-disable-next-line @typescript-eslint/no-loop-func
 						const jsonResponseData: IDataObject[] = await new Promise((resolve, reject) => {
@@ -1204,7 +1215,7 @@ export class NextCloud implements INodeType {
 						});
 
 						jsonResponseData.forEach((value) => {
-							returnData.push({ id: value } as IDataObject);
+							returnData.push({ json: { id: value }, pairedItem: { item: i } });
 						});
 					}
 				} else if (resource === 'folder' && operation === 'list') {
@@ -1265,19 +1276,23 @@ export class NextCloud implements INodeType {
 								// @ts-ignore
 								newItem.eTag = props['d:getetag'].slice(1, -1);
 
-								returnData.push(newItem);
+								returnData.push({ json: newItem, pairedItem: { item: i } });
 							}
 						}
 					}
 				} else {
-					returnData.push(responseData as IDataObject);
+					const executionData = this.helpers.constructExecutionMetaData(wrapData(responseData), {
+						itemData: { item: i },
+					});
+
+					returnData.push(...executionData);
 				}
 			} catch (error) {
 				if (this.continueOnFail()) {
 					if (resource === 'file' && operation === 'download') {
 						items[i].json = { error: error.message };
 					} else {
-						returnData.push({ error: error.message });
+						returnData.push({ json: { error: error.message }, pairedItem: { item: i } });
 					}
 					continue;
 				}
@@ -1287,10 +1302,10 @@ export class NextCloud implements INodeType {
 
 		if (resource === 'file' && operation === 'download') {
 			// For file downloads the files get attached to the existing items
-			return this.prepareOutputData(items);
+			return [items];
 		} else {
 			// For all other ones does the output get replaced
-			return [this.helpers.returnJsonArray(returnData)];
+			return [returnData];
 		}
 	}
 }
diff --git a/packages/nodes-base/nodes/NextCloud/nextcloud.svg b/packages/nodes-base/nodes/NextCloud/nextcloud.svg
index 716c7b0ef9802..82a9410c6367e 100644
--- a/packages/nodes-base/nodes/NextCloud/nextcloud.svg
+++ b/packages/nodes-base/nodes/NextCloud/nextcloud.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 76 51" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#A" x=".5" y=".5"/><symbol id="A" overflow="visible"><path d="M37.533 0c-7.77 0-14.355 5.268-16.396 12.379-1.778-3.819-5.597-6.453-10.075-6.453C5.004 5.926 0 10.931 0 17.054a11.16 11.16 0 0 0 11.128 11.128c4.412 0 8.297-2.634 10.075-6.453a16.99 16.99 0 0 0 16.33 12.379c7.704 0 14.289-5.202 16.396-12.248 1.778 3.687 5.597 6.256 9.943 6.256A11.16 11.16 0 0 0 75 16.989c0-6.124-5.004-11.062-11.128-11.062-4.346 0-8.165 2.568-9.943 6.256C51.822 5.202 45.303 0 37.533 0zm0 6.519a10.48 10.48 0 0 1 10.535 10.536A10.48 10.48 0 0 1 37.533 27.59a10.48 10.48 0 0 1-10.536-10.535A10.48 10.48 0 0 1 37.533 6.519zm-26.405 5.926a4.58 4.58 0 0 1 4.609 4.609 4.58 4.58 0 0 1-4.609 4.609 4.58 4.58 0 0 1-4.609-4.609 4.58 4.58 0 0 1 4.609-4.609zm52.744 0a4.58 4.58 0 0 1 4.609 4.609 4.609 4.609 0 1 1-9.218 0c.066-2.568 2.041-4.609 4.609-4.609zM19.176 41.957c1.827 0 2.85 1.301 2.85 3.252 0 .186-.155.341-.341.341H16.76c.031 1.734 1.239 2.726 2.633 2.726a2.89 2.89 0 0 0 1.796-.619c.186-.124.341-.093.434.093l.093.155c.093.155.062.31-.093.434a3.84 3.84 0 0 1-2.261.743c-2.013 0-3.562-1.456-3.562-3.562.031-2.23 1.518-3.562 3.376-3.562zm1.889 2.911c-.062-1.425-.929-2.137-1.92-2.137-1.146 0-2.137.743-2.354 2.137h4.274zm10.253-1.92v-.774-1.611c0-.217.124-.341.341-.341h.248c.217 0 .31.124.31.341v1.611h1.394c.217 0 .341.124.341.341v.093c0 .217-.124.31-.341.31h-1.394v3.407c0 1.58.96 1.766 1.487 1.796.279.031.372.093.372.341v.186c0 .217-.093.31-.372.31-1.487 0-2.385-.898-2.385-2.509v-3.5zm7.093-.991c1.177 0 1.92.496 2.261.774.155.124.186.279.031.465l-.093.155c-.124.186-.279.186-.465.062-.31-.217-.898-.619-1.703-.619-1.487 0-2.664 1.115-2.664 2.757 0 1.611 1.177 2.726 2.664 2.726.96 0 1.611-.434 1.92-.712.186-.124.31-.093.434.093l.093.124c.093.186.062.31-.093.465a3.81 3.81 0 0 1-2.416.867c-2.013 0-3.562-1.456-3.562-3.562.031-2.106 1.58-3.593 3.593-3.593zm4.119-2.199c0-.217-.124-.341.093-.341h.248c.217 0 .558.124.558.341v7.403c0 .867.403.96.712.991.155 0 .279.093.279.31v.217c0 .217-.093.341-.341.341-.557 0-1.549-.186-1.549-1.673v-7.589zm6.35 2.199c1.982 0 3.593 1.518 3.593 3.531 0 2.044-1.611 3.593-3.593 3.593s-3.593-1.549-3.593-3.593c0-2.013 1.611-3.531 3.593-3.531zm0 6.319c1.456 0 2.633-1.177 2.633-2.788 0-1.549-1.177-2.695-2.633-2.695a2.67 2.67 0 0 0-2.664 2.695c.031 1.58 1.208 2.788 2.664 2.788zm15.456-6.319a2.45 2.45 0 0 1 2.23 1.363h.031s-.031-.217-.031-.526v-3.066c0-.217-.093-.341.124-.341h.248c.217 0 .558.124.558.341v8.827c0 .217-.093.341-.31.341h-.217c-.217 0-.341-.093-.341-.31v-.527c0-.248.062-.434.062-.434h-.031s-.589 1.425-2.354 1.425c-1.827 0-2.973-1.456-2.973-3.562-.062-2.106 1.208-3.531 3.004-3.531h0zm.031 6.319c1.146 0 2.199-.805 2.199-2.757 0-1.394-.712-2.726-2.168-2.726-1.208 0-2.199.991-2.199 2.726.031 1.673.898 2.757 2.168 2.757zm-56.558.65h.248c.217 0 .341-.124.341-.341v-6.628c0-1.053 1.146-1.796 2.447-1.796s2.447.743 2.447 1.796v6.659c0 .217.124.341.341.341h.248c.217 0 .31-.124.31-.341v-6.721c0-1.766-1.765-2.633-3.376-2.633h0 0 0 0c-1.549 0-3.314.867-3.314 2.633v6.69c0 .217.093.341.31.341zm51.695-6.814h-.248c-.217 0-.341.124-.341.341v3.748c0 1.053-.681 2.013-2.013 2.013-1.301 0-2.013-.96-2.013-2.013v-3.748c0-.217-.124-.341-.341-.341H54.3c-.217 0-.31.124-.31.341v3.996c0 1.765 1.301 2.633 2.912 2.633h0 0 0 0c1.611 0 2.911-.867 2.911-2.633v-3.996c.031-.217-.093-.341-.31-.341h0zm-30.664-.031c-.062 0-.155.062-.217.155l-1.239 1.487-.929 1.115-1.425-1.704-.774-.929c-.062-.093-.155-.124-.217-.124s-.155.031-.248.093l-.186.155c-.155.124-.155.279-.031.465l1.239 1.487 1.053 1.239-1.518 1.827h0l-.774.929c-.124.155-.124.341.031.496l.186.155c.155.124.31.093.465-.062l1.239-1.487.929-1.115 1.425 1.704h0l.774.929c.124.155.31.186.465.031l.186-.155c.155-.124.155-.279.031-.465l-1.239-1.487-1.053-1.239 1.518-1.827h0l.774-.929c.124-.155.124-.341-.031-.495l-.186-.186c-.093-.062-.155-.093-.248-.062h0z" fill="#0082c9" fill-rule="nonzero" stroke="none"/></symbol></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round" viewBox="0 0 76 51"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><path fill="#0082c9" fill-rule="nonzero" stroke="none" d="M37.533 0c-7.77 0-14.355 5.268-16.396 12.379-1.778-3.819-5.597-6.453-10.075-6.453C5.004 5.926 0 10.931 0 17.054a11.16 11.16 0 0 0 11.128 11.128c4.412 0 8.297-2.634 10.075-6.453a16.99 16.99 0 0 0 16.33 12.379c7.704 0 14.289-5.202 16.396-12.248 1.778 3.687 5.597 6.256 9.943 6.256A11.16 11.16 0 0 0 75 16.989c0-6.124-5.004-11.062-11.128-11.062-4.346 0-8.165 2.568-9.943 6.256C51.822 5.202 45.303 0 37.533 0m0 6.519a10.48 10.48 0 0 1 10.535 10.536A10.48 10.48 0 0 1 37.533 27.59a10.48 10.48 0 0 1-10.536-10.535A10.48 10.48 0 0 1 37.533 6.519m-26.405 5.926a4.58 4.58 0 0 1 4.609 4.609 4.58 4.58 0 0 1-4.609 4.609 4.58 4.58 0 0 1-4.609-4.609 4.58 4.58 0 0 1 4.609-4.609m52.744 0a4.58 4.58 0 0 1 4.609 4.609 4.609 4.609 0 1 1-9.218 0c.066-2.568 2.041-4.609 4.609-4.609M19.176 41.957c1.827 0 2.85 1.301 2.85 3.252a.344.344 0 0 1-.341.341H16.76c.031 1.734 1.239 2.726 2.633 2.726a2.9 2.9 0 0 0 1.796-.619c.186-.124.341-.093.434.093l.093.155c.093.155.062.31-.093.434a3.84 3.84 0 0 1-2.261.743c-2.013 0-3.562-1.456-3.562-3.562.031-2.23 1.518-3.562 3.376-3.562zm1.889 2.911c-.062-1.425-.929-2.137-1.92-2.137-1.146 0-2.137.743-2.354 2.137zm10.253-1.92v-2.385c0-.217.124-.341.341-.341h.248c.217 0 .31.124.31.341v1.611h1.394c.217 0 .341.124.341.341v.093c0 .217-.124.31-.341.31h-1.394v3.407c0 1.58.96 1.766 1.487 1.796.279.031.372.093.372.341v.186c0 .217-.093.31-.372.31-1.487 0-2.385-.898-2.385-2.509v-3.5zm7.093-.991c1.177 0 1.92.496 2.261.774.155.124.186.279.031.465l-.093.155c-.124.186-.279.186-.465.062-.31-.217-.898-.619-1.703-.619-1.487 0-2.664 1.115-2.664 2.757 0 1.611 1.177 2.726 2.664 2.726.96 0 1.611-.434 1.92-.712.186-.124.31-.093.434.093l.093.124c.093.186.062.31-.093.465a3.8 3.8 0 0 1-2.416.867c-2.013 0-3.562-1.456-3.562-3.562.031-2.106 1.58-3.593 3.593-3.593zm4.119-2.199c0-.217-.124-.341.093-.341h.248c.217 0 .558.124.558.341v7.403c0 .867.403.96.712.991.155 0 .279.093.279.31v.217c0 .217-.093.341-.341.341-.557 0-1.549-.186-1.549-1.673zm6.35 2.199c1.982 0 3.593 1.518 3.593 3.531 0 2.044-1.611 3.593-3.593 3.593s-3.593-1.549-3.593-3.593c0-2.013 1.611-3.531 3.593-3.531m0 6.319c1.456 0 2.633-1.177 2.633-2.788 0-1.549-1.177-2.695-2.633-2.695a2.67 2.67 0 0 0-2.664 2.695c.031 1.58 1.208 2.788 2.664 2.788m15.456-6.319a2.45 2.45 0 0 1 2.23 1.363h.031s-.031-.217-.031-.526v-3.066c0-.217-.093-.341.124-.341h.248c.217 0 .558.124.558.341v8.827c0 .217-.093.341-.31.341h-.217c-.217 0-.341-.093-.341-.31v-.527c0-.248.062-.434.062-.434h-.031s-.589 1.425-2.354 1.425c-1.827 0-2.973-1.456-2.973-3.562-.062-2.106 1.208-3.531 3.004-3.531m.031 6.319c1.146 0 2.199-.805 2.199-2.757 0-1.394-.712-2.726-2.168-2.726-1.208 0-2.199.991-2.199 2.726.031 1.673.898 2.757 2.168 2.757m-56.558.65h.248c.217 0 .341-.124.341-.341v-6.628c0-1.053 1.146-1.796 2.447-1.796s2.447.743 2.447 1.796v6.659c0 .217.124.341.341.341h.248c.217 0 .31-.124.31-.341v-6.721c0-1.766-1.765-2.633-3.376-2.633-1.549 0-3.314.867-3.314 2.633v6.69c0 .217.093.341.31.341zm51.695-6.814h-.248c-.217 0-.341.124-.341.341v3.748c0 1.053-.681 2.013-2.013 2.013-1.301 0-2.013-.96-2.013-2.013v-3.748c0-.217-.124-.341-.341-.341H54.3c-.217 0-.31.124-.31.341v3.996c0 1.765 1.301 2.633 2.912 2.633s2.911-.867 2.911-2.633v-3.996c.031-.217-.093-.341-.31-.341zm-30.664-.031c-.062 0-.155.062-.217.155l-1.239 1.487-.929 1.115-1.425-1.704-.774-.929c-.062-.093-.155-.124-.217-.124s-.155.031-.248.093l-.186.155c-.155.124-.155.279-.031.465l1.239 1.487 1.053 1.239-1.518 1.827-.774.929c-.124.155-.124.341.031.496l.186.155c.155.124.31.093.465-.062l1.239-1.487.929-1.115 1.425 1.704.774.929c.124.155.31.186.465.031l.186-.155c.155-.124.155-.279.031-.465l-1.239-1.487-1.053-1.239 1.518-1.827.774-.929c.124-.155.124-.341-.031-.495l-.186-.186c-.093-.062-.155-.093-.248-.062z"/></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/NoOp/NoOp.node.ts b/packages/nodes-base/nodes/NoOp/NoOp.node.ts
index 8a8321ae18302..f6de989c1ffb5 100644
--- a/packages/nodes-base/nodes/NoOp/NoOp.node.ts
+++ b/packages/nodes-base/nodes/NoOp/NoOp.node.ts
@@ -25,6 +25,6 @@ export class NoOp implements INodeType {
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const items = this.getInputData();
 
-		return this.prepareOutputData(items);
+		return [items];
 	}
 }
diff --git a/packages/nodes-base/nodes/NocoDB/GenericFunctions.ts b/packages/nodes-base/nodes/NocoDB/GenericFunctions.ts
index 2bc682124461a..87afe701fb15e 100644
--- a/packages/nodes-base/nodes/NocoDB/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/NocoDB/GenericFunctions.ts
@@ -1,13 +1,14 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IBinaryKeyData,
 	IDataObject,
 	IExecuteFunctions,
 	IHookFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
+	IPairedItemData,
 	IPollFunctions,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { jsonParse, NodeOperationError } from 'n8n-workflow';
 
@@ -16,6 +17,7 @@ interface IAttachment {
 	title: string;
 	mimetype: string;
 	size: number;
+	signedUrl?: string;
 }
 
 /**
@@ -24,7 +26,7 @@ interface IAttachment {
  */
 export async function apiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: object,
 	query?: IDataObject,
@@ -42,12 +44,15 @@ export async function apiRequest(
 
 	query = query || {};
 
-	const options: OptionsWithUri = {
+	if (!uri) {
+		uri = baseUrl.endsWith('/') ? `${baseUrl.slice(0, -1)}${endpoint}` : `${baseUrl}${endpoint}`;
+	}
+
+	const options: IRequestOptions = {
 		method,
 		body,
 		qs: query,
-		uri:
-			uri || baseUrl.endsWith('/') ? `${baseUrl.slice(0, -1)}${endpoint}` : `${baseUrl}${endpoint}`,
+		uri,
 		json: true,
 	};
 
@@ -59,7 +64,7 @@ export async function apiRequest(
 		delete options.body;
 	}
 
-	return this.helpers.requestWithAuthentication.call(this, authenticationMethod, options);
+	return await this.helpers.requestWithAuthentication.call(this, authenticationMethod, options);
 }
 
 /**
@@ -70,7 +75,7 @@ export async function apiRequest(
  */
 export async function apiRequestAllItems(
 	this: IHookFunctions | IExecuteFunctions | IPollFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject,
 	query?: IDataObject,
@@ -102,18 +107,25 @@ export async function downloadRecordAttachments(
 	this: IExecuteFunctions | IPollFunctions,
 	records: IDataObject[],
 	fieldNames: string[],
+	pairedItem?: IPairedItemData[],
 ): Promise<INodeExecutionData[]> {
 	const elements: INodeExecutionData[] = [];
 
 	for (const record of records) {
 		const element: INodeExecutionData = { json: {}, binary: {} };
+		if (pairedItem) {
+			element.pairedItem = pairedItem;
+		}
 		element.json = record as unknown as IDataObject;
 		for (const fieldName of fieldNames) {
+			let attachments = record[fieldName] as IAttachment[];
+			if (typeof attachments === 'string') {
+				attachments = jsonParse<IAttachment[]>(record[fieldName] as string);
+			}
 			if (record[fieldName]) {
-				for (const [index, attachment] of jsonParse<IAttachment[]>(
-					record[fieldName] as string,
-				).entries()) {
-					const file: Buffer = await apiRequest.call(this, 'GET', '', {}, {}, attachment.url, {
+				for (const [index, attachment] of attachments.entries()) {
+					const attachmentUrl = attachment.signedUrl || attachment.url;
+					const file: Buffer = await apiRequest.call(this, 'GET', '', {}, {}, attachmentUrl, {
 						json: false,
 						encoding: null,
 					});
diff --git a/packages/nodes-base/nodes/NocoDB/NocoDB.node.ts b/packages/nodes-base/nodes/NocoDB/NocoDB.node.ts
index 85dca048335da..bfe3f4c090e6e 100644
--- a/packages/nodes-base/nodes/NocoDB/NocoDB.node.ts
+++ b/packages/nodes-base/nodes/NocoDB/NocoDB.node.ts
@@ -2,6 +2,7 @@
 import type {
 	IDataObject,
 	IExecuteFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
 	INodeType,
@@ -20,7 +21,7 @@ export class NocoDB implements INodeType {
 		name: 'nocoDb',
 		icon: 'file:nocodb.svg',
 		group: ['input'],
-		version: [1, 2],
+		version: [1, 2, 3],
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
 		description: 'Read, update, write and delete data from NocoDB',
 		defaults: {
@@ -54,14 +55,14 @@ export class NocoDB implements INodeType {
 				name: 'authentication',
 				type: 'options',
 				options: [
-					{
-						name: 'User Token',
-						value: 'nocoDb',
-					},
 					{
 						name: 'API Token',
 						value: 'nocoDbApiToken',
 					},
+					{
+						name: 'User Token',
+						value: 'nocoDb',
+					},
 				],
 				default: 'nocoDb',
 			},
@@ -69,11 +70,6 @@ export class NocoDB implements INodeType {
 				displayName: 'API Version',
 				name: 'version',
 				type: 'options',
-				displayOptions: {
-					show: {
-						'@version': [1],
-					},
-				},
 				isNodeSetting: true,
 				options: [
 					{
@@ -84,18 +80,48 @@ export class NocoDB implements INodeType {
 						name: 'v0.90.0 Onwards',
 						value: 2,
 					},
+					{
+						name: 'v0.200.0 Onwards',
+						value: 3,
+					},
 				],
+				displayOptions: {
+					show: {
+						'@version': [1],
+					},
+				},
 				default: 1,
 			},
 			{
 				displayName: 'API Version',
 				name: 'version',
 				type: 'options',
+				isNodeSetting: true,
+				options: [
+					{
+						name: 'Before v0.90.0',
+						value: 1,
+					},
+					{
+						name: 'v0.90.0 Onwards',
+						value: 2,
+					},
+					{
+						name: 'v0.200.0 Onwards',
+						value: 3,
+					},
+				],
 				displayOptions: {
 					show: {
 						'@version': [2],
 					},
 				},
+				default: 2,
+			},
+			{
+				displayName: 'API Version',
+				name: 'version',
+				type: 'options',
 				isNodeSetting: true,
 				options: [
 					{
@@ -106,8 +132,17 @@ export class NocoDB implements INodeType {
 						name: 'v0.90.0 Onwards',
 						value: 2,
 					},
+					{
+						name: 'v0.200.0 Onwards',
+						value: 3,
+					},
 				],
-				default: 2,
+				displayOptions: {
+					show: {
+						'@version': [3],
+					},
+				},
+				default: 3,
 			},
 			{
 				displayName: 'Resource',
@@ -172,26 +207,51 @@ export class NocoDB implements INodeType {
 
 	methods = {
 		loadOptions: {
-			async getProjects(this: ILoadOptionsFunctions) {
+			async getWorkspaces(this: ILoadOptionsFunctions) {
 				try {
 					const requestMethod = 'GET';
-					const endpoint = '/api/v1/db/meta/projects/';
+					const endpoint = '/api/v1/workspaces/';
 					const responseData = await apiRequest.call(this, requestMethod, endpoint, {}, {});
 					return responseData.list.map((i: IDataObject) => ({ name: i.title, value: i.id }));
+				} catch (e) {
+					return [{ name: 'No Workspace', value: 'none' }];
+				}
+			},
+			async getBases(this: ILoadOptionsFunctions) {
+				const version = this.getNodeParameter('version', 0) as number;
+				const workspaceId = this.getNodeParameter('workspaceId', 0) as string;
+				try {
+					if (workspaceId && workspaceId !== 'none') {
+						const requestMethod = 'GET';
+						const endpoint = `/api/v1/workspaces/${workspaceId}/bases/`;
+						const responseData = await apiRequest.call(this, requestMethod, endpoint, {}, {});
+						return responseData.list.map((i: IDataObject) => ({ name: i.title, value: i.id }));
+					} else {
+						const requestMethod = 'GET';
+						const endpoint = version === 3 ? '/api/v2/meta/bases/' : '/api/v1/db/meta/projects/';
+						const responseData = await apiRequest.call(this, requestMethod, endpoint, {}, {});
+						return responseData.list.map((i: IDataObject) => ({ name: i.title, value: i.id }));
+					}
 				} catch (e) {
 					throw new NodeOperationError(
 						this.getNode(),
-						new Error('Error while fetching projects!', { cause: e }),
+						new Error(`Error while fetching ${version === 3 ? 'bases' : 'projects'}!`, {
+							cause: e,
+						}),
 					);
 				}
 			},
-			// This only supports using the Project ID
+			// This only supports using the Base ID
 			async getTables(this: ILoadOptionsFunctions) {
-				const projectId = this.getNodeParameter('projectId', 0) as string;
-				if (projectId) {
+				const version = this.getNodeParameter('version', 0) as number;
+				const baseId = this.getNodeParameter('projectId', 0) as string;
+				if (baseId) {
 					try {
 						const requestMethod = 'GET';
-						const endpoint = `/api/v1/db/meta/projects/${projectId}/tables`;
+						const endpoint =
+							version === 3
+								? `/api/v2/meta/bases/${baseId}/tables`
+								: `/api/v1/db/meta/projects/${baseId}/tables`;
 						const responseData = await apiRequest.call(this, requestMethod, endpoint, {}, {});
 						return responseData.list.map((i: IDataObject) => ({ name: i.title, value: i.id }));
 					} catch (e) {
@@ -201,7 +261,10 @@ export class NocoDB implements INodeType {
 						);
 					}
 				} else {
-					throw new NodeOperationError(this.getNode(), 'No project selected!');
+					throw new NodeOperationError(
+						this.getNode(),
+						`No  ${version === 3 ? 'base' : 'project'} selected!`,
+					);
 				}
 			},
 		},
@@ -217,13 +280,13 @@ export class NocoDB implements INodeType {
 		const operation = this.getNodeParameter('operation', 0);
 
 		let returnAll = false;
-		let requestMethod = '';
+		let requestMethod: IHttpRequestMethods = 'GET';
 
 		let qs: IDataObject = {};
 
 		let endPoint = '';
 
-		const projectId = this.getNodeParameter('projectId', 0) as string;
+		const baseId = this.getNodeParameter('projectId', 0) as string;
 		const table = this.getNodeParameter('table', 0) as string;
 
 		if (resource === 'row') {
@@ -231,9 +294,11 @@ export class NocoDB implements INodeType {
 				requestMethod = 'POST';
 
 				if (version === 1) {
-					endPoint = `/nc/${projectId}/api/v1/${table}/bulk`;
+					endPoint = `/nc/${baseId}/api/v1/${table}/bulk`;
 				} else if (version === 2) {
-					endPoint = `/api/v1/db/data/bulk/noco/${projectId}/${table}`;
+					endPoint = `/api/v1/db/data/bulk/noco/${baseId}/${table}`;
+				} else if (version === 3) {
+					endPoint = `/api/v2/tables/${table}/records`;
 				}
 
 				const body: IDataObject[] = [];
@@ -278,7 +343,7 @@ export class NocoDB implements INodeType {
 									},
 									json: JSON.stringify({
 										api: 'xcAttachmentUpload',
-										project_id: projectId,
+										project_id: baseId,
 										dbAlias: 'db',
 										args: {},
 									}),
@@ -289,6 +354,8 @@ export class NocoDB implements INodeType {
 									postUrl = '/dashboard';
 								} else if (version === 2) {
 									postUrl = '/api/v1/db/storage/upload';
+								} else if (version === 3) {
+									postUrl = '/api/v2/storage/upload';
 								}
 
 								responseData = await apiRequest.call(
@@ -296,13 +363,15 @@ export class NocoDB implements INodeType {
 									'POST',
 									postUrl,
 									{},
-									{ project_id: projectId },
+									version === 3 ? { base_id: baseId } : { project_id: baseId },
 									undefined,
 									{
 										formData,
 									},
 								);
-								newItem[field.fieldName] = JSON.stringify([responseData]);
+								newItem[field.fieldName] = JSON.stringify(
+									Array.isArray(responseData) ? responseData : [responseData],
+								);
 							}
 						}
 					}
@@ -311,13 +380,21 @@ export class NocoDB implements INodeType {
 				try {
 					responseData = await apiRequest.call(this, requestMethod, endPoint, body, qs);
 
-					// Calculate ID manually and add to return data
-					let id = responseData[0];
-					for (let i = body.length - 1; i >= 0; i--) {
-						body[i].id = id--;
-					}
+					if (version === 3) {
+						for (let i = body.length - 1; i >= 0; i--) {
+							body[i] = { ...body[i], ...responseData[i] };
+						}
+
+						returnData.push(...body);
+					} else {
+						// Calculate ID manually and add to return data
+						let id = responseData[0];
+						for (let i = body.length - 1; i >= 0; i--) {
+							body[i].id = id--;
+						}
 
-					returnData.push(...body);
+						returnData.push(...body);
+					}
 				} catch (error) {
 					if (this.continueOnFail()) {
 						returnData.push({ error: error.toString() });
@@ -331,9 +408,16 @@ export class NocoDB implements INodeType {
 				let primaryKey = 'id';
 
 				if (version === 1) {
-					endPoint = `/nc/${projectId}/api/v1/${table}/bulk`;
+					endPoint = `/nc/${baseId}/api/v1/${table}/bulk`;
 				} else if (version === 2) {
-					endPoint = `/api/v1/db/data/bulk/noco/${projectId}/${table}`;
+					endPoint = `/api/v1/db/data/bulk/noco/${baseId}/${table}`;
+
+					primaryKey = this.getNodeParameter('primaryKey', 0) as string;
+					if (primaryKey === 'custom') {
+						primaryKey = this.getNodeParameter('customPrimaryKey', 0) as string;
+					}
+				} else if (version === 3) {
+					endPoint = `/api/v2/tables/${table}/records`;
 
 					primaryKey = this.getNodeParameter('primaryKey', 0) as string;
 					if (primaryKey === 'custom') {
@@ -349,13 +433,7 @@ export class NocoDB implements INodeType {
 				}
 
 				try {
-					responseData = (await apiRequest.call(
-						this,
-						requestMethod,
-						endPoint,
-						body,
-						qs,
-					)) as number[];
+					responseData = (await apiRequest.call(this, requestMethod, endPoint, body, qs)) as any[];
 					if (version === 1) {
 						returnData.push(...items.map((item) => item.json));
 					} else if (version === 2) {
@@ -377,6 +455,8 @@ export class NocoDB implements INodeType {
 								};
 							}),
 						);
+					} else if (version === 3) {
+						returnData.push(...responseData);
 					}
 				} catch (error) {
 					if (this.continueOnFail()) {
@@ -394,9 +474,11 @@ export class NocoDB implements INodeType {
 						requestMethod = 'GET';
 
 						if (version === 1) {
-							endPoint = `/nc/${projectId}/api/v1/${table}`;
+							endPoint = `/nc/${baseId}/api/v1/${table}`;
 						} else if (version === 2) {
-							endPoint = `/api/v1/db/data/noco/${projectId}/${table}`;
+							endPoint = `/api/v1/db/data/noco/${baseId}/${table}`;
+						} else if (version === 3) {
+							endPoint = `/api/v2/tables/${table}/records`;
 						}
 
 						returnAll = this.getNodeParameter('returnAll', 0);
@@ -421,7 +503,7 @@ export class NocoDB implements INodeType {
 						} else {
 							qs.limit = this.getNodeParameter('limit', 0);
 							responseData = await apiRequest.call(this, requestMethod, endPoint, {}, qs);
-							if (version === 2) {
+							if (version === 2 || version === 3) {
 								responseData = responseData.list;
 							}
 						}
@@ -440,6 +522,7 @@ export class NocoDB implements INodeType {
 								this,
 								responseData as IDataObject[],
 								downloadFieldNames,
+								[{ item: i }],
 							);
 							data.push(...response);
 						}
@@ -456,7 +539,7 @@ export class NocoDB implements INodeType {
 					}
 				}
 
-				return this.prepareOutputData(returnData as INodeExecutionData[]);
+				return [returnData as INodeExecutionData[]];
 			}
 
 			if (operation === 'get') {
@@ -468,9 +551,11 @@ export class NocoDB implements INodeType {
 						const id = this.getNodeParameter('id', i) as string;
 
 						if (version === 1) {
-							endPoint = `/nc/${projectId}/api/v1/${table}/${id}`;
+							endPoint = `/nc/${baseId}/api/v1/${table}/${id}`;
 						} else if (version === 2) {
-							endPoint = `/api/v1/db/data/noco/${projectId}/${table}/${id}`;
+							endPoint = `/api/v1/db/data/noco/${baseId}/${table}/${id}`;
+						} else if (version === 3) {
+							endPoint = `/api/v2/tables/${table}/records/${id}`;
 						}
 
 						responseData = await apiRequest.call(this, requestMethod, endPoint, {}, qs);
@@ -501,6 +586,7 @@ export class NocoDB implements INodeType {
 								this,
 								[responseData as IDataObject],
 								downloadFieldNames,
+								[{ item: i }],
 							);
 							const newItem = {
 								binary: data[0].binary,
@@ -534,7 +620,7 @@ export class NocoDB implements INodeType {
 						throw new NodeApiError(this.getNode(), error as JsonObject, { itemIndex: i });
 					}
 				}
-				return this.prepareOutputData(newItems);
+				return [newItems];
 			}
 
 			if (operation === 'update') {
@@ -542,22 +628,24 @@ export class NocoDB implements INodeType {
 				let primaryKey = 'id';
 
 				if (version === 1) {
-					endPoint = `/nc/${projectId}/api/v1/${table}/bulk`;
+					endPoint = `/nc/${baseId}/api/v1/${table}/bulk`;
 					requestMethod = 'PUT';
 				} else if (version === 2) {
-					endPoint = `/api/v1/db/data/bulk/noco/${projectId}/${table}`;
+					endPoint = `/api/v1/db/data/bulk/noco/${baseId}/${table}`;
 
 					primaryKey = this.getNodeParameter('primaryKey', 0) as string;
 					if (primaryKey === 'custom') {
 						primaryKey = this.getNodeParameter('customPrimaryKey', 0) as string;
 					}
+				} else if (version === 3) {
+					endPoint = `/api/v2/tables/${table}/records`;
 				}
 
 				const body: IDataObject[] = [];
 
 				for (let i = 0; i < items.length; i++) {
-					const id = this.getNodeParameter('id', i) as string;
-					const newItem: IDataObject = { [primaryKey]: id };
+					const id = version === 3 ? null : (this.getNodeParameter('id', i) as string);
+					const newItem: IDataObject = version === 3 ? {} : { [primaryKey]: id };
 					const dataToSend = this.getNodeParameter('dataToSend', i) as
 						| 'defineBelow'
 						| 'autoMapInputData';
@@ -596,7 +684,7 @@ export class NocoDB implements INodeType {
 									},
 									json: JSON.stringify({
 										api: 'xcAttachmentUpload',
-										project_id: projectId,
+										project_id: baseId,
 										dbAlias: 'db',
 										args: {},
 									}),
@@ -606,19 +694,24 @@ export class NocoDB implements INodeType {
 									postUrl = '/dashboard';
 								} else if (version === 2) {
 									postUrl = '/api/v1/db/storage/upload';
+								} else if (version === 3) {
+									postUrl = '/api/v2/storage/upload';
 								}
+
 								responseData = await apiRequest.call(
 									this,
 									'POST',
 									postUrl,
 									{},
-									{ project_id: projectId },
+									version === 3 ? { base_id: baseId } : { project_id: baseId },
 									undefined,
 									{
 										formData,
 									},
 								);
-								newItem[field.fieldName] = JSON.stringify([responseData]);
+								newItem[field.fieldName] = JSON.stringify(
+									Array.isArray(responseData) ? responseData : [responseData],
+								);
 							}
 						}
 					}
@@ -626,13 +719,7 @@ export class NocoDB implements INodeType {
 				}
 
 				try {
-					responseData = (await apiRequest.call(
-						this,
-						requestMethod,
-						endPoint,
-						body,
-						qs,
-					)) as number[];
+					responseData = (await apiRequest.call(this, requestMethod, endPoint, body, qs)) as any[];
 
 					if (version === 1) {
 						returnData.push(...body);
@@ -655,6 +742,12 @@ export class NocoDB implements INodeType {
 								};
 							}),
 						);
+					} else if (version === 3) {
+						for (let i = body.length - 1; i >= 0; i--) {
+							body[i] = { ...body[i], ...responseData[i] };
+						}
+
+						returnData.push(...body);
 					}
 				} catch (error) {
 					if (this.continueOnFail()) {
diff --git a/packages/nodes-base/nodes/NocoDB/OperationDescription.ts b/packages/nodes-base/nodes/NocoDB/OperationDescription.ts
index be2be114edc74..0d1b7ec7437d7 100644
--- a/packages/nodes-base/nodes/NocoDB/OperationDescription.ts
+++ b/packages/nodes-base/nodes/NocoDB/OperationDescription.ts
@@ -4,6 +4,40 @@ export const operationFields: INodeProperties[] = [
 	// ----------------------------------
 	//         Shared
 	// ----------------------------------
+	{
+		displayName: 'Workspace Name or ID',
+		name: 'workspaceId',
+		type: 'options',
+		default: 'none',
+		displayOptions: {
+			show: {
+				version: [3],
+			},
+		},
+		description:
+			'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
+		typeOptions: {
+			loadOptionsMethod: 'getWorkspaces',
+		},
+	},
+	{
+		displayName: 'Base Name or ID',
+		name: 'projectId',
+		type: 'options',
+		default: '',
+		displayOptions: {
+			show: {
+				version: [3],
+			},
+		},
+		required: true,
+		description:
+			'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
+		typeOptions: {
+			loadOptionsDependsOn: ['workspaceId'],
+			loadOptionsMethod: 'getBases',
+		},
+	},
 	{
 		displayName: 'Project ID',
 		name: 'projectId',
@@ -31,7 +65,7 @@ export const operationFields: INodeProperties[] = [
 		description:
 			'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
 		typeOptions: {
-			loadOptionsMethod: 'getProjects',
+			loadOptionsMethod: 'getBases',
 		},
 	},
 	{
@@ -41,7 +75,7 @@ export const operationFields: INodeProperties[] = [
 		default: '',
 		displayOptions: {
 			show: {
-				version: [2],
+				version: [2, 3],
 			},
 		},
 		required: true,
@@ -91,10 +125,42 @@ export const operationFields: INodeProperties[] = [
 		],
 		displayOptions: {
 			show: {
+				version: [1, 2],
 				operation: ['delete', 'update'],
 			},
 		},
 	},
+	{
+		displayName: 'Primary Key Type',
+		name: 'primaryKey',
+		type: 'options',
+		default: 'id',
+		options: [
+			{
+				name: 'Default',
+				value: 'id',
+				description:
+					'Default, added when table was created from UI by those options: Create new table / Import from Excel / Import from CSV',
+			},
+			{
+				name: 'Imported From Airtable',
+				value: 'ncRecordId',
+				description: 'Select if table was imported from Airtable',
+			},
+			{
+				name: 'Custom',
+				value: 'custom',
+				description:
+					'When connecting to existing external database as existing primary key field is retained as is, enter the name of the primary key field below',
+			},
+		],
+		displayOptions: {
+			show: {
+				version: [3],
+				operation: ['delete'],
+			},
+		},
+	},
 	{
 		displayName: 'Field Name',
 		name: 'customPrimaryKey',
@@ -102,11 +168,25 @@ export const operationFields: INodeProperties[] = [
 		default: '',
 		displayOptions: {
 			show: {
+				version: [1, 2],
 				operation: ['delete', 'update'],
 				primaryKey: ['custom'],
 			},
 		},
 	},
+	{
+		displayName: 'Field Name',
+		name: 'customPrimaryKey',
+		type: 'string',
+		default: '',
+		displayOptions: {
+			show: {
+				version: [3],
+				operation: ['delete'],
+				primaryKey: ['custom'],
+			},
+		},
+	},
 	{
 		displayName: 'Row ID Value',
 		name: 'id',
@@ -116,10 +196,25 @@ export const operationFields: INodeProperties[] = [
 		description: 'The value of the ID field',
 		displayOptions: {
 			show: {
+				version: [1, 2],
 				operation: ['delete', 'get', 'update'],
 			},
 		},
 	},
+	{
+		displayName: 'Row ID Value',
+		name: 'id',
+		type: 'string',
+		default: '',
+		required: true,
+		description: 'The value of the ID field',
+		displayOptions: {
+			show: {
+				version: [3],
+				operation: ['delete', 'get'],
+			},
+		},
+	},
 	// ----------------------------------
 	//         delete
 	// ----------------------------------
@@ -195,6 +290,17 @@ export const operationFields: INodeProperties[] = [
 		default: {},
 		placeholder: 'Add Option',
 		options: [
+			{
+				displayName: 'View ID',
+				name: 'viewId',
+				type: 'string',
+				typeOptions: {
+					multipleValues: false,
+				},
+				default: '',
+				placeholder: 'View ID',
+				description: 'The select fields of the returned rows',
+			},
 			{
 				displayName: 'Fields',
 				name: 'fields',
@@ -207,14 +313,6 @@ export const operationFields: INodeProperties[] = [
 				placeholder: 'Name',
 				description: 'The select fields of the returned rows',
 			},
-			{
-				displayName: 'Filter By Formula',
-				name: 'where',
-				type: 'string',
-				default: '',
-				placeholder: '(name,like,example%)~or(name,eq,test)',
-				description: 'A formula used to filter rows',
-			},
 			{
 				displayName: 'Sort',
 				name: 'sort',
@@ -260,6 +358,14 @@ export const operationFields: INodeProperties[] = [
 					},
 				],
 			},
+			{
+				displayName: 'Filter By Formula',
+				name: 'where',
+				type: 'string',
+				default: '',
+				placeholder: '(name,like,example%)~or(name,eq,test)',
+				description: 'A formula used to filter rows',
+			},
 		],
 	},
 	// ----------------------------------
@@ -322,6 +428,30 @@ export const operationFields: INodeProperties[] = [
 		default: 'defineBelow',
 		description: 'Whether to insert the input data this node receives in the new row',
 	},
+	{
+		displayName:
+			"In this mode, make sure the incoming data fields are named the same as the columns in NocoDB. (Use an 'Edit Fields' node before this node to change them if required.)",
+		name: 'info',
+		type: 'notice',
+		default: '',
+		displayOptions: {
+			show: {
+				dataToSend: ['autoMapInputData'],
+			},
+		},
+	},
+	{
+		displayName: 'This operation requires the primary key to be included for each row.',
+		name: 'info',
+		type: 'notice',
+		default: '',
+		displayOptions: {
+			show: {
+				operation: ['update'],
+				version: [3],
+			},
+		},
+	},
 	{
 		displayName: 'Inputs to Ignore',
 		name: 'inputsToIgnore',
@@ -365,7 +495,7 @@ export const operationFields: INodeProperties[] = [
 						default: '',
 					},
 					{
-						displayName: 'Is Binary Data',
+						displayName: 'Is Binary File',
 						name: 'binaryData',
 						type: 'boolean',
 						default: false,
diff --git a/packages/nodes-base/nodes/NocoDB/nocodb.svg b/packages/nodes-base/nodes/NocoDB/nocodb.svg
index 42a90146ba6f7..9c4381ec1459d 100644
--- a/packages/nodes-base/nodes/NocoDB/nocodb.svg
+++ b/packages/nodes-base/nodes/NocoDB/nocodb.svg
@@ -1,425 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<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" width="460px" height="460px" viewBox="0 0 460 460" enable-background="new 0 0 460 460" xml:space="preserve">  <image id="image0" width="460" height="460" x="0" y="0"
-    href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAcwAAAHMCAYAAABY25iGAAAABGdBTUEAALGPC/xhBQAAACBjSFJN
-AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAABmJLR0QA/wD/AP+gvaeTAABc
-rklEQVR42u3deZxddX3/8df3e85dZ89MMtkTspGQELYAgoAsYREQqK1WrVrX1rYuv1ptq/76I9r+
-QOXnVm1dqm1dWlttq6igAlFAVJBN1kAIWUlC9klmufeec77f7++PcyeZbGQymXvPXT7Px2M0GSZz
-v/fec8/7fLfPUQgAWi6/UacuW9GFY6Knmd6SoRc4CegBZgOtwCzAUzDVQSbpNgshxBj1AzsBA2wA
-BoD15e+tGyyxzVheQLEjXLliz+CdH7VJN7gWqKQbkJTeW5w/FNLja6a3ZTkZuBxYBEwD2hWkJRSF
-EM1GQclBAOwDNgOPAr/oL/JsZHkhn2Lntg+qKOl2JvTaNIfeW5yvNVODiAUtGV4GLFOwyMEUoC3p
-9gkhRI3rBzYCa4CHBkvcn/ZZbS1bmiVAGz4wJ37SdWjN5RmfNwJLZThVCCFOXLknugV4vBTxraGA
-2/o/rApJt6vCz7kxtFx+o/Y9eoB5+ctXLA4NZ+XTLCaeh5wEpJJuoxBCNKgQ2ASsL0U8YR2PBytX
-PFMKWe1pdjfKHGjdB2b+8hszueUrrmzJ8AfAcmBC0m0SQggBwGYFdwyU+H7hrhU/Hbrzo6WkG3Qi
-6jowp3zKzUx5rFDwBhlmFUKI2qSgFBr+1cFNW/9CbUy6PSfwPOrPrM+6JQ5uUPAmBwuSbo8QQohj
-U7DawTdDwzfqMTjrKjDLQfkO4PeIt38IIYSoM/UanHURmOWh1zcD70KCUgghGkK9BaeXdANeSnb5
-jbkJf3L327M+XwReA7Qn3SYhhBDjphu41NNckblshXHwZLj2HpN0o46mZnuYvbc4Xyk+mvb5K2o8
-2IUQQpwwE0T8nXP8Xa0WQqjJwOy82c3tyPERB29AVr8KIUSzKAFfCg2frsUh2poJzOxlN/a0XbXi
-8pTmtb7HhcRddSGEEM1nO3C3MfzHrttX3F1c+dE9STcIaiAwe29xfibF7wMfAhYn3R4hhBA15anB
-Eh/e9VfqB0k3JNHA7Py4627P8jcK3iWFB4QQQhxFP/APhYCP7/hLtTepRiS2mCa7/MapE065+N+B
-1wN+Uu0QQghR8zLABSmPpcBdpTX3DCbRiMR6mFP+n/t8yufdST2+EEKI+hNE/P2LH1DvS+Kxqx6Y
-bTe5XFeePwM+BuSSeNJCCCHqVqEY8ucKvlbt7SdVDczhOUvg3cjeSiGEEGNQvhfnl/YM8aFq3oOz
-aoHZdpOb3JXnS8D11XpMIYQQDcso+MbuIT7c/2H1YjUesCqBWS6a/lngsmo8nhBCiKZxa2h4bzUK
-HVR0WLTjqhsn9b777vcBnwNOq/STEUII0XQWeprXdly1Igs8W8kVtBULzI6rbpzUcdWKHwJvRoqm
-CyGEqJx24LLsvItfAfygUqGpK9X6jqtWvAM4p1K/XwghhDjEOeXsqYiKzGGW5yx/gty7UgghRHVt
-Dg3nV2JOc9x7mG03ucnlBT4SlkIIIaptWsrj79tucpPH+xePa2B2ftx1l7eOyGpYIYQQSbl+Qp6b
-2m5y41ocZ9wCs+0mlysXJZB9lkIIIRLl4M1deW7uvcWNW63ycQvMcrk7qQ0rhBCiFnjlO2G9fdx+
-4Yn+guzyG6dOfe/dnwH+F5BK8MURQgghRvJ9j8tyy1dM8jSPnOh2kxNaJVuuDfufyJylEEKI2nZ7
-IeANJ3I/zTEPyfbe4vzynKWEpRBCiFp3dS7NX5/ILxhzYGZS/L6CdyX9CgghhBCj9Gfdn3DXjfUf
-j2kOs+OqGyfl5l38dQe9ST97IYQQYpQyaZ+lpZBvR+vuKR7vPx5TDzN92YrLHCxI+pkLIYQQx2lx
-99UrLh7LPxxTYKY0r036GQshhBBj4Xm8biz/7rgDc9Zn3RLf4xVJP2EhhBBijC6e8ik383j/0XEF
-ZrliwvuBrqSfrRBCCDFGk1Ie7z/eKkCjXvSTXX5jLjf/4v/raf6YCt4WTAghhKiCM6xDW8evw7X3
-mNH8g1EXLpj5WfcB4Jakn6EQQggxTkwx5M+2f1B9eTQ/PKqeYufNbq6Cdyb9zIQQQohx5GVTvGe0
-85mjCsz2HO+QbSRCCCEa0OKUx5tH84PHDMxZn3VLgDcl/YyEEEKISlDwptH0Mo8ZmA7eAUxL+gkJ
-IYQQleBgwWh6mS8ZmOXe5e8l/WSEEEKIShpNL/MlA1N6l0IIIZrBaHqZRw3MzpvdXGDMVd2FEEKI
-enKsXuYRCxekL7uxtXvxxTcDlyT9BIQQQogq6XaOvHHceaRiBkcsXDDzs+4PgK8zxtt/CSGEEPVI
-QWmgxGt3/ZX6waH/7bAh2fRlN/rAa5CwFEII0WQcZFoz3NBy+Y2H5ePh31BMAi5MutFCCCFEEhxc
-YSwTDv3+YYGZ8ZkHh/+gEEII0SSmZVKHV7c7LDDzl69YmnRLhRBCiCSlL1ux8NDvHRaYoWFJ0g0V
-QgghkqQVh3UeD+9hpjkt6YYKIYQQScr4nHro9w4KzImfdB3AjKQbKoQQQiRsdttNLjfyGwcFposr
-+/Qm3UohhBAiYTPyaa4Z+Y39gdl2k8vl0/wh4CfdSiGEECJhqYzPa3pvcfszcX9geoqpwMIx/Voh
-hBCi8ZytNVOH/3IgMDWLgclJt04IIYSoBQqmBtGB/Zj7A7Mlw3lIOTwhhBACiMvktWR42fDfNcTz
-l8DZSTdOCCGEqDHLhucxNUBrhonAnKRbJYQQQtSYeUMhPVBeERtELEh7TDUu6XadGK1O/HcIIYQQ
-I8z0NdOBF30ATzPXODJJt+pE2ToP/EYhFy5CiAbS1pbl5D3wkJ++7EY/m+LlEjZivMixND7kuqM2
-KHkjBFzYcvmN31ZtN7nJXXnuso7FSbdICCFEY6rzkaff7CtytV8em52SdGuEEEI0rnoeedKKaTgm
-+loxVUFL0g1qBM6Vvzjy1dTwAaOVDPMIISrDufhcowCt47+PJOehMWn3NNP9lgwLnNSPHbPhg9PT
-0JWFpb2waCLMbAd/RBmIyMDGfbBmNzz2IuwuQmjkoBVCnLjhUGzLwMQ8zO6ExRNhRsfBP7d9AHYV
-YO0e2LQPNu6FyMo5aBTyLRl6faDbOqnwc7yGD9CJeThnGrxiNpzeC3O6IOsffewhMIr1exyrdinu
-3QC/2gQv9Me/Tw5aIcTxMBZaUnBqL1w0E142HU7qggk5R0of/d8VI9hbUtzxPHzrcXhud/w9T4/+
-sZuJdXhacZKa+Vn3n9bx2qQbVE+cg6ltcN3J8OqFML87PjittRgTYctjHiPH7PcP0SpNyvfQWuOc
-YsNeuGstfP9ZeGJ7/AGQ4BRCHIuv4Yo58JrFcM5UaM/Ec0LGGowFZy3gDhqCLf8JpRWeBs/z2V1Q
-PLAZvvs0/GIDDIYSnEeiFZ9TMz/rbrOOq5NuTD1wDlrScMPJ8PbTHQu6HdY5ImNx1hzXpHZ88Gp8
-X+0/aH+0Gr76aDxcIqEphDiS4dGoP10GHzg/vliPohBj7HEvrFGA7/v4vkcxgvs2Kb7xGNyzQS7e
-D6UVt6qZn3VPypaS0enJwd9eAlfOc3hYwtBgnT3h36tVfKXn+x7P71G858fw+DY5WIUQB3MuXivx
-5tPg3WeDR4gxZlx+t+d5pH2PfYHmO0/Blx6GFwfkPDRMK1aqmZ91G6xjZtKNqWXOwcIeuOlSx5m9
-EZExh608Gw8K0J5m25DP5x/U/OBZGAjkgBWi2TkHk1vhugXw+iWOkzoMkYkqcx5SCt/TbB/y+f6z
-ii8+BH2lpF+B5GnFGjX9M5V4yRvLdQscf3uJotUrYaqwmUgB6XSKn23w+Ou75CpPiGbmHCzohi+8
-Ek7psZSCoGp7GtMpj++uSvGBO+UcpBXrvParVqxIuiG1yli4eBbcdJmiKx0QVbE6vbOWeRMUc7s1
-v9wI/YGUSjsezf7hridyyX501sGUNrj5MjhzsqEYhFTz5TLWMa9b8eiLmk17m/tzpRS+mvbpxjlc
-x/PNdC7eIvKla+DkCSFBOD7zBMdDK0ilUvzH0x6ffwDq/W4y1eIc9BUhsPFeV5BVf7VkeO9ySkM+
-DW3ppFtUuzwF7zkXXneKIQzDRKrleFqxZm+Gd/8YVu9q8tBspMAcTzkf/t8VcO28ZMJymFagUxle
-HGjio/Q4GRsPY28bjD/gv34BVu2EvUUpFJGk4dWdU1rh7KmOl89ULO5xTMjLG/JSJuYdypQSLS2X
-Tnn8+PkUf3EnDIVJvyLJkQo/R2AdvHoRXDnXEUXJheVwWwhLTG2R2hKjp5jdofcn42CoWLUj3mf2
-g9UHgrNqrWnyPBgOysUT4TWnwPI5MK0dUjreN2idxY3DavNGFUXHt2WtUm244iS44eQU//ZE8x7T
-EpiHsOWiBH94GvguIKyB/rd1JNrLrWdaQUp7LJvicdpkxeVzFZ+9Hx7dWr0PfTOP4VgHHVl42+nx
-VojeFocxESayFK2r6nycGDvrwHOWt5/uuHeDYtO+5gxNmdk5ghsWwrzOkFAmDeuedWCMoVAKcFHA
-8tmWL7zy8BqbYvxZB7M64Jbl8IHzoCcbUiqVCEKDkbCsO8Y65nSGvHpR0i1JjgTmCMO9y1cvBJz0
-6BqNsY5CKWBGW8jbz6jv2w3VOlcOy89cCdfOtwRBQBAmP7QoToy1lusXOKa2xWsF9t+hqUm+JDBH
-8BS89XSY2xFgZEqlYQWh4fcXhbxpad3f1LZmzeqEf73esmxySLEUjEtFLJE8Y2FWW8Cblsa1bJtN
-Ez7lI3MurvL/qnkhyIe74aWV4cYLI145T3qa4806eMcZlpPaQ8LIyNBrw3FcPz9kdmfzfXYkMMsc
-cOokR2/eNd1B0IwckNaGt54eL0oR4yfrw/nTXVWqYonqsw4m5gyLeiQwm5YCFk4wKCW9y2YRGsfS
-iRHnTY9voitOXGThvOkwvVXWADQyT8O8Cc03pSGBWaYwzOmUD3mzSWvDqxdCPpV0SxpDPgWvXwIp
-LVcgjW5Wu226ClpN9nSPTmPoyQZJN0NUWWgc5041nDKx+YaXxpt1cPpkuGB6JK9lE5iYN6SaLEGa
-7OkenSKgLaOaepN5s+rKRCw/KelW1D+t4Op50JqSkZpG5xxMyDpaUs11oSmBWeYT0J33murNFzHr
-HJfMdvS2NNeHfzzZ8v0aL5opi31E45LALDOmiSsKNzljYeGEkNcvac5yX+PBU3Hpu1lt1btXoxDV
-JoFZVgpDQtt8q75EmbO88dSIk7ull3m8rINTJsLrTzEguy5FA5PAJB6SK0aGfUWZe2lW1kFP1nCp
-zGWOyfI50JGWxT7NQqn4Nl9Bk3UyJDCJAzM0jv6SkyG5puZYfpIUMjge1kF3Dq6Y45DeZXPZXXAU
-o6RbUV0SmIBzjkJkeWGf7B1rZsbC4p6QMydLIYPRsg7Ongbzu4zUX24y2wZ1073nEpiAUgosPL1d
-9mE2u5xnuWYBpOR+3aOS8eGqORZfyXRGMzEWVu/WTXdhKYEJaKVQSvHQloBAPvdNzVjHudNgeltz
-3/h5NIbvd3nBTIuTF6upFCJ4ZldzzV8CaOviA3+0X41IK4XSHk+8GPHigG26g0AcYB1MzwdcNEtm
-5I7FOnjFLOjO2IY9N4jDaQWb9mk27G2+YZjj7mEeb8DWy5dSmo17I+7fVJKFP01OKcs182m6sl/H
-w7p4cdQ185EbFjQZpeDhrYodQ03Yw0y6AbXC81KYyPG5X/Wzoc9IaDYxY2FZb8DJPcnf4b2Wv35v
-ESztkZutNxOlYM0exb88nmrK910CsyyTzoKGhzYFfOq+gaabzBYH85TlkllgXDw0K18HvqyDGR3w
-h0sdnvQum0pk4R8eTvPcbpruTiUggbmf72X2//m/nhrkkS1hUx4QImYdLOoxMjd3BA64cCbMagvl
-9WkinoYHt3r8bL1Cq+Sn0Sr5dTR+0m9CrfA8H6U9HIZdA5Yv3N/Pkt4JNVONX8I75lz13o+Tux25
-FISycvogaS+u7KOUq8rKKK2au8ZvLQx9agV7i44vP+zYU2j8ucujnWMkMMs87ZNN5ykU+0HD/zxd
-4KLZg7xzWUui7dIK9pUcz+6U4vAA7RnN/O7qHLbTWi0Lu+GxbY1/gjgePXlYNtlU7a4km/ZZXuxv
-spIyZSmtmN+TSvzC3Tr45mMFfrmprak/CxKYI+QybRSKg4DFRI6b793HookpLpydTuwqL7Tw8Xv7
-+cpD/Um/PDVhYU+Kn799El4VPrRpz7F8ThyY4oAF3fE9RKvR87YOPvqzvfzXk0P4zbeLAV8r3n9+
-Gx+4oC2xNigFd64p8fcPpjGkkn5JEiWBOUImnSOXbdnfy9zSZ/jgT/byr7/bxcKJfiKh+a+PDPKV
-h/oZKDiZcQbW7IzY2Bcxd4JfhStuxyWz4RuPwa5C0s+8dpw8Ia6/XA27C5Y71hQpBk16/FvHLfcN
-MLnN442n5RNpwo5By40r91GwU5t+aqjJn/6hFC25TnwvHf9Vw6ObS/zFj/tYsyuq+jzKtx4b4kN3
-9jFQsPJOlfWVLD9ZE1TlvXAOTp4QcsYUqS07LLJwWq+t2sXj2t0R2/dFzXv8a+gvGP7yp3385xND
-VX94T8O/P15g7UAnnm7CLv4hpId5iJSfoSXfxcDg9niORsNdzxV51w/28m+v6aInX/lPrgP++eFB
-/mblXgKbIZ1t1rPFARpFZEKiKODHzw7xljPy5Kpw9OY8y1Xz4GframPxV9JyKVjUU72rh8e3RaSz
-ya4jSEoYlXDWgIa+Qcuf/7iP0MIbT8vvX6VaSZ6G37wQ8KUHS+SzE5J+OWqCmvIpKQJ5JMXSIP2D
-O4lMebGNg/NnZrjxsnaWTUuTT6lxrTWq4odga7/h/93Xz9cfC8lkJpDNNOfJ4kgiE7Bzz2ZSyvLp
-q7t4+7J8xeu9KmAo0rzvzjR3PN/cq5Wtiyv7fPbyEr6q/GlDKXjbD1PcvbE5ezZhVKJ/cDdBOBgf
-5y5eoXz+rCx/eEaea0/O0prW47ZQWZX/Z1/J8cCmgP94YpDbV4eQmkguk8xwcK2RwHwJxhr6+rcR
-BOWhEAcoOHdGhj8/v41L52ToyKoT2urg6Xjo7/ndEV97eIhvPTbI7oLHhM5pMgRyBLv3bqVUHOSk
-7hR3vHUiM9p1Va6079+a5e0/gMEmXqzckYVv3gBLuosVv1DRCtb2aW74bpr+pr6JkGNgaC9DhV0H
-r0q2cM2iHJ+8soO5E3yUGvv2k+FtO3sKjh88U+CLDwzy6OYiyvfpauslk5awHCZDsi/B0x6dbb30
-D+6MFwKV580e2FDiLVsDLpiV4Q9Oy3PxnCy9LRpPg7UvvTVNAbrcSxkK4cktAd97usj3ni6wbld8
-Nu7o6JGwPIp0KkspGGTj3oj71hd5w2n5iu8FNBaWTow4Y4rP3evBb8JeZmThzMnxnG41LrGVgl+/
-oJo8LAEUrfkOAAYKe+IhWgANt60q8PT2iDeenuf6RTlO7vFJl08bx7qIHw5JW75Y/9naEt96bIjH
-tgYUA4ufytDe2iNheQgJzGPwtEd760S08hks9AHxvGYxctz1XJGfryuxoNvnotlZLpmT4expKSa1
-eqT04ZutjYXdRcfjL4b8dmvAyueLPLo1YNeALf9ej7aWCeSzyS0hr3UpP67IZCLH91YVuOGUPJkq
-XFu0pgxXzPG5b2PSr0Ay0h5csyCe063GdpKBAH6yLoV1sgc2Ds1OUn6afQM7iUz5KkLDul0hf7ty
-L197eICXz8xw+bwsS3tTTOvwmZBTh13cGRuXe9xVcGzeG/HDZwv8+2MF1u0JGX6xs9lWWlsm7P+s
-iQNkSPY47BvYWQ7NQ5SHQjxfMb/b59TeFDM6fLKHXI5s3Gt4envI09vDeJk8EAelIp3K0pqfIFd0
-xxCZkN19GzGRo7tVc9ubJnLG1MoXgtYKNvRneMP3FC/sa66TuHXx3stvXR/Sm698uUBPw8NbNW/5
-UZr+UtLPvraEUYnBQh9BMHDYEC0AGjpzmimtHksnp5k74eCrya0Dlq39hm39lo17Q3YNlofENPhe
-mly2nXyuHa2acBhlFKSHeRxaWyagtX/w0AjsX/JurOOZbSHPbDvGRJc+8G98L0Mu204u2ybDsKPg
-aR/Py2BskV0DlttWFzl9SuU3U1sX1059xaw033y8+QLzvOnQm3dVWSnsHNyx1mNvsble59FI+Rk6
-2yYxVMwzMLgLY8sVkEbkW9+gpW/QsupY56Hyv1OeRz7TTi7bKr3KY5DLiOOglaY130l3x1TaWnpI
-p7J4h36i9Si+0KTTeTraepnQOY3WvOxxGi2lFJl06/6//+iZIjuGXFVOrEpZXjkfWtNJvwrV1ZGp
-3n0vtYJtQx73bJLPw9Ep8tk2Otsnk023oA49d4zmHKTjEbFMuoXujqm0t3ZLWI6C9DDHIOVnSPkZ
-ctk2oqhEKSgQRgVCE+JseT5yBE8rjFX4nk86lSOfayflp9m/ikgcl0w6x0AhLpS/akfALzeU+J1T
-slVZ/HPaRMMpEz0e2tIcvZ/Iwqm98aKnahQrUAru3+zx3O7meH1PRDqVJd0xmTAK4nNQWCAyIcYZ
-NPYItX41SitSXoqUnyOTzpFKZWX49ThIYJ4AT3t46Xx53tFhrMWYgMhEh/2c1h5a+9KTHAcpP72/
-UH4xcPzo2QLXnJytSn3ZrkzE8pPiwGwGvo7vTNKaMlVZ7BMY+MlaTSlqztXIx0/tv4CHDoy1WBth
-rcGMmDY6+BykkYv1sZHAHDcqDlCdI93c9YmrIC5hGARDGGe49ekhXrUwx/ULsxWfY4us47WnWO5a
-q3loa2P3goyF82fA7y6IiEzlJy+1gtuf97h7PVW5+Gk8w+cguSivFJ30jTqrfQNQ0RhSfoZsph0U
-9BcdX7h/kL5i5d9456AnG/LOsxq/6k82BW8/A7qyphq3vaSv6PjKoykGgua+/6WoXQ3bw5TQrA2V
-7IHlsq0MlfbhMDz4QpHfvBBw5fxMxefanHOcPSWiM+Ozp1jZx0pKZOHUSXDu1Orc99LT8NBWzTO7
-GrvXLupbg18ji6RVchTB81Jk/CwAxcBx27PFqixMsQ56soY5XY07YqJVPHfZkalOofXAwO1r0xRC
-CUxRuxq2hymagSaTaaUYDAJwx5oi6/a0MKfLr8IQomPJJHiwSot/qh2aXTm4Yo4DV/mVPlrB+r2a
-Bzarij/XE7nLh0KGipudBKaoa5l0Ht9LExGwbk/Iz9aWmLPMr0592UkGY72Gm8s0Ni5UML/LVG0r
-yV3rdFUqKJ1IGDuoSh3dZlCvowgN9lEXzUYpj0y6fAs0C7euKhBUYfsDwMJuR6oBFySmPLhmniOt
-q/NC7i06Vq5Xsu6giSS9KHSsXxKYou5l0jmGD+WHtgTsHKzOiX5mu2FWR2MtMHMO5k2As6dEVVvs
-8+ROn6d2eHXb6xDNQwJT1L1UKks6ld5/Z/pndkQn/ktHocWHi2Y13jDdFXNhcoutyoWAsfDT5zV7
-pci6qAMyhykagCaf6ySItoFy3L66wGVzMxU/4Tscb1ka8ouNKZ7bdWBBiFbxAhFfx3/O+PHfc6kD
-G/KzPrQcUuCiLcP++xkOCwyH3bEjtLBvxPcKUbwNJLIQmvj2TdbFQT7yJRjuwL3UwpXuPLzuFIut
-wlWAAn75Aty62pO6M6IuSGCKhpBJt5LLDFIo9nPXmiKFiKrcJ3Nup+UvXua4dbViSmscejPboSXl
-mNauaEnBpHKt+NY0eCoOIk9DaozjO84pSiMq7wyFitDC3mIcpDuGYChwbBtS7C7A9kHoK8K2gfjP
-u4txsEb2QO9YqTjcl02B2e1hVcrghRb++fEsO4cavwiEaAwSmKJh5DJtBMEAL+wzPL874tRev+Kr
-PI11XL/AcN1C7wgB6HDWYp3FueEtE3FCOQNBNPz90TdSKQVKHzSX0p5SKOWYlNPl/672Pz7EARs5
-RyFU7CrApr2wY9CxaZ9i0z7YtA92DsHWgbjQejXmLgF2FRQPbZWwFPVDAlM0DN/P4HkZBoMitz9b
-4NTetqo8rjERyhpKI8Jv9JlznOHkHHBw988c4U8HL6CJ71KR9xwtbZqTOoe73vFjF6O4l/riAHSk
-oqotYtqwV7GnUL9bDETzkWs70TDiLSbx+Of3ni6yp1Cd+2RaF/fKrLM1U8v44OXwFmMMYWQJwohC
-sUSpNPwVol1EeypiYbdhUkt1KvtoBY9vl6QU9UUCUzSUTDoHWrFqR8BvXgikMstRHB6mEaUgJKpG
-pQLiUePfbvOldynqigSmaCiel8JXPsXA8r0qFjEQxycwsHq3pKWoLzKHKRqCdfF2ipTWnDK5heUn
-5bh8XjbpZokj0ApW745L4QlRTyQwRd0a3muYTcH0NljaCy+fAZee1MP09ngisVQKsa46w4xidJSC
-ezdqhkIpZi7qiwSmqAvWxRvdO7OwaCIsmBCXcJs3AWZ3wsS8IeM5NA5jHcWircpNj8XxK0aA9lk8
-CZ7fA8UwXq8r85mi1qne/9dohb1EoxjuQbZl4JSJ8IpZ8OqFMHdC/B8iE2EM0oOsM1ppMmmfwGpW
-7XD8fL3i3o3wxDb2l8iT8BS1SAJT1JThuch8CuZPiIdYr5kfB2Z7xmHLKzprYeuGODFaKzKpFCjF
-YKhYtQN+8jz8YgM8vTPueWolw7aidkhgipphXDwXeeEseOU8OHcaTMiN7E1WpyC4qC6tQGmPtO+B
-UuwuKB55EX78HNz6bFzyT6oBiVqgJt4ytsCUIRMxHoZ7lB0ZeM0p8EdnwZxOUMoRRaYckjLk2iy0
-As/z8X0P5xR3b4DP/wZ++2I8XOspOfeI5Iw5MEXy6vXEMRySnoKZHXDZSfGw68umg68MUVSdezGK
-2qaVJp32GYo0D2+B256DO56Hzf3DW4iSbqFoNhKYoqoiCy1pOK0Xrp4PV8+DWR2gsJTCECtBKUZQ
-gPbi4VqHZm0f/PR5uPUZeGpHfGszX+Y5RZVIYIqqsA66snDpSXDDwngxT3vGYUxEFDkZdhXHpJUm
-lfLQWrO7oPj5Osf/PKP4+fr4QqxeR1xE/ZDAFBVhy0OunVlY1AO/sxAun+PoyVsUFmstzjrZKymO
-mwKU1nhaYZzmse2a7z+reGQrrNkdLxKC5u51NvFTH1eHHkMSmGJcDc8tnTIR3rAErpwHM9odYRgR
-GSnsKsafUpBNp0Epnt+j+PaT8N9Ps7/0XjMHpxhfEphiXBwalK86GXpbhodcjWwHERU3cshWglNU
-ggSmOGEOOHWSBKWoDVqB73tonWJtH3z7SfiXR2FfSUJTnBgJTDFmzsUbyn9/MXz4wjgooyiUAgOi
-JowMzltXw0fvho374nsaSnCKsZDAFMdt+IhZNBHevBRetwSyOpCgFDVJK0ilUqzZrfnyI4rb18D2
-wXhRmhDHQwJTjJpzYIGTOuNe5euWDC/oCYiMHEaidikU6bSPQfPYi4p/egTuXHugepAQoyGBKUYl
-stDbCtctiMvXze2SeUpRf4bvlFI0ivs2Kf7xQbj/BQiM7OMUxyaBKY5Jqbh03R+dGRdEd84QhqEE
-pahbXrl60L5A8/1n4Ob7YOeQzG2KlyaBKY7IOmjPwBmT4Z1nwiWzDBqLMRYpNyAahVIK39Os6fP4
-18c0d6+HDX0QSuUgcQQSmOIgxkFrGq6d7/izsxWn9FiCMMJYKV0nGtdw8YPBSHPbs5YvPKR5aoes
-qBUHk8AUwIG7h5wxGd5zDiyf40hrK0Ovoql4nkc65bNpn+IrD8N/PAm7CuDLnVEEEpiCAwt63nY6
-vPk06M1bgjCUW2yJpjS8f9Mqn3s2xAuD7tsYrxKX3mZzk8Bscg64ZDa8/2XwsmmWyFiMiaRXKZre
-8Ira3UXN1x6Fzz0Qr6YVzctPugEiOZGN7yJyy+UwISu9SiFGss5SKAW0pzQfOC+NVvCJX0pPs5lJ
-YDah4ULp1y6A/3upoz0VUijJoh4hjiSMLNaW+NNlaaxTfPXReAuKFDxoPjIk22QiC9Pa4H3nwutP
-hTQBkZGwFOJYtFakUxke2Ax/9wv49QuyirbZSGA2ieFVsBfPPjBfGUQGI/eoFGLUPK1Ip1JsG9J8
-4Tfwb09Ieb1mono+KYHZyBwwqQWumAuvWQSn9xrS2mKMkfIDQoyRpxUoj/V7PX74nOK/V8Hzu+OC
-H9LjbFwSmA3u9afCB8+HGW2WUhBhnQy/CjFehregFG2Krz8Wl9grRUm3SlSKbMdtUMbFN3P+5HLH
-1JaQQimQsBRinFkHQWhIEfInZ8E7z4jXCUg3pDHJKtkGY4k/rGdPhRsvcmgXEUQyTylEJRljcNbw
-3nMyrN+r+NHq+KJVeiSVk8TQtwRmAzEO0h68dnE8DDslHxFKWApRFdZB3gv4/CszLJ0E//BgXFZP
-FgRVRhK9eAnMBmEcdOfgz8+Dt53uSKmIIJSwFKKajHWkvJD3nZti3gT42L2wZreEZqOQwGwAxsHJ
-3fC3l8JlsyGMZBhWiKQYY8BZrp2fYka74iM/V/z6hfi/yRBtfZP3r47Z8tfyOfD16x3LZ1uCoCh7
-K4VImLGOUhBw6iTL166D1y12eCr+vIr6JT3MOuWIy9v9wanwkQuhM2MpBXIrLiFqhXVQCkJ6spZP
-Xp5idid88SHYW5SbU9crNaFB9mE20/FnHZw5BW66FE6bZMBFWElKIWqWUgqtPZ7brfnwzzX3bZTQ
-rEcNE5jNwlhY2gvfvMExJR/I3UWEqCNawb4owxu/p3hwiywGqjcyh1lHnINLT4IvXQPTWiMJSyHq
-jHXQkQ756nXwynnxgj2Z16wfModZJzwF154MN18GE3OGktzJVoi6ZIxlakvIp69MMbkVvvl4HJyN
-rFF6ZhKYNc458DW89fR4cU+LH0pYClHngtDQnXF87JI0+RR87VEoRo1buL1RetESmDXMOcin4ntX
-/unZkFEBQdgoh54QzS2MLCkv5CMX+kxpU9z0CxgKGzc0G4EEZo0aDssPXwjvPNPhTEQYSVgK0UiM
-MXja8s4z04CEZq1rlKHlhuIcTGyJt42880yHiwIpRiBEgzI2/oy/80zHJy+H3la520mtkh5mDWpJ
-w6cuh2vnW0pBIMUIhGhwxjp0WOINi9O0pzV/cnvc0xS1RXqYNWR4GPamSx1XzQkpliQshWgW1kGx
-FHDVnJCbLnXkU9LTrDUSmDXCuXgo5otXw+sWhYSRQT4rQjQXB4SR4XWLQr54tQzP1ho/yTdDJrZj
-w3OWH78Mrp5nCAJZ3CNEMzPGcvU8A3h88C7YNiDny1qQ6BymXDnFwzC9rfDJ5fCq+YYwDKVnKUST
-c0AYhlw9DyQ0a4cMySboSGEpc5ZCCIjPD3FoGm5ZLsOztUACMyESlkKIYxkZmh+/DDqzEppJkm0l
-CZCwFEKM1nBovmo+bO739hc3qAYZAj6YBGaVOQcTchKWQojRsw6iKOKdZ2pGVgSqNOnNHkyGZKss
-7cEHzpewFEIcn5EVgd61LOnWNCcJzCp7/3nwjtMjAglLIcRxMtZhwhLvP9fwzjOlB1htEphV9NbT
-4T3LIkwUyYEuhBgT50DZkI9cEHHJSSD3ZKgeCcwqsC6+u/pHLgSNFFEXQpy4rDb83SWwbCoyWlUl
-EpgVZh2cOw0+vhzaUwFOupZCiHFgrGNht+GmS+GkTgnNapDArCDrYFEPfOZKmNoSyv0shRDjqhSE
-nD0l5KbL4tX3orIkMCtkeK/l314KJ08ICUIZihVCjL8oMlw5x/DhC+JV+KJyJDArwDpoTcNHLoBL
-ZxkJSyFExQwXNnjjUscfnpZ0axqbBGYFeBretQxeu9gRhnIXWCFEZVkH2gb81cvjBYYyn1kZEpjj
-zDn4vUXw3nPiA1gOXCFENRjraE8FfOwSWNorezQrQQJzHDkHl8yGT1xmyFDESFoKIaoojCwzWkp8
-43rL4klJt6bxSGCOE+ugNQN/e7Eho6SKjxAiGcY6puQDPnJh0i1pPBKY40Qr+OOzYH6XLPARQiTL
-Onj5tJCLZ0sloPEkgTkOrINrF8C7z4qwTo5OIUTysp7lxoscc7tkEdB4kcA8QcPFCf73BY7WtJWJ
-diFETTDWsWRixIdebmlNJ92axiCBeQJs+d6W/+cVMLcrkko+QoiaEkWGVy+0vPX0pFvSGHzpqo+d
-VvAny+Dy2ZEUJxBC1BzrQFnDu8/xefRFuG9jfN4SYyM9zDGyDpbPgbefAdZKWAohapOxju5MwP++
-MC7XKZ2ksZPAHAOt4PVL4HNXGFq8kuy3FELUtDCynNVb4muviosayClrbFTHx2WZyvGwDt5yOnz8
-kgiPSA48IUTd8DyP9Xt93vA9xepdjTM8W63nIT3M4+AcnD4Z3ncupLWRsKwATx/40urA18jvicZw
-6Pt66Hvtydlp3BljmNsV8f7zIJ9KujXjx7rqfPlJP9F6kvHhQxfA7PaQIJS0HE+ehkLoWLPDsGpH
-yPZBx7rd0f7/PqU9xcS846ypaRb0+KS9+AJGLlrqi1agFAQGHt4S8NutIVv7DbuGHClPkfZgWofP
-tDbNvG6f+d0eWV9hZAH6uIlXzvo8vEXx1Ufi90OMjgTmcVgySVbEjjdPw1AIz74Y8tlf9/OztSX6
-ozy+lyFw7SgVH6Kp8n3+JuYNZ09VXDFHcenskKltWoKzDgwH5ZZ+y51rity5psgvNlr6wxyRagcg
-7fuE5sB73ZFxXDHH8o4zFKdOsqQ9JDjHgXXg2YD3nJPhh6th+2DSLaofMoc5StbB310K7zpdFvmM
-B63i1/TBzSFfuL+fn60t0h+1kMl2k/F9hs+LI8NweFgksvGNcud1Brz1dM3vnBwyqUV6IbXK03FQ
-/s/TRb76YD/P7LLkM+1kMu1oncJy4M4a9pD/Dw30tMB1CxxvXBxyeq/df+yIE5NOebzr9hTffTrp
-ltQPCcxRak3Dz95kmNEq97c8UZ6G7YOOz/yyn68/OsCugkdbvoNsth0o9xg5+kl0OBhN+e/nz4C/
-Oi/kohnS869Ft68ucct9+3hgU4l0Ok97Szeel8E6jvleD18gQbwl4m1LDW8/PZALpHGgFfx4bYo3
-3+rJ2oBR8rLLV6xIuhG1zjp482nw6gUSlidKK3hye8R7friHf3tsEKNydLVPIpNuBQ58akdexblD
-/98d+F0OWN8Hd67TaKU4vdeSksUiiVNAycBnf9XPh+7s4/ldlraWbtpbu9E6Xm1y6Pt6pO+58u/S
-CvoDuG+T5rHtKU6eYJna5pCr/bFzQG+r5idrNTuHZC5zNCQwj8E6WDwRbl4O7anoxH9hE/M0PPBC
-yNv/Zze/2RiQy7XR0ToJ30sdduIbTWAOf08rGAgU923S+FrxsulWrpgTFhjH39zVz+d+3c9AoOho
-m0hLrgOl1BFDkaN870j/7bnd8MAWjyWTHLM6nNRvPgH5lKMl47NynQxzj4YE5ktwLt7k+8VXGuZ1
-hlgZAhqz0Do+fm8/H/xxHy/sdbS3TaStZQJaxd3BEwlMiEPTOPjlJk0u5Thvmnz6k/TxX/TzqV/s
-Q/stTOjoJZfJHzUMjzcwPQ3bBuD2NR6BUZwz1eBJ92hMnIPFEy0dOY/7X4hXL8tLeXQyeHUU1sHU
-dviHVzoW90RERk7AJ+KO50r87cp97CxAZ8dkWvPt6HH+ZA6H5id+neLRbVr28SXA03DP+oBP37eP
-dCZPd+dk0qnMuPdetILdBVhxr8c9GxtoQ2ESnOWPz4j407MlLI9FTilHoRW87XRY3BMSSlieEE/D
-rc8UAEcu20Iuk6/o4/WX4BO/9hgIkn7mzUUr2FNwfOq+fRRCaM114lVhbPyHzym5ODpBxkS87bSI
-M6fI0OxLkcPsCKyDc6fBW5YajCzFOyHDJ9F715VQvk9LrrMqV7F3rvW4a31aTqRVpBT84JkCP19X
-wvfT8TBshU++noJ7Nyi5ODpB1sGkvOV95zZWBaDxJqeTI2hNw5+eDV1ZKX93opSCu9eV2LIvIuNn
-yaYzFX9MreJiCP/+pJMTaRXtKTi++dsCJnKkU5mqDe+t74NfvyC9zBMVRpZLZ4VcMVd6mUcjh9gh
-rINXLYgr+sgNoU9cYOC/nxoispDJtFZt9apS8LN1jie3hXIirQJPw29eCHjwhSIAmVS6ao9dMppb
-VzvZlzkOcp7lvedAb4uE5pHIqWQE62BKG7zzzLi4ujgxWsHGvohfbiyBUrRls1V9/P6S5ifPJ/0q
-NAfn4I41JYqBAw3aq+643h3rsqXN/bKd6ESFxrF0YsjrliTdktokgXmINy2FpRNloc94UAoe2Rqy
-bcDu3z5S3QZoHtyqZVi2CvqKjgc3l/b/3dPVC0ylYFt/lFmzK5JVnuPBWd5yOizoll7moSQwy1y5
-QMEbTwWcjO2Ml1XbQ0zk0FqjvVTVP4DP7XLsLkjPo5K0gm0DhnV7ohHfq+6ppRhpHtkqo0LjwVjH
-rLaAd50FviTEQbQr13Os56/x0J6Bmy+zTGuR4urjpRjB49vKJ9GELv23D8La3dLzqCSlYH2fYU/B
-xsOxWldlO8mhVu1UyI2ExkcUWX7/lJB3nTWyYKXQjriCRj1/jceNQS+d7bhguhQoGE+RhR2DyZ3B
-4vsuKkqRvKeVtma3ISzfI1bhEhnK27B7kJIE5rhwQFoZ/vK8iJO6km5N7ZAON/HdLy6fa2VVbCUl
-VfDTScH8ajPW4aTAa92zDlpThvNnJN2S2iGBCbRl4Owp8gGvhHR5T4e1FmvCqs8lpnXpxH+JOKZp
-bRrPP/Dm2iqvA1AETG5VpL2kX4nGEhrHRTOsDHWXNX1gGgsXzYLpbXJEjLecD7M6y4FJ9Xvvzloy
-nqUrJ7MwldaR1QfdVs3Y6vbsnQ2YkPPk1m4VcOYUS0dWVsyCBCYT8vBHZ4Gv5GgYb56Gk7r8+C/O
-0V8sVvXxFQFd6YDJbb7cAqqCnIMZHR4T8prh6yITVXkvjy0yu8uTxV0VMLXF8qoFcediPNaL1PNX
-UwemsXD1PLhwWihXTxWyeFJq/1BdqTRQ1WoszhSZO8GjJ6/l/a0g62BSi2ZGh7//e0FUxR6ms6R1
-wOJJUgS1ErSyvPNM6G1NuiXJa+rA7GmBt54OnpLFPpXgHJza69PbqsFBMShQCqs0p2gjsP1cNDsj
-xaSroD2jePnMA3WCg6h6c8fOhcztNJw6OSUjCRXgXFzM5dpyL7OZNW1gGgtXzYUzJklVn0qxDmZ2
-+iNOpJbBQl9VTmrODtGZCblkTuWLvYt4C8/l87Jk0/FoQhSFFINSdYZIzRAXzc7S2yIjCRXjLG9e
-GncymllTBqZ1sGQS/K9zDThZ7FNJvoa/uqidnpb4UCsUB+jr34mxlbtUtaaEb3bxrrNbOWNKuumv
-iqvBWDh/Zoo/Pru1vNHdsWffixRKBaBym9+tjZiYHeDPXtYq85cVZKzj1J6A957T3NV/mvKpt6Zh
-xcUwvzOSK9IKGx6WvWpBrrwgxDFY6KNv3zZCU5mLFRfu4uqT03zwwnYpiVdFKa34yMXtXDY3Cw6M
-CdnVt5WBQj+V+JgZU8SWNnPdwhQn93gyHFth1lr+6IzmHpptusA0Fs6fARdMl6HYajEWfmdR7qDv
-FYNB9vVvx9jxC01rHS7qo9Uv8MEL2mit3h2mRFlHVvHXF7XTkh6+UrHs7d/BULF/XB/Ho4gLd4AJ
-uH5hrmlP4NWW8yyvPaV5bzLddIGZ8eH3TonfeFE9F8zOcOGc4V5mrBgM0te/jXAcFogoFxGWdmCC
-nSyfl+XsaTIUmwRj4YJZaS48KTvivY5Dc2Cob1wKGkThIKXiDoiKXLUwz8tnyZVRtYQmLiF67vTm
-7GU2VWAaC6dPhstnGymwXmXtGcVnru5gUW/qoNAMgiF27d3CUKEPN8biBlE4SLGwFcJ9eFrx1jNb
-Zag9QdbBu85uPajyD1j6B3eyd982wnBoTO+PchFBcRemtA2iIufOyvKJKzrIp2TcvZpaU4Y3n2rJ
-+Cf+u+pNUwWmp+PeZVdG5i6rzTlYMsnn89d2cca0zEGh6ayhf3Ang0O7UBwYoj3aIo5ytT2MKVIq
-bN9/As2mFe87r42LT5KVsUm7dE6G953XFt+15JBRhT392xgY3IazoxtZsDaiVOqjWNiKi/aANZw7
-K8s/vKqLhROlKEW1Geu4YKZlyaTm62V6meUrViTdiGowFuZPgBsvDMn7tiKLEMRLc8DsLo8LZmVY
-v9ewZlcUn0zLwRhGJUrBEMYWwUZ4yhJZhXMW5yxgKQZFiqV9hMEuTLAHXAmsZVK7z98t7+A957WR
-kXqiifMUnDczQz6leHx7SKHkDiyVdY4oCigFBXAGhcE4D1t+n4ff6yAKiII9hMFObDQIJgKluO6U
-PJ95ZSeLJ/lNd8KuBQ5oTzv6Q597NiTdmupSbTc3x/WZsfD+8+BvLggxFVqdKUbH07B90PGVBwf4
-8oMDbN9Xfj/0oT+nsId801kLw5c7Nv43y+dm+YsL2rnkpLSMHNQQreLh2bueL3HLfQP8Yn1h/3t2
-hJ9GHbKk2Q0vCCuH4tROj3ed3cofnd1KV05JWCZIK9jQn+F3v6tYu+fAqE+ja5rA7MnDd34PlvYU
-5YNWA4ZPpg9vCfj7Xw/ws7VFdg2U35iX+vCVb4Lq+YqlvWnedlae1yzJywm0hg1fIH3nyQLfenSQ
-x7cFmKjc43yp6cfy+zmp3eN3FuV565l5Tp8SL8+UC6PkaaX58D1pvvSQBGZDUcDfvALec1aAreCG
-eXH8lILQwO6C4dcbA36zOeCFvYbdQxZ7yFmxNauZ3+1z5tQ0C3t8ZnX5tKYVOGSIvcap8v8MBI4N
-eyKe2Rnx0OaA53dHDBQP/kxqrZiQ10zv8DhnWprzZqaZ1BIXVm/8s1X9UAo29qf4wx94PLmNpigc
-0RSBObkVfvkWQ6svNxOudce6UnVOeheNQqtjn2Rl1KC2pTzFd57N8Ke3NcfnsikWBi/qiVfGyk1Q
-a5+cIJuHLQ+vi/plrOPimRGdWZ/dhaRbU3kNP/JsLJw2GWzjd6SFEKKqrIOenGNeV9ItqY7GD0wH
-Z04y0nMRQohKcIbTJifdiOpo+MDMp+DkHuldCiFEJRgLZ0xujk5JQwemsfFtvCa3NME7KYQQCVnc
-40g1QcGQhg5MgCvmQt6XwBRCiEqZ2W44qbPxF+01bGAaC105WH6SLMQTQohKavHh/BmORr9jYsMG
-pnXwuiWwtCeQzc5CCFFRjred7pjV0dj7MRsyMI2FKW3wplMdvm7wMQIhhEiYA07tCXnDYtPQHZTG
-DEwX3/dyTmfU8GPqQghRGxyXzPFoyzTuXGZDBqanYPkcyEjvUgghqsJYWNRtOGUiDTuX2XCBaSz0
-tsLLp0vdLSGEqKaOdMQrZhi8Bi3E3niBKcOxQgiREMdFs2zDDss2XGB6Ci6ZGclwrBBCVFlcLEY3
-7LCs32hXAT0tcNFMiwzHCiFE9XWkI14+w+NXm5JuyfhrqB6mcXD5bMu8LtuQwwFCCFHrnHPccLJl
-envj7clsqMDsyBhec4ppipqGQghRi6yDJd0BV851RA3WcWmowJzWaljcEzX0xlkhhKh1SsErZjrS
-XjyvWemvavGTfmHHi3GwbKplYl413DCAEELUE+fg1IkRU9rSvLC38o9XrdBsmB5mWke8bJqHatD9
-P0IIUS+sg+kdisUNtlq2YQKzI+M4a0oDvTNCCFHHMtpy5hQaqohBQwSmcbCwO2BGu6yOFUKI2uB4
-+bSQlnTS7Rg/DRGY1jrOnmJpTTfQpYwQQtQx52BuF0xrS7ol46chAjPrG86aLF1LIYSoFdbBxJzh
-jCmNM49Z94FpLMzrLLJsWgory2OFEKJmeBqunWfINch+jLoPTK0sV811TGnzpBieEELUEOfgZdMd
-87uTbsn4qPvAdM5ySk+UdDOEEEIcwjroSkcsmdQYZfLqPjBbUpZFE1NIsXUhhKg9noYzJjVGp6bu
-A7M9VWRmhyfbSYQQokYtmRSXyat3dR+YXTlftpMIIUSNGt5e0gj7Mes+MCe3GjwtgSmEELXIOmhP
-G7pzSbfkxNV9YE5pdcj8pRBC1K58StHbUv/zZnUdmMbBlBYjt/MSQoia5pjcWv8jgfUdmCZg3oTG
-WK4shBCNKp7HtHVf8aeuA9PZkNmdDbD0SgghGph1sGBCnacldR6YWV1kYosEphBC1LrJMoeZHOMg
-pQPaMvU/Li6EEI2uK6fr/t6YdRuYykX05D1aZA+mEELUvAlZQ1sm6VacmLoNzFIUMa8rJCV7MIUQ
-oua1pi1dufq+1VfdBqazAbM6fFJ1+wyEEKJ5pD3FzPakW3Fi6jZuPGVZMDEF0sEUQoial9IwrZ26
-rvtdt4GZ1iVmdcgKWSGEqAdKwZyu+O4l9aoum26spSMdMr/bk6p4QghRJ5b0GLJ+0q0YO21cPAl7
-PF9JC6KAKS2O3lZP8lIIIeqBg5MnGCbmayNHxmJMWZ/0k3U2YEanli0lQghRJxzQkdN05WDTvqRb
-MzZ1OSSrXMjMjpSskBVCiDqS9yImtdTvwp+6jBznDF05hVLSwxRCiHqR8WBaW9KtGLu6DExcxAxZ
-ISuEEHXF0zC1xSTdjDGru/VKykWkPcvkVg9ZIiuEEPVlYpuHp5NfC3MsR6p7W3eB6VxERod05WQ4
-Vggh6k1v3pH2FEGNdzSPFOh1NyQbGGjLQFfOw9X4FYoQQoiDTW0JydTpjFrdBSY2YGLepzOrJDCF
-EKKOOAcTctCeTbolY1N/gelCJrYoWtJaZjCFEKKOWAedGcOkfH1uLam7wHS2xOQ2r2679EII0cwy
-vqK9Tu+LWXeBCdCS0shtMIUQov74GnrySbdibOoqMK11gKE7r5CaBUIIUX9SGrolMCvPUwacZUqb
-h9wIUwgh6lO9ljWtq2Y7F4EzBFbCUggh6pFSMLs9qsv7YtZdk5VWTGvTSJUfIYQQ1VRXgRkZQ0Zb
-OrJ11WwhhBAjtKTqs8NTX8njaryWkhBCiGOa1g7ZuivMWm+BiaU9q5napqXKjxBC1DFbh+fwOgvM
-eA+PJ5swhRCirtXjabyuAtOYAAAlC36EEKIuOQeTWxwddVhPtq4CUwghRP1Le/H9JuutnqwEphBC
-iKqr9RtIH4kEphBCCDEKdROY1jpwUdLNEEII0aTqJjBjht4Wn+68V5dLkoUQQtSvOgtMSPv1uRxZ
-CCFEfau7wNxXtJSMhKYQQojqqrvA3Fuy7CtKiTwhhKhXgYGwDpfJ1l1g7h6ybNxr5QbSQghRh5SC
-Z3f77C2qurvFV501F4qB5c41RaklK4QQdchYuGejolCHmx7qLjABvvd0ged3RzKPKYQQdcTTsHq3
-5o7nFV4dnr/rLDA90Ip1u0K++JshwjorqySEEM0sMPCPj6RZ30fdDcdCHQWm1gqlM/v//tWH+vn2
-40MylymEEHVAAV95aIj/fCrploydP94FACo5TOr5bURmAHRIMXT8+W172NAX8c5lLUxq8Q6Ep8xv
-ihGqfTjU4zVcNV+jenx9xBiU32jnYPug4R8eGOLvH8o5q1H12LsEUP7H6mv5jDFFCLfibHlriYNJ
-bR7XnJzjollp5nX7TMjV6bshKqI779GZVVWrDrWr4Opq61N71qM7V70Yq7fXR4zNziHH2t0h924I
-uO3ZAjuGMqTzU5Nu1gmpu8AEiMJ9EO4EypOYw3OZGjpzmnxKrmFFLONpPndNJ1fOz2KqkJgDgeMd
-39/N/ZsC/Dq4bossvGJ2hi9dP4GcX/nHS3mKW1cVee9tu5N+6qLC+kvQXzLEV6oKnZ1MKt2adLNO
-SBU+IhVodKqdCFBmV9zTHHFi6hu09CXdQFEjHIt605w2NY9zle/ReBoe3hLys7VFBgr1cx36k+dK
-PLol4MLZ6Yrfn9BYx1nTUmQ8zbpdATJA28CGz8tagdeOn6rvsIQ6DUyIQ9NLpSkVdoIrHvgPdXBV
-L6rEwisX5JjcCqYKI4DGwvefLjBQsHVVu7G/YLh9dZELZqUr/ljWwZRWn2tOzvGFXweSl41OZ/BS
-E9BeviEWaNZtYAIYsqRzvZhoEGMCcKWkmyRqSGeLz/WLcuAqv/9IK9i0z7JyvQI/m/RTHz0bf2Z+
-vLrAe85rZXKLrvgCIKUcNyzK8tVHQoqR7A1rPB5KZ9BelpSfIXI+Dio+elENdR2YAJYUyu/E90HJ
-8lhRFhrHy+dqlk6JMLbyJUWUgns3ptgwOJFUneSlpkSpsA10yOpdEXevLfK6pfmKL5k11rF0agu9
-nS1sGZAhoUbkykMHUYOdkus+MEdyMr4jyjIpxQ0nQ2vKEFZhOHYohB88p4lc/VQwMWRB58CEmMhx
-++oir1mSr8poclcm4pRJGTYPJP0qCDF6cnknGtKMdrhopqvKylhPw6qdmvs3109Y7m+737L/z/es
-L7FzqDrbPYx1nDlZtpaI+iKBKRqOAt59DsxqCyq+91IB/YHiUw/47Bqqv4+T8lpQfhto2L7PcN+G
-oCrjNNbB5XNcXZZHE81LDlfRcKa2wxsWG2wVthhrDSvXp/jxmvr9KKXTHSjtgYbbny2iq/RUzui1
-nDEZ6vC2iKJJ1e+nXIijOKUnniOrhsDA/6yKGAqTftZjZ8ngVDw0++S2oGqrGdOe46o5Miwr6ocE
-pmgoxsGpvVSld6kUPLsz4t5Nqbqo6nM0DrV/LnNjn2HtHlOlbaSOa072mFz/+9lFk6jjj7kQh3MO
-zuyNqtZLWrkhy4sDdbbS5wi0lwedoa9k+emaUlU2mTsHp3RHXDAzLtEnRK2TwBQNJZ+CxROr81jF
-0PG9ZxtjZ5ZDoXS8B/P7TxfYW6zOxGJaG66dD5nGeBlFg5PAFA3DOFjQDdPaqtNd2TqoeGoHdbeV
-5Ki8FkDx6NYij78YVmUFq7GOi2eGzJ8gi39E7ZPAFA3l2gWQ86tz5n1ml09/A1Vj9L0MaJ+BguP7
-q4pVGda2Dia3wtXzk372QhybBKZoCMbBpBa4/mSoxu2QtYKHt6qGKCg9zKFAxQXYVz5fYHO/rc7i
-H2e4Zj501klJQdG8JDBFQ9AK/vA0WNwdUI07vIYW7lqrG2c4tkx5edDwzI6Qf3ygn7AKvUxjYVlv
-wBuXUrWbfAsxFhKYou4ZB/O74c/OCtFU/gzvaXhwq8cTOxosLYkr/4DGWfiXRwb57dagKnOZnrK8
-e5ljVqfMZYraJYFZIcYd/iUqwzm4fA705l1VeijOwU+f1xSrUxuhqrT2QWdBxzdj//HqYlV67NbB
-rLaQy+dQlcdrFnIOGl8SmOPEuHgvmXWQ9uL5tBkdB74mt0IuFf/3yMrBO566cnDdyaBUde57uXXA
-ctsaL+mnXTGen9//5x+vLrF1oDpzmUpZblgIbZmkX4H6ZUacX3Kpg89B09qhJR2PkIw8X4nRk91P
-Jyiy4Ov4YDytFy6eBadPgYk5R0f2wFlmKISdQ/DEdli5Dn77Imzph1IUV4xptLmwaoksnD0VllWp
-WIFS8LP1KZ7bTZWq4VSfVa2g9oIOeXxbwH0bSrx2Sa4K98mEZZMNp0/2+MUG6rp6UjUNX3x3ZmHe
-BDhjMizqgdMmw8yOA+cW42DHYHweWrUzPhfduwE29Mk5aLQkMMcostCRhXOnwWtOgfNnwJwuR3b4
-FXUO6yzOWZTS6PJyyotmKf7oLNi4V/HAZvjJGrhrLWztl4N2LHwNr5xX/ftelqLGPaF7nk804j6Z
-P1hV4IZFuaocm12ZiFct8LhvY9KvQu2zLr5oO6033k51zfx4H3JXFpRygMNah3PxlaRSmrmdCpTi
-2gXgnOLZXfBPj8Dta2DNrjhU5Rx0dMr/mMwYHA/jIOfDNQvgj86C86ZDS8phrSUyFmfNSw5zaAVK
-e3g6PjGFFh57UfEvv3V87xnFiwNywI6WcTC7E277/YA5nbbiw0uehoe3an73v1O8OFB/9748Hs4M
-YkpbwcKkdo/b3zyRU3v9ivfiPQ2rdme45tuKLf3yWTga42BqG3z4QvjdRdDb4sA5IhNhDIA95nkI
-NCnfQ3uaTfsUP1wN//pbeHSrBOfRePqSFSuSbkS9sA7OnAK3LLd88OWKhd0ObEQUhXFYOnfMUSsH
-OBff2NgaA84yo0NzxTzFpbMVAwE8vTPpZ1ofrIPXLq7erbwU8PXHfW5b03jbSQ6ldQprhgDDYNFx
-0gSf82amK74gxzmYkFM8vl3zxLbGHfY+EZGF3lb4x6vhTUsdOS8iDEPCyMQ9SkZ5HsJhrMVZS0fG
-ce50zXUnK3ry8ZDt3pK8/odq0EGl8WfKYfm934fXLlGkCCkUSxhjxtyzsS4uDVYoBdgwZNkUy9eu
-c7xhiRSjHo18Cl61ADxdnUIFO4Yc31/duIt9RtpfW7bs+6sK7ClUr77s9Qss+VTSr0LtMQ7Ongbf
-ejVctyCiVCoRhGM/B0F8DgpCQ6lUoicb8oHz4HuvjVeei4NJD/MYrIOUF6/C/Mq1lqn5gDCMxr1H
-43BExqCc5fK5isltmmd3wZ4CDVVNZrxEFl53KvzpmSG4yl9dOOAfHsny3083VnWfl6JUCmdLQMS2
-fkN3i8fLZqQr/rjOwaxOeG6Px1Pb5fiH+Dw0dwL87SXw8UsNC7oMYWTGdR2WIw5PYyKmtDp+bzGc
-M13z0FbYNSTvA0gP8yUZB1kfPnUlfPf3DFPzIcYee7jjRDjnSKuQdy8LuetNsHyObEE5lHHxkNR7
-z4GMV/mVPlrB6t2af3pUETXRe6F0Crx2ACIDX/rNIGt3R1T6vOmAvG/4X+fGWyOanXHwyvlw15vh
-j84IyemQyFTuuHdAZAzahlx5UsjXruPAYsYmJy/DS/AUvPsceNvpjjAMq1Ch9IAgNMxog3+8JsUb
-/wfufyHpV6O2XDQrvpditbaS/HSt5sUmXISidB6nM0CJdXtCfra2xJxlflW2mCzuCZnaluK5XUm/
-Csm6cBZ88RqY2hISVGMp+AjGGJZNVrxrmc/fP5D0K5E8X3ovR+Yc/M4i+KuXg7ZBIr28IDTMbofP
-XJniK4/IvOZIbz4NfGWq8r7sLTp+tMbfv+e2mXiejzH5eGjWwq2rCrz5jBZSVXgdMtry9jPgqR1J
-vwrJ8TX86bJkwnKYs4aPXOjz7C64bXXzfQZGUuqjsq3kUM7BSV3wvdc6FveEhAknVTrlobWMTY1k
-bXVOIJ6GO9cqXv/9DIUw6WedDGOKuNIWsJbOFs1v3tXL9PbqLH5Kp9Jo3cRnaKp3rL+UlK/57fY0
-v/td2LS3+UZahsmQ7BH4Gv5kGSyZGBFU43YNxxCEBq3kuuZg1XlfjIXb16bpLzXGogfF8W8V8L0M
-oc4CQ/QNWlZtj6oWmFEUllvdvGwVFrUdSxhZzugNeffZKT68MunWJEcC8xDOwRlT4Q+WRERRsld1
-I9XCh6bZKGDdXs0dzzfOCdsxlkVkCrxWsEMAPLEt4Mr5marUIY1Xo8vFYi2IIsNblmp+uLp5SxdK
-YB7C1/CW02FS3hI24N0oxHFQ8OsXFOv7GqN3eUIvhc7jVAp0yMNbgvj1kBxrKtZBV9bwjjM8frMZ
-ghroT1R7aFgCcwTnYOFEuGFBhKnG8ktR0wID/7M6RWQlMNE+lOvLPr0tZCiETHPUcBAjGGN55VzD
-0l6PBzcn/7mo9mLMJuxUH13ai7eR9GRPrHKGaAzP7FKsXJt0K2qH8jtAeTy/O+KHzxSqcmNpUVus
-g850yJ8ts2SasLslh3yZc3BqL7xqfoSRtGx6WsHK9T7FKPmr6JqhM+B1EVn4zC8H2D7opNZoE4os
-XD7Hsqin+W72LYE5wllToDsjE5ciDslHXvQkLA+hvCxoxaodAQ9sCuT1aVJd6YhTe5NuRfVJYI6w
-pCeSE4AA4vnLVTtqYFVDrdFZIE0xcHx/1VBVKi2J2uNpOHVS0q2oPgnMMl9b5ncOJd0MUQM8Dc/u
-jNiwV1a1HIkqF9H45YaAdXsiGZZtUrPabdNtLWmyp3t0HiFT23TTjcmLI/vRmhwDQdKtqE1OZUCz
-v7asjMo0p4l503TF8SUwy1r8kHxaXg4BewqOn6yV3uXRKJ2J/2DhzueLNbEfT1TfhKwj6zfXwh9J
-iLKMLtGWVrKdpMl5Gh7aqnl8m6yOPSqdRun4guKhzQFrd8uwrGgOEphlzsrqWHGgduxQkxZaHxXl
-44iHZbfsM9y7XoZlm1Uz9S5BAnO/yISE1jV5mefmphX86gX47tNyFByT1x53wS185aEB1u8xEpqi
-4UlglhUiw+4hKx/6JhZa+PxDKXYMynDssSi/FVQONDyxJeTrjw7KxWaTeXFQMRQ212dFAhPARoTG
-0ld0TfXmiwM8DU9s19y/WQ6AUfNa9//xe08X2DpgZS6ziewteU234EsCsyyIHGt3y8RVs3IObl3t
-sW1Ay0XTKCmdBpUCDat2hNy5piivXRNZtcMRNVnhCglMwKEBxRPboqabxBbx3OWmfZZbn5OtJMdF
-Z+M7mABY+OZvC+wpSH3ZZhAYWLWzybqXSGACoHQcmI+/GDAoncymYx3825MZnt3ZXPMx48HzW+I/
-aPjVxiLffXJIXsMGpxX0FR1P7Uwn3ZTqP3fn4uGoev0ax5eCx7eFrNsTyW2Lmoin4bfbNF9+VKo8
-jYUhF9/FBDCR4x8fGGDNLqnJ3MiUgqd2+mzY23wXmHUfDeMWvNpn+4DhzjXFpJ+SqBKtYG/R8bnf
-wNZ+1XQf/vGgtAavI/6LhlXbQm6+t5+w+UbrmoZz8PP1mv5S0i2pvroPzHGjUuDgS78Z4MltUrmk
-0TniKjVv+K9B/vOp+M1OerSkXr/QrfG+TAAN//bbQT5/fz+AbDVpMFrB/ZsV33yiOef7PS5esSLp
-RtQMO8DeIcuLg4arT86TksuJhuRpuOO5Itf+Wz9r9vXEF0ti7JSKF/+4Erh4EcB960v4nmLp5DS5
-lJLh7gYwPHf5jtuzrGrS+X4JzP0cmH2gYEOfYX63z2lTUvJBbxBagdZQjOD+TQHvu72PHaXOA6s8
-xYlRKr7tly0AFmPh3g0Bz+wMmdLqM6nVI+PHPU75SNUnreEbT6T4l8d009bcVqyQSADAWQg2xVfI
-Fs6YluE7r+9mRnvyB4dWzXk1Nx6cg8EQXuyPeGRryA9WFbjz+SJ9xTRkpifdvMZj9kG4Eyhv0LPQ
-2aK5fG6W6xblOHNKisltPjkfWVw3Ss6R+DnI0/DcLsMN/9XCmt1JvyLJkcAcQUW7cNGe+C8W3np2
-K59+ZSeZBIfrtYpvZvxfTxUwSX9qapCnFTM6PHKpg68o+gqWrf2GXUOOp3dEvLA3YuPeCBPZ+EVN
-TT6oUo0YR2YfhDvY35csZ6fnK3pbNXMnpJncqjipy2+6GxAfL08rXndqjnndPiahIgEKGIrgfT8u
-8q2n2kE175vmJ92AmuJ1gBmIe5kavv3YIEt60/zZOflErvC0gh1Djr/4cR93PVdAllAcxdE+v/YI
-P6c9lN+Bk7CsHK89Hpo18cKf4ffHWMeWPsOWvkLSLawjjsdeDPjK9RPozCZz+0EHfOXBAb79VK6p
-wxIkMA/ilB+HZrQTgGLguOnuPqa1aW5YlK3qwTo8wf6hO/q46/kismx3DA79bOs8XqoDo1qSblnj
-8ycCCuUGcXbEHpPmPt+OgeIHqwp05/fyiSs6aM9UPzRX7Qj5xC9DDBOSfjESJ4F5KK8d7FD8pWHX
-gOW9t+0Burh+YbYqCxYUcVh+4Cd9fOu3g0m/InVMg06ByuD5LRhymCa/Qq4apSE1CVwRTDH+PLlw
-/ypacXy+8eggLSnN/764rao9Ta3gM78aYG/U1fS9S6DoEw9cNf0rsZ/SqNQEXBDuH5rdvs/w3tv2
-MLOzhzOnpCp+sA6G5bB8LAC/Rw7Ul6COcAJ2+Hiej8XDkQalkX30yXAqC34W6ES5CIjQGIyVd+SY
-zEB8oUE8nP2F+/cxGFo+dlkHk1pURec0tYpvd/e1hwf53jPl91FsUaxw64FZSbek5tgSRLvBlnt4
-DmZ2erz/gg6ump9heruHp8enPJ8q/89Q6Hj8xZCb7+nnjrUe+F37y44JIZqMs2D2QLSXkRPyczp9
-Xr0kzzuXtTCz0xu3rW9KgbGwoS/ip2tK/MfjQzyy1RJ5U0A3X93YI1irWOGeB+Yk3ZJaddDKWQAL
-3a2a6xblecsZLZw5NUXaG9vS7+Fl9dsHHT9eXeBrDw/ywKZSXDklPTnppy6EqAHKFXHBtoOHsy3M
-7fH5xJVdXDArTVdOjekcpIj3Vw6F8PDmgH99dJDvrxpioGDBb0GlJsVrOwTASsUKdxdwWdItqWlm
-H8rsOrB4oXyx192qeeWCHDcsynPujDTdObW/13mkA3fkfsqBAJ7bGfLzdSW+v6rAQ5uDeMuDl463
-PEjPUghRplwRF+6IR76GOcimFGdPz/LaJVkump1hZqdPvly46kjnoeG1g8Pnod0Fx13Px3eZuXd9
-ib5BE/+Q1y7TQYf7kWKF+w7wmqRbUus8N4gJtoMbMfdSDs5sWrFoYppzpqe5cn6Gk3t8uvOHb97s
-Dxzrdkfcva7Ib14IeHRrwK4BC7hyKZp8PH8q8wVCiEMoF+Gi3fE+15HKq1Cmtnssm5Zm2dQ0p09J
-s3CiT3vm4MALLeweMmzoMzy323Dr00P8cmMpvliH+ILd7zpQG1iM9GXFCvd3wEeSbkk9UGYAzI6D
-l8kPKx9v6ZSip0XT23L4MEZf0bJ9MGKwOOKyTwMqhfJacZ6sRBNCHIPZB9Gew1ccj1gElE0rels9
-JuQOvnAvRpZdBcu+oqUYlM9Dw6ccrx3lt8sF+9H9bx8YrmMlZ+pjcF4rSvsQ7YtXsI08QsuvXmCG
-N2cfZRWgOvCzSns41SIHqRBi9Lx2lM7jwp1gBw58f8QZvBg5NuyO2EB05N+hh3++XDjfi+84I7XE
-jioA1vndOdbuKhAAcsYeBaeykMqi/HYwgzg7dPC8Ahzj0qN8gOo8eFlQ1dnbKYRoHE758T5Xmwcz
-gKJ0+MjXsbpAKhVfrHtdST+dehB059juW8cWYAAJzOOyf3+Z60IR4EwRXAC2yBHvx6BSoHzwWkDF
-JaYkKIUQY6Z0PNeoW4EAbPn84yLAxNtSDv15lQGVxvNSGHI4mQIarb3G8oKfTbGdIvuAnqRbVJeU
-xjG8ORtwBnVIFDq0zE0KISpj+BzkZQ8s1nEWdUgx5ZHnISkbcdy2otjhBYZBM+vi84HFSbeoISh9
-hC+pAyuEqCKl5Dw0vu707lnxnzpY+dEI+FXSrRFCCCFq1B2Dd37UaoDuHE8SrwISQgghxAEDXVlW
-Q3kdlbGsA3Yk3SohhBCixmyPLC/AcGDGK2WfSbpVQgghRI15Op9iJ5QDs//DqgA8nnSrhBBCiBpz
-/7YPqggO3tr6EFDBO6wJIYQQdaXYneOB4b/sD8zODI8AW5NunRBCCFEjtqT9eMEPjAhM49iAzGMK
-IYQQwx62li3Df9kfmP0fVoWU5t+QIhBCCCFElPX5j+H5SzikPG9Lmh8Au5JupRBCCJGwrW1pVo78
-xkGB2ffXahfwfNKtFEIIIRK2bsdfqr0jv3FYRfCcz5qkWymEEEIkKaVZdej3DgtMBw8n3VAhhBAi
-SSnv8Cw8LDCLd614IumGCiGEEEkauvPwLDwsMLM+zwB9STdWCCGESMhOYO2h3zwsMK1jO3Bf0q0V
-QgghEvLzlnL92JEOC8zy/TG/jZTJE0II0XyC7hzfGrzzo4dloHekn057rDOzLp4LLEm65UIIIUQV
-/bO6Z8Xnw7X3HFbERx3tX3Te7Bb2lbgLmJZ064UQQogqeGpKG1dv/Qu18Uj/UR/tX/V9SD0DfCfp
-1gshhBBV8v2jhSW8RGCW/TOwOelnIIQQQlTYZuA/XuoHXjowV6gngR8l/SyEEEKICvtOOfOO6lg9
-TIAvIL1MIYQQjWsz8YjqSzp2YMaJK3OZQgghGtUXj9W7hNH1MCFO3rWj/FkhhBCiXjw1pY1vjuYH
-RxeYcfIes7sqhBBC1BELfPWlVsaO5I3mhwDSHo+aWRe3AcsYfc9UCCGEqEVBzufT/r0rPhWtvSca
-zT9Qo/mhYW03uVx/wNeB1yT9TIUQQogT8OXeFt697YNqVGEJxxmYAF0fd8v2FFkJtCf9bIUQQogx
-2NOZ4fxygZ5RO+6h1T1/rR4Cfpn0sxVCCCHGoiXFvccbljDGuch8iu8m/YSFEEKIsQgt/zmWfzem
-wLQ/X/FTZJuJEEKI+vOUvnvFnWP5h8c9hzls0i3uj7cP8vdAOulnL4QQQoxCEXg7K9S/j+Ufj3l7
-SCHkG8C/JP3shRBCiFH6Ym/L2CvXjbmHCdB2k5vcH/DfwPlJvwpCCCHES1jZmeX3+/5a7RrrLxh1
-4YIjCVZ+dCClWWlnXdwJnHKiv08IIYQYZ8Wcz1f8e1e8f+Arl2w/kV90Qj3MYb23OH/bIH8FfAyp
-AiSEEKI2WOD/sEL93/H4ZeMSbts+qKK2NJ8G/inJV0YIIYQY4XPlbBoX49LDHFae0/wn4NqqvyxC
-CCHEAd/tzPInJzJneahxDUyAzpvd3L4S/0FcpF0IIYSotpVtad7Y/2H14nj+0nEPTABWuCXAT4Gp
-VXhhhBBCiGFbgCtHc0Po41WZBTpxQ2U+UwghRLX9YyXCEiq4ojV334pvIOXzhBBCVM9D3L2iYp21
-iu2bjNbesyfn86No5sV9wAKgrVKPJYQQoqltAT7B3Sv+grs/ekJ7LV9KZeYwDxXPaf4LshBICCHE
-+FoJ/K9KDcOOVJ0iAyvUk50ZXgf8qCqPJ4QQohl8ty3NG6sRllDFqjx9H1LPt6V5J/Bl4uoLQggh
-xFhY4DOdWf5kvLeOvJTqDMmO0HaTy/UHvB/4P8itwYQQQhyfIvB3bWk+3f9hVajmA1c9MGF/7dl/
-At6SxOMLIYSoW19lhXpnEg+cSKH0bR9UUereFSuAXyXx+EIIIerSyux9K25M6sET6WEOK9eeXQG8
-FRmeFUIIcWRF4IudWf7veNaGPV6JBibEc5q5FG/ePshfAnOSbo8QQoiashb4m94WvrPtgypKsiGJ
-B+aw7PIbp+pLVlw5FPIa4OVAe9JtEkIIkYg9LSnuDS3/GaxcsbKSxQiOR80E5khdH3fL9hT5S+DV
-VLAakRBCiJoSAV8DvlCtvZXHoyYDE/ZvP/kE8J6k2yKEEKIqPtvbwgeTHno9mprtvQUrPxqlPX5h
-Zl08BMwGupJukxBCiIp4Crg5e9+KT+798iVB0o05mprtYR4krkX7NuC1wLSkmyOEEGJcbAa+05nh
-H/o+pJ5PujHHUh+BOUyCUwghGsFm4DvAP9fiXOXR1FdgDpPgFEKIerQWuJU6C8ph9RmYZZ03u4V9
-JW4kDs5EqhYJIYQ4Jgv8e2eGFfUw9Ho0NbvoZzSKKz+6M+3xUzPr4qeBDDAJyCbdLiGEEADsBH4G
-fCz9ixWfHvynS7Yl3aATUdc9zJHSl93oa8WkYsTC7PIVpyo4qxAxD5gLdFPnFwdCCFHDDLAN2JDS
-PJ7yeHzozhVPZH2et47twcqP1uQ2kePVMIF5NJ0fd92DAdeFlj8AFgJTkOFbIYQ4UQGwA3gmpfnX
-ziw/3PGXam/Sjaqkhg/MYW03uZynmNVX4kxgGbCUOEAnIoXfhRDiWIrAFmAdcH93jt8Yy1PGsaXa
-96VMStME5qHKATrV05y0q8AS4HzgFKAXaCUOUemJCiGajSXuPQ4QD7M+BjzYnePJtM/qgRI7miUg
-D9W0gXmo9GU3+pnLVvT4mulaMXVXgTlAD7AAmACcRDwPOgMJUiFE/bPAJuJgXAcUgNXAzu4ca61j
-S2R5obRyxc5GmYM8Uf8fZWHNEo08VPwAAAAldEVYdGRhdGU6Y3JlYXRlADIwMjEtMDctMzFUMDA6
-NDk6NTIrMDA6MDA/ywRpAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDIxLTA3LTMxVDAwOjQ5OjUyKzAw
-OjAwTpa81QAAAABJRU5ErkJggg==" />
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="200" height="200" fill="none"><rect width="200" height="200" fill="#3D43D5" rx="25"/><path fill="#fff" d="m38 93.907 29.76 29.006v45.92H38zm125-61.665v125.417c0 8.078-4.498 11.341-11.742 11.341-1.333 0-3.725-.501-5.793-2.502L38 65.328V42.84C38 34.763 41.363 31.5 49.723 31.5c1.333 0 4.01.52 6.06 2.502l77.438 71.923V32.242z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/NocoDbHttpRequest/V1/NocoDbHttpRequestV1.node.ts b/packages/nodes-base/nodes/NocoDbHttpRequest/V1/NocoDbHttpRequestV1.node.ts
index f6d34cb27d04d..ccf0527db2511 100644
--- a/packages/nodes-base/nodes/NocoDbHttpRequest/V1/NocoDbHttpRequestV1.node.ts
+++ b/packages/nodes-base/nodes/NocoDbHttpRequest/V1/NocoDbHttpRequestV1.node.ts
@@ -7,6 +7,7 @@ import type {
 	INodeTypeBaseDescription,
 	INodeTypeDescription,
 	JsonObject,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError, sleep } from 'n8n-workflow';
 
@@ -676,7 +677,7 @@ export class NocoDbHttpRequestV1 implements INodeType {
 
 			requestOptions = {
 				headers: {},
-				method: requestMethod,
+				method: requestMethod as string,
 				uri: url,
 				gzip: true,
 				rejectUnauthorized: !this.getNodeParameter('allowUnauthorizedCerts', itemIndex, false),
@@ -807,7 +808,7 @@ export class NocoDbHttpRequestV1 implements INodeType {
 						try {
 							// @ts-ignore
 							requestOptions[optionData.name] = JSON.parse(
-								requestOptions[optionData.name as OptionsWithUriKeys] as string,
+								requestOptions[optionData.name as keyof OptionsWithUri] as string,
 							);
 						} catch (error) {
 							throw new NodeOperationError(
@@ -840,8 +841,8 @@ export class NocoDbHttpRequestV1 implements INodeType {
 										return newValue;
 									}
 								};
-								requestOptions[optionName][parameterDataName] = computeNewValue(
-									requestOptions[optionName][parameterDataName],
+								requestOptions[optionName!][parameterDataName!] = computeNewValue(
+									requestOptions[optionName!][parameterDataName!],
 								);
 							} else if (optionName === 'headers') {
 								// @ts-ignore
@@ -939,18 +940,18 @@ export class NocoDbHttpRequestV1 implements INodeType {
 			} catch (e) {}
 
 			if (oAuth1Api) {
-				const requestOAuth1 = this.helpers.requestOAuth1.call(this, 'oAuth1Api', requestOptions);
+				const requestOAuth1 = this.helpers.requestOAuth1.call(this, 'oAuth1Api', requestOptions as IRequestOptions);
 				requestOAuth1.catch(() => {});
 				requestPromises.push(requestOAuth1);
 			} else if (oAuth2Api) {
-				const requestOAuth2 = this.helpers.requestOAuth2.call(this, 'oAuth2Api', requestOptions, {
+				const requestOAuth2 = this.helpers.requestOAuth2.call(this, 'oAuth2Api', requestOptions as IRequestOptions, {
 					tokenType: 'Bearer',
 				});
 				requestOAuth2.catch(() => {});
 				requestPromises.push(requestOAuth2);
 			} else {
 				// bearerAuth, queryAuth, headerAuth, digestAuth, none
-				const request = this.helpers.request(requestOptions);
+				const request = this.helpers.request(requestOptions as IRequestOptions);
 				request.catch(() => {});
 				requestPromises.push(request);
 			}
diff --git a/packages/nodes-base/nodes/NocoDbHttpRequest/V2/NocoDbHttpRequestV2.node.ts b/packages/nodes-base/nodes/NocoDbHttpRequest/V2/NocoDbHttpRequestV2.node.ts
index 3e4990b76b778..46340b01b080f 100644
--- a/packages/nodes-base/nodes/NocoDbHttpRequest/V2/NocoDbHttpRequestV2.node.ts
+++ b/packages/nodes-base/nodes/NocoDbHttpRequest/V2/NocoDbHttpRequestV2.node.ts
@@ -6,6 +6,7 @@ import type {
 	INodeTypeBaseDescription,
 	INodeTypeDescription,
 	JsonObject,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError, sleep } from 'n8n-workflow';
 
@@ -878,8 +879,8 @@ export class NocoDbHttpRequestV2 implements INodeType {
 										return newValue;
 									}
 								};
-								requestOptions[optionName][parameterDataName] = computeNewValue(
-									requestOptions[optionName][parameterDataName],
+								requestOptions[optionName!][parameterDataName!] = computeNewValue(
+									requestOptions[optionName!][parameterDataName!],
 								);
 							} else if (optionName === 'headers') {
 								// @ts-ignore
@@ -973,23 +974,23 @@ export class NocoDbHttpRequestV2 implements INodeType {
 			}
 
 			try {
-				this.sendMessageToUI(sanitizeUiMessage(requestOptions, authDataKeys));
+				this.sendMessageToUI(sanitizeUiMessage(requestOptions as OptionsWithUri, authDataKeys));
 			} catch (e) {}
 
 			if (authentication === 'genericCredentialType' || authentication === 'none') {
 				if (oAuth1Api) {
-					const requestOAuth1 = this.helpers.requestOAuth1.call(this, 'oAuth1Api', requestOptions);
+					const requestOAuth1 = this.helpers.requestOAuth1.call(this, 'oAuth1Api', requestOptions as IRequestOptions);
 					requestOAuth1.catch(() => {});
 					requestPromises.push(requestOAuth1);
 				} else if (oAuth2Api) {
-					const requestOAuth2 = this.helpers.requestOAuth2.call(this, 'oAuth2Api', requestOptions, {
+					const requestOAuth2 = this.helpers.requestOAuth2.call(this, 'oAuth2Api', requestOptions as IRequestOptions, {
 						tokenType: 'Bearer',
 					});
 					requestOAuth2.catch(() => {});
 					requestPromises.push(requestOAuth2);
 				} else {
 					// bearerAuth, queryAuth, headerAuth, digestAuth, none
-					const request = this.helpers.request(requestOptions);
+					const request = this.helpers.request(requestOptions as IRequestOptions);
 					request.catch(() => {});
 					requestPromises.push(request);
 				}
@@ -1000,7 +1001,7 @@ export class NocoDbHttpRequestV2 implements INodeType {
 				const requestWithAuthentication = this.helpers.requestWithAuthentication.call(
 					this,
 					nodeCredentialType,
-					requestOptions,
+					requestOptions as IRequestOptions,
 					additionalOAuth2Options && { oauth2: additionalOAuth2Options },
 				);
 				requestWithAuthentication.catch(() => {});
diff --git a/packages/nodes-base/nodes/NocoDbHttpRequest/V3/NocoDbHttpRequestV3.node.ts b/packages/nodes-base/nodes/NocoDbHttpRequest/V3/NocoDbHttpRequestV3.node.ts
index 931660468d7ef..6f58a4d77a94a 100644
--- a/packages/nodes-base/nodes/NocoDbHttpRequest/V3/NocoDbHttpRequestV3.node.ts
+++ b/packages/nodes-base/nodes/NocoDbHttpRequest/V3/NocoDbHttpRequestV3.node.ts
@@ -9,6 +9,7 @@ import type {
 	INodeTypeBaseDescription,
 	INodeTypeDescription,
 	JsonObject,
+	IRequestOptions,
 } from 'n8n-workflow';
 
 import { BINARY_ENCODING, jsonParse, NodeApiError, NodeOperationError, sleep } from 'n8n-workflow';
@@ -859,7 +860,7 @@ export class NocoDbHttpRequestV3 implements INodeType {
 		}
 
 		type RequestOptions = OptionsWithUri & { useStream?: boolean };
-		let requestOptions: RequestOptions = {
+		let requestOptions: OptionsWithUri & { useStream?: boolean } = {
 			uri: '',
 		};
 
@@ -1013,11 +1014,12 @@ export class NocoDbHttpRequestV3 implements INodeType {
 					const binaryData = this.helpers.assertBinaryData(itemIndex, cur.inputDataFieldName);
 					let uploadData: Buffer | Readable;
 					const itemBinaryData = items[itemIndex].binary![cur.inputDataFieldName];
-					if (itemBinaryData.id) {
-						uploadData = this.helpers.getBinaryStream(itemBinaryData.id);
-					} else {
-						uploadData = Buffer.from(itemBinaryData.data, BINARY_ENCODING);
-					}
+					// if (itemBinaryData.id) {
+					// 	uploadData = this.helpers.getBinaryStream(itemBinaryData.id);
+					// } else {
+					// 	uploadData = Buffer.from(itemBinaryData.data, BINARY_ENCODING);
+					// }
+					uploadData = Buffer.from(itemBinaryData.data, BINARY_ENCODING);
 
 					accumulator[cur.name] = {
 						value: uploadData,
@@ -1086,7 +1088,7 @@ export class NocoDbHttpRequestV3 implements INodeType {
 					const itemBinaryData = this.helpers.assertBinaryData(itemIndex, inputDataFieldName);
 
 					if (itemBinaryData.id) {
-						uploadData = this.helpers.getBinaryStream(itemBinaryData.id);
+						uploadData = await this.helpers.getBinaryStream(itemBinaryData.id);
 						const metadata = await this.helpers.getBinaryMetadata(itemBinaryData.id);
 						contentLength = metadata.fileSize;
 					} else {
@@ -1220,18 +1222,18 @@ export class NocoDbHttpRequestV3 implements INodeType {
 				authentication === 'none'
 			) {
 				if (oAuth1Api) {
-					const requestOAuth1 = this.helpers.requestOAuth1.call(this, 'oAuth1Api', requestOptions);
+					const requestOAuth1 = this.helpers.requestOAuth1.call(this, 'oAuth1Api', requestOptions as IRequestOptions);
 					requestOAuth1.catch(() => {});
 					requestPromises.push(requestOAuth1);
 				} else if (oAuth2Api) {
-					const requestOAuth2 = this.helpers.requestOAuth2.call(this, 'oAuth2Api', requestOptions, {
+					const requestOAuth2 = this.helpers.requestOAuth2.call(this, 'oAuth2Api', requestOptions as IRequestOptions, {
 						tokenType: 'Bearer',
 					});
 					requestOAuth2.catch(() => {});
 					requestPromises.push(requestOAuth2);
 				} else {
 					// bearerAuth, queryAuth, headerAuth, digestAuth, none
-					const request = this.helpers.request(requestOptions);
+					const request = this.helpers.request(requestOptions as IRequestOptions);
 					request.catch(() => {});
 					requestPromises.push(request);
 				}
@@ -1243,7 +1245,7 @@ export class NocoDbHttpRequestV3 implements INodeType {
 				const requestWithAuthentication = this.helpers.requestWithAuthentication.call(
 					this,
 					nodeCredentialType,
-					requestOptions,
+					requestOptions as IRequestOptions,
 					additionalOAuth2Options && { oauth2: additionalOAuth2Options },
 				);
 				requestWithAuthentication.catch(() => {});
diff --git a/packages/nodes-base/nodes/Notion/BlockDescription.ts b/packages/nodes-base/nodes/Notion/BlockDescription.ts
deleted file mode 100644
index 38174dd9ee01e..0000000000000
--- a/packages/nodes-base/nodes/Notion/BlockDescription.ts
+++ /dev/null
@@ -1,190 +0,0 @@
-import type { INodeProperties } from 'n8n-workflow';
-
-import { blocks } from './Blocks';
-
-export const blockOperations: INodeProperties[] = [
-	{
-		displayName: 'Operation',
-		name: 'operation',
-		type: 'options',
-		noDataExpression: true,
-		displayOptions: {
-			show: {
-				resource: ['block'],
-			},
-		},
-		options: [
-			{
-				name: 'Append After',
-				value: 'append',
-				description: 'Append a block',
-				action: 'Append a block',
-			},
-			{
-				// eslint-disable-next-line n8n-nodes-base/node-param-option-name-wrong-for-get-many
-				name: 'Get Child Blocks',
-				value: 'getAll',
-				description: 'Get many child blocks',
-				action: 'Get many child blocks',
-			},
-		],
-		default: 'append',
-	},
-];
-
-export const blockFields: INodeProperties[] = [
-	/* -------------------------------------------------------------------------- */
-	/*                                block:append                                 */
-	/* -------------------------------------------------------------------------- */
-	{
-		displayName: 'Block',
-		name: 'blockId',
-		type: 'resourceLocator',
-		default: { mode: 'url', value: '' },
-		required: true,
-		modes: [
-			{
-				displayName: 'Link',
-				name: 'url',
-				type: 'string',
-				placeholder: 'https://www.notion.so/My-Page-b4eeb113e118403ba450af65ac25f0b9',
-				validation: [
-					{
-						type: 'regex',
-						properties: {
-							regex:
-								'(?:https|http)://www.notion.so/(?:[a-z0-9-]{2,}/)?(?:[a-zA-Z0-9-]{2,}-)?([0-9a-f]{8}[0-9a-f]{4}4[0-9a-f]{3}[89ab][0-9a-f]{3}[0-9a-f]{12}).*',
-							errorMessage: 'Not a valid Notion Block URL',
-						},
-					},
-				],
-				extractValue: {
-					type: 'regex',
-					regex:
-						'(?:https|http)://www.notion.so/(?:[a-z0-9-]{2,}/)?(?:[a-zA-Z0-9-]{2,}-)?([0-9a-f]{8}[0-9a-f]{4}4[0-9a-f]{3}[89ab][0-9a-f]{3}[0-9a-f]{12})',
-				},
-			},
-			{
-				displayName: 'ID',
-				name: 'id',
-				type: 'string',
-				placeholder: 'ab1545b247fb49fa92d6f4b49f4d8116',
-				validation: [
-					{
-						type: 'regex',
-						properties: {
-							regex:
-								'^(([0-9a-f]{8}[0-9a-f]{4}4[0-9a-f]{3}[89ab][0-9a-f]{3}[0-9a-f]{12})|([0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}))[ \t]*',
-							errorMessage: 'Not a valid Notion Block ID',
-						},
-					},
-				],
-				extractValue: {
-					type: 'regex',
-					regex: '^([0-9a-f]{8}-?[0-9a-f]{4}-?4[0-9a-f]{3}-?[89ab][0-9a-f]{3}-?[0-9a-f]{12})',
-				},
-				url: '=https://www.notion.so/{{$value.replace(/-/g, "")}}',
-			},
-		],
-		displayOptions: {
-			show: {
-				resource: ['block'],
-				operation: ['append'],
-			},
-		},
-		description: 'The Notion Block to append blocks to',
-	},
-	...blocks('block', 'append'),
-	/* -------------------------------------------------------------------------- */
-	/*                                block:getAll                                */
-	/* -------------------------------------------------------------------------- */
-	{
-		displayName: 'Block',
-		name: 'blockId',
-		type: 'resourceLocator',
-		default: { mode: 'url', value: '' },
-		required: true,
-		modes: [
-			{
-				displayName: 'Link',
-				name: 'url',
-				type: 'string',
-				placeholder: 'https://www.notion.so/My-Page-b4eeb113e118403ba450af65ac25f0b9',
-				validation: [
-					{
-						type: 'regex',
-						properties: {
-							regex:
-								'(?:https|http)://www.notion.so/(?:[a-z0-9-]{2,}/)?(?:[a-zA-Z0-9-]{2,}-)?([0-9a-f]{8}[0-9a-f]{4}4[0-9a-f]{3}[89ab][0-9a-f]{3}[0-9a-f]{12}).*',
-							errorMessage: 'Not a valid Notion Block URL',
-						},
-					},
-				],
-				extractValue: {
-					type: 'regex',
-					regex:
-						'(?:https|http)://www.notion.so/(?:[a-z0-9-]{2,}/)?(?:[a-zA-Z0-9-]{2,}-)?([0-9a-f]{8}[0-9a-f]{4}4[0-9a-f]{3}[89ab][0-9a-f]{3}[0-9a-f]{12})',
-				},
-			},
-			{
-				displayName: 'ID',
-				name: 'id',
-				type: 'string',
-				placeholder: 'ab1545b247fb49fa92d6f4b49f4d8116',
-				validation: [
-					{
-						type: 'regex',
-						properties: {
-							regex:
-								'^(([0-9a-f]{8}[0-9a-f]{4}4[0-9a-f]{3}[89ab][0-9a-f]{3}[0-9a-f]{12})|([0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}))[ \t]*',
-							errorMessage: 'Not a valid Notion Block ID',
-						},
-					},
-				],
-				extractValue: {
-					type: 'regex',
-					regex: '^([0-9a-f]{8}-?[0-9a-f]{4}-?4[0-9a-f]{3}-?[89ab][0-9a-f]{3}-?[0-9a-f]{12})',
-				},
-				url: '=https://www.notion.so/{{$value.replace(/-/g, "")}}',
-			},
-		],
-		displayOptions: {
-			show: {
-				resource: ['block'],
-				operation: ['getAll'],
-			},
-		},
-		description: 'The Notion Block to get all children from',
-	},
-	{
-		displayName: 'Return All',
-		name: 'returnAll',
-		type: 'boolean',
-		displayOptions: {
-			show: {
-				resource: ['block'],
-				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: ['block'],
-				operation: ['getAll'],
-				returnAll: [false],
-			},
-		},
-		typeOptions: {
-			minValue: 1,
-			maxValue: 100,
-		},
-		default: 50,
-		description: 'Max number of results to return',
-	},
-];
diff --git a/packages/nodes-base/nodes/Notion/GenericFunctions.ts b/packages/nodes-base/nodes/Notion/GenericFunctions.ts
deleted file mode 100644
index e41a32cc81f10..0000000000000
--- a/packages/nodes-base/nodes/Notion/GenericFunctions.ts
+++ /dev/null
@@ -1,1014 +0,0 @@
-import type { OptionsWithUri } from 'request';
-
-import type {
-	IBinaryKeyData,
-	IDataObject,
-	IDisplayOptions,
-	IExecuteFunctions,
-	IExecuteSingleFunctions,
-	IHookFunctions,
-	ILoadOptionsFunctions,
-	INodeExecutionData,
-	INodeProperties,
-	IPollFunctions,
-	JsonObject,
-} from 'n8n-workflow';
-import { NodeApiError, NodeOperationError } from 'n8n-workflow';
-
-import { camelCase, capitalCase, snakeCase } from 'change-case';
-
-import { filters } from './Filters';
-
-import moment from 'moment-timezone';
-
-import { validate as uuidValidate } from 'uuid';
-
-function uuidValidateWithoutDashes(this: IExecuteFunctions, value: string) {
-	if (uuidValidate(value)) return true;
-	if (value.length == 32) {
-		//prettier-ignore
-		const strWithDashes = `${value.slice(0, 8)}-${value.slice(8, 12)}-${value.slice(12, 16)}-${value.slice(16, 20)}-${value.slice(20)}`;
-		if (uuidValidate(strWithDashes)) return true;
-	}
-	throw new NodeOperationError(
-		this.getNode(),
-		`The relation id "${value}" is not a valid uuid with optional dashes.`,
-	);
-}
-
-export type SortData = { key: string; type: string; direction: string; timestamp: boolean };
-
-const apiVersion: { [key: number]: string } = {
-	1: '2021-05-13',
-	2: '2021-08-16',
-};
-
-export async function notionApiRequest(
-	this:
-		| IHookFunctions
-		| IExecuteFunctions
-		| IExecuteSingleFunctions
-		| ILoadOptionsFunctions
-		| IPollFunctions,
-	method: string,
-	resource: string,
-
-	body: any = {},
-	qs: IDataObject = {},
-	uri?: string,
-	option: IDataObject = {},
-): Promise<any> {
-	try {
-		let options: OptionsWithUri = {
-			headers: {
-				'Notion-Version': apiVersion[this.getNode().typeVersion],
-			},
-			method,
-			qs,
-			body,
-			uri: uri || `https://api.notion.com/v1${resource}`,
-			json: true,
-		};
-		options = Object.assign({}, options, option);
-		if (Object.keys(body as IDataObject).length === 0) {
-			delete options.body;
-		}
-		if (!uri) {
-			return await this.helpers.requestWithAuthentication.call(this, 'notionApi', options);
-		}
-		return await this.helpers.request(options);
-	} catch (error) {
-		throw new NodeApiError(this.getNode(), error as JsonObject);
-	}
-}
-
-export async function notionApiRequestAllItems(
-	this: IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions,
-	propertyName: string,
-	method: string,
-	endpoint: string,
-
-	body: any = {},
-	query: IDataObject = {},
-): Promise<any> {
-	const resource = this.getNodeParameter('resource', 0);
-
-	const returnData: IDataObject[] = [];
-
-	let responseData;
-
-	do {
-		responseData = await notionApiRequest.call(this, method, endpoint, body, query);
-		const { next_cursor } = responseData;
-		if (resource === 'block' || resource === 'user') {
-			query.start_cursor = next_cursor;
-		} else {
-			body.start_cursor = next_cursor;
-		}
-		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
-		const limit = query.limit as number | undefined;
-		if (limit && limit <= returnData.length) {
-			return returnData;
-		}
-	} while (responseData.has_more !== false);
-
-	return returnData;
-}
-
-export function getBlockTypes() {
-	return [
-		{
-			name: 'Paragraph',
-			value: 'paragraph',
-		},
-		{
-			name: 'Heading 1',
-			value: 'heading_1',
-		},
-		{
-			name: 'Heading 2',
-			value: 'heading_2',
-		},
-		{
-			name: 'Heading 3',
-			value: 'heading_3',
-		},
-		{
-			name: 'Toggle',
-			value: 'toggle',
-		},
-		{
-			name: 'To-Do',
-			value: 'to_do',
-		},
-		// {
-		// 	name: 'Child Page',
-		// 	value: 'child_page',
-		// },
-		{
-			name: 'Bulleted List Item',
-			value: 'bulleted_list_item',
-		},
-		{
-			name: 'Numbered List Item',
-			value: 'numbered_list_item',
-		},
-		{
-			name: 'Image',
-			value: 'image',
-		},
-	];
-}
-
-function textContent(content: string) {
-	return {
-		text: {
-			content,
-		},
-	};
-}
-
-export function formatTitle(content: string) {
-	return {
-		title: [textContent(content)],
-	};
-}
-
-export function formatText(content: string) {
-	return {
-		text: [textContent(content)],
-	};
-}
-
-function getLink(text: { textLink: string; isLink: boolean }) {
-	if (text.isLink && text.textLink !== '') {
-		return {
-			link: {
-				url: text.textLink,
-			},
-		};
-	}
-	return {};
-}
-
-type TextData = {
-	textType: string;
-	text: string;
-	isLink: boolean;
-	range: boolean;
-	textLink: string;
-	mentionType: string;
-	dateStart: string;
-	dateEnd: string;
-	date: string;
-	annotationUi: IDataObject;
-	expression: string;
-};
-function getTexts(texts: TextData[]) {
-	const results = [];
-	for (const text of texts) {
-		if (text.textType === 'text') {
-			results.push({
-				type: 'text',
-				text: {
-					content: text.text,
-					...getLink(text),
-				},
-				annotations: text.annotationUi,
-			});
-		} else if (text.textType === 'mention') {
-			if (text.mentionType === 'date') {
-				results.push({
-					type: 'mention',
-					mention: {
-						type: text.mentionType,
-						[text.mentionType]: text.range
-							? { start: text.dateStart, end: text.dateEnd }
-							: { start: text.date, end: null },
-					},
-					annotations: text.annotationUi,
-				});
-			} else {
-				results.push({
-					type: 'mention',
-					mention: {
-						type: text.mentionType,
-						//@ts-expect-error any
-						[text.mentionType]: { id: text[text.mentionType] as string },
-					},
-					annotations: text.annotationUi,
-				});
-			}
-		} else if (text.textType === 'equation') {
-			results.push({
-				type: 'equation',
-				equation: {
-					expression: text.expression,
-				},
-				annotations: text.annotationUi,
-			});
-		}
-	}
-	return results;
-}
-
-function getTextBlocks(block: IDataObject) {
-	return {
-		text:
-			block.richText === false
-				? formatText(block.textContent as string).text
-				: getTexts(((block.text as IDataObject).text as TextData[]) || []),
-	};
-}
-
-export function formatBlocks(blocks: IDataObject[]) {
-	const results = [];
-	for (const block of blocks) {
-		results.push({
-			object: 'block',
-			type: block.type,
-			[block.type as string]: {
-				...(block.type === 'to_do' ? { checked: block.checked } : {}),
-				...(block.type === 'image' ? { type: 'external', external: { url: block.url } } : {}),
-				// prettier-ignore,
-				...(!['to_do', 'image'].includes(block.type as string) ? getTextBlocks(block) : {}),
-			},
-		});
-	}
-	return results;
-}
-
-function getDateFormat(includeTime: boolean) {
-	if (!includeTime) {
-		return 'yyyy-MM-DD';
-	}
-	return '';
-}
-
-function getPropertyKeyValue(
-	this: IExecuteFunctions,
-	value: any,
-	type: string,
-	timezone: string,
-	version = 1,
-) {
-	const ignoreIfEmpty = <T>(v: T, cb: (v: T) => any) =>
-		!v && value.ignoreIfEmpty ? undefined : cb(v);
-	let result: IDataObject = {};
-
-	switch (type) {
-		case 'rich_text':
-			if (value.richText === false) {
-				result = { rich_text: [{ text: { content: value.textContent } }] };
-			} else {
-				result = { rich_text: getTexts(value.text.text as TextData[]) };
-			}
-			break;
-		case 'title':
-			result = { title: [{ text: { content: value.title } }] };
-			break;
-		case 'number':
-			result = { type: 'number', number: value.numberValue };
-			break;
-		case 'url':
-			result = ignoreIfEmpty(value.urlValue, (url) => ({ type: 'url', url }));
-			break;
-		case 'checkbox':
-			result = { type: 'checkbox', checkbox: value.checkboxValue };
-			break;
-		case 'relation':
-			result = {
-				type: 'relation',
-				relation: value.relationValue
-					.filter((relation: IDataObject) => {
-						return relation && typeof relation === 'string';
-					})
-					.reduce((acc: string[], cur: string) => {
-						return acc.concat(cur.split(',').map((relation: string) => relation.trim()));
-					}, [])
-					.filter((relation: string) => {
-						return uuidValidateWithoutDashes.call(this, relation);
-					})
-					.map((relation: string) => ({ id: relation })),
-			};
-			break;
-		case 'multi_select':
-			const multiSelectValue = value.multiSelectValue;
-			result = {
-				type: 'multi_select',
-				multi_select: (Array.isArray(multiSelectValue)
-					? multiSelectValue
-					: multiSelectValue.split(',').map((v: string) => v.trim())
-				)
-					.filter((entry: any) => entry !== null)
-					.map((option: string) => (!uuidValidate(option) ? { name: option } : { id: option })),
-			};
-			break;
-		case 'email':
-			result = {
-				type: 'email',
-				email: value.emailValue,
-			};
-			break;
-		case 'people':
-			//if expression it's a single value, make it an array
-			if (!Array.isArray(value.peopleValue)) {
-				value.peopleValue = [value.peopleValue];
-			}
-
-			result = {
-				type: 'people',
-				people: value.peopleValue.map((option: string) => ({ id: option })),
-			};
-			break;
-		case 'phone_number':
-			result = {
-				type: 'phone_number',
-				phone_number: value.phoneValue,
-			};
-			break;
-		case 'select':
-			result = {
-				type: 'select',
-				select: version === 1 ? { id: value.selectValue } : { name: value.selectValue },
-			};
-			break;
-		case 'status':
-			result = {
-				type: 'status',
-				status: { name: value.statusValue },
-			};
-			break;
-		case 'date':
-			const format = getDateFormat(value.includeTime as boolean);
-			const timezoneValue = value.timezone === 'default' ? timezone : value.timezone;
-			if (value.range === true) {
-				result = {
-					type: 'date',
-					date: {
-						start: moment.tz(value.dateStart as number, timezoneValue as string).format(format),
-						end: moment.tz(value.dateEnd as number, timezoneValue as string).format(format),
-					},
-				};
-			} else {
-				result = {
-					type: 'date',
-					date: {
-						start: moment.tz(value.date as number, timezoneValue as string).format(format),
-						end: null,
-					},
-				};
-			}
-
-			//if the date was left empty, set it to null so it resets the value in notion
-			if (value.date === '' || (value.dateStart === '' && value.dateEnd === '')) {
-				result.date = null;
-			}
-
-			break;
-		case 'files':
-			result = {
-				type: 'files',
-				files: value.fileUrls.fileUrl.map((file: { name: string; url: string }) => ({
-					name: file.name,
-					type: 'external',
-					external: { url: file.url },
-				})),
-			};
-			break;
-		default:
-	}
-	return result;
-}
-
-function getNameAndType(key: string) {
-	const [name, type] = key.split('|');
-	return {
-		name,
-		type,
-	};
-}
-
-export function mapProperties(
-	this: IExecuteFunctions,
-	properties: IDataObject[],
-	timezone: string,
-	version = 1,
-) {
-	return properties
-		.filter(
-			(property): property is Record<string, { key: string; [k: string]: any }> =>
-				typeof property.key === 'string',
-		)
-		.map(
-			(property) =>
-				[
-					`${property.key.split('|')[0]}`,
-					getPropertyKeyValue.call(
-						this,
-						property,
-						property.key.split('|')[1] as string,
-						timezone,
-						version,
-					),
-				] as const,
-		)
-		.filter(([, value]) => value)
-		.reduce(
-			(obj, [key, value]) =>
-				Object.assign(obj, {
-					[key]: value,
-				}),
-			{},
-		);
-}
-
-export function mapSorting(data: SortData[]) {
-	return data.map((sort) => {
-		return {
-			direction: sort.direction,
-			[sort.timestamp ? 'timestamp' : 'property']: sort.key.split('|')[0],
-		};
-	});
-}
-
-export function mapFilters(filtersList: IDataObject[], timezone: string) {
-	return filtersList.reduce((obj, value: { [key: string]: any }) => {
-		let key = getNameAndType(value.key as string).type;
-
-		let valuePropertyName =
-			key === 'last_edited_time' ? value[camelCase(key)] : value[`${camelCase(key)}Value`];
-
-		if (['is_empty', 'is_not_empty'].includes(value.condition as string)) {
-			valuePropertyName = true;
-		} else if (
-			['past_week', 'past_month', 'past_year', 'next_week', 'next_month', 'next_year'].includes(
-				value.condition as string,
-			)
-		) {
-			valuePropertyName = {};
-		}
-		if (key === 'rich_text' || key === 'text') {
-			key = 'text';
-		} else if (key === 'phone_number') {
-			key = 'phone';
-		} else if (
-			key === 'date' &&
-			!['is_empty', 'is_not_empty'].includes(value.condition as string)
-		) {
-			valuePropertyName = value.date === '' ? {} : moment.tz(value.date, timezone).utc().format();
-		} else if (key === 'boolean') {
-			key = 'checkbox';
-		}
-
-		if (value.type === 'formula') {
-			const vpropertyName = value[`${camelCase(value.returnType as string)}Value`];
-
-			return Object.assign(obj, {
-				['property']: getNameAndType(value.key as string).name,
-				[key]: { [value.returnType]: { [`${value.condition}`]: vpropertyName } },
-			});
-		}
-
-		return Object.assign(obj, {
-			['property']: getNameAndType(value.key as string).name,
-			[key]: { [`${value.condition}`]: valuePropertyName },
-		});
-	}, {});
-}
-
-function simplifyProperty(property: any) {
-	let result: any;
-	const type = (property as IDataObject).type as string;
-	if (['text'].includes(property.type as string)) {
-		result = property.plain_text;
-	} else if (['rich_text', 'title'].includes(property.type as string)) {
-		if (Array.isArray(property[type]) && property[type].length !== 0) {
-			result = property[type].map((text: any) => simplifyProperty(text) as string).join('');
-		} else {
-			result = '';
-		}
-	} else if (
-		[
-			'url',
-			'created_time',
-			'checkbox',
-			'number',
-			'last_edited_time',
-			'email',
-			'phone_number',
-			'date',
-		].includes(property.type as string)
-	) {
-		result = property[type];
-	} else if (['created_by', 'last_edited_by', 'select'].includes(property.type as string)) {
-		result = property[type] ? property[type].name : null;
-	} else if (['people'].includes(property.type as string)) {
-		if (Array.isArray(property[type])) {
-			result = property[type].map((person: any) => person.person?.email || {});
-		} else {
-			result = property[type];
-		}
-	} else if (['multi_select'].includes(property.type as string)) {
-		if (Array.isArray(property[type])) {
-			result = property[type].map((e: IDataObject) => e.name || {});
-		} else {
-			result = property[type].options.map((e: IDataObject) => e.name || {});
-		}
-	} else if (['relation'].includes(property.type as string)) {
-		if (Array.isArray(property[type])) {
-			result = property[type].map((e: IDataObject) => e.id || {});
-		} else {
-			result = property[type].database_id;
-		}
-	} else if (['formula'].includes(property.type as string)) {
-		result = property[type][property[type].type];
-	} else if (['rollup'].includes(property.type as string)) {
-		const rollupFunction = property[type].function as string;
-		if (rollupFunction.startsWith('count') || rollupFunction.includes('empty')) {
-			result = property[type].number;
-			if (rollupFunction.includes('percent')) {
-				result = result * 100;
-			}
-		} else if (rollupFunction.startsWith('show') && property[type].type === 'array') {
-			const elements = property[type].array.map(simplifyProperty).flat();
-			result = rollupFunction === 'show_unique' ? [...new Set(elements as string)] : elements;
-		}
-	} else if (['files'].includes(property.type as string)) {
-		result = property[type].map(
-			(file: { type: string; [key: string]: any }) => file[file.type].url,
-		);
-	} else if (['status'].includes(property.type as string)) {
-		result = property[type].name;
-	}
-	return result;
-}
-
-export function simplifyProperties(properties: any) {
-	const results: any = {};
-	for (const key of Object.keys(properties as IDataObject)) {
-		results[`${key}`] = simplifyProperty(properties[key]);
-	}
-	return results;
-}
-
-export function getPropertyTitle(properties: { [key: string]: any }) {
-	return (
-		Object.values(properties).filter((property) => property.type === 'title')[0].title[0]
-			?.plain_text || ''
-	);
-}
-
-function prepend(stringKey: string, properties: { [key: string]: any }) {
-	for (const key of Object.keys(properties)) {
-		properties[`${stringKey}_${snakeCase(key)}`] = properties[key];
-		delete properties[key];
-	}
-	return properties;
-}
-
-export function simplifyObjects(objects: any, download = false, version = 2) {
-	if (!Array.isArray(objects)) {
-		objects = [objects];
-	}
-	const results: IDataObject[] = [];
-	for (const { object, id, properties, parent, title, json, binary, url } of objects) {
-		if (object === 'page' && (parent.type === 'page_id' || parent.type === 'workspace')) {
-			results.push({
-				id,
-				name: properties.title.title[0].plain_text,
-				...(version === 2 ? { url } : {}),
-			});
-		} else if (object === 'page' && parent.type === 'database_id') {
-			results.push({
-				id,
-				...(version === 2 ? { name: getPropertyTitle(properties as IDataObject) } : {}),
-				...(version === 2 ? { url } : {}),
-				...(version === 2
-					? { ...prepend('property', simplifyProperties(properties) as IDataObject) }
-					: { ...simplifyProperties(properties) }),
-			} as IDataObject);
-		} else if (download && json.object === 'page' && json.parent.type === 'database_id') {
-			results.push({
-				json: {
-					id: json.id,
-					...(version === 2 ? { name: getPropertyTitle(json.properties as IDataObject) } : {}),
-					...(version === 2 ? { url: json.url } : {}),
-					...(version === 2
-						? { ...prepend('property', simplifyProperties(json.properties) as IDataObject) }
-						: { ...simplifyProperties(json.properties) }),
-				},
-				binary,
-			});
-		} else if (object === 'database') {
-			results.push({
-				id,
-				...(version === 2
-					? { name: title[0]?.plain_text || '' }
-					: { title: title[0]?.plain_text || '' }),
-				...(version === 2 ? { url } : {}),
-			});
-		}
-	}
-	return results;
-}
-
-export function getFormattedChildren(children: IDataObject[]) {
-	const results: IDataObject[] = [];
-	for (const child of children) {
-		const type = child.type;
-		results.push({ [`${type}`]: child, object: 'block', type });
-	}
-	return results;
-}
-
-export function getConditions() {
-	const elements: INodeProperties[] = [];
-
-	const types: { [key: string]: string } = {
-		title: 'rich_text',
-		rich_text: 'rich_text',
-		number: 'number',
-		checkbox: 'checkbox',
-		select: 'select',
-		multi_select: 'multi_select',
-		status: 'status',
-		date: 'date',
-		people: 'people',
-		files: 'files',
-		url: 'rich_text',
-		email: 'rich_text',
-		phone_number: 'rich_text',
-		relation: 'relation',
-		//formula: 'formula',
-		created_by: 'people',
-		created_time: 'date',
-		last_edited_by: 'people',
-		last_edited_time: 'date',
-	};
-
-	const typeConditions: { [key: string]: string[] } = {
-		rich_text: [
-			'equals',
-			'does_not_equal',
-			'contains',
-			'does_not_contain',
-			'starts_with',
-			'ends_with',
-			'is_empty',
-			'is_not_empty',
-		],
-		number: [
-			'equals',
-			'does_not_equal',
-			'grater_than',
-			'less_than',
-			'greater_than_or_equal_to',
-			'less_than_or_equal_to',
-			'is_empty',
-			'is_not_empty',
-		],
-		checkbox: ['equals', 'does_not_equal'],
-		select: ['equals', 'does_not_equal', 'is_empty', 'is_not_empty'],
-		multi_select: ['contains', 'does_not_equal', 'is_empty', 'is_not_empty'],
-		status: ['equals', 'does_not_equal'],
-		date: [
-			'equals',
-			'before',
-			'after',
-			'on_or_before',
-			'is_empty',
-			'is_not_empty',
-			'on_or_after',
-			'past_week',
-			'past_month',
-			'past_year',
-			'next_week',
-			'next_month',
-			'next_year',
-		],
-		people: ['contains', 'does_not_contain', 'is_empty', 'is_not_empty'],
-		files: ['is_empty', 'is_not_empty'],
-		relation: ['contains', 'does_not_contain', 'is_empty', 'is_not_empty'],
-	};
-
-	const formula: { [key: string]: string[] } = {
-		text: [...typeConditions.rich_text],
-		checkbox: [...typeConditions.checkbox],
-		number: [...typeConditions.number],
-		date: [...typeConditions.date],
-	};
-
-	for (const type of Object.keys(types)) {
-		elements.push({
-			displayName: 'Condition',
-			name: 'condition',
-			type: 'options',
-			displayOptions: {
-				show: {
-					type: [type],
-				},
-			} as IDisplayOptions,
-			options: typeConditions[types[type]].map((entry: string) => ({
-				name: capitalCase(entry),
-				value: entry,
-			})),
-			default: '',
-			description: 'The value of the property to filter by',
-		} as INodeProperties);
-	}
-
-	elements.push({
-		displayName: 'Return Type',
-		name: 'returnType',
-		type: 'options',
-		displayOptions: {
-			show: {
-				type: ['formula'],
-			},
-		} as IDisplayOptions,
-		options: Object.keys(formula).map((key: string) => ({ name: capitalCase(key), value: key })),
-		default: '',
-		description: 'The formula return type',
-	} as INodeProperties);
-
-	for (const key of Object.keys(formula)) {
-		elements.push({
-			displayName: 'Condition',
-			name: 'condition',
-			type: 'options',
-			displayOptions: {
-				show: {
-					type: ['formula'],
-					returnType: [key],
-				},
-			} as IDisplayOptions,
-			options: formula[key].map((entry: string) => ({ name: capitalCase(entry), value: entry })),
-			default: '',
-			description: 'The value of the property to filter by',
-		} as INodeProperties);
-	}
-
-	return elements;
-}
-
-export type FileRecord = {
-	properties: {
-		[key: string]:
-			| any
-			| {
-					id: string;
-					type: string;
-					files: [{ external: { url: string } } | { file: { url: string } }];
-			  };
-	};
-};
-// prettier-ignore
-export async function downloadFiles(this: IExecuteFunctions | IPollFunctions, records: FileRecord[]): Promise<INodeExecutionData[]> {
-
-	const elements: INodeExecutionData[] = [];
-	for (const record of records) {
-		const element: INodeExecutionData = { json: {}, binary: {} };
-		element.json = record as unknown as IDataObject;
-		for (const key of Object.keys(record.properties)) {
-			if (record.properties[key].type === 'files') {
-				if (record.properties[key].files.length) {
-					for (const [index, file] of record.properties[key].files.entries()) {
-						const data = await notionApiRequest.call(
-							this,
-							'GET',
-							'',
-							{},
-							{},
-							file?.file?.url as string || file?.external?.url as string,
-							{ json: false, encoding: null },
-						);
-						element.binary![`${key}_${index}`] = await this.helpers.prepareBinaryData(data as Buffer);
-					}
-				}
-			}
-		}
-		if (Object.keys(element.binary as IBinaryKeyData).length === 0) {
-			delete element.binary;
-		}
-		elements.push(element);
-	}
-	return elements;
-}
-
-export function extractPageId(page: string) {
-	if (page.includes('p=')) {
-		return page.split('p=')[1];
-	} else if (page.includes('-') && page.includes('https')) {
-		return page.split('-')[page.split('-').length - 1];
-	}
-	return page;
-}
-
-export function extractDatabaseId(database: string) {
-	if (database.includes('?v=')) {
-		const data = database.split('?v=')[0].split('/');
-		const index = data.length - 1;
-		return data[index];
-	} else if (database.includes('/')) {
-		const index = database.split('/').length - 1;
-		return database.split('/')[index];
-	} else {
-		return database;
-	}
-}
-
-export function getSearchFilters(resource: string) {
-	return [
-		{
-			displayName: 'Filter',
-			name: 'filterType',
-			type: 'options',
-			options: [
-				{
-					name: 'None',
-					value: 'none',
-				},
-				{
-					name: 'Build Manually',
-					value: 'manual',
-				},
-				{
-					name: 'JSON',
-					value: 'json',
-				},
-			],
-			displayOptions: {
-				show: {
-					version: [2],
-					resource: [resource],
-					operation: ['getAll'],
-				},
-			},
-			default: 'none',
-		},
-		{
-			displayName: 'Must Match',
-			name: 'matchType',
-			type: 'options',
-			options: [
-				{
-					name: 'Any filter',
-					value: 'anyFilter',
-				},
-				{
-					name: 'All Filters',
-					value: 'allFilters',
-				},
-			],
-			displayOptions: {
-				show: {
-					version: [2],
-					resource: [resource],
-					operation: ['getAll'],
-					filterType: ['manual'],
-				},
-			},
-			default: 'anyFilter',
-		},
-		{
-			displayName: 'Filters',
-			name: 'filters',
-			type: 'fixedCollection',
-			typeOptions: {
-				multipleValues: true,
-			},
-			displayOptions: {
-				show: {
-					version: [2],
-					resource: [resource],
-					operation: ['getAll'],
-					filterType: ['manual'],
-				},
-			},
-			default: {},
-			placeholder: 'Add Condition',
-			options: [
-				{
-					displayName: 'Conditions',
-					name: 'conditions',
-					values: [...filters(getConditions())],
-				},
-			],
-		},
-		{
-			displayName:
-				'See <a href="https://developers.notion.com/reference/post-database-query#post-database-query-filter" target="_blank">Notion guide</a> to creating filters',
-			name: 'jsonNotice',
-			type: 'notice',
-			displayOptions: {
-				show: {
-					version: [2],
-					resource: [resource],
-					operation: ['getAll'],
-					filterType: ['json'],
-				},
-			},
-			default: '',
-		},
-		{
-			displayName: 'Filters (JSON)',
-			name: 'filterJson',
-			type: 'string',
-			displayOptions: {
-				show: {
-					version: [2],
-					resource: [resource],
-					operation: ['getAll'],
-					filterType: ['json'],
-				},
-			},
-			default: '',
-		},
-	];
-}
-
-export function validateJSON(json: string | undefined): any {
-	let result;
-	try {
-		result = JSON.parse(json!);
-	} catch (exception) {
-		result = undefined;
-	}
-	return result;
-}
-
-/**
- * Manually extract a richtext's database mention RLC parameter.
- * @param blockValues the blockUi.blockValues node parameter.
- */
-export function extractDatabaseMentionRLC(blockValues: IDataObject[]) {
-	blockValues.forEach((bv) => {
-		if (bv.richText && bv.text) {
-			const texts = (
-				bv.text as {
-					text: [
-						{
-							textType: string;
-							mentionType: string;
-							database: string | { value: string; mode: string; __rl: boolean; __regex: string };
-						},
-					];
-				}
-			).text;
-			texts.forEach((txt) => {
-				if (txt.textType === 'mention' && txt.mentionType === 'database') {
-					if (typeof txt.database === 'object' && txt.database.__rl) {
-						if (txt.database.__regex) {
-							const regex = new RegExp(txt.database.__regex);
-							const extracted = regex.exec(txt.database.value);
-							txt.database = extracted![1];
-						} else {
-							txt.database = txt.database.value;
-						}
-					}
-				}
-			});
-		}
-	});
-}
diff --git a/packages/nodes-base/nodes/Notion/Notion.node.ts b/packages/nodes-base/nodes/Notion/Notion.node.ts
index 9ea6e41f8ce32..7601a89867e68 100644
--- a/packages/nodes-base/nodes/Notion/Notion.node.ts
+++ b/packages/nodes-base/nodes/Notion/Notion.node.ts
@@ -13,12 +13,14 @@ export class Notion extends VersionedNodeType {
 			group: ['output'],
 			subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
 			description: 'Consume Notion API',
-			defaultVersion: 2,
+			defaultVersion: 2.2,
 		};
 
 		const nodeVersions: IVersionedNodeType['nodeVersions'] = {
 			1: new NotionV1(baseDescription),
 			2: new NotionV2(baseDescription),
+			2.1: new NotionV2(baseDescription),
+			2.2: new NotionV2(baseDescription),
 		};
 
 		super(nodeVersions, baseDescription);
diff --git a/packages/nodes-base/nodes/Notion/NotionTrigger.node.ts b/packages/nodes-base/nodes/Notion/NotionTrigger.node.ts
index d453e88ea49b6..ca6c69aa86852 100644
--- a/packages/nodes-base/nodes/Notion/NotionTrigger.node.ts
+++ b/packages/nodes-base/nodes/Notion/NotionTrigger.node.ts
@@ -6,14 +6,13 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
-import { notionApiRequest, simplifyObjects } from './GenericFunctions';
+import moment from 'moment-timezone';
+import { notionApiRequest, simplifyObjects } from './shared/GenericFunctions';
 
-import moment from 'moment';
-import { getDatabases } from './SearchFunctions';
+import { listSearch } from './shared/methods';
 
 export class NotionTrigger implements INodeType {
 	description: INodeTypeDescription = {
-		// eslint-disable-next-line n8n-nodes-base/node-class-description-display-name-unsuffixed-trigger-node
 		displayName: 'Notion Trigger',
 		name: 'notionTrigger',
 		icon: 'file:notion.svg',
@@ -22,7 +21,7 @@ export class NotionTrigger implements INodeType {
 		description: 'Starts the workflow when Notion events occur',
 		subtitle: '={{$parameter["event"]}}',
 		defaults: {
-			name: 'Notion Trigger (Beta)',
+			name: 'Notion Trigger',
 		},
 		credentials: [
 			{
@@ -143,9 +142,7 @@ export class NotionTrigger implements INodeType {
 	};
 
 	methods = {
-		listSearch: {
-			getDatabases,
-		},
+		listSearch,
 	};
 
 	async poll(this: IPollFunctions): Promise<INodeExecutionData[][] | null> {
diff --git a/packages/nodes-base/nodes/Notion/PageDescription.ts b/packages/nodes-base/nodes/Notion/PageDescription.ts
deleted file mode 100644
index 5c4ec2d158687..0000000000000
--- a/packages/nodes-base/nodes/Notion/PageDescription.ts
+++ /dev/null
@@ -1,485 +0,0 @@
-import type { INodeProperties } from 'n8n-workflow';
-
-import { blocks } from './Blocks';
-
-export const pageOperations: INodeProperties[] = [
-	{
-		displayName: 'Operation',
-		name: 'operation',
-		type: 'options',
-		noDataExpression: true,
-		displayOptions: {
-			show: {
-				version: [1],
-				resource: ['page'],
-			},
-		},
-		options: [
-			{
-				name: 'Create',
-				value: 'create',
-				description: 'Create a page',
-				action: 'Create a page',
-			},
-			{
-				name: 'Get',
-				value: 'get',
-				description: 'Get a page',
-				action: 'Get a page',
-			},
-			{
-				name: 'Search',
-				value: 'search',
-				description: 'Text search of pages',
-				action: 'Search a page',
-			},
-		],
-		default: 'create',
-	},
-	{
-		displayName: 'Operation',
-		name: 'operation',
-		type: 'options',
-		noDataExpression: true,
-		displayOptions: {
-			show: {
-				version: [2],
-				resource: ['page'],
-			},
-		},
-		options: [
-			{
-				name: 'Archive',
-				value: 'archive',
-				description: 'Archive a page',
-				action: 'Archive a page',
-			},
-			{
-				name: 'Create',
-				value: 'create',
-				description: 'Create a page',
-				action: 'Create a page',
-			},
-			{
-				name: 'Search',
-				value: 'search',
-				description: 'Text search of pages',
-				action: 'Search a page',
-			},
-		],
-		default: 'create',
-	},
-];
-
-export const pageFields: INodeProperties[] = [
-	/* -------------------------------------------------------------------------- */
-	/*                                page:archive                                */
-	/* -------------------------------------------------------------------------- */
-	{
-		displayName: 'Page',
-		name: 'pageId',
-		type: 'resourceLocator',
-		default: { mode: 'url', value: '' },
-		required: true,
-		modes: [
-			{
-				displayName: 'Link',
-				name: 'url',
-				type: 'string',
-				placeholder: 'https://www.notion.so/My-Page-b4eeb113e118403aa450af65ac25f0b9',
-				validation: [
-					{
-						type: 'regex',
-						properties: {
-							regex:
-								'(?:https|http)://www.notion.so/(?:[a-z0-9-]{2,}/)?(?:[a-zA-Z0-9-]{2,}-)?([0-9a-f]{8}[0-9a-f]{4}4[0-9a-f]{3}[89ab][0-9a-f]{3}[0-9a-f]{12}).*',
-							errorMessage: 'Not a valid Notion Page URL',
-						},
-					},
-				],
-				extractValue: {
-					type: 'regex',
-					regex:
-						'(?:https|http)://www.notion.so/(?:[a-z0-9-]{2,}/)?(?:[a-zA-Z0-9-]{2,}-)?([0-9a-f]{8}[0-9a-f]{4}4[0-9a-f]{3}[89ab][0-9a-f]{3}[0-9a-f]{12})',
-				},
-			},
-			{
-				displayName: 'ID',
-				name: 'id',
-				type: 'string',
-				placeholder: 'ab1545b247fb49fa92d6f4b49f4d8116',
-				validation: [
-					{
-						type: 'regex',
-						properties: {
-							regex:
-								'^(([0-9a-f]{8}[0-9a-f]{4}4[0-9a-f]{3}[89ab][0-9a-f]{3}[0-9a-f]{12})|([0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}))[ \t]*',
-							errorMessage: 'Not a valid Notion Page ID',
-						},
-					},
-				],
-				extractValue: {
-					type: 'regex',
-					regex: '^([0-9a-f]{8}-?[0-9a-f]{4}-?4[0-9a-f]{3}-?[89ab][0-9a-f]{3}-?[0-9a-f]{12})',
-				},
-				url: '=https://www.notion.so/{{$value.replace(/-/g, "")}}',
-			},
-		],
-		displayOptions: {
-			show: {
-				version: [2],
-				resource: ['page'],
-				operation: ['archive'],
-			},
-		},
-		description: 'The Notion Page to archive',
-	},
-	{
-		displayName: 'Simplify',
-		name: 'simple',
-		type: 'boolean',
-		displayOptions: {
-			show: {
-				version: [2],
-				resource: ['page'],
-				operation: ['archive'],
-			},
-		},
-		default: true,
-		description: 'Whether to return a simplified version of the response instead of the raw data',
-	},
-	/* -------------------------------------------------------------------------- */
-	/*                                page:create                                 */
-	/* -------------------------------------------------------------------------- */
-	{
-		displayName: 'Parent Page',
-		name: 'pageId',
-		type: 'resourceLocator',
-		default: { mode: 'url', value: '' },
-		required: true,
-		modes: [
-			{
-				displayName: 'Link',
-				name: 'url',
-				type: 'string',
-				placeholder: 'https://www.notion.so/My-Page-b4eeb113e118403aa450af65ac25f0b9',
-				validation: [
-					{
-						type: 'regex',
-						properties: {
-							regex:
-								'(?:https|http)://www.notion.so/(?:[a-z0-9-]{2,}/)?(?:[a-zA-Z0-9-]{2,}-)?([0-9a-f]{8}[0-9a-f]{4}4[0-9a-f]{3}[89ab][0-9a-f]{3}[0-9a-f]{12}).*',
-							errorMessage: 'Not a valid Notion Page URL',
-						},
-					},
-				],
-				extractValue: {
-					type: 'regex',
-					regex:
-						'(?:https|http)://www.notion.so/(?:[a-z0-9-]{2,}/)?(?:[a-zA-Z0-9-]{2,}-)?([0-9a-f]{8}[0-9a-f]{4}4[0-9a-f]{3}[89ab][0-9a-f]{3}[0-9a-f]{12})',
-				},
-			},
-			{
-				displayName: 'ID',
-				name: 'id',
-				type: 'string',
-				placeholder: 'ab1545b247fb49fa92d6f4b49f4d8116',
-				validation: [
-					{
-						type: 'regex',
-						properties: {
-							regex:
-								'^(([0-9a-f]{8}[0-9a-f]{4}4[0-9a-f]{3}[89ab][0-9a-f]{3}[0-9a-f]{12})|([0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}))[ \t]*',
-							errorMessage: 'Not a valid Notion Page ID',
-						},
-					},
-				],
-				extractValue: {
-					type: 'regex',
-					regex: '^([0-9a-f]{8}-?[0-9a-f]{4}-?4[0-9a-f]{3}-?[89ab][0-9a-f]{3}-?[0-9a-f]{12})',
-				},
-				url: '=https://www.notion.so/{{$value.replace(/-/g, "")}}',
-			},
-		],
-		displayOptions: {
-			show: {
-				resource: ['page'],
-				operation: ['create'],
-			},
-		},
-		description: 'The Notion Database Page to create a child page for',
-	},
-	{
-		displayName: 'Title',
-		name: 'title',
-		type: 'string',
-		default: '',
-		required: true,
-		displayOptions: {
-			show: {
-				resource: ['page'],
-				operation: ['create'],
-			},
-		},
-		description: 'Page title. Appears at the top of the page and can be found via Quick Find.',
-	},
-	{
-		displayName: 'Simplify',
-		name: 'simple',
-		type: 'boolean',
-		displayOptions: {
-			show: {
-				resource: ['page'],
-				operation: ['create'],
-			},
-		},
-		default: true,
-		description: 'Whether to return a simplified version of the response instead of the raw data',
-	},
-	...blocks('page', 'create'),
-	{
-		displayName: 'Options',
-		name: 'options',
-		type: 'collection',
-		displayOptions: {
-			show: {
-				resource: ['page'],
-				operation: ['create'],
-			},
-		},
-		default: {},
-		placeholder: 'Add Option',
-		options: [
-			{
-				displayName: 'Icon Type',
-				name: 'iconType',
-				type: 'options',
-				options: [
-					{
-						name: 'Emoji',
-						value: 'emoji',
-						description: 'Use an Emoji for the icon',
-					},
-					{
-						name: 'File',
-						value: 'file',
-						description: 'Use a file for the icon',
-					},
-				],
-				default: 'emoji',
-				description: 'The icon type for the page, Either a URL or an Emoji',
-			},
-			{
-				displayName: 'Icon',
-				name: 'icon',
-				type: 'string',
-				default: '',
-				description: 'Emoji or File URL to use as the icon',
-			},
-		],
-	},
-	/* -------------------------------------------------------------------------- */
-	/*                                page:get                                    */
-	/* -------------------------------------------------------------------------- */
-	{
-		displayName: 'Page Link or ID',
-		name: 'pageId',
-		type: 'string',
-		default: '',
-		required: true,
-		displayOptions: {
-			show: {
-				version: [1],
-				resource: ['page'],
-				operation: ['get'],
-			},
-		},
-		description:
-			"The Page URL from Notion's 'copy link' functionality (or just the ID contained within the URL)",
-	},
-	{
-		displayName: 'Simplify',
-		name: 'simple',
-		type: 'boolean',
-		displayOptions: {
-			show: {
-				version: [1],
-				resource: ['page'],
-				operation: ['get'],
-			},
-		},
-		default: true,
-		description: 'Whether to return a simplified version of the response instead of the raw data',
-	},
-	/* -------------------------------------------------------------------------- */
-	/*                                page:search                                  */
-	/* -------------------------------------------------------------------------- */
-	{
-		displayName: 'Search Text',
-		name: 'text',
-		type: 'string',
-		default: '',
-		displayOptions: {
-			show: {
-				resource: ['page'],
-				operation: ['search'],
-			},
-		},
-		description: 'The text to search for',
-	},
-	{
-		displayName: 'Return All',
-		name: 'returnAll',
-		type: 'boolean',
-		displayOptions: {
-			show: {
-				resource: ['page'],
-				operation: ['search'],
-			},
-		},
-		default: false,
-		description: 'Whether to return all results or only up to a given limit',
-	},
-	{
-		displayName: 'Limit',
-		name: 'limit',
-		type: 'number',
-		displayOptions: {
-			show: {
-				resource: ['page'],
-				operation: ['search'],
-				returnAll: [false],
-			},
-		},
-		typeOptions: {
-			minValue: 1,
-			maxValue: 100,
-		},
-		default: 50,
-		description: 'Max number of results to return',
-	},
-	{
-		displayName: 'Simplify',
-		name: 'simple',
-		type: 'boolean',
-		displayOptions: {
-			show: {
-				resource: ['page'],
-				operation: ['search'],
-			},
-		},
-		default: true,
-		description: 'Whether to return a simplified version of the response instead of the raw data',
-	},
-	{
-		displayName: 'Options',
-		name: 'options',
-		type: 'collection',
-		displayOptions: {
-			show: {
-				resource: ['page'],
-				operation: ['search'],
-			},
-		},
-		default: {},
-		placeholder: 'Add Field',
-		options: [
-			{
-				displayName: 'Filters',
-				name: 'filter',
-				placeholder: 'Add Filter',
-				type: 'fixedCollection',
-				typeOptions: {
-					multipleValues: false,
-				},
-				default: {},
-				options: [
-					{
-						displayName: 'Filter',
-						name: 'filters',
-						values: [
-							{
-								displayName: 'Property',
-								name: 'property',
-								type: 'options',
-								options: [
-									{
-										name: 'Object',
-										value: 'object',
-									},
-								],
-								default: 'object',
-								description: 'The name of the property to filter by',
-							},
-							{
-								displayName: 'Value',
-								name: 'value',
-								type: 'options',
-								options: [
-									{
-										name: 'Database',
-										value: 'database',
-									},
-									{
-										name: 'Page',
-										value: 'page',
-									},
-								],
-								default: '',
-								description: 'The value of the property to filter by',
-							},
-						],
-					},
-				],
-			},
-			{
-				displayName: 'Sort',
-				name: 'sort',
-				placeholder: 'Add Sort',
-				type: 'fixedCollection',
-				typeOptions: {
-					multipleValues: false,
-				},
-				default: {},
-				options: [
-					{
-						displayName: 'Sort',
-						name: 'sortValue',
-						values: [
-							{
-								displayName: 'Direction',
-								name: 'direction',
-								type: 'options',
-								options: [
-									{
-										name: 'Ascending',
-										value: 'ascending',
-									},
-									{
-										name: 'Descending',
-										value: 'descending',
-									},
-								],
-								default: 'descending',
-								description: 'The direction to sort',
-							},
-							{
-								displayName: 'Timestamp',
-								name: 'timestamp',
-								type: 'options',
-								options: [
-									{
-										name: 'Last Edited Time',
-										value: 'last_edited_time',
-									},
-								],
-								default: 'last_edited_time',
-								description: 'The name of the timestamp to sort against',
-							},
-						],
-					},
-				],
-			},
-		],
-	},
-];
diff --git a/packages/nodes-base/nodes/Notion/SearchFunctions.ts b/packages/nodes-base/nodes/Notion/SearchFunctions.ts
deleted file mode 100644
index 4501ca23603ff..0000000000000
--- a/packages/nodes-base/nodes/Notion/SearchFunctions.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import type {
-	IDataObject,
-	ILoadOptionsFunctions,
-	INodeListSearchItems,
-	INodeListSearchResult,
-} from 'n8n-workflow';
-import { notionApiRequestAllItems } from './GenericFunctions';
-
-export async function getDatabases(
-	this: ILoadOptionsFunctions,
-	filter?: string,
-): Promise<INodeListSearchResult> {
-	const returnData: INodeListSearchItems[] = [];
-	const body: IDataObject = {
-		page_size: 100,
-		query: filter,
-		filter: { property: 'object', value: 'database' },
-	};
-	const databases = await notionApiRequestAllItems.call(this, 'results', 'POST', '/search', body);
-	for (const database of databases) {
-		returnData.push({
-			name: database.title[0]?.plain_text || database.id,
-			value: database.id,
-			url: database.url,
-		});
-	}
-	returnData.sort((a, b) => {
-		if (a.name.toLocaleLowerCase() < b.name.toLocaleLowerCase()) {
-			return -1;
-		}
-		if (a.name.toLocaleLowerCase() > b.name.toLocaleLowerCase()) {
-			return 1;
-		}
-		return 0;
-	});
-	return { results: returnData };
-}
diff --git a/packages/nodes-base/nodes/Notion/notion.svg b/packages/nodes-base/nodes/Notion/notion.svg
index 8cf8adc1e7cf9..f2af3da9b223a 100644
--- a/packages/nodes-base/nodes/Notion/notion.svg
+++ b/packages/nodes-base/nodes/Notion/notion.svg
@@ -1 +1 @@
-<svg height="2500" width="2500" xmlns="http://www.w3.org/2000/svg" viewBox="12 0.19 487.619 510.941"><path d="M96.085 91.118c15.81 12.845 21.741 11.865 51.43 9.884l279.888-16.806c5.936 0 1-5.922-.98-6.906L379.94 43.686c-8.907-6.915-20.773-14.834-43.516-12.853L65.408 50.6c-9.884.98-11.858 5.922-7.922 9.883zm16.804 65.228v294.491c0 15.827 7.909 21.748 25.71 20.769l307.597-17.799c17.81-.979 19.794-11.865 19.794-24.722V136.57c0-12.836-4.938-19.758-15.84-18.77l-321.442 18.77c-11.863.997-15.82 6.931-15.82 19.776zm303.659 15.797c1.972 8.903 0 17.798-8.92 18.799l-14.82 2.953v217.412c-12.868 6.916-24.734 10.87-34.622 10.87-15.831 0-19.796-4.945-31.654-19.76l-96.944-152.19v147.248l30.677 6.922s0 17.78-24.75 17.78l-68.23 3.958c-1.982-3.958 0-13.832 6.921-15.81l17.805-4.935V210.7l-24.721-1.981c-1.983-8.903 2.955-21.74 16.812-22.736l73.195-4.934L358.186 335.22V198.836l-25.723-2.952c-1.974-10.884 5.927-18.787 15.819-19.767zM42.653 23.919l281.9-20.76c34.618-2.969 43.525-.98 65.283 14.825l89.986 63.247c14.848 10.876 19.797 13.837 19.797 25.693v346.883c0 21.74-7.92 34.597-35.608 36.564L136.64 510.14c-20.785.991-30.677-1.971-41.562-15.815l-66.267-85.978C16.938 392.52 12 380.68 12 366.828V58.495c0-17.778 7.922-32.608 30.653-34.576z" fill-rule="evenodd"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="2500" height="2500" viewBox="12 0.19 487.619 510.941"><path fill-rule="evenodd" d="M96.085 91.118c15.81 12.845 21.741 11.865 51.43 9.884l279.888-16.806c5.936 0 1-5.922-.98-6.906L379.94 43.686c-8.907-6.915-20.773-14.834-43.516-12.853L65.408 50.6c-9.884.98-11.858 5.922-7.922 9.883zm16.804 65.228v294.491c0 15.827 7.909 21.748 25.71 20.769l307.597-17.799c17.81-.979 19.794-11.865 19.794-24.722V136.57c0-12.836-4.938-19.758-15.84-18.77l-321.442 18.77c-11.863.997-15.82 6.931-15.82 19.776zm303.659 15.797c1.972 8.903 0 17.798-8.92 18.799l-14.82 2.953v217.412c-12.868 6.916-24.734 10.87-34.622 10.87-15.831 0-19.796-4.945-31.654-19.76l-96.944-152.19v147.248l30.677 6.922s0 17.78-24.75 17.78l-68.23 3.958c-1.982-3.958 0-13.832 6.921-15.81l17.805-4.935V210.7l-24.721-1.981c-1.983-8.903 2.955-21.74 16.812-22.736l73.195-4.934L358.186 335.22V198.836l-25.723-2.952c-1.974-10.884 5.927-18.787 15.819-19.767zM42.653 23.919l281.9-20.76c34.618-2.969 43.525-.98 65.283 14.825l89.986 63.247c14.848 10.876 19.797 13.837 19.797 25.693v346.883c0 21.74-7.92 34.597-35.608 36.564L136.64 510.14c-20.785.991-30.677-1.971-41.562-15.815l-66.267-85.978C16.938 392.52 12 380.68 12 366.828V58.495c0-17.778 7.922-32.608 30.653-34.576"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Notion/shared/GenericFunctions.ts b/packages/nodes-base/nodes/Notion/shared/GenericFunctions.ts
new file mode 100644
index 0000000000000..9ae5e52848237
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/shared/GenericFunctions.ts
@@ -0,0 +1,1188 @@
+import type {
+	IBinaryKeyData,
+	IDataObject,
+	IDisplayOptions,
+	IExecuteFunctions,
+	IHookFunctions,
+	IHttpRequestMethods,
+	ILoadOptionsFunctions,
+	INode,
+	INodeExecutionData,
+	INodeProperties,
+	IPairedItemData,
+	IPollFunctions,
+	IRequestOptions,
+	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 { filters } from './descriptions/Filters';
+import set from 'lodash/set';
+
+function uuidValidateWithoutDashes(this: IExecuteFunctions, value: string) {
+	if (uuidValidate(value)) return true;
+	if (value.length == 32) {
+		//prettier-ignore
+		const strWithDashes = `${value.slice(0, 8)}-${value.slice(8, 12)}-${value.slice(12, 16)}-${value.slice(16, 20)}-${value.slice(20)}`;
+		if (uuidValidate(strWithDashes)) return true;
+	}
+	throw new NodeOperationError(
+		this.getNode(),
+		`The relation id "${value}" is not a valid uuid with optional dashes.`,
+	);
+}
+
+export type SortData = { key: string; type: string; direction: string; timestamp: boolean };
+
+const apiVersion: { [key: number]: string } = {
+	1: '2021-05-13',
+	2: '2021-08-16',
+	2.1: '2021-08-16',
+	2.2: '2021-08-16',
+};
+
+export async function notionApiRequest(
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions,
+	method: IHttpRequestMethods,
+	resource: string,
+
+	body: any = {},
+	qs: IDataObject = {},
+	uri?: string,
+	option: IDataObject = {},
+): Promise<any> {
+	try {
+		let options: IRequestOptions = {
+			headers: {
+				'Notion-Version': apiVersion[this.getNode().typeVersion],
+			},
+			method,
+			qs,
+			body,
+			uri: uri || `https://api.notion.com/v1${resource}`,
+			json: true,
+		};
+		options = Object.assign({}, options, option);
+		if (Object.keys(body as IDataObject).length === 0) {
+			delete options.body;
+		}
+		if (!uri) {
+			return await this.helpers.requestWithAuthentication.call(this, 'notionApi', options);
+		}
+		return await this.helpers.request(options);
+	} catch (error) {
+		throw new NodeApiError(this.getNode(), error as JsonObject);
+	}
+}
+
+export async function notionApiRequestAllItems(
+	this: IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions,
+	propertyName: string,
+	method: IHttpRequestMethods,
+	endpoint: string,
+	body: any = {},
+	query: IDataObject = {},
+): Promise<any> {
+	const resource = this.getNodeParameter('resource', 0);
+
+	const returnData: IDataObject[] = [];
+
+	let responseData;
+
+	do {
+		responseData = await notionApiRequest.call(this, method, endpoint, body, query);
+		const { next_cursor } = responseData;
+		if (resource === 'block' || resource === 'user') {
+			query.start_cursor = next_cursor;
+		} else {
+			body.start_cursor = next_cursor;
+		}
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
+		const limit = query.limit as number | undefined;
+		if (limit && limit <= returnData.length) {
+			return returnData;
+		}
+	} while (responseData.has_more !== false);
+
+	return returnData;
+}
+
+export async function notionApiRequestGetBlockChildrens(
+	this: IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions,
+	blocks: IDataObject[],
+	responseData: IDataObject[] = [],
+	limit?: number,
+) {
+	if (blocks.length === 0) return responseData;
+
+	for (const block of blocks) {
+		responseData.push(block);
+
+		if (block.type === 'child_page') continue;
+
+		if (block.has_children) {
+			let childrens = await notionApiRequestAllItems.call(
+				this,
+				'results',
+				'GET',
+				`/blocks/${block.id}/children`,
+			);
+
+			childrens = (childrens || []).map((entry: IDataObject) => ({
+				object: entry.object,
+				parent_id: block.id,
+				...entry,
+			}));
+
+			await notionApiRequestGetBlockChildrens.call(this, childrens, responseData);
+		}
+
+		if (limit && responseData.length === limit) {
+			return responseData;
+		}
+
+		if (limit && responseData.length > limit) {
+			return responseData.slice(0, limit);
+		}
+	}
+
+	return responseData;
+}
+
+export function getBlockTypesOptions() {
+	return [
+		{
+			name: 'Paragraph',
+			value: 'paragraph',
+		},
+		{
+			name: 'Heading 1',
+			value: 'heading_1',
+		},
+		{
+			name: 'Heading 2',
+			value: 'heading_2',
+		},
+		{
+			name: 'Heading 3',
+			value: 'heading_3',
+		},
+		{
+			name: 'Toggle',
+			value: 'toggle',
+		},
+		{
+			name: 'To-Do',
+			value: 'to_do',
+		},
+		// {
+		// 	name: 'Child Page',
+		// 	value: 'child_page',
+		// },
+		{
+			name: 'Bulleted List Item',
+			value: 'bulleted_list_item',
+		},
+		{
+			name: 'Numbered List Item',
+			value: 'numbered_list_item',
+		},
+		{
+			name: 'Image',
+			value: 'image',
+		},
+	];
+}
+
+function textContent(content: string) {
+	return {
+		text: {
+			content,
+		},
+	};
+}
+
+export function formatTitle(content: string) {
+	return {
+		title: [textContent(content)],
+	};
+}
+
+export function formatText(content: string) {
+	return {
+		text: [textContent(content)],
+	};
+}
+
+function getLink(text: { textLink: string; isLink: boolean }) {
+	if (text.isLink && text.textLink !== '') {
+		return {
+			link: {
+				url: text.textLink,
+			},
+		};
+	}
+	return {};
+}
+
+type TextData = {
+	textType: string;
+	text: string;
+	isLink: boolean;
+	range: boolean;
+	textLink: string;
+	mentionType: string;
+	dateStart: string;
+	dateEnd: string;
+	date: string;
+	annotationUi: IDataObject;
+	expression: string;
+};
+function getTexts(texts: TextData[]) {
+	const results = [];
+	for (const text of texts) {
+		if (text.textType === 'text') {
+			results.push({
+				type: 'text',
+				text: {
+					content: text.text,
+					...getLink(text),
+				},
+				annotations: text.annotationUi,
+			});
+		} else if (text.textType === 'mention') {
+			if (text.mentionType === 'date') {
+				results.push({
+					type: 'mention',
+					mention: {
+						type: text.mentionType,
+						[text.mentionType]: text.range
+							? { start: text.dateStart, end: text.dateEnd }
+							: { start: text.date, end: null },
+					},
+					annotations: text.annotationUi,
+				});
+			} else {
+				results.push({
+					type: 'mention',
+					mention: {
+						type: text.mentionType,
+						//@ts-expect-error any
+						[text.mentionType]: { id: text[text.mentionType] as string },
+					},
+					annotations: text.annotationUi,
+				});
+			}
+		} else if (text.textType === 'equation') {
+			results.push({
+				type: 'equation',
+				equation: {
+					expression: text.expression,
+				},
+				annotations: text.annotationUi,
+			});
+		}
+	}
+	return results;
+}
+
+function getTextBlocks(block: IDataObject) {
+	return {
+		text:
+			block.richText === false
+				? formatText(block.textContent as string).text
+				: getTexts(((block.text as IDataObject).text as TextData[]) || []),
+	};
+}
+
+export function formatBlocks(blocks: IDataObject[]) {
+	const results = [];
+	for (const block of blocks) {
+		results.push({
+			object: 'block',
+			type: block.type,
+			[block.type as string]: {
+				...(block.type === 'to_do' ? { checked: block.checked } : {}),
+				...(block.type === 'image' ? { type: 'external', external: { url: block.url } } : {}),
+				// prettier-ignore,
+				...(!['image'].includes(block.type as string) ? getTextBlocks(block) : {}),
+			},
+		});
+	}
+	return results;
+}
+
+function getDateFormat(includeTime: boolean) {
+	if (!includeTime) {
+		return 'yyyy-MM-DD';
+	}
+	return '';
+}
+
+function isEmpty(value: unknown): boolean {
+	return value === undefined || value === null || value === '';
+}
+
+function getPropertyKeyValue(
+	this: IExecuteFunctions,
+	value: any,
+	type: string,
+	timezone: string,
+	version = 1,
+) {
+	const ignoreIfEmpty = <T>(v: T, cb: (v: T) => any) =>
+		!v && value.ignoreIfEmpty ? undefined : cb(v);
+	let result: IDataObject = {};
+
+	switch (type) {
+		case 'rich_text':
+			if (value.richText === false) {
+				result = { rich_text: [{ text: { content: value.textContent } }] };
+			} else {
+				result = { rich_text: getTexts(value.text.text as TextData[]) };
+			}
+			break;
+		case 'title':
+			result = { title: [{ text: { content: value.title } }] };
+			break;
+		case 'number':
+			result = { type: 'number', number: value.numberValue };
+			break;
+		case 'url':
+			result = ignoreIfEmpty(value.urlValue, (url) => ({ type: 'url', url }));
+			break;
+		case 'checkbox':
+			result = { type: 'checkbox', checkbox: value.checkboxValue };
+			break;
+		case 'relation':
+			result = {
+				type: 'relation',
+				relation: value.relationValue
+					.filter((relation: IDataObject) => {
+						return relation && typeof relation === 'string';
+					})
+					.reduce((acc: string[], cur: string) => {
+						return acc.concat(cur.split(',').map((relation: string) => relation.trim()));
+					}, [])
+					.filter((relation: string) => {
+						return uuidValidateWithoutDashes.call(this, relation);
+					})
+					.map((relation: string) => ({ id: relation })),
+			};
+			break;
+		case 'multi_select':
+			if (isEmpty(value.multiSelectValue)) {
+				result = {
+					type: 'multi_select',
+					multi_select: [],
+				};
+				break;
+			}
+
+			const multiSelectValue = value.multiSelectValue;
+
+			result = {
+				type: 'multi_select',
+				multi_select: (Array.isArray(multiSelectValue)
+					? multiSelectValue
+					: multiSelectValue.split(',').map((v: string) => v.trim())
+				)
+					.filter((entry: any) => entry !== null)
+					.map((option: string) => (!uuidValidate(option) ? { name: option } : { id: option })),
+			};
+			break;
+		case 'email':
+			result = {
+				type: 'email',
+				email: value.emailValue,
+			};
+			break;
+		case 'people':
+			//if expression it's a single value, make it an array
+			if (!Array.isArray(value.peopleValue)) {
+				value.peopleValue = [value.peopleValue];
+			}
+
+			result = {
+				type: 'people',
+				people: value.peopleValue.map((option: string) => ({ id: option })),
+			};
+			break;
+		case 'phone_number':
+			result = {
+				type: 'phone_number',
+				phone_number: value.phoneValue,
+			};
+			break;
+		case 'select':
+			if (isEmpty(value.selectValue)) {
+				result = {
+					type: 'select',
+					select: null,
+				};
+				break;
+			}
+
+			result = {
+				type: 'select',
+				select: version === 1 ? { id: value.selectValue } : { name: value.selectValue },
+			};
+			break;
+		case 'status':
+			result = {
+				type: 'status',
+				status: { name: value.statusValue },
+			};
+			break;
+		case 'date':
+			const format = getDateFormat(value.includeTime as boolean);
+			const timezoneValue = value.timezone === 'default' ? timezone : value.timezone;
+			if (value.range === true) {
+				result = {
+					type: 'date',
+					date: {
+						start: moment.tz(value.dateStart as number, timezoneValue as string).format(format),
+						end: moment.tz(value.dateEnd as number, timezoneValue as string).format(format),
+					},
+				};
+			} else {
+				result = {
+					type: 'date',
+					date: {
+						start: moment.tz(value.date as number, timezoneValue as string).format(format),
+						end: null,
+					},
+				};
+			}
+
+			//if the date was left empty, set it to null so it resets the value in notion
+			if (value.date === '' || (value.dateStart === '' && value.dateEnd === '')) {
+				result.date = null;
+			}
+
+			break;
+		case 'files':
+			result = {
+				type: 'files',
+				files: value.fileUrls.fileUrl.map((file: { name: string; url: string }) => ({
+					name: file.name,
+					type: 'external',
+					external: { url: file.url },
+				})),
+			};
+			break;
+		default:
+	}
+	return result;
+}
+
+function getNameAndType(key: string) {
+	const [name, type] = key.split('|');
+	return {
+		name,
+		type,
+	};
+}
+
+export function mapProperties(
+	this: IExecuteFunctions,
+	properties: IDataObject[],
+	timezone: string,
+	version = 1,
+) {
+	return properties
+		.filter(
+			(property): property is Record<string, { key: string; [k: string]: any }> =>
+				typeof property.key === 'string',
+		)
+		.map(
+			(property) =>
+				[
+					`${property.key.split('|')[0]}`,
+					getPropertyKeyValue.call(
+						this,
+						property,
+						property.key.split('|')[1] as string,
+						timezone,
+						version,
+					),
+				] as const,
+		)
+		.filter(([, value]) => value)
+		.reduce(
+			(obj, [key, value]) =>
+				Object.assign(obj, {
+					[key]: value,
+				}),
+			{},
+		);
+}
+
+export function mapSorting(data: SortData[]) {
+	return data.map((sort) => {
+		return {
+			direction: sort.direction,
+			[sort.timestamp ? 'timestamp' : 'property']: sort.key.split('|')[0],
+		};
+	});
+}
+
+export function mapFilters(filtersList: IDataObject[], timezone: string) {
+	return filtersList.reduce((obj, value: { [key: string]: any }) => {
+		let key = getNameAndType(value.key as string).type;
+
+		let valuePropertyName =
+			key === 'last_edited_time' ? value[camelCase(key)] : value[`${camelCase(key)}Value`];
+
+		if (['is_empty', 'is_not_empty'].includes(value.condition as string)) {
+			valuePropertyName = true;
+		} else if (
+			['past_week', 'past_month', 'past_year', 'next_week', 'next_month', 'next_year'].includes(
+				value.condition as string,
+			)
+		) {
+			valuePropertyName = {};
+		}
+		if (key === 'rich_text' || key === 'text') {
+			key = 'text';
+		} else if (key === 'phone_number') {
+			key = 'phone';
+		} else if (
+			key === 'date' &&
+			!['is_empty', 'is_not_empty'].includes(value.condition as string)
+		) {
+			valuePropertyName = value.date === '' ? {} : moment.tz(value.date, timezone).utc().format();
+		} else if (key === 'boolean') {
+			key = 'checkbox';
+		}
+
+		if (value.type === 'formula') {
+			if (['is_empty', 'is_not_empty'].includes(value.condition as string)) {
+				key = value.returnType;
+			} else {
+				const vpropertyName = value[`${camelCase(value.returnType as string)}Value`];
+
+				return Object.assign(obj, {
+					['property']: getNameAndType(value.key as string).name,
+					[key]: { [value.returnType]: { [`${value.condition}`]: vpropertyName } },
+				});
+			}
+		}
+
+		return Object.assign(obj, {
+			['property']: getNameAndType(value.key as string).name,
+			[key]: { [`${value.condition}`]: valuePropertyName },
+		});
+	}, {});
+}
+
+function simplifyProperty(property: any) {
+	let result: any;
+	const type = (property as IDataObject).type as string;
+	if (['text'].includes(property.type as string)) {
+		result = property.plain_text;
+	} else if (['rich_text', 'title'].includes(property.type as string)) {
+		if (Array.isArray(property[type]) && property[type].length !== 0) {
+			result = property[type].map((text: any) => simplifyProperty(text) as string).join('');
+		} else {
+			result = '';
+		}
+	} else if (
+		[
+			'url',
+			'created_time',
+			'checkbox',
+			'number',
+			'last_edited_time',
+			'email',
+			'phone_number',
+			'date',
+		].includes(property.type as string)
+	) {
+		result = property[type];
+	} else if (['created_by', 'last_edited_by', 'select'].includes(property.type as string)) {
+		result = property[type] ? property[type].name : null;
+	} else if (['people'].includes(property.type as string)) {
+		if (Array.isArray(property[type])) {
+			result = property[type].map((person: any) => person.person?.email || {});
+		} else {
+			result = property[type];
+		}
+	} else if (['multi_select'].includes(property.type as string)) {
+		if (Array.isArray(property[type])) {
+			result = property[type].map((e: IDataObject) => e.name || {});
+		} else {
+			result = property[type].options.map((e: IDataObject) => e.name || {});
+		}
+	} else if (['relation'].includes(property.type as string)) {
+		if (Array.isArray(property[type])) {
+			result = property[type].map((e: IDataObject) => e.id || {});
+		} else {
+			result = property[type].database_id;
+		}
+	} else if (['formula'].includes(property.type as string)) {
+		result = property[type][property[type].type];
+	} else if (['rollup'].includes(property.type as string)) {
+		const rollupFunction = property[type].function as string;
+		if (rollupFunction.startsWith('count') || rollupFunction.includes('empty')) {
+			result = property[type].number;
+			if (rollupFunction.includes('percent')) {
+				result = result * 100;
+			}
+		} else if (rollupFunction.startsWith('show') && property[type].type === 'array') {
+			const elements = property[type].array.map(simplifyProperty).flat();
+			result = rollupFunction === 'show_unique' ? [...new Set(elements as string)] : elements;
+		}
+	} else if (['files'].includes(property.type as string)) {
+		result = property[type].map(
+			(file: { type: string; [key: string]: any }) => file[file.type].url,
+		);
+	} else if (['status'].includes(property.type as string)) {
+		result = property[type].name;
+	}
+	return result;
+}
+
+export function simplifyProperties(properties: any) {
+	const results: any = {};
+	for (const key of Object.keys(properties as IDataObject)) {
+		results[`${key}`] = simplifyProperty(properties[key]);
+	}
+	return results;
+}
+
+export function getPropertyTitle(properties: { [key: string]: any }) {
+	return (
+		Object.values(properties).filter((property) => property.type === 'title')[0].title[0]
+			?.plain_text || ''
+	);
+}
+
+function prepend(stringKey: string, properties: { [key: string]: any }) {
+	for (const key of Object.keys(properties)) {
+		properties[`${stringKey}_${snakeCase(key)}`] = properties[key];
+		delete properties[key];
+	}
+	return properties;
+}
+
+export function simplifyObjects(objects: any, download = false, version = 2) {
+	if (!Array.isArray(objects)) {
+		objects = [objects];
+	}
+	const results: IDataObject[] = [];
+	for (const { object, id, properties, parent, title, json, binary, url } of objects) {
+		if (object === 'page' && (parent.type === 'page_id' || parent.type === 'workspace')) {
+			results.push({
+				id,
+				name: properties.title.title[0].plain_text,
+				...(version === 2 ? { url } : {}),
+			});
+		} else if (object === 'page' && parent.type === 'database_id') {
+			results.push({
+				id,
+				...(version === 2 ? { name: getPropertyTitle(properties as IDataObject) } : {}),
+				...(version === 2 ? { url } : {}),
+				...(version === 2
+					? { ...prepend('property', simplifyProperties(properties) as IDataObject) }
+					: { ...simplifyProperties(properties) }),
+			} as IDataObject);
+		} else if (download && json.object === 'page' && json.parent.type === 'database_id') {
+			results.push({
+				json: {
+					id: json.id,
+					...(version === 2 ? { name: getPropertyTitle(json.properties as IDataObject) } : {}),
+					...(version === 2 ? { url: json.url } : {}),
+					...(version === 2
+						? { ...prepend('property', simplifyProperties(json.properties) as IDataObject) }
+						: { ...simplifyProperties(json.properties) }),
+				},
+				binary,
+			});
+		} else if (object === 'database') {
+			results.push({
+				id,
+				...(version === 2
+					? { name: title[0]?.plain_text || '' }
+					: { title: title[0]?.plain_text || '' }),
+				...(version === 2 ? { url } : {}),
+			});
+		}
+	}
+	return results;
+}
+
+export function getFormattedChildren(children: IDataObject[]) {
+	const results: IDataObject[] = [];
+	for (const child of children) {
+		const type = child.type;
+		results.push({ [`${type}`]: child, object: 'block', type });
+	}
+	return results;
+}
+
+export function getConditions() {
+	const elements: INodeProperties[] = [];
+
+	const types: { [key: string]: string } = {
+		title: 'rich_text',
+		rich_text: 'rich_text',
+		number: 'number',
+		checkbox: 'checkbox',
+		select: 'select',
+		multi_select: 'multi_select',
+		status: 'status',
+		date: 'date',
+		people: 'people',
+		files: 'files',
+		url: 'rich_text',
+		email: 'rich_text',
+		phone_number: 'rich_text',
+		relation: 'relation',
+		//formula: 'formula',
+		created_by: 'people',
+		created_time: 'date',
+		last_edited_by: 'people',
+		last_edited_time: 'date',
+	};
+
+	const typeConditions: { [key: string]: string[] } = {
+		rich_text: [
+			'equals',
+			'does_not_equal',
+			'contains',
+			'does_not_contain',
+			'starts_with',
+			'ends_with',
+			'is_empty',
+			'is_not_empty',
+		],
+		number: [
+			'equals',
+			'does_not_equal',
+			'grater_than',
+			'less_than',
+			'greater_than_or_equal_to',
+			'less_than_or_equal_to',
+			'is_empty',
+			'is_not_empty',
+		],
+		checkbox: ['equals', 'does_not_equal'],
+		select: ['equals', 'does_not_equal', 'is_empty', 'is_not_empty'],
+		multi_select: ['contains', 'does_not_equal', 'is_empty', 'is_not_empty'],
+		status: ['equals', 'does_not_equal'],
+		date: [
+			'equals',
+			'before',
+			'after',
+			'on_or_before',
+			'is_empty',
+			'is_not_empty',
+			'on_or_after',
+			'past_week',
+			'past_month',
+			'past_year',
+			'next_week',
+			'next_month',
+			'next_year',
+		],
+		people: ['contains', 'does_not_contain', 'is_empty', 'is_not_empty'],
+		files: ['is_empty', 'is_not_empty'],
+		relation: ['contains', 'does_not_contain', 'is_empty', 'is_not_empty'],
+	};
+
+	const formula: { [key: string]: string[] } = {
+		text: [...typeConditions.rich_text],
+		checkbox: [...typeConditions.checkbox],
+		number: [...typeConditions.number],
+		date: [...typeConditions.date],
+	};
+
+	for (const type of Object.keys(types)) {
+		elements.push({
+			displayName: 'Condition',
+			name: 'condition',
+			type: 'options',
+			displayOptions: {
+				show: {
+					type: [type],
+				},
+			} as IDisplayOptions,
+			options: typeConditions[types[type]].map((entry: string) => ({
+				name: capitalCase(entry),
+				value: entry,
+			})),
+			default: '',
+			description: 'The value of the property to filter by',
+		} as INodeProperties);
+	}
+
+	elements.push({
+		displayName: 'Return Type',
+		name: 'returnType',
+		type: 'options',
+		displayOptions: {
+			show: {
+				type: ['formula'],
+			},
+		} as IDisplayOptions,
+		options: Object.keys(formula).map((key: string) => ({ name: capitalCase(key), value: key })),
+		default: '',
+		description: 'The formula return type',
+	} as INodeProperties);
+
+	for (const key of Object.keys(formula)) {
+		elements.push({
+			displayName: 'Condition',
+			name: 'condition',
+			type: 'options',
+			displayOptions: {
+				show: {
+					type: ['formula'],
+					returnType: [key],
+				},
+			} as IDisplayOptions,
+			options: formula[key].map((entry: string) => ({ name: capitalCase(entry), value: entry })),
+			default: '',
+			description: 'The value of the property to filter by',
+		} as INodeProperties);
+	}
+
+	return elements;
+}
+
+export type FileRecord = {
+	properties: {
+		[key: string]:
+			| any
+			| {
+					id: string;
+					type: string;
+					files: [{ external: { url: string } } | { file: { url: string } }];
+			  };
+	};
+};
+// prettier-ignore
+export async function downloadFiles(this: IExecuteFunctions | IPollFunctions, records: FileRecord[], pairedItem?: IPairedItemData[]): Promise<INodeExecutionData[]> {
+
+	const elements: INodeExecutionData[] = [];
+	for (const record of records) {
+		const element: INodeExecutionData = { json: {}, binary: {} };
+		element.json = record as unknown as IDataObject;
+		if (pairedItem) {
+			element.pairedItems = pairedItem;
+		}
+		for (const key of Object.keys(record.properties)) {
+			if (record.properties[key].type === 'files') {
+				if (record.properties[key].files.length) {
+					for (const [index, file] of record.properties[key].files.entries()) {
+						const data = await notionApiRequest.call(
+							this,
+							'GET',
+							'',
+							{},
+							{},
+							file?.file?.url as string || file?.external?.url as string,
+							{ json: false, encoding: null },
+						);
+						element.binary![`${key}_${index}`] = await this.helpers.prepareBinaryData(data as Buffer);
+					}
+				}
+			}
+		}
+		if (Object.keys(element.binary as IBinaryKeyData).length === 0) {
+			delete element.binary;
+		}
+		elements.push(element);
+	}
+	return elements;
+}
+
+export function extractPageId(page = '') {
+	if (page.includes('p=')) {
+		return page.split('p=')[1];
+	} else if (page.includes('-') && page.includes('https')) {
+		return page.split('-')[page.split('-').length - 1];
+	}
+	return page;
+}
+
+export function extractDatabaseId(database: string) {
+	if (database.includes('?v=')) {
+		const data = database.split('?v=')[0].split('/');
+		const index = data.length - 1;
+		return data[index];
+	} else if (database.includes('/')) {
+		const index = database.split('/').length - 1;
+		return database.split('/')[index];
+	} else {
+		return database;
+	}
+}
+
+export function getSearchFilters(resource: string) {
+	return [
+		{
+			displayName: 'Filter',
+			name: 'filterType',
+			type: 'options',
+			options: [
+				{
+					name: 'None',
+					value: 'none',
+				},
+				{
+					name: 'Build Manually',
+					value: 'manual',
+				},
+				{
+					name: 'JSON',
+					value: 'json',
+				},
+			],
+			displayOptions: {
+				show: {
+					resource: [resource],
+					operation: ['getAll'],
+				},
+				hide: {
+					'@version': [1],
+				},
+			},
+			default: 'none',
+		},
+		{
+			displayName: 'Must Match',
+			name: 'matchType',
+			type: 'options',
+			options: [
+				{
+					name: 'Any filter',
+					value: 'anyFilter',
+				},
+				{
+					name: 'All Filters',
+					value: 'allFilters',
+				},
+			],
+			displayOptions: {
+				show: {
+					resource: [resource],
+					operation: ['getAll'],
+					filterType: ['manual'],
+				},
+				hide: {
+					'@version': [1],
+				},
+			},
+			default: 'anyFilter',
+		},
+		{
+			displayName: 'Filters',
+			name: 'filters',
+			type: 'fixedCollection',
+			typeOptions: {
+				multipleValues: true,
+			},
+			displayOptions: {
+				show: {
+					resource: [resource],
+					operation: ['getAll'],
+					filterType: ['manual'],
+				},
+				hide: {
+					'@version': [1],
+				},
+			},
+			default: {},
+			placeholder: 'Add Condition',
+			options: [
+				{
+					displayName: 'Conditions',
+					name: 'conditions',
+					values: [...filters(getConditions())],
+				},
+			],
+		},
+		{
+			displayName:
+				'See <a href="https://developers.notion.com/reference/post-database-query#post-database-query-filter" target="_blank">Notion guide</a> to creating filters',
+			name: 'jsonNotice',
+			type: 'notice',
+			displayOptions: {
+				show: {
+					resource: [resource],
+					operation: ['getAll'],
+					filterType: ['json'],
+				},
+				hide: {
+					'@version': [1],
+				},
+			},
+			default: '',
+		},
+		{
+			displayName: 'Filters (JSON)',
+			name: 'filterJson',
+			type: 'string',
+			displayOptions: {
+				show: {
+					resource: [resource],
+					operation: ['getAll'],
+					filterType: ['json'],
+				},
+				hide: {
+					'@version': [1],
+				},
+			},
+			default: '',
+		},
+	];
+}
+
+export function validateJSON(json: string | undefined): any {
+	let result;
+	try {
+		result = JSON.parse(json!);
+	} catch (exception) {
+		result = undefined;
+	}
+	return result;
+}
+
+/**
+ * Manually extract a richtext's database mention RLC parameter.
+ * @param blockValues the blockUi.blockValues node parameter.
+ */
+export function extractDatabaseMentionRLC(blockValues: IDataObject[]) {
+	blockValues.forEach((bv) => {
+		if (bv.richText && bv.text) {
+			const texts = (
+				bv.text as {
+					text: [
+						{
+							textType: string;
+							mentionType: string;
+							database: string | { value: string; mode: string; __rl: boolean; __regex: string };
+						},
+					];
+				}
+			).text;
+			texts.forEach((txt) => {
+				if (txt.textType === 'mention' && txt.mentionType === 'database') {
+					if (typeof txt.database === 'object' && txt.database.__rl) {
+						if (txt.database.__regex) {
+							const regex = new RegExp(txt.database.__regex);
+							const extracted = regex.exec(txt.database.value);
+							txt.database = extracted![1];
+						} else {
+							txt.database = txt.database.value;
+						}
+					}
+				}
+			});
+		}
+	});
+}
+
+export function simplifyBlocksOutput(blocks: IDataObject[], rootId: string) {
+	for (const block of blocks) {
+		const type = block.type as string;
+		block.root_id = rootId;
+
+		['created_time', 'last_edited_time', 'created_by'].forEach((key) => {
+			delete block[key];
+		});
+
+		try {
+			if (['code'].includes(type)) {
+				const text = (block[type] as IDataObject).text as IDataObject[];
+				if (text && Array.isArray(text)) {
+					const content = text.map((entry) => entry.plain_text || '').join('');
+					block.content = content;
+					delete block[type];
+				}
+				continue;
+			}
+
+			if (['child_page', 'child_database'].includes(type)) {
+				const content = (block[type] as IDataObject).title as string;
+				block.content = content;
+				delete block[type];
+				continue;
+			}
+
+			const text = (block[type] as IDataObject)?.text as IDataObject[];
+
+			if (text && Array.isArray(text)) {
+				const content = text.map((entry) => entry.plain_text || '').join('');
+				block.content = content;
+				delete block[type];
+			}
+		} catch (e) {
+			continue;
+		}
+	}
+
+	return blocks;
+}
+
+export function extractBlockId(this: IExecuteFunctions, nodeVersion: number, itemIndex: number) {
+	let blockId: string;
+
+	if (nodeVersion < 2.2) {
+		blockId = extractPageId(
+			this.getNodeParameter('blockId', itemIndex, '', { extractValue: true }) as string,
+		);
+	} else {
+		const blockIdRLCData = this.getNodeParameter('blockId', itemIndex, {}) as IDataObject;
+
+		if (blockIdRLCData.mode === 'id') {
+			blockId = blockIdRLCData.value as string;
+		} else {
+			const blockRegex = /https:\/\/www\.notion\.so\/.+\?pvs=[0-9]+#([a-f0-9]{2,})/;
+			const match = (blockIdRLCData.value as string).match(blockRegex);
+
+			if (match === null) {
+				const pageRegex =
+					/(?:https|http):\/\/www\.notion\.so\/(?:[a-z0-9-]{2,}\/)?(?:[a-zA-Z0-9-]{2,}-)?([0-9a-f]{8}[0-9a-f]{4}4[0-9a-f]{3}[89ab][0-9a-f]{3}[0-9a-f]{12})/;
+				const pageMatch = (blockIdRLCData.value as string).match(pageRegex);
+
+				if (pageMatch === null) {
+					throw new NodeOperationError(
+						this.getNode(),
+						'Invalid URL, could not find block ID or page ID',
+						{
+							itemIndex,
+						},
+					);
+				} else {
+					blockId = extractPageId(pageMatch[1]);
+				}
+			} else {
+				blockId = match[1];
+			}
+		}
+	}
+
+	return blockId;
+}
+
+export const prepareNotionError = (node: INode, error: Error, itemIndex: number) => {
+	if (error instanceof NodeApiError) {
+		set(error, 'context.itemIndex', itemIndex);
+		return error;
+	}
+
+	if (error instanceof NodeOperationError && error?.context?.itemIndex === undefined) {
+		set(error, 'context.itemIndex', itemIndex);
+		return error;
+	}
+
+	return new NodeOperationError(node, error, { itemIndex });
+};
diff --git a/packages/nodes-base/nodes/Notion/shared/descriptions/BlockDescription.ts b/packages/nodes-base/nodes/Notion/shared/descriptions/BlockDescription.ts
new file mode 100644
index 0000000000000..fbb48ce26b484
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/shared/descriptions/BlockDescription.ts
@@ -0,0 +1,292 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+import { blocks } from './Blocks';
+
+//RLC with fixed regex for blockId
+const blockIdRLC: INodeProperties = {
+	displayName: 'Block',
+	name: 'blockId',
+	type: 'resourceLocator',
+	default: { mode: 'url', value: '' },
+	required: true,
+	modes: [
+		{
+			displayName: 'Link',
+			name: 'url',
+			type: 'string',
+			placeholder:
+				'e.g. https://www.notion.so/Block-Test-88888ccc303e4f44847f27d24bd7ad8e?pvs=4#c44444444444bbbbb4d32fdfdd84e',
+			validation: [
+				{
+					type: 'regex',
+					properties: {
+						regex:
+							'(?:https|http)://www.notion.so/(?:[a-z0-9-]{2,}/)?(?:[a-zA-Z0-9-]{2,}-)?([0-9a-f]{8}[0-9a-f]{4}4[0-9a-f]{3}[89ab][0-9a-f]{3}[0-9a-f]{12}).*',
+						errorMessage: 'Not a valid Notion Block URL',
+					},
+				},
+			],
+			// extractValue: {
+			// 	type: 'regex',
+			// 	regex: 'https:\\/\\/www\\.notion\\.so\\/.+\\?pvs=[0-9]+#([a-f0-9]{2,})',
+			// },
+		},
+		{
+			displayName: 'ID',
+			name: 'id',
+			type: 'string',
+			placeholder: 'e.g. ab1545b247fb49fa92d6f4b49f4d8116',
+			validation: [
+				{
+					type: 'regex',
+					properties: {
+						regex: '[a-f0-9]{2,}',
+						errorMessage: 'Not a valid Notion Block ID',
+					},
+				},
+			],
+		},
+	],
+	description:
+		"The Notion Block to get all children from, when using 'By URL' mode make sure to use the URL of the block itself, you can find it in block parameters in Notion under 'Copy link to block'",
+};
+
+export const blockOperations: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				resource: ['block'],
+			},
+		},
+		options: [
+			{
+				name: 'Append After',
+				value: 'append',
+				description: 'Append a block',
+				action: 'Append a block',
+			},
+			{
+				// eslint-disable-next-line n8n-nodes-base/node-param-option-name-wrong-for-get-many
+				name: 'Get Child Blocks',
+				value: 'getAll',
+				description: 'Get many child blocks',
+				action: 'Get many child blocks',
+			},
+		],
+		default: 'append',
+	},
+];
+
+export const blockFields: INodeProperties[] = [
+	/* -------------------------------------------------------------------------- */
+	/*                                block:append                                 */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Block',
+		name: 'blockId',
+		type: 'resourceLocator',
+		default: { mode: 'url', value: '' },
+		required: true,
+		modes: [
+			{
+				displayName: 'Link',
+				name: 'url',
+				type: 'string',
+				placeholder: 'https://www.notion.so/My-Page-b4eeb113e118403ba450af65ac25f0b9',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex:
+								'(?:https|http)://www.notion.so/(?:[a-z0-9-]{2,}/)?(?:[a-zA-Z0-9-]{2,}-)?([0-9a-f]{8}[0-9a-f]{4}4[0-9a-f]{3}[89ab][0-9a-f]{3}[0-9a-f]{12}).*',
+							errorMessage: 'Not a valid Notion Block URL',
+						},
+					},
+				],
+				extractValue: {
+					type: 'regex',
+					regex:
+						'(?:https|http)://www.notion.so/(?:[a-z0-9-]{2,}/)?(?:[a-zA-Z0-9-]{2,}-)?([0-9a-f]{8}[0-9a-f]{4}4[0-9a-f]{3}[89ab][0-9a-f]{3}[0-9a-f]{12})',
+				},
+			},
+			{
+				displayName: 'ID',
+				name: 'id',
+				type: 'string',
+				placeholder: 'ab1545b247fb49fa92d6f4b49f4d8116',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex:
+								'^(([0-9a-f]{8}[0-9a-f]{4}4[0-9a-f]{3}[89ab][0-9a-f]{3}[0-9a-f]{12})|([0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}))[ \t]*',
+							errorMessage: 'Not a valid Notion Block ID',
+						},
+					},
+				],
+				extractValue: {
+					type: 'regex',
+					regex: '^([0-9a-f]{8}-?[0-9a-f]{4}-?4[0-9a-f]{3}-?[89ab][0-9a-f]{3}-?[0-9a-f]{12})',
+				},
+				url: '=https://www.notion.so/{{$value.replace(/-/g, "")}}',
+			},
+		],
+		displayOptions: {
+			show: {
+				resource: ['block'],
+				operation: ['append'],
+			},
+			hide: {
+				'@version': [{ _cnd: { gte: 2.2 } }],
+			},
+		},
+		description: 'The Notion Block to append blocks to',
+	},
+	{
+		...blockIdRLC,
+		displayOptions: {
+			show: {
+				resource: ['block'],
+				operation: ['append'],
+				'@version': [{ _cnd: { gte: 2.2 } }],
+			},
+		},
+	},
+	...blocks('block', 'append'),
+	/* -------------------------------------------------------------------------- */
+	/*                                block:getAll                                */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Block',
+		name: 'blockId',
+		type: 'resourceLocator',
+		default: { mode: 'url', value: '' },
+		required: true,
+		modes: [
+			{
+				displayName: 'Link',
+				name: 'url',
+				type: 'string',
+				placeholder: 'https://www.notion.so/My-Page-b4eeb113e118403ba450af65ac25f0b9',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex:
+								'(?:https|http)://www.notion.so/(?:[a-z0-9-]{2,}/)?(?:[a-zA-Z0-9-]{2,}-)?([0-9a-f]{8}[0-9a-f]{4}4[0-9a-f]{3}[89ab][0-9a-f]{3}[0-9a-f]{12}).*',
+							errorMessage: 'Not a valid Notion Block URL',
+						},
+					},
+				],
+				extractValue: {
+					type: 'regex',
+					regex:
+						'(?:https|http)://www.notion.so/(?:[a-z0-9-]{2,}/)?(?:[a-zA-Z0-9-]{2,}-)?([0-9a-f]{8}[0-9a-f]{4}4[0-9a-f]{3}[89ab][0-9a-f]{3}[0-9a-f]{12})',
+				},
+			},
+			{
+				displayName: 'ID',
+				name: 'id',
+				type: 'string',
+				placeholder: 'ab1545b247fb49fa92d6f4b49f4d8116',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex:
+								'^(([0-9a-f]{8}[0-9a-f]{4}4[0-9a-f]{3}[89ab][0-9a-f]{3}[0-9a-f]{12})|([0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}))[ \t]*',
+							errorMessage: 'Not a valid Notion Block ID',
+						},
+					},
+				],
+				extractValue: {
+					type: 'regex',
+					regex: '^([0-9a-f]{8}-?[0-9a-f]{4}-?4[0-9a-f]{3}-?[89ab][0-9a-f]{3}-?[0-9a-f]{12})',
+				},
+				url: '=https://www.notion.so/{{$value.replace(/-/g, "")}}',
+			},
+		],
+		displayOptions: {
+			show: {
+				resource: ['block'],
+				operation: ['getAll'],
+			},
+			hide: {
+				'@version': [{ _cnd: { gte: 2.2 } }],
+			},
+		},
+		description: 'The Notion Block to get all children from',
+	},
+	{
+		...blockIdRLC,
+		displayOptions: {
+			show: {
+				resource: ['block'],
+				operation: ['getAll'],
+				'@version': [{ _cnd: { gte: 2.2 } }],
+			},
+		},
+	},
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: ['block'],
+				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: ['block'],
+				operation: ['getAll'],
+				returnAll: [false],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 100,
+		},
+		default: 50,
+		description: 'Max number of results to return',
+	},
+	{
+		displayName: 'Also Fetch Nested Blocks',
+		name: 'fetchNestedBlocks',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: ['block'],
+				operation: ['getAll'],
+			},
+		},
+		default: false,
+	},
+	{
+		displayName: 'Simplify Output',
+		name: 'simplifyOutput',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: ['block'],
+				operation: ['getAll'],
+			},
+			hide: {
+				'@version': [1, 2],
+			},
+		},
+		default: true,
+	},
+];
diff --git a/packages/nodes-base/nodes/Notion/Blocks.ts b/packages/nodes-base/nodes/Notion/shared/descriptions/Blocks.ts
similarity index 100%
rename from packages/nodes-base/nodes/Notion/Blocks.ts
rename to packages/nodes-base/nodes/Notion/shared/descriptions/Blocks.ts
diff --git a/packages/nodes-base/nodes/Notion/DatabaseDescription.ts b/packages/nodes-base/nodes/Notion/shared/descriptions/DatabaseDescription.ts
similarity index 98%
rename from packages/nodes-base/nodes/Notion/DatabaseDescription.ts
rename to packages/nodes-base/nodes/Notion/shared/descriptions/DatabaseDescription.ts
index 93e59af7d0bf0..aee9c8d886f23 100644
--- a/packages/nodes-base/nodes/Notion/DatabaseDescription.ts
+++ b/packages/nodes-base/nodes/Notion/shared/descriptions/DatabaseDescription.ts
@@ -8,9 +8,11 @@ export const databaseOperations: INodeProperties[] = [
 		noDataExpression: true,
 		displayOptions: {
 			show: {
-				version: [2],
 				resource: ['database'],
 			},
+			hide: {
+				'@version': [1],
+			},
 		},
 		options: [
 			{
@@ -41,7 +43,7 @@ export const databaseOperations: INodeProperties[] = [
 		noDataExpression: true,
 		displayOptions: {
 			show: {
-				version: [1],
+				'@version': [1],
 				resource: ['database'],
 			},
 		},
@@ -178,10 +180,12 @@ export const databaseFields: INodeProperties[] = [
 		type: 'boolean',
 		displayOptions: {
 			show: {
-				version: [2],
 				resource: ['database'],
 				operation: ['getAll', 'get'],
 			},
+			hide: {
+				'@version': [1],
+			},
 		},
 		default: true,
 		description: 'Whether to return a simplified version of the response instead of the raw data',
diff --git a/packages/nodes-base/nodes/Notion/DatabasePageDescription.ts b/packages/nodes-base/nodes/Notion/shared/descriptions/DatabasePageDescription.ts
similarity index 96%
rename from packages/nodes-base/nodes/Notion/DatabasePageDescription.ts
rename to packages/nodes-base/nodes/Notion/shared/descriptions/DatabasePageDescription.ts
index ee458942691d0..4916a3622393a 100644
--- a/packages/nodes-base/nodes/Notion/DatabasePageDescription.ts
+++ b/packages/nodes-base/nodes/Notion/shared/descriptions/DatabasePageDescription.ts
@@ -1,6 +1,6 @@
 import type { INodeProperties } from 'n8n-workflow';
 
-import { getConditions, getSearchFilters } from './GenericFunctions';
+import { getConditions, getSearchFilters } from '../GenericFunctions';
 
 import { blocks, text } from './Blocks';
 
@@ -14,9 +14,11 @@ export const databasePageOperations: INodeProperties[] = [
 		noDataExpression: true,
 		displayOptions: {
 			show: {
-				version: [2],
 				resource: ['databasePage'],
 			},
+			hide: {
+				'@version': [1],
+			},
 		},
 		options: [
 			{
@@ -53,7 +55,7 @@ export const databasePageOperations: INodeProperties[] = [
 		noDataExpression: true,
 		displayOptions: {
 			show: {
-				version: [1],
+				'@version': [1],
 				resource: ['databasePage'],
 			},
 		},
@@ -161,10 +163,12 @@ export const databasePageFields: INodeProperties[] = [
 		default: '',
 		displayOptions: {
 			show: {
-				version: [2],
 				resource: ['databasePage'],
 				operation: ['create'],
 			},
+			hide: {
+				'@version': [1],
+			},
 		},
 		description: 'Page title. Appears at the top of the page and can be found via Quick Find.',
 	},
@@ -502,9 +506,11 @@ export const databasePageFields: INodeProperties[] = [
 						},
 						displayOptions: {
 							show: {
-								'/version': [2],
 								type: ['files'],
 							},
+							hide: {
+								'@version': [1],
+							},
 						},
 						default: {},
 						options: [
@@ -969,9 +975,11 @@ export const databasePageFields: INodeProperties[] = [
 						},
 						displayOptions: {
 							show: {
-								'/version': [2],
 								type: ['files'],
 							},
+							hide: {
+								'@version': [1],
+							},
 						},
 						default: {},
 						options: [
@@ -1000,6 +1008,48 @@ export const databasePageFields: INodeProperties[] = [
 			},
 		],
 	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		displayOptions: {
+			show: {
+				resource: ['databasePage'],
+				operation: ['update'],
+			},
+		},
+		default: {},
+		placeholder: 'Add Option',
+		options: [
+			{
+				displayName: 'Icon Type',
+				name: 'iconType',
+				type: 'options',
+				options: [
+					{
+						name: 'Emoji',
+						value: 'emoji',
+						description: 'Use an Emoji for the icon',
+					},
+					{
+						name: 'File',
+						value: 'file',
+						description: 'Use a file for the icon',
+					},
+				],
+				default: 'emoji',
+				description: 'The icon type for the database page, Either a URL or an Emoji',
+			},
+			{
+				displayName: 'Icon',
+				name: 'icon',
+				type: 'string',
+				default: '',
+				description: 'Emoji or File URL to use as the icon',
+			},
+		],
+	},
+
 	/* -------------------------------------------------------------------------- */
 	/*                                databasePage:get                            */
 	/* -------------------------------------------------------------------------- */
@@ -1055,10 +1105,12 @@ export const databasePageFields: INodeProperties[] = [
 		],
 		displayOptions: {
 			show: {
-				version: [2],
 				resource: ['databasePage'],
 				operation: ['get'],
 			},
+			hide: {
+				'@version': [1],
+			},
 		},
 		description: 'The Notion Database Page to get',
 	},
@@ -1068,10 +1120,12 @@ export const databasePageFields: INodeProperties[] = [
 		type: 'boolean',
 		displayOptions: {
 			show: {
-				version: [2],
 				resource: ['databasePage'],
 				operation: ['get'],
 			},
+			hide: {
+				'@version': [1],
+			},
 		},
 		default: true,
 		description: 'Whether to return a simplified version of the response instead of the raw data',
@@ -1212,10 +1266,12 @@ export const databasePageFields: INodeProperties[] = [
 				type: 'boolean',
 				displayOptions: {
 					show: {
-						'/version': [2],
 						'/resource': ['databasePage'],
 						'/operation': ['getAll'],
 					},
+					hide: {
+						'@version': [1],
+					},
 				},
 				default: false,
 				description: "Whether to download a file if a database's field contains it",
@@ -1230,7 +1286,7 @@ export const databasePageFields: INodeProperties[] = [
 				},
 				displayOptions: {
 					show: {
-						'/version': [1],
+						'@version': [1],
 					},
 				},
 				default: {},
diff --git a/packages/nodes-base/nodes/Notion/Filters.ts b/packages/nodes-base/nodes/Notion/shared/descriptions/Filters.ts
similarity index 100%
rename from packages/nodes-base/nodes/Notion/Filters.ts
rename to packages/nodes-base/nodes/Notion/shared/descriptions/Filters.ts
diff --git a/packages/nodes-base/nodes/Notion/shared/descriptions/PageDescription.ts b/packages/nodes-base/nodes/Notion/shared/descriptions/PageDescription.ts
new file mode 100644
index 0000000000000..d0abb0f3f0cb1
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/shared/descriptions/PageDescription.ts
@@ -0,0 +1,491 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+import { blocks } from './Blocks';
+
+export const pageOperations: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				'@version': [1],
+				resource: ['page'],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a page',
+				action: 'Create a page',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get a page',
+				action: 'Get a page',
+			},
+			{
+				name: 'Search',
+				value: 'search',
+				description: 'Text search of pages',
+				action: 'Search a page',
+			},
+		],
+		default: 'create',
+	},
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				resource: ['page'],
+			},
+			hide: {
+				'@version': [1],
+			},
+		},
+		options: [
+			{
+				name: 'Archive',
+				value: 'archive',
+				description: 'Archive a page',
+				action: 'Archive a page',
+			},
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a page',
+				action: 'Create a page',
+			},
+			{
+				name: 'Search',
+				value: 'search',
+				description: 'Text search of pages',
+				action: 'Search a page',
+			},
+		],
+		default: 'create',
+	},
+];
+
+export const pageFields: INodeProperties[] = [
+	/* -------------------------------------------------------------------------- */
+	/*                                page:archive                                */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Page',
+		name: 'pageId',
+		type: 'resourceLocator',
+		default: { mode: 'url', value: '' },
+		required: true,
+		modes: [
+			{
+				displayName: 'Link',
+				name: 'url',
+				type: 'string',
+				placeholder: 'https://www.notion.so/My-Page-b4eeb113e118403aa450af65ac25f0b9',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex:
+								'(?:https|http)://www.notion.so/(?:[a-z0-9-]{2,}/)?(?:[a-zA-Z0-9-]{2,}-)?([0-9a-f]{8}[0-9a-f]{4}4[0-9a-f]{3}[89ab][0-9a-f]{3}[0-9a-f]{12}).*',
+							errorMessage: 'Not a valid Notion Page URL',
+						},
+					},
+				],
+				extractValue: {
+					type: 'regex',
+					regex:
+						'(?:https|http)://www.notion.so/(?:[a-z0-9-]{2,}/)?(?:[a-zA-Z0-9-]{2,}-)?([0-9a-f]{8}[0-9a-f]{4}4[0-9a-f]{3}[89ab][0-9a-f]{3}[0-9a-f]{12})',
+				},
+			},
+			{
+				displayName: 'ID',
+				name: 'id',
+				type: 'string',
+				placeholder: 'ab1545b247fb49fa92d6f4b49f4d8116',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex:
+								'^(([0-9a-f]{8}[0-9a-f]{4}4[0-9a-f]{3}[89ab][0-9a-f]{3}[0-9a-f]{12})|([0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}))[ \t]*',
+							errorMessage: 'Not a valid Notion Page ID',
+						},
+					},
+				],
+				extractValue: {
+					type: 'regex',
+					regex: '^([0-9a-f]{8}-?[0-9a-f]{4}-?4[0-9a-f]{3}-?[89ab][0-9a-f]{3}-?[0-9a-f]{12})',
+				},
+				url: '=https://www.notion.so/{{$value.replace(/-/g, "")}}',
+			},
+		],
+		displayOptions: {
+			show: {
+				resource: ['page'],
+				operation: ['archive'],
+			},
+			hide: {
+				'@version': [1],
+			},
+		},
+		description: 'The Notion Page to archive',
+	},
+	{
+		displayName: 'Simplify',
+		name: 'simple',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: ['page'],
+				operation: ['archive'],
+			},
+			hide: {
+				'@version': [1],
+			},
+		},
+		default: true,
+		description: 'Whether to return a simplified version of the response instead of the raw data',
+	},
+	/* -------------------------------------------------------------------------- */
+	/*                                page:create                                 */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Parent Page',
+		name: 'pageId',
+		type: 'resourceLocator',
+		default: { mode: 'url', value: '' },
+		required: true,
+		modes: [
+			{
+				displayName: 'Link',
+				name: 'url',
+				type: 'string',
+				placeholder: 'https://www.notion.so/My-Page-b4eeb113e118403aa450af65ac25f0b9',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex:
+								'(?:https|http)://www.notion.so/(?:[a-z0-9-]{2,}/)?(?:[a-zA-Z0-9-]{2,}-)?([0-9a-f]{8}[0-9a-f]{4}4[0-9a-f]{3}[89ab][0-9a-f]{3}[0-9a-f]{12}).*',
+							errorMessage: 'Not a valid Notion Page URL',
+						},
+					},
+				],
+				extractValue: {
+					type: 'regex',
+					regex:
+						'(?:https|http)://www.notion.so/(?:[a-z0-9-]{2,}/)?(?:[a-zA-Z0-9-]{2,}-)?([0-9a-f]{8}[0-9a-f]{4}4[0-9a-f]{3}[89ab][0-9a-f]{3}[0-9a-f]{12})',
+				},
+			},
+			{
+				displayName: 'ID',
+				name: 'id',
+				type: 'string',
+				placeholder: 'ab1545b247fb49fa92d6f4b49f4d8116',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex:
+								'^(([0-9a-f]{8}[0-9a-f]{4}4[0-9a-f]{3}[89ab][0-9a-f]{3}[0-9a-f]{12})|([0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}))[ \t]*',
+							errorMessage: 'Not a valid Notion Page ID',
+						},
+					},
+				],
+				extractValue: {
+					type: 'regex',
+					regex: '^([0-9a-f]{8}-?[0-9a-f]{4}-?4[0-9a-f]{3}-?[89ab][0-9a-f]{3}-?[0-9a-f]{12})',
+				},
+				url: '=https://www.notion.so/{{$value.replace(/-/g, "")}}',
+			},
+		],
+		displayOptions: {
+			show: {
+				resource: ['page'],
+				operation: ['create'],
+			},
+		},
+		description: 'The Notion Database Page to create a child page for',
+	},
+	{
+		displayName: 'Title',
+		name: 'title',
+		type: 'string',
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: ['page'],
+				operation: ['create'],
+			},
+		},
+		description: 'Page title. Appears at the top of the page and can be found via Quick Find.',
+	},
+	{
+		displayName: 'Simplify',
+		name: 'simple',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: ['page'],
+				operation: ['create'],
+			},
+		},
+		default: true,
+		description: 'Whether to return a simplified version of the response instead of the raw data',
+	},
+	...blocks('page', 'create'),
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		displayOptions: {
+			show: {
+				resource: ['page'],
+				operation: ['create'],
+			},
+		},
+		default: {},
+		placeholder: 'Add Option',
+		options: [
+			{
+				displayName: 'Icon Type',
+				name: 'iconType',
+				type: 'options',
+				options: [
+					{
+						name: 'Emoji',
+						value: 'emoji',
+						description: 'Use an Emoji for the icon',
+					},
+					{
+						name: 'File',
+						value: 'file',
+						description: 'Use a file for the icon',
+					},
+				],
+				default: 'emoji',
+				description: 'The icon type for the page, Either a URL or an Emoji',
+			},
+			{
+				displayName: 'Icon',
+				name: 'icon',
+				type: 'string',
+				default: '',
+				description: 'Emoji or File URL to use as the icon',
+			},
+		],
+	},
+	/* -------------------------------------------------------------------------- */
+	/*                                page:get                                    */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Page Link or ID',
+		name: 'pageId',
+		type: 'string',
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				'@version': [1],
+				resource: ['page'],
+				operation: ['get'],
+			},
+		},
+		description:
+			"The Page URL from Notion's 'copy link' functionality (or just the ID contained within the URL)",
+	},
+	{
+		displayName: 'Simplify',
+		name: 'simple',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				'@version': [1],
+				resource: ['page'],
+				operation: ['get'],
+			},
+		},
+		default: true,
+		description: 'Whether to return a simplified version of the response instead of the raw data',
+	},
+	/* -------------------------------------------------------------------------- */
+	/*                                page:search                                  */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Search Text',
+		name: 'text',
+		type: 'string',
+		default: '',
+		displayOptions: {
+			show: {
+				resource: ['page'],
+				operation: ['search'],
+			},
+		},
+		description: 'The text to search for',
+	},
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: ['page'],
+				operation: ['search'],
+			},
+		},
+		default: false,
+		description: 'Whether to return all results or only up to a given limit',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				resource: ['page'],
+				operation: ['search'],
+				returnAll: [false],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 100,
+		},
+		default: 50,
+		description: 'Max number of results to return',
+	},
+	{
+		displayName: 'Simplify',
+		name: 'simple',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: ['page'],
+				operation: ['search'],
+			},
+		},
+		default: true,
+		description: 'Whether to return a simplified version of the response instead of the raw data',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		displayOptions: {
+			show: {
+				resource: ['page'],
+				operation: ['search'],
+			},
+		},
+		default: {},
+		placeholder: 'Add Field',
+		options: [
+			{
+				displayName: 'Filters',
+				name: 'filter',
+				placeholder: 'Add Filter',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: false,
+				},
+				default: {},
+				options: [
+					{
+						displayName: 'Filter',
+						name: 'filters',
+						values: [
+							{
+								displayName: 'Property',
+								name: 'property',
+								type: 'options',
+								options: [
+									{
+										name: 'Object',
+										value: 'object',
+									},
+								],
+								default: 'object',
+								description: 'The name of the property to filter by',
+							},
+							{
+								displayName: 'Value',
+								name: 'value',
+								type: 'options',
+								options: [
+									{
+										name: 'Database',
+										value: 'database',
+									},
+									{
+										name: 'Page',
+										value: 'page',
+									},
+								],
+								default: '',
+								description: 'The value of the property to filter by',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Sort',
+				name: 'sort',
+				placeholder: 'Add Sort',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: false,
+				},
+				default: {},
+				options: [
+					{
+						displayName: 'Sort',
+						name: 'sortValue',
+						values: [
+							{
+								displayName: 'Direction',
+								name: 'direction',
+								type: 'options',
+								options: [
+									{
+										name: 'Ascending',
+										value: 'ascending',
+									},
+									{
+										name: 'Descending',
+										value: 'descending',
+									},
+								],
+								default: 'descending',
+								description: 'The direction to sort',
+							},
+							{
+								displayName: 'Timestamp',
+								name: 'timestamp',
+								type: 'options',
+								options: [
+									{
+										name: 'Last Edited Time',
+										value: 'last_edited_time',
+									},
+								],
+								default: 'last_edited_time',
+								description: 'The name of the timestamp to sort against',
+							},
+						],
+					},
+				],
+			},
+		],
+	},
+];
diff --git a/packages/nodes-base/nodes/Notion/UserDescription.ts b/packages/nodes-base/nodes/Notion/shared/descriptions/UserDescription.ts
similarity index 100%
rename from packages/nodes-base/nodes/Notion/UserDescription.ts
rename to packages/nodes-base/nodes/Notion/shared/descriptions/UserDescription.ts
diff --git a/packages/nodes-base/nodes/Notion/shared/methods/index.ts b/packages/nodes-base/nodes/Notion/shared/methods/index.ts
new file mode 100644
index 0000000000000..c7fb720e474f5
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/shared/methods/index.ts
@@ -0,0 +1 @@
+export * as listSearch from './listSearch';
diff --git a/packages/nodes-base/nodes/Notion/shared/methods/listSearch.ts b/packages/nodes-base/nodes/Notion/shared/methods/listSearch.ts
new file mode 100644
index 0000000000000..1caba20dcff65
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/shared/methods/listSearch.ts
@@ -0,0 +1,37 @@
+import type {
+	IDataObject,
+	ILoadOptionsFunctions,
+	INodeListSearchItems,
+	INodeListSearchResult,
+} from 'n8n-workflow';
+import { notionApiRequestAllItems } from '../GenericFunctions';
+
+export async function getDatabases(
+	this: ILoadOptionsFunctions,
+	filter?: string,
+): Promise<INodeListSearchResult> {
+	const returnData: INodeListSearchItems[] = [];
+	const body: IDataObject = {
+		page_size: 100,
+		query: filter,
+		filter: { property: 'object', value: 'database' },
+	};
+	const databases = await notionApiRequestAllItems.call(this, 'results', 'POST', '/search', body);
+	for (const database of databases) {
+		returnData.push({
+			name: database.title[0]?.plain_text || database.id,
+			value: database.id,
+			url: database.url,
+		});
+	}
+	returnData.sort((a, b) => {
+		if (a.name.toLocaleLowerCase() < b.name.toLocaleLowerCase()) {
+			return -1;
+		}
+		if (a.name.toLocaleLowerCase() > b.name.toLocaleLowerCase()) {
+			return 1;
+		}
+		return 0;
+	});
+	return { results: returnData };
+}
diff --git a/packages/nodes-base/nodes/Notion/test/GenericFunctions.test.ts b/packages/nodes-base/nodes/Notion/test/GenericFunctions.test.ts
new file mode 100644
index 0000000000000..dc5baba799c9a
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/test/GenericFunctions.test.ts
@@ -0,0 +1,33 @@
+import { formatBlocks } from '../shared/GenericFunctions';
+
+describe('Test NotionV2, formatBlocks', () => {
+	it('should format to_do block', () => {
+		const blocks = [
+			{
+				type: 'to_do',
+				checked: false,
+				richText: false,
+				textContent: 'Testing',
+			},
+		];
+
+		const result = formatBlocks(blocks);
+
+		expect(result).toEqual([
+			{
+				object: 'block',
+				type: 'to_do',
+				to_do: {
+					checked: false,
+					text: [
+						{
+							text: {
+								content: 'Testing',
+							},
+						},
+					],
+				},
+			},
+		]);
+	});
+});
diff --git a/packages/nodes-base/nodes/Notion/v1/NotionV1.node.ts b/packages/nodes-base/nodes/Notion/v1/NotionV1.node.ts
index 771a9b6d43616..587094b91bfba 100644
--- a/packages/nodes-base/nodes/Notion/v1/NotionV1.node.ts
+++ b/packages/nodes-base/nodes/Notion/v1/NotionV1.node.ts
@@ -9,26 +9,25 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
-import type { SortData } from '../GenericFunctions';
+import moment from 'moment-timezone';
+import type { SortData } from '../shared/GenericFunctions';
 import {
 	extractDatabaseId,
 	extractDatabaseMentionRLC,
 	extractPageId,
 	formatBlocks,
 	formatTitle,
-	getBlockTypes,
+	getBlockTypesOptions,
 	mapFilters,
 	mapProperties,
 	mapSorting,
 	notionApiRequest,
 	notionApiRequestAllItems,
 	simplifyObjects,
-} from '../GenericFunctions';
-
-import moment from 'moment-timezone';
+} from '../shared/GenericFunctions';
 
+import { listSearch } from '../shared/methods';
 import { versionDescription } from './VersionDescription';
-import { getDatabases } from '../SearchFunctions';
 
 export class NotionV1 implements INodeType {
 	description: INodeTypeDescription;
@@ -41,9 +40,7 @@ export class NotionV1 implements INodeType {
 	}
 
 	methods = {
-		listSearch: {
-			getDatabases,
-		},
+		listSearch,
 		loadOptions: {
 			async getDatabaseProperties(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
 				const returnData: INodePropertyOptions[] = [];
@@ -105,7 +102,7 @@ export class NotionV1 implements INodeType {
 				return returnData;
 			},
 			async getBlockTypes(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				return getBlockTypes();
+				return getBlockTypesOptions();
 			},
 			async getPropertySelectValues(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
 				const [name, type] = (this.getCurrentNodeParameter('&key') as string).split('|');
@@ -625,6 +622,6 @@ export class NotionV1 implements INodeType {
 				}
 			}
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Notion/v1/VersionDescription.ts b/packages/nodes-base/nodes/Notion/v1/VersionDescription.ts
index e01fb1b4a7ade..6f08675439a43 100644
--- a/packages/nodes-base/nodes/Notion/v1/VersionDescription.ts
+++ b/packages/nodes-base/nodes/Notion/v1/VersionDescription.ts
@@ -1,15 +1,17 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
-import { databaseFields, databaseOperations } from '../DatabaseDescription';
-
-import { userFields, userOperations } from '../UserDescription';
+import type { INodeTypeDescription } from 'n8n-workflow';
+import { databaseFields, databaseOperations } from '../shared/descriptions/DatabaseDescription';
 
-import { pageFields, pageOperations } from '../PageDescription';
+import { userFields, userOperations } from '../shared/descriptions/UserDescription';
 
-import { blockFields, blockOperations } from '../BlockDescription';
+import { pageFields, pageOperations } from '../shared/descriptions/PageDescription';
 
-import { databasePageFields, databasePageOperations } from '../DatabasePageDescription';
+import { blockFields, blockOperations } from '../shared/descriptions/BlockDescription';
 
-import type { INodeTypeDescription } from 'n8n-workflow';
+import {
+	databasePageFields,
+	databasePageOperations,
+} from '../shared/descriptions/DatabasePageDescription';
 
 export const versionDescription: INodeTypeDescription = {
 	displayName: 'Notion',
@@ -20,7 +22,7 @@ export const versionDescription: INodeTypeDescription = {
 	subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
 	description: 'Consume Notion API',
 	defaults: {
-		name: 'Notion (Beta)',
+		name: 'Notion',
 	},
 	inputs: ['main'],
 	outputs: ['main'],
@@ -73,12 +75,6 @@ export const versionDescription: INodeTypeDescription = {
 			type: 'notice',
 			default: '',
 		},
-		{
-			displayName: 'Version',
-			name: 'version',
-			type: 'hidden',
-			default: 1,
-		},
 		{
 			displayName: 'Resource',
 			name: 'resource',
diff --git a/packages/nodes-base/nodes/Notion/v2/NotionV2.node.ts b/packages/nodes-base/nodes/Notion/v2/NotionV2.node.ts
index f0050ab867b90..6c5205f9d04f2 100644
--- a/packages/nodes-base/nodes/Notion/v2/NotionV2.node.ts
+++ b/packages/nodes-base/nodes/Notion/v2/NotionV2.node.ts
@@ -1,37 +1,37 @@
 import type {
 	IExecuteFunctions,
 	IDataObject,
-	ILoadOptionsFunctions,
 	INodeExecutionData,
-	INodePropertyOptions,
 	INodeType,
 	INodeTypeBaseDescription,
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { jsonParse, NodeApiError } from 'n8n-workflow';
 
-import type { SortData, FileRecord } from '../GenericFunctions';
+import type { SortData, FileRecord } from '../shared/GenericFunctions';
 import {
 	downloadFiles,
+	extractBlockId,
 	extractDatabaseId,
 	extractDatabaseMentionRLC,
 	extractPageId,
 	formatBlocks,
 	formatTitle,
-	getBlockTypes,
 	mapFilters,
 	mapProperties,
 	mapSorting,
 	notionApiRequest,
 	notionApiRequestAllItems,
+	notionApiRequestGetBlockChildrens,
+	prepareNotionError,
+	simplifyBlocksOutput,
 	simplifyObjects,
 	validateJSON,
-} from '../GenericFunctions';
-
-import moment from 'moment-timezone';
+} from '../shared/GenericFunctions';
 
+import { listSearch } from '../shared/methods';
+import { loadOptions } from './methods';
 import { versionDescription } from './VersionDescription';
-import { getDatabases } from '../SearchFunctions';
 
 export class NotionV2 implements INodeType {
 	description: INodeTypeDescription;
@@ -43,268 +43,133 @@ export class NotionV2 implements INodeType {
 		};
 	}
 
-	methods = {
-		listSearch: {
-			getDatabases,
-		},
-		loadOptions: {
-			async getDatabaseProperties(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const databaseId = this.getCurrentNodeParameter('databaseId', {
-					extractValue: true,
-				}) as string;
-				const { properties } = await notionApiRequest.call(this, 'GET', `/databases/${databaseId}`);
-				for (const key of Object.keys(properties as IDataObject)) {
-					//remove parameters that cannot be set from the API.
-					if (
-						![
-							'created_time',
-							'last_edited_time',
-							'created_by',
-							'last_edited_by',
-							'formula',
-							'rollup',
-						].includes(properties[key].type as string)
-					) {
-						returnData.push({
-							name: `${key}`,
-							value: `${key}|${properties[key].type}`,
-						});
-					}
-				}
-				returnData.sort((a, b) => {
-					if (a.name.toLocaleLowerCase() < b.name.toLocaleLowerCase()) {
-						return -1;
-					}
-					if (a.name.toLocaleLowerCase() > b.name.toLocaleLowerCase()) {
-						return 1;
-					}
-					return 0;
-				});
-				return returnData;
-			},
-			async getFilterProperties(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const databaseId = this.getCurrentNodeParameter('databaseId', {
-					extractValue: true,
-				}) as string;
-				const { properties } = await notionApiRequest.call(this, 'GET', `/databases/${databaseId}`);
-				for (const key of Object.keys(properties as IDataObject)) {
-					returnData.push({
-						name: `${key}`,
-						value: `${key}|${properties[key].type}`,
-					});
-				}
-				returnData.sort((a, b) => {
-					if (a.name.toLocaleLowerCase() < b.name.toLocaleLowerCase()) {
-						return -1;
-					}
-					if (a.name.toLocaleLowerCase() > b.name.toLocaleLowerCase()) {
-						return 1;
-					}
-					return 0;
-				});
-				return returnData;
-			},
-			async getBlockTypes(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				return getBlockTypes();
-			},
-			async getPropertySelectValues(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const [name, type] = (this.getCurrentNodeParameter('&key') as string).split('|');
-				const databaseId = this.getCurrentNodeParameter('databaseId', {
-					extractValue: true,
-				}) as string;
-				const resource = this.getCurrentNodeParameter('resource') as string;
-				const operation = this.getCurrentNodeParameter('operation') as string;
-				const { properties } = await notionApiRequest.call(this, 'GET', `/databases/${databaseId}`);
-				if (resource === 'databasePage') {
-					if (['multi_select', 'select', 'status'].includes(type) && operation === 'getAll') {
-						return properties[name][type].options.map((option: IDataObject) => ({
-							name: option.name,
-							value: option.name,
-						}));
-					} else if (
-						['multi_select', 'select', 'status'].includes(type) &&
-						['create', 'update'].includes(operation)
-					) {
-						return properties[name][type].options.map((option: IDataObject) => ({
-							name: option.name,
-							value: option.name,
-						}));
-					}
-				}
-				return properties[name][type].options.map((option: IDataObject) => ({
-					name: option.name,
-					value: option.id,
-				}));
-			},
-			async getUsers(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const users = await notionApiRequestAllItems.call(this, 'results', 'GET', '/users');
-				for (const user of users) {
-					if (user.type === 'person') {
-						returnData.push({
-							name: user.name,
-							value: user.id,
-						});
-					}
-				}
-				return returnData;
-			},
-			async getDatabaseIdFromPage(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const pageId = extractPageId(
-					this.getCurrentNodeParameter('pageId', { extractValue: true }) as string,
-				);
-				const {
-					parent: { database_id: databaseId },
-				} = await notionApiRequest.call(this, 'GET', `/pages/${pageId}`);
-				const { properties } = await notionApiRequest.call(this, 'GET', `/databases/${databaseId}`);
-				for (const key of Object.keys(properties as IDataObject)) {
-					//remove parameters that cannot be set from the API.
-					if (
-						![
-							'created_time',
-							'last_edited_time',
-							'created_by',
-							'last_edited_by',
-							'formula',
-							'rollup',
-						].includes(properties[key].type as string)
-					) {
-						returnData.push({
-							name: `${key}`,
-							value: `${key}|${properties[key].type}`,
-						});
-					}
-				}
-				returnData.sort((a, b) => {
-					if (a.name.toLocaleLowerCase() < b.name.toLocaleLowerCase()) {
-						return -1;
-					}
-					if (a.name.toLocaleLowerCase() > b.name.toLocaleLowerCase()) {
-						return 1;
-					}
-					return 0;
-				});
-				return returnData;
-			},
-
-			async getDatabaseOptionsFromPage(
-				this: ILoadOptionsFunctions,
-			): Promise<INodePropertyOptions[]> {
-				const pageId = extractPageId(
-					this.getCurrentNodeParameter('pageId', { extractValue: true }) as string,
-				);
-				const [name, type] = (this.getCurrentNodeParameter('&key') as string).split('|');
-				const {
-					parent: { database_id: databaseId },
-				} = await notionApiRequest.call(this, 'GET', `/pages/${pageId}`);
-				const { properties } = await notionApiRequest.call(this, 'GET', `/databases/${databaseId}`);
-				return properties[name][type].options.map((option: IDataObject) => ({
-					name: option.name,
-					value: option.name,
-				}));
-			},
-
-			// Get all the timezones to display them to user so that they can
-			// select them easily
-			async getTimezones(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				for (const timezone of moment.tz.names()) {
-					const timezoneName = timezone;
-					const timezoneId = timezone;
-					returnData.push({
-						name: timezoneName,
-						value: timezoneId,
-					});
-				}
-				returnData.unshift({
-					name: 'Default',
-					value: 'default',
-					description: 'Timezone set in n8n',
-				});
-				return returnData;
-			},
-		},
-	};
+	methods = { listSearch, loadOptions };
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const items = this.getInputData();
-		const returnData: INodeExecutionData[] = [];
-		const length = items.length;
-		let responseData;
-		const qs: IDataObject = {};
-		const timezone = this.getTimezone();
-
+		const nodeVersion = this.getNode().typeVersion;
 		const resource = this.getNodeParameter('resource', 0);
 		const operation = this.getNodeParameter('operation', 0);
+
+		const itemsLength = items.length;
+		const timezone = this.getTimezone();
+		const qs: IDataObject = {};
+
+		let returnData: INodeExecutionData[] = [];
+		let responseData;
 		let download = false;
 
 		if (resource === 'block') {
 			if (operation === 'append') {
-				for (let i = 0; i < length; i++) {
-					const blockId = extractPageId(
-						this.getNodeParameter('blockId', i, '', { extractValue: true }) as string,
-					);
-					const blockValues = this.getNodeParameter('blockUi.blockValues', i, []) as IDataObject[];
-					extractDatabaseMentionRLC(blockValues);
-					const body: IDataObject = {
-						children: formatBlocks(blockValues),
-					};
-					const block = await notionApiRequest.call(
-						this,
-						'PATCH',
-						`/blocks/${blockId}/children`,
-						body,
-					);
-
-					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(block as IDataObject),
-						{ itemData: { item: i } },
-					);
-					returnData.push(...executionData);
-				}
-			}
-
-			if (operation === 'getAll') {
-				for (let i = 0; i < length; i++) {
-					const blockId = extractPageId(
-						this.getNodeParameter('blockId', i, '', { extractValue: true }) as string,
-					);
-					const returnAll = this.getNodeParameter('returnAll', i);
-
-					if (returnAll) {
-						responseData = await notionApiRequestAllItems.call(
+				for (let i = 0; i < itemsLength; i++) {
+					try {
+						const blockId = extractBlockId.call(this, nodeVersion, i);
+						const blockValues = this.getNodeParameter(
+							'blockUi.blockValues',
+							i,
+							[],
+						) as IDataObject[];
+						extractDatabaseMentionRLC(blockValues);
+						const body: IDataObject = {
+							children: formatBlocks(blockValues),
+						};
+						const block = await notionApiRequest.call(
 							this,
-							'results',
-							'GET',
+							'PATCH',
 							`/blocks/${blockId}/children`,
-							{},
+							body,
 						);
-					} else {
-						qs.page_size = this.getNodeParameter('limit', i);
-						responseData = await notionApiRequest.call(
-							this,
-							'GET',
-							`/blocks/${blockId}/children`,
-							{},
-							qs,
+
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(block as IDataObject),
+							{ itemData: { item: i } },
 						);
-						responseData = responseData.results;
+						returnData = returnData.concat(executionData);
+					} catch (error) {
+						if (this.continueOnFail()) {
+							returnData.push({
+								json: { error: error.message },
+								pairedItem: { item: i },
+							});
+						} else {
+							throw prepareNotionError(this.getNode(), error, i);
+						}
 					}
+				}
+			}
 
-					responseData = responseData.map((_data: IDataObject) => ({
-						object: _data.object,
-						parent_id: blockId,
-						..._data,
-					}));
-
-					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData as IDataObject),
-						{ itemData: { item: i } },
-					);
-					returnData.push(...executionData);
+			if (operation === 'getAll') {
+				for (let i = 0; i < itemsLength; i++) {
+					try {
+						const blockId = extractBlockId.call(this, nodeVersion, i);
+						const returnAll = this.getNodeParameter('returnAll', i);
+						const fetchNestedBlocks = this.getNodeParameter('fetchNestedBlocks', i) as boolean;
+
+						if (returnAll) {
+							responseData = await notionApiRequestAllItems.call(
+								this,
+								'results',
+								'GET',
+								`/blocks/${blockId}/children`,
+								{},
+							);
+
+							if (fetchNestedBlocks) {
+								responseData = await notionApiRequestGetBlockChildrens.call(this, responseData);
+							}
+						} else {
+							const limit = this.getNodeParameter('limit', i);
+							qs.page_size = limit;
+							responseData = await notionApiRequest.call(
+								this,
+								'GET',
+								`/blocks/${blockId}/children`,
+								{},
+								qs,
+							);
+							const results = responseData.results;
+
+							if (fetchNestedBlocks) {
+								responseData = await notionApiRequestGetBlockChildrens.call(
+									this,
+									results,
+									[],
+									limit,
+								);
+							} else {
+								responseData = results;
+							}
+						}
+
+						responseData = responseData.map((_data: IDataObject) => ({
+							object: _data.object,
+							parent_id: blockId,
+							..._data,
+						}));
+
+						if (nodeVersion > 2) {
+							const simplifyOutput = this.getNodeParameter('simplifyOutput', i) as boolean;
+
+							if (simplifyOutput) {
+								responseData = simplifyBlocksOutput(responseData, blockId);
+							}
+						}
+
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(responseData as IDataObject),
+							{ itemData: { item: i } },
+						);
+						returnData = returnData.concat(executionData);
+					} catch (error) {
+						if (this.continueOnFail()) {
+							returnData.push({
+								json: { error: error.message },
+								pairedItem: { item: i },
+							});
+						} else {
+							throw prepareNotionError(this.getNode(), error, i);
+						}
+					}
 				}
 			}
 		}
@@ -312,104 +177,137 @@ export class NotionV2 implements INodeType {
 		if (resource === 'database') {
 			if (operation === 'get') {
 				const simple = this.getNodeParameter('simple', 0) as boolean;
-				for (let i = 0; i < length; i++) {
-					const databaseId = extractDatabaseId(
-						this.getNodeParameter('databaseId', i, '', { extractValue: true }) as string,
-					);
-					responseData = await notionApiRequest.call(this, 'GET', `/databases/${databaseId}`);
-					if (simple) {
-						responseData = simplifyObjects(responseData, download)[0];
-					}
+				for (let i = 0; i < itemsLength; i++) {
+					try {
+						const databaseId = extractDatabaseId(
+							this.getNodeParameter('databaseId', i, '', { extractValue: true }) as string,
+						);
+						responseData = await notionApiRequest.call(this, 'GET', `/databases/${databaseId}`);
+						if (simple) {
+							responseData = simplifyObjects(responseData, download)[0];
+						}
 
-					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData as IDataObject),
-						{ itemData: { item: i } },
-					);
-					returnData.push(...executionData);
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(responseData as IDataObject),
+							{ itemData: { item: i } },
+						);
+						returnData = returnData.concat(executionData);
+					} catch (error) {
+						if (this.continueOnFail()) {
+							returnData.push({
+								json: { error: error.message },
+								pairedItem: { item: i },
+							});
+						} else {
+							throw prepareNotionError(this.getNode(), error, i);
+						}
+					}
 				}
 			}
 
 			if (operation === 'getAll') {
 				const simple = this.getNodeParameter('simple', 0) as boolean;
-				for (let i = 0; i < length; i++) {
-					const body: IDataObject = {
-						filter: { property: 'object', value: 'database' },
-					};
-					const returnAll = this.getNodeParameter('returnAll', i);
-					if (returnAll) {
-						responseData = await notionApiRequestAllItems.call(
-							this,
-							'results',
-							'POST',
-							'/search',
-							body,
+				for (let i = 0; i < itemsLength; i++) {
+					try {
+						const body: IDataObject = {
+							filter: { property: 'object', value: 'database' },
+						};
+						const returnAll = this.getNodeParameter('returnAll', i);
+						if (returnAll) {
+							responseData = await notionApiRequestAllItems.call(
+								this,
+								'results',
+								'POST',
+								'/search',
+								body,
+							);
+						} else {
+							body.page_size = this.getNodeParameter('limit', i);
+							responseData = await notionApiRequest.call(this, 'POST', '/search', body);
+							responseData = responseData.results;
+						}
+						if (simple) {
+							responseData = simplifyObjects(responseData, download);
+						}
+
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(responseData as IDataObject),
+							{ itemData: { item: i } },
 						);
-					} else {
-						body.page_size = this.getNodeParameter('limit', i);
-						responseData = await notionApiRequest.call(this, 'POST', '/search', body);
-						responseData = responseData.results;
-					}
-					if (simple) {
-						responseData = simplifyObjects(responseData, download);
+						returnData = returnData.concat(executionData);
+					} catch (error) {
+						if (this.continueOnFail()) {
+							returnData.push({
+								json: { error: error.message },
+								pairedItem: { item: i },
+							});
+						} else {
+							throw prepareNotionError(this.getNode(), error, i);
+						}
 					}
-
-					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData as IDataObject),
-						{ itemData: { item: i } },
-					);
-					returnData.push(...executionData);
 				}
 			}
 
 			if (operation === 'search') {
-				for (let i = 0; i < length; i++) {
-					const text = this.getNodeParameter('text', i) as string;
-					const options = this.getNodeParameter('options', i);
-					const returnAll = this.getNodeParameter('returnAll', i);
-					const simple = this.getNodeParameter('simple', i) as boolean;
-					const body: IDataObject = {
-						filter: {
-							property: 'object',
-							value: 'database',
-						},
-					};
-
-					if (text) {
-						body.query = text;
-					}
-					if (options.sort) {
-						const sort = ((options.sort as IDataObject)?.sortValue as IDataObject) || {};
-						body.sort = sort;
-					}
-					if (returnAll) {
-						responseData = await notionApiRequestAllItems.call(
-							this,
-							'results',
-							'POST',
-							'/search',
-							body,
-						);
-					} else {
-						qs.limit = this.getNodeParameter('limit', i);
-						responseData = await notionApiRequestAllItems.call(
-							this,
-							'results',
-							'POST',
-							'/search',
-							body,
-						);
-						responseData = responseData.splice(0, qs.limit);
-					}
+				for (let i = 0; i < itemsLength; i++) {
+					try {
+						const text = this.getNodeParameter('text', i) as string;
+						const options = this.getNodeParameter('options', i);
+						const returnAll = this.getNodeParameter('returnAll', i);
+						const simple = this.getNodeParameter('simple', i) as boolean;
+						const body: IDataObject = {
+							filter: {
+								property: 'object',
+								value: 'database',
+							},
+						};
 
-					if (simple) {
-						responseData = simplifyObjects(responseData, download);
-					}
+						if (text) {
+							body.query = text;
+						}
+						if (options.sort) {
+							const sort = ((options.sort as IDataObject)?.sortValue as IDataObject) || {};
+							body.sort = sort;
+						}
+						if (returnAll) {
+							responseData = await notionApiRequestAllItems.call(
+								this,
+								'results',
+								'POST',
+								'/search',
+								body,
+							);
+						} else {
+							qs.limit = this.getNodeParameter('limit', i);
+							responseData = await notionApiRequestAllItems.call(
+								this,
+								'results',
+								'POST',
+								'/search',
+								body,
+							);
+							responseData = responseData.splice(0, qs.limit);
+						}
+
+						if (simple) {
+							responseData = simplifyObjects(responseData, download);
+						}
 
-					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData as IDataObject),
-						{ itemData: { item: i } },
-					);
-					returnData.push(...executionData);
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(responseData as IDataObject),
+							{ itemData: { item: i } },
+						);
+						returnData = returnData.concat(executionData);
+					} catch (error) {
+						if (this.continueOnFail()) {
+							returnData.push({
+								json: { error: error.message },
+								pairedItem: { item: i },
+							});
+						} else {
+							throw prepareNotionError(this.getNode(), error, i);
+						}
+					}
 				}
 			}
 		}
@@ -426,343 +324,461 @@ export class NotionV2 implements INodeType {
 						titleKey = key;
 					}
 				}
-				for (let i = 0; i < length; i++) {
-					const title = this.getNodeParameter('title', i) as string;
-					const simple = this.getNodeParameter('simple', i) as boolean;
-
-					const body: { [key: string]: any } = {
-						parent: {},
-						properties: {},
-					};
-					if (title !== '') {
-						body.properties[titleKey] = {
-							title: [
-								{
-									text: {
-										content: title,
-									},
-								},
-							],
+				for (let i = 0; i < itemsLength; i++) {
+					try {
+						const title = this.getNodeParameter('title', i) as string;
+						const simple = this.getNodeParameter('simple', i) as boolean;
+
+						const body: { [key: string]: any } = {
+							parent: {},
+							properties: {},
 						};
-					}
-					body.parent.database_id = this.getNodeParameter('databaseId', i, '', {
-						extractValue: true,
-					}) as string;
-					const propertiesValues = this.getNodeParameter(
-						'propertiesUi.propertyValues',
-						i,
-						[],
-					) as IDataObject[];
-					if (propertiesValues.length !== 0) {
-						body.properties = Object.assign(
-							body.properties,
-							mapProperties.call(this, propertiesValues, timezone, 2) as IDataObject,
+						if (title !== '') {
+							body.properties[titleKey] = {
+								title: [
+									{
+										text: {
+											content: title,
+										},
+									},
+								],
+							};
+						}
+						body.parent.database_id = this.getNodeParameter('databaseId', i, '', {
+							extractValue: true,
+						}) as string;
+						const propertiesValues = this.getNodeParameter(
+							'propertiesUi.propertyValues',
+							i,
+							[],
+						) as IDataObject[];
+						if (propertiesValues.length !== 0) {
+							body.properties = Object.assign(
+								body.properties,
+								mapProperties.call(this, propertiesValues, timezone, 2) as IDataObject,
+							);
+						}
+						const blockValues = this.getNodeParameter(
+							'blockUi.blockValues',
+							i,
+							[],
+						) as IDataObject[];
+						extractDatabaseMentionRLC(blockValues);
+						body.children = formatBlocks(blockValues);
+
+						const options = this.getNodeParameter('options', i);
+						if (options.icon) {
+							if (options.iconType && options.iconType === 'file') {
+								body.icon = { external: { url: options.icon } };
+							} else {
+								body.icon = { emoji: options.icon };
+							}
+						}
+
+						responseData = await notionApiRequest.call(this, 'POST', '/pages', body);
+						if (simple) {
+							responseData = simplifyObjects(responseData);
+						}
+
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(responseData as IDataObject),
+							{ itemData: { item: i } },
 						);
-					}
-					const blockValues = this.getNodeParameter('blockUi.blockValues', i, []) as IDataObject[];
-					extractDatabaseMentionRLC(blockValues);
-					body.children = formatBlocks(blockValues);
-
-					const options = this.getNodeParameter('options', i);
-					if (options.icon) {
-						if (options.iconType && options.iconType === 'file') {
-							body.icon = { external: { url: options.icon } };
+						returnData = returnData.concat(executionData);
+					} catch (error) {
+						if (this.continueOnFail()) {
+							returnData.push({
+								json: { error: error.message },
+								pairedItem: { item: i },
+							});
 						} else {
-							body.icon = { emoji: options.icon };
+							throw prepareNotionError(this.getNode(), error, i);
 						}
 					}
-
-					responseData = await notionApiRequest.call(this, 'POST', '/pages', body);
-					if (simple) {
-						responseData = simplifyObjects(responseData);
-					}
-
-					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData as IDataObject),
-						{ itemData: { item: i } },
-					);
-					returnData.push(...executionData);
 				}
 			}
 
 			if (operation === 'get') {
-				for (let i = 0; i < length; i++) {
-					const pageId = extractPageId(
-						this.getNodeParameter('pageId', i, '', { extractValue: true }) as string,
-					);
-					const simple = this.getNodeParameter('simple', i) as boolean;
-					responseData = await notionApiRequest.call(this, 'GET', `/pages/${pageId}`);
-					if (simple) {
-						responseData = simplifyObjects(responseData, download);
-					}
+				for (let i = 0; i < itemsLength; i++) {
+					try {
+						const pageId = extractPageId(
+							this.getNodeParameter('pageId', i, '', { extractValue: true }) as string,
+						);
+						const simple = this.getNodeParameter('simple', i) as boolean;
+						responseData = await notionApiRequest.call(this, 'GET', `/pages/${pageId}`);
+						if (simple) {
+							responseData = simplifyObjects(responseData, download);
+						}
 
-					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData as IDataObject),
-						{ itemData: { item: i } },
-					);
-					returnData.push(...executionData);
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(responseData as IDataObject),
+							{ itemData: { item: i } },
+						);
+						returnData = returnData.concat(executionData);
+					} catch (error) {
+						if (this.continueOnFail()) {
+							returnData.push({
+								json: { error: error.message },
+								pairedItem: { item: i },
+							});
+						} else {
+							throw prepareNotionError(this.getNode(), error, i);
+						}
+					}
 				}
 			}
 
 			if (operation === 'getAll') {
-				for (let i = 0; i < length; i++) {
-					download = this.getNodeParameter('options.downloadFiles', 0, false) as boolean;
-					const simple = this.getNodeParameter('simple', 0) as boolean;
-					const databaseId = this.getNodeParameter('databaseId', i, '', {
-						extractValue: true,
-					}) as string;
-					const returnAll = this.getNodeParameter('returnAll', i);
-					const filterType = this.getNodeParameter('filterType', 0) as string;
-					const conditions = this.getNodeParameter('filters.conditions', i, []) as IDataObject[];
-					const sort = this.getNodeParameter('options.sort.sortValue', i, []) as IDataObject[];
-					const body: IDataObject = {
-						filter: {},
-					};
-
-					if (filterType === 'manual') {
-						const matchType = this.getNodeParameter('matchType', 0) as string;
-						if (matchType === 'anyFilter') {
-							Object.assign(body.filter!, {
-								or: conditions.map((data) => mapFilters([data], timezone)),
-							});
-						} else if (matchType === 'allFilters') {
-							Object.assign(body.filter!, {
-								and: conditions.map((data) => mapFilters([data], timezone)),
-							});
+				for (let i = 0; i < itemsLength; i++) {
+					try {
+						download = this.getNodeParameter('options.downloadFiles', 0, false) as boolean;
+						const simple = this.getNodeParameter('simple', 0) as boolean;
+						const databaseId = this.getNodeParameter('databaseId', i, '', {
+							extractValue: true,
+						}) as string;
+						const returnAll = this.getNodeParameter('returnAll', i);
+						const filterType = this.getNodeParameter('filterType', 0) as string;
+						const conditions = this.getNodeParameter('filters.conditions', i, []) as IDataObject[];
+						const sort = this.getNodeParameter('options.sort.sortValue', i, []) as IDataObject[];
+						const body: IDataObject = {
+							filter: {},
+						};
+
+						if (filterType === 'manual') {
+							const matchType = this.getNodeParameter('matchType', 0) as string;
+							if (matchType === 'anyFilter') {
+								Object.assign(body.filter!, {
+									or: conditions.map((data) => mapFilters([data], timezone)),
+								});
+							} else if (matchType === 'allFilters') {
+								Object.assign(body.filter!, {
+									and: conditions.map((data) => mapFilters([data], timezone)),
+								});
+							}
+						} else if (filterType === 'json') {
+							const filterJson = this.getNodeParameter('filterJson', i) as string;
+							if (validateJSON(filterJson) !== undefined) {
+								body.filter = jsonParse(filterJson);
+							} else {
+								throw new NodeApiError(
+									this.getNode(),
+									{
+										message: 'Filters (JSON) must be a valid json',
+									},
+									{ itemIndex: i },
+								);
+							}
 						}
-					} else if (filterType === 'json') {
-						const filterJson = this.getNodeParameter('filterJson', i) as string;
-						if (validateJSON(filterJson) !== undefined) {
-							body.filter = jsonParse(filterJson);
+
+						if (!Object.keys(body.filter as IDataObject).length) {
+							delete body.filter;
+						}
+						if (sort) {
+							body.sorts = mapSorting(sort as SortData[]);
+						}
+						if (returnAll) {
+							responseData = await notionApiRequestAllItems.call(
+								this,
+								'results',
+								'POST',
+								`/databases/${databaseId}/query`,
+								body,
+								{},
+							);
 						} else {
-							throw new NodeApiError(this.getNode(), {
-								message: 'Filters (JSON) must be a valid json',
-							});
+							body.page_size = this.getNodeParameter('limit', i);
+							responseData = await notionApiRequest.call(
+								this,
+								'POST',
+								`/databases/${databaseId}/query`,
+								body,
+								qs,
+							);
+							responseData = responseData.results;
+						}
+						if (download) {
+							responseData = await downloadFiles.call(this, responseData as FileRecord[], [
+								{ item: i },
+							]);
+						}
+						if (simple) {
+							responseData = simplifyObjects(responseData, download);
 						}
-					}
 
-					if (!Object.keys(body.filter as IDataObject).length) {
-						delete body.filter;
-					}
-					if (sort) {
-						body.sorts = mapSorting(sort as SortData[]);
-					}
-					if (returnAll) {
-						responseData = await notionApiRequestAllItems.call(
-							this,
-							'results',
-							'POST',
-							`/databases/${databaseId}/query`,
-							body,
-							{},
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(responseData as IDataObject),
+							{ itemData: { item: i } },
 						);
-					} else {
-						body.page_size = this.getNodeParameter('limit', i);
-						responseData = await notionApiRequest.call(
-							this,
-							'POST',
-							`/databases/${databaseId}/query`,
-							body,
-							qs,
-						);
-						responseData = responseData.results;
-					}
-					if (download) {
-						responseData = await downloadFiles.call(this, responseData as FileRecord[]);
-					}
-					if (simple) {
-						responseData = simplifyObjects(responseData, download);
+						returnData = returnData.concat(executionData);
+					} catch (error) {
+						if (this.continueOnFail()) {
+							returnData.push({
+								json: { error: error.message },
+								pairedItem: { item: i },
+							});
+						} else {
+							throw prepareNotionError(this.getNode(), error, i);
+						}
 					}
-
-					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData as IDataObject),
-						{ itemData: { item: i } },
-					);
-					returnData.push(...executionData);
 				}
 			}
 
 			if (operation === 'update') {
-				for (let i = 0; i < length; i++) {
-					const pageId = extractPageId(
-						this.getNodeParameter('pageId', i, '', { extractValue: true }) as string,
-					);
-					const simple = this.getNodeParameter('simple', i) as boolean;
-					const properties = this.getNodeParameter(
-						'propertiesUi.propertyValues',
-						i,
-						[],
-					) as IDataObject[];
-
-					const body: { [key: string]: any } = {
-						properties: {},
-					};
-					if (properties.length !== 0) {
-						body.properties = mapProperties.call(this, properties, timezone, 2) as IDataObject;
-					}
-					responseData = await notionApiRequest.call(this, 'PATCH', `/pages/${pageId}`, body);
-					if (simple) {
-						responseData = simplifyObjects(responseData, false);
-					}
+				for (let i = 0; i < itemsLength; i++) {
+					try {
+						const pageId = extractPageId(
+							this.getNodeParameter('pageId', i, '', { extractValue: true }) as string,
+						);
+						const simple = this.getNodeParameter('simple', i) as boolean;
+						const properties = this.getNodeParameter(
+							'propertiesUi.propertyValues',
+							i,
+							[],
+						) as IDataObject[];
+
+						const body: { [key: string]: any } = {
+							properties: {},
+						};
+						if (properties.length !== 0) {
+							body.properties = mapProperties.call(this, properties, timezone, 2) as IDataObject;
+						}
+
+						const options = this.getNodeParameter('options', i);
+						if (options.icon) {
+							if (options.iconType && options.iconType === 'file') {
+								body.icon = { type: 'external', external: { url: options.icon } };
+							} else {
+								body.icon = { type: 'emoji', emoji: options.icon };
+							}
+						}
+
+						responseData = await notionApiRequest.call(this, 'PATCH', `/pages/${pageId}`, body);
+						if (simple) {
+							responseData = simplifyObjects(responseData, false);
+						}
 
-					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData as IDataObject),
-						{ itemData: { item: i } },
-					);
-					returnData.push(...executionData);
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(responseData as IDataObject),
+							{ itemData: { item: i } },
+						);
+						returnData = returnData.concat(executionData);
+					} catch (error) {
+						if (this.continueOnFail()) {
+							returnData.push({
+								json: { error: error.message },
+								pairedItem: { item: i },
+							});
+						} else {
+							throw prepareNotionError(this.getNode(), error, i);
+						}
+					}
 				}
 			}
 		}
 
 		if (resource === 'user') {
 			if (operation === 'get') {
-				for (let i = 0; i < length; i++) {
-					const userId = this.getNodeParameter('userId', i) as string;
-					responseData = await notionApiRequest.call(this, 'GET', `/users/${userId}`);
-
-					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData as IDataObject),
-						{ itemData: { item: i } },
-					);
-					returnData.push(...executionData);
+				for (let i = 0; i < itemsLength; i++) {
+					try {
+						const userId = this.getNodeParameter('userId', i) as string;
+						responseData = await notionApiRequest.call(this, 'GET', `/users/${userId}`);
+
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(responseData as IDataObject),
+							{ itemData: { item: i } },
+						);
+						returnData = returnData.concat(executionData);
+					} catch (error) {
+						if (this.continueOnFail()) {
+							returnData.push({
+								json: { error: error.message },
+								pairedItem: { item: i },
+							});
+						} else {
+							throw prepareNotionError(this.getNode(), error, i);
+						}
+					}
 				}
 			}
 			if (operation === 'getAll') {
-				for (let i = 0; i < length; i++) {
-					const returnAll = this.getNodeParameter('returnAll', i);
-					if (returnAll) {
-						responseData = await notionApiRequestAllItems.call(this, 'results', 'GET', '/users');
-					} else {
-						qs.limit = this.getNodeParameter('limit', i);
-						responseData = await notionApiRequestAllItems.call(this, 'results', 'GET', '/users');
-						responseData = responseData.splice(0, qs.limit);
-					}
+				for (let i = 0; i < itemsLength; i++) {
+					try {
+						const returnAll = this.getNodeParameter('returnAll', i);
+						if (returnAll) {
+							responseData = await notionApiRequestAllItems.call(this, 'results', 'GET', '/users');
+						} else {
+							qs.limit = this.getNodeParameter('limit', i);
+							responseData = await notionApiRequestAllItems.call(this, 'results', 'GET', '/users');
+							responseData = responseData.splice(0, qs.limit);
+						}
 
-					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData as IDataObject),
-						{ itemData: { item: i } },
-					);
-					returnData.push(...executionData);
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(responseData as IDataObject),
+							{ itemData: { item: i } },
+						);
+						returnData = returnData.concat(executionData);
+					} catch (error) {
+						if (this.continueOnFail()) {
+							returnData.push({
+								json: { error: error.message },
+								pairedItem: { item: i },
+							});
+						} else {
+							throw prepareNotionError(this.getNode(), error, i);
+						}
+					}
 				}
 			}
 		}
 
 		if (resource === 'page') {
 			if (operation === 'archive') {
-				for (let i = 0; i < length; i++) {
-					const pageId = extractPageId(
-						this.getNodeParameter('pageId', i, '', { extractValue: true }) as string,
-					);
-					const simple = this.getNodeParameter('simple', i) as boolean;
-					responseData = await notionApiRequest.call(this, 'PATCH', `/pages/${pageId}`, {
-						archived: true,
-					});
-					if (simple) {
-						responseData = simplifyObjects(responseData, download);
-					}
+				for (let i = 0; i < itemsLength; i++) {
+					try {
+						const pageId = extractPageId(
+							this.getNodeParameter('pageId', i, '', { extractValue: true }) as string,
+						);
+						const simple = this.getNodeParameter('simple', i) as boolean;
+						responseData = await notionApiRequest.call(this, 'PATCH', `/pages/${pageId}`, {
+							archived: true,
+						});
+						if (simple) {
+							responseData = simplifyObjects(responseData, download);
+						}
 
-					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData as IDataObject),
-						{ itemData: { item: i } },
-					);
-					returnData.push(...executionData);
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(responseData as IDataObject),
+							{ itemData: { item: i } },
+						);
+						returnData = returnData.concat(executionData);
+					} catch (error) {
+						if (this.continueOnFail()) {
+							returnData.push({
+								json: { error: error.message },
+								pairedItem: { item: i },
+							});
+						} else {
+							throw prepareNotionError(this.getNode(), error, i);
+						}
+					}
 				}
 			}
 
 			if (operation === 'create') {
-				for (let i = 0; i < length; i++) {
-					const simple = this.getNodeParameter('simple', i) as boolean;
-					const body: { [key: string]: any } = {
-						parent: {},
-						properties: {},
-					};
-					body.parent.page_id = extractPageId(
-						this.getNodeParameter('pageId', i, '', { extractValue: true }) as string,
-					);
-					body.properties = formatTitle(this.getNodeParameter('title', i) as string);
-					const blockValues = this.getNodeParameter('blockUi.blockValues', i, []) as IDataObject[];
-					extractDatabaseMentionRLC(blockValues);
-					body.children = formatBlocks(blockValues);
-
-					const options = this.getNodeParameter('options', i);
-					if (options.icon) {
-						if (options.iconType && options.iconType === 'file') {
-							body.icon = { external: { url: options.icon } };
-						} else {
-							body.icon = { emoji: options.icon };
+				for (let i = 0; i < itemsLength; i++) {
+					try {
+						const simple = this.getNodeParameter('simple', i) as boolean;
+						const body: { [key: string]: any } = {
+							parent: {},
+							properties: {},
+						};
+						body.parent.page_id = extractPageId(
+							this.getNodeParameter('pageId', i, '', { extractValue: true }) as string,
+						);
+						body.properties = formatTitle(this.getNodeParameter('title', i) as string);
+						const blockValues = this.getNodeParameter(
+							'blockUi.blockValues',
+							i,
+							[],
+						) as IDataObject[];
+						extractDatabaseMentionRLC(blockValues);
+						body.children = formatBlocks(blockValues);
+
+						const options = this.getNodeParameter('options', i);
+						if (options.icon) {
+							if (options.iconType && options.iconType === 'file') {
+								body.icon = { external: { url: options.icon } };
+							} else {
+								body.icon = { emoji: options.icon };
+							}
 						}
-					}
 
-					responseData = await notionApiRequest.call(this, 'POST', '/pages', body);
-					if (simple) {
-						responseData = simplifyObjects(responseData, download);
-					}
+						responseData = await notionApiRequest.call(this, 'POST', '/pages', body);
+						if (simple) {
+							responseData = simplifyObjects(responseData, download);
+						}
 
-					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData as IDataObject),
-						{ itemData: { item: i } },
-					);
-					returnData.push(...executionData);
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(responseData as IDataObject),
+							{ itemData: { item: i } },
+						);
+						returnData = returnData.concat(executionData);
+					} catch (error) {
+						if (this.continueOnFail()) {
+							returnData.push({
+								json: { error: error.message },
+								pairedItem: { item: i },
+							});
+						} else {
+							throw prepareNotionError(this.getNode(), error, i);
+						}
+					}
 				}
 			}
 
 			if (operation === 'search') {
-				for (let i = 0; i < length; i++) {
-					const text = this.getNodeParameter('text', i) as string;
-					const options = this.getNodeParameter('options', i);
-					const returnAll = this.getNodeParameter('returnAll', i);
-					const simple = this.getNodeParameter('simple', i) as boolean;
-					const body: IDataObject = {};
-
-					if (text) {
-						body.query = text;
-					}
-					if (options.filter) {
-						const filter = ((options.filter as IDataObject)?.filters as IDataObject[]) || [];
-						body.filter = filter;
-					}
-					if (options.sort) {
-						const sort = ((options.sort as IDataObject)?.sortValue as IDataObject) || {};
-						body.sort = sort;
-					}
-					if (returnAll) {
-						responseData = await notionApiRequestAllItems.call(
-							this,
-							'results',
-							'POST',
-							'/search',
-							body,
-						);
-					} else {
-						qs.limit = this.getNodeParameter('limit', i);
-						responseData = await notionApiRequestAllItems.call(
-							this,
-							'results',
-							'POST',
-							'/search',
-							body,
-						);
-						responseData = responseData.splice(0, qs.limit);
-					}
+				for (let i = 0; i < itemsLength; i++) {
+					try {
+						const text = this.getNodeParameter('text', i) as string;
+						const options = this.getNodeParameter('options', i);
+						const returnAll = this.getNodeParameter('returnAll', i);
+						const simple = this.getNodeParameter('simple', i) as boolean;
+						const body: IDataObject = {};
+
+						if (text) {
+							body.query = text;
+						}
+						if (options.filter) {
+							const filter = ((options.filter as IDataObject)?.filters as IDataObject[]) || [];
+							body.filter = filter;
+						}
+						if (options.sort) {
+							const sort = ((options.sort as IDataObject)?.sortValue as IDataObject) || {};
+							body.sort = sort;
+						}
+						if (returnAll) {
+							responseData = await notionApiRequestAllItems.call(
+								this,
+								'results',
+								'POST',
+								'/search',
+								body,
+							);
+						} else {
+							qs.limit = this.getNodeParameter('limit', i);
+							responseData = await notionApiRequestAllItems.call(
+								this,
+								'results',
+								'POST',
+								'/search',
+								body,
+							);
+							responseData = responseData.splice(0, qs.limit);
+						}
 
-					if (simple) {
-						responseData = simplifyObjects(responseData, download);
-					}
+						if (simple) {
+							responseData = simplifyObjects(responseData, download);
+						}
 
-					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData as IDataObject),
-						{ itemData: { item: i } },
-					);
-					returnData.push(...executionData);
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(responseData as IDataObject),
+							{ itemData: { item: i } },
+						);
+						returnData = returnData.concat(executionData);
+					} catch (error) {
+						if (this.continueOnFail()) {
+							returnData.push({
+								json: { error: error.message },
+								pairedItem: { item: i },
+							});
+						} else {
+							throw prepareNotionError(this.getNode(), error, i);
+						}
+					}
 				}
 			}
 		}
 
-		if (download) {
-			const rawData = returnData.map((data) => data.json);
-			return this.prepareOutputData(rawData as INodeExecutionData[]);
-		}
-
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Notion/v2/VersionDescription.ts b/packages/nodes-base/nodes/Notion/v2/VersionDescription.ts
index ba41cb6ea4569..0cdd0995738ab 100644
--- a/packages/nodes-base/nodes/Notion/v2/VersionDescription.ts
+++ b/packages/nodes-base/nodes/Notion/v2/VersionDescription.ts
@@ -1,26 +1,28 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
-import { databaseFields, databaseOperations } from '../DatabaseDescription';
-
-import { userFields, userOperations } from '../UserDescription';
+import type { INodeTypeDescription } from 'n8n-workflow';
+import { databaseFields, databaseOperations } from '../shared/descriptions/DatabaseDescription';
 
-import { pageFields, pageOperations } from '../PageDescription';
+import { userFields, userOperations } from '../shared/descriptions/UserDescription';
 
-import { blockFields, blockOperations } from '../BlockDescription';
+import { pageFields, pageOperations } from '../shared/descriptions/PageDescription';
 
-import { databasePageFields, databasePageOperations } from '../DatabasePageDescription';
+import { blockFields, blockOperations } from '../shared/descriptions/BlockDescription';
 
-import type { INodeTypeDescription } from 'n8n-workflow';
+import {
+	databasePageFields,
+	databasePageOperations,
+} from '../shared/descriptions/DatabasePageDescription';
 
 export const versionDescription: INodeTypeDescription = {
 	displayName: 'Notion',
 	name: 'notion',
 	icon: 'file:notion.svg',
 	group: ['output'],
-	version: 2,
+	version: [2, 2.1, 2.2],
 	subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
 	description: 'Consume Notion API',
 	defaults: {
-		name: 'Notion (Beta)',
+		name: 'Notion',
 	},
 	inputs: ['main'],
 	outputs: ['main'],
@@ -74,10 +76,10 @@ export const versionDescription: INodeTypeDescription = {
 			default: '',
 		},
 		{
-			displayName: 'Version',
-			name: 'version',
-			type: 'hidden',
-			default: 2,
+			displayName: '',
+			name: 'Credentials',
+			type: 'credentials',
+			default: '',
 		},
 		{
 			displayName: 'Resource',
diff --git a/packages/nodes-base/nodes/Notion/v2/methods/index.ts b/packages/nodes-base/nodes/Notion/v2/methods/index.ts
new file mode 100644
index 0000000000000..65ff6192a3afd
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/v2/methods/index.ts
@@ -0,0 +1 @@
+export * as loadOptions from './loadOptions';
diff --git a/packages/nodes-base/nodes/Notion/v2/methods/loadOptions.ts b/packages/nodes-base/nodes/Notion/v2/methods/loadOptions.ts
new file mode 100644
index 0000000000000..1e0de238361a2
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/v2/methods/loadOptions.ts
@@ -0,0 +1,202 @@
+import type { IDataObject, ILoadOptionsFunctions, INodePropertyOptions } from 'n8n-workflow';
+
+import moment from 'moment-timezone';
+
+import {
+	extractPageId,
+	getBlockTypesOptions,
+	notionApiRequest,
+	notionApiRequestAllItems,
+} from '../../shared/GenericFunctions';
+
+export async function getDatabaseProperties(
+	this: ILoadOptionsFunctions,
+): Promise<INodePropertyOptions[]> {
+	const returnData: INodePropertyOptions[] = [];
+	const databaseId = this.getCurrentNodeParameter('databaseId', {
+		extractValue: true,
+	}) as string;
+	const { properties } = await notionApiRequest.call(this, 'GET', `/databases/${databaseId}`);
+	for (const key of Object.keys(properties as IDataObject)) {
+		//remove parameters that cannot be set from the API.
+		if (
+			![
+				'created_time',
+				'last_edited_time',
+				'created_by',
+				'last_edited_by',
+				'formula',
+				'rollup',
+			].includes(properties[key].type as string)
+		) {
+			returnData.push({
+				name: `${key}`,
+				value: `${key}|${properties[key].type}`,
+			});
+		}
+	}
+	returnData.sort((a, b) => {
+		if (a.name.toLocaleLowerCase() < b.name.toLocaleLowerCase()) {
+			return -1;
+		}
+		if (a.name.toLocaleLowerCase() > b.name.toLocaleLowerCase()) {
+			return 1;
+		}
+		return 0;
+	});
+	return returnData;
+}
+
+export async function getFilterProperties(
+	this: ILoadOptionsFunctions,
+): Promise<INodePropertyOptions[]> {
+	const returnData: INodePropertyOptions[] = [];
+	const databaseId = this.getCurrentNodeParameter('databaseId', {
+		extractValue: true,
+	}) as string;
+	const { properties } = await notionApiRequest.call(this, 'GET', `/databases/${databaseId}`);
+	for (const key of Object.keys(properties as IDataObject)) {
+		returnData.push({
+			name: `${key}`,
+			value: `${key}|${properties[key].type}`,
+		});
+	}
+	returnData.sort((a, b) => {
+		if (a.name.toLocaleLowerCase() < b.name.toLocaleLowerCase()) {
+			return -1;
+		}
+		if (a.name.toLocaleLowerCase() > b.name.toLocaleLowerCase()) {
+			return 1;
+		}
+		return 0;
+	});
+	return returnData;
+}
+
+export async function getBlockTypes(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+	return getBlockTypesOptions();
+}
+
+export async function getPropertySelectValues(
+	this: ILoadOptionsFunctions,
+): Promise<INodePropertyOptions[]> {
+	const [name, type] = (this.getCurrentNodeParameter('&key') as string).split('|');
+	const databaseId = this.getCurrentNodeParameter('databaseId', {
+		extractValue: true,
+	}) as string;
+	const resource = this.getCurrentNodeParameter('resource') as string;
+	const operation = this.getCurrentNodeParameter('operation') as string;
+	const { properties } = await notionApiRequest.call(this, 'GET', `/databases/${databaseId}`);
+	if (resource === 'databasePage') {
+		if (['multi_select', 'select', 'status'].includes(type) && operation === 'getAll') {
+			return properties[name][type].options.map((option: IDataObject) => ({
+				name: option.name,
+				value: option.name,
+			}));
+		} else if (
+			['multi_select', 'select', 'status'].includes(type) &&
+			['create', 'update'].includes(operation)
+		) {
+			return properties[name][type].options.map((option: IDataObject) => ({
+				name: option.name,
+				value: option.name,
+			}));
+		}
+	}
+	return properties[name][type].options.map((option: IDataObject) => ({
+		name: option.name,
+		value: option.id,
+	}));
+}
+
+export async function getUsers(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+	const returnData: INodePropertyOptions[] = [];
+	const users = await notionApiRequestAllItems.call(this, 'results', 'GET', '/users');
+	for (const user of users) {
+		if (user.type === 'person') {
+			returnData.push({
+				name: user.name,
+				value: user.id,
+			});
+		}
+	}
+	return returnData;
+}
+
+export async function getDatabaseIdFromPage(
+	this: ILoadOptionsFunctions,
+): Promise<INodePropertyOptions[]> {
+	const returnData: INodePropertyOptions[] = [];
+	const pageId = extractPageId(
+		this.getCurrentNodeParameter('pageId', { extractValue: true }) as string,
+	);
+	const {
+		parent: { database_id: databaseId },
+	} = await notionApiRequest.call(this, 'GET', `/pages/${pageId}`);
+	const { properties } = await notionApiRequest.call(this, 'GET', `/databases/${databaseId}`);
+	for (const key of Object.keys(properties as IDataObject)) {
+		//remove parameters that cannot be set from the API.
+		if (
+			![
+				'created_time',
+				'last_edited_time',
+				'created_by',
+				'last_edited_by',
+				'formula',
+				'rollup',
+			].includes(properties[key].type as string)
+		) {
+			returnData.push({
+				name: `${key}`,
+				value: `${key}|${properties[key].type}`,
+			});
+		}
+	}
+	returnData.sort((a, b) => {
+		if (a.name.toLocaleLowerCase() < b.name.toLocaleLowerCase()) {
+			return -1;
+		}
+		if (a.name.toLocaleLowerCase() > b.name.toLocaleLowerCase()) {
+			return 1;
+		}
+		return 0;
+	});
+	return returnData;
+}
+
+export async function getDatabaseOptionsFromPage(
+	this: ILoadOptionsFunctions,
+): Promise<INodePropertyOptions[]> {
+	const pageId = extractPageId(
+		this.getCurrentNodeParameter('pageId', { extractValue: true }) as string,
+	);
+	const [name, type] = (this.getCurrentNodeParameter('&key') as string).split('|');
+	const {
+		parent: { database_id: databaseId },
+	} = await notionApiRequest.call(this, 'GET', `/pages/${pageId}`);
+	const { properties } = await notionApiRequest.call(this, 'GET', `/databases/${databaseId}`);
+	return properties[name][type].options.map((option: IDataObject) => ({
+		name: option.name,
+		value: option.name,
+	}));
+}
+
+// Get all the timezones to display them to user so that they can
+// select them easily
+export async function getTimezones(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+	const returnData: INodePropertyOptions[] = [];
+	for (const timezone of moment.tz.names()) {
+		const timezoneName = timezone;
+		const timezoneId = timezone;
+		returnData.push({
+			name: timezoneName,
+			value: timezoneId,
+		});
+	}
+	returnData.unshift({
+		name: 'Default',
+		value: 'default',
+		description: 'Timezone set in n8n',
+	});
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/Npm/DistTagDescription.ts b/packages/nodes-base/nodes/Npm/DistTagDescription.ts
new file mode 100644
index 0000000000000..759c559e1bbfe
--- /dev/null
+++ b/packages/nodes-base/nodes/Npm/DistTagDescription.ts
@@ -0,0 +1,94 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+export const distTagOperations: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		default: 'getMany',
+		displayOptions: {
+			show: {
+				resource: ['distTag'],
+			},
+		},
+
+		options: [
+			{
+				name: 'Get All',
+				value: 'getMany',
+				action: 'Returns all the dist-tags for a package',
+				description: 'Returns all the dist-tags for a package',
+				routing: {
+					request: {
+						method: 'GET',
+						url: '=/-/package/{{ encodeURIComponent($parameter.packageName) }}/dist-tags',
+					},
+				},
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				action: 'Update a the dist-tags for a package',
+				description: 'Update a the dist-tags for a package',
+				routing: {
+					request: {
+						method: 'PUT',
+						url: '=/-/package/{{ encodeURIComponent($parameter.packageName) }}/dist-tags/{{ encodeURIComponent($parameter.distTagName) }}',
+					},
+					send: {
+						preSend: [
+							async function (this, requestOptions) {
+								requestOptions.headers!['content-type'] = 'application/x-www-form-urlencoded';
+								requestOptions.body = this.getNodeParameter('packageVersion');
+								return requestOptions;
+							},
+						],
+					},
+				},
+			},
+		],
+	},
+];
+
+export const distTagFields: INodeProperties[] = [
+	{
+		displayName: 'Package Name',
+		name: 'packageName',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: ['distTag'],
+				operation: ['getMany', 'update'],
+			},
+		},
+	},
+	{
+		displayName: 'Package Version',
+		name: 'packageVersion',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: ['distTag'],
+				operation: ['update'],
+			},
+		},
+	},
+	{
+		displayName: 'Distribution Tag Name',
+		name: 'distTagName',
+		type: 'string',
+		required: true,
+		default: 'latest',
+		displayOptions: {
+			show: {
+				resource: ['distTag'],
+				operation: ['update'],
+			},
+		},
+	},
+];
diff --git a/packages/nodes-base/nodes/Npm/Npm.node.json b/packages/nodes-base/nodes/Npm/Npm.node.json
new file mode 100644
index 0000000000000..39394b5ed4ccc
--- /dev/null
+++ b/packages/nodes-base/nodes/Npm/Npm.node.json
@@ -0,0 +1,19 @@
+{
+	"node": "n8n-nodes-base.npm",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"categories": ["Development"],
+	"resources": {
+		"credentialDocumentation": [
+			{
+				"url": "https://docs.n8n.io/credentials/npm"
+			}
+		],
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.npm/"
+			}
+		],
+		"generic": []
+	}
+}
diff --git a/packages/nodes-base/nodes/Npm/Npm.node.ts b/packages/nodes-base/nodes/Npm/Npm.node.ts
new file mode 100644
index 0000000000000..54d8a44fbd4b7
--- /dev/null
+++ b/packages/nodes-base/nodes/Npm/Npm.node.ts
@@ -0,0 +1,54 @@
+import type { INodeType, INodeTypeDescription } from 'n8n-workflow';
+import { packageFields, packageOperations } from './PackageDescription';
+import { distTagFields, distTagOperations } from './DistTagDescription';
+
+export class Npm implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Npm',
+		name: 'npm',
+		icon: 'file:npm.svg',
+		group: ['input'],
+		version: 1,
+		subtitle: '={{ $parameter["operation"] + ": " + $parameter["resource"] }}',
+		description: 'Consume NPM registry API',
+		defaults: {
+			name: 'npm',
+		},
+		inputs: ['main'],
+		outputs: ['main'],
+		credentials: [
+			{
+				name: 'npmApi',
+				required: false,
+			},
+		],
+		requestDefaults: {
+			baseURL: '={{ $credentials.registryUrl }}',
+		},
+		properties: [
+			{
+				displayName: 'Resource',
+				name: 'resource',
+				type: 'options',
+				noDataExpression: true,
+				options: [
+					{
+						name: 'Package',
+						value: 'package',
+					},
+					{
+						name: 'Distribution Tag',
+						value: 'distTag',
+					},
+				],
+				default: 'package',
+			},
+
+			...packageOperations,
+			...packageFields,
+
+			...distTagOperations,
+			...distTagFields,
+		],
+	};
+}
diff --git a/packages/nodes-base/nodes/Npm/PackageDescription.ts b/packages/nodes-base/nodes/Npm/PackageDescription.ts
new file mode 100644
index 0000000000000..75ebf7ed75567
--- /dev/null
+++ b/packages/nodes-base/nodes/Npm/PackageDescription.ts
@@ -0,0 +1,181 @@
+import { valid as isValidSemver } from 'semver';
+import type { INodeExecutionData, INodeProperties } from 'n8n-workflow';
+
+interface PackageJson {
+	name: string;
+	version: string;
+	description: string;
+}
+
+export const packageOperations: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		default: 'getMetadata',
+		displayOptions: {
+			show: {
+				resource: ['package'],
+			},
+		},
+		options: [
+			{
+				name: 'Get Metadata',
+				value: 'getMetadata',
+				action: 'Returns all the metadata for a package at a specific version',
+				description: 'Returns all the metadata for a package at a specific version',
+				routing: {
+					request: {
+						method: 'GET',
+						url: '=/{{ encodeURIComponent($parameter.packageName) }}/{{ $parameter.packageVersion }}',
+					},
+				},
+			},
+			{
+				name: 'Get Versions',
+				value: 'getVersions',
+				action: 'Returns all the versions for a package',
+				description: 'Returns all the versions for a package',
+				routing: {
+					request: {
+						method: 'GET',
+						url: '=/{{ encodeURIComponent($parameter.packageName) }}',
+					},
+					output: {
+						postReceive: [
+							async function (items) {
+								const allVersions: INodeExecutionData[] = [];
+								for (const { json } of items) {
+									const itemVersions = json.time as Record<string, string>;
+									Object.keys(itemVersions).forEach((version) => {
+										if (isValidSemver(version)) {
+											allVersions.push({
+												json: {
+													version,
+													published_at: itemVersions[version],
+												},
+											});
+										}
+									});
+								}
+								allVersions.sort(
+									(a, b) =>
+										new Date(b.json.published_at as string).getTime() -
+										new Date(a.json.published_at as string).getTime(),
+								);
+								return allVersions;
+							},
+						],
+					},
+				},
+			},
+			{
+				name: 'Search',
+				value: 'search',
+				action: 'Search for packages',
+				description: 'Search for packages',
+				routing: {
+					request: {
+						method: 'GET',
+						url: '/-/v1/search',
+						qs: {
+							text: '={{$parameter.query}}',
+							size: '={{$parameter.limit}}',
+							from: '={{$parameter.offset}}',
+							popularity: 0.99,
+						},
+					},
+					output: {
+						postReceive: [
+							async function (items) {
+								return items.flatMap(({ json }) =>
+									(json.objects as Array<{ package: PackageJson }>).map(
+										({ package: { name, version, description } }) =>
+											({ json: { name, version, description } }) as INodeExecutionData,
+									),
+								);
+							},
+						],
+					},
+				},
+			},
+		],
+	},
+];
+
+export const packageFields: INodeProperties[] = [
+	{
+		displayName: 'Package Name',
+		name: 'packageName',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: ['package'],
+				operation: ['getMetadata', 'getVersions'],
+			},
+		},
+	},
+	{
+		displayName: 'Package Version',
+		name: 'packageVersion',
+		type: 'string',
+		required: true,
+		default: 'latest',
+		displayOptions: {
+			show: {
+				resource: ['package'],
+				operation: ['getMetadata'],
+			},
+		},
+	},
+	{
+		displayName: 'Query',
+		name: 'query',
+		type: 'string',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: ['package'],
+				operation: ['search'],
+			},
+		},
+		default: '',
+		description: 'The query text used to search for packages',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		default: 10,
+		typeOptions: {
+			minValue: 1,
+			maxValue: 100,
+		},
+		displayOptions: {
+			show: {
+				resource: ['package'],
+				operation: ['search'],
+			},
+		},
+		description: 'Max number of results to return',
+	},
+	{
+		displayName: 'Offset',
+		name: 'offset',
+		type: 'number',
+		default: 0,
+		typeOptions: {
+			minValue: 0,
+		},
+		displayOptions: {
+			show: {
+				resource: ['package'],
+				operation: ['search'],
+			},
+		},
+		description: 'Offset to return results from',
+	},
+];
diff --git a/packages/nodes-base/nodes/Npm/npm.svg b/packages/nodes-base/nodes/Npm/npm.svg
new file mode 100644
index 0000000000000..2fc5e4ee7b320
--- /dev/null
+++ b/packages/nodes-base/nodes/Npm/npm.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2500 2500"><path fill="#c00" d="M0 0h2500v2500H0z"/><path fill="#fff" d="M1241.5 268.5h-973v1962.9h972.9V763.5h495v1467.9h495V268.5z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Npm/test/Npm.node.test.ts b/packages/nodes-base/nodes/Npm/test/Npm.node.test.ts
new file mode 100644
index 0000000000000..95d621240be06
--- /dev/null
+++ b/packages/nodes-base/nodes/Npm/test/Npm.node.test.ts
@@ -0,0 +1,38 @@
+import nock from 'nock';
+import { testWorkflows, getWorkflowFilenames } from '@test/nodes/Helpers';
+import { FAKE_CREDENTIALS_DATA } from '@test/nodes/FakeCredentialsMap';
+
+describe('Test npm Node', () => {
+	beforeAll(() => {
+		nock.disableNetConnect();
+
+		const { registryUrl } = FAKE_CREDENTIALS_DATA.npmApi;
+		const mock = nock(registryUrl); //.matchHeader('Authorization', `Bearer ${accessToken}`);
+
+		mock.get('/-/package/n8n/dist-tags').reply(200, {
+			latest: '0.225.2',
+			next: '0.226.2',
+		});
+
+		mock.get('/n8n').reply(200, {
+			time: {
+				'0.225.2': '2023-04-25T09:45:36.407Z',
+				'0.226.2': '2023-05-03T09:41:30.844Z',
+				'0.227.0': '2023-05-03T13:44:32.079Z',
+			},
+		});
+
+		mock.get('/n8n/latest').reply(200, {
+			name: 'n8n',
+			version: '0.225.2',
+			rest: 'of the properties',
+		});
+	});
+
+	afterAll(() => {
+		nock.restore();
+	});
+
+	const workflows = getWorkflowFilenames(__dirname);
+	testWorkflows(workflows);
+});
diff --git a/packages/nodes-base/nodes/Npm/test/Npm.workflow.test.json b/packages/nodes-base/nodes/Npm/test/Npm.workflow.test.json
new file mode 100644
index 0000000000000..794101292eaec
--- /dev/null
+++ b/packages/nodes-base/nodes/Npm/test/Npm.workflow.test.json
@@ -0,0 +1,117 @@
+{
+	"name": "Test NPM",
+	"nodes": [
+		{
+			"parameters": {},
+			"name": "Execute Workflow",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [620, 440]
+		},
+		{
+			"parameters": {
+				"resource": "distTag",
+				"operation": "getMany",
+				"packageName": "n8n"
+			},
+			"name": "Get All dist-tags",
+			"type": "n8n-nodes-base.npm",
+			"credentials": {
+				"npmApi": {
+					"id": "1"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"resource": "package",
+				"operation": "getVersions",
+				"packageName": "n8n"
+			},
+			"name": "Get Versions",
+			"type": "n8n-nodes-base.npm",
+			"credentials": {
+				"npmApi": {
+					"id": "1"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"resource": "package",
+				"operation": "getMetadata",
+				"packageName": "n8n",
+				"packageVersion": "latest"
+			},
+			"name": "Get Metadata",
+			"type": "n8n-nodes-base.npm",
+			"credentials": {
+				"npmApi": {
+					"id": "1"
+				}
+			}
+		}
+	],
+	"pinData": {
+		"Get All dist-tags": [
+			{
+				"json": {
+					"latest": "0.225.2",
+					"next": "0.226.2"
+				}
+			}
+		],
+		"Get Versions": [
+			{
+				"json": {
+					"version": "0.227.0",
+					"published_at": "2023-05-03T13:44:32.079Z"
+				}
+			},
+			{
+				"json": {
+					"version": "0.226.2",
+					"published_at": "2023-05-03T09:41:30.844Z"
+				}
+			},
+			{
+				"json": {
+					"version": "0.225.2",
+					"published_at": "2023-04-25T09:45:36.407Z"
+				}
+			}
+		],
+		"Get Metadata": [
+			{
+				"json": {
+					"name": "n8n",
+					"version": "0.225.2",
+					"rest": "of the properties"
+				}
+			}
+		]
+	},
+	"connections": {
+		"Execute Workflow": {
+			"main": [
+				[
+					{
+						"node": "Get All dist-tags",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Get Versions",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Get Metadata",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	}
+}
diff --git a/packages/nodes-base/nodes/Odoo/GenericFunctions.ts b/packages/nodes-base/nodes/Odoo/GenericFunctions.ts
index 573642ff3e822..53634b6438a02 100644
--- a/packages/nodes-base/nodes/Odoo/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Odoo/GenericFunctions.ts
@@ -1,12 +1,10 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	JsonObject,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
@@ -105,12 +103,12 @@ export function processNameValueFields(value: IDataObject) {
 // }
 
 export async function odooJSONRPCRequest(
-	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	body: IDataObject,
 	url: string,
 ): Promise<IDataObject | IDataObject[]> {
 	try {
-		const options: OptionsWithUri = {
+		const options: IRequestOptions = {
 			headers: {
 				'User-Agent': 'n8n',
 				Connection: 'keep-alive',
@@ -136,7 +134,7 @@ export async function odooJSONRPCRequest(
 }
 
 export async function odooGetModelFields(
-	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	db: string,
 	userID: number,
 	password: string,
@@ -171,7 +169,7 @@ export async function odooGetModelFields(
 }
 
 export async function odooCreate(
-	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	db: string,
 	userID: number,
 	password: string,
@@ -207,7 +205,7 @@ export async function odooCreate(
 }
 
 export async function odooGet(
-	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	db: string,
 	userID: number,
 	password: string,
@@ -236,7 +234,7 @@ export async function odooGet(
 					password,
 					mapOdooResources[resource] || resource,
 					mapOperationToJSONRPC[operation],
-					[+itemsID] || [],
+					itemsID ? [+itemsID] : [],
 					fieldsToReturn || [],
 				],
 			},
@@ -251,7 +249,7 @@ export async function odooGet(
 }
 
 export async function odooGetAll(
-	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	db: string,
 	userID: number,
 	password: string,
@@ -292,7 +290,7 @@ export async function odooGetAll(
 }
 
 export async function odooUpdate(
-	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	db: string,
 	userID: number,
 	password: string,
@@ -327,7 +325,7 @@ export async function odooUpdate(
 					password,
 					mapOdooResources[resource] || resource,
 					mapOperationToJSONRPC[operation],
-					[+itemsID] || [],
+					itemsID ? [+itemsID] : [],
 					fieldsToUpdate,
 				],
 			},
@@ -342,7 +340,7 @@ export async function odooUpdate(
 }
 
 export async function odooDelete(
-	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	db: string,
 	userID: number,
 	password: string,
@@ -370,7 +368,7 @@ export async function odooDelete(
 					password,
 					mapOdooResources[resource] || resource,
 					mapOperationToJSONRPC[operation],
-					[+itemsID] || [],
+					itemsID ? [+itemsID] : [],
 				],
 			},
 			id: Math.floor(Math.random() * 100),
@@ -384,7 +382,7 @@ export async function odooDelete(
 }
 
 export async function odooGetUserID(
-	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	db: string,
 	username: string,
 	password: string,
@@ -409,7 +407,7 @@ export async function odooGetUserID(
 }
 
 export async function odooGetServerVersion(
-	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	url: string,
 ) {
 	try {
diff --git a/packages/nodes-base/nodes/Odoo/Odoo.node.ts b/packages/nodes-base/nodes/Odoo/Odoo.node.ts
index 35ce0fa5aefcf..2df531dc549ed 100644
--- a/packages/nodes-base/nodes/Odoo/Odoo.node.ts
+++ b/packages/nodes-base/nodes/Odoo/Odoo.node.ts
@@ -1,5 +1,3 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IExecuteFunctions,
 	ICredentialsDecrypted,
@@ -11,9 +9,11 @@ import type {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { deepCopy } from 'n8n-workflow';
 
+import { capitalCase } from 'change-case';
 import {
 	contactDescription,
 	contactOperations,
@@ -39,7 +39,6 @@ import {
 	processNameValueFields,
 } from './GenericFunctions';
 
-import { capitalCase } from 'change-case';
 export class Odoo implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Odoo',
@@ -256,7 +255,7 @@ export class Odoo implements INodeType {
 						id: Math.floor(Math.random() * 100),
 					};
 
-					const options: OptionsWithUri = {
+					const options: IRequestOptions = {
 						headers: {
 							'User-Agent': 'n8n',
 							Connection: 'keep-alive',
@@ -765,6 +764,6 @@ export class Odoo implements INodeType {
 			}
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Odoo/descriptions/ContactDescription.ts b/packages/nodes-base/nodes/Odoo/descriptions/ContactDescription.ts
index 34971d068f634..88b9872244e99 100644
--- a/packages/nodes-base/nodes/Odoo/descriptions/ContactDescription.ts
+++ b/packages/nodes-base/nodes/Odoo/descriptions/ContactDescription.ts
@@ -254,7 +254,6 @@ export const contactDescription: INodeProperties[] = [
 		},
 		options: [
 			{
-				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-multi-options
 				displayName: 'Fields to Include',
 				name: 'fieldsList',
 				type: 'multiOptions',
diff --git a/packages/nodes-base/nodes/Odoo/descriptions/CustomResourceDescription.ts b/packages/nodes-base/nodes/Odoo/descriptions/CustomResourceDescription.ts
index 08b3616e96969..a59a592c5f3c4 100644
--- a/packages/nodes-base/nodes/Odoo/descriptions/CustomResourceDescription.ts
+++ b/packages/nodes-base/nodes/Odoo/descriptions/CustomResourceDescription.ts
@@ -175,7 +175,6 @@ export const customResourceDescription: INodeProperties[] = [
 		},
 		options: [
 			{
-				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-multi-options
 				displayName: 'Fields to Include',
 				name: 'fieldsList',
 				type: 'multiOptions',
diff --git a/packages/nodes-base/nodes/Odoo/descriptions/NoteDescription.ts b/packages/nodes-base/nodes/Odoo/descriptions/NoteDescription.ts
index 140e115cfcdf7..e144d2a4c377c 100644
--- a/packages/nodes-base/nodes/Odoo/descriptions/NoteDescription.ts
+++ b/packages/nodes-base/nodes/Odoo/descriptions/NoteDescription.ts
@@ -156,7 +156,6 @@ export const noteDescription: INodeProperties[] = [
 		},
 		options: [
 			{
-				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-multi-options
 				displayName: 'Fields to Include',
 				name: 'fieldsList',
 				type: 'multiOptions',
diff --git a/packages/nodes-base/nodes/Odoo/descriptions/OpportunityDescription.ts b/packages/nodes-base/nodes/Odoo/descriptions/OpportunityDescription.ts
index 2b19237d6cb55..1256052cdc7ff 100644
--- a/packages/nodes-base/nodes/Odoo/descriptions/OpportunityDescription.ts
+++ b/packages/nodes-base/nodes/Odoo/descriptions/OpportunityDescription.ts
@@ -207,7 +207,6 @@ export const opportunityDescription: INodeProperties[] = [
 		},
 		options: [
 			{
-				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-multi-options
 				displayName: 'Fields to Include',
 				name: 'fieldsList',
 				type: 'multiOptions',
diff --git a/packages/nodes-base/nodes/Odoo/odoo.svg b/packages/nodes-base/nodes/Odoo/odoo.svg
index 9efc0d87c01d9..9e549ae84edb5 100644
--- a/packages/nodes-base/nodes/Odoo/odoo.svg
+++ b/packages/nodes-base/nodes/Odoo/odoo.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="150" height="150"><circle cx="75" cy="75" r="72.4" fill="#9c5789"/><circle cx="75" cy="75" r="42.7" fill="#fff"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="150" height="150"><circle cx="75" cy="75" r="72.4" fill="#9c5789"/><circle cx="75" cy="75" r="42.7" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/OneSimpleApi/GenericFunctions.ts b/packages/nodes-base/nodes/OneSimpleApi/GenericFunctions.ts
index b4c0ed746f127..f8efd5ddc11e3 100644
--- a/packages/nodes-base/nodes/OneSimpleApi/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/OneSimpleApi/GenericFunctions.ts
@@ -1,11 +1,15 @@
-import type { OptionsWithUri } from 'request';
-
-import type { IExecuteFunctions, IDataObject, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IDataObject,
+	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function oneSimpleApiRequest(
 	this: IExecuteFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 	body: IDataObject = {},
 	qs: IDataObject = {},
@@ -15,7 +19,7 @@ export async function oneSimpleApiRequest(
 	const credentials = await this.getCredentials('oneSimpleApi');
 
 	const outputFormat = 'json';
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		method,
 		body,
 		qs,
diff --git a/packages/nodes-base/nodes/OneSimpleApi/OneSimpleApi.node.ts b/packages/nodes-base/nodes/OneSimpleApi/OneSimpleApi.node.ts
index 7f133b4c0513c..32445e0b1e282 100644
--- a/packages/nodes-base/nodes/OneSimpleApi/OneSimpleApi.node.ts
+++ b/packages/nodes-base/nodes/OneSimpleApi/OneSimpleApi.node.ts
@@ -873,7 +873,7 @@ export class OneSimpleApi implements INodeType {
 		}
 
 		if (download) {
-			return this.prepareOutputData(returnData as unknown as INodeExecutionData[]);
+			return [returnData as unknown as INodeExecutionData[]];
 		}
 
 		return [this.helpers.returnJsonArray(returnData)];
diff --git a/packages/nodes-base/nodes/OneSimpleApi/onesimpleapi.svg b/packages/nodes-base/nodes/OneSimpleApi/onesimpleapi.svg
index 9a918f0a9ca1b..9507ab28f8c96 100644
--- a/packages/nodes-base/nodes/OneSimpleApi/onesimpleapi.svg
+++ b/packages/nodes-base/nodes/OneSimpleApi/onesimpleapi.svg
@@ -1,25 +1 @@
-<svg version="1.0" xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 512.000000 512.000000" preserveAspectRatio="xMidYMid meet" class="block h-9 w-auto"><g transform="translate(0.000000,512.000000) scale(0.100000,-0.100000)" fill="#2563eb" stroke="none"><path d="M381 5100 c-91 -24 -149 -57 -221 -126 -72 -69 -115 -142 -140 -238
-    -19 -77 -20 -109 -20 -1052 l0 -973 37 5 c128 17 191 43 259 106 57 53 90 112
-    115 205 19 69 22 123 29 468 9 422 13 455 70 603 98 254 304 439 609 543 86
-    30 84 32 121 -88 18 -60 35 -113 37 -119 2 -7 -35 -31 -84 -54 -165 -80 -274
-    -220 -323 -415 -28 -110 -39 -273 -40 -585 -1 -287 -10 -367 -53 -482 -47
-    -123 -136 -235 -247 -308 -23 -15 -41 -31 -41 -34 0 -4 28 -25 62 -48 113 -75
-    203 -209 250 -368 20 -69 22 -108 30 -465 7 -332 11 -404 28 -485 44 -207 158
-    -367 319 -448 44 -22 85 -41 92 -44 10 -3 4 -32 -25 -118 -21 -63 -41 -119
-    -45 -123 -8 -9 -164 45 -245 85 -97 49 -158 92 -234 164 -87 82 -128 136 -179
-    239 -84 168 -102 280 -102 640 -1 309 -10 443 -39 535 -50 161 -167 256 -340
-    276 l-61 7 0 -970 c0 -940 1 -972 20 -1049 25 -96 68 -169 140 -238 73 -70
-    131 -102 225 -126 77 -20 111 -20 2175 -20 2070 0 2098 0 2176 20 96 25 169
-    68 238 140 70 73 102 131 126 225 19 76 20 111 20 1048 l0 969 -56 -7 c-186
-    -23 -302 -128 -350 -317 -12 -49 -18 -150 -24 -453 -5 -214 -13 -412 -19 -440
-    -77 -353 -286 -577 -664 -710 -43 -15 -79 -26 -81 -24 -11 13 -77 232 -73 242
-    3 7 23 19 44 25 107 32 247 162 307 284 72 146 78 188 86 618 9 447 17 504 92
-    657 40 83 146 192 237 245 l63 37 -49 25 c-107 54 -200 150 -258 265 -68 134
-    -85 271 -85 681 0 291 -9 377 -50 500 -30 89 -100 198 -165 259 -52 47 -181
-    121 -211 121 -20 0 -18 12 23 138 l38 113 34 -6 c19 -4 68 -20 110 -36 277
-    -110 459 -282 551 -521 57 -149 61 -181 70 -608 6 -308 11 -409 24 -458 48
-    -189 156 -284 354 -311 l52 -8 0 972 c0 939 -1 974 -20 1050 -24 94 -56 152
-    -126 225 -69 72 -142 115 -238 140 -78 20 -105 20 -2180 19 -2045 0 -2103 -1
-    -2175 -19z m2519 -2295 l0 -1575 -200 0 -200 0 0 1325 c0 729 -2 1325 -5 1325
-    -3 0 -141 -50 -307 -111 -167 -61 -345 -126 -396 -145 l-92 -33 2 181 3 181
-    560 213 c334 126 575 212 598 213 l37 1 0 -1575z"></path></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" class="block h-9 w-auto" version="1.0" viewBox="0 0 512 512"><path fill="#2563eb" d="M38.1 2C29 4.4 23.2 7.7 16 14.6S4.5 28.8 2 38.4C.1 46.1 0 49.3 0 143.6v97.3l3.7-.5c12.8-1.7 19.1-4.3 25.9-10.6 5.7-5.3 9-11.2 11.5-20.5 1.9-6.9 2.2-12.3 2.9-46.8.9-42.2 1.3-45.5 7-60.3 9.8-25.4 30.4-43.9 60.9-54.3 8.6-3 8.4-3.2 12.1 8.8 1.8 6 3.5 11.3 3.7 11.9.2.7-3.5 3.1-8.4 5.4-16.5 8-27.4 22-32.3 41.5-2.8 11-3.9 27.3-4 58.5-.1 28.7-1 36.7-5.3 48.2C73 234.5 64.1 245.7 53 253c-2.3 1.5-4.1 3.1-4.1 3.4 0 .4 2.8 2.5 6.2 4.8 11.3 7.5 20.3 20.9 25 36.8 2 6.9 2.2 10.8 3 46.5.7 33.2 1.1 40.4 2.8 48.5 4.4 20.7 15.8 36.7 31.9 44.8 4.4 2.2 8.5 4.1 9.2 4.4 1 .3.4 3.2-2.5 11.8-2.1 6.3-4.1 11.9-4.5 12.3-.8.9-16.4-4.5-24.5-8.5-9.7-4.9-15.8-9.2-23.4-16.4-8.7-8.2-12.8-13.6-17.9-23.9-8.4-16.8-10.2-28-10.2-64-.1-30.9-1-44.3-3.9-53.5-5-16.1-16.7-25.6-34-27.6l-6.1-.7v97c0 94 .1 97.2 2 104.9 2.5 9.6 6.8 16.9 14 23.8 7.3 7 13.1 10.2 22.5 12.6 7.7 2 11.1 2 217.5 2 207 0 209.8 0 217.6-2 9.6-2.5 16.9-6.8 23.8-14 7-7.3 10.2-13.1 12.6-22.5 1.9-7.6 2-11.1 2-104.8v-96.9l-5.6.7c-18.6 2.3-30.2 12.8-35 31.7-1.2 4.9-1.8 15-2.4 45.3-.5 21.4-1.3 41.2-1.9 44-7.7 35.3-28.6 57.7-66.4 71-4.3 1.5-7.9 2.6-8.1 2.4-1.1-1.3-7.7-23.2-7.3-24.2.3-.7 2.3-1.9 4.4-2.5 10.7-3.2 24.7-16.2 30.7-28.4 7.2-14.6 7.8-18.8 8.6-61.8.9-44.7 1.7-50.4 9.2-65.7 4-8.3 14.6-19.2 23.7-24.5l6.3-3.7-4.9-2.5c-10.7-5.4-20-15-25.8-26.5-6.8-13.4-8.5-27.1-8.5-68.1 0-29.1-.9-37.7-5-50-3-8.9-10-19.8-16.5-25.9-5.2-4.7-18.1-12.1-21.1-12.1-2 0-1.8-1.2 2.3-13.8l3.8-11.3 3.4.6c1.9.4 6.8 2 11 3.6 27.7 11 45.9 28.2 55.1 52.1 5.7 14.9 6.1 18.1 7 60.8.6 30.8 1.1 40.9 2.4 45.8 4.8 18.9 15.6 28.4 35.4 31.1l5.2.8v-97.2c0-93.9-.1-97.4-2-105-2.4-9.4-5.6-15.2-12.6-22.5-6.9-7.2-14.2-11.5-23.8-14-7.8-2-10.5-2-218-1.9C51.1.1 45.3.2 38.1 2M290 231.5V389h-40V256.5c0-72.9-.2-132.5-.5-132.5s-14.1 5-30.7 11.1c-16.7 6.1-34.5 12.6-39.6 14.5l-9.2 3.3.2-18.1.3-18.1 56-21.3c33.4-12.6 57.5-21.2 59.8-21.3l3.7-.1z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Onfleet/GenericFunctions.ts b/packages/nodes-base/nodes/Onfleet/GenericFunctions.ts
index 998a090cdcd1e..87c1b0be28fd3 100644
--- a/packages/nodes-base/nodes/Onfleet/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Onfleet/GenericFunctions.ts
@@ -2,20 +2,20 @@ import type {
 	IDataObject,
 	IExecuteFunctions,
 	IHookFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
 	INodePropertyOptions,
+	IRequestOptions,
 	IWebhookFunctions,
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import type { OptionsWithUri } from 'request';
-
 import moment from 'moment-timezone';
 
 export async function onfleetApiRequest(
 	this: IWebhookFunctions | IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -25,7 +25,7 @@ export async function onfleetApiRequest(
 ): Promise<any> {
 	const credentials = await this.getCredentials('onfleetApi');
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			'Content-Type': 'application/json',
 			'User-Agent': 'n8n-onfleet',
@@ -50,7 +50,7 @@ export async function onfleetApiRequest(
 export async function onfleetApiRequestAllItems(
 	this: IWebhookFunctions | IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: any = {},
diff --git a/packages/nodes-base/nodes/Onfleet/Onfleet.node.ts b/packages/nodes-base/nodes/Onfleet/Onfleet.node.ts
index 494879723bcfb..16c135383c25f 100644
--- a/packages/nodes-base/nodes/Onfleet/Onfleet.node.ts
+++ b/packages/nodes-base/nodes/Onfleet/Onfleet.node.ts
@@ -7,6 +7,7 @@ import type {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	IRequestOptions,
 } from 'n8n-workflow';
 
 import { taskFields, taskOperations } from './descriptions/TaskDescription';
@@ -34,8 +35,6 @@ import { containerFields, containerOperations } from './descriptions/ContainerDe
 
 import { teamFields, teamOperations } from './descriptions/TeamDescription';
 
-import type { OptionsWithUri } from 'request';
-
 import { Onfleet as OnfleetMethods } from './Onfleet';
 export class Onfleet implements INodeType {
 	description: INodeTypeDescription = {
@@ -142,7 +141,7 @@ export class Onfleet implements INodeType {
 			): Promise<INodeCredentialTestResult> {
 				const credentials = credential.data as IDataObject;
 
-				const options: OptionsWithUri = {
+				const options: IRequestOptions = {
 					headers: {
 						'Content-Type': 'application/json',
 						'User-Agent': 'n8n-onfleet',
diff --git a/packages/nodes-base/nodes/Onfleet/Onfleet.svg b/packages/nodes-base/nodes/Onfleet/Onfleet.svg
index a8e2b261c1500..6b0b9406f96ed 100644
--- a/packages/nodes-base/nodes/Onfleet/Onfleet.svg
+++ b/packages/nodes-base/nodes/Onfleet/Onfleet.svg
@@ -1,14 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="60px" height="60px" viewBox="0 0 60 60" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>Group 2</title>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="WIP-Illustrations" transform="translate(-1086.000000, -1490.000000)">
-            <g id="Group-2" transform="translate(1086.000000, 1490.000000)">
-                <rect id="Rectangle" fill="#AA81F3" x="0" y="0" width="60" height="60"></rect>
-                <g id="Icon_white" transform="translate(13.000000, 22.000000)" fill="#FFFFFF">
-                    <path d="M19.5506423,10.0656088 C20.0318974,10.5200534 20.7568258,11.1320386 21.6949686,11.8773277 C22.6331113,12.5983796 23.8636622,13.422439 25.3378865,14.0647206 C26.0871823,14.3555651 26.8913047,14.5979355 27.7502535,14.6221726 C28.1766821,14.6221726 28.6092024,14.6221726 29.0112636,14.4888688 C29.2244779,14.4646318 29.4133248,14.3555651 29.6021717,14.2767947 C29.7910186,14.1677281 29.9798655,14.0889577 30.1626206,13.9556539 C30.5098552,13.7132835 30.8570899,13.422439 31.1251307,13.0528242 C31.3931715,12.6832093 31.6368449,12.2832981 31.8500592,11.8288536 C32.227753,10.9260238 32.4653346,9.90806807 32.5201611,8.84769752 C32.5749876,7.78126771 32.4409673,6.69060085 32.0937326,5.64840808 C31.746498,4.63651161 31.186049,3.70338553 30.3819267,3.11563728 C29.6082635,2.55818533 28.6152943,2.34611122 27.5431311,2.50365199 C27.0070496,2.61271868 26.4466006,2.7460224 25.9105191,2.98233355 C25.6424783,3.09140024 25.3744375,3.22470397 25.0820294,3.35800769 C24.8139886,3.51554846 24.5459478,3.64885219 24.277907,3.81245221 C23.2057439,4.45473381 22.1640399,5.2484969 21.1710707,6.1028526 C20.6898156,6.55729713 20.1781014,6.98144535 19.7273056,7.46012691 C19.4836321,7.70249732 19.2460505,7.91457143 19.0328362,8.18117888 L18.3079078,8.9264679 C17.369765,9.91412733 16.2976019,10.9502608 15.2254388,11.8591499 C14.1289083,12.792276 12.9775513,13.6466317 11.6921739,14.3919207 C10.4311638,15.1129727 9.01176605,15.7249579 7.43398053,15.9370321 C6.62985818,16.0460987 5.80136849,16.0158024 4.99724614,15.8279654 C4.19312379,15.6401283 3.41946062,15.2705134 2.773726,14.7615356 C2.12799139,14.2525577 1.622369,13.6405724 1.24467517,13.0043501 C0.866981339,12.3620685 0.574573211,11.7016091 0.385726296,11.0047942 C0.19687938,10.3382755 0.0933181685,9.64751988 0.0384916447,8.98100124 C-0.0163348792,8.31448261 -0.0163348792,7.64796398 0.0628589886,7.01174165 C0.190787544,5.72111921 0.538022195,4.49714863 1.12283845,3.37618547 C1.41524658,2.81873353 1.76857306,2.30975566 2.19500158,1.85531114 C2.59706276,1.40086662 3.0783178,1.00095544 3.61439937,0.710110945 C4.15048094,0.419266451 4.71092985,0.201133081 5.27747059,0.122362697 C5.8379195,0.0193552722 6.39836841,0.0496515736 6.93444998,0.098125656 C7.97615393,0.231429382 8.88992933,0.60710352 9.6635925,1.00095544 C11.2170107,1.85531114 12.3440003,2.83691131 13.2273166,3.69126701 C14.0862654,4.54562271 14.7015409,5.29091173 15.1279694,5.79383033 L15.7432448,6.56335639 L15.0183163,5.89683775 C14.5370613,5.44239323 13.8121328,4.83040794 12.8739901,4.10935597 C11.9358473,3.38830399 10.7052965,2.56424459 9.23107215,1.921963 C8.48177632,1.63111851 7.67765397,1.3887481 6.8187051,1.36451106 C5.9902154,1.34027402 5.13126653,1.52205182 4.43679723,2.03102969 C4.08956258,2.2734001 3.74232792,2.56424459 3.47428714,2.93385947 C3.20624636,3.30347435 2.93820557,3.70338553 2.74935866,4.15783005 C2.34729748,5.06065983 2.10362404,6.1028526 2.0792567,7.16928242 C2.02443018,8.23571223 2.15845057,9.32637908 2.50568522,10.3685718 C2.85291987,11.3804683 3.41336878,12.3135944 4.21749113,12.8710464 C4.9911543,13.4284983 5.98412357,13.6405724 7.0562867,13.4587946 C7.19030709,13.4587946 7.32432748,13.4042613 7.45834788,13.3800242 C7.59236827,13.3557872 7.72638866,13.3254909 7.86040905,13.2709575 L8.26247023,13.1376538 L8.6645314,12.980113 C8.79855179,12.9255797 8.93257218,12.8710464 9.06659258,12.792276 L9.46865375,12.6044389 C9.73669453,12.4468981 10.0047353,12.3135944 10.2727761,12.1499944 C11.3449392,11.5077128 12.3866432,10.7139497 13.3796125,9.85959399 C14.3725817,8.98100124 15.2802653,8.1024085 16.2732345,7.06021573 L16.998163,6.31492671 C17.2418365,6.04831926 17.5098773,5.80594885 17.7474589,5.5696377 C18.2591731,5.06065983 18.7891628,4.58197827 19.3252444,4.13359301 C20.4217749,3.20046693 21.5731319,2.34611122 22.8585092,1.60082221 C24.1195193,0.879770234 25.5389171,0.267784944 27.1167026,0.0557108339 C27.920825,-0.0533558513 28.7493146,0.00117749129 29.553437,0.18901456 C30.3575593,0.376851629 31.1312225,0.776762809 31.7525898,1.27968141 C32.3983244,1.78865928 32.8795794,2.40064457 33.2816406,3.0368669 C33.6593345,3.67914849 33.9517426,4.33960786 34.1405895,5.03642279 C34.3294364,5.70294143 34.4329976,6.3936971 34.4878241,7.06021573 C34.5426507,7.72673436 34.5426507,8.36295669 34.4634568,9.02947533 C34.3294364,10.3079792 33.9822018,11.5622461 33.4217528,12.652913 C33.1293447,13.2103649 32.7760182,13.7193428 32.3495897,14.1737873 C31.9475285,14.6282318 31.4662735,15.028143 30.9058246,15.3189875 C30.6377838,15.4765283 30.369743,15.585595 30.0773349,15.6946616 C29.7849268,15.773432 29.516886,15.8824987 29.218386,15.9067358 C28.6579371,16.0158024 28.0913964,15.9855061 27.5553148,15.9309728 C26.5136108,15.773432 25.5998354,15.3977579 24.8261723,14.9978467 C23.2727541,14.143491 22.1457644,13.1315945 21.2624482,12.2832981 C20.4034993,11.4289424 19.7882239,10.6836534 19.3617954,10.1807348 L18.74652,9.41120872 C18.8257138,9.3990902 19.5506423,10.0656088 19.5506423,10.0656088 Z" id="Path"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="60" height="60"><g fill="none" fill-rule="evenodd"><path fill="#AA81F3" d="M0 0h60v60H0z"/><path fill="#FFF" d="M32.55 32.066c.482.454 1.207 1.066 2.145 1.811.938.721 2.169 1.545 3.643 2.188.75.29 1.553.533 2.412.557.427 0 .86 0 1.261-.133.213-.024.402-.133.591-.212.189-.11.378-.188.56-.321.348-.243.695-.534.963-.903.268-.37.512-.77.725-1.224.378-.903.615-1.92.67-2.981a8.7 8.7 0 0 0-.426-3.2c-.348-1.011-.908-1.945-1.712-2.532-.774-.558-1.767-.77-2.839-.612-.536.109-1.096.242-1.632.478-.269.11-.537.243-.829.376-.268.158-.536.29-.804.454-1.072.643-2.114 1.436-3.107 2.29-.481.455-.993.88-1.444 1.358-.243.242-.48.455-.694.721l-.725.745a40 40 0 0 1-3.083 2.933c-1.096.933-2.247 1.788-3.533 2.533-1.26.721-2.68 1.333-4.258 1.545a6.7 6.7 0 0 1-2.437-.109 5.7 5.7 0 0 1-2.223-1.066 6.4 6.4 0 0 1-1.53-1.758 8 8 0 0 1-.858-2 10.7 10.7 0 0 1-.348-2.023 9.7 9.7 0 0 1 .025-1.97 9.9 9.9 0 0 1 1.06-3.635 7 7 0 0 1 1.072-1.52 5.3 5.3 0 0 1 1.42-1.146c.535-.29 1.096-.509 1.662-.588.56-.103 1.121-.072 1.657-.024 1.042.133 1.956.51 2.73.903 1.553.854 2.68 1.836 3.563 2.69.86.855 1.475 1.6 1.901 2.103l.615.77-.725-.667c-.48-.455-1.206-1.067-2.144-1.788-.938-.72-2.169-1.545-3.643-2.187-.75-.29-1.553-.533-2.412-.557-.829-.025-1.688.157-2.382.666-.347.242-.695.533-.963.903s-.536.77-.725 1.224a7.9 7.9 0 0 0-.67 3.011 8.7 8.7 0 0 0 .427 3.2c.347 1.011.907 1.945 1.711 2.502.774.557 1.767.77 2.84.588.133 0 .267-.055.401-.079s.268-.055.402-.109l.402-.133.403-.158c.134-.054.268-.109.402-.188l.402-.188c.268-.157.536-.29.804-.454 1.072-.642 2.114-1.436 3.107-2.29.993-.879 1.9-1.758 2.893-2.8l.725-.745c.244-.267.512-.51.75-.745a25 25 0 0 1 1.577-1.436c1.097-.934 2.248-1.788 3.534-2.533 1.26-.721 2.68-1.333 4.258-1.545a6.8 6.8 0 0 1 2.436.133 5.6 5.6 0 0 1 2.2 1.09c.645.51 1.127 1.122 1.529 1.758a8 8 0 0 1 .859 2c.188.666.292 1.357.347 2.023a9.7 9.7 0 0 1-.025 1.97c-.134 1.278-.48 2.532-1.041 3.623a7 7 0 0 1-1.072 1.52 5 5 0 0 1-1.444 1.146 5 5 0 0 1-.829.376c-.292.078-.56.187-.859.212-.56.109-1.127.079-1.663.024-1.041-.158-1.955-.533-2.729-.933-1.553-.855-2.68-1.866-3.564-2.715-.859-.854-1.474-1.6-1.9-2.102l-.615-.77c.079-.012.804.655.804.655"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Onfleet/Onfleet.ts b/packages/nodes-base/nodes/Onfleet/Onfleet.ts
index 26dc787379193..b5c17186c5c6b 100644
--- a/packages/nodes-base/nodes/Onfleet/Onfleet.ts
+++ b/packages/nodes-base/nodes/Onfleet/Onfleet.ts
@@ -8,6 +8,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
+import moment from 'moment-timezone';
 import type {
 	OnfleetAdmins,
 	OnfleetCloneOverrideTaskOptions,
@@ -32,8 +33,6 @@ import type {
 
 import { onfleetApiRequest, onfleetApiRequestAllItems } from './GenericFunctions';
 
-import moment from 'moment-timezone';
-
 const formatAddress = (
 	unparsed: boolean,
 	address: string | undefined,
diff --git a/packages/nodes-base/nodes/OpenAi/ChatDescription.ts b/packages/nodes-base/nodes/OpenAi/ChatDescription.ts
index fad611fd35138..6bbea27f164f1 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[] = [
 	{
@@ -22,6 +23,7 @@ export const chatOperations: INodeProperties[] = [
 						method: 'POST',
 						url: '/v1/chat/completions',
 					},
+					output: { postReceive: [sendErrorPostReceive] },
 				},
 			},
 		],
@@ -40,6 +42,7 @@ const completeOperations: INodeProperties[] = [
 			show: {
 				operation: ['complete'],
 				resource: ['chat'],
+				'@version': [1],
 			},
 		},
 		typeOptions: {
@@ -60,13 +63,74 @@ const completeOperations: INodeProperties[] = [
 							{
 								type: 'filter',
 								properties: {
-									pass: "={{ $responseItem.id.startsWith('gpt-') }}",
+									pass: "={{ $responseItem.id.startsWith('gpt-') && !$responseItem.id.startsWith('gpt-4-vision') }}",
+								},
+							},
+							{
+								type: 'setKeyValue',
+								properties: {
+									name: '={{$responseItem.id}}',
+									value: '={{$responseItem.id}}',
+								},
+							},
+							{
+								type: 'sort',
+								properties: {
+									key: 'name',
+								},
+							},
+						],
+					},
+				},
+			},
+		},
+		routing: {
+			send: {
+				type: 'body',
+				property: 'model',
+			},
+		},
+		default: 'gpt-3.5-turbo',
+	},
+	{
+		displayName: 'Model',
+		name: 'chatModel',
+		type: 'options',
+		description:
+			'The model which will generate the completion. <a href="https://beta.openai.com/docs/models/overview">Learn more</a>.',
+		displayOptions: {
+			show: {
+				operation: ['complete'],
+				resource: ['chat'],
+			},
+			hide: {
+				'@version': [1],
+			},
+		},
+		typeOptions: {
+			loadOptions: {
+				routing: {
+					request: {
+						method: 'GET',
+						url: '/v1/models',
+					},
+					output: {
+						postReceive: [
+							{
+								type: 'rootProperty',
+								properties: {
+									property: 'data',
+								},
+							},
+							{
+								type: 'filter',
+								properties: {
+									pass: "={{ $responseItem.id.startsWith('gpt-') && !$responseItem.id.startsWith('gpt-4-vision') }}",
 								},
 							},
 							{
 								type: 'setKeyValue',
 								properties: {
-									// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased-id
 									name: '={{$responseItem.id}}',
 									value: '={{$responseItem.id}}',
 								},
@@ -250,7 +314,7 @@ const sharedOperations: INodeProperties[] = [
 				name: 'maxTokens',
 				default: 16,
 				description:
-					'The maximum number of tokens to generate in the completion. Most models have a context length of 2048 tokens (except for the newest models, which support 4096).',
+					'The maximum number of tokens to generate in the completion. Most models have a context length of 2048 tokens (except for the newest models, which support 32,768).',
 				type: 'number',
 				displayOptions: {
 					show: {
@@ -258,7 +322,7 @@ const sharedOperations: INodeProperties[] = [
 					},
 				},
 				typeOptions: {
-					maxValue: 4096,
+					maxValue: 32768,
 				},
 				routing: {
 					send: {
diff --git a/packages/nodes-base/nodes/OpenAi/GenericFunctions.ts b/packages/nodes-base/nodes/OpenAi/GenericFunctions.ts
new file mode 100644
index 0000000000000..4ef01acd49cc4
--- /dev/null
+++ b/packages/nodes-base/nodes/OpenAi/GenericFunctions.ts
@@ -0,0 +1,18 @@
+import type {
+	IExecuteSingleFunctions,
+	IN8nHttpFullResponse,
+	INodeExecutionData,
+	JsonObject,
+} from 'n8n-workflow';
+import { NodeApiError } from 'n8n-workflow';
+
+export async function sendErrorPostReceive(
+	this: IExecuteSingleFunctions,
+	data: INodeExecutionData[],
+	response: IN8nHttpFullResponse,
+): Promise<INodeExecutionData[]> {
+	if (String(response.statusCode).startsWith('4') || String(response.statusCode).startsWith('5')) {
+		throw new NodeApiError(this.getNode(), response as unknown as JsonObject);
+	}
+	return data;
+}
diff --git a/packages/nodes-base/nodes/OpenAi/ImageDescription.ts b/packages/nodes-base/nodes/OpenAi/ImageDescription.ts
index 012fc329c0d6c..ca26967525578 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[] = [
 	{
@@ -22,6 +23,7 @@ export const imageOperations: INodeProperties[] = [
 						method: 'POST',
 						url: '/v1/images/generations',
 					},
+					output: { postReceive: [sendErrorPostReceive] },
 				},
 			},
 		],
@@ -63,6 +65,126 @@ const createOperations: INodeProperties[] = [
 			},
 		},
 	},
+	{
+		displayName: 'Model',
+		name: 'model',
+		type: 'options',
+		default: 'dall-e-2',
+		description: 'The model to use for image generation',
+		typeOptions: {
+			loadOptions: {
+				routing: {
+					request: {
+						method: 'GET',
+						url: '/v1/models',
+					},
+					output: {
+						postReceive: [
+							{
+								type: 'rootProperty',
+								properties: {
+									property: 'data',
+								},
+							},
+							{
+								type: 'filter',
+								properties: {
+									pass: "={{ $responseItem.id.startsWith('dall-') }}",
+								},
+							},
+							{
+								type: 'setKeyValue',
+								properties: {
+									name: '={{$responseItem.id}}',
+									value: '={{$responseItem.id}}',
+								},
+							},
+							{
+								type: 'sort',
+								properties: {
+									key: 'name',
+								},
+							},
+						],
+					},
+				},
+			},
+		},
+		displayOptions: {
+			show: {
+				resource: ['image'],
+				operation: ['create'],
+				'@version': [1],
+			},
+		},
+		routing: {
+			send: {
+				type: 'body',
+				property: 'model',
+			},
+		},
+	},
+	{
+		displayName: 'Model',
+		name: 'imageModel',
+		type: 'options',
+		default: 'dall-e-2',
+		description: 'The model to use for image generation',
+		typeOptions: {
+			loadOptions: {
+				routing: {
+					request: {
+						method: 'GET',
+						url: '/v1/models',
+					},
+					output: {
+						postReceive: [
+							{
+								type: 'rootProperty',
+								properties: {
+									property: 'data',
+								},
+							},
+							{
+								type: 'filter',
+								properties: {
+									pass: "={{ $responseItem.id.startsWith('dall-') }}",
+								},
+							},
+							{
+								type: 'setKeyValue',
+								properties: {
+									name: '={{$responseItem.id}}',
+									value: '={{$responseItem.id}}',
+								},
+							},
+							{
+								type: 'sort',
+								properties: {
+									key: 'name',
+								},
+							},
+						],
+					},
+				},
+			},
+		},
+		displayOptions: {
+			show: {
+				resource: ['image'],
+				operation: ['create'],
+			},
+			hide: {
+				'@version': [1],
+			},
+		},
+		routing: {
+			send: {
+				type: 'body',
+				property: 'model',
+			},
+		},
+	},
 	{
 		displayName: 'Response Format',
 		name: 'responseFormat',
@@ -77,7 +199,7 @@ const createOperations: INodeProperties[] = [
 		},
 		options: [
 			{
-				name: 'Binary Data',
+				name: 'Binary File',
 				value: 'binaryData',
 			},
 			{
@@ -148,6 +270,33 @@ const createOperations: INodeProperties[] = [
 					},
 				},
 			},
+			{
+				displayName: 'Quality',
+				name: 'quality',
+				type: 'options',
+				options: [
+					{
+						name: 'HD',
+						value: 'hd',
+					},
+					{
+						name: 'Standard',
+						value: 'standard',
+					},
+				],
+				displayOptions: {
+					show: {
+						'/model': ['dall-e-3'],
+					},
+				},
+				routing: {
+					send: {
+						type: 'body',
+						property: 'quality',
+					},
+				},
+				default: 'standard',
+			},
 			{
 				displayName: 'Resolution',
 				name: 'size',
@@ -166,6 +315,42 @@ const createOperations: INodeProperties[] = [
 						value: '1024x1024',
 					},
 				],
+				displayOptions: {
+					show: {
+						'/model': ['dall-e-2'],
+					},
+				},
+				routing: {
+					send: {
+						type: 'body',
+						property: 'size',
+					},
+				},
+				default: '1024x1024',
+			},
+			{
+				displayName: 'Resolution',
+				name: 'size',
+				type: 'options',
+				options: [
+					{
+						name: '1024x1024',
+						value: '1024x1024',
+					},
+					{
+						name: '1792x1024',
+						value: '1792x1024',
+					},
+					{
+						name: '1024x1792',
+						value: '1024x1792',
+					},
+				],
+				displayOptions: {
+					show: {
+						'/model': ['dall-e-3'],
+					},
+				},
 				routing: {
 					send: {
 						type: 'body',
@@ -174,6 +359,33 @@ const createOperations: INodeProperties[] = [
 				},
 				default: '1024x1024',
 			},
+			{
+				displayName: 'Style',
+				name: 'style',
+				type: 'options',
+				options: [
+					{
+						name: 'Natural',
+						value: 'natural',
+					},
+					{
+						name: 'Vivid',
+						value: 'vivid',
+					},
+				],
+				displayOptions: {
+					show: {
+						'/model': ['dall-e-3'],
+					},
+				},
+				routing: {
+					send: {
+						type: 'body',
+						property: 'style',
+					},
+				},
+				default: 'vivid',
+			},
 		],
 	},
 ];
diff --git a/packages/nodes-base/nodes/OpenAi/OpenAi.node.json b/packages/nodes-base/nodes/OpenAi/OpenAi.node.json
index 37572986005b2..330794a0d5889 100644
--- a/packages/nodes-base/nodes/OpenAi/OpenAi.node.json
+++ b/packages/nodes-base/nodes/OpenAi/OpenAi.node.json
@@ -11,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.openai/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-langchain.openai/"
 			}
 		]
 	},
diff --git a/packages/nodes-base/nodes/OpenAi/OpenAi.node.ts b/packages/nodes-base/nodes/OpenAi/OpenAi.node.ts
index 51499ad6446cf..d4ed1e429d092 100644
--- a/packages/nodes-base/nodes/OpenAi/OpenAi.node.ts
+++ b/packages/nodes-base/nodes/OpenAi/OpenAi.node.ts
@@ -1,4 +1,5 @@
 import type { INodeType, INodeTypeDescription } from 'n8n-workflow';
+import { oldVersionNotice } from '../../utils/descriptions';
 import { imageFields, imageOperations } from './ImageDescription';
 import { textFields, textOperations } from './TextDescription';
 import { chatFields, chatOperations } from './ChatDescription';
@@ -7,9 +8,10 @@ export class OpenAi implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'OpenAI',
 		name: 'openAi',
+		hidden: true,
 		icon: 'file:openAi.svg',
 		group: ['transform'],
-		version: 1,
+		version: [1, 1.1],
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
 		description: 'Consume Open AI',
 		defaults: {
@@ -24,9 +26,11 @@ export class OpenAi implements INodeType {
 			},
 		],
 		requestDefaults: {
+			ignoreHttpStatusErrors: true,
 			baseURL: 'https://api.openai.com',
 		},
 		properties: [
+			oldVersionNotice,
 			{
 				displayName: 'Resource',
 				name: 'resource',
diff --git a/packages/nodes-base/nodes/OpenAi/TextDescription.ts b/packages/nodes-base/nodes/OpenAi/TextDescription.ts
index 83b42a993f67b..22d8b6a18c499 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[] = [
 	{
@@ -22,6 +23,7 @@ export const textOperations: INodeProperties[] = [
 						method: 'POST',
 						url: '/v1/completions',
 					},
+					output: { postReceive: [sendErrorPostReceive] },
 				},
 			},
 			{
@@ -34,6 +36,7 @@ export const textOperations: INodeProperties[] = [
 						method: 'POST',
 						url: '/v1/edits',
 					},
+					output: { postReceive: [sendErrorPostReceive] },
 				},
 			},
 			{
@@ -46,6 +49,7 @@ export const textOperations: INodeProperties[] = [
 						method: 'POST',
 						url: '/v1/moderations',
 					},
+					output: { postReceive: [sendErrorPostReceive] },
 				},
 			},
 		],
@@ -84,13 +88,12 @@ const completeOperations: INodeProperties[] = [
 							{
 								type: 'filter',
 								properties: {
-									pass: "={{ !$responseItem.id.startsWith('audio-') && !$responseItem.id.startsWith('gpt-') && !$responseItem.id.startsWith('whisper-') && !['cushman:2020-05-03', 'davinci-if:3.0.0', 'davinci-instruct-beta:2.0.0', 'if'].includes($responseItem.id) && !$responseItem.id.includes('-edit-') && !$responseItem.id.endsWith(':001') }}",
+									pass: "={{ !$responseItem.id.startsWith('audio-') && ($responseItem.id === 'gpt-3.5-turbo-instruct' || !$responseItem.id.startsWith('gpt-') ) && !$responseItem.id.startsWith('dall-') && !$responseItem.id.startsWith('tts-') && !$responseItem.id.startsWith('whisper-') && !['cushman:2020-05-03', 'davinci-if:3.0.0', 'davinci-instruct-beta:2.0.0', 'if'].includes($responseItem.id) && !$responseItem.id.includes('-edit-') && !$responseItem.id.endsWith(':001') }}",
 								},
 							},
 							{
 								type: 'setKeyValue',
 								properties: {
-									// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased-id
 									name: '={{$responseItem.id}}',
 									value: '={{$responseItem.id}}',
 								},
@@ -112,7 +115,7 @@ const completeOperations: INodeProperties[] = [
 				property: 'model',
 			},
 		},
-		default: 'text-davinci-003',
+		default: 'gpt-3.5-turbo-instruct',
 	},
 	{
 		displayName: 'Prompt',
@@ -399,7 +402,7 @@ const sharedOperations: INodeProperties[] = [
 				name: 'maxTokens',
 				default: 16,
 				description:
-					'The maximum number of tokens to generate in the completion. Most models have a context length of 2048 tokens (except for the newest models, which support 4096).',
+					'The maximum number of tokens to generate in the completion. Most models have a context length of 2048 tokens (except for the newest models, which support 32,768).',
 				type: 'number',
 				displayOptions: {
 					show: {
@@ -407,7 +410,7 @@ const sharedOperations: INodeProperties[] = [
 					},
 				},
 				typeOptions: {
-					maxValue: 4096,
+					maxValue: 32768,
 				},
 				routing: {
 					send: {
diff --git a/packages/nodes-base/nodes/OpenAi/openAi.svg b/packages/nodes-base/nodes/OpenAi/openAi.svg
index d9445723fffb7..4f8812da72e68 100644
--- a/packages/nodes-base/nodes/OpenAi/openAi.svg
+++ b/packages/nodes-base/nodes/OpenAi/openAi.svg
@@ -1,7 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="256px" height="260px" viewBox="0 0 256 260" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMidYMid">
-    <title>OpenAI</title>
-    <g>
-        <path d="M239.183914,106.202783 C245.054304,88.5242096 243.02228,69.1733805 233.607599,53.0998864 C219.451678,28.4588021 190.999703,15.7836129 163.213007,21.739505 C147.554077,4.32145883 123.794909,-3.42398554 100.87901,1.41873898 C77.9631105,6.26146349 59.3690093,22.9572536 52.0959621,45.2214219 C33.8436494,48.9644867 18.0901721,60.392749 8.86672513,76.5818033 C-5.443491,101.182962 -2.19544431,132.215255 16.8986662,153.320094 C11.0060865,170.990656 13.0197283,190.343991 22.4238231,206.422991 C36.5975553,231.072344 65.0680342,243.746566 92.8695738,237.783372 C105.235639,251.708249 123.001113,259.630942 141.623968,259.52692 C170.105359,259.552169 195.337611,241.165718 204.037777,214.045661 C222.28734,210.296356 238.038489,198.869783 247.267014,182.68528 C261.404453,158.127515 258.142494,127.262775 239.183914,106.202783 L239.183914,106.202783 Z M141.623968,242.541207 C130.255682,242.559177 119.243876,238.574642 110.519381,231.286197 L112.054146,230.416496 L163.724595,200.590881 C166.340648,199.056444 167.954321,196.256818 167.970781,193.224005 L167.970781,120.373788 L189.815614,133.010026 C190.034132,133.121423 190.186235,133.330564 190.224885,133.572774 L190.224885,193.940229 C190.168603,220.758427 168.442166,242.484864 141.623968,242.541207 Z M37.1575749,197.93062 C31.456498,188.086359 29.4094818,176.546984 31.3766237,165.342426 L32.9113895,166.263285 L84.6329973,196.088901 C87.2389349,197.618207 90.4682717,197.618207 93.0742093,196.088901 L156.255402,159.663793 L156.255402,184.885111 C156.243557,185.149771 156.111725,185.394602 155.89729,185.550176 L103.561776,215.733903 C80.3054953,229.131632 50.5924954,221.165435 37.1575749,197.93062 Z M23.5493181,85.3811273 C29.2899861,75.4733097 38.3511911,67.9162648 49.1287482,64.0478825 L49.1287482,125.438515 C49.0891492,128.459425 50.6965386,131.262556 53.3237748,132.754232 L116.198014,169.025864 L94.3531808,181.662102 C94.1132325,181.789434 93.8257461,181.789434 93.5857979,181.662102 L41.3526015,151.529534 C18.1419426,138.076098 10.1817681,108.385562 23.5493181,85.125333 L23.5493181,85.3811273 Z M203.0146,127.075598 L139.935725,90.4458545 L161.7294,77.8607748 C161.969348,77.7334434 162.256834,77.7334434 162.496783,77.8607748 L214.729979,108.044502 C231.032329,117.451747 240.437294,135.426109 238.871504,154.182739 C237.305714,172.939368 225.050719,189.105572 207.414262,195.67963 L207.414262,134.288998 C207.322521,131.276867 205.650697,128.535853 203.0146,127.075598 Z M224.757116,94.3850867 L223.22235,93.4642272 L171.60306,63.3828173 C168.981293,61.8443751 165.732456,61.8443751 163.110689,63.3828173 L99.9806554,99.8079259 L99.9806554,74.5866077 C99.9533004,74.3254088 100.071095,74.0701869 100.287609,73.9215426 L152.520805,43.7889738 C168.863098,34.3743518 189.174256,35.2529043 204.642579,46.0434841 C220.110903,56.8340638 227.949269,75.5923959 224.757116,94.1804513 L224.757116,94.3850867 Z M88.0606409,139.097931 L66.2158076,126.512851 C65.9950399,126.379091 65.8450965,126.154176 65.8065367,125.898945 L65.8065367,65.684966 C65.8314495,46.8285367 76.7500605,29.6846032 93.8270852,21.6883055 C110.90411,13.6920079 131.063833,16.2835462 145.5632,28.338998 L144.028434,29.2086986 L92.3579852,59.0343142 C89.7419327,60.5687513 88.1282597,63.3683767 88.1117998,66.4011901 L88.0606409,139.097931 Z M99.9294965,113.5185 L128.06687,97.3011417 L156.255402,113.5185 L156.255402,145.953218 L128.169187,162.170577 L99.9806554,145.953218 L99.9294965,113.5185 Z" fill="#000000"></path>
-    </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="260" preserveAspectRatio="xMidYMid"><path d="M239.184 106.203a64.72 64.72 0 0 0-5.576-53.103C219.452 28.459 191 15.784 163.213 21.74A65.586 65.586 0 0 0 52.096 45.22a64.72 64.72 0 0 0-43.23 31.36c-14.31 24.602-11.061 55.634 8.033 76.74a64.67 64.67 0 0 0 5.525 53.102c14.174 24.65 42.644 37.324 70.446 31.36a64.72 64.72 0 0 0 48.754 21.744c28.481.025 53.714-18.361 62.414-45.481a64.77 64.77 0 0 0 43.229-31.36c14.137-24.558 10.875-55.423-8.083-76.483m-97.56 136.338a48.4 48.4 0 0 1-31.105-11.255l1.535-.87 51.67-29.825a8.6 8.6 0 0 0 4.247-7.367v-72.85l21.845 12.636c.218.111.37.32.409.563v60.367c-.056 26.818-21.783 48.545-48.601 48.601M37.158 197.93a48.35 48.35 0 0 1-5.781-32.589l1.534.921 51.722 29.826a8.34 8.34 0 0 0 8.441 0l63.181-36.425v25.221a.87.87 0 0 1-.358.665l-52.335 30.184c-23.257 13.398-52.97 5.431-66.404-17.803M23.549 85.38a48.5 48.5 0 0 1 25.58-21.333v61.39a8.29 8.29 0 0 0 4.195 7.316l62.874 36.272-21.845 12.636a.82.82 0 0 1-.767 0L41.353 151.53c-23.211-13.454-31.171-43.144-17.804-66.405zm179.466 41.695-63.08-36.63L161.73 77.86a.82.82 0 0 1 .768 0l52.233 30.184a48.6 48.6 0 0 1-7.316 87.635v-61.391a8.54 8.54 0 0 0-4.4-7.213m21.742-32.69-1.535-.922-51.619-30.081a8.39 8.39 0 0 0-8.492 0L99.98 99.808V74.587a.72.72 0 0 1 .307-.665l52.233-30.133a48.652 48.652 0 0 1 72.236 50.391zM88.061 139.097l-21.845-12.585a.87.87 0 0 1-.41-.614V65.685a48.652 48.652 0 0 1 79.757-37.346l-1.535.87-51.67 29.825a8.6 8.6 0 0 0-4.246 7.367zm11.868-25.58L128.067 97.3l28.188 16.218v32.434l-28.086 16.218-28.188-16.218z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/OpenThesaurus/GenericFunctions.ts b/packages/nodes-base/nodes/OpenThesaurus/GenericFunctions.ts
index 38a5f39bc1e1e..33b7906adf44c 100644
--- a/packages/nodes-base/nodes/OpenThesaurus/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/OpenThesaurus/GenericFunctions.ts
@@ -1,18 +1,17 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	JsonObject,
+	IRequestOptions,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function openThesaurusApiRequest(
-	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -21,7 +20,7 @@ export async function openThesaurusApiRequest(
 	option: IDataObject = {},
 ): Promise<any> {
 	try {
-		let options: OptionsWithUri = {
+		let options = {
 			headers: {
 				'User-Agent': 'https://n8n.io',
 			},
@@ -30,7 +29,7 @@ export async function openThesaurusApiRequest(
 			body,
 			uri: uri || `https://www.openthesaurus.de${resource}`,
 			json: true,
-		};
+		} satisfies IRequestOptions;
 
 		options = Object.assign({}, options, option);
 		options.qs.format = 'application/json';
diff --git a/packages/nodes-base/nodes/OpenThesaurus/OpenThesaurus.node.ts b/packages/nodes-base/nodes/OpenThesaurus/OpenThesaurus.node.ts
index aab2b8577d300..e4276118b960f 100644
--- a/packages/nodes-base/nodes/OpenThesaurus/OpenThesaurus.node.ts
+++ b/packages/nodes-base/nodes/OpenThesaurus/OpenThesaurus.node.ts
@@ -183,6 +183,6 @@ export class OpenThesaurus implements INodeType {
 				throw error;
 			}
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/OpenWeatherMap/OpenWeatherMap.node.ts b/packages/nodes-base/nodes/OpenWeatherMap/OpenWeatherMap.node.ts
index 04fcb306707ee..f1f40ffc32990 100644
--- a/packages/nodes-base/nodes/OpenWeatherMap/OpenWeatherMap.node.ts
+++ b/packages/nodes-base/nodes/OpenWeatherMap/OpenWeatherMap.node.ts
@@ -5,11 +5,10 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 	JsonObject,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
-import type { OptionsWithUri } from 'request';
-
 export class OpenWeatherMap implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'OpenWeatherMap',
@@ -260,7 +259,7 @@ export class OpenWeatherMap implements INodeType {
 					);
 				}
 
-				const options: OptionsWithUri = {
+				const options: IRequestOptions = {
 					method: 'GET',
 					qs,
 					uri: `https://api.openweathermap.org/data/2.5/${endpoint}`,
@@ -288,6 +287,6 @@ export class OpenWeatherMap implements INodeType {
 			}
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Orbit/GenericFunctions.ts b/packages/nodes-base/nodes/Orbit/GenericFunctions.ts
index a39ad2493fe67..7759f248efb16 100644
--- a/packages/nodes-base/nodes/Orbit/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Orbit/GenericFunctions.ts
@@ -1,20 +1,19 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	JsonObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	IDataObject,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import type { IRelation } from './Interfaces';
 
 export async function orbitApiRequest(
-	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -24,7 +23,7 @@ export async function orbitApiRequest(
 ): Promise<any> {
 	try {
 		const credentials = await this.getCredentials('orbitApi');
-		let options: OptionsWithUri = {
+		let options: IRequestOptions = {
 			headers: {
 				Authorization: `Bearer ${credentials.accessToken}`,
 			},
@@ -87,7 +86,7 @@ export function resolveMember(responseData: IRelation) {
 export async function orbitApiRequestAllItems(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
diff --git a/packages/nodes-base/nodes/Orbit/Orbit.node.ts b/packages/nodes-base/nodes/Orbit/Orbit.node.ts
index 6c6c0a0e74689..f5faa28220614 100644
--- a/packages/nodes-base/nodes/Orbit/Orbit.node.ts
+++ b/packages/nodes-base/nodes/Orbit/Orbit.node.ts
@@ -8,6 +8,7 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
+import moment from 'moment-timezone';
 import { orbitApiRequest, orbitApiRequestAllItems, resolveIdentities } from './GenericFunctions';
 
 import { activityFields, activityOperations } from './ActivityDescription';
@@ -18,7 +19,6 @@ import { noteFields, noteOperations } from './NoteDescription';
 
 import { postFields, postOperations } from './PostDescription';
 
-import moment from 'moment';
 import type { IRelation } from './Interfaces';
 
 export class Orbit implements INodeType {
@@ -542,6 +542,6 @@ export class Orbit implements INodeType {
 				throw error;
 			}
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Orbit/orbit.svg b/packages/nodes-base/nodes/Orbit/orbit.svg
index ea0e0d15674a4..a52b999c6b931 100644
--- a/packages/nodes-base/nodes/Orbit/orbit.svg
+++ b/packages/nodes-base/nodes/Orbit/orbit.svg
@@ -1 +1 @@
-<svg width="80" height="80" fill="none" viewBox="13.5 9.957 132 91.59" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M119.047 49.098A44.997 44.997 0 0073.23 10.016a44.999 44.999 0 00-26.781 80.218c4.416-1.966 9.245-4.262 14.375-6.837a31.493 31.493 0 01-1.95-55.788 31.496 31.496 0 0146.923 30.239 405.85 405.85 0 0013.25-8.75zm.379 5.1c-4.546 3.362-9.583 6.846-15 10.358a31.493 31.493 0 01-37.411 21.045c-5.937 2.854-11.57 5.325-16.729 7.37a44.999 44.999 0 0069.14-38.773z" fill="#1D2125"/><path fill-rule="evenodd" clip-rule="evenodd" d="M121.709 17.6a3.082 3.082 0 002.845-1.902 3.078 3.078 0 00-4.023-4.023 3.076 3.076 0 00-1.901 2.845 3.077 3.077 0 003.079 3.08zM18.104 69.914a4.104 4.104 0 100-8.208 4.104 4.104 0 000 8.208zm69.31-24.174c4.433-2.45 8.75-4.775 12.916-6.92.155.25.321.545.496.879a615.52 615.52 0 00-12.878 6.945l-.534-.904zm57.582-21.862c-1.979-3.429-13.979.213-30.962 8.15.159.262.317.533.467.808 16.27-7.745 27.624-11.474 29.066-8.474 2.266 3.924-23.75 23.182-58.082 43.01-34.332 19.83-64.023 32.72-66.29 28.795-1.29-2.333 5.096-8.69 10.834-13.75-8.263 6.667-12.596 11.805-11.17 14.271 3.232 5.604 34.527-5.416 69.364-25.516 34.836-20.099 60.023-41.69 56.773-47.294z" fill="#00ADE8"/><path d="M83.335 48.998a6.3 6.3 0 113.825 2.917 6.078 6.078 0 01-3.825-2.917z" fill="#DD078C"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="80" height="80" fill="none" viewBox="13.5 9.957 132 91.59"><path fill="#1D2125" fill-rule="evenodd" d="M119.047 49.098A44.997 44.997 0 0 0 73.23 10.016a44.999 44.999 0 0 0-26.781 80.218c4.416-1.966 9.245-4.262 14.375-6.837a31.493 31.493 0 0 1-1.95-55.788 31.496 31.496 0 0 1 46.923 30.239 406 406 0 0 0 13.25-8.75m.379 5.1c-4.546 3.362-9.583 6.846-15 10.358a31.493 31.493 0 0 1-37.411 21.045c-5.937 2.854-11.57 5.325-16.729 7.37a44.999 44.999 0 0 0 69.14-38.773" clip-rule="evenodd"/><path fill="#00ADE8" fill-rule="evenodd" d="M121.709 17.6a3.08 3.08 0 0 0 2.845-1.902 3.078 3.078 0 0 0-4.023-4.023 3.08 3.08 0 0 0-1.901 2.845 3.077 3.077 0 0 0 3.079 3.08M18.104 69.914a4.104 4.104 0 1 0 0-8.208 4.104 4.104 0 0 0 0 8.208m69.31-24.174c4.433-2.45 8.75-4.775 12.916-6.92q.233.377.496.879a616 616 0 0 0-12.878 6.945zm57.582-21.862c-1.979-3.429-13.979.213-30.962 8.15q.24.394.467.808c16.27-7.745 27.624-11.474 29.066-8.474 2.266 3.924-23.75 23.182-58.082 43.01-34.332 19.83-64.023 32.72-66.29 28.795-1.29-2.333 5.096-8.69 10.834-13.75-8.263 6.667-12.596 11.805-11.17 14.271 3.232 5.604 34.527-5.416 69.364-25.516 34.836-20.099 60.023-41.69 56.773-47.294" clip-rule="evenodd"/><path fill="#DD078C" d="M83.335 48.998a6.3 6.3 0 1 1 3.825 2.917 6.08 6.08 0 0 1-3.825-2.917"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Oura/GenericFunctions.ts b/packages/nodes-base/nodes/Oura/GenericFunctions.ts
index a520f7f1446f1..9fb9691822004 100644
--- a/packages/nodes-base/nodes/Oura/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Oura/GenericFunctions.ts
@@ -1,18 +1,17 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	JsonObject,
+	IRequestOptions,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function ouraApiRequest(
-	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 	body: IDataObject = {},
 	qs: IDataObject = {},
@@ -20,7 +19,7 @@ export async function ouraApiRequest(
 	option: IDataObject = {},
 ) {
 	const credentials = await this.getCredentials('ouraApi');
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		headers: {
 			Authorization: `Bearer ${credentials.accessToken}`,
 		},
diff --git a/packages/nodes-base/nodes/Oura/Oura.node.ts b/packages/nodes-base/nodes/Oura/Oura.node.ts
index d7cc845ec4650..ecadcb9fcc53d 100644
--- a/packages/nodes-base/nodes/Oura/Oura.node.ts
+++ b/packages/nodes-base/nodes/Oura/Oura.node.ts
@@ -6,14 +6,13 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
+import moment from 'moment-timezone';
 import { ouraApiRequest } from './GenericFunctions';
 
 import { profileOperations } from './ProfileDescription';
 
 import { summaryFields, summaryOperations } from './SummaryDescription';
 
-import moment from 'moment';
-
 export class Oura implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Oura',
diff --git a/packages/nodes-base/nodes/Oura/oura.svg b/packages/nodes-base/nodes/Oura/oura.svg
index 190442d3d999a..85ddf3fd2975e 100644
--- a/packages/nodes-base/nodes/Oura/oura.svg
+++ b/packages/nodes-base/nodes/Oura/oura.svg
@@ -1 +1 @@
-<svg version="1.0" xmlns="http://www.w3.org/2000/svg" viewBox="12 12 35 35"><path d="M24 16.5c0 1.2 1.3 1.5 6 1.5s6-.3 6-1.5-1.3-1.5-6-1.5-6 .3-6 1.5zm2 4.8c-4.1 1.4-8 6.8-8 11.1 0 7.7 7.9 13.8 15.1 11.7 9.8-2.9 12.1-15.4 3.9-21.2-3.5-2.4-6.9-2.9-11-1.6zm10 4.4c4.9 4.3 4.3 12.1-1 14.8-4.2 2.2-7.4 1.8-10.9-1.1-4.3-3.6-4.4-9.3-.2-13.5 3.8-3.8 8-3.9 12.1-.2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" viewBox="12 12 35 35"><path d="M24 16.5c0 1.2 1.3 1.5 6 1.5s6-.3 6-1.5-1.3-1.5-6-1.5-6 .3-6 1.5m2 4.8c-4.1 1.4-8 6.8-8 11.1 0 7.7 7.9 13.8 15.1 11.7 9.8-2.9 12.1-15.4 3.9-21.2-3.5-2.4-6.9-2.9-11-1.6m10 4.4c4.9 4.3 4.3 12.1-1 14.8-4.2 2.2-7.4 1.8-10.9-1.1-4.3-3.6-4.4-9.3-.2-13.5 3.8-3.8 8-3.9 12.1-.2"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Paddle/GenericFunctions.ts b/packages/nodes-base/nodes/Paddle/GenericFunctions.ts
index 457028faead92..ea6808cf1ca29 100644
--- a/packages/nodes-base/nodes/Paddle/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Paddle/GenericFunctions.ts
@@ -1,25 +1,19 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	JsonObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	IWebhookFunctions,
 	IDataObject,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function paddleApiRequest(
-	this:
-		| IHookFunctions
-		| IExecuteFunctions
-		| IExecuteSingleFunctions
-		| ILoadOptionsFunctions
-		| IWebhookFunctions,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
 	endpoint: string,
-	method: string,
+	method: IHttpRequestMethods,
 
 	body: any = {},
 	_query?: IDataObject,
@@ -31,7 +25,7 @@ export async function paddleApiRequest(
 
 	const isSandbox = credentials.sandbox;
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		method,
 		headers: {
 			'content-type': 'application/json',
@@ -60,7 +54,7 @@ export async function paddleApiRequestAllItems(
 	this: IHookFunctions | IExecuteFunctions,
 	propertyName: string,
 	endpoint: string,
-	method: string,
+	method: IHttpRequestMethods,
 
 	body: any = {},
 	query: IDataObject = {},
diff --git a/packages/nodes-base/nodes/Paddle/Paddle.node.ts b/packages/nodes-base/nodes/Paddle/Paddle.node.ts
index a6951cb244038..3f335307fe37b 100644
--- a/packages/nodes-base/nodes/Paddle/Paddle.node.ts
+++ b/packages/nodes-base/nodes/Paddle/Paddle.node.ts
@@ -10,6 +10,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
+import moment from 'moment-timezone';
 import { couponFields, couponOperations } from './CouponDescription';
 
 import { paddleApiRequest, paddleApiRequestAllItems, validateJSON } from './GenericFunctions';
@@ -27,8 +28,6 @@ import { userFields, userOperations } from './UserDescription';
 // 	orderFields,
 // } from './OrderDescription';
 
-import moment from 'moment';
-
 export class Paddle implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Paddle',
@@ -538,6 +537,6 @@ export class Paddle implements INodeType {
 
 			returnData.push(...executionData);
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/PagerDuty/GenericFunctions.ts b/packages/nodes-base/nodes/PagerDuty/GenericFunctions.ts
index 52837e07ec19d..3206e205871d0 100644
--- a/packages/nodes-base/nodes/PagerDuty/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/PagerDuty/GenericFunctions.ts
@@ -1,5 +1,3 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	JsonObject,
 	IDataObject,
@@ -7,6 +5,8 @@ import type {
 	ILoadOptionsFunctions,
 	IHookFunctions,
 	IWebhookFunctions,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
@@ -14,7 +14,7 @@ import { snakeCase } from 'change-case';
 
 export async function pagerDutyApiRequest(
 	this: IExecuteFunctions | IWebhookFunctions | IHookFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -24,7 +24,7 @@ export async function pagerDutyApiRequest(
 ): Promise<any> {
 	const authenticationMethod = this.getNodeParameter('authentication', 0);
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			Accept: 'application/vnd.pagerduty+json;version=2',
 		},
@@ -65,7 +65,7 @@ export async function pagerDutyApiRequest(
 export async function pagerDutyApiRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: any = {},
diff --git a/packages/nodes-base/nodes/PagerDuty/IncidentDescription.ts b/packages/nodes-base/nodes/PagerDuty/IncidentDescription.ts
index a95a1879db874..08b60750ac1bf 100644
--- a/packages/nodes-base/nodes/PagerDuty/IncidentDescription.ts
+++ b/packages/nodes-base/nodes/PagerDuty/IncidentDescription.ts
@@ -297,10 +297,10 @@ export const incidentFields: INodeProperties[] = [
 					},
 					{
 						name: 'Assignees',
-						value: 'assigness',
+						value: 'assignees',
 					},
 					{
-						name: 'Conferenece Bridge',
+						name: 'Conference Bridge',
 						value: 'conferenceBridge',
 					},
 					{
@@ -550,7 +550,7 @@ export const incidentFields: INodeProperties[] = [
 				type: 'options',
 				options: [
 					{
-						name: 'Hight',
+						name: 'High',
 						value: 'high',
 					},
 					{
diff --git a/packages/nodes-base/nodes/PagerDuty/PagerDuty.node.ts b/packages/nodes-base/nodes/PagerDuty/PagerDuty.node.ts
index 2acb143d19fe7..fa7591d1e8715 100644
--- a/packages/nodes-base/nodes/PagerDuty/PagerDuty.node.ts
+++ b/packages/nodes-base/nodes/PagerDuty/PagerDuty.node.ts
@@ -8,6 +8,8 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
+import { snakeCase } from 'change-case';
+import moment from 'moment-timezone';
 import {
 	keysToSnakeCase,
 	pagerDutyApiRequest,
@@ -24,10 +26,6 @@ import { userFields, userOperations } from './UserDescription';
 
 import type { IIncident } from './IncidentInterface';
 
-import { snakeCase } from 'change-case';
-
-import moment from 'moment-timezone';
-
 export class PagerDuty implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'PagerDuty',
@@ -472,6 +470,6 @@ export class PagerDuty implements INodeType {
 				throw error;
 			}
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/PagerDuty/pagerDuty.svg b/packages/nodes-base/nodes/PagerDuty/pagerDuty.svg
index f43bdae4cb24a..f2852b5917cbb 100644
--- a/packages/nodes-base/nodes/PagerDuty/pagerDuty.svg
+++ b/packages/nodes-base/nodes/PagerDuty/pagerDuty.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 66 56" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><path d="M6.704 54.434H0v-33.65c0-3.455 1.418-5.544 2.604-6.704 2.63-2.58 6.2-2.656 6.782-2.656h10.546c3.765 0 5.93 1.52 7.117 2.8 2.346 2.553 2.372 5.853 2.32 6.73v12.687c0 3.662-1.496 5.828-2.733 6.988-2.553 2.398-5.93 2.45-6.73 2.424H6.704zm13.46-18.102c.36 0 1.367-.103 1.908-.62.413-.387.62-1.083.62-2.1v-13.02c0-.36-.077-1.315-.593-1.857-.5-.516-1.444-.62-2.166-.62h-10.6c-2.63 0-2.63 1.985-2.63 2.656v15.55zM57.296 0H64v33.677c0 3.455-1.418 5.544-2.604 6.704-2.63 2.58-6.2 2.656-6.782 2.656H44.068c-3.765 0-5.93-1.52-7.117-2.8-2.346-2.553-2.372-5.853-2.32-6.73v-12.67c0-3.662 1.496-5.828 2.733-6.988 2.553-2.398 5.93-2.45 6.73-2.424h13.202zm-13.46 18.117c-.36 0-1.367.103-1.908.62-.413.387-.62 1.083-.62 2.1v13.02c0 .36.077 1.315.593 1.857.5.516 1.444.62 2.166.62h10.598c2.656-.026 2.656-2 2.656-2.682V18.117z" stroke="none" fill="#25c151" fill-rule="nonzero"/></symbol></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round" viewBox="0 0 66 56"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><path fill="#25c151" fill-rule="nonzero" stroke="none" d="M6.704 54.434H0v-33.65c0-3.455 1.418-5.544 2.604-6.704 2.63-2.58 6.2-2.656 6.782-2.656h10.546c3.765 0 5.93 1.52 7.117 2.8 2.346 2.553 2.372 5.853 2.32 6.73v12.687c0 3.662-1.496 5.828-2.733 6.988-2.553 2.398-5.93 2.45-6.73 2.424H6.704zm13.46-18.102c.36 0 1.367-.103 1.908-.62.413-.387.62-1.083.62-2.1v-13.02c0-.36-.077-1.315-.593-1.857-.5-.516-1.444-.62-2.166-.62h-10.6c-2.63 0-2.63 1.985-2.63 2.656v15.55zM57.296 0H64v33.677c0 3.455-1.418 5.544-2.604 6.704-2.63 2.58-6.2 2.656-6.782 2.656H44.068c-3.765 0-5.93-1.52-7.117-2.8-2.346-2.553-2.372-5.853-2.32-6.73v-12.67c0-3.662 1.496-5.828 2.733-6.988 2.553-2.398 5.93-2.45 6.73-2.424h13.202zm-13.46 18.117c-.36 0-1.367.103-1.908.62-.413.387-.62 1.083-.62 2.1v13.02c0 .36.077 1.315.593 1.857.5.516 1.444.62 2.166.62h10.598c2.656-.026 2.656-2 2.656-2.682V18.117z"/></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/PayPal/GenericFunctions.ts b/packages/nodes-base/nodes/PayPal/GenericFunctions.ts
index 6d64e29d18ea2..60f597cbe8107 100644
--- a/packages/nodes-base/nodes/PayPal/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/PayPal/GenericFunctions.ts
@@ -1,13 +1,12 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	JsonObject,
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	IWebhookFunctions,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { BINARY_ENCODING, NodeApiError, NodeOperationError } from 'n8n-workflow';
 
@@ -19,12 +18,7 @@ function getEnvironment(env: string) {
 }
 
 async function getAccessToken(
-	this:
-		| IHookFunctions
-		| IExecuteFunctions
-		| IExecuteSingleFunctions
-		| ILoadOptionsFunctions
-		| IWebhookFunctions,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
 ): Promise<any> {
 	const credentials = await this.getCredentials('payPalApi');
 	const env = getEnvironment(credentials.env as string);
@@ -35,7 +29,7 @@ async function getAccessToken(
 		{},
 		{ Authorization: `Basic ${data}`, 'Content-Type': 'application/x-www-form-urlencoded' },
 	);
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: headerWithAuthentication,
 		method: 'POST',
 		form: {
@@ -52,14 +46,9 @@ async function getAccessToken(
 }
 
 export async function payPalApiRequest(
-	this:
-		| IHookFunctions
-		| IExecuteFunctions
-		| IExecuteSingleFunctions
-		| ILoadOptionsFunctions
-		| IWebhookFunctions,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
 	endpoint: string,
-	method: string,
+	method: IHttpRequestMethods,
 
 	body: any = {},
 	query?: IDataObject,
@@ -101,10 +90,10 @@ function getNext(links: IDataObject[]): string | undefined {
  * and return all results
  */
 export async function payPalApiRequestAllItems(
-	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	propertyName: string,
 	endpoint: string,
-	method: string,
+	method: IHttpRequestMethods,
 
 	body: any = {},
 	query?: IDataObject,
diff --git a/packages/nodes-base/nodes/PayPal/PayPal.node.ts b/packages/nodes-base/nodes/PayPal/PayPal.node.ts
index 856ab8822b045..6ed04330bf212 100644
--- a/packages/nodes-base/nodes/PayPal/PayPal.node.ts
+++ b/packages/nodes-base/nodes/PayPal/PayPal.node.ts
@@ -1,4 +1,3 @@
-import type { OptionsWithUri } from 'request';
 import type {
 	IExecuteFunctions,
 	ICredentialsDecrypted,
@@ -8,6 +7,7 @@ import type {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 import {
@@ -101,7 +101,7 @@ export class PayPal implements INodeType {
 
 				const base64Key = Buffer.from(`${clientId}:${clientSecret}`).toString('base64');
 
-				const options: OptionsWithUri = {
+				const options: IRequestOptions = {
 					headers: {
 						Authorization: `Basic ${base64Key}`,
 					},
@@ -253,6 +253,6 @@ export class PayPal implements INodeType {
 				throw error;
 			}
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/PayPal/paypal.svg b/packages/nodes-base/nodes/PayPal/paypal.svg
index a1cbd86d47582..1301cc6c6ebea 100644
--- a/packages/nodes-base/nodes/PayPal/paypal.svg
+++ b/packages/nodes-base/nodes/PayPal/paypal.svg
@@ -1 +1 @@
-<svg width="60" height="60" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round"><path d="M59.444 21.742c0 6.191-2.574 11.192-7.71 14.99-5.137 3.798-12.315 5.692-21.545 5.692h-5.102l-3.913 16.963H7.69L20.14 7.361h18.258c3.41 0 6.36.238 8.901.703 2.529.465 4.718 1.27 6.546 2.416 1.814 1.145 3.208 2.63 4.161 4.456.952 1.814 1.429 4.093 1.429 6.815l.01-.009z" fill="#009CDE"/><path d="M21.627 59.945H6.987L19.71 6.795h18.687c3.413 0 6.441.239 8.992.704 2.586.477 4.854 1.316 6.748 2.484 1.893 1.19 3.368 2.765 4.366 4.672C59.5 16.56 60 18.949 60 21.742c0 6.35-2.673 11.555-7.928 15.444-5.216 3.856-12.575 5.806-21.885 5.806h-4.661l-3.899 16.953zM8.404 58.833H20.73l3.912-16.963h5.545c9.06 0 16.205-1.882 21.217-5.59 2.483-1.837 4.377-3.992 5.623-6.396 1.246-2.404 1.86-5.148 1.86-8.142 0-2.618-.465-4.83-1.372-6.576-.907-1.735-2.234-3.153-3.958-4.241-1.77-1.1-3.912-1.883-6.36-2.336-2.484-.454-5.444-.692-8.8-.692H20.583L8.405 58.833z" fill="#FFF"/><path d="M53.457 15.957c0 6.192-2.573 11.192-7.71 14.99-5.137 3.798-12.315 5.693-21.543 5.693H19.1l-3.904 16.953H1.703L13.722 1.556h18.7c3.41 0 6.36.238 8.9.703 2.53.465 4.718 1.27 6.546 2.416 1.814 1.145 3.208 2.63 4.161 4.456.953 1.814 1.43 4.093 1.43 6.826h-.002z" fill="#0F3572"/><path d="M15.628 54.15H1L13.258 1h19.153c3.413 0 6.441.238 8.992.703 2.586.477 4.854 1.316 6.748 2.484 1.894 1.191 3.368 2.766 4.366 4.672.999 1.906 1.497 4.287 1.497 7.087 0 6.35-2.673 11.555-7.928 15.445-5.216 3.855-12.574 5.806-21.885 5.806H19.53L15.628 54.15zM2.406 53.027h12.337l3.913-16.963H24.2c9.06 0 16.205-1.882 21.216-5.59 2.483-1.837 4.377-3.992 5.623-6.396 1.247-2.404 1.86-5.148 1.86-8.142 0-2.618-.465-4.83-1.372-6.576-.907-1.735-2.234-3.153-3.958-4.241-1.77-1.1-3.912-1.883-6.36-2.336-2.484-.454-5.443-.692-8.8-.692H14.142L2.406 53.028zm37.193-35.221c-.092 1.587-.42 2.765-1.395 4.105-.964 1.35-2.098 2.212-3.617 2.948a9.836 9.836 0 01-2.87.85c-.997.137-2.188.217-3.583.217h-6.702l3.752-13.46h6.09c1.553 0 2.8.023 3.742.238.94.203 1.712.489 2.291.83.805.476 1.451 1.054 1.825 1.791.465.862.522 1.418.465 2.461l.002.02z" fill="#FFF"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="60" height="60"><g fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round"><path fill="#009CDE" d="M59.444 21.742c0 6.191-2.574 11.192-7.71 14.99s-12.315 5.692-21.545 5.692h-5.102l-3.913 16.963H7.69L20.14 7.361h18.258c3.41 0 6.36.238 8.901.703 2.529.465 4.718 1.27 6.546 2.416 1.814 1.145 3.208 2.63 4.161 4.456.952 1.814 1.429 4.093 1.429 6.815z"/><path fill="#FFF" d="M21.627 59.945H6.987L19.71 6.795h18.687c3.413 0 6.441.239 8.992.704 2.586.477 4.854 1.316 6.748 2.484 1.893 1.19 3.368 2.765 4.366 4.672C59.5 16.56 60 18.949 60 21.742c0 6.35-2.673 11.555-7.928 15.444-5.216 3.856-12.575 5.806-21.885 5.806h-4.661zM8.404 58.833H20.73l3.912-16.963h5.545c9.06 0 16.205-1.882 21.217-5.59 2.483-1.837 4.377-3.992 5.623-6.396s1.86-5.148 1.86-8.142c0-2.618-.465-4.83-1.372-6.576-.907-1.735-2.234-3.153-3.958-4.241-1.77-1.1-3.912-1.883-6.36-2.336-2.484-.454-5.444-.692-8.8-.692H20.583z"/><path fill="#0F3572" d="M53.457 15.957c0 6.192-2.573 11.192-7.71 14.99S33.432 36.64 24.204 36.64H19.1l-3.904 16.953H1.703L13.722 1.556h18.7c3.41 0 6.36.238 8.9.703 2.53.465 4.718 1.27 6.546 2.416 1.814 1.145 3.208 2.63 4.161 4.456.953 1.814 1.43 4.093 1.43 6.826z"/><path fill="#FFF" d="M15.628 54.15H1L13.258 1h19.153c3.413 0 6.441.238 8.992.703 2.586.477 4.854 1.316 6.748 2.484 1.894 1.191 3.368 2.766 4.366 4.672.999 1.906 1.497 4.287 1.497 7.087 0 6.35-2.673 11.555-7.928 15.445-5.216 3.855-12.574 5.806-21.885 5.806H19.53zM2.406 53.027h12.337l3.913-16.963H24.2c9.06 0 16.205-1.882 21.216-5.59 2.483-1.837 4.377-3.992 5.623-6.396s1.86-5.148 1.86-8.142c0-2.618-.465-4.83-1.372-6.576-.907-1.735-2.234-3.153-3.958-4.241-1.77-1.1-3.912-1.883-6.36-2.336-2.484-.454-5.443-.692-8.8-.692H14.142zm37.193-35.221c-.092 1.587-.42 2.765-1.395 4.105-.964 1.35-2.098 2.212-3.617 2.948a9.8 9.8 0 0 1-2.87.85c-.997.137-2.188.217-3.583.217h-6.702l3.752-13.46h6.09c1.553 0 2.8.023 3.742.238.94.203 1.712.489 2.291.83.805.476 1.451 1.054 1.825 1.791.465.862.522 1.418.465 2.461z"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Peekalink/GenericFunctions.ts b/packages/nodes-base/nodes/Peekalink/GenericFunctions.ts
deleted file mode 100644
index b288aa77f2f07..0000000000000
--- a/packages/nodes-base/nodes/Peekalink/GenericFunctions.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import type { OptionsWithUri } from 'request';
-
-import type {
-	JsonObject,
-	IExecuteFunctions,
-	IExecuteSingleFunctions,
-	IHookFunctions,
-	ILoadOptionsFunctions,
-	IDataObject,
-} from 'n8n-workflow';
-import { NodeApiError } from 'n8n-workflow';
-
-export async function peekalinkApiRequest(
-	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
-	resource: string,
-
-	body: any = {},
-	qs: IDataObject = {},
-	uri?: string,
-	option: IDataObject = {},
-): Promise<any> {
-	try {
-		const credentials = await this.getCredentials('peekalinkApi');
-		let options: OptionsWithUri = {
-			headers: {
-				'X-API-Key': credentials.apiKey,
-			},
-			method,
-			qs,
-			body,
-			uri: uri || `https://api.peekalink.io${resource}`,
-			json: true,
-		};
-
-		options = Object.assign({}, options, option);
-
-		return await this.helpers.request(options);
-	} catch (error) {
-		throw new NodeApiError(this.getNode(), error as JsonObject);
-	}
-}
diff --git a/packages/nodes-base/nodes/Peekalink/Peekalink.node.ts b/packages/nodes-base/nodes/Peekalink/Peekalink.node.ts
index 920564fb5a404..638ca9f4093ab 100644
--- a/packages/nodes-base/nodes/Peekalink/Peekalink.node.ts
+++ b/packages/nodes-base/nodes/Peekalink/Peekalink.node.ts
@@ -1,14 +1,17 @@
-import type {
-	IExecuteFunctions,
-	IDataObject,
-	INodeExecutionData,
-	INodeType,
-	INodeTypeDescription,
+import {
+	Node,
+	NodeApiError,
+	type IExecuteFunctions,
+	type INodeExecutionData,
+	type INodeTypeDescription,
+	type JsonObject,
 } from 'n8n-workflow';
 
-import { peekalinkApiRequest } from './GenericFunctions';
+export const apiUrl = 'https://api.peekalink.io';
 
-export class Peekalink implements INodeType {
+type Operation = 'preview' | 'isAvailable';
+
+export class Peekalink extends Node {
 	description: INodeTypeDescription = {
 		displayName: 'Peekalink',
 		name: 'peekalink',
@@ -61,44 +64,31 @@ export class Peekalink implements INodeType {
 		],
 	};
 
-	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
-		const items = this.getInputData();
-		const returnData: IDataObject[] = [];
-		const length = items.length;
-		let responseData;
-		const operation = this.getNodeParameter('operation', 0);
-
-		for (let i = 0; i < length; i++) {
-			try {
-				if (operation === 'isAvailable') {
-					const url = this.getNodeParameter('url', i) as string;
-					const body: IDataObject = {
-						link: url,
-					};
-
-					responseData = await peekalinkApiRequest.call(this, 'POST', '/is-available/', body);
-				}
-				if (operation === 'preview') {
-					const url = this.getNodeParameter('url', i) as string;
-					const body: IDataObject = {
-						link: url,
-					};
+	async execute(context: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = context.getInputData();
+		const operation = context.getNodeParameter('operation', 0) as Operation;
+		const credentials = await context.getCredentials('peekalinkApi');
 
-					responseData = await peekalinkApiRequest.call(this, 'POST', '/', body);
-				}
-				if (Array.isArray(responseData)) {
-					returnData.push.apply(returnData, responseData as IDataObject[]);
-				} else {
-					returnData.push(responseData as IDataObject);
-				}
-			} catch (error) {
-				if (this.continueOnFail()) {
-					returnData.push({ error: error.message });
-					continue;
+		const returnData = await Promise.all(
+			items.map(async (_, i) => {
+				try {
+					const link = context.getNodeParameter('url', i) as string;
+					// eslint-disable-next-line @typescript-eslint/no-unsafe-return
+					return await context.helpers.request({
+						method: 'POST',
+						uri: operation === 'preview' ? apiUrl : `${apiUrl}/is-available/`,
+						body: { link },
+						headers: { 'X-API-Key': credentials.apiKey },
+						json: true,
+					});
+				} catch (error) {
+					if (context.continueOnFail()) {
+						return { error: error.message };
+					}
+					throw new NodeApiError(context.getNode(), error as JsonObject);
 				}
-				throw error;
-			}
-		}
-		return [this.helpers.returnJsonArray(returnData)];
+			}),
+		);
+		return [context.helpers.returnJsonArray(returnData)];
 	}
 }
diff --git a/packages/nodes-base/nodes/Peekalink/test/Peekalink.node.test.ts b/packages/nodes-base/nodes/Peekalink/test/Peekalink.node.test.ts
new file mode 100644
index 0000000000000..f1262863ce643
--- /dev/null
+++ b/packages/nodes-base/nodes/Peekalink/test/Peekalink.node.test.ts
@@ -0,0 +1,171 @@
+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';
+
+describe('Peekalink Node', () => {
+	const exampleComPreview = {
+		url: 'https://example.com/',
+		domain: 'example.com',
+		lastUpdated: '2022-11-13T22:43:20.986744Z',
+		nextUpdate: '2022-11-20T22:43:20.982384Z',
+		contentType: 'html',
+		mimeType: 'text/html',
+		size: 648,
+		redirected: false,
+		title: 'Example Domain',
+		description: 'This domain is for use in illustrative examples in documents',
+		name: 'EXAMPLE.COM',
+		trackersDetected: false,
+	};
+
+	const tests: WorkflowTestData[] = [
+		{
+			description: 'should run isAvailable operation',
+			input: {
+				workflowData: {
+					nodes: [
+						{
+							parameters: {},
+							id: '8b7bb389-e4ef-424a-bca1-e7ead60e43eb',
+							name: 'When clicking "Execute Workflow"',
+							type: 'n8n-nodes-base.manualTrigger',
+							typeVersion: 1,
+							position: [740, 380],
+						},
+						{
+							parameters: {
+								operation: 'isAvailable',
+								url: 'https://example.com/',
+							},
+							id: '7354367e-39a7-4fc1-8cdd-442f0b0c7b62',
+							name: 'Peekalink',
+							type: 'n8n-nodes-base.peekalink',
+							typeVersion: 1,
+							position: [960, 380],
+							credentials: {
+								peekalinkApi: 'token',
+							},
+						},
+					],
+					connections: {
+						'When clicking "Execute Workflow"': {
+							main: [
+								[
+									{
+										node: 'Peekalink',
+										type: 'main',
+										index: 0,
+									},
+								],
+							],
+						},
+					},
+				},
+			},
+			output: {
+				nodeExecutionOrder: ['Start'],
+				nodeData: {
+					Peekalink: [
+						[
+							{
+								json: {
+									isAvailable: true,
+								},
+							},
+						],
+					],
+				},
+			},
+			nock: {
+				baseUrl: apiUrl,
+				mocks: [
+					{
+						method: 'post',
+						path: '/is-available/',
+						statusCode: 200,
+						responseBody: { isAvailable: true },
+					},
+				],
+			},
+		},
+		{
+			description: 'should run preview operation',
+			input: {
+				workflowData: {
+					nodes: [
+						{
+							parameters: {},
+							id: '8b7bb389-e4ef-424a-bca1-e7ead60e43eb',
+							name: 'When clicking "Execute Workflow"',
+							type: 'n8n-nodes-base.manualTrigger',
+							typeVersion: 1,
+							position: [740, 380],
+						},
+						{
+							parameters: {
+								operation: 'preview',
+								url: 'https://example.com/',
+							},
+							id: '7354367e-39a7-4fc1-8cdd-442f0b0c7b62',
+							name: 'Peekalink',
+							type: 'n8n-nodes-base.peekalink',
+							typeVersion: 1,
+							position: [960, 380],
+							credentials: {
+								peekalinkApi: 'token',
+							},
+						},
+					],
+					connections: {
+						'When clicking "Execute Workflow"': {
+							main: [
+								[
+									{
+										node: 'Peekalink',
+										type: 'main',
+										index: 0,
+									},
+								],
+							],
+						},
+					},
+				},
+			},
+			output: {
+				nodeExecutionOrder: ['Start'],
+				nodeData: {
+					Peekalink: [
+						[
+							{
+								json: exampleComPreview,
+							},
+						],
+					],
+				},
+			},
+			nock: {
+				baseUrl: apiUrl,
+				mocks: [
+					{
+						method: 'post',
+						path: '/',
+						statusCode: 200,
+						responseBody: exampleComPreview,
+					},
+				],
+			},
+		},
+	];
+
+	const nodeTypes = Helpers.setup(tests);
+
+	test.each(tests)('$description', async (testData) => {
+		const { result } = await executeWorkflow(testData, nodeTypes);
+		const resultNodeData = Helpers.getResultNodeData(result, testData);
+		resultNodeData.forEach(({ nodeName, resultData }) =>
+			expect(resultData).toEqual(testData.output.nodeData[nodeName]),
+		);
+		expect(result.finished).toEqual(true);
+	});
+});
diff --git a/packages/nodes-base/nodes/Phantombuster/GenericFunctions.ts b/packages/nodes-base/nodes/Phantombuster/GenericFunctions.ts
index 904cd1114e7f9..35abf9dde46d4 100644
--- a/packages/nodes-base/nodes/Phantombuster/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Phantombuster/GenericFunctions.ts
@@ -1,24 +1,23 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	JsonObject,
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	ILoadOptionsFunctions,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 export async function phantombusterApiRequest(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	path: string,
 
 	body: any = {},
 	qs: IDataObject = {},
 	_option = {},
 ): Promise<any> {
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {},
 		method,
 		body,
diff --git a/packages/nodes-base/nodes/Phantombuster/Phantombuster.node.json b/packages/nodes-base/nodes/Phantombuster/Phantombuster.node.json
index 1b5407627f553..b0f15495ed780 100644
--- a/packages/nodes-base/nodes/Phantombuster/Phantombuster.node.json
+++ b/packages/nodes-base/nodes/Phantombuster/Phantombuster.node.json
@@ -2,7 +2,7 @@
 	"node": "n8n-nodes-base.phantombuster",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Sales", "Marketing & Content"],
+	"categories": ["Sales", "Marketing"],
 	"resources": {
 		"credentialDocumentation": [
 			{
diff --git a/packages/nodes-base/nodes/Phantombuster/Phantombuster.node.ts b/packages/nodes-base/nodes/Phantombuster/Phantombuster.node.ts
index 473954c744947..afb351f9f2a1a 100644
--- a/packages/nodes-base/nodes/Phantombuster/Phantombuster.node.ts
+++ b/packages/nodes-base/nodes/Phantombuster/Phantombuster.node.ts
@@ -263,6 +263,6 @@ export class Phantombuster implements INodeType {
 				throw error;
 			}
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/PhilipsHue/GenericFunctions.ts b/packages/nodes-base/nodes/PhilipsHue/GenericFunctions.ts
index 77953f45e4177..2e739fb536b81 100644
--- a/packages/nodes-base/nodes/PhilipsHue/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/PhilipsHue/GenericFunctions.ts
@@ -1,16 +1,16 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	JsonObject,
 	IDataObject,
 	IExecuteFunctions,
 	ILoadOptionsFunctions,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function philipsHueApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -18,7 +18,7 @@ export async function philipsHueApiRequest(
 	uri?: string,
 	headers: IDataObject = {},
 ): Promise<any> {
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			'Content-Type': 'application/json',
 		},
diff --git a/packages/nodes-base/nodes/PhilipsHue/PhilipsHue.node.ts b/packages/nodes-base/nodes/PhilipsHue/PhilipsHue.node.ts
index f3a31360baad4..b9ef5cffa29a5 100644
--- a/packages/nodes-base/nodes/PhilipsHue/PhilipsHue.node.ts
+++ b/packages/nodes-base/nodes/PhilipsHue/PhilipsHue.node.ts
@@ -181,6 +181,6 @@ export class PhilipsHue implements INodeType {
 			);
 			returnData.push(...executionData);
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Pipedrive/GenericFunctions.ts b/packages/nodes-base/nodes/Pipedrive/GenericFunctions.ts
index 86bfc264ba11f..b320997a21c39 100644
--- a/packages/nodes-base/nodes/Pipedrive/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Pipedrive/GenericFunctions.ts
@@ -5,11 +5,11 @@ import type {
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	INodePropertyOptions,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
-import type { OptionsWithUri } from 'request';
-
 export interface ICustomInterface {
 	name: string;
 	key: string;
@@ -30,7 +30,7 @@ export interface ICustomProperties {
  */
 export async function pipedriveApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject,
 	query: IDataObject = {},
@@ -39,7 +39,7 @@ export async function pipedriveApiRequest(
 ): Promise<any> {
 	const authenticationMethod = this.getNodeParameter('authentication', 0);
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			Accept: 'application/json',
 		},
@@ -102,7 +102,7 @@ export async function pipedriveApiRequest(
  */
 export async function pipedriveApiRequestAllItems(
 	this: IHookFunctions | IExecuteFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject,
 	query?: IDataObject,
@@ -236,14 +236,14 @@ export function pipedriveResolveCustomProperties(
 	const json = item.json as IDataObject;
 
 	// Iterate over all keys and replace the custom ones
-	for (const key of Object.keys(json)) {
+	for (const [key, value] of Object.entries(json)) {
 		if (customProperties[key] !== undefined) {
 			// Is a custom property
 			customPropertyData = customProperties[key];
 
 			// value is not set, so nothing to resolve
-			if (json[key] === null) {
-				json[customPropertyData.name] = json[key];
+			if (value === null) {
+				json[customPropertyData.name] = value;
 				delete json[key];
 				continue;
 			}
@@ -267,7 +267,7 @@ export function pipedriveResolveCustomProperties(
 					'timerange',
 				].includes(customPropertyData.field_type)
 			) {
-				json[customPropertyData.name] = json[key];
+				json[customPropertyData.name] = value;
 				delete json[key];
 				// type options
 			} else if (
@@ -275,15 +275,19 @@ export function pipedriveResolveCustomProperties(
 				customPropertyData.options
 			) {
 				const propertyOption = customPropertyData.options.find(
-					(option) => option.id.toString() === json[key]!.toString(),
+					(option) => option.id.toString() === value?.toString(),
 				);
 				if (propertyOption !== undefined) {
 					json[customPropertyData.name] = propertyOption.label;
 					delete json[key];
 				}
 				// type multioptions
-			} else if (['set'].includes(customPropertyData.field_type) && customPropertyData.options) {
-				const selectedIds = (json[key] as string).split(',');
+			} else if (
+				['set'].includes(customPropertyData.field_type) &&
+				customPropertyData.options &&
+				typeof value === 'string'
+			) {
+				const selectedIds = value.split(',');
 				const selectedLabels = customPropertyData.options
 					.filter((option) => selectedIds.includes(option.id.toString()))
 					.map((option) => option.label);
diff --git a/packages/nodes-base/nodes/Pipedrive/Pipedrive.node.ts b/packages/nodes-base/nodes/Pipedrive/Pipedrive.node.ts
index 5119a3ac8d869..c77967fcdba6d 100644
--- a/packages/nodes-base/nodes/Pipedrive/Pipedrive.node.ts
+++ b/packages/nodes-base/nodes/Pipedrive/Pipedrive.node.ts
@@ -1,6 +1,7 @@
 import type {
 	IDataObject,
 	IExecuteFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
 	INodePropertyOptions,
@@ -38,7 +39,7 @@ function addAdditionalFields(body: IDataObject, additionalFields: IDataObject) {
 			key === 'customProperties' &&
 			(additionalFields.customProperties as IDataObject).property !== undefined
 		) {
-			for (const customProperty of (additionalFields.customProperties as IDataObject)!
+			for (const customProperty of (additionalFields.customProperties as IDataObject)
 				.property! as CustomProperty[]) {
 				body[customProperty.name] = customProperty.value;
 			}
@@ -359,6 +360,12 @@ export class Pipedrive implements INodeType {
 						description: 'Get data of a file',
 						action: 'Get a file',
 					},
+					{
+						name: 'Update',
+						value: 'update',
+						description: 'Update file details',
+						action: 'update details of a file',
+					},
 					// {
 					// 	name: 'Get All',
 					// 	value: 'getAll',
@@ -811,6 +818,13 @@ export class Pipedrive implements INodeType {
 				},
 				default: {},
 				options: [
+					{
+						displayName: 'Busy Flag',
+						name: 'busy_flag',
+						type: 'boolean',
+						default: false,
+						description: 'Whether the user is set to busy during the activity',
+					},
 					{
 						displayName: 'Deal ID',
 						name: 'deal_id',
@@ -842,7 +856,6 @@ export class Pipedrive implements INodeType {
 						default: '0',
 						description: 'Whether the activity is done or not',
 					},
-
 					{
 						displayName: 'Note',
 						name: 'note',
@@ -871,6 +884,14 @@ export class Pipedrive implements INodeType {
 						default: 0,
 						description: 'ID of the person this activity will be associated with',
 					},
+					{
+						displayName: 'Public Description',
+						name: 'public_description',
+						type: 'string',
+						default: '',
+						description:
+							'Additional details about the activity that is synced to your external calendar',
+					},
 					{
 						displayName: 'Subject',
 						name: 'subject',
@@ -1884,7 +1905,7 @@ export class Pipedrive implements INodeType {
 			//         file:create
 			// ----------------------------------
 			{
-				displayName: 'Binary Property',
+				displayName: 'Input Binary Field',
 				name: 'binaryPropertyName',
 				type: 'string',
 				default: 'data',
@@ -1896,8 +1917,7 @@ export class Pipedrive implements INodeType {
 					},
 				},
 				placeholder: '',
-				description:
-					'Name of the binary property which contains the data for the file to be created',
+				hint: 'The name of the input binary field containing the file to be written',
 			},
 			{
 				displayName: 'Additional Fields',
@@ -1990,7 +2010,7 @@ export class Pipedrive implements INodeType {
 				description: 'ID of the file to download',
 			},
 			{
-				displayName: 'Binary Property',
+				displayName: 'Put Output File in Field',
 				name: 'binaryPropertyName',
 				type: 'string',
 				required: true,
@@ -2001,8 +2021,7 @@ export class Pipedrive implements INodeType {
 						resource: ['file'],
 					},
 				},
-				description:
-					'Name of the binary property to which to write the data of the downloaded file',
+				hint: 'The name of the output binary field to put the file in',
 			},
 
 			// ----------------------------------
@@ -2023,6 +2042,57 @@ export class Pipedrive implements INodeType {
 				description: 'ID of the file to get',
 			},
 
+			// ----------------------------------
+			//         file:update
+			// ----------------------------------
+			{
+				displayName: 'File ID',
+				name: 'fileId',
+				type: 'number',
+				displayOptions: {
+					show: {
+						operation: ['update'],
+						resource: ['file'],
+					},
+				},
+				default: 0,
+				required: true,
+				description: 'ID of the file to update',
+			},
+			{
+				displayName: 'Update Fields',
+				name: 'updateFields',
+				type: 'collection',
+				placeholder: 'Add Field',
+				displayOptions: {
+					show: {
+						operation: ['update'],
+						resource: ['file'],
+					},
+				},
+				default: {},
+				options: [
+					{
+						displayName: 'Name',
+						name: 'name',
+						type: 'string',
+						default: '',
+						description: 'The updated visible name of the file',
+					},
+					{
+						displayName: 'Description',
+						name: 'description',
+						type: 'string',
+						default: '',
+						description: 'The updated description of the file',
+					},
+				],
+			},
+
+			// ----------------------------------
+			//         lead
+			// ----------------------------------
+
 			// ----------------------------------------
 			//               lead: create
 			// ----------------------------------------
@@ -4029,7 +4099,7 @@ export class Pipedrive implements INodeType {
 
 		let downloadFile: boolean;
 
-		let requestMethod: string;
+		let requestMethod: IHttpRequestMethods;
 		let endpoint: string;
 		let returnAll = false;
 
@@ -4380,6 +4450,16 @@ export class Pipedrive implements INodeType {
 
 						const fileId = this.getNodeParameter('fileId', i) as number;
 						endpoint = `/files/${fileId}`;
+					} else if (operation === 'update') {
+						// ----------------------------------
+						//         file:update
+						// ----------------------------------
+						requestMethod = 'PUT';
+
+						const fileId = this.getNodeParameter('fileId', i) as number;
+						const updateFields = this.getNodeParameter('updateFields', i);
+						endpoint = `/files/${fileId}`;
+						addAdditionalFields(body, updateFields);
 					}
 				} else if (resource === 'note') {
 					if (operation === 'create') {
@@ -4820,6 +4900,7 @@ export class Pipedrive implements INodeType {
 				if (resource === 'file' && operation === 'download') {
 					const newItem: INodeExecutionData = {
 						json: items[i].json,
+						pairedItem: { item: i },
 						binary: {},
 					};
 
@@ -4842,7 +4923,7 @@ export class Pipedrive implements INodeType {
 						responseData.data = [];
 					}
 
-					if (operation === 'search' && responseData.data && responseData.data.items) {
+					if (operation === 'search' && responseData.data?.items) {
 						responseData.data = responseData.data.items;
 						const additionalFields = this.getNodeParameter('additionalFields', i);
 						if (additionalFields.rawData !== true) {
@@ -4873,7 +4954,7 @@ export class Pipedrive implements INodeType {
 					if (resource === 'file' && operation === 'download') {
 						items[i].json = { error: error.message };
 					} else {
-						returnData.push({ json: { error: error.message } });
+						returnData.push({ json: { error: error.message }, pairedItem: { item: i } });
 					}
 					continue;
 				}
@@ -4889,10 +4970,10 @@ export class Pipedrive implements INodeType {
 
 		if (resource === 'file' && operation === 'download') {
 			// For file downloads the files get attached to the existing items
-			return this.prepareOutputData(items);
+			return [items];
 		} else {
 			// For all other ones does the output items get replaced
-			return this.prepareOutputData(returnData);
+			return [returnData];
 		}
 	}
 }
diff --git a/packages/nodes-base/nodes/Pipedrive/PipedriveTrigger.node.ts b/packages/nodes-base/nodes/Pipedrive/PipedriveTrigger.node.ts
index 60c0c2f316675..fa523ac9c5756 100644
--- a/packages/nodes-base/nodes/Pipedrive/PipedriveTrigger.node.ts
+++ b/packages/nodes-base/nodes/Pipedrive/PipedriveTrigger.node.ts
@@ -8,11 +8,10 @@ import type {
 	IWebhookResponseData,
 } from 'n8n-workflow';
 
-import { pipedriveApiRequest } from './GenericFunctions';
-
 import basicAuth from 'basic-auth';
 
 import type { Response } from 'express';
+import { pipedriveApiRequest } from './GenericFunctions';
 
 function authorizationError(resp: Response, realm: string, responseCode: number, message?: string) {
 	if (message === undefined) {
diff --git a/packages/nodes-base/nodes/Plivo/GenericFunctions.ts b/packages/nodes-base/nodes/Plivo/GenericFunctions.ts
index f308f6be47877..6ac63db30f10e 100644
--- a/packages/nodes-base/nodes/Plivo/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Plivo/GenericFunctions.ts
@@ -1,15 +1,20 @@
-import type { IExecuteFunctions, IHookFunctions, IDataObject, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IHookFunctions,
+	IDataObject,
+	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import type { OptionsWithUri } from 'request';
-
 /**
  * Make an API request to Plivo.
  *
  */
 export async function plivoApiRequest(
 	this: IHookFunctions | IExecuteFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject = {},
 	qs: IDataObject = {},
@@ -19,7 +24,7 @@ export async function plivoApiRequest(
 		authToken: string;
 	};
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			'user-agent': 'plivo-n8n',
 		},
diff --git a/packages/nodes-base/nodes/Plivo/plivo.svg b/packages/nodes-base/nodes/Plivo/plivo.svg
index fb428c04f147f..1eba709d7640d 100644
--- a/packages/nodes-base/nodes/Plivo/plivo.svg
+++ b/packages/nodes-base/nodes/Plivo/plivo.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="40 30 170 170"><defs><path id="a" d="M0 .549h152V119H0z"/></defs><g fill="none" fill-rule="evenodd"><path fill="#FFF" fill-opacity=".01" d="M0 0h250v218H0z"/><g transform="translate(49 49.451)"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><path fill="#43A046" d="M75.735.548C62.831.594 50.927 4.841 41.311 11.99c-9.616 7.15-16.943 17.202-20.695 28.853a4.275 4.275 0 01-.684 1.3 4.372 4.372 0 01-1.08.997 41.635 41.635 0 00-14.14 15.496C1.402 64.93-.328 72.182.052 79.872c.548 11.117 5.601 20.919 13.3 27.93 7.697 7.014 18.041 11.236 29.173 11.198h67.233a42.937 42.937 0 0029.096-11.513c7.65-7.122 12.635-17.015 13.108-28.137.326-7.693-1.454-14.932-4.807-21.203a41.637 41.637 0 00-14.244-15.4 4.378 4.378 0 01-1.089-.988 4.257 4.257 0 01-.692-1.296c-3.832-11.625-11.228-21.626-20.894-28.71C100.572 4.672 88.64.506 75.736.549m.05 14.778c9.526-.032 18.572 3.124 25.92 8.568 7.347 5.444 12.998 13.175 15.734 22.293l.592 1.973.593 1.974a4.25 4.25 0 001.913 2.441l1.776 1.047 1.775 1.046c4.261 2.513 7.634 6.024 9.894 10.143 2.26 4.119 3.408 8.847 3.22 13.794-.277 7.18-3.503 13.548-8.458 18.128a27.908 27.908 0 01-18.824 7.392l-33.83.116-33.83.117a27.913 27.913 0 01-18.874-7.263c-4.986-4.545-8.257-10.891-8.58-18.07-.225-4.945.89-9.68 3.122-13.815 2.233-4.135 5.582-7.67 9.826-10.211l1.768-1.058 1.767-1.06a4.254 4.254 0 001.898-2.454l.578-1.978.58-1.977c2.673-9.136 8.27-16.906 15.58-22.401 7.31-5.493 16.333-8.711 25.86-8.745" mask="url(#b)"/></g><path fill="#43A046" d="M113.281 100.651c0 .87-.35 1.658-.918 2.229a3.147 3.147 0 01-2.224.934l-3.174.012-3.175.011a3.154 3.154 0 01-2.229-.919 3.155 3.155 0 01-.934-2.223l-.01-3.175-.01-3.175a3.159 3.159 0 013.141-3.163l3.174-.01 3.174-.011c.87 0 1.658.35 2.23.918a3.15 3.15 0 01.933 2.223l.011 3.175.011 3.174zm17.961 0c0 .87-.35 1.658-.918 2.229a3.146 3.146 0 01-2.223.934l-3.175.012-3.174.011c-.87 0-1.658-.351-2.23-.919a3.15 3.15 0 01-.933-2.223l-.012-3.175-.01-3.175a3.159 3.159 0 013.141-3.163l3.175-.01 3.174-.011c.87 0 1.658.35 2.23.918.572.568.928 1.354.934 2.223l.01 3.175.011 3.174zm17.962.002c0 .869-.35 1.657-.918 2.229a3.155 3.155 0 01-2.225.934l-3.174.011-3.174.011a3.146 3.146 0 01-2.232-.916 3.146 3.146 0 01-.931-2.226l-.012-3.175-.01-3.175a3.133 3.133 0 01.916-2.231 3.145 3.145 0 012.226-.931l3.175-.011 3.173-.011a3.152 3.152 0 012.26.867c.587.557.96 1.338.984 2.21v.064l-.03 3.175-.029 3.175zm-35.915 17.955c0 .869-.35 1.657-.918 2.229a3.155 3.155 0 01-2.224.934l-3.174.011-3.175.011a3.153 3.153 0 01-2.23-.918 3.157 3.157 0 01-.933-2.224l-.011-3.175-.01-3.174c-.001-.87.35-1.658.918-2.229a3.15 3.15 0 012.223-.934l3.175-.01 3.174-.012c.87 0 1.658.35 2.229.919.573.567.929 1.353.934 2.222l.01 3.175.012 3.175zm17.96 0c0 .869-.35 1.657-.917 2.229a3.155 3.155 0 01-2.223.934l-3.175.011-3.174.011a3.154 3.154 0 01-2.23-.918 3.152 3.152 0 01-.933-2.224l-.012-3.175-.01-3.174c-.001-.87.35-1.658.918-2.229a3.15 3.15 0 012.223-.934l3.175-.01 3.174-.012c.87 0 1.658.35 2.23.919a3.15 3.15 0 01.934 2.222l.01 3.175.01 3.175zm17.962 0c0 .869-.35 1.657-.918 2.229a3.155 3.155 0 01-2.224.934l-3.174.011-3.175.011a3.142 3.142 0 01-2.232-.916 3.145 3.145 0 01-.93-2.226l-.012-3.175-.01-3.174a3.134 3.134 0 01.915-2.232 3.145 3.145 0 012.226-.931l3.175-.01 3.174-.012c.87 0 1.658.35 2.23.919.572.567.928 1.353.933 2.222l.011 3.175.011 3.175zm-35.914 17.95a3.14 3.14 0 01-.916 2.232 3.139 3.139 0 01-2.226.931l-3.174.011-3.175.011a3.145 3.145 0 01-2.232-.915 3.146 3.146 0 01-.931-2.226l-.011-3.175-.01-3.175a3.15 3.15 0 01.918-2.229 3.155 3.155 0 012.223-.934l3.175-.01 3.174-.01a3.142 3.142 0 012.229.917c.573.568.929 1.353.934 2.222l.01 3.175.012 3.175zm17.96 0a3.14 3.14 0 01-.915 2.232 3.138 3.138 0 01-2.225.931l-3.175.011-3.174.011a3.146 3.146 0 01-3.163-3.14l-.012-3.176-.01-3.175a3.15 3.15 0 01.918-2.229 3.155 3.155 0 012.223-.934l3.175-.01 3.174-.01a3.146 3.146 0 012.23.917c.572.568.928 1.353.934 2.222l.01 3.175.01 3.175zm17.962 0a3.14 3.14 0 01-.916 2.232 3.139 3.139 0 01-2.226.931l-3.174.011-3.175.011a3.145 3.145 0 01-2.232-.915 3.146 3.146 0 01-.93-2.226l-.012-3.175-.01-3.175c-.004-.87.346-1.66.915-2.232a3.145 3.145 0 012.226-.93l3.175-.01 3.174-.012a3.142 3.142 0 012.23.918c.572.568.928 1.353.933 2.222l.011 3.175.011 3.175z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="40 30 170 170"><defs><path id="a" d="M0 .549h152V119H0z"/></defs><g fill="none" fill-rule="evenodd"><path fill="#FFF" fill-opacity=".01" d="M0 0h250v218H0z"/><g transform="translate(49 49.451)"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><path fill="#43A046" d="M75.735.548C62.831.594 50.927 4.841 41.311 11.99c-9.616 7.15-16.943 17.202-20.695 28.853a4.3 4.3 0 0 1-.684 1.3 4.4 4.4 0 0 1-1.08.997 41.64 41.64 0 0 0-14.14 15.496C1.402 64.93-.328 72.182.052 79.872c.548 11.117 5.601 20.919 13.3 27.93 7.697 7.014 18.041 11.236 29.173 11.198h67.233a42.94 42.94 0 0 0 29.096-11.513c7.65-7.122 12.635-17.015 13.108-28.137.326-7.693-1.454-14.932-4.807-21.203a41.64 41.64 0 0 0-14.244-15.4 4.4 4.4 0 0 1-1.089-.988 4.3 4.3 0 0 1-.692-1.296c-3.832-11.625-11.228-21.626-20.894-28.71C100.572 4.672 88.64.506 75.736.549m.05 14.778c9.526-.032 18.572 3.124 25.92 8.568 7.347 5.444 12.998 13.175 15.734 22.293l.592 1.973.593 1.974a4.25 4.25 0 0 0 1.913 2.441l1.776 1.047 1.775 1.046c4.261 2.513 7.634 6.024 9.894 10.143s3.408 8.847 3.22 13.794c-.277 7.18-3.503 13.548-8.458 18.128a27.9 27.9 0 0 1-18.824 7.392l-33.83.116-33.83.117a27.9 27.9 0 0 1-18.874-7.263c-4.986-4.545-8.257-10.891-8.58-18.07-.225-4.945.89-9.68 3.122-13.815 2.233-4.135 5.582-7.67 9.826-10.211l1.768-1.058 1.767-1.06a4.25 4.25 0 0 0 1.898-2.454l.578-1.978.58-1.977c2.673-9.136 8.27-16.906 15.58-22.401 7.31-5.493 16.333-8.711 25.86-8.745" mask="url(#b)"/></g><path fill="#43A046" d="M113.281 100.651c0 .87-.35 1.658-.918 2.229a3.15 3.15 0 0 1-2.224.934l-3.174.012-3.175.011a3.15 3.15 0 0 1-2.229-.919 3.16 3.16 0 0 1-.934-2.223l-.01-3.175-.01-3.175a3.16 3.16 0 0 1 3.141-3.163l3.174-.01 3.174-.011c.87 0 1.658.35 2.23.918a3.15 3.15 0 0 1 .933 2.223l.011 3.175zm17.961 0c0 .87-.35 1.658-.918 2.229a3.15 3.15 0 0 1-2.223.934l-3.175.012-3.174.011c-.87 0-1.658-.351-2.23-.919a3.15 3.15 0 0 1-.933-2.223l-.012-3.175-.01-3.175a3.16 3.16 0 0 1 3.141-3.163l3.175-.01 3.174-.011c.87 0 1.658.35 2.23.918s.928 1.354.934 2.223l.01 3.175zm17.962.002c0 .869-.35 1.657-.918 2.229a3.16 3.16 0 0 1-2.225.934l-3.174.011-3.174.011a3.15 3.15 0 0 1-2.232-.916 3.15 3.15 0 0 1-.931-2.226l-.012-3.175-.01-3.175a3.13 3.13 0 0 1 .916-2.231 3.15 3.15 0 0 1 2.226-.931l3.175-.011 3.173-.011a3.15 3.15 0 0 1 2.26.867c.587.557.96 1.338.984 2.21v.064l-.03 3.175-.029 3.175zm-35.915 17.955c0 .869-.35 1.657-.918 2.229a3.16 3.16 0 0 1-2.224.934l-3.174.011-3.175.011a3.15 3.15 0 0 1-2.23-.918 3.16 3.16 0 0 1-.933-2.224l-.011-3.175-.01-3.174c-.001-.87.35-1.658.918-2.229a3.15 3.15 0 0 1 2.223-.934l3.175-.01 3.174-.012c.87 0 1.658.35 2.229.919.573.567.929 1.353.934 2.222l.01 3.175zm17.96 0c0 .869-.35 1.657-.917 2.229a3.16 3.16 0 0 1-2.223.934l-3.175.011-3.174.011a3.15 3.15 0 0 1-2.23-.918 3.15 3.15 0 0 1-.933-2.224l-.012-3.175-.01-3.174c-.001-.87.35-1.658.918-2.229a3.15 3.15 0 0 1 2.223-.934l3.175-.01 3.174-.012c.87 0 1.658.35 2.23.919a3.15 3.15 0 0 1 .934 2.222l.01 3.175zm17.962 0c0 .869-.35 1.657-.918 2.229a3.16 3.16 0 0 1-2.224.934l-3.174.011-3.175.011a3.14 3.14 0 0 1-2.232-.916 3.15 3.15 0 0 1-.93-2.226l-.012-3.175-.01-3.174a3.13 3.13 0 0 1 .915-2.232 3.15 3.15 0 0 1 2.226-.931l3.175-.01 3.174-.012c.87 0 1.658.35 2.23.919.572.567.928 1.353.933 2.222l.011 3.175zm-35.914 17.95a3.14 3.14 0 0 1-.916 2.232 3.14 3.14 0 0 1-2.226.931l-3.174.011-3.175.011a3.15 3.15 0 0 1-2.232-.915 3.15 3.15 0 0 1-.931-2.226l-.011-3.175-.01-3.175a3.15 3.15 0 0 1 .918-2.229 3.16 3.16 0 0 1 2.223-.934l3.175-.01 3.174-.01a3.14 3.14 0 0 1 2.229.917c.573.568.929 1.353.934 2.222l.01 3.175zm17.96 0a3.14 3.14 0 0 1-.915 2.232 3.14 3.14 0 0 1-2.225.931l-3.175.011-3.174.011a3.146 3.146 0 0 1-3.163-3.14l-.012-3.176-.01-3.175a3.15 3.15 0 0 1 .918-2.229 3.16 3.16 0 0 1 2.223-.934l3.175-.01 3.174-.01a3.15 3.15 0 0 1 2.23.917c.572.568.928 1.353.934 2.222l.01 3.175zm17.962 0a3.14 3.14 0 0 1-.916 2.232 3.14 3.14 0 0 1-2.226.931l-3.174.011-3.175.011a3.15 3.15 0 0 1-2.232-.915 3.15 3.15 0 0 1-.93-2.226l-.012-3.175-.01-3.175c-.004-.87.346-1.66.915-2.232a3.15 3.15 0 0 1 2.226-.93l3.175-.01 3.174-.012a3.14 3.14 0 0 1 2.23.918c.572.568.928 1.353.933 2.222l.011 3.175z"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/PostBin/postbin.svg b/packages/nodes-base/nodes/PostBin/postbin.svg
index daea1576f6077..5aec12fcea70a 100644
--- a/packages/nodes-base/nodes/PostBin/postbin.svg
+++ b/packages/nodes-base/nodes/PostBin/postbin.svg
@@ -1,3 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">	<!--! Font Awesome Pro 6.1.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc. -->
-	<path fill="#4dc0b5" d="M352 256C352 278.2 350.8 299.6 348.7 320H163.3C161.2 299.6 159.1 278.2 159.1 256C159.1 233.8 161.2 212.4 163.3 192H348.7C350.8 212.4 352 233.8 352 256zM503.9 192C509.2 212.5 512 233.9 512 256C512 278.1 509.2 299.5 503.9 320H380.8C382.9 299.4 384 277.1 384 256C384 234 382.9 212.6 380.8 192H503.9zM493.4 160H376.7C366.7 96.14 346.9 42.62 321.4 8.442C399.8 29.09 463.4 85.94 493.4 160zM344.3 160H167.7C173.8 123.6 183.2 91.38 194.7 65.35C205.2 41.74 216.9 24.61 228.2 13.81C239.4 3.178 248.7 0 256 0C263.3 0 272.6 3.178 283.8 13.81C295.1 24.61 306.8 41.74 317.3 65.35C328.8 91.38 338.2 123.6 344.3 160H344.3zM18.61 160C48.59 85.94 112.2 29.09 190.6 8.442C165.1 42.62 145.3 96.14 135.3 160H18.61zM131.2 192C129.1 212.6 127.1 234 127.1 256C127.1 277.1 129.1 299.4 131.2 320H8.065C2.8 299.5 0 278.1 0 256C0 233.9 2.8 212.5 8.065 192H131.2zM194.7 446.6C183.2 420.6 173.8 388.4 167.7 352H344.3C338.2 388.4 328.8 420.6 317.3 446.6C306.8 470.3 295.1 487.4 283.8 498.2C272.6 508.8 263.3 512 255.1 512C248.7 512 239.4 508.8 228.2 498.2C216.9 487.4 205.2 470.3 194.7 446.6H194.7zM190.6 503.6C112.2 482.9 48.59 426.1 18.61 352H135.3C145.3 415.9 165.1 469.4 190.6 503.6V503.6zM321.4 503.6C346.9 469.4 366.7 415.9 376.7 352H493.4C463.4 426.1 399.8 482.9 321.4 503.6V503.6z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--! Font Awesome Pro 6.1.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc.--><path fill="#4dc0b5" d="M352 256c0 22.2-1.2 43.6-3.3 64H163.3c-2.1-20.4-4.2-41.8-4.2-64s2.1-43.6 4.2-64h185.4c2.1 20.4 3.3 41.8 3.3 64m151.9-64c5.3 20.5 8.1 41.9 8.1 64s-2.8 43.5-8.1 64H380.8c2.1-20.6 3.2-42.9 3.2-64 0-22-1.1-43.4-3.2-64zm-10.5-32H376.7c-10-63.86-29.8-117.38-55.3-151.558C399.8 29.09 463.4 85.94 493.4 160m-149.1 0H167.7c6.1-36.4 15.5-68.62 27-94.65 10.5-23.61 22.2-40.74 33.5-51.54C239.4 3.178 248.7 0 256 0s16.6 3.178 27.8 13.81c11.3 10.8 23 27.93 33.5 51.54 11.5 26.03 20.9 58.25 27 94.65m-325.69 0C48.59 85.94 112.2 29.09 190.6 8.442 165.1 42.62 145.3 96.14 135.3 160zm112.59 32c-2.1 20.6-4.1 42-4.1 64 0 21.1 2 43.4 4.1 64H8.065C2.8 299.5 0 278.1 0 256s2.8-43.5 8.065-64zm63.5 254.6c-11.5-26-20.9-58.2-27-94.6h176.6c-6.1 36.4-15.5 68.6-27 94.6-10.5 23.7-22.2 40.8-33.5 51.6-11.2 10.6-20.5 13.8-28.7 13.8-6.4 0-15.7-3.2-26.9-13.8-11.3-10.8-23-27.9-33.5-51.6m-4.1 57C112.2 482.9 48.59 426.1 18.61 352H135.3c10 63.9 29.8 117.4 55.3 151.6m130.8 0c25.5-34.2 45.3-87.7 55.3-151.6h116.7c-30 74.1-93.6 130.9-172 151.6"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/PostHog/GenericFunctions.ts b/packages/nodes-base/nodes/PostHog/GenericFunctions.ts
index 0ef0201ae6cfa..2b2e54268cd70 100644
--- a/packages/nodes-base/nodes/PostHog/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/PostHog/GenericFunctions.ts
@@ -1,16 +1,16 @@
-import type { OptionsWithUrl } from 'request';
-
 import type {
+	IDataObject,
 	IExecuteFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
-	IDataObject,
+	IRequestOptions,
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function posthogApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	path: string,
 
 	body: any = {},
@@ -23,7 +23,7 @@ export async function posthogApiRequest(
 
 	body.api_key = credentials.apiKey as string;
 
-	const options: OptionsWithUrl = {
+	const options: IRequestOptions = {
 		headers: {
 			'Content-Type': 'application/json',
 		},
diff --git a/packages/nodes-base/nodes/PostHog/PostHog.node.ts b/packages/nodes-base/nodes/PostHog/PostHog.node.ts
index c05cd71917b94..b1452310b7371 100644
--- a/packages/nodes-base/nodes/PostHog/PostHog.node.ts
+++ b/packages/nodes-base/nodes/PostHog/PostHog.node.ts
@@ -6,6 +6,7 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
+import moment from 'moment-timezone';
 import type { IAlias, IEvent, IIdentity, ITrack } from './GenericFunctions';
 import { posthogApiRequest } from './GenericFunctions';
 
@@ -17,8 +18,6 @@ import { trackFields, trackOperations } from './TrackDescription';
 
 import { identityFields, identityOperations } from './IdentityDescription';
 
-import moment from 'moment-timezone';
-
 export class PostHog implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'PostHog',
diff --git a/packages/nodes-base/nodes/PostHog/postHog.svg b/packages/nodes-base/nodes/PostHog/postHog.svg
index 8f0c42e17d923..26cde1631e6f9 100644
--- a/packages/nodes-base/nodes/PostHog/postHog.svg
+++ b/packages/nodes-base/nodes/PostHog/postHog.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="300" height="300" fill="none"><path fill="#fff" d="M0 0h300v300H0z"/><path fill="#F9BD2B" d="M33 179.379l39.004 38.951H33v-38.951zm0-9.738l48.755 48.689h39.004L33 130.689v38.952zm0-48.69l97.51 97.379h39.003L33 82v38.951zm48.755 0l97.509 97.379v-38.951L81.754 82v38.951zM130.51 82v38.951l48.754 48.69v-38.952L130.51 82z"/><path fill="#000" d="M267.023 202.75a37.692 37.692 0 01-26.632-11.016l-54.231-54.158v80.754h80.863v-15.58z"/><path fill="#fff" d="M209.563 202.75c4.308 0 7.8-3.488 7.8-7.791 0-4.302-3.492-7.79-7.8-7.79-4.309 0-7.801 3.488-7.801 7.79 0 4.303 3.492 7.791 7.801 7.791z"/><path fill="#1D4AFF" d="M33 218.33h39.004L33 179.379v38.951zm48.755-87.641L33 82v38.951l48.755 48.69v-38.952zm-48.755 0v38.952l48.755 48.689v-38.951L33 130.689z"/><path fill="#F54E00" d="M130.51 130.689L81.755 82v38.951l48.755 48.69v-38.952zM81.755 218.33h39.004l-39.004-38.951v38.951zm0-87.641v38.952l48.755 48.689v-38.951l-48.755-48.69z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="300" height="300" fill="none"><path fill="#fff" d="M0 0h300v300H0z"/><path fill="#F9BD2B" d="m33 179.379 39.004 38.951H33zm0-9.738 48.755 48.689h39.004L33 130.689zm0-48.69 97.51 97.379h39.003L33 82zm48.755 0 97.509 97.379v-38.951L81.754 82zM130.51 82v38.951l48.754 48.69v-38.952z"/><path fill="#000" d="M267.023 202.75a37.7 37.7 0 0 1-26.632-11.016l-54.231-54.158v80.754h80.863z"/><path fill="#fff" d="M209.563 202.75c4.308 0 7.8-3.488 7.8-7.791 0-4.302-3.492-7.79-7.8-7.79-4.309 0-7.801 3.488-7.801 7.79 0 4.303 3.492 7.791 7.801 7.791"/><path fill="#1D4AFF" d="M33 218.33h39.004L33 179.379zm48.755-87.641L33 82v38.951l48.755 48.69zm-48.755 0v38.952l48.755 48.689v-38.951z"/><path fill="#F54E00" d="M130.51 130.689 81.755 82v38.951l48.755 48.69zM81.755 218.33h39.004l-39.004-38.951zm0-87.641v38.952l48.755 48.689v-38.951z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Postgres/Postgres.node.ts b/packages/nodes-base/nodes/Postgres/Postgres.node.ts
index 69aee12ada0f4..05e09dff4dfcb 100644
--- a/packages/nodes-base/nodes/Postgres/Postgres.node.ts
+++ b/packages/nodes-base/nodes/Postgres/Postgres.node.ts
@@ -11,13 +11,18 @@ export class Postgres extends VersionedNodeType {
 			name: 'postgres',
 			icon: 'file:postgres.svg',
 			group: ['input'],
-			defaultVersion: 2,
+			defaultVersion: 2.4,
 			description: 'Get, add and update data in Postgres',
+			parameterPane: 'wide',
 		};
 
 		const nodeVersions: IVersionedNodeType['nodeVersions'] = {
 			1: new PostgresV1(baseDescription),
 			2: new PostgresV2(baseDescription),
+			2.1: new PostgresV2(baseDescription),
+			2.2: new PostgresV2(baseDescription),
+			2.3: new PostgresV2(baseDescription),
+			2.4: new PostgresV2(baseDescription),
 		};
 
 		super(nodeVersions, baseDescription);
diff --git a/packages/nodes-base/nodes/Postgres/PostgresInterface.ts b/packages/nodes-base/nodes/Postgres/PostgresInterface.ts
new file mode 100644
index 0000000000000..27ca9ea847f45
--- /dev/null
+++ b/packages/nodes-base/nodes/Postgres/PostgresInterface.ts
@@ -0,0 +1,6 @@
+export interface IPostgresTrigger {
+	triggerName: string;
+	functionName: string;
+	channelName: string;
+	target: string;
+}
diff --git a/packages/nodes-base/nodes/Postgres/PostgresTrigger.functions.ts b/packages/nodes-base/nodes/Postgres/PostgresTrigger.functions.ts
new file mode 100644
index 0000000000000..e6830fc701dbb
--- /dev/null
+++ b/packages/nodes-base/nodes/Postgres/PostgresTrigger.functions.ts
@@ -0,0 +1,157 @@
+import { ApplicationError } from 'n8n-workflow';
+import type {
+	ITriggerFunctions,
+	IDataObject,
+	ILoadOptionsFunctions,
+	INodeListSearchResult,
+	INodeListSearchItems,
+} from 'n8n-workflow';
+import pgPromise from 'pg-promise';
+import type pg from 'pg-promise/typescript/pg-subset';
+
+export function prepareNames(id: string, mode: string, additionalFields: IDataObject) {
+	let suffix = id.replace(/-/g, '_');
+
+	if (mode === 'manual') {
+		suffix = `${suffix}_manual`;
+	}
+
+	let functionName =
+		(additionalFields.functionName as string) || `n8n_trigger_function_${suffix}()`;
+
+	if (!(functionName.includes('(') && functionName.includes(')'))) {
+		functionName = `${functionName}()`;
+	}
+
+	const triggerName = (additionalFields.triggerName as string) || `n8n_trigger_${suffix}`;
+	const channelName = (additionalFields.channelName as string) || `n8n_channel_${suffix}`;
+
+	if (channelName.includes('-')) {
+		throw new ApplicationError('Channel name cannot contain hyphens (-)', { level: 'warning' });
+	}
+
+	return { functionName, triggerName, channelName };
+}
+
+export async function pgTriggerFunction(
+	this: ITriggerFunctions,
+	db: pgPromise.IDatabase<{}, pg.IClient>,
+	additionalFields: IDataObject,
+	functionName: string,
+	triggerName: string,
+	channelName: string,
+): Promise<void> {
+	const schema = this.getNodeParameter('schema', 'public', { extractValue: true }) as string;
+	const tableName = this.getNodeParameter('tableName', undefined, {
+		extractValue: true,
+	}) as string;
+
+	const target = `${schema}."${tableName}"`;
+
+	const firesOn = this.getNodeParameter('firesOn', 0) as string;
+
+	const functionReplace =
+		"CREATE OR REPLACE FUNCTION $1:raw RETURNS trigger LANGUAGE 'plpgsql' COST 100 VOLATILE NOT LEAKPROOF AS $BODY$ begin perform pg_notify('$2:raw', row_to_json($3:raw)::text); return null; end; $BODY$;";
+
+	const dropIfExist = 'DROP TRIGGER IF EXISTS $1:raw ON $2:raw';
+
+	const functionExists =
+		"CREATE FUNCTION $1:raw RETURNS trigger LANGUAGE 'plpgsql' COST 100 VOLATILE NOT LEAKPROOF AS $BODY$ begin perform pg_notify('$2:raw', row_to_json($3:raw)::text); return null; end; $BODY$";
+
+	const trigger =
+		'CREATE TRIGGER $4:raw AFTER $3:raw ON $1:raw FOR EACH ROW EXECUTE FUNCTION $2:raw';
+
+	const whichData = firesOn === 'DELETE' ? 'old' : 'new';
+
+	if (channelName.includes('-')) {
+		throw new ApplicationError('Channel name cannot contain hyphens (-)', { level: 'warning' });
+	}
+
+	const replaceIfExists = additionalFields.replaceIfExists ?? false;
+
+	try {
+		if (replaceIfExists || !(additionalFields.triggerName ?? additionalFields.functionName)) {
+			await db.any(functionReplace, [functionName, channelName, whichData]);
+			await db.any(dropIfExist, [triggerName, target, whichData]);
+		} else {
+			await db.any(functionExists, [functionName, channelName, whichData]);
+		}
+		await db.any(trigger, [target, functionName, firesOn, triggerName]);
+	} catch (error) {
+		if ((error as Error).message.includes('near "-"')) {
+			throw new ApplicationError('Names cannot contain hyphens (-)', { level: 'warning' });
+		}
+		throw error;
+	}
+}
+
+export async function initDB(this: ITriggerFunctions | ILoadOptionsFunctions) {
+	const credentials = await this.getCredentials('postgres');
+	const options = this.getNodeParameter('options', {}) as {
+		connectionTimeout?: number;
+		delayClosingIdleConnection?: number;
+	};
+	const pgp = pgPromise({
+		// prevent spam in console "WARNING: Creating a duplicate database object for the same connection."
+		noWarnings: true,
+	});
+	const config: IDataObject = {
+		host: credentials.host as string,
+		port: credentials.port as number,
+		database: credentials.database as string,
+		user: credentials.user as string,
+		password: credentials.password as string,
+		keepAlive: true,
+	};
+
+	if (options.connectionTimeout) {
+		config.connectionTimeoutMillis = options.connectionTimeout * 1000;
+	}
+
+	if (options.delayClosingIdleConnection) {
+		config.keepAliveInitialDelayMillis = options.delayClosingIdleConnection * 1000;
+	}
+
+	if (credentials.allowUnauthorizedCerts === true) {
+		config.ssl = {
+			rejectUnauthorized: false,
+		};
+	} else {
+		config.ssl = !['disable', undefined].includes(credentials.ssl as string | undefined);
+		config.sslmode = (credentials.ssl as string) || 'disable';
+	}
+
+	const db = pgp(config);
+	return { db, pgp };
+}
+
+export async function searchSchema(this: ILoadOptionsFunctions): Promise<INodeListSearchResult> {
+	const { db } = await initDB.call(this);
+	const schemaList = await db.any('SELECT schema_name FROM information_schema.schemata');
+	const results: INodeListSearchItems[] = (schemaList as IDataObject[]).map((s) => ({
+		name: s.schema_name as string,
+		value: s.schema_name as string,
+	}));
+	await db.$pool.end();
+	return { results };
+}
+
+export async function searchTables(this: ILoadOptionsFunctions): Promise<INodeListSearchResult> {
+	const schema = this.getNodeParameter('schema', 0) as IDataObject;
+	const { db } = await initDB.call(this);
+	let tableList = [];
+	try {
+		tableList = await db.any(
+			'SELECT table_name FROM information_schema.tables WHERE table_schema = $1',
+			[schema.value],
+		);
+	} catch (error) {
+		throw new ApplicationError(error as string);
+	}
+	const results: INodeListSearchItems[] = (tableList as IDataObject[]).map((s) => ({
+		name: s.table_name as string,
+		value: s.table_name as string,
+	}));
+	await db.$pool.end();
+	return { results };
+}
diff --git a/packages/nodes-base/nodes/Postgres/PostgresTrigger.node.json b/packages/nodes-base/nodes/Postgres/PostgresTrigger.node.json
new file mode 100644
index 0000000000000..49f18daf8e899
--- /dev/null
+++ b/packages/nodes-base/nodes/Postgres/PostgresTrigger.node.json
@@ -0,0 +1,18 @@
+{
+	"node": "n8n-nodes-base.postgresTrigger",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"categories": ["Development"],
+	"resources": {
+		"credentialDocumentation": [
+			{
+				"url": "https://docs.n8n.io/credentials/postgres"
+			}
+		],
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.postgrestrigger/"
+			}
+		]
+	}
+}
diff --git a/packages/nodes-base/nodes/Postgres/PostgresTrigger.node.ts b/packages/nodes-base/nodes/Postgres/PostgresTrigger.node.ts
new file mode 100644
index 0000000000000..639da1d3e6092
--- /dev/null
+++ b/packages/nodes-base/nodes/Postgres/PostgresTrigger.node.ts
@@ -0,0 +1,366 @@
+import {
+	TriggerCloseError,
+	type IDataObject,
+	type INodeType,
+	type INodeTypeDescription,
+	type ITriggerFunctions,
+	type ITriggerResponse,
+} from 'n8n-workflow';
+import {
+	pgTriggerFunction,
+	initDB,
+	searchSchema,
+	searchTables,
+	prepareNames,
+} from './PostgresTrigger.functions';
+
+export class PostgresTrigger implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Postgres Trigger',
+		name: 'postgresTrigger',
+		icon: 'file:postgres.svg',
+		group: ['trigger'],
+		version: 1,
+		description: 'Listens to Postgres messages',
+		eventTriggerDescription: '',
+		defaults: {
+			name: 'Postgres Trigger',
+		},
+		triggerPanel: {
+			header: '',
+			executionsHelp: {
+				inactive:
+					"<b>While building your workflow</b>, click the 'listen' button, then trigger a Postgres event. This will trigger an execution, which will show up in this editor.<br /> <br /><b>Once you're happy with your workflow</b>, <a data-key='activate'>activate</a> it. Then every time a change is detected, the workflow will execute. These executions will show up in the <a data-key='executions'>executions list</a>, but not in the editor.",
+				active:
+					"<b>While building your workflow</b>, click the 'listen' button, then trigger a Postgres event. This will trigger an execution, which will show up in this editor.<br /> <br /><b>Your workflow will also execute automatically</b>, since it's activated. Every time a change is detected, this node will trigger an execution. These executions will show up in the <a data-key='executions'>executions list</a>, but not in the editor.",
+			},
+			activationHint:
+				"Once you've finished building your workflow, <a data-key='activate'>activate</a> it to have it also listen continuously (you just won't see those executions here).",
+		},
+		inputs: [],
+		outputs: ['main'],
+		credentials: [
+			{
+				name: 'postgres',
+				required: true,
+			},
+		],
+		properties: [
+			{
+				displayName: 'Listen For',
+				name: 'triggerMode',
+				type: 'options',
+				options: [
+					{
+						name: 'Table Row Change Events',
+						value: 'createTrigger',
+						description: 'Insert, update or delete',
+					},
+					{
+						name: 'Advanced',
+						value: 'listenTrigger',
+						description: 'Listen to existing Postgres channel',
+					},
+				],
+				default: 'createTrigger',
+			},
+			{
+				displayName: 'Schema Name',
+				name: 'schema',
+				type: 'resourceLocator',
+				default: { mode: 'list', value: 'public' },
+				required: true,
+				displayOptions: {
+					show: {
+						triggerMode: ['createTrigger'],
+					},
+				},
+				modes: [
+					{
+						displayName: 'From List',
+						name: 'list',
+						type: 'list',
+						placeholder: 'Select a schema',
+						typeOptions: {
+							searchListMethod: 'searchSchema',
+							searchFilterRequired: false,
+						},
+					},
+					{
+						displayName: 'Name',
+						name: 'name',
+						type: 'string',
+						placeholder: 'e.g. public',
+					},
+				],
+			},
+			{
+				displayName: 'Table Name',
+				name: 'tableName',
+				type: 'resourceLocator',
+				default: { mode: 'list', value: '' },
+				required: true,
+				displayOptions: {
+					show: {
+						triggerMode: ['createTrigger'],
+					},
+				},
+				modes: [
+					{
+						displayName: 'From List',
+						name: 'list',
+						type: 'list',
+						placeholder: 'Select a table',
+						typeOptions: {
+							searchListMethod: 'searchTables',
+							searchFilterRequired: false,
+						},
+					},
+					{
+						displayName: 'Name',
+						name: 'name',
+						type: 'string',
+						placeholder: 'e.g. table_name',
+					},
+				],
+			},
+			{
+				displayName: 'Channel Name',
+				name: 'channelName',
+				type: 'string',
+				default: '',
+				required: true,
+				placeholder: 'e.g. n8n_channel',
+				description: 'Name of the channel to listen to',
+				displayOptions: {
+					show: {
+						triggerMode: ['listenTrigger'],
+					},
+				},
+			},
+			{
+				displayName: 'Event to listen for',
+				name: 'firesOn',
+				type: 'options',
+				displayOptions: {
+					show: {
+						triggerMode: ['createTrigger'],
+					},
+				},
+				options: [
+					{
+						name: 'Insert',
+						value: 'INSERT',
+					},
+					{
+						name: 'Update',
+						value: 'UPDATE',
+					},
+					{
+						name: 'Delete',
+						value: 'DELETE',
+					},
+				],
+				default: 'INSERT',
+			},
+			{
+				displayName: 'Additional Fields',
+				name: 'additionalFields',
+				type: 'collection',
+				placeholder: 'Add Field',
+				default: {},
+				displayOptions: {
+					show: {
+						triggerMode: ['createTrigger'],
+					},
+				},
+				options: [
+					{
+						displayName: 'Channel Name',
+						name: 'channelName',
+						type: 'string',
+						placeholder: 'e.g. n8n_channel',
+						description: 'Name of the channel to listen to',
+						default: '',
+					},
+
+					{
+						displayName: 'Function Name',
+						name: 'functionName',
+						type: 'string',
+						description: 'Name of the function to create',
+						placeholder: 'e.g. n8n_trigger_function()',
+						default: '',
+					},
+					{
+						displayName: 'Replace if Exists',
+						name: 'replaceIfExists',
+						type: 'boolean',
+						description: 'Whether to replace an existing function and trigger with the same name',
+						default: false,
+					},
+					{
+						displayName: 'Trigger Name',
+						name: 'triggerName',
+						type: 'string',
+						description: 'Name of the trigger to create',
+						placeholder: 'e.g. n8n_trigger',
+						default: '',
+					},
+				],
+			},
+			{
+				displayName: 'Options',
+				name: 'options',
+				type: 'collection',
+				placeholder: 'Add Option',
+				default: {},
+				options: [
+					{
+						displayName: 'Connection Timeout',
+						name: 'connectionTimeout',
+						type: 'number',
+						default: 30,
+						description: 'Number of seconds reserved for connecting to the database',
+					},
+					{
+						displayName: 'Delay Closing Idle Connection',
+						name: 'delayClosingIdleConnection',
+						type: 'number',
+						default: 0,
+						description:
+							'Number of seconds to wait before idle connection would be eligible for closing',
+						typeOptions: {
+							minValue: 0,
+						},
+					},
+				],
+			},
+		],
+	};
+
+	methods = {
+		listSearch: {
+			searchSchema,
+			searchTables,
+		},
+	};
+
+	async trigger(this: ITriggerFunctions): Promise<ITriggerResponse> {
+		const triggerMode = this.getNodeParameter('triggerMode', 0) as string;
+		const additionalFields = this.getNodeParameter('additionalFields', 0) as IDataObject;
+
+		// initialize and connect to database
+		const { db } = await initDB.call(this);
+		const connection = await db.connect({ direct: true });
+
+		// prepare and set up listener
+		const onNotification = async (data: IDataObject) => {
+			if (data.payload) {
+				try {
+					data.payload = JSON.parse(data.payload as string) as IDataObject;
+				} catch (error) {}
+			}
+			this.emit([this.helpers.returnJsonArray([data])]);
+		};
+
+		// create trigger, function and channel or use existing channel
+		const pgNames = prepareNames(this.getNode().id, this.getMode(), additionalFields);
+		if (triggerMode === 'createTrigger') {
+			await pgTriggerFunction.call(
+				this,
+				db,
+				additionalFields,
+				pgNames.functionName,
+				pgNames.triggerName,
+				pgNames.channelName,
+			);
+		} else {
+			pgNames.channelName = this.getNodeParameter('channelName', '') as string;
+		}
+
+		// listen to channel
+		await connection.none(`LISTEN ${pgNames.channelName}`);
+
+		const cleanUpDb = async () => {
+			try {
+				try {
+					// check if the connection is healthy
+					await connection.query('SELECT 1');
+				} catch {
+					// connection already closed. Can't perform cleanup
+					// eslint-disable-next-line n8n-nodes-base/node-execute-block-wrong-error-thrown
+					throw new TriggerCloseError(this.getNode(), { level: 'warning' });
+				}
+
+				try {
+					await connection.none('UNLISTEN $1:name', [pgNames.channelName]);
+					if (triggerMode === 'createTrigger') {
+						const functionName = pgNames.functionName.includes('(')
+							? pgNames.functionName.split('(')[0]
+							: pgNames.functionName;
+						await connection.any('DROP FUNCTION IF EXISTS $1:name CASCADE', [functionName]);
+
+						const schema = this.getNodeParameter('schema', undefined, {
+							extractValue: true,
+						}) as string;
+						const table = this.getNodeParameter('tableName', undefined, {
+							extractValue: true,
+						}) as string;
+
+						await connection.any('DROP TRIGGER IF EXISTS $1:name ON $2:name.$3:name CASCADE', [
+							pgNames.triggerName,
+							schema,
+							table,
+						]);
+					}
+				} catch (error) {
+					// eslint-disable-next-line n8n-nodes-base/node-execute-block-wrong-error-thrown
+					throw new TriggerCloseError(this.getNode(), { cause: error as Error, level: 'error' });
+				}
+			} finally {
+				connection.client.removeListener('notification', onNotification);
+				if (!db.$pool.ending) await db.$pool.end();
+			}
+		};
+
+		connection.client.on('notification', onNotification);
+
+		// The "closeFunction" function gets called by n8n whenever
+		// the workflow gets deactivated and can so clean up.
+		const closeFunction = async () => {
+			await cleanUpDb();
+		};
+
+		const manualTriggerFunction = async () => {
+			await new Promise(async (resolve, reject) => {
+				const timeoutHandler = setTimeout(async () => {
+					reject(
+						new Error(
+							await (async () => {
+								await cleanUpDb();
+								return 'Aborted, no data received within 30secs. This 30sec timeout is only set for "manually triggered execution". Active Workflows will listen indefinitely.';
+							})(),
+						),
+					);
+				}, 60000);
+				connection.client.on('notification', async (data: IDataObject) => {
+					if (data.payload) {
+						try {
+							data.payload = JSON.parse(data.payload as string) as IDataObject;
+						} catch (error) {}
+					}
+
+					this.emit([this.helpers.returnJsonArray([data])]);
+					clearTimeout(timeoutHandler);
+					resolve(true);
+				});
+			});
+		};
+
+		return {
+			closeFunction,
+			manualTriggerFunction: this.getMode() === 'manual' ? manualTriggerFunction : undefined,
+		};
+	}
+}
diff --git a/packages/nodes-base/nodes/Postgres/postgres.svg b/packages/nodes-base/nodes/Postgres/postgres.svg
index 9f4598c180340..da7be289e282b 100644
--- a/packages/nodes-base/nodes/Postgres/postgres.svg
+++ b/packages/nodes-base/nodes/Postgres/postgres.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 79 81" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><g stroke="none" fill-rule="nonzero"><path d="M77.391 47.922c-.466-1.412-1.688-2.396-3.268-2.632-.745-.111-1.598-.064-2.608.144-1.76.363-3.065.501-4.018.528 3.596-6.072 6.521-12.997 8.204-19.515 2.722-10.54 1.268-15.341-.432-17.513C70.77 3.185 64.206.097 56.287.002c-4.224-.052-7.933.782-9.867 1.382a36.738 36.738 0 00-5.77-.528c-3.809-.061-7.174.77-10.05 2.476a45.934 45.934 0 00-7.098-1.782C16.561.411 10.968 1.299 6.876 4.19 1.922 7.689-.375 13.77.05 22.262c.135 2.696 1.643 10.9 4.018 18.68 1.365 4.472 2.82 8.185 4.326 11.038 2.135 4.046 4.419 6.428 6.984 7.284 1.438.479 4.049.814 6.797-1.473a5.94 5.94 0 001.429 1.23c.783.494 1.74.897 2.696 1.136 3.446.862 6.674.646 9.427-.561l.041 1.362.06 1.899c.163 4.064.44 7.223 1.259 9.434.045.122.105.307.169.503.409 1.251 1.092 3.346 2.83 4.987 1.8 1.699 3.978 2.22 5.972 2.22 1 0 1.955-.131 2.792-.311 2.984-.639 6.373-1.614 8.824-5.104 2.318-3.3 3.444-8.27 3.648-16.101l.074-.634.048-.414.546.048.141.01c3.039.138 6.755-.506 9.037-1.566 1.803-.837 7.582-3.888 6.221-8.007" fill="#000"/><path d="M72.195 48.723c-9.036 1.864-9.657-1.195-9.657-1.195 9.541-14.157 13.529-32.127 10.087-36.525C63.235-.994 46.981 4.68 46.71 4.827l-.087.016c-1.785-.371-3.783-.591-6.029-.628-4.089-.067-7.19 1.072-9.544 2.857 0 0-28.995-11.945-27.647 15.023.287 5.737 8.223 43.41 17.689 32.031 3.46-4.161 6.803-7.679 6.803-7.679 1.66 1.103 3.648 1.666 5.732 1.463l.162-.137a6.336 6.336 0 00.065 1.62c-2.439 2.725-1.722 3.203-6.597 4.206-4.933 1.017-2.035 2.826-.143 3.299 2.294.574 7.6 1.386 11.185-3.633l-.143.573c.956.765 1.626 4.978 1.514 8.797s-.188 6.441.565 8.489 1.503 6.656 7.912 5.282c5.355-1.148 8.13-4.121 8.516-9.081.274-3.526.894-3.005.933-6.158l.497-1.493c.573-4.78.091-6.322 3.39-5.605l.802.07c2.428.11 5.606-.391 7.471-1.257 4.016-1.864 6.398-4.976 2.438-4.158" fill="#336791"/><path d="M32.747 24.66c-.814-.113-1.552-.008-1.925.274a.702.702 0 00-.292.47c-.047.336.188.707.333.898.409.542 1.006.915 1.598.997a1.86 1.86 0 00.256.018c.986 0 1.883-.768 1.962-1.335.099-.71-.932-1.183-1.931-1.322m26.975.022c-.078-.556-1.068-.715-2.007-.584s-1.848.554-1.772 1.112c.061.434.844 1.174 1.771 1.174.078 0 .157-.005.237-.016.619-.086 1.073-.479 1.288-.705.329-.345.518-.73.484-.98m15.477 23.828c-.345-1.042-1.453-1.377-3.296-.997-5.471 1.129-7.43.347-8.073-.127 4.252-6.478 7.75-14.308 9.637-21.614.894-3.461 1.388-6.675 1.428-9.294.045-2.876-.445-4.988-1.455-6.279-4.072-5.203-10.048-7.994-17.283-8.07-4.973-.056-9.175 1.217-9.99 1.575a24.866 24.866 0 00-5.622-.722c-3.734-.06-6.961.834-9.633 2.655a43.02 43.02 0 00-7.828-2.052c-6.342-1.021-11.381-.248-14.978 2.3-4.291 3.04-6.272 8.475-5.888 16.152.129 2.583 1.601 10.529 3.923 18.139 3.057 10.016 6.38 15.686 9.877 16.852a4.42 4.42 0 001.402.232c1.276 0 2.839-.575 4.466-2.531a160.99 160.99 0 016.156-6.966 9.91 9.91 0 004.429 1.191l.01.121c-.31.368-.564.69-.781.965-1.07 1.358-1.293 1.641-4.738 2.351-.98.202-3.582.738-3.62 2.563-.041 1.993 3.076 2.83 3.431 2.919 1.238.31 2.43.463 3.568.463 2.766 0 5.2-.909 7.145-2.668-.06 7.106.236 14.107 1.089 16.241.699 1.746 2.406 6.014 7.798 6.014.791 0 1.662-.092 2.62-.297 5.627-1.207 8.071-3.694 9.016-9.177.506-2.93 1.374-9.928 1.782-13.682.862.269 1.971.392 3.17.392 2.501 0 5.387-.531 7.197-1.372 2.033-.944 5.702-3.261 5.037-5.274zM61.8 23.147c-.019 1.108-.171 2.114-.333 3.164-.174 1.129-.354 2.297-.399 3.715-.045 1.379.128 2.814.294 4.2.337 2.801.682 5.685-.655 8.531a11.064 11.064 0 01-.592-1.218c-.166-.403-.527-1.05-1.027-1.946-1.944-3.487-6.497-11.652-4.167-14.984.694-.992 2.456-2.011 6.879-1.463zM56.439 4.374c6.482.143 11.609 2.568 15.24 7.207 2.784 3.558-.282 19.749-9.158 33.716l-.269-.339-.112-.14c2.294-3.788 1.845-7.536 1.446-10.859-.164-1.364-.319-2.652-.28-3.861.041-1.283.21-2.382.374-3.446.202-1.311.407-2.667.35-4.265a1.77 1.77 0 00.037-.601c-.144-1.533-1.894-6.12-5.462-10.273-1.951-2.271-4.797-4.813-8.682-6.527a29.288 29.288 0 016.515-.612zM20.167 53.298c-1.793 2.155-3.031 1.742-3.438 1.607-2.653-.885-5.73-6.491-8.444-15.382-2.348-7.693-3.72-15.428-3.829-17.597-.343-6.86 1.32-11.641 4.943-14.21 5.896-4.181 15.589-1.679 19.484-.409l-.17.163c-6.391 6.455-6.24 17.483-6.224 18.157a21.6 21.6 0 00.051 1.135c.11 1.855.315 5.307-.232 9.217-.508 3.633.612 7.189 3.072 9.756.255.266.521.515.795.75a164.06 164.06 0 00-6.008 6.814zm6.83-9.113c-1.983-2.069-2.884-4.947-2.471-7.896.577-4.13.364-7.727.25-9.659l-.039-.694c.934-.828 5.261-3.146 8.346-2.439 1.408.323 2.266 1.281 2.623 2.931 1.846 8.539.244 12.098-1.043 14.957-.265.589-.516 1.146-.73 1.722l-.166.445c-.42 1.126-.811 2.173-1.053 3.167-2.108-.006-4.159-.907-5.718-2.534zm.324 11.516a4.98 4.98 0 01-1.494-.642c.271-.128.754-.301 1.591-.474 4.052-.834 4.678-1.423 6.045-3.158.313-.398.669-.849 1.16-1.398.733-.821 1.068-.682 1.676-.43.493.204.972.821 1.167 1.501.092.321.195.93-.143 1.404-2.855 3.997-7.015 3.946-10.003 3.198zm21.207 19.735c-4.957 1.062-6.713-1.467-7.869-4.359-.747-1.867-1.113-10.285-.853-19.582a1.135 1.135 0 00-.048-.356 4.64 4.64 0 00-.139-.657c-.387-1.353-1.331-2.484-2.462-2.953-.45-.186-1.275-.528-2.267-.274.212-.871.578-1.855.976-2.921l.167-.448c.188-.505.423-1.029.673-1.583 1.347-2.992 3.192-7.091 1.19-16.35-.75-3.468-3.254-5.161-7.05-4.768-2.276.235-4.358 1.154-5.396 1.68-.223.113-.428.222-.618.329.29-3.494 1.385-10.024 5.481-14.156 2.579-2.601 6.014-3.886 10.199-3.817 8.246.135 13.534 4.367 16.518 7.893 2.571 3.039 3.964 6.1 4.52 7.751-4.179-.425-7.022.4-8.463 2.46-3.135 4.481 1.715 13.178 4.046 17.358.427.766.796 1.428.912 1.709.759 1.839 1.742 3.067 2.459 3.964.22.275.433.541.596.774-1.266.365-3.539 1.208-3.332 5.422-.167 2.115-1.356 12.016-1.959 15.514-.797 4.621-2.497 6.343-7.279 7.368zm20.693-23.68c-1.294.601-3.46 1.052-5.518 1.148-2.273.107-3.43-.255-3.702-.477-.128-2.626.85-2.901 1.884-3.191.163-.046.321-.09.474-.144a4.17 4.17 0 00.313.23c1.827 1.206 5.085 1.336 9.685.386l.05-.01c-.62.58-1.682 1.359-3.187 2.058z"/></g></symbol></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round" viewBox="0 0 79 81"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><g fill-rule="nonzero" stroke="none"><path fill="#000" d="M77.391 47.922c-.466-1.412-1.688-2.396-3.268-2.632-.745-.111-1.598-.064-2.608.144-1.76.363-3.065.501-4.018.528 3.596-6.072 6.521-12.997 8.204-19.515 2.722-10.54 1.268-15.341-.432-17.513C70.77 3.185 64.206.097 56.287.002c-4.224-.052-7.933.782-9.867 1.382a37 37 0 0 0-5.77-.528c-3.809-.061-7.174.77-10.05 2.476a46 46 0 0 0-7.098-1.782C16.561.411 10.968 1.299 6.876 4.19 1.922 7.689-.375 13.77.05 22.262c.135 2.696 1.643 10.9 4.018 18.68 1.365 4.472 2.82 8.185 4.326 11.038 2.135 4.046 4.419 6.428 6.984 7.284 1.438.479 4.049.814 6.797-1.473a6 6 0 0 0 1.429 1.23c.783.494 1.74.897 2.696 1.136 3.446.862 6.674.646 9.427-.561l.041 1.362.06 1.899c.163 4.064.44 7.223 1.259 9.434.045.122.105.307.169.503.409 1.251 1.092 3.346 2.83 4.987 1.8 1.699 3.978 2.22 5.972 2.22 1 0 1.955-.131 2.792-.311 2.984-.639 6.373-1.614 8.824-5.104 2.318-3.3 3.444-8.27 3.648-16.101l.074-.634.048-.414.546.048.141.01c3.039.138 6.755-.506 9.037-1.566 1.803-.837 7.582-3.888 6.221-8.007"/><path fill="#336791" d="M72.195 48.723c-9.036 1.864-9.657-1.195-9.657-1.195 9.541-14.157 13.529-32.127 10.087-36.525C63.235-.994 46.981 4.68 46.71 4.827l-.087.016c-1.785-.371-3.783-.591-6.029-.628-4.089-.067-7.19 1.072-9.544 2.857 0 0-28.995-11.945-27.647 15.023.287 5.737 8.223 43.41 17.689 32.031 3.46-4.161 6.803-7.679 6.803-7.679 1.66 1.103 3.648 1.666 5.732 1.463l.162-.137a6.3 6.3 0 0 0 .065 1.62c-2.439 2.725-1.722 3.203-6.597 4.206-4.933 1.017-2.035 2.826-.143 3.299 2.294.574 7.6 1.386 11.185-3.633l-.143.573c.956.765 1.626 4.978 1.514 8.797s-.188 6.441.565 8.489 1.503 6.656 7.912 5.282c5.355-1.148 8.13-4.121 8.516-9.081.274-3.526.894-3.005.933-6.158l.497-1.493c.573-4.78.091-6.322 3.39-5.605l.802.07c2.428.11 5.606-.391 7.471-1.257 4.016-1.864 6.398-4.976 2.438-4.158"/><path d="M32.747 24.66c-.814-.113-1.552-.008-1.925.274a.7.7 0 0 0-.292.47c-.047.336.188.707.333.898.409.542 1.006.915 1.598.997a2 2 0 0 0 .256.018c.986 0 1.883-.768 1.962-1.335.099-.71-.932-1.183-1.931-1.322m26.975.022c-.078-.556-1.068-.715-2.007-.584s-1.848.554-1.772 1.112c.061.434.844 1.174 1.771 1.174q.117 0 .237-.016c.619-.086 1.073-.479 1.288-.705.329-.345.518-.73.484-.98m15.477 23.828c-.345-1.042-1.453-1.377-3.296-.997-5.471 1.129-7.43.347-8.073-.127 4.252-6.478 7.75-14.308 9.637-21.614.894-3.461 1.388-6.675 1.428-9.294.045-2.876-.445-4.988-1.455-6.279-4.072-5.203-10.048-7.994-17.283-8.07-4.973-.056-9.175 1.217-9.99 1.575a25 25 0 0 0-5.622-.722c-3.734-.06-6.961.834-9.633 2.655a43 43 0 0 0-7.828-2.052c-6.342-1.021-11.381-.248-14.978 2.3-4.291 3.04-6.272 8.475-5.888 16.152.129 2.583 1.601 10.529 3.923 18.139 3.057 10.016 6.38 15.686 9.877 16.852a4.4 4.4 0 0 0 1.402.232c1.276 0 2.839-.575 4.466-2.531a161 161 0 0 1 6.156-6.966 9.9 9.9 0 0 0 4.429 1.191l.01.121c-.31.368-.564.69-.781.965-1.07 1.358-1.293 1.641-4.738 2.351-.98.202-3.582.738-3.62 2.563-.041 1.993 3.076 2.83 3.431 2.919 1.238.31 2.43.463 3.568.463 2.766 0 5.2-.909 7.145-2.668-.06 7.106.236 14.107 1.089 16.241.699 1.746 2.406 6.014 7.798 6.014.791 0 1.662-.092 2.62-.297 5.627-1.207 8.071-3.694 9.016-9.177.506-2.93 1.374-9.928 1.782-13.682.862.269 1.971.392 3.17.392 2.501 0 5.387-.531 7.197-1.372 2.033-.944 5.702-3.261 5.037-5.274zM61.8 23.147c-.019 1.108-.171 2.114-.333 3.164-.174 1.129-.354 2.297-.399 3.715-.045 1.379.128 2.814.294 4.2.337 2.801.682 5.685-.655 8.531a11 11 0 0 1-.592-1.218c-.166-.403-.527-1.05-1.027-1.946-1.944-3.487-6.497-11.652-4.167-14.984.694-.992 2.456-2.011 6.879-1.463zM56.439 4.374c6.482.143 11.609 2.568 15.24 7.207 2.784 3.558-.282 19.749-9.158 33.716l-.269-.339-.112-.14c2.294-3.788 1.845-7.536 1.446-10.859-.164-1.364-.319-2.652-.28-3.861.041-1.283.21-2.382.374-3.446.202-1.311.407-2.667.35-4.265a1.8 1.8 0 0 0 .037-.601c-.144-1.533-1.894-6.12-5.462-10.273-1.951-2.271-4.797-4.813-8.682-6.527a29.3 29.3 0 0 1 6.515-.612zM20.167 53.298c-1.793 2.155-3.031 1.742-3.438 1.607-2.653-.885-5.73-6.491-8.444-15.382-2.348-7.693-3.72-15.428-3.829-17.597-.343-6.86 1.32-11.641 4.943-14.21 5.896-4.181 15.589-1.679 19.484-.409l-.17.163c-6.391 6.455-6.24 17.483-6.224 18.157a22 22 0 0 0 .051 1.135c.11 1.855.315 5.307-.232 9.217-.508 3.633.612 7.189 3.072 9.756q.383.398.795.75a164 164 0 0 0-6.008 6.814zm6.83-9.113c-1.983-2.069-2.884-4.947-2.471-7.896.577-4.13.364-7.727.25-9.659l-.039-.694c.934-.828 5.261-3.146 8.346-2.439 1.408.323 2.266 1.281 2.623 2.931 1.846 8.539.244 12.098-1.043 14.957-.265.589-.516 1.146-.73 1.722l-.166.445c-.42 1.126-.811 2.173-1.053 3.167-2.108-.006-4.159-.907-5.718-2.534zm.324 11.516a5 5 0 0 1-1.494-.642c.271-.128.754-.301 1.591-.474 4.052-.834 4.678-1.423 6.045-3.158.313-.398.669-.849 1.16-1.398.733-.821 1.068-.682 1.676-.43.493.204.972.821 1.167 1.501.092.321.195.93-.143 1.404-2.855 3.997-7.015 3.946-10.003 3.198zm21.207 19.735c-4.957 1.062-6.713-1.467-7.869-4.359-.747-1.867-1.113-10.285-.853-19.582a1.1 1.1 0 0 0-.048-.356 5 5 0 0 0-.139-.657c-.387-1.353-1.331-2.484-2.462-2.953-.45-.186-1.275-.528-2.267-.274.212-.871.578-1.855.976-2.921l.167-.448c.188-.505.423-1.029.673-1.583 1.347-2.992 3.192-7.091 1.19-16.35-.75-3.468-3.254-5.161-7.05-4.768-2.276.235-4.358 1.154-5.396 1.68q-.334.169-.618.329c.29-3.494 1.385-10.024 5.481-14.156 2.579-2.601 6.014-3.886 10.199-3.817 8.246.135 13.534 4.367 16.518 7.893 2.571 3.039 3.964 6.1 4.52 7.751-4.179-.425-7.022.4-8.463 2.46-3.135 4.481 1.715 13.178 4.046 17.358.427.766.796 1.428.912 1.709.759 1.839 1.742 3.067 2.459 3.964.22.275.433.541.596.774-1.266.365-3.539 1.208-3.332 5.422-.167 2.115-1.356 12.016-1.959 15.514-.797 4.621-2.497 6.343-7.279 7.368zm20.693-23.68c-1.294.601-3.46 1.052-5.518 1.148-2.273.107-3.43-.255-3.702-.477-.128-2.626.85-2.901 1.884-3.191.163-.046.321-.09.474-.144a4 4 0 0 0 .313.23c1.827 1.206 5.085 1.336 9.685.386l.05-.01c-.62.58-1.682 1.359-3.187 2.058z"/></g></symbol></svg>
\ No newline at end of file
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 4d0e30fa59fef..61484e54a14b0 100644
--- a/packages/nodes-base/nodes/Postgres/test/v2/operations.test.ts
+++ b/packages/nodes-base/nodes/Postgres/test/v2/operations.test.ts
@@ -1,8 +1,13 @@
-import type { IDataObject, IExecuteFunctions, IGetNodeParameterOptions, INode } from 'n8n-workflow';
-
-import type { ColumnInfo, PgpDatabase, QueriesRunner } from '../../v2/helpers/interfaces';
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	IGetNodeParameterOptions,
+	INode,
+	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';
@@ -38,6 +43,7 @@ const createMockExecuteFunction = (nodeParameters: IDataObject) => {
 			return get(nodeParameters, parameter, fallbackValue);
 		},
 		getNode() {
+			node.parameters = { ...node.parameters, ...(nodeParameters as INodeParameters) };
 			return node;
 		},
 	} as unknown as IExecuteFunctions;
@@ -82,7 +88,7 @@ describe('Test PostgresV2, deleteTable operation', () => {
 					},
 				],
 			},
-			options: {},
+			options: { nodeVersion: 2.1 },
 		};
 		const nodeOptions = nodeParameters.options as IDataObject;
 
@@ -161,7 +167,7 @@ describe('Test PostgresV2, deleteTable operation', () => {
 				cachedResultName: 'my_table',
 			},
 			deleteCommand: 'drop',
-			options: {},
+			options: { nodeVersion: 2.1 },
 		};
 		const nodeOptions = nodeParameters.options as IDataObject;
 
@@ -249,12 +255,12 @@ describe('Test PostgresV2, insert operation', () => {
 					},
 				],
 			},
-			options: {},
+			options: { nodeVersion: 2.1 },
 		};
 		const columnsInfo: ColumnInfo[] = [
-			{ column_name: 'id', data_type: 'integer', is_nullable: 'NO' },
-			{ column_name: 'json', data_type: 'json', is_nullable: 'NO' },
-			{ column_name: 'foo', data_type: 'text', is_nullable: 'NO' },
+			{ column_name: 'id', data_type: 'integer', is_nullable: 'NO', udt_name: '' },
+			{ column_name: 'json', data_type: 'json', is_nullable: 'NO', udt_name: '' },
+			{ column_name: 'foo', data_type: 'text', is_nullable: 'NO', udt_name: '' },
 		];
 
 		const nodeOptions = nodeParameters.options as IDataObject;
@@ -292,12 +298,12 @@ describe('Test PostgresV2, insert operation', () => {
 				mode: 'list',
 			},
 			dataMode: 'autoMapInputData',
-			options: {},
+			options: { nodeVersion: 2.1 },
 		};
 		const columnsInfo: ColumnInfo[] = [
-			{ column_name: 'id', data_type: 'integer', is_nullable: 'NO' },
-			{ column_name: 'json', data_type: 'json', is_nullable: 'NO' },
-			{ column_name: 'foo', data_type: 'text', is_nullable: 'NO' },
+			{ column_name: 'id', data_type: 'integer', is_nullable: 'NO', udt_name: '' },
+			{ column_name: 'json', data_type: 'json', is_nullable: 'NO', udt_name: '' },
+			{ column_name: 'foo', data_type: 'text', is_nullable: 'NO', udt_name: '' },
 		];
 
 		const inputItems = [
@@ -502,12 +508,13 @@ describe('Test PostgresV2, update operation', () => {
 			},
 			options: {
 				outputColumns: ['json', 'foo'],
+				nodeVersion: 2.1,
 			},
 		};
 		const columnsInfo: ColumnInfo[] = [
-			{ column_name: 'id', data_type: 'integer', is_nullable: 'NO' },
-			{ column_name: 'json', data_type: 'json', is_nullable: 'NO' },
-			{ column_name: 'foo', data_type: 'text', is_nullable: 'NO' },
+			{ column_name: 'id', data_type: 'integer', is_nullable: 'NO', udt_name: '' },
+			{ column_name: 'json', data_type: 'json', is_nullable: 'NO', udt_name: '' },
+			{ column_name: 'foo', data_type: 'text', is_nullable: 'NO', udt_name: '' },
 		];
 
 		const nodeOptions = nodeParameters.options as IDataObject;
@@ -558,12 +565,12 @@ describe('Test PostgresV2, update operation', () => {
 			},
 			dataMode: 'autoMapInputData',
 			columnToMatchOn: 'id',
-			options: {},
+			options: { nodeVersion: 2.1 },
 		};
 		const columnsInfo: ColumnInfo[] = [
-			{ column_name: 'id', data_type: 'integer', is_nullable: 'NO' },
-			{ column_name: 'json', data_type: 'json', is_nullable: 'NO' },
-			{ column_name: 'foo', data_type: 'text', is_nullable: 'NO' },
+			{ column_name: 'id', data_type: 'integer', is_nullable: 'NO', udt_name: '' },
+			{ column_name: 'json', data_type: 'json', is_nullable: 'NO', udt_name: '' },
+			{ column_name: 'foo', data_type: 'text', is_nullable: 'NO', udt_name: '' },
 		];
 
 		const inputItems = [
@@ -661,12 +668,13 @@ describe('Test PostgresV2, upsert operation', () => {
 			},
 			options: {
 				outputColumns: ['json'],
+				nodeVersion: 2.1,
 			},
 		};
 		const columnsInfo: ColumnInfo[] = [
-			{ column_name: 'id', data_type: 'integer', is_nullable: 'NO' },
-			{ column_name: 'json', data_type: 'json', is_nullable: 'NO' },
-			{ column_name: 'foo', data_type: 'text', is_nullable: 'NO' },
+			{ column_name: 'id', data_type: 'integer', is_nullable: 'NO', udt_name: '' },
+			{ column_name: 'json', data_type: 'json', is_nullable: 'NO', udt_name: '' },
+			{ column_name: 'foo', data_type: 'text', is_nullable: 'NO', udt_name: '' },
 		];
 
 		const nodeOptions = nodeParameters.options as IDataObject;
@@ -717,12 +725,12 @@ describe('Test PostgresV2, upsert operation', () => {
 			},
 			dataMode: 'autoMapInputData',
 			columnToMatchOn: 'id',
-			options: {},
+			options: { nodeVersion: 2.1 },
 		};
 		const columnsInfo: ColumnInfo[] = [
-			{ column_name: 'id', data_type: 'integer', is_nullable: 'NO' },
-			{ column_name: 'json', data_type: 'json', is_nullable: 'NO' },
-			{ column_name: 'foo', data_type: 'text', is_nullable: 'NO' },
+			{ column_name: 'id', data_type: 'integer', is_nullable: 'NO', udt_name: '' },
+			{ column_name: 'json', data_type: 'json', is_nullable: 'NO', udt_name: '' },
+			{ column_name: 'foo', data_type: 'text', is_nullable: 'NO', udt_name: '' },
 		];
 
 		const inputItems = [
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 9bf94936fed1a..d8dc12b01f7b2 100644
--- a/packages/nodes-base/nodes/Postgres/test/v2/runQueries.test.ts
+++ b/packages/nodes-base/nodes/Postgres/test/v2/runQueries.test.ts
@@ -1,11 +1,10 @@
-import { constructExecutionMetaData } from 'n8n-core';
-import type { IDataObject, INode } from 'n8n-workflow';
+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';
 
-import pgPromise from 'pg-promise';
-
 const node: INode = {
 	id: '1',
 	name: 'Postgres node',
@@ -41,13 +40,16 @@ describe('Test PostgresV2, runQueries', () => {
 
 		const dbMultiSpy = jest.spyOn(db, 'multi');
 
-		const runQueries = configureQueryRunner(node, constructExecutionMetaData, false, pgp, db);
+		const thisArg = mock<IExecuteFunctions>();
+		const runQueries = configureQueryRunner.call(thisArg, node, false, pgp, db);
 
-		const result = await runQueries([{ query: 'SELECT * FROM table', values: [] }], [], {});
+		const result = await runQueries([{ query: 'SELECT * FROM table', values: [] }], [], {
+			nodeVersion: 2.2,
+		});
 
 		expect(result).toBeDefined();
 		expect(result).toHaveLength(1);
-		expect(result).toEqual([{ json: { success: true } }]);
+		expect(result).toEqual([{ json: { success: true }, pairedItem: [{ item: 0 }] }]);
 		expect(dbMultiSpy).toHaveBeenCalledWith('SELECT * FROM table');
 	});
 });
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 8a707d592b720..39cdaf16ec005 100644
--- a/packages/nodes-base/nodes/Postgres/test/v2/utils.test.ts
+++ b/packages/nodes-base/nodes/Postgres/test/v2/utils.test.ts
@@ -10,7 +10,9 @@ import {
 	prepareItem,
 	replaceEmptyStringsByNulls,
 	wrapData,
+	convertArraysToPostgresFormat,
 } from '../../v2/helpers/utils';
+import type { ColumnInfo } from '../../v2/helpers/interfaces';
 
 const node: INode = {
 	id: '1',
@@ -373,3 +375,78 @@ describe('Test PostgresV2, checkItemAgainstSchema', () => {
 		}
 	});
 });
+
+describe('Test PostgresV2, convertArraysToPostgresFormat', () => {
+	it('should convert js arrays to postgres format', () => {
+		const item = {
+			jsonb_array: [
+				{
+					key: 'value44',
+				},
+			],
+			json_array: [
+				{
+					key: 'value54',
+				},
+			],
+			int_array: [1, 2, 5],
+			text_array: ['one', 't"w"o'],
+			bool_array: [true, false],
+		};
+
+		const schema: ColumnInfo[] = [
+			{
+				column_name: 'id',
+				data_type: 'integer',
+				is_nullable: 'NO',
+				udt_name: 'int4',
+				column_default: "nextval('test_data_array_id_seq'::regclass)",
+			},
+			{
+				column_name: 'jsonb_array',
+				data_type: 'ARRAY',
+				is_nullable: 'YES',
+				udt_name: '_jsonb',
+				column_default: null,
+			},
+			{
+				column_name: 'json_array',
+				data_type: 'ARRAY',
+				is_nullable: 'YES',
+				udt_name: '_json',
+				column_default: null,
+			},
+			{
+				column_name: 'int_array',
+				data_type: 'ARRAY',
+				is_nullable: 'YES',
+				udt_name: '_int4',
+				column_default: null,
+			},
+			{
+				column_name: 'bool_array',
+				data_type: 'ARRAY',
+				is_nullable: 'YES',
+				udt_name: '_bool',
+				column_default: null,
+			},
+			{
+				column_name: 'text_array',
+				data_type: 'ARRAY',
+				is_nullable: 'YES',
+				udt_name: '_text',
+				column_default: null,
+			},
+		];
+
+		convertArraysToPostgresFormat(item, schema, node, 0);
+
+		expect(item).toEqual({
+			jsonb_array: '{"{\\"key\\":\\"value44\\"}"}',
+			json_array: '{"{\\"key\\":\\"value54\\"}"}',
+			int_array: '{1,2,5}',
+			text_array: '{"one","t\\"w\\"o"}',
+			bool_array: '{"true","false"}',
+		});
+	});
+});
diff --git a/packages/nodes-base/nodes/Postgres/v1/PostgresV1.node.ts b/packages/nodes-base/nodes/Postgres/v1/PostgresV1.node.ts
index ac98d867336e5..f4b780f423043 100644
--- a/packages/nodes-base/nodes/Postgres/v1/PostgresV1.node.ts
+++ b/packages/nodes-base/nodes/Postgres/v1/PostgresV1.node.ts
@@ -1,9 +1,9 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
-import type { IExecuteFunctions } from 'n8n-core';
 import type {
 	ICredentialsDecrypted,
 	ICredentialTestFunctions,
 	IDataObject,
+	IExecuteFunctions,
 	INodeCredentialTestResult,
 	INodeExecutionData,
 	INodeType,
@@ -16,6 +16,8 @@ import pgPromise from 'pg-promise';
 
 import { pgInsertV2, pgQueryV2, pgUpdate, wrapData } from './genericFunctions';
 
+import { oldVersionNotice } from '@utils/descriptions';
+
 const versionDescription: INodeTypeDescription = {
 	displayName: 'Postgres',
 	name: 'postgres',
@@ -36,6 +38,7 @@ const versionDescription: INodeTypeDescription = {
 		},
 	],
 	properties: [
+		oldVersionNotice,
 		{
 			displayName: 'Operation',
 			name: 'operation',
@@ -71,6 +74,11 @@ const versionDescription: INodeTypeDescription = {
 			displayName: 'Query',
 			name: 'query',
 			type: 'string',
+			noDataExpression: true,
+			typeOptions: {
+				editor: 'sqlEditor',
+				sqlDialect: 'PostgreSQL',
+			},
 			displayOptions: {
 				show: {
 					operation: ['executeQuery'],
@@ -314,7 +322,7 @@ export class PostgresV1 implements INodeType {
 
 					const db = pgp(config);
 					await db.connect();
-					pgp.end();
+					await db.$pool.end();
 				} catch (error) {
 					return {
 						status: 'Error',
@@ -403,16 +411,16 @@ export class PostgresV1 implements INodeType {
 
 			returnItems = wrapData(updateItems);
 		} else {
-			pgp.end();
+			await db.$pool.end();
 			throw new NodeOperationError(
 				this.getNode(),
 				`The operation "${operation}" is not supported!`,
 			);
 		}
 
-		// Close the connection
-		pgp.end();
+		// shuts down the connection pool associated with the db object to allow the process to finish
+		await db.$pool.end();
 
-		return this.prepareOutputData(returnItems);
+		return [returnItems];
 	}
 }
diff --git a/packages/nodes-base/nodes/Postgres/v1/genericFunctions.ts b/packages/nodes-base/nodes/Postgres/v1/genericFunctions.ts
index df0331ddc7521..9420c427a12c4 100644
--- a/packages/nodes-base/nodes/Postgres/v1/genericFunctions.ts
+++ b/packages/nodes-base/nodes/Postgres/v1/genericFunctions.ts
@@ -1,6 +1,8 @@
+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';
 
 /**
  * Returns of a shallow copy of the items which only contains the json data and
@@ -118,7 +120,7 @@ export async function pgQuery(
 	if (mode === 'multiple') {
 		return (await db.multi(pgp.helpers.concat(allQueries))).flat(1);
 	} else if (mode === 'transaction') {
-		return db.tx(async (t) => {
+		return await db.tx(async (t) => {
 			const result: IDataObject[] = [];
 			for (let i = 0; i < allQueries.length; i++) {
 				try {
@@ -139,7 +141,7 @@ export async function pgQuery(
 			return result;
 		});
 	} else if (mode === 'independently') {
-		return db.task(async (t) => {
+		return await db.task(async (t) => {
 			const result: IDataObject[] = [];
 			for (let i = 0; i < allQueries.length; i++) {
 				try {
@@ -159,7 +161,9 @@ export async function pgQuery(
 			return result;
 		});
 	}
-	throw new Error('multiple, independently or transaction are valid options');
+	throw new ApplicationError('multiple, independently or transaction are valid options', {
+		level: 'warning',
+	});
 }
 
 export async function pgQueryV2(
@@ -168,7 +172,10 @@ export async function pgQueryV2(
 	db: pgPromise.IDatabase<{}, pg.IClient>,
 	items: INodeExecutionData[],
 	continueOnFail: boolean,
-	overrideMode?: string,
+	options?: {
+		overrideMode?: string;
+		resolveExpression?: boolean;
+	},
 ): Promise<IDataObject[]> {
 	const additionalFields = this.getNodeParameter('additionalFields', 0);
 
@@ -183,13 +190,22 @@ export async function pgQueryV2(
 	type QueryWithValues = { query: string; values?: string[] };
 	const allQueries = new Array<QueryWithValues>();
 	for (let i = 0; i < items.length; i++) {
-		const query = this.getNodeParameter('query', i) as string;
+		let query = this.getNodeParameter('query', i) as string;
+
+		if (options?.resolveExpression) {
+			for (const resolvable of getResolvables(query)) {
+				query = query.replace(resolvable, this.evaluateExpression(resolvable, i) as string);
+			}
+		}
+
 		const values = valuesArray[i];
 		const queryFormat = { query, values };
 		allQueries.push(queryFormat);
 	}
 
-	const mode = overrideMode ? overrideMode : ((additionalFields.mode ?? 'multiple') as string);
+	const mode = options?.overrideMode
+		? options.overrideMode
+		: ((additionalFields.mode ?? 'multiple') as string);
 	if (mode === 'multiple') {
 		return (await db.multi(pgp.helpers.concat(allQueries)))
 			.map((result, i) => {
@@ -199,7 +215,7 @@ export async function pgQueryV2(
 			})
 			.flat();
 	} else if (mode === 'transaction') {
-		return db.tx(async (t) => {
+		return await db.tx(async (t) => {
 			const result: INodeExecutionData[] = [];
 			for (let i = 0; i < allQueries.length; i++) {
 				try {
@@ -223,7 +239,7 @@ export async function pgQueryV2(
 			return result;
 		});
 	} else if (mode === 'independently') {
-		return db.task(async (t) => {
+		return await db.task(async (t) => {
 			const result: INodeExecutionData[] = [];
 			for (let i = 0; i < allQueries.length; i++) {
 				try {
@@ -246,7 +262,9 @@ export async function pgQueryV2(
 			return result;
 		});
 	}
-	throw new Error('multiple, independently or transaction are valid options');
+	throw new ApplicationError('multiple, independently or transaction are valid options', {
+		level: 'warning',
+	});
 }
 
 /**
@@ -290,9 +308,9 @@ export async function pgInsert(
 	if (mode === 'multiple') {
 		const query =
 			pgp.helpers.insert(getItemsCopy(items, columnNames, guardedColumns), cs) + returning;
-		return db.any(query);
+		return await db.any(query);
 	} else if (mode === 'transaction') {
-		return db.tx(async (t) => {
+		return await db.tx(async (t) => {
 			const result: IDataObject[] = [];
 			for (let i = 0; i < items.length; i++) {
 				const itemCopy = getItemCopy(items[i], columnNames, guardedColumns);
@@ -311,7 +329,7 @@ export async function pgInsert(
 			return result;
 		});
 	} else if (mode === 'independently') {
-		return db.task(async (t) => {
+		return await db.task(async (t) => {
 			const result: IDataObject[] = [];
 			for (let i = 0; i < items.length; i++) {
 				const itemCopy = getItemCopy(items[i], columnNames, guardedColumns);
@@ -335,7 +353,9 @@ export async function pgInsert(
 		});
 	}
 
-	throw new Error('multiple, independently or transaction are valid options');
+	throw new ApplicationError('multiple, independently or transaction are valid options', {
+		level: 'warning',
+	});
 }
 
 /**
@@ -343,7 +363,7 @@ export async function pgInsert(
  *
  * @param {Function} getNodeParam The getter for the Node's parameters
  * @param {pgPromise.IMain<{}, pg.IClient>} pgp The pgPromise instance
- * @param {pgPromise.IDatabase<{}, pg.IClient>} db The pgPromise database connection
+ * @param {pgPromise.IDatabase<{}, pg.IClient>} db`` The pgPromise database connection
  * @param {INodeExecutionData[]} items The items to be inserted
  */
 export async function pgInsertV2(
@@ -387,7 +407,7 @@ export async function pgInsertV2(
 			})
 			.flat();
 	} else if (mode === 'transaction') {
-		return db.tx(async (t) => {
+		return await db.tx(async (t) => {
 			const result: IDataObject[] = [];
 			for (let i = 0; i < items.length; i++) {
 				const itemCopy = getItemCopy(items[i], columnNames, guardedColumns);
@@ -412,7 +432,7 @@ export async function pgInsertV2(
 			return result;
 		});
 	} else if (mode === 'independently') {
-		return db.task(async (t) => {
+		return await db.task(async (t) => {
 			const result: IDataObject[] = [];
 			for (let i = 0; i < items.length; i++) {
 				const itemCopy = getItemCopy(items[i], columnNames, guardedColumns);
@@ -443,7 +463,9 @@ export async function pgInsertV2(
 		});
 	}
 
-	throw new Error('multiple, independently or transaction are valid options');
+	throw new ApplicationError('multiple, independently or transaction are valid options', {
+		level: 'warning',
+	});
 }
 
 /**
@@ -510,14 +532,14 @@ export async function pgUpdate(
 				})
 				.join(' AND ') +
 			returning;
-		return db.any(query);
+		return await db.any(query);
 	} else {
 		const where =
 			' WHERE ' +
 			// eslint-disable-next-line n8n-local-rules/no-interpolation-in-regular-string
 			updateKeys.map((entry) => pgp.as.name(entry.name) + ' = ${' + entry.prop + '}').join(' AND ');
 		if (mode === 'transaction') {
-			return db.tx(async (t) => {
+			return await db.tx(async (t) => {
 				const result: IDataObject[] = [];
 				for (let i = 0; i < items.length; i++) {
 					const itemCopy = getItemCopy(items[i], columnNames, guardedColumns);
@@ -543,7 +565,7 @@ export async function pgUpdate(
 				return result;
 			});
 		} else if (mode === 'independently') {
-			return db.task(async (t) => {
+			return await db.task(async (t) => {
 				const result: IDataObject[] = [];
 				for (let i = 0; i < items.length; i++) {
 					const itemCopy = getItemCopy(items[i], columnNames, guardedColumns);
@@ -569,7 +591,9 @@ export async function pgUpdate(
 			});
 		}
 	}
-	throw new Error('multiple, independently or transaction are valid options');
+	throw new ApplicationError('multiple, independently or transaction are valid options', {
+		level: 'warning',
+	});
 }
 
 /**
@@ -643,7 +667,7 @@ export async function pgUpdateV2(
 			// eslint-disable-next-line n8n-local-rules/no-interpolation-in-regular-string
 			updateKeys.map((entry) => pgp.as.name(entry.name) + ' = ${' + entry.prop + '}').join(' AND ');
 		if (mode === 'transaction') {
-			return db.tx(async (t) => {
+			return await db.tx(async (t) => {
 				const result: IDataObject[] = [];
 				for (let i = 0; i < items.length; i++) {
 					const itemCopy = getItemCopy(items[i], columnNames, guardedColumns);
@@ -671,7 +695,7 @@ export async function pgUpdateV2(
 				return result;
 			});
 		} else if (mode === 'independently') {
-			return db.task(async (t) => {
+			return await db.task(async (t) => {
 				const result: IDataObject[] = [];
 				for (let i = 0; i < items.length; i++) {
 					const itemCopy = getItemCopy(items[i], columnNames, guardedColumns);
@@ -700,5 +724,7 @@ export async function pgUpdateV2(
 			});
 		}
 	}
-	throw new Error('multiple, independently or transaction are valid options');
+	throw new ApplicationError('multiple, independently or transaction are valid options', {
+		level: 'warning',
+	});
 }
diff --git a/packages/nodes-base/nodes/Postgres/v2/PostgresV2.node.ts b/packages/nodes-base/nodes/Postgres/v2/PostgresV2.node.ts
index e435f4ddbe334..a8f5c03965c32 100644
--- a/packages/nodes-base/nodes/Postgres/v2/PostgresV2.node.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/PostgresV2.node.ts
@@ -1,6 +1,5 @@
-/* eslint-disable n8n-nodes-base/node-filename-against-convention */
-import type { IExecuteFunctions } from 'n8n-core';
 import type {
+	IExecuteFunctions,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeBaseDescription,
@@ -9,7 +8,7 @@ import type {
 import { router } from './actions/router';
 
 import { versionDescription } from './actions/versionDescription';
-import { credentialTest, listSearch, loadOptions } from './methods';
+import { credentialTest, listSearch, loadOptions, resourceMapping } from './methods';
 
 export class PostgresV2 implements INodeType {
 	description: INodeTypeDescription;
@@ -21,9 +20,9 @@ export class PostgresV2 implements INodeType {
 		};
 	}
 
-	methods = { credentialTest, listSearch, loadOptions };
+	methods = { credentialTest, listSearch, loadOptions, resourceMapping };
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
-		return router.call(this);
+		return await router.call(this);
 	}
 }
diff --git a/packages/nodes-base/nodes/Postgres/v2/actions/common.descriptions.ts b/packages/nodes-base/nodes/Postgres/v2/actions/common.descriptions.ts
index 0ea7b359620e3..1d4088820ff34 100644
--- a/packages/nodes-base/nodes/Postgres/v2/actions/common.descriptions.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/actions/common.descriptions.ts
@@ -30,6 +30,16 @@ export const optionsCollection: INodeProperties = {
 			default: 30,
 			description: 'Number of seconds reserved for connecting to the database',
 		},
+		{
+			displayName: 'Delay Closing Idle Connection',
+			name: 'delayClosingIdleConnection',
+			type: 'number',
+			default: 0,
+			description: 'Number of seconds to wait before idle connection would be eligible for closing',
+			typeOptions: {
+				minValue: 0,
+			},
+		},
 		{
 			displayName: 'Query Batching',
 			name: 'queryBatching',
@@ -62,7 +72,7 @@ export const optionsCollection: INodeProperties = {
 			type: 'string',
 			default: '',
 			description:
-				'Comma-separated list of the values you want to use as query parameters. <a href="https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.postgres/#use-query-parameters">More info</a>.',
+				'Comma-separated list of the values you want to use as query parameters. <a href="https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.postgres/#use-query-parameters" target="_blank">More info</a>.',
 			hint: 'Comma-separated list of values: reference them in your query as $1, $2, $3…',
 			placeholder: 'e.g. value1,value2,value3',
 			displayOptions: {
@@ -74,8 +84,9 @@ export const optionsCollection: INodeProperties = {
 			displayName: 'Output Columns',
 			name: 'outputColumns',
 			type: 'multiOptions',
+			// eslint-disable-next-line n8n-nodes-base/node-param-description-wrong-for-dynamic-multi-options
 			description:
-				'Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
+				'Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/" target="_blank">expression</a>',
 			typeOptions: {
 				loadOptionsMethod: 'getColumnsMultiOptions',
 				loadOptionsDependsOn: ['table.value'],
@@ -202,8 +213,9 @@ export const whereFixedCollection: INodeProperties = {
 					displayName: 'Column',
 					name: 'column',
 					type: 'options',
+					// eslint-disable-next-line n8n-nodes-base/node-param-description-wrong-for-dynamic-options
 					description:
-						'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
+						'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/" target="_blank">expression</a>',
 					default: '',
 					placeholder: 'e.g. ID',
 					typeOptions: {
@@ -251,6 +263,10 @@ export const whereFixedCollection: INodeProperties = {
 							name: 'Is Null',
 							value: 'IS NULL',
 						},
+						{
+							name: 'Is Not Null',
+							value: 'IS NOT NULL',
+						},
 					],
 					default: 'equal',
 				},
@@ -258,6 +274,11 @@ export const whereFixedCollection: INodeProperties = {
 					displayName: 'Value',
 					name: 'value',
 					type: 'string',
+					displayOptions: {
+						hide: {
+							condition: ['IS NULL', 'IS NOT NULL'],
+						},
+					},
 					default: '',
 				},
 			],
@@ -284,8 +305,9 @@ export const sortFixedCollection: INodeProperties = {
 					displayName: 'Column',
 					name: 'column',
 					type: 'options',
+					// eslint-disable-next-line n8n-nodes-base/node-param-description-wrong-for-dynamic-options
 					description:
-						'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
+						'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/" target="_blank">expression</a>',
 					default: '',
 					typeOptions: {
 						loadOptionsMethod: 'getColumns',
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 c0d4eba9a4320..badede9f5312e 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
@@ -1,11 +1,14 @@
-import type { IExecuteFunctions } from 'n8n-core';
-import type { IDataObject, INodeExecutionData, INodeProperties } from 'n8n-workflow';
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import { updateDisplayOptions } from '../../../../../utils/utilities';
-
 import type {
 	PgpDatabase,
+	PostgresNodeOptions,
 	QueriesRunner,
 	QueryValues,
 	QueryWithValues,
@@ -19,6 +22,7 @@ import {
 	optionsCollection,
 	whereFixedCollection,
 } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
@@ -92,7 +96,7 @@ export async function execute(
 	this: IExecuteFunctions,
 	runQueries: QueriesRunner,
 	items: INodeExecutionData[],
-	nodeOptions: IDataObject,
+	nodeOptions: PostgresNodeOptions,
 	_db?: PgpDatabase,
 ): Promise<INodeExecutionData[]> {
 	const queries: QueryWithValues[] = [];
@@ -155,5 +159,5 @@ export async function execute(
 		queries.push(queryWithValues);
 	}
 
-	return runQueries(queries, items, nodeOptions);
+	return await runQueries(queries, items, nodeOptions);
 }
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 41aedcf156251..6d7908905e856 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
@@ -1,14 +1,22 @@
-import type { IExecuteFunctions } from 'n8n-core';
-import type { IDataObject, INodeExecutionData, INodeProperties } from 'n8n-workflow';
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import { updateDisplayOptions } from '../../../../../utils/utilities';
-
-import type { PgpDatabase, QueriesRunner, QueryWithValues } from '../../helpers/interfaces';
+import type {
+	PgpDatabase,
+	PostgresNodeOptions,
+	QueriesRunner,
+	QueryWithValues,
+} from '../../helpers/interfaces';
 
 import { replaceEmptyStringsByNulls } from '../../helpers/utils';
 
 import { optionsCollection } from '../common.descriptions';
+import { getResolvables, updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
@@ -17,21 +25,15 @@ const properties: INodeProperties[] = [
 		type: 'string',
 		default: '',
 		placeholder: 'e.g. SELECT id, name FROM product WHERE quantity > $1 AND price <= $2',
+		noDataExpression: true,
 		required: true,
 		description:
 			"The SQL query to execute. You can use n8n expressions and $1, $2, $3, etc to refer to the 'Query Parameters' set in options below.",
 		typeOptions: {
-			rows: 3,
+			editor: 'sqlEditor',
+			sqlDialect: 'PostgreSQL',
 		},
-		hint: 'Prefer using query parameters over n8n expressions to avoid SQL injection attacks',
-	},
-	{
-		displayName: `
-		To use query parameters in your SQL query, reference them as $1, $2, $3, etc in the corresponding order. <a href="https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.postgres/#use-query-parameters">More info</a>.
-		`,
-		name: 'notice',
-		type: 'notice',
-		default: '',
+		hint: 'Consider using query parameters to prevent SQL injection attacks. Add them in the options below',
 	},
 	optionsCollection,
 ];
@@ -49,7 +51,7 @@ export async function execute(
 	this: IExecuteFunctions,
 	runQueries: QueriesRunner,
 	items: INodeExecutionData[],
-	nodeOptions: IDataObject,
+	nodeOptions: PostgresNodeOptions,
 	_db?: PgpDatabase,
 ): Promise<INodeExecutionData[]> {
 	items = replaceEmptyStringsByNulls(items, nodeOptions.replaceEmptyStrings as boolean);
@@ -57,28 +59,58 @@ export async function execute(
 	const queries: QueryWithValues[] = [];
 
 	for (let i = 0; i < items.length; i++) {
-		const query = this.getNodeParameter('query', i) as string;
+		let query = this.getNodeParameter('query', i) as string;
 
-		let values: IDataObject[] = [];
+		for (const resolvable of getResolvables(query)) {
+			query = query.replace(resolvable, this.evaluateExpression(resolvable, i) as string);
+		}
+
+		let values: Array<IDataObject | string> = [];
 
 		let queryReplacement = this.getNodeParameter('options.queryReplacement', i, '');
 
-		if (typeof queryReplacement === 'string') {
-			queryReplacement = queryReplacement.split(',').map((entry) => entry.trim());
+		if (typeof queryReplacement === 'number') {
+			queryReplacement = String(queryReplacement);
 		}
 
-		if (Array.isArray(queryReplacement)) {
-			values = queryReplacement as IDataObject[];
+		if (typeof queryReplacement === 'string') {
+			const node = this.getNode();
+
+			const rawReplacements = (node.parameters.options as IDataObject)?.queryReplacement as string;
+
+			if (rawReplacements) {
+				const rawValues = rawReplacements
+					.replace(/^=+/, '')
+					.split(',')
+					.filter((entry) => entry)
+					.map((entry) => entry.trim());
+
+				for (const rawValue of rawValues) {
+					const resolvables = getResolvables(rawValue);
+
+					if (resolvables.length) {
+						for (const resolvable of resolvables) {
+							values.push(this.evaluateExpression(`${resolvable}`, i) as IDataObject);
+						}
+					} else {
+						values.push(rawValue);
+					}
+				}
+			}
 		} else {
-			throw new NodeOperationError(
-				this.getNode(),
-				'Query Replacement must be a string of comma-separated values, or an array of values',
-				{ itemIndex: i },
-			);
+			if (Array.isArray(queryReplacement)) {
+				values = queryReplacement as IDataObject[];
+			} else {
+				throw new NodeOperationError(
+					this.getNode(),
+					'Query Parameters must be a string of comma-separated values or an array of values',
+					{ itemIndex: i },
+				);
+			}
 		}
 
 		queries.push({ query, values });
 	}
 
-	return runQueries(queries, items, nodeOptions);
+	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 a30b178bffbf6..13927797c7d4c 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
@@ -1,10 +1,13 @@
-import type { IExecuteFunctions } from 'n8n-core';
-import type { IDataObject, INodeExecutionData, INodeProperties } from 'n8n-workflow';
-
-import { updateDisplayOptions } from '../../../../../utils/utilities';
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
 
 import type {
 	PgpDatabase,
+	PostgresNodeOptions,
 	QueriesRunner,
 	QueryValues,
 	QueryWithValues,
@@ -13,12 +16,15 @@ import type {
 import {
 	addReturning,
 	checkItemAgainstSchema,
+	configureTableSchemaUpdater,
 	getTableSchema,
 	prepareItem,
+	convertArraysToPostgresFormat,
 	replaceEmptyStringsByNulls,
 } from '../../helpers/utils';
 
 import { optionsCollection } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
@@ -40,10 +46,15 @@ const properties: INodeProperties[] = [
 		default: 'autoMapInputData',
 		description:
 			'Whether to map node input properties and the table data automatically or manually',
+		displayOptions: {
+			show: {
+				'@version': [2, 2.1],
+			},
+		},
 	},
 	{
 		displayName: `
-		In this mode, make sure incoming data fields are named the same as the columns in your table. If needed, use a 'Set' node before this node to change the field names.
+		In this mode, make sure incoming data fields are named the same as the columns in your table. If needed, use an 'Edit Fields' node before this node to change the field names.
 		`,
 		name: 'notice',
 		type: 'notice',
@@ -51,6 +62,7 @@ const properties: INodeProperties[] = [
 		displayOptions: {
 			show: {
 				dataMode: ['autoMapInputData'],
+				'@version': [2, 2.1],
 			},
 		},
 	},
@@ -66,6 +78,7 @@ const properties: INodeProperties[] = [
 		displayOptions: {
 			show: {
 				dataMode: ['defineBelow'],
+				'@version': [2, 2.1],
 			},
 		},
 		default: {},
@@ -79,8 +92,9 @@ const properties: INodeProperties[] = [
 						displayName: 'Column',
 						name: 'column',
 						type: 'options',
+						// eslint-disable-next-line n8n-nodes-base/node-param-description-wrong-for-dynamic-options
 						description:
-							'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
+							'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/" target="_blank">expression</a>',
 						typeOptions: {
 							loadOptionsMethod: 'getColumns',
 							loadOptionsDependsOn: ['schema.value', 'table.value'],
@@ -97,6 +111,35 @@ const properties: INodeProperties[] = [
 			},
 		],
 	},
+	{
+		displayName: 'Columns',
+		name: 'columns',
+		type: 'resourceMapper',
+		default: {
+			mappingMode: 'defineBelow',
+			value: null,
+		},
+		noDataExpression: true,
+		required: true,
+		typeOptions: {
+			loadOptionsDependsOn: ['table.value', 'operation'],
+			resourceMapper: {
+				resourceMapperMethod: 'getMappingColumns',
+				mode: 'add',
+				fieldWords: {
+					singular: 'column',
+					plural: 'columns',
+				},
+				addAllFields: true,
+				multiKeyMatch: true,
+			},
+		},
+		displayOptions: {
+			show: {
+				'@version': [{ _cnd: { gte: 2.2 } }],
+			},
+		},
+	},
 	optionsCollection,
 ];
 
@@ -116,19 +159,32 @@ export async function execute(
 	this: IExecuteFunctions,
 	runQueries: QueriesRunner,
 	items: INodeExecutionData[],
-	nodeOptions: IDataObject,
+	nodeOptions: PostgresNodeOptions,
 	db: PgpDatabase,
 ): Promise<INodeExecutionData[]> {
 	items = replaceEmptyStringsByNulls(items, nodeOptions.replaceEmptyStrings as boolean);
+	const nodeVersion = nodeOptions.nodeVersion as number;
+
+	let schema = this.getNodeParameter('schema', 0, undefined, {
+		extractValue: true,
+	}) as string;
+
+	let table = this.getNodeParameter('table', 0, undefined, {
+		extractValue: true,
+	}) as string;
+
+	const updateTableSchema = configureTableSchemaUpdater(schema, table);
+
+	let tableSchema = await getTableSchema(db, schema, table);
 
 	const queries: QueryWithValues[] = [];
 
 	for (let i = 0; i < items.length; i++) {
-		const schema = this.getNodeParameter('schema', i, undefined, {
+		schema = this.getNodeParameter('schema', i, undefined, {
 			extractValue: true,
 		}) as string;
 
-		const table = this.getNodeParameter('table', i, undefined, {
+		table = this.getNodeParameter('table', i, undefined, {
 			extractValue: true,
 		}) as string;
 
@@ -142,7 +198,10 @@ export async function execute(
 		let query = `INSERT INTO $1:name.$2:name($3:name) VALUES($3:csv)${onConflict}`;
 		let values: QueryValues = [schema, table];
 
-		const dataMode = this.getNodeParameter('dataMode', i) as string;
+		const dataMode =
+			nodeVersion < 2.2
+				? (this.getNodeParameter('dataMode', i) as string)
+				: (this.getNodeParameter('columns.mappingMode', i) as string);
 
 		let item: IDataObject = {};
 
@@ -151,13 +210,24 @@ export async function execute(
 		}
 
 		if (dataMode === 'defineBelow') {
-			const valuesToSend = (this.getNodeParameter('valuesToSend', i, []) as IDataObject)
-				.values as IDataObject[];
-
-			item = prepareItem(valuesToSend);
+			const valuesToSend =
+				nodeVersion < 2.2
+					? ((this.getNodeParameter('valuesToSend', i, []) as IDataObject).values as IDataObject[])
+					: ((this.getNodeParameter('columns.values', i, []) as IDataObject)
+							.values as IDataObject[]);
+
+			if (nodeVersion < 2.2) {
+				item = prepareItem(valuesToSend);
+			} else {
+				item = this.getNodeParameter('columns.value', i) as IDataObject;
+			}
 		}
 
-		const tableSchema = await getTableSchema(db, schema, table);
+		tableSchema = await updateTableSchema(db, tableSchema, schema, table);
+
+		if (nodeVersion >= 2.4) {
+			convertArraysToPostgresFormat(item, tableSchema, this.getNode(), i);
+		}
 
 		values.push(checkItemAgainstSchema(this.getNode(), item, tableSchema, i));
 
@@ -168,5 +238,5 @@ export async function execute(
 		queries.push({ query, values });
 	}
 
-	return runQueries(queries, items, nodeOptions);
+	return await runQueries(queries, items, nodeOptions);
 }
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 2844893dc9959..b0848f2a6b59a 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
@@ -1,10 +1,13 @@
-import type { IExecuteFunctions } from 'n8n-core';
-import type { IDataObject, INodeExecutionData, INodeProperties } from 'n8n-workflow';
-
-import { updateDisplayOptions } from '../../../../../utils/utilities';
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
 
 import type {
 	PgpDatabase,
+	PostgresNodeOptions,
 	QueriesRunner,
 	QueryValues,
 	QueryWithValues,
@@ -20,6 +23,7 @@ import {
 	sortFixedCollection,
 	whereFixedCollection,
 } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
@@ -72,7 +76,7 @@ export async function execute(
 	this: IExecuteFunctions,
 	runQueries: QueriesRunner,
 	items: INodeExecutionData[],
-	nodeOptions: IDataObject,
+	nodeOptions: PostgresNodeOptions,
 	_db?: PgpDatabase,
 ): Promise<INodeExecutionData[]> {
 	items = replaceEmptyStringsByNulls(items, nodeOptions.replaceEmptyStrings as boolean);
@@ -130,5 +134,5 @@ export async function execute(
 		queries.push(queryWithValues);
 	}
 
-	return runQueries(queries, items, nodeOptions);
+	return await runQueries(queries, items, nodeOptions);
 }
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 be474904b6df9..6c5db8477062c 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
@@ -1,10 +1,14 @@
-import type { IExecuteFunctions } from 'n8n-core';
-import type { IDataObject, INodeExecutionData, INodeProperties } from 'n8n-workflow';
-
-import { updateDisplayOptions } from '../../../../../utils/utilities';
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+import { NodeOperationError } from 'n8n-workflow';
 
 import type {
 	PgpDatabase,
+	PostgresNodeOptions,
 	QueriesRunner,
 	QueryValues,
 	QueryWithValues,
@@ -13,12 +17,16 @@ import type {
 import {
 	addReturning,
 	checkItemAgainstSchema,
+	configureTableSchemaUpdater,
+	doesRowExist,
 	getTableSchema,
 	prepareItem,
+	convertArraysToPostgresFormat,
 	replaceEmptyStringsByNulls,
 } from '../../helpers/utils';
 
 import { optionsCollection } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
@@ -40,10 +48,15 @@ const properties: INodeProperties[] = [
 		default: 'autoMapInputData',
 		description:
 			'Whether to map node input properties and the table data automatically or manually',
+		displayOptions: {
+			show: {
+				'@version': [2, 2.1],
+			},
+		},
 	},
 	{
 		displayName: `
-		In this mode, make sure incoming data fields are named the same as the columns in your table. If needed, use a 'Set' node before this node to change the field names.
+		In this mode, make sure incoming data fields are named the same as the columns in your table. If needed, use an 'Edit Fields' node before this node to change the field names.
 		`,
 		name: 'notice',
 		type: 'notice',
@@ -51,23 +64,30 @@ const properties: INodeProperties[] = [
 		displayOptions: {
 			show: {
 				dataMode: ['autoMapInputData'],
+				'@version': [2],
 			},
 		},
 	},
 	{
-		// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased, n8n-nodes-base/node-param-display-name-wrong-for-dynamic-options
+		// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-options
 		displayName: 'Column to Match On',
 		name: 'columnToMatchOn',
 		type: 'options',
 		required: true,
+		// eslint-disable-next-line n8n-nodes-base/node-param-description-wrong-for-dynamic-options
 		description:
-			'The column to compare when finding the rows to update. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			'The column to compare when finding the rows to update. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/" target="_blank">expression</a>.',
 		typeOptions: {
 			loadOptionsMethod: 'getColumns',
 			loadOptionsDependsOn: ['schema.value', 'table.value'],
 		},
 		default: '',
 		hint: 'The column that identifies the row(s) to modify',
+		displayOptions: {
+			show: {
+				'@version': [2, 2.1],
+			},
+		},
 	},
 	{
 		displayName: 'Value of Column to Match On',
@@ -79,6 +99,7 @@ const properties: INodeProperties[] = [
 		displayOptions: {
 			show: {
 				dataMode: ['defineBelow'],
+				'@version': [2, 2.1],
 			},
 		},
 	},
@@ -94,6 +115,7 @@ const properties: INodeProperties[] = [
 		displayOptions: {
 			show: {
 				dataMode: ['defineBelow'],
+				'@version': [2, 2.1],
 			},
 		},
 		default: {},
@@ -107,8 +129,9 @@ const properties: INodeProperties[] = [
 						displayName: 'Column',
 						name: 'column',
 						type: 'options',
+						// eslint-disable-next-line n8n-nodes-base/node-param-description-wrong-for-dynamic-options
 						description:
-							'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
+							'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/" target="_blank">expression</a>',
 						typeOptions: {
 							loadOptionsMethod: 'getColumnsWithoutColumnToMatchOn',
 							loadOptionsDependsOn: ['schema.value', 'table.value'],
@@ -125,6 +148,35 @@ const properties: INodeProperties[] = [
 			},
 		],
 	},
+	{
+		displayName: 'Columns',
+		name: 'columns',
+		type: 'resourceMapper',
+		noDataExpression: true,
+		default: {
+			mappingMode: 'defineBelow',
+			value: null,
+		},
+		required: true,
+		typeOptions: {
+			loadOptionsDependsOn: ['table.value', 'operation'],
+			resourceMapper: {
+				resourceMapperMethod: 'getMappingColumns',
+				mode: 'update',
+				fieldWords: {
+					singular: 'column',
+					plural: 'columns',
+				},
+				addAllFields: true,
+				multiKeyMatch: true,
+			},
+		},
+		displayOptions: {
+			show: {
+				'@version': [{ _cnd: { gte: 2.2 } }],
+			},
+		},
+	},
 	optionsCollection,
 ];
 
@@ -144,44 +196,115 @@ export async function execute(
 	this: IExecuteFunctions,
 	runQueries: QueriesRunner,
 	items: INodeExecutionData[],
-	nodeOptions: IDataObject,
+	nodeOptions: PostgresNodeOptions,
 	db: PgpDatabase,
 ): Promise<INodeExecutionData[]> {
 	items = replaceEmptyStringsByNulls(items, nodeOptions.replaceEmptyStrings as boolean);
+	const nodeVersion = nodeOptions.nodeVersion as number;
+
+	let schema = this.getNodeParameter('schema', 0, undefined, {
+		extractValue: true,
+	}) as string;
+
+	let table = this.getNodeParameter('table', 0, undefined, {
+		extractValue: true,
+	}) as string;
+
+	const updateTableSchema = configureTableSchemaUpdater(schema, table);
+
+	let tableSchema = await getTableSchema(db, schema, table);
 
 	const queries: QueryWithValues[] = [];
 
 	for (let i = 0; i < items.length; i++) {
-		const schema = this.getNodeParameter('schema', i, undefined, {
+		schema = this.getNodeParameter('schema', i, undefined, {
 			extractValue: true,
 		}) as string;
 
-		const table = this.getNodeParameter('table', i, undefined, {
+		table = this.getNodeParameter('table', i, undefined, {
 			extractValue: true,
 		}) as string;
 
-		const columnToMatchOn = this.getNodeParameter('columnToMatchOn', i) as string;
+		const columnsToMatchOn: string[] =
+			nodeVersion < 2.2
+				? [this.getNodeParameter('columnToMatchOn', i) as string]
+				: (this.getNodeParameter('columns.matchingColumns', i) as string[]);
 
-		const dataMode = this.getNodeParameter('dataMode', i) as string;
+		const dataMode =
+			nodeVersion < 2.2
+				? (this.getNodeParameter('dataMode', i) as string)
+				: (this.getNodeParameter('columns.mappingMode', i) as string);
 
 		let item: IDataObject = {};
 		let valueToMatchOn: string | IDataObject = '';
+		if (nodeVersion < 2.2) {
+			valueToMatchOn = this.getNodeParameter('valueToMatchOn', i) as string;
+		}
 
 		if (dataMode === 'autoMapInputData') {
 			item = items[i].json;
-			valueToMatchOn = item[columnToMatchOn] as string;
+			if (nodeVersion < 2.2) {
+				valueToMatchOn = item[columnsToMatchOn[0]] as string;
+			}
 		}
 
 		if (dataMode === 'defineBelow') {
-			const valuesToSend = (this.getNodeParameter('valuesToSend', i, []) as IDataObject)
-				.values as IDataObject[];
+			const valuesToSend =
+				nodeVersion < 2.2
+					? ((this.getNodeParameter('valuesToSend', i, []) as IDataObject).values as IDataObject[])
+					: ((this.getNodeParameter('columns.values', i, []) as IDataObject)
+							.values as IDataObject[]);
 
-			item = prepareItem(valuesToSend);
+			if (nodeVersion < 2.2) {
+				item = prepareItem(valuesToSend);
+				item[columnsToMatchOn[0]] = this.getNodeParameter('valueToMatchOn', i) as string;
+			} else {
+				item = this.getNodeParameter('columns.value', i) as IDataObject;
+			}
+		}
 
-			valueToMatchOn = this.getNodeParameter('valueToMatchOn', i) as string;
+		const matchValues: string[] = [];
+		if (nodeVersion < 2.2) {
+			if (!item[columnsToMatchOn[0]] && dataMode === 'autoMapInputData') {
+				throw new NodeOperationError(
+					this.getNode(),
+					"Column to match on not found in input item. Add a column to match on or set the 'Data Mode' to 'Define Below' to define the value to match on.",
+				);
+			}
+			matchValues.push(valueToMatchOn);
+			matchValues.push(columnsToMatchOn[0]);
+		} else {
+			columnsToMatchOn.forEach((column) => {
+				matchValues.push(column);
+				matchValues.push(item[column] as string);
+			});
+			const rowExists = await doesRowExist(db, schema, table, matchValues);
+			if (!rowExists) {
+				const descriptionValues: string[] = [];
+				matchValues.forEach((_, index) => {
+					if (index % 2 === 0) {
+						descriptionValues.push(`${matchValues[index]}=${matchValues[index + 1]}`);
+					}
+				});
+
+				throw new NodeOperationError(
+					this.getNode(),
+					"The row you are trying to update doesn't exist",
+					{
+						description: `No rows matching the provided values (${descriptionValues.join(
+							', ',
+						)}) were found in the table "${table}".`,
+						itemIndex: i,
+					},
+				);
+			}
 		}
 
-		const tableSchema = await getTableSchema(db, schema, table);
+		tableSchema = await updateTableSchema(db, tableSchema, schema, table);
+
+		if (nodeVersion >= 2.4) {
+			convertArraysToPostgresFormat(item, tableSchema, this.getNode(), i);
+		}
 
 		item = checkItemAgainstSchema(this.getNode(), item, tableSchema, i);
 
@@ -189,11 +312,29 @@ export async function execute(
 
 		let valuesLength = values.length + 1;
 
-		const condition = `$${valuesLength}:name = $${valuesLength + 1}`;
-		valuesLength = valuesLength + 2;
-		values.push(columnToMatchOn, valueToMatchOn);
+		let condition = '';
+		if (nodeVersion < 2.2) {
+			condition = `$${valuesLength}:name = $${valuesLength + 1}`;
+			valuesLength = valuesLength + 2;
+			values.push(columnsToMatchOn[0], valueToMatchOn);
+		} else {
+			const conditions: string[] = [];
+			for (const column of columnsToMatchOn) {
+				conditions.push(`$${valuesLength}:name = $${valuesLength + 1}`);
+				valuesLength = valuesLength + 2;
+				values.push(column, item[column] as string);
+			}
+			condition = conditions.join(' AND ');
+		}
 
-		const updateColumns = Object.keys(item).filter((column) => column !== columnToMatchOn);
+		const updateColumns = Object.keys(item).filter((column) => !columnsToMatchOn.includes(column));
+
+		if (!Object.keys(updateColumns).length) {
+			throw new NodeOperationError(
+				this.getNode(),
+				"Add values to update to the input item or set the 'Data Mode' to 'Define Below' to define the values to update.",
+			);
+		}
 
 		const updates: string[] = [];
 
@@ -212,5 +353,6 @@ export async function execute(
 		queries.push({ query, values });
 	}
 
-	return runQueries(queries, items, nodeOptions);
+	const results = await runQueries(queries, items, nodeOptions);
+	return results;
 }
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 972f171d9cd0f..47a0a944931e5 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
@@ -1,10 +1,14 @@
-import type { IExecuteFunctions } from 'n8n-core';
-import type { IDataObject, INodeExecutionData, INodeProperties } from 'n8n-workflow';
-
-import { updateDisplayOptions } from '../../../../../utils/utilities';
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+import { NodeOperationError } from 'n8n-workflow';
 
 import type {
 	PgpDatabase,
+	PostgresNodeOptions,
 	QueriesRunner,
 	QueryValues,
 	QueryWithValues,
@@ -16,9 +20,12 @@ import {
 	getTableSchema,
 	prepareItem,
 	replaceEmptyStringsByNulls,
+	configureTableSchemaUpdater,
+	convertArraysToPostgresFormat,
 } from '../../helpers/utils';
 
 import { optionsCollection } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
@@ -40,10 +47,15 @@ const properties: INodeProperties[] = [
 		default: 'autoMapInputData',
 		description:
 			'Whether to map node input properties and the table data automatically or manually',
+		displayOptions: {
+			show: {
+				'@version': [2, 2.1],
+			},
+		},
 	},
 	{
 		displayName: `
-		In this mode, make sure incoming data fields are named the same as the columns in your table. If needed, use a 'Set' node before this node to change the field names.
+		In this mode, make sure incoming data fields are named the same as the columns in your table. If needed, use an 'Edit Fields' node before this node to change the field names.
 		`,
 		name: 'notice',
 		type: 'notice',
@@ -51,26 +63,33 @@ const properties: INodeProperties[] = [
 		displayOptions: {
 			show: {
 				dataMode: ['autoMapInputData'],
+				'@version': [2, 2.1],
 			},
 		},
 	},
 	{
-		// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased, n8n-nodes-base/node-param-display-name-wrong-for-dynamic-options
-		displayName: 'Column to Match On',
+		// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-options
+		displayName: 'Unique Column',
 		name: 'columnToMatchOn',
 		type: 'options',
 		required: true,
+		// eslint-disable-next-line n8n-nodes-base/node-param-description-wrong-for-dynamic-options
 		description:
-			'The column to compare when finding the rows to update. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			'The column to compare when finding the rows to update. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/" target="_blank">expression</a>.',
 		typeOptions: {
 			loadOptionsMethod: 'getColumns',
 			loadOptionsDependsOn: ['schema.value', 'table.value'],
 		},
 		default: '',
 		hint: "Used to find the correct row(s) to update. Doesn't get changed. Has to be unique.",
+		displayOptions: {
+			show: {
+				'@version': [2, 2.1],
+			},
+		},
 	},
 	{
-		displayName: 'Value of Column to Match On',
+		displayName: 'Value of Unique Column',
 		name: 'valueToMatchOn',
 		type: 'string',
 		default: '',
@@ -79,6 +98,7 @@ const properties: INodeProperties[] = [
 		displayOptions: {
 			show: {
 				dataMode: ['defineBelow'],
+				'@version': [2, 2.1],
 			},
 		},
 	},
@@ -94,6 +114,7 @@ const properties: INodeProperties[] = [
 		displayOptions: {
 			show: {
 				dataMode: ['defineBelow'],
+				'@version': [2, 2.1],
 			},
 		},
 		default: {},
@@ -107,8 +128,9 @@ const properties: INodeProperties[] = [
 						displayName: 'Column',
 						name: 'column',
 						type: 'options',
+						// eslint-disable-next-line n8n-nodes-base/node-param-description-wrong-for-dynamic-options
 						description:
-							'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
+							'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/" target="_blank">expression</a>',
 						typeOptions: {
 							loadOptionsMethod: 'getColumnsWithoutColumnToMatchOn',
 							loadOptionsDependsOn: ['schema.value', 'table.value'],
@@ -125,6 +147,35 @@ const properties: INodeProperties[] = [
 			},
 		],
 	},
+	{
+		displayName: 'Columns',
+		name: 'columns',
+		type: 'resourceMapper',
+		noDataExpression: true,
+		default: {
+			mappingMode: 'defineBelow',
+			value: null,
+		},
+		required: true,
+		typeOptions: {
+			loadOptionsDependsOn: ['table.value', 'operation'],
+			resourceMapper: {
+				resourceMapperMethod: 'getMappingColumns',
+				mode: 'upsert',
+				fieldWords: {
+					singular: 'column',
+					plural: 'columns',
+				},
+				addAllFields: true,
+				multiKeyMatch: true,
+			},
+		},
+		displayOptions: {
+			show: {
+				'@version': [{ _cnd: { gte: 2.2 } }],
+			},
+		},
+	},
 	optionsCollection,
 ];
 
@@ -144,25 +195,44 @@ export async function execute(
 	this: IExecuteFunctions,
 	runQueries: QueriesRunner,
 	items: INodeExecutionData[],
-	nodeOptions: IDataObject,
+	nodeOptions: PostgresNodeOptions,
 	db: PgpDatabase,
 ): Promise<INodeExecutionData[]> {
 	items = replaceEmptyStringsByNulls(items, nodeOptions.replaceEmptyStrings as boolean);
+	const nodeVersion = nodeOptions.nodeVersion as number;
+
+	let schema = this.getNodeParameter('schema', 0, undefined, {
+		extractValue: true,
+	}) as string;
+
+	let table = this.getNodeParameter('table', 0, undefined, {
+		extractValue: true,
+	}) as string;
+
+	const updateTableSchema = configureTableSchemaUpdater(schema, table);
+
+	let tableSchema = await getTableSchema(db, schema, table);
 
 	const queries: QueryWithValues[] = [];
 
 	for (let i = 0; i < items.length; i++) {
-		const schema = this.getNodeParameter('schema', i, undefined, {
+		schema = this.getNodeParameter('schema', i, undefined, {
 			extractValue: true,
 		}) as string;
 
-		const table = this.getNodeParameter('table', i, undefined, {
+		table = this.getNodeParameter('table', i, undefined, {
 			extractValue: true,
 		}) as string;
 
-		const columnToMatchOn = this.getNodeParameter('columnToMatchOn', i) as string;
+		const columnsToMatchOn: string[] =
+			nodeVersion < 2.2
+				? [this.getNodeParameter('columnToMatchOn', i) as string]
+				: (this.getNodeParameter('columns.matchingColumns', i) as string[]);
 
-		const dataMode = this.getNodeParameter('dataMode', i) as string;
+		const dataMode =
+			nodeVersion < 2.2
+				? (this.getNodeParameter('dataMode', i) as string)
+				: (this.getNodeParameter('columns.mappingMode', i) as string);
 
 		let item: IDataObject = {};
 
@@ -171,31 +241,58 @@ export async function execute(
 		}
 
 		if (dataMode === 'defineBelow') {
-			const valuesToSend = (this.getNodeParameter('valuesToSend', i, []) as IDataObject)
-				.values as IDataObject[];
+			const valuesToSend =
+				nodeVersion < 2.2
+					? ((this.getNodeParameter('valuesToSend', i, []) as IDataObject).values as IDataObject[])
+					: ((this.getNodeParameter('columns.values', i, []) as IDataObject)
+							.values as IDataObject[]);
+
+			if (nodeVersion < 2.2) {
+				item = prepareItem(valuesToSend);
+				item[columnsToMatchOn[0]] = this.getNodeParameter('valueToMatchOn', i) as string;
+			} else {
+				item = this.getNodeParameter('columns.value', i) as IDataObject;
+			}
+		}
 
-			item = prepareItem(valuesToSend);
+		if (!item[columnsToMatchOn[0]]) {
+			throw new NodeOperationError(
+				this.getNode(),
+				"Column to match on not found in input item. Add a column to match on or set the 'Data Mode' to 'Define Below' to define the value to match on.",
+			);
+		}
 
-			item[columnToMatchOn] = this.getNodeParameter('valueToMatchOn', i) as string;
+		if (item[columnsToMatchOn[0]] && Object.keys(item).length === 1) {
+			throw new NodeOperationError(
+				this.getNode(),
+				"Add values to update or insert to the input item or set the 'Data Mode' to 'Define Below' to define the values to insert or update.",
+			);
 		}
 
-		const tableSchema = await getTableSchema(db, schema, table);
+		tableSchema = await updateTableSchema(db, tableSchema, schema, table);
+
+		if (nodeVersion >= 2.4) {
+			convertArraysToPostgresFormat(item, tableSchema, this.getNode(), i);
+		}
 
 		item = checkItemAgainstSchema(this.getNode(), item, tableSchema, i);
 
 		let values: QueryValues = [schema, table];
 
 		let valuesLength = values.length + 1;
-		const onConflict = ` ON CONFLICT ($${valuesLength}:name) DO UPDATE `;
-		valuesLength = valuesLength + 1;
-		values.push(columnToMatchOn);
+		const conflictColumns: string[] = [];
+		columnsToMatchOn.forEach((column) => {
+			conflictColumns.push(`$${valuesLength}:name`);
+			valuesLength = valuesLength + 1;
+			values.push(column);
+		});
+		const onConflict = ` ON CONFLICT (${conflictColumns.join(',')}) DO UPDATE `;
 
 		const insertQuery = `INSERT INTO $1:name.$2:name($${valuesLength}:name) VALUES($${valuesLength}:csv)${onConflict}`;
 		valuesLength = valuesLength + 1;
 		values.push(item);
 
-		const updateColumns = Object.keys(item).filter((column) => column !== columnToMatchOn);
-
+		const updateColumns = Object.keys(item).filter((column) => !columnsToMatchOn.includes(column));
 		const updates: string[] = [];
 
 		for (const column of updateColumns) {
@@ -213,5 +310,5 @@ export async function execute(
 		queries.push({ query, values });
 	}
 
-	return runQueries(queries, items, nodeOptions);
+	return await runQueries(queries, items, nodeOptions);
 }
diff --git a/packages/nodes-base/nodes/Postgres/v2/actions/router.ts b/packages/nodes-base/nodes/Postgres/v2/actions/router.ts
index 68289d5a87664..47cc0a3f40c85 100644
--- a/packages/nodes-base/nodes/Postgres/v2/actions/router.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/actions/router.ts
@@ -1,12 +1,12 @@
 import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
+import { configurePostgres } from '../transport';
+import { configureQueryRunner } from '../helpers/utils';
 import type { PostgresType } from './node.type';
 
 import * as database from './database/Database.resource';
-import { Connections } from '../transport';
-import { configureQueryRunner } from '../helpers/utils';
-import type { ConnectionsData } from '../helpers/interfaces';
+import type { PostgresNodeCredentials, PostgresNodeOptions } from '../helpers/interfaces';
 
 export async function router(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 	let returnData: INodeExecutionData[] = [];
@@ -15,18 +15,16 @@ export async function router(this: IExecuteFunctions): Promise<INodeExecutionDat
 	const resource = this.getNodeParameter<PostgresType>('resource', 0);
 	const operation = this.getNodeParameter('operation', 0);
 
-	const credentials = await this.getCredentials('postgres');
-	const options = this.getNodeParameter('options', 0, {});
+	const credentials = (await this.getCredentials('postgres')) as PostgresNodeCredentials;
+	const options = this.getNodeParameter('options', 0, {}) as PostgresNodeOptions;
+	options.nodeVersion = this.getNode().typeVersion;
+	options.operation = operation;
 
-	const { db, pgp, sshClient } = (await Connections.getInstance(
-		credentials,
-		options,
-		true,
-	)) as ConnectionsData;
+	const { db, pgp, sshClient } = await configurePostgres(credentials, options);
 
-	const runQueries = configureQueryRunner(
+	const runQueries = configureQueryRunner.call(
+		this,
 		this.getNode(),
-		this.helpers.constructExecutionMetaData,
 		this.continueOnFail(),
 		pgp,
 		db,
@@ -60,8 +58,9 @@ export async function router(this: IExecuteFunctions): Promise<INodeExecutionDat
 		if (sshClient) {
 			sshClient.end();
 		}
-		pgp.end();
+
+		if (!db.$pool.ending) await db.$pool.end();
 	}
 
-	return this.prepareOutputData(returnData);
+	return [returnData];
 }
diff --git a/packages/nodes-base/nodes/Postgres/v2/actions/versionDescription.ts b/packages/nodes-base/nodes/Postgres/v2/actions/versionDescription.ts
index 031f178d2e6e6..1687accf1cde4 100644
--- a/packages/nodes-base/nodes/Postgres/v2/actions/versionDescription.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/actions/versionDescription.ts
@@ -8,7 +8,7 @@ export const versionDescription: INodeTypeDescription = {
 	name: 'postgres',
 	icon: 'file:postgres.svg',
 	group: ['input'],
-	version: 2,
+	version: [2, 2.1, 2.2, 2.3, 2.4],
 	subtitle: '={{ $parameter["operation"] }}',
 	description: 'Get, add and update data in Postgres',
 	defaults: {
diff --git a/packages/nodes-base/nodes/Postgres/v2/helpers/interfaces.ts b/packages/nodes-base/nodes/Postgres/v2/helpers/interfaces.ts
index e96cae5b1e34b..223996db6cdee 100644
--- a/packages/nodes-base/nodes/Postgres/v2/helpers/interfaces.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/helpers/interfaces.ts
@@ -1,9 +1,4 @@
-import type {
-	IDataObject,
-	INodeExecutionData,
-	IPairedItemData,
-	NodeExecutionWithMetadata,
-} from 'n8n-workflow';
+import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
 import type pgPromise from 'pg-promise';
 import type pg from 'pg-promise/typescript/pg-subset';
 import type { Client } from 'ssh2';
@@ -16,22 +11,60 @@ export type QueryWithValues = { query: string; values?: QueryValues };
 
 export type WhereClause = { column: string; condition: string; value: string | number };
 export type SortRule = { column: string; direction: string };
-export type ColumnInfo = { column_name: string; data_type: string; is_nullable: string };
+export type ColumnInfo = {
+	column_name: string;
+	data_type: string;
+	is_nullable: string;
+	udt_name?: string;
+	column_default?: string | null;
+	is_generated?: 'ALWAYS' | 'NEVER';
+	identity_generation?: 'ALWAYS' | 'NEVER';
+};
+export type EnumInfo = {
+	typname: string;
+	enumlabel: string;
+};
 
 export type PgpClient = pgPromise.IMain<{}, pg.IClient>;
 export type PgpDatabase = pgPromise.IDatabase<{}, pg.IClient>;
 export type PgpConnectionParameters = pg.IConnectionParameters<pg.IClient>;
 export type ConnectionsData = { db: PgpDatabase; pgp: PgpClient; sshClient?: Client };
 
-export type ConstructExecutionMetaData = (
-	inputData: INodeExecutionData[],
-	options: {
-		itemData: IPairedItemData | IPairedItemData[];
-	},
-) => NodeExecutionWithMetadata[];
-
 export type QueriesRunner = (
 	queries: QueryWithValues[],
 	items: INodeExecutionData[],
 	options: IDataObject,
 ) => Promise<INodeExecutionData[]>;
+
+export type PostgresNodeOptions = {
+	nodeVersion?: number;
+	operation?: string;
+	cascade?: boolean;
+	connectionTimeout?: number;
+	delayClosingIdleConnection?: number;
+	queryBatching?: QueryMode;
+	queryReplacement?: string;
+	outputColumns?: string[];
+	largeNumbersOutput?: 'numbers' | 'text';
+	skipOnConflict?: boolean;
+	replaceEmptyStrings?: boolean;
+};
+
+export type PostgresNodeCredentials = {
+	sshAuthenticateWith: 'password' | 'privateKey';
+	host: string;
+	port: number;
+	database: string;
+	user: string;
+	password: string;
+	allowUnauthorizedCerts?: boolean;
+	ssl?: 'disable' | 'allow' | 'require' | 'verify' | 'verify-full';
+	sshTunnel?: boolean;
+	sshHost?: string;
+	sshPort?: number;
+	sshPostgresPort?: number;
+	sshUser?: string;
+	sshPassword?: string;
+	privateKey?: string;
+	passphrase?: string;
+};
diff --git a/packages/nodes-base/nodes/Postgres/v2/helpers/utils.ts b/packages/nodes-base/nodes/Postgres/v2/helpers/utils.ts
index 152c4a344f67c..5f01e6b6a6690 100644
--- a/packages/nodes-base/nodes/Postgres/v2/helpers/utils.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/helpers/utils.ts
@@ -1,9 +1,16 @@
-import type { IDataObject, INode, INodeExecutionData } from 'n8n-workflow';
-import { NodeOperationError } from 'n8n-workflow';
-
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INode,
+	INodeExecutionData,
+	INodePropertyOptions,
+} from 'n8n-workflow';
+import { NodeOperationError, jsonParse } from 'n8n-workflow';
+
+import { generatePairedItemData } from '../../../../utils/utilities';
 import type {
 	ColumnInfo,
-	ConstructExecutionMetaData,
+	EnumInfo,
 	PgpClient,
 	PgpDatabase,
 	QueryMode,
@@ -140,7 +147,7 @@ export function addWhereClauses(
 		replacementIndex = replacementIndex + 1;
 
 		let valueReplacement = '';
-		if (clause.condition !== 'IS NULL') {
+		if (clause.condition !== 'IS NULL' && clause.condition !== 'IS NOT NULL') {
 			valueReplacement = ` $${replacementIndex}`;
 			values.push(clause.value);
 			replacementIndex = replacementIndex + 1;
@@ -193,16 +200,26 @@ export function addReturning(
 	return [`${query} RETURNING $${replacementIndex}:name`, [...replacements, outputColumns]];
 }
 
-export const configureQueryRunner =
-	(
-		node: INode,
-		constructExecutionMetaData: ConstructExecutionMetaData,
-		continueOnFail: boolean,
-		pgp: PgpClient,
-		db: PgpDatabase,
-	) =>
-	async (queries: QueryWithValues[], items: INodeExecutionData[], options: IDataObject) => {
+const isSelectQuery = (query: string) => {
+	return query
+		.replace(/\/\*.*?\*\//g, '') // remove multiline comments
+		.replace(/\n/g, '')
+		.split(';')
+		.filter((statement) => statement && !statement.startsWith('--')) // remove comments and empty statements
+		.every((statement) => statement.trim().toLowerCase().startsWith('select'));
+};
+
+export function configureQueryRunner(
+	this: IExecuteFunctions,
+	node: INode,
+	continueOnFail: boolean,
+	pgp: PgpClient,
+	db: PgpDatabase,
+) {
+	return async (queries: QueryWithValues[], items: INodeExecutionData[], options: IDataObject) => {
 		let returnData: INodeExecutionData[] = [];
+		const emptyReturnData: INodeExecutionData[] =
+			options.operation === 'select' ? [] : [{ json: { success: true } }];
 
 		const queryBatching = (options.queryBatching as QueryMode) || 'single';
 
@@ -210,12 +227,26 @@ export const configureQueryRunner =
 			try {
 				returnData = (await db.multi(pgp.helpers.concat(queries)))
 					.map((result, i) => {
-						return constructExecutionMetaData(wrapData(result as IDataObject[]), {
+						return this.helpers.constructExecutionMetaData(wrapData(result as IDataObject[]), {
 							itemData: { item: i },
 						});
 					})
 					.flat();
-				returnData = returnData.length ? returnData : [{ json: { success: true } }];
+
+				if (!returnData.length) {
+					const pairedItem = generatePairedItemData(queries.length);
+
+					if ((options?.nodeVersion as number) < 2.3) {
+						if (emptyReturnData.length) {
+							emptyReturnData[0].pairedItem = pairedItem;
+						}
+						returnData = emptyReturnData;
+					} else {
+						returnData = queries.every((query) => isSelectQuery(query.query))
+							? []
+							: [{ json: { success: true }, pairedItem }];
+					}
+				}
 			} catch (err) {
 				const error = parsePostgresError(node, err, queries);
 				if (!continueOnFail) throw error;
@@ -236,13 +267,26 @@ export const configureQueryRunner =
 				const result: INodeExecutionData[] = [];
 				for (let i = 0; i < queries.length; i++) {
 					try {
-						const transactionResult: IDataObject[] = await transaction.any(
-							queries[i].query,
-							queries[i].values,
-						);
-
-						const executionData = constructExecutionMetaData(
-							wrapData(transactionResult.length ? transactionResult : [{ success: true }]),
+						const query = queries[i].query;
+						const values = queries[i].values;
+
+						let transactionResults;
+						if ((options?.nodeVersion as number) < 2.3) {
+							transactionResults = await transaction.any(query, values);
+						} else {
+							transactionResults = (await transaction.multi(query, values)).flat();
+						}
+
+						if (!transactionResults.length) {
+							if ((options?.nodeVersion as number) < 2.3) {
+								transactionResults = emptyReturnData;
+							} else {
+								transactionResults = isSelectQuery(query) ? [] : [{ success: true }];
+							}
+						}
+
+						const executionData = this.helpers.constructExecutionMetaData(
+							wrapData(transactionResults),
 							{ itemData: { item: i } },
 						);
 
@@ -259,17 +303,30 @@ export const configureQueryRunner =
 		}
 
 		if (queryBatching === 'independently') {
-			returnData = await db.task(async (t) => {
+			returnData = await db.task(async (task) => {
 				const result: INodeExecutionData[] = [];
 				for (let i = 0; i < queries.length; i++) {
 					try {
-						const transactionResult: IDataObject[] = await t.any(
-							queries[i].query,
-							queries[i].values,
-						);
-
-						const executionData = constructExecutionMetaData(
-							wrapData(transactionResult.length ? transactionResult : [{ success: true }]),
+						const query = queries[i].query;
+						const values = queries[i].values;
+
+						let transactionResults;
+						if ((options?.nodeVersion as number) < 2.3) {
+							transactionResults = await task.any(query, values);
+						} else {
+							transactionResults = (await task.multi(query, values)).flat();
+						}
+
+						if (!transactionResults.length) {
+							if ((options?.nodeVersion as number) < 2.3) {
+								transactionResults = emptyReturnData;
+							} else {
+								transactionResults = isSelectQuery(query) ? [] : [{ success: true }];
+							}
+						}
+
+						const executionData = this.helpers.constructExecutionMetaData(
+							wrapData(transactionResults),
 							{ itemData: { item: i } },
 						);
 
@@ -286,6 +343,7 @@ export const configureQueryRunner =
 
 		return returnData;
 	};
+}
 
 export function replaceEmptyStringsByNulls(
 	items: INodeExecutionData[],
@@ -318,19 +376,100 @@ export function prepareItem(values: IDataObject[]) {
 	return item;
 }
 
+export async function columnFeatureSupport(
+	db: PgpDatabase,
+): Promise<{ identity_generation: boolean; is_generated: boolean }> {
+	const result = await db.any(
+		`SELECT EXISTS (
+			SELECT 1 FROM information_schema.columns WHERE table_name = 'columns' AND table_schema = 'information_schema' AND column_name = 'is_generated'
+		) as is_generated,
+		EXISTS (
+			SELECT 1 FROM information_schema.columns WHERE table_name = 'columns' AND table_schema = 'information_schema' AND column_name = 'identity_generation'
+		) as identity_generation;`,
+	);
+
+	return result[0];
+}
+
 export async function getTableSchema(
 	db: PgpDatabase,
 	schema: string,
 	table: string,
+	options?: { getColumnsForResourceMapper?: boolean },
 ): Promise<ColumnInfo[]> {
+	const select = ['column_name', 'data_type', 'is_nullable', 'udt_name', 'column_default'];
+
+	if (options?.getColumnsForResourceMapper) {
+		// Check if columns exist before querying (identity_generation was added in v10, is_generated in v12)
+		const supported = await columnFeatureSupport(db);
+
+		if (supported.identity_generation) {
+			select.push('identity_generation');
+		}
+
+		if (supported.is_generated) {
+			select.push('is_generated');
+		}
+	}
+
+	const selectString = select.join(', ');
 	const columns = await db.any(
-		'SELECT column_name, data_type, is_nullable FROM information_schema.columns WHERE table_schema = $1 AND table_name = $2',
+		`SELECT ${selectString} FROM information_schema.columns WHERE table_schema = $1 AND table_name = $2`,
 		[schema, table],
 	);
 
 	return columns;
 }
 
+export async function uniqueColumns(db: PgpDatabase, table: string, schema = 'public') {
+	// Using the modified query from https://wiki.postgresql.org/wiki/Retrieve_primary_key_columns
+	// `quote_ident` - properly quote and escape an identifier
+	// `::regclass` - cast a string to a regclass (internal type for object names)
+	const unique = await db.any(
+		`
+		SELECT DISTINCT a.attname
+			FROM pg_index i JOIN pg_attribute a ON a.attrelid = i.indrelid AND a.attnum = ANY(i.indkey)
+		WHERE i.indrelid = (quote_ident($1) || '.' || quote_ident($2))::regclass
+			AND (i.indisprimary OR i.indisunique);
+		`,
+		[schema, table],
+	);
+	return unique as IDataObject[];
+}
+
+export async function getEnums(db: PgpDatabase): Promise<EnumInfo[]> {
+	const enumsData = await db.any(
+		'SELECT pg_type.typname, pg_enum.enumlabel FROM pg_type JOIN pg_enum ON pg_enum.enumtypid = pg_type.oid;',
+	);
+	return enumsData as EnumInfo[];
+}
+
+export function getEnumValues(enumInfo: EnumInfo[], enumName: string): INodePropertyOptions[] {
+	return enumInfo.reduce((acc, current) => {
+		if (current.typname === enumName) {
+			acc.push({ name: current.enumlabel, value: current.enumlabel });
+		}
+		return acc;
+	}, [] as INodePropertyOptions[]);
+}
+
+export async function doesRowExist(
+	db: PgpDatabase,
+	schema: string,
+	table: string,
+	values: string[],
+): Promise<boolean> {
+	const where = [];
+	for (let i = 3; i < 3 + values.length; i += 2) {
+		where.push(`$${i}:name=$${i + 1}`);
+	}
+	const exists = await db.any(
+		`SELECT EXISTS(SELECT 1 FROM $1:name.$2:name WHERE ${where.join(' AND ')})`,
+		[schema, table, ...values],
+	);
+	return exists[0].exists;
+}
+
 export function checkItemAgainstSchema(
 	node: INode,
 	item: IDataObject,
@@ -358,3 +497,76 @@ export function checkItemAgainstSchema(
 
 	return item;
 }
+
+export const configureTableSchemaUpdater = (initialSchema: string, initialTable: string) => {
+	let currentSchema = initialSchema;
+	let currentTable = initialTable;
+	return async (db: PgpDatabase, tableSchema: ColumnInfo[], schema: string, table: string) => {
+		if (currentSchema !== schema || currentTable !== table) {
+			currentSchema = schema;
+			currentTable = table;
+			tableSchema = await getTableSchema(db, schema, table);
+		}
+		return tableSchema;
+	};
+};
+
+/**
+ * If postgress column type is array we need to convert it to fornmat that postgres understands, original object data would be modified
+ * @param data the object with keys representing column names and values
+ * @param schema table schema
+ * @param node INode
+ * @param itemIndex the index of the current item
+ */
+export const convertArraysToPostgresFormat = (
+	data: IDataObject,
+	schema: ColumnInfo[],
+	node: INode,
+	itemIndex = 0,
+) => {
+	for (const columnInfo of schema) {
+		//in case column type is array we need to convert it to fornmat that postgres understands
+		if (columnInfo.data_type.toUpperCase() === 'ARRAY') {
+			let columnValue = data[columnInfo.column_name];
+
+			if (typeof columnValue === 'string') {
+				columnValue = jsonParse(columnValue);
+			}
+
+			if (Array.isArray(columnValue)) {
+				const arrayEntries = columnValue.map((entry) => {
+					if (typeof entry === 'number') {
+						return entry;
+					}
+
+					if (typeof entry === 'boolean') {
+						entry = String(entry);
+					}
+
+					if (typeof entry === 'object') {
+						entry = JSON.stringify(entry);
+					}
+
+					if (typeof entry === 'string') {
+						return `"${entry.replace(/"/g, '\\"')}"`; //escape double quotes
+					}
+
+					return entry;
+				});
+
+				//wrap in {} instead of [] as postgres does and join with ,
+				data[columnInfo.column_name] = `{${arrayEntries.join(',')}}`;
+			} else {
+				if (columnInfo.is_nullable === 'NO') {
+					throw new NodeOperationError(
+						node,
+						`Column '${columnInfo.column_name}' has to be an array`,
+						{
+							itemIndex,
+						},
+					);
+				}
+			}
+		}
+	}
+};
diff --git a/packages/nodes-base/nodes/Postgres/v2/methods/credentialTest.ts b/packages/nodes-base/nodes/Postgres/v2/methods/credentialTest.ts
index 614f73285975e..1b4d588fa3b35 100644
--- a/packages/nodes-base/nodes/Postgres/v2/methods/credentialTest.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/methods/credentialTest.ts
@@ -1,31 +1,25 @@
 import type {
 	ICredentialsDecrypted,
 	ICredentialTestFunctions,
-	IDataObject,
 	INodeCredentialTestResult,
 } from 'n8n-workflow';
 
-import { Connections } from '../transport';
-
 import { Client } from 'ssh2';
-import type { ConnectionsData, PgpClient } from '../helpers/interfaces';
+import { configurePostgres } from '../transport';
+
+import type { PgpClient, PostgresNodeCredentials } from '../helpers/interfaces';
 
 export async function postgresConnectionTest(
 	this: ICredentialTestFunctions,
 	credential: ICredentialsDecrypted,
 ): Promise<INodeCredentialTestResult> {
-	const credentials = credential.data as IDataObject;
+	const credentials = credential.data as PostgresNodeCredentials;
 
 	let sshClientCreated: Client | undefined = new Client();
 	let pgpClientCreated: PgpClient | undefined;
 
 	try {
-		const { db, pgp, sshClient } = (await Connections.getInstance(
-			credentials,
-			{},
-			true,
-			sshClientCreated,
-		)) as ConnectionsData;
+		const { db, pgp, sshClient } = await configurePostgres(credentials, {}, sshClientCreated);
 
 		sshClientCreated = sshClient;
 		pgpClientCreated = pgp;
@@ -57,9 +51,6 @@ export async function postgresConnectionTest(
 		if (pgpClientCreated) {
 			pgpClientCreated.end();
 		}
-
-		//set the connection instance to null so that it can be recreated
-		await Connections.getInstance({}, {}, false, undefined, true);
 	}
 	return {
 		status: 'OK',
diff --git a/packages/nodes-base/nodes/Postgres/v2/methods/index.ts b/packages/nodes-base/nodes/Postgres/v2/methods/index.ts
index 8d2d0278ddb4f..5bfbb18ac060b 100644
--- a/packages/nodes-base/nodes/Postgres/v2/methods/index.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/methods/index.ts
@@ -1,3 +1,4 @@
 export * as credentialTest from './credentialTest';
 export * as listSearch from './listSearch';
 export * as loadOptions from './loadOptions';
+export * as resourceMapping from './resourceMapping';
diff --git a/packages/nodes-base/nodes/Postgres/v2/methods/listSearch.ts b/packages/nodes-base/nodes/Postgres/v2/methods/listSearch.ts
index 8a8b35ab39cf9..68c5c3d9ef89c 100644
--- a/packages/nodes-base/nodes/Postgres/v2/methods/listSearch.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/methods/listSearch.ts
@@ -1,11 +1,13 @@
 import type { ILoadOptionsFunctions, INodeListSearchResult } from 'n8n-workflow';
-import type { ConnectionsData } from '../helpers/interfaces';
-import { Connections } from '../transport';
+
+import { configurePostgres } from '../transport';
+import type { PostgresNodeCredentials } from '../helpers/interfaces';
 
 export async function schemaSearch(this: ILoadOptionsFunctions): Promise<INodeListSearchResult> {
-	const credentials = await this.getCredentials('postgres');
+	const credentials = (await this.getCredentials('postgres')) as PostgresNodeCredentials;
+	const options = { nodeVersion: this.getNode().typeVersion };
 
-	const { db } = (await Connections.getInstance(credentials)) as ConnectionsData;
+	const { db, sshClient } = await configurePostgres(credentials, options);
 
 	try {
 		const response = await db.any('SELECT schema_name FROM information_schema.schemata');
@@ -18,12 +20,18 @@ export async function schemaSearch(this: ILoadOptionsFunctions): Promise<INodeLi
 		};
 	} catch (error) {
 		throw error;
+	} finally {
+		if (sshClient) {
+			sshClient.end();
+		}
+		if (!db.$pool.ending) await db.$pool.end();
 	}
 }
 export async function tableSearch(this: ILoadOptionsFunctions): Promise<INodeListSearchResult> {
-	const credentials = await this.getCredentials('postgres');
+	const credentials = (await this.getCredentials('postgres')) as PostgresNodeCredentials;
+	const options = { nodeVersion: this.getNode().typeVersion };
 
-	const { db } = (await Connections.getInstance(credentials)) as ConnectionsData;
+	const { db, sshClient } = await configurePostgres(credentials, options);
 
 	const schema = this.getNodeParameter('schema', 0, {
 		extractValue: true,
@@ -43,5 +51,10 @@ export async function tableSearch(this: ILoadOptionsFunctions): Promise<INodeLis
 		};
 	} catch (error) {
 		throw error;
+	} finally {
+		if (sshClient) {
+			sshClient.end();
+		}
+		if (!db.$pool.ending) await db.$pool.end();
 	}
 }
diff --git a/packages/nodes-base/nodes/Postgres/v2/methods/loadOptions.ts b/packages/nodes-base/nodes/Postgres/v2/methods/loadOptions.ts
index acc6fb92472f3..e7ac1ac9453ee 100644
--- a/packages/nodes-base/nodes/Postgres/v2/methods/loadOptions.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/methods/loadOptions.ts
@@ -1,12 +1,14 @@
 import type { ILoadOptionsFunctions, INodePropertyOptions } from 'n8n-workflow';
-import type { ConnectionsData } from '../helpers/interfaces';
+
 import { getTableSchema } from '../helpers/utils';
-import { Connections } from '../transport';
+import { configurePostgres } from '../transport';
+import type { PostgresNodeCredentials } from '../helpers/interfaces';
 
 export async function getColumns(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-	const credentials = await this.getCredentials('postgres');
+	const credentials = (await this.getCredentials('postgres')) as PostgresNodeCredentials;
+	const options = { nodeVersion: this.getNode().typeVersion };
 
-	const { db } = (await Connections.getInstance(credentials)) as ConnectionsData;
+	const { db, sshClient } = await configurePostgres(credentials, options);
 
 	const schema = this.getNodeParameter('schema', 0, {
 		extractValue: true,
@@ -26,6 +28,11 @@ export async function getColumns(this: ILoadOptionsFunctions): Promise<INodeProp
 		}));
 	} catch (error) {
 		throw error;
+	} finally {
+		if (sshClient) {
+			sshClient.end();
+		}
+		if (!db.$pool.ending) await db.$pool.end();
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Postgres/v2/methods/resourceMapping.ts b/packages/nodes-base/nodes/Postgres/v2/methods/resourceMapping.ts
new file mode 100644
index 0000000000000..27333a558eeea
--- /dev/null
+++ b/packages/nodes-base/nodes/Postgres/v2/methods/resourceMapping.ts
@@ -0,0 +1,100 @@
+import type { ILoadOptionsFunctions, ResourceMapperFields, FieldType } from 'n8n-workflow';
+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'],
+	number: [
+		'integer',
+		'smallint',
+		'bigint',
+		'decimal',
+		'numeric',
+		'real',
+		'double precision',
+		'smallserial',
+		'serial',
+		'bigserial',
+	],
+	boolean: ['boolean'],
+	dateTime: [
+		'timestamp',
+		'date',
+		'timestampz',
+		'timestamp without time zone',
+		'timestamp with time zone',
+	],
+	time: ['time', 'time without time zone', 'time with time zone'],
+	object: ['json', 'jsonb'],
+	options: ['enum', 'USER-DEFINED'],
+	array: ['ARRAY'],
+};
+
+function mapPostgresType(postgresType: string): FieldType {
+	let mappedType: FieldType = 'string';
+
+	for (const t of Object.keys(fieldTypeMapping)) {
+		const postgresTypes = fieldTypeMapping[t as FieldType];
+		if (postgresTypes?.includes(postgresType)) {
+			mappedType = t as FieldType;
+		}
+	}
+	return mappedType;
+}
+
+export async function getMappingColumns(
+	this: ILoadOptionsFunctions,
+): Promise<ResourceMapperFields> {
+	const credentials = (await this.getCredentials('postgres')) as PostgresNodeCredentials;
+
+	const { db, sshClient } = await configurePostgres(credentials);
+
+	const schema = this.getNodeParameter('schema', 0, {
+		extractValue: true,
+	}) as string;
+
+	const table = this.getNodeParameter('table', 0, {
+		extractValue: true,
+	}) as string;
+
+	const operation = this.getNodeParameter('operation', 0, {
+		extractValue: true,
+	}) as string;
+
+	try {
+		const columns = await getTableSchema(db, schema, table, { getColumnsForResourceMapper: true });
+		const unique = operation === 'upsert' ? await uniqueColumns(db, table, schema) : [];
+		const enumInfo = await getEnums(db);
+		const fields = await Promise.all(
+			columns.map(async (col) => {
+				const canBeUsedToMatch =
+					operation === 'upsert' ? unique.some((u) => u.attname === col.column_name) : true;
+				const type = mapPostgresType(col.data_type);
+				const options =
+					type === 'options' ? getEnumValues(enumInfo, col.udt_name as string) : undefined;
+				const hasDefault = Boolean(col.column_default);
+				const isGenerated = col.is_generated === 'ALWAYS' || col.identity_generation === 'ALWAYS';
+				const nullable = col.is_nullable === 'YES';
+				return {
+					id: col.column_name,
+					displayName: col.column_name,
+					required: !nullable && !hasDefault && !isGenerated,
+					defaultMatch: (col.column_name === 'id' && canBeUsedToMatch) || false,
+					display: true,
+					type,
+					canBeUsedToMatch,
+					options,
+				};
+			}),
+		);
+		return { fields };
+	} catch (error) {
+		throw error;
+	} finally {
+		if (sshClient) {
+			sshClient.end();
+		}
+		if (!db.$pool.ending) await db.$pool.end();
+	}
+}
diff --git a/packages/nodes-base/nodes/Postgres/v2/transport/index.ts b/packages/nodes-base/nodes/Postgres/v2/transport/index.ts
index 76240a05ab704..7736805812717 100644
--- a/packages/nodes-base/nodes/Postgres/v2/transport/index.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/transport/index.ts
@@ -1,19 +1,19 @@
-import type { IDataObject } from 'n8n-workflow';
-
+import type { Server } from 'net';
+import { createServer } from 'net';
 import { Client } from 'ssh2';
 import type { ConnectConfig } from 'ssh2';
 
-import type { Server } from 'net';
-import { createServer } from 'net';
+import type { IDataObject } from 'n8n-workflow';
 
 import pgPromise from 'pg-promise';
-
-import { rm, writeFile } from 'fs/promises';
-import { file } from 'tmp-promise';
-
-import type { PgpClient, PgpDatabase } from '../helpers/interfaces';
-
-async function createSshConnectConfig(credentials: IDataObject) {
+import type {
+	PgpDatabase,
+	PostgresNodeCredentials,
+	PostgresNodeOptions,
+} from '../helpers/interfaces';
+import { formatPrivateKey } from '@utils/utilities';
+
+async function createSshConnectConfig(credentials: PostgresNodeCredentials) {
 	if (credentials.sshAuthenticateWith === 'password') {
 		return {
 			host: credentials.sshHost as string,
@@ -22,30 +22,40 @@ async function createSshConnectConfig(credentials: IDataObject) {
 			password: credentials.sshPassword as string,
 		} as ConnectConfig;
 	} else {
-		const { path } = await file({ prefix: 'n8n-ssh-' });
-		await writeFile(path, credentials.privateKey as string);
-
 		const options: ConnectConfig = {
-			host: credentials.host as string,
-			username: credentials.username as string,
-			port: credentials.port as number,
-			privateKey: path,
+			host: credentials.sshHost as string,
+			username: credentials.sshUser as string,
+			port: credentials.sshPort as number,
+			privateKey: formatPrivateKey(credentials.privateKey as string),
 		};
 
 		if (credentials.passphrase) {
-			options.passphrase = credentials.passphrase as string;
+			options.passphrase = credentials.passphrase;
 		}
 
 		return options;
 	}
 }
 
-async function configurePostgres(
-	credentials: IDataObject,
-	options: IDataObject = {},
+export async function configurePostgres(
+	credentials: PostgresNodeCredentials,
+	options: PostgresNodeOptions = {},
 	createdSshClient?: Client,
 ) {
-	const pgp = pgPromise();
+	const pgp = pgPromise({
+		// prevent spam in console "WARNING: Creating a duplicate database object for the same connection."
+		// duplicate connections created when auto loading parameters, they are closed imidiatly after, but several could be open at the same time
+		noWarnings: true,
+	});
+
+	if (typeof options.nodeVersion === 'number' && options.nodeVersion >= 2.1) {
+		// Always return dates as ISO strings
+		[pgp.pg.types.builtins.TIMESTAMP, pgp.pg.types.builtins.TIMESTAMPTZ].forEach((type) => {
+			pgp.pg.types.setTypeParser(type, (value: string) => {
+				return new Date(value).toISOString();
+			});
+		});
+	}
 
 	if (options.largeNumbersOutput === 'numbers') {
 		pgp.pg.types.setTypeParser(20, (value: string) => {
@@ -57,15 +67,20 @@ async function configurePostgres(
 	}
 
 	const dbConfig: IDataObject = {
-		host: credentials.host as string,
-		port: credentials.port as number,
-		database: credentials.database as string,
-		user: credentials.user as string,
-		password: credentials.password as string,
+		host: credentials.host,
+		port: credentials.port,
+		database: credentials.database,
+		user: credentials.user,
+		password: credentials.password,
+		keepAlive: true,
 	};
 
 	if (options.connectionTimeout) {
-		dbConfig.connectionTimeoutMillis = (options.connectionTimeout as number) * 1000;
+		dbConfig.connectionTimeoutMillis = options.connectionTimeout * 1000;
+	}
+
+	if (options.delayClosingIdleConnection) {
+		dbConfig.keepAliveInitialDelayMillis = options.delayClosingIdleConnection * 1000;
 	}
 
 	if (credentials.allowUnauthorizedCerts === true) {
@@ -74,7 +89,7 @@ async function configurePostgres(
 		};
 	} else {
 		dbConfig.ssl = !['disable', undefined].includes(credentials.ssl as string | undefined);
-		dbConfig.sslmode = (credentials.ssl as string) || 'disable';
+		dbConfig.sslmode = credentials.ssl || 'disable';
 	}
 
 	if (!credentials.sshTunnel) {
@@ -99,8 +114,8 @@ async function configurePostgres(
 				sshClient.forwardOut(
 					socket.remoteAddress as string,
 					socket.remotePort as number,
-					credentials.host as string,
-					credentials.port as number,
+					credentials.host,
+					credentials.port,
 					(err, stream) => {
 						if (err) reject(err);
 
@@ -133,9 +148,6 @@ async function configurePostgres(
 			});
 
 			sshClient.on('end', async () => {
-				if (tunnelConfig.privateKey) {
-					await rm(tunnelConfig.privateKey as string, { force: true });
-				}
 				if (proxy) proxy.close();
 			});
 		}).catch((err) => {
@@ -174,36 +186,3 @@ async function configurePostgres(
 		return { db, pgp, sshClient };
 	}
 }
-
-export const Connections = (function () {
-	let instance: { db: PgpDatabase; pgp: PgpClient; sshClient?: Client } | null = null;
-
-	return {
-		async getInstance(
-			credentials: IDataObject = {},
-			options: IDataObject = {},
-			reload = false,
-			createdSshClient?: Client,
-			nulify = false,
-		) {
-			if (nulify) {
-				instance = null;
-				return instance;
-			}
-
-			if (instance !== null && reload) {
-				if (instance.sshClient) {
-					instance.sshClient.end();
-				}
-				instance.pgp.end();
-
-				instance = null;
-			}
-
-			if (instance === null && Object.keys(credentials).length) {
-				instance = await configurePostgres(credentials, options, createdSshClient);
-			}
-			return instance;
-		},
-	};
-})();
diff --git a/packages/nodes-base/nodes/Postmark/GenericFunctions.ts b/packages/nodes-base/nodes/Postmark/GenericFunctions.ts
index fd38598233731..a1ceefe6eea5b 100644
--- a/packages/nodes-base/nodes/Postmark/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Postmark/GenericFunctions.ts
@@ -1,5 +1,3 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IExecuteFunctions,
 	ILoadOptionsFunctions,
@@ -7,18 +5,20 @@ import type {
 	IHookFunctions,
 	IWebhookFunctions,
 	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function postmarkApiRequest(
 	this: IExecuteFunctions | IWebhookFunctions | IHookFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: any = {},
 	option: IDataObject = {},
 ): Promise<any> {
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		headers: {
 			'Content-Type': 'application/json',
 			Accept: 'application/json',
diff --git a/packages/nodes-base/nodes/ProfitWell/GenericFunctions.ts b/packages/nodes-base/nodes/ProfitWell/GenericFunctions.ts
index da3bcb1e97ed5..1400bdce88df0 100644
--- a/packages/nodes-base/nodes/ProfitWell/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/ProfitWell/GenericFunctions.ts
@@ -1,18 +1,17 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	JsonObject,
+	IRequestOptions,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function profitWellApiRequest(
-	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -22,7 +21,7 @@ export async function profitWellApiRequest(
 ): Promise<any> {
 	try {
 		const credentials = await this.getCredentials('profitWellApi');
-		let options: OptionsWithUri = {
+		let options: IRequestOptions = {
 			headers: {
 				Authorization: credentials.accessToken,
 			},
diff --git a/packages/nodes-base/nodes/Pushbullet/GenericFunctions.ts b/packages/nodes-base/nodes/Pushbullet/GenericFunctions.ts
index 003e58d981eaf..4904d0671372c 100644
--- a/packages/nodes-base/nodes/Pushbullet/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Pushbullet/GenericFunctions.ts
@@ -1,16 +1,16 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
+	IDataObject,
 	IExecuteFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
-	IDataObject,
+	IRequestOptions,
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function pushbulletApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	path: string,
 
 	body: any = {},
@@ -18,7 +18,7 @@ export async function pushbulletApiRequest(
 	uri?: string | undefined,
 	option = {},
 ): Promise<any> {
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		method,
 		body,
 		qs,
@@ -41,7 +41,7 @@ export async function pushbulletApiRequest(
 export async function pushbulletApiRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: any = {},
diff --git a/packages/nodes-base/nodes/Pushbullet/Pushbullet.node.ts b/packages/nodes-base/nodes/Pushbullet/Pushbullet.node.ts
index 1c563f747d08a..ff4d4770c267d 100644
--- a/packages/nodes-base/nodes/Pushbullet/Pushbullet.node.ts
+++ b/packages/nodes-base/nodes/Pushbullet/Pushbullet.node.ts
@@ -8,9 +8,8 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
-import { pushbulletApiRequest, pushbulletApiRequestAllItems } from './GenericFunctions';
-
 import moment from 'moment-timezone';
+import { pushbulletApiRequest, pushbulletApiRequestAllItems } from './GenericFunctions';
 
 export class Pushbullet implements INodeType {
 	description: INodeTypeDescription = {
@@ -157,7 +156,7 @@ export class Pushbullet implements INodeType {
 				description: 'URL of the push',
 			},
 			{
-				displayName: 'Binary Property',
+				displayName: 'Input Binary Field',
 				name: 'binaryPropertyName',
 				type: 'string',
 				default: 'data',
@@ -170,8 +169,7 @@ export class Pushbullet implements INodeType {
 					},
 				},
 				placeholder: '',
-				description:
-					'Name of the binary property which contains the data for the file to be created',
+				hint: 'The name of the input binary field containing the file to be written',
 			},
 			{
 				displayName: 'Target',
@@ -506,6 +504,6 @@ export class Pushbullet implements INodeType {
 			}
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Pushbullet/pushbullet.svg b/packages/nodes-base/nodes/Pushbullet/pushbullet.svg
index b51a3fd61f18b..a5b5905521d93 100644
--- a/packages/nodes-base/nodes/Pushbullet/pushbullet.svg
+++ b/packages/nodes-base/nodes/Pushbullet/pushbullet.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="256" height="256" style="-ms-transform:rotate(360deg);-webkit-transform:rotate(360deg)" transform="rotate(360)"><defs><linearGradient x1="8.59%" y1="1.954%" x2="77.471%" y2="73.896%" id="c"><stop stop-color="#4CB36B" offset="0%"/><stop stop-color="#3EA16F" offset="100%"/></linearGradient><path id="a" d="M256 128c0 70.692-57.308 128-128 128C57.308 256 0 198.692 0 128 0 57.308 57.308 0 128 0c70.692 0 128 57.308 128 128"/></defs><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><use fill="#67BF79" xlink:href="#a"/><path d="M256 128c0 70.692-57.308 128-128 128C57.308 256 0 198.692 0 128 0 57.308 57.308 0 128 0c70.692 0 128 57.308 128 128" fill="#67BF79" mask="url(#b)"/><path d="M63.111 187.022L96.178 72l64.533 60.978L200 90.133l87.533 86.289-110.844 124.889L63.111 187.022" fill="url(#c)" mask="url(#b)"/><path d="M77 189.6c-16.733 0-16.733 0-16.733-16.733V81c0-16.733 0-16.733 16.733-16.733h3.334c16.733 0 16.733 0 16.733 16.733v91.867c0 16.733 0 16.733-16.733 16.733H77zm44.041 0c-5.699 0-8.508-2.809-8.508-8.508V72.774c0-5.698 2.809-8.507 8.508-8.507h37.537c32.178 0 52.628 32.273 52.628 63.025 0 30.752-20.628 62.308-52.628 62.308h-37.537z" fill="#FFF" mask="url(#b)"/><path fill="rgba(0, 0, 0, 0)" d="M0 0h256v256H0z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="256" height="256" style="-ms-transform:rotate(360deg);-webkit-transform:rotate(360deg)" transform="rotate(360)"><defs><linearGradient id="c" x1="8.59%" x2="77.471%" y1="1.954%" y2="73.896%"><stop offset="0%" stop-color="#4CB36B"/><stop offset="100%" stop-color="#3EA16F"/></linearGradient><path id="a" d="M256 128c0 70.692-57.308 128-128 128S0 198.692 0 128 57.308 0 128 0s128 57.308 128 128"/></defs><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><use xlink:href="#a" fill="#67BF79"/><path fill="#67BF79" d="M256 128c0 70.692-57.308 128-128 128S0 198.692 0 128 57.308 0 128 0s128 57.308 128 128" mask="url(#b)"/><path fill="url(#c)" d="M63.111 187.022 96.178 72l64.533 60.978L200 90.133l87.533 86.289-110.844 124.889z" mask="url(#b)"/><path fill="#FFF" d="M77 189.6c-16.733 0-16.733 0-16.733-16.733V81c0-16.733 0-16.733 16.733-16.733h3.334c16.733 0 16.733 0 16.733 16.733v91.867c0 16.733 0 16.733-16.733 16.733zm44.041 0c-5.699 0-8.508-2.809-8.508-8.508V72.774c0-5.698 2.809-8.507 8.508-8.507h37.537c32.178 0 52.628 32.273 52.628 63.025S190.578 189.6 158.578 189.6z" mask="url(#b)"/><path fill="rgba(0, 0, 0, 0)" d="M0 0h256v256H0z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Pushcut/GenericFunctions.ts b/packages/nodes-base/nodes/Pushcut/GenericFunctions.ts
index 7b1c8c4ec3cd2..9c96e60fb84e0 100644
--- a/packages/nodes-base/nodes/Pushcut/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Pushcut/GenericFunctions.ts
@@ -1,17 +1,17 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
-	IExecuteFunctions,
-	ILoadOptionsFunctions,
 	IDataObject,
+	IExecuteFunctions,
 	IHookFunctions,
+	IHttpRequestMethods,
+	ILoadOptionsFunctions,
+	IRequestOptions,
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function pushcutApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	path: string,
 
 	body: any = {},
@@ -21,7 +21,7 @@ export async function pushcutApiRequest(
 ): Promise<any> {
 	const credentials = await this.getCredentials('pushcutApi');
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			'API-Key': credentials.apiKey,
 		},
diff --git a/packages/nodes-base/nodes/Pushover/GenericFunctions.ts b/packages/nodes-base/nodes/Pushover/GenericFunctions.ts
index f5333705ada2e..56051e59cf74c 100644
--- a/packages/nodes-base/nodes/Pushover/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Pushover/GenericFunctions.ts
@@ -1,7 +1,6 @@
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	ILoadOptionsFunctions,
 	IHttpRequestMethods,
 	IHttpRequestOptions,
@@ -10,7 +9,7 @@ import type {
 import { NodeApiError } from 'n8n-workflow';
 
 export async function pushoverApiRequest(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
+	this: IExecuteFunctions | ILoadOptionsFunctions,
 	method: IHttpRequestMethods,
 	path: string,
 
diff --git a/packages/nodes-base/nodes/Pushover/Pushover.node.ts b/packages/nodes-base/nodes/Pushover/Pushover.node.ts
index 477e997d4a654..fab8ecdf80413 100644
--- a/packages/nodes-base/nodes/Pushover/Pushover.node.ts
+++ b/packages/nodes-base/nodes/Pushover/Pushover.node.ts
@@ -92,7 +92,7 @@ export class Pushover implements INodeType {
 				default: '',
 				description: 'Your message',
 			},
-			// eslint-disable-next-line n8n-nodes-base/node-param-default-missing
+
 			{
 				displayName: 'Priority',
 				name: 'priority',
@@ -196,13 +196,12 @@ export class Pushover implements INodeType {
 								displayName: 'Attachment Property',
 								values: [
 									{
-										displayName: 'Binary Property',
+										displayName: 'Input Binary Field',
 										name: 'binaryPropertyName',
 										type: 'string',
 										default: '',
 										placeholder: 'data',
-										description:
-											'Name of the binary properties which contain data which should be added to email as attachment',
+										hint: 'The name of the input binary field containing the file which should be added to email as attachment',
 									},
 								],
 							},
@@ -370,6 +369,6 @@ export class Pushover implements INodeType {
 				throw error;
 			}
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Pushover/pushover.svg b/packages/nodes-base/nodes/Pushover/pushover.svg
index 4d262ce497f02..9d9d8fffd366c 100644
--- a/packages/nodes-base/nodes/Pushover/pushover.svg
+++ b/packages/nodes-base/nodes/Pushover/pushover.svg
@@ -1,4 +1 @@
-<svg viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg">
-   <circle cx="512" cy="512" r="512" style="fill:#249df1"/>
-   <path d="m495.6 319.4 104-13.7-101.3 228.6c17.8-1.4 35.2-7.4 52.3-18.1 17.1-10.7 32.9-24.2 47.2-40.4 14.4-16.2 26.8-34.2 37.3-54.1 10.5-19.8 18-39.4 22.6-58.5 2.7-11.9 4-23.3 3.8-34.2-.2-10.9-3.1-20.5-8.6-28.7s-13.8-14.8-25-19.8-26.3-7.5-45.5-7.5c-22.4 0-44.4 3.6-66 10.9-21.7 7.3-41.7 17.9-60.2 31.8-18.5 13.9-34.5 31.2-48.2 52-13.7 20.8-23.5 44.4-29.4 70.8-2.3 8.7-3.6 15.6-4.1 20.9-.5 5.3-.6 9.6-.3 13 .2 3.4.7 6.1 1.4 7.9.7 1.8 1.3 3.6 1.7 5.5-23.3 0-40.3-4.7-51-14-10.7-9.3-13.3-25.7-7.9-48.9 5.5-24.2 17.9-47.2 37.3-69.1 19.4-21.9 42.4-41.2 69.1-57.8 26.7-16.6 55.9-29.9 87.6-39.7 31.7-9.8 62.6-14.7 92.7-14.7 26.5 0 48.7 3.8 66.7 11.3 18 7.5 32.1 17.5 42.1 29.8s16.3 26.7 18.8 43.1c2.5 16.4 1.7 33.5-2.4 51.3-5 21.4-14.5 43-28.4 64.7-13.9 21.7-31.4 41.3-52.3 58.8-21 17.6-45 31.8-72.2 42.8-27.1 10.9-56 16.4-86.6 16.4h-3.4l-86.9 195H302l193.6-435.4z" style="fill:#fff"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024"><circle cx="512" cy="512" r="512" style="fill:#249df1"/><path d="m495.6 319.4 104-13.7-101.3 228.6c17.8-1.4 35.2-7.4 52.3-18.1s32.9-24.2 47.2-40.4c14.4-16.2 26.8-34.2 37.3-54.1 10.5-19.8 18-39.4 22.6-58.5 2.7-11.9 4-23.3 3.8-34.2s-3.1-20.5-8.6-28.7-13.8-14.8-25-19.8-26.3-7.5-45.5-7.5c-22.4 0-44.4 3.6-66 10.9-21.7 7.3-41.7 17.9-60.2 31.8s-34.5 31.2-48.2 52q-20.55 31.2-29.4 70.8c-2.3 8.7-3.6 15.6-4.1 20.9s-.6 9.6-.3 13c.2 3.4.7 6.1 1.4 7.9s1.3 3.6 1.7 5.5c-23.3 0-40.3-4.7-51-14s-13.3-25.7-7.9-48.9c5.5-24.2 17.9-47.2 37.3-69.1s42.4-41.2 69.1-57.8 55.9-29.9 87.6-39.7q47.55-14.7 92.7-14.7c26.5 0 48.7 3.8 66.7 11.3s32.1 17.5 42.1 29.8 16.3 26.7 18.8 43.1q3.75 24.6-2.4 51.3c-5 21.4-14.5 43-28.4 64.7s-31.4 41.3-52.3 58.8c-21 17.6-45 31.8-72.2 42.8-27.1 10.9-56 16.4-86.6 16.4h-3.4l-86.9 195H302z" style="fill:#fff"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/QuestDb/QuestDb.node.ts b/packages/nodes-base/nodes/QuestDb/QuestDb.node.ts
index 5987d4007eda1..ad065b1d1dda3 100644
--- a/packages/nodes-base/nodes/QuestDb/QuestDb.node.ts
+++ b/packages/nodes-base/nodes/QuestDb/QuestDb.node.ts
@@ -8,7 +8,7 @@ import { NodeOperationError } from 'n8n-workflow';
 
 import pgPromise from 'pg-promise';
 
-import { pgInsert, pgQuery } from '../Postgres/v1/genericFunctions';
+import { pgInsert, pgQueryV2 } from '../Postgres/v1/genericFunctions';
 
 export class QuestDb implements INodeType {
 	description: INodeTypeDescription = {
@@ -24,6 +24,7 @@ export class QuestDb implements INodeType {
 		},
 		inputs: ['main'],
 		outputs: ['main'],
+		parameterPane: 'wide',
 		credentials: [
 			{
 				name: 'questDb',
@@ -60,6 +61,11 @@ export class QuestDb implements INodeType {
 				displayName: 'Query',
 				name: 'query',
 				type: 'string',
+				noDataExpression: true,
+				typeOptions: {
+					editor: 'sqlEditor',
+					sqlDialect: 'PostgreSQL',
+				},
 				displayOptions: {
 					show: {
 						operation: ['executeQuery'],
@@ -221,14 +227,10 @@ export class QuestDb implements INodeType {
 			const additionalFields = this.getNodeParameter('additionalFields', 0);
 			const mode = (additionalFields.mode || 'independently') as string;
 
-			const queryResult = await pgQuery(
-				this.getNodeParameter,
-				pgp,
-				db,
-				items,
-				this.continueOnFail(),
-				mode,
-			);
+			const queryResult = await pgQueryV2.call(this, pgp, db, items, this.continueOnFail(), {
+				overrideMode: mode,
+				resolveExpression: true,
+			});
 
 			returnItems = this.helpers.returnJsonArray(queryResult);
 		} else if (operation === 'insert') {
@@ -254,16 +256,16 @@ export class QuestDb implements INodeType {
 
 			returnItems = this.helpers.returnJsonArray(insertData);
 		} else {
-			pgp.end();
+			await db.$pool.end();
 			throw new NodeOperationError(
 				this.getNode(),
 				`The operation "${operation}" is not supported!`,
 			);
 		}
 
-		// Close the connection
-		pgp.end();
+		// shuts down the connection pool associated with the db object to allow the process to finish
+		await db.$pool.end();
 
-		return this.prepareOutputData(returnItems);
+		return [returnItems];
 	}
 }
diff --git a/packages/nodes-base/nodes/QuickBase/FileDescription.ts b/packages/nodes-base/nodes/QuickBase/FileDescription.ts
index 343f23cdfe127..89e7716c3a7aa 100644
--- a/packages/nodes-base/nodes/QuickBase/FileDescription.ts
+++ b/packages/nodes-base/nodes/QuickBase/FileDescription.ts
@@ -90,7 +90,7 @@ export const fileFields: INodeProperties[] = [
 		description: 'The file attachment version number',
 	},
 	{
-		displayName: 'Binary Property',
+		displayName: 'Input Binary Field',
 		displayOptions: {
 			show: {
 				resource: ['file'],
@@ -100,7 +100,7 @@ export const fileFields: INodeProperties[] = [
 		name: 'binaryPropertyName',
 		type: 'string',
 		default: 'data',
-		description: 'Object property name which holds binary data',
+		hint: 'The name of the input binary field containing the file to be written',
 		required: true,
 	},
 ];
diff --git a/packages/nodes-base/nodes/QuickBase/GenericFunctions.ts b/packages/nodes-base/nodes/QuickBase/GenericFunctions.ts
index e9d9278de0b58..73d8232aa6c4a 100644
--- a/packages/nodes-base/nodes/QuickBase/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/QuickBase/GenericFunctions.ts
@@ -1,10 +1,10 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
 	IHookFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
+	IRequestOptions,
 	IWebhookFunctions,
 	JsonObject,
 } from 'n8n-workflow';
@@ -12,7 +12,7 @@ import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 export async function quickbaseApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions | IWebhookFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -30,7 +30,7 @@ export async function quickbaseApiRequest(
 	}
 
 	try {
-		const options: OptionsWithUri = {
+		const options: IRequestOptions = {
 			headers: {
 				'QB-Realm-Hostname': credentials.hostname,
 				'User-Agent': 'n8n',
@@ -77,7 +77,7 @@ export async function getFieldsObject(this: IHookFunctions | ILoadOptionsFunctio
 
 export async function quickbaseApiRequestAllItems(
 	this: IHookFunctions | ILoadOptionsFunctions | IExecuteFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
diff --git a/packages/nodes-base/nodes/QuickBase/QuickBase.node.ts b/packages/nodes-base/nodes/QuickBase/QuickBase.node.ts
index 04ef96327c5d8..55e081553c135 100644
--- a/packages/nodes-base/nodes/QuickBase/QuickBase.node.ts
+++ b/packages/nodes-base/nodes/QuickBase/QuickBase.node.ts
@@ -10,6 +10,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
+import { generatePairedItemData } from '../../utils/utilities';
 import {
 	getFieldsObject,
 	quickbaseApiRequest,
@@ -116,6 +117,7 @@ export class QuickBase implements INodeType {
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const items = this.getInputData();
+		const itemData = generatePairedItemData(items.length);
 		const returnData: INodeExecutionData[] = [];
 		const length = items.length;
 		const qs: IDataObject = {};
@@ -229,7 +231,7 @@ export class QuickBase implements INodeType {
 					);
 				}
 
-				return this.prepareOutputData(items);
+				return [items];
 			}
 		}
 
@@ -295,7 +297,7 @@ export class QuickBase implements INodeType {
 
 				const executionData = this.helpers.constructExecutionMetaData(
 					this.helpers.returnJsonArray(responseData as IDataObject[]),
-					{ itemData: { item: 0 } },
+					{ itemData },
 				);
 
 				returnData.push(...executionData);
@@ -465,7 +467,7 @@ export class QuickBase implements INodeType {
 
 				const executionData = this.helpers.constructExecutionMetaData(
 					this.helpers.returnJsonArray(responseData as IDataObject[]),
-					{ itemData: { item: 0 } },
+					{ itemData },
 				);
 
 				returnData.push(...executionData);
@@ -548,7 +550,7 @@ export class QuickBase implements INodeType {
 
 				const executionData = this.helpers.constructExecutionMetaData(
 					this.helpers.returnJsonArray(responseData as IDataObject[]),
-					{ itemData: { item: 0 } },
+					{ itemData },
 				);
 
 				returnData.push(...executionData);
@@ -638,6 +640,6 @@ export class QuickBase implements INodeType {
 			}
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/QuickBooks/GenericFunctions.ts b/packages/nodes-base/nodes/QuickBooks/GenericFunctions.ts
index 85a39bdafd408..3f28e2d56a29e 100644
--- a/packages/nodes-base/nodes/QuickBooks/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/QuickBooks/GenericFunctions.ts
@@ -2,21 +2,21 @@ import type {
 	IDataObject,
 	IExecuteFunctions,
 	IHookFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
 	INodePropertyOptions,
+	IRequestOptions,
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import type { CustomField, GeneralAddress, Ref } from './descriptions/Shared.interface';
-
 import { capitalCase } from 'change-case';
 
-import omit from 'lodash.omit';
-import pickBy from 'lodash.pickby';
+import omit from 'lodash/omit';
+import pickBy from 'lodash/pickBy';
 
-import type { OptionsWithUri } from 'request';
+import type { CustomField, GeneralAddress, Ref } from './descriptions/Shared.interface';
 
 import type { DateFieldsUi, Option, QuickBooksOAuth2Credentials, TransactionReport } from './types';
 
@@ -25,7 +25,7 @@ import type { DateFieldsUi, Option, QuickBooksOAuth2Credentials, TransactionRepo
  */
 export async function quickBooksApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	qs: IDataObject,
 	body: IDataObject,
@@ -47,7 +47,7 @@ export async function quickBooksApiRequest(
 		'quickBooksOAuth2Api',
 	)) as QuickBooksOAuth2Credentials;
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			'user-agent': 'n8n',
 		},
@@ -94,7 +94,7 @@ export async function quickBooksApiRequest(
 
 async function getCount(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	qs: IDataObject,
 ): Promise<any> {
@@ -108,7 +108,7 @@ async function getCount(
  */
 export async function quickBooksApiRequestAllItems(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	qs: IDataObject,
 	body: IDataObject,
@@ -170,7 +170,7 @@ export async function handleListing(
 	}
 
 	if (returnAll) {
-		return quickBooksApiRequestAllItems.call(this, 'GET', endpoint, qs, {}, resource);
+		return await quickBooksApiRequestAllItems.call(this, 'GET', endpoint, qs, {}, resource);
 	} else {
 		const limit = this.getNodeParameter('limit', i);
 		qs.query += ` MAXRESULTS ${limit}`;
@@ -270,7 +270,6 @@ export async function loadResource(this: ILoadOptionsFunctions, resource: string
 
 	if (resource === 'preferences') {
 		const {
-			// eslint-disable-next-line @typescript-eslint/no-shadow
 			SalesFormsPrefs: { CustomField },
 		} = resourceItems[0];
 		const customFields = CustomField[1].CustomField;
diff --git a/packages/nodes-base/nodes/QuickBooks/QuickBooks.node.ts b/packages/nodes-base/nodes/QuickBooks/QuickBooks.node.ts
index 373ed80f59bef..8d10c9a439fa1 100644
--- a/packages/nodes-base/nodes/QuickBooks/QuickBooks.node.ts
+++ b/packages/nodes-base/nodes/QuickBooks/QuickBooks.node.ts
@@ -9,6 +9,8 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
+import { capitalCase } from 'change-case';
+import isEmpty from 'lodash/isEmpty';
 import {
 	billFields,
 	billOperations,
@@ -45,10 +47,6 @@ import {
 	simplifyTransactionReport,
 } from './GenericFunctions';
 
-import { capitalCase } from 'change-case';
-
-import isEmpty from 'lodash.isempty';
-
 import type { QuickBooksOAuth2Credentials, TransactionFields, TransactionReport } from './types';
 
 export class QuickBooks implements INodeType {
@@ -147,39 +145,39 @@ export class QuickBooks implements INodeType {
 	methods = {
 		loadOptions: {
 			async getCustomers(this: ILoadOptionsFunctions) {
-				return loadResource.call(this, 'customer');
+				return await loadResource.call(this, 'customer');
 			},
 
 			async getCustomFields(this: ILoadOptionsFunctions) {
-				return loadResource.call(this, 'preferences');
+				return await loadResource.call(this, 'preferences');
 			},
 
 			async getDepartments(this: ILoadOptionsFunctions) {
-				return loadResource.call(this, 'department');
+				return await loadResource.call(this, 'department');
 			},
 
 			async getItems(this: ILoadOptionsFunctions) {
-				return loadResource.call(this, 'item');
+				return await loadResource.call(this, 'item');
 			},
 
 			async getMemos(this: ILoadOptionsFunctions) {
-				return loadResource.call(this, 'CreditMemo');
+				return await loadResource.call(this, 'CreditMemo');
 			},
 
 			async getPurchases(this: ILoadOptionsFunctions) {
-				return loadResource.call(this, 'purchase');
+				return await loadResource.call(this, 'purchase');
 			},
 
 			async getTaxCodeRefs(this: ILoadOptionsFunctions) {
-				return loadResource.call(this, 'TaxCode');
+				return await loadResource.call(this, 'TaxCode');
 			},
 
 			async getTerms(this: ILoadOptionsFunctions) {
-				return loadResource.call(this, 'Term');
+				return await loadResource.call(this, 'Term');
 			},
 
 			async getVendors(this: ILoadOptionsFunctions) {
-				return loadResource.call(this, 'vendor');
+				return await loadResource.call(this, 'vendor');
 			},
 		},
 	};
@@ -1161,9 +1159,9 @@ export class QuickBooks implements INodeType {
 			['get'].includes(operation) &&
 			download
 		) {
-			return this.prepareOutputData(responseData as INodeExecutionData[]);
+			return [responseData as INodeExecutionData[]];
 		} else {
-			return this.prepareOutputData(returnData);
+			return [returnData];
 		}
 	}
 }
diff --git a/packages/nodes-base/nodes/QuickBooks/descriptions/Estimate/EstimateDescription.ts b/packages/nodes-base/nodes/QuickBooks/descriptions/Estimate/EstimateDescription.ts
index b286dfeb0452e..6c19bd7743317 100644
--- a/packages/nodes-base/nodes/QuickBooks/descriptions/Estimate/EstimateDescription.ts
+++ b/packages/nodes-base/nodes/QuickBooks/descriptions/Estimate/EstimateDescription.ts
@@ -210,12 +210,12 @@ export const estimateFields: INodeProperties[] = [
 		},
 	},
 	{
-		displayName: 'Binary Property',
+		displayName: 'Put Output File in Field',
 		name: 'binaryProperty',
 		type: 'string',
 		required: true,
 		default: 'data',
-		description: 'Name of the binary property to which to write to',
+		hint: 'The name of the output binary field to put the file in',
 		displayOptions: {
 			show: {
 				resource: ['estimate'],
diff --git a/packages/nodes-base/nodes/QuickBooks/descriptions/Invoice/InvoiceDescription.ts b/packages/nodes-base/nodes/QuickBooks/descriptions/Invoice/InvoiceDescription.ts
index 0e9c7c0e2734a..d15cd417f9931 100644
--- a/packages/nodes-base/nodes/QuickBooks/descriptions/Invoice/InvoiceDescription.ts
+++ b/packages/nodes-base/nodes/QuickBooks/descriptions/Invoice/InvoiceDescription.ts
@@ -215,12 +215,12 @@ export const invoiceFields: INodeProperties[] = [
 		},
 	},
 	{
-		displayName: 'Binary Property',
+		displayName: 'Put Output File in Field',
 		name: 'binaryProperty',
 		type: 'string',
 		required: true,
 		default: 'data',
-		description: 'Name of the binary property to which to write to',
+		hint: 'The name of the output binary field to put the file in',
 		displayOptions: {
 			show: {
 				resource: ['invoice'],
diff --git a/packages/nodes-base/nodes/QuickBooks/descriptions/Payment/PaymentDescription.ts b/packages/nodes-base/nodes/QuickBooks/descriptions/Payment/PaymentDescription.ts
index ff338841bc94a..faeec56d4a9b4 100644
--- a/packages/nodes-base/nodes/QuickBooks/descriptions/Payment/PaymentDescription.ts
+++ b/packages/nodes-base/nodes/QuickBooks/descriptions/Payment/PaymentDescription.ts
@@ -154,12 +154,12 @@ export const paymentFields: INodeProperties[] = [
 		},
 	},
 	{
-		displayName: 'Binary Property',
+		displayName: 'Put Output File in Field',
 		name: 'binaryProperty',
 		type: 'string',
 		required: true,
 		default: 'data',
-		description: 'Name of the binary property to which to write to',
+		hint: 'The name of the output binary field to put the file in',
 		displayOptions: {
 			show: {
 				resource: ['payment'],
diff --git a/packages/nodes-base/nodes/QuickBooks/quickbooks.svg b/packages/nodes-base/nodes/QuickBooks/quickbooks.svg
index f4e89f3a83a70..450c707a95f4a 100644
--- a/packages/nodes-base/nodes/QuickBooks/quickbooks.svg
+++ b/packages/nodes-base/nodes/QuickBooks/quickbooks.svg
@@ -1 +1 @@
-<svg viewBox="0 0 2500 2500" xmlns="http://www.w3.org/2000/svg"><circle cx="1250" cy="1250" fill="#2ca01c" r="1250"/><path d="M301.3 1249.6c.1 282.6 228 512.4 510.6 514.9h72.3v-188.9h-72.3c-175.2 47.8-355.9-55.5-403.6-230.7-.4-1.4-.7-2.8-1.1-4.2-49.1-177.5 53.7-361.4 230.6-412.5h36.1a322 322 0 01137.5 0H987v1002.9c-.9 106.1 84.4 192.9 190.5 193.9V729.6H813c-284.6 1.5-514 233.4-512.5 518v.1zm1387.5-519.8h-72.3v198.9h72.3c174.8-47.7 355.1 55.3 402.8 230 .4 1.3.7 2.7 1.1 4 48.8 176.9-53.7 360.1-229.9 411.1h-36.1a322 322 0 01-137.5 0h-175.6V571c.9-106.1-84.4-192.9-190.5-193.9v1397.4h364.5c287.1-4.5 516.2-240.8 511.8-527.9-4.4-280.8-230.9-507.4-511.8-511.8z" fill="#fff"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2500 2500"><circle cx="1250" cy="1250" r="1250" fill="#2ca01c"/><path fill="#fff" d="M301.3 1249.6c.1 282.6 228 512.4 510.6 514.9h72.3v-188.9h-72.3c-175.2 47.8-355.9-55.5-403.6-230.7-.4-1.4-.7-2.8-1.1-4.2-49.1-177.5 53.7-361.4 230.6-412.5h36.1a322 322 0 0 1 137.5 0H987v1002.9c-.9 106.1 84.4 192.9 190.5 193.9V729.6H813c-284.6 1.5-514 233.4-512.5 518v.1zm1387.5-519.8h-72.3v198.9h72.3c174.8-47.7 355.1 55.3 402.8 230 .4 1.3.7 2.7 1.1 4 48.8 176.9-53.7 360.1-229.9 411.1h-36.1a322 322 0 0 1-137.5 0h-175.6V571c.9-106.1-84.4-192.9-190.5-193.9v1397.4h364.5c287.1-4.5 516.2-240.8 511.8-527.9-4.4-280.8-230.9-507.4-511.8-511.8z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/QuickBooks/types.d.ts b/packages/nodes-base/nodes/QuickBooks/types.ts
similarity index 100%
rename from packages/nodes-base/nodes/QuickBooks/types.d.ts
rename to packages/nodes-base/nodes/QuickBooks/types.ts
diff --git a/packages/nodes-base/nodes/QuickChart/QuickChart.node.json b/packages/nodes-base/nodes/QuickChart/QuickChart.node.json
index 364fbf6f4d22f..3d8ea22e1d07a 100644
--- a/packages/nodes-base/nodes/QuickChart/QuickChart.node.json
+++ b/packages/nodes-base/nodes/QuickChart/QuickChart.node.json
@@ -2,7 +2,7 @@
 	"node": "n8n-nodes-base.quickChart",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Marketing & Content"],
+	"categories": ["Marketing"],
 	"resources": {
 		"credentialDocumentation": [
 			{
diff --git a/packages/nodes-base/nodes/QuickChart/QuickChart.node.ts b/packages/nodes-base/nodes/QuickChart/QuickChart.node.ts
index 9b36934cded67..defe162abd37c 100644
--- a/packages/nodes-base/nodes/QuickChart/QuickChart.node.ts
+++ b/packages/nodes-base/nodes/QuickChart/QuickChart.node.ts
@@ -18,7 +18,6 @@ import {
 } from './constants';
 import type { IDataset } from './types';
 
-import _ from 'lodash';
 export class QuickChart implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'QuickChart',
@@ -414,17 +413,19 @@ export class QuickChart implements INodeType {
 		let mimeType = response.headers['content-type'] as string | undefined;
 		mimeType = mimeType ? mimeType.split(';').find((value) => value.includes('/')) : undefined;
 
-		return this.prepareOutputData([
-			{
-				binary: {
-					[output]: await this.helpers.prepareBinaryData(
-						response.body as Buffer,
-						undefined,
-						mimeType,
-					),
+		return [
+			[
+				{
+					binary: {
+						[output]: await this.helpers.prepareBinaryData(
+							response.body as Buffer,
+							undefined,
+							mimeType,
+						),
+					},
+					json: { chart },
 				},
-				json: { chart },
-			},
-		]);
+			],
+		];
 	}
 }
diff --git a/packages/nodes-base/nodes/QuickChart/quickChart.svg b/packages/nodes-base/nodes/QuickChart/quickChart.svg
index 0f2ae092a660c..1f177b55b70dd 100644
--- a/packages/nodes-base/nodes/QuickChart/quickChart.svg
+++ b/packages/nodes-base/nodes/QuickChart/quickChart.svg
@@ -1,14 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="445" height="445" viewBox="0 0 445 445" xml:space="preserve">
-<desc>Created with Fabric.js 1.7.22</desc>
-<defs>
-</defs>
-<g id="icon" style="stroke: none; stroke-width: 1; stroke-dasharray: none; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 10; fill: none; fill-rule: nonzero; opacity: 1;" transform="translate(-2.4722222222222285 -2.4722222222222285) scale(4.94 4.94)" >
-	<path d="M 40.135 90 h -8.782 c -1.519 0 -2.75 -1.231 -2.75 -2.75 V 45.381 c 0 -1.519 1.231 -2.75 2.75 -2.75 h 8.782 c 1.519 0 2.75 1.231 2.75 2.75 V 87.25 C 42.885 88.769 41.654 90 40.135 90 z" style="stroke: none; stroke-width: 1; stroke-dasharray: none; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 10; fill: rgb(255,195,110); fill-rule: nonzero; opacity: 1;" transform=" matrix(1 0 0 1 0 0) " stroke-linecap="round" />
-	<path d="M 58.647 90 h -8.782 c -1.519 0 -2.75 -1.231 -2.75 -2.75 V 31.449 c 0 -1.519 1.231 -2.75 2.75 -2.75 h 8.782 c 1.519 0 2.75 1.231 2.75 2.75 V 87.25 C 61.397 88.769 60.165 90 58.647 90 z" style="stroke: none; stroke-width: 1; stroke-dasharray: none; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 10; fill: rgb(165,215,110); fill-rule: nonzero; opacity: 1;" transform=" matrix(1 0 0 1 0 0) " stroke-linecap="round" />
-	<path d="M 21.624 90 h -8.782 c -1.519 0 -2.75 -1.231 -2.75 -2.75 V 59.313 c 0 -1.519 1.231 -2.75 2.75 -2.75 h 8.782 c 1.519 0 2.75 1.231 2.75 2.75 V 87.25 C 24.374 88.769 23.142 90 21.624 90 z" style="stroke: none; stroke-width: 1; stroke-dasharray: none; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 10; fill: rgb(210,85,90); fill-rule: nonzero; opacity: 1;" transform=" matrix(1 0 0 1 0 0) " stroke-linecap="round" />
-	<path d="M 77.158 90 h -8.782 c -1.519 0 -2.75 -1.231 -2.75 -2.75 V 17.517 c 0 -1.519 1.231 -2.75 2.75 -2.75 h 8.782 c 1.519 0 2.75 1.231 2.75 2.75 V 87.25 C 79.908 88.769 78.677 90 77.158 90 z" style="stroke: none; stroke-width: 1; stroke-dasharray: none; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 10; fill: rgb(120,210,190); fill-rule: nonzero; opacity: 1;" transform=" matrix(1 0 0 1 0 0) " stroke-linecap="round" />
-	<path d="M 67.773 17.977 h 18.183 c 1.787 0 2.682 -2.258 1.418 -3.578 L 74.185 0.614 c -0.783 -0.819 -2.053 -0.819 -2.836 0 L 58.16 14.398 c -1.264 1.321 -0.369 3.578 1.418 3.578 L 67.773 17.977" style="stroke: none; stroke-width: 1; stroke-dasharray: none; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 10; fill: rgb(120,210,190); fill-rule: nonzero; opacity: 1;" transform=" matrix(1 0 0 1 0 0) " stroke-linecap="round" />
-</g>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="445" height="445"><g style="stroke:none;stroke-width:1;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;fill:none;fill-rule:nonzero;opacity:1"><path d="M40.135 90h-8.782a2.75 2.75 0 0 1-2.75-2.75V45.381a2.75 2.75 0 0 1 2.75-2.75h8.782a2.75 2.75 0 0 1 2.75 2.75V87.25a2.75 2.75 0 0 1-2.75 2.75" style="stroke:none;stroke-width:1;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;fill:#ffc36e;fill-rule:nonzero;opacity:1" transform="translate(-2.472 -2.472)scale(4.94)"/><path d="M58.647 90h-8.782a2.75 2.75 0 0 1-2.75-2.75V31.449a2.75 2.75 0 0 1 2.75-2.75h8.782a2.75 2.75 0 0 1 2.75 2.75V87.25a2.75 2.75 0 0 1-2.75 2.75" style="stroke:none;stroke-width:1;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;fill:#a5d76e;fill-rule:nonzero;opacity:1" transform="translate(-2.472 -2.472)scale(4.94)"/><path d="M21.624 90h-8.782a2.75 2.75 0 0 1-2.75-2.75V59.313a2.75 2.75 0 0 1 2.75-2.75h8.782a2.75 2.75 0 0 1 2.75 2.75V87.25a2.75 2.75 0 0 1-2.75 2.75" style="stroke:none;stroke-width:1;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;fill:#d2555a;fill-rule:nonzero;opacity:1" transform="translate(-2.472 -2.472)scale(4.94)"/><path d="M77.158 90h-8.782a2.75 2.75 0 0 1-2.75-2.75V17.517a2.75 2.75 0 0 1 2.75-2.75h8.782a2.75 2.75 0 0 1 2.75 2.75V87.25a2.75 2.75 0 0 1-2.75 2.75" style="stroke:none;stroke-width:1;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;fill:#78d2be;fill-rule:nonzero;opacity:1" transform="translate(-2.472 -2.472)scale(4.94)"/><path d="M67.773 17.977h18.183c1.787 0 2.682-2.258 1.418-3.578L74.185.614a1.944 1.944 0 0 0-2.836 0L58.16 14.398c-1.264 1.321-.369 3.578 1.418 3.578z" style="stroke:none;stroke-width:1;stroke-dasharray:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;fill:#78d2be;fill-rule:nonzero;opacity:1" transform="translate(-2.472 -2.472)scale(4.94)"/></g></svg>
\ No newline at end of file
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 77f125fd51bc8..b46bc920c05f8 100644
--- a/packages/nodes-base/nodes/QuickChart/test/QuickChart.node.test.ts
+++ b/packages/nodes-base/nodes/QuickChart/test/QuickChart.node.test.ts
@@ -1,12 +1,12 @@
 /* eslint-disable @typescript-eslint/no-loop-func */
-import * as Helpers from '../../../test/nodes/Helpers';
-import type { WorkflowTestData } from '../../../test/nodes/types';
-import { executeWorkflow } from '../../../test/nodes/ExecuteWorkflow';
 import nock from 'nock';
+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 () => {
-		await Helpers.initBinaryDataManager();
+		await Helpers.initBinaryDataService();
 		nock.disableNetConnect();
 		nock('https://quickchart.io')
 			.persist()
diff --git a/packages/nodes-base/nodes/RabbitMQ/DefaultOptions.ts b/packages/nodes-base/nodes/RabbitMQ/DefaultOptions.ts
index 17dcef42c8142..9533fb7f2f894 100644
--- a/packages/nodes-base/nodes/RabbitMQ/DefaultOptions.ts
+++ b/packages/nodes-base/nodes/RabbitMQ/DefaultOptions.ts
@@ -72,6 +72,20 @@ export const rabbitDefaultOptions: Array<
 		default: false,
 		description: 'Whether the queue will be deleted when the number of consumers drops to zero',
 	},
+	{
+		displayName: 'Assert Exchange',
+		name: 'assertExchange',
+		type: 'boolean',
+		default: true,
+		description: 'Whether to assert the exchange exists before sending',
+	},
+	{
+		displayName: 'Assert Queue',
+		name: 'assertQueue',
+		type: 'boolean',
+		default: true,
+		description: 'Whether to assert the queue exists before sending',
+	},
 	{
 		displayName: 'Durable',
 		name: 'durable',
diff --git a/packages/nodes-base/nodes/RabbitMQ/GenericFunctions.ts b/packages/nodes-base/nodes/RabbitMQ/GenericFunctions.ts
index 8f925ce0940ce..f85b20f078aa2 100644
--- a/packages/nodes-base/nodes/RabbitMQ/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/RabbitMQ/GenericFunctions.ts
@@ -1,7 +1,7 @@
 import type { IDataObject, IExecuteFunctions, ITriggerFunctions } from 'n8n-workflow';
 import { sleep } from 'n8n-workflow';
-
 import * as amqplib from 'amqplib';
+import { formatPrivateKey } from '@utils/utilities';
 
 export async function rabbitmqConnect(
 	this: IExecuteFunctions | ITriggerFunctions,
@@ -20,16 +20,23 @@ export async function rabbitmqConnect(
 	if (credentials.ssl === true) {
 		credentialData.protocol = 'amqps';
 
-		optsData.ca = credentials.ca === '' ? undefined : [Buffer.from(credentials.ca as string)];
+		optsData.ca =
+			credentials.ca === '' ? undefined : [Buffer.from(formatPrivateKey(credentials.ca as string))];
 		if (credentials.passwordless === true) {
-			optsData.cert = credentials.cert === '' ? undefined : Buffer.from(credentials.cert as string);
-			optsData.key = credentials.key === '' ? undefined : Buffer.from(credentials.key as string);
+			optsData.cert =
+				credentials.cert === ''
+					? undefined
+					: Buffer.from(formatPrivateKey(credentials.cert as string));
+			optsData.key =
+				credentials.key === ''
+					? undefined
+					: Buffer.from(formatPrivateKey(credentials.key as string));
 			optsData.passphrase = credentials.passphrase === '' ? undefined : credentials.passphrase;
 			optsData.credentials = amqplib.credentials.external();
 		}
 	}
 
-	return new Promise(async (resolve, reject) => {
+	return await new Promise(async (resolve, reject) => {
 		try {
 			const connection = await amqplib.connect(credentialData, optsData);
 
@@ -66,9 +73,26 @@ export async function rabbitmqConnectQueue(
 ): Promise<amqplib.Channel> {
 	const channel = await rabbitmqConnect.call(this, options);
 
-	return new Promise(async (resolve, reject) => {
+	return await new Promise(async (resolve, reject) => {
 		try {
-			await channel.assertQueue(queue, options);
+			if (options.assertQueue) {
+				await channel.assertQueue(queue, options);
+			} else {
+				await channel.checkQueue(queue);
+			}
+
+			if (options.binding && ((options.binding as IDataObject).bindings! as IDataObject[]).length) {
+				((options.binding as IDataObject).bindings as IDataObject[]).forEach(
+					async (binding: IDataObject) => {
+						await channel.bindQueue(
+							queue,
+							binding.exchange as string,
+							binding.routingKey as string,
+						);
+					},
+				);
+			}
+
 			resolve(channel);
 		} catch (error) {
 			reject(error);
@@ -84,9 +108,13 @@ export async function rabbitmqConnectExchange(
 ): Promise<amqplib.Channel> {
 	const channel = await rabbitmqConnect.call(this, options);
 
-	return new Promise(async (resolve, reject) => {
+	return await new Promise(async (resolve, reject) => {
 		try {
-			await channel.assertExchange(exchange, type, options);
+			if (options.assertExchange) {
+				await channel.assertExchange(exchange, type, options);
+			} else {
+				await channel.checkExchange(exchange);
+			}
 			resolve(channel);
 		} catch (error) {
 			reject(error);
diff --git a/packages/nodes-base/nodes/RabbitMQ/RabbitMQ.node.ts b/packages/nodes-base/nodes/RabbitMQ/RabbitMQ.node.ts
index b2e47208eff6f..85017cbdcd937 100644
--- a/packages/nodes-base/nodes/RabbitMQ/RabbitMQ.node.ts
+++ b/packages/nodes-base/nodes/RabbitMQ/RabbitMQ.node.ts
@@ -14,16 +14,16 @@ import type {
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 import { rabbitmqConnectExchange, rabbitmqConnectQueue } from './GenericFunctions';
+import { formatPrivateKey } from '@utils/utilities';
 
 export class RabbitMQ implements INodeType {
 	description: INodeTypeDescription = {
-		// eslint-disable-next-line
 		displayName: 'RabbitMQ',
 		name: 'rabbitmq',
 		// eslint-disable-next-line n8n-nodes-base/node-class-description-icon-not-svg
 		icon: 'file:rabbitmq.png',
 		group: ['transform'],
-		version: 1,
+		version: [1, 1.1],
 		description: 'Sends messages to a RabbitMQ topic',
 		defaults: {
 			name: 'RabbitMQ',
@@ -43,18 +43,71 @@ export class RabbitMQ implements INodeType {
 				name: 'operation',
 				type: 'hidden',
 				noDataExpression: true,
-				default: 'send_message',
+				default: 'sendMessage',
+				displayOptions: {
+					show: {
+						'@version': [1],
+					},
+				},
+				// To remove when action view is fixed
+				options: [
+					{
+						name: 'Send a Message to RabbitMQ',
+						value: 'sendMessage',
+						action: 'Send a Message to RabbitMQ',
+					},
+					{
+						name: 'Delete From Queue',
+						value: 'deleteMessage',
+						action: 'Delete From Queue',
+					},
+				],
+			},
+			{
+				displayName: 'Operation',
+				name: 'operation',
+				type: 'options',
+				noDataExpression: true,
+				default: 'sendMessage',
+				displayOptions: {
+					show: {
+						'@version': [1.1],
+					},
+				},
 				options: [
 					{
 						name: 'Send a Message to RabbitMQ',
-						value: 'send_message',
+						value: 'sendMessage',
+						action: 'Send a Message to RabbitMQ',
+					},
+					{
+						name: 'Delete From Queue',
+						value: 'deleteMessage',
+						action: 'Delete From Queue',
 					},
 				],
 			},
+			{
+				displayName:
+					'Will delete an item from the queue triggered earlier in the workflow by a RabbitMQ Trigger node',
+				name: 'deleteMessage',
+				type: 'notice',
+				default: '',
+				displayOptions: {
+					show: {
+						operation: ['deleteMessage'],
+					},
+				},
+			},
 			{
 				displayName: 'Mode',
 				name: 'mode',
 				type: 'options',
+				displayOptions: {
+					hide: {
+						operation: ['deleteMessage'],
+					},
+				},
 				options: [
 					{
 						name: 'Queue',
@@ -82,6 +135,9 @@ export class RabbitMQ implements INodeType {
 					show: {
 						mode: ['queue'],
 					},
+					hide: {
+						operation: ['deleteMessage'],
+					},
 				},
 				default: '',
 				placeholder: 'queue-name',
@@ -161,8 +217,13 @@ export class RabbitMQ implements INodeType {
 				displayName: 'Send Input Data',
 				name: 'sendInputData',
 				type: 'boolean',
+				displayOptions: {
+					show: {
+						operation: ['sendMessage'],
+					},
+				},
 				default: true,
-				description: 'Whether to send the the data the node receives as JSON',
+				description: 'Whether to send the data the node receives as JSON',
 			},
 			{
 				displayName: 'Message',
@@ -181,6 +242,11 @@ export class RabbitMQ implements INodeType {
 				name: 'options',
 				type: 'collection',
 				default: {},
+				displayOptions: {
+					show: {
+						operation: ['sendMessage'],
+					},
+				},
 				placeholder: 'Add Option',
 				options: [
 					{
@@ -310,12 +376,18 @@ export class RabbitMQ implements INodeType {
 						credentialData.protocol = 'amqps';
 
 						optsData.ca =
-							credentials.ca === '' ? undefined : [Buffer.from(credentials.ca as string)];
+							credentials.ca === ''
+								? undefined
+								: [Buffer.from(formatPrivateKey(credentials.ca as string))];
 						if (credentials.passwordless === true) {
 							optsData.cert =
-								credentials.cert === '' ? undefined : Buffer.from(credentials.cert as string);
+								credentials.cert === ''
+									? undefined
+									: Buffer.from(formatPrivateKey(credentials.cert as string));
 							optsData.key =
-								credentials.key === '' ? undefined : Buffer.from(credentials.key as string);
+								credentials.key === ''
+									? undefined
+									: Buffer.from(formatPrivateKey(credentials.key as string));
 							optsData.passphrase =
 								credentials.passphrase === '' ? undefined : credentials.passphrase;
 							optsData.credentials = amqplib.credentials.external();
@@ -341,10 +413,13 @@ export class RabbitMQ implements INodeType {
 		let channel, options: IDataObject;
 		try {
 			const items = this.getInputData();
-			const mode = this.getNodeParameter('mode', 0) as string;
-
+			const operation = this.getNodeParameter('operation', 0);
+			if (operation === 'deleteMessage') {
+				this.sendResponse(items[0].json);
+				return [items];
+			}
+			const mode = (this.getNodeParameter('mode', 0) as string) || 'queue';
 			const returnItems: INodeExecutionData[] = [];
-
 			if (mode === 'queue') {
 				const queue = this.getNodeParameter('queue', 0) as string;
 
@@ -355,7 +430,6 @@ export class RabbitMQ implements INodeType {
 				const sendInputData = this.getNodeParameter('sendInputData', 0) as boolean;
 
 				let message: string;
-
 				const queuePromises = [];
 				for (let i = 0; i < items.length; i++) {
 					if (sendInputData) {
@@ -378,7 +452,6 @@ export class RabbitMQ implements INodeType {
 						);
 						headers = additionalHeaders;
 					}
-
 					queuePromises.push(channel.sendToQueue(queue, Buffer.from(message), { headers }));
 				}
 
@@ -483,7 +556,7 @@ export class RabbitMQ implements INodeType {
 				throw new NodeOperationError(this.getNode(), `The operation "${mode}" is not known!`);
 			}
 
-			return await this.prepareOutputData(returnItems);
+			return [returnItems];
 		} catch (error) {
 			if (channel) {
 				await channel.close();
diff --git a/packages/nodes-base/nodes/RabbitMQ/RabbitMQTrigger.node.ts b/packages/nodes-base/nodes/RabbitMQ/RabbitMQTrigger.node.ts
index 3c7541a1b425a..7d8dd7c398e7d 100644
--- a/packages/nodes-base/nodes/RabbitMQ/RabbitMQTrigger.node.ts
+++ b/packages/nodes-base/nodes/RabbitMQ/RabbitMQTrigger.node.ts
@@ -2,6 +2,7 @@
 import type {
 	IDataObject,
 	IDeferredPromise,
+	IExecuteResponsePromiseData,
 	INodeExecutionData,
 	INodeProperties,
 	INodeType,
@@ -25,9 +26,21 @@ export class RabbitMQTrigger implements INodeType {
 		group: ['trigger'],
 		version: 1,
 		description: 'Listens to RabbitMQ messages',
+		eventTriggerDescription: '',
 		defaults: {
 			name: 'RabbitMQ Trigger',
 		},
+		triggerPanel: {
+			header: '',
+			executionsHelp: {
+				inactive:
+					"<b>While building your workflow</b>, click the 'listen' button, then trigger a Rabbit MQ event. This will trigger an execution, which will show up in this editor.<br /> <br /><b>Once you're happy with your workflow</b>, <a data-key='activate'>activate</a> it. Then every time a change is detected, the workflow will execute. These executions will show up in the <a data-key='executions'>executions list</a>, but not in the editor.",
+				active:
+					"<b>While building your workflow</b>, click the 'listen' button, then trigger a Rabbit MQ event. This will trigger an execution, which will show up in this editor.<br /> <br /><b>Your workflow will also execute automatically</b>, since it's activated. Every time a change is detected, this node will trigger an execution. These executions will show up in the <a data-key='executions'>executions list</a>, but not in the editor.",
+			},
+			activationHint:
+				"Once you’ve finished building your workflow, <a data-key='activate'>activate</a> it to have it also listen continuously (you just won’t see those executions here).",
+		},
 		inputs: [],
 		outputs: ['main'],
 		credentials: [
@@ -45,7 +58,6 @@ export class RabbitMQTrigger implements INodeType {
 				placeholder: 'queue-name',
 				description: 'The name of the queue to read from',
 			},
-
 			{
 				displayName: 'Options',
 				name: 'options',
@@ -81,6 +93,11 @@ export class RabbitMQTrigger implements INodeType {
 								value: 'immediately',
 								description: 'As soon as the message got received',
 							},
+							{
+								name: 'Specified Later in Workflow',
+								value: 'laterMessageNode',
+								description: 'Using a RabbitMQ node to remove the item from the queue',
+							},
 						],
 						default: 'immediately',
 						description: 'When to acknowledge the message',
@@ -109,7 +126,7 @@ export class RabbitMQTrigger implements INodeType {
 						default: false,
 						description: 'Whether to return only the content property',
 					},
-					// eslint-disable-next-line n8n-nodes-base/node-param-default-missing
+
 					{
 						displayName: 'Parallel Message Processing Limit',
 						name: 'parallelMessages',
@@ -122,6 +139,39 @@ export class RabbitMQTrigger implements INodeType {
 						},
 						description: 'Max number of executions at a time. Use -1 for no limit.',
 					},
+					{
+						displayName: 'Binding',
+						name: 'binding',
+						placeholder: 'Add Binding',
+						description: 'Add binding to queu',
+						type: 'fixedCollection',
+						typeOptions: {
+							multipleValues: true,
+						},
+						default: {},
+						options: [
+							{
+								name: 'bindings',
+								displayName: 'Binding',
+								values: [
+									{
+										displayName: 'Exchange',
+										name: 'exchange',
+										type: 'string',
+										default: '',
+										placeholder: 'exchange',
+									},
+									{
+										displayName: 'RoutingKey',
+										name: 'routingKey',
+										type: 'string',
+										default: '',
+										placeholder: 'routing-key',
+									},
+								],
+							},
+						],
+					},
 					...rabbitDefaultOptions,
 				].sort((a, b) => {
 					if (
@@ -139,6 +189,18 @@ export class RabbitMQTrigger implements INodeType {
 					return 0;
 				}) as INodeProperties[],
 			},
+			{
+				displayName:
+					"To delete an item from the queue, insert a RabbitMQ node later in the workflow and use the 'Delete from queue' operation",
+				name: 'laterMessageNode',
+				type: 'notice',
+				displayOptions: {
+					show: {
+						'/options.acknowledge': ['laterMessageNode'],
+					},
+				},
+				default: '',
+			},
 		],
 	};
 
@@ -201,7 +263,6 @@ export class RabbitMQTrigger implements INodeType {
 						const item: INodeExecutionData = {
 							json: {},
 						};
-
 						if (options.contentIsBinary === true) {
 							item.binary = {
 								data: await this.helpers.prepareBinaryData(message.content),
@@ -222,13 +283,20 @@ export class RabbitMQTrigger implements INodeType {
 						}
 
 						let responsePromise: IDeferredPromise<IRun> | undefined = undefined;
-						if (acknowledgeMode !== 'immediately') {
+						let responsePromiseHook: IDeferredPromise<IExecuteResponsePromiseData> | undefined =
+							undefined;
+						if (acknowledgeMode !== 'immediately' && acknowledgeMode !== 'laterMessageNode') {
 							responsePromise = await this.helpers.createDeferredPromise();
+						} else if (acknowledgeMode === 'laterMessageNode') {
+							responsePromiseHook =
+								await this.helpers.createDeferredPromise<IExecuteResponsePromiseData>();
 						}
-
-						this.emit([[item]], undefined, responsePromise);
-
-						if (responsePromise) {
+						if (responsePromiseHook) {
+							this.emit([[item]], responsePromiseHook, undefined);
+						} else {
+							this.emit([[item]], undefined, responsePromise);
+						}
+						if (responsePromise && acknowledgeMode !== 'laterMessageNode') {
 							// Acknowledge message after the execution finished
 							await responsePromise.promise().then(async (data: IRun) => {
 								if (data.data.resultData.error) {
@@ -239,7 +307,11 @@ export class RabbitMQTrigger implements INodeType {
 										return;
 									}
 								}
-
+								channel.ack(message);
+								messageTracker.answered(message);
+							});
+						} else if (responsePromiseHook && acknowledgeMode === 'laterMessageNode') {
+							await responsePromiseHook.promise().then(() => {
 								channel.ack(message);
 								messageTracker.answered(message);
 							});
@@ -266,7 +338,6 @@ export class RabbitMQTrigger implements INodeType {
 			});
 			consumerTag = consumerInfo.consumerTag;
 		};
-
 		await startConsumer();
 
 		// The "closeFunction" function gets called by n8n whenever
diff --git a/packages/nodes-base/nodes/Raindrop/GenericFunctions.ts b/packages/nodes-base/nodes/Raindrop/GenericFunctions.ts
index cde8a82e906cb..ac2e2d87bc1bb 100644
--- a/packages/nodes-base/nodes/Raindrop/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Raindrop/GenericFunctions.ts
@@ -4,23 +4,23 @@ import type {
 	IDataObject,
 	ILoadOptionsFunctions,
 	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import type { OptionsWithUri } from 'request';
-
 /**
  * Make an authenticated API request to Raindrop.
  */
 export async function raindropApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	qs: IDataObject,
 	body: IDataObject,
 	option: IDataObject = {},
 ) {
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			'user-agent': 'n8n',
 			'Content-Type': 'application/json',
diff --git a/packages/nodes-base/nodes/Raindrop/Raindrop.node.ts b/packages/nodes-base/nodes/Raindrop/Raindrop.node.ts
index 5c3632189eb93..c0f98cd52dd31 100644
--- a/packages/nodes-base/nodes/Raindrop/Raindrop.node.ts
+++ b/packages/nodes-base/nodes/Raindrop/Raindrop.node.ts
@@ -8,8 +8,8 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import isEmpty from 'lodash.isempty';
-import omit from 'lodash.omit';
+import isEmpty from 'lodash/isEmpty';
+import omit from 'lodash/omit';
 
 import { raindropApiRequest } from './GenericFunctions';
 
diff --git a/packages/nodes-base/nodes/Raindrop/raindrop.svg b/packages/nodes-base/nodes/Raindrop/raindrop.svg
index 3ea52bc0fe877..6490efb8aae86 100644
--- a/packages/nodes-base/nodes/Raindrop/raindrop.svg
+++ b/packages/nodes-base/nodes/Raindrop/raindrop.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="-2 -5 42 42"><defs><path id="a" d="M9.5.917a9.5 9.5 0 019.5 9.5v9.5H9.5a9.5 9.5 0 010-19z"/><path id="c" d="M0 19.917v-9.5l.004-.27a9.5 9.5 0 119.496 9.77H0z"/></defs><g fill="none" fill-rule="evenodd"><path fill="#1988E0" d="M28.192 4.7c5.077 4.933 5.077 12.93 0 17.863-.17.165-.343.325-.519.479L19 31l-8.673-7.958c-.176-.154-.35-.314-.52-.479-5.076-4.932-5.076-12.93 0-17.863 5.077-4.933 13.309-4.933 18.385 0z"/><g transform="translate(0 11.083)"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><use fill="#2CD4ED" xlink:href="#a"/><path fill="#0DB4E2" d="M28.192-6.384c5.077 4.933 5.077 12.931 0 17.864-.17.165-.343.324-.519.478L19 19.917l-8.673-7.959c-.176-.154-.35-.313-.52-.478-5.076-4.933-5.076-12.93 0-17.864 5.077-4.933 13.309-4.933 18.385 0z" mask="url(#b)"/></g><g transform="translate(19 11.083)"><mask id="d" fill="#fff"><use xlink:href="#c"/></mask><use fill="#3169FF" xlink:href="#c"/><path fill="#3153FF" d="M9.192-6.384c5.077 4.933 5.077 12.931 0 17.864-.17.165-.343.324-.519.478L0 19.917l-8.673-7.959c-.176-.154-.35-.313-.52-.478-5.076-4.933-5.076-12.93 0-17.864 5.077-4.933 13.309-4.933 18.385 0z" mask="url(#d)"/></g></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="-2 -5 42 42"><defs><path id="a" d="M9.5.917a9.5 9.5 0 0 1 9.5 9.5v9.5H9.5a9.5 9.5 0 0 1 0-19"/><path id="c" d="M0 19.917v-9.5l.004-.27a9.5 9.5 0 1 1 9.496 9.77z"/></defs><g fill="none" fill-rule="evenodd"><path fill="#1988E0" d="M28.192 4.7c5.077 4.933 5.077 12.93 0 17.863q-.255.248-.519.479L19 31l-8.673-7.958q-.264-.231-.52-.479c-5.076-4.932-5.076-12.93 0-17.863 5.077-4.933 13.309-4.933 18.385 0"/><g transform="translate(0 11.083)"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><use xlink:href="#a" fill="#2CD4ED"/><path fill="#0DB4E2" d="M28.192-6.384c5.077 4.933 5.077 12.931 0 17.864q-.255.247-.519.478L19 19.917l-8.673-7.959q-.264-.23-.52-.478c-5.076-4.933-5.076-12.93 0-17.864 5.077-4.933 13.309-4.933 18.385 0" mask="url(#b)"/></g><g transform="translate(19 11.083)"><mask id="d" fill="#fff"><use xlink:href="#c"/></mask><use xlink:href="#c" fill="#3169FF"/><path fill="#3153FF" d="M9.192-6.384c5.077 4.933 5.077 12.931 0 17.864q-.255.247-.519.478L0 19.917l-8.673-7.959q-.264-.23-.52-.478c-5.076-4.933-5.076-12.93 0-17.864 5.077-4.933 13.309-4.933 18.385 0" mask="url(#d)"/></g></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/ReadBinaryFile/ReadBinaryFile.node.json b/packages/nodes-base/nodes/ReadBinaryFile/ReadBinaryFile.node.json
index eded0c4e88a49..73b50bbc647df 100644
--- a/packages/nodes-base/nodes/ReadBinaryFile/ReadBinaryFile.node.json
+++ b/packages/nodes-base/nodes/ReadBinaryFile/ReadBinaryFile.node.json
@@ -6,7 +6,7 @@
 	"resources": {
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.readbinaryfiles/"
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.filesreadwrite/"
 			}
 		],
 		"generic": [
diff --git a/packages/nodes-base/nodes/ReadBinaryFile/ReadBinaryFile.node.ts b/packages/nodes-base/nodes/ReadBinaryFile/ReadBinaryFile.node.ts
index 00b591ee61945..13d5678b8fcd7 100644
--- a/packages/nodes-base/nodes/ReadBinaryFile/ReadBinaryFile.node.ts
+++ b/packages/nodes-base/nodes/ReadBinaryFile/ReadBinaryFile.node.ts
@@ -67,15 +67,17 @@ export class ReadBinaryFile implements INodeType {
 				}
 
 				const filePath = this.getNodeParameter('filePath', itemIndex);
+
 				const stream = await this.helpers.createReadStream(filePath);
 				const dataPropertyName = this.getNodeParameter('dataPropertyName', itemIndex);
+
 				newItem.binary![dataPropertyName] = await this.helpers.prepareBinaryData(stream, filePath);
 				returnData.push(newItem);
 			} catch (error) {
 				if (this.continueOnFail()) {
 					returnData.push({
 						json: {
-							error: error.message,
+							error: (error as Error).message,
 						},
 						pairedItem: {
 							item: itemIndex,
@@ -87,6 +89,6 @@ export class ReadBinaryFile implements INodeType {
 			}
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/ReadBinaryFile/test/ReadBinaryFile.test.ts b/packages/nodes-base/nodes/ReadBinaryFile/test/ReadBinaryFile.test.ts
index fbba908978002..c94feb97cf425 100644
--- a/packages/nodes-base/nodes/ReadBinaryFile/test/ReadBinaryFile.test.ts
+++ b/packages/nodes-base/nodes/ReadBinaryFile/test/ReadBinaryFile.test.ts
@@ -1,12 +1,12 @@
 /* eslint-disable @typescript-eslint/no-loop-func */
-import * as Helpers from '../../../test/nodes/Helpers';
-import type { WorkflowTestData } from '../../../test/nodes/types';
-import { executeWorkflow } from '../../../test/nodes/ExecuteWorkflow';
 import path from 'path';
+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 () => {
-		await Helpers.initBinaryDataManager();
+		await Helpers.initBinaryDataService();
 	});
 
 	const workflow = Helpers.readJsonFileSync(
diff --git a/packages/nodes-base/nodes/ReadBinaryFiles/ReadBinaryFiles.node.json b/packages/nodes-base/nodes/ReadBinaryFiles/ReadBinaryFiles.node.json
index 467151be71bf0..b9c9911ab292d 100644
--- a/packages/nodes-base/nodes/ReadBinaryFiles/ReadBinaryFiles.node.json
+++ b/packages/nodes-base/nodes/ReadBinaryFiles/ReadBinaryFiles.node.json
@@ -6,7 +6,7 @@
 	"resources": {
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.readbinaryfiles/"
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.filesreadwrite/"
 			}
 		]
 	},
diff --git a/packages/nodes-base/nodes/ReadBinaryFiles/ReadBinaryFiles.node.ts b/packages/nodes-base/nodes/ReadBinaryFiles/ReadBinaryFiles.node.ts
index bd9ebcb666d88..a1f0939c9e91b 100644
--- a/packages/nodes-base/nodes/ReadBinaryFiles/ReadBinaryFiles.node.ts
+++ b/packages/nodes-base/nodes/ReadBinaryFiles/ReadBinaryFiles.node.ts
@@ -4,10 +4,13 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
+
 import glob from 'fast-glob';
+import { generatePairedItemData } from '../../utils/utilities';
 
 export class ReadBinaryFiles implements INodeType {
 	description: INodeTypeDescription = {
+		hidden: true,
 		displayName: 'Read Binary Files',
 		name: 'readBinaryFiles',
 		icon: 'fa:file-import',
@@ -44,6 +47,7 @@ export class ReadBinaryFiles implements INodeType {
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const fileSelector = this.getNodeParameter('fileSelector', 0) as string;
 		const dataPropertyName = this.getNodeParameter('dataPropertyName', 0);
+		const pairedItem = generatePairedItemData(this.getInputData().length);
 
 		const files = await glob(fileSelector);
 
@@ -55,12 +59,10 @@ export class ReadBinaryFiles implements INodeType {
 					[dataPropertyName]: await this.helpers.prepareBinaryData(stream, filePath),
 				},
 				json: {},
-				pairedItem: {
-					item: 0,
-				},
+				pairedItem,
 			});
 		}
 
-		return this.prepareOutputData(items);
+		return [items];
 	}
 }
diff --git a/packages/nodes-base/nodes/ReadBinaryFiles/test/ReadBinaryFiles.test.ts b/packages/nodes-base/nodes/ReadBinaryFiles/test/ReadBinaryFiles.test.ts
new file mode 100644
index 0000000000000..76235ae1e2fd1
--- /dev/null
+++ b/packages/nodes-base/nodes/ReadBinaryFiles/test/ReadBinaryFiles.test.ts
@@ -0,0 +1,78 @@
+/* eslint-disable @typescript-eslint/no-loop-func */
+import path from 'path';
+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 () => {
+		await Helpers.initBinaryDataService();
+	});
+
+	const workflow = Helpers.readJsonFileSync(
+		'nodes/ReadBinaryFiles/test/ReadBinaryFiles.workflow.json',
+	);
+	const node = workflow.nodes.find((n: any) => n.name === 'Read Binary Files');
+	const dir = path.join(__dirname, 'data').split('\\').join('/');
+	node.parameters.fileSelector = `${dir}/*.json`;
+
+	const tests: WorkflowTestData[] = [
+		{
+			description: 'nodes/ReadBinaryFiles/test/ReadBinaryFiles.workflow.json',
+			input: {
+				workflowData: workflow,
+			},
+			output: {
+				nodeData: {
+					'Read Binary Files': [
+						[
+							{
+								binary: {
+									data: {
+										mimeType: 'application/json',
+										fileType: 'json',
+										fileExtension: 'json',
+										data: 'ewoJInRpdGxlIjogIkxvcmVtIElwc3VtIgp9Cg==',
+										directory: dir,
+										fileName: 'sample.json',
+										fileSize: '28 B',
+									},
+								},
+								json: {},
+							},
+							{
+								binary: {
+									data: {
+										mimeType: 'application/json',
+										fileType: 'json',
+										fileExtension: 'json',
+										data: 'ewoJInRpdGxlIjogIklwc3VtIExvcmVtIgp9Cg==',
+										directory: dir,
+										fileName: 'sample2.json',
+										fileSize: '28 B',
+									},
+								},
+								json: {},
+							},
+						],
+					],
+				},
+			},
+		},
+	];
+
+	const nodeTypes = Helpers.setup(tests);
+
+	for (const testData of tests) {
+		test(testData.description, async () => {
+			const { result } = await executeWorkflow(testData, nodeTypes);
+
+			const resultNodeData = Helpers.getResultNodeData(result, testData);
+			resultNodeData.forEach(({ nodeName, resultData }) =>
+				expect(resultData).toEqual(testData.output.nodeData[nodeName]),
+			);
+
+			expect(result.finished).toEqual(true);
+		});
+	}
+});
diff --git a/packages/nodes-base/nodes/ReadBinaryFiles/test/ReadBinaryFiles.workflow.json b/packages/nodes-base/nodes/ReadBinaryFiles/test/ReadBinaryFiles.workflow.json
new file mode 100644
index 0000000000000..7fecfa05021b2
--- /dev/null
+++ b/packages/nodes-base/nodes/ReadBinaryFiles/test/ReadBinaryFiles.workflow.json
@@ -0,0 +1,45 @@
+{
+	"name": "Read Binary Files test",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "90c8a569-5351-44a4-9073-b8d114108676",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [680, 640]
+		},
+		{
+			"parameters": {
+				"fileSelector": "C:/Test/data/*.json"
+			},
+			"id": "b4974ce2-9bc8-4242-b6f9-86b43608b521",
+			"name": "Read Binary Files",
+			"type": "n8n-nodes-base.readBinaryFiles",
+			"typeVersion": 1,
+			"position": [880, 640]
+		}
+	],
+	"pinData": {},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Read Binary Files",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {},
+	"versionId": "973f1d06-f5e6-4e05-8136-02f6518ad37b",
+	"id": "190",
+	"meta": {
+		"instanceId": "104a4d08d8897b8bdeb38aaca515021075e0bd8544c983c2bb8c86e6a8e6081c"
+	},
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/ReadBinaryFiles/test/data/sample.json b/packages/nodes-base/nodes/ReadBinaryFiles/test/data/sample.json
new file mode 100644
index 0000000000000..572ecfcee2202
--- /dev/null
+++ b/packages/nodes-base/nodes/ReadBinaryFiles/test/data/sample.json
@@ -0,0 +1,3 @@
+{
+	"title": "Lorem Ipsum"
+}
diff --git a/packages/nodes-base/nodes/ReadBinaryFiles/test/data/sample2.json b/packages/nodes-base/nodes/ReadBinaryFiles/test/data/sample2.json
new file mode 100644
index 0000000000000..f9bb627b46a90
--- /dev/null
+++ b/packages/nodes-base/nodes/ReadBinaryFiles/test/data/sample2.json
@@ -0,0 +1,3 @@
+{
+	"title": "Ipsum Lorem"
+}
diff --git a/packages/nodes-base/nodes/ReadPdf/ReadPDF.node.json b/packages/nodes-base/nodes/ReadPdf/ReadPDF.node.json
index e3c4a8723b87f..e1bc6666faed7 100644
--- a/packages/nodes-base/nodes/ReadPdf/ReadPDF.node.json
+++ b/packages/nodes-base/nodes/ReadPdf/ReadPDF.node.json
@@ -6,7 +6,7 @@
 	"resources": {
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.readpdf/"
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.extractfromfile/"
 			}
 		]
 	},
diff --git a/packages/nodes-base/nodes/ReadPdf/ReadPDF.node.ts b/packages/nodes-base/nodes/ReadPdf/ReadPDF.node.ts
index 6626c94e53575..ff882dfca5ffa 100644
--- a/packages/nodes-base/nodes/ReadPdf/ReadPDF.node.ts
+++ b/packages/nodes-base/nodes/ReadPdf/ReadPDF.node.ts
@@ -1,15 +1,15 @@
-import type {
-	IExecuteFunctions,
-	IDataObject,
-	INodeExecutionData,
-	INodeType,
-	INodeTypeDescription,
+import {
+	NodeOperationError,
+	type IExecuteFunctions,
+	type INodeExecutionData,
+	type INodeType,
+	type INodeTypeDescription,
 } from 'n8n-workflow';
-
-import pdf from 'pdf-parse';
+import { extractDataFromPDF } from '@utils/binary';
 
 export class ReadPDF implements INodeType {
 	description: INodeTypeDescription = {
+		hidden: true,
 		displayName: 'Read PDF',
 		// eslint-disable-next-line n8n-nodes-base/node-class-description-name-miscased
 		name: 'readPDF',
@@ -25,13 +25,33 @@ export class ReadPDF implements INodeType {
 		outputs: ['main'],
 		properties: [
 			{
-				displayName: 'Binary Property',
+				displayName: 'Input Binary Field',
 				name: 'binaryPropertyName',
 				type: 'string',
 				default: 'data',
 				required: true,
 				description: 'Name of the binary property from which to read the PDF file',
 			},
+			{
+				displayName: 'Encrypted',
+				name: 'encrypted',
+				type: 'boolean',
+				default: false,
+				required: true,
+			},
+			{
+				displayName: 'Password',
+				name: 'password',
+				type: 'string',
+				typeOptions: { password: true },
+				default: '',
+				description: 'Password to decrypt the PDF file with',
+				displayOptions: {
+					show: {
+						encrypted: [true],
+					},
+				},
+			},
 		],
 	};
 
@@ -40,25 +60,28 @@ export class ReadPDF implements INodeType {
 
 		const returnData: INodeExecutionData[] = [];
 		const length = items.length;
-		let item: INodeExecutionData;
 
 		for (let itemIndex = 0; itemIndex < length; itemIndex++) {
 			try {
-				item = items[itemIndex];
 				const binaryPropertyName = this.getNodeParameter('binaryPropertyName', itemIndex);
 
-				if (item.binary === undefined) {
-					item.binary = {};
+				let password;
+				if (this.getNodeParameter('encrypted', itemIndex) === true) {
+					password = this.getNodeParameter('password', itemIndex) as string;
 				}
 
-				const binaryDataBuffer = await this.helpers.getBinaryDataBuffer(
-					itemIndex,
+				const json = await extractDataFromPDF.call(
+					this,
 					binaryPropertyName,
+					password,
+					undefined,
+					undefined,
+					itemIndex,
 				);
-				returnData.push({
-					binary: item.binary,
 
-					json: (await pdf(binaryDataBuffer)) as unknown as IDataObject,
+				returnData.push({
+					binary: items[itemIndex].binary,
+					json,
 				});
 			} catch (error) {
 				if (this.continueOnFail()) {
@@ -72,9 +95,9 @@ export class ReadPDF implements INodeType {
 					});
 					continue;
 				}
-				throw error;
+				throw new NodeOperationError(this.getNode(), error, { itemIndex });
 			}
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/ReadPdf/test/ReadPDF-encrypted.workflow.json b/packages/nodes-base/nodes/ReadPdf/test/ReadPDF-encrypted.workflow.json
new file mode 100644
index 0000000000000..1bf9f597b819b
--- /dev/null
+++ b/packages/nodes-base/nodes/ReadPdf/test/ReadPDF-encrypted.workflow.json
@@ -0,0 +1,88 @@
+{
+	"nodes": [
+		{
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"parameters": {},
+			"position": [660, 580]
+		},
+		{
+			"name": "Read sample-encrypted.pdf",
+			"type": "n8n-nodes-base.readBinaryFile",
+			"typeVersion": 1,
+			"parameters": {
+				"filePath": "C:\\Test\\sample-encrypted.pdf"
+			},
+			"position": [880, 780]
+		},
+		{
+			"name": "Read PDF (encrypted)",
+			"type": "n8n-nodes-base.readPDF",
+			"typeVersion": 1,
+			"parameters": {
+				"encrypted": true,
+				"password": "ReaderPassword"
+			},
+			"position": [1100, 780]
+		}
+	],
+	"pinData": {
+		"Read PDF (encrypted)": [
+			{
+				"binary": {
+					"data": {
+						"fileExtension": "pdf",
+						"fileName": "sample-encrypted.pdf",
+						"fileSize": "18.9 kB",
+						"fileType": "pdf",
+						"mimeType": "application/pdf"
+					}
+				},
+				"json": {
+					"numpages": 1,
+					"numrender": 1,
+					"info": {
+						"PDFFormatVersion": "1.7",
+						"Language": null,
+						"EncryptFilterName": "Standard",
+						"IsLinearized": false,
+						"IsAcroFormPresent": false,
+						"IsXFAPresent": false,
+						"IsCollectionPresent": false,
+						"IsSignaturesPresent": false,
+						"ModDate": "D:20230210122750Z",
+						"Producer": "iLovePDF",
+						"Title": "sample"
+					},
+					"text": "N8N\nSample PDF\nLorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor\ninvidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et\njusto duo dolores et ea rebum.",
+					"version": "2.16.105"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Read sample-encrypted.pdf",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Read sample-encrypted.pdf": {
+			"main": [
+				[
+					{
+						"node": "Read PDF (encrypted)",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	}
+}
diff --git a/packages/nodes-base/nodes/ReadPdf/test/ReadPDF.test.ts b/packages/nodes-base/nodes/ReadPdf/test/ReadPDF.test.ts
index b814a3eee5ead..8a394c0ce9ba4 100644
--- a/packages/nodes-base/nodes/ReadPdf/test/ReadPDF.test.ts
+++ b/packages/nodes-base/nodes/ReadPdf/test/ReadPDF.test.ts
@@ -1,60 +1,11 @@
-/* eslint-disable @typescript-eslint/no-loop-func */
-import * as Helpers from '../../../test/nodes/Helpers';
-import type { WorkflowTestData } from '../../../test/nodes/types';
-import { executeWorkflow } from '../../../test/nodes/ExecuteWorkflow';
-import path from 'path';
+import { getWorkflowFilenames, initBinaryDataService, testWorkflows } from '@test/nodes/Helpers';
 
 describe('Test Read PDF Node', () => {
-	beforeEach(async () => {
-		await Helpers.initBinaryDataManager();
-	});
-
-	const workflow = Helpers.readJsonFileSync('nodes/ReadPdf/test/ReadPDF.workflow.json');
-	const node = workflow.nodes.find((n: any) => n.name === 'Read Binary File');
-	node.parameters.filePath = path.join(__dirname, 'sample.pdf');
-
-	const testData: WorkflowTestData = {
-		description: 'nodes/ReadPdf/test/ReadPDF.workflow.json',
-		input: {
-			workflowData: workflow,
-		},
-		output: {
-			nodeData: {
-				'Read PDF': [
-					[
-						{
-							json: {
-								numpages: 1,
-								numrender: 1,
-								info: {
-									PDFFormatVersion: '1.4',
-									IsAcroFormPresent: false,
-									IsXFAPresent: false,
-									Title: 'sample',
-									Producer: 'iLovePDF',
-									ModDate: 'D:20230210122750Z',
-								},
-								metadata: null,
-								text: '\n\nN8N\nSample PDF\nLorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor\ninvidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et\njusto duo dolores et ea rebum.',
-								version: '1.10.100',
-							},
-						},
-					],
-				],
-			},
-		},
-	};
-
-	const nodeTypes = Helpers.setup(testData);
+	const workflows = getWorkflowFilenames(__dirname);
 
-	test(testData.description, async () => {
-		const { result } = await executeWorkflow(testData, nodeTypes);
-		const resultNodeData = Helpers.getResultNodeData(result, testData);
-
-		// delete binary data because we test against json only
-		delete resultNodeData[0].resultData[0]![0].binary;
-		expect(resultNodeData[0].resultData).toEqual(testData.output.nodeData['Read PDF']);
-
-		expect(result.finished).toEqual(true);
+	beforeAll(async () => {
+		await initBinaryDataService();
 	});
+
+	testWorkflows(workflows);
 });
diff --git a/packages/nodes-base/nodes/ReadPdf/test/ReadPDF.workflow.json b/packages/nodes-base/nodes/ReadPdf/test/ReadPDF.workflow.json
index 9d6aaf0c1fd2b..5b257711addc4 100644
--- a/packages/nodes-base/nodes/ReadPdf/test/ReadPDF.workflow.json
+++ b/packages/nodes-base/nodes/ReadPdf/test/ReadPDF.workflow.json
@@ -1,47 +1,76 @@
 {
-	"name": "Read PDF node unit test",
 	"nodes": [
 		{
-			"parameters": {},
-			"id": "0c9db33c-dd15-4088-9d12-b9f3b8f1fa96",
 			"name": "When clicking \"Execute Workflow\"",
 			"type": "n8n-nodes-base.manualTrigger",
 			"typeVersion": 1,
-			"position": [960, 540]
-		},
-		{
 			"parameters": {},
-			"id": "86abdc3b-206d-4b67-a37f-6b67b6bd3bbc",
-			"name": "Read PDF",
-			"type": "n8n-nodes-base.readPDF",
-			"typeVersion": 1,
-			"position": [1400, 540]
+			"position": [660, 580]
 		},
 		{
+			"name": "Read sample.pdf",
+			"type": "n8n-nodes-base.readBinaryFile",
+			"typeVersion": 1,
 			"parameters": {
 				"filePath": "C:\\Test\\sample.pdf"
 			},
-			"id": "2f6d241e-44a4-4213-b49a-166201946a89",
-			"name": "Read Binary File",
-			"type": "n8n-nodes-base.readBinaryFile",
+			"position": [880, 580]
+		},
+		{
+			"name": "Read PDF",
+			"type": "n8n-nodes-base.readPDF",
 			"typeVersion": 1,
-			"position": [1180, 540]
+			"parameters": {},
+			"position": [1100, 580]
 		}
 	],
-	"pinData": {},
+	"pinData": {
+		"Read PDF": [
+			{
+				"binary": {
+					"data": {
+						"fileExtension": "pdf",
+						"fileName": "sample.pdf",
+						"fileSize": "17.8 kB",
+						"fileType": "pdf",
+						"mimeType": "application/pdf"
+					}
+				},
+				"json": {
+					"numpages": 1,
+					"numrender": 1,
+					"info": {
+						"PDFFormatVersion": "1.4",
+						"Language": null,
+						"EncryptFilterName": null,
+						"IsLinearized": false,
+						"IsAcroFormPresent": false,
+						"IsXFAPresent": false,
+						"IsCollectionPresent": false,
+						"IsSignaturesPresent": false,
+						"Title": "sample",
+						"Producer": "iLovePDF",
+						"ModDate": "D:20230210122750Z"
+					},
+					"text": "N8N\nSample PDF\nLorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor\ninvidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et\njusto duo dolores et ea rebum.",
+					"version": "2.16.105"
+				}
+			}
+		]
+	},
 	"connections": {
 		"When clicking \"Execute Workflow\"": {
 			"main": [
 				[
 					{
-						"node": "Read Binary File",
+						"node": "Read sample.pdf",
 						"type": "main",
 						"index": 0
 					}
 				]
 			]
 		},
-		"Read Binary File": {
+		"Read sample.pdf": {
 			"main": [
 				[
 					{
@@ -52,13 +81,5 @@
 				]
 			]
 		}
-	},
-	"active": false,
-	"settings": {},
-	"versionId": "9802b48d-727a-40ef-ad87-d544a9a648a7",
-	"id": "188",
-	"meta": {
-		"instanceId": "104a4d08d8897b8bdeb38aaca515021075e0bd8544c983c2bb8c86e6a8e6081c"
-	},
-	"tags": []
+	}
 }
diff --git a/packages/nodes-base/nodes/ReadPdf/test/sample-encrypted.pdf b/packages/nodes-base/nodes/ReadPdf/test/sample-encrypted.pdf
new file mode 100644
index 0000000000000..52d7fe80e8a39
Binary files /dev/null and b/packages/nodes-base/nodes/ReadPdf/test/sample-encrypted.pdf differ
diff --git a/packages/nodes-base/nodes/Reddit/GenericFunctions.ts b/packages/nodes-base/nodes/Reddit/GenericFunctions.ts
index 0008785eba174..e18982f9b908d 100644
--- a/packages/nodes-base/nodes/Reddit/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Reddit/GenericFunctions.ts
@@ -1,14 +1,19 @@
-import type { IExecuteFunctions, IHookFunctions, IDataObject, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IHookFunctions,
+	IDataObject,
+	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import type { OptionsWithUri } from 'request';
-
 /**
  * Make an authenticated or unauthenticated API request to Reddit.
  */
 export async function redditApiRequest(
 	this: IHookFunctions | IExecuteFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	qs: IDataObject,
 ): Promise<any> {
@@ -18,7 +23,7 @@ export async function redditApiRequest(
 
 	qs.api_type = 'json';
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			'user-agent': 'n8n',
 		},
@@ -54,7 +59,7 @@ export async function redditApiRequest(
  */
 export async function redditApiRequestAllItems(
 	this: IHookFunctions | IExecuteFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	qs: IDataObject,
 ): Promise<any> {
diff --git a/packages/nodes-base/nodes/Reddit/Reddit.node.ts b/packages/nodes-base/nodes/Reddit/Reddit.node.ts
index 0980361273908..6c29f9791da2a 100644
--- a/packages/nodes-base/nodes/Reddit/Reddit.node.ts
+++ b/packages/nodes-base/nodes/Reddit/Reddit.node.ts
@@ -440,6 +440,6 @@ export class Reddit implements INodeType {
 			}
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Reddit/reddit.svg b/packages/nodes-base/nodes/Reddit/reddit.svg
index 810345c370822..36fe20f49f34a 100644
--- a/packages/nodes-base/nodes/Reddit/reddit.svg
+++ b/packages/nodes-base/nodes/Reddit/reddit.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 513 514" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><g stroke="none" fill-rule="nonzero"><path d="M0 76.8C0 34.253 34.253 0 76.8 0h358.4C477.747 0 512 34.253 512 76.8v358.4c0 42.547-34.253 76.8-76.8 76.8H76.8C34.253 512 0 477.747 0 435.2z" fill="#ff4500"/><path d="M79 305c0-68.142 78.942-123 177-123s177 54.858 177 123-78.942 123-177 123S79 373.142 79 305z"/><g fill="#ff4500"><path d="M199 347c35 29 79 29 114 0l12 11c-42 35-96 35-138 0z"/><use xlink:href="#b"/><use xlink:href="#b" x="-118"/></g></g><g stroke="#fff" fill="none"><use xlink:href="#b" x="75" y="-160" stroke-width="25"/><path d="M87 282c-45-22-5-92 40-50m298 50c45-22 5-92-40-50m-127-45l24-83 80 16" stroke-width="22"/></g></symbol><defs><path id="b" d="M287 285a27.94 27.94 0 1156 0 27.94 27.94 0 11-56 0z"/></defs></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round" viewBox="0 0 513 514"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><g fill-rule="nonzero" stroke="none"><path fill="#ff4500" d="M0 76.8C0 34.253 34.253 0 76.8 0h358.4C477.747 0 512 34.253 512 76.8v358.4c0 42.547-34.253 76.8-76.8 76.8H76.8C34.253 512 0 477.747 0 435.2z"/><path d="M79 305c0-68.142 78.942-123 177-123s177 54.858 177 123-78.942 123-177 123S79 373.142 79 305"/><g fill="#ff4500"><path d="M199 347c35 29 79 29 114 0l12 11c-42 35-96 35-138 0z"/><use xlink:href="#b"/><use xlink:href="#b" x="-118"/></g></g><g fill="none" stroke="#fff"><use xlink:href="#b" x="75" y="-160" stroke-width="25"/><path stroke-width="22" d="M87 282c-45-22-5-92 40-50m298 50c45-22 5-92-40-50m-127-45 24-83 80 16"/></g></symbol><defs><path id="b" d="M287 285a27.94 27.94 0 1 1 56 0 27.94 27.94 0 1 1-56 0"/></defs></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Redis/Redis.node.ts b/packages/nodes-base/nodes/Redis/Redis.node.ts
index abefcf17b7163..70d2dfc681f09 100644
--- a/packages/nodes-base/nodes/Redis/Redis.node.ts
+++ b/packages/nodes-base/nodes/Redis/Redis.node.ts
@@ -1,21 +1,19 @@
 import type {
 	IExecuteFunctions,
-	GenericValue,
-	ICredentialDataDecryptedObject,
-	ICredentialsDecrypted,
-	ICredentialTestFunctions,
-	IDataObject,
-	INodeCredentialTestResult,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { NodeOperationError } from 'n8n-workflow';
 
-import set from 'lodash.set';
-import redis from 'redis';
+import set from 'lodash/set';
 
-import util from 'util';
+import {
+	setupRedisClient,
+	redisConnectionTest,
+	convertInfoToObject,
+	getValue,
+	setValue,
+} from './utils';
 
 export class Redis implements INodeType {
 	description: INodeTypeDescription = {
@@ -103,34 +101,38 @@ export class Redis implements INodeType {
 			},
 
 			// ----------------------------------
-			//         get
+			//         delete
 			// ----------------------------------
 			{
-				displayName: 'Name',
-				name: 'propertyName',
+				displayName: 'Key',
+				name: 'key',
 				type: 'string',
 				displayOptions: {
 					show: {
-						operation: ['get'],
+						operation: ['delete'],
 					},
 				},
-				default: 'propertyName',
+				default: '',
 				required: true,
-				description:
-					'Name of the property to write received data to. Supports dot-notation. Example: "data.person[0].name".',
+				description: 'Name of the key to delete from Redis',
 			},
+
+			// ----------------------------------
+			//         get
+			// ----------------------------------
 			{
-				displayName: 'Key',
-				name: 'key',
+				displayName: 'Name',
+				name: 'propertyName',
 				type: 'string',
 				displayOptions: {
 					show: {
-						operation: ['delete'],
+						operation: ['get'],
 					},
 				},
-				default: '',
+				default: 'propertyName',
 				required: true,
-				description: 'Name of the key to delete from Redis',
+				description:
+					'Name of the property to write received data to. Supports dot-notation. Example: "data.person[0].name".',
 			},
 			{
 				displayName: 'Key',
@@ -500,350 +502,135 @@ export class Redis implements INodeType {
 	};
 
 	methods = {
-		credentialTest: {
-			async redisConnectionTest(
-				this: ICredentialTestFunctions,
-				credential: ICredentialsDecrypted,
-			): Promise<INodeCredentialTestResult> {
-				const credentials = credential.data as ICredentialDataDecryptedObject;
-				const redisOptions: redis.ClientOpts = {
-					host: credentials.host as string,
-					port: credentials.port as number,
-					db: credentials.database as number,
-				};
-
-				if (credentials.password) {
-					redisOptions.password = credentials.password as string;
-				}
-				try {
-					const client = redis.createClient(redisOptions);
-
-					await new Promise((resolve, reject): any => {
-						client.on('connect', async () => {
-							client.ping('ping', (error, pong) => {
-								if (error) reject(error);
-								resolve(pong);
-								client.quit();
-							});
-						});
-						client.on('error', async (err) => {
-							client.quit();
-							reject(err);
-						});
-					});
-				} catch (error) {
-					return {
-						status: 'Error',
-						message: error.message,
-					};
-				}
-				return {
-					status: 'OK',
-					message: 'Connection successful!',
-				};
-			},
-		},
+		credentialTest: { redisConnectionTest },
 	};
 
-	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
-		// Parses the given value in a number if it is one else returns a string
-		function getParsedValue(value: string): string | number {
-			if (value.match(/^[\d\.]+$/) === null) {
-				// Is a string
-				return value;
-			} else {
-				// Is a number
-				return parseFloat(value);
-			}
-		}
-
-		// Converts the Redis Info String into an object
-		function convertInfoToObject(stringData: string): IDataObject {
-			const returnData: IDataObject = {};
-
-			let key: string, value: string;
-			for (const line of stringData.split('\n')) {
-				if (['#', ''].includes(line.charAt(0))) {
-					continue;
-				}
-				[key, value] = line.split(':');
-				if (key === undefined || value === undefined) {
-					continue;
-				}
-				value = value.trim();
-
-				if (value.includes('=')) {
-					returnData[key] = {};
-					let key2: string, value2: string;
-					for (const keyValuePair of value.split(',')) {
-						[key2, value2] = keyValuePair.split('=');
-						(returnData[key] as IDataObject)[key2] = getParsedValue(value2);
-					}
-				} else {
-					returnData[key] = getParsedValue(value);
-				}
-			}
-
-			return returnData;
-		}
+	async execute(this: IExecuteFunctions) {
+		// TODO: For array and object fields it should not have a "value" field it should
+		//       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 client = setupRedisClient(credentials);
+		await client.connect();
+		await client.ping();
+
+		const operation = this.getNodeParameter('operation', 0);
+		const returnItems: INodeExecutionData[] = [];
+
+		try {
+			if (operation === 'info') {
+				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();
+
+				let item: INodeExecutionData;
+				for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
+					item = { json: {}, pairedItem: { item: itemIndex } };
+
+					if (operation === 'delete') {
+						const keyDelete = this.getNodeParameter('key', itemIndex) as string;
+
+						await client.del(keyDelete);
+						returnItems.push(items[itemIndex]);
+					} else if (operation === 'get') {
+						const propertyName = this.getNodeParameter('propertyName', itemIndex) as string;
+						const keyGet = this.getNodeParameter('key', itemIndex) as string;
+						const keyType = this.getNodeParameter('keyType', itemIndex) as string;
+
+						const value = (await getValue(client, keyGet, keyType)) ?? null;
+
+						const options = this.getNodeParameter('options', itemIndex, {});
+
+						if (options.dotNotation === false) {
+							item.json[propertyName] = value;
+						} else {
+							set(item.json, propertyName, value);
+						}
 
-		async function getValue(client: redis.RedisClient, keyName: string, type?: string) {
-			if (type === undefined || type === 'automatic') {
-				// Request the type first
-				const clientType = util.promisify(client.type).bind(client);
-				type = await clientType(keyName);
-			}
+						returnItems.push(item);
+					} else if (operation === 'keys') {
+						const keyPattern = this.getNodeParameter('keyPattern', itemIndex) as string;
+						const getValues = this.getNodeParameter('getValues', itemIndex, true) as boolean;
 
-			if (type === 'string') {
-				const clientGet = util.promisify(client.get).bind(client);
-				return clientGet(keyName);
-			} else if (type === 'hash') {
-				const clientHGetAll = util.promisify(client.hgetall).bind(client);
-				return clientHGetAll(keyName);
-			} else if (type === 'list') {
-				const clientLRange = util.promisify(client.lrange).bind(client);
-				return clientLRange(keyName, 0, -1);
-			} else if (type === 'sets') {
-				const clientSMembers = util.promisify(client.smembers).bind(client);
-				return clientSMembers(keyName);
-			}
-		}
+						const keys = await client.keys(keyPattern);
 
-		const setValue = async (
-			client: redis.RedisClient,
-			keyName: string,
-			value: string | number | object | string[] | number[],
-			expire: boolean,
-			ttl: number,
-			type?: string,
-			valueIsJSON?: boolean,
-		) => {
-			if (type === undefined || type === 'automatic') {
-				// Request the type first
-				if (typeof value === 'string') {
-					type = 'string';
-				} else if (Array.isArray(value)) {
-					type = 'list';
-				} else if (typeof value === 'object') {
-					type = 'hash';
-				} else {
-					throw new NodeOperationError(
-						this.getNode(),
-						'Could not identify the type to set. Please set it manually!',
-					);
-				}
-			}
+						if (!getValues) {
+							returnItems.push({ json: { keys } });
+							continue;
+						}
 
-			if (type === 'string') {
-				const clientSet = util.promisify(client.set).bind(client);
-				await clientSet(keyName, value.toString());
-			} else if (type === 'hash') {
-				const clientHset = util.promisify(client.hset).bind(client);
-				if (valueIsJSON) {
-					let values: unknown;
-					if (typeof value === 'string') {
+						for (const keyName of keys) {
+							item.json[keyName] = await getValue(client, keyName);
+						}
+						returnItems.push(item);
+					} else if (operation === 'set') {
+						const keySet = this.getNodeParameter('key', itemIndex) as string;
+						const value = this.getNodeParameter('value', itemIndex) as string;
+						const keyType = this.getNodeParameter('keyType', itemIndex) as string;
+						const valueIsJSON = this.getNodeParameter('valueIsJSON', itemIndex, true) as boolean;
+						const expire = this.getNodeParameter('expire', itemIndex, false) as boolean;
+						const ttl = this.getNodeParameter('ttl', itemIndex, -1) as number;
+
+						await setValue.call(this, client, keySet, value, expire, ttl, keyType, valueIsJSON);
+						returnItems.push(items[itemIndex]);
+					} else if (operation === 'incr') {
+						const keyIncr = this.getNodeParameter('key', itemIndex) as string;
+						const expire = this.getNodeParameter('expire', itemIndex, false) as boolean;
+						const ttl = this.getNodeParameter('ttl', itemIndex, -1) as number;
+						const incrementVal = await client.incr(keyIncr);
+						if (expire && ttl > 0) {
+							await client.expire(keyIncr, ttl);
+						}
+						returnItems.push({ json: { [keyIncr]: incrementVal } });
+					} else if (operation === 'publish') {
+						const channel = this.getNodeParameter('channel', itemIndex) as string;
+						const messageData = this.getNodeParameter('messageData', itemIndex) as string;
+						await client.publish(channel, messageData);
+						returnItems.push(items[itemIndex]);
+					} else if (operation === 'push') {
+						const redisList = this.getNodeParameter('list', itemIndex) as string;
+						const messageData = this.getNodeParameter('messageData', itemIndex) as string;
+						const tail = this.getNodeParameter('tail', itemIndex, false) as boolean;
+						await client[tail ? 'rPush' : 'lPush'](redisList, messageData);
+						returnItems.push(items[itemIndex]);
+					} else if (operation === 'pop') {
+						const redisList = this.getNodeParameter('list', itemIndex) as string;
+						const tail = this.getNodeParameter('tail', itemIndex, false) as boolean;
+						const propertyName = this.getNodeParameter(
+							'propertyName',
+							itemIndex,
+							'propertyName',
+						) as string;
+
+						const value = await client[tail ? 'rPop' : 'lPop'](redisList);
+
+						let outputValue;
 						try {
-							values = JSON.parse(value);
+							outputValue = value && JSON.parse(value);
 						} catch {
-							// This is how we originally worked and prevents a breaking change
-							values = value;
+							outputValue = value;
 						}
-					} else {
-						values = value;
-					}
-					for (const key of Object.keys(values as object)) {
-						// @ts-ignore
-						await clientHset(keyName, key, (values as IDataObject)[key]!.toString());
+						const options = this.getNodeParameter('options', itemIndex, {});
+						if (options.dotNotation === false) {
+							item.json[propertyName] = outputValue;
+						} else {
+							set(item.json, propertyName, outputValue);
+						}
+						returnItems.push(item);
 					}
-				} else {
-					const values = value.toString().split(' ');
-					//@ts-ignore
-					await clientHset(keyName, values);
-				}
-			} else if (type === 'list') {
-				const clientLset = util.promisify(client.lset).bind(client);
-				for (let index = 0; index < (value as string[]).length; index++) {
-					await clientLset(keyName, index, (value as IDataObject)[index]!.toString());
 				}
 			}
+		} catch (error) {
+			throw error;
+		} finally {
+			await client.quit();
+		}
 
-			if (expire) {
-				const clientExpire = util.promisify(client.expire).bind(client);
-				await clientExpire(keyName, ttl);
-			}
-			return;
-		};
-
-		return new Promise(async (resolve, reject) => {
-			// TODO: For array and object fields it should not have a "value" field it should
-			//       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 redisOptions: redis.ClientOpts = {
-				host: credentials.host as string,
-				port: credentials.port as number,
-				db: credentials.database as number,
-			};
-
-			if (credentials.password) {
-				redisOptions.password = credentials.password as string;
-			}
-
-			const client = redis.createClient(redisOptions);
-
-			const operation = this.getNodeParameter('operation', 0);
-
-			client.on('error', (err: Error) => {
-				client.quit();
-				reject(err);
-			});
-
-			client.on('ready', async (_err: Error | null) => {
-				client.select(credentials.database as number);
-				try {
-					if (operation === 'info') {
-						const clientInfo = util.promisify(client.info).bind(client);
-						const result = await clientInfo();
-
-						resolve(this.prepareOutputData([{ json: convertInfoToObject(result as string) }]));
-						client.quit();
-					} else if (
-						['delete', 'get', 'keys', 'set', 'incr', 'publish', 'push', 'pop'].includes(operation)
-					) {
-						const items = this.getInputData();
-						const returnItems: INodeExecutionData[] = [];
-
-						let item: INodeExecutionData;
-						for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
-							item = { json: {} };
-
-							if (operation === 'delete') {
-								const keyDelete = this.getNodeParameter('key', itemIndex) as string;
-
-								const clientDel = util.promisify(client.del).bind(client);
-								// @ts-ignore
-								await clientDel(keyDelete);
-								returnItems.push(items[itemIndex]);
-							} else if (operation === 'get') {
-								const propertyName = this.getNodeParameter('propertyName', itemIndex) as string;
-								const keyGet = this.getNodeParameter('key', itemIndex) as string;
-								const keyType = this.getNodeParameter('keyType', itemIndex) as string;
-
-								const value = (await getValue(client, keyGet, keyType)) || null;
-
-								const options = this.getNodeParameter('options', itemIndex, {});
-
-								if (options.dotNotation === false) {
-									item.json[propertyName] = value;
-								} else {
-									set(item.json, propertyName, value);
-								}
-
-								returnItems.push(item);
-							} else if (operation === 'keys') {
-								const keyPattern = this.getNodeParameter('keyPattern', itemIndex) as string;
-								const getValues = this.getNodeParameter('getValues', itemIndex, true) as boolean;
-
-								const clientKeys = util.promisify(client.keys).bind(client);
-								const keys = await clientKeys(keyPattern);
-
-								if (!getValues) {
-									returnItems.push({ json: { keys } });
-									continue;
-								}
-
-								const promises: {
-									[key: string]: GenericValue;
-								} = {};
-
-								for (const keyName of keys) {
-									promises[keyName] = await getValue(client, keyName);
-								}
-
-								for (const keyName of keys) {
-									// eslint-disable-next-line @typescript-eslint/await-thenable
-									item.json[keyName] = await promises[keyName];
-								}
-								returnItems.push(item);
-							} else if (operation === 'set') {
-								const keySet = this.getNodeParameter('key', itemIndex) as string;
-								const value = this.getNodeParameter('value', itemIndex) as string;
-								const keyType = this.getNodeParameter('keyType', itemIndex) as string;
-								const valueIsJSON = this.getNodeParameter(
-									'valueIsJSON',
-									itemIndex,
-									true,
-								) as boolean;
-								const expire = this.getNodeParameter('expire', itemIndex, false) as boolean;
-								const ttl = this.getNodeParameter('ttl', itemIndex, -1) as number;
-
-								await setValue(client, keySet, value, expire, ttl, keyType, valueIsJSON);
-								returnItems.push(items[itemIndex]);
-							} else if (operation === 'incr') {
-								const keyIncr = this.getNodeParameter('key', itemIndex) as string;
-								const expire = this.getNodeParameter('expire', itemIndex, false) as boolean;
-								const ttl = this.getNodeParameter('ttl', itemIndex, -1) as number;
-								const clientIncr = util.promisify(client.incr).bind(client);
-								// @ts-ignore
-								const incrementVal = await clientIncr(keyIncr);
-								if (expire && ttl > 0) {
-									const clientExpire = util.promisify(client.expire).bind(client);
-									await clientExpire(keyIncr, ttl);
-								}
-								returnItems.push({ json: { [keyIncr]: incrementVal } });
-							} else if (operation === 'publish') {
-								const channel = this.getNodeParameter('channel', itemIndex) as string;
-								const messageData = this.getNodeParameter('messageData', itemIndex) as string;
-								const clientPublish = util.promisify(client.publish).bind(client);
-								await clientPublish(channel, messageData);
-								returnItems.push(items[itemIndex]);
-							} else if (operation === 'push') {
-								const redisList = this.getNodeParameter('list', itemIndex) as string;
-								const messageData = this.getNodeParameter('messageData', itemIndex) as string;
-								const tail = this.getNodeParameter('tail', itemIndex, false) as boolean;
-								const action = tail ? client.RPUSH : client.LPUSH;
-								const clientPush = util.promisify(action).bind(client);
-								// @ts-ignore: typescript not understanding generic function signatures
-								await clientPush(redisList, messageData);
-								returnItems.push(items[itemIndex]);
-							} else if (operation === 'pop') {
-								const redisList = this.getNodeParameter('list', itemIndex) as string;
-								const tail = this.getNodeParameter('tail', itemIndex, false) as boolean;
-								const propertyName = this.getNodeParameter(
-									'propertyName',
-									itemIndex,
-									'propertyName',
-								) as string;
-
-								const action = tail ? client.rpop : client.lpop;
-								const clientPop = util.promisify(action).bind(client);
-								const value = await clientPop(redisList);
-
-								let outputValue;
-								try {
-									outputValue = JSON.parse(value);
-								} catch {
-									outputValue = value;
-								}
-								const options = this.getNodeParameter('options', itemIndex, {});
-								if (options.dotNotation === false) {
-									item.json[propertyName] = outputValue;
-								} else {
-									set(item.json, propertyName, outputValue);
-								}
-								returnItems.push(item);
-							}
-						}
-
-						client.quit();
-						resolve(this.prepareOutputData(returnItems));
-					}
-				} catch (error) {
-					reject(error);
-				}
-			});
-		});
+		return [returnItems];
 	}
 }
diff --git a/packages/nodes-base/nodes/Redis/RedisTrigger.node.ts b/packages/nodes-base/nodes/Redis/RedisTrigger.node.ts
index 2224ee652d291..9616ba486ad68 100644
--- a/packages/nodes-base/nodes/Redis/RedisTrigger.node.ts
+++ b/packages/nodes-base/nodes/Redis/RedisTrigger.node.ts
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-loop-func */
 import type {
 	ITriggerFunctions,
 	IDataObject,
@@ -7,7 +8,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import redis from 'redis';
+import { redisConnectionTest, setupRedisClient } from './utils';
 
 export class RedisTrigger implements INodeType {
 	description: INodeTypeDescription = {
@@ -26,6 +27,7 @@ export class RedisTrigger implements INodeType {
 			{
 				name: 'redis',
 				required: true,
+				testedBy: 'redisConnectionTest',
 			},
 		],
 		properties: [
@@ -64,36 +66,29 @@ export class RedisTrigger implements INodeType {
 		],
 	};
 
+	methods = {
+		credentialTest: { redisConnectionTest },
+	};
+
 	async trigger(this: ITriggerFunctions): Promise<ITriggerResponse> {
 		const credentials = await this.getCredentials('redis');
 
-		const redisOptions: redis.ClientOpts = {
-			host: credentials.host as string,
-			port: credentials.port as number,
-			db: credentials.database as number,
-		};
-
-		if (credentials.password) {
-			redisOptions.password = credentials.password as string;
-		}
-
 		const channels = (this.getNodeParameter('channels') as string).split(',');
-
 		const options = this.getNodeParameter('options') as IDataObject;
 
 		if (!channels) {
 			throw new NodeOperationError(this.getNode(), 'Channels are mandatory!');
 		}
 
-		const client = redis.createClient(redisOptions);
+		const client = setupRedisClient(credentials);
 
 		const manualTriggerFunction = async () => {
-			await new Promise((resolve, reject) => {
-				client.on('connect', () => {
-					for (const channel of channels) {
-						client.psubscribe(channel);
-					}
-					client.on('pmessage', (pattern: string, channel: string, message: string) => {
+			await client.connect();
+			await client.ping();
+
+			try {
+				for (const channel of channels) {
+					await client.pSubscribe(channel, (message) => {
 						if (options.jsonParseBody) {
 							try {
 								message = JSON.parse(message);
@@ -102,27 +97,23 @@ export class RedisTrigger implements INodeType {
 
 						if (options.onlyMessage) {
 							this.emit([this.helpers.returnJsonArray({ message })]);
-							resolve(true);
 							return;
 						}
 
 						this.emit([this.helpers.returnJsonArray({ channel, message })]);
-						resolve(true);
 					});
-				});
-
-				client.on('error', (error) => {
-					reject(error);
-				});
-			});
+				}
+			} catch (error) {
+				throw new NodeOperationError(this.getNode(), error);
+			}
 		};
 
 		if (this.getMode() === 'trigger') {
-			await manualTriggerFunction();
+			void manualTriggerFunction();
 		}
 
 		async function closeFunction() {
-			client.quit();
+			await client.quit();
 		}
 
 		return {
diff --git a/packages/nodes-base/nodes/Redis/redis.svg b/packages/nodes-base/nodes/Redis/redis.svg
index 6e8301d99d85e..beb6ad40dab1b 100644
--- a/packages/nodes-base/nodes/Redis/redis.svg
+++ b/packages/nodes-base/nodes/Redis/redis.svg
@@ -1 +1 @@
-<svg width="60" height="60" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round"><path d="M57.656 43.99c-3.201 1.683-19.787 8.561-23.318 10.417-3.532 1.856-5.494 1.838-8.283.494-2.79-1.343-20.449-8.535-23.629-10.067C.834 44.066.002 43.422.002 42.811v-6.117s22.98-5.045 26.69-6.388c3.711-1.342 4.995-1.39 8.154-.225 3.16 1.165 22.035 4.603 25.154 5.756v6.032c0 .605-.72 1.283-2.35 2.124l.006-.003z" fill="#A41E11"/><path d="M57.656 37.872c-3.201 1.685-19.787 8.56-23.318 10.417-3.532 1.856-5.494 1.838-8.283.494-2.79-1.343-20.449-8.534-23.63-10.068-3.18-1.533-3.243-2.588-.122-3.82l24.388-9.52c3.71-1.34 4.994-1.39 8.153-.225 3.16 1.165 19.643 7.78 22.747 8.951 3.103 1.17 3.24 2.086.037 3.786l.028-.015z" fill="#D82C20"/><path d="M57.656 34.015c-3.201 1.683-19.787 8.561-23.318 10.417-3.532 1.856-5.494 1.838-8.283.495-2.79-1.344-20.449-8.536-23.629-10.067C.834 34.092.002 33.447.002 32.836V26.72s22.98-5.045 26.69-6.387c3.711-1.343 4.995-1.39 8.154-.225 3.16 1.165 22.035 4.602 25.154 5.756v6.032c0 .605-.72 1.283-2.35 2.123l.006-.003z" fill="#A41E11"/><path d="M57.656 27.898c-3.201 1.685-19.787 8.561-23.318 10.417-3.532 1.856-5.494 1.838-8.283.495-2.79-1.344-20.449-8.534-23.63-10.067-3.18-1.534-3.243-2.588-.122-3.82l24.388-9.52c3.71-1.343 4.994-1.39 8.153-.225 3.16 1.166 19.644 7.785 22.765 8.935 3.121 1.15 3.24 2.085.038 3.785h.01z" fill="#D82C20"/><path d="M57.656 23.671c-3.201 1.683-19.787 8.561-23.318 10.419-3.532 1.858-5.494 1.838-8.283.495-2.79-1.344-20.449-8.535-23.629-10.069-1.592-.765-2.424-1.411-2.424-2.02v-6.11s22.98-5.045 26.69-6.388c3.711-1.343 4.995-1.39 8.154-.225 3.16 1.165 22.035 4.591 25.154 5.745v6.032c0 .605-.72 1.283-2.35 2.123l.006-.002z" fill="#A41E11"/><path d="M57.656 17.553c-3.201 1.685-19.787 8.561-23.318 10.417-3.532 1.856-5.494 1.838-8.283.495-2.79-1.344-20.449-8.534-23.63-10.068-3.18-1.533-3.243-2.587-.122-3.82l24.388-9.52c3.71-1.343 4.994-1.39 8.153-.226 3.16 1.165 19.643 7.785 22.765 8.936 3.122 1.15 3.24 2.085.038 3.785l.01.001z" fill="#D82C20"/><path d="M31.497 15.032l-1.88-3.153-6.002-.545 4.48-1.63L26.75 7.2l4.192 1.653 3.955-1.305-1.07 2.586 4.032 1.524-5.198.546-1.164 2.827zm-10.014 6.275l13.903-2.153-4.2 6.211-9.703-4.058zm-11.17-5.167c0-1.61 3.314-2.906 7.431-2.906 4.118 0 7.432 1.296 7.432 2.906s-3.314 2.905-7.432 2.905c-4.117 0-7.431-1.295-7.431-2.905z" fill="#FFF"/><path fill="#7A0C00" d="M52.233 15.714l-8.224 3.276-.007-6.556z"/><path fill="#AD2115" d="M44.01 18.991l-.89.353-8.217-3.276 9.094-3.63z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="60" height="60"><g fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round"><path fill="#A41E11" d="M57.656 43.99c-3.201 1.683-19.787 8.561-23.318 10.417s-5.494 1.838-8.283.494c-2.79-1.343-20.449-8.535-23.629-10.067C.834 44.066.002 43.422.002 42.811v-6.117s22.98-5.045 26.69-6.388 4.995-1.39 8.154-.225c3.16 1.165 22.035 4.603 25.154 5.756v6.032c0 .605-.72 1.283-2.35 2.124z"/><path fill="#D82C20" d="M57.656 37.872c-3.201 1.685-19.787 8.56-23.318 10.417s-5.494 1.838-8.283.494c-2.79-1.343-20.449-8.534-23.63-10.068s-3.243-2.588-.122-3.82l24.388-9.52c3.71-1.34 4.994-1.39 8.153-.225s19.643 7.78 22.747 8.951c3.103 1.17 3.24 2.086.037 3.786z"/><path fill="#A41E11" d="M57.656 34.015c-3.201 1.683-19.787 8.561-23.318 10.417s-5.494 1.838-8.283.495c-2.79-1.344-20.449-8.536-23.629-10.067C.834 34.092.002 33.447.002 32.836V26.72s22.98-5.045 26.69-6.387c3.711-1.343 4.995-1.39 8.154-.225 3.16 1.165 22.035 4.602 25.154 5.756v6.032c0 .605-.72 1.283-2.35 2.123z"/><path fill="#D82C20" d="M57.656 27.898c-3.201 1.685-19.787 8.561-23.318 10.417s-5.494 1.838-8.283.495c-2.79-1.344-20.449-8.534-23.63-10.067-3.18-1.534-3.243-2.588-.122-3.82l24.388-9.52c3.71-1.343 4.994-1.39 8.153-.225 3.16 1.166 19.644 7.785 22.765 8.935s3.24 2.085.038 3.785z"/><path fill="#A41E11" d="M57.656 23.671c-3.201 1.683-19.787 8.561-23.318 10.419s-5.494 1.838-8.283.495c-2.79-1.344-20.449-8.535-23.629-10.069-1.592-.765-2.424-1.411-2.424-2.02v-6.11s22.98-5.045 26.69-6.388 4.995-1.39 8.154-.225c3.16 1.165 22.035 4.591 25.154 5.745v6.032c0 .605-.72 1.283-2.35 2.123z"/><path fill="#D82C20" d="M57.656 17.553c-3.201 1.685-19.787 8.561-23.318 10.417s-5.494 1.838-8.283.495c-2.79-1.344-20.449-8.534-23.63-10.068s-3.243-2.587-.122-3.82l24.388-9.52c3.71-1.343 4.994-1.39 8.153-.226 3.16 1.165 19.643 7.785 22.765 8.936s3.24 2.085.038 3.785z"/><path fill="#FFF" d="m31.497 15.032-1.88-3.153-6.002-.545 4.48-1.63L26.75 7.2l4.192 1.653 3.955-1.305-1.07 2.586 4.032 1.524-5.198.546zm-10.014 6.275 13.903-2.153-4.2 6.211zm-11.17-5.167c0-1.61 3.314-2.906 7.431-2.906 4.118 0 7.432 1.296 7.432 2.906s-3.314 2.905-7.432 2.905c-4.117 0-7.431-1.295-7.431-2.905"/><path fill="#7A0C00" d="m52.233 15.714-8.224 3.276-.007-6.556z"/><path fill="#AD2115" d="m44.01 18.991-.89.353-8.217-3.276 9.094-3.63z"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Redis/test/Redis.node.test.ts b/packages/nodes-base/nodes/Redis/test/Redis.node.test.ts
new file mode 100644
index 0000000000000..029b85f4d49df
--- /dev/null
+++ b/packages/nodes-base/nodes/Redis/test/Redis.node.test.ts
@@ -0,0 +1,205 @@
+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/utils.ts b/packages/nodes-base/nodes/Redis/utils.ts
new file mode 100644
index 0000000000000..effdd99778600
--- /dev/null
+++ b/packages/nodes-base/nodes/Redis/utils.ts
@@ -0,0 +1,169 @@
+import type {
+	ICredentialDataDecryptedObject,
+	ICredentialTestFunctions,
+	ICredentialsDecrypted,
+	IDataObject,
+	IExecuteFunctions,
+	INodeCredentialTestResult,
+} from 'n8n-workflow';
+import { NodeOperationError } from 'n8n-workflow';
+
+import { type RedisClientOptions, createClient } from 'redis';
+export type RedisClientType = ReturnType<typeof createClient>;
+
+export function setupRedisClient(credentials: ICredentialDataDecryptedObject): RedisClientType {
+	const redisOptions: RedisClientOptions = {
+		socket: {
+			host: credentials.host as string,
+			port: credentials.port as number,
+			tls: credentials.ssl === true,
+		},
+		database: credentials.database as number,
+		password: (credentials.password as string) || undefined,
+	};
+
+	return createClient(redisOptions);
+}
+
+export async function redisConnectionTest(
+	this: ICredentialTestFunctions,
+	credential: ICredentialsDecrypted,
+): Promise<INodeCredentialTestResult> {
+	const credentials = credential.data as ICredentialDataDecryptedObject;
+
+	try {
+		const client = setupRedisClient(credentials);
+		await client.connect();
+		await client.ping();
+		return {
+			status: 'OK',
+			message: 'Connection successful!',
+		};
+	} catch (error) {
+		return {
+			status: 'Error',
+			message: error.message,
+		};
+	}
+}
+
+/** Parses the given value in a number if it is one else returns a string */
+function getParsedValue(value: string): string | number {
+	if (value.match(/^[\d\.]+$/) === null) {
+		// Is a string
+		return value;
+	} else {
+		// Is a number
+		return parseFloat(value);
+	}
+}
+
+/** Converts the Redis Info String into an object */
+export function convertInfoToObject(stringData: string): IDataObject {
+	const returnData: IDataObject = {};
+
+	let key: string, value: string;
+	for (const line of stringData.split('\n')) {
+		if (['#', ''].includes(line.charAt(0))) {
+			continue;
+		}
+		[key, value] = line.split(':');
+		if (key === undefined || value === undefined) {
+			continue;
+		}
+		value = value.trim();
+
+		if (value.includes('=')) {
+			returnData[key] = {};
+			let key2: string, value2: string;
+			for (const keyValuePair of value.split(',')) {
+				[key2, value2] = keyValuePair.split('=');
+				(returnData[key] as IDataObject)[key2] = getParsedValue(value2);
+			}
+		} else {
+			returnData[key] = getParsedValue(value);
+		}
+	}
+
+	return returnData;
+}
+
+export async function getValue(client: RedisClientType, keyName: string, type?: string) {
+	if (type === undefined || type === 'automatic') {
+		// Request the type first
+		type = await client.type(keyName);
+	}
+
+	if (type === 'string') {
+		return await client.get(keyName);
+	} else if (type === 'hash') {
+		return await client.hGetAll(keyName);
+	} else if (type === 'list') {
+		return await client.lRange(keyName, 0, -1);
+	} else if (type === 'sets') {
+		return await client.sMembers(keyName);
+	}
+}
+
+export async function setValue(
+	this: IExecuteFunctions,
+	client: RedisClientType,
+	keyName: string,
+	value: string | number | object | string[] | number[],
+	expire: boolean,
+	ttl: number,
+	type?: string,
+	valueIsJSON?: boolean,
+) {
+	if (type === undefined || type === 'automatic') {
+		// Request the type first
+		if (typeof value === 'string') {
+			type = 'string';
+		} else if (Array.isArray(value)) {
+			type = 'list';
+		} else if (typeof value === 'object') {
+			type = 'hash';
+		} else {
+			throw new NodeOperationError(
+				this.getNode(),
+				'Could not identify the type to set. Please set it manually!',
+			);
+		}
+	}
+
+	if (type === 'string') {
+		await client.set(keyName, value.toString());
+	} else if (type === 'hash') {
+		if (valueIsJSON) {
+			let values: unknown;
+			if (typeof value === 'string') {
+				try {
+					values = JSON.parse(value);
+				} catch {
+					// This is how we originally worked and prevents a breaking change
+					values = value;
+				}
+			} else {
+				values = value;
+			}
+			for (const key of Object.keys(values as object)) {
+				await client.hSet(keyName, key, (values as IDataObject)[key]!.toString());
+			}
+		} else {
+			const values = value.toString().split(' ');
+			await client.hSet(keyName, values);
+		}
+	} else if (type === 'list') {
+		for (let index = 0; index < (value as string[]).length; index++) {
+			await client.lSet(keyName, index, (value as IDataObject)[index]!.toString());
+		}
+	} else if (type === 'sets') {
+		//@ts-ignore
+		await client.sAdd(keyName, value);
+	}
+
+	if (expire) {
+		await client.expire(keyName, ttl);
+	}
+	return;
+}
diff --git a/packages/nodes-base/nodes/RenameKeys/RenameKeys.node.ts b/packages/nodes-base/nodes/RenameKeys/RenameKeys.node.ts
index 82bc6f3f7cff8..d3a8d1ba71916 100644
--- a/packages/nodes-base/nodes/RenameKeys/RenameKeys.node.ts
+++ b/packages/nodes-base/nodes/RenameKeys/RenameKeys.node.ts
@@ -7,9 +7,9 @@ import type {
 } from 'n8n-workflow';
 import { deepCopy } from 'n8n-workflow';
 
-import get from 'lodash.get';
-import set from 'lodash.set';
-import unset from 'lodash.unset';
+import get from 'lodash/get';
+import set from 'lodash/set';
+import unset from 'lodash/unset';
 
 interface IRenameKey {
 	currentKey: string;
@@ -23,7 +23,7 @@ export class RenameKeys implements INodeType {
 		icon: 'fa:edit',
 		group: ['transform'],
 		version: 1,
-		description: 'Renames keys',
+		description: 'Update item field names',
 		defaults: {
 			name: 'Rename Keys',
 			color: '#772244',
diff --git a/packages/nodes-base/nodes/RenameKeys/test/RenameKeys.test.ts b/packages/nodes-base/nodes/RenameKeys/test/RenameKeys.test.ts
index 63446295bf708..deb62b4ac9a3d 100644
--- a/packages/nodes-base/nodes/RenameKeys/test/RenameKeys.test.ts
+++ b/packages/nodes-base/nodes/RenameKeys/test/RenameKeys.test.ts
@@ -1,4 +1,4 @@
-import { testWorkflows, getWorkflowFilenames } from '../../../test/nodes/Helpers';
+import { testWorkflows, getWorkflowFilenames } from '@test/nodes/Helpers';
 
 const workflows = getWorkflowFilenames(__dirname);
 
diff --git a/packages/nodes-base/nodes/RespondToWebhook/RespondToWebhook.node.json b/packages/nodes-base/nodes/RespondToWebhook/RespondToWebhook.node.json
index 0df99d6aba89c..19044f48ddc6f 100644
--- a/packages/nodes-base/nodes/RespondToWebhook/RespondToWebhook.node.json
+++ b/packages/nodes-base/nodes/RespondToWebhook/RespondToWebhook.node.json
@@ -11,6 +11,6 @@
 		]
 	},
 	"subcategories": {
-		"Core Nodes": ["Flow"]
+		"Core Nodes": ["Helpers"]
 	}
 }
diff --git a/packages/nodes-base/nodes/RespondToWebhook/RespondToWebhook.node.ts b/packages/nodes-base/nodes/RespondToWebhook/RespondToWebhook.node.ts
index 3296d404c88c5..c3a8c8ce0052e 100644
--- a/packages/nodes-base/nodes/RespondToWebhook/RespondToWebhook.node.ts
+++ b/packages/nodes-base/nodes/RespondToWebhook/RespondToWebhook.node.ts
@@ -1,3 +1,4 @@
+import type { Readable } from 'stream';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -7,7 +8,10 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { jsonParse, NodeOperationError } from 'n8n-workflow';
+import { jsonParse, BINARY_ENCODING, NodeOperationError } from 'n8n-workflow';
+import set from 'lodash/set';
+import jwt from 'jsonwebtoken';
+import { formatPrivateKey, generatePairedItemData } from '../../utils/utilities';
 
 export class RespondToWebhook implements INodeType {
 	description: INodeTypeDescription = {
@@ -15,55 +19,118 @@ export class RespondToWebhook implements INodeType {
 		icon: 'file:webhook.svg',
 		name: 'respondToWebhook',
 		group: ['transform'],
-		version: 1,
+		version: [1, 1.1],
 		description: 'Returns data for Webhook',
 		defaults: {
 			name: 'Respond to Webhook',
 		},
 		inputs: ['main'],
 		outputs: ['main'],
-		credentials: [],
+		credentials: [
+			{
+				name: 'jwtAuth',
+				required: true,
+				displayOptions: {
+					show: {
+						respondWith: ['jwt'],
+					},
+				},
+			},
+		],
 		properties: [
+			{
+				displayName:
+					'Verify that the "Webhook" node\'s "Respond" parameter is set to "Using Respond to Webhook Node". <a href="https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.respondtowebhook/" target="_blank">More details',
+				name: 'generalNotice',
+				type: 'notice',
+				default: '',
+			},
 			{
 				displayName: 'Respond With',
 				name: 'respondWith',
 				type: 'options',
 				options: [
 					{
-						name: 'Binary',
+						name: 'All Incoming Items',
+						value: 'allIncomingItems',
+						description: 'Respond with all input JSON items',
+					},
+					{
+						name: 'Binary File',
 						value: 'binary',
+						description: 'Respond with incoming file binary data',
 					},
 					{
 						name: 'First Incoming Item',
 						value: 'firstIncomingItem',
+						description: 'Respond with the first input JSON item',
 					},
 					{
 						name: 'JSON',
 						value: 'json',
+						description: 'Respond with a custom JSON body',
+					},
+					{
+						name: 'JWT Token',
+						value: 'jwt',
+						description: 'Respond with a JWT token',
 					},
 					{
 						name: 'No Data',
 						value: 'noData',
+						description: 'Respond with an empty body',
+					},
+					{
+						name: 'Redirect',
+						value: 'redirect',
+						description: 'Respond with a redirect to a given URL',
 					},
 					{
 						name: 'Text',
 						value: 'text',
+						description: 'Respond with a simple text message body',
 					},
 				],
 				default: 'firstIncomingItem',
 				description: 'The data that should be returned',
 			},
+			{
+				displayName: 'Credentials',
+				name: 'credentials',
+				type: 'credentials',
+				default: '',
+				displayOptions: {
+					show: {
+						respondWith: ['jwt'],
+					},
+				},
+			},
 			{
 				displayName:
-					'When using expressions, note that this node will only run for the first item in the input data.',
+					'When using expressions, note that this node will only run for the first item in the input data',
 				name: 'webhookNotice',
 				type: 'notice',
 				displayOptions: {
 					show: {
-						respondWith: ['json', 'text'],
+						respondWith: ['json', 'text', 'jwt'],
+					},
+				},
+				default: '',
+			},
+			{
+				displayName: 'Redirect URL',
+				name: 'redirectURL',
+				type: 'string',
+				required: true,
+				displayOptions: {
+					show: {
+						respondWith: ['redirect'],
 					},
 				},
 				default: '',
+				placeholder: 'e.g. http://www.n8n.io',
+				description: 'The URL to redirect to',
+				validateType: 'url',
 			},
 			{
 				displayName: 'Response Body',
@@ -74,9 +141,27 @@ export class RespondToWebhook implements INodeType {
 						respondWith: ['json'],
 					},
 				},
-				default: '',
-				placeholder: '{ "key": "value" }',
-				description: 'The HTTP Response JSON data',
+				default: '{\n  "myField": "value"\n}',
+				typeOptions: {
+					rows: 4,
+				},
+				description: 'The HTTP response JSON data',
+			},
+			{
+				displayName: 'Payload',
+				name: 'payload',
+				type: 'json',
+				displayOptions: {
+					show: {
+						respondWith: ['jwt'],
+					},
+				},
+				default: '{\n  "myField": "value"\n}',
+				typeOptions: {
+					rows: 4,
+				},
+				validateType: 'object',
+				description: 'The payload to include in the JWT token',
 			},
 			{
 				displayName: 'Response Body',
@@ -87,9 +172,12 @@ export class RespondToWebhook implements INodeType {
 						respondWith: ['text'],
 					},
 				},
+				typeOptions: {
+					rows: 2,
+				},
 				default: '',
-				placeholder: 'e.g. Workflow started',
-				description: 'The HTTP Response text data',
+				placeholder: 'e.g. Workflow completed',
+				description: 'The HTTP response text data',
 			},
 			{
 				displayName: 'Response Data Source',
@@ -145,7 +233,7 @@ export class RespondToWebhook implements INodeType {
 							maxValue: 599,
 						},
 						default: 200,
-						description: 'The HTTP Response code to return. Defaults to 200.',
+						description: 'The HTTP response code to return. Defaults to 200.',
 					},
 					{
 						displayName: 'Response Headers',
@@ -180,6 +268,19 @@ export class RespondToWebhook implements INodeType {
 							},
 						],
 					},
+					{
+						displayName: 'Put Response in Field',
+						name: 'responseKey',
+						type: 'string',
+						displayOptions: {
+							show: {
+								['/respondWith']: ['allIncomingItems', 'firstIncomingItem'],
+							},
+						},
+						default: '',
+						description: 'The name of the response field to put all items in',
+						placeholder: 'e.g. data',
+					},
 				],
 			},
 		],
@@ -187,78 +288,159 @@ export class RespondToWebhook implements INodeType {
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const items = this.getInputData();
+		const nodeVersion = this.getNode().typeVersion;
 
-		const respondWith = this.getNodeParameter('respondWith', 0) as string;
-		const options = this.getNodeParameter('options', 0, {});
+		const WEBHOOK_NODE_TYPES = ['n8n-nodes-base.webhook', 'n8n-nodes-base.formTrigger'];
 
-		const headers = {} as IDataObject;
-		if (options.responseHeaders) {
-			for (const header of (options.responseHeaders as IDataObject).entries as IDataObject[]) {
-				if (typeof header.name !== 'string') {
-					header.name = header.name?.toString();
+		try {
+			if (nodeVersion >= 1.1) {
+				const connectedNodes = this.getParentNodes(this.getNode().name);
+				if (!connectedNodes.some(({ type }) => WEBHOOK_NODE_TYPES.includes(type))) {
+					throw new NodeOperationError(
+						this.getNode(),
+						new Error('No Webhook node found in the workflow'),
+						{
+							description:
+								'Insert a Webhook node to your workflow and set the “Respond” parameter to “Using Respond to Webhook Node” ',
+						},
+					);
 				}
-				headers[header.name?.toLowerCase() as string] = header.value?.toString();
 			}
-		}
 
-		let responseBody: IN8nHttpResponse;
-		if (respondWith === 'json') {
-			const responseBodyParameter = this.getNodeParameter('responseBody', 0) as string;
-			if (responseBodyParameter) {
-				responseBody = jsonParse(responseBodyParameter, {
-					errorMessage: "Invalid JSON in 'Response Body' field",
-				});
-			}
-		} else if (respondWith === 'firstIncomingItem') {
-			responseBody = items[0].json;
-		} else if (respondWith === 'text') {
-			responseBody = this.getNodeParameter('responseBody', 0) as string;
-		} else if (respondWith === 'binary') {
-			const item = items[0];
+			const respondWith = this.getNodeParameter('respondWith', 0) as string;
+			const options = this.getNodeParameter('options', 0, {});
 
-			if (item.binary === undefined) {
-				throw new NodeOperationError(this.getNode(), 'No binary data exists on the first item!');
+			const headers = {} as IDataObject;
+			if (options.responseHeaders) {
+				for (const header of (options.responseHeaders as IDataObject).entries as IDataObject[]) {
+					if (typeof header.name !== 'string') {
+						header.name = header.name?.toString();
+					}
+					headers[header.name?.toLowerCase() as string] = header.value?.toString();
+				}
 			}
 
-			let responseBinaryPropertyName: string;
+			let statusCode = (options.responseCode as number) || 200;
+			let responseBody: IN8nHttpResponse | Readable;
+			if (respondWith === 'json') {
+				const responseBodyParameter = this.getNodeParameter('responseBody', 0) as string;
+				if (responseBodyParameter) {
+					if (typeof responseBodyParameter === 'object') {
+						responseBody = responseBodyParameter;
+					} else {
+						try {
+							responseBody = jsonParse(responseBodyParameter);
+						} catch (error) {
+							throw new NodeOperationError(this.getNode(), error as Error, {
+								message: "Invalid JSON in 'Response Body' field",
+								description:
+									"Check that the syntax of the JSON in the 'Response Body' parameter is valid",
+							});
+						}
+					}
+				}
+			} else if (respondWith === 'jwt') {
+				try {
+					const { keyType, secret, algorithm, privateKey } = (await this.getCredentials(
+						'jwtAuth',
+					)) as {
+						keyType: 'passphrase' | 'pemKey';
+						privateKey: string;
+						secret: string;
+						algorithm: jwt.Algorithm;
+					};
 
-			const responseDataSource = this.getNodeParameter('responseDataSource', 0) as string;
+					let secretOrPrivateKey;
 
-			if (responseDataSource === 'set') {
-				responseBinaryPropertyName = this.getNodeParameter('inputFieldName', 0) as string;
-			} else {
-				const binaryKeys = Object.keys(item.binary);
-				if (binaryKeys.length === 0) {
+					if (keyType === 'passphrase') {
+						secretOrPrivateKey = secret;
+					} else {
+						secretOrPrivateKey = formatPrivateKey(privateKey);
+					}
+					const payload = this.getNodeParameter('payload', 0, {}) as IDataObject;
+					const token = jwt.sign(payload, secretOrPrivateKey, { algorithm });
+					responseBody = { token };
+				} catch (error) {
+					throw new NodeOperationError(this.getNode(), error as Error, {
+						message: 'Error signing JWT token',
+					});
+				}
+			} else if (respondWith === 'allIncomingItems') {
+				const respondItems = items.map((item) => item.json);
+				responseBody = options.responseKey
+					? set({}, options.responseKey as string, respondItems)
+					: respondItems;
+			} else if (respondWith === 'firstIncomingItem') {
+				responseBody = options.responseKey
+					? set({}, options.responseKey as string, items[0].json)
+					: items[0].json;
+			} else if (respondWith === 'text') {
+				responseBody = this.getNodeParameter('responseBody', 0) as string;
+			} else if (respondWith === 'binary') {
+				const item = items[0];
+
+				if (item.binary === undefined) {
 					throw new NodeOperationError(this.getNode(), 'No binary data exists on the first item!');
 				}
-				responseBinaryPropertyName = binaryKeys[0];
-			}
 
-			const binaryData = this.helpers.assertBinaryData(0, responseBinaryPropertyName);
-			const binaryDataBuffer = await this.helpers.getBinaryDataBuffer(
-				0,
-				responseBinaryPropertyName,
-			);
+				let responseBinaryPropertyName: string;
 
-			if (!headers['content-type']) {
-				headers['content-type'] = binaryData.mimeType;
+				const responseDataSource = this.getNodeParameter('responseDataSource', 0) as string;
+
+				if (responseDataSource === 'set') {
+					responseBinaryPropertyName = this.getNodeParameter('inputFieldName', 0) as string;
+				} else {
+					const binaryKeys = Object.keys(item.binary);
+					if (binaryKeys.length === 0) {
+						throw new NodeOperationError(
+							this.getNode(),
+							'No binary data exists on the first item!',
+						);
+					}
+					responseBinaryPropertyName = binaryKeys[0];
+				}
+
+				const binaryData = this.helpers.assertBinaryData(0, responseBinaryPropertyName);
+				if (binaryData.id) {
+					responseBody = { binaryData };
+				} else {
+					responseBody = Buffer.from(binaryData.data, BINARY_ENCODING);
+					headers['content-length'] = (responseBody as Buffer).length;
+				}
+
+				if (!headers['content-type']) {
+					headers['content-type'] = binaryData.mimeType;
+				}
+			} else if (respondWith === 'redirect') {
+				headers.location = this.getNodeParameter('redirectURL', 0) as string;
+				statusCode = (options.responseCode as number) ?? 307;
+			} else if (respondWith !== 'noData') {
+				throw new NodeOperationError(
+					this.getNode(),
+					`The Response Data option "${respondWith}" is not supported!`,
+				);
 			}
-			responseBody = binaryDataBuffer;
-		} else if (respondWith !== 'noData') {
-			throw new NodeOperationError(
-				this.getNode(),
-				`The Response Data option "${respondWith}" is not supported!`,
-			);
-		}
 
-		const response: IN8nHttpFullResponse = {
-			body: responseBody,
-			headers,
-			statusCode: (options.responseCode as number) || 200,
-		};
+			const response: IN8nHttpFullResponse = {
+				body: responseBody,
+				headers,
+				statusCode,
+			};
+
+			this.sendResponse(response);
+		} catch (error) {
+			if (this.continueOnFail()) {
+				const itemData = generatePairedItemData(items.length);
+				const returnData = this.helpers.constructExecutionMetaData(
+					[{ json: { error: error.message } }],
+					{ itemData },
+				);
+				return [returnData];
+			}
 
-		this.sendResponse(response);
+			throw error;
+		}
 
-		return this.prepareOutputData(items);
+		return [items];
 	}
 }
diff --git a/packages/nodes-base/nodes/RespondToWebhook/webhook.svg b/packages/nodes-base/nodes/RespondToWebhook/webhook.svg
index a59b318554ef6..110ebbef60089 100644
--- a/packages/nodes-base/nodes/RespondToWebhook/webhook.svg
+++ b/packages/nodes-base/nodes/RespondToWebhook/webhook.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 48 48" width="48px" height="48px"><path fill="#37474f" d="M35,37c-2.2,0-4-1.8-4-4s1.8-4,4-4s4,1.8,4,4S37.2,37,35,37z"/><path fill="#37474f" d="M35,43c-3,0-5.9-1.4-7.8-3.7l3.1-2.5c1.1,1.4,2.9,2.3,4.7,2.3c3.3,0,6-2.7,6-6s-2.7-6-6-6 c-1,0-2,0.3-2.9,0.7l-1.7,1L23.3,16l3.5-1.9l5.3,9.4c1-0.3,2-0.5,3-0.5c5.5,0,10,4.5,10,10S40.5,43,35,43z"/><path fill="#37474f" d="M14,43C8.5,43,4,38.5,4,33c0-4.6,3.1-8.5,7.5-9.7l1,3.9C9.9,27.9,8,30.3,8,33c0,3.3,2.7,6,6,6 s6-2.7,6-6v-2h15v4H23.8C22.9,39.6,18.8,43,14,43z"/><path fill="#e91e63" d="M14,37c-2.2,0-4-1.8-4-4s1.8-4,4-4s4,1.8,4,4S16.2,37,14,37z"/><path fill="#37474f" d="M25,19c-2.2,0-4-1.8-4-4s1.8-4,4-4s4,1.8,4,4S27.2,19,25,19z"/><path fill="#e91e63" d="M15.7,34L12.3,32l5.9-9.7c-2-1.9-3.2-4.5-3.2-7.3c0-5.5,4.5-10,10-10c5.5,0,10,4.5,10,10 c0,0.9-0.1,1.7-0.3,2.5l-3.9-1c0.1-0.5,0.2-1,0.2-1.5c0-3.3-2.7-6-6-6s-6,2.7-6,6c0,2.1,1.1,4,2.9,5.1l1.7,1L15.7,34z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48"><path fill="#37474f" d="M35 37c-2.2 0-4-1.8-4-4s1.8-4 4-4 4 1.8 4 4-1.8 4-4 4"/><path fill="#37474f" d="M35 43c-3 0-5.9-1.4-7.8-3.7l3.1-2.5c1.1 1.4 2.9 2.3 4.7 2.3 3.3 0 6-2.7 6-6s-2.7-6-6-6c-1 0-2 .3-2.9.7l-1.7 1L23.3 16l3.5-1.9 5.3 9.4c1-.3 2-.5 3-.5 5.5 0 10 4.5 10 10S40.5 43 35 43"/><path fill="#37474f" d="M14 43C8.5 43 4 38.5 4 33c0-4.6 3.1-8.5 7.5-9.7l1 3.9C9.9 27.9 8 30.3 8 33c0 3.3 2.7 6 6 6s6-2.7 6-6v-2h15v4H23.8c-.9 4.6-5 8-9.8 8"/><path fill="#e91e63" d="M14 37c-2.2 0-4-1.8-4-4s1.8-4 4-4 4 1.8 4 4-1.8 4-4 4"/><path fill="#37474f" d="M25 19c-2.2 0-4-1.8-4-4s1.8-4 4-4 4 1.8 4 4-1.8 4-4 4"/><path fill="#e91e63" d="m15.7 34-3.4-2 5.9-9.7c-2-1.9-3.2-4.5-3.2-7.3 0-5.5 4.5-10 10-10s10 4.5 10 10c0 .9-.1 1.7-.3 2.5l-3.9-1c.1-.5.2-1 .2-1.5 0-3.3-2.7-6-6-6s-6 2.7-6 6c0 2.1 1.1 4 2.9 5.1l1.7 1z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Rocketchat/GenericFunctions.ts b/packages/nodes-base/nodes/Rocketchat/GenericFunctions.ts
index e45a307fc2b86..4a230c48d4d2d 100644
--- a/packages/nodes-base/nodes/Rocketchat/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Rocketchat/GenericFunctions.ts
@@ -1,19 +1,23 @@
-import type { OptionsWithUri } from 'request';
-
-import type { IDataObject, IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-workflow';
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	IHttpRequestMethods,
+	ILoadOptionsFunctions,
+	IRequestOptions,
+} from 'n8n-workflow';
 
 export async function rocketchatApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
 	resource: string,
-	method: string,
+	method: IHttpRequestMethods,
 	operation: string,
 
 	body: any = {},
-	headers?: object,
+	headers?: IDataObject,
 ): Promise<any> {
 	const credentials = await this.getCredentials('rocketchatApi');
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers,
 		method,
 		body,
@@ -23,7 +27,7 @@ export async function rocketchatApiRequest(
 	if (Object.keys(options.body as IDataObject).length === 0) {
 		delete options.body;
 	}
-	return this.helpers.requestWithAuthentication.call(this, 'rocketchatApi', options);
+	return await this.helpers.requestWithAuthentication.call(this, 'rocketchatApi', options);
 }
 
 export function validateJSON(json: string | undefined): any {
diff --git a/packages/nodes-base/nodes/Rocketchat/Rocketchat.node.ts b/packages/nodes-base/nodes/Rocketchat/Rocketchat.node.ts
index 7c1dbce58e250..623ba177882f4 100644
--- a/packages/nodes-base/nodes/Rocketchat/Rocketchat.node.ts
+++ b/packages/nodes-base/nodes/Rocketchat/Rocketchat.node.ts
@@ -495,6 +495,6 @@ export class Rocketchat implements INodeType {
 			}
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Rocketchat/rocketchat.svg b/packages/nodes-base/nodes/Rocketchat/rocketchat.svg
index 5a72e53f7ea6a..008e5de18249e 100644
--- a/packages/nodes-base/nodes/Rocketchat/rocketchat.svg
+++ b/packages/nodes-base/nodes/Rocketchat/rocketchat.svg
@@ -1 +1 @@
-<svg width="2500" height="2139" viewBox="0 0 256 219" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid"><path d="M255.95 109.307c0-12.853-3.844-25.173-11.43-36.63-6.81-10.283-16.351-19.385-28.355-27.057-23.18-14.806-53.647-22.963-85.782-22.963-10.734 0-21.315.907-31.577 2.705-6.366-5.96-13.82-11.322-21.707-15.56C34.964-10.62.022 9.322.022 9.322s32.487 26.688 27.204 50.08C12.693 73.821 4.814 91.207 4.814 109.307c0 .056.003.115.003.173 0 .057-.003.113-.003.174 0 18.1 7.876 35.486 22.412 49.902C32.509 182.95.022 209.639.022 209.639s34.942 19.939 77.077-.48c7.886-4.238 15.338-9.603 21.707-15.56 10.264 1.796 20.843 2.702 31.577 2.702 32.137 0 62.601-8.151 85.782-22.958 12.004-7.671 21.545-16.77 28.356-27.058 7.585-11.455 11.43-23.781 11.43-36.628 0-.06-.003-.115-.003-.174l.002-.176z" fill="#C1272D"/><path d="M130.383 40.828c59.505 0 107.746 30.814 107.746 68.824 0 38.007-48.241 68.823-107.746 68.823-13.25 0-25.94-1.532-37.662-4.325-11.915 14.332-38.125 34.26-63.587 27.82 8.282-8.895 20.552-23.926 17.926-48.686-15.262-11.873-24.422-27.07-24.422-43.632-.003-38.013 48.238-68.824 107.745-68.824" fill="#FFF"/><path d="M130.383 126.18c7.906 0 14.314-6.408 14.314-14.314 0-7.905-6.408-14.313-14.314-14.313-7.905 0-14.313 6.408-14.313 14.313 0 7.906 6.408 14.314 14.313 14.314zm49.764 0c7.905 0 14.314-6.408 14.314-14.314 0-7.905-6.409-14.313-14.314-14.313s-14.313 6.408-14.313 14.313c0 7.906 6.408 14.314 14.313 14.314zm-99.53-.003c7.904 0 14.311-6.407 14.311-14.31 0-7.904-6.407-14.312-14.31-14.312-7.905 0-14.312 6.408-14.312 14.311 0 7.904 6.407 14.311 14.311 14.311z" fill="#C1272D"/><path d="M130.383 169.42c-13.25 0-25.94-1.33-37.662-3.75-10.52 10.969-32.188 25.714-54.643 25.172-2.959 4.484-6.175 8.15-8.944 11.126 25.462 6.44 51.672-13.486 63.587-27.82 11.723 2.795 24.414 4.325 37.662 4.325 59.027 0 106.962-30.326 107.726-67.915-.764 32.582-48.699 58.861-107.726 58.861z" fill="#CCC"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="2500" height="2139" preserveAspectRatio="xMidYMid" viewBox="0 0 256 219"><path fill="#C1272D" d="M255.95 109.307c0-12.853-3.844-25.173-11.43-36.63-6.81-10.283-16.351-19.385-28.355-27.057-23.18-14.806-53.647-22.963-85.782-22.963-10.734 0-21.315.907-31.577 2.705-6.366-5.96-13.82-11.322-21.707-15.56C34.964-10.62.022 9.322.022 9.322s32.487 26.688 27.204 50.08C12.693 73.821 4.814 91.207 4.814 109.307l.003.173-.003.174c0 18.1 7.876 35.486 22.412 49.902C32.509 182.95.022 209.639.022 209.639s34.942 19.939 77.077-.48c7.886-4.238 15.338-9.603 21.707-15.56 10.264 1.796 20.843 2.702 31.577 2.702 32.137 0 62.601-8.151 85.782-22.958 12.004-7.671 21.545-16.77 28.356-27.058 7.585-11.455 11.43-23.781 11.43-36.628 0-.06-.003-.115-.003-.174z"/><path fill="#FFF" d="M130.383 40.828c59.505 0 107.746 30.814 107.746 68.824 0 38.007-48.241 68.823-107.746 68.823-13.25 0-25.94-1.532-37.662-4.325-11.915 14.332-38.125 34.26-63.587 27.82 8.282-8.895 20.552-23.926 17.926-48.686-15.262-11.873-24.422-27.07-24.422-43.632-.003-38.013 48.238-68.824 107.745-68.824"/><path fill="#C1272D" d="M130.383 126.18c7.906 0 14.314-6.408 14.314-14.314s-6.408-14.313-14.314-14.313-14.313 6.408-14.313 14.313 6.408 14.314 14.313 14.314m49.764 0c7.905 0 14.314-6.408 14.314-14.314s-6.409-14.313-14.314-14.313-14.313 6.408-14.313 14.313 6.408 14.314 14.313 14.314m-99.53-.003c7.904 0 14.311-6.407 14.311-14.31s-6.407-14.312-14.31-14.312c-7.905 0-14.312 6.408-14.312 14.311 0 7.904 6.407 14.311 14.311 14.311"/><path fill="#CCC" d="M130.383 169.42c-13.25 0-25.94-1.33-37.662-3.75-10.52 10.969-32.188 25.714-54.643 25.172-2.959 4.484-6.175 8.15-8.944 11.126 25.462 6.44 51.672-13.486 63.587-27.82 11.723 2.795 24.414 4.325 37.662 4.325 59.027 0 106.962-30.326 107.726-67.915-.764 32.582-48.699 58.861-107.726 58.861z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/RssFeedRead/RssFeedRead.node.json b/packages/nodes-base/nodes/RssFeedRead/RssFeedRead.node.json
index 234ca92da921d..f465f25e1dde3 100644
--- a/packages/nodes-base/nodes/RssFeedRead/RssFeedRead.node.json
+++ b/packages/nodes-base/nodes/RssFeedRead/RssFeedRead.node.json
@@ -21,8 +21,5 @@
 				"url": "https://n8n.io/blog/why-i-chose-n8n-over-zapier-in-2020/"
 			}
 		]
-	},
-	"subcategories": {
-		"Core Nodes": ["Helpers"]
 	}
 }
diff --git a/packages/nodes-base/nodes/RssFeedRead/RssFeedRead.node.ts b/packages/nodes-base/nodes/RssFeedRead/RssFeedRead.node.ts
index 637f589b8565c..615e21e4ee17c 100644
--- a/packages/nodes-base/nodes/RssFeedRead/RssFeedRead.node.ts
+++ b/packages/nodes-base/nodes/RssFeedRead/RssFeedRead.node.ts
@@ -1,3 +1,4 @@
+import { URL } from 'url';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -8,13 +9,13 @@ import type {
 import { NodeOperationError } from 'n8n-workflow';
 
 import Parser from 'rss-parser';
-import { URL } from 'url';
+import { generatePairedItemData } from '../../utils/utilities';
 
 // Utility function
 
 function validateURL(url: string) {
 	try {
-		const _parseUrl = new URL(url);
+		new URL(url);
 		return true;
 	} catch (err) {
 		return false;
@@ -44,12 +45,32 @@ export class RssFeedRead implements INodeType {
 				required: true,
 				description: 'URL of the RSS feed',
 			},
+			{
+				displayName: 'Options',
+				name: 'options',
+				type: 'collection',
+				placeholder: 'Add Option',
+				default: {},
+				options: [
+					{
+						displayName: 'Ignore SSL Issues',
+						name: 'ignoreSSL',
+						type: 'boolean',
+						default: false,
+						description: 'Whether to ignore SSL/TLS certificate issues or not',
+					},
+				],
+			},
 		],
 	};
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const pairedItem = generatePairedItemData(this.getInputData().length);
+
 		try {
 			const url = this.getNodeParameter('url', 0) as string;
+			const options = this.getNodeParameter('options', 0);
+			const ignoreSSL = Boolean(options.ignoreSSL);
 
 			if (!url) {
 				throw new NodeOperationError(this.getNode(), 'The parameter "URL" has to be set!');
@@ -59,7 +80,11 @@ export class RssFeedRead implements INodeType {
 				throw new NodeOperationError(this.getNode(), 'The provided "URL" is not valid!');
 			}
 
-			const parser = new Parser();
+			const parser = new Parser({
+				requestOptions: {
+					rejectUnauthorized: !ignoreSSL,
+				},
+			});
 
 			let feed: Parser.Output<IDataObject>;
 			try {
@@ -75,19 +100,22 @@ export class RssFeedRead implements INodeType {
 				throw new NodeOperationError(this.getNode(), error as Error);
 			}
 
-			const returnData: IDataObject[] = [];
+			const returnData: INodeExecutionData[] = [];
 
 			// For now we just take the items and ignore everything else
 			if (feed.items) {
 				feed.items.forEach((item) => {
-					returnData.push(item);
+					returnData.push({
+						json: item,
+						pairedItem,
+					});
 				});
 			}
 
-			return [this.helpers.returnJsonArray(returnData)];
+			return [returnData];
 		} catch (error) {
 			if (this.continueOnFail()) {
-				return this.prepareOutputData([{ json: { error: error.message } }]);
+				return [[{ json: { error: error.message }, pairedItem }]];
 			}
 			throw error;
 		}
diff --git a/packages/nodes-base/nodes/RssFeedRead/RssFeedReadTrigger.node.json b/packages/nodes-base/nodes/RssFeedRead/RssFeedReadTrigger.node.json
new file mode 100644
index 0000000000000..96c41459f96b4
--- /dev/null
+++ b/packages/nodes-base/nodes/RssFeedRead/RssFeedReadTrigger.node.json
@@ -0,0 +1,13 @@
+{
+	"node": "n8n-nodes-base.rssFeedReadTrigger",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"categories": ["Core Nodes"],
+	"resources": {
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.rssfeedreadtrigger/"
+			}
+		]
+	}
+}
diff --git a/packages/nodes-base/nodes/RssFeedRead/RssFeedReadTrigger.node.ts b/packages/nodes-base/nodes/RssFeedRead/RssFeedReadTrigger.node.ts
new file mode 100644
index 0000000000000..114bcb15e3161
--- /dev/null
+++ b/packages/nodes-base/nodes/RssFeedRead/RssFeedReadTrigger.node.ts
@@ -0,0 +1,88 @@
+import type {
+	IDataObject,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+	IPollFunctions,
+} from 'n8n-workflow';
+import { NodeOperationError } from 'n8n-workflow';
+import Parser from 'rss-parser';
+import moment from 'moment-timezone';
+
+export class RssFeedReadTrigger implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'RSS Feed Trigger',
+		name: 'rssFeedReadTrigger',
+		icon: 'fa:rss',
+		group: ['trigger'],
+		version: 1,
+		description: 'Starts a workflow when an RSS feed is updated',
+		subtitle: '={{$parameter["event"]}}',
+		defaults: {
+			name: 'RSS Feed Trigger',
+			color: '#b02020',
+		},
+		polling: true,
+		inputs: [],
+		outputs: ['main'],
+		properties: [
+			{
+				displayName: 'Feed URL',
+				name: 'feedUrl',
+				type: 'string',
+				default: 'https://blog.n8n.io/rss/',
+				required: true,
+				description: 'URL of the RSS feed to poll',
+			},
+		],
+	};
+
+	async poll(this: IPollFunctions): Promise<INodeExecutionData[][] | null> {
+		const pollData = this.getWorkflowStaticData('node');
+		const feedUrl = this.getNodeParameter('feedUrl') as string;
+
+		const now = moment().utc().format();
+		const dateToCheck =
+			(pollData.lastItemDate as string) || (pollData.lastTimeChecked as string) || now;
+
+		if (!feedUrl) {
+			throw new NodeOperationError(this.getNode(), 'The parameter "URL" has to be set!');
+		}
+
+		const parser = new Parser();
+
+		let feed: Parser.Output<IDataObject>;
+		try {
+			feed = await parser.parseURL(feedUrl);
+		} catch (error) {
+			if (error.code === 'ECONNREFUSED') {
+				throw new NodeOperationError(
+					this.getNode(),
+					`It was not possible to connect to the URL. Please make sure the URL "${feedUrl}" it is valid!`,
+				);
+			}
+
+			throw new NodeOperationError(this.getNode(), error as Error);
+		}
+
+		const returnData: IDataObject[] = [];
+
+		if (feed.items) {
+			if (this.getMode() === 'manual') {
+				return [this.helpers.returnJsonArray(feed.items[0])];
+			}
+			feed.items.forEach((item) => {
+				if (Date.parse(item.isoDate as string) > Date.parse(dateToCheck)) {
+					returnData.push(item);
+				}
+			});
+			pollData.lastItemDate = feed.items[0].isoDate;
+		}
+
+		if (Array.isArray(returnData) && returnData.length !== 0) {
+			return [this.helpers.returnJsonArray(returnData)];
+		}
+
+		return null;
+	}
+}
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 ff46b61735a63..62806e448ca83 100644
--- a/packages/nodes-base/nodes/RssFeedRead/test/node/RssFeedRead.test.ts
+++ b/packages/nodes-base/nodes/RssFeedRead/test/node/RssFeedRead.test.ts
@@ -1,11 +1,5 @@
-import {
-	setup,
-	equalityTest,
-	workflowToTests,
-	getWorkflowFilenames,
-} from '../../../../test/nodes/Helpers';
-
 import nock from 'nock';
+import { setup, equalityTest, workflowToTests, getWorkflowFilenames } from '@test/nodes/Helpers';
 
 // eslint-disable-next-line n8n-local-rules/no-unneeded-backticks
 const feed = `<?xml version="1.0" encoding="UTF-8"?><rss xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title><![CDATA[Lorem ipsum feed for an interval of 1 minutes with 3 item(s)]]></title><description><![CDATA[This is a constantly updating lorem ipsum feed]]></description><link>http://example.com/</link><generator>RSS for Node</generator><lastBuildDate>Thu, 09 Feb 2023 13:40:32 GMT</lastBuildDate><pubDate>Thu, 09 Feb 2023 13:40:00 GMT</pubDate><copyright><![CDATA[Michael Bertolacci, licensed under a Creative Commons Attribution 3.0 Unported License.]]></copyright><ttl>1</ttl><item><title><![CDATA[Lorem ipsum 2023-02-09T13:40:00Z]]></title><description><![CDATA[Fugiat excepteur exercitation tempor ut aute sunt pariatur veniam pariatur dolor.]]></description><link>http://example.com/test/1675950000</link><guid isPermaLink="true">http://example.com/test/1675950000</guid><dc:creator><![CDATA[John Smith]]></dc:creator><pubDate>Thu, 09 Feb 2023 13:40:00 GMT</pubDate></item><item><title><![CDATA[Lorem ipsum 2023-02-09T13:39:00Z]]></title><description><![CDATA[Laboris quis nulla tempor eu ullamco est esse qui aute commodo aliqua occaecat.]]></description><link>http://example.com/test/1675949940</link><guid isPermaLink="true">http://example.com/test/1675949940</guid><dc:creator><![CDATA[John Smith]]></dc:creator><pubDate>Thu, 09 Feb 2023 13:39:00 GMT</pubDate></item><item><title><![CDATA[Lorem ipsum 2023-02-09T13:38:00Z]]></title><description><![CDATA[Irure labore dolor dolore sint aliquip eu anim aute anim et nulla adipisicing nostrud.]]></description><link>http://example.com/test/1675949880</link><guid isPermaLink="true">http://example.com/test/1675949880</guid><dc:creator><![CDATA[John Smith]]></dc:creator><pubDate>Thu, 09 Feb 2023 13:38:00 GMT</pubDate></item></channel></rss>`;
@@ -27,6 +21,6 @@ describe('Test HTTP Request Node', () => {
 	const nodeTypes = setup(tests);
 
 	for (const testData of tests) {
-		test(testData.description, async () => equalityTest(testData, nodeTypes));
+		test(testData.description, async () => await equalityTest(testData, nodeTypes));
 	}
 });
diff --git a/packages/nodes-base/nodes/Rundeck/Rundeck.node.ts b/packages/nodes-base/nodes/Rundeck/Rundeck.node.ts
index 1ad253620fa83..439c9501d4a2c 100644
--- a/packages/nodes-base/nodes/Rundeck/Rundeck.node.ts
+++ b/packages/nodes-base/nodes/Rundeck/Rundeck.node.ts
@@ -119,6 +119,20 @@ export class Rundeck implements INodeType {
 					},
 				],
 			},
+			{
+				displayName: 'Filter',
+				name: 'filter',
+				type: 'string',
+				displayOptions: {
+					show: {
+						operation: ['execute'],
+						resource: ['job'],
+					},
+				},
+				default: '',
+				placeholder: 'Add Filters',
+				description: 'Filter Rundeck nodes by name',
+			},
 
 			// ----------------------------------
 			//         job:getMetadata
@@ -161,7 +175,8 @@ export class Rundeck implements INodeType {
 					const jobid = this.getNodeParameter('jobid', i) as string;
 					const rundeckArguments = (this.getNodeParameter('arguments', i) as IDataObject)
 						.arguments as IDataObject[];
-					const response = await rundeckApi.executeJob(jobid, rundeckArguments);
+					const filter = this.getNodeParameter('filter', i) as string;
+					const response = await rundeckApi.executeJob(jobid, rundeckArguments, filter);
 
 					returnData.push(response);
 				} else if (operation === 'getMetadata') {
diff --git a/packages/nodes-base/nodes/Rundeck/RundeckApi.ts b/packages/nodes-base/nodes/Rundeck/RundeckApi.ts
index fe85acde4eac7..4053912a555d7 100644
--- a/packages/nodes-base/nodes/Rundeck/RundeckApi.ts
+++ b/packages/nodes-base/nodes/Rundeck/RundeckApi.ts
@@ -1,5 +1,10 @@
-import type { OptionsWithUri } from 'request';
-import type { IDataObject, IExecuteFunctions, JsonObject } from 'n8n-workflow';
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
+} from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 export interface RundeckCredentials {
@@ -16,10 +21,15 @@ export class RundeckApi {
 		this.executeFunctions = executeFunctions;
 	}
 
-	protected async request(method: string, endpoint: string, body: IDataObject, query: object) {
+	protected async request(
+		method: IHttpRequestMethods,
+		endpoint: string,
+		body: IDataObject,
+		query: IDataObject,
+	) {
 		const credentialType = 'rundeckApi';
 
-		const options: OptionsWithUri = {
+		const options: IRequestOptions = {
 			rejectUnauthorized: false,
 			method,
 			qs: query,
@@ -49,7 +59,7 @@ export class RundeckApi {
 		this.credentials = credentials as unknown as RundeckCredentials;
 	}
 
-	async executeJob(jobId: string, args: IDataObject[]): Promise<IDataObject> {
+	async executeJob(jobId: string, args: IDataObject[], filter?: string): Promise<IDataObject> {
 		let params = '';
 
 		if (args) {
@@ -62,10 +72,15 @@ export class RundeckApi {
 			argString: params,
 		};
 
-		return this.request('POST', `/api/14/job/${jobId}/run`, body, {});
+		const query: IDataObject = {};
+		if (filter) {
+			query.filter = filter;
+		}
+
+		return await this.request('POST', `/api/14/job/${jobId}/run`, body, query);
 	}
 
 	async getJobMetadata(jobId: string): Promise<IDataObject> {
-		return this.request('GET', `/api/18/job/${jobId}/info`, {}, {});
+		return await this.request('GET', `/api/18/job/${jobId}/info`, {}, {});
 	}
 }
diff --git a/packages/nodes-base/nodes/S3/GenericFunctions.ts b/packages/nodes-base/nodes/S3/GenericFunctions.ts
index eea824e9ed4a5..a31eb6ddd5427 100644
--- a/packages/nodes-base/nodes/S3/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/S3/GenericFunctions.ts
@@ -1,9 +1,8 @@
+import { URL } from 'url';
 import type { Request } from 'aws4';
 import { sign } from 'aws4';
 
-import get from 'lodash.get';
-
-import type { OptionsWithUri } from 'request';
+import get from 'lodash/get';
 
 import { parseString } from 'xml2js';
 
@@ -11,14 +10,14 @@ import type {
 	IDataObject,
 	IExecuteFunctions,
 	IHookFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
+	IRequestOptions,
 	IWebhookFunctions,
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
-import { URL } from 'url';
-
 function queryToString(params: IDataObject) {
 	return Object.keys(params)
 		.map((key) => key + '=' + (params[key] as string))
@@ -28,7 +27,7 @@ function queryToString(params: IDataObject) {
 export async function s3ApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
 	bucket: string,
-	method: string,
+	method: IHttpRequestMethods,
 	path: string,
 	body?: string | Buffer,
 	query: IDataObject = {},
@@ -78,12 +77,13 @@ export async function s3ApiRequest(
 
 	sign(signOpts, securityHeaders);
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: signOpts.headers,
 		method,
 		qs: query,
 		uri: endpoint.toString(),
 		body: signOpts.body,
+		rejectUnauthorized: !credentials.ignoreSSLIssues as boolean,
 	};
 
 	if (Object.keys(option).length !== 0) {
@@ -99,7 +99,7 @@ export async function s3ApiRequest(
 export async function s3ApiRequestREST(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	bucket: string,
-	method: string,
+	method: IHttpRequestMethods,
 	path: string,
 	body?: string,
 	query: IDataObject = {},
@@ -128,7 +128,7 @@ export async function s3ApiRequestREST(
 export async function s3ApiRequestSOAP(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
 	bucket: string,
-	method: string,
+	method: IHttpRequestMethods,
 	path: string,
 	body?: string | Buffer,
 	query: IDataObject = {},
@@ -165,7 +165,7 @@ export async function s3ApiRequestSOAPAllItems(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
 	propertyName: string,
 	service: string,
-	method: string,
+	method: IHttpRequestMethods,
 	path: string,
 	body?: string,
 	query: IDataObject = {},
@@ -191,11 +191,11 @@ export async function s3ApiRequestSOAPAllItems(
 		);
 
 		//https://forums.aws.amazon.com/thread.jspa?threadID=55746
-		if (get(responseData, `${propertyName.split('.')[0]}.NextContinuationToken`)) {
-			query['continuation-token'] = get(
-				responseData,
-				`${propertyName.split('.')[0]}.NextContinuationToken`,
-			);
+		if (get(responseData, [propertyName.split('.')[0], 'NextContinuationToken'])) {
+			query['continuation-token'] = get(responseData, [
+				propertyName.split('.')[0],
+				'NextContinuationToken',
+			]);
 		}
 		if (get(responseData, propertyName)) {
 			if (Array.isArray(get(responseData, propertyName))) {
@@ -209,8 +209,8 @@ export async function s3ApiRequestSOAPAllItems(
 			return returnData;
 		}
 	} while (
-		get(responseData, `${propertyName.split('.')[0]}.IsTruncated`) !== undefined &&
-		get(responseData, `${propertyName.split('.')[0]}.IsTruncated`) !== 'false'
+		get(responseData, [propertyName.split('.')[0], 'IsTruncated']) !== undefined &&
+		get(responseData, [propertyName.split('.')[0], 'IsTruncated']) !== 'false'
 	);
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/S3/S3.node.ts b/packages/nodes-base/nodes/S3/S3.node.ts
index de9f08825c16d..d7844ba9a449c 100644
--- a/packages/nodes-base/nodes/S3/S3.node.ts
+++ b/packages/nodes-base/nodes/S3/S3.node.ts
@@ -1,6 +1,5 @@
-import { paramCase, snakeCase } from 'change-case';
-
 import { createHash } from 'crypto';
+import { paramCase, snakeCase } from 'change-case';
 
 import { Builder } from 'xml2js';
 
@@ -14,11 +13,11 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
-import { bucketFields, bucketOperations } from '../Aws/S3/BucketDescription';
+import { bucketFields, bucketOperations } from '../Aws/S3/V1/BucketDescription';
 
-import { folderFields, folderOperations } from '../Aws/S3/FolderDescription';
+import { folderFields, folderOperations } from '../Aws/S3/V1/FolderDescription';
 
-import { fileFields, fileOperations } from '../Aws/S3/FileDescription';
+import { fileFields, fileOperations } from '../Aws/S3/V1/FileDescription';
 
 import { s3ApiRequestREST, s3ApiRequestSOAP, s3ApiRequestSOAPAllItems } from './GenericFunctions';
 
@@ -902,9 +901,9 @@ export class S3 implements INodeType {
 		}
 		if (resource === 'file' && operation === 'download') {
 			// For file downloads the files get attached to the existing items
-			return this.prepareOutputData(items);
+			return [items];
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Salesforce/AttachmentDescription.ts b/packages/nodes-base/nodes/Salesforce/AttachmentDescription.ts
index d26a97d68b171..0a6c17968ca92 100644
--- a/packages/nodes-base/nodes/Salesforce/AttachmentDescription.ts
+++ b/packages/nodes-base/nodes/Salesforce/AttachmentDescription.ts
@@ -86,7 +86,7 @@ export const attachmentFields: INodeProperties[] = [
 			'Required. Name of the attached file. Maximum size is 255 characters. Label is File Name.',
 	},
 	{
-		displayName: 'Binary Property',
+		displayName: 'Input Binary Field',
 		name: 'binaryPropertyName',
 		type: 'string',
 		default: 'data',
@@ -98,7 +98,7 @@ export const attachmentFields: INodeProperties[] = [
 			},
 		},
 		placeholder: '',
-		description: 'Name of the binary property which contains the data for the file to be uploaded',
+		hint: 'The name of the input binary field containing the file to be uploaded',
 	},
 	{
 		displayName: 'Additional Fields',
@@ -173,13 +173,12 @@ export const attachmentFields: INodeProperties[] = [
 		},
 		options: [
 			{
-				displayName: 'Binary Property',
+				displayName: 'Input Binary Field',
 				name: 'binaryPropertyName',
 				type: 'string',
 				default: 'data',
 				placeholder: '',
-				description:
-					'Name of the binary property which contains the data for the file to be uploaded',
+				hint: 'The name of the input binary field containing the file to be uploaded',
 			},
 			{
 				displayName: 'Description',
diff --git a/packages/nodes-base/nodes/Salesforce/ContactDescription.ts b/packages/nodes-base/nodes/Salesforce/ContactDescription.ts
index 0a38facab3e08..39680eaab2187 100644
--- a/packages/nodes-base/nodes/Salesforce/ContactDescription.ts
+++ b/packages/nodes-base/nodes/Salesforce/ContactDescription.ts
@@ -13,10 +13,10 @@ export const contactOperations: INodeProperties[] = [
 		},
 		options: [
 			{
-				name: 'Add Lead To Campaign',
+				name: 'Add Contact To Campaign',
 				value: 'addToCampaign',
-				description: 'Add lead to a campaign',
-				action: 'Add a lead to a campaign',
+				description: 'Add contact to a campaign',
+				action: 'Add a contact to a campaign',
 			},
 			{
 				name: 'Add Note',
diff --git a/packages/nodes-base/nodes/Salesforce/DocumentDescription.ts b/packages/nodes-base/nodes/Salesforce/DocumentDescription.ts
index b2232fc3bdb4f..20b4062a47baf 100644
--- a/packages/nodes-base/nodes/Salesforce/DocumentDescription.ts
+++ b/packages/nodes-base/nodes/Salesforce/DocumentDescription.ts
@@ -42,7 +42,7 @@ export const documentFields: INodeProperties[] = [
 		description: 'Name of the file',
 	},
 	{
-		displayName: 'Binary Property',
+		displayName: 'Input Binary Field',
 		name: 'binaryPropertyName',
 		type: 'string',
 		default: 'data',
@@ -54,7 +54,7 @@ export const documentFields: INodeProperties[] = [
 			},
 		},
 		placeholder: '',
-		description: 'Name of the binary property which contains the data for the file to be uploaded',
+		hint: 'The name of the input binary field containing the file to be uploaded',
 	},
 	{
 		displayName: 'Additional Fields',
diff --git a/packages/nodes-base/nodes/Salesforce/GenericFunctions.ts b/packages/nodes-base/nodes/Salesforce/GenericFunctions.ts
index 86128c1c1e7cd..78454e3519994 100644
--- a/packages/nodes-base/nodes/Salesforce/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Salesforce/GenericFunctions.ts
@@ -1,12 +1,12 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	ILoadOptionsFunctions,
 	IDataObject,
 	INodePropertyOptions,
 	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
+	IPollFunctions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
@@ -15,22 +15,22 @@ import moment from 'moment-timezone';
 import jwt from 'jsonwebtoken';
 
 function getOptions(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: any,
 	qs: IDataObject,
 	instanceUrl: string,
-): OptionsWithUri {
-	const options: OptionsWithUri = {
+): IRequestOptions {
+	const options: IRequestOptions = {
 		headers: {
 			'Content-Type': 'application/json',
 		},
 		method,
 		body,
 		qs,
-		uri: `${instanceUrl}/services/data/v39.0${endpoint}`,
+		uri: `${instanceUrl}/services/data/v59.0${endpoint}`,
 		json: true,
 	};
 
@@ -42,7 +42,7 @@ function getOptions(
 }
 
 async function getAccessToken(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
+	this: IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions,
 	credentials: IDataObject,
 ): Promise<IDataObject> {
 	const now = moment().unix();
@@ -67,7 +67,7 @@ async function getAccessToken(
 		},
 	);
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			'Content-Type': 'application/x-www-form-urlencoded',
 		},
@@ -80,12 +80,12 @@ async function getAccessToken(
 		json: true,
 	};
 
-	return this.helpers.request(options);
+	return await this.helpers.request(options);
 }
 
 export async function salesforceApiRequest(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: any = {},
@@ -143,9 +143,9 @@ export async function salesforceApiRequest(
 }
 
 export async function salesforceApiRequestAllItems(
-	this: IExecuteFunctions | ILoadOptionsFunctions,
+	this: IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: any = {},
diff --git a/packages/nodes-base/nodes/Salesforce/LeadDescription.ts b/packages/nodes-base/nodes/Salesforce/LeadDescription.ts
index 297adf136acc6..4395a48b9ea0b 100644
--- a/packages/nodes-base/nodes/Salesforce/LeadDescription.ts
+++ b/packages/nodes-base/nodes/Salesforce/LeadDescription.ts
@@ -229,7 +229,14 @@ export const leadFields: INodeProperties[] = [
 				description: 'Email address for the lead',
 			},
 			{
-				displayName: 'Fist Name',
+				displayName: 'Fax',
+				name: 'fax',
+				type: 'number',
+				default: '',
+				description: 'Fax number of the lead',
+			},
+			{
+				displayName: 'First Name',
 				name: 'firstname',
 				type: 'string',
 				default: '',
@@ -243,6 +250,14 @@ export const leadFields: INodeProperties[] = [
 				description:
 					'Whether the lead doesn’t want to receive email from Salesforce (true) or does (false). Label is Email Opt Out.',
 			},
+			{
+				displayName: 'Has Opted Out of Fax',
+				name: 'hasOptedOutOfFax',
+				type: 'boolean',
+				default: false,
+				description:
+					'Whether the lead doesn’t want to receive fax from Salesforce (true) or does (false). Label is Email Opt Out.',
+			},
 			{
 				displayName: 'Industry',
 				name: 'industry',
@@ -498,7 +513,14 @@ export const leadFields: INodeProperties[] = [
 				description: 'Email address for the lead',
 			},
 			{
-				displayName: 'Fist Name',
+				displayName: 'Fax',
+				name: 'fax',
+				type: 'number',
+				default: '',
+				description: 'Fax Number of the lead',
+			},
+			{
+				displayName: 'First Name',
 				name: 'firstname',
 				type: 'string',
 				default: '',
@@ -512,6 +534,14 @@ export const leadFields: INodeProperties[] = [
 				description:
 					'Whether the lead doesn’t want to receive email from Salesforce (true) or does (false). Label is Email Opt Out.',
 			},
+			{
+				displayName: 'Has Opted Out of Fax',
+				name: 'HasOptedOutOfFax',
+				type: 'boolean',
+				default: false,
+				description:
+					'Whether the lead doesn’t want to receive fax from Salesforce (true) or does (false). Label is Fax Opt Out.',
+			},
 			{
 				displayName: 'Industry',
 				name: 'industry',
diff --git a/packages/nodes-base/nodes/Salesforce/LeadInterface.ts b/packages/nodes-base/nodes/Salesforce/LeadInterface.ts
index fca3e2be5da70..21881f1b9900e 100644
--- a/packages/nodes-base/nodes/Salesforce/LeadInterface.ts
+++ b/packages/nodes-base/nodes/Salesforce/LeadInterface.ts
@@ -3,6 +3,7 @@ export interface ILead {
 	Company?: string;
 	LastName?: string;
 	Email?: string;
+	Fax?: number;
 	City?: string;
 	Phone?: string;
 	State?: string;
@@ -25,4 +26,5 @@ export interface ILead {
 	NumberOfEmployees?: number;
 	MobilePhone?: string;
 	HasOptedOutOfEmail?: boolean;
+	HasOptedOutOfFax?: boolean;
 }
diff --git a/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts b/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts
index fff4bb6e697af..4db839ba1df21 100644
--- a/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts
+++ b/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts
@@ -7,6 +7,7 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 	JsonObject,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
@@ -1084,6 +1085,9 @@ export class Salesforce implements INodeType {
 						if (additionalFields.hasOptedOutOfEmail !== undefined) {
 							body.HasOptedOutOfEmail = additionalFields.hasOptedOutOfEmail as boolean;
 						}
+						if (additionalFields.hasOptedOutOfFax !== undefined) {
+							body.HasOptedOutOfFax = additionalFields.hasOptedOutOfFax as boolean;
+						}
 						if (additionalFields.email !== undefined) {
 							body.Email = additionalFields.email as string;
 						}
@@ -1123,6 +1127,9 @@ export class Salesforce implements INodeType {
 						if (additionalFields.industry !== undefined) {
 							body.Industry = additionalFields.industry as string;
 						}
+						if (additionalFields.fax !== undefined) {
+							body.Fax = additionalFields.fax as number;
+						}
 						if (additionalFields.firstname !== undefined) {
 							body.FirstName = additionalFields.firstname as string;
 						}
@@ -1163,7 +1170,7 @@ export class Salesforce implements INodeType {
 							}
 						}
 						let endpoint = '/sobjects/lead';
-						let method = 'POST';
+						let method: IHttpRequestMethods = 'POST';
 						if (operation === 'upsert') {
 							method = 'PATCH';
 							const externalId = this.getNodeParameter('externalId', 0) as string;
@@ -1190,6 +1197,9 @@ export class Salesforce implements INodeType {
 						if (updateFields.hasOptedOutOfEmail !== undefined) {
 							body.HasOptedOutOfEmail = updateFields.hasOptedOutOfEmail as boolean;
 						}
+						if (updateFields.hasOptedOutOfFax !== undefined) {
+							body.hasOptedOutOfFax = updateFields.hasOptedOutOfFax as boolean;
+						}
 						if (updateFields.lastname !== undefined) {
 							body.LastName = updateFields.lastname as string;
 						}
@@ -1238,6 +1248,9 @@ export class Salesforce implements INodeType {
 						if (updateFields.firstname !== undefined) {
 							body.FirstName = updateFields.firstname as string;
 						}
+						if (updateFields.fax !== undefined) {
+							body.Fax = updateFields.fax as number;
+						}
 						if (updateFields.leadSource !== undefined) {
 							body.LeadSource = updateFields.leadSource as string;
 						}
@@ -1485,7 +1498,7 @@ export class Salesforce implements INodeType {
 							}
 						}
 						let endpoint = '/sobjects/contact';
-						let method = 'POST';
+						let method: IHttpRequestMethods = 'POST';
 						if (operation === 'upsert') {
 							method = 'PATCH';
 							const externalId = this.getNodeParameter('externalId', 0) as string;
@@ -1737,7 +1750,7 @@ export class Salesforce implements INodeType {
 							body.RecordTypeId = additionalFields.recordTypeId as string;
 						}
 						let endpoint = `/sobjects/${customObject}`;
-						let method = 'POST';
+						let method: IHttpRequestMethods = 'POST';
 						if (operation === 'upsert') {
 							method = 'PATCH';
 							const externalId = this.getNodeParameter('externalId', 0) as string;
@@ -1932,7 +1945,7 @@ export class Salesforce implements INodeType {
 							}
 						}
 						let endpoint = '/sobjects/opportunity';
-						let method = 'POST';
+						let method: IHttpRequestMethods = 'POST';
 						if (operation === 'upsert') {
 							method = 'PATCH';
 							const externalId = this.getNodeParameter('externalId', 0) as string;
@@ -2181,7 +2194,7 @@ export class Salesforce implements INodeType {
 							}
 						}
 						let endpoint = '/sobjects/account';
-						let method = 'POST';
+						let method: IHttpRequestMethods = 'POST';
 						if (operation === 'upsert') {
 							method = 'PATCH';
 							const externalId = this.getNodeParameter('externalId', 0) as string;
@@ -2213,8 +2226,8 @@ export class Salesforce implements INodeType {
 						if (updateFields.phone !== undefined) {
 							body.Phone = updateFields.phone as string;
 						}
-						if (updateFields.owner !== undefined) {
-							body.OwnerId = updateFields.owner as string;
+						if (updateFields.ownerId !== undefined) {
+							body.OwnerId = updateFields.ownerId as string;
 						}
 						if (updateFields.sicDesc !== undefined) {
 							body.SicDesc = updateFields.sicDesc as string;
@@ -2842,7 +2855,7 @@ export class Salesforce implements INodeType {
 							Name: name,
 							ParentId: parentId,
 						};
-						if (items[i].binary && items[i].binary![binaryPropertyName]) {
+						if (items[i].binary?.[binaryPropertyName]) {
 							body.Body = items[i].binary![binaryPropertyName].data;
 							body.ContentType = items[i].binary![binaryPropertyName].mimeType;
 						} else {
@@ -2875,7 +2888,7 @@ export class Salesforce implements INodeType {
 						const body: IAttachment = {};
 						if (updateFields.binaryPropertyName !== undefined) {
 							const binaryPropertyName = updateFields.binaryPropertyName as string;
-							if (items[i].binary && items[i].binary![binaryPropertyName]) {
+							if (items[i].binary?.[binaryPropertyName]) {
 								body.Body = items[i].binary![binaryPropertyName].data;
 								body.ContentType = items[i].binary![binaryPropertyName].mimeType;
 							} else {
@@ -3082,6 +3095,6 @@ export class Salesforce implements INodeType {
 				throw error;
 			}
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Salesforce/SalesforceTrigger.node.ts b/packages/nodes-base/nodes/Salesforce/SalesforceTrigger.node.ts
new file mode 100644
index 0000000000000..613ff5daca208
--- /dev/null
+++ b/packages/nodes-base/nodes/Salesforce/SalesforceTrigger.node.ts
@@ -0,0 +1,290 @@
+import { NodeApiError } from 'n8n-workflow';
+
+import type {
+	IDataObject,
+	IPollFunctions,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+	ILoadOptionsFunctions,
+	INodePropertyOptions,
+	JsonObject,
+} from 'n8n-workflow';
+
+import { DateTime } from 'luxon';
+import {
+	getQuery,
+	salesforceApiRequest,
+	salesforceApiRequestAllItems,
+	sortOptions,
+} from './GenericFunctions';
+
+export class SalesforceTrigger implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Salesforce Trigger',
+		name: 'salesforceTrigger',
+		icon: 'file:salesforce.svg',
+		group: ['trigger'],
+		version: 1,
+		description:
+			'Fetches data from Salesforce and starts the workflow on specified polling intervals.',
+		subtitle: '={{($parameter["triggerOn"])}}',
+		defaults: {
+			name: 'Salesforce Trigger',
+		},
+		credentials: [
+			{
+				name: 'salesforceOAuth2Api',
+				required: true,
+			},
+		],
+		polling: true,
+		inputs: [],
+		outputs: ['main'],
+		properties: [
+			{
+				displayName: 'Trigger On',
+				name: 'triggerOn',
+				description: 'Which Salesforce event should trigger the node',
+				type: 'options',
+				default: '',
+				options: [
+					{
+						name: 'Account Created',
+						value: 'accountCreated',
+						description: 'When a new account is created',
+					},
+					{
+						name: 'Account Updated',
+						value: 'accountUpdated',
+						description: 'When an existing account is modified',
+					},
+					{
+						name: 'Attachment Created',
+						value: 'attachmentCreated',
+						description: 'When a file is uploaded and attached to an object',
+					},
+					{
+						name: 'Attachment Updated',
+						value: 'attachmentUpdated',
+						description: 'When an existing file is modified',
+					},
+					{
+						name: 'Case Created',
+						value: 'caseCreated',
+						description: 'When a new case is created',
+					},
+					{
+						name: 'Case Updated',
+						value: 'caseUpdated',
+						description: 'When an existing case is modified',
+					},
+					{
+						name: 'Contact Created',
+						value: 'contactCreated',
+						description: 'When a new contact is created',
+					},
+					{
+						name: 'Contact Updated',
+						value: 'contactUpdated',
+						description: 'When an existing contact is modified',
+					},
+					{
+						name: 'Custom Object Created',
+						value: 'customObjectCreated',
+						description: 'When a new object of a given type is created',
+					},
+					{
+						name: 'Custom Object Updated',
+						value: 'customObjectUpdated',
+						description: 'When an object of a given type is modified',
+					},
+					{
+						name: 'Lead Created',
+						value: 'leadCreated',
+						description: 'When a new lead is created',
+					},
+					{
+						name: 'Lead Updated',
+						value: 'leadUpdated',
+						description: 'When an existing lead is modified',
+					},
+					{
+						name: 'Opportunity Created',
+						value: 'opportunityCreated',
+						description: 'When a new opportunity is created',
+					},
+					{
+						name: 'Opportunity Updated',
+						value: 'opportunityUpdated',
+						description: 'When an existing opportunity is created',
+					},
+					{
+						name: 'Task Created',
+						value: 'taskCreated',
+						description: 'When a new task is created',
+					},
+					{
+						name: 'Task Updated',
+						value: 'taskUpdated',
+						description: 'When an existing task is modified',
+					},
+					{
+						name: 'User Created',
+						value: 'userCreated',
+						description: 'When a new user is created',
+					},
+					{
+						name: 'User Updated',
+						value: 'userUpdated',
+						description: 'When an existing user is modified',
+					},
+				],
+			},
+			{
+				displayName: 'Custom Object Name or ID',
+				name: 'customObject',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getCustomObjects',
+				},
+				required: true,
+				default: '',
+				displayOptions: {
+					show: {
+						triggerOn: ['customObjectUpdated', 'customObjectCreated'],
+					},
+				},
+				description:
+					'Name of the custom object. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+		],
+	};
+
+	methods = {
+		loadOptions: {
+			// Get all the custom objects recurrence instances to display them to user so that they can
+			// select them easily
+			async getCustomObjects(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				// TODO: find a way to filter this object to get just the lead sources instead of the whole object
+				const { sobjects: objects } = await salesforceApiRequest.call(this, 'GET', '/sobjects');
+				for (const object of objects) {
+					if (object.custom === true) {
+						const objectName = object.label;
+						const objectId = object.name;
+						returnData.push({
+							name: objectName,
+							value: objectId,
+						});
+					}
+				}
+				sortOptions(returnData);
+				return returnData;
+			},
+		},
+	};
+
+	async poll(this: IPollFunctions): Promise<INodeExecutionData[][] | null> {
+		const workflowData = this.getWorkflowStaticData('node');
+		let responseData;
+		const qs: IDataObject = {};
+		const triggerOn = this.getNodeParameter('triggerOn') as string;
+		let triggerResource = triggerOn.slice(0, 1).toUpperCase() + triggerOn.slice(1, -7);
+		const changeType = triggerOn.slice(-7);
+
+		if (triggerResource === 'CustomObject') {
+			triggerResource = this.getNodeParameter('customObject') as string;
+		}
+
+		const now = DateTime.now().toISO();
+		const startDate = (workflowData.lastTimeChecked as string) || now;
+		const endDate = now;
+		try {
+			const pollStartDate = startDate;
+			const pollEndDate = endDate;
+
+			const options = {
+				conditionsUi: {
+					conditionValues: [] as IDataObject[],
+				},
+			};
+			if (this.getMode() !== 'manual') {
+				if (changeType === 'Created') {
+					options.conditionsUi.conditionValues.push({
+						field: 'CreatedDate',
+						operation: '>=',
+						value: pollStartDate,
+					});
+					options.conditionsUi.conditionValues.push({
+						field: 'CreatedDate',
+						operation: '<',
+						value: pollEndDate,
+					});
+				} else {
+					options.conditionsUi.conditionValues.push({
+						field: 'LastModifiedDate',
+						operation: '>=',
+						value: pollStartDate,
+					});
+					options.conditionsUi.conditionValues.push({
+						field: 'LastModifiedDate',
+						operation: '<',
+						value: pollEndDate,
+					});
+					// make sure the resource wasn't just created.
+					options.conditionsUi.conditionValues.push({
+						field: 'CreatedDate',
+						operation: '<',
+						value: pollStartDate,
+					});
+				}
+			}
+
+			try {
+				if (this.getMode() === 'manual') {
+					qs.q = getQuery(options, triggerResource, false, 1);
+				} else {
+					qs.q = getQuery(options, triggerResource, true);
+				}
+				responseData = await salesforceApiRequestAllItems.call(
+					this,
+					'records',
+					'GET',
+					'/query',
+					{},
+					qs,
+				);
+			} catch (error) {
+				throw new NodeApiError(this.getNode(), error as JsonObject);
+			}
+
+			if (!responseData?.length) {
+				workflowData.lastTimeChecked = endDate;
+				return null;
+			}
+		} catch (error) {
+			if (this.getMode() === 'manual' || !workflowData.lastTimeChecked) {
+				throw error;
+			}
+			const workflow = this.getWorkflow();
+			const node = this.getNode();
+			this.logger.error(
+				`There was a problem in '${node.name}' node in workflow '${workflow.id}': '${error.description}'`,
+				{
+					node: node.name,
+					workflowId: workflow.id,
+					error,
+				},
+			);
+			throw error;
+		}
+		workflowData.lastTimeChecked = endDate;
+
+		if (Array.isArray(responseData) && responseData.length) {
+			return [this.helpers.returnJsonArray(responseData as IDataObject[])];
+		}
+
+		return null;
+	}
+}
diff --git a/packages/nodes-base/nodes/Salesforce/salesforce.svg b/packages/nodes-base/nodes/Salesforce/salesforce.svg
index 2a7c9a54d72e2..44774c54cd0a7 100644
--- a/packages/nodes-base/nodes/Salesforce/salesforce.svg
+++ b/packages/nodes-base/nodes/Salesforce/salesforce.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 75 53" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><g stroke="none" fill-rule="nonzero"><path d="M30.777 5.653c2.4-2.476 5.72-4.04 9.392-4.04 4.895 0 9.136 2.732 11.412 6.773a15.739 15.739 0 016.46-1.366c8.823 0 15.937 7.2 15.937 16.08s-7.143 16.088-15.937 16.088c-1.08 0-2.134-.114-3.13-.313a11.677 11.677 0 01-10.2 5.977 11.75 11.75 0 01-5.094-1.167c-2.02 4.753-6.745 8.1-12.238 8.1-5.72 0-10.615-3.614-12.494-8.7-.833.171-1.682.257-2.533.256C5.522 43.341 0 37.763 0 30.847a12.52 12.52 0 016.176-10.815 14.097 14.097 0 01-1.195-5.72C4.955 6.432 11.415 0 19.325 0a14.34 14.34 0 0111.441 5.663" fill="#00a1e0"/><path d="M10.712 26.856l.313-.825c.057-.142.142-.085.2-.057l.256.17a3.53 3.53 0 001.964.57c.655 0 1.08-.342 1.08-.825v-.028c0-.512-.626-.7-1.366-.94l-.17-.057c-.996-.285-2.078-.7-2.078-1.964v-.028c0-1.195.968-2.05 2.362-2.05h.142c.825 0 1.594.228 2.163.598.057.028.114.085.085.17l-.313.825c-.057.142-.2.057-.2.057a4.32 4.32 0 00-1.935-.484c-.598 0-.968.313-.968.74v.028c0 .484.655.7 1.395.94l.142.028c.996.313 2.05.74 2.05 1.964v.028c0 1.3-.94 2.106-2.448 2.106-.74 0-1.45-.114-2.22-.512-.142-.085-.285-.142-.427-.256-.028-.057-.085-.085-.028-.2zm22.2 0l.313-.825c.057-.142.17-.085.2-.057l.256.17a3.53 3.53 0 001.964.57c.655 0 1.08-.342 1.08-.825v-.028c0-.512-.626-.7-1.366-.94l-.17-.057c-.996-.285-2.078-.7-2.078-1.964v-.028c0-1.195.968-2.05 2.362-2.05h.142c.825 0 1.594.228 2.163.598.057.028.114.085.085.17l-.313.825c-.057.142-.2.057-.2.057a4.32 4.32 0 00-1.935-.484c-.598 0-.968.313-.968.74v.028c0 .484.655.7 1.395.94l.142.028c.996.313 2.05.74 2.05 1.964v.028c0 1.3-.94 2.106-2.448 2.106-.74 0-1.45-.114-2.22-.512-.142-.085-.285-.142-.427-.256 0-.057-.057-.085-.028-.2zm16.45-3.9c.114.427.2.882.2 1.366s-.057.94-.2 1.366a2.813 2.813 0 01-.57 1.1 2.75 2.75 0 01-.968.74c-.398.17-.854.256-1.366.256s-.968-.085-1.366-.256-.7-.427-.968-.74a2.96 2.96 0 01-.57-1.1c-.115-.417-.2-.882-.2-1.366s.057-.94.2-1.366c.114-.427.313-.797.57-1.1a2.75 2.75 0 01.968-.74 3.44 3.44 0 011.366-.285c.512 0 .968.085 1.366.285.398.17.7.427.968.74a2.96 2.96 0 01.57 1.1zm-1.28 1.338c0-.74-.142-1.3-.398-1.708s-.683-.598-1.224-.598c-.57 0-.968.2-1.224.598s-.398.968-.398 1.708.142 1.3.398 1.736c.256.398.655.598 1.224.598s.968-.2 1.224-.598c.285-.398.398-.996.398-1.736zm11.697 2.134l.313.854c.028.114-.057.142-.057.142-.484.2-1.138.313-1.793.313-1.1 0-1.935-.313-2.504-.94s-.854-1.48-.854-2.533c0-.484.057-.94.2-1.366s.342-.797.626-1.1a2.96 2.96 0 011.025-.74 3.62 3.62 0 011.423-.285 8.3 8.3 0 01.939.057c.285.057.683.142.854.228.028 0 .114.057.085.142l-.313.854c-.057.142-.142.085-.142.085a4.007 4.007 0 00-1.338-.2c-.626 0-1.1.2-1.395.626-.313.398-.484.94-.484 1.68 0 .797.2 1.366.54 1.736s.825.54 1.45.54c.256 0 .484-.028.683-.057s.398-.085.598-.17c-.028.057.085.028.142.142zm6.46-3.728c.285.968.142 1.793.114 1.85 0 .114-.114.114-.114.114h-4.297c.028.655.17 1.1.512 1.423.313.313.797.512 1.48.512 1.025 0 1.45-.2 1.765-.313 0 0 .114-.028.17.085l.285.797c.057.142 0 .17-.028.2-.256.142-.9.427-2.163.427-.598 0-1.138-.085-1.565-.256s-.797-.398-1.08-.7-.484-.683-.626-1.08c-.142-.427-.2-.882-.2-1.366s.057-.94.2-1.366c.114-.427.313-.797.57-1.1s.598-.57.996-.74c.398-.2.882-.285 1.423-.285.455 0 .882.085 1.224.256.256.114.54.313.825.626.142.114.398.54.512.94zm-4.27.9h3.045c-.028-.398-.114-.74-.285-1.025-.256-.398-.626-.626-1.195-.626s-.968.228-1.224.626c-.17.256-.256.598-.342 1.025zm-30.082-.9c.285.968.142 1.793.142 1.85 0 .114-.114.114-.114.114h-4.297c.028.655.17 1.1.512 1.423.313.313.797.512 1.48.512 1.025 0 1.45-.2 1.765-.313 0 0 .114-.028.17.085l.285.797c.057.142 0 .17-.028.2-.256.142-.9.427-2.163.427-.598 0-1.138-.085-1.565-.256s-.797-.398-1.08-.7-.484-.683-.626-1.08c-.142-.427-.2-.882-.2-1.366s.057-.94.2-1.366c.114-.427.313-.797.57-1.1s.598-.57.996-.74c.398-.2.882-.285 1.423-.285.455 0 .882.085 1.224.256.256.114.54.313.825.626.114.114.398.54.484.94zm-4.27.9h3.074c-.028-.398-.114-.74-.285-1.025-.256-.398-.626-.626-1.195-.626s-.968.228-1.224.626c-.2.256-.285.598-.37 1.025zm-7.542-.228l.7.085v-.17c0-.57-.114-.854-.342-1.025s-.598-.285-1.053-.285c0 0-1.053 0-1.878.427-.028.028-.057.028-.057.028s-.114.028-.142-.057l-.313-.825c-.057-.114.028-.17.028-.17.398-.313 1.3-.484 1.3-.484a7.69 7.69 0 011.138-.114c.854 0 1.508.2 1.964.598s.683 1.025.683 1.907v3.927s0 .114-.085.142c0 0-.17.057-.313.085l-1.08.2a6.59 6.59 0 01-1.3.114c-.427 0-.797-.028-1.138-.114a2.78 2.78 0 01-.882-.37 1.923 1.923 0 01-.57-.683c-.142-.256-.2-.598-.2-.968a2.26 2.26 0 01.228-.996c.143-.296.37-.512.626-.7s.57-.313.882-.427a4.293 4.293 0 011.053-.142l.74.028zm-1.708 3.017s.398.313 1.252.256c.626-.028 1.167-.142 1.167-.142v-1.955s-.54-.085-1.167-.085c-.882 0-1.252.313-1.252.313-.256.17-.37.455-.37.825a1.12 1.12 0 00.142.569c.028.057.057.114.228.228zm36.286-5.208c-.028.114-.256.7-.313.9-.028.085-.085.114-.17.114 0 0-.256-.057-.484-.057a2.3 2.3 0 00-.569.085c-.2.057-.37.17-.54.313s-.285.37-.37.626-.142.683-.142 1.138v3.187c0 .085-.057.142-.142.142h-1.128c-.085 0-.142-.057-.142-.142v-6.4c0-.085.057-.142.114-.142h1.1c.085 0 .114.057.114.142v.512a1.93 1.93 0 01.7-.54c.245-.113.57-.2 1.1-.17.285.028.655.085.7.114.114.028.17.057.142.17zm-10.56-2.96c.028 0 .114.057.085.142l-.342.9c-.028.057-.057.114-.2.057-.028 0-.085-.028-.228-.057-.085-.028-.228-.028-.342-.028-.17 0-.313.028-.455.057s-.256.114-.37.228-.228.256-.313.455a4.32 4.32 0 00-.228.968h1.366c.114 0 .142.057.142.142l-.17.882c-.028.142-.142.114-.142.114h-1.423l-.9 5.493c-.114.57-.228 1.053-.37 1.45s-.313.683-.57.968c-.228.256-.484.455-.797.54-.285.114-.655.17-1.053.17-.2 0-.398 0-.626-.057a1.619 1.619 0 01-.398-.114c-.057-.028-.085-.085-.057-.17l.293-.863c.057-.114.142-.057.142-.057l.228.085c.114.028.228.028.342.028.2 0 .37-.028.512-.085.17-.057.285-.17.398-.313s.2-.342.313-.598c.105-.346.191-.697.256-1.053l.968-5.38h-.94c-.114 0-.142-.057-.142-.142l.17-.882c.028-.142.142-.114.142-.114h.968l.057-.285c.142-.854.427-1.508.854-1.935s1.053-.655 1.82-.655c.201.002.401.021.598.057.114-.028.256 0 .398.057zm-19.182 9.25c0 .085-.057.142-.114.142h-1.138c-.085 0-.114-.057-.114-.142v-9.136c0-.057.057-.142.114-.142h1.138c.085 0 .114.057.114.142z"/></g></symbol></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round" viewBox="0 0 75 53"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><g fill-rule="nonzero" stroke="none"><path fill="#00a1e0" d="M30.777 5.653c2.4-2.476 5.72-4.04 9.392-4.04 4.895 0 9.136 2.732 11.412 6.773a15.7 15.7 0 0 1 6.46-1.366c8.823 0 15.937 7.2 15.937 16.08s-7.143 16.088-15.937 16.088c-1.08 0-2.134-.114-3.13-.313a11.68 11.68 0 0 1-10.2 5.977 11.75 11.75 0 0 1-5.094-1.167c-2.02 4.753-6.745 8.1-12.238 8.1-5.72 0-10.615-3.614-12.494-8.7-.833.171-1.682.257-2.533.256C5.522 43.341 0 37.763 0 30.847a12.52 12.52 0 0 1 6.176-10.815 14.1 14.1 0 0 1-1.195-5.72C4.955 6.432 11.415 0 19.325 0a14.34 14.34 0 0 1 11.441 5.663"/><path d="m10.712 26.856.313-.825c.057-.142.142-.085.2-.057l.256.17a3.53 3.53 0 0 0 1.964.57c.655 0 1.08-.342 1.08-.825v-.028c0-.512-.626-.7-1.366-.94l-.17-.057c-.996-.285-2.078-.7-2.078-1.964v-.028c0-1.195.968-2.05 2.362-2.05h.142c.825 0 1.594.228 2.163.598.057.028.114.085.085.17l-.313.825c-.057.142-.2.057-.2.057a4.3 4.3 0 0 0-1.935-.484c-.598 0-.968.313-.968.74v.028c0 .484.655.7 1.395.94l.142.028c.996.313 2.05.74 2.05 1.964v.028c0 1.3-.94 2.106-2.448 2.106-.74 0-1.45-.114-2.22-.512-.142-.085-.285-.142-.427-.256-.028-.057-.085-.085-.028-.2zm22.2 0 .313-.825c.057-.142.17-.085.2-.057l.256.17a3.53 3.53 0 0 0 1.964.57c.655 0 1.08-.342 1.08-.825v-.028c0-.512-.626-.7-1.366-.94l-.17-.057c-.996-.285-2.078-.7-2.078-1.964v-.028c0-1.195.968-2.05 2.362-2.05h.142c.825 0 1.594.228 2.163.598.057.028.114.085.085.17l-.313.825c-.057.142-.2.057-.2.057a4.3 4.3 0 0 0-1.935-.484c-.598 0-.968.313-.968.74v.028c0 .484.655.7 1.395.94l.142.028c.996.313 2.05.74 2.05 1.964v.028c0 1.3-.94 2.106-2.448 2.106-.74 0-1.45-.114-2.22-.512-.142-.085-.285-.142-.427-.256 0-.057-.057-.085-.028-.2zm16.45-3.9c.114.427.2.882.2 1.366s-.057.94-.2 1.366a2.8 2.8 0 0 1-.57 1.1 2.75 2.75 0 0 1-.968.74q-.597.255-1.366.256c-.769.001-.968-.085-1.366-.256s-.7-.427-.968-.74a3 3 0 0 1-.57-1.1c-.115-.417-.2-.882-.2-1.366s.057-.94.2-1.366c.114-.427.313-.797.57-1.1a2.75 2.75 0 0 1 .968-.74 3.4 3.4 0 0 1 1.366-.285c.512 0 .968.085 1.366.285.398.17.7.427.968.74a3 3 0 0 1 .57 1.1m-1.28 1.338c0-.74-.142-1.3-.398-1.708s-.683-.598-1.224-.598c-.57 0-.968.2-1.224.598s-.398.968-.398 1.708.142 1.3.398 1.736c.256.398.655.598 1.224.598s.968-.2 1.224-.598c.285-.398.398-.996.398-1.736m11.697 2.134.313.854c.028.114-.057.142-.057.142-.484.2-1.138.313-1.793.313q-1.65 0-2.504-.94c-.854-.94-.854-1.48-.854-2.533 0-.484.057-.94.2-1.366s.342-.797.626-1.1a3 3 0 0 1 1.025-.74 3.6 3.6 0 0 1 1.423-.285 8 8 0 0 1 .939.057c.285.057.683.142.854.228.028 0 .114.057.085.142l-.313.854c-.057.142-.142.085-.142.085a4 4 0 0 0-1.338-.2c-.626 0-1.1.2-1.395.626-.313.398-.484.94-.484 1.68 0 .797.2 1.366.54 1.736s.825.54 1.45.54c.256 0 .484-.028.683-.057s.398-.085.598-.17c-.028.057.085.028.142.142zm6.46-3.728c.285.968.142 1.793.114 1.85 0 .114-.114.114-.114.114h-4.297c.028.655.17 1.1.512 1.423.313.313.797.512 1.48.512 1.025 0 1.45-.2 1.765-.313 0 0 .114-.028.17.085l.285.797c.057.142 0 .17-.028.2-.256.142-.9.427-2.163.427-.598 0-1.138-.085-1.565-.256s-.797-.398-1.08-.7-.484-.683-.626-1.08c-.142-.427-.2-.882-.2-1.366s.057-.94.2-1.366c.114-.427.313-.797.57-1.1s.598-.57.996-.74c.398-.2.882-.285 1.423-.285.455 0 .882.085 1.224.256.256.114.54.313.825.626.142.114.398.54.512.94zm-4.27.9h3.045c-.028-.398-.114-.74-.285-1.025-.256-.398-.626-.626-1.195-.626s-.968.228-1.224.626c-.17.256-.256.598-.342 1.025zm-30.082-.9c.285.968.142 1.793.142 1.85 0 .114-.114.114-.114.114h-4.297c.028.655.17 1.1.512 1.423.313.313.797.512 1.48.512 1.025 0 1.45-.2 1.765-.313 0 0 .114-.028.17.085l.285.797c.057.142 0 .17-.028.2-.256.142-.9.427-2.163.427-.598 0-1.138-.085-1.565-.256s-.797-.398-1.08-.7-.484-.683-.626-1.08c-.142-.427-.2-.882-.2-1.366s.057-.94.2-1.366c.114-.427.313-.797.57-1.1s.598-.57.996-.74c.398-.2.882-.285 1.423-.285.455 0 .882.085 1.224.256.256.114.54.313.825.626.114.114.398.54.484.94zm-4.27.9h3.074c-.028-.398-.114-.74-.285-1.025-.256-.398-.626-.626-1.195-.626s-.968.228-1.224.626c-.2.256-.285.598-.37 1.025m-7.542-.228.7.085v-.17c0-.57-.114-.854-.342-1.025s-.598-.285-1.053-.285c0 0-1.053 0-1.878.427-.028.028-.057.028-.057.028s-.114.028-.142-.057l-.313-.825c-.057-.114.028-.17.028-.17.398-.313 1.3-.484 1.3-.484a8 8 0 0 1 1.138-.114q1.28 0 1.964.598c.684.598.683 1.025.683 1.907v3.927s0 .114-.085.142c0 0-.17.057-.313.085l-1.08.2a6.6 6.6 0 0 1-1.3.114c-.427 0-.797-.028-1.138-.114a2.8 2.8 0 0 1-.882-.37 1.9 1.9 0 0 1-.57-.683c-.142-.256-.2-.598-.2-.968a2.26 2.26 0 0 1 .228-.996c.143-.296.37-.512.626-.7s.57-.313.882-.427a4.3 4.3 0 0 1 1.053-.142l.74.028zm-1.708 3.017s.398.313 1.252.256c.626-.028 1.167-.142 1.167-.142v-1.955s-.54-.085-1.167-.085c-.882 0-1.252.313-1.252.313-.256.17-.37.455-.37.825a1.1 1.1 0 0 0 .142.569c.028.057.057.114.228.228zm36.286-5.208c-.028.114-.256.7-.313.9-.028.085-.085.114-.17.114 0 0-.256-.057-.484-.057a2.3 2.3 0 0 0-.569.085c-.2.057-.37.17-.54.313s-.285.37-.37.626-.142.683-.142 1.138v3.187c0 .085-.057.142-.142.142h-1.128c-.085 0-.142-.057-.142-.142v-6.4c0-.085.057-.142.114-.142h1.1c.085 0 .114.057.114.142v.512a1.9 1.9 0 0 1 .7-.54c.245-.113.57-.2 1.1-.17.285.028.655.085.7.114.114.028.17.057.142.17zm-10.56-2.96c.028 0 .114.057.085.142l-.342.9c-.028.057-.057.114-.2.057-.028 0-.085-.028-.228-.057-.085-.028-.228-.028-.342-.028-.17 0-.313.028-.455.057s-.256.114-.37.228-.228.256-.313.455a4.3 4.3 0 0 0-.228.968h1.366c.114 0 .142.057.142.142l-.17.882c-.028.142-.142.114-.142.114h-1.423l-.9 5.493c-.114.57-.228 1.053-.37 1.45s-.313.683-.57.968c-.228.256-.484.455-.797.54-.285.114-.655.17-1.053.17-.2 0-.398 0-.626-.057a1.6 1.6 0 0 1-.398-.114c-.057-.028-.085-.085-.057-.17l.293-.863c.057-.114.142-.057.142-.057l.228.085c.114.028.228.028.342.028q.3 0 .512-.085c.17-.057.285-.17.398-.313s.2-.342.313-.598q.158-.519.256-1.053l.968-5.38h-.94c-.114 0-.142-.057-.142-.142l.17-.882c.028-.142.142-.114.142-.114h.968l.057-.285c.142-.854.427-1.508.854-1.935s1.053-.655 1.82-.655q.302.003.598.057c.114-.028.256 0 .398.057zm-19.182 9.25c0 .085-.057.142-.114.142h-1.138c-.085 0-.114-.057-.114-.142v-9.136c0-.057.057-.142.114-.142h1.138c.085 0 .114.057.114.142z"/></g></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Salesmate/GenericFunctions.ts b/packages/nodes-base/nodes/Salesmate/GenericFunctions.ts
index 466b3efc0ddec..287da42e7e743 100644
--- a/packages/nodes-base/nodes/Salesmate/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Salesmate/GenericFunctions.ts
@@ -1,24 +1,18 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	IWebhookFunctions,
 	JsonObject,
+	IRequestOptions,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function salesmateApiRequest(
-	this:
-		| IHookFunctions
-		| IExecuteFunctions
-		| IExecuteSingleFunctions
-		| ILoadOptionsFunctions
-		| IWebhookFunctions,
-	method: string,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -28,7 +22,7 @@ export async function salesmateApiRequest(
 ): Promise<any> {
 	const credentials = await this.getCredentials('salesmateApi');
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			sessionToken: credentials.sessionToken,
 			'x-linkname': credentials.url,
@@ -53,7 +47,7 @@ export async function salesmateApiRequest(
 export async function salesmateApiRequestAllItems(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
diff --git a/packages/nodes-base/nodes/Salesmate/Salesmate.node.ts b/packages/nodes-base/nodes/Salesmate/Salesmate.node.ts
index e23773358fa4d..820f46f7f5504 100644
--- a/packages/nodes-base/nodes/Salesmate/Salesmate.node.ts
+++ b/packages/nodes-base/nodes/Salesmate/Salesmate.node.ts
@@ -789,6 +789,6 @@ export class Salesmate implements INodeType {
 			returnData.push(...executionData);
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Schedule/GenericFunctions.ts b/packages/nodes-base/nodes/Schedule/GenericFunctions.ts
index 15b753656cdc8..97cec572411e7 100644
--- a/packages/nodes-base/nodes/Schedule/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Schedule/GenericFunctions.ts
@@ -1,5 +1,6 @@
+import type { IDataObject } from 'n8n-workflow';
+import moment from 'moment-timezone';
 import type { IRecurencyRule } from './SchedulerInterface';
-import moment from 'moment';
 
 export function recurencyCheck(
 	recurrency: IRecurencyRule,
@@ -55,3 +56,38 @@ export function recurencyCheck(
 	}
 	return false;
 }
+
+export function convertMonthToUnix(expression: string): string {
+	if (!isNaN(parseInt(expression)) || expression.includes('-') || expression.includes(',')) {
+		let matches = expression.match(/([0-9])+/g) as string[];
+		if (matches) {
+			matches = matches.map((match) =>
+				parseInt(match) !== 0 ? String(parseInt(match) - 1) : match,
+			);
+		}
+		expression = matches?.join(expression.includes('-') ? '-' : ',') || '';
+	}
+	return expression;
+}
+
+export function convertToUnixFormat(interval: IDataObject) {
+	const expression = (interval.expression as string).split(' ');
+	if (expression.length === 5) {
+		expression[3] = convertMonthToUnix(expression[3]);
+		expression[4] = expression[4].replace('7', '0');
+	} else if (expression.length === 6) {
+		expression[4] = convertMonthToUnix(expression[4]);
+		expression[5] = expression[5].replace('7', '0');
+	}
+	interval.expression = expression.join(' ');
+}
+
+export const addFallbackValue = <T>(enabled: boolean, fallback: T) => {
+	if (enabled) {
+		return (value: T) => {
+			if (!value) return fallback;
+			return value;
+		};
+	}
+	return (value: T) => value;
+};
diff --git a/packages/nodes-base/nodes/Schedule/ScheduleTrigger.node.json b/packages/nodes-base/nodes/Schedule/ScheduleTrigger.node.json
index 4f9755e43870a..fd6aa494fb48c 100644
--- a/packages/nodes-base/nodes/Schedule/ScheduleTrigger.node.json
+++ b/packages/nodes-base/nodes/Schedule/ScheduleTrigger.node.json
@@ -11,8 +11,5 @@
 		],
 		"generic": []
 	},
-	"alias": ["Time", "Scheduler", "Polling", "Cron", "Interval"],
-	"subcategories": {
-		"Core Nodes": ["Flow"]
-	}
+	"alias": ["Time", "Scheduler", "Polling", "Cron", "Interval"]
 }
diff --git a/packages/nodes-base/nodes/Schedule/ScheduleTrigger.node.ts b/packages/nodes-base/nodes/Schedule/ScheduleTrigger.node.ts
index 6990c746a3cdb..09627e8d4b37d 100644
--- a/packages/nodes-base/nodes/Schedule/ScheduleTrigger.node.ts
+++ b/packages/nodes-base/nodes/Schedule/ScheduleTrigger.node.ts
@@ -8,9 +8,9 @@ import type {
 import { NodeOperationError } from 'n8n-workflow';
 
 import { CronJob } from 'cron';
-import moment from 'moment';
+import moment from 'moment-timezone';
 import type { IRecurencyRule } from './SchedulerInterface';
-import { recurencyCheck } from './GenericFunctions';
+import { addFallbackValue, convertToUnixFormat, recurencyCheck } from './GenericFunctions';
 
 export class ScheduleTrigger implements INodeType {
 	description: INodeTypeDescription = {
@@ -18,7 +18,7 @@ export class ScheduleTrigger implements INodeType {
 		name: 'scheduleTrigger',
 		icon: 'fa:clock',
 		group: ['trigger', 'schedule'],
-		version: 1,
+		version: [1, 1.1, 1.2],
 		description: 'Triggers the workflow on a given schedule',
 		eventTriggerDescription: '',
 		activationMessage:
@@ -27,13 +27,13 @@ export class ScheduleTrigger implements INodeType {
 			name: 'Schedule Trigger',
 			color: '#31C49F',
 		},
-		// eslint-disable-next-line n8n-nodes-base/node-class-description-inputs-wrong-regular-node
+
 		inputs: [],
 		outputs: ['main'],
 		properties: [
 			{
 				displayName:
-					'This workflow will run on the schedule you define here once you <a data-key="activate">activate</a> it.<br><br>For testing, you can also trigger it manually: by going back to the canvas and clicking ‘execute workflow’',
+					'This workflow will run on the schedule you define here once you <a data-key="activate">activate</a> it.<br><br>For testing, you can also trigger it manually: by going back to the canvas and clicking \'test workflow\'',
 				name: 'notice',
 				type: 'notice',
 				default: '',
@@ -415,6 +415,7 @@ export class ScheduleTrigger implements INodeType {
 		const rule = this.getNodeParameter('rule', []) as IDataObject;
 		const interval = rule.interval as IDataObject[];
 		const timezone = this.getTimezone();
+		const nodeVersion = this.getNode().typeVersion;
 		const cronJobs: CronJob[] = [];
 		const intervalArr: NodeJS.Timeout[] = [];
 		const staticData = this.getWorkflowStaticData('node') as {
@@ -423,6 +424,7 @@ export class ScheduleTrigger implements INodeType {
 		if (!staticData.recurrencyRules) {
 			staticData.recurrencyRules = [];
 		}
+		const fallbackToZero = addFallbackValue(nodeVersion >= 1.2, '0');
 		const executeTrigger = async (recurency: IRecurencyRule) => {
 			const resultData = {
 				timestamp: moment.tz(timezone).toISOString(true),
@@ -450,11 +452,15 @@ export class ScheduleTrigger implements INodeType {
 		for (let i = 0; i < interval.length; i++) {
 			let intervalValue = 1000;
 			if (interval[i].field === 'cronExpression') {
+				if (nodeVersion > 1) {
+					// ! Remove this part if we use a cron library that follows unix cron expression
+					convertToUnixFormat(interval[i]);
+				}
 				const cronExpression = interval[i].expression as string;
 				try {
 					const cronJob = new CronJob(
 						cronExpression,
-						async () => executeTrigger({ activated: false } as IRecurencyRule),
+						async () => await executeTrigger({ activated: false } as IRecurencyRule),
 						undefined,
 						true,
 						timezone,
@@ -471,7 +477,7 @@ export class ScheduleTrigger implements INodeType {
 				const seconds = interval[i].secondsInterval as number;
 				intervalValue *= seconds;
 				const intervalObj = setInterval(
-					async () => executeTrigger({ activated: false } as IRecurencyRule),
+					async () => await executeTrigger({ activated: false } as IRecurencyRule),
 					intervalValue,
 				) as NodeJS.Timeout;
 				intervalArr.push(intervalObj);
@@ -481,7 +487,7 @@ export class ScheduleTrigger implements INodeType {
 				const minutes = interval[i].minutesInterval as number;
 				intervalValue *= 60 * minutes;
 				const intervalObj = setInterval(
-					async () => executeTrigger({ activated: false } as IRecurencyRule),
+					async () => await executeTrigger({ activated: false } as IRecurencyRule),
 					intervalValue,
 				) as NodeJS.Timeout;
 				intervalArr.push(intervalObj);
@@ -489,13 +495,14 @@ export class ScheduleTrigger implements INodeType {
 
 			if (interval[i].field === 'hours') {
 				const hour = interval[i].hoursInterval as number;
-				const minute = interval[i].triggerAtMinute?.toString() as string;
+				const minute = fallbackToZero(interval[i].triggerAtMinute?.toString() as string);
+
 				const cronTimes: string[] = [minute, '*', '*', '*', '*'];
 				const cronExpression: string = cronTimes.join(' ');
 				if (hour === 1) {
 					const cronJob = new CronJob(
 						cronExpression,
-						async () => executeTrigger({ activated: false } as IRecurencyRule),
+						async () => await executeTrigger({ activated: false } as IRecurencyRule),
 						undefined,
 						true,
 						timezone,
@@ -505,7 +512,7 @@ export class ScheduleTrigger implements INodeType {
 					const cronJob = new CronJob(
 						cronExpression,
 						async () =>
-							executeTrigger({
+							await executeTrigger({
 								activated: true,
 								index: i,
 								intervalSize: hour,
@@ -522,13 +529,13 @@ export class ScheduleTrigger implements INodeType {
 			if (interval[i].field === 'days') {
 				const day = interval[i].daysInterval as number;
 				const hour = interval[i].triggerAtHour?.toString() as string;
-				const minute = interval[i].triggerAtMinute?.toString() as string;
+				const minute = fallbackToZero(interval[i].triggerAtMinute?.toString() as string);
 				const cronTimes: string[] = [minute, hour, '*', '*', '*'];
 				const cronExpression: string = cronTimes.join(' ');
 				if (day === 1) {
 					const cronJob = new CronJob(
 						cronExpression,
-						async () => executeTrigger({ activated: false } as IRecurencyRule),
+						async () => await executeTrigger({ activated: false } as IRecurencyRule),
 						undefined,
 						true,
 						timezone,
@@ -538,7 +545,7 @@ export class ScheduleTrigger implements INodeType {
 					const cronJob = new CronJob(
 						cronExpression,
 						async () =>
-							executeTrigger({
+							await executeTrigger({
 								activated: true,
 								index: i,
 								intervalSize: day,
@@ -554,7 +561,7 @@ export class ScheduleTrigger implements INodeType {
 
 			if (interval[i].field === 'weeks') {
 				const hour = interval[i].triggerAtHour?.toString() as string;
-				const minute = interval[i].triggerAtMinute?.toString() as string;
+				const minute = fallbackToZero(interval[i].triggerAtMinute?.toString() as string);
 				const week = interval[i].weeksInterval as number;
 				const days = interval[i].triggerAtDay as IDataObject[];
 				const day = days.length === 0 ? '*' : days.join(',');
@@ -563,7 +570,7 @@ export class ScheduleTrigger implements INodeType {
 				if (week === 1) {
 					const cronJob = new CronJob(
 						cronExpression,
-						async () => executeTrigger({ activated: false } as IRecurencyRule),
+						async () => await executeTrigger({ activated: false } as IRecurencyRule),
 						undefined,
 						true,
 						timezone,
@@ -573,7 +580,7 @@ export class ScheduleTrigger implements INodeType {
 					const cronJob = new CronJob(
 						cronExpression,
 						async () =>
-							executeTrigger({
+							await executeTrigger({
 								activated: true,
 								index: i,
 								intervalSize: week,
@@ -591,13 +598,13 @@ export class ScheduleTrigger implements INodeType {
 				const month = interval[i].monthsInterval;
 				const day = interval[i].triggerAtDayOfMonth?.toString() as string;
 				const hour = interval[i].triggerAtHour?.toString() as string;
-				const minute = interval[i].triggerAtMinute?.toString() as string;
+				const minute = fallbackToZero(interval[i].triggerAtMinute?.toString() as string);
 				const cronTimes: string[] = [minute, hour, day, '*', '*'];
 				const cronExpression: string = cronTimes.join(' ');
 				if (month === 1) {
 					const cronJob = new CronJob(
 						cronExpression,
-						async () => executeTrigger({ activated: false } as IRecurencyRule),
+						async () => await executeTrigger({ activated: false } as IRecurencyRule),
 						undefined,
 						true,
 						timezone,
@@ -607,7 +614,7 @@ export class ScheduleTrigger implements INodeType {
 					const cronJob = new CronJob(
 						cronExpression,
 						async () =>
-							executeTrigger({
+							await executeTrigger({
 								activated: true,
 								index: i,
 								intervalSize: month,
diff --git a/packages/nodes-base/nodes/SeaTable/GenericFunctions.ts b/packages/nodes-base/nodes/SeaTable/GenericFunctions.ts
index d08880507b52e..fe431813210f7 100644
--- a/packages/nodes-base/nodes/SeaTable/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/SeaTable/GenericFunctions.ts
@@ -1,11 +1,11 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
 	ILoadOptionsFunctions,
 	IPollFunctions,
 	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
@@ -49,7 +49,7 @@ export async function getBaseAccessToken(
 		return;
 	}
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			Authorization: `Token ${ctx?.credentials?.token}`,
 		},
@@ -76,7 +76,7 @@ function endpointCtxExpr(ctx: ICtx, endpoint: string): string {
 export async function seaTableApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions,
 	ctx: ICtx,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: any = {},
@@ -90,7 +90,7 @@ export async function seaTableApiRequest(
 
 	await getBaseAccessToken.call(this, ctx);
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			Authorization: `Token ${ctx?.base?.access_token}`,
 		},
@@ -120,7 +120,7 @@ export async function setableApiRequestAllItems(
 	this: IExecuteFunctions | IPollFunctions,
 	ctx: ICtx,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject,
 	query?: IDataObject,
diff --git a/packages/nodes-base/nodes/SeaTable/SeaTable.node.ts b/packages/nodes-base/nodes/SeaTable/SeaTable.node.ts
index 2c40e3bd47810..4f8f55b8561e2 100644
--- a/packages/nodes-base/nodes/SeaTable/SeaTable.node.ts
+++ b/packages/nodes-base/nodes/SeaTable/SeaTable.node.ts
@@ -446,6 +446,6 @@ export class SeaTable implements INodeType {
 				throw new NodeOperationError(this.getNode(), `The operation "${operation}" is not known!`);
 			}
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/SeaTable/SeaTableTrigger.node.ts b/packages/nodes-base/nodes/SeaTable/SeaTableTrigger.node.ts
index 9ede573334f85..ab90e22034d2c 100644
--- a/packages/nodes-base/nodes/SeaTable/SeaTableTrigger.node.ts
+++ b/packages/nodes-base/nodes/SeaTable/SeaTableTrigger.node.ts
@@ -7,12 +7,11 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
+import moment from 'moment-timezone';
 import { getColumns, rowFormatColumns, seaTableApiRequest, simplify } from './GenericFunctions';
 
 import type { ICtx, IRow, IRowResponse } from './Interfaces';
 
-import moment from 'moment';
-
 export class SeaTableTrigger implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'SeaTable Trigger',
diff --git a/packages/nodes-base/nodes/SeaTable/seaTable.svg b/packages/nodes-base/nodes/SeaTable/seaTable.svg
index 472598576d0d2..437e33c87aedb 100644
--- a/packages/nodes-base/nodes/SeaTable/seaTable.svg
+++ b/packages/nodes-base/nodes/SeaTable/seaTable.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="60" height="60"><path d="M16.787 43.213L28.574 55l16.943-16.942a7.872 7.872 0 000-11.132l-6.22-6.221-.112-.111-18.611 18.57.13.131z" fill="url(#g1)"/><path d="M20.704 39.295l22.51-22.507L31.425 5 14.483 21.942a7.872 7.872 0 000 11.133z" fill="#ff8000"/><defs id="d1"><linearGradient id="g1" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="scale(-10.08407) rotate(70.952 .948 -4.065)"><stop offset="0" id="stop905" stop-color="#ff8000" stop-opacity="1"/><stop offset="1" id="stop907" stop-color="#ec2837" stop-opacity="1"/></linearGradient></defs></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="60" height="60"><path fill="url(#a)" d="M16.787 43.213 28.574 55l16.943-16.942a7.87 7.87 0 0 0 0-11.132l-6.22-6.221-.112-.111-18.611 18.57.13.131z"/><path fill="#ff8000" d="m20.704 39.295 22.51-22.507L31.425 5 14.483 21.942a7.87 7.87 0 0 0 0 11.133z"/><defs><linearGradient id="a" x1="0" x2="1" y1="0" y2="0" gradientTransform="rotate(-109.048 29.213 6.813)scale(10.08407)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ff8000"/><stop offset="1" stop-color="#ec2837"/></linearGradient></defs></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/SeaTable/types.d.ts b/packages/nodes-base/nodes/SeaTable/types.d.ts
deleted file mode 100644
index 440c16db7e953..0000000000000
--- a/packages/nodes-base/nodes/SeaTable/types.d.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-// ----------------------------------
-//         sea-table
-// ----------------------------------
-
-type TSeaTableServerVersion = '2.0.6';
-type TSeaTableServerEdition = 'enterprise edition';
-
-// ----------------------------------
-//         dtable
-// ----------------------------------
-
-import type { IDtableMetadataColumn, IDtableMetadataTable, TDtableViewColumn } from './Interfaces';
-import type { ICredentialDataDecryptedObject } from 'n8n-workflow';
-
-type TInheritColumnTypeTime = 'ctime' | 'mtime';
-type TInheritColumnTypeUser = 'creator' | 'last-modifier';
-type TColumnType =
-	| 'text'
-	| 'long-text'
-	| 'number'
-	| 'collaborator'
-	| 'date'
-	| 'duration'
-	| 'single-select'
-	| 'multiple-select'
-	| 'email'
-	| 'url'
-	| 'rate'
-	| 'checkbox'
-	| 'formula'
-	| TInheritColumnTypeTime
-	| TInheritColumnTypeUser
-	| 'auto-number';
-
-type TImplementInheritColumnKey = '_seq';
-type TInheritColumnKey =
-	| '_id'
-	| '_creator'
-	| '_ctime'
-	| '_last_modifier'
-	| '_mtime'
-	| TImplementInheritColumnKey;
-
-type TColumnValue = undefined | boolean | number | string | string[] | null;
-type TColumnKey = TInheritColumnKey | string;
-
-export type TDtableMetadataTables = readonly IDtableMetadataTable[];
-export type TDtableMetadataColumns = readonly IDtableMetadataColumn[];
-export type TDtableViewColumns = readonly TDtableViewColumn[];
-
-// ----------------------------------
-//         api
-// ----------------------------------
-
-type TEndpointVariableName = 'access_token' | 'dtable_uuid' | 'server';
-
-// Template Literal Types requires-ts-4.1.5 -- deferred
-type TMethod = 'GET' | 'POST';
-type TDeferredEndpoint = string;
-type TDeferredEndpointExpr = string;
-type TEndpoint =
-	| '/api/v2.1/dtable/app-access-token/'
-	| '/dtable-server/api/v1/dtables/{{dtable_uuid}}/rows/'
-	| TDeferredEndpoint;
-type TEndpointExpr = TEndpoint | TDeferredEndpointExpr;
-type TEndpointResolvedExpr =
-	| TEndpoint
-	| string; /* deferred: but already in use for header values, e.g. authentication */
-
-type TDateTimeFormat = 'YYYY-MM-DDTHH:mm:ss.SSSZ' /* moment.js */;
-
-// ----------------------------------
-//         node
-// ----------------------------------
-
-type TCredentials = ICredentialDataDecryptedObject | undefined;
-
-type TTriggerOperation = 'create' | 'update';
-
-type TOperation = 'append' | 'list' | 'metadata';
-
-type TLoadedResource = {
-	name: string;
-};
-export type TColumnsUiValues = Array<{
-	columnName: string;
-	columnValue: string;
-}>;
diff --git a/packages/nodes-base/nodes/SeaTable/types.ts b/packages/nodes-base/nodes/SeaTable/types.ts
new file mode 100644
index 0000000000000..876342b368cc3
--- /dev/null
+++ b/packages/nodes-base/nodes/SeaTable/types.ts
@@ -0,0 +1,84 @@
+// ----------------------------------
+//         sea-table
+// ----------------------------------
+
+export type TSeaTableServerVersion = '2.0.6';
+export type TSeaTableServerEdition = 'enterprise edition';
+
+// ----------------------------------
+//         dtable
+// ----------------------------------
+
+import type { ICredentialDataDecryptedObject } from 'n8n-workflow';
+import type { IDtableMetadataColumn, IDtableMetadataTable, TDtableViewColumn } from './Interfaces';
+
+export type TInheritColumnTypeTime = 'ctime' | 'mtime';
+export type TInheritColumnTypeUser = 'creator' | 'last-modifier';
+export type TColumnType =
+	| 'text'
+	| 'long-text'
+	| 'number'
+	| 'collaborator'
+	| 'date'
+	| 'duration'
+	| 'single-select'
+	| 'multiple-select'
+	| 'email'
+	| 'url'
+	| 'rate'
+	| 'checkbox'
+	| 'formula'
+	| TInheritColumnTypeTime
+	| TInheritColumnTypeUser
+	| 'auto-number';
+
+type TImplementInheritColumnKey = '_seq';
+export type TInheritColumnKey =
+	| '_id'
+	| '_creator'
+	| '_ctime'
+	| '_last_modifier'
+	| '_mtime'
+	| TImplementInheritColumnKey;
+
+export type TColumnValue = undefined | boolean | number | string | string[] | null;
+export type TColumnKey = TInheritColumnKey | string;
+
+export type TDtableMetadataTables = readonly IDtableMetadataTable[];
+export type TDtableMetadataColumns = readonly IDtableMetadataColumn[];
+export type TDtableViewColumns = readonly TDtableViewColumn[];
+
+// ----------------------------------
+//         api
+// ----------------------------------
+
+export type TEndpointVariableName = 'access_token' | 'dtable_uuid' | 'server';
+
+// Template Literal Types requires-ts-4.1.5 -- deferred
+export type TMethod = 'GET' | 'POST';
+type TEndpoint =
+	| '/api/v2.1/dtable/app-access-token/'
+	| '/dtable-server/api/v1/dtables/{{dtable_uuid}}/rows/';
+export type TEndpointExpr = TEndpoint;
+export type TEndpointResolvedExpr =
+	TEndpoint; /* deferred: but already in use for header values, e.g. authentication */
+
+export type TDateTimeFormat = 'YYYY-MM-DDTHH:mm:ss.SSSZ' /* moment.js */;
+
+// ----------------------------------
+//         node
+// ----------------------------------
+
+export type TCredentials = ICredentialDataDecryptedObject | undefined;
+
+export type TTriggerOperation = 'create' | 'update';
+
+export type TOperation = 'append' | 'list' | 'metadata';
+
+export type TLoadedResource = {
+	name: string;
+};
+export type TColumnsUiValues = Array<{
+	columnName: string;
+	columnValue: string;
+}>;
diff --git a/packages/nodes-base/nodes/SecurityScorecard/GenericFunctions.ts b/packages/nodes-base/nodes/SecurityScorecard/GenericFunctions.ts
index c3ed713a8d5bb..fbfff300d65c7 100644
--- a/packages/nodes-base/nodes/SecurityScorecard/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/SecurityScorecard/GenericFunctions.ts
@@ -1,17 +1,17 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IExecuteFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	IDataObject,
 	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function scorecardApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -23,7 +23,7 @@ export async function scorecardApiRequest(
 
 	const headerWithAuthentication = { Authorization: `Token ${credentials.apiKey}` };
 
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		headers: headerWithAuthentication,
 		method,
 		qs: query,
diff --git a/packages/nodes-base/nodes/SecurityScorecard/SecurityScorecard.node.ts b/packages/nodes-base/nodes/SecurityScorecard/SecurityScorecard.node.ts
index 2deb1de4ad280..978135609edf8 100644
--- a/packages/nodes-base/nodes/SecurityScorecard/SecurityScorecard.node.ts
+++ b/packages/nodes-base/nodes/SecurityScorecard/SecurityScorecard.node.ts
@@ -6,6 +6,7 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
+import moment from 'moment-timezone';
 import { companyFields, companyOperations } from './descriptions/CompanyDescription';
 
 import { industryFields, industryOperations } from './descriptions/IndustryDescription';
@@ -23,8 +24,6 @@ import { reportFields, reportOperations } from './descriptions/ReportDescription
 
 import { scorecardApiRequest, simplify } from './GenericFunctions';
 
-import moment from 'moment';
-
 export class SecurityScorecard implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'SecurityScorecard',
@@ -520,7 +519,7 @@ export class SecurityScorecard implements INodeType {
 		}
 		// Handle file download output data differently
 		if (resource === 'report' && operation === 'download') {
-			return this.prepareOutputData(items);
+			return [items];
 		}
 		return [this.helpers.returnJsonArray(returnData)];
 	}
diff --git a/packages/nodes-base/nodes/SecurityScorecard/descriptions/ReportDescription.ts b/packages/nodes-base/nodes/SecurityScorecard/descriptions/ReportDescription.ts
index 805e6a7d7c8d9..f856770225837 100644
--- a/packages/nodes-base/nodes/SecurityScorecard/descriptions/ReportDescription.ts
+++ b/packages/nodes-base/nodes/SecurityScorecard/descriptions/ReportDescription.ts
@@ -299,7 +299,7 @@ export const reportFields: INodeProperties[] = [
 		},
 	},
 	{
-		displayName: 'Binary Property',
+		displayName: 'Put Output File in Field',
 		name: 'binaryPropertyName',
 		type: 'string',
 		required: true,
@@ -310,6 +310,6 @@ export const reportFields: INodeProperties[] = [
 				operation: ['download'],
 			},
 		},
-		description: 'Name of the binary property to which to write the data of the read file',
+		hint: 'The name of the output binary field to put the file in',
 	},
 ];
diff --git a/packages/nodes-base/nodes/SecurityScorecard/securityScorecard.svg b/packages/nodes-base/nodes/SecurityScorecard/securityScorecard.svg
index dd1d2a6bfa646..d60c4f05db48e 100644
--- a/packages/nodes-base/nodes/SecurityScorecard/securityScorecard.svg
+++ b/packages/nodes-base/nodes/SecurityScorecard/securityScorecard.svg
@@ -1 +1 @@
-<svg width="195" height="195" xmlns="http://www.w3.org/2000/svg"><path fill="none" d="M-1-1h197v197H-1z"/><g fill="none" class="mark"><path stroke="#619E73" fill="#4e878c" class="st0" d="M140.6 126.918v36l31.3-18.1-.1-36.1-31.2-18zm-74.8 43.1l31.2 18 31.2-18v-35.9zm106-75.7v-35.9l-31.2-18-31.1 17.9zm-106-10.7v36l31.2 18 31.2-17.9v-36.1l-31.2-18zm-43.7 25.2v36l31.2 18 31.2-18zm31.2-68.4l-31.2 18v36l31.2 18zm43.7 10.8l31.2-18-31.2-18-31.2 18v36z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="195" height="195"><path fill="none" d="M-1-1h197v197H-1z"/><g fill="none" class="mark"><path fill="#4e878c" stroke="#619E73" d="M140.6 126.918v36l31.3-18.1-.1-36.1-31.2-18zm-74.8 43.1 31.2 18 31.2-18v-35.9zm106-75.7v-35.9l-31.2-18-31.1 17.9zm-106-10.7v36l31.2 18 31.2-17.9v-36.1l-31.2-18zm-43.7 25.2v36l31.2 18 31.2-18zm31.2-68.4-31.2 18v36l31.2 18zm43.7 10.8 31.2-18-31.2-18-31.2 18v36z" class="st0"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Segment/GenericFunctions.ts b/packages/nodes-base/nodes/Segment/GenericFunctions.ts
index 739a526963e87..fa75e24a54855 100644
--- a/packages/nodes-base/nodes/Segment/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Segment/GenericFunctions.ts
@@ -1,28 +1,23 @@
-import type { OptionsWithUri } from 'request';
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
+	IRequestOptions,
 	IWebhookFunctions,
 } from 'n8n-workflow';
 
 export async function segmentApiRequest(
-	this:
-		| IHookFunctions
-		| IExecuteFunctions
-		| IExecuteSingleFunctions
-		| ILoadOptionsFunctions
-		| IWebhookFunctions,
-	method: string,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 	body: any = {},
 	qs: IDataObject = {},
 	uri?: string,
 	_option: IDataObject = {},
 ): Promise<any> {
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			'Content-Type': 'application/json',
 		},
@@ -35,5 +30,5 @@ export async function segmentApiRequest(
 	if (!Object.keys(body as IDataObject).length) {
 		delete options.body;
 	}
-	return this.helpers.requestWithAuthentication.call(this, 'segmentApi', options);
+	return await this.helpers.requestWithAuthentication.call(this, 'segmentApi', options);
 }
diff --git a/packages/nodes-base/nodes/Segment/Segment.node.ts b/packages/nodes-base/nodes/Segment/Segment.node.ts
index f83db44a1f917..850df9bd402cf 100644
--- a/packages/nodes-base/nodes/Segment/Segment.node.ts
+++ b/packages/nodes-base/nodes/Segment/Segment.node.ts
@@ -6,6 +6,7 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
+import { v4 as uuid } from 'uuid';
 import { segmentApiRequest } from './GenericFunctions';
 
 import { groupFields, groupOperations } from './GroupDescription';
@@ -18,8 +19,6 @@ import { trackFields, trackOperations } from './TrackDescription';
 
 import type { IGroup, ITrack } from './TrackInterface';
 
-import { v4 as uuid } from 'uuid';
-
 export class Segment implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Segment',
diff --git a/packages/nodes-base/nodes/Segment/segment.svg b/packages/nodes-base/nodes/Segment/segment.svg
index 05ce1a787a3f7..97a92bbb93e27 100644
--- a/packages/nodes-base/nodes/Segment/segment.svg
+++ b/packages/nodes-base/nodes/Segment/segment.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 65 61" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><g stroke="none" fill-rule="nonzero"><path d="M39.875 40.567H3.073C1.383 40.567 0 39.184 0 37.493s1.383-3.073 3.073-3.073h36.802c1.69 0 3.073 1.383 3.073 3.073s-1.383 3.073-3.073 3.073z" fill="#99cfac"/><path d="M32.038 59.39c-2.996 0-5.993-.461-8.836-1.306-1.613-.538-2.535-2.228-1.998-3.842s2.228-2.535 3.842-1.998a23.73 23.73 0 006.992 1.076c10.449 0 19.515-6.684 22.511-16.672.461-1.614 2.228-2.535 3.842-2.074s2.535 2.228 2.074 3.842C56.547 50.939 45.176 59.39 32.038 59.39z" fill="#49b881"/><path d="M60.927 24.971H24.125c-1.69 0-3.073-1.383-3.073-3.073s1.383-3.073 3.073-3.073h36.802c1.69 0 3.073 1.383 3.073 3.073s-1.383 3.073-3.073 3.073z" fill="#99cfac"/><path d="M6.531 24.97c-.307 0-.615-.077-.922-.154-1.613-.461-2.535-2.228-2.074-3.841C7.453 8.451 18.824 0 32.039 0c2.996 0 5.993.461 8.835 1.306 1.613.538 2.535 2.228 1.998 3.842s-2.228 2.535-3.842 1.998a23.73 23.73 0 00-6.992-1.076c-10.449 0-19.515 6.684-22.511 16.672-.461 1.383-1.69 2.228-2.996 2.228z" fill="#49b881"/><g fill="#99cfac"><use xlink:href="#C"/><use xlink:href="#C" x="-36.495" y="39.03"/></g></g></symbol><defs><path id="C" d="M47.174 10.218c0-1.703 1.371-3.073 3.073-3.073s3.073 1.371 3.073 3.073-1.371 3.073-3.073 3.073-3.073-1.371-3.073-3.073z"/></defs></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round" viewBox="0 0 65 61"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><g fill-rule="nonzero" stroke="none"><path fill="#99cfac" d="M39.875 40.567H3.073C1.383 40.567 0 39.184 0 37.493s1.383-3.073 3.073-3.073h36.802c1.69 0 3.073 1.383 3.073 3.073s-1.383 3.073-3.073 3.073z"/><path fill="#49b881" d="M32.038 59.39c-2.996 0-5.993-.461-8.836-1.306-1.613-.538-2.535-2.228-1.998-3.842s2.228-2.535 3.842-1.998a23.7 23.7 0 0 0 6.992 1.076c10.449 0 19.515-6.684 22.511-16.672.461-1.614 2.228-2.535 3.842-2.074s2.535 2.228 2.074 3.842C56.547 50.939 45.176 59.39 32.038 59.39"/><path fill="#99cfac" d="M60.927 24.971H24.125c-1.69 0-3.073-1.383-3.073-3.073s1.383-3.073 3.073-3.073h36.802c1.69 0 3.073 1.383 3.073 3.073s-1.383 3.073-3.073 3.073"/><path fill="#49b881" d="M6.531 24.97c-.307 0-.615-.077-.922-.154-1.613-.461-2.535-2.228-2.074-3.841C7.453 8.451 18.824 0 32.039 0c2.996 0 5.993.461 8.835 1.306 1.613.538 2.535 2.228 1.998 3.842s-2.228 2.535-3.842 1.998a23.7 23.7 0 0 0-6.992-1.076c-10.449 0-19.515 6.684-22.511 16.672-.461 1.383-1.69 2.228-2.996 2.228"/><g fill="#99cfac"><use xlink:href="#b"/><use xlink:href="#b" x="-36.495" y="39.03"/></g></g></symbol><defs><path id="b" d="M47.174 10.218c0-1.703 1.371-3.073 3.073-3.073s3.073 1.371 3.073 3.073-1.371 3.073-3.073 3.073-3.073-1.371-3.073-3.073"/></defs></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/SendGrid/GenericFunctions.ts b/packages/nodes-base/nodes/SendGrid/GenericFunctions.ts
index 9b0791aab9905..08ba895782bfe 100644
--- a/packages/nodes-base/nodes/SendGrid/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/SendGrid/GenericFunctions.ts
@@ -1,17 +1,16 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
+	IRequestOptions,
 } from 'n8n-workflow';
 
 export async function sendGridApiRequest(
-	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	endpoint: string,
-	method: string,
+	method: IHttpRequestMethods,
 
 	body: any = {},
 	qs: IDataObject = {},
@@ -19,7 +18,7 @@ export async function sendGridApiRequest(
 ): Promise<any> {
 	const host = 'api.sendgrid.com/v3';
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		method,
 		qs,
 		body,
@@ -35,13 +34,13 @@ export async function sendGridApiRequest(
 		Object.assign(options, option);
 	}
 
-	return this.helpers.requestWithAuthentication.call(this, 'sendGridApi', options);
+	return await this.helpers.requestWithAuthentication.call(this, 'sendGridApi', options);
 }
 
 export async function sendGridApiRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
 	endpoint: string,
-	method: string,
+	method: IHttpRequestMethods,
 	propertyName: string,
 
 	body: any = {},
@@ -54,7 +53,6 @@ export async function sendGridApiRequestAllItems(
 	let uri;
 
 	do {
-		// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
 		responseData = await sendGridApiRequest.call(this, endpoint, method, body, query, uri); // possible bug, as function does not have uri parameter
 		uri = responseData._metadata.next;
 		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
diff --git a/packages/nodes-base/nodes/SendGrid/SendGrid.node.json b/packages/nodes-base/nodes/SendGrid/SendGrid.node.json
index 3e5fdccc37b4c..0bccd6cf996f0 100644
--- a/packages/nodes-base/nodes/SendGrid/SendGrid.node.json
+++ b/packages/nodes-base/nodes/SendGrid/SendGrid.node.json
@@ -2,7 +2,7 @@
 	"node": "n8n-nodes-base.sendGrid",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Marketing & Content", "Communication"],
+	"categories": ["Marketing", "Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
diff --git a/packages/nodes-base/nodes/SendGrid/SendGrid.node.ts b/packages/nodes-base/nodes/SendGrid/SendGrid.node.ts
index 8409f7d526321..fd889ea057e31 100644
--- a/packages/nodes-base/nodes/SendGrid/SendGrid.node.ts
+++ b/packages/nodes-base/nodes/SendGrid/SendGrid.node.ts
@@ -1,6 +1,7 @@
 import type {
 	IDataObject,
 	IExecuteFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
 	INodePropertyOptions,
@@ -8,6 +9,7 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
+import moment from 'moment-timezone';
 import { listFields, listOperations } from './ListDescription';
 
 import { contactFields, contactOperations } from './ContactDescription';
@@ -17,8 +19,6 @@ import { mailFields, mailOperations } from './MailDescription';
 
 import { sendGridApiRequest, sendGridApiRequestAllItems } from './GenericFunctions';
 
-import moment from 'moment-timezone';
-
 export class SendGrid implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'SendGrid',
@@ -147,7 +147,7 @@ export class SendGrid implements INodeType {
 						const returnAll = this.getNodeParameter('returnAll', i);
 						const filters = this.getNodeParameter('filters', i);
 						let endpoint = '/marketing/contacts';
-						let method = 'GET';
+						let method: IHttpRequestMethods = 'GET';
 						const body: IDataObject = {};
 						if (filters.query && filters.query !== '') {
 							endpoint = '/marketing/contacts/search';
@@ -187,7 +187,7 @@ export class SendGrid implements INodeType {
 			if (operation === 'get') {
 				const by = this.getNodeParameter('by', 0) as string;
 				let endpoint;
-				let method;
+				let method: IHttpRequestMethods;
 				const body: IDataObject = {};
 				for (let i = 0; i < length; i++) {
 					try {
@@ -654,6 +654,6 @@ export class SendGrid implements INodeType {
 				}
 			}
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/SendGrid/sendGrid.svg b/packages/nodes-base/nodes/SendGrid/sendGrid.svg
index f8ba825549dd0..c7d0a5481b8a3 100644
--- a/packages/nodes-base/nodes/SendGrid/sendGrid.svg
+++ b/packages/nodes-base/nodes/SendGrid/sendGrid.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 66 65" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><g stroke="none" fill-rule="nonzero"><path d="M0 21.25h21.374v21.374H0z"/><path d="M0 21.25h21.374v21.374H0z" fill="#99e1f4"/><path d="M21.374 42.626h21.25v21.25h-21.25z"/><path d="M21.374 42.626h21.25v21.25h-21.25z" fill="#99e1f4"/><path d="M0 63.877h21.374V64H0zm0-21.25h21.374v21.25H0z" fill="#1a82e2"/><path d="M21.374 0h21.25v21.25h-21.25zm21.252 21.374H64v21.25H42.626z" fill="#00b3e3"/><path d="M21.374 42.626h21.25V21.25h-21.25z" fill="#009dd9"/><path d="M42.626 0H64v21.25H42.626zm0 21.25H64v.123H42.626z" fill="#1a82e2"/></g></symbol></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round" viewBox="0 0 66 65"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><g fill-rule="nonzero" stroke="none"><path d="M0 21.25h21.374v21.374H0z"/><path fill="#99e1f4" d="M0 21.25h21.374v21.374H0z"/><path d="M21.374 42.626h21.25v21.25h-21.25z"/><path fill="#99e1f4" d="M21.374 42.626h21.25v21.25h-21.25z"/><path fill="#1a82e2" d="M0 63.877h21.374V64H0zm0-21.25h21.374v21.25H0z"/><path fill="#00b3e3" d="M21.374 0h21.25v21.25h-21.25zm21.252 21.374H64v21.25H42.626z"/><path fill="#009dd9" d="M21.374 42.626h21.25V21.25h-21.25z"/><path fill="#1a82e2" d="M42.626 0H64v21.25H42.626zm0 21.25H64v.123H42.626z"/></g></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/SendInBlue/GenericFunctions.ts b/packages/nodes-base/nodes/SendInBlue/GenericFunctions.ts
deleted file mode 100644
index 7fa7a6e4bdb74..0000000000000
--- a/packages/nodes-base/nodes/SendInBlue/GenericFunctions.ts
+++ /dev/null
@@ -1,376 +0,0 @@
-import type {
-	IExecuteSingleFunctions,
-	IHookFunctions,
-	IHttpRequestOptions,
-	IWebhookFunctions,
-	JsonObject,
-} from 'n8n-workflow';
-import { jsonParse, NodeOperationError } from 'n8n-workflow';
-import type { OptionsWithUri } from 'request';
-import MailComposer from 'nodemailer/lib/mail-composer';
-export namespace SendInBlueNode {
-	type ValidEmailFields = { to: string } | { sender: string } | { cc: string } | { bcc: string };
-	type Address = { address: string; name?: string };
-	type Email = { email: string; name?: string };
-	type ToEmail = { to: Email[] };
-	type SenderEmail = { sender: Email };
-	type CCEmail = { cc: Email[] };
-	type BBCEmail = { bbc: Email[] };
-	type ValidatedEmail = ToEmail | SenderEmail | CCEmail | BBCEmail;
-
-	const enum OVERRIDE_MAP_VALUES {
-		'CATEGORY' = 'category',
-		'NORMAL' = 'boolean',
-		'TRANSACTIONAL' = 'id',
-	}
-
-	const enum OVERRIDE_MAP_TYPE {
-		'CATEGORY' = 'category',
-		'NORMAL' = 'normal',
-		'TRANSACTIONAL' = 'transactional',
-	}
-
-	export const INTERCEPTORS = new Map<string, (body: JsonObject) => void>([
-		[
-			OVERRIDE_MAP_TYPE.CATEGORY,
-			(body: JsonObject) => {
-				body.type = OVERRIDE_MAP_VALUES.CATEGORY;
-			},
-		],
-		[
-			OVERRIDE_MAP_TYPE.NORMAL,
-			(body: JsonObject) => {
-				body.type = OVERRIDE_MAP_VALUES.NORMAL;
-			},
-		],
-		[
-			OVERRIDE_MAP_TYPE.TRANSACTIONAL,
-			(body: JsonObject) => {
-				body.type = OVERRIDE_MAP_VALUES.TRANSACTIONAL;
-			},
-		],
-	]);
-	export namespace Validators {
-		function getFileName(
-			itemIndex: number,
-			mimeType: string,
-			fileExt: string,
-			fileName: string,
-		): string {
-			let ext = fileExt;
-			if (fileExt === undefined) {
-				ext = mimeType.split('/')[1];
-			}
-
-			let name = `${fileName}.${ext}`;
-			if (fileName === undefined) {
-				name = `file-${itemIndex}.${ext}`;
-			}
-			return name;
-		}
-
-		export async function validateAndCompileAttachmentsData(
-			this: IExecuteSingleFunctions,
-			requestOptions: IHttpRequestOptions,
-		): Promise<IHttpRequestOptions> {
-			const dataPropertyList = this.getNodeParameter(
-				'additionalFields.emailAttachments.attachment',
-			) as JsonObject;
-			const { body } = requestOptions;
-
-			const { attachment = [] } = body as { attachment: Array<{ content: string; name: string }> };
-
-			try {
-				const { binaryPropertyName } = dataPropertyList;
-				const dataMappingList = (binaryPropertyName as string).split(',');
-				for (const attachmentDataName of dataMappingList) {
-					const binaryData = this.helpers.assertBinaryData(attachmentDataName);
-					const bufferFromIncomingData = await this.helpers.getBinaryDataBuffer(attachmentDataName);
-
-					const {
-						data: content,
-						mimeType,
-						fileName,
-						fileExtension,
-					} = await this.helpers.prepareBinaryData(bufferFromIncomingData);
-
-					const itemIndex = this.getItemIndex();
-					const name = getFileName(
-						itemIndex,
-						mimeType,
-						fileExtension!,
-						fileName ?? binaryData.fileName!,
-					);
-
-					attachment.push({ content, name });
-				}
-
-				Object.assign(body!, { attachment });
-
-				return requestOptions;
-			} catch (err) {
-				throw new NodeOperationError(this.getNode(), err as Error);
-			}
-		}
-
-		export async function validateAndCompileTags(
-			this: IExecuteSingleFunctions,
-			requestOptions: IHttpRequestOptions,
-		): Promise<IHttpRequestOptions> {
-			const { tag } = this.getNodeParameter('additionalFields.emailTags.tags') as JsonObject;
-			const tags = (tag as string)
-				.split(',')
-				.map((entry) => entry.trim())
-				.filter((entry) => {
-					return entry !== '';
-				});
-			const { body } = requestOptions;
-			Object.assign(body!, { tags });
-			return requestOptions;
-		}
-
-		function formatToEmailName(data: Address): Email {
-			const { address: email, name } = data;
-			const result = { email };
-			if (name !== undefined && name !== '') {
-				Object.assign(result, { name });
-			}
-			return { ...result };
-		}
-
-		function validateEmailStrings(input: ValidEmailFields): ValidatedEmail {
-			const composer = new MailComposer({ ...input });
-			const addressFields = composer.compile().getAddresses();
-
-			const fieldFetcher = new Map<string, () => Email[] | Email>([
-				[
-					'bcc',
-					() => {
-						return (addressFields.bcc as unknown as Address[])?.map(formatToEmailName);
-					},
-				],
-				[
-					'cc',
-					() => {
-						return (addressFields.cc as unknown as Address[])?.map(formatToEmailName);
-					},
-				],
-				[
-					'from',
-					() => {
-						return (addressFields.from as unknown as Address[])?.map(formatToEmailName);
-					},
-				],
-				[
-					'reply-to',
-					() => {
-						return (addressFields['reply-to'] as unknown as Address[])?.map(formatToEmailName);
-					},
-				],
-				[
-					'sender',
-					() => {
-						return (addressFields.sender as unknown as Address[])?.map(formatToEmailName)[0];
-					},
-				],
-				[
-					'to',
-					() => {
-						return (addressFields.to as unknown as Address[])?.map(formatToEmailName);
-					},
-				],
-			]);
-
-			const result: { [key in keyof ValidatedEmail]: Email[] | Email } = {} as ValidatedEmail;
-			Object.keys(input).reduce((obj: { [key: string]: Email[] | Email }, key: string) => {
-				const getter = fieldFetcher.get(key);
-				const value = getter!();
-				obj[key] = value;
-				return obj;
-			}, result);
-
-			return result as ValidatedEmail;
-		}
-
-		export async function validateAndCompileCCEmails(
-			this: IExecuteSingleFunctions,
-			requestOptions: IHttpRequestOptions,
-		): Promise<IHttpRequestOptions> {
-			const ccData = this.getNodeParameter(
-				'additionalFields.receipientsCC.receipientCc',
-			) as JsonObject;
-			const { cc } = ccData;
-			const { body } = requestOptions;
-			const data = validateEmailStrings({ cc: cc as string });
-			Object.assign(body!, data);
-
-			return requestOptions;
-		}
-
-		export async function validateAndCompileBCCEmails(
-			this: IExecuteSingleFunctions,
-			requestOptions: IHttpRequestOptions,
-		): Promise<IHttpRequestOptions> {
-			const bccData = this.getNodeParameter(
-				'additionalFields.receipientsBCC.receipientBcc',
-			) as JsonObject;
-			const { bcc } = bccData;
-			const { body } = requestOptions;
-			const data = validateEmailStrings({ bcc: bcc as string });
-			Object.assign(body!, data);
-
-			return requestOptions;
-		}
-
-		export async function validateAndCompileReceipientEmails(
-			this: IExecuteSingleFunctions,
-			requestOptions: IHttpRequestOptions,
-		): Promise<IHttpRequestOptions> {
-			const to = this.getNodeParameter('receipients') as string;
-			const { body } = requestOptions;
-			const data = validateEmailStrings({ to });
-			Object.assign(body!, data);
-
-			return requestOptions;
-		}
-
-		export async function validateAndCompileSenderEmail(
-			this: IExecuteSingleFunctions,
-			requestOptions: IHttpRequestOptions,
-		): Promise<IHttpRequestOptions> {
-			const sender = this.getNodeParameter('sender') as string;
-			const { body } = requestOptions;
-			const data = validateEmailStrings({ sender });
-			Object.assign(body!, data);
-
-			return requestOptions;
-		}
-
-		export async function validateAndCompileTemplateParameters(
-			this: IExecuteSingleFunctions,
-			requestOptions: IHttpRequestOptions,
-		): Promise<IHttpRequestOptions> {
-			const parameterData = this.getNodeParameter(
-				'additionalFields.templateParameters.parameterValues',
-			);
-			const { body } = requestOptions;
-			const { parameters } = parameterData as JsonObject;
-			const params = (parameters as string)
-				.split(',')
-				.filter((parameter) => {
-					return parameter.split('=').length === 2;
-				})
-				.map((parameter) => {
-					const [key, value] = parameter.split('=');
-					return {
-						[key]: value,
-					};
-				})
-				.reduce((obj, cObj) => {
-					Object.assign(obj, cObj);
-					return obj;
-				}, {});
-
-			Object.assign(body!, { params });
-			return requestOptions;
-		}
-	}
-}
-
-export namespace SendInBlueWebhookApi {
-	interface WebhookDetails {
-		url: string;
-		id: number;
-		description: string;
-		events: string[];
-		type: string;
-		createdAt: string;
-		modifiedAt: string;
-	}
-
-	interface WebhookId {
-		id: string;
-	}
-
-	interface Webhooks {
-		webhooks: WebhookDetails[];
-	}
-
-	const credentialsName = 'sendInBlueApi';
-	const baseURL = 'https://api.sendinblue.com/v3';
-	export const supportedAuthMap = new Map<string, (ref: IWebhookFunctions) => Promise<string>>([
-		[
-			'apiKey',
-			async (ref: IWebhookFunctions): Promise<string> => {
-				const credentials = await ref.getCredentials(credentialsName);
-				return credentials.sharedSecret as string;
-			},
-		],
-	]);
-
-	export const fetchWebhooks = async (ref: IHookFunctions, type: string): Promise<Webhooks> => {
-		const endpoint = `${baseURL}/webhooks?type=${type}`;
-
-		const options: OptionsWithUri = {
-			method: 'GET',
-			headers: {
-				Accept: 'application/json',
-			},
-			uri: endpoint,
-		};
-
-		const webhooks = (await ref.helpers.requestWithAuthentication.call(
-			ref,
-			credentialsName,
-			options,
-		)) as string;
-
-		return jsonParse(webhooks);
-	};
-
-	export const createWebHook = async (
-		ref: IHookFunctions,
-		type: string,
-		events: string[],
-		url: string,
-	): Promise<WebhookId> => {
-		const endpoint = `${baseURL}/webhooks`;
-
-		const options: OptionsWithUri = {
-			method: 'POST',
-			headers: {
-				Accept: 'application/json',
-			},
-			uri: endpoint,
-			body: {
-				events,
-				type,
-				url,
-			},
-		};
-
-		const webhookId = await ref.helpers.requestWithAuthentication.call(
-			ref,
-			credentialsName,
-			options,
-		);
-
-		return jsonParse(webhookId as string);
-	};
-
-	export const deleteWebhook = async (ref: IHookFunctions, webhookId: string) => {
-		const endpoint = `${baseURL}/webhooks/${webhookId}`;
-		const body = {};
-
-		const options: OptionsWithUri = {
-			method: 'DELETE',
-			headers: {
-				Accept: 'application/json',
-			},
-			uri: endpoint,
-			body,
-		};
-
-		return ref.helpers.requestWithAuthentication.call(ref, credentialsName, options);
-	};
-}
diff --git a/packages/nodes-base/nodes/SendInBlue/SendInBlue.node.json b/packages/nodes-base/nodes/SendInBlue/SendInBlue.node.json
deleted file mode 100644
index abf2d926f1515..0000000000000
--- a/packages/nodes-base/nodes/SendInBlue/SendInBlue.node.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"node": "n8n-nodes-base.sendInBlue",
-	"nodeVersion": "1.0",
-	"codexVersion": "1.0",
-	"categories": ["Marketing & Content", "Communication"],
-	"resources": {
-		"credentialDocumentation": [
-			{
-				"url": "https://docs.n8n.io/credentials/sendInBlue"
-			}
-		],
-		"primaryDocumentation": [
-			{
-				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.sendinblue/"
-			}
-		]
-	}
-}
diff --git a/packages/nodes-base/nodes/SendInBlue/SendInBlue.node.ts b/packages/nodes-base/nodes/SendInBlue/SendInBlue.node.ts
deleted file mode 100644
index 19c9ba5a633b6..0000000000000
--- a/packages/nodes-base/nodes/SendInBlue/SendInBlue.node.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-/* eslint-disable n8n-nodes-base/node-filename-against-convention */
-import type { INodeType, INodeTypeDescription } from 'n8n-workflow';
-import { attributeFields, attributeOperations } from './AttributeDescription';
-import { contactFields, contactOperations } from './ContactDescription';
-import { emailFields, emailOperations } from './EmailDescription';
-import { senderFields, senderOperations } from './SenderDescrition';
-
-export class SendInBlue implements INodeType {
-	description: INodeTypeDescription = {
-		displayName: 'SendInBlue',
-		name: 'sendInBlue',
-		icon: 'file:sendinblue.svg',
-		group: ['transform'],
-		version: 1,
-		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume Sendinblue API',
-		defaults: {
-			name: 'SendInBlue',
-		},
-		inputs: ['main'],
-		outputs: ['main'],
-		credentials: [
-			{
-				name: 'sendInBlueApi',
-				required: true,
-			},
-		],
-		requestDefaults: {
-			baseURL: 'https://api.sendinblue.com',
-		},
-		properties: [
-			{
-				displayName: 'Resource',
-				name: 'resource',
-				type: 'options',
-				noDataExpression: true,
-				options: [
-					{
-						name: 'Contact',
-						value: 'contact',
-					},
-					{
-						name: 'Contact Attribute',
-						value: 'attribute',
-					},
-					{
-						name: 'Email',
-						value: 'email',
-					},
-					{
-						name: 'Sender',
-						value: 'sender',
-					},
-				],
-				default: 'email',
-			},
-
-			...attributeOperations,
-			...attributeFields,
-			...senderOperations,
-			...senderFields,
-			...contactOperations,
-			...contactFields,
-			...emailOperations,
-			...emailFields,
-		],
-	};
-}
diff --git a/packages/nodes-base/nodes/SendInBlue/SendInBlueTrigger.node.json b/packages/nodes-base/nodes/SendInBlue/SendInBlueTrigger.node.json
deleted file mode 100644
index f553e8d39fcf8..0000000000000
--- a/packages/nodes-base/nodes/SendInBlue/SendInBlueTrigger.node.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"node": "n8n-nodes-base.sendInBlueTrigger",
-	"nodeVersion": "1.0",
-	"codexVersion": "1.0",
-	"categories": ["Marketing & Content", "Communication"],
-	"resources": {
-		"credentialDocumentation": [
-			{
-				"url": "https://docs.n8n.io/credentials/sendInBlue"
-			}
-		],
-		"primaryDocumentation": [
-			{
-				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.sendinbluetrigger/"
-			}
-		],
-		"generic": []
-	}
-}
diff --git a/packages/nodes-base/nodes/SendInBlue/SendInBlueTrigger.node.ts b/packages/nodes-base/nodes/SendInBlue/SendInBlueTrigger.node.ts
deleted file mode 100644
index dc9bb3037030d..0000000000000
--- a/packages/nodes-base/nodes/SendInBlue/SendInBlueTrigger.node.ts
+++ /dev/null
@@ -1,289 +0,0 @@
-/* eslint-disable n8n-nodes-base/node-filename-against-convention */
-import type {
-	IHookFunctions,
-	INodeType,
-	INodeTypeDescription,
-	IWebhookFunctions,
-	IWebhookResponseData,
-} from 'n8n-workflow';
-import { SendInBlueWebhookApi } from './GenericFunctions';
-
-export class SendInBlueTrigger implements INodeType {
-	description: INodeTypeDescription = {
-		credentials: [
-			{
-				name: 'sendInBlueApi',
-				required: true,
-			},
-		],
-		displayName: 'SendInBlue Trigger',
-		defaults: {
-			name: 'SendInBlue Trigger',
-		},
-		description: 'Starts the workflow when SendInBlue events occur',
-		group: ['trigger'],
-		icon: 'file:sendinblue.svg',
-		inputs: [],
-		name: 'sendInBlueTrigger',
-		outputs: ['main'],
-		version: 1,
-		webhooks: [
-			{
-				name: 'default',
-				httpMethod: 'POST',
-				responseMode: 'onReceived',
-				path: 'webhooks',
-			},
-		],
-		properties: [
-			{
-				displayName: 'Resource',
-				default: 'transactional',
-				name: 'type',
-				options: [
-					{ name: 'Inbound', value: 'inbound' },
-					{ name: 'Marketing', value: 'marketing' },
-					{ name: 'Transactional', value: 'transactional' },
-				],
-				required: true,
-				type: 'options',
-			},
-			{
-				displayName: 'Trigger On',
-				displayOptions: {
-					show: {
-						type: ['transactional'],
-					},
-				},
-				name: 'events',
-				placeholder: 'Add Event',
-				options: [
-					{
-						name: 'Email Blocked',
-						value: 'blocked',
-						description: 'Triggers when transactional email is blocked',
-					},
-					{
-						name: 'Email Clicked',
-						value: 'click',
-						description: 'Triggers when transactional email is clicked',
-					},
-					{
-						name: 'Email Deferred',
-						value: 'deferred',
-						description: 'Triggers when transactional email is deferred',
-					},
-					{
-						name: 'Email Delivered',
-						value: 'delivered',
-						description: 'Triggers when transactional email is delivered',
-					},
-					{
-						name: 'Email Hard Bounce',
-						value: 'hardBounce',
-						description: 'Triggers when transactional email is hard bounced',
-					},
-					{
-						name: 'Email Invalid',
-						value: 'invalid',
-						description: 'Triggers when transactional email is invalid',
-					},
-					{
-						name: 'Email Marked Spam',
-						value: 'spam',
-						description: 'Triggers when transactional email is set to spam',
-					},
-					{
-						name: 'Email Opened',
-						value: 'opened',
-						description: 'Triggers when transactional email is opened',
-					},
-					{
-						name: 'Email Sent',
-						value: 'request',
-						description: 'Triggers when transactional email is sent',
-					},
-					{
-						name: 'Email Soft-Bounce',
-						value: 'softBounce',
-						description: 'Triggers when transactional email is soft bounced',
-					},
-					{
-						name: 'Email Unique Open',
-						value: 'uniqueOpened',
-						description: 'Triggers when transactional email is unique opened',
-					},
-					{
-						name: 'Email Unsubscribed',
-						value: 'unsubscribed',
-						description: 'Triggers when transactional email is unsubscribed',
-					},
-				],
-				default: [],
-				required: true,
-				type: 'multiOptions',
-			},
-			{
-				displayName: 'Trigger On',
-				displayOptions: {
-					show: {
-						type: ['marketing'],
-					},
-				},
-				name: 'events',
-				placeholder: 'Add Event',
-				options: [
-					{
-						name: 'Marketing Email Clicked',
-						value: 'click',
-						description: 'Triggers when marketing email is clicked',
-					},
-					{
-						name: 'Marketing Email Delivered',
-						value: 'delivered',
-						description: 'Triggers when marketing email is delivered',
-					},
-					{
-						name: 'Marketing Email Hard Bounce',
-						value: 'hardBounce',
-						description: 'Triggers when marketing email is hard bounced',
-					},
-					{
-						name: 'Marketing Email List Addition',
-						value: 'listAddition',
-						description: 'Triggers when marketing email is clicked',
-					},
-					{
-						name: 'Marketing Email Opened',
-						value: 'opened',
-						description: 'Triggers when marketing email is opened',
-					},
-					{
-						name: 'Marketing Email Soft Bounce',
-						value: 'softBounce',
-						description: 'Triggers when marketing email is soft bounced',
-					},
-					{
-						name: 'Marketing Email Spam',
-						value: 'spam',
-						description: 'Triggers when marketing email is spam',
-					},
-					{
-						name: 'Marketing Email Unsubscribed',
-						value: 'unsubscribed',
-						description: 'Triggers when marketing email is unsubscribed',
-					},
-				],
-				default: [],
-				required: true,
-				type: 'multiOptions',
-			},
-			{
-				displayName: 'Trigger On',
-				displayOptions: {
-					show: {
-						type: ['inbound'],
-					},
-				},
-				name: 'events',
-				placeholder: 'Add Event',
-				options: [
-					{
-						name: 'Inbound Email Processed',
-						value: 'inboundEmailProcessed',
-						description: 'Triggers when inbound email is processed',
-					},
-				],
-				default: [],
-				required: true,
-				type: 'multiOptions',
-			},
-		],
-	};
-
-	webhookMethods = {
-		default: {
-			async checkExists(this: IHookFunctions): Promise<boolean> {
-				const webhookData = this.getWorkflowStaticData('node');
-
-				const webhookUrl = this.getNodeWebhookUrl('default') as string;
-
-				const type = this.getNodeParameter('type') as string;
-
-				const events = this.getNodeParameter('events') as string[];
-
-				try {
-					const { webhooks } = await SendInBlueWebhookApi.fetchWebhooks(this, type);
-
-					for (const webhook of webhooks) {
-						if (
-							webhook.type === type &&
-							webhook.events.every((event) => events.includes(event)) &&
-							webhookUrl === webhook.url
-						) {
-							webhookData.webhookId = webhook.id;
-							return true;
-						}
-					}
-					// If it did not error then the webhook exists
-					return false;
-				} catch (err) {
-					return false;
-				}
-			},
-			async create(this: IHookFunctions): Promise<boolean> {
-				const webhookData = this.getWorkflowStaticData('node');
-
-				const webhookUrl = this.getNodeWebhookUrl('default') as string;
-
-				const type = this.getNodeParameter('type') as string;
-
-				const events = this.getNodeParameter('events') as string[];
-
-				const responseData = await SendInBlueWebhookApi.createWebHook(
-					this,
-					type,
-					events,
-					webhookUrl,
-				);
-
-				if (responseData === undefined || responseData.id === undefined) {
-					// Required data is missing so was not successful
-					return false;
-				}
-
-				webhookData.webhookId = responseData.id;
-
-				return true;
-			},
-			async delete(this: IHookFunctions): Promise<boolean> {
-				const webhookData = this.getWorkflowStaticData('node');
-
-				if (webhookData.webhookId !== undefined) {
-					try {
-						await SendInBlueWebhookApi.deleteWebhook(this, webhookData.webhookId as string);
-					} catch (error) {
-						return false;
-					}
-
-					// Remove from the static workflow data so that it is clear
-					// that no webhooks are registered anymore
-					delete webhookData.webhookId;
-					delete webhookData.webhookEvents;
-					delete webhookData.hookSecret;
-				}
-
-				return true;
-			},
-		},
-	};
-
-	async webhook(this: IWebhookFunctions): Promise<IWebhookResponseData> {
-		// The data to return and so start the workflow with
-		const bodyData = this.getBodyData();
-
-		return {
-			workflowData: [this.helpers.returnJsonArray(bodyData)],
-		};
-	}
-}
diff --git a/packages/nodes-base/nodes/SendInBlue/sendinblue.svg b/packages/nodes-base/nodes/SendInBlue/sendinblue.svg
deleted file mode 100644
index 7525b9036e2ec..0000000000000
--- a/packages/nodes-base/nodes/SendInBlue/sendinblue.svg
+++ /dev/null
@@ -1,20 +0,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 94.8 101.7" style="enable-background:new 0 0 94.8 101.7;" xml:space="preserve">
- <style type="text/css">
-  .st0{fill-rule:evenodd;clip-rule:evenodd;fill:#0092FF;}
- </style>
- <g>
-  <path class="st0" d="M85.2,72.8c-2.6,4.5-6.9,7.9-11.9,9.3c0.7-2.5,1.1-5,1.1-7.6c0-12.8-8.8-23.4-20.6-26.4c2.4-2.4,5.5-4.1,8.8-5
-		c5.1-1.4,10.6-0.7,15.2,2C87.5,50.8,90.8,63.1,85.2,72.8 M47.4,94.7c-5.2,0-10.2-2.1-13.9-5.7c2.5-0.6,4.8-1.6,7-2.8
-		c11-6.4,15.8-19.4,12.4-31.1c8.4,2.4,14.6,10.2,14.6,19.4C67.5,85.7,58.5,94.7,47.4,94.7 M9.6,72.8c-2.6-4.6-3.3-10-2.1-15
-		c1.8,1.8,3.8,3.4,6,4.7c4.1,2.4,8.7,3.6,13.5,3.6c7.4,0,14.4-3,19.5-8.4c2.1,8.5-1.5,17.8-9.4,22.4c-3,1.8-6.5,2.7-10,2.7
-		C19.9,82.9,13.2,79,9.6,72.8 M9.6,28.9c2.6-4.5,6.9-7.9,11.9-9.3c-0.7,2.5-1.1,5-1.1,7.6c0,12.7,8.8,23.4,20.6,26.4
-		c-6.3,6.1-16.1,7.6-24,3c-4.6-2.7-8-7.1-9.4-12.3C6.2,39.1,6.9,33.5,9.6,28.9 M47.4,7c5.2,0,10.2,2.1,13.9,5.7
-		c-2.5,0.6-4.8,1.6-7,2.8C48.1,19.1,43.6,25,41.7,32c-1.3,4.8-1.2,9.8,0.2,14.6c-8.4-2.4-14.6-10.2-14.6-19.4C27.3,16,36.3,7,47.4,7
-		 M85.2,28.9c2.6,4.6,3.3,10,2.1,15c-1.8-1.8-3.8-3.4-6-4.7c-6.2-3.6-13.5-4.6-20.5-2.7c-4.8,1.3-9.1,3.9-12.5,7.5
-		c-0.8-3.3-0.8-6.8,0.1-10.1c1.4-5.2,4.7-9.6,9.4-12.3c4.6-2.7,10.1-3.4,15.2-2C78.2,20.9,82.5,24.2,85.2,28.9 M91.2,25.4
-		c-3.6-6.3-9.4-10.8-16.4-12.7c-1.6-0.4-3.3-0.7-5-0.9C64.8,4.5,56.4,0,47.4,0c-9.3,0-17.5,4.7-22.3,11.9c-8.9,0.7-17,5.7-21.5,13.5
-		C0,31.7-0.9,39,0.9,46c0.4,1.7,1,3.3,1.8,4.8c-3.9,8.1-3.6,17.6,0.9,25.4c4.6,8.1,12.8,12.8,21.4,13.5c5,7.4,13.4,11.9,22.4,11.9
-		c9.3,0,17.5-4.7,22.3-11.9c8.9-0.7,17-5.7,21.5-13.5c4.6-8.1,4.7-17.6,0.9-25.4C96,42.8,95.7,33.2,91.2,25.4">
-  </path>
- </g>
-</svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Sendy/GenericFunctions.ts b/packages/nodes-base/nodes/Sendy/GenericFunctions.ts
index c36e00fb7ab53..e55ffca5a5eec 100644
--- a/packages/nodes-base/nodes/Sendy/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Sendy/GenericFunctions.ts
@@ -1,16 +1,16 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
+	IDataObject,
 	IExecuteFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
-	IDataObject,
+	IRequestOptions,
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function sendyApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	path: string,
 
 	body: any = {},
@@ -23,7 +23,7 @@ export async function sendyApiRequest(
 
 	body.boolean = true;
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			'Content-Type': 'application/x-www-form-urlencoded',
 		},
diff --git a/packages/nodes-base/nodes/Sendy/Sendy.node.json b/packages/nodes-base/nodes/Sendy/Sendy.node.json
index f3c54f179f997..b65a74caac1f6 100644
--- a/packages/nodes-base/nodes/Sendy/Sendy.node.json
+++ b/packages/nodes-base/nodes/Sendy/Sendy.node.json
@@ -2,7 +2,7 @@
 	"node": "n8n-nodes-base.sendy",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Communication", "Marketing & Content"],
+	"categories": ["Communication", "Marketing"],
 	"resources": {
 		"credentialDocumentation": [
 			{
diff --git a/packages/nodes-base/nodes/Sendy/Sendy.node.ts b/packages/nodes-base/nodes/Sendy/Sendy.node.ts
index fb5865f5a448b..0e8236c68c47a 100644
--- a/packages/nodes-base/nodes/Sendy/Sendy.node.ts
+++ b/packages/nodes-base/nodes/Sendy/Sendy.node.ts
@@ -86,6 +86,11 @@ export class Sendy implements INodeType {
 
 					const additionalFields = this.getNodeParameter('additionalFields', i);
 
+					let brandId = null;
+					if (!sendCampaign) {
+						brandId = this.getNodeParameter('brandId', i) as string;
+					}
+
 					const body: IDataObject = {
 						from_name: fromName,
 						from_email: fromEmail,
@@ -96,6 +101,10 @@ export class Sendy implements INodeType {
 						html_text: htmlText,
 					};
 
+					if (brandId) {
+						body.brand_id = brandId;
+					}
+
 					if (additionalFields.plainText) {
 						body.plain_text = additionalFields.plainText;
 					}
@@ -116,10 +125,6 @@ export class Sendy implements INodeType {
 						body.exclude_segments_ids = additionalFields.excludeSegmentIds as string;
 					}
 
-					if (additionalFields.brandId) {
-						body.brand_id = additionalFields.brandId as string;
-					}
-
 					if (additionalFields.queryString) {
 						body.query_string = additionalFields.queryString as string;
 					}
diff --git a/packages/nodes-base/nodes/SentryIo/GenericFunctions.ts b/packages/nodes-base/nodes/SentryIo/GenericFunctions.ts
index 855f628a3cedc..9c70f97994559 100644
--- a/packages/nodes-base/nodes/SentryIo/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/SentryIo/GenericFunctions.ts
@@ -1,24 +1,18 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
+	IRequestOptions,
 	IWebhookFunctions,
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function sentryIoApiRequest(
-	this:
-		| IHookFunctions
-		| IExecuteFunctions
-		| IExecuteSingleFunctions
-		| ILoadOptionsFunctions
-		| IWebhookFunctions,
-	method: string,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -30,14 +24,14 @@ export async function sentryIoApiRequest(
 
 	const version = this.getNodeParameter('sentryVersion', 0);
 
-	const options: OptionsWithUri = {
+	const options = {
 		headers: {},
 		method,
 		qs,
 		body,
 		uri: uri || `https://sentry.io${resource}`,
 		json: true,
-	};
+	} satisfies IRequestOptions;
 	if (!Object.keys(body as IDataObject).length) {
 		delete options.body;
 	}
@@ -101,7 +95,7 @@ function hasMore(link: string) {
 
 export async function sentryApiRequestAllItems(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
diff --git a/packages/nodes-base/nodes/SentryIo/SentryIo.node.ts b/packages/nodes-base/nodes/SentryIo/SentryIo.node.ts
index c3b355c8ca3f2..5133f74fe8077 100644
--- a/packages/nodes-base/nodes/SentryIo/SentryIo.node.ts
+++ b/packages/nodes-base/nodes/SentryIo/SentryIo.node.ts
@@ -743,6 +743,6 @@ export class SentryIo implements INodeType {
 				throw error;
 			}
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/SentryIo/sentryio.svg b/packages/nodes-base/nodes/SentryIo/sentryio.svg
index 60643b76f6cae..1988b93ff0166 100644
--- a/packages/nodes-base/nodes/SentryIo/sentryio.svg
+++ b/packages/nodes-base/nodes/SentryIo/sentryio.svg
@@ -1 +1 @@
-<svg class="css-15xgryy e10nushx5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 50 44" width="400" height="352"><path d="M29 2.26a4.67 4.67 0 00-8 0l-6.58 11.27a32.21 32.21 0 0117.75 26.66h-4.62a27.68 27.68 0 00-15.46-22.72L6 28a15.92 15.92 0 019.23 12.17H4.62A.76.76 0 014 39.06l2.94-5a10.74 10.74 0 00-3.36-1.9l-2.91 5a4.54 4.54 0 001.69 6.24 4.66 4.66 0 002.26.6h14.53a19.4 19.4 0 00-8-17.31l2.31-4A23.87 23.87 0 0123.76 44h12.31a35.88 35.88 0 00-16.41-31.8l4.67-8a.77.77 0 011.05-.27c.53.29 20.29 34.77 20.66 35.17a.76.76 0 01-.68 1.13H40.6q.09 1.91 0 3.81h4.78A4.59 4.59 0 0050 39.43a4.49 4.49 0 00-.62-2.28z" fill="#362d59"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="400" height="352" class="css-15xgryy e10nushx5" viewBox="0 0 50 44"><path fill="#362d59" d="M29 2.26a4.67 4.67 0 0 0-8 0l-6.58 11.27a32.21 32.21 0 0 1 17.75 26.66h-4.62a27.68 27.68 0 0 0-15.46-22.72L6 28a15.92 15.92 0 0 1 9.23 12.17H4.62A.76.76 0 0 1 4 39.06l2.94-5a10.7 10.7 0 0 0-3.36-1.9l-2.91 5a4.54 4.54 0 0 0 1.69 6.24 4.66 4.66 0 0 0 2.26.6h14.53a19.4 19.4 0 0 0-8-17.31l2.31-4A23.87 23.87 0 0 1 23.76 44h12.31a35.88 35.88 0 0 0-16.41-31.8l4.67-8a.77.77 0 0 1 1.05-.27c.53.29 20.29 34.77 20.66 35.17a.76.76 0 0 1-.68 1.13H40.6q.09 1.91 0 3.81h4.78A4.59 4.59 0 0 0 50 39.43a4.5 4.5 0 0 0-.62-2.28z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/ServiceNow/GenericFunctions.ts b/packages/nodes-base/nodes/ServiceNow/GenericFunctions.ts
index 71d9e997736d0..ded0e97c32e8d 100644
--- a/packages/nodes-base/nodes/ServiceNow/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/ServiceNow/GenericFunctions.ts
@@ -1,17 +1,17 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IExecuteFunctions,
 	ILoadOptionsFunctions,
 	IDataObject,
 	INodePropertyOptions,
 	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function serviceNowApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -30,14 +30,14 @@ export async function serviceNowApiRequest(
 		credentials = await this.getCredentials('serviceNowOAuth2Api');
 	}
 
-	const options: OptionsWithUri = {
+	const options = {
 		headers,
 		method,
 		qs,
 		body,
 		uri: uri || `https://${credentials.subdomain}.service-now.com/api${resource}`,
 		json: true,
-	};
+	} satisfies IRequestOptions;
 	if (!Object.keys(body as IDataObject).length) {
 		delete options.body;
 	}
@@ -61,7 +61,7 @@ export async function serviceNowApiRequest(
 
 export async function serviceNowRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
diff --git a/packages/nodes-base/nodes/ServiceNow/IncidentDescription.ts b/packages/nodes-base/nodes/ServiceNow/IncidentDescription.ts
index 13ddaa5d19a5f..97a52c09151d3 100644
--- a/packages/nodes-base/nodes/ServiceNow/IncidentDescription.ts
+++ b/packages/nodes-base/nodes/ServiceNow/IncidentDescription.ts
@@ -75,7 +75,7 @@ export const incidentFields: INodeProperties[] = [
 		default: {},
 		options: [
 			{
-				displayName: 'Asignee Name or ID',
+				displayName: 'Assignee Name or ID',
 				name: 'assigned_to',
 				type: 'options',
 				typeOptions: {
diff --git a/packages/nodes-base/nodes/ServiceNow/ServiceNow.node.ts b/packages/nodes-base/nodes/ServiceNow/ServiceNow.node.ts
index 0a60990513bba..e76c557f50ed7 100644
--- a/packages/nodes-base/nodes/ServiceNow/ServiceNow.node.ts
+++ b/packages/nodes-base/nodes/ServiceNow/ServiceNow.node.ts
@@ -1160,9 +1160,9 @@ export class ServiceNow implements INodeType {
 
 		if (resource === 'attachment') {
 			if (operation === 'get' || operation === 'getAll') {
-				return this.prepareOutputData(returnData);
+				return [returnData];
 			}
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/ServiceNow/UserDescription.ts b/packages/nodes-base/nodes/ServiceNow/UserDescription.ts
index 9a6749ca39fd8..b4d4ad0d88b9a 100644
--- a/packages/nodes-base/nodes/ServiceNow/UserDescription.ts
+++ b/packages/nodes-base/nodes/ServiceNow/UserDescription.ts
@@ -184,6 +184,7 @@ export const userFields: INodeProperties[] = [
 				displayName: 'Password',
 				name: 'user_password',
 				type: 'string',
+				typeOptions: { password: true },
 				default: '',
 				description: "The user's password",
 			},
@@ -617,6 +618,7 @@ export const userFields: INodeProperties[] = [
 				displayName: 'Password',
 				name: 'user_password',
 				type: 'string',
+				typeOptions: { password: true },
 				default: '',
 				description: "The user's password",
 			},
diff --git a/packages/nodes-base/nodes/ServiceNow/servicenow.svg b/packages/nodes-base/nodes/ServiceNow/servicenow.svg
index e5567e562c8e4..95186a8ae6bd4 100644
--- a/packages/nodes-base/nodes/ServiceNow/servicenow.svg
+++ b/packages/nodes-base/nodes/ServiceNow/servicenow.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 66 59" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#A" x=".5" y=".5"/><symbol id="A" overflow="visible"><path d="M32.196 0A32.27 32.27 0 0 0 2.312 20.275 32.27 32.27 0 0 0 9.95 55.571c2.27 2.167 5.782 2.349 8.264.43 8.15-6.045 19.295-6.045 27.445 0 2.507 1.985 6.098 1.8 8.389-.43A32.27 32.27 0 0 0 32.196 0m-.18 48.275a15.63 15.63 0 0 1-16.133-16.026c-.196-5.857 2.816-11.355 7.858-14.341s11.311-2.987 16.353 0 8.055 8.485 7.858 14.341c.115 4.284-1.537 8.428-4.568 11.458s-7.174 4.682-11.458 4.568" stroke="none" fill="#81b5a1"/></symbol></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round" viewBox="0 0 66 59"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><path fill="#81b5a1" stroke="none" d="M32.196 0A32.27 32.27 0 0 0 2.312 20.275 32.27 32.27 0 0 0 9.95 55.571a6.346 6.346 0 0 0 8.264.43 23.03 23.03 0 0 1 27.445 0 6.364 6.364 0 0 0 8.389-.43A32.27 32.27 0 0 0 32.196 0m-.18 48.275a15.63 15.63 0 0 1-16.133-16.026 16.043 16.043 0 1 1 32.069 0c.115 4.284-1.537 8.428-4.568 11.458s-7.174 4.682-11.458 4.568"/></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Set/Set.node.json b/packages/nodes-base/nodes/Set/Set.node.json
index 6710d8cd86c29..d6f5a78a97eab 100644
--- a/packages/nodes-base/nodes/Set/Set.node.json
+++ b/packages/nodes-base/nodes/Set/Set.node.json
@@ -121,7 +121,7 @@
 			}
 		]
 	},
-	"alias": ["JSON", "Filter", "Transform", "Map"],
+	"alias": ["Set", "JS", "JSON", "Filter", "Transform", "Map"],
 	"subcategories": {
 		"Core Nodes": ["Data Transformation"]
 	}
diff --git a/packages/nodes-base/nodes/Set/Set.node.ts b/packages/nodes-base/nodes/Set/Set.node.ts
index e6e0737ee7e94..1a74e8a42cd79 100644
--- a/packages/nodes-base/nodes/Set/Set.node.ts
+++ b/packages/nodes-base/nodes/Set/Set.node.ts
@@ -1,217 +1,29 @@
-import type {
-	IExecuteFunctions,
-	INodeExecutionData,
-	INodeParameters,
-	INodeType,
-	INodeTypeDescription,
-} from 'n8n-workflow';
-import { deepCopy } from 'n8n-workflow';
-
-import set from 'lodash.set';
-
-export class Set implements INodeType {
-	description: INodeTypeDescription = {
-		displayName: 'Set',
-		name: 'set',
-		icon: 'fa:pen',
-		group: ['input'],
-		version: [1, 2],
-		description: 'Sets values on items and optionally remove other values',
-		defaults: {
-			name: 'Set',
-			color: '#0000FF',
-		},
-		inputs: ['main'],
-		outputs: ['main'],
-		properties: [
-			{
-				displayName: 'Keep Only Set',
-				name: 'keepOnlySet',
-				type: 'boolean',
-				default: false,
-				description:
-					'Whether only the values set on this node should be kept and all others removed',
-			},
-			{
-				displayName: 'Values to Set',
-				name: 'values',
-				placeholder: 'Add Value',
-				type: 'fixedCollection',
-				typeOptions: {
-					multipleValues: true,
-					sortable: true,
-				},
-				description: 'The value to set',
-				default: {},
-				options: [
-					{
-						name: 'boolean',
-						displayName: 'Boolean',
-						values: [
-							{
-								displayName: 'Name',
-								name: 'name',
-								type: 'string',
-								requiresDataPath: 'single',
-								default: 'propertyName',
-								description:
-									'Name of the property to write data to. Supports dot-notation. Example: "data.person[0].name"',
-							},
-							{
-								displayName: 'Value',
-								name: 'value',
-								type: 'boolean',
-								default: false,
-								// eslint-disable-next-line n8n-nodes-base/node-param-description-boolean-without-whether
-								description: 'The boolean value to write in the property',
-							},
-						],
-					},
-					{
-						name: 'number',
-						displayName: 'Number',
-						values: [
-							{
-								displayName: 'Name',
-								name: 'name',
-								type: 'string',
-								default: 'propertyName',
-								requiresDataPath: 'single',
-								description:
-									'Name of the property to write data to. Supports dot-notation. Example: "data.person[0].name"',
-							},
-							{
-								displayName: 'Value',
-								name: 'value',
-								type: 'number',
-								default: 0,
-								description: 'The number value to write in the property',
-							},
-						],
-					},
-					{
-						name: 'string',
-						displayName: 'String',
-						values: [
-							{
-								displayName: 'Name',
-								name: 'name',
-								type: 'string',
-								default: 'propertyName',
-								requiresDataPath: 'single',
-								description:
-									'Name of the property to write data to. Supports dot-notation. Example: "data.person[0].name"',
-							},
-							{
-								displayName: 'Value',
-								name: 'value',
-								type: 'string',
-								default: '',
-								description: 'The string value to write in the property',
-							},
-						],
-					},
-				],
-			},
-
-			{
-				displayName: 'Options',
-				name: 'options',
-				type: 'collection',
-				placeholder: 'Add Option',
-				default: {},
-				options: [
-					{
-						displayName: 'Dot Notation',
-						name: 'dotNotation',
-						type: 'boolean',
-						default: true,
-						// eslint-disable-next-line n8n-nodes-base/node-param-description-boolean-without-whether
-						description:
-							'<p>By default, dot-notation is used in property names. This means that "a.b" will set the property "b" underneath "a" so { "a": { "b": value} }.<p></p>If that is not intended this can be deactivated, it will then set { "a.b": value } instead.</p>.',
-					},
-				],
-			},
-		],
-	};
-
-	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
-		const items = this.getInputData();
-		const nodeVersion = this.getNode().typeVersion;
-
-		if (items.length === 0) {
-			items.push({ json: {} });
-		}
-
-		const returnData: INodeExecutionData[] = [];
-
-		let item: INodeExecutionData;
-		let keepOnlySet: boolean;
-		for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
-			keepOnlySet = this.getNodeParameter('keepOnlySet', itemIndex, false) as boolean;
-			item = items[itemIndex];
-			const options = this.getNodeParameter('options', itemIndex, {});
-
-			const newItem: INodeExecutionData = {
-				json: {},
-				pairedItem: item.pairedItem,
-			};
-
-			if (!keepOnlySet) {
-				if (item.binary !== undefined) {
-					// Create a shallow copy of the binary data so that the old
-					// data references which do not get changed still stay behind
-					// but the incoming data does not get changed.
-					newItem.binary = {};
-					Object.assign(newItem.binary, item.binary);
-				}
-
-				newItem.json = deepCopy(item.json);
-			}
-
-			// Add boolean values
-			(this.getNodeParameter('values.boolean', itemIndex, []) as INodeParameters[]).forEach(
-				(setItem) => {
-					if (options.dotNotation === false) {
-						newItem.json[setItem.name as string] = !!setItem.value;
-					} else {
-						set(newItem.json, setItem.name as string, !!setItem.value);
-					}
-				},
-			);
-
-			// Add number values
-			(this.getNodeParameter('values.number', itemIndex, []) as INodeParameters[]).forEach(
-				(setItem) => {
-					if (
-						nodeVersion >= 2 &&
-						typeof setItem.value === 'string' &&
-						!Number.isNaN(Number(setItem.value))
-					) {
-						setItem.value = Number(setItem.value);
-					}
-					if (options.dotNotation === false) {
-						newItem.json[setItem.name as string] = setItem.value;
-					} else {
-						set(newItem.json, setItem.name as string, setItem.value);
-					}
-				},
-			);
-
-			// Add string values
-			(this.getNodeParameter('values.string', itemIndex, []) as INodeParameters[]).forEach(
-				(setItem) => {
-					if (options.dotNotation === false) {
-						newItem.json[setItem.name as string] = setItem.value;
-					} else {
-						set(newItem.json, setItem.name as string, setItem.value);
-					}
-				},
-			);
-
-			returnData.push(newItem);
-		}
-
-		return this.prepareOutputData(returnData);
+import type { INodeTypeBaseDescription, IVersionedNodeType } from 'n8n-workflow';
+import { VersionedNodeType } from 'n8n-workflow';
+
+import { SetV1 } from './v1/SetV1.node';
+import { SetV2 } from './v2/SetV2.node';
+
+export class Set extends VersionedNodeType {
+	constructor() {
+		const baseDescription: INodeTypeBaseDescription = {
+			displayName: 'Set',
+			name: 'set',
+			icon: 'fa:pen',
+			group: ['input'],
+			description: 'Add or edit fields on an input item and optionally remove other fields',
+			defaultVersion: 3.3,
+		};
+
+		const nodeVersions: IVersionedNodeType['nodeVersions'] = {
+			1: new SetV1(baseDescription),
+			2: new SetV1(baseDescription),
+			3: new SetV2(baseDescription),
+			3.1: new SetV2(baseDescription),
+			3.2: new SetV2(baseDescription),
+			3.3: new SetV2(baseDescription),
+		};
+
+		super(nodeVersions, baseDescription);
 	}
 }
diff --git a/packages/nodes-base/nodes/Set/test/Set.node.test.ts b/packages/nodes-base/nodes/Set/test/Set.node.test.ts
index 9c794fa420b99..121a3c0a126fd 100644
--- a/packages/nodes-base/nodes/Set/test/Set.node.test.ts
+++ b/packages/nodes-base/nodes/Set/test/Set.node.test.ts
@@ -1,4 +1,4 @@
-import { testWorkflows, getWorkflowFilenames } from '../../../test/nodes/Helpers';
+import { testWorkflows, getWorkflowFilenames } from '@test/nodes/Helpers';
 const workflows = getWorkflowFilenames(__dirname);
 
 describe('Test Set Node', () => testWorkflows(workflows));
diff --git a/packages/nodes-base/nodes/Set/test/Set.v3.workflow.json b/packages/nodes-base/nodes/Set/test/Set.v3.workflow.json
new file mode 100644
index 0000000000000..a45b4187fc084
--- /dev/null
+++ b/packages/nodes-base/nodes/Set/test/Set.v3.workflow.json
@@ -0,0 +1,786 @@
+{
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "27cc9b56542ad45b38725555722c50a1c3fee1670bbb67980558314ee08517c4"
+	},
+	"nodes": [
+		{
+			"parameters": {
+				"fields": {
+					"values": [
+						{
+							"name": "test",
+							"stringValue": "foo"
+						}
+					]
+				},
+				"include": "none",
+				"options": {}
+			},
+			"id": "d425fb32-2bbc-445d-8fec-0e1288adf6d8",
+			"name": "Keep None",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3,
+			"position": [800, 2680]
+		},
+		{
+			"parameters": {},
+			"id": "82a50bee-4dd1-4bb0-9513-71a54d37b51f",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [160, 1460]
+		},
+		{
+			"parameters": {
+				"jsCode": "return [\n  {\n    \"string\": {\n      test2: \"hello\",\n      test3: \" \",\n      test4: \"\",\n      test5: \"3\",\n      test6: \"3,14\",\n      test7: \"3.14\",\n      test8: \"false\",\n      test8: \"TRUE\",\n      test9: \"false\",\n      test10: \"1\",\n      test11: '[\"apples\", \"oranges\"]',\n      test12: '\"apples\", \"oranges\"',\n      test13: '[1, 2]',\n      test14: '{\"a\": 1, \"b\": { \"c\": 10, \"d\": \"test\"}}',\n      test15: '{\"a\": 1}',\n      test16: \"null\",\n      test17: \"undefined\",\n      test18: \"0\",\n    },\n    \"number\": {\n      test1: 52472,\n      test2: -1,\n      test3: 0,\n      test4: 1.334535,\n      test5: null,\n      test6: undefined,\n      test7: 1,\n    },\n    \"boolean\": {\n      // test1: 1,\n      // test2: 0,\n      test3: true,\n      test4: false,\n    },\n    \"date\": {\n      test1: $now,\n      test2: \"2023-08-01T12:34:56Z\",\n      test3: \"2016-05-25T09:24:15.123\",\n      test4: \"Tue, 01 Nov 2016 13:23:12 +0630\",\n      test5: \"2017-05-15 09:24:15\",\n      test6: \"1542674993\",\n      test7: 1542674993,\n    },\n    \"array\": {\n      test13: [1,2,3,4],\n    },\n    \"object\": {\n      obj: {\n        objKey: 2,\n        objArray: [1,2,3,4],\n        objBool: true\n      }\n    },\n  }\n];"
+			},
+			"id": "70c10657-5d81-46c5-b931-966024d7ce45",
+			"name": "Code1",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [640, 1460]
+		},
+		{
+			"parameters": {
+				"fields": {
+					"values": [
+						{
+							"name": "numberToString1",
+							"stringValue": "={{ $json.number.test1 }}"
+						},
+						{
+							"name": "numberToString2",
+							"stringValue": "={{ $json.number.test2 }}"
+						},
+						{
+							"name": "numberToString3",
+							"stringValue": "={{ $json.number.test4 }}"
+						},
+						{
+							"name": "boolToString1",
+							"stringValue": "={{ $json.boolean.test3 }}"
+						},
+						{
+							"name": "boolToString2",
+							"stringValue": "={{ $json.boolean.test4 }}"
+						},
+						{
+							"name": "arrayToString1",
+							"stringValue": "={{ $json.array.test13 }}"
+						},
+						{
+							"name": "objectToString1",
+							"stringValue": "={{ $json.object.obj }}"
+						}
+					]
+				},
+				"include": "none",
+				"options": {}
+			},
+			"id": "4c53fe8b-f01f-496e-83cd-e89070ed8ced",
+			"name": "To String",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3,
+			"position": [1000, 1080]
+		},
+		{
+			"parameters": {
+				"fields": {
+					"values": [
+						{
+							"name": "stringToNumber1",
+							"type": "numberValue",
+							"numberValue": "={{ $json.string.test5 }}"
+						},
+						{
+							"name": "stringToNumber2",
+							"type": "numberValue",
+							"numberValue": "={{ $json.string.test7 }}"
+						},
+						{
+							"name": "boolToNumber1",
+							"type": "numberValue",
+							"numberValue": "={{ $json.boolean.test3 }}"
+						},
+						{
+							"name": "boolToNumber2",
+							"type": "numberValue",
+							"numberValue": "={{ $json.boolean.test4 }}"
+						}
+					]
+				},
+				"include": "none",
+				"options": {}
+			},
+			"id": "d6c951b9-4b55-46cc-945a-d6f8f82d157a",
+			"name": "To Number",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3,
+			"position": [1000, 1280]
+		},
+		{
+			"parameters": {
+				"fields": {
+					"values": [
+						{
+							"name": "stringToBoolean1",
+							"type": "booleanValue",
+							"booleanValue": "={{ $json.string.test8 }}"
+						},
+						{
+							"name": "stringToBoolean3",
+							"type": "booleanValue",
+							"booleanValue": "={{ $json.string.test9 }}"
+						},
+						{
+							"name": "stringToBoolean4",
+							"type": "booleanValue",
+							"booleanValue": "={{ $json.string.test10 }}"
+						},
+						{
+							"name": "stringToBoolean5",
+							"type": "booleanValue",
+							"booleanValue": "={{ $json.string.test18 }}"
+						},
+						{
+							"name": "numberToBoolean1",
+							"type": "booleanValue",
+							"booleanValue": "={{ $json.number.test3 }}"
+						},
+						{
+							"name": "numberToBoolean2",
+							"type": "booleanValue",
+							"booleanValue": "={{ $json.number.test7 }}"
+						}
+					]
+				},
+				"include": "none",
+				"options": {}
+			},
+			"id": "a1b841e9-c0fc-4c6a-9090-29fb317d506a",
+			"name": "To Boolean",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3,
+			"position": [1000, 1460]
+		},
+		{
+			"parameters": {
+				"fields": {
+					"values": [
+						{
+							"name": "stringToArray1",
+							"type": "arrayValue",
+							"arrayValue": "={{ $json.string.test11 }}"
+						},
+						{
+							"name": "stringToArray2",
+							"type": "arrayValue",
+							"arrayValue": "={{ $json.string.test13 }}"
+						},
+						{
+							"name": "arrayToArray1",
+							"type": "arrayValue",
+							"arrayValue": "={{ $json.array.test13 }}"
+						}
+					]
+				},
+				"include": "none",
+				"options": {}
+			},
+			"id": "7b9d4152-3ded-446d-a5e8-6bf562f077ab",
+			"name": "To Array",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3,
+			"position": [1000, 1660]
+		},
+		{
+			"parameters": {
+				"fields": {
+					"values": [
+						{
+							"name": "stringToObject1",
+							"type": "objectValue",
+							"objectValue": "={{ $json.string.test14 }}"
+						},
+						{
+							"name": "stringToObject2",
+							"type": "objectValue",
+							"objectValue": "={{ $json.string.test15 }}"
+						}
+					]
+				},
+				"include": "none",
+				"options": {}
+			},
+			"id": "f50a1fce-acd8-439e-86f6-ddc39d21490d",
+			"name": "To Object",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3,
+			"position": [1000, 1840]
+		},
+		{
+			"parameters": {
+				"content": "### Strict type checking",
+				"height": 1063.125,
+				"width": 369.6875
+			},
+			"id": "29b19a78-3d26-4582-b7b3-4194b8891e0f",
+			"name": "Sticky Note",
+			"type": "n8n-nodes-base.stickyNote",
+			"typeVersion": 1,
+			"position": [880, 1020]
+		},
+		{
+			"parameters": {
+				"content": "### Loose type checking",
+				"height": 1058.046875,
+				"width": 310.703125
+			},
+			"id": "54a01a58-9d93-49d6-8964-a2a4e6b6e341",
+			"name": "Sticky Note1",
+			"type": "n8n-nodes-base.stickyNote",
+			"typeVersion": 1,
+			"position": [1340, 1020]
+		},
+		{
+			"parameters": {
+				"fields": {
+					"values": [
+						{
+							"name": "stringToNumber1",
+							"type": "numberValue",
+							"numberValue": "={{ $json.string.test2 }}"
+						},
+						{
+							"name": "stringToNumber2",
+							"type": "numberValue",
+							"numberValue": "={{ $json.string.test3 }}"
+						},
+						{
+							"name": "stringToNumber3",
+							"type": "numberValue",
+							"numberValue": "={{ $json.string.test9 }}"
+						},
+						{
+							"name": "arrayToNumber1",
+							"type": "numberValue",
+							"numberValue": "={{ $json.array.test13 }}"
+						}
+					]
+				},
+				"include": "none",
+				"options": {
+					"ignoreConversionErrors": true
+				}
+			},
+			"id": "e28c0f50-7309-428c-99a8-8bacdc6e11a4",
+			"name": "To Number1",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3,
+			"position": [1440, 1080]
+		},
+		{
+			"parameters": {
+				"fields": {
+					"values": [
+						{
+							"name": "stringToBoolean1",
+							"type": "booleanValue",
+							"booleanValue": "={{ $json.string.test5 }}"
+						},
+						{
+							"name": "stringToBoolean2",
+							"type": "booleanValue",
+							"booleanValue": "=3,14"
+						},
+						{
+							"name": "stringToBoolean3",
+							"type": "booleanValue",
+							"booleanValue": "={{ $json.string.test7 }}"
+						},
+						{
+							"name": "stringToBoolean4",
+							"type": "booleanValue",
+							"booleanValue": "={{ $json.string.test11 }}"
+						},
+						{
+							"name": "stringToBoolean5",
+							"type": "booleanValue",
+							"booleanValue": "={{ $json.string.test12 }}"
+						},
+						{
+							"name": "stringToBoolean6",
+							"type": "booleanValue",
+							"booleanValue": "={{ $json.string.test17 }}"
+						},
+						{
+							"name": "numberToBoolean1",
+							"type": "booleanValue",
+							"booleanValue": "={{ $json.number.test1 }}"
+						},
+						{
+							"name": "numberToBoolean2",
+							"type": "booleanValue",
+							"booleanValue": "={{ $json.number.test4 }}"
+						}
+					]
+				},
+				"include": "none",
+				"options": {
+					"ignoreConversionErrors": true
+				}
+			},
+			"id": "ee602441-15de-4b9f-91b7-b96e3ca6eb64",
+			"name": "To Boolean1",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3,
+			"position": [1440, 1280]
+		},
+		{
+			"parameters": {
+				"fields": {
+					"values": [
+						{
+							"name": "stringToArray1",
+							"type": "arrayValue",
+							"arrayValue": "={{ $json.string.test2 }}"
+						},
+						{
+							"name": "stringToArray2",
+							"type": "arrayValue",
+							"arrayValue": "={{ $json.string.test5 }}"
+						}
+					]
+				},
+				"include": "none",
+				"options": {
+					"ignoreConversionErrors": true
+				}
+			},
+			"id": "d2aa68a0-5a23-4f75-9fae-35777cb19ae3",
+			"name": "To Array1",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3,
+			"position": [1440, 1460]
+		},
+		{
+			"parameters": {
+				"fields": {
+					"values": [
+						{
+							"name": "stringToObject1",
+							"type": "objectValue",
+							"objectValue": "={{ $json.string.test14 }}"
+						},
+						{
+							"name": "stringToObject2",
+							"type": "objectValue",
+							"objectValue": "={{ $json.string.test15 }}"
+						}
+					]
+				},
+				"include": "none",
+				"options": {
+					"ignoreConversionErrors": true
+				}
+			},
+			"id": "98250306-4ec5-4ddc-abe4-3a6558ab26fd",
+			"name": "To Object1",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3,
+			"position": [1440, 1660]
+		},
+		{
+			"parameters": {},
+			"id": "7c79bfc1-02ca-43b8-b75f-0c2afcc80187",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [940, 680]
+		},
+		{
+			"parameters": {},
+			"id": "fdf64186-6911-4f0e-8ebd-534eb3b5e28f",
+			"name": "No Operation, do nothing1",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1200, 680]
+		},
+		{
+			"parameters": {
+				"content": "### Keep Input Fields",
+				"height": 752.046875,
+				"width": 310.703125
+			},
+			"id": "c51416d4-e560-4337-ab56-efbf90ead55b",
+			"name": "Sticky Note2",
+			"type": "n8n-nodes-base.stickyNote",
+			"typeVersion": 1,
+			"position": [700, 2120]
+		},
+		{
+			"parameters": {
+				"fields": {
+					"values": [
+						{
+							"name": "test",
+							"stringValue": "foo"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "b1e0a125-adc5-4048-b34f-309f8c752ef4",
+			"name": "Keep All",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3,
+			"position": [800, 2180]
+		},
+		{
+			"parameters": {
+				"fields": {
+					"values": [
+						{
+							"name": "test",
+							"stringValue": "foo"
+						}
+					]
+				},
+				"include": "selected",
+				"includeFields": "name,object",
+				"options": {}
+			},
+			"id": "b47927f2-170f-4b07-8e1d-d29959263772",
+			"name": "Keep Selected",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3,
+			"position": [800, 2340]
+		},
+		{
+			"parameters": {
+				"fields": {
+					"values": [
+						{
+							"name": "test",
+							"stringValue": "foo"
+						}
+					]
+				},
+				"include": "except",
+				"excludeFields": "age,name",
+				"options": {}
+			},
+			"id": "741bd22b-9572-43f9-ada1-0c03d06ec2c7",
+			"name": "Keep All Except",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3,
+			"position": [800, 2500]
+		},
+		{
+			"parameters": {
+				"jsCode": "return [{name: 'John Doe', age: 32, object: {nested: true}}, {name: 'Jane Doe', age: 35, object: {nested: true}}]"
+			},
+			"id": "c120da29-6807-4059-9a2a-13b9032f93cd",
+			"name": "Code",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 2,
+			"position": [480, 2420]
+		}
+	],
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Code1",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Code",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code1": {
+			"main": [
+				[
+					{
+						"node": "To String",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "To Number",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "To Boolean",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "To Array",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "To Object",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"No Operation, do nothing": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing1",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"No Operation, do nothing1": {
+			"main": [
+				[
+					{
+						"node": "To Number1",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "To Boolean1",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "To Array1",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "To Object1",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code": {
+			"main": [
+				[
+					{
+						"node": "Keep All",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Keep Selected",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Keep All Except",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Keep None",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"pinData": {
+		"Keep None": [
+			{
+				"json": { "test": "foo" }
+			},
+			{
+				"json": { "test": "foo" }
+			}
+		],
+		"To String": [
+			{
+				"json": {
+					"numberToString1": "52472",
+					"numberToString2": "-1",
+					"numberToString3": "1.334535",
+					"boolToString1": "true",
+					"boolToString2": "false",
+					"arrayToString1": "[1,2,3,4]",
+					"objectToString1": "{\"objKey\":2,\"objArray\":[1,2,3,4],\"objBool\":true}"
+				}
+			}
+		],
+		"To Number": [
+			{
+				"json": {
+					"stringToNumber1": 3,
+					"stringToNumber2": 3.14,
+					"boolToNumber1": 1,
+					"boolToNumber2": 0
+				}
+			}
+		],
+		"To Boolean": [
+			{
+				"json": {
+					"stringToBoolean1": true,
+					"stringToBoolean3": false,
+					"stringToBoolean4": true,
+					"stringToBoolean5": false,
+					"numberToBoolean1": false,
+					"numberToBoolean2": true
+				}
+			}
+		],
+		"To Array": [
+			{
+				"json": {
+					"stringToArray1": ["apples", "oranges"],
+					"stringToArray2": [1, 2],
+					"arrayToArray1": [1, 2, 3, 4]
+				}
+			}
+		],
+		"To Object": [
+			{
+				"json": {
+					"stringToObject1": {
+						"a": 1,
+						"b": {
+							"c": 10,
+							"d": "test"
+						}
+					},
+					"stringToObject2": {
+						"a": 1
+					}
+				}
+			}
+		],
+		"To Number1": [
+			{
+				"json": {
+					"stringToNumber1": "hello",
+					"stringToNumber2": 0,
+					"stringToNumber3": "false",
+					"arrayToNumber1": [1, 2, 3, 4]
+				}
+			}
+		],
+		"To Boolean1": [
+			{
+				"json": {
+					"stringToBoolean1": "3",
+					"stringToBoolean2": "3,14",
+					"stringToBoolean3": "3.14",
+					"stringToBoolean4": "[\"apples\", \"oranges\"]",
+					"stringToBoolean5": "\"apples\", \"oranges\"",
+					"stringToBoolean6": "undefined",
+					"numberToBoolean1": 52472,
+					"numberToBoolean2": 1.334535
+				}
+			}
+		],
+		"To Array1": [
+			{
+				"json": {
+					"stringToArray1": "hello",
+					"stringToArray2": "3"
+				}
+			}
+		],
+		"To Object1": [
+			{
+				"json": {
+					"stringToObject1": {
+						"a": 1,
+						"b": {
+							"c": 10,
+							"d": "test"
+						}
+					},
+					"stringToObject2": {
+						"a": 1
+					}
+				}
+			}
+		],
+		"Keep All": [
+			{
+				"json": {
+					"name": "John Doe",
+					"age": 32,
+					"object": {
+						"nested": true
+					},
+					"test": "foo"
+				}
+			},
+			{
+				"json": {
+					"name": "Jane Doe",
+					"age": 35,
+					"object": {
+						"nested": true
+					},
+					"test": "foo"
+				}
+			}
+		],
+		"Keep Selected": [
+			{
+				"json": {
+					"name": "John Doe",
+					"object": {
+						"nested": true
+					},
+					"test": "foo"
+				}
+			},
+			{
+				"json": {
+					"name": "Jane Doe",
+					"object": {
+						"nested": true
+					},
+					"test": "foo"
+				}
+			}
+		],
+		"Keep All Except": [
+			{
+				"json": {
+					"object": {
+						"nested": true
+					},
+					"test": "foo"
+				}
+			},
+			{
+				"json": {
+					"object": {
+						"nested": true
+					},
+					"test": "foo"
+				}
+			}
+		]
+	}
+}
diff --git a/packages/nodes-base/nodes/Set/test/Set.v3_3.workflow.json b/packages/nodes-base/nodes/Set/test/Set.v3_3.workflow.json
new file mode 100644
index 0000000000000..b7f1ff9d40861
--- /dev/null
+++ b/packages/nodes-base/nodes/Set/test/Set.v3_3.workflow.json
@@ -0,0 +1,806 @@
+{
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "27cc9b56542ad45b38725555722c50a1c3fee1670bbb67980558314ee08517c4"
+	},
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "487e9636-56d5-4955-9193-17dee520bdd0",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [160, 4240]
+		},
+		{
+			"parameters": {
+				"jsCode": "return [\n  {\n    \"string\": {\n      test2: \"hello\",\n      test3: \" \",\n      test4: \"\",\n      test5: \"3\",\n      test6: \"3,14\",\n      test7: \"3.14\",\n      test8: \"false\",\n      test8: \"TRUE\",\n      test9: \"false\",\n      test10: \"1\",\n      test11: '[\"apples\", \"oranges\"]',\n      test12: '\"apples\", \"oranges\"',\n      test13: '[1, 2]',\n      test14: '{\"a\": 1, \"b\": { \"c\": 10, \"d\": \"test\"}}',\n      test15: '{\"a\": 1}',\n      test16: \"null\",\n      test17: \"undefined\",\n      test18: \"0\",\n    },\n    \"number\": {\n      test1: 52472,\n      test2: -1,\n      test3: 0,\n      test4: 1.334535,\n      test5: null,\n      test6: undefined,\n      test7: 1,\n    },\n    \"boolean\": {\n      // test1: 1,\n      // test2: 0,\n      test3: true,\n      test4: false,\n    },\n    \"date\": {\n      test1: $now,\n      test2: \"2023-08-01T12:34:56Z\",\n      test3: \"2016-05-25T09:24:15.123\",\n      test4: \"Tue, 01 Nov 2016 13:23:12 +0630\",\n      test5: \"2017-05-15 09:24:15\",\n      test6: \"1542674993\",\n      test7: 1542674993,\n    },\n    \"array\": {\n      test13: [1,2,3,4],\n    },\n    \"object\": {\n      obj: {\n        objKey: 2,\n        objArray: [1,2,3,4],\n        objBool: true\n      }\n    },\n  }\n];"
+			},
+			"id": "8afc51b7-f9ed-417a-a58b-2fe251ba4b93",
+			"name": "Code1",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [420, 4240]
+		},
+		{
+			"parameters": {
+				"assignments": {
+					"assignments": [
+						{
+							"id": "1",
+							"name": "numberToString1",
+							"type": "string",
+							"value": "={{ $json.number.test1 }}"
+						},
+						{
+							"id": "2",
+							"name": "numberToString2",
+							"type": "string",
+							"value": "={{ $json.number.test2 }}"
+						},
+						{
+							"id": "3",
+							"name": "numberToString3",
+							"type": "string",
+							"value": "={{ $json.number.test4 }}"
+						},
+						{
+							"id": "1",
+							"name": "boolToString1",
+							"type": "string",
+							"value": "={{ $json.boolean.test3 }}"
+						},
+						{
+							"id": "4",
+							"name": "boolToString2",
+							"type": "string",
+							"value": "={{ $json.boolean.test4 }}"
+						},
+						{
+							"id": "5",
+							"name": "arrayToString1",
+							"type": "string",
+							"value": "={{ $json.array.test13 }}"
+						},
+						{
+							"id": "6",
+							"name": "objectToString1",
+							"type": "string",
+							"value": "={{ $json.object.obj }}"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "8ede737c-5648-4c8e-82b7-fa5193d8ff92",
+			"name": "To String",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.3,
+			"position": [780, 3860]
+		},
+		{
+			"parameters": {
+				"assignments": {
+					"assignments": [
+						{
+							"id": "1",
+							"name": "stringToNumber1",
+							"type": "number",
+							"value": "={{ $json.string.test5 }}"
+						},
+						{
+							"id": "2",
+							"name": "stringToNumber2",
+							"type": "number",
+							"value": "={{ $json.string.test7 }}"
+						},
+						{
+							"id": "3",
+							"name": "boolToNumber1",
+							"type": "number",
+							"value": "={{ $json.boolean.test3 }}"
+						},
+						{
+							"id": "4",
+							"name": "boolToNumber2",
+							"type": "number",
+							"value": "={{ $json.boolean.test4 }}"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "064976c4-b13d-4e2e-9a07-bab165b0efd7",
+			"name": "To Number",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.3,
+			"position": [780, 4060]
+		},
+		{
+			"parameters": {
+				"assignments": {
+					"assignments": [
+						{
+							"id": "1",
+							"name": "stringToBoolean1",
+							"type": "boolean",
+							"value": "={{ $json.string.test8 }}"
+						},
+						{
+							"id": "2",
+							"name": "stringToBoolean3",
+							"type": "boolean",
+							"value": "={{ $json.string.test9 }}"
+						},
+						{
+							"id": "3",
+							"name": "stringToBoolean4",
+							"type": "boolean",
+							"value": "={{ $json.string.test10 }}"
+						},
+						{
+							"id": "4",
+							"name": "stringToBoolean5",
+							"type": "boolean",
+							"value": "={{ $json.string.test18 }}"
+						},
+						{
+							"id": "5",
+							"name": "numberToBoolean1",
+							"type": "boolean",
+							"value": "={{ $json.number.test3 }}"
+						},
+						{
+							"id": "6",
+							"name": "numberToBoolean2",
+							"type": "boolean",
+							"value": "={{ $json.number.test7 }}"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "dfcdddde-cf89-44c5-94e7-f11e1f7e1a58",
+			"name": "To Boolean",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.3,
+			"position": [780, 4240]
+		},
+		{
+			"parameters": {
+				"assignments": {
+					"assignments": [
+						{
+							"id": "1",
+							"name": "stringToArray1",
+							"type": "array",
+							"value": "={{ $json.string.test11 }}"
+						},
+						{
+							"id": "2",
+							"name": "stringToArray2",
+							"type": "array",
+							"value": "={{ $json.string.test13 }}"
+						},
+						{
+							"id": "3",
+							"name": "arrayToArray1",
+							"type": "array",
+							"value": "={{ $json.array.test13 }}"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "7ea149df-c231-40fc-a95c-c062860896e6",
+			"name": "To Array",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.3,
+			"position": [780, 4440]
+		},
+		{
+			"parameters": {
+				"assignments": {
+					"assignments": [
+						{
+							"id": "1",
+							"name": "stringToObject1",
+							"type": "object",
+							"value": "={{ $json.string.test14 }}"
+						},
+						{
+							"id": "2",
+							"name": "stringToObject2",
+							"type": "object",
+							"value": "={{ $json.string.test15 }}"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "c775efa3-2508-466d-93b9-51d4c5ca9eca",
+			"name": "To Object",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.3,
+			"position": [780, 4620]
+		},
+		{
+			"parameters": {
+				"content": "### Strict type checking",
+				"height": 1063.125,
+				"width": 369.6875
+			},
+			"id": "d646183a-b6ea-48e5-99cc-a4be39959558",
+			"name": "Sticky Note",
+			"type": "n8n-nodes-base.stickyNote",
+			"typeVersion": 1,
+			"position": [700, 3800]
+		},
+		{
+			"parameters": {
+				"content": "### Loose type checking",
+				"height": 1058.046875,
+				"width": 310.703125
+			},
+			"id": "cb382bde-1cba-4019-a45a-b50fbeb2f8ac",
+			"name": "Sticky Note1",
+			"type": "n8n-nodes-base.stickyNote",
+			"typeVersion": 1,
+			"position": [1180, 3804.375]
+		},
+		{
+			"parameters": {
+				"assignments": {
+					"assignments": [
+						{
+							"id": "1",
+							"name": "stringToNumber1",
+							"type": "number",
+							"value": "={{ $json.string.test2 }}"
+						},
+						{
+							"id": "2",
+							"name": "stringToNumber2",
+							"type": "number",
+							"value": "={{ $json.string.test3 }}"
+						},
+						{
+							"id": "3",
+							"name": "stringToNumber3",
+							"type": "number",
+							"value": "={{ $json.string.test9 }}"
+						},
+						{
+							"id": "4",
+							"name": "arrayToNumber1",
+							"type": "number",
+							"value": "={{ $json.array.test13 }}"
+						}
+					]
+				},
+				"options": {
+					"ignoreConversionErrors": true
+				}
+			},
+			"id": "d9c91c3d-de1e-430e-acb2-c832d1b41b21",
+			"name": "To Number1",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.3,
+			"position": [1220, 3860]
+		},
+		{
+			"parameters": {
+				"assignments": {
+					"assignments": [
+						{
+							"id": "1",
+							"name": "stringToBoolean1",
+							"type": "boolean",
+							"value": "={{ $json.string.test5 }}"
+						},
+						{
+							"id": "2",
+							"name": "stringToBoolean2",
+							"type": "boolean",
+							"value": "=3,14"
+						},
+						{
+							"id": "3",
+							"name": "stringToBoolean3",
+							"type": "boolean",
+							"value": "={{ $json.string.test7 }}"
+						},
+						{
+							"id": "4",
+							"name": "stringToBoolean4",
+							"type": "boolean",
+							"value": "={{ $json.string.test11 }}"
+						},
+						{
+							"id": "5",
+							"name": "stringToBoolean5",
+							"type": "boolean",
+							"value": "={{ $json.string.test12 }}"
+						},
+						{
+							"id": "6",
+							"name": "stringToBoolean6",
+							"type": "boolean",
+							"value": "={{ $json.string.test17 }}"
+						},
+						{
+							"id": "7",
+							"name": "numberToBoolean1",
+							"type": "boolean",
+							"value": "={{ $json.number.test1 }}"
+						},
+						{
+							"id": "8",
+							"name": "numberToBoolean2",
+							"type": "boolean",
+							"value": "={{ $json.number.test4 }}"
+						}
+					]
+				},
+				"options": {
+					"ignoreConversionErrors": true
+				}
+			},
+			"id": "2a62319a-9850-4aed-ba83-f7e1fae233d6",
+			"name": "To Boolean1",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.3,
+			"position": [1220, 4060]
+		},
+		{
+			"parameters": {
+				"assignments": {
+					"assignments": [
+						{
+							"id": "1",
+							"name": "stringToArray1",
+							"type": "array",
+							"value": "={{ $json.string.test2 }}"
+						},
+						{
+							"id": "2",
+							"name": "stringToArray2",
+							"type": "array",
+							"value": "={{ $json.string.test5 }}"
+						}
+					]
+				},
+				"options": {
+					"ignoreConversionErrors": true
+				}
+			},
+			"id": "72275d21-9a12-4030-98b9-4a8ef37e0158",
+			"name": "To Array1",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.3,
+			"position": [1220, 4240]
+		},
+		{
+			"parameters": {
+				"assignments": {
+					"assignments": [
+						{
+							"id": "1",
+							"name": "stringToObject1",
+							"type": "object",
+							"value": "={{ $json.string.test14 }}"
+						},
+						{
+							"id": "2",
+							"name": "stringToObject2",
+							"type": "object",
+							"value": "={{ $json.string.test15 }}"
+						}
+					]
+				},
+				"options": {
+					"ignoreConversionErrors": true
+				}
+			},
+			"id": "c6b117f1-44b9-41ef-ad26-b8c77e37ed9e",
+			"name": "To Object1",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.3,
+			"position": [1220, 4440]
+		},
+		{
+			"parameters": {},
+			"id": "8e3ce059-9c1a-4490-b5a8-6cfb22e43632",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [720, 3460]
+		},
+		{
+			"parameters": {},
+			"id": "e581a88a-900e-4d9a-9dcd-6a4b6e30c39a",
+			"name": "No Operation, do nothing1",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [980, 3460]
+		},
+		{
+			"parameters": {
+				"content": "### Keep Input Fields",
+				"height": 752.046875,
+				"width": 310.703125
+			},
+			"id": "e03d8297-9eed-4679-9a8a-fc3e004ec0c7",
+			"name": "Sticky Note2",
+			"type": "n8n-nodes-base.stickyNote",
+			"typeVersion": 1,
+			"position": [700, 4940]
+		},
+		{
+			"parameters": {
+				"assignments": {
+					"assignments": [
+						{
+							"id": "c42efef4-240d-42b8-baf7-f9edc10a25ba",
+							"name": "test",
+							"value": "foo",
+							"type": "string"
+						}
+					]
+				},
+				"includeOtherFields": true,
+				"options": {}
+			},
+			"id": "cf0799c0-cf07-43f9-89ce-0d218f13f23f",
+			"name": "Keep All",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.3,
+			"position": [800, 5000]
+		},
+		{
+			"parameters": {
+				"assignments": {
+					"assignments": [
+						{
+							"id": "ae431a73-282b-4547-b82a-f491ca244ad2",
+							"name": "test",
+							"value": "foo",
+							"type": "string"
+						}
+					]
+				},
+				"includeOtherFields": true,
+				"include": "selected",
+				"includeFields": "object, age",
+				"options": {}
+			},
+			"id": "90575fc8-502c-4a22-ba27-bcf13a73e71a",
+			"name": "Keep Selected",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.3,
+			"position": [800, 5160]
+		},
+		{
+			"parameters": {
+				"assignments": {
+					"assignments": [
+						{
+							"id": "a1d28431-fd8e-4360-baec-f390515d57fd",
+							"name": "test",
+							"value": "foo",
+							"type": "string"
+						}
+					]
+				},
+				"includeOtherFields": true,
+				"include": "except",
+				"excludeFields": "age",
+				"options": {}
+			},
+			"id": "731be3d3-b08f-4e13-9f67-badae737d581",
+			"name": "Keep All Except",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.3,
+			"position": [800, 5320]
+		},
+		{
+			"parameters": {
+				"assignments": {
+					"assignments": [
+						{
+							"id": "23c2d8eb-7326-43ae-80b0-e651611f5f43",
+							"name": "test",
+							"value": "foo",
+							"type": "string"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "f310db17-beb9-436c-99ec-e0fa1deea94d",
+			"name": "Keep None",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.3,
+			"position": [800, 5500]
+		},
+		{
+			"parameters": {
+				"jsCode": "return [{name: 'John Doe', age: 32, object: {nested: true}}, {name: 'Jane Doe', age: 35, object: {nested: true}}]"
+			},
+			"id": "7f9a81c4-5207-493f-bf48-9e52e4c350c6",
+			"name": "Code",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 2,
+			"position": [480, 5240]
+		}
+	],
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Code1",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Code",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code1": {
+			"main": [
+				[
+					{
+						"node": "To String",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "To Number",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "To Boolean",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "To Array",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "To Object",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"No Operation, do nothing": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing1",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"No Operation, do nothing1": {
+			"main": [
+				[
+					{
+						"node": "To Number1",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "To Boolean1",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "To Array1",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "To Object1",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code": {
+			"main": [
+				[
+					{
+						"node": "Keep All",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Keep Selected",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Keep All Except",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Keep None",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"pinData": {
+		"To String": [
+			{
+				"json": {
+					"numberToString1": "52472",
+					"numberToString2": "-1",
+					"numberToString3": "1.334535",
+					"boolToString1": "true",
+					"boolToString2": "false",
+					"arrayToString1": "[1,2,3,4]",
+					"objectToString1": "{\"objKey\":2,\"objArray\":[1,2,3,4],\"objBool\":true}"
+				}
+			}
+		],
+		"To Number": [
+			{
+				"json": {
+					"stringToNumber1": 3,
+					"stringToNumber2": 3.14,
+					"boolToNumber1": 1,
+					"boolToNumber2": 0
+				}
+			}
+		],
+		"To Boolean": [
+			{
+				"json": {
+					"stringToBoolean1": true,
+					"stringToBoolean3": false,
+					"stringToBoolean4": true,
+					"stringToBoolean5": false,
+					"numberToBoolean1": false,
+					"numberToBoolean2": true
+				}
+			}
+		],
+		"To Array": [
+			{
+				"json": {
+					"stringToArray1": ["apples", "oranges"],
+					"stringToArray2": [1, 2],
+					"arrayToArray1": [1, 2, 3, 4]
+				}
+			}
+		],
+		"To Object": [
+			{
+				"json": {
+					"stringToObject1": {
+						"a": 1,
+						"b": {
+							"c": 10,
+							"d": "test"
+						}
+					},
+					"stringToObject2": {
+						"a": 1
+					}
+				}
+			}
+		],
+		"To Number1": [
+			{
+				"json": {
+					"stringToNumber1": "hello",
+					"stringToNumber2": 0,
+					"stringToNumber3": "false",
+					"arrayToNumber1": [1, 2, 3, 4]
+				}
+			}
+		],
+		"To Boolean1": [
+			{
+				"json": {
+					"stringToBoolean1": "3",
+					"stringToBoolean2": "3,14",
+					"stringToBoolean3": "3.14",
+					"stringToBoolean4": "[\"apples\", \"oranges\"]",
+					"stringToBoolean5": "\"apples\", \"oranges\"",
+					"stringToBoolean6": "undefined",
+					"numberToBoolean1": 52472,
+					"numberToBoolean2": 1.334535
+				}
+			}
+		],
+		"To Array1": [
+			{
+				"json": {
+					"stringToArray1": "hello",
+					"stringToArray2": "3"
+				}
+			}
+		],
+		"To Object1": [
+			{
+				"json": {
+					"stringToObject1": {
+						"a": 1,
+						"b": {
+							"c": 10,
+							"d": "test"
+						}
+					},
+					"stringToObject2": {
+						"a": 1
+					}
+				}
+			}
+		],
+		"Keep All": [
+			{
+				"json": {
+					"name": "John Doe",
+					"age": 32,
+					"object": {
+						"nested": true
+					},
+					"test": "foo"
+				}
+			},
+			{
+				"json": {
+					"name": "Jane Doe",
+					"age": 35,
+					"object": {
+						"nested": true
+					},
+					"test": "foo"
+				}
+			}
+		],
+		"Keep Selected": [
+			{
+				"json": {
+					"object": {
+						"nested": true
+					},
+					"age": 32,
+					"test": "foo"
+				}
+			},
+			{
+				"json": {
+					"object": {
+						"nested": true
+					},
+					"age": 35,
+					"test": "foo"
+				}
+			}
+		]
+	}
+}
diff --git a/packages/nodes-base/nodes/Set/test/Set.workflow.null_values.json b/packages/nodes-base/nodes/Set/test/Set.workflow.null_values.json
new file mode 100644
index 0000000000000..a95f04f0a7ee9
--- /dev/null
+++ b/packages/nodes-base/nodes/Set/test/Set.workflow.null_values.json
@@ -0,0 +1,244 @@
+{
+  "name": "My workflow 31",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "9fe8b524-b618-4abb-821f-227ae5cc1f12",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        560,
+        640
+      ]
+    },
+    {
+      "parameters": {
+        "fields": {
+          "values": [
+            {
+              "name": "test1",
+              "stringValue": "={{ null }}"
+            },
+            {
+              "name": "test2",
+              "stringValue": "={{ undefined }}"
+            }
+          ]
+        },
+        "options": {
+          "ignoreConversionErrors": true
+        }
+      },
+      "id": "78f2ad0d-e129-448b-ae78-5bfdba587186",
+      "name": "Edit Fields",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.2,
+      "position": [
+        1000,
+        240
+      ]
+    },
+    {
+      "parameters": {
+        "fields": {
+          "values": [
+            {
+              "name": "test1",
+              "type": "numberValue",
+              "numberValue": "={{ null }}"
+            },
+            {
+              "name": "test2",
+              "type": "numberValue",
+              "numberValue": "={{ undefined }}"
+            }
+          ]
+        },
+        "options": {
+          "ignoreConversionErrors": true
+        }
+      },
+      "id": "ceaad5a1-b78c-4d38-b80d-f608f8c95f71",
+      "name": "Edit Fields1",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.2,
+      "position": [
+        1000,
+        440
+      ]
+    },
+    {
+      "parameters": {
+        "fields": {
+          "values": [
+            {
+              "name": "test1",
+              "type": "booleanValue",
+              "booleanValue": "={{ null }}"
+            },
+            {
+              "name": "test2",
+              "type": "booleanValue",
+              "booleanValue": "={{ undefined }}"
+            }
+          ]
+        },
+        "options": {
+          "ignoreConversionErrors": true
+        }
+      },
+      "id": "0048be99-0bce-4073-86e6-2622169fe9ab",
+      "name": "Edit Fields2",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.2,
+      "position": [
+        1000,
+        640
+      ]
+    },
+    {
+      "parameters": {
+        "fields": {
+          "values": [
+            {
+              "name": "test1",
+              "type": "arrayValue",
+              "arrayValue": "={{ null }}"
+            },
+            {
+              "name": "test2",
+              "type": "arrayValue",
+              "arrayValue": "={{ undefined }}"
+            }
+          ]
+        },
+        "options": {
+          "ignoreConversionErrors": true
+        }
+      },
+      "id": "aa254a34-9267-42a2-9730-c2ab64760721",
+      "name": "Edit Fields3",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.2,
+      "position": [
+        1000,
+        840
+      ]
+    },
+    {
+      "parameters": {
+        "fields": {
+          "values": [
+            {
+              "name": "test1",
+              "type": "objectValue",
+              "objectValue": "={{ null }}"
+            },
+            {
+              "name": "test2",
+              "type": "objectValue",
+              "objectValue": "={{ undefined }}"
+            }
+          ]
+        },
+        "options": {
+          "ignoreConversionErrors": true
+        }
+      },
+      "id": "03e4acf2-ceaf-4a27-adb7-d074a95e9cc9",
+      "name": "Edit Fields4",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.2,
+      "position": [
+        1000,
+        1020
+      ]
+    }
+  ],
+  "pinData": {
+    "Edit Fields": [
+      {
+        "json": {
+          "test1": null,
+          "test2": null
+        }
+      }
+    ],
+    "Edit Fields1": [
+      {
+        "json": {
+          "test1": null,
+          "test2": null
+        }
+      }
+    ],
+    "Edit Fields2": [
+      {
+        "json": {
+          "test1": null,
+          "test2": null
+        }
+      }
+    ],
+    "Edit Fields3": [
+      {
+        "json": {
+          "test1": null,
+          "test2": null
+        }
+      }
+    ],
+    "Edit Fields4": [
+      {
+        "json": {
+          "test1": null,
+          "test2": null
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Edit Fields",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Edit Fields1",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Edit Fields2",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Edit Fields3",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Edit Fields4",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "016f70db-c529-43e9-a077-2e0d81859747",
+  "id": "ZfMuVQ1861mlPIKe",
+  "meta": {
+    "instanceId": "b888bd11cd1ddbb95450babf3e199556799d999b896f650de768b8370ee50363"
+  },
+  "tags": []
+}
diff --git a/packages/nodes-base/nodes/Set/test/v2/utils.test.ts b/packages/nodes-base/nodes/Set/test/v2/utils.test.ts
new file mode 100644
index 0000000000000..06d8d10aa50a3
--- /dev/null
+++ b/packages/nodes-base/nodes/Set/test/v2/utils.test.ts
@@ -0,0 +1,227 @@
+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 type { SetNodeOptions } from '../../v2/helpers/interfaces';
+
+export const node: INode = {
+	id: '11',
+	name: 'Edit Fields',
+	type: 'n8n-nodes-base.set',
+	typeVersion: 3,
+	position: [42, 42],
+	parameters: {
+		mode: 'manual',
+		fields: {
+			values: [],
+		},
+		include: 'none',
+		options: {},
+	},
+};
+
+export const createMockExecuteFunction = (nodeParameters: IDataObject) => {
+	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: () => false,
+	} as unknown as IExecuteFunctions;
+	return fakeExecuteFunction;
+};
+
+describe('test Set2, composeReturnItem', () => {
+	it('should compose return item including no other fields', () => {
+		const fakeExecuteFunction = createMockExecuteFunction({});
+
+		const inputItem = {
+			json: {
+				input1: 'value1',
+				input2: 2,
+				input3: [1, 2, 3],
+			},
+			pairedItem: {
+				item: 0,
+				input: undefined,
+			},
+		};
+
+		const newData = {
+			num1: 55,
+			str1: '42',
+			arr1: ['foo', 'bar'],
+			obj: {
+				key: 'value',
+			},
+		};
+
+		const options: SetNodeOptions = {
+			include: 'none',
+		};
+
+		const result = composeReturnItem.call(fakeExecuteFunction, 0, inputItem, newData, options);
+
+		expect(result).toEqual({
+			json: {
+				num1: 55,
+				str1: '42',
+				arr1: ['foo', 'bar'],
+				obj: {
+					key: 'value',
+				},
+			},
+			pairedItem: {
+				item: 0,
+			},
+		});
+	});
+
+	it('should compose return item including selected fields', () => {
+		const fakeExecuteFunction = createMockExecuteFunction({ includeFields: 'input1, input2' });
+
+		const inputItem = {
+			json: {
+				input1: 'value1',
+				input2: 2,
+				input3: [1, 2, 3],
+			},
+			pairedItem: {
+				item: 0,
+				input: undefined,
+			},
+		};
+
+		const newData = {
+			num1: 55,
+			str1: '42',
+			arr1: ['foo', 'bar'],
+			obj: {
+				key: 'value',
+			},
+		};
+
+		const options: SetNodeOptions = {
+			include: 'selected',
+		};
+
+		const result = composeReturnItem.call(fakeExecuteFunction, 0, inputItem, newData, options);
+
+		expect(result).toEqual({
+			json: {
+				num1: 55,
+				str1: '42',
+				arr1: ['foo', 'bar'],
+				input1: 'value1',
+				input2: 2,
+				obj: {
+					key: 'value',
+				},
+			},
+			pairedItem: {
+				item: 0,
+			},
+		});
+	});
+});
+
+describe('test Set2, parseJsonParameter', () => {
+	it('should parse valid JSON string', () => {
+		const result = parseJsonParameter('{"foo": "bar"}', node, 0, 'test');
+
+		expect(result).toEqual({
+			foo: 'bar',
+		});
+	});
+
+	it('should tolerate single quotes in string', () => {
+		const result = parseJsonParameter("{'foo': 'bar'}", node, 0, 'test');
+
+		expect(result).toEqual({
+			foo: 'bar',
+		});
+	});
+
+	it('should tolerate unquoted keys', () => {
+		const result = parseJsonParameter("{foo: 'bar'}", node, 0, 'test');
+
+		expect(result).toEqual({
+			foo: 'bar',
+		});
+	});
+
+	it('should tolerate trailing comma', () => {
+		const result = parseJsonParameter('{"foo": "bar"},', node, 0, 'test');
+
+		expect(result).toEqual({
+			foo: 'bar',
+		});
+	});
+
+	it('should tolerate trailing commas in objects', () => {
+		const result = parseJsonParameter("{foo: 'bar', baz: {'foo': 'bar',}, }", node, 0, 'test');
+
+		expect(result).toEqual({
+			foo: 'bar',
+			baz: {
+				foo: 'bar',
+			},
+		});
+	});
+});
+
+describe('test Set2, validateEntry', () => {
+	it('should convert number to string', () => {
+		const result = validateEntry('foo', 'string', 42 as unknown as string, node, 0);
+
+		expect(result).toEqual({
+			name: 'foo',
+			value: '42',
+		});
+	});
+
+	it('should convert array to string', () => {
+		const result = validateEntry('foo', 'string', [1, 2, 3] as unknown as string, node, 0);
+
+		expect(result).toEqual({
+			name: 'foo',
+			value: '[1,2,3]',
+		});
+	});
+
+	it('should convert object to string', () => {
+		const result = validateEntry('foo', 'string', { foo: 'bar' } as unknown as string, node, 0);
+
+		expect(result).toEqual({
+			name: 'foo',
+			value: '{"foo":"bar"}',
+		});
+	});
+
+	it('should convert boolean to string', () => {
+		const result = validateEntry('foo', 'string', true as unknown as string, node, 0);
+
+		expect(result).toEqual({
+			name: 'foo',
+			value: 'true',
+		});
+	});
+
+	it('should convert undefined to string', () => {
+		const result = validateEntry('foo', 'string', undefined as unknown as string, node, 0);
+
+		expect(result).toEqual({
+			name: 'foo',
+			value: 'undefined',
+		});
+	});
+});
diff --git a/packages/nodes-base/nodes/Set/v1/SetV1.node.ts b/packages/nodes-base/nodes/Set/v1/SetV1.node.ts
new file mode 100644
index 0000000000000..b505b62451b58
--- /dev/null
+++ b/packages/nodes-base/nodes/Set/v1/SetV1.node.ts
@@ -0,0 +1,227 @@
+/* eslint-disable n8n-nodes-base/node-filename-against-convention */
+import type {
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeParameters,
+	INodeType,
+	INodeTypeBaseDescription,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+import { deepCopy } from 'n8n-workflow';
+
+import set from 'lodash/set';
+
+const versionDescription: INodeTypeDescription = {
+	displayName: 'Set',
+	name: 'set',
+	icon: 'fa:pen',
+	group: ['input'],
+	version: [1, 2],
+	description: 'Sets values on items and optionally remove other values',
+	defaults: {
+		name: 'Set',
+		color: '#0000FF',
+	},
+	inputs: ['main'],
+	outputs: ['main'],
+	properties: [
+		{
+			displayName: 'Keep Only Set',
+			name: 'keepOnlySet',
+			type: 'boolean',
+			default: false,
+			description: 'Whether only the values set on this node should be kept and all others removed',
+		},
+		{
+			displayName: 'Values to Set',
+			name: 'values',
+			placeholder: 'Add Value',
+			type: 'fixedCollection',
+			typeOptions: {
+				multipleValues: true,
+				sortable: true,
+			},
+			description: 'The value to set',
+			default: {},
+			options: [
+				{
+					name: 'boolean',
+					displayName: 'Boolean',
+					values: [
+						{
+							displayName: 'Name',
+							name: 'name',
+							type: 'string',
+							requiresDataPath: 'single',
+							default: 'propertyName',
+							description:
+								'Name of the property to write data to. Supports dot-notation. Example: "data.person[0].name"',
+						},
+						{
+							displayName: 'Value',
+							name: 'value',
+							type: 'boolean',
+							default: false,
+							// eslint-disable-next-line n8n-nodes-base/node-param-description-boolean-without-whether
+							description: 'The boolean value to write in the property',
+						},
+					],
+				},
+				{
+					name: 'number',
+					displayName: 'Number',
+					values: [
+						{
+							displayName: 'Name',
+							name: 'name',
+							type: 'string',
+							default: 'propertyName',
+							requiresDataPath: 'single',
+							description:
+								'Name of the property to write data to. Supports dot-notation. Example: "data.person[0].name"',
+						},
+						{
+							displayName: 'Value',
+							name: 'value',
+							type: 'number',
+							default: 0,
+							description: 'The number value to write in the property',
+						},
+					],
+				},
+				{
+					name: 'string',
+					displayName: 'String',
+					values: [
+						{
+							displayName: 'Name',
+							name: 'name',
+							type: 'string',
+							default: 'propertyName',
+							requiresDataPath: 'single',
+							description:
+								'Name of the property to write data to. Supports dot-notation. Example: "data.person[0].name"',
+						},
+						{
+							displayName: 'Value',
+							name: 'value',
+							type: 'string',
+							default: '',
+							description: 'The string value to write in the property',
+						},
+					],
+				},
+			],
+		},
+
+		{
+			displayName: 'Options',
+			name: 'options',
+			type: 'collection',
+			placeholder: 'Add Option',
+			default: {},
+			options: [
+				{
+					displayName: 'Dot Notation',
+					name: 'dotNotation',
+					type: 'boolean',
+					default: true,
+					// eslint-disable-next-line n8n-nodes-base/node-param-description-boolean-without-whether
+					description:
+						'<p>By default, dot-notation is used in property names. This means that "a.b" will set the property "b" underneath "a" so { "a": { "b": value} }.<p></p>If that is not intended this can be deactivated, it will then set { "a.b": value } instead.</p>.',
+				},
+			],
+		},
+	],
+};
+
+export class SetV1 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			...versionDescription,
+		};
+	}
+
+	async execute(this: IExecuteFunctions) {
+		const items = this.getInputData();
+		const nodeVersion = this.getNode().typeVersion;
+
+		if (items.length === 0) {
+			items.push({ json: {}, pairedItem: { item: 0 } });
+		}
+
+		const returnData: INodeExecutionData[] = [];
+
+		let item: INodeExecutionData;
+		let keepOnlySet: boolean;
+		for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
+			keepOnlySet = this.getNodeParameter('keepOnlySet', itemIndex, false) as boolean;
+			item = items[itemIndex];
+			const options = this.getNodeParameter('options', itemIndex, {});
+
+			const newItem: INodeExecutionData = {
+				json: {},
+				pairedItem: { item: itemIndex },
+			};
+
+			if (!keepOnlySet) {
+				if (item.binary !== undefined) {
+					// Create a shallow copy of the binary data so that the old
+					// data references which do not get changed still stay behind
+					// but the incoming data does not get changed.
+					newItem.binary = {};
+					Object.assign(newItem.binary, item.binary);
+				}
+
+				newItem.json = deepCopy(item.json);
+			}
+
+			// Add boolean values
+			(this.getNodeParameter('values.boolean', itemIndex, []) as INodeParameters[]).forEach(
+				(setItem) => {
+					if (options.dotNotation === false) {
+						newItem.json[setItem.name as string] = !!setItem.value;
+					} else {
+						set(newItem.json, setItem.name as string, !!setItem.value);
+					}
+				},
+			);
+
+			// Add number values
+			(this.getNodeParameter('values.number', itemIndex, []) as INodeParameters[]).forEach(
+				(setItem) => {
+					if (
+						nodeVersion >= 2 &&
+						typeof setItem.value === 'string' &&
+						!Number.isNaN(Number(setItem.value))
+					) {
+						setItem.value = Number(setItem.value);
+					}
+					if (options.dotNotation === false) {
+						newItem.json[setItem.name as string] = setItem.value;
+					} else {
+						set(newItem.json, setItem.name as string, setItem.value);
+					}
+				},
+			);
+
+			// Add string values
+			(this.getNodeParameter('values.string', itemIndex, []) as INodeParameters[]).forEach(
+				(setItem) => {
+					if (options.dotNotation === false) {
+						newItem.json[setItem.name as string] = setItem.value;
+					} else {
+						set(newItem.json, setItem.name as string, setItem.value);
+					}
+				},
+			);
+
+			returnData.push(newItem);
+		}
+
+		return [returnData];
+	}
+}
diff --git a/packages/nodes-base/nodes/Set/v2/SetV2.node.ts b/packages/nodes-base/nodes/Set/v2/SetV2.node.ts
new file mode 100644
index 0000000000000..41cc4a2f337d2
--- /dev/null
+++ b/packages/nodes-base/nodes/Set/v2/SetV2.node.ts
@@ -0,0 +1,315 @@
+/* eslint-disable n8n-nodes-base/node-filename-against-convention */
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeBaseDescription,
+	INodeTypeDescription,
+} 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';
+
+type Mode = 'manual' | 'raw';
+
+const versionDescription: INodeTypeDescription = {
+	displayName: 'Edit Fields (Set)',
+	name: 'set',
+	icon: 'fa:pen',
+	group: ['input'],
+	version: [3, 3.1, 3.2, 3.3],
+	description: 'Modify, add, or remove item fields',
+	subtitle: '={{$parameter["mode"]}}',
+	defaults: {
+		name: 'Edit Fields',
+		color: '#0000FF',
+	},
+	inputs: ['main'],
+	outputs: ['main'],
+	properties: [
+		{
+			displayName: 'Mode',
+			name: 'mode',
+			type: 'options',
+			noDataExpression: true,
+			options: [
+				{
+					name: 'Manual Mapping',
+					value: 'manual',
+					description: 'Edit item fields one by one',
+					action: 'Edit item fields one by one',
+				},
+				{
+					name: 'JSON',
+					value: 'raw',
+					description: 'Customize item output with JSON',
+					action: 'Customize item output with JSON',
+				},
+			],
+			default: 'manual',
+		},
+		{
+			displayName: 'Duplicate Item',
+			name: 'duplicateItem',
+			type: 'boolean',
+			default: false,
+			isNodeSetting: true,
+		},
+		{
+			displayName: 'Duplicate Item Count',
+			name: 'duplicateCount',
+			type: 'number',
+			default: 0,
+			typeOptions: {
+				minValue: 0,
+			},
+			description:
+				'How many times the item should be duplicated, mainly used for testing and debugging',
+			isNodeSetting: true,
+			displayOptions: {
+				show: {
+					duplicateItem: [true],
+				},
+			},
+		},
+		{
+			displayName:
+				'Item duplication is set in the node settings. This option will be ignored when the workflow runs automatically.',
+			name: 'duplicateWarning',
+			type: 'notice',
+			default: '',
+			displayOptions: {
+				show: {
+					duplicateItem: [true],
+				},
+			},
+		},
+		...raw.description,
+		...manual.description,
+		{
+			displayName: 'Include in Output',
+			name: 'include',
+			type: 'options',
+			description: 'How to select the fields you want to include in your output items',
+			default: 'all',
+			displayOptions: {
+				show: {
+					'@version': [3, 3.1, 3.2],
+				},
+			},
+			options: [
+				{
+					name: 'All Input Fields',
+					value: INCLUDE.ALL,
+					description: 'Also include all unchanged fields from the input',
+				},
+				{
+					name: 'No Input Fields',
+					value: INCLUDE.NONE,
+					description: 'Include only the fields specified above',
+				},
+				{
+					name: 'Selected Input Fields',
+					value: INCLUDE.SELECTED,
+					description: 'Also include the fields listed in the parameter “Fields to Include”',
+				},
+				{
+					name: 'All Input Fields Except',
+					value: INCLUDE.EXCEPT,
+					description: 'Exclude the fields listed in the parameter “Fields to Exclude”',
+				},
+			],
+		},
+		{
+			displayName: 'Include Other Input Fields',
+			name: 'includeOtherFields',
+			type: 'boolean',
+			default: false,
+			description:
+				"Whether to pass to the output all the input fields (along with the fields set in 'Fields to Set')",
+			displayOptions: {
+				hide: {
+					'@version': [3, 3.1, 3.2],
+				},
+			},
+		},
+		{
+			displayName: 'Input Fields to Include',
+			name: 'include',
+			type: 'options',
+			description: 'How to select the fields you want to include in your output items',
+			default: 'all',
+			displayOptions: {
+				hide: {
+					'@version': [3, 3.1, 3.2],
+					'/includeOtherFields': [false],
+				},
+			},
+			options: [
+				{
+					name: 'All',
+					value: INCLUDE.ALL,
+					description: 'Also include all unchanged fields from the input',
+				},
+				{
+					name: 'Selected',
+					value: INCLUDE.SELECTED,
+					description: 'Also include the fields listed in the parameter “Fields to Include”',
+				},
+				{
+					name: 'All Except',
+					value: INCLUDE.EXCEPT,
+					description: 'Exclude the fields listed in the parameter “Fields to Exclude”',
+				},
+			],
+		},
+		{
+			displayName: 'Fields to Include',
+			name: 'includeFields',
+			type: 'string',
+			default: '',
+			placeholder: 'e.g. fieldToInclude1,fieldToInclude2',
+			description:
+				'Comma-separated list of the field names you want to include in the output. You can drag the selected fields from the input panel.',
+			requiresDataPath: 'multiple',
+			displayOptions: {
+				show: {
+					include: ['selected'],
+				},
+			},
+		},
+		{
+			displayName: 'Fields to Exclude',
+			name: 'excludeFields',
+			type: 'string',
+			default: '',
+			placeholder: 'e.g. fieldToExclude1,fieldToExclude2',
+			description:
+				'Comma-separated list of the field names you want to exclude from the output. You can drag the selected fields from the input panel.',
+			requiresDataPath: 'multiple',
+			displayOptions: {
+				show: {
+					include: ['except'],
+				},
+			},
+		},
+		{
+			displayName: 'Options',
+			name: 'options',
+			type: 'collection',
+			placeholder: 'Add Option',
+			default: {},
+			options: [
+				{
+					displayName: 'Include Binary File',
+					name: 'includeBinary',
+					type: 'boolean',
+					default: true,
+					description: 'Whether binary data should be included if present in the input item',
+				},
+				{
+					displayName: 'Ignore Type Conversion Errors',
+					name: 'ignoreConversionErrors',
+					type: 'boolean',
+					default: false,
+					description:
+						'Whether to ignore field type errors and apply a less strict type conversion',
+					displayOptions: {
+						show: {
+							'/mode': ['manual'],
+						},
+					},
+				},
+				{
+					displayName: 'Support Dot Notation',
+					name: 'dotNotation',
+					type: 'boolean',
+					default: true,
+					// eslint-disable-next-line n8n-nodes-base/node-param-description-boolean-without-whether
+					description:
+						'By default, dot-notation is used in property names. This means that "a.b" will set the property "b" underneath "a" so { "a": { "b": value} }. If that is not intended this can be deactivated, it will then set { "a.b": value } instead.',
+				},
+			],
+		},
+	],
+};
+
+export class SetV2 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			...versionDescription,
+		};
+	}
+
+	async execute(this: IExecuteFunctions) {
+		const items = this.getInputData();
+		const mode = this.getNodeParameter('mode', 0) as Mode;
+		const duplicateItem = this.getNodeParameter('duplicateItem', 0, false) as boolean;
+
+		const setNode = { raw, manual };
+
+		const returnData: INodeExecutionData[] = [];
+
+		const rawData: IDataObject = {};
+
+		if (mode === 'raw') {
+			const jsonOutput = this.getNodeParameter('jsonOutput', 0, '', {
+				rawExpressions: true,
+			}) as string | undefined;
+
+			if (jsonOutput?.startsWith('=')) {
+				rawData.jsonOutput = jsonOutput.replace(/^=+/, '');
+			}
+		} else {
+			const workflowFieldsJson = this.getNodeParameter('fields.values', 0, [], {
+				rawExpressions: true,
+			}) as SetField[];
+
+			for (const entry of workflowFieldsJson) {
+				if (entry.type === 'objectValue' && (entry.objectValue as string).startsWith('=')) {
+					rawData[entry.name] = (entry.objectValue as string).replace(/^=+/, '');
+				}
+			}
+		}
+
+		for (let i = 0; i < items.length; i++) {
+			const includeOtherFields = this.getNodeParameter('includeOtherFields', i, false) as boolean;
+			const include = this.getNodeParameter('include', i, 'all') as IncludeMods;
+			const options = this.getNodeParameter('options', i, {});
+			const node = this.getNode();
+
+			if (node.typeVersion >= 3.3) {
+				options.include = includeOtherFields ? include : 'none';
+			} else {
+				options.include = include;
+			}
+
+			const newItem = await setNode[mode].execute.call(
+				this,
+				items[i],
+				i,
+				options as SetNodeOptions,
+				rawData,
+				node,
+			);
+
+			if (duplicateItem && this.getMode() === 'manual') {
+				const duplicateCount = this.getNodeParameter('duplicateCount', 0, 0) as number;
+				for (let j = 0; j <= duplicateCount; j++) {
+					returnData.push(newItem);
+				}
+			} else {
+				returnData.push(newItem);
+			}
+		}
+
+		return [returnData];
+	}
+}
diff --git a/packages/nodes-base/nodes/Set/v2/helpers/interfaces.ts b/packages/nodes-base/nodes/Set/v2/helpers/interfaces.ts
new file mode 100644
index 0000000000000..67ae19383544a
--- /dev/null
+++ b/packages/nodes-base/nodes/Set/v2/helpers/interfaces.ts
@@ -0,0 +1,33 @@
+import type { IDataObject } from 'n8n-workflow';
+
+export type SetNodeOptions = {
+	dotNotation?: boolean;
+	ignoreConversionErrors?: boolean;
+	include?: IncludeMods;
+	includeBinary?: boolean;
+};
+
+export type SetField = {
+	name: string;
+	type: 'stringValue' | 'numberValue' | 'booleanValue' | 'arrayValue' | 'objectValue';
+	stringValue?: string;
+	numberValue?: number;
+	booleanValue?: boolean;
+	arrayValue?: string[] | string | IDataObject | IDataObject[];
+	objectValue?: string | IDataObject;
+};
+
+export type AssignmentSetField = {
+	name: string;
+	value: unknown;
+	type: string;
+};
+
+export const INCLUDE = {
+	ALL: 'all',
+	NONE: 'none',
+	SELECTED: 'selected',
+	EXCEPT: 'except',
+} as const;
+
+export type IncludeMods = (typeof INCLUDE)[keyof typeof INCLUDE];
diff --git a/packages/nodes-base/nodes/Set/v2/helpers/utils.ts b/packages/nodes-base/nodes/Set/v2/helpers/utils.ts
new file mode 100644
index 0000000000000..c60989f238bc5
--- /dev/null
+++ b/packages/nodes-base/nodes/Set/v2/helpers/utils.ts
@@ -0,0 +1,235 @@
+import type {
+	FieldType,
+	IDataObject,
+	IExecuteFunctions,
+	INode,
+	INodeExecutionData,
+	ValidationResult,
+} from 'n8n-workflow';
+import {
+	ApplicationError,
+	NodeOperationError,
+	deepCopy,
+	jsonParse,
+	validateFieldType,
+} from 'n8n-workflow';
+
+import get from 'lodash/get';
+import set from 'lodash/set';
+import unset from 'lodash/unset';
+
+import { getResolvables, sanitazeDataPathKey } from '../../../../utils/utilities';
+import type { SetNodeOptions } from './interfaces';
+import { INCLUDE } from './interfaces';
+
+const configureFieldHelper = (dotNotation?: boolean) => {
+	if (dotNotation !== false) {
+		return {
+			set: (item: IDataObject, key: string, value: IDataObject) => {
+				set(item, key, value);
+			},
+			get: (item: IDataObject, key: string) => {
+				return get(item, key);
+			},
+			unset: (item: IDataObject, key: string) => {
+				unset(item, key);
+			},
+		};
+	} else {
+		return {
+			set: (item: IDataObject, key: string, value: IDataObject) => {
+				item[sanitazeDataPathKey(item, key)] = value;
+			},
+			get: (item: IDataObject, key: string) => {
+				return item[sanitazeDataPathKey(item, key)];
+			},
+			unset: (item: IDataObject, key: string) => {
+				delete item[sanitazeDataPathKey(item, key)];
+			},
+		};
+	}
+};
+
+export function composeReturnItem(
+	this: IExecuteFunctions,
+	itemIndex: number,
+	inputItem: INodeExecutionData,
+	newFields: IDataObject,
+	options: SetNodeOptions,
+) {
+	const newItem: INodeExecutionData = {
+		json: {},
+		pairedItem: { item: itemIndex },
+	};
+
+	if (options.includeBinary && inputItem.binary !== undefined) {
+		// Create a shallow copy of the binary data so that the old
+		// data references which do not get changed still stay behind
+		// but the incoming data does not get changed.
+		newItem.binary = {};
+		Object.assign(newItem.binary, inputItem.binary);
+	}
+
+	const fieldHelper = configureFieldHelper(options.dotNotation);
+
+	switch (options.include) {
+		case INCLUDE.ALL:
+			newItem.json = deepCopy(inputItem.json);
+			break;
+		case INCLUDE.SELECTED:
+			const includeFields = (this.getNodeParameter('includeFields', itemIndex) as string)
+				.split(',')
+				.map((item) => item.trim())
+				.filter((item) => item);
+
+			for (const key of includeFields) {
+				const fieldValue = fieldHelper.get(inputItem.json, key) as IDataObject;
+				let keyToSet = key;
+				if (options.dotNotation !== false && key.includes('.')) {
+					keyToSet = key.split('.').pop() as string;
+				}
+				fieldHelper.set(newItem.json, keyToSet, fieldValue);
+			}
+			break;
+		case INCLUDE.EXCEPT:
+			const excludeFields = (this.getNodeParameter('excludeFields', itemIndex) as string)
+				.split(',')
+				.map((item) => item.trim())
+				.filter((item) => item);
+
+			const inputData = deepCopy(inputItem.json);
+
+			for (const key of excludeFields) {
+				fieldHelper.unset(inputData, key);
+			}
+
+			newItem.json = inputData;
+			break;
+		case INCLUDE.NONE:
+			break;
+		default:
+			throw new ApplicationError(`The include option "${options.include}" is not known!`, {
+				level: 'warning',
+			});
+	}
+
+	for (const key of Object.keys(newFields)) {
+		fieldHelper.set(newItem.json, key, newFields[key] as IDataObject);
+	}
+
+	return newItem;
+}
+
+export const parseJsonParameter = (
+	jsonData: string | IDataObject,
+	node: INode,
+	i: number,
+	entryName?: string,
+) => {
+	let returnData: IDataObject;
+	const location = entryName ? `entry "${entryName}" inside 'Fields to Set'` : "'JSON Output'";
+
+	if (typeof jsonData === 'string') {
+		try {
+			returnData = jsonParse<IDataObject>(jsonData);
+		} catch (error) {
+			let recoveredData = '';
+			try {
+				recoveredData = jsonData
+					.replace(/'/g, '"') // Replace single quotes with double quotes
+					.replace(/(['"])?([a-zA-Z0-9_]+)(['"])?:/g, '"$2":') // Wrap keys in double quotes
+					.replace(/,\s*([\]}])/g, '$1') // Remove trailing commas from objects
+					.replace(/,+$/, ''); // Remove trailing comma
+				returnData = jsonParse<IDataObject>(recoveredData);
+			} catch (err) {
+				const description =
+					recoveredData === jsonData ? jsonData : `${recoveredData};\n Original input: ${jsonData}`;
+				throw new NodeOperationError(node, `The ${location} in item ${i} contains invalid JSON`, {
+					description,
+				});
+			}
+		}
+	} else {
+		returnData = jsonData;
+	}
+
+	if (returnData === undefined || typeof returnData !== 'object' || Array.isArray(returnData)) {
+		throw new NodeOperationError(
+			node,
+			`The ${location} in item ${i} does not contain a valid JSON object`,
+		);
+	}
+
+	return returnData;
+};
+
+export const validateEntry = (
+	name: string,
+	type: FieldType,
+	value: unknown,
+	node: INode,
+	itemIndex: number,
+	ignoreErrors = false,
+	nodeVersion?: number,
+) => {
+	if (nodeVersion && nodeVersion >= 3.2 && (value === undefined || value === null)) {
+		return { name, value: null };
+	}
+
+	const description = `To fix the error try to change the type for the field "${name}" or activate the option “Ignore Type Conversion Errors” to apply a less strict type validation`;
+
+	if (type === 'string') {
+		if (nodeVersion && nodeVersion > 3 && (value === undefined || value === null)) {
+			if (ignoreErrors) {
+				return { name, value: null };
+			} else {
+				throw new NodeOperationError(
+					node,
+					`'${name}' expects a ${type} but we got '${String(value)}' [item ${itemIndex}]`,
+					{ description },
+				);
+			}
+		} else if (typeof value === 'object') {
+			value = JSON.stringify(value);
+		} else {
+			value = String(value);
+		}
+	}
+
+	const validationResult = validateFieldType(name, value, type);
+
+	if (!validationResult.valid) {
+		if (ignoreErrors) {
+			validationResult.newValue = value as ValidationResult['newValue'];
+		} else {
+			const message = `${validationResult.errorMessage} [item ${itemIndex}]`;
+			throw new NodeOperationError(node, message, {
+				itemIndex,
+				description,
+			});
+		}
+	}
+
+	return {
+		name,
+		value: validationResult.newValue === undefined ? null : validationResult.newValue,
+	};
+};
+
+export function resolveRawData(this: IExecuteFunctions, rawData: string, i: number) {
+	const resolvables = getResolvables(rawData);
+	let returnData: string = rawData;
+
+	if (resolvables.length) {
+		for (const resolvable of resolvables) {
+			const resolvedValue = this.evaluateExpression(`${resolvable}`, i);
+
+			if (typeof resolvedValue === 'object' && resolvedValue !== null) {
+				returnData = returnData.replace(resolvable, JSON.stringify(resolvedValue));
+			} else {
+				returnData = returnData.replace(resolvable, resolvedValue as string);
+			}
+		}
+	}
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/Set/v2/manual.mode.ts b/packages/nodes-base/nodes/Set/v2/manual.mode.ts
new file mode 100644
index 0000000000000..a02d5b5cb3b5c
--- /dev/null
+++ b/packages/nodes-base/nodes/Set/v2/manual.mode.ts
@@ -0,0 +1,260 @@
+import type {
+	AssignmentCollectionValue,
+	FieldType,
+	IDataObject,
+	IExecuteFunctions,
+	INode,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+import { NodeOperationError } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '../../../utils/utilities';
+import {
+	parseJsonParameter,
+	validateEntry,
+	composeReturnItem,
+	resolveRawData,
+} from './helpers/utils';
+import type { SetField, SetNodeOptions } from './helpers/interfaces';
+
+const properties: INodeProperties[] = [
+	{
+		displayName: 'Fields to Set',
+		name: 'fields',
+		placeholder: 'Add Field',
+		type: 'fixedCollection',
+		description: 'Edit existing fields or add new ones to modify the output data',
+		displayOptions: {
+			show: {
+				'@version': [3, 3.1, 3.2],
+			},
+		},
+		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,
+					},
+				],
+			},
+		],
+	},
+	{
+		displayName: 'Fields to Set',
+		name: 'assignments',
+		type: 'assignmentCollection',
+		displayOptions: {
+			hide: {
+				'@version': [3, 3.1, 3.2],
+			},
+		},
+		default: {},
+	},
+];
+
+const displayOptions = {
+	show: {
+		mode: ['manual'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	item: INodeExecutionData,
+	i: number,
+	options: SetNodeOptions,
+	rawFieldsData: IDataObject,
+	node: INode,
+) {
+	try {
+		if (node.typeVersion < 3.3) {
+			const fields = this.getNodeParameter('fields.values', i, []) as SetField[];
+
+			const newData: IDataObject = {};
+
+			for (const entry of fields) {
+				if (
+					entry.type === 'objectValue' &&
+					rawFieldsData[entry.name] !== undefined &&
+					entry.objectValue !== undefined &&
+					entry.objectValue !== null
+				) {
+					entry.objectValue = parseJsonParameter(
+						resolveRawData.call(this, rawFieldsData[entry.name] as string, i),
+						node,
+						i,
+						entry.name,
+					);
+				}
+
+				const { name, value } = validateEntry(
+					entry.name,
+					entry.type.replace('Value', '') as FieldType,
+					entry[entry.type],
+					node,
+					i,
+					options.ignoreConversionErrors,
+					node.typeVersion,
+				);
+				newData[name] = value;
+			}
+
+			return composeReturnItem.call(this, i, item, newData, options);
+		}
+
+		const assignmentCollection = this.getNodeParameter(
+			'assignments',
+			i,
+		) as AssignmentCollectionValue;
+		const newData = Object.fromEntries(
+			(assignmentCollection?.assignments ?? []).map((assignment) => {
+				const { name, value } = validateEntry(
+					assignment.name,
+					assignment.type as FieldType,
+					assignment.value,
+					node,
+					i,
+					options.ignoreConversionErrors,
+					node.typeVersion,
+				);
+
+				return [name, value];
+			}),
+		);
+		return composeReturnItem.call(this, i, item, newData, options);
+	} catch (error) {
+		if (this.continueOnFail()) {
+			return { json: { error: (error as Error).message, pairedItem: { item: i } } };
+		}
+		throw new NodeOperationError(this.getNode(), error as Error, {
+			itemIndex: i,
+			description: error.description,
+		});
+	}
+}
diff --git a/packages/nodes-base/nodes/Set/v2/raw.mode.ts b/packages/nodes-base/nodes/Set/v2/raw.mode.ts
new file mode 100644
index 0000000000000..1ffc1f2b877e6
--- /dev/null
+++ b/packages/nodes-base/nodes/Set/v2/raw.mode.ts
@@ -0,0 +1,67 @@
+import type {
+	INodeExecutionData,
+	IExecuteFunctions,
+	INodeProperties,
+	IDataObject,
+	INode,
+} 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';
+
+const properties: INodeProperties[] = [
+	{
+		displayName: 'JSON',
+		name: 'jsonOutput',
+		type: 'json',
+		typeOptions: {
+			rows: 5,
+		},
+		default: '{\n  "my_field_1": "value",\n  "my_field_2": 1\n}\n',
+		validateType: 'object',
+		ignoreValidationDuringExecution: true,
+	},
+];
+
+const displayOptions = {
+	show: {
+		mode: ['raw'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	item: INodeExecutionData,
+	i: number,
+	options: SetNodeOptions,
+	rawData: IDataObject,
+	node: INode,
+) {
+	try {
+		let newData: IDataObject;
+		if (rawData.jsonOutput === undefined) {
+			const json = this.getNodeParameter('jsonOutput', i) as string;
+			newData = parseJsonParameter(json, node, i);
+		} else {
+			newData = parseJsonParameter(
+				resolveRawData.call(this, rawData.jsonOutput as string, i),
+				node,
+				i,
+			);
+		}
+
+		return composeReturnItem.call(this, i, item, newData, options);
+	} catch (error) {
+		if (this.continueOnFail()) {
+			return { json: { error: (error as Error).message }, pairedItem: { item: i } };
+		}
+		throw new NodeOperationError(node, error as Error, {
+			itemIndex: i,
+			description: error.description,
+		});
+	}
+}
diff --git a/packages/nodes-base/nodes/Shopify/GenericFunctions.ts b/packages/nodes-base/nodes/Shopify/GenericFunctions.ts
index d10f9d74b95b8..d2d1852ad6d8c 100644
--- a/packages/nodes-base/nodes/Shopify/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Shopify/GenericFunctions.ts
@@ -1,19 +1,18 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	IOAuth2Options,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 
 import { snakeCase } from 'change-case';
 
 export async function shopifyApiRequest(
-	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -36,7 +35,7 @@ export async function shopifyApiRequest(
 		credentials = await this.getCredentials('shopifyOAuth2Api');
 	}
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		method,
 		qs: query,
 		uri: uri || `https://${credentials.shopSubdomain}.myshopify.com/admin/api/2019-10${resource}`,
@@ -65,7 +64,21 @@ export async function shopifyApiRequest(
 		delete options.qs;
 	}
 
-	return this.helpers.requestWithAuthentication.call(this, credentialType, options, {
+	// Only limit and fields are allowed for page_info links
+	// https://shopify.dev/docs/api/usage/pagination-rest#limitations-and-considerations
+	if (uri && uri.includes('page_info')) {
+		options.qs = {};
+
+		if (query.limit) {
+			options.qs.limit = query.limit;
+		}
+
+		if (query.fields) {
+			options.qs.fields = query.fields;
+		}
+	}
+
+	return await this.helpers.requestWithAuthentication.call(this, credentialType, options, {
 		oauth2: oAuth2Options,
 	});
 }
@@ -73,7 +86,7 @@ export async function shopifyApiRequest(
 export async function shopifyApiRequestAllItems(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
diff --git a/packages/nodes-base/nodes/Shopify/Shopify.node.ts b/packages/nodes-base/nodes/Shopify/Shopify.node.ts
index 077a0fcebf171..2baf13662a486 100644
--- a/packages/nodes-base/nodes/Shopify/Shopify.node.ts
+++ b/packages/nodes-base/nodes/Shopify/Shopify.node.ts
@@ -470,6 +470,6 @@ export class Shopify implements INodeType {
 				throw error;
 			}
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Shopify/ShopifyTrigger.node.ts b/packages/nodes-base/nodes/Shopify/ShopifyTrigger.node.ts
index 3fef89e3a56fa..c640e7c9f8e85 100644
--- a/packages/nodes-base/nodes/Shopify/ShopifyTrigger.node.ts
+++ b/packages/nodes-base/nodes/Shopify/ShopifyTrigger.node.ts
@@ -1,3 +1,4 @@
+import { createHmac } from 'crypto';
 import type {
 	IHookFunctions,
 	IWebhookFunctions,
@@ -9,8 +10,6 @@ import type {
 
 import { shopifyApiRequest } from './GenericFunctions';
 
-import { createHmac } from 'crypto';
-
 export class ShopifyTrigger implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Shopify Trigger',
diff --git a/packages/nodes-base/nodes/Shopify/shopify.svg b/packages/nodes-base/nodes/Shopify/shopify.svg
index bf03ea877823e..48dfc778b5563 100644
--- a/packages/nodes-base/nodes/Shopify/shopify.svg
+++ b/packages/nodes-base/nodes/Shopify/shopify.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 58 66" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><g stroke="none" fill-rule="nonzero"><path d="M49.255 12.484a.633.633 0 00-.564-.527c-.225-.037-5.17-.376-5.17-.376l-3.77-3.77c-.34-.376-1.092-.266-1.376-.188-.037 0-.752.225-1.922.605-1.137-3.3-3.15-6.306-6.696-6.306h-.303C28.438.605 27.194 0 26.144 0c-8.256.037-12.2 10.333-13.434 15.594l-5.77 1.77c-1.77.564-1.835.605-2.073 2.293L0 57.175 36.468 64l19.763-4.26c0-.037-6.94-46.897-6.976-47.255zM34.431 8.86c-.917.303-1.963.605-3.1.945v-.68a15.03 15.03 0 00-.752-4.999c1.848.284 3.1 2.357 3.843 4.733zm-6.068-4.298c.603 1.778.883 3.65.826 5.527v.34l-6.375 1.963c1.248-4.66 3.55-6.962 5.55-7.83zm-2.45-2.293a1.94 1.94 0 011.055.339c-2.66 1.238-5.472 4.366-6.678 10.627l-5.045 1.546C16.668 10.03 19.988 2.26 25.91 2.26z" fill="#95bf47"/><path d="M48.691 11.957c-.225-.037-5.17-.376-5.17-.376l-3.77-3.77a.753.753 0 00-.527-.225L36.472 64l19.763-4.26-6.98-47.218a.68.68 0 00-.564-.564z" fill="#5e8e3e"/><path d="M29.758 22.9l-2.454 7.242a11.36 11.36 0 00-4.752-1.133c-3.848 0-4.036 2.412-4.036 3.018 0 3.298 8.636 4.564 8.636 12.333 0 6.1-3.885 10.03-9.1 10.03-6.26 0-9.467-3.885-9.467-3.885l1.665-5.55s3.28 2.83 6.073 2.83a2.47 2.47 0 002.564-2.49c0-4.34-7.1-4.527-7.1-11.618 0-5.962 4.298-11.77 12.934-11.77 3.394.05 5.018 1 5.018 1z"/></g></symbol></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round" viewBox="0 0 58 66"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><g fill-rule="nonzero" stroke="none"><path fill="#95bf47" d="M49.255 12.484a.63.63 0 0 0-.564-.527c-.225-.037-5.17-.376-5.17-.376l-3.77-3.77c-.34-.376-1.092-.266-1.376-.188-.037 0-.752.225-1.922.605-1.137-3.3-3.15-6.306-6.696-6.306h-.303C28.438.605 27.194 0 26.144 0c-8.256.037-12.2 10.333-13.434 15.594l-5.77 1.77c-1.77.564-1.835.605-2.073 2.293L0 57.175 36.468 64l19.763-4.26c0-.037-6.94-46.897-6.976-47.255zM34.431 8.86c-.917.303-1.963.605-3.1.945v-.68a15 15 0 0 0-.752-4.999c1.848.284 3.1 2.357 3.843 4.733zm-6.068-4.298c.603 1.778.883 3.65.826 5.527v.34l-6.375 1.963c1.248-4.66 3.55-6.962 5.55-7.83zm-2.45-2.293a1.94 1.94 0 0 1 1.055.339c-2.66 1.238-5.472 4.366-6.678 10.627l-5.045 1.546C16.668 10.03 19.988 2.26 25.91 2.26z"/><path fill="#5e8e3e" d="M48.691 11.957c-.225-.037-5.17-.376-5.17-.376l-3.77-3.77a.75.75 0 0 0-.527-.225L36.472 64l19.763-4.26-6.98-47.218a.68.68 0 0 0-.564-.564z"/><path d="m29.758 22.9-2.454 7.242a11.4 11.4 0 0 0-4.752-1.133c-3.848 0-4.036 2.412-4.036 3.018 0 3.298 8.636 4.564 8.636 12.333 0 6.1-3.885 10.03-9.1 10.03-6.26 0-9.467-3.885-9.467-3.885l1.665-5.55s3.28 2.83 6.073 2.83a2.47 2.47 0 0 0 2.564-2.49c0-4.34-7.1-4.527-7.1-11.618 0-5.962 4.298-11.77 12.934-11.77 3.394.05 5.018 1 5.018 1z"/></g></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Signl4/GenericFunctions.ts b/packages/nodes-base/nodes/Signl4/GenericFunctions.ts
index 198ace3caf1ad..8ad84c272cf5d 100644
--- a/packages/nodes-base/nodes/Signl4/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Signl4/GenericFunctions.ts
@@ -1,8 +1,12 @@
-import type { IExecuteFunctions, IDataObject, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IDataObject,
+	JsonObject,
+	IRequestOptions,
+	IHttpRequestMethods,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import type { OptionsWithUri } from 'request';
-
 /**
  * Make an API request to SIGNL4
  *
@@ -12,7 +16,7 @@ import type { OptionsWithUri } from 'request';
 
 export async function SIGNL4ApiRequest(
 	this: IExecuteFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	body: string,
 	query: IDataObject = {},
 	option: IDataObject = {},
@@ -21,7 +25,7 @@ export async function SIGNL4ApiRequest(
 
 	const teamSecret = credentials?.teamSecret as string;
 
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		headers: {
 			Accept: '*/*',
 		},
diff --git a/packages/nodes-base/nodes/Simulate/Simulate.node.json b/packages/nodes-base/nodes/Simulate/Simulate.node.json
new file mode 100644
index 0000000000000..a7374513750a7
--- /dev/null
+++ b/packages/nodes-base/nodes/Simulate/Simulate.node.json
@@ -0,0 +1,11 @@
+{
+	"node": "n8n-nodes-base.simulate",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"categories": ["Core Nodes"],
+	"resources": {},
+	"alias": ["placeholder", "stub", "dummy"],
+	"subcategories": {
+		"Core Nodes": ["Helpers"]
+	}
+}
diff --git a/packages/nodes-base/nodes/Simulate/Simulate.node.ts b/packages/nodes-base/nodes/Simulate/Simulate.node.ts
new file mode 100644
index 0000000000000..c91154347f52c
--- /dev/null
+++ b/packages/nodes-base/nodes/Simulate/Simulate.node.ts
@@ -0,0 +1,131 @@
+import { sleep, jsonParse, NodeOperationError } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+	IDataObject,
+} from 'n8n-workflow';
+
+import { loadOptions } from './methods';
+import {
+	executionDurationProperty,
+	iconSelector,
+	jsonOutputProperty,
+	subtitleProperty,
+} from './descriptions';
+
+export class Simulate implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Simulate',
+		hidden: true,
+		name: 'simulate',
+		group: ['organization'],
+		version: 1,
+		description: 'Simulate a node',
+		subtitle: '={{$parameter.subtitle || undefined}}',
+		icon: 'fa:arrow-right',
+		defaults: {
+			name: 'Simulate',
+			color: '#b0b0b0',
+		},
+		inputs: ['main'],
+		outputs: ['main'],
+		properties: [
+			iconSelector,
+			subtitleProperty,
+			{
+				displayName: 'Output',
+				name: 'output',
+				type: 'options',
+				default: 'all',
+				noDataExpression: true,
+				options: [
+					{
+						// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+						name: 'Returns all input items',
+						value: 'all',
+					},
+					{
+						// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+						name: 'Specify how many of input items to return',
+						value: 'specify',
+					},
+					{
+						// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+						name: 'Specify output as JSON',
+						value: 'custom',
+					},
+				],
+			},
+			{
+				displayName: 'Number of Items',
+				name: 'numberOfItems',
+				type: 'number',
+				default: 1,
+				description:
+					'Number input of items to return, if greater then input length all items will be returned',
+				displayOptions: {
+					show: {
+						output: ['specify'],
+					},
+				},
+				typeOptions: {
+					minValue: 1,
+				},
+			},
+			{
+				...jsonOutputProperty,
+				displayOptions: {
+					show: {
+						output: ['custom'],
+					},
+				},
+			},
+			executionDurationProperty,
+		],
+	};
+
+	methods = { loadOptions };
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = this.getInputData();
+		let returnItems: INodeExecutionData[] = [];
+
+		const output = this.getNodeParameter('output', 0) as string;
+
+		if (output === 'all') {
+			returnItems = items;
+		} else if (output === 'specify') {
+			const numberOfItems = this.getNodeParameter('numberOfItems', 0) as number;
+
+			returnItems = items.slice(0, numberOfItems);
+		} else if (output === 'custom') {
+			let jsonOutput = this.getNodeParameter('jsonOutput', 0);
+
+			if (typeof jsonOutput === 'string') {
+				try {
+					jsonOutput = jsonParse<IDataObject>(jsonOutput);
+				} catch (error) {
+					throw new NodeOperationError(this.getNode(), 'Invalid JSON');
+				}
+			}
+
+			if (!Array.isArray(jsonOutput)) {
+				jsonOutput = [jsonOutput];
+			}
+
+			for (const item of jsonOutput as IDataObject[]) {
+				returnItems.push({ json: item });
+			}
+		}
+
+		const executionDuration = this.getNodeParameter('executionDuration', 0) as number;
+
+		if (executionDuration > 0) {
+			await sleep(executionDuration);
+		}
+
+		return [returnItems];
+	}
+}
diff --git a/packages/nodes-base/nodes/Simulate/SimulateTrigger.node.json b/packages/nodes-base/nodes/Simulate/SimulateTrigger.node.json
new file mode 100644
index 0000000000000..95c288764fc2b
--- /dev/null
+++ b/packages/nodes-base/nodes/Simulate/SimulateTrigger.node.json
@@ -0,0 +1,11 @@
+{
+	"node": "n8n-nodes-base.simulateTrigger",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"categories": ["Core Nodes"],
+	"resources": {},
+	"alias": ["placeholder", "stub", "dummy"],
+	"subcategories": {
+		"Core Nodes": ["Helpers"]
+	}
+}
diff --git a/packages/nodes-base/nodes/Simulate/SimulateTrigger.node.ts b/packages/nodes-base/nodes/Simulate/SimulateTrigger.node.ts
new file mode 100644
index 0000000000000..4532908936e78
--- /dev/null
+++ b/packages/nodes-base/nodes/Simulate/SimulateTrigger.node.ts
@@ -0,0 +1,79 @@
+import { sleep, NodeOperationError, jsonParse } from 'n8n-workflow';
+import type {
+	IDataObject,
+	ITriggerFunctions,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+	ITriggerResponse,
+} from 'n8n-workflow';
+import {
+	executionDurationProperty,
+	iconSelector,
+	jsonOutputProperty,
+	subtitleProperty,
+} from './descriptions';
+import { loadOptions } from './methods';
+
+export class SimulateTrigger implements INodeType {
+	description: INodeTypeDescription = {
+		hidden: true,
+		displayName: 'Simulate Trigger',
+		name: 'simulateTrigger',
+		subtitle: '={{$parameter.subtitle || undefined}}',
+		icon: 'fa:arrow-right',
+		group: ['trigger'],
+		version: 1,
+		description: 'Simulate a trigger node',
+		defaults: {
+			name: 'Simulate Trigger',
+			color: '#b0b0b0',
+		},
+		inputs: [],
+		outputs: ['main'],
+		properties: [
+			{ ...iconSelector, default: 'n8n-nodes-base.manualTrigger' },
+			subtitleProperty,
+			{ ...jsonOutputProperty, displayName: 'Output (JSON)' },
+			executionDurationProperty,
+		],
+	};
+
+	methods = { loadOptions };
+
+	async trigger(this: ITriggerFunctions): Promise<ITriggerResponse> {
+		const returnItems: INodeExecutionData[] = [];
+
+		let jsonOutput = this.getNodeParameter('jsonOutput', 0);
+
+		if (typeof jsonOutput === 'string') {
+			try {
+				jsonOutput = jsonParse<IDataObject>(jsonOutput);
+			} catch (error) {
+				throw new NodeOperationError(this.getNode(), 'Invalid JSON');
+			}
+		}
+
+		if (!Array.isArray(jsonOutput)) {
+			jsonOutput = [jsonOutput];
+		}
+
+		for (const item of jsonOutput as IDataObject[]) {
+			returnItems.push({ json: item });
+		}
+
+		const executionDuration = this.getNodeParameter('executionDuration', 0) as number;
+
+		if (executionDuration > 0) {
+			await sleep(executionDuration);
+		}
+
+		const manualTriggerFunction = async () => {
+			this.emit([returnItems]);
+		};
+
+		return {
+			manualTriggerFunction,
+		};
+	}
+}
diff --git a/packages/nodes-base/nodes/Simulate/descriptions.ts b/packages/nodes-base/nodes/Simulate/descriptions.ts
new file mode 100644
index 0000000000000..d5a459777495b
--- /dev/null
+++ b/packages/nodes-base/nodes/Simulate/descriptions.ts
@@ -0,0 +1,44 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+export const iconSelector: INodeProperties = {
+	// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-options
+	displayName: 'Icon to Display on Canvas',
+	name: 'icon',
+	type: 'options',
+	// eslint-disable-next-line n8n-nodes-base/node-param-description-wrong-for-dynamic-options
+	description: 'Select a type of node to show corresponding icon',
+	default: 'n8n-nodes-base.noOp',
+	typeOptions: {
+		loadOptionsMethod: 'getNodeTypes',
+	},
+};
+
+export const subtitleProperty: INodeProperties = {
+	displayName: 'Subtitle',
+	name: 'subtitle',
+	type: 'string',
+	default: '',
+	placeholder: "e.g. 'record: read'",
+};
+
+export const jsonOutputProperty: INodeProperties = {
+	displayName: 'JSON',
+	name: 'jsonOutput',
+	type: 'json',
+	typeOptions: {
+		rows: 5,
+	},
+	default: '[\n  {\n  "my_field_1": "value",\n  "my_field_2": 1\n  }\n]',
+	validateType: 'array',
+};
+
+export const executionDurationProperty: INodeProperties = {
+	displayName: 'Execution Duration (MS)',
+	name: 'executionDuration',
+	type: 'number',
+	default: 150,
+	description: 'Execution duration in milliseconds',
+	typeOptions: {
+		minValue: 0,
+	},
+};
diff --git a/packages/nodes-base/nodes/Simulate/methods/index.ts b/packages/nodes-base/nodes/Simulate/methods/index.ts
new file mode 100644
index 0000000000000..65ff6192a3afd
--- /dev/null
+++ b/packages/nodes-base/nodes/Simulate/methods/index.ts
@@ -0,0 +1 @@
+export * as loadOptions from './loadOptions';
diff --git a/packages/nodes-base/nodes/Simulate/methods/loadOptions.ts b/packages/nodes-base/nodes/Simulate/methods/loadOptions.ts
new file mode 100644
index 0000000000000..205d9555d9e0a
--- /dev/null
+++ b/packages/nodes-base/nodes/Simulate/methods/loadOptions.ts
@@ -0,0 +1,26 @@
+import type { ILoadOptionsFunctions, INodePropertyOptions } from 'n8n-workflow';
+
+export async function getNodeTypes(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+	const types = this.getKnownNodeTypes() as {
+		[key: string]: {
+			className: string;
+		};
+	};
+
+	const returnData: INodePropertyOptions[] = [];
+
+	let typeNames = Object.keys(types);
+
+	if (this.getNode().type === 'n8n-nodes-base.simulateTrigger') {
+		typeNames = typeNames.filter((type) => type.toLowerCase().includes('trigger'));
+	}
+
+	for (const type of typeNames) {
+		returnData.push({
+			name: types[type].className,
+			value: type,
+		});
+	}
+
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/Slack/Slack.node.ts b/packages/nodes-base/nodes/Slack/Slack.node.ts
index febdacc7f3b16..0eac92e5366ee 100644
--- a/packages/nodes-base/nodes/Slack/Slack.node.ts
+++ b/packages/nodes-base/nodes/Slack/Slack.node.ts
@@ -14,12 +14,14 @@ export class Slack extends VersionedNodeType {
 			group: ['output'],
 			subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
 			description: 'Consume Slack API',
-			defaultVersion: 2,
+			defaultVersion: 2.2,
 		};
 
 		const nodeVersions: IVersionedNodeType['nodeVersions'] = {
 			1: new SlackV1(baseDescription),
 			2: new SlackV2(baseDescription),
+			2.1: new SlackV2(baseDescription),
+			2.2: new SlackV2(baseDescription),
 		};
 
 		super(nodeVersions, baseDescription);
diff --git a/packages/nodes-base/nodes/Slack/V1/FileDescription.ts b/packages/nodes-base/nodes/Slack/V1/FileDescription.ts
index e22ad88882cbb..57ffb0ac1a925 100644
--- a/packages/nodes-base/nodes/Slack/V1/FileDescription.ts
+++ b/packages/nodes-base/nodes/Slack/V1/FileDescription.ts
@@ -40,7 +40,7 @@ export const fileFields: INodeProperties[] = [
 	/*                                file:upload                                 */
 	/* -------------------------------------------------------------------------- */
 	{
-		displayName: 'Binary Data',
+		displayName: 'Binary File',
 		name: 'binaryData',
 		type: 'boolean',
 		default: false,
@@ -68,7 +68,7 @@ export const fileFields: INodeProperties[] = [
 		description: 'The text content of the file to upload',
 	},
 	{
-		displayName: 'Binary Property',
+		displayName: 'Input Binary Field',
 		name: 'binaryPropertyName',
 		type: 'string',
 		default: 'data',
@@ -81,7 +81,7 @@ export const fileFields: INodeProperties[] = [
 			},
 		},
 		placeholder: '',
-		description: 'Name of the binary property which contains the data for the file to be uploaded',
+		hint: 'The name of the input binary field containing the file to be uploaded',
 	},
 	{
 		displayName: 'Options',
diff --git a/packages/nodes-base/nodes/Slack/V1/GenericFunctions.ts b/packages/nodes-base/nodes/Slack/V1/GenericFunctions.ts
index 4e7255fac4a9e..c31607dc0ce74 100644
--- a/packages/nodes-base/nodes/Slack/V1/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Slack/V1/GenericFunctions.ts
@@ -1,28 +1,27 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	ILoadOptionsFunctions,
 	IDataObject,
 	IOAuth2Options,
 	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
-import get from 'lodash.get';
+import get from 'lodash/get';
 
 export async function slackApiRequest(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 	body: object = {},
-	query: object = {},
+	query: IDataObject = {},
 	headers: IDataObject | undefined = undefined,
 	option: IDataObject = {},
 ): Promise<any> {
 	const authenticationMethod = this.getNodeParameter('authentication', 0, 'accessToken') as string;
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		method,
 		headers: headers || {
 			'Content-Type': 'application/json; charset=utf-8',
@@ -86,7 +85,7 @@ export async function slackApiRequest(
 export async function slackApiRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: any = {},
diff --git a/packages/nodes-base/nodes/Slack/V1/SlackV1.node.ts b/packages/nodes-base/nodes/Slack/V1/SlackV1.node.ts
index 9055db4a16a7c..b247a0b810f8a 100644
--- a/packages/nodes-base/nodes/Slack/V1/SlackV1.node.ts
+++ b/packages/nodes-base/nodes/Slack/V1/SlackV1.node.ts
@@ -11,6 +11,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
+import moment from 'moment-timezone';
 import { channelFields, channelOperations } from './ChannelDescription';
 import { messageFields, messageOperations } from './MessageDescription';
 import { starFields, starOperations } from './StarDescription';
@@ -22,7 +23,7 @@ import { userProfileFields, userProfileOperations } from './UserProfileDescripti
 import { slackApiRequest, slackApiRequestAllItems, validateJSON } from './GenericFunctions';
 import type { IAttachment } from './MessageInterface';
 
-import moment from 'moment';
+import { oldVersionNotice } from '@utils/descriptions';
 
 interface Attachment {
 	fields: {
@@ -97,6 +98,7 @@ export class SlackV1 implements INodeType {
 				},
 			],
 			properties: [
+				oldVersionNotice,
 				{
 					displayName: 'Authentication',
 					name: 'authentication',
@@ -1377,6 +1379,6 @@ export class SlackV1 implements INodeType {
 				throw error;
 			}
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Slack/V2/FileDescription.ts b/packages/nodes-base/nodes/Slack/V2/FileDescription.ts
index fdd1aaf9beec1..07d514ff493aa 100644
--- a/packages/nodes-base/nodes/Slack/V2/FileDescription.ts
+++ b/packages/nodes-base/nodes/Slack/V2/FileDescription.ts
@@ -39,7 +39,7 @@ export const fileFields: INodeProperties[] = [
 	/*                                file:upload                                 */
 	/* -------------------------------------------------------------------------- */
 	{
-		displayName: 'Binary Data',
+		displayName: 'Binary File',
 		name: 'binaryData',
 		type: 'boolean',
 		default: false,
@@ -47,6 +47,7 @@ export const fileFields: INodeProperties[] = [
 			show: {
 				operation: ['upload'],
 				resource: ['file'],
+				'@version': [2, 2.1],
 			},
 		},
 		description: 'Whether the data to upload should be taken from binary field',
@@ -61,12 +62,13 @@ export const fileFields: INodeProperties[] = [
 				operation: ['upload'],
 				resource: ['file'],
 				binaryData: [false],
+				'@version': [2, 2.1],
 			},
 		},
 		placeholder: '',
 	},
 	{
-		displayName: 'Binary Property',
+		displayName: 'File Property',
 		name: 'binaryPropertyName',
 		type: 'string',
 		default: 'data',
@@ -76,6 +78,23 @@ export const fileFields: INodeProperties[] = [
 				operation: ['upload'],
 				resource: ['file'],
 				binaryData: [true],
+				'@version': [2, 2.1],
+			},
+		},
+		placeholder: '',
+		description: 'Name of the binary property which contains the data for the file to be uploaded',
+	},
+	{
+		displayName: 'File Property',
+		name: 'binaryPropertyName',
+		type: 'string',
+		default: 'data',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: ['upload'],
+				resource: ['file'],
+				'@version': [2.2],
 			},
 		},
 		placeholder: '',
@@ -102,10 +121,31 @@ export const fileFields: INodeProperties[] = [
 				typeOptions: {
 					loadOptionsMethod: 'getChannels',
 				},
+				displayOptions: {
+					show: {
+						'@version': [2, 2.1],
+					},
+				},
 				default: [],
 				description:
 					'The channels to send the file to. Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
 			},
+			{
+				displayName: 'Channel Name or ID',
+				name: 'channelId',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getChannels',
+				},
+				displayOptions: {
+					show: {
+						'@version': [2.2],
+					},
+				},
+				default: [],
+				description:
+					'The channel to send the file to. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
 			{
 				displayName: 'File Name',
 				name: 'fileName',
diff --git a/packages/nodes-base/nodes/Slack/V2/GenericFunctions.ts b/packages/nodes-base/nodes/Slack/V2/GenericFunctions.ts
index 88f7a043e2e8a..255456523931d 100644
--- a/packages/nodes-base/nodes/Slack/V2/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Slack/V2/GenericFunctions.ts
@@ -1,35 +1,35 @@
-import type { OptionsWithUri } from 'request';
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	ILoadOptionsFunctions,
 	IOAuth2Options,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 
-import { NodeOperationError } from 'n8n-workflow';
+import { NodeOperationError, jsonParse } from 'n8n-workflow';
 
-import get from 'lodash.get';
+import get from 'lodash/get';
 
 export async function slackApiRequest(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 	body: object = {},
-	query: object = {},
+	query: IDataObject = {},
 	headers: {} | undefined = undefined,
 	option: {} = {},
 	// tslint:disable-next-line:no-any
 ): Promise<any> {
 	const authenticationMethod = this.getNodeParameter('authentication', 0, 'accessToken') as string;
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		method,
 		headers: headers ?? {
 			'Content-Type': 'application/json; charset=utf-8',
 		},
 		body,
 		qs: query,
-		uri: `https://slack.com/api${resource}`,
+		uri: resource.startsWith('https') ? resource : `https://slack.com/api${resource}`,
 		json: true,
 	};
 	options = Object.assign({}, options, option);
@@ -65,6 +65,7 @@ export async function slackApiRequest(
 				{
 					description:
 						'Hint: Upgrade to a Slack plan that includes the functionality you want to use.',
+					level: 'warning',
 				},
 			);
 		} else if (response.error === 'missing_scope') {
@@ -73,9 +74,11 @@ export async function slackApiRequest(
 				'Your Slack credential is missing required Oauth Scopes',
 				{
 					description: `Add the following scope(s) to your Slack App: ${response.needed}`,
+					level: 'warning',
 				},
 			);
 		}
+
 		throw new NodeOperationError(
 			this.getNode(),
 			'Slack error response: ' + JSON.stringify(response.error),
@@ -91,7 +94,7 @@ export async function slackApiRequest(
 export async function slackApiRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	// tslint:disable-next-line:no-any
 	body: any = {},
@@ -130,6 +133,80 @@ export async function slackApiRequestAllItems(
 	return returnData;
 }
 
+export function getMessageContent(
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	i: number,
+	nodeVersion: number,
+	instanceId?: string,
+) {
+	const includeLinkToWorkflow = this.getNodeParameter(
+		'otherOptions.includeLinkToWorkflow',
+		i,
+		nodeVersion >= 2.1 ? true : false,
+	) as IDataObject;
+
+	const { id } = this.getWorkflow();
+	const automatedMessage = `_Automated with this <${this.getInstanceBaseUrl()}workflow/${id}?utm_source=n8n-internal&utm_medium=powered_by&utm_campaign=${encodeURIComponent(
+		'n8n-nodes-base.slack',
+	)}${instanceId ? '_' + instanceId : ''}|n8n workflow>_`;
+	const messageType = this.getNodeParameter('messageType', i) as string;
+
+	let content: IDataObject = {};
+	const text = this.getNodeParameter('text', i, '') as string;
+	switch (messageType) {
+		case 'text':
+			content = {
+				text: includeLinkToWorkflow ? `${text}\n${automatedMessage}` : text,
+			};
+			break;
+		case 'block':
+			content = jsonParse(this.getNodeParameter('blocksUi', i) as string);
+
+			if (includeLinkToWorkflow && Array.isArray(content.blocks)) {
+				content.blocks.push({
+					type: 'section',
+					text: {
+						type: 'mrkdwn',
+						text: automatedMessage,
+					},
+				});
+			}
+			if (text) {
+				content.text = text;
+			}
+			break;
+		case 'attachment':
+			const attachmentsUI = this.getNodeParameter('attachments', i) as IDataObject[];
+
+			const attachments: IDataObject[] = [];
+
+			for (const attachment of attachmentsUI) {
+				if (attachment.fields !== undefined) {
+					if ((attachment?.fields as IDataObject)?.item) {
+						attachment.fields = (attachment?.fields as IDataObject)?.item as IDataObject[];
+					}
+				}
+				attachments.push(attachment);
+			}
+
+			content = { attachments } as IDataObject;
+
+			if (includeLinkToWorkflow && Array.isArray(content.attachments)) {
+				content.attachments.push({
+					text: automatedMessage,
+				});
+			}
+			break;
+		default:
+			throw new NodeOperationError(
+				this.getNode(),
+				`The message type "${messageType}" is not known!`,
+			);
+	}
+
+	return content;
+}
+
 // tslint:disable-next-line:no-any
 export function validateJSON(json: string | undefined): any {
 	let result;
diff --git a/packages/nodes-base/nodes/Slack/V2/MessageDescription.ts b/packages/nodes-base/nodes/Slack/V2/MessageDescription.ts
index 7e1ecd27789e5..527e687af26bf 100644
--- a/packages/nodes-base/nodes/Slack/V2/MessageDescription.ts
+++ b/packages/nodes-base/nodes/Slack/V2/MessageDescription.ts
@@ -331,6 +331,21 @@ export const messageFields: INodeProperties[] = [
 		hint: "To create blocks, use <a target='_blank' href='https://app.slack.com/block-kit-builder'>Slack's Block Kit Builder</a>",
 		default: '',
 	},
+	{
+		displayName: 'Notification Text',
+		name: 'text',
+		type: 'string',
+		default: '',
+		displayOptions: {
+			show: {
+				operation: ['post'],
+				resource: ['message'],
+				messageType: ['block'],
+			},
+		},
+		description:
+			'Fallback text to display in slack notifications. Supports <a href="https://api.slack.com/reference/surfaces/formatting">markdown</a> by default - this can be disabled in "Options".',
+	},
 	{
 		displayName: 'This is a legacy Slack feature. Slack advises to instead use Blocks.',
 		name: 'noticeAttachments',
@@ -542,6 +557,14 @@ export const messageFields: INodeProperties[] = [
 		description: 'Other options to set',
 		placeholder: 'Add options',
 		options: [
+			{
+				displayName: 'Include Link to Workflow',
+				name: 'includeLinkToWorkflow',
+				type: 'boolean',
+				default: true,
+				description:
+					'Whether to append a link to this workflow at the end of the message. This is helpful if you have many workflows sending Slack messages.',
+			},
 			{
 				displayName: 'Custom Bot Profile Photo',
 				name: 'botProfile',
diff --git a/packages/nodes-base/nodes/Slack/V2/SlackV2.node.ts b/packages/nodes-base/nodes/Slack/V2/SlackV2.node.ts
index 2a226c6c4fd5f..df0ac7b9998e2 100644
--- a/packages/nodes-base/nodes/Slack/V2/SlackV2.node.ts
+++ b/packages/nodes-base/nodes/Slack/V2/SlackV2.node.ts
@@ -17,6 +17,7 @@ import type {
 
 import { BINARY_ENCODING, NodeOperationError } from 'n8n-workflow';
 
+import moment from 'moment-timezone';
 import { channelFields, channelOperations } from './ChannelDescription';
 import { messageFields, messageOperations } from './MessageDescription';
 import { starFields, starOperations } from './StarDescription';
@@ -24,9 +25,12 @@ import { fileFields, fileOperations } from './FileDescription';
 import { reactionFields, reactionOperations } from './ReactionDescription';
 import { userGroupFields, userGroupOperations } from './UserGroupDescription';
 import { userFields, userOperations } from './UserDescription';
-import { slackApiRequest, slackApiRequestAllItems, validateJSON } from './GenericFunctions';
-
-import moment from 'moment';
+import {
+	slackApiRequest,
+	slackApiRequestAllItems,
+	validateJSON,
+	getMessageContent,
+} from './GenericFunctions';
 
 export class SlackV2 implements INodeType {
 	description: INodeTypeDescription;
@@ -34,7 +38,7 @@ export class SlackV2 implements INodeType {
 	constructor(baseDescription: INodeTypeBaseDescription) {
 		this.description = {
 			...baseDescription,
-			version: 2,
+			version: [2, 2.1, 2.2],
 			defaults: {
 				name: 'Slack',
 			},
@@ -317,6 +321,9 @@ export class SlackV2 implements INodeType {
 		const resource = this.getNodeParameter('resource', 0);
 		const operation = this.getNodeParameter('operation', 0);
 
+		const nodeVersion = this.getNode().typeVersion;
+		const instanceId = this.getInstanceId();
+
 		for (let i = 0; i < length; i++) {
 			try {
 				responseData = {
@@ -747,37 +754,24 @@ export class SlackV2 implements INodeType {
 					//https://api.slack.com/methods/chat.postMessage
 					if (operation === 'post') {
 						const select = this.getNodeParameter('select', i) as string;
-						const messageType = this.getNodeParameter('messageType', i) as string;
 						let target =
 							select === 'channel'
 								? (this.getNodeParameter('channelId', i, undefined, {
 										extractValue: true,
-								  }) as string)
+									}) as string)
 								: (this.getNodeParameter('user', i, undefined, {
 										extractValue: true,
-								  }) as string);
-						// @ts-ignore
-						if (select === 'user' && this.getNodeParameter('user', i).mode === 'username') {
+									}) as string);
+
+						if (
+							select === 'user' &&
+							(this.getNodeParameter('user', i) as IDataObject).mode === 'username'
+						) {
 							target = target.slice(0, 1) === '@' ? target : `@${target}`;
 						}
 						const { sendAsUser } = this.getNodeParameter('otherOptions', i) as IDataObject;
-						let content: IDataObject = {};
-						switch (messageType) {
-							case 'text':
-								content = { text: this.getNodeParameter('text', i) as string };
-								break;
-							case 'block':
-								content = JSON.parse(this.getNodeParameter('blocksUi', i) as string);
-								break;
-							case 'attachment':
-								content = { attachments: this.getNodeParameter('attachments', i) } as IDataObject;
-								break;
-							default:
-								throw new NodeOperationError(
-									this.getNode(),
-									`The message type "${messageType}" is not known!`,
-								);
-						}
+						const content = getMessageContent.call(this, i, nodeVersion, instanceId);
+
 						const body: IDataObject = {
 							channel: target,
 							...content,
@@ -803,8 +797,8 @@ export class SlackV2 implements INodeType {
 								action = 'postEphemeral';
 							}
 						}
-						//@ts-ignore
-						const replyValues = otherOptions.thread_ts?.replyValues as IDataObject;
+
+						const replyValues = (otherOptions.thread_ts as IDataObject)?.replyValues as IDataObject;
 						Object.assign(body, replyValues);
 						delete otherOptions.thread_ts;
 						delete otherOptions.ephemeral;
@@ -875,12 +869,15 @@ export class SlackV2 implements INodeType {
 							select === 'channel'
 								? (this.getNodeParameter('channelId', i, undefined, {
 										extractValue: true,
-								  }) as string)
+									}) as string)
 								: (this.getNodeParameter('user', i, undefined, {
 										extractValue: true,
-								  }) as string);
-						// @ts-ignore
-						if (select === 'user' && this.getNodeParameter('user', i).mode === 'username') {
+									}) as string);
+
+						if (
+							select === 'user' &&
+							(this.getNodeParameter('user', i) as IDataObject).mode === 'username'
+						) {
 							target = target.slice(0, 1) === '@' ? target : `@${target}`;
 						}
 						const timestamp = this.getNodeParameter('timestamp', i)?.toString() as string;
@@ -1043,11 +1040,13 @@ export class SlackV2 implements INodeType {
 					if (operation === 'upload') {
 						const options = this.getNodeParameter('options', i);
 						const body: IDataObject = {};
+						const fileBody: IDataObject = {};
+
 						if (options.channelIds) {
 							body.channels = (options.channelIds as string[]).join(',');
 						}
-						if (options.fileName) {
-							body.filename = options.fileName as string;
+						if (options.channelId) {
+							body.channel_id = options.channelId as string;
 						}
 						if (options.initialComment) {
 							body.initial_comment = options.initialComment as string;
@@ -1056,35 +1055,87 @@ export class SlackV2 implements INodeType {
 							body.thread_ts = options.threadTs as string;
 						}
 						if (options.title) {
-							body.title = options.title as string;
+							if (nodeVersion <= 2.1) {
+								body.title = options.title as string;
+							}
 						}
-						if (this.getNodeParameter('binaryData', i)) {
+
+						if (this.getNodeParameter('binaryData', i, false) || nodeVersion > 2.1) {
 							const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i);
 							const binaryData = this.helpers.assertBinaryData(i, binaryPropertyName);
 
+							let fileSize: number;
 							let uploadData: Buffer | Readable;
 							if (binaryData.id) {
-								uploadData = this.helpers.getBinaryStream(binaryData.id);
+								uploadData = await this.helpers.getBinaryStream(binaryData.id);
+								const metadata = await this.helpers.getBinaryMetadata(binaryData.id);
+								fileSize = metadata.fileSize;
 							} else {
 								uploadData = Buffer.from(binaryData.data, BINARY_ENCODING);
+								fileSize = uploadData.length;
+							}
+
+							if (nodeVersion <= 2.1) {
+								body.file = {
+									value: uploadData,
+									options: {
+										filename: binaryData.fileName,
+										contentType: binaryData.mimeType,
+									},
+								};
+
+								responseData = await slackApiRequest.call(
+									this,
+									'POST',
+									'/files.upload',
+									{},
+									qs,
+									{ 'Content-Type': 'multipart/form-data' },
+									{ formData: body },
+								);
+								responseData = responseData.file;
+							} else {
+								fileBody.file = {
+									value: uploadData,
+									options: {
+										filename: binaryData.fileName,
+										contentType: binaryData.mimeType,
+									},
+								};
+
+								const uploadUrl = await slackApiRequest.call(
+									this,
+									'GET',
+									'/files.getUploadURLExternal',
+									{},
+									{
+										filename: options.fileName ? options.fileName : binaryData.fileName,
+										length: fileSize,
+									},
+								);
+								await slackApiRequest.call(
+									this,
+									'POST',
+									uploadUrl.upload_url,
+									{},
+									qs,
+									{ 'Content-Type': 'multipart/form-data' },
+									{ formData: fileBody },
+								);
+								body.files = [
+									{
+										id: uploadUrl.file_id,
+										title: options.title ? options.title : binaryData.fileName,
+									},
+								];
+								responseData = await slackApiRequest.call(
+									this,
+									'POST',
+									'/files.completeUploadExternal',
+									body,
+								);
+								responseData = responseData.files;
 							}
-							body.file = {
-								value: uploadData,
-								options: {
-									filename: binaryData.fileName,
-									contentType: binaryData.mimeType,
-								},
-							};
-							responseData = await slackApiRequest.call(
-								this,
-								'POST',
-								'/files.upload',
-								{},
-								qs,
-								{ 'Content-Type': 'multipart/form-data' },
-								{ formData: body },
-							);
-							responseData = responseData.file;
 						} else {
 							const fileContent = this.getNodeParameter('fileContent', i) as string;
 							body.content = fileContent;
@@ -1175,6 +1226,11 @@ export class SlackV2 implements INodeType {
 						qs.user = this.getNodeParameter('user', i, undefined, { extractValue: true }) as string;
 						responseData = await slackApiRequest.call(this, 'GET', '/users.getPresence', {}, qs);
 					}
+					if (operation === 'getProfile') {
+						qs.user = this.getNodeParameter('user', i, undefined, { extractValue: true }) as string;
+						responseData = await slackApiRequest.call(this, 'GET', '/users.profile.get', {}, qs);
+						responseData = responseData.profile;
+					}
 					if (operation === 'updateProfile') {
 						const options = this.getNodeParameter('options', i);
 						const timezone = this.getTimezone();
@@ -1182,8 +1238,7 @@ export class SlackV2 implements INodeType {
 						const body: IDataObject = {};
 						let status;
 						if (options.status) {
-							// @ts-ignore
-							status = options.status?.set_status[0] as IDataObject;
+							status = ((options.status as IDataObject)?.set_status as IDataObject[])[0];
 							if (status.status_expiration === undefined) {
 								status.status_expiration = 0;
 							} else {
@@ -1199,15 +1254,16 @@ export class SlackV2 implements INodeType {
 							const customFields = (options.customFieldUi as IDataObject)
 								.customFieldValues as IDataObject[];
 
-							options.fields = {};
+							const fields: IDataObject = {};
 
 							for (const customField of customFields) {
-								//@ts-ignore
-								options.fields[customField.id] = {
+								fields[customField.id as string] = {
 									value: customField.value,
 									alt: customField.alt,
 								};
 							}
+
+							options.fields = fields;
 						}
 						Object.assign(body, options);
 						responseData = await slackApiRequest.call(
@@ -1326,6 +1382,6 @@ export class SlackV2 implements INodeType {
 				throw error;
 			}
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Slack/V2/UserDescription.ts b/packages/nodes-base/nodes/Slack/V2/UserDescription.ts
index 1ced8d7dae10d..fc69e0eeb2fe0 100644
--- a/packages/nodes-base/nodes/Slack/V2/UserDescription.ts
+++ b/packages/nodes-base/nodes/Slack/V2/UserDescription.ts
@@ -24,6 +24,12 @@ export const userOperations: INodeProperties[] = [
 				description: 'Get a list of many users',
 				action: 'Get many users',
 			},
+			{
+				name: "Get User's Profile",
+				value: 'getProfile',
+				description: "Get a user's",
+				action: "Get a user's profile",
+			},
 			{
 				name: "Get User's Status",
 				value: 'getPresence',
@@ -54,7 +60,7 @@ export const userFields: INodeProperties[] = [
 		description: 'The ID of the user to get information about',
 		displayOptions: {
 			show: {
-				operation: ['info'],
+				operation: ['info', 'getProfile'],
 				resource: ['user'],
 			},
 		},
diff --git a/packages/nodes-base/nodes/Slack/slack.svg b/packages/nodes-base/nodes/Slack/slack.svg
index 29072dc62a15b..12747e2eec59d 100644
--- a/packages/nodes-base/nodes/Slack/slack.svg
+++ b/packages/nodes-base/nodes/Slack/slack.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 150.852 150.852" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".926" y=".926"/><symbol id="a" overflow="visible"><g stroke-width="1.852"><path d="M40.741 93.55c0-8.735 6.607-15.772 14.815-15.772s14.815 7.037 14.815 15.772v38.824c0 8.737-6.607 15.774-14.815 15.774s-14.815-7.037-14.815-15.772z" fill="#e01e5a" stroke="#e01e5a"/><path d="M93.55 107.408c-8.735 0-15.772-6.607-15.772-14.815s7.037-14.815 15.772-14.815h38.826c8.735 0 15.772 6.607 15.772 14.815s-7.037 14.815-15.772 14.815z" fill="#ecb22d" stroke="#ecb22d"/><path d="M77.778 15.772C77.778 7.037 84.385 0 92.593 0s14.815 7.037 14.815 15.772v38.826c0 8.735-6.607 15.772-14.815 15.772s-14.815-7.037-14.815-15.772z" fill="#2fb67c" stroke="#2fb67c"/><path d="M15.772 70.371C7.037 70.371 0 63.763 0 55.556s7.037-14.815 15.772-14.815h38.826c8.735 0 15.772 6.607 15.772 14.815s-7.037 14.815-15.772 14.815z" fill="#36c5f1" stroke="#36c5f1"/><g stroke-linejoin="miter"><path d="M77.778 133.333c0 8.208 6.607 14.815 14.815 14.815s14.815-6.607 14.815-14.815-6.607-14.815-14.815-14.815H77.778z" fill="#ecb22d" stroke="#ecb22d"/><path d="M133.334 70.371h-14.815V55.556c0-8.207 6.607-14.815 14.815-14.815s14.815 6.607 14.815 14.815-6.607 14.815-14.815 14.815z" fill="#2fb67c" stroke="#2fb67c"/><path d="M14.815 77.778H29.63v14.815c0 8.207-6.607 14.815-14.815 14.815S0 100.8 0 92.593s6.607-14.815 14.815-14.815z" fill="#e01e5a" stroke="#e01e5a"/><path d="M70.371 14.815V29.63H55.556c-8.207 0-14.815-6.607-14.815-14.815S47.348 0 55.556 0s14.815 6.607 14.815 14.815z" fill="#36c5f1" stroke="#36c5f1"/></g></g></symbol></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round" viewBox="0 0 150.852 150.852"><use xlink:href="#a" x=".926" y=".926"/><symbol id="a" overflow="visible"><g stroke-width="1.852"><path fill="#e01e5a" stroke="#e01e5a" d="M40.741 93.55c0-8.735 6.607-15.772 14.815-15.772s14.815 7.037 14.815 15.772v38.824c0 8.737-6.607 15.774-14.815 15.774s-14.815-7.037-14.815-15.772z"/><path fill="#ecb22d" stroke="#ecb22d" d="M93.55 107.408c-8.735 0-15.772-6.607-15.772-14.815s7.037-14.815 15.772-14.815h38.826c8.735 0 15.772 6.607 15.772 14.815s-7.037 14.815-15.772 14.815z"/><path fill="#2fb67c" stroke="#2fb67c" d="M77.778 15.772C77.778 7.037 84.385 0 92.593 0s14.815 7.037 14.815 15.772v38.826c0 8.735-6.607 15.772-14.815 15.772s-14.815-7.037-14.815-15.772z"/><path fill="#36c5f1" stroke="#36c5f1" d="M15.772 70.371C7.037 70.371 0 63.763 0 55.556s7.037-14.815 15.772-14.815h38.826c8.735 0 15.772 6.607 15.772 14.815s-7.037 14.815-15.772 14.815z"/><g stroke-linejoin="miter"><path fill="#ecb22d" stroke="#ecb22d" d="M77.778 133.333c0 8.208 6.607 14.815 14.815 14.815s14.815-6.607 14.815-14.815-6.607-14.815-14.815-14.815H77.778z"/><path fill="#2fb67c" stroke="#2fb67c" d="M133.334 70.371h-14.815V55.556c0-8.207 6.607-14.815 14.815-14.815s14.815 6.607 14.815 14.815-6.607 14.815-14.815 14.815z"/><path fill="#e01e5a" stroke="#e01e5a" d="M14.815 77.778H29.63v14.815c0 8.207-6.607 14.815-14.815 14.815S0 100.8 0 92.593s6.607-14.815 14.815-14.815z"/><path fill="#36c5f1" stroke="#36c5f1" d="M70.371 14.815V29.63H55.556c-8.207 0-14.815-6.607-14.815-14.815S47.348 0 55.556 0s14.815 6.607 14.815 14.815z"/></g></g></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Sms77/GenericFunctions.ts b/packages/nodes-base/nodes/Sms77/GenericFunctions.ts
index a4836165f96e9..90f92939c11f8 100644
--- a/packages/nodes-base/nodes/Sms77/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Sms77/GenericFunctions.ts
@@ -1,27 +1,32 @@
-import type { IExecuteFunctions, IHookFunctions, IDataObject, JsonObject } from 'n8n-workflow';
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	IHookFunctions,
+	IHttpRequestMethods,
+	IRequestOptions,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import type { OptionsWithUri } from 'request';
-
 /**
- * Make an API request to Sms77
+ * Make an API request to seven
  *
  * @param {IHookFunctions | IExecuteFunctions} this
  * @param {object | undefined} data
  */
 export async function sms77ApiRequest(
 	this: IHookFunctions | IExecuteFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject,
 	qs: IDataObject = {},
 ): Promise<any> {
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			SentWith: 'n8n',
 		},
 		qs,
-		uri: `https://gateway.sms77.io/api${endpoint}`,
+		uri: `https://gateway.seven.io/api${endpoint}`,
 		json: true,
 		method,
 	};
diff --git a/packages/nodes-base/nodes/Sms77/Sms77.node.json b/packages/nodes-base/nodes/Sms77/Sms77.node.json
index 2495b864ee589..58d0776f6275f 100644
--- a/packages/nodes-base/nodes/Sms77/Sms77.node.json
+++ b/packages/nodes-base/nodes/Sms77/Sms77.node.json
@@ -14,5 +14,6 @@
 				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.sms77/"
 			}
 		]
-	}
+	},
+	"alias": ["SMS", "Sms77"]
 }
diff --git a/packages/nodes-base/nodes/Sms77/Sms77.node.ts b/packages/nodes-base/nodes/Sms77/Sms77.node.ts
index c85617f202b82..f5775eca1f58b 100644
--- a/packages/nodes-base/nodes/Sms77/Sms77.node.ts
+++ b/packages/nodes-base/nodes/Sms77/Sms77.node.ts
@@ -1,6 +1,6 @@
 import type {
-	IExecuteFunctions,
 	IDataObject,
+	IExecuteFunctions,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
@@ -10,16 +10,15 @@ import { sms77ApiRequest } from './GenericFunctions';
 
 export class Sms77 implements INodeType {
 	description: INodeTypeDescription = {
-		displayName: 'sms77',
+		displayName: 'seven',
 		name: 'sms77',
-		// eslint-disable-next-line n8n-nodes-base/node-class-description-icon-not-svg
-		icon: 'file:sms77.png',
+		icon: 'file:seven.svg',
 		group: ['transform'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
 		description: 'Send SMS and make text-to-speech calls',
 		defaults: {
-			name: 'sms77',
+			name: 'seven',
 		},
 		inputs: ['main'],
 		outputs: ['main'],
@@ -118,7 +117,7 @@ export class Sms77 implements INodeType {
 					},
 				},
 				description:
-					'The number of your recipient(s) separated by comma. Can be regular numbers or contact/groups from Sms77.',
+					'The number of your recipient(s) separated by comma. Can be regular numbers or contact/groups from seven.',
 			},
 			{
 				displayName: 'Message',
diff --git a/packages/nodes-base/nodes/Sms77/seven.svg b/packages/nodes-base/nodes/Sms77/seven.svg
new file mode 100644
index 0000000000000..4689cec4ffa0f
--- /dev/null
+++ b/packages/nodes-base/nodes/Sms77/seven.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 252 176"><linearGradient id="a" x1="32.71" x2="115.06" y1="19.46" y2="67.11" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#01d468"/><stop offset=".1" stop-color="#15d875"/><stop offset=".41" stop-color="#50e59b"/><stop offset=".67" stop-color="#7befb7"/><stop offset=".88" stop-color="#96f5c9"/><stop offset="1" stop-color="#a0f7cf"/></linearGradient><path fill="url(#a)" d="m101.45 57-6.78 9.2-84.6-43.03C2.42 20.3.4 14.54 1.03 10.07 1.92 4.52 6.8.68 12.9.68h16.91l2.04 5.52-2.04 6.19H14.49l86.96 44.6z"/><linearGradient id="b" x1="110.13" x2="248.26" y1="44.67" y2="-35.11" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#01d468"/><stop offset=".26" stop-color="#22de7b"/><stop offset=".76" stop-color="#5ef29d"/><stop offset="1" stop-color="#75f9ab"/></linearGradient><path fill="url(#b)" d="M251.48 9.47c-1.1-3.28-4.5-8.79-15.24-8.79H29.82V12.4h37.16c1.72 0 3.38.03 4.99.11 3.88.16 7.43.5 10.66.97l.14.02c18.07 2.1 32.42 7.17 34.7 15.32a6.3 6.3 0 0 1 .21 3.66l-.02.15c-.67 3-2.98 6.66-6.49 11.44l-83.3 110.3a12.51 12.51 0 0 0-1.74 13.37 12.8 12.8 0 0 0 11.5 7.09 13.55 13.55 0 0 0 7.4-2.23l.87-.58c.17-.11.34-.24.48-.38l199-147.66c7.94-5.4 6.92-11.93 6.1-14.5zm-12.93 4.82L38.52 162.73c-.65.46-1.64.46-1.85.03-.1-.19.04-.6.41-1.04l82.63-109.56c3.73-4.94 7.6-10.04 9.57-15.46 3.01-8.32.98-15.9-5.74-21.36a37.5 37.5 0 0 0-4.14-2.95h117.06c2.22 0 3.26.31 3.71.52-.23.3-.7.76-1.62 1.38"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Sms77/sms77.png b/packages/nodes-base/nodes/Sms77/sms77.png
deleted file mode 100644
index 500ba005ae607..0000000000000
Binary files a/packages/nodes-base/nodes/Sms77/sms77.png and /dev/null differ
diff --git a/packages/nodes-base/nodes/Snowflake/GenericFunctions.ts b/packages/nodes-base/nodes/Snowflake/GenericFunctions.ts
index efa66cf4bd032..6e2d332048b2f 100644
--- a/packages/nodes-base/nodes/Snowflake/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Snowflake/GenericFunctions.ts
@@ -1,31 +1,14 @@
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
-import { deepCopy } from 'n8n-workflow';
-
 import type snowflake from 'snowflake-sdk';
 
 export async function connect(conn: snowflake.Connection) {
-	return new Promise((resolve, reject) => {
-		conn.connect((err, _conn) => {
-			if (!err) {
-				// @ts-ignore
-				resolve();
-			} else {
-				reject(err);
-			}
-		});
+	return await new Promise<void>((resolve, reject) => {
+		conn.connect((error) => (error ? reject(error) : resolve()));
 	});
 }
 
 export async function destroy(conn: snowflake.Connection) {
-	return new Promise((resolve, reject) => {
-		conn.destroy((err, _conn) => {
-			if (!err) {
-				// @ts-ignore
-				resolve();
-			} else {
-				reject(err);
-			}
-		});
+	return await new Promise<void>((resolve, reject) => {
+		conn.destroy((error) => (error ? reject(error) : resolve()));
 	});
 }
 
@@ -34,33 +17,11 @@ export async function execute(
 	sqlText: string,
 	binds: snowflake.InsertBinds,
 ) {
-	return new Promise((resolve, reject) => {
+	return await new Promise<any[] | undefined>((resolve, reject) => {
 		conn.execute({
 			sqlText,
 			binds,
-			complete: (err, stmt, rows) => {
-				if (!err) {
-					resolve(rows);
-				} else {
-					reject(err);
-				}
-			},
+			complete: (error, stmt, rows) => (error ? reject(error) : resolve(rows)),
 		});
 	});
 }
-
-export function copyInputItems(items: INodeExecutionData[], properties: string[]): IDataObject[] {
-	// Prepare the data to insert and copy it to be returned
-	let newItem: IDataObject;
-	return items.map((item) => {
-		newItem = {};
-		for (const property of properties) {
-			if (item.json[property] === undefined) {
-				newItem[property] = null;
-			} else {
-				newItem[property] = deepCopy(item.json[property]);
-			}
-		}
-		return newItem;
-	});
-}
diff --git a/packages/nodes-base/nodes/Snowflake/Snowflake.node.ts b/packages/nodes-base/nodes/Snowflake/Snowflake.node.ts
index 8264cdce7a83c..a2d33e95f35b3 100644
--- a/packages/nodes-base/nodes/Snowflake/Snowflake.node.ts
+++ b/packages/nodes-base/nodes/Snowflake/Snowflake.node.ts
@@ -6,9 +6,10 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
-import { connect, copyInputItems, destroy, execute } from './GenericFunctions';
-
 import snowflake from 'snowflake-sdk';
+import { connect, destroy, execute } from './GenericFunctions';
+
+import { getResolvables } from '@utils/utilities';
 
 export class Snowflake implements INodeType {
 	description: INodeTypeDescription = {
@@ -23,6 +24,7 @@ export class Snowflake implements INodeType {
 		},
 		inputs: ['main'],
 		outputs: ['main'],
+		parameterPane: 'wide',
 		credentials: [
 			{
 				name: 'snowflake',
@@ -65,6 +67,10 @@ export class Snowflake implements INodeType {
 				displayName: 'Query',
 				name: 'query',
 				type: 'string',
+				noDataExpression: true,
+				typeOptions: {
+					editor: 'sqlEditor',
+				},
 				displayOptions: {
 					show: {
 						operation: ['executeQuery'],
@@ -175,7 +181,12 @@ export class Snowflake implements INodeType {
 			// ----------------------------------
 
 			for (let i = 0; i < items.length; i++) {
-				const query = this.getNodeParameter('query', i) as string;
+				let query = this.getNodeParameter('query', i) as string;
+
+				for (const resolvable of getResolvables(query)) {
+					query = query.replace(resolvable, this.evaluateExpression(resolvable, i) as string);
+				}
+
 				responseData = await execute(connection, query, []);
 				const executionData = this.helpers.constructExecutionMetaData(
 					this.helpers.returnJsonArray(responseData as IDataObject[]),
@@ -196,7 +207,7 @@ export class Snowflake implements INodeType {
 			const query = `INSERT INTO ${table}(${columns.join(',')}) VALUES (${columns
 				.map((_column) => '?')
 				.join(',')})`;
-			const data = copyInputItems(items, columns);
+			const data = this.helpers.copyInputItems(items, columns);
 			const binds = data.map((element) => Object.values(element));
 			await execute(connection, query, binds as unknown as snowflake.InsertBinds);
 			data.forEach((d, i) => {
@@ -225,7 +236,7 @@ export class Snowflake implements INodeType {
 			const query = `UPDATE ${table} SET ${columns
 				.map((column) => `${column} = ?`)
 				.join(',')} WHERE ${updateKey} = ?;`;
-			const data = copyInputItems(items, columns);
+			const data = this.helpers.copyInputItems(items, columns);
 			const binds = data.map((element) => Object.values(element).concat(element[updateKey]));
 			for (let i = 0; i < binds.length; i++) {
 				await execute(connection, query, binds[i] as unknown as snowflake.InsertBinds);
@@ -240,6 +251,6 @@ export class Snowflake implements INodeType {
 		}
 
 		await destroy(connection);
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Snowflake/snowflake.svg b/packages/nodes-base/nodes/Snowflake/snowflake.svg
index be59081ae9dfd..8d20a49feb438 100644
--- a/packages/nodes-base/nodes/Snowflake/snowflake.svg
+++ b/packages/nodes-base/nodes/Snowflake/snowflake.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 63 66" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><path d="M8.645 15.304l13.008 7.8a3.72 3.72 0 004.589-.601 4.01 4.01 0 001.227-2.908V3.962a3.81 3.81 0 00-1.861-3.42 3.81 3.81 0 00-3.893 0 3.81 3.81 0 00-1.861 3.42v8.896l-7.387-4.43a3.79 3.79 0 00-2.922-.4 3.712 3.712 0 00-2.3 1.844 4.052 4.052 0 001.4 5.422m31.27 7.8l13.008-7.8a4.056 4.056 0 001.4-5.424 3.75 3.75 0 00-5.22-1.452l-7.3 4.37v-8.84A3.81 3.81 0 0039.94.534a3.81 3.81 0 00-3.889 0 3.81 3.81 0 00-1.863 3.414v15.323a4.08 4.08 0 00.494 2.367 3.745 3.745 0 002.3 1.844 3.71 3.71 0 002.922-.4m-11.567 8.894c.013-.25.108-.5.272-.68l1.52-1.58a1.06 1.06 0 01.658-.282h.057a1.05 1.05 0 01.656.282l1.52 1.58a1.12 1.12 0 01.272.681v.06a1.13 1.13 0 01-.272.683L31.5 34.3a1.04 1.04 0 01-.656.284h-.057a1.043 1.043 0 01-.658-.284l-1.52-1.58a1.13 1.13 0 01-.272-.683zm-4.604-.65v1.364a1.54 1.54 0 00.372.93l5.16 5.357a1.42 1.42 0 00.895.386h1.312a1.42 1.42 0 00.895-.386l5.16-5.357a1.54 1.54 0 00.372-.93v-1.364a1.54 1.54 0 00-.372-.93l-5.16-5.357a1.42 1.42 0 00-.895-.386H30.16a1.42 1.42 0 00-.895.386l-5.16 5.367a1.55 1.55 0 00-.372.93m-21.818-3.71l7.365 4.417-7.365 4.413A4.06 4.06 0 00.516 41.88a3.75 3.75 0 002.3 1.844 3.746 3.746 0 002.922-.392l13.008-7.8a4.113 4.113 0 001.9-3.492 4.16 4.16 0 00-1.9-3.492l-13.008-7.8a3.79 3.79 0 00-2.922-.4 3.712 3.712 0 00-2.3 1.844 4.053 4.053 0 001.4 5.422m38.995 4.442a4 4 0 001.91 3.477l13 7.8a3.745 3.745 0 005.22-1.451 4.05 4.05 0 00-1.4-5.424l-7.356-4.414 7.365-4.417a4.054 4.054 0 001.4-5.422 3.74 3.74 0 00-2.3-1.844 3.704 3.704 0 00-2.92.4l-13 7.8a4 4 0 00-1.91 3.507m-16.655 8.446a3.7 3.7 0 00-2.611.464l-13.008 7.8a4.055 4.055 0 00-1.4 5.422 3.743 3.743 0 002.3 1.843 3.75 3.75 0 002.922-.392l7.387-4.43v8.83a3.81 3.81 0 005.755 3.425 3.81 3.81 0 001.858-3.425V44.406a3.91 3.91 0 00-3.205-3.903m28.66 8.276l-13.008-7.8a3.75 3.75 0 00-2.922-.392 3.74 3.74 0 00-2.3 1.843 4.09 4.09 0 00-.494 2.37v15.25a3.81 3.81 0 005.755 3.425 3.81 3.81 0 001.859-3.425v-8.764l7.287 4.37a3.79 3.79 0 002.922.4 3.712 3.712 0 002.3-1.844c1.057-1.9.44-4.28-1.4-5.422" stroke="none" fill="#29b5e8" fill-rule="nonzero"/></symbol></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round" viewBox="0 0 63 66"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><path fill="#29b5e8" fill-rule="nonzero" stroke="none" d="m8.645 15.304 13.008 7.8a3.72 3.72 0 0 0 4.589-.601 4 4 0 0 0 1.227-2.908V3.962a3.81 3.81 0 0 0-1.861-3.42 3.81 3.81 0 0 0-3.893 0 3.81 3.81 0 0 0-1.861 3.42v8.896l-7.387-4.43a3.8 3.8 0 0 0-2.922-.4 3.7 3.7 0 0 0-2.3 1.844 4.05 4.05 0 0 0 1.4 5.422m31.27 7.8 13.008-7.8a4.056 4.056 0 0 0 1.4-5.424 3.75 3.75 0 0 0-5.22-1.452l-7.3 4.37v-8.84A3.81 3.81 0 0 0 39.94.534a3.81 3.81 0 0 0-3.889 0 3.81 3.81 0 0 0-1.863 3.414v15.323a4.1 4.1 0 0 0 .494 2.367 3.75 3.75 0 0 0 2.3 1.844 3.7 3.7 0 0 0 2.922-.4m-11.567 8.894c.013-.25.108-.5.272-.68l1.52-1.58a1.06 1.06 0 0 1 .658-.282h.057a1.05 1.05 0 0 1 .656.282l1.52 1.58a1.12 1.12 0 0 1 .272.681v.06a1.13 1.13 0 0 1-.272.683L31.5 34.3a1.04 1.04 0 0 1-.656.284h-.057a1.04 1.04 0 0 1-.658-.284l-1.52-1.58a1.13 1.13 0 0 1-.272-.683zm-4.604-.65v1.364a1.54 1.54 0 0 0 .372.93l5.16 5.357a1.42 1.42 0 0 0 .895.386h1.312a1.42 1.42 0 0 0 .895-.386l5.16-5.357a1.54 1.54 0 0 0 .372-.93v-1.364a1.54 1.54 0 0 0-.372-.93l-5.16-5.357a1.42 1.42 0 0 0-.895-.386H30.16a1.42 1.42 0 0 0-.895.386l-5.16 5.367a1.55 1.55 0 0 0-.372.93m-21.818-3.71 7.365 4.417-7.365 4.413A4.06 4.06 0 0 0 .516 41.88a3.75 3.75 0 0 0 2.3 1.844 3.75 3.75 0 0 0 2.922-.392l13.008-7.8a4.11 4.11 0 0 0 1.9-3.492 4.16 4.16 0 0 0-1.9-3.492l-13.008-7.8a3.8 3.8 0 0 0-2.922-.4 3.7 3.7 0 0 0-2.3 1.844 4.053 4.053 0 0 0 1.4 5.422m38.995 4.442a4 4 0 0 0 1.91 3.477l13 7.8a3.745 3.745 0 0 0 5.22-1.451 4.05 4.05 0 0 0-1.4-5.424l-7.356-4.414 7.365-4.417a4.054 4.054 0 0 0 1.4-5.422 3.74 3.74 0 0 0-2.3-1.844 3.7 3.7 0 0 0-2.92.4l-13 7.8a4 4 0 0 0-1.91 3.507m-16.655 8.446a3.7 3.7 0 0 0-2.611.464l-13.008 7.8a4.055 4.055 0 0 0-1.4 5.422 3.74 3.74 0 0 0 2.3 1.843 3.75 3.75 0 0 0 2.922-.392l7.387-4.43v8.83a3.81 3.81 0 0 0 5.755 3.425 3.81 3.81 0 0 0 1.858-3.425V44.406a3.91 3.91 0 0 0-3.205-3.903m28.66 8.276-13.008-7.8a3.75 3.75 0 0 0-2.922-.392 3.74 3.74 0 0 0-2.3 1.843 4.1 4.1 0 0 0-.494 2.37v15.25a3.81 3.81 0 0 0 5.755 3.425 3.81 3.81 0 0 0 1.859-3.425v-8.764l7.287 4.37a3.8 3.8 0 0 0 2.922.4 3.7 3.7 0 0 0 2.3-1.844c1.057-1.9.44-4.28-1.4-5.422"/></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/SplitInBatches/SplitInBatches.node.json b/packages/nodes-base/nodes/SplitInBatches/SplitInBatches.node.json
index 33cd361076f48..56b942098dec9 100644
--- a/packages/nodes-base/nodes/SplitInBatches/SplitInBatches.node.json
+++ b/packages/nodes-base/nodes/SplitInBatches/SplitInBatches.node.json
@@ -22,7 +22,7 @@
 			}
 		]
 	},
-	"alias": ["Loop"],
+	"alias": ["Loop", "Concatenate", "Batch", "Split", "Split In Batches"],
 	"subcategories": {
 		"Core Nodes": ["Flow"]
 	}
diff --git a/packages/nodes-base/nodes/SplitInBatches/SplitInBatches.node.ts b/packages/nodes-base/nodes/SplitInBatches/SplitInBatches.node.ts
index 2c322603314de..befc773106020 100644
--- a/packages/nodes-base/nodes/SplitInBatches/SplitInBatches.node.ts
+++ b/packages/nodes-base/nodes/SplitInBatches/SplitInBatches.node.ts
@@ -2,6 +2,8 @@ import type { INodeTypeBaseDescription, IVersionedNodeType } from 'n8n-workflow'
 import { VersionedNodeType } from 'n8n-workflow';
 
 import { SplitInBatchesV1 } from './v1/SplitInBatchesV1.node';
+import { SplitInBatchesV2 } from './v2/SplitInBatchesV2.node';
+import { SplitInBatchesV3 } from './v3/SplitInBatchesV3.node';
 
 export class SplitInBatches extends VersionedNodeType {
 	constructor() {
@@ -11,12 +13,13 @@ export class SplitInBatches extends VersionedNodeType {
 			icon: 'fa:th-large',
 			group: ['organization'],
 			description: 'Split data into batches and iterate over each batch',
-			defaultVersion: 1,
+			defaultVersion: 3,
 		};
 
 		const nodeVersions: IVersionedNodeType['nodeVersions'] = {
 			1: new SplitInBatchesV1(),
-			2: new SplitInBatchesV1(),
+			2: new SplitInBatchesV2(),
+			3: new SplitInBatchesV3(),
 		};
 
 		super(nodeVersions, baseDescription);
diff --git a/packages/nodes-base/nodes/SplitInBatches/test/SplitInBatches.node.test.ts b/packages/nodes-base/nodes/SplitInBatches/test/SplitInBatches.node.test.ts
index 21e55f4fd89e3..708919f602a81 100644
--- a/packages/nodes-base/nodes/SplitInBatches/test/SplitInBatches.node.test.ts
+++ b/packages/nodes-base/nodes/SplitInBatches/test/SplitInBatches.node.test.ts
@@ -1,4 +1,4 @@
-import { testWorkflows, getWorkflowFilenames } from '../../../test/nodes/Helpers';
+import { testWorkflows, getWorkflowFilenames } from '@test/nodes/Helpers';
 const workflows = getWorkflowFilenames(__dirname);
 
 describe('Execute SplitInBatches Node', () => testWorkflows(workflows));
diff --git a/packages/nodes-base/nodes/SplitInBatches/test/SplitInBatches.workflow_v2_done_variable.json b/packages/nodes-base/nodes/SplitInBatches/test/SplitInBatches.workflow_v2_done_variable.json
new file mode 100644
index 0000000000000..d9d239adc01ed
--- /dev/null
+++ b/packages/nodes-base/nodes/SplitInBatches/test/SplitInBatches.workflow_v2_done_variable.json
@@ -0,0 +1,738 @@
+{
+	"name": "My workflow 91",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "75920640-6f1e-41dc-b8c0-bc2f21c823a5",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [740, 1100]
+		},
+		{
+			"parameters": {
+				"conditions": {
+					"boolean": [
+						{
+							"value1": "={{ $node[\"Split In Batches 3_2\"].context[\"noItemsLeft\"] }}",
+							"value2": true
+						}
+					]
+				}
+			},
+			"id": "ca59e1fe-83df-4cf8-9cbb-d3ea6a8a7247",
+			"name": "No Items Left",
+			"type": "n8n-nodes-base.if",
+			"typeVersion": 1,
+			"position": [2320, 1560]
+		},
+		{
+			"parameters": {
+				"batchSize": 1,
+				"options": {}
+			},
+			"id": "21991c05-c919-405b-a0d7-e1dafa5a5e74",
+			"name": "Split In Batches 1",
+			"type": "n8n-nodes-base.splitInBatches",
+			"typeVersion": 2,
+			"position": [1220, 840]
+		},
+		{
+			"parameters": {
+				"batchSize": 1,
+				"options": {
+					"reset": "={{ $node[\"Split In Batches 1_2\"].context[\"done\"] }}"
+				}
+			},
+			"id": "3b3ecf28-b865-4995-a34d-587047b9887a",
+			"name": "Split In Batches 1_2",
+			"type": "n8n-nodes-base.splitInBatches",
+			"typeVersion": 2,
+			"position": [1840, 900]
+		},
+		{
+			"parameters": {
+				"content": "# V2 with done branch and \"done\" variable",
+				"height": 221.18781425126934
+			},
+			"id": "558ca8c2-1d75-44c1-81ee-8614e1bdc36a",
+			"name": "Sticky Note",
+			"type": "n8n-nodes-base.stickyNote",
+			"typeVersion": 1,
+			"position": [660, 816.8121857487308]
+		},
+		{
+			"parameters": {
+				"content": "# V2 with IF",
+				"height": 113.61217587373169
+			},
+			"id": "08957c26-00d4-459b-9497-7b0636086575",
+			"name": "Sticky Note4",
+			"type": "n8n-nodes-base.stickyNote",
+			"typeVersion": 1,
+			"position": [660, 1320]
+		},
+		{
+			"parameters": {
+				"conditions": {
+					"boolean": [
+						{
+							"value1": "={{ $node[\"Split In Batches 2_2\"].context[\"noItemsLeft\"] }}",
+							"value2": true
+						}
+					]
+				}
+			},
+			"id": "a38109ba-672e-4bd0-ac66-e243d53d2252",
+			"name": "No Items Left2",
+			"type": "n8n-nodes-base.if",
+			"typeVersion": 1,
+			"position": [2320, 1320]
+		},
+		{
+			"parameters": {
+				"content": "# V1 with IF",
+				"height": 113.61217587373169
+			},
+			"id": "d5f45e34-21f6-4dc0-bf54-2bbbea561aed",
+			"name": "Sticky Note8",
+			"type": "n8n-nodes-base.stickyNote",
+			"typeVersion": 1,
+			"position": [660, 1560]
+		},
+		{
+			"parameters": {
+				"conditions": {
+					"boolean": [
+						{
+							"value1": "={{ $node[\"Split In Batches 3\"].context[\"noItemsLeft\"] }}",
+							"value2": true
+						}
+					]
+				}
+			},
+			"id": "1787b55b-4e33-4034-8043-33d21e78cd30",
+			"name": "IF",
+			"type": "n8n-nodes-base.if",
+			"typeVersion": 1,
+			"position": [2540, 1540]
+		},
+		{
+			"parameters": {
+				"conditions": {
+					"boolean": [
+						{
+							"value1": "={{ $node[\"Split In Batches 2\"].context[\"noItemsLeft\"] }}",
+							"value2": true
+						}
+					]
+				}
+			},
+			"id": "e149b5d7-7a7f-4939-88e4-789e987cf280",
+			"name": "IF1",
+			"type": "n8n-nodes-base.if",
+			"typeVersion": 1,
+			"position": [2540, 1300]
+		},
+		{
+			"parameters": {
+				"jsCode": "return [\n  {\n    key: '0'\n  },\n  {\n    key: '1'\n  }\n];"
+			},
+			"id": "cf21ca09-ca2e-4334-a6ea-e7453d8598ca",
+			"name": "Mock Data 1",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [1000, 840]
+		},
+		{
+			"parameters": {
+				"jsCode": "return [\n  {\n    key: '10_' + $runIndex\n  },\n  {\n    key: '11_' + $runIndex\n  },\n  {\n    key: '12_' + $runIndex\n  },\n  {\n    key: '13_' + $runIndex\n  },\n  {\n    key: '14_' + $runIndex\n  },\n];"
+			},
+			"id": "2a62fdd8-5e6c-468b-88af-bddd0475ff4a",
+			"name": "Mock Data 1_2",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [1580, 820]
+		},
+		{
+			"parameters": {
+				"jsCode": "return [\n  {\n    key: '0'\n  },\n  {\n    key: '1'\n  }\n];"
+			},
+			"id": "f4b7b020-7d07-4aff-a99b-f0d6bfe656ff",
+			"name": "Mock Data 2",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [1000, 1280]
+		},
+		{
+			"parameters": {
+				"jsCode": "return [\n  {\n    key: '10_' + $runIndex\n  },\n  {\n    key: '11_' + $runIndex\n  },\n  {\n    key: '12_' + $runIndex\n  },\n  {\n    key: '13_' + $runIndex\n  },\n  {\n    key: '14_' + $runIndex\n  },\n];"
+			},
+			"id": "9f9e4c1f-5dfc-45f6-ac48-ccd02d42e54c",
+			"name": "Mock Data 2_2",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [1580, 1260]
+		},
+		{
+			"parameters": {
+				"jsCode": "return [\n  {\n    key: '0'\n  },\n  {\n    key: '1'\n  }\n];"
+			},
+			"id": "d20015b3-6e15-4094-bd18-c62be7fbcf9e",
+			"name": "Mock Data 3",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [1000, 1560]
+		},
+		{
+			"parameters": {
+				"jsCode": "return [\n  {\n    key: '10_' + $runIndex\n  },\n  {\n    key: '11_' + $runIndex\n  },\n  {\n    key: '12_' + $runIndex\n  },\n  {\n    key: '13_' + $runIndex\n  },\n  {\n    key: '14_' + $runIndex\n  },\n];"
+			},
+			"id": "9b8f1472-3913-44ae-9e8c-e8bf01d5ea3c",
+			"name": "Mock Data 3_2",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [1580, 1560]
+		},
+		{
+			"parameters": {},
+			"id": "11b6d860-ce7b-4e5c-b5eb-5ec4387092c1",
+			"name": "Results 1",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1400, 920]
+		},
+		{
+			"parameters": {
+				"jsCode": "let results = [],\n  i = 0;\n\ndo {\n  try {\n    results = results.concat($(\"Some Operation 2\").all(0, i));\n  } catch (error) {\n    return results;\n  }\n  i++;\n} while (true);\n"
+			},
+			"id": "84277fcb-2749-49f3-83f3-7132848f3a0b",
+			"name": "Result 2",
+			"type": "n8n-nodes-base.code",
+			"position": [2860, 1280],
+			"typeVersion": 1
+		},
+		{
+			"parameters": {
+				"jsCode": "let results = [],\n  i = 0;\n\ndo {\n  try {\n    results = results.concat($(\"Some Operation 3\").all(0, i));\n  } catch (error) {\n    return results;\n  }\n  i++;\n} while (true);\n"
+			},
+			"id": "fd9de431-a537-44a6-a4e2-68825768bb1d",
+			"name": "Result 3",
+			"type": "n8n-nodes-base.code",
+			"position": [2860, 1520],
+			"typeVersion": 1
+		},
+		{
+			"parameters": {},
+			"id": "9a62eed8-9c40-4763-92e9-9633b77a37cf",
+			"name": "Some Operation 1",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [2100, 880]
+		},
+		{
+			"parameters": {},
+			"id": "cb35f9e6-7379-484b-b770-5eecba535a83",
+			"name": "Some Operation 2",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [2100, 1320]
+		},
+		{
+			"parameters": {},
+			"id": "62a66c9d-2a66-4c77-b4a2-0db89574074d",
+			"name": "Some Operation 3",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [2100, 1560]
+		},
+		{
+			"parameters": {
+				"batchSize": 1,
+				"options": {}
+			},
+			"id": "2ac3d20c-8891-4854-bca1-188f0e9542ac",
+			"name": "Split In Batches 3",
+			"type": "n8n-nodes-base.splitInBatches",
+			"typeVersion": 1,
+			"position": [1220, 1560]
+		},
+		{
+			"parameters": {
+				"batchSize": 1,
+				"options": {}
+			},
+			"id": "d37b3b09-1255-486d-99ed-cffcc9f87548",
+			"name": "Split In Batches 2",
+			"type": "n8n-nodes-base.splitInBatches",
+			"typeVersion": 2,
+			"position": [1220, 1280]
+		},
+		{
+			"parameters": {
+				"batchSize": 1,
+				"options": {
+					"reset": "={{ $node[\"Split In Batches 3_2\"].context[\"noItemsLeft\"] }}"
+				}
+			},
+			"id": "89a74a96-e3f7-4306-b68b-fa82254ccca3",
+			"name": "Split In Batches 3_2",
+			"type": "n8n-nodes-base.splitInBatches",
+			"typeVersion": 1,
+			"position": [1840, 1560]
+		},
+		{
+			"parameters": {
+				"batchSize": 1,
+				"options": {
+					"reset": "={{ $node[\"Split In Batches 2_2\"].context[\"noItemsLeft\"] }}"
+				}
+			},
+			"id": "2cc3f863-e388-494f-ba9d-e18ac28df5ee",
+			"name": "Split In Batches 2_2",
+			"type": "n8n-nodes-base.splitInBatches",
+			"typeVersion": 2,
+			"position": [1840, 1340]
+		}
+	],
+	"pinData": {
+		"Results 1": [
+			{
+				"json": {
+					"key": "10_0"
+				}
+			},
+			{
+				"json": {
+					"key": "11_0"
+				}
+			},
+			{
+				"json": {
+					"key": "12_0"
+				}
+			},
+			{
+				"json": {
+					"key": "13_0"
+				}
+			},
+			{
+				"json": {
+					"key": "14_0"
+				}
+			},
+			{
+				"json": {
+					"key": "10_1"
+				}
+			},
+			{
+				"json": {
+					"key": "11_1"
+				}
+			},
+			{
+				"json": {
+					"key": "12_1"
+				}
+			},
+			{
+				"json": {
+					"key": "13_1"
+				}
+			},
+			{
+				"json": {
+					"key": "14_1"
+				}
+			}
+		],
+		"Result 3": [
+			{
+				"json": {
+					"key": "10_0"
+				}
+			},
+			{
+				"json": {
+					"key": "11_0"
+				}
+			},
+			{
+				"json": {
+					"key": "12_0"
+				}
+			},
+			{
+				"json": {
+					"key": "13_0"
+				}
+			},
+			{
+				"json": {
+					"key": "14_0"
+				}
+			},
+			{
+				"json": {
+					"key": "10_1"
+				}
+			},
+			{
+				"json": {
+					"key": "11_1"
+				}
+			},
+			{
+				"json": {
+					"key": "12_1"
+				}
+			},
+			{
+				"json": {
+					"key": "13_1"
+				}
+			},
+			{
+				"json": {
+					"key": "14_1"
+				}
+			}
+		],
+		"Result 2": [
+			{
+				"json": {
+					"key": "10_0"
+				}
+			},
+			{
+				"json": {
+					"key": "11_0"
+				}
+			},
+			{
+				"json": {
+					"key": "12_0"
+				}
+			},
+			{
+				"json": {
+					"key": "13_0"
+				}
+			},
+			{
+				"json": {
+					"key": "14_0"
+				}
+			},
+			{
+				"json": {
+					"key": "10_1"
+				}
+			},
+			{
+				"json": {
+					"key": "11_1"
+				}
+			},
+			{
+				"json": {
+					"key": "12_1"
+				}
+			},
+			{
+				"json": {
+					"key": "13_1"
+				}
+			},
+			{
+				"json": {
+					"key": "14_1"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Mock Data 1",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Mock Data 2",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Mock Data 3",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"No Items Left": {
+			"main": [
+				[
+					{
+						"node": "IF",
+						"type": "main",
+						"index": 0
+					}
+				],
+				[
+					{
+						"node": "Split In Batches 3_2",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Split In Batches 1": {
+			"main": [
+				[
+					{
+						"node": "Mock Data 1_2",
+						"type": "main",
+						"index": 0
+					}
+				],
+				[
+					{
+						"node": "Results 1",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Split In Batches 1_2": {
+			"main": [
+				[
+					{
+						"node": "Some Operation 1",
+						"type": "main",
+						"index": 0
+					}
+				],
+				[
+					{
+						"node": "Split In Batches 1",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"No Items Left2": {
+			"main": [
+				[
+					{
+						"node": "IF1",
+						"type": "main",
+						"index": 0
+					}
+				],
+				[
+					{
+						"node": "Split In Batches 2_2",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"IF": {
+			"main": [
+				[
+					{
+						"node": "Result 3",
+						"type": "main",
+						"index": 0
+					}
+				],
+				[
+					{
+						"node": "Split In Batches 3",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"IF1": {
+			"main": [
+				[
+					{
+						"node": "Result 2",
+						"type": "main",
+						"index": 0
+					}
+				],
+				[
+					{
+						"node": "Split In Batches 2",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Mock Data 1": {
+			"main": [
+				[
+					{
+						"node": "Split In Batches 1",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Mock Data 1_2": {
+			"main": [
+				[
+					{
+						"node": "Split In Batches 1_2",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Mock Data 2": {
+			"main": [
+				[
+					{
+						"node": "Split In Batches 2",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Mock Data 2_2": {
+			"main": [
+				[
+					{
+						"node": "Split In Batches 2_2",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Mock Data 3": {
+			"main": [
+				[
+					{
+						"node": "Split In Batches 3",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Mock Data 3_2": {
+			"main": [
+				[
+					{
+						"node": "Split In Batches 3_2",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Some Operation 1": {
+			"main": [
+				[
+					{
+						"node": "Split In Batches 1_2",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Some Operation 2": {
+			"main": [
+				[
+					{
+						"node": "No Items Left2",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Some Operation 3": {
+			"main": [
+				[
+					{
+						"node": "No Items Left",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Split In Batches 3": {
+			"main": [
+				[
+					{
+						"node": "Mock Data 3_2",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Split In Batches 2": {
+			"main": [
+				[
+					{
+						"node": "Mock Data 2_2",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Split In Batches 3_2": {
+			"main": [
+				[
+					{
+						"node": "Some Operation 3",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Split In Batches 2_2": {
+			"main": [
+				[
+					{
+						"node": "Some Operation 2",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {},
+	"versionId": "027162aa-0b6a-4cd5-9bf6-345b70c83f2d",
+	"id": "1124",
+	"meta": {
+		"instanceId": "021d3c82ba2d3bc090cbf4fc81c9312668bcc34297e022bb3438c5c88a43a5ff"
+	},
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/SplitInBatches/v2/SplitInBatchesV2.node.ts b/packages/nodes-base/nodes/SplitInBatches/v2/SplitInBatchesV2.node.ts
index 31252fd48384a..27405a039c7eb 100644
--- a/packages/nodes-base/nodes/SplitInBatches/v2/SplitInBatchesV2.node.ts
+++ b/packages/nodes-base/nodes/SplitInBatches/v2/SplitInBatchesV2.node.ts
@@ -153,9 +153,12 @@ export class SplitInBatchesV2 implements INodeType {
 		nodeContext.noItemsLeft = nodeContext.items.length === 0;
 
 		if (returnItems.length === 0) {
+			nodeContext.done = true;
 			return [[], nodeContext.processedItems];
 		}
 
+		nodeContext.done = false;
+
 		return [returnItems, []];
 	}
 }
diff --git a/packages/nodes-base/nodes/SplitInBatches/v3/SplitInBatchesV3.node.ts b/packages/nodes-base/nodes/SplitInBatches/v3/SplitInBatchesV3.node.ts
new file mode 100644
index 0000000000000..6e1e416ad3dfc
--- /dev/null
+++ b/packages/nodes-base/nodes/SplitInBatches/v3/SplitInBatchesV3.node.ts
@@ -0,0 +1,164 @@
+/* eslint-disable n8n-nodes-base/node-filename-against-convention */
+import type {
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+	IPairedItemData,
+} from 'n8n-workflow';
+import { deepCopy } from 'n8n-workflow';
+
+export class SplitInBatchesV3 implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Loop Over Items (Split in Batches)',
+		name: 'splitInBatches',
+		icon: 'fa:sync',
+		group: ['organization'],
+		version: 3,
+		description: 'Split data into batches and iterate over each batch',
+		defaults: {
+			name: 'Loop Over Items',
+			color: '#007755',
+		},
+		inputs: ['main'],
+		// eslint-disable-next-line n8n-nodes-base/node-class-description-outputs-wrong
+		outputs: ['main', 'main'],
+		outputNames: ['done', 'loop'],
+		properties: [
+			{
+				displayName:
+					'You may not need this node — n8n nodes automatically run once for each input item. <a href="https://docs.n8n.io/getting-started/key-concepts/looping.html#using-loops-in-n8n" target="_blank">More info</a>',
+				name: 'splitInBatchesNotice',
+				type: 'notice',
+				default: '',
+			},
+			{
+				displayName: 'Batch Size',
+				name: 'batchSize',
+				type: 'number',
+				typeOptions: {
+					minValue: 1,
+				},
+				default: 1,
+				description: 'The number of items to return with each call',
+			},
+			{
+				displayName: 'Options',
+				name: 'options',
+				type: 'collection',
+				placeholder: 'Add Option',
+				default: {},
+				options: [
+					{
+						displayName: 'Reset',
+						name: 'reset',
+						type: 'boolean',
+						default: false,
+						description:
+							'Whether the node will be reset and so with the current input-data newly initialized',
+					},
+				],
+			},
+		],
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][] | null> {
+		// Get the input data and create a new array so that we can remove
+		// items without a problem
+		const items = this.getInputData().slice();
+
+		const nodeContext = this.getContext('node');
+
+		const batchSize = this.getNodeParameter('batchSize', 0) as number;
+
+		const returnItems: INodeExecutionData[] = [];
+
+		const options = this.getNodeParameter('options', 0, {});
+
+		if (nodeContext.items === undefined || options.reset === true) {
+			// Is the first time the node runs
+
+			const sourceData = this.getInputSourceData();
+
+			nodeContext.currentRunIndex = 0;
+			nodeContext.maxRunIndex = Math.ceil(items.length / batchSize);
+			nodeContext.sourceData = deepCopy(sourceData);
+
+			// Get the items which should be returned
+			returnItems.push.apply(returnItems, items.splice(0, batchSize));
+
+			// Save the incoming items to be able to return them for later runs
+			nodeContext.items = [...items];
+
+			// Reset processedItems as they get only added starting from the first iteration
+			nodeContext.processedItems = [];
+		} else {
+			// The node has been called before. So return the next batch of items.
+			nodeContext.currentRunIndex += 1;
+			returnItems.push.apply(
+				returnItems,
+				(nodeContext.items as INodeExecutionData[]).splice(0, batchSize),
+			);
+
+			const addSourceOverwrite = (pairedItem: IPairedItemData | number): IPairedItemData => {
+				if (typeof pairedItem === 'number') {
+					return {
+						item: pairedItem,
+						sourceOverwrite: nodeContext.sourceData,
+					};
+				}
+
+				return {
+					...pairedItem,
+					sourceOverwrite: nodeContext.sourceData,
+				};
+			};
+
+			function getPairedItemInformation(
+				item: INodeExecutionData,
+			): IPairedItemData | IPairedItemData[] {
+				if (item.pairedItem === undefined) {
+					return {
+						item: 0,
+						sourceOverwrite: nodeContext.sourceData,
+					};
+				}
+
+				if (Array.isArray(item.pairedItem)) {
+					return item.pairedItem.map(addSourceOverwrite);
+				}
+
+				return addSourceOverwrite(item.pairedItem);
+			}
+
+			const sourceOverwrite = this.getInputSourceData();
+
+			const newItems = items.map((item, index) => {
+				return {
+					...item,
+					pairedItem: {
+						sourceOverwrite,
+						item: index,
+					},
+				};
+			});
+
+			nodeContext.processedItems = [...nodeContext.processedItems, ...newItems];
+
+			returnItems.map((item) => {
+				item.pairedItem = getPairedItemInformation(item);
+			});
+		}
+
+		nodeContext.noItemsLeft = nodeContext.items.length === 0;
+
+		if (returnItems.length === 0) {
+			nodeContext.done = true;
+			return [nodeContext.processedItems, []];
+		}
+
+		nodeContext.done = false;
+
+		return [[], returnItems];
+	}
+}
diff --git a/packages/nodes-base/nodes/Splunk/GenericFunctions.ts b/packages/nodes-base/nodes/Splunk/GenericFunctions.ts
index 903dd212282ec..5d463efaf51eb 100644
--- a/packages/nodes-base/nodes/Splunk/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Splunk/GenericFunctions.ts
@@ -3,10 +3,10 @@ import type {
 	IDataObject,
 	ILoadOptionsFunctions,
 	JsonObject,
+	IRequestOptions,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
-import { NodeApiError } from 'n8n-workflow';
-
-import type { OptionsWithUri } from 'request';
+import { NodeApiError, NodeOperationError, sleep } from 'n8n-workflow';
 
 import { parseString } from 'xml2js';
 
@@ -90,7 +90,7 @@ export function formatSearch(responseData: SplunkSearchResponse) {
 // ----------------------------------------
 
 export async function parseXml(xml: string) {
-	return new Promise((resolve, reject) => {
+	return await new Promise((resolve, reject) => {
 		parseString(xml, { explicitArray: false }, (error, result) => {
 			error ? reject(error) : resolve(result);
 		});
@@ -108,7 +108,7 @@ export function toUnixEpoch(timestamp: string) {
 
 export async function splunkApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject = {},
 	qs: IDataObject = {},
@@ -117,7 +117,7 @@ export async function splunkApiRequest(
 		'splunkApi',
 	)) as SplunkCredentials;
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			Authorization: `Bearer ${authToken}`,
 			'Content-Type': 'application/x-www-form-urlencoded',
@@ -139,9 +139,29 @@ export async function splunkApiRequest(
 		delete options.qs;
 	}
 
+	let result;
 	try {
-		return await this.helpers.request(options).then(parseXml);
+		let attempts = 0;
+
+		do {
+			try {
+				const response = await this.helpers.request(options);
+				result = await parseXml(response);
+				return result;
+			} catch (error) {
+				if (attempts >= 5) {
+					throw error;
+				}
+				await sleep(1000);
+				attempts++;
+			}
+		} while (true);
 	} catch (error) {
+		if (result === undefined) {
+			throw new NodeOperationError(this.getNode(), 'No response from API call', {
+				description: "Try to use 'Retry On Fail' option from node's settings",
+			});
+		}
 		if (error?.cause?.code === 'ECONNREFUSED') {
 			throw new NodeApiError(this.getNode(), { ...(error as JsonObject), code: 401 });
 		}
diff --git a/packages/nodes-base/nodes/Splunk/Splunk.node.ts b/packages/nodes-base/nodes/Splunk/Splunk.node.ts
index 7fbbab14fbf07..2e220fe1f7210 100644
--- a/packages/nodes-base/nodes/Splunk/Splunk.node.ts
+++ b/packages/nodes-base/nodes/Splunk/Splunk.node.ts
@@ -1,13 +1,16 @@
-import type {
-	IExecuteFunctions,
-	ICredentialsDecrypted,
-	ICredentialTestFunctions,
-	IDataObject,
-	ILoadOptionsFunctions,
-	INodeCredentialTestResult,
-	INodeExecutionData,
-	INodeType,
-	INodeTypeDescription,
+import {
+	type IExecuteFunctions,
+	type ICredentialsDecrypted,
+	type ICredentialTestFunctions,
+	type IDataObject,
+	type ILoadOptionsFunctions,
+	type INodeCredentialTestResult,
+	type INodeExecutionData,
+	type INodeType,
+	type INodeTypeDescription,
+	type IRequestOptions,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -34,8 +37,7 @@ import {
 } from './descriptions';
 
 import type { SplunkCredentials, SplunkFeedResponse } from './types';
-
-import type { OptionsWithUri } from 'request';
+import set from 'lodash/set';
 
 export class Splunk implements INodeType {
 	description: INodeTypeDescription = {
@@ -125,7 +127,7 @@ export class Splunk implements INodeType {
 
 				const endpoint = '/services/alerts/fired_alerts';
 
-				const options: OptionsWithUri = {
+				const options: IRequestOptions = {
 					headers: {
 						Authorization: `Bearer ${authToken}`,
 						'Content-Type': 'application/x-www-form-urlencoded',
@@ -156,7 +158,7 @@ export class Splunk implements INodeType {
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const items = this.getInputData();
-		const returnData: IDataObject[] = [];
+		const returnData: INodeExecutionData[] = [];
 
 		const resource = this.getNodeParameter('resource', 0);
 		const operation = this.getNodeParameter('operation', 0);
@@ -455,18 +457,30 @@ export class Splunk implements INodeType {
 				}
 			} catch (error) {
 				if (this.continueOnFail()) {
-					returnData.push({ error: error.cause.error });
+					returnData.push({ json: { error: error.cause.error }, pairedItem: { item: i } });
 					continue;
 				}
 
-				throw error;
+				if (error instanceof NodeApiError) {
+					set(error, 'context.itemIndex', i);
+				}
+
+				if (error instanceof NodeOperationError && error?.context?.itemIndex === undefined) {
+					set(error, 'context.itemIndex', i);
+				}
+
+				throw new NodeOperationError(this.getNode(), error, { itemIndex: i });
 			}
 
-			Array.isArray(responseData)
-				? returnData.push(...(responseData as IDataObject[]))
-				: returnData.push(responseData as IDataObject);
+			if (Array.isArray(responseData)) {
+				for (const item of responseData) {
+					returnData.push({ json: item, pairedItem: { item: i } });
+				}
+			} else {
+				returnData.push({ json: responseData, pairedItem: { item: i } });
+			}
 		}
 
-		return [this.helpers.returnJsonArray(returnData)];
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Splunk/splunk.svg b/packages/nodes-base/nodes/Splunk/splunk.svg
index 808255d4fb9f5..8eb25b4a26ff0 100644
--- a/packages/nodes-base/nodes/Splunk/splunk.svg
+++ b/packages/nodes-base/nodes/Splunk/splunk.svg
@@ -1,3 +1,134 @@
-<svg width="200" height="136" viewBox="2 25 102 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.9281 21.8019C12.9281 22.6038 12.7585 23.3491 12.4193 24.0377C12.0801 24.717 11.5995 25.3019 10.9964 25.7736C10.3839 26.2547 9.65838 26.6226 8.81975 26.8868C7.98112 27.1509 7.05769 27.283 6.05887 27.283C4.86218 27.283 3.78798 27.1226 2.8457 26.7925C1.90342 26.4717 0.951704 25.9245 0 25.1698L1.57362 22.6132C2.32744 23.2453 3.00588 23.7076 3.61836 24C4.22142 24.2925 4.84333 24.434 5.48408 24.434C6.26618 24.434 6.88808 24.2358 7.36865 23.8302C7.84921 23.4245 8.07536 22.8868 8.07536 22.1981C8.07536 21.9057 8.02824 21.6321 7.94344 21.3774C7.85863 21.1226 7.69844 20.8585 7.4723 20.5849C7.24615 20.3208 6.92578 20.0189 6.52059 19.7076C6.12484 19.3962 5.60658 19 4.96583 18.5377C4.48527 18.1981 4.00469 17.8396 3.54298 17.4811C3.08126 17.1132 2.66666 16.7264 2.28033 16.3113C1.90342 15.8962 1.60188 15.434 1.36631 14.9151C1.14016 14.4057 1.01767 13.8113 1.01767 13.1604C1.01767 12.4057 1.17786 11.7075 1.48881 11.0849C1.79976 10.4623 2.23321 9.93396 2.77973 9.49056C3.32625 9.04717 3.97643 8.70754 4.7491 8.46226C5.51235 8.21698 6.34156 8.09435 7.24615 8.09435C8.19785 8.09435 9.11186 8.21699 9.9976 8.4717C10.8833 8.72642 11.7031 9.09434 12.4664 9.5849L11.0435 11.8868C10.073 11.2075 9.0459 10.8585 7.9717 10.8585C7.32152 10.8585 6.77501 11.0283 6.35098 11.3679C5.92695 11.7075 5.71022 12.1321 5.71022 12.6509C5.71022 13.1415 5.89868 13.5849 6.27559 13.9717C6.6525 14.3679 7.30269 14.9057 8.22612 15.6226C9.15898 16.3019 9.93165 16.9057 10.5347 17.4151C11.1472 17.9245 11.6278 18.4151 11.9858 18.8679C12.3439 19.3208 12.5795 19.7736 12.7208 20.2453C12.8621 20.7264 12.9281 21.2358 12.9281 21.8019ZM29.0882 17.4906C29.0882 18.1981 29.0128 18.9623 28.8621 19.783C28.7207 20.6038 28.4663 21.3585 28.1083 22.0566C27.7502 22.7547 27.2885 23.3302 26.7137 23.7736C26.1389 24.2264 25.4039 24.4528 24.5276 24.4528C23.0576 24.4528 21.8986 23.8679 21.0506 22.6887C20.2025 21.5189 19.7785 19.9057 19.7785 17.8585C19.7785 15.7547 20.2025 14.0943 21.0694 12.8585C21.9269 11.6226 23.0953 11.0094 24.5653 11.0094C25.9599 11.0094 27.0623 11.5943 27.8727 12.7453C28.6831 13.9057 29.0882 15.4906 29.0882 17.4906ZM34.1954 17.3113C34.1954 15.9434 33.9975 14.6981 33.6112 13.5849C33.2154 12.4623 32.6689 11.5 31.9433 10.6887C31.2178 9.87736 30.3697 9.25472 29.3803 8.80189C28.3909 8.34906 27.2979 8.12264 26.1012 8.12264C24.782 8.12264 23.623 8.37736 22.6242 8.86793C21.6254 9.36793 20.6925 10.1509 19.8444 11.2264L19.8162 8.5566H15.1142V36H19.8068V24.4057C20.2685 24.9434 20.7113 25.3962 21.1448 25.7642C21.5688 26.1321 22.0023 26.434 22.4452 26.6604C22.888 26.8868 23.3497 27.0566 23.8397 27.151C24.3297 27.2453 24.8574 27.2925 25.4133 27.2925C26.6571 27.2925 27.8256 27.0377 28.8998 26.5472C29.974 26.0472 30.9068 25.3491 31.6889 24.4434C32.471 23.5377 33.0835 22.4811 33.5264 21.283C33.9787 20.0755 34.1954 18.7453 34.1954 17.3113ZM36.2873 26.8491H41.1117V0H36.2873V26.8491ZM61.6912 26.8585V8.53774H56.8667V18.3962C56.8667 19.2736 56.829 19.9528 56.7536 20.434C56.6782 20.9151 56.5557 21.3396 56.3861 21.7359C55.7077 23.2453 54.4544 24.0094 52.6358 24.0094C51.213 24.0094 50.2236 23.5 49.6582 22.4717C49.4321 22.0849 49.2813 21.6415 49.1965 21.1509C49.1117 20.6604 49.0646 19.9528 49.0646 19.0189V8.53774H44.2401V18.9434C44.2401 19.6509 44.2495 20.2547 44.259 20.7359C44.2684 21.217 44.3061 21.6604 44.3532 22.0377C44.4003 22.4151 44.4568 22.7547 44.5228 23.0472C44.5793 23.3396 44.6736 23.6226 44.7961 23.8868C45.2389 25.0094 45.9456 25.8585 46.935 26.434C47.9244 27.0094 49.14 27.2925 50.5723 27.2925C51.8632 27.2925 53.0033 27.066 53.9833 26.6132C54.9633 26.1604 55.915 25.4245 56.8384 24.3962L56.8478 26.8491L61.6912 26.8585ZM82.4779 26.8491V16.4623C82.4779 15.7547 82.4685 15.1509 82.459 14.6509C82.4496 14.1509 82.4214 13.717 82.3648 13.3491C82.3177 12.9811 82.2518 12.6604 82.1858 12.3868C82.1104 12.1038 82.0256 11.8302 81.9314 11.566C81.4885 10.4717 80.7818 9.62264 79.7924 9.0283C78.803 8.43396 77.5874 8.13207 76.1458 8.13207C74.8548 8.13207 73.7147 8.35849 72.7347 8.81132C71.7547 9.26415 70.803 10.0094 69.8796 11.0283L69.8702 8.57547H65.0174V26.8585H69.8796V16.9906C69.8796 16.1415 69.9079 15.4717 69.9738 15C70.0303 14.5283 70.1529 14.0849 70.3225 13.6604C70.6334 12.9245 71.1234 12.3774 71.7736 12C72.4238 11.6226 73.1964 11.434 74.101 11.434C75.5239 11.434 76.5133 11.9434 77.0786 12.9717C77.2954 13.3585 77.4461 13.8019 77.5309 14.283C77.6157 14.7642 77.6628 15.4811 77.6628 16.4057V26.8396L82.4779 26.8491ZM102.435 25.6415L95.0856 16.5L101.295 9.83963L97.6392 8.26415L91.1751 15.7641H90.6663V0H85.8041V26.8491H90.6663V17.1226L97.9407 27.217L102.435 25.6415ZM121.225 19.0755V16.0849L106.61 8.74528V12.0377L117.936 17.5566L106.61 23.1509V26.3679L121.225 19.0755ZM108.023 4C107.128 4 106.402 4.73585 106.402 5.64151C106.402 6.56604 107.128 7.29246 108.023 7.29246C108.928 7.29246 109.644 6.56604 109.644 5.64151C109.644 4.72642 108.928 4 108.023 4ZM108.033 4.25471C108.758 4.25471 109.342 4.87736 109.342 5.65095C109.342 6.42453 108.758 7.04717 108.033 7.03773C107.298 7.03773 106.713 6.42453 106.713 5.64151C106.713 4.87736 107.298 4.25471 108.033 4.25471ZM107.722 5.81132H107.919C108.155 5.81132 108.268 5.89623 108.315 6.13208C108.353 6.37736 108.4 6.53774 108.438 6.59434H108.749C108.72 6.53774 108.673 6.42453 108.636 6.14151C108.598 5.86792 108.494 5.72642 108.325 5.69812V5.67924C108.523 5.62264 108.683 5.4717 108.683 5.23585C108.683 5.06604 108.626 4.93396 108.513 4.85849C108.4 4.77359 108.221 4.71698 107.948 4.71698C107.731 4.71698 107.58 4.73585 107.43 4.76415V6.59434H107.722V5.81132ZM107.722 4.96226C107.769 4.95283 107.835 4.9434 107.929 4.9434C108.259 4.9434 108.372 5.10378 108.372 5.26416C108.372 5.49057 108.164 5.57547 107.929 5.57547H107.722V4.96226Z" fill="#0C1724"/>
+<svg width="1200" height="1200" viewBox="0 0 1200 1200" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0)">
+<path d="M600 1200C931.371 1200 1200 931.371 1200 600C1200 268.629 931.371 0 600 0C268.629 0 0 268.629 0 600C0 931.371 268.629 1200 600 1200Z" fill="url(#paint0_linear)"/>
+<path opacity="0.2" fill-rule="evenodd" clip-rule="evenodd" d="M710.16 207.142L556.582 312.306L213.567 -188.585L367.146 -293.749L710.16 207.142Z" fill="url(#paint1_linear)"/>
+<path opacity="0.2" fill-rule="evenodd" clip-rule="evenodd" d="M296.051 314.149L142.473 419.285L-200.52 -81.6L-46.9418 -186.764L296.051 314.149Z" fill="url(#paint2_linear)"/>
+<path opacity="0.2" fill-rule="evenodd" clip-rule="evenodd" d="M428.635 271.287L275.056 376.424L-67.9309 -124.462L85.6473 -229.625L428.635 271.287Z" fill="url(#paint3_linear)"/>
+<path opacity="0.2" fill-rule="evenodd" clip-rule="evenodd" d="M582.966 306.671L429.387 411.807L86.4001 -89.0781L239.978 -194.242L582.966 306.671Z" fill="url(#paint4_linear)"/>
+<path opacity="0.2" fill-rule="evenodd" clip-rule="evenodd" d="M1008.27 254.209L854.695 359.345L511.708 -141.54L665.286 -246.704L1008.27 254.209Z" fill="url(#paint5_linear)"/>
+<path opacity="0.2" fill-rule="evenodd" clip-rule="evenodd" d="M639.049 207.066L485.471 312.229L144.813 -185.269L298.391 -290.433L639.049 207.066Z" fill="url(#paint6_linear)"/>
+<path opacity="0.2" fill-rule="evenodd" clip-rule="evenodd" d="M1282.8 875.449L1129.22 980.591L788.569 483.12L942.148 377.956L1282.8 875.449Z" fill="url(#paint7_linear)"/>
+<path opacity="0.444" fill-rule="evenodd" clip-rule="evenodd" d="M699.469 396.262L545.891 501.425L75.3601 -185.711L228.938 -290.875L699.469 396.262Z" fill="url(#paint8_linear)"/>
+<path opacity="0.444" fill-rule="evenodd" clip-rule="evenodd" d="M1112.22 1556.92L958.642 1662.08L488.084 974.918L641.662 869.755L1112.22 1556.92Z" fill="url(#paint9_linear)"/>
+<path opacity="0.2" fill-rule="evenodd" clip-rule="evenodd" d="M1158.31 1361.07L1004.73 1466.23L664.047 968.733L817.625 863.569L1158.31 1361.07Z" fill="url(#paint10_linear)"/>
+<path opacity="0.444" fill-rule="evenodd" clip-rule="evenodd" d="M425.755 366.796L272.204 471.96L-198 -214.697L-44.4218 -319.838L425.755 366.796Z" fill="url(#paint11_linear)"/>
+<path opacity="0.444" fill-rule="evenodd" clip-rule="evenodd" d="M1496.68 890.815L1343.1 995.978L872.896 309.316L1026.47 204.153L1496.68 890.815Z" fill="url(#paint12_linear)"/>
+<path opacity="0.444" fill-rule="evenodd" clip-rule="evenodd" d="M281.58 708.917L128.002 814.08L-342.196 127.424L-188.618 22.2603L281.58 708.917Z" fill="url(#paint13_linear)"/>
+<path opacity="0.444" fill-rule="evenodd" clip-rule="evenodd" d="M1531.55 1063.06L1378 1168.22L907.8 481.566L1061.38 376.424L1531.55 1063.06Z" fill="url(#paint14_linear)"/>
+<path opacity="0.444" fill-rule="evenodd" clip-rule="evenodd" d="M866.133 208.893L712.582 314.057L242.378 -372.605L395.956 -477.742L866.133 208.893Z" fill="url(#paint15_linear)"/>
+<path opacity="0.444" fill-rule="evenodd" clip-rule="evenodd" d="M919.096 1442.67L765.518 1547.84L295.314 861.18L448.893 756.017L919.096 1442.67Z" fill="url(#paint16_linear)"/>
+<path opacity="0.444" fill-rule="evenodd" clip-rule="evenodd" d="M691.866 198.066L538.287 303.229L68.0837 -383.427L221.662 -488.591L691.866 198.066Z" fill="url(#paint17_linear)"/>
+<path opacity="0.444" fill-rule="evenodd" clip-rule="evenodd" d="M325.915 1194.27L172.336 1299.43L-155.716 820.364L-2.13814 715.2L325.915 1194.27Z" fill="url(#paint18_linear)"/>
+<path opacity="0.4" fill-rule="evenodd" clip-rule="evenodd" d="M1421.45 829.664L1267.88 934.827L924.36 433.14L1077.91 327.971L1421.45 829.664Z" fill="url(#paint19_linear)"/>
+<path opacity="0.4" fill-rule="evenodd" clip-rule="evenodd" d="M743.64 1395.64L590.062 1500.8L246.518 999.109L400.096 893.945L743.64 1395.64Z" fill="url(#paint20_linear)"/>
+<path d="M276.655 637.429C276.655 643.265 275.422 648.66 272.929 653.618C270.464 658.576 267.005 662.765 262.576 666.229C258.147 669.693 252.9 672.387 246.796 674.324C240.698 676.26 234.011 677.225 226.767 677.225C218.089 677.225 210.316 676.053 203.422 673.674C196.56 671.329 189.665 667.396 182.776 661.915L194.182 643.38C199.664 647.984 204.595 651.327 209.024 653.438C213.42 655.549 217.936 656.607 222.545 656.607C228.207 656.607 232.751 655.173 236.209 652.238C239.667 649.304 241.369 645.376 241.369 640.418C241.369 638.307 241.047 636.284 240.431 634.435C239.815 632.585 238.669 630.682 237 628.718C235.331 626.782 233.04 624.644 230.111 622.353C227.209 620.067 223.456 617.22 218.847 613.849C215.329 611.356 211.865 608.804 208.522 606.164C205.151 603.496 202.129 600.682 199.375 597.66C196.647 594.638 194.449 591.294 192.747 587.569C191.078 583.844 190.227 579.595 190.227 574.844C190.227 569.362 191.373 564.344 193.658 559.827C195.944 555.311 199.085 551.471 203.04 548.302C207 545.105 211.751 542.64 217.32 540.884C222.862 539.122 228.905 538.216 235.445 538.216C242.335 538.216 248.995 539.127 255.447 540.971C261.9 542.815 267.851 545.487 273.338 549.005L262.985 565.664C255.916 560.705 248.498 558.245 240.698 558.245C235.947 558.245 231.987 559.478 228.911 561.971C225.802 564.464 224.28 567.545 224.28 571.265C224.28 574.816 225.627 578.013 228.387 580.827C231.115 583.674 235.805 587.629 242.52 592.762C249.267 597.72 254.869 602.056 259.293 605.782C263.722 609.507 267.24 612.998 269.82 616.282C272.4 619.565 274.162 622.882 275.16 626.253C276.158 629.662 276.655 633.355 276.655 637.429ZM393.933 606.196C393.933 611.329 393.404 616.871 392.318 622.795C391.26 628.718 389.416 634.233 386.836 639.245C384.256 644.291 380.885 648.453 376.691 651.709C372.496 654.993 367.216 656.607 360.796 656.607C350.122 656.607 341.705 652.353 335.547 643.849C329.416 635.345 326.34 623.673 326.34 608.804C326.34 593.585 329.449 581.498 335.695 572.558C341.913 563.613 350.389 559.156 361.064 559.156C371.209 559.156 379.216 563.378 385.08 571.767C390.998 580.216 393.933 591.682 393.933 606.196ZM431.002 604.849C431.002 594.938 429.595 585.933 426.747 577.811C423.9 569.656 419.885 562.68 414.665 556.844C409.445 551.007 403.227 546.464 396.071 543.18C388.887 539.924 380.967 538.282 372.289 538.282C362.727 538.282 354.311 540.098 347.04 543.709C339.769 547.347 333.049 553.036 326.864 560.809L326.689 541.456H292.582V740.351H326.662V656.302C330.033 660.202 333.262 663.485 336.371 666.125C339.48 668.793 342.616 670.964 345.813 672.638C349.009 674.313 352.38 675.513 355.931 676.216C359.482 676.92 363.295 677.275 367.369 677.275C376.402 677.275 384.845 675.458 392.651 671.847C400.451 668.209 407.198 663.136 412.887 656.596C418.576 650.056 423.005 642.404 426.202 633.665C429.42 624.878 431.002 615.289 431.002 604.849ZM446.165 674.002H481.151V479.362H446.165V674.002ZM630.54 674.062V541.271H595.555V612.742C595.555 619.107 595.293 624.033 594.764 627.491C594.235 630.949 593.329 634.091 592.096 636.933C587.138 647.902 578.078 653.416 564.911 653.416C554.618 653.416 547.402 649.691 543.327 642.245C541.713 639.431 540.6 636.235 539.984 632.684C539.367 629.133 539.046 624.005 539.046 617.258V541.298H504.055V616.756C504.055 621.889 504.115 626.231 504.202 629.776C504.289 633.322 504.524 636.464 504.878 639.218C505.233 641.973 505.642 644.411 506.078 646.522C506.52 648.633 507.191 650.684 508.075 652.62C511.271 660.774 516.431 666.933 523.62 671.094C530.804 675.256 539.602 677.313 550.042 677.313C559.424 677.313 567.665 675.671 574.762 672.415C581.858 669.131 588.753 663.791 595.495 656.345L595.582 674.116H630.54V674.062ZM781.396 674.002V598.718C781.396 593.585 781.336 589.216 781.249 585.611C781.162 581.973 780.955 578.864 780.573 576.196C780.218 573.556 779.782 571.211 779.253 569.187C778.724 567.164 778.107 565.167 777.404 563.204C774.207 555.256 769.047 549.125 761.858 544.789C754.675 540.447 745.876 538.276 735.404 538.276C726.022 538.276 717.78 539.918 710.684 543.202C703.587 546.485 696.693 551.853 689.951 559.271L689.891 541.5H654.638V673.996H689.918V602.438C689.918 596.253 690.153 591.442 690.595 588.011C691.036 584.58 691.887 581.356 693.147 578.335C695.433 573.027 698.956 569.007 703.675 566.28C708.398 563.553 714.027 562.173 720.595 562.173C730.887 562.173 738.104 565.898 742.178 573.289C743.76 576.104 744.878 579.3 745.495 582.818C746.111 586.336 746.433 591.469 746.433 598.184V673.964H781.391V674.002H781.396ZM926.236 665.264L872.924 598.985L918 550.713L891.491 539.307L844.571 593.651H840.846V479.389H805.565V674.029H840.846V603.496L893.602 676.664L926.236 665.264ZM1062.58 617.694V595.991L956.504 542.765V566.607L1038.7 606.611L956.504 647.138V670.451L1062.58 617.694ZM966.764 508.396C960.251 508.396 954.976 513.704 954.976 520.304C954.976 527.018 960.256 532.271 966.764 532.271C973.331 532.271 978.524 527.024 978.524 520.304C978.524 513.676 973.331 508.396 966.824 508.396H966.764ZM966.824 510.24C972.104 510.24 976.353 514.729 976.353 520.358C976.353 525.96 972.131 530.476 966.824 530.416C961.516 530.416 957.235 525.96 957.235 520.298C957.235 514.724 961.516 510.24 966.764 510.24H966.824ZM964.565 521.504H966.033C967.735 521.504 968.586 522.147 968.88 523.822C969.142 525.584 969.469 526.784 969.791 527.193H972.022C971.815 526.784 971.493 525.96 971.171 523.909C970.909 521.945 970.113 520.887 968.94 520.685V520.565C970.375 520.156 971.52 519.071 971.52 517.342C971.52 516.082 971.078 515.171 970.287 514.587C969.496 513.998 968.176 513.589 966.153 513.589C964.571 513.589 963.513 513.736 962.4 513.911V527.198H964.511V521.509H964.565V521.504ZM964.565 515.373C964.92 515.313 965.416 515.253 966.093 515.253C968.466 515.253 969.316 516.425 969.316 517.571C969.316 519.213 967.822 519.856 966.093 519.856H964.565V515.373Z" fill="white"/>
+</g>
+<defs>
+<linearGradient id="paint0_linear" x1="1096.43" y1="283.718" x2="125.147" y2="902.538" gradientUnits="userSpaceOnUse">
+<stop stop-color="#EC0677"/>
+<stop offset="0.1649" stop-color="#F05A22"/>
+<stop offset="0.2486" stop-color="#F26A21"/>
+<stop offset="0.3729" stop-color="#F58A1F"/>
+<stop offset="0.4425" stop-color="#F37720"/>
+<stop offset="0.5441" stop-color="#F16222"/>
+<stop offset="0.6102" stop-color="#F05A22"/>
+<stop offset="0.6666" stop-color="#F05627"/>
+<stop offset="0.7295" stop-color="#EF4934"/>
+<stop offset="0.7955" stop-color="#EE334A"/>
+<stop offset="0.8632" stop-color="#ED1669"/>
+<stop offset="0.9045" stop-color="#EC0080"/>
+</linearGradient>
+<linearGradient id="paint1_linear" x1="291.269" y1="-238.934" x2="634.115" y2="259.256" gradientUnits="userSpaceOnUse">
+<stop offset="0.5027" stop-color="#E20782"/>
+<stop offset="1" stop-color="white" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="paint2_linear" x1="-53.3055" y1="-30.797" x2="218.517" y2="364.189" gradientUnits="userSpaceOnUse">
+<stop offset="0.0374" stop-color="#E20782" stop-opacity="0.1"/>
+<stop offset="1" stop-color="#E20782"/>
+</linearGradient>
+<linearGradient id="paint3_linear" x1="79.2788" y1="-73.6585" x2="351.102" y2="321.327" gradientUnits="userSpaceOnUse">
+<stop offset="0.0374" stop-color="#E20782" stop-opacity="0.1"/>
+<stop offset="1" stop-color="#E20782"/>
+</linearGradient>
+<linearGradient id="paint4_linear" x1="233.612" y1="-38.275" x2="505.435" y2="356.711" gradientUnits="userSpaceOnUse">
+<stop offset="0.0374" stop-color="#E20782" stop-opacity="0.1"/>
+<stop offset="1" stop-color="#E20782"/>
+</linearGradient>
+<linearGradient id="paint5_linear" x1="658.917" y1="-90.7367" x2="930.74" y2="304.249" gradientUnits="userSpaceOnUse">
+<stop offset="0.0374" stop-color="#E20782" stop-opacity="0.1"/>
+<stop offset="1" stop-color="#E20782"/>
+</linearGradient>
+<linearGradient id="paint6_linear" x1="221.473" y1="-237.099" x2="560.292" y2="255.255" gradientUnits="userSpaceOnUse">
+<stop stop-color="#E20782"/>
+<stop offset="0.7718" stop-color="#E20782" stop-opacity="0.1"/>
+</linearGradient>
+<linearGradient id="paint7_linear" x1="865.218" y1="431.261" x2="1204.04" y2="923.615" gradientUnits="userSpaceOnUse">
+<stop offset="0.2128" stop-color="#E20782" stop-opacity="0.1"/>
+<stop offset="1" stop-color="#E20782"/>
+</linearGradient>
+<linearGradient id="paint8_linear" x1="152.169" y1="-237.349" x2="620.768" y2="442.31" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F89E1C" stop-opacity="0.2"/>
+<stop offset="0.4534" stop-color="#F89E1C"/>
+<stop offset="1" stop-color="#F89E1C" stop-opacity="0.15"/>
+</linearGradient>
+<linearGradient id="paint9_linear" x1="564.872" y1="923.243" x2="1033.47" y2="1602.9" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F89E1C" stop-opacity="0.2"/>
+<stop offset="0.5539" stop-color="#F89E1C" stop-opacity="0.5"/>
+<stop offset="1" stop-color="#F89E1C" stop-opacity="0.15"/>
+</linearGradient>
+<linearGradient id="paint10_linear" x1="740.706" y1="916.883" x2="1079.52" y2="1409.24" gradientUnits="userSpaceOnUse">
+<stop offset="0.2282" stop-color="#E20782" stop-opacity="0.1"/>
+<stop offset="1" stop-color="#E20782"/>
+</linearGradient>
+<linearGradient id="paint11_linear" x1="-121.218" y1="-266.367" x2="347.033" y2="412.791" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F89E1C" stop-opacity="0.2"/>
+<stop offset="0.4418" stop-color="#F89E1C"/>
+<stop offset="1" stop-color="#F89E1C" stop-opacity="0.15"/>
+</linearGradient>
+<linearGradient id="paint12_linear" x1="949.684" y1="257.647" x2="1417.94" y2="936.804" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F89E1C" stop-opacity="0.2"/>
+<stop offset="0.4418" stop-color="#F89E1C"/>
+<stop offset="1" stop-color="#F89E1C" stop-opacity="0.15"/>
+</linearGradient>
+<linearGradient id="paint13_linear" x1="-265.412" y1="75.7488" x2="202.838" y2="754.907" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F89E1C" stop-opacity="0.2"/>
+<stop offset="0.4419" stop-color="#F89E1C"/>
+<stop offset="1" stop-color="#F89E1C" stop-opacity="0.15"/>
+</linearGradient>
+<linearGradient id="paint14_linear" x1="984.581" y1="429.894" x2="1452.83" y2="1109.05" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F89E1C" stop-opacity="0.2"/>
+<stop offset="0.4418" stop-color="#F89E1C"/>
+<stop offset="1" stop-color="#F89E1C" stop-opacity="0.15"/>
+</linearGradient>
+<linearGradient id="paint15_linear" x1="319.16" y1="-424.273" x2="787.41" y2="254.885" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F89E1C" stop-opacity="0.2"/>
+<stop offset="0.4418" stop-color="#F89E1C"/>
+<stop offset="1" stop-color="#F89E1C" stop-opacity="0.15"/>
+</linearGradient>
+<linearGradient id="paint16_linear" x1="372.102" y1="809.506" x2="840.353" y2="1488.66" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F89E1C" stop-opacity="0.1"/>
+<stop offset="0.4404" stop-color="#F89E1C" stop-opacity="0.5"/>
+<stop offset="1" stop-color="#F89E1C" stop-opacity="0.15"/>
+</linearGradient>
+<linearGradient id="paint17_linear" x1="144.87" y1="-435.099" x2="613.121" y2="244.058" gradientUnits="userSpaceOnUse">
+<stop stop-color="#EC008C" stop-opacity="0.2"/>
+<stop offset="0.4418" stop-color="#EC008C"/>
+<stop offset="0.9409" stop-color="#EC008C" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="paint18_linear" x1="-124.77" y1="702.017" x2="249.791" y2="1246.41" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F89E1C" stop-opacity="0"/>
+<stop offset="0.8492" stop-color="#F05A22"/>
+</linearGradient>
+<linearGradient id="paint19_linear" x1="953.168" y1="311.681" x2="1345.48" y2="881.743" gradientUnits="userSpaceOnUse">
+<stop offset="0.3432" stop-color="#E20782" stop-opacity="0.1"/>
+<stop offset="1" stop-color="#E20782"/>
+</linearGradient>
+<linearGradient id="paint20_linear" x1="275.351" y1="877.645" x2="667.661" y2="1447.71" gradientUnits="userSpaceOnUse">
+<stop offset="0.2895" stop-color="#F05A22"/>
+<stop offset="0.8575" stop-color="#E20782" stop-opacity="0.1"/>
+</linearGradient>
+<clipPath id="clip0">
+<path d="M0 600C0 268.629 268.629 0 600 0C931.371 0 1200 268.629 1200 600C1200 931.371 931.371 1200 600 1200C268.629 1200 0 931.371 0 600Z" fill="white"/>
+</clipPath>
+</defs>
 </svg>
diff --git a/packages/nodes-base/nodes/Splunk/types.d.ts b/packages/nodes-base/nodes/Splunk/types.ts
similarity index 100%
rename from packages/nodes-base/nodes/Splunk/types.d.ts
rename to packages/nodes-base/nodes/Splunk/types.ts
diff --git a/packages/nodes-base/nodes/Spontit/GenericFunctions.ts b/packages/nodes-base/nodes/Spontit/GenericFunctions.ts
index 38e75aa3d14db..d4ca5e48fd8b5 100644
--- a/packages/nodes-base/nodes/Spontit/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Spontit/GenericFunctions.ts
@@ -1,10 +1,10 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
 	IHookFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
+	IRequestOptions,
 	IWebhookFunctions,
 	JsonObject,
 } from 'n8n-workflow';
@@ -12,7 +12,7 @@ import { NodeApiError } from 'n8n-workflow';
 
 export async function spontitApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions | IWebhookFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -21,7 +21,7 @@ export async function spontitApiRequest(
 	const credentials = await this.getCredentials('spontitApi');
 
 	try {
-		const options: OptionsWithUri = {
+		const options: IRequestOptions = {
 			headers: {
 				'X-Authorization': credentials.apiKey as string,
 				'X-UserId': credentials.username as string,
diff --git a/packages/nodes-base/nodes/Spontit/Spontit.node.ts b/packages/nodes-base/nodes/Spontit/Spontit.node.ts
index b54cd906e2619..a2e9475f9ed3c 100644
--- a/packages/nodes-base/nodes/Spontit/Spontit.node.ts
+++ b/packages/nodes-base/nodes/Spontit/Spontit.node.ts
@@ -6,12 +6,11 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
+import moment from 'moment-timezone';
 import { spontitApiRequest } from './GenericFunctions';
 
 import { pushFields, pushOperations } from './PushDescription';
 
-import moment from 'moment';
-
 export class Spontit implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Spontit',
diff --git a/packages/nodes-base/nodes/Spotify/GenericFunctions.ts b/packages/nodes-base/nodes/Spotify/GenericFunctions.ts
index 752962363746e..6b61655ee30fd 100644
--- a/packages/nodes-base/nodes/Spotify/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Spotify/GenericFunctions.ts
@@ -1,9 +1,14 @@
-import type { OptionsWithUri } from 'request';
-
-import type { IExecuteFunctions, IHookFunctions, IDataObject, JsonObject } from 'n8n-workflow';
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	IHookFunctions,
+	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import get from 'lodash.get';
+import get from 'lodash/get';
 
 /**
  * Make an API request to Spotify
@@ -11,13 +16,13 @@ import get from 'lodash.get';
  */
 export async function spotifyApiRequest(
 	this: IHookFunctions | IExecuteFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: object,
-	query?: object,
+	query?: IDataObject,
 	uri?: string,
 ): Promise<any> {
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		method,
 		headers: {
 			'User-Agent': 'n8n',
@@ -42,10 +47,10 @@ export async function spotifyApiRequest(
 export async function spotifyApiRequestAllItems(
 	this: IHookFunctions | IExecuteFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: object,
-	query?: object,
+	query?: IDataObject,
 ): Promise<any> {
 	const returnData: IDataObject[] = [];
 
@@ -55,7 +60,7 @@ export async function spotifyApiRequestAllItems(
 
 	do {
 		responseData = await spotifyApiRequest.call(this, method, endpoint, body, query, uri);
-		// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+
 		returnData.push.apply(returnData, get(responseData, propertyName));
 		uri = responseData.next || responseData[propertyName.split('.')[0]].next;
 		//remove the query as the query parameters are already included in the next, else api throws error.
diff --git a/packages/nodes-base/nodes/Spotify/Spotify.node.ts b/packages/nodes-base/nodes/Spotify/Spotify.node.ts
index 2203cdbe4bf49..329d998da1b73 100644
--- a/packages/nodes-base/nodes/Spotify/Spotify.node.ts
+++ b/packages/nodes-base/nodes/Spotify/Spotify.node.ts
@@ -4,6 +4,7 @@ import type {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 
 import { spotifyApiRequest, spotifyApiRequestAllItems } from './GenericFunctions';
@@ -330,7 +331,7 @@ export class Spotify implements INodeType {
 					},
 				},
 				placeholder: 'US',
-				description: 'Top tracks in which country? Enter the postal abbriviation',
+				description: 'Top tracks in which country? Enter the postal abbreviation',
 			},
 
 			{
@@ -362,13 +363,13 @@ export class Spotify implements INodeType {
 						resource: ['playlist'],
 					},
 				},
-				// eslint-disable-next-line n8n-nodes-base/node-param-options-type-unsorted-items
+
 				options: [
 					{
 						name: 'Add an Item',
 						value: 'add',
-						description: 'Add tracks from a playlist by track and playlist URI or ID',
-						action: 'Add an Item a playlist',
+						description: 'Add tracks to a playlist by track and playlist URI or ID',
+						action: 'Add an Item to a playlist',
 					},
 					{
 						name: 'Create a Playlist',
@@ -789,7 +790,7 @@ export class Spotify implements INodeType {
 		// For Query string
 		let qs: IDataObject;
 
-		let requestMethod: string;
+		let requestMethod: IHttpRequestMethods;
 		let endpoint: string;
 		let returnAll: boolean;
 		let propertyName = '';
@@ -1324,6 +1325,6 @@ export class Spotify implements INodeType {
 			}
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Spotify/spotify.svg b/packages/nodes-base/nodes/Spotify/spotify.svg
index 96c9e3a6dc392..b0389fa7cf64d 100644
--- a/packages/nodes-base/nodes/Spotify/spotify.svg
+++ b/packages/nodes-base/nodes/Spotify/spotify.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 66 65" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><path d="M32 0C14.3 0 0 14.337 0 32c0 17.7 14.337 32 32 32 17.7 0 32-14.337 32-32S49.663 0 32 0zm14.68 46.184c-.573.956-1.797 1.223-2.753.65-7.532-4.588-16.975-5.62-28.14-3.097-1.07.23-2.14-.42-2.37-1.5s.42-2.14 1.5-2.37c12.196-2.8 22.67-1.606 31.082 3.556a2 2 0 01.688 2.753zm3.9-8.717c-.726 1.185-2.256 1.53-3.44.84-8.602-5.276-21.716-6.805-31.885-3.747-1.338.382-2.714-.344-3.097-1.644-.382-1.338.344-2.714 1.682-3.097 11.622-3.517 26.074-1.835 35.976 4.244 1.147.688 1.5 2.217.765 3.403zm.344-9.1c-10.323-6.117-27.336-6.7-37.2-3.708-1.568.497-3.25-.42-3.747-1.988s.42-3.25 1.988-3.747c11.317-3.44 30.127-2.753 41.98 4.282 1.415.84 1.873 2.676 1.032 4.1-.765 1.453-2.638 1.912-4.053 1.07z" stroke="none" fill="#1ed760" fill-rule="nonzero"/></symbol></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round" viewBox="0 0 66 65"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><path fill="#1ed760" fill-rule="nonzero" stroke="none" d="M32 0C14.3 0 0 14.337 0 32c0 17.7 14.337 32 32 32 17.7 0 32-14.337 32-32S49.663 0 32 0m14.68 46.184c-.573.956-1.797 1.223-2.753.65-7.532-4.588-16.975-5.62-28.14-3.097-1.07.23-2.14-.42-2.37-1.5s.42-2.14 1.5-2.37c12.196-2.8 22.67-1.606 31.082 3.556a2 2 0 0 1 .688 2.753zm3.9-8.717c-.726 1.185-2.256 1.53-3.44.84-8.602-5.276-21.716-6.805-31.885-3.747-1.338.382-2.714-.344-3.097-1.644-.382-1.338.344-2.714 1.682-3.097 11.622-3.517 26.074-1.835 35.976 4.244 1.147.688 1.5 2.217.765 3.403zm.344-9.1c-10.323-6.117-27.336-6.7-37.2-3.708-1.568.497-3.25-.42-3.747-1.988s.42-3.25 1.988-3.747c11.317-3.44 30.127-2.753 41.98 4.282 1.415.84 1.873 2.676 1.032 4.1-.765 1.453-2.638 1.912-4.053 1.07z"/></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/SpreadsheetFile/SpreadsheetFile.node.json b/packages/nodes-base/nodes/SpreadsheetFile/SpreadsheetFile.node.json
index 5eb36aaa977a0..7f4260ba45013 100644
--- a/packages/nodes-base/nodes/SpreadsheetFile/SpreadsheetFile.node.json
+++ b/packages/nodes-base/nodes/SpreadsheetFile/SpreadsheetFile.node.json
@@ -6,7 +6,7 @@
 	"resources": {
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.spreadsheetfile/"
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.converttofile/"
 			}
 		],
 		"generic": [
@@ -17,7 +17,7 @@
 			}
 		]
 	},
-	"alias": ["CSV", "Spreadsheet", "Excel", "xls", "xlsx", "ods"],
+	"alias": ["_Excel", "Excel", "CSV", "Sheet", "Spreadsheet", "xls", "xlsx", "ods"],
 	"subcategories": {
 		"Core Nodes": ["Files"]
 	}
diff --git a/packages/nodes-base/nodes/SpreadsheetFile/SpreadsheetFile.node.ts b/packages/nodes-base/nodes/SpreadsheetFile/SpreadsheetFile.node.ts
index ac51121f9b884..d1333c7a25317 100644
--- a/packages/nodes-base/nodes/SpreadsheetFile/SpreadsheetFile.node.ts
+++ b/packages/nodes-base/nodes/SpreadsheetFile/SpreadsheetFile.node.ts
@@ -1,497 +1,26 @@
-import type {
-	IDataObject,
-	IExecuteFunctions,
-	INodeExecutionData,
-	INodeType,
-	INodeTypeDescription,
-} from 'n8n-workflow';
-import { NodeOperationError } from 'n8n-workflow';
-
-import type { JSON2SheetOpts, Sheet2JSONOpts, WorkBook, WritingOptions } from 'xlsx';
-import { read as xlsxRead, utils as xlsxUtils, write as xlsxWrite } from 'xlsx';
-
-/**
- * Flattens an object with deep data
- *
- * @param {IDataObject} data The object to flatten
- */
-function flattenObject(data: IDataObject) {
-	const returnData: IDataObject = {};
-	for (const key1 of Object.keys(data)) {
-		if (data[key1] !== null && typeof data[key1] === 'object') {
-			if (data[key1] instanceof Date) {
-				returnData[key1] = data[key1]?.toString();
-				continue;
-			}
-			const flatObject = flattenObject(data[key1] as IDataObject);
-			for (const key2 in flatObject) {
-				if (flatObject[key2] === undefined) {
-					continue;
-				}
-				returnData[`${key1}.${key2}`] = flatObject[key2];
-			}
-		} else {
-			returnData[key1] = data[key1];
-		}
-	}
-	return returnData;
-}
-
-export class SpreadsheetFile implements INodeType {
-	description: INodeTypeDescription = {
-		displayName: 'Spreadsheet File',
-		name: 'spreadsheetFile',
-		icon: 'fa:table',
-		group: ['transform'],
-		version: 1,
-		description: 'Reads and writes data from a spreadsheet file like CSV, XLS, ODS, etc',
-		defaults: {
-			name: 'Spreadsheet File',
-			color: '#2244FF',
-		},
-		inputs: ['main'],
-		outputs: ['main'],
-		properties: [
-			{
-				displayName: 'Operation',
-				name: 'operation',
-				type: 'options',
-				noDataExpression: true,
-				options: [
-					{
-						name: 'Read From File',
-						value: 'fromFile',
-						description: 'Reads data from a spreadsheet file',
-						action: 'Read data from a spreadsheet file',
-					},
-					{
-						name: 'Write to File',
-						value: 'toFile',
-						description: 'Writes the workflow data to a spreadsheet file',
-						action: 'Write data to a spreadsheet file',
-					},
-				],
-				default: 'fromFile',
-			},
-
-			// ----------------------------------
-			//         fromFile
-			// ----------------------------------
-			{
-				displayName: 'Binary Property',
-				name: 'binaryPropertyName',
-				type: 'string',
-				default: 'data',
-				required: true,
-				displayOptions: {
-					show: {
-						operation: ['fromFile'],
-					},
-				},
-				placeholder: '',
-				description:
-					'Name of the binary property from which to read the binary data of the spreadsheet file',
-			},
-
-			// ----------------------------------
-			//         toFile
-			// ----------------------------------
-			{
-				displayName: 'File Format',
-				name: 'fileFormat',
-				type: 'options',
-				options: [
-					{
-						name: 'CSV',
-						value: 'csv',
-						description: 'Comma-separated values',
-					},
-					{
-						name: 'HTML',
-						value: 'html',
-						description: 'HTML Table',
-					},
-					{
-						name: 'ODS',
-						value: 'ods',
-						description: 'OpenDocument Spreadsheet',
-					},
-					{
-						name: 'RTF',
-						value: 'rtf',
-						description: 'Rich Text Format',
-					},
-					{
-						name: 'XLS',
-						value: 'xls',
-						description: 'Excel',
-					},
-					{
-						name: 'XLSX',
-						value: 'xlsx',
-						description: 'Excel',
-					},
-				],
-				default: 'xls',
-				displayOptions: {
-					show: {
-						operation: ['toFile'],
-					},
-				},
-				description: 'The format of the file to save the data as',
-			},
-			{
-				displayName: 'Binary Property',
-				name: 'binaryPropertyName',
-				type: 'string',
-				default: 'data',
-				required: true,
-				displayOptions: {
-					show: {
-						operation: ['toFile'],
-					},
-				},
-				placeholder: '',
-				description:
-					'Name of the binary property in which to save the binary data of the spreadsheet file',
-			},
-
-			{
-				displayName: 'Options',
-				name: 'options',
-				type: 'collection',
-				placeholder: 'Add Option',
-				default: {},
-				options: [
-					{
-						displayName: 'Compression',
-						name: 'compression',
-						type: 'boolean',
-						displayOptions: {
-							show: {
-								'/operation': ['toFile'],
-								'/fileFormat': ['xlsx', 'ods'],
-							},
-						},
-						default: false,
-						description: 'Whether compression will be applied or not',
-					},
-					{
-						displayName: 'File Name',
-						name: 'fileName',
-						type: 'string',
-						displayOptions: {
-							show: {
-								'/operation': ['toFile'],
-							},
-						},
-						default: '',
-						description:
-							'File name to set in binary data. By default will "spreadsheet.&lt;fileFormat&gt;" be used.',
-					},
-					{
-						displayName: 'Header Row',
-						name: 'headerRow',
-						type: 'boolean',
-						displayOptions: {
-							show: {
-								'/operation': ['fromFile', 'toFile'],
-							},
-						},
-						default: true,
-						description: 'Whether the first row of the file contains the header names',
-					},
-					{
-						displayName: 'Include Empty Cells',
-						name: 'includeEmptyCells',
-						type: 'boolean',
-						displayOptions: {
-							show: {
-								'/operation': ['fromFile'],
-							},
-						},
-						default: false,
-						// eslint-disable-next-line n8n-nodes-base/node-param-description-boolean-without-whether
-						description:
-							'When reading from file the empty cells will be filled with an empty string in the JSON',
-					},
-					{
-						displayName: 'RAW Data',
-						name: 'rawData',
-						type: 'boolean',
-						displayOptions: {
-							show: {
-								'/operation': ['fromFile'],
-							},
-						},
-						default: false,
-						description: 'Whether the data should be returned RAW instead of parsed',
-					},
-					{
-						displayName: 'Read As String',
-						name: 'readAsString',
-						type: 'boolean',
-						displayOptions: {
-							show: {
-								'/operation': ['fromFile'],
-							},
-						},
-						default: false,
-						// eslint-disable-next-line n8n-nodes-base/node-param-description-boolean-without-whether
-						description:
-							'In some cases and file formats, it is necessary to read specifically as string else some special character get interpreted wrong',
-					},
-					{
-						displayName: 'Range',
-						name: 'range',
-						type: 'string',
-						displayOptions: {
-							show: {
-								'/operation': ['fromFile'],
-							},
-						},
-						default: '',
-						description:
-							'The range to read from the table. If set to a number it will be the starting row. If set to string it will be used as A1-style bounded range.',
-					},
-					{
-						displayName: 'Sheet Name',
-						name: 'sheetName',
-						type: 'string',
-						displayOptions: {
-							show: {
-								'/operation': ['fromFile'],
-							},
-						},
-						default: 'Sheet',
-						description:
-							'Name of the sheet to read from in the spreadsheet (if supported). If not set, the first one gets chosen.',
-					},
-					{
-						displayName: 'Sheet Name',
-						name: 'sheetName',
-						type: 'string',
-						displayOptions: {
-							show: {
-								'/operation': ['toFile'],
-								'/fileFormat': ['ods', 'xls', 'xlsx'],
-							},
-						},
-						default: 'Sheet',
-						description: 'Name of the sheet to create in the spreadsheet',
-					},
-				],
-			},
-		],
-	};
-
-	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
-		const items = this.getInputData();
-
-		const operation = this.getNodeParameter('operation', 0);
-
-		const newItems: INodeExecutionData[] = [];
-
-		if (operation === 'fromFile') {
-			// Read data from spreadsheet file to workflow
-			for (let i = 0; i < items.length; i++) {
-				try {
-					const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i);
-					const options = this.getNodeParameter('options', i, {});
-
-					this.helpers.assertBinaryData(i, binaryPropertyName);
-					// Read the binary spreadsheet data
-					const binaryDataBuffer = await this.helpers.getBinaryDataBuffer(i, binaryPropertyName);
-					let workbook;
-					if (options.readAsString === true) {
-						workbook = xlsxRead(binaryDataBuffer.toString(), {
-							type: 'string',
-							raw: options.rawData as boolean,
-						});
-					} else {
-						workbook = xlsxRead(binaryDataBuffer, { raw: options.rawData as boolean });
-					}
-
-					if (workbook.SheetNames.length === 0) {
-						throw new NodeOperationError(this.getNode(), 'Spreadsheet does not have any sheets!', {
-							itemIndex: i,
-						});
-					}
-
-					let sheetName = workbook.SheetNames[0];
-					if (options.sheetName) {
-						if (!workbook.SheetNames.includes(options.sheetName as string)) {
-							throw new NodeOperationError(
-								this.getNode(),
-								`Spreadsheet does not contain sheet called "${options.sheetName}"!`,
-								{ itemIndex: i },
-							);
-						}
-						sheetName = options.sheetName as string;
-					}
-
-					// Convert it to json
-					const sheetToJsonOptions: Sheet2JSONOpts = {};
-					if (options.range) {
-						if (isNaN(options.range as number)) {
-							sheetToJsonOptions.range = options.range;
-						} else {
-							sheetToJsonOptions.range = parseInt(options.range as string, 10);
-						}
-					}
-
-					if (options.includeEmptyCells) {
-						sheetToJsonOptions.defval = '';
-					}
-					if (options.headerRow === false) {
-						sheetToJsonOptions.header = 1; // Consider the first row as a data row
-					}
-
-					const sheetJson = xlsxUtils.sheet_to_json(workbook.Sheets[sheetName], sheetToJsonOptions);
-
-					// Check if data could be found in file
-					if (sheetJson.length === 0) {
-						continue;
-					}
-
-					// Add all the found data columns to the workflow data
-					if (options.headerRow === false) {
-						// Data was returned as an array - https://github.com/SheetJS/sheetjs#json
-						for (const rowData of sheetJson) {
-							newItems.push({
-								json: {
-									row: rowData,
-								},
-								pairedItem: {
-									item: i,
-								},
-							} as INodeExecutionData);
-						}
-					} else {
-						for (const rowData of sheetJson) {
-							newItems.push({
-								json: rowData,
-								pairedItem: {
-									item: i,
-								},
-							} as INodeExecutionData);
-						}
-					}
-				} catch (error) {
-					if (this.continueOnFail()) {
-						newItems.push({
-							json: {
-								error: error.message,
-							},
-							pairedItem: {
-								item: i,
-							},
-						});
-						continue;
-					}
-					throw error;
-				}
-			}
-
-			return this.prepareOutputData(newItems);
-		} else if (operation === 'toFile') {
-			try {
-				// Write the workflow data to spreadsheet file
-				const binaryPropertyName = this.getNodeParameter('binaryPropertyName', 0);
-				const fileFormat = this.getNodeParameter('fileFormat', 0) as string;
-				const options = this.getNodeParameter('options', 0, {});
-				const sheetToJsonOptions: JSON2SheetOpts = {};
-				if (options.headerRow === false) {
-					sheetToJsonOptions.skipHeader = true;
-				}
-				// Get the json data of the items and flatten it
-				let item: INodeExecutionData;
-				const itemData: IDataObject[] = [];
-				for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
-					item = items[itemIndex];
-					itemData.push(flattenObject(item.json));
-				}
-
-				const ws = xlsxUtils.json_to_sheet(itemData, sheetToJsonOptions);
-
-				const wopts: WritingOptions = {
-					bookSST: false,
-					type: 'buffer',
-				};
-
-				if (fileFormat === 'csv') {
-					wopts.bookType = 'csv';
-				} else if (fileFormat === 'html') {
-					wopts.bookType = 'html';
-				} else if (fileFormat === 'rtf') {
-					wopts.bookType = 'rtf';
-				} else if (fileFormat === 'ods') {
-					wopts.bookType = 'ods';
-					if (options.compression) {
-						wopts.compression = true;
-					}
-				} else if (fileFormat === 'xls') {
-					wopts.bookType = 'xls';
-				} else if (fileFormat === 'xlsx') {
-					wopts.bookType = 'xlsx';
-					if (options.compression) {
-						wopts.compression = true;
-					}
-				}
-
-				// Convert the data in the correct format
-				const sheetName = (options.sheetName as string) || 'Sheet';
-				const wb: WorkBook = {
-					SheetNames: [sheetName],
-					Sheets: {
-						[sheetName]: ws,
-					},
-				};
-				const wbout: Buffer = xlsxWrite(wb, wopts);
-
-				// Create a new item with only the binary spreadsheet data
-				const newItem: INodeExecutionData = {
-					json: {},
-					binary: {},
-					pairedItem: {
-						item: 0,
-					},
-				};
-
-				let fileName = `spreadsheet.${fileFormat}`;
-				if (options.fileName !== undefined) {
-					fileName = options.fileName as string;
-				}
-
-				newItem.binary![binaryPropertyName] = await this.helpers.prepareBinaryData(wbout, fileName);
-
-				newItems.push(newItem);
-			} catch (error) {
-				if (this.continueOnFail()) {
-					newItems.push({
-						json: {
-							error: error.message,
-						},
-						pairedItem: {
-							item: 0,
-						},
-					});
-				} else {
-					throw error;
-				}
-			}
-		} else {
-			if (this.continueOnFail()) {
-				return this.prepareOutputData([
-					{ json: { error: `The operation "${operation}" is not supported!` } },
-				]);
-			} else {
-				throw new NodeOperationError(
-					this.getNode(),
-					`The operation "${operation}" is not supported!`,
-				);
-			}
-		}
-		return this.prepareOutputData(newItems);
+import type { INodeTypeBaseDescription, IVersionedNodeType } from 'n8n-workflow';
+import { VersionedNodeType } from 'n8n-workflow';
+
+import { SpreadsheetFileV1 } from './v1/SpreadsheetFileV1.node';
+import { SpreadsheetFileV2 } from './v2/SpreadsheetFileV2.node';
+
+export class SpreadsheetFile extends VersionedNodeType {
+	constructor() {
+		const baseDescription: INodeTypeBaseDescription = {
+			hidden: true,
+			displayName: 'Spreadsheet File',
+			name: 'spreadsheetFile',
+			icon: 'fa:table',
+			group: ['transform'],
+			description: 'Reads and writes data from a spreadsheet file like CSV, XLS, ODS, etc',
+			defaultVersion: 2,
+		};
+
+		const nodeVersions: IVersionedNodeType['nodeVersions'] = {
+			1: new SpreadsheetFileV1(baseDescription),
+			2: new SpreadsheetFileV2(baseDescription),
+		};
+
+		super(nodeVersions, baseDescription);
 	}
 }
diff --git a/packages/nodes-base/nodes/SpreadsheetFile/description.ts b/packages/nodes-base/nodes/SpreadsheetFile/description.ts
new file mode 100644
index 0000000000000..78c8952b90d35
--- /dev/null
+++ b/packages/nodes-base/nodes/SpreadsheetFile/description.ts
@@ -0,0 +1,269 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+export const operationProperty: INodeProperties = {
+	displayName: 'Operation',
+	name: 'operation',
+	type: 'options',
+	noDataExpression: true,
+	options: [
+		{
+			name: 'Read From File',
+			value: 'fromFile',
+			description: 'Reads data from a spreadsheet file',
+			action: 'Read data from a spreadsheet file',
+		},
+		{
+			name: 'Write to File',
+			value: 'toFile',
+			description: 'Writes the workflow data to a spreadsheet file',
+			action: 'Write data to a spreadsheet file',
+		},
+	],
+	default: 'fromFile',
+};
+
+export const binaryProperty: INodeProperties = {
+	displayName: 'Input Binary Field',
+	name: 'binaryPropertyName',
+	type: 'string',
+	default: 'data',
+	required: true,
+	placeholder: '',
+	hint: 'The name of the input field containing the file data to be processed',
+	displayOptions: {
+		show: {
+			operation: ['fromFile'],
+		},
+	},
+};
+
+export const toFileProperties: INodeProperties[] = [
+	{
+		displayName: 'File Format',
+		name: 'fileFormat',
+		type: 'options',
+		options: [
+			{
+				name: 'CSV',
+				value: 'csv',
+				description: 'Comma-separated values',
+			},
+			{
+				name: 'HTML',
+				value: 'html',
+				description: 'HTML Table',
+			},
+			{
+				name: 'ODS',
+				value: 'ods',
+				description: 'OpenDocument Spreadsheet',
+			},
+			{
+				name: 'RTF',
+				value: 'rtf',
+				description: 'Rich Text Format',
+			},
+			{
+				name: 'XLS',
+				value: 'xls',
+				description: 'Excel',
+			},
+			{
+				name: 'XLSX',
+				value: 'xlsx',
+				description: 'Excel',
+			},
+		],
+		default: 'xls',
+		displayOptions: {
+			show: {
+				operation: ['toFile'],
+			},
+		},
+		description: 'The format of the file to save the data as',
+	},
+	{
+		displayName: 'Put Output File in Field',
+		name: 'binaryPropertyName',
+		type: 'string',
+		default: 'data',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: ['toFile'],
+			},
+		},
+		placeholder: '',
+		hint: 'The name of the output binary field to put the file in',
+	},
+];
+
+export const toFileOptions: INodeProperties = {
+	displayName: 'Options',
+	name: 'options',
+	type: 'collection',
+	placeholder: 'Add Option',
+	default: {},
+	displayOptions: {
+		show: {
+			operation: ['toFile'],
+		},
+	},
+	options: [
+		{
+			displayName: 'Compression',
+			name: 'compression',
+			type: 'boolean',
+			displayOptions: {
+				show: {
+					'/fileFormat': ['xlsx', 'ods'],
+				},
+			},
+			default: false,
+			description: 'Whether compression will be applied or not',
+		},
+		{
+			displayName: 'File Name',
+			name: 'fileName',
+			type: 'string',
+			default: '',
+			description:
+				'File name to set in binary data. By default will "spreadsheet.&lt;fileFormat&gt;" be used.',
+		},
+		{
+			displayName: 'Header Row',
+			name: 'headerRow',
+			type: 'boolean',
+			default: true,
+			description: 'Whether the first row of the file contains the header names',
+		},
+		{
+			displayName: 'Sheet Name',
+			name: 'sheetName',
+			type: 'string',
+			displayOptions: {
+				show: {
+					'/fileFormat': ['ods', 'xls', 'xlsx'],
+				},
+			},
+			default: 'Sheet',
+			description: 'Name of the sheet to create in the spreadsheet',
+		},
+	],
+};
+
+export const fromFileOptions: INodeProperties = {
+	displayName: 'Options',
+	name: 'options',
+	type: 'collection',
+	placeholder: 'Add Option',
+	default: {},
+	displayOptions: {
+		show: {
+			operation: ['fromFile'],
+		},
+	},
+	options: [
+		{
+			displayName: 'Delimiter',
+			name: 'delimiter',
+			type: 'string',
+			displayOptions: {
+				show: {
+					'/fileFormat': ['csv'],
+				},
+			},
+			default: ',',
+			placeholder: 'e.g. ,',
+			description: 'Set the field delimiter, usually a comma',
+		},
+		{
+			displayName: 'Exclude Byte Order Mark (BOM)',
+			name: 'enableBOM',
+			type: 'boolean',
+			displayOptions: {
+				show: {
+					'/fileFormat': ['csv'],
+				},
+			},
+			default: false,
+			description:
+				'Whether to detect and exclude the byte-order-mark from the CSV Input if present',
+		},
+		{
+			displayName: 'Header Row',
+			name: 'headerRow',
+			type: 'boolean',
+			default: true,
+			description: 'Whether the first row of the file contains the header names',
+		},
+		{
+			displayName: 'Include Empty Cells',
+			name: 'includeEmptyCells',
+			type: 'boolean',
+			default: false,
+			description:
+				'Whether to include empty cells when reading from file. They will be filled with an empty string.',
+		},
+		{
+			displayName: 'Max Number of Rows to Load',
+			name: 'maxRowCount',
+			type: 'number',
+			displayOptions: {
+				show: {
+					'/fileFormat': ['csv'],
+				},
+			},
+			default: -1,
+			placeholder: 'e.g. 10',
+			description:
+				'Stop handling records after the requested number of rows are read. Use -1 if you want to load all rows.',
+		},
+		{
+			displayName: 'Range',
+			name: 'range',
+			type: 'string',
+			default: '',
+			description:
+				'The range to read from the table. If set to a number it will be the starting row. If set to string it will be used as A1-style notation range.',
+		},
+		{
+			displayName: 'RAW Data',
+			name: 'rawData',
+			type: 'boolean',
+			default: false,
+			description: 'Whether to return RAW data, instead of parsing it',
+		},
+		{
+			displayName: 'Read As String',
+			name: 'readAsString',
+			type: 'boolean',
+			default: false,
+			// eslint-disable-next-line n8n-nodes-base/node-param-description-boolean-without-whether
+			description:
+				'In some cases and file formats, it is necessary to read as string to ensure special characters are interpreted correctly',
+		},
+		{
+			displayName: 'Sheet Name',
+			name: 'sheetName',
+			type: 'string',
+			default: 'Sheet',
+			placeholder: 'e.g. mySheet',
+			description:
+				'Name of the sheet to read from in the spreadsheet (if supported). If not set, the first one will be chosen.',
+		},
+		{
+			displayName: 'Starting Line',
+			name: 'fromLine',
+			type: 'number',
+			displayOptions: {
+				show: {
+					'/fileFormat': ['csv'],
+				},
+			},
+			default: 0,
+			placeholder: 'e.g. 0',
+			description: 'Start handling records from the requested line number. Starts at 0.',
+		},
+	],
+};
diff --git a/packages/nodes-base/nodes/SpreadsheetFile/test/SpreadsheetFile.test.ts b/packages/nodes-base/nodes/SpreadsheetFile/test/SpreadsheetFile.test.ts
index 9fae97cd527b0..f4779fb77e17d 100644
--- a/packages/nodes-base/nodes/SpreadsheetFile/test/SpreadsheetFile.test.ts
+++ b/packages/nodes-base/nodes/SpreadsheetFile/test/SpreadsheetFile.test.ts
@@ -1,24 +1,28 @@
-import * as Helpers from '../../../test/nodes/Helpers';
-import type { WorkflowTestData } from '../../../test/nodes/types';
-
-import { executeWorkflow } from '../../../test/nodes/ExecuteWorkflow';
 import path from 'path';
+import type { IWorkflowBase } from 'n8n-workflow';
+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 () => {
-		await Helpers.initBinaryDataManager();
+		await Helpers.initBinaryDataService();
 	});
 
-	// replace workflow json 'Read Binary File' node's filePath to local file
-	const workflow = Helpers.readJsonFileSync('nodes/SpreadsheetFile/test/workflow.json');
-	const node = workflow.nodes.find((n: any) => n.name === 'Read Binary File');
-	node.parameters.filePath = path.join(__dirname, 'spreadsheet.csv');
+	const loadWorkflow = (fileName: string, csvName: string) => {
+		const workflow = Helpers.readJsonFileSync<IWorkflowBase>(
+			`nodes/SpreadsheetFile/test/${fileName}`,
+		);
+		const node = workflow.nodes.find((n) => n.name === 'Read Binary File');
+		node!.parameters.fileSelector = path.join(__dirname, csvName);
+		return workflow;
+	};
 
 	const tests: WorkflowTestData[] = [
 		{
 			description: 'execute workflow.json',
 			input: {
-				workflowData: workflow,
+				workflowData: loadWorkflow('workflow.json', 'spreadsheet.csv'),
 			},
 			output: {
 				nodeData: {
@@ -78,6 +82,7 @@ describe('Execute Spreadsheet File Node', () => {
 							},
 						],
 					],
+					'Read CSV with Row Limit': [[{ json: { A: '1', B: '2', C: '3' } }]],
 					'Write To File CSV': [
 						[
 							{
@@ -87,9 +92,9 @@ describe('Execute Spreadsheet File Node', () => {
 										mimeType: 'text/csv',
 										fileType: 'text',
 										fileExtension: 'csv',
-										data: '77u/QSxCLEMKMSwyLDMKNCw1LDYK',
+										data: '77u/QSxCLEMKMSwyLDMKNCw1LDY=',
 										fileName: 'spreadsheet.csv',
-										fileSize: '21 B',
+										fileSize: '20 B',
 									},
 								},
 							},
@@ -102,7 +107,7 @@ describe('Execute Spreadsheet File Node', () => {
 								binary: {
 									data: {
 										mimeType: 'text/html',
-										fileType: 'text',
+										fileType: 'html',
 										fileExtension: 'html',
 										data: 'PGh0bWw+PGhlYWQ+PG1ldGEgY2hhcnNldD0idXRmLTgiLz48dGl0bGU+U2hlZXRKUyBUYWJsZSBFeHBvcnQ8L3RpdGxlPjwvaGVhZD48Ym9keT48dGFibGU+PHRyPjx0ZCBkYXRhLXQ9InMiIGRhdGEtdj0iQSIgaWQ9InNqcy1BMSI+QTwvdGQ+PHRkIGRhdGEtdD0icyIgZGF0YS12PSJCIiBpZD0ic2pzLUIxIj5CPC90ZD48dGQgZGF0YS10PSJzIiBkYXRhLXY9IkMiIGlkPSJzanMtQzEiPkM8L3RkPjwvdHI+PHRyPjx0ZCBkYXRhLXQ9Im4iIGRhdGEtdj0iMSIgaWQ9InNqcy1BMiI+MTwvdGQ+PHRkIGRhdGEtdD0ibiIgZGF0YS12PSIyIiBpZD0ic2pzLUIyIj4yPC90ZD48dGQgZGF0YS10PSJuIiBkYXRhLXY9IjMiIGlkPSJzanMtQzIiPjM8L3RkPjwvdHI+PHRyPjx0ZCBkYXRhLXQ9Im4iIGRhdGEtdj0iNCIgaWQ9InNqcy1BMyI+NDwvdGQ+PHRkIGRhdGEtdD0ibiIgZGF0YS12PSI1IiBpZD0ic2pzLUIzIj41PC90ZD48dGQgZGF0YS10PSJuIiBkYXRhLXY9IjYiIGlkPSJzanMtQzMiPjY8L3RkPjwvdHI+PC90YWJsZT48L2JvZHk+PC9odG1sPg==',
 										fileName: 'spreadsheet.html',
@@ -149,6 +154,46 @@ describe('Execute Spreadsheet File Node', () => {
 				},
 			},
 		},
+		{
+			description: 'execute workflow.bom.json',
+			input: {
+				workflowData: loadWorkflow('workflow.bom.json', 'bom.csv'),
+			},
+			output: {
+				nodeData: {
+					'Edit with BOM included': [[{ json: { X: null } }]],
+					'Edit with BOM excluded': [[{ json: { X: '1' } }]],
+				},
+			},
+		},
+		{
+			description: 'execute includeempty.json',
+			input: {
+				workflowData: loadWorkflow('workflow.empty.json', 'includeempty.csv'),
+			},
+			output: {
+				nodeData: {
+					'Include Empty': [[{ json: { A: '1', B: '', C: '3' } }]],
+					'Ignore Empty': [[{ json: { A: '1', C: '3' } }]],
+				},
+			},
+		},
+		{
+			description: 'execute utf8.json',
+			input: {
+				workflowData: loadWorkflow('workflow.utf8.json', 'utf8.csv'),
+			},
+			output: {
+				nodeData: {
+					'Parse UTF8 v1': [
+						[{ json: { A: 1, B: '株式会社', C: 3 } }, { json: { A: 4, B: 5, C: '🐛' } }],
+					],
+					'Parse UTF8 v2': [
+						[{ json: { A: '1', B: '株式会社', C: '3' } }, { json: { A: '4', B: '5', C: '🐛' } }],
+					],
+				},
+			},
+		},
 	];
 
 	const nodeTypes = Helpers.setup(tests);
diff --git a/packages/nodes-base/nodes/SpreadsheetFile/test/bom.csv b/packages/nodes-base/nodes/SpreadsheetFile/test/bom.csv
new file mode 100644
index 0000000000000..9c60e4f480b2f
--- /dev/null
+++ b/packages/nodes-base/nodes/SpreadsheetFile/test/bom.csv
@@ -0,0 +1,2 @@
+a,b,c
+1,2,3
diff --git a/packages/nodes-base/nodes/SpreadsheetFile/test/includeempty.csv b/packages/nodes-base/nodes/SpreadsheetFile/test/includeempty.csv
new file mode 100644
index 0000000000000..f8ffb44c7ceec
--- /dev/null
+++ b/packages/nodes-base/nodes/SpreadsheetFile/test/includeempty.csv
@@ -0,0 +1,2 @@
+A,B,C
+1,,3
diff --git a/packages/nodes-base/nodes/SpreadsheetFile/test/utf8.csv b/packages/nodes-base/nodes/SpreadsheetFile/test/utf8.csv
new file mode 100644
index 0000000000000..4ea2755e56d4c
--- /dev/null
+++ b/packages/nodes-base/nodes/SpreadsheetFile/test/utf8.csv
@@ -0,0 +1,3 @@
+A,B,C
+1,株式会社,3
+4,5,🐛
diff --git a/packages/nodes-base/nodes/SpreadsheetFile/test/workflow.bom.json b/packages/nodes-base/nodes/SpreadsheetFile/test/workflow.bom.json
new file mode 100644
index 0000000000000..2f6d22457dacb
--- /dev/null
+++ b/packages/nodes-base/nodes/SpreadsheetFile/test/workflow.bom.json
@@ -0,0 +1,155 @@
+{
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "40bf604f-19f9-43e7-8bbb-74c36925f154",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        -320,
+        1040
+      ]
+    },
+    {
+      "parameters": {
+        "fileSelector": "bom.csv"
+      },
+      "id": "623ea890-8882-4273-973e-834652d823b5",
+      "name": "Read Binary File",
+      "type": "n8n-nodes-base.readBinaryFiles",
+      "typeVersion": 1,
+      "position": [
+        -100,
+        1040
+      ]
+    },
+    {
+      "parameters": {
+        "fileFormat": "csv",
+        "options": {
+          "enableBOM": true
+        }
+      },
+      "id": "c8cca5fb-e119-4ca1-a597-4f051a7f64ea",
+      "name": "Exclude BOM",
+      "type": "n8n-nodes-base.spreadsheetFile",
+      "typeVersion": 2,
+      "position": [
+        120,
+        960
+      ]
+    },
+    {
+      "parameters": {
+        "fileFormat": "csv",
+        "options": {
+          "enableBOM": false
+        }
+      },
+      "id": "56ec11dc-966b-4d06-b8c0-61475b30333d",
+      "name": "Include BOM",
+      "type": "n8n-nodes-base.spreadsheetFile",
+      "typeVersion": 2,
+      "position": [
+        120,
+        1180
+      ]
+    },
+    {
+      "parameters": {
+        "fields": {
+          "values": [
+            {
+              "name": "X",
+              "stringValue": "={{ $json.a }}"
+            }
+          ]
+        },
+        "include": "none",
+        "options": {}
+      },
+      "id": "6f6bccf2-d674-4774-9df9-6f6fd893bace",
+      "name": "Edit with BOM excluded",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.2,
+      "position": [
+        320,
+        960
+      ]
+    },
+    {
+      "parameters": {
+        "fields": {
+          "values": [
+            {
+              "name": "X",
+              "stringValue": "={{ $json.a }}"
+            }
+          ]
+        },
+        "include": "none",
+        "options": {}
+      },
+      "id": "27ca5cde-19cb-4bf2-9ab4-7f7e77ad01bd",
+      "name": "Edit with BOM included",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.2,
+      "position": [
+        320,
+        1180
+      ]
+    }
+  ],
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Read Binary File",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Exclude BOM": {
+      "main": [
+        [
+          {
+            "node": "Edit with BOM excluded",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Include BOM": {
+      "main": [
+        [
+          {
+            "node": "Edit with BOM included",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Read Binary File": {
+      "main": [
+        [
+          {
+            "node": "Exclude BOM",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Include BOM",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  }
+}
diff --git a/packages/nodes-base/nodes/SpreadsheetFile/test/workflow.empty.json b/packages/nodes-base/nodes/SpreadsheetFile/test/workflow.empty.json
new file mode 100644
index 0000000000000..49017cfe8770b
--- /dev/null
+++ b/packages/nodes-base/nodes/SpreadsheetFile/test/workflow.empty.json
@@ -0,0 +1,90 @@
+{
+  "meta": {},
+  "nodes": [
+    {
+      "parameters": {
+        "fileFormat": "csv",
+        "options": {
+          "includeEmptyCells": false
+        }
+      },
+      "id": "8aed098d-3c0b-43c9-b7e8-c4106c88b409",
+      "name": "Ignore Empty",
+      "type": "n8n-nodes-base.spreadsheetFile",
+      "typeVersion": 2,
+      "position": [
+        1160,
+        500
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "649db2c5-27dc-4cec-b084-8982632311e7",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        720,
+        360
+      ]
+    },
+    {
+      "parameters": {
+        "fileSelector": "includeempty.csv"
+      },
+      "id": "5056b8c4-fb6e-4ca1-9bc1-33f5db4027ad",
+      "name": "Read Binary File",
+      "type": "n8n-nodes-base.readBinaryFiles",
+      "typeVersion": 1,
+      "position": [
+        940,
+        360
+      ]
+    },
+    {
+      "parameters": {
+        "fileFormat": "csv",
+        "options": {
+          "includeEmptyCells": true
+        }
+      },
+      "id": "a4822e75-d638-45c8-887f-0487d5237267",
+      "name": "Include Empty",
+      "type": "n8n-nodes-base.spreadsheetFile",
+      "typeVersion": 2,
+      "position": [
+        1160,
+        280
+      ]
+    }
+  ],
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Read Binary File",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Read Binary File": {
+      "main": [
+        [
+          {
+            "node": "Include Empty",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Ignore Empty",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  }
+}
diff --git a/packages/nodes-base/nodes/SpreadsheetFile/test/workflow.json b/packages/nodes-base/nodes/SpreadsheetFile/test/workflow.json
index b52c7918bd411..5f1ce7c152efd 100644
--- a/packages/nodes-base/nodes/SpreadsheetFile/test/workflow.json
+++ b/packages/nodes-base/nodes/SpreadsheetFile/test/workflow.json
@@ -1,7 +1,4 @@
 {
-	"meta": {
-		"instanceId": "104a4d08d8897b8bdeb38aaca515021075e0bd8544c983c2bb8c86e6a8e6081c"
-	},
 	"nodes": [
 		{
 			"parameters": {},
@@ -29,11 +26,11 @@
 		},
 		{
 			"parameters": {
-				"filePath": "C:\\Users\\spech\\Documents\\GitHub\\n8n-master\\packages\\nodes-base\\nodes\\SpreadsheetFile\\test\\spreadsheet.csv"
+				"fileSelector": "spreadsheet.csv"
 			},
 			"id": "d7620053-eb3d-43dd-b2cd-d60d9a08a9cc",
 			"name": "Read Binary File",
-			"type": "n8n-nodes-base.readBinaryFile",
+			"type": "n8n-nodes-base.readBinaryFiles",
 			"typeVersion": 1,
 			"position": [
 				840,
@@ -173,6 +170,22 @@
 				1060,
 				940
 			]
+		},
+		{
+			"parameters": {
+				"fileFormat": "csv",
+				"options": {
+					"maxRowCount": 1
+				}
+			},
+			"id": "de905389-a11b-4dd8-8416-14d650804445",
+			"name": "Read CSV with Row Limit",
+			"type": "n8n-nodes-base.spreadsheetFile",
+			"typeVersion": 2,
+			"position": [
+				-60,
+				1340
+			]
 		}
 	],
 	"connections": {
@@ -245,9 +258,14 @@
 						"node": "Read From File Read as String",
 						"type": "main",
 						"index": 0
+					},
+					{
+						"node": "Read CSV with Row Limit",
+						"type": "main",
+						"index": 0
 					}
 				]
 			]
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/SpreadsheetFile/test/workflow.utf8.json b/packages/nodes-base/nodes/SpreadsheetFile/test/workflow.utf8.json
new file mode 100644
index 0000000000000..de88e693199c7
--- /dev/null
+++ b/packages/nodes-base/nodes/SpreadsheetFile/test/workflow.utf8.json
@@ -0,0 +1,91 @@
+{
+  "meta": {
+    "instanceId": "78577815012af39cf16dad7a787b0898c42fb7514b8a7f99b2136862c2af502c"
+  },
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "2130ab19-2efb-4217-b234-f8607d4122cc",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        260,
+        460
+      ]
+    },
+    {
+      "parameters": {
+        "options": {
+          "readAsString": true
+        }
+      },
+      "id": "68e03042-aa27-43db-bfec-3c4fe07ce9f6",
+      "name": "Parse UTF8 v1",
+      "type": "n8n-nodes-base.spreadsheetFile",
+      "typeVersion": 1,
+      "position": [
+        760,
+        360
+      ]
+    },
+    {
+      "parameters": {
+        "fileFormat": "csv",
+        "options": {
+          "readAsString": true
+        }
+      },
+      "id": "6a8b7ee9-5d14-4b67-b7cc-afee6bcc1fa6",
+      "name": "Parse UTF8 v2",
+      "type": "n8n-nodes-base.spreadsheetFile",
+      "typeVersion": 2,
+      "position": [
+        760,
+        560
+      ]
+    },
+    {
+      "parameters": {
+        "fileSelector": "utf8.csv"
+      },
+      "id": "623ea890-8882-4273-973e-834652d823b5",
+      "name": "Read Binary File",
+      "type": "n8n-nodes-base.readBinaryFiles",
+      "typeVersion": 1,
+      "position": [
+        480,
+        460
+      ]
+    }
+  ],
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Read Binary File",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Read Binary File": {
+      "main": [
+        [
+          {
+            "node": "Parse UTF8 v1",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Parse UTF8 v2",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  }
+}
diff --git a/packages/nodes-base/nodes/SpreadsheetFile/v1/SpreadsheetFileV1.node.ts b/packages/nodes-base/nodes/SpreadsheetFile/v1/SpreadsheetFileV1.node.ts
new file mode 100644
index 0000000000000..3a57d58c23f7e
--- /dev/null
+++ b/packages/nodes-base/nodes/SpreadsheetFile/v1/SpreadsheetFileV1.node.ts
@@ -0,0 +1,268 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeBaseDescription,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+import { BINARY_ENCODING, NodeOperationError } from 'n8n-workflow';
+
+import type {
+	JSON2SheetOpts,
+	ParsingOptions,
+	Sheet2JSONOpts,
+	WorkBook,
+	WritingOptions,
+} from 'xlsx';
+import {
+	read as xlsxRead,
+	readFile as xlsxReadFile,
+	utils as xlsxUtils,
+	write as xlsxWrite,
+} from 'xlsx';
+
+import {
+	operationProperty,
+	binaryProperty,
+	toFileProperties,
+	fromFileOptions,
+	toFileOptions,
+} from '../description';
+import { flattenObject, generatePairedItemData } from '@utils/utilities';
+import { oldVersionNotice } from '@utils/descriptions';
+
+export class SpreadsheetFileV1 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			version: 1,
+			defaults: {
+				name: 'Spreadsheet File',
+				color: '#2244FF',
+			},
+			inputs: ['main'],
+			outputs: ['main'],
+			properties: [
+				oldVersionNotice,
+				operationProperty,
+				binaryProperty,
+				...toFileProperties,
+				fromFileOptions,
+				toFileOptions,
+			],
+		};
+	}
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = this.getInputData();
+		const pairedItem = generatePairedItemData(items.length);
+
+		const operation = this.getNodeParameter('operation', 0);
+
+		const newItems: INodeExecutionData[] = [];
+
+		if (operation === 'fromFile') {
+			// Read data from spreadsheet file to workflow
+			for (let i = 0; i < items.length; i++) {
+				try {
+					const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i);
+					const options = this.getNodeParameter('options', i, {});
+					const binaryData = this.helpers.assertBinaryData(i, binaryPropertyName);
+
+					// Read the binary spreadsheet data
+					let workbook: WorkBook;
+					const xlsxOptions: ParsingOptions = { raw: options.rawData as boolean };
+					if (options.readAsString) xlsxOptions.type = 'string';
+
+					if (binaryData.id) {
+						const binaryPath = this.helpers.getBinaryPath(binaryData.id);
+						xlsxOptions.codepage = 65001; // utf8 codepage
+						workbook = xlsxReadFile(binaryPath, xlsxOptions);
+					} else {
+						const binaryDataBuffer = Buffer.from(binaryData.data, BINARY_ENCODING);
+						workbook = xlsxRead(
+							options.readAsString ? binaryDataBuffer.toString() : binaryDataBuffer,
+							xlsxOptions,
+						);
+					}
+
+					if (workbook.SheetNames.length === 0) {
+						throw new NodeOperationError(this.getNode(), 'Spreadsheet does not have any sheets!', {
+							itemIndex: i,
+						});
+					}
+
+					let sheetName = workbook.SheetNames[0];
+					if (options.sheetName) {
+						if (!workbook.SheetNames.includes(options.sheetName as string)) {
+							throw new NodeOperationError(
+								this.getNode(),
+								`Spreadsheet does not contain sheet called "${options.sheetName}"!`,
+								{ itemIndex: i },
+							);
+						}
+						sheetName = options.sheetName as string;
+					}
+
+					// Convert it to json
+					const sheetToJsonOptions: Sheet2JSONOpts = {};
+					if (options.range) {
+						if (isNaN(options.range as number)) {
+							sheetToJsonOptions.range = options.range;
+						} else {
+							sheetToJsonOptions.range = parseInt(options.range as string, 10);
+						}
+					}
+
+					if (options.includeEmptyCells) {
+						sheetToJsonOptions.defval = '';
+					}
+					if (options.headerRow === false) {
+						sheetToJsonOptions.header = 1; // Consider the first row as a data row
+					}
+
+					const sheetJson = xlsxUtils.sheet_to_json(workbook.Sheets[sheetName], sheetToJsonOptions);
+
+					// Check if data could be found in file
+					if (sheetJson.length === 0) {
+						continue;
+					}
+
+					// Add all the found data columns to the workflow data
+					if (options.headerRow === false) {
+						// Data was returned as an array - https://github.com/SheetJS/sheetjs#json
+						for (const rowData of sheetJson) {
+							newItems.push({
+								json: {
+									row: rowData,
+								},
+								pairedItem: {
+									item: i,
+								},
+							} as INodeExecutionData);
+						}
+					} else {
+						for (const rowData of sheetJson) {
+							newItems.push({
+								json: rowData,
+								pairedItem: {
+									item: i,
+								},
+							} as INodeExecutionData);
+						}
+					}
+				} catch (error) {
+					if (this.continueOnFail()) {
+						newItems.push({
+							json: {
+								error: error.message,
+							},
+							pairedItem: {
+								item: i,
+							},
+						});
+						continue;
+					}
+					throw error;
+				}
+			}
+
+			return [newItems];
+		} else if (operation === 'toFile') {
+			try {
+				// Write the workflow data to spreadsheet file
+				const binaryPropertyName = this.getNodeParameter('binaryPropertyName', 0);
+				const fileFormat = this.getNodeParameter('fileFormat', 0) as string;
+				const options = this.getNodeParameter('options', 0, {});
+				const sheetToJsonOptions: JSON2SheetOpts = {};
+				if (options.headerRow === false) {
+					sheetToJsonOptions.skipHeader = true;
+				}
+				// Get the json data of the items and flatten it
+				let item: INodeExecutionData;
+				const itemData: IDataObject[] = [];
+				for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
+					item = items[itemIndex];
+					itemData.push(flattenObject(item.json));
+				}
+
+				const ws = xlsxUtils.json_to_sheet(itemData, sheetToJsonOptions);
+
+				const wopts: WritingOptions = {
+					bookSST: false,
+					type: 'buffer',
+				};
+
+				if (fileFormat === 'csv') {
+					wopts.bookType = 'csv';
+				} else if (fileFormat === 'html') {
+					wopts.bookType = 'html';
+				} else if (fileFormat === 'rtf') {
+					wopts.bookType = 'rtf';
+				} else if (fileFormat === 'ods') {
+					wopts.bookType = 'ods';
+					if (options.compression) {
+						wopts.compression = true;
+					}
+				} else if (fileFormat === 'xls') {
+					wopts.bookType = 'xls';
+				} else if (fileFormat === 'xlsx') {
+					wopts.bookType = 'xlsx';
+					if (options.compression) {
+						wopts.compression = true;
+					}
+				}
+
+				// Convert the data in the correct format
+				const sheetName = (options.sheetName as string) || 'Sheet';
+				const wb: WorkBook = {
+					SheetNames: [sheetName],
+					Sheets: {
+						[sheetName]: ws,
+					},
+				};
+				const wbout: Buffer = xlsxWrite(wb, wopts);
+
+				// Create a new item with only the binary spreadsheet data
+				const newItem: INodeExecutionData = {
+					json: {},
+					binary: {},
+					pairedItem,
+				};
+
+				let fileName = `spreadsheet.${fileFormat}`;
+				if (options.fileName !== undefined) {
+					fileName = options.fileName as string;
+				}
+
+				newItem.binary![binaryPropertyName] = await this.helpers.prepareBinaryData(wbout, fileName);
+
+				newItems.push(newItem);
+			} catch (error) {
+				if (this.continueOnFail()) {
+					newItems.push({
+						json: {
+							error: error.message,
+						},
+						pairedItem,
+					});
+				} else {
+					throw error;
+				}
+			}
+		} else {
+			if (this.continueOnFail()) {
+				return [[{ json: { error: `The operation "${operation}" is not supported!` } }]];
+			} else {
+				throw new NodeOperationError(
+					this.getNode(),
+					`The operation "${operation}" is not supported!`,
+				);
+			}
+		}
+		return [newItems];
+	}
+}
diff --git a/packages/nodes-base/nodes/SpreadsheetFile/v2/SpreadsheetFileV2.node.ts b/packages/nodes-base/nodes/SpreadsheetFile/v2/SpreadsheetFileV2.node.ts
new file mode 100644
index 0000000000000..c1a75b69a9828
--- /dev/null
+++ b/packages/nodes-base/nodes/SpreadsheetFile/v2/SpreadsheetFileV2.node.ts
@@ -0,0 +1,45 @@
+import type {
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeBaseDescription,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+
+import { operationProperty } from '../description';
+import * as fromFile from './fromFile.operation';
+import * as toFile from './toFile.operation';
+
+export class SpreadsheetFileV2 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			version: 2,
+			defaults: {
+				name: 'Spreadsheet File',
+				color: '#2244FF',
+			},
+			inputs: ['main'],
+			outputs: ['main'],
+			properties: [operationProperty, ...fromFile.description, ...toFile.description],
+		};
+	}
+
+	async execute(this: IExecuteFunctions) {
+		const items = this.getInputData();
+		const operation = this.getNodeParameter('operation', 0);
+		let returnData: INodeExecutionData[] = [];
+
+		if (operation === 'fromFile') {
+			returnData = await fromFile.execute.call(this, items);
+		}
+
+		if (operation === 'toFile') {
+			returnData = await toFile.execute.call(this, items);
+		}
+
+		return [returnData];
+	}
+}
diff --git a/packages/nodes-base/nodes/SpreadsheetFile/v2/fromFile.operation.ts b/packages/nodes-base/nodes/SpreadsheetFile/v2/fromFile.operation.ts
new file mode 100644
index 0000000000000..ffafaa952ddcb
--- /dev/null
+++ b/packages/nodes-base/nodes/SpreadsheetFile/v2/fromFile.operation.ts
@@ -0,0 +1,230 @@
+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[] = [
+	binaryProperty,
+	{
+		displayName: 'File Format',
+		name: 'fileFormat',
+		type: 'options',
+		options: [
+			{
+				name: 'Autodetect',
+				value: 'autodetect',
+			},
+			{
+				name: 'CSV',
+				value: 'csv',
+				description: 'Comma-separated values',
+			},
+			{
+				name: 'HTML',
+				value: 'html',
+				description: 'HTML Table',
+			},
+			{
+				name: 'ODS',
+				value: 'ods',
+				description: 'OpenDocument Spreadsheet',
+			},
+			{
+				name: 'RTF',
+				value: 'rtf',
+				description: 'Rich Text Format',
+			},
+			{
+				name: 'XLS',
+				value: 'xls',
+				description: 'Excel',
+			},
+			{
+				name: 'XLSX',
+				value: 'xlsx',
+				description: 'Excel',
+			},
+		],
+		default: 'autodetect',
+		description: 'The format of the binary data to read from',
+		displayOptions: {
+			show: {
+				operation: ['fromFile'],
+			},
+		},
+	},
+	fromFileOptions,
+];
+
+export async function execute(
+	this: IExecuteFunctions,
+	items: INodeExecutionData[],
+	fileFormatProperty = 'fileFormat',
+) {
+	const returnData: INodeExecutionData[] = [];
+	let fileExtension;
+	let fileFormat;
+
+	for (let i = 0; i < items.length; i++) {
+		try {
+			const options = this.getNodeParameter('options', i, {});
+			fileFormat = this.getNodeParameter(fileFormatProperty, i, '');
+			const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i);
+			const binaryData = this.helpers.assertBinaryData(i, binaryPropertyName);
+			fileExtension = binaryData.fileExtension;
+
+			let rows: unknown[] = [];
+
+			if (
+				fileFormat === 'autodetect' &&
+				(binaryData.mimeType === 'text/csv' ||
+					(binaryData.mimeType === 'text/plain' && binaryData.fileExtension === 'csv'))
+			) {
+				fileFormat = 'csv';
+			}
+
+			if (fileFormat === 'csv') {
+				const maxRowCount = options.maxRowCount as number;
+				const parser = createCSVParser({
+					delimiter: options.delimiter as string,
+					fromLine: options.fromLine as number,
+					bom: options.enableBOM as boolean,
+					to: maxRowCount > -1 ? maxRowCount : undefined,
+					columns: options.headerRow !== false,
+					onRecord: (record) => {
+						if (!options.includeEmptyCells) {
+							record = Object.fromEntries(
+								Object.entries(record).filter(([_key, value]) => value !== ''),
+							);
+						}
+						rows.push(record);
+					},
+				});
+				if (binaryData.id) {
+					const stream = await this.helpers.getBinaryStream(binaryData.id);
+					await new Promise<void>(async (resolve, reject) => {
+						parser.on('error', reject);
+						parser.on('readable', () => {
+							stream.unpipe(parser);
+							stream.destroy();
+							resolve();
+						});
+						stream.pipe(parser);
+					});
+				} else {
+					parser.write(binaryData.data, BINARY_ENCODING);
+					parser.end();
+				}
+			} else {
+				let workbook: WorkBook;
+				const xlsxOptions: ParsingOptions = { raw: options.rawData as boolean };
+				if (options.readAsString) xlsxOptions.type = 'string';
+
+				if (binaryData.id) {
+					const binaryPath = this.helpers.getBinaryPath(binaryData.id);
+					workbook = xlsxReadFile(binaryPath, xlsxOptions);
+				} else {
+					const binaryDataBuffer = Buffer.from(binaryData.data, BINARY_ENCODING);
+					workbook = xlsxRead(
+						options.readAsString ? binaryDataBuffer.toString() : binaryDataBuffer,
+						xlsxOptions,
+					);
+				}
+
+				if (workbook.SheetNames.length === 0) {
+					throw new NodeOperationError(this.getNode(), 'Spreadsheet does not have any sheets!', {
+						itemIndex: i,
+					});
+				}
+
+				let sheetName = workbook.SheetNames[0];
+				if (options.sheetName) {
+					if (!workbook.SheetNames.includes(options.sheetName as string)) {
+						throw new NodeOperationError(
+							this.getNode(),
+							`Spreadsheet does not contain sheet called "${options.sheetName}"!`,
+							{ itemIndex: i },
+						);
+					}
+					sheetName = options.sheetName as string;
+				}
+
+				// Convert it to json
+				const sheetToJsonOptions: Sheet2JSONOpts = {};
+				if (options.range) {
+					if (isNaN(options.range as number)) {
+						sheetToJsonOptions.range = options.range;
+					} else {
+						sheetToJsonOptions.range = parseInt(options.range as string, 10);
+					}
+				}
+
+				if (options.includeEmptyCells) {
+					sheetToJsonOptions.defval = '';
+				}
+
+				if (options.headerRow === false) {
+					sheetToJsonOptions.header = 1; // Consider the first row as a data row
+				}
+
+				rows = xlsxUtils.sheet_to_json(workbook.Sheets[sheetName], sheetToJsonOptions);
+
+				// Check if data could be found in file
+				if (rows.length === 0) {
+					continue;
+				}
+			}
+
+			// Add all the found data columns to the workflow data
+			if (options.headerRow === false) {
+				// Data was returned as an array - https://github.com/SheetJS/sheetjs#json
+				for (const rowData of rows) {
+					returnData.push({
+						json: {
+							row: rowData,
+						},
+						pairedItem: {
+							item: i,
+						},
+					} as INodeExecutionData);
+				}
+			} else {
+				for (const rowData of rows) {
+					returnData.push({
+						json: rowData,
+						pairedItem: {
+							item: i,
+						},
+					} as INodeExecutionData);
+				}
+			}
+		} catch (error) {
+			let errorDescription = error.description;
+			if (fileExtension && fileExtension !== fileFormat) {
+				error.message = `The file selected in 'Input Binary Field' is not in ${fileFormat} format`;
+				errorDescription = `Try to change the operation or select a ${fileFormat} file in 'Input Binary Field'`;
+			}
+			if (this.continueOnFail()) {
+				returnData.push({
+					json: {
+						error: error.message,
+					},
+					pairedItem: {
+						item: i,
+					},
+				});
+				continue;
+			}
+			throw new NodeOperationError(this.getNode(), error, {
+				itemIndex: i,
+				description: errorDescription,
+			});
+		}
+	}
+
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/SpreadsheetFile/v2/toFile.operation.ts b/packages/nodes-base/nodes/SpreadsheetFile/v2/toFile.operation.ts
new file mode 100644
index 0000000000000..61f8f8509ef39
--- /dev/null
+++ b/packages/nodes-base/nodes/SpreadsheetFile/v2/toFile.operation.ts
@@ -0,0 +1,44 @@
+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';
+
+export const description: INodeProperties[] = [...toFileProperties, toFileOptions];
+
+export async function execute(this: IExecuteFunctions, items: INodeExecutionData[]) {
+	const returnData: INodeExecutionData[] = [];
+
+	const pairedItem = generatePairedItemData(items.length);
+
+	try {
+		const binaryPropertyName = this.getNodeParameter('binaryPropertyName', 0);
+		const fileFormat = this.getNodeParameter('fileFormat', 0) as JsonToSpreadsheetBinaryFormat;
+		const options = this.getNodeParameter('options', 0, {}) as JsonToSpreadsheetBinaryOptions;
+
+		const binaryData = await convertJsonToSpreadsheetBinary.call(this, items, fileFormat, options);
+
+		const newItem: INodeExecutionData = {
+			json: {},
+			binary: {
+				[binaryPropertyName]: binaryData,
+			},
+			pairedItem,
+		};
+
+		returnData.push(newItem);
+	} catch (error) {
+		if (this.continueOnFail()) {
+			returnData.push({
+				json: {
+					error: error.message,
+				},
+				pairedItem,
+			});
+		} else {
+			throw error;
+		}
+	}
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/SseTrigger/SseTrigger.node.json b/packages/nodes-base/nodes/SseTrigger/SseTrigger.node.json
index 3a46546a738cc..7965e4c1bd010 100644
--- a/packages/nodes-base/nodes/SseTrigger/SseTrigger.node.json
+++ b/packages/nodes-base/nodes/SseTrigger/SseTrigger.node.json
@@ -18,6 +18,6 @@
 		]
 	},
 	"subcategories": {
-		"Core Nodes": ["Flow", "Other Trigger Nodes"]
+		"Core Nodes": ["Other Trigger Nodes"]
 	}
 }
diff --git a/packages/nodes-base/nodes/SseTrigger/SseTrigger.node.ts b/packages/nodes-base/nodes/SseTrigger/SseTrigger.node.ts
index a0cfde72d4fd4..16d696817d8bc 100644
--- a/packages/nodes-base/nodes/SseTrigger/SseTrigger.node.ts
+++ b/packages/nodes-base/nodes/SseTrigger/SseTrigger.node.ts
@@ -22,6 +22,17 @@ export class SseTrigger implements INodeType {
 			name: 'SSE Trigger',
 			color: '#225577',
 		},
+		triggerPanel: {
+			header: '',
+			executionsHelp: {
+				inactive:
+					"<b>While building your workflow</b>, click the 'listen' button, then trigger an SSE event. This will trigger an execution, which will show up in this editor.<br /> <br /><b>Once you're happy with your workflow</b>, <a data-key='activate'>activate</a> it. Then every time a change is detected, the workflow will execute. These executions will show up in the <a data-key='executions'>executions list</a>, but not in the editor.",
+				active:
+					"<b>While building your workflow</b>, click the 'listen' button, then trigger an SSE event. This will trigger an execution, which will show up in this editor.<br /> <br /><b>Your workflow will also execute automatically</b>, since it's activated. Every time a change is detected, this node will trigger an execution. These executions will show up in the <a data-key='executions'>executions list</a>, but not in the editor.",
+			},
+			activationHint:
+				"Once you’ve finished building your workflow, <a data-key='activate'>activate</a> it to have it also listen continuously (you just won’t see those executions here).",
+		},
 		inputs: [],
 		outputs: ['main'],
 		properties: [
diff --git a/packages/nodes-base/nodes/Ssh/Ssh.node.ts b/packages/nodes-base/nodes/Ssh/Ssh.node.ts
index b39d429374d31..7625289797609 100644
--- a/packages/nodes-base/nodes/Ssh/Ssh.node.ts
+++ b/packages/nodes-base/nodes/Ssh/Ssh.node.ts
@@ -1,19 +1,51 @@
+import { rm, writeFile } from 'fs/promises';
+import type { Readable } from 'stream';
 import type {
+	ICredentialTestFunctions,
+	ICredentialsDecrypted,
 	IDataObject,
 	IExecuteFunctions,
+	INodeCredentialTestResult,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { BINARY_ENCODING } from 'n8n-workflow';
-
-import { rm, writeFile } from 'fs/promises';
+import { BINARY_ENCODING, 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 { formatPrivateKey } from '@utils/utilities';
+
+async function resolveHomeDir(
+	this: IExecuteFunctions,
+	path: string,
+	ssh: NodeSSH,
+	itemIndex: number,
+) {
+	if (path.startsWith('~/')) {
+		let homeDir = (await ssh.execCommand('echo $HOME')).stdout;
+
+		if (homeDir.charAt(homeDir.length - 1) !== '/') {
+			homeDir += '/';
+		}
+
+		return path.replace('~/', homeDir);
+	}
+
+	if (path.startsWith('~')) {
+		throw new NodeOperationError(
+			this.getNode(),
+			'Invalid path. Replace "~" with home directory or "~/"',
+			{
+				itemIndex,
+			},
+		);
+	}
+
+	return path;
+}
 
 export class Ssh implements INodeType {
 	description: INodeTypeDescription = {
@@ -34,6 +66,7 @@ export class Ssh implements INodeType {
 			{
 				name: 'sshPassword',
 				required: true,
+				testedBy: 'sshConnectionTest',
 				displayOptions: {
 					show: {
 						authentication: ['password'],
@@ -43,6 +76,7 @@ export class Ssh implements INodeType {
 			{
 				name: 'sshPrivateKey',
 				required: true,
+				testedBy: 'sshConnectionTest',
 				displayOptions: {
 					show: {
 						authentication: ['privateKey'],
@@ -157,7 +191,7 @@ export class Ssh implements INodeType {
 				default: 'upload',
 			},
 			{
-				displayName: 'Binary Property',
+				displayName: 'Input Binary Field',
 				name: 'binaryPropertyName',
 				type: 'string',
 				default: 'data',
@@ -169,8 +203,7 @@ export class Ssh implements INodeType {
 					},
 				},
 				placeholder: '',
-				description:
-					'Name of the binary property which contains the data for the file to be uploaded',
+				hint: 'The name of the input binary field containing the file to be uploaded',
 			},
 			{
 				displayName: 'Target Directory',
@@ -205,7 +238,7 @@ export class Ssh implements INodeType {
 				required: true,
 			},
 			{
-				displayName: 'Binary Property',
+				displayName: 'File Property',
 				displayOptions: {
 					show: {
 						resource: ['file'],
@@ -226,7 +259,7 @@ export class Ssh implements INodeType {
 				displayOptions: {
 					show: {
 						resource: ['file'],
-						operation: ['upload'],
+						operation: ['upload', 'download'],
 					},
 				},
 				default: {},
@@ -243,6 +276,56 @@ export class Ssh implements INodeType {
 		],
 	};
 
+	methods = {
+		credentialTest: {
+			async sshConnectionTest(
+				this: ICredentialTestFunctions,
+				credential: ICredentialsDecrypted,
+			): Promise<INodeCredentialTestResult> {
+				const credentials = credential.data as IDataObject;
+				const ssh = new NodeSSH();
+				const temporaryFiles: string[] = [];
+
+				try {
+					if (!credentials.privateKey) {
+						await ssh.connect({
+							host: credentials.host as string,
+							username: credentials.username as string,
+							port: credentials.port as number,
+							password: credentials.password as string,
+						});
+					} else {
+						const options: Config = {
+							host: credentials.host as string,
+							username: credentials.username as string,
+							port: credentials.port as number,
+							privateKey: formatPrivateKey(credentials.privateKey as string),
+						};
+
+						if (credentials.passphrase) {
+							options.passphrase = credentials.passphrase as string;
+						}
+
+						await ssh.connect(options);
+					}
+				} catch (error) {
+					const message = `SSH connection failed: ${error.message}`;
+					return {
+						status: 'Error',
+						message,
+					};
+				} finally {
+					ssh.dispose();
+					for (const tempFile of temporaryFiles) await rm(tempFile);
+				}
+				return {
+					status: 'OK',
+					message: 'Connection successful!',
+				};
+			},
+		},
+	};
+
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const items = this.getInputData();
 
@@ -268,16 +351,11 @@ export class Ssh implements INodeType {
 				});
 			} else if (authentication === 'privateKey') {
 				const credentials = await this.getCredentials('sshPrivateKey');
-
-				const { path } = await tmpFile({ prefix: 'n8n-ssh-' });
-				temporaryFiles.push(path);
-				await writeFile(path, credentials.privateKey as string);
-
 				const options: Config = {
 					host: credentials.host as string,
 					username: credentials.username as string,
 					port: credentials.port as number,
-					privateKey: path,
+					privateKey: formatPrivateKey(credentials.privateKey as string),
 				};
 
 				if (credentials.passphrase) {
@@ -292,7 +370,12 @@ export class Ssh implements INodeType {
 					if (resource === 'command') {
 						if (operation === 'execute') {
 							const command = this.getNodeParameter('command', i) as string;
-							const cwd = this.getNodeParameter('cwd', i) as string;
+							const cwd = await resolveHomeDir.call(
+								this,
+								this.getNodeParameter('cwd', i) as string,
+								ssh,
+								i,
+							);
 							returnItems.push({
 								json: (await ssh.execCommand(command, { cwd })) as unknown as IDataObject,
 								pairedItem: {
@@ -305,7 +388,12 @@ export class Ssh implements INodeType {
 					if (resource === 'file') {
 						if (operation === 'download') {
 							const dataPropertyNameDownload = this.getNodeParameter('binaryPropertyName', i);
-							const parameterPath = this.getNodeParameter('path', i) as string;
+							const parameterPath = await resolveHomeDir.call(
+								this,
+								this.getNodeParameter('path', i) as string,
+								ssh,
+								i,
+							);
 
 							const { path } = await tmpFile({ prefix: 'n8n-ssh-' });
 							temporaryFiles.push(path);
@@ -329,14 +417,20 @@ export class Ssh implements INodeType {
 
 							items[i] = newItem;
 
+							const fileName = this.getNodeParameter('options.fileName', i, '') as string;
 							items[i].binary![dataPropertyNameDownload] = await this.nodeHelpers.copyBinaryFile(
 								path,
-								parameterPath,
+								fileName || parameterPath,
 							);
 						}
 
 						if (operation === 'upload') {
-							const parameterPath = this.getNodeParameter('path', i) as string;
+							const parameterPath = await resolveHomeDir.call(
+								this,
+								this.getNodeParameter('path', i) as string,
+								ssh,
+								i,
+							);
 							const fileName = this.getNodeParameter('options.fileName', i, '') as string;
 
 							const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i);
@@ -344,7 +438,7 @@ export class Ssh implements INodeType {
 
 							let uploadData: Buffer | Readable;
 							if (binaryData.id) {
-								uploadData = this.helpers.getBinaryStream(binaryData.id);
+								uploadData = await this.helpers.getBinaryStream(binaryData.id);
 							} else {
 								uploadData = Buffer.from(binaryData.data, BINARY_ENCODING);
 							}
@@ -405,9 +499,9 @@ export class Ssh implements INodeType {
 
 		if (resource === 'file' && operation === 'download') {
 			// For file downloads the files get attached to the existing items
-			return this.prepareOutputData(items);
+			return [items];
 		} else {
-			return this.prepareOutputData(returnItems);
+			return [returnItems];
 		}
 	}
 }
diff --git a/packages/nodes-base/nodes/Stackby/GenericFunction.ts b/packages/nodes-base/nodes/Stackby/GenericFunction.ts
index d5368105d1a83..f5b6f8f4a3f77 100644
--- a/packages/nodes-base/nodes/Stackby/GenericFunction.ts
+++ b/packages/nodes-base/nodes/Stackby/GenericFunction.ts
@@ -1,11 +1,11 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
 	IHookFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
 	IPollFunctions,
+	IRequestOptions,
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
@@ -16,7 +16,7 @@ import { NodeApiError } from 'n8n-workflow';
  */
 export async function apiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject,
 	query?: IDataObject,
@@ -25,7 +25,7 @@ export async function apiRequest(
 ): Promise<any> {
 	const credentials = await this.getCredentials('stackbyApi');
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			'api-key': credentials.apiKey,
 			'Content-Type': 'application/json',
@@ -60,7 +60,7 @@ export async function apiRequest(
  */
 export async function apiRequestAllItems(
 	this: IHookFunctions | IExecuteFunctions | IPollFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject = {},
 	query: IDataObject = {},
diff --git a/packages/nodes-base/nodes/Stackby/Stackby.node.ts b/packages/nodes-base/nodes/Stackby/Stackby.node.ts
index 2607affa1e73e..608551fac0040 100644
--- a/packages/nodes-base/nodes/Stackby/Stackby.node.ts
+++ b/packages/nodes-base/nodes/Stackby/Stackby.node.ts
@@ -7,6 +7,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
+import { generatePairedItemData } from '../../utils/utilities';
 import type { IRecord } from './GenericFunction';
 import { apiRequest, apiRequestAllItems } from './GenericFunction';
 
@@ -282,9 +283,10 @@ export class Stackby implements INodeType {
 				);
 			} catch (error) {
 				if (this.continueOnFail()) {
+					const itemData = generatePairedItemData(items.length);
 					const executionErrorData = this.helpers.constructExecutionMetaData(
 						this.helpers.returnJsonArray({ error: error.message }),
-						{ itemData: { item: 0 } },
+						{ itemData },
 					);
 					returnData.push(...executionErrorData);
 				} else {
@@ -342,6 +344,6 @@ export class Stackby implements INodeType {
 				}
 			}
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Start/Start.node.ts b/packages/nodes-base/nodes/Start/Start.node.ts
index 05d3871e1e0c0..7affed7c2c54f 100644
--- a/packages/nodes-base/nodes/Start/Start.node.ts
+++ b/packages/nodes-base/nodes/Start/Start.node.ts
@@ -36,6 +36,6 @@ export class Start implements INodeType {
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const items = this.getInputData();
 
-		return this.prepareOutputData(items);
+		return [items];
 	}
 }
diff --git a/packages/nodes-base/nodes/StickyNote/StickyNote.node.ts b/packages/nodes-base/nodes/StickyNote/StickyNote.node.ts
index 819f1477355eb..79e0efbdcb09d 100644
--- a/packages/nodes-base/nodes/StickyNote/StickyNote.node.ts
+++ b/packages/nodes-base/nodes/StickyNote/StickyNote.node.ts
@@ -26,7 +26,6 @@ export class StickyNote implements INodeType {
 				displayName: 'Content',
 				name: 'content',
 				type: 'string',
-				required: true,
 				default:
 					"## I'm a note \n**Double click** to edit me. [Guide](https://docs.n8n.io/workflows/sticky-notes/)",
 			},
@@ -44,11 +43,19 @@ export class StickyNote implements INodeType {
 				required: true,
 				default: 240,
 			},
+			{
+				displayName: 'Color',
+				name: 'color',
+				// eslint-disable-next-line n8n-nodes-base/node-param-color-type-unused
+				type: 'number',
+				required: true,
+				default: 1,
+			},
 		],
 	};
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const items = this.getInputData();
-		return this.prepareOutputData(items);
+		return [items];
 	}
 }
diff --git a/packages/nodes-base/nodes/StopAndError/StopAndError.node.json b/packages/nodes-base/nodes/StopAndError/StopAndError.node.json
index 29e19dc814bc8..b46fd906bd971 100644
--- a/packages/nodes-base/nodes/StopAndError/StopAndError.node.json
+++ b/packages/nodes-base/nodes/StopAndError/StopAndError.node.json
@@ -12,6 +12,6 @@
 	},
 	"alias": ["Throw error", "Error", "Exception"],
 	"subcategories": {
-		"Core Nodes": ["Helpers"]
+		"Core Nodes": ["Flow"]
 	}
 }
diff --git a/packages/nodes-base/nodes/StopAndError/StopAndError.node.ts b/packages/nodes-base/nodes/StopAndError/StopAndError.node.ts
index 537ce4101b6bb..3378c73699ea9 100644
--- a/packages/nodes-base/nodes/StopAndError/StopAndError.node.ts
+++ b/packages/nodes-base/nodes/StopAndError/StopAndError.node.ts
@@ -3,6 +3,7 @@ import type {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	JsonObject,
 } from 'n8n-workflow';
 import { jsonParse, NodeOperationError } from 'n8n-workflow';
 
@@ -81,14 +82,14 @@ export class StopAndError implements INodeType {
 		const errorType = this.getNodeParameter('errorType', 0) as 'errorMessage' | 'errorObject';
 		const { id: workflowId, name: workflowName } = this.getWorkflow();
 
-		let toThrow: string | { name: string; message: string; [otherKey: string]: unknown };
+		let toThrow: string | JsonObject;
 
 		if (errorType === 'errorMessage') {
 			toThrow = this.getNodeParameter('errorMessage', 0) as string;
 		} else {
 			const json = this.getNodeParameter('errorObject', 0) as string;
 
-			const errorObject = jsonParse<any>(json);
+			const errorObject = jsonParse<JsonObject>(json);
 
 			toThrow = {
 				name: 'User-thrown error',
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 fd339562312be..dc0c630de682a 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,8 @@
 /* eslint-disable @typescript-eslint/no-loop-func */
-import type { WorkflowTestData } from '../../../../test/nodes/types';
-import { executeWorkflow } from '../../../../test/nodes/ExecuteWorkflow';
-import * as Helpers from '../../../../test/nodes/Helpers';
 import 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';
 
 describe('Execute Stop and Error Node', () => {
 	const tests: WorkflowTestData[] = [
@@ -88,7 +88,7 @@ describe('Execute Stop and Error Node', () => {
 			const stopAndError1RunData = result.data.resultData.runData['Stop and Error1'];
 			const stopAndError1Object = (
 				(stopAndError1RunData as unknown as IDataObject[])[0].error as IDataObject
-			).cause;
+			).errorResponse;
 
 			expect(stopAndError1Object).toEqual({
 				code: 404,
diff --git a/packages/nodes-base/nodes/Storyblok/GenericFunctions.ts b/packages/nodes-base/nodes/Storyblok/GenericFunctions.ts
index 1b5e8f0aee0e0..00401d97724fc 100644
--- a/packages/nodes-base/nodes/Storyblok/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Storyblok/GenericFunctions.ts
@@ -1,18 +1,17 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	JsonObject,
+	IRequestOptions,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function storyblokApiRequest(
-	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 	body: IDataObject = {},
 	qs: IDataObject = {},
@@ -20,7 +19,7 @@ export async function storyblokApiRequest(
 ) {
 	const authenticationMethod = this.getNodeParameter('source', 0) as string;
 
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		headers: {
 			'Content-Type': 'application/json',
 		},
@@ -33,7 +32,7 @@ export async function storyblokApiRequest(
 
 	options = Object.assign({}, options, option);
 
-	if (Object.keys(options.body as IDataObject).length === 0) {
+	if (Object.keys(options.body).length === 0) {
 		delete options.body;
 	}
 
@@ -42,7 +41,7 @@ export async function storyblokApiRequest(
 
 		options.uri = `https://api.storyblok.com${resource}`;
 
-		Object.assign(options.qs, { token: credentials.apiKey });
+		Object.assign(options.qs ?? {}, { token: credentials.apiKey });
 	} else {
 		const credentials = await this.getCredentials('storyblokManagementApi');
 
@@ -63,7 +62,7 @@ export async function storyblokApiRequest(
 export async function storyblokApiRequestAllItems(
 	this: IHookFunctions | ILoadOptionsFunctions | IExecuteFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 	body: IDataObject = {},
 	query: IDataObject = {},
diff --git a/packages/nodes-base/nodes/Storyblok/Storyblok.node.json b/packages/nodes-base/nodes/Storyblok/Storyblok.node.json
index 2ce9f0153fe5e..b9db04104eff6 100644
--- a/packages/nodes-base/nodes/Storyblok/Storyblok.node.json
+++ b/packages/nodes-base/nodes/Storyblok/Storyblok.node.json
@@ -2,7 +2,7 @@
 	"node": "n8n-nodes-base.storyblok",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Data & Storage", "Marketing & Content"],
+	"categories": ["Data & Storage", "Marketing"],
 	"resources": {
 		"credentialDocumentation": [
 			{
diff --git a/packages/nodes-base/nodes/Storyblok/Storyblok.node.ts b/packages/nodes-base/nodes/Storyblok/Storyblok.node.ts
index 052760a19824c..d6323156c5664 100644
--- a/packages/nodes-base/nodes/Storyblok/Storyblok.node.ts
+++ b/packages/nodes-base/nodes/Storyblok/Storyblok.node.ts
@@ -359,6 +359,6 @@ export class Storyblok implements INodeType {
 				throw error;
 			}
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Storyblok/storyblok.svg b/packages/nodes-base/nodes/Storyblok/storyblok.svg
index c47cb1e56a9e0..c8b617c2d624b 100644
--- a/packages/nodes-base/nodes/Storyblok/storyblok.svg
+++ b/packages/nodes-base/nodes/Storyblok/storyblok.svg
@@ -1 +1 @@
-<svg width="87" height="103" xmlns="http://www.w3.org/2000/svg"><g fill="#09B3AF"><path d="M51.8 49H31v10h20.3c1.2 0 2.3-.5 3.2-1.3.8-.8 1.3-2 1.3-3.5a6 6 0 00-1.1-3.6c-.8-1-1.7-1.6-2.9-1.6zm.7-12.1c.9-.6 1.3-1.9 1.3-3.6 0-1.5-.4-2.6-1.1-3.3-.7-.6-1.6-1-2.6-1H31v9h18.7c1 0 2-.5 2.8-1.1z"/><path d="M83 0H4.5C2 0 0 2 0 4.4V83c0 2.4 2 3.9 4.4 3.9H16v15.7L30.4 87H83c2.4 0 3.9-1.5 3.9-4V4.5c0-2.4-1.5-4.4-4-4.4L83 0zM69.8 63.7c-1 1.8-2.5 3.3-4.3 4.4-1.9 1.2-4 2.3-6.4 2.8-2.4.6-5 1.1-7.7 1.1H16V16h40.2c2 0 3.7.4 5.3 1.3 1.5.8 2.9 1.9 4 3.2a15 15 0 013.4 9.7c0 2.6-.7 5.1-2 7.5a12.5 12.5 0 01-6 5.4c3.2.9 5.7 2.5 7.6 4.8 1.8 2.4 2.7 5.5 2.7 9.4 0 2.5-.5 4.6-1.5 6.4h.1z"/><path d="M51.8 49H31v10h20.3c1.2 0 2.3-.5 3.2-1.3.8-.8 1.3-2 1.3-3.5a6 6 0 00-1.1-3.6c-.8-1-1.7-1.6-2.9-1.6zm.7-12.1c.9-.6 1.3-1.9 1.3-3.6 0-1.5-.4-2.6-1.1-3.3-.7-.6-1.6-1-2.6-1H31v9h18.7c1 0 2-.5 2.8-1.1z"/><path d="M83 0H4.5C2 0 0 2 0 4.4V83c0 2.4 2 3.9 4.4 3.9H16v15.7L30.4 87H83c2.4 0 3.9-1.5 3.9-4V4.5c0-2.4-1.5-4.4-4-4.4L83 0zM69.8 63.7c-1 1.8-2.5 3.3-4.3 4.4-1.9 1.2-4 2.3-6.4 2.8-2.4.6-5 1.1-7.7 1.1H16V16h40.2c2 0 3.7.4 5.3 1.3 1.5.8 2.9 1.9 4 3.2a15 15 0 013.4 9.7c0 2.6-.7 5.1-2 7.5a12.5 12.5 0 01-6 5.4c3.2.9 5.7 2.5 7.6 4.8 1.8 2.4 2.7 5.5 2.7 9.4 0 2.5-.5 4.6-1.5 6.4h.1z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="87" height="103"><g fill="#09B3AF"><path d="M51.8 49H31v10h20.3c1.2 0 2.3-.5 3.2-1.3.8-.8 1.3-2 1.3-3.5a6 6 0 0 0-1.1-3.6c-.8-1-1.7-1.6-2.9-1.6m.7-12.1c.9-.6 1.3-1.9 1.3-3.6 0-1.5-.4-2.6-1.1-3.3-.7-.6-1.6-1-2.6-1H31v9h18.7c1 0 2-.5 2.8-1.1"/><path d="M83 0H4.5C2 0 0 2 0 4.4V83c0 2.4 2 3.9 4.4 3.9H16v15.7L30.4 87H83c2.4 0 3.9-1.5 3.9-4V4.5c0-2.4-1.5-4.4-4-4.4zM69.8 63.7c-1 1.8-2.5 3.3-4.3 4.4-1.9 1.2-4 2.3-6.4 2.8-2.4.6-5 1.1-7.7 1.1H16V16h40.2c2 0 3.7.4 5.3 1.3 1.5.8 2.9 1.9 4 3.2a15 15 0 0 1 3.4 9.7c0 2.6-.7 5.1-2 7.5a12.5 12.5 0 0 1-6 5.4c3.2.9 5.7 2.5 7.6 4.8 1.8 2.4 2.7 5.5 2.7 9.4 0 2.5-.5 4.6-1.5 6.4z"/><path d="M51.8 49H31v10h20.3c1.2 0 2.3-.5 3.2-1.3.8-.8 1.3-2 1.3-3.5a6 6 0 0 0-1.1-3.6c-.8-1-1.7-1.6-2.9-1.6m.7-12.1c.9-.6 1.3-1.9 1.3-3.6 0-1.5-.4-2.6-1.1-3.3-.7-.6-1.6-1-2.6-1H31v9h18.7c1 0 2-.5 2.8-1.1"/><path d="M83 0H4.5C2 0 0 2 0 4.4V83c0 2.4 2 3.9 4.4 3.9H16v15.7L30.4 87H83c2.4 0 3.9-1.5 3.9-4V4.5c0-2.4-1.5-4.4-4-4.4zM69.8 63.7c-1 1.8-2.5 3.3-4.3 4.4-1.9 1.2-4 2.3-6.4 2.8-2.4.6-5 1.1-7.7 1.1H16V16h40.2c2 0 3.7.4 5.3 1.3 1.5.8 2.9 1.9 4 3.2a15 15 0 0 1 3.4 9.7c0 2.6-.7 5.1-2 7.5a12.5 12.5 0 0 1-6 5.4c3.2.9 5.7 2.5 7.6 4.8 1.8 2.4 2.7 5.5 2.7 9.4 0 2.5-.5 4.6-1.5 6.4z"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Strapi/GenericFunctions.ts b/packages/nodes-base/nodes/Strapi/GenericFunctions.ts
index c8d8a02fa272b..b687766037d8b 100644
--- a/packages/nodes-base/nodes/Strapi/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Strapi/GenericFunctions.ts
@@ -1,40 +1,53 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
+	ICredentialDataDecryptedObject,
 	IDataObject,
 	IExecuteFunctions,
 	IHookFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
+	IRequestOptions,
 	IWebhookFunctions,
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
+export const removeTrailingSlash = (url: string) => {
+	if (url.endsWith('/')) {
+		return url.slice(0, -1);
+	}
+	return url;
+};
+
 export async function strapiApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions | IWebhookFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
-
 	body: IDataObject = {},
 	qs: IDataObject = {},
 	uri?: string,
 	headers: IDataObject = {},
 ) {
-	const credentials = await this.getCredentials('strapiApi');
+	const authenticationMethod = this.getNodeParameter('authentication', 0);
+	let credentials: ICredentialDataDecryptedObject;
+
+	if (authenticationMethod === 'password') {
+		credentials = await this.getCredentials('strapiApi');
+	} else {
+		credentials = await this.getCredentials('strapiTokenApi');
+	}
+
+	const url = removeTrailingSlash(credentials.url as string);
 
 	try {
-		const options: OptionsWithUri = {
+		const options: IRequestOptions = {
 			headers: {},
 			method,
 			body,
 			qs,
-			uri:
-				uri || credentials.apiVersion === 'v4'
-					? `${credentials.url}/api${resource}`
-					: `${credentials.url}${resource}`,
+			uri: uri || credentials.apiVersion === 'v4' ? `${url}/api${resource}` : `${url}${resource}`,
 			json: true,
 			qsStringifyOptions: {
-				arrayFormat: 'indice',
+				arrayFormat: 'indices',
 			},
 		};
 		if (Object.keys(headers).length !== 0) {
@@ -44,7 +57,11 @@ export async function strapiApiRequest(
 			delete options.body;
 		}
 
-		return await this.helpers?.request(options);
+		return await this.helpers.requestWithAuthentication.call(
+			this,
+			authenticationMethod === 'password' ? 'strapiApi' : 'strapiTokenApi',
+			options,
+		);
 	} catch (error) {
 		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
@@ -52,9 +69,12 @@ export async function strapiApiRequest(
 
 export async function getToken(
 	this: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions | IWebhookFunctions,
-): Promise<any> {
+): Promise<{ jwt: string }> {
 	const credentials = await this.getCredentials('strapiApi');
-	let options = {} as OptionsWithUri;
+
+	const url = removeTrailingSlash(credentials.url as string);
+
+	let options = {} as IRequestOptions;
 	options = {
 		headers: {
 			'content-type': 'application/json',
@@ -64,30 +84,27 @@ export async function getToken(
 			identifier: credentials.email,
 			password: credentials.password,
 		},
-		uri:
-			credentials.apiVersion === 'v4'
-				? `${credentials.url}/api/auth/local`
-				: `${credentials.url}/auth/local`,
+		uri: credentials.apiVersion === 'v4' ? `${url}/api/auth/local` : `${url}/auth/local`,
 		json: true,
 	};
-	return this.helpers.request(options);
+	return await (this.helpers.request(options) as Promise<{ jwt: string }>);
 }
 
 export async function strapiApiRequestAllItems(
 	this: IHookFunctions | ILoadOptionsFunctions | IExecuteFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 	body: IDataObject = {},
 	query: IDataObject = {},
 	headers: IDataObject = {},
+	apiVersion: string = 'v3',
 ) {
 	const returnData: IDataObject[] = [];
-	const { apiVersion } = await this.getCredentials('strapiApi');
 
 	let responseData;
 	if (apiVersion === 'v4') {
 		query['pagination[pageSize]'] = 20;
-		query['pagination[page]'] = 0;
+		query['pagination[page]'] = 1;
 		do {
 			({ data: responseData } = await strapiApiRequest.call(
 				this,
@@ -98,7 +115,7 @@ export async function strapiApiRequestAllItems(
 				undefined,
 				headers,
 			));
-			query['pagination[page]'] += query['pagination[pageSize]'];
+			query['pagination[page]']++;
 			returnData.push.apply(returnData, responseData as IDataObject[]);
 		} while (responseData.length !== 0);
 	} else {
diff --git a/packages/nodes-base/nodes/Strapi/Strapi.node.json b/packages/nodes-base/nodes/Strapi/Strapi.node.json
index a41614a40b03d..07df9ead6db9c 100644
--- a/packages/nodes-base/nodes/Strapi/Strapi.node.json
+++ b/packages/nodes-base/nodes/Strapi/Strapi.node.json
@@ -2,11 +2,11 @@
 	"node": "n8n-nodes-base.strapi",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Data & Storage", "Marketing & Content"],
+	"categories": ["Data & Storage", "Marketing"],
 	"resources": {
 		"credentialDocumentation": [
 			{
-				"url": "https://docs.n8n.io/credentials/strapi"
+				"url": "https://docs.n8n.io/integrations/builtin/credentials/strapi"
 			}
 		],
 		"primaryDocumentation": [
diff --git a/packages/nodes-base/nodes/Strapi/Strapi.node.ts b/packages/nodes-base/nodes/Strapi/Strapi.node.ts
index 7f2328b0e3b53..4633e2819aa64 100644
--- a/packages/nodes-base/nodes/Strapi/Strapi.node.ts
+++ b/packages/nodes-base/nodes/Strapi/Strapi.node.ts
@@ -1,5 +1,3 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IExecuteFunctions,
 	ICredentialsDecrypted,
@@ -9,11 +7,13 @@ import type {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
 import {
 	getToken,
+	removeTrailingSlash,
 	strapiApiRequest,
 	strapiApiRequestAllItems,
 	validateJSON,
@@ -40,9 +40,39 @@ export class Strapi implements INodeType {
 				name: 'strapiApi',
 				required: true,
 				testedBy: 'strapiApiTest',
+				displayOptions: {
+					show: {
+						authentication: ['password'],
+					},
+				},
+			},
+			{
+				name: 'strapiTokenApi',
+				required: true,
+				displayOptions: {
+					show: {
+						authentication: ['token'],
+					},
+				},
 			},
 		],
 		properties: [
+			{
+				displayName: 'Authentication',
+				name: 'authentication',
+				type: 'options',
+				options: [
+					{
+						name: 'Username & Password',
+						value: 'password',
+					},
+					{
+						name: 'API Token',
+						value: 'token',
+					},
+				],
+				default: 'password',
+			},
 			{
 				displayName: 'Resource',
 				name: 'resource',
@@ -68,7 +98,9 @@ export class Strapi implements INodeType {
 				credential: ICredentialsDecrypted,
 			): Promise<INodeCredentialTestResult> {
 				const credentials = credential.data as IDataObject;
-				let options = {} as OptionsWithUri;
+				let options: IRequestOptions = {};
+
+				const url = removeTrailingSlash(credentials.url as string);
 
 				options = {
 					headers: {
@@ -79,12 +111,10 @@ export class Strapi implements INodeType {
 						identifier: credentials.email,
 						password: credentials.password,
 					},
-					uri:
-						credentials.apiVersion === 'v4'
-							? `${credentials.url}/api/auth/local`
-							: `${credentials.url}/auth/local`,
+					uri: credentials.apiVersion === 'v4' ? `${url}/api/auth/local` : `${url}/auth/local`,
 					json: true,
 				};
+
 				try {
 					await this.helpers.request(options);
 					return {
@@ -111,10 +141,18 @@ export class Strapi implements INodeType {
 		const resource = this.getNodeParameter('resource', 0);
 		const operation = this.getNodeParameter('operation', 0);
 
-		const { apiVersion } = await this.getCredentials('strapiApi');
-		const { jwt } = await getToken.call(this);
+		const authenticationMethod = this.getNodeParameter('authentication', 0);
+
+		let apiVersion: string;
+
+		if (authenticationMethod === 'password') {
+			const { jwt } = await getToken.call(this);
+			apiVersion = (await this.getCredentials('strapiApi')).apiVersion as string;
+			headers.Authorization = `Bearer ${jwt}`;
+		} else {
+			apiVersion = (await this.getCredentials('strapiTokenApi')).apiVersion as string;
+		}
 
-		headers.Authorization = `Bearer ${jwt}`;
 		for (let i = 0; i < length; i++) {
 			try {
 				if (resource === 'entry') {
@@ -212,6 +250,7 @@ export class Strapi implements INodeType {
 									{},
 									qs,
 									headers,
+									apiVersion,
 								);
 							} else {
 								qs['pagination[pageSize]'] = this.getNodeParameter('limit', i);
@@ -255,6 +294,7 @@ export class Strapi implements INodeType {
 									{},
 									qs,
 									headers,
+									apiVersion,
 								);
 							} else {
 								qs._limit = this.getNodeParameter('limit', i);
@@ -360,6 +400,6 @@ export class Strapi implements INodeType {
 				throw error;
 			}
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Strapi/strapi.svg b/packages/nodes-base/nodes/Strapi/strapi.svg
index ceb65ff0e30e2..3496c5a10d4c3 100644
--- a/packages/nodes-base/nodes/Strapi/strapi.svg
+++ b/packages/nodes-base/nodes/Strapi/strapi.svg
@@ -1 +1 @@
-<svg width="1025" height="1032" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M341.328 0v344.061h341.333v344.06h341.329V0H341.328z" fill="url(#a)"/><path d="M683 343.725H343v344.732h340V343.725z" fill="url(#b)"/><path d="M341.333 344.061H0L341.333 0v344.061z" fill="url(#c)"/><path d="M682.367 1031.18V687.457h342.003L682.367 1031.18z" fill="url(#d)"/><circle r="1.796" transform="matrix(1 0 0 -1 365.162 314.663)" fill="#956FFF"/><circle r="1.796" transform="matrix(1 0 0 -1 374.502 314.663)" fill="#956FFF"/><circle r="1.796" transform="matrix(1 0 0 -1 383.843 314.663)" fill="#956FFF"/><circle r="1.796" transform="matrix(1 0 0 -1 393.184 314.663)" fill="#956FFF"/><circle r="1.796" transform="matrix(1 0 0 -1 402.525 314.663)" fill="#956FFF"/><circle r="1.796" transform="matrix(1 0 0 -1 411.866 314.663)" fill="#956FFF"/><circle r="1.796" transform="matrix(1 0 0 -1 421.206 314.663)" fill="#956FFF"/><circle r="1.796" transform="matrix(1 0 0 -1 430.546 314.663)" fill="#956FFF"/><circle r="1.796" transform="matrix(1 0 0 -1 439.887 314.663)" fill="#956FFF"/><circle r="1.796" transform="matrix(1 0 0 -1 449.228 314.663)" fill="#956FFF"/><circle r="1.796" transform="matrix(1 0 0 -1 458.569 314.663)" fill="#956FFF"/><circle r="1.796" transform="matrix(1 0 0 -1 365.162 306.041)" fill="#956FFF"/><circle r="1.796" transform="matrix(1 0 0 -1 374.502 306.041)" fill="#956FFF"/><circle r="1.796" transform="matrix(1 0 0 -1 383.843 306.041)" fill="#956FFF"/><circle r="1.796" transform="matrix(1 0 0 -1 393.184 306.041)" fill="#956FFF"/><circle r="1.796" transform="matrix(1 0 0 -1 402.525 306.041)" fill="#956FFF"/><circle r="1.796" transform="matrix(1 0 0 -1 411.866 306.041)" fill="#956FFF"/><circle r="1.796" transform="matrix(1 0 0 -1 421.206 306.041)" fill="#956FFF"/><circle r="1.796" transform="matrix(1 0 0 -1 430.546 306.041)" fill="#956FFF"/><circle r="1.796" transform="matrix(1 0 0 -1 365.162 297.419)" fill="#956FFF"/><circle r="1.796" transform="matrix(1 0 0 -1 374.502 297.419)" fill="#956FFF"/><circle r="1.796" transform="matrix(1 0 0 -1 383.843 297.419)" fill="#956FFF"/><circle r="1.796" transform="matrix(1 0 0 -1 393.184 297.419)" fill="#956FFF"/><circle r="1.796" transform="matrix(1 0 0 -1 402.525 297.419)" fill="#956FFF"/><circle r="1.796" transform="matrix(1 0 0 -1 365.162 288.796)" fill="#956FFF"/><circle r="1.796" transform="matrix(1 0 0 -1 374.502 288.797)" fill="#956FFF"/><circle r="1.796" transform="matrix(1 0 0 -1 383.843 288.797)" fill="#956FFF"/><circle cx="716.162" cy="638.796" r="1.796" fill="#956FFF"/><circle cx="725.502" cy="638.796" r="1.796" fill="#956FFF"/><circle cx="734.843" cy="638.796" r="1.796" fill="#956FFF"/><circle cx="744.184" cy="638.796" r="1.796" fill="#956FFF"/><circle cx="753.525" cy="638.796" r="1.796" fill="#956FFF"/><circle cx="762.866" cy="638.796" r="1.796" fill="#956FFF"/><circle cx="772.206" cy="638.796" r="1.796" fill="#956FFF"/><circle cx="716.162" cy="647.419" r="1.796" fill="#956FFF"/><circle cx="725.502" cy="647.419" r="1.796" fill="#956FFF"/><circle cx="734.843" cy="647.419" r="1.796" fill="#956FFF"/><circle cx="744.184" cy="647.419" r="1.796" fill="#956FFF"/><circle cx="753.525" cy="647.419" r="1.796" fill="#956FFF"/><circle cx="762.866" cy="647.419" r="1.796" fill="#956FFF"/><circle cx="716.162" cy="656.041" r="1.796" fill="#956FFF"/><circle cx="725.502" cy="656.04" r="1.796" fill="#956FFF"/><circle cx="734.843" cy="656.04" r="1.796" fill="#956FFF"/><circle cx="744.184" cy="656.04" r="1.796" fill="#956FFF"/><circle cx="753.525" cy="656.04" r="1.796" fill="#956FFF"/><circle cx="716.162" cy="664.664" r="1.796" fill="#956FFF"/><circle cx="725.502" cy="664.663" r="1.796" fill="#956FFF"/><circle cx="734.843" cy="664.663" r="1.796" fill="#956FFF"/><defs><linearGradient id="a" x1="1072.36" y1="-51.407" x2="553.031" y2="446.945" gradientUnits="userSpaceOnUse"><stop offset=".021" stop-color="#956FFF"/><stop offset="1" stop-color="#1C1B7E"/></linearGradient><linearGradient id="b" x1="634.365" y1="396.5" x2="277.177" y2="712.901" gradientUnits="userSpaceOnUse"><stop stop-color="#956FFF"/><stop offset="1" stop-color="#1A2670"/></linearGradient><linearGradient id="c" x1="170.667" y1="0" x2="170.667" y2="344.061" gradientUnits="userSpaceOnUse"><stop offset=".021" stop-color="#956FFF"/><stop offset="1" stop-color="#1C1B7E"/></linearGradient><linearGradient id="d" x1="1085.18" y1="556.22" x2="695.654" y2="967.042" gradientUnits="userSpaceOnUse"><stop stop-color="#956FFF"/><stop offset=".839" stop-color="#1C1B7E"/></linearGradient></defs></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="1025" height="1032" fill="none"><path fill="url(#a)" d="M341.328 0v344.061h341.333v344.06h341.329V0z"/><path fill="url(#b)" d="M683 343.725H343v344.732h340z"/><path fill="url(#c)" d="M341.333 344.061H0L341.333 0z"/><path fill="url(#d)" d="M682.367 1031.18V687.457h342.003z"/><circle r="1.796" fill="#956FFF" transform="matrix(1 0 0 -1 365.162 314.663)"/><circle r="1.796" fill="#956FFF" transform="matrix(1 0 0 -1 374.502 314.663)"/><circle r="1.796" fill="#956FFF" transform="matrix(1 0 0 -1 383.843 314.663)"/><circle r="1.796" fill="#956FFF" transform="matrix(1 0 0 -1 393.184 314.663)"/><circle r="1.796" fill="#956FFF" transform="matrix(1 0 0 -1 402.525 314.663)"/><circle r="1.796" fill="#956FFF" transform="matrix(1 0 0 -1 411.866 314.663)"/><circle r="1.796" fill="#956FFF" transform="matrix(1 0 0 -1 421.206 314.663)"/><circle r="1.796" fill="#956FFF" transform="matrix(1 0 0 -1 430.546 314.663)"/><circle r="1.796" fill="#956FFF" transform="matrix(1 0 0 -1 439.887 314.663)"/><circle r="1.796" fill="#956FFF" transform="matrix(1 0 0 -1 449.228 314.663)"/><circle r="1.796" fill="#956FFF" transform="matrix(1 0 0 -1 458.569 314.663)"/><circle r="1.796" fill="#956FFF" transform="matrix(1 0 0 -1 365.162 306.041)"/><circle r="1.796" fill="#956FFF" transform="matrix(1 0 0 -1 374.502 306.041)"/><circle r="1.796" fill="#956FFF" transform="matrix(1 0 0 -1 383.843 306.041)"/><circle r="1.796" fill="#956FFF" transform="matrix(1 0 0 -1 393.184 306.041)"/><circle r="1.796" fill="#956FFF" transform="matrix(1 0 0 -1 402.525 306.041)"/><circle r="1.796" fill="#956FFF" transform="matrix(1 0 0 -1 411.866 306.041)"/><circle r="1.796" fill="#956FFF" transform="matrix(1 0 0 -1 421.206 306.041)"/><circle r="1.796" fill="#956FFF" transform="matrix(1 0 0 -1 430.546 306.041)"/><circle r="1.796" fill="#956FFF" transform="matrix(1 0 0 -1 365.162 297.419)"/><circle r="1.796" fill="#956FFF" transform="matrix(1 0 0 -1 374.502 297.419)"/><circle r="1.796" fill="#956FFF" transform="matrix(1 0 0 -1 383.843 297.419)"/><circle r="1.796" fill="#956FFF" transform="matrix(1 0 0 -1 393.184 297.419)"/><circle r="1.796" fill="#956FFF" transform="matrix(1 0 0 -1 402.525 297.419)"/><circle r="1.796" fill="#956FFF" transform="matrix(1 0 0 -1 365.162 288.796)"/><circle r="1.796" fill="#956FFF" transform="matrix(1 0 0 -1 374.502 288.797)"/><circle r="1.796" fill="#956FFF" transform="matrix(1 0 0 -1 383.843 288.797)"/><circle cx="716.162" cy="638.796" r="1.796" fill="#956FFF"/><circle cx="725.502" cy="638.796" r="1.796" fill="#956FFF"/><circle cx="734.843" cy="638.796" r="1.796" fill="#956FFF"/><circle cx="744.184" cy="638.796" r="1.796" fill="#956FFF"/><circle cx="753.525" cy="638.796" r="1.796" fill="#956FFF"/><circle cx="762.866" cy="638.796" r="1.796" fill="#956FFF"/><circle cx="772.206" cy="638.796" r="1.796" fill="#956FFF"/><circle cx="716.162" cy="647.419" r="1.796" fill="#956FFF"/><circle cx="725.502" cy="647.419" r="1.796" fill="#956FFF"/><circle cx="734.843" cy="647.419" r="1.796" fill="#956FFF"/><circle cx="744.184" cy="647.419" r="1.796" fill="#956FFF"/><circle cx="753.525" cy="647.419" r="1.796" fill="#956FFF"/><circle cx="762.866" cy="647.419" r="1.796" fill="#956FFF"/><circle cx="716.162" cy="656.041" r="1.796" fill="#956FFF"/><circle cx="725.502" cy="656.04" r="1.796" fill="#956FFF"/><circle cx="734.843" cy="656.04" r="1.796" fill="#956FFF"/><circle cx="744.184" cy="656.04" r="1.796" fill="#956FFF"/><circle cx="753.525" cy="656.04" r="1.796" fill="#956FFF"/><circle cx="716.162" cy="664.664" r="1.796" fill="#956FFF"/><circle cx="725.502" cy="664.663" r="1.796" fill="#956FFF"/><circle cx="734.843" cy="664.663" r="1.796" fill="#956FFF"/><defs><linearGradient id="a" x1="1072.36" x2="553.031" y1="-51.407" y2="446.945" gradientUnits="userSpaceOnUse"><stop offset=".021" stop-color="#956FFF"/><stop offset="1" stop-color="#1C1B7E"/></linearGradient><linearGradient id="b" x1="634.365" x2="277.177" y1="396.5" y2="712.901" gradientUnits="userSpaceOnUse"><stop stop-color="#956FFF"/><stop offset="1" stop-color="#1A2670"/></linearGradient><linearGradient id="c" x1="170.667" x2="170.667" y1="0" y2="344.061" gradientUnits="userSpaceOnUse"><stop offset=".021" stop-color="#956FFF"/><stop offset="1" stop-color="#1C1B7E"/></linearGradient><linearGradient id="d" x1="1085.18" x2="695.654" y1="556.22" y2="967.042" gradientUnits="userSpaceOnUse"><stop stop-color="#956FFF"/><stop offset=".839" stop-color="#1C1B7E"/></linearGradient></defs></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Strava/ActivityDescription.ts b/packages/nodes-base/nodes/Strava/ActivityDescription.ts
index c2f8da8d093de..ddf7179ce45f2 100644
--- a/packages/nodes-base/nodes/Strava/ActivityDescription.ts
+++ b/packages/nodes-base/nodes/Strava/ActivityDescription.ts
@@ -233,6 +233,14 @@ export const activityFields: INodeProperties[] = [
 				description:
 					'Identifier for the gear associated with the activity. ‘none’ clears gear from activity.',
 			},
+			{
+				displayName: 'Mute Activity',
+				name: 'hide_from_home',
+				type: 'boolean',
+				default: false,
+				// eslint-disable-next-line n8n-nodes-base/node-param-description-boolean-without-whether
+				description: 'Do not publish to Home or Club feeds',
+			},
 			{
 				displayName: 'Name',
 				name: 'name',
diff --git a/packages/nodes-base/nodes/Strava/GenericFunctions.ts b/packages/nodes-base/nodes/Strava/GenericFunctions.ts
index c42c34ad93cac..d5488b7e0e865 100644
--- a/packages/nodes-base/nodes/Strava/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Strava/GenericFunctions.ts
@@ -1,31 +1,25 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
+	IRequestOptions,
 	IWebhookFunctions,
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function stravaApiRequest(
-	this:
-		| IExecuteFunctions
-		| IExecuteSingleFunctions
-		| ILoadOptionsFunctions
-		| IHookFunctions
-		| IWebhookFunctions,
-	method: string,
+	this: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions | IWebhookFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 	body: IDataObject = {},
 	qs: IDataObject = {},
 	uri?: string,
 	headers: IDataObject = {},
 ) {
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		method,
 		form: body,
 		qs,
@@ -63,7 +57,7 @@ export async function stravaApiRequest(
 
 export async function stravaApiRequestAllItems(
 	this: IHookFunctions | ILoadOptionsFunctions | IExecuteFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: IDataObject = {},
diff --git a/packages/nodes-base/nodes/Strava/Strava.node.ts b/packages/nodes-base/nodes/Strava/Strava.node.ts
index 15535b98512c4..f88c9c94dc905 100644
--- a/packages/nodes-base/nodes/Strava/Strava.node.ts
+++ b/packages/nodes-base/nodes/Strava/Strava.node.ts
@@ -6,12 +6,11 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
+import moment from 'moment-timezone';
 import { stravaApiRequest, stravaApiRequestAllItems } from './GenericFunctions';
 
 import { activityFields, activityOperations } from './ActivityDescription';
 
-import moment from 'moment';
-
 export class Strava implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Strava',
@@ -161,14 +160,6 @@ export class Strava implements INodeType {
 
 						const updateFields = this.getNodeParameter('updateFields', i);
 
-						if (updateFields.trainer === true) {
-							updateFields.trainer = 1;
-						}
-
-						if (updateFields.commute === true) {
-							updateFields.commute = 1;
-						}
-
 						const body: IDataObject = {};
 
 						Object.assign(body, updateFields);
@@ -201,6 +192,6 @@ export class Strava implements INodeType {
 			}
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Strava/StravaTrigger.node.ts b/packages/nodes-base/nodes/Strava/StravaTrigger.node.ts
index 68c7fc650f8bf..c937825e5ff23 100644
--- a/packages/nodes-base/nodes/Strava/StravaTrigger.node.ts
+++ b/packages/nodes-base/nodes/Strava/StravaTrigger.node.ts
@@ -1,3 +1,4 @@
+import { randomBytes } from 'crypto';
 import type {
 	IHookFunctions,
 	IWebhookFunctions,
@@ -9,8 +10,6 @@ import type {
 
 import { stravaApiRequest } from './GenericFunctions';
 
-import { randomBytes } from 'crypto';
-
 export class StravaTrigger implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Strava Trigger',
@@ -270,7 +269,7 @@ export class StravaTrigger implements INodeType {
 			return {};
 		}
 
-		if (resolveData) {
+		if (resolveData && body.aspect_type !== 'delete') {
 			let endpoint = `/athletes/${body.object_id}/stats`;
 			if (body.object_type === 'activity') {
 				endpoint = `/activities/${body.object_id}`;
diff --git a/packages/nodes-base/nodes/Strava/strava.svg b/packages/nodes-base/nodes/Strava/strava.svg
index d94ac6a66fbc6..8c68136b5b487 100644
--- a/packages/nodes-base/nodes/Strava/strava.svg
+++ b/packages/nodes-base/nodes/Strava/strava.svg
@@ -1 +1 @@
-<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" width="2500" height="2500"><path d="M0 0h16v16H0z" fill="#fc4c02"/><g fill="#fff" fill-rule="evenodd"><path d="M6.9 8.8l2.5 4.5 2.4-4.5h-1.5l-.9 1.7-1-1.7z" opacity=".6"/><path d="M7.2 2.5l3.1 6.3H4zm0 3.8l1.2 2.5H5.9z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="2500" height="2500" viewBox="0 0 16 16"><path fill="#fc4c02" d="M0 0h16v16H0z"/><g fill="#fff" fill-rule="evenodd"><path d="m6.9 8.8 2.5 4.5 2.4-4.5h-1.5l-.9 1.7-1-1.7z" opacity=".6"/><path d="m7.2 2.5 3.1 6.3H4zm0 3.8 1.2 2.5H5.9z"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Stripe/Stripe.node.ts b/packages/nodes-base/nodes/Stripe/Stripe.node.ts
index 63553d2fb0a6c..e50e35f30a166 100644
--- a/packages/nodes-base/nodes/Stripe/Stripe.node.ts
+++ b/packages/nodes-base/nodes/Stripe/Stripe.node.ts
@@ -9,7 +9,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import isEmpty from 'lodash.isempty';
+import isEmpty from 'lodash/isEmpty';
 
 import {
 	adjustChargeFields,
@@ -113,7 +113,7 @@ export class Stripe implements INodeType {
 	methods = {
 		loadOptions: {
 			async getCustomers(this: ILoadOptionsFunctions) {
-				return loadResource.call(this, 'customer');
+				return await loadResource.call(this, 'customer');
 			},
 			async getCurrencies(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
 				const returnData: INodePropertyOptions[] = [];
@@ -484,6 +484,6 @@ export class Stripe implements INodeType {
 			returnData.push(...executionData);
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Stripe/StripeTrigger.node.ts b/packages/nodes-base/nodes/Stripe/StripeTrigger.node.ts
index db1490583664e..6d2837237e4fb 100644
--- a/packages/nodes-base/nodes/Stripe/StripeTrigger.node.ts
+++ b/packages/nodes-base/nodes/Stripe/StripeTrigger.node.ts
@@ -501,6 +501,11 @@ export class StripeTrigger implements INodeType {
 						value: 'payment_intent.succeeded',
 						description: 'Occurs when a PaymentIntent has been successfully fulfilled.',
 					},
+					{
+						name: 'Payment Intent.requires_action',
+						value: 'payment_intent.requires_action',
+						description: 'Occurs when a PaymentIntent requires an action.',
+					},
 					{
 						name: 'Payment Method.attached',
 						value: 'payment_method.attached',
diff --git a/packages/nodes-base/nodes/Stripe/descriptions/CustomerCardDescription.ts b/packages/nodes-base/nodes/Stripe/descriptions/CustomerCardDescription.ts
index bc49a6ebd215b..78eecc78ee177 100644
--- a/packages/nodes-base/nodes/Stripe/descriptions/CustomerCardDescription.ts
+++ b/packages/nodes-base/nodes/Stripe/descriptions/CustomerCardDescription.ts
@@ -57,6 +57,7 @@ export const customerCardFields: INodeProperties[] = [
 		displayName: 'Card Token',
 		name: 'token',
 		type: 'string',
+		typeOptions: { password: true },
 		required: true,
 		default: '',
 		placeholder: 'tok_1IMfKdJhRTnqS5TKQVG1LI9o',
diff --git a/packages/nodes-base/nodes/Stripe/helpers.ts b/packages/nodes-base/nodes/Stripe/helpers.ts
index a8c241e2242b7..f5d300b8c8ec3 100644
--- a/packages/nodes-base/nodes/Stripe/helpers.ts
+++ b/packages/nodes-base/nodes/Stripe/helpers.ts
@@ -1,12 +1,14 @@
-import flow from 'lodash.flow';
-import isEmpty from 'lodash.isempty';
-import omit from 'lodash.omit';
+import flow from 'lodash/flow';
+import isEmpty from 'lodash/isEmpty';
+import omit from 'lodash/omit';
 import type {
 	IExecuteFunctions,
 	IHookFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodePropertyOptions,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 
 /**
@@ -15,10 +17,10 @@ import type {
  */
 export async function stripeApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
-	body: object,
-	query?: object,
+	body: IDataObject,
+	query?: IDataObject,
 ) {
 	const options = {
 		method,
@@ -26,13 +28,13 @@ export async function stripeApiRequest(
 		qs: query,
 		uri: `https://api.stripe.com/v1${endpoint}`,
 		json: true,
-	};
+	} satisfies IRequestOptions;
 
 	if (options.qs && Object.keys(options.qs).length === 0) {
 		delete options.qs;
 	}
 
-	return this.helpers.requestWithAuthentication.call(this, 'stripeApi', options);
+	return await this.helpers.requestWithAuthentication.call(this, 'stripeApi', options);
 }
 
 /**
diff --git a/packages/nodes-base/nodes/Stripe/stripe.svg b/packages/nodes-base/nodes/Stripe/stripe.svg
index e5419a6d1df96..f6bcb749dd0ca 100644
--- a/packages/nodes-base/nodes/Stripe/stripe.svg
+++ b/packages/nodes-base/nodes/Stripe/stripe.svg
@@ -1,22 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="54 -80 360 360">
-<style type="text/css">
-	.st0{fill-rule:evenodd;clip-rule:evenodd;fill:#635BFF;}
-</style>
-<g>
-	<path class="st0" d="M414,113.4c0-25.6-12.4-45.8-36.1-45.8c-23.8,0-38.2,20.2-38.2,45.6c0,30.1,17,45.3,41.4,45.3
-		c11.9,0,20.9-2.7,27.7-6.5v-20c-6.8,3.4-14.6,5.5-24.5,5.5c-9.7,0-18.3-3.4-19.4-15.2h48.9C413.8,121,414,115.8,414,113.4z
-		 M364.6,103.9c0-11.3,6.9-16,13.2-16c6.1,0,12.6,4.7,12.6,16H364.6z"/>
-	<path class="st0" d="M301.1,67.6c-9.8,0-16.1,4.6-19.6,7.8l-1.3-6.2h-22v116.6l25-5.3l0.1-28.3c3.6,2.6,8.9,6.3,17.7,6.3
-		c17.9,0,34.2-14.4,34.2-46.1C335.1,83.4,318.6,67.6,301.1,67.6z M295.1,136.5c-5.9,0-9.4-2.1-11.8-4.7l-0.1-37.1
-		c2.6-2.9,6.2-4.9,11.9-4.9c9.1,0,15.4,10.2,15.4,23.3C310.5,126.5,304.3,136.5,295.1,136.5z"/>
-	<polygon class="st0" points="223.8,61.7 248.9,56.3 248.9,36 223.8,41.3 	"/>
-	<rect x="223.8" y="69.3" class="st0" width="25.1" height="87.5"/>
-	<path class="st0" d="M196.9,76.7l-1.6-7.4h-21.6v87.5h25V97.5c5.9-7.7,15.9-6.3,19-5.2v-23C214.5,68.1,202.8,65.9,196.9,76.7z"/>
-	<path class="st0" d="M146.9,47.6l-24.4,5.2l-0.1,80.1c0,14.8,11.1,25.7,25.9,25.7c8.2,0,14.2-1.5,17.5-3.3V135
-		c-3.2,1.3-19,5.9-19-8.9V90.6h19V69.3h-19L146.9,47.6z"/>
-	<path class="st0" d="M79.3,94.7c0-3.9,3.2-5.4,8.5-5.4c7.6,0,17.2,2.3,24.8,6.4V72.2c-8.3-3.3-16.5-4.6-24.8-4.6
-		C67.5,67.6,54,78.2,54,95.9c0,27.6,38,23.2,38,35.1c0,4.6-4,6.1-9.6,6.1c-8.3,0-18.9-3.4-27.3-8v23.8c9.3,4,18.7,5.7,27.3,5.7
-		c20.8,0,35.1-10.3,35.1-28.2C117.4,100.6,79.3,105.9,79.3,94.7z"/>
-</g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="54 -80 360 360"><path d="M414 113.4c0-25.6-12.4-45.8-36.1-45.8-23.8 0-38.2 20.2-38.2 45.6 0 30.1 17 45.3 41.4 45.3 11.9 0 20.9-2.7 27.7-6.5v-20c-6.8 3.4-14.6 5.5-24.5 5.5-9.7 0-18.3-3.4-19.4-15.2h48.9c0-1.3.2-6.5.2-8.9m-49.4-9.5c0-11.3 6.9-16 13.2-16 6.1 0 12.6 4.7 12.6 16zm-63.5-36.3c-9.8 0-16.1 4.6-19.6 7.8l-1.3-6.2h-22v116.6l25-5.3.1-28.3c3.6 2.6 8.9 6.3 17.7 6.3 17.9 0 34.2-14.4 34.2-46.1-.1-29-16.6-44.8-34.1-44.8m-6 68.9c-5.9 0-9.4-2.1-11.8-4.7l-.1-37.1c2.6-2.9 6.2-4.9 11.9-4.9 9.1 0 15.4 10.2 15.4 23.3 0 13.4-6.2 23.4-15.4 23.4m-71.3-74.8 25.1-5.4V36l-25.1 5.3zm0 7.6h25.1v87.5h-25.1zm-26.9 7.4-1.6-7.4h-21.6v87.5h25V97.5c5.9-7.7 15.9-6.3 19-5.2v-23c-3.2-1.2-14.9-3.4-20.8 7.4m-50-29.1-24.4 5.2-.1 80.1c0 14.8 11.1 25.7 25.9 25.7 8.2 0 14.2-1.5 17.5-3.3V135c-3.2 1.3-19 5.9-19-8.9V90.6h19V69.3h-19zM79.3 94.7c0-3.9 3.2-5.4 8.5-5.4 7.6 0 17.2 2.3 24.8 6.4V72.2c-8.3-3.3-16.5-4.6-24.8-4.6C67.5 67.6 54 78.2 54 95.9c0 27.6 38 23.2 38 35.1 0 4.6-4 6.1-9.6 6.1-8.3 0-18.9-3.4-27.3-8v23.8c9.3 4 18.7 5.7 27.3 5.7 20.8 0 35.1-10.3 35.1-28.2-.1-29.8-38.2-24.5-38.2-35.7" style="fill-rule:evenodd;clip-rule:evenodd;fill:#635bff"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Supabase/GenericFunctions.ts b/packages/nodes-base/nodes/Supabase/GenericFunctions.ts
index 7570e95eb5f97..4366409e2aa19 100644
--- a/packages/nodes-base/nodes/Supabase/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Supabase/GenericFunctions.ts
@@ -1,28 +1,22 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	ICredentialDataDecryptedObject,
 	ICredentialTestFunctions,
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	IWebhookFunctions,
 	INodeProperties,
 	IPairedItemData,
 	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function supabaseApiRequest(
-	this:
-		| IExecuteFunctions
-		| IExecuteSingleFunctions
-		| ILoadOptionsFunctions
-		| IHookFunctions
-		| IWebhookFunctions,
-	method: string,
+	this: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions | IWebhookFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 	body: IDataObject | IDataObject[] = {},
 	qs: IDataObject = {},
@@ -34,7 +28,7 @@ export async function supabaseApiRequest(
 		serviceRole: string;
 	};
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			Prefer: 'return=representation',
 		},
@@ -71,7 +65,7 @@ export function getFilters(
 		includeNoneOption = true,
 		filterTypeDisplayName = 'Filter',
 		filterFixedCollectionDisplayName = 'Filters',
-		// eslint-disable-next-line @typescript-eslint/no-unused-vars
+
 		filterStringDisplayName = 'Filters (String)',
 		mustMatchOptions = [
 			{
@@ -308,7 +302,7 @@ export async function validateCredentials(
 		serviceRole: string;
 	};
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			apikey: serviceRole,
 			Authorization: 'Bearer ' + serviceRole,
@@ -318,7 +312,7 @@ export async function validateCredentials(
 		json: true,
 	};
 
-	return this.helpers.request(options);
+	return await this.helpers.request(options);
 }
 
 export function mapPairedItemsFrom<T>(iterable: Iterable<T> | ArrayLike<T>): IPairedItemData[] {
diff --git a/packages/nodes-base/nodes/Supabase/Supabase.node.ts b/packages/nodes-base/nodes/Supabase/Supabase.node.ts
index 0068cd42a8644..9e025547bc7ea 100644
--- a/packages/nodes-base/nodes/Supabase/Supabase.node.ts
+++ b/packages/nodes-base/nodes/Supabase/Supabase.node.ts
@@ -310,12 +310,18 @@ export class Supabase implements INodeType {
 						qs.limit = this.getNodeParameter('limit', 0);
 					}
 
-					let rows;
+					let rows: IDataObject[] = [];
 
 					try {
-						rows = await supabaseApiRequest.call(this, 'GET', endpoint, {}, qs);
+						let responseLength = 0;
+						do {
+							const newRows = await supabaseApiRequest.call(this, 'GET', endpoint, {}, qs);
+							responseLength = newRows.length;
+							rows = rows.concat(newRows);
+							qs.offset = rows.length;
+						} while (responseLength >= 1000);
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(rows as IDataObject[]),
+							this.helpers.returnJsonArray(rows),
 							{ itemData: { item: i } },
 						);
 						returnData.push(...executionData);
@@ -409,6 +415,6 @@ export class Supabase implements INodeType {
 				}
 			}
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Supabase/supabase.svg b/packages/nodes-base/nodes/Supabase/supabase.svg
index ad802ac16ae9e..7f00f09fc9d03 100644
--- a/packages/nodes-base/nodes/Supabase/supabase.svg
+++ b/packages/nodes-base/nodes/Supabase/supabase.svg
@@ -1,15 +1 @@
-<svg width="109" height="113" viewBox="0 0 109 113" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M63.7076 110.284C60.8481 113.885 55.0502 111.912 54.9813 107.314L53.9738 40.0627L99.1935 40.0627C107.384 40.0627 111.952 49.5228 106.859 55.9374L63.7076 110.284Z" fill="url(#paint0_linear)"/>
-<path d="M63.7076 110.284C60.8481 113.885 55.0502 111.912 54.9813 107.314L53.9738 40.0627L99.1935 40.0627C107.384 40.0627 111.952 49.5228 106.859 55.9374L63.7076 110.284Z" fill="url(#paint1_linear)" fill-opacity="0.2"/>
-<path d="M45.317 2.07103C48.1765 -1.53037 53.9745 0.442937 54.0434 5.041L54.4849 72.2922H9.83113C1.64038 72.2922 -2.92775 62.8321 2.1655 56.4175L45.317 2.07103Z" fill="#3ECF8E"/>
-<defs>
-<linearGradient id="paint0_linear" x1="53.9738" y1="54.974" x2="94.1635" y2="71.8295" gradientUnits="userSpaceOnUse">
-<stop stop-color="#249361"/>
-<stop offset="1" stop-color="#3ECF8E"/>
-</linearGradient>
-<linearGradient id="paint1_linear" x1="36.1558" y1="30.578" x2="54.4844" y2="65.0806" gradientUnits="userSpaceOnUse">
-<stop/>
-<stop offset="1" stop-opacity="0"/>
-</linearGradient>
-</defs>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="109" height="113" fill="none"><path fill="url(#a)" d="M63.708 110.284c-2.86 3.601-8.658 1.628-8.727-2.97l-1.007-67.251h45.22c8.19 0 12.758 9.46 7.665 15.874z"/><path fill="url(#b)" fill-opacity=".2" d="M63.708 110.284c-2.86 3.601-8.658 1.628-8.727-2.97l-1.007-67.251h45.22c8.19 0 12.758 9.46 7.665 15.874z"/><path fill="#3ECF8E" d="M45.317 2.071c2.86-3.601 8.657-1.628 8.726 2.97l.442 67.251H9.83c-8.19 0-12.759-9.46-7.665-15.875z"/><defs><linearGradient id="a" x1="53.974" x2="94.163" y1="54.974" y2="71.829" gradientUnits="userSpaceOnUse"><stop stop-color="#249361"/><stop offset="1" stop-color="#3ECF8E"/></linearGradient><linearGradient id="b" x1="36.156" x2="54.484" y1="30.578" y2="65.081" gradientUnits="userSpaceOnUse"><stop/><stop offset="1" stop-opacity="0"/></linearGradient></defs></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/SurveyMonkey/GenericFunctions.ts b/packages/nodes-base/nodes/SurveyMonkey/GenericFunctions.ts
index da7da90736039..ec53b79698c5f 100644
--- a/packages/nodes-base/nodes/SurveyMonkey/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/SurveyMonkey/GenericFunctions.ts
@@ -1,5 +1,3 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IExecuteFunctions,
 	ILoadOptionsFunctions,
@@ -7,12 +5,14 @@ import type {
 	IHookFunctions,
 	IWebhookFunctions,
 	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function surveyMonkeyApiRequest(
 	this: IExecuteFunctions | IWebhookFunctions | IHookFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: IDataObject = {},
@@ -24,7 +24,7 @@ export async function surveyMonkeyApiRequest(
 
 	const endpoint = 'https://api.surveymonkey.com/v3';
 
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		headers: {
 			'Content-Type': 'application/json',
 		},
@@ -61,7 +61,7 @@ export async function surveyMonkeyApiRequest(
 export async function surveyMonkeyRequestAllItems(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: IDataObject = {},
diff --git a/packages/nodes-base/nodes/SurveyMonkey/SurveyMonkeyTrigger.node.json b/packages/nodes-base/nodes/SurveyMonkey/SurveyMonkeyTrigger.node.json
index 357d2ae3e8cfd..439bc2afc81cd 100644
--- a/packages/nodes-base/nodes/SurveyMonkey/SurveyMonkeyTrigger.node.json
+++ b/packages/nodes-base/nodes/SurveyMonkey/SurveyMonkeyTrigger.node.json
@@ -2,7 +2,7 @@
 	"node": "n8n-nodes-base.surveyMonkeyTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Marketing & Content", "Communication"],
+	"categories": ["Marketing", "Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
diff --git a/packages/nodes-base/nodes/SurveyMonkey/SurveyMonkeyTrigger.node.ts b/packages/nodes-base/nodes/SurveyMonkey/SurveyMonkeyTrigger.node.ts
index a6ef965a07980..b299e9a21e6c7 100644
--- a/packages/nodes-base/nodes/SurveyMonkey/SurveyMonkeyTrigger.node.ts
+++ b/packages/nodes-base/nodes/SurveyMonkey/SurveyMonkeyTrigger.node.ts
@@ -1,3 +1,4 @@
+import { createHmac } from 'crypto';
 import type {
 	IHookFunctions,
 	IWebhookFunctions,
@@ -15,8 +16,6 @@ import { idsExist, surveyMonkeyApiRequest, surveyMonkeyRequestAllItems } from '.
 
 import type { IAnswer, IChoice, IOther, IQuestion, IRow } from './Interfaces';
 
-import { createHmac } from 'crypto';
-
 export class SurveyMonkeyTrigger implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'SurveyMonkey Trigger',
@@ -492,7 +491,7 @@ export class SurveyMonkeyTrigger implements INodeType {
 			return {};
 		}
 
-		return new Promise((resolve, _reject) => {
+		return await new Promise((resolve, _reject) => {
 			const data: Buffer[] = [];
 
 			req.on('data', (chunk) => {
diff --git a/packages/nodes-base/nodes/SurveyMonkey/surveyMonkey.svg b/packages/nodes-base/nodes/SurveyMonkey/surveyMonkey.svg
index 9d6409a2f16f5..27a55e31631c9 100644
--- a/packages/nodes-base/nodes/SurveyMonkey/surveyMonkey.svg
+++ b/packages/nodes-base/nodes/SurveyMonkey/surveyMonkey.svg
@@ -1 +1 @@
-<svg width="60" height="60" xmlns="http://www.w3.org/2000/svg"><path d="M53.05 42.178a2.081 2.081 0 01-1.394-.537c.125-1.085.209-2.181.223-3.297a2.096 2.096 0 011.17-.362 2.1 2.1 0 011.482 3.583 2.093 2.093 0 01-1.481.613m-46.1 0a2.093 2.093 0 01-2.09-2.094c0-1.16.94-2.104 2.09-2.104.433 0 .837.14 1.171.364.014 1.116.098 2.212.223 3.297a2.086 2.086 0 01-1.394.537m45.963-9.21c-.588 0-1.153.08-1.695.212-2.083-8.268-8.85-14.665-17.302-16.178-.377-.07-.718-.118-1.102-.167.063-2.072.16-4.466 3.197-6.62L35.53 9s-5.916 1.845-6.602 6.926c-.296-1.383-3.054-3.112-4.42-3.44l-.68 1.099s1.812.91 2.252 3.417c-8.45 1.515-15.215 7.912-17.298 16.178a7.137 7.137 0 00-1.696-.211C3.18 32.969 0 36.152 0 40.084 0 44.008 3.18 47.2 7.086 47.2c.915 0 1.788-.184 2.59-.498A21.849 21.849 0 0011.979 51l5.882-3.98-.05-.066c-1.556-2.007-2.508-4.962-2.667-7.904-.177-3.242.612-6.464 2.677-8.358 4.254-3.634 8.886-1.978 11.789 1.507h.78c2.903-3.485 7.535-5.141 11.79-1.507 2.064 1.894 2.853 5.116 2.677 8.36-.16 2.94-1.112 5.895-2.668 7.903l-.05.064L48.02 51a21.88 21.88 0 002.303-4.3 7.08 7.08 0 002.589.499c3.907 0 7.087-3.19 7.087-7.115 0-3.933-3.18-7.117-7.087-7.117" fill="#00BF6F" fill-rule="evenodd"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="60" height="60"><path fill="#00BF6F" fill-rule="evenodd" d="M53.05 42.178a2.08 2.08 0 0 1-1.394-.537c.125-1.085.209-2.181.223-3.297a2.1 2.1 0 0 1 1.17-.362 2.1 2.1 0 0 1 1.482 3.583 2.1 2.1 0 0 1-1.481.613m-46.1 0a2.093 2.093 0 0 1-2.09-2.094c0-1.16.94-2.104 2.09-2.104.433 0 .837.14 1.171.364.014 1.116.098 2.212.223 3.297a2.1 2.1 0 0 1-1.394.537m45.963-9.21a7 7 0 0 0-1.695.212c-2.083-8.268-8.85-14.665-17.302-16.178-.377-.07-.718-.118-1.102-.167.063-2.072.16-4.466 3.197-6.62L35.53 9s-5.916 1.845-6.602 6.926c-.296-1.383-3.054-3.112-4.42-3.44l-.68 1.099s1.812.91 2.252 3.417c-8.45 1.515-15.215 7.912-17.298 16.178a7 7 0 0 0-1.696-.211C3.18 32.969 0 36.152 0 40.084 0 44.008 3.18 47.2 7.086 47.2c.915 0 1.788-.184 2.59-.498A22 22 0 0 0 11.979 51l5.882-3.98-.05-.066c-1.556-2.007-2.508-4.962-2.667-7.904-.177-3.242.612-6.464 2.677-8.358 4.254-3.634 8.886-1.978 11.789 1.507h.78c2.903-3.485 7.535-5.141 11.79-1.507 2.064 1.894 2.853 5.116 2.677 8.36-.16 2.94-1.112 5.895-2.668 7.903l-.05.064L48.02 51a22 22 0 0 0 2.303-4.3 7.1 7.1 0 0 0 2.589.499c3.907 0 7.087-3.19 7.087-7.115 0-3.933-3.18-7.117-7.087-7.117"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Switch/Switch.node.ts b/packages/nodes-base/nodes/Switch/Switch.node.ts
index 994daa6b75893..9b6de4015f8f4 100644
--- a/packages/nodes-base/nodes/Switch/Switch.node.ts
+++ b/packages/nodes-base/nodes/Switch/Switch.node.ts
@@ -1,687 +1,27 @@
-import type {
-	IExecuteFunctions,
-	INodeExecutionData,
-	INodeParameters,
-	INodeType,
-	INodeTypeDescription,
-	NodeParameterValue,
-} from 'n8n-workflow';
-import { NodeOperationError } from 'n8n-workflow';
-
-export class Switch implements INodeType {
-	description: INodeTypeDescription = {
-		displayName: 'Switch',
-		name: 'switch',
-		icon: 'fa:map-signs',
-		group: ['transform'],
-		version: 1,
-		description: 'Route items depending on defined expression or rules',
-		defaults: {
-			name: 'Switch',
-			color: '#506000',
-		},
-		inputs: ['main'],
-		// eslint-disable-next-line n8n-nodes-base/node-class-description-outputs-wrong
-		outputs: ['main', 'main', 'main', 'main'],
-		outputNames: ['0', '1', '2', '3'],
-		properties: [
-			{
-				displayName: 'Mode',
-				name: 'mode',
-				type: 'options',
-				options: [
-					{
-						name: 'Expression',
-						value: 'expression',
-						description: 'Expression decides how to route data',
-					},
-					{
-						name: 'Rules',
-						value: 'rules',
-						description: 'Rules decide how to route data',
-					},
-				],
-				default: 'rules',
-				description: 'How data should be routed',
-			},
-
-			// ----------------------------------
-			//         mode:expression
-			// ----------------------------------
-			{
-				displayName: 'Output',
-				name: 'output',
-				type: 'number',
-				typeOptions: {
-					minValue: 0,
-					maxValue: 3,
-				},
-				displayOptions: {
-					show: {
-						mode: ['expression'],
-					},
-				},
-				default: 0,
-				description: 'The index of output to which to send data to',
-			},
-
-			// ----------------------------------
-			//         mode:rules
-			// ----------------------------------
-			{
-				displayName: 'Data Type',
-				name: 'dataType',
-				type: 'options',
-				displayOptions: {
-					show: {
-						mode: ['rules'],
-					},
-				},
-				options: [
-					{
-						name: 'Boolean',
-						value: 'boolean',
-					},
-					{
-						name: 'Date & Time',
-						value: 'dateTime',
-					},
-					{
-						name: 'Number',
-						value: 'number',
-					},
-					{
-						name: 'String',
-						value: 'string',
-					},
-				],
-				default: 'number',
-				description: 'The type of data to route on',
-			},
-
-			// ----------------------------------
-			//         dataType:boolean
-			// ----------------------------------
-			{
-				displayName: 'Value 1',
-				name: 'value1',
-				type: 'boolean',
-				displayOptions: {
-					show: {
-						dataType: ['boolean'],
-						mode: ['rules'],
-					},
-				},
-				default: false,
-				// eslint-disable-next-line n8n-nodes-base/node-param-description-boolean-without-whether
-				description: 'The value to compare with the first one',
-			},
-			{
-				displayName: 'Routing Rules',
-				name: 'rules',
-				placeholder: 'Add Routing Rule',
-				type: 'fixedCollection',
-				typeOptions: {
-					multipleValues: true,
-				},
-				displayOptions: {
-					show: {
-						dataType: ['boolean'],
-						mode: ['rules'],
-					},
-				},
-				default: {},
-				options: [
-					{
-						name: 'rules',
-						displayName: 'Boolean',
-						values: [
-							// eslint-disable-next-line n8n-nodes-base/node-param-operation-without-no-data-expression
-							{
-								displayName: 'Operation',
-								name: 'operation',
-								type: 'options',
-								options: [
-									{
-										name: 'Equal',
-										value: 'equal',
-									},
-									{
-										name: 'Not Equal',
-										value: 'notEqual',
-									},
-								],
-								default: 'equal',
-								description: 'Operation to decide where the the data should be mapped to',
-							},
-							{
-								displayName: 'Value 2',
-								name: 'value2',
-								type: 'boolean',
-								default: false,
-								// eslint-disable-next-line n8n-nodes-base/node-param-description-boolean-without-whether
-								description: 'The value to compare with the first one',
-							},
-							{
-								displayName: 'Output',
-								name: 'output',
-								type: 'number',
-								typeOptions: {
-									minValue: 0,
-									maxValue: 3,
-								},
-								default: 0,
-								description: 'The index of output to which to send data to if rule matches',
-							},
-						],
-					},
-				],
-			},
-
-			// ----------------------------------
-			//         dataType:dateTime
-			// ----------------------------------
-			{
-				displayName: 'Value 1',
-				name: 'value1',
-				type: 'dateTime',
-				displayOptions: {
-					show: {
-						dataType: ['dateTime'],
-						mode: ['rules'],
-					},
-				},
-				default: '',
-				description: 'The value to compare with the second one',
-			},
-			{
-				displayName: 'Routing Rules',
-				name: 'rules',
-				placeholder: 'Add Routing Rule',
-				type: 'fixedCollection',
-				typeOptions: {
-					multipleValues: true,
-				},
-				displayOptions: {
-					show: {
-						dataType: ['dateTime'],
-						mode: ['rules'],
-					},
-				},
-				default: {},
-				options: [
-					{
-						name: 'rules',
-						displayName: 'Dates',
-						values: [
-							// eslint-disable-next-line n8n-nodes-base/node-param-operation-without-no-data-expression
-							{
-								displayName: 'Operation',
-								name: 'operation',
-								type: 'options',
-								options: [
-									{
-										name: 'Occurred After',
-										value: 'after',
-									},
-									{
-										name: 'Occurred Before',
-										value: 'before',
-									},
-								],
-								default: 'after',
-								description: 'Operation to decide where the the data should be mapped to',
-							},
-							{
-								displayName: 'Value 2',
-								name: 'value2',
-								type: 'dateTime',
-								default: 0,
-								description: 'The value to compare with the first one',
-							},
-							{
-								displayName: 'Output',
-								name: 'output',
-								type: 'number',
-								typeOptions: {
-									minValue: 0,
-									maxValue: 3,
-								},
-								default: 0,
-								description: 'The index of output to which to send data to if rule matches',
-							},
-						],
-					},
-				],
-			},
-
-			// ----------------------------------
-			//         dataType:number
-			// ----------------------------------
-			{
-				displayName: 'Value 1',
-				name: 'value1',
-				type: 'number',
-				displayOptions: {
-					show: {
-						dataType: ['number'],
-						mode: ['rules'],
-					},
-				},
-				default: 0,
-				description: 'The value to compare with the second one',
-			},
-			{
-				displayName: 'Routing Rules',
-				name: 'rules',
-				placeholder: 'Add Routing Rule',
-				type: 'fixedCollection',
-				typeOptions: {
-					multipleValues: true,
-				},
-				displayOptions: {
-					show: {
-						dataType: ['number'],
-						mode: ['rules'],
-					},
-				},
-				default: {},
-				options: [
-					{
-						name: 'rules',
-						displayName: 'Numbers',
-						values: [
-							// eslint-disable-next-line n8n-nodes-base/node-param-operation-without-no-data-expression
-							{
-								displayName: 'Operation',
-								name: 'operation',
-								type: 'options',
-								// eslint-disable-next-line n8n-nodes-base/node-param-options-type-unsorted-items
-								options: [
-									{
-										name: 'Smaller',
-										value: 'smaller',
-									},
-									{
-										name: 'Smaller Equal',
-										value: 'smallerEqual',
-									},
-									{
-										name: 'Equal',
-										value: 'equal',
-									},
-									{
-										name: 'Not Equal',
-										value: 'notEqual',
-									},
-									{
-										name: 'Larger',
-										value: 'larger',
-									},
-									{
-										name: 'Larger Equal',
-										value: 'largerEqual',
-									},
-								],
-								default: 'smaller',
-								description: 'Operation to decide where the the data should be mapped to',
-							},
-							{
-								displayName: 'Value 2',
-								name: 'value2',
-								type: 'number',
-								default: 0,
-								description: 'The value to compare with the first one',
-							},
-							{
-								displayName: 'Output',
-								name: 'output',
-								type: 'number',
-								typeOptions: {
-									minValue: 0,
-									maxValue: 3,
-								},
-								default: 0,
-								description: 'The index of output to which to send data to if rule matches',
-							},
-						],
-					},
-				],
-			},
-
-			// ----------------------------------
-			//         dataType:string
-			// ----------------------------------
-			{
-				displayName: 'Value 1',
-				name: 'value1',
-				type: 'string',
-				displayOptions: {
-					show: {
-						dataType: ['string'],
-						mode: ['rules'],
-					},
-				},
-				default: '',
-				description: 'The value to compare with the second one',
-			},
-			{
-				displayName: 'Routing Rules',
-				name: 'rules',
-				placeholder: 'Add Routing Rule',
-				type: 'fixedCollection',
-				typeOptions: {
-					multipleValues: true,
-				},
-				displayOptions: {
-					show: {
-						dataType: ['string'],
-						mode: ['rules'],
-					},
-				},
-				default: {},
-				options: [
-					{
-						name: 'rules',
-						displayName: 'Strings',
-						values: [
-							// eslint-disable-next-line n8n-nodes-base/node-param-operation-without-no-data-expression
-							{
-								displayName: 'Operation',
-								name: 'operation',
-								type: 'options',
-								// eslint-disable-next-line n8n-nodes-base/node-param-options-type-unsorted-items
-								options: [
-									{
-										name: 'Contains',
-										value: 'contains',
-									},
-									{
-										name: 'Not Contains',
-										value: 'notContains',
-									},
-									{
-										name: 'Ends With',
-										value: 'endsWith',
-									},
-									{
-										name: 'Not Ends With',
-										value: 'notEndsWith',
-									},
-									{
-										name: 'Equal',
-										value: 'equal',
-									},
-									{
-										name: 'Not Equal',
-										value: 'notEqual',
-									},
-									{
-										name: 'Regex Match',
-										value: 'regex',
-									},
-									{
-										name: 'Regex Not Match',
-										value: 'notRegex',
-									},
-									{
-										name: 'Starts With',
-										value: 'startsWith',
-									},
-									{
-										name: 'Not Starts With',
-										value: 'notStartsWith',
-									},
-								],
-								default: 'equal',
-								description: 'Operation to decide where the the data should be mapped to',
-							},
-							{
-								displayName: 'Value 2',
-								name: 'value2',
-								type: 'string',
-								displayOptions: {
-									hide: {
-										operation: ['regex', 'notRegex'],
-									},
-								},
-								default: '',
-								description: 'The value to compare with the first one',
-							},
-							{
-								displayName: 'Regex',
-								name: 'value2',
-								type: 'string',
-								displayOptions: {
-									show: {
-										operation: ['regex', 'notRegex'],
-									},
-								},
-								default: '',
-								placeholder: '/text/i',
-								description: 'The regex which has to match',
-							},
-							{
-								displayName: 'Output',
-								name: 'output',
-								type: 'number',
-								typeOptions: {
-									minValue: 0,
-									maxValue: 3,
-								},
-								default: 0,
-								description: 'The index of output to which to send data to if rule matches',
-							},
-						],
-					},
-				],
-			},
-
-			// eslint-disable-next-line n8n-nodes-base/node-param-default-missing
-			{
-				displayName: 'Fallback Output',
-				name: 'fallbackOutput',
-				type: 'options',
-				displayOptions: {
-					show: {
-						mode: ['rules'],
-					},
-				},
-				// eslint-disable-next-line n8n-nodes-base/node-param-options-type-unsorted-items
-				options: [
-					{
-						name: 'None',
-						value: -1,
-					},
-					{
-						name: '0',
-						value: 0,
-					},
-					{
-						name: '1',
-						value: 1,
-					},
-					{
-						name: '2',
-						value: 2,
-					},
-					{
-						name: '3',
-						value: 3,
-					},
-				],
-				default: -1,
-				description: 'The output to which to route all items which do not match any of the rules',
-			},
-		],
-	};
-
-	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
-		const returnData: INodeExecutionData[][] = [[], [], [], []];
-
-		const items = this.getInputData();
-
-		let compareOperationResult: boolean;
-		let item: INodeExecutionData;
-		let mode: string;
-		let outputIndex: number;
-		let ruleData: INodeParameters;
-
-		// The compare operations
-		const compareOperationFunctions: {
-			[key: string]: (value1: NodeParameterValue, value2: NodeParameterValue) => boolean;
-		} = {
-			after: (value1: NodeParameterValue, value2: NodeParameterValue) =>
-				(value1 || 0) > (value2 || 0),
-			before: (value1: NodeParameterValue, value2: NodeParameterValue) =>
-				(value1 || 0) < (value2 || 0),
-			contains: (value1: NodeParameterValue, value2: NodeParameterValue) =>
-				(value1 || '').toString().includes((value2 || '').toString()),
-			notContains: (value1: NodeParameterValue, value2: NodeParameterValue) =>
-				!(value1 || '').toString().includes((value2 || '').toString()),
-			endsWith: (value1: NodeParameterValue, value2: NodeParameterValue) =>
-				(value1 as string).endsWith(value2 as string),
-			notEndsWith: (value1: NodeParameterValue, value2: NodeParameterValue) =>
-				!(value1 as string).endsWith(value2 as string),
-			equal: (value1: NodeParameterValue, value2: NodeParameterValue) => value1 === value2,
-			notEqual: (value1: NodeParameterValue, value2: NodeParameterValue) => value1 !== value2,
-			larger: (value1: NodeParameterValue, value2: NodeParameterValue) =>
-				(value1 || 0) > (value2 || 0),
-			largerEqual: (value1: NodeParameterValue, value2: NodeParameterValue) =>
-				(value1 || 0) >= (value2 || 0),
-			smaller: (value1: NodeParameterValue, value2: NodeParameterValue) =>
-				(value1 || 0) < (value2 || 0),
-			smallerEqual: (value1: NodeParameterValue, value2: NodeParameterValue) =>
-				(value1 || 0) <= (value2 || 0),
-			startsWith: (value1: NodeParameterValue, value2: NodeParameterValue) =>
-				(value1 as string).startsWith(value2 as string),
-			notStartsWith: (value1: NodeParameterValue, value2: NodeParameterValue) =>
-				!(value1 as string).startsWith(value2 as string),
-			regex: (value1: NodeParameterValue, value2: NodeParameterValue) => {
-				const regexMatch = (value2 || '').toString().match(new RegExp('^/(.*?)/([gimusy]*)$'));
-
-				let regex: RegExp;
-				if (!regexMatch) {
-					regex = new RegExp((value2 || '').toString());
-				} else if (regexMatch.length === 1) {
-					regex = new RegExp(regexMatch[1]);
-				} else {
-					regex = new RegExp(regexMatch[1], regexMatch[2]);
-				}
-
-				return !!(value1 || '').toString().match(regex);
-			},
-			notRegex: (value1: NodeParameterValue, value2: NodeParameterValue) => {
-				const regexMatch = (value2 || '').toString().match(new RegExp('^/(.*?)/([gimusy]*)$'));
-
-				let regex: RegExp;
-				if (!regexMatch) {
-					regex = new RegExp((value2 || '').toString());
-				} else if (regexMatch.length === 1) {
-					regex = new RegExp(regexMatch[1]);
-				} else {
-					regex = new RegExp(regexMatch[1], regexMatch[2]);
-				}
-
-				return !(value1 || '').toString().match(regex);
-			},
+import type { INodeTypeBaseDescription, IVersionedNodeType } from 'n8n-workflow';
+import { VersionedNodeType } from 'n8n-workflow';
+
+import { SwitchV1 } from './V1/SwitchV1.node';
+import { SwitchV2 } from './V2/SwitchV2.node';
+import { SwitchV3 } from './V3/SwitchV3.node';
+
+export class Switch extends VersionedNodeType {
+	constructor() {
+		const baseDescription: INodeTypeBaseDescription = {
+			displayName: 'Switch',
+			name: 'switch',
+			icon: 'fa:map-signs',
+			group: ['transform'],
+			description: 'Route items depending on defined expression or rules',
+			defaultVersion: 3,
 		};
 
-		// Converts the input data of a dateTime into a number for easy compare
-		const convertDateTime = (value: NodeParameterValue): number => {
-			let returnValue: number | undefined = undefined;
-			if (typeof value === 'string') {
-				returnValue = new Date(value).getTime();
-			} else if (typeof value === 'number') {
-				returnValue = value;
-			}
-			if ((value as unknown as object) instanceof Date) {
-				returnValue = (value as unknown as Date).getTime();
-			}
-
-			if (returnValue === undefined || isNaN(returnValue)) {
-				throw new NodeOperationError(
-					this.getNode(),
-					`The value "${value}" is not a valid DateTime.`,
-				);
-			}
-
-			return returnValue;
-		};
-
-		const checkIndexRange = (index: number) => {
-			if (index < 0 || index >= returnData.length) {
-				throw new NodeOperationError(
-					this.getNode(),
-					`The ouput ${index} is not allowed. It has to be between 0 and ${returnData.length - 1}!`,
-				);
-			}
+		const nodeVersions: IVersionedNodeType['nodeVersions'] = {
+			1: new SwitchV1(baseDescription),
+			2: new SwitchV2(baseDescription),
+			3: new SwitchV3(baseDescription),
 		};
 
-		// Iterate over all items to check to which output they should be routed to
-		itemLoop: for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
-			try {
-				item = items[itemIndex];
-				mode = this.getNodeParameter('mode', itemIndex) as string;
-
-				if (mode === 'expression') {
-					// One expression decides how to route item
-
-					outputIndex = this.getNodeParameter('output', itemIndex) as number;
-					checkIndexRange(outputIndex);
-
-					returnData[outputIndex].push(item);
-				} else if (mode === 'rules') {
-					// Rules decide how to route item
-
-					const dataType = this.getNodeParameter('dataType', 0) as string;
-
-					let value1 = this.getNodeParameter('value1', itemIndex) as NodeParameterValue;
-					if (dataType === 'dateTime') {
-						value1 = convertDateTime(value1);
-					}
-
-					for (ruleData of this.getNodeParameter(
-						'rules.rules',
-						itemIndex,
-						[],
-					) as INodeParameters[]) {
-						// Check if the values passes
-
-						let value2 = ruleData.value2 as NodeParameterValue;
-						if (dataType === 'dateTime') {
-							value2 = convertDateTime(value2);
-						}
-
-						compareOperationResult = compareOperationFunctions[ruleData.operation as string](
-							value1,
-							value2,
-						);
-
-						if (compareOperationResult) {
-							// If rule matches add it to the correct output and continue with next item
-							checkIndexRange(ruleData.output as number);
-							returnData[ruleData.output as number].push(item);
-							continue itemLoop;
-						}
-					}
-
-					// Check if a fallback output got defined and route accordingly
-					outputIndex = this.getNodeParameter('fallbackOutput', itemIndex) as number;
-					if (outputIndex !== -1) {
-						checkIndexRange(outputIndex);
-						returnData[outputIndex].push(item);
-					}
-				}
-			} catch (error) {
-				if (this.continueOnFail()) {
-					returnData[0].push({ json: { error: error.message } });
-					continue;
-				}
-				throw error;
-			}
-		}
-
-		return returnData;
+		super(nodeVersions, baseDescription);
 	}
 }
diff --git a/packages/nodes-base/nodes/Switch/V1/SwitchV1.node.ts b/packages/nodes-base/nodes/Switch/V1/SwitchV1.node.ts
new file mode 100644
index 0000000000000..aa41602f8f40f
--- /dev/null
+++ b/packages/nodes-base/nodes/Switch/V1/SwitchV1.node.ts
@@ -0,0 +1,686 @@
+import type {
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeParameters,
+	INodeType,
+	INodeTypeBaseDescription,
+	INodeTypeDescription,
+	NodeParameterValue,
+} from 'n8n-workflow';
+import { NodeOperationError } from 'n8n-workflow';
+
+export class SwitchV1 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			version: [1],
+			defaults: {
+				name: 'Switch',
+				color: '#506000',
+			},
+			inputs: ['main'],
+			outputs: ['main', 'main', 'main', 'main'],
+			outputNames: ['0', '1', '2', '3'],
+			properties: [
+				{
+					displayName: 'Mode',
+					name: 'mode',
+					type: 'options',
+					options: [
+						{
+							name: 'Expression',
+							value: 'expression',
+							description: 'Expression decides how to route data',
+						},
+						{
+							name: 'Rules',
+							value: 'rules',
+							description: 'Rules decide how to route data',
+						},
+					],
+					default: 'rules',
+					description: 'How data should be routed',
+				},
+
+				// ----------------------------------
+				//         mode:expression
+				// ----------------------------------
+				{
+					displayName: 'Output',
+					name: 'output',
+					type: 'number',
+					typeOptions: {
+						minValue: 0,
+						maxValue: 3,
+					},
+					displayOptions: {
+						show: {
+							mode: ['expression'],
+						},
+					},
+					default: 0,
+					description: 'The index of output to which to send data to',
+				},
+
+				// ----------------------------------
+				//         mode:rules
+				// ----------------------------------
+				{
+					displayName: 'Data Type',
+					name: 'dataType',
+					type: 'options',
+					displayOptions: {
+						show: {
+							mode: ['rules'],
+						},
+					},
+					options: [
+						{
+							name: 'Boolean',
+							value: 'boolean',
+						},
+						{
+							name: 'Date & Time',
+							value: 'dateTime',
+						},
+						{
+							name: 'Number',
+							value: 'number',
+						},
+						{
+							name: 'String',
+							value: 'string',
+						},
+					],
+					default: 'number',
+					description: 'The type of data to route on',
+				},
+
+				// ----------------------------------
+				//         dataType:boolean
+				// ----------------------------------
+				{
+					displayName: 'Value 1',
+					name: 'value1',
+					type: 'boolean',
+					displayOptions: {
+						show: {
+							dataType: ['boolean'],
+							mode: ['rules'],
+						},
+					},
+					default: false,
+					// eslint-disable-next-line n8n-nodes-base/node-param-description-boolean-without-whether
+					description: 'The value to compare with the first one',
+				},
+				{
+					displayName: 'Routing Rules',
+					name: 'rules',
+					placeholder: 'Add Routing Rule',
+					type: 'fixedCollection',
+					typeOptions: {
+						multipleValues: true,
+					},
+					displayOptions: {
+						show: {
+							dataType: ['boolean'],
+							mode: ['rules'],
+						},
+					},
+					default: {},
+					options: [
+						{
+							name: 'rules',
+							displayName: 'Boolean',
+							values: [
+								// eslint-disable-next-line n8n-nodes-base/node-param-operation-without-no-data-expression
+								{
+									displayName: 'Operation',
+									name: 'operation',
+									type: 'options',
+									options: [
+										{
+											name: 'Equal',
+											value: 'equal',
+										},
+										{
+											name: 'Not Equal',
+											value: 'notEqual',
+										},
+									],
+									default: 'equal',
+									description: 'Operation to decide where the data should be mapped to',
+								},
+								{
+									displayName: 'Value 2',
+									name: 'value2',
+									type: 'boolean',
+									default: false,
+									// eslint-disable-next-line n8n-nodes-base/node-param-description-boolean-without-whether
+									description: 'The value to compare with the first one',
+								},
+								{
+									displayName: 'Output',
+									name: 'output',
+									type: 'number',
+									typeOptions: {
+										minValue: 0,
+										maxValue: 3,
+									},
+									default: 0,
+									description: 'The index of output to which to send data to if rule matches',
+								},
+							],
+						},
+					],
+				},
+
+				// ----------------------------------
+				//         dataType:dateTime
+				// ----------------------------------
+				{
+					displayName: 'Value 1',
+					name: 'value1',
+					type: 'dateTime',
+					displayOptions: {
+						show: {
+							dataType: ['dateTime'],
+							mode: ['rules'],
+						},
+					},
+					default: '',
+					description: 'The value to compare with the second one',
+				},
+				{
+					displayName: 'Routing Rules',
+					name: 'rules',
+					placeholder: 'Add Routing Rule',
+					type: 'fixedCollection',
+					typeOptions: {
+						multipleValues: true,
+					},
+					displayOptions: {
+						show: {
+							dataType: ['dateTime'],
+							mode: ['rules'],
+						},
+					},
+					default: {},
+					options: [
+						{
+							name: 'rules',
+							displayName: 'Dates',
+							values: [
+								// eslint-disable-next-line n8n-nodes-base/node-param-operation-without-no-data-expression
+								{
+									displayName: 'Operation',
+									name: 'operation',
+									type: 'options',
+									options: [
+										{
+											name: 'Occurred After',
+											value: 'after',
+										},
+										{
+											name: 'Occurred Before',
+											value: 'before',
+										},
+									],
+									default: 'after',
+									description: 'Operation to decide where the data should be mapped to',
+								},
+								{
+									displayName: 'Value 2',
+									name: 'value2',
+									type: 'dateTime',
+									default: 0,
+									description: 'The value to compare with the first one',
+								},
+								{
+									displayName: 'Output',
+									name: 'output',
+									type: 'number',
+									typeOptions: {
+										minValue: 0,
+										maxValue: 3,
+									},
+									default: 0,
+									description: 'The index of output to which to send data to if rule matches',
+								},
+							],
+						},
+					],
+				},
+
+				// ----------------------------------
+				//         dataType:number
+				// ----------------------------------
+				{
+					displayName: 'Value 1',
+					name: 'value1',
+					type: 'number',
+					displayOptions: {
+						show: {
+							dataType: ['number'],
+							mode: ['rules'],
+						},
+					},
+					default: 0,
+					description: 'The value to compare with the second one',
+				},
+				{
+					displayName: 'Routing Rules',
+					name: 'rules',
+					placeholder: 'Add Routing Rule',
+					type: 'fixedCollection',
+					typeOptions: {
+						multipleValues: true,
+					},
+					displayOptions: {
+						show: {
+							dataType: ['number'],
+							mode: ['rules'],
+						},
+					},
+					default: {},
+					options: [
+						{
+							name: 'rules',
+							displayName: 'Numbers',
+							values: [
+								// eslint-disable-next-line n8n-nodes-base/node-param-operation-without-no-data-expression
+								{
+									displayName: 'Operation',
+									name: 'operation',
+									type: 'options',
+									// eslint-disable-next-line n8n-nodes-base/node-param-options-type-unsorted-items
+									options: [
+										{
+											name: 'Smaller',
+											value: 'smaller',
+										},
+										{
+											name: 'Smaller Equal',
+											value: 'smallerEqual',
+										},
+										{
+											name: 'Equal',
+											value: 'equal',
+										},
+										{
+											name: 'Not Equal',
+											value: 'notEqual',
+										},
+										{
+											name: 'Larger',
+											value: 'larger',
+										},
+										{
+											name: 'Larger Equal',
+											value: 'largerEqual',
+										},
+									],
+									default: 'smaller',
+									description: 'Operation to decide where the data should be mapped to',
+								},
+								{
+									displayName: 'Value 2',
+									name: 'value2',
+									type: 'number',
+									default: 0,
+									description: 'The value to compare with the first one',
+								},
+								{
+									displayName: 'Output',
+									name: 'output',
+									type: 'number',
+									typeOptions: {
+										minValue: 0,
+										maxValue: 3,
+									},
+									default: 0,
+									description: 'The index of output to which to send data to if rule matches',
+								},
+							],
+						},
+					],
+				},
+
+				// ----------------------------------
+				//         dataType:string
+				// ----------------------------------
+				{
+					displayName: 'Value 1',
+					name: 'value1',
+					type: 'string',
+					displayOptions: {
+						show: {
+							dataType: ['string'],
+							mode: ['rules'],
+						},
+					},
+					default: '',
+					description: 'The value to compare with the second one',
+				},
+				{
+					displayName: 'Routing Rules',
+					name: 'rules',
+					placeholder: 'Add Routing Rule',
+					type: 'fixedCollection',
+					typeOptions: {
+						multipleValues: true,
+					},
+					displayOptions: {
+						show: {
+							dataType: ['string'],
+							mode: ['rules'],
+						},
+					},
+					default: {},
+					options: [
+						{
+							name: 'rules',
+							displayName: 'Strings',
+							values: [
+								// eslint-disable-next-line n8n-nodes-base/node-param-operation-without-no-data-expression
+								{
+									displayName: 'Operation',
+									name: 'operation',
+									type: 'options',
+									// eslint-disable-next-line n8n-nodes-base/node-param-options-type-unsorted-items
+									options: [
+										{
+											name: 'Contains',
+											value: 'contains',
+										},
+										{
+											name: 'Not Contains',
+											value: 'notContains',
+										},
+										{
+											name: 'Ends With',
+											value: 'endsWith',
+										},
+										{
+											name: 'Not Ends With',
+											value: 'notEndsWith',
+										},
+										{
+											name: 'Equal',
+											value: 'equal',
+										},
+										{
+											name: 'Not Equal',
+											value: 'notEqual',
+										},
+										{
+											name: 'Regex Match',
+											value: 'regex',
+										},
+										{
+											name: 'Regex Not Match',
+											value: 'notRegex',
+										},
+										{
+											name: 'Starts With',
+											value: 'startsWith',
+										},
+										{
+											name: 'Not Starts With',
+											value: 'notStartsWith',
+										},
+									],
+									default: 'equal',
+									description: 'Operation to decide where the data should be mapped to',
+								},
+								{
+									displayName: 'Value 2',
+									name: 'value2',
+									type: 'string',
+									displayOptions: {
+										hide: {
+											operation: ['regex', 'notRegex'],
+										},
+									},
+									default: '',
+									description: 'The value to compare with the first one',
+								},
+								{
+									displayName: 'Regex',
+									name: 'value2',
+									type: 'string',
+									displayOptions: {
+										show: {
+											operation: ['regex', 'notRegex'],
+										},
+									},
+									default: '',
+									placeholder: '/text/i',
+									description: 'The regex which has to match',
+								},
+								{
+									displayName: 'Output',
+									name: 'output',
+									type: 'number',
+									typeOptions: {
+										minValue: 0,
+										maxValue: 3,
+									},
+									default: 0,
+									description: 'The index of output to which to send data to if rule matches',
+								},
+							],
+						},
+					],
+				},
+
+				{
+					displayName: 'Fallback Output',
+					name: 'fallbackOutput',
+					type: 'options',
+					displayOptions: {
+						show: {
+							mode: ['rules'],
+						},
+					},
+					// eslint-disable-next-line n8n-nodes-base/node-param-options-type-unsorted-items
+					options: [
+						{
+							name: 'None',
+							value: -1,
+						},
+						{
+							name: '0',
+							value: 0,
+						},
+						{
+							name: '1',
+							value: 1,
+						},
+						{
+							name: '2',
+							value: 2,
+						},
+						{
+							name: '3',
+							value: 3,
+						},
+					],
+					default: -1,
+					description: 'The output to which to route all items which do not match any of the rules',
+				},
+			],
+		};
+	}
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const returnData: INodeExecutionData[][] = [[], [], [], []];
+
+		const items = this.getInputData();
+
+		let compareOperationResult: boolean;
+		let item: INodeExecutionData;
+		let mode: string;
+		let outputIndex: number;
+		let ruleData: INodeParameters;
+
+		// The compare operations
+		const compareOperationFunctions: {
+			[key: string]: (value1: NodeParameterValue, value2: NodeParameterValue) => boolean;
+		} = {
+			after: (value1: NodeParameterValue, value2: NodeParameterValue) =>
+				(value1 || 0) > (value2 || 0),
+			before: (value1: NodeParameterValue, value2: NodeParameterValue) =>
+				(value1 || 0) < (value2 || 0),
+			contains: (value1: NodeParameterValue, value2: NodeParameterValue) =>
+				(value1 || '').toString().includes((value2 || '').toString()),
+			notContains: (value1: NodeParameterValue, value2: NodeParameterValue) =>
+				!(value1 || '').toString().includes((value2 || '').toString()),
+			endsWith: (value1: NodeParameterValue, value2: NodeParameterValue) =>
+				(value1 as string).endsWith(value2 as string),
+			notEndsWith: (value1: NodeParameterValue, value2: NodeParameterValue) =>
+				!(value1 as string).endsWith(value2 as string),
+			equal: (value1: NodeParameterValue, value2: NodeParameterValue) => value1 === value2,
+			notEqual: (value1: NodeParameterValue, value2: NodeParameterValue) => value1 !== value2,
+			larger: (value1: NodeParameterValue, value2: NodeParameterValue) =>
+				(value1 || 0) > (value2 || 0),
+			largerEqual: (value1: NodeParameterValue, value2: NodeParameterValue) =>
+				(value1 || 0) >= (value2 || 0),
+			smaller: (value1: NodeParameterValue, value2: NodeParameterValue) =>
+				(value1 || 0) < (value2 || 0),
+			smallerEqual: (value1: NodeParameterValue, value2: NodeParameterValue) =>
+				(value1 || 0) <= (value2 || 0),
+			startsWith: (value1: NodeParameterValue, value2: NodeParameterValue) =>
+				(value1 as string).startsWith(value2 as string),
+			notStartsWith: (value1: NodeParameterValue, value2: NodeParameterValue) =>
+				!(value1 as string).startsWith(value2 as string),
+			regex: (value1: NodeParameterValue, value2: NodeParameterValue) => {
+				const regexMatch = (value2 || '').toString().match(new RegExp('^/(.*?)/([gimusy]*)$'));
+
+				let regex: RegExp;
+				if (!regexMatch) {
+					regex = new RegExp((value2 || '').toString());
+				} else if (regexMatch.length === 1) {
+					regex = new RegExp(regexMatch[1]);
+				} else {
+					regex = new RegExp(regexMatch[1], regexMatch[2]);
+				}
+
+				return !!(value1 || '').toString().match(regex);
+			},
+			notRegex: (value1: NodeParameterValue, value2: NodeParameterValue) => {
+				const regexMatch = (value2 || '').toString().match(new RegExp('^/(.*?)/([gimusy]*)$'));
+
+				let regex: RegExp;
+				if (!regexMatch) {
+					regex = new RegExp((value2 || '').toString());
+				} else if (regexMatch.length === 1) {
+					regex = new RegExp(regexMatch[1]);
+				} else {
+					regex = new RegExp(regexMatch[1], regexMatch[2]);
+				}
+
+				return !(value1 || '').toString().match(regex);
+			},
+		};
+
+		// Converts the input data of a dateTime into a number for easy compare
+		const convertDateTime = (value: NodeParameterValue): number => {
+			let returnValue: number | undefined = undefined;
+			if (typeof value === 'string') {
+				returnValue = new Date(value).getTime();
+			} else if (typeof value === 'number') {
+				returnValue = value;
+			}
+			if ((value as unknown as object) instanceof Date) {
+				returnValue = (value as unknown as Date).getTime();
+			}
+
+			if (returnValue === undefined || isNaN(returnValue)) {
+				throw new NodeOperationError(
+					this.getNode(),
+					`The value "${value}" is not a valid DateTime.`,
+				);
+			}
+
+			return returnValue;
+		};
+
+		const checkIndexRange = (index: number) => {
+			if (index < 0 || index >= returnData.length) {
+				throw new NodeOperationError(
+					this.getNode(),
+					`The ouput ${index} is not allowed. It has to be between 0 and ${returnData.length - 1}!`,
+				);
+			}
+		};
+
+		// Iterate over all items to check to which output they should be routed to
+		itemLoop: for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
+			try {
+				item = items[itemIndex];
+				mode = this.getNodeParameter('mode', itemIndex) as string;
+
+				if (mode === 'expression') {
+					// One expression decides how to route item
+
+					outputIndex = this.getNodeParameter('output', itemIndex) as number;
+					checkIndexRange(outputIndex);
+
+					returnData[outputIndex].push(item);
+				} else if (mode === 'rules') {
+					// Rules decide how to route item
+
+					const dataType = this.getNodeParameter('dataType', 0) as string;
+
+					let value1 = this.getNodeParameter('value1', itemIndex) as NodeParameterValue;
+					if (dataType === 'dateTime') {
+						value1 = convertDateTime(value1);
+					}
+
+					for (ruleData of this.getNodeParameter(
+						'rules.rules',
+						itemIndex,
+						[],
+					) as INodeParameters[]) {
+						// Check if the values passes
+
+						let value2 = ruleData.value2 as NodeParameterValue;
+						if (dataType === 'dateTime') {
+							value2 = convertDateTime(value2);
+						}
+
+						compareOperationResult = compareOperationFunctions[ruleData.operation as string](
+							value1,
+							value2,
+						);
+
+						if (compareOperationResult) {
+							// If rule matches add it to the correct output and continue with next item
+							checkIndexRange(ruleData.output as number);
+							returnData[ruleData.output as number].push(item);
+							continue itemLoop;
+						}
+					}
+
+					// Check if a fallback output got defined and route accordingly
+					outputIndex = this.getNodeParameter('fallbackOutput', itemIndex) as number;
+					if (outputIndex !== -1) {
+						checkIndexRange(outputIndex);
+						returnData[outputIndex].push(item);
+					}
+				}
+			} catch (error) {
+				if (this.continueOnFail()) {
+					returnData[0].push({ json: { error: error.message } });
+					continue;
+				}
+				throw error;
+			}
+		}
+
+		return returnData;
+	}
+}
diff --git a/packages/nodes-base/nodes/Switch/test/switch.expression.workflow.json b/packages/nodes-base/nodes/Switch/V1/test/switch.expression.workflow.json
similarity index 100%
rename from packages/nodes-base/nodes/Switch/test/switch.expression.workflow.json
rename to packages/nodes-base/nodes/Switch/V1/test/switch.expression.workflow.json
diff --git a/packages/nodes-base/nodes/Switch/V1/test/switch.node.test.ts b/packages/nodes-base/nodes/Switch/V1/test/switch.node.test.ts
new file mode 100644
index 0000000000000..ab506aa481df6
--- /dev/null
+++ b/packages/nodes-base/nodes/Switch/V1/test/switch.node.test.ts
@@ -0,0 +1,4 @@
+import { testWorkflows, getWorkflowFilenames } from '@test/nodes/Helpers';
+const workflows = getWorkflowFilenames(__dirname);
+
+describe('Execute Switch Node', () => testWorkflows(workflows));
diff --git a/packages/nodes-base/nodes/Switch/test/switch.rules.workflow.json b/packages/nodes-base/nodes/Switch/V1/test/switch.rules.workflow.json
similarity index 100%
rename from packages/nodes-base/nodes/Switch/test/switch.rules.workflow.json
rename to packages/nodes-base/nodes/Switch/V1/test/switch.rules.workflow.json
diff --git a/packages/nodes-base/nodes/Switch/V2/SwitchV2.node.ts b/packages/nodes-base/nodes/Switch/V2/SwitchV2.node.ts
new file mode 100644
index 0000000000000..f9bad8aeb9c60
--- /dev/null
+++ b/packages/nodes-base/nodes/Switch/V2/SwitchV2.node.ts
@@ -0,0 +1,712 @@
+import type {
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
+	INodeExecutionData,
+	INodeParameters,
+	INodePropertyOptions,
+	INodeType,
+	INodeTypeBaseDescription,
+	INodeTypeDescription,
+	NodeParameterValue,
+} from 'n8n-workflow';
+import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
+
+export class SwitchV2 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			version: [2],
+			defaults: {
+				name: 'Switch',
+				color: '#506000',
+			},
+			inputs: ['main'],
+
+			outputs: `={{
+					((parameters) => {
+						const rules = parameters.rules?.rules ?? [];
+						const mode = parameters.mode;
+
+						if (mode === 'expression') {
+							return Array
+								.from(
+									{ length: parameters.outputsAmount },
+									(_, i) => ({ type: "${NodeConnectionType.Main}", displayName: i.toString() })
+								)
+						}
+
+
+						return rules.map(value => {
+							return { type: "${NodeConnectionType.Main}", displayName: value.outputKey }
+						})
+					})($parameter)
+				}}`,
+
+			properties: [
+				{
+					displayName: 'Mode',
+					name: 'mode',
+					type: 'options',
+					options: [
+						{
+							name: 'Expression',
+							value: 'expression',
+							description: 'Expression decides how to route data',
+						},
+						{
+							name: 'Rules',
+							value: 'rules',
+							description: 'Rules decide how to route data',
+						},
+					],
+					default: 'rules',
+					description: 'How data should be routed',
+				},
+
+				// ----------------------------------
+				//         mode:expression
+				// ----------------------------------
+				{
+					displayName: 'Output',
+					name: 'output',
+					type: 'string',
+					displayOptions: {
+						show: {
+							mode: ['expression'],
+						},
+					},
+					default: '',
+					description: 'The index of output to which to send data to',
+				},
+
+				{
+					displayName: 'Outputs Amount',
+					name: 'outputsAmount',
+					type: 'number',
+					displayOptions: {
+						show: {
+							mode: ['expression'],
+						},
+					},
+					default: 4,
+					description: 'Amount of outputs to create',
+				},
+
+				// ----------------------------------
+				//         mode:rules
+				// ----------------------------------
+				{
+					displayName: 'Data Type',
+					name: 'dataType',
+					type: 'options',
+					displayOptions: {
+						show: {
+							mode: ['rules'],
+						},
+					},
+					options: [
+						{
+							name: 'Boolean',
+							value: 'boolean',
+						},
+						{
+							name: 'Date & Time',
+							value: 'dateTime',
+						},
+						{
+							name: 'Number',
+							value: 'number',
+						},
+						{
+							name: 'String',
+							value: 'string',
+						},
+					],
+					default: 'number',
+					description: 'The type of data to route on',
+				},
+
+				// ----------------------------------
+				//         dataType:boolean
+				// ----------------------------------
+				{
+					displayName: 'Value 1',
+					name: 'value1',
+					type: 'boolean',
+					displayOptions: {
+						show: {
+							dataType: ['boolean'],
+							mode: ['rules'],
+						},
+					},
+					default: false,
+					// eslint-disable-next-line n8n-nodes-base/node-param-description-boolean-without-whether
+					description: 'The value to compare with the first one',
+				},
+				{
+					displayName: 'Routing Rules',
+					name: 'rules',
+					placeholder: 'Add Routing Rule',
+					type: 'fixedCollection',
+					typeOptions: {
+						multipleValues: true,
+						sortable: true,
+					},
+					displayOptions: {
+						show: {
+							dataType: ['boolean'],
+							mode: ['rules'],
+						},
+					},
+					default: {},
+					options: [
+						{
+							name: 'rules',
+							displayName: 'Boolean',
+							values: [
+								// eslint-disable-next-line n8n-nodes-base/node-param-operation-without-no-data-expression
+								{
+									displayName: 'Operation',
+									name: 'operation',
+									type: 'options',
+									options: [
+										{
+											name: 'Equal',
+											value: 'equal',
+										},
+										{
+											name: 'Not Equal',
+											value: 'notEqual',
+										},
+									],
+									default: 'equal',
+									description: 'Operation to decide where the data should be mapped to',
+								},
+								{
+									displayName: 'Value 2',
+									name: 'value2',
+									type: 'boolean',
+									default: false,
+									// eslint-disable-next-line n8n-nodes-base/node-param-description-boolean-without-whether
+									description: 'The value to compare with the first one',
+								},
+								{
+									displayName: 'Output Key',
+									name: 'outputKey',
+									type: 'string',
+									default: '',
+									description: 'The label of output to which to send data to if rule matches',
+								},
+							],
+						},
+					],
+				},
+
+				// ----------------------------------
+				//         dataType:dateTime
+				// ----------------------------------
+				{
+					displayName: 'Value 1',
+					name: 'value1',
+					type: 'dateTime',
+					displayOptions: {
+						show: {
+							dataType: ['dateTime'],
+							mode: ['rules'],
+						},
+					},
+					default: '',
+					description: 'The value to compare with the second one',
+				},
+				{
+					displayName: 'Routing Rules',
+					name: 'rules',
+					placeholder: 'Add Routing Rule',
+					type: 'fixedCollection',
+					typeOptions: {
+						multipleValues: true,
+						sortable: true,
+					},
+					displayOptions: {
+						show: {
+							dataType: ['dateTime'],
+							mode: ['rules'],
+						},
+					},
+					default: {},
+					options: [
+						{
+							name: 'rules',
+							displayName: 'Dates',
+							values: [
+								// eslint-disable-next-line n8n-nodes-base/node-param-operation-without-no-data-expression
+								{
+									displayName: 'Operation',
+									name: 'operation',
+									type: 'options',
+									options: [
+										{
+											name: 'Occurred After',
+											value: 'after',
+										},
+										{
+											name: 'Occurred Before',
+											value: 'before',
+										},
+									],
+									default: 'after',
+									description: 'Operation to decide where the data should be mapped to',
+								},
+								{
+									displayName: 'Value 2',
+									name: 'value2',
+									type: 'dateTime',
+									default: 0,
+									description: 'The value to compare with the first one',
+								},
+								{
+									displayName: 'Output Key',
+									name: 'outputKey',
+									type: 'string',
+									default: '',
+									description: 'The label of output to which to send data to if rule matches',
+								},
+							],
+						},
+					],
+				},
+
+				// ----------------------------------
+				//         dataType:number
+				// ----------------------------------
+				{
+					displayName: 'Value 1',
+					name: 'value1',
+					type: 'number',
+					displayOptions: {
+						show: {
+							dataType: ['number'],
+							mode: ['rules'],
+						},
+					},
+					default: 0,
+					description: 'The value to compare with the second one',
+				},
+				{
+					displayName: 'Routing Rules',
+					name: 'rules',
+					placeholder: 'Add Routing Rule',
+					type: 'fixedCollection',
+					typeOptions: {
+						multipleValues: true,
+						sortable: true,
+					},
+					displayOptions: {
+						show: {
+							dataType: ['number'],
+							mode: ['rules'],
+						},
+					},
+					default: {},
+					options: [
+						{
+							name: 'rules',
+							displayName: 'Numbers',
+							values: [
+								// eslint-disable-next-line n8n-nodes-base/node-param-operation-without-no-data-expression
+								{
+									displayName: 'Operation',
+									name: 'operation',
+									type: 'options',
+									// eslint-disable-next-line n8n-nodes-base/node-param-options-type-unsorted-items
+									options: [
+										{
+											name: 'Smaller',
+											value: 'smaller',
+										},
+										{
+											name: 'Smaller Equal',
+											value: 'smallerEqual',
+										},
+										{
+											name: 'Equal',
+											value: 'equal',
+										},
+										{
+											name: 'Not Equal',
+											value: 'notEqual',
+										},
+										{
+											name: 'Larger',
+											value: 'larger',
+										},
+										{
+											name: 'Larger Equal',
+											value: 'largerEqual',
+										},
+									],
+									default: 'smaller',
+									description: 'Operation to decide where the data should be mapped to',
+								},
+								{
+									displayName: 'Value 2',
+									name: 'value2',
+									type: 'number',
+									default: 0,
+									description: 'The value to compare with the first one',
+								},
+								{
+									displayName: 'Output Key',
+									name: 'outputKey',
+									type: 'string',
+									default: '',
+									description: 'The label of output to which to send data to if rule matches',
+								},
+							],
+						},
+					],
+				},
+
+				// ----------------------------------
+				//         dataType:string
+				// ----------------------------------
+				{
+					displayName: 'Value 1',
+					name: 'value1',
+					type: 'string',
+					displayOptions: {
+						show: {
+							dataType: ['string'],
+							mode: ['rules'],
+						},
+					},
+					default: '',
+					description: 'The value to compare with the second one',
+				},
+				{
+					displayName: 'Routing Rules',
+					name: 'rules',
+					placeholder: 'Add Routing Rule',
+					type: 'fixedCollection',
+					typeOptions: {
+						multipleValues: true,
+						sortable: true,
+					},
+					displayOptions: {
+						show: {
+							dataType: ['string'],
+							mode: ['rules'],
+						},
+					},
+					default: {},
+					options: [
+						{
+							name: 'rules',
+							displayName: 'Strings',
+							values: [
+								// eslint-disable-next-line n8n-nodes-base/node-param-operation-without-no-data-expression
+								{
+									displayName: 'Operation',
+									name: 'operation',
+									type: 'options',
+									// eslint-disable-next-line n8n-nodes-base/node-param-options-type-unsorted-items
+									options: [
+										{
+											name: 'Contains',
+											value: 'contains',
+										},
+										{
+											name: 'Not Contains',
+											value: 'notContains',
+										},
+										{
+											name: 'Ends With',
+											value: 'endsWith',
+										},
+										{
+											name: 'Not Ends With',
+											value: 'notEndsWith',
+										},
+										{
+											name: 'Equal',
+											value: 'equal',
+										},
+										{
+											name: 'Not Equal',
+											value: 'notEqual',
+										},
+										{
+											name: 'Regex Match',
+											value: 'regex',
+										},
+										{
+											name: 'Regex Not Match',
+											value: 'notRegex',
+										},
+										{
+											name: 'Starts With',
+											value: 'startsWith',
+										},
+										{
+											name: 'Not Starts With',
+											value: 'notStartsWith',
+										},
+									],
+									default: 'equal',
+									description: 'Operation to decide where the data should be mapped to',
+								},
+								{
+									displayName: 'Value 2',
+									name: 'value2',
+									type: 'string',
+									displayOptions: {
+										hide: {
+											operation: ['regex', 'notRegex'],
+										},
+									},
+									default: '',
+									description: 'The value to compare with the first one',
+								},
+								{
+									displayName: 'Regex',
+									name: 'value2',
+									type: 'string',
+									displayOptions: {
+										show: {
+											operation: ['regex', 'notRegex'],
+										},
+									},
+									default: '',
+									placeholder: '/text/i',
+									description: 'The regex which has to match',
+								},
+								{
+									displayName: 'Output Key',
+									name: 'outputKey',
+									type: 'string',
+									default: '',
+									description: 'The label of output to which to send data to if rule matches',
+								},
+							],
+						},
+					],
+				},
+
+				{
+					displayName: 'Fallback Output Name or ID',
+					name: 'fallbackOutput',
+					type: 'options',
+					displayOptions: {
+						show: {
+							mode: ['rules'],
+						},
+					},
+
+					typeOptions: {
+						loadOptionsDependsOn: ['rules.rules'],
+						loadOptionsMethod: 'getFallbackOutputOptions',
+					},
+					default: -1,
+					description:
+						'The output to which to route all items which do not match any of the rules. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+				},
+			],
+		};
+	}
+
+	methods = {
+		loadOptions: {
+			async getFallbackOutputOptions(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const rules = (this.getCurrentNodeParameter('rules.rules') as INodeParameters[]) ?? [];
+				const options = rules.map((rule, index) => ({
+					name: `${index} ${rule.outputKey as string}`,
+					value: index,
+				}));
+
+				options.unshift({
+					name: 'None',
+					value: -1,
+				});
+
+				return options;
+			},
+		},
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		let returnData: INodeExecutionData[][] = [];
+
+		const items = this.getInputData();
+
+		let compareOperationResult: boolean;
+		let item: INodeExecutionData;
+		let mode: string;
+		let outputIndex: number;
+		let ruleData: INodeParameters;
+
+		// The compare operations
+		const compareOperationFunctions: {
+			[key: string]: (value1: NodeParameterValue, value2: NodeParameterValue) => boolean;
+		} = {
+			after: (value1: NodeParameterValue, value2: NodeParameterValue) =>
+				(value1 || 0) > (value2 || 0),
+			before: (value1: NodeParameterValue, value2: NodeParameterValue) =>
+				(value1 || 0) < (value2 || 0),
+			contains: (value1: NodeParameterValue, value2: NodeParameterValue) =>
+				(value1 || '').toString().includes((value2 || '').toString()),
+			notContains: (value1: NodeParameterValue, value2: NodeParameterValue) =>
+				!(value1 || '').toString().includes((value2 || '').toString()),
+			endsWith: (value1: NodeParameterValue, value2: NodeParameterValue) =>
+				(value1 as string).endsWith(value2 as string),
+			notEndsWith: (value1: NodeParameterValue, value2: NodeParameterValue) =>
+				!(value1 as string).endsWith(value2 as string),
+			equal: (value1: NodeParameterValue, value2: NodeParameterValue) => value1 === value2,
+			notEqual: (value1: NodeParameterValue, value2: NodeParameterValue) => value1 !== value2,
+			larger: (value1: NodeParameterValue, value2: NodeParameterValue) =>
+				(value1 || 0) > (value2 || 0),
+			largerEqual: (value1: NodeParameterValue, value2: NodeParameterValue) =>
+				(value1 || 0) >= (value2 || 0),
+			smaller: (value1: NodeParameterValue, value2: NodeParameterValue) =>
+				(value1 || 0) < (value2 || 0),
+			smallerEqual: (value1: NodeParameterValue, value2: NodeParameterValue) =>
+				(value1 || 0) <= (value2 || 0),
+			startsWith: (value1: NodeParameterValue, value2: NodeParameterValue) =>
+				(value1 as string).startsWith(value2 as string),
+			notStartsWith: (value1: NodeParameterValue, value2: NodeParameterValue) =>
+				!(value1 as string).startsWith(value2 as string),
+			regex: (value1: NodeParameterValue, value2: NodeParameterValue) => {
+				const regexMatch = (value2 || '').toString().match(new RegExp('^/(.*?)/([gimusy]*)$'));
+
+				let regex: RegExp;
+				if (!regexMatch) {
+					regex = new RegExp((value2 || '').toString());
+				} else if (regexMatch.length === 1) {
+					regex = new RegExp(regexMatch[1]);
+				} else {
+					regex = new RegExp(regexMatch[1], regexMatch[2]);
+				}
+
+				return !!(value1 || '').toString().match(regex);
+			},
+			notRegex: (value1: NodeParameterValue, value2: NodeParameterValue) => {
+				const regexMatch = (value2 || '').toString().match(new RegExp('^/(.*?)/([gimusy]*)$'));
+
+				let regex: RegExp;
+				if (!regexMatch) {
+					regex = new RegExp((value2 || '').toString());
+				} else if (regexMatch.length === 1) {
+					regex = new RegExp(regexMatch[1]);
+				} else {
+					regex = new RegExp(regexMatch[1], regexMatch[2]);
+				}
+
+				return !(value1 || '').toString().match(regex);
+			},
+		};
+
+		// Converts the input data of a dateTime into a number for easy compare
+		const convertDateTime = (value: NodeParameterValue): number => {
+			let returnValue: number | undefined = undefined;
+			if (typeof value === 'string') {
+				returnValue = new Date(value).getTime();
+			} else if (typeof value === 'number') {
+				returnValue = value;
+			}
+			if ((value as unknown as object) instanceof Date) {
+				returnValue = (value as unknown as Date).getTime();
+			}
+
+			if (returnValue === undefined || isNaN(returnValue)) {
+				throw new NodeOperationError(
+					this.getNode(),
+					`The value "${value}" is not a valid DateTime.`,
+				);
+			}
+
+			return returnValue;
+		};
+
+		const checkIndexRange = (index: number) => {
+			if (index < 0 || index >= returnData.length) {
+				throw new NodeOperationError(
+					this.getNode(),
+					`The ouput ${index} is not allowed. It has to be between 0 and ${returnData.length - 1}!`,
+				);
+			}
+		};
+
+		// Iterate over all items to check to which output they should be routed to
+		itemLoop: for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
+			try {
+				item = items[itemIndex];
+				const rules = this.getNodeParameter('rules.rules', itemIndex, []) as INodeParameters[];
+				mode = this.getNodeParameter('mode', itemIndex) as string;
+
+				item.pairedItem = { item: itemIndex };
+
+				if (mode === 'expression') {
+					const outputsAmount = this.getNodeParameter('outputsAmount', itemIndex) as number;
+					if (itemIndex === 0) {
+						returnData = new Array(outputsAmount).fill(0).map(() => []);
+					}
+					// One expression decides how to route item
+					outputIndex = this.getNodeParameter('output', itemIndex) as number;
+					checkIndexRange(outputIndex);
+
+					returnData[outputIndex].push(item);
+				} else if (mode === 'rules') {
+					// Rules decide how to route item
+					if (itemIndex === 0) {
+						returnData = new Array(rules.length).fill(0).map(() => []);
+					}
+					const dataType = this.getNodeParameter('dataType', 0) as string;
+
+					let value1 = this.getNodeParameter('value1', itemIndex) as NodeParameterValue;
+					if (dataType === 'dateTime') {
+						value1 = convertDateTime(value1);
+					}
+
+					for (ruleData of rules) {
+						// Check if the values passes
+
+						let value2 = ruleData.value2 as NodeParameterValue;
+						if (dataType === 'dateTime') {
+							value2 = convertDateTime(value2);
+						}
+
+						compareOperationResult = compareOperationFunctions[ruleData.operation as string](
+							value1,
+							value2,
+						);
+
+						if (compareOperationResult) {
+							// If rule matches add it to the correct output and continue with next item
+							checkIndexRange(ruleData.output as number);
+
+							const ruleIndex = rules.indexOf(ruleData);
+							returnData[ruleIndex].push(item);
+							continue itemLoop;
+						}
+					}
+
+					// Check if a fallback output got defined and route accordingly
+					outputIndex = this.getNodeParameter('fallbackOutput', itemIndex) as number;
+					if (outputIndex !== -1) {
+						checkIndexRange(outputIndex);
+						returnData[outputIndex].push(item);
+					}
+				}
+			} catch (error) {
+				if (this.continueOnFail()) {
+					returnData[0].push({ json: { error: error.message } });
+					continue;
+				}
+				throw error;
+			}
+		}
+
+		return returnData;
+	}
+}
diff --git a/packages/nodes-base/nodes/Switch/V2/test/switch.expression.workflow.json b/packages/nodes-base/nodes/Switch/V2/test/switch.expression.workflow.json
new file mode 100644
index 0000000000000..18498d4d076af
--- /dev/null
+++ b/packages/nodes-base/nodes/Switch/V2/test/switch.expression.workflow.json
@@ -0,0 +1,171 @@
+{
+  "name": "My workflow 109",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "7ae16f96-5c2c-44a3-9f96-167e426336f9",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        620,
+        720
+      ]
+    },
+    {
+      "parameters": {
+        "jsCode": "return [{\n  \"output\": \"third\",\n  \"text\": \"third output text\"\n}, {\n  \"output\": \"fourth\",\n  \"text\": \"fourth output text\"\n}, {\n  \"output\": \"first\",\n  \"text\": \"first output text\"\n}, {\n  \"output\": \"second\",\n  \"text\": \"second output text\"\n}]"
+      },
+      "id": "31e9aada-7aa2-4c62-8e15-0cecb91788e4",
+      "name": "Code",
+      "type": "n8n-nodes-base.code",
+      "typeVersion": 2,
+      "position": [
+        840,
+        720
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "cf10b4c7-16a6-4c16-a17c-7b83f954f7b9",
+      "name": "No Operation, do nothing",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        1380,
+        560
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "3e7e7f4a-bff9-4ce1-a5e5-58505853260f",
+      "name": "No Operation, do nothing1",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        1380,
+        720
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "205f59d6-52f5-4412-9511-b680a91d0be2",
+      "name": "No Operation, do nothing2",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        1380,
+        880
+      ]
+    },
+    {
+      "parameters": {
+        "mode": "expression",
+        "output": "={{ Math.max(0, ['first', 'second', 'third'].indexOf( $json.output)) }}",
+        "outputsAmount": 3
+      },
+      "id": "9c3dc163-0103-45c2-8455-e6ab3e84679c",
+      "name": "Switch1",
+      "type": "n8n-nodes-base.switch",
+      "typeVersion": 2,
+      "position": [
+        1100,
+        720
+      ]
+    }
+  ],
+  "pinData": {
+    "No Operation, do nothing2": [
+      {
+        "json": {
+          "output": "third",
+          "text": "third output text"
+        }
+      }
+    ],
+    "No Operation, do nothing1": [
+      {
+        "json": {
+          "output": "second",
+          "text": "second output text"
+        }
+
+      }
+    ],
+    "No Operation, do nothing": [
+      {
+        "json": {
+          "output": "fourth",
+          "text": "fourth output text"
+        }
+
+      },
+      {
+        "json": {
+          "output": "first",
+          "text": "first output text"
+        }
+
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Code",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Code": {
+      "main": [
+        [
+          {
+            "node": "Switch1",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Switch1": {
+      "main": [
+        [
+          {
+            "node": "No Operation, do nothing",
+            "type": "main",
+            "index": 0
+          }
+        ],
+        [
+          {
+            "node": "No Operation, do nothing1",
+            "type": "main",
+            "index": 0
+          }
+        ],
+        [
+          {
+            "node": "No Operation, do nothing2",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "cca0f0b9-d01e-435b-9125-9616007f4aea",
+  "id": "xjPY8ZYJK53G6nQ1",
+  "meta": {
+    "instanceId": "ec7a5f4ffdb34436e59d23eaccb5015b5238de2a877e205b28572bf1ffecfe04"
+  },
+  "tags": []
+}
diff --git a/packages/nodes-base/nodes/Switch/V2/test/switch.node.test.ts b/packages/nodes-base/nodes/Switch/V2/test/switch.node.test.ts
new file mode 100644
index 0000000000000..ab506aa481df6
--- /dev/null
+++ b/packages/nodes-base/nodes/Switch/V2/test/switch.node.test.ts
@@ -0,0 +1,4 @@
+import { testWorkflows, getWorkflowFilenames } from '@test/nodes/Helpers';
+const workflows = getWorkflowFilenames(__dirname);
+
+describe('Execute Switch Node', () => testWorkflows(workflows));
diff --git a/packages/nodes-base/nodes/Switch/V2/test/switch.rules.workflow.json b/packages/nodes-base/nodes/Switch/V2/test/switch.rules.workflow.json
new file mode 100644
index 0000000000000..516f9cac74658
--- /dev/null
+++ b/packages/nodes-base/nodes/Switch/V2/test/switch.rules.workflow.json
@@ -0,0 +1,187 @@
+{
+  "name": "My workflow 109",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "7ae16f96-5c2c-44a3-9f96-167e426336f9",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        620,
+        720
+      ]
+    },
+    {
+      "parameters": {
+        "jsCode": "return [{\n  \"output\": \"third\",\n  \"text\": \"third output text\"\n}, {\n  \"output\": \"fourth\",\n  \"text\": \"fourth output text\"\n}, {\n  \"output\": \"first\",\n  \"text\": \"first output text\"\n}, {\n  \"output\": \"second\",\n  \"text\": \"second output text\"\n}]"
+      },
+      "id": "31e9aada-7aa2-4c62-8e15-0cecb91788e4",
+      "name": "Code",
+      "type": "n8n-nodes-base.code",
+      "typeVersion": 2,
+      "position": [
+        840,
+        720
+      ]
+    },
+    {
+      "parameters": {
+        "dataType": "string",
+        "value1": "={{ $json.output }}",
+        "rules": {
+          "rules": [
+            {
+              "value2": "first",
+              "outputKey": "First Output"
+            },
+            {
+              "value2": "second",
+              "outputKey": "Second Output"
+            },
+            {
+              "value2": "third",
+              "outputKey": "Third Output"
+            }
+          ]
+        },
+        "fallbackOutput": 2
+      },
+      "id": "0dd6e98a-2830-42fb-9a9d-6d4ff8678cbd",
+      "name": "Switch",
+      "type": "n8n-nodes-base.switch",
+      "typeVersion": 2,
+      "position": [
+        1120,
+        720
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "cf10b4c7-16a6-4c16-a17c-7b83f954f7b9",
+      "name": "No Operation, do nothing",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        1380,
+        560
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "3e7e7f4a-bff9-4ce1-a5e5-58505853260f",
+      "name": "No Operation, do nothing1",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        1380,
+        720
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "205f59d6-52f5-4412-9511-b680a91d0be2",
+      "name": "No Operation, do nothing2",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        1380,
+        880
+      ]
+    }
+  ],
+  "pinData": {
+    "No Operation, do nothing": [
+      {
+        "json": {
+          "output": "first",
+          "text": "first output text"
+        }
+
+      }
+    ],
+    "No Operation, do nothing1": [
+      {
+        "json": {
+          "output": "second",
+          "text": "second output text"
+        }
+
+      }
+    ],
+    "No Operation, do nothing2": [
+      {
+        "json": {
+          "output": "third",
+          "text": "third output text"
+        }
+
+      },
+      {
+        "json": {
+          "output": "fourth",
+          "text": "fourth output text"
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Code",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Code": {
+      "main": [
+        [
+          {
+            "node": "Switch",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Switch": {
+      "main": [
+        [
+          {
+            "node": "No Operation, do nothing",
+            "type": "main",
+            "index": 0
+          }
+        ],
+        [
+          {
+            "node": "No Operation, do nothing1",
+            "type": "main",
+            "index": 0
+          }
+        ],
+        [
+          {
+            "node": "No Operation, do nothing2",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "627af20f-47fc-47a7-8da6-a7e7b21225df",
+  "id": "xjPY8ZYJK53G6nQ1",
+  "meta": {
+    "instanceId": "ec7a5f4ffdb34436e59d23eaccb5015b5238de2a877e205b28572bf1ffecfe04"
+  },
+  "tags": []
+}
diff --git a/packages/nodes-base/nodes/Switch/V3/SwitchV3.node.ts b/packages/nodes-base/nodes/Switch/V3/SwitchV3.node.ts
new file mode 100644
index 0000000000000..20f02eaa27cb3
--- /dev/null
+++ b/packages/nodes-base/nodes/Switch/V3/SwitchV3.node.ts
@@ -0,0 +1,393 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
+	INodeExecutionData,
+	INodeParameters,
+	INodePropertyOptions,
+	INodeType,
+	INodeTypeBaseDescription,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
+import set from 'lodash/set';
+import { capitalize } from '@utils/utilities';
+
+const configuredOutputs = (parameters: INodeParameters) => {
+	const mode = parameters.mode as string;
+
+	if (mode === 'expression') {
+		return Array.from({ length: parameters.numberOutputs as number }, (_, i) => ({
+			type: `${NodeConnectionType.Main}`,
+			displayName: i.toString(),
+		}));
+	} else {
+		const rules = ((parameters.rules as IDataObject)?.values as IDataObject[]) ?? [];
+		const ruleOutputs = rules.map((rule, index) => {
+			return {
+				type: `${NodeConnectionType.Main}`,
+				displayName: rule.outputKey || index.toString(),
+			};
+		});
+		if ((parameters.options as IDataObject)?.fallbackOutput === 'extra') {
+			const renameFallbackOutput = (parameters.options as IDataObject)?.renameFallbackOutput;
+			ruleOutputs.push({
+				type: `${NodeConnectionType.Main}`,
+				displayName: renameFallbackOutput || 'Fallback',
+			});
+		}
+		return ruleOutputs;
+	}
+};
+
+export class SwitchV3 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			subtitle: `=mode: {{(${capitalize})($parameter["mode"])}}`,
+			version: [3],
+			defaults: {
+				name: 'Switch',
+				color: '#506000',
+			},
+			inputs: ['main'],
+			outputs: `={{(${configuredOutputs})($parameter)}}`,
+			properties: [
+				{
+					displayName: 'Mode',
+					name: 'mode',
+					type: 'options',
+					noDataExpression: true,
+					options: [
+						{
+							name: 'Rules',
+							value: 'rules',
+							description: 'Build a matching rule for each output',
+						},
+						{
+							name: 'Expression',
+							value: 'expression',
+							description: 'Write an expression to return the output index',
+						},
+					],
+					default: 'rules',
+					description: 'How data should be routed',
+				},
+				{
+					displayName: 'Number of Outputs',
+					name: 'numberOutputs',
+					type: 'number',
+					displayOptions: {
+						show: {
+							mode: ['expression'],
+						},
+					},
+					default: 4,
+					description: 'How many outputs to create',
+				},
+				{
+					displayName: 'Output Index',
+					name: 'output',
+					type: 'number',
+					validateType: 'number',
+					hint: 'The index to route the item to, starts at 0',
+					displayOptions: {
+						show: {
+							mode: ['expression'],
+						},
+					},
+					// eslint-disable-next-line n8n-nodes-base/node-param-default-wrong-for-number
+					default: '={{}}',
+					description:
+						'The output index to send the input item to. Use an expression to calculate which input item should be routed to which output. The expression must return a number.',
+				},
+				{
+					displayName: 'Routing Rules',
+					name: 'rules',
+					placeholder: 'Add Routing Rule',
+					type: 'fixedCollection',
+					typeOptions: {
+						multipleValues: true,
+						sortable: true,
+					},
+					default: {
+						values: [
+							{
+								conditions: {
+									options: {
+										caseSensitive: true,
+										leftValue: '',
+										typeValidation: 'strict',
+									},
+									conditions: [
+										{
+											leftValue: '',
+											rightValue: '',
+											operator: {
+												type: 'string',
+												operation: 'equals',
+											},
+										},
+									],
+									combinator: 'and',
+								},
+							},
+						],
+					},
+					displayOptions: {
+						show: {
+							mode: ['rules'],
+						},
+					},
+					options: [
+						{
+							name: 'values',
+							displayName: 'Values',
+							values: [
+								{
+									displayName: 'Conditions',
+									name: 'conditions',
+									placeholder: 'Add Condition',
+									type: 'filter',
+									default: {},
+									typeOptions: {
+										multipleValues: false,
+										filter: {
+											caseSensitive: '={{!$parameter.options.ignoreCase}}',
+											typeValidation:
+												'={{$parameter.options.looseTypeValidation ? "loose" : "strict"}}',
+										},
+									},
+								},
+								{
+									displayName: 'Rename Output',
+									name: 'renameOutput',
+									type: 'boolean',
+									default: false,
+								},
+								{
+									displayName: 'Output Name',
+									name: 'outputKey',
+									type: 'string',
+									default: '',
+									description: 'The label of output to which to send data to if rule matches',
+									displayOptions: {
+										show: {
+											renameOutput: [true],
+										},
+									},
+								},
+							],
+						},
+					],
+				},
+				{
+					displayName: 'Options',
+					name: 'options',
+					type: 'collection',
+					placeholder: 'Add Option',
+					default: {},
+					displayOptions: {
+						show: {
+							mode: ['rules'],
+						},
+					},
+					options: [
+						{
+							// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-options
+							displayName: 'Fallback Output',
+							name: 'fallbackOutput',
+							type: 'options',
+							typeOptions: {
+								loadOptionsDependsOn: ['rules.values', '/rules', '/rules.values'],
+								loadOptionsMethod: 'getFallbackOutputOptions',
+							},
+							default: 'none',
+							// eslint-disable-next-line n8n-nodes-base/node-param-description-wrong-for-dynamic-options
+							description:
+								'If no rule matches the item will be sent to this output, by default they will be ignored',
+						},
+						{
+							displayName: 'Ignore Case',
+							description: 'Whether to ignore letter case when evaluating conditions',
+							name: 'ignoreCase',
+							type: 'boolean',
+							default: true,
+						},
+						{
+							displayName: 'Less Strict Type Validation',
+							description: 'Whether to try casting value types based on the selected operator',
+							name: 'looseTypeValidation',
+							type: 'boolean',
+							default: true,
+						},
+						{
+							displayName: 'Rename Fallback Output',
+							name: 'renameFallbackOutput',
+							type: 'string',
+							placeholder: 'e.g. Fallback',
+							default: '',
+							displayOptions: {
+								show: {
+									fallbackOutput: ['extra'],
+								},
+							},
+						},
+						{
+							// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+							displayName: 'Send data to all matching outputs',
+							name: 'allMatchingOutputs',
+							type: 'boolean',
+							default: false,
+							description:
+								'Whether to send data to all outputs meeting conditions (and not just the first one)',
+						},
+					],
+				},
+			],
+		};
+	}
+
+	methods = {
+		loadOptions: {
+			async getFallbackOutputOptions(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const rules = (this.getCurrentNodeParameter('rules.values') as INodeParameters[]) ?? [];
+
+				const outputOptions: INodePropertyOptions[] = [
+					{
+						// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+						name: 'None (default)',
+						value: 'none',
+						description: 'Items will be ignored',
+					},
+					{
+						name: 'Extra Output',
+						value: 'extra',
+						description: 'Items will be sent to the extra, separate, output',
+					},
+				];
+
+				for (const [index, rule] of rules.entries()) {
+					outputOptions.push({
+						name: `Output ${rule.outputKey || index}`,
+						value: index,
+						description: `Items will be sent to the same output as when matched rule ${index + 1}`,
+					});
+				}
+
+				return outputOptions;
+			},
+		},
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		let returnData: INodeExecutionData[][] = [];
+
+		const items = this.getInputData();
+		const mode = this.getNodeParameter('mode', 0) as string;
+
+		const checkIndexRange = (returnDataLength: number, index: number, itemIndex = 0) => {
+			if (Number(index) === returnDataLength) {
+				throw new NodeOperationError(this.getNode(), `The ouput ${index} is not allowed. `, {
+					itemIndex,
+					description: `Output indexes are zero based, if you want to use the extra output use ${
+						index - 1
+					}`,
+				});
+			}
+			if (index < 0 || index > returnDataLength) {
+				throw new NodeOperationError(this.getNode(), `The ouput ${index} is not allowed`, {
+					itemIndex,
+					description: `It has to be between 0 and ${returnDataLength - 1}`,
+				});
+			}
+		};
+
+		itemLoop: for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
+			try {
+				const item = items[itemIndex];
+
+				item.pairedItem = { item: itemIndex };
+
+				if (mode === 'expression') {
+					const numberOutputs = this.getNodeParameter('numberOutputs', itemIndex) as number;
+					if (itemIndex === 0) {
+						returnData = new Array(numberOutputs).fill(0).map(() => []);
+					}
+					const outputIndex = this.getNodeParameter('output', itemIndex) as number;
+					checkIndexRange(returnData.length, outputIndex, itemIndex);
+
+					returnData[outputIndex].push(item);
+				} else if (mode === 'rules') {
+					const rules = this.getNodeParameter('rules.values', itemIndex, []) as INodeParameters[];
+					if (!rules.length) continue;
+					const options = this.getNodeParameter('options', itemIndex, {});
+					const fallbackOutput = options.fallbackOutput;
+
+					if (itemIndex === 0) {
+						returnData = new Array(rules.length).fill(0).map(() => []);
+
+						if (fallbackOutput === 'extra') {
+							returnData.push([]);
+						}
+					}
+
+					let matchFound = false;
+					for (const [ruleIndex, rule] of rules.entries()) {
+						let conditionPass;
+
+						try {
+							conditionPass = this.getNodeParameter(
+								`rules.values[${ruleIndex}].conditions`,
+								itemIndex,
+								false,
+								{
+									extractValue: true,
+								},
+							) as boolean;
+						} catch (error) {
+							if (!options.looseTypeValidation) {
+								error.description =
+									"Try changing the type of comparison. Alternatively you can enable 'Less Strict Type Validation' in the options.";
+							}
+							set(error, 'context.itemIndex', itemIndex);
+							set(error, 'node', this.getNode());
+							throw error;
+						}
+
+						if (conditionPass) {
+							matchFound = true;
+							checkIndexRange(returnData.length, rule.output as number, itemIndex);
+							returnData[ruleIndex].push(item);
+
+							if (!options.allMatchingOutputs) {
+								continue itemLoop;
+							}
+						}
+					}
+
+					if (fallbackOutput !== undefined && fallbackOutput !== 'none' && !matchFound) {
+						if (fallbackOutput === 'extra') {
+							returnData[returnData.length - 1].push(item);
+							continue;
+						}
+						checkIndexRange(returnData.length, fallbackOutput as number, itemIndex);
+						returnData[fallbackOutput as number].push(item);
+					}
+				}
+			} catch (error) {
+				if (this.continueOnFail()) {
+					returnData[0].push({ json: { error: error.message } });
+					continue;
+				}
+				throw new NodeOperationError(this.getNode(), error);
+			}
+		}
+
+		if (!returnData.length) return [[]];
+
+		return returnData;
+	}
+}
diff --git a/packages/nodes-base/nodes/Switch/V3/test/switch.expression.workflow.json b/packages/nodes-base/nodes/Switch/V3/test/switch.expression.workflow.json
new file mode 100644
index 0000000000000..ea910a554dce7
--- /dev/null
+++ b/packages/nodes-base/nodes/Switch/V3/test/switch.expression.workflow.json
@@ -0,0 +1,168 @@
+{
+  "name": "My workflow 64",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "58cc2d21-a8b1-424d-a8e4-e79d39955fa8",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        0,
+        620
+      ]
+    },
+    {
+      "parameters": {
+        "jsCode": "return [{\n  \"output\": \"third\",\n  \"text\": \"third output text\"\n}, {\n  \"output\": \"fourth\",\n  \"text\": \"fourth output text\"\n}, {\n  \"output\": \"first\",\n  \"text\": \"first output text\"\n}, {\n  \"output\": \"second\",\n  \"text\": \"second output text\"\n}]"
+      },
+      "id": "85adf7fc-2d33-49aa-b4bb-2000cce07ce0",
+      "name": "Code",
+      "type": "n8n-nodes-base.code",
+      "typeVersion": 2,
+      "position": [
+        220,
+        620
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "ebab0b65-6feb-416c-828e-ca5e766ea048",
+      "name": "No Operation, do nothing",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        760,
+        460
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "2f58a703-b7ae-4279-a60b-a0243af3b563",
+      "name": "No Operation, do nothing1",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        760,
+        620
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "b1d0b310-6edf-4a40-a66d-689078ddbf31",
+      "name": "No Operation, do nothing2",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        760,
+        780
+      ]
+    },
+    {
+      "parameters": {
+        "mode": "expression",
+        "numberOutputs": 3,
+        "output": "={{ Math.max(0, ['first', 'second', 'third'].indexOf( $json.output)) }}"
+      },
+      "id": "437e2c46-81d8-4c76-a036-db767576f55d",
+      "name": "Switch",
+      "type": "n8n-nodes-base.switch",
+      "typeVersion": 3,
+      "position": [
+        460,
+        620
+      ]
+    }
+  ],
+  "pinData": {
+    "No Operation, do nothing2": [
+      {
+        "json": {
+          "output": "third",
+          "text": "third output text"
+        }
+      }
+    ],
+    "No Operation, do nothing1": [
+      {
+        "json": {
+          "output": "second",
+          "text": "second output text"
+        }
+      }
+    ],
+    "No Operation, do nothing": [
+      {
+        "json": {
+          "output": "fourth",
+          "text": "fourth output text"
+        }
+      },
+      {
+        "json": {
+          "output": "first",
+          "text": "first output text"
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Code",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Code": {
+      "main": [
+        [
+          {
+            "node": "Switch",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Switch": {
+      "main": [
+        [
+          {
+            "node": "No Operation, do nothing",
+            "type": "main",
+            "index": 0
+          }
+        ],
+        [
+          {
+            "node": "No Operation, do nothing1",
+            "type": "main",
+            "index": 0
+          }
+        ],
+        [
+          {
+            "node": "No Operation, do nothing2",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "c72f2f9b-5089-42c2-8939-b70d9467a718",
+  "id": "1vDZkJN9SpYXu0Ic",
+  "meta": {
+    "instanceId": "b888bd11cd1ddbb95450babf3e199556799d999b896f650de768b8370ee50363"
+  },
+  "tags": []
+}
diff --git a/packages/nodes-base/nodes/Switch/V3/test/switch.node.test.ts b/packages/nodes-base/nodes/Switch/V3/test/switch.node.test.ts
new file mode 100644
index 0000000000000..ab506aa481df6
--- /dev/null
+++ b/packages/nodes-base/nodes/Switch/V3/test/switch.node.test.ts
@@ -0,0 +1,4 @@
+import { testWorkflows, getWorkflowFilenames } from '@test/nodes/Helpers';
+const workflows = getWorkflowFilenames(__dirname);
+
+describe('Execute Switch Node', () => testWorkflows(workflows));
diff --git a/packages/nodes-base/nodes/Switch/V3/test/switch.regex.workflow.json b/packages/nodes-base/nodes/Switch/V3/test/switch.regex.workflow.json
new file mode 100644
index 0000000000000..1876c5e233e33
--- /dev/null
+++ b/packages/nodes-base/nodes/Switch/V3/test/switch.regex.workflow.json
@@ -0,0 +1,371 @@
+{
+  "name": "Switch Regex Test",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "1301e15e-7a64-44bf-bc4b-d60e7b8c629a",
+      "name": "When clicking \"Test workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        780,
+        600
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "be9a3cd8-7c19-493c-aacf-a52aba064324",
+      "name": "Fallback",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        1680,
+        900
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "f7de5522-5750-4102-9b3b-0a01f7bbf6cc",
+      "name": "Output",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        1640,
+        320
+      ]
+    },
+    {
+      "parameters": {
+        "fields": {
+          "values": [
+            {
+              "name": "test",
+              "stringValue": "value"
+            }
+          ]
+        },
+        "options": {}
+      },
+      "id": "55af4400-ed88-4ee2-b654-3a82bd112875",
+      "name": "Edit Fields",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.2,
+      "position": [
+        1020,
+        600
+      ]
+    },
+    {
+      "parameters": {
+        "rules": {
+          "values": [
+            {
+              "conditions": {
+                "options": {
+                  "caseSensitive": true,
+                  "leftValue": "",
+                  "typeValidation": "strict"
+                },
+                "conditions": [
+                  {
+                    "id": "17eb6574-9578-4915-8365-772e08d2f06b",
+                    "leftValue": "={{ $json.test }}",
+                    "rightValue": "/^value$/g",
+                    "operator": {
+                      "type": "string",
+                      "operation": "notRegex"
+                    }
+                  }
+                ],
+                "combinator": "and"
+              }
+            }
+          ]
+        },
+        "options": {
+          "fallbackOutput": "extra"
+        }
+      },
+      "id": "06657954-6bcb-4d60-a659-5d3e5e3d093d",
+      "name": "NotMatch",
+      "type": "n8n-nodes-base.switch",
+      "typeVersion": 3,
+      "position": [
+        1320,
+        720
+      ],
+      "alwaysOutputData": false
+    },
+    {
+      "parameters": {
+        "rules": {
+          "values": [
+            {
+              "conditions": {
+                "options": {
+                  "caseSensitive": true,
+                  "leftValue": "",
+                  "typeValidation": "strict"
+                },
+                "conditions": [
+                  {
+                    "id": "17eb6574-9578-4915-8365-772e08d2f06b",
+                    "leftValue": "={{ $json.test }}",
+                    "rightValue": "/^value$/g",
+                    "operator": {
+                      "type": "string",
+                      "operation": "regex"
+                    }
+                  }
+                ],
+                "combinator": "and"
+              }
+            }
+          ]
+        },
+        "options": {
+          "fallbackOutput": "extra"
+        }
+      },
+      "id": "07776b86-1d7c-4435-b7d8-da73a01830cf",
+      "name": "Match",
+      "type": "n8n-nodes-base.switch",
+      "typeVersion": 3,
+      "position": [
+        1320,
+        340
+      ],
+      "alwaysOutputData": false
+    },
+    {
+      "parameters": {
+        "rules": {
+          "values": [
+            {
+              "conditions": {
+                "options": {
+                  "caseSensitive": true,
+                  "leftValue": "",
+                  "typeValidation": "strict"
+                },
+                "conditions": [
+                  {
+                    "id": "17eb6574-9578-4915-8365-772e08d2f06b",
+                    "leftValue": "={{ $json.test }}",
+                    "rightValue": "^value$",
+                    "operator": {
+                      "type": "string",
+                      "operation": "regex"
+                    }
+                  }
+                ],
+                "combinator": "and"
+              }
+            }
+          ]
+        },
+        "options": {
+          "fallbackOutput": "extra"
+        }
+      },
+      "id": "9fb71a7e-23aa-44f6-ae75-cfc4dc045b81",
+      "name": "Match1",
+      "type": "n8n-nodes-base.switch",
+      "typeVersion": 3,
+      "position": [
+        1320,
+        500
+      ],
+      "alwaysOutputData": false
+    },
+    {
+      "parameters": {
+        "rules": {
+          "values": [
+            {
+              "conditions": {
+                "options": {
+                  "caseSensitive": true,
+                  "leftValue": "",
+                  "typeValidation": "strict"
+                },
+                "conditions": [
+                  {
+                    "id": "17eb6574-9578-4915-8365-772e08d2f06b",
+                    "leftValue": "={{ $json.test }}",
+                    "rightValue": "^value$",
+                    "operator": {
+                      "type": "string",
+                      "operation": "notRegex"
+                    }
+                  }
+                ],
+                "combinator": "and"
+              }
+            }
+          ]
+        },
+        "options": {
+          "fallbackOutput": "extra"
+        }
+      },
+      "id": "555125fe-6509-4b68-8e3d-bf643f9b4d09",
+      "name": "NotMatch1",
+      "type": "n8n-nodes-base.switch",
+      "typeVersion": 3,
+      "position": [
+        1320,
+        880
+      ],
+      "alwaysOutputData": false
+    },
+    {
+      "parameters": {},
+      "id": "a8d5d282-cff3-4bbf-8293-67b1bbb08e2f",
+      "name": "Output1",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        1640,
+        480
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "3b7cf77e-f435-4863-a63d-db716cd27528",
+      "name": "Fallback1",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        1680,
+        740
+      ]
+    }
+  ],
+  "pinData": {
+    "Output": [
+      {
+        "json": {
+          "test": "value"
+        }
+      }
+    ],
+    "Fallback": [
+      {
+        "json": {
+          "test": "value"
+        }
+      }
+    ],
+    "Output1": [
+      {
+        "json": {
+          "test": "value"
+        }
+      }
+    ],
+    "Fallback1": [
+      {
+        "json": {
+          "test": "value"
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Test workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Edit Fields",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Edit Fields": {
+      "main": [
+        [
+          {
+            "node": "Match",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "NotMatch",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Match1",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "NotMatch1",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "NotMatch": {
+      "main": [
+        [],
+        [
+          {
+            "node": "Fallback1",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Match": {
+      "main": [
+        [
+          {
+            "node": "Output",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "NotMatch1": {
+      "main": [
+        [],
+        [
+          {
+            "node": "Fallback",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Match1": {
+      "main": [
+        [
+          {
+            "node": "Output1",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "1fdad78e-d569-48c8-bbb9-640e8889b8e3",
+  "meta": {
+    "templateCredsSetupCompleted": true,
+    "instanceId": "8c8c5237b8e37b006a7adce87f4369350c58e41f3ca9de16196d3197f69eabcd"
+  },
+  "id": "EbLiIKvBYzJvLtX3",
+  "tags": []
+}
diff --git a/packages/nodes-base/nodes/Switch/V3/test/switch.rules.workflow.json b/packages/nodes-base/nodes/Switch/V3/test/switch.rules.workflow.json
new file mode 100644
index 0000000000000..0cea4bcabd020
--- /dev/null
+++ b/packages/nodes-base/nodes/Switch/V3/test/switch.rules.workflow.json
@@ -0,0 +1,242 @@
+{
+  "name": "My workflow 64",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "2c6504d1-9412-4da5-bd51-e5f9d6a84721",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        -560,
+        620
+      ]
+    },
+    {
+      "parameters": {
+        "jsCode": "return [{\n  \"output\": \"third\",\n  \"text\": \"third output text\"\n}, {\n  \"output\": \"fourth\",\n  \"text\": \"fourth output text\"\n}, {\n  \"output\": \"first\",\n  \"text\": \"first output text\"\n}, {\n  \"output\": \"second\",\n  \"text\": \"second output text\"\n}]"
+      },
+      "id": "73d838de-89f2-476e-9dc8-a4dc59e4bdfb",
+      "name": "Code",
+      "type": "n8n-nodes-base.code",
+      "typeVersion": 2,
+      "position": [
+        -340,
+        620
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "d19a786e-e9fc-4480-af8a-c1abc9d9ef9a",
+      "name": "No Operation, do nothing",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        200,
+        460
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "82d5a7b9-6a29-4df8-823a-bd926f2000a9",
+      "name": "No Operation, do nothing1",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        200,
+        620
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "40276b8e-eaad-49bd-9271-cd82c6688f24",
+      "name": "No Operation, do nothing2",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        200,
+        780
+      ]
+    },
+    {
+      "parameters": {
+        "rules": {
+          "values": [
+            {
+              "conditions": {
+                "options": {
+                  "caseSensitive": true,
+                  "leftValue": "",
+                  "typeValidation": "strict"
+                },
+                "conditions": [
+                  {
+                    "leftValue": "={{ $json.output }}",
+                    "rightValue": "first",
+                    "operator": {
+                      "type": "string",
+                      "operation": "equals"
+                    }
+                  }
+                ],
+                "combinator": "and"
+              },
+              "renameOutput": true,
+              "outputKey": "First Output"
+            },
+            {
+              "conditions": {
+                "options": {
+                  "caseSensitive": true,
+                  "leftValue": "",
+                  "typeValidation": "strict"
+                },
+                "conditions": [
+                  {
+                    "id": "199d4f8c-1c92-48cd-99ad-e1da186ed54f",
+                    "leftValue": "={{ $json.output }}",
+                    "rightValue": "second",
+                    "operator": {
+                      "type": "string",
+                      "operation": "equals",
+                      "name": "filter.operator.equals"
+                    }
+                  }
+                ],
+                "combinator": "and"
+              },
+              "renameOutput": true,
+              "outputKey": "Second Output"
+            },
+            {
+              "conditions": {
+                "options": {
+                  "caseSensitive": true,
+                  "leftValue": "",
+                  "typeValidation": "strict"
+                },
+                "conditions": [
+                  {
+                    "id": "e894662a-7496-4df4-a084-7200c3192485",
+                    "leftValue": "={{ $json.output }}",
+                    "rightValue": "third",
+                    "operator": {
+                      "type": "string",
+                      "operation": "equals",
+                      "name": "filter.operator.equals"
+                    }
+                  }
+                ],
+                "combinator": "and"
+              },
+              "renameOutput": true,
+              "outputKey": "Third Output"
+            }
+          ]
+        },
+        "options": {
+          "fallbackOutput": 2
+        }
+      },
+      "id": "0c34bae5-89c8-4adb-bb38-092d5a0e349e",
+      "name": "Switch1",
+      "type": "n8n-nodes-base.switch",
+      "typeVersion": 3,
+      "position": [
+        -120,
+        620
+      ]
+    }
+  ],
+  "pinData": {
+    "No Operation, do nothing": [
+      {
+        "json": {
+          "output": "first",
+          "text": "first output text"
+        }
+      }
+    ],
+    "No Operation, do nothing1": [
+      {
+        "json": {
+          "output": "second",
+          "text": "second output text"
+        }
+      }
+    ],
+    "No Operation, do nothing2": [
+      {
+        "json": {
+          "output": "third",
+          "text": "third output text"
+        }
+      },
+      {
+        "json": {
+          "output": "fourth",
+          "text": "fourth output text"
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Code",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Code": {
+      "main": [
+        [
+          {
+            "node": "Switch1",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Switch1": {
+      "main": [
+        [
+          {
+            "node": "No Operation, do nothing",
+            "type": "main",
+            "index": 0
+          }
+        ],
+        [
+          {
+            "node": "No Operation, do nothing1",
+            "type": "main",
+            "index": 0
+          }
+        ],
+        [
+          {
+            "node": "No Operation, do nothing2",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "c9c4d7fd-b704-4664-8fde-d1c2414e68f0",
+  "id": "1vDZkJN9SpYXu0Ic",
+  "meta": {
+    "instanceId": "b888bd11cd1ddbb95450babf3e199556799d999b896f650de768b8370ee50363"
+  },
+  "tags": []
+}
diff --git a/packages/nodes-base/nodes/Switch/test/switch.node.test.ts b/packages/nodes-base/nodes/Switch/test/switch.node.test.ts
deleted file mode 100644
index 030f9fa24e4d2..0000000000000
--- a/packages/nodes-base/nodes/Switch/test/switch.node.test.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { testWorkflows, getWorkflowFilenames } from '../../../test/nodes/Helpers';
-const workflows = getWorkflowFilenames(__dirname);
-
-describe('Execute Switch Node', () => testWorkflows(workflows));
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/SyncroMspV1.node.ts b/packages/nodes-base/nodes/SyncroMSP/v1/SyncroMspV1.node.ts
index 07a17ef81a9a6..18f6568d04bdd 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/SyncroMspV1.node.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/SyncroMspV1.node.ts
@@ -51,6 +51,6 @@ export class SyncroMspV1 implements INodeType {
 	};
 
 	async execute(this: IExecuteFunctions) {
-		return router.call(this);
+		return await router.call(this);
 	}
 }
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 2b8dccbb51bd8..92652e7bace61 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/index.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/index.ts
@@ -1,11 +1,10 @@
+import type { INodeProperties } from 'n8n-workflow';
 import * as getAll from './getAll';
 import * as create from './create';
 import * as get from './get';
 import * as update from './update';
 import * as del from './del';
 
-import type { INodeProperties } from 'n8n-workflow';
-
 export { getAll, create, del as delete, update, get };
 
 export const descriptions = [
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 041c712a9629f..be3c8fd202e96 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/index.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/index.ts
@@ -1,11 +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 type { INodeProperties } from 'n8n-workflow';
-
 export { getAll, create, del as delete, update, get };
 
 export const descriptions = [
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 a8842a4af7e81..5eaeaf3ec30fa 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/index.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/index.ts
@@ -1,11 +1,10 @@
+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 mute from './mute';
 
-import type { INodeProperties } from 'n8n-workflow';
-
 export { getAll, get, mute, del as delete, create };
 
 export const descriptions = [
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/router.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/router.ts
index 1c3f18782b434..3b5a5b3210efb 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/router.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/router.ts
@@ -54,5 +54,5 @@ export async function router(this: IExecuteFunctions): Promise<INodeExecutionDat
 		}
 	}
 
-	return this.prepareOutputData(operationResult);
+	return [operationResult];
 }
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 ca2bcd6d78228..49dfc1d67c2b4 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/index.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/index.ts
@@ -1,11 +1,10 @@
+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 update from './update';
 
-import type { INodeProperties } from 'n8n-workflow';
-
 export { getAll, create, get, del as delete, update };
 
 export const descriptions = [
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/transport/index.ts b/packages/nodes-base/nodes/SyncroMSP/v1/transport/index.ts
index 32c9acf290d8b..13096d6962bca 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/transport/index.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/transport/index.ts
@@ -79,5 +79,5 @@ export async function validateCredentials(
 		url: `https://${subdomain}.syncromsp.com/api/v1//me`,
 	};
 
-	return this.helpers.request(options);
+	return await this.helpers.request(options);
 }
diff --git a/packages/nodes-base/nodes/Taiga/GenericFunctions.ts b/packages/nodes-base/nodes/Taiga/GenericFunctions.ts
index c787691bbf329..d01e36cdd4a21 100644
--- a/packages/nodes-base/nodes/Taiga/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Taiga/GenericFunctions.ts
@@ -1,26 +1,20 @@
-import type { OptionsWithUri } from 'request';
+import { createHash } from 'crypto';
 
 import type {
 	ICredentialDataDecryptedObject,
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	IWebhookFunctions,
 	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
-import { createHash } from 'crypto';
-
 export async function getAuthorization(
-	this:
-		| IHookFunctions
-		| IExecuteFunctions
-		| IExecuteSingleFunctions
-		| ILoadOptionsFunctions
-		| IWebhookFunctions,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
 	credentials?: ICredentialDataDecryptedObject,
 ): Promise<string> {
 	if (credentials === undefined) {
@@ -28,7 +22,7 @@ export async function getAuthorization(
 	}
 
 	const { password, username } = credentials;
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: { 'Content-Type': 'application/json' },
 		method: 'POST',
 		body: {
@@ -50,13 +44,8 @@ export async function getAuthorization(
 }
 
 export async function taigaApiRequest(
-	this:
-		| IHookFunctions
-		| IExecuteFunctions
-		| IExecuteSingleFunctions
-		| ILoadOptionsFunctions
-		| IWebhookFunctions,
-	method: string,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 	body = {},
 	query = {},
@@ -67,7 +56,7 @@ export async function taigaApiRequest(
 
 	const authToken = await getAuthorization.call(this, credentials);
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			'Content-Type': 'application/json',
 		},
@@ -97,7 +86,7 @@ export async function taigaApiRequest(
 
 export async function taigaApiRequestAllItems(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: IDataObject = {},
@@ -133,7 +122,7 @@ export function getAutomaticSecret(credentials: ICredentialDataDecryptedObject)
 
 export async function handleListing(
 	this: IExecuteFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject,
 	qs: IDataObject,
@@ -144,7 +133,7 @@ export async function handleListing(
 	const returnAll = this.getNodeParameter('returnAll', i);
 
 	if (returnAll) {
-		return taigaApiRequestAllItems.call(this, method, endpoint, body, qs);
+		return await taigaApiRequestAllItems.call(this, method, endpoint, body, qs);
 	} else {
 		qs.limit = this.getNodeParameter('limit', i);
 		responseData = await taigaApiRequestAllItems.call(this, method, endpoint, body, qs);
@@ -163,5 +152,5 @@ export function throwOnEmptyUpdate(this: IExecuteFunctions, resource: Resource)
 }
 
 export async function getVersionForUpdate(this: IExecuteFunctions, endpoint: string) {
-	return taigaApiRequest.call(this, 'GET', endpoint).then((response) => response.version);
+	return await taigaApiRequest.call(this, 'GET', endpoint).then((response) => response.version);
 }
diff --git a/packages/nodes-base/nodes/Taiga/Taiga.node.ts b/packages/nodes-base/nodes/Taiga/Taiga.node.ts
index 454d0ecac5f0a..d55864087ef1f 100644
--- a/packages/nodes-base/nodes/Taiga/Taiga.node.ts
+++ b/packages/nodes-base/nodes/Taiga/Taiga.node.ts
@@ -581,6 +581,6 @@ export class Taiga implements INodeType {
 			returnData.push(...executionData);
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Taiga/descriptions/EpicDescription.ts b/packages/nodes-base/nodes/Taiga/descriptions/EpicDescription.ts
index 313ef824943bc..c442ab07b6f7f 100644
--- a/packages/nodes-base/nodes/Taiga/descriptions/EpicDescription.ts
+++ b/packages/nodes-base/nodes/Taiga/descriptions/EpicDescription.ts
@@ -250,7 +250,7 @@ export const epicFields: INodeProperties[] = [
 		default: {},
 		options: [
 			{
-				displayName: 'Asignee Name or ID',
+				displayName: 'Assignee Name or ID',
 				name: 'assigned_to',
 				type: 'options',
 				typeOptions: {
diff --git a/packages/nodes-base/nodes/Taiga/descriptions/IssueDescription.ts b/packages/nodes-base/nodes/Taiga/descriptions/IssueDescription.ts
index 88bc54d7c8986..5a233f5660502 100644
--- a/packages/nodes-base/nodes/Taiga/descriptions/IssueDescription.ts
+++ b/packages/nodes-base/nodes/Taiga/descriptions/IssueDescription.ts
@@ -96,8 +96,7 @@ export const issueFields: INodeProperties[] = [
 		},
 		options: [
 			{
-				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-options
-				displayName: 'Asignee Name or ID',
+				displayName: 'Assignee Name or ID',
 				name: 'assigned_to',
 				type: 'options',
 				typeOptions: {
@@ -304,7 +303,7 @@ export const issueFields: INodeProperties[] = [
 		default: {},
 		options: [
 			{
-				displayName: 'Asignee Name or ID',
+				displayName: 'Assignee Name or ID',
 				name: 'assigned_to',
 				description:
 					'ID of the user to assign the issue to. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
@@ -495,7 +494,7 @@ export const issueFields: INodeProperties[] = [
 		},
 		options: [
 			{
-				displayName: 'Asignee Name or ID',
+				displayName: 'Assignee Name or ID',
 				name: 'assigned_to',
 				type: 'options',
 				typeOptions: {
diff --git a/packages/nodes-base/nodes/Taiga/descriptions/TaskDescription.ts b/packages/nodes-base/nodes/Taiga/descriptions/TaskDescription.ts
index 012d1e86f6d7f..fec8af90d6b87 100644
--- a/packages/nodes-base/nodes/Taiga/descriptions/TaskDescription.ts
+++ b/packages/nodes-base/nodes/Taiga/descriptions/TaskDescription.ts
@@ -96,7 +96,7 @@ export const taskFields: INodeProperties[] = [
 		},
 		options: [
 			{
-				displayName: 'Asignee Name or ID',
+				displayName: 'Assignee Name or ID',
 				name: 'assigned_to',
 				type: 'options',
 				typeOptions: {
@@ -299,7 +299,7 @@ export const taskFields: INodeProperties[] = [
 		default: {},
 		options: [
 			{
-				displayName: 'Asignee Name or ID',
+				displayName: 'Assignee Name or ID',
 				name: 'assigned_to',
 				type: 'options',
 				typeOptions: {
@@ -440,7 +440,7 @@ export const taskFields: INodeProperties[] = [
 		},
 		options: [
 			{
-				displayName: 'Asignee Name or ID',
+				displayName: 'Assignee Name or ID',
 				name: 'assigned_to',
 				type: 'options',
 				typeOptions: {
diff --git a/packages/nodes-base/nodes/Taiga/descriptions/UserStoryDescription.ts b/packages/nodes-base/nodes/Taiga/descriptions/UserStoryDescription.ts
index 00a2444e4ac9e..338bf6b72d799 100644
--- a/packages/nodes-base/nodes/Taiga/descriptions/UserStoryDescription.ts
+++ b/packages/nodes-base/nodes/Taiga/descriptions/UserStoryDescription.ts
@@ -96,7 +96,7 @@ export const userStoryFields: INodeProperties[] = [
 		},
 		options: [
 			{
-				displayName: 'Asignee Name or ID',
+				displayName: 'Assignee Name or ID',
 				name: 'assigned_to',
 				type: 'options',
 				typeOptions: {
@@ -310,7 +310,7 @@ export const userStoryFields: INodeProperties[] = [
 		default: {},
 		options: [
 			{
-				displayName: 'Asignee Name or ID',
+				displayName: 'Assignee Name or ID',
 				name: 'assigned_to',
 				description:
 					'ID of the user whom the user story is assigned to. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
@@ -446,7 +446,7 @@ export const userStoryFields: INodeProperties[] = [
 		},
 		options: [
 			{
-				displayName: 'Asignee Name or ID',
+				displayName: 'Assignee Name or ID',
 				name: 'assigned_to',
 				type: 'options',
 				typeOptions: {
diff --git a/packages/nodes-base/nodes/Taiga/taiga.svg b/packages/nodes-base/nodes/Taiga/taiga.svg
index 913a5d31df3fb..6aca2f991229a 100644
--- a/packages/nodes-base/nodes/Taiga/taiga.svg
+++ b/packages/nodes-base/nodes/Taiga/taiga.svg
@@ -1 +1 @@
-<svg width="2500" height="2500" viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMinYMin meet"><path d="M224.288 43.916l-11.963 84.2-84.2-11.963 11.963-84.2 84.2 11.963z" opacity=".8" fill="#A295AE"/><path d="M31.885 212.291l11.963-84.2 84.2 11.963-11.963 84.2-84.2-11.963z" opacity=".8" fill="#5D6F6D"/><path d="M43.848 32.065l84.2 11.962-11.963 84.2-84.2-11.963 11.963-84.2z" opacity=".8" fill="#8CD592"/><path d="M212.226 224.264l-84.2-11.963 11.963-84.2 84.2 11.963-11.963 84.2z" opacity=".8" fill="#665E74"/><path d="M119.642 255.595l-51.08-67.997 67.998-51.08 51.08 67.998-67.998 51.08z" opacity=".8" fill="#3C3647"/><path d="M255.463 136.39l-67.997 51.079-51.08-67.997 67.998-51.08 51.08 67.998z" opacity=".8" fill="#837193"/><path d="M136.437.554l51.079 67.997-67.997 51.08-51.08-67.998L136.437.553z" opacity=".8" fill="#A2F4AC"/><path d="M.463 119.7l67.998-51.08 51.079 67.998-67.997 51.08L.463 119.7z" opacity=".8" fill="#7EA685"/><path d="M127.963 95.742l32.332 32.333-32.332 32.332-32.332-32.332 32.332-32.333z" fill="#3C3647"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="2500" height="2500" preserveAspectRatio="xMinYMin meet" viewBox="0 0 256 256"><path fill="#A295AE" d="m224.288 43.916-11.963 84.2-84.2-11.963 11.963-84.2z" opacity=".8"/><path fill="#5D6F6D" d="m31.885 212.291 11.963-84.2 84.2 11.963-11.963 84.2z" opacity=".8"/><path fill="#8CD592" d="m43.848 32.065 84.2 11.962-11.963 84.2-84.2-11.963z" opacity=".8"/><path fill="#665E74" d="m212.226 224.264-84.2-11.963 11.963-84.2 84.2 11.963z" opacity=".8"/><path fill="#3C3647" d="m119.642 255.595-51.08-67.997 67.998-51.08 51.08 67.998-67.998 51.08z" opacity=".8"/><path fill="#837193" d="m255.463 136.39-67.997 51.079-51.08-67.997 67.998-51.08 51.08 67.998z" opacity=".8"/><path fill="#A2F4AC" d="m136.437.554 51.079 67.997-67.997 51.08-51.08-67.998L136.437.553z" opacity=".8"/><path fill="#7EA685" d="m.463 119.7 67.998-51.08 51.079 67.998-67.997 51.08z" opacity=".8"/><path fill="#3C3647" d="m127.963 95.742 32.332 32.333-32.332 32.332-32.332-32.332z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Taiga/types.d.ts b/packages/nodes-base/nodes/Taiga/types.ts
similarity index 100%
rename from packages/nodes-base/nodes/Taiga/types.d.ts
rename to packages/nodes-base/nodes/Taiga/types.ts
diff --git a/packages/nodes-base/nodes/Tapfiliate/GenericFunctions.ts b/packages/nodes-base/nodes/Tapfiliate/GenericFunctions.ts
index e96b69c37593e..5c8a836926db2 100644
--- a/packages/nodes-base/nodes/Tapfiliate/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Tapfiliate/GenericFunctions.ts
@@ -1,18 +1,17 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	JsonObject,
+	IRequestOptions,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function tapfiliateApiRequest(
-	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: IDataObject = {},
@@ -22,7 +21,7 @@ export async function tapfiliateApiRequest(
 ) {
 	const credentials = await this.getCredentials('tapfiliateApi');
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			'Api-Key': credentials.apiKey,
 		},
@@ -49,7 +48,7 @@ export async function tapfiliateApiRequest(
 
 export async function tapfiliateApiRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: IDataObject = {},
diff --git a/packages/nodes-base/nodes/Tapfiliate/Tapfiliate.node.ts b/packages/nodes-base/nodes/Tapfiliate/Tapfiliate.node.ts
index a11bdf6c139a0..95542ce3f0b01 100644
--- a/packages/nodes-base/nodes/Tapfiliate/Tapfiliate.node.ts
+++ b/packages/nodes-base/nodes/Tapfiliate/Tapfiliate.node.ts
@@ -313,6 +313,6 @@ export class Tapfiliate implements INodeType {
 				throw error;
 			}
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Tapfiliate/tapfiliate.svg b/packages/nodes-base/nodes/Tapfiliate/tapfiliate.svg
index 6ea919ed39a8b..bb7a3b72d367c 100644
--- a/packages/nodes-base/nodes/Tapfiliate/tapfiliate.svg
+++ b/packages/nodes-base/nodes/Tapfiliate/tapfiliate.svg
@@ -1 +1 @@
-<svg width="900" height="900" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient x1="2.037%" y1="113.141%" x2="106.275%" y2="-7.854%" id="a"><stop stop-color="#2FDFBF" offset="0%"/><stop stop-color="#2FDFBF" offset="0%"/><stop stop-color="#2F74FF" offset="100%"/></linearGradient></defs><path d="M900 289.19c0-113.514-67.164-221.622-178.657-267.568C685.075 6.757 647.463 0 609.851 0 552.09 0 495.67 17.568 448.657 48.649 402.985 17.568 347.91 0 288.806 0c-20.15 0-41.642 2.703-63.134 6.757C118.209 29.73 32.239 113.514 6.716 220.27v2.703C2.686 241.892 0 262.163 0 281.081 0 322.973 9.403 363.514 24.18 400l145.074 363.514c21.492 55.405 64.477 101.35 123.582 122.972 21.492 8.109 42.985 12.163 65.82 13.514h502.389l-90-239.19L878.507 400C891.94 363.514 900 325.676 900 289.19zm-804.627-8.11c0-12.162 1.343-25.676 4.03-37.838v-2.702c16.12-68.92 75.224-127.027 145.075-140.541 14.776-2.703 29.552-4.054 42.985-4.054 32.238 0 61.79 8.108 88.656 21.622-13.432 18.918-25.522 37.837-34.925 60.81L188.06 556.757l-76.567-191.892c-9.403-28.379-16.12-56.757-16.12-83.784zm693.134 82.433L666.27 659.459l55.074 145.946H362.687c-12.09 0-24.18-2.702-36.27-8.108-48.357-17.567-76.566-63.513-76.566-110.81 0-13.514 2.686-28.379 8.06-43.244l173.283-428.378c30.896-74.324 103.433-118.92 180-118.92 24.18 0 49.702 4.055 73.88 14.866 75.225 31.08 119.553 102.703 119.553 178.378-1.343 24.325-5.373 50-16.12 74.325z" fill="url(#a)"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="900" height="900"><defs><linearGradient id="a" x1="2.037%" x2="106.275%" y1="113.141%" y2="-7.854%"><stop offset="0%" stop-color="#2FDFBF"/><stop offset="0%" stop-color="#2FDFBF"/><stop offset="100%" stop-color="#2F74FF"/></linearGradient></defs><path fill="url(#a)" d="M900 289.19c0-113.514-67.164-221.622-178.657-267.568C685.075 6.757 647.463 0 609.851 0 552.09 0 495.67 17.568 448.657 48.649 402.985 17.568 347.91 0 288.806 0c-20.15 0-41.642 2.703-63.134 6.757C118.209 29.73 32.239 113.514 6.716 220.27v2.703C2.686 241.892 0 262.163 0 281.081 0 322.973 9.403 363.514 24.18 400l145.074 363.514c21.492 55.405 64.477 101.35 123.582 122.972 21.492 8.109 42.985 12.163 65.82 13.514h502.389l-90-239.19L878.507 400C891.94 363.514 900 325.676 900 289.19m-804.627-8.11c0-12.162 1.343-25.676 4.03-37.838v-2.702c16.12-68.92 75.224-127.027 145.075-140.541 14.776-2.703 29.552-4.054 42.985-4.054 32.238 0 61.79 8.108 88.656 21.622-13.432 18.918-25.522 37.837-34.925 60.81L188.06 556.757l-76.567-191.892c-9.403-28.379-16.12-56.757-16.12-83.784zm693.134 82.433L666.27 659.459l55.074 145.946H362.687q-18.135 0-36.27-8.108c-48.357-17.567-76.566-63.513-76.566-110.81 0-13.514 2.686-28.379 8.06-43.244l173.283-428.378c30.896-74.324 103.433-118.92 180-118.92 24.18 0 49.702 4.055 73.88 14.866 75.225 31.08 119.553 102.703 119.553 178.378-1.343 24.325-5.373 50-16.12 74.325z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Telegram/GenericFunctions.ts b/packages/nodes-base/nodes/Telegram/GenericFunctions.ts
index d12215f68ff7f..473709d7ace90 100644
--- a/packages/nodes-base/nodes/Telegram/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Telegram/GenericFunctions.ts
@@ -1,10 +1,10 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
 	IHookFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
+	IRequestOptions,
 	IWebhookFunctions,
 	JsonObject,
 } from 'n8n-workflow';
@@ -64,12 +64,59 @@ export interface IMarkupReplyKeyboardRemove {
  * @param {IDataObject} body The body object to add fields to
  * @param {number} index The index of the item
  */
-export function addAdditionalFields(this: IExecuteFunctions, body: IDataObject, index: number) {
+export function addAdditionalFields(
+	this: IExecuteFunctions,
+	body: IDataObject,
+	index: number,
+	nodeVersion?: number,
+	instanceId?: string,
+) {
+	const operation = this.getNodeParameter('operation', index);
+
 	// Add the additional fields
 	const additionalFields = this.getNodeParameter('additionalFields', index);
-	Object.assign(body, additionalFields);
 
-	const operation = this.getNodeParameter('operation', index);
+	if (operation === 'sendMessage') {
+		const attributionText = 'This message was sent automatically with ';
+		const link = `https://n8n.io/?utm_source=n8n-internal&utm_medium=powered_by&utm_campaign=${encodeURIComponent(
+			'n8n-nodes-base.telegram',
+		)}${instanceId ? '_' + instanceId : ''}`;
+
+		if (nodeVersion && nodeVersion >= 1.1 && additionalFields.appendAttribution === undefined) {
+			additionalFields.appendAttribution = true;
+		}
+
+		if (!additionalFields.parse_mode) {
+			additionalFields.parse_mode = 'Markdown';
+		}
+
+		const regex = /(https?|ftp|file):\/\/\S+|www\.\S+|\S+\.\S+/;
+		const containsUrl = regex.test(body.text as string);
+
+		if (!containsUrl) {
+			body.disable_web_page_preview = true;
+		}
+
+		if (additionalFields.appendAttribution) {
+			if (additionalFields.parse_mode === 'Markdown') {
+				body.text = `${body.text}\n\n_${attributionText}_[n8n](${link})`;
+			} else if (additionalFields.parse_mode === 'HTML') {
+				body.text = `${body.text}\n\n<em>${attributionText}</em><a href="${link}" target="_blank">n8n</a>`;
+			}
+		}
+
+		if (
+			nodeVersion &&
+			nodeVersion >= 1.2 &&
+			additionalFields.disable_web_page_preview === undefined
+		) {
+			body.disable_web_page_preview = true;
+		}
+
+		delete additionalFields.appendAttribution;
+	}
+
+	Object.assign(body, additionalFields);
 
 	// Add the reply markup
 	let replyMarkupOption = '';
@@ -100,7 +147,7 @@ export function addAdditionalFields(this: IExecuteFunctions, body: IDataObject,
 		if (keyboardData.rows !== undefined) {
 			for (const row of keyboardData.rows) {
 				const sendRows: ITelegramKeyboardButton[] = [];
-				if (row.row === undefined || row.row.buttons === undefined) {
+				if (row.row?.buttons === undefined) {
 					continue;
 				}
 				for (const button of row.row.buttons) {
@@ -142,7 +189,7 @@ export function addAdditionalFields(this: IExecuteFunctions, body: IDataObject,
  */
 export async function apiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject,
 	query?: IDataObject,
@@ -152,7 +199,7 @@ export async function apiRequest(
 
 	query = query || {};
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {},
 		method,
 		uri: `https://api.telegram.org/bot${credentials.accessToken}/${endpoint}`,
@@ -196,3 +243,9 @@ export function getImageBySize(photos: IDataObject[], size: string): IDataObject
 export function getPropertyName(operation: string) {
 	return operation.replace('send', '').toLowerCase();
 }
+
+export function getSecretToken(this: IHookFunctions | IWebhookFunctions) {
+	// Only characters A-Z, a-z, 0-9, _ and - are allowed.
+	const secret_token = `${this.getWorkflow().id}_${this.getNode().id}`;
+	return secret_token.replace(/[^a-zA-Z0-9\_\-]+/g, '');
+}
diff --git a/packages/nodes-base/nodes/Telegram/Telegram.node.ts b/packages/nodes-base/nodes/Telegram/Telegram.node.ts
index 1773926cf96a8..4790ad2ce20f7 100644
--- a/packages/nodes-base/nodes/Telegram/Telegram.node.ts
+++ b/packages/nodes-base/nodes/Telegram/Telegram.node.ts
@@ -6,6 +6,7 @@ import type {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { BINARY_ENCODING, NodeOperationError } from 'n8n-workflow';
 
@@ -17,7 +18,7 @@ export class Telegram implements INodeType {
 		name: 'telegram',
 		icon: 'file:telegram.svg',
 		group: ['output'],
-		version: 1,
+		version: [1, 1.1, 1.2],
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
 		description: 'Sends data to Telegram',
 		defaults: {
@@ -688,7 +689,7 @@ export class Telegram implements INodeType {
 			// ----------------------------------
 
 			{
-				displayName: 'Binary Data',
+				displayName: 'Binary File',
 				name: 'binaryData',
 				type: 'boolean',
 				default: false,
@@ -709,11 +710,12 @@ export class Telegram implements INodeType {
 				description: 'Whether the data to upload should be taken from binary field',
 			},
 			{
-				displayName: 'Binary Property',
+				displayName: 'Input Binary Field',
 				name: 'binaryPropertyName',
 				type: 'string',
 				default: 'data',
 				required: true,
+				hint: 'The name of the input binary field containing the file to be written',
 				displayOptions: {
 					show: {
 						operation: [
@@ -1022,9 +1024,13 @@ export class Telegram implements INodeType {
 										type: 'options',
 										options: [
 											{
-												name: 'Markdown',
+												name: 'Markdown (Legacy)',
 												value: 'Markdown',
 											},
+											{
+												name: 'MarkdownV2',
+												value: 'MarkdownV2',
+											},
 											{
 												name: 'HTML',
 												value: 'HTML',
@@ -1461,6 +1467,20 @@ export class Telegram implements INodeType {
 				},
 				default: {},
 				options: [
+					{
+						// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+						displayName: 'Append n8n Attribution',
+						name: 'appendAttribution',
+						type: 'boolean',
+						default: true,
+						description:
+							'Whether to include the phrase “This message was sent automatically with n8n” to the end of the message',
+						displayOptions: {
+							show: {
+								'/operation': ['sendMessage'],
+							},
+						},
+					},
 					{
 						displayName: 'Caption',
 						name: 'caption',
@@ -1561,9 +1581,13 @@ export class Telegram implements INodeType {
 						type: 'options',
 						options: [
 							{
-								name: 'Markdown',
+								name: 'Markdown (Legacy)',
 								value: 'Markdown',
 							},
+							{
+								name: 'MarkdownV2',
+								value: 'MarkdownV2',
+							},
 							{
 								name: 'HTML',
 								value: 'HTML',
@@ -1609,6 +1633,29 @@ export class Telegram implements INodeType {
 						default: 0,
 						description: 'If the message is a reply, ID of the original message',
 					},
+					{
+						displayName: 'Message Thread ID',
+						name: 'message_thread_id',
+						type: 'number',
+						displayOptions: {
+							show: {
+								'/operation': [
+									'sendAnimation',
+									'sendAudio',
+									'sendChatAction',
+									'sendDocument',
+									'sendLocation',
+									'sendMediaGroup',
+									'sendMessage',
+									'sendPhoto',
+									'sendSticker',
+									'sendVideo',
+								],
+							},
+						},
+						default: 0,
+						description: 'The unique identifier of the forum topic',
+					},
 					{
 						displayName: 'Title',
 						name: 'title',
@@ -1663,13 +1710,16 @@ export class Telegram implements INodeType {
 		// For Query string
 		let qs: IDataObject;
 
-		let requestMethod: string;
+		let requestMethod: IHttpRequestMethods;
 		let endpoint: string;
 
 		const operation = this.getNodeParameter('operation', 0);
 		const resource = this.getNodeParameter('resource', 0);
 		const binaryData = this.getNodeParameter('binaryData', 0, false);
 
+		const nodeVersion = this.getNode().typeVersion;
+		const instanceId = this.getInstanceId();
+
 		for (let i = 0; i < items.length; i++) {
 			try {
 				// Reset all values
@@ -1894,7 +1944,7 @@ export class Telegram implements INodeType {
 						body.text = this.getNodeParameter('text', i) as string;
 
 						// Add additional fields and replyMarkup
-						addAdditionalFields.call(this, body, i);
+						addAdditionalFields.call(this, body, i, nodeVersion, instanceId);
 					} else if (operation === 'sendMediaGroup') {
 						// ----------------------------------
 						//         message:sendMediaGroup
@@ -1982,7 +2032,7 @@ export class Telegram implements INodeType {
 
 					let uploadData: Buffer | Readable;
 					if (itemBinaryData.id) {
-						uploadData = this.helpers.getBinaryStream(itemBinaryData.id);
+						uploadData = await this.helpers.getBinaryStream(itemBinaryData.id);
 					} else {
 						uploadData = Buffer.from(itemBinaryData.data, BINARY_ENCODING);
 					}
@@ -2060,6 +2110,6 @@ export class Telegram implements INodeType {
 			}
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Telegram/TelegramTrigger.node.ts b/packages/nodes-base/nodes/Telegram/TelegramTrigger.node.ts
index ee1252fe153bf..5f1a9f21d53ea 100644
--- a/packages/nodes-base/nodes/Telegram/TelegramTrigger.node.ts
+++ b/packages/nodes-base/nodes/Telegram/TelegramTrigger.node.ts
@@ -7,7 +7,7 @@ import type {
 	IWebhookResponseData,
 } from 'n8n-workflow';
 
-import { apiRequest, getImageBySize } from './GenericFunctions';
+import { apiRequest, getImageBySize, getSecretToken } from './GenericFunctions';
 
 import type { IEvent } from './IEvent';
 
@@ -17,7 +17,8 @@ export class TelegramTrigger implements INodeType {
 		name: 'telegramTrigger',
 		icon: 'file:telegram.svg',
 		group: ['trigger'],
-		version: 1,
+		version: [1, 1.1],
+		defaultVersion: 1.1,
 		subtitle: '=Updates: {{$parameter["updates"].join(", ")}}',
 		description: 'Starts the workflow on a Telegram update',
 		defaults: {
@@ -40,6 +41,13 @@ export class TelegramTrigger implements INodeType {
 			},
 		],
 		properties: [
+			{
+				displayName:
+					'Due to Telegram API limitations, you can use just one Telegram trigger for each bot at a time',
+				name: 'telegramTriggerNotice',
+				type: 'notice',
+				default: '',
+			},
 			{
 				displayName: 'Trigger On',
 				name: 'updates',
@@ -182,15 +190,18 @@ export class TelegramTrigger implements INodeType {
 
 				let allowedUpdates = this.getNodeParameter('updates') as string[];
 
-				if (allowedUpdates.includes('*')) {
+				if ((allowedUpdates || []).includes('*')) {
 					allowedUpdates = [];
 				}
 
 				const endpoint = 'setWebhook';
 
+				const secret_token = getSecretToken.call(this);
+
 				const body = {
 					url: webhookUrl,
 					allowed_updates: allowedUpdates,
+					secret_token,
 				};
 
 				await apiRequest.call(this, 'POST', endpoint, body);
@@ -216,6 +227,19 @@ export class TelegramTrigger implements INodeType {
 		const credentials = await this.getCredentials('telegramApi');
 
 		const bodyData = this.getBodyData() as IEvent;
+		const headerData = this.getHeaderData();
+
+		const nodeVersion = this.getNode().typeVersion;
+		if (nodeVersion > 1) {
+			const secret = getSecretToken.call(this);
+			if (secret !== headerData['x-telegram-bot-api-secret-token']) {
+				const res = this.getResponseObject();
+				res.status(403).json({ message: 'Provided secret is not valid' });
+				return {
+					noWebhookResponse: true,
+				};
+			}
+		}
 
 		const additionalFields = this.getNodeParameter('additionalFields') as IDataObject;
 
diff --git a/packages/nodes-base/nodes/Telegram/telegram.svg b/packages/nodes-base/nodes/Telegram/telegram.svg
index 71696476212a9..d070edee6bb75 100644
--- a/packages/nodes-base/nodes/Telegram/telegram.svg
+++ b/packages/nodes-base/nodes/Telegram/telegram.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 66 66" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><g stroke="none" fill-rule="nonzero"><path d="M0 32c0 17.673 14.327 32 32 32s32-14.327 32-32S49.673 0 32 0 0 14.327 0 32" fill="#37aee2"/><path d="M21.661 34.338l3.797 10.508s.475.983.983.983 8.068-7.864 8.068-7.864l8.407-16.237-21.119 9.898z" fill="#c8daea"/><path d="M26.695 37.034l-.729 7.746s-.305 2.373 2.068 0l4.644-4.203" fill="#a9c6d8"/><path d="M21.73 34.712l-7.809-2.545s-.932-.378-.633-1.237c.062-.177.186-.328.559-.588 1.731-1.206 32.028-12.096 32.028-12.096s.856-.288 1.361-.097c.231.088.378.187.503.548.045.132.071.411.068.689-.003.201-.027.386-.045.678-.184 2.978-5.706 25.198-5.706 25.198s-.33 1.3-1.514 1.345c-.432.016-.956-.071-1.582-.61-2.323-1.998-10.352-7.394-12.126-8.58a.34.34 0 01-.146-.239c-.025-.125.108-.28.108-.28s13.98-12.427 14.352-13.731c.029-.101-.079-.151-.226-.107-.929.342-17.025 10.506-18.801 11.629-.104.066-.395.023-.395.023"/></g></symbol></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round" viewBox="0 0 66 66"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><g fill-rule="nonzero" stroke="none"><path fill="#37aee2" d="M0 32c0 17.673 14.327 32 32 32s32-14.327 32-32S49.673 0 32 0 0 14.327 0 32"/><path fill="#c8daea" d="m21.661 34.338 3.797 10.508s.475.983.983.983 8.068-7.864 8.068-7.864l8.407-16.237-21.119 9.898z"/><path fill="#a9c6d8" d="m26.695 37.034-.729 7.746s-.305 2.373 2.068 0l4.644-4.203"/><path d="m21.73 34.712-7.809-2.545s-.932-.378-.633-1.237c.062-.177.186-.328.559-.588 1.731-1.206 32.028-12.096 32.028-12.096s.856-.288 1.361-.097c.231.088.378.187.503.548.045.132.071.411.068.689-.003.201-.027.386-.045.678-.184 2.978-5.706 25.198-5.706 25.198s-.33 1.3-1.514 1.345c-.432.016-.956-.071-1.582-.61-2.323-1.998-10.352-7.394-12.126-8.58a.34.34 0 0 1-.146-.239c-.025-.125.108-.28.108-.28s13.98-12.427 14.352-13.731c.029-.101-.079-.151-.226-.107-.929.342-17.025 10.506-18.801 11.629-.104.066-.395.023-.395.023"/></g></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/TheHive/GenericFunctions.ts b/packages/nodes-base/nodes/TheHive/GenericFunctions.ts
index fab2dc8612198..ab9a4cd445830 100644
--- a/packages/nodes-base/nodes/TheHive/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/TheHive/GenericFunctions.ts
@@ -1,19 +1,19 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IExecuteFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	IDataObject,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
-import { jsonParse } from 'n8n-workflow';
+import { ApplicationError, jsonParse } from 'n8n-workflow';
 
-import moment from 'moment';
+import moment from 'moment-timezone';
 import { Eq } from './QueryFunctions';
 
 export async function theHiveApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 	body: IDataObject = {},
 	query: IDataObject = {},
@@ -22,7 +22,7 @@ export async function theHiveApiRequest(
 ) {
 	const credentials = await this.getCredentials('theHiveApi');
 
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		method,
 		qs: query,
 		uri: uri || `${credentials.url}/api${resource}`,
@@ -42,7 +42,7 @@ export async function theHiveApiRequest(
 	if (Object.keys(query).length === 0) {
 		delete options.qs;
 	}
-	return this.helpers.requestWithAuthentication.call(this, 'theHiveApi', options);
+	return await this.helpers.requestWithAuthentication.call(this, 'theHiveApi', options);
 }
 
 // Helpers functions
@@ -79,7 +79,7 @@ export function prepareOptional(optionals: IDataObject): IDataObject {
 				try {
 					response[key] = jsonParse(optionals[key] as string);
 				} catch (error) {
-					throw new Error('Invalid JSON for artifacts');
+					throw new ApplicationError('Invalid JSON for artifacts', { level: 'warning' });
 				}
 			} else if (key === 'tags') {
 				response[key] = splitTags(optionals[key] as string);
@@ -107,7 +107,7 @@ export async function prepareCustomFields(
 			try {
 				customFieldsJson = jsonParse(customFieldsJson);
 			} catch (error) {
-				throw new Error('Invalid JSON for customFields');
+				throw new ApplicationError('Invalid JSON for customFields', { level: 'warning' });
 			}
 		}
 
@@ -119,7 +119,7 @@ export async function prepareCustomFields(
 
 			return customFields;
 		} else if (customFieldsJson) {
-			throw Error('customFieldsJson value is invalid');
+			throw new ApplicationError('customFieldsJson value is invalid', { level: 'warning' });
 		}
 	} else if (additionalFields.customFieldsUi) {
 		// Get Custom Field Types from TheHive
diff --git a/packages/nodes-base/nodes/TheHive/QueryFunctions.ts b/packages/nodes-base/nodes/TheHive/QueryFunctions.ts
index 7bb5a4f604aed..40b74d8865904 100644
--- a/packages/nodes-base/nodes/TheHive/QueryFunctions.ts
+++ b/packages/nodes-base/nodes/TheHive/QueryFunctions.ts
@@ -14,7 +14,6 @@ export declare type queryIndexSignature =
 	| '_id'
 	| '_between'
 	| '_parent'
-	| '_parent'
 	| '_child'
 	| '_type'
 	| '_string'
diff --git a/packages/nodes-base/nodes/TheHive/TheHive.node.json b/packages/nodes-base/nodes/TheHive/TheHive.node.json
index b59545df9c024..7a20277c7573c 100644
--- a/packages/nodes-base/nodes/TheHive/TheHive.node.json
+++ b/packages/nodes-base/nodes/TheHive/TheHive.node.json
@@ -6,7 +6,7 @@
 	"resources": {
 		"credentialDocumentation": [
 			{
-				"url": "https://docs.n8n.io/credentials/theHive"
+				"url": "https://docs.n8n.io/integrations/builtin/credentials/thehive/"
 			}
 		],
 		"primaryDocumentation": [
diff --git a/packages/nodes-base/nodes/TheHive/TheHive.node.ts b/packages/nodes-base/nodes/TheHive/TheHive.node.ts
index 4a89fadafc8b1..8b37019c8984f 100644
--- a/packages/nodes-base/nodes/TheHive/TheHive.node.ts
+++ b/packages/nodes-base/nodes/TheHive/TheHive.node.ts
@@ -2,6 +2,7 @@
 import type {
 	IDataObject,
 	IExecuteFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
 	INodeParameters,
@@ -10,6 +11,7 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
+import set from 'lodash/set';
 import { alertFields, alertOperations } from './descriptions/AlertDescription';
 
 import { observableFields, observableOperations } from './descriptions/ObservableDescription';
@@ -34,8 +36,6 @@ import {
 	theHiveApiRequest,
 } from './GenericFunctions';
 
-import set from 'lodash.set';
-
 export class TheHive implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'TheHive',
@@ -544,7 +544,7 @@ export class TheHive implements INodeType {
 
 						let endpoint;
 
-						let method;
+						let method: IHttpRequestMethods;
 
 						let body: IDataObject = {};
 
@@ -904,7 +904,7 @@ export class TheHive implements INodeType {
 
 						let endpoint;
 
-						let method;
+						let method: IHttpRequestMethods;
 
 						let body: IDataObject = {};
 
@@ -945,7 +945,7 @@ export class TheHive implements INodeType {
 
 						let endpoint;
 
-						let method;
+						let method: IHttpRequestMethods;
 
 						let body: IDataObject = {};
 
@@ -1043,7 +1043,7 @@ export class TheHive implements INodeType {
 
 						let endpoint;
 
-						let method;
+						let method: IHttpRequestMethods;
 
 						let body: IDataObject = {};
 
@@ -1251,7 +1251,7 @@ export class TheHive implements INodeType {
 
 						let endpoint;
 
-						let method;
+						let method: IHttpRequestMethods;
 
 						let body: IDataObject = {};
 
@@ -1317,7 +1317,7 @@ export class TheHive implements INodeType {
 
 						let endpoint;
 
-						let method;
+						let method: IHttpRequestMethods;
 
 						let body: IDataObject = {};
 
@@ -1500,7 +1500,7 @@ export class TheHive implements INodeType {
 
 						let endpoint;
 
-						let method;
+						let method: IHttpRequestMethods;
 
 						let body: IDataObject = {};
 
@@ -1542,7 +1542,7 @@ export class TheHive implements INodeType {
 
 						let endpoint;
 
-						let method;
+						let method: IHttpRequestMethods;
 
 						let body: IDataObject = {};
 
@@ -1624,7 +1624,7 @@ export class TheHive implements INodeType {
 
 						let endpoint;
 
-						let method;
+						let method: IHttpRequestMethods;
 
 						let body: IDataObject = {};
 
@@ -1796,7 +1796,7 @@ export class TheHive implements INodeType {
 
 						let endpoint;
 
-						let method;
+						let method: IHttpRequestMethods;
 
 						let body: IDataObject = {};
 
@@ -1837,7 +1837,7 @@ export class TheHive implements INodeType {
 
 						let endpoint;
 
-						let method;
+						let method: IHttpRequestMethods;
 
 						let body: IDataObject = {};
 
@@ -1903,6 +1903,6 @@ export class TheHive implements INodeType {
 				throw error;
 			}
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/TheHive/TheHiveTrigger.node.ts b/packages/nodes-base/nodes/TheHive/TheHiveTrigger.node.ts
index d293d40348355..a3e7b8e5e18f3 100644
--- a/packages/nodes-base/nodes/TheHive/TheHiveTrigger.node.ts
+++ b/packages/nodes-base/nodes/TheHive/TheHiveTrigger.node.ts
@@ -29,7 +29,16 @@ export class TheHiveTrigger implements INodeType {
 				path: 'webhook',
 			},
 		],
-		properties: [...eventsDescription],
+		properties: [
+			{
+				displayName:
+					'You must set up the webhook in TheHive — instructions <a href="https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.thehivetrigger/#configure-a-webhook-in-thehive" target="_blank">here</a>',
+				name: 'notice',
+				type: 'notice',
+				default: '',
+			},
+			...eventsDescription,
+		],
 	};
 
 	webhookMethods = {
diff --git a/packages/nodes-base/nodes/TheHive/descriptions/AlertDescription.ts b/packages/nodes-base/nodes/TheHive/descriptions/AlertDescription.ts
index 835d47bd563e9..2522094645a76 100644
--- a/packages/nodes-base/nodes/TheHive/descriptions/AlertDescription.ts
+++ b/packages/nodes-base/nodes/TheHive/descriptions/AlertDescription.ts
@@ -339,9 +339,10 @@ export const alertFields: INodeProperties[] = [
 						default: '',
 					},
 					{
-						displayName: 'Binary Property',
+						displayName: 'Input Binary Field',
 						name: 'binaryProperty',
 						type: 'string',
+						hint: 'The name of the input binary field containing the file to be written',
 						displayOptions: {
 							show: {
 								dataType: ['file'],
@@ -553,9 +554,10 @@ export const alertFields: INodeProperties[] = [
 								default: '',
 							},
 							{
-								displayName: 'Binary Property',
+								displayName: 'Input Binary Field',
 								name: 'binaryProperty',
 								type: 'string',
+								hint: 'The name of the input binary field containing the file to be written',
 								displayOptions: {
 									show: {
 										dataType: ['file'],
diff --git a/packages/nodes-base/nodes/TheHive/descriptions/LogDescription.ts b/packages/nodes-base/nodes/TheHive/descriptions/LogDescription.ts
index 8f8f8ed16b59d..834201ed65e63 100644
--- a/packages/nodes-base/nodes/TheHive/descriptions/LogDescription.ts
+++ b/packages/nodes-base/nodes/TheHive/descriptions/LogDescription.ts
@@ -206,11 +206,11 @@ export const logFields: INodeProperties[] = [
 						name: 'attachmentValues',
 						values: [
 							{
-								displayName: 'Binary Property',
+								displayName: 'Input Binary Field',
 								name: 'binaryProperty',
 								type: 'string',
 								default: 'data',
-								description: 'Object property name which holds binary data',
+								description: 'The name of the input binary field which holds binary data',
 							},
 						],
 					},
diff --git a/packages/nodes-base/nodes/TheHive/descriptions/ObservableDescription.ts b/packages/nodes-base/nodes/TheHive/descriptions/ObservableDescription.ts
index d4d9a82b2267b..747d6102222a0 100644
--- a/packages/nodes-base/nodes/TheHive/descriptions/ObservableDescription.ts
+++ b/packages/nodes-base/nodes/TheHive/descriptions/ObservableDescription.ts
@@ -120,12 +120,12 @@ export const observableFields: INodeProperties[] = [
 		},
 	},
 	{
-		displayName: 'Binary Property',
+		displayName: 'Input Binary Field',
 		name: 'binaryProperty',
 		type: 'string',
 		required: true,
 		default: 'data',
-		description: 'Binary Property that represent the attachment file',
+		description: 'The name of the input binary field that represent the attachment file',
 		displayOptions: {
 			show: {
 				resource: ['observable'],
diff --git a/packages/nodes-base/nodes/TheHive/thehive.svg b/packages/nodes-base/nodes/TheHive/thehive.svg
index 03ef3ed41b643..d48b8fd6f6de6 100644
--- a/packages/nodes-base/nodes/TheHive/thehive.svg
+++ b/packages/nodes-base/nodes/TheHive/thehive.svg
@@ -1 +1 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 300 300"><defs><style>.cls-2{fill:#fff}</style></defs><path d="M290 150A140 140 0 11150 10a140 140 0 01140 140" fill="#f3d02f"/><path class="cls-2" d="M204.62 210.6a15.13 15.13 0 01-6.68 1.38 17.49 17.49 0 01-16.11-10.93l-4.83-11.6-7.31-18.28a5.05 5.05 0 00-.7-2.12l-10.1-25.31c16.15 2.86 45.93 20.16 55.68 43.72 3.48 9.49-.76 19.66-9.9 23.14m-54.87 27.21c-11.58 0-21-8.5-24.85-21.5l49.85.16c-3.9 13.33-13.41 21.38-25 21.34m-48-26.14a14.3 14.3 0 01-6.67-1.43c-8.76-3.89-13.29-14.09-9.4-22.85 9.91-23.85 39.81-40.95 56-43.36L131 170l-7.79 19.29-5 11.57a18.34 18.34 0 01-16.53 10.83m42.63-45.16l5.69-13.69 5.57 13.71zm-7.79 19.29l3.19-8.06 20.37.07 3.13 8.08zm-5 11.57l36.17.12 3.13 8.09-42.48-.15zm18.56-90.87c9.48 0 17.53 9.18 17.5 16.56 0 8.77-14.43 9.43-17.23 9.41-3.16 0-17.21-.4-17.18-9.53-.67-7.38 7.43-16.48 16.91-16.44m-13.2-.42a3.75 3.75 0 01-3.39-2.15l-5.81-12.34a3.74 3.74 0 116.77-3.19l5.81 12.34a3.74 3.74 0 01-1.79 5 3.79 3.79 0 01-1.59.36m26.24-.02a3.79 3.79 0 01-1.59-.36 3.74 3.74 0 01-1.79-5l5.82-12.35a3.74 3.74 0 116.77 3.2L166.51 104a3.75 3.75 0 01-3.39 2.15"/><path class="cls-2" d="M204.36 157.81a3.74 3.74 0 01-3.26-5.56l14.41-25.87-32.87-56.7h-65.28L84.54 126.3l15.66 25.83a3.74 3.74 0 01-6.4 3.87L77 128.28a3.72 3.72 0 010-3.81l35-60.41a3.77 3.77 0 013.24-1.87h69.6a3.75 3.75 0 013.16 1.87l35 60.41a3.73 3.73 0 010 3.7l-15.44 27.72a3.75 3.75 0 01-3.28 1.92"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" data-name="Layer 1" viewBox="0 0 300 300"><defs><style>.cls-2{fill:#fff}</style></defs><path fill="#f3d02f" d="M290 150A140 140 0 1 1 150 10a140 140 0 0 1 140 140"/><path d="M204.62 210.6a15.1 15.1 0 0 1-6.68 1.38 17.49 17.49 0 0 1-16.11-10.93l-4.83-11.6-7.31-18.28a5.05 5.05 0 0 0-.7-2.12l-10.1-25.31c16.15 2.86 45.93 20.16 55.68 43.72 3.48 9.49-.76 19.66-9.9 23.14m-54.87 27.21c-11.58 0-21-8.5-24.85-21.5l49.85.16c-3.9 13.33-13.41 21.38-25 21.34m-48-26.14a14.3 14.3 0 0 1-6.67-1.43c-8.76-3.89-13.29-14.09-9.4-22.85 9.91-23.85 39.81-40.95 56-43.36L131 170l-7.79 19.29-5 11.57a18.34 18.34 0 0 1-16.53 10.83m42.63-45.16 5.69-13.69 5.57 13.71zm-7.79 19.29 3.19-8.06 20.37.07 3.13 8.08zm-5 11.57 36.17.12 3.13 8.09-42.48-.15zm18.56-90.87c9.48 0 17.53 9.18 17.5 16.56 0 8.77-14.43 9.43-17.23 9.41-3.16 0-17.21-.4-17.18-9.53-.67-7.38 7.43-16.48 16.91-16.44m-13.2-.42a3.75 3.75 0 0 1-3.39-2.15l-5.81-12.34a3.74 3.74 0 1 1 6.77-3.19l5.81 12.34a3.74 3.74 0 0 1-1.79 5 3.8 3.8 0 0 1-1.59.36m26.24-.02a3.8 3.8 0 0 1-1.59-.36 3.74 3.74 0 0 1-1.79-5l5.82-12.35a3.74 3.74 0 1 1 6.77 3.2L166.51 104a3.75 3.75 0 0 1-3.39 2.15" class="cls-2"/><path d="M204.36 157.81a3.74 3.74 0 0 1-3.26-5.56l14.41-25.87-32.87-56.7h-65.28L84.54 126.3l15.66 25.83a3.74 3.74 0 0 1-6.4 3.87L77 128.28a3.72 3.72 0 0 1 0-3.81l35-60.41a3.77 3.77 0 0 1 3.24-1.87h69.6a3.75 3.75 0 0 1 3.16 1.87l35 60.41a3.73 3.73 0 0 1 0 3.7l-15.44 27.72a3.75 3.75 0 0 1-3.28 1.92" class="cls-2"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/TheHiveProject/TheHiveProject.node.json b/packages/nodes-base/nodes/TheHiveProject/TheHiveProject.node.json
new file mode 100644
index 0000000000000..73176eb7df344
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/TheHiveProject.node.json
@@ -0,0 +1,19 @@
+{
+	"node": "n8n-nodes-base.theHiveProject",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"categories": ["Development"],
+	"alias": ["Security", "Monitoring", "Incident", "Response", "Alert"],
+	"resources": {
+		"credentialDocumentation": [
+			{
+				"url": "https://docs.n8n.io/integrations/builtin/credentials/thehive5/"
+			}
+		],
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.thehive5/"
+			}
+		]
+	}
+}
diff --git a/packages/nodes-base/nodes/TheHiveProject/TheHiveProject.node.ts b/packages/nodes-base/nodes/TheHiveProject/TheHiveProject.node.ts
new file mode 100644
index 0000000000000..4c71dabb1c49f
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/TheHiveProject.node.ts
@@ -0,0 +1,15 @@
+import type { IExecuteFunctions, INodeType, INodeTypeDescription } from 'n8n-workflow';
+
+import { description } from './actions/node.description';
+import { router } from './actions/router';
+import { loadOptions, listSearch, resourceMapping } from './methods';
+
+export class TheHiveProject implements INodeType {
+	description: INodeTypeDescription = description;
+
+	methods = { loadOptions, listSearch, resourceMapping };
+
+	async execute(this: IExecuteFunctions) {
+		return await router.call(this);
+	}
+}
diff --git a/packages/nodes-base/nodes/TheHiveProject/TheHiveProjectTrigger.node.json b/packages/nodes-base/nodes/TheHiveProject/TheHiveProjectTrigger.node.json
new file mode 100644
index 0000000000000..1732f940dd09e
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/TheHiveProjectTrigger.node.json
@@ -0,0 +1,13 @@
+{
+	"node": "n8n-nodes-base.theHiveProjectTrigger",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"categories": ["Development"],
+	"resources": {
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.thehive5trigger/"
+			}
+		]
+	}
+}
diff --git a/packages/nodes-base/nodes/TheHiveProject/TheHiveProjectTrigger.node.ts b/packages/nodes-base/nodes/TheHiveProject/TheHiveProjectTrigger.node.ts
new file mode 100644
index 0000000000000..074573e7de56c
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/TheHiveProjectTrigger.node.ts
@@ -0,0 +1,311 @@
+import type {
+	IWebhookFunctions,
+	IDataObject,
+	IHookFunctions,
+	INodeType,
+	INodeTypeDescription,
+	IWebhookResponseData,
+} from 'n8n-workflow';
+
+import get from 'lodash/get';
+
+export class TheHiveProjectTrigger implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'TheHive 5 Trigger',
+		name: 'theHiveProjectTrigger',
+		icon: 'file:thehiveproject.svg',
+		group: ['trigger'],
+		version: 1,
+		description: 'Starts the workflow when TheHive events occur',
+		defaults: {
+			name: 'TheHive Trigger',
+		},
+		inputs: [],
+		outputs: ['main'],
+		webhooks: [
+			{
+				name: 'default',
+				httpMethod: 'POST',
+				responseMode: 'onReceived',
+				path: 'webhook',
+			},
+		],
+		properties: [
+			{
+				displayName:
+					'You must set up the webhook in TheHive — instructions <a href="https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.thehive5trigger/#configure-a-webhook-in-thehive" target="_blank">here</a>',
+				name: 'notice',
+				type: 'notice',
+				default: '',
+			},
+			{
+				displayName: 'Events',
+				name: 'events',
+				type: 'multiOptions',
+				default: [],
+				required: true,
+				description: 'Events types',
+				// eslint-disable-next-line n8n-nodes-base/node-param-multi-options-type-unsorted-items
+				options: [
+					{
+						name: '*',
+						value: '*',
+						description: 'Any time any event is triggered (Wildcard Event)',
+					},
+					{
+						name: 'Alert Created',
+						value: 'alert_create',
+						description: 'Triggered when an alert is created',
+					},
+					{
+						name: 'Alert Deleted',
+						value: 'alert_delete',
+						description: 'Triggered when an alert is deleted',
+					},
+					{
+						name: 'Alert Updated',
+						value: 'alert_update',
+						description: 'Triggered when an alert is updated',
+					},
+					{
+						name: 'Case Created',
+						value: 'case_create',
+						description: 'Triggered when a case is created',
+					},
+					{
+						name: 'Case Deleted',
+						value: 'case_delete',
+						description: 'Triggered when a case is deleted',
+					},
+					{
+						name: 'Case Updated',
+						value: 'case_update',
+						description: 'Triggered when a case is updated',
+					},
+					{
+						name: 'Comment Created',
+						value: 'comment_create',
+						description: 'Triggered when a comment is created',
+					},
+					{
+						name: 'Comment Deleted',
+						value: 'comment_delete',
+						description: 'Triggered when a comment is deleted',
+					},
+					{
+						name: 'Comment Updated',
+						value: 'comment_update',
+						description: 'Triggered when a comment is updated',
+					},
+					{
+						name: 'Observable Created',
+						value: 'observable_create',
+						description: 'Triggered when an observable is created',
+					},
+					{
+						name: 'Observable Deleted',
+						value: 'observable_delete',
+						description: 'Triggered when an observable is deleted',
+					},
+					{
+						name: 'Observable Updated',
+						value: 'observable_update',
+						description: 'Triggered when an observable is updated',
+					},
+					{
+						name: 'Page Created',
+						value: 'page_create',
+						description: 'Triggered when an page is created',
+					},
+					{
+						name: 'Page Deleted',
+						value: 'page_delete',
+						description: 'Triggered when an page is deleted',
+					},
+					{
+						name: 'Page Updated',
+						value: 'page_update',
+						description: 'Triggered when an page is updated',
+					},
+					{
+						name: 'Task Created',
+						value: 'task_create',
+						description: 'Triggered when a task is created',
+					},
+					{
+						name: 'Task Updated',
+						value: 'task_update',
+						description: 'Triggered when a task is updated',
+					},
+					{
+						name: 'Task Log Created',
+						value: 'log_create',
+						description: 'Triggered when a task log is created',
+					},
+					{
+						name: 'Task Log Deleted',
+						value: 'log_delete',
+						description: 'Triggered when a task log is deleted',
+					},
+					{
+						name: 'Task Log Updated',
+						value: 'log_update',
+						description: 'Triggered when a task log is updated',
+					},
+				],
+			},
+			{
+				displayName: 'Filters',
+				description: 'Filter any incoming events based on their fields',
+				name: 'filters',
+				type: 'fixedCollection',
+				placeholder: 'Add Filter',
+				default: {},
+				typeOptions: {
+					multipleValues: true,
+				},
+				options: [
+					{
+						displayName: 'Values',
+						name: 'values',
+						values: [
+							{
+								displayName: 'Field',
+								name: 'field',
+								type: 'string',
+								placeholder: 'e.g. context.severity',
+								default: '',
+								hint: 'The field to filter on, supports dot notation',
+							},
+							{
+								displayName: 'Operator',
+								name: 'operator',
+								type: 'options',
+								options: [
+									{
+										name: 'Equal',
+										value: 'equal',
+										description: 'Field is equal to value',
+									},
+									{
+										name: 'Not Equal',
+										value: 'notEqual',
+										description: 'Field is not equal to value',
+									},
+									{
+										name: 'Includes',
+										value: 'includes',
+										description: 'Field includes value',
+									},
+								],
+								default: 'equal',
+							},
+							{
+								displayName: 'Value',
+								name: 'value',
+								type: 'string',
+								default: '',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Options',
+				name: 'options',
+				type: 'collection',
+				placeholder: 'Add Option',
+				default: {},
+				options: [
+					{
+						displayName: 'Output Only Data',
+						description: 'Whether to output data with additional details and omit headers',
+						name: 'outputOnlyData',
+						type: 'boolean',
+						default: false,
+					},
+				],
+			},
+		],
+	};
+
+	webhookMethods = {
+		default: {
+			async checkExists(this: IHookFunctions): Promise<boolean> {
+				return true;
+			},
+			async create(this: IHookFunctions): Promise<boolean> {
+				return true;
+			},
+			async delete(this: IHookFunctions): Promise<boolean> {
+				return true;
+			},
+		},
+	};
+
+	async webhook(this: IWebhookFunctions): Promise<IWebhookResponseData> {
+		// Get the request body
+		const bodyData = this.getBodyData();
+		const events = this.getNodeParameter('events', []) as string[];
+
+		if (!bodyData.action || !bodyData.objectType) {
+			// Don't start the workflow if mandatory fields are not specified
+			return {};
+		}
+
+		const action = (bodyData.action as string).toLowerCase();
+		const objectType = (bodyData.objectType as string).toLowerCase();
+		const event = `${objectType}_${action}`;
+
+		if (events.indexOf('*') === -1 && events.indexOf(event) === -1) {
+			return {};
+		}
+
+		const filters = this.getNodeParameter('filters.values', []) as IDataObject[];
+
+		if (filters.length) {
+			for (const filter of filters) {
+				const field = filter.field as string;
+				const operator = filter.operator as string;
+				const expectedValue = filter.value as string;
+				const actualValue = get(bodyData, field);
+
+				if (operator === 'equal') {
+					if (actualValue !== expectedValue) {
+						return {};
+					}
+				}
+				if (operator === 'notEqual') {
+					if (actualValue === expectedValue) {
+						return {};
+					}
+				}
+				if (operator === 'includes') {
+					if (!String(actualValue).includes(expectedValue)) {
+						return {};
+					}
+				}
+			}
+		}
+
+		// The data to return and so start the workflow with
+		const returnData: IDataObject[] = [];
+
+		const outputOnlyData = this.getNodeParameter('options.outputOnlyData', false) as boolean;
+
+		if (outputOnlyData) {
+			returnData.push(bodyData);
+		} else {
+			returnData.push({
+				event,
+				body: this.getBodyData(),
+				headers: this.getHeaderData(),
+				query: this.getQueryData(),
+			});
+		}
+
+		return {
+			workflowData: [this.helpers.returnJsonArray(returnData)],
+		};
+	}
+}
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/alert/create.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/alert/create.operation.ts
new file mode 100644
index 0000000000000..e7a6fc6f9e955
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/alert/create.operation.ts
@@ -0,0 +1,196 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+
+import set from 'lodash/set';
+
+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';
+
+const properties: INodeProperties[] = [
+	{
+		displayName: 'Fields',
+		name: 'alertFields',
+		type: 'resourceMapper',
+		default: {
+			mappingMode: 'defineBelow',
+			value: null,
+		},
+		noDataExpression: true,
+		required: true,
+		typeOptions: {
+			resourceMapper: {
+				resourceMapperMethod: 'getAlertFields',
+				mode: 'add',
+				valuesLabel: 'Fields',
+			},
+		},
+	},
+	{
+		displayName: 'Observables',
+		name: 'observableUi',
+		type: 'fixedCollection',
+		placeholder: 'Add Observable',
+		default: {},
+		typeOptions: {
+			multipleValues: true,
+		},
+		options: [
+			{
+				displayName: 'Values',
+				name: 'values',
+				values: [
+					observableTypeOptions,
+					{
+						displayName: 'Data',
+						name: 'data',
+						type: 'string',
+						displayOptions: {
+							hide: {
+								dataType: ['file'],
+							},
+						},
+						default: '',
+					},
+					{
+						displayName: 'Input Binary Field',
+						name: 'binaryProperty',
+						type: 'string',
+						hint: 'The name of the input binary field containing the file to be written',
+						displayOptions: {
+							show: {
+								dataType: ['file'],
+							},
+						},
+						default: 'data',
+					},
+					{
+						displayName: 'Message',
+						name: 'message',
+						type: 'string',
+						default: '',
+					},
+					{
+						displayName: 'Tags',
+						name: 'tags',
+						type: 'string',
+						default: '',
+					},
+				],
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['alert'],
+		operation: ['create'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	i: number,
+	item: INodeExecutionData,
+): Promise<INodeExecutionData[]> {
+	let responseData: IDataObject | IDataObject[] = [];
+	let inputData: IDataObject = {};
+
+	const dataMode = this.getNodeParameter('alertFields.mappingMode', i) as string;
+
+	if (dataMode === 'autoMapInputData') {
+		const schema = this.getNodeParameter('alertFields.schema', i) as IDataObject[];
+		inputData = prepareInputItem(item.json, schema, i);
+	}
+
+	if (dataMode === 'defineBelow') {
+		const alertFields = this.getNodeParameter('alertFields.value', i, []) as IDataObject;
+		inputData = alertFields;
+	}
+
+	inputData = fixFieldType(inputData);
+
+	const body: IDataObject = {};
+
+	for (const field of Object.keys(inputData)) {
+		// use set to construct the updateBody, as it allows to process customFields.fieldName
+		// if customFields provided under customFields property, it will be send as is
+		set(body, field, inputData[field]);
+	}
+
+	let multiPartRequest = false;
+	const formData = new FormData();
+
+	const observableUi = this.getNodeParameter('observableUi', i) as IDataObject;
+	if (observableUi) {
+		const values = observableUi.values as IDataObject[];
+
+		if (values) {
+			const observables = [];
+
+			for (const value of values) {
+				const observable: IDataObject = {};
+
+				observable.dataType = value.dataType as string;
+				observable.message = value.message as string;
+				observable.tags = splitAndTrim(value.tags as string);
+
+				if (value.dataType === 'file') {
+					multiPartRequest = true;
+
+					const attachmentIndex = `attachment${i}`;
+					observable.attachment = attachmentIndex;
+
+					const binaryPropertyName = value.binaryProperty as string;
+					const binaryData = this.helpers.assertBinaryData(i, binaryPropertyName);
+					const dataBuffer = await this.helpers.getBinaryDataBuffer(i, binaryPropertyName);
+
+					formData.append(attachmentIndex, dataBuffer, {
+						filename: binaryData.fileName,
+						contentType: binaryData.mimeType,
+					});
+				} else {
+					observable.data = value.data as string;
+				}
+
+				observables.push(observable);
+			}
+			body.observables = observables;
+		}
+	}
+
+	if (multiPartRequest) {
+		formData.append('_json', JSON.stringify(body));
+		responseData = await theHiveApiRequest.call(
+			this,
+			'POST',
+			'/v1/alert',
+			undefined,
+			undefined,
+			undefined,
+			{
+				Headers: {
+					'Content-Type': 'multipart/form-data',
+				},
+				formData,
+			},
+		);
+	} else {
+		responseData = await theHiveApiRequest.call(this, 'POST', '/v1/alert' as string, body);
+	}
+
+	const executionData = this.helpers.constructExecutionMetaData(wrapData(responseData), {
+		itemData: { item: i },
+	});
+
+	return executionData;
+}
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/alert/deleteAlert.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/alert/deleteAlert.operation.ts
new file mode 100644
index 0000000000000..2e914b5f58ea1
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/alert/deleteAlert.operation.ts
@@ -0,0 +1,27 @@
+import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
+import { theHiveApiRequest } from '../../transport';
+import { alertRLC } from '../../descriptions';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
+const properties: INodeProperties[] = [alertRLC];
+
+const displayOptions = {
+	show: {
+		resource: ['alert'],
+		operation: ['deleteAlert'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	const alertId = this.getNodeParameter('alertId', i, '', { extractValue: true }) as string;
+
+	await theHiveApiRequest.call(this, 'DELETE', `/v1/alert/${alertId}`);
+
+	const executionData = this.helpers.constructExecutionMetaData(wrapData({ success: true }), {
+		itemData: { item: i },
+	});
+
+	return executionData;
+}
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/alert/executeResponder.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/alert/executeResponder.operation.ts
new file mode 100644
index 0000000000000..4a5712152ab6a
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/alert/executeResponder.operation.ts
@@ -0,0 +1,76 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+import { alertRLC, responderOptions } from '../../descriptions';
+import { theHiveApiRequest } from '../../transport';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
+const properties: INodeProperties[] = [{ ...alertRLC, name: 'id' }, responderOptions];
+
+const displayOptions = {
+	show: {
+		resource: ['alert'],
+		operation: ['executeResponder'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	let responseData: IDataObject | IDataObject[] = [];
+
+	const alertId = this.getNodeParameter('id', i, '', { extractValue: true }) as string;
+	const responderId = this.getNodeParameter('responder', i) as string;
+	let body: IDataObject;
+	let response;
+	responseData = [];
+	body = {
+		responderId,
+		objectId: alertId,
+		objectType: 'alert',
+	};
+	response = await theHiveApiRequest.call(this, 'POST', '/connector/cortex/action' as string, body);
+	body = {
+		query: [
+			{
+				_name: 'listAction',
+			},
+			{
+				_name: 'filter',
+				_and: [
+					{
+						_field: 'cortexId',
+						_value: response.cortexId,
+					},
+					{
+						_field: 'objectId',
+						_value: response.objectId,
+					},
+					{
+						_field: 'startDate',
+						_value: response.startDate,
+					},
+				],
+			},
+		],
+	};
+
+	const qs: IDataObject = {};
+
+	qs.name = 'log-actions';
+
+	do {
+		response = await theHiveApiRequest.call(this, 'POST', '/v1/query', body, qs);
+	} while (response.status === 'Waiting' || response.status === 'InProgress');
+
+	responseData = response;
+
+	const executionData = this.helpers.constructExecutionMetaData(wrapData(responseData), {
+		itemData: { item: i },
+	});
+
+	return executionData;
+}
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/alert/get.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/alert/get.operation.ts
new file mode 100644
index 0000000000000..32cee8ca991c5
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/alert/get.operation.ts
@@ -0,0 +1,98 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+import { theHiveApiRequest } from '../../transport';
+import { alertRLC } from '../../descriptions';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	alertRLC,
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			{
+				displayName: 'Include Similar Alerts',
+				name: 'includeSimilarAlerts',
+				type: 'boolean',
+				description: 'Whether to include similar cases',
+				default: false,
+			},
+			{
+				displayName: 'Include Similar Cases',
+				name: 'includeSimilarCases',
+				type: 'boolean',
+				description: 'Whether to include similar cases',
+				default: false,
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['alert'],
+		operation: ['get'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	let responseData: IDataObject;
+
+	const alertId = this.getNodeParameter('alertId', i, '', { extractValue: true }) as string;
+	const options = this.getNodeParameter('options', i, {});
+
+	responseData = await theHiveApiRequest.call(this, 'GET', `/v1/alert/${alertId}`);
+
+	if (responseData && options.includeSimilarAlerts) {
+		const similarAlerts = await theHiveApiRequest.call(this, 'POST', '/v1/query', {
+			query: [
+				{
+					_name: 'getAlert',
+					idOrName: alertId,
+				},
+				{
+					_name: 'similarAlerts',
+				},
+			],
+		});
+
+		responseData = {
+			...responseData,
+			similarAlerts,
+		};
+	}
+
+	if (responseData && options.includeSimilarCases) {
+		const similarCases = await theHiveApiRequest.call(this, 'POST', '/v1/query', {
+			query: [
+				{
+					_name: 'getAlert',
+					idOrName: alertId,
+				},
+				{
+					_name: 'similarCases',
+				},
+			],
+		});
+
+		responseData = {
+			...responseData,
+			similarCases,
+		};
+	}
+
+	const executionData = this.helpers.constructExecutionMetaData(wrapData(responseData), {
+		itemData: { item: i },
+	});
+
+	return executionData;
+}
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/alert/index.ts b/packages/nodes-base/nodes/TheHiveProject/actions/alert/index.ts
new file mode 100644
index 0000000000000..4e3801bf7cfab
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/alert/index.ts
@@ -0,0 +1,85 @@
+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 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 update from './update.operation';
+
+export { create, executeResponder, deleteAlert, get, search, status, merge, promote, update };
+
+export const description: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		required: true,
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				action: 'Create an alert',
+			},
+			{
+				name: 'Delete',
+				value: 'deleteAlert',
+				action: 'Delete an alert',
+			},
+			{
+				name: 'Execute Responder',
+				value: 'executeResponder',
+				action: 'Execute responder on an alert',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				action: 'Get an alert',
+			},
+			{
+				name: 'Merge Into Case',
+				value: 'merge',
+				action: 'Merge an alert into a case',
+			},
+			{
+				name: 'Promote to Case',
+				value: 'promote',
+				action: 'Promote an alert to a case',
+			},
+			{
+				name: 'Search',
+				value: 'search',
+				action: 'Search alerts',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				action: 'Update an alert',
+			},
+			{
+				name: 'Update Status',
+				value: 'status',
+				action: 'Update an alert status',
+			},
+		],
+		displayOptions: {
+			show: {
+				resource: ['alert'],
+			},
+		},
+		default: 'create',
+	},
+	...create.description,
+	...deleteAlert.description,
+	...executeResponder.description,
+	...get.description,
+	...search.description,
+	...status.description,
+	...merge.description,
+	...promote.description,
+	...update.description,
+];
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/alert/merge.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/alert/merge.operation.ts
new file mode 100644
index 0000000000000..9be2833a4e47a
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/alert/merge.operation.ts
@@ -0,0 +1,41 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+import { theHiveApiRequest } from '../../transport';
+import { alertRLC, caseRLC } from '../../descriptions';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
+const properties: INodeProperties[] = [alertRLC, caseRLC];
+
+const displayOptions = {
+	show: {
+		resource: ['alert'],
+		operation: ['merge'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	let responseData: IDataObject | IDataObject[] = [];
+
+	const alertId = this.getNodeParameter('alertId', i, '', { extractValue: true }) as string;
+
+	const caseId = this.getNodeParameter('caseId', i, '', { extractValue: true }) as string;
+
+	responseData = await theHiveApiRequest.call(
+		this,
+		'POST',
+		`/alert/${alertId}/merge/${caseId}`,
+		{},
+	);
+
+	const executionData = this.helpers.constructExecutionMetaData(wrapData(responseData), {
+		itemData: { item: i },
+	});
+
+	return executionData;
+}
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/alert/promote.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/alert/promote.operation.ts
new file mode 100644
index 0000000000000..cc69c94f9cc57
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/alert/promote.operation.ts
@@ -0,0 +1,69 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+import { theHiveApiRequest } from '../../transport';
+import { alertRLC } from '../../descriptions';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	alertRLC,
+	{
+		displayName: 'Options',
+		name: 'options',
+		placeholder: 'Add Field',
+		type: 'collection',
+		default: {},
+		options: [
+			{
+				displayName: 'Case Template Name or ID',
+				name: 'caseTemplate',
+				type: 'options',
+				description:
+					'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
+				default: '',
+				typeOptions: {
+					loadOptionsMethod: 'loadCaseTemplate',
+				},
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['alert'],
+		operation: ['promote'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	let responseData: IDataObject | IDataObject[] = [];
+
+	const alertId = this.getNodeParameter('alertId', i, '', { extractValue: true }) as string;
+	const caseTemplate = this.getNodeParameter('options.caseTemplate', i, '') as string;
+
+	const body: IDataObject = {};
+
+	// await theHiveApiRequest.call(this, 'POST', '/v1/caseTemplate', {
+	// 	name: 'test template 001',
+	// 	displayName: 'Test Template 001',
+	// 	description: 'test',
+	// });
+
+	if (caseTemplate) {
+		body.caseTemplate = caseTemplate;
+	}
+
+	responseData = await theHiveApiRequest.call(this, 'POST', `/v1/alert/${alertId}/case`, body);
+
+	const executionData = this.helpers.constructExecutionMetaData(wrapData(responseData), {
+		itemData: { item: i },
+	});
+
+	return executionData;
+}
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/alert/search.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/alert/search.operation.ts
new file mode 100644
index 0000000000000..f74cb70b9a705
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/alert/search.operation.ts
@@ -0,0 +1,60 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+import {
+	genericFiltersCollection,
+	returnAllAndLimit,
+	searchOptions,
+	sortCollection,
+} from '../../descriptions';
+import { theHiveApiQuery } from '../../transport';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	...returnAllAndLimit,
+	genericFiltersCollection,
+	sortCollection,
+	searchOptions,
+];
+
+const displayOptions = {
+	show: {
+		resource: ['alert'],
+		operation: ['search'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	let responseData: IDataObject | IDataObject[] = [];
+
+	const filtersValues = this.getNodeParameter('filters.values', i, []) as IDataObject[];
+	const sortFields = this.getNodeParameter('sort.fields', i, []) as IDataObject[];
+	const returnAll = this.getNodeParameter('returnAll', i);
+	const { returnCount, extraData } = this.getNodeParameter('options', i);
+	let limit;
+
+	if (!returnAll) {
+		limit = this.getNodeParameter('limit', i);
+	}
+
+	responseData = await theHiveApiQuery.call(
+		this,
+		{ query: 'listAlert' },
+		filtersValues,
+		sortFields,
+		limit,
+		returnCount as boolean,
+		extraData as string[],
+	);
+
+	const executionData = this.helpers.constructExecutionMetaData(wrapData(responseData), {
+		itemData: { item: i },
+	});
+
+	return executionData;
+}
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/alert/status.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/alert/status.operation.ts
new file mode 100644
index 0000000000000..d4c7484abe368
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/alert/status.operation.ts
@@ -0,0 +1,42 @@
+import type { INodeExecutionData, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
+import { theHiveApiRequest } from '../../transport';
+import { alertRLC } from '../../descriptions';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	alertRLC,
+	{
+		displayName: 'Status Name or ID',
+		name: 'status',
+		type: 'options',
+		description:
+			'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
+		default: '',
+		required: true,
+		typeOptions: {
+			loadOptionsMethod: 'loadAlertStatus',
+		},
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['alert'],
+		operation: ['status'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	const alertId = this.getNodeParameter('alertId', i, '', { extractValue: true }) as string;
+	const status = this.getNodeParameter('status', i) as string;
+
+	await theHiveApiRequest.call(this, 'PATCH', `/v1/alert/${alertId}`, { status });
+
+	const executionData = this.helpers.constructExecutionMetaData(wrapData({ success: true }), {
+		itemData: { item: i },
+	});
+
+	return executionData;
+}
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/alert/update.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/alert/update.operation.ts
new file mode 100644
index 0000000000000..aaf0b398ed36f
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/alert/update.operation.ts
@@ -0,0 +1,150 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	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';
+
+const properties: INodeProperties[] = [
+	{
+		displayName: 'Fields',
+		name: 'alertUpdateFields',
+		type: 'resourceMapper',
+		default: {
+			mappingMode: 'defineBelow',
+			value: null,
+		},
+		noDataExpression: true,
+		required: true,
+		typeOptions: {
+			resourceMapper: {
+				resourceMapperMethod: 'getAlertUpdateFields',
+				mode: 'update',
+				valuesLabel: 'Fields',
+				addAllFields: true,
+				multiKeyMatch: true,
+			},
+		},
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['alert'],
+		operation: ['update'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	i: number,
+	item: INodeExecutionData,
+): Promise<INodeExecutionData[]> {
+	let body: IDataObject = {};
+	let updated = 1;
+
+	const dataMode = this.getNodeParameter('alertUpdateFields.mappingMode', i) as string;
+
+	if (dataMode === 'autoMapInputData') {
+		const schema = this.getNodeParameter('alertUpdateFields.schema', i) as IDataObject[];
+		body = prepareInputItem(item.json, schema, i);
+	}
+
+	if (dataMode === 'defineBelow') {
+		const alertUpdateFields = this.getNodeParameter(
+			'alertUpdateFields.value',
+			i,
+			[],
+		) as IDataObject;
+		body = alertUpdateFields;
+	}
+
+	body = fixFieldType(body);
+
+	const fieldsToMatchOn = this.getNodeParameter('alertUpdateFields.matchingColumns', i) as string[];
+
+	const updateBody: IDataObject = {};
+	const matchFields: IDataObject = {};
+	const { id } = body; // id would be used if matching on id, also we need to remove it from the body
+
+	for (const field of Object.keys(body)) {
+		if (field === 'customFields') {
+			//in input data customFields sent as an object, parse it extracting customFields that are used for matching
+			const customFields: IDataObject = {};
+			for (const customField of Object.keys(body.customFields || {})) {
+				const combinedPath = `customFields.${customField}`;
+				if (fieldsToMatchOn.includes(combinedPath)) {
+					matchFields[combinedPath] = (body.customFields as IDataObject)[customField];
+				} else {
+					customFields[customField] = (body.customFields as IDataObject)[customField];
+				}
+			}
+			set(updateBody, 'customFields', customFields);
+			continue;
+		}
+		if (fieldsToMatchOn.includes(field)) {
+			// if field is in fieldsToMatchOn, we need to exclude it from the updateBody, as values used for matching should not be updated
+			matchFields[field] = body[field];
+		} else {
+			// use set to construct the updateBody, as it allows to process customFields.fieldName
+			// if customFields provided under customFields property, it will be send as is
+			set(updateBody, field, body[field]);
+		}
+	}
+
+	if (fieldsToMatchOn.includes('id')) {
+		await theHiveApiRequest.call(this, 'PATCH', `/v1/alert/${id}`, updateBody);
+	} else {
+		const filter = {
+			_name: 'filter',
+			_and: fieldsToMatchOn.map((field) => ({
+				_eq: {
+					_field: field,
+					_value: matchFields[field],
+				},
+			})),
+		};
+
+		const queryBody = {
+			query: [
+				{
+					_name: 'listAlert',
+				},
+				filter,
+			],
+		};
+
+		const matches = (await theHiveApiRequest.call(
+			this,
+			'POST',
+			'/v1/query',
+			queryBody,
+		)) as IDataObject[];
+
+		if (!matches.length) {
+			throw new NodeOperationError(this.getNode(), 'No matching alerts found');
+		}
+		const ids = matches.map((match) => match._id);
+		updated = ids.length;
+
+		updateBody.ids = ids;
+
+		await theHiveApiRequest.call(this, 'PATCH', '/v1/alert/_bulk', updateBody);
+	}
+
+	const executionData = this.helpers.constructExecutionMetaData(
+		wrapData({ success: true, updatedAlerts: updated }),
+		{
+			itemData: { item: i },
+		},
+	);
+
+	return executionData;
+}
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/case/addAttachment.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/case/addAttachment.operation.ts
new file mode 100644
index 0000000000000..9f0bcdc6f5757
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/case/addAttachment.operation.ts
@@ -0,0 +1,89 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+import { theHiveApiRequest } from '../../transport';
+import { attachmentsUi, caseRLC } from '../../descriptions';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	caseRLC,
+	attachmentsUi,
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			{
+				displayName: 'Rename Files',
+				name: 'canRename',
+				type: 'boolean',
+				description: 'Whether to rename the file in case a file with the same name already exists',
+				default: false,
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['case'],
+		operation: ['addAttachment'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	let responseData: IDataObject | IDataObject[] = [];
+
+	const caseId = this.getNodeParameter('caseId', i, '', { extractValue: true }) as string;
+	const canRename = this.getNodeParameter('options.canRename', i, false) as boolean;
+
+	const inputDataFields = (
+		this.getNodeParameter('attachmentsUi.values', i, []) as IDataObject[]
+	).map((entry) => (entry.field as string).trim());
+
+	const attachments = [];
+
+	for (const inputDataField of inputDataFields) {
+		const binaryData = this.helpers.assertBinaryData(i, inputDataField);
+		const dataBuffer = await this.helpers.getBinaryDataBuffer(i, inputDataField);
+
+		attachments.push({
+			value: dataBuffer,
+			options: {
+				contentType: binaryData.mimeType,
+				filename: binaryData.fileName,
+			},
+		});
+	}
+
+	responseData = await theHiveApiRequest.call(
+		this,
+		'POST',
+		`/v1/case/${caseId}/attachments`,
+		undefined,
+		undefined,
+		undefined,
+		{
+			Headers: {
+				'Content-Type': 'multipart/form-data',
+			},
+			formData: {
+				attachments,
+				canRename: JSON.stringify(canRename),
+			},
+		},
+	);
+
+	const executionData = this.helpers.constructExecutionMetaData(wrapData(responseData), {
+		itemData: { item: i },
+	});
+
+	return executionData;
+}
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/case/create.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/case/create.operation.ts
new file mode 100644
index 0000000000000..7e212c3c62329
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/case/create.operation.ts
@@ -0,0 +1,81 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+
+import set from 'lodash/set';
+import { theHiveApiRequest } from '../../transport';
+
+import { fixFieldType, prepareInputItem } from '../../helpers/utils';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	{
+		displayName: 'Fields',
+		name: 'caseFields',
+		type: 'resourceMapper',
+		default: {
+			mappingMode: 'defineBelow',
+			value: null,
+		},
+		noDataExpression: true,
+		required: true,
+		typeOptions: {
+			resourceMapper: {
+				resourceMapperMethod: 'getCaseFields',
+				mode: 'add',
+				valuesLabel: 'Fields',
+			},
+		},
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['case'],
+		operation: ['create'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	i: number,
+	item: INodeExecutionData,
+): Promise<INodeExecutionData[]> {
+	let responseData: IDataObject | IDataObject[] = [];
+	let inputData: IDataObject = {};
+
+	const dataMode = this.getNodeParameter('caseFields.mappingMode', i) as string;
+
+	if (dataMode === 'autoMapInputData') {
+		const schema = this.getNodeParameter('caseFields.schema', i) as IDataObject[];
+		inputData = prepareInputItem(item.json, schema, i);
+	}
+
+	if (dataMode === 'defineBelow') {
+		const caseFields = this.getNodeParameter('caseFields.value', i, []) as IDataObject;
+		inputData = caseFields;
+	}
+
+	inputData = fixFieldType(inputData);
+
+	const body: IDataObject = {};
+
+	for (const field of Object.keys(inputData)) {
+		// use set to construct the updateBody, as it allows to process customFields.fieldName
+		// if customFields provided under customFields property, it will be send as is
+		set(body, field, inputData[field]);
+	}
+
+	responseData = await theHiveApiRequest.call(this, 'POST', '/v1/case' as string, body);
+
+	const executionData = this.helpers.constructExecutionMetaData(wrapData(responseData), {
+		itemData: { item: i },
+	});
+
+	return executionData;
+}
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/case/deleteAttachment.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/case/deleteAttachment.operation.ts
new file mode 100644
index 0000000000000..aa398e0871704
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/case/deleteAttachment.operation.ts
@@ -0,0 +1,42 @@
+import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
+import { theHiveApiRequest } from '../../transport';
+import { caseRLC } from '../../descriptions';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	caseRLC,
+	{
+		displayName: 'Attachment Name or ID',
+		name: 'attachmentId',
+		type: 'options',
+		default: '',
+		required: true,
+		description:
+			'ID of the attachment. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+		typeOptions: {
+			loadOptionsMethod: 'loadCaseAttachments',
+		},
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['case'],
+		operation: ['deleteAttachment'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	const caseId = this.getNodeParameter('caseId', i, '', { extractValue: true }) as string;
+	const attachmentId = this.getNodeParameter('attachmentId', i) as string;
+
+	await theHiveApiRequest.call(this, 'DELETE', `/v1/case/${caseId}/attachment/${attachmentId}`);
+
+	const executionData = this.helpers.constructExecutionMetaData(wrapData({ success: true }), {
+		itemData: { item: i },
+	});
+
+	return executionData;
+}
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/case/deleteCase.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/case/deleteCase.operation.ts
new file mode 100644
index 0000000000000..077b45ad9b4fc
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/case/deleteCase.operation.ts
@@ -0,0 +1,27 @@
+import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
+import { theHiveApiRequest } from '../../transport';
+import { caseRLC } from '../../descriptions';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
+const properties: INodeProperties[] = [caseRLC];
+
+const displayOptions = {
+	show: {
+		resource: ['case'],
+		operation: ['deleteCase'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	const caseId = this.getNodeParameter('caseId', i, '', { extractValue: true }) as string;
+
+	await theHiveApiRequest.call(this, 'DELETE', `/v1/case/${caseId}`);
+
+	const executionData = this.helpers.constructExecutionMetaData(wrapData({ success: true }), {
+		itemData: { item: i },
+	});
+
+	return executionData;
+}
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/case/executeResponder.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/case/executeResponder.operation.ts
new file mode 100644
index 0000000000000..3132266005317
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/case/executeResponder.operation.ts
@@ -0,0 +1,73 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+import { caseRLC, responderOptions } from '../../descriptions';
+import { theHiveApiRequest } from '../../transport';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
+const properties: INodeProperties[] = [{ ...caseRLC, name: 'id' }, responderOptions];
+
+const displayOptions = {
+	show: {
+		resource: ['case'],
+		operation: ['executeResponder'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	let responseData: IDataObject | IDataObject[] = [];
+
+	const caseId = this.getNodeParameter('id', i, '', { extractValue: true }) as string;
+	const responderId = this.getNodeParameter('responder', i) as string;
+	let body: IDataObject;
+	let response;
+	responseData = [];
+	body = {
+		responderId,
+		objectId: caseId,
+		objectType: 'case',
+	};
+	response = await theHiveApiRequest.call(this, 'POST', '/connector/cortex/action' as string, body);
+	body = {
+		query: [
+			{
+				_name: 'listAction',
+			},
+			{
+				_name: 'filter',
+				_and: [
+					{
+						_field: 'cortexId',
+						_value: response.cortexId,
+					},
+					{
+						_field: 'objectId',
+						_value: response.objectId,
+					},
+					{
+						_field: 'startDate',
+						_value: response.startDate,
+					},
+				],
+			},
+		],
+	};
+	const qs: IDataObject = {};
+	qs.name = 'log-actions';
+	do {
+		response = await theHiveApiRequest.call(this, 'POST', '/v1/query', body, qs);
+	} while (response.status === 'Waiting' || response.status === 'InProgress');
+
+	responseData = response;
+
+	const executionData = this.helpers.constructExecutionMetaData(wrapData(responseData), {
+		itemData: { item: i },
+	});
+
+	return executionData;
+}
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/case/get.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/case/get.operation.ts
new file mode 100644
index 0000000000000..2c516f05ab377
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/case/get.operation.ts
@@ -0,0 +1,53 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+import { theHiveApiRequest } from '../../transport';
+import { caseRLC } from '../../descriptions';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
+const properties: INodeProperties[] = [caseRLC];
+
+const displayOptions = {
+	show: {
+		resource: ['case'],
+		operation: ['get'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	let responseData: IDataObject | IDataObject[] = [];
+
+	const caseId = this.getNodeParameter('caseId', i, '', { extractValue: true }) as string;
+
+	const qs: IDataObject = {};
+
+	const body = {
+		query: [
+			{
+				_name: 'getCase',
+				idOrName: caseId,
+			},
+			{
+				_name: 'page',
+				from: 0,
+				to: 10,
+				extraData: ['attachmentCount'],
+			},
+		],
+	};
+
+	qs.name = `get-case-${caseId}`;
+
+	responseData = await theHiveApiRequest.call(this, 'POST', '/v1/query', body, qs);
+
+	const executionData = this.helpers.constructExecutionMetaData(wrapData(responseData), {
+		itemData: { item: i },
+	});
+
+	return executionData;
+}
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/case/getAttachment.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/case/getAttachment.operation.ts
new file mode 100644
index 0000000000000..cf538f4ab705f
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/case/getAttachment.operation.ts
@@ -0,0 +1,112 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+import { theHiveApiRequest } from '../../transport';
+import { caseRLC } from '../../descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	caseRLC,
+	{
+		displayName: 'Attachment Name or ID',
+		name: 'attachmentId',
+		type: 'options',
+		default: '',
+		required: true,
+		description:
+			'ID of the attachment. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+		typeOptions: {
+			loadOptionsMethod: 'loadCaseAttachments',
+			loadOptionsDependsOn: ['caseId.value'],
+		},
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			{
+				displayName: 'File Name',
+				name: 'fileName',
+				type: 'string',
+				default: '',
+				description: 'Rename the file when downloading',
+			},
+			{
+				displayName: 'Data Property Name',
+				name: 'dataPropertyName',
+				type: 'string',
+				default: 'data',
+				description: 'Name of the binary property to which write the data of the attachment',
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['case'],
+		operation: ['getAttachment'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	const caseId = this.getNodeParameter('caseId', i, '', { extractValue: true }) as string;
+	const options = this.getNodeParameter('options', i);
+	const attachmentId = this.getNodeParameter('attachmentId', i) as string;
+
+	const requestOptions = {
+		useStream: true,
+		resolveWithFullResponse: true,
+		encoding: null,
+		json: false,
+	};
+
+	const response = await theHiveApiRequest.call(
+		this,
+		'GET',
+		`/v1/case/${caseId}/attachment/${attachmentId}/download`,
+		undefined,
+		undefined,
+		undefined,
+		requestOptions,
+	);
+
+	const mimeType = (response.headers as IDataObject)?.['content-type'] ?? undefined;
+
+	let fileName = (options.fileName as string) || 'attachment';
+
+	if (!options.fileName && response.headers['content-disposition'] !== undefined) {
+		const contentDisposition = response.headers['content-disposition'] as string;
+		const fileNameMatch = contentDisposition.match(/filename="(.+)"/);
+		if (fileNameMatch !== null) {
+			fileName = fileNameMatch[1];
+		}
+	}
+
+	const newItem: INodeExecutionData = {
+		json: {
+			_id: attachmentId,
+			caseId,
+			fileName,
+			mimeType,
+		},
+		binary: {},
+	};
+
+	newItem.binary![(options.dataPropertyName as string) || 'data'] =
+		await this.helpers.prepareBinaryData(response.body as Buffer, fileName, mimeType as string);
+
+	const executionData = this.helpers.constructExecutionMetaData([newItem], {
+		itemData: { item: i },
+	});
+
+	return executionData;
+}
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/case/getTimeline.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/case/getTimeline.operation.ts
new file mode 100644
index 0000000000000..3b945856f9b66
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/case/getTimeline.operation.ts
@@ -0,0 +1,34 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+import { theHiveApiRequest } from '../../transport';
+import { caseRLC } from '../../descriptions';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
+const properties: INodeProperties[] = [caseRLC];
+
+const displayOptions = {
+	show: {
+		resource: ['case'],
+		operation: ['getTimeline'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	let responseData: IDataObject | IDataObject[] = [];
+
+	const caseId = this.getNodeParameter('caseId', i, '', { extractValue: true }) as string;
+
+	responseData = await theHiveApiRequest.call(this, 'GET', `/v1/case/${caseId}/timeline`);
+
+	const executionData = this.helpers.constructExecutionMetaData(wrapData(responseData), {
+		itemData: { item: i },
+	});
+
+	return executionData;
+}
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/case/index.ts b/packages/nodes-base/nodes/TheHiveProject/actions/case/index.ts
new file mode 100644
index 0000000000000..9a2ec7c3ae12a
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/case/index.ts
@@ -0,0 +1,104 @@
+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 update from './update.operation';
+
+export {
+	addAttachment,
+	create,
+	deleteAttachment,
+	deleteCase,
+	executeResponder,
+	get,
+	search,
+	getAttachment,
+	getTimeline,
+	update,
+};
+
+export const description: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		default: 'create',
+		type: 'options',
+		noDataExpression: true,
+		required: true,
+		options: [
+			{
+				name: 'Add Attachment',
+				value: 'addAttachment',
+				action: 'Add attachment to a case',
+			},
+			{
+				name: 'Create',
+				value: 'create',
+				action: 'Create a case',
+			},
+			{
+				name: 'Delete Attachment',
+				value: 'deleteAttachment',
+				action: 'Delete attachment from a case',
+			},
+			{
+				name: 'Delete Case',
+				value: 'deleteCase',
+				action: 'Delete an case',
+			},
+			{
+				name: 'Execute Responder',
+				value: 'executeResponder',
+				action: 'Execute responder on a case',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				action: 'Get a case',
+			},
+			{
+				name: 'Get Attachment',
+				value: 'getAttachment',
+				action: 'Get attachment from a case',
+			},
+			{
+				name: 'Get Timeline',
+				value: 'getTimeline',
+				action: 'Get timeline of a case',
+			},
+			{
+				name: 'Search',
+				value: 'search',
+				action: 'Search cases',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				action: 'Update a case',
+			},
+		],
+		displayOptions: {
+			show: {
+				resource: ['case'],
+			},
+		},
+	},
+	...addAttachment.description,
+	...create.description,
+	...deleteAttachment.description,
+	...deleteCase.description,
+	...executeResponder.description,
+	...get.description,
+	...getAttachment.description,
+	...search.description,
+	...getTimeline.description,
+	...update.description,
+];
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/case/search.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/case/search.operation.ts
new file mode 100644
index 0000000000000..c7f44f5e40f6b
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/case/search.operation.ts
@@ -0,0 +1,60 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+import {
+	genericFiltersCollection,
+	returnAllAndLimit,
+	searchOptions,
+	sortCollection,
+} from '../../descriptions';
+import { theHiveApiQuery } from '../../transport';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	...returnAllAndLimit,
+	genericFiltersCollection,
+	sortCollection,
+	searchOptions,
+];
+
+const displayOptions = {
+	show: {
+		resource: ['case'],
+		operation: ['search'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	let responseData: IDataObject | IDataObject[] = [];
+
+	const filtersValues = this.getNodeParameter('filters.values', i, []) as IDataObject[];
+	const sortFields = this.getNodeParameter('sort.fields', i, []) as IDataObject[];
+	const returnAll = this.getNodeParameter('returnAll', i);
+	const { returnCount, extraData } = this.getNodeParameter('options', i);
+	let limit;
+
+	if (!returnAll) {
+		limit = this.getNodeParameter('limit', i);
+	}
+
+	responseData = await theHiveApiQuery.call(
+		this,
+		{ query: 'listCase' },
+		filtersValues,
+		sortFields,
+		limit,
+		returnCount as boolean,
+		extraData as string[],
+	);
+
+	const executionData = this.helpers.constructExecutionMetaData(wrapData(responseData), {
+		itemData: { item: i },
+	});
+
+	return executionData;
+}
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/case/update.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/case/update.operation.ts
new file mode 100644
index 0000000000000..4b3539bc2e7fe
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/case/update.operation.ts
@@ -0,0 +1,146 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	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';
+
+const properties: INodeProperties[] = [
+	{
+		displayName: 'Fields',
+		name: 'caseUpdateFields',
+		type: 'resourceMapper',
+		default: {
+			mappingMode: 'defineBelow',
+			value: null,
+		},
+		noDataExpression: true,
+		required: true,
+		typeOptions: {
+			resourceMapper: {
+				resourceMapperMethod: 'getCaseUpdateFields',
+				mode: 'update',
+				valuesLabel: 'Fields',
+				addAllFields: true,
+				multiKeyMatch: true,
+			},
+		},
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['case'],
+		operation: ['update'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	i: number,
+	item: INodeExecutionData,
+): Promise<INodeExecutionData[]> {
+	let body: IDataObject = {};
+	let updated = 1;
+
+	const dataMode = this.getNodeParameter('caseUpdateFields.mappingMode', i) as string;
+
+	if (dataMode === 'autoMapInputData') {
+		const schema = this.getNodeParameter('caseUpdateFields.schema', i) as IDataObject[];
+		body = prepareInputItem(item.json, schema, i);
+	}
+
+	if (dataMode === 'defineBelow') {
+		const caseUpdateFields = this.getNodeParameter('caseUpdateFields.value', i, []) as IDataObject;
+		body = caseUpdateFields;
+	}
+
+	body = fixFieldType(body);
+
+	const fieldsToMatchOn = this.getNodeParameter('caseUpdateFields.matchingColumns', i) as string[];
+
+	const updateBody: IDataObject = {};
+	const matchFields: IDataObject = {};
+	const { id } = body; // id would be used if matching on id, also we need to remove it from the body
+
+	for (const field of Object.keys(body)) {
+		if (field === 'customFields') {
+			//in input data customFields sent as an object, parse it extracting customFields that are used for matching
+			const customFields: IDataObject = {};
+			for (const customField of Object.keys(body.customFields || {})) {
+				const customFieldPath = `customFields.${customField}`;
+				if (fieldsToMatchOn.includes(customFieldPath)) {
+					matchFields[customFieldPath] = (body.customFields as IDataObject)[customField];
+				} else {
+					customFields[customField] = (body.customFields as IDataObject)[customField];
+				}
+			}
+			set(updateBody, 'customFields', customFields);
+			continue;
+		}
+		if (fieldsToMatchOn.includes(field)) {
+			// if field is in fieldsToMatchOn, we need to exclude it from the updateBody, as values used for matching should not be updated
+			matchFields[field] = body[field];
+		} else {
+			// use set to construct the updateBody, as it allows to process customFields.fieldName
+			// if customFields provided under customFields property, it will be send as is
+			set(updateBody, field, body[field]);
+		}
+	}
+
+	if (fieldsToMatchOn.includes('id')) {
+		await theHiveApiRequest.call(this, 'PATCH', `/v1/case/${id}`, updateBody);
+	} else {
+		const filter = {
+			_name: 'filter',
+			_and: fieldsToMatchOn.map((field) => ({
+				_eq: {
+					_field: field,
+					_value: matchFields[field],
+				},
+			})),
+		};
+
+		const queryBody = {
+			query: [
+				{
+					_name: 'listCase',
+				},
+				filter,
+			],
+		};
+
+		const matches = (await theHiveApiRequest.call(
+			this,
+			'POST',
+			'/v1/query',
+			queryBody,
+		)) as IDataObject[];
+
+		if (!matches.length) {
+			throw new NodeOperationError(this.getNode(), 'No matching alerts found');
+		}
+		const ids = matches.map((match) => match._id);
+		updated = ids.length;
+
+		updateBody.ids = ids;
+
+		await theHiveApiRequest.call(this, 'PATCH', '/v1/case/_bulk', updateBody);
+	}
+
+	const executionData = this.helpers.constructExecutionMetaData(
+		wrapData({ success: true, updated }),
+		{
+			itemData: { item: i },
+		},
+	);
+
+	return executionData;
+}
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/comment/add.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/comment/add.operation.ts
new file mode 100644
index 0000000000000..572db219591dc
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/comment/add.operation.ts
@@ -0,0 +1,86 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+import { theHiveApiRequest } from '../../transport';
+import { alertRLC, caseRLC } from '../../descriptions';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	{
+		// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+		displayName: 'Add to',
+		name: 'addTo',
+		type: 'options',
+		options: [
+			{
+				name: 'Alert',
+				value: 'alert',
+			},
+			{
+				name: 'Case',
+				value: 'case',
+			},
+		],
+		default: 'alert',
+	},
+	{
+		...caseRLC,
+		name: 'id',
+		displayOptions: {
+			show: {
+				addTo: ['case'],
+			},
+		},
+	},
+	{
+		...alertRLC,
+		name: 'id',
+		displayOptions: {
+			show: {
+				addTo: ['alert'],
+			},
+		},
+	},
+	{
+		displayName: 'Message',
+		name: 'message',
+		type: 'string',
+		default: '',
+		required: true,
+		typeOptions: {
+			rows: 2,
+		},
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['comment'],
+		operation: ['add'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	let responseData: IDataObject | IDataObject[] = [];
+
+	const addTo = this.getNodeParameter('addTo', i) as string;
+	const id = this.getNodeParameter('id', i, '', { extractValue: true });
+	const message = this.getNodeParameter('message', i) as string;
+
+	const body: IDataObject = {
+		message,
+	};
+
+	responseData = await theHiveApiRequest.call(this, 'POST', `/v1/${addTo}/${id}/comment`, body);
+
+	const executionData = this.helpers.constructExecutionMetaData(wrapData(responseData), {
+		itemData: { item: i },
+	});
+
+	return executionData;
+}
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/comment/deleteComment.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/comment/deleteComment.operation.ts
new file mode 100644
index 0000000000000..e178729c61e8f
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/comment/deleteComment.operation.ts
@@ -0,0 +1,27 @@
+import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
+import { theHiveApiRequest } from '../../transport';
+import { commentRLC } from '../../descriptions';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
+const properties: INodeProperties[] = [commentRLC];
+
+const displayOptions = {
+	show: {
+		resource: ['comment'],
+		operation: ['deleteComment'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	const commentId = this.getNodeParameter('commentId', i, '', { extractValue: true }) as string;
+
+	await theHiveApiRequest.call(this, 'DELETE', `/v1/comment/${commentId}`);
+
+	const executionData = this.helpers.constructExecutionMetaData(wrapData({ success: true }), {
+		itemData: { item: i },
+	});
+
+	return executionData;
+}
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/comment/index.ts b/packages/nodes-base/nodes/TheHiveProject/actions/comment/index.ts
new file mode 100644
index 0000000000000..c4cf802cb6941
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/comment/index.ts
@@ -0,0 +1,50 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+import * as add from './add.operation';
+import * as deleteComment from './deleteComment.operation';
+import * as search from './search.operation';
+import * as update from './update.operation';
+
+export { add, deleteComment, search, update };
+
+export const description: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		noDataExpression: true,
+		type: 'options',
+		required: true,
+		default: 'add',
+		options: [
+			{
+				name: 'Create',
+				value: 'add',
+				action: 'Create a comment in a case or alert',
+			},
+			{
+				name: 'Delete',
+				value: 'deleteComment',
+				action: 'Delete a comment',
+			},
+			{
+				name: 'Search',
+				value: 'search',
+				action: 'Search comments',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				action: 'Update a comment',
+			},
+		],
+		displayOptions: {
+			show: {
+				resource: ['comment'],
+			},
+		},
+	},
+	...add.description,
+	...deleteComment.description,
+	...search.description,
+	...update.description,
+];
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/comment/search.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/comment/search.operation.ts
new file mode 100644
index 0000000000000..86bcd95d6178b
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/comment/search.operation.ts
@@ -0,0 +1,118 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+import { NodeOperationError } from 'n8n-workflow';
+import {
+	alertRLC,
+	caseRLC,
+	genericFiltersCollection,
+	returnAllAndLimit,
+	searchOptions,
+	sortCollection,
+} from '../../descriptions';
+import { theHiveApiQuery } from '../../transport';
+import type { QueryScope } from '../../helpers/interfaces';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	{
+		// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+		displayName: 'Search in',
+		name: 'searchIn',
+		type: 'options',
+		default: 'all',
+		description:
+			'Whether to search for comments in all alerts and cases or in a specific case or alert',
+		options: [
+			{
+				name: 'Alerts and Cases',
+				value: 'all',
+			},
+			{
+				name: 'Alert',
+				value: 'alert',
+			},
+			{
+				name: 'Case',
+				value: 'case',
+			},
+		],
+	},
+	{
+		...caseRLC,
+		displayOptions: {
+			show: {
+				searchIn: ['case'],
+			},
+		},
+	},
+	{
+		...alertRLC,
+		displayOptions: {
+			show: {
+				searchIn: ['alert'],
+			},
+		},
+	},
+	...returnAllAndLimit,
+	genericFiltersCollection,
+	sortCollection,
+	searchOptions,
+];
+
+const displayOptions = {
+	show: {
+		resource: ['comment'],
+		operation: ['search'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	let responseData: IDataObject | IDataObject[] = [];
+
+	const searchIn = this.getNodeParameter('searchIn', i) as string;
+	const filtersValues = this.getNodeParameter('filters.values', i, []) as IDataObject[];
+	const sortFields = this.getNodeParameter('sort.fields', i, []) as IDataObject[];
+	const returnAll = this.getNodeParameter('returnAll', i);
+	const { returnCount, extraData } = this.getNodeParameter('options', i);
+
+	let limit;
+	let scope: QueryScope;
+
+	if (searchIn === 'all') {
+		scope = { query: 'listComment' };
+	} else if (searchIn === 'alert') {
+		const alertId = this.getNodeParameter('alertId', i, '', { extractValue: true }) as string;
+		scope = { query: 'getAlert', id: alertId, restrictTo: 'comments' };
+	} else if (searchIn === 'case') {
+		const caseId = this.getNodeParameter('caseId', i, '', { extractValue: true }) as string;
+		scope = { query: 'getCase', id: caseId, restrictTo: 'comments' };
+	} else {
+		throw new NodeOperationError(this.getNode(), `Invalid 'Search In ...' value: ${searchIn}`);
+	}
+
+	if (!returnAll) {
+		limit = this.getNodeParameter('limit', i);
+	}
+
+	responseData = await theHiveApiQuery.call(
+		this,
+		scope,
+		filtersValues,
+		sortFields,
+		limit,
+		returnCount as boolean,
+		extraData as string[],
+	);
+
+	const executionData = this.helpers.constructExecutionMetaData(wrapData(responseData), {
+		itemData: { item: i },
+	});
+
+	return executionData;
+}
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/comment/update.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/comment/update.operation.ts
new file mode 100644
index 0000000000000..5379ce91a4e3a
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/comment/update.operation.ts
@@ -0,0 +1,51 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+import { theHiveApiRequest } from '../../transport';
+import { commentRLC } from '../../descriptions';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	commentRLC,
+	{
+		displayName: 'Message',
+		name: 'message',
+		type: 'string',
+		default: '',
+		required: true,
+		typeOptions: {
+			rows: 2,
+		},
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['comment'],
+		operation: ['update'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	let responseData: IDataObject | IDataObject[] = [];
+
+	const commentId = this.getNodeParameter('commentId', i, '', { extractValue: true }) as string;
+	const message = this.getNodeParameter('message', i) as string;
+
+	const body: IDataObject = {
+		message,
+	};
+
+	responseData = await theHiveApiRequest.call(this, 'PATCH', `/v1/comment/${commentId}`, body);
+
+	const executionData = this.helpers.constructExecutionMetaData(wrapData(responseData), {
+		itemData: { item: i },
+	});
+
+	return executionData;
+}
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/log/addAttachment.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/log/addAttachment.operation.ts
new file mode 100644
index 0000000000000..31e84c5dc914a
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/log/addAttachment.operation.ts
@@ -0,0 +1,66 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+import { theHiveApiRequest } from '../../transport';
+import { attachmentsUi, logRLC } from '../../descriptions';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
+const properties: INodeProperties[] = [logRLC, attachmentsUi];
+
+const displayOptions = {
+	show: {
+		resource: ['log'],
+		operation: ['addAttachment'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	const logId = this.getNodeParameter('logId', i, '', { extractValue: true }) as string;
+
+	const inputDataFields = (
+		this.getNodeParameter('attachmentsUi.values', i, []) as IDataObject[]
+	).map((entry) => (entry.field as string).trim());
+
+	const attachments = [];
+
+	for (const inputDataField of inputDataFields) {
+		const binaryData = this.helpers.assertBinaryData(i, inputDataField);
+		const dataBuffer = await this.helpers.getBinaryDataBuffer(i, inputDataField);
+
+		attachments.push({
+			value: dataBuffer,
+			options: {
+				contentType: binaryData.mimeType,
+				filename: binaryData.fileName,
+			},
+		});
+	}
+
+	await theHiveApiRequest.call(
+		this,
+		'POST',
+		`/v1/log/${logId}/attachments`,
+		undefined,
+		undefined,
+		undefined,
+		{
+			Headers: {
+				'Content-Type': 'multipart/form-data',
+			},
+			formData: {
+				attachments,
+			},
+		},
+	);
+
+	const executionData = this.helpers.constructExecutionMetaData(wrapData({ success: true }), {
+		itemData: { item: i },
+	});
+
+	return executionData;
+}
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/log/create.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/log/create.operation.ts
new file mode 100644
index 0000000000000..2f73eeaed08cc
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/log/create.operation.ts
@@ -0,0 +1,115 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+
+import { theHiveApiRequest } from '../../transport';
+
+import { fixFieldType, prepareInputItem } from '../../helpers/utils';
+import { attachmentsUi, taskRLC } from '../../descriptions';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	taskRLC,
+	{
+		displayName: 'Fields',
+		name: 'logFields',
+		type: 'resourceMapper',
+		default: {
+			mappingMode: 'defineBelow',
+			value: null,
+		},
+		noDataExpression: true,
+		required: true,
+		typeOptions: {
+			resourceMapper: {
+				resourceMapperMethod: 'getLogFields',
+				mode: 'add',
+				valuesLabel: 'Fields',
+			},
+		},
+	},
+	attachmentsUi,
+];
+
+const displayOptions = {
+	show: {
+		resource: ['log'],
+		operation: ['create'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	i: number,
+	item: INodeExecutionData,
+): Promise<INodeExecutionData[]> {
+	let responseData: IDataObject | IDataObject[] = [];
+	let body: IDataObject = {};
+
+	const dataMode = this.getNodeParameter('logFields.mappingMode', i) as string;
+	const taskId = this.getNodeParameter('taskId', i, '', { extractValue: true }) as string;
+
+	if (dataMode === 'autoMapInputData') {
+		const schema = this.getNodeParameter('logFields.schema', i) as IDataObject[];
+		body = prepareInputItem(item.json, schema, i);
+	}
+
+	if (dataMode === 'defineBelow') {
+		const logFields = this.getNodeParameter('logFields.value', i, []) as IDataObject;
+		body = logFields;
+	}
+
+	body = fixFieldType(body);
+
+	const inputDataFields = (
+		this.getNodeParameter('attachmentsUi.values', i, []) as IDataObject[]
+	).map((entry) => (entry.field as string).trim());
+
+	if (inputDataFields.length) {
+		const binaries = [];
+
+		for (const inputDataField of inputDataFields) {
+			const binaryData = this.helpers.assertBinaryData(i, inputDataField);
+			const dataBuffer = await this.helpers.getBinaryDataBuffer(i, inputDataField);
+
+			binaries.push({
+				value: dataBuffer,
+				options: {
+					contentType: binaryData.mimeType,
+					filename: binaryData.fileName,
+				},
+			});
+		}
+
+		responseData = await theHiveApiRequest.call(
+			this,
+			'POST',
+			`/v1/task/${taskId}/log`,
+			undefined,
+			undefined,
+			undefined,
+			{
+				Headers: {
+					'Content-Type': 'multipart/form-data',
+				},
+				formData: {
+					attachments: binaries,
+					_json: JSON.stringify(body),
+				},
+			},
+		);
+	} else {
+		responseData = await theHiveApiRequest.call(this, 'POST', `/v1/task/${taskId}/log`, body);
+	}
+
+	const executionData = this.helpers.constructExecutionMetaData(wrapData(responseData), {
+		itemData: { item: i },
+	});
+
+	return executionData;
+}
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/log/deleteAttachment.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/log/deleteAttachment.operation.ts
new file mode 100644
index 0000000000000..3f3e64755e4b1
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/log/deleteAttachment.operation.ts
@@ -0,0 +1,43 @@
+import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
+import { theHiveApiRequest } from '../../transport';
+import { logRLC } from '../../descriptions';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	logRLC,
+	{
+		displayName: 'Attachment Name or ID',
+		name: 'attachmentId',
+		type: 'options',
+		default: '',
+		required: true,
+		description:
+			'ID of the attachment. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+		typeOptions: {
+			loadOptionsMethod: 'loadLogAttachments',
+			loadOptionsDependsOn: ['logId.value'],
+		},
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['log'],
+		operation: ['deleteAttachment'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	const logId = this.getNodeParameter('logId', i, '', { extractValue: true }) as string;
+	const attachmentId = this.getNodeParameter('attachmentId', i) as string;
+
+	await theHiveApiRequest.call(this, 'DELETE', `/v1/log/${logId}/attachments/${attachmentId}`);
+
+	const executionData = this.helpers.constructExecutionMetaData(wrapData({ success: true }), {
+		itemData: { item: i },
+	});
+
+	return executionData;
+}
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/log/deleteLog.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/log/deleteLog.operation.ts
new file mode 100644
index 0000000000000..44fb4e5aed139
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/log/deleteLog.operation.ts
@@ -0,0 +1,27 @@
+import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
+import { theHiveApiRequest } from '../../transport';
+import { logRLC } from '../../descriptions';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
+const properties: INodeProperties[] = [logRLC];
+
+const displayOptions = {
+	show: {
+		resource: ['log'],
+		operation: ['deleteLog'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	const logId = this.getNodeParameter('logId', i, '', { extractValue: true }) as string;
+
+	await theHiveApiRequest.call(this, 'DELETE', `/v1/log/${logId}`);
+
+	const executionData = this.helpers.constructExecutionMetaData(wrapData({ success: true }), {
+		itemData: { item: i },
+	});
+
+	return executionData;
+}
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/log/executeResponder.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/log/executeResponder.operation.ts
new file mode 100644
index 0000000000000..8eceb9660b08d
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/log/executeResponder.operation.ts
@@ -0,0 +1,72 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+import { logRLC, responderOptions } from '../../descriptions';
+import { theHiveApiRequest } from '../../transport';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
+const properties: INodeProperties[] = [{ ...logRLC, name: 'id' }, responderOptions];
+
+const displayOptions = {
+	show: {
+		resource: ['log'],
+		operation: ['executeResponder'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	let responseData: IDataObject | IDataObject[] = [];
+
+	const logId = this.getNodeParameter('id', i);
+	const responderId = this.getNodeParameter('responder', i) as string;
+	let body: IDataObject;
+	let response;
+	const qs: IDataObject = {};
+	body = {
+		responderId,
+		objectId: logId,
+		objectType: 'case_task_log',
+	};
+	response = await theHiveApiRequest.call(this, 'POST', '/connector/cortex/action' as string, body);
+	body = {
+		query: [
+			{
+				_name: 'listAction',
+			},
+			{
+				_name: 'filter',
+				_and: [
+					{
+						_field: 'cortexId',
+						_value: response.cortexId,
+					},
+					{
+						_field: 'objectId',
+						_value: response.objectId,
+					},
+					{
+						_field: 'startDate',
+						_value: response.startDate,
+					},
+				],
+			},
+		],
+	};
+	qs.name = 'log-actions';
+	do {
+		response = await theHiveApiRequest.call(this, 'POST', '/v1/query', body, qs);
+	} while (response.status === 'Waiting' || response.status === 'InProgress');
+
+	responseData = response;
+
+	const executionData = this.helpers.constructExecutionMetaData(wrapData(responseData), {
+		itemData: { item: i },
+	});
+
+	return executionData;
+}
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/log/get.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/log/get.operation.ts
new file mode 100644
index 0000000000000..b110db32aca09
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/log/get.operation.ts
@@ -0,0 +1,43 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+import { theHiveApiRequest } from '../../transport';
+import { logRLC } from '../../descriptions';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
+const properties: INodeProperties[] = [logRLC];
+
+const displayOptions = {
+	show: {
+		resource: ['log'],
+		operation: ['get'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	let responseData: IDataObject | IDataObject[] = [];
+
+	const logId = this.getNodeParameter('logId', i, '', { extractValue: true }) as string;
+
+	const body = {
+		query: [
+			{
+				_name: 'getLog',
+				idOrName: logId,
+			},
+		],
+	};
+
+	responseData = await theHiveApiRequest.call(this, 'POST', '/v1/query', body);
+
+	const executionData = this.helpers.constructExecutionMetaData(wrapData(responseData), {
+		itemData: { item: i },
+	});
+
+	return executionData;
+}
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/log/index.ts b/packages/nodes-base/nodes/TheHiveProject/actions/log/index.ts
new file mode 100644
index 0000000000000..afd47ea08d858
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/log/index.ts
@@ -0,0 +1,71 @@
+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 deleteLog from './deleteLog.operation';
+import * as executeResponder from './executeResponder.operation';
+import * as get from './get.operation';
+import * as search from './search.operation';
+
+export { addAttachment, create, deleteAttachment, deleteLog, executeResponder, get, search };
+
+export const description: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		noDataExpression: true,
+		type: 'options',
+		required: true,
+		default: 'create',
+		options: [
+			{
+				name: 'Add Attachment',
+				value: 'addAttachment',
+				action: 'Add attachment to a task log',
+			},
+			{
+				name: 'Create',
+				value: 'create',
+				action: 'Create a task log',
+			},
+			{
+				name: 'Delete',
+				value: 'deleteLog',
+				action: 'Delete task log',
+			},
+			{
+				name: 'Delete Attachment',
+				value: 'deleteAttachment',
+				action: 'Delete attachment from a task log',
+			},
+			{
+				name: 'Execute Responder',
+				value: 'executeResponder',
+				action: 'Execute responder on a task log',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				action: 'Get a task log',
+			},
+			{
+				name: 'Search',
+				value: 'search',
+				action: 'Search task logs',
+			},
+		],
+		displayOptions: {
+			show: {
+				resource: ['log'],
+			},
+		},
+	},
+	...addAttachment.description,
+	...create.description,
+	...deleteAttachment.description,
+	...deleteLog.description,
+	...executeResponder.description,
+	...get.description,
+	...search.description,
+];
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/log/search.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/log/search.operation.ts
new file mode 100644
index 0000000000000..9aed5104042bc
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/log/search.operation.ts
@@ -0,0 +1,87 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+import {
+	taskRLC,
+	genericFiltersCollection,
+	returnAllAndLimit,
+	sortCollection,
+	searchOptions,
+} from '../../descriptions';
+import { theHiveApiQuery } from '../../transport';
+import type { QueryScope } from '../../helpers/interfaces';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	{
+		displayName: 'Search in All Tasks',
+		name: 'allTasks',
+		type: 'boolean',
+		default: true,
+		description: 'Whether to search in all tasks or only in selected task',
+	},
+	{
+		...taskRLC,
+		displayOptions: {
+			show: {
+				allTasks: [false],
+			},
+		},
+	},
+	...returnAllAndLimit,
+	genericFiltersCollection,
+	sortCollection,
+	searchOptions,
+];
+
+const displayOptions = {
+	show: {
+		resource: ['log'],
+		operation: ['search'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	let responseData: IDataObject | IDataObject[] = [];
+
+	const allTasks = this.getNodeParameter('allTasks', i) as boolean;
+	const filtersValues = this.getNodeParameter('filters.values', i, []) as IDataObject[];
+	const sortFields = this.getNodeParameter('sort.fields', i, []) as IDataObject[];
+	const returnAll = this.getNodeParameter('returnAll', i);
+	const { returnCount, extraData } = this.getNodeParameter('options', i);
+
+	let limit;
+	let scope: QueryScope;
+
+	if (allTasks) {
+		scope = { query: 'listLog' };
+	} else {
+		const taskId = this.getNodeParameter('taskId', i, '', { extractValue: true }) as string;
+		scope = { query: 'getTask', id: taskId, restrictTo: 'logs' };
+	}
+
+	if (!returnAll) {
+		limit = this.getNodeParameter('limit', i);
+	}
+
+	responseData = await theHiveApiQuery.call(
+		this,
+		scope,
+		filtersValues,
+		sortFields,
+		limit,
+		returnCount as boolean,
+		extraData as string[],
+	);
+
+	const executionData = this.helpers.constructExecutionMetaData(wrapData(responseData), {
+		itemData: { item: i },
+	});
+
+	return executionData;
+}
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/node.description.ts b/packages/nodes-base/nodes/TheHiveProject/actions/node.description.ts
new file mode 100644
index 0000000000000..b5af7386c7392
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/node.description.ts
@@ -0,0 +1,85 @@
+/* eslint-disable n8n-nodes-base/node-filename-against-convention */
+import type { INodeTypeDescription } from 'n8n-workflow';
+
+import * as alert from './alert';
+import * as case_ from './case';
+import * as comment from './comment';
+import * as log from './log';
+import * as observable from './observable';
+import * as query from './query';
+import * as task from './task';
+import * as page from './page';
+
+export const description: INodeTypeDescription = {
+	displayName: 'TheHive 5',
+	name: 'theHiveProject',
+	icon: 'file:thehiveproject.svg',
+	group: ['transform'],
+	subtitle: '={{$parameter["operation"]}} : {{$parameter["resource"]}}',
+	version: 1,
+	description: 'Consume TheHive 5 API',
+	defaults: {
+		name: 'TheHive 5',
+	},
+	inputs: ['main'],
+	outputs: ['main'],
+	credentials: [
+		{
+			name: 'theHiveProjectApi',
+			required: true,
+		},
+	],
+	properties: [
+		{
+			displayName: 'Resource',
+			name: 'resource',
+			type: 'options',
+			noDataExpression: true,
+			required: true,
+			options: [
+				{
+					name: 'Alert',
+					value: 'alert',
+				},
+				{
+					name: 'Case',
+					value: 'case',
+				},
+				{
+					name: 'Comment',
+					value: 'comment',
+				},
+				{
+					name: 'Observable',
+					value: 'observable',
+				},
+				{
+					name: 'Page',
+					value: 'page',
+				},
+				{
+					name: 'Query',
+					value: 'query',
+				},
+				{
+					name: 'Task',
+					value: 'task',
+				},
+				{
+					name: 'Task Log',
+					value: 'log',
+				},
+			],
+			default: 'alert',
+		},
+
+		...alert.description,
+		...case_.description,
+		...comment.description,
+		...log.description,
+		...observable.description,
+		...page.description,
+		...query.description,
+		...task.description,
+	],
+};
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/node.type.ts b/packages/nodes-base/nodes/TheHiveProject/actions/node.type.ts
new file mode 100644
index 0000000000000..29575ab79e6d4
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/node.type.ts
@@ -0,0 +1,47 @@
+import type { AllEntities } from 'n8n-workflow';
+
+type NodeMap = {
+	alert:
+		| 'create'
+		| 'deleteAlert'
+		| 'executeResponder'
+		| 'get'
+		| 'search'
+		| 'status'
+		| 'merge'
+		| 'promote'
+		| 'update';
+	case:
+		| 'addAttachment'
+		| 'create'
+		| 'deleteAttachment'
+		| 'deleteCase'
+		| 'executeResponder'
+		| 'get'
+		| 'search'
+		| 'getAttachment'
+		| 'getTimeline'
+		| 'update';
+	comment: 'add' | 'deleteComment' | 'search' | 'update';
+	log:
+		| 'addAttachment'
+		| 'create'
+		| 'deleteLog'
+		| 'deleteAttachment'
+		| 'executeResponder'
+		| 'get'
+		| 'search';
+	observable:
+		| 'create'
+		| 'deleteObservable'
+		| 'executeAnalyzer'
+		| 'executeResponder'
+		| 'get'
+		| 'search'
+		| 'update';
+	page: 'create' | 'deletePage' | 'search' | 'update';
+	query: 'executeQuery';
+	task: 'create' | 'deleteTask' | 'executeResponder' | 'get' | 'search' | 'update';
+};
+
+export type TheHiveType = AllEntities<NodeMap>;
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/observable/create.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/observable/create.operation.ts
new file mode 100644
index 0000000000000..b431c2e9ca19c
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/observable/create.operation.ts
@@ -0,0 +1,187 @@
+import {
+	NodeOperationError,
+	type IDataObject,
+	type IExecuteFunctions,
+	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';
+
+const properties: INodeProperties[] = [
+	{
+		// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+		displayName: 'Create in',
+		name: 'createIn',
+		type: 'options',
+		options: [
+			{
+				name: 'Case',
+				value: 'case',
+			},
+			{
+				name: 'Alert',
+				value: 'alert',
+			},
+		],
+		default: 'case',
+	},
+	{
+		...caseRLC,
+		name: 'id',
+		displayOptions: {
+			show: {
+				createIn: ['case'],
+			},
+		},
+	},
+	{
+		...alertRLC,
+		name: 'id',
+		displayOptions: {
+			show: {
+				createIn: ['alert'],
+			},
+		},
+	},
+	{
+		// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-options
+		displayName: 'Data Type',
+		name: 'dataType',
+		type: 'options',
+		description:
+			'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
+		required: true,
+		default: 'file',
+		typeOptions: {
+			loadOptionsMethod: 'loadObservableTypes',
+		},
+	},
+	{
+		displayName: 'Data',
+		name: 'data',
+		type: 'string',
+		default: '',
+		required: true,
+		displayOptions: {
+			hide: {
+				dataType: ['file'],
+			},
+		},
+	},
+	{ ...attachmentsUi, required: true, displayOptions: { show: { dataType: ['file'] } } },
+	{
+		displayName: 'Fields',
+		name: 'observableFields',
+		type: 'resourceMapper',
+		default: {
+			mappingMode: 'defineBelow',
+			value: null,
+		},
+		noDataExpression: true,
+		required: true,
+		typeOptions: {
+			resourceMapper: {
+				resourceMapperMethod: 'getObservableFields',
+				mode: 'add',
+				valuesLabel: 'Fields',
+			},
+		},
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['observable'],
+		operation: ['create'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	i: number,
+	item: INodeExecutionData,
+): Promise<INodeExecutionData[]> {
+	let responseData: IDataObject = {};
+	let body: IDataObject = {};
+
+	const createIn = this.getNodeParameter('createIn', i) as string;
+	const id = this.getNodeParameter('id', i, '', { extractValue: true }) as string;
+	const endpoint = `/v1/${createIn}/${id}/observable`;
+
+	const dataMode = this.getNodeParameter('observableFields.mappingMode', i) as string;
+
+	if (dataMode === 'autoMapInputData') {
+		const schema = this.getNodeParameter('observableFields.schema', i) as IDataObject[];
+		body = prepareInputItem(item.json, schema, i);
+	}
+
+	if (dataMode === 'defineBelow') {
+		const observableFields = this.getNodeParameter('observableFields.value', i, []) as IDataObject;
+		body = observableFields;
+	}
+
+	body = fixFieldType(body);
+
+	const dataType = this.getNodeParameter('dataType', i) as string;
+
+	body.dataType = dataType;
+
+	if (dataType === 'file') {
+		const inputDataFields = (
+			this.getNodeParameter('attachmentsUi.values', i, []) as IDataObject[]
+		).map((entry) => (entry.field as string).trim());
+
+		const formData = new FormData();
+
+		for (const inputDataField of inputDataFields) {
+			const binaryData = this.helpers.assertBinaryData(i, inputDataField);
+			const dataBuffer = await this.helpers.getBinaryDataBuffer(i, inputDataField);
+
+			formData.append('attachment', dataBuffer, {
+				filename: binaryData.fileName,
+				contentType: binaryData.mimeType,
+			});
+		}
+
+		formData.append('_json', JSON.stringify(body));
+
+		responseData = await theHiveApiRequest.call(
+			this,
+			'POST',
+			endpoint,
+			undefined,
+			undefined,
+			undefined,
+			{
+				Headers: {
+					'Content-Type': 'multipart/form-data',
+				},
+				formData,
+			},
+		);
+	} else {
+		const data = this.getNodeParameter('data', i) as string;
+		body.data = data;
+		responseData = await theHiveApiRequest.call(this, 'POST', endpoint, body);
+	}
+
+	if (responseData.failure) {
+		const message = (responseData.failure as IDataObject[])
+			.map((error: IDataObject) => error.message)
+			.join(', ');
+		throw new NodeOperationError(this.getNode(), message, { itemIndex: i });
+	}
+
+	const executionData = this.helpers.constructExecutionMetaData(wrapData(responseData), {
+		itemData: { item: i },
+	});
+
+	return executionData;
+}
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/observable/deleteObservable.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/observable/deleteObservable.operation.ts
new file mode 100644
index 0000000000000..e8e6567b5afde
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/observable/deleteObservable.operation.ts
@@ -0,0 +1,29 @@
+import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
+import { theHiveApiRequest } from '../../transport';
+import { observableRLC } from '../../descriptions';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
+const properties: INodeProperties[] = [observableRLC];
+
+const displayOptions = {
+	show: {
+		resource: ['observable'],
+		operation: ['deleteObservable'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	const observableId = this.getNodeParameter('observableId', i, '', {
+		extractValue: true,
+	}) as string;
+
+	await theHiveApiRequest.call(this, 'DELETE', `/v1/observable/${observableId}`);
+
+	const executionData = this.helpers.constructExecutionMetaData(wrapData({ success: true }), {
+		itemData: { item: i },
+	});
+
+	return executionData;
+}
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/observable/executeAnalyzer.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/observable/executeAnalyzer.operation.ts
new file mode 100644
index 0000000000000..50bbfbdfb34e7
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/observable/executeAnalyzer.operation.ts
@@ -0,0 +1,93 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+import { observableRLC, observableTypeOptions } from '../../descriptions';
+import { theHiveApiRequest } from '../../transport';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	observableRLC,
+	observableTypeOptions,
+	{
+		displayName: 'Analyzer Names or IDs',
+		name: 'analyzers',
+		type: 'multiOptions',
+		description:
+			'Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
+		required: true,
+		default: [],
+		typeOptions: {
+			loadOptionsDependsOn: ['observableId.value', 'dataType'],
+			loadOptionsMethod: 'loadAnalyzers',
+		},
+		displayOptions: {
+			hide: {
+				id: [''],
+			},
+		},
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['observable'],
+		operation: ['executeAnalyzer'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	let responseData: IDataObject = {};
+
+	const observableId = this.getNodeParameter('observableId', i, '', {
+		extractValue: true,
+	}) as string;
+
+	const analyzers = (this.getNodeParameter('analyzers', i) as string[]).map((analyzer) => {
+		const parts = analyzer.split('::');
+		return {
+			analyzerId: parts[0],
+			cortexId: parts[1],
+		};
+	});
+	let response: any;
+	let body: IDataObject;
+
+	const qs: IDataObject = {};
+	for (const analyzer of analyzers) {
+		body = {
+			...analyzer,
+			artifactId: observableId,
+		};
+		// execute the analyzer
+		response = await theHiveApiRequest.call(
+			this,
+			'POST',
+			'/connector/cortex/job' as string,
+			body,
+			qs,
+		);
+		const jobId = response.id;
+		qs.name = 'observable-jobs';
+		// query the job result (including the report)
+		do {
+			responseData = await theHiveApiRequest.call(
+				this,
+				'GET',
+				`/connector/cortex/job/${jobId}`,
+				body,
+				qs,
+			);
+		} while (responseData.status === 'Waiting' || responseData.status === 'InProgress');
+	}
+
+	const executionData = this.helpers.constructExecutionMetaData(wrapData(responseData), {
+		itemData: { item: i },
+	});
+
+	return executionData;
+}
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/observable/executeResponder.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/observable/executeResponder.operation.ts
new file mode 100644
index 0000000000000..5f75bc93676ef
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/observable/executeResponder.operation.ts
@@ -0,0 +1,73 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+import { observableRLC, responderOptions } from '../../descriptions';
+import { theHiveApiRequest } from '../../transport';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
+const properties: INodeProperties[] = [{ ...observableRLC, name: 'id' }, responderOptions];
+
+const displayOptions = {
+	show: {
+		resource: ['observable'],
+		operation: ['executeResponder'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	let responseData: IDataObject | IDataObject[] = [];
+
+	const observableId = this.getNodeParameter('id', i);
+	const responderId = this.getNodeParameter('responder', i) as string;
+	let body: IDataObject;
+	let response;
+	responseData = [];
+	body = {
+		responderId,
+		objectId: observableId,
+		objectType: 'case_artifact',
+	};
+	response = await theHiveApiRequest.call(this, 'POST', '/connector/cortex/action' as string, body);
+	body = {
+		query: [
+			{
+				_name: 'listAction',
+			},
+			{
+				_name: 'filter',
+				_and: [
+					{
+						_field: 'cortexId',
+						_value: response.cortexId,
+					},
+					{
+						_field: 'objectId',
+						_value: response.objectId,
+					},
+					{
+						_field: 'startDate',
+						_value: response.startDate,
+					},
+				],
+			},
+		],
+	};
+	const qs: IDataObject = {};
+	qs.name = 'log-actions';
+	do {
+		response = await theHiveApiRequest.call(this, 'POST', '/v1/query', body, qs);
+	} while (response.status === 'Waiting' || response.status === 'InProgress');
+
+	responseData = response;
+
+	const executionData = this.helpers.constructExecutionMetaData(wrapData(responseData), {
+		itemData: { item: i },
+	});
+
+	return executionData;
+}
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/observable/get.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/observable/get.operation.ts
new file mode 100644
index 0000000000000..7dc729b56d39c
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/observable/get.operation.ts
@@ -0,0 +1,49 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+import { theHiveApiRequest } from '../../transport';
+import { observableRLC } from '../../descriptions';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
+const properties: INodeProperties[] = [observableRLC];
+
+const displayOptions = {
+	show: {
+		resource: ['observable'],
+		operation: ['get'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	let responseData: IDataObject | IDataObject[] = [];
+
+	const observableId = this.getNodeParameter('observableId', i, '', {
+		extractValue: true,
+	}) as string;
+
+	const qs: IDataObject = {};
+
+	const body = {
+		query: [
+			{
+				_name: 'getObservable',
+				idOrName: observableId,
+			},
+		],
+	};
+
+	qs.name = `get-observable-${observableId}`;
+
+	responseData = await theHiveApiRequest.call(this, 'POST', '/v1/query', body, qs);
+
+	const executionData = this.helpers.constructExecutionMetaData(wrapData(responseData), {
+		itemData: { item: i },
+	});
+
+	return executionData;
+}
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/observable/index.ts b/packages/nodes-base/nodes/TheHiveProject/actions/observable/index.ts
new file mode 100644
index 0000000000000..c9eb3ecad33a6
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/observable/index.ts
@@ -0,0 +1,71 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+import * as create from './create.operation';
+import * as deleteObservable from './deleteObservable.operation';
+import * as executeAnalyzer from './executeAnalyzer.operation';
+import * as executeResponder from './executeResponder.operation';
+import * as get from './get.operation';
+import * as search from './search.operation';
+import * as update from './update.operation';
+
+export { create, deleteObservable, executeAnalyzer, executeResponder, get, search, update };
+
+export const description: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		required: true,
+		default: 'create',
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				action: 'Create an observable',
+			},
+			{
+				name: 'Delete',
+				value: 'deleteObservable',
+				action: 'Delete an observable',
+			},
+			{
+				name: 'Execute Analyzer',
+				value: 'executeAnalyzer',
+				action: 'Execute analyzer on an observable',
+			},
+			{
+				name: 'Execute Responder',
+				value: 'executeResponder',
+				action: 'Execute responder on an observable',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				action: 'Get an observable',
+			},
+			{
+				name: 'Search',
+				value: 'search',
+				action: 'Search observables',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				action: 'Update an observable',
+			},
+		],
+		displayOptions: {
+			show: {
+				resource: ['observable'],
+			},
+		},
+	},
+	...create.description,
+	...deleteObservable.description,
+	...executeAnalyzer.description,
+	...executeResponder.description,
+	...get.description,
+	...search.description,
+	...update.description,
+];
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/observable/search.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/observable/search.operation.ts
new file mode 100644
index 0000000000000..e27c8e8331c9b
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/observable/search.operation.ts
@@ -0,0 +1,118 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+import { NodeOperationError } from 'n8n-workflow';
+import {
+	alertRLC,
+	caseRLC,
+	genericFiltersCollection,
+	returnAllAndLimit,
+	searchOptions,
+	sortCollection,
+} from '../../descriptions';
+import { theHiveApiQuery } from '../../transport';
+import type { QueryScope } from '../../helpers/interfaces';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	{
+		// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+		displayName: 'Search in',
+		name: 'searchIn',
+		type: 'options',
+		default: 'all',
+		description:
+			'Whether to search for observables in all alerts and cases or in a specific case or alert',
+		options: [
+			{
+				name: 'Alerts and Cases',
+				value: 'all',
+			},
+			{
+				name: 'Alert',
+				value: 'alert',
+			},
+			{
+				name: 'Case',
+				value: 'case',
+			},
+		],
+	},
+	{
+		...caseRLC,
+		displayOptions: {
+			show: {
+				searchIn: ['case'],
+			},
+		},
+	},
+	{
+		...alertRLC,
+		displayOptions: {
+			show: {
+				searchIn: ['alert'],
+			},
+		},
+	},
+	...returnAllAndLimit,
+	genericFiltersCollection,
+	sortCollection,
+	searchOptions,
+];
+
+const displayOptions = {
+	show: {
+		resource: ['observable'],
+		operation: ['search'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	let responseData: IDataObject | IDataObject[] = [];
+
+	const searchIn = this.getNodeParameter('searchIn', i) as string;
+	const filtersValues = this.getNodeParameter('filters.values', i, []) as IDataObject[];
+	const sortFields = this.getNodeParameter('sort.fields', i, []) as IDataObject[];
+	const returnAll = this.getNodeParameter('returnAll', i);
+	const { returnCount, extraData } = this.getNodeParameter('options', i);
+
+	let limit;
+	let scope: QueryScope;
+
+	if (searchIn === 'all') {
+		scope = { query: 'listObservable' };
+	} else if (searchIn === 'alert') {
+		const alertId = this.getNodeParameter('alertId', i, '', { extractValue: true }) as string;
+		scope = { query: 'getAlert', id: alertId, restrictTo: 'observables' };
+	} else if (searchIn === 'case') {
+		const caseId = this.getNodeParameter('caseId', i, '', { extractValue: true }) as string;
+		scope = { query: 'getCase', id: caseId, restrictTo: 'observables' };
+	} else {
+		throw new NodeOperationError(this.getNode(), `Invalid 'Search In ...' value: ${searchIn}`);
+	}
+
+	if (!returnAll) {
+		limit = this.getNodeParameter('limit', i);
+	}
+
+	responseData = await theHiveApiQuery.call(
+		this,
+		scope,
+		filtersValues,
+		sortFields,
+		limit,
+		returnCount as boolean,
+		extraData as string[],
+	);
+
+	const executionData = this.helpers.constructExecutionMetaData(wrapData(responseData), {
+		itemData: { item: i },
+	});
+
+	return executionData;
+}
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/observable/update.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/observable/update.operation.ts
new file mode 100644
index 0000000000000..9c3ef4243f880
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/observable/update.operation.ts
@@ -0,0 +1,139 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	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';
+
+const properties: INodeProperties[] = [
+	{
+		displayName: 'Fields',
+		name: 'observableUpdateFields',
+		type: 'resourceMapper',
+		default: {
+			mappingMode: 'defineBelow',
+			value: null,
+		},
+		noDataExpression: true,
+		required: true,
+		typeOptions: {
+			resourceMapper: {
+				resourceMapperMethod: 'getObservableUpdateFields',
+				mode: 'update',
+				valuesLabel: 'Fields',
+				addAllFields: true,
+				multiKeyMatch: true,
+			},
+		},
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['observable'],
+		operation: ['update'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	i: number,
+	item: INodeExecutionData,
+): Promise<INodeExecutionData[]> {
+	let body: IDataObject = {};
+	let updated = 1;
+
+	const dataMode = this.getNodeParameter('observableUpdateFields.mappingMode', i) as string;
+
+	if (dataMode === 'autoMapInputData') {
+		const schema = this.getNodeParameter('observableUpdateFields.schema', i) as IDataObject[];
+		body = prepareInputItem(item.json, schema, i);
+	}
+
+	if (dataMode === 'defineBelow') {
+		const observableUpdateFields = this.getNodeParameter(
+			'observableUpdateFields.value',
+			i,
+			[],
+		) as IDataObject;
+		body = observableUpdateFields;
+	}
+
+	body = fixFieldType(body);
+
+	const fieldsToMatchOn = this.getNodeParameter(
+		'observableUpdateFields.matchingColumns',
+		i,
+	) as string[];
+
+	const updateBody: IDataObject = {};
+	const matchFields: IDataObject = {};
+	const { id } = body; // id would be used if matching on id, also we need to remove it from the body
+
+	for (const field of Object.keys(body)) {
+		if (fieldsToMatchOn.includes(field)) {
+			// if field is in fieldsToMatchOn, we need to exclude it from the updateBody, as values used for matching should not be updated
+			matchFields[field] = body[field];
+		} else {
+			// use set to construct the updateBody, as it allows to process customFields.fieldName
+			// if customFields provided under customFields property, it will be send as is
+			set(updateBody, field, body[field]);
+		}
+	}
+
+	if (fieldsToMatchOn.includes('id')) {
+		await theHiveApiRequest.call(this, 'PATCH', `/v1/observable/${id}`, body);
+	} else {
+		const filter = {
+			_name: 'filter',
+			_and: fieldsToMatchOn.map((field) => ({
+				_eq: {
+					_field: field,
+					_value: matchFields[field],
+				},
+			})),
+		};
+
+		const queryBody = {
+			query: [
+				{
+					_name: 'listObservable',
+				},
+				filter,
+			],
+		};
+
+		const matches = (await theHiveApiRequest.call(
+			this,
+			'POST',
+			'/v1/query',
+			queryBody,
+		)) as IDataObject[];
+
+		if (!matches.length) {
+			throw new NodeOperationError(this.getNode(), 'No matching alerts found');
+		}
+		const ids = matches.map((match) => match._id);
+		updated = ids.length;
+
+		updateBody.ids = ids;
+
+		await theHiveApiRequest.call(this, 'PATCH', '/v1/observable/_bulk', updateBody);
+	}
+
+	const executionData = this.helpers.constructExecutionMetaData(
+		wrapData({ success: true, updated }),
+		{
+			itemData: { item: i },
+		},
+	);
+
+	return executionData;
+}
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/page/create.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/page/create.operation.ts
new file mode 100644
index 0000000000000..0c2531d8df060
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/page/create.operation.ts
@@ -0,0 +1,102 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+import { theHiveApiRequest } from '../../transport';
+import { caseRLC } from '../../descriptions';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	{
+		// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+		displayName: 'Create in',
+		name: 'location',
+		type: 'options',
+		options: [
+			{
+				name: 'Case',
+				value: 'case',
+			},
+			{
+				name: 'Knowledge Base',
+				value: 'knowledgeBase',
+			},
+		],
+		default: 'case',
+	},
+	{
+		...caseRLC,
+		displayOptions: {
+			show: {
+				location: ['case'],
+			},
+		},
+	},
+	{
+		displayName: 'Title',
+		name: 'title',
+		type: 'string',
+		default: '',
+		required: true,
+	},
+	{
+		displayName: 'Category',
+		name: 'category',
+		type: 'string',
+		default: '',
+		required: true,
+	},
+	{
+		displayName: 'Content',
+		name: 'content',
+		type: 'string',
+		default: '',
+		required: true,
+		typeOptions: {
+			rows: 2,
+		},
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['page'],
+		operation: ['create'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	let responseData: IDataObject | IDataObject[] = [];
+
+	const location = this.getNodeParameter('location', i) as string;
+	const title = this.getNodeParameter('title', i) as string;
+	const category = this.getNodeParameter('category', i) as string;
+	const content = this.getNodeParameter('content', i) as string;
+
+	let endpoint;
+
+	if (location === 'case') {
+		const caseId = this.getNodeParameter('caseId', i, '', { extractValue: true }) as string;
+		endpoint = `/v1/case/${caseId}/page`;
+	} else {
+		endpoint = '/v1/page';
+	}
+
+	const body: IDataObject = {
+		title,
+		category,
+		content,
+	};
+
+	responseData = await theHiveApiRequest.call(this, 'POST', endpoint, body);
+
+	const executionData = this.helpers.constructExecutionMetaData(wrapData(responseData), {
+		itemData: { item: i },
+	});
+
+	return executionData;
+}
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/page/deletePage.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/page/deletePage.operation.ts
new file mode 100644
index 0000000000000..3522404168119
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/page/deletePage.operation.ts
@@ -0,0 +1,63 @@
+import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
+import { theHiveApiRequest } from '../../transport';
+import { caseRLC, pageRLC } from '../../descriptions';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	{
+		displayName: 'Delete From ...',
+		name: 'location',
+		type: 'options',
+		options: [
+			{
+				name: 'Case',
+				value: 'case',
+			},
+			{
+				name: 'Knowledge Base',
+				value: 'knowledgeBase',
+			},
+		],
+		default: 'knowledgeBase',
+	},
+	{
+		...caseRLC,
+		displayOptions: {
+			show: {
+				location: ['case'],
+			},
+		},
+	},
+	pageRLC,
+];
+
+const displayOptions = {
+	show: {
+		resource: ['page'],
+		operation: ['deletePage'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	const location = this.getNodeParameter('location', i) as string;
+	const pageId = this.getNodeParameter('pageId', i, '', { extractValue: true }) as string;
+
+	let endpoint;
+
+	if (location === 'case') {
+		const caseId = this.getNodeParameter('caseId', i, '', { extractValue: true }) as string;
+		endpoint = `/v1/case/${caseId}/page/${pageId}`;
+	} else {
+		endpoint = `/v1/page/${pageId}`;
+	}
+
+	await theHiveApiRequest.call(this, 'DELETE', endpoint);
+
+	const executionData = this.helpers.constructExecutionMetaData(wrapData({ success: true }), {
+		itemData: { item: i },
+	});
+
+	return executionData;
+}
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/page/index.ts b/packages/nodes-base/nodes/TheHiveProject/actions/page/index.ts
new file mode 100644
index 0000000000000..511f0e0d2f5a8
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/page/index.ts
@@ -0,0 +1,50 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+import * as create from './create.operation';
+import * as deletePage from './deletePage.operation';
+import * as search from './search.operation';
+import * as update from './update.operation';
+
+export { create, deletePage, search, update };
+
+export const description: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		noDataExpression: true,
+		type: 'options',
+		required: true,
+		default: 'create',
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				action: 'Create a page',
+			},
+			{
+				name: 'Delete',
+				value: 'deletePage',
+				action: 'Delete a page',
+			},
+			{
+				name: 'Search',
+				value: 'search',
+				action: 'Search pages',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				action: 'Update a page',
+			},
+		],
+		displayOptions: {
+			show: {
+				resource: ['page'],
+			},
+		},
+	},
+	...create.description,
+	...deletePage.description,
+	...search.description,
+	...update.description,
+];
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/page/search.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/page/search.operation.ts
new file mode 100644
index 0000000000000..796da7b682a90
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/page/search.operation.ts
@@ -0,0 +1,96 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+import {
+	caseRLC,
+	genericFiltersCollection,
+	returnAllAndLimit,
+	sortCollection,
+	searchOptions,
+} from '../../descriptions';
+import { theHiveApiQuery } from '../../transport';
+import type { QueryScope } from '../../helpers/interfaces';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	{
+		displayName: 'Search in Knowledge Base',
+		name: 'searchInKnowledgeBase',
+		type: 'boolean',
+		default: true,
+		description: 'Whether to search in knowledge base or only in the selected case',
+	},
+	{
+		...caseRLC,
+		displayOptions: {
+			show: {
+				searchInKnowledgeBase: [false],
+			},
+		},
+	},
+	...returnAllAndLimit,
+	genericFiltersCollection,
+	sortCollection,
+	{
+		...searchOptions,
+		displayOptions: {
+			show: {
+				returnAll: [true],
+			},
+		},
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['page'],
+		operation: ['search'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	let responseData: IDataObject | IDataObject[] = [];
+
+	const searchInKnowledgeBase = this.getNodeParameter('searchInKnowledgeBase', i) as boolean;
+	const filtersValues = this.getNodeParameter('filters.values', i, []) as IDataObject[];
+	const sortFields = this.getNodeParameter('sort.fields', i, []) as IDataObject[];
+	const returnAll = this.getNodeParameter('returnAll', i);
+	let returnCount = false;
+	if (!returnAll) {
+		returnCount = this.getNodeParameter('options.returnCount', i, false) as boolean;
+	}
+
+	let limit;
+	let scope: QueryScope;
+
+	if (searchInKnowledgeBase) {
+		scope = { query: 'listOrganisationPage' };
+	} else {
+		const caseId = this.getNodeParameter('caseId', i, '', { extractValue: true }) as string;
+		scope = { query: 'getCase', id: caseId, restrictTo: 'pages' };
+	}
+
+	if (!returnAll) {
+		limit = this.getNodeParameter('limit', i);
+	}
+
+	responseData = await theHiveApiQuery.call(
+		this,
+		scope,
+		filtersValues,
+		sortFields,
+		limit,
+		returnCount,
+	);
+
+	const executionData = this.helpers.constructExecutionMetaData(wrapData(responseData), {
+		itemData: { item: i },
+	});
+
+	return executionData;
+}
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/page/update.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/page/update.operation.ts
new file mode 100644
index 0000000000000..1b401e56454ae
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/page/update.operation.ts
@@ -0,0 +1,118 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+import { theHiveApiRequest } from '../../transport';
+import { caseRLC, pageRLC } from '../../descriptions';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	{
+		// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+		displayName: 'Update in',
+		name: 'location',
+		type: 'options',
+		options: [
+			{
+				name: 'Case',
+				value: 'case',
+			},
+			{
+				name: 'Knowledge Base',
+				value: 'knowledgeBase',
+			},
+		],
+		default: 'case',
+	},
+	{
+		...caseRLC,
+		displayOptions: {
+			show: {
+				location: ['case'],
+			},
+		},
+	},
+	pageRLC,
+	{
+		displayName: 'Content',
+		name: 'content',
+		type: 'string',
+		default: '',
+		typeOptions: {
+			rows: 2,
+		},
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			{
+				displayName: 'Category',
+				name: 'category',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Title',
+				name: 'title',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Order',
+				name: 'order',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['page'],
+		operation: ['update'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	let responseData: IDataObject | IDataObject[] = [];
+
+	const location = this.getNodeParameter('location', i) as string;
+	const pageId = this.getNodeParameter('pageId', i, '', { extractValue: true }) as string;
+	const content = this.getNodeParameter('content', i, '') as string;
+	const options = this.getNodeParameter('options', i, {});
+
+	let endpoint;
+
+	if (location === 'case') {
+		const caseId = this.getNodeParameter('caseId', i, '', { extractValue: true }) as string;
+		endpoint = `/v1/case/${caseId}/page/${pageId}`;
+	} else {
+		endpoint = `/v1/page/${pageId}`;
+	}
+
+	const body: IDataObject = options;
+
+	if (content) {
+		body.content = content;
+	}
+
+	responseData = await theHiveApiRequest.call(this, 'PATCH', endpoint, body);
+
+	const executionData = this.helpers.constructExecutionMetaData(wrapData(responseData), {
+		itemData: { item: i },
+	});
+
+	return executionData;
+}
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/query/executeQuery.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/query/executeQuery.operation.ts
new file mode 100644
index 0000000000000..f4772aacad363
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/query/executeQuery.operation.ts
@@ -0,0 +1,76 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+import { NodeOperationError, jsonParse } from 'n8n-workflow';
+
+import { theHiveApiRequest } from '../../transport';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	{
+		displayName: 'Query',
+		name: 'queryJson',
+		type: 'json',
+		required: true,
+		default: '=[\n  {\n    "_name": "listOrganisation"\n  }\n]',
+		description: 'Search for objects with filtering and sorting capabilities',
+		hint: 'The query should be an array of operations with the required selection and optional filtering, sorting, and pagination. See <a href="https://docs.strangebee.com/thehive/api-docs/#operation/Query%20API" target="_blank">Query API</a> for more information.',
+		typeOptions: {
+			rows: 10,
+		},
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['query'],
+		operation: ['executeQuery'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	let responseData: IDataObject | IDataObject[] = [];
+
+	const queryJson = this.getNodeParameter('queryJson', i) as string;
+
+	let query: IDataObject = {};
+	if (typeof queryJson === 'object') {
+		query = queryJson;
+	} else {
+		query = jsonParse<IDataObject>(queryJson, {
+			errorMessage: 'Query JSON must be a valid JSON object',
+		});
+	}
+
+	if (query.query) {
+		query = query.query as IDataObject;
+	}
+
+	if (!Array.isArray(query)) {
+		throw new NodeOperationError(
+			this.getNode(),
+			'The query should be an array of operations with the required selection and optional filtering, sorting, and pagination',
+		);
+	}
+
+	const body: IDataObject = {
+		query,
+	};
+
+	responseData = await theHiveApiRequest.call(this, 'POST', '/v1/query', body);
+
+	if (typeof responseData !== 'object') {
+		responseData = { queryResult: responseData };
+	}
+
+	const executionData = this.helpers.constructExecutionMetaData(wrapData(responseData), {
+		itemData: { item: i },
+	});
+
+	return executionData;
+}
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/query/index.ts b/packages/nodes-base/nodes/TheHiveProject/actions/query/index.ts
new file mode 100644
index 0000000000000..ccce45dadfbe6
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/query/index.ts
@@ -0,0 +1,29 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+import * as executeQuery from './executeQuery.operation';
+
+export { executeQuery };
+
+export const description: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		noDataExpression: true,
+		type: 'options',
+		required: true,
+		default: 'executeQuery',
+		options: [
+			{
+				name: 'Execute Query',
+				value: 'executeQuery',
+				action: 'Execute a query',
+			},
+		],
+		displayOptions: {
+			show: {
+				resource: ['query'],
+			},
+		},
+	},
+	...executeQuery.description,
+];
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/router.ts b/packages/nodes-base/nodes/TheHiveProject/actions/router.ts
new file mode 100644
index 0000000000000..0cb6866edab5c
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/router.ts
@@ -0,0 +1,80 @@
+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 * as observable from './observable';
+import * as page from './page';
+import * as query from './query';
+import * as task from './task';
+
+export async function router(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+	const items = this.getInputData();
+	const returnData: INodeExecutionData[] = [];
+	const length = items.length;
+
+	const resource = this.getNodeParameter<TheHiveType>('resource', 0);
+	const operation = this.getNodeParameter('operation', 0);
+
+	let executionData: INodeExecutionData[] = [];
+
+	const theHiveNodeData = {
+		resource,
+		operation,
+	} as TheHiveType;
+
+	for (let i = 0; i < length; i++) {
+		try {
+			switch (theHiveNodeData.resource) {
+				case 'alert':
+					executionData = await alert[theHiveNodeData.operation].execute.call(this, i, items[i]);
+					break;
+				case 'case':
+					executionData = await case_[theHiveNodeData.operation].execute.call(this, i, items[i]);
+					break;
+				case 'comment':
+					executionData = await comment[theHiveNodeData.operation].execute.call(this, i);
+					break;
+				case 'log':
+					executionData = await log[theHiveNodeData.operation].execute.call(this, i, items[i]);
+					break;
+				case 'observable':
+					executionData = await observable[theHiveNodeData.operation].execute.call(
+						this,
+						i,
+						items[i],
+					);
+					break;
+				case 'page':
+					executionData = await page[theHiveNodeData.operation].execute.call(this, i);
+					break;
+				case 'query':
+					executionData = await query[theHiveNodeData.operation].execute.call(this, i);
+					break;
+				case 'task':
+					executionData = await task[theHiveNodeData.operation].execute.call(this, i, items[i]);
+					break;
+				default:
+					throw new NodeOperationError(
+						this.getNode(),
+						`The operation "${operation}" is not supported!`,
+					);
+			}
+			returnData.push(...executionData);
+		} catch (error) {
+			if (this.continueOnFail()) {
+				executionData = this.helpers.constructExecutionMetaData(
+					this.helpers.returnJsonArray({ error: error.message }),
+					{ itemData: { item: i } },
+				);
+				returnData.push(...executionData);
+				continue;
+			}
+			throw error;
+		}
+	}
+	return await this.prepareOutputData(returnData);
+}
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/task/create.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/task/create.operation.ts
new file mode 100644
index 0000000000000..414549e6904f7
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/task/create.operation.ts
@@ -0,0 +1,75 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+
+import { theHiveApiRequest } from '../../transport';
+
+import { fixFieldType, prepareInputItem } from '../../helpers/utils';
+import { caseRLC } from '../../descriptions';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	caseRLC,
+	{
+		displayName: 'Fields',
+		name: 'taskFields',
+		type: 'resourceMapper',
+		default: {
+			mappingMode: 'defineBelow',
+			value: null,
+		},
+		noDataExpression: true,
+		required: true,
+		typeOptions: {
+			resourceMapper: {
+				resourceMapperMethod: 'getTaskFields',
+				mode: 'add',
+				valuesLabel: 'Fields',
+			},
+		},
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['task'],
+		operation: ['create'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	i: number,
+	item: INodeExecutionData,
+): Promise<INodeExecutionData[]> {
+	let responseData: IDataObject | IDataObject[] = [];
+	let body: IDataObject = {};
+
+	const dataMode = this.getNodeParameter('taskFields.mappingMode', i) as string;
+	const caseId = this.getNodeParameter('caseId', i, '', { extractValue: true }) as string;
+
+	if (dataMode === 'autoMapInputData') {
+		const schema = this.getNodeParameter('taskFields.schema', i) as IDataObject[];
+		body = prepareInputItem(item.json, schema, i);
+	}
+
+	if (dataMode === 'defineBelow') {
+		const taskFields = this.getNodeParameter('taskFields.value', i, []) as IDataObject;
+		body = taskFields;
+	}
+
+	body = fixFieldType(body);
+
+	responseData = await theHiveApiRequest.call(this, 'POST', `/v1/case/${caseId}/task`, body);
+
+	const executionData = this.helpers.constructExecutionMetaData(wrapData(responseData), {
+		itemData: { item: i },
+	});
+
+	return executionData;
+}
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/task/deleteTask.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/task/deleteTask.operation.ts
new file mode 100644
index 0000000000000..213e4794cfb73
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/task/deleteTask.operation.ts
@@ -0,0 +1,27 @@
+import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
+import { theHiveApiRequest } from '../../transport';
+import { taskRLC } from '../../descriptions';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
+const properties: INodeProperties[] = [taskRLC];
+
+const displayOptions = {
+	show: {
+		resource: ['task'],
+		operation: ['deleteTask'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	const taskId = this.getNodeParameter('taskId', i, '', { extractValue: true }) as string;
+
+	await theHiveApiRequest.call(this, 'DELETE', `/v1/task/${taskId}`);
+
+	const executionData = this.helpers.constructExecutionMetaData(wrapData({ success: true }), {
+		itemData: { item: i },
+	});
+
+	return executionData;
+}
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/task/executeResponder.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/task/executeResponder.operation.ts
new file mode 100644
index 0000000000000..d3f540baadb34
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/task/executeResponder.operation.ts
@@ -0,0 +1,75 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+import { responderOptions, taskRLC } from '../../descriptions';
+import { theHiveApiRequest } from '../../transport';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
+const properties: INodeProperties[] = [{ ...taskRLC, name: 'id' }, responderOptions];
+
+const displayOptions = {
+	show: {
+		resource: ['task'],
+		operation: ['executeResponder'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	let responseData: IDataObject | IDataObject[] = [];
+
+	const taskId = this.getNodeParameter('id', i);
+	const responderId = this.getNodeParameter('responder', i) as string;
+	let body: IDataObject;
+	let response;
+	responseData = [];
+
+	const qs: IDataObject = {};
+
+	body = {
+		responderId,
+		objectId: taskId,
+		objectType: 'case_task',
+	};
+	response = await theHiveApiRequest.call(this, 'POST', '/connector/cortex/action' as string, body);
+	body = {
+		query: [
+			{
+				_name: 'listAction',
+			},
+			{
+				_name: 'filter',
+				_and: [
+					{
+						_field: 'cortexId',
+						_value: response.cortexId,
+					},
+					{
+						_field: 'objectId',
+						_value: response.objectId,
+					},
+					{
+						_field: 'startDate',
+						_value: response.startDate,
+					},
+				],
+			},
+		],
+	};
+	qs.name = 'task-actions';
+	do {
+		response = await theHiveApiRequest.call(this, 'POST', '/v1/query', body, qs);
+	} while (response.status === 'Waiting' || response.status === 'InProgress');
+
+	responseData = response;
+
+	const executionData = this.helpers.constructExecutionMetaData(wrapData(responseData), {
+		itemData: { item: i },
+	});
+
+	return executionData;
+}
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/task/get.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/task/get.operation.ts
new file mode 100644
index 0000000000000..f88853e614f2e
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/task/get.operation.ts
@@ -0,0 +1,47 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+import { theHiveApiRequest } from '../../transport';
+import { taskRLC } from '../../descriptions';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
+const properties: INodeProperties[] = [taskRLC];
+
+const displayOptions = {
+	show: {
+		resource: ['task'],
+		operation: ['get'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	let responseData: IDataObject | IDataObject[] = [];
+
+	const taskId = this.getNodeParameter('taskId', i, '', { extractValue: true }) as string;
+
+	const qs: IDataObject = {};
+
+	const body = {
+		query: [
+			{
+				_name: 'getTask',
+				idOrName: taskId,
+			},
+		],
+	};
+
+	qs.name = `get-task-${taskId}`;
+
+	responseData = await theHiveApiRequest.call(this, 'POST', '/v1/query', body, qs);
+
+	const executionData = this.helpers.constructExecutionMetaData(wrapData(responseData), {
+		itemData: { item: i },
+	});
+
+	return executionData;
+}
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/task/index.ts b/packages/nodes-base/nodes/TheHiveProject/actions/task/index.ts
new file mode 100644
index 0000000000000..90cdec2126d81
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/task/index.ts
@@ -0,0 +1,64 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+import * as create from './create.operation';
+import * as deleteTask from './deleteTask.operation';
+import * as executeResponder from './executeResponder.operation';
+import * as get from './get.operation';
+import * as search from './search.operation';
+import * as update from './update.operation';
+
+export { create, deleteTask, executeResponder, get, search, update };
+
+export const description: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		default: 'create',
+		type: 'options',
+		noDataExpression: true,
+		required: true,
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				action: 'Create a task',
+			},
+			{
+				name: 'Delete',
+				value: 'deleteTask',
+				action: 'Delete an task',
+			},
+			{
+				name: 'Execute Responder',
+				value: 'executeResponder',
+				action: 'Execute responder on a task',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				action: 'Get a task',
+			},
+			{
+				name: 'Search',
+				value: 'search',
+				action: 'Search tasks',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				action: 'Update a task',
+			},
+		],
+		displayOptions: {
+			show: {
+				resource: ['task'],
+			},
+		},
+	},
+	...create.description,
+	...deleteTask.description,
+	...executeResponder.description,
+	...get.description,
+	...search.description,
+	...update.description,
+];
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/task/search.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/task/search.operation.ts
new file mode 100644
index 0000000000000..0954fc8856844
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/task/search.operation.ts
@@ -0,0 +1,87 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+import {
+	caseRLC,
+	genericFiltersCollection,
+	returnAllAndLimit,
+	searchOptions,
+	sortCollection,
+} from '../../descriptions';
+import { theHiveApiQuery } from '../../transport';
+import type { QueryScope } from '../../helpers/interfaces';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
+const properties: INodeProperties[] = [
+	{
+		displayName: 'Search in All Cases',
+		name: 'allCases',
+		type: 'boolean',
+		default: true,
+		description: 'Whether to search in all cases or only in a selected case',
+	},
+	{
+		...caseRLC,
+		displayOptions: {
+			show: {
+				allCases: [false],
+			},
+		},
+	},
+	...returnAllAndLimit,
+	genericFiltersCollection,
+	sortCollection,
+	searchOptions,
+];
+
+const displayOptions = {
+	show: {
+		resource: ['task'],
+		operation: ['search'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
+	let responseData: IDataObject | IDataObject[] = [];
+
+	const allCases = this.getNodeParameter('allCases', i) as boolean;
+	const filtersValues = this.getNodeParameter('filters.values', i, []) as IDataObject[];
+	const sortFields = this.getNodeParameter('sort.fields', i, []) as IDataObject[];
+	const returnAll = this.getNodeParameter('returnAll', i);
+	const { returnCount, extraData } = this.getNodeParameter('options', i);
+
+	let limit;
+	let scope: QueryScope;
+
+	if (allCases) {
+		scope = { query: 'listTask' };
+	} else {
+		const caseId = this.getNodeParameter('caseId', i, '', { extractValue: true }) as string;
+		scope = { query: 'getCase', id: caseId, restrictTo: 'tasks' };
+	}
+
+	if (!returnAll) {
+		limit = this.getNodeParameter('limit', i);
+	}
+
+	responseData = await theHiveApiQuery.call(
+		this,
+		scope,
+		filtersValues,
+		sortFields,
+		limit,
+		returnCount as boolean,
+		extraData as string[],
+	);
+
+	const executionData = this.helpers.constructExecutionMetaData(wrapData(responseData), {
+		itemData: { item: i },
+	});
+
+	return executionData;
+}
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/task/update.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/task/update.operation.ts
new file mode 100644
index 0000000000000..80875d27f64aa
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/task/update.operation.ts
@@ -0,0 +1,132 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	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';
+
+const properties: INodeProperties[] = [
+	{
+		displayName: 'Fields',
+		name: 'taskUpdateFields',
+		type: 'resourceMapper',
+		default: {
+			mappingMode: 'defineBelow',
+			value: null,
+		},
+		noDataExpression: true,
+		required: true,
+		typeOptions: {
+			resourceMapper: {
+				resourceMapperMethod: 'getTaskUpdateFields',
+				mode: 'update',
+				valuesLabel: 'Fields',
+				addAllFields: true,
+				multiKeyMatch: true,
+			},
+		},
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['task'],
+		operation: ['update'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	i: number,
+	item: INodeExecutionData,
+): Promise<INodeExecutionData[]> {
+	let body: IDataObject = {};
+	let updated = 1;
+
+	const dataMode = this.getNodeParameter('taskUpdateFields.mappingMode', i) as string;
+
+	if (dataMode === 'autoMapInputData') {
+		const schema = this.getNodeParameter('taskUpdateFields.schema', i) as IDataObject[];
+		body = prepareInputItem(item.json, schema, i);
+	}
+
+	if (dataMode === 'defineBelow') {
+		const taskUpdateFields = this.getNodeParameter('taskUpdateFields.value', i, []) as IDataObject;
+		body = taskUpdateFields;
+	}
+
+	body = fixFieldType(body);
+
+	const fieldsToMatchOn = this.getNodeParameter('taskUpdateFields.matchingColumns', i) as string[];
+
+	const updateBody: IDataObject = {};
+	const matchFields: IDataObject = {};
+	const { id } = body; // id would be used if matching on id, also we need to remove it from the body
+
+	for (const field of Object.keys(body)) {
+		if (fieldsToMatchOn.includes(field)) {
+			// if field is in fieldsToMatchOn, we need to exclude it from the updateBody, as values used for matching should not be updated
+			matchFields[field] = body[field];
+		} else {
+			// use set to construct the updateBody, as it allows to process customFields.fieldName
+			// if customFields provided under customFields property, it will be send as is
+			set(updateBody, field, body[field]);
+		}
+	}
+
+	if (fieldsToMatchOn.includes('id')) {
+		await theHiveApiRequest.call(this, 'PATCH', `/v1/task/${id}`, body);
+	} else {
+		const filter = {
+			_name: 'filter',
+			_and: fieldsToMatchOn.map((field) => ({
+				_eq: {
+					_field: field,
+					_value: matchFields[field],
+				},
+			})),
+		};
+
+		const queryBody = {
+			query: [
+				{
+					_name: 'listTask',
+				},
+				filter,
+			],
+		};
+
+		const matches = (await theHiveApiRequest.call(
+			this,
+			'POST',
+			'/v1/query',
+			queryBody,
+		)) as IDataObject[];
+
+		if (!matches.length) {
+			throw new NodeOperationError(this.getNode(), 'No matching alerts found');
+		}
+		const ids = matches.map((match) => match._id);
+		updated = ids.length;
+
+		updateBody.ids = ids;
+
+		await theHiveApiRequest.call(this, 'PATCH', '/v1/task/_bulk', updateBody);
+	}
+
+	const executionData = this.helpers.constructExecutionMetaData(
+		wrapData({ success: true, updated }),
+		{
+			itemData: { item: i },
+		},
+	);
+
+	return executionData;
+}
diff --git a/packages/nodes-base/nodes/TheHiveProject/descriptions/common.description.ts b/packages/nodes-base/nodes/TheHiveProject/descriptions/common.description.ts
new file mode 100644
index 0000000000000..612f4dd446523
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/descriptions/common.description.ts
@@ -0,0 +1,542 @@
+import type { INodeProperties } from 'n8n-workflow';
+import { TLP } from '../helpers/interfaces';
+
+export const returnAllAndLimit: INodeProperties[] = [
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		default: false,
+		description: 'Whether to return all results or only up to a given limit',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		typeOptions: {
+			minValue: 1,
+		},
+		default: 50,
+		description: 'Max number of results to return',
+		displayOptions: {
+			show: {
+				returnAll: [false],
+			},
+		},
+	},
+];
+
+export const responderOptions: INodeProperties = {
+	displayName: 'Responder Name or ID',
+	name: 'responder',
+	type: 'options',
+	description:
+		'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
+	required: true,
+	default: '',
+	typeOptions: {
+		loadOptionsDependsOn: ['id', 'id.value'],
+		loadOptionsMethod: 'loadResponders',
+	},
+	displayOptions: {
+		hide: {
+			id: [''],
+		},
+	},
+};
+
+export const tlpOptions: INodeProperties = {
+	displayName: 'Traffict Light Protocol (TLP)',
+	name: 'tlp',
+	type: 'options',
+	default: 2,
+	options: [
+		{
+			name: 'White',
+			value: TLP.white,
+		},
+		{
+			name: 'Green',
+			value: TLP.green,
+		},
+		{
+			name: 'Amber',
+			value: TLP.amber,
+		},
+		{
+			name: 'Red',
+			value: TLP.red,
+		},
+	],
+};
+
+export const severityOptions: INodeProperties = {
+	displayName: 'Severity',
+	name: 'severity',
+	type: 'options',
+	options: [
+		{
+			name: 'Low',
+			value: 1,
+		},
+		{
+			name: 'Medium',
+			value: 2,
+		},
+		{
+			name: 'High',
+			value: 3,
+		},
+		{
+			name: 'Critical',
+			value: 4,
+		},
+	],
+	default: 2,
+	description: 'Severity of the alert. Default=Medium.',
+};
+
+export const observableTypeOptions: INodeProperties = {
+	// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-options
+	displayName: 'Data Type',
+	name: 'dataType',
+	type: 'options',
+	default: '',
+	typeOptions: {
+		loadOptionsMethod: 'loadObservableTypes',
+	},
+	description:
+		'Type of the observable. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+};
+
+export const alertStatusOptions: INodeProperties = {
+	displayName: 'Status',
+	name: 'status',
+	type: 'options',
+	options: [
+		{
+			name: 'New',
+			value: 'New',
+		},
+		{
+			name: 'Updated',
+			value: 'Updated',
+		},
+		{
+			name: 'Ignored',
+			value: 'Ignored',
+		},
+		{
+			name: 'Imported',
+			value: 'Imported',
+		},
+	],
+	default: 'New',
+	description: 'Status of the alert',
+};
+
+export const caseStatusOptions: INodeProperties = {
+	displayName: 'Status',
+	name: 'status',
+	type: 'options',
+	options: [
+		{
+			name: 'Open',
+			value: 'Open',
+		},
+		{
+			name: 'Resolved',
+			value: 'Resolved',
+		},
+		{
+			name: 'Deleted',
+			value: 'Deleted',
+		},
+	],
+	default: 'Open',
+};
+
+export const observableStatusOptions: INodeProperties = {
+	displayName: 'Status',
+	name: 'status',
+	type: 'options',
+	default: 'Ok',
+	options: [
+		{
+			name: 'Ok',
+			value: 'Ok',
+		},
+		{
+			name: 'Deleted',
+			value: 'Deleted',
+		},
+	],
+	description: 'Status of the observable. Default=Ok.',
+};
+
+export const taskStatusOptions: INodeProperties = {
+	displayName: 'Status',
+	name: 'status',
+	type: 'options',
+	default: 'Waiting',
+	options: [
+		{
+			name: 'Cancel',
+			value: 'Cancel',
+		},
+		{
+			name: 'Completed',
+			value: 'Completed',
+		},
+		{
+			name: 'InProgress',
+			value: 'InProgress',
+		},
+		{
+			name: 'Waiting',
+			value: 'Waiting',
+		},
+	],
+	description: 'Status of the task. Default=Waiting.',
+};
+
+export const searchOptions: INodeProperties = {
+	displayName: 'Options',
+	name: 'options',
+	type: 'collection',
+	placeholder: 'Add Option',
+	default: {},
+	options: [
+		{
+			displayName: 'Return Count',
+			name: 'returnCount',
+			type: 'boolean',
+			description: 'Whether to return only the count of results',
+			default: false,
+			displayOptions: {
+				hide: {
+					'/returnAll': [false],
+				},
+			},
+		},
+		{
+			displayName: 'Extra Data',
+			name: 'extraData',
+			type: 'multiOptions',
+			description: 'Additional data to include in the response',
+			options: [
+				{
+					name: 'isOwner',
+					value: 'isOwner',
+				},
+				{
+					// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+					name: 'links',
+					value: 'links',
+				},
+				{
+					// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+					name: 'permissions',
+					value: 'permissions',
+				},
+				{
+					// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+					name: 'seen',
+					value: 'seen',
+				},
+				{
+					name: 'shareCount',
+					value: 'shareCount',
+				},
+				{
+					// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+					name: 'shares',
+					value: 'shares',
+				},
+			],
+			default: [],
+			displayOptions: {
+				show: {
+					'/resource': ['observable'],
+				},
+				hide: {
+					returnCount: [true],
+				},
+			},
+		},
+		{
+			displayName: 'Extra Data',
+			name: 'extraData',
+			type: 'multiOptions',
+			description: 'Additional data to include in the response',
+			options: [
+				{
+					name: 'actionRequired',
+					value: 'actionRequired',
+				},
+				{
+					name: 'actionRequiredMap',
+					value: 'actionRequiredMap',
+				},
+				{
+					// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+					name: 'case',
+					value: 'case',
+				},
+				{
+					name: 'caseId',
+					value: 'caseId',
+				},
+				{
+					name: 'caseTemplate',
+					value: 'caseTemplate',
+				},
+				{
+					name: 'caseTemplateId',
+					value: 'caseTemplateId',
+				},
+				{
+					name: 'shareCount',
+					value: 'shareCount',
+				},
+			],
+			default: [],
+			displayOptions: {
+				show: {
+					'/resource': ['task'],
+				},
+				hide: {
+					returnCount: [true],
+				},
+			},
+		},
+		{
+			displayName: 'Extra Data',
+			name: 'extraData',
+			type: 'multiOptions',
+			description: 'Additional data to include in the response',
+			options: [
+				{
+					name: 'caseNumber',
+					value: 'caseNumber',
+				},
+				{
+					name: 'importDate',
+					value: 'importDate',
+				},
+				{
+					name: 'procedureCount',
+					value: 'procedureCount',
+				},
+				{
+					// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+					name: 'status',
+					value: 'status',
+				},
+			],
+			default: [],
+			displayOptions: {
+				show: {
+					'/resource': ['alert'],
+				},
+				hide: {
+					returnCount: [true],
+				},
+			},
+		},
+		{
+			displayName: 'Extra Data',
+			name: 'extraData',
+			type: 'multiOptions',
+			description: 'Additional data to include in the response',
+			options: [
+				{
+					name: 'actionRequired',
+					value: 'actionRequired',
+				},
+				{
+					name: 'alertCount',
+					value: 'alertCount',
+				},
+				{
+					// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+					name: 'alerts',
+					value: 'alerts',
+				},
+				{
+					name: 'attachmentCount',
+					value: 'attachmentCount',
+				},
+				{
+					// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+					name: 'contributors',
+					value: 'contributors',
+				},
+				{
+					name: 'handlingDuration',
+					value: 'computed.handlingDuration',
+				},
+				{
+					name: 'handlingDurationInDays',
+					value: 'computed.handlingDurationInDays',
+				},
+				{
+					name: 'handlingDurationInHours',
+					value: 'computed.handlingDurationInHours',
+				},
+				{
+					name: 'handlingDurationInMinutes',
+					value: 'computed.handlingDurationInMinutes',
+				},
+				{
+					name: 'handlingDurationInSeconds',
+					value: 'computed.handlingDurationInSeconds',
+				},
+				{
+					name: 'isOwner',
+					value: 'isOwner',
+				},
+				{
+					name: 'observableStats',
+					value: 'observableStats',
+				},
+				{
+					// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+					name: 'permissions',
+					value: 'permissions',
+				},
+				{
+					name: 'procedureCount',
+					value: 'procedureCount',
+				},
+				{
+					name: 'shareCount',
+					value: 'shareCount',
+				},
+				{
+					name: 'similarAlerts',
+					value: 'similarAlerts',
+				},
+				{
+					// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+					name: 'status',
+					value: 'status',
+				},
+				{
+					name: 'taskStats',
+					value: 'taskStats',
+				},
+			],
+			default: [],
+			displayOptions: {
+				show: {
+					'/resource': ['case'],
+				},
+				hide: {
+					returnCount: [true],
+				},
+			},
+		},
+		{
+			displayName: 'Extra Data',
+			name: 'extraData',
+			type: 'multiOptions',
+			description: 'Additional data to include in the response',
+			options: [
+				{
+					// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+					name: 'links',
+					value: 'links',
+				},
+			],
+			default: [],
+			displayOptions: {
+				show: {
+					'/resource': ['comment'],
+				},
+				hide: {
+					returnCount: [true],
+				},
+			},
+		},
+		{
+			displayName: 'Extra Data',
+			name: 'extraData',
+			type: 'multiOptions',
+			description: 'Additional data to include in the response',
+			options: [
+				{
+					name: 'actionCount',
+					value: 'actionCount',
+				},
+				{
+					// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+					name: 'case',
+					value: 'case',
+				},
+				{
+					// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+					name: 'task',
+					value: 'task',
+				},
+				{
+					name: 'taskId',
+					value: 'taskId',
+				},
+			],
+			default: [],
+			displayOptions: {
+				show: {
+					'/resource': ['log'],
+				},
+				hide: {
+					returnCount: [true],
+				},
+			},
+		},
+		{
+			displayName: 'Extra Data',
+			name: 'extraData',
+			type: 'string',
+			description: 'Additional data to include in the response',
+			default: '',
+			requiresDataPath: 'multiple',
+			displayOptions: {
+				show: {
+					'/resource': ['query'],
+				},
+				hide: {
+					returnCount: [true],
+				},
+			},
+		},
+	],
+};
+
+export const attachmentsUi: INodeProperties = {
+	displayName: 'Attachments',
+	name: 'attachmentsUi',
+	placeholder: 'Add Attachment',
+	type: 'fixedCollection',
+	typeOptions: {
+		multipleValues: true,
+	},
+	options: [
+		{
+			name: 'values',
+			displayName: 'Values',
+			values: [
+				{
+					displayName: 'Attachment Field Name',
+					name: 'field',
+					type: 'string',
+					default: 'data',
+					description: 'Add the field name from the input node',
+					hint: 'The name of the field with the attachment in the node input',
+				},
+			],
+		},
+	],
+	default: {},
+	description: 'Array of supported attachments to add to the message',
+};
diff --git a/packages/nodes-base/nodes/TheHiveProject/descriptions/filter.description.ts b/packages/nodes-base/nodes/TheHiveProject/descriptions/filter.description.ts
new file mode 100644
index 0000000000000..015d766e8885b
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/descriptions/filter.description.ts
@@ -0,0 +1,318 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+const field: INodeProperties[] = [
+	{
+		displayName: 'Field',
+		name: 'field',
+		type: 'string',
+		default: '',
+		requiresDataPath: 'single',
+		description: 'Dot notation is also supported, e.g. customFields.field1',
+		displayOptions: {
+			hide: {
+				'/resource': ['alert', 'case', 'comment', 'task', 'observable', 'log', 'page'],
+			},
+		},
+	},
+	{
+		// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-options
+		displayName: 'Field',
+		name: 'field',
+		type: 'options',
+		default: '',
+		typeOptions: {
+			loadOptionsMethod: 'loadAlertFields',
+		},
+		description:
+			'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
+		displayOptions: {
+			show: {
+				'/resource': ['alert'],
+			},
+		},
+	},
+	{
+		// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-options
+		displayName: 'Field',
+		name: 'field',
+		type: 'options',
+		default: '',
+		typeOptions: {
+			loadOptionsMethod: 'loadCaseFields',
+		},
+		description:
+			'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
+		displayOptions: {
+			show: {
+				'/resource': ['case'],
+			},
+		},
+	},
+	{
+		// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-options
+		displayName: 'Field',
+		name: 'field',
+		type: 'options',
+		default: '',
+		typeOptions: {
+			loadOptionsMethod: 'loadTaskFields',
+		},
+		description:
+			'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
+		displayOptions: {
+			show: {
+				'/resource': ['task'],
+			},
+		},
+	},
+	{
+		// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-options
+		displayName: 'Field',
+		name: 'field',
+		type: 'options',
+		default: '',
+		typeOptions: {
+			loadOptionsMethod: 'loadObservableFields',
+		},
+		description:
+			'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
+		displayOptions: {
+			show: {
+				'/resource': ['observable'],
+			},
+		},
+	},
+	{
+		displayName: 'Field',
+		name: 'field',
+		type: 'options',
+		default: '',
+		options: [
+			{
+				name: 'Message',
+				value: 'message',
+			},
+			{
+				name: 'Date',
+				value: 'date',
+			},
+		],
+		displayOptions: {
+			show: {
+				'/resource': ['log'],
+			},
+		},
+	},
+	{
+		displayName: 'Field',
+		name: 'field',
+		type: 'options',
+		default: '',
+		options: [
+			{
+				name: 'Message',
+				value: 'message',
+			},
+		],
+		displayOptions: {
+			show: {
+				'/resource': ['comment'],
+			},
+		},
+	},
+	{
+		displayName: 'Field',
+		name: 'field',
+		type: 'options',
+		default: '',
+		options: [
+			{
+				name: 'Category',
+				value: 'category',
+			},
+			{
+				name: 'Content',
+				value: 'content',
+			},
+			{
+				name: 'Title',
+				value: 'title',
+			},
+		],
+		displayOptions: {
+			show: {
+				'/resource': ['page'],
+			},
+		},
+	},
+];
+
+export const genericFiltersCollection: INodeProperties = {
+	displayName: 'Filters',
+	name: 'filters',
+	type: 'fixedCollection',
+	placeholder: 'Add Filter',
+	default: {},
+	typeOptions: {
+		multipleValues: true,
+	},
+	options: [
+		{
+			displayName: 'Values',
+			name: 'values',
+			values: [
+				...field,
+				{
+					displayName: 'Operator',
+					name: 'operator',
+					type: 'options',
+					options: [
+						{
+							name: 'Between',
+							value: '_between',
+							description: "Field is between two values ('From' is inclusive, 'To' is exclusive)",
+						},
+						{
+							name: 'Contains',
+							value: '_like',
+							description: 'Field contains the substring from value',
+						},
+						{
+							name: 'Ends With',
+							value: '_endsWith',
+							description: 'Field ends with value',
+						},
+						{
+							name: 'Equal',
+							value: '_eq',
+							description: 'Field is equal to value',
+						},
+						{
+							name: 'Greater Than',
+							value: '_gt',
+							description: 'Field is greater than value',
+						},
+						{
+							name: 'Greater Than Or Equal To',
+							value: '_gte',
+							description: 'Field is greater than or equal to value',
+						},
+						{
+							name: 'In',
+							value: '_in',
+							description: 'Field is one of the values',
+						},
+						{
+							name: 'Less Than',
+							value: '_lt',
+							description: 'Field is less than value',
+						},
+						{
+							name: 'Less Than Or Equal To',
+							value: '_lte',
+							description: 'Field is less than or equal to value',
+						},
+						{
+							name: 'Match Word',
+							value: '_match',
+							description: 'Field contains the value as a word',
+						},
+						{
+							name: 'Not Equal',
+							value: '_ne',
+							description: 'Field is not equal to value',
+						},
+						{
+							name: 'Starts With',
+							value: '_startsWith',
+							description: 'Field starts with value',
+						},
+					],
+					default: '_eq',
+				},
+				{
+					displayName: 'Value',
+					name: 'value',
+					type: 'string',
+					default: '',
+					displayOptions: {
+						hide: {
+							operator: ['_between', '_in'],
+						},
+					},
+				},
+				{
+					displayName: 'Values',
+					name: 'values',
+					type: 'string',
+					default: '',
+					description: 'Comma-separated list of values',
+					placeholder: 'e.g. value1,value2',
+					displayOptions: {
+						show: {
+							operator: ['_in'],
+						},
+					},
+				},
+				{
+					displayName: 'From',
+					name: 'from',
+					type: 'string',
+					default: '',
+					displayOptions: {
+						show: {
+							operator: ['_between'],
+						},
+					},
+				},
+				{
+					displayName: 'To',
+					name: 'to',
+					type: 'string',
+					default: '',
+					displayOptions: {
+						show: {
+							operator: ['_between'],
+						},
+					},
+				},
+			],
+		},
+	],
+};
+
+export const sortCollection: INodeProperties = {
+	displayName: 'Sort',
+	name: 'sort',
+	type: 'fixedCollection',
+	placeholder: 'Add Sort Rule',
+	default: {},
+	typeOptions: {
+		multipleValues: true,
+	},
+	options: [
+		{
+			displayName: 'Fields',
+			name: 'fields',
+			values: [
+				...field,
+				{
+					displayName: 'Direction',
+					name: 'direction',
+					type: 'options',
+					options: [
+						{
+							name: 'Ascending',
+							value: 'asc',
+						},
+						{
+							name: 'Descending',
+							value: 'desc',
+						},
+					],
+					default: 'asc',
+				},
+			],
+		},
+	],
+};
diff --git a/packages/nodes-base/nodes/TheHiveProject/descriptions/index.ts b/packages/nodes-base/nodes/TheHiveProject/descriptions/index.ts
new file mode 100644
index 0000000000000..53fb80b7bd827
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/descriptions/index.ts
@@ -0,0 +1,3 @@
+export * from './rlc.description';
+export * from './common.description';
+export * from './filter.description';
diff --git a/packages/nodes-base/nodes/TheHiveProject/descriptions/rlc.description.ts b/packages/nodes-base/nodes/TheHiveProject/descriptions/rlc.description.ts
new file mode 100644
index 0000000000000..529fe214cedf0
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/descriptions/rlc.description.ts
@@ -0,0 +1,285 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+export const caseRLC: INodeProperties = {
+	displayName: 'Case',
+	name: 'caseId',
+	type: 'resourceLocator',
+	default: { mode: 'list', value: '' },
+	required: true,
+	modes: [
+		{
+			displayName: 'From List',
+			name: 'list',
+			type: 'list',
+			placeholder: 'Select a case...',
+			typeOptions: {
+				searchListMethod: 'caseSearch',
+				searchable: true,
+			},
+		},
+		{
+			displayName: 'Link',
+			name: 'url',
+			type: 'string',
+			extractValue: {
+				type: 'regex',
+				regex: 'https:\\/\\/.+\\/cases\\/(~[0-9]{1,})\\/details',
+			},
+			validation: [
+				{
+					type: 'regex',
+					properties: {
+						regex: 'https:\\/\\/.+\\/cases\\/(~[0-9]{1,})\\/details',
+						errorMessage: 'Not a valid Case URL',
+					},
+				},
+			],
+		},
+		{
+			displayName: 'ID',
+			name: 'id',
+			type: 'string',
+			placeholder: 'e.g. ~123456789',
+			validation: [
+				{
+					type: 'regex',
+					properties: {
+						regex: '(~[0-9]{1,})',
+						errorMessage: 'Not a valid Case ID',
+					},
+				},
+			],
+		},
+	],
+};
+
+export const alertRLC: INodeProperties = {
+	displayName: 'Alert',
+	name: 'alertId',
+	type: 'resourceLocator',
+	default: { mode: 'list', value: '' },
+	required: true,
+	modes: [
+		{
+			displayName: 'From List',
+			name: 'list',
+			type: 'list',
+			placeholder: 'Select a alert...',
+			typeOptions: {
+				searchListMethod: 'alertSearch',
+				searchable: true,
+			},
+		},
+		{
+			displayName: 'Link',
+			name: 'url',
+			type: 'string',
+			extractValue: {
+				type: 'regex',
+				regex: 'https:\\/\\/.+\\/alerts\\/(~[0-9]{1,})\\/details',
+			},
+			validation: [
+				{
+					type: 'regex',
+					properties: {
+						regex: 'https:\\/\\/.+\\/alerts\\/(~[0-9]{1,})\\/details',
+						errorMessage: 'Not a valid Alert URL',
+					},
+				},
+			],
+		},
+		{
+			displayName: 'ID',
+			name: 'id',
+			type: 'string',
+			placeholder: 'e.g. ~123456789',
+			validation: [
+				{
+					type: 'regex',
+					properties: {
+						regex: '(~[0-9]{1,})',
+						errorMessage: 'Not a valid Alert ID',
+					},
+				},
+			],
+		},
+	],
+};
+
+export const taskRLC: INodeProperties = {
+	displayName: 'Task',
+	name: 'taskId',
+	type: 'resourceLocator',
+	default: { mode: 'list', value: '' },
+	required: true,
+	modes: [
+		{
+			displayName: 'From List',
+			name: 'list',
+			type: 'list',
+			placeholder: 'Select a task...',
+			typeOptions: {
+				searchListMethod: 'taskSearch',
+				searchable: true,
+			},
+		},
+		{
+			displayName: 'ID',
+			name: 'id',
+			type: 'string',
+			placeholder: 'e.g. ~123456789',
+			validation: [
+				{
+					type: 'regex',
+					properties: {
+						regex: '(~[0-9]{1,})',
+						errorMessage: 'Not a valid Task ID',
+					},
+				},
+			],
+		},
+	],
+};
+
+export const pageRLC: INodeProperties = {
+	displayName: 'Page',
+	name: 'pageId',
+	type: 'resourceLocator',
+	default: { mode: 'list', value: '' },
+	required: true,
+	typeOptions: {
+		loadOptionsDependsOn: ['caseId'],
+	},
+	modes: [
+		{
+			displayName: 'From List',
+			name: 'list',
+			type: 'list',
+			placeholder: 'Select a page...',
+			typeOptions: {
+				searchListMethod: 'pageSearch',
+				searchable: true,
+			},
+		},
+		{
+			displayName: 'ID',
+			name: 'id',
+			type: 'string',
+			placeholder: 'e.g. ~123456789',
+			validation: [
+				{
+					type: 'regex',
+					properties: {
+						regex: '(~[0-9]{1,})',
+						errorMessage: 'Not a valid Page ID',
+					},
+				},
+			],
+		},
+	],
+};
+
+export const logRLC: INodeProperties = {
+	displayName: 'Task Log',
+	name: 'logId',
+	type: 'resourceLocator',
+	default: { mode: 'list', value: '' },
+	required: true,
+	modes: [
+		{
+			displayName: 'From List',
+			name: 'list',
+			type: 'list',
+			placeholder: 'Select a task log...',
+			typeOptions: {
+				searchListMethod: 'logSearch',
+				searchable: true,
+			},
+		},
+		{
+			displayName: 'ID',
+			name: 'id',
+			type: 'string',
+			placeholder: 'e.g. ~123456789',
+			validation: [
+				{
+					type: 'regex',
+					properties: {
+						regex: '(~[0-9]{1,})',
+						errorMessage: 'Not a valid task Log ID',
+					},
+				},
+			],
+		},
+	],
+};
+
+export const commentRLC: INodeProperties = {
+	displayName: 'Comment',
+	name: 'commentId',
+	type: 'resourceLocator',
+	default: { mode: 'list', value: '' },
+	required: true,
+	modes: [
+		{
+			displayName: 'From List',
+			name: 'list',
+			type: 'list',
+			placeholder: 'Select a comment...',
+			typeOptions: {
+				searchListMethod: 'commentSearch',
+				searchable: true,
+			},
+		},
+		{
+			displayName: 'ID',
+			name: 'id',
+			type: 'string',
+			placeholder: 'e.g. ~123456789',
+			validation: [
+				{
+					type: 'regex',
+					properties: {
+						regex: '(~[0-9]{1,})',
+						errorMessage: 'Not a valid comment ID',
+					},
+				},
+			],
+		},
+	],
+};
+
+export const observableRLC: INodeProperties = {
+	displayName: 'Observable',
+	name: 'observableId',
+	type: 'resourceLocator',
+	default: { mode: 'list', value: '' },
+	required: true,
+	modes: [
+		{
+			displayName: 'From List',
+			name: 'list',
+			type: 'list',
+			placeholder: 'Select an observable...',
+			typeOptions: {
+				searchListMethod: 'observableSearch',
+				searchable: true,
+			},
+		},
+		{
+			displayName: 'ID',
+			name: 'id',
+			type: 'string',
+			placeholder: 'e.g. ~123456789',
+			validation: [
+				{
+					type: 'regex',
+					properties: {
+						regex: '(~[0-9]{1,})',
+						errorMessage: 'Not a valid Log ID',
+					},
+				},
+			],
+		},
+	],
+};
diff --git a/packages/nodes-base/nodes/TheHiveProject/helpers/constants.ts b/packages/nodes-base/nodes/TheHiveProject/helpers/constants.ts
new file mode 100644
index 0000000000000..33553fe127198
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/helpers/constants.ts
@@ -0,0 +1,543 @@
+import { TLP } from './interfaces';
+
+export const alertCommonFields = [
+	{
+		displayName: 'Title',
+		id: 'title',
+		type: 'string',
+		removed: false,
+	},
+	{
+		displayName: 'Description',
+		id: 'description',
+		type: 'string',
+		removed: false,
+	},
+	{
+		displayName: 'Type',
+		id: 'type',
+		type: 'string',
+		removed: false,
+	},
+	{
+		displayName: 'Source',
+		id: 'source',
+		type: 'string',
+		removed: false,
+	},
+	{
+		displayName: 'Source Reference',
+		id: 'sourceRef',
+		type: 'string',
+		removed: false,
+	},
+	{
+		displayName: 'External Link',
+		id: 'externalLink',
+		type: 'string',
+		removed: true,
+	},
+	{
+		displayName: 'Severity (Severity of information)',
+		id: 'severity',
+		type: 'options',
+		options: [
+			{
+				name: 'Low',
+				value: 1,
+			},
+			{
+				name: 'Medium',
+				value: 2,
+			},
+			{
+				name: 'High',
+				value: 3,
+			},
+			{
+				name: 'Critical',
+				value: 4,
+			},
+		],
+		removed: true,
+	},
+	{
+		displayName: 'Date',
+		id: 'date',
+		type: 'dateTime',
+		removed: true,
+	},
+	{
+		displayName: 'Last Sync Date',
+		id: 'lastSyncDate',
+		type: 'dateTime',
+		removed: true,
+	},
+	{
+		displayName: 'Tags',
+		id: 'tags',
+		type: 'string',
+		removed: true,
+	},
+	{
+		displayName: 'Follow',
+		id: 'follow',
+		type: 'boolean',
+		removed: true,
+	},
+	{
+		displayName: 'Flag',
+		id: 'flag',
+		type: 'boolean',
+		removed: true,
+	},
+	{
+		displayName: 'TLP (Confidentiality of information)',
+		id: 'tlp',
+		type: 'options',
+		options: [
+			{
+				name: 'White',
+				value: TLP.white,
+			},
+			{
+				name: 'Green',
+				value: TLP.green,
+			},
+			{
+				name: 'Amber',
+				value: TLP.amber,
+			},
+			{
+				name: 'Red',
+				value: TLP.red,
+			},
+		],
+		removed: true,
+	},
+	{
+		displayName: 'PAP (Level of exposure of information)',
+		id: 'pap',
+		type: 'options',
+		options: [
+			{
+				name: 'White',
+				value: TLP.white,
+			},
+			{
+				name: 'Green',
+				value: TLP.green,
+			},
+			{
+				name: 'Amber',
+				value: TLP.amber,
+			},
+			{
+				name: 'Red',
+				value: TLP.red,
+			},
+		],
+		removed: true,
+	},
+	{
+		displayName: 'Summary',
+		id: 'summary',
+		type: 'string',
+		removed: true,
+	},
+	{
+		displayName: 'Status',
+		id: 'status',
+		type: 'options',
+		removed: true,
+	},
+	{
+		displayName: 'Case Template',
+		id: 'caseTemplate',
+		type: 'options',
+		removed: true,
+	},
+	{
+		displayName: 'Add Tags',
+		id: 'addTags',
+		type: 'string',
+		canBeUsedToMatch: false,
+		removed: true,
+	},
+	{
+		displayName: 'Remove Tags',
+		id: 'removeTags',
+		type: 'string',
+		canBeUsedToMatch: false,
+		removed: true,
+	},
+];
+
+export const caseCommonFields = [
+	{
+		displayName: 'Title',
+		id: 'title',
+		type: 'string',
+		removed: false,
+	},
+	{
+		displayName: 'Description',
+		id: 'description',
+		type: 'string',
+		removed: false,
+	},
+	{
+		displayName: 'Severity (Severity of information)',
+		id: 'severity',
+		type: 'options',
+		options: [
+			{
+				name: 'Low',
+				value: 1,
+			},
+			{
+				name: 'Medium',
+				value: 2,
+			},
+			{
+				name: 'High',
+				value: 3,
+			},
+			{
+				name: 'Critical',
+				value: 4,
+			},
+		],
+		removed: false,
+	},
+	{
+		displayName: 'Start Date',
+		id: 'startDate',
+		type: 'dateTime',
+		removed: false,
+	},
+	{
+		displayName: 'End Date',
+		id: 'endDate',
+		type: 'dateTime',
+		removed: true,
+	},
+	{
+		displayName: 'Tags',
+		id: 'tags',
+		type: 'string',
+		removed: false,
+	},
+	{
+		displayName: 'Flag',
+		id: 'flag',
+		type: 'boolean',
+		removed: true,
+	},
+	{
+		displayName: 'TLP (Confidentiality of information)',
+		id: 'tlp',
+		type: 'options',
+		options: [
+			{
+				name: 'White',
+				value: TLP.white,
+			},
+			{
+				name: 'Green',
+				value: TLP.green,
+			},
+			{
+				name: 'Amber',
+				value: TLP.amber,
+			},
+			{
+				name: 'Red',
+				value: TLP.red,
+			},
+		],
+		removed: false,
+	},
+	{
+		displayName: 'PAP (Level of exposure of information)',
+		id: 'pap',
+		type: 'options',
+		options: [
+			{
+				name: 'White',
+				value: TLP.white,
+			},
+			{
+				name: 'Green',
+				value: TLP.green,
+			},
+			{
+				name: 'Amber',
+				value: TLP.amber,
+			},
+			{
+				name: 'Red',
+				value: TLP.red,
+			},
+		],
+		removed: false,
+	},
+	{
+		displayName: 'Summary',
+		id: 'summary',
+		type: 'string',
+		removed: true,
+	},
+	{
+		displayName: 'Status',
+		id: 'status',
+		type: 'options',
+		removed: true,
+	},
+	{
+		displayName: 'Assignee',
+		id: 'assignee',
+		type: 'options',
+		removed: true,
+	},
+	{
+		displayName: 'Case Template',
+		id: 'caseTemplate',
+		type: 'options',
+		removed: true,
+	},
+	{
+		displayName: 'Tasks',
+		id: 'tasks',
+		type: 'array',
+		removed: true,
+	},
+	{
+		displayName: 'Sharing Parameters',
+		id: 'sharingParameters',
+		type: 'array',
+		removed: true,
+	},
+	{
+		displayName: 'Impact Status',
+		id: 'impactStatus',
+		type: 'string',
+		removed: true,
+	},
+	{
+		displayName: 'Task Rule',
+		id: 'taskRule',
+		type: 'string',
+		removed: true,
+	},
+	{
+		displayName: 'Observable Rule',
+		id: 'observableRule',
+		type: 'string',
+		removed: true,
+	},
+	{
+		displayName: 'Add Tags',
+		id: 'addTags',
+		type: 'string',
+		removed: true,
+	},
+	{
+		displayName: 'Remove Tags',
+		id: 'removeTags',
+		type: 'string',
+		removed: true,
+	},
+];
+
+export const taskCommonFields = [
+	{
+		displayName: 'Title',
+		id: 'title',
+		type: 'string',
+		removed: false,
+	},
+	{
+		displayName: 'Description',
+		id: 'description',
+		type: 'string',
+		removed: false,
+	},
+	{
+		displayName: 'Group',
+		id: 'group',
+		type: 'string',
+		removed: false,
+	},
+	{
+		displayName: 'Status',
+		id: 'status',
+		type: 'stirng',
+		removed: true,
+	},
+	{
+		displayName: 'Flag',
+		id: 'flag',
+		type: 'boolean',
+		removed: false,
+	},
+	{
+		displayName: 'Start Date',
+		id: 'startDate',
+		type: 'dateTime',
+		removed: true,
+	},
+	{
+		displayName: 'Due Date',
+		id: 'dueDate',
+		type: 'dateTime',
+		removed: false,
+	},
+	{
+		displayName: 'End Date',
+		id: 'endDate',
+		type: 'dateTime',
+		removed: true,
+	},
+	{
+		displayName: 'Assignee',
+		id: 'assignee',
+		type: 'options',
+		removed: false,
+	},
+	{
+		displayName: 'Mandatory',
+		id: 'mandatory',
+		type: 'boolean',
+		removed: false,
+	},
+	{
+		displayName: 'Order',
+		id: 'order',
+		type: 'number',
+		removed: true,
+	},
+];
+
+export const observableCommonFields = [
+	{
+		displayName: 'Data Type',
+		id: 'dataType',
+		type: 'options',
+		removed: false,
+	},
+	{
+		displayName: 'Start Date',
+		id: 'startDate',
+		type: 'dateTime',
+		removed: true,
+	},
+	{
+		displayName: 'Description',
+		id: 'message',
+		type: 'string',
+		removed: false,
+	},
+	{
+		displayName: 'Tags',
+		id: 'tags',
+		type: 'string',
+		removed: false,
+	},
+	{
+		displayName: 'TLP (Confidentiality of information)',
+		id: 'tlp',
+		type: 'options',
+		options: [
+			{
+				name: 'White',
+				value: TLP.white,
+			},
+			{
+				name: 'Green',
+				value: TLP.green,
+			},
+			{
+				name: 'Amber',
+				value: TLP.amber,
+			},
+			{
+				name: 'Red',
+				value: TLP.red,
+			},
+		],
+		removed: false,
+	},
+	{
+		displayName: 'PAP (Level of exposure of information)',
+		id: 'pap',
+		type: 'options',
+		options: [
+			{
+				name: 'White',
+				value: TLP.white,
+			},
+			{
+				name: 'Green',
+				value: TLP.green,
+			},
+			{
+				name: 'Amber',
+				value: TLP.amber,
+			},
+			{
+				name: 'Red',
+				value: TLP.red,
+			},
+		],
+		removed: false,
+	},
+	{
+		displayName: 'IOC',
+		id: 'ioc',
+		type: 'boolean',
+		removed: false,
+	},
+	{
+		displayName: 'Sighted',
+		id: 'sighted',
+		type: 'boolean',
+		removed: false,
+	},
+	{
+		displayName: 'Sighted At',
+		id: 'sightedAt',
+		type: 'dateTime',
+		removed: true,
+	},
+	{
+		displayName: 'Ignore Similarity',
+		id: 'ignoreSimilarity',
+		type: 'boolean',
+		removed: false,
+	},
+	{
+		displayName: 'Is Zip',
+		id: 'isZip',
+		type: 'boolean',
+		removed: true,
+	},
+	{
+		displayName: 'Zip Password',
+		id: 'zipPassword',
+		type: 'string',
+		removed: true,
+	},
+	{
+		displayName: 'Add Tags',
+		id: 'addTags',
+		type: 'string',
+		removed: true,
+	},
+	{
+		displayName: 'Remove Tags',
+		id: 'removeTags',
+		type: 'string',
+		removed: true,
+	},
+];
diff --git a/packages/nodes-base/nodes/TheHiveProject/helpers/interfaces.ts b/packages/nodes-base/nodes/TheHiveProject/helpers/interfaces.ts
new file mode 100644
index 0000000000000..ebd508251f984
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/helpers/interfaces.ts
@@ -0,0 +1,8 @@
+export const enum TLP {
+	white,
+	green,
+	amber,
+	red,
+}
+
+export type QueryScope = { query: string; id?: string; restrictTo?: string };
diff --git a/packages/nodes-base/nodes/TheHiveProject/helpers/utils.ts b/packages/nodes-base/nodes/TheHiveProject/helpers/utils.ts
new file mode 100644
index 0000000000000..8c392043b8f1c
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/helpers/utils.ts
@@ -0,0 +1,102 @@
+import { ApplicationError, type IDataObject } from 'n8n-workflow';
+
+import get from 'lodash/get';
+import set from 'lodash/set';
+
+export function splitAndTrim(str: string | string[]) {
+	if (typeof str === 'string') {
+		return str
+			.split(',')
+			.map((tag) => tag.trim())
+			.filter((tag) => tag);
+	}
+	return str;
+}
+
+export function fixFieldType(fields: IDataObject) {
+	const returnData: IDataObject = {};
+
+	for (const key of Object.keys(fields)) {
+		if (
+			[
+				'date',
+				'lastSyncDate',
+				'startDate',
+				'endDate',
+				'dueDate',
+				'includeInTimeline',
+				'sightedAt',
+			].includes(key)
+		) {
+			returnData[key] = Date.parse(fields[key] as string);
+			continue;
+		}
+
+		if (['tags', 'addTags', 'removeTags'].includes(key)) {
+			returnData[key] = splitAndTrim(fields[key] as string);
+			continue;
+		}
+
+		returnData[key] = fields[key];
+	}
+
+	return returnData;
+}
+
+export function prepareInputItem(item: IDataObject, schema: IDataObject[], i: number) {
+	const returnData: IDataObject = {};
+
+	for (const entry of schema) {
+		const id = entry.id as string;
+		const value = get(item, id);
+
+		if (value !== undefined) {
+			set(returnData, id, value);
+		} else {
+			if (entry.required) {
+				throw new ApplicationError(`Required field "${id}" is missing in item ${i}`, {
+					level: 'warning',
+				});
+			}
+		}
+	}
+
+	return returnData;
+}
+
+export function constructFilter(entry: IDataObject) {
+	const { field, value } = entry;
+	let { operator } = entry;
+
+	if (operator === undefined) {
+		operator = '_eq';
+	}
+
+	if (operator === '_between') {
+		const { from, to } = entry;
+		return {
+			_between: {
+				_field: field,
+				_from: from,
+				_to: to,
+			},
+		};
+	}
+
+	if (operator === '_in') {
+		const { values } = entry;
+		return {
+			_in: {
+				_field: field,
+				_values: typeof values === 'string' ? splitAndTrim(values) : values,
+			},
+		};
+	}
+
+	return {
+		[operator as string]: {
+			_field: field,
+			_value: value,
+		},
+	};
+}
diff --git a/packages/nodes-base/nodes/TheHiveProject/methods/index.ts b/packages/nodes-base/nodes/TheHiveProject/methods/index.ts
new file mode 100644
index 0000000000000..b438352ebd4b2
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/methods/index.ts
@@ -0,0 +1,3 @@
+export * as loadOptions from './loadOptions';
+export * as listSearch from './listSearch';
+export * as resourceMapping from './resourceMapping';
diff --git a/packages/nodes-base/nodes/TheHiveProject/methods/listSearch.ts b/packages/nodes-base/nodes/TheHiveProject/methods/listSearch.ts
new file mode 100644
index 0000000000000..ce35c11a485c5
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/methods/listSearch.ts
@@ -0,0 +1,270 @@
+import type { IDataObject, ILoadOptionsFunctions, INodeListSearchResult } from 'n8n-workflow';
+import { theHiveApiRequest } from '../transport';
+
+async function listResource(
+	this: ILoadOptionsFunctions,
+	resource: string,
+	filterField: string,
+	nameField: string,
+	urlPlaceholder: string | undefined,
+	filter?: string,
+	paginationToken?: string,
+): Promise<INodeListSearchResult> {
+	const query: IDataObject[] = [
+		{
+			_name: resource,
+		},
+	];
+
+	if (filter) {
+		query.push({
+			_name: 'filter',
+			_like: {
+				_field: filterField,
+				_value: filter,
+			},
+		});
+	}
+
+	const from = paginationToken !== undefined ? parseInt(paginationToken, 10) : 0;
+	const to = from + 100;
+	query.push({
+		_name: 'page',
+		from,
+		to,
+	});
+
+	const response = await theHiveApiRequest.call(this, 'POST', '/v1/query', { query });
+
+	if (response.length === 0) {
+		return {
+			results: [],
+			paginationToken: undefined,
+		};
+	}
+
+	const credentials = await this.getCredentials('theHiveProjectApi');
+	const url = credentials?.url as string;
+
+	return {
+		results: response.map((entry: IDataObject) => ({
+			name: entry[nameField],
+			value: entry._id,
+			url:
+				urlPlaceholder !== undefined ? `${url}/${urlPlaceholder}/${entry._id}/details` : undefined,
+		})),
+		paginationToken: to,
+	};
+}
+
+export async function caseSearch(
+	this: ILoadOptionsFunctions,
+	filter?: string,
+	paginationToken?: string,
+): Promise<INodeListSearchResult> {
+	return await listResource.call(
+		this,
+		'listCase',
+		'title',
+		'title',
+		'cases',
+		filter,
+		paginationToken,
+	);
+}
+
+export async function commentSearch(
+	this: ILoadOptionsFunctions,
+	filter?: string,
+	paginationToken?: string,
+): Promise<INodeListSearchResult> {
+	return await listResource.call(
+		this,
+		'listComment',
+		'message',
+		'message',
+		undefined,
+		filter,
+		paginationToken,
+	);
+}
+
+export async function alertSearch(
+	this: ILoadOptionsFunctions,
+	filter?: string,
+	paginationToken?: string,
+): Promise<INodeListSearchResult> {
+	return await listResource.call(
+		this,
+		'listAlert',
+		'title',
+		'title',
+		'alerts',
+		filter,
+		paginationToken,
+	);
+}
+
+export async function taskSearch(
+	this: ILoadOptionsFunctions,
+	filter?: string,
+	paginationToken?: string,
+): Promise<INodeListSearchResult> {
+	return await listResource.call(
+		this,
+		'listTask',
+		'title',
+		'title',
+		undefined,
+		filter,
+		paginationToken,
+	);
+}
+
+export async function pageSearch(
+	this: ILoadOptionsFunctions,
+	filter?: string,
+	paginationToken?: string,
+): Promise<INodeListSearchResult> {
+	let caseId;
+
+	try {
+		caseId = this.getNodeParameter('caseId', '', { extractValue: true }) as string;
+	} catch (error) {
+		caseId = undefined;
+	}
+
+	let query: IDataObject[];
+
+	if (caseId) {
+		query = [
+			{
+				_name: 'getCase',
+				idOrName: caseId,
+			},
+			{
+				_name: 'pages',
+			},
+		];
+	} else {
+		query = [
+			{
+				_name: 'listOrganisationPage',
+			},
+		];
+	}
+
+	if (filter) {
+		query.push({
+			_name: 'filter',
+			_like: {
+				_field: 'title',
+				_value: filter,
+			},
+		});
+	}
+
+	const from = paginationToken !== undefined ? parseInt(paginationToken, 10) : 0;
+	const to = from + 100;
+	query.push({
+		_name: 'page',
+		from,
+		to,
+	});
+
+	const response = await theHiveApiRequest.call(this, 'POST', '/v1/query', { query });
+
+	if (response.length === 0) {
+		return {
+			results: [],
+			paginationToken: undefined,
+		};
+	}
+
+	return {
+		results: response.map((entry: IDataObject) => ({
+			name: entry.title,
+			value: entry._id,
+		})),
+		paginationToken: to,
+	};
+}
+
+export async function logSearch(
+	this: ILoadOptionsFunctions,
+	filter?: string,
+	paginationToken?: string,
+): Promise<INodeListSearchResult> {
+	return await listResource.call(
+		this,
+		'listLog',
+		'message',
+		'message',
+		undefined,
+		filter,
+		paginationToken,
+	);
+}
+
+export async function observableSearch(
+	this: ILoadOptionsFunctions,
+	filter?: string,
+	paginationToken?: string,
+): Promise<INodeListSearchResult> {
+	const query: IDataObject[] = [
+		{
+			_name: 'listObservable',
+		},
+	];
+
+	if (filter) {
+		query.push({
+			_name: 'filter',
+			_or: [
+				{
+					_like: {
+						_field: 'data',
+						_value: filter,
+					},
+				},
+				{
+					_like: {
+						_field: 'message',
+						_value: filter,
+					},
+				},
+				{
+					_like: {
+						_field: 'attachment.name',
+						_value: filter,
+					},
+				},
+			],
+		});
+	}
+
+	const from = paginationToken !== undefined ? parseInt(paginationToken, 10) : 0;
+	const to = from + 100;
+	query.push({
+		_name: 'page',
+		from,
+		to,
+	});
+
+	const response = await theHiveApiRequest.call(this, 'POST', '/v1/query', { query });
+
+	if (response.length === 0) {
+		return {
+			results: [],
+			paginationToken: undefined,
+		};
+	}
+
+	return {
+		results: response.map((entry: IDataObject) => ({
+			name: entry.data || (entry.attachment as IDataObject)?.name || entry.message || entry._id,
+			value: entry._id,
+		})),
+		paginationToken: to,
+	};
+}
diff --git a/packages/nodes-base/nodes/TheHiveProject/methods/loadOptions.ts b/packages/nodes-base/nodes/TheHiveProject/methods/loadOptions.ts
new file mode 100644
index 0000000000000..3e7c925257857
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/methods/loadOptions.ts
@@ -0,0 +1,348 @@
+import type { IDataObject, ILoadOptionsFunctions, INodePropertyOptions } from 'n8n-workflow';
+import { theHiveApiRequest } from '../transport';
+import {
+	alertCommonFields,
+	caseCommonFields,
+	observableCommonFields,
+	taskCommonFields,
+} from '../helpers/constants';
+
+export async function loadResponders(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+	let resource = this.getNodeParameter('resource') as string;
+
+	let resourceId = '';
+
+	if (['case', 'alert', 'observable', 'log', 'task'].includes(resource)) {
+		resourceId = this.getNodeParameter('id', '', { extractValue: true }) as string;
+	} else {
+		resourceId = this.getNodeParameter('id') as string;
+	}
+
+	switch (resource) {
+		case 'observable':
+			resource = 'case_artifact';
+			break;
+		case 'task':
+			resource = 'case_task';
+			break;
+		case 'log':
+			resource = 'case_task_log';
+			break;
+	}
+
+	const responders = await theHiveApiRequest.call(
+		this,
+		'GET',
+		`/connector/cortex/responder/${resource}/${resourceId}`,
+	);
+
+	const returnData: INodePropertyOptions[] = [];
+
+	for (const responder of responders) {
+		returnData.push({
+			name: responder.name as string,
+			value: responder.id,
+			description: responder.description as string,
+		});
+	}
+
+	return returnData;
+}
+
+export async function loadAnalyzers(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+	const returnData: INodePropertyOptions[] = [];
+
+	const dataType = this.getNodeParameter('dataType') as string;
+
+	const requestResult = await theHiveApiRequest.call(
+		this,
+		'GET',
+		`/connector/cortex/analyzer/type/${dataType}`,
+	);
+
+	for (const analyzer of requestResult) {
+		for (const cortexId of analyzer.cortexIds) {
+			returnData.push({
+				name: `[${cortexId}] ${analyzer.name}`,
+				value: `${analyzer.id as string}::${cortexId as string}`,
+				description: analyzer.description as string,
+			});
+		}
+	}
+
+	return returnData;
+}
+
+export async function loadCustomFields(
+	this: ILoadOptionsFunctions,
+): Promise<INodePropertyOptions[]> {
+	const requestResult = await theHiveApiRequest.call(this, 'GET', '/customField');
+
+	const returnData: INodePropertyOptions[] = [];
+
+	for (const field of requestResult) {
+		returnData.push({
+			name: `Custom Field: ${(field.displayName || field.name) as string}`,
+			value: `customFields.${field.name}`,
+			// description: `${field.type}: ${field.description}`,
+		} as INodePropertyOptions);
+	}
+
+	return returnData;
+}
+
+export async function loadObservableTypes(
+	this: ILoadOptionsFunctions,
+): Promise<INodePropertyOptions[]> {
+	const returnData: INodePropertyOptions[] = [];
+
+	const body = {
+		query: [
+			{
+				_name: 'listObservableType',
+			},
+		],
+	};
+
+	const response = await theHiveApiRequest.call(this, 'POST', '/v1/query', body);
+
+	for (const entry of response) {
+		returnData.push({
+			name: `${entry.name as string}${entry.isAttachment ? ' (attachment)' : ''}`,
+			value: entry.name,
+		});
+	}
+	return returnData;
+}
+export async function loadCaseAttachments(
+	this: ILoadOptionsFunctions,
+): Promise<INodePropertyOptions[]> {
+	const returnData: INodePropertyOptions[] = [];
+	const caseId = this.getNodeParameter('caseId', '', { extractValue: true }) as string;
+
+	const body = {
+		query: [
+			{
+				_name: 'getCase',
+				idOrName: caseId,
+			},
+			{
+				_name: 'attachments',
+			},
+		],
+	};
+
+	const response = await theHiveApiRequest.call(this, 'POST', '/v1/query', body);
+
+	for (const entry of response) {
+		returnData.push({
+			name: entry.name as string,
+			value: entry._id,
+			description: `Content-Type: ${entry.contentType}`,
+		});
+	}
+	return returnData;
+}
+
+export async function loadLogAttachments(
+	this: ILoadOptionsFunctions,
+): Promise<INodePropertyOptions[]> {
+	const returnData: INodePropertyOptions[] = [];
+	const logId = this.getNodeParameter('logId', '', { extractValue: true }) as string;
+
+	const body = {
+		query: [
+			{
+				_name: 'getLog',
+				idOrName: logId,
+			},
+		],
+	};
+
+	// extract log object from array
+	const [response] = await theHiveApiRequest.call(this, 'POST', '/v1/query', body);
+
+	for (const entry of (response.attachments as IDataObject[]) || []) {
+		returnData.push({
+			name: entry.name as string,
+			value: entry._id as string,
+			description: `Content-Type: ${entry.contentType}`,
+		});
+	}
+	return returnData;
+}
+
+export async function loadAlertStatus(
+	this: ILoadOptionsFunctions,
+): Promise<INodePropertyOptions[]> {
+	const returnData: INodePropertyOptions[] = [];
+
+	const body = {
+		query: [
+			{
+				_name: 'listAlertStatus',
+			},
+		],
+	};
+
+	const response = await theHiveApiRequest.call(this, 'POST', '/v1/query', body);
+
+	for (const entry of response) {
+		returnData.push({
+			name: entry.value,
+			value: entry.value,
+			description: `Stage: ${entry.stage}`,
+		});
+	}
+	return returnData.sort((a, b) => a.name.localeCompare(b.name));
+}
+
+export async function loadCaseStatus(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+	const returnData: INodePropertyOptions[] = [];
+
+	const body = {
+		query: [
+			{
+				_name: 'listCaseStatus',
+			},
+		],
+	};
+
+	const response = await theHiveApiRequest.call(this, 'POST', '/v1/query', body);
+
+	for (const entry of response) {
+		returnData.push({
+			name: entry.value,
+			value: entry.value,
+			description: `Stage: ${entry.stage}`,
+		});
+	}
+	return returnData.sort((a, b) => a.name.localeCompare(b.name));
+}
+
+export async function loadCaseTemplate(
+	this: ILoadOptionsFunctions,
+): Promise<INodePropertyOptions[]> {
+	const returnData: INodePropertyOptions[] = [];
+
+	const body = {
+		query: [
+			{
+				_name: 'listCaseTemplate',
+			},
+		],
+	};
+
+	const response = await theHiveApiRequest.call(this, 'POST', '/v1/query', body);
+
+	for (const entry of response) {
+		returnData.push({
+			name: entry.displayName || entry.name,
+			value: entry.name,
+		});
+	}
+	return returnData;
+}
+
+export async function loadUsers(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+	const returnData: INodePropertyOptions[] = [];
+
+	const body = {
+		query: [
+			{
+				_name: 'listUser',
+			},
+		],
+	};
+
+	const response = await theHiveApiRequest.call(this, 'POST', '/v1/query', body);
+
+	for (const entry of response) {
+		returnData.push({
+			name: entry.name,
+			value: entry.login,
+		});
+	}
+	return returnData;
+}
+
+export async function loadAlertFields(
+	this: ILoadOptionsFunctions,
+): Promise<INodePropertyOptions[]> {
+	const returnData: INodePropertyOptions[] = [];
+
+	const excludeFields = ['addTags', 'removeTags'];
+
+	const fields = alertCommonFields
+		.filter((entry) => !excludeFields.includes(entry.id))
+		.map((entry) => {
+			const field: INodePropertyOptions = {
+				name: entry.displayName || entry.id,
+				value: entry.id,
+			};
+
+			return field;
+		});
+
+	const customFields = await loadCustomFields.call(this);
+
+	returnData.push(...fields, ...customFields);
+	return returnData;
+}
+
+export async function loadCaseFields(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+	const returnData: INodePropertyOptions[] = [];
+
+	const excludeFields = ['addTags', 'removeTags', 'taskRule', 'observableRule'];
+
+	const fields = caseCommonFields
+		.filter((entry) => !excludeFields.includes(entry.id))
+		.map((entry) => {
+			const field: INodePropertyOptions = {
+				name: entry.displayName || entry.id,
+				value: entry.id,
+			};
+
+			return field;
+		});
+
+	const customFields = await loadCustomFields.call(this);
+
+	returnData.push(...fields, ...customFields);
+	return returnData;
+}
+
+export async function loadObservableFields(
+	this: ILoadOptionsFunctions,
+): Promise<INodePropertyOptions[]> {
+	const returnData: INodePropertyOptions[] = [];
+
+	const excludeFields = ['addTags', 'removeTags', 'zipPassword'];
+
+	const fields = observableCommonFields
+		.filter((entry) => !excludeFields.includes(entry.id))
+		.map((entry) => {
+			const field: INodePropertyOptions = {
+				name: entry.displayName || entry.id,
+				value: entry.id,
+			};
+
+			return field;
+		});
+
+	returnData.push(...fields);
+	return returnData;
+}
+
+export async function loadTaskFields(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+	const fields = taskCommonFields.map((entry) => {
+		const field: INodePropertyOptions = {
+			name: entry.displayName || entry.id,
+			value: entry.id,
+		};
+
+		return field;
+	});
+
+	return fields;
+}
diff --git a/packages/nodes-base/nodes/TheHiveProject/methods/resourceMapping.ts b/packages/nodes-base/nodes/TheHiveProject/methods/resourceMapping.ts
new file mode 100644
index 0000000000000..84703409ba0fd
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/methods/resourceMapping.ts
@@ -0,0 +1,441 @@
+import type {
+	FieldType,
+	IDataObject,
+	ILoadOptionsFunctions,
+	ResourceMapperField,
+	ResourceMapperFields,
+} from 'n8n-workflow';
+
+import { theHiveApiRequest } from '../transport';
+
+import {
+	alertCommonFields,
+	caseCommonFields,
+	observableCommonFields,
+	taskCommonFields,
+} from '../helpers/constants';
+import {
+	loadAlertStatus,
+	loadCaseStatus,
+	loadCaseTemplate,
+	loadObservableTypes,
+	loadUsers,
+} from './loadOptions';
+
+async function getCustomFields(this: ILoadOptionsFunctions) {
+	const customFields = (await theHiveApiRequest.call(this, 'POST', '/v1/query', {
+		query: [
+			{
+				_name: 'listCustomField',
+			},
+		],
+	})) as IDataObject[];
+
+	return customFields.map((field) => ({
+		displayName: `Custom Field: ${(field.displayName || field.name) as string}`,
+		id: `customFields.${field.name}`,
+		required: false,
+		display: true,
+		type: (field.options as string[])?.length ? 'options' : (field.type as FieldType),
+		defaultMatch: false,
+		options: (field.options as string[])?.length
+			? (field.options as string[]).map((option) => ({ name: option, value: option }))
+			: undefined,
+		removed: true,
+	}));
+}
+
+export async function getAlertFields(this: ILoadOptionsFunctions): Promise<ResourceMapperFields> {
+	const alertStatus = await loadAlertStatus.call(this);
+	const caseTemplates = await loadCaseTemplate.call(this);
+
+	const requiredFields = ['title', 'description', 'type', 'source', 'sourceRef'];
+	const excludeFields = ['addTags', 'removeTags', 'lastSyncDate'];
+
+	const fields: ResourceMapperField[] = alertCommonFields
+		.filter((entry) => !excludeFields.includes(entry.id))
+		.map((entry) => {
+			const type = entry.type as FieldType;
+			const field: ResourceMapperField = {
+				...entry,
+				type,
+				required: false,
+				display: true,
+				defaultMatch: false,
+			};
+
+			if (requiredFields.includes(entry.id)) {
+				field.required = true;
+			}
+
+			if (field.id === 'status') {
+				field.options = alertStatus;
+			}
+
+			if (field.id === 'caseTemplate') {
+				field.options = caseTemplates;
+			}
+			return field;
+		});
+
+	const customFields = (await getCustomFields.call(this)) || [];
+	fields.push(...customFields);
+
+	const columnData: ResourceMapperFields = {
+		fields,
+	};
+
+	return columnData;
+}
+
+export async function getAlertUpdateFields(
+	this: ILoadOptionsFunctions,
+): Promise<ResourceMapperFields> {
+	const alertStatus = await loadAlertStatus.call(this);
+	const excludedFromMatching = ['addTags', 'removeTags'];
+	const excludeFields = ['flag', 'caseTemplate'];
+
+	const alertUpdateFields = alertCommonFields
+		.filter((entry) => !excludeFields.includes(entry.id))
+		.map((entry) => {
+			const type = entry.type as FieldType;
+			const field: ResourceMapperField = {
+				...entry,
+				type,
+				required: false,
+				display: true,
+				defaultMatch: false,
+				canBeUsedToMatch: true,
+			};
+
+			if (excludedFromMatching.includes(field.id)) {
+				field.canBeUsedToMatch = false;
+			}
+
+			if (field.id === 'status') {
+				field.options = alertStatus;
+			}
+			return field;
+		});
+
+	const fields: ResourceMapperField[] = [
+		{
+			displayName: 'ID',
+			id: 'id',
+			required: false,
+			display: true,
+			type: 'string',
+			defaultMatch: true,
+			canBeUsedToMatch: true,
+		},
+		...alertUpdateFields,
+	];
+
+	const customFields = (await getCustomFields.call(this)) || [];
+	fields.push(...customFields);
+
+	const columnData: ResourceMapperFields = {
+		fields,
+	};
+
+	return columnData;
+}
+
+export async function getCaseFields(this: ILoadOptionsFunctions): Promise<ResourceMapperFields> {
+	const caseStatus = await loadCaseStatus.call(this);
+	const caseTemplates = await loadCaseTemplate.call(this);
+	const users = await loadUsers.call(this);
+
+	const requiredFields = ['title', 'description'];
+	const excludeCreateFields = ['impactStatus', 'taskRule', 'addTags', 'removeTags'];
+
+	const fields: ResourceMapperField[] = caseCommonFields
+		.filter((entry) => !excludeCreateFields.includes(entry.id))
+		.map((entry) => {
+			const type = entry.type as FieldType;
+			const field: ResourceMapperField = {
+				...entry,
+				type,
+				required: false,
+				display: true,
+				defaultMatch: false,
+			};
+
+			if (requiredFields.includes(entry.id)) {
+				field.required = true;
+			}
+
+			if (field.id === 'assignee') {
+				field.options = users;
+			}
+
+			if (field.id === 'status') {
+				field.options = caseStatus;
+			}
+
+			if (field.id === 'caseTemplate') {
+				field.options = caseTemplates;
+			}
+			return field;
+		});
+
+	const customFields = (await getCustomFields.call(this)) || [];
+	fields.push(...customFields);
+
+	const columnData: ResourceMapperFields = {
+		fields,
+	};
+
+	return columnData;
+}
+
+export async function getCaseUpdateFields(
+	this: ILoadOptionsFunctions,
+): Promise<ResourceMapperFields> {
+	const caseStatus = await loadCaseStatus.call(this);
+	const users = await loadUsers.call(this);
+
+	const excludedFromMatching = ['addTags', 'removeTags', 'taskRule', 'observableRule'];
+	const excludeUpdateFields = ['caseTemplate', 'tasks', 'sharingParameters'];
+
+	const caseUpdateFields = caseCommonFields
+		.filter((entry) => !excludeUpdateFields.includes(entry.id))
+		.map((entry) => {
+			const type = entry.type as FieldType;
+			const field: ResourceMapperField = {
+				...entry,
+				type,
+				required: false,
+				display: true,
+				defaultMatch: false,
+				canBeUsedToMatch: true,
+			};
+
+			if (excludedFromMatching.includes(field.id)) {
+				field.canBeUsedToMatch = false;
+			}
+
+			if (field.id === 'assignee') {
+				field.options = users;
+			}
+
+			if (field.id === 'status') {
+				field.options = caseStatus;
+			}
+			return field;
+		});
+
+	const fields: ResourceMapperField[] = [
+		{
+			displayName: 'ID',
+			id: 'id',
+			required: false,
+			display: true,
+			type: 'string',
+			defaultMatch: true,
+			canBeUsedToMatch: true,
+		},
+		...caseUpdateFields,
+	];
+
+	const customFields = (await getCustomFields.call(this)) || [];
+	fields.push(...customFields);
+
+	const columnData: ResourceMapperFields = {
+		fields,
+	};
+
+	return columnData;
+}
+
+export async function getTaskFields(this: ILoadOptionsFunctions): Promise<ResourceMapperFields> {
+	const users = await loadUsers.call(this);
+
+	const requiredFields = ['title'];
+
+	const fields: ResourceMapperField[] = taskCommonFields.map((entry) => {
+		const type = entry.type as FieldType;
+		const field: ResourceMapperField = {
+			...entry,
+			type,
+			required: false,
+			display: true,
+			defaultMatch: false,
+		};
+
+		if (requiredFields.includes(entry.id)) {
+			field.required = true;
+		}
+
+		if (field.id === 'assignee') {
+			field.options = users;
+		}
+
+		return field;
+	});
+
+	const columnData: ResourceMapperFields = {
+		fields,
+	};
+
+	return columnData;
+}
+
+export async function getTaskUpdateFields(
+	this: ILoadOptionsFunctions,
+): Promise<ResourceMapperFields> {
+	const users = await loadUsers.call(this);
+
+	const caseUpdateFields = taskCommonFields.map((entry) => {
+		const type = entry.type as FieldType;
+		const field: ResourceMapperField = {
+			...entry,
+			type,
+			required: false,
+			display: true,
+			defaultMatch: false,
+			canBeUsedToMatch: true,
+		};
+
+		if (field.id === 'assignee') {
+			field.options = users;
+		}
+
+		return field;
+	});
+
+	const fields: ResourceMapperField[] = [
+		{
+			displayName: 'ID',
+			id: 'id',
+			required: false,
+			display: true,
+			type: 'string',
+			defaultMatch: true,
+			canBeUsedToMatch: true,
+		},
+		...caseUpdateFields,
+	];
+
+	const columnData: ResourceMapperFields = {
+		fields,
+	};
+
+	return columnData;
+}
+
+export async function getLogFields(this: ILoadOptionsFunctions): Promise<ResourceMapperFields> {
+	const fields: ResourceMapperField[] = [
+		{
+			displayName: 'Message',
+			id: 'message',
+			required: true,
+			display: true,
+			type: 'string',
+			defaultMatch: true,
+		},
+		{
+			displayName: 'Start Date',
+			id: 'startDate',
+			required: false,
+			display: true,
+			type: 'dateTime',
+			defaultMatch: false,
+			removed: true,
+		},
+		{
+			displayName: 'Include In Timeline',
+			id: 'includeInTimeline',
+			required: false,
+			display: true,
+			type: 'dateTime',
+			defaultMatch: false,
+			removed: true,
+		},
+	];
+
+	const columnData: ResourceMapperFields = {
+		fields,
+	};
+
+	return columnData;
+}
+
+export async function getObservableFields(
+	this: ILoadOptionsFunctions,
+): Promise<ResourceMapperFields> {
+	const excludeFields = ['addTags', 'removeTags', 'dataType'];
+
+	const fields: ResourceMapperField[] = observableCommonFields
+		.filter((entry) => !excludeFields.includes(entry.id))
+		.map((entry) => {
+			const type = entry.type as FieldType;
+			const field: ResourceMapperField = {
+				...entry,
+				type,
+				required: false,
+				display: true,
+				defaultMatch: false,
+			};
+
+			return field;
+		});
+
+	const columnData: ResourceMapperFields = {
+		fields,
+	};
+
+	return columnData;
+}
+
+export async function getObservableUpdateFields(
+	this: ILoadOptionsFunctions,
+): Promise<ResourceMapperFields> {
+	const dataTypes = await loadObservableTypes.call(this);
+
+	const excludedFromMatching = ['addTags', 'removeTags'];
+	const excludeFields: string[] = ['attachment', 'data', 'startDate', 'zipPassword', 'isZip'];
+
+	const caseUpdateFields = observableCommonFields
+		.filter((entry) => !excludeFields.includes(entry.id))
+		.map((entry) => {
+			const type = entry.type as FieldType;
+			const field: ResourceMapperField = {
+				...entry,
+				type,
+				required: false,
+				display: true,
+				defaultMatch: false,
+				canBeUsedToMatch: true,
+			};
+
+			if (excludedFromMatching.includes(field.id)) {
+				field.canBeUsedToMatch = false;
+			}
+
+			if (field.id === 'dataType') {
+				field.options = dataTypes;
+			}
+
+			return field;
+		});
+
+	const fields: ResourceMapperField[] = [
+		{
+			displayName: 'ID',
+			id: 'id',
+			required: false,
+			display: true,
+			type: 'string',
+			defaultMatch: true,
+			canBeUsedToMatch: true,
+		},
+		...caseUpdateFields,
+	];
+
+	const columnData: ResourceMapperFields = {
+		fields,
+	};
+
+	return columnData;
+}
diff --git a/packages/nodes-base/nodes/TheHiveProject/test/transport.test.ts b/packages/nodes-base/nodes/TheHiveProject/test/transport.test.ts
new file mode 100644
index 0000000000000..442cb2739fe6e
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/test/transport.test.ts
@@ -0,0 +1,163 @@
+import type { IExecuteFunctions } from 'n8n-workflow';
+import nock from 'nock';
+import * as transport from '../transport/requestApi';
+
+import { theHiveApiQuery } from '../transport/queryHelper';
+
+jest.mock('../transport/requestApi', () => {
+	const originalModule = jest.requireActual('../transport/requestApi');
+	return {
+		...originalModule,
+		theHiveApiRequest: jest.fn(async function () {
+			return {};
+		}),
+	};
+});
+
+const fakeExecuteFunction = {} as unknown as IExecuteFunctions;
+
+describe('Test TheHiveProject, theHiveApiQuery', () => {
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../transport/requestApi');
+	});
+
+	it('should make list query request', async () => {
+		const scope = {
+			query: 'listOrganisationPage',
+		};
+		const filtersValues = [
+			{
+				field: 'title',
+				operator: '_like',
+				value: 'Test',
+			},
+		];
+		const sortFields = [
+			{
+				field: 'title',
+				direction: 'asc',
+			},
+		];
+		const limit = undefined;
+		const returnCount = false;
+
+		await theHiveApiQuery.call(
+			fakeExecuteFunction,
+			scope,
+			filtersValues,
+			sortFields,
+			limit,
+			returnCount,
+		);
+
+		expect(transport.theHiveApiRequest).toHaveBeenCalledTimes(1);
+		expect(transport.theHiveApiRequest).toHaveBeenCalledWith('POST', '/v1/query', {
+			query: [
+				{ _name: 'listOrganisationPage' },
+				{ _and: [{ _like: { _field: 'title', _value: 'Test' } }], _name: 'filter' },
+				{ _fields: [{ title: 'asc' }], _name: 'sort' },
+				{ _name: 'page', extraData: undefined, from: 0, to: 500 },
+			],
+		});
+	});
+
+	it('should make get query request', async () => {
+		const scope = {
+			query: 'getTask',
+			id: '~368644136',
+			restrictTo: 'logs',
+		};
+		const filtersValues = [
+			{
+				field: 'message',
+				operator: '_like',
+				value: 'Test',
+			},
+			{
+				field: 'date',
+				operator: '_gt',
+				value: 1687263671915,
+			},
+		];
+		const sortFields = [
+			{
+				field: 'message',
+				direction: 'desc',
+			},
+		];
+		const limit = undefined;
+		const returnCount = false;
+		const extraData = ['taskId', 'case'];
+
+		await theHiveApiQuery.call(
+			fakeExecuteFunction,
+			scope,
+			filtersValues,
+			sortFields,
+			limit,
+			returnCount,
+			extraData,
+		);
+
+		expect(transport.theHiveApiRequest).toHaveBeenCalledTimes(2);
+		expect(transport.theHiveApiRequest).toHaveBeenCalledWith('POST', '/v1/query', {
+			query: [
+				{ _name: 'getTask', idOrName: '~368644136' },
+				{ _name: 'logs' },
+				{
+					_and: [
+						{ _like: { _field: 'message', _value: 'Test' } },
+						{ _gt: { _field: 'date', _value: 1687263671915 } },
+					],
+					_name: 'filter',
+				},
+				{ _fields: [{ message: 'desc' }], _name: 'sort' },
+				{ _name: 'page', extraData: ['taskId', 'case'], from: 0, to: 500 },
+			],
+		});
+	});
+
+	it('should make return count query request', async () => {
+		const scope = {
+			query: 'listOrganisationPage',
+		};
+		const returnCount = true;
+
+		await theHiveApiQuery.call(
+			fakeExecuteFunction,
+			scope,
+			undefined,
+			undefined,
+			undefined,
+			returnCount,
+		);
+
+		expect(transport.theHiveApiRequest).toHaveBeenCalledTimes(3);
+		expect(transport.theHiveApiRequest).toHaveBeenCalledWith('POST', '/v1/query', {
+			query: [{ _name: 'listOrganisationPage' }, { _name: 'count' }],
+		});
+	});
+
+	it('should set limit to query request', async () => {
+		const scope = {
+			query: 'listOrganisationPage',
+		};
+
+		const limit = 15;
+
+		await theHiveApiQuery.call(fakeExecuteFunction, scope, undefined, undefined, limit);
+
+		expect(transport.theHiveApiRequest).toHaveBeenCalledTimes(4);
+		expect(transport.theHiveApiRequest).toHaveBeenCalledWith('POST', '/v1/query', {
+			query: [
+				{ _name: 'listOrganisationPage' },
+				{ _name: 'page', extraData: undefined, from: 0, to: 15 },
+			],
+		});
+	});
+});
diff --git a/packages/nodes-base/nodes/TheHiveProject/test/utils.test.ts b/packages/nodes-base/nodes/TheHiveProject/test/utils.test.ts
new file mode 100644
index 0000000000000..af2e5855ff3d3
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/test/utils.test.ts
@@ -0,0 +1,179 @@
+import { splitAndTrim, fixFieldType, prepareInputItem, constructFilter } from '../helpers/utils';
+
+describe('Test TheHiveProject, splitAndTrim', () => {
+	it('should split and trim string, removing empty entries', () => {
+		const data = 'a, b,, c, d, e, f,,';
+
+		const result = splitAndTrim(data);
+
+		expect(result).toEqual(['a', 'b', 'c', 'd', 'e', 'f']);
+	});
+
+	it('should return unchanged array', () => {
+		const data = ['a', 'b', 'c', 'd', 'e', 'f'];
+
+		const result = splitAndTrim(data);
+
+		expect(result).toEqual(data);
+	});
+});
+
+describe('Test TheHiveProject, fixFieldType', () => {
+	it('should split and trim tags', () => {
+		const data = {
+			tags: 'a, b,, c, d, e, f,,',
+			addTags: 'a, b,, c, d, e, f,,',
+			removeTags: 'a, b,, c, d, e, f,,',
+			notChanged: 'a, b,, c, d, e, f,,',
+		};
+
+		const result = fixFieldType(data);
+
+		expect(result).toEqual({
+			tags: ['a', 'b', 'c', 'd', 'e', 'f'],
+			addTags: ['a', 'b', 'c', 'd', 'e', 'f'],
+			removeTags: ['a', 'b', 'c', 'd', 'e', 'f'],
+			notChanged: 'a, b,, c, d, e, f,,',
+		});
+	});
+
+	it('should convert date strings to milis', () => {
+		const data = {
+			date: '2020-01-01T00:00:00.000Z',
+			lastSyncDate: '2020-01-01T00:00:00.000Z',
+			startDate: '2020-01-01T00:00:00.000Z',
+			endDate: '2020-01-01T00:00:00.000Z',
+			dueDate: '2020-01-01T00:00:00.000Z',
+			includeInTimeline: '2020-01-01T00:00:00.000Z',
+			sightedAt: '2020-01-01T00:00:00.000Z',
+			notChanged: '2020-01-01T00:00:00.000Z',
+		};
+
+		const result = fixFieldType(data);
+
+		expect(result).toEqual({
+			date: 1577836800000,
+			lastSyncDate: 1577836800000,
+			startDate: 1577836800000,
+			endDate: 1577836800000,
+			dueDate: 1577836800000,
+			includeInTimeline: 1577836800000,
+			sightedAt: 1577836800000,
+			notChanged: '2020-01-01T00:00:00.000Z',
+		});
+	});
+});
+
+describe('Test TheHiveProject, prepareInputItem', () => {
+	it('should return object with fields present in schema', () => {
+		const data = {
+			a: 1,
+			b: 2,
+			c: 3,
+			d: 4,
+			f: 5,
+			g: 6,
+		};
+
+		const schema = [
+			{
+				id: 'a',
+				required: true,
+			},
+			{
+				id: 'b',
+				required: true,
+			},
+			{
+				id: 'c',
+			},
+			{
+				id: 'd',
+				required: true,
+			},
+			{
+				id: 'e',
+			},
+		];
+
+		const result = prepareInputItem(data, schema, 0);
+
+		expect(result).toEqual({
+			a: 1,
+			b: 2,
+			c: 3,
+			d: 4,
+		});
+	});
+});
+
+describe('Test TheHiveProject, constructFilter', () => {
+	it('should add default operator _eq', () => {
+		const data = {
+			field: 'myField',
+			value: 'myValue',
+		};
+
+		const result = constructFilter(data);
+
+		expect(result).toEqual({
+			_eq: {
+				_field: 'myField',
+				_value: 'myValue',
+			},
+		});
+	});
+
+	it('should return filter _gte', () => {
+		const data = {
+			field: 'myField',
+			value: 'myValue',
+			operator: '_gte',
+		};
+
+		const result = constructFilter(data);
+
+		expect(result).toEqual({
+			_gte: {
+				_field: 'myField',
+				_value: 'myValue',
+			},
+		});
+	});
+
+	it('should return filter _in', () => {
+		const data = {
+			field: 'myField',
+			values: 'a, b,, c, d',
+			operator: '_in',
+		};
+
+		const result = constructFilter(data);
+
+		expect(result).toEqual({
+			_in: {
+				_field: 'myField',
+				_values: ['a', 'b', 'c', 'd'],
+			},
+		});
+	});
+
+	it('should return filter _between', () => {
+		const data = {
+			field: 'myField',
+			from: 'a',
+			to: 'b',
+			operator: '_between',
+		};
+
+		const result = constructFilter(data);
+
+		expect(result).toEqual({
+			_between: {
+				_field: 'myField',
+				_from: 'a',
+				_to: 'b',
+			},
+		});
+	});
+});
diff --git a/packages/nodes-base/nodes/TheHiveProject/thehiveproject.svg b/packages/nodes-base/nodes/TheHiveProject/thehiveproject.svg
new file mode 100644
index 0000000000000..914c9c5d22954
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/thehiveproject.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" data-name="Layer 1" viewBox="0 0 300 300"><defs><style>.cls-2{fill:#f3d02f}</style></defs><path fill="#252525" d="M290 150A140 140 0 1 1 150 10a140 140 0 0 1 140 140"/><path d="M204.62 210.6a15.1 15.1 0 0 1-6.68 1.38 17.49 17.49 0 0 1-16.11-10.93l-4.83-11.6-7.31-18.28a5.05 5.05 0 0 0-.7-2.12l-10.1-25.31c16.15 2.86 45.93 20.16 55.68 43.72 3.48 9.49-.76 19.66-9.9 23.14m-54.87 27.21c-11.58 0-21-8.5-24.85-21.5l49.85.16c-3.9 13.33-13.41 21.38-25 21.34m-48-26.14a14.3 14.3 0 0 1-6.67-1.43c-8.76-3.89-13.29-14.09-9.4-22.85 9.91-23.85 39.81-40.95 56-43.36L131 170l-7.79 19.29-5 11.57a18.34 18.34 0 0 1-16.53 10.83m42.63-45.16 5.69-13.69 5.57 13.71zm-7.79 19.29 3.19-8.06 20.37.07 3.13 8.08zm-5 11.57 36.17.12 3.13 8.09-42.48-.15zm18.56-90.87c9.48 0 17.53 9.18 17.5 16.56 0 8.77-14.43 9.43-17.23 9.41-3.16 0-17.21-.4-17.18-9.53-.67-7.38 7.43-16.48 16.91-16.44m-13.2-.42a3.75 3.75 0 0 1-3.39-2.15l-5.81-12.34a3.74 3.74 0 1 1 6.77-3.19l5.81 12.34a3.74 3.74 0 0 1-1.79 5 3.8 3.8 0 0 1-1.59.36m26.24-.02a3.8 3.8 0 0 1-1.59-.36 3.74 3.74 0 0 1-1.79-5l5.82-12.35a3.74 3.74 0 1 1 6.77 3.2L166.51 104a3.75 3.75 0 0 1-3.39 2.15" class="cls-2"/><path d="M204.36 157.81a3.74 3.74 0 0 1-3.26-5.56l14.41-25.87-32.87-56.7h-65.28L84.54 126.3l15.66 25.83a3.74 3.74 0 0 1-6.4 3.87L77 128.28a3.72 3.72 0 0 1 0-3.81l35-60.41a3.77 3.77 0 0 1 3.24-1.87h69.6a3.75 3.75 0 0 1 3.16 1.87l35 60.41a3.73 3.73 0 0 1 0 3.7l-15.44 27.72a3.75 3.75 0 0 1-3.28 1.92" class="cls-2"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/TheHiveProject/transport/index.ts b/packages/nodes-base/nodes/TheHiveProject/transport/index.ts
new file mode 100644
index 0000000000000..7b846a2251d31
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/transport/index.ts
@@ -0,0 +1,2 @@
+export * from './queryHelper';
+export * from './requestApi';
diff --git a/packages/nodes-base/nodes/TheHiveProject/transport/queryHelper.ts b/packages/nodes-base/nodes/TheHiveProject/transport/queryHelper.ts
new file mode 100644
index 0000000000000..69cd05f3e830a
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/transport/queryHelper.ts
@@ -0,0 +1,101 @@
+import type { IExecuteFunctions, IDataObject } from 'n8n-workflow';
+
+import type { QueryScope } from '../helpers/interfaces';
+import { constructFilter } from '../helpers/utils';
+import { theHiveApiRequest } from './requestApi';
+
+export async function theHiveApiQuery(
+	this: IExecuteFunctions,
+	scope: QueryScope,
+	filters?: IDataObject[],
+	sortFields?: IDataObject[],
+	limit?: number,
+	returnCount = false,
+	extraData?: string[],
+) {
+	const query: IDataObject[] = [];
+
+	if (scope.id) {
+		query.push({
+			_name: scope.query,
+			idOrName: scope.id,
+		});
+	} else {
+		query.push({
+			_name: scope.query,
+		});
+	}
+
+	if (scope.restrictTo) {
+		query.push({
+			_name: scope.restrictTo,
+		});
+	}
+
+	if (filters && Array.isArray(filters) && filters.length) {
+		const filter = {
+			_name: 'filter',
+			_and: filters.filter((f) => f.field).map(constructFilter),
+		};
+
+		query.push(filter);
+	}
+
+	if (sortFields?.length && !returnCount) {
+		const sort = {
+			_name: 'sort',
+			_fields: sortFields.map((field) => {
+				return {
+					[`${field.field as string}`]: field.direction as string,
+				};
+			}),
+		};
+
+		query.push(sort);
+	}
+
+	let responseData: IDataObject[] = [];
+
+	if (returnCount) {
+		query.push({
+			_name: 'count',
+		});
+
+		const count = await theHiveApiRequest.call(this, 'POST', '/v1/query', { query });
+
+		responseData.push({ count });
+	} else if (limit) {
+		const pagination: IDataObject = {
+			_name: 'page',
+			from: 0,
+			to: limit,
+			extraData,
+		};
+
+		query.push(pagination);
+		responseData = await theHiveApiRequest.call(this, 'POST', '/v1/query', { query });
+	} else {
+		let to = 500;
+		let from = 0;
+		let response: IDataObject[] = [];
+
+		do {
+			const pagination: IDataObject = {
+				_name: 'page',
+				from,
+				to,
+				extraData,
+			};
+
+			response = await theHiveApiRequest.call(this, 'POST', '/v1/query', {
+				query: [...query, pagination],
+			});
+
+			responseData = responseData.concat(response || []);
+			from = to;
+			to += 500;
+		} while (response?.length);
+	}
+
+	return responseData;
+}
diff --git a/packages/nodes-base/nodes/TheHiveProject/transport/requestApi.ts b/packages/nodes-base/nodes/TheHiveProject/transport/requestApi.ts
new file mode 100644
index 0000000000000..2080c1bdc9898
--- /dev/null
+++ b/packages/nodes-base/nodes/TheHiveProject/transport/requestApi.ts
@@ -0,0 +1,42 @@
+import type {
+	IExecuteFunctions,
+	IHookFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	IHttpRequestOptions,
+	IHttpRequestMethods,
+} from 'n8n-workflow';
+
+export async function theHiveApiRequest(
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
+	resource: string,
+	body: IDataObject | FormData = {},
+	query: IDataObject = {},
+	uri?: string,
+	option: IDataObject = {},
+) {
+	const credentials = await this.getCredentials('theHiveProjectApi');
+
+	let options: IHttpRequestOptions = {
+		method,
+		qs: query,
+		url: uri || `${credentials.url}/api${resource}`,
+		body,
+		skipSslCertificateValidation: credentials.allowUnauthorizedCerts as boolean,
+		json: true,
+	};
+
+	if (Object.keys(option).length !== 0) {
+		options = Object.assign({}, options, option);
+	}
+
+	if (Object.keys(body).length === 0) {
+		delete options.body;
+	}
+
+	if (Object.keys(query).length === 0) {
+		delete options.qs;
+	}
+	return await this.helpers.requestWithAuthentication.call(this, 'theHiveProjectApi', options);
+}
diff --git a/packages/nodes-base/nodes/TimescaleDb/TimescaleDb.node.ts b/packages/nodes-base/nodes/TimescaleDb/TimescaleDb.node.ts
index 5a43f7c500f53..e287be8edec91 100644
--- a/packages/nodes-base/nodes/TimescaleDb/TimescaleDb.node.ts
+++ b/packages/nodes-base/nodes/TimescaleDb/TimescaleDb.node.ts
@@ -6,9 +6,8 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import { pgInsert, pgQuery, pgUpdate } from '../Postgres/v1/genericFunctions';
-
 import pgPromise from 'pg-promise';
+import { pgInsert, pgQueryV2, pgUpdate } from '../Postgres/v1/genericFunctions';
 
 export class TimescaleDb implements INodeType {
 	description: INodeTypeDescription = {
@@ -23,6 +22,7 @@ export class TimescaleDb implements INodeType {
 		},
 		inputs: ['main'],
 		outputs: ['main'],
+		parameterPane: 'wide',
 		credentials: [
 			{
 				name: 'timescaleDb',
@@ -65,6 +65,11 @@ export class TimescaleDb implements INodeType {
 				displayName: 'Query',
 				name: 'query',
 				type: 'string',
+				noDataExpression: true,
+				typeOptions: {
+					editor: 'sqlEditor',
+					sqlDialect: 'PostgreSQL',
+				},
 				displayOptions: {
 					show: {
 						operation: ['executeQuery'],
@@ -275,13 +280,9 @@ export class TimescaleDb implements INodeType {
 			//         executeQuery
 			// ----------------------------------
 
-			const queryResult = await pgQuery(
-				this.getNodeParameter,
-				pgp,
-				db,
-				items,
-				this.continueOnFail(),
-			);
+			const queryResult = await pgQueryV2.call(this, pgp, db, items, this.continueOnFail(), {
+				resolveExpression: true,
+			});
 
 			returnItems = this.helpers.returnJsonArray(queryResult);
 		} else if (operation === 'insert') {
@@ -318,16 +319,16 @@ export class TimescaleDb implements INodeType {
 
 			returnItems = this.helpers.returnJsonArray(updateItems);
 		} else {
-			pgp.end();
+			await db.$pool.end();
 			throw new NodeOperationError(
 				this.getNode(),
 				`The operation "${operation}" is not supported!`,
 			);
 		}
 
-		// Close the connection
-		pgp.end();
+		// shuts down the connection pool associated with the db object to allow the process to finish
+		await db.$pool.end();
 
-		return this.prepareOutputData(returnItems);
+		return [returnItems];
 	}
 }
diff --git a/packages/nodes-base/nodes/TimescaleDb/timescale.svg b/packages/nodes-base/nodes/TimescaleDb/timescale.svg
index 8144d21550e9f..e0f4d6e2e60f8 100644
--- a/packages/nodes-base/nodes/TimescaleDb/timescale.svg
+++ b/packages/nodes-base/nodes/TimescaleDb/timescale.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="80" height="80" viewBox="4 4 32 32"><defs><path d="M20.42 0C9.14 0 0 8.95 0 20s9.14 20 20.42 20c11.28 0 20.42-8.95 20.42-20S31.7 0 20.42 0z" id="a"/><path d="M20.42 0C9.14 0 0 8.95 0 20s9.14 20 20.42 20c11.28 0 20.42-8.95 20.42-20S31.7 0 20.42 0z" id="b"/><path d="M20.42 6.56c-7.56 0-13.69 6.01-13.69 13.41 0 7.41 6.13 13.41 13.69 13.41s13.69-6 13.69-13.41c0-7.4-6.13-13.41-13.69-13.41z" id="c"/><path d="M20.42 6.56c-7.56 0-13.69 6.01-13.69 13.41 0 7.41 6.13 13.41 13.69 13.41s13.69-6 13.69-13.41c0-7.4-6.13-13.41-13.69-13.41z" id="d"/><path d="M23.82 16.38c-.82 1.96-.22 4.06 1.34 4.69 1.56.63 3.5-.45 4.32-2.42.82-1.96.22-4.06-1.34-4.68-1.56-.63-3.49.45-4.32 2.41z" id="e"/><path d="M23.82 16.38c-.82 1.96-.22 4.06 1.34 4.69 1.56.63 3.5-.45 4.32-2.42.82-1.96.22-4.06-1.34-4.68-1.56-.63-3.49.45-4.32 2.41z" id="f"/><path d="M20.45 28.27c-2.16 0-3.92 1.87-3.92 4.16 0 2.3 1.76 4.17 3.92 4.17 2.17 0 3.93-1.87 3.93-4.17 0-2.29-1.76-4.16-3.93-4.16z" id="g"/><path d="M20.45 28.27c-2.16 0-3.92 1.87-3.92 4.16 0 2.3 1.76 4.17 3.92 4.17 2.17 0 3.93-1.87 3.93-4.17 0-2.29-1.76-4.16-3.93-4.16z" id="h"/><path d="M12.83 13.96c-1.56.63-2.16 2.73-1.33 4.69.82 1.96 2.75 3.04 4.31 2.42 1.56-.63 2.16-2.73 1.34-4.69-.82-1.96-2.75-3.05-4.32-2.42z" id="i"/><path d="M12.83 13.96c-1.56.63-2.16 2.73-1.33 4.69.82 1.96 2.75 3.04 4.31 2.42 1.56-.63 2.16-2.73 1.34-4.69-.82-1.96-2.75-3.05-4.32-2.42z" id="j"/><path d="M37.49 24.22c-1.32 5.27-5.12 9.58-10.11 11.7.05-.42.08-.89.08-1.43-.01-.54-.03-1.08-.08-1.62 4.23-2.22 7.24-6.41 7.74-11.31.24.26 2.13 2.4 2.37 2.66zm-12.15 9.54c-.32 1.27-.83 2.37-1.47 3.24-1.12.22-2.28.34-3.47.34-1.11 0-2.2-.1-3.26-.3-.65-.86-1.16-1.96-1.49-3.21 1.49.49 3.08.76 4.75.76 1.73 0 3.39-.29 4.94-.83zM3.35 24.42c1.38 5.21 5.18 9.46 10.15 11.54-.05-.43-.08-.92-.08-1.47 0-.53.03-1.06.08-1.58-4.31-2.22-7.35-6.46-7.83-11.43-.24.29-2.09 2.65-2.32 2.94zM29.76 5.49c-.28.16-2.55 1.44-2.83 1.6 2.11 1.01 3.95 2.52 5.35 4.36.33-.47 1.51-2.12 1.68-2.35-1.2-1.41-2.61-2.63-4.2-3.61zM8.74 11.16c1.38-1.72 3.14-3.12 5.16-4.09-.18-.12-1.07-.68-2.67-1.7-2.1 1.5-3.56 2.74-4.38 3.71.19.21 1.7 1.88 1.89 2.08z" id="k"/><path d="M37.49 24.22c-1.32 5.27-5.12 9.58-10.11 11.7.05-.42.08-.89.08-1.43-.01-.54-.03-1.08-.08-1.62 4.23-2.22 7.24-6.41 7.74-11.31.24.26 2.13 2.4 2.37 2.66zm-12.15 9.54c-.32 1.27-.83 2.37-1.47 3.24-1.12.22-2.28.34-3.47.34-1.11 0-2.2-.1-3.26-.3-.65-.86-1.16-1.96-1.49-3.21 1.49.49 3.08.76 4.75.76 1.73 0 3.39-.29 4.94-.83zM3.35 24.42c1.38 5.21 5.18 9.46 10.15 11.54-.05-.43-.08-.92-.08-1.47 0-.53.03-1.06.08-1.58-4.31-2.22-7.35-6.46-7.83-11.43-.24.29-2.09 2.65-2.32 2.94zM29.76 5.49c-.28.16-2.55 1.44-2.83 1.6 2.11 1.01 3.95 2.52 5.35 4.36.33-.47 1.51-2.12 1.68-2.35-1.2-1.41-2.61-2.63-4.2-3.61zM8.74 11.16c1.38-1.72 3.14-3.12 5.16-4.09-.18-.12-1.07-.68-2.67-1.7-2.1 1.5-3.56 2.74-4.38 3.71.19.21 1.7 1.88 1.89 2.08z" id="l"/><path d="M18.34 9.52c-5.02.95-8.8 5.28-8.8 10.47 0 3.67 1.9 6.91 4.79 8.83.13-.37.26-.72.42-1.06-2.48-1.73-4.09-4.57-4.09-7.77 0-4.35 2.96-8.01 7.01-9.18.19-.5.41-.93.67-1.29z" id="m"/><path d="M18.34 9.52c-5.02.95-8.8 5.28-8.8 10.47 0 3.67 1.9 6.91 4.79 8.83.13-.37.26-.72.42-1.06-2.48-1.73-4.09-4.57-4.09-7.77 0-4.35 2.96-8.01 7.01-9.18.19-.5.41-.93.67-1.29z" id="n"/><path d="M17.19 13.19c.03-.33.06-.64.11-.95a8.469 8.469 0 00-4.72 4.55c.17.04.74.19.83.21a7.546 7.546 0 013.78-3.81z" id="o"/><path d="M17.19 13.19c.03-.33.06-.64.11-.95a8.469 8.469 0 00-4.72 4.55c.17.04.74.19.83.21a7.546 7.546 0 013.78-3.81z" id="p"/><path d="M15.33 26.62c.14-.24.29-.48.45-.7a7.46 7.46 0 01-2.9-4.75h-.85a8.294 8.294 0 003.3 5.45z" id="q"/><path d="M15.33 26.62c.14-.24.29-.48.45-.7a7.46 7.46 0 01-2.9-4.75h-.85a8.294 8.294 0 003.3 5.45z" id="r"/><path d="M22.73 11.98c.06.29.11.59.15.91 2.06.68 3.72 2.2 4.57 4.14l.82-.21a8.42 8.42 0 00-5.54-4.84z" id="s"/><path d="M22.73 11.98c.06.29.11.59.15.91 2.06.68 3.72 2.2 4.57 4.14l.82-.21a8.42 8.42 0 00-5.54-4.84z" id="t"/><path d="M25.11 18.5l-.44 1.31 1.34.88 2.46-.88.45-.87-.89-.9-2.92.46z" id="u"/><path d="M25.11 18.5l-.44 1.31 1.34.88 2.46-.88.45-.87-.89-.9-2.92.46z" id="v"/><path d="M15.85 18.5l.44 1.31-1.34.88-2.45-.88-.45-.87.88-.9 2.92.46z" id="w"/><path d="M15.85 18.5l.44 1.31-1.34.88-2.45-.88-.45-.87.88-.9 2.92.46z" id="x"/><path d="M27.97 21.17c-.05.25-.1.5-.17.75.25.2.48.39.7.58.14-.43.25-.87.32-1.33h-.85z" id="y"/><path d="M27.97 21.17c-.05.25-.1.5-.17.75.25.2.48.39.7.58.14-.43.25-.87.32-1.33h-.85z" id="z"/><path d="M25.57 26.58c.38-.29.73-.6 1.06-.94-.27-.11-.54-.23-.82-.36-.22.21-.45.41-.69.6.16.22.31.45.45.7z" id="A"/><path d="M25.57 26.58c.38-.29.73-.6 1.06-.94-.27-.11-.54-.23-.82-.36-.22.21-.45.41-.69.6.16.22.31.45.45.7z" id="B"/><path d="M30.07 25.28c.69-1.4 1.08-2.96 1.08-4.61 0-5.5-4.26-10.03-9.72-10.6.27.33.51.74.71 1.21 4.49.86 7.88 4.74 7.88 9.39 0 1.25-.25 2.43-.69 3.52.33.39.58.76.74 1.09z" id="C"/><path d="M30.07 25.28c.69-1.4 1.08-2.96 1.08-4.61 0-5.5-4.26-10.03-9.72-10.6.27.33.51.74.71 1.21 4.49.86 7.88 4.74 7.88 9.39 0 1.25-.25 2.43-.69 3.52.33.39.58.76.74 1.09z" id="D"/><path d="M26.59 28.77c1.02-.69 1.91-1.54 2.64-2.52-.37 0-.8-.06-1.28-.18-.52.62-1.12 1.17-1.78 1.65.15.33.29.69.42 1.05z" id="E"/><path d="M26.59 28.77c1.02-.69 1.91-1.54 2.64-2.52-.37 0-.8-.06-1.28-.18-.52.62-1.12 1.17-1.78 1.65.15.33.29.69.42 1.05z" id="F"/><path d="M20.42 9.31h-.85c-.47 5.66-.73 8.8-.78 9.43v.06c0 .15.01.3.04.45.02.16.06.32.14.48.16.41.43.72.74.87.07.05.14.11.22.16.01.01.03.02.05.02v.01c.63.34 3.8 2.04 9.5 5.11l.49-.67c-5.17-3.93-8.04-6.11-8.61-6.55-.01 0-.02 0-.02-.01-.06-.62-.37-3.74-.92-9.36z" id="G"/><path d="M20.42 9.31h-.85c-.47 5.66-.73 8.8-.78 9.43v.06c0 .15.01.3.04.45.02.16.06.32.14.48.16.41.43.72.74.87.07.05.14.11.22.16.01.01.03.02.05.02v.01c.63.34 3.8 2.04 9.5 5.11l.49-.67c-5.17-3.93-8.04-6.11-8.61-6.55-.01 0-.02 0-.02-.01-.06-.62-.37-3.74-.92-9.36z" id="H"/><path d="M24.54 29.01c-.06-.14-.34-.82-.84-2.04l-3.28 1.3-3.28-1.3c-.5 1.22-.77 1.9-.83 2.04 2.08.81 3.25 1.26 3.48 1.35a1.6 1.6 0 01-1.54 1.13h-.15c-.07.09-.64.87-.71.97a2.73 2.73 0 003.02-.91c.49.63 1.28 1.05 2.16 1.05.33 0 .65-.06.94-.17-.07-.1-.62-.86-.69-.95-.09.01-.17.01-.25.01-.74 0-1.37-.49-1.55-1.16.24-.09 1.41-.53 3.52-1.32z" id="I"/><path d="M24.54 29.01c-.06-.14-.34-.82-.84-2.04l-3.28 1.3-3.28-1.3c-.5 1.22-.77 1.9-.83 2.04 2.08.81 3.25 1.26 3.48 1.35a1.6 1.6 0 01-1.54 1.13h-.15c-.07.09-.64.87-.71.97a2.73 2.73 0 003.02-.91c.49.63 1.28 1.05 2.16 1.05.33 0 .65-.06.94-.17-.07-.1-.62-.86-.69-.95-.09.01-.17.01-.25.01-.74 0-1.37-.49-1.55-1.16.24-.09 1.41-.53 3.52-1.32z" id="J"/><path d="M32.43 19.97c0 4.15-2.2 7.8-5.51 9.89.14.55.26 1.13.35 1.72 4.09-2.32 6.83-6.65 6.83-11.61a13.14 13.14 0 00-2.74-8.06c-.23.25-1.03 1.14-1.14 1.27 1.39 1.92 2.21 4.26 2.21 6.79z" id="K"/><path d="M32.43 19.97c0 4.15-2.2 7.8-5.51 9.89.14.55.26 1.13.35 1.72 4.09-2.32 6.83-6.65 6.83-11.61a13.14 13.14 0 00-2.74-8.06c-.23.25-1.03 1.14-1.14 1.27 1.39 1.92 2.21 4.26 2.21 6.79z" id="L"/><path d="M9.48 11.92a13.119 13.119 0 00-2.75 8.05c0 4.99 2.78 9.34 6.91 11.65.1-.59.21-1.17.36-1.71-3.36-2.09-5.58-5.76-5.58-9.94 0-2.52.81-4.86 2.2-6.78a68.75 68.75 0 00-1.14-1.27z" id="M"/><path d="M9.48 11.92a13.119 13.119 0 00-2.75 8.05c0 4.99 2.78 9.34 6.91 11.65.1-.59.21-1.17.36-1.71-3.36-2.09-5.58-5.76-5.58-9.94 0-2.52.81-4.86 2.2-6.78a68.75 68.75 0 00-1.14-1.27z" id="N"/><path d="M15.39 9.29c1.53-.69 3.23-1.08 5.03-1.08 1.79 0 3.5.39 5.03 1.08.08-.14.75-1.29.84-1.44-1.78-.82-3.77-1.29-5.87-1.29s-4.1.47-5.87 1.3c.08.14.75 1.29.84 1.43z" id="O"/><path d="M15.39 9.29c1.53-.69 3.23-1.08 5.03-1.08 1.79 0 3.5.39 5.03 1.08.08-.14.75-1.29.84-1.44-1.78-.82-3.77-1.29-5.87-1.29s-4.1.47-5.87 1.3c.08.14.75 1.29.84 1.43z" id="P"/></defs><use xlink:href="#a" fill="#fff"/><use xlink:href="#a" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#b" fill-opacity="0"/><use xlink:href="#b" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#c" fill="#fdb515"/><use xlink:href="#c" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#d" fill-opacity="0"/><use xlink:href="#d" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#e" fill="#fff"/><use xlink:href="#e" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#f" fill-opacity="0"/><use xlink:href="#f" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#g" fill="#fff"/><use xlink:href="#g" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#h" fill-opacity="0"/><use xlink:href="#h" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#i" fill="#fff"/><use xlink:href="#i" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#j" fill-opacity="0"/><use xlink:href="#j" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#k" fill="#333"/><use xlink:href="#k" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#l" fill-opacity="0"/><use xlink:href="#l" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#m" fill="#333"/><use xlink:href="#m" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#n" fill-opacity="0"/><use xlink:href="#n" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#o" fill="#333"/><use xlink:href="#o" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#p" fill-opacity="0"/><use xlink:href="#p" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#q" fill="#333"/><use xlink:href="#q" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#r" fill-opacity="0"/><use xlink:href="#r" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#s" fill="#333"/><use xlink:href="#s" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#t" fill-opacity="0"/><use xlink:href="#t" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#u" fill="#333"/><use xlink:href="#u" fill-opacity="0" stroke="#000" stroke-opacity="0"/><g fill-opacity="0"><use xlink:href="#v"/><use xlink:href="#v" stroke="#000" stroke-opacity="0"/></g><use xlink:href="#w" fill="#333"/><use xlink:href="#w" fill-opacity="0" stroke="#000" stroke-opacity="0"/><g fill-opacity="0"><use xlink:href="#x"/><use xlink:href="#x" stroke="#000" stroke-opacity="0"/></g><use xlink:href="#y" fill="#333"/><use xlink:href="#y" fill-opacity="0" stroke="#000" stroke-opacity="0"/><g fill-opacity="0"><use xlink:href="#z"/><use xlink:href="#z" stroke="#000" stroke-opacity="0"/></g><use xlink:href="#A" fill="#333"/><use xlink:href="#A" fill-opacity="0" stroke="#000" stroke-opacity="0"/><g fill-opacity="0"><use xlink:href="#B"/><use xlink:href="#B" stroke="#000" stroke-opacity="0"/></g><use xlink:href="#C" fill="#333"/><use xlink:href="#C" fill-opacity="0" stroke="#000" stroke-opacity="0"/><g fill-opacity="0"><use xlink:href="#D"/><use xlink:href="#D" stroke="#000" stroke-opacity="0"/></g><use xlink:href="#E" fill="#333"/><use xlink:href="#E" fill-opacity="0" stroke="#000" stroke-opacity="0"/><g fill-opacity="0"><use xlink:href="#F"/><use xlink:href="#F" stroke="#000" stroke-opacity="0"/></g><use xlink:href="#G" fill="#333"/><use xlink:href="#G" fill-opacity="0" stroke="#000" stroke-opacity="0"/><g fill-opacity="0"><use xlink:href="#H"/><use xlink:href="#H" stroke="#000" stroke-opacity="0"/></g><use xlink:href="#I" fill="#333"/><use xlink:href="#I" fill-opacity="0" stroke="#000" stroke-opacity="0"/><g fill-opacity="0"><use xlink:href="#J"/><use xlink:href="#J" stroke="#000" stroke-opacity="0"/></g><use xlink:href="#K" fill="#333"/><use xlink:href="#K" fill-opacity="0" stroke="#000" stroke-opacity="0"/><g fill-opacity="0"><use xlink:href="#L"/><use xlink:href="#L" stroke="#000" stroke-opacity="0"/></g><use xlink:href="#M" fill="#333"/><use xlink:href="#M" fill-opacity="0" stroke="#000" stroke-opacity="0"/><g fill-opacity="0"><use xlink:href="#N"/><use xlink:href="#N" stroke="#000" stroke-opacity="0"/></g><use xlink:href="#O" fill="#333"/><use xlink:href="#O" fill-opacity="0" stroke="#000" stroke-opacity="0"/><g fill-opacity="0"><use xlink:href="#P"/><use xlink:href="#P" stroke="#000" stroke-opacity="0"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 1409 1408.1"><linearGradient id="a" x1="601.093" x2="487.473" y1="879.558" y2="877.868" gradientTransform="translate(0 -373.06)" gradientUnits="userSpaceOnUse"><stop offset="0" style="stop-color:#000;stop-opacity:0"/><stop offset="1" style="stop-color:#000"/></linearGradient><path d="m599.4 619-.1-116.1c0-6.9-2.7-13.5-7.6-18.4L491.2 383.7l-70.1 77.4L584.9 625c5.4 5.3 14.5 1.5 14.5-6" style="fill:url(#a)"/><linearGradient id="b" x1="396.304" x2="223.453" y1="1239.858" y2="1239.858" gradientTransform="translate(0 -373.06)" gradientUnits="userSpaceOnUse"><stop offset="0" style="stop-color:#000;stop-opacity:0"/><stop offset=".96" style="stop-color:#000"/></linearGradient><path d="M391.6 914 153.4 676.4l-90.9 57 322.2 321.2c5.3 5.3 14.5 1.6 14.5-6V932.5c0-6.9-2.7-13.6-7.6-18.5" style="fill:url(#b)"/><path d="M654.7 4.3C300.2 28.8 16.9 322.2 3.5 677.3c-13 346.7 225.4 640.1 547.3 712L121.7 960.1c-6.2-6.2-9.6-14.5-9.6-23.2l.3-138.7c0-5.8 7-8.7 11.1-4.6l70.6-76.7c-4.4-4.4-4.4-11.6 0-16l67.9-67.7c4.4-4.4 11.6-4.4 16 0l229.4 229.4c9.8 9.8 15.2 23 15.2 36.8v239.3c0 34.5 13.7 67.6 38.1 91.9l174.9 174.9c44.4-1.9 87.7-8 129.6-17.8L643.6 1166c-11-11-17.1-25.8-17.1-41.3V893.5c0-37.9-15.1-74.3-41.9-101.1L351.8 559.6c-4.4-4.4-4.4-11.6 0-16l67.4-67.2c4.4-4.4 11.6-4.4 16 0l70.1-77.4c-1.3-1.5-2.5-3.1-3.8-4.8-20-27-32.2-71.6-18-121.8 8.5-32.2 26.1-56.4 58.7-85.9 2.9-2.6 7.4-2.7 10.3-.2l84.3 73 16.6 14.4c6.4 5.5 14 9.5 22.2 11.4l262.8 62.5c3.1.7 5.9 2.3 8.1 4.5l269.9 269.3c4.7 4.5 7.4 10.8 7.4 17.3v57.2c0 8.8-2.2 17.5-6.5 25.2l-133.6 243.4c-5.8 10.7-18.8 15.1-30 10.3L992.1 948h-225c-14.5 0-26.2 11.7-26.2 26.2v100.3c0 13.8 5.5 27.1 15.2 36.9l233.1 234.8c245.4-109.3 416.6-355.4 416.6-641.6.2-404.3-341.2-728.7-751.1-700.3" style="fill:#000"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Todoist/GenericFunctions.ts b/packages/nodes-base/nodes/Todoist/GenericFunctions.ts
index 4278cc905af59..fb8cfc9bbad68 100644
--- a/packages/nodes-base/nodes/Todoist/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Todoist/GenericFunctions.ts
@@ -1,11 +1,11 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IExecuteFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	IDataObject,
 	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
@@ -19,7 +19,7 @@ export function FormatDueDatetime(isoString: string): string {
 
 export async function todoistApiRequest(
 	this: Context,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 	body: IDataObject = {},
 	qs: IDataObject = {},
@@ -28,7 +28,7 @@ export async function todoistApiRequest(
 
 	const endpoint = 'api.todoist.com/rest/v2';
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		method,
 		qs,
 		uri: `https://${endpoint}${resource}`,
@@ -54,7 +54,7 @@ export async function todoistSyncRequest(
 ): Promise<any> {
 	const authentication = this.getNodeParameter('authentication', 0, 'oAuth2');
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {},
 		method: 'POST',
 		qs,
diff --git a/packages/nodes-base/nodes/Todoist/todoist.svg b/packages/nodes-base/nodes/Todoist/todoist.svg
index 61dcc2ea7cadd..4c999448c620d 100644
--- a/packages/nodes-base/nodes/Todoist/todoist.svg
+++ b/packages/nodes-base/nodes/Todoist/todoist.svg
@@ -1 +1 @@
-<svg width="60" height="60" xmlns="http://www.w3.org/2000/svg"><g fill-rule="nonzero" fill="none"><path d="M52.5 0h-45C3.364.01.013 3.36 0 7.5v45C0 56.625 3.374 60 7.5 60h45c4.126 0 7.5-3.375 7.5-7.5v-45C60 3.375 56.626 0 52.5 0" fill="#E44332"/><path d="M12.121 29.582c1-.673 22.469-15.055 22.96-15.388.49-.329.518-1.341-.036-1.707-.55-.365-1.593-1.056-1.98-1.321a1.592 1.592 0 00-1.771.025A26390.6 26390.6 0 0112.062 24.06c-.737.486-1.642.494-2.373 0L0 17.507v5.57c2.356 1.601 8.222 5.576 9.642 6.512.848.555 1.66.543 2.481-.007" fill="#FFF"/><path d="M12.121 39.128c1-.673 22.469-15.055 22.96-15.389.49-.329.518-1.34-.036-1.707-.55-.364-1.593-1.055-1.98-1.32a1.592 1.592 0 00-1.771.024c-.275.185-18.62 12.467-19.232 12.87-.737.486-1.642.494-2.373 0L0 27.052v5.57c2.356 1.602 8.222 5.576 9.642 6.512.848.556 1.66.543 2.481-.006" fill="#FFF"/><path d="M12.121 48.674c1-.673 22.469-15.056 22.96-15.39.49-.328.518-1.34-.036-1.707-.55-.363-1.593-1.055-1.98-1.32a1.592 1.592 0 00-1.771.024c-.275.185-18.62 12.467-19.232 12.87-.737.486-1.642.495-2.373 0L0 36.598v5.571c2.356 1.601 8.222 5.576 9.642 6.512.848.555 1.66.543 2.481-.006" fill="#FFF"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="60" height="60"><g fill="none"><path fill="#E44332" d="M52.5 0h-45A7.52 7.52 0 0 0 0 7.5v45C0 56.625 3.374 60 7.5 60h45c4.126 0 7.5-3.375 7.5-7.5v-45C60 3.375 56.626 0 52.5 0"/><path fill="#FFF" d="M12.121 29.582c1-.673 22.469-15.055 22.96-15.388.49-.329.518-1.341-.036-1.707-.55-.365-1.593-1.056-1.98-1.321a1.59 1.59 0 0 0-1.771.025A26391 26391 0 0 1 12.062 24.06c-.737.486-1.642.494-2.373 0L0 17.507v5.57c2.356 1.601 8.222 5.576 9.642 6.512.848.555 1.66.543 2.481-.007"/><path fill="#FFF" d="M12.121 39.128c1-.673 22.469-15.055 22.96-15.389.49-.329.518-1.34-.036-1.707a234 234 0 0 1-1.98-1.32 1.59 1.59 0 0 0-1.771.024c-.275.185-18.62 12.467-19.232 12.87-.737.486-1.642.494-2.373 0L0 27.052v5.57c2.356 1.602 8.222 5.576 9.642 6.512.848.556 1.66.543 2.481-.006"/><path fill="#FFF" d="M12.121 48.674c1-.673 22.469-15.056 22.96-15.39.49-.328.518-1.34-.036-1.707-.55-.363-1.593-1.055-1.98-1.32a1.59 1.59 0 0 0-1.771.024c-.275.185-18.62 12.467-19.232 12.87-.737.486-1.642.495-2.373 0L0 36.598v5.571c2.356 1.601 8.222 5.576 9.642 6.512.848.555 1.66.543 2.481-.006"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Todoist/v1/OperationHandler.ts b/packages/nodes-base/nodes/Todoist/v1/OperationHandler.ts
index a45773a8809c7..b4cd4f2ec1b57 100644
--- a/packages/nodes-base/nodes/Todoist/v1/OperationHandler.ts
+++ b/packages/nodes-base/nodes/Todoist/v1/OperationHandler.ts
@@ -1,9 +1,9 @@
 import type { IDataObject } from 'n8n-workflow';
-import { jsonParse } from 'n8n-workflow';
+import { ApplicationError, jsonParse } from 'n8n-workflow';
+import { v4 as uuid } from 'uuid';
 import type { Context } from '../GenericFunctions';
 import { FormatDueDatetime, todoistApiRequest, todoistSyncRequest } from '../GenericFunctions';
 import type { Section, TodoistResponse } from './Service';
-import { v4 as uuid } from 'uuid';
 
 export interface OperationHandler {
 	handleOperation(ctx: Context, itemIndex: number): Promise<TodoistResponse>;
@@ -323,7 +323,10 @@ export class SyncHandler implements OperationHandler {
 			if (sectionId) {
 				command.args.section_id = sectionId;
 			} else {
-				throw new Error('Section ' + command.args.section + " doesn't exist on Todoist");
+				throw new ApplicationError(
+					'Section ' + command.args.section + " doesn't exist on Todoist",
+					{ level: 'warning' },
+				);
 			}
 		}
 	}
diff --git a/packages/nodes-base/nodes/Todoist/v1/Service.ts b/packages/nodes-base/nodes/Todoist/v1/Service.ts
index e40fe25be02e4..fa5112a5bffd0 100644
--- a/packages/nodes-base/nodes/Todoist/v1/Service.ts
+++ b/packages/nodes-base/nodes/Todoist/v1/Service.ts
@@ -1,3 +1,5 @@
+import type { IDataObject } from 'n8n-workflow';
+import type { Context } from '../GenericFunctions';
 import {
 	CloseHandler,
 	CreateHandler,
@@ -10,16 +12,13 @@ import {
 	UpdateHandler,
 } from './OperationHandler';
 
-import type { Context } from '../GenericFunctions';
-import type { IDataObject } from 'n8n-workflow';
-
 export class TodoistService implements Service {
 	async execute(
 		ctx: Context,
 		operation: OperationType,
 		itemIndex: number,
 	): Promise<TodoistResponse> {
-		return this.handlers[operation].handleOperation(ctx, itemIndex);
+		return await this.handlers[operation].handleOperation(ctx, itemIndex);
 	}
 
 	private handlers = {
diff --git a/packages/nodes-base/nodes/Todoist/v2/OperationHandler.ts b/packages/nodes-base/nodes/Todoist/v2/OperationHandler.ts
index fbe65589c8343..19e9c661ad94c 100644
--- a/packages/nodes-base/nodes/Todoist/v2/OperationHandler.ts
+++ b/packages/nodes-base/nodes/Todoist/v2/OperationHandler.ts
@@ -1,9 +1,9 @@
 import type { IDataObject } from 'n8n-workflow';
-import { jsonParse } from 'n8n-workflow';
+import { ApplicationError, jsonParse } from 'n8n-workflow';
+import { v4 as uuid } from 'uuid';
 import type { Context } from '../GenericFunctions';
 import { FormatDueDatetime, todoistApiRequest, todoistSyncRequest } from '../GenericFunctions';
 import type { Section, TodoistResponse } from './Service';
-import { v4 as uuid } from 'uuid';
 
 export interface OperationHandler {
 	handleOperation(ctx: Context, itemIndex: number): Promise<TodoistResponse>;
@@ -148,6 +148,9 @@ export class GetAllHandler implements OperationHandler {
 		if (filters.projectId) {
 			qs.project_id = filters.projectId as string;
 		}
+		if (filters.sectionId) {
+			qs.section_id = filters.sectionId as string;
+		}
 		if (filters.labelId) {
 			qs.label = filters.labelId as string;
 		}
@@ -314,7 +317,10 @@ export class SyncHandler implements OperationHandler {
 			if (sectionId) {
 				command.args.section_id = sectionId;
 			} else {
-				throw new Error('Section ' + command.args.section + " doesn't exist on Todoist");
+				throw new ApplicationError(
+					'Section ' + command.args.section + " doesn't exist on Todoist",
+					{ level: 'warning' },
+				);
 			}
 		}
 	}
diff --git a/packages/nodes-base/nodes/Todoist/v2/Service.ts b/packages/nodes-base/nodes/Todoist/v2/Service.ts
index e40fe25be02e4..fa5112a5bffd0 100644
--- a/packages/nodes-base/nodes/Todoist/v2/Service.ts
+++ b/packages/nodes-base/nodes/Todoist/v2/Service.ts
@@ -1,3 +1,5 @@
+import type { IDataObject } from 'n8n-workflow';
+import type { Context } from '../GenericFunctions';
 import {
 	CloseHandler,
 	CreateHandler,
@@ -10,16 +12,13 @@ import {
 	UpdateHandler,
 } from './OperationHandler';
 
-import type { Context } from '../GenericFunctions';
-import type { IDataObject } from 'n8n-workflow';
-
 export class TodoistService implements Service {
 	async execute(
 		ctx: Context,
 		operation: OperationType,
 		itemIndex: number,
 	): Promise<TodoistResponse> {
-		return this.handlers[operation].handleOperation(ctx, itemIndex);
+		return await this.handlers[operation].handleOperation(ctx, itemIndex);
 	}
 
 	private handlers = {
diff --git a/packages/nodes-base/nodes/Todoist/v2/TodoistV2.node.ts b/packages/nodes-base/nodes/Todoist/v2/TodoistV2.node.ts
index f3813ca59be54..2867542c893a6 100644
--- a/packages/nodes-base/nodes/Todoist/v2/TodoistV2.node.ts
+++ b/packages/nodes-base/nodes/Todoist/v2/TodoistV2.node.ts
@@ -742,6 +742,6 @@ export class TodoistV2 implements INodeType {
 				throw error;
 			}
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Toggl/GenericFunctions.ts b/packages/nodes-base/nodes/Toggl/GenericFunctions.ts
index 33557fc6b97fc..48b018a21577c 100644
--- a/packages/nodes-base/nodes/Toggl/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Toggl/GenericFunctions.ts
@@ -1,12 +1,11 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
 	IPollFunctions,
+	IRequestOptions,
 	ITriggerFunctions,
 	JsonObject,
 } from 'n8n-workflow';
@@ -18,9 +17,8 @@ export async function togglApiRequest(
 		| IPollFunctions
 		| IHookFunctions
 		| IExecuteFunctions
-		| IExecuteSingleFunctions
 		| ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 	body: IDataObject = {},
 	query?: IDataObject,
@@ -36,7 +34,7 @@ export async function togglApiRequest(
 		},
 	);
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: headerWithAuthentication,
 		method,
 		qs: query,
diff --git a/packages/nodes-base/nodes/Toggl/TogglTrigger.node.ts b/packages/nodes-base/nodes/Toggl/TogglTrigger.node.ts
index 3278ed27b6bdd..fcfcf87846f0d 100644
--- a/packages/nodes-base/nodes/Toggl/TogglTrigger.node.ts
+++ b/packages/nodes-base/nodes/Toggl/TogglTrigger.node.ts
@@ -8,7 +8,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
-import moment from 'moment';
+import moment from 'moment-timezone';
 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 ad52fd33abdb8..e61a1ec3dc496 100644
--- a/packages/nodes-base/nodes/Totp/Totp.node.ts
+++ b/packages/nodes-base/nodes/Totp/Totp.node.ts
@@ -169,6 +169,6 @@ export class Totp implements INodeType {
 			}
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
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 200aa41d35776..f454daeba325d 100644
--- a/packages/nodes-base/nodes/Totp/test/Totp.node.test.ts
+++ b/packages/nodes-base/nodes/Totp/test/Totp.node.test.ts
@@ -1,6 +1,6 @@
-import * as Helpers from '../../../test/nodes/Helpers';
-import { executeWorkflow } from '../../../test/nodes/ExecuteWorkflow';
-import type { WorkflowTestData } from '../../../test/nodes/types';
+import * as Helpers from '@test/nodes/Helpers';
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+import type { WorkflowTestData } from '@test/nodes/types';
 
 jest.mock('otpauth', () => {
 	return {
diff --git a/packages/nodes-base/nodes/Transform/Aggregate/Aggregate.node.json b/packages/nodes-base/nodes/Transform/Aggregate/Aggregate.node.json
new file mode 100644
index 0000000000000..53a9760c16858
--- /dev/null
+++ b/packages/nodes-base/nodes/Transform/Aggregate/Aggregate.node.json
@@ -0,0 +1,19 @@
+{
+	"node": "n8n-nodes-base.aggregate",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"details": "",
+	"categories": ["Core Nodes"],
+	"resources": {
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.aggregate/"
+			}
+		],
+		"generic": []
+	},
+	"alias": ["Aggregate", "Combine", "Flatten", "Transform", "Array", "List", "Item"],
+	"subcategories": {
+		"Core Nodes": ["Data Transformation"]
+	}
+}
diff --git a/packages/nodes-base/nodes/Transform/Aggregate/Aggregate.node.ts b/packages/nodes-base/nodes/Transform/Aggregate/Aggregate.node.ts
new file mode 100644
index 0000000000000..fd918290a4b20
--- /dev/null
+++ b/packages/nodes-base/nodes/Transform/Aggregate/Aggregate.node.ts
@@ -0,0 +1,414 @@
+import get from 'lodash/get';
+import isEmpty from 'lodash/isEmpty';
+import set from 'lodash/set';
+import {
+	NodeOperationError,
+	type IDataObject,
+	type IExecuteFunctions,
+	type INodeExecutionData,
+	type INodeType,
+	type INodeTypeDescription,
+	type IPairedItemData,
+} from 'n8n-workflow';
+import { prepareFieldsArray } from '../utils/utils';
+import { addBinariesToItem } from './utils';
+
+export class Aggregate implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Aggregate',
+		name: 'aggregate',
+		icon: 'file:aggregate.svg',
+		group: ['transform'],
+		subtitle: '',
+		version: 1,
+		description: 'Combine a field from many items into a list in a single item',
+		defaults: {
+			name: 'Aggregate',
+		},
+		inputs: ['main'],
+		outputs: ['main'],
+		properties: [
+			{
+				displayName: 'Aggregate',
+				name: 'aggregate',
+				type: 'options',
+				default: 'aggregateIndividualFields',
+				options: [
+					{
+						name: 'Individual Fields',
+						value: 'aggregateIndividualFields',
+					},
+					{
+						name: 'All Item Data (Into a Single List)',
+						value: 'aggregateAllItemData',
+					},
+				],
+			},
+			{
+				displayName: 'Fields To Aggregate',
+				name: 'fieldsToAggregate',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: true,
+				},
+				placeholder: 'Add Field To Aggregate',
+				default: { fieldToAggregate: [{ fieldToAggregate: '', renameField: false }] },
+				displayOptions: {
+					show: {
+						aggregate: ['aggregateIndividualFields'],
+					},
+				},
+				options: [
+					{
+						displayName: '',
+						name: 'fieldToAggregate',
+						values: [
+							{
+								displayName: 'Input Field Name',
+								name: 'fieldToAggregate',
+								type: 'string',
+								default: '',
+								description: 'The name of a field in the input items to aggregate together',
+								// eslint-disable-next-line n8n-nodes-base/node-param-placeholder-miscased-id
+								placeholder: 'e.g. id',
+								hint: ' Enter the field name as text',
+								requiresDataPath: 'single',
+							},
+							{
+								displayName: 'Rename Field',
+								name: 'renameField',
+								type: 'boolean',
+								default: false,
+								description: 'Whether to give the field a different name in the output',
+							},
+							{
+								displayName: 'Output Field Name',
+								name: 'outputFieldName',
+								displayOptions: {
+									show: {
+										renameField: [true],
+									},
+								},
+								type: 'string',
+								default: '',
+								description:
+									'The name of the field to put the aggregated data in. Leave blank to use the input field name.',
+								requiresDataPath: 'single',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Put Output in Field',
+				name: 'destinationFieldName',
+				type: 'string',
+				displayOptions: {
+					show: {
+						aggregate: ['aggregateAllItemData'],
+					},
+				},
+				default: 'data',
+				description: 'The name of the output field to put the data in',
+			},
+			{
+				displayName: 'Include',
+				name: 'include',
+				type: 'options',
+				default: 'allFields',
+				options: [
+					{
+						name: 'All Fields',
+						value: 'allFields',
+					},
+					{
+						name: 'Specified Fields',
+						value: 'specifiedFields',
+					},
+					{
+						name: 'All Fields Except',
+						value: 'allFieldsExcept',
+					},
+				],
+				displayOptions: {
+					show: {
+						aggregate: ['aggregateAllItemData'],
+					},
+				},
+			},
+			{
+				displayName: 'Fields To Exclude',
+				name: 'fieldsToExclude',
+				type: 'string',
+				placeholder: 'e.g. email, name',
+				default: '',
+				requiresDataPath: 'multiple',
+				displayOptions: {
+					show: {
+						aggregate: ['aggregateAllItemData'],
+						include: ['allFieldsExcept'],
+					},
+				},
+			},
+			{
+				displayName: 'Fields To Include',
+				name: 'fieldsToInclude',
+				type: 'string',
+				placeholder: 'e.g. email, name',
+				default: '',
+				requiresDataPath: 'multiple',
+				displayOptions: {
+					show: {
+						aggregate: ['aggregateAllItemData'],
+						include: ['specifiedFields'],
+					},
+				},
+			},
+			{
+				displayName: 'Options',
+				name: 'options',
+				type: 'collection',
+				placeholder: 'Add Field',
+				default: {},
+				options: [
+					{
+						displayName: 'Disable Dot Notation',
+						name: 'disableDotNotation',
+						type: 'boolean',
+						default: false,
+						description:
+							'Whether to disallow referencing child fields using `parent.child` in the field name',
+						displayOptions: {
+							hide: {
+								'/aggregate': ['aggregateAllItemData'],
+							},
+						},
+					},
+					{
+						displayName: 'Merge Lists',
+						name: 'mergeLists',
+						type: 'boolean',
+						default: false,
+						description:
+							'Whether to merge the output into a single flat list (rather than a list of lists), if the field to aggregate is a list',
+						displayOptions: {
+							hide: {
+								'/aggregate': ['aggregateAllItemData'],
+							},
+						},
+					},
+					{
+						displayName: 'Include Binaries',
+						name: 'includeBinaries',
+						type: 'boolean',
+						default: false,
+						description: 'Whether to include the binary data in the new item',
+					},
+					{
+						displayName: 'Keep Only Unique Binaries',
+						name: 'keepOnlyUnique',
+						type: 'boolean',
+						default: false,
+						description:
+							'Whether to keep only unique binaries by comparing mime types, file types, file sizes and file extensions',
+						displayOptions: {
+							show: {
+								includeBinaries: [true],
+							},
+						},
+					},
+					{
+						displayName: 'Keep Missing And Null Values',
+						name: 'keepMissing',
+						type: 'boolean',
+						default: false,
+						description:
+							'Whether to add a null entry to the aggregated list when there is a missing or null value',
+						displayOptions: {
+							hide: {
+								'/aggregate': ['aggregateAllItemData'],
+							},
+						},
+					},
+				],
+			},
+		],
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		let returnData: INodeExecutionData = { json: {}, pairedItem: [] };
+		const items = this.getInputData();
+
+		const aggregate = this.getNodeParameter('aggregate', 0, '') as string;
+
+		if (aggregate === 'aggregateIndividualFields') {
+			const disableDotNotation = this.getNodeParameter(
+				'options.disableDotNotation',
+				0,
+				false,
+			) as boolean;
+			const mergeLists = this.getNodeParameter('options.mergeLists', 0, false) as boolean;
+			const fieldsToAggregate = this.getNodeParameter(
+				'fieldsToAggregate.fieldToAggregate',
+				0,
+				[],
+			) as [{ fieldToAggregate: string; renameField: boolean; outputFieldName: string }];
+			const keepMissing = this.getNodeParameter('options.keepMissing', 0, false) as boolean;
+
+			if (!fieldsToAggregate.length) {
+				throw new NodeOperationError(this.getNode(), 'No fields specified', {
+					description: 'Please add a field to aggregate',
+				});
+			}
+
+			const newItem: INodeExecutionData = {
+				json: {},
+				pairedItem: Array.from({ length: items.length }, (_, i) => i).map((index) => {
+					return {
+						item: index,
+					};
+				}),
+			};
+
+			const values: { [key: string]: any } = {};
+			const outputFields: string[] = [];
+
+			for (const { fieldToAggregate, outputFieldName, renameField } of fieldsToAggregate) {
+				const field = renameField ? outputFieldName : fieldToAggregate;
+
+				if (outputFields.includes(field)) {
+					throw new NodeOperationError(
+						this.getNode(),
+						`The '${field}' output field is used more than once`,
+						{ description: 'Please make sure each output field name is unique' },
+					);
+				} else {
+					outputFields.push(field);
+				}
+
+				const getFieldToAggregate = () =>
+					!disableDotNotation && fieldToAggregate.includes('.')
+						? fieldToAggregate.split('.').pop()
+						: fieldToAggregate;
+
+				const _outputFieldName = outputFieldName
+					? outputFieldName
+					: (getFieldToAggregate() as string);
+
+				if (fieldToAggregate !== '') {
+					values[_outputFieldName] = [];
+					for (let i = 0; i < items.length; i++) {
+						if (!disableDotNotation) {
+							let value = get(items[i].json, fieldToAggregate);
+
+							if (!keepMissing) {
+								if (Array.isArray(value)) {
+									value = value.filter((entry) => entry !== null);
+								} else if (value === null || value === undefined) {
+									continue;
+								}
+							}
+
+							if (Array.isArray(value) && mergeLists) {
+								values[_outputFieldName].push(...value);
+							} else {
+								values[_outputFieldName].push(value);
+							}
+						} else {
+							let value = items[i].json[fieldToAggregate];
+
+							if (!keepMissing) {
+								if (Array.isArray(value)) {
+									value = value.filter((entry) => entry !== null);
+								} else if (value === null || value === undefined) {
+									continue;
+								}
+							}
+
+							if (Array.isArray(value) && mergeLists) {
+								values[_outputFieldName].push(...value);
+							} else {
+								values[_outputFieldName].push(value);
+							}
+						}
+					}
+				}
+			}
+
+			for (const key of Object.keys(values)) {
+				if (!disableDotNotation) {
+					set(newItem.json, key, values[key]);
+				} else {
+					newItem.json[key] = values[key];
+				}
+			}
+
+			returnData = newItem;
+		} else {
+			let newItems: IDataObject[] = items.map((item) => item.json);
+			let pairedItem: IPairedItemData[] = [];
+			const destinationFieldName = this.getNodeParameter('destinationFieldName', 0) as string;
+
+			const fieldsToExclude = prepareFieldsArray(
+				this.getNodeParameter('fieldsToExclude', 0, '') as string,
+				'Fields To Exclude',
+			);
+
+			const fieldsToInclude = prepareFieldsArray(
+				this.getNodeParameter('fieldsToInclude', 0, '') as string,
+				'Fields To Include',
+			);
+
+			if (fieldsToExclude.length || fieldsToInclude.length) {
+				newItems = newItems.reduce((acc, item, index) => {
+					const newItem: IDataObject = {};
+					let outputFields = Object.keys(item);
+
+					if (fieldsToExclude.length) {
+						outputFields = outputFields.filter((key) => !fieldsToExclude.includes(key));
+					}
+					if (fieldsToInclude.length) {
+						outputFields = outputFields.filter((key) =>
+							fieldsToInclude.length ? fieldsToInclude.includes(key) : true,
+						);
+					}
+
+					outputFields.forEach((key) => {
+						newItem[key] = item[key];
+					});
+
+					if (isEmpty(newItem)) {
+						return acc;
+					}
+
+					pairedItem.push({ item: index });
+					return acc.concat([newItem]);
+				}, [] as IDataObject[]);
+			} else {
+				pairedItem = Array.from({ length: newItems.length }, (_, item) => ({
+					item,
+				}));
+			}
+
+			const output: INodeExecutionData = { json: { [destinationFieldName]: newItems }, pairedItem };
+
+			returnData = output;
+		}
+
+		const includeBinaries = this.getNodeParameter('options.includeBinaries', 0, false) as boolean;
+
+		if (includeBinaries) {
+			const pairedItems = (returnData.pairedItem || []) as IPairedItemData[];
+
+			const aggregatedItems = pairedItems.map((item) => {
+				return items[item.item];
+			});
+
+			const keepOnlyUnique = this.getNodeParameter('options.keepOnlyUnique', 0, false) as boolean;
+
+			addBinariesToItem(returnData, aggregatedItems, keepOnlyUnique);
+		}
+
+		return [[returnData]];
+	}
+}
diff --git a/packages/nodes-base/nodes/Transform/Aggregate/aggregate.svg b/packages/nodes-base/nodes/Transform/Aggregate/aggregate.svg
new file mode 100644
index 0000000000000..56381ac612f13
--- /dev/null
+++ b/packages/nodes-base/nodes/Transform/Aggregate/aggregate.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512" fill="none"><g fill="#FF6D5A" clip-path="url(#a)"><path fill-rule="evenodd" d="M32 148c0-6.627 5.373-12 12-12h146c6.627 0 12 5.373 12 12v24c0 6.627-5.373 12-12 12H44c-6.627 0-12-5.373-12-12zm0 96c0-6.627 5.373-12 12-12h146c6.627 0 12 5.373 12 12v24c0 6.627-5.373 12-12 12H44c-6.627 0-12-5.373-12-12zm0 96c0-6.627 5.373-12 12-12h146c6.627 0 12 5.373 12 12v24c0 6.627-5.373 12-12 12H44c-6.627 0-12-5.373-12-12z" clip-rule="evenodd"/><path d="M74 76c0 6.627 5.373 12 12 12h116.217c17.673 0 32 14.327 32 32v56c0 26.978 10.272 51.557 27.119 70.039 5.055 5.545 5.055 14.377 0 19.922-16.847 18.482-27.119 43.061-27.119 70.039v56c0 17.673-14.327 32-32 32H86c-6.627 0-12 5.373-12 12v24c0 6.627 5.373 12 12 12h116.217c44.183 0 80-35.817 80-80v-56c0-30.928 25.072-56 56-56a5.783 5.783 0 0 0 5.783-5.783v-36.434a5.783 5.783 0 0 0-5.783-5.783c-30.928 0-56-25.072-56-56v-56c0-44.183-35.817-80-80-80H86c-6.627 0-12 5.373-12 12z"/><path fill-rule="evenodd" d="M376 244c0-6.627 5.373-12 12-12h112c6.627 0 12 5.373 12 12v24c0 6.627-5.373 12-12 12H388c-6.627 0-12-5.373-12-12z" clip-rule="evenodd"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h512v512H0z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Transform/Aggregate/test/Aggregate.test.ts b/packages/nodes-base/nodes/Transform/Aggregate/test/Aggregate.test.ts
new file mode 100644
index 0000000000000..9682e72a11e63
--- /dev/null
+++ b/packages/nodes-base/nodes/Transform/Aggregate/test/Aggregate.test.ts
@@ -0,0 +1,5 @@
+import { testWorkflows, getWorkflowFilenames } from '@test/nodes/Helpers';
+
+const workflows = getWorkflowFilenames(__dirname);
+
+describe('Test Aggregate Node', () => testWorkflows(workflows));
diff --git a/packages/nodes-base/nodes/Transform/Aggregate/test/workflow.aggregate.json b/packages/nodes-base/nodes/Transform/Aggregate/test/workflow.aggregate.json
new file mode 100644
index 0000000000000..db8e778e9731a
--- /dev/null
+++ b/packages/nodes-base/nodes/Transform/Aggregate/test/workflow.aggregate.json
@@ -0,0 +1,207 @@
+{
+	"name": "itemLists test",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "6c90bf81-0c0e-4c5f-9f0c-297f06d9668a",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [-440, 260]
+		},
+		{
+			"parameters": {
+				"jsCode": "return [\n  {id: 1, char: 'a'},\n  {id: 2, char: 'b'},\n  {id: 3, char: 'c'},\n  {id: 4, char: 'd'},\n  {id: 5, char: 'e'},\n];"
+			},
+			"id": "2e0011d5-c6a0-4a40-ab8c-9d011cde40d5",
+			"name": "Code",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [-180, 260]
+		},
+		{
+			"parameters": {
+				"fieldsToAggregate": {
+					"fieldToAggregate": [
+						{
+							"fieldToAggregate": "id",
+							"renameField": true,
+							"outputFieldName": "data"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "d95ca3a3-fb43-4037-846e-b87103dec1a3",
+			"name": "fields aggregate and rename",
+			"type": "n8n-nodes-base.aggregate",
+			"typeVersion": 1,
+			"position": [80, 0]
+		},
+		{
+			"parameters": {
+				"aggregate": "aggregateAllItemData"
+			},
+			"id": "4c1bc7be-7611-418d-aad5-8642b1cc0781",
+			"name": "aggregate all fields into list",
+			"type": "n8n-nodes-base.aggregate",
+			"typeVersion": 1,
+			"position": [80, 320]
+		},
+		{
+			"parameters": {
+				"aggregate": "aggregateAllItemData",
+				"include": "specifiedFields",
+				"fieldsToInclude": ["id"]
+			},
+			"id": "951de23c-2018-437b-961e-8ae7d7fd1a82",
+			"name": "aggregate selected fields into list",
+			"type": "n8n-nodes-base.aggregate",
+			"typeVersion": 1,
+			"position": [80, 500]
+		},
+		{
+			"parameters": {
+				"aggregate": "aggregateAllItemData",
+				"destinationFieldName": "output",
+				"include": "allFieldsExcept",
+				"fieldsToExclude": ["char"]
+			},
+			"id": "b62c02ee-5edb-473d-a755-7fb8700641fa",
+			"name": "aggregate all fields except selected into list",
+			"type": "n8n-nodes-base.aggregate",
+			"typeVersion": 1,
+			"position": [80, 700]
+		}
+	],
+	"pinData": {
+		"fields aggregate and rename": [
+			{
+				"json": {
+					"data": [1, 2, 3, 4, 5]
+				}
+			}
+		],
+		"aggregate all fields into list": [
+			{
+				"json": {
+					"data": [
+						{
+							"id": 1,
+							"char": "a"
+						},
+						{
+							"id": 2,
+							"char": "b"
+						},
+						{
+							"id": 3,
+							"char": "c"
+						},
+						{
+							"id": 4,
+							"char": "d"
+						},
+						{
+							"id": 5,
+							"char": "e"
+						}
+					]
+				}
+			}
+		],
+		"aggregate selected fields into list": [
+			{
+				"json": {
+					"data": [
+						{
+							"id": 1
+						},
+						{
+							"id": 2
+						},
+						{
+							"id": 3
+						},
+						{
+							"id": 4
+						},
+						{
+							"id": 5
+						}
+					]
+				}
+			}
+		],
+		"aggregate all fields except selected into list": [
+			{
+				"json": {
+					"output": [
+						{
+							"id": 1
+						},
+						{
+							"id": 2
+						},
+						{
+							"id": 3
+						},
+						{
+							"id": 4
+						},
+						{
+							"id": 5
+						}
+					]
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Code",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code": {
+			"main": [
+				[
+					{
+						"node": "fields aggregate and rename",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "aggregate all fields into list",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "aggregate selected fields into list",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "aggregate all fields except selected into list",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {},
+	"versionId": "9bf7c52b-b118-4dad-bfef-7db41828393b",
+	"id": "105",
+	"meta": {
+		"instanceId": "36203ea1ce3cef713fa25999bd9874ae26b9e4c2c3a90a365f2882a154d031d0"
+	},
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Transform/Aggregate/utils.ts b/packages/nodes-base/nodes/Transform/Aggregate/utils.ts
new file mode 100644
index 0000000000000..5a4f1e10fd4be
--- /dev/null
+++ b/packages/nodes-base/nodes/Transform/Aggregate/utils.ts
@@ -0,0 +1,60 @@
+import type { IBinaryData, INodeExecutionData } from 'n8n-workflow';
+
+type PartialBinaryData = Omit<IBinaryData, 'data'>;
+const isBinaryUniqueSetup = () => {
+	const binaries: PartialBinaryData[] = [];
+	return (binary: IBinaryData) => {
+		for (const existingBinary of binaries) {
+			if (
+				existingBinary.mimeType === binary.mimeType &&
+				existingBinary.fileType === binary.fileType &&
+				existingBinary.fileSize === binary.fileSize &&
+				existingBinary.fileExtension === binary.fileExtension
+			) {
+				return false;
+			}
+		}
+
+		binaries.push({
+			mimeType: binary.mimeType,
+			fileType: binary.fileType,
+			fileSize: binary.fileSize,
+			fileExtension: binary.fileExtension,
+		});
+
+		return true;
+	};
+};
+
+export function addBinariesToItem(
+	newItem: INodeExecutionData,
+	items: INodeExecutionData[],
+	uniqueOnly?: boolean,
+) {
+	const isBinaryUnique = uniqueOnly ? isBinaryUniqueSetup() : undefined;
+
+	for (const item of items) {
+		if (item.binary === undefined) continue;
+
+		for (const key of Object.keys(item.binary)) {
+			if (!newItem.binary) newItem.binary = {};
+			let binaryKey = key;
+			const binary = item.binary[key];
+
+			if (isBinaryUnique && !isBinaryUnique(binary)) {
+				continue;
+			}
+
+			// If the binary key already exists add a suffix to it
+			let i = 1;
+			while (newItem.binary[binaryKey] !== undefined) {
+				binaryKey = `${key}_${i}`;
+				i++;
+			}
+
+			newItem.binary[binaryKey] = binary;
+		}
+	}
+
+	return newItem;
+}
diff --git a/packages/nodes-base/nodes/Transform/Limit/Limit.node.json b/packages/nodes-base/nodes/Transform/Limit/Limit.node.json
new file mode 100644
index 0000000000000..1fa3619523a44
--- /dev/null
+++ b/packages/nodes-base/nodes/Transform/Limit/Limit.node.json
@@ -0,0 +1,19 @@
+{
+	"node": "n8n-nodes-base.limit",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"details": "",
+	"categories": ["Core Nodes"],
+	"resources": {
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.limit/"
+			}
+		],
+		"generic": []
+	},
+	"alias": ["Limit", "Remove", "Slice", "Transform", "Array", "List", "Item"],
+	"subcategories": {
+		"Core Nodes": ["Data Transformation"]
+	}
+}
diff --git a/packages/nodes-base/nodes/Transform/Limit/Limit.node.ts b/packages/nodes-base/nodes/Transform/Limit/Limit.node.ts
new file mode 100644
index 0000000000000..0415520801aad
--- /dev/null
+++ b/packages/nodes-base/nodes/Transform/Limit/Limit.node.ts
@@ -0,0 +1,70 @@
+import type {
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+
+export class Limit implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Limit',
+		name: 'limit',
+		icon: 'file:limit.svg',
+		group: ['transform'],
+		subtitle: '',
+		version: 1,
+		description: 'Restrict the number of items',
+		defaults: {
+			name: 'Limit',
+		},
+		inputs: ['main'],
+		outputs: ['main'],
+		properties: [
+			{
+				displayName: 'Max Items',
+				name: 'maxItems',
+				type: 'number',
+				typeOptions: {
+					minValue: 1,
+				},
+				default: 1,
+				description: 'If there are more items than this number, some are removed',
+			},
+			{
+				displayName: 'Keep',
+				name: 'keep',
+				type: 'options',
+				options: [
+					{
+						name: 'First Items',
+						value: 'firstItems',
+					},
+					{
+						name: 'Last Items',
+						value: 'lastItems',
+					},
+				],
+				default: 'firstItems',
+				description: 'When removing items, whether to keep the ones at the start or the ending',
+			},
+		],
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = this.getInputData();
+		let returnData = items;
+		const maxItems = this.getNodeParameter('maxItems', 0) as number;
+		const keep = this.getNodeParameter('keep', 0) as string;
+
+		if (maxItems > items.length) {
+			return [returnData];
+		}
+
+		if (keep === 'firstItems') {
+			returnData = items.slice(0, maxItems);
+		} else {
+			returnData = items.slice(items.length - maxItems, items.length);
+		}
+		return [returnData];
+	}
+}
diff --git a/packages/nodes-base/nodes/Transform/Limit/limit.svg b/packages/nodes-base/nodes/Transform/Limit/limit.svg
new file mode 100644
index 0000000000000..d736ec53b0a97
--- /dev/null
+++ b/packages/nodes-base/nodes/Transform/Limit/limit.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512" fill="none"><g fill="#2FB67C" fill-rule="evenodd" clip-path="url(#a)" clip-rule="evenodd"><path d="M512 458c0-6.627-5.373-12-12-12h-68c-6.627 0-12 5.373-12 12v24c0 6.627 5.373 12 12 12h68c6.627 0 12-5.373 12-12zm-140 0c0-6.627-5.373-12-12-12h-68c-6.627 0-12 5.373-12 12v24c0 6.627 5.373 12 12 12h68c6.627 0 12-5.373 12-12zm-140 0c0-6.627-5.373-12-12-12h-68c-6.627 0-12 5.373-12 12v24c0 6.627 5.373 12 12 12h68c6.627 0 12-5.373 12-12zm-140 0c0-6.627-5.373-12-12-12H12c-6.627 0-12 5.373-12 12v24c0 6.627 5.373 12 12 12h68c6.627 0 12-5.373 12-12zm152-222c-6.627 0-12-5.373-12-12V30c0-6.627 5.373-12 12-12h24c6.627 0 12 5.373 12 12v194c0 6.627-5.373 12-12 12z"/><path d="M149.577 146.982c9.398-9.346 24.594-9.304 33.941.095L256 219.964l72.482-72.887c9.347-9.399 24.543-9.441 33.941-.095s9.441 24.543.095 33.941l-89.5 90a24 24 0 0 1-34.036 0l-89.5-90c-9.346-9.398-9.304-24.594.095-33.941M0 350c0-6.627 5.373-12 12-12h488c6.627 0 12 5.373 12 12v24c0 6.627-5.373 12-12 12H12c-6.627 0-12-5.373-12-12z"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h512v512H0z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Transform/Limit/test/Limit.test.ts b/packages/nodes-base/nodes/Transform/Limit/test/Limit.test.ts
new file mode 100644
index 0000000000000..1b9feb88cb73f
--- /dev/null
+++ b/packages/nodes-base/nodes/Transform/Limit/test/Limit.test.ts
@@ -0,0 +1,5 @@
+import { testWorkflows, getWorkflowFilenames } from '@test/nodes/Helpers';
+
+const workflows = getWorkflowFilenames(__dirname);
+
+describe('Test Limit Node', () => testWorkflows(workflows));
diff --git a/packages/nodes-base/nodes/Transform/Limit/test/workflow.limit.json b/packages/nodes-base/nodes/Transform/Limit/test/workflow.limit.json
new file mode 100644
index 0000000000000..609538fceb3c0
--- /dev/null
+++ b/packages/nodes-base/nodes/Transform/Limit/test/workflow.limit.json
@@ -0,0 +1,97 @@
+{
+	"name": "itemLists test",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "bd7af0bb-de39-44b4-ac11-eb1d22f5e8d7",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [260, 180]
+		},
+		{
+			"parameters": {
+				"jsCode": "return [\n  {entry: 1},\n  {entry: 2},\n  {entry: 3},\n  {entry: 4},\n  {entry: 5},\n];"
+			},
+			"id": "21185d7a-f0c1-49a0-9c2d-f0f198ceea7e",
+			"name": "Code",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [520, 180]
+		},
+		{
+			"parameters": {
+				"maxItems": 1
+			},
+			"id": "7cc02cc4-1f5f-489a-81e2-4c96b3bdf221",
+			"name": "Item Lists limit first",
+			"type": "n8n-nodes-base.limit",
+			"typeVersion": 1,
+			"position": [740, 80]
+		},
+		{
+			"parameters": {
+				"keep": "lastItems",
+				"maxItems": 1
+			},
+			"id": "2bf79d53-7a0b-4716-aa09-55ad43d306ae",
+			"name": "Item Lists limit last",
+			"type": "n8n-nodes-base.limit",
+			"typeVersion": 1,
+			"position": [740, 300]
+		}
+	],
+	"pinData": {
+		"Item Lists limit first": [
+			{
+				"json": {
+					"entry": 1
+				}
+			}
+		],
+		"Item Lists limit last": [
+			{
+				"json": {
+					"entry": 5
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Code",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code": {
+			"main": [
+				[
+					{
+						"node": "Item Lists limit first",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Item Lists limit last",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {},
+	"versionId": "5036d554-1ba4-4b5f-ba9f-1de6df09e807",
+	"id": "105",
+	"meta": {
+		"instanceId": "36203ea1ce3cef713fa25999bd9874ae26b9e4c2c3a90a365f2882a154d031d0"
+	},
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Transform/RemoveDuplicates/RemoveDuplicates.node.json b/packages/nodes-base/nodes/Transform/RemoveDuplicates/RemoveDuplicates.node.json
new file mode 100644
index 0000000000000..5130b9f4067a0
--- /dev/null
+++ b/packages/nodes-base/nodes/Transform/RemoveDuplicates/RemoveDuplicates.node.json
@@ -0,0 +1,29 @@
+{
+	"node": "n8n-nodes-base.removeDuplicates",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"details": "",
+	"categories": ["Core Nodes"],
+	"resources": {
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.removeduplicates/"
+			}
+		],
+		"generic": []
+	},
+	"alias": [
+		"Dedupe",
+		"Deduplicate",
+		"Duplicates",
+		"Remove",
+		"Unique",
+		"Transform",
+		"Array",
+		"List",
+		"Item"
+	],
+	"subcategories": {
+		"Core Nodes": ["Data Transformation"]
+	}
+}
diff --git a/packages/nodes-base/nodes/Transform/RemoveDuplicates/RemoveDuplicates.node.ts b/packages/nodes-base/nodes/Transform/RemoveDuplicates/RemoveDuplicates.node.ts
new file mode 100644
index 0000000000000..2d914fdf34b18
--- /dev/null
+++ b/packages/nodes-base/nodes/Transform/RemoveDuplicates/RemoveDuplicates.node.ts
@@ -0,0 +1,262 @@
+import get from 'lodash/get';
+import isEqual from 'lodash/isEqual';
+import lt from 'lodash/lt';
+import pick from 'lodash/pick';
+import {
+	NodeOperationError,
+	type IExecuteFunctions,
+	type INodeExecutionData,
+	type INodeType,
+	type INodeTypeDescription,
+} from 'n8n-workflow';
+import { prepareFieldsArray } from '../utils/utils';
+import { compareItems, flattenKeys } from './utils';
+
+export class RemoveDuplicates implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Remove Duplicates',
+		name: 'removeDuplicates',
+		icon: 'file:removeDuplicates.svg',
+		group: ['transform'],
+		subtitle: '',
+		version: 1,
+		description: 'Delete items with matching field values',
+		defaults: {
+			name: 'Remove Duplicates',
+		},
+		inputs: ['main'],
+		outputs: ['main'],
+		properties: [
+			{
+				displayName: 'Compare',
+				name: 'compare',
+				type: 'options',
+				options: [
+					{
+						name: 'All Fields',
+						value: 'allFields',
+					},
+					{
+						name: 'All Fields Except',
+						value: 'allFieldsExcept',
+					},
+					{
+						name: 'Selected Fields',
+						value: 'selectedFields',
+					},
+				],
+				default: 'allFields',
+				description: 'The fields of the input items to compare to see if they are the same',
+			},
+			{
+				displayName: 'Fields To Exclude',
+				name: 'fieldsToExclude',
+				type: 'string',
+				placeholder: 'e.g. email, name',
+				requiresDataPath: 'multiple',
+				description: 'Fields in the input to exclude from the comparison',
+				default: '',
+				displayOptions: {
+					show: {
+						compare: ['allFieldsExcept'],
+					},
+				},
+			},
+			{
+				displayName: 'Fields To Compare',
+				name: 'fieldsToCompare',
+				type: 'string',
+				placeholder: 'e.g. email, name',
+				requiresDataPath: 'multiple',
+				description: 'Fields in the input to add to the comparison',
+				default: '',
+				displayOptions: {
+					show: {
+						compare: ['selectedFields'],
+					},
+				},
+			},
+			{
+				displayName: 'Options',
+				name: 'options',
+				type: 'collection',
+				placeholder: 'Add Field',
+				default: {},
+				displayOptions: {
+					show: {
+						compare: ['allFieldsExcept', 'selectedFields'],
+					},
+				},
+				options: [
+					{
+						displayName: 'Disable Dot Notation',
+						name: 'disableDotNotation',
+						type: 'boolean',
+						default: false,
+						description:
+							'Whether to disallow referencing child fields using `parent.child` in the field name',
+					},
+					{
+						displayName: 'Remove Other Fields',
+						name: 'removeOtherFields',
+						type: 'boolean',
+						default: false,
+						description:
+							'Whether to remove any fields that are not being compared. If disabled, will keep the values from the first of the duplicates.',
+					},
+				],
+			},
+		],
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = this.getInputData();
+		const compare = this.getNodeParameter('compare', 0) as string;
+		const disableDotNotation = this.getNodeParameter(
+			'options.disableDotNotation',
+			0,
+			false,
+		) as boolean;
+		const removeOtherFields = this.getNodeParameter(
+			'options.removeOtherFields',
+			0,
+			false,
+		) as boolean;
+
+		let keys = disableDotNotation
+			? Object.keys(items[0].json)
+			: Object.keys(flattenKeys(items[0].json));
+
+		for (const item of items) {
+			for (const key of disableDotNotation
+				? Object.keys(item.json)
+				: Object.keys(flattenKeys(item.json))) {
+				if (!keys.includes(key)) {
+					keys.push(key);
+				}
+			}
+		}
+
+		if (compare === 'allFieldsExcept') {
+			const fieldsToExclude = prepareFieldsArray(
+				this.getNodeParameter('fieldsToExclude', 0, '') as string,
+				'Fields To Exclude',
+			);
+
+			if (!fieldsToExclude.length) {
+				throw new NodeOperationError(
+					this.getNode(),
+					'No fields specified. Please add a field to exclude from comparison',
+				);
+			}
+			if (!disableDotNotation) {
+				keys = Object.keys(flattenKeys(items[0].json));
+			}
+			keys = keys.filter((key) => !fieldsToExclude.includes(key));
+		}
+		if (compare === 'selectedFields') {
+			const fieldsToCompare = prepareFieldsArray(
+				this.getNodeParameter('fieldsToCompare', 0, '') as string,
+				'Fields To Compare',
+			);
+			if (!fieldsToCompare.length) {
+				throw new NodeOperationError(
+					this.getNode(),
+					'No fields specified. Please add a field to compare on',
+				);
+			}
+			if (!disableDotNotation) {
+				keys = Object.keys(flattenKeys(items[0].json));
+			}
+			keys = fieldsToCompare.map((key) => key.trim());
+		}
+
+		// This solution is O(nlogn)
+		// add original index to the items
+		const newItems = items.map(
+			(item, index) =>
+				({
+					json: { ...item.json, __INDEX: index },
+					pairedItem: { item: index },
+				}) as INodeExecutionData,
+		);
+		//sort items using the compare keys
+		newItems.sort((a, b) => {
+			let result = 0;
+
+			for (const key of keys) {
+				let equal;
+				if (!disableDotNotation) {
+					equal = isEqual(get(a.json, key), get(b.json, key));
+				} else {
+					equal = isEqual(a.json[key], b.json[key]);
+				}
+				if (!equal) {
+					let lessThan;
+					if (!disableDotNotation) {
+						lessThan = lt(get(a.json, key), get(b.json, key));
+					} else {
+						lessThan = lt(a.json[key], b.json[key]);
+					}
+					result = lessThan ? -1 : 1;
+					break;
+				}
+			}
+			return result;
+		});
+
+		for (const key of keys) {
+			let type: any = undefined;
+			for (const item of newItems) {
+				if (key === '') {
+					throw new NodeOperationError(this.getNode(), 'Name of field to compare is blank');
+				}
+				const value = !disableDotNotation ? get(item.json, key) : item.json[key];
+				if (value === undefined && disableDotNotation && key.includes('.')) {
+					throw new NodeOperationError(
+						this.getNode(),
+						`'${key}' field is missing from some input items`,
+						{
+							description:
+								"If you're trying to use a nested field, make sure you turn off 'disable dot notation' in the node options",
+						},
+					);
+				} else if (value === undefined) {
+					throw new NodeOperationError(
+						this.getNode(),
+						`'${key}' field is missing from some input items`,
+					);
+				}
+				if (type !== undefined && value !== undefined && type !== typeof value) {
+					throw new NodeOperationError(this.getNode(), `'${key}' isn't always the same type`, {
+						description: 'The type of this field varies between items',
+					});
+				} else {
+					type = typeof value;
+				}
+			}
+		}
+
+		// collect the original indexes of items to be removed
+		const removedIndexes: number[] = [];
+		let temp = newItems[0];
+		for (let index = 1; index < newItems.length; index++) {
+			if (compareItems(newItems[index], temp, keys, disableDotNotation, this.getNode())) {
+				removedIndexes.push(newItems[index].json.__INDEX as unknown as number);
+			} else {
+				temp = newItems[index];
+			}
+		}
+
+		let returnData = items.filter((_, index) => !removedIndexes.includes(index));
+
+		if (removeOtherFields) {
+			returnData = returnData.map((item, index) => ({
+				json: pick(item.json, ...keys),
+				pairedItem: { item: index },
+			}));
+		}
+
+		return [returnData];
+	}
+}
diff --git a/packages/nodes-base/nodes/Transform/RemoveDuplicates/removeDuplicates.svg b/packages/nodes-base/nodes/Transform/RemoveDuplicates/removeDuplicates.svg
new file mode 100644
index 0000000000000..f2a0416c403df
--- /dev/null
+++ b/packages/nodes-base/nodes/Transform/RemoveDuplicates/removeDuplicates.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512" fill="none"><g fill="#54B8C9" clip-path="url(#a)"><path d="M134.097 111h38.829v32.508H138.16v34.635h-32.508v-38.699c0-15.709 12.735-28.444 28.445-28.444m77.658 32.508V111h77.657v32.508zm116.486 0V111h77.658v32.508zm116.487 0V111h38.829c15.71 0 28.445 12.735 28.445 28.444v38.699h-32.508v-34.635zm34.766 73.238h32.508v38.698c0 15.71-12.735 28.445-28.445 28.445h-38.829v-32.508h34.766zM0 244.537C0 229.329 12.735 217 28.444 217h349.461c15.709 0 28.444 12.329 28.444 27.537v129.815c0 15.208-12.735 27.537-28.444 27.537H28.445C12.734 401.889 0 389.56 0 374.352z"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h512v512H0z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Transform/RemoveDuplicates/test/RemoveDuplicates.test.ts b/packages/nodes-base/nodes/Transform/RemoveDuplicates/test/RemoveDuplicates.test.ts
new file mode 100644
index 0000000000000..73d697bfc7a06
--- /dev/null
+++ b/packages/nodes-base/nodes/Transform/RemoveDuplicates/test/RemoveDuplicates.test.ts
@@ -0,0 +1,5 @@
+import { testWorkflows, getWorkflowFilenames } from '@test/nodes/Helpers';
+
+const workflows = getWorkflowFilenames(__dirname);
+
+describe('Test Remove Duplicates Node', () => testWorkflows(workflows));
diff --git a/packages/nodes-base/nodes/Transform/RemoveDuplicates/test/workflow.removeDuplicates.json b/packages/nodes-base/nodes/Transform/RemoveDuplicates/test/workflow.removeDuplicates.json
new file mode 100644
index 0000000000000..0699c46f7d451
--- /dev/null
+++ b/packages/nodes-base/nodes/Transform/RemoveDuplicates/test/workflow.removeDuplicates.json
@@ -0,0 +1,326 @@
+{
+	"name": "Remove Duplicates",
+	"nodes": [
+	  {
+		"parameters": {},
+		"id": "a4da10da-991f-48ab-b873-9d633a11311f",
+		"name": "When clicking \"Execute Workflow\"",
+		"type": "n8n-nodes-base.manualTrigger",
+		"typeVersion": 1,
+		"position": [
+		  760,
+		  420
+		]
+	  },
+	  {
+		"parameters": {
+		  "jsCode": "return [{ id: 1, name: 'John Doe', age: 18 },{ id: 1, name: 'John Doe', age: 18 },\n  { id: 1, name: 'John Doe', age: 98 },\n  { id: 3, name: 'Bob Johnson', age:34 }]"
+		},
+		"id": "7ab7d5cd-0b1e-48bc-bdbd-57c91e201cf3",
+		"name": "Code",
+		"type": "n8n-nodes-base.code",
+		"typeVersion": 2,
+		"position": [
+		  980,
+		  420
+		]
+	  },
+	  {
+		"parameters": {},
+		"id": "c336939c-062e-475e-ba7c-8601e3662e8c",
+		"name": "Remove Duplicates (All Fields)",
+		"type": "n8n-nodes-base.removeDuplicates",
+		"typeVersion": 1,
+		"position": [
+		  1200,
+		  260
+		]
+	  },
+	  {
+		"parameters": {
+		  "compare": "selectedFields",
+		  "fieldsToCompare": "name",
+		  "options": {}
+		},
+		"id": "d4343ffe-8a9e-4e34-a0a1-aa463afedd80",
+		"name": "Remove Duplicates (Selected Fields)",
+		"type": "n8n-nodes-base.removeDuplicates",
+		"typeVersion": 1,
+		"position": [
+		  1200,
+		  420
+		]
+	  },
+	  {
+		"parameters": {
+		  "compare": "allFieldsExcept",
+		  "fieldsToExclude": "age",
+		  "options": {}
+		},
+		"id": "b67daea4-4545-429e-9e2a-58f2d6a7df7b",
+		"name": "Remove Duplicates (Except Fields)",
+		"type": "n8n-nodes-base.removeDuplicates",
+		"typeVersion": 1,
+		"position": [
+		  1200,
+		  580
+		]
+	  },
+	  {
+		"parameters": {},
+		"id": "813e690f-a83e-4a38-a64a-c3d72afcc9ba",
+		"name": "All Fields",
+		"type": "n8n-nodes-base.noOp",
+		"typeVersion": 1,
+		"position": [
+		  1380,
+		  260
+		]
+	  },
+	  {
+		"parameters": {},
+		"id": "b5c5c946-2e96-451b-b9a6-78e478504d6c",
+		"name": "Selected Fields",
+		"type": "n8n-nodes-base.noOp",
+		"typeVersion": 1,
+		"position": [
+		  1380,
+		  420
+		]
+	  },
+	  {
+		"parameters": {},
+		"id": "afb92bc5-beba-4b0a-aefb-b47cc708a125",
+		"name": "Except Fields",
+		"type": "n8n-nodes-base.noOp",
+		"typeVersion": 1,
+		"position": [
+		  1380,
+		  580
+		]
+	  },
+	  {
+		"parameters": {
+		  "compare": "allFieldsExcept",
+		  "fieldsToExclude": "age",
+		  "options": {
+			"removeOtherFields": true
+		  }
+		},
+		"id": "f92c5533-ac29-476c-aebb-4849ddd22110",
+		"name": "Remove Duplicates (Remove)",
+		"type": "n8n-nodes-base.removeDuplicates",
+		"typeVersion": 1,
+		"position": [
+		  1200,
+		  760
+		]
+	  },
+	  {
+		"parameters": {},
+		"id": "1e142ab7-b32e-4f67-b5cc-5c9fb63fba89",
+		"name": "Remove",
+		"type": "n8n-nodes-base.noOp",
+		"typeVersion": 1,
+		"position": [
+		  1380,
+		  760
+		]
+	  }
+	],
+	"pinData": {
+	  "Code": [
+		{
+		  "json": {
+			"id": 1,
+			"name": "John Doe",
+			"age": 18
+		  }
+		},
+		{
+		  "json": {
+			"id": 1,
+			"name": "John Doe",
+			"age": 18
+		  }
+		},
+		{
+		  "json": {
+			"id": 1,
+			"name": "John Doe",
+			"age": 98
+		  }
+		},
+		{
+		  "json": {
+			"id": 3,
+			"name": "Bob Johnson",
+			"age": 34
+		  }
+		}
+	  ],
+	  "All Fields": [
+		{
+		  "json": {
+			"id": 1,
+			"name": "John Doe",
+			"age": 18
+		  }
+		},
+		{
+		  "json": {
+			"id": 1,
+			"name": "John Doe",
+			"age": 98
+		  }
+		},
+		{
+		  "json": {
+			"id": 3,
+			"name": "Bob Johnson",
+			"age": 34
+		  }
+		}
+	  ],
+	  "Selected Fields": [
+		{
+		  "json": {
+			"id": 1,
+			"name": "John Doe",
+			"age": 18
+		  }
+		},
+		{
+		  "json": {
+			"id": 3,
+			"name": "Bob Johnson",
+			"age": 34
+		  }
+		}
+	  ],
+	  "Except Fields": [
+		{
+		  "json": {
+			"id": 1,
+			"name": "John Doe",
+			"age": 18
+		  }
+		},
+		{
+		  "json": {
+			"id": 3,
+			"name": "Bob Johnson",
+			"age": 34
+		  }
+		}
+	  ],
+	  "Remove": [
+		{
+		  "json": {
+			"id": 1,
+			"name": "John Doe"
+		  }
+		},
+		{
+		  "json": {
+			"id": 3,
+			"name": "Bob Johnson"
+		  }
+		}
+	  ]
+	},
+	"connections": {
+	  "When clicking \"Execute Workflow\"": {
+		"main": [
+		  [
+			{
+			  "node": "Code",
+			  "type": "main",
+			  "index": 0
+			}
+		  ]
+		]
+	  },
+	  "Code": {
+		"main": [
+		  [
+			{
+			  "node": "Remove Duplicates (All Fields)",
+			  "type": "main",
+			  "index": 0
+			},
+			{
+			  "node": "Remove Duplicates (Selected Fields)",
+			  "type": "main",
+			  "index": 0
+			},
+			{
+			  "node": "Remove Duplicates (Except Fields)",
+			  "type": "main",
+			  "index": 0
+			},
+			{
+			  "node": "Remove Duplicates (Remove)",
+			  "type": "main",
+			  "index": 0
+			}
+		  ]
+		]
+	  },
+	  "Remove Duplicates (All Fields)": {
+		"main": [
+		  [
+			{
+			  "node": "All Fields",
+			  "type": "main",
+			  "index": 0
+			}
+		  ]
+		]
+	  },
+	  "Remove Duplicates (Selected Fields)": {
+		"main": [
+		  [
+			{
+			  "node": "Selected Fields",
+			  "type": "main",
+			  "index": 0
+			}
+		  ]
+		]
+	  },
+	  "Remove Duplicates (Except Fields)": {
+		"main": [
+		  [
+			{
+			  "node": "Except Fields",
+			  "type": "main",
+			  "index": 0
+			}
+		  ]
+		]
+	  },
+	  "Remove Duplicates (Remove)": {
+		"main": [
+		  [
+			{
+			  "node": "Remove",
+			  "type": "main",
+			  "index": 0
+			}
+		  ]
+		]
+	  }
+	},
+	"active": false,
+	"settings": {
+	  "executionOrder": "v1"
+	},
+	"versionId": "5bb09766-4c67-4fb4-ae53-89d8db4727e3",
+	"id": "74gMYOHjjPArZg4q",
+	"meta": {
+	  "instanceId": "27cc9b56542ad45b38725555722c50a1c3fee1670bbb67980558314ee08517c4"
+	},
+	"tags": [
+	]
+  }
diff --git a/packages/nodes-base/nodes/Transform/RemoveDuplicates/utils.ts b/packages/nodes-base/nodes/Transform/RemoveDuplicates/utils.ts
new file mode 100644
index 0000000000000..ff5d794092dbd
--- /dev/null
+++ b/packages/nodes-base/nodes/Transform/RemoveDuplicates/utils.ts
@@ -0,0 +1,36 @@
+import get from 'lodash/get';
+import isEqual from 'lodash/isEqual';
+import isObject from 'lodash/isObject';
+import merge from 'lodash/merge';
+import reduce from 'lodash/reduce';
+import type { IDataObject, INode, INodeExecutionData } from 'n8n-workflow';
+
+export const compareItems = (
+	obj: INodeExecutionData,
+	obj2: INodeExecutionData,
+	keys: string[],
+	disableDotNotation: boolean,
+	_node: INode,
+) => {
+	let result = true;
+	for (const key of keys) {
+		if (!disableDotNotation) {
+			if (!isEqual(get(obj.json, key), get(obj2.json, key))) {
+				result = false;
+				break;
+			}
+		} else {
+			if (!isEqual(obj.json[key], obj2.json[key])) {
+				result = false;
+				break;
+			}
+		}
+	}
+	return result;
+};
+
+export const flattenKeys = (obj: IDataObject, path: string[] = []): IDataObject => {
+	return !isObject(obj)
+		? { [path.join('.')]: obj }
+		: reduce(obj, (cum, next, key) => merge(cum, flattenKeys(next as IDataObject, [...path, key])), {}); //prettier-ignore
+};
diff --git a/packages/nodes-base/nodes/Transform/Sort/Sort.node.json b/packages/nodes-base/nodes/Transform/Sort/Sort.node.json
new file mode 100644
index 0000000000000..387b009439fee
--- /dev/null
+++ b/packages/nodes-base/nodes/Transform/Sort/Sort.node.json
@@ -0,0 +1,19 @@
+{
+	"node": "n8n-nodes-base.sort",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"details": "",
+	"categories": ["Core Nodes"],
+	"resources": {
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.sort/"
+			}
+		],
+		"generic": []
+	},
+	"alias": ["Sort", "Order", "Transform", "Array", "List", "Item", "Random"],
+	"subcategories": {
+		"Core Nodes": ["Data Transformation"]
+	}
+}
diff --git a/packages/nodes-base/nodes/Transform/Sort/Sort.node.ts b/packages/nodes-base/nodes/Transform/Sort/Sort.node.ts
new file mode 100644
index 0000000000000..52ac687132ada
--- /dev/null
+++ b/packages/nodes-base/nodes/Transform/Sort/Sort.node.ts
@@ -0,0 +1,285 @@
+import get from 'lodash/get';
+import isEqual from 'lodash/isEqual';
+import lt from 'lodash/lt';
+import {
+	NodeOperationError,
+	type IDataObject,
+	type IExecuteFunctions,
+	type INodeExecutionData,
+	type INodeType,
+	type INodeTypeDescription,
+} from 'n8n-workflow';
+import { shuffleArray, sortByCode } from './utils';
+
+export class Sort implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Sort',
+		name: 'sort',
+		icon: 'file:sort.svg',
+		group: ['transform'],
+		subtitle: '',
+		version: 1,
+		description: 'Change items order',
+		defaults: {
+			name: 'Sort',
+		},
+		inputs: ['main'],
+		outputs: ['main'],
+		properties: [
+			{
+				displayName: 'Type',
+				name: 'type',
+				type: 'options',
+				options: [
+					{
+						name: 'Simple',
+						value: 'simple',
+					},
+					{
+						name: 'Random',
+						value: 'random',
+					},
+					{
+						name: 'Code',
+						value: 'code',
+					},
+				],
+				default: 'simple',
+				description: 'The fields of the input items to compare to see if they are the same',
+			},
+			{
+				displayName: 'Fields To Sort By',
+				name: 'sortFieldsUi',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: true,
+				},
+				placeholder: 'Add Field To Sort By',
+				options: [
+					{
+						displayName: '',
+						name: 'sortField',
+						values: [
+							{
+								displayName: 'Field Name',
+								name: 'fieldName',
+								type: 'string',
+								required: true,
+								default: '',
+								description: 'The field to sort by',
+								// eslint-disable-next-line n8n-nodes-base/node-param-placeholder-miscased-id
+								placeholder: 'e.g. id',
+								hint: ' Enter the field name as text',
+								requiresDataPath: 'single',
+							},
+							{
+								displayName: 'Order',
+								name: 'order',
+								type: 'options',
+								options: [
+									{
+										name: 'Ascending',
+										value: 'ascending',
+									},
+									{
+										name: 'Descending',
+										value: 'descending',
+									},
+								],
+								default: 'ascending',
+								description: 'The order to sort by',
+							},
+						],
+					},
+				],
+				default: {},
+				description: 'The fields of the input items to compare to see if they are the same',
+				displayOptions: {
+					show: {
+						type: ['simple'],
+					},
+				},
+			},
+			{
+				displayName: 'Code',
+				name: 'code',
+				type: 'string',
+				typeOptions: {
+					alwaysOpenEditWindow: true,
+					editor: 'jsEditor',
+					rows: 10,
+				},
+				default: `// The two items to compare are in the variables a and b
+	// Access the fields in a.json and b.json
+	// Return -1 if a should go before b
+	// Return 1 if b should go before a
+	// Return 0 if there's no difference
+
+	fieldName = 'myField';
+
+	if (a.json[fieldName] < b.json[fieldName]) {
+	return -1;
+	}
+	if (a.json[fieldName] > b.json[fieldName]) {
+	return 1;
+	}
+	return 0;`,
+				description: 'Javascript code to determine the order of any two items',
+				displayOptions: {
+					show: {
+						type: ['code'],
+					},
+				},
+			},
+			{
+				displayName: 'Options',
+				name: 'options',
+				type: 'collection',
+				placeholder: 'Add Field',
+				default: {},
+				displayOptions: {
+					show: {
+						type: ['simple'],
+					},
+				},
+				options: [
+					{
+						displayName: 'Disable Dot Notation',
+						name: 'disableDotNotation',
+						type: 'boolean',
+						default: false,
+						description:
+							'Whether to disallow referencing child fields using `parent.child` in the field name',
+					},
+				],
+			},
+		],
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = this.getInputData();
+		let returnData = [...items];
+		const type = this.getNodeParameter('type', 0) as string;
+		const disableDotNotation = this.getNodeParameter(
+			'options.disableDotNotation',
+			0,
+			false,
+		) as boolean;
+
+		if (type === 'random') {
+			shuffleArray(returnData);
+			return [returnData];
+		}
+
+		if (type === 'simple') {
+			const sortFieldsUi = this.getNodeParameter('sortFieldsUi', 0) as IDataObject;
+			const sortFields = sortFieldsUi.sortField as Array<{
+				fieldName: string;
+				order: 'ascending' | 'descending';
+			}>;
+
+			if (!sortFields?.length) {
+				throw new NodeOperationError(
+					this.getNode(),
+					'No sorting specified. Please add a field to sort by',
+				);
+			}
+
+			for (const { fieldName } of sortFields) {
+				let found = false;
+				for (const item of items) {
+					if (!disableDotNotation) {
+						if (get(item.json, fieldName) !== undefined) {
+							found = true;
+						}
+					} else if (item.json.hasOwnProperty(fieldName)) {
+						found = true;
+					}
+				}
+				if (!found && disableDotNotation && fieldName.includes('.')) {
+					throw new NodeOperationError(
+						this.getNode(),
+						`Couldn't find the field '${fieldName}' in the input data`,
+						{
+							description:
+								"If you're trying to use a nested field, make sure you turn off 'disable dot notation' in the node options",
+						},
+					);
+				} else if (!found) {
+					throw new NodeOperationError(
+						this.getNode(),
+						`Couldn't find the field '${fieldName}' in the input data`,
+					);
+				}
+			}
+
+			const sortFieldsWithDirection = sortFields.map((field) => ({
+				name: field.fieldName,
+				dir: field.order === 'ascending' ? 1 : -1,
+			}));
+
+			returnData.sort((a, b) => {
+				let result = 0;
+				for (const field of sortFieldsWithDirection) {
+					let equal;
+					if (!disableDotNotation) {
+						const _a =
+							typeof get(a.json, field.name) === 'string'
+								? (get(a.json, field.name) as string).toLowerCase()
+								: get(a.json, field.name);
+						const _b =
+							typeof get(b.json, field.name) === 'string'
+								? (get(b.json, field.name) as string).toLowerCase()
+								: get(b.json, field.name);
+						equal = isEqual(_a, _b);
+					} else {
+						const _a =
+							typeof a.json[field.name] === 'string'
+								? (a.json[field.name] as string).toLowerCase()
+								: a.json[field.name];
+						const _b =
+							typeof b.json[field.name] === 'string'
+								? (b.json[field.name] as string).toLowerCase()
+								: b.json[field.name];
+						equal = isEqual(_a, _b);
+					}
+
+					if (!equal) {
+						let lessThan;
+						if (!disableDotNotation) {
+							const _a =
+								typeof get(a.json, field.name) === 'string'
+									? (get(a.json, field.name) as string).toLowerCase()
+									: get(a.json, field.name);
+							const _b =
+								typeof get(b.json, field.name) === 'string'
+									? (get(b.json, field.name) as string).toLowerCase()
+									: get(b.json, field.name);
+							lessThan = lt(_a, _b);
+						} else {
+							const _a =
+								typeof a.json[field.name] === 'string'
+									? (a.json[field.name] as string).toLowerCase()
+									: a.json[field.name];
+							const _b =
+								typeof b.json[field.name] === 'string'
+									? (b.json[field.name] as string).toLowerCase()
+									: b.json[field.name];
+							lessThan = lt(_a, _b);
+						}
+						if (lessThan) {
+							result = -1 * field.dir;
+						} else {
+							result = 1 * field.dir;
+						}
+						break;
+					}
+				}
+				return result;
+			});
+		} else {
+			returnData = sortByCode.call(this, returnData);
+		}
+		return [returnData];
+	}
+}
diff --git a/packages/nodes-base/nodes/Transform/Sort/sort.svg b/packages/nodes-base/nodes/Transform/Sort/sort.svg
new file mode 100644
index 0000000000000..ebb6dd48981eb
--- /dev/null
+++ b/packages/nodes-base/nodes/Transform/Sort/sort.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512" fill="none"><path fill="#8287EB" fill-rule="evenodd" d="M130.5 422.5c-6.627 0-12-5.373-12-12v-351c0-6.627 5.373-12 12-12h24c6.627 0 12 5.373 12 12v351c0 6.627-5.373 12-12 12z" clip-rule="evenodd"/><path fill="#8287EB" fill-rule="evenodd" d="M36.077 333.482c9.398-9.346 24.594-9.304 33.94.095l72.483 72.887 72.482-72.887c9.347-9.399 24.543-9.441 33.941-.095s9.441 24.543.095 33.941l-89.5 90a24 24 0 0 1-34.036 0l-89.5-90c-9.346-9.398-9.304-24.594.095-33.941M381.5 89.5c6.627 0 12 5.373 12 12v351c0 6.627-5.373 12-12 12h-24c-6.627 0-12-5.373-12-12v-351c0-6.627 5.373-12 12-12z" clip-rule="evenodd"/><path fill="#8287EB" fill-rule="evenodd" d="M475.923 178.518c-9.398 9.346-24.594 9.304-33.941-.095L369.5 105.536l-72.482 72.887c-9.347 9.399-24.543 9.441-33.941.095s-9.441-24.543-.095-33.941l89.5-90a24 24 0 0 1 34.036 0l89.5 90c9.346 9.398 9.304 24.594-.095 33.941" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Transform/Sort/test/Sort.test.ts b/packages/nodes-base/nodes/Transform/Sort/test/Sort.test.ts
new file mode 100644
index 0000000000000..fdbe316072e9e
--- /dev/null
+++ b/packages/nodes-base/nodes/Transform/Sort/test/Sort.test.ts
@@ -0,0 +1,5 @@
+import { testWorkflows, getWorkflowFilenames } from '@test/nodes/Helpers';
+
+const workflows = getWorkflowFilenames(__dirname);
+
+describe('Test Sort Node', () => testWorkflows(workflows));
diff --git a/packages/nodes-base/nodes/Transform/Sort/test/workflow.sort.json b/packages/nodes-base/nodes/Transform/Sort/test/workflow.sort.json
new file mode 100644
index 0000000000000..b6f6dd53419db
--- /dev/null
+++ b/packages/nodes-base/nodes/Transform/Sort/test/workflow.sort.json
@@ -0,0 +1,213 @@
+{
+	"name": "sort test",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "6c90bf81-0c0e-4c5f-9f0c-297f06d9668a",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [-440, 300]
+		},
+		{
+			"parameters": {
+				"jsCode": "return [\n  {id: 3, char: 'c'},\n  {id: 4, char: 'd'},\n  {id: 5, char: 'e'},\n  {id: 1, char: 'a'},\n  {id: 2, char: 'b'},\n];"
+			},
+			"id": "2e0011d5-c6a0-4a40-ab8c-9d011cde40d5",
+			"name": "Code",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [-180, 300]
+		},
+		{
+			"parameters": {
+				"sortFieldsUi": {
+					"sortField": [
+						{
+							"fieldName": "char",
+							"order": "descending"
+						},
+						{
+							"fieldName": "id",
+							"order": "descending"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "20031848-2374-45b2-98db-69d7b8d055ad",
+			"name": "Item Lists1",
+			"type": "n8n-nodes-base.sort",
+			"typeVersion": 1,
+			"position": [80, 300]
+		},
+		{
+			"parameters": {
+				"sortFieldsUi": {
+					"sortField": [
+						{
+							"fieldName": "id"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "93dd8c32-21e1-4762-a340-b3e8c6866811",
+			"name": "Item Lists",
+			"type": "n8n-nodes-base.sort",
+			"typeVersion": 1,
+			"position": [80, 120]
+		},
+		{
+			"parameters": {
+				"type": "code",
+				"code": "// The two items to compare are in the variables a and b\n// Access the fields in a.json and b.json\n// Return -1 if a should go before b\n// Return 1 if b should go before a\n// Return 0 if there's no difference\n\nfieldName = 'id';\n\nif (a.json[fieldName] < b.json[fieldName]) {\n\t\treturn -1;\n}\nif (a.json[fieldName] > b.json[fieldName]) {\n\t\treturn 1;\n}\nreturn 0;"
+			},
+			"id": "112c72e6-b5d9-4d6d-87fc-2621fbaa5bf7",
+			"name": "Item Lists2",
+			"type": "n8n-nodes-base.sort",
+			"typeVersion": 1,
+			"position": [80, 500]
+		}
+	],
+	"pinData": {
+		"Item Lists": [
+			{
+				"json": {
+					"id": 1,
+					"char": "a"
+				}
+			},
+			{
+				"json": {
+					"id": 2,
+					"char": "b"
+				}
+			},
+			{
+				"json": {
+					"id": 3,
+					"char": "c"
+				}
+			},
+			{
+				"json": {
+					"id": 4,
+					"char": "d"
+				}
+			},
+			{
+				"json": {
+					"id": 5,
+					"char": "e"
+				}
+			}
+		],
+		"Item Lists1": [
+			{
+				"json": {
+					"id": 5,
+					"char": "e"
+				}
+			},
+			{
+				"json": {
+					"id": 4,
+					"char": "d"
+				}
+			},
+			{
+				"json": {
+					"id": 3,
+					"char": "c"
+				}
+			},
+			{
+				"json": {
+					"id": 2,
+					"char": "b"
+				}
+			},
+			{
+				"json": {
+					"id": 1,
+					"char": "a"
+				}
+			}
+		],
+		"Item Lists2": [
+			{
+				"json": {
+					"id": 1,
+					"char": "a"
+				}
+			},
+			{
+				"json": {
+					"id": 2,
+					"char": "b"
+				}
+			},
+			{
+				"json": {
+					"id": 3,
+					"char": "c"
+				}
+			},
+			{
+				"json": {
+					"id": 4,
+					"char": "d"
+				}
+			},
+			{
+				"json": {
+					"id": 5,
+					"char": "e"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Code",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code": {
+			"main": [
+				[
+					{
+						"node": "Item Lists1",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Item Lists",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Item Lists2",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {},
+	"versionId": "6f896427-a3be-44bc-898f-c1a6f58fa1e1",
+	"id": "105",
+	"meta": {
+		"instanceId": "36203ea1ce3cef713fa25999bd9874ae26b9e4c2c3a90a365f2882a154d031d0"
+	},
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Transform/Sort/utils.ts b/packages/nodes-base/nodes/Transform/Sort/utils.ts
new file mode 100644
index 0000000000000..3b156e206bb9d
--- /dev/null
+++ b/packages/nodes-base/nodes/Transform/Sort/utils.ts
@@ -0,0 +1,31 @@
+import { NodeVM } from '@n8n/vm2';
+import { type IExecuteFunctions, type INodeExecutionData, NodeOperationError } from 'n8n-workflow';
+
+export const shuffleArray = (array: any[]) => {
+	for (let i = array.length - 1; i > 0; i--) {
+		const j = Math.floor(Math.random() * (i + 1));
+		[array[i], array[j]] = [array[j], array[i]];
+	}
+};
+
+const returnRegExp = /\breturn\b/g;
+export function sortByCode(
+	this: IExecuteFunctions,
+	items: INodeExecutionData[],
+): INodeExecutionData[] {
+	const code = this.getNodeParameter('code', 0) as string;
+	if (!returnRegExp.test(code)) {
+		throw new NodeOperationError(
+			this.getNode(),
+			"Sort code doesn't return. Please add a 'return' statement to your code",
+		);
+	}
+
+	const mode = this.getMode();
+	const vm = new NodeVM({
+		console: mode === 'manual' ? 'redirect' : 'inherit',
+		sandbox: { items },
+	});
+
+	return vm.run(`module.exports = items.sort((a, b) => { ${code} })`);
+}
diff --git a/packages/nodes-base/nodes/Transform/SplitOut/SplitOut.node.json b/packages/nodes-base/nodes/Transform/SplitOut/SplitOut.node.json
new file mode 100644
index 0000000000000..8cc55b4864643
--- /dev/null
+++ b/packages/nodes-base/nodes/Transform/SplitOut/SplitOut.node.json
@@ -0,0 +1,19 @@
+{
+	"node": "n8n-nodes-base.splitOut",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"details": "",
+	"categories": ["Core Nodes"],
+	"resources": {
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.splitout/"
+			}
+		],
+		"generic": []
+	},
+	"alias": ["Split", "Nested", "Transform", "Array", "List", "Item"],
+	"subcategories": {
+		"Core Nodes": ["Data Transformation"]
+	}
+}
diff --git a/packages/nodes-base/nodes/Transform/SplitOut/SplitOut.node.ts b/packages/nodes-base/nodes/Transform/SplitOut/SplitOut.node.ts
new file mode 100644
index 0000000000000..5a48662cb903c
--- /dev/null
+++ b/packages/nodes-base/nodes/Transform/SplitOut/SplitOut.node.ts
@@ -0,0 +1,259 @@
+import get from 'lodash/get';
+import unset from 'lodash/unset';
+import {
+	type IBinaryData,
+	NodeOperationError,
+	deepCopy,
+	type IDataObject,
+	type IExecuteFunctions,
+	type INodeExecutionData,
+	type INodeType,
+	type INodeTypeDescription,
+} from 'n8n-workflow';
+import { prepareFieldsArray } from '../utils/utils';
+
+export class SplitOut implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Split Out',
+		name: 'splitOut',
+		icon: 'file:splitOut.svg',
+		group: ['transform'],
+		subtitle: '',
+		version: 1,
+		description: 'Turn a list inside item(s) into separate items',
+		defaults: {
+			name: 'Split Out',
+		},
+		inputs: ['main'],
+		outputs: ['main'],
+		properties: [
+			{
+				displayName: 'Fields To Split Out',
+				name: 'fieldToSplitOut',
+				type: 'string',
+				default: '',
+				required: true,
+				placeholder: 'Drag fields from the left or type their names',
+				description:
+					'The name of the input fields to break out into separate items. Separate multiple field names by commas. For binary data, use $binary.',
+				requiresDataPath: 'multiple',
+			},
+			{
+				displayName: 'Include',
+				name: 'include',
+				type: 'options',
+				options: [
+					{
+						name: 'No Other Fields',
+						value: 'noOtherFields',
+					},
+					{
+						name: 'All Other Fields',
+						value: 'allOtherFields',
+					},
+					{
+						name: 'Selected Other Fields',
+						value: 'selectedOtherFields',
+					},
+				],
+				default: 'noOtherFields',
+				description: 'Whether to copy any other fields into the new items',
+			},
+			{
+				displayName: 'Fields To Include',
+				name: 'fieldsToInclude',
+				type: 'string',
+				placeholder: 'e.g. email, name',
+				requiresDataPath: 'multiple',
+				description: 'Fields in the input items to aggregate together',
+				default: '',
+				displayOptions: {
+					show: {
+						include: ['selectedOtherFields'],
+					},
+				},
+			},
+			{
+				displayName: 'Options',
+				name: 'options',
+				type: 'collection',
+				placeholder: 'Add Field',
+				default: {},
+				options: [
+					{
+						displayName: 'Disable Dot Notation',
+						name: 'disableDotNotation',
+						type: 'boolean',
+						default: false,
+						description:
+							'Whether to disallow referencing child fields using `parent.child` in the field name',
+					},
+					{
+						displayName: 'Destination Field Name',
+						name: 'destinationFieldName',
+						type: 'string',
+						requiresDataPath: 'multiple',
+						default: '',
+						description: 'The field in the output under which to put the split field contents',
+					},
+					{
+						displayName: 'Include Binary',
+						name: 'includeBinary',
+						type: 'boolean',
+						default: false,
+						description: 'Whether to include the binary data in the new items',
+					},
+				],
+			},
+		],
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const returnData: INodeExecutionData[] = [];
+		const items = this.getInputData();
+
+		for (let i = 0; i < items.length; i++) {
+			const fieldsToSplitOut = (this.getNodeParameter('fieldToSplitOut', i) as string)
+				.split(',')
+				.map((field) => field.trim().replace(/^\$json\./, ''));
+
+			const options = this.getNodeParameter('options', i, {});
+
+			const disableDotNotation = options.disableDotNotation as boolean;
+
+			const destinationFields = ((options.destinationFieldName as string) || '')
+				.split(',')
+				.filter((field) => field.trim() !== '')
+				.map((field) => field.trim());
+
+			if (destinationFields.length && destinationFields.length !== fieldsToSplitOut.length) {
+				throw new NodeOperationError(
+					this.getNode(),
+					'If multiple fields to split out are given, the same number of destination fields must be given',
+				);
+			}
+
+			const include = this.getNodeParameter('include', i) as
+				| 'selectedOtherFields'
+				| 'allOtherFields'
+				| 'noOtherFields';
+
+			const multiSplit = fieldsToSplitOut.length > 1;
+
+			const item = { ...items[i].json };
+			const splited: INodeExecutionData[] = [];
+			for (const [entryIndex, fieldToSplitOut] of fieldsToSplitOut.entries()) {
+				const destinationFieldName = destinationFields[entryIndex] || '';
+
+				let entityToSplit: IDataObject[] = [];
+
+				if (fieldToSplitOut === '$binary') {
+					entityToSplit = Object.entries(items[i].binary || {}).map(([key, value]) => ({
+						[key]: value,
+					}));
+				} else {
+					if (!disableDotNotation) {
+						entityToSplit = get(item, fieldToSplitOut) as IDataObject[];
+					} else {
+						entityToSplit = item[fieldToSplitOut] as IDataObject[];
+					}
+
+					if (entityToSplit === undefined) {
+						entityToSplit = [];
+					}
+
+					if (typeof entityToSplit !== 'object' || entityToSplit === null) {
+						entityToSplit = [entityToSplit];
+					}
+
+					if (!Array.isArray(entityToSplit)) {
+						entityToSplit = Object.values(entityToSplit);
+					}
+				}
+
+				for (const [elementIndex, element] of entityToSplit.entries()) {
+					if (splited[elementIndex] === undefined) {
+						splited[elementIndex] = { json: {}, pairedItem: { item: i } };
+					}
+
+					const fieldName = destinationFieldName || fieldToSplitOut;
+
+					if (fieldToSplitOut === '$binary') {
+						if (splited[elementIndex].binary === undefined) {
+							splited[elementIndex].binary = {};
+						}
+						splited[elementIndex].binary![Object.keys(element)[0]] = Object.values(
+							element,
+						)[0] as IBinaryData;
+
+						continue;
+					}
+
+					if (typeof element === 'object' && element !== null && include === 'noOtherFields') {
+						if (destinationFieldName === '' && !multiSplit) {
+							splited[elementIndex] = {
+								json: { ...splited[elementIndex].json, ...element },
+								pairedItem: { item: i },
+							};
+						} else {
+							splited[elementIndex].json[fieldName] = element;
+						}
+					} else {
+						splited[elementIndex].json[fieldName] = element;
+					}
+				}
+			}
+
+			for (const splitEntry of splited) {
+				let newItem: INodeExecutionData = splitEntry;
+
+				if (include === 'allOtherFields') {
+					const itemCopy = deepCopy(item);
+					for (const fieldToSplitOut of fieldsToSplitOut) {
+						if (!disableDotNotation) {
+							unset(itemCopy, fieldToSplitOut);
+						} else {
+							delete itemCopy[fieldToSplitOut];
+						}
+					}
+					newItem.json = { ...itemCopy, ...splitEntry.json };
+				}
+
+				if (include === 'selectedOtherFields') {
+					const fieldsToInclude = prepareFieldsArray(
+						this.getNodeParameter('fieldsToInclude', i, '') as string,
+						'Fields To Include',
+					);
+
+					if (!fieldsToInclude.length) {
+						throw new NodeOperationError(this.getNode(), 'No fields specified', {
+							description: 'Please add a field to include',
+						});
+					}
+
+					for (const field of fieldsToInclude) {
+						if (!disableDotNotation) {
+							splitEntry.json[field] = get(item, field);
+						} else {
+							splitEntry.json[field] = item[field];
+						}
+					}
+
+					newItem = splitEntry;
+				}
+
+				const includeBinary = options.includeBinary as boolean;
+
+				if (includeBinary) {
+					if (items[i].binary && !newItem.binary) {
+						newItem.binary = items[i].binary;
+					}
+				}
+
+				returnData.push(newItem);
+			}
+		}
+
+		return [returnData];
+	}
+}
diff --git a/packages/nodes-base/nodes/Transform/SplitOut/splitOut.svg b/packages/nodes-base/nodes/Transform/SplitOut/splitOut.svg
new file mode 100644
index 0000000000000..b00f667ee6b5d
--- /dev/null
+++ b/packages/nodes-base/nodes/Transform/SplitOut/splitOut.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512" fill="none"><g fill="#9B6DD5" clip-path="url(#a)"><path fill-rule="evenodd" d="M480 148c0-6.627-5.373-12-12-12H322c-6.627 0-12 5.373-12 12v24c0 6.627 5.373 12 12 12h146c6.627 0 12-5.373 12-12zm0 96c0-6.627-5.373-12-12-12H322c-6.627 0-12 5.373-12 12v24c0 6.627 5.373 12 12 12h146c6.627 0 12-5.373 12-12zm0 96c0-6.627-5.373-12-12-12H322c-6.627 0-12 5.373-12 12v24c0 6.627 5.373 12 12 12h146c6.627 0 12-5.373 12-12z" clip-rule="evenodd"/><path d="M438 76c0 6.627-5.373 12-12 12H309.783c-17.673 0-32 14.327-32 32v56c0 26.978-10.272 51.557-27.119 70.039-5.055 5.545-5.055 14.377 0 19.922 16.847 18.482 27.119 43.061 27.119 70.039v56c0 17.673 14.327 32 32 32H426c6.627 0 12 5.373 12 12v24c0 6.627-5.373 12-12 12H309.783c-44.183 0-80-35.817-80-80v-56c0-30.928-25.072-56-56-56a5.783 5.783 0 0 1-5.783-5.783v-36.434a5.783 5.783 0 0 1 5.783-5.783c30.928 0 56-25.072 56-56v-56c0-44.183 35.817-80 80-80H426c6.627 0 12 5.373 12 12z"/><path fill-rule="evenodd" d="M136 244c0-6.627-5.373-12-12-12H12c-6.627 0-12 5.373-12 12v24c0 6.627 5.373 12 12 12h112c6.627 0 12-5.373 12-12z" clip-rule="evenodd"/></g><defs><clipPath id="a"><path fill="#fff" d="M512 0H0v512h512z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Transform/SplitOut/test/SplitOut.test.ts b/packages/nodes-base/nodes/Transform/SplitOut/test/SplitOut.test.ts
new file mode 100644
index 0000000000000..24c642cfeb59d
--- /dev/null
+++ b/packages/nodes-base/nodes/Transform/SplitOut/test/SplitOut.test.ts
@@ -0,0 +1,5 @@
+import { testWorkflows, getWorkflowFilenames } from '@test/nodes/Helpers';
+
+const workflows = getWorkflowFilenames(__dirname);
+
+describe('Test Split Out Node', () => testWorkflows(workflows));
diff --git a/packages/nodes-base/nodes/Transform/SplitOut/test/workflow.splitOut.json b/packages/nodes-base/nodes/Transform/SplitOut/test/workflow.splitOut.json
new file mode 100644
index 0000000000000..9bb7dac8f9fa9
--- /dev/null
+++ b/packages/nodes-base/nodes/Transform/SplitOut/test/workflow.splitOut.json
@@ -0,0 +1,360 @@
+{
+	"name": "splitOut test",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "6c90bf81-0c0e-4c5f-9f0c-297f06d9668a",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [-400, 400]
+		},
+		{
+			"parameters": {
+				"jsCode": "return { \ndata:[\n  {id: 3, char: 'c'},\n  {id: 4, char: 'd'},\n  {id: 5, char: 'e'},\n  {id: 1, char: 'a'},\n  {id: 2, char: 'b'},\n],\ndata2: [\n  {text: 'foo'},\n],\ndata3: [\n  {text: 'bar'},\n],\n};"
+			},
+			"id": "2e0011d5-c6a0-4a40-ab8c-9d011cde40d5",
+			"name": "Code",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [-180, 400]
+		},
+		{
+			"parameters": {
+				"fieldToSplitOut": "data",
+				"options": {}
+			},
+			"id": "e7eac465-8fe6-498c-9942-ebd47df537c1",
+			"name": "Item Lists",
+			"type": "n8n-nodes-base.splitOut",
+			"typeVersion": 1,
+			"position": [80, 160]
+		},
+		{
+			"parameters": {
+				"fieldToSplitOut": "data",
+				"include": "allOtherFields",
+				"options": {}
+			},
+			"id": "09b7fe15-dbad-4ca6-bf1e-3093139d14e5",
+			"name": "Item Lists1",
+			"type": "n8n-nodes-base.splitOut",
+			"typeVersion": 1,
+			"position": [80, 320]
+		},
+		{
+			"parameters": {
+				"fieldToSplitOut": "data",
+				"include": "selectedOtherFields",
+				"fieldsToInclude": ["data3"],
+
+
+
+
+
+
+				"options": {}
+			},
+			"id": "7ea63dc7-8141-4233-af47-9894919c7fe4",
+			"name": "Item Lists2",
+			"type": "n8n-nodes-base.splitOut",
+			"typeVersion": 1,
+			"position": [80, 480]
+		},
+		{
+			"parameters": {
+				"fieldToSplitOut": "data",
+				"options": {
+					"destinationFieldName": "output"
+				}
+			},
+			"id": "89c3c1b4-9577-480a-931f-3b34450b23cb",
+			"name": "Item Lists3",
+			"type": "n8n-nodes-base.splitOut",
+			"typeVersion": 1,
+			"position": [80, 660]
+		}
+	],
+	"pinData": {
+		"Item Lists": [
+			{
+				"json": {
+					"id": 3,
+					"char": "c"
+				}
+			},
+			{
+				"json": {
+					"id": 4,
+					"char": "d"
+				}
+			},
+			{
+				"json": {
+					"id": 5,
+					"char": "e"
+				}
+			},
+			{
+				"json": {
+					"id": 1,
+					"char": "a"
+				}
+			},
+			{
+				"json": {
+					"id": 2,
+					"char": "b"
+				}
+			}
+		],
+		"Item Lists1": [
+			{
+				"json": {
+					"data2": [
+						{
+							"text": "foo"
+						}
+					],
+					"data3": [
+						{
+							"text": "bar"
+						}
+					],
+					"data": {
+						"id": 3,
+						"char": "c"
+					}
+				}
+			},
+			{
+				"json": {
+					"data2": [
+						{
+							"text": "foo"
+						}
+					],
+					"data3": [
+						{
+							"text": "bar"
+						}
+					],
+					"data": {
+						"id": 4,
+						"char": "d"
+					}
+				}
+			},
+			{
+				"json": {
+					"data2": [
+						{
+							"text": "foo"
+						}
+					],
+					"data3": [
+						{
+							"text": "bar"
+						}
+					],
+					"data": {
+						"id": 5,
+						"char": "e"
+					}
+				}
+			},
+			{
+				"json": {
+					"data2": [
+						{
+							"text": "foo"
+						}
+					],
+					"data3": [
+						{
+							"text": "bar"
+						}
+					],
+					"data": {
+						"id": 1,
+						"char": "a"
+					}
+				}
+			},
+			{
+				"json": {
+					"data2": [
+						{
+							"text": "foo"
+						}
+					],
+					"data3": [
+						{
+							"text": "bar"
+						}
+					],
+					"data": {
+						"id": 2,
+						"char": "b"
+					}
+				}
+			}
+		],
+		"Item Lists2": [
+			{
+				"json": {
+					"data3": [
+						{
+							"text": "bar"
+						}
+					],
+					"data": {
+						"id": 3,
+						"char": "c"
+					}
+				}
+			},
+			{
+				"json": {
+					"data3": [
+						{
+							"text": "bar"
+						}
+					],
+					"data": {
+						"id": 4,
+						"char": "d"
+					}
+				}
+			},
+			{
+				"json": {
+					"data3": [
+						{
+							"text": "bar"
+						}
+					],
+					"data": {
+						"id": 5,
+						"char": "e"
+					}
+				}
+			},
+			{
+				"json": {
+					"data3": [
+						{
+							"text": "bar"
+						}
+					],
+					"data": {
+						"id": 1,
+						"char": "a"
+					}
+				}
+			},
+			{
+				"json": {
+					"data3": [
+						{
+							"text": "bar"
+						}
+					],
+					"data": {
+						"id": 2,
+						"char": "b"
+					}
+				}
+			}
+		],
+		"Item Lists3": [
+			{
+				"json": {
+					"output": {
+						"id": 3,
+						"char": "c"
+					}
+				}
+			},
+			{
+				"json": {
+					"output": {
+						"id": 4,
+						"char": "d"
+					}
+				}
+			},
+			{
+				"json": {
+					"output": {
+						"id": 5,
+						"char": "e"
+					}
+				}
+			},
+			{
+				"json": {
+					"output": {
+						"id": 1,
+						"char": "a"
+					}
+				}
+			},
+			{
+				"json": {
+					"output": {
+						"id": 2,
+						"char": "b"
+					}
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Code",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code": {
+			"main": [
+				[
+					{
+						"node": "Item Lists",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Item Lists1",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Item Lists2",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Item Lists3",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {},
+	"versionId": "9230f580-6f41-47c9-9949-bf258fc3fa47",
+	"id": "105",
+	"meta": {
+		"instanceId": "36203ea1ce3cef713fa25999bd9874ae26b9e4c2c3a90a365f2882a154d031d0"
+	},
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Transform/SplitOut/test/workflow.splitOutObject.json b/packages/nodes-base/nodes/Transform/SplitOut/test/workflow.splitOutObject.json
new file mode 100644
index 0000000000000..dda1c6c4c4f74
--- /dev/null
+++ b/packages/nodes-base/nodes/Transform/SplitOut/test/workflow.splitOutObject.json
@@ -0,0 +1,386 @@
+{
+	"name": "itemList split Object",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "ade46a75-ab57-48c6-886b-0c118f5ef1c6",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [520, 800]
+		},
+		{
+			"parameters": {
+				"fieldToSplitOut": "data",
+				"include": "selectedOtherFields",
+				"fieldsToInclude": ["tag"],
+				"options": {}
+			},
+			"id": "45e1d7a3-d6e8-4b69-a68a-1038db13be4c",
+			"name": "Item Lists1",
+			"type": "n8n-nodes-base.splitOut",
+			"typeVersion": 1,
+			"position": [1120, 340]
+		},
+		{
+			"parameters": {
+				"jsCode": "const data = {\n  entry1: {\n    id: 1,\n    info: 'some info 1',\n  },\n  entry2: {\n    id: 2,\n    info: 'some info 2',\n  },\n  entry3: {\n    id: 3,\n    info: 'some info 3',\n  },\n};\n\n\nconst data2 = [\n  'a', 'b', 'c'\n];\n\nconst data3 = {\n  a: 1,\n  b: 2,\n  c: 3,\n};\n\nreturn {data, data2, data3, data4: null, tag: 'bar'};"
+			},
+			"id": "faa78fac-468d-42b8-96e9-0fb62c312da3",
+			"name": "Code1",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [760, 800]
+		},
+		{
+			"parameters": {},
+			"id": "5baaf321-7e89-473d-a313-7cb90b3f13b3",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1380, 340]
+		},
+		{
+			"parameters": {
+				"fieldToSplitOut": "data3",
+				"include": "allOtherFields",
+				"options": {
+					"destinationFieldName": "extracted"
+				}
+			},
+			"id": "a786bea9-eb29-4c6d-aea6-a22aee622bc6",
+			"name": "Item Lists",
+			"type": "n8n-nodes-base.splitOut",
+			"typeVersion": 1,
+			"position": [1120, 720]
+		},
+		{
+			"parameters": {},
+			"id": "0521a24b-c74a-48fa-ae50-48a242b97806",
+			"name": "No Operation, do nothing1",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1380, 720]
+		},
+		{
+			"parameters": {
+				"fieldToSplitOut": "data3",
+				"options": {}
+			},
+			"id": "0c1c8827-72ab-4738-918c-d529e66505c6",
+			"name": "Item Lists2",
+			"type": "n8n-nodes-base.splitOut",
+			"typeVersion": 1,
+			"position": [1120, 540]
+		},
+		{
+			"parameters": {},
+			"id": "4c0dca36-c2ae-4d40-8952-0e728ac93fa3",
+			"name": "No Operation, do nothing2",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1380, 540]
+		},
+		{
+			"parameters": {
+				"fieldToSplitOut": "data2",
+				"options": {}
+			},
+			"id": "b2031380-b2a8-426d-8f7a-ab072d23b979",
+			"name": "Item Lists3",
+			"type": "n8n-nodes-base.splitOut",
+			"typeVersion": 1,
+			"position": [1120, 920]
+		},
+		{
+			"parameters": {},
+			"id": "617f7259-beee-42f1-bba2-4e75a83fe369",
+			"name": "No Operation, do nothing3",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1380, 920]
+		},
+		{
+			"parameters": {
+				"fieldToSplitOut": "data4",
+				"include": "allOtherFields",
+				"options": {}
+			},
+			"id": "8909b8eb-e5a9-4436-8e62-09d8c9670ac1",
+			"name": "Item Lists4",
+			"type": "n8n-nodes-base.splitOut",
+			"typeVersion": 1,
+			"position": [1120, 1140],
+			"continueOnFail": true
+		},
+		{
+			"parameters": {},
+			"id": "a9278f90-8ad9-42dc-85b6-28bf1b6764b7",
+			"name": "No Operation, do nothing4",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1380, 1140]
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"tag": "bar",
+					"data": {
+						"id": 1,
+						"info": "some info 1"
+					}
+				}
+			},
+			{
+				"json": {
+					"tag": "bar",
+					"data": {
+						"id": 2,
+						"info": "some info 2"
+					}
+				}
+			},
+			{
+				"json": {
+					"tag": "bar",
+					"data": {
+						"id": 3,
+						"info": "some info 3"
+					}
+				}
+			}
+		],
+		"No Operation, do nothing2": [
+			{
+				"json": {
+					"data3": 1
+				}
+			},
+			{
+				"json": {
+					"data3": 2
+				}
+			},
+			{
+				"json": {
+					"data3": 3
+				}
+			}
+		],
+		"No Operation, do nothing1": [
+			{
+				"json": {
+					"data": {
+						"entry1": {
+							"id": 1,
+							"info": "some info 1"
+						},
+						"entry2": {
+							"id": 2,
+							"info": "some info 2"
+						},
+						"entry3": {
+							"id": 3,
+							"info": "some info 3"
+						}
+					},
+					"data2": ["a", "b", "c"],
+					"data4": null,
+					"tag": "bar",
+					"extracted": 1
+				}
+			},
+			{
+				"json": {
+					"data": {
+						"entry1": {
+							"id": 1,
+							"info": "some info 1"
+						},
+						"entry2": {
+							"id": 2,
+							"info": "some info 2"
+						},
+						"entry3": {
+							"id": 3,
+							"info": "some info 3"
+						}
+					},
+					"data2": ["a", "b", "c"],
+					"data4": null,
+					"tag": "bar",
+					"extracted": 2
+				}
+			},
+			{
+				"json": {
+					"data": {
+						"entry1": {
+							"id": 1,
+							"info": "some info 1"
+						},
+						"entry2": {
+							"id": 2,
+							"info": "some info 2"
+						},
+						"entry3": {
+							"id": 3,
+							"info": "some info 3"
+						}
+					},
+					"data2": ["a", "b", "c"],
+					"data4": null,
+					"tag": "bar",
+					"extracted": 3
+				}
+			}
+		],
+		"No Operation, do nothing3": [
+			{
+				"json": {
+					"data2": "a"
+				}
+			},
+			{
+				"json": {
+					"data2": "b"
+				}
+			},
+			{
+				"json": {
+					"data2": "c"
+				}
+			}
+		],
+		"No Operation, do nothing4": [
+			{
+				"json": {
+					"data": {
+						"entry1": {
+							"id": 1,
+							"info": "some info 1"
+						},
+						"entry2": {
+							"id": 2,
+							"info": "some info 2"
+						},
+						"entry3": {
+							"id": 3,
+							"info": "some info 3"
+						}
+					},
+					"data2": ["a", "b", "c"],
+					"data3": {
+						"a": 1,
+						"b": 2,
+						"c": 3
+					},
+					"data4": null,
+					"tag": "bar"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Code1",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code1": {
+			"main": [
+				[
+					{
+						"node": "Item Lists1",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Item Lists2",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Item Lists",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Item Lists3",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Item Lists4",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Item Lists1": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Item Lists": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing1",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Item Lists2": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing2",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Item Lists3": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing3",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Item Lists4": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing4",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false
+}
diff --git a/packages/nodes-base/nodes/Transform/Summarize/Summarize.node.json b/packages/nodes-base/nodes/Transform/Summarize/Summarize.node.json
new file mode 100644
index 0000000000000..d6dc63b661d5d
--- /dev/null
+++ b/packages/nodes-base/nodes/Transform/Summarize/Summarize.node.json
@@ -0,0 +1,36 @@
+{
+	"node": "n8n-nodes-base.summarize",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"details": "",
+	"categories": ["Core Nodes"],
+	"resources": {
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.summarize/"
+			}
+		],
+		"generic": []
+	},
+	"alias": [
+		"Append",
+		"Array",
+		"Average",
+		"Concatenate",
+		"Count",
+		"Group",
+		"Item",
+		"List",
+		"Max",
+		"Min",
+		"Pivot",
+		"Sum",
+		"Summarise",
+		"Summarize",
+		"Transform",
+		"Unique"
+	],
+	"subcategories": {
+		"Core Nodes": ["Data Transformation"]
+	}
+}
diff --git a/packages/nodes-base/nodes/Transform/Summarize/Summarize.node.ts b/packages/nodes-base/nodes/Transform/Summarize/Summarize.node.ts
new file mode 100644
index 0000000000000..60e2a4599d5a8
--- /dev/null
+++ b/packages/nodes-base/nodes/Transform/Summarize/Summarize.node.ts
@@ -0,0 +1,369 @@
+import {
+	NodeOperationError,
+	type IExecuteFunctions,
+	type INodeExecutionData,
+	type INodeType,
+	type INodeTypeDescription,
+} from 'n8n-workflow';
+import {
+	type Aggregations,
+	NUMERICAL_AGGREGATIONS,
+	type SummarizeOptions,
+	aggregationToArray,
+	checkIfFieldExists,
+	fieldValueGetter,
+	splitData,
+} from './utils';
+import { generatePairedItemData } from '../../../utils/utilities';
+
+export class Summarize implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Summarize',
+		name: 'summarize',
+		icon: 'file:summarize.svg',
+		group: ['transform'],
+		subtitle: '',
+		version: 1,
+		description: 'Sum, count, max, etc. across items',
+		defaults: {
+			name: 'Summarize',
+		},
+		inputs: ['main'],
+		outputs: ['main'],
+		properties: [
+			{
+				displayName: 'Fields to Summarize',
+				name: 'fieldsToSummarize',
+				type: 'fixedCollection',
+				placeholder: 'Add Field',
+				default: { values: [{ aggregation: 'count', field: '' }] },
+				typeOptions: {
+					multipleValues: true,
+				},
+				options: [
+					{
+						displayName: '',
+						name: 'values',
+						values: [
+							{
+								displayName: 'Aggregation',
+								name: 'aggregation',
+								type: 'options',
+								options: [
+									{
+										name: 'Append',
+										value: 'append',
+									},
+									{
+										name: 'Average',
+										value: 'average',
+									},
+									{
+										name: 'Concatenate',
+										value: 'concatenate',
+									},
+									{
+										name: 'Count',
+										value: 'count',
+									},
+									{
+										name: 'Count Unique',
+										value: 'countUnique',
+									},
+									{
+										name: 'Max',
+										value: 'max',
+									},
+									{
+										name: 'Min',
+										value: 'min',
+									},
+									{
+										name: 'Sum',
+										value: 'sum',
+									},
+								],
+								default: 'count',
+								description: 'How to combine the values of the field you want to summarize',
+							},
+							//field repeated to have different descriptions for different aggregations --------------------------------
+							{
+								displayName: 'Field',
+								name: 'field',
+								type: 'string',
+								default: '',
+								description: 'The name of an input field that you want to summarize',
+								placeholder: 'e.g. cost',
+								hint: ' Enter the field name as text',
+								displayOptions: {
+									hide: {
+										aggregation: [...NUMERICAL_AGGREGATIONS, 'countUnique', 'count', 'max', 'min'],
+									},
+								},
+								requiresDataPath: 'single',
+							},
+							{
+								displayName: 'Field',
+								name: 'field',
+								type: 'string',
+								default: '',
+								description:
+									'The name of an input field that you want to summarize. The field should contain numerical values; null, undefined, empty strings would be ignored.',
+								placeholder: 'e.g. cost',
+								hint: ' Enter the field name as text',
+								displayOptions: {
+									show: {
+										aggregation: NUMERICAL_AGGREGATIONS,
+									},
+								},
+								requiresDataPath: 'single',
+							},
+							{
+								displayName: 'Field',
+								name: 'field',
+								type: 'string',
+								default: '',
+								description:
+									'The name of an input field that you want to summarize; null, undefined, empty strings would be ignored',
+								placeholder: 'e.g. cost',
+								hint: ' Enter the field name as text',
+								displayOptions: {
+									show: {
+										aggregation: ['countUnique', 'count', 'max', 'min'],
+									},
+								},
+								requiresDataPath: 'single',
+							},
+							// ----------------------------------------------------------------------------------------------------------
+							{
+								displayName: 'Include Empty Values',
+								name: 'includeEmpty',
+								type: 'boolean',
+								default: false,
+								displayOptions: {
+									show: {
+										aggregation: ['append', 'concatenate'],
+									},
+								},
+							},
+							{
+								displayName: 'Separator',
+								name: 'separateBy',
+								type: 'options',
+								default: ',',
+								// eslint-disable-next-line n8n-nodes-base/node-param-options-type-unsorted-items
+								options: [
+									{
+										name: 'Comma',
+										value: ',',
+									},
+									{
+										name: 'Comma and Space',
+										value: ', ',
+									},
+									{
+										name: 'New Line',
+										value: '\n',
+									},
+									{
+										name: 'None',
+										value: '',
+									},
+									{
+										name: 'Space',
+										value: ' ',
+									},
+									{
+										name: 'Other',
+										value: 'other',
+									},
+								],
+								hint: 'What to insert between values',
+								displayOptions: {
+									show: {
+										aggregation: ['concatenate'],
+									},
+								},
+							},
+							{
+								displayName: 'Custom Separator',
+								name: 'customSeparator',
+								type: 'string',
+								default: '',
+								displayOptions: {
+									show: {
+										aggregation: ['concatenate'],
+										separateBy: ['other'],
+									},
+								},
+							},
+						],
+					},
+				],
+			},
+			// fieldsToSplitBy repeated to have different displayName for singleItem and separateItems -----------------------------
+			{
+				displayName: 'Fields to Split By',
+				name: 'fieldsToSplitBy',
+				type: 'string',
+				placeholder: 'e.g. country, city',
+				default: '',
+				description: 'The name of the input fields that you want to split the summary by',
+				hint: 'Enter the name of the fields as text (separated by commas)',
+				displayOptions: {
+					hide: {
+						'/options.outputFormat': ['singleItem'],
+					},
+				},
+				requiresDataPath: 'multiple',
+			},
+			{
+				displayName: 'Fields to Group By',
+				name: 'fieldsToSplitBy',
+				type: 'string',
+				placeholder: 'e.g. country, city',
+				default: '',
+				description: 'The name of the input fields that you want to split the summary by',
+				hint: 'Enter the name of the fields as text (separated by commas)',
+				displayOptions: {
+					show: {
+						'/options.outputFormat': ['singleItem'],
+					},
+				},
+				requiresDataPath: 'multiple',
+			},
+			// ----------------------------------------------------------------------------------------------------------
+			{
+				displayName: 'Options',
+				name: 'options',
+				type: 'collection',
+				placeholder: 'Add Option',
+				default: {},
+				options: [
+					{
+						displayName: 'Continue if Field Not Found',
+						name: 'continueIfFieldNotFound',
+						type: 'boolean',
+						default: false,
+						description:
+							"Whether to continue if field to summarize can't be found in any items and return single empty item, owerwise an error would be thrown",
+					},
+					{
+						displayName: 'Disable Dot Notation',
+						name: 'disableDotNotation',
+						type: 'boolean',
+						default: false,
+						description:
+							'Whether to disallow referencing child fields using `parent.child` in the field name',
+					},
+					{
+						displayName: 'Output Format',
+						name: 'outputFormat',
+						type: 'options',
+						default: 'separateItems',
+						options: [
+							{
+								name: 'Each Split in a Separate Item',
+								value: 'separateItems',
+							},
+							{
+								name: 'All Splits in a Single Item',
+								value: 'singleItem',
+							},
+						],
+					},
+					{
+						// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+						displayName: 'Ignore items without valid fields to group by',
+						name: 'skipEmptySplitFields',
+						type: 'boolean',
+						default: false,
+					},
+				],
+			},
+		],
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = this.getInputData();
+		const newItems = items.map(({ json }, i) => ({ ...json, _itemIndex: i }));
+
+		const options = this.getNodeParameter('options', 0, {}) as SummarizeOptions;
+
+		const fieldsToSplitBy = (this.getNodeParameter('fieldsToSplitBy', 0, '') as string)
+			.split(',')
+			.map((field) => field.trim())
+			.filter((field) => field);
+
+		const fieldsToSummarize = this.getNodeParameter(
+			'fieldsToSummarize.values',
+			0,
+			[],
+		) as Aggregations;
+
+		if (fieldsToSummarize.filter((aggregation) => aggregation.field !== '').length === 0) {
+			throw new NodeOperationError(
+				this.getNode(),
+				"You need to add at least one aggregation to 'Fields to Summarize' with non empty 'Field'",
+			);
+		}
+
+		const getValue = fieldValueGetter(options.disableDotNotation);
+
+		const nodeVersion = this.getNode().typeVersion;
+
+		if (nodeVersion < 2.1) {
+			try {
+				checkIfFieldExists.call(this, newItems, fieldsToSummarize, getValue);
+			} catch (error) {
+				if (options.continueIfFieldNotFound) {
+					const itemData = generatePairedItemData(items.length);
+
+					return [[{ json: {}, pairedItem: itemData }]];
+				} else {
+					throw error;
+				}
+			}
+		}
+
+		const aggregationResult = splitData(
+			fieldsToSplitBy,
+			newItems,
+			fieldsToSummarize,
+			options,
+			getValue,
+		);
+
+		if (options.outputFormat === 'singleItem') {
+			const executionData: INodeExecutionData = {
+				json: aggregationResult,
+				pairedItem: newItems.map((_v, index) => ({
+					item: index,
+				})),
+			};
+			return [[executionData]];
+		} else {
+			if (!fieldsToSplitBy.length) {
+				const { pairedItems, ...json } = aggregationResult;
+				const executionData: INodeExecutionData = {
+					json,
+					pairedItem: ((pairedItems as number[]) || []).map((index: number) => ({
+						item: index,
+					})),
+				};
+				return [[executionData]];
+			}
+			const returnData = aggregationToArray(aggregationResult, fieldsToSplitBy);
+			const executionData = returnData.map((item) => {
+				const { pairedItems, ...json } = item;
+				return {
+					json,
+					pairedItem: ((pairedItems as number[]) || []).map((index: number) => ({
+						item: index,
+					})),
+				};
+			});
+			return [executionData];
+		}
+	}
+}
diff --git a/packages/nodes-base/nodes/Transform/Summarize/summarize.svg b/packages/nodes-base/nodes/Transform/Summarize/summarize.svg
new file mode 100644
index 0000000000000..e0ef907fa0d33
--- /dev/null
+++ b/packages/nodes-base/nodes/Transform/Summarize/summarize.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512" fill="none"><path fill="#F92" fill-rule="evenodd" d="M132 91c-15.464 0-28 12.536-28 28v317c0 15.464 12.536 28 28 28h248c15.464 0 28-12.536 28-28V119c0-15.464-12.536-28-28-28h-6a6 6 0 0 1-6-6V49a6 6 0 0 1 6-6h6c41.974 0 76 34.026 76 76v317c0 41.974-34.026 76-76 76H132c-41.974 0-76-34.026-76-76V119c0-41.974 34.026-76 76-76h6a6 6 0 0 1 6 6v36a6 6 0 0 1-6 6z" clip-rule="evenodd"/><path fill="#F92" fill-rule="evenodd" d="M256 0c-27.232 0-50.227 18.142-57.558 43H182a6 6 0 0 0-6 6v70a6 6 0 0 0 6 6h148a6 6 0 0 0 6-6V49a6 6 0 0 0-6-6h-16.442C306.227 18.142 283.232 0 256 0m0 40a19.9 19.9 0 0 0-10.541 3C239.781 46.528 236 52.823 236 60c0 11.046 8.954 20 20 20s20-8.954 20-20c0-7.177-3.781-13.472-9.459-17A19.9 19.9 0 0 0 256 40m101 179c0 6.627-5.373 12-12 12H233c-6.627 0-12-5.373-12-12v-24c0-6.627 5.373-12 12-12h112c6.627 0 12 5.373 12 12z" clip-rule="evenodd"/><path fill="#F92" d="M197 207c0 13.255-10.745 24-24 24s-24-10.745-24-24 10.745-24 24-24 24 10.745 24 24"/><path fill="#F92" fill-rule="evenodd" d="M357 395c0 6.627-5.373 12-12 12H233c-6.627 0-12-5.373-12-12v-24c0-6.627 5.373-12 12-12h112c6.627 0 12 5.373 12 12z" clip-rule="evenodd"/><path fill="#F92" d="M197 383c0 13.255-10.745 24-24 24s-24-10.745-24-24 10.745-24 24-24 24 10.745 24 24"/><path fill="#F92" fill-rule="evenodd" d="M357 307c0 6.627-5.373 12-12 12H233c-6.627 0-12-5.373-12-12v-24c0-6.627 5.373-12 12-12h112c6.627 0 12 5.373 12 12z" clip-rule="evenodd"/><path fill="#F92" d="M197 295c0 13.255-10.745 24-24 24s-24-10.745-24-24 10.745-24 24-24 24 10.745 24 24"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Transform/Summarize/test/Summarize.test.ts b/packages/nodes-base/nodes/Transform/Summarize/test/Summarize.test.ts
new file mode 100644
index 0000000000000..c846b0c33c9e7
--- /dev/null
+++ b/packages/nodes-base/nodes/Transform/Summarize/test/Summarize.test.ts
@@ -0,0 +1,5 @@
+import { testWorkflows, getWorkflowFilenames } from '@test/nodes/Helpers';
+
+const workflows = getWorkflowFilenames(__dirname);
+
+describe('Test Summarize Node', () => testWorkflows(workflows));
diff --git a/packages/nodes-base/nodes/Transform/Summarize/test/workflow.summarize.json b/packages/nodes-base/nodes/Transform/Summarize/test/workflow.summarize.json
new file mode 100644
index 0000000000000..3a6446d12b9d5
--- /dev/null
+++ b/packages/nodes-base/nodes/Transform/Summarize/test/workflow.summarize.json
@@ -0,0 +1,296 @@
+{
+	"name": "summarize test",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "6c90bf81-0c0e-4c5f-9f0c-297f06d9668a",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [-400, 420]
+		},
+		{
+			"parameters": {
+				"jsCode": "return [\n  {\n    category: 'red',\n    text: 'foo',\n    char: 'a',\n    value: 1,\n  },\n  {\n    category: 'blue',\n    text: 'spam',\n    char: 'b',\n    value: 2,\n  },\n  {\n    category: 'green',\n    text: 'bar',\n    char: 'c',\n    value: 3,\n  },\n  {\n    category: 'red',\n    text: 'foo',\n    char: 'a',\n    value: 4,\n  },\n  {\n    category: 'red',\n    text: 'bar',\n    char: 'a',\n    value: 5,\n  },\n  {\n    category: 'blue',\n    text: 'foo',\n    char: 'a',\n    value: 6,\n  },\n  {\n    category: 'blue',\n    text: 'foo',\n    char: 'a',\n    value: 7,\n  },\n];"
+			},
+			"id": "2e0011d5-c6a0-4a40-ab8c-9d011cde40d5",
+			"name": "Code",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [-180, 420]
+		},
+		{
+			"parameters": {
+				"fieldsToSummarize": {
+					"values": [
+						{
+							"aggregation": "append",
+							"field": "char"
+						},
+						{
+							"field": "char"
+						},
+						{
+							"aggregation": "countUnique",
+							"field": "char"
+						},
+						{
+							"aggregation": "concatenate",
+							"field": "char",
+							"separateBy": ", "
+						}
+					]
+				},
+				"fieldsToSplitBy": "category, text",
+				"options": {}
+			},
+			"id": "1dedf668-b766-4283-9efd-90db28404f0b",
+			"name": "Item Lists",
+			"type": "n8n-nodes-base.summarize",
+			"typeVersion": 1,
+			"position": [40, 220]
+		},
+		{
+			"parameters": {
+				"fieldsToSummarize": {
+					"values": [
+						{
+							"aggregation": "append",
+							"field": "char"
+						},
+						{
+							"field": "char"
+						},
+						{
+							"aggregation": "countUnique",
+							"field": "char"
+						},
+						{
+							"aggregation": "concatenate",
+							"field": "char",
+							"separateBy": ", "
+						}
+					]
+				},
+				"fieldsToSplitBy": "category, text",
+				"options": {
+					"outputFormat": "singleItem"
+				}
+			},
+			"id": "8fd0f819-226c-4b29-87c7-b724dd72605c",
+			"name": "Item Lists1",
+			"type": "n8n-nodes-base.summarize",
+			"typeVersion": 1,
+			"position": [40, 420]
+		},
+		{
+			"parameters": {
+				"fieldsToSummarize": {
+					"values": [
+						{
+							"aggregation": "average",
+							"field": "value"
+						},
+						{
+							"aggregation": "max",
+							"field": "value"
+						},
+						{
+							"aggregation": "min",
+							"field": "value"
+						},
+						{
+							"aggregation": "max",
+							"field": "value"
+						},
+						{
+							"aggregation": "sum",
+							"field": "value"
+						},
+						{
+							"aggregation": "append",
+							"field": "value"
+						}
+					]
+				},
+				"fieldsToSplitBy": "category",
+				"options": {}
+			},
+			"id": "33e0367d-42d9-4f82-8fc8-8e2019aa3734",
+			"name": "Item Lists2",
+			"type": "n8n-nodes-base.summarize",
+			"typeVersion": 1,
+			"position": [40, 620]
+		}
+	],
+	"pinData": {
+		"Item Lists": [
+			{
+				"json": {
+					"category": "red",
+					"text": "foo",
+					"appended_char": ["a", "a"],
+					"count_char": 2,
+					"unique_count_char": 1,
+					"concatenated_char": "a, a"
+				}
+			},
+			{
+				"json": {
+					"category": "red",
+					"text": "bar",
+					"appended_char": ["a"],
+					"count_char": 1,
+					"unique_count_char": 1,
+					"concatenated_char": "a"
+				}
+			},
+			{
+				"json": {
+					"category": "blue",
+					"text": "spam",
+					"appended_char": ["b"],
+					"count_char": 1,
+					"unique_count_char": 1,
+					"concatenated_char": "b"
+				}
+			},
+			{
+				"json": {
+					"category": "blue",
+					"text": "foo",
+					"appended_char": ["a", "a"],
+					"count_char": 2,
+					"unique_count_char": 1,
+					"concatenated_char": "a, a"
+				}
+			},
+			{
+				"json": {
+					"category": "green",
+					"text": "bar",
+					"appended_char": ["c"],
+					"count_char": 1,
+					"unique_count_char": 1,
+					"concatenated_char": "c"
+				}
+			}
+		],
+		"Item Lists1": [
+			{
+				"json": {
+					"red": {
+						"foo": {
+							"appended_char": ["a", "a"],
+							"count_char": 2,
+							"unique_count_char": 1,
+							"concatenated_char": "a, a"
+						},
+						"bar": {
+							"appended_char": ["a"],
+							"count_char": 1,
+							"unique_count_char": 1,
+							"concatenated_char": "a"
+						}
+					},
+					"blue": {
+						"spam": {
+							"appended_char": ["b"],
+							"count_char": 1,
+							"unique_count_char": 1,
+							"concatenated_char": "b"
+						},
+						"foo": {
+							"appended_char": ["a", "a"],
+							"count_char": 2,
+							"unique_count_char": 1,
+							"concatenated_char": "a, a"
+						}
+					},
+					"green": {
+						"bar": {
+							"appended_char": ["c"],
+							"count_char": 1,
+							"unique_count_char": 1,
+							"concatenated_char": "c"
+						}
+					}
+				}
+			}
+		],
+		"Item Lists2": [
+			{
+				"json": {
+					"category": "red",
+					"average_value": 3.3333333333333335,
+					"max_value": 5,
+					"min_value": 1,
+					"sum_value": 10,
+					"appended_value": [1, 4, 5]
+				}
+			},
+			{
+				"json": {
+					"category": "blue",
+					"average_value": 5,
+					"max_value": 7,
+					"min_value": 2,
+					"sum_value": 15,
+					"appended_value": [2, 6, 7]
+				}
+			},
+			{
+				"json": {
+					"category": "green",
+					"average_value": 3,
+					"max_value": 3,
+					"min_value": 3,
+					"sum_value": 3,
+					"appended_value": [3]
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Code",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code": {
+			"main": [
+				[
+					{
+						"node": "Item Lists",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Item Lists1",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Item Lists2",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {},
+	"versionId": "bee0d911-844d-4fe6-bd52-a1716dd74dd8",
+	"id": "105",
+	"meta": {
+		"instanceId": "36203ea1ce3cef713fa25999bd9874ae26b9e4c2c3a90a365f2882a154d031d0"
+	},
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Transform/Summarize/utils.ts b/packages/nodes-base/nodes/Transform/Summarize/utils.ts
new file mode 100644
index 0000000000000..0094d4d8efc9a
--- /dev/null
+++ b/packages/nodes-base/nodes/Transform/Summarize/utils.ts
@@ -0,0 +1,289 @@
+import get from 'lodash/get';
+import {
+	type IDataObject,
+	type GenericValue,
+	type IExecuteFunctions,
+	NodeOperationError,
+} from 'n8n-workflow';
+
+type AggregationType =
+	| 'append'
+	| 'average'
+	| 'concatenate'
+	| 'count'
+	| 'countUnique'
+	| 'max'
+	| 'min'
+	| 'sum';
+
+export type Aggregation = {
+	aggregation: AggregationType;
+	field: string;
+	includeEmpty?: boolean;
+	separateBy?: string;
+	customSeparator?: string;
+};
+
+export type Aggregations = Aggregation[];
+
+const AggregationDisplayNames = {
+	append: 'appended_',
+	average: 'average_',
+	concatenate: 'concatenated_',
+	count: 'count_',
+	countUnique: 'unique_count_',
+	max: 'max_',
+	min: 'min_',
+	sum: 'sum_',
+};
+
+export const NUMERICAL_AGGREGATIONS = ['average', 'sum'];
+
+export type SummarizeOptions = {
+	continueIfFieldNotFound: boolean;
+	disableDotNotation?: boolean;
+	outputFormat?: 'separateItems' | 'singleItem';
+	skipEmptySplitFields?: boolean;
+};
+
+export type ValueGetterFn = (
+	item: IDataObject,
+	field: string,
+) => IDataObject | IDataObject[] | GenericValue | GenericValue[];
+
+function isEmpty<T>(value: T) {
+	return value === undefined || value === null || value === '';
+}
+
+function parseReturnData(returnData: IDataObject) {
+	const regexBrackets = /[\]\["]/g;
+	const regexSpaces = /[ .]/g;
+	for (const key of Object.keys(returnData)) {
+		if (key.match(regexBrackets)) {
+			const newKey = key.replace(regexBrackets, '');
+			returnData[newKey] = returnData[key];
+			delete returnData[key];
+		}
+	}
+	for (const key of Object.keys(returnData)) {
+		if (key.match(regexSpaces)) {
+			const newKey = key.replace(regexSpaces, '_');
+			returnData[newKey] = returnData[key];
+			delete returnData[key];
+		}
+	}
+}
+
+function parseFieldName(fieldName: string[]) {
+	const regexBrackets = /[\]\["]/g;
+	const regexSpaces = /[ .]/g;
+	fieldName = fieldName.map((field) => {
+		field = field.replace(regexBrackets, '');
+		field = field.replace(regexSpaces, '_');
+		return field;
+	});
+	return fieldName;
+}
+
+export const fieldValueGetter = (disableDotNotation?: boolean) => {
+	if (disableDotNotation) {
+		return (item: IDataObject, field: string) => item[field];
+	} else {
+		return (item: IDataObject, field: string) => get(item, field);
+	}
+};
+
+export function checkIfFieldExists(
+	this: IExecuteFunctions,
+	items: IDataObject[],
+	aggregations: Aggregations,
+	getValue: ValueGetterFn,
+) {
+	for (const aggregation of aggregations) {
+		if (aggregation.field === '') {
+			continue;
+		}
+		const exist = items.some((item) => getValue(item, aggregation.field) !== undefined);
+		if (!exist) {
+			throw new NodeOperationError(
+				this.getNode(),
+				`The field '${aggregation.field}' does not exist in any items`,
+			);
+		}
+	}
+}
+
+function aggregate(items: IDataObject[], entry: Aggregation, getValue: ValueGetterFn) {
+	const { aggregation, field } = entry;
+	let data = [...items];
+
+	if (NUMERICAL_AGGREGATIONS.includes(aggregation)) {
+		data = data.filter(
+			(item) => typeof getValue(item, field) === 'number' && !isEmpty(getValue(item, field)),
+		);
+	}
+
+	switch (aggregation) {
+		//combine operations
+		case 'append':
+			if (!entry.includeEmpty) {
+				data = data.filter((item) => !isEmpty(getValue(item, field)));
+			}
+			return data.map((item) => getValue(item, field));
+		case 'concatenate':
+			const separateBy = entry.separateBy === 'other' ? entry.customSeparator : entry.separateBy;
+			if (!entry.includeEmpty) {
+				data = data.filter((item) => !isEmpty(getValue(item, field)));
+			}
+			return data
+				.map((item) => {
+					let value = getValue(item, field);
+					if (typeof value === 'object') {
+						value = JSON.stringify(value);
+					}
+					if (typeof value === 'undefined') {
+						value = 'undefined';
+					}
+
+					return value;
+				})
+				.join(separateBy);
+
+		//numerical operations
+		case 'average':
+			return (
+				data.reduce((acc, item) => {
+					return acc + (getValue(item, field) as number);
+				}, 0) / data.length
+			);
+		case 'sum':
+			return data.reduce((acc, item) => {
+				return acc + (getValue(item, field) as number);
+			}, 0);
+		//comparison operations
+		case 'min':
+			let min;
+			for (const item of data) {
+				const value = getValue(item, field);
+				if (value !== undefined && value !== null && value !== '') {
+					if (min === undefined || value < min) {
+						min = value;
+					}
+				}
+			}
+			return min !== undefined ? min : null;
+		case 'max':
+			let max;
+			for (const item of data) {
+				const value = getValue(item, field);
+				if (value !== undefined && value !== null && value !== '') {
+					if (max === undefined || value > max) {
+						max = value;
+					}
+				}
+			}
+			return max !== undefined ? max : null;
+
+		//count operations
+		case 'countUnique':
+			return new Set(data.map((item) => getValue(item, field)).filter((item) => !isEmpty(item)))
+				.size;
+		default:
+			//count by default
+			return data.filter((item) => !isEmpty(getValue(item, field))).length;
+	}
+}
+
+function aggregateData(
+	data: IDataObject[],
+	fieldsToSummarize: Aggregations,
+	options: SummarizeOptions,
+	getValue: ValueGetterFn,
+) {
+	const returnData = fieldsToSummarize.reduce((acc, aggregation) => {
+		acc[`${AggregationDisplayNames[aggregation.aggregation]}${aggregation.field}`] = aggregate(
+			data,
+			aggregation,
+			getValue,
+		);
+		return acc;
+	}, {} as IDataObject);
+	parseReturnData(returnData);
+	if (options.outputFormat === 'singleItem') {
+		parseReturnData(returnData);
+		return returnData;
+	} else {
+		return { ...returnData, pairedItems: data.map((item) => item._itemIndex as number) };
+	}
+}
+
+export function splitData(
+	splitKeys: string[],
+	data: IDataObject[],
+	fieldsToSummarize: Aggregations,
+	options: SummarizeOptions,
+	getValue: ValueGetterFn,
+) {
+	if (!splitKeys || splitKeys.length === 0) {
+		return aggregateData(data, fieldsToSummarize, options, getValue);
+	}
+
+	const [firstSplitKey, ...restSplitKeys] = splitKeys;
+
+	const groupedData = data.reduce((acc, item) => {
+		let keyValuee = getValue(item, firstSplitKey) as string;
+
+		if (typeof keyValuee === 'object') {
+			keyValuee = JSON.stringify(keyValuee);
+		}
+
+		if (options.skipEmptySplitFields && typeof keyValuee !== 'number' && !keyValuee) {
+			return acc;
+		}
+
+		if (acc[keyValuee] === undefined) {
+			acc[keyValuee] = [item];
+		} else {
+			(acc[keyValuee] as IDataObject[]).push(item);
+		}
+		return acc;
+	}, {} as IDataObject);
+
+	return Object.keys(groupedData).reduce((acc, key) => {
+		const value = groupedData[key] as IDataObject[];
+		acc[key] = splitData(restSplitKeys, value, fieldsToSummarize, options, getValue);
+		return acc;
+	}, {} as IDataObject);
+}
+
+export function aggregationToArray(
+	aggregationResult: IDataObject,
+	fieldsToSplitBy: string[],
+	previousStage: IDataObject = {},
+) {
+	const returnData: IDataObject[] = [];
+	fieldsToSplitBy = parseFieldName(fieldsToSplitBy);
+	const splitFieldName = fieldsToSplitBy[0];
+	const isNext = fieldsToSplitBy[1];
+
+	if (isNext === undefined) {
+		for (const fieldName of Object.keys(aggregationResult)) {
+			returnData.push({
+				...previousStage,
+				[splitFieldName]: fieldName,
+				...(aggregationResult[fieldName] as IDataObject),
+			});
+		}
+		return returnData;
+	} else {
+		for (const key of Object.keys(aggregationResult)) {
+			returnData.push(
+				...aggregationToArray(aggregationResult[key] as IDataObject, fieldsToSplitBy.slice(1), {
+					...previousStage,
+					[splitFieldName]: key,
+				}),
+			);
+		}
+		return returnData;
+	}
+}
diff --git a/packages/nodes-base/nodes/Transform/utils/utils.ts b/packages/nodes-base/nodes/Transform/utils/utils.ts
new file mode 100644
index 0000000000000..73b9fc7d68c45
--- /dev/null
+++ b/packages/nodes-base/nodes/Transform/utils/utils.ts
@@ -0,0 +1,17 @@
+import { ApplicationError } from 'n8n-workflow';
+
+export const prepareFieldsArray = (fields: string | string[], fieldName = 'Fields') => {
+	if (typeof fields === 'string') {
+		return fields
+			.split(',')
+			.map((entry) => entry.trim())
+			.filter((entry) => entry !== '');
+	}
+	if (Array.isArray(fields)) {
+		return fields;
+	}
+	throw new ApplicationError(
+		`The \'${fieldName}\' parameter must be a string of fields separated by commas or an array of strings.`,
+		{ level: 'warning' },
+	);
+};
diff --git a/packages/nodes-base/nodes/TravisCi/GenericFunctions.ts b/packages/nodes-base/nodes/TravisCi/GenericFunctions.ts
index 48553b7df6ac2..b089998eb812c 100644
--- a/packages/nodes-base/nodes/TravisCi/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/TravisCi/GenericFunctions.ts
@@ -1,20 +1,19 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	JsonObject,
+	IRequestOptions,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import get from 'lodash.get';
+import get from 'lodash/get';
 
 export async function travisciApiRequest(
-	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 	body: IDataObject | string = {},
 	qs: IDataObject = {},
@@ -22,7 +21,7 @@ export async function travisciApiRequest(
 	option: IDataObject = {},
 ) {
 	const credentials = await this.getCredentials('travisCiApi');
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		headers: {
 			'Travis-API-Version': '3',
 			Accept: 'application/json',
@@ -53,7 +52,7 @@ export async function travisciApiRequest(
 export async function travisciApiRequestAllItems(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: IDataObject = {},
diff --git a/packages/nodes-base/nodes/TravisCi/TravisCi.node.ts b/packages/nodes-base/nodes/TravisCi/TravisCi.node.ts
index 701076cf54806..4ad7e8451135e 100644
--- a/packages/nodes-base/nodes/TravisCi/TravisCi.node.ts
+++ b/packages/nodes-base/nodes/TravisCi/TravisCi.node.ts
@@ -174,6 +174,6 @@ export class TravisCi implements INodeType {
 				throw error;
 			}
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Trello/GenericFunctions.ts b/packages/nodes-base/nodes/Trello/GenericFunctions.ts
index c653b28050125..91f90be4b88f5 100644
--- a/packages/nodes-base/nodes/Trello/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Trello/GenericFunctions.ts
@@ -1,10 +1,10 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
 	IHookFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
+	IRequestOptions,
 } from 'n8n-workflow';
 
 /**
@@ -13,14 +13,14 @@ import type {
  */
 export async function apiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: object,
 	query?: IDataObject,
 ): Promise<any> {
 	query = query || {};
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		method,
 		body,
 		qs: query,
@@ -28,12 +28,16 @@ export async function apiRequest(
 		json: true,
 	};
 
-	return this.helpers.requestWithAuthentication.call(this, 'trelloApi', options);
+	if (method === 'GET') {
+		delete options.body;
+	}
+
+	return await this.helpers.requestWithAuthentication.call(this, 'trelloApi', options);
 }
 
 export async function apiRequestAllItems(
 	this: IHookFunctions | IExecuteFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject,
 	query: IDataObject = {},
diff --git a/packages/nodes-base/nodes/Trello/Trello.node.ts b/packages/nodes-base/nodes/Trello/Trello.node.ts
index da784c193960c..22cbba53d672c 100644
--- a/packages/nodes-base/nodes/Trello/Trello.node.ts
+++ b/packages/nodes-base/nodes/Trello/Trello.node.ts
@@ -6,6 +6,7 @@ import type {
 	INodeListSearchResult,
 	INodeType,
 	INodeTypeDescription,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
@@ -202,7 +203,7 @@ export class Trello implements INodeType {
 		// For Query string
 		let qs: IDataObject;
 
-		let requestMethod: string;
+		let requestMethod: IHttpRequestMethods;
 		let endpoint: string;
 		let returnAll = false;
 		let responseData;
@@ -917,6 +918,6 @@ export class Trello implements INodeType {
 			}
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Trello/trello.svg b/packages/nodes-base/nodes/Trello/trello.svg
index 3fa2aaf5323c1..d497f2168b334 100644
--- a/packages/nodes-base/nodes/Trello/trello.svg
+++ b/packages/nodes-base/nodes/Trello/trello.svg
@@ -1 +1 @@
-<svg width="200" height="200" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><rect fill="#0079BF" width="200" height="200" rx="25"/><rect fill="#FFF" x="113" y="26" width="61" height="87.5" rx="12"/><rect fill="#FFF" x="26" y="26" width="61" height="137.5" rx="12"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="200" height="200"><g fill="none" fill-rule="evenodd"><rect width="200" height="200" fill="#0079BF" rx="25"/><rect width="61" height="87.5" x="113" y="26" fill="#FFF" rx="12"/><rect width="61" height="137.5" x="26" y="26" fill="#FFF" rx="12"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Twake/GenericFunctions.ts b/packages/nodes-base/nodes/Twake/GenericFunctions.ts
index bb6a5791fe490..fb3d2482ed628 100644
--- a/packages/nodes-base/nodes/Twake/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Twake/GenericFunctions.ts
@@ -1,5 +1,11 @@
-import type { OptionsWithUri } from 'request';
-import type { IExecuteFunctions, IHookFunctions, ILoadOptionsFunctions } from 'n8n-workflow';
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	IHookFunctions,
+	IHttpRequestMethods,
+	ILoadOptionsFunctions,
+	IRequestOptions,
+} from 'n8n-workflow';
 
 /**
  * Make an API request to Twake
@@ -7,13 +13,13 @@ import type { IExecuteFunctions, IHookFunctions, ILoadOptionsFunctions } from 'n
  */
 export async function twakeApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 	body: object,
-	query?: object,
+	query?: IDataObject,
 	uri?: string,
 ) {
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {},
 		method,
 		body,
@@ -29,5 +35,5 @@ export async function twakeApiRequest(
 	// 	options.uri = `${credentials!.hostUrl}/api/v1${resource}`;
 	// }
 
-	return this.helpers.requestWithAuthentication.call(this, 'twakeCloudApi', options);
+	return await this.helpers.requestWithAuthentication.call(this, 'twakeCloudApi', options);
 }
diff --git a/packages/nodes-base/nodes/Twilio/GenericFunctions.ts b/packages/nodes-base/nodes/Twilio/GenericFunctions.ts
index af6007d29e472..4f18bbccf5ff0 100644
--- a/packages/nodes-base/nodes/Twilio/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Twilio/GenericFunctions.ts
@@ -1,6 +1,12 @@
-import type { IExecuteFunctions, IHookFunctions, IDataObject } from 'n8n-workflow';
-
-import type { OptionsWithUri } from 'request';
+import type {
+	IExecuteFunctions,
+	IHookFunctions,
+	IDataObject,
+	IHttpRequestMethods,
+	IRequestOptions,
+	IHttpRequestOptions,
+	ILoadOptionsFunctions,
+} from 'n8n-workflow';
 
 /**
  * Make an API request to Twilio
@@ -8,7 +14,7 @@ import type { OptionsWithUri } from 'request';
  */
 export async function twilioApiRequest(
 	this: IHookFunctions | IExecuteFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject,
 	query?: IDataObject,
@@ -25,7 +31,7 @@ export async function twilioApiRequest(
 		query = {};
 	}
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		method,
 		form: body,
 		qs: query,
@@ -33,7 +39,25 @@ export async function twilioApiRequest(
 		json: true,
 	};
 
-	return this.helpers.requestWithAuthentication.call(this, 'twilioApi', options);
+	return await this.helpers.requestWithAuthentication.call(this, 'twilioApi', options);
+}
+
+export async function twilioTriggerApiRequest(
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
+	endpoint: string,
+	body: FormData | IDataObject = {},
+): Promise<any> {
+	const options: IHttpRequestOptions = {
+		method,
+		body,
+		headers: {
+			'Content-Type': 'application/x-www-form-urlencoded',
+		},
+		url: `https://events.twilio.com/v1/${endpoint}`,
+		json: true,
+	};
+	return await this.helpers.requestWithAuthentication.call(this, 'twilioApi', options);
 }
 
 const XML_CHAR_MAP: { [key: string]: string } = {
diff --git a/packages/nodes-base/nodes/Twilio/Twilio.node.ts b/packages/nodes-base/nodes/Twilio/Twilio.node.ts
index 55de035ead1f3..a07e525f2a4e8 100644
--- a/packages/nodes-base/nodes/Twilio/Twilio.node.ts
+++ b/packages/nodes-base/nodes/Twilio/Twilio.node.ts
@@ -4,6 +4,7 @@ import type {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
@@ -212,7 +213,7 @@ export class Twilio implements INodeType {
 		// For Query string
 		let qs: IDataObject;
 
-		let requestMethod: string;
+		let requestMethod: IHttpRequestMethods;
 		let endpoint: string;
 
 		for (let i = 0; i < items.length; i++) {
diff --git a/packages/nodes-base/nodes/Twilio/TwilioTrigger.node.json b/packages/nodes-base/nodes/Twilio/TwilioTrigger.node.json
new file mode 100644
index 0000000000000..44182e29c53d7
--- /dev/null
+++ b/packages/nodes-base/nodes/Twilio/TwilioTrigger.node.json
@@ -0,0 +1,19 @@
+{
+	"node": "n8n-nodes-base.twilioTrigger",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"categories": ["Communication", "Development"],
+	"resources": {
+		"credentialDocumentation": [
+			{
+				"url": "https://docs.n8n.io/credentials/twilio"
+			}
+		],
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.twiliotrigger/"
+			}
+		]
+	},
+	"alias": ["SMS", "Phone", "Voice"]
+}
diff --git a/packages/nodes-base/nodes/Twilio/TwilioTrigger.node.ts b/packages/nodes-base/nodes/Twilio/TwilioTrigger.node.ts
new file mode 100644
index 0000000000000..4bf3d253d697d
--- /dev/null
+++ b/packages/nodes-base/nodes/Twilio/TwilioTrigger.node.ts
@@ -0,0 +1,196 @@
+import type {
+	IHookFunctions,
+	IWebhookFunctions,
+	INodeType,
+	INodeTypeDescription,
+	IWebhookResponseData,
+} from 'n8n-workflow';
+
+import { twilioTriggerApiRequest } from './GenericFunctions';
+
+export class TwilioTrigger implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Twilio Trigger',
+		name: 'twilioTrigger',
+		icon: 'file:twilio.svg',
+		group: ['trigger'],
+		version: [1],
+		defaultVersion: 1,
+		subtitle: '=Updates: {{$parameter["updates"].join(", ")}}',
+		description: 'Starts the workflow on a Twilio update',
+		defaults: {
+			name: 'Twilio Trigger',
+		},
+		inputs: [],
+		outputs: ['main'],
+		credentials: [
+			{
+				name: 'twilioApi',
+				required: true,
+			},
+		],
+		webhooks: [
+			{
+				name: 'default',
+				httpMethod: 'POST',
+				responseMode: 'onReceived',
+				path: 'webhook',
+			},
+		],
+		properties: [
+			{
+				displayName: 'Trigger On',
+				name: 'updates',
+				type: 'multiOptions',
+				options: [
+					{
+						name: 'New SMS',
+						value: 'com.twilio.messaging.inbound-message.received',
+						description: 'When an SMS message is received',
+					},
+					{
+						name: 'New Call',
+						value: 'com.twilio.voice.insights.call-summary.complete',
+						description: 'When a call is received',
+					},
+				],
+				required: true,
+				default: [],
+			},
+			{
+				displayName: "The 'New Call' event may take up to thirty minutes to be triggered",
+				name: 'callTriggerNotice',
+				type: 'notice',
+				default: '',
+				displayOptions: {
+					show: {
+						updates: ['com.twilio.voice.insights.call-summary.complete'],
+					},
+				},
+			},
+		],
+	};
+
+	webhookMethods = {
+		default: {
+			async checkExists(this: IHookFunctions): Promise<boolean> {
+				const webhookUrl = this.getNodeWebhookUrl('default');
+
+				const { sinks } = (await twilioTriggerApiRequest.call(this, 'GET', 'Sinks')) || {};
+
+				const sink = sinks.find(
+					(entry: { sink_configuration: { destination: string | undefined } }) =>
+						entry.sink_configuration.destination === webhookUrl,
+				);
+
+				if (sink) {
+					const { subscriptions } =
+						(await twilioTriggerApiRequest.call(this, 'GET', 'Subscriptions')) || {};
+
+					const subscription = subscriptions.find(
+						(entry: { sink_sid: any }) => entry.sink_sid === sink.sid,
+					);
+
+					if (subscription) {
+						const { types } =
+							(await twilioTriggerApiRequest.call(
+								this,
+								'GET',
+								`Subscriptions/${subscription.sid}/SubscribedEvents`,
+							)) || {};
+
+						const typesFound = types.map((type: { type: any }) => type.type);
+
+						const allowedUpdates = this.getNodeParameter('updates') as string[];
+
+						if (typesFound.sort().join(',') === allowedUpdates.sort().join(',')) {
+							return true;
+						} else {
+							return false;
+						}
+					}
+				}
+				return false;
+			},
+
+			async create(this: IHookFunctions): Promise<boolean> {
+				const workflowData = this.getWorkflowStaticData('node');
+				const webhookUrl = this.getNodeWebhookUrl('default');
+
+				const allowedUpdates = this.getNodeParameter('updates') as string[];
+
+				const bodySink = {
+					Description: 'Sink created by n8n Twilio Trigger Node.',
+					SinkConfiguration: `{	"destination": "${webhookUrl}",	"method": "POST"	}`,
+					SinkType: 'webhook',
+				};
+
+				const sink = await twilioTriggerApiRequest.call(this, 'POST', 'Sinks', bodySink);
+
+				workflowData.sinkId = sink.sid;
+
+				const body = {
+					Description: 'Subscription created by n8n Twilio Trigger Node.',
+					Types: `{ "type": "${allowedUpdates[0]}" }`,
+					SinkSid: sink.sid,
+				};
+
+				const subscription = await twilioTriggerApiRequest.call(
+					this,
+					'POST',
+					'Subscriptions',
+					body,
+				);
+				workflowData.subscriptionId = subscription.sid;
+				// if there is more than one event type add the others on the existing subscription
+				if (allowedUpdates.length > 1) {
+					for (let index = 1; index < allowedUpdates.length; index++) {
+						await twilioTriggerApiRequest.call(
+							this,
+							'POST',
+							`Subscriptions/${workflowData.subscriptionId}/SubscribedEvents`,
+							{
+								Type: allowedUpdates[index],
+							},
+						);
+					}
+				}
+
+				return true;
+			},
+
+			async delete(this: IHookFunctions): Promise<boolean> {
+				const workflowData = this.getWorkflowStaticData('node');
+				const sinkId = workflowData.sinkId;
+				const subscriptionId = workflowData.subscriptionId;
+
+				try {
+					if (sinkId) {
+						await twilioTriggerApiRequest.call(this, 'DELETE', `Sinks/${sinkId}`, {});
+						workflowData.sinkId = '';
+					}
+					if (subscriptionId) {
+						await twilioTriggerApiRequest.call(
+							this,
+							'DELETE',
+							`Subscriptions/${subscriptionId}`,
+							{},
+						);
+						workflowData.subscriptionId = '';
+					}
+				} catch (error) {
+					return false;
+				}
+				return true;
+			},
+		},
+	};
+
+	async webhook(this: IWebhookFunctions): Promise<IWebhookResponseData> {
+		const bodyData = this.getBodyData();
+
+		return {
+			workflowData: [this.helpers.returnJsonArray(bodyData)],
+		};
+	}
+}
diff --git a/packages/nodes-base/nodes/Twilio/twilio.svg b/packages/nodes-base/nodes/Twilio/twilio.svg
index 5055f6372faec..de22b6c6944b7 100644
--- a/packages/nodes-base/nodes/Twilio/twilio.svg
+++ b/packages/nodes-base/nodes/Twilio/twilio.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 65 65" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><g stroke="none" fill="#e31e26" fill-rule="nonzero"><path d="M31.953 0C14.337 0 0 14.337 0 31.953s14.337 31.953 31.953 31.953C49.663 64 64 49.663 64 31.953S49.663 0 31.953 0zm0 55.567c-12.931 0-23.52-10.589-23.52-23.614 0-12.931 10.589-23.52 23.52-23.52 13.025 0 23.614 10.589 23.614 23.52 0 13.025-10.589 23.614-23.614 23.614z"/><use xlink:href="#C"/><use xlink:href="#C" y="15.93"/><path d="M17.335 39.918a6.64 6.64 0 016.653-6.653 6.653 6.653 0 110 13.306 6.64 6.64 0 01-6.653-6.653zm0-15.93a6.64 6.64 0 016.653-6.653 6.64 6.64 0 016.653 6.653 6.64 6.64 0 01-6.653 6.653 6.64 6.64 0 01-6.653-6.653z"/></g></symbol><defs><path id="C" d="M33.265 23.988a6.64 6.64 0 1113.306 0 6.64 6.64 0 11-13.306 0z"/></defs></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round" viewBox="0 0 65 65"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><g fill="#e31e26" fill-rule="nonzero" stroke="none"><path d="M31.953 0C14.337 0 0 14.337 0 31.953s14.337 31.953 31.953 31.953C49.663 64 64 49.663 64 31.953S49.663 0 31.953 0m0 55.567c-12.931 0-23.52-10.589-23.52-23.614 0-12.931 10.589-23.52 23.52-23.52 13.025 0 23.614 10.589 23.614 23.52 0 13.025-10.589 23.614-23.614 23.614"/><use xlink:href="#b"/><use xlink:href="#b" y="15.93"/><path d="M17.335 39.918a6.64 6.64 0 0 1 6.653-6.653 6.653 6.653 0 1 1 0 13.306 6.64 6.64 0 0 1-6.653-6.653m0-15.93a6.64 6.64 0 0 1 6.653-6.653 6.64 6.64 0 0 1 6.653 6.653 6.64 6.64 0 0 1-6.653 6.653 6.64 6.64 0 0 1-6.653-6.653"/></g></symbol><defs><path id="b" d="M33.265 23.988a6.64 6.64 0 1 1 13.306 0 6.64 6.64 0 1 1-13.306 0"/></defs></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Twist/ChannelDescription.ts b/packages/nodes-base/nodes/Twist/ChannelDescription.ts
index 84bcd31da6bbe..afdc772ff4207 100644
--- a/packages/nodes-base/nodes/Twist/ChannelDescription.ts
+++ b/packages/nodes-base/nodes/Twist/ChannelDescription.ts
@@ -179,7 +179,7 @@ export const channelFields: INodeProperties[] = [
 				default: false,
 				description: 'Whether the channel will be marked as public',
 			},
-			// eslint-disable-next-line n8n-nodes-base/node-param-default-missing
+
 			{
 				displayName: 'Temp ID',
 				name: 'temp_id',
diff --git a/packages/nodes-base/nodes/Twist/GenericFunctions.ts b/packages/nodes-base/nodes/Twist/GenericFunctions.ts
index 95a8564d9f778..64a5f803b23f5 100644
--- a/packages/nodes-base/nodes/Twist/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Twist/GenericFunctions.ts
@@ -1,22 +1,22 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IExecuteFunctions,
 	ILoadOptionsFunctions,
 	IDataObject,
 	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function twistApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject = {},
 	qs: IDataObject = {},
 	option: IDataObject = {},
 ) {
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		method,
 		body,
 		qs,
diff --git a/packages/nodes-base/nodes/Twist/Twist.node.ts b/packages/nodes-base/nodes/Twist/Twist.node.ts
index dd046523ec2d4..c5b35aece3462 100644
--- a/packages/nodes-base/nodes/Twist/Twist.node.ts
+++ b/packages/nodes-base/nodes/Twist/Twist.node.ts
@@ -8,6 +8,8 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
+import { v4 as uuid } from 'uuid';
+import moment from 'moment-timezone';
 import { twistApiRequest } from './GenericFunctions';
 
 import { channelFields, channelOperations } from './ChannelDescription';
@@ -19,8 +21,6 @@ import {
 
 import { threadFields, threadOperations } from './ThreadDescription';
 import { commentFields, commentOperations } from './CommentDescription';
-import { v4 as uuid } from 'uuid';
-import moment from 'moment';
 
 export class Twist implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Twitter/GenericFunctions.ts b/packages/nodes-base/nodes/Twitter/GenericFunctions.ts
deleted file mode 100644
index 94194b82436f0..0000000000000
--- a/packages/nodes-base/nodes/Twitter/GenericFunctions.ts
+++ /dev/null
@@ -1,177 +0,0 @@
-import type { OptionsWithUrl } from 'request';
-
-import type {
-	IDataObject,
-	IExecuteFunctions,
-	IExecuteSingleFunctions,
-	IHookFunctions,
-	ILoadOptionsFunctions,
-	JsonObject,
-} from 'n8n-workflow';
-import { NodeApiError, NodeOperationError, sleep } from 'n8n-workflow';
-
-export async function twitterApiRequest(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IHookFunctions,
-	method: string,
-	resource: string,
-	body: IDataObject = {},
-	qs: IDataObject = {},
-	uri?: string,
-	option: IDataObject = {},
-) {
-	let options: OptionsWithUrl = {
-		method,
-		body,
-		qs,
-		url: uri || `https://api.twitter.com/1.1${resource}`,
-		json: true,
-	};
-	try {
-		if (Object.keys(option).length !== 0) {
-			options = Object.assign({}, options, option);
-		}
-		if (Object.keys(body).length === 0) {
-			delete options.body;
-		}
-		if (Object.keys(qs).length === 0) {
-			delete options.qs;
-		}
-		return await this.helpers.requestOAuth1.call(this, 'twitterOAuth1Api', options);
-	} catch (error) {
-		throw new NodeApiError(this.getNode(), error as JsonObject);
-	}
-}
-
-export async function twitterApiRequestAllItems(
-	this: IExecuteFunctions | ILoadOptionsFunctions,
-	propertyName: string,
-	method: string,
-	endpoint: string,
-	body: IDataObject = {},
-	query: IDataObject = {},
-) {
-	const returnData: IDataObject[] = [];
-
-	let responseData;
-
-	query.count = 100;
-
-	do {
-		responseData = await twitterApiRequest.call(this, method, endpoint, body, query);
-		query.since_id = responseData.search_metadata.max_id;
-		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
-	} while (responseData.search_metadata?.next_results);
-
-	return returnData;
-}
-
-export function chunks(buffer: Buffer, chunkSize: number) {
-	const result = [];
-	const len = buffer.length;
-	let i = 0;
-
-	while (i < len) {
-		result.push(buffer.slice(i, (i += chunkSize)));
-	}
-
-	return result;
-}
-
-export async function uploadAttachments(
-	this: IExecuteFunctions,
-	binaryProperties: string[],
-	i: number,
-) {
-	const uploadUri = 'https://upload.twitter.com/1.1/media/upload.json';
-
-	const media: IDataObject[] = [];
-
-	for (const binaryPropertyName of binaryProperties) {
-		let attachmentBody = {};
-		let response: IDataObject = {};
-
-		const binaryData = this.helpers.assertBinaryData(i, binaryPropertyName);
-		const dataBuffer = await this.helpers.getBinaryDataBuffer(i, binaryPropertyName);
-
-		const isAnimatedWebp = dataBuffer.toString().indexOf('ANMF') !== -1;
-		const isImage = binaryData.mimeType.includes('image');
-
-		if (isImage && isAnimatedWebp) {
-			throw new NodeOperationError(
-				this.getNode(),
-				'Animated .webp images are not supported use .gif instead',
-				{ itemIndex: i },
-			);
-		}
-
-		if (isImage) {
-			const form = {
-				media_data: binaryData.data,
-			};
-
-			response = await twitterApiRequest.call(this, 'POST', '', {}, {}, uploadUri, {
-				form,
-			});
-
-			media.push(response);
-		} else {
-			// https://developer.twitter.com/en/docs/media/upload-media/api-reference/post-media-upload-init
-			attachmentBody = {
-				command: 'INIT',
-				total_bytes: dataBuffer.byteLength,
-				media_type: binaryData.mimeType,
-			};
-
-			response = await twitterApiRequest.call(this, 'POST', '', {}, {}, uploadUri, {
-				form: attachmentBody,
-			});
-
-			const mediaId = response.media_id_string;
-
-			// break the data on 5mb chunks (max size that can be uploaded at once)
-
-			const binaryParts = chunks(dataBuffer, 5242880);
-
-			let index = 0;
-
-			for (const binaryPart of binaryParts) {
-				//https://developer.twitter.com/en/docs/media/upload-media/api-reference/post-media-upload-append
-
-				attachmentBody = {
-					name: binaryData.fileName,
-					command: 'APPEND',
-					media_id: mediaId,
-					media_data: Buffer.from(binaryPart).toString('base64'),
-					segment_index: index,
-				};
-
-				response = await twitterApiRequest.call(this, 'POST', '', {}, {}, uploadUri, {
-					form: attachmentBody,
-				});
-
-				index++;
-			}
-
-			//https://developer.twitter.com/en/docs/media/upload-media/api-reference/post-media-upload-finalize
-
-			attachmentBody = {
-				command: 'FINALIZE',
-				media_id: mediaId,
-			};
-
-			response = await twitterApiRequest.call(this, 'POST', '', {}, {}, uploadUri, {
-				form: attachmentBody,
-			});
-
-			// data has not been uploaded yet, so wait for it to be ready
-			if (response.processing_info) {
-				const { check_after_secs } = response.processing_info as IDataObject;
-				await sleep((check_after_secs as number) * 1000);
-			}
-
-			media.push(response);
-		}
-
-		return media;
-	}
-}
diff --git a/packages/nodes-base/nodes/Twitter/Twitter.node.json b/packages/nodes-base/nodes/Twitter/Twitter.node.json
index 7282e9b2ce7d3..91d0d19d861fa 100644
--- a/packages/nodes-base/nodes/Twitter/Twitter.node.json
+++ b/packages/nodes-base/nodes/Twitter/Twitter.node.json
@@ -2,7 +2,7 @@
 	"node": "n8n-nodes-base.twitter",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Marketing & Content"],
+	"categories": ["Marketing"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -31,5 +31,6 @@
 				"url": "https://n8n.io/blog/5-workflow-automations-for-mattermost-that-we-love-at-n8n/"
 			}
 		]
-	}
+	},
+	"alias": ["Tweet", "Twitter", "X", "X API"]
 }
diff --git a/packages/nodes-base/nodes/Twitter/Twitter.node.ts b/packages/nodes-base/nodes/Twitter/Twitter.node.ts
index 4f49f7a414884..922b29f4a220e 100644
--- a/packages/nodes-base/nodes/Twitter/Twitter.node.ts
+++ b/packages/nodes-base/nodes/Twitter/Twitter.node.ts
@@ -1,335 +1,27 @@
-import type {
-	IDataObject,
-	IExecuteFunctions,
-	ILoadOptionsFunctions,
-	INodeExecutionData,
-	INodePropertyOptions,
-	INodeType,
-	INodeTypeDescription,
-	JsonObject,
-} from 'n8n-workflow';
-
-import { directMessageFields, directMessageOperations } from './DirectMessageDescription';
-
-import { tweetFields, tweetOperations } from './TweetDescription';
-
-import {
-	twitterApiRequest,
-	twitterApiRequestAllItems,
-	uploadAttachments,
-} from './GenericFunctions';
-
-import type { ITweet, ITweetCreate } from './TweetInterface';
-
-import ISO6391 from 'iso-639-1';
-
-export class Twitter implements INodeType {
-	description: INodeTypeDescription = {
-		displayName: 'Twitter',
-		name: 'twitter',
-		icon: 'file:twitter.svg',
-		group: ['input', 'output'],
-		version: 1,
-		description: 'Consume Twitter API',
-		subtitle: '={{$parameter["operation"] + ":" + $parameter["resource"]}}',
-		defaults: {
-			name: 'Twitter',
-		},
-		inputs: ['main'],
-		outputs: ['main'],
-		credentials: [
-			{
-				name: 'twitterOAuth1Api',
-				required: true,
-			},
-		],
-		properties: [
-			{
-				displayName: 'Resource',
-				name: 'resource',
-				type: 'options',
-				noDataExpression: true,
-				options: [
-					{
-						name: 'Direct Message',
-						value: 'directMessage',
-					},
-					{
-						name: 'Tweet',
-						value: 'tweet',
-					},
-				],
-				default: 'tweet',
-			},
-			// DIRECT MESSAGE
-			...directMessageOperations,
-			...directMessageFields,
-			// TWEET
-			...tweetOperations,
-			...tweetFields,
-		],
-	};
-
-	methods = {
-		loadOptions: {
-			// Get all the available languages to display them to user so that they can
-			// select them easily
-			async getLanguages(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const languages = ISO6391.getAllNames();
-				for (const language of languages) {
-					const languageName = language;
-					const languageId = ISO6391.getCode(language);
-					returnData.push({
-						name: languageName,
-						value: languageId,
-					});
-				}
-				return returnData;
-			},
-		},
-	};
-
-	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
-		const items = this.getInputData();
-		const returnData: INodeExecutionData[] = [];
-		const length = items.length;
-		let responseData;
-		const resource = this.getNodeParameter('resource', 0);
-		const operation = this.getNodeParameter('operation', 0);
-		for (let i = 0; i < length; i++) {
-			try {
-				if (resource === 'directMessage') {
-					//https://developer.twitter.com/en/docs/twitter-api/v1/direct-messages/sending-and-receiving/api-reference/new-event
-					if (operation === 'create') {
-						const userId = this.getNodeParameter('userId', i) as string;
-						const text = this.getNodeParameter('text', i) as string;
-						const additionalFields = this.getNodeParameter('additionalFields', i);
-						const body: ITweetCreate = {
-							type: 'message_create',
-							message_create: {
-								target: {
-									recipient_id: userId,
-								},
-								message_data: {
-									text,
-									attachment: {},
-								},
-							},
-						};
-
-						if (additionalFields.attachment) {
-							const attachment = additionalFields.attachment as string;
-
-							const attachmentProperties: string[] = attachment.split(',').map((propertyName) => {
-								return propertyName.trim();
-							});
-
-							const medias = await uploadAttachments.call(this, attachmentProperties, i);
-							body.message_create.message_data.attachment = {
-								type: 'media',
-								//@ts-ignore
-								media: { id: medias[0].media_id_string },
-							};
-						} else {
-							delete body.message_create.message_data.attachment;
-						}
-
-						responseData = await twitterApiRequest.call(
-							this,
-							'POST',
-							'/direct_messages/events/new.json',
-							{ event: body },
-						);
-
-						responseData = responseData.event;
-					}
-				}
-				if (resource === 'tweet') {
-					// https://developer.twitter.com/en/docs/tweets/post-and-engage/api-reference/post-statuses-update
-					if (operation === 'create') {
-						const text = this.getNodeParameter('text', i) as string;
-						const additionalFields = this.getNodeParameter('additionalFields', i);
-						const body: ITweet = {
-							status: text,
-						};
-
-						if (additionalFields.inReplyToStatusId) {
-							body.in_reply_to_status_id = additionalFields.inReplyToStatusId as string;
-							body.auto_populate_reply_metadata = true;
-						}
-
-						if (additionalFields.attachments) {
-							const attachments = additionalFields.attachments as string;
-
-							const attachmentProperties: string[] = attachments.split(',').map((propertyName) => {
-								return propertyName.trim();
-							});
-
-							const medias = await uploadAttachments.call(this, attachmentProperties, i);
-
-							body.media_ids = (medias as IDataObject[])
-								.map((media: IDataObject) => media.media_id_string)
-								.join(',');
-						}
-
-						if (additionalFields.possiblySensitive) {
-							body.possibly_sensitive = additionalFields.possiblySensitive as boolean;
-						}
-
-						if (additionalFields.displayCoordinates) {
-							body.display_coordinates = additionalFields.displayCoordinates as boolean;
-						}
-
-						if (additionalFields.locationFieldsUi) {
-							const locationUi = additionalFields.locationFieldsUi as IDataObject;
-							if (locationUi.locationFieldsValues) {
-								const values = locationUi.locationFieldsValues as IDataObject;
-								body.lat = parseFloat(values.latitude as string);
-								body.long = parseFloat(values.longitude as string);
-							}
-						}
-
-						responseData = await twitterApiRequest.call(
-							this,
-							'POST',
-							'/statuses/update.json',
-							{},
-							body as unknown as IDataObject,
-						);
-					}
-					// https://developer.twitter.com/en/docs/twitter-api/v1/tweets/post-and-engage/api-reference/post-statuses-destroy-id
-					if (operation === 'delete') {
-						const tweetId = this.getNodeParameter('tweetId', i) as string;
-
-						responseData = await twitterApiRequest.call(
-							this,
-							'POST',
-							`/statuses/destroy/${tweetId}.json`,
-							{},
-							{},
-						);
-					}
-					// https://developer.twitter.com/en/docs/tweets/search/api-reference/get-search-tweets
-					if (operation === 'search') {
-						const q = this.getNodeParameter('searchText', i) as string;
-						const returnAll = this.getNodeParameter('returnAll', i);
-						const additionalFields = this.getNodeParameter('additionalFields', i);
-						const qs: IDataObject = {
-							q,
-						};
-
-						if (additionalFields.includeEntities) {
-							qs.include_entities = additionalFields.includeEntities as boolean;
-						}
-
-						if (additionalFields.resultType) {
-							qs.response_type = additionalFields.resultType as string;
-						}
-
-						if (additionalFields.until) {
-							qs.until = additionalFields.until as string;
-						}
-
-						if (additionalFields.lang) {
-							qs.lang = additionalFields.lang as string;
-						}
-
-						if (additionalFields.locationFieldsUi) {
-							const locationUi = additionalFields.locationFieldsUi as IDataObject;
-							if (locationUi.locationFieldsValues) {
-								const values = locationUi.locationFieldsValues as IDataObject;
-								qs.geocode = `${values.latitude as string},${values.longitude as string},${
-									values.distance
-								}${values.radius}`;
-							}
-						}
-
-						qs.tweet_mode = additionalFields.tweetMode || 'compat';
-
-						if (returnAll) {
-							responseData = await twitterApiRequestAllItems.call(
-								this,
-								'statuses',
-								'GET',
-								'/search/tweets.json',
-								{},
-								qs,
-							);
-						} else {
-							qs.count = this.getNodeParameter('limit', 0);
-							responseData = await twitterApiRequest.call(
-								this,
-								'GET',
-								'/search/tweets.json',
-								{},
-								qs,
-							);
-							responseData = responseData.statuses;
-						}
-					}
-					//https://developer.twitter.com/en/docs/twitter-api/v1/tweets/post-and-engage/api-reference/post-favorites-create
-					if (operation === 'like') {
-						const tweetId = this.getNodeParameter('tweetId', i) as string;
-						const additionalFields = this.getNodeParameter('additionalFields', i);
-
-						const qs: IDataObject = {
-							id: tweetId,
-						};
-
-						if (additionalFields.includeEntities) {
-							qs.include_entities = additionalFields.includeEntities as boolean;
-						}
-
-						responseData = await twitterApiRequest.call(
-							this,
-							'POST',
-							'/favorites/create.json',
-							{},
-							qs,
-						);
-					}
-					//https://developer.twitter.com/en/docs/twitter-api/v1/tweets/post-and-engage/api-reference/post-statuses-retweet-id
-					if (operation === 'retweet') {
-						const tweetId = this.getNodeParameter('tweetId', i) as string;
-						const additionalFields = this.getNodeParameter('additionalFields', i);
-
-						const qs: IDataObject = {
-							id: tweetId,
-						};
-
-						if (additionalFields.trimUser) {
-							qs.trim_user = additionalFields.trimUser as boolean;
-						}
-
-						responseData = await twitterApiRequest.call(
-							this,
-							'POST',
-							`/statuses/retweet/${tweetId}.json`,
-							{},
-							qs,
-						);
-					}
-				}
-				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData as IDataObject[]),
-					{ itemData: { item: i } },
-				);
-				returnData.push(...executionData);
-			} catch (error) {
-				if (this.continueOnFail()) {
-					const executionErrorData = {
-						json: {
-							error: (error as JsonObject).message,
-						},
-					};
-					returnData.push(executionErrorData);
-					continue;
-				}
-				throw error;
-			}
-		}
-
-		return this.prepareOutputData(returnData);
+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 {
+	constructor() {
+		const baseDescription: INodeTypeBaseDescription = {
+			displayName: 'X (Formerly Twitter)',
+			name: 'twitter',
+			icon: 'file:x.svg',
+			group: ['output'],
+			subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+			description: 'Consume the X API',
+			defaultVersion: 2,
+		};
+
+		const nodeVersions: IVersionedNodeType['nodeVersions'] = {
+			1: new TwitterV1(baseDescription),
+			2: new TwitterV2(baseDescription),
+		};
+
+		super(nodeVersions, baseDescription);
 	}
 }
diff --git a/packages/nodes-base/nodes/Twitter/DirectMessageDescription.ts b/packages/nodes-base/nodes/Twitter/V1/DirectMessageDescription.ts
similarity index 100%
rename from packages/nodes-base/nodes/Twitter/DirectMessageDescription.ts
rename to packages/nodes-base/nodes/Twitter/V1/DirectMessageDescription.ts
diff --git a/packages/nodes-base/nodes/Twitter/V1/GenericFunctions.ts b/packages/nodes-base/nodes/Twitter/V1/GenericFunctions.ts
new file mode 100644
index 0000000000000..40a19fea00718
--- /dev/null
+++ b/packages/nodes-base/nodes/Twitter/V1/GenericFunctions.ts
@@ -0,0 +1,176 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	IHookFunctions,
+	ILoadOptionsFunctions,
+	JsonObject,
+	IRequestOptions,
+	IHttpRequestMethods,
+} from 'n8n-workflow';
+import { NodeApiError, NodeOperationError, sleep } from 'n8n-workflow';
+
+export async function twitterApiRequest(
+	this: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions,
+	method: IHttpRequestMethods,
+	resource: string,
+	body: IDataObject = {},
+	qs: IDataObject = {},
+	uri?: string,
+	option: IDataObject = {},
+) {
+	let options: IRequestOptions = {
+		method,
+		body,
+		qs,
+		url: uri || `https://api.twitter.com/1.1${resource}`,
+		json: true,
+	};
+	try {
+		if (Object.keys(option).length !== 0) {
+			options = Object.assign({}, options, option);
+		}
+		if (Object.keys(body).length === 0) {
+			delete options.body;
+		}
+		if (Object.keys(qs).length === 0) {
+			delete options.qs;
+		}
+		return await this.helpers.requestOAuth1.call(this, 'twitterOAuth1Api', options);
+	} catch (error) {
+		throw new NodeApiError(this.getNode(), error as JsonObject);
+	}
+}
+
+export async function twitterApiRequestAllItems(
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	propertyName: string,
+	method: IHttpRequestMethods,
+	endpoint: string,
+	body: IDataObject = {},
+	query: IDataObject = {},
+) {
+	const returnData: IDataObject[] = [];
+
+	let responseData;
+
+	query.count = 100;
+
+	do {
+		responseData = await twitterApiRequest.call(this, method, endpoint, body, query);
+		query.since_id = responseData.search_metadata.max_id;
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
+	} while (responseData.search_metadata?.next_results);
+
+	return returnData;
+}
+
+export function chunks(buffer: Buffer, chunkSize: number) {
+	const result = [];
+	const len = buffer.length;
+	let i = 0;
+
+	while (i < len) {
+		result.push(buffer.slice(i, (i += chunkSize)));
+	}
+
+	return result;
+}
+
+export async function uploadAttachments(
+	this: IExecuteFunctions,
+	binaryProperties: string[],
+	i: number,
+) {
+	const uploadUri = 'https://upload.twitter.com/1.1/media/upload.json';
+
+	const media: IDataObject[] = [];
+
+	for (const binaryPropertyName of binaryProperties) {
+		let attachmentBody = {};
+		let response: IDataObject = {};
+
+		const binaryData = this.helpers.assertBinaryData(i, binaryPropertyName);
+		const dataBuffer = await this.helpers.getBinaryDataBuffer(i, binaryPropertyName);
+
+		const isAnimatedWebp = dataBuffer.toString().indexOf('ANMF') !== -1;
+		const isImage = binaryData.mimeType.includes('image');
+
+		if (isImage && isAnimatedWebp) {
+			throw new NodeOperationError(
+				this.getNode(),
+				'Animated .webp images are not supported use .gif instead',
+				{ itemIndex: i },
+			);
+		}
+
+		if (isImage) {
+			const form = {
+				media_data: binaryData.data,
+			};
+
+			response = await twitterApiRequest.call(this, 'POST', '', {}, {}, uploadUri, {
+				form,
+			});
+
+			media.push(response);
+		} else {
+			// https://developer.twitter.com/en/docs/media/upload-media/api-reference/post-media-upload-init
+			attachmentBody = {
+				command: 'INIT',
+				total_bytes: dataBuffer.byteLength,
+				media_type: binaryData.mimeType,
+			};
+
+			response = await twitterApiRequest.call(this, 'POST', '', {}, {}, uploadUri, {
+				form: attachmentBody,
+			});
+
+			const mediaId = response.media_id_string;
+
+			// break the data on 5mb chunks (max size that can be uploaded at once)
+
+			const binaryParts = chunks(dataBuffer, 5242880);
+
+			let index = 0;
+
+			for (const binaryPart of binaryParts) {
+				//https://developer.twitter.com/en/docs/media/upload-media/api-reference/post-media-upload-append
+
+				attachmentBody = {
+					name: binaryData.fileName,
+					command: 'APPEND',
+					media_id: mediaId,
+					media_data: Buffer.from(binaryPart).toString('base64'),
+					segment_index: index,
+				};
+
+				response = await twitterApiRequest.call(this, 'POST', '', {}, {}, uploadUri, {
+					form: attachmentBody,
+				});
+
+				index++;
+			}
+
+			//https://developer.twitter.com/en/docs/media/upload-media/api-reference/post-media-upload-finalize
+
+			attachmentBody = {
+				command: 'FINALIZE',
+				media_id: mediaId,
+			};
+
+			response = await twitterApiRequest.call(this, 'POST', '', {}, {}, uploadUri, {
+				form: attachmentBody,
+			});
+
+			// data has not been uploaded yet, so wait for it to be ready
+			if (response.processing_info) {
+				const { check_after_secs } = response.processing_info as IDataObject;
+				await sleep((check_after_secs as number) * 1000);
+			}
+
+			media.push(response);
+		}
+
+		return media;
+	}
+}
diff --git a/packages/nodes-base/nodes/Twitter/TweetDescription.ts b/packages/nodes-base/nodes/Twitter/V1/TweetDescription.ts
similarity index 100%
rename from packages/nodes-base/nodes/Twitter/TweetDescription.ts
rename to packages/nodes-base/nodes/Twitter/V1/TweetDescription.ts
diff --git a/packages/nodes-base/nodes/Twitter/TweetInterface.ts b/packages/nodes-base/nodes/Twitter/V1/TweetInterface.ts
similarity index 100%
rename from packages/nodes-base/nodes/Twitter/TweetInterface.ts
rename to packages/nodes-base/nodes/Twitter/V1/TweetInterface.ts
diff --git a/packages/nodes-base/nodes/Twitter/V1/TwitterV1.node.ts b/packages/nodes-base/nodes/Twitter/V1/TwitterV1.node.ts
new file mode 100644
index 0000000000000..0757de3e12580
--- /dev/null
+++ b/packages/nodes-base/nodes/Twitter/V1/TwitterV1.node.ts
@@ -0,0 +1,336 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
+	INodeExecutionData,
+	INodePropertyOptions,
+	INodeType,
+	INodeTypeBaseDescription,
+	INodeTypeDescription,
+	JsonObject,
+} 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 type { ITweet, ITweetCreate } from './TweetInterface';
+
+export class TwitterV1 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDecription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDecription,
+			version: 1,
+			description: 'Consume Twitter API',
+			subtitle: '={{$parameter["operation"] + ":" + $parameter["resource"]}}',
+			defaults: {
+				name: 'Twitter',
+			},
+			inputs: ['main'],
+			outputs: ['main'],
+			credentials: [
+				{
+					name: 'twitterOAuth1Api',
+					required: true,
+				},
+			],
+			properties: [
+				{
+					displayName: 'Resource',
+					name: 'resource',
+					type: 'options',
+					noDataExpression: true,
+					options: [
+						{
+							name: 'Direct Message',
+							value: 'directMessage',
+						},
+						{
+							name: 'Tweet',
+							value: 'tweet',
+						},
+					],
+					default: 'tweet',
+				},
+				// DIRECT MESSAGE
+				...directMessageOperations,
+				...directMessageFields,
+				// TWEET
+				...tweetOperations,
+				...tweetFields,
+			],
+		};
+	}
+
+	methods = {
+		loadOptions: {
+			// Get all the available languages to display them to user so that they can
+			// select them easily
+			async getLanguages(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const languages = ISO6391.getAllNames();
+				for (const language of languages) {
+					const languageName = language;
+					const languageId = ISO6391.getCode(language);
+					returnData.push({
+						name: languageName,
+						value: languageId,
+					});
+				}
+				return returnData;
+			},
+		},
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = this.getInputData();
+		const returnData: INodeExecutionData[] = [];
+		const length = items.length;
+		let responseData;
+		const resource = this.getNodeParameter('resource', 0);
+		const operation = this.getNodeParameter('operation', 0);
+		for (let i = 0; i < length; i++) {
+			try {
+				if (resource === 'directMessage') {
+					//https://developer.twitter.com/en/docs/twitter-api/v1/direct-messages/sending-and-receiving/api-reference/new-event
+					if (operation === 'create') {
+						const userId = this.getNodeParameter('userId', i) as string;
+						const text = this.getNodeParameter('text', i) as string;
+						const additionalFields = this.getNodeParameter('additionalFields', i);
+						const body: ITweetCreate = {
+							type: 'message_create',
+							message_create: {
+								target: {
+									recipient_id: userId,
+								},
+								message_data: {
+									text,
+									attachment: {},
+								},
+							},
+						};
+
+						if (additionalFields.attachment) {
+							const attachment = additionalFields.attachment as string;
+
+							const attachmentProperties: string[] = attachment.split(',').map((propertyName) => {
+								return propertyName.trim();
+							});
+
+							const medias = await uploadAttachments.call(this, attachmentProperties, i);
+							body.message_create.message_data.attachment = {
+								type: 'media',
+								//@ts-ignore
+								media: { id: medias[0].media_id_string },
+							};
+						} else {
+							delete body.message_create.message_data.attachment;
+						}
+
+						responseData = await twitterApiRequest.call(
+							this,
+							'POST',
+							'/direct_messages/events/new.json',
+							{ event: body },
+						);
+
+						responseData = responseData.event;
+					}
+				}
+				if (resource === 'tweet') {
+					// https://developer.twitter.com/en/docs/tweets/post-and-engage/api-reference/post-statuses-update
+					if (operation === 'create') {
+						const text = this.getNodeParameter('text', i) as string;
+						const additionalFields = this.getNodeParameter('additionalFields', i);
+						const body: ITweet = {
+							status: text,
+						};
+
+						if (additionalFields.inReplyToStatusId) {
+							body.in_reply_to_status_id = additionalFields.inReplyToStatusId as string;
+							body.auto_populate_reply_metadata = true;
+						}
+
+						if (additionalFields.attachments) {
+							const attachments = additionalFields.attachments as string;
+
+							const attachmentProperties: string[] = attachments.split(',').map((propertyName) => {
+								return propertyName.trim();
+							});
+
+							const medias = await uploadAttachments.call(this, attachmentProperties, i);
+
+							body.media_ids = (medias as IDataObject[])
+								.map((media: IDataObject) => media.media_id_string)
+								.join(',');
+						}
+
+						if (additionalFields.possiblySensitive) {
+							body.possibly_sensitive = additionalFields.possiblySensitive as boolean;
+						}
+
+						if (additionalFields.displayCoordinates) {
+							body.display_coordinates = additionalFields.displayCoordinates as boolean;
+						}
+
+						if (additionalFields.locationFieldsUi) {
+							const locationUi = additionalFields.locationFieldsUi as IDataObject;
+							if (locationUi.locationFieldsValues) {
+								const values = locationUi.locationFieldsValues as IDataObject;
+								body.lat = parseFloat(values.latitude as string);
+								body.long = parseFloat(values.longitude as string);
+							}
+						}
+
+						responseData = await twitterApiRequest.call(
+							this,
+							'POST',
+							'/statuses/update.json',
+							{},
+							body as unknown as IDataObject,
+						);
+					}
+					// https://developer.twitter.com/en/docs/twitter-api/v1/tweets/post-and-engage/api-reference/post-statuses-destroy-id
+					if (operation === 'delete') {
+						const tweetId = this.getNodeParameter('tweetId', i) as string;
+
+						responseData = await twitterApiRequest.call(
+							this,
+							'POST',
+							`/statuses/destroy/${tweetId}.json`,
+							{},
+							{},
+						);
+					}
+					// https://developer.twitter.com/en/docs/tweets/search/api-reference/get-search-tweets
+					if (operation === 'search') {
+						const q = this.getNodeParameter('searchText', i) as string;
+						const returnAll = this.getNodeParameter('returnAll', i);
+						const additionalFields = this.getNodeParameter('additionalFields', i);
+						const qs: IDataObject = {
+							q,
+						};
+
+						if (additionalFields.includeEntities) {
+							qs.include_entities = additionalFields.includeEntities as boolean;
+						}
+
+						if (additionalFields.resultType) {
+							qs.response_type = additionalFields.resultType as string;
+						}
+
+						if (additionalFields.until) {
+							qs.until = additionalFields.until as string;
+						}
+
+						if (additionalFields.lang) {
+							qs.lang = additionalFields.lang as string;
+						}
+
+						if (additionalFields.locationFieldsUi) {
+							const locationUi = additionalFields.locationFieldsUi as IDataObject;
+							if (locationUi.locationFieldsValues) {
+								const values = locationUi.locationFieldsValues as IDataObject;
+								qs.geocode = `${values.latitude as string},${values.longitude as string},${
+									values.distance
+								}${values.radius}`;
+							}
+						}
+
+						qs.tweet_mode = additionalFields.tweetMode || 'compat';
+
+						if (returnAll) {
+							responseData = await twitterApiRequestAllItems.call(
+								this,
+								'statuses',
+								'GET',
+								'/search/tweets.json',
+								{},
+								qs,
+							);
+						} else {
+							qs.count = this.getNodeParameter('limit', 0);
+							responseData = await twitterApiRequest.call(
+								this,
+								'GET',
+								'/search/tweets.json',
+								{},
+								qs,
+							);
+							responseData = responseData.statuses;
+						}
+					}
+					//https://developer.twitter.com/en/docs/twitter-api/v1/tweets/post-and-engage/api-reference/post-favorites-create
+					if (operation === 'like') {
+						const tweetId = this.getNodeParameter('tweetId', i) as string;
+						const additionalFields = this.getNodeParameter('additionalFields', i);
+
+						const qs: IDataObject = {
+							id: tweetId,
+						};
+
+						if (additionalFields.includeEntities) {
+							qs.include_entities = additionalFields.includeEntities as boolean;
+						}
+
+						responseData = await twitterApiRequest.call(
+							this,
+							'POST',
+							'/favorites/create.json',
+							{},
+							qs,
+						);
+					}
+					//https://developer.twitter.com/en/docs/twitter-api/v1/tweets/post-and-engage/api-reference/post-statuses-retweet-id
+					if (operation === 'retweet') {
+						const tweetId = this.getNodeParameter('tweetId', i) as string;
+						const additionalFields = this.getNodeParameter('additionalFields', i);
+
+						const qs: IDataObject = {
+							id: tweetId,
+						};
+
+						if (additionalFields.trimUser) {
+							qs.trim_user = additionalFields.trimUser as boolean;
+						}
+
+						responseData = await twitterApiRequest.call(
+							this,
+							'POST',
+							`/statuses/retweet/${tweetId}.json`,
+							{},
+							qs,
+						);
+					}
+				}
+				const executionData = this.helpers.constructExecutionMetaData(
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
+					{ itemData: { item: i } },
+				);
+				returnData.push(...executionData);
+			} catch (error) {
+				if (this.continueOnFail()) {
+					const executionErrorData = {
+						json: {
+							error: (error as JsonObject).message,
+						},
+					};
+					returnData.push(executionErrorData);
+					continue;
+				}
+				throw error;
+			}
+		}
+
+		return [returnData];
+	}
+}
diff --git a/packages/nodes-base/nodes/Twitter/V2/DirectMessageDescription.ts b/packages/nodes-base/nodes/Twitter/V2/DirectMessageDescription.ts
new file mode 100644
index 0000000000000..2e98afede198b
--- /dev/null
+++ b/packages/nodes-base/nodes/Twitter/V2/DirectMessageDescription.ts
@@ -0,0 +1,103 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+export const directMessageOperations: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				resource: ['directMessage'],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Send a direct message to a user',
+				action: 'Create Direct Message',
+			},
+		],
+		default: 'create',
+	},
+];
+
+export const directMessageFields: INodeProperties[] = [
+	/* -------------------------------------------------------------------------- */
+	/*                                directMessage:create                        */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'User',
+		name: 'user',
+		type: 'resourceLocator',
+		default: { mode: 'username', value: '' },
+		required: true,
+		description: 'The user you want to send the message to',
+		displayOptions: {
+			show: {
+				operation: ['create'],
+				resource: ['directMessage'],
+			},
+		},
+		modes: [
+			{
+				displayName: 'By Username',
+				name: 'username',
+				type: 'string',
+				validation: [],
+				placeholder: 'e.g. n8n',
+				url: '',
+			},
+			{
+				displayName: 'By ID',
+				name: 'id',
+				type: 'string',
+				validation: [],
+				placeholder: 'e.g. 1068479892537384960',
+				url: '',
+			},
+		],
+	},
+	{
+		displayName: 'Text',
+		name: 'text',
+		type: 'string',
+		required: true,
+		default: '',
+		typeOptions: {
+			rows: 2,
+		},
+		displayOptions: {
+			show: {
+				operation: ['create'],
+				resource: ['directMessage'],
+			},
+		},
+		description:
+			'The text of the direct message. URL encoding is required. Max length of 10,000 characters.',
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				operation: ['create'],
+				resource: ['directMessage'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Attachment ID',
+				name: 'attachments',
+				type: 'string',
+				default: '',
+				placeholder: '1664279886239010824',
+				description: 'The attachment ID to associate with the message',
+			},
+		],
+	},
+];
diff --git a/packages/nodes-base/nodes/Twitter/V2/GenericFunctions.ts b/packages/nodes-base/nodes/Twitter/V2/GenericFunctions.ts
new file mode 100644
index 0000000000000..33f238add0b2a
--- /dev/null
+++ b/packages/nodes-base/nodes/Twitter/V2/GenericFunctions.ts
@@ -0,0 +1,127 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	IHookFunctions,
+	ILoadOptionsFunctions,
+	INodeParameterResourceLocator,
+	JsonObject,
+	IRequestOptions,
+	IHttpRequestMethods,
+} from 'n8n-workflow';
+import { ApplicationError, NodeApiError, NodeOperationError } from 'n8n-workflow';
+
+export async function twitterApiRequest(
+	this: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions,
+	method: IHttpRequestMethods,
+	resource: string,
+	body: IDataObject = {},
+	qs: IDataObject = {},
+	fullOutput?: boolean,
+	uri?: string,
+	option: IDataObject = {},
+) {
+	let options: IRequestOptions = {
+		method,
+		body,
+		qs,
+		url: uri || `https://api.twitter.com/2${resource}`,
+		json: true,
+	};
+	try {
+		if (Object.keys(option).length !== 0) {
+			options = Object.assign({}, options, option);
+		}
+		if (Object.keys(body).length === 0) {
+			delete options.body;
+		}
+		if (Object.keys(qs).length === 0) {
+			delete options.qs;
+		}
+		if (fullOutput) {
+			return await this.helpers.requestOAuth2.call(this, 'twitterOAuth2Api', options);
+		} else {
+			const { data } = await this.helpers.requestOAuth2.call(this, 'twitterOAuth2Api', options);
+			return data;
+		}
+	} catch (error) {
+		if (error.error?.required_enrollment === 'Appropriate Level of API Access') {
+			throw new NodeOperationError(
+				this.getNode(),
+				'The operation requires Twitter Api to be either Basic or Pro.',
+			);
+		} else if (error.errors && error.error?.errors[0].message.includes('must be ')) {
+			throw new NodeOperationError(this.getNode(), error.error.errors[0].message as string);
+		}
+		throw new NodeApiError(this.getNode(), error as JsonObject);
+	}
+}
+
+export async function twitterApiRequestAllItems(
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	propertyName: string,
+	method: IHttpRequestMethods,
+	endpoint: string,
+	body: IDataObject = {},
+	query: IDataObject = {},
+) {
+	const returnData: IDataObject[] = [];
+
+	let responseData;
+
+	query.max_results = 10;
+
+	do {
+		responseData = await twitterApiRequest.call(this, method, endpoint, body, query, true);
+		query.next_token = responseData.meta.next_token as string;
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
+	} while (responseData.meta.next_token);
+
+	return returnData;
+}
+
+export function returnId(tweetId: INodeParameterResourceLocator) {
+	if (tweetId.mode === 'id') {
+		return tweetId.value as string;
+	} else if (tweetId.mode === 'url') {
+		const value = tweetId.value as string;
+		const tweetIdMatch = value.includes('lists')
+			? value.match(/^https?:\/\/twitter\.com\/(?:#!\/)?(\w+)\/list(s)?\/(\d+)$/)
+			: value.match(/^https?:\/\/twitter\.com\/(?:#!\/)?(\w+)\/status(es)?\/(\d+)$/);
+
+		return tweetIdMatch?.[3] as string;
+	} else {
+		throw new ApplicationError(`The mode ${tweetId.mode} is not valid!`, { level: 'warning' });
+	}
+}
+
+export async function returnIdFromUsername(
+	this: IExecuteFunctions,
+	usernameRlc: INodeParameterResourceLocator,
+) {
+	usernameRlc.value = (usernameRlc.value as string).includes('@')
+		? (usernameRlc.value as string).replace('@', '')
+		: usernameRlc.value;
+	if (
+		usernameRlc.mode === 'username' ||
+		(usernameRlc.mode === 'name' && this.getNode().parameters.list !== undefined)
+	) {
+		const user = (await twitterApiRequest.call(
+			this,
+			'GET',
+			`/users/by/username/${usernameRlc.value}`,
+			{},
+		)) as { id: string };
+		return user.id;
+	} else if (this.getNode().parameters.list === undefined) {
+		const list = (await twitterApiRequest.call(
+			this,
+			'GET',
+			`/list/by/name/${usernameRlc.value}`,
+			{},
+		)) as { id: string };
+		return list.id;
+	} else
+		throw new ApplicationError(`The username mode ${usernameRlc.mode} is not valid!`, {
+			level: 'warning',
+		});
+}
diff --git a/packages/nodes-base/nodes/Twitter/V2/ListDescription.ts b/packages/nodes-base/nodes/Twitter/V2/ListDescription.ts
new file mode 100644
index 0000000000000..430e1bcaa987b
--- /dev/null
+++ b/packages/nodes-base/nodes/Twitter/V2/ListDescription.ts
@@ -0,0 +1,94 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+export const listOperations: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				resource: ['list'],
+			},
+		},
+		options: [
+			{
+				name: 'Add Member',
+				value: 'add',
+				description: 'Add a member to a list',
+				action: 'Add Member to List',
+			},
+		],
+		default: 'add',
+	},
+];
+
+export const listFields: INodeProperties[] = [
+	/* -------------------------------------------------------------------------- */
+	/*                                list:add                        */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'List',
+		name: 'list',
+		type: 'resourceLocator',
+		default: { mode: 'id', value: '' },
+		required: true,
+		description: 'The list you want to add the user to',
+		displayOptions: {
+			show: {
+				operation: ['add'],
+				resource: ['list'],
+			},
+		},
+		modes: [
+			{
+				displayName: 'By ID',
+				name: 'id',
+				type: 'string',
+				validation: [],
+				placeholder: 'e.g. 99923132',
+				url: '',
+			},
+			{
+				displayName: 'By URL',
+				name: 'url',
+				type: 'string',
+				validation: [],
+				placeholder: 'e.g. https://twitter.com/i/lists/99923132',
+				url: '',
+			},
+		],
+	},
+	{
+		displayName: 'User',
+		name: 'user',
+		type: 'resourceLocator',
+		default: { mode: 'username', value: '' },
+		required: true,
+		description: 'The user you want to add to the list',
+		displayOptions: {
+			show: {
+				operation: ['add'],
+				resource: ['list'],
+			},
+		},
+		modes: [
+			{
+				displayName: 'By Username',
+				name: 'username',
+				type: 'string',
+				validation: [],
+				placeholder: 'e.g. n8n',
+				url: '',
+			},
+			{
+				displayName: 'By ID',
+				name: 'id',
+				type: 'string',
+				validation: [],
+				placeholder: 'e.g. 1068479892537384960',
+				url: '',
+			},
+		],
+	},
+];
diff --git a/packages/nodes-base/nodes/Twitter/V2/TweetDescription.ts b/packages/nodes-base/nodes/Twitter/V2/TweetDescription.ts
new file mode 100644
index 0000000000000..b7fb9006efd5d
--- /dev/null
+++ b/packages/nodes-base/nodes/Twitter/V2/TweetDescription.ts
@@ -0,0 +1,479 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+export const tweetOperations: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				resource: ['tweet'],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create, quote, or reply to a tweet',
+				action: 'Create Tweet',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a tweet',
+				action: 'Delete Tweet',
+			},
+			{
+				name: 'Like',
+				value: 'like',
+				description: 'Like a tweet',
+				action: 'Like Tweet',
+			},
+			{
+				name: 'Retweet',
+				value: 'retweet',
+				description: 'Retweet a tweet',
+				action: 'Retweet Tweet',
+			},
+			{
+				name: 'Search',
+				value: 'search',
+				description: 'Search for tweets from the last seven days',
+				action: 'Search Tweets',
+			},
+		],
+		default: 'create',
+	},
+];
+
+export const tweetFields: INodeProperties[] = [
+	/* -------------------------------------------------------------------------- */
+	/*                                tweet:create                                */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Text',
+		name: 'text',
+		type: 'string',
+		typeOptions: {
+			rows: 2,
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: ['create'],
+				resource: ['tweet'],
+			},
+		},
+		description:
+			'The text of the status update. URLs must be encoded. Links wrapped with the t.co shortener will affect character count',
+	},
+	{
+		displayName: 'Options',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				operation: ['create'],
+				resource: ['tweet'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Location ID',
+				name: 'location',
+				type: 'string',
+				placeholder: '4e696bef7e24d378',
+				default: '',
+				description: 'Location information for the tweet',
+			},
+			{
+				displayName: 'Media ID',
+				name: 'attachments',
+				type: 'string',
+				default: '',
+				placeholder: '1664279886239010824',
+				description: 'The attachment ID to associate with the message',
+			},
+			{
+				displayName: 'Quote a Tweet',
+				name: 'inQuoteToStatusId',
+				type: 'resourceLocator',
+				default: { mode: 'id', value: '' },
+				description: 'The tweet being quoted',
+				modes: [
+					{
+						displayName: 'By ID',
+						name: 'id',
+						type: 'string',
+						validation: [],
+						placeholder: 'e.g. 1187836157394112513',
+						url: '',
+					},
+					{
+						displayName: 'By URL',
+						name: 'url',
+						type: 'string',
+						validation: [],
+						placeholder: 'e.g. https://twitter.com/n8n_io/status/1187836157394112513',
+						url: '',
+					},
+				],
+			},
+			{
+				displayName: 'Reply to Tweet',
+				name: 'inReplyToStatusId',
+				type: 'resourceLocator',
+				default: { mode: 'id', value: '' },
+				// required: true,
+				description: 'The tweet being replied to',
+				modes: [
+					{
+						displayName: 'By ID',
+						name: 'id',
+						type: 'string',
+						validation: [],
+						placeholder: 'e.g. 1187836157394112513',
+						url: '',
+					},
+					{
+						displayName: 'By URL',
+						name: 'url',
+						type: 'string',
+						validation: [],
+						placeholder: 'e.g. https://twitter.com/n8n_io/status/1187836157394112513',
+						url: '',
+					},
+				],
+			},
+		],
+	},
+	{
+		displayName: 'Locations are not supported due to Twitter V2 API limitations',
+		name: 'noticeLocation',
+		type: 'notice',
+		displayOptions: {
+			show: {
+				'/additionalFields.location': [''],
+			},
+		},
+		default: '',
+	},
+	{
+		displayName: 'Attachements are not supported due to Twitter V2 API limitations',
+		name: 'noticeAttachments',
+		type: 'notice',
+		displayOptions: {
+			show: {
+				'/additionalFields.attachments': [''],
+			},
+		},
+		default: '',
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                tweet:delete                                */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Tweet',
+		name: 'tweetDeleteId',
+		type: 'resourceLocator',
+		default: { mode: 'id', value: '' },
+		required: true,
+		description: 'The tweet to delete',
+		displayOptions: {
+			show: {
+				resource: ['tweet'],
+				operation: ['delete'],
+			},
+		},
+		modes: [
+			{
+				displayName: 'By ID',
+				name: 'id',
+				type: 'string',
+				validation: [],
+				placeholder: 'e.g. 1187836157394112513',
+				url: '',
+			},
+			{
+				displayName: 'By URL',
+				name: 'url',
+				type: 'string',
+				validation: [],
+				placeholder: 'e.g. https://twitter.com/n8n_io/status/1187836157394112513',
+				url: '',
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                tweet:like                                  */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Tweet',
+		name: 'tweetId',
+		type: 'resourceLocator',
+		default: { mode: 'id', value: '' },
+		required: true,
+		description: 'The tweet to like',
+		displayOptions: {
+			show: {
+				operation: ['like'],
+				resource: ['tweet'],
+			},
+		},
+		modes: [
+			{
+				displayName: 'By ID',
+				name: 'id',
+				type: 'string',
+				validation: [],
+				placeholder: 'e.g. 1187836157394112513',
+				url: '',
+			},
+			{
+				displayName: 'By URL',
+				name: 'url',
+				type: 'string',
+				validation: [],
+				placeholder: 'e.g. https://twitter.com/n8n_io/status/1187836157394112513',
+				url: '',
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                tweet:search                                */
+	/* -------------------------------------------------------------------------- */
+	{
+		// displayName: 'Search Text',
+		displayName: 'Search Term',
+		name: 'searchText',
+		type: 'string',
+		required: true,
+		default: '',
+		placeholder: 'e.g. automation',
+		displayOptions: {
+			show: {
+				operation: ['search'],
+				resource: ['tweet'],
+			},
+		},
+		description:
+			'A UTF-8, URL-encoded search query of 500 characters maximum, including operators. Queries may additionally be limited by complexity. Check the searching examples <a href="https://developer.twitter.com/en/docs/tweets/search/guides/standard-operators">here</a>.',
+	},
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		default: false,
+		description: 'Whether to return all results or only up to a given limit',
+		displayOptions: {
+			show: {
+				resource: ['tweet'],
+				operation: ['search'],
+			},
+		},
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		default: 50,
+		description: 'Max number of results to return',
+		typeOptions: {
+			minValue: 1,
+		},
+		displayOptions: {
+			show: {
+				resource: ['tweet'],
+				operation: ['search'],
+				returnAll: [false],
+			},
+		},
+	},
+	{
+		displayName: 'Options',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				operation: ['search'],
+				resource: ['tweet'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Sort Order',
+				name: 'sortOrder',
+				type: 'options',
+				options: [
+					{
+						name: 'Recent',
+						value: 'recency',
+					},
+					{
+						name: 'Relevant',
+						value: 'relevancy',
+					},
+				],
+				// required: true,
+				description: 'The order in which to return results',
+				default: 'recency',
+			},
+			{
+				displayName: 'After',
+				name: 'startTime',
+				type: 'dateTime',
+				default: '',
+				description:
+					"Tweets before this date will not be returned. This date must be within the last 7 days if you don't have Academic Research access.",
+			},
+			{
+				displayName: 'Before',
+				name: 'endTime',
+				type: 'dateTime',
+				default: '',
+				description:
+					"Tweets after this date will not be returned. This date must be within the last 7 days if you don't have Academic Research access.",
+			},
+			{
+				displayName: 'Tweet Fields',
+				name: 'tweetFieldsObject',
+				type: 'multiOptions',
+				// eslint-disable-next-line n8n-nodes-base/node-param-multi-options-type-unsorted-items
+				options: [
+					{
+						name: 'Attachments',
+						value: 'attachments',
+					},
+					{
+						name: 'Author ID',
+						value: 'author_id',
+					},
+					{
+						name: 'Context Annotations',
+						value: 'context_annotations',
+					},
+					{
+						name: 'Conversation ID',
+						value: 'conversation_id',
+					},
+					{
+						name: 'Created At',
+						value: 'created_at',
+					},
+					{
+						name: 'Edit Controls',
+						value: 'edit_controls',
+					},
+					{
+						name: 'Entities',
+						value: 'entities',
+					},
+					{
+						name: 'Geo',
+						value: 'geo',
+					},
+					{
+						name: 'ID',
+						value: 'id',
+					},
+					{
+						name: 'In Reply To User ID',
+						value: 'in_reply_to_user_id',
+					},
+					{
+						name: 'Lang',
+						value: 'lang',
+					},
+					{
+						name: 'Non Public Metrics',
+						value: 'non_public_metrics',
+					},
+					{
+						name: 'Public Metrics',
+						value: 'public_metrics',
+					},
+					{
+						name: 'Organic Metrics',
+						value: 'organic_metrics',
+					},
+					{
+						name: 'Promoted Metrics',
+						value: 'promoted_metrics',
+					},
+					{
+						name: 'Possibly Sensitive',
+						value: 'possibly_sensitive',
+					},
+					{
+						name: 'Referenced Tweets',
+						value: 'referenced_tweets',
+					},
+					{
+						name: 'Reply Settings',
+						value: 'reply_settings',
+					},
+					{
+						name: 'Source',
+						value: 'source',
+					},
+					{
+						name: 'Text',
+						value: 'text',
+					},
+					{
+						name: 'Withheld',
+						value: 'withheld',
+					},
+				],
+				default: [],
+				description:
+					'The fields to add to each returned tweet object. Default fields are: ID, text, edit_history_tweet_ids.',
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                tweet:retweet                               */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Tweet',
+		name: 'tweetId',
+		type: 'resourceLocator',
+		default: { mode: 'id', value: '' },
+		required: true,
+		description: 'The tweet to retweet',
+		displayOptions: {
+			show: {
+				operation: ['retweet'],
+				resource: ['tweet'],
+			},
+		},
+		modes: [
+			{
+				displayName: 'By ID',
+				name: 'id',
+				type: 'string',
+				validation: [],
+				placeholder: 'e.g. 1187836157394112513',
+				url: '',
+			},
+			{
+				displayName: 'By URL',
+				name: 'url',
+				type: 'string',
+				validation: [],
+				placeholder: 'e.g. https://twitter.com/n8n_io/status/1187836157394112513',
+				url: '',
+			},
+		],
+	},
+];
diff --git a/packages/nodes-base/nodes/Twitter/V2/TweetInterface.ts b/packages/nodes-base/nodes/Twitter/V2/TweetInterface.ts
new file mode 100644
index 0000000000000..05fb67e26035a
--- /dev/null
+++ b/packages/nodes-base/nodes/Twitter/V2/TweetInterface.ts
@@ -0,0 +1,25 @@
+import type { IDataObject } from 'n8n-workflow';
+
+export interface ITweet {
+	auto_populate_reply_metadata?: boolean;
+	display_coordinates?: boolean;
+	lat?: number;
+	long?: number;
+	media_ids?: string;
+	possibly_sensitive?: boolean;
+	status: string;
+	in_reply_to_status_id?: string;
+}
+
+export interface ITweetCreate {
+	type: 'message_create';
+	message_create: {
+		target: {
+			recipient_id: string;
+		};
+		message_data: {
+			text: string;
+			attachment?: IDataObject;
+		};
+	};
+}
diff --git a/packages/nodes-base/nodes/Twitter/V2/TwitterV2.node.ts b/packages/nodes-base/nodes/Twitter/V2/TwitterV2.node.ts
new file mode 100644
index 0000000000000..ef13131b05431
--- /dev/null
+++ b/packages/nodes-base/nodes/Twitter/V2/TwitterV2.node.ts
@@ -0,0 +1,365 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
+	INodeExecutionData,
+	INodeParameterResourceLocator,
+	INodePropertyOptions,
+	INodeType,
+	INodeTypeBaseDescription,
+	INodeTypeDescription,
+	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';
+
+export class TwitterV2 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			version: 2,
+			description:
+				'Post, like, and search tweets, send messages, search users, and add users to lists',
+			subtitle: '={{$parameter["operation"] + ":" + $parameter["resource"]}}',
+			defaults: {
+				name: 'X',
+			},
+			inputs: ['main'],
+			outputs: ['main'],
+			credentials: [
+				{
+					name: 'twitterOAuth2Api',
+					required: true,
+				},
+			],
+			properties: [
+				{
+					displayName: 'Resource',
+					name: 'resource',
+					type: 'options',
+					noDataExpression: true,
+					options: [
+						{
+							name: 'Direct Message',
+							value: 'directMessage',
+							description: 'Send a direct message to a user',
+						},
+						{
+							name: 'List',
+							value: 'list',
+							description: 'Add a user to a list',
+						},
+						{
+							name: 'Tweet',
+							value: 'tweet',
+							description: 'Create, like, search, or delete a tweet',
+						},
+						{
+							name: 'User',
+							value: 'user',
+							description: 'Search users by username',
+						},
+					],
+					default: 'tweet',
+				},
+				// DIRECT MESSAGE
+				...directMessageOperations,
+				...directMessageFields,
+				// LIST
+				...listOperations,
+				...listFields,
+				// TWEET
+				...tweetOperations,
+				...tweetFields,
+				// USER
+				...userOperations,
+				...userFields,
+			],
+		};
+	}
+
+	methods = {
+		loadOptions: {
+			// Get all the available languages to display them to user so that they can
+			// select them easily
+			async getLanguages(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const languages = ISO6391.getAllNames();
+				for (const language of languages) {
+					const languageName = language;
+					const languageId = ISO6391.getCode(language);
+					returnData.push({
+						name: languageName,
+						value: languageId,
+					});
+				}
+				return returnData;
+			},
+		},
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = this.getInputData();
+		const returnData: INodeExecutionData[] = [];
+		const length = items.length;
+		let responseData;
+		const resource = this.getNodeParameter('resource', 0);
+		const operation = this.getNodeParameter('operation', 0);
+		for (let i = 0; i < length; i++) {
+			try {
+				if (resource === 'user') {
+					if (operation === 'searchUser') {
+						const me = this.getNodeParameter('me', i, false) as boolean;
+						if (me) {
+							responseData = await twitterApiRequest.call(this, 'GET', '/users/me', {});
+						} else {
+							const userRlc = this.getNodeParameter(
+								'user',
+								i,
+								undefined,
+								{},
+							) as INodeParameterResourceLocator;
+							if (userRlc.mode === 'username') {
+								userRlc.value = (userRlc.value as string).includes('@')
+									? (userRlc.value as string).replace('@', '')
+									: userRlc.value;
+								responseData = await twitterApiRequest.call(
+									this,
+									'GET',
+									`/users/by/username/${userRlc.value}`,
+									{},
+								);
+							} else if (userRlc.mode === 'id') {
+								responseData = await twitterApiRequest.call(
+									this,
+									'GET',
+									`/users/${userRlc.value}`,
+									{},
+								);
+							}
+						}
+					}
+				}
+				if (resource === 'tweet') {
+					if (operation === 'search') {
+						const searchText = this.getNodeParameter('searchText', i, '', {});
+						const returnAll = this.getNodeParameter('returnAll', i);
+						const { sortOrder, startTime, endTime, tweetFieldsObject } = this.getNodeParameter(
+							'additionalFields',
+							i,
+							{},
+						) as {
+							sortOrder: string;
+							startTime: string;
+							endTime: string;
+							tweetFieldsObject: string[];
+						};
+						const qs: IDataObject = {
+							query: searchText,
+						};
+						if (endTime) {
+							const endTimeISO = DateTime.fromISO(endTime).toISO();
+							qs.end_time = endTimeISO;
+						}
+						if (sortOrder) {
+							qs.sort_order = sortOrder;
+						}
+						if (startTime) {
+							const startTimeISO8601 = DateTime.fromISO(startTime).toISO();
+							qs.start_time = startTimeISO8601;
+						}
+						if (tweetFieldsObject) {
+							if (tweetFieldsObject.length > 0) {
+								qs['tweet.fields'] = tweetFieldsObject.join(',');
+							}
+						}
+						if (returnAll) {
+							responseData = await twitterApiRequestAllItems.call(
+								this,
+								'data',
+								'GET',
+								'/tweets/search/recent',
+								{},
+								qs,
+							);
+						} else {
+							const limit = this.getNodeParameter('limit', i);
+							qs.max_results = limit;
+							responseData = await twitterApiRequest.call(
+								this,
+								'GET',
+								'/tweets/search/recent',
+								{},
+								qs,
+							);
+						}
+					}
+					if (operation === 'create') {
+						const text = this.getNodeParameter('text', i, '', {});
+						const { location, attachments, inQuoteToStatusId, inReplyToStatusId } =
+							this.getNodeParameter('additionalFields', i, {}) as {
+								location: string;
+								attachments: string;
+								inQuoteToStatusId: INodeParameterResourceLocator;
+								inReplyToStatusId: INodeParameterResourceLocator;
+							};
+						const body: IDataObject = {
+							text,
+						};
+						if (location) {
+							body.geo = { place_id: location };
+						}
+						if (attachments) {
+							body.media = { media_ids: [attachments] };
+						}
+						if (inQuoteToStatusId) {
+							body.quote_tweet_id = returnId(inQuoteToStatusId);
+						}
+						if (inReplyToStatusId) {
+							const inReplyToStatusIdValue = { in_reply_to_tweet_id: returnId(inReplyToStatusId) };
+							body.reply = inReplyToStatusIdValue;
+						}
+						responseData = await twitterApiRequest.call(this, 'POST', '/tweets', body);
+					}
+					if (operation === 'delete') {
+						const tweetRLC = this.getNodeParameter(
+							'tweetDeleteId',
+							i,
+							'',
+							{},
+						) as INodeParameterResourceLocator;
+						const tweetId = returnId(tweetRLC);
+						responseData = await twitterApiRequest.call(this, 'DELETE', `/tweets/${tweetId}`, {});
+					}
+					if (operation === 'like') {
+						const tweetRLC = this.getNodeParameter(
+							'tweetId',
+							i,
+							'',
+							{},
+						) as INodeParameterResourceLocator;
+						const tweetId = returnId(tweetRLC);
+						const body: IDataObject = {
+							tweet_id: tweetId,
+						};
+						const user = (await twitterApiRequest.call(this, 'GET', '/users/me', {})) as {
+							id: string;
+						};
+						responseData = await twitterApiRequest.call(
+							this,
+							'POST',
+							`/users/${user.id}/likes`,
+							body,
+						);
+					}
+					if (operation === 'retweet') {
+						const tweetRLC = this.getNodeParameter(
+							'tweetId',
+							i,
+							'',
+							{},
+						) as INodeParameterResourceLocator;
+						const tweetId = returnId(tweetRLC);
+						const body: IDataObject = {
+							tweet_id: tweetId,
+						};
+						const user = (await twitterApiRequest.call(this, 'GET', '/users/me', {})) as {
+							id: string;
+						};
+						responseData = await twitterApiRequest.call(
+							this,
+							'POST',
+							`/users/${user.id}/retweets`,
+							body,
+						);
+					}
+				}
+				if (resource === 'list') {
+					if (operation === 'add') {
+						const userRlc = this.getNodeParameter(
+							'user',
+							i,
+							'',
+							{},
+						) as INodeParameterResourceLocator;
+						const userId =
+							userRlc.mode !== 'username'
+								? returnId(userRlc)
+								: await returnIdFromUsername.call(this, userRlc);
+						const listRlc = this.getNodeParameter(
+							'list',
+							i,
+							'',
+							{},
+						) as INodeParameterResourceLocator;
+						const listId = returnId(listRlc);
+						responseData = await twitterApiRequest.call(this, 'POST', `/lists/${listId}/members`, {
+							user_id: userId,
+						});
+					}
+				}
+				if (resource === 'directMessage') {
+					if (operation === 'create') {
+						const userRlc = this.getNodeParameter(
+							'user',
+							i,
+							'',
+							{},
+						) as INodeParameterResourceLocator;
+						const user = await returnIdFromUsername.call(this, userRlc);
+						const text = this.getNodeParameter('text', i, '', {});
+						const { attachments } = this.getNodeParameter('additionalFields', i, {}, {}) as {
+							attachments: number;
+						};
+						const body: IDataObject = {
+							text,
+						};
+
+						if (attachments) {
+							body.attachments = [{ media_id: attachments }];
+						}
+
+						responseData = await twitterApiRequest.call(
+							this,
+							'POST',
+							`/dm_conversations/with/${user}/messages`,
+							body,
+						);
+					}
+				}
+				const executionData = this.helpers.constructExecutionMetaData(
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
+					{ itemData: { item: i } },
+				);
+				returnData.push(...executionData);
+			} catch (error) {
+				if (this.continueOnFail()) {
+					const executionErrorData = {
+						json: {
+							error: (error as JsonObject).message,
+						},
+					};
+					returnData.push(executionErrorData);
+					continue;
+				}
+				throw error;
+			}
+		}
+
+		return [returnData];
+	}
+}
diff --git a/packages/nodes-base/nodes/Twitter/V2/UserDescription.ts b/packages/nodes-base/nodes/Twitter/V2/UserDescription.ts
new file mode 100644
index 0000000000000..9f7c9d6ff80b1
--- /dev/null
+++ b/packages/nodes-base/nodes/Twitter/V2/UserDescription.ts
@@ -0,0 +1,78 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+export const userOperations: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				resource: ['user'],
+			},
+		},
+		options: [
+			{
+				name: 'Get',
+				value: 'searchUser',
+				description: 'Retrieve a user by username',
+				action: 'Get User',
+			},
+		],
+		default: 'searchUser',
+	},
+];
+
+export const userFields: INodeProperties[] = [
+	/* -------------------------------------------------------------------------- */
+	/*                                user:searchUser                        */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'User',
+		name: 'user',
+		type: 'resourceLocator',
+		default: { mode: 'username', value: '' },
+		required: true,
+		description: 'The user you want to search',
+		displayOptions: {
+			show: {
+				operation: ['searchUser'],
+				resource: ['user'],
+			},
+			hide: {
+				me: [true],
+			},
+		},
+		modes: [
+			{
+				displayName: 'By Username',
+				name: 'username',
+				type: 'string',
+				validation: [],
+				placeholder: 'e.g. n8n',
+				url: '',
+			},
+			{
+				displayName: 'By ID',
+				name: 'id',
+				type: 'string',
+				validation: [],
+				placeholder: 'e.g. 1068479892537384960',
+				url: '',
+			},
+		],
+	},
+	{
+		displayName: 'Me',
+		name: 'me',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				operation: ['searchUser'],
+				resource: ['user'],
+			},
+		},
+		default: false,
+		description: 'Whether you want to search the authenticated user',
+	},
+];
diff --git a/packages/nodes-base/nodes/Twitter/test/Twitter.test.ts b/packages/nodes-base/nodes/Twitter/test/Twitter.test.ts
new file mode 100644
index 0000000000000..ff0c8fa1e4f87
--- /dev/null
+++ b/packages/nodes-base/nodes/Twitter/test/Twitter.test.ts
@@ -0,0 +1,87 @@
+import nock from 'nock';
+import { getWorkflowFilenames, testWorkflows } from '@test/nodes/Helpers';
+
+const searchResult = {
+	data: [
+		{
+			edit_history_tweet_ids: ['1666357334740811776'],
+			id: '1666357334740811776',
+			text: 'RT @business: Extreme heat is happening earlier than usual this year in Asia. That’s posing a grave risk to agriculture and industrial acti…',
+		},
+		{
+			edit_history_tweet_ids: ['1666357331276230656'],
+			id: '1666357331276230656',
+			text:
+				'@ROBVME @sheepsleepdeep @mattxiv Bit like Bloomberg, but then for an incredible average beer brand, to which grown ass adults have some deeply emotional attachment to and going through a teenage break-up with, because a tiktok.\n' +
+				'Got it.',
+		},
+		{
+			edit_history_tweet_ids: ['1666357319381180417'],
+			id: '1666357319381180417',
+			text: "The global economy is set for a weak recovery from the shocks of Covid and Russia’s war in Ukraine, dogged by persistent inflation and central banks' restrictive policies, the OECD warns https://t.co/HPtelXu8iR https://t.co/rziWHhr8Np",
+		},
+		{
+			edit_history_tweet_ids: ['1666357315946303488'],
+			id: '1666357315946303488',
+			text:
+				'RT @lukedepulford: Love this so much. Variations of “Glory to Hong Kong” are THE WHOLE TOP TEN of the most downloaded song on iTunes.\n' +
+				'\n' +
+				'✊\n' +
+				'\n' +
+				'h…',
+		},
+		{
+			edit_history_tweet_ids: ['1666357265320869891'],
+			id: '1666357265320869891',
+			text: 'RT @business: The SEC said it’s seeking to freeze https://t.co/35sr7lifRX’s assets and protect customer funds, including through the repatr…',
+		},
+		{
+			edit_history_tweet_ids: ['1666357244760555520'],
+			id: '1666357244760555520',
+			text: 'RT @BloombergJapan: オプション市場で日経平均先高観強まる、３万4000円に備える買い急増 https://t.co/mIcdkgokYj',
+		},
+		{
+			edit_history_tweet_ids: ['1666357239710359552'],
+			id: '1666357239710359552',
+			text: "Twitter'a mı girdim bloomberg mi anlamadım,dolar euro altın..maşallahları var,tl mi onun anası sikilmiş.",
+		},
+		{
+			edit_history_tweet_ids: ['1666357235340165120'],
+			id: '1666357235340165120',
+			text: 'RT @business: These charts show why Germany needs mass migration https://t.co/rvZixuwwnu',
+		},
+		{
+			edit_history_tweet_ids: ['1666357210409213952'],
+			id: '1666357210409213952',
+			text: 'RT @elonmusk: @MattWalshBlog View count is actually understated, as it does not include anything from our API, for example tweets you see i…',
+		},
+		{
+			edit_history_tweet_ids: ['1666357208983166976'],
+			id: '1666357208983166976',
+			text: 'RT @coinbureau: There we go. Without proving in a court of law that these tokens are "securities" the SEC may be able to restrict access to…',
+		},
+	],
+};
+
+const meResult = {
+	data: { id: '1285192200213626880', name: 'Integration-n8n', username: 'IntegrationN8n' },
+};
+describe('Test Twitter Request Node', () => {
+	beforeAll(() => {
+		const baseUrl = 'https://api.twitter.com/2';
+		nock.disableNetConnect();
+		//GET
+		nock(baseUrl).get('/users/me').reply(200, meResult);
+
+		nock(baseUrl)
+			.get('/tweets/search/recent?query=bloomberg&max_results=10')
+			.reply(200, searchResult);
+	});
+
+	afterEach(() => {
+		nock.restore();
+	});
+
+	const workflows = getWorkflowFilenames(__dirname);
+	testWorkflows(workflows);
+});
diff --git a/packages/nodes-base/nodes/Twitter/test/Workflow_Twitter_UnitTest.json b/packages/nodes-base/nodes/Twitter/test/Workflow_Twitter_UnitTest.json
new file mode 100644
index 0000000000000..54548cf88ec5d
--- /dev/null
+++ b/packages/nodes-base/nodes/Twitter/test/Workflow_Twitter_UnitTest.json
@@ -0,0 +1,284 @@
+{
+	"name": "node-1-twitter-node-overhaul",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "91cdc3d3-9cf7-4fe0-b74c-b17e0c8b404d",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [-420, 80]
+		},
+		{
+			"parameters": {
+				"resource": "user",
+				"me": true
+			},
+			"id": "4ee34d07-db6c-413b-95f3-932182770044",
+			"name": "Twitter1",
+			"type": "n8n-nodes-base.twitter",
+			"typeVersion": 2,
+			"position": [-140, 260],
+			"credentials": {
+				"twitterOAuth2Api": {
+					"id": "121",
+					"name": "Twitter OAuth account 2"
+				}
+			},
+			"disabled": false
+		},
+		{
+			"parameters": {
+				"operation": "delete",
+				"tweetDeleteId": {
+					"__rl": true,
+					"value": "={{ $('Twitter').item.json.id }}",
+					"mode": "id"
+				}
+			},
+			"id": "ceca5fb1-f4b7-4dbe-9505-61793bffd87a",
+			"name": "Twitter3",
+			"type": "n8n-nodes-base.twitter",
+			"typeVersion": 2,
+			"position": [240, 80],
+			"credentials": {
+				"twitterOAuth2Api": {
+					"id": "121",
+					"name": "Twitter OAuth account 2"
+				}
+			},
+			"disabled": true
+		},
+		{
+			"parameters": {
+				"operation": "retweet",
+				"tweetId": {
+					"__rl": true,
+					"value": "={{ $json.id }}",
+					"mode": "id"
+				},
+				"additionalFields": {}
+			},
+			"id": "ce49286a-04bb-4f59-bae5-ef64a1bca2b0",
+			"name": "Twitter2",
+			"type": "n8n-nodes-base.twitter",
+			"typeVersion": 2,
+			"position": [40, 80],
+			"credentials": {
+				"twitterOAuth2Api": {
+					"id": "121",
+					"name": "Twitter OAuth account 2"
+				}
+			},
+			"disabled": true
+		},
+		{
+			"parameters": {
+				"text": "test5",
+				"additionalFields": {}
+			},
+			"id": "370e20de-dca6-48ab-aa24-47fb326bad77",
+			"name": "Twitter",
+			"type": "n8n-nodes-base.twitter",
+			"typeVersion": 2,
+			"position": [-140, 80],
+			"credentials": {
+				"twitterOAuth2Api": {
+					"id": "121",
+					"name": "Twitter OAuth account 2"
+				}
+			},
+			"disabled": true
+		},
+		{
+			"parameters": {
+				"resource": "list",
+				"list": {
+					"__rl": true,
+					"value": "https://twitter.com/i/lists/1663852298521419776",
+					"mode": "url"
+				},
+				"user": {
+					"__rl": true,
+					"value": "n8n_io",
+					"mode": "username"
+				}
+			},
+			"id": "ea1c13af-80b8-41d4-8591-e16b8e7be84b",
+			"name": "Twitter7",
+			"type": "n8n-nodes-base.twitter",
+			"typeVersion": 2,
+			"position": [-140, 640],
+			"credentials": {
+				"twitterOAuth2Api": {
+					"id": "121",
+					"name": "Twitter OAuth account 2"
+				}
+			},
+			"disabled": true
+		},
+		{
+			"parameters": {
+				"operation": "search",
+				"searchText": "bloomberg",
+				"limit": 10,
+				"additionalFields": {}
+			},
+			"id": "216b3061-a52b-4d64-9ed8-9cc6940f6efa",
+			"name": "Twitter5",
+			"type": "n8n-nodes-base.twitter",
+			"typeVersion": 2,
+			"position": [-140, 440],
+			"credentials": {
+				"twitterOAuth2Api": {
+					"id": "121",
+					"name": "Twitter OAuth account 2"
+				}
+			}
+		}
+	],
+	"pinData": {
+		"Twitter1": [
+			{
+				"json": {
+					"id": "1285192200213626880",
+					"name": "Integration-n8n",
+					"username": "IntegrationN8n"
+				}
+			}
+		],
+		"Twitter5": [
+			{
+				"json": {
+					"edit_history_tweet_ids": ["1666357334740811776"],
+					"id": "1666357334740811776",
+					"text": "RT @business: Extreme heat is happening earlier than usual this year in Asia. That’s posing a grave risk to agriculture and industrial acti…"
+				}
+			},
+			{
+				"json": {
+					"edit_history_tweet_ids": ["1666357331276230656"],
+					"id": "1666357331276230656",
+					"text": "@ROBVME @sheepsleepdeep @mattxiv Bit like Bloomberg, but then for an incredible average beer brand, to which grown ass adults have some deeply emotional attachment to and going through a teenage break-up with, because a tiktok.\nGot it."
+				}
+			},
+			{
+				"json": {
+					"edit_history_tweet_ids": ["1666357319381180417"],
+					"id": "1666357319381180417",
+					"text": "The global economy is set for a weak recovery from the shocks of Covid and Russia’s war in Ukraine, dogged by persistent inflation and central banks' restrictive policies, the OECD warns https://t.co/HPtelXu8iR https://t.co/rziWHhr8Np"
+				}
+			},
+			{
+				"json": {
+					"edit_history_tweet_ids": ["1666357315946303488"],
+					"id": "1666357315946303488",
+					"text": "RT @lukedepulford: Love this so much. Variations of “Glory to Hong Kong” are THE WHOLE TOP TEN of the most downloaded song on iTunes.\n\n✊\n\nh…"
+				}
+			},
+			{
+				"json": {
+					"edit_history_tweet_ids": ["1666357265320869891"],
+					"id": "1666357265320869891",
+					"text": "RT @business: The SEC said it’s seeking to freeze https://t.co/35sr7lifRX’s assets and protect customer funds, including through the repatr…"
+				}
+			},
+			{
+				"json": {
+					"edit_history_tweet_ids": ["1666357244760555520"],
+					"id": "1666357244760555520",
+					"text": "RT @BloombergJapan: オプション市場で日経平均先高観強まる、３万4000円に備える買い急増 https://t.co/mIcdkgokYj"
+				}
+			},
+			{
+				"json": {
+					"edit_history_tweet_ids": ["1666357239710359552"],
+					"id": "1666357239710359552",
+					"text": "Twitter'a mı girdim bloomberg mi anlamadım,dolar euro altın..maşallahları var,tl mi onun anası sikilmiş."
+				}
+			},
+			{
+				"json": {
+					"edit_history_tweet_ids": ["1666357235340165120"],
+					"id": "1666357235340165120",
+					"text": "RT @business: These charts show why Germany needs mass migration https://t.co/rvZixuwwnu"
+				}
+			},
+			{
+				"json": {
+					"edit_history_tweet_ids": ["1666357210409213952"],
+					"id": "1666357210409213952",
+					"text": "RT @elonmusk: @MattWalshBlog View count is actually understated, as it does not include anything from our API, for example tweets you see i…"
+				}
+			},
+			{
+				"json": {
+					"edit_history_tweet_ids": ["1666357208983166976"],
+					"id": "1666357208983166976",
+					"text": "RT @coinbureau: There we go. Without proving in a court of law that these tokens are \"securities\" the SEC may be able to restrict access to…"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Twitter1",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Twitter",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Twitter7",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Twitter5",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Twitter1": {
+			"main": [[]]
+		},
+		"Twitter2": {
+			"main": [
+				[
+					{
+						"node": "Twitter3",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Twitter": {
+			"main": [
+				[
+					{
+						"node": "Twitter2",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {},
+	"versionId": "bc985960-5bfd-4b56-b290-ab839b3c0c30",
+	"id": "66",
+	"meta": {
+		"instanceId": "8e9416f42a954d0a370d988ac3c0f916f44074a6e45189164b1a8559394a7516"
+	},
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Twitter/twitter.svg b/packages/nodes-base/nodes/Twitter/twitter.svg
deleted file mode 100644
index 59c4d9b6b0e88..0000000000000
--- a/packages/nodes-base/nodes/Twitter/twitter.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 257 210" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><path d="M80.507 208.013c96.604 0 149.442-80.036 149.442-149.442 0-2.274 0-4.537-.153-6.8A106.874 106.874 0 00256 24.595a104.84 104.84 0 01-30.167 8.264 52.709 52.709 0 0023.091-29.05 105.26 105.26 0 01-33.352 12.748C199.291-.754 173.422-4.991 152.469 6.223s-31.777 35.088-26.404 58.238A149.117 149.117 0 0117.818 9.583c-13.941 23.999-6.821 54.7 16.26 70.113a52.13 52.13 0 01-23.838-6.574v.665c.007 25.002 17.631 46.537 42.138 51.487a52.44 52.44 0 01-23.716.901c6.881 21.396 26.599 36.053 49.07 36.475a105.39 105.39 0 01-65.229 22.528A106.844 106.844 0 010 184.42a148.695 148.695 0 0080.507 23.552" stroke="none" fill="#1da1f2" fill-rule="nonzero"/></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Twitter/x.svg b/packages/nodes-base/nodes/Twitter/x.svg
new file mode 100644
index 0000000000000..95d7fc2f51382
--- /dev/null
+++ b/packages/nodes-base/nodes/Twitter/x.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M18.244 2.25h3.308l-7.227 8.26 8.502 11.24H16.17l-5.214-6.817L4.99 21.75H1.68l7.73-8.835L1.254 2.25H8.08l4.713 6.231zm-1.161 17.52h1.833L7.084 4.126H5.117z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Typeform/GenericFunctions.ts b/packages/nodes-base/nodes/Typeform/GenericFunctions.ts
index 7248439ec0534..f7262b7a839f5 100644
--- a/packages/nodes-base/nodes/Typeform/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Typeform/GenericFunctions.ts
@@ -5,11 +5,11 @@ import type {
 	IDataObject,
 	INodePropertyOptions,
 	JsonObject,
+	IRequestOptions,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
-import type { OptionsWithUri } from 'request';
-
 // Interface in Typeform
 export interface ITypeformDefinition {
 	fields: ITypeformDefinitionField[];
@@ -39,14 +39,14 @@ export interface ITypeformAnswerField {
  */
 export async function apiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: object,
 	query?: IDataObject,
 ): Promise<any> {
 	const authenticationMethod = this.getNodeParameter('authentication', 0);
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {},
 		method,
 		body,
@@ -76,7 +76,7 @@ export async function apiRequest(
  */
 export async function apiRequestAllItems(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject,
 	query?: IDataObject,
diff --git a/packages/nodes-base/nodes/Typeform/TypeformTrigger.node.ts b/packages/nodes-base/nodes/Typeform/TypeformTrigger.node.ts
index d2f153efb00ad..5b85262a6e2c9 100644
--- a/packages/nodes-base/nodes/Typeform/TypeformTrigger.node.ts
+++ b/packages/nodes-base/nodes/Typeform/TypeformTrigger.node.ts
@@ -25,7 +25,7 @@ export class TypeformTrigger implements INodeType {
 		name: 'typeformTrigger',
 		icon: 'file:typeform.svg',
 		group: ['trigger'],
-		version: 1,
+		version: [1, 1.1],
 		subtitle: '=Form ID: {{$parameter["formId"]}}',
 		description: 'Starts the workflow on a Typeform form submission',
 		defaults: {
@@ -93,12 +93,11 @@ export class TypeformTrigger implements INodeType {
 					'Form which should trigger workflow on submission. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
 			},
 			{
-				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-simplify
 				displayName: 'Simplify Answers',
 				name: 'simplifyAnswers',
 				type: 'boolean',
 				default: true,
-				// eslint-disable-next-line n8n-nodes-base/node-param-description-wrong-for-simplify
+
 				description:
 					'Whether to convert the answers to a key:value pair ("FIELD_TITLE":"USER_ANSER") to be easily processable',
 			},
@@ -221,6 +220,7 @@ export class TypeformTrigger implements INodeType {
 	};
 
 	async webhook(this: IWebhookFunctions): Promise<IWebhookResponseData> {
+		const version = this.getNode().typeVersion;
 		const bodyData = this.getBodyData();
 
 		const simplifyAnswers = this.getNodeParameter('simplifyAnswers') as boolean;
@@ -279,7 +279,23 @@ export class TypeformTrigger implements INodeType {
 		}
 
 		if (onlyAnswers) {
-			// Return only the answer
+			// Return only the answers
+			if (version >= 1.1) {
+				return {
+					workflowData: [
+						this.helpers.returnJsonArray([
+							answers.reduce(
+								(acc, answer) => {
+									acc[answer.field.id] = answer;
+									return acc;
+								},
+								{} as Record<string, ITypeformAnswer>,
+							),
+						]),
+					],
+				};
+			}
+
 			return {
 				workflowData: [this.helpers.returnJsonArray([answers as unknown as IDataObject])],
 			};
diff --git a/packages/nodes-base/nodes/Typeform/typeform.svg b/packages/nodes-base/nodes/Typeform/typeform.svg
index c3176af1808f7..4720d1190061a 100644
--- a/packages/nodes-base/nodes/Typeform/typeform.svg
+++ b/packages/nodes-base/nodes/Typeform/typeform.svg
@@ -1 +1 @@
-<svg width="256" height="257" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid"><path d="M121.24.474c33.019-2.718 56.734 6.045 82.25 31.547 27.549 27.532 45.864 63.212 50.8 101.218 5.492 42.266-2.062 73.807-25.326 96.898-22.247 22.08-54.74 29.364-98.146 25.735l-1.797-.158c-36.963-3.398-63.107-15.517-88.438-41.171C13.526 187.14-.732 156.026.029 123.37c.372-15.987 4.901-29.612 13.635-42.98 5.726-8.765 11.54-15.602 23.704-28.14l4.06-4.158 4.474-4.536C74.73 14.58 93.707 2.741 121.24.475zm80.288 33.51C176.586 9.057 153.672.59 121.468 3.241c-27.14 2.234-45.78 14.091-74.95 43.635l-2.11 2.141c-14.21 14.448-20.87 21.835-26.738 30.378l-.854 1.26-.828 1.252c-8.461 12.95-12.824 26.078-13.184 41.528-.743 31.846 13.194 62.258 39.754 89.157 25.267 25.59 51.225 37.4 88.49 40.514l1.85.148c41.744 3.21 72.867-4.002 94.11-25.087 22.57-22.402 29.92-53.088 24.53-94.57-4.855-37.382-22.884-72.503-50.01-99.613zM166.984 93.39v13.56h-28.797v77.712h-14.345V106.95H95.045V93.39h71.94z" fill="#262627"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="257" preserveAspectRatio="xMidYMid"><path fill="#262627" d="M121.24.474c33.019-2.718 56.734 6.045 82.25 31.547 27.549 27.532 45.864 63.212 50.8 101.218 5.492 42.266-2.062 73.807-25.326 96.898-22.247 22.08-54.74 29.364-98.146 25.735l-1.797-.158c-36.963-3.398-63.107-15.517-88.438-41.171C13.526 187.14-.732 156.026.029 123.37c.372-15.987 4.901-29.612 13.635-42.98 5.726-8.765 11.54-15.602 23.704-28.14l4.06-4.158 4.474-4.536C74.73 14.58 93.707 2.741 121.24.475zm80.288 33.51C176.586 9.057 153.672.59 121.468 3.241c-27.14 2.234-45.78 14.091-74.95 43.635l-2.11 2.141c-14.21 14.448-20.87 21.835-26.738 30.378l-.854 1.26-.828 1.252c-8.461 12.95-12.824 26.078-13.184 41.528-.743 31.846 13.194 62.258 39.754 89.157 25.267 25.59 51.225 37.4 88.49 40.514l1.85.148c41.744 3.21 72.867-4.002 94.11-25.087 22.57-22.402 29.92-53.088 24.53-94.57-4.855-37.382-22.884-72.503-50.01-99.613M166.984 93.39v13.56h-28.797v77.712h-14.345V106.95H95.045V93.39h71.94z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/UProc/GenericFunctions.ts b/packages/nodes-base/nodes/UProc/GenericFunctions.ts
index 9b96f5b51de01..bad8de0251cd1 100644
--- a/packages/nodes-base/nodes/UProc/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/UProc/GenericFunctions.ts
@@ -1,7 +1,6 @@
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	IHttpRequestMethods,
@@ -11,15 +10,15 @@ import type {
 import { NodeApiError } from 'n8n-workflow';
 
 export async function uprocApiRequest(
-	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	body: any = {},
 	qs: IDataObject = {},
 	uri?: string,
 	_option: IDataObject = {},
 ): Promise<any> {
 	const options: IHttpRequestOptions = {
-		method: method as IHttpRequestMethods,
+		method,
 		qs,
 		body,
 		url: 'https://api.uproc.io/api/v2/process',
@@ -29,6 +28,7 @@ export async function uprocApiRequest(
 	try {
 		return await this.helpers.httpRequestWithAuthentication.call(this, 'uprocApi', options);
 	} catch (error) {
+		if (error instanceof NodeApiError) throw error;
 		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
diff --git a/packages/nodes-base/nodes/UProc/UProc.node.ts b/packages/nodes-base/nodes/UProc/UProc.node.ts
index bcd9f2967a83a..298e1f5efde79 100644
--- a/packages/nodes-base/nodes/UProc/UProc.node.ts
+++ b/packages/nodes-base/nodes/UProc/UProc.node.ts
@@ -102,7 +102,6 @@ export class UProc implements INodeType {
 				return field.name;
 			});
 
-		const _requestPromises = [];
 		for (let i = 0; i < length; i++) {
 			try {
 				const toolKey = tool.replace(/([A-Z]+)/g, '-$1').toLowerCase();
diff --git a/packages/nodes-base/nodes/UnleashedSoftware/GenericFunctions.ts b/packages/nodes-base/nodes/UnleashedSoftware/GenericFunctions.ts
index 510cc36b606d6..23c0b1d8c62a8 100644
--- a/packages/nodes-base/nodes/UnleashedSoftware/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/UnleashedSoftware/GenericFunctions.ts
@@ -1,22 +1,20 @@
-import type { OptionsWithUrl } from 'request';
-
+import { createHmac } from 'crypto';
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	JsonObject,
+	IRequestOptions,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import { createHmac } from 'crypto';
-
 import qs from 'qs';
 
 export async function unleashedApiRequest(
-	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	path: string,
 	body: IDataObject = {},
 	query: IDataObject = {},
@@ -25,7 +23,7 @@ export async function unleashedApiRequest(
 ) {
 	const paginatedPath = pageNumber ? `/${path}/${pageNumber}` : `/${path}`;
 
-	const options: OptionsWithUrl = {
+	const options: IRequestOptions = {
 		headers: {
 			Accept: 'application/json',
 			'Content-Type': 'application/json',
@@ -62,7 +60,7 @@ export async function unleashedApiRequest(
 export async function unleashedApiRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject = {},
 	query: IDataObject = {},
diff --git a/packages/nodes-base/nodes/UnleashedSoftware/UnleashedSoftware.node.ts b/packages/nodes-base/nodes/UnleashedSoftware/UnleashedSoftware.node.ts
index 69ff21a8cafba..6bbab8a80ecd3 100644
--- a/packages/nodes-base/nodes/UnleashedSoftware/UnleashedSoftware.node.ts
+++ b/packages/nodes-base/nodes/UnleashedSoftware/UnleashedSoftware.node.ts
@@ -6,6 +6,7 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
+import moment from 'moment-timezone';
 import {
 	convertNETDates,
 	unleashedApiRequest,
@@ -16,8 +17,6 @@ import { salesOrderFields, salesOrderOperations } from './SalesOrderDescription'
 
 import { stockOnHandFields, stockOnHandOperations } from './StockOnHandDescription';
 
-import moment from 'moment';
-
 export class UnleashedSoftware implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Unleashed Software',
@@ -194,6 +193,6 @@ export class UnleashedSoftware implements INodeType {
 			returnData.push(...executionData);
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Uplead/GenericFunctions.ts b/packages/nodes-base/nodes/Uplead/GenericFunctions.ts
index b18069ad2a79f..1c73b029fddd8 100644
--- a/packages/nodes-base/nodes/Uplead/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Uplead/GenericFunctions.ts
@@ -1,17 +1,17 @@
-import type { OptionsWithUri } from 'request';
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
+	IRequestOptions,
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function upleadApiRequest(
-	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -20,7 +20,7 @@ export async function upleadApiRequest(
 	option: IDataObject = {},
 ): Promise<any> {
 	const credentials = await this.getCredentials('upleadApi');
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		headers: { Authorization: credentials.apiKey },
 		method,
 		qs,
diff --git a/packages/nodes-base/nodes/Uplead/PersonDescription.ts b/packages/nodes-base/nodes/Uplead/PersonDescription.ts
index 69b2278a9df96..86aa23307713f 100644
--- a/packages/nodes-base/nodes/Uplead/PersonDescription.ts
+++ b/packages/nodes-base/nodes/Uplead/PersonDescription.ts
@@ -41,7 +41,7 @@ export const personFields: INodeProperties[] = [
 		description: 'Email address (e.g – mbenioff@salesforce.com)',
 	},
 	{
-		displayName: 'Fist Name',
+		displayName: 'First Name',
 		name: 'firstname',
 		type: 'string',
 		default: '',
diff --git a/packages/nodes-base/nodes/UptimeRobot/GenericFunctions.ts b/packages/nodes-base/nodes/UptimeRobot/GenericFunctions.ts
index 4643c82dcfe9d..308c1c4a07154 100644
--- a/packages/nodes-base/nodes/UptimeRobot/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/UptimeRobot/GenericFunctions.ts
@@ -1,11 +1,15 @@
-import type { OptionsWithUri } from 'request';
-
-import type { IExecuteFunctions, IDataObject, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IDataObject,
+	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
+} from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 export async function uptimeRobotApiRequest(
 	this: IExecuteFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 	body: IDataObject = {},
 	qs: IDataObject = {},
@@ -14,7 +18,7 @@ export async function uptimeRobotApiRequest(
 ) {
 	const credentials = await this.getCredentials('uptimeRobotApi');
 
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		method,
 		qs,
 		form: {
diff --git a/packages/nodes-base/nodes/UptimeRobot/MaintenanceWindowDescription.ts b/packages/nodes-base/nodes/UptimeRobot/MaintenanceWindowDescription.ts
index 296739d4da264..68985226578a9 100644
--- a/packages/nodes-base/nodes/UptimeRobot/MaintenanceWindowDescription.ts
+++ b/packages/nodes-base/nodes/UptimeRobot/MaintenanceWindowDescription.ts
@@ -122,7 +122,7 @@ export const maintenanceWindowFields: INodeProperties[] = [
 				type: [3],
 			},
 		},
-		// eslint-disable-next-line n8n-nodes-base/node-param-options-type-unsorted-items
+
 		options: [
 			{
 				name: 'Monday',
@@ -354,7 +354,7 @@ export const maintenanceWindowFields: INodeProperties[] = [
 						type: [3],
 					},
 				},
-				// eslint-disable-next-line n8n-nodes-base/node-param-options-type-unsorted-items
+
 				options: [
 					{
 						name: 'Monday',
diff --git a/packages/nodes-base/nodes/UptimeRobot/MonitorDescription.ts b/packages/nodes-base/nodes/UptimeRobot/MonitorDescription.ts
index 148c298f0b269..7ba57fb4a90ff 100644
--- a/packages/nodes-base/nodes/UptimeRobot/MonitorDescription.ts
+++ b/packages/nodes-base/nodes/UptimeRobot/MonitorDescription.ts
@@ -234,7 +234,7 @@ export const monitorFields: INodeProperties[] = [
 				name: 'statuses',
 				type: 'multiOptions',
 				default: [],
-				// eslint-disable-next-line n8n-nodes-base/node-param-multi-options-type-unsorted-items
+
 				options: [
 					{
 						name: 'Paused',
@@ -385,6 +385,7 @@ export const monitorFields: INodeProperties[] = [
 				displayName: 'HTTP Password',
 				name: 'http_password',
 				type: 'string',
+				typeOptions: { password: true },
 				default: '',
 				description: 'The password used for password-protected web pages',
 			},
diff --git a/packages/nodes-base/nodes/UptimeRobot/UptimeRobot.node.ts b/packages/nodes-base/nodes/UptimeRobot/UptimeRobot.node.ts
index 0fb7324c76c5e..c6b205254d594 100644
--- a/packages/nodes-base/nodes/UptimeRobot/UptimeRobot.node.ts
+++ b/packages/nodes-base/nodes/UptimeRobot/UptimeRobot.node.ts
@@ -6,6 +6,7 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
+import moment from 'moment-timezone';
 import { uptimeRobotApiRequest } from './GenericFunctions';
 
 import { monitorFields, monitorOperations } from './MonitorDescription';
@@ -19,8 +20,6 @@ import {
 
 import { publicStatusPageFields, publicStatusPageOperations } from './PublicStatusPageDescription';
 
-import moment from 'moment-timezone';
-
 export class UptimeRobot implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'UptimeRobot',
diff --git a/packages/nodes-base/nodes/UrlScanIo/GenericFunctions.ts b/packages/nodes-base/nodes/UrlScanIo/GenericFunctions.ts
index d69867a7f6e47..558d54496efc9 100644
--- a/packages/nodes-base/nodes/UrlScanIo/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/UrlScanIo/GenericFunctions.ts
@@ -1,6 +1,4 @@
-import type { OptionsWithUri } from 'request';
-
-import type { IExecuteFunctions, IDataObject } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, IRequestOptions } from 'n8n-workflow';
 
 export async function urlScanIoApiRequest(
 	this: IExecuteFunctions,
@@ -9,7 +7,7 @@ export async function urlScanIoApiRequest(
 	body: IDataObject = {},
 	qs: IDataObject = {},
 ) {
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		method,
 		body,
 		qs,
@@ -25,7 +23,7 @@ export async function urlScanIoApiRequest(
 		delete options.qs;
 	}
 
-	return this.helpers.requestWithAuthentication.call(this, 'urlScanIoApi', options);
+	return await this.helpers.requestWithAuthentication.call(this, 'urlScanIoApi', options);
 }
 
 export async function handleListing(
diff --git a/packages/nodes-base/nodes/UrlScanIo/urlScanIo.svg b/packages/nodes-base/nodes/UrlScanIo/urlScanIo.svg
index e361a718c5ff8..e27957b65670d 100644
--- a/packages/nodes-base/nodes/UrlScanIo/urlScanIo.svg
+++ b/packages/nodes-base/nodes/UrlScanIo/urlScanIo.svg
@@ -1 +1 @@
-<svg height="2500" width="2500" xmlns="http://www.w3.org/2000/svg" viewBox="70 70 884 884"><path d="M512 70c244 0 442 198 442 442S756 954 512 954 70 756 70 512 268 70 512 70z" fill="#e35946"/><path d="M772 730c10 9 16 22 16 37 0 29-24 53-53 53-15 0-28-6-37-16L548 655c-34 23-76 37-121 37-120 0-218-98-218-218s98-218 218-218 218 98 218 218c0 37-9 72-26 102z" fill="#b74837"/><path d="M789 721c0 29-24 53-53 53-15 0-28-6-37-16L504 564c32-18 57-46 70-80l199 200c10 9 16 22 16 37z" fill="#294658"/><path d="M428 272c86 0 156 70 156 156s-70 156-156 156-156-70-156-156 70-156 156-156z" fill="#26495d"/><path d="M428 606c-82 0-148-66-148-148s66-148 148-148 148 66 148 148-66 148-148 148z" fill="#3b637d"/><path d="M403 334c23 0 41 18 41 41s-18 41-41 41-41-18-41-41 18-41 41-41z" fill="#9db2c2"/><path d="M428 646c-120 0-218-98-218-218s98-218 218-218 218 98 218 218-98 218-218 218zm0-366c-82 0-148 66-148 148s66 148 148 148 148-66 148-148-66-148-148-148z" fill="#e5e9ec"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="2500" height="2500" viewBox="70 70 884 884"><path fill="#e35946" d="M512 70c244 0 442 198 442 442S756 954 512 954 70 756 70 512 268 70 512 70"/><path fill="#b74837" d="M772 730c10 9 16 22 16 37 0 29-24 53-53 53-15 0-28-6-37-16L548 655c-34 23-76 37-121 37-120 0-218-98-218-218s98-218 218-218 218 98 218 218c0 37-9 72-26 102z"/><path fill="#294658" d="M789 721c0 29-24 53-53 53-15 0-28-6-37-16L504 564c32-18 57-46 70-80l199 200c10 9 16 22 16 37"/><path fill="#26495d" d="M428 272c86 0 156 70 156 156s-70 156-156 156-156-70-156-156 70-156 156-156"/><path fill="#3b637d" d="M428 606c-82 0-148-66-148-148s66-148 148-148 148 66 148 148-66 148-148 148"/><path fill="#9db2c2" d="M403 334c23 0 41 18 41 41s-18 41-41 41-41-18-41-41 18-41 41-41"/><path fill="#e5e9ec" d="M428 646c-120 0-218-98-218-218s98-218 218-218 218 98 218 218-98 218-218 218m0-366c-82 0-148 66-148 148s66 148 148 148 148-66 148-148-66-148-148-148"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Venafi/Datacenter/CertificateDescription.ts b/packages/nodes-base/nodes/Venafi/Datacenter/CertificateDescription.ts
index 2d33a91df73d2..3973d830627a9 100644
--- a/packages/nodes-base/nodes/Venafi/Datacenter/CertificateDescription.ts
+++ b/packages/nodes-base/nodes/Venafi/Datacenter/CertificateDescription.ts
@@ -654,6 +654,7 @@ export const certificateFields: INodeProperties[] = [
 				displayName: 'Keystore Password',
 				name: 'KeystorePassword',
 				type: 'string',
+				typeOptions: { password: true },
 				default: '',
 			},
 		],
diff --git a/packages/nodes-base/nodes/Venafi/Datacenter/GenericFunctions.ts b/packages/nodes-base/nodes/Venafi/Datacenter/GenericFunctions.ts
index 55d14056531d7..6887a0cf78386 100644
--- a/packages/nodes-base/nodes/Venafi/Datacenter/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Venafi/Datacenter/GenericFunctions.ts
@@ -1,18 +1,18 @@
-import type { OptionsWithUri } from 'request';
-
+import { ApplicationError } from 'n8n-workflow';
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
 	IPollFunctions,
+	IRequestOptions,
 } from 'n8n-workflow';
 
-import get from 'lodash.get';
+import get from 'lodash/get';
 
 export async function venafiApiRequest(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IPollFunctions,
-	method: string,
+	this: IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 	body: IDataObject = {},
 	qs: IDataObject = {},
@@ -21,7 +21,7 @@ export async function venafiApiRequest(
 ): Promise<any> {
 	const credentials = (await this.getCredentials('venafiTlsProtectDatacenterApi')) as IDataObject;
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			'Content-Type': 'application/json',
 		},
@@ -51,7 +51,10 @@ export async function venafiApiRequest(
 
 			errors = errors.map((e: IDataObject) => e.message);
 			// Try to return the error prettier
-			throw new Error(`Venafi error response [${error.statusCode}]: ${errors.join('|')}`);
+			throw new ApplicationError(
+				`Venafi error response [${error.statusCode}]: ${errors.join('|')}`,
+				{ level: 'warning' },
+			);
 		}
 		throw error;
 	}
@@ -60,7 +63,7 @@ export async function venafiApiRequest(
 export async function venafiApiRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject = {},
 	query: IDataObject = {},
diff --git a/packages/nodes-base/nodes/Venafi/Datacenter/VenafiTlsProtectDatacenterTrigger.node.ts b/packages/nodes-base/nodes/Venafi/Datacenter/VenafiTlsProtectDatacenterTrigger.node.ts
index 7035cbdaf2a0d..518e539a59223 100644
--- a/packages/nodes-base/nodes/Venafi/Datacenter/VenafiTlsProtectDatacenterTrigger.node.ts
+++ b/packages/nodes-base/nodes/Venafi/Datacenter/VenafiTlsProtectDatacenterTrigger.node.ts
@@ -6,7 +6,7 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
-import moment from 'moment';
+import moment from 'moment-timezone';
 
 import { venafiApiRequest } from './GenericFunctions';
 
diff --git a/packages/nodes-base/nodes/Venafi/ProtectCloud/CertificateRequestDescription.ts b/packages/nodes-base/nodes/Venafi/ProtectCloud/CertificateRequestDescription.ts
index 9090c78dd5f66..91e8e6fa9f856 100644
--- a/packages/nodes-base/nodes/Venafi/ProtectCloud/CertificateRequestDescription.ts
+++ b/packages/nodes-base/nodes/Venafi/ProtectCloud/CertificateRequestDescription.ts
@@ -86,24 +86,6 @@ export const certificateRequestFields: INodeProperties[] = [
 		},
 		default: false,
 	},
-	{
-		displayName: 'Application Server Type Name or ID',
-		name: 'applicationServerTypeId',
-		type: 'options',
-		description:
-			'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
-		typeOptions: {
-			loadOptionsMethod: 'getApplicationServerTypes',
-		},
-		displayOptions: {
-			show: {
-				operation: ['create'],
-				resource: ['certificateRequest'],
-				generateCsr: [true],
-			},
-		},
-		default: '',
-	},
 	{
 		displayName: 'Common Name',
 		name: 'commonName',
diff --git a/packages/nodes-base/nodes/Venafi/ProtectCloud/GenericFunctions.ts b/packages/nodes-base/nodes/Venafi/ProtectCloud/GenericFunctions.ts
index 7bdffa5541287..de82bd7585ab1 100644
--- a/packages/nodes-base/nodes/Venafi/ProtectCloud/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Venafi/ProtectCloud/GenericFunctions.ts
@@ -1,22 +1,21 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	ILoadOptionsFunctions,
 	IDataObject,
 	IHookFunctions,
 	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import get from 'lodash.get';
+import get from 'lodash/get';
 
 import * as nacl_factory from 'js-nacl';
 
 export async function venafiApiRequest(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IHookFunctions,
-	method: string,
+	this: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 	body = {},
 	qs: IDataObject = {},
@@ -24,8 +23,11 @@ export async function venafiApiRequest(
 	option: IDataObject = {},
 ): Promise<any> {
 	const operation = this.getNodeParameter('operation', 0);
+	const credentials = await this.getCredentials('venafiTlsProtectCloudApi');
+
+	const region = credentials.region ?? 'cloud';
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			Accept: 'application/json',
 			'content-type': 'application/json',
@@ -33,7 +35,7 @@ export async function venafiApiRequest(
 		method,
 		body,
 		qs,
-		uri: `https://api.venafi.cloud${resource}`,
+		uri: `https://api.venafi.${region}${resource}`,
 		json: true,
 	};
 
@@ -68,7 +70,7 @@ export async function venafiApiRequest(
 export async function venafiApiRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: IDataObject = {},
@@ -119,7 +121,7 @@ export async function encryptPassphrase(
 	let encryptedKeyStorePass = '';
 
 	const promise = async () => {
-		return new Promise((resolve, reject) => {
+		return await new Promise((resolve, reject) => {
 			nacl_factory.instantiate((nacl: any) => {
 				try {
 					const passphraseUTF8 = nacl.encode_utf8(passphrase) as string;
@@ -140,5 +142,5 @@ export async function encryptPassphrase(
 			});
 		});
 	};
-	return promise();
+	return await promise();
 }
diff --git a/packages/nodes-base/nodes/Venafi/ProtectCloud/VenafiTlsProtectCloud.node.ts b/packages/nodes-base/nodes/Venafi/ProtectCloud/VenafiTlsProtectCloud.node.ts
index 97fb3876f2d44..25a09ea38a4bd 100644
--- a/packages/nodes-base/nodes/Venafi/ProtectCloud/VenafiTlsProtectCloud.node.ts
+++ b/packages/nodes-base/nodes/Venafi/ProtectCloud/VenafiTlsProtectCloud.node.ts
@@ -88,23 +88,6 @@ export class VenafiTlsProtectCloud implements INodeType {
 				}
 				return returnData;
 			},
-			async getApplicationServerTypes(
-				this: ILoadOptionsFunctions,
-			): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const { applicationServerTypes } = await venafiApiRequest.call(
-					this,
-					'GET',
-					'/outagedetection/v1/applicationservertypes',
-				);
-				for (const applicationServerType of applicationServerTypes) {
-					returnData.push({
-						name: applicationServerType.platformName,
-						value: applicationServerType.id,
-					});
-				}
-				return returnData;
-			},
 			async getCertificateIssuingTemplates(
 				this: ILoadOptionsFunctions,
 			): Promise<INodePropertyOptions[]> {
@@ -157,10 +140,6 @@ export class VenafiTlsProtectCloud implements INodeType {
 						};
 
 						if (generateCsr) {
-							const applicationServerTypeId = this.getNodeParameter(
-								'applicationServerTypeId',
-								i,
-							) as string;
 							const commonName = this.getNodeParameter('commonName', i) as string;
 							const additionalFields = this.getNodeParameter('additionalFields', i);
 
@@ -169,7 +148,6 @@ export class VenafiTlsProtectCloud implements INodeType {
 							const subjectAltNamesByType: ISubjectAltNamesByType = {};
 
 							body.isVaaSGenerated = true;
-							body.applicationServerTypeId = applicationServerTypeId;
 
 							csrAttributes.commonName = commonName;
 
diff --git a/packages/nodes-base/nodes/Venafi/ProtectCloud/VenafiTlsProtectCloudTrigger.node.ts b/packages/nodes-base/nodes/Venafi/ProtectCloud/VenafiTlsProtectCloudTrigger.node.ts
index dd9aaf6316942..75478cc78d43e 100644
--- a/packages/nodes-base/nodes/Venafi/ProtectCloud/VenafiTlsProtectCloudTrigger.node.ts
+++ b/packages/nodes-base/nodes/Venafi/ProtectCloud/VenafiTlsProtectCloudTrigger.node.ts
@@ -106,6 +106,7 @@ export class VenafiTlsProtectCloudTrigger implements INodeType {
 				for (const connector of connectors) {
 					const {
 						id,
+						status,
 						properties: {
 							target: {
 								connection: { url },
@@ -113,7 +114,7 @@ export class VenafiTlsProtectCloudTrigger implements INodeType {
 						},
 					} = connector;
 
-					if (url === webhookUrl) {
+					if (url === webhookUrl && status === 'Active') {
 						await venafiApiRequest.call(this, 'DELETE', `/v1/connectors/${id}`);
 						return false;
 					}
@@ -172,10 +173,10 @@ export class VenafiTlsProtectCloudTrigger implements INodeType {
 	};
 
 	async webhook(this: IWebhookFunctions): Promise<IWebhookResponseData> {
-		const bodyData = this.getBodyData() as { message: string; eventName: string };
+		const { events } = this.getBodyData() as { events: [{ message: string; eventName: string }] };
 		const triggerOn = this.getNodeParameter('triggerOn') as string;
 
-		if (Object.keys(bodyData).length === 1 && bodyData.message) {
+		if (Array.isArray(events) && events[0]?.message?.includes('TESTING CONNECTION...')) {
 			// Is a create webhook confirmation request
 			const res = this.getResponseObject();
 			res.status(200).end();
@@ -184,10 +185,10 @@ export class VenafiTlsProtectCloudTrigger implements INodeType {
 			};
 		}
 
-		if (!triggerOn.includes('*') && !triggerOn.includes(bodyData.eventName)) return {};
+		if (!triggerOn.includes('*') && !triggerOn.includes(events[0]?.eventName)) return {};
 
 		return {
-			workflowData: [this.helpers.returnJsonArray(bodyData)],
+			workflowData: [this.helpers.returnJsonArray(events)],
 		};
 	}
 }
diff --git a/packages/nodes-base/nodes/Venafi/venafi.svg b/packages/nodes-base/nodes/Venafi/venafi.svg
index 70ed4594fa93a..a9196165bcf86 100644
--- a/packages/nodes-base/nodes/Venafi/venafi.svg
+++ b/packages/nodes-base/nodes/Venafi/venafi.svg
@@ -1 +1 @@
-<svg id="SvgjsSvg1001" width="288" height="288" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svgjs="http://svgjs.com/svgjs"><defs id="SvgjsDefs1002"></defs><g id="SvgjsG1008"><svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" class="animicon" viewBox="0 0 58 49" width="288" height="288"><path d="M15.3387 9.94015C18.0582 17.5866 22.0735 24.6859 27.2014 30.9138L28.9394 32.9761L30.6976 30.9138C35.8337 24.6846 39.8621 17.5863 42.6007 9.94015H36.6996C34.7605 14.8817 32.1701 19.5303 29 23.7575C25.8286 19.5348 23.2444 14.885 21.3206 9.94015H15.3387Z" fill="#ff6333" class="color000 svgShape"></path><path d="M39.6704 0.0618034C39.5289 0.412393 38.1951 4.43394 37.4878 6.06315H48.8251C44.8538 17.1118 39.0274 27.3702 31.607 36.3788L29.0808 39.4311L26.5547 36.3788C19.1282 27.3515 13.3016 17.0717 9.33659 6.00122H20.1282C19.4209 4.37201 18.1073 0.35059 17.9456 0H0C5.83647 16.2283 14.3983 31.295 25.3017 44.5249L29 49L32.7185 44.5249C43.6117 31.2913 52.1663 16.2252 58 0L39.6704 0.0618034Z" fill="#ff6333" class="color000 svgShape"></path></svg></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="288" height="288"><svg xmlns="http://www.w3.org/2000/svg" width="288" height="288" fill="currentColor" class="animicon" viewBox="0 0 58 49"><path fill="#ff6333" d="M15.339 9.94A69.8 69.8 0 0 0 27.2 30.914l1.738 2.062 1.759-2.062A70.1 70.1 0 0 0 42.6 9.94H36.7A58.9 58.9 0 0 1 29 23.758 58 58 0 0 1 21.32 9.94z" class="color000 svgShape"/><path fill="#ff6333" d="M39.67.062c-.141.35-1.475 4.372-2.182 6.001h11.337A101.9 101.9 0 0 1 31.607 36.38l-2.526 3.052-2.526-3.052A101.9 101.9 0 0 1 9.337 6h10.791C19.421 4.372 18.108.351 17.946 0H0c5.836 16.228 14.398 31.295 25.302 44.525L29 49l3.718-4.475C43.613 31.29 52.167 16.225 58 0z" class="color000 svgShape"/></svg></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Vero/GenericFunctions.ts b/packages/nodes-base/nodes/Vero/GenericFunctions.ts
index cb2b1a087f001..51df117aa1382 100644
--- a/packages/nodes-base/nodes/Vero/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Vero/GenericFunctions.ts
@@ -1,16 +1,16 @@
-import type { OptionsWithUri } from 'request';
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
+	IRequestOptions,
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function veroApiRequest(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -20,7 +20,7 @@ export async function veroApiRequest(
 ): Promise<any> {
 	const credentials = await this.getCredentials('veroApi');
 
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		method,
 		qs,
 		body,
diff --git a/packages/nodes-base/nodes/Vero/vero.svg b/packages/nodes-base/nodes/Vero/vero.svg
index 46f4cf1efa9c4..35fa614dc85a8 100644
--- a/packages/nodes-base/nodes/Vero/vero.svg
+++ b/packages/nodes-base/nodes/Vero/vero.svg
@@ -1,21 +1 @@
-<svg width="225" height="225" xmlns="http://www.w3.org/2000/svg" fill="none">
- <defs>
-  <linearGradient y2="0.53466" y1="0.45356" x2="-0.15926" x1="1.04746" id="a">
-   <stop stop-color="#2936a3" offset="0"/>
-   <stop stop-color="#162286" offset="1"/>
-  </linearGradient>
-  <linearGradient y2="0.15582" y1="0.6753" x2="0.95825" x1="-0.19201" id="b">
-   <stop stop-color="#2297f4" offset="0"/>
-   <stop stop-color="#31a0f9" offset="1"/>
-  </linearGradient>
- </defs>
- <clipPath id="c">
-  <path id="svg_1" d="m0,0l720,0l0,150.523l-720,0l0,-150.523z"/>
- </clipPath>
- <g>
-  <title>Layer 1</title>
-  <path stroke="null" id="svg_4" fill="url(#a)" d="m211.145,121.3891c18.18,-18.1614 18.18,-47.6067 0,-65.7681c-18.18,-18.16132 -47.656,-18.16135 -65.836,0l-32.919,32.8841l32.817,32.7831c0.034,0.0338 0.068,0.0674 0.101,0.1011c18.161,18.1421 47.594,18.1613 65.779,0.0578l0.058,-0.058z"/>
-  <path stroke="null" id="svg_5" fill="#17da88" d="m46.5554,154.275l-32.9202,-32.8854c-18.18028,-18.1613 -18.18026,-47.6066 0,-65.768c18.1803,-18.16133 47.6564,-18.16132 65.8367,0l32.9201,32.8859l-65.8366,65.7675z"/>
-  <path stroke="null" id="svg_6" fill="url(#b)" d="m211.145,121.3893c-18.18,18.1613 -47.656,18.1613 -65.836,0c-0.034,-0.0337 -0.068,-0.0674 -0.101,-0.1011l-32.816,-32.781l-65.8363,65.7678l18.8086,18.789c25.9719,25.945 68.0807,25.945 94.0527,0l51.728,-51.6747z"/>
- </g>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="225" height="225" fill="none"><defs><linearGradient id="a" x1="1.047" x2="-.159" y1=".454" y2=".535"><stop offset="0" stop-color="#2936a3"/><stop offset="1" stop-color="#162286"/></linearGradient><linearGradient id="b" x1="-.192" x2=".958" y1=".675" y2=".156"><stop offset="0" stop-color="#2297f4"/><stop offset="1" stop-color="#31a0f9"/></linearGradient></defs><path fill="url(#a)" stroke="null" d="M211.145 121.39c18.18-18.162 18.18-47.608 0-65.769s-47.656-18.161-65.836 0L112.39 88.505l32.817 32.783.101.101c18.161 18.142 47.594 18.162 65.779.058z"/><path fill="#17da88" stroke="null" d="m46.555 154.275-32.92-32.885c-18.18-18.162-18.18-47.607 0-65.768s47.657-18.162 65.837 0l32.92 32.886z"/><path fill="url(#b)" stroke="null" d="M211.145 121.39c-18.18 18.16-47.656 18.16-65.836 0l-.101-.102-32.816-32.78-65.836 65.767 18.808 18.789c25.972 25.945 68.081 25.945 94.053 0z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Vonage/GenericFunctions.ts b/packages/nodes-base/nodes/Vonage/GenericFunctions.ts
index b67d956f451f7..41618f755c926 100644
--- a/packages/nodes-base/nodes/Vonage/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Vonage/GenericFunctions.ts
@@ -1,19 +1,17 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	ILoadOptionsFunctions,
 	IDataObject,
 	JsonObject,
+	IRequestOptions,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function vonageApiRequest(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	path: string,
-
 	body: any = {},
 	qs: IDataObject = {},
 	_option = {},
@@ -24,7 +22,7 @@ export async function vonageApiRequest(
 
 	body.api_secret = credentials.apiSecret as string;
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		method,
 		form: body,
 		qs,
diff --git a/packages/nodes-base/nodes/Vonage/Vonage.node.ts b/packages/nodes-base/nodes/Vonage/Vonage.node.ts
index 162b982c3aec2..b6944f4f1a2f7 100644
--- a/packages/nodes-base/nodes/Vonage/Vonage.node.ts
+++ b/packages/nodes-base/nodes/Vonage/Vonage.node.ts
@@ -133,7 +133,7 @@ export class Vonage implements INodeType {
 			// 	description: 'The format of the message body',
 			// },
 			// {
-			// 	displayName: 'Binary Property',
+			// 	displayName: 'Input Binary Field',
 			// 	name: 'binaryPropertyName',
 			// 	displayOptions: {
 			// 		show: {
diff --git a/packages/nodes-base/nodes/Wait/Wait.node.json b/packages/nodes-base/nodes/Wait/Wait.node.json
index 6e8098d3efd88..73debf51a21db 100644
--- a/packages/nodes-base/nodes/Wait/Wait.node.json
+++ b/packages/nodes-base/nodes/Wait/Wait.node.json
@@ -23,6 +23,6 @@
 	},
 	"alias": ["pause", "sleep", "delay", "timeout"],
 	"subcategories": {
-		"Core Nodes": ["Flow"]
+		"Core Nodes": ["Helpers", "Flow"]
 	}
 }
diff --git a/packages/nodes-base/nodes/Wait/Wait.node.ts b/packages/nodes-base/nodes/Wait/Wait.node.ts
index a6eff82ad7133..f30b006a08c64 100644
--- a/packages/nodes-base/nodes/Wait/Wait.node.ts
+++ b/packages/nodes-base/nodes/Wait/Wait.node.ts
@@ -1,50 +1,233 @@
+import { DateTime } from 'luxon';
 import type {
 	IExecuteFunctions,
-	ICredentialDataDecryptedObject,
-	IDataObject,
 	INodeExecutionData,
-	INodeType,
 	INodeTypeDescription,
+	INodeProperties,
+	IDisplayOptions,
 	IWebhookFunctions,
-	IWebhookResponseData,
 } from 'n8n-workflow';
-import { BINARY_ENCODING, WAIT_TIME_UNLIMITED, NodeOperationError } from 'n8n-workflow';
-
-import fs from 'fs';
-import stream from 'stream';
-import { promisify } from 'util';
-import basicAuth from 'basic-auth';
-import type { Response } from 'express';
-import formidable from 'formidable';
-import isbot from 'isbot';
-import { file as tmpFile } from 'tmp-promise';
-
-const pipeline = promisify(stream.pipeline);
-
-function authorizationError(resp: Response, realm: string, responseCode: number, message?: string) {
-	if (message === undefined) {
-		message = 'Authorization problem!';
-		if (responseCode === 401) {
-			message = 'Authorization is required!';
-		} else if (responseCode === 403) {
-			message = 'Authorization data is wrong!';
-		}
-	}
-
-	resp.writeHead(responseCode, { 'WWW-Authenticate': `Basic realm="${realm}"` });
-	resp.end(message);
-	return {
-		noWebhookResponse: true,
-	};
-}
+import { WAIT_TIME_UNLIMITED } from 'n8n-workflow';
+
+import {
+	authenticationProperty,
+	credentialsProperty,
+	defaultWebhookDescription,
+	httpMethodsProperty,
+	optionsProperty,
+	responseBinaryPropertyNameProperty,
+	responseCodeProperty,
+	responseDataProperty,
+	responseModeProperty,
+} from '../Webhook/description';
+
+import {
+	formDescription,
+	formFields,
+	respondWithOptions,
+	formRespondMode,
+	formTitle,
+} from '../Form/common.descriptions';
+import { formWebhook } from '../Form/utils';
+import { updateDisplayOptions } from '../../utils/utilities';
+import { Webhook } from '../Webhook/Webhook.node';
+
+const toWaitAmount: INodeProperties = {
+	displayName: 'Wait Amount',
+	name: 'amount',
+	type: 'number',
+	typeOptions: {
+		minValue: 0,
+		numberPrecision: 2,
+	},
+	default: 1,
+	description: 'The time to wait',
+};
+
+const unitSelector: INodeProperties = {
+	displayName: 'Wait Unit',
+	name: 'unit',
+	type: 'options',
+	options: [
+		{
+			name: 'Seconds',
+			value: 'seconds',
+		},
+		{
+			name: 'Minutes',
+			value: 'minutes',
+		},
+		{
+			name: 'Hours',
+			value: 'hours',
+		},
+		{
+			name: 'Days',
+			value: 'days',
+		},
+	],
+	default: 'hours',
+	description: 'The time unit of the Wait Amount value',
+};
+
+const waitTimeProperties: INodeProperties[] = [
+	{
+		displayName: 'Limit Wait Time',
+		name: 'limitWaitTime',
+		type: 'boolean',
+		default: false,
+		description:
+			'Whether the workflow will automatically resume execution after the specified limit type',
+		displayOptions: {
+			show: {
+				resume: ['webhook', 'form'],
+			},
+		},
+	},
+	{
+		displayName: 'Limit Type',
+		name: 'limitType',
+		type: 'options',
+		default: 'afterTimeInterval',
+		description:
+			'Sets the condition for the execution to resume. Can be a specified date or after some time.',
+		displayOptions: {
+			show: {
+				limitWaitTime: [true],
+				resume: ['webhook', 'form'],
+			},
+		},
+		options: [
+			{
+				name: 'After Time Interval',
+				description: 'Waits for a certain amount of time',
+				value: 'afterTimeInterval',
+			},
+			{
+				name: 'At Specified Time',
+				description: 'Waits until the set date and time to continue',
+				value: 'atSpecifiedTime',
+			},
+		],
+	},
+	{
+		displayName: 'Amount',
+		name: 'resumeAmount',
+		type: 'number',
+		displayOptions: {
+			show: {
+				limitType: ['afterTimeInterval'],
+				limitWaitTime: [true],
+				resume: ['webhook', 'form'],
+			},
+		},
+		typeOptions: {
+			minValue: 0,
+			numberPrecision: 2,
+		},
+		default: 1,
+		description: 'The time to wait',
+	},
+	{
+		displayName: 'Unit',
+		name: 'resumeUnit',
+		type: 'options',
+		displayOptions: {
+			show: {
+				limitType: ['afterTimeInterval'],
+				limitWaitTime: [true],
+				resume: ['webhook', 'form'],
+			},
+		},
+		options: [
+			{
+				name: 'Seconds',
+				value: 'seconds',
+			},
+			{
+				name: 'Minutes',
+				value: 'minutes',
+			},
+			{
+				name: 'Hours',
+				value: 'hours',
+			},
+			{
+				name: 'Days',
+				value: 'days',
+			},
+		],
+		default: 'hours',
+		description: 'Unit of the interval value',
+	},
+	{
+		displayName: 'Max Date and Time',
+		name: 'maxDateAndTime',
+		type: 'dateTime',
+		displayOptions: {
+			show: {
+				limitType: ['atSpecifiedTime'],
+				limitWaitTime: [true],
+				resume: ['webhook', 'form'],
+			},
+		},
+		default: '',
+		description: 'Continue execution after the specified date and time',
+	},
+];
+
+const webhookSuffix: INodeProperties = {
+	displayName: 'Webhook Suffix',
+	name: 'webhookSuffix',
+	type: 'string',
+	default: '',
+	placeholder: 'webhook',
+	noDataExpression: true,
+	description:
+		'This suffix path will be appended to the restart URL. Helpful when using multiple wait nodes.',
+};
+
+const displayOnWebhook: IDisplayOptions = {
+	show: {
+		resume: ['webhook'],
+	},
+};
+
+const displayOnFormSubmission = {
+	show: {
+		resume: ['form'],
+	},
+};
+
+const onFormSubmitProperties = updateDisplayOptions(displayOnFormSubmission, [
+	formTitle,
+	formDescription,
+	formFields,
+	formRespondMode,
+]);
+
+const onWebhookCallProperties = updateDisplayOptions(displayOnWebhook, [
+	{
+		...httpMethodsProperty,
+		description: 'The HTTP method of the Webhook call',
+	},
+	responseCodeProperty,
+	responseModeProperty,
+	responseDataProperty,
+	responseBinaryPropertyNameProperty,
+]);
+
+const webhookPath = '={{$parameter["options"]["webhookSuffix"] || ""}}';
+
+export class Wait extends Webhook {
+	authPropertyName = 'incomingAuthentication';
 
-export class Wait implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Wait',
 		name: 'wait',
 		icon: 'fa:pause-circle',
 		group: ['organization'],
-		version: 1,
+		version: [1, 1.1],
 		description: 'Wait before continue with execution',
 		defaults: {
 			name: 'Wait',
@@ -52,70 +235,35 @@ export class Wait implements INodeType {
 		},
 		inputs: ['main'],
 		outputs: ['main'],
-		credentials: [
+		credentials: credentialsProperty(this.authPropertyName),
+		webhooks: [
 			{
-				name: 'httpBasicAuth',
-				required: true,
-				displayOptions: {
-					show: {
-						incomingAuthentication: ['basicAuth'],
-					},
-				},
+				...defaultWebhookDescription,
+				responseData: '={{$parameter["responseData"]}}',
+				path: webhookPath,
+				restartWebhook: true,
 			},
 			{
-				name: 'httpHeaderAuth',
-				required: true,
-				displayOptions: {
-					show: {
-						incomingAuthentication: ['headerAuth'],
-					},
-				},
+				name: 'default',
+				httpMethod: 'GET',
+				responseMode: 'onReceived',
+				path: webhookPath,
+				restartWebhook: true,
+				isFullPath: true,
+				isForm: true,
 			},
-		],
-		webhooks: [
 			{
 				name: 'default',
-				httpMethod: '={{$parameter["httpMethod"]}}',
-				isFullPath: true,
-				responseCode: '={{$parameter["responseCode"]}}',
+				httpMethod: 'POST',
 				responseMode: '={{$parameter["responseMode"]}}',
-				responseData: '={{$parameter["responseData"]}}',
-				responseBinaryPropertyName: '={{$parameter["responseBinaryPropertyName"]}}',
-				responseContentType: '={{$parameter["options"]["responseContentType"]}}',
-				responsePropertyName: '={{$parameter["options"]["responsePropertyName"]}}',
-				responseHeaders: '={{$parameter["options"]["responseHeaders"]}}',
-				path: '={{$parameter["options"]["webhookSuffix"] || ""}}',
+				responseData: '={{$parameter["responseMode"] === "lastNode" ? "noData" : undefined}}',
+				path: webhookPath,
 				restartWebhook: true,
+				isFullPath: true,
+				isForm: true,
 			},
 		],
 		properties: [
-			{
-				displayName: 'Webhook Authentication',
-				name: 'incomingAuthentication',
-				type: 'options',
-				displayOptions: {
-					show: {
-						resume: ['webhook'],
-					},
-				},
-				options: [
-					{
-						name: 'Basic Auth',
-						value: 'basicAuth',
-					},
-					{
-						name: 'Header Auth',
-						value: 'headerAuth',
-					},
-					{
-						name: 'None',
-						value: 'none',
-					},
-				],
-				default: 'none',
-				description:
-					'If and how incoming resume-webhook-requests to $execution.resumeUrl should be authenticated for additional security',
-			},
 			{
 				displayName: 'Resume',
 				name: 'resume',
@@ -136,10 +284,21 @@ export class Wait implements INodeType {
 						value: 'webhook',
 						description: 'Waits for a webhook call before continuing',
 					},
+					{
+						name: 'On Form Submited',
+						value: 'form',
+						description: 'Waits for a form submission before continuing',
+					},
 				],
 				default: 'timeInterval',
 				description: 'Determines the waiting mode to use before the workflow continues',
 			},
+			{
+				...authenticationProperty(this.authPropertyName),
+				description:
+					'If and how incoming resume-webhook-requests to $execution.resumeUrl should be authenticated for additional security',
+				displayOptions: displayOnWebhook,
+			},
 
 			// ----------------------------------
 			//         resume:specificTime
@@ -161,677 +320,128 @@ export class Wait implements INodeType {
 			//         resume:timeInterval
 			// ----------------------------------
 			{
-				displayName: 'Wait Amount',
-				name: 'amount',
-				type: 'number',
+				...toWaitAmount,
 				displayOptions: {
 					show: {
 						resume: ['timeInterval'],
+						'@version': [1],
 					},
 				},
-				typeOptions: {
-					minValue: 0,
-					numberPrecision: 2,
-				},
-				default: 1,
-				description: 'The time to wait',
 			},
 			{
-				displayName: 'Wait Unit',
-				name: 'unit',
-				type: 'options',
+				...toWaitAmount,
+				default: 5,
 				displayOptions: {
 					show: {
 						resume: ['timeInterval'],
 					},
-				},
-				options: [
-					{
-						name: 'Seconds',
-						value: 'seconds',
-					},
-					{
-						name: 'Minutes',
-						value: 'minutes',
-					},
-					{
-						name: 'Hours',
-						value: 'hours',
-					},
-					{
-						name: 'Days',
-						value: 'days',
-					},
-				],
-				default: 'hours',
-				description: 'The time unit of the Wait Amount value',
-			},
-
-			// ----------------------------------
-			//         resume:webhook
-			// ----------------------------------
-			{
-				displayName:
-					'The webhook URL will be generated at run time. It can be referenced with the <strong>$execution.resumeUrl</strong> variable. Send it somewhere before getting to this node. <a href="https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.wait/?utm_source=n8n_app&utm_medium=node_settings_modal-credential_link&utm_campaign=n8n-nodes-base.wait" target="_blank">More info</a>',
-				name: 'webhookNotice',
-				type: 'notice',
-				displayOptions: {
-					show: {
-						resume: ['webhook'],
+					hide: {
+						'@version': [1],
 					},
 				},
-				default: '',
 			},
 			{
-				displayName: 'HTTP Method',
-				name: 'httpMethod',
-				type: 'options',
+				...unitSelector,
 				displayOptions: {
 					show: {
-						resume: ['webhook'],
-					},
-				},
-				options: [
-					{
-						name: 'DELETE',
-						value: 'DELETE',
-					},
-					{
-						name: 'GET',
-						value: 'GET',
-					},
-					{
-						name: 'HEAD',
-						value: 'HEAD',
-					},
-					{
-						name: 'PATCH',
-						value: 'PATCH',
-					},
-					{
-						name: 'POST',
-						value: 'POST',
-					},
-					{
-						name: 'PUT',
-						value: 'PUT',
-					},
-				],
-				default: 'GET',
-				description: 'The HTTP method of the Webhook call',
-			},
-			{
-				displayName: 'Response Code',
-				name: 'responseCode',
-				type: 'number',
-				displayOptions: {
-					show: {
-						resume: ['webhook'],
-					},
-				},
-				typeOptions: {
-					minValue: 100,
-					maxValue: 599,
-				},
-				default: 200,
-				description: 'The HTTP Response code to return',
-			},
-			{
-				displayName: 'Respond',
-				name: 'responseMode',
-				type: 'options',
-				displayOptions: {
-					show: {
-						resume: ['webhook'],
+						resume: ['timeInterval'],
+						'@version': [1],
 					},
 				},
-				options: [
-					{
-						name: 'Immediately',
-						value: 'onReceived',
-						description: 'As soon as this node executes',
-					},
-					{
-						name: 'When Last Node Finishes',
-						value: 'lastNode',
-						description: 'Returns data of the last-executed node',
-					},
-					{
-						name: "Using 'Respond to Webhook' Node",
-						value: 'responseNode',
-						description: 'Response defined in that node',
-					},
-				],
-				default: 'onReceived',
-				description: 'When and how to respond to the webhook',
 			},
 			{
-				displayName: 'Response Data',
-				name: 'responseData',
-				type: 'options',
+				...unitSelector,
+				default: 'seconds',
 				displayOptions: {
 					show: {
-						resume: ['webhook'],
-						responseMode: ['lastNode'],
-					},
-				},
-				options: [
-					{
-						name: 'All Entries',
-						value: 'allEntries',
-						description: 'Returns all the entries of the last node. Always returns an array.',
-					},
-					{
-						name: 'First Entry JSON',
-						value: 'firstEntryJson',
-						description:
-							'Returns the JSON data of the first entry of the last node. Always returns a JSON object.',
-					},
-					{
-						name: 'First Entry Binary',
-						value: 'firstEntryBinary',
-						description:
-							'Returns the binary data of the first entry of the last node. Always returns a binary file.',
+						resume: ['timeInterval'],
 					},
-				],
-				default: 'firstEntryJson',
-				description:
-					'What data should be returned. If it should return all the items as array or only the first item as object.',
-			},
-			{
-				displayName: 'Property Name',
-				name: 'responseBinaryPropertyName',
-				type: 'string',
-				required: true,
-				default: 'data',
-				displayOptions: {
-					show: {
-						resume: ['webhook'],
-						responseData: ['firstEntryBinary'],
+					hide: {
+						'@version': [1],
 					},
 				},
-				description: 'Name of the binary property to return',
 			},
+
+			// ----------------------------------
+			//         resume:webhook & form
+			// ----------------------------------
 			{
-				displayName: 'Limit Wait Time',
-				name: 'limitWaitTime',
-				type: 'boolean',
-				default: false,
-				// eslint-disable-next-line n8n-nodes-base/node-param-description-boolean-without-whether
-				description:
-					'If no webhook call is received, the workflow will automatically resume execution after the specified limit type',
-				displayOptions: {
-					show: {
-						resume: ['webhook'],
-					},
-				},
+				displayName:
+					'The webhook URL will be generated at run time. It can be referenced with the <strong>$execution.resumeUrl</strong> variable. Send it somewhere before getting to this node. <a href="https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.wait/?utm_source=n8n_app&utm_medium=node_settings_modal-credential_link&utm_campaign=n8n-nodes-base.wait" target="_blank">More info</a>',
+				name: 'webhookNotice',
+				type: 'notice',
+				displayOptions: displayOnWebhook,
+				default: '',
 			},
 			{
-				displayName: 'Limit Type',
-				name: 'limitType',
-				type: 'options',
-				default: 'afterTimeInterval',
-				description:
-					'Sets the condition for the execution to resume. Can be a specified date or after some time.',
-				displayOptions: {
-					show: {
-						limitWaitTime: [true],
-						resume: ['webhook'],
-					},
-				},
-				options: [
-					{
-						name: 'After Time Interval',
-						description: 'Waits for a certain amount of time',
-						value: 'afterTimeInterval',
-					},
-					{
-						name: 'At Specified Time',
-						description: 'Waits until the set date and time to continue',
-						value: 'atSpecifiedTime',
-					},
-				],
+				displayName:
+					'The form url will be generated at run time. It can be referenced with the <strong>$execution.resumeFormUrl</strong> variable. Send it somewhere before getting to this node. <a href="https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.wait/?utm_source=n8n_app&utm_medium=node_settings_modal-credential_link&utm_campaign=n8n-nodes-base.wait" target="_blank">More info</a>',
+				name: 'formNotice',
+				type: 'notice',
+				displayOptions: displayOnFormSubmission,
+				default: '',
 			},
+			...onFormSubmitProperties,
+			...onWebhookCallProperties,
+			...waitTimeProperties,
 			{
-				displayName: 'Amount',
-				name: 'resumeAmount',
-				type: 'number',
-				displayOptions: {
-					show: {
-						limitType: ['afterTimeInterval'],
-						limitWaitTime: [true],
-						resume: ['webhook'],
-					},
-				},
-				typeOptions: {
-					minValue: 0,
-					numberPrecision: 2,
-				},
-				default: 1,
-				description: 'The time to wait',
+				...optionsProperty,
+				displayOptions: displayOnWebhook,
+				options: [...(optionsProperty.options as INodeProperties[]), webhookSuffix],
 			},
 			{
-				displayName: 'Unit',
-				name: 'resumeUnit',
-				type: 'options',
+				displayName: 'Options',
+				name: 'options',
+				type: 'collection',
+				placeholder: 'Add Option',
+				default: {},
 				displayOptions: {
 					show: {
-						limitType: ['afterTimeInterval'],
-						limitWaitTime: [true],
-						resume: ['webhook'],
+						resume: ['form'],
 					},
-				},
-				options: [
-					{
-						name: 'Seconds',
-						value: 'seconds',
-					},
-					{
-						name: 'Minutes',
-						value: 'minutes',
-					},
-					{
-						name: 'Hours',
-						value: 'hours',
-					},
-					{
-						name: 'Days',
-						value: 'days',
-					},
-				],
-				default: 'hours',
-				description: 'Unit of the interval value',
-			},
-			{
-				displayName: 'Max Date and Time',
-				name: 'maxDateAndTime',
-				type: 'dateTime',
-				displayOptions: {
-					show: {
-						limitType: ['atSpecifiedTime'],
-						limitWaitTime: [true],
-						resume: ['webhook'],
+					hide: {
+						responseMode: ['responseNode'],
 					},
 				},
-				default: '',
-				description: 'Continue execution after the specified date and time',
+				options: [respondWithOptions, webhookSuffix],
 			},
 			{
 				displayName: 'Options',
 				name: 'options',
 				type: 'collection',
-				displayOptions: {
-					show: {
-						resume: ['webhook'],
-					},
-				},
 				placeholder: 'Add Option',
 				default: {},
-				options: [
-					{
-						displayName: 'Binary Data',
-						name: 'binaryData',
-						type: 'boolean',
-						displayOptions: {
-							show: {
-								'/httpMethod': ['PATCH', 'PUT', 'POST'],
-							},
-						},
-						default: false,
-						description: 'Whether the webhook will receive binary data',
-					},
-					{
-						displayName: 'Binary Property',
-						name: 'binaryPropertyName',
-						type: 'string',
-						default: 'data',
-						displayOptions: {
-							show: {
-								binaryData: [true],
-							},
-						},
-						description:
-							'Name of the binary property to which to write the data of the received file. If the data gets received via "Form-Data Multipart" it will be the prefix and a number starting with 0 will be attached to it.',
-					},
-					{
-						displayName: 'Ignore Bots',
-						name: 'ignoreBots',
-						type: 'boolean',
-						default: false,
-						description:
-							'Whether to ignore requests from bots like link previewers and web crawlers',
-					},
-					{
-						displayName: 'Response Data',
-						name: 'responseData',
-						type: 'string',
-						displayOptions: {
-							show: {
-								'/responseMode': ['onReceived'],
-							},
-						},
-						default: '',
-						placeholder: 'success',
-						description: 'Custom response data to send',
-					},
-					{
-						displayName: 'Response Content-Type',
-						name: 'responseContentType',
-						type: 'string',
-						displayOptions: {
-							show: {
-								'/responseData': ['firstEntryJson'],
-								'/responseMode': ['lastNode'],
-							},
-						},
-						default: '',
-						placeholder: 'application/xml',
-						// eslint-disable-next-line n8n-nodes-base/node-param-description-miscased-json
-						description:
-							'Set a custom content-type to return if another one as the "application/json" should be returned',
-					},
-					{
-						displayName: 'Response Headers',
-						name: 'responseHeaders',
-						placeholder: 'Add Response Header',
-						description: 'Add headers to the webhook response',
-						type: 'fixedCollection',
-						typeOptions: {
-							multipleValues: true,
-						},
-						default: {},
-						options: [
-							{
-								name: 'entries',
-								displayName: 'Entries',
-								values: [
-									{
-										displayName: 'Name',
-										name: 'name',
-										type: 'string',
-										default: '',
-										description: 'Name of the header',
-									},
-									{
-										displayName: 'Value',
-										name: 'value',
-										type: 'string',
-										default: '',
-										description: 'Value of the header',
-									},
-								],
-							},
-						],
-					},
-					{
-						displayName: 'Property Name',
-						name: 'responsePropertyName',
-						type: 'string',
-						displayOptions: {
-							show: {
-								'/responseData': ['firstEntryJson'],
-								'/responseMode': ['lastNode'],
-							},
-						},
-						default: 'data',
-						description: 'Name of the property to return the data of instead of the whole JSON',
+				displayOptions: {
+					show: {
+						resume: ['form'],
 					},
-					{
-						displayName: 'Webhook Suffix',
-						name: 'webhookSuffix',
-						type: 'string',
-						default: '',
-						placeholder: 'webhook',
-						description:
-							'This suffix path will be appended to the restart URL. Helpful when using multiple wait nodes. Note: Does not support expressions.',
+					hide: {
+						responseMode: ['onReceived', 'lastNode'],
 					},
-					// {
-					// 	displayName: 'Raw Body',
-					// 	name: 'rawBody',
-					// 	type: 'boolean',
-					// 	displayOptions: {
-					// 		hide: {
-					// 			binaryData: [
-					// 				true,
-					// 			],
-					// 		},
-					// 	},
-					// 	default: false,
-					// 	description: 'Raw body (binary)',
-					// },
-				],
+				},
+				options: [webhookSuffix],
 			},
 		],
 	};
 
-	async webhook(this: IWebhookFunctions): Promise<IWebhookResponseData> {
-		// INFO: Currently (20.06.2021) 100% identical with Webhook-Node
-		const incomingAuthentication = this.getNodeParameter('incomingAuthentication') as string;
-		const options = this.getNodeParameter('options', {}) as IDataObject;
-		const req = this.getRequestObject();
-		const resp = this.getResponseObject();
-		const headers = this.getHeaderData();
-		const realm = 'Webhook';
-
-		const ignoreBots = options.ignoreBots as boolean;
-		if (ignoreBots && isbot((headers as IDataObject)['user-agent'] as string)) {
-			return authorizationError(resp, realm, 403);
-		}
-
-		if (incomingAuthentication === 'basicAuth') {
-			// Basic authorization is needed to call webhook
-			let httpBasicAuth: ICredentialDataDecryptedObject | undefined;
-
-			try {
-				httpBasicAuth = await this.getCredentials('httpBasicAuth');
-			} catch (error) {
-				// Do nothing
-			}
-
-			if (httpBasicAuth === undefined || !httpBasicAuth.user || !httpBasicAuth.password) {
-				// Data is not defined on node so can not authenticate
-				return authorizationError(resp, realm, 500, 'No authentication data defined on node!');
-			}
-
-			const basicAuthData = basicAuth(req);
-
-			if (basicAuthData === undefined) {
-				// Authorization data is missing
-				return authorizationError(resp, realm, 401);
-			}
-
-			if (
-				basicAuthData.name !== httpBasicAuth.user ||
-				basicAuthData.pass !== httpBasicAuth.password
-			) {
-				// Provided authentication data is wrong
-				return authorizationError(resp, realm, 403);
-			}
-		} else if (incomingAuthentication === 'headerAuth') {
-			// Special header with value is needed to call webhook
-			let httpHeaderAuth: ICredentialDataDecryptedObject | undefined;
-
-			try {
-				httpHeaderAuth = await this.getCredentials('httpHeaderAuth');
-			} catch (error) {
-				// Do nothing
-			}
-
-			if (httpHeaderAuth === undefined || !httpHeaderAuth.name || !httpHeaderAuth.value) {
-				// Data is not defined on node so can not authenticate
-				return authorizationError(resp, realm, 500, 'No authentication data defined on node!');
-			}
-			const headerName = (httpHeaderAuth.name as string).toLowerCase();
-			const headerValue = httpHeaderAuth.value as string;
-
-			if (
-				!headers.hasOwnProperty(headerName) ||
-				(headers as IDataObject)[headerName] !== headerValue
-			) {
-				// Provided authentication data is wrong
-				return authorizationError(resp, realm, 403);
-			}
-		}
-
-		const mimeType = headers['content-type'] ?? 'application/json';
-		if (mimeType.includes('multipart/form-data')) {
-			const form = new formidable.IncomingForm({ multiples: true });
-
-			return new Promise((resolve, _reject) => {
-				form.parse(req, async (err, data, files) => {
-					const returnItem: INodeExecutionData = {
-						binary: {},
-						json: {
-							headers,
-							params: this.getParamsData(),
-							query: this.getQueryData(),
-							body: data,
-						},
-					};
-
-					let count = 0;
-					for (const xfile of Object.keys(files)) {
-						const processFiles: formidable.File[] = [];
-						let multiFile = false;
-						if (Array.isArray(files[xfile])) {
-							processFiles.push(...(files[xfile] as formidable.File[]));
-							multiFile = true;
-						} else {
-							processFiles.push(files[xfile] as formidable.File);
-						}
-
-						let fileCount = 0;
-						for (const file of processFiles) {
-							let binaryPropertyName = xfile;
-							if (binaryPropertyName.endsWith('[]')) {
-								binaryPropertyName = binaryPropertyName.slice(0, -2);
-							}
-							if (multiFile) {
-								binaryPropertyName += fileCount++;
-							}
-							if (options.binaryPropertyName) {
-								binaryPropertyName = `${options.binaryPropertyName}${count}`;
-							}
-
-							const fileJson = file.toJSON();
-							returnItem.binary![binaryPropertyName] = await this.nodeHelpers.copyBinaryFile(
-								file.path,
-								fileJson.name || fileJson.filename,
-								fileJson.type as string,
-							);
-
-							count += 1;
-						}
-					}
-					resolve({
-						workflowData: [[returnItem]],
-					});
-				});
-			});
-		}
-
-		if (options.binaryData === true) {
-			const binaryFile = await tmpFile({ prefix: 'n8n-webhook-' });
-
-			try {
-				await pipeline(req, fs.createWriteStream(binaryFile.path));
-
-				const returnItem: INodeExecutionData = {
-					binary: {},
-					json: {
-						headers,
-						params: this.getParamsData(),
-						query: this.getQueryData(),
-						body: this.getBodyData(),
-					},
-				};
-
-				const binaryPropertyName = (options.binaryPropertyName || 'data') as string;
-				returnItem.binary![binaryPropertyName] = await this.nodeHelpers.copyBinaryFile(
-					binaryFile.path,
-					mimeType,
-				);
-
-				return {
-					workflowData: [[returnItem]],
-				};
-			} catch (error) {
-				throw new NodeOperationError(this.getNode(), error as Error);
-			} finally {
-				await binaryFile.cleanup();
-			}
-		}
-
-		const response: INodeExecutionData = {
-			json: {
-				headers,
-				params: this.getParamsData(),
-				query: this.getQueryData(),
-				body: this.getBodyData(),
-			},
-		};
-
-		if (options.rawBody) {
-			response.binary = {
-				data: {
-					data: req.rawBody.toString(BINARY_ENCODING),
-					mimeType,
-				},
-			};
-		}
-
-		let webhookResponse: string | undefined;
-		if (options.responseData) {
-			webhookResponse = options.responseData as string;
-		}
-
-		return {
-			webhookResponse,
-			workflowData: [[response]],
-		};
+	async webhook(context: IWebhookFunctions) {
+		const resume = context.getNodeParameter('resume', 0) as string;
+		if (resume === 'form') return await formWebhook(context);
+		return await super.webhook(context);
 	}
 
-	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
-		const resume = this.getNodeParameter('resume', 0) as string;
-
-		if (resume === 'webhook') {
-			let waitTill = new Date(WAIT_TIME_UNLIMITED);
-
-			const limitWaitTime = this.getNodeParameter('limitWaitTime', 0);
-
-			if (limitWaitTime === true) {
-				const limitType = this.getNodeParameter('limitType', 0);
-				if (limitType === 'afterTimeInterval') {
-					let waitAmount = this.getNodeParameter('resumeAmount', 0) as number;
-					const resumeUnit = this.getNodeParameter('resumeUnit', 0);
-					if (resumeUnit === 'minutes') {
-						waitAmount *= 60;
-					}
-					if (resumeUnit === 'hours') {
-						waitAmount *= 60 * 60;
-					}
-					if (resumeUnit === 'days') {
-						waitAmount *= 60 * 60 * 24;
-					}
-
-					waitAmount *= 1000;
-
-					waitTill = new Date(new Date().getTime() + waitAmount);
-				} else {
-					waitTill = new Date(this.getNodeParameter('maxDateAndTime', 0) as string);
-				}
-			}
+	async execute(context: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const resume = context.getNodeParameter('resume', 0) as string;
 
-			await this.putExecutionToWait(waitTill);
-
-			return [this.getInputData()];
+		if (['webhook', 'form'].includes(resume)) {
+			return await this.configureAndPutToWait(context);
 		}
 
 		let waitTill: Date;
 		if (resume === 'timeInterval') {
-			const unit = this.getNodeParameter('unit', 0) as string;
+			const unit = context.getNodeParameter('unit', 0) as string;
 
-			let waitAmount = this.getNodeParameter('amount', 0) as number;
+			let waitAmount = context.getNodeParameter('amount', 0) as number;
 			if (unit === 'minutes') {
 				waitAmount *= 60;
 			}
@@ -844,12 +454,17 @@ export class Wait implements INodeType {
 
 			waitAmount *= 1000;
 
+			// Timezone does not change relative dates, since they are just
+			// a number of seconds added to the current timestamp
 			waitTill = new Date(new Date().getTime() + waitAmount);
 		} else {
-			// resume: dateTime
-			const dateTime = this.getNodeParameter('dateTime', 0) as string;
+			const dateTimeStr = context.getNodeParameter('dateTime', 0) as string;
 
-			waitTill = new Date(dateTime);
+			waitTill = DateTime.fromFormat(dateTimeStr, "yyyy-MM-dd'T'HH:mm:ss", {
+				zone: context.getTimezone(),
+			})
+				.toUTC()
+				.toJSDate();
 		}
 
 		const waitValue = Math.max(waitTill.getTime() - new Date().getTime(), 0);
@@ -857,16 +472,49 @@ export class Wait implements INodeType {
 		if (waitValue < 65000) {
 			// If wait time is shorter than 65 seconds leave execution active because
 			// we just check the database every 60 seconds.
-			return new Promise((resolve, _reject) => {
-				setTimeout(() => {
-					resolve([this.getInputData()]);
-				}, waitValue);
+			return await new Promise((resolve) => {
+				const timer = setTimeout(() => resolve([context.getInputData()]), waitValue);
+				context.onExecutionCancellation(() => clearTimeout(timer));
 			});
 		}
 
-		// If longer than 60 seconds put execution to wait
-		await this.putExecutionToWait(waitTill);
+		// If longer than 65 seconds put execution to wait
+		return await this.putToWait(context, waitTill);
+	}
+
+	private async configureAndPutToWait(context: IExecuteFunctions) {
+		let waitTill = new Date(WAIT_TIME_UNLIMITED);
+		const limitWaitTime = context.getNodeParameter('limitWaitTime', 0);
+
+		if (limitWaitTime === true) {
+			const limitType = context.getNodeParameter('limitType', 0);
+
+			if (limitType === 'afterTimeInterval') {
+				let waitAmount = context.getNodeParameter('resumeAmount', 0) as number;
+				const resumeUnit = context.getNodeParameter('resumeUnit', 0);
+
+				if (resumeUnit === 'minutes') {
+					waitAmount *= 60;
+				}
+				if (resumeUnit === 'hours') {
+					waitAmount *= 60 * 60;
+				}
+				if (resumeUnit === 'days') {
+					waitAmount *= 60 * 60 * 24;
+				}
+
+				waitAmount *= 1000;
+				waitTill = new Date(new Date().getTime() + waitAmount);
+			} else {
+				waitTill = new Date(context.getNodeParameter('maxDateAndTime', 0) as string);
+			}
+		}
+
+		return await this.putToWait(context, waitTill);
+	}
 
-		return [this.getInputData()];
+	private async putToWait(context: IExecuteFunctions, waitTill: Date) {
+		await context.putExecutionToWait(waitTill);
+		return [context.getInputData()];
 	}
 }
diff --git a/packages/nodes-base/nodes/Wait/test/Wait.node.test.ts b/packages/nodes-base/nodes/Wait/test/Wait.node.test.ts
index 02b5e39eac8c2..d6d43c5329655 100644
--- a/packages/nodes-base/nodes/Wait/test/Wait.node.test.ts
+++ b/packages/nodes-base/nodes/Wait/test/Wait.node.test.ts
@@ -1,4 +1,4 @@
-import { testWorkflows, getWorkflowFilenames } from '../../../test/nodes/Helpers';
+import { testWorkflows, getWorkflowFilenames } from '@test/nodes/Helpers';
 const workflows = getWorkflowFilenames(__dirname);
 
 describe('Execute Wait Node', () => {
diff --git a/packages/nodes-base/nodes/Webflow/GenericFunctions.ts b/packages/nodes-base/nodes/Webflow/GenericFunctions.ts
index c91eead9b2691..4cbf8c277520b 100644
--- a/packages/nodes-base/nodes/Webflow/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Webflow/GenericFunctions.ts
@@ -1,16 +1,16 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	IWebhookFunctions,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 
 export async function webflowApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 	body: IDataObject = {},
 	qs: IDataObject = {},
@@ -28,7 +28,7 @@ export async function webflowApiRequest(
 		credentialsType = 'webflowOAuth2Api';
 	}
 
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		headers: {
 			'accept-version': '1.0.0',
 		},
@@ -47,12 +47,12 @@ export async function webflowApiRequest(
 	if (Object.keys(options.body as IDataObject).length === 0) {
 		delete options.body;
 	}
-	return this.helpers.requestWithAuthentication.call(this, credentialsType, options);
+	return await this.helpers.requestWithAuthentication.call(this, credentialsType, options);
 }
 
 export async function webflowApiRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject = {},
 	query: IDataObject = {},
diff --git a/packages/nodes-base/nodes/Webflow/Webflow.node.json b/packages/nodes-base/nodes/Webflow/Webflow.node.json
index c3291e7e730e3..9e95776d2d6ef 100644
--- a/packages/nodes-base/nodes/Webflow/Webflow.node.json
+++ b/packages/nodes-base/nodes/Webflow/Webflow.node.json
@@ -2,7 +2,7 @@
 	"node": "n8n-nodes-base.webflow",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Marketing & Content"],
+	"categories": ["Marketing"],
 	"resources": {
 		"credentialDocumentation": [
 			{
diff --git a/packages/nodes-base/nodes/Webflow/Webflow.node.ts b/packages/nodes-base/nodes/Webflow/Webflow.node.ts
index 7acc90e54c32c..6a961ef554ca8 100644
--- a/packages/nodes-base/nodes/Webflow/Webflow.node.ts
+++ b/packages/nodes-base/nodes/Webflow/Webflow.node.ts
@@ -287,6 +287,6 @@ export class Webflow implements INodeType {
 			}
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Webflow/WebflowTrigger.node.json b/packages/nodes-base/nodes/Webflow/WebflowTrigger.node.json
index f812473110452..5c3aaa7984139 100644
--- a/packages/nodes-base/nodes/Webflow/WebflowTrigger.node.json
+++ b/packages/nodes-base/nodes/Webflow/WebflowTrigger.node.json
@@ -2,7 +2,7 @@
 	"node": "n8n-nodes-base.webflowTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Marketing & Content"],
+	"categories": ["Marketing"],
 	"resources": {
 		"credentialDocumentation": [
 			{
diff --git a/packages/nodes-base/nodes/Webflow/webflow.svg b/packages/nodes-base/nodes/Webflow/webflow.svg
index 80675e0218748..32fa9dbda263e 100644
--- a/packages/nodes-base/nodes/Webflow/webflow.svg
+++ b/packages/nodes-base/nodes/Webflow/webflow.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 67 66" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x="1" y="1"/><symbol id="a" overflow="visible"><g stroke="none" fill-rule="nonzero"><path d="M0 32C0 14.272 14.272 0 32 0s32 14.272 32 32-14.272 32-32 32S0 49.728 0 32z" fill="#4353ff"/><path d="M41.4 28.2l-2.9 9.14c0-.7-2-15.86-2-15.86-4.6 0-7.04 3.26-8.32 6.72l-3.54 9.16c0-.66-.5-9.08-.5-9.08a7.48 7.48 0 00-7.26-6.78l3.76 22.96c4.8 0 7.4-3.26 8.74-6.72l3-7.8c0 .32 2 14.52 2 14.52a9.24 9.24 0 008.8-6.46l6.8-16.52c-4.8 0-7.32 3.26-8.6 6.72z"/></g></symbol></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round" viewBox="0 0 67 66"><use xlink:href="#a" x="1" y="1"/><symbol id="a" overflow="visible"><g fill-rule="nonzero" stroke="none"><path fill="#4353ff" d="M0 32C0 14.272 14.272 0 32 0s32 14.272 32 32-14.272 32-32 32S0 49.728 0 32"/><path d="m41.4 28.2-2.9 9.14c0-.7-2-15.86-2-15.86-4.6 0-7.04 3.26-8.32 6.72l-3.54 9.16c0-.66-.5-9.08-.5-9.08a7.48 7.48 0 0 0-7.26-6.78l3.76 22.96c4.8 0 7.4-3.26 8.74-6.72l3-7.8c0 .32 2 14.52 2 14.52a9.24 9.24 0 0 0 8.8-6.46l6.8-16.52c-4.8 0-7.32 3.26-8.6 6.72z"/></g></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Webhook/Webhook.node.json b/packages/nodes-base/nodes/Webhook/Webhook.node.json
index 20502304293c4..cc6961da5c751 100644
--- a/packages/nodes-base/nodes/Webhook/Webhook.node.json
+++ b/packages/nodes-base/nodes/Webhook/Webhook.node.json
@@ -83,6 +83,6 @@
 	},
 	"alias": ["HTTP", "API", "Build", "WH"],
 	"subcategories": {
-		"Core Nodes": ["Flow"]
+		"Core Nodes": ["Helpers"]
 	}
 }
diff --git a/packages/nodes-base/nodes/Webhook/Webhook.node.ts b/packages/nodes-base/nodes/Webhook/Webhook.node.ts
index 80de8d21bb509..4604d0c4b53fb 100644
--- a/packages/nodes-base/nodes/Webhook/Webhook.node.ts
+++ b/packages/nodes-base/nodes/Webhook/Webhook.node.ts
@@ -1,27 +1,49 @@
+/* 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';
 /* eslint-disable @typescript-eslint/no-var-requires */
 import type {
 	IWebhookFunctions,
 	ICredentialDataDecryptedObject,
 	IDataObject,
 	INodeExecutionData,
-	INodeType,
 	INodeTypeDescription,
 	IWebhookResponseData,
+	MultiPartFormData,
+	INodeProperties,
 } from 'n8n-workflow';
-import { BINARY_ENCODING, NodeOperationError } from 'n8n-workflow';
+import { BINARY_ENCODING, NodeOperationError, Node } from 'n8n-workflow';
 import { verifyCrmToken, verifyOauth2Token, verifyPortalToken } from './authentication';
-import fs from 'fs';
-import stream from 'stream';
-import { promisify } from 'util';
+import { v4 as uuid } from 'uuid';
 import basicAuth from 'basic-auth';
-import type { Response } from 'express';
-import formidable from 'formidable';
 import isbot from 'isbot';
+import type { Response } from 'express';
 import { file as tmpFile } from 'tmp-promise';
 import type { OpenAPIRequestValidatorArgs } from 'openapi-request-validator';
 import OpenAPIRequestValidator from 'openapi-request-validator';
-
-const pipeline = promisify(stream.pipeline);
+import jwt from 'jsonwebtoken';
+
+import {
+	authenticationProperty,
+	credentialsProperty,
+	defaultWebhookDescription,
+	httpMethodsProperty,
+	optionsProperty,
+	responseBinaryPropertyNameProperty,
+	responseCodeOption,
+	responseCodeProperty,
+	responseDataProperty,
+	responseModeProperty,
+} from './description';
+import { WebhookAuthorizationError } from './error';
+import {
+	checkResponseModeConfiguration,
+	configuredOutputs,
+	isIpWhitelisted,
+	setupOutputConnection,
+} from './utils';
+import { formatPrivateKey } from '../../utils/utilities';
 
 function authorizationError(resp: Response, realm: string, responseCode: number, message?: string) {
 	if (message === undefined) {
@@ -40,19 +62,22 @@ function authorizationError(resp: Response, realm: string, responseCode: number,
 	};
 }
 
-export class Webhook implements INodeType {
+export class Webhook extends Node {
+	authPropertyName = 'authentication';
+
 	description: INodeTypeDescription = {
 		displayName: 'Webhook',
 		icon: 'file:webhook.svg',
 		name: 'webhook',
 		group: ['trigger'],
-		version: 1,
+		version: [1, 1.1, 2],
 		description: 'Starts the workflow when a webhook is called',
 		eventTriggerDescription: 'Waiting for you to call the Test URL',
 		activationMessage: 'You can now make calls to your production webhook URL.',
 		defaults: {
 			name: 'Webhook',
 		},
+		supportsCORS: true,
 		triggerPanel: {
 			header: '',
 			executionsHelp: {
@@ -62,116 +87,34 @@ export class Webhook implements INodeType {
 					'Webhooks have two modes: test and production. <br /> <br /> <b>Use test mode while you build your workflow</b>. Click the \'listen\' button, then make a request to the test URL. The executions will show up in the editor.<br /> <br /> <b>Use production mode to run your workflow automatically</b>. Since the workflow is activated, you can make requests to the production URL. These executions will show up in the <a data-key="executions">executions list</a>, but not in the editor.',
 			},
 			activationHint:
-				'Once you’ve finished building your workflow, run it without having to click this button by using the production webhook URL.',
+				"Once you've finished building your workflow, run it without having to click this button by using the production webhook URL.",
 		},
 		// eslint-disable-next-line n8n-nodes-base/node-class-description-inputs-wrong-regular-node
 		inputs: [],
-		outputs: ['main'],
-		credentials: [
-			{
-				name: 'httpBasicAuth',
-				required: true,
-				displayOptions: {
-					show: {
-						authentication: ['basicAuth'],
-					},
-				},
-			},
-			{
-				name: 'httpHeaderAuth',
-				required: true,
-				displayOptions: {
-					show: {
-						authentication: ['headerAuth'],
-					},
-				},
-			},
-		],
-		webhooks: [
-			{
-				name: 'default',
-				httpMethod: '={{$parameter["httpMethod"]}}',
-				isFullPath: true,
-				responseCode: '={{$parameter["responseCode"]}}',
-				responseMode: '={{$parameter["responseMode"]}}',
-				responseData:
-					'={{$parameter["responseData"] || ($parameter.options.noResponseBody ? "noData" : undefined) }}',
-				responseBinaryPropertyName: '={{$parameter["responseBinaryPropertyName"]}}',
-				responseContentType: '={{$parameter["options"]["responseContentType"]}}',
-				responsePropertyName: '={{$parameter["options"]["responsePropertyName"]}}',
-				responseHeaders: '={{$parameter["options"]["responseHeaders"]}}',
-				path: '={{$parameter["path"]}}',
-				swagger: '={{$parameter["swagger"]}}',
-			},
-		],
+		outputs: `={{(${configuredOutputs})($parameter)}}`,
+		credentials: credentialsProperty(this.authPropertyName),
+		webhooks: [defaultWebhookDescription],
 		properties: [
 			{
-				displayName: 'Authentication',
-				name: 'authentication',
-				type: 'options',
-				options: [
-					{
-						name: 'Basic Auth',
-						value: 'basicAuth',
-					},
-					{
-						name: 'Client Portal Auth',
-						value: 'clientPortalAuth',
-					},
-					{
-						name: 'Header Auth',
-						value: 'headerAuth',
-					},
-					{
-						name: 'NocoDB Webhook Auth',
-						value: 'nocoDBWebhookAuth',
-					},
-					{
-						name: 'None',
-						value: 'none',
-					},
-					{
-						name: 'Oauth2 Token Auth',
-						value: 'oauth2TokenAuth',
-					},
-					{
-						name: 'Zoho CRM Auth',
-						value: 'zohoCRMAuth',
-					},
-				],
-				default: 'none',
-				description: 'The way to authenticate',
-			},
-			{
-				displayName: 'Roles (Optional)',
-				name: 'roles',
-				type: 'string',
-				default: '',
-				placeholder: 'Authorized roles (comma seperated values)',
-				description: 'Specifies the roles within which the bearer must belong',
-				displayOptions: {
-					hide: {
-						authentication: ['oauth2TokenAuth'],
-					},
-				},
+				displayName: 'Allow Multiple HTTP Methods',
+				name: 'multipleMethods',
+				type: 'boolean',
+				default: false,
+				isNodeSetting: true,
+				description: 'Whether to allow the webhook to listen for multiple HTTP methods',
 			},
 			{
-				displayName: 'Scopes (Optional)',
-				name: 'scopes',
-				type: 'string',
-				default: '',
-				placeholder: 'Authorized scopes (comma separated values)',
-				description: 'Specifies the scopes within which the bearer must belong',
+				...httpMethodsProperty,
 				displayOptions: {
 					show: {
-						authentication: ['oauth2TokenAuth'],
+						multipleMethods: [false],
 					},
 				},
 			},
 			{
-				displayName: 'HTTP Method',
+				displayName: 'HTTP Methods',
 				name: 'httpMethod',
-				type: 'options',
+				type: 'multiOptions',
 				options: [
 					{
 						name: 'DELETE',
@@ -198,8 +141,13 @@ export class Webhook implements INodeType {
 						value: 'PUT',
 					},
 				],
-				default: 'GET',
-				description: 'The HTTP method to listen to',
+				default: ['GET', 'POST'],
+				description: 'The HTTP methods to listen to',
+				displayOptions: {
+					show: {
+						multipleMethods: [true],
+					},
+				},
 			},
 			{
 				displayName: 'Path',
@@ -208,32 +156,11 @@ export class Webhook implements INodeType {
 				default: '',
 				placeholder: 'webhook',
 				required: true,
-				description: 'The path to listen to',
-			},
-			{
-				displayName: 'Respond',
-				name: 'responseMode',
-				type: 'options',
-				options: [
-					{
-						name: 'Immediately',
-						value: 'onReceived',
-						description: 'As soon as this node executes',
-					},
-					{
-						name: 'When Last Node Finishes',
-						value: 'lastNode',
-						description: 'Returns data of the last-executed node',
-					},
-					{
-						name: "Using 'Respond to Webhook' Node",
-						value: 'responseNode',
-						description: 'Response defined in that node',
-					},
-				],
-				default: 'onReceived',
-				description: 'When and how to respond to the webhook',
+				description:
+					"The path to listen to, dynamic values could be specified by using ':', e.g. 'your-path/:dynamic-value'. If dynamic values are set 'webhookId' would be prepended to path.",
 			},
+			authenticationProperty(this.authPropertyName),
+			responseModeProperty,
 			{
 				displayName:
 					'Insert a \'Respond to Webhook\' node to control when and how you respond. <a href="https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.respondtowebhook/" target="_blank">More details</a>',
@@ -247,246 +174,162 @@ export class Webhook implements INodeType {
 				default: '',
 			},
 			{
-				displayName: 'Response Code',
-				name: 'responseCode',
-				type: 'number',
-				displayOptions: {
-					hide: {
-						responseMode: ['responseNode'],
-					},
-				},
-				typeOptions: {
-					minValue: 100,
-					maxValue: 599,
-				},
-				default: 200,
-				description: 'The HTTP Response code to return',
-			},
-			{
-				displayName: 'Swagger',
-				name: 'swagger',
-				type: 'swaggerEditor',
-				typeOptions: {
-					editor: 'json',
-					rows: 10,
-				},
-				default: '{}',
-				required: true,
-				description: 'JSON code for the Swagger docs to be displayed',
-			},
-			{
-				displayName: 'Response Data',
-				name: 'responseData',
-				type: 'options',
+				...responseCodeProperty,
 				displayOptions: {
 					show: {
-						responseMode: ['lastNode'],
-					},
-				},
-				options: [
-					{
-						name: 'All Entries',
-						value: 'allEntries',
-						description: 'Returns all the entries of the last node. Always returns an array.',
-					},
-					{
-						name: 'First Entry JSON',
-						value: 'firstEntryJson',
-						description:
-							'Returns the JSON data of the first entry of the last node. Always returns a JSON object.',
-					},
-					{
-						name: 'First Entry Binary',
-						value: 'firstEntryBinary',
-						description:
-							'Returns the binary data of the first entry of the last node. Always returns a binary file.',
-					},
-					{
-						name: 'No Response Body',
-						value: 'noData',
-						description: 'Returns without a body',
+						'@version': [1, 1.1],
 					},
-				],
-				default: 'firstEntryJson',
-				description:
-					'What data should be returned. If it should return all items as an array or only the first item as object.',
-			},
-			{
-				displayName: 'Property Name',
-				name: 'responseBinaryPropertyName',
-				type: 'string',
-				required: true,
-				default: 'data',
-				displayOptions: {
-					show: {
-						responseData: ['firstEntryBinary'],
+					hide: {
+						responseMode: ['responseNode'],
 					},
 				},
-				description: 'Name of the binary property to return',
 			},
+			responseDataProperty,
+			responseBinaryPropertyNameProperty,
+
 			{
-				displayName: 'Options',
-				name: 'options',
-				type: 'collection',
-				placeholder: 'Add Option',
-				default: {},
-				options: [
-					{
-						displayName: 'Binary Data',
-						name: 'binaryData',
-						type: 'boolean',
-						displayOptions: {
-							show: {
-								'/httpMethod': ['PATCH', 'PUT', 'POST'],
-							},
-						},
-						default: false,
-						description: 'Whether the webhook will receive binary data',
-					},
-					{
-						displayName: 'Binary Property',
-						name: 'binaryPropertyName',
-						type: 'string',
-						default: 'data',
-						required: true,
-						displayOptions: {
-							show: {
-								binaryData: [true],
-							},
-						},
-						description:
-							'Name of the binary property to write the data of the received file to. If the data gets received via "Form-Data Multipart" it will be the prefix and a number starting with 0 will be attached to it.',
-					},
-					{
-						displayName: 'Ignore Bots',
-						name: 'ignoreBots',
-						type: 'boolean',
-						default: false,
-						description:
-							'Whether to ignore requests from bots like link previewers and web crawlers',
-					},
-					{
-						displayName: 'No Response Body',
-						name: 'noResponseBody',
-						type: 'boolean',
-						default: false,
-						description: 'Whether to send any body in the response',
-						displayOptions: {
-							hide: {
-								rawBody: [true],
-							},
-							show: {
-								'/responseMode': ['onReceived'],
-							},
-						},
-					},
-					{
-						displayName: 'Raw Body',
-						name: 'rawBody',
-						type: 'boolean',
-						displayOptions: {
-							hide: {
-								binaryData: [true],
-								noResponseBody: [true],
-							},
-						},
-						default: false,
-						// eslint-disable-next-line n8n-nodes-base/node-param-description-boolean-without-whether
-						description: 'Raw body (binary)',
-					},
-					{
-						displayName: 'Response Data',
-						name: 'responseData',
-						type: 'string',
-						displayOptions: {
-							show: {
-								'/responseMode': ['onReceived'],
-							},
-							hide: {
-								noResponseBody: [true],
-							},
-						},
-						default: '',
-						placeholder: 'success',
-						description: 'Custom response data to send',
-					},
-					{
-						displayName: 'Response Content-Type',
-						name: 'responseContentType',
-						type: 'string',
-						displayOptions: {
-							show: {
-								'/responseData': ['firstEntryJson'],
-								'/responseMode': ['lastNode'],
-							},
-						},
-						default: '',
-						placeholder: 'application/xml',
-						// eslint-disable-next-line n8n-nodes-base/node-param-description-miscased-json
-						description:
-							'Set a custom content-type to return if another one as the "application/json" should be returned',
-					},
-					{
-						displayName: 'Response Headers',
-						name: 'responseHeaders',
-						placeholder: 'Add Response Header',
-						description: 'Add headers to the webhook response',
-						type: 'fixedCollection',
-						typeOptions: {
-							multipleValues: true,
-						},
-						default: {},
-						options: [
-							{
-								name: 'entries',
-								displayName: 'Entries',
-								values: [
-									{
-										displayName: 'Name',
-										name: 'name',
-										type: 'string',
-										default: '',
-										description: 'Name of the header',
-									},
-									{
-										displayName: 'Value',
-										name: 'value',
-										type: 'string',
-										default: '',
-										description: 'Value of the header',
-									},
-								],
-							},
-						],
-					},
-					{
-						displayName: 'Property Name',
-						name: 'responsePropertyName',
-						type: 'string',
-						displayOptions: {
-							show: {
-								'/responseData': ['firstEntryJson'],
-								'/responseMode': ['lastNode'],
-							},
-						},
-						default: 'data',
-						description: 'Name of the property to return the data of instead of the whole JSON',
-					},
-				],
+				...optionsProperty,
+				options: [...(optionsProperty.options as INodeProperties[]), responseCodeOption].sort(
+					(a, b) => {
+						const nameA = a.displayName.toUpperCase();
+						const nameB = b.displayName.toUpperCase();
+						if (nameA < nameB) return -1;
+						if (nameA > nameB) return 1;
+						return 0;
+					},
+				),
 			},
 		],
 	};
 
-	async webhook(this: IWebhookFunctions): Promise<IWebhookResponseData> {
-		const authentication = this.getNodeParameter('authentication') as string;
-		const options = this.getNodeParameter('options', {}) as IDataObject;
-		const swagger = this.getNodeParameter('swagger', '{}') as Record<string, any>;
+	async webhook(context: IWebhookFunctions): Promise<IWebhookResponseData> {
+		const { typeVersion: nodeVersion, type: nodeType } = context.getNode();
+
+		if (nodeVersion >= 2 && nodeType === 'n8n-nodes-base.webhook') {
+			checkResponseModeConfiguration(context);
+		}
 
-		const req = this.getRequestObject();
-		const resp = this.getResponseObject();
-		const headers = this.getHeaderData();
+		const options = context.getNodeParameter('options', {}) as {
+			binaryData: boolean;
+			ignoreBots: boolean;
+			rawBody: boolean;
+			responseData?: string;
+			ipWhitelist?: string;
+		};
+		const req = context.getRequestObject();
+		const resp = context.getResponseObject();
+		const requestMethod = context.getRequestObject().method;
+		const swagger = context.getNodeParameter('swagger', '{}') as Record<string, any>;
+		const realm = 'Webhook';
+
+		if (!isIpWhitelisted(options.ipWhitelist, req.ips, req.ip)) {
+			resp.writeHead(403);
+			resp.end('IP is not whitelisted to access the webhook!');
+			return { noWebhookResponse: true };
+		}
+
+		let validationData: IDataObject | undefined;
+		try {
+			if (options.ignoreBots && isbot(req.headers['user-agent']))
+				throw new WebhookAuthorizationError(403);
+			validationData = await this.validateAuth(context);
+		} catch (error) {
+			if (error instanceof WebhookAuthorizationError) {
+				resp.writeHead(error.responseCode, { 'WWW-Authenticate': 'Basic realm="Webhook"' });
+				resp.end(error.message);
+				return { noWebhookResponse: true };
+			}
+			throw error;
+		}
+
+		const prepareOutput = setupOutputConnection(context, requestMethod, {
+			jwtPayload: validationData,
+		});
+
+		if (options.binaryData) {
+			return await this.handleBinaryData(context, prepareOutput);
+		}
+
+		if (req.contentType === 'multipart/form-data') {
+			return await this.handleFormData(context, prepareOutput);
+		}
+
+		if (nodeVersion > 1 && !req.body && !options.rawBody) {
+			try {
+				return await this.handleBinaryData(context, prepareOutput);
+			} catch (error) {}
+		}
+
+		if (options.rawBody && !req.rawBody) {
+			await req.readRawBody();
+		}
+
+		const response: INodeExecutionData = {
+			json: {
+				headers: req.headers,
+				params: req.params,
+				query: req.query,
+				body: req.body,
+			},
+			binary: options.rawBody
+				? {
+						data: {
+							data: (req.rawBody ?? '').toString(BINARY_ENCODING),
+							mimeType: req.contentType ?? 'application/json',
+						},
+					}
+				: undefined,
+		};
+
+		if (swagger) {
+			// eslint-disable-next-line n8n-local-rules/no-uncaught-json-parse
+			const parsedSwaggerDoc = JSON.parse(swagger as unknown as string);
+			const endpointPaths = parsedSwaggerDoc?.paths as Record<string, any>;
+			const endpoints = Object.keys(endpointPaths || {});
+			const endpointPath = endpoints[0] || '';
+			const method = (context.getNodeParameter('httpMethod') as string)?.toLowerCase();
+			const parameters = endpointPaths?.[endpointPath]?.[method]
+				?.parameters as OpenAPIRequestValidatorArgs['parameters'];
+			const requestBody = endpointPaths?.[endpointPath]?.[method]
+				?.requestBody as OpenAPIRequestValidatorArgs['requestBody'];
+
+			if (parameters?.length || requestBody) {
+				const componentSchemas = (parsedSwaggerDoc?.components?.schemas ||
+					{}) as OpenAPIRequestValidatorArgs['componentSchemas'];
+
+				const requestValidator = new OpenAPIRequestValidator({
+					requestBody,
+					parameters,
+					componentSchemas,
+				});
+				const errors = requestValidator.validateRequest(response.json);
+				if (errors) {
+					const firstError = errors?.errors[0];
+					return authorizationError(
+						resp,
+						realm,
+						400,
+						`${firstError?.message} in the request ${firstError?.location}`,
+					);
+				}
+			}
+		}
+
+		return {
+			webhookResponse: options.responseData,
+			workflowData: prepareOutput(response),
+		};
+	}
+
+	private async validateAuth(context: IWebhookFunctions) {
+		const authentication = context.getNodeParameter(this.authPropertyName) as string;
+		if (authentication === 'none') return;
+
+		const req = context.getRequestObject();
+		const resp = context.getResponseObject();
+		const swagger = context.getNodeParameter('swagger', '{}') as Record<string, any>;
+		const headers = context.getHeaderData();
 		const realm = 'Webhook';
-		const ignoreBots = options.ignoreBots as boolean;
 		const requestAuthData: {
 			tokenData: Record<string, any>;
 			authentication: string;
@@ -495,41 +338,87 @@ export class Webhook implements INodeType {
 			tokenData: null!,
 		};
 
-		if (ignoreBots && isbot((headers as IDataObject)['user-agent'] as string)) {
-			return authorizationError(resp, realm, 403);
-		}
 		const [, token] = headers.authorization?.split(' ') || [];
+
 		if (authentication === 'basicAuth') {
 			// Basic authorization is needed to call webhook
-			let httpBasicAuth: ICredentialDataDecryptedObject | undefined;
+			let expectedAuth: ICredentialDataDecryptedObject | undefined;
 			try {
-				httpBasicAuth = await this.getCredentials('httpBasicAuth');
-			} catch (error) {
-				// Do nothing
-			}
+				expectedAuth = await context.getCredentials('httpBasicAuth');
+			} catch {}
 
-			if (httpBasicAuth === undefined || !httpBasicAuth.user || !httpBasicAuth.password) {
+			if (expectedAuth === undefined || !expectedAuth.user || !expectedAuth.password) {
 				// Data is not defined on node so can not authenticate
-				return authorizationError(resp, realm, 500, 'No authentication data defined on node!');
+				throw new WebhookAuthorizationError(500, 'No authentication data defined on node!');
 			}
 
-			const basicAuthData = basicAuth(req);
+			const providedAuth = basicAuth(req);
+			// Authorization data is missing
+			if (!providedAuth) throw new WebhookAuthorizationError(401);
+
+			if (providedAuth.name !== expectedAuth.user || providedAuth.pass !== expectedAuth.password) {
+				// Provided authentication data is wrong
+				throw new WebhookAuthorizationError(403);
+			}
+		} else if (authentication === 'clientPortalAuth') {
+			try {
+				const authData = await verifyPortalToken(token, context.helpers.httpRequest);
+				requestAuthData.tokenData = authData;
+			} catch (error) {
+				return authorizationError(
+					resp,
+					realm,
+					401,
+					(error?.message || error?.toString()) as string,
+				);
+			}
+		} else if (authentication === 'zohoCRMAuth') {
+			try {
+				const authData = await verifyCrmToken(token, context.helpers.httpRequest);
+				const roles = (context.getNodeParameter('roles', '') as string)
+					?.trim()
+					?.split(',')
+					.filter((fragment) => !!fragment);
+				if (
+					roles?.length &&
+					// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+					!roles.includes(authData?.zohoUser?.role || authData?.zohoUser?.profile)
+				) {
+					return authorizationError(resp, realm, 403, 'User role is not authorized');
+				}
 
-			if (basicAuthData === undefined) {
-				// Authorization data is missing
-				return authorizationError(resp, realm, 401);
+				requestAuthData.tokenData = authData;
+			} catch (error) {
+				return authorizationError(
+					resp,
+					realm,
+					401,
+					(error?.message || error?.toString()) as string,
+				);
 			}
+		} else if (authentication === 'oauth2TokenAuth') {
+			try {
+				const authData = await verifyOauth2Token(token, context.helpers.httpRequest);
+				const scopes = (context.getNodeParameter('scopes', '') as string)
+					?.trim()
+					?.split(',')
+					.filter((fragment) => !!fragment);
+				if (scopes?.length && scopes.every((s) => authData?.user?.scopes.includes(s))) {
+					return authorizationError(resp, realm, 403, 'User role is not authorized');
+				}
 
-			if (
-				basicAuthData.name !== httpBasicAuth.user ||
-				basicAuthData.pass !== httpBasicAuth.password
-			) {
-				// Provided authentication data is wrong
-				return authorizationError(resp, realm, 403);
+				requestAuthData.tokenData = authData;
+			} catch (error) {
+				return authorizationError(
+					resp,
+					realm,
+					401,
+					(error?.message || error?.toString()) as string,
+				);
 			}
 		} else if (authentication === 'clientPortalAuth') {
 			try {
-				const authData = await verifyPortalToken(token, this.helpers.httpRequest);
+				const authData = await verifyPortalToken(token, context.helpers.httpRequest);
 				requestAuthData.tokenData = authData;
 			} catch (error) {
 				return authorizationError(
@@ -541,8 +430,8 @@ export class Webhook implements INodeType {
 			}
 		} else if (authentication === 'zohoCRMAuth') {
 			try {
-				const authData = await verifyCrmToken(token, this.helpers.httpRequest);
-				const roles = (this.getNodeParameter('roles', '') as string)
+				const authData = await verifyCrmToken(token, context.helpers.httpRequest);
+				const roles = (context.getNodeParameter('roles', '') as string)
 					?.trim()
 					?.split(',')
 					.filter((fragment) => !!fragment);
@@ -565,8 +454,8 @@ export class Webhook implements INodeType {
 			}
 		} else if (authentication === 'oauth2TokenAuth') {
 			try {
-				const authData = await verifyOauth2Token(token, this.helpers.httpRequest);
-				const scopes = (this.getNodeParameter('scopes', '') as string)
+				const authData = await verifyOauth2Token(token, context.helpers.httpRequest);
+				const scopes = (context.getNodeParameter('scopes', '') as string)
 					?.trim()
 					?.split(',')
 					.filter((fragment) => !!fragment);
@@ -585,26 +474,24 @@ export class Webhook implements INodeType {
 			}
 		} else if (authentication === 'headerAuth') {
 			// Special header with value is needed to call webhook
-			let httpHeaderAuth: ICredentialDataDecryptedObject | undefined;
+			let expectedAuth: ICredentialDataDecryptedObject | undefined;
 			try {
-				httpHeaderAuth = await this.getCredentials('httpHeaderAuth');
-			} catch (error) {
-				// Do nothing
-			}
+				expectedAuth = await context.getCredentials('httpHeaderAuth');
+			} catch {}
 
-			if (httpHeaderAuth === undefined || !httpHeaderAuth.name || !httpHeaderAuth.value) {
+			if (expectedAuth === undefined || !expectedAuth.name || !expectedAuth.value) {
 				// Data is not defined on node so can not authenticate
-				return authorizationError(resp, realm, 500, 'No authentication data defined on node!');
+				throw new WebhookAuthorizationError(500, 'No authentication data defined on node!');
 			}
-			const headerName = (httpHeaderAuth.name as string).toLowerCase();
-			const headerValue = httpHeaderAuth.value as string;
+			const headerName = (expectedAuth.name as string).toLowerCase();
+			const expectedValue = expectedAuth.value as string;
 
 			if (
 				!headers.hasOwnProperty(headerName) ||
-				(headers as IDataObject)[headerName] !== headerValue
+				(headers as IDataObject)[headerName] !== expectedValue
 			) {
 				// Provided authentication data is wrong
-				return authorizationError(resp, realm, 403);
+				throw new WebhookAuthorizationError(403);
 			}
 		} else if (authentication === 'nocoDBWebhookAuth') {
 			const esaKey = headers['esa-key'];
@@ -630,168 +517,164 @@ export class Webhook implements INodeType {
 			delete requestAuthData.tokenData.tokenDetails;
 		} else if (authentication === 'nocoDBWebhookAuth') {
 			if (headers['esa-key']) headers['esa-key'] = hiddenMsg;
-		}
-
-		const mimeType = headers['content-type'] ?? 'application/json';
-		if (mimeType.includes('multipart/form-data')) {
-			const form = new formidable.IncomingForm({ multiples: true });
-
-			return new Promise((resolve, _reject) => {
-				form.parse(req, async (err, data, files) => {
-					const returnItem: INodeExecutionData = {
-						binary: {},
-						json: {
-							authData: requestAuthData,
-							headers,
-							params: this.getParamsData(),
-							query: this.getQueryData(),
-							body: data,
-						},
-					};
-
-					let count = 0;
-					for (const xfile of Object.keys(files)) {
-						const processFiles: formidable.File[] = [];
-						let multiFile = false;
-						if (Array.isArray(files[xfile])) {
-							processFiles.push(...(files[xfile] as formidable.File[]));
-							multiFile = true;
-						} else {
-							processFiles.push(files[xfile] as formidable.File);
-						}
-
-						let fileCount = 0;
-						for (const file of processFiles) {
-							let binaryPropertyName = xfile;
-							if (binaryPropertyName.endsWith('[]')) {
-								binaryPropertyName = binaryPropertyName.slice(0, -2);
-							}
-							if (multiFile) {
-								binaryPropertyName += fileCount++;
-							}
-							if (options.binaryPropertyName) {
-								binaryPropertyName = `${options.binaryPropertyName}${count}`;
-							}
-
-							const fileJson = file.toJSON();
-							returnItem.binary![binaryPropertyName] = await this.nodeHelpers.copyBinaryFile(
-								file.path,
-								fileJson.name || fileJson.filename,
-								fileJson.type as string,
-							);
-
-							count += 1;
-						}
-					}
-					resolve({
-						workflowData: [[returnItem]],
-					});
-				});
-			});
-		}
-
-		if (options.binaryData === true) {
-			const binaryFile = await tmpFile({ prefix: 'n8n-webhook-' });
+		} else if (authentication === 'jwtAuth') {
+			let expectedAuth;
 
 			try {
-				await pipeline(req, fs.createWriteStream(binaryFile.path));
-
-				const returnItem: INodeExecutionData = {
-					binary: {},
-					json: {
-						authData: requestAuthData,
-						headers,
-						params: this.getParamsData(),
-						query: this.getQueryData(),
-						body: this.getBodyData(),
-					},
+				expectedAuth = (await context.getCredentials('jwtAuth')) as {
+					keyType: 'passphrase' | 'pemKey';
+					publicKey: string;
+					secret: string;
+					algorithm: jwt.Algorithm;
 				};
+			} catch {}
 
-				const binaryPropertyName = (options.binaryPropertyName || 'data') as string;
-				returnItem.binary![binaryPropertyName] = await this.nodeHelpers.copyBinaryFile(
-					binaryFile.path,
-					mimeType,
-				);
+			if (expectedAuth === undefined) {
+				// Data is not defined on node so can not authenticate
+				throw new WebhookAuthorizationError(500, 'No authentication data defined on node!');
+			}
 
-				return {
-					workflowData: [[returnItem]],
-				};
-			} catch (error) {
-				throw new NodeOperationError(this.getNode(), error as Error);
-			} finally {
-				await binaryFile.cleanup();
+			const authHeader = req.headers.authorization;
+			const token = authHeader && authHeader.split(' ')[1];
+
+			if (!token) {
+				throw new WebhookAuthorizationError(401, 'No token provided');
 			}
-		}
-		let body = this.getBodyData();
-		// parse request body if request is made from within NOCODB
-		if (authentication === 'nocoDBWebhookAuth') {
+
+			let secretOrPublicKey;
+
+			if (expectedAuth.keyType === 'passphrase') {
+				secretOrPublicKey = expectedAuth.secret;
+			} else {
+				secretOrPublicKey = formatPrivateKey(expectedAuth.publicKey, true);
+			}
+
 			try {
-				body = JSON.parse(Object.keys(body)[0]);
+				return jwt.verify(token, secretOrPublicKey, {
+					algorithms: [expectedAuth.algorithm],
+				}) as IDataObject;
 			} catch (error) {
-				// Do nothing
+				throw new WebhookAuthorizationError(403, error.message);
 			}
 		}
-		const response: INodeExecutionData = {
+	}
+
+	private async handleFormData(
+		context: IWebhookFunctions,
+		prepareOutput: (data: INodeExecutionData) => INodeExecutionData[][],
+	) {
+		const req = context.getRequestObject() as MultiPartFormData.Request;
+		const options = context.getNodeParameter('options', {}) as IDataObject;
+		const authentication = context.getNodeParameter(this.authPropertyName) as string;
+		const { data, files } = req.body;
+		const requestAuthData: {
+			tokenData: Record<string, any>;
+			authentication: string;
+		} = {
+			authentication,
+			tokenData: null!,
+		};
+
+		const returnItem: INodeExecutionData = {
 			json: {
 				authData: requestAuthData,
-				headers,
-				params: this.getParamsData(),
-				query: this.getQueryData(),
-				body,
+				headers: req.headers,
+				params: req.params,
+				query: req.query,
+				body: data,
 			},
 		};
-		// request body, query, params validation
-		if (swagger) {
-			// eslint-disable-next-line n8n-local-rules/no-uncaught-json-parse
-			const parsedSwaggerDoc = JSON.parse(swagger as unknown as string);
-			const endpointPaths = parsedSwaggerDoc?.paths as Record<string, any>;
-			const endpoints = Object.keys(endpointPaths || {});
-			const endpointPath = endpoints[0] || '';
-			const method = (this.getNodeParameter('httpMethod') as string)?.toLowerCase();
-			const parameters = endpointPaths?.[endpointPath]?.[method]
-				?.parameters as OpenAPIRequestValidatorArgs['parameters'];
-			const requestBody = endpointPaths?.[endpointPath]?.[method]
-				?.requestBody as OpenAPIRequestValidatorArgs['requestBody'];
 
-			if (parameters?.length || requestBody) {
-				const componentSchemas = (parsedSwaggerDoc?.components?.schemas ||
-					{}) as OpenAPIRequestValidatorArgs['componentSchemas'];
+		if (files && Object.keys(files).length) {
+			returnItem.binary = {};
+		}
 
-				const requestValidator = new OpenAPIRequestValidator({
-					requestBody,
-					parameters,
-					componentSchemas,
-				});
-				const errors = requestValidator.validateRequest(response.json);
-				if (errors) {
-					const firstError = errors?.errors[0];
-					return authorizationError(
-						resp,
-						realm,
-						400,
-						`${firstError?.message} in the request ${firstError?.location}`,
-					);
+		let count = 0;
+
+		for (const key of Object.keys(files)) {
+			const processFiles: MultiPartFormData.File[] = [];
+			let multiFile = false;
+			if (Array.isArray(files[key])) {
+				processFiles.push(...(files[key] as MultiPartFormData.File[]));
+				multiFile = true;
+			} else {
+				processFiles.push(files[key] as MultiPartFormData.File);
+			}
+
+			let fileCount = 0;
+			for (const file of processFiles) {
+				let binaryPropertyName = key;
+				if (binaryPropertyName.endsWith('[]')) {
+					binaryPropertyName = binaryPropertyName.slice(0, -2);
 				}
+				if (multiFile) {
+					binaryPropertyName += fileCount++;
+				}
+				if (options.binaryPropertyName) {
+					binaryPropertyName = `${options.binaryPropertyName}${count}`;
+				}
+
+				returnItem.binary![binaryPropertyName] = await context.nodeHelpers.copyBinaryFile(
+					file.filepath,
+					file.originalFilename ?? file.newFilename,
+					file.mimetype,
+				);
+
+				count += 1;
 			}
 		}
 
-		if (options.rawBody) {
-			response.binary = {
-				data: {
-					data: req.rawBody.toString(BINARY_ENCODING),
-					mimeType,
+		return { workflowData: prepareOutput(returnItem) };
+	}
+
+	private async handleBinaryData(
+		context: IWebhookFunctions,
+		prepareOutput: (data: INodeExecutionData) => INodeExecutionData[][],
+	): Promise<IWebhookResponseData> {
+		const req = context.getRequestObject();
+		const options = context.getNodeParameter('options', {}) as IDataObject;
+		const authentication = context.getNodeParameter(this.authPropertyName) as string;
+		const requestAuthData: {
+			tokenData: Record<string, any>;
+			authentication: string;
+		} = {
+			authentication,
+			tokenData: null!,
+		};
+
+		// TODO: create empty binaryData placeholder, stream into that path, and then finalize the binaryData
+		const binaryFile = await tmpFile({ prefix: 'n8n-webhook-' });
+
+		try {
+			await pipeline(req, createWriteStream(binaryFile.path));
+
+			const returnItem: INodeExecutionData = {
+				json: {
+					authData: requestAuthData,
+					headers: req.headers,
+					params: req.params,
+					query: req.query,
+					body: {},
 				},
 			};
-		}
 
-		let webhookResponse: string | undefined;
-		if (options.responseData) {
-			webhookResponse = options.responseData as string;
-		}
+			const stats = await stat(binaryFile.path);
+			if (stats.size) {
+				const binaryPropertyName = (options.binaryPropertyName ?? 'data') as string;
+				const fileName = req.contentDisposition?.filename ?? uuid();
+				const binaryData = await context.nodeHelpers.copyBinaryFile(
+					binaryFile.path,
+					fileName,
+					req.contentType ?? 'application/octet-stream',
+				);
+				returnItem.binary = { [binaryPropertyName]: binaryData };
+			}
 
-		return {
-			webhookResponse,
-			workflowData: [[response]],
-		};
+			return { workflowData: prepareOutput(returnItem) };
+		} catch (error) {
+			throw new NodeOperationError(context.getNode(), error as Error);
+		} finally {
+			await binaryFile.cleanup();
+		}
 	}
 }
diff --git a/packages/nodes-base/nodes/Webhook/description.ts b/packages/nodes-base/nodes/Webhook/description.ts
new file mode 100644
index 0000000000000..7039ae84905c7
--- /dev/null
+++ b/packages/nodes-base/nodes/Webhook/description.ts
@@ -0,0 +1,468 @@
+import type { INodeProperties, INodeTypeDescription, IWebhookDescription } from 'n8n-workflow';
+import { getResponseCode, getResponseData } from './utils';
+
+export const defaultWebhookDescription: IWebhookDescription = {
+	name: 'default',
+	httpMethod: '={{$parameter["httpMethod"] || "GET"}}',
+	isFullPath: true,
+	responseCode: `={{(${getResponseCode})($parameter)}}`,
+	responseMode: '={{$parameter["responseMode"]}}',
+	responseData: `={{(${getResponseData})($parameter)}}`,
+	responseBinaryPropertyName: '={{$parameter["responseBinaryPropertyName"]}}',
+	responseContentType: '={{$parameter["options"]["responseContentType"]}}',
+	responsePropertyName: '={{$parameter["options"]["responsePropertyName"]}}',
+	responseHeaders: '={{$parameter["options"]["responseHeaders"]}}',
+	path: '={{$parameter["path"]}}',
+};
+
+export const credentialsProperty = (
+	propertyName = 'authentication',
+): INodeTypeDescription['credentials'] => [
+	{
+		name: 'httpBasicAuth',
+		required: true,
+		displayOptions: {
+			show: {
+				[propertyName]: ['basicAuth'],
+			},
+		},
+	},
+	{
+		name: 'httpHeaderAuth',
+		required: true,
+		displayOptions: {
+			show: {
+				[propertyName]: ['headerAuth'],
+			},
+		},
+	},
+	{
+		name: 'jwtAuth',
+		required: true,
+		displayOptions: {
+			show: {
+				[propertyName]: ['jwtAuth'],
+			},
+		},
+	},
+];
+
+export const authenticationProperty = (propertyName = 'authentication'): INodeProperties => ({
+	displayName: 'Authentication',
+	name: propertyName,
+	type: 'options',
+	options: [
+		{
+			name: 'Basic Auth',
+			value: 'basicAuth',
+		},
+		{
+			name: 'Header Auth',
+			value: 'headerAuth',
+		},
+		{
+			name: 'JWT Auth',
+			value: 'jwtAuth',
+		},
+		{
+			name: 'None',
+			value: 'none',
+		},
+	],
+	default: 'none',
+	description: 'The way to authenticate',
+});
+
+export const httpMethodsProperty: INodeProperties = {
+	displayName: 'HTTP Method',
+	name: 'httpMethod',
+	type: 'options',
+	options: [
+		{
+			name: 'DELETE',
+			value: 'DELETE',
+		},
+		{
+			name: 'GET',
+			value: 'GET',
+		},
+		{
+			name: 'HEAD',
+			value: 'HEAD',
+		},
+		{
+			name: 'PATCH',
+			value: 'PATCH',
+		},
+		{
+			name: 'POST',
+			value: 'POST',
+		},
+		{
+			name: 'PUT',
+			value: 'PUT',
+		},
+	],
+	default: 'GET',
+	description: 'The HTTP method to listen to',
+};
+
+export const responseCodeProperty: INodeProperties = {
+	displayName: 'Response Code',
+	name: 'responseCode',
+	type: 'number',
+	displayOptions: {
+		hide: {
+			responseMode: ['responseNode'],
+		},
+	},
+	typeOptions: {
+		minValue: 100,
+		maxValue: 599,
+	},
+	default: 200,
+	description: 'The HTTP Response code to return',
+};
+
+export const responseModeProperty: INodeProperties = {
+	displayName: 'Respond',
+	name: 'responseMode',
+	type: 'options',
+	options: [
+		{
+			name: 'Immediately',
+			value: 'onReceived',
+			description: 'As soon as this node executes',
+		},
+		{
+			name: 'When Last Node Finishes',
+			value: 'lastNode',
+			description: 'Returns data of the last-executed node',
+		},
+		{
+			name: "Using 'Respond to Webhook' Node",
+			value: 'responseNode',
+			description: 'Response defined in that node',
+		},
+	],
+	default: 'onReceived',
+	description: 'When and how to respond to the webhook',
+};
+
+export const responseDataProperty: INodeProperties = {
+	displayName: 'Response Data',
+	name: 'responseData',
+	type: 'options',
+	displayOptions: {
+		show: {
+			responseMode: ['lastNode'],
+		},
+	},
+	options: [
+		{
+			name: 'All Entries',
+			value: 'allEntries',
+			description: 'Returns all the entries of the last node. Always returns an array.',
+		},
+		{
+			name: 'First Entry JSON',
+			value: 'firstEntryJson',
+			description:
+				'Returns the JSON data of the first entry of the last node. Always returns a JSON object.',
+		},
+		{
+			name: 'First Entry Binary',
+			value: 'firstEntryBinary',
+			description:
+				'Returns the binary data of the first entry of the last node. Always returns a binary file.',
+		},
+		{
+			name: 'No Response Body',
+			value: 'noData',
+			description: 'Returns without a body',
+		},
+	],
+	default: 'firstEntryJson',
+	description:
+		'What data should be returned. If it should return all items as an array or only the first item as object.',
+};
+
+export const responseBinaryPropertyNameProperty: INodeProperties = {
+	displayName: 'Property Name',
+	name: 'responseBinaryPropertyName',
+	type: 'string',
+	required: true,
+	default: 'data',
+	displayOptions: {
+		show: {
+			responseData: ['firstEntryBinary'],
+		},
+	},
+	description: 'Name of the binary property to return',
+};
+
+export const optionsProperty: INodeProperties = {
+	displayName: 'Options',
+	name: 'options',
+	type: 'collection',
+	placeholder: 'Add Option',
+	default: {},
+	options: [
+		{
+			displayName: 'Binary File',
+			name: 'binaryData',
+			type: 'boolean',
+			displayOptions: {
+				show: {
+					'/httpMethod': ['PATCH', 'PUT', 'POST'],
+					'@version': [1],
+				},
+			},
+			default: false,
+			description: 'Whether the webhook will receive binary data',
+		},
+		{
+			displayName: 'Put Output File in Field',
+			name: 'binaryPropertyName',
+			type: 'string',
+			default: 'data',
+			displayOptions: {
+				show: {
+					binaryData: [true],
+					'@version': [1],
+				},
+			},
+			hint: 'The name of the output binary field to put the file in',
+			description:
+				'If the data gets received via "Form-Data Multipart" it will be the prefix and a number starting with 0 will be attached to it',
+		},
+		{
+			displayName: 'Binary Property',
+			name: 'binaryPropertyName',
+			type: 'string',
+			default: 'data',
+			displayOptions: {
+				hide: {
+					'@version': [1],
+				},
+			},
+			description:
+				'Name of the binary property to write the data of the received file to, only relevant if binary data is received',
+		},
+		{
+			displayName: 'Ignore Bots',
+			name: 'ignoreBots',
+			type: 'boolean',
+			default: false,
+			description: 'Whether to ignore requests from bots like link previewers and web crawlers',
+		},
+		{
+			displayName: 'IP(s) Whitelist',
+			name: 'ipWhitelist',
+			type: 'string',
+			placeholder: 'e.g. 127.0.0.1',
+			default: '',
+			description: 'Comma-separated list of allowed IP addresses. Leave empty to allow all IPs.',
+		},
+		{
+			displayName: 'No Response Body',
+			name: 'noResponseBody',
+			type: 'boolean',
+			default: false,
+			description: 'Whether to send any body in the response',
+			displayOptions: {
+				hide: {
+					rawBody: [true],
+				},
+				show: {
+					'/responseMode': ['onReceived'],
+				},
+			},
+		},
+		{
+			displayName: 'Raw Body',
+			name: 'rawBody',
+			type: 'boolean',
+			displayOptions: {
+				show: {
+					'@version': [1],
+				},
+				hide: {
+					binaryData: [true],
+					noResponseBody: [true],
+				},
+			},
+			default: false,
+			// eslint-disable-next-line n8n-nodes-base/node-param-description-boolean-without-whether
+			description: 'Raw body (binary)',
+		},
+		{
+			displayName: 'Raw Body',
+			name: 'rawBody',
+			type: 'boolean',
+			displayOptions: {
+				hide: {
+					noResponseBody: [true],
+					'@version': [1],
+				},
+			},
+			default: false,
+			description: 'Whether to return the raw body',
+		},
+		{
+			displayName: 'Response Data',
+			name: 'responseData',
+			type: 'string',
+			displayOptions: {
+				show: {
+					'/responseMode': ['onReceived'],
+				},
+				hide: {
+					noResponseBody: [true],
+				},
+			},
+			default: '',
+			placeholder: 'success',
+			description: 'Custom response data to send',
+		},
+		{
+			displayName: 'Response Content-Type',
+			name: 'responseContentType',
+			type: 'string',
+			displayOptions: {
+				show: {
+					'/responseData': ['firstEntryJson'],
+					'/responseMode': ['lastNode'],
+				},
+			},
+			default: '',
+			placeholder: 'application/xml',
+			// eslint-disable-next-line n8n-nodes-base/node-param-description-miscased-json
+			description:
+				'Set a custom content-type to return if another one as the "application/json" should be returned',
+		},
+		{
+			displayName: 'Response Headers',
+			name: 'responseHeaders',
+			placeholder: 'Add Response Header',
+			description: 'Add headers to the webhook response',
+			type: 'fixedCollection',
+			typeOptions: {
+				multipleValues: true,
+			},
+			default: {},
+			options: [
+				{
+					name: 'entries',
+					displayName: 'Entries',
+					values: [
+						{
+							displayName: 'Name',
+							name: 'name',
+							type: 'string',
+							default: '',
+							description: 'Name of the header',
+						},
+						{
+							displayName: 'Value',
+							name: 'value',
+							type: 'string',
+							default: '',
+							description: 'Value of the header',
+						},
+					],
+				},
+			],
+		},
+		{
+			displayName: 'Property Name',
+			name: 'responsePropertyName',
+			type: 'string',
+			displayOptions: {
+				show: {
+					'/responseData': ['firstEntryJson'],
+					'/responseMode': ['lastNode'],
+				},
+			},
+			default: 'data',
+			description: 'Name of the property to return the data of instead of the whole JSON',
+		},
+	],
+};
+
+export const responseCodeSelector: INodeProperties = {
+	displayName: 'Response Code',
+	name: 'responseCode',
+	type: 'options',
+	options: [
+		{ name: '200', value: 200, description: 'OK - Request has succeeded' },
+		{ name: '201', value: 201, description: 'Created - Request has been fulfilled' },
+		{ name: '204', value: 204, description: 'No Content - Request processed, no content returned' },
+		{
+			name: '301',
+			value: 301,
+			description: 'Moved Permanently - Requested resource moved permanently',
+		},
+		{ name: '302', value: 302, description: 'Found - Requested resource moved temporarily' },
+		{ name: '304', value: 304, description: 'Not Modified - Resource has not been modified' },
+		{ name: '400', value: 400, description: 'Bad Request - Request could not be understood' },
+		{ name: '401', value: 401, description: 'Unauthorized - Request requires user authentication' },
+		{
+			name: '403',
+			value: 403,
+			description: 'Forbidden - Server understood, but refuses to fulfill',
+		},
+		{ name: '404', value: 404, description: 'Not Found - Server has not found a match' },
+		{
+			name: 'Custom Code',
+			value: 'customCode',
+			description: 'Write any HTTP code',
+		},
+	],
+	default: 200,
+	description: 'The HTTP response code to return',
+};
+
+export const responseCodeOption: INodeProperties = {
+	displayName: 'Response Code',
+	name: 'responseCode',
+	placeholder: 'Add Response Code',
+	type: 'fixedCollection',
+	default: {
+		values: {
+			responseCode: 200,
+		},
+	},
+	options: [
+		{
+			name: 'values',
+			displayName: 'Values',
+			values: [
+				responseCodeSelector,
+				{
+					displayName: 'Code',
+					name: 'customCode',
+					type: 'number',
+					default: 200,
+					placeholder: 'e.g. 400',
+					typeOptions: {
+						minValue: 100,
+					},
+					displayOptions: {
+						show: {
+							responseCode: ['customCode'],
+						},
+					},
+				},
+			],
+		},
+	],
+	displayOptions: {
+		show: {
+			'@version': [{ _cnd: { gte: 2 } }],
+		},
+		hide: {
+			'/responseMode': ['responseNode'],
+		},
+	},
+};
diff --git a/packages/nodes-base/nodes/Webhook/error.ts b/packages/nodes-base/nodes/Webhook/error.ts
new file mode 100644
index 0000000000000..35001d67e4b85
--- /dev/null
+++ b/packages/nodes-base/nodes/Webhook/error.ts
@@ -0,0 +1,16 @@
+export class WebhookAuthorizationError extends Error {
+	constructor(
+		readonly responseCode: number,
+		message?: string,
+	) {
+		if (message === undefined) {
+			message = 'Authorization problem!';
+			if (responseCode === 401) {
+				message = 'Authorization is required!';
+			} else if (responseCode === 403) {
+				message = 'Authorization data is wrong!';
+			}
+		}
+		super(message);
+	}
+}
diff --git a/packages/nodes-base/nodes/Webhook/test/Webhook.formdata.test.json b/packages/nodes-base/nodes/Webhook/test/Webhook.formdata.test.json
new file mode 100644
index 0000000000000..94449c295efdc
--- /dev/null
+++ b/packages/nodes-base/nodes/Webhook/test/Webhook.formdata.test.json
@@ -0,0 +1,60 @@
+{
+	"nodes": [
+		{
+			"parameters": {
+				"httpMethod": "POST",
+				"path": "test",
+				"options": {
+					"binaryData": false
+				}
+			},
+			"id": "ec188f16-b2c5-44e3-bd83-259a94f15c94",
+			"name": "Webhook",
+			"type": "n8n-nodes-base.webhook",
+			"typeVersion": 1,
+			"webhookId": "a59a3be7-6d43-47e7-951d-86b8172c2006"
+		}
+	],
+	"connections": {
+		"Webhook": {
+			"main": [[]]
+		}
+	},
+	"trigger": {
+		"mode": "webhook",
+		"input": {
+			"json": {
+				"headers": {
+					"host": "localhost:5678",
+					"user-agent": "curl/8.2.0",
+					"accept": "*/*",
+					"content-length": "137",
+					"content-type": "multipart/form-data; boundary=--boundary"
+				},
+				"params": { "path": "test" },
+				"query": {},
+				"body": { "a": ["b"] }
+			}
+		}
+	},
+	"pinData": {
+		"Webhook": [
+			{
+				"json": {
+					"headers": {
+						"host": "localhost:5678",
+						"user-agent": "curl/8.2.0",
+						"accept": "*/*",
+						"content-length": "137",
+						"content-type": "multipart/form-data; boundary=--boundary"
+					},
+					"params": { "path": "test" },
+					"query": {},
+					"body": {
+						"a": ["b"]
+					}
+				}
+			}
+		]
+	}
+}
diff --git a/packages/nodes-base/nodes/Webhook/test/Webhook.test.ts b/packages/nodes-base/nodes/Webhook/test/Webhook.test.ts
new file mode 100644
index 0000000000000..97fd23e90eb43
--- /dev/null
+++ b/packages/nodes-base/nodes/Webhook/test/Webhook.test.ts
@@ -0,0 +1,44 @@
+import type { Request } from 'express';
+import type { IWebhookFunctions } from 'n8n-workflow';
+import { mock } from 'jest-mock-extended';
+import { Webhook } from '../Webhook.node';
+import { testWorkflows, getWorkflowFilenames } from '@test/nodes/Helpers';
+
+const workflows = getWorkflowFilenames(__dirname);
+
+describe('Test Webhook Node', () => {
+	testWorkflows(workflows);
+
+	describe('handleFormData', () => {
+		const node = new Webhook();
+		const context = mock<IWebhookFunctions>({
+			nodeHelpers: mock(),
+		});
+		context.getNodeParameter.calledWith('options').mockReturnValue({});
+		context.getNode.calledWith().mockReturnValue({
+			type: 'n8n-nodes-base.webhook',
+			typeVersion: 1.1,
+		} as any);
+		const req = mock<Request>();
+		req.contentType = 'multipart/form-data';
+		context.getRequestObject.mockReturnValue(req);
+
+		it('should handle when no files are present', async () => {
+			req.body = {
+				files: {},
+			};
+			const returnData = await node.webhook(context);
+			expect(returnData.workflowData?.[0][0].binary).toBeUndefined();
+			expect(context.nodeHelpers.copyBinaryFile).not.toHaveBeenCalled();
+		});
+
+		it('should handle when files are present', async () => {
+			req.body = {
+				files: { file1: {} },
+			};
+			const returnData = await node.webhook(context);
+			expect(returnData.workflowData?.[0][0].binary).not.toBeUndefined();
+			expect(context.nodeHelpers.copyBinaryFile).toHaveBeenCalled();
+		});
+	});
+});
diff --git a/packages/nodes-base/nodes/Webhook/utils.ts b/packages/nodes-base/nodes/Webhook/utils.ts
new file mode 100644
index 0000000000000..33fd36331ecc8
--- /dev/null
+++ b/packages/nodes-base/nodes/Webhook/utils.ts
@@ -0,0 +1,169 @@
+import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
+import type { IWebhookFunctions, INodeExecutionData, IDataObject } from 'n8n-workflow';
+
+type WebhookParameters = {
+	httpMethod: string;
+	responseMode: string;
+	responseData: string;
+	responseCode?: number; //typeVersion <= 1.1
+	options?: {
+		responseData?: string;
+		responseCode?: {
+			values?: {
+				responseCode: number;
+				customCode?: number;
+			};
+		};
+		noResponseBody?: boolean;
+	};
+};
+
+export const getResponseCode = (parameters: WebhookParameters) => {
+	if (parameters.responseCode) {
+		return parameters.responseCode;
+	}
+	const responseCodeOptions = parameters.options;
+	if (responseCodeOptions?.responseCode?.values) {
+		const { responseCode, customCode } = responseCodeOptions.responseCode.values;
+
+		if (customCode) {
+			return customCode;
+		}
+
+		return responseCode;
+	}
+	return 200;
+};
+
+export const getResponseData = (parameters: WebhookParameters) => {
+	const { responseData, responseMode, options } = parameters;
+	if (responseData) return responseData;
+
+	if (responseMode === 'onReceived') {
+		const data = options?.responseData;
+		if (data) return data;
+	}
+
+	if (options?.noResponseBody) return 'noData';
+
+	return undefined;
+};
+
+export const configuredOutputs = (parameters: WebhookParameters) => {
+	const httpMethod = parameters.httpMethod as string | string[];
+
+	if (!Array.isArray(httpMethod))
+		return [
+			{
+				type: `${NodeConnectionType.Main}`,
+				displayName: httpMethod,
+			},
+		];
+
+	const outputs = httpMethod.map((method) => {
+		return {
+			type: `${NodeConnectionType.Main}`,
+			displayName: method,
+		};
+	});
+
+	return outputs;
+};
+
+export const setupOutputConnection = (
+	ctx: IWebhookFunctions,
+	method: string,
+	additionalData: {
+		jwtPayload?: IDataObject;
+	},
+) => {
+	const httpMethod = ctx.getNodeParameter('httpMethod', []) as string[] | string;
+	let webhookUrl = ctx.getNodeWebhookUrl('default') as string;
+	const executionMode = ctx.getMode() === 'manual' ? 'test' : 'production';
+
+	if (executionMode === 'test') {
+		webhookUrl = webhookUrl.replace('/webhook/', '/webhook-test/');
+	}
+
+	// multi methods could be set in settings of node, so we need to check if it's an array
+	if (!Array.isArray(httpMethod)) {
+		return (outputData: INodeExecutionData): INodeExecutionData[][] => {
+			outputData.json.webhookUrl = webhookUrl;
+			outputData.json.executionMode = executionMode;
+			if (additionalData?.jwtPayload) {
+				outputData.json.jwtPayload = additionalData.jwtPayload;
+			}
+			return [[outputData]];
+		};
+	}
+
+	const outputIndex = httpMethod.indexOf(method.toUpperCase());
+	const outputs: INodeExecutionData[][] = httpMethod.map(() => []);
+
+	return (outputData: INodeExecutionData): INodeExecutionData[][] => {
+		outputData.json.webhookUrl = webhookUrl;
+		outputData.json.executionMode = executionMode;
+		if (additionalData?.jwtPayload) {
+			outputData.json.jwtPayload = additionalData.jwtPayload;
+		}
+		outputs[outputIndex] = [outputData];
+		return outputs;
+	};
+};
+
+export const isIpWhitelisted = (
+	whitelist: string | string[] | undefined,
+	ips: string[],
+	ip?: string,
+) => {
+	if (whitelist === undefined || whitelist === '') {
+		return true;
+	}
+
+	if (!Array.isArray(whitelist)) {
+		whitelist = whitelist.split(',').map((entry) => entry.trim());
+	}
+
+	for (const address of whitelist) {
+		if (ip && ip.includes(address)) {
+			return true;
+		}
+
+		if (ips.some((entry) => entry.includes(address))) {
+			return true;
+		}
+	}
+
+	return false;
+};
+
+export const checkResponseModeConfiguration = (context: IWebhookFunctions) => {
+	const responseMode = context.getNodeParameter('responseMode', 'onReceived') as string;
+	const connectedNodes = context.getChildNodes(context.getNode().name);
+
+	const isRespondToWebhookConnected = connectedNodes.some(
+		(node) => node.type === 'n8n-nodes-base.respondToWebhook',
+	);
+
+	if (!isRespondToWebhookConnected && responseMode === 'responseNode') {
+		throw new NodeOperationError(
+			context.getNode(),
+			new Error('No Respond to Webhook node found in the workflow'),
+			{
+				description:
+					'Insert a Respond to Webhook node to your workflow to respond to the webhook or choose another option for the “Respond” parameter',
+			},
+		);
+	}
+
+	if (isRespondToWebhookConnected && responseMode !== 'responseNode') {
+		throw new NodeOperationError(
+			context.getNode(),
+			new Error('Webhook node not correctly configured'),
+			{
+				description:
+					'Set the “Respond” parameter to “Using Respond to Webhook Node” or remove the Respond to Webhook node',
+			},
+		);
+	}
+};
diff --git a/packages/nodes-base/nodes/Webhook/webhook.svg b/packages/nodes-base/nodes/Webhook/webhook.svg
index a59b318554ef6..110ebbef60089 100644
--- a/packages/nodes-base/nodes/Webhook/webhook.svg
+++ b/packages/nodes-base/nodes/Webhook/webhook.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 48 48" width="48px" height="48px"><path fill="#37474f" d="M35,37c-2.2,0-4-1.8-4-4s1.8-4,4-4s4,1.8,4,4S37.2,37,35,37z"/><path fill="#37474f" d="M35,43c-3,0-5.9-1.4-7.8-3.7l3.1-2.5c1.1,1.4,2.9,2.3,4.7,2.3c3.3,0,6-2.7,6-6s-2.7-6-6-6 c-1,0-2,0.3-2.9,0.7l-1.7,1L23.3,16l3.5-1.9l5.3,9.4c1-0.3,2-0.5,3-0.5c5.5,0,10,4.5,10,10S40.5,43,35,43z"/><path fill="#37474f" d="M14,43C8.5,43,4,38.5,4,33c0-4.6,3.1-8.5,7.5-9.7l1,3.9C9.9,27.9,8,30.3,8,33c0,3.3,2.7,6,6,6 s6-2.7,6-6v-2h15v4H23.8C22.9,39.6,18.8,43,14,43z"/><path fill="#e91e63" d="M14,37c-2.2,0-4-1.8-4-4s1.8-4,4-4s4,1.8,4,4S16.2,37,14,37z"/><path fill="#37474f" d="M25,19c-2.2,0-4-1.8-4-4s1.8-4,4-4s4,1.8,4,4S27.2,19,25,19z"/><path fill="#e91e63" d="M15.7,34L12.3,32l5.9-9.7c-2-1.9-3.2-4.5-3.2-7.3c0-5.5,4.5-10,10-10c5.5,0,10,4.5,10,10 c0,0.9-0.1,1.7-0.3,2.5l-3.9-1c0.1-0.5,0.2-1,0.2-1.5c0-3.3-2.7-6-6-6s-6,2.7-6,6c0,2.1,1.1,4,2.9,5.1l1.7,1L15.7,34z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48"><path fill="#37474f" d="M35 37c-2.2 0-4-1.8-4-4s1.8-4 4-4 4 1.8 4 4-1.8 4-4 4"/><path fill="#37474f" d="M35 43c-3 0-5.9-1.4-7.8-3.7l3.1-2.5c1.1 1.4 2.9 2.3 4.7 2.3 3.3 0 6-2.7 6-6s-2.7-6-6-6c-1 0-2 .3-2.9.7l-1.7 1L23.3 16l3.5-1.9 5.3 9.4c1-.3 2-.5 3-.5 5.5 0 10 4.5 10 10S40.5 43 35 43"/><path fill="#37474f" d="M14 43C8.5 43 4 38.5 4 33c0-4.6 3.1-8.5 7.5-9.7l1 3.9C9.9 27.9 8 30.3 8 33c0 3.3 2.7 6 6 6s6-2.7 6-6v-2h15v4H23.8c-.9 4.6-5 8-9.8 8"/><path fill="#e91e63" d="M14 37c-2.2 0-4-1.8-4-4s1.8-4 4-4 4 1.8 4 4-1.8 4-4 4"/><path fill="#37474f" d="M25 19c-2.2 0-4-1.8-4-4s1.8-4 4-4 4 1.8 4 4-1.8 4-4 4"/><path fill="#e91e63" d="m15.7 34-3.4-2 5.9-9.7c-2-1.9-3.2-4.5-3.2-7.3 0-5.5 4.5-10 10-10s10 4.5 10 10c0 .9-.1 1.7-.3 2.5l-3.9-1c.1-.5.2-1 .2-1.5 0-3.3-2.7-6-6-6s-6 2.7-6 6c0 2.1 1.1 4 2.9 5.1l1.7 1z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Wekan/GenericFunctions.ts b/packages/nodes-base/nodes/Wekan/GenericFunctions.ts
index 4308ec8eb4a50..18e5afbd3e562 100644
--- a/packages/nodes-base/nodes/Wekan/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Wekan/GenericFunctions.ts
@@ -1,15 +1,15 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
 	IHookFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
+	IRequestOptions,
 } from 'n8n-workflow';
 
 export async function apiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: object,
 	query?: IDataObject,
@@ -18,7 +18,7 @@ export async function apiRequest(
 
 	query = query || {};
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			Accept: 'application/json',
 		},
@@ -29,5 +29,5 @@ export async function apiRequest(
 		json: true,
 	};
 
-	return this.helpers.requestWithAuthentication.call(this, 'wekanApi', options);
+	return await this.helpers.requestWithAuthentication.call(this, 'wekanApi', options);
 }
diff --git a/packages/nodes-base/nodes/Wekan/Wekan.node.ts b/packages/nodes-base/nodes/Wekan/Wekan.node.ts
index fe83b296bc2ed..b3a8501f47bb3 100644
--- a/packages/nodes-base/nodes/Wekan/Wekan.node.ts
+++ b/packages/nodes-base/nodes/Wekan/Wekan.node.ts
@@ -6,9 +6,11 @@ import type {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
+import { wrapData } from '../../utils/utilities';
 import { apiRequest } from './GenericFunctions';
 
 import { boardFields, boardOperations } from './BoardDescription';
@@ -234,7 +236,7 @@ export class Wekan implements INodeType {
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const items = this.getInputData();
-		const returnData: IDataObject[] = [];
+		const returnData: INodeExecutionData[] = [];
 		let returnAll;
 		let limit;
 
@@ -246,7 +248,7 @@ export class Wekan implements INodeType {
 		// For Query string
 		let qs: IDataObject;
 
-		let requestMethod: string;
+		let requestMethod: IHttpRequestMethods;
 		let endpoint: string;
 
 		for (let i = 0; i < items.length; i++) {
@@ -654,19 +656,20 @@ export class Wekan implements INodeType {
 				}
 				let responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
 
-				if (returnAll === false) {
+				if (returnAll === false && Array.isArray(responseData)) {
 					limit = this.getNodeParameter('limit', i);
 					responseData = responseData.splice(0, limit);
 				}
 
-				if (Array.isArray(responseData)) {
-					returnData.push.apply(returnData, responseData as IDataObject[]);
-				} else {
-					returnData.push(responseData as IDataObject);
-				}
+				const executionData = this.helpers.constructExecutionMetaData(
+					wrapData(responseData as IDataObject[]),
+					{ itemData: { item: i } },
+				);
+
+				returnData.push(...executionData);
 			} catch (error) {
 				if (this.continueOnFail()) {
-					returnData.push({ error: error.message });
+					returnData.push({ json: { error: error.message }, pairedItem: { item: i } });
 					continue;
 				}
 				throw error;
diff --git a/packages/nodes-base/nodes/WhatsApp/GenericFunctions.ts b/packages/nodes-base/nodes/WhatsApp/GenericFunctions.ts
new file mode 100644
index 0000000000000..b50c9adad9e20
--- /dev/null
+++ b/packages/nodes-base/nodes/WhatsApp/GenericFunctions.ts
@@ -0,0 +1,103 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	IHookFunctions,
+	IHttpRequestMethods,
+	IHttpRequestOptions,
+	ILoadOptionsFunctions,
+	IWebhookFunctions,
+	JsonObject,
+} from 'n8n-workflow';
+import { NodeApiError } from 'n8n-workflow';
+import type {
+	WhatsAppAppWebhookSubscriptionsResponse,
+	WhatsAppAppWebhookSubscription,
+} from './types';
+
+async function appAccessTokenRead(
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
+): Promise<{ access_token: string }> {
+	const credentials = await this.getCredentials('whatsAppTriggerApi');
+
+	const options: IHttpRequestOptions = {
+		headers: {
+			'content-type': 'application/x-www-form-urlencoded',
+		},
+		method: 'POST',
+		body: {
+			client_id: credentials.clientId,
+			client_secret: credentials.clientSecret,
+			grant_type: 'client_credentials',
+		},
+		url: 'https://graph.facebook.com/v19.0/oauth/access_token',
+		json: true,
+	};
+	try {
+		return await this.helpers.httpRequest.call(this, options);
+	} catch (error) {
+		throw new NodeApiError(this.getNode(), error as JsonObject);
+	}
+}
+
+async function whatsappApiRequest(
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
+	method: IHttpRequestMethods,
+	resource: string,
+	body?: { type: 'json'; payload: IDataObject } | { type: 'form'; payload: IDataObject },
+	qs: IDataObject = {},
+): Promise<any> {
+	const tokenResponse = await appAccessTokenRead.call(this);
+	const appAccessToken = tokenResponse.access_token;
+
+	const options: IHttpRequestOptions = {
+		headers: {
+			accept: 'application/json',
+			authorization: `Bearer ${appAccessToken}`,
+		},
+		method,
+		qs,
+		body: body?.payload,
+		url: `https://graph.facebook.com/v19.0${resource}`,
+		json: true,
+	};
+
+	try {
+		return await this.helpers.httpRequest.call(this, options);
+	} catch (error) {
+		throw new NodeApiError(this.getNode(), error as JsonObject);
+	}
+}
+
+export async function appWebhookSubscriptionList(
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
+	appId: string,
+): Promise<WhatsAppAppWebhookSubscription[]> {
+	const response = (await whatsappApiRequest.call(
+		this,
+		'GET',
+		`/${appId}/subscriptions`,
+	)) as WhatsAppAppWebhookSubscriptionsResponse;
+	return response.data;
+}
+
+export async function appWebhookSubscriptionCreate(
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
+	appId: string,
+	subscription: IDataObject,
+) {
+	return await whatsappApiRequest.call(this, 'POST', `/${appId}/subscriptions`, {
+		type: 'form',
+		payload: { ...subscription },
+	});
+}
+
+export async function appWebhookSubscriptionDelete(
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
+	appId: string,
+	object: string,
+) {
+	return await whatsappApiRequest.call(this, 'DELETE', `/${appId}/subscriptions`, {
+		type: 'form',
+		payload: { object },
+	});
+}
diff --git a/packages/nodes-base/nodes/WhatsApp/MessageFunctions.ts b/packages/nodes-base/nodes/WhatsApp/MessageFunctions.ts
index ec0e217b546ea..3cecb0811e865 100644
--- a/packages/nodes-base/nodes/WhatsApp/MessageFunctions.ts
+++ b/packages/nodes-base/nodes/WhatsApp/MessageFunctions.ts
@@ -1,4 +1,4 @@
-import set from 'lodash.set';
+import set from 'lodash/set';
 import type {
 	IDataObject,
 	IExecuteSingleFunctions,
@@ -76,9 +76,9 @@ export async function mediaUploadFromItem(
 	if (!requestOptions.body) {
 		requestOptions.body = {};
 	}
-	set(requestOptions.body as IDataObject, `${operation}.id`, result.id);
+	set(requestOptions.body as IDataObject, [operation, 'id'], result.id);
 	if (operation === 'document') {
-		set(requestOptions.body as IDataObject, `${operation}.filename`, uploadData.fileName);
+		set(requestOptions.body as IDataObject, [operation, 'filename'], uploadData.fileName);
 	}
 
 	return requestOptions;
@@ -115,8 +115,9 @@ export async function componentsRequest(
 		};
 
 		if (component.type === 'body') {
-			comp.parameters = (((component.bodyParameters as IDataObject)!.parameter as IDataObject[]) ||
-				[])!.map((i: IDataObject) => {
+			comp.parameters = (
+				((component.bodyParameters as IDataObject).parameter as IDataObject[]) || []
+			).map((i: IDataObject) => {
 				if (i.type === 'text') {
 					return i;
 				} else if (i.type === 'currency') {
diff --git a/packages/nodes-base/nodes/WhatsApp/WhatsApp.node.json b/packages/nodes-base/nodes/WhatsApp/WhatsApp.node.json
new file mode 100644
index 0000000000000..d495137617905
--- /dev/null
+++ b/packages/nodes-base/nodes/WhatsApp/WhatsApp.node.json
@@ -0,0 +1,18 @@
+{
+	"node": "n8n-nodes-base.whatsApp",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"categories": ["Communication"],
+	"resources": {
+		"credentialDocumentation": [
+			{
+				"url": "https://docs.n8n.io/integrations/builtin/credentials/whatsapp/"
+			}
+		],
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.whatsapp/"
+			}
+		]
+	}
+}
diff --git a/packages/nodes-base/nodes/WhatsApp/WhatsAppTrigger.node.json b/packages/nodes-base/nodes/WhatsApp/WhatsAppTrigger.node.json
new file mode 100644
index 0000000000000..7cbbea6b53ef4
--- /dev/null
+++ b/packages/nodes-base/nodes/WhatsApp/WhatsAppTrigger.node.json
@@ -0,0 +1,18 @@
+{
+	"node": "n8n-nodes-base.whatsAppTrigger",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"categories": ["Communication"],
+	"resources": {
+		"credentialDocumentation": [
+			{
+				"url": "https://docs.n8n.io/integrations/credentials/whatsapp/"
+			}
+		],
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.whatsapptrigger/"
+			}
+		]
+	}
+}
diff --git a/packages/nodes-base/nodes/WhatsApp/WhatsAppTrigger.node.ts b/packages/nodes-base/nodes/WhatsApp/WhatsAppTrigger.node.ts
new file mode 100644
index 0000000000000..58444a6c62538
--- /dev/null
+++ b/packages/nodes-base/nodes/WhatsApp/WhatsAppTrigger.node.ts
@@ -0,0 +1,185 @@
+import { createHmac } from 'crypto';
+import {
+	NodeOperationError,
+	type IDataObject,
+	type IHookFunctions,
+	type INodeType,
+	type INodeTypeDescription,
+	type IWebhookFunctions,
+	type IWebhookResponseData,
+} from 'n8n-workflow';
+import {
+	appWebhookSubscriptionCreate,
+	appWebhookSubscriptionDelete,
+	appWebhookSubscriptionList,
+} from './GenericFunctions';
+import type { WhatsAppPageEvent } from './types';
+import { whatsappTriggerDescription } from './WhatsappDescription';
+
+export class WhatsAppTrigger implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'WhatsApp Trigger',
+		name: 'whatsAppTrigger',
+		icon: 'file:whatsapp.svg',
+		group: ['trigger'],
+		version: 1,
+		subtitle: '={{$parameter["event"]}}',
+		description: 'Handle WhatsApp events via webhooks',
+		defaults: {
+			name: 'WhatsApp Trigger',
+		},
+		inputs: [],
+		outputs: ['main'],
+		credentials: [
+			{
+				name: 'whatsAppTriggerApi',
+				required: true,
+			},
+		],
+		webhooks: [
+			{
+				name: 'setup',
+				httpMethod: 'GET',
+				responseMode: 'onReceived',
+				path: 'webhook',
+			},
+			{
+				name: 'default',
+				httpMethod: 'POST',
+				responseMode: 'onReceived',
+				path: 'webhook',
+			},
+		],
+		properties: [
+			{
+				displayName:
+					'Due to Facebook API limitations, you can use just one WhatsApp trigger for each Facebook App',
+				name: 'whatsAppNotice',
+				type: 'notice',
+				default: '',
+			},
+			...whatsappTriggerDescription,
+		],
+	};
+
+	webhookMethods = {
+		default: {
+			async checkExists(this: IHookFunctions): Promise<boolean> {
+				const webhookUrl = this.getNodeWebhookUrl('default') as string;
+				const credentials = await this.getCredentials('whatsAppTriggerApi');
+				const updates = this.getNodeParameter('updates', []) as IDataObject[];
+				const subscribedEvents = updates.sort().join(',');
+				const appId = credentials.clientId as string;
+
+				const webhooks = await appWebhookSubscriptionList.call(this, appId);
+
+				const subscription = webhooks.find(
+					(webhook) =>
+						webhook.object === 'whatsapp_business_account' &&
+						webhook.fields
+							.map((x) => x.name)
+							.sort()
+							.join(',') === subscribedEvents &&
+						webhook.active,
+				);
+
+				if (!subscription) {
+					return false;
+				}
+
+				if (subscription.callback_url !== webhookUrl) {
+					throw new NodeOperationError(
+						this.getNode(),
+						`The WhatsApp App ID ${appId} already has a webhook subscription. Delete it or use another App before executing the trigger. Due to WhatsApp API limitations, you can have just one trigger per App.`,
+						{ level: 'warning' },
+					);
+				}
+
+				if (
+					subscription?.fields
+						.map((x) => x.name)
+						.sort()
+						.join(',') !== subscribedEvents
+				) {
+					await appWebhookSubscriptionDelete.call(this, appId, 'whatsapp_business_account');
+					return false;
+				}
+
+				return true;
+			},
+			async create(this: IHookFunctions): Promise<boolean> {
+				const webhookUrl = this.getNodeWebhookUrl('default') as string;
+				const credentials = await this.getCredentials('whatsAppTriggerApi');
+				const appId = credentials.clientId as string;
+				const updates = this.getNodeParameter('updates', []) as IDataObject[];
+				const verifyToken = this.getNode().id;
+
+				await appWebhookSubscriptionCreate.call(this, appId, {
+					object: 'whatsapp_business_account',
+					callback_url: webhookUrl,
+					verify_token: verifyToken,
+					fields: JSON.stringify(updates),
+					include_values: true,
+				});
+
+				return true;
+			},
+			async delete(this: IHookFunctions): Promise<boolean> {
+				const credentials = await this.getCredentials('whatsAppTriggerApi');
+				const appId = credentials.clientId as string;
+
+				await appWebhookSubscriptionDelete.call(this, appId, 'whatsapp_business_account');
+
+				return true;
+			},
+		},
+	};
+
+	async webhook(this: IWebhookFunctions): Promise<IWebhookResponseData> {
+		const bodyData = this.getBodyData() as unknown as WhatsAppPageEvent;
+		const query = this.getQueryData() as IDataObject;
+		const res = this.getResponseObject();
+		const req = this.getRequestObject();
+		const headerData = this.getHeaderData() as IDataObject;
+		const credentials = await this.getCredentials('whatsAppTriggerApi');
+
+		// Check if we're getting facebook's challenge request (https://developers.facebook.com/docs/graph-api/webhooks/getting-started)
+		if (this.getWebhookName() === 'setup') {
+			if (query['hub.challenge']) {
+				if (this.getNode().id !== query['hub.verify_token']) {
+					return {};
+				}
+
+				res.status(200).send(query['hub.challenge']).end();
+
+				return { noWebhookResponse: true };
+			}
+		}
+
+		const computedSignature = createHmac('sha256', credentials.clientSecret as string)
+			.update(req.rawBody)
+			.digest('hex');
+		if (headerData['x-hub-signature-256'] !== `sha256=${computedSignature}`) {
+			return {};
+		}
+
+		if (bodyData.object !== 'whatsapp_business_account') {
+			return {};
+		}
+
+		const events = await Promise.all(
+			bodyData.entry
+				.map((entry) => entry.changes)
+				.flat()
+				.map((change) => ({ ...change.value, field: change.field })),
+		);
+
+		if (events.length === 0) {
+			return {};
+		}
+
+		return {
+			workflowData: [this.helpers.returnJsonArray(events)],
+		};
+	}
+}
diff --git a/packages/nodes-base/nodes/WhatsApp/WhatsappDescription.ts b/packages/nodes-base/nodes/WhatsApp/WhatsappDescription.ts
new file mode 100644
index 0000000000000..564cb3bc7fba6
--- /dev/null
+++ b/packages/nodes-base/nodes/WhatsApp/WhatsappDescription.ts
@@ -0,0 +1,53 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+export const whatsappTriggerDescription: INodeProperties[] = [
+	{
+		displayName: 'Trigger On',
+		name: 'updates',
+		type: 'multiOptions',
+		required: true,
+		default: [],
+		options: [
+			{
+				name: 'Account Review Update',
+				value: 'account_review_update',
+			},
+			{
+				name: 'Account Update',
+				value: 'account_update',
+			},
+			{
+				name: 'Business Capability Update',
+				value: 'business_capability_update',
+			},
+			{
+				name: 'Message Template Quality Update',
+				value: 'message_template_quality_update',
+			},
+			{
+				name: 'Message Template Status Update',
+				value: 'message_template_status_update',
+			},
+			{
+				name: 'Messages',
+				value: 'messages',
+			},
+			{
+				name: 'Phone Number Name Update',
+				value: 'phone_number_name_update',
+			},
+			{
+				name: 'Phone Number Quality Update',
+				value: 'phone_number_quality_update',
+			},
+			{
+				name: 'Security',
+				value: 'security',
+			},
+			{
+				name: 'Template Category Update',
+				value: 'template_category_update',
+			},
+		],
+	},
+];
diff --git a/packages/nodes-base/nodes/WhatsApp/types.ts b/packages/nodes-base/nodes/WhatsApp/types.ts
new file mode 100644
index 0000000000000..6cf3dc8fe17a1
--- /dev/null
+++ b/packages/nodes-base/nodes/WhatsApp/types.ts
@@ -0,0 +1,98 @@
+import type { GenericValue, IDataObject } from 'n8n-workflow';
+
+export type BaseFacebookResponse<TData> = { data: TData };
+export type BasePaginatedFacebookResponse<TData> = BaseFacebookResponse<TData> & {
+	paging: { cursors: { before?: string; after?: string } };
+};
+
+export type WhatsAppAppWebhookSubscriptionsResponse = BaseFacebookResponse<
+	WhatsAppAppWebhookSubscription[]
+>;
+
+export interface WhatsAppAppWebhookSubscription {
+	object: string;
+	callback_url: string;
+	active: boolean;
+	fields: WhatsAppAppWebhookSubscriptionField[];
+}
+
+export interface WhatsAppAppWebhookSubscriptionField {
+	name: string;
+	version: string;
+}
+
+export interface CreateFacebookAppWebhookSubscription {
+	object: string;
+	callback_url: string;
+	fields: string[];
+	include_values: boolean;
+	verify_token: string;
+}
+
+export type FacebookPageListResponse = BasePaginatedFacebookResponse<FacebookPage[]>;
+export type FacebookFormListResponse = BasePaginatedFacebookResponse<FacebookForm[]>;
+
+export interface FacebookPage {
+	id: string;
+	name: string;
+	access_token: string;
+	category: string;
+	category_list: FacebookPageCategory[];
+	tasks: string[];
+}
+
+export interface FacebookPageCategory {
+	id: string;
+	name: string;
+}
+
+export interface FacebookFormQuestion {
+	id: string;
+	key: string;
+	label: string;
+	type: string;
+}
+
+export interface FacebookForm {
+	id: string;
+	name: string;
+	locale: string;
+	status: string;
+	page: {
+		id: string;
+		name: string;
+	};
+	questions: FacebookFormQuestion[];
+}
+
+export interface WhatsAppPageEvent {
+	object: 'whatsapp_business_account';
+	entry: WhatsAppEventEntry[];
+}
+
+export interface WhatsAppEventEntry {
+	id: string;
+	time: number;
+	changes: [
+		{
+			field: string;
+			value: IDataObject;
+		},
+	];
+}
+
+export interface FacebookFormLeadData {
+	id: string;
+	created_time: string;
+	ad_id: string;
+	ad_name: string;
+	adset_id: string;
+	adset_name: string;
+	form_id: string;
+	field_data: [
+		{
+			name: string;
+			values: GenericValue[];
+		},
+	];
+}
diff --git a/packages/nodes-base/nodes/WhatsApp/whatsapp.svg b/packages/nodes-base/nodes/WhatsApp/whatsapp.svg
index fda6c26df415c..4d96452c7827d 100644
--- a/packages/nodes-base/nodes/WhatsApp/whatsapp.svg
+++ b/packages/nodes-base/nodes/WhatsApp/whatsapp.svg
@@ -1,7 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" viewBox="0 0 48 48" width="60px" height="60px">
-  <path fill="#fff" d="m4.868 43.303 2.694-9.835a18.941 18.941 0 0 1-2.535-9.489C5.032 13.514 13.548 5 24.014 5a18.867 18.867 0 0 1 13.43 5.566A18.866 18.866 0 0 1 43 23.994c-.004 10.465-8.522 18.98-18.986 18.98-.001 0 0 0 0 0h-.008a18.965 18.965 0 0 1-9.073-2.311l-10.065 2.64z"/>
-  <path fill="#fff" d="M4.868 43.803a.499.499 0 0 1-.482-.631l2.639-9.636a19.48 19.48 0 0 1-2.497-9.556C4.532 13.238 13.273 4.5 24.014 4.5a19.367 19.367 0 0 1 13.784 5.713A19.362 19.362 0 0 1 43.5 23.994c-.004 10.741-8.746 19.48-19.486 19.48a19.535 19.535 0 0 1-9.144-2.277l-9.875 2.589a.457.457 0 0 1-.127.017z"/>
-  <path fill="#cfd8dc" d="M24.014 5a18.867 18.867 0 0 1 13.43 5.566A18.866 18.866 0 0 1 43 23.994c-.004 10.465-8.522 18.98-18.986 18.98h-.008a18.965 18.965 0 0 1-9.073-2.311l-10.065 2.64 2.694-9.835a18.941 18.941 0 0 1-2.535-9.489C5.032 13.514 13.548 5 24.014 5m0-1C12.998 4 4.032 12.962 4.027 23.979a20.01 20.01 0 0 0 2.461 9.622L3.903 43.04a.998.998 0 0 0 1.219 1.231l9.687-2.54a20.026 20.026 0 0 0 9.197 2.244c11.024 0 19.99-8.963 19.995-19.98A19.856 19.856 0 0 0 38.153 9.86 19.869 19.869 0 0 0 24.014 4z"/>
-  <path fill="#40c351" d="M35.176 12.832a15.673 15.673 0 0 0-11.157-4.626c-8.704 0-15.783 7.076-15.787 15.774a15.738 15.738 0 0 0 2.413 8.396l.376.597-1.595 5.821 5.973-1.566.577.342a15.75 15.75 0 0 0 8.032 2.199h.006c8.698 0 15.777-7.077 15.78-15.776a15.68 15.68 0 0 0-4.618-11.161z"/>
-  <path fill="#fff" d="M19.268 16.045c-.355-.79-.729-.806-1.068-.82-.277-.012-.593-.011-.909-.011-.316 0-.83.119-1.265.594-.435.475-1.661 1.622-1.661 3.956 0 2.334 1.7 4.59 1.937 4.906.237.316 3.282 5.259 8.104 7.161 4.007 1.58 4.823 1.266 5.693 1.187.87-.079 2.807-1.147 3.202-2.255.395-1.108.395-2.057.277-2.255-.119-.198-.435-.316-.909-.554s-2.807-1.385-3.242-1.543c-.435-.158-.751-.237-1.068.238-.316.474-1.225 1.543-1.502 1.859-.277.317-.554.357-1.028.119s-2.002-.738-3.815-2.354c-1.41-1.257-2.362-2.81-2.639-3.285-.277-.474-.03-.731.208-.968.213-.213.474-.554.712-.831.237-.277.316-.475.474-.791.158-.317.079-.594-.04-.831-.117-.238-1.039-2.584-1.461-3.522z"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="60" height="60" fill-rule="evenodd" clip-rule="evenodd" viewBox="0 0 48 48"><path fill="#fff" d="m4.868 43.303 2.694-9.835a18.94 18.94 0 0 1-2.535-9.489C5.032 13.514 13.548 5 24.014 5a18.87 18.87 0 0 1 13.43 5.566A18.87 18.87 0 0 1 43 23.994c-.004 10.465-8.522 18.98-18.986 18.98h-.008a19 19 0 0 1-9.073-2.311z"/><path fill="#fff" d="M4.868 43.803a.5.5 0 0 1-.482-.631l2.639-9.636a19.5 19.5 0 0 1-2.497-9.556C4.532 13.238 13.273 4.5 24.014 4.5a19.37 19.37 0 0 1 13.784 5.713A19.36 19.36 0 0 1 43.5 23.994c-.004 10.741-8.746 19.48-19.486 19.48a19.54 19.54 0 0 1-9.144-2.277l-9.875 2.589a.5.5 0 0 1-.127.017"/><path fill="#cfd8dc" d="M24.014 5a18.87 18.87 0 0 1 13.43 5.566A18.87 18.87 0 0 1 43 23.994c-.004 10.465-8.522 18.98-18.986 18.98h-.008a19 19 0 0 1-9.073-2.311l-10.065 2.64 2.694-9.835a18.94 18.94 0 0 1-2.535-9.489C5.032 13.514 13.548 5 24.014 5m0-1C12.998 4 4.032 12.962 4.027 23.979a20 20 0 0 0 2.461 9.622L3.903 43.04a.998.998 0 0 0 1.219 1.231l9.687-2.54a20 20 0 0 0 9.197 2.244c11.024 0 19.99-8.963 19.995-19.98A19.86 19.86 0 0 0 38.153 9.86 19.87 19.87 0 0 0 24.014 4"/><path fill="#40c351" d="M35.176 12.832a15.67 15.67 0 0 0-11.157-4.626c-8.704 0-15.783 7.076-15.787 15.774a15.74 15.74 0 0 0 2.413 8.396l.376.597-1.595 5.821 5.973-1.566.577.342a15.75 15.75 0 0 0 8.032 2.199h.006c8.698 0 15.777-7.077 15.78-15.776a15.68 15.68 0 0 0-4.618-11.161"/><path fill="#fff" d="M19.268 16.045c-.355-.79-.729-.806-1.068-.82-.277-.012-.593-.011-.909-.011s-.83.119-1.265.594-1.661 1.622-1.661 3.956 1.7 4.59 1.937 4.906 3.282 5.259 8.104 7.161c4.007 1.58 4.823 1.266 5.693 1.187s2.807-1.147 3.202-2.255.395-2.057.277-2.255c-.119-.198-.435-.316-.909-.554s-2.807-1.385-3.242-1.543-.751-.237-1.068.238c-.316.474-1.225 1.543-1.502 1.859s-.554.357-1.028.119-2.002-.738-3.815-2.354c-1.41-1.257-2.362-2.81-2.639-3.285-.277-.474-.03-.731.208-.968.213-.213.474-.554.712-.831.237-.277.316-.475.474-.791s.079-.594-.04-.831c-.117-.238-1.039-2.584-1.461-3.522"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Wise/GenericFunctions.ts b/packages/nodes-base/nodes/Wise/GenericFunctions.ts
index 21372da30d116..8742dccd0125a 100644
--- a/packages/nodes-base/nodes/Wise/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Wise/GenericFunctions.ts
@@ -123,6 +123,7 @@ export function getTriggerName(eventName: string) {
 		tranferStateChange: 'transfers#state-change',
 		transferActiveCases: 'transfers#active-cases',
 		balanceCredit: 'balances#credit',
+		balanceUpdate: 'balances#update',
 	};
 	return events[eventName];
 }
diff --git a/packages/nodes-base/nodes/Wise/Wise.node.ts b/packages/nodes-base/nodes/Wise/Wise.node.ts
index 2d00939bfc7c9..03123d5c71dc5 100644
--- a/packages/nodes-base/nodes/Wise/Wise.node.ts
+++ b/packages/nodes-base/nodes/Wise/Wise.node.ts
@@ -8,6 +8,9 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
+import omit from 'lodash/omit';
+import moment from 'moment-timezone';
+import { v4 as uuid } from 'uuid';
 import {
 	accountFields,
 	accountOperations,
@@ -33,12 +36,6 @@ import type {
 } from './GenericFunctions';
 import { wiseApiRequest } from './GenericFunctions';
 
-import omit from 'lodash.omit';
-
-import moment from 'moment-timezone';
-
-import { v4 as uuid } from 'uuid';
-
 export class Wise implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Wise',
@@ -216,7 +213,7 @@ export class Wise implements INodeType {
 
 						const profileId = this.getNodeParameter('profileId', i);
 						const borderlessAccountId = this.getNodeParameter('borderlessAccountId', i);
-						const format = this.getNodeParameter('format', i) as 'json' | 'csv' | 'pdf';
+						const format = this.getNodeParameter('format', i) as 'json' | 'csv' | 'pdf' | 'xml';
 						const endpoint = `v3/profiles/${profileId}/borderless-accounts/${borderlessAccountId}/statement.${format}`;
 
 						const qs = {
@@ -544,7 +541,7 @@ export class Wise implements INodeType {
 		}
 
 		if (binaryOutput && responseData !== undefined) {
-			return this.prepareOutputData(responseData as INodeExecutionData[]);
+			return [responseData as INodeExecutionData[]];
 		}
 
 		return [this.helpers.returnJsonArray(returnData)];
diff --git a/packages/nodes-base/nodes/Wise/WiseTrigger.node.ts b/packages/nodes-base/nodes/Wise/WiseTrigger.node.ts
index f5b23538c315d..c9a3bf55e4afb 100644
--- a/packages/nodes-base/nodes/Wise/WiseTrigger.node.ts
+++ b/packages/nodes-base/nodes/Wise/WiseTrigger.node.ts
@@ -1,3 +1,4 @@
+import { createVerify } from 'crypto';
 import type {
 	IHookFunctions,
 	IWebhookFunctions,
@@ -11,8 +12,6 @@ import type {
 import type { Profile } from './GenericFunctions';
 import { getTriggerName, livePublicKey, testPublicKey, wiseApiRequest } from './GenericFunctions';
 
-import { createVerify } from 'crypto';
-
 export class WiseTrigger implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Wise Trigger',
@@ -66,6 +65,11 @@ export class WiseTrigger implements INodeType {
 						value: 'balanceCredit',
 						description: 'Triggered every time a balance account is credited',
 					},
+					{
+						name: 'Balance Update',
+						value: 'balanceUpdate',
+						description: 'Triggered every time a balance account is credited or debited',
+					},
 					{
 						name: 'Transfer Active Case',
 						value: 'transferActiveCases',
diff --git a/packages/nodes-base/nodes/Wise/descriptions/AccountDescription.ts b/packages/nodes-base/nodes/Wise/descriptions/AccountDescription.ts
index 00101da4b3985..605a1d2ec7008 100644
--- a/packages/nodes-base/nodes/Wise/descriptions/AccountDescription.ts
+++ b/packages/nodes-base/nodes/Wise/descriptions/AccountDescription.ts
@@ -136,20 +136,24 @@ export const accountFields: INodeProperties[] = [
 				name: 'PDF',
 				value: 'pdf',
 			},
+			{
+				name: 'XML (CAMT.053)',
+				value: 'xml',
+			},
 		],
 	},
 	{
-		displayName: 'Binary Property',
+		displayName: 'Put Output File in Field',
 		name: 'binaryProperty',
 		type: 'string',
 		required: true,
 		default: 'data',
-		description: 'Name of the binary property to which to write to',
+		hint: 'The name of the output binary field to put the file in',
 		displayOptions: {
 			show: {
 				resource: ['account'],
 				operation: ['getStatement'],
-				format: ['csv', 'pdf'],
+				format: ['csv', 'pdf', 'xml'],
 			},
 		},
 	},
@@ -165,7 +169,7 @@ export const accountFields: INodeProperties[] = [
 			show: {
 				resource: ['account'],
 				operation: ['getStatement'],
-				format: ['csv', 'pdf'],
+				format: ['csv', 'pdf', 'xml'],
 			},
 		},
 	},
diff --git a/packages/nodes-base/nodes/Wise/descriptions/TransferDescription.ts b/packages/nodes-base/nodes/Wise/descriptions/TransferDescription.ts
index 5d9f0a2d95153..5f743cc997f78 100644
--- a/packages/nodes-base/nodes/Wise/descriptions/TransferDescription.ts
+++ b/packages/nodes-base/nodes/Wise/descriptions/TransferDescription.ts
@@ -207,12 +207,12 @@ export const transferFields: INodeProperties[] = [
 		},
 	},
 	{
-		displayName: 'Binary Property',
+		displayName: 'Put Output File in Field',
 		name: 'binaryProperty',
 		type: 'string',
 		required: true,
 		default: 'data',
-		description: 'Name of the binary property to which to write to',
+		hint: 'The name of the output binary field to put the file in',
 		displayOptions: {
 			show: {
 				resource: ['transfer'],
diff --git a/packages/nodes-base/nodes/Wise/wise.svg b/packages/nodes-base/nodes/Wise/wise.svg
index 16f4d8336ac65..008014c69af80 100644
--- a/packages/nodes-base/nodes/Wise/wise.svg
+++ b/packages/nodes-base/nodes/Wise/wise.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="-2 -3 25 26"><path d="M2.471 0l3.282 5.496L0 10.983h9.947l.935-2.199H5.394l3.32-3.302-1.94-3.283h9.051L7.88 20.966h2.722L19.486 0H2.471" fill="#00cdff"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="-2 -3 25 26"><path fill="#00cdff" d="m2.471 0 3.282 5.496L0 10.983h9.947l.935-2.199H5.394l3.32-3.302-1.94-3.283h9.051L7.88 20.966h2.722L19.486 0z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/WooCommerce/GenericFunctions.ts b/packages/nodes-base/nodes/WooCommerce/GenericFunctions.ts
index a7a2b24d8041d..f2519b17e5555 100644
--- a/packages/nodes-base/nodes/WooCommerce/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/WooCommerce/GenericFunctions.ts
@@ -1,31 +1,24 @@
-import type { OptionsWithUri } from 'request';
+import { createHash } from 'crypto';
 
 import type {
 	ICredentialDataDecryptedObject,
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	IWebhookFunctions,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 
-import type { ICouponLine, IFeeLine, ILineItem, IShoppingLine } from './OrderInterface';
-
-import { createHash } from 'crypto';
-
 import { snakeCase } from 'change-case';
 
-import omit from 'lodash.omit';
+import omit from 'lodash/omit';
+import type { ICouponLine, IFeeLine, ILineItem, IShoppingLine } from './OrderInterface';
 
 export async function woocommerceApiRequest(
-	this:
-		| IHookFunctions
-		| IExecuteFunctions
-		| IExecuteSingleFunctions
-		| ILoadOptionsFunctions
-		| IWebhookFunctions,
-	method: string,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -35,7 +28,7 @@ export async function woocommerceApiRequest(
 ): Promise<any> {
 	const credentials = await this.getCredentials('wooCommerceApi');
 
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		method,
 		qs,
 		body,
@@ -47,12 +40,12 @@ export async function woocommerceApiRequest(
 		delete options.form;
 	}
 	options = Object.assign({}, options, option);
-	return this.helpers.requestWithAuthentication.call(this, 'wooCommerceApi', options);
+	return await this.helpers.requestWithAuthentication.call(this, 'wooCommerceApi', options);
 }
 
 export async function woocommerceApiRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: any = {},
@@ -87,9 +80,7 @@ export function getAutomaticSecret(credentials: ICredentialDataDecryptedObject)
 	return createHash('md5').update(data).digest('hex');
 }
 
-export function setMetadata(
-	data: IShoppingLine[] | IShoppingLine[] | IFeeLine[] | ILineItem[] | ICouponLine[],
-) {
+export function setMetadata(data: IShoppingLine[] | IFeeLine[] | ILineItem[] | ICouponLine[]) {
 	for (let i = 0; i < data.length; i++) {
 		//@ts-ignore\
 		if (data[i].metadataUi?.metadataValues) {
@@ -105,7 +96,7 @@ export function setMetadata(
 }
 
 export function toSnakeCase(
-	data: IShoppingLine[] | IShoppingLine[] | IFeeLine[] | ILineItem[] | ICouponLine[] | IDataObject,
+	data: IShoppingLine[] | IFeeLine[] | ILineItem[] | ICouponLine[] | IDataObject,
 ) {
 	if (!Array.isArray(data)) {
 		data = [data];
diff --git a/packages/nodes-base/nodes/WooCommerce/WooCommerce.node.ts b/packages/nodes-base/nodes/WooCommerce/WooCommerce.node.ts
index 9ff57215a1fcd..6548d5486df0b 100644
--- a/packages/nodes-base/nodes/WooCommerce/WooCommerce.node.ts
+++ b/packages/nodes-base/nodes/WooCommerce/WooCommerce.node.ts
@@ -583,6 +583,6 @@ export class WooCommerce implements INodeType {
 			);
 			returnData.push(...executionData);
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/WooCommerce/WooCommerceTrigger.node.ts b/packages/nodes-base/nodes/WooCommerce/WooCommerceTrigger.node.ts
index 4aa9c634f1a78..af36889a38374 100644
--- a/packages/nodes-base/nodes/WooCommerce/WooCommerceTrigger.node.ts
+++ b/packages/nodes-base/nodes/WooCommerce/WooCommerceTrigger.node.ts
@@ -1,3 +1,4 @@
+import { createHmac } from 'crypto';
 import type {
 	IHookFunctions,
 	IWebhookFunctions,
@@ -9,8 +10,6 @@ import type {
 
 import { getAutomaticSecret, woocommerceApiRequest } from './GenericFunctions';
 
-import { createHmac } from 'crypto';
-
 export class WooCommerceTrigger implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'WooCommerce Trigger',
diff --git a/packages/nodes-base/nodes/WooCommerce/wooCommerce.svg b/packages/nodes-base/nodes/WooCommerce/wooCommerce.svg
index 9cde2a9d4129e..974dc29fbfbbd 100644
--- a/packages/nodes-base/nodes/WooCommerce/wooCommerce.svg
+++ b/packages/nodes-base/nodes/WooCommerce/wooCommerce.svg
@@ -1,14 +1 @@
-<svg preserveAspectRatio="xMidYMid" version="1.1" viewBox="0 -50 256 253" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-<title>WooCommerce Logo</title>
-<metadata>
-<rdf:RDF>
-<cc:Work rdf:about="">
-<dc:format>image/svg+xml</dc:format>
-<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-<dc:title/>
-</cc:Work>
-</rdf:RDF>
-</metadata>
-<path d="m23.759 0h208.38c13.187 0 23.863 10.675 23.863 23.863v79.542c0 13.187-10.675 23.863-23.863 23.863h-74.727l10.257 25.118-45.109-25.118h-98.695c-13.187 0-23.863-10.675-23.863-23.863v-79.542c-0.10466-13.083 10.571-23.863 23.758-23.863z" fill="#7f54b3"/>
-<path d="m14.578 21.75c1.4569-1.9772 3.6423-3.0179 6.5561-3.226 5.3073-0.41626 8.3252 2.0813 9.0537 7.4927 3.226 21.75 6.7642 40.169 10.511 55.259l22.79-43.395c2.0813-3.9545 4.6829-6.0358 7.8049-6.2439 4.5789-0.3122 7.3886 2.6016 8.5333 8.7415 2.6016 13.841 5.9317 25.6 9.8862 35.59 2.7057-26.433 7.2846-45.476 13.737-57.236 1.561-2.9138 3.8504-4.3707 6.8683-4.5789 2.3935-0.20813 4.5789 0.52033 6.5561 2.0813 1.9772 1.561 3.0179 3.5382 3.226 5.9317 0.10406 1.8732-0.20813 3.4341-1.0407 4.9951-4.0585 7.4927-7.3886 20.085-10.094 37.567-2.6016 16.963-3.5382 30.179-2.9138 39.649 0.20813 2.6016-0.20813 4.8911-1.2488 6.8683-1.2488 2.2894-3.122 3.5382-5.5154 3.7463-2.7057 0.20813-5.5154-1.0406-8.2211-3.8504-9.678-9.8862-17.379-24.663-22.998-44.332-6.7642 13.32-11.759 23.311-14.985 29.971-6.1398 11.759-11.343 17.795-15.714 18.107-2.8098 0.20813-5.2033-2.1854-7.2846-7.1805-5.3073-13.633-11.031-39.961-17.171-78.985-0.41626-2.7057 0.20813-5.0992 1.665-6.9724zm223.64 16.338c-3.7463-6.5561-9.2618-10.511-16.65-12.072-1.9772-0.41626-3.8504-0.62439-5.6195-0.62439-9.9902 0-18.107 5.2033-24.455 15.61-5.4114 8.8455-8.1171 18.628-8.1171 29.346 0 8.013 1.665 14.881 4.9951 20.605 3.7463 6.5561 9.2618 10.511 16.65 12.072 1.9772 0.41626 3.8504 0.62439 5.6195 0.62439 10.094 0 18.211-5.2033 24.455-15.61 5.4114-8.9496 8.1171-18.732 8.1171-29.45 0.10406-8.1171-1.665-14.881-4.9951-20.501zm-13.112 28.826c-1.4569 6.8683-4.0585 11.967-7.9089 15.402-3.0179 2.7057-5.8276 3.8504-8.4293 3.3301-2.4976-0.52033-4.5789-2.7057-6.1398-6.7642-1.2488-3.226-1.8732-6.452-1.8732-9.4699 0-2.6016 0.20813-5.2033 0.72846-7.5967 0.93659-4.2667 2.7057-8.4293 5.5154-12.384 3.4341-5.0992 7.0764-7.1805 10.823-6.452 2.4976 0.52033 4.5789 2.7057 6.1398 6.7642 1.2488 3.226 1.8732 6.452 1.8732 9.4699 0 2.7057-0.20813 5.3073-0.72846 7.7008zm-52.033-28.826c-3.7463-6.5561-9.3659-10.511-16.65-12.072-1.9772-0.41626-3.8504-0.62439-5.6195-0.62439-9.9902 0-18.107 5.2033-24.455 15.61-5.4114 8.8455-8.1171 18.628-8.1171 29.346 0 8.013 1.665 14.881 4.9951 20.605 3.7463 6.5561 9.2618 10.511 16.65 12.072 1.9772 0.41626 3.8504 0.62439 5.6195 0.62439 10.094 0 18.211-5.2033 24.455-15.61 5.4114-8.9496 8.1171-18.732 8.1171-29.45 0-8.1171-1.665-14.881-4.9951-20.501zm-13.216 28.826c-1.4569 6.8683-4.0585 11.967-7.9089 15.402-3.0179 2.7057-5.8276 3.8504-8.4293 3.3301-2.4976-0.52033-4.5789-2.7057-6.1398-6.7642-1.2488-3.226-1.8732-6.452-1.8732-9.4699 0-2.6016 0.20813-5.2033 0.72846-7.5967 0.93658-4.2667 2.7057-8.4293 5.5154-12.384 3.4341-5.0992 7.0764-7.1805 10.823-6.452 2.4976 0.52033 4.5789 2.7057 6.1398 6.7642 1.2488 3.226 1.8732 6.452 1.8732 9.4699 0.10406 2.7057-0.20813 5.3073-0.72846 7.7008z" fill="#fff"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid" viewBox="0 -50 256 253"><path fill="#7f54b3" d="M23.759 0h208.38c13.187 0 23.863 10.675 23.863 23.863v79.542c0 13.187-10.675 23.863-23.863 23.863h-74.727l10.257 25.118-45.109-25.118H23.865c-13.187 0-23.863-10.675-23.863-23.863V23.863C-.103 10.78 10.573 0 23.76 0z"/><path fill="#fff" d="M14.578 21.75c1.457-1.977 3.642-3.018 6.556-3.226q7.96-.625 9.054 7.493c3.226 21.75 6.764 40.169 10.51 55.259l22.79-43.395q3.123-5.932 7.806-6.244c4.579-.312 7.388 2.601 8.533 8.741 2.602 13.841 5.932 25.6 9.886 35.59 2.706-26.433 7.285-45.476 13.737-57.236 1.561-2.913 3.85-4.37 6.868-4.579 2.394-.208 4.58.52 6.557 2.082 1.977 1.56 3.018 3.538 3.226 5.931.104 1.874-.209 3.434-1.041 4.995-4.059 7.493-7.389 20.086-10.094 37.567-2.602 16.964-3.538 30.18-2.914 39.65q.312 3.901-1.249 6.868c-1.248 2.29-3.122 3.538-5.515 3.746-2.706.208-5.515-1.04-8.221-3.85-9.678-9.886-17.38-24.663-22.998-44.332Q57.922 86.79 53.084 96.78c-6.14 11.76-11.343 17.796-15.714 18.108-2.81.208-5.203-2.186-7.285-7.18q-7.96-20.45-17.17-78.986c-.417-2.705.207-5.099 1.664-6.972zm223.64 16.338c-3.746-6.556-9.262-10.511-16.65-12.072q-2.965-.624-5.62-.624c-9.99 0-18.107 5.203-24.455 15.61q-8.116 13.268-8.117 29.346 0 12.018 4.995 20.605c3.747 6.556 9.262 10.51 16.65 12.072q2.966.624 5.62.624c10.094 0 18.211-5.203 24.455-15.61 5.411-8.95 8.117-18.732 8.117-29.45.104-8.117-1.665-14.881-4.995-20.501m-13.112 28.826c-1.457 6.868-4.059 11.967-7.909 15.402-3.018 2.706-5.827 3.85-8.43 3.33-2.497-.52-4.578-2.706-6.139-6.764-1.249-3.226-1.873-6.452-1.873-9.47 0-2.602.208-5.203.728-7.597.937-4.266 2.706-8.429 5.516-12.384 3.434-5.099 7.076-7.18 10.823-6.452 2.497.52 4.579 2.706 6.14 6.765 1.248 3.226 1.873 6.452 1.873 9.47 0 2.705-.208 5.307-.729 7.7zm-52.033-28.826c-3.746-6.556-9.366-10.511-16.65-12.072q-2.965-.624-5.62-.624c-9.99 0-18.107 5.203-24.455 15.61q-8.116 13.268-8.117 29.346 0 12.018 4.995 20.605c3.747 6.556 9.262 10.51 16.65 12.072q2.966.624 5.62.624c10.094 0 18.211-5.203 24.455-15.61 5.411-8.95 8.117-18.732 8.117-29.45 0-8.117-1.665-14.881-4.995-20.501m-13.216 28.826c-1.457 6.868-4.059 11.967-7.909 15.402-3.018 2.706-5.828 3.85-8.43 3.33-2.497-.52-4.578-2.706-6.139-6.764-1.249-3.226-1.873-6.452-1.873-9.47 0-2.602.208-5.203.728-7.597.937-4.266 2.706-8.429 5.516-12.384 3.434-5.099 7.076-7.18 10.823-6.452 2.497.52 4.579 2.706 6.14 6.765 1.248 3.226 1.873 6.452 1.873 9.47.104 2.705-.208 5.307-.729 7.7z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Wordpress/GenericFunctions.ts b/packages/nodes-base/nodes/Wordpress/GenericFunctions.ts
index 5470a0724b090..ac0feb564cd77 100644
--- a/packages/nodes-base/nodes/Wordpress/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Wordpress/GenericFunctions.ts
@@ -1,17 +1,16 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	ILoadOptionsFunctions,
 	IDataObject,
 	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function wordpressApiRequest(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -21,7 +20,7 @@ export async function wordpressApiRequest(
 ): Promise<any> {
 	const credentials = await this.getCredentials('wordpressApi');
 
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		headers: {
 			Accept: 'application/json',
 			'Content-Type': 'application/json',
@@ -31,6 +30,7 @@ export async function wordpressApiRequest(
 		qs,
 		body,
 		uri: uri || `${credentials.url}/wp-json/wp/v2${resource}`,
+		rejectUnauthorized: !credentials.allowUnauthorizedCerts,
 		json: true,
 	};
 	options = Object.assign({}, options, option);
@@ -47,7 +47,7 @@ export async function wordpressApiRequest(
 
 export async function wordpressApiRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: any = {},
diff --git a/packages/nodes-base/nodes/Wordpress/PageDescription.ts b/packages/nodes-base/nodes/Wordpress/PageDescription.ts
new file mode 100644
index 0000000000000..32f3afec3156e
--- /dev/null
+++ b/packages/nodes-base/nodes/Wordpress/PageDescription.ts
@@ -0,0 +1,834 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+export const pageOperations: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				resource: ['page'],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a page',
+				action: 'Create a page',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get a page',
+				action: 'Get a page',
+			},
+			{
+				name: 'Get Many',
+				value: 'getAll',
+				description: 'Get many pages',
+				action: 'Get many pages',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update a page',
+				action: 'Update a page',
+			},
+		],
+		default: 'create',
+	},
+];
+
+export const pageFields: INodeProperties[] = [
+	/* -------------------------------------------------------------------------- */
+	/*                                page:create                                 */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Title',
+		name: 'title',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: ['page'],
+				operation: ['create'],
+			},
+		},
+		description: 'The title for the page',
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['page'],
+				operation: ['create'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Author Name or ID',
+				name: 'authorId',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getAuthors',
+				},
+				default: '',
+				description:
+					'The ID for the author of the object. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Parent ID',
+				name: 'parent',
+				type: 'number',
+				default: '',
+				description: 'The ID for the parent of the post',
+			},
+			{
+				displayName: 'Content',
+				name: 'content',
+				type: 'string',
+				default: '',
+				description: 'The content for the page',
+			},
+			{
+				displayName: 'Slug',
+				name: 'slug',
+				type: 'string',
+				default: '',
+				description: 'An alphanumeric identifier for the object unique to its type',
+			},
+			{
+				displayName: 'Password',
+				name: 'password',
+				type: 'string',
+				typeOptions: { password: true },
+				default: '',
+				description: 'A password to protect access to the content and excerpt',
+			},
+			{
+				displayName: 'Status',
+				name: 'status',
+				type: 'options',
+				options: [
+					{
+						name: 'Draft',
+						value: 'draft',
+					},
+					{
+						name: 'Future',
+						value: 'future',
+					},
+					{
+						name: 'Pending',
+						value: 'pending',
+					},
+					{
+						name: 'Private',
+						value: 'private',
+					},
+					{
+						name: 'Publish',
+						value: 'publish',
+					},
+				],
+				default: 'draft',
+				description: 'A named status for the page',
+			},
+			{
+				displayName: 'Comment Status',
+				name: 'commentStatus',
+				type: 'options',
+				options: [
+					{
+						name: 'Open',
+						value: 'open',
+					},
+					{
+						name: 'Close',
+						value: 'closed',
+					},
+				],
+				default: 'open',
+				description: 'Whether or not comments are open on the page',
+			},
+			{
+				displayName: 'Ping Status',
+				name: 'pingStatus',
+				type: 'options',
+				options: [
+					{
+						name: 'Open',
+						value: 'open',
+					},
+					{
+						name: 'Close',
+						value: 'closed',
+					},
+				],
+				default: 'open',
+				description: 'If the a message should be send to announce the page',
+			},
+			{
+				displayName: 'Template',
+				name: 'pageTemplate',
+				type: 'fixedCollection',
+				default: {},
+				typeOptions: {
+					multipleValues: false,
+				},
+				options: [
+					{
+						displayName: 'Values',
+						name: 'values',
+						values: [
+							{
+								displayName: 'Elementor Template',
+								name: 'elementor',
+								type: 'boolean',
+								default: true,
+								description: 'Whether site uses elementor page builder',
+							},
+							{
+								displayName: 'Template',
+								name: 'template',
+								type: 'string',
+								default: '',
+								description: 'The theme file to use',
+								displayOptions: {
+									show: {
+										elementor: [false],
+									},
+								},
+							},
+							{
+								displayName: 'Template',
+								name: 'template',
+								type: 'options',
+								options: [
+									{
+										name: 'Standard',
+										value: '',
+									},
+									{
+										name: 'Elementor Canvas',
+										value: 'elementor_canvas',
+									},
+									{
+										name: 'Elementor Header Footer',
+										value: 'elementor_header_footer',
+									},
+									{
+										name: 'Elementor Theme',
+										value: 'elementor_theme',
+									},
+								],
+								default: '',
+								description: 'The Elementor template to use',
+								displayOptions: {
+									show: {
+										elementor: [true],
+									},
+								},
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Menu Order',
+				name: 'menuOrder',
+				type: 'number',
+				default: 0,
+				description: 'The order of the page in relation to other pages',
+			},
+			{
+				displayName: 'Comment Status',
+				name: 'commentStatus',
+				type: 'options',
+				options: [
+					{
+						name: 'Open',
+						value: 'open',
+					},
+					{
+						name: 'Closed',
+						value: 'closed',
+					},
+				],
+				default: 'open',
+				description: 'Whether or not comments are open on the page',
+			},
+			{
+				displayName: 'Featured Media ID',
+				name: 'featuredMediaId',
+				type: 'number',
+				default: '',
+				description: 'The ID of the featured media for the page',
+			},
+		],
+	},
+	/* -------------------------------------------------------------------------- */
+	/*                                 page:update                                */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Page ID',
+		name: 'pageId',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: ['page'],
+				operation: ['update'],
+			},
+		},
+		description: 'Unique identifier for the object',
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['page'],
+				operation: ['update'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Author Name or ID',
+				name: 'authorId',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getAuthors',
+				},
+				default: '',
+				description:
+					'The ID for the author of the object. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Parent ID',
+				name: 'parent',
+				type: 'number',
+				default: '',
+				description: 'The ID for the parent of the post',
+			},
+			{
+				displayName: 'Title',
+				name: 'title',
+				type: 'string',
+				default: '',
+				description: 'The title for the page',
+			},
+			{
+				displayName: 'Content',
+				name: 'content',
+				type: 'string',
+				default: '',
+				description: 'The content for the page',
+			},
+			{
+				displayName: 'Slug',
+				name: 'slug',
+				type: 'string',
+				default: '',
+				description: 'An alphanumeric identifier for the object unique to its type',
+			},
+			{
+				displayName: 'Password',
+				name: 'password',
+				type: 'string',
+				typeOptions: { password: true },
+				default: '',
+				description: 'A password to protect access to the content and excerpt',
+			},
+			{
+				displayName: 'Status',
+				name: 'status',
+				type: 'options',
+				options: [
+					{
+						name: 'Draft',
+						value: 'draft',
+					},
+					{
+						name: 'Future',
+						value: 'future',
+					},
+					{
+						name: 'Pending',
+						value: 'pending',
+					},
+					{
+						name: 'Private',
+						value: 'private',
+					},
+					{
+						name: 'Publish',
+						value: 'publish',
+					},
+				],
+				default: 'draft',
+				description: 'A named status for the page',
+			},
+			{
+				displayName: 'Comment Status',
+				name: 'commentStatus',
+				type: 'options',
+				options: [
+					{
+						name: 'Open',
+						value: 'open',
+					},
+					{
+						name: 'Close',
+						value: 'closed',
+					},
+				],
+				default: 'open',
+				description: 'Whether or not comments are open on the page',
+			},
+			{
+				displayName: 'Ping Status',
+				name: 'pingStatus',
+				type: 'options',
+				options: [
+					{
+						name: 'Open',
+						value: 'open',
+					},
+					{
+						name: 'Close',
+						value: 'closed',
+					},
+				],
+				default: 'open',
+				description: 'Whether or not comments are open on the page',
+			},
+			{
+				displayName: 'Template',
+				name: 'pageTemplate',
+				type: 'fixedCollection',
+				default: {},
+				typeOptions: {
+					multipleValues: false,
+				},
+				options: [
+					{
+						displayName: 'Values',
+						name: 'values',
+						values: [
+							{
+								displayName: 'Elementor Template',
+								name: 'elementor',
+								type: 'boolean',
+								default: true,
+								description: 'Whether site uses elementor page builder',
+							},
+							{
+								displayName: 'Template',
+								name: 'template',
+								type: 'string',
+								default: '',
+								description: 'The theme file to use',
+								displayOptions: {
+									show: {
+										elementor: [false],
+									},
+								},
+							},
+							{
+								displayName: 'Template',
+								name: 'template',
+								type: 'options',
+								options: [
+									{
+										name: 'Standard',
+										value: '',
+									},
+									{
+										name: 'Elementor Canvas',
+										value: 'elementor_canvas',
+									},
+									{
+										name: 'Elementor Header Footer',
+										value: 'elementor_header_footer',
+									},
+									{
+										name: 'Elementor Theme',
+										value: 'elementor_theme',
+									},
+								],
+								default: '',
+								description: 'The Elementor template to use',
+								displayOptions: {
+									show: {
+										elementor: [true],
+									},
+								},
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Menu Order',
+				name: 'menuOrder',
+				type: 'number',
+				default: 0,
+				description: 'The order of the page in relation to other pages',
+			},
+			{
+				displayName: 'Comment Status',
+				name: 'commentStatus',
+				type: 'options',
+				options: [
+					{
+						name: 'Open',
+						value: 'open',
+					},
+					{
+						name: 'Closed',
+						value: 'closed',
+					},
+				],
+				default: 'open',
+				description: 'Whether or not comments are open on the page',
+			},
+			{
+				displayName: 'Featured Media ID',
+				name: 'featuredMediaId',
+				type: 'number',
+				default: '',
+				description: 'The ID of the featured media for the page',
+			},
+		],
+	},
+	/* -------------------------------------------------------------------------- */
+	/*                                  page:get                                  */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Page ID',
+		name: 'pageId',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: ['page'],
+				operation: ['get'],
+			},
+		},
+		description: 'Unique identifier for the object',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['page'],
+				operation: ['get'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Password',
+				name: 'password',
+				type: 'string',
+				typeOptions: { password: true },
+				default: '',
+				description: 'The password for the page if it is password protected',
+			},
+			{
+				displayName: 'Context',
+				name: 'context',
+				type: 'options',
+				options: [
+					{
+						name: 'View',
+						value: 'view',
+					},
+					{
+						name: 'Embed',
+						value: 'embed',
+					},
+					{
+						name: 'Edit',
+						value: 'edit',
+					},
+				],
+				default: 'view',
+				description: 'Scope under which the request is made; determines fields present in response',
+			},
+		],
+	},
+	/* -------------------------------------------------------------------------- */
+	/*                                   page:getAll                              */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: ['page'],
+				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: ['page'],
+				operation: ['getAll'],
+				returnAll: [false],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 10,
+		},
+		default: 5,
+		description: 'Max number of results to return',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['page'],
+				operation: ['getAll'],
+			},
+		},
+		options: [
+			{
+				displayName: 'After',
+				name: 'after',
+				type: 'dateTime',
+				default: '',
+				description: 'Limit response to pages published after a given ISO8601 compliant date',
+			},
+			{
+				displayName: 'Author Names or IDs',
+				name: 'author',
+				type: 'multiOptions',
+				default: [],
+				typeOptions: {
+					loadOptionsMethod: 'getAuthors',
+				},
+				description:
+					'Limit result set to pages assigned to specific authors. Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Before',
+				name: 'before',
+				type: 'dateTime',
+				default: '',
+				description: 'Limit response to pages published before a given ISO8601 compliant date',
+			},
+			{
+				displayName: 'Context',
+				name: 'context',
+				type: 'options',
+				options: [
+					{
+						name: 'View',
+						value: 'view',
+					},
+					{
+						name: 'Embed',
+						value: 'embed',
+					},
+					{
+						name: 'Edit',
+						value: 'edit',
+					},
+				],
+				default: 'view',
+				description: 'Scope under which the request is made; determines fields present in response',
+			},
+			{
+				displayName: 'Menu Order',
+				name: 'menuOrder',
+				type: 'number',
+				default: 0,
+				description: 'Limit result set to items with a specific menu order value',
+			},
+			{
+				displayName: 'Order',
+				name: 'order',
+				type: 'options',
+				options: [
+					{
+						name: 'ASC',
+						value: 'asc',
+					},
+					{
+						name: 'DESC',
+						value: 'desc',
+					},
+				],
+				default: 'desc',
+				description: 'Order sort attribute ascending or descending',
+			},
+			{
+				displayName: 'Order By',
+				name: 'orderBy',
+				type: 'options',
+				options: [
+					{
+						name: 'Author',
+						value: 'author',
+					},
+					{
+						name: 'Date',
+						value: 'date',
+					},
+					{
+						name: 'ID',
+						value: 'id',
+					},
+					{
+						name: 'Include',
+						value: 'include',
+					},
+					{
+						name: 'Include Slugs',
+						value: 'include_slugs',
+					},
+					{
+						name: 'Modified',
+						value: 'modified',
+					},
+					{
+						name: 'Parent',
+						value: 'parent',
+					},
+					{
+						name: 'Relevance',
+						value: 'relevance',
+					},
+					{
+						name: 'Slug',
+						value: 'slug',
+					},
+					{
+						name: 'Title',
+						value: 'title',
+					},
+				],
+				default: 'id',
+				description: 'Sort collection by object attribute',
+			},
+			{
+				displayName: 'Page',
+				name: 'page',
+				type: 'number',
+				default: 1,
+				description: 'Current page of the collection',
+			},
+			{
+				displayName: 'Parent Page ID',
+				name: 'parent',
+				type: 'number',
+				default: '',
+				description: 'Limit result set to items with a particular parent page ID',
+			},
+			{
+				displayName: 'Search',
+				name: 'search',
+				type: 'string',
+				default: '',
+				description: 'Limit results to those matching a string',
+			},
+			{
+				displayName: 'Status',
+				name: 'status',
+				type: 'options',
+				options: [
+					{
+						name: 'Draft',
+						value: 'draft',
+					},
+					{
+						name: 'Future',
+						value: 'future',
+					},
+					{
+						name: 'Pending',
+						value: 'pending',
+					},
+					{
+						name: 'Private',
+						value: 'private',
+					},
+					{
+						name: 'Publish',
+						value: 'publish',
+					},
+				],
+				default: 'publish',
+				description: 'The status of the page',
+			},
+		],
+	},
+	/* -------------------------------------------------------------------------- */
+	/*                                 page:delete                                */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Page ID',
+		name: 'pageId',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: ['page'],
+				operation: ['delete'],
+			},
+		},
+		description: 'Unique identifier for the object',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['page'],
+				operation: ['delete'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Force',
+				name: 'force',
+				type: 'boolean',
+				default: false,
+				description: 'Whether to bypass trash and force deletion',
+			},
+		],
+	},
+];
diff --git a/packages/nodes-base/nodes/Wordpress/PageInterface.ts b/packages/nodes-base/nodes/Wordpress/PageInterface.ts
new file mode 100644
index 0000000000000..687d5c8e4dd97
--- /dev/null
+++ b/packages/nodes-base/nodes/Wordpress/PageInterface.ts
@@ -0,0 +1,16 @@
+export interface IPage {
+	author?: number;
+	comment_status?: string;
+	content?: string;
+	featured_media?: number;
+	id?: number;
+	menu_order?: number;
+	page?: number;
+	parent?: number;
+	password?: string;
+	ping_status?: string;
+	slug?: string;
+	status?: string;
+	template?: string;
+	title?: string;
+}
diff --git a/packages/nodes-base/nodes/Wordpress/PostDescription.ts b/packages/nodes-base/nodes/Wordpress/PostDescription.ts
index ee4659afad05f..e2b0cd957c43a 100644
--- a/packages/nodes-base/nodes/Wordpress/PostDescription.ts
+++ b/packages/nodes-base/nodes/Wordpress/PostDescription.ts
@@ -18,11 +18,6 @@ export const postOperations: INodeProperties[] = [
 				description: 'Create a post',
 				action: 'Create a post',
 			},
-			// {
-			// 	name: 'Delete',
-			// 	value: 'delete',
-			// 	description: 'Delete a post',
-			// },
 			{
 				name: 'Get',
 				value: 'get',
diff --git a/packages/nodes-base/nodes/Wordpress/UserDescription.ts b/packages/nodes-base/nodes/Wordpress/UserDescription.ts
index fcc72b398954c..aae020c6d8905 100644
--- a/packages/nodes-base/nodes/Wordpress/UserDescription.ts
+++ b/packages/nodes-base/nodes/Wordpress/UserDescription.ts
@@ -18,11 +18,6 @@ export const userOperations: INodeProperties[] = [
 				description: 'Create a user',
 				action: 'Create a user',
 			},
-			// {
-			// 	name: 'Delete',
-			// 	value: 'delete',
-			// 	description: 'Delete a user',
-			// },
 			{
 				name: 'Get',
 				value: 'get',
diff --git a/packages/nodes-base/nodes/Wordpress/Wordpress.node.json b/packages/nodes-base/nodes/Wordpress/Wordpress.node.json
index a150bd81e4e3f..2d7526cb9bb2e 100644
--- a/packages/nodes-base/nodes/Wordpress/Wordpress.node.json
+++ b/packages/nodes-base/nodes/Wordpress/Wordpress.node.json
@@ -2,7 +2,7 @@
 	"node": "n8n-nodes-base.wordpress",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Marketing & Content"],
+	"categories": ["Marketing"],
 	"resources": {
 		"credentialDocumentation": [
 			{
diff --git a/packages/nodes-base/nodes/Wordpress/Wordpress.node.ts b/packages/nodes-base/nodes/Wordpress/Wordpress.node.ts
index f1ef4909ce8ea..1d22cac0f7319 100644
--- a/packages/nodes-base/nodes/Wordpress/Wordpress.node.ts
+++ b/packages/nodes-base/nodes/Wordpress/Wordpress.node.ts
@@ -9,8 +9,11 @@ import type {
 } 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 type { IUser } from './UserInterface';
 
 export class Wordpress implements INodeType {
@@ -44,6 +47,10 @@ export class Wordpress implements INodeType {
 						name: 'Post',
 						value: 'post',
 					},
+					{
+						name: 'Page',
+						value: 'page',
+					},
 					{
 						name: 'User',
 						value: 'user',
@@ -53,6 +60,8 @@ export class Wordpress implements INodeType {
 			},
 			...postOperations,
 			...postFields,
+			...pageOperations,
+			...pageFields,
 			...userOperations,
 			...userFields,
 		],
@@ -305,6 +314,171 @@ export class Wordpress implements INodeType {
 						);
 					}
 				}
+				if (resource === 'page') {
+					//https://developer.wordpress.org/rest-api/reference/pages/#create-a-page
+					if (operation === 'create') {
+						const title = this.getNodeParameter('title', i) as string;
+						const additionalFields = this.getNodeParameter('additionalFields', i);
+						const body: IPage = {
+							title,
+						};
+						if (additionalFields.authorId) {
+							body.author = additionalFields.authorId as number;
+						}
+						if (additionalFields.content) {
+							body.content = additionalFields.content as string;
+						}
+						if (additionalFields.slug) {
+							body.slug = additionalFields.slug as string;
+						}
+						if (additionalFields.password) {
+							body.password = additionalFields.password as string;
+						}
+						if (additionalFields.status) {
+							body.status = additionalFields.status as string;
+						}
+						if (additionalFields.commentStatus) {
+							body.comment_status = additionalFields.commentStatus as string;
+						}
+						if (additionalFields.pingStatus) {
+							body.ping_status = additionalFields.pingStatus as string;
+						}
+						if (additionalFields.pageTemplate) {
+							body.template = this.getNodeParameter(
+								'additionalFields.pageTemplate.values.template',
+								i,
+								'',
+							) as string;
+						}
+						if (additionalFields.menuOrder) {
+							body.menu_order = additionalFields.menuOrder as number;
+						}
+						if (additionalFields.parent) {
+							body.parent = additionalFields.parent as number;
+						}
+						if (additionalFields.featuredMediaId) {
+							body.featured_media = additionalFields.featuredMediaId as number;
+						}
+						responseData = await wordpressApiRequest.call(this, 'POST', '/pages', body);
+					}
+					//https://developer.wordpress.org/rest-api/reference/pages/#update-a-page
+					if (operation === 'update') {
+						const pageId = this.getNodeParameter('pageId', i) as string;
+						const updateFields = this.getNodeParameter('updateFields', i);
+						const body: IPage = {
+							id: parseInt(pageId, 10),
+						};
+						if (updateFields.authorId) {
+							body.author = updateFields.authorId as number;
+						}
+						if (updateFields.title) {
+							body.title = updateFields.title as string;
+						}
+						if (updateFields.content) {
+							body.content = updateFields.content as string;
+						}
+						if (updateFields.slug) {
+							body.slug = updateFields.slug as string;
+						}
+						if (updateFields.password) {
+							body.password = updateFields.password as string;
+						}
+						if (updateFields.status) {
+							body.status = updateFields.status as string;
+						}
+						if (updateFields.commentStatus) {
+							body.comment_status = updateFields.commentStatus as string;
+						}
+						if (updateFields.pingStatus) {
+							body.ping_status = updateFields.pingStatus as string;
+						}
+						if (updateFields.pageTemplate) {
+							body.template = this.getNodeParameter(
+								'updateFields.pageTemplate.values.template',
+								i,
+								'',
+							) as string;
+						}
+						if (updateFields.menuOrder) {
+							body.menu_order = updateFields.menuOrder as number;
+						}
+						if (updateFields.parent) {
+							body.parent = updateFields.parent as number;
+						}
+						if (updateFields.featuredMediaId) {
+							body.featured_media = updateFields.featuredMediaId as number;
+						}
+						responseData = await wordpressApiRequest.call(this, 'POST', `/pages/${pageId}`, body);
+					}
+					//https://developer.wordpress.org/rest-api/reference/pages/#retrieve-a-page
+					if (operation === 'get') {
+						const pageId = this.getNodeParameter('pageId', i) as string;
+						const options = this.getNodeParameter('options', i);
+						if (options.password) {
+							qs.password = options.password as string;
+						}
+						if (options.context) {
+							qs.context = options.context as string;
+						}
+						responseData = await wordpressApiRequest.call(this, 'GET', `/pages/${pageId}`, {}, qs);
+					}
+					//https://developer.wordpress.org/rest-api/reference/pages/#list-pages
+					if (operation === 'getAll') {
+						const returnAll = this.getNodeParameter('returnAll', i);
+						const options = this.getNodeParameter('options', i);
+						if (options.context) {
+							qs.context = options.context as string;
+						}
+						if (options.orderBy) {
+							qs.orderby = options.orderBy as string;
+						}
+						if (options.order) {
+							qs.order = options.order as string;
+						}
+						if (options.search) {
+							qs.search = options.search as string;
+						}
+						if (options.after) {
+							qs.after = options.after as string;
+						}
+						if (options.author) {
+							qs.author = options.author as number[];
+						}
+						if (options.parent) {
+							qs.parent = options.parent as number;
+						}
+						if (options.menuOrder) {
+							qs.menu_order = options.menuOrder as number;
+						}
+						if (options.status) {
+							qs.status = options.status as string;
+						}
+						if (options.page) {
+							qs.page = options.page as number;
+						}
+						if (returnAll) {
+							responseData = await wordpressApiRequestAllItems.call(this, 'GET', '/pages', {}, qs);
+						} else {
+							qs.per_page = this.getNodeParameter('limit', i);
+							responseData = await wordpressApiRequest.call(this, 'GET', '/pages', {}, qs);
+						}
+					}
+					//https://developer.wordpress.org/rest-api/reference/pages/#delete-a-page
+					if (operation === 'delete') {
+						const pageId = this.getNodeParameter('pageId', i) as string;
+						const options = this.getNodeParameter('options', i);
+						if (options.force) {
+							qs.force = options.force as boolean;
+						}
+						responseData = await wordpressApiRequest.call(
+							this,
+							'DELETE',
+							`/pages/${pageId}`,
+							{},
+							qs,
+						);
+					}
+				}
 				if (resource === 'user') {
 					//https://developer.wordpress.org/rest-api/reference/users/#create-a-user
 					if (operation === 'create') {
@@ -432,6 +606,6 @@ export class Wordpress implements INodeType {
 				throw error;
 			}
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Wordpress/wordpress.svg b/packages/nodes-base/nodes/Wordpress/wordpress.svg
index 1ec64c05f7c08..d45f7df925c8f 100644
--- a/packages/nodes-base/nodes/Wordpress/wordpress.svg
+++ b/packages/nodes-base/nodes/Wordpress/wordpress.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="2500" height="2500" viewBox="8.399 8.4 51.2 51.2"><path fill="#21759B" d="M34 59.6C19.813 59.6 8.293 48.293 8.4 34 8.507 19.707 19.28 8.4 34 8.4c14.721 0 25.6 11.52 25.6 25.6S48.187 59.6 34 59.6zm7.573-3.947l-7.253-19.52-6.827 19.947c5.014 1.174 8.427 1.493 14.08-.427zm-17.706-1.066l-10.88-29.76c-1.494 3.2-1.813 5.867-2.027 9.173.107 8.746 5.013 16.746 12.907 20.587zM56.934 34c.106-5.653-2.453-10.133-2.667-10.773.214 4.374-.427 6.613-1.173 9.067l-7.467 21.44C55.014 48.08 56.826 39.653 57.04 34h-.106zm-23.68-.96l-3.627-9.92-2.667-.213c-1.066-.747-.427-1.92.32-1.92 4.8.32 7.466.32 12.267 0 1.174 0 1.493 1.707.106 1.92l-2.56.213 8.319 24.533 3.946-13.44c.214-5.866-1.387-6.506-3.52-10.773-1.707-3.307.107-6.507 3.414-6.613-2.668-2.56-8.107-5.76-15.254-5.867s-14.72 3.52-19.2 10.347l7.894-.213c.96.427.533 1.813 0 1.92l-2.773.213 8.32 24.96 5.015-15.147z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="2500" height="2500" viewBox="8.399 8.4 51.2 51.2"><path fill="#21759B" d="M34 59.6C19.813 59.6 8.293 48.293 8.4 34S19.28 8.4 34 8.4 59.6 19.92 59.6 34 48.187 59.6 34 59.6m7.573-3.947-7.253-19.52-6.827 19.947c5.014 1.174 8.427 1.493 14.08-.427m-17.706-1.066-10.88-29.76c-1.494 3.2-1.813 5.867-2.027 9.173.107 8.746 5.013 16.746 12.907 20.587M56.934 34c.106-5.653-2.453-10.133-2.667-10.773.214 4.374-.427 6.613-1.173 9.067l-7.467 21.44C55.014 48.08 56.826 39.653 57.04 34zm-23.68-.96-3.627-9.92-2.667-.213c-1.066-.747-.427-1.92.32-1.92 4.8.32 7.466.32 12.267 0 1.174 0 1.493 1.707.106 1.92l-2.56.213 8.319 24.533 3.946-13.44c.214-5.866-1.387-6.506-3.52-10.773-1.707-3.307.107-6.507 3.414-6.613-2.668-2.56-8.107-5.76-15.254-5.867s-14.72 3.52-19.2 10.347l7.894-.213c.96.427.533 1.813 0 1.92l-2.773.213 8.32 24.96z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Workable/GenericFunctions.ts b/packages/nodes-base/nodes/Workable/GenericFunctions.ts
index b0ac7888900fb..8b6dbc7eaeb71 100644
--- a/packages/nodes-base/nodes/Workable/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Workable/GenericFunctions.ts
@@ -1,18 +1,17 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	JsonObject,
+	IRequestOptions,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function workableApiRequest(
-	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -25,7 +24,7 @@ export async function workableApiRequest(
 		subdomain: string;
 	};
 
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		headers: { Authorization: `Bearer ${credentials.accessToken}` },
 		method,
 		qs,
diff --git a/packages/nodes-base/nodes/Workable/WorkableTrigger.node.ts b/packages/nodes-base/nodes/Workable/WorkableTrigger.node.ts
index e67a7ab7ead21..d942f697e86f6 100644
--- a/packages/nodes-base/nodes/Workable/WorkableTrigger.node.ts
+++ b/packages/nodes-base/nodes/Workable/WorkableTrigger.node.ts
@@ -9,9 +9,8 @@ import type {
 	IWebhookResponseData,
 } from 'n8n-workflow';
 
-import { workableApiRequest } from './GenericFunctions';
-
 import { snakeCase } from 'change-case';
+import { workableApiRequest } from './GenericFunctions';
 
 export class WorkableTrigger implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/WriteBinaryFile/WriteBinaryFile.node.json b/packages/nodes-base/nodes/WriteBinaryFile/WriteBinaryFile.node.json
index ddd9e6584810f..8fe40e84205f5 100644
--- a/packages/nodes-base/nodes/WriteBinaryFile/WriteBinaryFile.node.json
+++ b/packages/nodes-base/nodes/WriteBinaryFile/WriteBinaryFile.node.json
@@ -6,7 +6,7 @@
 	"resources": {
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.writebinaryfile/"
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.filesreadwrite/"
 			}
 		],
 		"generic": [
diff --git a/packages/nodes-base/nodes/WriteBinaryFile/WriteBinaryFile.node.ts b/packages/nodes-base/nodes/WriteBinaryFile/WriteBinaryFile.node.ts
index 176f7fa4e2bb6..0938a31488a55 100644
--- a/packages/nodes-base/nodes/WriteBinaryFile/WriteBinaryFile.node.ts
+++ b/packages/nodes-base/nodes/WriteBinaryFile/WriteBinaryFile.node.ts
@@ -1,16 +1,16 @@
+import type { Readable } from 'stream';
+
+import { BINARY_ENCODING } from 'n8n-workflow';
 import type {
 	IExecuteFunctions,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { BINARY_ENCODING } from 'n8n-workflow';
-
-import { writeFile as fsWriteFile } from 'fs/promises';
-import type { Readable } from 'stream';
 
 export class WriteBinaryFile implements INodeType {
 	description: INodeTypeDescription = {
+		hidden: true,
 		displayName: 'Write Binary File',
 		name: 'writeBinaryFile',
 		icon: 'fa:file-export',
@@ -73,9 +73,10 @@ export class WriteBinaryFile implements INodeType {
 				const dataPropertyName = this.getNodeParameter('dataPropertyName', itemIndex);
 
 				const fileName = this.getNodeParameter('fileName', itemIndex) as string;
+
 				const options = this.getNodeParameter('options', 0, {});
 
-				const flag = options.append ? 'a' : 'w';
+				const flag: string = options.append ? 'a' : 'w';
 
 				item = items[itemIndex];
 
@@ -91,13 +92,14 @@ export class WriteBinaryFile implements INodeType {
 
 				let fileContent: Buffer | Readable;
 				if (binaryData.id) {
-					fileContent = this.helpers.getBinaryStream(binaryData.id);
+					fileContent = await this.helpers.getBinaryStream(binaryData.id);
 				} else {
 					fileContent = Buffer.from(binaryData.data, BINARY_ENCODING);
 				}
 
 				// Write the file to disk
-				await fsWriteFile(fileName, fileContent, { encoding: 'binary', flag });
+
+				await this.helpers.writeContentToFile(fileName, fileContent, flag);
 
 				if (item.binary !== undefined) {
 					// Create a shallow copy of the binary data so that the old
@@ -116,7 +118,7 @@ export class WriteBinaryFile implements INodeType {
 				if (this.continueOnFail()) {
 					returnData.push({
 						json: {
-							error: error.message,
+							error: (error as Error).message,
 						},
 						pairedItem: {
 							item: itemIndex,
@@ -127,6 +129,6 @@ export class WriteBinaryFile implements INodeType {
 				throw error;
 			}
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/WriteBinaryFile/test/WriteBinaryFile.test.ts b/packages/nodes-base/nodes/WriteBinaryFile/test/WriteBinaryFile.test.ts
index 8a11e927c1e1c..4a06f8d0e3db3 100644
--- a/packages/nodes-base/nodes/WriteBinaryFile/test/WriteBinaryFile.test.ts
+++ b/packages/nodes-base/nodes/WriteBinaryFile/test/WriteBinaryFile.test.ts
@@ -1,12 +1,12 @@
 /* eslint-disable @typescript-eslint/no-loop-func */
-import * as Helpers from '../../../test/nodes/Helpers';
-import type { WorkflowTestData } from '../../../test/nodes/types';
-import { executeWorkflow } from '../../../test/nodes/ExecuteWorkflow';
 import path from 'path';
+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 () => {
-		await Helpers.initBinaryDataManager();
+		await Helpers.initBinaryDataService();
 	});
 
 	const temporaryDir = Helpers.createTemporaryDir();
diff --git a/packages/nodes-base/nodes/Wufoo/GenericFunctions.ts b/packages/nodes-base/nodes/Wufoo/GenericFunctions.ts
index 2a58f899a7fc1..9007d215a8319 100644
--- a/packages/nodes-base/nodes/Wufoo/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Wufoo/GenericFunctions.ts
@@ -1,16 +1,15 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
+	IHttpRequestMethods,
 	ILoadOptionsFunctions,
+	IRequestOptions,
 } from 'n8n-workflow';
 
 export async function wufooApiRequest(
-	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -20,7 +19,7 @@ export async function wufooApiRequest(
 ): Promise<any> {
 	const credentials = await this.getCredentials('wufooApi');
 
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		method,
 		form: body,
 		body,
@@ -34,5 +33,5 @@ export async function wufooApiRequest(
 		delete options.body;
 	}
 
-	return this.helpers.requestWithAuthentication.call(this, 'wufooApi', options);
+	return await this.helpers.requestWithAuthentication.call(this, 'wufooApi', options);
 }
diff --git a/packages/nodes-base/nodes/Wufoo/WufooTrigger.node.ts b/packages/nodes-base/nodes/Wufoo/WufooTrigger.node.ts
index 575c29c320091..bd10e1ea90a76 100644
--- a/packages/nodes-base/nodes/Wufoo/WufooTrigger.node.ts
+++ b/packages/nodes-base/nodes/Wufoo/WufooTrigger.node.ts
@@ -1,3 +1,4 @@
+import { randomBytes } from 'crypto';
 import type {
 	IHookFunctions,
 	IWebhookFunctions,
@@ -14,8 +15,6 @@ import { wufooApiRequest } from './GenericFunctions';
 
 import type { IField, IWebhook } from './Interface';
 
-import { randomBytes } from 'crypto';
-
 export class WufooTrigger implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Wufoo Trigger',
diff --git a/packages/nodes-base/nodes/Xero/GenericFunctions.ts b/packages/nodes-base/nodes/Xero/GenericFunctions.ts
index 56a248827ee51..c1d7d372286e7 100644
--- a/packages/nodes-base/nodes/Xero/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Xero/GenericFunctions.ts
@@ -1,17 +1,16 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	ILoadOptionsFunctions,
 	IDataObject,
 	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function xeroApiRequest(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -19,7 +18,7 @@ export async function xeroApiRequest(
 	uri?: string,
 	headers: IDataObject = {},
 ): Promise<any> {
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		headers: {
 			'Content-Type': 'application/json',
 		},
@@ -49,7 +48,7 @@ export async function xeroApiRequest(
 export async function xeroApiRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 
 	body: any = {},
diff --git a/packages/nodes-base/nodes/Xero/Xero.node.ts b/packages/nodes-base/nodes/Xero/Xero.node.ts
index 70f0f365de83d..2f872dd4deb66 100644
--- a/packages/nodes-base/nodes/Xero/Xero.node.ts
+++ b/packages/nodes-base/nodes/Xero/Xero.node.ts
@@ -730,6 +730,6 @@ export class Xero implements INodeType {
 				throw error;
 			}
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Xero/xero.svg b/packages/nodes-base/nodes/Xero/xero.svg
index 34d4008f912c3..f2136fb2a7c1a 100644
--- a/packages/nodes-base/nodes/Xero/xero.svg
+++ b/packages/nodes-base/nodes/Xero/xero.svg
@@ -1 +1 @@
-<svg width="60" height="60" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round"><path d="M30 59.538c16.336 0 29.538-13.202 29.538-29.538S46.336.462 30 .462.462 13.664.462 30 13.664 59.538 30 59.538z" fill="#00B2D5"/><path d="M14.588 29.908l5.035-5.035a.95.95 0 00.256-.616.92.92 0 00-.925-.925c-.256 0-.461.092-.667.256l-5.034 5.035-5.035-5.035a.95.95 0 00-.616-.256.92.92 0 00-.925.925c0 .256.092.461.256.667l5.035 5.034-5.045 5.027c-.206.154-.257.41-.257.667 0 .514.411.925.925.925a.85.85 0 00.617-.257l5.034-5.034 5.035 5.034a.85.85 0 00.667.257.92.92 0 00.925-.925.85.85 0 00-.256-.617l-5.025-5.127zm29.95 0c0 .925.72 1.643 1.644 1.643.923 0 1.643-.72 1.643-1.643s-.72-1.643-1.643-1.643c-.874 0-1.644.77-1.644 1.643zm-4.984 0a6.646 6.646 0 006.627 6.626 6.646 6.646 0 006.626-6.626 6.646 6.646 0 00-6.626-6.627 6.646 6.646 0 00-6.627 6.627zm1.901 0a4.77 4.77 0 014.778-4.778 4.77 4.77 0 014.778 4.778 4.735 4.735 0 01-4.778 4.778 4.769 4.769 0 01-4.778-4.778zm-2.363-6.474h-.256a3.78 3.78 0 00-2.312.77c-.092-.41-.461-.72-.873-.72a.865.865 0 00-.873.874v11.148c0 .514.41.925.925.925a.92.92 0 00.925-.925v-6.832c0-2.262.206-3.185 2.157-3.444h.37c.513 0 .924-.369.924-.873-.052-.565-.461-.925-.976-.925l-.01.002zm-6.215 5.23c-.41-1.849-1.387-3.338-2.928-4.315-2.261-1.438-5.24-1.336-7.397.206-1.747 1.233-2.774 3.339-2.774 5.446 0 .514.052 1.08.206 1.592.667 2.62 2.928 4.616 5.6 4.932a6.07 6.07 0 002.362-.154 7.215 7.215 0 002.003-.83c.668-.411 1.182-.976 1.696-1.593l.052-.052c.369-.461.308-1.08-.093-1.387-.308-.257-.873-.37-1.335.206-.093.154-.206.256-.309.41a5.39 5.39 0 01-1.292 1.08 4.592 4.592 0 01-2.209.565c-2.62-.051-4.006-1.848-4.52-3.184a5.413 5.413 0 01-.206-.77v-.155h9.452c1.233-.052 1.902-.976 1.696-2.003l-.004.006zm-11.095.154v-.092c.514-2.055 2.415-3.596 4.615-3.596 2.262 0 4.161 1.592 4.675 3.699l-9.29-.01z" fill="#FFF"/><path d="M29.538 59.077c16.336 0 29.539-13.203 29.539-29.539C59.077 13.203 45.874 0 29.538 0 13.203 0 0 13.203 0 29.538c0 16.336 13.203 29.539 29.538 29.539z" fill="#00B2D5"/><path d="M14.127 29.446l5.034-5.034a.95.95 0 00.257-.617.92.92 0 00-.925-.925c-.257 0-.462.092-.667.257L12.79 28.16l-5.034-5.034a.95.95 0 00-.617-.257.92.92 0 00-.925.925c0 .257.092.462.257.667l5.034 5.035-5.044 5.026c-.206.154-.257.41-.257.667 0 .515.41.925.925.925a.85.85 0 00.616-.256l5.035-5.035 5.034 5.035a.85.85 0 00.668.256.92.92 0 00.925-.925.85.85 0 00-.257-.616l-5.024-5.128zm29.95 0c0 .925.72 1.643 1.643 1.643s1.643-.72 1.643-1.643-.72-1.643-1.643-1.643c-.873 0-1.643.77-1.643 1.643zm-4.985 0a6.646 6.646 0 006.627 6.627 6.646 6.646 0 006.627-6.627 6.646 6.646 0 00-6.627-6.627 6.646 6.646 0 00-6.627 6.627zm1.902 0a4.77 4.77 0 014.778-4.778 4.77 4.77 0 014.778 4.778 4.735 4.735 0 01-4.778 4.778 4.769 4.769 0 01-4.778-4.778zm-2.363-6.473h-.257c-.83 0-1.643.256-2.311.77-.093-.41-.462-.72-.873-.72a.865.865 0 00-.874.874v11.148c0 .514.411.925.925.925a.92.92 0 00.925-.925v-6.833c0-2.262.206-3.185 2.157-3.443h.37c.514 0 .925-.37.925-.873-.052-.565-.462-.925-.976-.925l-.011.002zm-6.215 5.23c-.411-1.85-1.388-3.339-2.928-4.316-2.262-1.438-5.24-1.335-7.398.206-1.746 1.233-2.774 3.339-2.774 5.446 0 .515.052 1.08.206 1.593.668 2.62 2.928 4.615 5.6 4.932.79.104 1.593.051 2.363-.154a7.215 7.215 0 002.003-.831c.667-.411 1.181-.976 1.695-1.593l.052-.051c.37-.462.308-1.08-.092-1.388-.309-.256-.873-.369-1.336.206-.092.154-.206.257-.308.411-.37.41-.771.77-1.293 1.08a4.592 4.592 0 01-2.208.565c-2.62-.052-4.007-1.849-4.52-3.185a5.413 5.413 0 01-.207-.77v-.155h9.453c1.233-.051 1.901-.975 1.695-2.003l-.003.007zm-11.096.154v-.092c.514-2.055 2.415-3.597 4.616-3.597 2.261 0 4.16 1.593 4.674 3.7l-9.29-.011z" fill="#FFF"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="60" height="60"><g fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round"><path fill="#00B2D5" d="M30 59.538c16.336 0 29.538-13.202 29.538-29.538S46.336.462 30 .462.462 13.664.462 30 13.664 59.538 30 59.538"/><path fill="#FFF" d="m14.588 29.908 5.035-5.035a.95.95 0 0 0 .256-.616.92.92 0 0 0-.925-.925c-.256 0-.461.092-.667.256l-5.034 5.035-5.035-5.035a.95.95 0 0 0-.616-.256.92.92 0 0 0-.925.925c0 .256.092.461.256.667l5.035 5.034-5.045 5.027c-.206.154-.257.41-.257.667 0 .514.411.925.925.925a.85.85 0 0 0 .617-.257l5.034-5.034 5.035 5.034a.85.85 0 0 0 .667.257.92.92 0 0 0 .925-.925.85.85 0 0 0-.256-.617zm29.95 0c0 .925.72 1.643 1.644 1.643s1.643-.72 1.643-1.643-.72-1.643-1.643-1.643c-.874 0-1.644.77-1.644 1.643m-4.984 0a6.646 6.646 0 0 0 6.627 6.626 6.646 6.646 0 0 0 6.626-6.626 6.646 6.646 0 0 0-6.626-6.627 6.646 6.646 0 0 0-6.627 6.627m1.901 0a4.77 4.77 0 0 1 4.778-4.778 4.77 4.77 0 0 1 4.778 4.778 4.735 4.735 0 0 1-4.778 4.778 4.77 4.77 0 0 1-4.778-4.778m-2.363-6.474h-.256a3.78 3.78 0 0 0-2.312.77c-.092-.41-.461-.72-.873-.72a.865.865 0 0 0-.873.874v11.148c0 .514.41.925.925.925a.92.92 0 0 0 .925-.925v-6.832c0-2.262.206-3.185 2.157-3.444h.37c.513 0 .924-.369.924-.873-.052-.565-.461-.925-.976-.925zm-6.215 5.23c-.41-1.849-1.387-3.338-2.928-4.315-2.261-1.438-5.24-1.336-7.397.206-1.747 1.233-2.774 3.339-2.774 5.446 0 .514.052 1.08.206 1.592.667 2.62 2.928 4.616 5.6 4.932a6.1 6.1 0 0 0 2.362-.154 7.2 7.2 0 0 0 2.003-.83c.668-.411 1.182-.976 1.696-1.593l.052-.052c.369-.461.308-1.08-.093-1.387-.308-.257-.873-.37-1.335.206-.093.154-.206.256-.309.41a5.4 5.4 0 0 1-1.292 1.08 4.6 4.6 0 0 1-2.209.565c-2.62-.051-4.006-1.848-4.52-3.184a5.4 5.4 0 0 1-.206-.77v-.155h9.452c1.233-.052 1.902-.976 1.696-2.003zm-11.095.154v-.092c.514-2.055 2.415-3.596 4.615-3.596 2.262 0 4.161 1.592 4.675 3.699z"/><path fill="#00B2D5" d="M29.538 59.077c16.336 0 29.539-13.203 29.539-29.539C59.077 13.203 45.874 0 29.538 0 13.203 0 0 13.203 0 29.538s13.203 29.539 29.538 29.539"/><path fill="#FFF" d="m14.127 29.446 5.034-5.034a.95.95 0 0 0 .257-.617.92.92 0 0 0-.925-.925c-.257 0-.462.092-.667.257L12.79 28.16l-5.034-5.034a.95.95 0 0 0-.617-.257.92.92 0 0 0-.925.925c0 .257.092.462.257.667l5.034 5.035-5.044 5.026c-.206.154-.257.41-.257.667 0 .515.41.925.925.925a.85.85 0 0 0 .616-.256l5.035-5.035 5.034 5.035a.85.85 0 0 0 .668.256.92.92 0 0 0 .925-.925.85.85 0 0 0-.257-.616l-5.024-5.128zm29.95 0c0 .925.72 1.643 1.643 1.643s1.643-.72 1.643-1.643-.72-1.643-1.643-1.643c-.873 0-1.643.77-1.643 1.643m-4.985 0a6.646 6.646 0 0 0 6.627 6.627 6.646 6.646 0 0 0 6.627-6.627 6.646 6.646 0 0 0-6.627-6.627 6.646 6.646 0 0 0-6.627 6.627m1.902 0a4.77 4.77 0 0 1 4.778-4.778 4.77 4.77 0 0 1 4.778 4.778 4.735 4.735 0 0 1-4.778 4.778 4.77 4.77 0 0 1-4.778-4.778m-2.363-6.473h-.257c-.83 0-1.643.256-2.311.77-.093-.41-.462-.72-.873-.72a.865.865 0 0 0-.874.874v11.148c0 .514.411.925.925.925a.92.92 0 0 0 .925-.925v-6.833c0-2.262.206-3.185 2.157-3.443h.37c.514 0 .925-.37.925-.873-.052-.565-.462-.925-.976-.925zm-6.215 5.23c-.411-1.85-1.388-3.339-2.928-4.316-2.262-1.438-5.24-1.335-7.398.206-1.746 1.233-2.774 3.339-2.774 5.446 0 .515.052 1.08.206 1.593.668 2.62 2.928 4.615 5.6 4.932.79.104 1.593.051 2.363-.154a7.2 7.2 0 0 0 2.003-.831c.667-.411 1.181-.976 1.695-1.593l.052-.051c.37-.462.308-1.08-.092-1.388-.309-.256-.873-.369-1.336.206-.092.154-.206.257-.308.411-.37.41-.771.77-1.293 1.08a4.6 4.6 0 0 1-2.208.565c-2.62-.052-4.007-1.849-4.52-3.185a5.4 5.4 0 0 1-.207-.77v-.155h9.453c1.233-.051 1.901-.975 1.695-2.003zm-11.096.154v-.092c.514-2.055 2.415-3.597 4.616-3.597 2.261 0 4.16 1.593 4.674 3.7z"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Xml/Xml.node.json b/packages/nodes-base/nodes/Xml/Xml.node.json
index 0291e03833d9b..09fc208546187 100644
--- a/packages/nodes-base/nodes/Xml/Xml.node.json
+++ b/packages/nodes-base/nodes/Xml/Xml.node.json
@@ -19,6 +19,6 @@
 	},
 	"alias": ["Parse"],
 	"subcategories": {
-		"Core Nodes": ["Files", "Data Transformation"]
+		"Core Nodes": ["Data Transformation"]
 	}
 }
diff --git a/packages/nodes-base/nodes/Xml/Xml.node.ts b/packages/nodes-base/nodes/Xml/Xml.node.ts
index 213ce2df7320b..efb3518a3414a 100644
--- a/packages/nodes-base/nodes/Xml/Xml.node.ts
+++ b/packages/nodes-base/nodes/Xml/Xml.node.ts
@@ -5,7 +5,7 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { NodeOperationError } from 'n8n-workflow';
+import { NodeOperationError, deepCopy } from 'n8n-workflow';
 
 export class Xml implements INodeType {
 	description: INodeTypeDescription = {
@@ -42,6 +42,18 @@ export class Xml implements INodeType {
 				default: 'xmlToJson',
 				description: 'From and to what format the data should be converted',
 			},
+			{
+				displayName:
+					"If your XML is inside a binary file, use the 'Extract from File' node to convert it to text first",
+				name: 'xmlNotice',
+				type: 'notice',
+				default: '',
+				displayOptions: {
+					show: {
+						mode: ['xmlToJson'],
+					},
+				},
+			},
 
 			// ----------------------------------
 			//         option:jsonToxml
@@ -249,7 +261,7 @@ export class Xml implements INodeType {
 					}
 
 					const json = await parser.parseStringPromise(item.json[dataPropertyName] as string);
-					returnData.push({ json });
+					returnData.push({ json: deepCopy(json) });
 				} else if (mode === 'jsonToxml') {
 					const builder = new Builder(options);
 
@@ -282,6 +294,6 @@ export class Xml implements INodeType {
 			}
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Xml/test/node/Xml.test.ts b/packages/nodes-base/nodes/Xml/test/node/Xml.test.ts
index 42fc0cf34a07c..3be88943f237c 100644
--- a/packages/nodes-base/nodes/Xml/test/node/Xml.test.ts
+++ b/packages/nodes-base/nodes/Xml/test/node/Xml.test.ts
@@ -1,4 +1,4 @@
-import { testWorkflows, getWorkflowFilenames } from '../../../../test/nodes/Helpers';
+import { testWorkflows, getWorkflowFilenames } from '@test/nodes/Helpers';
 
 const workflows = getWorkflowFilenames(__dirname);
 
diff --git a/packages/nodes-base/nodes/Xml/test/node/workflow.xml-valid-data.json b/packages/nodes-base/nodes/Xml/test/node/workflow.xml-valid-data.json
new file mode 100644
index 0000000000000..0b46a4ca968c7
--- /dev/null
+++ b/packages/nodes-base/nodes/Xml/test/node/workflow.xml-valid-data.json
@@ -0,0 +1,134 @@
+{
+	"name": "My workflow",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "7f04c09e-5a60-4a0c-a336-ef38e4732452",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [860, 380]
+		},
+		{
+			"parameters": {
+				"jsCode": "return [\n  {\n    json: {\n      a: {\n        b: {\n          c: 1\n        }\n      }\n    }\n  }\n];\n"
+			},
+			"id": "be80ce82-d312-460d-ac79-05c0626845ad",
+			"name": "Code",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [1080, 380]
+		},
+		{
+			"parameters": {
+				"mode": "jsonToxml",
+				"options": {}
+			},
+			"id": "c352655b-e0dc-4f7c-a63a-ff1bc5f1909f",
+			"name": "XML",
+			"type": "n8n-nodes-base.xml",
+			"typeVersion": 1,
+			"position": [1300, 380]
+		},
+		{
+			"parameters": {
+				"options": {}
+			},
+			"id": "21547e44-133e-4c3b-a601-0cffba1daf9b",
+			"name": "XML1",
+			"type": "n8n-nodes-base.xml",
+			"typeVersion": 1,
+			"position": [1500, 380]
+		},
+		{
+			"parameters": {
+				"values": {
+					"string": [
+						{
+							"name": "new",
+							"value": "={{ $json.a }}"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "632dee22-10d1-424d-b1d2-673b95b32943",
+			"name": "Set",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 2,
+			"position": [1720, 380]
+		}
+	],
+	"pinData": {
+		"Set": [
+			{
+				"json": {
+					"a": {
+						"b": {
+							"c": "1"
+						}
+					},
+					"new": {
+						"b": {
+							"c": "1"
+						}
+					}
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Code",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code": {
+			"main": [
+				[
+					{
+						"node": "XML",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"XML": {
+			"main": [
+				[
+					{
+						"node": "XML1",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"XML1": {
+			"main": [
+				[
+					{
+						"node": "Set",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {},
+	"versionId": "14c1d4b8-3546-4692-8e8a-44c244c79bcc",
+	"id": "0G78Fh2FTnM46kuR",
+	"meta": {
+		"instanceId": "021d3c82ba2d3bc090cbf4fc81c9312668bcc34297e022bb3438c5c88a43a5ff"
+	},
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Yourls/GenericFunctions.ts b/packages/nodes-base/nodes/Yourls/GenericFunctions.ts
index 293d4842d2b16..c847c0714d6e7 100644
--- a/packages/nodes-base/nodes/Yourls/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Yourls/GenericFunctions.ts
@@ -1,17 +1,16 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	ILoadOptionsFunctions,
 	IDataObject,
 	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 export async function yourlsApiRequest(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 
 	body: any = {},
 	qs: IDataObject = {},
@@ -21,7 +20,7 @@ export async function yourlsApiRequest(
 	qs.signature = credentials.signature as string;
 	qs.format = 'json';
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		method,
 		body,
 		qs,
@@ -38,6 +37,16 @@ export async function yourlsApiRequest(
 			);
 		}
 
+		if (typeof response === 'string' && response.includes('<b>Fatal error</b>')) {
+			throw new NodeOperationError(
+				this.getNode(),
+				"Yourls responded with a 'Fatal error', check description for more details",
+				{
+					description: `Server response:\n${response}`,
+				},
+			);
+		}
+
 		return response;
 	} catch (error) {
 		throw new NodeApiError(this.getNode(), error as JsonObject);
diff --git a/packages/nodes-base/nodes/Zammad/GenericFunctions.ts b/packages/nodes-base/nodes/Zammad/GenericFunctions.ts
index 0ef1fba494665..aad3fa3d84917 100644
--- a/packages/nodes-base/nodes/Zammad/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Zammad/GenericFunctions.ts
@@ -3,12 +3,12 @@ import type {
 	IDataObject,
 	ILoadOptionsFunctions,
 	JsonObject,
+	IRequestOptions,
+	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
-import type { OptionsWithUri } from 'request';
-
-import flow from 'lodash.flow';
+import flow from 'lodash/flow';
 
 import type { Zammad } from './types';
 
@@ -18,12 +18,12 @@ export function tolerateTrailingSlash(url: string) {
 
 export async function zammadApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject = {},
 	qs: IDataObject = {},
 ) {
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		method,
 		body,
 		qs,
@@ -85,7 +85,7 @@ export async function zammadApiRequest(
 
 export async function zammadApiRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject = {},
 	qs: IDataObject = {},
diff --git a/packages/nodes-base/nodes/Zammad/Zammad.node.ts b/packages/nodes-base/nodes/Zammad/Zammad.node.ts
index ef142bc6be940..8441fa0d017e2 100644
--- a/packages/nodes-base/nodes/Zammad/Zammad.node.ts
+++ b/packages/nodes-base/nodes/Zammad/Zammad.node.ts
@@ -8,11 +8,10 @@ import type {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import type { OptionsWithUri } from 'request';
-
 import {
 	groupDescription,
 	organizationDescription,
@@ -256,7 +255,7 @@ export class Zammad implements INodeType {
 
 				const baseUrl = tolerateTrailingSlash(credentials.baseUrl);
 
-				const options: OptionsWithUri = {
+				const options: IRequestOptions = {
 					method: 'GET',
 					uri: `${baseUrl}/api/v1/users/me`,
 					json: true,
@@ -289,7 +288,7 @@ export class Zammad implements INodeType {
 
 				const baseUrl = tolerateTrailingSlash(credentials.baseUrl);
 
-				const options: OptionsWithUri = {
+				const options: IRequestOptions = {
 					method: 'GET',
 					uri: `${baseUrl}/api/v1/users/me`,
 					json: true,
@@ -757,6 +756,6 @@ export class Zammad implements INodeType {
 				throw error;
 			}
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Zammad/descriptions/OrganizationDescription.ts b/packages/nodes-base/nodes/Zammad/descriptions/OrganizationDescription.ts
index afa07c16e4b3a..fb6b852edc574 100644
--- a/packages/nodes-base/nodes/Zammad/descriptions/OrganizationDescription.ts
+++ b/packages/nodes-base/nodes/Zammad/descriptions/OrganizationDescription.ts
@@ -123,11 +123,47 @@ export const organizationDescription: INodeProperties[] = [
 		default: {},
 		placeholder: 'Add Field',
 		options: [
+			{
+				displayName: 'Shared',
+				name: 'shared',
+				type: 'boolean',
+				default: false,
+				description: 'Whether the organization is shared with other instances',
+			},
+			{
+				displayName: 'Domain',
+				name: 'domain',
+				type: 'string',
+				default: '',
+				description: 'The domain associated with the organization',
+			},
+			{
+				displayName: 'Domain Assignment',
+				name: 'domain_assignment',
+				type: 'boolean',
+				default: true,
+				description: 'Whether to assign users based on their email domain',
+			},
 			{
 				displayName: 'Active',
 				name: 'active',
 				type: 'boolean',
 				default: true,
+				description: 'Whether the organization is active',
+			},
+			{
+				displayName: 'VIP',
+				name: 'vip',
+				type: 'boolean',
+				default: false,
+				description: 'Whether the organization is marked as VIP',
+			},
+			{
+				displayName: 'Notes',
+				name: 'note',
+				type: 'string',
+				default: '',
+				description: 'A note about the organization',
 			},
 			{
 				displayName: 'Custom Fields',
@@ -165,12 +201,6 @@ export const organizationDescription: INodeProperties[] = [
 					},
 				],
 			},
-			{
-				displayName: 'Notes',
-				name: 'note',
-				type: 'string',
-				default: '',
-			},
 		],
 	},
 	{
@@ -186,11 +216,47 @@ export const organizationDescription: INodeProperties[] = [
 		default: {},
 		placeholder: 'Add Field',
 		options: [
+			{
+				displayName: 'Shared',
+				name: 'shared',
+				type: 'boolean',
+				default: false,
+				description: 'Whether the organization is shared with other instances',
+			},
+			{
+				displayName: 'Domain',
+				name: 'domain',
+				type: 'string',
+				default: '',
+				description: 'The domain associated with the organization',
+			},
+			{
+				displayName: 'Domain Assignment',
+				name: 'domain_assignment',
+				type: 'boolean',
+				default: true,
+				description: 'Whether to assign users based on their email domain',
+			},
 			{
 				displayName: 'Active',
 				name: 'active',
 				type: 'boolean',
 				default: true,
+				description: 'Whether the organization is active',
+			},
+			{
+				displayName: 'VIP',
+				name: 'vip',
+				type: 'boolean',
+				default: false,
+				description: 'Whether the organization is marked as VIP',
+			},
+			{
+				displayName: 'Notes',
+				name: 'note',
+				type: 'string',
+				default: '',
+				description: 'A note about the organization',
 			},
 			{
 				displayName: 'Custom Fields',
@@ -228,18 +294,6 @@ export const organizationDescription: INodeProperties[] = [
 					},
 				],
 			},
-			{
-				displayName: 'Organization Name',
-				name: 'name',
-				type: 'string',
-				default: '',
-			},
-			{
-				displayName: 'Notes',
-				name: 'note',
-				type: 'string',
-				default: '',
-			},
 		],
 	},
 	{
diff --git a/packages/nodes-base/nodes/Zammad/types.d.ts b/packages/nodes-base/nodes/Zammad/types.ts
similarity index 100%
rename from packages/nodes-base/nodes/Zammad/types.d.ts
rename to packages/nodes-base/nodes/Zammad/types.ts
diff --git a/packages/nodes-base/nodes/Zammad/zammad.svg b/packages/nodes-base/nodes/Zammad/zammad.svg
index f3ef577a4618d..1af051651b562 100644
--- a/packages/nodes-base/nodes/Zammad/zammad.svg
+++ b/packages/nodes-base/nodes/Zammad/zammad.svg
@@ -1,27 +1 @@
-<svg
-	version="1.1"
-	xmlns="http://www.w3.org/2000/svg"
-	xmlns:xlink="http://www.w3.org/1999/xlink"
-	viewBox="140 210 140 140"
-	xml:space="preserve"
->
-	<g>
-		<polygon fill="#CA2317" points="230.5,250 272.2,237.2 247.5,252.9"/>
-		<polygon fill="#E84F83" points="255.9,281.2 247.5,252.9 272.2,237.2 264.8,262.6"/>
-		<polygon fill="#CA2317" points="284.4,229.5 279.8,237.2 264.8,262.6 272.2,237.2"/>
-		<polygon fill="#E54011" points="285.9,234.5 274.3,246.4 279.8,237.2"/>
-		<polygon fill="#E54011" points="233,242.1 267.1,238.7 243.4,246"/>
-		<polygon fill="#CA2317" points="234.3,261.4 247.5,252.9 255.9,281.2 251.5,290.2"/>
-		<polygon fill="#B7DFF2" points="214.6,295 208.3,218 251.5,290.2"/>
-		<polygon fill="#E54011" points="196.7,314.7 214.6,295 251.5,290.2"/>
-		<polygon fill="#FFCE33" points="109.7,353.4 196.7,314.7 214.6,295 186.2,292.1"/>
-		<polygon fill="#D6B12D" points="113,321.8 157.7,315 171.6,303.8 164.8,300.8"/>
-		<polygon fill="#FFDE85" points="129.1,285.3 171.6,303.8 186.2,292.1"/>
-		<polygon fill="#009EC6" points="205.1,245.9 199.7,246.8 186.2,292.1 200.8,282.9"/>
-		<polygon fill="#5EAFCE" points="213,275.1 200.8,282.9 208.3,218"/>
-		<polygon fill="#045972" points="166.9,252 205.1,245.9 206.8,230.8"/>
-		<polygon fill="#5A8591" points="162.8,216.6 196,236.6 206.8,230.8 207.1,228.7"/>
-		<polygon fill="#009EC6" points="169.3,194.8 199.5,226.6 207.1,228.7 208.3,218"/>
-		<polygon fill="#F39804" points="186.2,292.1 213,275.1 214.6,295"/>
-	</g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="140 210 140 140"><path fill="#CA2317" d="m230.5 250 41.7-12.8-24.7 15.7z"/><path fill="#E84F83" d="m255.9 281.2-8.4-28.3 24.7-15.7-7.4 25.4z"/><path fill="#CA2317" d="m284.4 229.5-4.6 7.7-15 25.4 7.4-25.4z"/><path fill="#E54011" d="m285.9 234.5-11.6 11.9 5.5-9.2zm-52.9 7.6 34.1-3.4-23.7 7.3z"/><path fill="#CA2317" d="m234.3 261.4 13.2-8.5 8.4 28.3-4.4 9z"/><path fill="#B7DFF2" d="m214.6 295-6.3-77 43.2 72.2z"/><path fill="#E54011" d="m196.7 314.7 17.9-19.7 36.9-4.8z"/><path fill="#FFCE33" d="m109.7 353.4 87-38.7 17.9-19.7-28.4-2.9z"/><path fill="#D6B12D" d="m113 321.8 44.7-6.8 13.9-11.2-6.8-3z"/><path fill="#FFDE85" d="m129.1 285.3 42.5 18.5 14.6-11.7z"/><path fill="#009EC6" d="m205.1 245.9-5.4.9-13.5 45.3 14.6-9.2z"/><path fill="#5EAFCE" d="m213 275.1-12.2 7.8 7.5-64.9z"/><path fill="#045972" d="m166.9 252 38.2-6.1 1.7-15.1z"/><path fill="#5A8591" d="m162.8 216.6 33.2 20 10.8-5.8.3-2.1z"/><path fill="#009EC6" d="m169.3 194.8 30.2 31.8 7.6 2.1 1.2-10.7z"/><path fill="#F39804" d="m186.2 292.1 26.8-17 1.6 19.9z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Zendesk/GenericFunctions.ts b/packages/nodes-base/nodes/Zendesk/GenericFunctions.ts
index 4c5d26d55a237..d38f741e4eb6c 100644
--- a/packages/nodes-base/nodes/Zendesk/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Zendesk/GenericFunctions.ts
@@ -1,11 +1,10 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 
 function getUri(resource: string, subdomain: string) {
@@ -17,8 +16,8 @@ function getUri(resource: string, subdomain: string) {
 }
 
 export async function zendeskApiRequest(
-	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
@@ -36,7 +35,7 @@ export async function zendeskApiRequest(
 		credentials = (await this.getCredentials('zendeskOAuth2Api')) as { subdomain: string };
 	}
 
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		method,
 		qs,
 		body,
@@ -54,7 +53,7 @@ export async function zendeskApiRequest(
 
 	const credentialType = authenticationMethod === 'apiToken' ? 'zendeskApi' : 'zendeskOAuth2Api';
 
-	return this.helpers.requestWithAuthentication.call(this, credentialType, options);
+	return await this.helpers.requestWithAuthentication.call(this, credentialType, options);
 }
 
 /**
@@ -64,7 +63,7 @@ export async function zendeskApiRequest(
 export async function zendeskApiRequestAllItems(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: any = {},
diff --git a/packages/nodes-base/nodes/Zendesk/TicketInterface.ts b/packages/nodes-base/nodes/Zendesk/TicketInterface.ts
index 79097931beac4..95249dd402afd 100644
--- a/packages/nodes-base/nodes/Zendesk/TicketInterface.ts
+++ b/packages/nodes-base/nodes/Zendesk/TicketInterface.ts
@@ -10,7 +10,7 @@ export interface ITicket {
 	subject?: string;
 	comment?: IComment;
 	type?: string;
-	group?: string;
+	group_id?: number;
 	external_id?: string;
 	tags?: string[];
 	status?: string;
diff --git a/packages/nodes-base/nodes/Zendesk/Zendesk.node.ts b/packages/nodes-base/nodes/Zendesk/Zendesk.node.ts
index 6b0feb8f15797..337e8f3d19f84 100644
--- a/packages/nodes-base/nodes/Zendesk/Zendesk.node.ts
+++ b/packages/nodes-base/nodes/Zendesk/Zendesk.node.ts
@@ -319,7 +319,7 @@ export class Zendesk implements INodeType {
 								body.recipient = additionalFields.recipient as string;
 							}
 							if (additionalFields.group) {
-								body.group = additionalFields.group as string;
+								body.group_id = additionalFields.group as number;
 							}
 							if (additionalFields.tags) {
 								body.tags = additionalFields.tags as string[];
@@ -371,7 +371,7 @@ export class Zendesk implements INodeType {
 								body.recipient = updateFields.recipient as string;
 							}
 							if (updateFields.group) {
-								body.group = updateFields.group as string;
+								body.group_id = updateFields.group as number;
 							}
 							if (updateFields.tags) {
 								body.tags = updateFields.tags as string[];
@@ -799,6 +799,6 @@ export class Zendesk implements INodeType {
 				throw error;
 			}
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Zendesk/zendesk.svg b/packages/nodes-base/nodes/Zendesk/zendesk.svg
index dc3d0ec9b316a..456aeae4e80a5 100644
--- a/packages/nodes-base/nodes/Zendesk/zendesk.svg
+++ b/packages/nodes-base/nodes/Zendesk/zendesk.svg
@@ -1,4 +1 @@
-<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M0 24C0 10.7452 10.7452 0 24 0C37.2548 0 48 10.7452 48 24C48 37.2548 37.2548 48 24 48C10.7452 48 0 37.2548 0 24Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M15.4479 18.6532C19.4971 18.6532 22.7796 15.278 22.7796 11.1145H8.11609C8.11609 15.278 11.3986 18.6532 15.4479 18.6532ZM22.7796 35.8515V17.6483L8.11609 35.8515H22.7796ZM25.1953 35.8516C25.1953 31.6881 28.4779 28.3129 32.5271 28.3129C36.5763 28.3129 39.8588 31.6881 39.8588 35.8516H25.1953ZM25.1953 11.1145V29.3177L39.8604 11.1145H25.1953Z" fill="#03363D"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" fill="none"><path fill="#fff" d="M0 24C0 10.745 10.745 0 24 0s24 10.745 24 24-10.745 24-24 24S0 37.255 0 24"/><path fill="#03363D" fill-rule="evenodd" d="M15.448 18.653c4.05 0 7.332-3.375 7.332-7.538H8.116c0 4.163 3.283 7.538 7.332 7.538m7.332 17.199V17.648L8.116 35.852zm2.415 0c0-4.164 3.283-7.54 7.332-7.54 4.05 0 7.332 3.376 7.332 7.54zm0-24.737v18.203L39.86 11.115z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Zoho/GenericFunctions.ts b/packages/nodes-base/nodes/Zoho/GenericFunctions.ts
index b64b91f9290d4..7b025bfcda0e7 100644
--- a/packages/nodes-base/nodes/Zoho/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Zoho/GenericFunctions.ts
@@ -1,16 +1,16 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IExecuteFunctions,
 	IHookFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
-import flow from 'lodash.flow';
-import sortBy from 'lodash.sortby';
+import flow from 'lodash/flow';
+import sortBy from 'lodash/sortBy';
 
 import type {
 	AllFields,
@@ -30,7 +30,9 @@ import type {
 
 export function throwOnErrorStatus(
 	this: IExecuteFunctions | IHookFunctions | ILoadOptionsFunctions,
-	responseData: { data?: Array<{ status: string; message: string }> },
+	responseData: {
+		data?: Array<{ status: string; message: string }>;
+	},
 ) {
 	if (responseData?.data?.[0].status === 'error') {
 		throw new NodeOperationError(this.getNode(), responseData as Error);
@@ -39,7 +41,7 @@ export function throwOnErrorStatus(
 
 export async function zohoApiRequest(
 	this: IExecuteFunctions | IHookFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject = {},
 	qs: IDataObject = {},
@@ -49,7 +51,7 @@ export async function zohoApiRequest(
 		'zohoOAuth2Api',
 	)) as ZohoOAuth2ApiCredentials;
 
-	const options: OptionsWithUri = {
+	const options: IRequestOptions = {
 		body: {
 			data: [body],
 		},
@@ -69,14 +71,18 @@ export async function zohoApiRequest(
 
 	try {
 		const responseData = await this.helpers.requestOAuth2?.call(this, 'zohoOAuth2Api', options);
-
 		if (responseData === undefined) return [];
-
 		throwOnErrorStatus.call(this, responseData as IDataObject);
 
 		return responseData;
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error as JsonObject);
+		const args = error.cause?.data
+			? {
+					message: error.cause.data.message || 'The Zoho API returned an error.',
+					description: JSON.stringify(error.cause.data, null, 2),
+				}
+			: undefined;
+		throw new NodeApiError(this.getNode(), error as JsonObject, args);
 	}
 }
 
@@ -85,7 +91,7 @@ export async function zohoApiRequest(
  */
 export async function zohoApiRequestAllItems(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject = {},
 	qs: IDataObject = {},
@@ -111,7 +117,7 @@ export async function zohoApiRequestAllItems(
  */
 export async function handleListing(
 	this: IExecuteFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject = {},
 	qs: IDataObject = {},
@@ -119,7 +125,7 @@ export async function handleListing(
 	const returnAll = this.getNodeParameter('returnAll', 0);
 
 	if (returnAll) {
-		return zohoApiRequestAllItems.call(this, method, endpoint, body, qs);
+		return await zohoApiRequestAllItems.call(this, method, endpoint, body, qs);
 	}
 
 	const responseData = await zohoApiRequestAllItems.call(this, method, endpoint, body, qs);
@@ -161,13 +167,18 @@ const omit = (propertyToOmit: string, { [propertyToOmit]: _, ...remainingObject
 /**
  * Place a product ID at a nested position in a product details field.
  */
-export const adjustProductDetails = (productDetails: ProductDetails) => {
+export const adjustProductDetails = (productDetails: ProductDetails, operation?: string) => {
 	return productDetails.map((p) => {
-		return {
-			...omit('product', p),
+		const adjustedProduct = {
 			product: { id: p.id },
 			quantity: p.quantity || 1,
 		};
+
+		if (operation === 'upsert') {
+			return { ...adjustedProduct, ...omit('id', p) };
+		} else {
+			return { ...adjustedProduct, ...omit('product', p) };
+		}
 	});
 };
 
diff --git a/packages/nodes-base/nodes/Zoho/ZohoCrm.node.ts b/packages/nodes-base/nodes/Zoho/ZohoCrm.node.ts
index bf468d29ccaaf..4b56e030d2a5f 100644
--- a/packages/nodes-base/nodes/Zoho/ZohoCrm.node.ts
+++ b/packages/nodes-base/nodes/Zoho/ZohoCrm.node.ts
@@ -212,93 +212,93 @@ export class ZohoCrm implements INodeType {
 			// standard fields - called from `makeGetAllFields`
 
 			async getAccountFields(this: ILoadOptionsFunctions) {
-				return getFields.call(this, 'account');
+				return await getFields.call(this, 'account');
 			},
 
 			async getContactFields(this: ILoadOptionsFunctions) {
-				return getFields.call(this, 'contact');
+				return await getFields.call(this, 'contact');
 			},
 
 			async getDealFields(this: ILoadOptionsFunctions) {
-				return getFields.call(this, 'deal');
+				return await getFields.call(this, 'deal');
 			},
 
 			async getInvoiceFields(this: ILoadOptionsFunctions) {
-				return getFields.call(this, 'invoice');
+				return await getFields.call(this, 'invoice');
 			},
 
 			async getLeadFields(this: ILoadOptionsFunctions) {
-				return getFields.call(this, 'lead');
+				return await getFields.call(this, 'lead');
 			},
 
 			async getProductFields(this: ILoadOptionsFunctions) {
-				return getFields.call(this, 'product');
+				return await getFields.call(this, 'product');
 			},
 
 			async getPurchaseOrderFields(this: ILoadOptionsFunctions) {
-				return getFields.call(this, 'purchase_order');
+				return await getFields.call(this, 'purchase_order');
 			},
 
 			async getVendorOrderFields(this: ILoadOptionsFunctions) {
-				return getFields.call(this, 'vendor');
+				return await getFields.call(this, 'vendor');
 			},
 
 			async getQuoteFields(this: ILoadOptionsFunctions) {
-				return getFields.call(this, 'quote');
+				return await getFields.call(this, 'quote');
 			},
 
 			async getSalesOrderFields(this: ILoadOptionsFunctions) {
-				return getFields.call(this, 'sales_order');
+				return await getFields.call(this, 'sales_order');
 			},
 
 			async getVendorFields(this: ILoadOptionsFunctions) {
-				return getFields.call(this, 'vendor');
+				return await getFields.call(this, 'vendor');
 			},
 
 			// custom fields
 
 			async getCustomAccountFields(this: ILoadOptionsFunctions) {
-				return getFields.call(this, 'account', { onlyCustom: true });
+				return await getFields.call(this, 'account', { onlyCustom: true });
 			},
 
 			async getCustomContactFields(this: ILoadOptionsFunctions) {
-				return getFields.call(this, 'contact', { onlyCustom: true });
+				return await getFields.call(this, 'contact', { onlyCustom: true });
 			},
 
 			async getCustomDealFields(this: ILoadOptionsFunctions) {
-				return getFields.call(this, 'deal', { onlyCustom: true });
+				return await getFields.call(this, 'deal', { onlyCustom: true });
 			},
 
 			async getCustomInvoiceFields(this: ILoadOptionsFunctions) {
-				return getFields.call(this, 'invoice', { onlyCustom: true });
+				return await getFields.call(this, 'invoice', { onlyCustom: true });
 			},
 
 			async getCustomLeadFields(this: ILoadOptionsFunctions) {
-				return getFields.call(this, 'lead', { onlyCustom: true });
+				return await getFields.call(this, 'lead', { onlyCustom: true });
 			},
 
 			async getCustomProductFields(this: ILoadOptionsFunctions) {
-				return getFields.call(this, 'product', { onlyCustom: true });
+				return await getFields.call(this, 'product', { onlyCustom: true });
 			},
 
 			async getCustomPurchaseOrderFields(this: ILoadOptionsFunctions) {
-				return getFields.call(this, 'purchase_order', { onlyCustom: true });
+				return await getFields.call(this, 'purchase_order', { onlyCustom: true });
 			},
 
 			async getCustomVendorOrderFields(this: ILoadOptionsFunctions) {
-				return getFields.call(this, 'vendor', { onlyCustom: true });
+				return await getFields.call(this, 'vendor', { onlyCustom: true });
 			},
 
 			async getCustomQuoteFields(this: ILoadOptionsFunctions) {
-				return getFields.call(this, 'quote', { onlyCustom: true });
+				return await getFields.call(this, 'quote', { onlyCustom: true });
 			},
 
 			async getCustomSalesOrderFields(this: ILoadOptionsFunctions) {
-				return getFields.call(this, 'sales_order', { onlyCustom: true });
+				return await getFields.call(this, 'sales_order', { onlyCustom: true });
 			},
 
 			async getCustomVendorFields(this: ILoadOptionsFunctions) {
-				return getFields.call(this, 'vendor', { onlyCustom: true });
+				return await getFields.call(this, 'vendor', { onlyCustom: true });
 			},
 
 			// ----------------------------------------
@@ -306,23 +306,23 @@ export class ZohoCrm implements INodeType {
 			// ----------------------------------------
 
 			async getAccountType(this: ILoadOptionsFunctions) {
-				return getPicklistOptions.call(this, 'account', 'Account_Type');
+				return await getPicklistOptions.call(this, 'account', 'Account_Type');
 			},
 
 			async getDealStage(this: ILoadOptionsFunctions) {
-				return getPicklistOptions.call(this, 'deal', 'Stage');
+				return await getPicklistOptions.call(this, 'deal', 'Stage');
 			},
 
 			async getPurchaseOrderStatus(this: ILoadOptionsFunctions) {
-				return getPicklistOptions.call(this, 'purchaseOrder', 'Status');
+				return await getPicklistOptions.call(this, 'purchaseOrder', 'Status');
 			},
 
 			async getSalesOrderStatus(this: ILoadOptionsFunctions) {
-				return getPicklistOptions.call(this, 'salesOrder', 'Status');
+				return await getPicklistOptions.call(this, 'salesOrder', 'Status');
 			},
 
 			async getQuoteStage(this: ILoadOptionsFunctions) {
-				return getPicklistOptions.call(this, 'quote', 'Quote_Stage');
+				return await getPicklistOptions.call(this, 'quote', 'Quote_Stage');
 			},
 		},
 	};
@@ -1211,7 +1211,7 @@ export class ZohoCrm implements INodeType {
 						const body: IDataObject = {
 							Account_Name: { id: this.getNodeParameter('accountId', i) },
 							Subject: this.getNodeParameter('subject', i),
-							Product_Details: adjustProductDetails(productDetails),
+							Product_Details: adjustProductDetails(productDetails, 'upsert'),
 						};
 
 						const additionalFields = this.getNodeParameter('additionalFields', i);
@@ -1331,6 +1331,6 @@ export class ZohoCrm implements INodeType {
 			returnData.push(...executionData);
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Zoho/types.d.ts b/packages/nodes-base/nodes/Zoho/types.d.ts
deleted file mode 100644
index 564a8120fa59e..0000000000000
--- a/packages/nodes-base/nodes/Zoho/types.d.ts
+++ /dev/null
@@ -1,121 +0,0 @@
-import type { IDataObject } from 'n8n-workflow';
-
-// ----------------------------------------
-//          for generic functions
-// ----------------------------------------
-
-type Resource =
-	| 'account'
-	| 'contact'
-	| 'deal'
-	| 'invoice'
-	| 'lead'
-	| 'product'
-	| 'quote'
-	| 'vendor';
-
-export type CamelCaseResource = Resource | 'purchaseOrder' | 'salesOrder';
-
-export type SnakeCaseResource = Resource | 'purchase_order' | 'sales_order';
-
-export type GetAllFilterOptions = {
-	fields: string[];
-	[otherOptions: string]: unknown;
-};
-
-// ----------------------------------------
-//               for auth
-// ----------------------------------------
-
-export type ZohoOAuth2ApiCredentials = {
-	oauthTokenData: {
-		api_domain: string;
-	};
-};
-
-// ----------------------------------------
-//         for field adjusters
-// ----------------------------------------
-
-export type IdType = 'accountId' | 'contactId' | 'dealId' | 'purchaseOrderId';
-
-export type NameType = 'Account_Name' | 'Full_Name' | 'Deal_Name' | 'Product_Name' | 'Vendor_Name';
-
-type LocationType =
-	| 'Address'
-	| 'Billing_Address'
-	| 'Mailing_Address'
-	| 'Shipping_Address'
-	| 'Other_Address';
-
-type DateType =
-	| 'Date_of_Birth'
-	| 'Closing_Date'
-	| 'Due_Date'
-	| 'Invoice_Date'
-	| 'PO_Date'
-	| 'Valid_Till';
-
-export type AllFields = { [Date in DateType]?: string } & {
-	[Location in LocationType]?: { address_fields: { [key: string]: string } };
-} & { Account?: { subfields: { id: string; name: string } } } & {
-	[key in 'accountId' | 'contactId' | 'dealId']?: string;
-} & { customFields?: { customFields: Array<{ fieldId: string; value: string }> } } & {
-	Product_Details?: ProductDetails;
-} & IDataObject;
-
-export type ProductDetails = Array<{ id: string; quantity: number }>;
-
-export type ResourceItems = Array<{ [key: string]: string }>;
-
-// ----------------------------------------
-//         for resource loaders
-// ----------------------------------------
-
-export type LoadedAccounts = Array<{
-	Account_Name: string;
-	id: string;
-}>;
-
-export type LoadedContacts = Array<{
-	Full_Name: string;
-	id: string;
-}>;
-
-export type LoadedDeals = Array<{
-	Deal_Name: string;
-	id: string;
-}>;
-
-export type LoadedFields = {
-	fields: Array<{
-		field_label: string;
-		api_name: string;
-		custom_field: boolean;
-	}>;
-};
-
-export type LoadedVendors = Array<{
-	Vendor_Name: string;
-	id: string;
-}>;
-
-export type LoadedProducts = Array<{
-	Product_Name: string;
-	id: string;
-}>;
-
-export type LoadedLayouts = {
-	layouts: Array<{
-		sections: Array<{
-			api_name: string;
-			fields: Array<{
-				api_name: string;
-				pick_list_values: Array<{
-					display_value: string;
-					actual_value: string;
-				}>;
-			}>;
-		}>;
-	}>;
-};
diff --git a/packages/nodes-base/nodes/Zoho/types.ts b/packages/nodes-base/nodes/Zoho/types.ts
new file mode 100644
index 0000000000000..f3c07adc72127
--- /dev/null
+++ b/packages/nodes-base/nodes/Zoho/types.ts
@@ -0,0 +1,121 @@
+import type { IDataObject } from 'n8n-workflow';
+
+// ----------------------------------------
+//          for generic functions
+// ----------------------------------------
+
+type Resource =
+	| 'account'
+	| 'contact'
+	| 'deal'
+	| 'invoice'
+	| 'lead'
+	| 'product'
+	| 'quote'
+	| 'vendor';
+
+export type CamelCaseResource = Resource | 'purchaseOrder' | 'salesOrder';
+
+export type SnakeCaseResource = Resource | 'purchase_order' | 'sales_order';
+
+export type GetAllFilterOptions = {
+	fields: string[];
+	[otherOptions: string]: unknown;
+};
+
+// ----------------------------------------
+//               for auth
+// ----------------------------------------
+
+export type ZohoOAuth2ApiCredentials = {
+	oauthTokenData: {
+		api_domain: string;
+	};
+};
+
+// ----------------------------------------
+//         for field adjusters
+// ----------------------------------------
+
+export type IdType = 'accountId' | 'contactId' | 'dealId' | 'purchaseOrderId';
+
+export type NameType = 'Account_Name' | 'Full_Name' | 'Deal_Name' | 'Product_Name' | 'Vendor_Name';
+
+export type LocationType =
+	| 'Address'
+	| 'Billing_Address'
+	| 'Mailing_Address'
+	| 'Shipping_Address'
+	| 'Other_Address';
+
+export type DateType =
+	| 'Date_of_Birth'
+	| 'Closing_Date'
+	| 'Due_Date'
+	| 'Invoice_Date'
+	| 'PO_Date'
+	| 'Valid_Till';
+
+export type AllFields = { [Date in DateType]?: string } & {
+	[Location in LocationType]?: { address_fields: { [key: string]: string } };
+} & { Account?: { subfields: { id: string; name: string } } } & {
+	[key in 'accountId' | 'contactId' | 'dealId']?: string;
+} & { customFields?: { customFields: Array<{ fieldId: string; value: string }> } } & {
+	Product_Details?: ProductDetails;
+} & IDataObject;
+
+export type ProductDetails = Array<{ id: string; quantity: number }>;
+
+export type ResourceItems = Array<{ [key: string]: string }>;
+
+// ----------------------------------------
+//         for resource loaders
+// ----------------------------------------
+
+export type LoadedAccounts = Array<{
+	Account_Name: string;
+	id: string;
+}>;
+
+export type LoadedContacts = Array<{
+	Full_Name: string;
+	id: string;
+}>;
+
+export type LoadedDeals = Array<{
+	Deal_Name: string;
+	id: string;
+}>;
+
+export type LoadedFields = {
+	fields: Array<{
+		field_label: string;
+		api_name: string;
+		custom_field: boolean;
+	}>;
+};
+
+export type LoadedVendors = Array<{
+	Vendor_Name: string;
+	id: string;
+}>;
+
+export type LoadedProducts = Array<{
+	Product_Name: string;
+	id: string;
+}>;
+
+export type LoadedLayouts = {
+	layouts: Array<{
+		sections: Array<{
+			api_name: string;
+			fields: Array<{
+				api_name: string;
+				pick_list_values: Array<{
+					display_value: string;
+					actual_value: string;
+				}>;
+			}>;
+		}>;
+	}>;
+};
diff --git a/packages/nodes-base/nodes/Zoho/zoho.svg b/packages/nodes-base/nodes/Zoho/zoho.svg
index 203761c2702ed..44bdedddec216 100644
--- a/packages/nodes-base/nodes/Zoho/zoho.svg
+++ b/packages/nodes-base/nodes/Zoho/zoho.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 -30 100 100" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".5" y=".5"/><defs><linearGradient x1="50%" y1="1.43%" x2="50%" y2="96.98%" id="b"><stop stop-color="#ffe513" offset=".562%"/><stop stop-color="#fdb924" offset="100%"/></linearGradient><linearGradient x1="4.51%" y1="13.49%" x2="95.67%" y2="87.06%" id="c"><stop stop-color="#008cd2" offset=".562%"/><stop stop-color="#00649d" offset="100%"/></linearGradient><linearGradient x1="50%" y1="27.78%" x2="50%" y2="97.53%" id="d"><stop stop-color="#26a146" offset="0%"/><stop stop-color="#008a52" offset="100%"/></linearGradient><linearGradient x1="43.73%" y1="8.21%" x2="57.54%" y2="93.2%" id="e"><stop stop-color="#d92231" offset="0%"/><stop stop-color="#ba2234" offset="100%"/></linearGradient></defs><symbol id="a" overflow="visible"><g stroke="none" fill-rule="nonzero"><path d="M102.964 7.581v24.414l-3.379 3.298V11.402z" fill="#e79225"/><path d="M80.822 7.601l-3.499 3.801.181.241 21.94-.08.201-.161 3.318-3.821z" fill="#fff16d"/><path d="M77.323 11.402h22.322v23.911H77.323z" fill="url(#b)"/><path d="M96.246 20.009a8.84 8.84 0 00-1.971-2.976c-.825-.845-1.749-1.488-2.795-1.91-1.026-.422-2.132-.643-3.338-.643s-2.333.221-3.358.643c-1.046.422-1.971 1.066-2.795 1.91-.865.865-1.508 1.87-1.951 2.976s-.644 2.313-.644 3.64a9.8 9.8 0 00.664 3.62 8.95 8.95 0 001.951 3.017c.804.825 1.73 1.448 2.755 1.87s2.172.644 3.399.644c1.186 0 2.293-.221 3.318-.644s1.971-1.046 2.795-1.87c.865-.885 1.528-1.89 1.971-2.996s.664-2.333.664-3.62c0-1.347-.221-2.554-.664-3.66zm-4.605 7.883c-.865 1.026-2.011 1.549-3.499 1.549s-2.655-.523-3.519-1.549-1.287-2.453-1.287-4.263c0-1.85.442-3.278 1.287-4.324.865-1.046 2.011-1.549 3.519-1.549 1.488 0 2.634.523 3.499 1.549.845 1.046 1.287 2.474 1.287 4.324 0 1.81-.422 3.238-1.287 4.263z"/><path d="M75.131 5.591v.121l2.856 21.94-1.669 4.625-.221-.161-2.936-21.035.06-.281 1.83-5.088z" fill="#009ada"/><path d="M53.151 8.648l21.98-3.057-1.85 5.269-.261.282-20.552 3.017.101-3.761z" fill="#91c9ed"/><path d="M73.281 10.859l3.037 21.417-21.659 3.037-2.916-20.693 1.267-.985z" fill="url(#c)"/><path d="M69.601 14.962c-.101-.664-.322-1.166-.684-1.508a1.61 1.61 0 00-1.086-.402c-.1 0-.221 0-.342.02-.563.081-.985.342-1.247.764-.201.302-.281.684-.281 1.126 0 .161.02.342.04.523l.784 5.57-6.234.925-.784-5.57c-.1-.644-.322-1.146-.684-1.488a1.52 1.52 0 00-1.066-.422c-.101 0-.201 0-.302.02-.583.081-1.026.342-1.307.764-.201.302-.282.684-.282 1.126 0 .161.02.342.04.543l2.132 14.499c.1.664.322 1.166.724 1.508.302.261.664.382 1.106.382.121 0 .241 0 .362-.02.543-.081.945-.342 1.207-.764.181-.302.261-.664.261-1.086 0-.161-.02-.342-.04-.523l-.865-5.731 6.234-.925.865 5.731c.1.664.322 1.166.704 1.488a1.61 1.61 0 001.086.402c.101 0 .221 0 .342-.02.563-.081.985-.342 1.247-.764.181-.302.282-.664.282-1.106 0-.161-.02-.342-.04-.523z"/><path d="M32.578 0l-7.823 18.582 1.066 8.165.06-.02 8.788-19.768-.04-.422-1.89-6.274z" fill="#66bf6b"/><path d="M32.578 0l2.071 6.958 19.346 8.667.06-.04-1.649-6.516z" fill="#98d0a0"/><path d="M34.609 6.817l19.446 8.768-8.788 19.929-19.446-8.768z" fill="url(#d)"/><path d="M48.164 17.194c-.422-1.126-1.005-2.091-1.77-2.896a8.24 8.24 0 00-2.775-1.911 8.257 8.257 0 00-3.278-.684h-.06c-1.126 0-2.232.261-3.318.744a8.883 8.883 0 00-2.976 2.091c-.845.885-1.528 1.971-2.051 3.218a10.783 10.783 0 00-.865 3.7v.422a9.24 9.24 0 00.563 3.197c.402 1.106.985 2.051 1.75 2.856s1.709 1.448 2.836 1.91a8.1 8.1 0 003.258.684h.02c1.106 0 2.212-.241 3.298-.704a9.018 9.018 0 002.996-2.111c.845-.885 1.548-1.951 2.071-3.198s.804-2.474.865-3.7v-.362a8.7 8.7 0 00-.563-3.258zm-3.881 5.792c-.724 1.73-1.709 2.916-2.896 3.56-.644.342-1.307.523-1.971.523-.583 0-1.206-.141-1.83-.402-1.367-.583-2.212-1.508-2.574-2.835a5.25 5.25 0 01-.181-1.388c0-.965.241-2.031.724-3.177.744-1.77 1.73-2.976 2.916-3.64a3.968 3.968 0 011.971-.523c.603 0 1.207.141 1.85.402 1.347.583 2.192 1.508 2.554 2.835.121.422.181.885.181 1.367 0 1.006-.241 2.091-.744 3.278z"/><path d="M23.207 3.157l3.177 21.276-1.448 7.481-.201-.261-3.097-20.552v-.402l1.367-7.179z" fill="#760d16"/><path d="M0 14.157l1.508-7.521 21.699-3.479-1.468 7.662v.503L.261 14.358z" fill="#ef463e"/><path d="M21.739 10.819l3.197 21.095-21.477 3.358L0 14.157z" fill="url(#e)"/><path d="M19.427 28.556c-.161-.201-.402-.342-.684-.442s-.623-.141-1.046-.141c-.382 0-.824.04-1.307.121l-5.671.965c.06-.443.282-1.006.664-1.709.422-.784 1.066-1.73 1.89-2.815l.664-.865.463-.583c1.307-1.709 2.091-3.097 2.413-4.183a8.663 8.663 0 00.322-1.87c.02-.181.02-.342.02-.503a7.4 7.4 0 00-.121-1.327c-.06-.402-.161-.724-.302-.985s-.302-.463-.503-.583c-.221-.141-.563-.201-.985-.201-.342 0-.764.04-1.267.121L7.421 14.68c-.784.141-1.388.362-1.75.724a1.38 1.38 0 00-.442 1.046 2.07 2.07 0 00.02.342c.101.563.382.965.845 1.166.282.121.603.181 1.005.181.261 0 .563-.02.885-.08l5.47-.965c0 .101.02.201.02.282a2.87 2.87 0 01-.181 1.005c-.161.463-.563 1.106-1.227 1.931l-.845 1.046c-1.488 1.79-2.534 3.318-3.177 4.585a9.917 9.917 0 00-.945 2.594 7.23 7.23 0 00-.161 1.428c0 .322.02.643.081.945.08.442.181.804.322 1.086s.342.503.563.623.523.161.965.161c.543 0 1.287-.08 2.232-.241l5.953-1.026c1.046-.181 1.79-.442 2.212-.784a1.39 1.39 0 00.523-1.106c0-.121-.02-.241-.04-.362a1.333 1.333 0 00-.322-.704z"/></g></symbol></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round" viewBox="0 -30 100 100"><use xlink:href="#a" x=".5" y=".5"/><defs><linearGradient id="b" x1="50%" x2="50%" y1="1.43%" y2="96.98%"><stop offset=".562%" stop-color="#ffe513"/><stop offset="100%" stop-color="#fdb924"/></linearGradient><linearGradient id="c" x1="4.51%" x2="95.67%" y1="13.49%" y2="87.06%"><stop offset=".562%" stop-color="#008cd2"/><stop offset="100%" stop-color="#00649d"/></linearGradient><linearGradient id="d" x1="50%" x2="50%" y1="27.78%" y2="97.53%"><stop offset="0%" stop-color="#26a146"/><stop offset="100%" stop-color="#008a52"/></linearGradient><linearGradient id="e" x1="43.73%" x2="57.54%" y1="8.21%" y2="93.2%"><stop offset="0%" stop-color="#d92231"/><stop offset="100%" stop-color="#ba2234"/></linearGradient></defs><symbol id="a" overflow="visible"><g fill-rule="nonzero" stroke="none"><path fill="#e79225" d="M102.964 7.581v24.414l-3.379 3.298V11.402z"/><path fill="#fff16d" d="m80.822 7.601-3.499 3.801.181.241 21.94-.08.201-.161 3.318-3.821z"/><path fill="url(#b)" d="M77.323 11.402h22.322v23.911H77.323z"/><path d="M96.246 20.009a8.8 8.8 0 0 0-1.971-2.976c-.825-.845-1.749-1.488-2.795-1.91-1.026-.422-2.132-.643-3.338-.643s-2.333.221-3.358.643c-1.046.422-1.971 1.066-2.795 1.91-.865.865-1.508 1.87-1.951 2.976s-.644 2.313-.644 3.64a9.8 9.8 0 0 0 .664 3.62 8.95 8.95 0 0 0 1.951 3.017c.804.825 1.73 1.448 2.755 1.87s2.172.644 3.399.644c1.186 0 2.293-.221 3.318-.644s1.971-1.046 2.795-1.87c.865-.885 1.528-1.89 1.971-2.996s.664-2.333.664-3.62c0-1.347-.221-2.554-.664-3.66zm-4.605 7.883c-.865 1.026-2.011 1.549-3.499 1.549s-2.655-.523-3.519-1.549-1.287-2.453-1.287-4.263c0-1.85.442-3.278 1.287-4.324.865-1.046 2.011-1.549 3.519-1.549 1.488 0 2.634.523 3.499 1.549.845 1.046 1.287 2.474 1.287 4.324 0 1.81-.422 3.238-1.287 4.263"/><path fill="#009ada" d="M75.131 5.591v.121l2.856 21.94-1.669 4.625-.221-.161-2.936-21.035.06-.281 1.83-5.088z"/><path fill="#91c9ed" d="m53.151 8.648 21.98-3.057-1.85 5.269-.261.282-20.552 3.017.101-3.761z"/><path fill="url(#c)" d="m73.281 10.859 3.037 21.417-21.659 3.037-2.916-20.693 1.267-.985z"/><path d="M69.601 14.962c-.101-.664-.322-1.166-.684-1.508a1.6 1.6 0 0 0-1.086-.402c-.1 0-.221 0-.342.02-.563.081-.985.342-1.247.764-.201.302-.281.684-.281 1.126 0 .161.02.342.04.523l.784 5.57-6.234.925-.784-5.57c-.1-.644-.322-1.146-.684-1.488a1.52 1.52 0 0 0-1.066-.422c-.101 0-.201 0-.302.02-.583.081-1.026.342-1.307.764-.201.302-.282.684-.282 1.126 0 .161.02.342.04.543l2.132 14.499c.1.664.322 1.166.724 1.508.302.261.664.382 1.106.382.121 0 .241 0 .362-.02.543-.081.945-.342 1.207-.764.181-.302.261-.664.261-1.086 0-.161-.02-.342-.04-.523l-.865-5.731 6.234-.925.865 5.731c.1.664.322 1.166.704 1.488a1.6 1.6 0 0 0 1.086.402c.101 0 .221 0 .342-.02.563-.081.985-.342 1.247-.764.181-.302.282-.664.282-1.106 0-.161-.02-.342-.04-.523z"/><path fill="#66bf6b" d="m32.578 0-7.823 18.582 1.066 8.165.06-.02 8.788-19.768-.04-.422-1.89-6.274z"/><path fill="#98d0a0" d="m32.578 0 2.071 6.958 19.346 8.667.06-.04-1.649-6.516z"/><path fill="url(#d)" d="m34.609 6.817 19.446 8.768-8.788 19.929-19.446-8.768z"/><path d="M48.164 17.194c-.422-1.126-1.005-2.091-1.77-2.896a8.2 8.2 0 0 0-2.775-1.911 8.3 8.3 0 0 0-3.278-.684h-.06c-1.126 0-2.232.261-3.318.744a8.9 8.9 0 0 0-2.976 2.091c-.845.885-1.528 1.971-2.051 3.218a10.8 10.8 0 0 0-.865 3.7v.422a9.2 9.2 0 0 0 .563 3.197c.402 1.106.985 2.051 1.75 2.856s1.709 1.448 2.836 1.91a8.1 8.1 0 0 0 3.258.684h.02c1.106 0 2.212-.241 3.298-.704a9 9 0 0 0 2.996-2.111c.845-.885 1.548-1.951 2.071-3.198s.804-2.474.865-3.7v-.362a8.7 8.7 0 0 0-.563-3.258zm-3.881 5.792c-.724 1.73-1.709 2.916-2.896 3.56-.644.342-1.307.523-1.971.523-.583 0-1.206-.141-1.83-.402-1.367-.583-2.212-1.508-2.574-2.835a5.3 5.3 0 0 1-.181-1.388c0-.965.241-2.031.724-3.177.744-1.77 1.73-2.976 2.916-3.64a3.97 3.97 0 0 1 1.971-.523c.603 0 1.207.141 1.85.402 1.347.583 2.192 1.508 2.554 2.835.121.422.181.885.181 1.367 0 1.006-.241 2.091-.744 3.278"/><path fill="#760d16" d="m23.207 3.157 3.177 21.276-1.448 7.481-.201-.261-3.097-20.552v-.402l1.367-7.179z"/><path fill="#ef463e" d="m0 14.157 1.508-7.521 21.699-3.479-1.468 7.662v.503L.261 14.358z"/><path fill="url(#e)" d="m21.739 10.819 3.197 21.095-21.477 3.358L0 14.157z"/><path d="M19.427 28.556c-.161-.201-.402-.342-.684-.442s-.623-.141-1.046-.141c-.382 0-.824.04-1.307.121l-5.671.965c.06-.443.282-1.006.664-1.709.422-.784 1.066-1.73 1.89-2.815l.664-.865.463-.583c1.307-1.709 2.091-3.097 2.413-4.183a8.7 8.7 0 0 0 .322-1.87c.02-.181.02-.342.02-.503a7.4 7.4 0 0 0-.121-1.327c-.06-.402-.161-.724-.302-.985s-.302-.463-.503-.583c-.221-.141-.563-.201-.985-.201q-.513 0-1.267.121L7.421 14.68c-.784.141-1.388.362-1.75.724a1.38 1.38 0 0 0-.442 1.046 2 2 0 0 0 .02.342c.101.563.382.965.845 1.166.282.121.603.181 1.005.181.261 0 .563-.02.885-.08l5.47-.965c0 .101.02.201.02.282a2.9 2.9 0 0 1-.181 1.005c-.161.463-.563 1.106-1.227 1.931l-.845 1.046c-1.488 1.79-2.534 3.318-3.177 4.585a10 10 0 0 0-.945 2.594 7.2 7.2 0 0 0-.161 1.428c0 .322.02.643.081.945.08.442.181.804.322 1.086s.342.503.563.623.523.161.965.161q.814 0 2.232-.241l5.953-1.026c1.046-.181 1.79-.442 2.212-.784a1.39 1.39 0 0 0 .523-1.106c0-.121-.02-.241-.04-.362a1.33 1.33 0 0 0-.322-.704z"/></g></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Zoom/GenericFunctions.ts b/packages/nodes-base/nodes/Zoom/GenericFunctions.ts
index faa63161ed3f6..e02bbf642ac5d 100644
--- a/packages/nodes-base/nodes/Zoom/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Zoom/GenericFunctions.ts
@@ -1,26 +1,25 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	ILoadOptionsFunctions,
 	IDataObject,
 	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function zoomApiRequest(
-	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
-	method: string,
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
 	resource: string,
 	body: object = {},
-	query: object = {},
+	query: IDataObject = {},
 	headers: IDataObject | undefined = undefined,
 	option: IDataObject = {},
 ) {
 	const authenticationMethod = this.getNodeParameter('authentication', 0, 'accessToken') as string;
 
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		method,
 		headers: headers || {
 			'Content-Type': 'application/json',
@@ -50,7 +49,7 @@ export async function zoomApiRequest(
 }
 
 async function wait() {
-	return new Promise((resolve, _reject) => {
+	return await new Promise((resolve, _reject) => {
 		setTimeout(() => {
 			resolve(true);
 		}, 1000);
@@ -60,7 +59,7 @@ async function wait() {
 export async function zoomApiRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
 	propertyName: string,
-	method: string,
+	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject = {},
 	query: IDataObject = {},
diff --git a/packages/nodes-base/nodes/Zoom/Zoom.node.ts b/packages/nodes-base/nodes/Zoom/Zoom.node.ts
index c9e2331251219..cbc3630726b4d 100644
--- a/packages/nodes-base/nodes/Zoom/Zoom.node.ts
+++ b/packages/nodes-base/nodes/Zoom/Zoom.node.ts
@@ -8,6 +8,7 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
+import moment from 'moment-timezone';
 import { zoomApiRequest, zoomApiRequestAllItems } from './GenericFunctions';
 
 import { meetingFields, meetingOperations } from './MeetingDescription';
@@ -22,8 +23,6 @@ import { meetingFields, meetingOperations } from './MeetingDescription';
 // 	webinarFields,
 // } from './WebinarDescription';
 
-import moment from 'moment-timezone';
-
 interface Settings {
 	host_video?: boolean;
 	participant_video?: boolean;
@@ -792,6 +791,6 @@ export class Zoom implements INodeType {
 			}
 		}
 
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Zoom/zoom.svg b/packages/nodes-base/nodes/Zoom/zoom.svg
index 6120c9137853c..58643b49b8ea3 100644
--- a/packages/nodes-base/nodes/Zoom/zoom.svg
+++ b/packages/nodes-base/nodes/Zoom/zoom.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 65 65" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><g stroke="none" fill-rule="nonzero"><path d="M0 32C0 14.272 14.272 0 32 0s32 14.272 32 32-14.272 32-32 32S0 49.728 0 32z"/><path d="M3.137 32A28.8 28.8 0 0132 3.137 28.8 28.8 0 0160.862 32 28.8 28.8 0 0132 60.862 28.8 28.8 0 013.137 32z" fill="#4a8cff"/><path d="M40.784 28.254l8.157-5.961c.712-.58 1.255-.445 1.255.627v18.177c0 1.205-.678 1.067-1.255.627l-8.157-5.961zm-27.608-5.289v13.553a5.55 5.55 0 005.575 5.522h19.765a1.01 1.01 0 001.013-1.004V27.483a5.55 5.55 0 00-5.575-5.522H14.189a1.01 1.01 0 00-1.013 1.004z"/></g></symbol></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round" viewBox="0 0 65 65"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><g fill-rule="nonzero" stroke="none"><path d="M0 32C0 14.272 14.272 0 32 0s32 14.272 32 32-14.272 32-32 32S0 49.728 0 32"/><path fill="#4a8cff" d="M3.137 32A28.8 28.8 0 0 1 32 3.137 28.8 28.8 0 0 1 60.862 32 28.8 28.8 0 0 1 32 60.862 28.8 28.8 0 0 1 3.137 32"/><path d="m40.784 28.254 8.157-5.961c.712-.58 1.255-.445 1.255.627v18.177c0 1.205-.678 1.067-1.255.627l-8.157-5.961zm-27.608-5.289v13.553a5.55 5.55 0 0 0 5.575 5.522h19.765a1.01 1.01 0 0 0 1.013-1.004V27.483a5.55 5.55 0 0 0-5.575-5.522H14.189a1.01 1.01 0 0 0-1.013 1.004"/></g></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Zulip/GenericFunctions.ts b/packages/nodes-base/nodes/Zulip/GenericFunctions.ts
index f8c7f06be4ba1..12ef28ab5b329 100644
--- a/packages/nodes-base/nodes/Zulip/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Zulip/GenericFunctions.ts
@@ -1,5 +1,3 @@
-import type { OptionsWithUri } from 'request';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -7,6 +5,8 @@ import type {
 	IHookFunctions,
 	IWebhookFunctions,
 	JsonObject,
+	IHttpRequestMethods,
+	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
@@ -16,7 +16,7 @@ import type { IUser } from './UserInterface';
 
 export async function zulipApiRequest(
 	this: IExecuteFunctions | IWebhookFunctions | IHookFunctions | ILoadOptionsFunctions,
-	method: string,
+	method: IHttpRequestMethods,
 	resource: string,
 
 	body: IMessage | IStream | IUser = {},
@@ -26,9 +26,9 @@ export async function zulipApiRequest(
 ) {
 	const credentials = await this.getCredentials('zulipApi');
 
-	const endpoint = `${credentials.url}/api/v1`;
+	const endpoint = `${credentials.url.toString().replace(new RegExp('/$'), '')}/api/v1`;
 
-	let options: OptionsWithUri = {
+	let options: IRequestOptions = {
 		auth: {
 			user: credentials.email as string,
 			password: credentials.apiKey as string,
@@ -37,7 +37,7 @@ export async function zulipApiRequest(
 			'Content-Type': 'application/x-www-form-urlencoded',
 		},
 		method,
-		form: body,
+		form: body as IDataObject,
 		qs: query,
 		uri: uri || `${endpoint}${resource}`,
 		json: true,
diff --git a/packages/nodes-base/nodes/Zulip/MessageDescription.ts b/packages/nodes-base/nodes/Zulip/MessageDescription.ts
index 786cf7c7450e8..c8f0efc3393d0 100644
--- a/packages/nodes-base/nodes/Zulip/MessageDescription.ts
+++ b/packages/nodes-base/nodes/Zulip/MessageDescription.ts
@@ -249,7 +249,7 @@ export const messageFields: INodeProperties[] = [
 	/*                                 message:updateFile                         */
 	/* -------------------------------------------------------------------------- */
 	{
-		displayName: 'Binary Property',
+		displayName: 'Put Output File in Field',
 		name: 'dataBinaryProperty',
 		type: 'string',
 		required: true,
@@ -260,6 +260,6 @@ export const messageFields: INodeProperties[] = [
 				operation: ['updateFile'],
 			},
 		},
-		description: 'Name of the binary property to which to write the data of the read file',
+		hint: 'The name of the output binary field to put the file in',
 	},
 ];
diff --git a/packages/nodes-base/nodes/Zulip/Zulip.node.ts b/packages/nodes-base/nodes/Zulip/Zulip.node.ts
index cc0cbcd779619..0b7c4b0915fb4 100644
--- a/packages/nodes-base/nodes/Zulip/Zulip.node.ts
+++ b/packages/nodes-base/nodes/Zulip/Zulip.node.ts
@@ -8,10 +8,10 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { 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 { snakeCase } from 'change-case';
 import { streamFields, streamOperations } from './StreamDescription';
 import { userFields, userOperations } from './UserDescription';
 import type { IPrincipal, IStream } from './StreamInterface';
@@ -468,6 +468,6 @@ export class Zulip implements INodeType {
 				throw error;
 			}
 		}
-		return this.prepareOutputData(returnData);
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Zulip/zulip.svg b/packages/nodes-base/nodes/Zulip/zulip.svg
index bea31eed7ce17..5e398ae55d3eb 100644
--- a/packages/nodes-base/nodes/Zulip/zulip.svg
+++ b/packages/nodes-base/nodes/Zulip/zulip.svg
@@ -1 +1 @@
-<svg width="256" height="256" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid"><defs><linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="a"><stop stop-color="#24ADFF" offset="0%"/><stop stop-color="#7B71FF" offset="100%"/></linearGradient></defs><path d="M128 0c70.692 0 128 57.308 128 128 0 70.692-57.308 128-128 128C57.308 256 0 198.692 0 128 0 57.308 57.308 0 128 0zm-6.32 118.222l-45.892 40.979c-4.728 3.72-7.83 9.86-7.83 16.766 0 11.279 8.274 20.508 18.386 20.508h86.247c10.112 0 18.386-9.23 18.386-20.508 0-11.28-8.274-20.507-18.386-20.507H107.3c-.968 0-1.58-1.16-1.108-2.104l16.833-33.703c.615-.983-.493-2.161-1.345-1.43zm50.91-58.86H86.345c-10.112 0-18.386 9.227-18.386 20.508 0 11.279 8.274 20.508 18.386 20.508h65.292c.968 0 1.58 1.16 1.108 2.103l-16.834 33.704c-.615.983.494 2.161 1.346 1.43l45.892-40.984c4.727-3.723 7.829-9.86 7.829-16.767 0-11.278-8.274-20.507-18.386-20.501z" fill="url(#a)"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" preserveAspectRatio="xMidYMid"><defs><linearGradient id="a" x1="50%" x2="50%" y1="0%" y2="100%"><stop offset="0%" stop-color="#24ADFF"/><stop offset="100%" stop-color="#7B71FF"/></linearGradient></defs><path fill="url(#a)" d="M128 0c70.692 0 128 57.308 128 128s-57.308 128-128 128S0 198.692 0 128 57.308 0 128 0m-6.32 118.222-45.892 40.979c-4.728 3.72-7.83 9.86-7.83 16.766 0 11.279 8.274 20.508 18.386 20.508h86.247c10.112 0 18.386-9.23 18.386-20.508 0-11.28-8.274-20.507-18.386-20.507H107.3c-.968 0-1.58-1.16-1.108-2.104l16.833-33.703c.615-.983-.493-2.161-1.345-1.43zm50.91-58.86H86.345c-10.112 0-18.386 9.227-18.386 20.508 0 11.279 8.274 20.508 18.386 20.508h65.292c.968 0 1.58 1.16 1.108 2.103l-16.834 33.704c-.615.983.494 2.161 1.346 1.43l45.892-40.984c4.727-3.723 7.829-9.86 7.829-16.767 0-11.278-8.274-20.507-18.386-20.501z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index d6ed6cc6a968c..c656289d6e0d3 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-nodes-base",
-  "version": "0.223.0",
+  "version": "1.41.0",
   "description": "Base nodes of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",
@@ -17,13 +17,12 @@
     "clean": "rimraf dist .turbo",
     "dev": "pnpm watch",
     "typecheck": "tsc",
-    "build": "tsc -p tsconfig.build.json && gulp build:icons && gulp build:translations && pnpm build:metadata",
-    "build:translations": "gulp build:translations",
+    "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",
     "format": "prettier --write . --ignore-path ../../.prettierignore",
-    "lint": "eslint --quiet nodes credentials",
-    "lintfix": "eslint nodes credentials --fix",
-    "watch": "tsc-watch -p tsconfig.build.json --onSuccess \"pnpm n8n-generate-ui-types\"",
+    "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\"",
     "test": "jest"
   },
   "files": [
@@ -39,10 +38,14 @@
       "dist/credentials/AffinityApi.credentials.js",
       "dist/credentials/AgileCrmApi.credentials.js",
       "dist/credentials/AirtableApi.credentials.js",
+      "dist/credentials/AirtableOAuth2Api.credentials.js",
+      "dist/credentials/AirtableTokenApi.credentials.js",
+      "dist/credentials/AlienVaultApi.credentials.js",
       "dist/credentials/Amqp.credentials.js",
       "dist/credentials/ApiTemplateIoApi.credentials.js",
       "dist/credentials/AsanaApi.credentials.js",
       "dist/credentials/AsanaOAuth2Api.credentials.js",
+      "dist/credentials/Auth0ManagementApi.credentials.js",
       "dist/credentials/AutomizyApi.credentials.js",
       "dist/credentials/AutopilotApi.credentials.js",
       "dist/credentials/Aws.credentials.js",
@@ -59,9 +62,13 @@
       "dist/credentials/BubbleApi.credentials.js",
       "dist/credentials/CalApi.credentials.js",
       "dist/credentials/CalendlyApi.credentials.js",
+      "dist/credentials/CarbonBlackApi.credentials.js",
       "dist/credentials/ChargebeeApi.credentials.js",
       "dist/credentials/CircleCiApi.credentials.js",
+      "dist/credentials/CiscoMerakiApi.credentials.js",
+      "dist/credentials/CiscoSecureEndpointApi.credentials.js",
       "dist/credentials/CiscoWebexOAuth2Api.credentials.js",
+      "dist/credentials/CiscoUmbrellaApi.credentials.js",
       "dist/credentials/CitrixAdcApi.credentials.js",
       "dist/credentials/CloudflareApi.credentials.js",
       "dist/credentials/ClearbitApi.credentials.js",
@@ -75,10 +82,15 @@
       "dist/credentials/CopperApi.credentials.js",
       "dist/credentials/CortexApi.credentials.js",
       "dist/credentials/CrateDb.credentials.js",
+      "dist/credentials/CrowdStrikeOAuth2Api.credentials.js",
+      "dist/credentials/CrowdDevApi.credentials.js",
       "dist/credentials/CustomerIoApi.credentials.js",
       "dist/credentials/DeepLApi.credentials.js",
       "dist/credentials/DemioApi.credentials.js",
       "dist/credentials/DhlApi.credentials.js",
+      "dist/credentials/DiscordBotApi.credentials.js",
+      "dist/credentials/DiscordOAuth2Api.credentials.js",
+      "dist/credentials/DiscordWebhookApi.credentials.js",
       "dist/credentials/DiscourseApi.credentials.js",
       "dist/credentials/DisqusApi.credentials.js",
       "dist/credentials/DriftApi.credentials.js",
@@ -93,14 +105,17 @@
       "dist/credentials/ERPNextApi.credentials.js",
       "dist/credentials/EventbriteApi.credentials.js",
       "dist/credentials/EventbriteOAuth2Api.credentials.js",
+      "dist/credentials/F5BigIpApi.credentials.js",
       "dist/credentials/FacebookGraphApi.credentials.js",
       "dist/credentials/FacebookGraphAppApi.credentials.js",
+      "dist/credentials/FacebookLeadAdsOAuth2Api.credentials.js",
       "dist/credentials/FigmaApi.credentials.js",
       "dist/credentials/FileMaker.credentials.js",
       "dist/credentials/FlowApi.credentials.js",
       "dist/credentials/FormIoApi.credentials.js",
       "dist/credentials/FormstackApi.credentials.js",
       "dist/credentials/FormstackOAuth2Api.credentials.js",
+      "dist/credentials/FortiGateApi.credentials.js",
       "dist/credentials/FreshdeskApi.credentials.js",
       "dist/credentials/FreshserviceApi.credentials.js",
       "dist/credentials/FreshworksCrmApi.credentials.js",
@@ -150,14 +165,18 @@
       "dist/credentials/HttpBasicAuth.credentials.js",
       "dist/credentials/HttpDigestAuth.credentials.js",
       "dist/credentials/HttpHeaderAuth.credentials.js",
+      "dist/credentials/HttpCustomAuth.credentials.js",
       "dist/credentials/HttpQueryAuth.credentials.js",
+      "dist/credentials/HttpSslAuth.credentials.js",
       "dist/credentials/HubspotApi.credentials.js",
       "dist/credentials/HubspotAppToken.credentials.js",
       "dist/credentials/HubspotDeveloperApi.credentials.js",
       "dist/credentials/HubspotOAuth2Api.credentials.js",
       "dist/credentials/HumanticAiApi.credentials.js",
       "dist/credentials/HunterApi.credentials.js",
+      "dist/credentials/HybridAnalysisApi.credentials.js",
       "dist/credentials/Imap.credentials.js",
+      "dist/credentials/ImpervaWafApi.credentials.js",
       "dist/credentials/IntercomApi.credentials.js",
       "dist/credentials/InvoiceNinjaApi.credentials.js",
       "dist/credentials/IterableApi.credentials.js",
@@ -165,15 +184,21 @@
       "dist/credentials/JiraSoftwareCloudApi.credentials.js",
       "dist/credentials/JiraSoftwareServerApi.credentials.js",
       "dist/credentials/JotFormApi.credentials.js",
+      "dist/credentials/JwtAuth.credentials.js",
       "dist/credentials/Kafka.credentials.js",
       "dist/credentials/KeapOAuth2Api.credentials.js",
+      "dist/credentials/KibanaApi.credentials.js",
       "dist/credentials/KitemakerApi.credentials.js",
       "dist/credentials/KoBoToolboxApi.credentials.js",
+      "dist/credentials/Ldap.credentials.js",
       "dist/credentials/LemlistApi.credentials.js",
       "dist/credentials/LinearApi.credentials.js",
+      "dist/credentials/LinearOAuth2Api.credentials.js",
       "dist/credentials/LineNotifyOAuth2Api.credentials.js",
       "dist/credentials/LingvaNexApi.credentials.js",
+      "dist/credentials/LinkedInCommunityManagementOAuth2Api.credentials.js",
       "dist/credentials/LinkedInOAuth2Api.credentials.js",
+      "dist/credentials/LoneScaleApi.credentials.js",
       "dist/credentials/Magento2Api.credentials.js",
       "dist/credentials/MailcheckApi.credentials.js",
       "dist/credentials/MailchimpApi.credentials.js",
@@ -194,6 +219,7 @@
       "dist/credentials/MessageBirdApi.credentials.js",
       "dist/credentials/MetabaseApi.credentials.js",
       "dist/credentials/MicrosoftDynamicsOAuth2Api.credentials.js",
+      "dist/credentials/MicrosoftEntraOAuth2Api.credentials.js",
       "dist/credentials/MicrosoftExcelOAuth2Api.credentials.js",
       "dist/credentials/MicrosoftGraphSecurityOAuth2Api.credentials.js",
       "dist/credentials/MicrosoftOAuth2Api.credentials.js",
@@ -205,6 +231,7 @@
       "dist/credentials/MindeeInvoiceApi.credentials.js",
       "dist/credentials/MindeeReceiptApi.credentials.js",
       "dist/credentials/MispApi.credentials.js",
+      "dist/credentials/MistApi.credentials.js",
       "dist/credentials/MoceanApi.credentials.js",
       "dist/credentials/MondayComApi.credentials.js",
       "dist/credentials/MondayComOAuth2Api.credentials.js",
@@ -222,12 +249,15 @@
       "dist/credentials/NocoDbApiToken.credentials.js",
       "dist/credentials/NotionApi.credentials.js",
       "dist/credentials/NotionOAuth2Api.credentials.js",
+      "dist/credentials/NpmApi.credentials.js",
       "dist/credentials/OAuth1Api.credentials.js",
       "dist/credentials/OAuth2Api.credentials.js",
       "dist/credentials/OdooApi.credentials.js",
+      "dist/credentials/OktaApi.credentials.js",
       "dist/credentials/OneSimpleApi.credentials.js",
       "dist/credentials/OnfleetApi.credentials.js",
       "dist/credentials/OpenAiApi.credentials.js",
+      "dist/credentials/OpenCTIApi.credentials.js",
       "dist/credentials/OpenWeatherMapApi.credentials.js",
       "dist/credentials/OrbitApi.credentials.js",
       "dist/credentials/OuraApi.credentials.js",
@@ -248,11 +278,14 @@
       "dist/credentials/PushbulletOAuth2Api.credentials.js",
       "dist/credentials/PushcutApi.credentials.js",
       "dist/credentials/PushoverApi.credentials.js",
+      "dist/credentials/QRadarApi.credentials.js",
+      "dist/credentials/QualysApi.credentials.js",
       "dist/credentials/QuestDb.credentials.js",
       "dist/credentials/QuickBaseApi.credentials.js",
       "dist/credentials/QuickBooksOAuth2Api.credentials.js",
       "dist/credentials/RabbitMQ.credentials.js",
       "dist/credentials/RaindropOAuth2Api.credentials.js",
+      "dist/credentials/RecordedFutureApi.credentials.js",
       "dist/credentials/RedditOAuth2Api.credentials.js",
       "dist/credentials/Redis.credentials.js",
       "dist/credentials/RocketchatApi.credentials.js",
@@ -264,8 +297,9 @@
       "dist/credentials/SeaTableApi.credentials.js",
       "dist/credentials/SecurityScorecardApi.credentials.js",
       "dist/credentials/SegmentApi.credentials.js",
+      "dist/credentials/SekoiaApi.credentials.js",
       "dist/credentials/SendGridApi.credentials.js",
-      "dist/credentials/SendInBlueApi.credentials.js",
+      "dist/credentials/BrevoApi.credentials.js",
       "dist/credentials/SendyApi.credentials.js",
       "dist/credentials/SentryIoApi.credentials.js",
       "dist/credentials/SentryIoOAuth2Api.credentials.js",
@@ -285,12 +319,14 @@
       "dist/credentials/SplunkApi.credentials.js",
       "dist/credentials/SpontitApi.credentials.js",
       "dist/credentials/SpotifyOAuth2Api.credentials.js",
+      "dist/credentials/ShufflerApi.credentials.js",
       "dist/credentials/SshPassword.credentials.js",
       "dist/credentials/SshPrivateKey.credentials.js",
       "dist/credentials/StackbyApi.credentials.js",
       "dist/credentials/StoryblokContentApi.credentials.js",
       "dist/credentials/StoryblokManagementApi.credentials.js",
       "dist/credentials/StrapiApi.credentials.js",
+      "dist/credentials/StrapiTokenApi.credentials.js",
       "dist/credentials/StravaOAuth2Api.credentials.js",
       "dist/credentials/StripeApi.credentials.js",
       "dist/credentials/SupabaseApi.credentials.js",
@@ -300,6 +336,7 @@
       "dist/credentials/TaigaApi.credentials.js",
       "dist/credentials/TapfiliateApi.credentials.js",
       "dist/credentials/TelegramApi.credentials.js",
+      "dist/credentials/TheHiveProjectApi.credentials.js",
       "dist/credentials/TheHiveApi.credentials.js",
       "dist/credentials/TimescaleDb.credentials.js",
       "dist/credentials/TodoistApi.credentials.js",
@@ -307,12 +344,14 @@
       "dist/credentials/TogglApi.credentials.js",
       "dist/credentials/TotpApi.credentials.js",
       "dist/credentials/TravisCiApi.credentials.js",
+      "dist/credentials/TrellixEpoApi.credentials.js",
       "dist/credentials/TrelloApi.credentials.js",
       "dist/credentials/TwakeCloudApi.credentials.js",
       "dist/credentials/TwakeServerApi.credentials.js",
       "dist/credentials/TwilioApi.credentials.js",
       "dist/credentials/TwistOAuth2Api.credentials.js",
       "dist/credentials/TwitterOAuth1Api.credentials.js",
+      "dist/credentials/TwitterOAuth2Api.credentials.js",
       "dist/credentials/TypeformApi.credentials.js",
       "dist/credentials/TypeformOAuth2Api.credentials.js",
       "dist/credentials/UnleashedSoftwareApi.credentials.js",
@@ -321,6 +360,7 @@
       "dist/credentials/UptimeRobotApi.credentials.js",
       "dist/credentials/UrlScanIoApi.credentials.js",
       "dist/credentials/VeroApi.credentials.js",
+      "dist/credentials/VirusTotalApi.credentials.js",
       "dist/credentials/VonageApi.credentials.js",
       "dist/credentials/VenafiTlsProtectCloudApi.credentials.js",
       "dist/credentials/VenafiTlsProtectDatacenterApi.credentials.js",
@@ -328,6 +368,7 @@
       "dist/credentials/WebflowOAuth2Api.credentials.js",
       "dist/credentials/WekanApi.credentials.js",
       "dist/credentials/WhatsAppApi.credentials.js",
+      "dist/credentials/WhatsAppTriggerApi.credentials.js",
       "dist/credentials/WiseApi.credentials.js",
       "dist/credentials/WooCommerceApi.credentials.js",
       "dist/credentials/WordpressApi.credentials.js",
@@ -343,6 +384,7 @@
       "dist/credentials/ZohoOAuth2Api.credentials.js",
       "dist/credentials/ZoomApi.credentials.js",
       "dist/credentials/ZoomOAuth2Api.credentials.js",
+      "dist/credentials/ZscalerZiaApi.credentials.js",
       "dist/credentials/ZulipApi.credentials.js"
     ],
     "nodes": [
@@ -416,10 +458,13 @@
       "dist/nodes/Cortex/Cortex.node.js",
       "dist/nodes/CrateDb/CrateDb.node.js",
       "dist/nodes/Cron/Cron.node.js",
+      "dist/nodes/CrowdDev/CrowdDev.node.js",
+      "dist/nodes/CrowdDev/CrowdDevTrigger.node.js",
       "dist/nodes/Crypto/Crypto.node.js",
       "dist/nodes/CustomerIo/CustomerIo.node.js",
       "dist/nodes/CustomerIo/CustomerIoTrigger.node.js",
       "dist/nodes/DateTime/DateTime.node.js",
+      "dist/nodes/DebugHelper/DebugHelper.node.js",
       "dist/nodes/DeepL/DeepL.node.js",
       "dist/nodes/Demio/Demio.node.js",
       "dist/nodes/Dhl/Dhl.node.js",
@@ -430,6 +475,7 @@
       "dist/nodes/Dropbox/Dropbox.node.js",
       "dist/nodes/Dropcontact/Dropcontact.node.js",
       "dist/nodes/EditImage/EditImage.node.js",
+      "dist/nodes/E2eTest/E2eTest.node.js",
       "dist/nodes/Egoi/Egoi.node.js",
       "dist/nodes/Elastic/Elasticsearch/Elasticsearch.node.js",
       "dist/nodes/Elastic/ElasticSecurity/ElasticSecurity.node.js",
@@ -443,13 +489,19 @@
       "dist/nodes/ExecuteCommand/ExecuteCommand.node.js",
       "dist/nodes/ExecuteWorkflow/ExecuteWorkflow.node.js",
       "dist/nodes/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.js",
+      "dist/nodes/ExecutionData/ExecutionData.node.js",
       "dist/nodes/Facebook/FacebookGraphApi.node.js",
       "dist/nodes/Facebook/FacebookTrigger.node.js",
+      "dist/nodes/FacebookLeadAds/FacebookLeadAdsTrigger.node.js",
       "dist/nodes/Figma/FigmaTrigger.node.js",
       "dist/nodes/FileMaker/FileMaker.node.js",
+      "dist/nodes/Files/ReadWriteFile/ReadWriteFile.node.js",
+      "dist/nodes/Files/ConvertToFile/ConvertToFile.node.js",
+      "dist/nodes/Files/ExtractFromFile/ExtractFromFile.node.js",
       "dist/nodes/Filter/Filter.node.js",
       "dist/nodes/Flow/Flow.node.js",
       "dist/nodes/Flow/FlowTrigger.node.js",
+      "dist/nodes/Form/FormTrigger.node.js",
       "dist/nodes/FormIo/FormIoTrigger.node.js",
       "dist/nodes/Formstack/FormstackTrigger.node.js",
       "dist/nodes/Freshdesk/Freshdesk.node.js",
@@ -523,6 +575,7 @@
       "dist/nodes/Jira/Jira.node.js",
       "dist/nodes/Jira/JiraTrigger.node.js",
       "dist/nodes/JotForm/JotFormTrigger.node.js",
+      "dist/nodes/Jwt/Jwt.node.js",
       "dist/nodes/Kafka/Kafka.node.js",
       "dist/nodes/Kafka/KafkaTrigger.node.js",
       "dist/nodes/Keap/Keap.node.js",
@@ -530,6 +583,7 @@
       "dist/nodes/Kitemaker/Kitemaker.node.js",
       "dist/nodes/KoBoToolbox/KoBoToolbox.node.js",
       "dist/nodes/KoBoToolbox/KoBoToolboxTrigger.node.js",
+      "dist/nodes/Ldap/Ldap.node.js",
       "dist/nodes/Lemlist/Lemlist.node.js",
       "dist/nodes/Lemlist/LemlistTrigger.node.js",
       "dist/nodes/Line/Line.node.js",
@@ -538,6 +592,8 @@
       "dist/nodes/LingvaNex/LingvaNex.node.js",
       "dist/nodes/LinkedIn/LinkedIn.node.js",
       "dist/nodes/LocalFileTrigger/LocalFileTrigger.node.js",
+      "dist/nodes/LoneScale/LoneScaleTrigger.node.js",
+      "dist/nodes/LoneScale/LoneScale.node.js",
       "dist/nodes/Magento/Magento2.node.js",
       "dist/nodes/Mailcheck/Mailcheck.node.js",
       "dist/nodes/Mailchimp/Mailchimp.node.js",
@@ -563,7 +619,9 @@
       "dist/nodes/Microsoft/Excel/MicrosoftExcel.node.js",
       "dist/nodes/Microsoft/GraphSecurity/MicrosoftGraphSecurity.node.js",
       "dist/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.js",
+      "dist/nodes/Microsoft/OneDrive/MicrosoftOneDriveTrigger.node.js",
       "dist/nodes/Microsoft/Outlook/MicrosoftOutlook.node.js",
+      "dist/nodes/Microsoft/Outlook/MicrosoftOutlookTrigger.node.js",
       "dist/nodes/Microsoft/Sql/MicrosoftSql.node.js",
       "dist/nodes/Microsoft/Teams/MicrosoftTeams.node.js",
       "dist/nodes/Microsoft/ToDo/MicrosoftToDo.node.js",
@@ -588,14 +646,15 @@
       "dist/nodes/NextCloud/NextCloud.node.js",
       "dist/nodes/NocoDB/NocoDB.node.js",
       "dist/nodes/NocoDbHttpRequest/NocoDbHttpRequest.node.js",
-      "dist/nodes/SendInBlue/SendInBlue.node.js",
-      "dist/nodes/SendInBlue/SendInBlueTrigger.node.js",
+      "dist/nodes/Brevo/Brevo.node.js",
+      "dist/nodes/Brevo/BrevoTrigger.node.js",
       "dist/nodes/StickyNote/StickyNote.node.js",
       "dist/nodes/NoOp/NoOp.node.js",
       "dist/nodes/Onfleet/Onfleet.node.js",
       "dist/nodes/Onfleet/OnfleetTrigger.node.js",
       "dist/nodes/Notion/Notion.node.js",
       "dist/nodes/Notion/NotionTrigger.node.js",
+      "dist/nodes/Npm/Npm.node.js",
       "dist/nodes/Odoo/Odoo.node.js",
       "dist/nodes/OneSimpleApi/OneSimpleApi.node.js",
       "dist/nodes/OpenAi/OpenAi.node.js",
@@ -615,6 +674,7 @@
       "dist/nodes/Plivo/Plivo.node.js",
       "dist/nodes/PostBin/PostBin.node.js",
       "dist/nodes/Postgres/Postgres.node.js",
+      "dist/nodes/Postgres/PostgresTrigger.node.js",
       "dist/nodes/PostHog/PostHog.node.js",
       "dist/nodes/Postmark/PostmarkTrigger.node.js",
       "dist/nodes/ProfitWell/ProfitWell.node.js",
@@ -639,9 +699,11 @@
       "dist/nodes/RespondToWebhook/RespondToWebhook.node.js",
       "dist/nodes/Rocketchat/Rocketchat.node.js",
       "dist/nodes/RssFeedRead/RssFeedRead.node.js",
+      "dist/nodes/RssFeedRead/RssFeedReadTrigger.node.js",
       "dist/nodes/Rundeck/Rundeck.node.js",
       "dist/nodes/S3/S3.node.js",
       "dist/nodes/Salesforce/Salesforce.node.js",
+      "dist/nodes/Salesforce/SalesforceTrigger.node.js",
       "dist/nodes/Salesmate/Salesmate.node.js",
       "dist/nodes/Schedule/ScheduleTrigger.node.js",
       "dist/nodes/SeaTable/SeaTable.node.js",
@@ -656,6 +718,8 @@
       "dist/nodes/Shopify/Shopify.node.js",
       "dist/nodes/Shopify/ShopifyTrigger.node.js",
       "dist/nodes/Signl4/Signl4.node.js",
+      "dist/nodes/Simulate/Simulate.node.js",
+      "dist/nodes/Simulate/SimulateTrigger.node.js",
       "dist/nodes/Slack/Slack.node.js",
       "dist/nodes/Sms77/Sms77.node.js",
       "dist/nodes/Snowflake/Snowflake.node.js",
@@ -684,6 +748,8 @@
       "dist/nodes/Tapfiliate/Tapfiliate.node.js",
       "dist/nodes/Telegram/Telegram.node.js",
       "dist/nodes/Telegram/TelegramTrigger.node.js",
+      "dist/nodes/TheHiveProject/TheHiveProject.node.js",
+      "dist/nodes/TheHiveProject/TheHiveProjectTrigger.node.js",
       "dist/nodes/TheHive/TheHive.node.js",
       "dist/nodes/TheHive/TheHiveTrigger.node.js",
       "dist/nodes/TimescaleDb/TimescaleDb.node.js",
@@ -696,6 +762,7 @@
       "dist/nodes/Twake/Twake.node.js",
       "dist/nodes/Twilio/Twilio.node.js",
       "dist/nodes/EsaTwilio/EsaTwilio.node.js",
+      "dist/nodes/Twilio/TwilioTrigger.node.js",
       "dist/nodes/Twist/Twist.node.js",
       "dist/nodes/Twitter/Twitter.node.js",
       "dist/nodes/Typeform/TypeformTrigger.node.js",
@@ -714,6 +781,7 @@
       "dist/nodes/Webflow/WebflowTrigger.node.js",
       "dist/nodes/Webhook/Webhook.node.js",
       "dist/nodes/Wekan/Wekan.node.js",
+      "dist/nodes/WhatsApp/WhatsAppTrigger.node.js",
       "dist/nodes/WhatsApp/WhatsApp.node.js",
       "dist/nodes/Wise/Wise.node.js",
       "dist/nodes/Wise/WiseTrigger.node.js",
@@ -732,7 +800,13 @@
       "dist/nodes/Zendesk/ZendeskTrigger.node.js",
       "dist/nodes/Zoho/ZohoCrm.node.js",
       "dist/nodes/Zoom/Zoom.node.js",
-      "dist/nodes/Zulip/Zulip.node.js"
+      "dist/nodes/Zulip/Zulip.node.js",
+      "dist/nodes/Transform/Aggregate/Aggregate.node.js",
+      "dist/nodes/Transform/Limit/Limit.node.js",
+      "dist/nodes/Transform/RemoveDuplicates/RemoveDuplicates.node.js",
+      "dist/nodes/Transform/SplitOut/SplitOut.node.js",
+      "dist/nodes/Transform/Sort/Sort.node.js",
+      "dist/nodes/Transform/Summarize/Summarize.node.js"
     ]
   },
   "devDependencies": {
@@ -742,170 +816,95 @@
     "@types/cheerio": "^0.22.15",
     "@types/cron": "~1.7.1",
     "@types/eventsource": "^1.1.2",
-    "@types/express": "^4.17.6",
-    "@types/formidable": "^1.0.31",
+    "@types/express": "^4.17.21",
+    "@types/html-to-text": "^9.0.1",
     "@types/gm": "^1.25.0",
-    "@types/imap-simple": "^4.2.0",
     "@types/js-nacl": "^1.3.0",
-    "@types/jsonwebtoken": "^9.0.1",
-    "@types/lodash": "^4.14.191",
-    "@types/lodash.assign": "^4",
-    "@types/lodash.assignwith": "^4",
-    "@types/lodash.clone": "^4",
-    "@types/lodash.compact": "^3",
-    "@types/lodash.concat": "^4",
-    "@types/lodash.difference": "^4",
-    "@types/lodash.escaperegexp": "^4",
-    "@types/lodash.every": "^4",
-    "@types/lodash.find": "^4",
-    "@types/lodash.first": "^3",
-    "@types/lodash.flow": "^3",
-    "@types/lodash.get": "^4",
-    "@types/lodash.intersection": "^4",
-    "@types/lodash.isarray": "^4",
-    "@types/lodash.isempty": "^4",
-    "@types/lodash.isequal": "^4",
-    "@types/lodash.isobject": "^3",
-    "@types/lodash.isstring": "^4",
-    "@types/lodash.last": "^3",
-    "@types/lodash.lt": "^3",
-    "@types/lodash.map": "^4",
-    "@types/lodash.merge": "^4",
-    "@types/lodash.mergewith": "^4",
-    "@types/lodash.omit": "^4",
-    "@types/lodash.partialright": "^4",
-    "@types/lodash.pick": "^4",
-    "@types/lodash.pickby": "^4",
-    "@types/lodash.reduce": "^4",
-    "@types/lodash.set": "^4",
-    "@types/lodash.some": "^4",
-    "@types/lodash.sortby": "^4",
-    "@types/lodash.split": "^4",
-    "@types/lodash.tonumber": "^4",
-    "@types/lodash.tostring": "^4",
-    "@types/lodash.trim": "^4",
-    "@types/lodash.union": "^4",
-    "@types/lodash.uniqby": "^4",
-    "@types/lodash.unset": "^4",
-    "@types/lodash.upperfirst": "^4",
-    "@types/lodash.zip": "^4",
+    "@types/jsonwebtoken": "^9.0.6",
+    "@types/lodash": "^4.14.195",
     "@types/lossless-json": "^1.0.0",
-    "@types/mailparser": "^2.7.3",
+    "@types/mailparser": "^3.4.4",
     "@types/mime-types": "^2.1.0",
-    "@types/mssql": "^6.0.2",
+    "@types/mssql": "^9.1.5",
     "@types/node-ssh": "^7.0.1",
-    "@types/nodemailer": "^6.4.0",
-    "@types/pdf-parse": "^1.1.1",
+    "@types/nodemailer": "^6.4.14",
     "@types/promise-ftp": "^1.3.4",
-    "@types/redis": "^2.8.11",
-    "@types/request-promise-native": "~1.0.15",
+    "@types/rfc2047": "^2.0.1",
     "@types/showdown": "^1.9.4",
-    "@types/snowflake-sdk": "^1.5.1",
+    "@types/snowflake-sdk": "^1.6.20",
     "@types/ssh2-sftp-client": "^5.1.0",
     "@types/tmp": "^0.2.0",
     "@types/uuid": "^8.3.2",
-    "@types/xml2js": "^0.4.11",
-    "eslint-plugin-n8n-nodes-base": "^1.12.0",
-    "gulp": "^4.0.0",
+    "@types/xml2js": "^0.4.14",
+    "eslint-plugin-n8n-nodes-base": "^1.16.0",
     "n8n-core": "workspace:*"
   },
   "dependencies": {
     "@kafkajs/confluent-schema-registry": "1.0.6",
-    "amqplib": "^0.10.3",
-    "aws4": "^1.8.0",
-    "basic-auth": "^2.0.1",
-    "change-case": "^4.1.1",
+    "@n8n/imap": "workspace:*",
+    "@n8n/vm2": "3.9.20",
+    "amqplib": "0.10.3",
+    "aws4": "1.11.0",
+    "basic-auth": "2.0.1",
+    "change-case": "4.1.2",
     "cheerio": "1.0.0-rc.6",
     "chokidar": "3.5.2",
-    "cron": "~1.7.2",
-    "currency-codes": "^2.1.0",
+    "cron": "1.7.2",
+    "csv-parse": "5.5.0",
+    "currency-codes": "2.1.0",
     "dotenv": "^16.0.3",
-    "eventsource": "^2.0.2",
-    "fast-glob": "^3.2.5",
-    "fflate": "^0.7.0",
-    "formidable": "^1.2.1",
-    "get-system-fonts": "^2.0.2",
-    "gm": "^1.25.0",
-    "iconv-lite": "^0.6.2",
-    "ics": "^2.27.0",
-    "imap-simple": "^4.3.0",
-    "isbot": "^3.3.4",
-    "iso-639-1": "^2.1.3",
-    "js-nacl": "^1.4.0",
-    "jsonwebtoken": "^9.0.0",
-    "kafkajs": "^1.14.0",
-    "lodash.assign": "^4",
-    "lodash.assignwith": "^4",
-    "lodash.clone": "^4",
-    "lodash.compact": "^3",
-    "lodash.concat": "^4",
-    "lodash.difference": "^4",
-    "lodash.escaperegexp": "^4",
-    "lodash.every": "^4",
-    "lodash.find": "^4",
-    "lodash.first": "^3",
-    "lodash.flow": "^3",
-    "lodash.get": "^4",
-    "lodash.intersection": "^4",
-    "lodash.isarray": "^4",
-    "lodash.isempty": "^4",
-    "lodash.isequal": "^4",
-    "lodash.isobject": "^3",
-    "lodash.isstring": "^4",
-    "lodash.last": "^3",
-    "lodash.lt": "^3",
-    "lodash.map": "^4",
-    "lodash.merge": "^4",
-    "lodash.mergewith": "^4",
-    "lodash.omit": "^4",
-    "lodash.partialright": "^4",
-    "lodash.pick": "^4",
-    "lodash.pickby": "^4",
-    "lodash.reduce": "^4",
-    "lodash.set": "^4",
-    "lodash.some": "^4",
-    "lodash.sortby": "^4",
-    "lodash.split": "^4",
-    "lodash.tonumber": "^4",
-    "lodash.tostring": "^4",
-    "lodash.trim": "^4",
-    "lodash.union": "^4",
-    "lodash.uniqby": "^4",
-    "lodash.unset": "^4",
-    "lodash.upperfirst": "^4",
-    "lodash.zip": "^4",
-    "lossless-json": "^1.0.4",
-    "luxon": "^3.3.0",
-    "mailparser": "^3.2.0",
-    "moment": "~2.29.2",
-    "moment-timezone": "^0.5.28",
-    "mongodb": "^4.9.1",
-    "mqtt": "4.2.6",
-    "mssql": "^8.1.2",
-    "mysql2": "~2.3.0",
+    "eventsource": "2.0.2",
+    "html-to-text": "9.0.5",
+    "fast-glob": "3.2.12",
+    "fflate": "0.7.4",
+    "get-system-fonts": "2.0.2",
+    "gm": "1.25.0",
+    "iconv-lite": "0.6.3",
+    "ics": "2.40.0",
+    "isbot": "3.6.13",
+    "iso-639-1": "2.1.15",
+    "js-nacl": "1.4.0",
+    "jsonwebtoken": "9.0.2",
+    "kafkajs": "1.16.0",
+    "ldapts": "4.2.6",
+    "lodash": "4.17.21",
+    "lossless-json": "1.0.5",
+    "luxon": "3.3.0",
+    "mailparser": "3.6.7",
+    "minifaker": "1.34.1",
+    "moment-timezone": "0.5.37",
+    "mongodb": "6.3.0",
+    "mqtt": "5.0.2",
+    "mssql": "10.0.2",
+    "mysql2": "3.9.7",
     "n8n-workflow": "workspace:*",
-    "node-html-markdown": "^1.1.3",
-    "node-ssh": "^12.0.0",
-    "nodemailer": "^6.7.1",
+    "nanoid": "3.3.6",
+    "node-html-markdown": "1.2.0",
+    "node-ssh": "12.0.5",
+    "nodemailer": "6.9.9",
     "openapi-request-validator": "12.1.0",
-    "otpauth": "^9.1.1",
-    "pdf-parse": "^1.1.1",
-    "pg": "^8.3.0",
-    "pg-promise": "^10.5.8",
-    "pretty-bytes": "^5.6.0",
-    "promise-ftp": "^1.3.5",
-    "redis": "^3.1.1",
-    "request": "^2.88.2",
-    "rhea": "^1.0.11",
-    "rss-parser": "^3.7.0",
-    "showdown": "^2.0.3",
-    "simple-git": "^3.17.0",
-    "snowflake-sdk": "^1.5.3",
-    "ssh2-sftp-client": "^7.0.0",
-    "tmp-promise": "^3.0.2",
-    "uuid": "^8.3.2",
-    "vm2": "~3.9.17",
-    "xlsx": "^0.17.0",
-    "xml2js": "^0.5.0"
+    "otpauth": "9.1.1",
+    "pdfjs-dist": "2.16.105",
+    "pg": "8.11.3",
+    "pg-promise": "10.15.4",
+    "pretty-bytes": "5.6.0",
+    "promise-ftp": "1.3.5",
+    "pyodide": "0.23.4",
+    "redis": "4.6.12",
+    "rfc2047": "4.0.1",
+    "rhea": "1.0.24",
+    "rrule": "^2.8.1",
+    "rss-parser": "3.13.0",
+    "semver": "7.5.4",
+    "showdown": "2.1.0",
+    "simple-git": "3.17.0",
+    "snowflake-sdk": "1.9.2",
+    "ssh2-sftp-client": "7.2.3",
+    "tmp-promise": "3.0.3",
+    "ts-ics": "^1.2.2",
+    "typedi": "0.10.0",
+    "uuid": "8.3.2",
+    "xlsx": "https://cdn.sheetjs.com/xlsx-0.19.3/xlsx-0.19.3.tgz",
+    "xml2js": "0.6.2"
   }
-}
\ No newline at end of file
+}
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 02f91ebdd72b6..82b20eaf82f5f 100644
--- a/packages/nodes-base/test/nodes/Airtable/Airtable.node.test.ts
+++ b/packages/nodes-base/test/nodes/Airtable/Airtable.node.test.ts
@@ -1,7 +1,7 @@
+import nock from 'nock';
 import { executeWorkflow } from '../ExecuteWorkflow';
 import * as Helpers from '../Helpers';
-import { WorkflowTestData } from '../types';
-import nock from 'nock';
+import type { WorkflowTestData } from '../types';
 
 const records = [
 	{
@@ -26,7 +26,7 @@ describe('Execute Airtable Node', () => {
 		nock.restore();
 	});
 
-	const tests: Array<WorkflowTestData> = [
+	const tests: WorkflowTestData[] = [
 		{
 			description: 'List Airtable Records',
 			input: {
@@ -44,16 +44,15 @@ describe('Execute Airtable Node', () => {
 
 	for (const testData of tests) {
 		test(testData.description, async () => {
-			// execute workflow
-			const { result } = await executeWorkflow(testData, nodeTypes);
-
-			// check if result node data matches expected test data
-			const resultNodeData = Helpers.getResultNodeData(result, testData);
-			resultNodeData.forEach(({ nodeName, resultData }) =>
-				expect(resultData).toEqual(testData.output.nodeData[nodeName]),
-			);
-
-			expect(result.finished).toEqual(true);
+			try {
+				// execute workflow
+				await executeWorkflow(testData, nodeTypes);
+			} catch (error) {
+				expect(error).toBeUndefined();
+				expect(error.message).toEqual(
+					'The API Key connection was deprecated by Airtable, please use Access Token or OAuth2 instead.',
+				);
+			}
 		});
 	}
 });
diff --git a/packages/nodes-base/test/nodes/Airtable/workflow.json b/packages/nodes-base/test/nodes/Airtable/workflow.json
index 43b959b92e249..b171c33df052e 100644
--- a/packages/nodes-base/test/nodes/Airtable/workflow.json
+++ b/packages/nodes-base/test/nodes/Airtable/workflow.json
@@ -9,10 +9,7 @@
 			"name": "On clicking 'execute'",
 			"type": "n8n-nodes-base.manualTrigger",
 			"typeVersion": 1,
-			"position": [
-				820,
-				380
-			]
+			"position": [820, 380]
 		},
 		{
 			"parameters": {
@@ -35,10 +32,7 @@
 			"name": "Airtable",
 			"type": "n8n-nodes-base.airtable",
 			"typeVersion": 1,
-			"position": [
-				1020,
-				380
-			],
+			"position": [1020, 380],
 			"credentials": {
 				"airtableApi": {
 					"id": "20",
diff --git a/packages/nodes-base/test/nodes/ExecuteWorkflow.ts b/packages/nodes-base/test/nodes/ExecuteWorkflow.ts
index cf0b5dd01e1f8..6ba0c741a21d7 100644
--- a/packages/nodes-base/test/nodes/ExecuteWorkflow.ts
+++ b/packages/nodes-base/test/nodes/ExecuteWorkflow.ts
@@ -1,25 +1,59 @@
+import nock from 'nock';
 import { WorkflowExecute } from 'n8n-core';
-import { createDeferredPromise, INodeTypes, IRun, Workflow } from 'n8n-workflow';
+import type { INodeTypes, IRun, IRunExecutionData } from 'n8n-workflow';
+import { createDeferredPromise, Workflow } from 'n8n-workflow';
 import * as Helpers from './Helpers';
 import type { WorkflowTestData } from './types';
 
 export async function executeWorkflow(testData: WorkflowTestData, nodeTypes: INodeTypes) {
-	const executionMode = 'manual';
+	if (testData.nock) {
+		const { baseUrl, mocks } = testData.nock;
+		const agent = nock(baseUrl);
+		mocks.forEach(({ method, path, statusCode, responseBody }) =>
+			agent[method](path).reply(statusCode, responseBody),
+		);
+	}
+	const executionMode = testData.trigger?.mode ?? 'manual';
 	const workflowInstance = new Workflow({
 		id: 'test',
 		nodes: testData.input.workflowData.nodes,
 		connections: testData.input.workflowData.connections,
 		active: false,
 		nodeTypes,
+		settings: testData.input.workflowData.settings,
 	});
-
 	const waitPromise = await createDeferredPromise<IRun>();
 	const nodeExecutionOrder: string[] = [];
-	const additionalData = Helpers.WorkflowExecuteAdditionalData(waitPromise, nodeExecutionOrder);
+	const additionalData = Helpers.WorkflowExecuteAdditionalData(
+		waitPromise,
+		nodeExecutionOrder,
+		testData,
+	);
 
-	const workflowExecute = new WorkflowExecute(additionalData, executionMode);
+	let executionData: IRun;
+	const runExecutionData: IRunExecutionData = {
+		resultData: {
+			runData: {},
+		},
+		executionData: {
+			contextData: {},
+			waitingExecution: {},
+			waitingExecutionSource: null,
+			nodeExecutionStack: [
+				{
+					node: workflowInstance.getStartNode()!,
+					data: {
+						main: [[testData.trigger?.input ?? { json: {} }]],
+					},
+					source: null,
+				},
+			],
+		},
+	};
+	const workflowExecute = new WorkflowExecute(additionalData, executionMode, runExecutionData);
+	console.log('we got here for executeWorkflow.js');
+	executionData = await workflowExecute.processRunExecutionData(workflowInstance);
 
-	const executionData = await workflowExecute.run(workflowInstance);
 	const result = await waitPromise.promise();
 	return { executionData, result, nodeExecutionOrder };
 }
diff --git a/packages/nodes-base/test/nodes/FakeCredentialsMap.ts b/packages/nodes-base/test/nodes/FakeCredentialsMap.ts
index ab7b4680fad73..fbf6d00b71a8a 100644
--- a/packages/nodes-base/test/nodes/FakeCredentialsMap.ts
+++ b/packages/nodes-base/test/nodes/FakeCredentialsMap.ts
@@ -1,13 +1,56 @@
-import { IDataObject } from 'n8n-workflow';
-
 // If your test needs data from credentials, you can add it here.
 // as JSON.stringify({ id: 'credentials_ID', name: 'credentials_name' }) for specific credentials
 // or as 'credentials_type' for all credentials of that type
 // expected keys for credentials can be found in packages/nodes-base/credentials/[credentials_type].credentials.ts
-export const FAKE_CREDENTIALS_DATA: IDataObject = {
+export const FAKE_CREDENTIALS_DATA = {
 	[JSON.stringify({ id: '20', name: 'Airtable account' })]: {
 		apiKey: 'key456',
 	},
+	[JSON.stringify({ id: 'G45TOKX5kBEraTr1', name: 'JWT Auth test PEM' })]: {
+		keyType: 'pemKey',
+		privateKey: `
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCfw0m1K+M1/6Tw
+CvLYDv0gmxa+reEdKBfT0/hfkkjFWqbMRo0f4CQ3PwrOavS+80PDy6nVL21BmGev
+w1bF7KXmqOzr+yKOUJ8A4u6vXUQKzVSFBqb2YZmZL1s7va9aaO6pVANTbmYHpTjh
+SBnBrXgidVOXNX1c+IG+OZZMiTFWg4lJTE9rvMbLh4o5FPwdZlA1rLAux4KXVNNr
+mE7T5/tsuikR06KMJS6V6YR4PZmTsy/3D2clADXDCtbUdEe0eBYoUmRLMhRL6umq
+h98Dsm5ZG+YB2dn0ThR/g7DPVwvmnrK2S5e4hpqFYxQ8V8pGx7dQLsc/utbvsn32
+dctGivkFAgMBAAECggEABDB0QdZtRlC2S/8VgBnghFbcwVJA6WlQOqM/y43D77zh
+S9D7yV6wxGwYRfJjCZDKcZtpECiGtmYfLeoy38zFSueaEtQKg23UxYqt1JZe/uOE
+eFqEzUgg5XXq8AWY0AeZXoJP9gOalE++TpX76uq4EDtAXmIuL95qVIkhCk+8pfaR
+avLcejnyYGSJAG1J9pXHNChXXDVPd7PrIa20A44osvusifVMlcIYM3qkv167ULzX
+4nu2hZwlNxGKtpVPldFY/qu5S7SdLo/2BQinrMSSKRSFihA4Uuod8GK0+UwjE4gO
+TD15bjqIcadlAYV6bn34sHnMU9hjhPB5NyXiINYdsQKBgQDNu0XFjYyAgwORaZYs
+jVTJg+fQ9wM7xnlfxXCVb9eoOGF0blW9VjIEz8lLjmPlPFFVS+EPN0andHHqH4t5
+SQZVZxgNMcodWs8BJTVZUkXa+IljHXT1Vkb2zvtH96ADzs3c43+tNpmKhjG3XK1U
+rL/v8feU31nwQb7imOmYmzbHCQKBgQDGzJ/pRLByB24W6FRfHIItP81vVg5ckCXi
+sIhzHUdUmTdVbdAxeS6IW2oAc/IuksvmiZMLYsm+sIFFePJQrBsoD41R5VsFcJqE
+o5x0DUzbOzqaV4HPOHDniibudyryZKnBvkXlCjyCv4iPKaFhH4T1aB+wdK4pJPo2
+fyABs2lFHQKBgQDHz6IFK+QREK3PdhA/twhpK65jWvUOAkbxyE3/JX/7xr6IGX02
+hdfQqoqj0midRMbto+OzJol9q+/TZs3MfysimR1X+0qE1iSExUGaPfjQomC1He/x
+M9l6bi7Jh+wmpp10cpQXhBb93jW9E8rYmWtVPNmsAn1UhlZBuCfwapd6GQKBgATM
+f7ezzsaR41huN0ssdv/8oErluucFG8UDGegddtFV+X34bqQjFrp36nEkW15AcOeZ
+vpDxy4js3dH9f2vvG6C172VgsffJphE5mdc7UvWf0mRTZHDKHf+Y2CO9gK3lPCvP
+GgTTYG6PjQ5XpOuhRSZfYxRxXJrlp5yVKQKhgBMJAoGBAMc6ktd0iqHAYCW3d9QP
+e618RiMlVIYZIUlLWAUQWQSf3linqMjo1rCbbI/lSxE216XwI/VBX50gg/Oy3aUl
+CibHHk2aKGlxVxe0Huv5gcjbZgVh1EMi4oxh4600IrWRH1Uz5AleXnheNiappKnA
+lOMhy99LXMlAOL7qOBnZHgrm
+-----END PRIVATE KEY-----
+		`,
+		publicKey: `
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAn8NJtSvjNf+k8Ary2A79
+IJsWvq3hHSgX09P4X5JIxVqmzEaNH+AkNz8Kzmr0vvNDw8up1S9tQZhnr8NWxeyl
+5qjs6/sijlCfAOLur11ECs1UhQam9mGZmS9bO72vWmjuqVQDU25mB6U44UgZwa14
+InVTlzV9XPiBvjmWTIkxVoOJSUxPa7zGy4eKORT8HWZQNaywLseCl1TTa5hO0+f7
+bLopEdOijCUulemEeD2Zk7Mv9w9nJQA1wwrW1HRHtHgWKFJkSzIUS+rpqoffA7Ju
+WRvmAdnZ9E4Uf4Owz1cL5p6ytkuXuIaahWMUPFfKRse3UC7HP7rW77J99nXLRor5
+BQIDAQAB
+-----END PUBLIC KEY-----
+		`,
+		algorithm: 'RS256',
+	},
 	airtableApi: {
 		apiKey: 'key123',
 	},
@@ -15,8 +58,41 @@ export const FAKE_CREDENTIALS_DATA: IDataObject = {
 		apiKey: 'key123',
 		baseUrl: 'https://test.app.n8n.cloud/api/v1',
 	},
+	npmApi: {
+		accessToken: 'fake-npm-access-token',
+		registryUrl: 'https://fake.npm.registry',
+	},
 	totpApi: {
 		label: 'GitHub:john-doe',
 		secret: 'BVDRSBXQB2ZEL5HE',
 	},
-};
+	aws: {
+		region: 'eu-central-1',
+		accessKeyId: 'key',
+		secretAccessKey: 'secret',
+	},
+	twitterOAuth2Api: {
+		grantType: 'pkce',
+		authUrl: 'https://twitter.com/i/oauth2/authorize',
+		accessTokenUrl: 'https://api.twitter.com/2/oauth2/token',
+		clientId: 'CLIENTID',
+		clientSecret: 'CLIENTSECRET',
+		scope:
+			'tweet.read users.read tweet.write tweet.moderate.write users.read follows.read follows.write offline.access like.read like.write dm.write dm.read list.read list.write',
+		authQueryParameters: '',
+		authentication: 'header',
+		oauthTokenData: {
+			token_type: 'bearer',
+			expires_in: 7200,
+			access_token: 'ACCESSTOKEN',
+			scope:
+				'tweet.moderate.write follows.read offline.access list.write dm.read list.read tweet.write like.write like.read users.read dm.write tweet.read follows.write',
+			refresh_token: 'REFRESHTOKEN',
+		},
+	},
+	jwtAuth: {
+		keyType: 'passphrase',
+		secret: 'baz',
+		algorithm: 'HS256',
+	},
+} as const;
diff --git a/packages/nodes-base/test/nodes/Helpers.ts b/packages/nodes-base/test/nodes/Helpers.ts
index baa5871a31984..b5c6714280fbf 100644
--- a/packages/nodes-base/test/nodes/Helpers.ts
+++ b/packages/nodes-base/test/nodes/Helpers.ts
@@ -1,8 +1,17 @@
 import { readFileSync, readdirSync, mkdtempSync } from 'fs';
-import { BinaryDataManager, Credentials, constructExecutionMetaData } from 'n8n-core';
-import {
+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 type {
+	CredentialLoadingDetails,
 	ICredentialDataDecryptedObject,
-	ICredentialsHelper,
+	ICredentialType,
+	ICredentialTypeData,
+	ICredentialTypes,
 	IDataObject,
 	IDeferredPromise,
 	IExecuteFunctions,
@@ -10,8 +19,8 @@ import {
 	IGetNodeParameterOptions,
 	IHttpRequestHelper,
 	IHttpRequestOptions,
-	ILogger,
 	INode,
+	INodeCredentials,
 	INodeCredentialsDetails,
 	INodeType,
 	INodeTypeData,
@@ -21,20 +30,16 @@ import {
 	IVersionedNodeType,
 	IWorkflowBase,
 	IWorkflowExecuteAdditionalData,
-	LoadingDetails,
-	LoggerProxy,
-	NodeHelpers,
-	WorkflowHooks,
+	NodeLoadingDetails,
+	WorkflowTestData,
 } from 'n8n-workflow';
+import { ApplicationError, ICredentialsHelper, NodeHelpers, WorkflowHooks } from 'n8n-workflow';
 import { executeWorkflow } from './ExecuteWorkflow';
-import { WorkflowTestData } from './types';
-import path from 'path';
-import { tmpdir } from 'os';
-import { isEmpty } from 'lodash';
-import { get } from 'lodash';
 
 import { FAKE_CREDENTIALS_DATA } from './FakeCredentialsMap';
 
+const baseDir = path.resolve(__dirname, '../..');
+
 const getFakeDecryptedCredentials = (
 	nodeCredentials: INodeCredentialsDetails,
 	type: string,
@@ -51,12 +56,56 @@ const getFakeDecryptedCredentials = (
 	return {};
 };
 
+export const readJsonFileSync = <T = any>(filePath: string) =>
+	JSON.parse(readFileSync(path.join(baseDir, filePath), 'utf-8')) as T;
+
+const knownCredentials = readJsonFileSync<Record<string, CredentialLoadingDetails>>(
+	'dist/known/credentials.json',
+);
+
+const knownNodes = readJsonFileSync<Record<string, NodeLoadingDetails>>('dist/known/nodes.json');
+
+class CredentialType implements ICredentialTypes {
+	credentialTypes: ICredentialTypeData = {};
+
+	addCredential(credentialTypeName: string, credentialType: ICredentialType) {
+		this.credentialTypes[credentialTypeName] = {
+			sourcePath: '',
+			type: credentialType,
+		};
+	}
+
+	recognizes(credentialType: string): boolean {
+		return credentialType in this.credentialTypes;
+	}
+
+	getByName(credentialType: string): ICredentialType {
+		return this.credentialTypes[credentialType].type;
+	}
+
+	getSupportedNodes(type: string): string[] {
+		return knownCredentials[type]?.supportedNodes ?? [];
+	}
+
+	getParentTypes(typeName: string): string[] {
+		return [];
+	}
+}
+
 export class CredentialsHelper extends ICredentialsHelper {
+	constructor(private credentialTypes: ICredentialTypes) {
+		super('');
+	}
+
 	async authenticate(
 		credentials: ICredentialDataDecryptedObject,
 		typeName: string,
 		requestParams: IHttpRequestOptions,
 	): Promise<IHttpRequestOptions> {
+		const credentialType = this.credentialTypes.getByName(typeName);
+		if (typeof credentialType.authenticate === 'function') {
+			return await credentialType.authenticate(credentials, requestParams);
+		}
 		return requestParams;
 	}
 
@@ -75,6 +124,7 @@ export class CredentialsHelper extends ICredentialsHelper {
 	}
 
 	async getDecrypted(
+		additionalData: IWorkflowExecuteAdditionalData,
 		nodeCredentials: INodeCredentialsDetails,
 		type: string,
 	): Promise<ICredentialDataDecryptedObject> {
@@ -98,6 +148,7 @@ export class CredentialsHelper extends ICredentialsHelper {
 export function WorkflowExecuteAdditionalData(
 	waitPromise: IDeferredPromise<IRun>,
 	nodeExecutionOrder: string[],
+	workflowTestData?: WorkflowTestData,
 ): IWorkflowExecuteAdditionalData {
 	const hookFunctions = {
 		nodeExecuteAfter: [
@@ -120,25 +171,24 @@ export function WorkflowExecuteAdditionalData(
 		nodes: [],
 		connections: {},
 	};
-
 	return {
-		credentialsHelper: new CredentialsHelper(''),
+		credentialsHelper: new CredentialsHelper(credentialTypes),
 		hooks: new WorkflowHooks(hookFunctions, 'trigger', '1', workflowData),
 		executeWorkflow: async (workflowInfo: IExecuteWorkflowInfo): Promise<any> => {},
-		sendMessageToUI: (message: string) => {},
+		sendDataToUI: (message: string) => {},
 		restApiUrl: '',
-		encryptionKey: 'test',
-		timezone: 'America/New_York',
 		webhookBaseUrl: 'webhook',
 		webhookWaitingBaseUrl: 'webhook-waiting',
 		webhookTestBaseUrl: 'webhook-test',
 		userId: '123',
 		variables: {},
+		instanceBaseUrl: '',
 	};
 }
 
-class NodeTypesClass implements INodeTypes {
+class NodeTypes implements INodeTypes {
 	nodeTypes: INodeTypeData = {};
+
 	getByName(nodeType: string): INodeType | IVersionedNodeType {
 		return this.nodeTypes[nodeType].type;
 	}
@@ -154,7 +204,6 @@ class NodeTypesClass implements INodeTypes {
 			...this.nodeTypes,
 			...loadedNode,
 		};
-		//Object.assign(this.nodeTypes, loadedNode);
 	}
 
 	getByNameAndVersion(nodeType: string, version?: number): INodeType {
@@ -162,82 +211,92 @@ class NodeTypesClass implements INodeTypes {
 	}
 }
 
-let nodeTypesInstance: NodeTypesClass | undefined;
-
-export function NodeTypes(): NodeTypesClass {
-	if (nodeTypesInstance === undefined) {
-		nodeTypesInstance = new NodeTypesClass();
-	}
-	return nodeTypesInstance;
-}
-
-let knownNodes: Record<string, LoadingDetails> | null = null;
-
-const loadKnownNodes = (): Record<string, LoadingDetails> => {
-	if (knownNodes === null) {
-		knownNodes = JSON.parse(readFileSync('dist/known/nodes.json').toString());
-	}
-	return knownNodes!;
-};
-
-export function createTemporaryDir(prefix: string = 'n8n') {
+export function createTemporaryDir(prefix = 'n8n') {
 	return mkdtempSync(path.join(tmpdir(), prefix));
 }
 
-export async function initBinaryDataManager(mode: 'default' | 'filesystem' = 'default') {
-	const temporaryDir = createTemporaryDir();
-	await BinaryDataManager.init({
-		mode,
-		availableModes: mode,
-		localStoragePath: temporaryDir,
-		binaryDataTTL: 1,
-		persistedBinaryDataTTL: 1,
+export async function initBinaryDataService(mode: 'default' | 'filesystem' = 'default') {
+	const binaryDataService = new BinaryDataService();
+	await binaryDataService.init({
+		mode: 'default',
+		availableModes: [mode],
+		localStoragePath: createTemporaryDir(),
 	});
-	return temporaryDir;
+	Container.set(BinaryDataService, binaryDataService);
 }
 
-export function setup(testData: Array<WorkflowTestData> | WorkflowTestData) {
+const credentialTypes = new CredentialType();
+
+export function setup(testData: WorkflowTestData[] | WorkflowTestData) {
 	if (!Array.isArray(testData)) {
 		testData = [testData];
 	}
 
-	const knownNodes = loadKnownNodes();
+	if (testData.some((t) => !!t.nock)) {
+		beforeAll(() => {
+			nock.disableNetConnect();
+		});
 
-	const nodeTypes = NodeTypes();
-	const nodeNames = Array.from(
-		new Set(testData.flatMap((data) => data.input.workflowData.nodes.map((n) => n.type))),
-	);
+		afterAll(() => {
+			nock.restore();
+		});
+	}
+
+	const nodeTypes = new NodeTypes();
+
+	const nodes = [...new Set(testData.flatMap((data) => data.input.workflowData.nodes))];
+	const credentialNames = nodes
+		.filter((n) => n.credentials)
+		.flatMap(({ credentials }) => Object.keys(credentials as INodeCredentials));
+	for (const credentialName of credentialNames) {
+		const loadInfo = knownCredentials[credentialName];
+		if (!loadInfo) {
+			throw new ApplicationError(`Unknown credential type: ${credentialName}`, {
+				level: 'warning',
+			});
+		}
+		const sourcePath = loadInfo.sourcePath.replace(/^dist\//, './').replace(/\.js$/, '.ts');
+		const nodeSourcePath = path.join(baseDir, sourcePath);
+		const credential = new (require(nodeSourcePath)[loadInfo.className])() as ICredentialType;
+		credentialTypes.addCredential(credentialName, credential);
+	}
 
+	const nodeNames = nodes.map((n) => n.type);
 	for (const nodeName of nodeNames) {
 		if (!nodeName.startsWith('n8n-nodes-base.')) {
-			throw new Error(`Unknown node type: ${nodeName}`);
+			throw new ApplicationError(`Unknown node type: ${nodeName}`, { level: 'warning' });
 		}
 		const loadInfo = knownNodes[nodeName.replace('n8n-nodes-base.', '')];
 		if (!loadInfo) {
-			throw new Error(`Unknown node type: ${nodeName}`);
+			throw new ApplicationError(`Unknown node type: ${nodeName}`, { level: 'warning' });
 		}
 		const sourcePath = loadInfo.sourcePath.replace(/^dist\//, './').replace(/\.js$/, '.ts');
-		const nodeSourcePath = path.join(process.cwd(), sourcePath);
+		const nodeSourcePath = path.join(baseDir, sourcePath);
 		const node = new (require(nodeSourcePath)[loadInfo.className])() as INodeType;
 		nodeTypes.addNode(nodeName, node);
 	}
 
-	const fakeLogger = {
-		log: () => {},
-		debug: () => {},
-		verbose: () => {},
-		info: () => {},
-		warn: () => {},
-		error: () => {},
-	} as ILogger;
-	LoggerProxy.init(fakeLogger);
 	return nodeTypes;
 }
 
 export function getResultNodeData(result: IRun, testData: WorkflowTestData) {
 	return Object.keys(testData.output.nodeData).map((nodeName) => {
+		const error = result.data.resultData.error;
+		// If there was an error running the workflow throw it for easier debugging
+		// and to surface all issues
+		if (error?.cause) throw error.cause;
+		if (error) throw error;
+
 		if (result.data.resultData.runData[nodeName] === undefined) {
-			throw new Error(`Data for node "${nodeName}" is missing!`);
+			// log errors from other nodes
+			Object.keys(result.data.resultData.runData).forEach((key) => {
+				const error = result.data.resultData.runData[key][0]?.error;
+				if (error) {
+					console.log(`Node ${key}\n`, error);
+				}
+			});
+
+			throw new ApplicationError(`Data for node "${nodeName}" is missing!`, { level: 'warning' });
 		}
 		const resultData = result.data.resultData.runData[nodeName].map((nodeData) => {
 			if (nodeData.data === undefined) {
@@ -256,19 +315,31 @@ export function getResultNodeData(result: IRun, testData: WorkflowTestData) {
 	});
 }
 
-export function readJsonFileSync(path: string) {
-	return JSON.parse(readFileSync(path, 'utf-8'));
-}
-
 export const equalityTest = async (testData: WorkflowTestData, types: INodeTypes) => {
 	// execute workflow
 	const { result } = await executeWorkflow(testData, types);
 
 	// check if result node data matches expected test data
 	const resultNodeData = getResultNodeData(result, testData);
-
 	resultNodeData.forEach(({ nodeName, resultData }) => {
-		return expect(resultData).toEqual(testData.output.nodeData[nodeName]);
+		const msg = `Equality failed for "${testData.description}" at node "${nodeName}"`;
+		resultData.forEach((item) => {
+			item?.forEach(({ binary, json }) => {
+				if (binary) {
+					// @ts-ignore
+					delete binary.data.data;
+					delete binary.data.directory;
+				}
+
+				// Convert errors to JSON so tests can compare
+				if (json.error instanceof Error) {
+					json.error = JSON.parse(
+						JSON.stringify(json.error, ['message', 'name', 'description', 'context']),
+					);
+				}
+			});
+		});
+		return expect(resultData, msg).toEqual(testData.output.nodeData[nodeName]);
 	});
 
 	expect(result.finished).toEqual(true);
@@ -278,7 +349,7 @@ const preparePinData = (pinData: IDataObject) => {
 	const returnData = Object.keys(pinData).reduce(
 		(acc, key) => {
 			const data = pinData[key] as IDataObject[];
-			acc[key] = [data as IDataObject[]];
+			acc[key] = [data];
 			return acc;
 		},
 		{} as {
@@ -287,24 +358,35 @@ const preparePinData = (pinData: IDataObject) => {
 	);
 	return returnData;
 };
-
 export const workflowToTests = (workflowFiles: string[]) => {
 	const testCases: WorkflowTestData[] = [];
 	for (const filePath of workflowFiles) {
 		const description = filePath.replace('.json', '');
-		const workflowData = readJsonFileSync(filePath);
+		const workflowData = readJsonFileSync<IWorkflowBase & Pick<WorkflowTestData, 'trigger'>>(
+			filePath,
+		);
+		const testDir = path.join(baseDir, path.dirname(filePath));
+		workflowData.nodes.forEach((node) => {
+			if (node.parameters) {
+				node.parameters = JSON.parse(
+					JSON.stringify(node.parameters).replace(/"C:\\\\Test\\\\(.*)"/, `"${testDir}/$1"`),
+				);
+			}
+		});
 		if (workflowData.pinData === undefined) {
-			throw new Error('Workflow data does not contain pinData');
+			throw new ApplicationError('Workflow data does not contain pinData', { level: 'warning' });
 		}
 
 		const nodeData = preparePinData(workflowData.pinData);
-
 		delete workflowData.pinData;
 
+		const { trigger } = workflowData;
+		delete workflowData.trigger;
+
 		const input = { workflowData };
 		const output = { nodeData };
 
-		testCases.push({ description, input, output });
+		testCases.push({ description, input, output, trigger });
 	}
 	return testCases;
 };
@@ -315,7 +397,7 @@ export const testWorkflows = (workflows: string[]) => {
 	const nodeTypes = setup(tests);
 
 	for (const testData of tests) {
-		test(testData.description, async () => equalityTest(testData, nodeTypes));
+		test(testData.description, async () => await equalityTest(testData, nodeTypes));
 	}
 };
 
@@ -325,7 +407,7 @@ export const getWorkflowFilenames = (dirname: string) => {
 	const filenames = readdirSync(dirname);
 	const testFolder = dirname.split(`${path.sep}nodes-base${path.sep}`)[1];
 	filenames.forEach((file) => {
-		if (file.includes('.json')) {
+		if (file.endsWith('.json')) {
 			workflows.push(path.join(testFolder, file));
 		}
 	});
diff --git a/packages/nodes-base/test/nodes/Postgres/Postgres.node.functions.test.js b/packages/nodes-base/test/nodes/Postgres/Postgres.node.functions.test.js
deleted file mode 100644
index 29b72932c8645..0000000000000
--- a/packages/nodes-base/test/nodes/Postgres/Postgres.node.functions.test.js
+++ /dev/null
@@ -1,172 +0,0 @@
-const PostgresFun = require('../../../nodes/Postgres/v1/genericFunctions');
-const pgPromise = require('pg-promise');
-
-describe('pgUpdate', () => {
-	it('runs query to update db', async () => {
-		const updateItem = { id: 1234, name: 'test' };
-		const nodeParams = {
-			table: 'mytable',
-			schema: 'myschema',
-			updateKey: 'id',
-			columns: 'id,name',
-			additionalFields: {},
-			returnFields: '*',
-		};
-		const getNodeParam = (key) => nodeParams[key];
-		const pgp = pgPromise();
-		const any = jest.fn();
-		const db = { any };
-
-		const items = [
-			{
-				json: updateItem,
-			},
-		];
-
-		await PostgresFun.pgUpdate(getNodeParam, pgp, db, items);
-
-		expect(db.any).toHaveBeenCalledWith(
-			`update \"myschema\".\"mytable\" as t set \"id\"=v.\"id\",\"name\"=v.\"name\" from (values(1234,'test')) as v(\"id\",\"name\") WHERE v.\"id\" = t.\"id\" RETURNING *`,
-		);
-	});
-
-	it('runs query to update db if updateKey is not in columns', async () => {
-		const updateItem = { id: 1234, name: 'test' };
-		const nodeParams = {
-			table: 'mytable',
-			schema: 'myschema',
-			updateKey: 'id',
-			columns: 'name',
-			additionalFields: {},
-			returnFields: '*',
-		};
-		const getNodeParam = (key) => nodeParams[key];
-		const pgp = pgPromise();
-		const any = jest.fn();
-		const db = { any };
-
-		const items = [
-			{
-				json: updateItem,
-			},
-		];
-
-		const results = await PostgresFun.pgUpdate(getNodeParam, pgp, db, items);
-
-		expect(db.any).toHaveBeenCalledWith(
-			`update \"myschema\".\"mytable\" as t set \"id\"=v.\"id\",\"name\"=v.\"name\" from (values(1234,'test')) as v(\"id\",\"name\") WHERE v.\"id\" = t.\"id\" RETURNING *`,
-		);
-	});
-
-	it('runs query to update db with cast as updateKey', async () => {
-		const updateItem = { id: '1234', name: 'test' };
-		const nodeParams = {
-			table: 'mytable',
-			schema: 'myschema',
-			updateKey: 'id:uuid',
-			columns: 'name',
-			additionalFields: {},
-			returnFields: '*',
-		};
-		const getNodeParam = (key) => nodeParams[key];
-		const pgp = pgPromise();
-		const any = jest.fn();
-		const db = { any };
-
-		const items = [
-			{
-				json: updateItem,
-			},
-		];
-
-		await PostgresFun.pgUpdate(getNodeParam, pgp, db, items);
-
-		expect(db.any).toHaveBeenCalledWith(
-			`update \"myschema\".\"mytable\" as t set \"id\"=v.\"id\",\"name\"=v.\"name\" from (values('1234'::uuid,'test')) as v(\"id\",\"name\") WHERE v.\"id\" = t.\"id\" RETURNING *`,
-		);
-	});
-
-	it('runs query to update db with cast in target columns', async () => {
-		const updateItem = { id: '1234', name: 'test' };
-		const nodeParams = {
-			table: 'mytable',
-			schema: 'myschema',
-			updateKey: 'id',
-			columns: 'id:uuid,name',
-			additionalFields: {},
-			returnFields: '*',
-		};
-		const getNodeParam = (key) => nodeParams[key];
-		const pgp = pgPromise();
-		const any = jest.fn();
-		const db = { any };
-
-		const items = [
-			{
-				json: updateItem,
-			},
-		];
-
-		await PostgresFun.pgUpdate(getNodeParam, pgp, db, items);
-
-		expect(db.any).toHaveBeenCalledWith(
-			`update \"myschema\".\"mytable\" as t set \"id\"=v.\"id\",\"name\"=v.\"name\" from (values('1234'::uuid,'test')) as v(\"id\",\"name\") WHERE v.\"id\" = t.\"id\" RETURNING *`,
-		);
-	});
-});
-
-describe('pgInsert', () => {
-	it('runs query to insert', async () => {
-		const insertItem = { id: 1234, name: 'test', age: 34 };
-		const nodeParams = {
-			table: 'mytable',
-			schema: 'myschema',
-			columns: 'id,name,age',
-			returnFields: '*',
-			additionalFields: {},
-		};
-		const getNodeParam = (key) => nodeParams[key];
-		const pgp = pgPromise();
-		const any = jest.fn();
-		const db = { any };
-
-		const items = [
-			{
-				json: insertItem,
-			},
-		];
-
-		await PostgresFun.pgInsert(getNodeParam, pgp, db, items);
-
-		expect(db.any).toHaveBeenCalledWith(
-			`insert into \"myschema\".\"mytable\"(\"id\",\"name\",\"age\") values(1234,'test',34) RETURNING *`,
-		);
-	});
-
-	it('runs query to insert with type casting', async () => {
-		const insertItem = { id: 1234, name: 'test', age: 34 };
-		const nodeParams = {
-			table: 'mytable',
-			schema: 'myschema',
-			columns: 'id:int,name:text,age',
-			returnFields: '*',
-			additionalFields: {},
-		};
-		const getNodeParam = (key) => nodeParams[key];
-		const pgp = pgPromise();
-		const any = jest.fn();
-		const db = { any };
-
-		const items = [
-			{
-				json: insertItem,
-			},
-		];
-
-		await PostgresFun.pgInsert(getNodeParam, pgp, db, items);
-
-		expect(db.any).toHaveBeenCalledWith(
-			`insert into \"myschema\".\"mytable\"(\"id\",\"name\",\"age\") values(1234::int,'test'::text,34) RETURNING *`,
-		);
-	});
-});
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
new file mode 100644
index 0000000000000..018d34bdb1c64
--- /dev/null
+++ b/packages/nodes-base/test/nodes/Postgres/Postgres.node.functions.test.ts
@@ -0,0 +1,174 @@
+const pgPromise = require('pg-promise');
+const PostgresFun = require('../../../nodes/Postgres/v1/genericFunctions');
+
+type NodeParams = Record<string, string | {}>;
+
+describe('pgUpdate', () => {
+	it('runs query to update db', async () => {
+		const updateItem = { id: 1234, name: 'test' };
+		const nodeParams: NodeParams = {
+			table: 'mytable',
+			schema: 'myschema',
+			updateKey: 'id',
+			columns: 'id,name',
+			additionalFields: {},
+			returnFields: '*',
+		};
+		const getNodeParam = (key: string) => nodeParams[key];
+		const pgp = pgPromise();
+		const any = jest.fn();
+		const db = { any };
+
+		const items = [
+			{
+				json: updateItem,
+			},
+		];
+
+		await PostgresFun.pgUpdate(getNodeParam, pgp, db, items);
+
+		expect(db.any).toHaveBeenCalledWith(
+			'update "myschema"."mytable" as t set "id"=v."id","name"=v."name" from (values(1234,\'test\')) as v("id","name") WHERE v."id" = t."id" RETURNING *',
+		);
+	});
+
+	it('runs query to update db if updateKey is not in columns', async () => {
+		const updateItem = { id: 1234, name: 'test' };
+		const nodeParams: NodeParams = {
+			table: 'mytable',
+			schema: 'myschema',
+			updateKey: 'id',
+			columns: 'name',
+			additionalFields: {},
+			returnFields: '*',
+		};
+		const getNodeParam = (key: string) => nodeParams[key];
+		const pgp = pgPromise();
+		const any = jest.fn();
+		const db = { any };
+
+		const items = [
+			{
+				json: updateItem,
+			},
+		];
+
+		const results = await PostgresFun.pgUpdate(getNodeParam, pgp, db, items);
+
+		expect(db.any).toHaveBeenCalledWith(
+			'update "myschema"."mytable" as t set "id"=v."id","name"=v."name" from (values(1234,\'test\')) as v("id","name") WHERE v."id" = t."id" RETURNING *',
+		);
+	});
+
+	it('runs query to update db with cast as updateKey', async () => {
+		const updateItem = { id: '1234', name: 'test' };
+		const nodeParams: NodeParams = {
+			table: 'mytable',
+			schema: 'myschema',
+			updateKey: 'id:uuid',
+			columns: 'name',
+			additionalFields: {},
+			returnFields: '*',
+		};
+		const getNodeParam = (key: string) => nodeParams[key];
+		const pgp = pgPromise();
+		const any = jest.fn();
+		const db = { any };
+
+		const items = [
+			{
+				json: updateItem,
+			},
+		];
+
+		await PostgresFun.pgUpdate(getNodeParam, pgp, db, items);
+
+		expect(db.any).toHaveBeenCalledWith(
+			'update "myschema"."mytable" as t set "id"=v."id","name"=v."name" from (values(\'1234\'::uuid,\'test\')) as v("id","name") WHERE v."id" = t."id" RETURNING *',
+		);
+	});
+
+	it('runs query to update db with cast in target columns', async () => {
+		const updateItem = { id: '1234', name: 'test' };
+		const nodeParams: NodeParams = {
+			table: 'mytable',
+			schema: 'myschema',
+			updateKey: 'id',
+			columns: 'id:uuid,name',
+			additionalFields: {},
+			returnFields: '*',
+		};
+		const getNodeParam = (key: string) => nodeParams[key];
+		const pgp = pgPromise();
+		const any = jest.fn();
+		const db = { any };
+
+		const items = [
+			{
+				json: updateItem,
+			},
+		];
+
+		await PostgresFun.pgUpdate(getNodeParam, pgp, db, items);
+
+		expect(db.any).toHaveBeenCalledWith(
+			'update "myschema"."mytable" as t set "id"=v."id","name"=v."name" from (values(\'1234\'::uuid,\'test\')) as v("id","name") WHERE v."id" = t."id" RETURNING *',
+		);
+	});
+});
+
+describe('pgInsert', () => {
+	it('runs query to insert', async () => {
+		const insertItem = { id: 1234, name: 'test', age: 34 };
+		const nodeParams: NodeParams = {
+			table: 'mytable',
+			schema: 'myschema',
+			columns: 'id,name,age',
+			returnFields: '*',
+			additionalFields: {},
+		};
+		const getNodeParam = (key: string) => nodeParams[key];
+		const pgp = pgPromise();
+		const any = jest.fn();
+		const db = { any };
+
+		const items = [
+			{
+				json: insertItem,
+			},
+		];
+
+		await PostgresFun.pgInsert(getNodeParam, pgp, db, items);
+
+		expect(db.any).toHaveBeenCalledWith(
+			'insert into "myschema"."mytable"("id","name","age") values(1234,\'test\',34) RETURNING *',
+		);
+	});
+
+	it('runs query to insert with type casting', async () => {
+		const insertItem = { id: 1234, name: 'test', age: 34 };
+		const nodeParams: NodeParams = {
+			table: 'mytable',
+			schema: 'myschema',
+			columns: 'id:int,name:text,age',
+			returnFields: '*',
+			additionalFields: {},
+		};
+		const getNodeParam = (key: string) => nodeParams[key];
+		const pgp = pgPromise();
+		const any = jest.fn();
+		const db = { any };
+
+		const items = [
+			{
+				json: insertItem,
+			},
+		];
+
+		await PostgresFun.pgInsert(getNodeParam, pgp, db, items);
+
+		expect(db.any).toHaveBeenCalledWith(
+			'insert into "myschema"."mytable"("id","name","age") values(1234::int,\'test\'::text,34) RETURNING *',
+		);
+	});
+});
diff --git a/packages/nodes-base/test/nodes/Start/StartNode.test.ts b/packages/nodes-base/test/nodes/Start/StartNode.test.ts
index 3c29c006ca61b..c399bd4554bf3 100644
--- a/packages/nodes-base/test/nodes/Start/StartNode.test.ts
+++ b/packages/nodes-base/test/nodes/Start/StartNode.test.ts
@@ -1,9 +1,9 @@
 import * as Helpers from '../Helpers';
-import { WorkflowTestData } from '../types';
+import type { WorkflowTestData } from '../types';
 import { executeWorkflow } from '../ExecuteWorkflow';
 
 describe('Execute Start Node', () => {
-	const tests: Array<WorkflowTestData> = [
+	const tests: WorkflowTestData[] = [
 		{
 			description: 'should run start node',
 			input: {
diff --git a/packages/nodes-base/test/nodes/Stripe/helpers.test.js b/packages/nodes-base/test/nodes/Stripe/helpers.test.ts
similarity index 100%
rename from packages/nodes-base/test/nodes/Stripe/helpers.test.js
rename to packages/nodes-base/test/nodes/Stripe/helpers.test.ts
diff --git a/packages/nodes-base/test/nodes/types.ts b/packages/nodes-base/test/nodes/types.ts
index 37ffd12aea03b..73e09fcb24743 100644
--- a/packages/nodes-base/test/nodes/types.ts
+++ b/packages/nodes-base/test/nodes/types.ts
@@ -1,17 +1,3 @@
-import { INode, IConnections } from 'n8n-workflow';
-
-export interface WorkflowTestData {
-	description: string;
-	input: {
-		workflowData: {
-			nodes: INode[];
-			connections: IConnections;
-		};
-	};
-	output: {
-		nodeExecutionOrder?: string[];
-		nodeData: {
-			[key: string]: any[][];
-		};
-	};
-}
+import type { WorkflowTestData } from 'n8n-workflow';
+//TODO: remove, update import in tests
+export { WorkflowTestData };
diff --git a/packages/nodes-base/test/setup.ts b/packages/nodes-base/test/setup.ts
new file mode 100644
index 0000000000000..d2c9bc6e645e1
--- /dev/null
+++ b/packages/nodes-base/test/setup.ts
@@ -0,0 +1 @@
+import 'reflect-metadata';
diff --git a/packages/nodes-base/test/utils/utilities.test.ts b/packages/nodes-base/test/utils/utilities.test.ts
index 78fa5631bc0c5..88edcedc279ce 100644
--- a/packages/nodes-base/test/utils/utilities.test.ts
+++ b/packages/nodes-base/test/utils/utilities.test.ts
@@ -1,4 +1,4 @@
-import { fuzzyCompare } from '../../utils/utilities';
+import { fuzzyCompare, getResolvables, keysToLowercase, wrapData } from '@utils/utilities';
 
 //most test cases for fuzzyCompare are done in Compare Datasets node tests
 describe('Test fuzzyCompare', () => {
@@ -29,3 +29,111 @@ describe('Test fuzzyCompare', () => {
 		expect(compareFunction(null, '0')).toEqual(false);
 	});
 });
+
+describe('Test wrapData', () => {
+	it('should wrap object in json', () => {
+		const data = {
+			id: 1,
+			name: 'Name',
+		};
+		const wrappedData = wrapData(data);
+		expect(wrappedData).toBeDefined();
+		expect(wrappedData).toEqual([{ json: data }]);
+	});
+	it('should wrap each object in array in json', () => {
+		const data = [
+			{
+				id: 1,
+				name: 'Name',
+			},
+			{
+				id: 2,
+				name: 'Name 2',
+			},
+		];
+		const wrappedData = wrapData(data);
+		expect(wrappedData).toBeDefined();
+		expect(wrappedData).toEqual([{ json: data[0] }, { json: data[1] }]);
+	});
+	it('json key from source should be inside json', () => {
+		const data = {
+			json: {
+				id: 1,
+				name: 'Name',
+			},
+		};
+		const wrappedData = wrapData(data);
+		expect(wrappedData).toBeDefined();
+		expect(wrappedData).toEqual([{ json: data }]);
+		expect(Object.keys(wrappedData[0].json)).toContain('json');
+	});
+});
+
+describe('Test keysToLowercase', () => {
+	it('should convert keys to lowercase', () => {
+		const headers = {
+			'Content-Type': 'application/json',
+			'X-Test-Header': 'Test',
+			Accept: 'application/json',
+		};
+
+		const newHeaders = keysToLowercase(headers);
+
+		expect(newHeaders).toEqual({
+			'content-type': 'application/json',
+			'x-test-header': 'Test',
+			accept: 'application/json',
+		});
+	});
+	it('should return original value if it is not an object', () => {
+		const test1 = keysToLowercase(['hello']);
+		const test2 = keysToLowercase('test');
+		const test3 = keysToLowercase(1);
+		const test4 = keysToLowercase(true);
+		const test5 = keysToLowercase(null);
+		const test6 = keysToLowercase(undefined);
+
+		expect(test1).toEqual(['hello']);
+		expect(test2).toEqual('test');
+		expect(test3).toEqual(1);
+		expect(test4).toEqual(true);
+		expect(test5).toEqual(null);
+		expect(test6).toEqual(undefined);
+	});
+});
+
+describe('Test getResolvables', () => {
+	it('should return empty array when there are no resolvables', () => {
+		expect(getResolvables('Plain String, no resolvables here.')).toEqual([]);
+	});
+	it('should properly handle resovables in SQL query', () => {
+		expect(getResolvables('SELECT * FROM {{ $json.db }}.{{ $json.table }};')).toEqual([
+			'{{ $json.db }}',
+			'{{ $json.table }}',
+		]);
+	});
+	it('should properly handle resovables in HTML string', () => {
+		expect(
+			getResolvables(
+				`
+				<!DOCTYPE html>
+				<html>
+					<head><title>{{ $json.pageTitle }}</title></head>
+					<body><h1>{{ $json.heading }}</h1></body>
+				<html>
+				<style>
+					body { height: {{ $json.pageHeight }}; }
+				</style>
+				<script>
+					console.log('{{ $json.welcomeMessage }}');
+				</script>
+				`,
+			),
+		).toEqual([
+			'{{ $json.pageTitle }}',
+			'{{ $json.heading }}',
+			'{{ $json.pageHeight }}',
+			'{{ $json.welcomeMessage }}',
+		]);
+	});
+});
diff --git a/packages/nodes-base/tsconfig.build.json b/packages/nodes-base/tsconfig.build.json
index 10e0fa38b107a..499160a1edd99 100644
--- a/packages/nodes-base/tsconfig.build.json
+++ b/packages/nodes-base/tsconfig.build.json
@@ -1,9 +1,7 @@
 {
-	"extends": "./tsconfig.json",
+	"extends": ["./tsconfig.json", "../../tsconfig.build.json"],
 	"compilerOptions": {
 		"outDir": "dist",
-		"types": ["node"],
-		"noEmit": false,
 		"tsBuildInfoFile": "dist/build.tsbuildinfo"
 	},
 	"include": [
diff --git a/packages/nodes-base/tsconfig.json b/packages/nodes-base/tsconfig.json
index 44bdf1d0a0ae4..7e4ed688fb475 100644
--- a/packages/nodes-base/tsconfig.json
+++ b/packages/nodes-base/tsconfig.json
@@ -1,17 +1,27 @@
 {
-	"extends": "../../tsconfig.json",
+	"extends": ["../../tsconfig.json", "../../tsconfig.backend.json"],
 	"compilerOptions": {
 		"lib": ["dom", "es2020", "es2022.error"],
-		"types": ["node", "jest"],
-		"noEmit": true,
+		"paths": {
+			"@test/*": ["./test/*"],
+			"@utils/*": ["./utils/*"]
+		},
+		"tsBuildInfoFile": "dist/typecheck.tsbuildinfo",
 		// TODO: remove all options below this line
 		"noImplicitReturns": false,
-		"noUnusedLocals": false,
 		"useUnknownInCatchVariables": false
 	},
-	"include": ["credentials/**/*.ts", "nodes/**/*.ts"],
+	"include": ["credentials/**/*.ts", "nodes/**/*.ts", "test/**/*.ts", "utils/**/*.ts"],
 	"references": [
+		{ "path": "../@n8n/imap/tsconfig.build.json" },
 		{ "path": "../workflow/tsconfig.build.json" },
 		{ "path": "../core/tsconfig.build.json" }
-	]
+	],
+	"tsc-alias": {
+		"replacers": {
+			"base-url": {
+				"enabled": false
+			}
+		}
+	}
 }
diff --git a/packages/nodes-base/utils/binary.ts b/packages/nodes-base/utils/binary.ts
new file mode 100644
index 0000000000000..1a7b16f24d516
--- /dev/null
+++ b/packages/nodes-base/utils/binary.ts
@@ -0,0 +1,201 @@
+import type { IBinaryData, IDataObject, IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
+import { NodeOperationError, BINARY_ENCODING } from 'n8n-workflow';
+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';
+
+export type JsonToSpreadsheetBinaryOptions = {
+	headerRow?: boolean;
+	compression?: boolean;
+	fileName?: string;
+	sheetName?: string;
+};
+
+export type JsonToBinaryOptions = {
+	fileName?: string;
+	sourceKey?: string;
+	encoding?: string;
+	addBOM?: boolean;
+	mimeType?: string;
+	dataIsBase64?: boolean;
+	itemIndex?: number;
+	format?: boolean;
+};
+
+type PdfDocument = Awaited<ReturnType<Awaited<typeof readPDF>>['promise']>;
+type PdfPage = Awaited<ReturnType<Awaited<PdfDocument['getPage']>>>;
+type PdfTextContent = Awaited<ReturnType<PdfPage['getTextContent']>>;
+
+export async function convertJsonToSpreadsheetBinary(
+	this: IExecuteFunctions,
+	items: INodeExecutionData[],
+	fileFormat: JsonToSpreadsheetBinaryFormat,
+	options: JsonToSpreadsheetBinaryOptions,
+	defaultFileName = 'spreadsheet',
+): Promise<IBinaryData> {
+	const itemData: IDataObject[] = [];
+	for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
+		itemData.push(flattenObject(items[itemIndex].json));
+	}
+
+	let sheetToJsonOptions;
+	if (options.headerRow === false) {
+		sheetToJsonOptions = { skipHeader: true };
+	}
+
+	const sheet = xlsxUtils.json_to_sheet(itemData, sheetToJsonOptions);
+
+	const writingOptions: WritingOptions = {
+		bookType: fileFormat,
+		bookSST: false,
+		type: 'buffer',
+	};
+
+	if (['xlsx', 'ods'].includes(fileFormat) && options.compression) {
+		writingOptions.compression = true;
+	}
+
+	// Convert the data in the correct format
+	const sheetName = (options.sheetName as string) || 'Sheet';
+	const workbook: WorkBook = {
+		SheetNames: [sheetName],
+		Sheets: {
+			[sheetName]: sheet,
+		},
+	};
+
+	const buffer: Buffer = xlsxWrite(workbook, writingOptions);
+	const fileName =
+		options.fileName !== undefined ? options.fileName : `${defaultFileName}.${fileFormat}`;
+	const binaryData = await this.helpers.prepareBinaryData(buffer, fileName);
+
+	return binaryData;
+}
+
+export async function createBinaryFromJson(
+	this: IExecuteFunctions,
+	data: IDataObject | IDataObject[],
+	options: JsonToBinaryOptions,
+): Promise<IBinaryData> {
+	let value;
+	if (options.sourceKey) {
+		value = get(data, options.sourceKey) as IDataObject;
+	} else {
+		value = data;
+	}
+
+	if (value === undefined) {
+		throw new NodeOperationError(this.getNode(), `The value in "${options.sourceKey}" is not set`, {
+			itemIndex: options.itemIndex || 0,
+		});
+	}
+
+	let buffer: Buffer;
+	if (!options.dataIsBase64) {
+		let valueAsString = value as unknown as string;
+
+		if (typeof value === 'object') {
+			options.mimeType = 'application/json';
+			if (options.format) {
+				valueAsString = JSON.stringify(value, null, 2);
+			} else {
+				valueAsString = JSON.stringify(value);
+			}
+		}
+
+		buffer = iconv.encode(valueAsString, options.encoding || 'utf8', {
+			addBOM: options.addBOM,
+		});
+	} else {
+		buffer = Buffer.from(value as unknown as string, BINARY_ENCODING);
+	}
+
+	const binaryData = await this.helpers.prepareBinaryData(
+		buffer,
+		options.fileName,
+		options.mimeType,
+	);
+
+	if (!binaryData.fileName) {
+		const fileExtension = binaryData.fileExtension ? `.${binaryData.fileExtension}` : '';
+		binaryData.fileName = `file${fileExtension}`;
+	}
+
+	return binaryData;
+}
+
+const parseText = (textContent: PdfTextContent) => {
+	let lastY = undefined;
+	const text = [];
+	for (const item of textContent.items) {
+		if ('str' in item) {
+			if (lastY == item.transform[5] || !lastY) {
+				text.push(item.str);
+			} else {
+				text.push(`\n${item.str}`);
+			}
+			lastY = item.transform[5];
+		}
+	}
+	return text.join('');
+};
+
+export async function extractDataFromPDF(
+	this: IExecuteFunctions,
+	binaryPropertyName: string,
+	password?: string,
+	maxPages?: number,
+	joinPages = true,
+	itemIndex = 0,
+) {
+	const binaryData = this.helpers.assertBinaryData(itemIndex, binaryPropertyName);
+
+	const params: DocumentInitParameters = { password, isEvalSupported: false };
+
+	if (binaryData.id) {
+		params.data = await this.helpers.binaryToBuffer(
+			await this.helpers.getBinaryStream(binaryData.id),
+		);
+	} else {
+		params.data = Buffer.from(binaryData.data, BINARY_ENCODING).buffer;
+	}
+
+	const document = await readPDF(params).promise;
+	const { info, metadata } = await document
+		.getMetadata()
+		.catch(() => ({ info: null, metadata: null }));
+
+	const pages = [];
+	if (maxPages !== 0) {
+		let pagesToRead = document.numPages;
+		if (maxPages && maxPages < document.numPages) {
+			pagesToRead = maxPages;
+		}
+		for (let i = 1; i <= pagesToRead; i++) {
+			const page = await document.getPage(i);
+			const text = await page.getTextContent().then(parseText);
+			pages.push(text);
+		}
+	}
+
+	const text = joinPages ? pages.join('\n\n') : pages;
+
+	const returnData = {
+		numpages: document.numPages,
+		numrender: document.numPages,
+		info,
+		metadata: metadata?.getAll(),
+		text,
+		version: pdfJsVersion,
+	};
+
+	return returnData;
+}
diff --git a/packages/nodes-base/utils/descriptions.ts b/packages/nodes-base/utils/descriptions.ts
new file mode 100644
index 0000000000000..1465d3e31476c
--- /dev/null
+++ b/packages/nodes-base/utils/descriptions.ts
@@ -0,0 +1,445 @@
+import type { INodeProperties, INodePropertyOptions } from 'n8n-workflow';
+
+export const oldVersionNotice: INodeProperties = {
+	displayName:
+		'<strong>New node version available:</strong> get the latest version with added features from the nodes panel.',
+	name: 'oldVersionNotice',
+	type: 'notice',
+	default: '',
+};
+
+export const returnAllOrLimit: INodeProperties[] = [
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		default: false,
+		description: 'Whether to return all results or only up to a given limit',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				returnAll: [false],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+		},
+		default: 100,
+		description: 'Max number of results to return',
+	},
+];
+
+export const encodeDecodeOptions: INodePropertyOptions[] = [
+	{
+		name: 'armscii8',
+		value: 'armscii8',
+	},
+	{
+		name: 'ascii',
+		value: 'ascii',
+	},
+	{
+		name: 'base64',
+		value: 'base64',
+	},
+	{
+		name: 'big5hkscs',
+		value: 'big5hkscs',
+	},
+	{
+		name: 'binary',
+		value: 'binary',
+	},
+	{
+		name: 'cesu8',
+		value: 'cesu8',
+	},
+	{
+		name: 'cp1046',
+		value: 'cp1046',
+	},
+	{
+		name: 'cp1124',
+		value: 'cp1124',
+	},
+	{
+		name: 'cp1125',
+		value: 'cp1125',
+	},
+	{
+		name: 'cp1129',
+		value: 'cp1129',
+	},
+	{
+		name: 'cp1133',
+		value: 'cp1133',
+	},
+	{
+		name: 'cp1161',
+		value: 'cp1161',
+	},
+	{
+		name: 'cp1162',
+		value: 'cp1162',
+	},
+	{
+		name: 'cp1163',
+		value: 'cp1163',
+	},
+	{
+		name: 'cp437',
+		value: 'cp437',
+	},
+	{
+		name: 'cp720',
+		value: 'cp720',
+	},
+	{
+		name: 'cp737',
+		value: 'cp737',
+	},
+	{
+		name: 'cp775',
+		value: 'cp775',
+	},
+	{
+		name: 'cp808',
+		value: 'cp808',
+	},
+	{
+		name: 'cp850',
+		value: 'cp850',
+	},
+	{
+		name: 'cp852',
+		value: 'cp852',
+	},
+	{
+		name: 'cp855',
+		value: 'cp855',
+	},
+	{
+		name: 'cp856',
+		value: 'cp856',
+	},
+	{
+		name: 'cp857',
+		value: 'cp857',
+	},
+	{
+		name: 'cp858',
+		value: 'cp858',
+	},
+	{
+		name: 'cp860',
+		value: 'cp860',
+	},
+	{
+		name: 'cp861',
+		value: 'cp861',
+	},
+	{
+		name: 'cp862',
+		value: 'cp862',
+	},
+	{
+		name: 'cp863',
+		value: 'cp863',
+	},
+	{
+		name: 'cp864',
+		value: 'cp864',
+	},
+	{
+		name: 'cp865',
+		value: 'cp865',
+	},
+	{
+		name: 'cp866',
+		value: 'cp866',
+	},
+	{
+		name: 'cp869',
+		value: 'cp869',
+	},
+	{
+		name: 'cp922',
+		value: 'cp922',
+	},
+	{
+		name: 'cp936',
+		value: 'cp936',
+	},
+	{
+		name: 'cp949',
+		value: 'cp949',
+	},
+	{
+		name: 'cp950',
+		value: 'cp950',
+	},
+	{
+		name: 'eucjp',
+		value: 'eucjp',
+	},
+	{
+		name: 'gb18030',
+		value: 'gb18030',
+	},
+	{
+		name: 'gbk',
+		value: 'gbk',
+	},
+	{
+		name: 'georgianacademy',
+		value: 'georgianacademy',
+	},
+	{
+		name: 'georgianps',
+		value: 'georgianps',
+	},
+	{
+		name: 'hex',
+		value: 'hex',
+	},
+	{
+		name: 'hproman8',
+		value: 'hproman8',
+	},
+	{
+		name: 'iso646cn',
+		value: 'iso646cn',
+	},
+	{
+		name: 'iso646jp',
+		value: 'iso646jp',
+	},
+	{
+		name: 'iso88591',
+		value: 'iso88591',
+	},
+	{
+		name: 'iso885910',
+		value: 'iso885910',
+	},
+	{
+		name: 'iso885911',
+		value: 'iso885911',
+	},
+	{
+		name: 'iso885913',
+		value: 'iso885913',
+	},
+	{
+		name: 'iso885914',
+		value: 'iso885914',
+	},
+	{
+		name: 'iso885915',
+		value: 'iso885915',
+	},
+	{
+		name: 'iso885916',
+		value: 'iso885916',
+	},
+	{
+		name: 'iso88592',
+		value: 'iso88592',
+	},
+	{
+		name: 'iso88593',
+		value: 'iso88593',
+	},
+	{
+		name: 'iso88594',
+		value: 'iso88594',
+	},
+	{
+		name: 'iso88595',
+		value: 'iso88595',
+	},
+	{
+		name: 'iso88596',
+		value: 'iso88596',
+	},
+	{
+		name: 'iso88597',
+		value: 'iso88597',
+	},
+	{
+		name: 'iso88598',
+		value: 'iso88598',
+	},
+	{
+		name: 'iso88599',
+		value: 'iso88599',
+	},
+	{
+		name: 'koi8r',
+		value: 'koi8r',
+	},
+	{
+		name: 'koi8ru',
+		value: 'koi8ru',
+	},
+	{
+		name: 'koi8t',
+		value: 'koi8t',
+	},
+	{
+		name: 'koi8u',
+		value: 'koi8u',
+	},
+	{
+		name: 'maccenteuro',
+		value: 'maccenteuro',
+	},
+	{
+		name: 'maccroatian',
+		value: 'maccroatian',
+	},
+	{
+		name: 'maccyrillic',
+		value: 'maccyrillic',
+	},
+	{
+		name: 'macgreek',
+		value: 'macgreek',
+	},
+	{
+		name: 'maciceland',
+		value: 'maciceland',
+	},
+	{
+		name: 'macintosh',
+		value: 'macintosh',
+	},
+	{
+		name: 'macroman',
+		value: 'macroman',
+	},
+	{
+		name: 'macromania',
+		value: 'macromania',
+	},
+	{
+		name: 'macthai',
+		value: 'macthai',
+	},
+	{
+		name: 'macturkish',
+		value: 'macturkish',
+	},
+	{
+		name: 'macukraine',
+		value: 'macukraine',
+	},
+	{
+		name: 'mik',
+		value: 'mik',
+	},
+	{
+		name: 'pt154',
+		value: 'pt154',
+	},
+	{
+		name: 'rk1048',
+		value: 'rk1048',
+	},
+	{
+		name: 'shiftjis',
+		value: 'shiftjis',
+	},
+	{
+		name: 'tcvn',
+		value: 'tcvn',
+	},
+	{
+		name: 'tis620',
+		value: 'tis620',
+	},
+	{
+		name: 'ucs2',
+		value: 'ucs2',
+	},
+	{
+		name: 'utf16',
+		value: 'utf16',
+	},
+	{
+		name: 'utf16be',
+		value: 'utf16be',
+	},
+	{
+		name: 'utf32',
+		value: 'utf32',
+	},
+	{
+		name: 'utf32be',
+		value: 'utf32be',
+	},
+	{
+		name: 'utf32le',
+		value: 'utf32le',
+	},
+	{
+		name: 'utf7',
+		value: 'utf7',
+	},
+	{
+		name: 'utf7imap',
+		value: 'utf7imap',
+	},
+	{
+		name: 'utf8',
+		value: 'utf8',
+	},
+	{
+		name: 'viscii',
+		value: 'viscii',
+	},
+	{
+		name: 'windows1250',
+		value: 'windows1250',
+	},
+	{
+		name: 'windows1251',
+		value: 'windows1251',
+	},
+	{
+		name: 'windows1252',
+		value: 'windows1252',
+	},
+	{
+		name: 'windows1253',
+		value: 'windows1253',
+	},
+	{
+		name: 'windows1254',
+		value: 'windows1254',
+	},
+	{
+		name: 'windows1255',
+		value: 'windows1255',
+	},
+	{
+		name: 'windows1256',
+		value: 'windows1256',
+	},
+	{
+		name: 'windows1257',
+		value: 'windows1257',
+	},
+	{
+		name: 'windows1258',
+		value: 'windows1258',
+	},
+	{
+		name: 'windows874',
+		value: 'windows874',
+	},
+];
diff --git a/packages/nodes-base/utils/utilities.ts b/packages/nodes-base/utils/utilities.ts
index 28fa916896bf3..6783a5d8b692f 100644
--- a/packages/nodes-base/utils/utilities.ts
+++ b/packages/nodes-base/utils/utilities.ts
@@ -1,5 +1,12 @@
-import type { IDataObject, IDisplayOptions, INodeProperties } from 'n8n-workflow';
-import { jsonParse } from 'n8n-workflow';
+import type {
+	IDataObject,
+	IDisplayOptions,
+	INodeExecutionData,
+	INodeProperties,
+	IPairedItemData,
+} from 'n8n-workflow';
+
+import { ApplicationError, jsonParse } from 'n8n-workflow';
 
 import { isEqual, isNull, merge } from 'lodash';
 
@@ -19,8 +26,8 @@ import { isEqual, isNull, merge } from 'lodash';
  * // => [['a', 'b', 'c'], ['d']]
  */
 
-export function chunk(array: any[], size = 1) {
-	const length = array == null ? 0 : array.length;
+export function chunk<T>(array: T[], size = 1) {
+	const length = array === null ? 0 : array.length;
 	if (!length || size < 1) {
 		return [];
 	}
@@ -31,7 +38,7 @@ export function chunk(array: any[], size = 1) {
 	while (index < length) {
 		result[resIndex++] = array.slice(index, (index += size));
 	}
-	return result;
+	return result as T[][];
 }
 
 /**
@@ -45,20 +52,22 @@ export function chunk(array: any[], size = 1) {
  *
  */
 
-export function flatten(nestedArray: any[][]) {
+export function flatten<T>(nestedArray: T[][]) {
 	const result = [];
 
-	(function loop(array: any[] | any) {
+	(function loop(array: T[] | T[][]) {
 		for (let i = 0; i < array.length; i++) {
 			if (Array.isArray(array[i])) {
-				loop(array[i]);
+				loop(array[i] as T[]);
 			} else {
 				result.push(array[i]);
 			}
 		}
 	})(nestedArray);
 
-	return result;
+	//TODO: check logic in MicrosoftSql.node.ts
+
+	return result as any;
 }
 
 export function updateDisplayOptions(
@@ -73,6 +82,25 @@ export function updateDisplayOptions(
 	});
 }
 
+export function processJsonInput<T>(jsonData: T, inputName?: string) {
+	let values;
+	const input = inputName ? `'${inputName}' ` : '';
+
+	if (typeof jsonData === 'string') {
+		try {
+			values = jsonParse(jsonData);
+		} catch (error) {
+			throw new ApplicationError(`Input ${input} must contain a valid JSON`, { level: 'warning' });
+		}
+	} else if (typeof jsonData === 'object') {
+		values = jsonData;
+	} else {
+		throw new ApplicationError(`Input ${input} must contain a valid JSON`, { level: 'warning' });
+	}
+
+	return values;
+}
+
 function isFalsy<T>(value: T) {
 	if (isNull(value)) return true;
 	if (typeof value === 'string' && value === '') return true;
@@ -172,3 +200,149 @@ export const fuzzyCompare = (useFuzzyCompare: boolean, compareVersion = 1) => {
 		return isEqual(item1, item2);
 	};
 };
+
+export function wrapData(data: IDataObject | IDataObject[]): INodeExecutionData[] {
+	if (!Array.isArray(data)) {
+		return [{ json: data }];
+	}
+	return data.map((item) => ({
+		json: item,
+	}));
+}
+
+export const keysToLowercase = <T>(headers: T) => {
+	if (typeof headers !== 'object' || Array.isArray(headers) || headers === null) return headers;
+	return Object.entries(headers).reduce((acc, [key, value]) => {
+		acc[key.toLowerCase()] = value as IDataObject;
+		return acc;
+	}, {} as IDataObject);
+};
+
+/**
+ * Formats a private key by removing unnecessary whitespace and adding line breaks.
+ * @param privateKey - The private key to format.
+ * @returns The formatted private key.
+ */
+export function formatPrivateKey(privateKey: string, keyIsPublic = false): string {
+	let regex = /(PRIVATE KEY|CERTIFICATE)/;
+	if (keyIsPublic) {
+		regex = /(PUBLIC KEY)/;
+	}
+	if (!privateKey || /\n/.test(privateKey)) {
+		return privateKey;
+	}
+	let formattedPrivateKey = '';
+	const parts = privateKey.split('-----').filter((item) => item !== '');
+	parts.forEach((part) => {
+		if (regex.test(part)) {
+			formattedPrivateKey += `-----${part}-----`;
+		} else {
+			const passRegex = /Proc-Type|DEK-Info/;
+			if (passRegex.test(part)) {
+				part = part.replace(/:\s+/g, ':');
+				formattedPrivateKey += part.replace(/\\n/g, '\n').replace(/\s+/g, '\n');
+			} else {
+				formattedPrivateKey += part.replace(/\\n/g, '\n').replace(/\s+/g, '\n');
+			}
+		}
+	});
+	return formattedPrivateKey;
+}
+
+/**
+ * @TECH_DEBT Explore replacing with handlebars
+ */
+export function getResolvables(expression: string) {
+	if (!expression) return [];
+
+	const resolvables = [];
+	const resolvableRegex = /({{[\s\S]*?}})/g;
+
+	let match;
+
+	while ((match = resolvableRegex.exec(expression)) !== null) {
+		if (match[1]) {
+			resolvables.push(match[1]);
+		}
+	}
+
+	return resolvables;
+}
+
+/**
+ * Flattens an object with deep data
+ *
+ * @param {IDataObject} data The object to flatten
+ */
+export function flattenObject(data: IDataObject) {
+	const returnData: IDataObject = {};
+	for (const key1 of Object.keys(data)) {
+		if (data[key1] !== null && typeof data[key1] === 'object') {
+			if (data[key1] instanceof Date) {
+				returnData[key1] = data[key1]?.toString();
+				continue;
+			}
+			const flatObject = flattenObject(data[key1] as IDataObject);
+			for (const key2 in flatObject) {
+				if (flatObject[key2] === undefined) {
+					continue;
+				}
+				returnData[`${key1}.${key2}`] = flatObject[key2];
+			}
+		} else {
+			returnData[key1] = data[key1];
+		}
+	}
+	return returnData;
+}
+
+/**
+ * Capitalizes the first letter of a string
+ *
+ * @param {string} string The string to capitalize
+ */
+export function capitalize(str: string): string {
+	if (!str) return str;
+
+	const chars = str.split('');
+	chars[0] = chars[0].toUpperCase();
+
+	return chars.join('');
+}
+
+export function generatePairedItemData(length: number): IPairedItemData[] {
+	return Array.from({ length }, (_, item) => ({
+		item,
+	}));
+}
+
+/**
+ * Output Paired Item Data Array
+ *
+ * @param {number | IPairedItemData | IPairedItemData[] | undefined} pairedItem
+ */
+export function preparePairedItemDataArray(
+	pairedItem: number | IPairedItemData | IPairedItemData[] | undefined,
+): IPairedItemData[] {
+	if (pairedItem === undefined) return [];
+	if (typeof pairedItem === 'number') return [{ item: pairedItem }];
+	if (Array.isArray(pairedItem)) return pairedItem;
+	return [pairedItem];
+}
+
+export const sanitazeDataPathKey = (item: IDataObject, key: string) => {
+	if (item[key] !== undefined) {
+		return key;
+	}
+
+	if (
+		(key.startsWith("['") && key.endsWith("']")) ||
+		(key.startsWith('["') && key.endsWith('"]'))
+	) {
+		key = key.slice(2, -2);
+		if (item[key] !== undefined) {
+			return key;
+		}
+	}
+	return key;
+};
diff --git a/packages/workflow/.eslintrc.js b/packages/workflow/.eslintrc.js
index 51b395f058b56..32422b284657d 100644
--- a/packages/workflow/.eslintrc.js
+++ b/packages/workflow/.eslintrc.js
@@ -1,4 +1,4 @@
-const { sharedOptions } = require('@n8n_io/eslint-config/shared');
+const sharedOptions = require('@n8n_io/eslint-config/shared');
 
 /**
  * @type {import('@types/eslint').ESLint.ConfigData}
@@ -9,6 +9,18 @@ module.exports = {
 	...sharedOptions(__dirname),
 
 	rules: {
-		'import/order': 'off', // TODO: remove this
+		complexity: 'error',
+
+		// TODO: remove these
+		'import/order': 'off',
+		'@typescript-eslint/no-base-to-string': 'warn',
+		'@typescript-eslint/no-explicit-any': 'warn',
+		'@typescript-eslint/no-redundant-type-constituents': 'warn',
+		'@typescript-eslint/prefer-nullish-coalescing': 'warn',
+		'@typescript-eslint/prefer-optional-chain': 'warn',
+		/**
+		 * https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/docs/rules/return-await.md
+		 */
+		'@typescript-eslint/return-await': ['error', 'always'],
 	},
 };
diff --git a/packages/workflow/LICENSE.md b/packages/workflow/LICENSE.md
index c1d74239754fd..aab68b6d9301b 100644
--- a/packages/workflow/LICENSE.md
+++ b/packages/workflow/LICENSE.md
@@ -3,8 +3,9 @@
 Portions of this software are licensed as follows:
 
 - Content of branches other than the main branch (i.e. "master") are not licensed.
-- All source code files that contain ".ee." in their filename are licensed under the
-  "n8n Enterprise License" defined in "LICENSE_EE.md".
+- Source code files that contain ".ee." in their filename are NOT licensed under the Sustainable Use License.
+  To use source code files that contain ".ee." in their filename you must hold a valid n8n Enterprise License
+  specifically allowing you access to such source code files and as defined in "LICENSE_EE.md".
 - All third party components incorporated into the n8n Software are licensed under the original license
   provided by the owner of the applicable component.
 - Content outside of the above mentioned files or restrictions is available under the "Sustainable Use
diff --git a/packages/workflow/README.md b/packages/workflow/README.md
index 601ecd8553cde..da80c579206e4 100644
--- a/packages/workflow/README.md
+++ b/packages/workflow/README.md
@@ -10,7 +10,7 @@ npm install n8n-workflow
 
 ## License
 
-n8n is [fair-code](http://faircode.io) distributed under the [**Sustainable Use License**](https://github.com/n8n-io/n8n/blob/master/packages/cli/LICENSE.md).
+n8n is [fair-code](https://faircode.io) distributed under the [**Sustainable Use License**](https://github.com/n8n-io/n8n/blob/master/packages/cli/LICENSE.md).
 
 Proprietary licenses are available for enterprise customers. [Get in touch](mailto:license@n8n.io)
 
diff --git a/packages/workflow/package.json b/packages/workflow/package.json
index 7b2085ef723fe..d3839c66b71b9 100644
--- a/packages/workflow/package.json
+++ b/packages/workflow/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-workflow",
-  "version": "0.146.0",
+  "version": "1.40.0",
   "description": "Workflow base code of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",
@@ -29,7 +29,7 @@
     "typecheck": "tsc",
     "build": "tsc -p tsconfig.build.json",
     "format": "prettier --write . --ignore-path ../../.prettierignore",
-    "lint": "eslint --quiet .",
+    "lint": "eslint . --quiet",
     "lintfix": "eslint . --fix",
     "watch": "tsc -p tsconfig.build.json --watch",
     "test": "jest",
@@ -39,33 +39,33 @@
     "dist/**/*"
   ],
   "devDependencies": {
-    "@types/crypto-js": "^4.1.1",
     "@types/deep-equal": "^1.0.1",
-    "@types/express": "^4.17.6",
+    "@types/express": "^4.17.21",
     "@types/jmespath": "^0.15.0",
-    "@types/lodash.get": "^4.4.6",
-    "@types/lodash.isequal": "^4.5.6",
-    "@types/lodash.merge": "^4.6.6",
-    "@types/lodash.set": "^4.3.6",
+    "@types/lodash": "^4.14.195",
     "@types/luxon": "^3.2.0",
-    "@types/xml2js": "^0.4.11"
+    "@types/md5": "^2.3.5",
+    "@types/xml2js": "^0.4.14"
   },
   "dependencies": {
-    "@n8n_io/riot-tmpl": "^3.0.0",
+    "@n8n/tournament": "1.0.2",
+    "@n8n_io/riot-tmpl": "4.0.0",
     "ast-types": "0.15.2",
-    "crypto-js": "^4.1.1",
-    "deep-equal": "^2.2.0",
+    "axios": "1.6.7",
+    "callsites": "3.1.0",
+    "deep-equal": "2.2.0",
     "esprima-next": "5.8.4",
-    "jmespath": "^0.16.0",
-    "js-base64": "^3.7.2",
-    "lodash.get": "^4.4.2",
-    "lodash.isequal": "^4.5.0",
-    "lodash.merge": "^4.6.2",
-    "lodash.set": "^4.3.2",
-    "luxon": "^3.3.0",
-    "recast": "^0.21.5",
-    "title-case": "^3.0.3",
-    "transliteration": "^2.3.5",
-    "xml2js": "^0.5.0"
+    "form-data": "4.0.0",
+    "jmespath": "0.16.0",
+    "js-base64": "3.7.2",
+    "jssha": "3.3.1",
+    "lodash": "4.17.21",
+    "luxon": "3.3.0",
+    "md5": "2.3.0",
+    "recast": "0.21.5",
+    "title-case": "3.0.3",
+    "transliteration": "2.3.5",
+    "xml2js": "0.6.2",
+    "@langchain/core": "0.1.61"
   }
 }
diff --git a/packages/workflow/src/AugmentObject.ts b/packages/workflow/src/AugmentObject.ts
index 80a80b905a936..708bfd84748a8 100644
--- a/packages/workflow/src/AugmentObject.ts
+++ b/packages/workflow/src/AugmentObject.ts
@@ -33,7 +33,7 @@ export function augmentArray<T>(data: T[]): T[] {
 			return Reflect.deleteProperty(getData(), key);
 		},
 		get(target, key: string, receiver): unknown {
-			const value = Reflect.get(newData !== undefined ? newData : target, key, receiver) as unknown;
+			const value = Reflect.get(newData ?? target, key, receiver) as unknown;
 			const newValue = augment(value);
 			if (newValue !== value) {
 				newData = getData();
@@ -54,10 +54,10 @@ export function augmentArray<T>(data: T[]): T[] {
 			return Object.getOwnPropertyDescriptor(data, key) ?? defaultPropertyDescriptor;
 		},
 		has(target, key) {
-			return Reflect.has(newData !== undefined ? newData : target, key);
+			return Reflect.has(newData ?? target, key);
 		},
 		ownKeys(target) {
-			return Reflect.ownKeys(newData !== undefined ? newData : target);
+			return Reflect.ownKeys(newData ?? target);
 		},
 		set(target, key: string, newValue: unknown) {
 			// Always proxy all objects. Like that we can check in get simply if it
@@ -76,11 +76,11 @@ export function augmentObject<T extends object>(data: T): T {
 	if (augmentedObjects.has(data)) return data;
 
 	const newData = {} as IDataObject;
-	const deletedProperties: Array<string | symbol> = [];
+	const deletedProperties = new Set<string | symbol>();
 
 	const proxy = new Proxy(data, {
 		get(target, key: string, receiver): unknown {
-			if (deletedProperties.indexOf(key) !== -1) {
+			if (deletedProperties.has(key)) {
 				return undefined;
 			}
 
@@ -88,8 +88,12 @@ export function augmentObject<T extends object>(data: T): T {
 				return newData[key];
 			}
 
-			// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 			const value = Reflect.get(target, key, receiver);
+
+			if (typeof value !== 'object' || value === null) return value;
+			if (value instanceof RegExp) return value.toString();
+			if ('toJSON' in value && typeof value.toJSON === 'function') return value.toJSON() as T;
+
 			const newValue = augment(value);
 			if (newValue !== value) {
 				Object.assign(newData, { [key]: newValue });
@@ -103,7 +107,7 @@ export function augmentObject<T extends object>(data: T): T {
 				delete newData[key];
 			}
 			if (key in target) {
-				deletedProperties.push(key);
+				deletedProperties.add(key);
 			}
 
 			return true;
@@ -114,31 +118,34 @@ export function augmentObject<T extends object>(data: T): T {
 					delete newData[key];
 				}
 				if (key in target) {
-					deletedProperties.push(key);
+					deletedProperties.add(key);
 				}
 				return true;
 			}
 
 			newData[key] = newValue as IDataObject;
 
-			const deleteIndex = deletedProperties.indexOf(key);
-			if (deleteIndex !== -1) {
-				deletedProperties.splice(deleteIndex, 1);
+			if (deletedProperties.has(key)) {
+				deletedProperties.delete(key);
 			}
 
 			return true;
 		},
-
+		has(target, key) {
+			if (deletedProperties.has(key)) return false;
+			return Reflect.has(newData, key) || Reflect.has(target, key);
+		},
 		ownKeys(target) {
 			const originalKeys = Reflect.ownKeys(target);
 			const newKeys = Object.keys(newData);
 			return [...new Set([...originalKeys, ...newKeys])].filter(
-				(key) => deletedProperties.indexOf(key) === -1,
+				(key) => !deletedProperties.has(key),
 			);
 		},
 
 		getOwnPropertyDescriptor(target, key) {
-			return Object.getOwnPropertyDescriptor(data, key) ?? defaultPropertyDescriptor;
+			if (deletedProperties.has(key)) return undefined;
+			return Object.getOwnPropertyDescriptor(key in newData ? newData : data, key);
 		},
 	});
 
diff --git a/packages/workflow/src/Authentication.ts b/packages/workflow/src/Authentication.ts
index b743e1ecab4e0..05fec7b4bd8bd 100644
--- a/packages/workflow/src/Authentication.ts
+++ b/packages/workflow/src/Authentication.ts
@@ -1 +1 @@
-export type AuthenticationMethod = 'none' | 'email' | 'ldap' | 'saml';
+export type AuthenticationMethod = 'email' | 'ldap' | 'saml';
diff --git a/packages/workflow/src/Constants.ts b/packages/workflow/src/Constants.ts
index e2a6fdf1e8540..1988f655d8155 100644
--- a/packages/workflow/src/Constants.ts
+++ b/packages/workflow/src/Constants.ts
@@ -1,3 +1,64 @@
-/* eslint-disable @typescript-eslint/naming-convention */
 export const BINARY_ENCODING = 'base64';
 export const WAIT_TIME_UNLIMITED = '3000-01-01T00:00:00.000Z';
+
+export const LOG_LEVELS = ['silent', 'error', 'warn', 'info', 'debug', 'verbose'] as const;
+
+export const CODE_LANGUAGES = ['javaScript', 'python'] as const;
+export const CODE_EXECUTION_MODES = ['runOnceForAllItems', 'runOnceForEachItem'] as const;
+
+// Arbitrary value to represent an empty credential value
+export const CREDENTIAL_EMPTY_VALUE = '__n8n_EMPTY_VALUE_7b1af746-3729-4c60-9b9b-e08eb29e58da';
+
+export const FORM_TRIGGER_PATH_IDENTIFIER = 'n8n-form';
+
+export const UNKNOWN_ERROR_MESSAGE = 'There was an unknown issue while executing the node';
+export const UNKNOWN_ERROR_DESCRIPTION =
+	'Double-check the node configuration and the service it connects to. Check the error details below and refer to the <a href="https://docs.n8n.io" target="_blank">n8n documentation</a> to troubleshoot the issue.';
+export const UNKNOWN_ERROR_MESSAGE_CRED = 'UNKNOWN ERROR';
+
+//n8n-nodes-base
+export const STICKY_NODE_TYPE = 'n8n-nodes-base.stickyNote';
+export const NO_OP_NODE_TYPE = 'n8n-nodes-base.noOp';
+export const HTTP_REQUEST_NODE_TYPE = 'n8n-nodes-base.httpRequest';
+export const WEBHOOK_NODE_TYPE = 'n8n-nodes-base.webhook';
+export const MANUAL_TRIGGER_NODE_TYPE = 'n8n-nodes-base.manualTrigger';
+export const ERROR_TRIGGER_NODE_TYPE = 'n8n-nodes-base.errorTrigger';
+export const START_NODE_TYPE = 'n8n-nodes-base.start';
+export const EXECUTE_WORKFLOW_TRIGGER_NODE_TYPE = 'n8n-nodes-base.executeWorkflowTrigger';
+export const CODE_NODE_TYPE = 'n8n-nodes-base.code';
+export const FUNCTION_NODE_TYPE = 'n8n-nodes-base.function';
+export const FUNCTION_ITEM_NODE_TYPE = 'n8n-nodes-base.functionItem';
+
+export const STARTING_NODE_TYPES = [
+	MANUAL_TRIGGER_NODE_TYPE,
+	EXECUTE_WORKFLOW_TRIGGER_NODE_TYPE,
+	ERROR_TRIGGER_NODE_TYPE,
+	START_NODE_TYPE,
+];
+
+export const SCRIPTING_NODE_TYPES = [FUNCTION_NODE_TYPE, FUNCTION_ITEM_NODE_TYPE, CODE_NODE_TYPE];
+
+/**
+ * Nodes whose parameter values may refer to other nodes without expressions.
+ * Their content may need to be updated when the referenced node is renamed.
+ */
+export const NODES_WITH_RENAMABLE_CONTENT = new Set([
+	CODE_NODE_TYPE,
+	FUNCTION_NODE_TYPE,
+	FUNCTION_ITEM_NODE_TYPE,
+]);
+
+//@n8n/n8n-nodes-langchain
+export const MANUAL_CHAT_TRIGGER_LANGCHAIN_NODE_TYPE = '@n8n/n8n-nodes-langchain.manualChatTrigger';
+export const AGENT_LANGCHAIN_NODE_TYPE = '@n8n/n8n-nodes-langchain.agent';
+export const CHAIN_LLM_LANGCHAIN_NODE_TYPE = '@n8n/n8n-nodes-langchain.chainLlm';
+export const OPENAI_LANGCHAIN_NODE_TYPE = '@n8n/n8n-nodes-langchain.openAi';
+export const CHAIN_SUMMARIZATION_LANGCHAIN_NODE_TYPE =
+	'@n8n/n8n-nodes-langchain.chainSummarization';
+export const CODE_TOOL_LANGCHAIN_NODE_TYPE = '@n8n/n8n-nodes-langchain.toolCode';
+export const WORKFLOW_TOOL_LANGCHAIN_NODE_TYPE = '@n8n/n8n-nodes-langchain.toolWorkflow';
+
+export const LANGCHAIN_CUSTOM_TOOLS = [
+	CODE_TOOL_LANGCHAIN_NODE_TYPE,
+	WORKFLOW_TOOL_LANGCHAIN_NODE_TYPE,
+];
diff --git a/packages/workflow/src/DeferredPromise.ts b/packages/workflow/src/DeferredPromise.ts
index 80e088e1bd849..1feededead2b3 100644
--- a/packages/workflow/src/DeferredPromise.ts
+++ b/packages/workflow/src/DeferredPromise.ts
@@ -6,9 +6,9 @@ export interface IDeferredPromise<T> {
 }
 
 export async function createDeferredPromise<T = void>(): Promise<IDeferredPromise<T>> {
-	return new Promise<IDeferredPromise<T>>((resolveCreate) => {
+	return await new Promise<IDeferredPromise<T>>((resolveCreate) => {
 		const promise = new Promise<T>((resolve, reject) => {
-			resolveCreate({ promise: async () => promise, resolve, reject });
+			resolveCreate({ promise: async () => await promise, resolve, reject });
 		});
 	});
 }
diff --git a/packages/workflow/src/ErrorReporterProxy.ts b/packages/workflow/src/ErrorReporterProxy.ts
index 6f7251d7375ad..3b50d31719ed5 100644
--- a/packages/workflow/src/ErrorReporterProxy.ts
+++ b/packages/workflow/src/ErrorReporterProxy.ts
@@ -1,11 +1,5 @@
-import type { Primitives } from './utils';
 import * as Logger from './LoggerProxy';
-
-export interface ReportingOptions {
-	level?: 'warning' | 'error' | 'fatal';
-	tags?: Record<string, Primitives>;
-	extra?: Record<string, unknown>;
-}
+import { ApplicationError, type ReportingOptions } from './errors/application.error';
 
 interface ErrorReporter {
 	report: (error: Error | string, options?: ReportingOptions) => void;
@@ -16,7 +10,8 @@ const instance: ErrorReporter = {
 		if (error instanceof Error) {
 			let e = error;
 			do {
-				Logger.error(`${e.constructor.name}: ${e.message}`);
+				const meta = e instanceof ApplicationError ? e.extra : undefined;
+				Logger.error(`${e.constructor.name}: ${e.message}`, meta);
 				e = e.cause as Error;
 			} while (e);
 		}
@@ -29,7 +24,7 @@ export function init(errorReporter: ErrorReporter) {
 
 const wrap = (e: unknown) => {
 	if (e instanceof Error) return e;
-	if (typeof e === 'string') return new Error(e);
+	if (typeof e === 'string') return new ApplicationError(e);
 	return;
 };
 
@@ -38,5 +33,10 @@ export const error = (e: unknown, options?: ReportingOptions) => {
 	if (toReport) instance.report(toReport, options);
 };
 
+export const info = (msg: string, options?: ReportingOptions) => {
+	Logger.info(msg);
+	instance.report(msg, options);
+};
+
 export const warn = (warning: Error | string, options?: ReportingOptions) =>
 	error(warning, { level: 'warning', ...options });
diff --git a/packages/workflow/src/ExecutionStatus.ts b/packages/workflow/src/ExecutionStatus.ts
index 501bd683ede96..715abbaeabfb1 100644
--- a/packages/workflow/src/ExecutionStatus.ts
+++ b/packages/workflow/src/ExecutionStatus.ts
@@ -1,10 +1,13 @@
-export type ExecutionStatus =
-	| 'canceled'
-	| 'crashed'
-	| 'error'
-	| 'failed'
-	| 'new'
-	| 'running'
-	| 'success'
-	| 'unknown'
-	| 'waiting';
+export const ExecutionStatusList = [
+	'canceled' as const,
+	'crashed' as const,
+	'error' as const,
+	'new' as const,
+	'running' as const,
+	'success' as const,
+	'unknown' as const,
+	'waiting' as const,
+	'warning' as const,
+];
+
+export type ExecutionStatus = (typeof ExecutionStatusList)[number];
diff --git a/packages/workflow/src/Expression.ts b/packages/workflow/src/Expression.ts
index 61dd617250eee..35f0ddca6c165 100644
--- a/packages/workflow/src/Expression.ts
+++ b/packages/workflow/src/Expression.ts
@@ -1,7 +1,8 @@
-import * as tmpl from '@n8n_io/riot-tmpl';
 import { DateTime, Duration, Interval } from 'luxon';
+import * as tmpl from '@n8n_io/riot-tmpl';
 
 import type {
+	IDataObject,
 	IExecuteData,
 	INode,
 	INodeExecutionData,
@@ -14,40 +15,56 @@ import type {
 	NodeParameterValueType,
 	WorkflowExecuteMode,
 } from './Interfaces';
-import { ExpressionError } from './ExpressionError';
+import { ExpressionError } from './errors/expression.error';
+import { ExpressionExtensionError } from './errors/expression-extension.error';
 import { WorkflowDataProxy } from './WorkflowDataProxy';
 import type { Workflow } from './Workflow';
 
-// eslint-disable-next-line import/no-cycle
 import { extend, extendOptional } from './Extensions';
 import { extendedFunctions } from './Extensions/ExtendedFunctions';
 import { extendSyntax } from './Extensions/ExpressionExtension';
+import { evaluateExpression, setErrorHandler } from './ExpressionEvaluatorProxy';
+import { getGlobalState } from './GlobalState';
+import { ApplicationError } from './errors/application.error';
+
+const IS_FRONTEND_IN_DEV_MODE =
+	typeof process === 'object' &&
+	Object.keys(process).length === 1 &&
+	'env' in process &&
+	Object.keys(process.env).length === 0;
+
+const IS_FRONTEND = typeof process === 'undefined' || IS_FRONTEND_IN_DEV_MODE;
+
+const isSyntaxError = (error: unknown): error is SyntaxError =>
+	error instanceof SyntaxError || (error instanceof Error && error.name === 'SyntaxError');
+
+const isExpressionError = (error: unknown): error is ExpressionError =>
+	error instanceof ExpressionError || error instanceof ExpressionExtensionError;
 
-// Set it to use double curly brackets instead of single ones
-tmpl.brackets.set('{{ }}');
+const isTypeError = (error: unknown): error is TypeError =>
+	error instanceof TypeError || (error instanceof Error && error.name === 'TypeError');
 
 // Make sure that error get forwarded
-tmpl.tmpl.errorHandler = (error: Error) => {
-	if (error instanceof ExpressionError) {
-		if (error.context.failExecution) {
-			throw error;
-		}
+setErrorHandler((error: Error) => {
+	if (isExpressionError(error)) throw error;
+});
 
-		if (typeof process === 'undefined' && error.clientOnly) {
-			throw error;
-		}
-	}
+const AsyncFunction = (async () => {}).constructor as FunctionConstructor;
+
+const fnConstructors = {
+	sync: Function.prototype.constructor,
+
+	async: AsyncFunction.prototype.constructor,
+	mock: () => {
+		throw new ExpressionError('Arbitrary code execution detected');
+	},
 };
 
 export class Expression {
-	workflow: Workflow;
+	constructor(private readonly workflow: Workflow) {}
 
-	constructor(workflow: Workflow) {
-		this.workflow = workflow;
-	}
-
-	static resolveWithoutWorkflow(expression: string) {
-		return tmpl.tmpl(expression, {});
+	static resolveWithoutWorkflow(expression: string, data: IDataObject = {}) {
+		return tmpl.tmpl(expression, data);
 	}
 
 	/**
@@ -59,14 +76,14 @@ export class Expression {
 		const typeName = Array.isArray(value) ? 'Array' : 'Object';
 
 		if (value instanceof DateTime && value.invalidReason !== null) {
-			throw new Error('invalid DateTime');
+			throw new ApplicationError('invalid DateTime');
 		}
 
 		let result = '';
 		if (value instanceof Date) {
 			// We don't want to use JSON.stringify for dates since it disregards workflow timezone
 			result = DateTime.fromJSDate(value, {
-				zone: this.workflow.settings?.timezone ?? 'default',
+				zone: this.workflow.settings?.timezone ?? getGlobalState().defaultTimezone,
 			}).toISO();
 		} else {
 			result = JSON.stringify(value);
@@ -86,6 +103,8 @@ export class Expression {
 	 * @param {(IRunExecutionData | null)} runExecutionData
 	 * @param {boolean} [returnObjectAsString=false]
 	 */
+	// TODO: Clean that up at some point and move all the options into an options object
+	// eslint-disable-next-line complexity
 	resolveSimpleParameterValue(
 		parameterValue: NodeParameterValue,
 		siblingParameters: INodeParameters,
@@ -95,11 +114,11 @@ export class Expression {
 		activeNodeName: string,
 		connectionInputData: INodeExecutionData[],
 		mode: WorkflowExecuteMode,
-		timezone: string,
 		additionalKeys: IWorkflowDataProxyAdditionalKeys,
 		executeData?: IExecuteData,
 		returnObjectAsString = false,
 		selfData = {},
+		contextNodeName?: string,
 	): NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[] {
 		// Check if it is an expression
 		if (typeof parameterValue !== 'string' || parameterValue.charAt(0) !== '=') {
@@ -110,7 +129,7 @@ export class Expression {
 		// Is an expression
 
 		// Remove the equal sign
-		// eslint-disable-next-line no-param-reassign
+
 		parameterValue = parameterValue.substr(1);
 
 		// Generate a data proxy which allows to query workflow data
@@ -123,11 +142,11 @@ export class Expression {
 			connectionInputData,
 			siblingParameters,
 			mode,
-			timezone,
 			additionalKeys,
 			executeData,
 			-1,
 			selfData,
+			contextNodeName,
 		);
 		const data = dataProxy.getDataProxy();
 
@@ -143,7 +162,7 @@ export class Expression {
 						release: process.release,
 						version: process.pid,
 						versions: process.versions,
-				  }
+					}
 				: {};
 
 		/**
@@ -293,12 +312,12 @@ export class Expression {
 		const extendedExpression = extendSyntax(parameterValue);
 		const returnValue = this.renderExpression(extendedExpression, data);
 		if (typeof returnValue === 'function') {
-			if (returnValue.name === '$') throw new Error('invalid syntax');
+			if (returnValue.name === '$') throw new ApplicationError('invalid syntax');
 
 			if (returnValue.name === 'DateTime')
-				throw new Error('this is a DateTime, please access its methods');
+				throw new ApplicationError('this is a DateTime, please access its methods');
 
-			throw new Error('this is a function, please add ()');
+			throw new ApplicationError('this is a function, please add ()');
 		} else if (typeof returnValue === 'string') {
 			return returnValue;
 		} else if (returnValue !== null && typeof returnValue === 'object') {
@@ -315,44 +334,29 @@ export class Expression {
 		data: IWorkflowDataProxyData,
 	): tmpl.ReturnValue | undefined {
 		try {
-			return tmpl.tmpl(expression, data);
+			[Function, AsyncFunction].forEach(({ prototype }) =>
+				Object.defineProperty(prototype, 'constructor', { value: fnConstructors.mock }),
+			);
+			return evaluateExpression(expression, data);
 		} catch (error) {
-			if (error instanceof ExpressionError) {
-				// Ignore all errors except if they are ExpressionErrors and they are supposed
-				// to fail the execution
-				if (error.context.failExecution) {
-					throw error;
-				}
-
-				if (typeof process === 'undefined' && error.clientOnly) {
-					throw error;
-				}
-			}
+			if (isExpressionError(error)) throw error;
 
-			// Syntax errors resolve to `Error` on the frontend and `null` on the backend.
-			// This is a temporary divergence in evaluation behavior until we make the
-			// breaking change to allow syntax errors to fail executions.
-			if (
-				typeof process === 'undefined' &&
-				error instanceof Error &&
-				error.name === 'SyntaxError'
-			) {
-				throw new Error('invalid syntax');
-			}
+			if (isSyntaxError(error)) throw new ApplicationError('invalid syntax');
 
-			if (
-				typeof process === 'undefined' &&
-				error instanceof Error &&
-				error.name === 'TypeError' &&
-				error.message.endsWith('is not a function')
-			) {
+			if (isTypeError(error) && IS_FRONTEND && error.message.endsWith('is not a function')) {
 				const match = error.message.match(/(?<msg>[^.]+is not a function)/);
 
 				if (!match?.groups?.msg) return null;
 
-				throw new Error(match.groups.msg);
+				throw new ApplicationError(match.groups.msg);
 			}
+		} finally {
+			Object.defineProperty(Function.prototype, 'constructor', { value: fnConstructors.sync });
+			Object.defineProperty(AsyncFunction.prototype, 'constructor', {
+				value: fnConstructors.async,
+			});
 		}
+
 		return null;
 	}
 
@@ -365,11 +369,10 @@ export class Expression {
 		node: INode,
 		parameterValue: string | boolean | undefined,
 		mode: WorkflowExecuteMode,
-		timezone: string,
 		additionalKeys: IWorkflowDataProxyAdditionalKeys,
 		executeData?: IExecuteData,
-		defaultValue?: boolean | number | string,
-	): boolean | number | string | undefined {
+		defaultValue?: boolean | number | string | unknown[],
+	): boolean | number | string | undefined | unknown[] {
 		if (parameterValue === undefined) {
 			// Value is not set so return the default
 			return defaultValue;
@@ -393,7 +396,6 @@ export class Expression {
 			node.name,
 			connectionInputData,
 			mode,
-			timezone,
 			additionalKeys,
 			executeData,
 		) as boolean | number | string | undefined;
@@ -409,7 +411,6 @@ export class Expression {
 		node: INode,
 		parameterValue: NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[],
 		mode: WorkflowExecuteMode,
-		timezone: string,
 		additionalKeys: IWorkflowDataProxyAdditionalKeys,
 		executeData?: IExecuteData,
 		defaultValue: NodeParameterValueType | undefined = undefined,
@@ -439,7 +440,6 @@ export class Expression {
 			node.name,
 			connectionInputData,
 			mode,
-			timezone,
 			additionalKeys,
 			executeData,
 			false,
@@ -455,7 +455,6 @@ export class Expression {
 			node.name,
 			connectionInputData,
 			mode,
-			timezone,
 			additionalKeys,
 			executeData,
 			false,
@@ -472,6 +471,7 @@ export class Expression {
 	 * @param {(IRunExecutionData | null)} runExecutionData
 	 * @param {boolean} [returnObjectAsString=false]
 	 */
+	// TODO: Clean that up at some point and move all the options into an options object
 	getParameterValue(
 		parameterValue: NodeParameterValueType | INodeParameterResourceLocator,
 		runExecutionData: IRunExecutionData | null,
@@ -480,11 +480,11 @@ export class Expression {
 		activeNodeName: string,
 		connectionInputData: INodeExecutionData[],
 		mode: WorkflowExecuteMode,
-		timezone: string,
 		additionalKeys: IWorkflowDataProxyAdditionalKeys,
 		executeData?: IExecuteData,
 		returnObjectAsString = false,
 		selfData = {},
+		contextNodeName?: string,
 	): NodeParameterValueType {
 		// Helper function which returns true when the parameter is a complex one or array
 		const isComplexParameter = (value: NodeParameterValueType) => {
@@ -505,11 +505,11 @@ export class Expression {
 					activeNodeName,
 					connectionInputData,
 					mode,
-					timezone,
 					additionalKeys,
 					executeData,
 					returnObjectAsString,
 					selfData,
+					contextNodeName,
 				);
 			}
 
@@ -522,11 +522,11 @@ export class Expression {
 				activeNodeName,
 				connectionInputData,
 				mode,
-				timezone,
 				additionalKeys,
 				executeData,
 				returnObjectAsString,
 				selfData,
+				contextNodeName,
 			);
 		};
 
@@ -541,18 +541,20 @@ export class Expression {
 				activeNodeName,
 				connectionInputData,
 				mode,
-				timezone,
 				additionalKeys,
 				executeData,
 				returnObjectAsString,
 				selfData,
+				contextNodeName,
 			);
 		}
 
 		// The parameter value is complex so resolve depending on type
 		if (Array.isArray(parameterValue)) {
 			// Data is an array
-			const returnData = parameterValue.map((item) => resolveParameterValue(item, {}));
+			const returnData = parameterValue.map((item) =>
+				resolveParameterValue(item as NodeParameterValueType, {}),
+			);
 			return returnData as NodeParameterValue[] | INodeParameters[];
 		}
 
@@ -566,7 +568,7 @@ export class Expression {
 
 		// Data is an object
 		const returnData: INodeParameters = {};
-		// eslint-disable-next-line no-restricted-syntax
+
 		for (const [key, value] of Object.entries(parameterValue)) {
 			returnData[key] = resolveParameterValue(
 				value as NodeParameterValueType,
diff --git a/packages/workflow/src/ExpressionError.ts b/packages/workflow/src/ExpressionError.ts
deleted file mode 100644
index c7540ccd6fc92..0000000000000
--- a/packages/workflow/src/ExpressionError.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-import type { IDataObject } from './Interfaces';
-import { ExecutionBaseError } from './NodeErrors';
-
-/**
- * Class for instantiating an expression error
- */
-export class ExpressionError extends ExecutionBaseError {
-	clientOnly = false;
-
-	constructor(
-		message: string,
-		options?: {
-			cause?: Error;
-			causeDetailed?: string;
-			description?: string;
-			descriptionTemplate?: string;
-			failExecution?: boolean;
-			clientOnly?: boolean; // whether to throw error only on frontend
-			functionality?: 'pairedItem';
-			itemIndex?: number;
-			messageTemplate?: string;
-			nodeCause?: string;
-			parameter?: string;
-			runIndex?: number;
-			type?: string;
-		},
-	) {
-		super(message, { cause: options?.cause });
-
-		if (options?.description !== undefined) {
-			this.description = options.description;
-		}
-
-		if (options?.clientOnly) {
-			this.clientOnly = options.clientOnly;
-		}
-
-		this.context.failExecution = !!options?.failExecution;
-
-		const allowedKeys = [
-			'causeDetailed',
-			'descriptionTemplate',
-			'functionality',
-			'itemIndex',
-			'messageTemplate',
-			'nodeCause',
-			'parameter',
-			'runIndex',
-			'type',
-		];
-		if (options !== undefined) {
-			Object.keys(options as IDataObject).forEach((key) => {
-				if (allowedKeys.includes(key)) {
-					this.context[key] = (options as IDataObject)[key];
-				}
-			});
-		}
-	}
-}
-
-export class ExpressionExtensionError extends ExpressionError {
-	constructor(message: string) {
-		super(message);
-		this.context.failExecution = true;
-	}
-}
diff --git a/packages/workflow/src/ExpressionEvaluatorProxy.ts b/packages/workflow/src/ExpressionEvaluatorProxy.ts
new file mode 100644
index 0000000000000..60e33e5a7d15c
--- /dev/null
+++ b/packages/workflow/src/ExpressionEvaluatorProxy.ts
@@ -0,0 +1,149 @@
+import * as tmpl from '@n8n_io/riot-tmpl';
+import type { ReturnValue, TmplDifference } from '@n8n/tournament';
+import { Tournament } from '@n8n/tournament';
+import type { ExpressionEvaluatorType } from './Interfaces';
+import * as LoggerProxy from './LoggerProxy';
+
+type Evaluator = (expr: string, data: unknown) => tmpl.ReturnValue;
+type ErrorHandler = (error: Error) => void;
+type DifferenceHandler = (expr: string) => void;
+
+// Set it to use double curly brackets instead of single ones
+tmpl.brackets.set('{{ }}');
+
+let errorHandler: ErrorHandler = () => {};
+let differenceHandler: DifferenceHandler = () => {};
+const differenceChecker = (diff: TmplDifference) => {
+	try {
+		if (diff.same) {
+			return;
+		}
+		if (diff.has?.function || diff.has?.templateString) {
+			return;
+		}
+		if (diff.expression === 'UNPARSEABLE') {
+			differenceHandler(diff.expression);
+		} else {
+			differenceHandler(diff.expression.value);
+		}
+	} catch {
+		LoggerProxy.error('Expression evaluator difference checker failed');
+	}
+};
+const tournamentEvaluator = new Tournament(errorHandler, undefined);
+let evaluator: Evaluator = tmpl.tmpl;
+let currentEvaluatorType: ExpressionEvaluatorType = 'tmpl';
+let diffExpressions = false;
+
+export const setErrorHandler = (handler: ErrorHandler) => {
+	errorHandler = handler;
+	tmpl.tmpl.errorHandler = handler;
+	tournamentEvaluator.errorHandler = handler;
+};
+
+export const setEvaluator = (evalType: ExpressionEvaluatorType) => {
+	currentEvaluatorType = evalType;
+	if (evalType === 'tmpl') {
+		evaluator = tmpl.tmpl;
+	} else if (evalType === 'tournament') {
+		evaluator = tournamentEvaluator.execute.bind(tournamentEvaluator);
+	}
+};
+
+export const setDiffReporter = (reporter: (expr: string) => void) => {
+	differenceHandler = reporter;
+};
+
+export const setDifferEnabled = (enabled: boolean) => {
+	diffExpressions = enabled;
+};
+
+const diffCache: Record<string, TmplDifference | null> = {};
+
+export const checkEvaluatorDifferences = (expr: string): TmplDifference | null => {
+	if (expr in diffCache) {
+		return diffCache[expr];
+	}
+	let diff: TmplDifference | null;
+	try {
+		diff = tournamentEvaluator.tmplDiff(expr);
+	} catch {
+		// We don't include the expression for privacy reasons
+		try {
+			differenceHandler('ERROR');
+		} catch {}
+		diff = null;
+	}
+
+	if (diff?.same === false) {
+		differenceChecker(diff);
+	}
+
+	diffCache[expr] = diff;
+	return diff;
+};
+
+export const getEvaluator = () => {
+	return evaluator;
+};
+
+export const evaluateExpression: Evaluator = (expr, data) => {
+	if (!diffExpressions) {
+		return evaluator(expr, data);
+	}
+	const diff = checkEvaluatorDifferences(expr);
+
+	// We already know that they're different so don't bother
+	// evaluating with both evaluators
+	if (!diff?.same) {
+		return evaluator(expr, data);
+	}
+
+	let tmplValue: tmpl.ReturnValue;
+	let tournValue: ReturnValue;
+	let wasTmplError = false;
+	let tmplError: unknown;
+	let wasTournError = false;
+	let tournError: unknown;
+
+	try {
+		tmplValue = tmpl.tmpl(expr, data);
+	} catch (error) {
+		tmplError = error;
+		wasTmplError = true;
+	}
+
+	try {
+		tournValue = tournamentEvaluator.execute(expr, data);
+	} catch (error) {
+		tournError = error;
+		wasTournError = true;
+	}
+
+	if (
+		wasTmplError !== wasTournError ||
+		JSON.stringify(tmplValue!) !== JSON.stringify(tournValue!)
+	) {
+		try {
+			if (diff.expression) {
+				differenceHandler(diff.expression.value);
+			} else {
+				differenceHandler('VALUEDIFF');
+			}
+		} catch {
+			LoggerProxy.error('Failed to report error difference');
+		}
+	}
+
+	if (currentEvaluatorType === 'tmpl') {
+		if (wasTmplError) {
+			throw tmplError;
+		}
+		return tmplValue!;
+	}
+
+	if (wasTournError) {
+		throw tournError;
+	}
+	return tournValue!;
+};
diff --git a/packages/workflow/src/Extensions/ArrayExtensions.ts b/packages/workflow/src/Extensions/ArrayExtensions.ts
index 06383a6c82890..23b2ca33c1f39 100644
--- a/packages/workflow/src/Extensions/ArrayExtensions.ts
+++ b/packages/workflow/src/Extensions/ArrayExtensions.ts
@@ -1,4 +1,5 @@
-import { ExpressionError, ExpressionExtensionError } from '../ExpressionError';
+import { ExpressionError } from '../errors/expression.error';
+import { ExpressionExtensionError } from '../errors/expression-extension.error';
 import type { ExtensionMap } from './Extensions';
 import { compact as oCompact } from './ObjectExtensions';
 import deepEqual from 'deep-equal';
@@ -182,7 +183,7 @@ function chunk(value: unknown[], extraArgs: number[]) {
 	const chunks: unknown[][] = [];
 	for (let i = 0; i < value.length; i += chunkSize) {
 		// I have no clue why eslint thinks 2 numbers could be anything but that but here we are
-		// eslint-disable-next-line @typescript-eslint/restrict-plus-operands
+
 		chunks.push(value.slice(i, i + chunkSize));
 	}
 	return chunks;
@@ -275,7 +276,6 @@ function union(value: unknown[], extraArgs: unknown[][]): unknown[] {
 	}
 	const newArr: unknown[] = Array.from(value);
 	for (const v of others) {
-		// eslint-disable-next-line @typescript-eslint/no-unsafe-call
 		if (newArr.findIndex((w) => deepEqual(w, v, { strict: true })) === -1) {
 			newArr.push(v);
 		}
@@ -313,7 +313,6 @@ function intersection(value: unknown[], extraArgs: unknown[][]): unknown[] {
 		}
 	}
 	for (const v of others) {
-		// eslint-disable-next-line @typescript-eslint/no-unsafe-call
 		if (value.findIndex((w) => deepEqual(w, v, { strict: true })) !== -1) {
 			newArr.push(v);
 		}
@@ -321,84 +320,94 @@ function intersection(value: unknown[], extraArgs: unknown[][]): unknown[] {
 	return unique(newArr, []);
 }
 
+export function toJsonString(value: unknown[]) {
+	return JSON.stringify(value);
+}
+
+export function toInt() {
+	return undefined;
+}
+
+export function toFloat() {
+	return undefined;
+}
+
+export function toBoolean() {
+	return undefined;
+}
+
+export function toDateTime() {
+	return undefined;
+}
+
 average.doc = {
 	name: 'average',
 	description: 'Returns the mean average of all values in the array.',
 	returnType: 'number',
-	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/arrays/#array-average',
+	docURL: 'https://docs.n8n.io/code/builtin/data-transformation-functions/arrays/#array-average',
 };
 
 compact.doc = {
 	name: 'compact',
 	description: 'Removes all empty values from the array.',
 	returnType: 'Array',
-	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/arrays/#array-compact',
+	docURL: 'https://docs.n8n.io/code/builtin/data-transformation-functions/arrays/#array-compact',
 };
 
 isEmpty.doc = {
 	name: 'isEmpty',
 	description: 'Checks if the array doesn’t have any elements.',
 	returnType: 'boolean',
-	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/arrays/#array-isEmpty',
+	docURL: 'https://docs.n8n.io/code/builtin/data-transformation-functions/arrays/#array-isEmpty',
 };
 
 isNotEmpty.doc = {
 	name: 'isNotEmpty',
 	description: 'Checks if the array has elements.',
 	returnType: 'boolean',
-	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/arrays/#array-isNotEmpty',
+	docURL: 'https://docs.n8n.io/code/builtin/data-transformation-functions/arrays/#array-isNotEmpty',
 };
 
 first.doc = {
 	name: 'first',
 	description: 'Returns the first element of the array.',
 	returnType: 'Element',
-	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/arrays/#array-first',
+	docURL: 'https://docs.n8n.io/code/builtin/data-transformation-functions/arrays/#array-first',
 };
 
 last.doc = {
 	name: 'last',
 	description: 'Returns the last element of the array.',
 	returnType: 'Element',
-	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/arrays/#array-last',
+	docURL: 'https://docs.n8n.io/code/builtin/data-transformation-functions/arrays/#array-last',
 };
 
 max.doc = {
 	name: 'max',
 	description: 'Gets the maximum value from a number-only array.',
 	returnType: 'number',
-	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/arrays/#array-max',
+	docURL: 'https://docs.n8n.io/code/builtin/data-transformation-functions/arrays/#array-max',
 };
 
 min.doc = {
 	name: 'min',
 	description: 'Gets the minimum value from a number-only array.',
 	returnType: 'number',
-	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/arrays/#array-min',
+	docURL: 'https://docs.n8n.io/code/builtin/data-transformation-functions/arrays/#array-min',
 };
 
 randomItem.doc = {
 	name: 'randomItem',
 	description: 'Returns a random element from an array.',
 	returnType: 'Element',
-	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/arrays/#array-randomItem',
+	docURL: 'https://docs.n8n.io/code/builtin/data-transformation-functions/arrays/#array-randomItem',
 };
 
 sum.doc = {
 	name: 'sum',
 	description: 'Returns the total sum all the values in an array of parsable numbers.',
 	returnType: 'number',
-	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/arrays/#array-sum',
+	docURL: 'https://docs.n8n.io/code/builtin/data-transformation-functions/arrays/#array-sum',
 };
 
 chunk.doc = {
@@ -406,8 +415,7 @@ chunk.doc = {
 	description: 'Splits arrays into chunks with a length of `size`.',
 	returnType: 'Array',
 	args: [{ name: 'size', type: 'number' }],
-	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/arrays/#array-chunk',
+	docURL: 'https://docs.n8n.io/code/builtin/data-transformation-functions/arrays/#array-chunk',
 };
 
 difference.doc = {
@@ -416,8 +424,7 @@ difference.doc = {
 		'Compares two arrays. Returns all elements in the base array that aren’t present in `arr`.',
 	returnType: 'Array',
 	args: [{ name: 'arr', type: 'Array' }],
-	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/arrays/#array-difference',
+	docURL: 'https://docs.n8n.io/code/builtin/data-transformation-functions/arrays/#array-difference',
 };
 
 intersection.doc = {
@@ -427,7 +434,7 @@ intersection.doc = {
 	returnType: 'Array',
 	args: [{ name: 'arr', type: 'Array' }],
 	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/arrays/#array-intersection',
+		'https://docs.n8n.io/code/builtin/data-transformation-functions/arrays/#array-intersection',
 };
 
 merge.doc = {
@@ -436,8 +443,7 @@ merge.doc = {
 		'Merges two Object-arrays into one array by merging the key-value pairs of each element.',
 	returnType: 'array',
 	args: [{ name: 'arr', type: 'Array' }],
-	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/arrays/#array-merge',
+	docURL: 'https://docs.n8n.io/code/builtin/data-transformation-functions/arrays/#array-merge',
 };
 
 pluck.doc = {
@@ -450,8 +456,7 @@ pluck.doc = {
 		{ name: '...' },
 		{ name: 'fieldNameN?', type: 'string' },
 	],
-	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/arrays/#array-pluck',
+	docURL: 'https://docs.n8n.io/code/builtin/data-transformation-functions/arrays/#array-pluck',
 };
 
 renameKeys.doc = {
@@ -467,8 +472,7 @@ renameKeys.doc = {
 		{ name: 'fromN?', type: 'string' },
 		{ name: 'toN?', type: 'string' },
 	],
-	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/arrays/#array-renameKeys',
+	docURL: 'https://docs.n8n.io/code/builtin/data-transformation-functions/arrays/#array-renameKeys',
 };
 
 smartJoin.doc = {
@@ -480,8 +484,7 @@ smartJoin.doc = {
 		{ name: 'keyField', type: 'string' },
 		{ name: 'nameField', type: 'string' },
 	],
-	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/arrays/#array-smartJoin',
+	docURL: 'https://docs.n8n.io/code/builtin/data-transformation-functions/arrays/#array-smartJoin',
 };
 
 union.doc = {
@@ -489,8 +492,7 @@ union.doc = {
 	description: 'Concatenates two arrays and then removes duplicates.',
 	returnType: 'Array',
 	args: [{ name: 'arr', type: 'Array' }],
-	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/arrays/#array-union',
+	docURL: 'https://docs.n8n.io/code/builtin/data-transformation-functions/arrays/#array-union',
 };
 
 unique.doc = {
@@ -498,8 +500,15 @@ unique.doc = {
 	description: 'Remove duplicates from an array. ',
 	returnType: 'Element',
 	aliases: ['removeDuplicates'],
+	docURL: 'https://docs.n8n.io/code/builtin/data-transformation-functions/arrays/#array-unique',
+};
+
+toJsonString.doc = {
+	name: 'toJsonString',
+	description: 'Converts an array to a JSON string',
 	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/arrays/#array-unique',
+		'https://docs.n8n.io/code/builtin/data-transformation-functions/arrays/#array-toJsonString',
+	returnType: 'string',
 };
 
 export const arrayExtensions: ExtensionMap = {
@@ -525,5 +534,10 @@ export const arrayExtensions: ExtensionMap = {
 		union,
 		difference,
 		intersection,
+		toJsonString,
+		toInt,
+		toFloat,
+		toBoolean,
+		toDateTime,
 	},
 };
diff --git a/packages/workflow/src/Extensions/BooleanExtensions.ts b/packages/workflow/src/Extensions/BooleanExtensions.ts
new file mode 100644
index 0000000000000..c275c304c94b0
--- /dev/null
+++ b/packages/workflow/src/Extensions/BooleanExtensions.ts
@@ -0,0 +1,35 @@
+import type { ExtensionMap } from './Extensions';
+
+export function toBoolean(value: boolean) {
+	return value;
+}
+
+export function toInt(value: boolean) {
+	return value ? 1 : 0;
+}
+
+export function toFloat(value: boolean) {
+	return value ? 1 : 0;
+}
+
+export function toDateTime() {
+	return undefined;
+}
+
+toInt.doc = {
+	name: 'toInt',
+	description: 'Converts a boolean to an integer. `false` is 0, `true` is 1.',
+	section: 'cast',
+	returnType: 'boolean',
+	docURL: 'https://docs.n8n.io/code/builtin/data-transformation-functions/booleans/#boolean-toInt',
+};
+
+export const booleanExtensions: ExtensionMap = {
+	typeName: 'Boolean',
+	functions: {
+		toBoolean,
+		toInt,
+		toFloat,
+		toDateTime,
+	},
+};
diff --git a/packages/workflow/src/Extensions/DateExtensions.ts b/packages/workflow/src/Extensions/DateExtensions.ts
index 6208c234429fc..f0e8e670620d3 100644
--- a/packages/workflow/src/Extensions/DateExtensions.ts
+++ b/packages/workflow/src/Extensions/DateExtensions.ts
@@ -1,6 +1,5 @@
-import { ExpressionExtensionError } from './../ExpressionError';
-/* eslint-disable @typescript-eslint/unbound-method */
-/* eslint-disable @typescript-eslint/explicit-member-accessibility */
+import { ExpressionExtensionError } from '../errors/expression-extension.error';
+
 import { DateTime } from 'luxon';
 import type {
 	DateTimeUnit,
@@ -70,57 +69,54 @@ const DATETIMEUNIT_MAP: Record<string, DateTimeUnit> = {
 	ms: 'millisecond',
 };
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-function isDateTime(date: any): date is DateTime {
-	if (date) {
-		// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-		return DateTime.isDateTime(date);
-	}
-	return false;
+function isDateTime(date: unknown): date is DateTime {
+	return date ? DateTime.isDateTime(date) : false;
 }
 
-function generateDurationObject(durationValue: number, unit: DurationUnit) {
+function generateDurationObject(durationValue: number, unit: DurationUnit): DurationObjectUnits {
 	const convertedUnit = DURATION_MAP[unit] || unit;
-	return { [`${convertedUnit}`]: durationValue } as DurationObjectUnits;
+	return { [`${convertedUnit}`]: durationValue };
 }
 
-function beginningOf(date: Date | DateTime, extraArgs: DurationUnit[]): Date {
-	const [unit = 'week'] = extraArgs;
+function beginningOf(date: Date | DateTime, extraArgs: DurationUnit[]): Date | DateTime {
+	const [rawUnit = 'week'] = extraArgs;
 
-	if (isDateTime(date)) {
-		return date.startOf(DATETIMEUNIT_MAP[unit] || unit).toJSDate();
-	}
-	const dateTime = DateTime.fromJSDate(date);
-	return dateTime.startOf(DATETIMEUNIT_MAP[unit] || unit).toJSDate();
+	const unit = DATETIMEUNIT_MAP[rawUnit] || rawUnit;
+
+	if (isDateTime(date)) return date.startOf(unit);
+
+	return DateTime.fromJSDate(date).startOf(unit).toJSDate();
 }
 
-function endOfMonth(date: Date | DateTime): Date {
-	if (isDateTime(date)) {
-		return date.endOf('month').toJSDate();
-	}
+function endOfMonth(date: Date | DateTime): Date | DateTime {
+	if (isDateTime(date)) return date.endOf('month');
+
 	return DateTime.fromJSDate(date).endOf('month').toJSDate();
 }
 
-function extract(inputDate: Date | DateTime, extraArgs: DatePart[]): number | Date {
-	let [part = 'week'] = extraArgs;
-	let date = inputDate;
-	if (isDateTime(date)) {
-		date = date.toJSDate();
-	}
+function extract(date: Date | DateTime, args: DatePart[]): number {
+	let [part = 'week'] = args;
+
 	if (part === 'yearDayNumber') {
+		date = isDateTime(date) ? date.toJSDate() : date;
+
 		const firstDayOfTheYear = new Date(date.getFullYear(), 0, 0);
+
 		const diff =
 			date.getTime() -
 			firstDayOfTheYear.getTime() +
 			(firstDayOfTheYear.getTimezoneOffset() - date.getTimezoneOffset()) * 60 * 1000;
+
 		return Math.floor(diff / (1000 * 60 * 60 * 24));
 	}
 
-	if (part === 'week') {
-		part = 'weekNumber';
-	}
+	if (part === 'week') part = 'weekNumber';
 
-	return DateTime.fromJSDate(date).get((DATETIMEUNIT_MAP[part] as keyof DateTime) || part);
+	const unit = (DATETIMEUNIT_MAP[part] as keyof DateTime) || part;
+
+	if (isDateTime(date)) return date.get(unit);
+
+	return DateTime.fromJSDate(date).get(unit);
 }
 
 function format(date: Date | DateTime, extraArgs: unknown[]): string {
@@ -178,129 +174,177 @@ function isWeekend(date: Date | DateTime): boolean {
 	return WEEKEND_DAYS.includes(weekday);
 }
 
-function minus(date: Date | DateTime, extraArgs: unknown[]): Date | DateTime {
-	if (isDateTime(date) && extraArgs.length === 1) {
-		return date.minus(extraArgs[0] as DurationLike);
-	}
+function minus(
+	date: Date | DateTime,
+	args: [DurationLike] | [number, DurationUnit],
+): Date | DateTime {
+	if (args.length === 1) {
+		const [arg] = args;
 
-	const [durationValue = 0, unit = 'minutes'] = extraArgs as [number, DurationUnit];
+		if (isDateTime(date)) return date.minus(arg);
 
-	if (isDateTime(date)) {
-		return date.minus(generateDurationObject(durationValue, unit)).toJSDate();
+		return DateTime.fromJSDate(date).minus(arg).toJSDate();
 	}
-	return DateTime.fromJSDate(date).minus(generateDurationObject(durationValue, unit)).toJSDate();
+
+	const [durationValue = 0, unit = 'minutes'] = args;
+
+	const duration = generateDurationObject(durationValue, unit);
+
+	if (isDateTime(date)) return date.minus(duration);
+
+	return DateTime.fromJSDate(date).minus(duration).toJSDate();
 }
 
-function plus(date: Date | DateTime, extraArgs: unknown[]): Date | DateTime {
-	if (isDateTime(date) && extraArgs.length === 1) {
-		return date.plus(extraArgs[0] as DurationLike);
+function plus(
+	date: Date | DateTime,
+	args: [DurationLike] | [number, DurationUnit],
+): Date | DateTime {
+	if (args.length === 1) {
+		const [arg] = args;
+
+		if (isDateTime(date)) return date.plus(arg);
+
+		return DateTime.fromJSDate(date).plus(arg).toJSDate();
 	}
 
-	const [durationValue = 0, unit = 'minutes'] = extraArgs as [number, DurationUnit];
+	const [durationValue = 0, unit = 'minutes'] = args;
+
+	const duration = generateDurationObject(durationValue, unit);
+
+	if (isDateTime(date)) return date.plus(duration);
 
+	return DateTime.fromJSDate(date).plus(duration).toJSDate();
+}
+
+function toDateTime(date: Date | DateTime): DateTime {
+	if (isDateTime(date)) return date;
+
+	return DateTime.fromJSDate(date);
+}
+
+function toInt(date: Date | DateTime): number {
 	if (isDateTime(date)) {
-		return date.plus(generateDurationObject(durationValue, unit)).toJSDate();
+		return date.toMillis();
 	}
-	return DateTime.fromJSDate(date).plus(generateDurationObject(durationValue, unit)).toJSDate();
+	return date.getTime();
+}
+
+const toFloat = toInt;
+
+function toBoolean() {
+	return undefined;
 }
 
 endOfMonth.doc = {
 	name: 'endOfMonth',
 	returnType: 'Date',
+	hidden: true,
 	description: 'Transforms a date to the last possible moment that lies within the month.',
-	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/dates/#date-endOfMonth',
+	section: 'edit',
+	docURL: 'https://docs.n8n.io/code/builtin/data-transformation-functions/dates/#date-endOfMonth',
 };
 
 isDst.doc = {
 	name: 'isDst',
 	returnType: 'boolean',
+	hidden: true,
 	description: 'Checks if a Date is within Daylight Savings Time.',
-	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/dates/#date-isDst',
+	section: 'query',
+	docURL: 'https://docs.n8n.io/code/builtin/data-transformation-functions/dates/#date-isDst',
 };
 
 isWeekend.doc = {
 	name: 'isWeekend',
 	returnType: 'boolean',
+	hidden: true,
 	description: 'Checks if the Date falls on a Saturday or Sunday.',
-	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/dates/#date-isWeekend',
+	section: 'query',
+	docURL: 'https://docs.n8n.io/code/builtin/data-transformation-functions/dates/#date-isWeekend',
 };
 
 beginningOf.doc = {
 	name: 'beginningOf',
 	description: 'Transform a Date to the start of the given time period. Default unit is `week`.',
+	section: 'edit',
+	hidden: true,
 	returnType: 'Date',
 	args: [{ name: 'unit?', type: 'DurationUnit' }],
-	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/dates/#date-beginningOf',
+	docURL: 'https://docs.n8n.io/code/builtin/data-transformation-functions/dates/#date-beginningOf',
 };
 
 extract.doc = {
 	name: 'extract',
 	description: 'Extracts the part defined in `datePart` from a Date. Default unit is `week`.',
+	section: 'query',
 	returnType: 'number',
 	args: [{ name: 'datePart?', type: 'DurationUnit' }],
-	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/dates/#date-extract',
+	docURL: 'https://docs.n8n.io/code/builtin/data-transformation-functions/dates/#date-extract',
 };
 
 format.doc = {
 	name: 'format',
 	description: 'Formats a Date in the given structure.',
 	returnType: 'string',
-	args: [{ name: 'fmt', type: 'TimeFormat' }],
-	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/dates/#date-format',
+	section: 'format',
+	args: [{ name: 'fmt', default: 'yyyy-MM-dd', type: 'TimeFormat' }],
+	docURL: 'https://docs.n8n.io/code/builtin/data-transformation-functions/dates/#date-format',
 };
 
 isBetween.doc = {
 	name: 'isBetween',
 	description: 'Checks if a Date is between two given dates.',
+	section: 'query',
 	returnType: 'boolean',
 	args: [
 		{ name: 'date1', type: 'Date|string' },
 		{ name: 'date2', type: 'Date|string' },
 	],
-	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/dates/#date-isBetween',
+	docURL: 'https://docs.n8n.io/code/builtin/data-transformation-functions/dates/#date-isBetween',
 };
 
 isInLast.doc = {
 	name: 'isInLast',
 	description: 'Checks if a Date is within a given time period. Default unit is `minute`.',
+	section: 'query',
 	returnType: 'boolean',
 	args: [
 		{ name: 'n', type: 'number' },
 		{ name: 'unit?', type: 'DurationUnit' },
 	],
-	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/dates/#date-isInLast',
+	docURL: 'https://docs.n8n.io/code/builtin/data-transformation-functions/dates/#date-isInLast',
+};
+
+toDateTime.doc = {
+	name: 'toDateTime',
+	description: 'Convert a JavaScript Date to a Luxon DateTime.',
+	section: 'query',
+	returnType: 'DateTime',
+	hidden: true,
+	docURL: 'https://docs.n8n.io/code/builtin/data-transformation-functions/dates/#date-toDateTime',
 };
 
 minus.doc = {
 	name: 'minus',
-	description: 'Subtracts a given time period from a Date. Default unit is `minute`.',
+	description: 'Subtracts a given time period from a Date. Default unit is `milliseconds`.',
+	section: 'edit',
 	returnType: 'Date',
 	args: [
 		{ name: 'n', type: 'number' },
 		{ name: 'unit?', type: 'DurationUnit' },
 	],
-	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/dates/#date-minus',
+	docURL: 'https://docs.n8n.io/code/builtin/data-transformation-functions/dates/#date-minus',
 };
 
 plus.doc = {
 	name: 'plus',
-	description: 'Adds a given time period to a Date. Default unit is `minute`.',
+	description: 'Adds a given time period to a Date. Default unit is `milliseconds`.',
+	section: 'edit',
 	returnType: 'Date',
 	args: [
 		{ name: 'n', type: 'number' },
 		{ name: 'unit?', type: 'DurationUnit' },
 	],
-	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/dates/#date-plus',
+	docURL: 'https://docs.n8n.io/code/builtin/data-transformation-functions/dates/#date-plus',
 };
 
 export const dateExtensions: ExtensionMap = {
@@ -316,5 +360,9 @@ export const dateExtensions: ExtensionMap = {
 		minus,
 		plus,
 		format,
+		toDateTime,
+		toInt,
+		toFloat,
+		toBoolean,
 	},
 };
diff --git a/packages/workflow/src/Extensions/ExpressionExtension.ts b/packages/workflow/src/Extensions/ExpressionExtension.ts
index 6600f8e8ead68..3231abfaf0843 100644
--- a/packages/workflow/src/Extensions/ExpressionExtension.ts
+++ b/packages/workflow/src/Extensions/ExpressionExtension.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 import { DateTime } from 'luxon';
-import { ExpressionExtensionError } from '../ExpressionError';
+import { ExpressionExtensionError } from '../errors/expression-extension.error';
 import { parse, visit, types, print } from 'recast';
 import { getOption } from 'recast/lib/util';
 import type { Config as EsprimaConfig } from 'esprima-next';
@@ -15,6 +15,7 @@ import type { ExpressionKind } from 'ast-types/gen/kinds';
 
 import type { ExpressionChunk, ExpressionCode } from './ExpressionParser';
 import { joinExpression, splitExpression } from './ExpressionParser';
+import { booleanExtensions } from './BooleanExtensions';
 
 const EXPRESSION_EXTENDER = 'extend';
 const EXPRESSION_EXTENDER_OPTIONAL = 'extendOptional';
@@ -33,6 +34,7 @@ export const EXTENSION_OBJECTS = [
 	numberExtensions,
 	objectExtensions,
 	stringExtensions,
+	booleanExtensions,
 ];
 
 // eslint-disable-next-line @typescript-eslint/ban-types
@@ -48,6 +50,7 @@ const EXPRESSION_EXTENSION_METHODS = Array.from(
 		...Object.keys(dateExtensions.functions),
 		...Object.keys(arrayExtensions.functions),
 		...Object.keys(objectExtensions.functions),
+		...Object.keys(booleanExtensions.functions),
 		...Object.keys(genericExtensions),
 	]),
 );
@@ -88,7 +91,6 @@ export const hasNativeMethod = (method: string): boolean => {
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function parseWithEsprimaNext(source: string, options?: any): any {
-	// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
 	const ast = esprimaParse(source, {
 		loc: true,
 		locations: true,
@@ -125,6 +127,7 @@ export const extendTransform = (expression: string): { code: string } | undefine
 
 		// Polyfill optional chaining
 		visit(ast, {
+			// eslint-disable-next-line complexity
 			visitChainExpression(path) {
 				this.traverse(path);
 				const chainNumber = currentChain;
@@ -451,13 +454,12 @@ interface FoundFunction {
 	function: Function;
 }
 
-// eslint-disable-next-line @typescript-eslint/ban-types
 function findExtendedFunction(input: unknown, functionName: string): FoundFunction | undefined {
 	// eslint-disable-next-line @typescript-eslint/ban-types
 	let foundFunction: Function | undefined;
 	if (Array.isArray(input)) {
 		foundFunction = arrayExtensions.functions[functionName];
-	} else if (isDate(input) && functionName !== 'toDate') {
+	} else if (isDate(input) && functionName !== 'toDate' && functionName !== 'toDateTime') {
 		// If it's a string date (from $json), convert it to a Date object,
 		// unless that function is `toDate`, since `toDate` does something
 		// very different on date objects
@@ -471,6 +473,8 @@ function findExtendedFunction(input: unknown, functionName: string): FoundFuncti
 		foundFunction = dateExtensions.functions[functionName];
 	} else if (input !== null && typeof input === 'object') {
 		foundFunction = objectExtensions.functions[functionName];
+	} else if (typeof input === 'boolean') {
+		foundFunction = booleanExtensions.functions[functionName];
 	}
 
 	// Look for generic or builtin
@@ -479,12 +483,7 @@ function findExtendedFunction(input: unknown, functionName: string): FoundFuncti
 		const inputAny: any = input;
 		// This is likely a builtin we're implementing for another type
 		// (e.g. toLocaleString). We'll return that instead
-		if (
-			inputAny &&
-			functionName &&
-			// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-			typeof inputAny[functionName] === 'function'
-		) {
+		if (inputAny && functionName && typeof inputAny[functionName] === 'function') {
 			// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 			return { type: 'native', function: inputAny[functionName] };
 		}
@@ -508,7 +507,6 @@ function findExtendedFunction(input: unknown, functionName: string): FoundFuncti
  * ```
  */
 export function extend(input: unknown, functionName: string, args: unknown[]) {
-	// eslint-disable-next-line @typescript-eslint/ban-types
 	const foundFunction = findExtendedFunction(input, functionName);
 
 	// No type specific or generic function found. Check to see if
@@ -522,7 +520,6 @@ export function extend(input: unknown, functionName: string, args: unknown[]) {
 		}
 
 		if (haveFunction.length > 1) {
-			// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 			const lastType = `"${haveFunction.pop()!.typeName}"`;
 			const typeNames = `${haveFunction.map((v) => `"${v.typeName}"`).join(', ')}, and ${lastType}`;
 			throw new ExpressionExtensionError(
diff --git a/packages/workflow/src/Extensions/ExtendedFunctions.ts b/packages/workflow/src/Extensions/ExtendedFunctions.ts
index 73fb21ca90696..091cdc8b0c67c 100644
--- a/packages/workflow/src/Extensions/ExtendedFunctions.ts
+++ b/packages/workflow/src/Extensions/ExtendedFunctions.ts
@@ -1,4 +1,5 @@
-import { ExpressionExtensionError } from '../ExpressionError';
+import { ExpressionError } from '../errors/expression.error';
+import { ExpressionExtensionError } from '../errors/expression-extension.error';
 import { average as aAverage } from './ArrayExtensions';
 
 const min = Math.min;
@@ -39,6 +40,36 @@ const not = (value: unknown): boolean => {
 	return !value;
 };
 
+function ifEmpty<T, V>(value: V, defaultValue: T) {
+	if (arguments.length !== 2) {
+		throw new ExpressionError('expected two arguments (value, defaultValue) for this function');
+	}
+	if (value === undefined || value === null || value === '') {
+		return defaultValue;
+	}
+	if (typeof value === 'object') {
+		if (Array.isArray(value) && !value.length) {
+			return defaultValue;
+		}
+		if (!Object.keys(value).length) {
+			return defaultValue;
+		}
+	}
+	return value;
+}
+
+ifEmpty.doc = {
+	name: 'ifEmpty',
+	description:
+		'Returns the default value if the value is empty. Empty values are undefined, null, empty strings, arrays without elements and objects without keys.',
+	returnType: 'any',
+	args: [
+		{ name: 'value', type: 'any' },
+		{ name: 'defaultValue', type: 'any' },
+	],
+	docURL: 'https://docs.n8n.io/code/builtin/convenience',
+};
+
 export const extendedFunctions = {
 	min,
 	max,
@@ -50,4 +81,5 @@ export const extendedFunctions = {
 	$max: max,
 	$average: average,
 	$not: not,
+	$ifEmpty: ifEmpty,
 };
diff --git a/packages/workflow/src/Extensions/Extensions.ts b/packages/workflow/src/Extensions/Extensions.ts
index a5ec7575c86de..2fef4620ff5ac 100644
--- a/packages/workflow/src/Extensions/Extensions.ts
+++ b/packages/workflow/src/Extensions/Extensions.ts
@@ -1,9 +1,11 @@
 export interface ExtensionMap {
 	typeName: string;
-	// eslint-disable-next-line @typescript-eslint/ban-types
-	functions: Record<string, Function & { doc?: DocMetadata }>;
+	functions: Record<string, Extension>;
 }
 
+// eslint-disable-next-line @typescript-eslint/ban-types
+export type Extension = Function & { doc?: DocMetadata };
+
 export type NativeDoc = {
 	typeName: string;
 	properties?: Record<string, { doc?: DocMetadata }>;
@@ -14,6 +16,8 @@ export type DocMetadata = {
 	name: string;
 	returnType: string;
 	description?: string;
+	section?: string;
+	hidden?: boolean;
 	aliases?: string[];
 	args?: Array<{ name: string; type?: string }>;
 	docURL?: string;
diff --git a/packages/workflow/src/Extensions/NumberExtensions.ts b/packages/workflow/src/Extensions/NumberExtensions.ts
index 50eb182f668eb..caac368c64978 100644
--- a/packages/workflow/src/Extensions/NumberExtensions.ts
+++ b/packages/workflow/src/Extensions/NumberExtensions.ts
@@ -1,7 +1,8 @@
 /**
  * @jest-environment jsdom
  */
-import { ExpressionExtensionError } from './../ExpressionError';
+import { DateTime } from 'luxon';
+import { ExpressionExtensionError } from '../errors/expression-extension.error';
 import type { ExtensionMap } from './Extensions';
 
 function format(value: number, extraArgs: unknown[]): string {
@@ -40,36 +41,67 @@ function round(value: number, extraArgs: number[]) {
 	return +value.toFixed(decimalPlaces);
 }
 
+function toBoolean(value: number) {
+	return value !== 0;
+}
+
+function toInt(value: number) {
+	return round(value, []);
+}
+
+function toFloat(value: number) {
+	return value;
+}
+
+type DateTimeFormat = 'ms' | 's' | 'excel';
+function toDateTime(value: number, extraArgs: [DateTimeFormat]) {
+	const [valueFormat = 'ms'] = extraArgs;
+
+	switch (valueFormat) {
+		// Excel format is days since 1900
+		// There is a bug where 1900 is incorrectly treated as a leap year
+		case 'excel': {
+			const DAYS_BETWEEN_1900_1970 = 25567;
+			const DAYS_LEAP_YEAR_BUG_ADJUST = 2;
+			const SECONDS_IN_DAY = 86_400;
+			return DateTime.fromSeconds(
+				(value - (DAYS_BETWEEN_1900_1970 + DAYS_LEAP_YEAR_BUG_ADJUST)) * SECONDS_IN_DAY,
+			);
+		}
+		case 's':
+			return DateTime.fromSeconds(value);
+		case 'ms':
+		default:
+			return DateTime.fromMillis(value);
+	}
+}
+
 ceil.doc = {
 	name: 'ceil',
 	description: 'Rounds up a number to a whole number.',
 	returnType: 'number',
-	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/numbers/#number-ceil',
+	docURL: 'https://docs.n8n.io/code/builtin/data-transformation-functions/numbers/#number-ceil',
 };
 
 floor.doc = {
 	name: 'floor',
 	description: 'Rounds down a number to a whole number.',
 	returnType: 'number',
-	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/numbers/#number-floor',
+	docURL: 'https://docs.n8n.io/code/builtin/data-transformation-functions/numbers/#number-floor',
 };
 
 isEven.doc = {
 	name: 'isEven',
 	description: 'Returns true if the number is even. Only works on whole numbers.',
 	returnType: 'boolean',
-	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/numbers/#number-isEven',
+	docURL: 'https://docs.n8n.io/code/builtin/data-transformation-functions/numbers/#number-isEven',
 };
 
 isOdd.doc = {
 	name: 'isOdd',
 	description: 'Returns true if the number is odd. Only works on whole numbers.',
 	returnType: 'boolean',
-	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/numbers/#number-isOdd',
+	docURL: 'https://docs.n8n.io/code/builtin/data-transformation-functions/numbers/#number-isOdd',
 };
 
 format.doc = {
@@ -81,18 +113,36 @@ format.doc = {
 		{ name: 'locales?', type: 'LanguageCode' },
 		{ name: 'options?', type: 'FormatOptions' },
 	],
-	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/numbers/#number-format',
+	docURL: 'https://docs.n8n.io/code/builtin/data-transformation-functions/numbers/#number-format',
 };
 
 round.doc = {
 	name: 'round',
 	description:
-		'Returns the value of a number rounded to the nearest whole number. Defaults to 0 decimal places if no argument is given.',
+		'Returns the value of a number rounded to the nearest whole number, unless a decimal place is specified. Defaults to 0 decimal places if no argument is given.',
 	returnType: 'number',
 	args: [{ name: 'decimalPlaces?', type: 'number' }],
+	docURL: 'https://docs.n8n.io/code/builtin/data-transformation-functions/numbers/#number-round',
+};
+
+toBoolean.doc = {
+	name: 'toBoolean',
+	description: 'Converts a number to a boolean. 0 is `false`, all other numbers are `true`.',
+	section: 'cast',
+	returnType: 'boolean',
+	docURL:
+		'https://docs.n8n.io/code/builtin/data-transformation-functions/numbers/#number-toBoolean',
+};
+
+toDateTime.doc = {
+	name: 'toDateTime',
+	description:
+		"Converts a number to a DateTime. Defaults to milliseconds. Format can be 'ms' (milliseconds), 's' (seconds) or 'excel' (Excel 1900 format).",
+	section: 'cast',
+	returnType: 'DateTime',
+	args: [{ name: 'format?', type: 'string' }],
 	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/numbers/#number-round',
+		'https://docs.n8n.io/code/builtin/data-transformation-functions/numbers/#number-toDateTime',
 };
 
 export const numberExtensions: ExtensionMap = {
@@ -104,5 +154,9 @@ export const numberExtensions: ExtensionMap = {
 		round,
 		isEven,
 		isOdd,
+		toBoolean,
+		toInt,
+		toFloat,
+		toDateTime,
 	},
 };
diff --git a/packages/workflow/src/Extensions/ObjectExtensions.ts b/packages/workflow/src/Extensions/ObjectExtensions.ts
index e1556d6e693aa..82da2f332d767 100644
--- a/packages/workflow/src/Extensions/ObjectExtensions.ts
+++ b/packages/workflow/src/Extensions/ObjectExtensions.ts
@@ -1,4 +1,4 @@
-import { ExpressionExtensionError } from '../ExpressionError';
+import { ExpressionExtensionError } from '../errors/expression-extension.error';
 import type { ExtensionMap } from './Extensions';
 
 function isEmpty(value: object): boolean {
@@ -9,6 +9,14 @@ function isNotEmpty(value: object): boolean {
 	return !isEmpty(value);
 }
 
+function keys(value: object): string[] {
+	return Object.keys(value);
+}
+
+function values(value: object): unknown[] {
+	return Object.values(value);
+}
+
 function hasField(value: object, extraArgs: string[]): boolean {
 	const [name] = extraArgs;
 	return name in value;
@@ -64,7 +72,7 @@ export function compact(value: object): object {
 		if (val !== null && val !== undefined && val !== 'nil' && val !== '') {
 			if (typeof val === 'object') {
 				if (Object.keys(val as object).length === 0) continue;
-				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-argument
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-argument
 				newObj[key] = compact(val);
 			} else {
 				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
@@ -80,12 +88,31 @@ export function urlEncode(value: object) {
 	return new URLSearchParams(value as Record<string, string>).toString();
 }
 
+export function toJsonString(value: object) {
+	return JSON.stringify(value);
+}
+
+export function toInt() {
+	return undefined;
+}
+
+export function toFloat() {
+	return undefined;
+}
+
+export function toBoolean() {
+	return undefined;
+}
+
+export function toDateTime() {
+	return undefined;
+}
+
 isEmpty.doc = {
 	name: 'isEmpty',
 	description: 'Checks if the Object has no key-value pairs.',
 	returnType: 'boolean',
-	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/objects/#object-isEmpty',
+	docURL: 'https://docs.n8n.io/code/builtin/data-transformation-functions/objects/#object-isEmpty',
 };
 
 isNotEmpty.doc = {
@@ -93,15 +120,14 @@ isNotEmpty.doc = {
 	description: 'Checks if the Object has key-value pairs.',
 	returnType: 'boolean',
 	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/objects/#object-isNotEmpty',
+		'https://docs.n8n.io/code/builtin/data-transformation-functions/objects/#object-isNotEmpty',
 };
 
 compact.doc = {
 	name: 'compact',
 	description: 'Removes empty values from an Object.',
 	returnType: 'boolean',
-	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/objects/#object-compact',
+	docURL: 'https://docs.n8n.io/code/builtin/data-transformation-functions/objects/#object-compact',
 };
 
 urlEncode.doc = {
@@ -109,7 +135,7 @@ urlEncode.doc = {
 	description: 'Transforms an Object into a URL parameter list. Only top-level keys are supported.',
 	returnType: 'string',
 	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/objects/#object-urlEncode',
+		'https://docs.n8n.io/code/builtin/data-transformation-functions/objects/#object-urlEncode',
 };
 
 hasField.doc = {
@@ -117,8 +143,7 @@ hasField.doc = {
 	description: 'Checks if the Object has a given field. Only top-level keys are supported.',
 	returnType: 'boolean',
 	args: [{ name: 'fieldName', type: 'string' }],
-	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/objects/#object-hasField',
+	docURL: 'https://docs.n8n.io/code/builtin/data-transformation-functions/objects/#object-hasField',
 };
 
 removeField.doc = {
@@ -127,7 +152,7 @@ removeField.doc = {
 	returnType: 'object',
 	args: [{ name: 'key', type: 'string' }],
 	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/objects/#object-removeField',
+		'https://docs.n8n.io/code/builtin/data-transformation-functions/objects/#object-removeField',
 };
 
 removeFieldsContaining.doc = {
@@ -137,7 +162,7 @@ removeFieldsContaining.doc = {
 	returnType: 'object',
 	args: [{ name: 'value', type: 'string' }],
 	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/objects/#object-removeFieldsContaining',
+		'https://docs.n8n.io/code/builtin/data-transformation-functions/objects/#object-removeFieldsContaining',
 };
 
 keepFieldsContaining.doc = {
@@ -146,7 +171,29 @@ keepFieldsContaining.doc = {
 	returnType: 'object',
 	args: [{ name: 'value', type: 'string' }],
 	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/objects/#object-keepFieldsContaining',
+		'https://docs.n8n.io/code/builtin/data-transformation-functions/objects/#object-keepFieldsContaining',
+};
+
+keys.doc = {
+	name: 'keys',
+	description: "Returns an array of a given object's own enumerable string-keyed property names.",
+	docURL: 'https://docs.n8n.io/code/builtin/data-transformation-functions/objects/#object-keys',
+	returnType: 'Array',
+};
+
+values.doc = {
+	name: 'values',
+	description: "Returns an array of a given object's own enumerable string-keyed property values.",
+	docURL: 'https://docs.n8n.io/code/builtin/data-transformation-functions/objects/#object-values',
+	returnType: 'Array',
+};
+
+toJsonString.doc = {
+	name: 'toJsonString',
+	description: 'Converts an object to a JSON string',
+	docURL:
+		'https://docs.n8n.io/code/builtin/data-transformation-functions/objects/#object-toJsonString',
+	returnType: 'string',
 };
 
 export const objectExtensions: ExtensionMap = {
@@ -160,5 +207,12 @@ export const objectExtensions: ExtensionMap = {
 		keepFieldsContaining,
 		compact,
 		urlEncode,
+		keys,
+		values,
+		toJsonString,
+		toInt,
+		toFloat,
+		toBoolean,
+		toDateTime,
 	},
 };
diff --git a/packages/workflow/src/Extensions/StringExtensions.ts b/packages/workflow/src/Extensions/StringExtensions.ts
index 00343a05fd01c..15b0f32f2774d 100644
--- a/packages/workflow/src/Extensions/StringExtensions.ts
+++ b/packages/workflow/src/Extensions/StringExtensions.ts
@@ -1,22 +1,22 @@
-/* eslint-disable @typescript-eslint/unbound-method */
-// import { createHash } from 'crypto';
+import SHA from 'jssha';
+import MD5 from 'md5';
+import { toBase64, fromBase64 } from 'js-base64';
 import { titleCase } from 'title-case';
-import * as ExpressionError from '../ExpressionError';
-import type { ExtensionMap } from './Extensions';
-import CryptoJS from 'crypto-js';
-import { encode } from 'js-base64';
+import type { Extension, ExtensionMap } from './Extensions';
 import { transliterate } from 'transliteration';
-
-const hashFunctions: Record<string, typeof CryptoJS.MD5> = {
-	md5: CryptoJS.MD5,
-	sha1: CryptoJS.SHA1,
-	sha224: CryptoJS.SHA224,
-	sha256: CryptoJS.SHA256,
-	sha384: CryptoJS.SHA384,
-	sha512: CryptoJS.SHA512,
-	sha3: CryptoJS.SHA3,
-	ripemd160: CryptoJS.RIPEMD160,
-};
+import { ExpressionExtensionError } from '../errors/expression-extension.error';
+import type { DateTime } from 'luxon';
+import { tryToParseDateTime } from '../TypeValidation';
+
+export const SupportedHashAlgorithms = [
+	'md5',
+	'sha1',
+	'sha224',
+	'sha256',
+	'sha384',
+	'sha512',
+	'sha3',
+] as const;
 
 // All symbols from https://www.xe.com/symbols/ as for 2022/11/09
 const CURRENCY_REGEXP =
@@ -114,23 +114,35 @@ const URL_REGEXP =
 const CHAR_TEST_REGEXP = /\p{L}/u;
 const PUNC_TEST_REGEXP = /[!?.]/;
 
-function hash(value: string, extraArgs?: unknown): string {
-	const [algorithm = 'MD5'] = extraArgs as string[];
-	if (algorithm.toLowerCase() === 'base64') {
-		// We're using a library instead of btoa because btoa only
-		// works on ASCII
-		return encode(value);
+function hash(value: string, extraArgs: string[]): string {
+	const algorithm = extraArgs[0]?.toLowerCase() ?? 'md5';
+	switch (algorithm) {
+		case 'base64':
+			return toBase64(value);
+		case 'md5':
+			return MD5(value);
+		case 'sha1':
+		case 'sha224':
+		case 'sha256':
+		case 'sha384':
+		case 'sha512':
+		case 'sha3':
+			const variant = (
+				{
+					sha1: 'SHA-1',
+					sha224: 'SHA-224',
+					sha256: 'SHA-256',
+					sha384: 'SHA-384',
+					sha512: 'SHA-512',
+					sha3: 'SHA3-512',
+				} as const
+			)[algorithm];
+			return new SHA(variant, 'TEXT').update(value).getHash('HEX');
+		default:
+			throw new ExpressionExtensionError(
+				`Unknown algorithm ${algorithm}. Available algorithms are: ${SupportedHashAlgorithms.join()}, and Base64.`,
+			);
 	}
-	const hashFunction = hashFunctions[algorithm.toLowerCase()];
-	if (!hashFunction) {
-		throw new ExpressionError.ExpressionExtensionError(
-			`Unknown algorithm ${algorithm}. Available algorithms are: ${Object.keys(hashFunctions)
-				.map((s) => s.toUpperCase())
-				.join(', ')}, and Base64.`,
-		);
-	}
-	return hashFunction(value.toString()).toString();
-	// return createHash(format).update(value.toString()).digest('hex');
 }
 
 function isEmpty(value: string): boolean {
@@ -195,7 +207,7 @@ function toDate(value: string): Date {
 	const date = new Date(Date.parse(value));
 
 	if (date.toString() === 'Invalid Date') {
-		throw new ExpressionError.ExpressionExtensionError('cannot convert to date');
+		throw new ExpressionExtensionError('cannot convert to date');
 	}
 	// If time component is not specified, force 00:00h
 	if (!/:/.test(value)) {
@@ -204,6 +216,14 @@ function toDate(value: string): Date {
 	return date;
 }
 
+function toDateTime(value: string): DateTime {
+	try {
+		return tryToParseDateTime(value);
+	} catch (error) {
+		throw new ExpressionExtensionError('cannot convert to Luxon DateTime');
+	}
+}
+
 function urlDecode(value: string, extraArgs: boolean[]): string {
 	const [entireString = false] = extraArgs;
 	if (entireString) {
@@ -225,7 +245,7 @@ function toInt(value: string, extraArgs: Array<number | undefined>) {
 	const int = parseInt(value.replace(CURRENCY_REGEXP, ''), radix);
 
 	if (isNaN(int)) {
-		throw new ExpressionError.ExpressionExtensionError('cannot convert to integer');
+		throw new ExpressionExtensionError('cannot convert to integer');
 	}
 
 	return int;
@@ -233,15 +253,13 @@ function toInt(value: string, extraArgs: Array<number | undefined>) {
 
 function toFloat(value: string) {
 	if (value.includes(',')) {
-		throw new ExpressionError.ExpressionExtensionError(
-			'cannot convert to float, expected . as decimal separator',
-		);
+		throw new ExpressionExtensionError('cannot convert to float, expected . as decimal separator');
 	}
 
 	const float = parseFloat(value.replace(CURRENCY_REGEXP, ''));
 
 	if (isNaN(float)) {
-		throw new ExpressionError.ExpressionExtensionError('cannot convert to float');
+		throw new ExpressionExtensionError('cannot convert to float');
 	}
 
 	return float;
@@ -295,8 +313,7 @@ function toSentenceCase(value: string) {
 		const charIndex = current.search(CHAR_TEST_REGEXP);
 		current =
 			current.slice(0, charIndex) +
-			// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-			current[charIndex]!.toLocaleUpperCase() +
+			current[charIndex].toLocaleUpperCase() +
 			current.slice(charIndex + 1).toLocaleLowerCase();
 		const puncIndex = current.search(PUNC_TEST_REGEXP);
 		if (puncIndex === -1) {
@@ -352,197 +369,309 @@ function extractUrl(value: string) {
 	return matched[0];
 }
 
+function extractUrlPath(value: string) {
+	try {
+		const url = new URL(value);
+		return url.pathname;
+	} catch (error) {
+		return undefined;
+	}
+}
+
+function parseJson(value: string): unknown {
+	try {
+		return JSON.parse(value);
+	} catch (error) {
+		if (value.includes("'")) {
+			throw new ExpressionExtensionError("Parsing failed. Check you're using double quotes");
+		}
+		throw new ExpressionExtensionError('Parsing failed');
+	}
+}
+
+function toBoolean(value: string): boolean {
+	const normalized = value.toLowerCase();
+	const FALSY = new Set(['false', 'no', '0']);
+	return normalized.length > 0 && !FALSY.has(normalized);
+}
+
+function base64Encode(value: string): string {
+	return toBase64(value);
+}
+
+function base64Decode(value: string): string {
+	return fromBase64(value);
+}
+
 removeMarkdown.doc = {
 	name: 'removeMarkdown',
 	description: 'Removes Markdown formatting from a string.',
+	section: 'edit',
 	returnType: 'string',
 	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/strings/#string-removeMarkdown',
+		'https://docs.n8n.io/code/builtin/data-transformation-functions/strings/#string-removeMarkdown',
 };
 
 removeTags.doc = {
 	name: 'removeTags',
 	description: 'Removes tags, such as HTML or XML, from a string.',
+	section: 'edit',
 	returnType: 'string',
 	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/strings/#string-removeTags',
+		'https://docs.n8n.io/code/builtin/data-transformation-functions/strings/#string-removeTags',
 };
 
 toDate.doc = {
 	name: 'toDate',
 	description: 'Converts a string to a date.',
+	section: 'cast',
 	returnType: 'Date',
+	hidden: true,
+	docURL: 'https://docs.n8n.io/code/builtin/data-transformation-functions/strings/#string-toDate',
+};
+
+toDateTime.doc = {
+	name: 'toDateTime',
+	description: 'Converts a string to a Luxon DateTime.',
+	section: 'cast',
+	returnType: 'DateTime',
 	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/strings/#string-toDate',
+		'https://docs.n8n.io/code/builtin/data-transformation-functions/strings/#string-toDateTime',
+};
+
+toBoolean.doc = {
+	name: 'toBoolean',
+	description: 'Converts a string to a boolean.',
+	section: 'cast',
+	returnType: 'boolean',
+	docURL:
+		'https://docs.n8n.io/code/builtin/data-transformation-functions/strings/#string-toBoolean',
 };
 
 toFloat.doc = {
 	name: 'toFloat',
 	description: 'Converts a string to a decimal number.',
+	section: 'cast',
 	returnType: 'number',
 	aliases: ['toDecimalNumber'],
 	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/strings/#string-toDecimalNumber',
+		'https://docs.n8n.io/code/builtin/data-transformation-functions/strings/#string-toDecimalNumber',
 };
 
 toInt.doc = {
 	name: 'toInt',
 	description: 'Converts a string to an integer.',
+	section: 'cast',
 	returnType: 'number',
 	args: [{ name: 'radix?', type: 'number' }],
 	aliases: ['toWholeNumber'],
-	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/strings/#string-toInt',
+	docURL: 'https://docs.n8n.io/code/builtin/data-transformation-functions/strings/#string-toInt',
 };
 
 toSentenceCase.doc = {
 	name: 'toSentenceCase',
 	description: 'Formats a string to sentence case. Example: "This is a sentence".',
+	section: 'case',
 	returnType: 'string',
 	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/strings/#string-toSentenceCase',
+		'https://docs.n8n.io/code/builtin/data-transformation-functions/strings/#string-toSentenceCase',
 };
 
 toSnakeCase.doc = {
 	name: 'toSnakeCase',
 	description: 'Formats a string to snake case. Example: "this_is_snake_case".',
+	section: 'case',
 	returnType: 'string',
 	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/strings/#string-toSnakeCase',
+		'https://docs.n8n.io/code/builtin/data-transformation-functions/strings/#string-toSnakeCase',
 };
 
 toTitleCase.doc = {
 	name: 'toTitleCase',
-	description: 'Formats a string to title case. Example: "This Is a Title".',
+	description:
+		'Formats a string to title case. Example: "This Is a Title". Will not change already uppercase letters to prevent losing information from acronyms and trademarks such as iPhone or FAANG.',
+	section: 'case',
 	returnType: 'string',
 	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/strings/#string-toTitleCase',
+		'https://docs.n8n.io/code/builtin/data-transformation-functions/strings/#string-toTitleCase',
 };
 
 urlEncode.doc = {
 	name: 'urlEncode',
 	description: 'Encodes a string to be used/included in a URL.',
+	section: 'edit',
 	args: [{ name: 'entireString?', type: 'boolean' }],
 	returnType: 'string',
 	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/strings/#string-urlEncode',
+		'https://docs.n8n.io/code/builtin/data-transformation-functions/strings/#string-urlEncode',
 };
 
 urlDecode.doc = {
 	name: 'urlDecode',
 	description:
 		'Decodes a URL-encoded string. It decodes any percent-encoded characters in the input string, and replaces them with their original characters.',
+	section: 'edit',
 	returnType: 'string',
 	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/strings/#string-urlDecode',
+		'https://docs.n8n.io/code/builtin/data-transformation-functions/strings/#string-urlDecode',
 };
 
 replaceSpecialChars.doc = {
 	name: 'replaceSpecialChars',
 	description: 'Replaces non-ASCII characters in a string with an ASCII representation.',
+	section: 'edit',
 	returnType: 'string',
 	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/strings/#string-replaceSpecialChars',
+		'https://docs.n8n.io/code/builtin/data-transformation-functions/strings/#string-replaceSpecialChars',
 };
 
 length.doc = {
 	name: 'length',
+	section: 'query',
+	hidden: true,
 	description: 'Returns the character count of a string.',
 	returnType: 'number',
-	docURL: 'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/strings',
+	docURL: 'https://docs.n8n.io/code/builtin/data-transformation-functions/strings',
 };
 
 isDomain.doc = {
 	name: 'isDomain',
 	description: 'Checks if a string is a domain.',
+	section: 'validation',
 	returnType: 'boolean',
-	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/strings/#string-isDomain',
+	docURL: 'https://docs.n8n.io/code/builtin/data-transformation-functions/strings/#string-isDomain',
 };
 
 isEmail.doc = {
 	name: 'isEmail',
 	description: 'Checks if a string is an email.',
+	section: 'validation',
 	returnType: 'boolean',
-	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/strings/#string-isEmail',
+	docURL: 'https://docs.n8n.io/code/builtin/data-transformation-functions/strings/#string-isEmail',
 };
 
 isNumeric.doc = {
-	name: 'isEmail',
+	name: 'isNumeric',
 	description: 'Checks if a string only contains digits.',
+	section: 'validation',
 	returnType: 'boolean',
 	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/strings/#string-isNumeric',
+		'https://docs.n8n.io/code/builtin/data-transformation-functions/strings/#string-isNumeric',
 };
 
 isUrl.doc = {
 	name: 'isUrl',
 	description: 'Checks if a string is a valid URL.',
+	section: 'validation',
 	returnType: 'boolean',
-	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/strings/#string-isUrl',
+	docURL: 'https://docs.n8n.io/code/builtin/data-transformation-functions/strings/#string-isUrl',
 };
 
 isEmpty.doc = {
 	name: 'isEmpty',
 	description: 'Checks if a string is empty.',
+	section: 'validation',
 	returnType: 'boolean',
-	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/strings/#string-isEmpty',
+	docURL: 'https://docs.n8n.io/code/builtin/data-transformation-functions/strings/#string-isEmpty',
 };
 
 isNotEmpty.doc = {
 	name: 'isNotEmpty',
 	description: 'Checks if a string has content.',
+	section: 'validation',
 	returnType: 'boolean',
 	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/strings/#string-isNotEmpty',
+		'https://docs.n8n.io/code/builtin/data-transformation-functions/strings/#string-isNotEmpty',
 };
 
 extractEmail.doc = {
 	name: 'extractEmail',
 	description: 'Extracts an email from a string. Returns undefined if none is found.',
+	section: 'edit',
 	returnType: 'string',
 	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/strings/#string-extractEmail',
+		'https://docs.n8n.io/code/builtin/data-transformation-functions/strings/#string-extractEmail',
 };
 
 extractDomain.doc = {
 	name: 'extractDomain',
 	description:
 		'Extracts a domain from a string containing a valid URL. Returns undefined if none is found.',
+	section: 'edit',
 	returnType: 'string',
 	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/strings/#string-extractDomain',
+		'https://docs.n8n.io/code/builtin/data-transformation-functions/strings/#string-extractDomain',
 };
 
 extractUrl.doc = {
 	name: 'extractUrl',
 	description: 'Extracts a URL from a string. Returns undefined if none is found.',
+	section: 'edit',
+	returnType: 'string',
+	docURL:
+		'https://docs.n8n.io/code/builtin/data-transformation-functions/strings/#string-extractUrl',
+};
+
+extractUrlPath.doc = {
+	name: 'extractUrlPath',
+	description: 'Extracts the path from a URL. Returns undefined if none is found.',
+	section: 'edit',
 	returnType: 'string',
 	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/strings/#string-extractUrl',
+		'https://docs.n8n.io/code/builtin/data-transformation-functions/strings/#string-extractUrlPath',
 };
 
 hash.doc = {
 	name: 'hash',
 	description: 'Returns a string hashed with the given algorithm. Default algorithm is `md5`.',
+	section: 'edit',
 	returnType: 'string',
 	args: [{ name: 'algo?', type: 'Algorithm' }],
-	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/strings/#string-hash',
+	docURL: 'https://docs.n8n.io/code/builtin/data-transformation-functions/strings/#string-hash',
 };
 
 quote.doc = {
 	name: 'quote',
 	description: 'Returns a string wrapped in the quotation marks. Default quotation is `"`.',
+	section: 'edit',
 	returnType: 'string',
 	args: [{ name: 'mark?', type: 'string' }],
+	docURL: 'https://docs.n8n.io/code/builtin/data-transformation-functions/strings/#string-quote',
+};
+
+parseJson.doc = {
+	name: 'parseJson',
+	description:
+		'Parses a JSON string, constructing the JavaScript value or object described by the string.',
+	section: 'cast',
+	returnType: 'any',
 	docURL:
-		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/strings/#string-quote',
+		'https://docs.n8n.io/code/builtin/data-transformation-functions/strings/#string-parseJson',
 };
 
+base64Encode.doc = {
+	name: 'base64Encode',
+	description: 'Converts a UTF-8-encoded string to a Base64 string.',
+	section: 'edit',
+	returnType: 'string',
+	docURL:
+		'https://docs.n8n.io/code/builtin/data-transformation-functions/strings/#string-base64Encode',
+};
+
+base64Decode.doc = {
+	name: 'base64Decode',
+	description: 'Converts a Base64 string to a UTF-8 string.',
+	section: 'edit',
+	returnType: 'string',
+	docURL:
+		'https://docs.n8n.io/code/builtin/data-transformation-functions/strings/#string-base64Decode',
+};
+
+const toDecimalNumber: Extension = toFloat.bind({});
+toDecimalNumber.doc = { ...toFloat.doc, hidden: true };
+const toWholeNumber: Extension = toInt.bind({});
+toWholeNumber.doc = { ...toInt.doc, hidden: true };
+
 export const stringExtensions: ExtensionMap = {
 	typeName: 'String',
 	functions: {
@@ -550,10 +679,12 @@ export const stringExtensions: ExtensionMap = {
 		removeMarkdown,
 		removeTags,
 		toDate,
-		toDecimalNumber: toFloat,
+		toDateTime,
+		toBoolean,
+		toDecimalNumber,
 		toFloat,
 		toInt,
-		toWholeNumber: toInt,
+		toWholeNumber,
 		toSentenceCase,
 		toSnakeCase,
 		toTitleCase,
@@ -571,5 +702,9 @@ export const stringExtensions: ExtensionMap = {
 		extractEmail,
 		extractDomain,
 		extractUrl,
+		extractUrlPath,
+		parseJson,
+		base64Encode,
+		base64Decode,
 	},
 };
diff --git a/packages/workflow/src/Extensions/index.ts b/packages/workflow/src/Extensions/index.ts
index a0c98d6208f37..1ff8812e4df16 100644
--- a/packages/workflow/src/Extensions/index.ts
+++ b/packages/workflow/src/Extensions/index.ts
@@ -1,4 +1,3 @@
-// eslint-disable-next-line import/no-cycle
 export {
 	extend,
 	extendOptional,
@@ -8,4 +7,4 @@ export {
 	EXTENSION_OBJECTS as ExpressionExtensions,
 } from './ExpressionExtension';
 
-export type { DocMetadata } from './Extensions';
+export type { DocMetadata, NativeDoc } from './Extensions';
diff --git a/packages/workflow/src/GlobalState.ts b/packages/workflow/src/GlobalState.ts
new file mode 100644
index 0000000000000..f76920fea19fb
--- /dev/null
+++ b/packages/workflow/src/GlobalState.ts
@@ -0,0 +1,15 @@
+import { deepCopy } from './utils';
+
+export interface GlobalState {
+	defaultTimezone: string;
+}
+
+let globalState: GlobalState = { defaultTimezone: 'America/New_York' };
+
+export function setGlobalState(state: GlobalState) {
+	globalState = state;
+}
+
+export function getGlobalState() {
+	return deepCopy(globalState);
+}
diff --git a/packages/workflow/src/Interfaces.ts b/packages/workflow/src/Interfaces.ts
index da601f58d7352..1da8d73792fdd 100644
--- a/packages/workflow/src/Interfaces.ts
+++ b/packages/workflow/src/Interfaces.ts
@@ -1,23 +1,26 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-// eslint-disable-next-line max-classes-per-file
+
 import type * as express from 'express';
-import type * as FormData from 'form-data';
+import type FormData from 'form-data';
+import type { PathLike } from 'fs';
 import type { IncomingHttpHeaders } from 'http';
+import type { SecureContextOptions } from 'tls';
 import type { Readable } from 'stream';
 import type { URLSearchParams } from 'url';
-import type { OptionsWithUri, OptionsWithUrl } from 'request';
-import type { RequestPromiseOptions, RequestPromiseAPI } from 'request-promise-native';
 
+import type { AuthenticationMethod } from './Authentication';
+import type { CODE_EXECUTION_MODES, CODE_LANGUAGES, LOG_LEVELS } from './Constants';
 import type { IDeferredPromise } from './DeferredPromise';
+import type { ExecutionStatus } from './ExecutionStatus';
+import type { ExpressionError } from './errors/expression.error';
 import type { Workflow } from './Workflow';
+import type { WorkflowActivationError } from './errors/workflow-activation.error';
+import type { WorkflowOperationError } from './errors/workflow-operation.error';
 import type { WorkflowHooks } from './WorkflowHooks';
-import type { WorkflowActivationError } from './WorkflowActivationError';
-import type { WorkflowOperationError } from './WorkflowErrors';
-import type { NodeApiError, NodeOperationError } from './NodeErrors';
-import type { ExpressionError } from './ExpressionError';
-import type { PathLike } from 'fs';
-import type { ExecutionStatus } from './ExecutionStatus';
-import type { AuthenticationMethod } from './Authentication';
+import type { NodeOperationError } from './errors/node-operation.error';
+import type { NodeApiError } from './errors/node-api.error';
+import type { AxiosProxyConfig } from 'axios';
+import type { CallbackManager as CallbackManagerLC } from '@langchain/core/callbacks/manager';
 
 export interface IAdditionalCredentialOptions {
 	oauth2?: IOAuth2Options;
@@ -34,7 +37,7 @@ export type IAllExecuteFunctions =
 	| ITriggerFunctions
 	| IWebhookFunctions;
 
-export type BinaryFileType = 'text' | 'json' | 'image' | 'video';
+export type BinaryFileType = 'text' | 'json' | 'image' | 'audio' | 'video' | 'pdf' | 'html';
 export interface IBinaryData {
 	[key: string]: string | undefined;
 	data: string;
@@ -47,12 +50,6 @@ export interface IBinaryData {
 	id?: string;
 }
 
-export interface BinaryMetadata {
-	fileName?: string;
-	mimeType?: string;
-	fileSize: number;
-}
-
 // All properties in this interface except for
 // "includeCredentialsOnRefreshOnBody" will get
 // removed once we add the OAuth2 hooks to the
@@ -98,32 +95,18 @@ export abstract class ICredentials {
 
 	data: string | undefined;
 
-	nodesAccess: ICredentialNodeAccess[];
-
-	constructor(
-		nodeCredentials: INodeCredentialsDetails,
-		type: string,
-		nodesAccess: ICredentialNodeAccess[],
-		data?: string,
-	) {
+	constructor(nodeCredentials: INodeCredentialsDetails, type: string, data?: string) {
 		this.id = nodeCredentials.id ?? undefined;
 		this.name = nodeCredentials.name;
 		this.type = type;
-		this.nodesAccess = nodesAccess;
 		this.data = data;
 	}
 
-	abstract getData(encryptionKey: string, nodeType?: string): ICredentialDataDecryptedObject;
-
-	abstract getDataKey(key: string, encryptionKey: string, nodeType?: string): CredentialInformation;
+	abstract getData(nodeType?: string): ICredentialDataDecryptedObject;
 
 	abstract getDataToSave(): ICredentialsEncrypted;
 
-	abstract hasNodeAccess(nodeType: string): boolean;
-
-	abstract setData(data: ICredentialDataDecryptedObject, encryptionKey: string): void;
-
-	abstract setDataKey(key: string, data: CredentialInformation, encryptionKey: string): void;
+	abstract setData(data: ICredentialDataDecryptedObject): void;
 }
 
 export interface IUser {
@@ -133,19 +116,10 @@ export interface IUser {
 	lastName: string;
 }
 
-// Defines which nodes are allowed to access the credentials and
-// when that access got granted from which user
-export interface ICredentialNodeAccess {
-	nodeType: string;
-	user?: string;
-	date?: Date;
-}
-
 export interface ICredentialsDecrypted {
 	id: string;
 	name: string;
 	type: string;
-	nodesAccess: ICredentialNodeAccess[];
 	data?: ICredentialDataDecryptedObject;
 	ownedBy?: IUser;
 	sharedWith?: IUser[];
@@ -155,7 +129,6 @@ export interface ICredentialsEncrypted {
 	id?: string;
 	name: string;
 	type: string;
-	nodesAccess: ICredentialNodeAccess[];
 	data?: string;
 }
 
@@ -197,8 +170,6 @@ export interface IHttpRequestHelper {
 	helpers: { httpRequest: IAllExecuteFunctions['helpers']['httpRequest'] };
 }
 export abstract class ICredentialsHelper {
-	constructor(readonly encryptionKey: string) {}
-
 	abstract getParentTypes(name: string): string[];
 
 	abstract authenticate(
@@ -207,7 +178,6 @@ export abstract class ICredentialsHelper {
 		requestOptions: IHttpRequestOptions | IRequestOptionsSimplified,
 		workflow: Workflow,
 		node: INode,
-		defaultTimezone: string,
 	): Promise<IHttpRequestOptions>;
 
 	abstract preAuthentication(
@@ -224,10 +194,11 @@ export abstract class ICredentialsHelper {
 	): Promise<ICredentials>;
 
 	abstract getDecrypted(
+		additionalData: IWorkflowExecuteAdditionalData,
 		nodeCredentials: INodeCredentialsDetails,
 		type: string,
 		mode: WorkflowExecuteMode,
-		defaultTimezone: string,
+		executeData?: IExecuteData,
 		raw?: boolean,
 		expressionResolveValues?: ICredentialsExpressionResolveValues,
 	): Promise<ICredentialDataDecryptedObject>;
@@ -320,6 +291,11 @@ export interface ICredentialTestRequestData {
 	testRequest: ICredentialTestRequest;
 }
 
+type ICredentialHttpRequestNode = {
+	name: string;
+	docsUrl: string;
+} & ({ apiBaseUrl: string } | { apiBaseUrlPlaceholder: string });
+
 export interface ICredentialType {
 	name: string;
 	displayName: string;
@@ -336,12 +312,13 @@ export interface ICredentialType {
 	) => Promise<IDataObject>;
 	test?: ICredentialTestRequest;
 	genericAuth?: boolean;
+	httpRequestNode?: ICredentialHttpRequestNode;
 }
 
 export interface ICredentialTypes {
 	recognizes(credentialType: string): boolean;
 	getByName(credentialType: string): ICredentialType;
-	getNodeTypesToTestWith(type: string): string[];
+	getSupportedNodes(type: string): string[];
 	getParentTypes(typeName: string): string[];
 }
 
@@ -350,7 +327,6 @@ export interface ICredentialData {
 	id?: string;
 	name: string;
 	data: string; // Contains the access data as encrypted JSON string
-	nodesAccess: ICredentialNodeAccess[];
 }
 
 // The encrypted credentials which the nodes can access
@@ -382,6 +358,8 @@ export interface IConnections {
 
 export type GenericValue = string | object | number | boolean | undefined | null;
 
+export type CloseFunction = () => Promise<void>;
+
 export interface IDataObject {
 	[key: string]: GenericValue | IDataObject | GenericValue[] | IDataObject[];
 }
@@ -415,7 +393,7 @@ export interface IGetExecuteTriggerFunctions {
 
 export interface IRunNodeResponse {
 	data: INodeExecutionData[][] | null | undefined;
-	closeFunction?: () => Promise<void>;
+	closeFunction?: CloseFunction;
 }
 export interface IGetExecuteFunctions {
 	(
@@ -428,6 +406,8 @@ export interface IGetExecuteFunctions {
 		additionalData: IWorkflowExecuteAdditionalData,
 		executeData: IExecuteData,
 		mode: WorkflowExecuteMode,
+		closeFunctions: CloseFunction[],
+		abortSignal?: AbortSignal,
 	): IExecuteFunctions;
 }
 
@@ -443,6 +423,7 @@ export interface IGetExecuteSingleFunctions {
 		additionalData: IWorkflowExecuteAdditionalData,
 		executeData: IExecuteData,
 		mode: WorkflowExecuteMode,
+		abortSignal?: AbortSignal,
 	): IExecuteSingleFunctions;
 }
 
@@ -453,7 +434,6 @@ export interface IGetExecuteHookFunctions {
 		additionalData: IWorkflowExecuteAdditionalData,
 		mode: WorkflowExecuteMode,
 		activation: WorkflowActivateMode,
-		isTest?: boolean,
 		webhookData?: IWebhookData,
 	): IHookFunctions;
 }
@@ -465,6 +445,7 @@ export interface IGetExecuteWebhookFunctions {
 		additionalData: IWorkflowExecuteAdditionalData,
 		mode: WorkflowExecuteMode,
 		webhookData: IWebhookData,
+		closeFunctions: CloseFunction[],
 	): IWebhookFunctions;
 }
 
@@ -492,6 +473,7 @@ export interface IExecuteContextData {
 
 export type IHttpRequestMethods = 'DELETE' | 'GET' | 'HEAD' | 'PATCH' | 'POST' | 'PUT';
 
+/** used in helpers.httpRequest(WithAuthentication) */
 export interface IHttpRequestOptions {
 	url: string;
 	baseURL?: string;
@@ -523,10 +505,66 @@ export interface IHttpRequestOptions {
 	json?: boolean;
 }
 
+/**
+ * used in helpers.request(WithAuthentication)
+ * @see IHttpRequestOptions
+ * @deprecated Prefer using IHttpRequestOptions
+ */
+export interface IRequestOptions {
+	baseURL?: string;
+	uri?: string;
+	url?: string;
+	method?: IHttpRequestMethods;
+	qs?: IDataObject;
+	qsStringifyOptions?: { arrayFormat: 'repeat' | 'brackets' | 'indices' };
+	useQuerystring?: boolean;
+	headers?: IDataObject;
+	auth?: Partial<{
+		sendImmediately: boolean;
+		bearer: string;
+		user: string;
+		username: string;
+		password: string;
+		pass: string;
+	}>;
+	body?: any;
+	formData?: IDataObject | FormData;
+	form?: IDataObject | FormData;
+	json?: boolean;
+	useStream?: boolean;
+	encoding?: string | null;
+	timeout?: number;
+	rejectUnauthorized?: boolean;
+	proxy?: string | AxiosProxyConfig;
+	simple?: boolean;
+	gzip?: boolean;
+	resolveWithFullResponse?: boolean;
+
+	/** Whether to follow GET or HEAD HTTP 3xx redirects @default true */
+	followRedirect?: boolean;
+
+	/** Whether to follow **All** HTTP 3xx redirects @default false */
+	followAllRedirects?: boolean;
+
+	/** Max number of redirects to follow @default 21 */
+	maxRedirects?: number;
+
+	agentOptions?: SecureContextOptions;
+}
+
+export interface PaginationOptions {
+	binaryResult?: boolean;
+	continue: boolean | string;
+	request: IRequestOptionsSimplifiedAuth;
+	requestInterval: number;
+	maxRequests?: number;
+}
+
 export type IN8nHttpResponse = IDataObject | Buffer | GenericValue | GenericValue[] | null;
 
 export interface IN8nHttpFullResponse {
-	body: IN8nHttpResponse;
+	body: IN8nHttpResponse | Readable;
+	__bodyResolved?: boolean;
 	headers: IDataObject;
 	statusCode: number;
 	statusMessage?: string;
@@ -569,7 +607,11 @@ export interface IN8nRequestOperationPaginationOffset extends IN8nRequestOperati
 }
 
 export interface IGetNodeParameterOptions {
+	contextNode?: INode;
+	// extract value from regex, works only when parameter type is resourceLocator
 	extractValue?: boolean;
+	// get raw value of parameter with unresolved expressions
+	rawExpressions?: boolean;
 }
 
 namespace ExecuteFunctions {
@@ -656,7 +698,7 @@ export type ICredentialTestFunction = (
 
 export interface ICredentialTestFunctions {
 	helpers: {
-		request: RequestPromiseAPI;
+		request: (uriOrObject: string | object, options?: object) => Promise<any>;
 	};
 }
 
@@ -670,6 +712,12 @@ interface JsonHelperFunctions {
 
 export interface FileSystemHelperFunctions {
 	createReadStream(path: PathLike): Promise<Readable>;
+	getStoragePath(): string;
+	writeContentToFile(
+		path: PathLike,
+		content: string | Buffer | Readable,
+		flag?: string,
+	): Promise<void>;
 }
 
 export interface BinaryHelperFunctions {
@@ -681,8 +729,13 @@ export interface BinaryHelperFunctions {
 	setBinaryDataBuffer(data: IBinaryData, binaryData: Buffer): Promise<IBinaryData>;
 	copyBinaryFile(): Promise<never>;
 	binaryToBuffer(body: Buffer | Readable): Promise<Buffer>;
-	getBinaryStream(binaryDataId: string, chunkSize?: number): Readable;
-	getBinaryMetadata(binaryDataId: string): Promise<BinaryMetadata>;
+	getBinaryPath(binaryDataId: string): string;
+	getBinaryStream(binaryDataId: string, chunkSize?: number): Promise<Readable>;
+	getBinaryMetadata(binaryDataId: string): Promise<{
+		fileName?: string;
+		mimeType?: string;
+		fileSize: number;
+	}>;
 }
 
 export interface NodeHelperFunctions {
@@ -690,37 +743,67 @@ export interface NodeHelperFunctions {
 }
 
 export interface RequestHelperFunctions {
-	request(uriOrObject: string | IDataObject | any, options?: IDataObject): Promise<any>;
-	requestWithAuthentication(
+	httpRequest(requestOptions: IHttpRequestOptions): Promise<any>;
+	httpRequestWithAuthentication(
 		this: IAllExecuteFunctions,
 		credentialsType: string,
-		requestOptions: OptionsWithUri | RequestPromiseOptions,
+		requestOptions: IHttpRequestOptions,
 		additionalCredentialOptions?: IAdditionalCredentialOptions,
 	): Promise<any>;
+	requestWithAuthenticationPaginated(
+		this: IAllExecuteFunctions,
+		requestOptions: IRequestOptions,
+		itemIndex: number,
+		paginationOptions: PaginationOptions,
+		credentialsType?: string,
+		additionalCredentialOptions?: IAdditionalCredentialOptions,
+	): Promise<any[]>;
 
-	httpRequest(requestOptions: IHttpRequestOptions): Promise<any>;
-	httpRequestWithAuthentication(
+	/**
+	 * @deprecated Use .httpRequest instead
+	 * @see RequestHelperFunctions.httpRequest
+	 */
+	request(uriOrObject: string | IRequestOptions, options?: IRequestOptions): Promise<any>;
+	/**
+	 * @deprecated Use .httpRequestWithAuthentication instead
+	 * @see RequestHelperFunctions.requestWithAuthentication
+	 */
+	requestWithAuthentication(
 		this: IAllExecuteFunctions,
 		credentialsType: string,
-		requestOptions: IHttpRequestOptions,
+		requestOptions: IRequestOptions,
 		additionalCredentialOptions?: IAdditionalCredentialOptions,
+		itemIndex?: number,
 	): Promise<any>;
-
+	/**
+	 * @deprecated Use .httpRequestWithAuthentication instead
+	 * @see RequestHelperFunctions.requestWithAuthentication
+	 */
 	requestOAuth1(
 		this: IAllExecuteFunctions,
 		credentialsType: string,
-		requestOptions: OptionsWithUrl | RequestPromiseOptions,
+		requestOptions: IRequestOptions,
 	): Promise<any>;
+	/**
+	 * @deprecated Use .httpRequestWithAuthentication instead
+	 * @see RequestHelperFunctions.requestWithAuthentication
+	 */
 	requestOAuth2(
 		this: IAllExecuteFunctions,
 		credentialsType: string,
-		requestOptions: OptionsWithUri | RequestPromiseOptions,
+		requestOptions: IRequestOptions,
 		oAuth2Options?: IOAuth2Options,
 	): Promise<any>;
 }
 
+export type NodeTypeAndVersion = {
+	name: string;
+	type: string;
+	typeVersion: number;
+};
+
 export interface FunctionsBase {
-	logger: ILogger;
+	logger: Logger;
 	getCredentials(type: string, itemIndex?: number): Promise<ICredentialDataDecryptedObject>;
 	getExecutionId(): string;
 	getNode(): INode;
@@ -728,39 +811,67 @@ export interface FunctionsBase {
 	getWorkflowStaticData(type: string): IDataObject;
 	getTimezone(): string;
 	getRestApiUrl(): string;
-
+	getInstanceBaseUrl(): string;
+	getInstanceId(): string;
+	getChildNodes(nodeName: string): NodeTypeAndVersion[];
+	getParentNodes(nodeName: string): NodeTypeAndVersion[];
+	getKnownNodeTypes(): IDataObject;
 	getMode?: () => WorkflowExecuteMode;
 	getActivationMode?: () => WorkflowActivateMode;
+
+	/** @deprecated */
+	prepareOutputData(outputData: INodeExecutionData[]): Promise<INodeExecutionData[][]>;
 }
 
 type FunctionsBaseWithRequiredKeys<Keys extends keyof FunctionsBase> = FunctionsBase & {
 	[K in Keys]: NonNullable<FunctionsBase[K]>;
 };
 
+export type ContextType = 'flow' | 'node';
+
 type BaseExecutionFunctions = FunctionsBaseWithRequiredKeys<'getMode'> & {
 	continueOnFail(): boolean;
 	evaluateExpression(expression: string, itemIndex: number): NodeParameterValueType;
-	getContext(type: string): IContextObject;
+	getContext(type: ContextType): IContextObject;
 	getExecuteData(): IExecuteData;
 	getWorkflowDataProxy(itemIndex: number): IWorkflowDataProxyData;
 	getInputSourceData(inputIndex?: number, inputName?: string): ISourceData;
+	getExecutionCancelSignal(): AbortSignal | undefined;
+	onExecutionCancellation(handler: () => unknown): void;
+	logAiEvent(eventName: EventNamesAiNodesType, msg?: string | undefined): Promise<void>;
 };
 
+// TODO: Create later own type only for Config-Nodes
 export type IExecuteFunctions = ExecuteFunctions.GetNodeParameterFn &
 	BaseExecutionFunctions & {
 		executeWorkflow(
 			workflowInfo: IExecuteWorkflowInfo,
 			inputData?: INodeExecutionData[],
+			parentCallbackManager?: CallbackManager,
 		): Promise<any>;
+		getInputConnectionData(
+			inputName: ConnectionTypes,
+			itemIndex: number,
+			inputIndex?: number,
+		): Promise<unknown>;
 		getInputData(inputIndex?: number, inputName?: string): INodeExecutionData[];
-		prepareOutputData(
-			outputData: INodeExecutionData[],
-			outputIndex?: number,
-		): Promise<INodeExecutionData[][]>;
+		getNodeOutputs(): INodeOutputConfiguration[];
 		putExecutionToWait(waitTill: Date): Promise<void>;
 		sendMessageToUI(message: any): void;
 		sendResponse(response: IExecuteResponsePromiseData): void;
 
+		// TODO: Make this one then only available in the new config one
+		addInputData(
+			connectionType: ConnectionTypes,
+			data: INodeExecutionData[][] | ExecutionError,
+			runIndex?: number,
+		): { index: number };
+		addOutputData(
+			connectionType: ConnectionTypes,
+			currentNodeRunIndex: number,
+			data: INodeExecutionData[][] | ExecutionError,
+		): void;
+
 		nodeHelpers: NodeHelperFunctions;
 		helpers: RequestHelperFunctions &
 			BaseHelperFunctions &
@@ -774,7 +885,10 @@ export type IExecuteFunctions = ExecuteFunctions.GetNodeParameterFn &
 				): NodeExecutionWithMetadata[];
 				assertBinaryData(itemIndex: number, propertyName: string): IBinaryData;
 				getBinaryDataBuffer(itemIndex: number, propertyName: string): Promise<Buffer>;
+				copyInputItems(items: INodeExecutionData[], properties: string[]): IDataObject[];
 			};
+
+		getParentCallbackManager(): CallbackManager | undefined;
 	};
 
 export interface IExecuteSingleFunctions extends BaseExecutionFunctions {
@@ -869,6 +983,11 @@ export interface IHookFunctions
 export interface IWebhookFunctions extends FunctionsBaseWithRequiredKeys<'getMode'> {
 	getBodyData(): IDataObject;
 	getHeaderData(): IncomingHttpHeaders;
+	getInputConnectionData(
+		inputName: ConnectionTypes,
+		itemIndex: number,
+		inputIndex?: number,
+	): Promise<unknown>;
 	getNodeParameter(
 		parameterName: string,
 		fallbackValue?: any,
@@ -880,10 +999,6 @@ export interface IWebhookFunctions extends FunctionsBaseWithRequiredKeys<'getMod
 	getRequestObject(): express.Request;
 	getResponseObject(): express.Response;
 	getWebhookName(): string;
-	prepareOutputData(
-		outputData: INodeExecutionData[],
-		outputIndex?: number,
-	): Promise<INodeExecutionData[][]>;
 	nodeHelpers: NodeHelperFunctions;
 	helpers: RequestHelperFunctions &
 		BaseHelperFunctions &
@@ -900,6 +1015,7 @@ export interface INodeCredentials {
 	[key: string]: INodeCredentialsDetails;
 }
 
+export type OnError = 'continueErrorOutput' | 'continueRegularOutput' | 'stopWorkflow';
 export interface INode {
 	id: string;
 	name: string;
@@ -914,10 +1030,12 @@ export interface INode {
 	waitBetweenTries?: number;
 	alwaysOutputData?: boolean;
 	executeOnce?: boolean;
+	onError?: OnError;
 	continueOnFail?: boolean;
 	parameters: INodeParameters;
 	credentials?: INodeCredentials;
 	webhookId?: string;
+	extendsCredential?: string;
 }
 
 export interface IPinData {
@@ -994,7 +1112,8 @@ export type NodeParameterValueType =
 	| INodeParameterResourceLocator
 	| NodeParameterValue[]
 	| INodeParameters[]
-	| INodeParameterResourceLocator[];
+	| INodeParameterResourceLocator[]
+	| ResourceMapperValue[];
 
 export interface INodeParameters {
 	[key: string]: NodeParameterValueType;
@@ -1002,6 +1121,7 @@ export interface INodeParameters {
 
 export type NodePropertyTypes =
 	| 'boolean'
+	| 'button'
 	| 'collection'
 	| 'color'
 	| 'dateTime'
@@ -1016,12 +1136,27 @@ export type NodePropertyTypes =
 	| 'credentialsSelect'
 	| 'resourceLocator'
 	| 'curlImport'
+	| 'resourceMapper'
+	| 'filter'
+	| 'assignmentCollection'
+	| 'credentials'
 	| 'sendgridPreview'
 	| 'swaggerEditor';
 
 export type CodeAutocompleteTypes = 'function' | 'functionItem';
 
-export type EditorTypes = 'code' | 'codeNodeEditor' | 'htmlEditor' | 'json';
+export type EditorType = 'codeNodeEditor' | 'jsEditor' | 'htmlEditor' | 'sqlEditor';
+export type CodeNodeEditorLanguage = (typeof CODE_LANGUAGES)[number];
+export type CodeExecutionMode = (typeof CODE_EXECUTION_MODES)[number];
+export type SQLDialect =
+	| 'StandardSQL'
+	| 'PostgreSQL'
+	| 'MySQL'
+	| 'MariaSQL'
+	| 'MSSQL'
+	| 'SQLite'
+	| 'Cassandra'
+	| 'PLSQL';
 
 export interface ILoadOptions {
 	routing?: {
@@ -1032,9 +1167,12 @@ export interface ILoadOptions {
 }
 
 export interface INodePropertyTypeOptions {
+	action?: string; // Supported by: button
+	containerClass?: string; // Supported by: notice
 	alwaysOpenEditWindow?: boolean; // Supported by: json
 	codeAutocomplete?: CodeAutocompleteTypes; // Supported by: string
-	editor?: EditorTypes; // Supported by: string
+	editor?: EditorType; // Supported by: string
+	sqlDialect?: SQLDialect; // Supported by: sqlEditor
 	loadOptionsDependsOn?: string[]; // Supported by: options
 	loadOptionsMethod?: string; // Supported by: options
 	loadOptions?: ILoadOptions; // Supported by: options
@@ -1048,16 +1186,79 @@ export interface INodePropertyTypeOptions {
 	showAlpha?: boolean; // Supported by: color
 	sortable?: boolean; // Supported when "multipleValues" set to true
 	expirable?: boolean; // Supported by: hidden (only in the credentials)
+	resourceMapper?: ResourceMapperTypeOptions;
+	filter?: FilterTypeOptions;
+	assignment?: AssignmentTypeOptions;
 	[key: string]: any;
 }
 
+export interface ResourceMapperTypeOptions {
+	resourceMapperMethod: string;
+	mode: 'add' | 'update' | 'upsert';
+	valuesLabel?: string;
+	fieldWords?: { singular: string; plural: string };
+	addAllFields?: boolean;
+	noFieldsError?: string;
+	multiKeyMatch?: boolean;
+	supportAutoMap?: boolean;
+	matchingFieldsLabels?: {
+		title?: string;
+		description?: string;
+		hint?: string;
+	};
+}
+
+type NonEmptyArray<T> = [T, ...T[]];
+
+export type FilterTypeCombinator = 'and' | 'or';
+
+export type FilterTypeOptions = Partial<{
+	caseSensitive: boolean | string; // default = true
+	leftValue: string; // when set, user can't edit left side of condition
+	allowedCombinators: NonEmptyArray<FilterTypeCombinator>; // default = ['and', 'or']
+	maxConditions: number; // default = 10
+	typeValidation: 'strict' | 'loose' | {}; // default = strict, `| {}` is a TypeScript trick to allow custom strings, but still give autocomplete
+}>;
+
+export type AssignmentTypeOptions = Partial<{
+	hideType?: boolean; // visible by default
+}>;
+
+export type DisplayCondition =
+	| { _cnd: { eq: NodeParameterValue } }
+	| { _cnd: { not: NodeParameterValue } }
+	| { _cnd: { gte: number | string } }
+	| { _cnd: { lte: number | string } }
+	| { _cnd: { gt: number | string } }
+	| { _cnd: { lt: number | string } }
+	| { _cnd: { between: { from: number | string; to: number | string } } }
+	| { _cnd: { startsWith: string } }
+	| { _cnd: { endsWith: string } }
+	| { _cnd: { includes: string } }
+	| { _cnd: { regex: string } };
+
 export interface IDisplayOptions {
+	hide?: {
+		[key: string]: Array<NodeParameterValue | DisplayCondition> | undefined;
+	};
+	show?: {
+		'@version'?: Array<number | DisplayCondition>;
+		[key: string]: Array<NodeParameterValue | DisplayCondition> | undefined;
+	};
+
+	hideOnCloud?: boolean;
+}
+export interface ICredentialsDisplayOptions {
 	hide?: {
 		[key: string]: NodeParameterValue[] | undefined;
 	};
 	show?: {
+		// eslint-disable-next-line @typescript-eslint/naming-convention
+		'@version'?: number[];
 		[key: string]: NodeParameterValue[] | undefined;
 	};
+
+	hideOnCloud?: boolean;
 }
 
 export interface INodeProperties {
@@ -1081,6 +1282,13 @@ export interface INodeProperties {
 	extractValue?: INodePropertyValueExtractor;
 	modes?: INodePropertyMode[];
 	requiresDataPath?: 'single' | 'multiple';
+	doNotInherit?: boolean;
+	// set expected type for the value which would be used for validation and type casting
+	validateType?: FieldType;
+	// works only if validateType is set
+	// allows to skip validation during execution or set custom validation/casting logic inside node
+	// inline error messages would still be shown in UI
+	ignoreValidationDuringExecution?: boolean;
 }
 
 export interface INodePropertyModeTypeOptions {
@@ -1163,11 +1371,11 @@ export interface INodePropertyValueExtractorRegex extends INodePropertyValueExtr
 }
 
 export interface INodePropertyValueExtractorFunction {
-	(this: IExecuteSingleFunctions, value: string | NodeParameterValue):
-		| Promise<string | NodeParameterValue>
-		| (string | NodeParameterValue);
+	(
+		this: IExecuteSingleFunctions,
+		value: string | NodeParameterValue,
+	): Promise<string | NodeParameterValue> | (string | NodeParameterValue);
 }
-
 export type INodePropertyValueExtractor = INodePropertyValueExtractorRegex;
 
 export interface IParameterDependencies {
@@ -1179,13 +1387,13 @@ export type IParameterLabel = {
 };
 
 export interface IPollResponse {
-	closeFunction?: () => Promise<void>;
+	closeFunction?: CloseFunction;
 }
 
 export interface ITriggerResponse {
-	closeFunction?: () => Promise<void>;
+	closeFunction?: CloseFunction;
 	// To manually trigger the run
-	manualTriggerFunction?: () => Promise<void>;
+	manualTriggerFunction?: CloseFunction;
 	// Gets added automatically at manual workflow runs resolves with
 	// the first emitted data
 	manualTriggerResponse?: Promise<INodeExecutionData[][]>;
@@ -1193,12 +1401,36 @@ export interface ITriggerResponse {
 
 export type WebhookSetupMethodNames = 'checkExists' | 'create' | 'delete';
 
+export namespace MultiPartFormData {
+	export interface File {
+		filepath: string;
+		mimetype?: string;
+		originalFilename?: string;
+		newFilename: string;
+	}
+
+	export type Request = express.Request<
+		{},
+		{},
+		{
+			data: Record<string, string | string[]>;
+			files: Record<string, File | File[]>;
+		}
+	>;
+}
+
+export interface SupplyData {
+	metadata?: IDataObject;
+	response: unknown;
+	closeFunction?: CloseFunction;
+}
+
 export interface INodeType {
 	description: INodeTypeDescription;
+	supplyData?(this: IAllExecuteFunctions, itemIndex: number): Promise<SupplyData>;
 	execute?(
 		this: IExecuteFunctions,
 	): Promise<INodeExecutionData[][] | NodeExecutionWithMetadata[][] | null>;
-	executeSingle?(this: IExecuteSingleFunctions): Promise<INodeExecutionData>;
 	poll?(this: IPollFunctions): Promise<INodeExecutionData[][] | null>;
 	trigger?(this: ITriggerFunctions): Promise<ITriggerResponse | undefined>;
 	webhook?(this: IWebhookFunctions): Promise<IWebhookResponseData>;
@@ -1217,6 +1449,9 @@ export interface INodeType {
 			// Contains a group of functions that test credentials.
 			[functionName: string]: ICredentialTestFunction;
 		};
+		resourceMapping?: {
+			[functionName: string]: (this: ILoadOptionsFunctions) => Promise<ResourceMapperFields>;
+		};
 	};
 	webhookMethods?: {
 		[name in IWebhookDescription['name']]?: {
@@ -1225,6 +1460,16 @@ export interface INodeType {
 	};
 }
 
+/**
+ * This class serves as the base for all nodes using the new context API
+ * having this as a class enables us to identify these instances at runtime
+ */
+export abstract class Node {
+	abstract description: INodeTypeDescription;
+	execute?(context: IExecuteFunctions): Promise<INodeExecutionData[][]>;
+	webhook?(context: IWebhookFunctions): Promise<IWebhookResponseData>;
+}
+
 export interface IVersionedNodeType {
 	nodeVersions: {
 		[key: number]: INodeType;
@@ -1245,11 +1490,12 @@ export interface INodeCredentialTestRequest {
 export interface INodeCredentialDescription {
 	name: string;
 	required?: boolean;
-	displayOptions?: IDisplayOptions;
+	displayName?: string;
+	displayOptions?: ICredentialsDisplayOptions;
 	testedBy?: ICredentialTestRequest | string; // Name of a function inside `loadOptions.credentialTest`
 }
 
-export type INodeIssueTypes = 'credentials' | 'execution' | 'parameters' | 'typeUnknown';
+export type INodeIssueTypes = 'credentials' | 'execution' | 'input' | 'parameters' | 'typeUnknown';
 
 export interface INodeIssueObjectProperty {
 	[key: string]: string[];
@@ -1264,6 +1510,7 @@ export interface INodeIssueData {
 export interface INodeIssues {
 	execution?: boolean;
 	credentials?: INodeIssueObjectProperty;
+	input?: INodeIssueObjectProperty;
 	parameters?: INodeIssueObjectProperty;
 	typeUnknown?: boolean;
 	[key: string]: undefined | boolean | INodeIssueObjectProperty;
@@ -1278,6 +1525,7 @@ export interface INodeTypeBaseDescription {
 	name: string;
 	icon?: string;
 	iconUrl?: string;
+	badgeIconUrl?: string;
 	group: string[];
 	description: string;
 	documentationUrl?: string;
@@ -1391,10 +1639,68 @@ export interface IPostReceiveSort extends IPostReceiveBase {
 	};
 }
 
-export interface INodeActionTypeDescription extends INodeTypeDescription {
-	displayOptions?: IDisplayOptions;
-	values?: IDataObject;
-	actionKey: string;
+export type ConnectionTypes =
+	| 'ai_agent'
+	| 'ai_chain'
+	| 'ai_document'
+	| 'ai_embedding'
+	| 'ai_languageModel'
+	| 'ai_memory'
+	| 'ai_outputParser'
+	| 'ai_retriever'
+	| 'ai_textSplitter'
+	| 'ai_tool'
+	| 'ai_vectorRetriever'
+	| 'ai_vectorStore'
+	| 'main';
+
+export const enum NodeConnectionType {
+	// eslint-disable-next-line @typescript-eslint/naming-convention
+	AiAgent = 'ai_agent',
+	// eslint-disable-next-line @typescript-eslint/naming-convention
+	AiChain = 'ai_chain',
+	// eslint-disable-next-line @typescript-eslint/naming-convention
+	AiDocument = 'ai_document',
+	// eslint-disable-next-line @typescript-eslint/naming-convention
+	AiEmbedding = 'ai_embedding',
+	// eslint-disable-next-line @typescript-eslint/naming-convention
+	AiLanguageModel = 'ai_languageModel',
+	// eslint-disable-next-line @typescript-eslint/naming-convention
+	AiMemory = 'ai_memory',
+	// eslint-disable-next-line @typescript-eslint/naming-convention
+	AiOutputParser = 'ai_outputParser',
+	// eslint-disable-next-line @typescript-eslint/naming-convention
+	AiRetriever = 'ai_retriever',
+	// eslint-disable-next-line @typescript-eslint/naming-convention
+	AiTextSplitter = 'ai_textSplitter',
+	// eslint-disable-next-line @typescript-eslint/naming-convention
+	AiTool = 'ai_tool',
+	// eslint-disable-next-line @typescript-eslint/naming-convention
+	AiVectorStore = 'ai_vectorStore',
+	// eslint-disable-next-line @typescript-eslint/naming-convention
+	Main = 'main',
+}
+
+export interface INodeInputFilter {
+	// TODO: Later add more filter options like categories, subcatogries,
+	//       regex, allow to exclude certain nodes, ... ?
+	//       Potentially change totally after alpha/beta. Is not a breaking change after all.
+	nodes: string[]; // Allowed nodes
+}
+
+export interface INodeInputConfiguration {
+	displayName?: string;
+	maxConnections?: number;
+	required?: boolean;
+	filter?: INodeInputFilter;
+	type: ConnectionTypes;
+}
+
+export interface INodeOutputConfiguration {
+	category?: string;
+	displayName?: string;
+	required?: boolean;
+	type: ConnectionTypes;
 }
 
 export interface INodeTypeDescription extends INodeTypeBaseDescription {
@@ -1402,14 +1708,16 @@ export interface INodeTypeDescription extends INodeTypeBaseDescription {
 	defaults: INodeParameters;
 	eventTriggerDescription?: string;
 	activationMessage?: string;
-	inputs: string[];
+	inputs: Array<ConnectionTypes | INodeInputConfiguration> | string;
+	requiredInputs?: string | number[] | number; // Ony available with executionOrder => "v1"
 	inputNames?: string[];
-	outputs: string[];
+	outputs: Array<ConnectionTypes | INodeInputConfiguration> | string;
 	outputNames?: string[];
 	properties: INodeProperties[];
 	credentials?: INodeCredentialDescription[];
 	maxNodes?: number; // How many nodes of that type can be created in a workflow
-	polling?: boolean;
+	polling?: true | undefined;
+	supportsCORS?: true | undefined;
 	requestDefaults?: DeclarativeRestApiSettings.HttpRequestOptions;
 	requestOperations?: IN8nRequestOperations;
 	hooks?: {
@@ -1420,22 +1728,25 @@ export interface INodeTypeDescription extends INodeTypeBaseDescription {
 	webhooks?: IWebhookDescription[];
 	translation?: { [key: string]: object };
 	mockManualExecution?: true;
-	triggerPanel?: {
-		header?: string;
-		executionsHelp?:
-			| string
-			| {
-					active: string;
-					inactive: string;
-			  };
-		activationHint?:
-			| string
-			| {
-					active: string;
-					inactive: string;
-			  };
-	};
-	actions?: INodeActionTypeDescription[];
+	triggerPanel?:
+		| {
+				hideContent?: boolean | string;
+				header?: string;
+				executionsHelp?:
+					| string
+					| {
+							active: string;
+							inactive: string;
+					  };
+				activationHint?:
+					| string
+					| {
+							active: string;
+							inactive: string;
+					  };
+		  }
+		| boolean;
+	extendsCredential?: string;
 	__loadOptionsMethods?: string[]; // only for validation during build
 }
 
@@ -1444,18 +1755,21 @@ export interface INodeHookDescription {
 }
 
 export interface IWebhookData {
-	httpMethod: WebhookHttpMethod;
+	httpMethod: IHttpRequestMethods;
 	node: string;
 	path: string;
 	webhookDescription: IWebhookDescription;
 	workflowId: string;
 	workflowExecuteAdditionalData: IWorkflowExecuteAdditionalData;
 	webhookId?: string;
+	isTest?: boolean;
+	userId?: string;
+	staticData?: Workflow['staticData'];
 }
 
 export interface IWebhookDescription {
-	[key: string]: WebhookHttpMethod | WebhookResponseMode | boolean | string | undefined;
-	httpMethod: WebhookHttpMethod | string;
+	[key: string]: IHttpRequestMethods | WebhookResponseMode | boolean | string | undefined;
+	httpMethod: IHttpRequestMethods | string;
 	isFullPath?: boolean;
 	name: 'default' | 'setup';
 	path: string;
@@ -1465,6 +1779,10 @@ export interface IWebhookDescription {
 	responseMode?: WebhookResponseMode | string;
 	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
 }
 
 export interface ProxyInput {
@@ -1496,6 +1814,11 @@ export interface IWorkflowDataProxyData {
 	$thisItemIndex: number;
 	$now: any;
 	$today: any;
+	$getPairedItem: (
+		destinationNodeName: string,
+		incomingSourceData: ISourceData | null,
+		pairedItem: IPairedItemData,
+	) => INodeExecutionData | null;
 	constructor: any;
 }
 
@@ -1507,8 +1830,6 @@ export interface IWorkflowMetadata {
 	active: boolean;
 }
 
-export type WebhookHttpMethod = 'DELETE' | 'GET' | 'HEAD' | 'PATCH' | 'POST' | 'PUT' | 'OPTIONS';
-
 export interface IWebhookResponseData {
 	workflowData?: INodeExecutionData[][];
 	webhookResponse?: any;
@@ -1516,11 +1837,12 @@ export interface IWebhookResponseData {
 }
 
 export type WebhookResponseData = 'allEntries' | 'firstEntryJson' | 'firstEntryBinary' | 'noData';
-export type WebhookResponseMode = 'onReceived' | 'lastNode';
+export type WebhookResponseMode = 'onReceived' | 'lastNode' | 'responseNode';
 
 export interface INodeTypes {
 	getByName(nodeType: string): INodeType | IVersionedNodeType;
 	getByNameAndVersion(nodeType: string, version?: number): INodeType;
+	getKnownTypes(): IDataObject;
 }
 
 export type LoadingDetails = {
@@ -1529,7 +1851,8 @@ export type LoadingDetails = {
 };
 
 export type CredentialLoadingDetails = LoadingDetails & {
-	nodesToTestWith?: string[];
+	supportedNodes?: string[];
+	extends?: string[];
 };
 
 export type NodeLoadingDetails = LoadingDetails;
@@ -1548,17 +1871,6 @@ type LoadedData<T> = Record<string, LoadedClass<T>>;
 export type ICredentialTypeData = LoadedData<ICredentialType>;
 export type INodeTypeData = LoadedData<INodeType | IVersionedNodeType>;
 
-export type LoadedNodesAndCredentials = {
-	nodes: INodeTypeData;
-	credentials: ICredentialTypeData;
-};
-
-export interface INodesAndCredentials {
-	known: KnownNodesAndCredentials;
-	loaded: LoadedNodesAndCredentials;
-	credentialTypes: ICredentialTypes;
-}
-
 export interface IRun {
 	data: IRunExecutionData;
 	finished?: boolean;
@@ -1587,6 +1899,10 @@ export interface IRunExecutionData {
 	executionData?: {
 		contextData: IExecuteContextData;
 		nodeExecutionStack: IExecuteData[];
+		metadata: {
+			// node-name: metadata by runIndex
+			[key: string]: ITaskMetadata[];
+		};
 		waitingExecution: IWaitingForExecution;
 		waitingExecutionSource: IWaitingForExecutionSource | null;
 	};
@@ -1598,14 +1914,25 @@ export interface IRunData {
 	[key: string]: ITaskData[];
 }
 
+export interface ITaskSubRunMetadata {
+	node: string;
+	runIndex: number;
+}
+
+export interface ITaskMetadata {
+	subRun?: ITaskSubRunMetadata[];
+}
+
 // The data that gets returned when a node runs
 export interface ITaskData {
 	startTime: number;
 	executionTime: number;
 	executionStatus?: ExecutionStatus;
 	data?: ITaskDataConnections;
+	inputOverride?: ITaskDataConnections;
 	error?: ExecutionError;
 	source: Array<ISourceData | null>; // Is an array as nodes have multiple inputs
+	metadata?: ITaskMetadata;
 }
 
 export interface ISourceData {
@@ -1614,6 +1941,11 @@ export interface ISourceData {
 	previousNodeRun?: number; // If undefined "0" gets used
 }
 
+export interface StartNodeData {
+	name: string;
+	sourceData: ISourceData | null;
+}
+
 // The data for all the different kind of connections (like main) and all the indexes
 export interface ITaskDataConnections {
 	// Key for each input type and because there can be multiple inputs of the same type it is an array
@@ -1647,7 +1979,7 @@ export interface IWaitingForExecutionSource {
 }
 
 export interface IWorkflowBase {
-	id?: string;
+	id: string;
 	name: string;
 	active: boolean;
 	createdAt: Date;
@@ -1657,6 +1989,7 @@ export interface IWorkflowBase {
 	settings?: IWorkflowSettings;
 	staticData?: IDataObject;
 	pinData?: IPinData;
+	versionId?: string;
 }
 
 export interface IWorkflowCredentials {
@@ -1676,31 +2009,50 @@ export interface IWorkflowExecuteHooks {
 	sendResponse?: Array<(response: IExecuteResponsePromiseData) => Promise<void>>;
 }
 
+export const eventNamesAiNodes = [
+	'n8n.ai.memory.get.messages',
+	'n8n.ai.memory.added.message',
+	'n8n.ai.output.parser.get.instructions',
+	'n8n.ai.output.parser.parsed',
+	'n8n.ai.retriever.get.relevant.documents',
+	'n8n.ai.embeddings.embedded.document',
+	'n8n.ai.embeddings.embedded.query',
+	'n8n.ai.document.processed',
+	'n8n.ai.text.splitter.split',
+	'n8n.ai.tool.called',
+	'n8n.ai.vector.store.searched',
+	'n8n.ai.llm.generated',
+	'n8n.ai.vector.store.populated',
+] as const;
+
+export type EventNamesAiNodesType = (typeof eventNamesAiNodes)[number];
+
 export interface IWorkflowExecuteAdditionalData {
 	credentialsHelper: ICredentialsHelper;
-	encryptionKey: string;
 	executeWorkflow: (
 		workflowInfo: IExecuteWorkflowInfo,
 		additionalData: IWorkflowExecuteAdditionalData,
 		options: {
-			parentWorkflowId?: string;
+			node?: INode;
+			parentWorkflowId: string;
 			inputData?: INodeExecutionData[];
 			parentExecutionId?: string;
 			loadedWorkflowData?: IWorkflowBase;
 			loadedRunData?: any;
 			parentWorkflowSettings?: IWorkflowSettings;
+			parentCallbackManager?: CallbackManager;
 		},
 	) => Promise<any>;
-	// hooks?: IWorkflowExecuteHooks;
 	executionId?: string;
 	restartExecutionId?: string;
 	hooks?: WorkflowHooks;
 	httpResponse?: express.Response;
 	httpRequest?: express.Request;
 	restApiUrl: string;
+	instanceBaseUrl: string;
 	setExecutionStatus?: (status: ExecutionStatus) => void;
-	sendMessageToUI?: (source: string, message: any) => void;
-	timezone: string;
+	sendDataToUI?: (type: string, data: IDataObject | IDataObject[]) => void;
+	formWaitingBaseUrl: string;
 	webhookBaseUrl: string;
 	webhookWaitingBaseUrl: string;
 	webhookTestBaseUrl: string;
@@ -1708,6 +2060,19 @@ export interface IWorkflowExecuteAdditionalData {
 	executionTimeoutTimestamp?: number;
 	userId: string;
 	variables: IDataObject;
+	secretsHelpers: SecretsHelpersBase;
+	logAiEvent: (
+		eventName: EventNamesAiNodesType,
+		payload: {
+			msg?: string;
+			executionId: string;
+			nodeName: string;
+			workflowId?: string;
+			workflowName: string;
+			nodeType?: string;
+		},
+	) => Promise<void>;
+	parentCallbackManager?: CallbackManager;
 }
 
 export type WorkflowExecuteMode =
@@ -1719,12 +2084,18 @@ export type WorkflowExecuteMode =
 	| 'retry'
 	| 'trigger'
 	| 'webhook';
-export type WorkflowActivateMode = 'init' | 'create' | 'update' | 'activate' | 'manual';
+
+export type WorkflowActivateMode =
+	| 'init'
+	| 'create' // unused
+	| 'update'
+	| 'activate'
+	| 'manual' // unused
+	| 'leadershipChange';
 
 export interface IWorkflowHooksOptionalParameters {
-	parentProcessMode?: string;
 	retryOf?: string;
-	sessionId?: string;
+	pushRef?: string;
 }
 
 export namespace WorkflowSettings {
@@ -1742,19 +2113,46 @@ export interface IWorkflowSettings {
 	saveManualExecutions?: 'DEFAULT' | boolean;
 	saveExecutionProgress?: 'DEFAULT' | boolean;
 	executionTimeout?: number;
+	executionOrder?: 'v0' | 'v1';
 }
 
-export type LogTypes = 'debug' | 'verbose' | 'info' | 'warn' | 'error';
+export interface WorkflowFEMeta {
+	onboardingId?: string;
+}
 
-export interface ILogger {
-	log: (type: LogTypes, message: string, meta?: object) => void;
-	debug: (message: string, meta?: object) => void;
-	verbose: (message: string, meta?: object) => void;
-	info: (message: string, meta?: object) => void;
-	warn: (message: string, meta?: object) => void;
-	error: (message: string, meta?: object) => void;
+export interface WorkflowTestData {
+	description: string;
+	input: {
+		workflowData: {
+			nodes: INode[];
+			connections: IConnections;
+			settings?: IWorkflowSettings;
+		};
+	};
+	output: {
+		nodeExecutionOrder?: string[];
+		nodeData: {
+			[key: string]: any[][];
+		};
+	};
+	nock?: {
+		baseUrl: string;
+		mocks: Array<{
+			method: string;
+			path: string;
+			statusCode: number;
+			responseBody: any;
+		}>;
+	};
+	trigger?: {
+		mode: WorkflowExecuteMode;
+		input: INodeExecutionData;
+	};
 }
 
+export type LogLevel = (typeof LOG_LEVELS)[number];
+export type Logger = Record<Exclude<LogLevel, 'silent'>, (message: string, meta?: object) => void>;
+
 export interface IStatusCodeMessages {
 	[key: string]: string;
 }
@@ -1787,7 +2185,7 @@ export type PropertiesOf<M extends { resource: string; operation: string }> = Ar
 			[key in 'show' | 'hide']?: {
 				resource?: Array<M['resource']>;
 				operation?: Array<M['operation']>;
-				[otherKey: string]: NodeParameterValue[] | undefined;
+				[otherKey: string]: Array<NodeParameterValue | DisplayCondition> | undefined;
 			};
 		};
 	}
@@ -1826,6 +2224,7 @@ export interface INoteGraphItem {
 export interface INodeGraphItem {
 	id: string;
 	type: string;
+	version?: number;
 	resource?: string;
 	operation?: string;
 	domain?: string; // HTTP Request node v1
@@ -1838,6 +2237,8 @@ export interface INodeGraphItem {
 	method?: string; // HTTP Request node v2
 	src_node_id?: string;
 	src_instance_id?: string;
+	agent?: string; //@n8n/n8n-nodes-langchain.agent
+	prompts?: IDataObject[] | IDataObject; //ai node's prompts, cloud only
 }
 
 export interface INodeNameIndex {
@@ -1870,22 +2271,6 @@ export interface IConnectedNode {
 	depth: number;
 }
 
-export const enum OAuth2GrantType {
-	authorizationCode = 'authorizationCode',
-	clientCredentials = 'clientCredentials',
-}
-export interface IOAuth2Credentials {
-	grantType: 'authorizationCode' | 'clientCredentials';
-	clientId: string;
-	clientSecret: string;
-	accessTokenUrl: string;
-	authUrl: string;
-	authQueryParameters: string;
-	authentication: 'body' | 'header';
-	scope: string;
-	oauthTokenData?: IDataObject;
-}
-
 export type PublicInstalledPackage = {
 	packageName: string;
 	installedVersion: string;
@@ -1909,12 +2294,12 @@ export interface NodeExecutionWithMetadata extends INodeExecutionData {
 	pairedItem: IPairedItemData | IPairedItemData[];
 }
 
-export interface IExecutionsSummary {
+export interface ExecutionSummary {
 	id: string;
 	finished?: boolean;
 	mode: WorkflowExecuteMode;
-	retryOf?: string;
-	retrySuccessId?: string;
+	retryOf?: string | null;
+	retrySuccessId?: string | null;
 	waitTill?: Date;
 	startedAt: Date;
 	stoppedAt?: Date;
@@ -1924,11 +2309,11 @@ export interface IExecutionsSummary {
 	lastNodeExecuted?: string;
 	executionError?: ExecutionError;
 	nodeExecutionStatus?: {
-		[key: string]: IExceutionSummaryNodeExecutionResult;
+		[key: string]: IExecutionSummaryNodeExecutionResult;
 	};
 }
 
-export interface IExceutionSummaryNodeExecutionResult {
+export interface IExecutionSummaryNodeExecutionResult {
 	executionStatus: ExecutionStatus;
 	errors?: Array<{
 		name?: string;
@@ -1937,6 +2322,95 @@ export interface IExceutionSummaryNodeExecutionResult {
 	}>;
 }
 
+export interface ResourceMapperFields {
+	fields: ResourceMapperField[];
+}
+
+export interface ResourceMapperField {
+	id: string;
+	displayName: string;
+	defaultMatch: boolean;
+	canBeUsedToMatch?: boolean;
+	required: boolean;
+	display: boolean;
+	type?: FieldType;
+	removed?: boolean;
+	options?: INodePropertyOptions[];
+	readOnly?: boolean;
+}
+
+export type FieldType =
+	| 'string'
+	| 'string-alphanumeric'
+	| 'number'
+	| 'dateTime'
+	| 'boolean'
+	| 'time'
+	| 'array'
+	| 'object'
+	| 'options'
+	| 'url'
+	| 'jwt';
+
+export type ValidationResult = {
+	valid: boolean;
+	errorMessage?: string;
+	newValue?: string | number | boolean | object | null | undefined;
+};
+
+export type ResourceMapperValue = {
+	mappingMode: string;
+	value: { [key: string]: string | number | boolean | null } | null;
+	matchingColumns: string[];
+	schema: ResourceMapperField[];
+};
+
+export type FilterOperatorType =
+	| 'string'
+	| 'number'
+	| 'boolean'
+	| 'array'
+	| 'object'
+	| 'dateTime'
+	| 'any';
+
+export interface FilterOperatorValue {
+	type: FilterOperatorType;
+	operation: string;
+	rightType?: FilterOperatorType;
+	singleValue?: boolean; // default = false
+}
+
+export type FilterConditionValue = {
+	id: string;
+	leftValue: unknown;
+	operator: FilterOperatorValue;
+	rightValue: unknown;
+};
+
+export type FilterOptionsValue = {
+	caseSensitive: boolean;
+	leftValue: string;
+	typeValidation: 'strict' | 'loose';
+};
+
+export type FilterValue = {
+	options: FilterOptionsValue;
+	conditions: FilterConditionValue[];
+	combinator: FilterTypeCombinator;
+};
+
+export type AssignmentCollectionValue = {
+	assignments: AssignmentValue[];
+};
+
+export type AssignmentValue = {
+	id: string;
+	name: string;
+	value: NodeParameterValue;
+	type?: string;
+};
+
 export interface ExecutionOptions {
 	limit?: number;
 }
@@ -1958,12 +2432,19 @@ export interface IVersionNotificationSettings {
 }
 
 export interface IUserManagementSettings {
-	enabled: boolean;
+	quota: number;
 	showSetupOnFirstLoad?: boolean;
 	smtpSetup: boolean;
 	authenticationMethod: AuthenticationMethod;
 }
 
+export interface IUserSettings {
+	isOnboarded?: boolean;
+	firstSuccessfulWorkflowId?: string;
+	userActivated?: boolean;
+	allowSSOManualLogin?: boolean;
+}
+
 export interface IPublicApiSettings {
 	enabled: boolean;
 	latestVersion: number;
@@ -1973,9 +2454,14 @@ export interface IPublicApiSettings {
 	};
 }
 
-export type ILogLevel = 'info' | 'debug' | 'warn' | 'error' | 'verbose' | 'silent';
+export type ExpressionEvaluatorType = 'tmpl' | 'tournament';
+
+export type N8nAIProviderType = 'openai' | 'unknown';
 
 export interface IN8nUISettings {
+	endpointForm: string;
+	endpointFormTest: string;
+	endpointFormWaiting: string;
 	endpointWebhook: string;
 	endpointWebhookTest: string;
 	saveDataErrorExecution: WorkflowSettings.SaveDataExecution;
@@ -1992,7 +2478,13 @@ export interface IN8nUISettings {
 	urlBaseWebhook: string;
 	urlBaseEditor: string;
 	versionCli: string;
+	authCookie: {
+		secure: boolean;
+	};
+	binaryDataMode: string;
+	releaseChannel: 'stable' | 'beta' | 'nightly' | 'dev';
 	n8nMetadata?: {
+		userId?: string;
 		[key: string]: string | number | undefined;
 	};
 	versionNotifications: IVersionNotificationSettings;
@@ -2007,7 +2499,6 @@ export interface IN8nUISettings {
 		debug: boolean;
 	};
 	personalizationSurveyEnabled: boolean;
-	userActivationSurveyEnabled: boolean;
 	defaultLocale: string;
 	userManagement: IUserManagementSettings;
 	sso: {
@@ -2022,8 +2513,9 @@ export interface IN8nUISettings {
 	};
 	publicApi: IPublicApiSettings;
 	workflowTagsDisabled: boolean;
-	logLevel: ILogLevel;
+	logLevel: LogLevel;
 	hiringBannerEnabled: boolean;
+	previewMode: boolean;
 	templates: {
 		enabled: boolean;
 		host: string;
@@ -2048,7 +2540,15 @@ export interface IN8nUISettings {
 		logStreaming: boolean;
 		advancedExecutionFilters: boolean;
 		variables: boolean;
-		versionControl: boolean;
+		sourceControl: boolean;
+		auditLogs: boolean;
+		externalSecrets: boolean;
+		showNonProdBanner: boolean;
+		debugInEditor: boolean;
+		binaryDataS3: boolean;
+		workflowHistory: boolean;
+		workerView: boolean;
+		advancedPermissions: boolean;
 	};
 	hideUsagePage: boolean;
 	license: {
@@ -2057,4 +2557,48 @@ export interface IN8nUISettings {
 	variables: {
 		limit: number;
 	};
+	expressions: {
+		evaluator: ExpressionEvaluatorType;
+	};
+	mfa: {
+		enabled: boolean;
+	};
+	banners: {
+		dismissed: string[];
+	};
+	ai: {
+		enabled: boolean;
+		provider: string;
+		features: {
+			generateCurl: boolean;
+		};
+	};
+	workflowHistory: {
+		pruneTime: number;
+		licensePruneTime: number;
+	};
+}
+
+export interface SecretsHelpersBase {
+	update(): Promise<void>;
+	waitForInit(): Promise<void>;
+
+	getSecret(provider: string, name: string): unknown;
+	hasSecret(provider: string, name: string): boolean;
+	hasProvider(provider: string): boolean;
+	listProviders(): string[];
+	listSecrets(provider: string): string[];
 }
+
+export type BannerName =
+	| 'V1'
+	| 'TRIAL_OVER'
+	| 'TRIAL'
+	| 'NON_PRODUCTION_LICENSE'
+	| 'EMAIL_CONFIRMATION';
+
+export type Functionality = 'regular' | 'configuration-node' | 'pairedItem';
+
+export type Result<T, E> = { ok: true; result: T } | { ok: false; error: E };
+
+export type CallbackManager = CallbackManagerLC;
diff --git a/packages/workflow/src/LoggerProxy.ts b/packages/workflow/src/LoggerProxy.ts
index 57cf6419c96b6..cd6f1b1cb98e5 100644
--- a/packages/workflow/src/LoggerProxy.ts
+++ b/packages/workflow/src/LoggerProxy.ts
@@ -1,43 +1,16 @@
-/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
-import type { ILogger, LogTypes } from './Interfaces';
-
-let logger: ILogger | undefined;
-
-export function init<L extends ILogger>(loggerInstance: L) {
-	logger = loggerInstance;
-	return loggerInstance;
-}
-
-export function getInstance(): ILogger {
-	if (logger === undefined) {
-		throw new Error('LoggerProxy not initialized');
-	}
-
-	return logger;
-}
-
-export function log(type: LogTypes, message: string, meta: object = {}) {
-	getInstance().log(type, message, meta);
-}
-
-// Convenience methods below
-
-export function debug(message: string, meta: object = {}) {
-	getInstance().log('debug', message, meta);
-}
-
-export function info(message: string, meta: object = {}) {
-	getInstance().log('info', message, meta);
-}
-
-export function error(message: string, meta: object = {}) {
-	getInstance().log('error', message, meta);
-}
-
-export function verbose(message: string, meta: object = {}) {
-	getInstance().log('verbose', message, meta);
-}
-
-export function warn(message: string, meta: object = {}) {
-	getInstance().log('warn', message, meta);
-}
+import type { Logger } from './Interfaces';
+
+const noOp = () => {};
+export let error: Logger['error'] = noOp;
+export let warn: Logger['warn'] = noOp;
+export let info: Logger['info'] = noOp;
+export let debug: Logger['debug'] = noOp;
+export let verbose: Logger['verbose'] = noOp;
+
+export const init = (logger: Logger) => {
+	error = (message, meta) => logger.error(message, meta);
+	warn = (message, meta) => logger.warn(message, meta);
+	info = (message, meta) => logger.info(message, meta);
+	debug = (message, meta) => logger.debug(message, meta);
+	verbose = (message, meta) => logger.verbose(message, meta);
+};
diff --git a/packages/workflow/src/MessageEventBus.ts b/packages/workflow/src/MessageEventBus.ts
index 2da8c7a20d826..97ca4116b43e1 100644
--- a/packages/workflow/src/MessageEventBus.ts
+++ b/packages/workflow/src/MessageEventBus.ts
@@ -11,6 +11,7 @@ export const enum EventMessageTypeNames {
 	confirm = '$$EventMessageConfirm',
 	workflow = '$$EventMessageWorkflow',
 	node = '$$EventMessageNode',
+	aiNode = '$$EventMessageAiNode',
 }
 
 export const enum MessageEventBusDestinationTypeNames {
diff --git a/packages/workflow/src/NativeMethods/Boolean.methods.ts b/packages/workflow/src/NativeMethods/Boolean.methods.ts
new file mode 100644
index 0000000000000..a6c16ae102c11
--- /dev/null
+++ b/packages/workflow/src/NativeMethods/Boolean.methods.ts
@@ -0,0 +1,16 @@
+import type { NativeDoc } from '@/Extensions/Extensions';
+
+export const booleanMethods: NativeDoc = {
+	typeName: 'Boolean',
+	functions: {
+		toString: {
+			doc: {
+				name: 'toString',
+				description: 'returns a string representing this boolean value.',
+				docURL:
+					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Boolean/toString',
+				returnType: 'string',
+			},
+		},
+	},
+};
diff --git a/packages/workflow/src/NativeMethods/Number.methods.ts b/packages/workflow/src/NativeMethods/Number.methods.ts
index f2c8d9884b06e..051643c569a02 100644
--- a/packages/workflow/src/NativeMethods/Number.methods.ts
+++ b/packages/workflow/src/NativeMethods/Number.methods.ts
@@ -6,6 +6,7 @@ export const numberMethods: NativeDoc = {
 		toFixed: {
 			doc: {
 				name: 'toFixed',
+				hidden: true,
 				description:
 					'Formats a number using fixed-point notation. `digits` defaults to null if not given.',
 				docURL:
@@ -17,6 +18,7 @@ export const numberMethods: NativeDoc = {
 		toPrecision: {
 			doc: {
 				name: 'toPrecision',
+				hidden: true,
 				description: 'Returns a string representing the number to the specified precision.',
 				docURL:
 					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number/toPrecision',
@@ -24,5 +26,14 @@ export const numberMethods: NativeDoc = {
 				args: [{ name: 'precision?', type: 'number' }],
 			},
 		},
+		toString: {
+			doc: {
+				name: 'toString',
+				description: 'returns a string representing this number value.',
+				docURL:
+					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number/toString',
+				returnType: 'string',
+			},
+		},
 	},
 };
diff --git a/packages/workflow/src/NativeMethods/Object.Methods.ts b/packages/workflow/src/NativeMethods/Object.Methods.ts
index 41739de8b159f..e1cc8a204d2bc 100644
--- a/packages/workflow/src/NativeMethods/Object.Methods.ts
+++ b/packages/workflow/src/NativeMethods/Object.Methods.ts
@@ -2,26 +2,5 @@ import type { NativeDoc } from '@/Extensions/Extensions';
 
 export const objectMethods: NativeDoc = {
 	typeName: 'Object',
-	functions: {
-		keys: {
-			doc: {
-				name: 'keys',
-				description:
-					"Returns an array of a given object's own enumerable string-keyed property names.",
-				docURL:
-					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/keys',
-				returnType: 'Array',
-			},
-		},
-		values: {
-			doc: {
-				name: 'values',
-				description:
-					"Returns an array of a given object's own enumerable string-keyed property values.",
-				docURL:
-					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/values',
-				returnType: 'Array',
-			},
-		},
-	},
+	functions: {},
 };
diff --git a/packages/workflow/src/NativeMethods/String.methods.ts b/packages/workflow/src/NativeMethods/String.methods.ts
index 39fde491b3af2..7689707f520ad 100644
--- a/packages/workflow/src/NativeMethods/String.methods.ts
+++ b/packages/workflow/src/NativeMethods/String.methods.ts
@@ -7,6 +7,7 @@ export const stringMethods: NativeDoc = {
 			doc: {
 				name: 'length',
 				description: 'Returns the number of characters in the string.',
+				section: 'query',
 				docURL:
 					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/length',
 				returnType: 'number',
@@ -18,6 +19,7 @@ export const stringMethods: NativeDoc = {
 			doc: {
 				name: 'concat',
 				description: 'Concatenates the string arguments to the calling string.',
+				section: 'edit',
 				docURL:
 					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/concat',
 				returnType: 'string',
@@ -27,6 +29,7 @@ export const stringMethods: NativeDoc = {
 			doc: {
 				name: 'endsWith',
 				description: 'Checks if a string ends with `searchString`.',
+				section: 'query',
 				docURL:
 					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/endsWith',
 				returnType: 'boolean',
@@ -37,6 +40,7 @@ export const stringMethods: NativeDoc = {
 			doc: {
 				name: 'indexOf',
 				description: 'Returns the index of the first occurrence of `searchString`.',
+				section: 'query',
 				docURL:
 					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/indexOf',
 				returnType: 'number',
@@ -50,6 +54,7 @@ export const stringMethods: NativeDoc = {
 			doc: {
 				name: 'lastIndexOf',
 				description: 'Returns the index of the last occurrence of `searchString`.',
+				section: 'query',
 				docURL:
 					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/lastIndexOf',
 				returnType: 'number',
@@ -63,6 +68,7 @@ export const stringMethods: NativeDoc = {
 			doc: {
 				name: 'match',
 				description: 'Retrieves the result of matching a string against a regular expression.',
+				section: 'query',
 				docURL:
 					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/match',
 				returnType: 'Array',
@@ -73,6 +79,7 @@ export const stringMethods: NativeDoc = {
 			doc: {
 				name: 'includes',
 				description: 'Checks if `searchString` may be found within the calling string.',
+				section: 'query',
 				docURL:
 					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/includes',
 				returnType: 'boolean',
@@ -87,6 +94,7 @@ export const stringMethods: NativeDoc = {
 				name: 'replace',
 				description:
 					'Returns a string with matches of a `pattern` replaced by a `replacement`. If `pattern` is a string, only the first occurrence will be replaced.',
+				section: 'edit',
 				docURL:
 					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/replace',
 				returnType: 'string',
@@ -100,6 +108,7 @@ export const stringMethods: NativeDoc = {
 			doc: {
 				name: 'replaceAll',
 				description: 'Returns a string with matches of a `pattern` replaced by a `replacement`.',
+				section: 'edit',
 				docURL:
 					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/replaceAll',
 				returnType: 'string',
@@ -113,6 +122,7 @@ export const stringMethods: NativeDoc = {
 			doc: {
 				name: 'search',
 				description: 'Returns a string that matches `pattern` within the given string.',
+				section: 'query',
 				docURL:
 					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/search',
 				returnType: 'string',
@@ -124,6 +134,7 @@ export const stringMethods: NativeDoc = {
 				name: 'slice',
 				description:
 					'Returns a section of a string. `indexEnd` defaults to the length of the string if not given.',
+				section: 'edit',
 				docURL:
 					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/slice',
 				returnType: 'string',
@@ -138,6 +149,7 @@ export const stringMethods: NativeDoc = {
 				name: 'split',
 				description:
 					'Returns the substrings that result from dividing the given string with `separator`.',
+				section: 'edit',
 				docURL:
 					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/split',
 				returnType: 'Array',
@@ -151,6 +163,7 @@ export const stringMethods: NativeDoc = {
 			doc: {
 				name: 'startsWith',
 				description: 'Checks if the string begins with `searchString`.',
+				section: 'query',
 				docURL:
 					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/startsWith',
 				returnType: 'boolean',
@@ -165,6 +178,7 @@ export const stringMethods: NativeDoc = {
 				name: 'substring',
 				description:
 					'Returns the part of the string from the start index up to and excluding the end index, or to the end of the string if no end index is supplied.',
+				section: 'edit',
 				docURL:
 					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/substring',
 				returnType: 'string',
@@ -178,6 +192,7 @@ export const stringMethods: NativeDoc = {
 			doc: {
 				name: 'toLowerCase',
 				description: 'Formats a string to lowercase. Example: "this is lowercase”.',
+				section: 'case',
 				docURL:
 					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/toLowerCase',
 				returnType: 'string',
@@ -187,6 +202,7 @@ export const stringMethods: NativeDoc = {
 			doc: {
 				name: 'toUpperCase',
 				description: 'Formats a string to lowercase. Example: "THIS IS UPPERCASE”.',
+				section: 'case',
 				docURL:
 					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/toUpperCase',
 				returnType: 'string',
@@ -196,6 +212,7 @@ export const stringMethods: NativeDoc = {
 			doc: {
 				name: 'trim',
 				description: 'Removes whitespace from both ends of a string and returns a new string.',
+				section: 'edit',
 				docURL:
 					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/Trim',
 				returnType: 'string',
@@ -205,6 +222,7 @@ export const stringMethods: NativeDoc = {
 			doc: {
 				name: 'trimEnd',
 				description: 'Removes whitespace from the end of a string and returns a new string.',
+				section: 'edit',
 				docURL:
 					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/trimEnd',
 				returnType: 'string',
@@ -214,6 +232,7 @@ export const stringMethods: NativeDoc = {
 			doc: {
 				name: 'trimStart',
 				description: 'Removes whitespace from the beginning of a string and returns a new string.',
+				section: 'edit',
 				docURL:
 					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/trimStart',
 				returnType: 'string',
diff --git a/packages/workflow/src/NativeMethods/index.ts b/packages/workflow/src/NativeMethods/index.ts
index 9f96784ac5fe0..acf79c418dc9c 100644
--- a/packages/workflow/src/NativeMethods/index.ts
+++ b/packages/workflow/src/NativeMethods/index.ts
@@ -3,7 +3,14 @@ import { arrayMethods } from './Array.methods';
 import { numberMethods } from './Number.methods';
 import { objectMethods } from './Object.Methods';
 import type { NativeDoc } from '@/Extensions/Extensions';
+import { booleanMethods } from './Boolean.methods';
 
-const NATIVE_METHODS: NativeDoc[] = [stringMethods, arrayMethods, numberMethods, objectMethods];
+const NATIVE_METHODS: NativeDoc[] = [
+	stringMethods,
+	arrayMethods,
+	numberMethods,
+	objectMethods,
+	booleanMethods,
+];
 
 export { NATIVE_METHODS as NativeMethods };
diff --git a/packages/workflow/src/NodeErrors.ts b/packages/workflow/src/NodeErrors.ts
deleted file mode 100644
index c2225d46fbf4f..0000000000000
--- a/packages/workflow/src/NodeErrors.ts
+++ /dev/null
@@ -1,382 +0,0 @@
-/* eslint-disable @typescript-eslint/naming-convention */
-/* eslint-disable @typescript-eslint/no-shadow */
-/* eslint-disable @typescript-eslint/no-unsafe-call */
-/* eslint-disable no-param-reassign */
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* eslint-disable @typescript-eslint/no-unsafe-return */
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
-// eslint-disable-next-line max-classes-per-file
-import { parseString } from 'xml2js';
-import type { IDataObject, INode, IStatusCodeMessages, JsonObject } from './Interfaces';
-
-/**
- * Top-level properties where an error message can be found in an API response.
- */
-const ERROR_MESSAGE_PROPERTIES = [
-	'cause',
-	'error',
-	'message',
-	'Message',
-	'msg',
-	'messages',
-	'description',
-	'reason',
-	'detail',
-	'details',
-	'errors',
-	'errorMessage',
-	'errorMessages',
-	'ErrorMessage',
-	'error_message',
-	'_error_message',
-	'errorDescription',
-	'error_description',
-	'error_summary',
-	'title',
-	'text',
-	'field',
-	'err',
-	'type',
-];
-
-/**
- * Top-level properties where an HTTP error code can be found in an API response.
- */
-const ERROR_STATUS_PROPERTIES = [
-	'statusCode',
-	'status',
-	'code',
-	'status_code',
-	'errorCode',
-	'error_code',
-];
-
-/**
- * Properties where a nested object can be found in an API response.
- */
-const ERROR_NESTING_PROPERTIES = ['error', 'err', 'response', 'body', 'data'];
-
-interface ExecutionBaseErrorOptions {
-	cause?: Error | JsonObject;
-}
-
-export abstract class ExecutionBaseError extends Error {
-	description: string | null | undefined;
-
-	cause: Error | JsonObject | undefined;
-
-	timestamp: number;
-
-	context: IDataObject = {};
-
-	lineNumber: number | undefined;
-
-	constructor(message: string, { cause }: ExecutionBaseErrorOptions) {
-		const options = cause instanceof Error ? { cause } : {};
-		super(message, options);
-
-		this.name = this.constructor.name;
-		this.timestamp = Date.now();
-
-		if (cause instanceof ExecutionBaseError) {
-			this.context = cause.context;
-		} else if (cause && !(cause instanceof Error)) {
-			this.cause = cause;
-		}
-	}
-
-	// eslint-disable-next-line @typescript-eslint/no-explicit-any
-	toJSON?(): any {
-		return {
-			message: this.message,
-			lineNumber: this.lineNumber,
-			timestamp: this.timestamp,
-			name: this.name,
-			description: this.description,
-			context: this.context,
-			cause: this.cause,
-		};
-	}
-}
-
-/**
- * Base class for specific NodeError-types, with functionality for finding
- * a value recursively inside an error object.
- */
-abstract class NodeError extends ExecutionBaseError {
-	node: INode;
-
-	constructor(node: INode, error: Error | JsonObject) {
-		const message = error instanceof Error ? error.message : '';
-		super(message, { cause: error });
-		this.node = node;
-	}
-
-	/**
-	 * Finds property through exploration based on potential keys and traversal keys.
-	 * Depth-first approach.
-	 *
-	 * This method iterates over `potentialKeys` and, if the value at the key is a
-	 * truthy value, the type of the value is checked:
-	 * (1) if a string or number, the value is returned as a string; or
-	 * (2) if an array,
-	 * 		its string or number elements are collected as a long string,
-	 * 		its object elements are traversed recursively (restart this function
-	 *    with each object as a starting point), or
-	 * (3) if it is an object, it traverses the object and nested ones recursively
-	 * 		based on the `potentialKeys` and returns a string if found.
-	 *
-	 * If nothing found via `potentialKeys` this method iterates over `traversalKeys` and
-	 * if the value at the key is a traversable object, it restarts with the object as the
-	 * new starting point (recursion).
-	 * If nothing found for any of the `traversalKeys`, exploration continues with remaining
-	 * `traversalKeys`.
-	 *
-	 * Otherwise, if all the paths have been exhausted and no value is eligible, `null` is
-	 * returned.
-	 *
-	 */
-	protected findProperty(
-		jsonError: JsonObject,
-		potentialKeys: string[],
-		traversalKeys: string[] = [],
-	): string | null {
-		// eslint-disable-next-line no-restricted-syntax
-		for (const key of potentialKeys) {
-			const value = jsonError[key];
-			if (value) {
-				if (typeof value === 'string') return value;
-				if (typeof value === 'number') return value.toString();
-				if (Array.isArray(value)) {
-					const resolvedErrors: string[] = value
-						.map((jsonError) => {
-							if (typeof jsonError === 'string') return jsonError;
-							if (typeof jsonError === 'number') return jsonError.toString();
-							if (this.isTraversableObject(jsonError)) {
-								return this.findProperty(jsonError, potentialKeys);
-							}
-							return null;
-						})
-						.filter((errorValue): errorValue is string => errorValue !== null);
-
-					if (resolvedErrors.length === 0) {
-						return null;
-					}
-					return resolvedErrors.join(' | ');
-				}
-				if (this.isTraversableObject(value)) {
-					const property = this.findProperty(value, potentialKeys);
-					if (property) {
-						return property;
-					}
-				}
-			}
-		}
-
-		// eslint-disable-next-line no-restricted-syntax
-		for (const key of traversalKeys) {
-			const value = jsonError[key];
-			if (this.isTraversableObject(value)) {
-				const property = this.findProperty(value, potentialKeys, traversalKeys);
-				if (property) {
-					return property;
-				}
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * Check if a value is an object with at least one key, i.e. it can be traversed.
-	 */
-	// eslint-disable-next-line @typescript-eslint/no-explicit-any
-	protected isTraversableObject(value: any): value is JsonObject {
-		return (
-			value &&
-			typeof value === 'object' &&
-			!Array.isArray(value) &&
-			// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-			!!Object.keys(value).length
-		);
-	}
-
-	/**
-	 * Remove circular references from objects.
-	 */
-	protected removeCircularRefs(obj: JsonObject, seen = new Set()) {
-		seen.add(obj);
-		Object.entries(obj).forEach(([key, value]) => {
-			if (this.isTraversableObject(value)) {
-				// eslint-disable-next-line @typescript-eslint/no-unused-expressions
-				seen.has(value)
-					? (obj[key] = { circularReference: true })
-					: this.removeCircularRefs(value, seen);
-				return;
-			}
-			if (Array.isArray(value)) {
-				value.forEach((val, index) => {
-					if (seen.has(val)) {
-						value[index] = { circularReference: true };
-						return;
-					}
-					if (this.isTraversableObject(val)) {
-						this.removeCircularRefs(val, seen);
-					}
-				});
-			}
-		});
-	}
-}
-
-interface NodeOperationErrorOptions {
-	message?: string;
-	description?: string;
-	runIndex?: number;
-	itemIndex?: number;
-}
-
-/**
- * Class for instantiating an operational error, e.g. an invalid credentials error.
- */
-export class NodeOperationError extends NodeError {
-	lineNumber: number | undefined;
-
-	constructor(node: INode, error: Error | string, options: NodeOperationErrorOptions = {}) {
-		if (typeof error === 'string') {
-			error = new Error(error);
-		}
-		super(node, error);
-
-		if (options.message) {
-			this.message = options.message;
-		}
-		this.description = options.description;
-		this.context.runIndex = options.runIndex;
-		this.context.itemIndex = options.itemIndex;
-	}
-}
-
-const STATUS_CODE_MESSAGES: IStatusCodeMessages = {
-	'4XX': 'Your request is invalid or could not be processed by the service',
-	'400': 'Bad request - please check your parameters',
-	'401': 'Authorization failed - please check your credentials',
-	'402': 'Payment required - perhaps check your payment details?',
-	'403': 'Forbidden - perhaps check your credentials?',
-	'404': 'The resource you are requesting could not be found',
-	'405': 'Method not allowed - please check you are using the right HTTP method',
-	'429': 'The service is receiving too many requests from you! Perhaps take a break?',
-
-	'5XX': 'The service failed to process your request',
-	'500': 'The service was not able to process your request',
-	'502': 'Bad gateway - the service failed to handle your request',
-	'503': 'Service unavailable - perhaps try again later?',
-	'504': 'Gateway timed out - perhaps try again later?',
-
-	ECONNREFUSED: 'The service refused the connection - perhaps it is offline',
-};
-
-const UNKNOWN_ERROR_MESSAGE = 'UNKNOWN ERROR - check the detailed error for more information';
-const UNKNOWN_ERROR_MESSAGE_CRED = 'UNKNOWN ERROR';
-
-interface NodeApiErrorOptions extends NodeOperationErrorOptions {
-	message?: string;
-	httpCode?: string;
-	parseXml?: boolean;
-}
-
-/**
- * Class for instantiating an error in an API response, e.g. a 404 Not Found response,
- * with an HTTP error code, an error message and a description.
- */
-export class NodeApiError extends NodeError {
-	httpCode: string | null;
-
-	constructor(
-		node: INode,
-		error: JsonObject,
-		{ message, description, httpCode, parseXml, runIndex, itemIndex }: NodeApiErrorOptions = {},
-	) {
-		super(node, error);
-		if (error.error) {
-			// only for request library error
-			this.removeCircularRefs(error.error as JsonObject);
-		}
-
-		// if it's an error generated by axios
-		// look for descriptions in the response object
-		if (error.reason) {
-			const reason: IDataObject = error.reason as unknown as IDataObject;
-			if (reason.isAxiosError && reason.response) {
-				error = reason.response as JsonObject;
-			}
-		}
-
-		if (message) {
-			this.message = message;
-			this.description = description;
-			this.httpCode = httpCode ?? null;
-			return;
-		}
-
-		this.httpCode = this.findProperty(error, ERROR_STATUS_PROPERTIES, ERROR_NESTING_PROPERTIES);
-		this.setMessage();
-
-		if (parseXml) {
-			this.setDescriptionFromXml(error.error as string);
-			return;
-		}
-
-		this.description = this.findProperty(error, ERROR_MESSAGE_PROPERTIES, ERROR_NESTING_PROPERTIES);
-
-		if (runIndex !== undefined) this.context.runIndex = runIndex;
-		if (itemIndex !== undefined) this.context.itemIndex = itemIndex;
-	}
-
-	private setDescriptionFromXml(xml: string) {
-		// eslint-disable-next-line @typescript-eslint/naming-convention
-		parseString(xml, { explicitArray: false }, (_, result) => {
-			if (!result) return;
-
-			// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-			const topLevelKey = Object.keys(result)[0];
-			this.description = this.findProperty(
-				// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-argument
-				result[topLevelKey],
-				ERROR_MESSAGE_PROPERTIES,
-				['Error'].concat(ERROR_NESTING_PROPERTIES),
-			);
-		});
-	}
-
-	/**
-	 * Set the error's message based on the HTTP status code.
-	 *
-	 */
-	private setMessage() {
-		if (!this.httpCode) {
-			this.httpCode = null;
-			this.message = UNKNOWN_ERROR_MESSAGE;
-			return;
-		}
-
-		if (STATUS_CODE_MESSAGES[this.httpCode]) {
-			this.message = STATUS_CODE_MESSAGES[this.httpCode];
-			return;
-		}
-
-		switch (this.httpCode.charAt(0)) {
-			case '4':
-				this.message = STATUS_CODE_MESSAGES['4XX'];
-				break;
-			case '5':
-				this.message = STATUS_CODE_MESSAGES['5XX'];
-				break;
-			default:
-				this.message = UNKNOWN_ERROR_MESSAGE;
-		}
-		if (this.node.type === 'n8n-nodes-base.noOp' && this.message === UNKNOWN_ERROR_MESSAGE) {
-			this.message = `${UNKNOWN_ERROR_MESSAGE_CRED} - ${this.httpCode}`;
-		}
-	}
-}
diff --git a/packages/workflow/src/NodeHelpers.ts b/packages/workflow/src/NodeHelpers.ts
index aff3f28c7e173..74d4b6562b19c 100644
--- a/packages/workflow/src/NodeHelpers.ts
+++ b/packages/workflow/src/NodeHelpers.ts
@@ -1,25 +1,23 @@
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
-/* eslint-disable @typescript-eslint/no-unsafe-call */
+
 /* eslint-disable @typescript-eslint/no-unsafe-return */
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* eslint-disable no-console */
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
+
 /* eslint-disable @typescript-eslint/no-use-before-define */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/prefer-nullish-coalescing */
-/* eslint-disable no-param-reassign */
-/* eslint-disable no-continue */
+
 /* eslint-disable prefer-spread */
-/* eslint-disable no-restricted-syntax */
-/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
-import get from 'lodash.get';
-import isEqual from 'lodash.isequal';
+
+import get from 'lodash/get';
+import isEqual from 'lodash/isEqual';
+import uniqBy from 'lodash/uniqBy';
 
 import type {
+	FieldType,
 	IContextObject,
+	IHttpRequestMethods,
 	INode,
 	INodeCredentialDescription,
-	INodeExecutionData,
 	INodeIssueObjectProperty,
 	INodeIssues,
 	INodeParameterResourceLocator,
@@ -28,20 +26,34 @@ import type {
 	INodePropertyCollection,
 	INodePropertyMode,
 	INodePropertyModeValidation,
+	INodePropertyOptions,
 	INodePropertyRegexValidation,
 	INodeType,
-	IVersionedNodeType,
 	IParameterDependencies,
 	IRunExecutionData,
+	IVersionedNodeType,
 	IWebhookData,
 	IWorkflowExecuteAdditionalData,
 	NodeParameterValue,
-	WebhookHttpMethod,
+	ResourceMapperValue,
+	ConnectionTypes,
+	INodeTypeDescription,
+	INodeOutputConfiguration,
+	INodeInputConfiguration,
+	GenericValue,
+	DisplayCondition,
 } from './Interfaces';
-import { isValidResourceLocatorParameterValue } from './type-guards';
+import {
+	isFilterValue,
+	isResourceMapperValue,
+	isValidResourceLocatorParameterValue,
+} from './type-guards';
 import { deepCopy } from './utils';
 
 import type { Workflow } from './Workflow';
+import { validateFilterParameter } from './NodeParameters/FilterParameter';
+import { validateFieldType } from './TypeValidation';
+import { ApplicationError } from './errors/application.error';
 
 export const cronNodeOptions: INodePropertyCollection[] = [
 	{
@@ -230,7 +242,7 @@ export const cronNodeOptions: INodePropertyCollection[] = [
 	},
 ];
 
-const specialNodeParameters: INodeProperties[] = [
+const commonPollingParameters: INodeProperties[] = [
 	{
 		displayName: 'Poll Times',
 		name: 'pollTimes',
@@ -246,15 +258,120 @@ const specialNodeParameters: INodeProperties[] = [
 	},
 ];
 
+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.',
+	},
+];
+
 /**
  * Apply special parameters which should be added to nodeTypes depending on their type or configuration
  */
 export function applySpecialNodeParameters(nodeType: INodeType): void {
-	if (nodeType.description.polling === true) {
-		nodeType.description.properties.unshift(...specialNodeParameters);
+	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);
 	}
 }
 
+const getPropertyValues = (
+	nodeValues: INodeParameters,
+	propertyName: string,
+	node: Pick<INode, 'typeVersion'> | null,
+	nodeValuesRoot: INodeParameters,
+) => {
+	let value;
+	if (propertyName.charAt(0) === '/') {
+		// Get the value from the root of the node
+		value = get(nodeValuesRoot, propertyName.slice(1));
+	} else if (propertyName === '@version') {
+		value = node?.typeVersion || 0;
+	} else {
+		// Get the value from current level
+		value = get(nodeValues, propertyName);
+	}
+
+	if (value && typeof value === 'object' && '__rl' in value && value.__rl) {
+		value = value.value;
+	}
+
+	if (!Array.isArray(value)) {
+		return [value as NodeParameterValue];
+	} else {
+		return value as NodeParameterValue[];
+	}
+};
+
+const checkConditions = (
+	conditions: Array<NodeParameterValue | DisplayCondition>,
+	actualValues: NodeParameterValue[],
+) => {
+	return conditions.some((condition) => {
+		if (
+			condition &&
+			typeof condition === 'object' &&
+			condition._cnd &&
+			Object.keys(condition).length === 1
+		) {
+			const [key, targetValue] = Object.entries(condition._cnd)[0];
+
+			return actualValues.every((propertyValue) => {
+				if (key === 'eq') {
+					return isEqual(propertyValue, targetValue);
+				}
+				if (key === 'not') {
+					return !isEqual(propertyValue, targetValue);
+				}
+				if (key === 'gte') {
+					return (propertyValue as number) >= targetValue;
+				}
+				if (key === 'lte') {
+					return (propertyValue as number) <= targetValue;
+				}
+				if (key === 'gt') {
+					return (propertyValue as number) > targetValue;
+				}
+				if (key === 'lt') {
+					return (propertyValue as number) < targetValue;
+				}
+				if (key === 'between') {
+					const { from, to } = targetValue as { from: number; to: number };
+					return (propertyValue as number) >= from && (propertyValue as number) <= to;
+				}
+				if (key === 'includes') {
+					return (propertyValue as string).includes(targetValue);
+				}
+				if (key === 'startsWith') {
+					return (propertyValue as string).startsWith(targetValue);
+				}
+				if (key === 'endsWith') {
+					return (propertyValue as string).endsWith(targetValue);
+				}
+				if (key === 'regex') {
+					return new RegExp(targetValue as string).test(propertyValue as string);
+				}
+				return false;
+			});
+		}
+
+		return actualValues.includes(condition as NodeParameterValue);
+	});
+};
+
 /**
  * Returns if the parameter should be displayed or not
  *
@@ -266,83 +383,38 @@ export function applySpecialNodeParameters(nodeType: INodeType): void {
 export function displayParameter(
 	nodeValues: INodeParameters,
 	parameter: INodeProperties | INodeCredentialDescription,
-	node: INode | null, // Allow null as it does also get used by credentials and they do not have versioning yet
+	node: Pick<INode, 'typeVersion'> | null, // Allow null as it does also get used by credentials and they do not have versioning yet
 	nodeValuesRoot?: INodeParameters,
 ) {
 	if (!parameter.displayOptions) {
 		return true;
 	}
 
+	const { show, hide } = parameter.displayOptions;
+
 	nodeValuesRoot = nodeValuesRoot || nodeValues;
 
-	let value;
-	// eslint-disable-next-line @typescript-eslint/no-explicit-any
-	const values: any[] = [];
-	if (parameter.displayOptions.show) {
+	if (show) {
 		// All the defined rules have to match to display parameter
-		for (const propertyName of Object.keys(parameter.displayOptions.show)) {
-			if (propertyName.charAt(0) === '/') {
-				// Get the value from the root of the node
-				value = get(nodeValuesRoot, propertyName.slice(1));
-			} else if (propertyName === '@version') {
-				value = node?.typeVersion || 0;
-			} else {
-				// Get the value from current level
-				value = get(nodeValues, propertyName);
-			}
-
-			if (value && typeof value === 'object' && '__rl' in value && value.__rl) {
-				value = value.value;
-			}
-
-			values.length = 0;
-			if (!Array.isArray(value)) {
-				values.push(value);
-			} else {
-				values.push.apply(values, value);
-			}
+		for (const propertyName of Object.keys(show)) {
+			const values = getPropertyValues(nodeValues, propertyName, node, nodeValuesRoot);
 
 			if (values.some((v) => typeof v === 'string' && v.charAt(0) === '=')) {
 				return true;
 			}
 
-			if (
-				values.length === 0 ||
-				!parameter.displayOptions.show[propertyName]!.some((v) => values.includes(v))
-			) {
+			if (values.length === 0 || !checkConditions(show[propertyName]!, values)) {
 				return false;
 			}
 		}
 	}
 
-	if (parameter.displayOptions.hide) {
+	if (hide) {
 		// Any of the defined hide rules have to match to hide the parameter
-		for (const propertyName of Object.keys(parameter.displayOptions.hide)) {
-			if (propertyName.charAt(0) === '/') {
-				// Get the value from the root of the node
-				value = get(nodeValuesRoot, propertyName.slice(1));
-			} else if (propertyName === '@version') {
-				value = node?.typeVersion || 0;
-			} else {
-				// Get the value from current level
-				value = get(nodeValues, propertyName);
-			}
-
-			if (value && typeof value === 'object' && '__rl' in value && value.__rl) {
-				value = value.value;
-			}
-
-			values.length = 0;
-			if (!Array.isArray(value)) {
-				values.push(value);
-			} else {
-				values.push.apply(values, value);
-			}
+		for (const propertyName of Object.keys(hide)) {
+			const values = getPropertyValues(nodeValues, propertyName, node, nodeValuesRoot);
 
-			if (
-				values.length !== 0 &&
-				parameter.displayOptions.hide[propertyName]!.some((v) => values.includes(v))
-			) {
+			if (values.length !== 0 && checkConditions(hide[propertyName]!, values)) {
 				return false;
 			}
 		}
@@ -364,7 +436,7 @@ export function displayParameterPath(
 	nodeValues: INodeParameters,
 	parameter: INodeProperties | INodeCredentialDescription,
 	path: string,
-	node: INode | null,
+	node: Pick<INode, 'typeVersion'> | null,
 ) {
 	let resolvedNodeValues = nodeValues;
 	if (path !== '') {
@@ -394,7 +466,7 @@ export function getContext(
 ): IContextObject {
 	if (runExecutionData.executionData === undefined) {
 		// TODO: Should not happen leave it for test now
-		throw new Error('The "executionData" is not initialized!');
+		throw new ApplicationError('`executionData` is not initialized');
 	}
 
 	let key: string;
@@ -402,15 +474,19 @@ export function getContext(
 		key = 'flow';
 	} else if (type === 'node') {
 		if (node === undefined) {
-			throw new Error('The request data of context type "node" the node parameter has to be set!');
+			// @TODO: What does this mean?
+			throw new ApplicationError(
+				'The request data of context type "node" the node parameter has to be set!',
+			);
 		}
 		key = `node:${node.name}`;
 	} else {
-		throw new Error(`The context type "${type}" is not know. Only "flow" and node" are supported!`);
+		throw new ApplicationError('Unknown context type. Only `flow` and `node` are supported.', {
+			extra: { contextType: type },
+		});
 	}
 
 	if (runExecutionData.executionData.contextData[key] === undefined) {
-		// eslint-disable-next-line no-param-reassign
 		runExecutionData.executionData.contextData[key] = {};
 	}
 
@@ -462,7 +538,7 @@ export function getParameterResolveOrder(
 	parameterDependencies: IParameterDependencies,
 ): number[] {
 	const executionOrder: number[] = [];
-	const indexToResolve = Array.from({ length: nodePropertiesArray.length }, (v, k) => k);
+	const indexToResolve = Array.from({ length: nodePropertiesArray.length }, (_, k) => k);
 	const resolvedParameters: string[] = [];
 
 	let index: number;
@@ -509,7 +585,7 @@ export function getParameterResolveOrder(
 		}
 
 		if (iterations > lastIndexReduction + nodePropertiesArray.length) {
-			throw new Error(
+			throw new ApplicationError(
 				'Could not resolve parameter dependencies. Max iterations reached! Hint: If `displayOptions` are specified in any child parameter of a parent `collection` or `fixedCollection`, remove the `displayOptions` from the child parameter.',
 			);
 		}
@@ -531,12 +607,13 @@ export function getParameterResolveOrder(
  * @param {boolean} [dataIsResolved=false] If nodeValues are already fully resolved (so that all default values got added already)
  * @param {INodeParameters} [nodeValuesRoot] The root node-parameter-data
  */
+// eslint-disable-next-line complexity
 export function getNodeParameters(
 	nodePropertiesArray: INodeProperties[],
-	nodeValues: INodeParameters,
+	nodeValues: INodeParameters | null,
 	returnDefaults: boolean,
 	returnNoneDisplayed: boolean,
-	node: INode | null,
+	node: Pick<INode, 'typeVersion'> | null,
 	onlySimpleTypes = false,
 	dataIsResolved = false,
 	nodeValuesRoot?: INodeParameters,
@@ -583,16 +660,17 @@ export function getNodeParameters(
 	nodeValuesRoot = nodeValuesRoot || nodeValuesDisplayCheck;
 
 	// Go through the parameters in order of their dependencies
-	const parameterItterationOrderIndex = getParameterResolveOrder(
+	const parameterIterationOrderIndex = getParameterResolveOrder(
 		nodePropertiesArray,
 		parameterDependencies,
 	);
 
-	for (const parameterIndex of parameterItterationOrderIndex) {
+	for (const parameterIndex of parameterIterationOrderIndex) {
 		const nodeProperties = nodePropertiesArray[parameterIndex];
 		if (
-			nodeValues[nodeProperties.name] === undefined &&
-			(!returnDefaults || parentType === 'collection')
+			!nodeValues ||
+			(nodeValues[nodeProperties.name] === undefined &&
+				(!returnDefaults || parentType === 'collection'))
 		) {
 			// The value is not defined so go to the next
 			continue;
@@ -635,7 +713,7 @@ export function getNodeParameters(
 							: { __rl: true, ...nodeProperties.default };
 				} else {
 					nodeParameters[nodeProperties.name] =
-						nodeValues[nodeProperties.name] || nodeProperties.default;
+						nodeValues[nodeProperties.name] ?? nodeProperties.default;
 				}
 				nodeParametersFull[nodeProperties.name] = nodeParameters[nodeProperties.name];
 			} else if (
@@ -751,9 +829,9 @@ export function getNodeParameters(
 						) as INodePropertyCollection;
 
 						if (nodePropertyOptions === undefined) {
-							throw new Error(
-								`Could not find property option "${itemName}" for "${nodeProperties.name}"`,
-							);
+							throw new ApplicationError('Could not find property option', {
+								extra: { propertyOption: itemName, property: nodeProperties.name },
+							});
 						}
 
 						tempNodePropertiesArray = nodePropertyOptions.values!;
@@ -847,31 +925,8 @@ export function getNodeParameters(
 	return nodeParameters;
 }
 
-/**
- * Brings the output data in a format that can be returned from a node
- *
- * @param {number} [outputIndex=0]
- */
-export async function prepareOutputData(
-	outputData: INodeExecutionData[],
-	outputIndex = 0,
-): Promise<INodeExecutionData[][]> {
-	// TODO: Check if node has output with that index
-	const returnData = [];
-
-	for (let i = 0; i < outputIndex; i++) {
-		returnData.push([]);
-	}
-
-	returnData.push(outputData);
-
-	return returnData;
-}
-
 /**
  * Returns all the webhooks which should be created for the give node
- *
- *
  */
 export function getNodeWebhooks(
 	workflow: Workflow,
@@ -904,7 +959,6 @@ export function getNodeWebhooks(
 			node,
 			webhookDescription.path,
 			mode,
-			additionalData.timezone,
 			{},
 		);
 		if (nodeWebhookPath === undefined) {
@@ -928,7 +982,6 @@ export function getNodeWebhooks(
 			node,
 			webhookDescription.isFullPath,
 			'internal',
-			additionalData.timezone,
 			{},
 			undefined,
 			false,
@@ -937,7 +990,6 @@ export function getNodeWebhooks(
 			node,
 			webhookDescription.restartWebhook,
 			'internal',
-			additionalData.timezone,
 			{},
 			undefined,
 			false,
@@ -951,17 +1003,16 @@ export function getNodeWebhooks(
 			true,
 		); /////////
 
-		const httpMethod = workflow.expression.getSimpleParameterValue(
+		const webhookMethods = workflow.expression.getSimpleParameterValue(
 			node,
 			webhookDescription.httpMethod,
 			mode,
-			additionalData.timezone,
 			{},
 			undefined,
 			'GET',
 		);
 
-		if (httpMethod === undefined) {
+		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.`,
@@ -974,15 +1025,20 @@ export function getNodeWebhooks(
 			webhookId = node.webhookId;
 		}
 
-		returnData.push({
-			httpMethod: httpMethod.toString() as WebhookHttpMethod,
-			node: node.name,
-			path,
-			webhookDescription,
-			workflowId,
-			workflowExecuteAdditionalData: additionalData,
-			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;
@@ -1050,6 +1106,91 @@ export function getNodeWebhookUrl(
 	)}`;
 }
 
+export function getConnectionTypes(
+	connections: Array<ConnectionTypes | INodeInputConfiguration | INodeOutputConfiguration>,
+): ConnectionTypes[] {
+	return connections
+		.map((connection) => {
+			if (typeof connection === 'string') {
+				return connection;
+			}
+			return connection.type;
+		})
+		.filter((connection) => connection !== undefined);
+}
+
+export function getNodeInputs(
+	workflow: Workflow,
+	node: INode,
+	nodeTypeData: INodeTypeDescription,
+): Array<ConnectionTypes | INodeInputConfiguration> {
+	if (Array.isArray(nodeTypeData?.inputs)) {
+		return nodeTypeData.inputs;
+	}
+
+	// Calculate the outputs dynamically
+	try {
+		return (workflow.expression.getSimpleParameterValue(
+			node,
+			nodeTypeData.inputs,
+			'internal',
+			{},
+		) || []) as ConnectionTypes[];
+	} catch (e) {
+		console.warn('Could not calculate inputs dynamically for node: ', node.name);
+		return [];
+	}
+}
+
+export function getNodeOutputs(
+	workflow: Workflow,
+	node: INode,
+	nodeTypeData: INodeTypeDescription,
+): Array<ConnectionTypes | INodeOutputConfiguration> {
+	let outputs: Array<ConnectionTypes | INodeOutputConfiguration> = [];
+
+	if (Array.isArray(nodeTypeData.outputs)) {
+		outputs = nodeTypeData.outputs;
+	} else {
+		// Calculate the outputs dynamically
+		try {
+			outputs = (workflow.expression.getSimpleParameterValue(
+				node,
+				nodeTypeData.outputs,
+				'internal',
+				{},
+			) || []) as ConnectionTypes[];
+		} catch (e) {
+			console.warn('Could not calculate outputs dynamically for node: ', node.name);
+		}
+	}
+
+	if (node.onError === 'continueErrorOutput') {
+		// Copy the data to make sure that we do not change the data of the
+		// node type and so change the displayNames for all nodes in the flow
+		outputs = deepCopy(outputs);
+		if (outputs.length === 1) {
+			// Set the displayName to "Success"
+			if (typeof outputs[0] === 'string') {
+				outputs[0] = {
+					type: outputs[0],
+				};
+			}
+			outputs[0].displayName = 'Success';
+		}
+		return [
+			...outputs,
+			{
+				category: 'error',
+				type: 'main',
+				displayName: 'Error',
+			},
+		];
+	}
+
+	return outputs;
+}
+
 /**
  * Returns all the parameter-issues of the node
  *
@@ -1094,7 +1235,7 @@ export function nodeIssuesToString(issues: INodeIssues, node?: INode): string[]
 		nodeIssues.push('Execution Error.');
 	}
 
-	const objectProperties = ['parameters', 'credentials'];
+	const objectProperties = ['parameters', 'credentials', 'input'];
 
 	let issueText: string;
 	let parameterName: string;
@@ -1150,6 +1291,70 @@ export const validateResourceLocatorParameter = (
 	return validationErrors;
 };
 
+/*
+ * Validates resource mapper values based on service schema
+ *
+ */
+export const validateResourceMapperParameter = (
+	nodeProperties: INodeProperties,
+	value: ResourceMapperValue,
+	skipRequiredCheck = false,
+): Record<string, string[]> => {
+	// No issues to raise in automatic mapping mode, no user input to validate
+	if (value.mappingMode === 'autoMapInputData') {
+		return {};
+	}
+
+	const issues: Record<string, string[]> = {};
+	let fieldWordSingular =
+		nodeProperties.typeOptions?.resourceMapper?.fieldWords?.singular || 'Field';
+	fieldWordSingular = fieldWordSingular.charAt(0).toUpperCase() + fieldWordSingular.slice(1);
+	value.schema.forEach((field) => {
+		const fieldValue = value.value ? value.value[field.id] : null;
+		const key = `${nodeProperties.name}.${field.id}`;
+		const fieldErrors: string[] = [];
+		if (field.required && !skipRequiredCheck) {
+			if (value.value === null || fieldValue === undefined) {
+				const error = `${fieldWordSingular} "${field.id}" is required`;
+				fieldErrors.push(error);
+			}
+		}
+		if (!fieldValue?.toString().startsWith('=') && field.type) {
+			const validationResult = validateFieldType(field.id, fieldValue, field.type, {
+				valueOptions: field.options,
+			});
+			if (!validationResult.valid && validationResult.errorMessage) {
+				fieldErrors.push(validationResult.errorMessage);
+			}
+		}
+		if (fieldErrors.length > 0) {
+			issues[key] = fieldErrors;
+		}
+	});
+	return issues;
+};
+
+export const validateParameter = (
+	nodeProperties: INodeProperties,
+	value: GenericValue,
+	type: FieldType,
+): string | undefined => {
+	const nodeName = nodeProperties.name;
+	const options = type === 'options' ? nodeProperties.options : undefined;
+
+	if (!value?.toString().startsWith('=')) {
+		const validationResult = validateFieldType(nodeName, value, type, {
+			valueOptions: options as INodePropertyOptions[],
+		});
+
+		if (!validationResult.valid && validationResult.errorMessage) {
+			return validationResult.errorMessage;
+		}
+	}
+
+	return undefined;
+};
+
 /**
  * Adds an issue if the parameter is not defined
  *
@@ -1211,6 +1416,7 @@ function isINodeParameterResourceLocator(value: unknown): value is INodeParamete
  * @param {INodeParameters} nodeValues The values of the node
  * @param {string} path The path to the properties
  */
+// eslint-disable-next-line complexity
 export function getParameterIssues(
 	nodeProperties: INodeProperties,
 	nodeValues: INodeParameters,
@@ -1218,8 +1424,9 @@ export function getParameterIssues(
 	node: INode,
 ): INodeIssues {
 	const foundIssues: INodeIssues = {};
+	const isDisplayed = displayParameterPath(nodeValues, nodeProperties, path, node);
 	if (nodeProperties.required === true) {
-		if (displayParameterPath(nodeValues, nodeProperties, path, node)) {
+		if (isDisplayed) {
 			const value = getParameterValueByPath(nodeValues, nodeProperties.name, path);
 
 			if (
@@ -1240,26 +1447,60 @@ export function getParameterIssues(
 		}
 	}
 
-	if (nodeProperties.type === 'resourceLocator') {
-		if (displayParameterPath(nodeValues, nodeProperties, path, node)) {
-			const value = getParameterValueByPath(nodeValues, nodeProperties.name, path);
-			if (isINodeParameterResourceLocator(value)) {
-				const mode = nodeProperties.modes?.find((option) => option.name === value.mode);
-				if (mode) {
-					const errors = validateResourceLocatorParameter(value, mode);
-					errors.forEach((error) => {
-						if (foundIssues.parameters === undefined) {
-							foundIssues.parameters = {};
-						}
-						if (foundIssues.parameters[nodeProperties.name] === undefined) {
-							foundIssues.parameters[nodeProperties.name] = [];
-						}
+	if (nodeProperties.type === 'resourceLocator' && isDisplayed) {
+		const value = getParameterValueByPath(nodeValues, nodeProperties.name, path);
+		if (isINodeParameterResourceLocator(value)) {
+			const mode = nodeProperties.modes?.find((option) => option.name === value.mode);
+			if (mode) {
+				const errors = validateResourceLocatorParameter(value, mode);
+				errors.forEach((error) => {
+					if (foundIssues.parameters === undefined) {
+						foundIssues.parameters = {};
+					}
+					if (foundIssues.parameters[nodeProperties.name] === undefined) {
+						foundIssues.parameters[nodeProperties.name] = [];
+					}
 
-						foundIssues.parameters[nodeProperties.name].push(error);
-					});
+					foundIssues.parameters[nodeProperties.name].push(error);
+				});
+			}
+		}
+	} else if (nodeProperties.type === 'resourceMapper' && isDisplayed) {
+		const skipRequiredCheck = nodeProperties.typeOptions?.resourceMapper?.mode !== 'add';
+		const value = getParameterValueByPath(nodeValues, nodeProperties.name, path);
+		if (isResourceMapperValue(value)) {
+			const issues = validateResourceMapperParameter(nodeProperties, value, skipRequiredCheck);
+			if (Object.keys(issues).length > 0) {
+				if (foundIssues.parameters === undefined) {
+					foundIssues.parameters = {};
+				}
+				if (foundIssues.parameters[nodeProperties.name] === undefined) {
+					foundIssues.parameters[nodeProperties.name] = [];
 				}
+				foundIssues.parameters = { ...foundIssues.parameters, ...issues };
+			}
+		}
+	} else if (nodeProperties.type === 'filter' && isDisplayed) {
+		const value = getParameterValueByPath(nodeValues, nodeProperties.name, path);
+		if (isFilterValue(value)) {
+			const issues = validateFilterParameter(nodeProperties, value);
+			if (Object.keys(issues).length > 0) {
+				foundIssues.parameters = { ...foundIssues.parameters, ...issues };
 			}
 		}
+	} else if (nodeProperties.validateType) {
+		const value = getParameterValueByPath(nodeValues, nodeProperties.name, path);
+		const error = validateParameter(nodeProperties, value, nodeProperties.validateType);
+		if (error) {
+			if (foundIssues.parameters === undefined) {
+				foundIssues.parameters = {};
+			}
+			if (foundIssues.parameters[nodeProperties.name] === undefined) {
+				foundIssues.parameters[nodeProperties.name] = [];
+			}
+
+			foundIssues.parameters[nodeProperties.name].push(error);
+		}
 	}
 
 	// Check if there are any child parameters
@@ -1401,6 +1642,8 @@ export function mergeNodeProperties(
 ): void {
 	let existingIndex: number;
 	for (const property of addProperties) {
+		if (property.doNotInherit) continue;
+
 		existingIndex = mainProperties.findIndex((element) => element.name === property.name);
 
 		if (existingIndex === -1) {
@@ -1425,10 +1668,34 @@ export function getVersionedNodeType(
 
 export function getVersionedNodeTypeAll(object: IVersionedNodeType | INodeType): INodeType[] {
 	if ('nodeVersions' in object) {
-		return Object.values(object.nodeVersions).map((element) => {
-			element.description.name = object.description.name;
-			return element;
-		});
+		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 ?? [];
+}
diff --git a/packages/workflow/src/NodeParameters/FilterParameter.ts b/packages/workflow/src/NodeParameters/FilterParameter.ts
new file mode 100644
index 0000000000000..5196eb0af132d
--- /dev/null
+++ b/packages/workflow/src/NodeParameters/FilterParameter.ts
@@ -0,0 +1,352 @@
+import type { DateTime } from 'luxon';
+import type {
+	FilterConditionValue,
+	FilterOperatorType,
+	FilterOptionsValue,
+	FilterValue,
+	INodeProperties,
+	Result,
+	ValidationResult,
+} from '../Interfaces';
+import { validateFieldType } from '../TypeValidation';
+import * as LoggerProxy from '../LoggerProxy';
+
+type FilterConditionMetadata = {
+	index: number;
+	unresolvedExpressions: boolean;
+	itemIndex: number;
+	errorFormat: 'full' | 'inline';
+};
+
+export class FilterError extends Error {
+	constructor(
+		message: string,
+		readonly description: string,
+	) {
+		super(message);
+	}
+}
+
+function parseSingleFilterValue(
+	value: unknown,
+	type: FilterOperatorType,
+	strict = false,
+): ValidationResult {
+	if (type === 'any' || value === null || value === undefined) {
+		return { valid: true, newValue: value } as ValidationResult;
+	}
+
+	if (type === 'boolean' && !strict) {
+		return { valid: true, newValue: Boolean(value) };
+	}
+
+	return validateFieldType('filter', value, type, { strict, parseStrings: true });
+}
+
+const withIndefiniteArticle = (noun: string): string => {
+	const article = 'aeiou'.includes(noun.charAt(0)) ? 'an' : 'a';
+	return `${article} ${noun}`;
+};
+
+function parseFilterConditionValues(
+	condition: FilterConditionValue,
+	options: FilterOptionsValue,
+	metadata: Partial<FilterConditionMetadata>,
+): Result<{ left: unknown; right: unknown }, FilterError> {
+	const index = metadata.index ?? 0;
+	const itemIndex = metadata.itemIndex ?? 0;
+	const errorFormat = metadata.errorFormat ?? 'full';
+	const strict = options.typeValidation === 'strict';
+	const { operator } = condition;
+	const rightType = operator.rightType ?? operator.type;
+	const parsedLeftValue = parseSingleFilterValue(condition.leftValue, operator.type, strict);
+	const parsedRightValue = parseSingleFilterValue(condition.rightValue, rightType, strict);
+	const leftValid =
+		parsedLeftValue.valid ||
+		(metadata.unresolvedExpressions &&
+			typeof condition.leftValue === 'string' &&
+			condition.leftValue.startsWith('='));
+	const rightValid =
+		parsedRightValue.valid ||
+		!!operator.singleValue ||
+		(metadata.unresolvedExpressions &&
+			typeof condition.rightValue === 'string' &&
+			condition.rightValue.startsWith('='));
+	const leftValueString = String(condition.leftValue);
+	const rightValueString = String(condition.rightValue);
+	const suffix =
+		errorFormat === 'full' ? `[condition ${index}, item ${itemIndex}]` : `[item ${itemIndex}]`;
+
+	const composeInvalidTypeMessage = (type: string, fromType: string, value: string) => {
+		fromType = fromType.toLocaleLowerCase();
+		if (strict) {
+			return `Wrong type: '${value}' is ${withIndefiniteArticle(
+				fromType,
+			)} but was expecting ${withIndefiniteArticle(type)} ${suffix}`;
+		}
+		return `Conversion error: the ${fromType} '${value}' can't be converted to ${withIndefiniteArticle(
+			type,
+		)} ${suffix}`;
+	};
+
+	const invalidTypeDescription = 'Try changing the type of comparison.';
+
+	if (!leftValid) {
+		return {
+			ok: false,
+			error: new FilterError(
+				composeInvalidTypeMessage(operator.type, typeof condition.leftValue, leftValueString),
+				invalidTypeDescription,
+			),
+		};
+	}
+
+	if (!rightValid) {
+		return {
+			ok: false,
+			error: new FilterError(
+				composeInvalidTypeMessage(rightType, typeof condition.rightValue, rightValueString),
+				invalidTypeDescription,
+			),
+		};
+	}
+
+	return { ok: true, result: { left: parsedLeftValue.newValue, right: parsedRightValue.newValue } };
+}
+
+function parseRegexPattern(pattern: string): RegExp {
+	const regexMatch = (pattern || '').match(new RegExp('^/(.*?)/([gimusy]*)$'));
+	let regex: RegExp;
+
+	if (!regexMatch) {
+		regex = new RegExp((pattern || '').toString());
+	} else {
+		regex = new RegExp(regexMatch[1], regexMatch[2]);
+	}
+
+	return regex;
+}
+
+// eslint-disable-next-line complexity
+export function executeFilterCondition(
+	condition: FilterConditionValue,
+	filterOptions: FilterOptionsValue,
+	metadata: Partial<FilterConditionMetadata> = {},
+): boolean {
+	const ignoreCase = !filterOptions.caseSensitive;
+	const { operator } = condition;
+	const parsedValues = parseFilterConditionValues(condition, filterOptions, metadata);
+
+	if (!parsedValues.ok) {
+		throw parsedValues.error;
+	}
+
+	let { left: leftValue, right: rightValue } = parsedValues.result;
+
+	const exists = leftValue !== undefined && leftValue !== null;
+	if (condition.operator.operation === 'exists') {
+		return exists;
+	} else if (condition.operator.operation === 'notExists') {
+		return !exists;
+	}
+
+	switch (operator.type) {
+		case 'string': {
+			if (ignoreCase) {
+				if (typeof leftValue === 'string') {
+					leftValue = leftValue.toLocaleLowerCase();
+				}
+
+				if (
+					typeof rightValue === 'string' &&
+					!(condition.operator.operation === 'regex' || condition.operator.operation === 'notRegex')
+				) {
+					rightValue = rightValue.toLocaleLowerCase();
+				}
+			}
+
+			const left = (leftValue ?? '') as string;
+			const right = (rightValue ?? '') as string;
+
+			switch (condition.operator.operation) {
+				case 'empty':
+					return left.length === 0;
+				case 'notEmpty':
+					return left.length !== 0;
+				case 'equals':
+					return left === right;
+				case 'notEquals':
+					return left !== right;
+				case 'contains':
+					return left.includes(right);
+				case 'notContains':
+					return !left.includes(right);
+				case 'startsWith':
+					return left.startsWith(right);
+				case 'notStartsWith':
+					return !left.startsWith(right);
+				case 'endsWith':
+					return left.endsWith(right);
+				case 'notEndsWith':
+					return !left.endsWith(right);
+				case 'regex':
+					return parseRegexPattern(right).test(left);
+				case 'notRegex':
+					return !parseRegexPattern(right).test(left);
+			}
+
+			break;
+		}
+		case 'number': {
+			const left = leftValue as number;
+			const right = rightValue as number;
+
+			switch (condition.operator.operation) {
+				case 'equals':
+					return left === right;
+				case 'notEquals':
+					return left !== right;
+				case 'gt':
+					return left > right;
+				case 'lt':
+					return left < right;
+				case 'gte':
+					return left >= right;
+				case 'lte':
+					return left <= right;
+			}
+		}
+		case 'dateTime': {
+			const left = leftValue as DateTime;
+			const right = rightValue as DateTime;
+
+			if (!left || !right) {
+				return false;
+			}
+
+			switch (condition.operator.operation) {
+				case 'equals':
+					return left.toMillis() === right.toMillis();
+				case 'notEquals':
+					return left.toMillis() !== right.toMillis();
+				case 'after':
+					return left.toMillis() > right.toMillis();
+				case 'before':
+					return left.toMillis() < right.toMillis();
+				case 'afterOrEquals':
+					return left.toMillis() >= right.toMillis();
+				case 'beforeOrEquals':
+					return left.toMillis() <= right.toMillis();
+			}
+		}
+		case 'boolean': {
+			const left = leftValue as boolean;
+			const right = rightValue as boolean;
+
+			switch (condition.operator.operation) {
+				case 'true':
+					return left;
+				case 'false':
+					return !left;
+				case 'equals':
+					return left === right;
+				case 'notEquals':
+					return left !== right;
+			}
+		}
+		case 'array': {
+			const left = (leftValue ?? []) as unknown[];
+			const rightNumber = rightValue as number;
+
+			switch (condition.operator.operation) {
+				case 'contains':
+					if (ignoreCase && typeof rightValue === 'string') {
+						rightValue = rightValue.toLocaleLowerCase();
+					}
+					return left.includes(rightValue);
+				case 'notContains':
+					if (ignoreCase && typeof rightValue === 'string') {
+						rightValue = rightValue.toLocaleLowerCase();
+					}
+					return !left.includes(rightValue);
+				case 'lengthEquals':
+					return left.length === rightNumber;
+				case 'lengthNotEquals':
+					return left.length !== rightNumber;
+				case 'lengthGt':
+					return left.length > rightNumber;
+				case 'lengthLt':
+					return left.length < rightNumber;
+				case 'lengthGte':
+					return left.length >= rightNumber;
+				case 'lengthLte':
+					return left.length <= rightNumber;
+				case 'empty':
+					return left.length === 0;
+				case 'notEmpty':
+					return left.length !== 0;
+			}
+		}
+		case 'object': {
+			const left = leftValue;
+
+			switch (condition.operator.operation) {
+				case 'empty':
+					return !left || Object.keys(left).length === 0;
+				case 'notEmpty':
+					return !!left && Object.keys(left).length !== 0;
+			}
+		}
+	}
+
+	LoggerProxy.warn(`Unknown filter parameter operator "${operator.type}:${operator.operation}"`);
+
+	return false;
+}
+
+type ExecuteFilterOptions = {
+	itemIndex?: number;
+};
+export function executeFilter(
+	value: FilterValue,
+	{ itemIndex }: ExecuteFilterOptions = {},
+): boolean {
+	const conditionPass = (condition: FilterConditionValue, index: number) =>
+		executeFilterCondition(condition, value.options, { index, itemIndex });
+
+	if (value.combinator === 'and') {
+		return value.conditions.every(conditionPass);
+	} else if (value.combinator === 'or') {
+		return value.conditions.some(conditionPass);
+	}
+
+	LoggerProxy.warn(`Unknown filter combinator "${value.combinator as string}"`);
+
+	return false;
+}
+
+export const validateFilterParameter = (
+	nodeProperties: INodeProperties,
+	value: FilterValue,
+): Record<string, string[]> => {
+	return value.conditions.reduce(
+		(issues, condition, index) => {
+			const key = `${nodeProperties.name}.${index}`;
+
+			try {
+				parseFilterConditionValues(condition, value.options, {
+					index,
+					unresolvedExpressions: true,
+					errorFormat: 'inline',
+				});
+			} catch (error) {
+				if (error instanceof FilterError) {
+					issues[key].push(error.message);
+				}
+			}
+
+			return issues;
+		},
+		{} as Record<string, string[]>,
+	);
+};
diff --git a/packages/workflow/src/ObservableObject.ts b/packages/workflow/src/ObservableObject.ts
index 4f97de1a1915a..c9c2b7e9b301a 100644
--- a/packages/workflow/src/ObservableObject.ts
+++ b/packages/workflow/src/ObservableObject.ts
@@ -1,7 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 /* eslint-disable @typescript-eslint/no-shadow */
-/* eslint-disable no-param-reassign */
-/* eslint-disable no-underscore-dangle */
+
 import type { IDataObject, IObservableObject } from './Interfaces';
 
 interface IObservableOptions {
@@ -14,14 +13,13 @@ export function create(
 	option?: IObservableOptions,
 	depth?: number,
 ): IDataObject {
-	// eslint-disable-next-line no-param-reassign, @typescript-eslint/prefer-nullish-coalescing
+	// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
 	depth = depth || 0;
 
 	// Make all the children of target also observable
-	// eslint-disable-next-line no-restricted-syntax
+
 	for (const key in target) {
 		if (typeof target[key] === 'object' && target[key] !== null) {
-			// eslint-disable-next-line no-param-reassign
 			target[key] = create(
 				target[key] as IDataObject,
 				// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
@@ -37,7 +35,6 @@ export function create(
 		writable: true,
 	});
 	return new Proxy(target, {
-		// eslint-disable-next-line @typescript-eslint/no-shadow
 		deleteProperty(target, name) {
 			if (parent === undefined) {
 				// If no parent is given mark current data as changed
@@ -51,6 +48,9 @@ export function create(
 		get(target, name, receiver) {
 			return Reflect.get(target, name, receiver);
 		},
+		has(target, key) {
+			return Reflect.has(target, key);
+		},
 		set(target, name, value) {
 			if (parent === undefined) {
 				// If no parent is given mark current data as changed
@@ -62,7 +62,6 @@ export function create(
 					typeof value === 'object' &&
 					// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
 					Object.keys(value).length === 0
-					// eslint-disable-next-line no-empty
 				) {
 				} else {
 					(target as IObservableObject).__dataChanged = true;
diff --git a/packages/workflow/src/RoutingNode.ts b/packages/workflow/src/RoutingNode.ts
index 727fe5efca208..99935ede325b0 100644
--- a/packages/workflow/src/RoutingNode.ts
+++ b/packages/workflow/src/RoutingNode.ts
@@ -1,17 +1,14 @@
-/* eslint-disable @typescript-eslint/no-unsafe-argument */
 /* eslint-disable @typescript-eslint/no-unsafe-call */
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
+
 /* eslint-disable @typescript-eslint/prefer-nullish-coalescing */
-/* eslint-disable no-param-reassign */
-/* eslint-disable no-continue */
-/* eslint-disable @typescript-eslint/no-unsafe-return */
+
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
-/* eslint-disable no-await-in-loop */
-/* eslint-disable no-restricted-syntax */
-import get from 'lodash.get';
-import merge from 'lodash.merge';
-import set from 'lodash.set';
+
+import get from 'lodash/get';
+import merge from 'lodash/merge';
+import set from 'lodash/set';
 
 import type {
 	ICredentialDataDecryptedObject,
@@ -39,11 +36,17 @@ import type {
 	INodePropertyCollection,
 	NodeParameterValueType,
 	PostReceiveAction,
+	JsonObject,
+	CloseFunction,
 } from './Interfaces';
-import { NodeApiError, NodeOperationError } from './NodeErrors';
+
 import * as NodeHelpers from './NodeHelpers';
 
 import type { Workflow } from './Workflow';
+import type { NodeError } from './errors/abstract/node.error';
+
+import { NodeOperationError } from './errors/node-operation.error';
+import { NodeApiError } from './errors/node-api.error';
 
 export class RoutingNode {
 	additionalData: IWorkflowExecuteAdditionalData;
@@ -81,6 +84,7 @@ export class RoutingNode {
 		executeData: IExecuteData,
 		nodeExecuteFunctions: INodeExecuteFunctions,
 		credentialsDecrypted?: ICredentialsDecrypted,
+		abortSignal?: AbortSignal,
 	): Promise<INodeExecutionData[][] | null | undefined> {
 		const items = inputData.main[0] as INodeExecutionData[];
 		const returnData: INodeExecutionData[] = [];
@@ -91,6 +95,7 @@ export class RoutingNode {
 		if (nodeType.description.credentials?.length) {
 			credentialType = nodeType.description.credentials[0].name;
 		}
+		const closeFunctions: CloseFunction[] = [];
 		const executeFunctions = nodeExecuteFunctions.getExecuteFunctions(
 			this.workflow,
 			this.runExecutionData,
@@ -101,6 +106,8 @@ export class RoutingNode {
 			this.additionalData,
 			executeData,
 			this.mode,
+			closeFunctions,
+			abortSignal,
 		);
 
 		let credentials: ICredentialDataDecryptedObject | undefined;
@@ -125,8 +132,9 @@ export class RoutingNode {
 
 		// TODO: Think about how batching could be handled for REST APIs which support it
 		for (let i = 0; i < items.length; i++) {
+			let thisArgs: IExecuteSingleFunctions | undefined;
 			try {
-				const thisArgs = nodeExecuteFunctions.getExecuteSingleFunctions(
+				thisArgs = nodeExecuteFunctions.getExecuteSingleFunctions(
 					this.workflow,
 					this.runExecutionData,
 					runIndex,
@@ -137,6 +145,7 @@ export class RoutingNode {
 					this.additionalData,
 					executeData,
 					this.mode,
+					abortSignal,
 				);
 				const requestData: DeclarativeRestApiSettings.ResultOptions = {
 					options: {
@@ -213,15 +222,34 @@ export class RoutingNode {
 
 				returnData.push(...responseData);
 			} catch (error) {
-				if (get(this.node, 'continueOnFail', false)) {
-					returnData.push({ json: {}, error: error.message });
+				if (thisArgs !== undefined && thisArgs.continueOnFail()) {
+					returnData.push({ json: {}, error: error as NodeApiError });
 					continue;
 				}
-				throw new NodeApiError(this.node, error, {
+
+				if (error instanceof NodeApiError) {
+					set(error, 'context.itemIndex', i);
+					set(error, 'context.runIndex', runIndex);
+					throw error;
+				}
+
+				interface AxiosError extends NodeError {
+					isAxiosError: boolean;
+					description: string | undefined;
+					response?: { status: number };
+				}
+
+				const routingError = error as AxiosError;
+
+				throw new NodeApiError(this.node, error as JsonObject, {
 					runIndex,
 					itemIndex: i,
-					message: error?.message,
-					description: error?.description,
+					message: routingError?.message,
+					description: routingError?.description,
+					httpCode:
+						routingError.isAxiosError && routingError.response
+							? String(routingError.response?.status)
+							: 'none',
 				});
 			}
 		}
@@ -260,7 +288,7 @@ export class RoutingNode {
 		runIndex: number,
 	): Promise<INodeExecutionData[]> {
 		if (typeof action === 'function') {
-			return action.call(executeSingleFunctions, inputData, responseData);
+			return await action.call(executeSingleFunctions, inputData, responseData);
 		}
 		if (action.type === 'rootProperty') {
 			try {
@@ -277,7 +305,7 @@ export class RoutingNode {
 					});
 				});
 			} catch (error) {
-				throw new NodeOperationError(this.node, error, {
+				throw new NodeOperationError(this.node, error as Error, {
 					runIndex,
 					itemIndex,
 					description: `The rootProperty "${action.properties.property}" could not be found on item.`,
@@ -357,7 +385,6 @@ export class RoutingNode {
 		if (action.type === 'setKeyValue') {
 			const returnData: INodeExecutionData[] = [];
 
-			// eslint-disable-next-line @typescript-eslint/no-loop-func
 			inputData.forEach((item) => {
 				const returnItem: IDataObject = {};
 				for (const key of Object.keys(action.properties)) {
@@ -452,7 +479,7 @@ export class RoutingNode {
 			}
 		} else {
 			// No postReceive functionality got defined so simply add data as it is
-			// eslint-disable-next-line no-lonely-if
+
 			if (Array.isArray(responseData.body)) {
 				returnData = responseData.body.map((json) => {
 					return {
@@ -511,19 +538,20 @@ export class RoutingNode {
 		const executePaginationFunctions = {
 			...executeSingleFunctions,
 			makeRoutingRequest: async (requestOptions: DeclarativeRestApiSettings.ResultOptions) => {
-				return this.rawRoutingRequest(
+				return await this.rawRoutingRequest(
 					executeSingleFunctions,
 					requestOptions,
 					credentialType,
 					credentialsDecrypted,
-				).then(async (data) =>
-					this.postProcessResponseData(
-						executeSingleFunctions,
-						data,
-						requestData,
-						itemIndex,
-						runIndex,
-					),
+				).then(
+					async (data) =>
+						await this.postProcessResponseData(
+							executeSingleFunctions,
+							data,
+							requestData,
+							itemIndex,
+							runIndex,
+						),
 				);
 			},
 		};
@@ -626,14 +654,15 @@ export class RoutingNode {
 							requestData,
 							credentialType,
 							credentialsDecrypted,
-						).then(async (data) =>
-							this.postProcessResponseData(
-								executeSingleFunctions,
-								data,
-								requestData,
-								itemIndex,
-								runIndex,
-							),
+						).then(
+							async (data) =>
+								await this.postProcessResponseData(
+									executeSingleFunctions,
+									data,
+									requestData,
+									itemIndex,
+									runIndex,
+								),
 						);
 
 						(requestData.options[optionsType] as IDataObject)[properties.offsetParameter] =
@@ -671,14 +700,15 @@ export class RoutingNode {
 				requestData,
 				credentialType,
 				credentialsDecrypted,
-			).then(async (data) =>
-				this.postProcessResponseData(
-					executeSingleFunctions,
-					data,
-					requestData,
-					itemIndex,
-					runIndex,
-				),
+			).then(
+				async (data) =>
+					await this.postProcessResponseData(
+						executeSingleFunctions,
+						data,
+						requestData,
+						itemIndex,
+						runIndex,
+					),
 			);
 		}
 		return responseData;
@@ -704,7 +734,6 @@ export class RoutingNode {
 				this.node.name,
 				this.connectionInputData,
 				this.mode,
-				this.additionalData.timezone,
 				additionalKeys ?? {},
 				executeData,
 				returnObjectAsString,
@@ -714,6 +743,7 @@ export class RoutingNode {
 		return parameterValue;
 	}
 
+	// eslint-disable-next-line complexity
 	getRequestOptionsFromParameters(
 		executeSingleFunctions: IExecuteSingleFunctions,
 		nodeProperties: INodeProperties | INodePropertyOptions,
@@ -812,16 +842,16 @@ export class RoutingNode {
 
 					if (nodeProperties.routing.send.type === 'body') {
 						// Send in "body"
-						// eslint-disable-next-line no-lonely-if
+
 						if (nodeProperties.routing.send.propertyInDotNotation === false) {
 							// eslint-disable-next-line @typescript-eslint/no-explicit-any
-							(returnData.options.body as Record<string, any>)![propertyName] = value;
+							(returnData.options.body as Record<string, any>)[propertyName] = value;
 						} else {
 							set(returnData.options.body as object, propertyName, value);
 						}
 					} else {
 						// Send in "query"
-						// eslint-disable-next-line no-lonely-if
+
 						if (nodeProperties.routing.send.propertyInDotNotation === false) {
 							returnData.options.qs![propertyName] = value;
 						} else {
diff --git a/packages/workflow/src/TelemetryHelpers.ts b/packages/workflow/src/TelemetryHelpers.ts
index 69231a167ef1e..f2f51e9c7dfe9 100644
--- a/packages/workflow/src/TelemetryHelpers.ts
+++ b/packages/workflow/src/TelemetryHelpers.ts
@@ -1,3 +1,4 @@
+import { getNodeParameters } from './NodeHelpers';
 import type {
 	IConnection,
 	INode,
@@ -7,10 +8,19 @@ import type {
 	INodesGraphResult,
 	IWorkflowBase,
 	INodeTypes,
-	INodeType,
+	IDataObject,
 } from './Interfaces';
-
-const STICKY_NODE_TYPE = 'n8n-nodes-base.stickyNote';
+import { ApplicationError } from './errors/application.error';
+import {
+	AGENT_LANGCHAIN_NODE_TYPE,
+	CHAIN_LLM_LANGCHAIN_NODE_TYPE,
+	CHAIN_SUMMARIZATION_LANGCHAIN_NODE_TYPE,
+	HTTP_REQUEST_NODE_TYPE,
+	LANGCHAIN_CUSTOM_TOOLS,
+	OPENAI_LANGCHAIN_NODE_TYPE,
+	STICKY_NODE_TYPE,
+	WEBHOOK_NODE_TYPE,
+} from './Constants';
 
 export function getNodeTypeForName(workflow: IWorkflowBase, nodeName: string): INode | undefined {
 	return workflow.nodes.find((node) => node.name === nodeName);
@@ -20,28 +30,6 @@ export function isNumber(value: unknown): value is number {
 	return typeof value === 'number';
 }
 
-function getStickyDimensions(note: INode, stickyType: INodeType | undefined) {
-	const heightProperty = stickyType?.description?.properties.find(
-		(property) => property.name === 'height',
-	);
-	const widthProperty = stickyType?.description?.properties.find(
-		(property) => property.name === 'width',
-	);
-
-	const defaultHeight =
-		heightProperty && isNumber(heightProperty?.default) ? heightProperty.default : 0;
-	const defaultWidth =
-		widthProperty && isNumber(widthProperty?.default) ? widthProperty.default : 0;
-
-	const height: number = isNumber(note.parameters.height) ? note.parameters.height : defaultHeight;
-	const width: number = isNumber(note.parameters.width) ? note.parameters.width : defaultWidth;
-
-	return {
-		height,
-		width,
-	};
-}
-
 type XYPosition = [number, number];
 
 function areOverlapping(
@@ -95,7 +83,7 @@ export function getDomainPath(raw: string, urlParts = URL_PARTS_REGEX): string {
 	try {
 		const url = new URL(raw);
 
-		if (!url.hostname) throw new Error('Malformed URL');
+		if (!url.hostname) throw new ApplicationError('Malformed URL');
 
 		return sanitizeRoute(url.pathname);
 	} catch {
@@ -111,122 +99,219 @@ export function getDomainPath(raw: string, urlParts = URL_PARTS_REGEX): string {
 }
 
 export function generateNodesGraph(
-	workflow: IWorkflowBase,
+	workflow: Partial<IWorkflowBase>,
 	nodeTypes: INodeTypes,
 	options?: {
 		sourceInstanceId?: string;
 		nodeIdMap?: { [curr: string]: string };
+		isCloudDeployment?: boolean;
 	},
 ): INodesGraphResult {
-	const nodesGraph: INodesGraph = {
+	const nodeGraph: INodesGraph = {
 		node_types: [],
 		node_connections: [],
 		nodes: {},
 		notes: {},
 		is_pinned: Object.keys(workflow.pinData ?? {}).length > 0,
 	};
-	const nodeNameAndIndex: INodeNameIndex = {};
+	const nameIndices: INodeNameIndex = {};
 	const webhookNodeNames: string[] = [];
 
-	try {
-		const notes = workflow.nodes.filter((node) => node.type === STICKY_NODE_TYPE);
-		const otherNodes = workflow.nodes.filter((node) => node.type !== STICKY_NODE_TYPE);
-
-		notes.forEach((stickyNote: INode, index: number) => {
-			const stickyType = nodeTypes.getByNameAndVersion(STICKY_NODE_TYPE, stickyNote.typeVersion);
-			const { height, width } = getStickyDimensions(stickyNote, stickyType);
-
-			const topLeft = stickyNote.position;
-			const bottomRight: [number, number] = [topLeft[0] + width, topLeft[1] + height];
-			const overlapping = Boolean(
-				otherNodes.find((node) => areOverlapping(topLeft, bottomRight, node.position)),
-			);
-			nodesGraph.notes[index] = {
-				overlapping,
-				position: topLeft,
-				height,
-				width,
-			};
-		});
-
-		otherNodes.forEach((node: INode, index: number) => {
-			nodesGraph.node_types.push(node.type);
-			const nodeItem: INodeGraphItem = {
-				id: node.id,
-				type: node.type,
-				position: node.position,
-			};
+	const notes = (workflow.nodes ?? []).filter((node) => node.type === STICKY_NODE_TYPE);
+	const otherNodes = (workflow.nodes ?? []).filter((node) => node.type !== STICKY_NODE_TYPE);
+
+	notes.forEach((stickyNote: INode, index: number) => {
+		const stickyType = nodeTypes.getByNameAndVersion(STICKY_NODE_TYPE, stickyNote.typeVersion);
+		if (!stickyType) {
+			return;
+		}
+
+		let nodeParameters: IDataObject = {};
+
+		try {
+			nodeParameters =
+				getNodeParameters(
+					stickyType.description.properties,
+					stickyNote.parameters,
+					true,
+					false,
+					stickyNote,
+				) ?? {};
+		} catch {
+			// prevent node param resolution from failing graph generation
+		}
+
+		const height: number = typeof nodeParameters.height === 'number' ? nodeParameters.height : 0;
+		const width: number = typeof nodeParameters.width === 'number' ? nodeParameters.width : 0;
+
+		const topLeft = stickyNote.position;
+		const bottomRight: [number, number] = [topLeft[0] + width, topLeft[1] + height];
+		const overlapping = Boolean(
+			otherNodes.find((node) => areOverlapping(topLeft, bottomRight, node.position)),
+		);
+		nodeGraph.notes[index] = {
+			overlapping,
+			position: topLeft,
+			height,
+			width,
+		};
+	});
+
+	// eslint-disable-next-line complexity
+	otherNodes.forEach((node: INode, index: number) => {
+		nodeGraph.node_types.push(node.type);
+		const nodeItem: INodeGraphItem = {
+			id: node.id,
+			type: node.type,
+			version: node.typeVersion,
+			position: node.position,
+		};
 
-			if (options?.sourceInstanceId) {
-				nodeItem.src_instance_id = options.sourceInstanceId;
+		if (options?.sourceInstanceId) {
+			nodeItem.src_instance_id = options.sourceInstanceId;
+		}
+
+		if (node.id && options?.nodeIdMap?.[node.id]) {
+			nodeItem.src_node_id = options.nodeIdMap[node.id];
+		}
+
+		if (node.type === AGENT_LANGCHAIN_NODE_TYPE) {
+			nodeItem.agent = (node.parameters.agent as string) ?? 'conversationalAgent';
+		} else if (node.type === HTTP_REQUEST_NODE_TYPE && node.typeVersion === 1) {
+			try {
+				nodeItem.domain = new URL(node.parameters.url as string).hostname;
+			} catch {
+				nodeItem.domain = getDomainBase(node.parameters.url as string);
+			}
+		} else if (node.type === HTTP_REQUEST_NODE_TYPE && node.typeVersion > 1) {
+			const { authentication } = node.parameters as { authentication: string };
+
+			nodeItem.credential_type = {
+				none: 'none',
+				genericCredentialType: node.parameters.genericAuthType as string,
+				predefinedCredentialType: node.parameters.nodeCredentialType as string,
+			}[authentication];
+
+			nodeItem.credential_set = node.credentials ? Object.keys(node.credentials).length > 0 : false;
+
+			const { url } = node.parameters as { url: string };
+
+			nodeItem.domain_base = getDomainBase(url);
+			nodeItem.domain_path = getDomainPath(url);
+			nodeItem.method = node.parameters.requestMethod as string;
+		} else if (node.type === WEBHOOK_NODE_TYPE) {
+			webhookNodeNames.push(node.name);
+		} else {
+			try {
+				const nodeType = nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
+				if (nodeType) {
+					const nodeParameters = getNodeParameters(
+						nodeType.description.properties,
+						node.parameters,
+						true,
+						false,
+						node,
+					);
+
+					if (nodeParameters) {
+						const keys: Array<'operation' | 'resource' | 'mode'> = [
+							'operation',
+							'resource',
+							'mode',
+						];
+						keys.forEach((key) => {
+							if (nodeParameters.hasOwnProperty(key)) {
+								nodeItem[key] = nodeParameters[key]?.toString();
+							}
+						});
+					}
+				}
+			} catch (e: unknown) {
+				if (!(e instanceof Error && e.message.includes('Unrecognized node type'))) {
+					throw e;
+				}
 			}
+		}
 
-			if (node.id && options?.nodeIdMap && options.nodeIdMap[node.id]) {
-				nodeItem.src_node_id = options.nodeIdMap[node.id];
+		if (options?.isCloudDeployment === true) {
+			if (node.type === OPENAI_LANGCHAIN_NODE_TYPE) {
+				nodeItem.prompts =
+					(((node.parameters?.messages as IDataObject) ?? {}).values as IDataObject[]) ?? [];
 			}
 
-			if (node.type === 'n8n-nodes-base.httpRequest' && node.typeVersion === 1) {
-				try {
-					nodeItem.domain = new URL(node.parameters.url as string).hostname;
-				} catch {
-					nodeItem.domain = getDomainBase(node.parameters.url as string);
+			if (node.type === AGENT_LANGCHAIN_NODE_TYPE) {
+				const prompts: IDataObject = {};
+
+				if (node.parameters?.text) {
+					prompts.text = node.parameters.text as string;
 				}
-			} else if (node.type === 'n8n-nodes-base.httpRequest' && [2, 3].includes(node.typeVersion)) {
-				const { authentication } = node.parameters as { authentication: string };
-
-				nodeItem.credential_type = {
-					none: 'none',
-					genericCredentialType: node.parameters.genericAuthType as string,
-					predefinedCredentialType: node.parameters.nodeCredentialType as string,
-				}[authentication];
-
-				nodeItem.credential_set = node.credentials
-					? Object.keys(node.credentials).length > 0
-					: false;
-
-				const { url } = node.parameters as { url: string };
-
-				nodeItem.domain_base = getDomainBase(url);
-				nodeItem.domain_path = getDomainPath(url);
-				nodeItem.method = node.parameters.requestMethod as string;
-			} else if (node.type === 'n8n-nodes-base.webhook') {
-				webhookNodeNames.push(node.name);
-			} else {
-				const nodeType = nodeTypes.getByNameAndVersion(node.type);
-
-				nodeType?.description?.properties?.forEach((property) => {
-					if (
-						property.name === 'operation' ||
-						property.name === 'resource' ||
-						property.name === 'mode'
-					) {
-						nodeItem[property.name] = property.default ? property.default.toString() : undefined;
+				const nodeOptions = node.parameters?.options as IDataObject;
+
+				if (nodeOptions) {
+					const optionalMessagesKeys = [
+						'humanMessage',
+						'systemMessage',
+						'humanMessageTemplate',
+						'prefix',
+						'suffixChat',
+						'suffix',
+						'prefixPrompt',
+						'suffixPrompt',
+					];
+
+					for (const key of optionalMessagesKeys) {
+						if (nodeOptions[key]) {
+							prompts[key] = nodeOptions[key] as string;
+						}
 					}
-				});
+				}
 
-				nodeItem.operation = node.parameters.operation?.toString() ?? nodeItem.operation;
-				nodeItem.resource = node.parameters.resource?.toString() ?? nodeItem.resource;
-				nodeItem.mode = node.parameters.mode?.toString() ?? nodeItem.mode;
+				if (Object.keys(prompts).length) {
+					nodeItem.prompts = prompts;
+				}
 			}
-			nodesGraph.nodes[`${index}`] = nodeItem;
-			nodeNameAndIndex[node.name] = index.toString();
-		});
 
-		const getGraphConnectionItem = (startNode: string, connectionItem: IConnection) => {
-			return { start: nodeNameAndIndex[startNode], end: nodeNameAndIndex[connectionItem.node] };
-		};
+			if (node.type === CHAIN_SUMMARIZATION_LANGCHAIN_NODE_TYPE) {
+				nodeItem.prompts = (
+					(((node.parameters?.options as IDataObject) ?? {})
+						.summarizationMethodAndPrompts as IDataObject) ?? {}
+				).values as IDataObject;
+			}
 
-		Object.keys(workflow.connections).forEach((nodeName) => {
-			const connections = workflow.connections[nodeName];
-			connections.main.forEach((element) => {
-				element.forEach((element2) => {
-					nodesGraph.node_connections.push(getGraphConnectionItem(nodeName, element2));
+			if (LANGCHAIN_CUSTOM_TOOLS.includes(node.type)) {
+				nodeItem.prompts = {
+					description: (node.parameters?.description as string) ?? '',
+				};
+			}
+
+			if (node.type === CHAIN_LLM_LANGCHAIN_NODE_TYPE) {
+				nodeItem.prompts =
+					(((node.parameters?.messages as IDataObject) ?? {}).messageValues as IDataObject[]) ?? [];
+			}
+		}
+
+		nodeGraph.nodes[index.toString()] = nodeItem;
+		nameIndices[node.name] = index.toString();
+	});
+
+	const getGraphConnectionItem = (startNode: string, connectionItem: IConnection) => {
+		return { start: nameIndices[startNode], end: nameIndices[connectionItem.node] };
+	};
+
+	Object.keys(workflow.connections ?? []).forEach((nodeName) => {
+		const connections = workflow.connections?.[nodeName];
+		if (!connections) {
+			return;
+		}
+
+		Object.keys(connections).forEach((key) => {
+			connections[key].forEach((element) => {
+				(element ?? []).forEach((element2) => {
+					nodeGraph.node_connections.push(getGraphConnectionItem(nodeName, element2));
 				});
 			});
 		});
-	} catch (e) {
-		return { nodeGraph: nodesGraph, nameIndices: nodeNameAndIndex, webhookNodeNames };
-	}
+	});
 
-	return { nodeGraph: nodesGraph, nameIndices: nodeNameAndIndex, webhookNodeNames };
+	return { nodeGraph, nameIndices, webhookNodeNames };
 }
diff --git a/packages/workflow/src/TypeValidation.ts b/packages/workflow/src/TypeValidation.ts
new file mode 100644
index 0000000000000..ea19af07c6786
--- /dev/null
+++ b/packages/workflow/src/TypeValidation.ts
@@ -0,0 +1,311 @@
+import { DateTime } from 'luxon';
+import type { FieldType, INodePropertyOptions, ValidationResult } from './Interfaces';
+import isObject from 'lodash/isObject';
+import { ApplicationError } from './errors';
+
+export const tryToParseNumber = (value: unknown): number => {
+	const isValidNumber = !isNaN(Number(value));
+
+	if (!isValidNumber) {
+		throw new ApplicationError('Failed to parse value to number', { extra: { value } });
+	}
+	return Number(value);
+};
+
+export const tryToParseString = (value: unknown): string => {
+	if (typeof value === 'object') return JSON.stringify(value);
+	if (typeof value === 'undefined') return '';
+	if (
+		typeof value === 'string' ||
+		typeof value === 'bigint' ||
+		typeof value === 'boolean' ||
+		typeof value === 'number'
+	) {
+		return value.toString();
+	}
+
+	return String(value);
+};
+export const tryToParseAlphanumericString = (value: unknown): string => {
+	const parsed = tryToParseString(value);
+	const regex = /^[a-zA-Z_][a-zA-Z0-9_]*$/;
+	if (!regex.test(parsed)) {
+		throw new ApplicationError('Value is not a valid alphanumeric string', { extra: { value } });
+	}
+	return parsed;
+};
+export const tryToParseBoolean = (value: unknown): value is boolean => {
+	if (typeof value === 'boolean') {
+		return value;
+	}
+
+	if (typeof value === 'string' && ['true', 'false'].includes(value.toLowerCase())) {
+		return value.toLowerCase() === 'true';
+	}
+
+	// If value is not a empty string, try to parse it to a number
+	if (!(typeof value === 'string' && value.trim() === '')) {
+		const num = Number(value);
+		if (num === 0) {
+			return false;
+		} else if (num === 1) {
+			return true;
+		}
+	}
+
+	throw new ApplicationError('Failed to parse value as boolean', {
+		extra: { value },
+	});
+};
+
+export const tryToParseDateTime = (value: unknown): DateTime => {
+	if (value instanceof DateTime && value.isValid) {
+		return value;
+	}
+
+	if (value instanceof Date) {
+		const fromJSDate = DateTime.fromJSDate(value);
+		if (fromJSDate.isValid) {
+			return fromJSDate;
+		}
+	}
+
+	const dateString = String(value).trim();
+
+	// Rely on luxon to parse different date formats
+	const isoDate = DateTime.fromISO(dateString, { setZone: true });
+	if (isoDate.isValid) {
+		return isoDate;
+	}
+	const httpDate = DateTime.fromHTTP(dateString, { setZone: true });
+	if (httpDate.isValid) {
+		return httpDate;
+	}
+	const rfc2822Date = DateTime.fromRFC2822(dateString, { setZone: true });
+	if (rfc2822Date.isValid) {
+		return rfc2822Date;
+	}
+	const sqlDate = DateTime.fromSQL(dateString, { setZone: true });
+	if (sqlDate.isValid) {
+		return sqlDate;
+	}
+
+	const parsedDateTime = DateTime.fromMillis(Date.parse(dateString));
+	if (parsedDateTime.isValid) {
+		return parsedDateTime;
+	}
+
+	throw new ApplicationError('Value is not a valid date', { extra: { dateString } });
+};
+
+export const tryToParseTime = (value: unknown): string => {
+	const isTimeInput = /^\d{2}:\d{2}(:\d{2})?((\-|\+)\d{4})?((\-|\+)\d{1,2}(:\d{2})?)?$/s.test(
+		String(value),
+	);
+	if (!isTimeInput) {
+		throw new ApplicationError('Value is not a valid time', { extra: { value } });
+	}
+	return String(value);
+};
+
+export const tryToParseArray = (value: unknown): unknown[] => {
+	try {
+		if (typeof value === 'object' && Array.isArray(value)) {
+			return value;
+		}
+
+		let parsed: unknown[];
+		try {
+			parsed = JSON.parse(String(value)) as unknown[];
+		} catch (e) {
+			parsed = JSON.parse(String(value).replace(/'/g, '"')) as unknown[];
+		}
+
+		if (!Array.isArray(parsed)) {
+			throw new ApplicationError('Value is not a valid array', { extra: { value } });
+		}
+		return parsed;
+	} catch (e) {
+		throw new ApplicationError('Value is not a valid array', { extra: { value } });
+	}
+};
+
+export const tryToParseObject = (value: unknown): object => {
+	if (value && typeof value === 'object' && !Array.isArray(value)) {
+		return value;
+	}
+	try {
+		const o = JSON.parse(String(value)) as object;
+		if (typeof o !== 'object' || Array.isArray(o)) {
+			throw new ApplicationError('Value is not a valid object', { extra: { value } });
+		}
+		return o;
+	} catch (e) {
+		throw new ApplicationError('Value is not a valid object', { extra: { value } });
+	}
+};
+
+export const tryToParseUrl = (value: unknown): string => {
+	if (typeof value === 'string' && !value.includes('://')) {
+		value = `http://${value}`;
+	}
+	const urlPattern = /^(https?|ftp|file):\/\/\S+|www\.\S+/;
+	if (!urlPattern.test(String(value))) {
+		throw new ApplicationError(`The value "${String(value)}" is not a valid url.`, {
+			extra: { value },
+		});
+	}
+	return String(value);
+};
+
+export const tryToParseJwt = (value: unknown): string => {
+	const error = new ApplicationError(`The value "${String(value)}" is not a valid JWT token.`, {
+		extra: { value },
+	});
+
+	if (!value) throw error;
+
+	const jwtPattern = /^[A-Za-z0-9-_]+\.[A-Za-z0-9-_]+\.[A-Za-z0-9-_.+/=]*$/;
+
+	if (!jwtPattern.test(String(value))) throw error;
+
+	return String(value);
+};
+
+type ValidateFieldTypeOptions = Partial<{
+	valueOptions: INodePropertyOptions[];
+	strict: boolean;
+	parseStrings: boolean;
+}>;
+// Validates field against the schema and tries to parse it to the correct type
+// eslint-disable-next-line complexity
+export const validateFieldType = (
+	fieldName: string,
+	value: unknown,
+	type: FieldType,
+	options: ValidateFieldTypeOptions = {},
+): ValidationResult => {
+	if (value === null || value === undefined) return { valid: true };
+	const strict = options.strict ?? false;
+	const valueOptions = options.valueOptions ?? [];
+	const parseStrings = options.parseStrings ?? false;
+	const defaultErrorMessage = `'${fieldName}' expects a ${type} but we got '${String(value)}'`;
+	switch (type.toLowerCase()) {
+		case 'string': {
+			if (!parseStrings) return { valid: true, newValue: value };
+			try {
+				if (strict && typeof value !== 'string') {
+					return { valid: false, errorMessage: defaultErrorMessage };
+				}
+				return { valid: true, newValue: tryToParseString(value) };
+			} catch (e) {
+				return { valid: false, errorMessage: defaultErrorMessage };
+			}
+		}
+		case 'string-alphanumeric': {
+			try {
+				return { valid: true, newValue: tryToParseAlphanumericString(value) };
+			} catch (e) {
+				return {
+					valid: false,
+					errorMessage:
+						'Value is not a valid alphanumeric string, only letters, numbers and underscore allowed',
+				};
+			}
+		}
+		case 'number': {
+			try {
+				if (strict && typeof value !== 'number') {
+					return { valid: false, errorMessage: defaultErrorMessage };
+				}
+				return { valid: true, newValue: tryToParseNumber(value) };
+			} catch (e) {
+				return { valid: false, errorMessage: defaultErrorMessage };
+			}
+		}
+		case 'boolean': {
+			try {
+				if (strict && typeof value !== 'boolean') {
+					return { valid: false, errorMessage: defaultErrorMessage };
+				}
+				return { valid: true, newValue: tryToParseBoolean(value) };
+			} catch (e) {
+				return { valid: false, errorMessage: defaultErrorMessage };
+			}
+		}
+		case 'datetime': {
+			try {
+				return { valid: true, newValue: tryToParseDateTime(value) };
+			} catch (e) {
+				const luxonDocsURL =
+					'https://moment.github.io/luxon/api-docs/index.html#datetimefromformat';
+				const errorMessage = `${defaultErrorMessage} <br/><br/> Consider using <a href="${luxonDocsURL}" target="_blank"><code>DateTime.fromFormat</code></a> to work with custom date formats.`;
+				return { valid: false, errorMessage };
+			}
+		}
+		case 'time': {
+			try {
+				return { valid: true, newValue: tryToParseTime(value) };
+			} catch (e) {
+				return {
+					valid: false,
+					errorMessage: `'${fieldName}' expects time (hh:mm:(:ss)) but we got '${String(value)}'.`,
+				};
+			}
+		}
+		case 'object': {
+			try {
+				if (strict && !isObject(value)) {
+					return { valid: false, errorMessage: defaultErrorMessage };
+				}
+				return { valid: true, newValue: tryToParseObject(value) };
+			} catch (e) {
+				return { valid: false, errorMessage: defaultErrorMessage };
+			}
+		}
+		case 'array': {
+			if (strict && !Array.isArray(value)) {
+				return { valid: false, errorMessage: defaultErrorMessage };
+			}
+			try {
+				return { valid: true, newValue: tryToParseArray(value) };
+			} catch (e) {
+				return { valid: false, errorMessage: defaultErrorMessage };
+			}
+		}
+		case 'options': {
+			const validOptions = valueOptions.map((option) => option.value).join(', ');
+			const isValidOption = valueOptions.some((option) => option.value === value);
+
+			if (!isValidOption) {
+				return {
+					valid: false,
+					errorMessage: `'${fieldName}' expects one of the following values: [${validOptions}] but we got '${String(
+						value,
+					)}'`,
+				};
+			}
+			return { valid: true, newValue: value };
+		}
+		case 'url': {
+			try {
+				return { valid: true, newValue: tryToParseUrl(value) };
+			} catch (e) {
+				return { valid: false, errorMessage: defaultErrorMessage };
+			}
+		}
+		case 'jwt': {
+			try {
+				return { valid: true, newValue: tryToParseJwt(value) };
+			} catch (e) {
+				return {
+					valid: false,
+					errorMessage: 'Value is not a valid JWT token',
+				};
+			}
+		}
+		default: {
+			return { valid: true, newValue: value };
+		}
+	}
+};
diff --git a/packages/workflow/src/Workflow.ts b/packages/workflow/src/Workflow.ts
index a3befc4580b46..8fb579fe279d4 100644
--- a/packages/workflow/src/Workflow.ts
+++ b/packages/workflow/src/Workflow.ts
@@ -1,18 +1,11 @@
 /* eslint-disable @typescript-eslint/no-use-before-define */
-/* eslint-disable no-await-in-loop */
-/* eslint-disable @typescript-eslint/no-unsafe-call */
+
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
-/* eslint-disable no-param-reassign */
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
-/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
+
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 /* eslint-disable @typescript-eslint/no-for-in-array */
-/* eslint-disable no-prototype-builtins */
+
 /* eslint-disable @typescript-eslint/prefer-nullish-coalescing */
-/* eslint-disable no-underscore-dangle */
-/* eslint-disable no-continue */
-/* eslint-disable no-restricted-syntax */
 
 import type {
 	IConnections,
@@ -48,20 +41,30 @@ import type {
 	IRun,
 	IRunNodeResponse,
 	NodeParameterValueType,
+	ConnectionTypes,
+	CloseFunction,
+	INodeOutputConfiguration,
 } from './Interfaces';
+import { Node, NodeConnectionType } from './Interfaces';
 import type { IDeferredPromise } from './DeferredPromise';
 
 import * as NodeHelpers from './NodeHelpers';
 import * as ObservableObject from './ObservableObject';
 import { RoutingNode } from './RoutingNode';
 import { Expression } from './Expression';
+import {
+	MANUAL_CHAT_TRIGGER_LANGCHAIN_NODE_TYPE,
+	NODES_WITH_RENAMABLE_CONTENT,
+	STARTING_NODE_TYPES,
+} from './Constants';
+import { ApplicationError } from './errors/application.error';
 
 function dedupe<T>(arr: T[]): T[] {
 	return [...new Set(arr)];
 }
 
 export class Workflow {
-	id: string | undefined;
+	id: string;
 
 	name: string | undefined;
 
@@ -83,6 +86,8 @@ export class Workflow {
 	// ids of registered webhooks of nodes
 	staticData: IDataObject;
 
+	testStaticData: IDataObject | undefined;
+
 	pinData?: IPinData;
 
 	// constructor(id: string | undefined, nodes: INode[], connections: IConnections, active: boolean, nodeTypes: INodeTypes, staticData?: IDataObject, settings?: IWorkflowSettings) {
@@ -97,7 +102,7 @@ export class Workflow {
 		settings?: IWorkflowSettings;
 		pinData?: IPinData;
 	}) {
-		this.id = parameters.id;
+		this.id = parameters.id as string; // @tech_debt Ensure this is not optional
 		this.name = parameters.name;
 		this.nodeTypes = parameters.nodeTypes;
 		this.pinData = parameters.pinData;
@@ -117,7 +122,10 @@ export class Workflow {
 				// expression resolution also then when the unknown node
 				// does not get used.
 				continue;
-				// throw new Error(`The node type "${node.type}" of node "${node.name}" is not known.`);
+				// throw new ApplicationError(`Node with unknown node type`, {
+				// 	tags: { nodeType: node.type },
+				// 	extra: { node },
+				// });
 			}
 
 			// Add default values
@@ -207,12 +215,11 @@ export class Workflow {
 		for (const nodeName of Object.keys(this.nodes)) {
 			node = this.nodes[nodeName];
 
-			if (node.disabled === true) {
+			if (node?.disabled === true) {
 				// Deactivated nodes can not trigger a run so ignore
 				continue;
 			}
 
-			// eslint-disable-next-line @typescript-eslint/prefer-optional-chain
 			if (ignoreNodeTypes !== undefined && ignoreNodeTypes.includes(node.type)) {
 				continue;
 			}
@@ -272,7 +279,7 @@ export class Workflow {
 			nodeIssues = null;
 			node = this.nodes[nodeName];
 
-			if (node.disabled === true) {
+			if (node?.disabled === true) {
 				continue;
 			}
 
@@ -317,17 +324,19 @@ export class Workflow {
 			key = 'global';
 		} else if (type === 'node') {
 			if (node === undefined) {
-				throw new Error(
+				throw new ApplicationError(
 					'The request data of context type "node" the node parameter has to be set!',
 				);
 			}
 			key = `node:${node.name}`;
 		} else {
-			throw new Error(
-				`The context type "${type}" is not know. Only "global" and node" are supported!`,
-			);
+			throw new ApplicationError('Unknown context type. Only `global` and `node` are supported.', {
+				extra: { contextType: type },
+			});
 		}
 
+		if (this.testStaticData?.[key]) return this.testStaticData[key] as IDataObject;
+
 		if (this.staticData[key] === undefined) {
 			// Create it as ObservableObject that we can easily check if the data changed
 			// to know if the workflow with its data has to be saved afterwards or not.
@@ -337,6 +346,10 @@ export class Workflow {
 		return this.staticData[key] as IDataObject;
 	}
 
+	setTestStaticData(testStaticData: IDataObject) {
+		this.testStaticData = testStaticData;
+	}
+
 	/**
 	 * Returns all the trigger nodes in the workflow.
 	 *
@@ -369,7 +382,7 @@ export class Workflow {
 		for (const nodeName of Object.keys(this.nodes)) {
 			node = this.nodes[nodeName];
 
-			if (node.disabled === true) {
+			if (node?.disabled === true) {
 				continue;
 			}
 
@@ -405,21 +418,18 @@ export class Workflow {
 		return this.pinData ? this.pinData[nodeName] : undefined;
 	}
 
-	/**
-	 * Renames nodes in expressions
-	 *
-	 * @param {(NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[])} parameterValue The parameters to check for expressions
-	 * @param {string} currentName The current name of the node
-	 * @param {string} newName The new name
-	 */
-	renameNodeInExpressions(
+	renameNodeInParameterValue(
 		parameterValue: NodeParameterValueType,
 		currentName: string,
 		newName: string,
+		{ hasRenamableContent } = { hasRenamableContent: false },
 	): NodeParameterValueType {
 		if (typeof parameterValue !== 'object') {
 			// Reached the actual value
-			if (typeof parameterValue === 'string' && parameterValue.charAt(0) === '=') {
+			if (
+				typeof parameterValue === 'string' &&
+				(parameterValue.charAt(0) === '=' || hasRenamableContent)
+			) {
 				// Is expression so has to be rewritten
 				// To not run the "expensive" regex stuff when it is not needed
 				// make a simple check first if it really contains the the node-name
@@ -467,7 +477,13 @@ export class Workflow {
 			const returnArray: any[] = [];
 
 			for (const currentValue of parameterValue) {
-				returnArray.push(this.renameNodeInExpressions(currentValue, currentName, newName));
+				returnArray.push(
+					this.renameNodeInParameterValue(
+						currentValue as NodeParameterValueType,
+						currentName,
+						newName,
+					),
+				);
 			}
 
 			return returnArray;
@@ -477,11 +493,11 @@ export class Workflow {
 		const returnData: any = {};
 
 		for (const parameterName of Object.keys(parameterValue || {})) {
-			// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-			returnData[parameterName] = this.renameNodeInExpressions(
+			returnData[parameterName] = this.renameNodeInParameterValue(
 				parameterValue![parameterName as keyof typeof parameterValue],
 				currentName,
 				newName,
+				{ hasRenamableContent },
 			);
 		}
 
@@ -505,11 +521,20 @@ export class Workflow {
 		// Update the expressions which reference the node
 		// with its old name
 		for (const node of Object.values(this.nodes)) {
-			node.parameters = this.renameNodeInExpressions(
+			node.parameters = this.renameNodeInParameterValue(
 				node.parameters,
 				currentName,
 				newName,
 			) as INodeParameters;
+
+			if (NODES_WITH_RENAMABLE_CONTENT.has(node.type)) {
+				node.parameters.jsCode = this.renameNodeInParameterValue(
+					node.parameters.jsCode,
+					currentName,
+					newName,
+					{ hasRenamableContent: true },
+				);
+			}
 		}
 
 		// Change all source connections
@@ -551,11 +576,11 @@ export class Workflow {
 	/**
 	 * Finds the highest parent nodes of the node with the given name
 	 *
-	 * @param {string} [type='main']
+	 * @param {ConnectionTypes} [type='main']
 	 */
 	getHighestNode(
 		nodeName: string,
-		type = 'main',
+		type: ConnectionTypes = 'main',
 		nodeConnectionIndex?: number,
 		checkedNodes?: string[],
 	): string[] {
@@ -600,7 +625,7 @@ export class Workflow {
 			connectionsByIndex = this.connectionsByDestinationNode[nodeName][type][connectionIndex];
 			// eslint-disable-next-line @typescript-eslint/no-loop-func
 			connectionsByIndex.forEach((connection) => {
-				if (checkedNodes!.includes(connection.node)) {
+				if (checkedNodes.includes(connection.node)) {
 					// Node got checked already before
 					return;
 				}
@@ -633,17 +658,25 @@ export class Workflow {
 	 * @param {string} [type='main']
 	 * @param {*} [depth=-1]
 	 */
-	getChildNodes(nodeName: string, type = 'main', depth = -1): string[] {
+	getChildNodes(
+		nodeName: string,
+		type: ConnectionTypes | 'ALL' | 'ALL_NON_MAIN' = 'main',
+		depth = -1,
+	): string[] {
 		return this.getConnectedNodes(this.connectionsBySourceNode, nodeName, type, depth);
 	}
 
 	/**
 	 * Returns all the nodes before the given one
 	 *
-	 * @param {string} [type='main']
+	 * @param {ConnectionTypes} [type='main']
 	 * @param {*} [depth=-1]
 	 */
-	getParentNodes(nodeName: string, type = 'main', depth = -1): string[] {
+	getParentNodes(
+		nodeName: string,
+		type: ConnectionTypes | 'ALL' | 'ALL_NON_MAIN' = 'main',
+		depth = -1,
+	): string[] {
 		return this.getConnectedNodes(this.connectionsByDestinationNode, nodeName, type, depth);
 	}
 
@@ -651,15 +684,15 @@ export class Workflow {
 	 * Gets all the nodes which are connected nodes starting from
 	 * the given one
 	 *
-	 * @param {string} [type='main']
+	 * @param {ConnectionTypes} [type='main']
 	 * @param {*} [depth=-1]
 	 */
 	getConnectedNodes(
 		connections: IConnections,
 		nodeName: string,
-		type = 'main',
+		connectionType: ConnectionTypes | 'ALL' | 'ALL_NON_MAIN' = 'main',
 		depth = -1,
-		checkedNodes?: string[],
+		checkedNodesIncoming?: string[],
 	): string[] {
 		depth = depth === -1 ? -1 : depth;
 		const newDepth = depth === -1 ? depth : depth - 1;
@@ -673,57 +706,71 @@ export class Workflow {
 			return [];
 		}
 
-		if (!connections[nodeName].hasOwnProperty(type)) {
-			// Node does not have incoming connections of given type
-			return [];
-		}
-
-		checkedNodes = checkedNodes || [];
-
-		if (checkedNodes.includes(nodeName)) {
-			// Node got checked already before
-			return [];
+		let types: ConnectionTypes[];
+		if (connectionType === 'ALL') {
+			types = Object.keys(connections[nodeName]) as ConnectionTypes[];
+		} else if (connectionType === 'ALL_NON_MAIN') {
+			types = Object.keys(connections[nodeName]).filter(
+				(type) => type !== 'main',
+			) as ConnectionTypes[];
+		} else {
+			types = [connectionType];
 		}
 
-		checkedNodes.push(nodeName);
-
-		const returnNodes: string[] = [];
 		let addNodes: string[];
 		let nodeIndex: number;
 		let i: number;
 		let parentNodeName: string;
-		connections[nodeName][type].forEach((connectionsByIndex) => {
-			connectionsByIndex.forEach((connection) => {
-				if (checkedNodes!.includes(connection.node)) {
-					// Node got checked already before
-					return;
-				}
+		const returnNodes: string[] = [];
 
-				returnNodes.unshift(connection.node);
+		types.forEach((type) => {
+			if (!connections[nodeName].hasOwnProperty(type)) {
+				// Node does not have incoming connections of given type
+				return;
+			}
 
-				addNodes = this.getConnectedNodes(
-					connections,
-					connection.node,
-					type,
-					newDepth,
-					checkedNodes,
-				);
+			const checkedNodes = checkedNodesIncoming ? [...checkedNodesIncoming] : [];
+
+			if (checkedNodes.includes(nodeName)) {
+				// Node got checked already before
+				return;
+			}
 
-				for (i = addNodes.length; i--; i > 0) {
-					// Because nodes can have multiple parents it is possible that
-					// parts of the tree is parent of both and to not add nodes
-					// twice check first if they already got added before.
-					parentNodeName = addNodes[i];
-					nodeIndex = returnNodes.indexOf(parentNodeName);
-
-					if (nodeIndex !== -1) {
-						// Node got found before so remove it from current location
-						// that node-order stays correct
-						returnNodes.splice(nodeIndex, 1);
+			checkedNodes.push(nodeName);
+
+			connections[nodeName][type].forEach((connectionsByIndex) => {
+				connectionsByIndex.forEach((connection) => {
+					if (checkedNodes.includes(connection.node)) {
+						// Node got checked already before
+						return;
 					}
 
-					returnNodes.unshift(parentNodeName);
-				}
+					returnNodes.unshift(connection.node);
+
+					addNodes = this.getConnectedNodes(
+						connections,
+						connection.node,
+						connectionType,
+						newDepth,
+						checkedNodes,
+					);
+
+					for (i = addNodes.length; i--; i > 0) {
+						// Because nodes can have multiple parents it is possible that
+						// parts of the tree is parent of both and to not add nodes
+						// twice check first if they already got added before.
+						parentNodeName = addNodes[i];
+						nodeIndex = returnNodes.indexOf(parentNodeName);
+
+						if (nodeIndex !== -1) {
+							// Node got found before so remove it from current location
+							// that node-order stays correct
+							returnNodes.splice(nodeIndex, 1);
+						}
+
+						returnNodes.unshift(parentNodeName);
+					}
+				});
 			});
 		});
 
@@ -749,7 +796,7 @@ export class Workflow {
 	searchNodesBFS(connections: IConnections, sourceNode: string, maxDepth = -1): IConnectedNode[] {
 		const returnConns: IConnectedNode[] = [];
 
-		const type = 'main';
+		const type: ConnectionTypes = 'main';
 		let queue: IConnectedNode[] = [];
 		queue.push({
 			name: sourceNode,
@@ -803,6 +850,47 @@ export class Workflow {
 		return returnConns;
 	}
 
+	getParentMainInputNode(node: INode): INode {
+		if (node) {
+			const nodeType = this.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
+			const outputs = NodeHelpers.getNodeOutputs(this, node, nodeType.description);
+
+			if (
+				!!outputs.find(
+					(output) =>
+						((output as INodeOutputConfiguration)?.type ?? output) !== NodeConnectionType.Main,
+				)
+			) {
+				// Get the first node which is connected to a non-main output
+				const nonMainNodesConnected = outputs?.reduce((acc, outputName) => {
+					const parentNodes = this.getChildNodes(
+						node.name,
+						(outputName as INodeOutputConfiguration)?.type ?? outputName,
+					);
+					if (parentNodes.length > 0) {
+						acc.push(...parentNodes);
+					}
+					return acc;
+				}, [] as string[]);
+
+				if (nonMainNodesConnected.length) {
+					const returnNode = this.getNode(nonMainNodesConnected[0]);
+					if (returnNode === null) {
+						// This should theoretically never happen as the node is connected
+						// but who knows and it makes TS happy
+						throw new ApplicationError(`Node "${nonMainNodesConnected[0]}" not found`);
+					}
+
+					// The chain of non-main nodes is potentially not finished yet so
+					// keep on going
+					return this.getParentMainInputNode(returnNode);
+				}
+			}
+		}
+
+		return node;
+	}
+
 	/**
 	 * Returns via which output of the parent-node and index the current node
 	 * they are connected
@@ -815,7 +903,7 @@ export class Workflow {
 	getNodeConnectionIndexes(
 		nodeName: string,
 		parentNodeName: string,
-		type = 'main',
+		type: ConnectionTypes = 'main',
 		depth = -1,
 		checkedNodes?: string[],
 	): INodeConnection | undefined {
@@ -899,35 +987,33 @@ export class Workflow {
 		for (const nodeName of nodeNames) {
 			node = this.nodes[nodeName];
 
-			if (nodeNames.length === 1 && !node.disabled) {
+			if (nodeNames.length === 1 && !node?.disabled) {
 				return node;
 			}
 
 			nodeType = this.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
 
+			// TODO: Identify later differently
+			if (nodeType.description.name === MANUAL_CHAT_TRIGGER_LANGCHAIN_NODE_TYPE) {
+				continue;
+			}
+
 			if (nodeType && (nodeType.trigger !== undefined || nodeType.poll !== undefined)) {
-				if (node.disabled === true) {
+				if (node?.disabled === true) {
 					continue;
 				}
 				return node;
 			}
 		}
 
-		const startingNodeTypes = [
-			'n8n-nodes-base.manualTrigger',
-			'n8n-nodes-base.executeWorkflowTrigger',
-			'n8n-nodes-base.errorTrigger',
-			'n8n-nodes-base.start',
-		];
-
 		const sortedNodeNames = Object.values(this.nodes)
-			.sort((a, b) => startingNodeTypes.indexOf(a.type) - startingNodeTypes.indexOf(b.type))
+			.sort((a, b) => STARTING_NODE_TYPES.indexOf(a.type) - STARTING_NODE_TYPES.indexOf(b.type))
 			.map((n) => n.name);
 
 		for (const nodeName of sortedNodeNames) {
 			node = this.nodes[nodeName];
-			if (startingNodeTypes.includes(node.type)) {
-				if (node.disabled === true) {
+			if (STARTING_NODE_TYPES.includes(node.type)) {
+				if (node?.disabled === true) {
 					continue;
 				}
 				return node;
@@ -966,20 +1052,45 @@ export class Workflow {
 		return this.__getStartNode(Object.keys(this.nodes));
 	}
 
-	/**
-	 * Executes the Webhooks method of the node
-	 *
-	 * @param {WebhookSetupMethodNames} method The name of the method to execute
-	 */
-	async runWebhookMethod(
+	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,
-		isTest?: boolean,
 	): Promise<boolean | undefined> {
-		const node = this.getNode(webhookData.node) as INode;
+		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];
@@ -991,11 +1102,10 @@ export class Workflow {
 			webhookData.workflowExecuteAdditionalData,
 			mode,
 			activation,
-			isTest,
 			webhookData,
 		);
 
-		return webhookFn.call(thisArgs);
+		return await webhookFn.call(thisArgs);
 	}
 
 	/**
@@ -1015,13 +1125,17 @@ export class Workflow {
 		const nodeType = this.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
 
 		if (nodeType === undefined) {
-			throw new Error(`The node type "${node.type}" of node "${node.name}" is not known.`);
+			throw new ApplicationError('Node with unknown node type', {
+				extra: { nodeName: node.name },
+				tags: { nodeType: node.type },
+			});
 		}
 
 		if (!nodeType.trigger) {
-			throw new Error(
-				`The node type "${node.type}" of node "${node.name}" does not have a trigger function defined.`,
-			);
+			throw new ApplicationError('Node type does not have a trigger function defined', {
+				extra: { nodeName: node.name },
+				tags: { nodeType: node.type },
+			});
 		}
 
 		if (mode === 'manual') {
@@ -1076,7 +1190,7 @@ export class Workflow {
 			return triggerResponse;
 		}
 		// In all other modes simply start the trigger
-		return nodeType.trigger.call(triggerFunctions);
+		return await nodeType.trigger.call(triggerFunctions);
 	}
 
 	/**
@@ -1092,16 +1206,20 @@ export class Workflow {
 		const nodeType = this.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
 
 		if (nodeType === undefined) {
-			throw new Error(`The node type "${node.type}" of node "${node.name}" is not known.`);
+			throw new ApplicationError('Node with unknown node type', {
+				extra: { nodeName: node.name },
+				tags: { nodeType: node.type },
+			});
 		}
 
 		if (!nodeType.poll) {
-			throw new Error(
-				`The node type "${node.type}" of node "${node.name}" does not have a poll function defined.`,
-			);
+			throw new ApplicationError('Node type does not have a poll function defined', {
+				extra: { nodeName: node.name },
+				tags: { nodeType: node.type },
+			});
 		}
 
-		return nodeType.poll.call(pollFunctions);
+		return await nodeType.poll.call(pollFunctions);
 	}
 
 	/**
@@ -1118,25 +1236,35 @@ export class Workflow {
 	): Promise<IWebhookResponseData> {
 		const nodeType = this.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
 		if (nodeType === undefined) {
-			throw new Error(`The type of the webhook node "${node.name}" is not known.`);
+			throw new ApplicationError('Unknown node type of webhook node', {
+				extra: { nodeName: node.name },
+			});
 		} else if (nodeType.webhook === undefined) {
-			throw new Error(`The node "${node.name}" does not have any webhooks defined.`);
+			throw new ApplicationError('Node does not have any webhooks defined', {
+				extra: { nodeName: node.name },
+			});
 		}
 
-		const thisArgs = nodeExecuteFunctions.getExecuteWebhookFunctions(
+		const closeFunctions: CloseFunction[] = [];
+
+		const context = nodeExecuteFunctions.getExecuteWebhookFunctions(
 			this,
 			node,
 			additionalData,
 			mode,
 			webhookData,
+			closeFunctions,
 		);
-		return nodeType.webhook.call(thisArgs);
+		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,
@@ -1144,11 +1272,12 @@ export class Workflow {
 		additionalData: IWorkflowExecuteAdditionalData,
 		nodeExecuteFunctions: INodeExecuteFunctions,
 		mode: WorkflowExecuteMode,
+		abortSignal?: AbortSignal,
 	): Promise<IRunNodeResponse> {
 		const { node } = executionData;
 		let inputData = executionData.data;
 
-		if (node.disabled === true) {
+		if (node?.disabled === true) {
 			// If node is disabled simply pass the data through
 			// return NodeRunHelpers.
 			if (inputData.hasOwnProperty('main') && inputData.main.length > 0) {
@@ -1163,24 +1292,34 @@ export class Workflow {
 
 		const nodeType = this.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
 		if (nodeType === undefined) {
-			throw new Error(`Node type "${node.type}" is not known so can not run it!`);
+			throw new ApplicationError('Node type is unknown so cannot run it', {
+				tags: { nodeType: node.type },
+			});
 		}
 
 		let connectionInputData: INodeExecutionData[] = [];
-		if (
-			nodeType.execute ||
-			nodeType.executeSingle ||
-			(!nodeType.poll && !nodeType.trigger && !nodeType.webhook)
-		) {
-			// Only stop if first input is empty for execute & executeSingle runs. For all others run anyways
+		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.hasOwnProperty('main') && inputData.main.length > 0) {
-				// We always use the data of main input and the first input for executeSingle
+			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 };
@@ -1194,6 +1333,12 @@ export class Workflow {
 			// 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;
@@ -1212,36 +1357,9 @@ export class Workflow {
 			inputData = newInputData;
 		}
 
-		if (nodeType.executeSingle) {
-			const returnPromises: Array<Promise<INodeExecutionData>> = [];
-
-			for (let itemIndex = 0; itemIndex < connectionInputData.length; itemIndex++) {
-				const thisArgs = nodeExecuteFunctions.getExecuteSingleFunctions(
-					this,
-					runExecutionData,
-					runIndex,
-					connectionInputData,
-					inputData,
-					node,
-					itemIndex,
-					additionalData,
-					executionData,
-					mode,
-				);
-
-				returnPromises.push(nodeType.executeSingle.call(thisArgs));
-			}
-
-			if (returnPromises.length === 0) {
-				return { data: null };
-			}
-
-			const promiseResults = await Promise.all(returnPromises);
-			if (promiseResults) {
-				return { data: [promiseResults] };
-			}
-		} else if (nodeType.execute) {
-			const thisArgs = nodeExecuteFunctions.getExecuteFunctions(
+		if (nodeType.execute) {
+			const closeFunctions: CloseFunction[] = [];
+			const context = nodeExecuteFunctions.getExecuteFunctions(
 				this,
 				runExecutionData,
 				runIndex,
@@ -1251,8 +1369,32 @@ export class Workflow {
 				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()),
 			);
-			return { data: await nodeType.execute.call(thisArgs) };
+
+			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
@@ -1329,11 +1471,11 @@ export class Workflow {
 					nodeType,
 					executionData,
 					nodeExecuteFunctions,
+					undefined,
+					abortSignal,
 				),
 			};
 		}
-
-		return { data: null };
 	}
 }
 
diff --git a/packages/workflow/src/WorkflowActivationError.ts b/packages/workflow/src/WorkflowActivationError.ts
deleted file mode 100644
index dd1ba2c42223c..0000000000000
--- a/packages/workflow/src/WorkflowActivationError.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import type { INode } from './Interfaces';
-import { ExecutionBaseError } from './NodeErrors';
-
-interface WorkflowActivationErrorOptions {
-	cause?: Error;
-	node?: INode;
-}
-
-/**
- * Class for instantiating an workflow activation error
- */
-export class WorkflowActivationError extends ExecutionBaseError {
-	node: INode | undefined;
-
-	constructor(message: string, { cause, node }: WorkflowActivationErrorOptions) {
-		let error = cause as Error;
-		if (cause instanceof ExecutionBaseError) {
-			error = new Error(cause.message);
-			error.constructor = cause.constructor;
-			error.name = cause.name;
-			error.stack = cause.stack;
-		}
-		super(message, { cause: error });
-		this.node = node;
-		this.message = message;
-	}
-}
diff --git a/packages/workflow/src/WorkflowDataProxy.ts b/packages/workflow/src/WorkflowDataProxy.ts
index c6466ae41e8a1..e8a1091783fdf 100644
--- a/packages/workflow/src/WorkflowDataProxy.ts
+++ b/packages/workflow/src/WorkflowDataProxy.ts
@@ -1,11 +1,6 @@
 /* eslint-disable @typescript-eslint/prefer-nullish-coalescing */
-/* eslint-disable @typescript-eslint/no-unused-vars */
-/* eslint-disable no-restricted-syntax */
-/* eslint-disable no-param-reassign */
 /* eslint-disable @typescript-eslint/no-this-alias */
 /* eslint-disable @typescript-eslint/no-unsafe-return */
-/* eslint-disable no-prototype-builtins */
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
 
 import { DateTime, Duration, Interval, Settings } from 'luxon';
 import * as jmespath from 'jmespath';
@@ -27,9 +22,13 @@ import type {
 	ProxyInput,
 } from './Interfaces';
 import * as NodeHelpers from './NodeHelpers';
-import { ExpressionError } from './ExpressionError';
+import { ExpressionError, type ExpressionErrorOptions } from './errors/expression.error';
 import type { Workflow } from './Workflow';
 import { augmentArray, augmentObject } from './AugmentObject';
+import { deepCopy } from './utils';
+import { getGlobalState } from './GlobalState';
+import { ApplicationError } from './errors/application.error';
+import { SCRIPTING_NODE_TYPES } from './Constants';
 
 export function isResourceLocatorValue(value: unknown): value is INodeParameterResourceLocator {
 	return Boolean(
@@ -37,12 +36,6 @@ export function isResourceLocatorValue(value: unknown): value is INodeParameterR
 	);
 }
 
-const SCRIPTING_NODE_TYPES = [
-	'n8n-nodes-base.function',
-	'n8n-nodes-base.functionItem',
-	'n8n-nodes-base.code',
-];
-
 const isScriptingNode = (nodeName: string, workflow: Workflow) => {
 	const node = workflow.getNode(nodeName);
 
@@ -50,72 +43,39 @@ const isScriptingNode = (nodeName: string, workflow: Workflow) => {
 };
 
 export class WorkflowDataProxy {
-	private workflow: Workflow;
-
 	private runExecutionData: IRunExecutionData | null;
 
-	private defaultReturnRunIndex: number;
-
-	private runIndex: number;
-
-	private itemIndex: number;
-
-	private activeNodeName: string;
-
 	private connectionInputData: INodeExecutionData[];
 
-	private siblingParameters: INodeParameters;
-
-	private mode: WorkflowExecuteMode;
-
-	private selfData: IDataObject;
-
-	private additionalKeys: IWorkflowDataProxyAdditionalKeys;
-
-	private executeData: IExecuteData | undefined;
-
-	private defaultTimezone: string;
-
 	private timezone: string;
 
+	// TODO: Clean that up at some point and move all the options into an options object
 	constructor(
-		workflow: Workflow,
+		private workflow: Workflow,
 		runExecutionData: IRunExecutionData | null,
-		runIndex: number,
-		itemIndex: number,
-		activeNodeName: string,
+		private runIndex: number,
+		private itemIndex: number,
+		private activeNodeName: string,
 		connectionInputData: INodeExecutionData[],
-		siblingParameters: INodeParameters,
-		mode: WorkflowExecuteMode,
-		defaultTimezone: string,
-		additionalKeys: IWorkflowDataProxyAdditionalKeys,
-		executeData?: IExecuteData,
-		defaultReturnRunIndex = -1,
-		selfData = {},
+		private siblingParameters: INodeParameters,
+		private mode: WorkflowExecuteMode,
+		private additionalKeys: IWorkflowDataProxyAdditionalKeys,
+		private executeData?: IExecuteData,
+		private defaultReturnRunIndex = -1,
+		private selfData: IDataObject = {},
+		private contextNodeName: string = activeNodeName,
 	) {
-		this.activeNodeName = activeNodeName;
-		this.workflow = workflow;
-
-		this.runExecutionData = isScriptingNode(activeNodeName, workflow)
+		this.runExecutionData = isScriptingNode(this.contextNodeName, workflow)
 			? runExecutionData !== null
 				? augmentObject(runExecutionData)
 				: null
 			: runExecutionData;
 
-		this.connectionInputData = isScriptingNode(activeNodeName, workflow)
+		this.connectionInputData = isScriptingNode(this.contextNodeName, workflow)
 			? augmentArray(connectionInputData)
 			: connectionInputData;
 
-		this.defaultReturnRunIndex = defaultReturnRunIndex;
-		this.runIndex = runIndex;
-		this.itemIndex = itemIndex;
-		this.siblingParameters = siblingParameters;
-		this.mode = mode;
-		this.defaultTimezone = defaultTimezone;
-		this.timezone = workflow.settings?.timezone ?? defaultTimezone;
-		this.selfData = selfData;
-		this.additionalKeys = additionalKeys;
-		this.executeData = executeData;
+		this.timezone = workflow.settings?.timezone ?? getGlobalState().defaultTimezone;
 		Settings.defaultZone = this.timezone;
 	}
 
@@ -139,6 +99,7 @@ export class WorkflowDataProxy {
 				{
 					runIndex: that.runIndex,
 					itemIndex: that.itemIndex,
+					type: 'no_execution_data',
 				},
 			);
 		}
@@ -146,6 +107,7 @@ export class WorkflowDataProxy {
 		return new Proxy(
 			{},
 			{
+				has: () => true,
 				ownKeys(target) {
 					if (Reflect.ownKeys(target).length === 0) {
 						// Target object did not get set yet
@@ -154,15 +116,15 @@ export class WorkflowDataProxy {
 
 					return Reflect.ownKeys(target);
 				},
-				getOwnPropertyDescriptor(k) {
+				getOwnPropertyDescriptor() {
 					return {
 						enumerable: true,
 						configurable: true,
 					};
 				},
-				get(target, name, receiver) {
+				get(_, name) {
 					if (name === 'isProxy') return true;
-					// eslint-disable-next-line no-param-reassign
+
 					name = name.toString();
 					const contextData = NodeHelpers.getContext(that.runExecutionData!, 'node', node);
 
@@ -178,11 +140,12 @@ export class WorkflowDataProxy {
 		return new Proxy(
 			{},
 			{
+				has: () => true,
 				ownKeys(target) {
 					return Reflect.ownKeys(target);
 				},
-				// eslint-disable-next-line @typescript-eslint/no-unused-vars
-				get(target, name, receiver) {
+
+				get(_, name) {
 					if (name === 'isProxy') return true;
 					name = name.toString();
 					return that.selfData[name];
@@ -201,25 +164,32 @@ export class WorkflowDataProxy {
 		const that = this;
 		const node = this.workflow.nodes[nodeName];
 
-		return new Proxy(node.parameters, {
+		// `node` is `undefined` only in expressions in credentials
+
+		return new Proxy(node?.parameters ?? {}, {
+			has: () => true,
 			ownKeys(target) {
 				return Reflect.ownKeys(target);
 			},
-			getOwnPropertyDescriptor(k) {
+			getOwnPropertyDescriptor() {
 				return {
 					enumerable: true,
 					configurable: true,
 				};
 			},
-			get(target, name, receiver) {
+			get(target, name) {
 				if (name === 'isProxy') return true;
+				if (name === 'toJSON') return () => deepCopy(target);
+
 				name = name.toString();
 
 				let returnValue: NodeParameterValueType;
 				if (name[0] === '&') {
 					const key = name.slice(1);
 					if (!that.siblingParameters.hasOwnProperty(key)) {
-						throw new Error(`Could not find sibling parameter "${key}" on node "${nodeName}"`);
+						throw new ApplicationError('Could not find sibling parameter on node', {
+							extra: { nodeName, parameter: key },
+						});
 					}
 					returnValue = that.siblingParameters[key];
 				} else {
@@ -231,6 +201,9 @@ export class WorkflowDataProxy {
 					returnValue = node.parameters[name];
 				}
 
+				// Avoid recursion
+				if (returnValue === `={{ $parameter.${name} }}`) return undefined;
+
 				if (isResourceLocatorValue(returnValue)) {
 					if (returnValue.__regex && typeof returnValue.value === 'string') {
 						const expr = new RegExp(returnValue.__regex);
@@ -255,9 +228,11 @@ export class WorkflowDataProxy {
 						that.activeNodeName,
 						that.connectionInputData,
 						that.mode,
-						that.timezone,
 						that.additionalKeys,
 						that.executeData,
+						false,
+						{},
+						that.contextNodeName,
 					);
 				}
 
@@ -297,16 +272,25 @@ export class WorkflowDataProxy {
 				);
 			}
 
-			if (!that.runExecutionData.resultData.runData.hasOwnProperty(nodeName)) {
-				if (that.workflow.getNode(nodeName)) {
-					throw new ExpressionError(`no data, execute "${nodeName}" node first`, {
-						runIndex: that.runIndex,
-						itemIndex: that.itemIndex,
-					});
-				}
-				throw new ExpressionError(`"${nodeName}" node doesn't exist`, {
+			if (!that.workflow.getNode(nodeName)) {
+				throw new ExpressionError("Referenced node doesn't exist", {
 					runIndex: that.runIndex,
 					itemIndex: that.itemIndex,
+					nodeCause: nodeName,
+					descriptionKey: 'nodeNotFound',
+				});
+			}
+
+			if (
+				!that.runExecutionData.resultData.runData.hasOwnProperty(nodeName) &&
+				!that.workflow.getPinDataOfNode(nodeName)
+			) {
+				throw new ExpressionError('Referenced node is unexecuted', {
+					runIndex: that.runIndex,
+					itemIndex: that.itemIndex,
+					type: 'no_node_execution_data',
+					descriptionKey: 'noNodeExecutionData',
+					nodeCause: nodeName,
 				});
 			}
 
@@ -323,9 +307,9 @@ export class WorkflowDataProxy {
 
 			const taskData = that.runExecutionData.resultData.runData[nodeName][runIndex].data!;
 
-			if (taskData.main === null || !taskData.main.length || taskData.main[0] === null) {
-				// throw new Error(`No data found for item-index: "${itemIndex}"`);
-				throw new ExpressionError('No data found from "main" input.', {
+			if (!taskData.main?.length || taskData.main[0] === null) {
+				// throw new ApplicationError('No data found for item-index', { extra: { itemIndex } });
+				throw new ExpressionError('No data found from `main` input', {
 					runIndex: that.runIndex,
 					itemIndex: that.itemIndex,
 				});
@@ -336,13 +320,13 @@ export class WorkflowDataProxy {
 			// (example "IF" node. If node is connected to "true" or to "false" output)
 			if (outputIndex === undefined) {
 				const nodeConnection = that.workflow.getNodeConnectionIndexes(
-					that.activeNodeName,
+					that.contextNodeName,
 					nodeName,
 					'main',
 				);
 
 				if (nodeConnection === undefined) {
-					throw new ExpressionError(`connect "${that.activeNodeName}" to "${nodeName}"`, {
+					throw new ExpressionError(`connect "${that.contextNodeName}" to "${nodeName}"`, {
 						runIndex: that.runIndex,
 						itemIndex: that.itemIndex,
 					});
@@ -384,16 +368,43 @@ export class WorkflowDataProxy {
 		return new Proxy(
 			{ binary: undefined, data: undefined, json: undefined },
 			{
+				has: () => true,
 				get(target, name, receiver) {
 					if (name === 'isProxy') return true;
 					name = name.toString();
 
 					if (!node) {
-						throw new ExpressionError(`"${nodeName}" node doesn't exist`);
+						throw new ExpressionError("Referenced node doesn't exist", {
+							runIndex: that.runIndex,
+							itemIndex: that.itemIndex,
+							nodeCause: nodeName,
+							descriptionKey: 'nodeNotFound',
+						});
 					}
 
 					if (['binary', 'data', 'json'].includes(name)) {
 						const executionData = that.getNodeExecutionData(nodeName, shortSyntax, undefined);
+
+						if (executionData.length === 0) {
+							if (that.workflow.getParentNodes(nodeName).length === 0) {
+								throw new ExpressionError('No execution data available', {
+									messageTemplate:
+										'No execution data available to expression under ‘%%PARAMETER%%’',
+									descriptionKey: 'noInputConnection',
+									nodeCause: nodeName,
+									runIndex: that.runIndex,
+									itemIndex: that.itemIndex,
+									type: 'no_input_connection',
+								});
+							}
+
+							throw new ExpressionError('No execution data available', {
+								runIndex: that.runIndex,
+								itemIndex: that.itemIndex,
+								type: 'no_execution_data',
+							});
+						}
+
 						if (executionData.length <= that.itemIndex) {
 							throw new ExpressionError(`No data found for item-index: "${that.itemIndex}"`, {
 								runIndex: that.runIndex,
@@ -421,7 +432,7 @@ export class WorkflowDataProxy {
 								for (const propertyName in binaryData) {
 									if (propertyName === 'data') {
 										// Skip the data property
-										// eslint-disable-next-line no-continue
+
 										continue;
 									}
 									(returnData[keyName] as IDataObject)[propertyName] = binaryData[propertyName];
@@ -436,10 +447,7 @@ export class WorkflowDataProxy {
 						// Get node parameter data
 						return that.nodeParameterGetter(nodeName);
 					} else if (name === 'runIndex') {
-						if (
-							that.runExecutionData === null ||
-							!that.runExecutionData.resultData.runData[nodeName]
-						) {
+						if (!that.runExecutionData?.resultData.runData[nodeName]) {
 							return -1;
 						}
 						return that.runExecutionData.resultData.runData[nodeName].length - 1;
@@ -461,14 +469,14 @@ export class WorkflowDataProxy {
 		return new Proxy(
 			{},
 			{
-				get(target, name, receiver) {
+				has: () => true,
+				get(_, name) {
 					if (name === 'isProxy') return true;
 
 					if (typeof process === 'undefined') {
 						throw new ExpressionError('not accessible via UI, please run node', {
 							runIndex: that.runIndex,
 							itemIndex: that.itemIndex,
-							failExecution: true,
 						});
 					}
 					if (process.env.N8N_BLOCK_ENV_ACCESS_IN_NODE === 'true') {
@@ -477,7 +485,6 @@ export class WorkflowDataProxy {
 								'If you need access please contact the administrator to remove the environment variable ‘N8N_BLOCK_ENV_ACCESS_IN_NODE‘',
 							runIndex: that.runIndex,
 							itemIndex: that.itemIndex,
-							failExecution: true,
 						});
 					}
 					return process.env[name.toString()];
@@ -493,10 +500,11 @@ export class WorkflowDataProxy {
 		return new Proxy(
 			{},
 			{
-				ownKeys(target) {
+				has: () => true,
+				ownKeys() {
 					return allowedValues;
 				},
-				getOwnPropertyDescriptor(k) {
+				getOwnPropertyDescriptor() {
 					return {
 						enumerable: true,
 						configurable: true,
@@ -540,10 +548,11 @@ export class WorkflowDataProxy {
 		return new Proxy(
 			{},
 			{
-				ownKeys(target) {
+				has: () => true,
+				ownKeys() {
 					return allowedValues;
 				},
-				getOwnPropertyDescriptor(k) {
+				getOwnPropertyDescriptor() {
 					return {
 						enumerable: true,
 						configurable: true,
@@ -560,7 +569,6 @@ export class WorkflowDataProxy {
 								description: 'Please save the workflow first to use $workflow',
 								runIndex: that.runIndex,
 								itemIndex: that.itemIndex,
-								failExecution: true,
 							});
 						}
 
@@ -583,17 +591,18 @@ export class WorkflowDataProxy {
 		return new Proxy(
 			{},
 			{
-				get(target, name, receiver) {
+				has: () => true,
+				get(_, name) {
 					if (name === 'isProxy') return true;
 
 					const nodeName = name.toString();
 
 					if (that.workflow.getNode(nodeName) === null) {
-						throw new ExpressionError(`"${nodeName}" node doesn't exist`, {
+						throw new ExpressionError("Referenced node doesn't exist", {
 							runIndex: that.runIndex,
 							itemIndex: that.itemIndex,
-							// TODO: re-enable this for v1.0.0 release
-							// failExecution: true,
+							nodeCause: nodeName,
+							descriptionKey: 'nodeNotFound',
 						});
 					}
 
@@ -630,7 +639,6 @@ export class WorkflowDataProxy {
 				throw new ExpressionError('expected two arguments (Object, string) for this function', {
 					runIndex: that.runIndex,
 					itemIndex: that.itemIndex,
-					clientOnly: true,
 				});
 			}
 
@@ -642,22 +650,13 @@ export class WorkflowDataProxy {
 
 		const createExpressionError = (
 			message: string,
-			context?: {
-				causeDetailed?: string;
-				description?: string;
-				descriptionTemplate?: string;
-				functionality?: 'pairedItem';
+			context?: ExpressionErrorOptions & {
+				moreInfoLink?: boolean;
 				functionOverrides?: {
 					// Custom data to display for Function-Nodes
 					message?: string;
 					description?: string;
 				};
-				itemIndex?: number;
-				messageTemplate?: string;
-				moreInfoLink?: boolean;
-				nodeCause?: string;
-				runIndex?: number;
-				type?: string;
 			},
 		) => {
 			if (isScriptingNode(that.activeNodeName, that.workflow) && context?.functionOverrides) {
@@ -678,10 +677,9 @@ export class WorkflowDataProxy {
 					if (!context) {
 						context = {};
 					}
-					message = `‘Node ${nodeName}‘ must be unpinned to execute`;
+					message = `Unpin '${nodeName}' to execute`;
 					context.messageTemplate = undefined;
-					context.description = `To fetch the data for the expression, you must unpin the node <strong>'${nodeName}'</strong> and execute the workflow again.`;
-					context.descriptionTemplate = `To fetch the data for the expression under '%%PARAMETER%%', you must unpin the node <strong>'${nodeName}'</strong> and execute the workflow again.`;
+					context.descriptionKey = 'pairedItemPinned';
 				}
 
 				if (context.moreInfoLink && (pinData || isScriptingNode(nodeName, that.workflow))) {
@@ -689,24 +687,66 @@ export class WorkflowDataProxy {
 						' <a target="_blank" href="https://docs.n8n.io/data/data-mapping/data-item-linking/item-linking-errors/">More info</a>';
 
 					context.description += moreInfoLink;
-					context.descriptionTemplate += moreInfoLink;
+					if (context.descriptionTemplate) context.descriptionTemplate += moreInfoLink;
 				}
 			}
 
 			return new ExpressionError(message, {
 				runIndex: that.runIndex,
 				itemIndex: that.itemIndex,
-				failExecution: true,
 				...context,
 			});
 		};
 
+		const createInvalidPairedItemError = ({ nodeName }: { nodeName: string }) => {
+			return createExpressionError("Can't get data for expression", {
+				messageTemplate: 'Expression info invalid',
+				functionality: 'pairedItem',
+				functionOverrides: {
+					message: "Can't get data",
+				},
+				nodeCause: nodeName,
+				descriptionKey: 'pairedItemInvalidInfo',
+				type: 'paired_item_invalid_info',
+			});
+		};
+
+		const createMissingPairedItemError = (nodeCause: string) => {
+			return createExpressionError("Can't get data for expression", {
+				messageTemplate: 'Info for expression missing from previous node',
+				functionality: 'pairedItem',
+				functionOverrides: {
+					message: "Can't get data",
+				},
+				nodeCause,
+				descriptionKey: isScriptingNode(nodeCause, that.workflow)
+					? 'pairedItemNoInfoCodeNode'
+					: 'pairedItemNoInfo',
+				causeDetailed: `Missing pairedItem data (node '${nodeCause}' probably didn't supply it)`,
+				type: 'paired_item_no_info',
+			});
+		};
+
+		const createNoConnectionError = (nodeCause: string) => {
+			return createExpressionError('Invalid expression', {
+				messageTemplate: 'No path back to referenced node',
+				functionality: 'pairedItem',
+				descriptionKey: isScriptingNode(nodeCause, that.workflow)
+					? 'pairedItemNoConnectionCodeNode'
+					: 'pairedItemNoConnection',
+				type: 'paired_item_no_connection',
+				moreInfoLink: true,
+				nodeCause,
+			});
+		};
+
+		// eslint-disable-next-line complexity
 		const getPairedItem = (
 			destinationNodeName: string,
 			incomingSourceData: ISourceData | null,
 			pairedItem: IPairedItemData,
 		): INodeExecutionData | null => {
-			let taskData: ITaskData;
+			let taskData: ITaskData | undefined;
 
 			let sourceData: ISourceData | null = incomingSourceData;
 
@@ -725,13 +765,12 @@ export class WorkflowDataProxy {
 			let nodeBeforeLast: string | undefined;
 
 			while (sourceData !== null && destinationNodeName !== sourceData.previousNode) {
+				const runIndex = sourceData?.previousNodeRun || 0;
+				const previousNodeOutput = sourceData.previousNodeOutput || 0;
 				taskData =
-					that.runExecutionData!.resultData.runData[sourceData.previousNode][
-						sourceData?.previousNodeRun || 0
-					];
+					that.runExecutionData?.resultData?.runData?.[sourceData.previousNode]?.[runIndex];
 
-				const previousNodeOutput = sourceData.previousNodeOutput || 0;
-				if (previousNodeOutput >= taskData.data!.main.length) {
+				if (taskData?.data?.main && previousNodeOutput >= taskData.data.main.length) {
 					throw createExpressionError('Can’t get data for expression', {
 						messageTemplate: 'Can’t get data for expression under ‘%%PARAMETER%%’ field',
 						functionOverrides: {
@@ -744,44 +783,21 @@ export class WorkflowDataProxy {
 					});
 				}
 
-				if (pairedItem.item >= taskData.data!.main[previousNodeOutput]!.length) {
-					throw createExpressionError('Can’t get data for expression', {
-						messageTemplate: 'Can’t get data for expression under ‘%%PARAMETER%%’ field',
-						functionality: 'pairedItem',
-						functionOverrides: {
-							message: 'Can’t get data',
-						},
-						nodeCause: nodeBeforeLast,
-						description: `In node ‘<strong>${nodeBeforeLast!}</strong>’, output item ${
-							currentPairedItem.item || 0
-						} ${
-							sourceData.previousNodeRun
-								? `of run ${(sourceData.previousNodeRun || 0).toString()} `
-								: ''
-						}points to an input item on node ‘<strong>${
-							sourceData.previousNode
-						}</strong>‘ that doesn’t exist.`,
-						type: 'invalid pairing info',
-						moreInfoLink: true,
+				const previousNodeOutputData =
+					taskData?.data?.main?.[previousNodeOutput] ??
+					(that.workflow.getPinDataOfNode(sourceData.previousNode) as INodeExecutionData[]);
+				const source = taskData?.source ?? [];
+
+				if (pairedItem.item >= previousNodeOutputData.length) {
+					throw createInvalidPairedItemError({
+						nodeName: sourceData.previousNode,
 					});
 				}
 
-				const itemPreviousNode: INodeExecutionData =
-					taskData.data!.main[previousNodeOutput]![pairedItem.item];
+				const itemPreviousNode: INodeExecutionData = previousNodeOutputData[pairedItem.item];
 
 				if (itemPreviousNode.pairedItem === undefined) {
-					throw createExpressionError('Can’t get data for expression', {
-						messageTemplate: 'Can’t get data for expression under ‘%%PARAMETER%%’ field',
-						functionality: 'pairedItem',
-						functionOverrides: {
-							message: 'Can’t get data',
-						},
-						nodeCause: sourceData.previousNode,
-						description: `To fetch the data from other nodes that this expression needs, more information is needed from the node ‘<strong>${sourceData.previousNode}</strong>’`,
-						causeDetailed: `Missing pairedItem data (node ‘${sourceData.previousNode}’ probably didn’t supply it)`,
-						type: 'no pairing info',
-						moreInfoLink: true,
-					});
+					throw createMissingPairedItemError(sourceData.previousNode);
 				}
 
 				if (Array.isArray(itemPreviousNode.pairedItem)) {
@@ -791,13 +807,13 @@ export class WorkflowDataProxy {
 						.map((item) => {
 							try {
 								const itemInput = item.input || 0;
-								if (itemInput >= taskData.source.length) {
+								if (itemInput >= source.length) {
 									// `Could not resolve pairedItem as the defined node input '${itemInput}' does not exist on node '${sourceData!.previousNode}'.`
 									// Actual error does not matter as it gets caught below and `null` will be returned
-									throw new Error('Not found');
+									throw new ApplicationError('Not found');
 								}
 
-								return getPairedItem(destinationNodeName, taskData.source[itemInput], item);
+								return getPairedItem(destinationNodeName, source[itemInput], item);
 							} catch (error) {
 								// Means pairedItem could not be found
 								return null;
@@ -806,15 +822,26 @@ export class WorkflowDataProxy {
 						.filter((result) => result !== null);
 
 					if (results.length !== 1) {
+						// Check if the results are all the same
+						const firstResult = results[0];
+						if (results.every((result) => result === firstResult)) {
+							// All results are the same so return the first one
+							return firstResult;
+						}
+
 						throw createExpressionError('Invalid expression', {
-							messageTemplate: 'Invalid expression under ‘%%PARAMETER%%’',
+							messageTemplate: `Multiple matching items for expression [item ${
+								currentPairedItem.item || 0
+							}]`,
 							functionality: 'pairedItem',
 							functionOverrides: {
-								description: `The code uses data in the node ‘<strong>${destinationNodeName}</strong>’ but there is more than one matching item in that node`,
-								message: 'Invalid code',
+								message: `Multiple matching items for code [item ${currentPairedItem.item || 0}]`,
 							},
-							description: `The expression uses data in the node ‘<strong>${destinationNodeName}</strong>’ but there is more than one matching item in that node`,
-							type: 'multiple matches',
+							nodeCause: destinationNodeName,
+							descriptionKey: isScriptingNode(destinationNodeName, that.workflow)
+								? 'pairedItemMultipleMatchesCodeNode'
+								: 'pairedItemMultipleMatches',
+							type: 'paired_item_multiple_matches',
 						});
 					}
 
@@ -833,20 +860,10 @@ export class WorkflowDataProxy {
 				}
 
 				const itemInput = pairedItem.input || 0;
-				if (itemInput >= taskData.source.length) {
-					if (taskData.source.length === 0) {
+				if (itemInput >= source.length) {
+					if (source.length === 0) {
 						// A trigger node got reached, so looks like that that item can not be resolved
-						throw createExpressionError('Invalid expression', {
-							messageTemplate: 'Invalid expression under ‘%%PARAMETER%%’',
-							functionality: 'pairedItem',
-							functionOverrides: {
-								description: `The code uses data in the node ‘<strong>${destinationNodeName}</strong>’ but there is no path back to it. Please check this node is connected to it (there can be other nodes in between).`,
-								message: 'Invalid code',
-							},
-							description: `The expression uses data in the node ‘<strong>${destinationNodeName}</strong>’ but there is no path back to it. Please check this node is connected to it (there can be other nodes in between).`,
-							type: 'no connection',
-							moreInfoLink: true,
-						});
+						throw createNoConnectionError(destinationNodeName);
 					}
 					throw createExpressionError('Can’t get data for expression', {
 						messageTemplate: 'Can’t get data for expression under ‘%%PARAMETER%%’ field',
@@ -862,12 +879,12 @@ export class WorkflowDataProxy {
 								? `of run ${(sourceData.previousNodeRun || 0).toString()} `
 								: ''
 						}points to a branch that doesn’t exist.`,
-						type: 'invalid pairing info',
+						type: 'paired_item_invalid_info',
 					});
 				}
 
 				nodeBeforeLast = sourceData.previousNode;
-				sourceData = taskData.source[pairedItem.input || 0] || null;
+				sourceData = source[pairedItem.input || 0] || null;
 
 				if (pairedItem.sourceOverwrite) {
 					sourceData = pairedItem.sourceOverwrite;
@@ -882,8 +899,8 @@ export class WorkflowDataProxy {
 						message: 'Can’t get data',
 					},
 					nodeCause: nodeBeforeLast,
-					description: 'Could not resolve, proably no pairedItem exists',
-					type: 'no pairing info',
+					description: 'Could not resolve, probably no pairedItem exists',
+					type: 'paired_item_no_info',
 					moreInfoLink: true,
 				});
 			}
@@ -901,31 +918,16 @@ export class WorkflowDataProxy {
 					functionOverrides: {
 						message: 'Can’t get data',
 					},
+					nodeCause: sourceData.previousNode,
 					description: 'Item points to a node output which does not exist',
 					causeDetailed: `The sourceData points to a node output ‘${previousNodeOutput}‘ which does not exist on node ‘${sourceData.previousNode}‘ (output node did probably supply a wrong one)`,
-					type: 'invalid pairing info',
+					type: 'paired_item_invalid_info',
 				});
 			}
 
 			if (pairedItem.item >= taskData.data!.main[previousNodeOutput]!.length) {
-				throw createExpressionError('Can’t get data for expression', {
-					messageTemplate: 'Can’t get data for expression under ‘%%PARAMETER%%’ field',
-					functionality: 'pairedItem',
-					functionOverrides: {
-						message: 'Can’t get data',
-					},
-					nodeCause: nodeBeforeLast,
-					description: `In node ‘<strong>${nodeBeforeLast!}</strong>’, output item ${
-						currentPairedItem.item || 0
-					} ${
-						sourceData.previousNodeRun
-							? `of run ${(sourceData.previousNodeRun || 0).toString()} `
-							: ''
-					}points to an input item on node ‘<strong>${
-						sourceData.previousNode
-					}</strong>‘ that doesn’t exist.`,
-					type: 'invalid pairing info',
-					moreInfoLink: true,
+				throw createInvalidPairedItemError({
+					nodeName: sourceData.previousNode,
 				});
 			}
 
@@ -940,15 +942,37 @@ export class WorkflowDataProxy {
 
 				const referencedNode = that.workflow.getNode(nodeName);
 				if (referencedNode === null) {
-					throw createExpressionError(`"${nodeName}" node doesn't exist`);
+					throw createExpressionError("Referenced node doesn't exist", {
+						runIndex: that.runIndex,
+						itemIndex: that.itemIndex,
+						nodeCause: nodeName,
+						descriptionKey: 'nodeNotFound',
+					});
 				}
 
+				const ensureNodeExecutionData = () => {
+					if (
+						!that?.runExecutionData?.resultData?.runData.hasOwnProperty(nodeName) &&
+						!that.workflow.getPinDataOfNode(nodeName)
+					) {
+						throw createExpressionError('Referenced node is unexecuted', {
+							runIndex: that.runIndex,
+							itemIndex: that.itemIndex,
+							type: 'no_node_execution_data',
+							descriptionKey: 'noNodeExecutionData',
+							nodeCause: nodeName,
+						});
+					}
+				};
+
 				return new Proxy(
 					{},
 					{
-						ownKeys(target) {
+						has: () => true,
+						ownKeys() {
 							return [
 								'pairedItem',
+								'isExecuted',
 								'itemMatching',
 								'item',
 								'first',
@@ -961,7 +985,28 @@ export class WorkflowDataProxy {
 						get(target, property, receiver) {
 							if (property === 'isProxy') return true;
 
+							if (property === 'isExecuted') {
+								return (
+									that?.runExecutionData?.resultData?.runData.hasOwnProperty(nodeName) ?? false
+								);
+							}
+
 							if (['pairedItem', 'itemMatching', 'item'].includes(property as string)) {
+								// Before resolving the pairedItem make sure that the requested node comes in the
+								// graph before the current one
+								const activeNode = that.workflow.getNode(that.activeNodeName);
+								let contextNode = that.contextNodeName;
+								if (activeNode) {
+									const parentMainInputNode = that.workflow.getParentMainInputNode(activeNode);
+									contextNode = parentMainInputNode.name ?? contextNode;
+								}
+								const parentNodes = that.workflow.getParentNodes(contextNode);
+								if (!parentNodes.includes(nodeName)) {
+									throw createNoConnectionError(nodeName);
+								}
+
+								ensureNodeExecutionData();
+
 								const pairedItemMethod = (itemIndex?: number) => {
 									if (itemIndex === undefined) {
 										if (property === 'itemMatching') {
@@ -973,26 +1018,31 @@ export class WorkflowDataProxy {
 									}
 
 									const executionData = that.connectionInputData;
-
-									// As we operate on the incoming item we can be sure that pairedItem is not an
-									// array. After all can it only come from exactly one previous node via a certain
-									// input. For that reason do we not have to consider the array case.
-									const pairedItem = executionData[itemIndex].pairedItem as IPairedItemData;
-
-									if (pairedItem === undefined) {
+									const input = executionData[itemIndex];
+									if (!input) {
 										throw createExpressionError('Can’t get data for expression', {
 											messageTemplate: 'Can’t get data for expression under ‘%%PARAMETER%%’ field',
 											functionality: 'pairedItem',
 											functionOverrides: {
-												description: `To fetch the data from other nodes that this code needs, more information is needed from the node ‘<strong>${that.activeNodeName}</strong>‘`,
+												description: `Some intermediate nodes between ‘<strong>${nodeName}</strong>‘ and  ‘<strong>${that.activeNodeName}</strong>‘ have not executed yet.`,
 												message: 'Can’t get data',
 											},
-											description: `To fetch the data from other nodes that this expression needs, more information is needed from the node ‘<strong>${that.activeNodeName}</strong>‘`,
-											causeDetailed: `Missing pairedItem data (node ‘${that.activeNodeName}‘ probably didn’t supply it)`,
+											description: `Some intermediate nodes between ‘<strong>${nodeName}</strong>‘ and  ‘<strong>${that.activeNodeName}</strong>‘ have not executed yet.`,
+											causeDetailed: `pairedItem can\'t be found when intermediate nodes between ‘<strong>${nodeName}</strong>‘ and  ‘<strong>${that.activeNodeName}</strong> have not executed yet.`,
 											itemIndex,
+											type: 'paired_item_intermediate_nodes',
 										});
 									}
 
+									// As we operate on the incoming item we can be sure that pairedItem is not an
+									// array. After all can it only come from exactly one previous node via a certain
+									// input. For that reason do we not have to consider the array case.
+									const pairedItem = input.pairedItem as IPairedItemData;
+
+									if (pairedItem === undefined) {
+										throw createMissingPairedItemError(that.activeNodeName);
+									}
+
 									if (!that.executeData?.source) {
 										throw createExpressionError('Can’t get data for expression', {
 											messageTemplate: 'Can’t get data for expression under ‘%%PARAMETER%%’ field',
@@ -1007,25 +1057,9 @@ export class WorkflowDataProxy {
 										});
 									}
 
-									// Before resolving the pairedItem make sure that the requested node comes in the
-									// graph before the current one
-									const parentNodes = that.workflow.getParentNodes(that.activeNodeName);
-									if (!parentNodes.includes(nodeName)) {
-										throw createExpressionError('Invalid expression', {
-											messageTemplate: 'Invalid expression under ‘%%PARAMETER%%’',
-											functionality: 'pairedItem',
-											functionOverrides: {
-												description: `The code uses data in the node <strong>‘${nodeName}’</strong> but there is no path back to it. Please check this node is connected to it (there can be other nodes in between).`,
-												message: `No path back to node ‘${nodeName}’`,
-											},
-											description: `The expression uses data in the node <strong>‘${nodeName}’</strong> but there is no path back to it. Please check this node is connected to it (there can be other nodes in between).`,
-											itemIndex,
-										});
-									}
-
-									const sourceData: ISourceData = that.executeData.source.main[
-										pairedItem.input || 0
-									] as ISourceData;
+									const sourceData: ISourceData | null =
+										that.executeData.source.main[pairedItem.input || 0] ??
+										that.executeData.source.main[0];
 
 									return getPairedItem(nodeName, sourceData, pairedItem);
 								};
@@ -1036,6 +1070,7 @@ export class WorkflowDataProxy {
 								return pairedItemMethod;
 							}
 							if (property === 'first') {
+								ensureNodeExecutionData();
 								return (branchIndex?: number, runIndex?: number) => {
 									const executionData = getNodeOutput(nodeName, branchIndex, runIndex);
 									if (executionData[0]) return executionData[0];
@@ -1043,6 +1078,7 @@ export class WorkflowDataProxy {
 								};
 							}
 							if (property === 'last') {
+								ensureNodeExecutionData();
 								return (branchIndex?: number, runIndex?: number) => {
 									const executionData = getNodeOutput(nodeName, branchIndex, runIndex);
 									if (!executionData.length) return undefined;
@@ -1053,6 +1089,7 @@ export class WorkflowDataProxy {
 								};
 							}
 							if (property === 'all') {
+								ensureNodeExecutionData();
 								return (branchIndex?: number, runIndex?: number) =>
 									getNodeOutput(nodeName, branchIndex, runIndex);
 							}
@@ -1069,10 +1106,11 @@ export class WorkflowDataProxy {
 			},
 
 			$input: new Proxy({} as ProxyInput, {
-				ownKeys(target) {
+				has: () => true,
+				ownKeys() {
 					return ['all', 'context', 'first', 'item', 'last', 'params'];
 				},
-				getOwnPropertyDescriptor(k) {
+				getOwnPropertyDescriptor() {
 					return {
 						enumerable: true,
 						configurable: true,
@@ -1081,6 +1119,14 @@ export class WorkflowDataProxy {
 				get(target, property, receiver) {
 					if (property === 'isProxy') return true;
 
+					if (that.connectionInputData.length === 0) {
+						throw createExpressionError('No execution data available', {
+							runIndex: that.runIndex,
+							itemIndex: that.itemIndex,
+							type: 'no_execution_data',
+						});
+					}
+
 					if (property === 'item') {
 						return that.connectionInputData[that.itemIndex];
 					}
@@ -1163,9 +1209,11 @@ export class WorkflowDataProxy {
 					that.activeNodeName,
 					that.connectionInputData,
 					that.mode,
-					that.timezone,
 					that.additionalKeys,
 					that.executeData,
+					false,
+					{},
+					that.contextNodeName,
 				);
 			},
 			$item: (itemIndex: number, runIndex?: number) => {
@@ -1179,10 +1227,11 @@ export class WorkflowDataProxy {
 					this.connectionInputData,
 					that.siblingParameters,
 					that.mode,
-					that.defaultTimezone,
 					that.additionalKeys,
 					that.executeData,
 					defaultReturnRunIndex,
+					{},
+					that.contextNodeName,
 				);
 				return dataProxy.getDataProxy();
 			},
@@ -1224,6 +1273,7 @@ export class WorkflowDataProxy {
 			// eslint-disable-next-line @typescript-eslint/naming-convention
 			Duration,
 			...that.additionalKeys,
+			$getPairedItem: getPairedItem,
 
 			// deprecated
 			$jmespath: jmespathWrapper,
@@ -1234,14 +1284,15 @@ export class WorkflowDataProxy {
 		};
 
 		return new Proxy(base, {
+			has: () => true,
 			get(target, name, receiver) {
 				if (name === 'isProxy') return true;
 
 				if (['$data', '$json'].includes(name as string)) {
-					return that.nodeDataGetter(that.activeNodeName, true)?.json;
+					return that.nodeDataGetter(that.contextNodeName, true)?.json;
 				}
 				if (name === '$binary') {
-					return that.nodeDataGetter(that.activeNodeName, true)?.binary;
+					return that.nodeDataGetter(that.contextNodeName, true)?.binary;
 				}
 
 				return Reflect.get(target, name, receiver);
diff --git a/packages/workflow/src/WorkflowErrors.ts b/packages/workflow/src/WorkflowErrors.ts
deleted file mode 100644
index c161d4475fad5..0000000000000
--- a/packages/workflow/src/WorkflowErrors.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import type { INode } from './Interfaces';
-
-/**
- * Class for instantiating an operational error, e.g. a timeout error.
- */
-export class WorkflowOperationError extends Error {
-	node: INode | undefined;
-
-	timestamp: number;
-
-	lineNumber: number | undefined;
-
-	description: string | undefined;
-
-	constructor(message: string, node?: INode) {
-		super(message);
-		this.name = this.constructor.name;
-		this.node = node;
-		this.timestamp = Date.now();
-	}
-}
-
-export class SubworkflowOperationError extends WorkflowOperationError {
-	description = '';
-
-	cause: { message: string; stack: string };
-
-	constructor(message: string, description: string) {
-		super(message);
-		this.name = this.constructor.name;
-		this.description = description;
-
-		this.cause = {
-			message,
-			stack: this.stack as string,
-		};
-	}
-}
-
-export class CliWorkflowOperationError extends SubworkflowOperationError {}
diff --git a/packages/workflow/src/WorkflowHooks.ts b/packages/workflow/src/WorkflowHooks.ts
index 3462719bc2f84..68ca3d3a83ae6 100644
--- a/packages/workflow/src/WorkflowHooks.ts
+++ b/packages/workflow/src/WorkflowHooks.ts
@@ -12,7 +12,7 @@ export class WorkflowHooks {
 
 	executionId: string;
 
-	sessionId?: string;
+	pushRef?: string;
 
 	retryOf?: string;
 
@@ -25,24 +25,22 @@ export class WorkflowHooks {
 		workflowData: IWorkflowBase,
 		optionalParameters?: IWorkflowHooksOptionalParameters,
 	) {
-		// eslint-disable-next-line no-param-reassign, @typescript-eslint/prefer-nullish-coalescing
+		// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
 		optionalParameters = optionalParameters || {};
 
 		this.hookFunctions = hookFunctions;
 		this.mode = mode;
 		this.executionId = executionId;
 		this.workflowData = workflowData;
-		this.sessionId = optionalParameters.sessionId;
+		this.pushRef = optionalParameters.pushRef;
 		// retryOf might be `null` from TypeORM
 		this.retryOf = optionalParameters.retryOf ?? undefined;
 	}
 
-	// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types, @typescript-eslint/no-explicit-any
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	async executeHookFunctions(hookName: string, parameters: any[]) {
 		if (this.hookFunctions[hookName] !== undefined && Array.isArray(this.hookFunctions[hookName])) {
-			// eslint-disable-next-line @typescript-eslint/no-non-null-assertion, no-restricted-syntax
 			for (const hookFunction of this.hookFunctions[hookName]!) {
-				// eslint-disable-next-line no-await-in-loop
 				await hookFunction.apply(this, parameters);
 			}
 		}
diff --git a/packages/workflow/src/errors/abstract/execution-base.error.ts b/packages/workflow/src/errors/abstract/execution-base.error.ts
new file mode 100644
index 0000000000000..c29e84ef87a7f
--- /dev/null
+++ b/packages/workflow/src/errors/abstract/execution-base.error.ts
@@ -0,0 +1,52 @@
+import type { Functionality, IDataObject, JsonObject } from '../../Interfaces';
+import { ApplicationError, type ReportingOptions } from '../application.error';
+
+interface ExecutionBaseErrorOptions extends ReportingOptions {
+	cause?: Error;
+	errorResponse?: JsonObject;
+}
+
+export abstract class ExecutionBaseError extends ApplicationError {
+	description: string | null | undefined;
+
+	cause?: Error;
+
+	errorResponse?: JsonObject;
+
+	timestamp: number;
+
+	context: IDataObject = {};
+
+	lineNumber: number | undefined;
+
+	functionality: Functionality = 'regular';
+
+	constructor(message: string, options: ExecutionBaseErrorOptions = {}) {
+		super(message, options);
+
+		this.name = this.constructor.name;
+		this.timestamp = Date.now();
+
+		const { cause, errorResponse } = options;
+		if (cause instanceof ExecutionBaseError) {
+			this.context = cause.context;
+		} else if (cause && !(cause instanceof Error)) {
+			this.cause = cause;
+		}
+
+		if (errorResponse) this.errorResponse = errorResponse;
+	}
+
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	toJSON?(): any {
+		return {
+			message: this.message,
+			lineNumber: this.lineNumber,
+			timestamp: this.timestamp,
+			name: this.name,
+			description: this.description,
+			context: this.context,
+			cause: this.cause,
+		};
+	}
+}
diff --git a/packages/workflow/src/errors/abstract/node.error.ts b/packages/workflow/src/errors/abstract/node.error.ts
new file mode 100644
index 0000000000000..060751cd86c5e
--- /dev/null
+++ b/packages/workflow/src/errors/abstract/node.error.ts
@@ -0,0 +1,180 @@
+import { isTraversableObject } from '../../utils';
+import type { IDataObject, INode, JsonObject } from '../..';
+import { ExecutionBaseError } from './execution-base.error';
+
+/**
+ * Descriptive messages for common errors.
+ */
+const COMMON_ERRORS: IDataObject = {
+	// nodeJS errors
+	ECONNREFUSED: 'The service refused the connection - perhaps it is offline',
+	ECONNRESET:
+		'The connection to the server wes closed unexpectedly, perhaps it is offline. You can retry request immidiately or wait and retry later.',
+	ENOTFOUND:
+		'The connection cannot be established, this usually occurs due to an incorrect host(domain) value',
+	ETIMEDOUT:
+		"The connection timed out, consider setting 'Retry on Fail' option in the node settings",
+	ERRADDRINUSE:
+		'The port is already occupied by some other application, if possible change the port or kill the application that is using it',
+	EADDRNOTAVAIL: 'The address is not available, ensure that you have the right IP address',
+	ECONNABORTED: 'The connection was aborted, perhaps the server is offline',
+	EHOSTUNREACH: 'The host is unreachable, perhaps the server is offline',
+	EAI_AGAIN: 'The DNS server returned an error, perhaps the server is offline',
+	ENOENT: 'The file or directory does not exist',
+	EISDIR: 'The file path expected but a given path is a directory',
+	ENOTDIR: 'The directory path expected but a given path is a file',
+	EACCES: 'Forbidden by access permissions, make sure you have the right permissions',
+	EEXIST: 'The file or directory already exists',
+	EPERM: 'Operation not permitted, make sure you have the right permissions',
+	// other errors
+	GETADDRINFO: 'The server closed the connection unexpectedly',
+};
+
+/**
+ * Base class for specific NodeError-types, with functionality for finding
+ * a value recursively inside an error object.
+ */
+export abstract class NodeError extends ExecutionBaseError {
+	messages: string[] = [];
+
+	constructor(
+		readonly node: INode,
+		error: Error | JsonObject,
+	) {
+		const isError = error instanceof Error;
+		const message = isError ? error.message : '';
+		const options = isError ? { cause: error } : { errorResponse: error };
+		super(message, options);
+
+		if (error instanceof NodeError) {
+			this.tags.reWrapped = true;
+		}
+	}
+
+	/**
+	 * Finds property through exploration based on potential keys and traversal keys.
+	 * Depth-first approach.
+	 *
+	 * This method iterates over `potentialKeys` and, if the value at the key is a
+	 * truthy value, the type of the value is checked:
+	 * (1) if a string or number, the value is returned as a string; or
+	 * (2) if an array,
+	 * 		its string or number elements are collected as a long string,
+	 * 		its object elements are traversed recursively (restart this function
+	 *    with each object as a starting point), or
+	 * (3) if it is an object, it traverses the object and nested ones recursively
+	 * 		based on the `potentialKeys` and returns a string if found.
+	 *
+	 * If nothing found via `potentialKeys` this method iterates over `traversalKeys` and
+	 * if the value at the key is a traversable object, it restarts with the object as the
+	 * new starting point (recursion).
+	 * If nothing found for any of the `traversalKeys`, exploration continues with remaining
+	 * `traversalKeys`.
+	 *
+	 * Otherwise, if all the paths have been exhausted and no value is eligible, `null` is
+	 * returned.
+	 *
+	 */
+	protected findProperty(
+		jsonError: JsonObject,
+		potentialKeys: string[],
+		traversalKeys: string[] = [],
+	): string | null {
+		for (const key of potentialKeys) {
+			const value = jsonError[key];
+			if (value) {
+				if (typeof value === 'string') return value;
+				if (typeof value === 'number') return value.toString();
+				if (Array.isArray(value)) {
+					const resolvedErrors: string[] = value
+						// eslint-disable-next-line @typescript-eslint/no-shadow
+						.map((jsonError) => {
+							if (typeof jsonError === 'string') return jsonError;
+							if (typeof jsonError === 'number') return jsonError.toString();
+							if (isTraversableObject(jsonError)) {
+								return this.findProperty(jsonError, potentialKeys);
+							}
+							return null;
+						})
+						.filter((errorValue): errorValue is string => errorValue !== null);
+
+					if (resolvedErrors.length === 0) {
+						return null;
+					}
+					return resolvedErrors.join(' | ');
+				}
+				if (isTraversableObject(value)) {
+					const property = this.findProperty(value, potentialKeys);
+					if (property) {
+						return property;
+					}
+				}
+			}
+		}
+
+		for (const key of traversalKeys) {
+			const value = jsonError[key];
+			if (isTraversableObject(value)) {
+				const property = this.findProperty(value, potentialKeys, traversalKeys);
+				if (property) {
+					return property;
+				}
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * Preserve the original error message before setting the new one
+	 */
+	protected addToMessages(message: string): void {
+		if (message && !this.messages.includes(message)) {
+			this.messages.push(message);
+		}
+	}
+
+	/**
+	 * Set descriptive error message if code is provided or if message contains any of the common errors,
+	 * update description to include original message plus the description
+	 */
+	protected setDescriptiveErrorMessage(
+		message: string,
+		messages: string[],
+		code?: string | null,
+		messageMapping?: { [key: string]: string },
+	): [string, string[]] {
+		let newMessage = message;
+
+		if (messageMapping) {
+			for (const [mapKey, mapMessage] of Object.entries(messageMapping)) {
+				if ((message || '').toUpperCase().includes(mapKey.toUpperCase())) {
+					newMessage = mapMessage;
+					messages.push(message);
+					break;
+				}
+			}
+			if (newMessage !== message) {
+				return [newMessage, messages];
+			}
+		}
+
+		// if code is provided and it is in the list of common errors set the message and return early
+		if (code && COMMON_ERRORS[code.toUpperCase()]) {
+			newMessage = COMMON_ERRORS[code] as string;
+			messages.push(message);
+			return [newMessage, messages];
+		}
+
+		// check if message contains any of the common errors and set the message and description
+		for (const [errorCode, errorDescriptiveMessage] of Object.entries(COMMON_ERRORS)) {
+			if ((message || '').toUpperCase().includes(errorCode.toUpperCase())) {
+				newMessage = errorDescriptiveMessage as string;
+				messages.push(message);
+				break;
+			}
+		}
+
+		return [newMessage, messages];
+	}
+}
diff --git a/packages/workflow/src/errors/application.error.ts b/packages/workflow/src/errors/application.error.ts
new file mode 100644
index 0000000000000..954df90a788d9
--- /dev/null
+++ b/packages/workflow/src/errors/application.error.ts
@@ -0,0 +1,35 @@
+import callsites from 'callsites';
+import type { Event } from '@sentry/node';
+
+export type Level = 'warning' | 'error' | 'fatal' | 'info';
+
+export type ReportingOptions = {
+	level?: Level;
+} & Pick<Event, 'tags' | 'extra'>;
+
+export class ApplicationError extends Error {
+	level: Level;
+
+	readonly tags: NonNullable<Event['tags']>;
+
+	readonly extra?: Event['extra'];
+
+	readonly packageName?: string;
+
+	constructor(
+		message: string,
+		{ level, tags = {}, extra, ...rest }: Partial<ErrorOptions> & ReportingOptions = {},
+	) {
+		super(message, rest);
+		this.level = level ?? 'error';
+		this.tags = tags;
+		this.extra = extra;
+
+		try {
+			const filePath = callsites()[2].getFileName() ?? '';
+			const match = /packages\/([^\/]+)\//.exec(filePath)?.[1];
+
+			if (match) this.tags.packageName = match;
+		} catch {}
+	}
+}
diff --git a/packages/workflow/src/errors/cli-subworkflow-operation.error.ts b/packages/workflow/src/errors/cli-subworkflow-operation.error.ts
new file mode 100644
index 0000000000000..59236957c6666
--- /dev/null
+++ b/packages/workflow/src/errors/cli-subworkflow-operation.error.ts
@@ -0,0 +1,3 @@
+import { SubworkflowOperationError } from './subworkflow-operation.error';
+
+export class CliWorkflowOperationError extends SubworkflowOperationError {}
diff --git a/packages/workflow/src/errors/credential-access-error.ts b/packages/workflow/src/errors/credential-access-error.ts
new file mode 100644
index 0000000000000..e3d41e22079fe
--- /dev/null
+++ b/packages/workflow/src/errors/credential-access-error.ts
@@ -0,0 +1,25 @@
+import type { INode } from '@/Interfaces';
+import { ExecutionBaseError } from './abstract/execution-base.error';
+
+export class CredentialAccessError extends ExecutionBaseError {
+	override readonly description =
+		'Please recreate the credential or ask its owner to share it with you.';
+
+	override readonly level = 'warning';
+
+	constructor(
+		readonly node: INode,
+		credentialId: string,
+		workflowId: string,
+	) {
+		super('Node has no access to credential', {
+			tags: {
+				nodeType: node.type,
+			},
+			extra: {
+				credentialId,
+				workflowId,
+			},
+		});
+	}
+}
diff --git a/packages/workflow/src/errors/expression-extension.error.ts b/packages/workflow/src/errors/expression-extension.error.ts
new file mode 100644
index 0000000000000..f5f60b3c2e418
--- /dev/null
+++ b/packages/workflow/src/errors/expression-extension.error.ts
@@ -0,0 +1,3 @@
+import { ExpressionError } from './expression.error';
+
+export class ExpressionExtensionError extends ExpressionError {}
diff --git a/packages/workflow/src/errors/expression.error.ts b/packages/workflow/src/errors/expression.error.ts
new file mode 100644
index 0000000000000..ac73010957153
--- /dev/null
+++ b/packages/workflow/src/errors/expression.error.ts
@@ -0,0 +1,59 @@
+import type { IDataObject } from '../Interfaces';
+import { ExecutionBaseError } from './abstract/execution-base.error';
+
+export interface ExpressionErrorOptions {
+	cause?: Error;
+	causeDetailed?: string;
+	description?: string;
+	descriptionKey?: string;
+	descriptionTemplate?: string;
+	functionality?: 'pairedItem';
+	itemIndex?: number;
+	messageTemplate?: string;
+	nodeCause?: string;
+	parameter?: string;
+	runIndex?: number;
+	type?:
+		| 'no_execution_data'
+		| 'no_node_execution_data'
+		| 'no_input_connection'
+		| 'internal'
+		| 'paired_item_invalid_info'
+		| 'paired_item_no_info'
+		| 'paired_item_multiple_matches'
+		| 'paired_item_no_connection'
+		| 'paired_item_intermediate_nodes';
+}
+
+/**
+ * Class for instantiating an expression error
+ */
+export class ExpressionError extends ExecutionBaseError {
+	constructor(message: string, options?: ExpressionErrorOptions) {
+		super(message, { cause: options?.cause });
+
+		if (options?.description !== undefined) {
+			this.description = options.description;
+		}
+
+		const allowedKeys = [
+			'causeDetailed',
+			'descriptionTemplate',
+			'descriptionKey',
+			'functionality',
+			'itemIndex',
+			'messageTemplate',
+			'nodeCause',
+			'parameter',
+			'runIndex',
+			'type',
+		];
+		if (options !== undefined) {
+			Object.keys(options as IDataObject).forEach((key) => {
+				if (allowedKeys.includes(key)) {
+					this.context[key] = (options as IDataObject)[key];
+				}
+			});
+		}
+	}
+}
diff --git a/packages/workflow/src/errors/index.ts b/packages/workflow/src/errors/index.ts
new file mode 100644
index 0000000000000..b23367e91dddd
--- /dev/null
+++ b/packages/workflow/src/errors/index.ts
@@ -0,0 +1,17 @@
+export { ApplicationError } from './application.error';
+export { ExpressionError } from './expression.error';
+export { CredentialAccessError } from './credential-access-error';
+export { NodeApiError } from './node-api.error';
+export { NodeOperationError } from './node-operation.error';
+export { NodeSslError } from './node-ssl.error';
+export { WebhookPathTakenError } from './webhook-taken.error';
+export { WorkflowActivationError } from './workflow-activation.error';
+export { WorkflowDeactivationError } from './workflow-deactivation.error';
+export { WorkflowOperationError } from './workflow-operation.error';
+export { SubworkflowOperationError } from './subworkflow-operation.error';
+export { CliWorkflowOperationError } from './cli-subworkflow-operation.error';
+export { TriggerCloseError } from './trigger-close.error';
+
+export { NodeError } from './abstract/node.error';
+export { ExecutionBaseError } from './abstract/execution-base.error';
+export { ExpressionExtensionError } from './expression-extension.error';
diff --git a/packages/workflow/src/errors/node-api.error.ts b/packages/workflow/src/errors/node-api.error.ts
new file mode 100644
index 0000000000000..f1f6c8175a5d0
--- /dev/null
+++ b/packages/workflow/src/errors/node-api.error.ts
@@ -0,0 +1,333 @@
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
+/* eslint-disable @typescript-eslint/naming-convention */
+
+import { parseString } from 'xml2js';
+import type {
+	INode,
+	JsonObject,
+	IDataObject,
+	IStatusCodeMessages,
+	Functionality,
+} from '../Interfaces';
+import { NodeError } from './abstract/node.error';
+import { removeCircularRefs } from '../utils';
+import type { ReportingOptions } from './application.error';
+import { AxiosError } from 'axios';
+import {
+	NO_OP_NODE_TYPE,
+	UNKNOWN_ERROR_DESCRIPTION,
+	UNKNOWN_ERROR_MESSAGE,
+	UNKNOWN_ERROR_MESSAGE_CRED,
+} from '../Constants';
+
+export interface NodeOperationErrorOptions {
+	message?: string;
+	description?: string;
+	runIndex?: number;
+	itemIndex?: number;
+	level?: ReportingOptions['level'];
+	messageMapping?: { [key: string]: string }; // allows to pass custom mapping for error messages scoped to a node
+	functionality?: Functionality;
+	type?: string;
+}
+
+interface NodeApiErrorOptions extends NodeOperationErrorOptions {
+	message?: string;
+	httpCode?: string;
+	parseXml?: boolean;
+}
+
+/**
+ * Top-level properties where an error message can be found in an API response.
+ */
+const ERROR_MESSAGE_PROPERTIES = [
+	'cause',
+	'error',
+	'message',
+	'Message',
+	'msg',
+	'messages',
+	'description',
+	'reason',
+	'detail',
+	'details',
+	'errors',
+	'errorMessage',
+	'errorMessages',
+	'ErrorMessage',
+	'error_message',
+	'_error_message',
+	'errorDescription',
+	'error_description',
+	'error_summary',
+	'title',
+	'text',
+	'field',
+	'err',
+	'type',
+];
+
+/**
+ * Top-level properties where an HTTP error code can be found in an API response.
+ */
+const ERROR_STATUS_PROPERTIES = [
+	'statusCode',
+	'status',
+	'code',
+	'status_code',
+	'errorCode',
+	'error_code',
+];
+
+/**
+ * Properties where a nested object can be found in an API response.
+ */
+const ERROR_NESTING_PROPERTIES = ['error', 'err', 'response', 'body', 'data'];
+
+/**
+ * Descriptive messages for common HTTP status codes
+ * this is used by NodeApiError class
+ */
+const STATUS_CODE_MESSAGES: IStatusCodeMessages = {
+	'4XX': 'Your request is invalid or could not be processed by the service',
+	'400': 'Bad request - please check your parameters',
+	'401': 'Authorization failed - please check your credentials',
+	'402': 'Payment required - perhaps check your payment details?',
+	'403': 'Forbidden - perhaps check your credentials?',
+	'404': 'The resource you are requesting could not be found',
+	'405': 'Method not allowed - please check you are using the right HTTP method',
+	'429': 'The service is receiving too many requests from you',
+
+	'5XX': 'The service failed to process your request',
+	'500': 'The service was not able to process your request',
+	'502': 'Bad gateway - the service failed to handle your request',
+	'503':
+		'Service unavailable - try again later or consider setting this node to retry automatically (in the node settings)',
+	'504': 'Gateway timed out - perhaps try again later?',
+};
+
+/**
+ * Class for instantiating an error in an API response, e.g. a 404 Not Found response,
+ * with an HTTP error code, an error message and a description.
+ */
+export class NodeApiError extends NodeError {
+	httpCode: string | null;
+
+	// eslint-disable-next-line complexity
+	constructor(
+		node: INode,
+		errorResponse: JsonObject,
+		{
+			message,
+			description,
+			httpCode,
+			parseXml,
+			runIndex,
+			itemIndex,
+			level,
+			functionality,
+			messageMapping,
+		}: NodeApiErrorOptions = {},
+	) {
+		super(node, errorResponse);
+
+		this.addToMessages(errorResponse.message as string);
+
+		if (!httpCode && errorResponse instanceof AxiosError) {
+			httpCode = errorResponse.response?.status?.toString();
+		}
+
+		// only for request library error
+		if (errorResponse.error) {
+			removeCircularRefs(errorResponse.error as JsonObject);
+		}
+
+		// if not description provided, try to find it in the error object
+		// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+		if (
+			!description &&
+			(errorResponse.description || (errorResponse?.reason as IDataObject)?.description)
+		) {
+			// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+			this.description = (errorResponse.description ||
+				(errorResponse?.reason as IDataObject)?.description) as string;
+		}
+
+		// if not message provided, try to find it in the error object or set description as message
+		// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+		if (
+			!message &&
+			(errorResponse.message || (errorResponse?.reason as IDataObject)?.message || description)
+		) {
+			// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+			this.message = (errorResponse.message ||
+				// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+				(errorResponse?.reason as IDataObject)?.message ||
+				description) as string;
+		}
+
+		// if it's an error generated by axios
+		// look for descriptions in the response object
+		if (errorResponse.reason) {
+			const reason: IDataObject = errorResponse.reason as unknown as IDataObject;
+
+			if (reason.isAxiosError && reason.response) {
+				errorResponse = reason.response as JsonObject;
+			}
+		}
+
+		// set http code of this error
+		if (httpCode) {
+			this.httpCode = httpCode;
+		} else if (errorResponse.httpCode) {
+			this.httpCode = errorResponse.httpCode as string;
+		} else {
+			this.httpCode =
+				this.findProperty(errorResponse, ERROR_STATUS_PROPERTIES, ERROR_NESTING_PROPERTIES) ?? null;
+		}
+
+		if (level) {
+			this.level = level;
+		} else if (this.httpCode?.charAt(0) !== '5') {
+			this.level = 'warning';
+		}
+
+		if (
+			errorResponse?.response &&
+			typeof errorResponse?.response === 'object' &&
+			!Array.isArray(errorResponse.response) &&
+			errorResponse.response.data &&
+			typeof errorResponse.response.data === 'object' &&
+			!Array.isArray(errorResponse.response.data)
+		) {
+			const data = errorResponse.response.data;
+
+			if (data.message) {
+				description = data.message as string;
+			} else if (data.error && ((data.error as IDataObject) || {}).message) {
+				description = (data.error as IDataObject).message as string;
+			}
+
+			this.context.data = data;
+		}
+
+		// set description of this error
+		if (description) {
+			this.description = description;
+		}
+
+		if (!this.description) {
+			if (parseXml) {
+				this.setDescriptionFromXml(errorResponse.error as string);
+			} else {
+				this.description = this.findProperty(
+					errorResponse,
+					ERROR_MESSAGE_PROPERTIES,
+					ERROR_NESTING_PROPERTIES,
+				);
+			}
+		}
+
+		// set message if provided
+		// set default message based on http code
+		// or use raw error message
+		if (message) {
+			this.message = message;
+		} else {
+			this.setDefaultStatusCodeMessage();
+		}
+
+		// if message and description are the same, unset redundant description
+		if (this.message === this.description) {
+			this.description = undefined;
+		}
+
+		// if message contain common error code set descriptive message and update description
+		[this.message, this.messages] = this.setDescriptiveErrorMessage(
+			this.message,
+			this.messages,
+			// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+			this.httpCode ||
+				(errorResponse?.code as string) ||
+				((errorResponse?.reason as JsonObject)?.code as string) ||
+				undefined,
+			messageMapping,
+		);
+
+		if (functionality !== undefined) this.context.functionality = functionality;
+		if (runIndex !== undefined) this.context.runIndex = runIndex;
+		if (itemIndex !== undefined) this.context.itemIndex = itemIndex;
+	}
+
+	private setDescriptionFromXml(xml: string) {
+		parseString(xml, { explicitArray: false }, (_, result) => {
+			if (!result) return;
+
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+			const topLevelKey = Object.keys(result)[0];
+			this.description = this.findProperty(
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-member-access
+				result[topLevelKey],
+				ERROR_MESSAGE_PROPERTIES,
+				['Error'].concat(ERROR_NESTING_PROPERTIES),
+			);
+		});
+	}
+
+	/**
+	 * Set the error's message based on the HTTP status code.
+	 */
+	private setDefaultStatusCodeMessage() {
+		// Set generic error message for 502 Bad Gateway
+		if (!this.httpCode && this.message && this.message.toLowerCase().includes('bad gateway')) {
+			this.httpCode = '502';
+		}
+
+		if (!this.httpCode) {
+			this.httpCode = null;
+
+			if (!this.message) {
+				if (this.description) {
+					this.message = this.description;
+					this.description = undefined;
+				} else {
+					this.message = UNKNOWN_ERROR_MESSAGE;
+					this.description = UNKNOWN_ERROR_DESCRIPTION;
+				}
+			}
+			return;
+		}
+
+		if (STATUS_CODE_MESSAGES[this.httpCode]) {
+			this.addToMessages(this.message);
+			this.message = STATUS_CODE_MESSAGES[this.httpCode];
+			return;
+		}
+
+		switch (this.httpCode.charAt(0)) {
+			case '4':
+				this.addToMessages(this.message);
+				this.message = STATUS_CODE_MESSAGES['4XX'];
+				break;
+			case '5':
+				this.addToMessages(this.message);
+				this.message = STATUS_CODE_MESSAGES['5XX'];
+				break;
+			default:
+				if (!this.message) {
+					if (this.description) {
+						this.message = this.description;
+						this.description = undefined;
+					} else {
+						this.message = UNKNOWN_ERROR_MESSAGE;
+						this.description = UNKNOWN_ERROR_DESCRIPTION;
+					}
+				}
+		}
+		if (this.node.type === NO_OP_NODE_TYPE && this.message === UNKNOWN_ERROR_MESSAGE) {
+			this.message = `${UNKNOWN_ERROR_MESSAGE_CRED} - ${this.httpCode}`;
+		}
+	}
+}
diff --git a/packages/workflow/src/errors/node-operation.error.ts b/packages/workflow/src/errors/node-operation.error.ts
new file mode 100644
index 0000000000000..3a41f1903e890
--- /dev/null
+++ b/packages/workflow/src/errors/node-operation.error.ts
@@ -0,0 +1,46 @@
+import type { INode, JsonObject } from '..';
+import type { NodeOperationErrorOptions } from './node-api.error';
+import { NodeError } from './abstract/node.error';
+
+/**
+ * Class for instantiating an operational error, e.g. an invalid credentials error.
+ */
+export class NodeOperationError extends NodeError {
+	lineNumber: number | undefined;
+
+	type: string | undefined;
+
+	constructor(
+		node: INode,
+		error: Error | string | JsonObject,
+		options: NodeOperationErrorOptions = {},
+	) {
+		if (typeof error === 'string') {
+			error = new Error(error);
+		}
+		super(node, error);
+
+		if (error instanceof NodeError && error?.messages?.length) {
+			error.messages.forEach((message) => this.addToMessages(message));
+		}
+
+		if (options.message) this.message = options.message;
+		if (options.level) this.level = options.level;
+		if (options.functionality) this.functionality = options.functionality;
+		if (options.type) this.type = options.type;
+		this.description = options.description;
+		this.context.runIndex = options.runIndex;
+		this.context.itemIndex = options.itemIndex;
+
+		if (this.message === this.description) {
+			this.description = undefined;
+		}
+
+		[this.message, this.messages] = this.setDescriptiveErrorMessage(
+			this.message,
+			this.messages,
+			undefined,
+			options.messageMapping,
+		);
+	}
+}
diff --git a/packages/workflow/src/errors/node-ssl.error.ts b/packages/workflow/src/errors/node-ssl.error.ts
new file mode 100644
index 0000000000000..2a16a20f1a5d1
--- /dev/null
+++ b/packages/workflow/src/errors/node-ssl.error.ts
@@ -0,0 +1,7 @@
+import { ExecutionBaseError } from './abstract/execution-base.error';
+
+export class NodeSslError extends ExecutionBaseError {
+	constructor(cause: Error) {
+		super("SSL Issue: consider using the 'Ignore SSL issues' option", { cause });
+	}
+}
diff --git a/packages/workflow/src/errors/subworkflow-operation.error.ts b/packages/workflow/src/errors/subworkflow-operation.error.ts
new file mode 100644
index 0000000000000..7bf2bf385c9ab
--- /dev/null
+++ b/packages/workflow/src/errors/subworkflow-operation.error.ts
@@ -0,0 +1,19 @@
+import { WorkflowOperationError } from './workflow-operation.error';
+
+export class SubworkflowOperationError extends WorkflowOperationError {
+	description = '';
+
+	cause: Error;
+
+	constructor(message: string, description: string) {
+		super(message);
+		this.name = this.constructor.name;
+		this.description = description;
+
+		this.cause = {
+			name: this.name,
+			message,
+			stack: this.stack as string,
+		};
+	}
+}
diff --git a/packages/workflow/src/errors/trigger-close.error.ts b/packages/workflow/src/errors/trigger-close.error.ts
new file mode 100644
index 0000000000000..19d3b7a76934e
--- /dev/null
+++ b/packages/workflow/src/errors/trigger-close.error.ts
@@ -0,0 +1,16 @@
+import type { INode } from '../Interfaces';
+import { ApplicationError, type Level } from './application.error';
+
+interface TriggerCloseErrorOptions extends ErrorOptions {
+	level: Level;
+}
+
+export class TriggerCloseError extends ApplicationError {
+	constructor(
+		readonly node: INode,
+		{ cause, level }: TriggerCloseErrorOptions,
+	) {
+		super('Trigger Close Failed', { cause, extra: { nodeName: node.name } });
+		this.level = level;
+	}
+}
diff --git a/packages/workflow/src/errors/webhook-taken.error.ts b/packages/workflow/src/errors/webhook-taken.error.ts
new file mode 100644
index 0000000000000..091094ade5912
--- /dev/null
+++ b/packages/workflow/src/errors/webhook-taken.error.ts
@@ -0,0 +1,10 @@
+import { WorkflowActivationError } from './workflow-activation.error';
+
+export class WebhookPathTakenError extends WorkflowActivationError {
+	constructor(nodeName: string, cause?: Error) {
+		super(
+			`The URL path that the "${nodeName}" node uses is already taken. Please change it to something else.`,
+			{ level: 'warning', cause },
+		);
+	}
+}
diff --git a/packages/workflow/src/errors/workflow-activation.error.ts b/packages/workflow/src/errors/workflow-activation.error.ts
new file mode 100644
index 0000000000000..16e68effda578
--- /dev/null
+++ b/packages/workflow/src/errors/workflow-activation.error.ts
@@ -0,0 +1,37 @@
+import type { INode } from '../Interfaces';
+import { ExecutionBaseError } from './abstract/execution-base.error';
+import type { ApplicationError } from './application.error';
+
+interface WorkflowActivationErrorOptions {
+	cause?: Error;
+	node?: INode;
+	level?: ApplicationError['level'];
+	workflowId?: string;
+}
+
+/**
+ * Class for instantiating an workflow activation error
+ */
+export class WorkflowActivationError extends ExecutionBaseError {
+	node: INode | undefined;
+
+	workflowId: string | undefined;
+
+	constructor(
+		message: string,
+		{ cause, node, level, workflowId }: WorkflowActivationErrorOptions = {},
+	) {
+		let error = cause as Error;
+		if (cause instanceof ExecutionBaseError) {
+			error = new Error(cause.message);
+			error.constructor = cause.constructor;
+			error.name = cause.name;
+			error.stack = cause.stack;
+		}
+		super(message, { cause: error });
+		this.node = node;
+		this.workflowId = workflowId;
+		this.message = message;
+		if (level) this.level = level;
+	}
+}
diff --git a/packages/workflow/src/errors/workflow-deactivation.error.ts b/packages/workflow/src/errors/workflow-deactivation.error.ts
new file mode 100644
index 0000000000000..275544fd2b226
--- /dev/null
+++ b/packages/workflow/src/errors/workflow-deactivation.error.ts
@@ -0,0 +1,3 @@
+import { WorkflowActivationError } from './workflow-activation.error';
+
+export class WorkflowDeactivationError extends WorkflowActivationError {}
diff --git a/packages/workflow/src/errors/workflow-operation.error.ts b/packages/workflow/src/errors/workflow-operation.error.ts
new file mode 100644
index 0000000000000..25b47e149ce78
--- /dev/null
+++ b/packages/workflow/src/errors/workflow-operation.error.ts
@@ -0,0 +1,24 @@
+import type { INode } from '..';
+import { ExecutionBaseError } from './abstract/execution-base.error';
+
+/**
+ * Class for instantiating an operational error, e.g. a timeout error.
+ */
+export class WorkflowOperationError extends ExecutionBaseError {
+	node: INode | undefined;
+
+	timestamp: number;
+
+	lineNumber: number | undefined;
+
+	description: string | undefined;
+
+	constructor(message: string, node?: INode, description?: string) {
+		super(message, { cause: undefined });
+		this.level = 'warning';
+		this.name = this.constructor.name;
+		if (description) this.description = description;
+		this.node = node;
+		this.timestamp = Date.now();
+	}
+}
diff --git a/packages/workflow/src/index.ts b/packages/workflow/src/index.ts
index 63e71425fa225..7ac82621ce3f4 100644
--- a/packages/workflow/src/index.ts
+++ b/packages/workflow/src/index.ts
@@ -1,29 +1,40 @@
 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';
 import * as TelemetryHelpers from './TelemetryHelpers';
 
+export * from './errors';
 export * from './Authentication';
 export * from './Constants';
 export * from './Cron';
 export * from './DeferredPromise';
+export * from './GlobalState';
 export * from './Interfaces';
 export * from './MessageEventBus';
 export * from './ExecutionStatus';
 export * from './Expression';
-export * from './ExpressionError';
-export * from './NodeErrors';
 export * from './NodeHelpers';
 export * from './RoutingNode';
 export * from './Workflow';
-export * from './WorkflowActivationError';
 export * from './WorkflowDataProxy';
-export * from './WorkflowErrors';
 export * from './WorkflowHooks';
 export * from './VersionedNodeType';
+export * from './TypeValidation';
 export { LoggerProxy, NodeHelpers, ObservableObject, TelemetryHelpers };
-export { deepCopy, jsonParse, jsonStringify, sleep, fileTypeFromMimeType, assert } from './utils';
+export {
+	isObjectEmpty,
+	deepCopy,
+	jsonParse,
+	jsonStringify,
+	replaceCircularReferences,
+	sleep,
+	fileTypeFromMimeType,
+	assert,
+	removeCircularRefs,
+	updateDisplayOptions,
+} from './utils';
 export {
 	isINodeProperties,
 	isINodePropertyOptions,
@@ -31,15 +42,30 @@ export {
 	isINodePropertiesList,
 	isINodePropertyCollectionList,
 	isINodePropertyOptionsList,
+	isResourceMapperValue,
+	isFilterValue,
 } from './type-guards';
 
 export { ExpressionExtensions } from './Extensions';
+export * as ExpressionParser from './Extensions/ExpressionParser';
 export { NativeMethods } from './NativeMethods';
+export * from './NodeParameters/FilterParameter';
 
-export type { DocMetadata } from './Extensions';
+export type { DocMetadata, NativeDoc } from './Extensions';
 
 declare module 'http' {
 	export interface IncomingMessage {
+		contentType?: string;
+		encoding: BufferEncoding;
+		contentDisposition?: { type: string; filename?: string };
 		rawBody: Buffer;
+		readRawBody(): Promise<void>;
+		_body: boolean;
+
+		// This gets added by the `follow-redirects` package
+		responseUrl?: string;
+
+		// This is added to response objects for all outgoing requests
+		req?: ClientRequest;
 	}
 }
diff --git a/packages/workflow/src/type-guards.ts b/packages/workflow/src/type-guards.ts
index 51b08b9e66981..2e3bc7fb3d6ec 100644
--- a/packages/workflow/src/type-guards.ts
+++ b/packages/workflow/src/type-guards.ts
@@ -3,6 +3,8 @@ import type {
 	INodePropertyOptions,
 	INodePropertyCollection,
 	INodeParameterResourceLocator,
+	ResourceMapperValue,
+	FilterValue,
 } from './Interfaces';
 
 export const isINodeProperties = (
@@ -43,3 +45,19 @@ export const isValidResourceLocatorParameterValue = (
 		return !!value;
 	}
 };
+
+export const isResourceMapperValue = (value: unknown): value is ResourceMapperValue => {
+	return (
+		typeof value === 'object' &&
+		value !== null &&
+		'mappingMode' in value &&
+		'schema' in value &&
+		'value' in value
+	);
+};
+
+export const isFilterValue = (value: unknown): value is FilterValue => {
+	return (
+		typeof value === 'object' && value !== null && 'conditions' in value && 'combinator' in value
+	);
+};
diff --git a/packages/workflow/src/types.d.ts b/packages/workflow/src/types.d.ts
index 85bfad7a58e6a..12fdaa8b194c5 100644
--- a/packages/workflow/src/types.d.ts
+++ b/packages/workflow/src/types.d.ts
@@ -12,3 +12,7 @@ declare module '@n8n_io/riot-tmpl' {
 	let brackets: Brackets;
 	let tmpl: Tmpl;
 }
+
+interface BigInt {
+	toJSON(): string;
+}
diff --git a/packages/workflow/src/utils.ts b/packages/workflow/src/utils.ts
index 71d4a50028a35..e7e5182443fd7 100644
--- a/packages/workflow/src/utils.ts
+++ b/packages/workflow/src/utils.ts
@@ -1,4 +1,29 @@
-import type { BinaryFileType } from './Interfaces';
+import FormData from 'form-data';
+import type { BinaryFileType, IDisplayOptions, INodeProperties, JsonObject } from './Interfaces';
+import { ApplicationError } from './errors/application.error';
+
+import { merge } from 'lodash';
+
+const readStreamClasses = new Set(['ReadStream', 'Readable', 'ReadableStream']);
+
+// NOTE: BigInt.prototype.toJSON is not available, which causes JSON.stringify to throw an error
+// as well as the flatted stringify method. This is a workaround for that.
+BigInt.prototype.toJSON = function () {
+	return this.toString();
+};
+
+export const isObjectEmpty = (obj: object | null | undefined): boolean => {
+	if (obj === undefined || obj === null) return true;
+	if (typeof obj === 'object') {
+		if (obj instanceof FormData) return obj.getLengthSync() === 0;
+		if (Array.isArray(obj)) return obj.length === 0;
+		if (obj instanceof Set || obj instanceof Map) return obj.size === 0;
+		if (ArrayBuffer.isView(obj) || obj instanceof ArrayBuffer) return obj.byteLength === 0;
+		if (Symbol.iterator in obj || readStreamClasses.has(obj.constructor.name)) return false;
+		return Object.keys(obj).length === 0;
+	}
+	return true;
+};
 
 export type Primitives = string | number | boolean | bigint | symbol | null | undefined;
 
@@ -55,7 +80,7 @@ export const jsonParse = <T>(jsonString: string, options?: JSONParseOptions<T>):
 		if (options?.fallbackValue !== undefined) {
 			return options.fallbackValue;
 		} else if (options?.errorMessage) {
-			throw new Error(options.errorMessage);
+			throw new ApplicationError(options.errorMessage);
 		}
 
 		throw error;
@@ -66,7 +91,7 @@ type JSONStringifyOptions = {
 	replaceCircularRefs?: boolean;
 };
 
-const replaceCircularReferences = <T>(value: T, knownObjects = new WeakSet()): T => {
+export const replaceCircularReferences = <T>(value: T, knownObjects = new WeakSet()): T => {
 	if (typeof value !== 'object' || value === null || value instanceof RegExp) return value;
 	if ('toJSON' in value && typeof value.toJSON === 'function') return value.toJSON() as T;
 	if (knownObjects.has(value)) return '[Circular Reference]' as T;
@@ -84,15 +109,18 @@ export const jsonStringify = (obj: unknown, options: JSONStringifyOptions = {}):
 };
 
 export const sleep = async (ms: number): Promise<void> =>
-	new Promise((resolve) => {
+	await new Promise((resolve) => {
 		setTimeout(resolve, ms);
 	});
 
 export function fileTypeFromMimeType(mimeType: string): BinaryFileType | undefined {
 	if (mimeType.startsWith('application/json')) return 'json';
+	if (mimeType.startsWith('text/html')) return 'html';
 	if (mimeType.startsWith('image/')) return 'image';
+	if (mimeType.startsWith('audio/')) return 'audio';
 	if (mimeType.startsWith('video/')) return 'video';
-	if (mimeType.startsWith('text/')) return 'text';
+	if (mimeType.startsWith('text/') || mimeType.startsWith('application/javascript')) return 'text';
+	if (mimeType.startsWith('application/pdf')) return 'pdf';
 	return;
 }
 
@@ -113,3 +141,41 @@ export function assert<T>(condition: T, msg?: string): asserts condition {
 		throw error;
 	}
 }
+
+export const isTraversableObject = (value: any): value is JsonObject => {
+	return value && typeof value === 'object' && !Array.isArray(value) && !!Object.keys(value).length;
+};
+
+export const removeCircularRefs = (obj: JsonObject, seen = new Set()) => {
+	seen.add(obj);
+	Object.entries(obj).forEach(([key, value]) => {
+		if (isTraversableObject(value)) {
+			// eslint-disable-next-line @typescript-eslint/no-unused-expressions
+			seen.has(value) ? (obj[key] = { circularReference: true }) : removeCircularRefs(value, seen);
+			return;
+		}
+		if (Array.isArray(value)) {
+			value.forEach((val, index) => {
+				if (seen.has(val)) {
+					value[index] = { circularReference: true };
+					return;
+				}
+				if (isTraversableObject(val)) {
+					removeCircularRefs(val, seen);
+				}
+			});
+		}
+	});
+};
+
+export function updateDisplayOptions(
+	displayOptions: IDisplayOptions,
+	properties: INodeProperties[],
+) {
+	return properties.map((nodeProperty) => {
+		return {
+			...nodeProperty,
+			displayOptions: merge({}, nodeProperty.displayOptions, displayOptions),
+		};
+	});
+}
diff --git a/packages/workflow/test/AugmentObject.test.ts b/packages/workflow/test/AugmentObject.test.ts
index e9fe6ee948697..25cc6d4317b23 100644
--- a/packages/workflow/test/AugmentObject.test.ts
+++ b/packages/workflow/test/AugmentObject.test.ts
@@ -6,7 +6,7 @@ describe('AugmentObject', () => {
 	describe('augmentArray', () => {
 		test('should work with arrays', () => {
 			const originalObject = [1, 2, 3, 4, null];
-			const copyOriginal = JSON.parse(JSON.stringify(originalObject));
+			const copyOriginal = deepCopy(originalObject);
 
 			const augmentedObject = augmentArray(originalObject);
 
@@ -70,7 +70,7 @@ describe('AugmentObject', () => {
 					},
 				],
 			};
-			const copyOriginal = JSON.parse(JSON.stringify(originalObject));
+			const copyOriginal = deepCopy(originalObject);
 
 			const augmentedObject = augmentObject(originalObject);
 
@@ -81,13 +81,13 @@ describe('AugmentObject', () => {
 
 			// Make sure that also array operations as push and length work as expected
 			// On lower levels
-			augmentedObject.a.b.c[0].a3!.b3.c3 = '033';
-			expect(augmentedObject.a.b.c[0].a3!.b3.c3).toEqual('033');
-			expect(originalObject.a.b.c[0].a3!.b3.c3).toEqual('03');
+			augmentedObject.a.b.c[0].a3.b3.c3 = '033';
+			expect(augmentedObject.a.b.c[0].a3.b3.c3).toEqual('033');
+			expect(originalObject.a.b.c[0].a3.b3.c3).toEqual('03');
 
-			augmentedObject.a.b.c[1].a3!.b3.c3 = '133';
-			expect(augmentedObject.a.b.c[1].a3!.b3.c3).toEqual('133');
-			expect(originalObject.a.b.c[1].a3!.b3.c3).toEqual('13');
+			augmentedObject.a.b.c[1].a3.b3.c3 = '133';
+			expect(augmentedObject.a.b.c[1].a3.b3.c3).toEqual('133');
+			expect(originalObject.a.b.c[1].a3.b3.c3).toEqual('13');
 
 			augmentedObject.a.b.c.push({
 				a3: {
@@ -203,7 +203,7 @@ describe('AugmentObject', () => {
 				d: date,
 				r: regexp,
 			};
-			const copyOriginal = JSON.parse(JSON.stringify(originalObject));
+			const copyOriginal = deepCopy(originalObject);
 
 			const augmentedObject = augmentObject(originalObject);
 
@@ -233,8 +233,8 @@ describe('AugmentObject', () => {
 				a: 9111,
 				b: '9222',
 				c: 3,
-				d: date,
-				r: regexp,
+				d: date.toJSON(),
+				r: regexp.toString(),
 			});
 		});
 
@@ -248,30 +248,30 @@ describe('AugmentObject', () => {
 				},
 				aa: '1',
 			};
-			const copyOriginal = JSON.parse(JSON.stringify(originalObject));
+			const copyOriginal = deepCopy(originalObject);
 
 			const augmentedObject = augmentObject(originalObject);
 
 			augmentedObject.a.bb = '92';
 			expect(originalObject.a.bb).toEqual('2');
-			expect(augmentedObject.a!.bb!).toEqual('92');
+			expect(augmentedObject.a.bb).toEqual('92');
 
-			augmentedObject.a!.b!.cc = '93';
+			augmentedObject.a.b.cc = '93';
 			expect(originalObject.a.b.cc).toEqual('3');
-			expect(augmentedObject.a!.b!.cc).toEqual('93');
+			expect(augmentedObject.a.b.cc).toEqual('93');
 
 			// @ts-ignore
-			augmentedObject.a!.b!.ccc = {
+			augmentedObject.a.b.ccc = {
 				d: '4',
 			};
 
 			// @ts-ignore
-			expect(augmentedObject.a!.b!.ccc).toEqual({ d: '4' });
+			expect(augmentedObject.a.b.ccc).toEqual({ d: '4' });
 
 			// @ts-ignore
-			augmentedObject.a!.b!.ccc.d = '94';
+			augmentedObject.a.b.ccc.d = '94';
 			// @ts-ignore
-			expect(augmentedObject.a!.b!.ccc.d).toEqual('94');
+			expect(augmentedObject.a.b.ccc.d).toEqual('94');
 
 			expect(originalObject).toEqual(copyOriginal);
 
@@ -300,7 +300,7 @@ describe('AugmentObject', () => {
 				},
 				aa: '1',
 			};
-			const copyOriginal = JSON.parse(JSON.stringify(originalObject));
+			const copyOriginal = deepCopy(originalObject);
 
 			const augmentedObject = augmentObject(originalObject);
 
@@ -351,7 +351,7 @@ describe('AugmentObject', () => {
 				},
 				aa: '1' as string | undefined,
 			};
-			const copyOriginal = JSON.parse(JSON.stringify(originalObject));
+			const copyOriginal = deepCopy(originalObject);
 
 			const augmentedObject = augmentObject(originalObject);
 
@@ -423,7 +423,7 @@ describe('AugmentObject', () => {
 				},
 				aa: '1' as string | undefined,
 			};
-			const copyOriginal = JSON.parse(JSON.stringify(originalObject));
+			const copyOriginal = deepCopy(originalObject);
 
 			const augmentedObject = augmentObject(originalObject);
 
@@ -528,5 +528,49 @@ describe('AugmentObject', () => {
 			const augmentedObject = augmentObject(originalObject);
 			expect(Object.keys(augmentedObject)).toEqual(['a', 'b']);
 		});
+
+		test('should return property descriptors', () => {
+			const originalObject = {
+				x: {
+					y: {},
+					z: {},
+				},
+			};
+			const augmentedObject = augmentObject(originalObject);
+
+			expect(Object.getOwnPropertyDescriptor(augmentedObject.x, 'y')).toEqual({
+				configurable: true,
+				enumerable: true,
+				value: {},
+				writable: true,
+			});
+
+			delete augmentedObject.x.y;
+			expect(augmentedObject.x.hasOwnProperty('y')).toEqual(false);
+
+			augmentedObject.x.y = 42;
+			expect(augmentedObject.x.hasOwnProperty('y')).toEqual(true);
+			expect(Object.getOwnPropertyDescriptor(augmentedObject.x, 'y')).toEqual({
+				configurable: true,
+				enumerable: true,
+				value: 42,
+				writable: true,
+			});
+		});
+
+		test('should return valid values on `has` calls', () => {
+			const originalObject = {
+				x: {
+					y: {},
+				},
+			};
+			const augmentedObject = augmentObject(originalObject);
+			expect('y' in augmentedObject.x).toBe(true);
+			expect('z' in augmentedObject.x).toBe(false);
+
+			augmentedObject.x.z = 5;
+			expect('z' in augmentedObject.x).toBe(true);
+			expect('y' in augmentedObject.x).toBe(true);
+		});
 	});
 });
diff --git a/packages/workflow/test/Expression.test.ts b/packages/workflow/test/Expression.test.ts
index 73bc289311be1..f9d15fb0af5f3 100644
--- a/packages/workflow/test/Expression.test.ts
+++ b/packages/workflow/test/Expression.test.ts
@@ -3,211 +3,219 @@
  */
 
 import { DateTime, Duration, Interval } from 'luxon';
-import { Expression } from '@/Expression';
 import { Workflow } from '@/Workflow';
 import * as Helpers from './Helpers';
-import {
-	baseFixtures,
-	ExpressionTestEvaluation,
-	ExpressionTestTransform,
-} from './ExpressionFixtures/base';
-import { INodeExecutionData } from '@/Interfaces';
+import type { ExpressionTestEvaluation, ExpressionTestTransform } from './ExpressionFixtures/base';
+import { baseFixtures } from './ExpressionFixtures/base';
+import type { INodeExecutionData } from '@/Interfaces';
 import { extendSyntax } from '@/Extensions/ExpressionExtension';
+import { ExpressionError } from '@/errors/expression.error';
+import { setDifferEnabled, setEvaluator } from '@/ExpressionEvaluatorProxy';
+import { workflow } from './ExpressionExtensions/Helpers';
+
+setDifferEnabled(true);
+
+for (const evaluator of ['tmpl', 'tournament'] as const) {
+	setEvaluator(evaluator);
+	describe(`Expression (with ${evaluator})`, () => {
+		describe('getParameterValue()', () => {
+			const nodeTypes = Helpers.NodeTypes();
+			const workflow = new Workflow({
+				id: '1',
+				nodes: [
+					{
+						name: 'node',
+						typeVersion: 1,
+						type: 'test.set',
+						id: 'uuid-1234',
+						position: [0, 0],
+						parameters: {},
+					},
+				],
+				connections: {},
+				active: false,
+				nodeTypes,
+			});
+			const expression = workflow.expression;
 
-describe('Expression', () => {
-	describe('getParameterValue()', () => {
-		const nodeTypes = Helpers.NodeTypes();
-		const workflow = new Workflow({
-			nodes: [
-				{
-					name: 'node',
-					typeVersion: 1,
-					type: 'test.set',
-					id: 'uuid-1234',
-					position: [0, 0],
-					parameters: {},
-				},
-			],
-			connections: {},
-			active: false,
-			nodeTypes,
-		});
-		const expression = new Expression(workflow);
-
-		const evaluate = (value: string) =>
-			expression.getParameterValue(value, null, 0, 0, 'node', [], 'manual', '', {});
+			const evaluate = (value: string) =>
+				expression.getParameterValue(value, null, 0, 0, 'node', [], 'manual', {});
 
-		it('should not be able to use global built-ins from denylist', () => {
-			expect(evaluate('={{document}}')).toEqual({});
-			expect(evaluate('={{window}}')).toEqual({});
+			it('should not be able to use global built-ins from denylist', () => {
+				expect(evaluate('={{document}}')).toEqual({});
+				expect(evaluate('={{window}}')).toEqual({});
 
-			expect(evaluate('={{Window}}')).toEqual({});
-			expect(evaluate('={{globalThis}}')).toEqual({});
-			expect(evaluate('={{self}}')).toEqual({});
+				expect(evaluate('={{Window}}')).toEqual({});
+				expect(evaluate('={{globalThis}}')).toEqual({});
+				expect(evaluate('={{self}}')).toEqual({});
 
-			expect(evaluate('={{alert}}')).toEqual({});
-			expect(evaluate('={{prompt}}')).toEqual({});
-			expect(evaluate('={{confirm}}')).toEqual({});
+				expect(evaluate('={{alert}}')).toEqual({});
+				expect(evaluate('={{prompt}}')).toEqual({});
+				expect(evaluate('={{confirm}}')).toEqual({});
 
-			expect(evaluate('={{eval}}')).toEqual({});
-			expect(evaluate('={{uneval}}')).toEqual({});
-			expect(evaluate('={{setTimeout}}')).toEqual({});
-			expect(evaluate('={{setInterval}}')).toEqual({});
-			expect(evaluate('={{Function}}')).toEqual({});
+				expect(evaluate('={{eval}}')).toEqual({});
+				expect(evaluate('={{uneval}}')).toEqual({});
+				expect(evaluate('={{setTimeout}}')).toEqual({});
+				expect(evaluate('={{setInterval}}')).toEqual({});
+				expect(evaluate('={{Function}}')).toEqual({});
 
-			expect(evaluate('={{fetch}}')).toEqual({});
-			expect(evaluate('={{XMLHttpRequest}}')).toEqual({});
+				expect(evaluate('={{fetch}}')).toEqual({});
+				expect(evaluate('={{XMLHttpRequest}}')).toEqual({});
 
-			expect(evaluate('={{Promise}}')).toEqual({});
-			expect(evaluate('={{Generator}}')).toEqual({});
-			expect(evaluate('={{GeneratorFunction}}')).toEqual({});
-			expect(evaluate('={{AsyncFunction}}')).toEqual({});
-			expect(evaluate('={{AsyncGenerator}}')).toEqual({});
-			expect(evaluate('={{AsyncGeneratorFunction}}')).toEqual({});
+				expect(evaluate('={{Promise}}')).toEqual({});
+				expect(evaluate('={{Generator}}')).toEqual({});
+				expect(evaluate('={{GeneratorFunction}}')).toEqual({});
+				expect(evaluate('={{AsyncFunction}}')).toEqual({});
+				expect(evaluate('={{AsyncGenerator}}')).toEqual({});
+				expect(evaluate('={{AsyncGeneratorFunction}}')).toEqual({});
 
-			expect(evaluate('={{WebAssembly}}')).toEqual({});
+				expect(evaluate('={{WebAssembly}}')).toEqual({});
 
-			expect(evaluate('={{Reflect}}')).toEqual({});
-			expect(evaluate('={{Proxy}}')).toEqual({});
+				expect(evaluate('={{Reflect}}')).toEqual({});
+				expect(evaluate('={{Proxy}}')).toEqual({});
 
-			expect(evaluate('={{constructor}}')).toEqual({});
+				expect(evaluate('={{constructor}}')).toEqual({});
 
-			expect(evaluate('={{escape}}')).toEqual({});
-			expect(evaluate('={{unescape}}')).toEqual({});
-		});
+				expect(evaluate('={{escape}}')).toEqual({});
+				expect(evaluate('={{unescape}}')).toEqual({});
+			});
 
-		it('should be able to use global built-ins from allowlist', () => {
-			expect(evaluate('={{new Date()}}')).toBeInstanceOf(Date);
-			expect(evaluate('={{DateTime.now().toLocaleString()}}')).toEqual(
-				DateTime.now().toLocaleString(),
-			);
-			expect(evaluate('={{Interval.after(new Date(), 100)}}')).toEqual(
-				Interval.after(new Date(), 100),
-			);
-			expect(evaluate('={{Duration.fromMillis(100)}}')).toEqual(Duration.fromMillis(100));
-
-			expect(evaluate('={{new Object()}}')).toEqual(new Object());
-
-			expect(evaluate('={{new Array()}}')).toEqual(new Array());
-			expect(evaluate('={{new Int8Array()}}')).toEqual(new Int8Array());
-			expect(evaluate('={{new Uint8Array()}}')).toEqual(new Uint8Array());
-			expect(evaluate('={{new Uint8ClampedArray()}}')).toEqual(new Uint8ClampedArray());
-			expect(evaluate('={{new Int16Array()}}')).toEqual(new Int16Array());
-			expect(evaluate('={{new Uint16Array()}}')).toEqual(new Uint16Array());
-			expect(evaluate('={{new Int32Array()}}')).toEqual(new Int32Array());
-			expect(evaluate('={{new Uint32Array()}}')).toEqual(new Uint32Array());
-			expect(evaluate('={{new Float32Array()}}')).toEqual(new Float32Array());
-			expect(evaluate('={{new Float64Array()}}')).toEqual(new Float64Array());
-			expect(evaluate('={{new BigInt64Array()}}')).toEqual(new BigInt64Array());
-			expect(evaluate('={{new BigUint64Array()}}')).toEqual(new BigUint64Array());
-
-			expect(evaluate('={{new Map()}}')).toEqual(new Map());
-			expect(evaluate('={{new WeakMap()}}')).toEqual(new WeakMap());
-			expect(evaluate('={{new Set()}}')).toEqual(new Set());
-			expect(evaluate('={{new WeakSet()}}')).toEqual(new WeakSet());
-
-			expect(evaluate('={{new Error()}}')).toEqual(new Error());
-			expect(evaluate('={{new TypeError()}}')).toEqual(new TypeError());
-			expect(evaluate('={{new SyntaxError()}}')).toEqual(new SyntaxError());
-			expect(evaluate('={{new EvalError()}}')).toEqual(new EvalError());
-			expect(evaluate('={{new RangeError()}}')).toEqual(new RangeError());
-			expect(evaluate('={{new ReferenceError()}}')).toEqual(new ReferenceError());
-			expect(evaluate('={{new URIError()}}')).toEqual(new URIError());
-
-			expect(evaluate('={{Intl}}')).toEqual(Intl);
-
-			expect(evaluate('={{new String()}}')).toEqual(new String());
-			expect(evaluate("={{new RegExp('')}}")).toEqual(new RegExp(''));
-
-			expect(evaluate('={{Math}}')).toEqual(Math);
-			expect(evaluate('={{new Number()}}')).toEqual(new Number());
-			expect(evaluate("={{BigInt('1')}}")).toEqual(BigInt('1'));
-			expect(evaluate('={{Infinity}}')).toEqual(Infinity);
-			expect(evaluate('={{NaN}}')).toEqual(NaN);
-			expect(evaluate('={{isFinite(1)}}')).toEqual(isFinite(1));
-			expect(evaluate('={{isNaN(1)}}')).toEqual(isNaN(1));
-			expect(evaluate("={{parseFloat('1')}}")).toEqual(parseFloat('1'));
-			expect(evaluate("={{parseInt('1', 10)}}")).toEqual(parseInt('1', 10));
-
-			expect(evaluate('={{JSON.stringify({})}}')).toEqual(JSON.stringify({}));
-			expect(evaluate('={{new ArrayBuffer(10)}}')).toEqual(new ArrayBuffer(10));
-			expect(evaluate('={{new SharedArrayBuffer(10)}}')).toEqual(new SharedArrayBuffer(10));
-			expect(evaluate('={{Atomics}}')).toEqual(Atomics);
-			expect(evaluate('={{new DataView(new ArrayBuffer(1))}}')).toEqual(
-				new DataView(new ArrayBuffer(1)),
-			);
-
-			expect(evaluate("={{encodeURI('https://google.com')}}")).toEqual(
-				encodeURI('https://google.com'),
-			);
-			expect(evaluate("={{encodeURIComponent('https://google.com')}}")).toEqual(
-				encodeURIComponent('https://google.com'),
-			);
-			expect(evaluate("={{decodeURI('https://google.com')}}")).toEqual(
-				decodeURI('https://google.com'),
-			);
-			expect(evaluate("={{decodeURIComponent('https://google.com')}}")).toEqual(
-				decodeURIComponent('https://google.com'),
-			);
-
-			expect(evaluate('={{Boolean(1)}}')).toEqual(Boolean(1));
-			expect(evaluate('={{Symbol(1).toString()}}')).toEqual(Symbol(1).toString());
-		});
-	});
+			it('should be able to use global built-ins from allowlist', () => {
+				expect(evaluate('={{new Date()}}')).toBeInstanceOf(Date);
+				expect(evaluate('={{DateTime.now().toLocaleString()}}')).toEqual(
+					DateTime.now().toLocaleString(),
+				);
+
+				jest.useFakeTimers({ now: new Date() });
+				expect(evaluate('={{Interval.after(new Date(), 100)}}')).toEqual(
+					Interval.after(new Date(), 100),
+				);
+				jest.useRealTimers();
+
+				expect(evaluate('={{Duration.fromMillis(100)}}')).toEqual(Duration.fromMillis(100));
+
+				expect(evaluate('={{new Object()}}')).toEqual(new Object());
+
+				expect(evaluate('={{new Array()}}')).toEqual([]);
+				expect(evaluate('={{new Int8Array()}}')).toEqual(new Int8Array());
+				expect(evaluate('={{new Uint8Array()}}')).toEqual(new Uint8Array());
+				expect(evaluate('={{new Uint8ClampedArray()}}')).toEqual(new Uint8ClampedArray());
+				expect(evaluate('={{new Int16Array()}}')).toEqual(new Int16Array());
+				expect(evaluate('={{new Uint16Array()}}')).toEqual(new Uint16Array());
+				expect(evaluate('={{new Int32Array()}}')).toEqual(new Int32Array());
+				expect(evaluate('={{new Uint32Array()}}')).toEqual(new Uint32Array());
+				expect(evaluate('={{new Float32Array()}}')).toEqual(new Float32Array());
+				expect(evaluate('={{new Float64Array()}}')).toEqual(new Float64Array());
+				expect(evaluate('={{new BigInt64Array()}}')).toEqual(new BigInt64Array());
+				expect(evaluate('={{new BigUint64Array()}}')).toEqual(new BigUint64Array());
+
+				expect(evaluate('={{new Map()}}')).toEqual(new Map());
+				expect(evaluate('={{new WeakMap()}}')).toEqual(new WeakMap());
+				expect(evaluate('={{new Set()}}')).toEqual(new Set());
+				expect(evaluate('={{new WeakSet()}}')).toEqual(new WeakSet());
+
+				expect(evaluate('={{new Error()}}')).toEqual(new Error());
+				expect(evaluate('={{new TypeError()}}')).toEqual(new TypeError());
+				expect(evaluate('={{new SyntaxError()}}')).toEqual(new SyntaxError());
+				expect(evaluate('={{new EvalError()}}')).toEqual(new EvalError());
+				expect(evaluate('={{new RangeError()}}')).toEqual(new RangeError());
+				expect(evaluate('={{new ReferenceError()}}')).toEqual(new ReferenceError());
+				expect(evaluate('={{new URIError()}}')).toEqual(new URIError());
+
+				expect(evaluate('={{Intl}}')).toEqual(Intl);
+
+				expect(evaluate('={{new String()}}')).toEqual(new String());
+				expect(evaluate("={{new RegExp('')}}")).toEqual(new RegExp(''));
+
+				expect(evaluate('={{Math}}')).toEqual(Math);
+				expect(evaluate('={{new Number()}}')).toEqual(new Number());
+				expect(evaluate("={{BigInt('1')}}")).toEqual(BigInt('1'));
+				expect(evaluate('={{Infinity}}')).toEqual(Infinity);
+				expect(evaluate('={{NaN}}')).toEqual(NaN);
+				expect(evaluate('={{isFinite(1)}}')).toEqual(isFinite(1));
+				expect(evaluate('={{isNaN(1)}}')).toEqual(isNaN(1));
+				expect(evaluate("={{parseFloat('1')}}")).toEqual(parseFloat('1'));
+				expect(evaluate("={{parseInt('1', 10)}}")).toEqual(parseInt('1', 10));
+
+				expect(evaluate('={{JSON.stringify({})}}')).toEqual(JSON.stringify({}));
+				expect(evaluate('={{new ArrayBuffer(10)}}')).toEqual(new ArrayBuffer(10));
+				expect(evaluate('={{new SharedArrayBuffer(10)}}')).toEqual(new SharedArrayBuffer(10));
+				expect(evaluate('={{Atomics}}')).toEqual(Atomics);
+				expect(evaluate('={{new DataView(new ArrayBuffer(1))}}')).toEqual(
+					new DataView(new ArrayBuffer(1)),
+				);
+
+				expect(evaluate("={{encodeURI('https://google.com')}}")).toEqual(
+					encodeURI('https://google.com'),
+				);
+				expect(evaluate("={{encodeURIComponent('https://google.com')}}")).toEqual(
+					encodeURIComponent('https://google.com'),
+				);
+				expect(evaluate("={{decodeURI('https://google.com')}}")).toEqual(
+					decodeURI('https://google.com'),
+				);
+				expect(evaluate("={{decodeURIComponent('https://google.com')}}")).toEqual(
+					decodeURIComponent('https://google.com'),
+				);
+
+				expect(evaluate('={{Boolean(1)}}')).toEqual(Boolean(1));
+				expect(evaluate('={{Symbol(1).toString()}}')).toEqual(Symbol(1).toString());
+			});
 
-	describe('Test all expression value fixtures', () => {
-		const nodeTypes = Helpers.NodeTypes();
-		const workflow = new Workflow({
-			nodes: [
-				{
-					name: 'node',
-					typeVersion: 1,
-					type: 'test.set',
-					id: 'uuid-1234',
-					position: [0, 0],
-					parameters: {},
-				},
-			],
-			connections: {},
-			active: false,
-			nodeTypes,
+			it('should not able to do arbitrary code execution', () => {
+				const testFn = jest.fn();
+				Object.assign(global, { testFn });
+				expect(() => evaluate("={{ Date['constructor']('testFn()')()}}")).toThrowError(
+					new ExpressionError('Arbitrary code execution detected'),
+				);
+				expect(testFn).not.toHaveBeenCalled();
+			});
 		});
 
-		const expression = new Expression(workflow);
+		describe('Test all expression value fixtures', () => {
+			const expression = workflow.expression;
 
-		const evaluate = (value: string, data: INodeExecutionData[]) => {
-			return expression.getParameterValue(value, null, 0, 0, 'node', data, 'manual', '', {});
-		};
+			const evaluate = (value: string, data: INodeExecutionData[]) => {
+				const itemIndex = data.length === 0 ? -1 : 0;
+				return expression.getParameterValue(value, null, 0, itemIndex, 'node', data, 'manual', {});
+			};
 
-		for (const t of baseFixtures) {
-			if (!t.tests.some((test) => test.type === 'evaluation')) {
-				continue;
-			}
-			test(t.expression, () => {
-				for (const test of t.tests.filter(
-					(test) => test.type === 'evaluation',
-				) as ExpressionTestEvaluation[]) {
-					expect(evaluate(t.expression, test.input.map((d) => ({ json: d })) as any)).toStrictEqual(
-						test.output,
-					);
+			for (const t of baseFixtures) {
+				if (!t.tests.some((test) => test.type === 'evaluation')) {
+					continue;
 				}
-			});
-		}
-	});
-
-	describe('Test all expression transform fixtures', () => {
-		for (const t of baseFixtures) {
-			if (!t.tests.some((test) => test.type === 'transform')) {
-				continue;
+				test(t.expression, () => {
+					const evaluationTests = t.tests.filter(
+						(test) => test.type === 'evaluation',
+					) as ExpressionTestEvaluation[];
+
+					for (const test of evaluationTests) {
+						const input = test.input.map((d) => ({ json: d })) as any;
+
+						if ('error' in test) {
+							expect(() => evaluate(t.expression, input)).toThrowError(test.error);
+						} else {
+							expect(evaluate(t.expression, input)).toStrictEqual(test.output);
+						}
+					}
+				});
 			}
-			test(t.expression, () => {
-				for (const test of t.tests.filter(
-					(test) => test.type === 'transform',
-				) as ExpressionTestTransform[]) {
-					const expr = t.expression;
-					expect(extendSyntax(expr, test.forceTransform)).toEqual(test.result ?? expr);
+		});
+
+		describe('Test all expression transform fixtures', () => {
+			for (const t of baseFixtures) {
+				if (!t.tests.some((test) => test.type === 'transform')) {
+					continue;
 				}
-			});
-		}
+				test(t.expression, () => {
+					for (const test of t.tests.filter(
+						(test) => test.type === 'transform',
+					) as ExpressionTestTransform[]) {
+						const expr = t.expression;
+						expect(extendSyntax(expr, test.forceTransform)).toEqual(test.result ?? expr);
+					}
+				});
+			}
+		});
 	});
-});
+}
diff --git a/packages/workflow/test/ExpressionExtensions/ArrayExtensions.test.ts b/packages/workflow/test/ExpressionExtensions/ArrayExtensions.test.ts
index fbd62432e4bc5..299afed4c798b 100644
--- a/packages/workflow/test/ExpressionExtensions/ArrayExtensions.test.ts
+++ b/packages/workflow/test/ExpressionExtensions/ArrayExtensions.test.ts
@@ -2,6 +2,7 @@
  * @jest-environment jsdom
  */
 
+import { arrayExtensions } from '../../src/Extensions/ArrayExtensions';
 import { evaluate } from './Helpers';
 
 describe('Data Transformation Functions', () => {
@@ -25,9 +26,7 @@ describe('Data Transformation Functions', () => {
 				{ value: 6, string: '6' },
 				{ value: { something: 'else' } }
 			].pluck("value") }}`),
-			).toEqual(
-				expect.arrayContaining([1, 2, 3, 4, 5, 6, { something: 'else' }]),
-			);
+			).toEqual(expect.arrayContaining([1, 2, 3, 4, 5, 6, { something: 'else' }]));
 		});
 
 		test('.pluck() should work correctly for multiple values', () => {
@@ -50,7 +49,10 @@ describe('Data Transformation Functions', () => {
 					}
 			].pluck("firstName", "lastName") }}`),
 			).toEqual(
-				expect.arrayContaining([["John", "Doe"],["Jane", "Doe"]]),
+				expect.arrayContaining([
+					['John', 'Doe'],
+					['Jane', 'Doe'],
+				]),
 			);
 		});
 
@@ -73,7 +75,7 @@ describe('Data Transformation Functions', () => {
 					{ value: 4, string: '4' },
 					{ value: 5, string: '5' },
 					{ value: 6, string: '6' },
-					{ value: { something: 'else' } }
+					{ value: { something: 'else' } },
 				]),
 			);
 		});
@@ -86,10 +88,8 @@ describe('Data Transformation Functions', () => {
 
 		test('.unique() should work on an arrays containing nulls, objects and arrays', () => {
 			expect(
-				evaluate(
-					'={{ [1, 2, 3, "as", {}, {}, 1, 2, [1,2], "[sad]", "[sad]", null].unique() }}',
-				),
-			).toEqual([1, 2, 3, "as", {}, [1,2], "[sad]", null]);
+				evaluate('={{ [1, 2, 3, "as", {}, {}, 1, 2, [1,2], "[sad]", "[sad]", null].unique() }}'),
+			).toEqual([1, 2, 3, 'as', {}, [1, 2], '[sad]', null]);
 		});
 
 		test('.isEmpty() should work correctly on an array', () => {
@@ -113,7 +113,7 @@ describe('Data Transformation Functions', () => {
 				evaluate(
 					'={{ [{ test1: 1, test2: 2 }, { test1: 1, test3: 3 }].merge([{ test1: 2, test3: 3 }, { test4: 4 }]) }}',
 				),
-			).toEqual({"test1": 1, "test2": 2, "test3": 3, "test4": 4});
+			).toEqual({ test1: 1, test2: 2, test3: 3, test4: 4 });
 		});
 
 		test('.merge() should work correctly without arguments', () => {
@@ -121,7 +121,7 @@ describe('Data Transformation Functions', () => {
 				evaluate(
 					'={{ [{ a: 1, some: null }, { a: 2, c: "something" }, 2, "asds", { b: 23 }, null, [1, 2]].merge() }}',
 				),
-			).toEqual({"a": 1, "some": null, "c": "something", "b": 23});
+			).toEqual({ a: 1, some: null, c: 'something', b: 23 });
 		});
 
 		test('.smartJoin() should work correctly on an array of objects', () => {
@@ -175,11 +175,14 @@ describe('Data Transformation Functions', () => {
 		});
 
 		test('.union() should work on an arrays containing nulls, objects and arrays', () => {
-			expect(
-				evaluate(
-					'={{ [1, 2, "dd", {}, null].union([1, {}, null, 3]) }}',
-				),
-			).toEqual([1, 2, "dd", {}, null, 3]);
+			expect(evaluate('={{ [1, 2, "dd", {}, null].union([1, {}, null, 3]) }}')).toEqual([
+				1,
+				2,
+				'dd',
+				{},
+				null,
+				3,
+			]);
 		});
 
 		test('.intersection() should work on an array of objects', () => {
@@ -191,11 +194,11 @@ describe('Data Transformation Functions', () => {
 		});
 
 		test('.intersection() should work on an arrays containing nulls, objects and arrays', () => {
-			expect(
-				evaluate(
-					'={{ [1, 2, "dd", {}, null].intersection([1, {}, null]) }}',
-				),
-			).toEqual([1, {}, null]);
+			expect(evaluate('={{ [1, 2, "dd", {}, null].intersection([1, {}, null]) }}')).toEqual([
+				1,
+				{},
+				null,
+			]);
 		});
 
 		test('.difference() should work on an array of objects', () => {
@@ -212,10 +215,8 @@ describe('Data Transformation Functions', () => {
 
 		test('.difference() should work on an arrays containing nulls, objects and arrays', () => {
 			expect(
-				evaluate(
-					'={{ [1, 2, "dd", {}, null, ["a", 1]].difference([1, {}, null, ["a", 1]]) }}',
-				),
-			).toEqual([2, "dd"]);
+				evaluate('={{ [1, 2, "dd", {}, null, ["a", 1]].difference([1, {}, null, ["a", 1]]) }}'),
+			).toEqual([2, 'dd']);
 		});
 
 		test('.compact() should work on an array', () => {
@@ -234,5 +235,27 @@ describe('Data Transformation Functions', () => {
 				[16, 17, 18, 19, 20],
 			]);
 		});
+
+		test('.toJsonString() should work on an array', () => {
+			expect(evaluate('={{ [true, 1, "one", {foo: "bar"}].toJsonString() }}')).toEqual(
+				'[true,1,"one",{"foo":"bar"}]',
+			);
+		});
+
+		describe('Conversion methods', () => {
+			test('should exist but return undefined (to not break expressions with mixed data)', () => {
+				expect(evaluate('={{ numberList(1, 20).toInt() }}')).toBeUndefined();
+				expect(evaluate('={{ numberList(1, 20).toFloat() }}')).toBeUndefined();
+				expect(evaluate('={{ numberList(1, 20).toBoolean() }}')).toBeUndefined();
+				expect(evaluate('={{ numberList(1, 20).toDateTime() }}')).toBeUndefined();
+			});
+
+			test('should not have a doc (hidden from autocomplete)', () => {
+				expect(arrayExtensions.functions.toInt.doc).toBeUndefined();
+				expect(arrayExtensions.functions.toFloat.doc).toBeUndefined();
+				expect(arrayExtensions.functions.toBoolean.doc).toBeUndefined();
+				expect(arrayExtensions.functions.toDateTime.doc).toBeUndefined();
+			});
+		});
 	});
 });
diff --git a/packages/workflow/test/ExpressionExtensions/BooleanExtensions.test.ts b/packages/workflow/test/ExpressionExtensions/BooleanExtensions.test.ts
new file mode 100644
index 0000000000000..eccb53e50b7e1
--- /dev/null
+++ b/packages/workflow/test/ExpressionExtensions/BooleanExtensions.test.ts
@@ -0,0 +1,39 @@
+/**
+ * @jest-environment jsdom
+ */
+
+import { booleanExtensions } from '../../src/Extensions/BooleanExtensions';
+import { evaluate } from './Helpers';
+
+describe('Data Transformation Functions', () => {
+	describe('Boolean Data Transformation Functions', () => {
+		describe('Conversion methods', () => {
+			describe('toInt/toFloat', () => {
+				test('should return 1 for true, 0 for false', () => {
+					expect(evaluate('={{ (true).toInt() }}')).toEqual(1);
+					expect(evaluate('={{ (true).toFloat() }}')).toEqual(1);
+					expect(evaluate('={{ (false).toInt() }}')).toEqual(0);
+					expect(evaluate('={{ (false).toFloat() }}')).toEqual(0);
+				});
+			});
+
+			describe('toDateTime', () => {
+				test('should return undefined', () => {
+					expect(evaluate('={{ (true).toDateTime() }}')).toBeUndefined();
+				});
+			});
+
+			describe('toBoolean', () => {
+				test('should return itself', () => {
+					expect(evaluate('={{ (true).toDateTime() }}')).toBeUndefined();
+				});
+			});
+
+			test('should not have a doc (hidden from autocomplete)', () => {
+				expect(booleanExtensions.functions.toFloat.doc).toBeUndefined();
+				expect(booleanExtensions.functions.toBoolean.doc).toBeUndefined();
+				expect(booleanExtensions.functions.toDateTime.doc).toBeUndefined();
+			});
+		});
+	});
+});
diff --git a/packages/workflow/test/ExpressionExtensions/DateExtensions.test.ts b/packages/workflow/test/ExpressionExtensions/DateExtensions.test.ts
index 917c20cb48870..e2fd830f11d24 100644
--- a/packages/workflow/test/ExpressionExtensions/DateExtensions.test.ts
+++ b/packages/workflow/test/ExpressionExtensions/DateExtensions.test.ts
@@ -3,7 +3,11 @@
  */
 
 import { DateTime } from 'luxon';
-import { evaluate, getLocalISOString, TEST_TIMEZONE } from './Helpers';
+import { getGlobalState } from '@/GlobalState';
+import { evaluate, getLocalISOString } from './Helpers';
+import { dateExtensions } from '../../src/Extensions/DateExtensions';
+
+const { defaultTimezone } = getGlobalState();
 
 describe('Data Transformation Functions', () => {
 	describe('Date Data Transformation Functions', () => {
@@ -16,13 +20,17 @@ describe('Data Transformation Functions', () => {
 
 		test('.beginningOf("week") should work correctly on a date', () => {
 			expect(evaluate('={{ DateTime.local(2023, 1, 20).beginningOf("week") }}')).toEqual(
-				DateTime.local(2023, 1, 16, { zone: TEST_TIMEZONE }).toJSDate(),
+				DateTime.local(2023, 1, 16, { zone: defaultTimezone }),
+			);
+
+			expect(evaluate('={{ new Date(2023, 0, 20).beginningOf("week") }}')).toEqual(
+				DateTime.local(2023, 1, 16, { zone: defaultTimezone }).toJSDate(),
 			);
 		});
 
 		test('.beginningOf("week") should work correctly on a string', () => {
 			const evaluatedDate = evaluate('={{ "2023-01-30".toDate().beginningOf("week") }}');
-			const expectedDate = DateTime.local(2023, 1, 23, { zone: TEST_TIMEZONE }).toJSDate();
+			const expectedDate = DateTime.local(2023, 1, 23, { zone: defaultTimezone }).toJSDate();
 
 			if (evaluatedDate && evaluatedDate instanceof Date) {
 				expect(evaluatedDate.toDateString()).toEqual(expectedDate.toDateString());
@@ -31,7 +39,7 @@ describe('Data Transformation Functions', () => {
 
 		test('.beginningOf("month") should work correctly on a string', () => {
 			const evaluatedDate = evaluate('={{ "2023-06-16".toDate().beginningOf("month") }}');
-			const expectedDate = DateTime.local(2023, 6, 1, { zone: TEST_TIMEZONE }).toJSDate();
+			const expectedDate = DateTime.local(2023, 6, 1, { zone: defaultTimezone }).toJSDate();
 
 			if (evaluatedDate && evaluatedDate instanceof Date) {
 				expect(evaluatedDate.toDateString()).toEqual(expectedDate.toDateString());
@@ -40,7 +48,7 @@ describe('Data Transformation Functions', () => {
 
 		test('.beginningOf("year") should work correctly on a string', () => {
 			const evaluatedDate = evaluate('={{ "2023-01-30".toDate().beginningOf("year") }}');
-			const expectedDate = DateTime.local(2023, 1, 1, { zone: TEST_TIMEZONE }).toJSDate();
+			const expectedDate = DateTime.local(2023, 1, 1, { zone: defaultTimezone }).toJSDate();
 
 			if (evaluatedDate && evaluatedDate instanceof Date) {
 				expect(evaluatedDate.toDateString()).toEqual(expectedDate.toDateString());
@@ -49,7 +57,10 @@ describe('Data Transformation Functions', () => {
 
 		test('.endOfMonth() should work correctly on a date', () => {
 			expect(evaluate('={{ DateTime.local(2023, 1, 16).endOfMonth() }}')).toEqual(
-				DateTime.local(2023, 1, 31, 23, 59, 59, 999, { zone: TEST_TIMEZONE }).toJSDate(),
+				DateTime.local(2023, 1, 31, 23, 59, 59, 999, { zone: defaultTimezone }),
+			);
+			expect(evaluate('={{ new Date(2023, 0, 16).endOfMonth() }}')).toEqual(
+				DateTime.local(2023, 1, 31, 23, 59, 59, 999, { zone: defaultTimezone }).toJSDate(),
 			);
 		});
 
@@ -61,7 +72,6 @@ describe('Data Transformation Functions', () => {
 			expect(evaluate('={{ DateTime.local(2023, 1, 20).extract() }}')).toEqual(3);
 		});
 
-
 		test('.format("yyyy LLL dd") should work correctly on a date', () => {
 			expect(evaluate('={{ DateTime.local(2023, 1, 16).format("yyyy LLL dd") }}')).toEqual(
 				'2023 Jan 16',
@@ -74,27 +84,80 @@ describe('Data Transformation Functions', () => {
 		});
 
 		test('.inBetween() should work on string and Date', () => {
-			expect(evaluate(`={{ $now.isBetween('2023-06-23'.toDate(), '2023-06-23') }}`)).toBeDefined();
+			expect(evaluate("={{ $now.isBetween('2023-06-23'.toDate(), '2023-06-23') }}")).toBeDefined();
 		});
 
 		test('.inBetween() should work on string and DateTime', () => {
-			expect(evaluate(`={{ $now.isBetween($now, '2023-06-23') }}`)).toBeDefined();
+			expect(evaluate("={{ $now.isBetween($now, '2023-06-23') }}")).toBeDefined();
 		});
 
 		test('.inBetween() should not work for invalid strings', () => {
-			expect(evaluate(`={{ $now.isBetween($now, 'invalid') }}`)).toBeUndefined();
+			expect(evaluate("={{ $now.isBetween($now, 'invalid') }}")).toBeUndefined();
 		});
 
 		test('.inBetween() should not work for numbers', () => {
-			expect(evaluate(`={{ $now.isBetween($now, 1) }}`)).toBeUndefined();
+			expect(evaluate('={{ $now.isBetween($now, 1) }}')).toBeUndefined();
 		});
 
 		test('.inBetween() should not work for a single argument', () => {
-			expect(() => evaluate(`={{ $now.isBetween($now) }}`)).toThrow();
+			expect(() => evaluate('={{ $now.isBetween($now) }}')).toThrow();
 		});
 
 		test('.inBetween() should not work for a more than two arguments', () => {
-			expect(() => evaluate(`={{ $now.isBetween($now, '2023-06-23', '2023-09-21'.toDate()) }}`)).toThrow();
+			expect(() =>
+				evaluate("={{ $now.isBetween($now, '2023-06-23', '2023-09-21'.toDate()) }}"),
+			).toThrow();
+		});
+
+		describe('toDateTime', () => {
+			test('should return itself for DateTime', () => {
+				const result = evaluate(
+					"={{ DateTime.fromFormat('01-01-2024', 'dd-MM-yyyy').toDateTime() }}",
+				) as unknown as DateTime;
+				expect(result).toBeInstanceOf(DateTime);
+				expect(result.day).toEqual(1);
+				expect(result.month).toEqual(1);
+				expect(result.year).toEqual(2024);
+			});
+
+			test('should return a DateTime for JS Date', () => {
+				const result = evaluate(
+					'={{ new Date(2024, 0, 1, 12).toDateTime() }}',
+				) as unknown as DateTime;
+				expect(result).toBeInstanceOf(DateTime);
+				expect(result.day).toEqual(1);
+				expect(result.month).toEqual(1);
+				expect(result.year).toEqual(2024);
+			});
+		});
+
+		describe('toInt/toFloat', () => {
+			test('should return milliseconds for DateTime', () => {
+				expect(evaluate("={{ DateTime.fromISO('2024-01-01T00:00:00.000Z').toInt() }}")).toEqual(
+					1704067200000,
+				);
+			});
+
+			test('should return milliseconds for JS Date', () => {
+				expect(evaluate('={{ new Date("2024-01-01T00:00:00.000Z").toFloat() }}')).toEqual(
+					1704067200000,
+				);
+			});
+
+			test('should not have a doc (hidden from autocomplete)', () => {
+				expect(dateExtensions.functions.toInt.doc).toBeUndefined();
+				expect(dateExtensions.functions.toFloat.doc).toBeUndefined();
+			});
+		});
+
+		describe('toBoolean', () => {
+			test('should return undefined', () => {
+				expect(evaluate('={{ new Date("2024-01-01T00:00:00.000Z").toBoolean() }}')).toBeUndefined();
+			});
+
+			test('should not have a doc (hidden from autocomplete)', () => {
+				expect(dateExtensions.functions.toBoolean.doc).toBeUndefined();
+			});
 		});
 	});
 });
diff --git a/packages/workflow/test/ExpressionExtensions/ExpressionExtension.test.ts b/packages/workflow/test/ExpressionExtensions/ExpressionExtension.test.ts
index 71dfe82fe9955..2c2f8e391a8fc 100644
--- a/packages/workflow/test/ExpressionExtensions/ExpressionExtension.test.ts
+++ b/packages/workflow/test/ExpressionExtensions/ExpressionExtension.test.ts
@@ -2,6 +2,8 @@
  * @jest-environment jsdom
  */
 
+/* eslint-disable n8n-local-rules/no-interpolation-in-regular-string */
+
 import { extendTransform } from '@/Extensions';
 import { joinExpression, splitExpression } from '@/Extensions/ExpressionParser';
 import { evaluate } from './Helpers';
@@ -226,5 +228,18 @@ describe('tmpl Expression Parser', () => {
 			expect(evaluate('={{ $not("") }}')).toEqual(true);
 			expect(evaluate('={{ $not("a") }}')).toEqual(false);
 		});
+		test('$ifEmpty', () => {
+			expect(evaluate('={{ $ifEmpty(1, "default") }}')).toEqual(1);
+			expect(evaluate('={{ $ifEmpty(0, "default") }}')).toEqual(0);
+			expect(evaluate('={{ $ifEmpty(false, "default") }}')).toEqual(false);
+			expect(evaluate('={{ $ifEmpty(true, "default") }}')).toEqual(true);
+			expect(evaluate('={{ $ifEmpty("", "default") }}')).toEqual('default');
+			expect(evaluate('={{ $ifEmpty(null, "default") }}')).toEqual('default');
+			expect(evaluate('={{ $ifEmpty(undefined, "default") }}')).toEqual('default');
+			expect(evaluate('={{ $ifEmpty([], "default") }}')).toEqual('default');
+			expect(evaluate('={{ $ifEmpty({}, "default") }}')).toEqual('default');
+			expect(evaluate('={{ $ifEmpty([1], "default") }}')).toEqual([1]);
+			expect(evaluate('={{ $ifEmpty({a: 1}, "default") }}')).toEqual({ a: 1 });
+		});
 	});
 });
diff --git a/packages/workflow/test/ExpressionExtensions/Helpers.ts b/packages/workflow/test/ExpressionExtensions/Helpers.ts
index 9d6bd1ad7b066..54836960e55b4 100644
--- a/packages/workflow/test/ExpressionExtensions/Helpers.ts
+++ b/packages/workflow/test/ExpressionExtensions/Helpers.ts
@@ -1,8 +1,7 @@
-import { Expression, IDataObject, Workflow } from '../../src';
+import type { IDataObject } from '@/Interfaces';
+import { Workflow } from '@/Workflow';
 import * as Helpers from '../Helpers';
 
-export const TEST_TIMEZONE = 'America/New_York';
-
 export const nodeTypes = Helpers.NodeTypes();
 export const workflow = new Workflow({
 	nodes: [
@@ -18,11 +17,8 @@ export const workflow = new Workflow({
 	connections: {},
 	active: false,
 	nodeTypes,
-	settings: {
-		timezone: TEST_TIMEZONE,
-	}
 });
-export const expression = new Expression(workflow);
+export const expression = workflow.expression;
 
 export const evaluate = (value: string, values?: IDataObject[]) =>
 	expression.getParameterValue(
@@ -33,7 +29,6 @@ export const evaluate = (value: string, values?: IDataObject[]) =>
 		'node',
 		values?.map((v) => ({ json: v })) ?? [],
 		'manual',
-		TEST_TIMEZONE,
 		{},
 	);
 
diff --git a/packages/workflow/test/ExpressionExtensions/NumberExtensions.test.ts b/packages/workflow/test/ExpressionExtensions/NumberExtensions.test.ts
index 1a514c79284b0..faaeeadcf08de 100644
--- a/packages/workflow/test/ExpressionExtensions/NumberExtensions.test.ts
+++ b/packages/workflow/test/ExpressionExtensions/NumberExtensions.test.ts
@@ -55,10 +55,57 @@ describe('Data Transformation Functions', () => {
 			expect(() => evaluate('={{ (NaN).isEven() }}')).toThrow();
 			expect(() => evaluate('={{ (9.2).isEven() }}')).toThrow();
 		});
+
+		describe('toDateTime', () => {
+			test('from milliseconds (default)', () => {
+				expect(evaluate('={{ (1704085200000).toDateTime().toISO() }}')).toEqual(
+					'2024-01-01T00:00:00.000-05:00',
+				);
+				expect(evaluate('={{ (1704085200000).toDateTime("ms").toISO() }}')).toEqual(
+					'2024-01-01T00:00:00.000-05:00',
+				);
+			});
+
+			test('from seconds', () => {
+				expect(evaluate('={{ (1704085200).toDateTime("s").toISO() }}')).toEqual(
+					'2024-01-01T00:00:00.000-05:00',
+				);
+			});
+
+			test('from Excel 1900 format', () => {
+				expect(evaluate('={{ (42144).toDateTime("excel").toISO() }}')).toEqual(
+					'2015-05-19T20:00:00.000-04:00',
+				);
+			});
+		});
+
+		describe('toInt', () => {
+			test('should round numbers', () => {
+				expect(evaluate('={{ (42144).toInt() }}')).toEqual(42144);
+				expect(evaluate('={{ (42144.345).toInt() }}')).toEqual(42144);
+				expect(evaluate('={{ (42144.545).toInt() }}')).toEqual(42145);
+			});
+		});
+
+		describe('toFloat', () => {
+			test('should return itself', () => {
+				expect(evaluate('={{ (42144).toFloat() }}')).toEqual(42144);
+				expect(evaluate('={{ (42144.345).toFloat() }}')).toEqual(42144.345);
+			});
+		});
+
+		describe('toBoolean', () => {
+			test('should return false for 0, 1 for other numbers', () => {
+				expect(evaluate('={{ (42144).toBoolean() }}')).toBe(true);
+				expect(evaluate('={{ (-1.549).toBoolean() }}')).toBe(true);
+				expect(evaluate('={{ (0).toBoolean() }}')).toBe(false);
+			});
+		});
 	});
 
 	describe('Multiple expressions', () => {
 		test('Basic multiple expressions', () => {
+			// eslint-disable-next-line n8n-local-rules/no-interpolation-in-regular-string
 			expect(evaluate('={{ "test abc".toSnakeCase() }} you have ${{ (100).format() }}.')).toEqual(
 				'test_abc you have $100.',
 			);
diff --git a/packages/workflow/test/ExpressionExtensions/ObjectExtensions.test.ts b/packages/workflow/test/ExpressionExtensions/ObjectExtensions.test.ts
index 71e5445f11f02..4a78037488af3 100644
--- a/packages/workflow/test/ExpressionExtensions/ObjectExtensions.test.ts
+++ b/packages/workflow/test/ExpressionExtensions/ObjectExtensions.test.ts
@@ -1,3 +1,4 @@
+import { objectExtensions } from '../../src/Extensions/ObjectExtensions';
 import { evaluate } from './Helpers';
 
 describe('Data Transformation Functions', () => {
@@ -37,8 +38,8 @@ describe('Data Transformation Functions', () => {
 		});
 
 		test('.removeFieldsContaining should not work for empty string', () => {
-			expect(
-				() => evaluate(
+			expect(() =>
+				evaluate(
 					'={{ ({ test1: "i exist", test2: "i should be removed", test3: "i should also be removed" }).removeFieldsContaining("") }}',
 				),
 			).toThrow();
@@ -65,8 +66,8 @@ describe('Data Transformation Functions', () => {
 		});
 
 		test('.keepFieldsContaining should not work for empty string', () => {
-			expect(
-				() => evaluate(
+			expect(() =>
+				evaluate(
 					'={{ ({ test1: "i exist", test2: "i should be removed", test3: "i should also be removed" }).keepFieldsContaining("") }}',
 				),
 			).toThrow();
@@ -81,5 +82,35 @@ describe('Data Transformation Functions', () => {
 		test('.urlEncode should work on an object', () => {
 			expect(evaluate('={{ ({ test1: 1, test2: "2" }).urlEncode() }}')).toEqual('test1=1&test2=2');
 		});
+
+		test('.keys should work on an object', () => {
+			expect(evaluate('={{ ({ test1: 1, test2: "2" }).keys() }}')).toEqual(['test1', 'test2']);
+		});
+
+		test('.values should work on an object', () => {
+			expect(evaluate('={{ ({ test1: 1, test2: "2" }).values() }}')).toEqual([1, '2']);
+		});
+
+		test('.toJsonString() should work on an object', () => {
+			expect(evaluate('={{ ({ test1: 1, test2: "2" }).toJsonString() }}')).toEqual(
+				'{"test1":1,"test2":"2"}',
+			);
+		});
+
+		describe('Conversion methods', () => {
+			test('should exist but return undefined (to not break expressions with mixed data)', () => {
+				expect(evaluate('={{ ({ test1: 1, test2: "2" }).toInt() }}')).toBeUndefined();
+				expect(evaluate('={{ ({ test1: 1, test2: "2" }).toFloat() }}')).toBeUndefined();
+				expect(evaluate('={{ ({ test1: 1, test2: "2" }).toBoolean() }}')).toBeUndefined();
+				expect(evaluate('={{ ({ test1: 1, test2: "2" }).toDateTime() }}')).toBeUndefined();
+			});
+
+			it('should not have a doc (hidden from autocomplete)', () => {
+				expect(objectExtensions.functions.toInt.doc).toBeUndefined();
+				expect(objectExtensions.functions.toFloat.doc).toBeUndefined();
+				expect(objectExtensions.functions.toBoolean.doc).toBeUndefined();
+				expect(objectExtensions.functions.toDateTime.doc).toBeUndefined();
+			});
+		});
 	});
 });
diff --git a/packages/workflow/test/ExpressionExtensions/StringExtensions.test.ts b/packages/workflow/test/ExpressionExtensions/StringExtensions.test.ts
index 2b31634480d24..7f437953c06ed 100644
--- a/packages/workflow/test/ExpressionExtensions/StringExtensions.test.ts
+++ b/packages/workflow/test/ExpressionExtensions/StringExtensions.test.ts
@@ -1,10 +1,9 @@
 /**
  * @jest-environment jsdom
  */
-
-import { stringExtensions } from '@/Extensions/StringExtensions';
-import { dateExtensions } from '@/Extensions/DateExtensions';
+import { DateTime } from 'luxon';
 import { evaluate } from './Helpers';
+import { ExpressionExtensionError } from '../../src/errors';
 
 describe('Data Transformation Functions', () => {
 	describe('String Data Transformation Functions', () => {
@@ -16,28 +15,28 @@ describe('Data Transformation Functions', () => {
 			expect(evaluate('={{"".isEmpty()}}')).toEqual(true);
 		});
 
-		test('.hash() should work correctly on a string', () => {
-			expect(evaluate('={{ "12345".hash("sha256") }}')).toEqual(
-				stringExtensions.functions.hash('12345', ['sha256']),
-			);
-
-			expect(evaluate('={{ "12345".hash("sha256") }}')).not.toEqual(
-				stringExtensions.functions.hash('12345', ['MD5']),
-			);
-
-			expect(evaluate('={{ "12345".hash("MD5") }}')).toEqual(
-				stringExtensions.functions.hash('12345', ['MD5']),
-			);
-
-			expect(evaluate('={{ "12345".hash("sha256") }}')).toEqual(
-				'5994471abb01112afcc18159f6cc74b4f511b99806da59b3caf5a9c173cacfc5',
-			);
-		});
-
-		test('.hash() alias should work correctly on a string', () => {
-			expect(evaluate('={{ "12345".hash("sha256") }}')).toEqual(
-				'5994471abb01112afcc18159f6cc74b4f511b99806da59b3caf5a9c173cacfc5',
-			);
+		describe('.hash()', () => {
+			test.each([
+				['md5', '827ccb0eea8a706c4c34a16891f84e7b'],
+				['sha1', '8cb2237d0679ca88db6464eac60da96345513964'],
+				['sha224', 'a7470858e79c282bc2f6adfd831b132672dfd1224c1e78cbf5bcd057'],
+				['sha256', '5994471abb01112afcc18159f6cc74b4f511b99806da59b3caf5a9c173cacfc5'],
+				[
+					'sha384',
+					'0fa76955abfa9dafd83facca8343a92aa09497f98101086611b0bfa95dbc0dcc661d62e9568a5a032ba81960f3e55d4a',
+				],
+				[
+					'sha512',
+					'3627909a29c31381a071ec27f7c9ca97726182aed29a7ddd2e54353322cfb30abb9e3a6df2ac2c20fe23436311d678564d0c8d305930575f60e2d3d048184d79',
+				],
+				[
+					'sha3',
+					'0a2a1719bf3ce682afdbedf3b23857818d526efbe7fcb372b31347c26239a0f916c398b7ad8dd0ee76e8e388604d0b0f925d5e913ad2d3165b9b35b3844cd5e6',
+				],
+			])('should work for %p', (hashFn, hashValue) => {
+				expect(evaluate(`={{ "12345".hash("${hashFn}") }}`)).toEqual(hashValue);
+				expect(evaluate(`={{ "12345".hash("${hashFn.toLowerCase()}") }}`)).toEqual(hashValue);
+			});
 		});
 
 		test('.urlDecode should work correctly on a string', () => {
@@ -157,13 +156,29 @@ describe('Data Transformation Functions', () => {
 					'={{ "I am a test with a url: https://example.net/ and I am a test with an email: test@example.org".extractUrl() }}',
 				),
 			).toEqual('https://example.net/');
-			expect(evaluate('={{ "Check this out: https://subdomain.example.com:3000/path?q=1#hash".extractUrl() }}')).toEqual('https://subdomain.example.com:3000/path?q=1#hash');
+			expect(
+				evaluate(
+					'={{ "Check this out: https://subdomain.example.com:3000/path?q=1#hash".extractUrl() }}',
+				),
+			).toEqual('https://subdomain.example.com:3000/path?q=1#hash');
 			expect(evaluate('={{ "Invalid URL: http:///example.com".extractUrl() }}')).toEqual(undefined);
-			expect(evaluate('={{ "Mixed content: https://www.example.com and http://www.example.org".extractUrl() }}')).toEqual('https://www.example.com');
-			expect(evaluate('={{ "Text without URL: This is just a simple text".extractUrl() }}')).toEqual(undefined);
-			expect(evaluate('={{ "URL with Unicode: http://www.xn--80aswg.xn--j1amh".extractUrl() }}')).toEqual('http://www.xn--80aswg.xn--j1amh');
-			expect(evaluate('={{ "Localhost URL: http://localhost:8080/test?x=1".extractUrl() }}')).toEqual('http://localhost:8080/test?x=1');
-			expect(evaluate('={{ "IP URL: http://192.168.1.1:8000/path?q=value#frag".extractUrl() }}')).toEqual('http://192.168.1.1:8000/path?q=value#frag');
+			expect(
+				evaluate(
+					'={{ "Mixed content: https://www.example.com and http://www.example.org".extractUrl() }}',
+				),
+			).toEqual('https://www.example.com');
+			expect(
+				evaluate('={{ "Text without URL: This is just a simple text".extractUrl() }}'),
+			).toEqual(undefined);
+			expect(
+				evaluate('={{ "URL with Unicode: http://www.xn--80aswg.xn--j1amh".extractUrl() }}'),
+			).toEqual('http://www.xn--80aswg.xn--j1amh');
+			expect(
+				evaluate('={{ "Localhost URL: http://localhost:8080/test?x=1".extractUrl() }}'),
+			).toEqual('http://localhost:8080/test?x=1');
+			expect(
+				evaluate('={{ "IP URL: http://192.168.1.1:8000/path?q=value#frag".extractUrl() }}'),
+			).toEqual('http://192.168.1.1:8000/path?q=value#frag');
 		});
 
 		test('.extractDomain should work on a string', () => {
@@ -175,24 +190,46 @@ describe('Data Transformation Functions', () => {
 			expect(evaluate('={{ "google.com".extractDomain() }}')).toEqual('google.com');
 			expect(evaluate('={{ "www.example.net".extractDomain() }}')).toEqual('www.example.net');
 			expect(evaluate('={{ "//example.com".extractDomain() }}')).toEqual('example.com');
-			expect(evaluate('={{ "mailto:john.doe@example.com".extractDomain() }}')).toEqual('example.com');
+			expect(evaluate('={{ "mailto:john.doe@example.com".extractDomain() }}')).toEqual(
+				'example.com',
+			);
 			expect(evaluate('={{ "tel:+1-555-123-4567".extractDomain() }}')).toEqual(undefined);
 			expect(evaluate('={{ "jane.doe@example.org".extractDomain() }}')).toEqual('example.org');
 			expect(evaluate('={{ "name+tag@example.com".extractDomain() }}')).toEqual('example.com');
-			expect(evaluate('={{ "first.last@example.co.uk".extractDomain() }}')).toEqual('example.co.uk');
-			expect(evaluate('={{ "user@subdomain.example.com".extractDomain() }}')).toEqual('subdomain.example.com');
-			expect(evaluate('={{ "www.example.net?test=1213".extractDomain() }}')).toEqual('www.example.net');
+			expect(evaluate('={{ "first.last@example.co.uk".extractDomain() }}')).toEqual(
+				'example.co.uk',
+			);
+			expect(evaluate('={{ "user@subdomain.example.com".extractDomain() }}')).toEqual(
+				'subdomain.example.com',
+			);
+			expect(evaluate('={{ "www.example.net?test=1213".extractDomain() }}')).toEqual(
+				'www.example.net',
+			);
 			expect(evaluate('={{ "www.example.net?test".extractDomain() }}')).toEqual('www.example.net');
-			expect(evaluate('={{ "www.example.net#tesdt123".extractDomain() }}')).toEqual('www.example.net');
-			expect(evaluate('={{ "https://www.example.net?test=1213".extractDomain() }}')).toEqual('www.example.net');
-			expect(evaluate('={{ "https://www.example.net?test".extractDomain() }}')).toEqual('www.example.net');
-			expect(evaluate('={{ "https://www.example.net#tesdt123".extractDomain() }}')).toEqual('www.example.net');
+			expect(evaluate('={{ "www.example.net#tesdt123".extractDomain() }}')).toEqual(
+				'www.example.net',
+			);
+			expect(evaluate('={{ "https://www.example.net?test=1213".extractDomain() }}')).toEqual(
+				'www.example.net',
+			);
+			expect(evaluate('={{ "https://www.example.net?test".extractDomain() }}')).toEqual(
+				'www.example.net',
+			);
+			expect(evaluate('={{ "https://www.example.net#tesdt123".extractDomain() }}')).toEqual(
+				'www.example.net',
+			);
 			expect(evaluate('={{ "https://192.168.1.1".extractDomain() }}')).toEqual('192.168.1.1');
-			expect(evaluate('={{ "http://www.xn--80aswg.xn--j1amh".extractDomain() }}')).toEqual('www.xn--80aswg.xn--j1amh');
+			expect(evaluate('={{ "http://www.xn--80aswg.xn--j1amh".extractDomain() }}')).toEqual(
+				'www.xn--80aswg.xn--j1amh',
+			);
 			expect(evaluate('={{ "https://localhost".extractDomain() }}')).toEqual('localhost');
 			expect(evaluate('={{ "https://localhost?test=123".extractDomain() }}')).toEqual('localhost');
-			expect(evaluate('={{ "https://www.example_with_underscore.com".extractDomain() }}')).toEqual('www.example_with_underscore.com');
-			expect(evaluate('={{ "https://www.example.com:8080".extractDomain() }}')).toEqual('www.example.com');
+			expect(evaluate('={{ "https://www.example_with_underscore.com".extractDomain() }}')).toEqual(
+				'www.example_with_underscore.com',
+			);
+			expect(evaluate('={{ "https://www.example.com:8080".extractDomain() }}')).toEqual(
+				'www.example.com',
+			);
 			expect(evaluate('={{ "https://example.space".extractDomain() }}')).toEqual('example.space');
 		});
 
@@ -209,5 +246,54 @@ describe('Data Transformation Functions', () => {
 			expect(evaluate('={{ "aaaaaaaa".isEmail() }}')).toEqual(false);
 			expect(evaluate('={{ "test @ n8n".isEmail() }}')).toEqual(false);
 		});
+
+		test('.toDateTime should work on a variety of formats', () => {
+			expect(evaluate('={{ "Wed, 21 Oct 2015 07:28:00 GMT".toDateTime() }}')).toBeInstanceOf(
+				DateTime,
+			);
+			expect(evaluate('={{ "2008-11-11".toDateTime() }}')).toBeInstanceOf(DateTime);
+			expect(evaluate('={{ "1-Feb-2024".toDateTime() }}')).toBeInstanceOf(DateTime);
+			expect(() => evaluate('={{ "hi".toDateTime() }}')).toThrowError(
+				new ExpressionExtensionError('cannot convert to Luxon DateTime'),
+			);
+		});
+
+		test('.extractUrlPath should work on a string', () => {
+			expect(
+				evaluate('={{ "https://example.com/orders/1/detail#hash?foo=bar".extractUrlPath() }}'),
+			).toEqual('/orders/1/detail');
+			expect(evaluate('={{ "hi".extractUrlPath() }}')).toBeUndefined();
+		});
+
+		test('.parseJson should work on a string', () => {
+			expect(evaluate('={{ \'{"test1":1,"test2":"2"}\'.parseJson() }}')).toEqual({
+				test1: 1,
+				test2: '2',
+			});
+		});
+
+		test('.parseJson should throw on invalid JSON', () => {
+			expect(() => evaluate("={{ \"{'test1':1,'test2':'2'}\".parseJson() }}")).toThrowError(
+				"Parsing failed. Check you're using double quotes",
+			);
+			expect(() => evaluate('={{ "No JSON here".parseJson() }}')).toThrowError('Parsing failed');
+		});
+
+		test('.toBoolean should work on a string', () => {
+			expect(evaluate('={{ "False".toBoolean() }}')).toBe(false);
+			expect(evaluate('={{ "".toBoolean() }}')).toBe(false);
+			expect(evaluate('={{ "0".toBoolean() }}')).toBe(false);
+			expect(evaluate('={{ "no".toBoolean() }}')).toBe(false);
+			expect(evaluate('={{ "TRUE".toBoolean() }}')).toBe(true);
+			expect(evaluate('={{ "hello".toBoolean() }}')).toBe(true);
+		});
+
+		test('.base64Encode should work on a string', () => {
+			expect(evaluate('={{ "n8n test".base64Encode() }}')).toBe('bjhuIHRlc3Q=');
+		});
+
+		test('.base64Decode should work on a string', () => {
+			expect(evaluate('={{ "bjhuIHRlc3Q=".base64Decode() }}')).toBe('n8n test');
+		});
 	});
 });
diff --git a/packages/workflow/test/ExpressionFixtures/base.ts b/packages/workflow/test/ExpressionFixtures/base.ts
index c902ccea0b364..f05d098fd5bbb 100644
--- a/packages/workflow/test/ExpressionFixtures/base.ts
+++ b/packages/workflow/test/ExpressionFixtures/base.ts
@@ -1,15 +1,22 @@
 import type { GenericValue, IDataObject } from '@/Interfaces';
+import { ExpressionError } from '@/errors/expression.error';
 
-export interface ExpressionTestBase {
-	type: string;
+interface ExpressionTestBase {
+	type: 'evaluation' | 'transform';
 }
 
-export interface ExpressionTestEvaluation extends ExpressionTestBase {
+interface ExpressionTestSuccess extends ExpressionTestBase {
 	type: 'evaluation';
 	input: Array<IDataObject | GenericValue>;
 	output: IDataObject | GenericValue;
 }
 
+interface ExpressionTestFailure extends ExpressionTestBase {
+	type: 'evaluation';
+	input: Array<IDataObject | GenericValue>;
+	error: ExpressionError;
+}
+
 export interface ExpressionTestTransform extends ExpressionTestBase {
 	type: 'transform';
 	// If we don't specify a result we expect it to be the same as the input
@@ -17,6 +24,7 @@ export interface ExpressionTestTransform extends ExpressionTestBase {
 	forceTransform?: boolean;
 }
 
+export type ExpressionTestEvaluation = ExpressionTestSuccess | ExpressionTestFailure;
 export type ExpressionTests = ExpressionTestEvaluation | ExpressionTestTransform;
 
 export interface ExpressionTestFixture {
@@ -265,7 +273,11 @@ export const baseFixtures: ExpressionTestFixture[] = [
 			{
 				type: 'evaluation',
 				input: [],
-				output: undefined,
+				error: new ExpressionError('No execution data available', {
+					runIndex: 0,
+					itemIndex: 0,
+					type: 'no_execution_data',
+				}),
 			},
 			{ type: 'transform' },
 			{ type: 'transform', forceTransform: true },
diff --git a/packages/workflow/test/FilterParameter.test.ts b/packages/workflow/test/FilterParameter.test.ts
new file mode 100644
index 0000000000000..197ab8508c010
--- /dev/null
+++ b/packages/workflow/test/FilterParameter.test.ts
@@ -0,0 +1,1074 @@
+import { executeFilter } from '@/NodeParameters/FilterParameter';
+import type { FilterConditionValue, FilterValue } from '@/Interfaces';
+import merge from 'lodash/merge';
+import { DateTime } from 'luxon';
+
+type DeepPartial<T> = {
+	[P in keyof T]?: T[P] extends object ? DeepPartial<T[P]> : T[P];
+};
+
+const filterFactory = (data: DeepPartial<FilterValue> = {}): FilterValue =>
+	merge(
+		{
+			combinator: 'and',
+			conditions: [],
+			options: {
+				leftValue: '',
+				caseSensitive: false,
+				typeValidation: 'strict',
+			},
+		} as FilterValue,
+		data,
+	);
+
+describe('FilterParameter', () => {
+	describe('executeFilter', () => {
+		it('should support and/or combinators', () => {
+			const falseCondition: FilterConditionValue = {
+				id: '1',
+				leftValue: 'foo',
+				rightValue: 'bar',
+				operator: { operation: 'equals', type: 'string' },
+			};
+			const trueCondition: FilterConditionValue = {
+				id: '2',
+				leftValue: 'foo',
+				rightValue: 'foo',
+				operator: { operation: 'equals', type: 'string' },
+			};
+
+			const andResult = executeFilter(
+				filterFactory({ combinator: 'and', conditions: [falseCondition, trueCondition] }),
+			);
+			expect(andResult).toBe(false);
+
+			const orResult = executeFilter(
+				filterFactory({ combinator: 'or', conditions: [falseCondition, trueCondition] }),
+			);
+			expect(orResult).toBe(true);
+		});
+
+		describe('options.caseSensitive', () => {
+			it('should evaluate strings case insensitive (=default)', () => {
+				const result = executeFilter(
+					filterFactory({
+						combinator: 'and',
+						conditions: [
+							{
+								id: '1',
+								leftValue: 'FOO',
+								rightValue: 'foo',
+								operator: { operation: 'equals', type: 'string' },
+							},
+							{
+								id: '2',
+								leftValue: 'foobarbaz',
+								rightValue: 'BAR',
+								operator: { operation: 'contains', type: 'string' },
+							},
+						],
+						options: { caseSensitive: false },
+					}),
+				);
+				expect(result).toBe(true);
+			});
+
+			it('should evaluate strings case sensitive', () => {
+				const result = executeFilter(
+					filterFactory({
+						combinator: 'or',
+						conditions: [
+							{
+								id: '1',
+								leftValue: 'Foo',
+								rightValue: 'FOO',
+								operator: { operation: 'equals', type: 'string' },
+							},
+							{
+								id: '2',
+								leftValue: 'foobarbaz',
+								rightValue: 'BAR',
+								operator: { operation: 'contains', type: 'string' },
+							},
+						],
+						options: { caseSensitive: true },
+					}),
+				);
+				expect(result).toBe(false);
+			});
+		});
+
+		describe('options.typeValidation', () => {
+			describe('strict (=default)', () => {
+				it('should throw an error when types are not as expected (primitives)', () => {
+					expect(() =>
+						executeFilter(
+							filterFactory({
+								conditions: [
+									{
+										id: '1',
+										leftValue: '15',
+										rightValue: true,
+										operator: { operation: 'equals', type: 'number' },
+									},
+								],
+								options: { typeValidation: 'strict' },
+							}),
+						),
+					).toThrowError(
+						"Wrong type: '15' is a string but was expecting a number [condition 0, item 0]",
+					);
+				});
+
+				it('should throw an error when types are not as expected (arrays)', () => {
+					expect(() =>
+						executeFilter(
+							filterFactory({
+								conditions: [
+									{
+										id: '1',
+										leftValue: '[]',
+										rightValue: 0,
+										operator: { operation: 'lengthEquals', type: 'array', rightType: 'number' },
+									},
+								],
+								options: { typeValidation: 'strict' },
+							}),
+						),
+					).toThrowError(
+						"Wrong type: '[]' is a string but was expecting an array [condition 0, item 0]",
+					);
+				});
+
+				it('should throw an error when types are not as expected (objects)', () => {
+					expect(() =>
+						executeFilter(
+							filterFactory({
+								conditions: [
+									{
+										id: '1',
+										leftValue: '{}',
+										operator: { operation: 'empty', type: 'object', singleValue: true },
+									},
+								],
+								options: { typeValidation: 'strict' },
+							}),
+						),
+					).toThrowError(
+						"Wrong type: '{}' is a string but was expecting an object [condition 0, item 0]",
+					);
+				});
+			});
+
+			describe('loose', () => {
+				it('should evaluate conditions when type can be converted', () => {
+					const result = executeFilter(
+						filterFactory({
+							combinator: 'and',
+							conditions: [
+								{
+									id: '1',
+									leftValue: '15',
+									rightValue: 15,
+									operator: { operation: 'equals', type: 'number' },
+								},
+								{
+									id: '2',
+									leftValue: 'true',
+									operator: { operation: 'true', type: 'boolean' },
+								},
+								{
+									id: '3',
+									leftValue: '',
+									operator: { operation: 'false', type: 'boolean' },
+								},
+
+								{
+									id: '4',
+									leftValue: 0,
+									operator: { operation: 'false', type: 'boolean' },
+								},
+								{
+									id: '5',
+									leftValue: 1,
+									operator: { operation: 'true', type: 'boolean' },
+								},
+								{
+									id: '6',
+									leftValue: 'a string',
+									operator: { operation: 'true', type: 'boolean' },
+								},
+							],
+							options: { typeValidation: 'loose' },
+						}),
+					);
+					expect(result).toBe(true);
+				});
+
+				it('should throw an error when types cannot be converted', () => {
+					expect(() =>
+						executeFilter(
+							filterFactory({
+								combinator: 'and',
+								conditions: [
+									{
+										id: '1',
+										leftValue: 'a string',
+										rightValue: 15,
+										operator: { operation: 'equals', type: 'number' },
+									},
+								],
+								options: { typeValidation: 'loose' },
+							}),
+						),
+					).toThrowError(
+						"Conversion error: the string 'a string' can't be converted to a number [condition 0, item 0]",
+					);
+				});
+			});
+		});
+
+		describe('operators', () => {
+			describe('exists', () => {
+				it.each([
+					{ left: '', expected: true },
+					{ left: null, expected: false },
+					{ left: undefined, expected: false },
+					{ left: 'foo', expected: true },
+				])('string:exists($left) === $expected', ({ left, expected }) => {
+					const result = executeFilter(
+						filterFactory({
+							conditions: [
+								{
+									id: '1',
+									leftValue: left as string,
+									operator: { operation: 'exists', type: 'string' },
+								},
+							],
+						}),
+					);
+					expect(result).toBe(expected);
+				});
+
+				it.each([
+					{ left: '', expected: false },
+					{ left: null, expected: true },
+					{ left: undefined, expected: true },
+					{ left: 'foo', expected: false },
+				])('string:notExists($left) === $expected', ({ left, expected }) => {
+					const result = executeFilter(
+						filterFactory({
+							conditions: [
+								{
+									id: '1',
+									leftValue: left as string,
+									operator: { operation: 'notExists', type: 'string' },
+								},
+							],
+						}),
+					);
+					expect(result).toBe(expected);
+				});
+			});
+
+			describe('string', () => {
+				it.each([
+					{ left: null, expected: true },
+					{ left: undefined, expected: true },
+					{ left: '', expected: true },
+					{ left: '🐛', expected: false },
+				])('string:empty($left) === $expected', ({ left, expected }) => {
+					const result = executeFilter(
+						filterFactory({
+							conditions: [
+								{ id: '1', leftValue: left, operator: { operation: 'empty', type: 'string' } },
+							],
+						}),
+					);
+					expect(result).toBe(expected);
+				});
+
+				it.each([
+					{ left: null, expected: false },
+					{ left: undefined, expected: false },
+					{ left: '', expected: false },
+					{ left: '🐛', expected: true },
+				])('string:notEmpty($left) === $expected', ({ left, expected }) => {
+					const result = executeFilter(
+						filterFactory({
+							conditions: [
+								{ id: '1', leftValue: left, operator: { operation: 'notEmpty', type: 'string' } },
+							],
+						}),
+					);
+					expect(result).toBe(expected);
+				});
+
+				it.each([
+					{ left: 'first string', right: 'first string', expected: true },
+					{ left: 'first string', right: 'second string', expected: false },
+					{ left: '', right: '🐛', expected: false },
+					{ left: '🐛', right: '🐛', expected: true },
+				])('string:equals("$left","$right") === $expected', ({ left, right, expected }) => {
+					const result = executeFilter(
+						filterFactory({
+							conditions: [
+								{
+									id: '1',
+									leftValue: left,
+									rightValue: right,
+									operator: { operation: 'equals', type: 'string' },
+								},
+							],
+						}),
+					);
+					expect(result).toBe(expected);
+				});
+
+				it.each([
+					{ left: 'first string', right: 'first string', expected: false },
+					{ left: 'first string', right: 'second string', expected: true },
+					{ left: '', right: '🐛', expected: true },
+					{ left: '🐛', right: '🐛', expected: false },
+				])('string:notEquals("$left","$right") === $expected', ({ left, right, expected }) => {
+					const result = executeFilter(
+						filterFactory({
+							conditions: [
+								{
+									id: '1',
+									leftValue: left,
+									rightValue: right,
+									operator: { operation: 'notEquals', type: 'string' },
+								},
+							],
+						}),
+					);
+					expect(result).toBe(expected);
+				});
+
+				it.each([
+					{ left: 'first string', right: 'first string', expected: true },
+					{ left: 'first string', right: 'first', expected: true },
+					{ left: 'first string', right: 'irs', expected: true },
+					{ left: 'first string', right: '', expected: true },
+					{ left: 'first string', right: '?', expected: false },
+				])('string:contains("$left","$right") === $expected', ({ left, right, expected }) => {
+					const result = executeFilter(
+						filterFactory({
+							conditions: [
+								{
+									id: '1',
+									leftValue: left,
+									rightValue: right,
+									operator: { operation: 'contains', type: 'string' },
+								},
+							],
+						}),
+					);
+					expect(result).toBe(expected);
+				});
+
+				it.each([
+					{ left: 'first string', right: 'first string', expected: false },
+					{ left: 'first string', right: 'first', expected: false },
+					{ left: 'first string', right: 'irs', expected: false },
+					{ left: 'first string', right: '', expected: false },
+					{ left: 'first string', right: '?', expected: true },
+				])('string:notContains("$left","$right") === $expected', ({ left, right, expected }) => {
+					const result = executeFilter(
+						filterFactory({
+							conditions: [
+								{
+									id: '1',
+									leftValue: left,
+									rightValue: right,
+									operator: { operation: 'notContains', type: 'string' },
+								},
+							],
+						}),
+					);
+					expect(result).toBe(expected);
+				});
+
+				it.each([
+					{ left: 'first string', right: 'first string', expected: true },
+					{ left: 'first string', right: 'first', expected: true },
+					{ left: 'first string', right: 'irs', expected: false },
+					{ left: 'first string', right: '', expected: true },
+					{ left: 'first string', right: '?', expected: false },
+				])('string:startsWith("$left","$right") === $expected', ({ left, right, expected }) => {
+					const result = executeFilter(
+						filterFactory({
+							conditions: [
+								{
+									id: '1',
+									leftValue: left,
+									rightValue: right,
+									operator: { operation: 'startsWith', type: 'string' },
+								},
+							],
+						}),
+					);
+					expect(result).toBe(expected);
+				});
+
+				it.each([
+					{ left: 'first string', right: 'first string', expected: false },
+					{ left: 'first string', right: 'first', expected: false },
+					{ left: 'first string', right: 'irs', expected: true },
+					{ left: 'first string', right: '', expected: false },
+					{ left: 'first string', right: '?', expected: true },
+				])('string:notStartsWith("$left","$right") === $expected', ({ left, right, expected }) => {
+					const result = executeFilter(
+						filterFactory({
+							conditions: [
+								{
+									id: '1',
+									leftValue: left,
+									rightValue: right,
+									operator: { operation: 'notStartsWith', type: 'string' },
+								},
+							],
+						}),
+					);
+					expect(result).toBe(expected);
+				});
+
+				it.each([
+					{ left: 'first string', right: 'first string', expected: true },
+					{ left: 'first string', right: 'string', expected: true },
+					{ left: 'first string', right: 'g', expected: true },
+					{ left: 'first string', right: '', expected: true },
+					{ left: 'first string', right: '?', expected: false },
+				])('string:endsWith("$left","$right") === $expected', ({ left, right, expected }) => {
+					const result = executeFilter(
+						filterFactory({
+							conditions: [
+								{
+									id: '1',
+									leftValue: left,
+									rightValue: right,
+									operator: { operation: 'endsWith', type: 'string' },
+								},
+							],
+						}),
+					);
+					expect(result).toBe(expected);
+				});
+
+				it.each([
+					{ left: 'first string', right: 'first string', expected: false },
+					{ left: 'first string', right: 'string', expected: false },
+					{ left: 'first string', right: 'g', expected: false },
+					{ left: 'first string', right: '', expected: false },
+					{ left: 'first string', right: '?', expected: true },
+				])('string:notEndsWith("$left","$right") === $expected', ({ left, right, expected }) => {
+					const result = executeFilter(
+						filterFactory({
+							conditions: [
+								{
+									id: '1',
+									leftValue: left,
+									rightValue: right,
+									operator: { operation: 'notEndsWith', type: 'string' },
+								},
+							],
+						}),
+					);
+					expect(result).toBe(expected);
+				});
+
+				it.each([
+					{ left: 'first string', right: 'first', expected: true },
+					{ left: 'first string', right: 'second', expected: false },
+					{ left: 'first string', right: '.*', expected: true },
+					{ left: 'any string', right: '[0-9]', expected: false },
+					{ left: 'any string', right: '[a-z]', expected: true },
+					{ left: 'lowercase', right: '[A-Z]', expected: false },
+					{ left: 'foo', right: '/^fo{2}$/g', expected: true },
+				])('string:regex("$left","$right") === $expected', ({ left, right, expected }) => {
+					const result = executeFilter(
+						filterFactory({
+							conditions: [
+								{
+									id: '1',
+									leftValue: left,
+									rightValue: right,
+									operator: { operation: 'regex', type: 'string' },
+								},
+							],
+						}),
+					);
+					expect(result).toBe(expected);
+				});
+
+				it.each([
+					{ left: 'first string', right: 'first', expected: false },
+					{ left: 'first string', right: 'second', expected: true },
+					{ left: 'first string', right: '.*', expected: false },
+					{ left: 'any string', right: '[0-9]', expected: true },
+					{ left: 'any string', right: '[a-z]', expected: false },
+					{ left: 'lowercase', right: '[A-Z]', expected: true },
+					{ left: 'foo', right: '/^fo{2}$/g', expected: false },
+				])('string:notRegex("$left","$right") === $expected', ({ left, right, expected }) => {
+					const result = executeFilter(
+						filterFactory({
+							conditions: [
+								{
+									id: '1',
+									leftValue: left,
+									rightValue: right,
+									operator: { operation: 'notRegex', type: 'string' },
+								},
+							],
+						}),
+					);
+					expect(result).toBe(expected);
+				});
+			});
+
+			describe('number', () => {
+				it.each([
+					{ left: 0, right: 0, expected: true },
+					{ left: 15, right: 15, expected: true },
+					{ left: 15.34, right: 15.34, expected: true },
+					{ left: 15, right: 15.3249038, expected: false },
+				])('number:equals($left,$right) === $expected', ({ left, right, expected }) => {
+					const result = executeFilter(
+						filterFactory({
+							conditions: [
+								{
+									id: '1',
+									leftValue: left,
+									rightValue: right,
+									operator: { operation: 'equals', type: 'number' },
+								},
+							],
+						}),
+					);
+					expect(result).toBe(expected);
+				});
+
+				it.each([
+					{ left: 0, right: 0, expected: false },
+					{ left: 15, right: 15, expected: false },
+					{ left: 15.34, right: 15.34, expected: false },
+					{ left: 15, right: 15.3249038, expected: true },
+				])('number:notEquals($left,$right) === $expected', ({ left, right, expected }) => {
+					const result = executeFilter(
+						filterFactory({
+							conditions: [
+								{
+									id: '1',
+									leftValue: left,
+									rightValue: right,
+									operator: { operation: 'notEquals', type: 'number' },
+								},
+							],
+						}),
+					);
+					expect(result).toBe(expected);
+				});
+
+				it.each([
+					{ left: 0, right: 0, expected: false },
+					{ left: 15, right: 16, expected: false },
+					{ left: 16, right: 15, expected: true },
+					{ left: 15.34001, right: 15.34, expected: true },
+				])('number:gt($left,$right) === $expected', ({ left, right, expected }) => {
+					const result = executeFilter(
+						filterFactory({
+							conditions: [
+								{
+									id: '1',
+									leftValue: left,
+									rightValue: right,
+									operator: { operation: 'gt', type: 'number' },
+								},
+							],
+						}),
+					);
+					expect(result).toBe(expected);
+				});
+
+				it.each([
+					{ left: 0, right: 0, expected: false },
+					{ left: 15, right: 16, expected: true },
+					{ left: 16, right: 15, expected: false },
+					{ left: 15.34001, right: 15.34, expected: false },
+				])('number:lt($left,$right) === $expected', ({ left, right, expected }) => {
+					const result = executeFilter(
+						filterFactory({
+							conditions: [
+								{
+									id: '1',
+									leftValue: left,
+									rightValue: right,
+									operator: { operation: 'lt', type: 'number' },
+								},
+							],
+						}),
+					);
+					expect(result).toBe(expected);
+				});
+
+				it.each([
+					{ left: 0, right: 0, expected: true },
+					{ left: 15, right: 16, expected: false },
+					{ left: 16, right: 15, expected: true },
+					{ left: 15.34001, right: 15.34, expected: true },
+				])('number:gte($left,$right) === $expected', ({ left, right, expected }) => {
+					const result = executeFilter(
+						filterFactory({
+							conditions: [
+								{
+									id: '1',
+									leftValue: left,
+									rightValue: right,
+									operator: { operation: 'gte', type: 'number' },
+								},
+							],
+						}),
+					);
+					expect(result).toBe(expected);
+				});
+
+				it.each([
+					{ left: 0, right: 0, expected: true },
+					{ left: 15, right: 16, expected: true },
+					{ left: 16, right: 15, expected: false },
+					{ left: 15.34001, right: 15.34, expected: false },
+				])('number:lte($left,$right) === $expected', ({ left, right, expected }) => {
+					const result = executeFilter(
+						filterFactory({
+							conditions: [
+								{
+									id: '1',
+									leftValue: left,
+									rightValue: right,
+									operator: { operation: 'lte', type: 'number' },
+								},
+							],
+						}),
+					);
+					expect(result).toBe(expected);
+				});
+			});
+
+			describe('dateTime', () => {
+				it.each([
+					{ left: '2023-11-15T17:10:49.113Z', right: '2023-11-15T17:10:49.113Z', expected: true },
+					{ left: '2023-11-15T17:10:49.113Z', right: '2023-11-15T17:12:49.113Z', expected: false },
+				])('dateTime:equals("$left", "$right") === $expected', ({ left, right, expected }) => {
+					const result = executeFilter(
+						filterFactory({
+							conditions: [
+								{
+									id: '1',
+									leftValue: left,
+									rightValue: right,
+									operator: { operation: 'equals', type: 'dateTime' },
+								},
+							],
+						}),
+					);
+					expect(result).toBe(expected);
+				});
+
+				it.each([
+					{ left: '2023-11-15T17:10:49.113Z', right: '2023-11-15T17:10:49.113Z', expected: false },
+					{ left: '2023-11-15T17:10:49.113Z', right: '2023-11-15T17:12:49.113Z', expected: true },
+				])('dateTime:notEquals("$left", "$right") === $expected', ({ left, right, expected }) => {
+					const result = executeFilter(
+						filterFactory({
+							conditions: [
+								{
+									id: '1',
+									leftValue: left,
+									rightValue: right,
+									operator: { operation: 'notEquals', type: 'dateTime' },
+								},
+							],
+						}),
+					);
+					expect(result).toBe(expected);
+				});
+
+				it.each([
+					{ left: '2023-11-15T17:10:49.113Z', right: '2023-11-15T17:10:49.113Z', expected: false },
+					{ left: '2023-11-15T17:10:49.113Z', right: '2023-11-15T17:12:49.113Z', expected: false },
+					{ left: '2023-11-15T17:10:49.113Z', right: '2023-01-01T00:00:00.000Z', expected: true },
+					{ left: '2024-01-01', right: new Date('2023-01-01T00:00:00.000Z'), expected: true },
+					{
+						left: DateTime.fromFormat('2024-01-01', 'yyyy-MM-dd'),
+						right: '1-Feb-2024',
+						expected: false,
+					},
+				])('dateTime:after("$left", "$right") === $expected', ({ left, right, expected }) => {
+					const result = executeFilter(
+						filterFactory({
+							conditions: [
+								{
+									id: '1',
+									leftValue: left,
+									rightValue: right,
+									operator: { operation: 'after', type: 'dateTime' },
+								},
+							],
+						}),
+					);
+					expect(result).toBe(expected);
+				});
+
+				it.each([
+					{ left: '2023-11-15T17:10:49.113Z', right: '2023-11-15T17:10:49.113Z', expected: false },
+					{ left: '2023-11-15T17:10:49.113Z', right: '2023-11-15T17:12:49.113Z', expected: true },
+					{ left: '2023-11-15T17:10:49.113Z', right: '2023-01-01T00:00:00.000Z', expected: false },
+				])('dateTime:before("$left", "$right") === $expected', ({ left, right, expected }) => {
+					const result = executeFilter(
+						filterFactory({
+							conditions: [
+								{
+									id: '1',
+									leftValue: left,
+									rightValue: right,
+									operator: { operation: 'before', type: 'dateTime' },
+								},
+							],
+						}),
+					);
+					expect(result).toBe(expected);
+				});
+
+				it.each([
+					{ left: '2023-11-15T17:10:49.113Z', right: '2023-11-15T17:10:49.113Z', expected: true },
+					{ left: '2023-11-15T17:10:49.113Z', right: '2023-11-15T17:12:49.113Z', expected: false },
+					{ left: '2023-11-15T17:10:49.113Z', right: '2023-01-01T00:00:00.000Z', expected: true },
+				])(
+					'dateTime:afterOrEquals("$left", "$right") === $expected',
+					({ left, right, expected }) => {
+						const result = executeFilter(
+							filterFactory({
+								conditions: [
+									{
+										id: '1',
+										leftValue: left,
+										rightValue: right,
+										operator: { operation: 'afterOrEquals', type: 'dateTime' },
+									},
+								],
+							}),
+						);
+						expect(result).toBe(expected);
+					},
+				);
+
+				it.each([
+					{ left: '2023-11-15T17:10:49.113Z', right: '2023-11-15T17:10:49.113Z', expected: true },
+					{ left: '2023-11-15T17:10:49.113Z', right: '2023-11-15T17:12:49.113Z', expected: true },
+					{ left: '2023-11-15T17:10:49.113Z', right: '2023-01-01T00:00:00.000Z', expected: false },
+				])(
+					'dateTime:beforeOrEquals("$left", "$right") === $expected',
+					({ left, right, expected }) => {
+						const result = executeFilter(
+							filterFactory({
+								conditions: [
+									{
+										id: '1',
+										leftValue: left,
+										rightValue: right,
+										operator: { operation: 'beforeOrEquals', type: 'dateTime' },
+									},
+								],
+							}),
+						);
+						expect(result).toBe(expected);
+					},
+				);
+			});
+
+			describe('boolean', () => {
+				it.each([
+					{ left: true, expected: true },
+					{ left: false, expected: false },
+				])('boolean:true($left) === $expected', ({ left, expected }) => {
+					const result = executeFilter(
+						filterFactory({
+							conditions: [
+								{
+									id: '1',
+									leftValue: left,
+									operator: { operation: 'true', type: 'boolean' },
+								},
+							],
+						}),
+					);
+					expect(result).toBe(expected);
+				});
+
+				it.each([
+					{ left: true, expected: false },
+					{ left: false, expected: true },
+				])('boolean:false($left) === $expected', ({ left, expected }) => {
+					const result = executeFilter(
+						filterFactory({
+							conditions: [
+								{
+									id: '1',
+									leftValue: left,
+									operator: { operation: 'false', type: 'boolean' },
+								},
+							],
+						}),
+					);
+					expect(result).toBe(expected);
+				});
+
+				it.each([
+					{ left: true, right: true, expected: true },
+					{ left: false, right: false, expected: true },
+					{ left: true, right: false, expected: false },
+				])('boolean:equals($left,$right) === $expected', ({ left, right, expected }) => {
+					const result = executeFilter(
+						filterFactory({
+							conditions: [
+								{
+									id: '1',
+									leftValue: left,
+									rightValue: right,
+									operator: { operation: 'equals', type: 'boolean' },
+								},
+							],
+						}),
+					);
+					expect(result).toBe(expected);
+				});
+
+				it.each([
+					{ left: true, right: true, expected: false },
+					{ left: false, right: false, expected: false },
+					{ left: true, right: false, expected: true },
+				])('boolean:notEquals($left,$right) === $expected', ({ left, right, expected }) => {
+					const result = executeFilter(
+						filterFactory({
+							conditions: [
+								{
+									id: '1',
+									leftValue: left,
+									rightValue: right,
+									operator: { operation: 'notEquals', type: 'boolean' },
+								},
+							],
+						}),
+					);
+					expect(result).toBe(expected);
+				});
+			});
+
+			describe('array', () => {
+				it.each([
+					{ left: ['foo', 'bar'], right: 'foo', expected: true },
+					{ left: ['foo', 'bar'], right: 'ba', expected: false },
+				])('array:contains($left,$right) === $expected', ({ left, right, expected }) => {
+					const result = executeFilter(
+						filterFactory({
+							conditions: [
+								{
+									id: '1',
+									leftValue: left,
+									rightValue: right,
+									operator: { operation: 'contains', type: 'array', rightType: 'any' },
+								},
+							],
+						}),
+					);
+					expect(result).toBe(expected);
+				});
+
+				it.each([
+					{ left: ['foo', 'bar'], right: 'foo', expected: false },
+					{ left: ['foo', 'bar'], right: 'ba', expected: true },
+				])('array:notContains($left,$right) === $expected', ({ left, right, expected }) => {
+					const result = executeFilter(
+						filterFactory({
+							conditions: [
+								{
+									id: '1',
+									leftValue: left,
+									rightValue: right,
+									operator: { operation: 'notContains', type: 'array', rightType: 'any' },
+								},
+							],
+						}),
+					);
+					expect(result).toBe(expected);
+				});
+
+				it.each([
+					{ left: ['foo', 'bar'], right: 2, expected: true },
+					{ left: [], right: 0, expected: true },
+					{ left: ['foo', 'bar'], right: 1, expected: false },
+				])('array:lengthEquals($left,$right) === $expected', ({ left, right, expected }) => {
+					const result = executeFilter(
+						filterFactory({
+							conditions: [
+								{
+									id: '1',
+									leftValue: left,
+									rightValue: right,
+									operator: { operation: 'lengthEquals', type: 'array', rightType: 'number' },
+								},
+							],
+						}),
+					);
+					expect(result).toBe(expected);
+				});
+
+				it.each([
+					{ left: ['foo', 'bar'], right: 2, expected: false },
+					{ left: [], right: 0, expected: false },
+					{ left: ['foo', 'bar'], right: 1, expected: true },
+				])('array:lengthNotEquals($left,$right) === $expected', ({ left, right, expected }) => {
+					const result = executeFilter(
+						filterFactory({
+							conditions: [
+								{
+									id: '1',
+									leftValue: left,
+									rightValue: right,
+									operator: { operation: 'lengthNotEquals', type: 'array', rightType: 'number' },
+								},
+							],
+						}),
+					);
+					expect(result).toBe(expected);
+				});
+
+				it.each([
+					{ left: ['foo', 'bar'], right: 2, expected: false },
+					{ left: [], right: 0, expected: false },
+					{ left: ['foo', 'bar'], right: 1, expected: true },
+				])('array:lengthGt($left,$right) === $expected', ({ left, right, expected }) => {
+					const result = executeFilter(
+						filterFactory({
+							conditions: [
+								{
+									id: '1',
+									leftValue: left,
+									rightValue: right,
+									operator: { operation: 'lengthGt', type: 'array', rightType: 'number' },
+								},
+							],
+						}),
+					);
+					expect(result).toBe(expected);
+				});
+
+				it.each([
+					{ left: ['foo', 'bar'], right: 2, expected: false },
+					{ left: [], right: 0, expected: false },
+					{ left: ['foo', 'bar'], right: 1, expected: false },
+					{ left: ['foo', 'bar'], right: 3, expected: true },
+				])('array:lengthLt($left,$right) === $expected', ({ left, right, expected }) => {
+					const result = executeFilter(
+						filterFactory({
+							conditions: [
+								{
+									id: '1',
+									leftValue: left,
+									rightValue: right,
+									operator: { operation: 'lengthLt', type: 'array', rightType: 'number' },
+								},
+							],
+						}),
+					);
+					expect(result).toBe(expected);
+				});
+
+				it.each([
+					{ left: ['foo', 'bar'], right: 2, expected: true },
+					{ left: [], right: 0, expected: true },
+					{ left: ['foo', 'bar'], right: 1, expected: true },
+					{ left: ['foo', 'bar'], right: 3, expected: false },
+				])('array:lengthGte($left,$right) === $expected', ({ left, right, expected }) => {
+					const result = executeFilter(
+						filterFactory({
+							conditions: [
+								{
+									id: '1',
+									leftValue: left,
+									rightValue: right,
+									operator: { operation: 'lengthGte', type: 'array', rightType: 'number' },
+								},
+							],
+						}),
+					);
+					expect(result).toBe(expected);
+				});
+
+				it.each([
+					{ left: ['foo', 'bar'], right: 2, expected: true },
+					{ left: [], right: 0, expected: true },
+					{ left: ['foo', 'bar'], right: 1, expected: false },
+					{ left: ['foo', 'bar'], right: 3, expected: true },
+				])('array:lengthLte($left,$right) === $expected', ({ left, right, expected }) => {
+					const result = executeFilter(
+						filterFactory({
+							conditions: [
+								{
+									id: '1',
+									leftValue: left,
+									rightValue: right,
+									operator: { operation: 'lengthLte', type: 'array', rightType: 'number' },
+								},
+							],
+						}),
+					);
+					expect(result).toBe(expected);
+				});
+			});
+
+			describe('object', () => {
+				it.each([
+					{ left: {}, expected: true },
+					{ left: { foo: 'bar' }, expected: false },
+					{ left: undefined, expected: true },
+					{ left: null, expected: true },
+				])('object:empty($left) === $expected', ({ left, expected }) => {
+					const result = executeFilter(
+						filterFactory({
+							conditions: [
+								{
+									id: '1',
+									leftValue: left as string,
+									operator: { operation: 'empty', type: 'object' },
+								},
+							],
+						}),
+					);
+					expect(result).toBe(expected);
+				});
+
+				it.each([
+					{ left: {}, expected: false },
+					{ left: { foo: 'bar' }, expected: true },
+					{ left: undefined, expected: false },
+					{ left: null, expected: false },
+				])('object:notEmpty($left) === $expected', ({ left, expected }) => {
+					const result = executeFilter(
+						filterFactory({
+							conditions: [
+								{
+									id: '1',
+									leftValue: left as string,
+									operator: { operation: 'notEmpty', type: 'object' },
+								},
+							],
+						}),
+					);
+					expect(result).toBe(expected);
+				});
+			});
+		});
+	});
+});
diff --git a/packages/workflow/test/Helpers.ts b/packages/workflow/test/Helpers.ts
index d6a93d575d07c..8b07f3d6aa366 100644
--- a/packages/workflow/test/Helpers.ts
+++ b/packages/workflow/test/Helpers.ts
@@ -1,6 +1,5 @@
-import get from 'lodash.get';
+import get from 'lodash/get';
 import type {
-	CredentialInformation,
 	IAdditionalCredentialOptions,
 	IAllExecuteFunctions,
 	IContextObject,
@@ -21,9 +20,6 @@ import type {
 	INodeExecutionData,
 	INodeParameters,
 	INodeType,
-	INodeTypeData,
-	INodeTypes,
-	IVersionedNodeType,
 	IRunExecutionData,
 	ITaskDataConnections,
 	IWorkflowBase,
@@ -34,62 +30,36 @@ import type {
 	WorkflowExecuteMode,
 } from '@/Interfaces';
 import { ICredentials, ICredentialsHelper } from '@/Interfaces';
-import { Workflow } from '@/Workflow';
+import type { Workflow } from '@/Workflow';
 import { WorkflowDataProxy } from '@/WorkflowDataProxy';
 import { WorkflowHooks } from '@/WorkflowHooks';
 import * as NodeHelpers from '@/NodeHelpers';
+import { deepCopy } from '@/utils';
+import { getGlobalState } from '@/GlobalState';
+import { ApplicationError } from '@/errors/application.error';
+import { NodeTypes as NodeTypesClass } from './NodeTypes';
+import { readFileSync } from 'fs';
+import path from 'path';
 
 export interface INodeTypesObject {
 	[key: string]: INodeType;
 }
 
 export class Credentials extends ICredentials {
-	hasNodeAccess(nodeType: string): boolean {
-		return true;
-	}
-
-	setData(data: ICredentialDataDecryptedObject, encryptionKey: string): void {
+	setData(data: ICredentialDataDecryptedObject) {
 		this.data = JSON.stringify(data);
 	}
 
-	setDataKey(key: string, data: CredentialInformation, encryptionKey: string): void {
-		let fullData;
-		try {
-			fullData = this.getData(encryptionKey);
-		} catch (e) {
-			fullData = {};
-		}
-
-		fullData[key] = data;
-
-		return this.setData(fullData, encryptionKey);
-	}
-
-	getData(encryptionKey: string, nodeType?: string): ICredentialDataDecryptedObject {
+	getData(): ICredentialDataDecryptedObject {
 		if (this.data === undefined) {
-			throw new Error('No data is set so nothing can be returned.');
+			throw new ApplicationError('No data is set so nothing can be returned');
 		}
 		return JSON.parse(this.data);
 	}
 
-	getDataKey(key: string, encryptionKey: string, nodeType?: string): CredentialInformation {
-		const fullData = this.getData(encryptionKey, nodeType);
-
-		if (fullData === null) {
-			throw new Error(`No data was set.`);
-		}
-
-		// eslint-disable-next-line no-prototype-builtins
-		if (!fullData.hasOwnProperty(key)) {
-			throw new Error(`No data for key "${key}" exists.`);
-		}
-
-		return fullData[key];
-	}
-
 	getDataToSave(): ICredentialsEncrypted {
 		if (this.data === undefined) {
-			throw new Error(`No credentials were set to save.`);
+			throw new ApplicationError('No credentials were set to save');
 		}
 
 		return {
@@ -97,7 +67,6 @@ export class Credentials extends ICredentials {
 			name: this.name,
 			type: this.type,
 			data: this.data,
-			nodesAccess: this.nodesAccess,
 		};
 	}
 }
@@ -126,6 +95,7 @@ export class CredentialsHelper extends ICredentialsHelper {
 	}
 
 	async getDecrypted(
+		additionalData: IWorkflowExecuteAdditionalData,
 		nodeCredentials: INodeCredentialsDetails,
 		type: string,
 	): Promise<ICredentialDataDecryptedObject> {
@@ -155,20 +125,21 @@ export function getNodeParameter(
 	parameterName: string,
 	itemIndex: number,
 	mode: WorkflowExecuteMode,
-	timezone: string,
 	additionalKeys: IWorkflowDataProxyAdditionalKeys,
 	executeData: IExecuteData,
 	fallbackValue?: any,
 ): NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[] | object {
 	const nodeType = workflow.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
 	if (nodeType === undefined) {
-		throw new Error(`Node type "${node.type}" is not known so can not return parameter value!`);
+		throw new ApplicationError('Node type is unknown so cannot return parameter value', {
+			tags: { nodeType: node.type },
+		});
 	}
 
 	const value = get(node.parameters, parameterName, fallbackValue);
 
 	if (value === undefined) {
-		throw new Error(`Could not get parameter "${parameterName}"!`);
+		throw new ApplicationError('Could not get parameter', { extra: { parameterName } });
 	}
 
 	let returnData;
@@ -181,7 +152,6 @@ export function getNodeParameter(
 			node.name,
 			connectionInputData,
 			mode,
-			timezone,
 			additionalKeys,
 		);
 	} catch (e) {
@@ -216,7 +186,7 @@ export function getExecuteFunctions(
 				workflowInfo: IExecuteWorkflowInfo,
 				inputData?: INodeExecutionData[],
 			): Promise<any> {
-				return additionalData.executeWorkflow(workflowInfo, additionalData, { inputData });
+				return await additionalData.executeWorkflow(workflowInfo, additionalData, { inputData });
 			},
 			getContext(type: string): IContextObject {
 				return NodeHelpers.getContext(runExecutionData, type, node);
@@ -239,12 +209,15 @@ export function getExecuteFunctions(
 				}
 
 				if (inputData[inputName].length < inputIndex) {
-					throw new Error(`Could not get input index "${inputIndex}" of input "${inputName}"!`);
+					throw new ApplicationError('Could not get input index', {
+						extra: { inputIndex, inputName },
+					});
 				}
 
 				if (inputData[inputName][inputIndex] === null) {
-					// return [];
-					throw new Error(`Value "${inputIndex}" of input "${inputName}" did not get set!`);
+					throw new ApplicationError('Value of input did not get set', {
+						extra: { inputIndex, inputName },
+					});
 				}
 
 				return inputData[inputName][inputIndex] as INodeExecutionData[];
@@ -268,7 +241,6 @@ export function getExecuteFunctions(
 					parameterName,
 					itemIndex,
 					mode,
-					additionalData.timezone,
 					{},
 					fallbackValue,
 				);
@@ -277,13 +249,13 @@ export function getExecuteFunctions(
 				return mode;
 			},
 			getNode: () => {
-				return JSON.parse(JSON.stringify(node));
+				return deepCopy(node);
 			},
 			getRestApiUrl: (): string => {
 				return additionalData.restApiUrl;
 			},
 			getTimezone: (): string => {
-				return additionalData.timezone;
+				return workflow.settings.timezone ?? getGlobalState().defaultTimezone;
 			},
 			getExecuteData: (): IExecuteData => {
 				return executeData;
@@ -305,7 +277,6 @@ export function getExecuteFunctions(
 					connectionInputData,
 					{},
 					mode,
-					additionalData.timezone,
 					{},
 					executeData,
 				);
@@ -327,7 +298,6 @@ export function getExecuteFunctions(
 						additionalData.sendMessageToUI(node.name, args);
 					}
 				} catch (error) {
-					// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
 					console.error(`There was a problem sending message to UI: ${error.message}`);
 				}
 			},
@@ -418,21 +388,23 @@ export function getExecuteSingleFunctions(
 				}
 
 				if (inputData[inputName].length < inputIndex) {
-					throw new Error(`Could not get input index "${inputIndex}" of input "${inputName}"!`);
+					throw new ApplicationError('Could not get input index', {
+						extra: { inputIndex, inputName },
+					});
 				}
 
 				const allItems = inputData[inputName][inputIndex];
 
 				if (allItems === null) {
-					// return [];
-					throw new Error(`Value "${inputIndex}" of input "${inputName}" did not get set!`);
+					throw new ApplicationError('Value of input did not get set', {
+						extra: { inputIndex, inputName },
+					});
 				}
 
 				if (allItems[itemIndex] === null) {
-					// return [];
-					throw new Error(
-						`Value "${inputIndex}" of input "${inputName}" with itemIndex "${itemIndex}" did not get set!`,
-					);
+					throw new ApplicationError('Value of input with item index did not get set', {
+						extra: { inputIndex, inputName, itemIndex },
+					});
 				}
 
 				return allItems[itemIndex];
@@ -444,13 +416,13 @@ export function getExecuteSingleFunctions(
 				return mode;
 			},
 			getNode: () => {
-				return JSON.parse(JSON.stringify(node));
+				return deepCopy(node);
 			},
 			getRestApiUrl: (): string => {
 				return additionalData.restApiUrl;
 			},
 			getTimezone: (): string => {
-				return additionalData.timezone;
+				return workflow.settings.timezone ?? getGlobalState().defaultTimezone;
 			},
 			getExecuteData: (): IExecuteData => {
 				return executeData;
@@ -473,7 +445,6 @@ export function getExecuteSingleFunctions(
 					parameterName,
 					itemIndex,
 					mode,
-					additionalData.timezone,
 					{},
 					fallbackValue,
 				);
@@ -495,7 +466,6 @@ export function getExecuteSingleFunctions(
 					connectionInputData,
 					{},
 					mode,
-					additionalData.timezone,
 					{},
 					executeData,
 				);
@@ -553,135 +523,6 @@ export function getExecuteSingleFunctions(
 	})(workflow, runExecutionData, connectionInputData, inputData, node, itemIndex);
 }
 
-class NodeTypesClass implements INodeTypes {
-	nodeTypes: INodeTypeData = {
-		'test.set': {
-			sourcePath: '',
-			type: {
-				description: {
-					displayName: 'Set',
-					name: 'set',
-					group: ['input'],
-					version: 1,
-					description: 'Sets a value',
-					defaults: {
-						name: 'Set',
-						color: '#0000FF',
-					},
-					inputs: ['main'],
-					outputs: ['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: ['main'],
-					outputs: ['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.',
-										},
-									],
-								},
-							],
-						},
-					],
-				},
-			},
-		},
-		'test.switch': {
-			sourcePath: '',
-			type: {
-				description: {
-					displayName: 'Set',
-					name: 'set',
-					group: ['input'],
-					version: 1,
-					description: 'Switches',
-					defaults: {
-						name: 'Switch',
-						color: '#0000FF',
-					},
-					inputs: ['main'],
-					outputs: ['main', 'main', 'main', 'main'],
-					outputNames: ['0', '1', '2', '3'],
-					properties: [
-						{
-							displayName: 'Value1',
-							name: 'value1',
-							type: 'string',
-							default: 'default-value1',
-						},
-						{
-							displayName: 'Value2',
-							name: 'value2',
-							type: 'string',
-							default: 'default-value2',
-						},
-					],
-				},
-			},
-		},
-	};
-
-	getByName(nodeType: string): INodeType | IVersionedNodeType {
-		return this.nodeTypes[nodeType].type;
-	}
-
-	getByNameAndVersion(nodeType: string, version?: number): INodeType {
-		return NodeHelpers.getVersionedNodeType(this.nodeTypes[nodeType].type, version);
-	}
-}
-
 let nodeTypesInstance: NodeTypesClass | undefined;
 
 export function NodeTypes(): NodeTypesClass {
@@ -703,16 +544,18 @@ export function WorkflowExecuteAdditionalData(): IWorkflowExecuteAdditionalData
 	};
 
 	return {
-		credentialsHelper: new CredentialsHelper(''),
+		credentialsHelper: new CredentialsHelper(),
 		hooks: new WorkflowHooks({}, 'trigger', '1', workflowData),
 		executeWorkflow: async (workflowInfo: IExecuteWorkflowInfo): Promise<any> => {},
-		sendMessageToUI: (message: string) => {},
+		sendDataToUI: (message: string) => {},
 		restApiUrl: '',
-		encryptionKey: 'test',
-		timezone: 'America/New_York',
 		webhookBaseUrl: 'webhook',
 		webhookWaitingBaseUrl: 'webhook-waiting',
 		webhookTestBaseUrl: 'webhook-test',
 		userId: '123',
 	};
 }
+
+const BASE_DIR = path.resolve(__dirname, '..');
+export const readJsonFileSync = <T>(filePath: string) =>
+	JSON.parse(readFileSync(path.join(BASE_DIR, filePath), 'utf-8')) as T;
diff --git a/packages/workflow/test/NodeErrors.test.ts b/packages/workflow/test/NodeErrors.test.ts
new file mode 100644
index 0000000000000..8b9f7fefbbb91
--- /dev/null
+++ b/packages/workflow/test/NodeErrors.test.ts
@@ -0,0 +1,263 @@
+import type { INode } from '@/Interfaces';
+import { NodeOperationError } from '@/errors';
+import { NodeApiError } from '@/errors/node-api.error';
+import { UNKNOWN_ERROR_DESCRIPTION, UNKNOWN_ERROR_MESSAGE } from '../src/Constants';
+
+const node: INode = {
+	id: '1',
+	name: 'Postgres node',
+	typeVersion: 2,
+	type: 'n8n-nodes-base.postgres',
+	position: [60, 760],
+	parameters: {
+		operation: 'executeQuery',
+	},
+};
+
+describe('NodeErrors tests', () => {
+	it('should return unknown error message', () => {
+		const nodeApiError = new NodeApiError(node, {});
+
+		expect(nodeApiError.message).toEqual(UNKNOWN_ERROR_MESSAGE);
+	});
+
+	it('should return the error message', () => {
+		const nodeApiError = new NodeApiError(node, { message: 'test error message' });
+
+		expect(nodeApiError.message).toEqual('test error message');
+	});
+
+	it('should return the error message defined in reason', () => {
+		const nodeApiError = new NodeApiError(node, { reason: { message: 'test error message' } });
+
+		expect(nodeApiError.message).toEqual('test error message');
+	});
+
+	it('should return the error message defined in options', () => {
+		const nodeApiError = new NodeApiError(node, {}, { message: 'test error message' });
+
+		expect(nodeApiError.message).toEqual('test error message');
+	});
+
+	it('should return description error message', () => {
+		const nodeApiError = new NodeApiError(node, { description: 'test error description' });
+
+		expect(nodeApiError.message).toEqual('test error description');
+	});
+
+	it('should return description as error message defined in reason', () => {
+		const nodeApiError = new NodeApiError(node, {
+			reason: { description: 'test error description' },
+		});
+
+		expect(nodeApiError.message).toEqual('test error description');
+	});
+
+	it('should return description as error message defined in options', () => {
+		const nodeApiError = new NodeApiError(node, {}, { description: 'test error description' });
+
+		expect(nodeApiError.message).toEqual('test error description');
+	});
+
+	it('should return default message for ECONNREFUSED', () => {
+		const nodeApiError = new NodeApiError(node, {
+			message: 'ECONNREFUSED',
+		});
+
+		expect(nodeApiError.message).toEqual(
+			'The service refused the connection - perhaps it is offline',
+		);
+	});
+
+	it('should return default message for 502', () => {
+		const nodeApiError = new NodeApiError(node, {
+			message: '502 Bad Gateway',
+		});
+
+		expect(nodeApiError.message).toEqual('Bad gateway - the service failed to handle your request');
+	});
+
+	it('should return default message for ENOTFOUND, NodeOperationError', () => {
+		const nodeOperationError = new NodeOperationError(node, 'ENOTFOUND test error message');
+
+		expect(nodeOperationError.message).toEqual(
+			'The connection cannot be established, this usually occurs due to an incorrect host(domain) value',
+		);
+	});
+
+	it('should return default message for ENOTFOUND, NodeApiError', () => {
+		const nodeApiError = new NodeApiError(node, { message: 'ENOTFOUND test error message' });
+
+		expect(nodeApiError.message).toEqual(
+			'The connection cannot be established, this usually occurs due to an incorrect host(domain) value',
+		);
+	});
+
+	it('should return default message for EEXIST based on code, NodeApiError', () => {
+		const nodeApiError = new NodeApiError(node, {
+			message: 'test error message',
+			code: 'EEXIST',
+		});
+
+		expect(nodeApiError.message).toEqual('The file or directory already exists');
+	});
+
+	it('should update description GETADDRINFO, NodeOperationError', () => {
+		const nodeOperationError = new NodeOperationError(node, 'GETADDRINFO test error message', {
+			description: 'test error description',
+		});
+
+		expect(nodeOperationError.message).toEqual('The server closed the connection unexpectedly');
+
+		//description should not include error message
+		expect(nodeOperationError.description).toEqual('test error description');
+	});
+
+	it('should remove description if it is equal to message, NodeOperationError', () => {
+		const nodeOperationError = new NodeOperationError(node, 'some text', {
+			description: 'some text',
+		});
+
+		expect(nodeOperationError.message).toEqual('some text');
+
+		expect(nodeOperationError.description).toEqual(undefined);
+	});
+
+	it('should remove description if it is equal to message, message provided in options take precedence over original, NodeApiError', () => {
+		const nodeApiError = new NodeApiError(
+			node,
+			{
+				message: 'original message',
+			},
+			{ message: 'new text', description: 'new text' },
+		);
+
+		expect(nodeApiError.message).toEqual('new text');
+
+		expect(nodeApiError.description).toEqual(undefined);
+	});
+
+	it('should return mapped message for MYMAPPEDMESSAGE, NodeOperationError', () => {
+		const nodeOperationError = new NodeOperationError(node, 'MYMAPPEDMESSAGE test error message', {
+			messageMapping: {
+				MYMAPPEDMESSAGE: 'test error message',
+			},
+		});
+
+		expect(nodeOperationError.message).toEqual('test error message');
+	});
+
+	it('should return mapped message for MYMAPPEDMESSAGE, NodeApiError', () => {
+		const nodeApiError = new NodeApiError(
+			node,
+			{ message: 'MYMAPPEDMESSAGE test error message' },
+			{
+				messageMapping: {
+					MYMAPPEDMESSAGE: 'test error message',
+				},
+			},
+		);
+
+		expect(nodeApiError.message).toEqual('test error message');
+	});
+
+	it('should return default message for EACCES, custom mapping not found, NodeOperationError', () => {
+		const nodeOperationError = new NodeOperationError(node, 'EACCES test error message', {
+			messageMapping: {
+				MYMAPPEDMESSAGE: 'test error message',
+			},
+		});
+
+		expect(nodeOperationError.message).toEqual(
+			'Forbidden by access permissions, make sure you have the right permissions',
+		);
+	});
+});
+
+describe('NodeApiError message and description logic', () => {
+	it('case: customMessage && customDescription, result: message === customMessage; description === customDescription', () => {
+		const apiError = { message: 'Original message', code: 404 };
+		const nodeApiError = new NodeApiError(node, apiError, {
+			message: 'Custom message',
+			description: 'Custom description',
+		});
+
+		expect(nodeApiError.message).toEqual('Custom message');
+		expect(nodeApiError.description).toEqual('Custom description');
+		expect(nodeApiError.messages).toContain('Original message');
+	});
+
+	it('case: customMessage && !customDescription && extractedMessage, result: message === customMessage; description === extractedMessage', () => {
+		const apiError = {
+			message: 'Original message',
+			code: 404,
+			response: { data: { error: { message: 'Extracted message' } } },
+		};
+		const nodeApiError = new NodeApiError(node, apiError, {
+			message: 'Custom message',
+		});
+
+		expect(nodeApiError.message).toEqual('Custom message');
+		expect(nodeApiError.description).toEqual('Extracted message');
+		expect(nodeApiError.messages).toContain('Original message');
+	});
+
+	it('case: customMessage && !customDescription && !extractedMessage, result: message === customMessage; !description', () => {
+		const apiError = {
+			message: '',
+			code: 404,
+			response: { data: { error: { foo: 'Extracted message' } } },
+		};
+		const nodeApiError = new NodeApiError(node, apiError, {
+			message: 'Custom message',
+		});
+
+		expect(nodeApiError.message).toEqual('Custom message');
+		expect(nodeApiError.description).toBeFalsy();
+		expect(nodeApiError.messages.length).toBe(0);
+	});
+
+	it('case: !customMessage && httpCodeMapping && extractedMessage, result: message === httpCodeMapping; description === extractedMessage', () => {
+		const apiError = {
+			message: 'Original message',
+			code: 404,
+			response: { data: { error: { message: 'Extracted message' } } },
+		};
+		const nodeApiError = new NodeApiError(node, apiError);
+
+		expect(nodeApiError.message).toEqual('The resource you are requesting could not be found');
+		expect(nodeApiError.description).toEqual('Extracted message');
+		expect(nodeApiError.messages).toContain('Original message');
+	});
+
+	it('case: !customMessage && httpCodeMapping && !extractedMessage, result: message === httpCodeMapping; !description', () => {
+		const apiError = {
+			message: '',
+			code: 500,
+		};
+		const nodeApiError = new NodeApiError(node, apiError);
+
+		expect(nodeApiError.message).toEqual('The service was not able to process your request');
+		expect(nodeApiError.description).toBeFalsy();
+	});
+
+	it('case: !customMessage && !httpCodeMapping && extractedMessage, result: message === extractedMessage; !description', () => {
+		const apiError = {
+			message: '',
+			code: 300,
+			response: { data: { error: { message: 'Extracted message' } } },
+		};
+		const nodeApiError = new NodeApiError(node, apiError);
+
+		expect(nodeApiError.message).toEqual('Extracted message');
+		expect(nodeApiError.description).toBeFalsy();
+	});
+
+	it('case: !customMessage && !httpCodeMapping && !extractedMessage, result: message === UNKNOWN_ERROR_MESSAGE; description === UNKNOWN_ERROR_DESCRIPTION', () => {
+		const apiError = {};
+		const nodeApiError = new NodeApiError(node, apiError);
+
+		expect(nodeApiError.message).toEqual(UNKNOWN_ERROR_MESSAGE);
+		expect(nodeApiError.description).toEqual(UNKNOWN_ERROR_DESCRIPTION);
+	});
+});
diff --git a/packages/workflow/test/NodeHelpers.conditions.test.ts b/packages/workflow/test/NodeHelpers.conditions.test.ts
new file mode 100644
index 0000000000000..9e1bcec5f0f8c
--- /dev/null
+++ b/packages/workflow/test/NodeHelpers.conditions.test.ts
@@ -0,0 +1,1936 @@
+import type { INodeParameters, INodeProperties } from '@/Interfaces';
+import { getNodeParameters } from '@/NodeHelpers';
+
+describe('NodeHelpers', () => {
+	describe('getNodeParameters, displayOptions set using DisplayCondition', () => {
+		const tests: Array<{
+			description: string;
+			input: {
+				nodePropertiesArray: INodeProperties[];
+				nodeValues: INodeParameters | null;
+			};
+			output: {
+				noneDisplayedFalse: {
+					defaultsFalse: INodeParameters;
+					defaultsTrue: INodeParameters;
+				};
+				noneDisplayedTrue: {
+					defaultsFalse: INodeParameters;
+					defaultsTrue: INodeParameters;
+				};
+			};
+		}> = [
+			{
+				description: 'simple values with displayOptions "show" number (gt). No values set.',
+				input: {
+					nodePropertiesArray: [
+						{
+							name: 'number1',
+							displayName: 'number1',
+							type: 'number',
+							default: 2,
+						},
+						{
+							name: 'string1',
+							displayName: 'string1',
+							displayOptions: {
+								show: {
+									number1: [{ _cnd: { gt: 1 } }],
+								},
+							},
+							type: 'string',
+							default: 'default string1',
+						},
+					],
+					nodeValues: {},
+				},
+				output: {
+					noneDisplayedFalse: {
+						defaultsFalse: {},
+						defaultsTrue: {
+							number1: 2,
+							string1: 'default string1',
+						},
+					},
+					noneDisplayedTrue: {
+						defaultsFalse: {},
+						defaultsTrue: {
+							number1: 2,
+							string1: 'default string1',
+						},
+					},
+				},
+			},
+			{
+				description: 'simple values with displayOptions "show" number (lt). No values set.',
+				input: {
+					nodePropertiesArray: [
+						{
+							name: 'number1',
+							displayName: 'number1',
+							type: 'number',
+							default: 2,
+						},
+						{
+							name: 'string1',
+							displayName: 'string1',
+							displayOptions: {
+								show: {
+									number1: [{ _cnd: { lt: 3 } }],
+								},
+							},
+							type: 'string',
+							default: 'default string1',
+						},
+					],
+					nodeValues: {},
+				},
+				output: {
+					noneDisplayedFalse: {
+						defaultsFalse: {},
+						defaultsTrue: {
+							number1: 2,
+							string1: 'default string1',
+						},
+					},
+					noneDisplayedTrue: {
+						defaultsFalse: {},
+						defaultsTrue: {
+							number1: 2,
+							string1: 'default string1',
+						},
+					},
+				},
+			},
+			{
+				description: 'simple values with displayOptions "show" number (between). No values set.',
+				input: {
+					nodePropertiesArray: [
+						{
+							name: 'number1',
+							displayName: 'number1',
+							type: 'number',
+							default: 2,
+						},
+						{
+							name: 'string1',
+							displayName: 'string1',
+							displayOptions: {
+								show: {
+									number1: [{ _cnd: { between: { from: 1, to: 3 } } }],
+								},
+							},
+							type: 'string',
+							default: 'default string1',
+						},
+					],
+					nodeValues: {},
+				},
+				output: {
+					noneDisplayedFalse: {
+						defaultsFalse: {},
+						defaultsTrue: {
+							number1: 2,
+							string1: 'default string1',
+						},
+					},
+					noneDisplayedTrue: {
+						defaultsFalse: {},
+						defaultsTrue: {
+							number1: 2,
+							string1: 'default string1',
+						},
+					},
+				},
+			},
+			{
+				description: 'simple values with displayOptions "show" number (lte). No values set.',
+				input: {
+					nodePropertiesArray: [
+						{
+							name: 'number1',
+							displayName: 'number1',
+							type: 'number',
+							default: 2,
+						},
+						{
+							name: 'string1',
+							displayName: 'string1',
+							displayOptions: {
+								show: {
+									number1: [{ _cnd: { lte: 3 } }],
+								},
+							},
+							type: 'string',
+							default: 'default string1',
+						},
+					],
+					nodeValues: {},
+				},
+				output: {
+					noneDisplayedFalse: {
+						defaultsFalse: {},
+						defaultsTrue: {
+							number1: 2,
+							string1: 'default string1',
+						},
+					},
+					noneDisplayedTrue: {
+						defaultsFalse: {},
+						defaultsTrue: {
+							number1: 2,
+							string1: 'default string1',
+						},
+					},
+				},
+			},
+			{
+				description: 'simple values with displayOptions "show" number (gte). No values set.',
+				input: {
+					nodePropertiesArray: [
+						{
+							name: 'number1',
+							displayName: 'number1',
+							type: 'number',
+							default: 2,
+						},
+						{
+							name: 'string1',
+							displayName: 'string1',
+							displayOptions: {
+								show: {
+									number1: [{ _cnd: { gte: 1 } }],
+								},
+							},
+							type: 'string',
+							default: 'default string1',
+						},
+					],
+					nodeValues: {},
+				},
+				output: {
+					noneDisplayedFalse: {
+						defaultsFalse: {},
+						defaultsTrue: {
+							number1: 2,
+							string1: 'default string1',
+						},
+					},
+					noneDisplayedTrue: {
+						defaultsFalse: {},
+						defaultsTrue: {
+							number1: 2,
+							string1: 'default string1',
+						},
+					},
+				},
+			},
+			{
+				description:
+					'simple values with displayOptions "show" (match) which is boolean. All values set.',
+				input: {
+					nodePropertiesArray: [
+						{
+							name: 'boolean1',
+							displayName: 'boolean1',
+							type: 'boolean',
+							default: false,
+						},
+						{
+							name: 'string1',
+							displayName: 'string1',
+							displayOptions: {
+								show: {
+									boolean1: [{ _cnd: { eq: true } }],
+								},
+							},
+							type: 'string',
+							default: 'default string1',
+						},
+					],
+					nodeValues: {
+						boolean1: true,
+						string1: 'own string1',
+					},
+				},
+				output: {
+					noneDisplayedFalse: {
+						defaultsFalse: {
+							boolean1: true,
+							string1: 'own string1',
+						},
+						defaultsTrue: {
+							boolean1: true,
+							string1: 'own string1',
+						},
+					},
+					noneDisplayedTrue: {
+						defaultsFalse: {
+							boolean1: true,
+							string1: 'own string1',
+						},
+						defaultsTrue: {
+							boolean1: true,
+							string1: 'own string1',
+						},
+					},
+				},
+			},
+			{
+				description:
+					'simple values with displayOptions "hide" (match) which is boolean. All values set.',
+				input: {
+					nodePropertiesArray: [
+						{
+							name: 'boolean1',
+							displayName: 'boolean1',
+							type: 'boolean',
+							default: false,
+						},
+						{
+							name: 'string1',
+							displayName: 'string1',
+							displayOptions: {
+								hide: {
+									boolean1: [{ _cnd: { eq: true } }],
+								},
+							},
+							type: 'string',
+							default: 'default string1',
+						},
+					],
+					nodeValues: {
+						boolean1: true,
+					},
+				},
+				output: {
+					noneDisplayedFalse: {
+						defaultsFalse: {
+							boolean1: true,
+						},
+						defaultsTrue: {
+							boolean1: true,
+						},
+					},
+					noneDisplayedTrue: {
+						defaultsFalse: {
+							boolean1: true,
+						},
+						defaultsTrue: {
+							boolean1: true,
+							string1: 'default string1',
+						},
+					},
+				},
+			},
+			{
+				description:
+					'simple values with displayOptions "show" (match) which is boolean. One values set.',
+				input: {
+					nodePropertiesArray: [
+						{
+							name: 'boolean1',
+							displayName: 'boolean1',
+							type: 'boolean',
+							default: false,
+						},
+						{
+							name: 'string1',
+							displayName: 'string1',
+							displayOptions: {
+								show: {
+									boolean1: [{ _cnd: { eq: true } }],
+								},
+							},
+							type: 'string',
+							default: 'default string1',
+						},
+					],
+					nodeValues: {
+						boolean1: true,
+					},
+				},
+				output: {
+					noneDisplayedFalse: {
+						defaultsFalse: {
+							boolean1: true,
+						},
+						defaultsTrue: {
+							boolean1: true,
+							string1: 'default string1',
+						},
+					},
+					noneDisplayedTrue: {
+						defaultsFalse: {
+							boolean1: true,
+						},
+						defaultsTrue: {
+							boolean1: true,
+							string1: 'default string1',
+						},
+					},
+				},
+			},
+			{
+				description: 'simple values with displayOptions "show" (match). No values set.',
+				input: {
+					nodePropertiesArray: [
+						{
+							name: 'mode',
+							displayName: 'mode',
+							type: 'string',
+							default: 'mode1',
+						},
+						{
+							name: 'string1',
+							displayName: 'string1',
+							displayOptions: {
+								show: {
+									mode: [{ _cnd: { includes: 'mode1' } }],
+								},
+							},
+							type: 'string',
+							default: 'default string1',
+						},
+					],
+					nodeValues: {},
+				},
+				output: {
+					noneDisplayedFalse: {
+						defaultsFalse: {},
+						defaultsTrue: {
+							mode: 'mode1',
+							string1: 'default string1',
+						},
+					},
+					noneDisplayedTrue: {
+						defaultsFalse: {},
+						defaultsTrue: {
+							mode: 'mode1',
+							string1: 'default string1',
+						},
+					},
+				},
+			},
+			{
+				description:
+					'simple values with displayOptions "show" (match) on two which depend on each other of which is boolean. One value should be displayed. One values set (none-default).',
+				input: {
+					nodePropertiesArray: [
+						{
+							name: 'string1',
+							displayName: 'string1',
+							type: 'string',
+							default: 'default string1',
+						},
+						{
+							name: 'boolean1',
+							displayName: 'boolean1',
+							displayOptions: {
+								show: {
+									string1: [{ _cnd: { eq: 'default string1' } }],
+								},
+							},
+							type: 'boolean',
+							default: false,
+						},
+						{
+							name: 'string2',
+							displayName: 'string2',
+							displayOptions: {
+								show: {
+									boolean1: [{ _cnd: { not: false } }],
+								},
+							},
+							type: 'string',
+							default: 'default string2',
+						},
+					],
+					nodeValues: {
+						boolean1: true,
+					},
+				},
+				output: {
+					noneDisplayedFalse: {
+						defaultsFalse: {
+							boolean1: true,
+						},
+						defaultsTrue: {
+							string1: 'default string1',
+							boolean1: true,
+							string2: 'default string2',
+						},
+					},
+					noneDisplayedTrue: {
+						defaultsFalse: {
+							boolean1: true,
+						},
+						defaultsTrue: {
+							string1: 'default string1',
+							boolean1: true,
+							string2: 'default string2',
+						},
+					},
+				},
+			},
+			{
+				description:
+					'simple values with displayOptions "show" (match) on two which depend on each other of which is boolean. One value should be displayed. One values set. (default)',
+				input: {
+					nodePropertiesArray: [
+						{
+							name: 'string1',
+							displayName: 'string1',
+							type: 'string',
+							default: 'default string1',
+						},
+						{
+							name: 'boolean1',
+							displayName: 'boolean1',
+							displayOptions: {
+								show: {
+									string1: [{ _cnd: { endsWith: 'string1' } }],
+								},
+							},
+							type: 'boolean',
+							default: false,
+						},
+						{
+							name: 'string2',
+							displayName: 'string2',
+							displayOptions: {
+								show: {
+									boolean1: [{ _cnd: { eq: true } }],
+								},
+							},
+							type: 'string',
+							default: 'default string2',
+						},
+					],
+					nodeValues: {
+						boolean1: false,
+					},
+				},
+				output: {
+					noneDisplayedFalse: {
+						defaultsFalse: {},
+						defaultsTrue: {
+							string1: 'default string1',
+							boolean1: false,
+						},
+					},
+					noneDisplayedTrue: {
+						defaultsFalse: {},
+						defaultsTrue: {
+							string1: 'default string1',
+							boolean1: false,
+							string2: 'default string2',
+						},
+					},
+				},
+			},
+			{
+				description: 'simple values with displayOptions "show" (match). All values set.',
+				input: {
+					nodePropertiesArray: [
+						{
+							name: 'mode',
+							displayName: 'mode',
+							type: 'string',
+							default: 'mode1',
+						},
+						{
+							name: 'string1',
+							displayName: 'string1',
+							displayOptions: {
+								show: {
+									mode: [{ _cnd: { startsWith: 'mo' } }],
+								},
+							},
+							type: 'string',
+							default: 'default string1',
+						},
+					],
+					nodeValues: {
+						mode: 'mode1',
+						string1: 'default string1',
+					},
+				},
+				output: {
+					noneDisplayedFalse: {
+						defaultsFalse: {},
+						defaultsTrue: {
+							mode: 'mode1',
+							string1: 'default string1',
+						},
+					},
+					noneDisplayedTrue: {
+						defaultsFalse: {},
+						defaultsTrue: {
+							mode: 'mode1',
+							string1: 'default string1',
+						},
+					},
+				},
+			},
+			{
+				description: 'simple values with displayOptions "show" (no-match). No values set.',
+				input: {
+					nodePropertiesArray: [
+						{
+							name: 'mode',
+							displayName: 'mode',
+							type: 'string',
+							default: 'mode1',
+						},
+						{
+							name: 'string1',
+							displayName: 'string1',
+							displayOptions: {
+								show: {
+									mode: [{ _cnd: { endsWith: '2' } }],
+								},
+							},
+							type: 'string',
+							default: 'default string1',
+						},
+					],
+					nodeValues: {},
+				},
+				output: {
+					noneDisplayedFalse: {
+						defaultsFalse: {},
+						defaultsTrue: {
+							mode: 'mode1',
+						},
+					},
+					noneDisplayedTrue: {
+						defaultsFalse: {},
+						defaultsTrue: {
+							mode: 'mode1',
+							string1: 'default string1',
+						},
+					},
+				},
+			},
+			{
+				description: 'simple values with displayOptions "show" (no-match). All values set.',
+				input: {
+					nodePropertiesArray: [
+						{
+							name: 'mode',
+							displayName: 'mode',
+							type: 'string',
+							default: 'mode1',
+						},
+						{
+							name: 'string1',
+							displayName: 'string1',
+							displayOptions: {
+								show: {
+									mode: [{ _cnd: { startsWith: 'foo' } }],
+								},
+							},
+							type: 'string',
+							default: 'default string1',
+						},
+					],
+					nodeValues: {
+						mode: 'mode1',
+						string1: 'default string1',
+					},
+				},
+				output: {
+					noneDisplayedFalse: {
+						defaultsFalse: {},
+						defaultsTrue: {
+							mode: 'mode1',
+						},
+					},
+					noneDisplayedTrue: {
+						defaultsFalse: {},
+						defaultsTrue: {
+							mode: 'mode1',
+							string1: 'default string1',
+						},
+					},
+				},
+			},
+
+			{
+				description:
+					'complex type "fixedCollection" with "multipleValues: false" and with displayOptions "show" (match) on option. One value set.',
+				input: {
+					nodePropertiesArray: [
+						{
+							name: 'values',
+							displayName: 'Values',
+							type: 'fixedCollection',
+							default: {},
+							options: [
+								{
+									name: 'number',
+									displayName: 'Number',
+									values: [
+										{
+											name: 'mode',
+											displayName: 'mode',
+											type: 'string',
+											default: 'mode1',
+										},
+										{
+											name: 'string1',
+											displayName: 'string1',
+											type: 'string',
+											displayOptions: {
+												show: {
+													mode: [{ _cnd: { endsWith: 'mode1' } }],
+												},
+											},
+											default: 'default string1',
+										},
+										{
+											name: 'number1',
+											displayName: 'number1',
+											type: 'number',
+											default: 0,
+										},
+									],
+								},
+							],
+						},
+					],
+					nodeValues: {
+						values: {
+							number: {
+								number1: 1,
+							},
+						},
+					},
+				},
+				output: {
+					noneDisplayedFalse: {
+						defaultsFalse: {
+							values: {
+								number: {
+									number1: 1,
+								},
+							},
+						},
+						defaultsTrue: {
+							values: {
+								number: {
+									mode: 'mode1',
+									string1: 'default string1',
+									number1: 1,
+								},
+							},
+						},
+					},
+					noneDisplayedTrue: {
+						defaultsFalse: {
+							values: {
+								number: {
+									number1: 1,
+								},
+							},
+						},
+						defaultsTrue: {
+							values: {
+								number: {
+									mode: 'mode1',
+									string1: 'default string1',
+									number1: 1,
+								},
+							},
+						},
+					},
+				},
+			},
+			{
+				description:
+					'complex type "fixedCollection" with "multipleValues: false" and with displayOptions "show" (match) on option which references root-value. One value set.',
+				input: {
+					nodePropertiesArray: [
+						{
+							name: 'mode',
+							displayName: 'mode',
+							type: 'string',
+							default: 'mode1',
+						},
+						{
+							name: 'values',
+							displayName: 'Values',
+							type: 'fixedCollection',
+							default: {},
+							options: [
+								{
+									name: 'number',
+									displayName: 'Number',
+									values: [
+										{
+											name: 'string1',
+											displayName: 'string1',
+											type: 'string',
+											displayOptions: {
+												show: {
+													'/mode': [{ _cnd: { eq: 'mode1' } }],
+												},
+											},
+											default: 'default string1',
+										},
+										{
+											name: 'number1',
+											displayName: 'number1',
+											type: 'number',
+											default: 0,
+										},
+									],
+								},
+							],
+						},
+					],
+					nodeValues: {
+						values: {
+							number: {
+								string1: 'own string1',
+							},
+						},
+					},
+				},
+				output: {
+					noneDisplayedFalse: {
+						defaultsFalse: {
+							values: {
+								number: {
+									string1: 'own string1',
+								},
+							},
+						},
+						defaultsTrue: {
+							mode: 'mode1',
+							values: {
+								number: {
+									string1: 'own string1',
+									number1: 0,
+								},
+							},
+						},
+					},
+					noneDisplayedTrue: {
+						defaultsFalse: {
+							values: {
+								number: {
+									string1: 'own string1',
+								},
+							},
+						},
+						defaultsTrue: {
+							mode: 'mode1',
+							values: {
+								number: {
+									string1: 'own string1',
+									number1: 0,
+								},
+							},
+						},
+					},
+				},
+			},
+			{
+				description:
+					'complex type "fixedCollection" with "multipleValues: false" and with displayOptions "show" (no-match) on option which references root-value. One value set.',
+				input: {
+					nodePropertiesArray: [
+						{
+							name: 'mode',
+							displayName: 'mode',
+							type: 'string',
+							default: 'mode1',
+						},
+						{
+							name: 'values',
+							displayName: 'Values',
+							type: 'fixedCollection',
+							default: {},
+							options: [
+								{
+									name: 'number',
+									displayName: 'Number',
+									values: [
+										{
+											name: 'string1',
+											displayName: 'string1',
+											type: 'string',
+											displayOptions: {
+												show: {
+													'/mode': [{ _cnd: { includes: 'de2' } }],
+												},
+											},
+											default: 'default string1',
+										},
+										{
+											name: 'number1',
+											displayName: 'number1',
+											type: 'number',
+											default: 0,
+										},
+									],
+								},
+							],
+						},
+					],
+					nodeValues: {
+						values: {
+							number: {
+								string1: 'own string1',
+							},
+						},
+					},
+				},
+				output: {
+					noneDisplayedFalse: {
+						defaultsFalse: {},
+						defaultsTrue: {
+							mode: 'mode1',
+							values: {
+								number: {
+									number1: 0,
+								},
+							},
+						},
+					},
+					noneDisplayedTrue: {
+						defaultsFalse: {
+							values: {
+								number: {
+									string1: 'own string1',
+								},
+							},
+						},
+						defaultsTrue: {
+							mode: 'mode1',
+							values: {
+								number: {
+									string1: 'own string1',
+									number1: 0,
+								},
+							},
+						},
+					},
+				},
+			},
+			// Remember it is correct that default strings get returned here even when returnDefaults
+			// is set to false because if they would not, there would be no way to know which value
+			// got added and which one not.
+			{
+				description:
+					'complex type "collection" with "multipleValues: false" and with displayOptions "show" (match) on option which references root-value. One value set.',
+				input: {
+					nodePropertiesArray: [
+						{
+							name: 'mode',
+							displayName: 'mode',
+							type: 'string',
+							default: 'mode1',
+						},
+						{
+							name: 'values',
+							displayName: 'Values',
+							type: 'collection',
+							default: {},
+							options: [
+								{
+									name: 'string1',
+									displayName: 'string1',
+									type: 'string',
+									displayOptions: {
+										show: {
+											'/mode': [{ _cnd: { eq: 'mode1' } }],
+										},
+									},
+									default: 'default string1',
+								},
+								{
+									name: 'number1',
+									displayName: 'number1',
+									type: 'number',
+									default: 0,
+								},
+							],
+						},
+					],
+					nodeValues: {
+						values: {
+							string1: 'own string1',
+						},
+					},
+				},
+				output: {
+					noneDisplayedFalse: {
+						defaultsFalse: {
+							values: {
+								string1: 'own string1',
+							},
+						},
+						defaultsTrue: {
+							mode: 'mode1',
+							values: {
+								string1: 'own string1',
+							},
+						},
+					},
+					noneDisplayedTrue: {
+						defaultsFalse: {
+							values: {
+								string1: 'own string1',
+							},
+						},
+						defaultsTrue: {
+							mode: 'mode1',
+							values: {
+								string1: 'own string1',
+							},
+						},
+					},
+				},
+			},
+			// Remember it is correct that default strings get returned here even when returnDefaults
+			// is set to false because if they would not, there would be no way to know which value
+			// got added and which one not.
+			{
+				description:
+					'complex type "collection" with "multipleValues: false" and with displayOptions "show" (no-match) on option which references root-value. One value set.',
+				input: {
+					nodePropertiesArray: [
+						{
+							name: 'mode',
+							displayName: 'mode',
+							type: 'string',
+							default: 'mode1',
+						},
+						{
+							name: 'values',
+							displayName: 'Values',
+							type: 'collection',
+							default: {},
+							options: [
+								{
+									name: 'string1',
+									displayName: 'string1',
+									type: 'string',
+									displayOptions: {
+										show: {
+											'/mode': [{ _cnd: { eq: 'mode2' } }],
+										},
+									},
+									default: 'default string1',
+								},
+								{
+									name: 'number1',
+									displayName: 'number1',
+									type: 'number',
+									default: 0,
+								},
+							],
+						},
+					],
+					nodeValues: {
+						values: {
+							string1: 'own string1',
+						},
+					},
+				},
+				output: {
+					noneDisplayedFalse: {
+						defaultsFalse: {
+							// TODO: Write some code which cleans up data like that
+							values: {},
+						},
+						defaultsTrue: {
+							mode: 'mode1',
+							values: {},
+						},
+					},
+					noneDisplayedTrue: {
+						defaultsFalse: {
+							values: {
+								string1: 'own string1',
+							},
+						},
+						defaultsTrue: {
+							mode: 'mode1',
+							values: {
+								string1: 'own string1',
+							},
+						},
+					},
+				},
+			},
+			// Remember it is correct that default strings get returned here even when returnDefaults
+			// is set to false because if they would not, there would be no way to know which value
+			// got added and which one not.
+			{
+				description:
+					'complex type "collection" with "multipleValues: true" and with displayOptions "show" (match) on option which references root-value. One value set.',
+				input: {
+					nodePropertiesArray: [
+						{
+							name: 'mode',
+							displayName: 'mode',
+							type: 'string',
+							default: 'mode1',
+						},
+						{
+							name: 'values',
+							displayName: 'Values',
+							type: 'collection',
+							typeOptions: {
+								multipleValues: true,
+							},
+							default: {},
+							options: [
+								{
+									name: 'string1',
+									displayName: 'string1',
+									type: 'string',
+									displayOptions: {
+										show: {
+											'/mode': [{ _cnd: { eq: 'mode1' } }],
+										},
+									},
+									default: 'default string1',
+								},
+								{
+									name: 'number1',
+									displayName: 'number1',
+									type: 'number',
+									default: 0,
+								},
+							],
+						},
+					],
+					nodeValues: {
+						values: [
+							{
+								string1: 'own string1',
+							},
+						],
+					},
+				},
+				output: {
+					noneDisplayedFalse: {
+						defaultsFalse: {
+							values: [
+								{
+									string1: 'own string1',
+								},
+							],
+						},
+						defaultsTrue: {
+							mode: 'mode1',
+							values: [
+								{
+									string1: 'own string1',
+								},
+							],
+						},
+					},
+					noneDisplayedTrue: {
+						defaultsFalse: {
+							values: [
+								{
+									string1: 'own string1',
+								},
+							],
+						},
+						defaultsTrue: {
+							mode: 'mode1',
+							values: [
+								{
+									string1: 'own string1',
+								},
+							],
+						},
+					},
+				},
+			},
+
+			// Remember it is correct that default strings get returned here even when returnDefaults
+			// is set to false because if they would not, there would be no way to know which value
+			// got added and which one not.
+			{
+				description:
+					'complex type "collection" with "multipleValues: true" and with displayOptions "show" (no-match) on option which references root-value. One value set.',
+				input: {
+					nodePropertiesArray: [
+						{
+							name: 'mode',
+							displayName: 'mode',
+							type: 'string',
+							default: 'mode1',
+						},
+						{
+							name: 'values',
+							displayName: 'Values',
+							type: 'collection',
+							typeOptions: {
+								multipleValues: true,
+							},
+							default: {},
+							options: [
+								{
+									name: 'string1',
+									displayName: 'string1',
+									type: 'string',
+									displayOptions: {
+										show: {
+											'/mode': [{ _cnd: { eq: 'mode2' } }],
+										},
+									},
+									default: 'default string1',
+								},
+								{
+									name: 'number1',
+									displayName: 'number1',
+									type: 'number',
+									default: 0,
+								},
+							],
+						},
+					],
+					nodeValues: {
+						values: [
+							{
+								string1: 'own string1',
+								number1: 0,
+							},
+						],
+					},
+				},
+				output: {
+					noneDisplayedFalse: {
+						defaultsFalse: {
+							values: [
+								{
+									string1: 'own string1',
+									number1: 0,
+								},
+							],
+						},
+						defaultsTrue: {
+							mode: 'mode1',
+							values: [
+								{
+									string1: 'own string1',
+									number1: 0,
+								},
+							],
+						},
+					},
+					noneDisplayedTrue: {
+						defaultsFalse: {
+							values: [
+								{
+									string1: 'own string1',
+									number1: 0,
+								},
+							],
+						},
+						defaultsTrue: {
+							mode: 'mode1',
+							values: [
+								{
+									string1: 'own string1',
+									number1: 0,
+								},
+							],
+						},
+					},
+				},
+			},
+			{
+				description:
+					'complex type "fixedCollection" with "multipleValues: false" and with displayOptions "show" (no-match) on option. One value set also the not displayed one.',
+				input: {
+					nodePropertiesArray: [
+						{
+							name: 'values',
+							displayName: 'Values',
+							type: 'fixedCollection',
+							default: {},
+							options: [
+								{
+									name: 'number',
+									displayName: 'Number',
+									values: [
+										{
+											name: 'mode',
+											displayName: 'mode',
+											type: 'string',
+											default: 'mode1',
+										},
+										{
+											displayName: 'string1',
+											name: 'string1',
+											type: 'string',
+											displayOptions: {
+												show: {
+													mode: [{ _cnd: { eq: 'mode1' } }],
+												},
+											},
+											default: 'default string1',
+										},
+										{
+											displayName: 'number1',
+											name: 'number1',
+											type: 'number',
+											default: 0,
+										},
+									],
+								},
+							],
+						},
+					],
+					nodeValues: {
+						values: {
+							number: {
+								mode: 'mode2',
+								string1: 'default string1',
+								number1: 1,
+							},
+						},
+					},
+				},
+				output: {
+					noneDisplayedFalse: {
+						defaultsFalse: {
+							values: {
+								number: {
+									mode: 'mode2',
+									number1: 1,
+								},
+							},
+						},
+						defaultsTrue: {
+							values: {
+								number: {
+									mode: 'mode2',
+									number1: 1,
+								},
+							},
+						},
+					},
+					noneDisplayedTrue: {
+						defaultsFalse: {
+							values: {
+								number: {
+									mode: 'mode2',
+									number1: 1,
+								},
+							},
+						},
+						defaultsTrue: {
+							values: {
+								number: {
+									mode: 'mode2',
+									string1: 'default string1',
+									number1: 1,
+								},
+							},
+						},
+					},
+				},
+			},
+
+			{
+				description:
+					'two identically named properties of which only one gets displayed with different options. No value set at all.',
+				input: {
+					nodePropertiesArray: [
+						{
+							displayName: 'mainOption',
+							name: 'mainOption',
+							type: 'options',
+							options: [
+								{
+									name: 'option1',
+									value: 'option1',
+								},
+								{
+									name: 'option2',
+									value: 'option2',
+								},
+							],
+							default: 'option1',
+						},
+						{
+							displayName: 'subOption',
+							name: 'subOption',
+							type: 'options',
+							displayOptions: {
+								show: {
+									mainOption: [{ _cnd: { endsWith: '1' } }],
+								},
+							},
+							options: [
+								{
+									name: 'option1a',
+									value: 'option1a',
+								},
+								{
+									name: 'option1b',
+									value: 'option1b',
+								},
+							],
+							default: 'option1a',
+						},
+						{
+							displayName: 'subOption',
+							name: 'subOption',
+							type: 'options',
+							displayOptions: {
+								show: {
+									mainOption: [{ _cnd: { endsWith: '2' } }],
+								},
+							},
+							options: [
+								{
+									name: 'option2a',
+									value: 'option2a',
+								},
+								{
+									name: 'option2b',
+									value: 'option2b',
+								},
+							],
+							default: 'option2a',
+						},
+					],
+					nodeValues: {},
+				},
+				output: {
+					noneDisplayedFalse: {
+						defaultsFalse: {},
+						defaultsTrue: {
+							mainOption: 'option1',
+							subOption: 'option1a',
+						},
+					},
+					noneDisplayedTrue: {
+						defaultsFalse: {},
+						defaultsTrue: {
+							mainOption: 'option1',
+							subOption: 'option1a',
+						},
+					},
+				},
+			},
+			{
+				description:
+					'One property which is dependency on two identically named properties of which only one gets displayed with different options. No value set at all.',
+				input: {
+					nodePropertiesArray: [
+						{
+							displayName: 'mainOption',
+							name: 'mainOption',
+							type: 'options',
+							options: [
+								{
+									name: 'option1',
+									value: 'option1',
+								},
+								{
+									name: 'option2',
+									value: 'option2',
+								},
+							],
+							default: 'option1',
+						},
+						{
+							displayName: 'subOption',
+							name: 'subOption',
+							type: 'options',
+							displayOptions: {
+								show: {
+									mainOption: [{ _cnd: { eq: 'option1' } }],
+								},
+							},
+							options: [
+								{
+									name: 'option1a',
+									value: 'option1a',
+								},
+								{
+									name: 'option1b',
+									value: 'option1b',
+								},
+							],
+							default: 'option1a',
+						},
+						{
+							displayName: 'subOption',
+							name: 'subOption',
+							type: 'options',
+							displayOptions: {
+								show: {
+									mainOption: [{ _cnd: { eq: 'option2' } }],
+								},
+							},
+							options: [
+								{
+									name: 'option2a',
+									value: 'option2a',
+								},
+								{
+									name: 'option2b',
+									value: 'option2b',
+								},
+							],
+							default: 'option2a',
+						},
+						{
+							displayName: 'dependentParameter',
+							name: 'dependentParameter',
+							type: 'string',
+							default: 'value1',
+							required: true,
+							displayOptions: {
+								show: {
+									mainOption: [{ _cnd: { eq: 'option1' } }],
+									subOption: [{ _cnd: { includes: '1a' } }],
+								},
+							},
+						},
+						{
+							displayName: 'dependentParameter',
+							name: 'dependentParameter',
+							type: 'string',
+							default: 'value2',
+							required: true,
+							displayOptions: {
+								show: {
+									mainOption: [{ _cnd: { eq: 'option2' } }],
+									subOption: [{ _cnd: { includes: '2a' } }],
+								},
+							},
+						},
+					],
+					nodeValues: {},
+				},
+				output: {
+					noneDisplayedFalse: {
+						defaultsFalse: {},
+						defaultsTrue: {
+							mainOption: 'option1',
+							subOption: 'option1a',
+							dependentParameter: 'value1',
+						},
+					},
+					noneDisplayedTrue: {
+						defaultsFalse: {},
+						defaultsTrue: {
+							mainOption: 'option1',
+							subOption: 'option1a',
+							dependentParameter: 'value1',
+						},
+					},
+				},
+			},
+			{
+				description:
+					'One property which is dependency on two identically named properties of which only one gets displayed with different options. No value set at all. Order reversed',
+				input: {
+					nodePropertiesArray: [
+						{
+							displayName: 'dependentParameter',
+							name: 'dependentParameter',
+							type: 'string',
+							default: 'value2',
+							required: true,
+							displayOptions: {
+								show: {
+									mainOption: [{ _cnd: { eq: 'option2' } }],
+									subOption: [{ _cnd: { includes: '2a' } }],
+								},
+							},
+						},
+						{
+							displayName: 'subOption',
+							name: 'subOption',
+							type: 'options',
+							displayOptions: {
+								show: {
+									mainOption: [{ _cnd: { eq: 'option2' } }],
+								},
+							},
+							options: [
+								{
+									name: 'option2a',
+									value: 'option2a',
+								},
+								{
+									name: 'option2b',
+									value: 'option2b',
+								},
+							],
+							default: 'option2a',
+						},
+						{
+							displayName: 'subOption',
+							name: 'subOption',
+							type: 'options',
+							displayOptions: {
+								show: {
+									mainOption: [{ _cnd: { eq: 'option1' } }],
+								},
+							},
+							options: [
+								{
+									name: 'option1a',
+									value: 'option1a',
+								},
+								{
+									name: 'option1b',
+									value: 'option1b',
+								},
+							],
+							default: 'option1a',
+						},
+						{
+							displayName: 'dependentParameter',
+							name: 'dependentParameter',
+							type: 'string',
+							default: 'value1',
+							required: true,
+							displayOptions: {
+								show: {
+									mainOption: [{ _cnd: { eq: 'option1' } }],
+									subOption: [{ _cnd: { eq: 'option1a' } }],
+								},
+							},
+						},
+						{
+							displayName: 'mainOption',
+							name: 'mainOption',
+							type: 'options',
+							options: [
+								{
+									name: 'option1',
+									value: 'option1',
+								},
+								{
+									name: 'option2',
+									value: 'option2',
+								},
+							],
+							default: 'option1',
+						},
+					],
+					nodeValues: {},
+				},
+				output: {
+					noneDisplayedFalse: {
+						defaultsFalse: {},
+						defaultsTrue: {
+							mainOption: 'option1',
+							subOption: 'option1a',
+							dependentParameter: 'value1',
+						},
+					},
+					noneDisplayedTrue: {
+						defaultsFalse: {},
+						defaultsTrue: {
+							mainOption: 'option1',
+							subOption: 'option1a',
+							dependentParameter: 'value1',
+						},
+					},
+				},
+			},
+			{
+				description:
+					'One property which is dependency on two identically named properties of which only one gets displayed with different options. No value set at all.',
+				input: {
+					nodePropertiesArray: [
+						{
+							displayName: 'mainOption',
+							name: 'mainOption',
+							type: 'options',
+							options: [
+								{
+									name: 'option1',
+									value: 'option1',
+								},
+								{
+									name: 'option2',
+									value: 'option2',
+								},
+							],
+							default: 'option1',
+						},
+						{
+							displayName: 'subOption',
+							name: 'subOption',
+							type: 'options',
+							displayOptions: {
+								show: {
+									mainOption: [{ _cnd: { eq: 'option1' } }],
+								},
+							},
+							options: [
+								{
+									name: 'option1a',
+									value: 'option1a',
+								},
+								{
+									name: 'option1b',
+									value: 'option1b',
+								},
+							],
+							default: 'option1a',
+						},
+						{
+							displayName: 'subOption',
+							name: 'subOption',
+							type: 'options',
+							displayOptions: {
+								show: {
+									mainOption: [{ _cnd: { eq: 'option2' } }],
+								},
+							},
+							options: [
+								{
+									name: 'option2a',
+									value: 'option2a',
+								},
+								{
+									name: 'option2b',
+									value: 'option2b',
+								},
+							],
+							default: 'option2a',
+						},
+						{
+							displayName: 'dependentParameter',
+							name: 'dependentParameter',
+							type: 'string',
+							default: 'value1',
+							required: true,
+							displayOptions: {
+								show: {
+									mainOption: [{ _cnd: { eq: 'option1' } }],
+									subOption: [{ _cnd: { eq: 'option1a' } }],
+								},
+							},
+						},
+						{
+							displayName: 'dependentParameter',
+							name: 'dependentParameter',
+							type: 'string',
+							default: 'value2',
+							required: true,
+							displayOptions: {
+								show: {
+									mainOption: [{ _cnd: { eq: 'option2' } }],
+									subOption: [{ _cnd: { eq: 'option2a' } }],
+								},
+							},
+						},
+					],
+					nodeValues: {
+						mainOption: 'option2',
+					},
+				},
+				output: {
+					noneDisplayedFalse: {
+						defaultsFalse: {
+							mainOption: 'option2',
+						},
+						defaultsTrue: {
+							mainOption: 'option2',
+							subOption: 'option2a',
+							dependentParameter: 'value2',
+						},
+					},
+					noneDisplayedTrue: {
+						defaultsFalse: {
+							mainOption: 'option2',
+						},
+						defaultsTrue: {
+							mainOption: 'option2',
+							subOption: 'option2a',
+							dependentParameter: 'value2',
+						},
+					},
+				},
+			},
+			{
+				description:
+					'complex type "fixedCollection" with "multipleValues: true". Which contains parameters which get displayed on a parameter with a default expression with relative parameter references.',
+				input: {
+					nodePropertiesArray: [
+						{
+							displayName: 'Values1',
+							name: 'values1',
+							type: 'fixedCollection',
+							typeOptions: {
+								multipleValues: true,
+							},
+							description: 'The value to set.',
+							default: {},
+							options: [
+								{
+									displayName: 'Options1',
+									name: 'options1',
+									values: [
+										{
+											displayName: 'Key',
+											name: 'key',
+											type: 'string',
+											default: '',
+										},
+										{
+											displayName: 'Type',
+											name: 'type',
+											type: 'hidden',
+											default: '={{$parameter["&key"].split("|")[1]}}',
+										},
+										{
+											displayName: 'Title Value',
+											name: 'titleValue',
+											displayOptions: {
+												show: {
+													type: [{ _cnd: { eq: 'title' } }],
+												},
+											},
+											type: 'string',
+											default: 'defaultTitle',
+										},
+										{
+											displayName: 'Title Number',
+											name: 'numberValue',
+											displayOptions: {
+												show: {
+													type: [{ _cnd: { eq: 'number' } }],
+												},
+											},
+											type: 'number',
+											default: 1,
+										},
+									],
+								},
+							],
+						},
+					],
+					nodeValues: {
+						values1: {
+							options1: [
+								{
+									key: 'asdf|title',
+									titleValue: 'different',
+								},
+							],
+						},
+					},
+				},
+				output: {
+					noneDisplayedFalse: {
+						defaultsFalse: {
+							values1: {
+								options1: [
+									{
+										key: 'asdf|title',
+										titleValue: 'different',
+									},
+								],
+							},
+						},
+						defaultsTrue: {
+							values1: {
+								options1: [
+									{
+										key: 'asdf|title',
+										type: '={{$parameter["&key"].split("|")[1]}}',
+										// This is not great that it displays this theoretically hidden parameter
+										// but because we can not resolve the values for now
+										numberValue: 1,
+										titleValue: 'different',
+									},
+								],
+							},
+						},
+					},
+					noneDisplayedTrue: {
+						defaultsFalse: {
+							values1: {
+								options1: [
+									{
+										key: 'asdf|title',
+										titleValue: 'different',
+									},
+								],
+							},
+						},
+						defaultsTrue: {
+							values1: {
+								options1: [
+									{
+										key: 'asdf|title',
+										type: '={{$parameter["&key"].split("|")[1]}}',
+										titleValue: 'different',
+										numberValue: 1,
+									},
+								],
+							},
+						},
+					},
+				},
+			},
+		];
+
+		for (const testData of tests) {
+			test(testData.description, () => {
+				// returnDefaults: false | returnNoneDisplayed: false
+				let result = getNodeParameters(
+					testData.input.nodePropertiesArray,
+					testData.input.nodeValues,
+					false,
+					false,
+					null,
+				);
+				expect(result).toEqual(testData.output.noneDisplayedFalse.defaultsFalse);
+
+				// returnDefaults: true | returnNoneDisplayed: false
+				result = getNodeParameters(
+					testData.input.nodePropertiesArray,
+					testData.input.nodeValues,
+					true,
+					false,
+					null,
+				);
+				expect(result).toEqual(testData.output.noneDisplayedFalse.defaultsTrue);
+
+				// returnDefaults: false | returnNoneDisplayed: true
+				result = getNodeParameters(
+					testData.input.nodePropertiesArray,
+					testData.input.nodeValues,
+					false,
+					true,
+					null,
+				);
+				expect(result).toEqual(testData.output.noneDisplayedTrue.defaultsFalse);
+
+				// returnDefaults: true | returnNoneDisplayed: true
+				result = getNodeParameters(
+					testData.input.nodePropertiesArray,
+					testData.input.nodeValues,
+					true,
+					true,
+					null,
+				);
+				expect(result).toEqual(testData.output.noneDisplayedTrue.defaultsTrue);
+			});
+		}
+	});
+});
diff --git a/packages/workflow/test/NodeHelpers.test.ts b/packages/workflow/test/NodeHelpers.test.ts
index 0814bf40f047d..a35dd9cd2e71e 100644
--- a/packages/workflow/test/NodeHelpers.test.ts
+++ b/packages/workflow/test/NodeHelpers.test.ts
@@ -2,12 +2,12 @@ import type { INodeParameters, INodeProperties } from '@/Interfaces';
 import { getNodeParameters } from '@/NodeHelpers';
 
 describe('NodeHelpers', () => {
-	describe('getParameterValue', () => {
+	describe('getNodeParameters', () => {
 		const tests: Array<{
 			description: string;
 			input: {
 				nodePropertiesArray: INodeProperties[];
-				nodeValues: INodeParameters;
+				nodeValues: INodeParameters | null;
 			};
 			output: {
 				noneDisplayedFalse: {
@@ -3336,6 +3336,61 @@ describe('NodeHelpers', () => {
 					},
 				},
 			},
+			{
+				description: 'nodeValues is null (for example when resolving expression fails)',
+				input: {
+					nodePropertiesArray: [
+						{
+							displayName: 'Custom Properties',
+							name: 'customPropertiesUi',
+							placeholder: 'Add Custom Property',
+							type: 'fixedCollection',
+							typeOptions: {
+								multipleValues: true,
+							},
+							default: {},
+							options: [
+								{
+									name: 'customPropertiesValues',
+									displayName: 'Custom Property',
+									values: [
+										{
+											displayName: 'Property Name or ID',
+											name: 'property',
+											type: 'options',
+											typeOptions: {
+												loadOptionsMethod: 'getDealCustomProperties',
+											},
+											default: '',
+											description:
+												'Name of the property. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+										},
+										{
+											displayName: 'Value',
+											name: 'value',
+											type: 'string',
+											default: '',
+											required: true,
+											description: 'Value of the property',
+										},
+									],
+								},
+							],
+						},
+					],
+					nodeValues: null,
+				},
+				output: {
+					noneDisplayedFalse: {
+						defaultsFalse: {},
+						defaultsTrue: {},
+					},
+					noneDisplayedTrue: {
+						defaultsFalse: {},
+						defaultsTrue: {},
+					},
+				},
+			},
 		];
 
 		for (const testData of tests) {
diff --git a/packages/workflow/test/NodeTypes.ts b/packages/workflow/test/NodeTypes.ts
new file mode 100644
index 0000000000000..3adbe32109d32
--- /dev/null
+++ b/packages/workflow/test/NodeTypes.ts
@@ -0,0 +1,673 @@
+import {
+	NodeHelpers,
+	type INodeType,
+	type INodeTypeData,
+	type INodeTypes,
+	type IVersionedNodeType,
+	type LoadedClass,
+} from '@/index';
+
+const stickyNode: LoadedClass<INodeType> = {
+	type: {
+		description: {
+			displayName: 'Sticky Note',
+			name: 'n8n-nodes-base.stickyNote',
+			icon: 'fa:sticky-note',
+			group: ['input'],
+			version: 1,
+			description: 'Make your workflow easier to understand',
+			defaults: { name: 'Sticky Note', color: '#FFD233' },
+			inputs: [],
+			outputs: [],
+			properties: [
+				{
+					displayName: 'Content',
+					name: 'content',
+					type: 'string',
+					required: true,
+					default:
+						"## I'm a note \n**Double click** to edit me. [Guide](https://docs.n8n.io/workflows/sticky-notes/)",
+				},
+				{ displayName: 'Height', name: 'height', type: 'number', required: true, default: 160 },
+				{ displayName: 'Width', name: 'width', type: 'number', required: true, default: 240 },
+				{ displayName: 'Color', name: 'color', type: 'number', required: true, default: 1 },
+			],
+		},
+	},
+	sourcePath: '',
+};
+
+const googleSheetsNode: LoadedClass<IVersionedNodeType> = {
+	sourcePath: '',
+	type: {
+		nodeVersions: {
+			'1': {
+				methods: {
+					loadOptions: {},
+					credentialTest: {},
+				},
+				description: {
+					displayName: 'Google Sheets ',
+					name: 'googleSheets',
+					icon: 'file:googleSheets.svg',
+					group: ['input', 'output'],
+					defaultVersion: 4.2,
+					subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+					description: 'Read, update and write data to Google Sheets',
+					version: [1, 2],
+					defaults: {
+						name: 'Google Sheets',
+					},
+					inputs: ['main'],
+					outputs: ['main'],
+					credentials: [
+						{
+							name: 'googleApi',
+							required: true,
+							displayOptions: {
+								show: {
+									authentication: ['serviceAccount'],
+								},
+							},
+							testedBy: 'googleApiCredentialTest',
+						},
+						{
+							name: 'googleSheetsOAuth2Api',
+							required: true,
+							displayOptions: {
+								show: {
+									authentication: ['oAuth2'],
+								},
+							},
+						},
+					],
+					properties: [
+						{
+							displayName:
+								'<strong>New node version available:</strong> get the latest version with added features from the nodes panel.',
+							name: 'oldVersionNotice',
+							type: 'notice',
+							default: '',
+						},
+						{
+							displayName: 'Authentication',
+							name: 'authentication',
+							type: 'options',
+							options: [
+								{
+									name: 'Service Account',
+									value: 'serviceAccount',
+								},
+								{
+									name: 'OAuth2',
+									value: 'oAuth2',
+								},
+							],
+							default: 'serviceAccount',
+							displayOptions: {
+								show: {
+									'@version': [1],
+								},
+							},
+						},
+						{
+							displayName: 'Authentication',
+							name: 'authentication',
+							type: 'options',
+							options: [
+								{
+									name: 'OAuth2 (recommended)',
+									value: 'oAuth2',
+								},
+								{
+									name: 'Service Account',
+									value: 'serviceAccount',
+								},
+							],
+							default: 'oAuth2',
+							displayOptions: {
+								show: {
+									'@version': [2],
+								},
+							},
+						},
+						{
+							displayName: 'Resource',
+							name: 'resource',
+							type: 'options',
+							noDataExpression: true,
+							options: [
+								{
+									name: 'Spreadsheet',
+									value: 'spreadsheet',
+								},
+								{
+									name: 'Sheet',
+									value: 'sheet',
+								},
+							],
+							default: 'sheet',
+						},
+						{
+							displayName: 'Operation',
+							name: 'operation',
+							type: 'options',
+							noDataExpression: true,
+							displayOptions: {
+								show: {
+									resource: ['sheet'],
+								},
+							},
+							options: [
+								{
+									name: 'Append',
+									value: 'append',
+									description: 'Append data to a sheet',
+									action: 'Append data to a sheet',
+								},
+								{
+									name: 'Clear',
+									value: 'clear',
+									description: 'Clear data from a sheet',
+									action: 'Clear a sheet',
+								},
+								{
+									name: 'Create',
+									value: 'create',
+									description: 'Create a new sheet',
+									action: 'Create a sheet',
+								},
+								{
+									name: 'Create or Update',
+									value: 'upsert',
+									description:
+										'Create a new record, or update the current one if it already exists (upsert)',
+									action: 'Create or update a sheet',
+								},
+								{
+									name: 'Delete',
+									value: 'delete',
+									description: 'Delete columns and rows from a sheet',
+									action: 'Delete a sheet',
+								},
+								{
+									name: 'Lookup',
+									value: 'lookup',
+									description: 'Look up a specific column value and return the matching row',
+									action: 'Look up a column value in a sheet',
+								},
+								{
+									name: 'Read',
+									value: 'read',
+									description: 'Read data from a sheet',
+									action: 'Read a sheet',
+								},
+								{
+									name: 'Remove',
+									value: 'remove',
+									description: 'Remove a sheet',
+									action: 'Remove a sheet',
+								},
+								{
+									name: 'Update',
+									value: 'update',
+									description: 'Update rows in a sheet',
+									action: 'Update a sheet',
+								},
+							],
+							default: 'read',
+						},
+						{
+							displayName: 'Spreadsheet ID',
+							name: 'sheetId',
+							type: 'string',
+							displayOptions: {
+								show: {
+									resource: ['sheet'],
+								},
+							},
+							default: '',
+							required: true,
+							description:
+								'The ID of the Google Spreadsheet. Found as part of the sheet URL https://docs.google.com/spreadsheets/d/{ID}/.',
+						},
+						{
+							displayName: 'Range',
+							name: 'range',
+							type: 'string',
+							displayOptions: {
+								show: {
+									resource: ['sheet'],
+								},
+								hide: {
+									operation: ['create', 'delete', 'remove'],
+								},
+							},
+							default: 'A:F',
+							required: true,
+							description:
+								'The table range to read from or to append data to. See the Google <a href="https://developers.google.com/sheets/api/guides/values#writing">documentation</a> for the details. If it contains multiple sheets it can also be added like this: "MySheet!A:F"',
+						},
+					],
+				},
+			},
+			'4': {
+				description: {
+					subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+					version: [3, 4, 4.1, 4.2],
+					credentials: [
+						{
+							displayOptions: {
+								show: {
+									authentication: ['serviceAccount'],
+								},
+							},
+							name: 'googleApi',
+							required: true,
+							testedBy: 'googleApiCredentialTest',
+						},
+						{
+							displayOptions: {
+								show: {
+									authentication: ['oAuth2'],
+								},
+							},
+							name: 'googleSheetsOAuth2Api',
+							required: true,
+						},
+					],
+					defaults: {
+						name: 'Google Sheets',
+					},
+					defaultVersion: 4.2,
+					description: 'Read, update and write data to Google Sheets',
+					displayName: 'Google Sheets',
+					group: ['input', 'output'],
+					icon: 'file:googleSheets.svg',
+					inputs: ['main'],
+					name: 'googleSheets',
+					outputs: ['main'],
+					properties: [
+						{
+							default: 'oAuth2',
+							displayName: 'Authentication',
+							name: 'authentication',
+							options: [
+								{
+									name: 'Service Account',
+									value: 'serviceAccount',
+								},
+								{
+									name: 'OAuth2 (recommended)',
+									value: 'oAuth2',
+								},
+							],
+							type: 'options',
+						},
+						{
+							default: 'sheet',
+							displayName: 'Resource',
+							name: 'resource',
+							noDataExpression: true,
+							options: [
+								{
+									name: 'Document',
+									value: 'spreadsheet',
+								},
+								{
+									name: 'Sheet Within Document',
+									value: 'sheet',
+								},
+							],
+							type: 'options',
+						},
+						{
+							default: 'read',
+							displayName: 'Operation',
+							displayOptions: {
+								show: {
+									resource: ['sheet'],
+								},
+							},
+							name: 'operation',
+							noDataExpression: true,
+							options: [
+								{
+									action: 'Append or update row in sheet',
+									description: 'Append a new row or update an existing one (upsert)',
+									name: 'Append or Update Row',
+									value: 'appendOrUpdate',
+								},
+								{
+									action: 'Append row in sheet',
+									description: 'Create a new row in a sheet',
+									name: 'Append Row',
+									value: 'append',
+								},
+								{
+									action: 'Clear sheet',
+									description: 'Delete all the contents or a part of a sheet',
+									name: 'Clear',
+									value: 'clear',
+								},
+								{
+									action: 'Create sheet',
+									description: 'Create a new sheet',
+									name: 'Create',
+									value: 'create',
+								},
+								{
+									action: 'Delete sheet',
+									description: 'Permanently delete a sheet',
+									name: 'Delete',
+									value: 'remove',
+								},
+								{
+									action: 'Delete rows or columns from sheet',
+									description: 'Delete columns or rows from a sheet',
+									name: 'Delete Rows or Columns',
+									value: 'delete',
+								},
+								{
+									action: 'Get row(s) in sheet',
+									description: 'Retrieve one or more rows from a sheet',
+									name: 'Get Row(s)',
+									value: 'read',
+								},
+								{
+									action: 'Update row in sheet',
+									description: 'Update an existing row in a sheet',
+									name: 'Update Row',
+									value: 'update',
+								},
+							],
+							type: 'options',
+						},
+						{
+							default: {
+								mode: 'list',
+								value: '',
+							},
+							displayName: 'Document',
+							displayOptions: {
+								show: {
+									resource: ['sheet'],
+								},
+							},
+							modes: [
+								{
+									displayName: 'From List',
+									name: 'list',
+									type: 'list',
+									typeOptions: {
+										searchable: true,
+										searchListMethod: 'spreadSheetsSearch',
+									},
+								},
+								{
+									displayName: 'By URL',
+									extractValue: {
+										regex:
+											'https:\\/\\/(?:drive|docs)\\.google\\.com(?:\\/.*|)\\/d\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)',
+										type: 'regex',
+									},
+									name: 'url',
+									type: 'string',
+									validation: [
+										{
+											properties: {
+												errorMessage: 'Not a valid Google Drive File URL',
+												regex:
+													'https:\\/\\/(?:drive|docs)\\.google\\.com(?:\\/.*|)\\/d\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)',
+											},
+											type: 'regex',
+										},
+									],
+								},
+								{
+									displayName: 'By ID',
+									name: 'id',
+									type: 'string',
+									url: '=https://docs.google.com/spreadsheets/d/{{$value}}/edit',
+									validation: [
+										{
+											properties: {
+												errorMessage: 'Not a valid Google Drive File ID',
+												regex: '[a-zA-Z0-9\\-_]{2,}',
+											},
+											type: 'regex',
+										},
+									],
+								},
+							],
+							name: 'documentId',
+							required: true,
+							type: 'resourceLocator',
+						},
+						{
+							default: {
+								mode: 'list',
+								value: '',
+							},
+							displayName: 'Sheet',
+							displayOptions: {
+								show: {
+									operation: [
+										'append',
+										'appendOrUpdate',
+										'clear',
+										'delete',
+										'read',
+										'remove',
+										'update',
+									],
+									resource: ['sheet'],
+								},
+							},
+							modes: [
+								{
+									displayName: 'From List',
+									name: 'list',
+									type: 'list',
+									typeOptions: {
+										searchable: false,
+										searchListMethod: 'sheetsSearch',
+									},
+								},
+								{
+									displayName: 'By URL',
+									extractValue: {
+										regex:
+											'https:\\/\\/docs\\.google\\.com/spreadsheets\\/d\\/[0-9a-zA-Z\\-_]+\\/edit\\#gid=([0-9]+)',
+										type: 'regex',
+									},
+									name: 'url',
+									type: 'string',
+									validation: [
+										{
+											properties: {
+												errorMessage: 'Not a valid Sheet URL',
+												regex:
+													'https:\\/\\/docs\\.google\\.com/spreadsheets\\/d\\/[0-9a-zA-Z\\-_]+\\/edit\\#gid=([0-9]+)',
+											},
+											type: 'regex',
+										},
+									],
+								},
+								{
+									displayName: 'By ID',
+									name: 'id',
+									type: 'string',
+									validation: [
+										{
+											properties: {
+												errorMessage: 'Not a valid Sheet ID',
+												regex: '((gid=)?[0-9]{1,})',
+											},
+											type: 'regex',
+										},
+									],
+								},
+							],
+							name: 'sheetName',
+							required: true,
+							type: 'resourceLocator',
+							typeOptions: {
+								loadOptionsDependsOn: ['documentId.value'],
+							},
+						},
+					],
+				},
+			},
+		},
+		currentVersion: 4.2,
+		description: {
+			displayName: 'Google Sheets',
+			name: 'googleSheets',
+			icon: 'file:googleSheets.svg',
+			group: ['input', 'output'],
+			defaultVersion: 4.2,
+			subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+			description: 'Read, update and write data to Google Sheets',
+		},
+		getNodeType(version: number | undefined) {
+			return this.nodeVersions[Math.floor(version ?? this.currentVersion)];
+		},
+	},
+};
+
+const setNode: LoadedClass<INodeType> = {
+	sourcePath: '',
+	type: {
+		description: {
+			displayName: 'Set',
+			name: 'set',
+			group: ['input'],
+			version: 1,
+			description: 'Sets a value',
+			defaults: {
+				name: 'Set',
+				color: '#0000FF',
+			},
+			inputs: ['main'],
+			outputs: ['main'],
+			properties: [
+				{
+					displayName: 'Value1',
+					name: 'value1',
+					type: 'string',
+					default: 'default-value1',
+				},
+				{
+					displayName: 'Value2',
+					name: 'value2',
+					type: 'string',
+					default: 'default-value2',
+				},
+			],
+		},
+	},
+};
+
+export class NodeTypes implements INodeTypes {
+	nodeTypes: INodeTypeData = {
+		'n8n-nodes-base.stickyNote': stickyNode,
+		'n8n-nodes-base.set': setNode,
+		'test.googleSheets': googleSheetsNode,
+		'test.set': setNode,
+		'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: ['main'],
+					outputs: ['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.',
+										},
+									],
+								},
+							],
+						},
+					],
+				},
+			},
+		},
+		'test.switch': {
+			sourcePath: '',
+			type: {
+				description: {
+					displayName: 'Set',
+					name: 'set',
+					group: ['input'],
+					version: 1,
+					description: 'Switches',
+					defaults: {
+						name: 'Switch',
+						color: '#0000FF',
+					},
+					inputs: ['main'],
+					outputs: ['main', 'main', 'main', 'main'],
+					outputNames: ['0', '1', '2', '3'],
+					properties: [
+						{
+							displayName: 'Value1',
+							name: 'value1',
+							type: 'string',
+							default: 'default-value1',
+						},
+						{
+							displayName: 'Value2',
+							name: 'value2',
+							type: 'string',
+							default: 'default-value2',
+						},
+					],
+				},
+			},
+		},
+	};
+
+	getByName(nodeType: string): INodeType | IVersionedNodeType {
+		return this.nodeTypes[nodeType]?.type;
+	}
+
+	getByNameAndVersion(nodeType: string, version?: number): INodeType {
+		if (this.nodeTypes[nodeType]?.type) {
+			return NodeHelpers.getVersionedNodeType(this.nodeTypes[nodeType]?.type, version);
+		}
+	}
+}
diff --git a/packages/workflow/test/RoutingNode.test.ts b/packages/workflow/test/RoutingNode.test.ts
index ab9c55df10152..9496e84d6a4f9 100644
--- a/packages/workflow/test/RoutingNode.test.ts
+++ b/packages/workflow/test/RoutingNode.test.ts
@@ -5,7 +5,6 @@ import type {
 	DeclarativeRestApiSettings,
 	IRunExecutionData,
 	INodeProperties,
-	IDataObject,
 	IExecuteSingleFunctions,
 	IHttpRequestOptions,
 	IN8nHttpFullResponse,
@@ -34,7 +33,7 @@ const preSendFunction1 = async function (
 	this: IExecuteSingleFunctions,
 	requestOptions: IHttpRequestOptions,
 ): Promise<IHttpRequestOptions> {
-	requestOptions.headers = (requestOptions.headers || {}) as IDataObject;
+	requestOptions.headers = requestOptions.headers || {};
 	requestOptions.headers.addedIn = 'preSendFunction1';
 	return requestOptions;
 };
@@ -344,6 +343,7 @@ describe('RoutingNode', () => {
 								type: 'string',
 								routing: {
 									send: {
+										// eslint-disable-next-line n8n-local-rules/no-interpolation-in-regular-string
 										property: '={{ `value${5+1}A` }}',
 										type: 'query',
 										value: '={{$value.toUpperCase()}}',
@@ -357,6 +357,7 @@ describe('RoutingNode', () => {
 								type: 'string',
 								routing: {
 									send: {
+										// eslint-disable-next-line n8n-local-rules/no-interpolation-in-regular-string
 										property: '={{ `value${6+1}B` }}',
 										type: 'body',
 										value: "={{$value.split(',')}}",
@@ -705,7 +706,7 @@ describe('RoutingNode', () => {
 					mode,
 				);
 
-				const result = await routingNode.getRequestOptionsFromParameters(
+				const result = routingNode.getRequestOptionsFromParameters(
 					executeSingleFunctions,
 					testData.input.nodeTypeProperties,
 					itemIndex,
diff --git a/packages/workflow/test/TelemetryHelpers.test.ts b/packages/workflow/test/TelemetryHelpers.test.ts
index 763d528d98186..11f741e79a230 100644
--- a/packages/workflow/test/TelemetryHelpers.test.ts
+++ b/packages/workflow/test/TelemetryHelpers.test.ts
@@ -1,5 +1,14 @@
 import { v5 as uuidv5, v3 as uuidv3, v4 as uuidv4, v1 as uuidv1 } from 'uuid';
-import { ANONYMIZATION_CHARACTER as CHAR, getDomainBase, getDomainPath } from '@/TelemetryHelpers';
+import {
+	ANONYMIZATION_CHARACTER as CHAR,
+	generateNodesGraph,
+	getDomainBase,
+	getDomainPath,
+} from '@/TelemetryHelpers';
+import { ApplicationError, STICKY_NODE_TYPE, type IWorkflowBase } from '@/index';
+import { nodeTypes } from './ExpressionExtensions/Helpers';
+import { mock } from 'jest-mock-extended';
+import * as nodeHelpers from '@/NodeHelpers';
 
 describe('getDomainBase should return protocol plus domain', () => {
 	test('in valid URLs', () => {
@@ -67,6 +76,707 @@ describe('getDomainPath should return pathname, excluding query string', () => {
 	});
 });
 
+describe('generateNodesGraph', () => {
+	test('should return node graph when node type is unknown', () => {
+		const workflow: IWorkflowBase = {
+			createdAt: new Date('2024-01-05T13:49:14.244Z'),
+			updatedAt: new Date('2024-01-05T15:44:31.000Z'),
+			id: 'NfV4GV9aQTifSLc2',
+			name: 'My workflow 26',
+			active: false,
+			nodes: [
+				{
+					parameters: {},
+					id: 'fa7d5628-5a47-4c8f-98ef-fb3532e5a9f5',
+					name: 'When clicking "Execute Workflow"',
+					type: 'n8n-nodes-base.manualTrigger',
+					typeVersion: 1,
+					position: [420, 420],
+				},
+				{
+					parameters: {
+						documentId: { __rl: true, mode: 'list', value: '' },
+						sheetName: { __rl: true, mode: 'list', value: '' },
+					},
+					id: '266128b9-e5db-4c26-9555-185d48946afb',
+					name: 'Google Sheets',
+					type: 'test.unknown',
+					typeVersion: 4.2,
+					position: [640, 420],
+				},
+			],
+			connections: {
+				'When clicking "Execute Workflow"': {
+					main: [[{ node: 'Google Sheets', type: 'main', index: 0 }]],
+				},
+			},
+			settings: { executionOrder: 'v1' },
+			pinData: {},
+			versionId: '70b92d94-0e9a-4b41-9976-a654df420af5',
+		};
+		expect(generateNodesGraph(workflow, nodeTypes)).toEqual({
+			nodeGraph: {
+				node_types: ['n8n-nodes-base.manualTrigger', 'test.unknown'],
+				node_connections: [{ start: '0', end: '1' }],
+				nodes: {
+					'0': {
+						id: 'fa7d5628-5a47-4c8f-98ef-fb3532e5a9f5',
+						type: 'n8n-nodes-base.manualTrigger',
+						version: 1,
+						position: [420, 420],
+					},
+					'1': {
+						id: '266128b9-e5db-4c26-9555-185d48946afb',
+						type: 'test.unknown',
+						version: 4.2,
+						position: [640, 420],
+					},
+				},
+				notes: {},
+				is_pinned: false,
+			},
+			nameIndices: { 'When clicking "Execute Workflow"': '0', 'Google Sheets': '1' },
+			webhookNodeNames: [],
+		});
+	});
+
+	test('should return node graph when workflow is empty', () => {
+		const workflow: IWorkflowBase = {
+			createdAt: new Date('2024-01-05T13:49:14.244Z'),
+			updatedAt: new Date('2024-01-05T15:44:31.000Z'),
+			id: 'NfV4GV9aQTifSLc2',
+			name: 'My workflow 26',
+			active: false,
+			nodes: [],
+			connections: {},
+			settings: { executionOrder: 'v1' },
+			pinData: {},
+			versionId: '70b92d94-0e9a-4b41-9976-a654df420af5',
+		};
+		expect(generateNodesGraph(workflow, nodeTypes)).toEqual({
+			nodeGraph: {
+				node_types: [],
+				node_connections: [],
+				nodes: {},
+				notes: {},
+				is_pinned: false,
+			},
+			nameIndices: {},
+			webhookNodeNames: [],
+		});
+	});
+
+	test('should return node graph when workflow keys are not set', () => {
+		const workflow: Partial<IWorkflowBase> = {};
+		expect(generateNodesGraph(workflow, nodeTypes)).toEqual({
+			nodeGraph: {
+				node_types: [],
+				node_connections: [],
+				nodes: {},
+				notes: {},
+				is_pinned: false,
+			},
+			nameIndices: {},
+			webhookNodeNames: [],
+		});
+	});
+
+	test('should return node graph when node has multiple operation fields with different display options', () => {
+		const workflow: IWorkflowBase = {
+			createdAt: new Date('2024-01-05T13:49:14.244Z'),
+			updatedAt: new Date('2024-01-05T15:44:31.000Z'),
+			id: 'NfV4GV9aQTifSLc2',
+			name: 'My workflow 26',
+			active: false,
+			nodes: [
+				{
+					parameters: {},
+					id: 'fa7d5628-5a47-4c8f-98ef-fb3532e5a9f5',
+					name: 'When clicking "Execute Workflow"',
+					type: 'n8n-nodes-base.manualTrigger',
+					typeVersion: 1,
+					position: [420, 420],
+				},
+				{
+					parameters: {
+						documentId: { __rl: true, mode: 'list', value: '' },
+						sheetName: { __rl: true, mode: 'list', value: '' },
+					},
+					id: '266128b9-e5db-4c26-9555-185d48946afb',
+					name: 'Google Sheets',
+					type: 'test.googleSheets',
+					typeVersion: 4.2,
+					position: [640, 420],
+				},
+			],
+			connections: {
+				'When clicking "Execute Workflow"': {
+					main: [[{ node: 'Google Sheets', type: 'main', index: 0 }]],
+				},
+			},
+			settings: { executionOrder: 'v1' },
+			pinData: {},
+			versionId: '70b92d94-0e9a-4b41-9976-a654df420af5',
+		};
+		expect(generateNodesGraph(workflow, nodeTypes)).toEqual({
+			nodeGraph: {
+				node_types: ['n8n-nodes-base.manualTrigger', 'test.googleSheets'],
+				node_connections: [{ start: '0', end: '1' }],
+				nodes: {
+					'0': {
+						id: 'fa7d5628-5a47-4c8f-98ef-fb3532e5a9f5',
+						type: 'n8n-nodes-base.manualTrigger',
+						version: 1,
+						position: [420, 420],
+					},
+					'1': {
+						id: '266128b9-e5db-4c26-9555-185d48946afb',
+						type: 'test.googleSheets',
+						version: 4.2,
+						position: [640, 420],
+						operation: 'read',
+						resource: 'sheet',
+					},
+				},
+				notes: {},
+				is_pinned: false,
+			},
+			nameIndices: { 'When clicking "Execute Workflow"': '0', 'Google Sheets': '1' },
+			webhookNodeNames: [],
+		});
+	});
+
+	test('should return node graph with stickies of default size', () => {
+		const workflow: IWorkflowBase = {
+			createdAt: new Date('2024-01-05T13:49:14.244Z'),
+			updatedAt: new Date('2024-01-05T15:44:31.000Z'),
+			id: 'NfV4GV9aQTifSLc2',
+			name: 'My workflow 26',
+			active: false,
+			nodes: [
+				{
+					parameters: {},
+					id: 'fa7d5628-5a47-4c8f-98ef-fb3532e5a9f5',
+					name: 'When clicking "Execute Workflow"',
+					type: 'n8n-nodes-base.manualTrigger',
+					typeVersion: 1,
+					position: [420, 420],
+				},
+				{
+					parameters: {
+						documentId: { __rl: true, mode: 'list', value: '' },
+						sheetName: { __rl: true, mode: 'list', value: '' },
+					},
+					id: '266128b9-e5db-4c26-9555-185d48946afb',
+					name: 'Google Sheets',
+					type: 'test.googleSheets',
+					typeVersion: 4.2,
+					position: [640, 420],
+				},
+				{
+					parameters: {
+						content:
+							"test\n\n## I'm a note \n**Double click** to edit me. [Guide](https://docs.n8n.io/workflows/sticky-notes/)",
+					},
+					id: '03e85c3e-4303-4f93-8d62-e05d457e8f70',
+					name: 'Sticky Note',
+					type: 'n8n-nodes-base.stickyNote',
+					typeVersion: 1,
+					position: [240, 140],
+				},
+			],
+			connections: {
+				'When clicking "Execute Workflow"': {
+					main: [[{ node: 'Google Sheets', type: 'main', index: 0 }]],
+				},
+			},
+			settings: { executionOrder: 'v1' },
+			pinData: {},
+			versionId: '70b92d94-0e9a-4b41-9976-a654df420af5',
+		};
+		expect(generateNodesGraph(workflow, nodeTypes)).toEqual({
+			nodeGraph: {
+				node_types: ['n8n-nodes-base.manualTrigger', 'test.googleSheets'],
+				node_connections: [{ start: '0', end: '1' }],
+				nodes: {
+					'0': {
+						id: 'fa7d5628-5a47-4c8f-98ef-fb3532e5a9f5',
+						type: 'n8n-nodes-base.manualTrigger',
+						version: 1,
+						position: [420, 420],
+					},
+					'1': {
+						id: '266128b9-e5db-4c26-9555-185d48946afb',
+						type: 'test.googleSheets',
+						version: 4.2,
+						position: [640, 420],
+						operation: 'read',
+						resource: 'sheet',
+					},
+				},
+				notes: { '0': { overlapping: false, position: [240, 140], height: 160, width: 240 } },
+				is_pinned: false,
+			},
+			nameIndices: { 'When clicking "Execute Workflow"': '0', 'Google Sheets': '1' },
+			webhookNodeNames: [],
+		});
+	});
+
+	test('should return node graph with stickies indicating overlap', () => {
+		const workflow: IWorkflowBase = {
+			createdAt: new Date('2024-01-05T13:49:14.244Z'),
+			updatedAt: new Date('2024-01-05T15:44:31.000Z'),
+			id: 'NfV4GV9aQTifSLc2',
+			name: 'My workflow 26',
+			active: false,
+			nodes: [
+				{
+					parameters: {},
+					id: 'fa7d5628-5a47-4c8f-98ef-fb3532e5a9f5',
+					name: 'When clicking "Execute Workflow"',
+					type: 'n8n-nodes-base.manualTrigger',
+					typeVersion: 1,
+					position: [420, 420],
+				},
+				{
+					parameters: {
+						documentId: { __rl: true, mode: 'list', value: '' },
+						sheetName: { __rl: true, mode: 'list', value: '' },
+					},
+					id: '266128b9-e5db-4c26-9555-185d48946afb',
+					name: 'Google Sheets',
+					type: 'test.googleSheets',
+					typeVersion: 4.2,
+					position: [640, 420],
+				},
+				{
+					parameters: {
+						content:
+							"test\n\n## I'm a note \n**Double click** to edit me. [Guide](https://docs.n8n.io/workflows/sticky-notes/)",
+						height: 488,
+						width: 645,
+					},
+					id: '03e85c3e-4303-4f93-8d62-e05d457e8f70',
+					name: 'Sticky Note',
+					type: 'n8n-nodes-base.stickyNote',
+					typeVersion: 1,
+					position: [240, 140],
+				},
+			],
+			connections: {
+				'When clicking "Execute Workflow"': {
+					main: [[{ node: 'Google Sheets', type: 'main', index: 0 }]],
+				},
+			},
+			settings: { executionOrder: 'v1' },
+			pinData: {},
+			versionId: '70b92d94-0e9a-4b41-9976-a654df420af5',
+		};
+		expect(generateNodesGraph(workflow, nodeTypes)).toEqual({
+			nodeGraph: {
+				node_types: ['n8n-nodes-base.manualTrigger', 'test.googleSheets'],
+				node_connections: [{ start: '0', end: '1' }],
+				nodes: {
+					'0': {
+						id: 'fa7d5628-5a47-4c8f-98ef-fb3532e5a9f5',
+						type: 'n8n-nodes-base.manualTrigger',
+						version: 1,
+						position: [420, 420],
+					},
+					'1': {
+						id: '266128b9-e5db-4c26-9555-185d48946afb',
+						type: 'test.googleSheets',
+						version: 4.2,
+						position: [640, 420],
+						operation: 'read',
+						resource: 'sheet',
+					},
+				},
+				notes: { '0': { overlapping: true, position: [240, 140], height: 488, width: 645 } },
+				is_pinned: false,
+			},
+			nameIndices: { 'When clicking "Execute Workflow"': '0', 'Google Sheets': '1' },
+			webhookNodeNames: [],
+		});
+	});
+
+	test('should return node graph indicating pinned data', () => {
+		const workflow: Partial<IWorkflowBase> = {
+			nodes: [
+				{
+					parameters: {},
+					id: 'e59d3ad9-3448-4899-9f47-d2922c8727ce',
+					name: 'When clicking "Execute Workflow"',
+					type: 'n8n-nodes-base.manualTrigger',
+					typeVersion: 1,
+					position: [460, 460],
+				},
+			],
+			connections: {},
+			pinData: {
+				'When clicking "Execute Workflow"': [],
+			},
+		};
+		expect(generateNodesGraph(workflow, nodeTypes)).toEqual({
+			nameIndices: {
+				'When clicking "Execute Workflow"': '0',
+			},
+			nodeGraph: {
+				is_pinned: true,
+				node_connections: [],
+				node_types: ['n8n-nodes-base.manualTrigger'],
+				nodes: {
+					'0': {
+						id: 'e59d3ad9-3448-4899-9f47-d2922c8727ce',
+						position: [460, 460],
+						type: 'n8n-nodes-base.manualTrigger',
+						version: 1,
+					},
+				},
+				notes: {},
+			},
+			webhookNodeNames: [],
+		});
+	});
+
+	test('should return graph with webhook node', () => {
+		const workflow: Partial<IWorkflowBase> = {
+			nodes: [
+				{
+					parameters: {
+						path: 'bf4c0699-cff8-4440-8964-8e97fda8b4f8',
+						options: {},
+					},
+					id: '5e49e129-2c59-4650-95ea-14d4b94db1f3',
+					name: 'Webhook',
+					type: 'n8n-nodes-base.webhook',
+					typeVersion: 1.1,
+					position: [520, 380],
+					webhookId: 'bf4c0699-cff8-4440-8964-8e97fda8b4f8',
+				},
+			],
+			connections: {},
+			pinData: {},
+		};
+		expect(generateNodesGraph(workflow, nodeTypes)).toEqual({
+			nodeGraph: {
+				node_types: ['n8n-nodes-base.webhook'],
+				node_connections: [],
+				nodes: {
+					'0': {
+						id: '5e49e129-2c59-4650-95ea-14d4b94db1f3',
+						type: 'n8n-nodes-base.webhook',
+						version: 1.1,
+						position: [520, 380],
+					},
+				},
+				notes: {},
+				is_pinned: false,
+			},
+			nameIndices: { Webhook: '0' },
+			webhookNodeNames: ['Webhook'],
+		});
+	});
+
+	test('should return graph with http v4 node with generic auth', () => {
+		const workflow: Partial<IWorkflowBase> = {
+			nodes: [
+				{
+					parameters: {
+						url: 'google.com/path/test',
+						authentication: 'genericCredentialType',
+						genericAuthType: 'httpBasicAuth',
+						options: {},
+					},
+					id: '04d6e44f-09c1-454d-9225-60aeed7f022c',
+					name: 'HTTP Request V4 with generic auth',
+					type: 'n8n-nodes-base.httpRequest',
+					typeVersion: 4.1,
+					position: [780, 120],
+					credentials: {
+						httpBasicAuth: {
+							id: 'yuuJAO2Ang5B64wd',
+							name: 'Unnamed credential',
+						},
+					},
+				},
+			],
+			connections: {},
+			pinData: {},
+		};
+		expect(generateNodesGraph(workflow, nodeTypes)).toEqual({
+			nodeGraph: {
+				node_types: ['n8n-nodes-base.httpRequest'],
+				node_connections: [],
+				nodes: {
+					'0': {
+						id: '04d6e44f-09c1-454d-9225-60aeed7f022c',
+						type: 'n8n-nodes-base.httpRequest',
+						version: 4.1,
+						position: [780, 120],
+						credential_type: 'httpBasicAuth',
+						credential_set: true,
+						domain_base: 'google.com',
+						domain_path: '/path/test',
+					},
+				},
+				notes: {},
+				is_pinned: false,
+			},
+			nameIndices: { 'HTTP Request V4 with generic auth': '0' },
+			webhookNodeNames: [],
+		});
+	});
+
+	test('should return graph with HTTP V4 with predefined cred', () => {
+		const workflow: Partial<IWorkflowBase> = {
+			nodes: [
+				{
+					parameters: {
+						url: 'google.com/path/test',
+						authentication: 'predefinedCredentialType',
+						nodeCredentialType: 'activeCampaignApi',
+						options: {},
+					},
+					id: 'dcc4a9e1-c2c5-4d7e-aec0-2a23adabbb77',
+					name: 'HTTP Request V4 with predefined cred',
+					type: 'n8n-nodes-base.httpRequest',
+					typeVersion: 4.1,
+					position: [320, 220],
+					credentials: {
+						httpBasicAuth: {
+							id: 'yuuJAO2Ang5B64wd',
+							name: 'Unnamed credential',
+						},
+						activeCampaignApi: {
+							id: 'SFCbnfgRBuSzRu6N',
+							name: 'ActiveCampaign account',
+						},
+					},
+				},
+			],
+			connections: {},
+			pinData: {},
+		};
+		expect(generateNodesGraph(workflow, nodeTypes)).toEqual({
+			nodeGraph: {
+				node_types: ['n8n-nodes-base.httpRequest'],
+				node_connections: [],
+				nodes: {
+					'0': {
+						id: 'dcc4a9e1-c2c5-4d7e-aec0-2a23adabbb77',
+						type: 'n8n-nodes-base.httpRequest',
+						version: 4.1,
+						position: [320, 220],
+						credential_type: 'activeCampaignApi',
+						credential_set: true,
+						domain_base: 'google.com',
+						domain_path: '/path/test',
+					},
+				},
+				notes: {},
+				is_pinned: false,
+			},
+			nameIndices: { 'HTTP Request V4 with predefined cred': '0' },
+			webhookNodeNames: [],
+		});
+	});
+
+	test('should return graph with http v1 node', () => {
+		const workflow: Partial<IWorkflowBase> = {
+			nodes: [
+				{
+					parameters: {
+						url: 'https://google.com',
+						options: {},
+					},
+					id: 'b468b603-3e59-4515-b555-90cfebd64d47',
+					name: 'HTTP Request V1',
+					type: 'n8n-nodes-base.httpRequest',
+					typeVersion: 1,
+					position: [320, 460],
+				},
+			],
+			connections: {},
+			pinData: {},
+		};
+		expect(generateNodesGraph(workflow, nodeTypes)).toEqual({
+			nodeGraph: {
+				node_types: ['n8n-nodes-base.httpRequest'],
+				node_connections: [],
+				nodes: {
+					'0': {
+						id: 'b468b603-3e59-4515-b555-90cfebd64d47',
+						type: 'n8n-nodes-base.httpRequest',
+						version: 1,
+						position: [320, 460],
+						domain: 'google.com',
+					},
+				},
+				notes: {},
+				is_pinned: false,
+			},
+			nameIndices: { 'HTTP Request V1': '0' },
+			webhookNodeNames: [],
+		});
+	});
+
+	test('should return graph with http v4 node with no parameters and no credentials', () => {
+		const workflow: Partial<IWorkflowBase> = {
+			nodes: [
+				{
+					parameters: {
+						options: {},
+					},
+					id: 'd002e66f-deba-455c-9f8b-65239db453c3',
+					name: 'HTTP Request v4 with defaults',
+					type: 'n8n-nodes-base.httpRequest',
+					typeVersion: 4.1,
+					position: [600, 240],
+				},
+			],
+			connections: {},
+			pinData: {},
+		};
+		expect(generateNodesGraph(workflow, nodeTypes)).toEqual({
+			nodeGraph: {
+				node_types: ['n8n-nodes-base.httpRequest'],
+				node_connections: [],
+				nodes: {
+					'0': {
+						id: 'd002e66f-deba-455c-9f8b-65239db453c3',
+						type: 'n8n-nodes-base.httpRequest',
+						version: 4.1,
+						position: [600, 240],
+						credential_set: false,
+						domain_base: '',
+						domain_path: '',
+					},
+				},
+				notes: {},
+				is_pinned: false,
+			},
+			nameIndices: { 'HTTP Request v4 with defaults': '0' },
+			webhookNodeNames: [],
+		});
+	});
+
+	test('should support custom connections like in AI nodes', () => {
+		const workflow: Partial<IWorkflowBase> = {
+			nodes: [
+				{
+					parameters: {},
+					id: 'fe69383c-e418-4f98-9c0e-924deafa7f93',
+					name: 'When clicking "Test workflow"',
+					type: 'n8n-nodes-base.manualTrigger',
+					typeVersion: 1,
+					position: [540, 220],
+				},
+				{
+					parameters: {},
+					id: 'c5c374f1-6fad-46bb-8eea-ceec126b300a',
+					name: 'Chain',
+					type: '@n8n/n8n-nodes-langchain.chainLlm',
+					typeVersion: 1,
+					position: [760, 320],
+				},
+				{
+					parameters: {
+						options: {},
+					},
+					id: '198133b6-95dd-4f7e-90e5-e16c4cdbad12',
+					name: 'Model',
+					type: '@n8n/n8n-nodes-langchain.lmChatOpenAi',
+					typeVersion: 1,
+					position: [780, 500],
+				},
+			],
+			connections: {
+				'When clicking "Test workflow"': {
+					main: [
+						[
+							{
+								node: 'Chain',
+								type: 'main',
+								index: 0,
+							},
+						],
+					],
+				},
+				Model: {
+					ai_languageModel: [
+						[
+							{
+								node: 'Chain',
+								type: 'ai_languageModel',
+								index: 0,
+							},
+						],
+					],
+				},
+			},
+		};
+
+		expect(generateNodesGraph(workflow, nodeTypes)).toEqual({
+			nodeGraph: {
+				node_types: [
+					'n8n-nodes-base.manualTrigger',
+					'@n8n/n8n-nodes-langchain.chainLlm',
+					'@n8n/n8n-nodes-langchain.lmChatOpenAi',
+				],
+				node_connections: [
+					{
+						start: '0',
+						end: '1',
+					},
+					{
+						start: '2',
+						end: '1',
+					},
+				],
+				nodes: {
+					'0': {
+						id: 'fe69383c-e418-4f98-9c0e-924deafa7f93',
+						type: 'n8n-nodes-base.manualTrigger',
+						version: 1,
+						position: [540, 220],
+					},
+					'1': {
+						id: 'c5c374f1-6fad-46bb-8eea-ceec126b300a',
+						type: '@n8n/n8n-nodes-langchain.chainLlm',
+						version: 1,
+						position: [760, 320],
+					},
+					'2': {
+						id: '198133b6-95dd-4f7e-90e5-e16c4cdbad12',
+						type: '@n8n/n8n-nodes-langchain.lmChatOpenAi',
+						version: 1,
+						position: [780, 500],
+					},
+				},
+				notes: {},
+				is_pinned: false,
+			},
+			nameIndices: {
+				'When clicking "Test workflow"': '0',
+				Chain: '1',
+				Model: '2',
+			},
+			webhookNodeNames: [],
+		});
+	});
+
+	test('should not fail on error to resolve a node parameter for sticky node type', () => {
+		const workflow = mock<IWorkflowBase>({ nodes: [{ type: STICKY_NODE_TYPE }] });
+
+		jest.spyOn(nodeHelpers, 'getNodeParameters').mockImplementationOnce(() => {
+			throw new ApplicationError('Could not find property option');
+		});
+
+		expect(() => generateNodesGraph(workflow, nodeTypes)).not.toThrow();
+	});
+});
+
 function validUrls(idMaker: typeof alphanumericId | typeof email, char = CHAR) {
 	const firstId = idMaker();
 	const secondId = idMaker();
diff --git a/packages/workflow/test/TypeValidation.test.ts b/packages/workflow/test/TypeValidation.test.ts
new file mode 100644
index 0000000000000..16467f06de32c
--- /dev/null
+++ b/packages/workflow/test/TypeValidation.test.ts
@@ -0,0 +1,233 @@
+import { validateFieldType } from '@/TypeValidation';
+import { DateTime } from 'luxon';
+
+const VALID_ISO_DATES = [
+	'1994-11-05T08:15:30-05:00',
+	'1994-11-05T13:15:30Z',
+	'1997-07-16T19:20+01:00',
+	'1997-07-16T19:20:30+01:00',
+	'1997-07-16T19:20:30.45+01:00',
+	'2018-05-16',
+	'1972-06-30T23:59:40Z',
+	'2019-03-26T14:00:00.9Z',
+	'2019-03-26T14:00:00.4999Z',
+	'2023-05-17T10:52:32+0000',
+	'2023-05-17T10:52:32+0000',
+];
+
+const VALID_HTTP_DATES = [
+	'Wed, 21 Oct 2015 07:28:00 GMT',
+	'Wed, 01 Jun 2022 08:00:00 GMT',
+	'Tue, 15 Nov 1994 12:45:26 GMT',
+	'Wed, 1 Jun 2022 08:00:00 GMT',
+];
+
+const VALID_RFC_DATES = [
+	'Tue, 04 Jun 2013 07:40:03 -0400',
+	'Tue, 4 Jun 2013 02:24:39 +0530',
+	'Wed, 17 May 2023 10:52:32 +0000',
+];
+
+const VALID_SQL_DATES = ['2008-11-11', '2008-11-11 13:23:44'];
+
+const OTHER_VALID_DATES = [
+	'Wed, 17 May 2023 10:52:32',
+	'SMT, 17 May 2023 10:52:32',
+	'1-Feb-2024',
+	new Date(),
+	DateTime.now(),
+];
+
+const INVALID_DATES = [
+	'1994-11-05M08:15:30-05:00',
+	'18-05-2020',
+	'',
+	'1685084980', // We are not supporting timestamps
+	'1685085012135',
+	1685084980,
+	1685085012135,
+	true,
+	[],
+];
+
+describe('Type Validation', () => {
+	describe('Dates', () => {
+		test.each(VALID_ISO_DATES)('should validate and cast ISO date "%s"', (date) => {
+			const validationResult = validateFieldType('date', date, 'dateTime');
+			expect(validationResult.valid).toBe(true);
+			expect((validationResult.newValue as DateTime).isValid).toBe(true);
+		});
+
+		test.each(VALID_RFC_DATES)('should validate and cast RFC2822 date "%s"', (date) => {
+			const validationResult = validateFieldType('date', date, 'dateTime');
+			expect(validationResult.valid).toBe(true);
+			expect((validationResult.newValue as DateTime).isValid).toBe(true);
+		});
+
+		test.each(VALID_HTTP_DATES)('should validate and cast HTTP date "%s"', (date) => {
+			const validationResult = validateFieldType('date', date, 'dateTime');
+			expect(validationResult.valid).toBe(true);
+			expect((validationResult.newValue as DateTime).isValid).toBe(true);
+		});
+
+		test.each(VALID_SQL_DATES)('should validate and cast SQL date "%s"', (date) => {
+			const validationResult = validateFieldType('date', date, 'dateTime');
+			expect(validationResult.valid).toBe(true);
+			expect((validationResult.newValue as DateTime).isValid).toBe(true);
+		});
+
+		test.each(OTHER_VALID_DATES)('should validate and cast date "%s"', (date) => {
+			const validationResult = validateFieldType('date', date, 'dateTime');
+			expect(validationResult.valid).toBe(true);
+			expect((validationResult.newValue as DateTime).isValid).toBe(true);
+		});
+
+		test.each(INVALID_DATES)('should not validate invalid date "%s"', (date) => {
+			const validationResult = validateFieldType('date', date, 'dateTime');
+			expect(validationResult.valid).toBe(false);
+		});
+	});
+
+	it('should validate boolean values properly', () => {
+		expect(validateFieldType('boolean', 'true', 'boolean').newValue).toBe(true);
+		expect(validateFieldType('boolean', 'TRUE', 'boolean').newValue).toBe(true);
+		expect(validateFieldType('boolean', 1, 'boolean').newValue).toBe(true);
+		expect(validateFieldType('boolean', '1', 'boolean').newValue).toBe(true);
+		expect(validateFieldType('boolean', '01', 'boolean').newValue).toBe(true);
+		expect(validateFieldType('boolean', 'false', 'boolean').newValue).toBe(false);
+		expect(validateFieldType('boolean', 'FALSE', 'boolean').newValue).toBe(false);
+		expect(validateFieldType('boolean', '0', 'boolean').newValue).toBe(false);
+		expect(validateFieldType('boolean', '000', 'boolean').newValue).toBe(false);
+		expect(validateFieldType('boolean', '0000', 'boolean').newValue).toBe(false);
+		expect(validateFieldType('boolean', 0, 'boolean').newValue).toBe(false);
+	});
+
+	it('should not validate invalid boolean values', () => {
+		expect(validateFieldType('boolean', 'tru', 'boolean').valid).toBe(false);
+		expect(validateFieldType('boolean', 'fals', 'boolean').valid).toBe(false);
+		expect(validateFieldType('boolean', 1111, 'boolean').valid).toBe(false);
+		expect(validateFieldType('boolean', 2, 'boolean').valid).toBe(false);
+		expect(validateFieldType('boolean', -1, 'boolean').valid).toBe(false);
+		expect(validateFieldType('boolean', 'yes', 'boolean').valid).toBe(false);
+		expect(validateFieldType('boolean', 'no', 'boolean').valid).toBe(false);
+	});
+
+	it('should validate and cast numbers', () => {
+		expect(validateFieldType('number', '1', 'number').newValue).toBe(1);
+		expect(validateFieldType('number', '-1', 'number').newValue).toBe(-1);
+		expect(validateFieldType('number', '1.1', 'number').newValue).toBe(1.1);
+		expect(validateFieldType('number', '-1.1', 'number').newValue).toBe(-1.1);
+		expect(validateFieldType('number', 1, 'number').newValue).toBe(1);
+		expect(validateFieldType('number', 'A', 'number').valid).toBe(false);
+		expect(validateFieldType('number', '1,1', 'number').valid).toBe(false);
+		expect(validateFieldType('number', true, 'number').valid).toBe(true);
+		expect(validateFieldType('number', '1972-06-30T23:59:40Z', 'number').valid).toBe(false);
+		expect(validateFieldType('number', [1, 2], 'number').valid).toBe(false);
+	});
+
+	it('should validate and cast JSON properly', () => {
+		expect(validateFieldType('json', '{"a": 1}', 'object').newValue).toEqual({ a: 1 });
+		expect(
+			validateFieldType('json', '{"a": 1, "b": { "c": 10, "d": "test"}}', 'object').valid,
+		).toEqual(true);
+		expect(validateFieldType('json', { name: 'John' }, 'object').valid).toEqual(true);
+		expect(
+			validateFieldType(
+				'json',
+				{ name: 'John', address: { street: 'Via Roma', city: 'Milano' } },
+				'object',
+			).valid,
+		).toEqual(true);
+		// Invalid value:
+		expect(validateFieldType('json', ['one', 'two'], 'object').valid).toEqual(false);
+		expect(validateFieldType('json', ['one', 'two'], 'object').valid).toEqual(false);
+		expect(validateFieldType('json', '1', 'object').valid).toEqual(false);
+		expect(validateFieldType('json', '[1]', 'object').valid).toEqual(false);
+		expect(validateFieldType('json', '1.1', 'object').valid).toEqual(false);
+		expect(validateFieldType('json', 1.1, 'object').valid).toEqual(false);
+		expect(validateFieldType('json', '"a"', 'object').valid).toEqual(false);
+		expect(validateFieldType('json', '{a: 1}', 'object').valid).toEqual(false);
+		expect(validateFieldType('json', '["apples", "oranges"]', 'object').valid).toEqual(false);
+		expect(validateFieldType('json', [{ name: 'john' }, { name: 'bob' }], 'object').valid).toEqual(
+			false,
+		);
+		expect(
+			validateFieldType('json', '[ { name: "john" }, { name: "bob" } ]', 'object').valid,
+		).toEqual(false);
+	});
+
+	it('should validate and cast arrays properly', () => {
+		expect(validateFieldType('array', '["apples", "oranges"]', 'array').newValue).toEqual([
+			'apples',
+			'oranges',
+		]);
+		expect(validateFieldType('array', '[1]', 'array').newValue).toEqual([1]);
+		expect(validateFieldType('array', '[1, 2]', 'array').newValue).toEqual([1, 2]);
+		// Invalid values:
+		expect(validateFieldType('array', '"apples", "oranges"', 'array').valid).toEqual(false);
+		expect(validateFieldType('array', '1', 'array').valid).toEqual(false);
+		expect(validateFieldType('array', '1.1', 'array').valid).toEqual(false);
+		expect(validateFieldType('array', '1, 2', 'array').valid).toEqual(false);
+		expect(validateFieldType('array', '1. 2. 3', 'array').valid).toEqual(false);
+		expect(validateFieldType('array', '[1, 2, 3', 'array').valid).toEqual(false);
+		expect(validateFieldType('array', '1, 2, 3]', 'array').valid).toEqual(false);
+		expect(validateFieldType('array', '{1, 2, {3, 4}, 5}', 'array').valid).toEqual(false);
+		expect(validateFieldType('array', '1, 2, {3, 4}, 5', 'array').valid).toEqual(false);
+		expect(validateFieldType('array', { name: 'John' }, 'array').valid).toEqual(false);
+	});
+
+	it('should validate options properly', () => {
+		expect(
+			validateFieldType('options', 'oranges', 'options', {
+				valueOptions: [
+					{ name: 'apples', value: 'apples' },
+					{ name: 'oranges', value: 'oranges' },
+				],
+			}).valid,
+		).toEqual(true);
+		expect(
+			validateFieldType('options', 'something else', 'options', {
+				valueOptions: [
+					{ name: 'apples', value: 'apples' },
+					{ name: 'oranges', value: 'oranges' },
+				],
+			}).valid,
+		).toEqual(false);
+	});
+
+	it('should validate and cast time properly', () => {
+		expect(validateFieldType('time', '23:23', 'time').valid).toEqual(true);
+		expect(validateFieldType('time', '23:23:23', 'time').valid).toEqual(true);
+		expect(validateFieldType('time', '23:23:23+1000', 'time').valid).toEqual(true);
+		expect(validateFieldType('time', '23:23:23-1000', 'time').valid).toEqual(true);
+		expect(validateFieldType('time', '22:00:00+01:00', 'time').valid).toEqual(true);
+		expect(validateFieldType('time', '22:00:00-01:00', 'time').valid).toEqual(true);
+		expect(validateFieldType('time', '22:00:00+01', 'time').valid).toEqual(true);
+		expect(validateFieldType('time', '22:00:00-01', 'time').valid).toEqual(true);
+		expect(validateFieldType('time', '23:23:23:23', 'time').valid).toEqual(false);
+		expect(validateFieldType('time', '23', 'time').valid).toEqual(false);
+		expect(validateFieldType('time', 'foo', 'time').valid).toEqual(false);
+		expect(validateFieldType('time', '23:23:', 'time').valid).toEqual(false);
+		expect(validateFieldType('time', '23::23::23', 'time').valid).toEqual(false);
+	});
+
+	describe('options', () => {
+		describe('strict=true', () => {
+			it('should not convert/cast types', () => {
+				const options = { strict: true };
+				expect(validateFieldType('test', '42', 'number', options).valid).toBe(false);
+				expect(validateFieldType('test', 'true', 'boolean', options).valid).toBe(false);
+				expect(validateFieldType('test', [], 'object', options).valid).toBe(false);
+			});
+		});
+
+		describe('parseStrings=true', () => {
+			it('should parse strings from other types', () => {
+				const options = { parseStrings: true };
+				expect(validateFieldType('test', 42, 'string').newValue).toBe(42);
+				expect(validateFieldType('test', 42, 'string', options).newValue).toBe('42');
+				expect(validateFieldType('test', true, 'string', options).newValue).toBe('true');
+			});
+		});
+	});
+});
diff --git a/packages/workflow/test/Workflow.test.ts b/packages/workflow/test/Workflow.test.ts
index 98c151988be38..28bac2c13bb2a 100644
--- a/packages/workflow/test/Workflow.test.ts
+++ b/packages/workflow/test/Workflow.test.ts
@@ -20,7 +20,7 @@ interface StubNode {
 }
 
 describe('Workflow', () => {
-	describe('renameNodeInExpressions', () => {
+	describe('renameNodeInParameterValue for expressions', () => {
 		const tests = [
 			{
 				description: 'do nothing if there is no expression',
@@ -257,7 +257,7 @@ describe('Workflow', () => {
 
 		for (const testData of tests) {
 			test(testData.description, () => {
-				const result = workflow.renameNodeInExpressions(
+				const result = workflow.renameNodeInParameterValue(
 					testData.input.parameters,
 					testData.input.currentName,
 					testData.input.newName,
@@ -267,6 +267,58 @@ describe('Workflow', () => {
 		}
 	});
 
+	describe('renameNodeInParameterValue for node with renamable content', () => {
+		const tests = [
+			{
+				description: "should work with $('name')",
+				input: {
+					currentName: 'Old',
+					newName: 'New',
+					parameters: { jsCode: "$('Old').first();" },
+				},
+				output: { jsCode: "$('New').first();" },
+			},
+			{
+				description: "should work with $node['name'] and $node.name",
+				input: {
+					currentName: 'Old',
+					newName: 'New',
+					parameters: { jsCode: "$node['Old'].first(); $node.Old.first();" },
+				},
+				output: { jsCode: "$node['New'].first(); $node.New.first();" },
+			},
+			{
+				description: 'should work with $items()',
+				input: {
+					currentName: 'Old',
+					newName: 'New',
+					parameters: { jsCode: "$items('Old').first();" },
+				},
+				output: { jsCode: "$items('New').first();" },
+			},
+		];
+
+		const workflow = new Workflow({
+			nodes: [],
+			connections: {},
+			active: false,
+			nodeTypes: Helpers.NodeTypes(),
+		});
+
+		for (const t of tests) {
+			test(t.description, () => {
+				expect(
+					workflow.renameNodeInParameterValue(
+						t.input.parameters,
+						t.input.currentName,
+						t.input.newName,
+						{ hasRenamableContent: true },
+					),
+				).toEqual(t.output);
+			});
+		}
+	});
+
 	describe('renameNode', () => {
 		const tests = [
 			{
@@ -605,9 +657,9 @@ describe('Workflow', () => {
 					},
 				},
 			},
-			// This does just a basic test if "renameNodeInExpressions" gets used. More complex
+			// This does just a basic test if "renameNodeInParameterValue" gets used. More complex
 			// tests with different formats and levels are in the separate tests for the function
-			// "renameNodeInExpressions"
+			// "renameNodeInParameterValue"
 			{
 				description: 'change name also in expressions which use node-name (dot notation)',
 				input: {
@@ -699,7 +751,7 @@ describe('Workflow', () => {
 	});
 
 	describe('getParameterValue', () => {
-		const tests: {
+		const tests: Array<{
 			description: string;
 			input: {
 				[nodeName: string]: {
@@ -709,7 +761,7 @@ describe('Workflow', () => {
 				};
 			};
 			output: Record<string, unknown>;
-		}[] = [
+		}> = [
 			{
 				description: 'read simple not expression value',
 				input: {
@@ -1130,7 +1182,6 @@ describe('Workflow', () => {
 		];
 
 		const nodeTypes = Helpers.NodeTypes();
-		const timezone = 'America/New_York';
 
 		for (const testData of tests) {
 			test(testData.description, () => {
@@ -1244,7 +1295,7 @@ describe('Workflow', () => {
 				const itemIndex = 0;
 				const runIndex = 0;
 				const connectionInputData: INodeExecutionData[] =
-					runExecutionData.resultData.runData!['Node1']![0]!.data!.main[0]!;
+					runExecutionData.resultData.runData.Node1[0].data!.main[0]!;
 
 				for (const parameterName of Object.keys(testData.output)) {
 					const parameterValue = nodes.find((node) => node.name === activeNodeName)!.parameters[
@@ -1258,7 +1309,6 @@ describe('Workflow', () => {
 						activeNodeName,
 						connectionInputData,
 						'manual',
-						timezone,
 						{},
 					);
 					expect(result).toEqual(testData.output[parameterName]);
@@ -1399,7 +1449,7 @@ describe('Workflow', () => {
 			const itemIndex = 0;
 			const runIndex = 0;
 			const connectionInputData: INodeExecutionData[] =
-				runExecutionData.resultData.runData!['Node1']![0]!.data!.main[0]!;
+				runExecutionData.resultData.runData.Node1[0].data!.main[0]!;
 			const parameterName = 'values';
 
 			const parameterValue = nodes.find((node) => node.name === activeNodeName)!.parameters[
@@ -1413,7 +1463,6 @@ describe('Workflow', () => {
 				activeNodeName,
 				connectionInputData,
 				'manual',
-				timezone,
 				{},
 			);
 
diff --git a/packages/workflow/test/WorkflowDataProxy.test.ts b/packages/workflow/test/WorkflowDataProxy.test.ts
index f3f360ac774cc..98f0a3959c1db 100644
--- a/packages/workflow/test/WorkflowDataProxy.test.ts
+++ b/packages/workflow/test/WorkflowDataProxy.test.ts
@@ -1,327 +1,144 @@
-import { IConnections, IExecuteData, INode, IRunExecutionData } from '@/Interfaces';
+import type { IExecuteData, INode, IRun, IWorkflowBase } from '@/Interfaces';
 import { Workflow } from '@/Workflow';
 import { WorkflowDataProxy } from '@/WorkflowDataProxy';
+import { ExpressionError } from '@/errors/expression.error';
 import * as Helpers from './Helpers';
 
-describe('WorkflowDataProxy', () => {
-	describe('test data proxy', () => {
-		const nodes: INode[] = [
-			{
-				name: 'Start',
-				type: 'test.set',
-				parameters: {},
-				typeVersion: 1,
-				id: 'uuid-1',
-				position: [100, 200],
-			},
-			{
-				name: 'Function',
-				type: 'test.set',
-				parameters: {
-					functionCode:
-						'// Code here will run only once, no matter how many input items there are.\n// More info and help: https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.function/\nconst { DateTime, Duration, Interval } = require("luxon");\n\nconst data = [\n  {\n  "length": 105\n  },\n  {\n  "length": 160\n  },\n  {\n  "length": 121\n  },\n  {\n  "length": 275\n  },\n  {\n  "length": 950\n  },\n];\n\nreturn data.map(fact => ({json: fact}));',
-				},
-				typeVersion: 1,
-				id: 'uuid-2',
-				position: [280, 200],
-			},
-			{
-				name: 'Rename',
-				type: 'test.set',
-				parameters: {
-					value1: 'data',
-					value2: 'initialName',
-				},
-				typeVersion: 1,
-				id: 'uuid-3',
-				position: [460, 200],
-			},
-			{
-				name: 'End',
-				type: 'test.set',
-				parameters: {},
-				typeVersion: 1,
-				id: 'uuid-4',
-				position: [640, 200],
-			},
-		];
+const loadFixture = (fixture: string) => {
+	const workflow = Helpers.readJsonFileSync<IWorkflowBase>(
+		`test/fixtures/WorkflowDataProxy/${fixture}_workflow.json`,
+	);
+	const run = Helpers.readJsonFileSync<IRun>(`test/fixtures/WorkflowDataProxy/${fixture}_run.json`);
 
-		const connections: IConnections = {
-			Start: {
-				main: [
-					[
-						{
-							node: 'Function',
-							type: 'main',
-							index: 0,
-						},
-					],
-				],
-			},
-			Function: {
-				main: [
-					[
-						{
-							node: 'Rename',
-							type: 'main',
-							index: 0,
-						},
-					],
-				],
-			},
-			Rename: {
-				main: [
-					[
-						{
-							node: 'End',
-							type: 'main',
-							index: 0,
-						},
-					],
-				],
-			},
-		};
+	return { workflow, run };
+};
+
+const getProxyFromFixture = (workflow: IWorkflowBase, run: IRun | null, activeNode: string) => {
+	const taskData = run?.data.resultData.runData[activeNode]?.[0];
+	const lastNodeConnectionInputData = taskData?.data?.main[0];
+
+	let executeData: IExecuteData | undefined;
 
-		const runExecutionData: IRunExecutionData = {
-			resultData: {
-				runData: {
-					Start: [
-						{
-							startTime: 1,
-							executionTime: 1,
-							data: {
-								main: [
-									[
-										{
-											json: {},
-										},
-									],
-								],
-							},
-							source: [],
-						},
-					],
-					Function: [
-						{
-							startTime: 1,
-							executionTime: 1,
-							data: {
-								main: [
-									[
-										{
-											json: { initialName: 105 },
-											pairedItem: { item: 0 },
-										},
-										{
-											json: { initialName: 160 },
-											pairedItem: { item: 0 },
-										},
-										{
-											json: { initialName: 121 },
-											pairedItem: { item: 0 },
-										},
-										{
-											json: { initialName: 275 },
-											pairedItem: { item: 0 },
-										},
-										{
-											json: { initialName: 950 },
-											pairedItem: { item: 0 },
-										},
-									],
-								],
-							},
-							source: [
-								{
-									previousNode: 'Start',
-								},
-							],
-						},
-					],
-					Rename: [
-						{
-							startTime: 1,
-							executionTime: 1,
-							data: {
-								main: [
-									[
-										{
-											json: { data: 105 },
-											pairedItem: { item: 0 },
-										},
-										{
-											json: { data: 160 },
-											pairedItem: { item: 1 },
-										},
-										{
-											json: { data: 121 },
-											pairedItem: { item: 2 },
-										},
-										{
-											json: { data: 275 },
-											pairedItem: { item: 3 },
-										},
-										{
-											json: { data: 950 },
-											pairedItem: { item: 4 },
-										},
-									],
-								],
-							},
-							source: [
-								{
-									previousNode: 'Function',
-								},
-							],
-						},
-					],
-					End: [
-						{
-							startTime: 1,
-							executionTime: 1,
-							data: {
-								main: [
-									[
-										{
-											json: { data: 105 },
-											pairedItem: { item: 0 },
-										},
-										{
-											json: { data: 160 },
-											pairedItem: { item: 1 },
-										},
-										{
-											json: { data: 121 },
-											pairedItem: { item: 2 },
-										},
-										{
-											json: { data: 275 },
-											pairedItem: { item: 3 },
-										},
-										{
-											json: { data: 950 },
-											pairedItem: { item: 4 },
-										},
-									],
-								],
-							},
-							source: [
-								{
-									previousNode: 'Rename',
-								},
-							],
-						},
-					],
-				},
+	if (taskData) {
+		executeData = {
+			data: taskData.data!,
+			node: workflow.nodes.find((node) => node.name === activeNode) as INode,
+			source: {
+				main: taskData.source,
 			},
 		};
+	}
 
-		const nodeTypes = Helpers.NodeTypes();
-		const workflow = new Workflow({
+	const dataProxy = new WorkflowDataProxy(
+		new Workflow({
 			id: '123',
 			name: 'test workflow',
-			nodes,
-			connections,
+			nodes: workflow.nodes,
+			connections: workflow.connections,
 			active: false,
-			nodeTypes,
-		});
-		const nameLastNode = 'End';
-
-		const lastNodeConnectionInputData =
-			runExecutionData.resultData.runData[nameLastNode][0].data!.main[0];
+			nodeTypes: Helpers.NodeTypes(),
+		}),
+		run?.data ?? null,
+		0,
+		0,
+		activeNode,
+		lastNodeConnectionInputData ?? [],
+		{},
+		'manual',
+		{},
+		executeData,
+	);
 
-		const executeData: IExecuteData = {
-			data: runExecutionData.resultData.runData[nameLastNode][0].data!,
-			node: nodes.find((node) => node.name === nameLastNode) as INode,
-			source: {
-				main: runExecutionData.resultData.runData[nameLastNode][0].source!,
-			},
-		};
+	return dataProxy.getDataProxy();
+};
 
-		const dataProxy = new WorkflowDataProxy(
-			workflow,
-			runExecutionData,
-			0,
-			0,
-			nameLastNode,
-			lastNodeConnectionInputData || [],
-			{},
-			'manual',
-			'America/New_York',
-			{},
-			executeData,
-		);
-		const proxy = dataProxy.getDataProxy();
+describe('WorkflowDataProxy', () => {
+	describe('Base', () => {
+		const fixture = loadFixture('base');
+		const proxy = getProxyFromFixture(fixture.workflow, fixture.run, 'End');
 
-		test('test $("NodeName").all()', () => {
+		test('$("NodeName").all()', () => {
 			expect(proxy.$('Rename').all()[1].json.data).toEqual(160);
 		});
-		test('test $("NodeName").all() length', () => {
+		test('$("NodeName").all() length', () => {
 			expect(proxy.$('Rename').all().length).toEqual(5);
 		});
-		test('test $("NodeName").item', () => {
+		test('$("NodeName").item', () => {
 			expect(proxy.$('Rename').item).toEqual({ json: { data: 105 }, pairedItem: { item: 0 } });
 		});
-		test('test $("NodeNameEarlier").item', () => {
+		test('$("NodeNameEarlier").item', () => {
 			expect(proxy.$('Function').item).toEqual({
 				json: { initialName: 105 },
 				pairedItem: { item: 0 },
 			});
 		});
-		test('test $("NodeName").itemMatching(2)', () => {
+		test('$("NodeName").itemMatching(2)', () => {
 			expect(proxy.$('Rename').itemMatching(2).json.data).toEqual(121);
 		});
-		test('test $("NodeName").first()', () => {
+		test('$("NodeName").first()', () => {
 			expect(proxy.$('Rename').first().json.data).toEqual(105);
 		});
-		test('test $("NodeName").last()', () => {
+		test('$("NodeName").last()', () => {
 			expect(proxy.$('Rename').last().json.data).toEqual(950);
 		});
 
-		test('test $("NodeName").params', () => {
+		test('$("NodeName").params', () => {
 			expect(proxy.$('Rename').params).toEqual({ value1: 'data', value2: 'initialName' });
 		});
 
-		test('test $input.all()', () => {
+		test('$("NodeName") not in workflow should throw', () => {
+			expect(() => proxy.$('doNotExist')).toThrowError(ExpressionError);
+		});
+
+		test('$("NodeName").item on Node that has not executed', () => {
+			expect(() => proxy.$('Set').item).toThrowError(ExpressionError);
+		});
+
+		test('$("NodeName").isExecuted', () => {
+			expect(proxy.$('Function').isExecuted).toEqual(true);
+			expect(proxy.$('Set').isExecuted).toEqual(false);
+		});
+
+		test('$input.all()', () => {
 			expect(proxy.$input.all()[1].json.data).toEqual(160);
 		});
-		test('test $input.all() length', () => {
+		test('$input.all() length', () => {
 			expect(proxy.$input.all().length).toEqual(5);
 		});
-		test('test $input.first()', () => {
-			expect(proxy.$input.first().json.data).toEqual(105);
+		test('$input.first()', () => {
+			expect(proxy.$input.first()?.json?.data).toEqual(105);
 		});
-		test('test $input.last()', () => {
-			expect(proxy.$input.last().json.data).toEqual(950);
+		test('$input.last()', () => {
+			expect(proxy.$input.last()?.json?.data).toEqual(950);
 		});
-		test('test $input.item', () => {
-			expect(proxy.$input.item.json.data).toEqual(105);
+		test('$input.item', () => {
+			expect(proxy.$input.item?.json?.data).toEqual(105);
 		});
-		test('test $thisItem', () => {
+		test('$thisItem', () => {
 			expect(proxy.$thisItem.json.data).toEqual(105);
 		});
 
-		test('test $binary', () => {
+		test('$binary', () => {
 			expect(proxy.$binary).toEqual({});
 		});
 
-		test('test $json', () => {
+		test('$json', () => {
 			expect(proxy.$json).toEqual({ data: 105 });
 		});
 
-		test('test $itemIndex', () => {
+		test('$itemIndex', () => {
 			expect(proxy.$itemIndex).toEqual(0);
 		});
 
-		test('test $prevNode', () => {
+		test('$prevNode', () => {
 			expect(proxy.$prevNode).toEqual({ name: 'Rename', outputIndex: 0, runIndex: 0 });
 		});
 
-		test('test $runIndex', () => {
+		test('$runIndex', () => {
 			expect(proxy.$runIndex).toEqual(0);
 		});
 
-		test('test $workflow', () => {
+		test('$workflow', () => {
 			expect(proxy.$workflow).toEqual({
 				active: false,
 				id: '123',
@@ -329,4 +146,141 @@ describe('WorkflowDataProxy', () => {
 			});
 		});
 	});
+
+	describe('Errors', () => {
+		const fixture = loadFixture('errors');
+
+		test('$("NodeName").item, Node does not exist', (done) => {
+			const proxy = getProxyFromFixture(
+				fixture.workflow,
+				fixture.run,
+				'Reference non-existent node',
+			);
+			try {
+				proxy.$('does not exist').item;
+				done('should throw');
+			} catch (error) {
+				expect(error).toBeInstanceOf(ExpressionError);
+				const exprError = error as ExpressionError;
+				expect(exprError.message).toEqual("Referenced node doesn't exist");
+				done();
+			}
+		});
+
+		test('$("NodeName").item, node has no connection to referenced node', (done) => {
+			const proxy = getProxyFromFixture(fixture.workflow, fixture.run, 'NoPathBack');
+			try {
+				proxy.$('Customer Datastore (n8n training)').item;
+				done('should throw');
+			} catch (error) {
+				expect(error).toBeInstanceOf(ExpressionError);
+				const exprError = error as ExpressionError;
+				expect(exprError.message).toEqual('Invalid expression');
+				expect(exprError.context.type).toEqual('paired_item_no_connection');
+				done();
+			}
+		});
+
+		test('$("NodeName").first(), node has no connection to referenced node', (done) => {
+			const proxy = getProxyFromFixture(
+				fixture.workflow,
+				fixture.run,
+				'Reference impossible with .first()',
+			);
+			try {
+				proxy.$('Impossible').first().json.name;
+				done('should throw');
+			} catch (error) {
+				expect(error).toBeInstanceOf(ExpressionError);
+				const exprError = error as ExpressionError;
+				expect(exprError.message).toEqual('Referenced node is unexecuted');
+				expect(exprError.context.type).toEqual('no_node_execution_data');
+				done();
+			}
+		});
+
+		test('$json, Node has no connections', (done) => {
+			const proxy = getProxyFromFixture(fixture.workflow, fixture.run, 'NoInputConnection');
+			try {
+				proxy.$json.email;
+				done('should throw');
+			} catch (error) {
+				expect(error).toBeInstanceOf(ExpressionError);
+				const exprError = error as ExpressionError;
+				expect(exprError.message).toEqual('No execution data available');
+				expect(exprError.context.type).toEqual('no_input_connection');
+				done();
+			}
+		});
+
+		test('$("NodeName").item, Node has not run', (done) => {
+			const proxy = getProxyFromFixture(fixture.workflow, fixture.run, 'Impossible');
+			try {
+				proxy.$('Impossible if').item;
+				done('should throw');
+			} catch (error) {
+				expect(error).toBeInstanceOf(ExpressionError);
+				const exprError = error as ExpressionError;
+				expect(exprError.message).toEqual('Referenced node is unexecuted');
+				expect(exprError.context.type).toEqual('no_node_execution_data');
+				done();
+			}
+		});
+
+		test('$json, Node has not run', (done) => {
+			const proxy = getProxyFromFixture(fixture.workflow, fixture.run, 'Impossible');
+			try {
+				proxy.$json.email;
+				done('should throw');
+			} catch (error) {
+				expect(error).toBeInstanceOf(ExpressionError);
+				const exprError = error as ExpressionError;
+				expect(exprError.message).toEqual('No execution data available');
+				expect(exprError.context.type).toEqual('no_execution_data');
+				done();
+			}
+		});
+
+		test('$("NodeName").item, paired item error: more than 1 matching item', (done) => {
+			const proxy = getProxyFromFixture(fixture.workflow, fixture.run, 'PairedItemMultipleMatches');
+			try {
+				proxy.$('Edit Fields').item;
+				done('should throw');
+			} catch (error) {
+				expect(error).toBeInstanceOf(ExpressionError);
+				const exprError = error as ExpressionError;
+				expect(exprError.message).toEqual('Invalid expression');
+				expect(exprError.context.type).toEqual('paired_item_multiple_matches');
+				done();
+			}
+		});
+
+		test('$("NodeName").item, paired item error: missing paired item', (done) => {
+			const proxy = getProxyFromFixture(fixture.workflow, fixture.run, 'PairedItemInfoMissing');
+			try {
+				proxy.$('Edit Fields').item;
+				done('should throw');
+			} catch (error) {
+				expect(error).toBeInstanceOf(ExpressionError);
+				const exprError = error as ExpressionError;
+				expect(exprError.message).toEqual("Can't get data for expression");
+				expect(exprError.context.type).toEqual('paired_item_no_info');
+				done();
+			}
+		});
+
+		test('$("NodeName").item, paired item error: invalid paired item', (done) => {
+			const proxy = getProxyFromFixture(fixture.workflow, fixture.run, 'IncorrectPairedItem');
+			try {
+				proxy.$('Edit Fields').item;
+				done('should throw');
+			} catch (error) {
+				expect(error).toBeInstanceOf(ExpressionError);
+				const exprError = error as ExpressionError;
+				expect(exprError.message).toEqual("Can't get data for expression");
+				expect(exprError.context.type).toEqual('paired_item_invalid_info');
+				done();
+			}
+		});
+	});
 });
diff --git a/packages/workflow/test/errors/node.error.test.ts b/packages/workflow/test/errors/node.error.test.ts
new file mode 100644
index 0000000000000..3bf7dc20a6112
--- /dev/null
+++ b/packages/workflow/test/errors/node.error.test.ts
@@ -0,0 +1,22 @@
+import { mock } from 'jest-mock-extended';
+import type { INode } from '@/Interfaces';
+import { NodeApiError } from '@/errors/node-api.error';
+import { NodeOperationError } from '@/errors/node-operation.error';
+
+describe('NodeError', () => {
+	const node = mock<INode>();
+
+	it('should update re-wrapped error level and message', () => {
+		const apiError = new NodeApiError(node, { message: 'Some error happened', code: 500 });
+		const opsError = new NodeOperationError(node, mock(), { message: 'Some operation failed' });
+		const wrapped1 = new NodeOperationError(node, apiError);
+		const wrapped2 = new NodeOperationError(node, opsError);
+
+		expect(wrapped1.level).toEqual('error');
+		expect(wrapped1.message).toEqual('The service was not able to process your request');
+		expect(wrapped1.tags).toEqual(expect.objectContaining({ reWrapped: true }));
+		expect(wrapped2.level).toEqual('error');
+		expect(wrapped2.message).toEqual('Some operation failed');
+		expect(wrapped2.tags).toEqual(expect.objectContaining({ reWrapped: true }));
+	});
+});
diff --git a/packages/workflow/test/fixtures/WorkflowDataProxy/base_run.json b/packages/workflow/test/fixtures/WorkflowDataProxy/base_run.json
new file mode 100644
index 0000000000000..d1d76dfeddbaf
--- /dev/null
+++ b/packages/workflow/test/fixtures/WorkflowDataProxy/base_run.json
@@ -0,0 +1,140 @@
+{
+	"data": {
+		"startData": {},
+		"resultData": {
+			"runData": {
+				"Start": [
+					{
+						"startTime": 1,
+						"executionTime": 1,
+						"data": {
+							"main": [
+								[
+									{
+										"json": {}
+									}
+								]
+							]
+						},
+						"source": []
+					}
+				],
+				"Function": [
+					{
+						"startTime": 1,
+						"executionTime": 1,
+						"data": {
+							"main": [
+								[
+									{
+										"json": { "initialName": 105 },
+										"pairedItem": { "item": 0 }
+									},
+									{
+										"json": { "initialName": 160 },
+										"pairedItem": { "item": 0 }
+									},
+									{
+										"json": { "initialName": 121 },
+										"pairedItem": { "item": 0 }
+									},
+									{
+										"json": { "initialName": 275 },
+										"pairedItem": { "item": 0 }
+									},
+									{
+										"json": { "initialName": 950 },
+										"pairedItem": { "item": 0 }
+									}
+								]
+							]
+						},
+						"source": [
+							{
+								"previousNode": "Start"
+							}
+						]
+					}
+				],
+				"Rename": [
+					{
+						"startTime": 1,
+						"executionTime": 1,
+						"data": {
+							"main": [
+								[
+									{
+										"json": { "data": 105 },
+										"pairedItem": { "item": 0 }
+									},
+									{
+										"json": { "data": 160 },
+										"pairedItem": { "item": 1 }
+									},
+									{
+										"json": { "data": 121 },
+										"pairedItem": { "item": 2 }
+									},
+									{
+										"json": { "data": 275 },
+										"pairedItem": { "item": 3 }
+									},
+									{
+										"json": { "data": 950 },
+										"pairedItem": { "item": 4 }
+									}
+								]
+							]
+						},
+						"source": [
+							{
+								"previousNode": "Function"
+							}
+						]
+					}
+				],
+				"End": [
+					{
+						"startTime": 1,
+						"executionTime": 1,
+						"data": {
+							"main": [
+								[
+									{
+										"json": { "data": 105 },
+										"pairedItem": { "item": 0 }
+									},
+									{
+										"json": { "data": 160 },
+										"pairedItem": { "item": 1 }
+									},
+									{
+										"json": { "data": 121 },
+										"pairedItem": { "item": 2 }
+									},
+									{
+										"json": { "data": 275 },
+										"pairedItem": { "item": 3 }
+									},
+									{
+										"json": { "data": 950 },
+										"pairedItem": { "item": 4 }
+									}
+								]
+							]
+						},
+						"source": [
+							{
+								"previousNode": "Rename"
+							}
+						]
+					}
+				]
+			}
+		}
+	},
+	"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/base_workflow.json b/packages/workflow/test/fixtures/WorkflowDataProxy/base_workflow.json
new file mode 100644
index 0000000000000..9894b66626447
--- /dev/null
+++ b/packages/workflow/test/fixtures/WorkflowDataProxy/base_workflow.json
@@ -0,0 +1,86 @@
+{
+	"name": "",
+	"nodes": [
+		{
+			"name": "Start",
+			"type": "test.set",
+			"parameters": {},
+			"typeVersion": 1,
+			"id": "uuid-1",
+			"position": [100, 200]
+		},
+		{
+			"name": "Function",
+			"type": "test.set",
+			"parameters": {
+				"functionCode": "// Code here will run only once, no matter how many input items there are.\n// More info and help: https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.function/\nconst { DateTime, Duration, Interval } = require(\"luxon\");\n\nconst data = [\n  {\n  \"length\": 105\n  },\n  {\n  \"length\": 160\n  },\n  {\n  \"length\": 121\n  },\n  {\n  \"length\": 275\n  },\n  {\n  \"length\": 950\n  },\n];\n\nreturn data.map(fact => ({json: fact}));"
+			},
+			"typeVersion": 1,
+			"id": "uuid-2",
+			"position": [280, 200]
+		},
+		{
+			"name": "Rename",
+			"type": "test.set",
+			"parameters": {
+				"value1": "data",
+				"value2": "initialName"
+			},
+			"typeVersion": 1,
+			"id": "uuid-3",
+			"position": [460, 200]
+		},
+		{
+			"name": "Set",
+			"type": "test.set",
+			"parameters": {},
+			"typeVersion": 1,
+			"id": "uuid-4",
+			"position": [640, 200]
+		},
+		{
+			"name": "End",
+			"type": "test.set",
+			"parameters": {},
+			"typeVersion": 1,
+			"id": "uuid-5",
+			"position": [640, 200]
+		}
+	],
+	"pinData": {},
+	"connections": {
+		"Start": {
+			"main": [
+				[
+					{
+						"node": "Function",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Function": {
+			"main": [
+				[
+					{
+						"node": "Rename",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Rename": {
+			"main": [
+				[
+					{
+						"node": "End",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	}
+}
diff --git a/packages/workflow/test/fixtures/WorkflowDataProxy/errors_run.json b/packages/workflow/test/fixtures/WorkflowDataProxy/errors_run.json
new file mode 100644
index 0000000000000..6ee89f092b0da
--- /dev/null
+++ b/packages/workflow/test/fixtures/WorkflowDataProxy/errors_run.json
@@ -0,0 +1,1017 @@
+{
+	"data": {
+		"startData": {},
+		"resultData": {
+			"runData": {
+				"When clicking \"Test workflow\"": [
+					{
+						"startTime": 1707471743600,
+						"executionTime": 1,
+						"source": [],
+						"executionStatus": "success",
+						"data": {
+							"main": [
+								[
+									{
+										"json": {},
+										"pairedItem": {
+											"item": 0
+										}
+									}
+								]
+							]
+						}
+					}
+				],
+				"Customer Datastore (n8n training)": [
+					{
+						"startTime": 1707471743602,
+						"executionTime": 1,
+						"source": [
+							{
+								"previousNode": "When clicking \"Test workflow\""
+							}
+						],
+						"executionStatus": "success",
+						"data": {
+							"main": [
+								[
+									{
+										"json": {
+											"id": "23423532",
+											"name": "Jay Gatsby",
+											"email": "gatsby@west-egg.com",
+											"notes": "Keeps asking about a green light??",
+											"country": "US",
+											"created": "1925-04-10"
+										},
+										"pairedItem": {
+											"item": 0
+										}
+									},
+									{
+										"json": {
+											"id": "23423533",
+											"name": "José Arcadio Buendía",
+											"email": "jab@macondo.co",
+											"notes": "Lots of people named after him. Very confusing",
+											"country": "CO",
+											"created": "1967-05-05"
+										},
+										"pairedItem": {
+											"item": 0
+										}
+									},
+									{
+										"json": {
+											"id": "23423534",
+											"name": "Max Sendak",
+											"email": "info@in-and-out-of-weeks.org",
+											"notes": "Keeps rolling his terrible eyes",
+											"country": "US",
+											"created": "1963-04-09"
+										},
+										"pairedItem": {
+											"item": 0
+										}
+									},
+									{
+										"json": {
+											"id": "23423535",
+											"name": "Zaphod Beeblebrox",
+											"email": "captain@heartofgold.com",
+											"notes": "Felt like I was talking to more than one person",
+											"country": null,
+											"created": "1979-10-12"
+										},
+										"pairedItem": {
+											"item": 0
+										}
+									},
+									{
+										"json": {
+											"id": "23423536",
+											"name": "Edmund Pevensie",
+											"email": "edmund@narnia.gov",
+											"notes": "Passionate sailor",
+											"country": "UK",
+											"created": "1950-10-16"
+										},
+										"pairedItem": {
+											"item": 0
+										}
+									}
+								]
+							]
+						}
+					}
+				],
+				"Edit Fields": [
+					{
+						"startTime": 1707471743604,
+						"executionTime": 2,
+						"source": [
+							{
+								"previousNode": "Customer Datastore (n8n training)"
+							}
+						],
+						"executionStatus": "success",
+						"data": {
+							"main": [
+								[
+									{
+										"json": {
+											"id": "23423532",
+											"name": "Jay Gatsby",
+											"email": "gatsby@west-egg.com",
+											"notes": "Keeps asking about a green light??",
+											"country": "US",
+											"created": "1925-04-10"
+										},
+										"pairedItem": {
+											"item": 0
+										}
+									},
+									{
+										"json": {
+											"id": "23423533",
+											"name": "José Arcadio Buendía",
+											"email": "jab@macondo.co",
+											"notes": "Lots of people named after him. Very confusing",
+											"country": "CO",
+											"created": "1967-05-05"
+										},
+										"pairedItem": {
+											"item": 1
+										}
+									},
+									{
+										"json": {
+											"id": "23423534",
+											"name": "Max Sendak",
+											"email": "info@in-and-out-of-weeks.org",
+											"notes": "Keeps rolling his terrible eyes",
+											"country": "US",
+											"created": "1963-04-09"
+										},
+										"pairedItem": {
+											"item": 2
+										}
+									},
+									{
+										"json": {
+											"id": "23423535",
+											"name": "Zaphod Beeblebrox",
+											"email": "captain@heartofgold.com",
+											"notes": "Felt like I was talking to more than one person",
+											"country": null,
+											"created": "1979-10-12"
+										},
+										"pairedItem": {
+											"item": 3
+										}
+									},
+									{
+										"json": {
+											"id": "23423536",
+											"name": "Edmund Pevensie",
+											"email": "edmund@narnia.gov",
+											"notes": "Passionate sailor",
+											"country": "UK",
+											"created": "1950-10-16"
+										},
+										"pairedItem": {
+											"item": 4
+										}
+									}
+								]
+							]
+						}
+					}
+				],
+				"Aggregate": [
+					{
+						"startTime": 1707471743607,
+						"executionTime": 1,
+						"source": [
+							{
+								"previousNode": "Edit Fields"
+							}
+						],
+						"executionStatus": "success",
+						"data": {
+							"main": [
+								[
+									{
+										"json": {
+											"name": [
+												"Jay Gatsby",
+												"José Arcadio Buendía",
+												"Max Sendak",
+												"Zaphod Beeblebrox",
+												"Edmund Pevensie"
+											]
+										},
+										"pairedItem": [
+											{
+												"item": 0
+											},
+											{
+												"item": 1
+											},
+											{
+												"item": 2
+											},
+											{
+												"item": 3
+											},
+											{
+												"item": 4
+											}
+										]
+									}
+								]
+							]
+						}
+					}
+				],
+				"PairedItemMultipleMatches": [
+					{
+						"startTime": 1707471743609,
+						"executionTime": 1,
+						"source": [
+							{
+								"previousNode": "Aggregate"
+							}
+						],
+						"executionStatus": "success",
+						"data": {
+							"main": [
+								[
+									{
+										"json": {
+											"error": "Invalid expression",
+											"pairedItem": {
+												"item": 0
+											}
+										},
+										"pairedItem": {
+											"item": 0
+										}
+									}
+								],
+								[]
+							]
+						}
+					}
+				],
+				"Break pairedItem chain": [
+					{
+						"startTime": 1707471743611,
+						"executionTime": 5,
+						"source": [
+							{
+								"previousNode": "Edit Fields"
+							}
+						],
+						"executionStatus": "success",
+						"data": {
+							"main": [
+								[
+									{
+										"json": {
+											"field": "the same"
+										}
+									}
+								]
+							]
+						}
+					}
+				],
+				"PairedItemInfoMissing": [
+					{
+						"startTime": 1707471743617,
+						"executionTime": 1,
+						"source": [
+							{
+								"previousNode": "Break pairedItem chain"
+							}
+						],
+						"executionStatus": "success",
+						"data": {
+							"main": [
+								[
+									{
+										"json": {
+											"error": "Can’t get data for expression",
+											"pairedItem": {
+												"item": 0
+											}
+										},
+										"pairedItem": {
+											"item": 0
+										}
+									}
+								],
+								[]
+							]
+						}
+					}
+				],
+				"Break pairedItem chain, pinned": [
+					{
+						"startTime": 1707471743619,
+						"executionTime": 0,
+						"source": [
+							{
+								"previousNode": "Edit Fields"
+							}
+						],
+						"executionStatus": "success",
+						"data": {
+							"main": [
+								[
+									{
+										"json": {
+											"field": "the same"
+										}
+									}
+								]
+							]
+						}
+					}
+				],
+				"PairedItemInfoMissingPinned": [
+					{
+						"startTime": 1707471743620,
+						"executionTime": 2,
+						"source": [
+							{
+								"previousNode": "Break pairedItem chain, pinned"
+							}
+						],
+						"executionStatus": "success",
+						"data": {
+							"main": [
+								[
+									{
+										"json": {
+											"error": "‘Node Break pairedItem chain, pinned‘ must be unpinned to execute",
+											"pairedItem": {
+												"item": 0
+											}
+										},
+										"pairedItem": {
+											"item": 0
+										}
+									}
+								],
+								[]
+							]
+						}
+					}
+				],
+				"Incorrect pairedItem info": [
+					{
+						"startTime": 1707471743623,
+						"executionTime": 3,
+						"source": [
+							{
+								"previousNode": "Edit Fields"
+							}
+						],
+						"executionStatus": "success",
+						"data": {
+							"main": [
+								[
+									{
+										"json": {
+											"field": "the same"
+										},
+										"pairedItem": 99
+									}
+								]
+							]
+						}
+					}
+				],
+				"IncorrectPairedItem": [
+					{
+						"startTime": 1707471743628,
+						"executionTime": 2,
+						"source": [
+							{
+								"previousNode": "Incorrect pairedItem info"
+							}
+						],
+						"executionStatus": "success",
+						"data": {
+							"main": [
+								[
+									{
+										"json": {
+											"error": "Can’t get data for expression",
+											"pairedItem": {
+												"item": 0
+											}
+										},
+										"pairedItem": {
+											"item": 0
+										}
+									}
+								],
+								[]
+							]
+						}
+					}
+				],
+				"Incorrect pairedItem info, pinned1": [
+					{
+						"startTime": 1707471743631,
+						"executionTime": 0,
+						"source": [
+							{
+								"previousNode": "Edit Fields"
+							}
+						],
+						"executionStatus": "success",
+						"data": {
+							"main": [
+								[
+									{
+										"json": {
+											"field": "the same"
+										}
+									}
+								]
+							]
+						}
+					}
+				],
+				"IncorrectPairedItemPinned": [
+					{
+						"startTime": 1707471743632,
+						"executionTime": 1,
+						"source": [
+							{
+								"previousNode": "Incorrect pairedItem info, pinned1"
+							}
+						],
+						"executionStatus": "success",
+						"data": {
+							"main": [
+								[
+									{
+										"json": {
+											"error": "‘Node Incorrect pairedItem info, pinned1‘ must be unpinned to execute",
+											"pairedItem": {
+												"item": 0
+											}
+										},
+										"pairedItem": {
+											"item": 0
+										}
+									}
+								],
+								[]
+							]
+						}
+					}
+				],
+				"Multiple matching items": [
+					{
+						"startTime": 1707471743634,
+						"executionTime": 5,
+						"source": [
+							{
+								"previousNode": "Edit Fields"
+							}
+						],
+						"executionStatus": "success",
+						"data": {
+							"main": [
+								[
+									{
+										"json": {
+											"field": "the same"
+										},
+										"pairedItem": [1, 2, 3, 4]
+									}
+								]
+							]
+						}
+					}
+				],
+				"PairedItemMultipleMatches2": [
+					{
+						"startTime": 1707471743640,
+						"executionTime": 1,
+						"source": [
+							{
+								"previousNode": "Multiple matching items"
+							}
+						],
+						"executionStatus": "success",
+						"data": {
+							"main": [
+								[
+									{
+										"json": {
+											"error": "Invalid expression",
+											"pairedItem": {
+												"item": 0
+											}
+										},
+										"pairedItem": {
+											"item": 0
+										}
+									}
+								],
+								[]
+							]
+						}
+					}
+				],
+				"Multiple matching items, pinned": [
+					{
+						"startTime": 1707471743642,
+						"executionTime": 0,
+						"source": [
+							{
+								"previousNode": "Edit Fields"
+							}
+						],
+						"executionStatus": "success",
+						"data": {
+							"main": [
+								[
+									{
+										"json": {
+											"field": "the same"
+										}
+									}
+								]
+							]
+						}
+					}
+				],
+				"IncorrectPairedItemPinned2": [
+					{
+						"startTime": 1707471743645,
+						"executionTime": 1,
+						"source": [
+							{
+								"previousNode": "Multiple matching items, pinned"
+							}
+						],
+						"executionStatus": "success",
+						"data": {
+							"main": [
+								[
+									{
+										"json": {
+											"error": "‘Node Multiple matching items, pinned‘ must be unpinned to execute",
+											"pairedItem": {
+												"item": 0
+											}
+										},
+										"pairedItem": {
+											"item": 0
+										}
+									}
+								],
+								[]
+							]
+						}
+					}
+				],
+				"Reference impossible with .item": [
+					{
+						"startTime": 1707471743647,
+						"executionTime": 15,
+						"source": [
+							{
+								"previousNode": "Customer Datastore (n8n training)"
+							}
+						],
+						"executionStatus": "error",
+						"error": {
+							"level": "error",
+							"tags": {},
+							"context": {
+								"itemIndex": 0,
+								"messageTemplate": "Invalid expression under ‘%%PARAMETER%%’",
+								"functionality": "pairedItem",
+								"nodeCause": "Impossible",
+								"type": "paired_item_no_connection",
+								"parameter": "fields.values"
+							},
+							"functionality": "regular",
+							"name": "NodeOperationError",
+							"timestamp": 1707471743662,
+							"node": {
+								"parameters": {
+									"mode": "manual",
+									"duplicateItem": false,
+									"fields": {
+										"values": [
+											{
+												"name": "name",
+												"type": "stringValue",
+												"stringValue": "={{ $('Impossible').item.json.name }}"
+											}
+										]
+									},
+									"include": "all",
+									"options": {}
+								},
+								"id": "4cbbee96-dd4c-4625-95b9-c68faef3e9a8",
+								"name": "Reference impossible with .item",
+								"type": "n8n-nodes-base.set",
+								"typeVersion": 3.2,
+								"position": [1420, 2000]
+							},
+							"description": "The expression uses data in the node <strong>‘Impossible’</strong> but there is no path back to it. Please check this node is connected to it (there can be other nodes in between).",
+							"message": "Invalid expression",
+							"stack": "NodeOperationError: Invalid expression\n    at Object.execute (/usr/local/lib/node_modules/n8n/node_modules/.pnpm/file+packages+nodes-base_asn1.js@5.4.1_date-fns@2.30.0_promise-ftp-common@1.1.5_zod@3.22.4/node_modules/n8n-nodes-base/dist/nodes/Set/v2/manual.mode.js:197:15)\n    at Object.execute (/usr/local/lib/node_modules/n8n/node_modules/.pnpm/file+packages+nodes-base_asn1.js@5.4.1_date-fns@2.30.0_promise-ftp-common@1.1.5_zod@3.22.4/node_modules/n8n-nodes-base/dist/nodes/Set/v2/SetV2.node.js:286:57)\n    at Workflow.runNode (/usr/local/lib/node_modules/n8n/node_modules/.pnpm/file+packages+workflow/node_modules/n8n-workflow/dist/Workflow.js:706:42)\n    at /usr/local/lib/node_modules/n8n/node_modules/.pnpm/file+packages+core_n8n-nodes-base@1.28.0/node_modules/n8n-core/dist/WorkflowExecute.js:656:68\n    at /usr/local/lib/node_modules/n8n/node_modules/.pnpm/file+packages+core_n8n-nodes-base@1.28.0/node_modules/n8n-core/dist/WorkflowExecute.js:1058:20"
+						}
+					}
+				]
+			},
+			"pinData": {
+				"Multiple matching items, pinned": [
+					{
+						"json": {
+							"field": "the same"
+						}
+					}
+				],
+				"Incorrect pairedItem info, pinned1": [
+					{
+						"json": {
+							"field": "the same"
+						}
+					}
+				],
+				"Break pairedItem chain, pinned": [
+					{
+						"json": {
+							"field": "the same"
+						}
+					}
+				]
+			},
+			"lastNodeExecuted": "Reference impossible with .item",
+			"error": {
+				"level": "error",
+				"tags": {},
+				"context": {
+					"itemIndex": 0,
+					"messageTemplate": "Invalid expression under ‘%%PARAMETER%%’",
+					"functionality": "pairedItem",
+					"nodeCause": "Impossible",
+					"type": "paired_item_no_connection",
+					"parameter": "fields.values"
+				},
+				"functionality": "regular",
+				"name": "NodeOperationError",
+				"timestamp": 1707471743662,
+				"node": {
+					"parameters": {
+						"mode": "manual",
+						"duplicateItem": false,
+						"fields": {
+							"values": [
+								{
+									"name": "name",
+									"type": "stringValue",
+									"stringValue": "={{ $('Impossible').item.json.name }}"
+								}
+							]
+						},
+						"include": "all",
+						"options": {}
+					},
+					"id": "4cbbee96-dd4c-4625-95b9-c68faef3e9a8",
+					"name": "Reference impossible with .item",
+					"type": "n8n-nodes-base.set",
+					"typeVersion": 3.2,
+					"position": [1420, 2000]
+				},
+				"description": "The expression uses data in the node <strong>‘Impossible’</strong> but there is no path back to it. Please check this node is connected to it (there can be other nodes in between).",
+				"message": "Invalid expression",
+				"stack": "NodeOperationError: Invalid expression\n    at Object.execute (/usr/local/lib/node_modules/n8n/node_modules/.pnpm/file+packages+nodes-base_asn1.js@5.4.1_date-fns@2.30.0_promise-ftp-common@1.1.5_zod@3.22.4/node_modules/n8n-nodes-base/dist/nodes/Set/v2/manual.mode.js:197:15)\n    at Object.execute (/usr/local/lib/node_modules/n8n/node_modules/.pnpm/file+packages+nodes-base_asn1.js@5.4.1_date-fns@2.30.0_promise-ftp-common@1.1.5_zod@3.22.4/node_modules/n8n-nodes-base/dist/nodes/Set/v2/SetV2.node.js:286:57)\n    at Workflow.runNode (/usr/local/lib/node_modules/n8n/node_modules/.pnpm/file+packages+workflow/node_modules/n8n-workflow/dist/Workflow.js:706:42)\n    at /usr/local/lib/node_modules/n8n/node_modules/.pnpm/file+packages+core_n8n-nodes-base@1.28.0/node_modules/n8n-core/dist/WorkflowExecute.js:656:68\n    at /usr/local/lib/node_modules/n8n/node_modules/.pnpm/file+packages+core_n8n-nodes-base@1.28.0/node_modules/n8n-core/dist/WorkflowExecute.js:1058:20"
+			}
+		},
+		"executionData": {
+			"contextData": {},
+			"nodeExecutionStack": [
+				{
+					"node": {
+						"parameters": {
+							"mode": "manual",
+							"duplicateItem": false,
+							"fields": {
+								"values": [
+									{
+										"name": "name",
+										"type": "stringValue",
+										"stringValue": "={{ $('Impossible').item.json.name }}"
+									}
+								]
+							},
+							"include": "all",
+							"options": {}
+						},
+						"id": "4cbbee96-dd4c-4625-95b9-c68faef3e9a8",
+						"name": "Reference impossible with .item",
+						"type": "n8n-nodes-base.set",
+						"typeVersion": 3.2,
+						"position": [1420, 2000]
+					},
+					"data": {
+						"main": [
+							[
+								{
+									"json": {
+										"id": "23423532",
+										"name": "Jay Gatsby",
+										"email": "gatsby@west-egg.com",
+										"notes": "Keeps asking about a green light??",
+										"country": "US",
+										"created": "1925-04-10"
+									},
+									"pairedItem": {
+										"item": 0
+									}
+								},
+								{
+									"json": {
+										"id": "23423533",
+										"name": "José Arcadio Buendía",
+										"email": "jab@macondo.co",
+										"notes": "Lots of people named after him. Very confusing",
+										"country": "CO",
+										"created": "1967-05-05"
+									},
+									"pairedItem": {
+										"item": 1
+									}
+								},
+								{
+									"json": {
+										"id": "23423534",
+										"name": "Max Sendak",
+										"email": "info@in-and-out-of-weeks.org",
+										"notes": "Keeps rolling his terrible eyes",
+										"country": "US",
+										"created": "1963-04-09"
+									},
+									"pairedItem": {
+										"item": 2
+									}
+								},
+								{
+									"json": {
+										"id": "23423535",
+										"name": "Zaphod Beeblebrox",
+										"email": "captain@heartofgold.com",
+										"notes": "Felt like I was talking to more than one person",
+										"country": null,
+										"created": "1979-10-12"
+									},
+									"pairedItem": {
+										"item": 3
+									}
+								},
+								{
+									"json": {
+										"id": "23423536",
+										"name": "Edmund Pevensie",
+										"email": "edmund@narnia.gov",
+										"notes": "Passionate sailor",
+										"country": "UK",
+										"created": "1950-10-16"
+									},
+									"pairedItem": {
+										"item": 4
+									}
+								}
+							]
+						]
+					},
+					"source": {
+						"main": [
+							{
+								"previousNode": "Customer Datastore (n8n training)"
+							}
+						]
+					}
+				},
+				{
+					"node": {
+						"parameters": {
+							"mode": "manual",
+							"duplicateItem": false,
+							"fields": {
+								"values": [
+									{
+										"name": "name",
+										"type": "stringValue",
+										"stringValue": "={{ $('Impossible').first().json.name }}"
+									}
+								]
+							},
+							"include": "all",
+							"options": {}
+						},
+						"id": "6d47bd08-810a-4ade-be57-635adc1df47f",
+						"name": "Reference impossible with .first()",
+						"type": "n8n-nodes-base.set",
+						"typeVersion": 3.2,
+						"position": [1420, 2320]
+					},
+					"data": {
+						"main": [
+							[
+								{
+									"json": {
+										"id": "23423532",
+										"name": "Jay Gatsby",
+										"email": "gatsby@west-egg.com",
+										"notes": "Keeps asking about a green light??",
+										"country": "US",
+										"created": "1925-04-10"
+									},
+									"pairedItem": {
+										"item": 0
+									}
+								},
+								{
+									"json": {
+										"id": "23423533",
+										"name": "José Arcadio Buendía",
+										"email": "jab@macondo.co",
+										"notes": "Lots of people named after him. Very confusing",
+										"country": "CO",
+										"created": "1967-05-05"
+									},
+									"pairedItem": {
+										"item": 0
+									}
+								},
+								{
+									"json": {
+										"id": "23423534",
+										"name": "Max Sendak",
+										"email": "info@in-and-out-of-weeks.org",
+										"notes": "Keeps rolling his terrible eyes",
+										"country": "US",
+										"created": "1963-04-09"
+									},
+									"pairedItem": {
+										"item": 0
+									}
+								},
+								{
+									"json": {
+										"id": "23423535",
+										"name": "Zaphod Beeblebrox",
+										"email": "captain@heartofgold.com",
+										"notes": "Felt like I was talking to more than one person",
+										"country": null,
+										"created": "1979-10-12"
+									},
+									"pairedItem": {
+										"item": 0
+									}
+								},
+								{
+									"json": {
+										"id": "23423536",
+										"name": "Edmund Pevensie",
+										"email": "edmund@narnia.gov",
+										"notes": "Passionate sailor",
+										"country": "UK",
+										"created": "1950-10-16"
+									},
+									"pairedItem": {
+										"item": 0
+									}
+								}
+							]
+						]
+					},
+					"source": {
+						"main": [
+							{
+								"previousNode": "Customer Datastore (n8n training)"
+							}
+						]
+					}
+				},
+				{
+					"node": {
+						"parameters": {
+							"conditions": {
+								"options": {
+									"caseSensitive": true,
+									"leftValue": "",
+									"typeValidation": "strict"
+								},
+								"conditions": [
+									{
+										"id": "1fff886f-3d13-4fbf-b0fb-7e2f845937c0",
+										"leftValue": "={{ false }}",
+										"rightValue": "",
+										"operator": {
+											"type": "boolean",
+											"operation": "true",
+											"singleValue": true
+										}
+									}
+								],
+								"combinator": "and"
+							},
+							"options": {}
+						},
+						"id": "56dd65f0-d67a-42ce-a876-77434f621dc3",
+						"name": "Impossible if",
+						"type": "n8n-nodes-base.if",
+						"typeVersion": 2,
+						"position": [1000, 2000]
+					},
+					"data": {
+						"main": [
+							[
+								{
+									"json": {},
+									"pairedItem": {
+										"item": 0
+									}
+								}
+							]
+						]
+					},
+					"source": {
+						"main": [
+							{
+								"previousNode": "When clicking \"Test workflow\""
+							}
+						]
+					}
+				},
+				{
+					"node": {
+						"parameters": {
+							"mode": "manual",
+							"duplicateItem": false,
+							"fields": {
+								"values": [
+									{
+										"name": "",
+										"type": "stringValue",
+										"stringValue": "={{ $('non existent') }}"
+									}
+								]
+							},
+							"include": "all",
+							"options": {}
+						},
+						"id": "327d7f7b-61a5-4d60-9542-d61f84e7c83a",
+						"name": "Reference non-existent node",
+						"type": "n8n-nodes-base.set",
+						"typeVersion": 3.2,
+						"position": [1000, 2320]
+					},
+					"data": {
+						"main": [
+							[
+								{
+									"json": {},
+									"pairedItem": {
+										"item": 0
+									}
+								}
+							]
+						]
+					},
+					"source": {
+						"main": [
+							{
+								"previousNode": "When clicking \"Test workflow\""
+							}
+						]
+					}
+				}
+			],
+			"metadata": {},
+			"waitingExecution": {},
+			"waitingExecutionSource": {}
+		}
+	},
+	"mode": "manual",
+	"startedAt": "2024-02-09T09:42:23.598Z",
+	"stoppedAt": "2024-02-09T09:42:23.663Z",
+	"status": "running"
+}
diff --git a/packages/workflow/test/fixtures/WorkflowDataProxy/errors_workflow.json b/packages/workflow/test/fixtures/WorkflowDataProxy/errors_workflow.json
new file mode 100644
index 0000000000000..fd93f3374c9b5
--- /dev/null
+++ b/packages/workflow/test/fixtures/WorkflowDataProxy/errors_workflow.json
@@ -0,0 +1,747 @@
+{
+	"name": "WorkflowDataProxy errors",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "b5122d27-4bb5-4100-a69b-03b1dcac76c7",
+			"name": "When clicking \"Test workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [740, 1680]
+		},
+		{
+			"parameters": {
+				"operation": "getAllPeople"
+			},
+			"id": "bf471582-900d-47af-848c-2d4218798775",
+			"name": "Customer Datastore (n8n training)",
+			"type": "n8n-nodes-base.n8nTrainingCustomerDatastore",
+			"typeVersion": 1,
+			"position": [1180, 1680]
+		},
+		{
+			"parameters": {
+				"fields": {
+					"values": [
+						{
+							"name": "name",
+							"stringValue": "={{ $json.name }}"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "1de94b04-c87b-4ef1-b5d7-5078f9e33220",
+			"name": "Edit Fields",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.2,
+			"position": [1400, 1680]
+		},
+		{
+			"parameters": {
+				"content": "These expression should always be red — there is no way of getting the input data even if you execute. Text should be:",
+				"height": 349.2762683040461,
+				"width": 339
+			},
+			"id": "c277f7c6-8a7a-41e9-9484-78e90bd205bf",
+			"name": "Sticky Note",
+			"type": "n8n-nodes-base.stickyNote",
+			"typeVersion": 1,
+			"position": [1020, 1040]
+		},
+		{
+			"parameters": {
+				"fieldsToAggregate": {
+					"fieldToAggregate": [
+						{
+							"fieldToAggregate": "name"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "f6606ff5-4d66-4efb-8dad-de7662f20867",
+			"name": "Aggregate",
+			"type": "n8n-nodes-base.aggregate",
+			"typeVersion": 1,
+			"position": [1820, 860]
+		},
+		{
+			"parameters": {
+				"content": "This error should be\n\n[Can't determine which item to use]",
+				"height": 255,
+				"width": 177
+			},
+			"id": "71fbae4a-f5b3-4db1-9684-83c4d2037099",
+			"name": "Sticky Note1",
+			"type": "n8n-nodes-base.stickyNote",
+			"typeVersion": 1,
+			"position": [2000, 760]
+		},
+		{
+			"parameters": {
+				"content": "[No path back to node]",
+				"height": 209,
+				"width": 150
+			},
+			"id": "24e878cb-a681-4c00-bec1-83188aa20eb7",
+			"name": "Sticky Note2",
+			"type": "n8n-nodes-base.stickyNote",
+			"typeVersion": 1,
+			"position": [1020, 1132]
+		},
+		{
+			"parameters": {
+				"content": "[No input connected]",
+				"height": 201,
+				"width": 150
+			},
+			"id": "4bd26f55-87b5-4ad1-b3f1-ae2786941114",
+			"name": "Sticky Note3",
+			"type": "n8n-nodes-base.stickyNote",
+			"typeVersion": 1,
+			"position": [1200, 1132]
+		},
+		{
+			"parameters": {
+				"jsCode": "\nreturn [\n  {\n    \"field\": \"the same\"\n  }\n];"
+			},
+			"id": "6538818e-c5b3-422b-920c-d5d52533578b",
+			"name": "Break pairedItem chain",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 2,
+			"position": [1820, 1120]
+		},
+		{
+			"parameters": {
+				"content": "This error should be\n\n[Can't determine which item to use]",
+				"height": 255,
+				"width": 177
+			},
+			"id": "42641e54-60e1-46d7-bcb4-b55a83f89f6b",
+			"name": "Sticky Note4",
+			"type": "n8n-nodes-base.stickyNote",
+			"typeVersion": 1,
+			"position": [2000, 1020]
+		},
+		{
+			"parameters": {
+				"jsCode": "\nreturn [\n  {\n    \"json\": {\n      \"field\": \"the same\"\n    },\n    \"pairedItem\": 99\n  }\n];"
+			},
+			"id": "05583883-ab4a-42c2-9edb-8e8cf3c9d074",
+			"name": "Incorrect pairedItem info",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 2,
+			"position": [1820, 1680]
+		},
+		{
+			"parameters": {
+				"content": "This error should be\n\n[Can't determine which item to use]",
+				"height": 255,
+				"width": 177
+			},
+			"id": "aea58e9e-5a00-4a86-a0bc-b077a07cd1f4",
+			"name": "Sticky Note5",
+			"type": "n8n-nodes-base.stickyNote",
+			"typeVersion": 1,
+			"position": [2000, 1580]
+		},
+		{
+			"parameters": {
+				"content": "If the pinned node is executed, make grey and use text:\n[For preview, unpin node ‘<node_name>’ and execute]",
+				"height": 255,
+				"width": 237.63786881219818
+			},
+			"id": "3fdf6bdc-8065-421b-9ecf-6453946356a4",
+			"name": "Sticky Note6",
+			"type": "n8n-nodes-base.stickyNote",
+			"typeVersion": 1,
+			"position": [2000, 1840]
+		},
+		{
+			"parameters": {
+				"jsCode": "\nreturn [\n  {\n    \"json\": {\n      \"field\": \"the same\"\n    },\n    \"pairedItem\": [1, 2, 3, 4]\n  }\n];"
+			},
+			"id": "f8de7b0a-79c1-4b7a-a183-feb94f2f8625",
+			"name": "Multiple matching items",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 2,
+			"position": [1820, 2200]
+		},
+		{
+			"parameters": {
+				"content": "This error should be\n\n[Can't determine which item to use]",
+				"height": 255,
+				"width": 177
+			},
+			"id": "601c050a-7909-4708-be8d-4de248b68392",
+			"name": "Sticky Note7",
+			"type": "n8n-nodes-base.stickyNote",
+			"typeVersion": 1,
+			"position": [2000, 2100]
+		},
+		{
+			"parameters": {
+				"content": "This should be grey, with text\n\n[For preview, unpin node ‘<node_name>’ and execute]",
+				"height": 291.70186796527776,
+				"width": 177
+			},
+			"id": "dfdcfaf4-a76b-4307-97a6-3fd7772e9fa8",
+			"name": "Sticky Note8",
+			"type": "n8n-nodes-base.stickyNote",
+			"typeVersion": 1,
+			"position": [2000, 2360]
+		},
+		{
+			"parameters": {
+				"jsCode": "\nreturn [\n  {\n    \"json\": {\n      \"field\": \"the same\"\n    },\n    \"pairedItem\": [1, 2, 3, 4]\n  }\n];"
+			},
+			"id": "8f2a9642-68e7-4dc6-a6c2-2018919327a3",
+			"name": "Multiple matching items, pinned",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 2,
+			"position": [1820, 2500]
+		},
+		{
+			"parameters": {
+				"content": "If the pinned node isn't executed (e.g. if you execute one of the other code nodes in the same column), the expression is green!",
+				"height": 128.93706220621976,
+				"width": 177
+			},
+			"id": "65cf9b4c-a96d-46f5-b9bb-f6d88d1fbc44",
+			"name": "Sticky Note9",
+			"type": "n8n-nodes-base.stickyNote",
+			"typeVersion": 1,
+			"position": [2220, 1940]
+		},
+		{
+			"parameters": {
+				"jsCode": "\nreturn [\n  {\n    \"json\": {\n      \"field\": \"the same\"\n    },\n    \"pairedItem\": 99\n  }\n];"
+			},
+			"id": "0bdfe0d2-7de2-472d-bc0a-2d0eff0e08c7",
+			"name": "Incorrect pairedItem info, pinned1",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 2,
+			"position": [1820, 1940]
+		},
+		{
+			"parameters": {
+				"jsCode": "\nreturn [\n  {\n    \"field\": \"the same\"\n  }\n];"
+			},
+			"id": "b080a98e-d983-414a-b925-bdfc7ab2c3b6",
+			"name": "Break pairedItem chain, pinned",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 2,
+			"position": [1820, 1420]
+		},
+		{
+			"parameters": {
+				"content": "This should be grey, with text\n\n[For preview, unpin node ‘<node_name>’ and execute]",
+				"height": 291.70186796527776,
+				"width": 177
+			},
+			"id": "ce083193-1944-4c6c-925d-9e23c5194d98",
+			"name": "Sticky Note11",
+			"type": "n8n-nodes-base.stickyNote",
+			"typeVersion": 1,
+			"position": [2000, 1280]
+		},
+		{
+			"parameters": {
+				"content": "We should also change the output pane error on execution in this case.\n\nERROR: No path back to '<node_name>' node\nDescription: Please make sure it is connected to this node (there can be other nodes in between)",
+				"height": 209,
+				"width": 301.59467203049536
+			},
+			"id": "755e07f0-3f18-4b08-ad30-79221a76507a",
+			"name": "Sticky Note10",
+			"type": "n8n-nodes-base.stickyNote",
+			"typeVersion": 1,
+			"position": [1080, 1360]
+		},
+		{
+			"parameters": {
+				"conditions": {
+					"options": {
+						"caseSensitive": true,
+						"leftValue": "",
+						"typeValidation": "strict"
+					},
+					"conditions": [
+						{
+							"id": "1fff886f-3d13-4fbf-b0fb-7e2f845937c0",
+							"leftValue": "={{ false }}",
+							"rightValue": "",
+							"operator": {
+								"type": "boolean",
+								"operation": "true",
+								"singleValue": true
+							}
+						}
+					],
+					"combinator": "and"
+				},
+				"options": {}
+			},
+			"id": "56dd65f0-d67a-42ce-a876-77434f621dc3",
+			"name": "Impossible if",
+			"type": "n8n-nodes-base.if",
+			"typeVersion": 2,
+			"position": [1000, 2000]
+		},
+		{
+			"parameters": {
+				"fields": {
+					"values": [
+						{
+							"name": "test",
+							"stringValue": "xzy"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "11eadfc8-d14d-407c-b6d5-6e59b2e427a1",
+			"name": "Impossible",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.2,
+			"position": [1180, 1980]
+		},
+		{
+			"parameters": {
+				"content": "Should be an error when using .item:\n\n[No path back to node]",
+				"height": 237.7232010163043,
+				"width": 150
+			},
+			"id": "c3a3fdc2-66fa-4562-a359-45bdece2f625",
+			"name": "Sticky Note12",
+			"type": "n8n-nodes-base.stickyNote",
+			"typeVersion": 1,
+			"position": [1400, 1880]
+		},
+		{
+			"parameters": {
+				"fields": {
+					"values": [
+						{
+							"name": "name",
+							"stringValue": "={{ $('Impossible').item.json.name }}"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "4cbbee96-dd4c-4625-95b9-c68faef3e9a8",
+			"name": "Reference impossible with .item",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.2,
+			"position": [1420, 2000]
+		},
+		{
+			"parameters": {
+				"fields": {
+					"values": [
+						{
+							"name": "name",
+							"stringValue": "={{ $('Impossible').first().json.name }}"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "6d47bd08-810a-4ade-be57-635adc1df47f",
+			"name": "Reference impossible with .first()",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.2,
+			"position": [1420, 2320]
+		},
+		{
+			"parameters": {
+				"content": "When using .first(), .last() or .all() and the node isn't executed, show grey warning:\n\n[Execute ‘<node_name>’ for preview]",
+				"height": 330.27573762439613,
+				"width": 229.78666948973432
+			},
+			"id": "1fcf2562-0789-41ad-8c92-44bcdd5d44e6",
+			"name": "Sticky Note13",
+			"type": "n8n-nodes-base.stickyNote",
+			"typeVersion": 1,
+			"position": [1400, 2180]
+		},
+		{
+			"parameters": {
+				"fields": {
+					"values": [
+						{
+							"stringValue": "={{ $('non existent') }}"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "327d7f7b-61a5-4d60-9542-d61f84e7c83a",
+			"name": "Reference non-existent node",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.2,
+			"position": [1000, 2320]
+		},
+		{
+			"parameters": {
+				"fields": {
+					"values": [
+						{
+							"stringValue": "={{ $('Customer Datastore (n8n training)').item.json.email }}"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "38e3a736-4e13-4c23-af16-e50e605c4fb5",
+			"name": "NoPathBack",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.2,
+			"position": [1040, 1184]
+		},
+		{
+			"parameters": {
+				"fields": {
+					"values": [
+						{
+							"stringValue": "={{ $json.email }}"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "2a7eaf81-6d64-488d-baf6-cc2f962908af",
+			"name": "NoInputConnection",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.2,
+			"position": [1220, 1180]
+		},
+		{
+			"parameters": {
+				"fields": {
+					"values": [
+						{
+							"stringValue": "={{ $('Edit Fields').item.json.name }}"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "166ee813-1db8-43a6-ace4-990c41dfeaea",
+			"name": "PairedItemInfoMissing",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.2,
+			"position": [2040, 1120]
+		},
+		{
+			"parameters": {
+				"fields": {
+					"values": [
+						{
+							"stringValue": "={{ $('Edit Fields').item.json.name }}"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "a2dca54c-03ef-4a16-bf29-71eb0012cf0b",
+			"name": "PairedItemInfoMissingPinned",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.2,
+			"position": [2040, 1420]
+		},
+		{
+			"parameters": {
+				"fields": {
+					"values": [
+						{
+							"stringValue": "={{ $('Edit Fields').item.json.name }}"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "0a1f566b-8dcf-4e28-81c4-faeadcdc02fb",
+			"name": "IncorrectPairedItem",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.2,
+			"position": [2040, 1680]
+		},
+		{
+			"parameters": {
+				"fields": {
+					"values": [
+						{
+							"stringValue": "={{ $('Edit Fields').item.to }}"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "4d76b75f-5896-48ba-bb2f-8a2574ec1b8b",
+			"name": "IncorrectPairedItemPinned",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.2,
+			"position": [2040, 1940]
+		},
+		{
+			"parameters": {
+				"fields": {
+					"values": [
+						{
+							"stringValue": "={{ $('Edit Fields').item.json.name }}"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "c4636b5c-c13a-441b-a59c-23962b2757b3",
+			"name": "PairedItemMultipleMatches2",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.2,
+			"position": [2040, 2200]
+		},
+		{
+			"parameters": {
+				"fields": {
+					"values": [
+						{
+							"stringValue": "={{ $('Edit Fields').item.json.name }}"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "6d687cf8-5309-4d44-aab3-aa023a42fa27",
+			"name": "PairedItemMultipleMatches",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.2,
+			"position": [2040, 860]
+		},
+		{
+			"parameters": {
+				"fields": {
+					"values": [
+						{
+							"stringValue": "={{ $('Edit Fields').item.json.name }}"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "d87a7aa4-b4c7-4fad-897d-a7ce0657bef3",
+			"name": "IncorrectPairedItemPinned2",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.2,
+			"position": [2040, 2500]
+		}
+	],
+	"pinData": {
+		"Multiple matching items, pinned": [
+			{
+				"json": {
+					"field": "the same"
+				}
+			}
+		],
+		"Incorrect pairedItem info, pinned1": [
+			{
+				"json": {
+					"field": "the same"
+				}
+			}
+		],
+		"Break pairedItem chain, pinned": [
+			{
+				"json": {
+					"field": "the same"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Test workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Customer Datastore (n8n training)",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Impossible if",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Reference non-existent node",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Customer Datastore (n8n training)": {
+			"main": [
+				[
+					{
+						"node": "Edit Fields",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Reference impossible with .item",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Reference impossible with .first()",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Edit Fields": {
+			"main": [
+				[
+					{
+						"node": "Aggregate",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Break pairedItem chain",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Incorrect pairedItem info",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Multiple matching items",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Incorrect pairedItem info, pinned1",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Multiple matching items, pinned",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Break pairedItem chain, pinned",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Aggregate": {
+			"main": [
+				[
+					{
+						"node": "PairedItemMultipleMatches",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Break pairedItem chain": {
+			"main": [
+				[
+					{
+						"node": "PairedItemInfoMissing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Incorrect pairedItem info": {
+			"main": [
+				[
+					{
+						"node": "IncorrectPairedItem",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Multiple matching items": {
+			"main": [
+				[
+					{
+						"node": "PairedItemMultipleMatches2",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Multiple matching items, pinned": {
+			"main": [
+				[
+					{
+						"node": "IncorrectPairedItemPinned2",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Incorrect pairedItem info, pinned1": {
+			"main": [
+				[
+					{
+						"node": "IncorrectPairedItemPinned",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Break pairedItem chain, pinned": {
+			"main": [
+				[
+					{
+						"node": "PairedItemInfoMissingPinned",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Impossible if": {
+			"main": [
+				[
+					{
+						"node": "Impossible",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "f6276c80-c1d1-485b-9d07-894868bcd701",
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "2e88d456a76a9edc44cbcda082bb44ddef9555356ef691b0c6a45099d5095a45"
+	},
+	"id": "BmXv9neCtTggKXuG",
+	"tags": []
+}
diff --git a/packages/workflow/test/utils.test.ts b/packages/workflow/test/utils.test.ts
index 268f270e02624..a0867f5517667 100644
--- a/packages/workflow/test/utils.test.ts
+++ b/packages/workflow/test/utils.test.ts
@@ -1,4 +1,82 @@
-import { jsonParse, jsonStringify, deepCopy } from '@/utils';
+import { ApplicationError } from '@/errors/application.error';
+import { jsonParse, jsonStringify, deepCopy, isObjectEmpty, fileTypeFromMimeType } from '@/utils';
+
+describe('isObjectEmpty', () => {
+	it('should handle null and undefined', () => {
+		expect(isObjectEmpty(null)).toEqual(true);
+		expect(isObjectEmpty(undefined)).toEqual(true);
+	});
+
+	it('should handle arrays', () => {
+		expect(isObjectEmpty([])).toEqual(true);
+		expect(isObjectEmpty([1, 2, 3])).toEqual(false);
+	});
+
+	it('should handle Set and Map', () => {
+		expect(isObjectEmpty(new Set())).toEqual(true);
+		expect(isObjectEmpty(new Set([1, 2, 3]))).toEqual(false);
+
+		expect(isObjectEmpty(new Map())).toEqual(true);
+		expect(
+			isObjectEmpty(
+				new Map([
+					['a', 1],
+					['b', 2],
+				]),
+			),
+		).toEqual(false);
+	});
+
+	it('should handle Buffer, ArrayBuffer, and Uint8Array', () => {
+		expect(isObjectEmpty(Buffer.from(''))).toEqual(true);
+		expect(isObjectEmpty(Buffer.from('abcd'))).toEqual(false);
+
+		expect(isObjectEmpty(Uint8Array.from([]))).toEqual(true);
+		expect(isObjectEmpty(Uint8Array.from([1, 2, 3]))).toEqual(false);
+
+		expect(isObjectEmpty(new ArrayBuffer(0))).toEqual(true);
+		expect(isObjectEmpty(new ArrayBuffer(1))).toEqual(false);
+	});
+
+	it('should handle plain objects', () => {
+		expect(isObjectEmpty({})).toEqual(true);
+		expect(isObjectEmpty({ a: 1, b: 2 })).toEqual(false);
+	});
+
+	it('should handle instantiated classes', () => {
+		expect(isObjectEmpty(new (class Test {})())).toEqual(true);
+		expect(
+			isObjectEmpty(
+				new (class Test {
+					prop = 123;
+				})(),
+			),
+		).toEqual(false);
+	});
+
+	it('should not call Object.keys unless a plain object', () => {
+		const keySpy = jest.spyOn(Object, 'keys');
+		const { calls } = keySpy.mock;
+
+		const assertCalls = (count: number) => {
+			if (calls.length !== count) {
+				throw new ApplicationError('`Object.keys()` was called an unexpected number of times', {
+					extra: { times: calls.length },
+				});
+			}
+		};
+
+		assertCalls(0);
+		isObjectEmpty(null);
+		assertCalls(0);
+		isObjectEmpty([1, 2, 3]);
+		assertCalls(0);
+		isObjectEmpty(Buffer.from('123'));
+		assertCalls(0);
+		isObjectEmpty({});
+		assertCalls(1);
+	});
+});
 
 describe('jsonParse', () => {
 	it('parses JSON', () => {
@@ -117,3 +195,45 @@ describe('deepCopy', () => {
 		expect(copy.deep.arr.slice(-1)[0]).not.toBe(object);
 	});
 });
+
+describe('fileTypeFromMimeType', () => {
+	it('should recognize json', () => {
+		expect(fileTypeFromMimeType('application/json')).toEqual('json');
+	});
+
+	it('should recognize html', () => {
+		expect(fileTypeFromMimeType('text/html')).toEqual('html');
+	});
+
+	it('should recognize image', () => {
+		expect(fileTypeFromMimeType('image/jpeg')).toEqual('image');
+		expect(fileTypeFromMimeType('image/png')).toEqual('image');
+		expect(fileTypeFromMimeType('image/avif')).toEqual('image');
+		expect(fileTypeFromMimeType('image/webp')).toEqual('image');
+	});
+
+	it('should recognize audio', () => {
+		expect(fileTypeFromMimeType('audio/wav')).toEqual('audio');
+		expect(fileTypeFromMimeType('audio/webm')).toEqual('audio');
+		expect(fileTypeFromMimeType('audio/ogg')).toEqual('audio');
+		expect(fileTypeFromMimeType('audio/mp3')).toEqual('audio');
+	});
+
+	it('should recognize video', () => {
+		expect(fileTypeFromMimeType('video/mp4')).toEqual('video');
+		expect(fileTypeFromMimeType('video/webm')).toEqual('video');
+		expect(fileTypeFromMimeType('video/ogg')).toEqual('video');
+	});
+
+	it('should recognize text', () => {
+		expect(fileTypeFromMimeType('text/plain')).toEqual('text');
+		expect(fileTypeFromMimeType('text/css')).toEqual('text');
+		expect(fileTypeFromMimeType('text/html')).not.toEqual('text');
+		expect(fileTypeFromMimeType('text/javascript')).toEqual('text');
+		expect(fileTypeFromMimeType('application/javascript')).toEqual('text');
+	});
+
+	it('should recognize pdf', () => {
+		expect(fileTypeFromMimeType('application/pdf')).toEqual('pdf');
+	});
+});
diff --git a/packages/workflow/tsconfig.build.json b/packages/workflow/tsconfig.build.json
index c8f44354c7ac4..1e8a2ff7fa476 100644
--- a/packages/workflow/tsconfig.build.json
+++ b/packages/workflow/tsconfig.build.json
@@ -1,10 +1,8 @@
 {
-	"extends": "./tsconfig.json",
+	"extends": ["./tsconfig.json", "../../tsconfig.build.json"],
 	"compilerOptions": {
 		"rootDir": "src",
 		"outDir": "dist",
-		"types": ["node"],
-		"noEmit": false,
 		"tsBuildInfoFile": "dist/build.tsbuildinfo"
 	},
 	"include": ["src/**/*.ts"],
diff --git a/packages/workflow/tsconfig.json b/packages/workflow/tsconfig.json
index 84ea36482ce7b..cf7874454e1fe 100644
--- a/packages/workflow/tsconfig.json
+++ b/packages/workflow/tsconfig.json
@@ -2,16 +2,12 @@
 	"extends": "../../tsconfig.json",
 	"compilerOptions": {
 		"rootDir": ".",
-		"types": ["node", "jest"],
 		"composite": true,
-		"noEmit": true,
 		"baseUrl": "src",
 		"paths": {
 			"@/*": ["./*"]
 		},
-		"tsBuildInfoFile": "dist/typecheck.tsbuildinfo",
-		// TODO: remove all options below this line
-		"useUnknownInCatchVariables": false
+		"tsBuildInfoFile": "dist/typecheck.tsbuildinfo"
 	},
 	"include": ["src/**/*.ts", "test/**/*.ts"]
 }
diff --git a/patches/@types__express-serve-static-core@4.17.43.patch b/patches/@types__express-serve-static-core@4.17.43.patch
new file mode 100644
index 0000000000000..05882f0b97f5d
--- /dev/null
+++ b/patches/@types__express-serve-static-core@4.17.43.patch
@@ -0,0 +1,13 @@
+diff --git a/index.d.ts b/index.d.ts
+index 5cc36f5760c806a76ee839bfb67c419c9cb48901..8ef0bf74f0f31741b564fe37f040144526e98eb5 100644
+--- a/index.d.ts
++++ b/index.d.ts
+@@ -646,7 +646,7 @@ export interface Request<
+ 
+     query: ReqQuery;
+ 
+-    route: any;
++    route?: Pick<IRoute, 'path' | 'stack'>;
+ 
+     signedCookies: any;
+ 
diff --git a/patches/@types__ws@8.5.4.patch b/patches/@types__ws@8.5.4.patch
new file mode 100644
index 0000000000000..b489d1e61843a
--- /dev/null
+++ b/patches/@types__ws@8.5.4.patch
@@ -0,0 +1,14 @@
+diff --git a/index.d.ts b/index.d.ts
+index 7a8182a94289524851cb08a3b24897f2b6bce747..f5bfb61bdacbae81ca274cc4b5a61e6e7322b7cd 100755
+--- a/index.d.ts
++++ b/index.d.ts
+@@ -72,6 +72,9 @@ declare class WebSocket extends EventEmitter {
+         | typeof WebSocket.CLOSED;
+     readonly url: string;
+ 
++    /** Indicates if the connection has replied to the last PING */
++    isAlive: boolean;
++
+     /** The connection is not yet open. */
+     readonly CONNECTING: 0;
+     /** The connection is open and ready to communicate. */
\ No newline at end of file
diff --git a/patches/@typescript-eslint__eslint-plugin@5.59.0.patch b/patches/@typescript-eslint__eslint-plugin@5.59.0.patch
deleted file mode 100644
index e07dd173c4951..0000000000000
--- a/patches/@typescript-eslint__eslint-plugin@5.59.0.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/dist/rules/consistent-type-imports.js b/dist/rules/consistent-type-imports.js
-index 1844dc32b19d10abbe13556b9ee2f69c0aabac05..01320c5212fd61e08ca8a438db3ccd59949f9421 100644
---- a/dist/rules/consistent-type-imports.js
-+++ b/dist/rules/consistent-type-imports.js
-@@ -81,6 +81,8 @@ exports.default = util.createRule({
-                 ImportDeclaration(node) {
-                     var _a;
-                     const source = node.source.value;
-+                    if (source.endsWith('.vue')) return;
-+
-                     // sourceImports is the object containing all the specifics for a particular import source, type or value
-                     const sourceImports = (_a = sourceImportsMap[source]) !== null && _a !== void 0 ? _a : (sourceImportsMap[source] = {
-                         source,
\ No newline at end of file
diff --git a/patches/element-ui@2.15.12.patch b/patches/element-ui@2.15.12.patch
deleted file mode 100644
index 3f7ef6e50a915..0000000000000
--- a/patches/element-ui@2.15.12.patch
+++ /dev/null
@@ -1,262 +0,0 @@
-diff --git a/lib/element-ui.common.js b/lib/element-ui.common.js
-index 6209b8b7f21c6eea447dd4671b7c4cfc1ef5e9c2..a26772af8dcdcbc0e3a6058bda30c7f9f143cd5d 100644
---- a/lib/element-ui.common.js
-+++ b/lib/element-ui.common.js
-@@ -21471,14 +21471,8 @@ mainvue_type_template_id_52060272_render._withStripped = true
-       popper.setAttribute('tabindex', 0);
- 
-       if (this.trigger !== 'click') {
--        Object(dom_["on"])(reference, 'focusin', function () {
--          _this.handleFocus();
--          var instance = reference.__vue__;
--          if (instance && typeof instance.focus === 'function') {
--            instance.focus();
--          }
--        });
--        Object(dom_["on"])(popper, 'focusin', this.handleFocus);
-+        Object(dom_["on"])(reference, 'focusin', this.handleRefrenceFocus);
-+        Object(dom_["on"])(popper, 'focusin', this.handlePopperFocus);
-         Object(dom_["on"])(reference, 'focusout', this.handleBlur);
-         Object(dom_["on"])(popper, 'focusout', this.handleBlur);
-       }
-@@ -21524,7 +21518,17 @@ mainvue_type_template_id_52060272_render._withStripped = true
-     doClose: function doClose() {
-       this.showPopper = false;
-     },
--    handleFocus: function handleFocus() {
-+    handleRefrenceFocus: function handleRefrenceFocus() {
-+      this.handlePopperFocus();
-+      if (!this.referenceElm) {
-+        return;
-+      }
-+      const instance = this.referenceElm.__vue__;
-+      if (instance && typeof instance.focus === 'function') {
-+        instance.focus();
-+      }
-+    },
-+    handlePopperFocus: function handlePopperFocus() {
-       Object(dom_["addClass"])(this.referenceElm, 'focusing');
-       if (this.trigger === 'click' || this.trigger === 'focus') this.showPopper = true;
-     },
-@@ -21570,7 +21574,7 @@ mainvue_type_template_id_52060272_render._withStripped = true
-       var popper = this.popper || this.$refs.popper;
- 
-       if (!reference && this.$refs.wrapper.children) {
--        reference = this.referenceElm = this.$refs.wrapper.children[0];
-+        reference = this.$refs.wrapper.children[0];
-       }
-       if (!this.$el || !reference || this.$el.contains(e.target) || reference.contains(e.target) || !popper || popper.contains(e.target)) return;
-       this.showPopper = false;
-@@ -21590,18 +21594,28 @@ mainvue_type_template_id_52060272_render._withStripped = true
-   },
- 
-   destroyed: function destroyed() {
--    var reference = this.reference;
-+    var reference = this.referenceElm;
-+    var popper = this.popper || this.$refs.popper;
- 
-+    Object(dom_["off"])(reference, 'focusin', this.handleRefrenceFocus);
-+    Object(dom_["off"])(popper, 'focusin', this.handlePopperFocus);
-+    Object(dom_["off"])(reference, 'focusout', this.handleBlur);
-+    Object(dom_["off"])(popper, 'focusout', this.handleBlur);
-+    Object(dom_["off"])(reference, 'keydown', this.handleKeydown);
-+    Object(dom_["off"])(reference, 'click', this.handleClick);
-     Object(dom_["off"])(reference, 'click', this.doToggle);
-+    Object(dom_["off"])(document, 'click', this.handleDocumentClick);
-+    Object(dom_["off"])(reference, 'mouseenter', this.handleMouseEnter);
-+    Object(dom_["off"])(popper, 'mouseenter', this.handleMouseEnter);
-+    Object(dom_["off"])(reference, 'mouseleave', this.handleMouseLeave);
-+    Object(dom_["off"])(popper, 'mouseleave', this.handleMouseLeave);
-     Object(dom_["off"])(reference, 'mouseup', this.doClose);
-     Object(dom_["off"])(reference, 'mousedown', this.doShow);
-     Object(dom_["off"])(reference, 'focusin', this.doShow);
-     Object(dom_["off"])(reference, 'focusout', this.doClose);
-     Object(dom_["off"])(reference, 'mousedown', this.doShow);
-     Object(dom_["off"])(reference, 'mouseup', this.doClose);
--    Object(dom_["off"])(reference, 'mouseleave', this.handleMouseLeave);
--    Object(dom_["off"])(reference, 'mouseenter', this.handleMouseEnter);
--    Object(dom_["off"])(document, 'click', this.handleDocumentClick);
-+    this.referenceElm = undefined;
-   }
- });
- // CONCATENATED MODULE: ./packages/popover/src/main.vue?vue&type=script&lang=js&
-@@ -21805,18 +21819,7 @@ main.directive = directive;
-       this.$el.setAttribute('tabindex', this.tabindex);
-       Object(dom_["on"])(this.referenceElm, 'mouseenter', this.show);
-       Object(dom_["on"])(this.referenceElm, 'mouseleave', this.hide);
--      Object(dom_["on"])(this.referenceElm, 'focus', function () {
--        if (!_this3.$slots.default || !_this3.$slots.default.length) {
--          _this3.handleFocus();
--          return;
--        }
--        var instance = _this3.$slots.default[0].componentInstance;
--        if (instance && instance.focus) {
--          instance.focus();
--        } else {
--          _this3.handleFocus();
--        }
--      });
-+      Object(dom_["on"])(this.referenceElm, 'focus', this.handleFocus);
-       Object(dom_["on"])(this.referenceElm, 'blur', this.handleBlur);
-       Object(dom_["on"])(this.referenceElm, 'click', this.removeFocusing);
-     }
-@@ -21849,8 +21852,18 @@ main.directive = directive;
-       this.debounceClose();
-     },
-     handleFocus: function handleFocus() {
--      this.focusing = true;
--      this.show();
-+      if (!this.$slots.default || !this.$slots.default.length) {
-+        this.focusing = true;
-+        this.show();
-+        return;
-+      }
-+      var instance = this.$slots.default[0].componentInstance;
-+      if (instance && instance.focus) {
-+        instance.focus();
-+      } else {
-+        this.focusing = true;
-+        this.show();
-+      }
-     },
-     handleBlur: function handleBlur() {
-       this.focusing = false;
-@@ -21918,6 +21931,7 @@ main.directive = directive;
-     this.popperVM && this.popperVM.$destroy();
-   },
-   destroyed: function destroyed() {
-+    this.popperVM && this.popperVM.$destroy();
-     var reference = this.referenceElm;
-     if (reference.nodeType === 1) {
-       Object(dom_["off"])(reference, 'mouseenter', this.show);
-diff --git a/packages/popover/src/main.vue b/packages/popover/src/main.vue
-index ab5d060182c2e671989f1aba190c85a074d2c754..8b464ad39a78ac6efead5f687d977500642e45dc 100644
---- a/packages/popover/src/main.vue
-+++ b/packages/popover/src/main.vue
-@@ -98,16 +98,9 @@ export default {
-       reference.setAttribute('aria-describedby', this.tooltipId);
-       reference.setAttribute('tabindex', this.tabindex); // tab序列
-       popper.setAttribute('tabindex', 0);
--
-       if (this.trigger !== 'click') {
--        on(reference, 'focusin', () => {
--          this.handleFocus();
--          const instance = reference.__vue__;
--          if (instance && typeof instance.focus === 'function') {
--            instance.focus();
--          }
--        });
--        on(popper, 'focusin', this.handleFocus);
-+        on(reference, 'focusin', this.handleRefrenceFocus);
-+        on(popper, 'focusin', this.handlePopperFocus);
-         on(reference, 'focusout', this.handleBlur);
-         on(popper, 'focusout', this.handleBlur);
-       }
-@@ -154,7 +147,17 @@ export default {
-     doClose() {
-       this.showPopper = false;
-     },
--    handleFocus() {
-+    handleRefrenceFocus() {
-+      this.handlePopperFocus();
-+      if (!this.referenceElm) {
-+        return;
-+      }
-+      const instance = this.referenceElm.__vue__;
-+      if (instance && typeof instance.focus === 'function') {
-+        instance.focus();
-+      }
-+    },
-+    handlePopperFocus() {
-       addClass(this.referenceElm, 'focusing');
-       if (this.trigger === 'click' || this.trigger === 'focus') this.showPopper = true;
-     },
-@@ -193,9 +196,8 @@ export default {
-     handleDocumentClick(e) {
-       let reference = this.reference || this.$refs.reference;
-       const popper = this.popper || this.$refs.popper;
--
-       if (!reference && this.$refs.wrapper.children) {
--        reference = this.referenceElm = this.$refs.wrapper.children[0];
-+        reference = this.$refs.wrapper.children[0];
-       }
-       if (!this.$el ||
-         !reference ||
-@@ -218,20 +220,26 @@ export default {
-       }
-     }
-   },
--
-   destroyed() {
--    const reference = this.reference;
--
-+    const reference = this.referenceElm;
-+    const popper = this.popper || this.$refs.popper;
-+    off(reference, 'focusin', this.handleRefrenceFocus);
-+    off(popper, 'focusin', this.handlePopperFocus);
-+    off(reference, 'focusout', this.handleBlur);
-+    off(popper, 'focusout', this.handleBlur);
-+    off(reference, 'keydown', this.handleKeydown);
-+    off(reference, 'click', this.handleClick);
-     off(reference, 'click', this.doToggle);
--    off(reference, 'mouseup', this.doClose);
--    off(reference, 'mousedown', this.doShow);
-+    off(document, 'click', this.handleDocumentClick);
-+    off(reference, 'mouseenter', this.handleMouseEnter);
-+    off(popper, 'mouseenter', this.handleMouseEnter);
-+    off(reference, 'mouseleave', this.handleMouseLeave);
-+    off(popper, 'mouseleave', this.handleMouseLeave);
-     off(reference, 'focusin', this.doShow);
-     off(reference, 'focusout', this.doClose);
-     off(reference, 'mousedown', this.doShow);
-     off(reference, 'mouseup', this.doClose);
--    off(reference, 'mouseleave', this.handleMouseLeave);
--    off(reference, 'mouseenter', this.handleMouseEnter);
--    off(document, 'click', this.handleDocumentClick);
-+    this.referenceElm = undefined;
-   }
- };
- </script>
-diff --git a/packages/tooltip/src/main.js b/packages/tooltip/src/main.js
-index dc930ec58d42328a4d62cddb22fd513db31793cf..d9a6afc80d27ea89b838a47f395e249131c1370c 100644
---- a/packages/tooltip/src/main.js
-+++ b/packages/tooltip/src/main.js
-@@ -113,18 +113,7 @@ export default {
-       this.$el.setAttribute('tabindex', this.tabindex);
-       on(this.referenceElm, 'mouseenter', this.show);
-       on(this.referenceElm, 'mouseleave', this.hide);
--      on(this.referenceElm, 'focus', () => {
--        if (!this.$slots.default || !this.$slots.default.length) {
--          this.handleFocus();
--          return;
--        }
--        const instance = this.$slots.default[0].componentInstance;
--        if (instance && instance.focus) {
--          instance.focus();
--        } else {
--          this.handleFocus();
--        }
--      });
-+      on(this.referenceElm, 'focus', this.handleFocus);
-       on(this.referenceElm, 'blur', this.handleBlur);
-       on(this.referenceElm, 'click', this.removeFocusing);
-     }
-@@ -157,6 +146,18 @@ export default {
-       this.debounceClose();
-     },
-     handleFocus() {
-+      if (!this.$slots.default || !this.$slots.default.length) {
-+        this.doFocus();
-+        return;
-+      }
-+      const instance = this.$slots.default[0].componentInstance;
-+      if (instance && instance.focus) {
-+        instance.focus();
-+      } else {
-+        this.doFocus();
-+      }
-+    },
-+    doFocus() {
-       this.focusing = true;
-       this.show();
-     },
\ No newline at end of file
diff --git a/patches/pkce-challenge@3.0.0.patch b/patches/pkce-challenge@3.0.0.patch
new file mode 100644
index 0000000000000..f3d9159ee9c6e
--- /dev/null
+++ b/patches/pkce-challenge@3.0.0.patch
@@ -0,0 +1,13 @@
+diff --git a/dist/main.js b/dist/main.js
+index 86be84f44210b26583e0a7f1732acd8b98a5e701..a2b05be6a45355704fedf43b51a34793580eaf6c 100644
+--- a/dist/main.js
++++ b/dist/main.js
+@@ -42,7 +42,7 @@ $parcel$export(module.exports, "verifyChallenge", () => $f5bfd4ce37214f4f$export
+  * @param size The desired length of the string
+  * @returns The random string
+  */ function $f5bfd4ce37214f4f$var$random(size) {
+-    const mask = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~";
++    const mask = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._";
+     let result = "";
+     const randomUints = $f5bfd4ce37214f4f$var$getRandomValues(size);
+     for(let i = 0; i < size; i++){
\ No newline at end of file
diff --git a/patches/pyodide@0.23.4.patch b/patches/pyodide@0.23.4.patch
new file mode 100644
index 0000000000000..efb5318177134
--- /dev/null
+++ b/patches/pyodide@0.23.4.patch
@@ -0,0 +1,20 @@
+diff --git a/pyodide.d.ts b/pyodide.d.ts
+index d5ed46f6345855a75ec6f2b7ef73237a0af64a7e..e0087c83792558ca30713e9d07a9a37625f68d8d 100644
+--- a/pyodide.d.ts
++++ b/pyodide.d.ts
+@@ -1118,6 +1118,15 @@ export declare function loadPyodide(options?: {
+ 	 * (``pyodide.js`` or ``pyodide.mjs``) removed.
+ 	 */
+ 	indexURL?: string;
++	/**
++	 * The file path where packages will be cached in `node.js`. If a package
++	 * exists in `packageCacheDir` it is loaded from there, otherwise it is
++	 * downloaded from the JsDelivr CDN and then cached into `packageCacheDir`.
++	 * Only applies when running in node.js. Ignored in browsers.
++	 *
++	 * Default: same as indexURL
++	 */
++	packageCacheDir?: string;
+ 	/**
+ 	 * file. You can produce custom lock files with :py:func:`micropip.freeze`.
+ 	 * Default: ```${indexURL}/repodata.json```
\ No newline at end of file
diff --git a/patches/typedi@0.10.0.patch b/patches/typedi@0.10.0.patch
index 38f3b73e28c34..d9b4ab659ca8b 100644
--- a/patches/typedi@0.10.0.patch
+++ b/patches/typedi@0.10.0.patch
@@ -1,12 +1,14 @@
 diff --git a/cjs/container-instance.class.js b/cjs/container-instance.class.js
-index e473b1e652aa0b6e7462f7ba93fcef2812483b20..1e2ac7e5cb7943f5226a2bc25fa83bee0470f90c 100644
+index e473b1e652aa0b6e7462f7ba93fcef2812483b20..9e57857e5584373b88a9fad3fbb37bbcc56b554a 100644
 --- a/cjs/container-instance.class.js
 +++ b/cjs/container-instance.class.js
-@@ -234,6 +234,7 @@ class ContainerInstance {
+@@ -234,6 +234,9 @@ class ContainerInstance {
       */
      initializeParams(target, paramTypes) {
          return paramTypes.map((paramType, index) => {
-+            if (paramType === undefined) throw new ReferenceError('Cannot inject an `undefined` dependency. Possibly a circular dependency detected');
++            if (paramType === undefined) {
++                throw new ReferenceError(`Circular dependency: Target${target.name}. Index: ${index} `);
++            }
              const paramHandler = container_class_1.Container.handlers.find(handler => {
                  /**
-                  * @Inject()-ed values are stored as parameter handlers and they reference their target
\ No newline at end of file
+                  * @Inject()-ed values are stored as parameter handlers and they reference their target
diff --git a/patches/vite-plugin-checker@0.6.4.patch b/patches/vite-plugin-checker@0.6.4.patch
new file mode 100644
index 0000000000000..32f00fd32df62
--- /dev/null
+++ b/patches/vite-plugin-checker@0.6.4.patch
@@ -0,0 +1,13 @@
+diff --git a/dist/esm/checkers/vueTsc/prepareVueTsc.js b/dist/esm/checkers/vueTsc/prepareVueTsc.js
+index 94334b8862feddf28cf32cad5a67112eb3a58cec..f5693c9b8ec1b74e54cb18c9ba72bac3b761d231 100644
+--- a/dist/esm/checkers/vueTsc/prepareVueTsc.js
++++ b/dist/esm/checkers/vueTsc/prepareVueTsc.js
+@@ -8,7 +8,7 @@ const { copy, mkdir } = fsExtra;
+ const _require = createRequire(import.meta.url);
+ const _filename = fileURLToPath(import.meta.url);
+ const _dirname = dirname(_filename);
+-const proxyApiPath = _require.resolve("vue-tsc/out/index");
++const proxyApiPath = _require.resolve("vue-tsc/index");
+ async function prepareVueTsc() {
+   const targetTsDir = path.resolve(_dirname, "typescript-vue-tsc");
+   const vueTscFlagFile = path.resolve(targetTsDir, "vue-tsc-resolve-path");
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 2f406e2b3c5cb..d9693b2d3ebbc 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1,50 +1,107 @@
 lockfileVersion: '6.0'
 
+settings:
+  autoInstallPeers: true
+  excludeLinksFromLockfile: false
+
 onlyBuiltDependencies:
   - sqlite3
-  - vue-demi
 
 overrides:
-  '@types/node': ^16.18.12
-  browserslist: ^4.21.4
+  '@types/node': ^18.16.16
+  axios: 1.6.7
   chokidar: 3.5.2
-  decode-uri-component: 0.2.2
-  ejs: ^3.1.8
-  fork-ts-checker-webpack-plugin: ^6.0.4
-  http-cache-semantics: 4.1.1
-  jsonwebtoken: 9.0.0
-  prettier: ^2.8.3
-  tslib: ^2.5.0
-  ts-node: ^10.9.1
-  typescript: ^5.0.3
-  xml2js: ^0.5.0
-  cpy@8>globby: ^11.1.0
-  qqjs>globby: ^11.1.0
+  formidable: 3.5.1
+  prettier: ^3.2.5
+  semver: ^7.5.4
+  tslib: ^2.6.2
+  tsconfig-paths: ^4.2.0
+  typescript: ^5.4.2
 
 patchedDependencies:
   '@sentry/cli@2.17.0':
     hash: nchnoezkq6p37qaiku3vrpwraq
     path: patches/@sentry__cli@2.17.0.patch
-  '@typescript-eslint/eslint-plugin@5.59.0':
-    hash: tk3n6hvmqwfzrfqe3awfxnqtuy
-    path: patches/@typescript-eslint__eslint-plugin@5.59.0.patch
-  element-ui@2.15.12:
-    hash: prckukfdop5sl2her6de25cod4
-    path: patches/element-ui@2.15.12.patch
+  '@types/express-serve-static-core@4.17.43':
+    hash: 5orrj4qleu2iko5t27vl44u4we
+    path: patches/@types__express-serve-static-core@4.17.43.patch
+  '@types/ws@8.5.4':
+    hash: nbzuqaoyqbrfwipijj5qriqqju
+    path: patches/@types__ws@8.5.4.patch
+  pkce-challenge@3.0.0:
+    hash: dypouzb3lve7vncq25i5fuanki
+    path: patches/pkce-challenge@3.0.0.patch
+  pyodide@0.23.4:
+    hash: kzcwsjcayy5m6iezu7r4tdimjq
+    path: patches/pyodide@0.23.4.patch
   typedi@0.10.0:
-    hash: syy565ld7euwcedfbmx53j2qc4
+    hash: sk6omkefrosihg7lmqbzh7vfxe
     path: patches/typedi@0.10.0.patch
+  vite-plugin-checker@0.6.4:
+    hash: emhml6hz55p6dz7xjncbjppjdm
+    path: patches/vite-plugin-checker@0.6.4.patch
 
 importers:
 
   .:
     dependencies:
+      '@deep-consulting-solutions/incident-handling':
+        specifier: ^0.0.37
+        version: 0.0.37
+      '@types/lodash.set':
+        specifier: ^4.3.9
+        version: 4.3.9
+      '@types/lodash.sortby':
+        specifier: ^4.7.9
+        version: 4.7.9
+      '@types/openapi-to-postmanv2':
+        specifier: ^3.2.4
+        version: 3.2.4
+      '@types/postman-collection':
+        specifier: ^3.5.10
+        version: 3.5.10
+      '@types/qrcode':
+        specifier: ^1.5.0
+        version: 1.5.5
+      '@types/request':
+        specifier: ^2.48.12
+        version: 2.48.12
+      '@types/request-promise-native':
+        specifier: ^1.0.21
+        version: 1.0.21
+      '@types/speakeasy':
+        specifier: ^2.0.7
+        version: 2.0.10
       '@types/strftime':
         specifier: ^0.9.8
         version: 0.9.8
+      lodash.set:
+        specifier: ^4.3.2
+        version: 4.3.2
+      lodash.sortby:
+        specifier: ^4.7.0
+        version: 4.7.0
       n8n:
         specifier: workspace:*
         version: link:packages/cli
+      openapi-to-postmanv2:
+        specifier: ^4.20.1
+        version: 4.20.1
+      postman-collection:
+        specifier: ^4.4.0
+        version: 4.4.0
+      qrcode:
+        specifier: ^1.5.3
+        version: 1.5.3
+      request:
+        specifier: ^2.88.2
+        version: 2.88.2
+      request-promise-native:
+        specifier: ^1.0.9
+        version: 1.0.9(request@2.88.2)
+      speakeasy:
+        specifier: ^2.0.0
+        version: 2.0.0
       strftime:
         specifier: ^0.10.2
         version: 0.10.2
@@ -53,296 +110,598 @@ importers:
         specifier: workspace:*
         version: link:packages/@n8n_io/eslint-config
       '@ngneat/falso':
-        specifier: ^6.1.0
-        version: 6.1.0
+        specifier: ^6.4.0
+        version: 6.4.0
       '@types/jest':
-        specifier: ^29.5.0
-        version: 29.5.0
+        specifier: ^29.5.3
+        version: 29.5.3
       '@types/supertest':
-        specifier: ^2.0.12
-        version: 2.0.12
+        specifier: ^6.0.2
+        version: 6.0.2
+      '@vitest/coverage-v8':
+        specifier: ^1.2.1
+        version: 1.2.1(vitest@1.3.1)
       cross-env:
         specifier: ^7.0.3
         version: 7.0.3
       cypress:
-        specifier: ^12.8.1
-        version: 12.8.1
+        specifier: ^13.6.2
+        version: 13.6.2
+      cypress-otp:
+        specifier: ^1.0.3
+        version: 1.0.3
       cypress-real-events:
-        specifier: ^1.7.6
-        version: 1.7.6(cypress@12.8.1)
+        specifier: ^1.11.0
+        version: 1.11.0(cypress@13.6.2)
       jest:
-        specifier: ^29.5.0
-        version: 29.5.0
+        specifier: ^29.6.2
+        version: 29.6.2
       jest-environment-jsdom:
-        specifier: ^29.5.0
-        version: 29.5.0
+        specifier: ^29.6.2
+        version: 29.6.2
+      jest-expect-message:
+        specifier: ^1.1.3
+        version: 1.1.3
       jest-mock:
-        specifier: ^29.5.0
-        version: 29.5.0
+        specifier: ^29.6.2
+        version: 29.6.2
       jest-mock-extended:
         specifier: ^3.0.4
-        version: 3.0.4(jest@29.5.0)(typescript@5.0.3)
+        version: 3.0.4(jest@29.6.2)(typescript@5.4.2)
       nock:
-        specifier: ^13.2.9
-        version: 13.2.9
-      node-fetch:
-        specifier: ^2.6.7
-        version: 2.6.7
+        specifier: ^13.3.2
+        version: 13.3.2
+      nodemon:
+        specifier: ^3.0.1
+        version: 3.0.1
       p-limit:
         specifier: ^3.1.0
         version: 3.1.0
-      prettier:
-        specifier: ^2.8.3
-        version: 2.8.3
       rimraf:
-        specifier: ^3.0.2
-        version: 3.0.2
+        specifier: ^5.0.1
+        version: 5.0.1
       run-script-os:
         specifier: ^1.0.7
         version: 1.1.6
       start-server-and-test:
-        specifier: ^1.14.0
-        version: 1.14.0
+        specifier: ^2.0.3
+        version: 2.0.3
       supertest:
-        specifier: ^6.3.3
-        version: 6.3.3
+        specifier: ^6.3.4
+        version: 6.3.4
       ts-jest:
-        specifier: ^29.1.0
-        version: 29.1.0(@babel/core@7.21.5)(jest@29.5.0)(typescript@5.0.3)
+        specifier: ^29.1.1
+        version: 29.1.1(@babel/core@7.24.0)(jest@29.6.2)(typescript@5.4.2)
+      tsc-alias:
+        specifier: ^1.8.7
+        version: 1.8.7
       tsc-watch:
-        specifier: ^6.0.0
-        version: 6.0.0(typescript@5.0.3)
+        specifier: ^6.0.4
+        version: 6.0.4(typescript@5.4.2)
       turbo:
-        specifier: 1.8.8
-        version: 1.8.8
+        specifier: 1.13.3
+        version: 1.13.3
       typescript:
-        specifier: ^5.0.3
-        version: 5.0.3
+        specifier: ^5.4.2
+        version: 5.4.2
+      vite:
+        specifier: ^5.1.6
+        version: 5.1.6(sass@1.64.1)
+      vite-plugin-checker:
+        specifier: ^0.6.4
+        version: 0.6.4(patch_hash=emhml6hz55p6dz7xjncbjppjdm)(typescript@5.4.2)(vite@5.1.6)(vue-tsc@2.0.6)
+      vitest:
+        specifier: ^1.3.1
+        version: 1.3.1
+      vue-tsc:
+        specifier: ^2.0.6
+        version: 2.0.6(typescript@5.4.2)
+
+  packages/@n8n/chat:
+    dependencies:
+      highlight.js:
+        specifier: ^11.8.0
+        version: 11.9.0
+      markdown-it-link-attributes:
+        specifier: ^4.0.1
+        version: 4.0.1
+      uuid:
+        specifier: ^8.3.2
+        version: 8.3.2
+      vue:
+        specifier: ^3.4.21
+        version: 3.4.21(typescript@5.4.2)
+      vue-markdown-render:
+        specifier: ^2.1.1
+        version: 2.1.1(vue@3.4.21)
+    devDependencies:
+      '@iconify-json/mdi':
+        specifier: ^1.1.54
+        version: 1.1.63
+      '@n8n/storybook':
+        specifier: workspace:*
+        version: link:../storybook
+      '@types/markdown-it':
+        specifier: ^12.2.3
+        version: 12.2.3
+      shelljs:
+        specifier: ^0.8.5
+        version: 0.8.5
+      unbuild:
+        specifier: ^2.0.0
+        version: 2.0.0(typescript@5.4.2)
+      unplugin-icons:
+        specifier: ^0.17.0
+        version: 0.17.4
+      vite-plugin-dts:
+        specifier: ^3.7.3
+        version: 3.7.3(rollup@3.29.4)(typescript@5.4.2)(vite@5.1.6)
+
+  packages/@n8n/client-oauth2:
+    dependencies:
+      axios:
+        specifier: 1.6.7
+        version: 1.6.7(debug@3.2.7)
+
+  packages/@n8n/imap:
+    dependencies:
+      iconv-lite:
+        specifier: 0.6.3
+        version: 0.6.3
+      imap:
+        specifier: 0.8.19
+        version: 0.8.19
+      quoted-printable:
+        specifier: 1.0.1
+        version: 1.0.1
+      utf8:
+        specifier: 3.0.0
+        version: 3.0.0
+      uuencode:
+        specifier: 0.0.4
+        version: 0.0.4
+    devDependencies:
+      '@types/imap':
+        specifier: ^0.8.40
+        version: 0.8.40
+      '@types/quoted-printable':
+        specifier: ^1.0.2
+        version: 1.0.2
+      '@types/utf8':
+        specifier: ^3.0.3
+        version: 3.0.3
+      '@types/uuencode':
+        specifier: ^0.0.3
+        version: 0.0.3
+
+  packages/@n8n/nodes-langchain:
+    dependencies:
+      '@aws-sdk/client-bedrock-runtime':
+        specifier: 3.549.0
+        version: 3.549.0
+      '@aws-sdk/credential-provider-node':
+        specifier: 3.549.0
+        version: 3.549.0
+      '@getzep/zep-js':
+        specifier: 0.9.0
+        version: 0.9.0
+      '@google-ai/generativelanguage':
+        specifier: 0.2.1
+        version: 0.2.1
+      '@google/generative-ai':
+        specifier: 0.8.0
+        version: 0.8.0
+      '@huggingface/inference':
+        specifier: 2.6.4
+        version: 2.6.4
+      '@langchain/anthropic':
+        specifier: ^0.1.16
+        version: 0.1.16
+      '@langchain/cohere':
+        specifier: ^0.0.8
+        version: 0.0.8
+      '@langchain/community':
+        specifier: 0.0.53
+        version: 0.0.53(@aws-sdk/client-bedrock-runtime@3.549.0)(@aws-sdk/credential-provider-node@3.549.0)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@0.2.1)(@huggingface/inference@2.6.4)(@pinecone-database/pinecone@2.2.0)(@qdrant/js-client-rest@1.7.0)(@supabase/supabase-js@2.38.5)(@xata.io/client@0.28.0)(cohere-ai@6.2.2)(html-to-text@9.0.5)(lodash@4.17.21)(pg@8.11.3)(redis@4.6.12)
+      '@langchain/core':
+        specifier: 0.1.61
+        version: 0.1.61
+      '@langchain/google-genai':
+        specifier: ^0.0.12
+        version: 0.0.12
+      '@langchain/groq':
+        specifier: ^0.0.8
+        version: 0.0.8
+      '@langchain/mistralai':
+        specifier: 0.0.19
+        version: 0.0.19
+      '@langchain/openai':
+        specifier: ^0.0.28
+        version: 0.0.28
+      '@langchain/pinecone':
+        specifier: ^0.0.4
+        version: 0.0.4
+      '@langchain/redis':
+        specifier: ^0.0.2
+        version: 0.0.2
+      '@n8n/typeorm':
+        specifier: 0.3.20-9
+        version: 0.3.20-9(pg@8.11.3)(redis@4.6.12)(sqlite3@5.1.7)
+      '@n8n/vm2':
+        specifier: 3.9.20
+        version: 3.9.20
+      '@pinecone-database/pinecone':
+        specifier: 2.2.0
+        version: 2.2.0
+      '@qdrant/js-client-rest':
+        specifier: 1.7.0
+        version: 1.7.0(typescript@5.4.2)
+      '@supabase/supabase-js':
+        specifier: 2.38.5
+        version: 2.38.5
+      '@xata.io/client':
+        specifier: 0.28.0
+        version: 0.28.0(typescript@5.4.2)
+      basic-auth:
+        specifier: 2.0.1
+        version: 2.0.1
+      cohere-ai:
+        specifier: 6.2.2
+        version: 6.2.2
+      d3-dsv:
+        specifier: 2.0.0
+        version: 2.0.0
+      epub2:
+        specifier: 3.0.2
+        version: 3.0.2(ts-toolbelt@9.6.0)
+      form-data:
+        specifier: 4.0.0
+        version: 4.0.0
+      html-to-text:
+        specifier: 9.0.5
+        version: 9.0.5
+      jest-mock-extended:
+        specifier: ^3.0.4
+        version: 3.0.4(jest@29.6.2)(typescript@5.4.2)
+      json-schema-to-zod:
+        specifier: 2.0.14
+        version: 2.0.14
+      langchain:
+        specifier: 0.1.36
+        version: 0.1.36(@aws-sdk/client-bedrock-runtime@3.549.0)(@aws-sdk/credential-provider-node@3.549.0)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@0.2.1)(@huggingface/inference@2.6.4)(@pinecone-database/pinecone@2.2.0)(@qdrant/js-client-rest@1.7.0)(@supabase/supabase-js@2.38.5)(@xata.io/client@0.28.0)(cohere-ai@6.2.2)(d3-dsv@2.0.0)(epub2@3.0.2)(html-to-text@9.0.5)(lodash@4.17.21)(mammoth@1.6.0)(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)
+      lodash:
+        specifier: 4.17.21
+        version: 4.17.21
+      mammoth:
+        specifier: 1.6.0
+        version: 1.6.0
+      n8n-nodes-base:
+        specifier: workspace:*
+        version: link:../../nodes-base
+      n8n-workflow:
+        specifier: workspace:*
+        version: link:../../workflow
+      openai:
+        specifier: 4.38.5
+        version: 4.38.5
+      pdf-parse:
+        specifier: 1.1.1
+        version: 1.1.1
+      pg:
+        specifier: 8.11.3
+        version: 8.11.3
+      redis:
+        specifier: 4.6.12
+        version: 4.6.12
+      sqlite3:
+        specifier: 5.1.7
+        version: 5.1.7
+      temp:
+        specifier: 0.9.4
+        version: 0.9.4
+      tmp-promise:
+        specifier: 3.0.3
+        version: 3.0.3
+      zod:
+        specifier: 3.22.4
+        version: 3.22.4
+      zod-to-json-schema:
+        specifier: 3.22.4
+        version: 3.22.4(zod@3.22.4)
+    devDependencies:
+      '@aws-sdk/types':
+        specifier: 3.357.0
+        version: 3.357.0
+      '@types/basic-auth':
+        specifier: ^1.1.3
+        version: 1.1.3
+      '@types/express':
+        specifier: ^4.17.21
+        version: 4.17.21
+      '@types/html-to-text':
+        specifier: ^9.0.1
+        version: 9.0.4
+      '@types/json-schema':
+        specifier: ^7.0.15
+        version: 7.0.15
+      '@types/temp':
+        specifier: ^0.9.1
+        version: 0.9.4
+      eslint-plugin-n8n-nodes-base:
+        specifier: ^1.16.0
+        version: 1.16.0(eslint@8.57.0)(typescript@5.4.2)
+      n8n-core:
+        specifier: workspace:*
+        version: link:../../core
+
+  packages/@n8n/permissions: {}
+
+  packages/@n8n/storybook:
+    devDependencies:
+      '@chromatic-com/storybook':
+        specifier: ^1.2.18
+        version: 1.2.18(react@18.2.0)
+      '@storybook/addon-a11y':
+        specifier: ^8.0.0
+        version: 8.0.0
+      '@storybook/addon-actions':
+        specifier: ^8.0.0
+        version: 8.0.0
+      '@storybook/addon-docs':
+        specifier: ^8.0.0
+        version: 8.0.0
+      '@storybook/addon-essentials':
+        specifier: ^8.0.0
+        version: 8.0.0(@types/react@18.0.27)(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/addon-interactions':
+        specifier: ^8.0.0
+        version: 8.0.0
+      '@storybook/addon-links':
+        specifier: ^8.0.0
+        version: 8.0.0(react@18.2.0)
+      '@storybook/blocks':
+        specifier: ^8.0.0
+        version: 8.0.0(@types/react@18.0.27)(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/test':
+        specifier: ^8.0.0
+        version: 8.0.0(@types/jest@29.5.3)(jest@29.6.2)(vitest@1.3.1)
+      '@storybook/vue3':
+        specifier: ^8.0.0
+        version: 8.0.0(vue@3.4.21)
+      '@storybook/vue3-vite':
+        specifier: ^8.0.0
+        version: 8.0.0(react-dom@18.2.0)(react@18.2.0)(vite@5.1.6)(vue@3.4.21)
+      chromatic:
+        specifier: ^11.0.8
+        version: 11.0.8
+      storybook:
+        specifier: ^8.0.0
+        version: 8.0.0(react-dom@18.2.0)(react@18.2.0)
 
   packages/@n8n_io/eslint-config:
     devDependencies:
       '@types/eslint':
-        specifier: ~8.37
-        version: 8.37.0
+        specifier: ^8.56.5
+        version: 8.56.5
       '@typescript-eslint/eslint-plugin':
-        specifier: ~5.59
-        version: 5.59.0(patch_hash=tk3n6hvmqwfzrfqe3awfxnqtuy)(@typescript-eslint/parser@5.59.0)(eslint@8.39.0)(typescript@5.0.3)
+        specifier: ^7.2.0
+        version: 7.2.0(@typescript-eslint/parser@7.2.0)(eslint@8.57.0)(typescript@5.4.2)
       '@typescript-eslint/parser':
-        specifier: ~5.59
-        version: 5.59.0(eslint@8.39.0)(typescript@5.0.3)
+        specifier: ^7.2.0
+        version: 7.2.0(eslint@8.57.0)(typescript@5.4.2)
+      '@vue/eslint-config-prettier':
+        specifier: ^9.0.0
+        version: 9.0.0(@types/eslint@8.56.5)(eslint@8.57.0)(prettier@3.2.5)
       '@vue/eslint-config-typescript':
-        specifier: ~8.0
-        version: 8.0.0(@typescript-eslint/eslint-plugin@5.59.0)(@typescript-eslint/parser@5.59.0)(eslint-plugin-vue@7.17.0)(eslint@8.39.0)(typescript@5.0.3)
+        specifier: ^13.0.0
+        version: 13.0.0(eslint-plugin-vue@9.23.0)(eslint@8.57.0)(typescript@5.4.2)
       eslint:
-        specifier: ~8.39
-        version: 8.39.0
+        specifier: ^8.57.0
+        version: 8.57.0
       eslint-config-airbnb-typescript:
-        specifier: ~17.0
-        version: 17.0.0(@typescript-eslint/eslint-plugin@5.59.0)(@typescript-eslint/parser@5.59.0)(eslint-plugin-import@2.27.5)(eslint@8.39.0)
+        specifier: ^18.0.0
+        version: 18.0.0(@typescript-eslint/eslint-plugin@7.2.0)(@typescript-eslint/parser@7.2.0)(eslint-plugin-import@2.29.1)(eslint@8.57.0)
       eslint-config-prettier:
-        specifier: ~8.8
-        version: 8.8.0(eslint@8.39.0)
+        specifier: ^9.1.0
+        version: 9.1.0(eslint@8.57.0)
       eslint-import-resolver-typescript:
-        specifier: ~3.5
-        version: 3.5.5(@typescript-eslint/parser@5.59.0)(eslint-plugin-import@2.27.5)(eslint@8.39.0)
-      eslint-plugin-diff:
-        specifier: ~2.0
-        version: 2.0.1(eslint@8.39.0)
+        specifier: ^3.6.1
+        version: 3.6.1(@typescript-eslint/parser@7.2.0)(eslint-plugin-import@2.29.1)(eslint@8.57.0)
       eslint-plugin-import:
-        specifier: ~2.27
-        version: 2.27.5(@typescript-eslint/parser@5.59.0)(eslint-import-resolver-typescript@3.5.5)(eslint@8.39.0)
+        specifier: ^2.29.1
+        version: 2.29.1(@typescript-eslint/parser@7.2.0)(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0)
+      eslint-plugin-lodash:
+        specifier: ^7.4.0
+        version: 7.4.0(eslint@8.57.0)
       eslint-plugin-n8n-local-rules:
-        specifier: ~1.0
+        specifier: ^1.0.0
         version: 1.0.0
       eslint-plugin-prettier:
-        specifier: ~4.2
-        version: 4.2.1(eslint-config-prettier@8.8.0)(eslint@8.39.0)(prettier@2.8.3)
+        specifier: ^5.1.3
+        version: 5.1.3(@types/eslint@8.56.5)(eslint-config-prettier@9.1.0)(eslint@8.57.0)(prettier@3.2.5)
       eslint-plugin-unicorn:
-        specifier: ~46.0
-        version: 46.0.0(eslint@8.39.0)
+        specifier: ^51.0.1
+        version: 51.0.1(eslint@8.57.0)
+      eslint-plugin-unused-imports:
+        specifier: ^3.1.0
+        version: 3.1.0(@typescript-eslint/eslint-plugin@7.2.0)(eslint@8.57.0)
       eslint-plugin-vue:
-        specifier: ~7.17
-        version: 7.17.0(eslint@8.39.0)
+        specifier: ^9.23.0
+        version: 9.23.0(eslint@8.57.0)
+      vue-eslint-parser:
+        specifier: ^9.4.2
+        version: 9.4.2(eslint@8.57.0)
 
   packages/cli:
     dependencies:
-      '@deep-consulting-solutions/incident-handling':
-        specifier: ^0.0.25
-        version: 0.0.25(mysql2@2.3.3)(sqlite3@5.1.6)
+      '@langchain/community':
+        specifier: 0.0.53
+        version: 0.0.53(@pinecone-database/pinecone@2.1.0)(ioredis@5.3.2)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mysql2@3.9.7)(pg@8.11.3)(ws@8.14.2)
+      '@langchain/core':
+        specifier: 0.1.61
+        version: 0.1.61
+      '@langchain/openai':
+        specifier: 0.0.28
+        version: 0.0.28
+      '@langchain/pinecone':
+        specifier: ^0.0.3
+        version: 0.0.3
+      '@n8n/client-oauth2':
+        specifier: workspace:*
+        version: link:../@n8n/client-oauth2
+      '@n8n/localtunnel':
+        specifier: 2.1.0
+        version: 2.1.0
+      '@n8n/n8n-nodes-langchain':
+        specifier: workspace:*
+        version: link:../@n8n/nodes-langchain
+      '@n8n/permissions':
+        specifier: workspace:*
+        version: link:../@n8n/permissions
+      '@n8n/typeorm':
+        specifier: 0.3.20-9
+        version: 0.3.20-9(@sentry/node@7.87.0)(ioredis@5.3.2)(mysql2@3.9.7)(pg@8.11.3)(sqlite3@5.1.7)
       '@n8n_io/license-sdk':
-        specifier: ~2.3.0
-        version: 2.3.0
-      '@oclif/command':
-        specifier: ^1.8.16
-        version: 1.8.18(@oclif/config@1.18.5)(supports-color@8.1.1)
+        specifier: 2.10.0
+        version: 2.10.0
       '@oclif/core':
-        specifier: ^1.16.4
-        version: 1.16.6
-      '@oclif/errors':
-        specifier: ^1.3.6
-        version: 1.3.6
+        specifier: 3.18.1
+        version: 3.18.1
+      '@pinecone-database/pinecone':
+        specifier: 2.1.0
+        version: 2.1.0
       '@rudderstack/rudder-sdk-node':
-        specifier: 1.0.6
-        version: 1.0.6
+        specifier: 2.0.7
+        version: 2.0.7(tslib@2.6.2)
       '@sentry/integrations':
-        specifier: ^7.28.1
-        version: 7.28.1
+        specifier: 7.87.0
+        version: 7.87.0
       '@sentry/node':
-        specifier: ^7.28.1
-        version: 7.28.1
+        specifier: 7.87.0
+        version: 7.87.0
+      aws4:
+        specifier: 1.11.0
+        version: 1.11.0
       axios:
-        specifier: ^0.21.1
-        version: 0.21.4(debug@4.3.2)
+        specifier: 1.6.7
+        version: 1.6.7(debug@3.2.7)
       basic-auth:
-        specifier: ^2.0.1
+        specifier: 2.0.1
         version: 2.0.1
       bcryptjs:
-        specifier: ^2.4.3
+        specifier: 2.4.3
         version: 2.4.3
-      body-parser:
-        specifier: ^1.20.1
-        version: 1.20.1
-      body-parser-xml:
-        specifier: ^2.0.3
-        version: 2.0.3
       bull:
-        specifier: ^4.10.2
-        version: 4.10.2
+        specifier: 4.12.1
+        version: 4.12.1
+      cache-manager:
+        specifier: 5.2.3
+        version: 5.2.3
       callsites:
-        specifier: ^3.1.0
+        specifier: 3.1.0
         version: 3.1.0
       change-case:
-        specifier: ^4.1.1
+        specifier: 4.1.2
         version: 4.1.2
       class-transformer:
-        specifier: ^0.5.1
+        specifier: 0.5.1
         version: 0.5.1
       class-validator:
-        specifier: ^0.14.0
+        specifier: 0.14.0
         version: 0.14.0
-      client-oauth2:
-        specifier: ^4.2.5
-        version: 4.3.3
       compression:
-        specifier: ^1.7.4
+        specifier: 1.7.4
         version: 1.7.4
-      connect-history-api-fallback:
-        specifier: ^1.6.0
-        version: 1.6.0
       convict:
-        specifier: ^6.2.4
+        specifier: 6.2.4
         version: 6.2.4
       cookie-parser:
-        specifier: ^1.4.6
+        specifier: 1.4.6
         version: 1.4.6
-      crypto-js:
-        specifier: ~4.1.1
-        version: 4.1.1
       csrf:
-        specifier: ^3.1.0
+        specifier: 3.1.0
         version: 3.1.0
       curlconverter:
-        specifier: ^3.0.0
+        specifier: 3.21.0
         version: 3.21.0(chokidar@3.5.2)
       dotenv:
-        specifier: ^8.0.0
+        specifier: 8.6.0
         version: 8.6.0
       express:
-        specifier: ^4.18.2
-        version: 4.18.2
+        specifier: 4.19.2
+        version: 4.19.2
       express-async-errors:
-        specifier: ^3.1.1
-        version: 3.1.1(express@4.18.2)
+        specifier: 3.1.1
+        version: 3.1.1(express@4.19.2)
       express-handlebars:
-        specifier: ^7.0.2
-        version: 7.0.2
+        specifier: 7.1.2
+        version: 7.1.2
       express-openapi-validator:
-        specifier: ^4.13.6
-        version: 4.13.8
+        specifier: 5.1.6
+        version: 5.1.6
       express-prom-bundle:
-        specifier: ^6.6.0
+        specifier: 6.6.0
         version: 6.6.0(prom-client@13.2.0)
+      express-rate-limit:
+        specifier: 7.2.0
+        version: 7.2.0(express@4.19.2)
       fast-glob:
-        specifier: ^3.2.5
+        specifier: 3.2.12
         version: 3.2.12
       flatted:
-        specifier: ^3.2.4
+        specifier: 3.2.7
         version: 3.2.7
+      formidable:
+        specifier: 3.5.1
+        version: 3.5.1
+      fuse.js:
+        specifier: ^7.0.0
+        version: 7.0.0
       google-timezones-json:
-        specifier: ^1.1.0
+        specifier: 1.1.0
         version: 1.1.0
       handlebars:
-        specifier: 4.7.7
-        version: 4.7.7
+        specifier: 4.7.8
+        version: 4.7.8
+      helmet:
+        specifier: 7.1.0
+        version: 7.1.0
+      infisical-node:
+        specifier: 1.3.0
+        version: 1.3.0
       inquirer:
-        specifier: ^7.0.1
+        specifier: 7.3.3
         version: 7.3.3
       ioredis:
-        specifier: ^5.2.4
-        version: 5.2.4
+        specifier: 5.3.2
+        version: 5.3.2
+      isbot:
+        specifier: 3.6.13
+        version: 3.6.13
       json-diff:
-        specifier: ^0.5.4
-        version: 0.5.5
+        specifier: 1.0.6
+        version: 1.0.6
       jsonschema:
-        specifier: ^1.4.1
+        specifier: 1.4.1
         version: 1.4.1
       jsonwebtoken:
-        specifier: 9.0.0
-        version: 9.0.0
-      jwks-rsa:
-        specifier: ^3.0.1
-        version: 3.0.1
+        specifier: 9.0.2
+        version: 9.0.2
+      langchain:
+        specifier: 0.1.36
+        version: 0.1.36(@pinecone-database/pinecone@2.1.0)(axios@1.6.7)(handlebars@4.7.8)(ioredis@5.3.2)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mysql2@3.9.7)(pg@8.11.3)(ws@8.14.2)
       ldapts:
-        specifier: ^4.2.2
-        version: 4.2.2
-      localtunnel:
-        specifier: ^2.0.0
-        version: 2.0.2
-      lodash.get:
-        specifier: ^4.4.2
-        version: 4.4.2
-      lodash.intersection:
-        specifier: ^4.4.0
-        version: 4.4.0
-      lodash.iteratee:
-        specifier: ^4.7.0
-        version: 4.7.0
-      lodash.merge:
-        specifier: ^4.6.2
-        version: 4.6.2
-      lodash.omit:
-        specifier: ^4.5.0
-        version: 4.5.0
-      lodash.pick:
-        specifier: ^4.4.0
-        version: 4.4.0
-      lodash.remove:
-        specifier: ^4.7.0
-        version: 4.7.0
-      lodash.set:
-        specifier: ^4.3.2
-        version: 4.3.2
-      lodash.split:
-        specifier: ^4.4.2
-        version: 4.4.2
-      lodash.unionby:
-        specifier: ^4.8.0
-        version: 4.8.0
-      lodash.uniq:
-        specifier: ^4.5.0
-        version: 4.5.0
-      lodash.uniqby:
-        specifier: ^4.7.0
-        version: 4.7.0
-      lodash.unset:
-        specifier: ^4.5.2
-        version: 4.5.2
+        specifier: 4.2.6
+        version: 4.2.6
+      lodash:
+        specifier: 4.17.21
+        version: 4.17.21
       luxon:
-        specifier: ^3.3.0
+        specifier: 3.3.0
         version: 3.3.0
       mysql2:
-        specifier: ~2.3.3
-        version: 2.3.3
+        specifier: 3.9.7
+        version: 3.9.7
       n8n-core:
         specifier: workspace:*
         version: link:../core
@@ -355,136 +714,133 @@ importers:
       n8n-workflow:
         specifier: workspace:*
         version: link:../workflow
+      nanoid:
+        specifier: 3.3.6
+        version: 3.3.6
       nodemailer:
-        specifier: ^6.7.1
-        version: 6.8.0
+        specifier: 6.9.9
+        version: 6.9.9
       oauth-1.0a:
-        specifier: ^2.2.6
+        specifier: 2.2.6
         version: 2.2.6
       open:
-        specifier: ^7.0.0
+        specifier: 7.4.2
         version: 7.4.2
-      openapi-to-postmanv2:
-        specifier: ^4.12.0
-        version: 4.12.0
       openapi-types:
-        specifier: ^10.0.0
+        specifier: 10.0.0
         version: 10.0.0
+      otpauth:
+        specifier: 9.1.1
+        version: 9.1.1
       p-cancelable:
-        specifier: ^2.0.0
+        specifier: 2.1.1
         version: 2.1.1
-      parseurl:
-        specifier: ^1.3.3
-        version: 1.3.3
-      passport:
-        specifier: ^0.6.0
-        version: 0.6.0
-      passport-cookie:
-        specifier: ^1.0.9
-        version: 1.0.9
-      passport-jwt:
-        specifier: ^4.0.0
-        version: 4.0.0
+      p-lazy:
+        specifier: 3.1.0
+        version: 3.1.0
       pg:
-        specifier: ^8.8.0
-        version: 8.8.0
+        specifier: 8.11.3
+        version: 8.11.3
       picocolors:
-        specifier: ^1.0.0
+        specifier: 1.0.0
         version: 1.0.0
+      pkce-challenge:
+        specifier: 3.0.0
+        version: 3.0.0(patch_hash=dypouzb3lve7vncq25i5fuanki)
       posthog-node:
-        specifier: ^2.2.2
-        version: 2.2.2
+        specifier: 3.2.1
+        version: 3.2.1
       prom-client:
-        specifier: ^13.1.0
+        specifier: 13.2.0
         version: 13.2.0
       psl:
-        specifier: ^1.8.0
+        specifier: 1.9.0
         version: 1.9.0
+      raw-body:
+        specifier: 2.5.1
+        version: 2.5.1
       reflect-metadata:
-        specifier: ^0.1.13
-        version: 0.1.13
+        specifier: 0.2.1
+        version: 0.2.1
       replacestream:
-        specifier: ^4.0.3
+        specifier: 4.0.3
         version: 4.0.3
       samlify:
-        specifier: ^2.8.9
+        specifier: 2.8.9
         version: 2.8.9
       semver:
-        specifier: ^7.3.8
-        version: 7.3.8
+        specifier: ^7.5.4
+        version: 7.6.0
       shelljs:
-        specifier: ^0.8.5
+        specifier: 0.8.5
         version: 0.8.5
+      simple-git:
+        specifier: 3.17.0
+        version: 3.17.0
       source-map-support:
-        specifier: ^0.5.21
+        specifier: 0.5.21
         version: 0.5.21
-      speakeasy:
-        specifier: ^2.0.0
-        version: 2.0.0
       sqlite3:
-        specifier: ^5.1.6
-        version: 5.1.6
+        specifier: 5.1.7
+        version: 5.1.7
       sse-channel:
-        specifier: ^4.0.0
+        specifier: 4.0.0
         version: 4.0.0
       sshpk:
-        specifier: ^1.17.0
+        specifier: 1.17.0
         version: 1.17.0
       swagger-ui-express:
-        specifier: ^4.3.0
-        version: 4.5.0(express@4.18.2)
+        specifier: 5.0.0
+        version: 5.0.0(express@4.19.2)
       syslog-client:
-        specifier: ^1.1.1
+        specifier: 1.1.1
         version: 1.1.1
       typedi:
-        specifier: ^0.10.0
-        version: 0.10.0(patch_hash=syy565ld7euwcedfbmx53j2qc4)
-      typeorm:
-        specifier: ^0.3.12
-        version: 0.3.12(ioredis@5.2.4)(mysql2@2.3.3)(pg@8.8.0)(sqlite3@5.1.6)(ts-node@10.9.1)
-      url-pattern:
-        specifier: ^1.0.3
-        version: 1.0.3
+        specifier: 0.10.0
+        version: 0.10.0(patch_hash=sk6omkefrosihg7lmqbzh7vfxe)
       uuid:
-        specifier: ^8.3.2
+        specifier: 8.3.2
         version: 8.3.2
       validator:
         specifier: 13.7.0
         version: 13.7.0
       winston:
-        specifier: ^3.3.3
+        specifier: 3.8.2
         version: 3.8.2
       ws:
-        specifier: ^8.12.0
-        version: 8.12.0
+        specifier: 8.14.2
+        version: 8.14.2
+      xml2js:
+        specifier: 0.6.2
+        version: 0.6.2
       xmllint-wasm:
-        specifier: ^3.0.1
+        specifier: 3.0.1
         version: 3.0.1
       yamljs:
-        specifier: ^0.3.0
+        specifier: 0.3.0
         version: 0.3.0
+      zod:
+        specifier: 3.22.4
+        version: 3.22.4
+      zod-to-json-schema:
+        specifier: 3.22.4
+        version: 3.22.4(zod@3.22.4)
     devDependencies:
-      '@apidevtools/swagger-cli':
-        specifier: 4.0.0
-        version: 4.0.0
-      '@oclif/dev-cli':
-        specifier: ^1.22.2
-        version: 1.26.10
+      '@redocly/cli':
+        specifier: ^1.6.0
+        version: 1.6.0
+      '@types/aws4':
+        specifier: ^1.5.1
+        version: 1.11.2
       '@types/basic-auth':
         specifier: ^1.1.3
         version: 1.1.3
       '@types/bcryptjs':
         specifier: ^2.4.2
         version: 2.4.2
-      '@types/body-parser-xml':
-        specifier: ^2.0.2
-        version: 2.0.2
       '@types/compression':
         specifier: 1.0.1
         version: 1.0.1
-      '@types/connect-history-api-fallback':
-        specifier: ^1.3.1
-        version: 1.3.5
       '@types/convict':
         specifier: ^6.1.1
         version: 6.1.1
@@ -492,95 +848,41 @@ importers:
         specifier: ^1.4.2
         version: 1.4.3
       '@types/express':
-        specifier: ^4.17.6
-        version: 4.17.14
+        specifier: ^4.17.21
+        version: 4.17.21
+      '@types/formidable':
+        specifier: ^3.4.5
+        version: 3.4.5
       '@types/json-diff':
-        specifier: ^0.5.1
-        version: 0.5.2
+        specifier: ^1.0.0
+        version: 1.0.0
       '@types/jsonwebtoken':
-        specifier: ^9.0.1
-        version: 9.0.1
-      '@types/localtunnel':
-        specifier: ^1.9.0
-        version: 1.9.0
-      '@types/lodash.debounce':
-        specifier: ^4.0.7
-        version: 4.0.7
-      '@types/lodash.get':
-        specifier: ^4.4.6
-        version: 4.4.7
-      '@types/lodash.intersection':
-        specifier: ^4.4.7
-        version: 4.4.7
-      '@types/lodash.iteratee':
-        specifier: ^4.7.7
-        version: 4.7.7
-      '@types/lodash.merge':
-        specifier: ^4.6.6
-        version: 4.6.7
-      '@types/lodash.omit':
-        specifier: ^4.5.7
-        version: 4.5.7
-      '@types/lodash.pick':
-        specifier: ^4.4.7
-        version: 4.4.7
-      '@types/lodash.remove':
-        specifier: ^4.7.7
-        version: 4.7.7
-      '@types/lodash.set':
-        specifier: ^4.3.6
-        version: 4.3.7
-      '@types/lodash.split':
-        specifier: ^4.4.7
-        version: 4.4.7
-      '@types/lodash.unionby':
-        specifier: ^4.8.7
-        version: 4.8.7
-      '@types/lodash.uniq':
-        specifier: ^4.5.7
-        version: 4.5.7
-      '@types/lodash.uniqby':
-        specifier: ^4.7.7
-        version: 4.7.7
-      '@types/lodash.unset':
-        specifier: ^4.5.7
-        version: 4.5.7
-      '@types/openapi-to-postmanv2':
-        specifier: ^3.2.0
-        version: 3.2.0
-      '@types/parseurl':
-        specifier: ^1.3.1
-        version: 1.3.1
-      '@types/passport-jwt':
-        specifier: ^3.0.6
-        version: 3.0.7
-      '@types/postman-collection':
-        specifier: ^3.5.7
-        version: 3.5.7
+        specifier: ^9.0.6
+        version: 9.0.6
+      '@types/lodash':
+        specifier: ^4.14.195
+        version: 4.14.195
       '@types/psl':
         specifier: ^1.1.0
         version: 1.1.0
       '@types/replacestream':
         specifier: ^4.0.1
         version: 4.0.1
-      '@types/send':
-        specifier: ^0.17.1
-        version: 0.17.1
       '@types/shelljs':
         specifier: ^0.8.11
         version: 0.8.11
       '@types/speakeasy':
         specifier: ^2.0.7
-        version: 2.0.7
+        version: 2.0.10
       '@types/sshpk':
         specifier: ^1.17.1
         version: 1.17.1
       '@types/superagent':
-        specifier: 4.1.13
-        version: 4.1.13
+        specifier: ^8.1.4
+        version: 8.1.4
       '@types/swagger-ui-express':
-        specifier: ^4.1.3
-        version: 4.1.3
+        specifier: ^4.1.6
+        version: 4.1.6
       '@types/syslog-client':
         specifier: ^1.1.2
         version: 1.1.2
@@ -592,7 +894,10 @@ importers:
         version: 13.7.7
       '@types/ws':
         specifier: ^8.5.4
-        version: 8.5.4
+        version: 8.5.4(patch_hash=nbzuqaoyqbrfwipijj5qriqqju)
+      '@types/xml2js':
+        specifier: ^0.4.14
+        version: 0.4.14
       '@types/yamljs':
         specifier: ^0.2.31
         version: 0.2.31
@@ -600,129 +905,120 @@ importers:
         specifier: 3.5.2
         version: 3.5.2
       concurrently:
-        specifier: ^5.1.0
-        version: 5.3.0
-      lodash.debounce:
-        specifier: ^4.0.8
-        version: 4.0.8
-      mock-jwks:
-        specifier: ^1.0.9
-        version: 1.0.9(nock@13.2.9)
-      nodemon:
-        specifier: ^2.0.2
-        version: 2.0.20
-      run-script-os:
-        specifier: ^1.0.7
-        version: 1.1.6
+        specifier: ^8.2.0
+        version: 8.2.0
+      ioredis-mock:
+        specifier: ^8.8.1
+        version: 8.8.1(@types/ioredis-mock@8.2.2)(ioredis@5.3.2)
       ts-essentials:
         specifier: ^7.0.3
-        version: 7.0.3(typescript@5.0.3)
-      ts-node:
-        specifier: ^10.9.1
-        version: 10.9.1(@types/node@16.18.12)(typescript@5.0.3)
-      tsc-alias:
-        specifier: ^1.8.2
-        version: 1.8.2
-      tsconfig-paths:
-        specifier: ^4.1.2
-        version: 4.1.2
+        version: 7.0.3(typescript@5.4.2)
 
   packages/core:
     dependencies:
+      '@n8n/client-oauth2':
+        specifier: workspace:*
+        version: link:../@n8n/client-oauth2
+      aws4:
+        specifier: 1.11.0
+        version: 1.11.0
       axios:
-        specifier: ^0.21.1
-        version: 0.21.4(debug@4.3.2)
-      client-oauth2:
-        specifier: ^4.2.5
-        version: 4.3.3
+        specifier: 1.6.7
+        version: 1.6.7(debug@3.2.7)
       concat-stream:
-        specifier: ^2.0.0
+        specifier: 2.0.0
         version: 2.0.0
       cron:
-        specifier: ~1.7.2
+        specifier: 1.7.2
         version: 1.7.2
-      crypto-js:
-        specifier: ~4.1.1
-        version: 4.1.1
       fast-glob:
-        specifier: ^3.2.5
+        specifier: 3.2.12
         version: 3.2.12
       file-type:
-        specifier: ^16.5.4
+        specifier: 16.5.4
         version: 16.5.4
-      flatted:
-        specifier: ^3.2.4
-        version: 3.2.7
       form-data:
-        specifier: ^4.0.0
+        specifier: 4.0.0
         version: 4.0.0
-      lodash.get:
-        specifier: ^4.4.2
-        version: 4.4.2
-      lodash.pick:
-        specifier: ^4.4.0
-        version: 4.4.0
+      lodash:
+        specifier: 4.17.21
+        version: 4.17.21
+      luxon:
+        specifier: ^3.4.4
+        version: 3.4.4
       mime-types:
-        specifier: ^2.1.27
+        specifier: 2.1.35
         version: 2.1.35
+      n8n-nodes-base:
+        specifier: workspace:*
+        version: link:../nodes-base
       n8n-workflow:
         specifier: workspace:*
         version: link:../workflow
       oauth-1.0a:
-        specifier: ^2.2.6
+        specifier: 2.2.6
         version: 2.2.6
       p-cancelable:
-        specifier: ^2.0.0
+        specifier: 2.1.1
         version: 2.1.1
       pretty-bytes:
-        specifier: ^5.6.0
+        specifier: 5.6.0
         version: 5.6.0
       qs:
-        specifier: ^6.10.1
+        specifier: 6.11.0
         version: 6.11.0
-      request:
-        specifier: ^2.88.2
-        version: 2.88.2
-      request-promise-native:
-        specifier: ^1.0.7
-        version: 1.0.9(request@2.88.2)
+      typedi:
+        specifier: 0.10.0
+        version: 0.10.0(patch_hash=sk6omkefrosihg7lmqbzh7vfxe)
       uuid:
-        specifier: ^8.3.2
+        specifier: 8.3.2
         version: 8.3.2
+      xml2js:
+        specifier: 0.6.2
+        version: 0.6.2
     devDependencies:
+      '@types/aws4':
+        specifier: ^1.5.1
+        version: 1.11.2
       '@types/concat-stream':
         specifier: ^2.0.0
         version: 2.0.0
       '@types/cron':
         specifier: ~1.7.1
         version: 1.7.3
-      '@types/crypto-js':
-        specifier: ^4.0.1
-        version: 4.1.1
       '@types/express':
-        specifier: ^4.17.6
-        version: 4.17.14
-      '@types/lodash.get':
-        specifier: ^4.4.6
-        version: 4.4.7
-      '@types/lodash.pick':
-        specifier: ^4.4.7
-        version: 4.4.7
+        specifier: ^4.17.21
+        version: 4.17.21
+      '@types/lodash':
+        specifier: ^4.14.195
+        version: 4.14.195
       '@types/mime-types':
         specifier: ^2.1.0
         version: 2.1.1
-      '@types/request-promise-native':
-        specifier: ~1.0.15
-        version: 1.0.18
       '@types/uuid':
         specifier: ^8.3.2
         version: 8.3.4
+      '@types/xml2js':
+        specifier: ^0.4.14
+        version: 0.4.14
 
   packages/design-system:
     dependencies:
-      element-ui:
-        specifier: ~2.15.12
-        version: 2.15.12(patch_hash=prckukfdop5sl2her6de25cod4)(vue@2.7.14)
+      '@fortawesome/fontawesome-svg-core':
+        specifier: ^1.2.36
+        version: 1.2.36
+      '@fortawesome/free-regular-svg-icons':
+        specifier: ^6.1.1
+        version: 6.2.0
+      '@fortawesome/free-solid-svg-icons':
+        specifier: ^5.15.4
+        version: 5.15.4
+      '@fortawesome/vue-fontawesome':
+        specifier: ^3.0.3
+        version: 3.0.3(@fortawesome/fontawesome-svg-core@1.2.36)(vue@3.4.21)
+      element-plus:
+        specifier: ^2.3.6
+        version: 2.3.6(vue@3.4.21)
       markdown-it:
         specifier: ^13.0.1
         version: 13.0.1
@@ -736,54 +1032,39 @@ importers:
         specifier: ^2.1.1
         version: 2.1.1
       sanitize-html:
-        specifier: 2.10.0
-        version: 2.10.0
+        specifier: 2.12.1
+        version: 2.12.1
       vue:
-        specifier: ^2.7.14
-        version: 2.7.14
-      vue-typed-mixins:
-        specifier: ^0.2.0
-        version: 0.2.0
-      vue2-boring-avatars:
-        specifier: ^0.3.8
-        version: 0.3.8
+        specifier: ^3.4.21
+        version: 3.4.21(typescript@5.4.2)
+      vue-boring-avatars:
+        specifier: ^1.3.0
+        version: 1.3.0(vue@3.4.21)
+      vue-router:
+        specifier: ^4.2.2
+        version: 4.2.2(vue@3.4.21)
       xss:
         specifier: ^1.0.14
         version: 1.0.14
     devDependencies:
-      '@fortawesome/fontawesome-svg-core':
-        specifier: ^1.2.36
-        version: 1.2.36
-      '@fortawesome/free-solid-svg-icons':
-        specifier: ^5.15.4
-        version: 5.15.4
-      '@fortawesome/vue-fontawesome':
-        specifier: ^2.0.9
-        version: 2.0.9(@fortawesome/fontawesome-svg-core@1.2.36)(vue@2.7.14)
-      '@storybook/addon-actions':
-        specifier: ^7.0.0-beta.46
-        version: 7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/addon-essentials':
-        specifier: ^7.0.0-beta.46
-        version: 7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/addon-links':
-        specifier: ^7.0.0-beta.46
-        version: 7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/addon-postcss':
-        specifier: ^3.0.0-alpha.1
-        version: 3.0.0-alpha.1(webpack@5.75.0)
-      '@storybook/vue':
-        specifier: ^7.0.0-beta.46
-        version: 7.0.0-beta.46(@babel/core@7.21.5)(babel-loader@9.1.2)(css-loader@6.7.3)(vue@2.7.14)
-      '@storybook/vue-webpack5':
-        specifier: ^7.0.0-beta.46
-        version: 7.0.0-beta.46(@babel/core@7.21.5)(@babel/preset-env@7.20.2)(babel-loader@9.1.2)(css-loader@6.7.3)(esbuild@0.16.17)(react-dom@18.2.0)(react@17.0.2)(typescript@5.0.3)(vue-loader@15.10.1)(vue-template-compiler@2.7.14)(vue@2.7.14)
+      '@n8n/storybook':
+        specifier: workspace:*
+        version: link:../@n8n/storybook
       '@testing-library/jest-dom':
-        specifier: ^5.16.5
-        version: 5.16.5
+        specifier: ^6.1.5
+        version: 6.1.5(@types/jest@29.5.3)(jest@29.6.2)(vitest@1.3.1)
+      '@testing-library/user-event':
+        specifier: ^14.5.1
+        version: 14.5.1(@testing-library/dom@9.3.3)
       '@testing-library/vue':
-        specifier: ^5.8.3
-        version: 5.8.3(vue-template-compiler@2.7.14)(vue@2.7.14)
+        specifier: ^8.0.1
+        version: 8.0.1(@vue/compiler-sfc@3.4.21)(vue@3.4.21)
+      '@tsconfig/node18':
+        specifier: ^18.2.2
+        version: 18.2.2
+      '@types/jsdom':
+        specifier: ^21.1.6
+        version: 21.1.6
       '@types/markdown-it':
         specifier: ^12.2.3
         version: 12.2.3
@@ -794,107 +1075,77 @@ importers:
         specifier: ^3.0.1
         version: 3.0.1
       '@types/sanitize-html':
-        specifier: ^2.8.0
-        version: 2.8.0
-      '@vitejs/plugin-vue2':
-        specifier: ^2.2.0
-        version: 2.2.0(vite@4.0.4)(vue@2.7.14)
-      '@vitest/coverage-c8':
-        specifier: ^0.28.5
-        version: 0.28.5(jsdom@21.1.0)(sass@1.58.0)
+        specifier: ^2.11.0
+        version: 2.11.0
+      '@vitejs/plugin-vue':
+        specifier: ^5.0.4
+        version: 5.0.4(vite@5.1.6)(vue@3.4.21)
+      '@vue/test-utils':
+        specifier: ^2.4.3
+        version: 2.4.3(vue@3.4.21)
+      '@vue/tsconfig':
+        specifier: ^0.5.1
+        version: 0.5.1
       autoprefixer:
-        specifier: ^10.4.13
-        version: 10.4.13(postcss@8.4.21)
-      c8:
-        specifier: 7.12.0
-        version: 7.12.0
+        specifier: ^10.4.14
+        version: 10.4.14(postcss@8.4.35)
       core-js:
-        specifier: ^3.27.2
-        version: 3.27.2
+        specifier: ^3.31.0
+        version: 3.31.0
       jsdom:
-        specifier: 21.1.0
-        version: 21.1.0
-      node-notifier:
-        specifier: ^10.0.1
-        version: 10.0.1
+        specifier: ^23.0.1
+        version: 23.0.1
       sass:
-        specifier: ^1.58.0
-        version: 1.58.0
+        specifier: ^1.64.1
+        version: 1.64.1
       sass-loader:
-        specifier: ^13.2.0
-        version: 13.2.0(sass@1.58.0)(webpack@5.75.0)
-      storybook:
-        specifier: ^7.0.0-beta.46
-        version: 7.0.0-beta.46
-      storybook-addon-designs:
-        specifier: ^6.3.1
-        version: 6.3.1(react@17.0.2)
-      storybook-addon-themes:
-        specifier: ^6.1.0
-        version: 6.1.0(react-dom@18.2.0)(react@17.0.2)(vue@2.7.14)
-      trim:
-        specifier: ^1.0.1
-        version: 1.0.1
-      vite:
-        specifier: ^4.0.4
-        version: 4.0.4(@types/node@16.18.12)(sass@1.55.0)(terser@5.16.1)
-      vitest:
-        specifier: ^0.28.5
-        version: 0.28.5(jsdom@21.1.0)(sass@1.58.0)
-      vue-class-component:
-        specifier: ^7.2.6
-        version: 7.2.6(vue@2.7.14)
-      vue-loader:
-        specifier: ^15.10.1
-        version: 15.10.1(css-loader@6.7.3)(react-dom@18.2.0)(react@17.0.2)(vue-template-compiler@2.7.14)(webpack@5.75.0)
-      vue-property-decorator:
-        specifier: ^9.1.2
-        version: 9.1.2(vue-class-component@7.2.6)(vue@2.7.14)
-      vue-template-compiler:
-        specifier: ^2.7.14
-        version: 2.7.14
-      vue-tsc:
-        specifier: ^1.0.24
-        version: 1.0.24(typescript@5.0.3)
+        specifier: ^13.3.2
+        version: 13.3.2(sass@1.64.1)(webpack@5.75.0)
 
   packages/editor-ui:
     dependencies:
       '@codemirror/autocomplete':
-        specifier: ^6.4.0
-        version: 6.4.0(@codemirror/language@6.2.1)(@codemirror/state@6.1.4)(@codemirror/view@6.5.1)(@lezer/common@1.0.1)
+        specifier: ^6.11.1
+        version: 6.11.1(@codemirror/language@6.9.3)(@codemirror/state@6.3.3)(@codemirror/view@6.22.3)(@lezer/common@1.1.0)
       '@codemirror/commands':
-        specifier: ^6.1.0
-        version: 6.1.2
+        specifier: ^6.3.2
+        version: 6.3.2
       '@codemirror/lang-javascript':
-        specifier: ^6.1.2
-        version: 6.1.2
-      '@codemirror/language':
         specifier: ^6.2.1
         version: 6.2.1
+      '@codemirror/lang-json':
+        specifier: ^6.0.1
+        version: 6.0.1
+      '@codemirror/lang-python':
+        specifier: ^6.1.3
+        version: 6.1.3(@codemirror/state@6.3.3)(@codemirror/view@6.22.3)(@lezer/common@1.1.0)
+      '@codemirror/language':
+        specifier: ^6.9.3
+        version: 6.9.3
       '@codemirror/lint':
-        specifier: ^6.0.0
-        version: 6.0.0
+        specifier: ^6.4.2
+        version: 6.4.2
       '@codemirror/state':
-        specifier: ^6.1.4
-        version: 6.1.4
+        specifier: ^6.3.3
+        version: 6.3.3
       '@codemirror/view':
-        specifier: ^6.5.1
-        version: 6.5.1
+        specifier: ^6.22.3
+        version: 6.22.3
       '@fontsource/open-sans':
         specifier: ^4.5.0
         version: 4.5.12
       '@fortawesome/fontawesome-svg-core':
-        specifier: ^1.2.35
+        specifier: '*'
         version: 1.2.36
       '@fortawesome/free-regular-svg-icons':
-        specifier: ^6.1.1
+        specifier: '*'
         version: 6.2.0
       '@fortawesome/free-solid-svg-icons':
-        specifier: ^5.15.3
+        specifier: '*'
         version: 5.15.4
       '@fortawesome/vue-fontawesome':
-        specifier: ^2.0.2
-        version: 2.0.8(@fortawesome/fontawesome-svg-core@1.2.36)(vue@2.7.14)
+        specifier: '*'
+        version: 3.0.3(@fortawesome/fontawesome-svg-core@1.2.36)(vue@3.4.21)
       '@jsplumb/browser-ui':
         specifier: ^5.13.2
         version: 5.13.2
@@ -910,24 +1161,42 @@ importers:
       '@jsplumb/util':
         specifier: ^5.13.2
         version: 5.13.2
+      '@lezer/common':
+        specifier: ^1.0.4
+        version: 1.1.0
+      '@n8n/chat':
+        specifier: workspace:*
+        version: link:../@n8n/chat
+      '@n8n/codemirror-lang-sql':
+        specifier: ^1.0.2
+        version: 1.0.2(@codemirror/view@6.22.3)(@lezer/common@1.1.0)
+      '@n8n/permissions':
+        specifier: workspace:*
+        version: link:../@n8n/permissions
+      '@vueuse/components':
+        specifier: ^10.5.0
+        version: 10.5.0(vue@3.4.21)
+      '@vueuse/core':
+        specifier: ^10.5.0
+        version: 10.5.0(vue@3.4.21)
       axios:
-        specifier: ^0.21.1
-        version: 0.21.4(debug@4.3.2)
-      canvas-confetti:
-        specifier: ^1.6.0
-        version: 1.6.0
+        specifier: 1.6.7
+        version: 1.6.7(debug@3.2.7)
+      chart.js:
+        specifier: ^4.4.0
+        version: 4.4.0
       codemirror-lang-html-n8n:
         specifier: ^1.0.0
         version: 1.0.0
       codemirror-lang-n8n-expression:
-        specifier: ^0.2.0
-        version: 0.2.0(@codemirror/state@6.1.4)(@codemirror/view@6.5.1)(@lezer/common@1.0.1)
-      copy-to-clipboard:
-        specifier: ^3.3.3
-        version: 3.3.3
+        specifier: ^0.3.0
+        version: 0.3.0(@codemirror/state@6.3.3)(@codemirror/view@6.22.3)(@lezer/common@1.1.0)
       dateformat:
         specifier: ^3.0.3
         version: 3.0.3
+      email-providers:
+        specifier: ^2.0.1
+        version: 2.0.1
       esprima-next:
         specifier: 5.8.4
         version: 5.8.4
@@ -943,9 +1212,6 @@ importers:
       humanize-duration:
         specifier: ^3.27.2
         version: 3.27.3
-      jquery:
-        specifier: ^3.4.1
-        version: 3.6.1
       jsonpath:
         specifier: ^1.1.1
         version: 1.1.1
@@ -955,30 +1221,21 @@ importers:
       luxon:
         specifier: ^3.3.0
         version: 3.3.0
-      monaco-editor:
-        specifier: ^0.33.0
-        version: 0.33.0
       n8n-design-system:
         specifier: workspace:*
         version: link:../design-system
       n8n-workflow:
         specifier: workspace:*
         version: link:../workflow
-      normalize-wheel:
-        specifier: ^1.0.1
-        version: 1.0.1
       pinia:
-        specifier: ^2.0.22
-        version: 2.0.23(typescript@5.0.3)(vue@2.7.14)
+        specifier: ^2.1.6
+        version: 2.1.6(typescript@5.4.2)(vue@3.4.21)
       prettier:
-        specifier: ^2.8.3
-        version: 2.8.3
-      prismjs:
-        specifier: ^1.17.1
-        version: 1.29.0
-      qrcode:
-        specifier: ^1.5.3
-        version: 1.5.3
+        specifier: ^3.2.5
+        version: 3.2.5
+      qrcode.vue:
+        specifier: ^3.3.4
+        version: 3.3.4(vue@3.4.21)
       stream-browserify:
         specifier: ^3.0.0
         version: 3.0.0
@@ -988,82 +1245,49 @@ importers:
       uuid:
         specifier: ^8.3.2
         version: 8.3.2
-      v-click-outside:
-        specifier: ^3.1.2
-        version: 3.2.0
+      v3-infinite-loading:
+        specifier: ^1.2.2
+        version: 1.2.2
       vue:
-        specifier: ^2.7.14
-        version: 2.7.14
+        specifier: ^3.4.21
+        version: 3.4.21(typescript@5.4.2)
       vue-agile:
         specifier: ^2.0.0
         version: 2.0.0
-      vue-fragment:
-        specifier: 1.5.1
-        version: 1.5.1(vue@2.7.14)
+      vue-chartjs:
+        specifier: ^5.2.0
+        version: 5.2.0(chart.js@4.4.0)(vue@3.4.21)
       vue-i18n:
-        specifier: ^8.26.7
-        version: 8.27.2(vue@2.7.14)
-      vue-infinite-loading:
-        specifier: ^2.4.5
-        version: 2.4.5(vue@2.7.14)
+        specifier: ^9.2.2
+        version: 9.2.2(vue@3.4.21)
       vue-json-pretty:
-        specifier: 1.9.3
-        version: 1.9.3
-      vue-prism-editor:
-        specifier: ^0.3.0
-        version: 0.3.0
+        specifier: 2.2.4
+        version: 2.2.4(vue@3.4.21)
+      vue-markdown-render:
+        specifier: ^2.0.1
+        version: 2.0.1(typescript@5.4.2)
       vue-router:
-        specifier: ^3.6.5
-        version: 3.6.5(vue@2.7.14)
-      vue-template-compiler:
-        specifier: ^2.7.14
-        version: 2.7.14
-      vue-typed-mixins:
-        specifier: ^0.2.0
-        version: 0.2.0
-      vue2-boring-avatars:
-        specifier: 0.3.4
-        version: 0.3.4
-      vue2-teleport:
-        specifier: ^1.0.1
-        version: 1.0.1
-      vue2-touch-events:
-        specifier: ^3.2.1
-        version: 3.2.2
+        specifier: ^4.2.2
+        version: 4.2.2(vue@3.4.21)
+      vue3-touch-events:
+        specifier: ^4.1.3
+        version: 4.1.3
       xss:
-        specifier: ^1.0.10
+        specifier: ^1.0.14
         version: 1.0.14
     devDependencies:
       '@faker-js/faker':
-        specifier: ^7.6.0
-        version: 7.6.0
-      '@modyfi/vite-plugin-yaml':
-        specifier: ^1.0.4
-        version: 1.0.4(vite@4.0.4)
+        specifier: ^8.0.2
+        version: 8.0.2
       '@pinia/testing':
-        specifier: ^0.0.14
-        version: 0.0.14(pinia@2.0.23)(vue@2.7.14)
+        specifier: ^0.1.3
+        version: 0.1.3(pinia@2.1.6)(vue@3.4.21)
       '@sentry/vite-plugin':
-        specifier: ^0.4.0
-        version: 0.4.0
-      '@testing-library/jest-dom':
-        specifier: ^5.16.5
-        version: 5.16.5
-      '@testing-library/user-event':
-        specifier: ^14.4.3
-        version: 14.4.3(@testing-library/dom@7.31.2)
-      '@testing-library/vue':
-        specifier: ^5.8.3
-        version: 5.8.3(vue-template-compiler@2.7.14)(vue@2.7.14)
-      '@types/canvas-confetti':
-        specifier: ^1.6.0
-        version: 1.6.0
+        specifier: ^2.5.0
+        version: 2.5.0
       '@types/dateformat':
         specifier: ^3.0.0
         version: 3.0.1
-      '@types/express':
-        specifier: ^4.17.6
-        version: 4.17.14
       '@types/file-saver':
         specifier: ^2.0.1
         version: 2.0.5
@@ -1076,78 +1300,30 @@ importers:
       '@types/lodash-es':
         specifier: ^4.17.6
         version: 4.17.6
-      '@types/lodash.camelcase':
-        specifier: ^4.3.6
-        version: 4.3.7
-      '@types/lodash.get':
-        specifier: ^4.4.6
-        version: 4.4.7
-      '@types/lodash.set':
-        specifier: ^4.3.6
-        version: 4.3.7
       '@types/luxon':
         specifier: ^3.2.0
         version: 3.2.0
       '@types/qrcode':
         specifier: ^1.5.0
-        version: 1.5.0
+        version: 1.5.5
       '@types/swagger-ui':
         specifier: ^3.52.0
-        version: 3.52.0
+        version: 3.52.4
       '@types/uuid':
         specifier: ^8.3.2
         version: 8.3.4
-      '@vitejs/plugin-legacy':
-        specifier: ^3.0.1
-        version: 3.0.1(terser@5.16.1)(vite@4.0.4)
-      '@vitejs/plugin-react':
-        specifier: ^4.0.0
-        version: 4.0.0(vite@4.0.4)
-      '@vitejs/plugin-vue2':
-        specifier: ^2.2.0
-        version: 2.2.0(vite@4.0.4)(vue@2.7.14)
-      '@vitest/coverage-c8':
-        specifier: ^0.28.5
-        version: 0.28.5(sass@1.55.0)(terser@5.16.1)
-      c8:
-        specifier: ^7.12.0
-        version: 7.12.0
-      jshint:
-        specifier: ^2.9.7
-        version: 2.13.5
       miragejs:
-        specifier: ^0.1.47
-        version: 0.1.47
-      sass:
-        specifier: ^1.55.0
-        version: 1.55.0
-      sass-loader:
-        specifier: ^10.1.1
-        version: 10.3.1(sass@1.55.0)(webpack@5.75.0)
-      string-template-parser:
-        specifier: ^1.2.6
-        version: 1.2.6
-      vite:
-        specifier: 4.0.4
-        version: 4.0.4(@types/node@16.18.12)(sass@1.55.0)(terser@5.16.1)
-      vite-plugin-monaco-editor:
-        specifier: ^1.0.10
-        version: 1.1.0(monaco-editor@0.33.0)
-      vitest:
-        specifier: ^0.28.5
-        version: 0.28.5(sass@1.55.0)(terser@5.16.1)
-      vue-tsc:
-        specifier: ^1.0.24
-        version: 1.0.24(typescript@5.0.3)
+        specifier: ^0.1.48
+        version: 0.1.48
+      unplugin-icons:
+        specifier: ^0.17.0
+        version: 0.17.4
 
   packages/node-dev:
     dependencies:
-      '@oclif/command':
-        specifier: ^1.5.18
-        version: 1.8.18(@oclif/config@1.18.5)(supports-color@8.1.1)
-      '@oclif/errors':
-        specifier: ^1.2.2
-        version: 1.3.6
+      '@oclif/core':
+        specifier: 3.18.1
+        version: 3.18.1
       change-case:
         specifier: ^4.1.1
         version: 4.1.2
@@ -1163,51 +1339,42 @@ importers:
       n8n-workflow:
         specifier: workspace:*
         version: link:../workflow
-      oauth-1.0a:
-        specifier: ^2.2.6
-        version: 2.2.6
       replace-in-file:
         specifier: ^6.0.0
         version: 6.3.5
-      request:
-        specifier: ^2.88.2
-        version: 2.88.2
       tmp-promise:
-        specifier: ^3.0.2
+        specifier: ^3.0.3
         version: 3.0.3
+      typedi:
+        specifier: ^0.10.0
+        version: 0.10.0(patch_hash=sk6omkefrosihg7lmqbzh7vfxe)
     devDependencies:
-      '@oclif/dev-cli':
-        specifier: ^1.22.2
-        version: 1.26.10
-      '@types/express':
-        specifier: ^4.17.6
-        version: 4.17.14
       '@types/inquirer':
         specifier: ^6.5.0
         version: 6.5.0
-      '@types/tmp':
-        specifier: ^0.2.0
-        version: 0.2.3
-      '@types/vorpal':
-        specifier: ^1.11.0
-        version: 1.12.2
 
   packages/nodes-base:
     dependencies:
       '@kafkajs/confluent-schema-registry':
         specifier: 1.0.6
         version: 1.0.6
+      '@n8n/imap':
+        specifier: workspace:*
+        version: link:../@n8n/imap
+      '@n8n/vm2':
+        specifier: 3.9.20
+        version: 3.9.20
       amqplib:
-        specifier: ^0.10.3
+        specifier: 0.10.3
         version: 0.10.3
       aws4:
-        specifier: ^1.8.0
+        specifier: 1.11.0
         version: 1.11.0
       basic-auth:
-        specifier: ^2.0.1
+        specifier: 2.0.1
         version: 2.0.1
       change-case:
-        specifier: ^4.1.1
+        specifier: 4.1.2
         version: 4.1.2
       cheerio:
         specifier: 1.0.0-rc.6
@@ -1216,275 +1383,176 @@ importers:
         specifier: 3.5.2
         version: 3.5.2
       cron:
-        specifier: ~1.7.2
+        specifier: 1.7.2
         version: 1.7.2
+      csv-parse:
+        specifier: 5.5.0
+        version: 5.5.0
       currency-codes:
-        specifier: ^2.1.0
+        specifier: 2.1.0
         version: 2.1.0
       dotenv:
         specifier: ^16.0.3
-        version: 16.0.3
+        version: 16.3.1
       eventsource:
-        specifier: ^2.0.2
+        specifier: 2.0.2
         version: 2.0.2
       fast-glob:
-        specifier: ^3.2.5
+        specifier: 3.2.12
         version: 3.2.12
       fflate:
-        specifier: ^0.7.0
+        specifier: 0.7.4
         version: 0.7.4
-      formidable:
-        specifier: ^1.2.1
-        version: 1.2.6
       get-system-fonts:
-        specifier: ^2.0.2
+        specifier: 2.0.2
         version: 2.0.2
       gm:
-        specifier: ^1.25.0
+        specifier: 1.25.0
         version: 1.25.0
+      html-to-text:
+        specifier: 9.0.5
+        version: 9.0.5
       iconv-lite:
-        specifier: ^0.6.2
+        specifier: 0.6.3
         version: 0.6.3
       ics:
-        specifier: ^2.27.0
+        specifier: 2.40.0
         version: 2.40.0
-      imap-simple:
-        specifier: ^4.3.0
-        version: 4.3.0
       isbot:
-        specifier: ^3.3.4
-        version: 3.6.1
+        specifier: 3.6.13
+        version: 3.6.13
       iso-639-1:
-        specifier: ^2.1.3
+        specifier: 2.1.15
         version: 2.1.15
       js-nacl:
-        specifier: ^1.4.0
+        specifier: 1.4.0
         version: 1.4.0
       jsonwebtoken:
-        specifier: 9.0.0
-        version: 9.0.0
+        specifier: 9.0.2
+        version: 9.0.2
       kafkajs:
-        specifier: ^1.14.0
+        specifier: 1.16.0
         version: 1.16.0
-      lodash.assign:
-        specifier: ^4
-        version: 4.2.0
-      lodash.assignwith:
-        specifier: ^4
-        version: 4.2.0
-      lodash.clone:
-        specifier: ^4
-        version: 4.5.0
-      lodash.compact:
-        specifier: ^3
-        version: 3.0.1
-      lodash.concat:
-        specifier: ^4
-        version: 4.5.0
-      lodash.difference:
-        specifier: ^4
-        version: 4.5.0
-      lodash.escaperegexp:
-        specifier: ^4
-        version: 4.1.2
-      lodash.every:
-        specifier: ^4
-        version: 4.6.0
-      lodash.find:
-        specifier: ^4
-        version: 4.6.0
-      lodash.first:
-        specifier: ^3
-        version: 3.0.0
-      lodash.flow:
-        specifier: ^3
-        version: 3.5.0
-      lodash.get:
-        specifier: ^4
-        version: 4.4.2
-      lodash.intersection:
-        specifier: ^4
-        version: 4.4.0
-      lodash.isarray:
-        specifier: ^4
-        version: 4.0.0
-      lodash.isempty:
-        specifier: ^4
-        version: 4.4.0
-      lodash.isequal:
-        specifier: ^4
-        version: 4.5.0
-      lodash.isobject:
-        specifier: ^3
-        version: 3.0.2
-      lodash.isstring:
-        specifier: ^4
-        version: 4.0.1
-      lodash.last:
-        specifier: ^3
-        version: 3.0.0
-      lodash.lt:
-        specifier: ^3
-        version: 3.9.2
-      lodash.map:
-        specifier: ^4
-        version: 4.6.0
-      lodash.merge:
-        specifier: ^4
-        version: 4.6.2
-      lodash.mergewith:
-        specifier: ^4
-        version: 4.6.2
-      lodash.omit:
-        specifier: ^4
-        version: 4.5.0
-      lodash.partialright:
-        specifier: ^4
-        version: 4.2.1
-      lodash.pick:
-        specifier: ^4
-        version: 4.4.0
-      lodash.pickby:
-        specifier: ^4
-        version: 4.6.0
-      lodash.reduce:
-        specifier: ^4
-        version: 4.6.0
-      lodash.set:
-        specifier: ^4
-        version: 4.3.2
-      lodash.some:
-        specifier: ^4
-        version: 4.6.0
-      lodash.sortby:
-        specifier: ^4
-        version: 4.7.0
-      lodash.split:
-        specifier: ^4
-        version: 4.4.2
-      lodash.tonumber:
-        specifier: ^4
-        version: 4.0.3
-      lodash.tostring:
-        specifier: ^4
-        version: 4.1.4
-      lodash.trim:
-        specifier: ^4
-        version: 4.5.1
-      lodash.union:
-        specifier: ^4
-        version: 4.6.0
-      lodash.uniqby:
-        specifier: ^4
-        version: 4.7.0
-      lodash.unset:
-        specifier: ^4
-        version: 4.5.2
-      lodash.upperfirst:
-        specifier: ^4
-        version: 4.3.1
-      lodash.zip:
-        specifier: ^4
-        version: 4.2.0
+      ldapts:
+        specifier: 4.2.6
+        version: 4.2.6
+      lodash:
+        specifier: 4.17.21
+        version: 4.17.21
       lossless-json:
-        specifier: ^1.0.4
+        specifier: 1.0.5
         version: 1.0.5
       luxon:
-        specifier: ^3.3.0
+        specifier: 3.3.0
         version: 3.3.0
       mailparser:
-        specifier: ^3.2.0
-        version: 3.5.0
-      moment:
-        specifier: ~2.29.2
-        version: 2.29.4
+        specifier: 3.6.7
+        version: 3.6.7
+      minifaker:
+        specifier: 1.34.1
+        version: 1.34.1
       moment-timezone:
-        specifier: ^0.5.28
+        specifier: 0.5.37
         version: 0.5.37
       mongodb:
-        specifier: ^4.9.1
-        version: 4.10.0
+        specifier: 6.3.0
+        version: 6.3.0
       mqtt:
-        specifier: 4.2.6
-        version: 4.2.6
+        specifier: 5.0.2
+        version: 5.0.2
       mssql:
-        specifier: ^8.1.2
-        version: 8.1.4
+        specifier: 10.0.2
+        version: 10.0.2
       mysql2:
-        specifier: ~2.3.0
-        version: 2.3.3
+        specifier: 3.9.7
+        version: 3.9.7
       n8n-workflow:
         specifier: workspace:*
         version: link:../workflow
+      nanoid:
+        specifier: 3.3.6
+        version: 3.3.6
       node-html-markdown:
-        specifier: ^1.1.3
+        specifier: 1.2.0
         version: 1.2.0
       node-ssh:
-        specifier: ^12.0.0
+        specifier: 12.0.5
         version: 12.0.5
       nodemailer:
-        specifier: ^6.7.1
-        version: 6.8.0
+        specifier: 6.9.9
+        version: 6.9.9
       openapi-request-validator:
         specifier: 12.1.0
         version: 12.1.0
       otpauth:
-        specifier: ^9.1.1
+        specifier: 9.1.1
         version: 9.1.1
-      pdf-parse:
-        specifier: ^1.1.1
-        version: 1.1.1
+      pdfjs-dist:
+        specifier: 2.16.105
+        version: 2.16.105
       pg:
-        specifier: ^8.3.0
-        version: 8.8.0
+        specifier: 8.11.3
+        version: 8.11.3
       pg-promise:
-        specifier: ^10.5.8
-        version: 10.12.0
+        specifier: 10.15.4
+        version: 10.15.4
       pretty-bytes:
-        specifier: ^5.6.0
+        specifier: 5.6.0
         version: 5.6.0
       promise-ftp:
-        specifier: ^1.3.5
+        specifier: 1.3.5
         version: 1.3.5(promise-ftp-common@1.1.5)
+      pyodide:
+        specifier: 0.23.4
+        version: 0.23.4(patch_hash=kzcwsjcayy5m6iezu7r4tdimjq)
       redis:
-        specifier: ^3.1.1
-        version: 3.1.2
-      request:
-        specifier: ^2.88.2
-        version: 2.88.2
+        specifier: 4.6.12
+        version: 4.6.12
+      rfc2047:
+        specifier: 4.0.1
+        version: 4.0.1
       rhea:
-        specifier: ^1.0.11
+        specifier: 1.0.24
         version: 1.0.24
+      rrule:
+        specifier: ^2.8.1
+        version: 2.8.1
       rss-parser:
-        specifier: ^3.7.0
-        version: 3.12.0
+        specifier: 3.13.0
+        version: 3.13.0
+      semver:
+        specifier: ^7.5.4
+        version: 7.6.0
       showdown:
-        specifier: ^2.0.3
+        specifier: 2.1.0
         version: 2.1.0
       simple-git:
-        specifier: ^3.17.0
+        specifier: 3.17.0
         version: 3.17.0
       snowflake-sdk:
-        specifier: ^1.5.3
-        version: 1.6.14(asn1.js@5.4.1)
+        specifier: 1.9.2
+        version: 1.9.2(asn1.js@5.4.1)
       ssh2-sftp-client:
-        specifier: ^7.0.0
+        specifier: 7.2.3
         version: 7.2.3
       tmp-promise:
-        specifier: ^3.0.2
+        specifier: 3.0.3
         version: 3.0.3
+      ts-ics:
+        specifier: ^1.2.2
+        version: 1.2.2(date-fns@2.30.0)(lodash@4.17.21)(zod@3.22.4)
+      typedi:
+        specifier: 0.10.0
+        version: 0.10.0(patch_hash=sk6omkefrosihg7lmqbzh7vfxe)
       uuid:
-        specifier: ^8.3.2
+        specifier: 8.3.2
         version: 8.3.2
-      vm2:
-        specifier: ~3.9.17
-        version: 3.9.17
       xlsx:
-        specifier: ^0.17.0
-        version: 0.17.5
+        specifier: https://cdn.sheetjs.com/xlsx-0.19.3/xlsx-0.19.3.tgz
+        version: '@cdn.sheetjs.com/xlsx-0.19.3/xlsx-0.19.3.tgz'
       xml2js:
-        specifier: ^0.5.0
-        version: 0.5.0
+        specifier: 0.6.2
+        version: 0.6.2
     devDependencies:
       '@types/amqplib':
         specifier: ^0.10.1
@@ -1505,182 +1573,53 @@ importers:
         specifier: ^1.1.2
         version: 1.1.9
       '@types/express':
-        specifier: ^4.17.6
-        version: 4.17.14
-      '@types/formidable':
-        specifier: ^1.0.31
-        version: 1.2.5
+        specifier: ^4.17.21
+        version: 4.17.21
       '@types/gm':
         specifier: ^1.25.0
         version: 1.25.0
-      '@types/imap-simple':
-        specifier: ^4.2.0
-        version: 4.2.5
+      '@types/html-to-text':
+        specifier: ^9.0.1
+        version: 9.0.4
       '@types/js-nacl':
         specifier: ^1.3.0
         version: 1.3.0
       '@types/jsonwebtoken':
-        specifier: ^9.0.1
-        version: 9.0.1
+        specifier: ^9.0.6
+        version: 9.0.6
       '@types/lodash':
-        specifier: ^4.14.191
-        version: 4.14.191
-      '@types/lodash.assign':
-        specifier: ^4
-        version: 4.2.7
-      '@types/lodash.assignwith':
-        specifier: ^4
-        version: 4.2.7
-      '@types/lodash.clone':
-        specifier: ^4
-        version: 4.5.7
-      '@types/lodash.compact':
-        specifier: ^3
-        version: 3.0.7
-      '@types/lodash.concat':
-        specifier: ^4
-        version: 4.5.7
-      '@types/lodash.difference':
-        specifier: ^4
-        version: 4.5.7
-      '@types/lodash.escaperegexp':
-        specifier: ^4
-        version: 4.1.7
-      '@types/lodash.every':
-        specifier: ^4
-        version: 4.6.7
-      '@types/lodash.find':
-        specifier: ^4
-        version: 4.6.7
-      '@types/lodash.first':
-        specifier: ^3
-        version: 3.0.7
-      '@types/lodash.flow':
-        specifier: ^3
-        version: 3.5.7
-      '@types/lodash.get':
-        specifier: ^4
-        version: 4.4.7
-      '@types/lodash.intersection':
-        specifier: ^4
-        version: 4.4.7
-      '@types/lodash.isarray':
-        specifier: ^4
-        version: 4.0.7
-      '@types/lodash.isempty':
-        specifier: ^4
-        version: 4.4.7
-      '@types/lodash.isequal':
-        specifier: ^4
-        version: 4.5.6
-      '@types/lodash.isobject':
-        specifier: ^3
-        version: 3.0.7
-      '@types/lodash.isstring':
-        specifier: ^4
-        version: 4.0.7
-      '@types/lodash.last':
-        specifier: ^3
-        version: 3.0.7
-      '@types/lodash.lt':
-        specifier: ^3
-        version: 3.9.7
-      '@types/lodash.map':
-        specifier: ^4
-        version: 4.6.13
-      '@types/lodash.merge':
-        specifier: ^4
-        version: 4.6.7
-      '@types/lodash.mergewith':
-        specifier: ^4
-        version: 4.6.7
-      '@types/lodash.omit':
-        specifier: ^4
-        version: 4.5.7
-      '@types/lodash.partialright':
-        specifier: ^4
-        version: 4.2.7
-      '@types/lodash.pick':
-        specifier: ^4
-        version: 4.4.7
-      '@types/lodash.pickby':
-        specifier: ^4
-        version: 4.6.7
-      '@types/lodash.reduce':
-        specifier: ^4
-        version: 4.6.7
-      '@types/lodash.set':
-        specifier: ^4
-        version: 4.3.7
-      '@types/lodash.some':
-        specifier: ^4
-        version: 4.6.7
-      '@types/lodash.sortby':
-        specifier: ^4
-        version: 4.7.7
-      '@types/lodash.split':
-        specifier: ^4
-        version: 4.4.7
-      '@types/lodash.tonumber':
-        specifier: ^4
-        version: 4.0.7
-      '@types/lodash.tostring':
-        specifier: ^4
-        version: 4.1.7
-      '@types/lodash.trim':
-        specifier: ^4
-        version: 4.5.7
-      '@types/lodash.union':
-        specifier: ^4
-        version: 4.6.7
-      '@types/lodash.uniqby':
-        specifier: ^4
-        version: 4.7.7
-      '@types/lodash.unset':
-        specifier: ^4
-        version: 4.5.7
-      '@types/lodash.upperfirst':
-        specifier: ^4
-        version: 4.3.7
-      '@types/lodash.zip':
-        specifier: ^4
-        version: 4.2.7
+        specifier: ^4.14.195
+        version: 4.14.195
       '@types/lossless-json':
         specifier: ^1.0.0
         version: 1.0.1
       '@types/mailparser':
-        specifier: ^2.7.3
-        version: 2.7.4
+        specifier: ^3.4.4
+        version: 3.4.4
       '@types/mime-types':
         specifier: ^2.1.0
         version: 2.1.1
       '@types/mssql':
-        specifier: ^6.0.2
-        version: 6.0.8
+        specifier: ^9.1.5
+        version: 9.1.5
       '@types/node-ssh':
         specifier: ^7.0.1
         version: 7.0.1
       '@types/nodemailer':
-        specifier: ^6.4.0
-        version: 6.4.6
-      '@types/pdf-parse':
-        specifier: ^1.1.1
-        version: 1.1.1
+        specifier: ^6.4.14
+        version: 6.4.14
       '@types/promise-ftp':
         specifier: ^1.3.4
         version: 1.3.4
-      '@types/redis':
-        specifier: ^2.8.11
-        version: 2.8.32
-      '@types/request-promise-native':
-        specifier: ~1.0.15
-        version: 1.0.18
+      '@types/rfc2047':
+        specifier: ^2.0.1
+        version: 2.0.1
       '@types/showdown':
         specifier: ^1.9.4
         version: 1.9.4
       '@types/snowflake-sdk':
-        specifier: ^1.5.1
-        version: 1.6.8
+        specifier: ^1.6.20
+        version: 1.6.20
       '@types/ssh2-sftp-client':
         specifier: ^5.1.0
         version: 5.3.2
@@ -1691,102 +1630,104 @@ importers:
         specifier: ^8.3.2
         version: 8.3.4
       '@types/xml2js':
-        specifier: ^0.4.11
-        version: 0.4.11
+        specifier: ^0.4.14
+        version: 0.4.14
       eslint-plugin-n8n-nodes-base:
-        specifier: ^1.12.0
-        version: 1.12.0(eslint@8.39.0)(typescript@5.0.3)
-      gulp:
-        specifier: ^4.0.0
-        version: 4.0.2
+        specifier: ^1.16.0
+        version: 1.16.0(eslint@8.57.0)(typescript@5.4.2)
       n8n-core:
         specifier: workspace:*
         version: link:../core
 
   packages/workflow:
     dependencies:
+      '@langchain/core':
+        specifier: 0.1.61
+        version: 0.1.61
+      '@n8n/tournament':
+        specifier: 1.0.2
+        version: 1.0.2
       '@n8n_io/riot-tmpl':
-        specifier: ^3.0.0
-        version: 3.0.0
+        specifier: 4.0.0
+        version: 4.0.0
       ast-types:
         specifier: 0.15.2
         version: 0.15.2
-      crypto-js:
-        specifier: ^4.1.1
-        version: 4.1.1
+      axios:
+        specifier: 1.6.7
+        version: 1.6.7(debug@3.2.7)
+      callsites:
+        specifier: 3.1.0
+        version: 3.1.0
       deep-equal:
-        specifier: ^2.2.0
+        specifier: 2.2.0
         version: 2.2.0
       esprima-next:
         specifier: 5.8.4
         version: 5.8.4
-      jmespath:
-        specifier: ^0.16.0
+      form-data:
+        specifier: 4.0.0
+        version: 4.0.0
+      jmespath:
+        specifier: 0.16.0
         version: 0.16.0
       js-base64:
-        specifier: ^3.7.2
+        specifier: 3.7.2
         version: 3.7.2
-      lodash.get:
-        specifier: ^4.4.2
-        version: 4.4.2
-      lodash.isequal:
-        specifier: ^4.5.0
-        version: 4.5.0
-      lodash.merge:
-        specifier: ^4.6.2
-        version: 4.6.2
-      lodash.set:
-        specifier: ^4.3.2
-        version: 4.3.2
+      jssha:
+        specifier: 3.3.1
+        version: 3.3.1
+      lodash:
+        specifier: 4.17.21
+        version: 4.17.21
       luxon:
-        specifier: ^3.3.0
+        specifier: 3.3.0
         version: 3.3.0
+      md5:
+        specifier: 2.3.0
+        version: 2.3.0
       recast:
-        specifier: ^0.21.5
+        specifier: 0.21.5
         version: 0.21.5
       title-case:
-        specifier: ^3.0.3
+        specifier: 3.0.3
         version: 3.0.3
       transliteration:
-        specifier: ^2.3.5
+        specifier: 2.3.5
         version: 2.3.5
       xml2js:
-        specifier: ^0.5.0
-        version: 0.5.0
+        specifier: 0.6.2
+        version: 0.6.2
     devDependencies:
-      '@types/crypto-js':
-        specifier: ^4.1.1
-        version: 4.1.1
       '@types/deep-equal':
         specifier: ^1.0.1
         version: 1.0.1
       '@types/express':
-        specifier: ^4.17.6
-        version: 4.17.14
+        specifier: ^4.17.21
+        version: 4.17.21
       '@types/jmespath':
         specifier: ^0.15.0
         version: 0.15.0
-      '@types/lodash.get':
-        specifier: ^4.4.6
-        version: 4.4.7
-      '@types/lodash.isequal':
-        specifier: ^4.5.6
-        version: 4.5.6
-      '@types/lodash.merge':
-        specifier: ^4.6.6
-        version: 4.6.7
-      '@types/lodash.set':
-        specifier: ^4.3.6
-        version: 4.3.7
+      '@types/lodash':
+        specifier: ^4.14.195
+        version: 4.14.195
       '@types/luxon':
         specifier: ^3.2.0
         version: 3.2.0
+      '@types/md5':
+        specifier: ^2.3.5
+        version: 2.3.5
       '@types/xml2js':
-        specifier: ^0.4.11
-        version: 0.4.11
+        specifier: ^0.4.14
+        version: 0.4.14
 
 packages:
 
+  /@aashutoshrathi/word-wrap@1.2.6:
+    resolution: {integrity: sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==}
+    engines: {node: '>=0.10.0'}
+    dev: true
+
   /@acuminous/bitsyntax@0.1.2:
     resolution: {integrity: sha512-29lUK80d1muEQqiUsSo+3A0yP6CdspgC95EnKBMi22Xlwt79i/En4Vr67+cXhU+cZjbti3TgGGC5wy1stIywVQ==}
     engines: {node: '>=0.8'}
@@ -1798,66 +1739,69 @@ packages:
       - supports-color
     dev: false
 
-  /@adobe/css-tools@4.0.2:
-    resolution: {integrity: sha512-Fx6tYjk2wKUgLi8uMANZr8GNZx05u44ArIJldn9VxLvolzlJVgHbTUCbwhMd6bcYky178+WUSxPHO3DAtGLWpw==}
+  /@adobe/css-tools@4.3.2:
+    resolution: {integrity: sha512-DA5a1C0gD/pLOvhv33YMrbf2FK3oUzwNl9oOJqE4XVjuEtt6XIakRcsd7eLiOSPkp1kTRQGICTA8cKra/vFbjw==}
     dev: true
 
-  /@ampproject/remapping@2.2.0:
-    resolution: {integrity: sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==}
+  /@ampproject/remapping@2.2.1:
+    resolution: {integrity: sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==}
     engines: {node: '>=6.0.0'}
     dependencies:
-      '@jridgewell/gen-mapping': 0.1.1
-      '@jridgewell/trace-mapping': 0.3.17
-    dev: true
+      '@jridgewell/gen-mapping': 0.3.2
+      '@jridgewell/trace-mapping': 0.3.18
 
-  /@apidevtools/json-schema-ref-parser@8.0.0:
-    resolution: {integrity: sha512-n4YBtwQhdpLto1BaUCyAeflizmIbaloGShsPyRtFf5qdFJxfssj+GgLavczgKJFa3Bq+3St2CKcpRJdjtB4EBw==}
+  /@antfu/install-pkg@0.1.1:
+    resolution: {integrity: sha512-LyB/8+bSfa0DFGC06zpCEfs89/XoWZwws5ygEa5D+Xsm3OfI+aXQ86VgVG7Acyef+rSZ5HE7J8rrxzrQeM3PjQ==}
     dependencies:
-      '@jsdevtools/ono': 7.1.3
-      call-me-maybe: 1.0.1
-      js-yaml: 3.14.1
+      execa: 5.1.1
+      find-up: 5.0.0
     dev: true
 
-  /@apidevtools/json-schema-ref-parser@9.0.9:
-    resolution: {integrity: sha512-GBD2Le9w2+lVFoc4vswGI/TjkNIZSVp7+9xPf+X3uidBfWnAeUWmquteSyt0+VCrhNMWj/FTABISQrD3Z/YA+w==}
-    dependencies:
-      '@jsdevtools/ono': 7.1.3
-      '@types/json-schema': 7.0.11
-      call-me-maybe: 1.0.1
-      js-yaml: 4.1.0
-    dev: false
-
-  /@apidevtools/openapi-schemas@2.1.0:
-    resolution: {integrity: sha512-Zc1AlqrJlX3SlpupFGpiLi2EbteyP7fXmUOGup6/DnkRgjP9bgMM/ag+n91rsv0U1Gpz0H3VILA/o3bW7Ua6BQ==}
-    engines: {node: '>=10'}
+  /@antfu/utils@0.7.6:
+    resolution: {integrity: sha512-pvFiLP2BeOKA/ZOS6jxx4XhKzdVLHDhGlFEaZ2flWWYf2xOqVniqpk38I04DFRyz+L0ASggl7SkItTc+ZLju4w==}
     dev: true
 
-  /@apidevtools/swagger-cli@4.0.0:
-    resolution: {integrity: sha512-8jDHtZxEkxFNMfqeNhyHjxiS9P3BlSj1WpetsMExs4N+PIa3d0vSNch4Fk9OlgT/2oClCK0YSc+dmmdVpHh0hg==}
-    engines: {node: '>=10'}
-    hasBin: true
+  /@anthropic-ai/sdk@0.20.7:
+    resolution: {integrity: sha512-uyc+3WGLpe8ur6mSIKSab7P9JdBerTdmqb7popc/yROYLLCW/Ykyw4ZfjmN/cLmxjnAKnv5YUngzbPM0BJuGjg==}
     dependencies:
-      '@apidevtools/swagger-parser': 9.0.1
-      chalk: 3.0.0
-      js-yaml: 3.14.1
-      yargs: 15.4.1
-    dev: true
+      '@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)
+      web-streams-polyfill: 3.2.1
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
+    dev: false
 
-  /@apidevtools/swagger-methods@3.0.2:
-    resolution: {integrity: sha512-QAkD5kK2b1WfjDS/UQn/qQkbwF31uqRjPTrsCs5ZG9BQGAkjwvqGFjjPqAuzac/IYzpPtRzjCP1WrTuAIjMrXg==}
-    dev: true
+  /@anthropic-ai/sdk@0.9.1:
+    resolution: {integrity: sha512-wa1meQ2WSfoY8Uor3EdrJq0jTiZJoKoSii2ZVWRY1oN4Tlr5s59pADg9T79FTbPe1/se5c3pBeZgJL63wmuoBA==}
+    dependencies:
+      '@types/node': 18.16.16
+      '@types/node-fetch': 2.6.4
+      abort-controller: 3.0.0
+      agentkeepalive: 4.2.1
+      digest-fetch: 1.3.0
+      form-data-encoder: 1.7.2
+      formdata-node: 4.4.1
+      node-fetch: 2.7.0(encoding@0.1.13)
+      web-streams-polyfill: 3.2.1
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
+    dev: false
 
-  /@apidevtools/swagger-parser@9.0.1:
-    resolution: {integrity: sha512-Irqybg4dQrcHhZcxJc/UM4vO7Ksoj1Id5e+K94XUOzllqX1n47HEA50EKiXTCQbykxuJ4cYGIivjx/MRSTC5OA==}
+  /@apidevtools/json-schema-ref-parser@9.1.2:
+    resolution: {integrity: sha512-r1w81DpR+KyRWd3f+rk6TNqMgedmAxZP5v5KWlXQWlgMUUtyEJch0DKEci1SorPMiSeM8XPl7MZ3miJ60JIpQg==}
     dependencies:
-      '@apidevtools/json-schema-ref-parser': 8.0.0
-      '@apidevtools/openapi-schemas': 2.1.0
-      '@apidevtools/swagger-methods': 3.0.2
       '@jsdevtools/ono': 7.1.3
+      '@types/json-schema': 7.0.15
       call-me-maybe: 1.0.1
-      openapi-types: 1.3.5
-      z-schema: 4.2.4
-    dev: true
+      js-yaml: 4.1.0
+    dev: false
 
   /@authenio/xml-encryption@2.0.2:
     resolution: {integrity: sha512-cTlrKttbrRHEw3W+0/I609A2Matj5JQaRvfLtEIGZvlN0RaPi+3ANsMeqAyCAVlH/lUIW2tmtBlSMni74lcXeg==}
@@ -1868,2664 +1812,2975 @@ packages:
       xpath: 0.0.32
     dev: false
 
-  /@aw-web-design/x-default-browser@1.4.88:
-    resolution: {integrity: sha512-AkEmF0wcwYC2QkhK703Y83fxWARttIWXDmQN8+cof8FmFZ5BRhnNXGymeb1S73bOCLfWjYELxtujL56idCN/XA==}
+  /@aw-web-design/x-default-browser@1.4.126:
+    resolution: {integrity: sha512-Xk1sIhyNC/esHGGVjL/niHLowM0csl/kFO5uawBy4IrWwy0o1G8LGt3jP6nmWGz+USxeeqbihAmp/oVZju6wug==}
     hasBin: true
     dependencies:
       default-browser-id: 3.0.0
     dev: true
 
-  /@azure/abort-controller@1.1.0:
-    resolution: {integrity: sha512-TrRLIoSQVzfAJX9H1JeFjzAoDGcoK1IYX1UImfceTZpsyYfWr09Ss1aHW1y5TrrR3iq6RZLBwJ3E24uwPhwahw==}
-    engines: {node: '>=12.0.0'}
+  /@aws-crypto/crc32@3.0.0:
+    resolution: {integrity: sha512-IzSgsrxUcsrejQbPVilIKy16kAT52EwB6zSaI+M3xxIhKh5+aldEyvI+z6erM7TCLB2BJsFrtHjp6/4/sr+3dA==}
     dependencies:
-      tslib: 2.5.0
+      '@aws-crypto/util': 3.0.0
+      '@aws-sdk/types': 3.357.0
+      tslib: 2.6.2
     dev: false
 
-  /@azure/core-auth@1.4.0:
-    resolution: {integrity: sha512-HFrcTgmuSuukRf/EdPmqBrc5l6Q5Uu+2TbuhaKbgaCpP2TfAeiNaQPAadxO+CYBRHGUzIDteMAjFspFLDLnKVQ==}
-    engines: {node: '>=12.0.0'}
+  /@aws-crypto/crc32c@3.0.0:
+    resolution: {integrity: sha512-ENNPPManmnVJ4BTXlOjAgD7URidbAznURqD0KvfREyc4o20DPYdEldU1f5cQ7Jbj0CJJSPaMIk/9ZshdB3210w==}
     dependencies:
-      '@azure/abort-controller': 1.1.0
-      tslib: 2.5.0
+      '@aws-crypto/util': 3.0.0
+      '@aws-sdk/types': 3.357.0
+      tslib: 2.6.2
     dev: false
 
-  /@azure/core-client@1.6.1:
-    resolution: {integrity: sha512-mZ1MSKhZBYoV8GAWceA+PEJFWV2VpdNSpxxcj1wjIAOi00ykRuIQChT99xlQGZWLY3/NApWhSImlFwsmCEs4vA==}
-    engines: {node: '>=12.0.0'}
+  /@aws-crypto/ie11-detection@3.0.0:
+    resolution: {integrity: sha512-341lBBkiY1DfDNKai/wXM3aujNBkXR7tq1URPQDL9wi3AUbI80NR74uF1TXHMm7po1AcnFk8iu2S2IeU/+/A+Q==}
     dependencies:
-      '@azure/abort-controller': 1.1.0
-      '@azure/core-auth': 1.4.0
-      '@azure/core-rest-pipeline': 1.9.2
-      '@azure/core-tracing': 1.0.1
-      '@azure/core-util': 1.1.1
-      '@azure/logger': 1.0.3
-      tslib: 2.5.0
-    transitivePeerDependencies:
-      - supports-color
+      tslib: 2.6.2
     dev: false
 
-  /@azure/core-http-compat@1.3.0:
-    resolution: {integrity: sha512-ZN9avruqbQ5TxopzG3ih3KRy52n8OAbitX3fnZT5go4hzu0J+KVPSzkL+Wt3hpJpdG8WIfg1sBD1tWkgUdEpBA==}
-    engines: {node: '>=12.0.0'}
+  /@aws-crypto/sha1-browser@3.0.0:
+    resolution: {integrity: sha512-NJth5c997GLHs6nOYTzFKTbYdMNA6/1XlKVgnZoaZcQ7z7UJlOgj2JdbHE8tiYLS3fzXNCguct77SPGat2raSw==}
     dependencies:
-      '@azure/abort-controller': 1.1.0
-      '@azure/core-client': 1.6.1
-      '@azure/core-rest-pipeline': 1.9.2
-    transitivePeerDependencies:
-      - supports-color
+      '@aws-crypto/ie11-detection': 3.0.0
+      '@aws-crypto/supports-web-crypto': 3.0.0
+      '@aws-crypto/util': 3.0.0
+      '@aws-sdk/types': 3.357.0
+      '@aws-sdk/util-locate-window': 3.310.0
+      '@aws-sdk/util-utf8-browser': 3.259.0
+      tslib: 2.6.2
     dev: false
 
-  /@azure/core-http@2.2.7:
-    resolution: {integrity: sha512-TyGMeDm90mkRS8XzSQbSMD+TqnWL1XKGCh0x0QVGMD8COH2yU0q5SaHm/IBEBkzcq0u73NhS/p57T3KVSgUFqQ==}
-    engines: {node: '>=12.0.0'}
+  /@aws-crypto/sha256-browser@3.0.0:
+    resolution: {integrity: sha512-8VLmW2B+gjFbU5uMeqtQM6Nj0/F1bro80xQXCW6CQBWgosFWXTx77aeOF5CAIAmbOK64SdMBJdNr6J41yP5mvQ==}
     dependencies:
-      '@azure/abort-controller': 1.1.0
-      '@azure/core-auth': 1.4.0
-      '@azure/core-tracing': 1.0.0-preview.13
-      '@azure/core-util': 1.1.1
-      '@azure/logger': 1.0.3
-      '@types/node-fetch': 2.6.2
-      '@types/tunnel': 0.0.3
-      form-data: 4.0.0
-      node-fetch: 2.6.8
-      process: 0.11.10
-      tough-cookie: 4.1.2
-      tslib: 2.5.0
-      tunnel: 0.0.6
-      uuid: 8.3.2
-      xml2js: 0.5.0
-    transitivePeerDependencies:
-      - encoding
+      '@aws-crypto/ie11-detection': 3.0.0
+      '@aws-crypto/sha256-js': 3.0.0
+      '@aws-crypto/supports-web-crypto': 3.0.0
+      '@aws-crypto/util': 3.0.0
+      '@aws-sdk/types': 3.357.0
+      '@aws-sdk/util-locate-window': 3.310.0
+      '@aws-sdk/util-utf8-browser': 3.259.0
+      tslib: 2.6.2
     dev: false
 
-  /@azure/core-lro@2.4.0:
-    resolution: {integrity: sha512-F65+rYkll1dpw3RGm8/SSiSj+/QkMeYDanzS/QKlM1dmuneVyXbO46C88V1MRHluLGdMP6qfD3vDRYALn0z0tQ==}
-    engines: {node: '>=12.0.0'}
+  /@aws-crypto/sha256-js@3.0.0:
+    resolution: {integrity: sha512-PnNN7os0+yd1XvXAy23CFOmTbMaDxgxXtTKHybrJ39Y8kGzBATgBFibWJKH6BhytLI/Zyszs87xCOBNyBig6vQ==}
     dependencies:
-      '@azure/abort-controller': 1.1.0
-      '@azure/logger': 1.0.3
-      tslib: 2.5.0
+      '@aws-crypto/util': 3.0.0
+      '@aws-sdk/types': 3.357.0
+      tslib: 2.6.2
     dev: false
 
-  /@azure/core-paging@1.3.0:
-    resolution: {integrity: sha512-H6Tg9eBm0brHqLy0OSAGzxIh1t4UL8eZVrSUMJ60Ra9cwq2pOskFqVpz2pYoHDsBY1jZ4V/P8LRGb5D5pmC6rg==}
-    engines: {node: '>=12.0.0'}
+  /@aws-crypto/supports-web-crypto@3.0.0:
+    resolution: {integrity: sha512-06hBdMwUAb2WFTuGG73LSC0wfPu93xWwo5vL2et9eymgmu3Id5vFAHBbajVWiGhPO37qcsdCap/FqXvJGJWPIg==}
     dependencies:
-      tslib: 2.5.0
+      tslib: 2.6.2
     dev: false
 
-  /@azure/core-rest-pipeline@1.9.2:
-    resolution: {integrity: sha512-8rXI6ircjenaLp+PkOFpo37tQ1PQfztZkfVj97BIF3RPxHAsoVSgkJtu3IK/bUEWcb7HzXSoyBe06M7ODRkRyw==}
-    engines: {node: '>=12.0.0'}
+  /@aws-crypto/util@3.0.0:
+    resolution: {integrity: sha512-2OJlpeJpCR48CC8r+uKVChzs9Iungj9wkZrl8Z041DWEWvyIHILYKCPNzJghKsivj+S3mLo6BVc7mBNzdxA46w==}
     dependencies:
-      '@azure/abort-controller': 1.1.0
-      '@azure/core-auth': 1.4.0
-      '@azure/core-tracing': 1.0.1
-      '@azure/core-util': 1.1.1
-      '@azure/logger': 1.0.3
-      form-data: 4.0.0
-      http-proxy-agent: 5.0.0
-      https-proxy-agent: 5.0.1
-      tslib: 2.5.0
-      uuid: 8.3.2
-    transitivePeerDependencies:
-      - supports-color
+      '@aws-sdk/types': 3.357.0
+      '@aws-sdk/util-utf8-browser': 3.259.0
+      tslib: 2.6.2
     dev: false
 
-  /@azure/core-tracing@1.0.0-preview.13:
-    resolution: {integrity: sha512-KxDlhXyMlh2Jhj2ykX6vNEU0Vou4nHr025KoSEiz7cS3BNiHNaZcdECk/DmLkEB0as5T7b/TpRcehJ5yV6NeXQ==}
-    engines: {node: '>=12.0.0'}
+  /@aws-sdk/client-bedrock-runtime@3.549.0:
+    resolution: {integrity: sha512-29Qai+25vulsNo41P1JaOa1kVWoF2tI+W6YrGUf64M7Fxhe6MzI5kMM6PHHuOOOeBq6oiSxnpAjDpEWr9p1aDw==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@opentelemetry/api': 1.2.0
-      tslib: 2.5.0
+      '@aws-crypto/sha256-browser': 3.0.0
+      '@aws-crypto/sha256-js': 3.0.0
+      '@aws-sdk/client-sts': 3.549.0(@aws-sdk/credential-provider-node@3.549.0)
+      '@aws-sdk/core': 3.549.0
+      '@aws-sdk/credential-provider-node': 3.549.0
+      '@aws-sdk/middleware-host-header': 3.535.0
+      '@aws-sdk/middleware-logger': 3.535.0
+      '@aws-sdk/middleware-recursion-detection': 3.535.0
+      '@aws-sdk/middleware-user-agent': 3.540.0
+      '@aws-sdk/region-config-resolver': 3.535.0
+      '@aws-sdk/types': 3.535.0
+      '@aws-sdk/util-endpoints': 3.540.0
+      '@aws-sdk/util-user-agent-browser': 3.535.0
+      '@aws-sdk/util-user-agent-node': 3.535.0
+      '@smithy/config-resolver': 2.2.0
+      '@smithy/core': 1.4.2
+      '@smithy/eventstream-serde-browser': 2.2.0
+      '@smithy/eventstream-serde-config-resolver': 2.2.0
+      '@smithy/eventstream-serde-node': 2.2.0
+      '@smithy/fetch-http-handler': 2.5.0
+      '@smithy/hash-node': 2.2.0
+      '@smithy/invalid-dependency': 2.2.0
+      '@smithy/middleware-content-length': 2.2.0
+      '@smithy/middleware-endpoint': 2.5.1
+      '@smithy/middleware-retry': 2.3.1
+      '@smithy/middleware-serde': 2.3.0
+      '@smithy/middleware-stack': 2.2.0
+      '@smithy/node-config-provider': 2.3.0
+      '@smithy/node-http-handler': 2.5.0
+      '@smithy/protocol-http': 3.3.0
+      '@smithy/smithy-client': 2.5.1
+      '@smithy/types': 2.12.0
+      '@smithy/url-parser': 2.2.0
+      '@smithy/util-base64': 2.3.0
+      '@smithy/util-body-length-browser': 2.2.0
+      '@smithy/util-body-length-node': 2.3.0
+      '@smithy/util-defaults-mode-browser': 2.2.1
+      '@smithy/util-defaults-mode-node': 2.3.1
+      '@smithy/util-endpoints': 1.2.0
+      '@smithy/util-middleware': 2.2.0
+      '@smithy/util-retry': 2.2.0
+      '@smithy/util-stream': 2.2.0
+      '@smithy/util-utf8': 2.3.0
+      tslib: 2.6.2
+    transitivePeerDependencies:
+      - aws-crt
     dev: false
 
-  /@azure/core-tracing@1.0.1:
-    resolution: {integrity: sha512-I5CGMoLtX+pI17ZdiFJZgxMJApsK6jjfm85hpgp3oazCdq5Wxgh4wMr7ge/TTWW1B5WBuvIOI1fMU/FrOAMKrw==}
-    engines: {node: '>=12.0.0'}
+  /@aws-sdk/client-s3@3.478.0:
+    resolution: {integrity: sha512-OUpbCCnK71lQQ07BohJOx9ZER0rPqRAGOVIIVhNEkeN0uYFLzB7/o5a7+FEPUQXEd5rZRZgbxN5xEmnNW/0Waw==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      tslib: 2.5.0
+      '@aws-crypto/sha1-browser': 3.0.0
+      '@aws-crypto/sha256-browser': 3.0.0
+      '@aws-crypto/sha256-js': 3.0.0
+      '@aws-sdk/client-sts': 3.478.0
+      '@aws-sdk/core': 3.477.0
+      '@aws-sdk/credential-provider-node': 3.478.0
+      '@aws-sdk/middleware-bucket-endpoint': 3.470.0
+      '@aws-sdk/middleware-expect-continue': 3.468.0
+      '@aws-sdk/middleware-flexible-checksums': 3.468.0
+      '@aws-sdk/middleware-host-header': 3.468.0
+      '@aws-sdk/middleware-location-constraint': 3.468.0
+      '@aws-sdk/middleware-logger': 3.468.0
+      '@aws-sdk/middleware-recursion-detection': 3.468.0
+      '@aws-sdk/middleware-sdk-s3': 3.474.0
+      '@aws-sdk/middleware-signing': 3.468.0
+      '@aws-sdk/middleware-ssec': 3.468.0
+      '@aws-sdk/middleware-user-agent': 3.478.0
+      '@aws-sdk/region-config-resolver': 3.470.0
+      '@aws-sdk/signature-v4-multi-region': 3.474.0
+      '@aws-sdk/types': 3.468.0
+      '@aws-sdk/util-endpoints': 3.478.0
+      '@aws-sdk/util-user-agent-browser': 3.468.0
+      '@aws-sdk/util-user-agent-node': 3.470.0
+      '@aws-sdk/xml-builder': 3.472.0
+      '@smithy/config-resolver': 2.0.21
+      '@smithy/core': 1.2.0
+      '@smithy/eventstream-serde-browser': 2.0.15
+      '@smithy/eventstream-serde-config-resolver': 2.0.15
+      '@smithy/eventstream-serde-node': 2.0.15
+      '@smithy/fetch-http-handler': 2.3.1
+      '@smithy/hash-blob-browser': 2.0.16
+      '@smithy/hash-node': 2.0.17
+      '@smithy/hash-stream-node': 2.0.17
+      '@smithy/invalid-dependency': 2.0.15
+      '@smithy/md5-js': 2.0.17
+      '@smithy/middleware-content-length': 2.0.17
+      '@smithy/middleware-endpoint': 2.2.3
+      '@smithy/middleware-retry': 2.0.24
+      '@smithy/middleware-serde': 2.0.15
+      '@smithy/middleware-stack': 2.0.9
+      '@smithy/node-config-provider': 2.1.8
+      '@smithy/node-http-handler': 2.2.1
+      '@smithy/protocol-http': 3.0.11
+      '@smithy/smithy-client': 2.1.18
+      '@smithy/types': 2.7.0
+      '@smithy/url-parser': 2.0.15
+      '@smithy/util-base64': 2.0.1
+      '@smithy/util-body-length-browser': 2.0.1
+      '@smithy/util-body-length-node': 2.1.0
+      '@smithy/util-defaults-mode-browser': 2.0.22
+      '@smithy/util-defaults-mode-node': 2.0.29
+      '@smithy/util-endpoints': 1.0.7
+      '@smithy/util-retry': 2.0.8
+      '@smithy/util-stream': 2.0.23
+      '@smithy/util-utf8': 2.0.2
+      '@smithy/util-waiter': 2.0.15
+      fast-xml-parser: 4.2.5
+      tslib: 2.6.2
+    transitivePeerDependencies:
+      - aws-crt
     dev: false
 
-  /@azure/core-util@1.1.1:
-    resolution: {integrity: sha512-A4TBYVQCtHOigFb2ETiiKFDocBoI1Zk2Ui1KpI42aJSIDexF7DHQFpnjonltXAIU/ceH+1fsZAWWgvX6/AKzog==}
-    engines: {node: '>=12.0.0'}
-    dependencies:
-      '@azure/abort-controller': 1.1.0
-      tslib: 2.5.0
+  /@aws-sdk/client-sso-oidc@3.549.0(@aws-sdk/credential-provider-node@3.549.0):
+    resolution: {integrity: sha512-FbB4A78ILAb8sM4TfBd+3CrQcfZIhe0gtVZNbaxpq5cJZh1K7oZ8vPfKw4do9JWkDUXPLsD9Bwz12f8/JpAb6Q==}
+    engines: {node: '>=14.0.0'}
+    peerDependencies:
+      '@aws-sdk/credential-provider-node': ^3.549.0
+    dependencies:
+      '@aws-crypto/sha256-browser': 3.0.0
+      '@aws-crypto/sha256-js': 3.0.0
+      '@aws-sdk/client-sts': 3.549.0(@aws-sdk/credential-provider-node@3.549.0)
+      '@aws-sdk/core': 3.549.0
+      '@aws-sdk/credential-provider-node': 3.549.0
+      '@aws-sdk/middleware-host-header': 3.535.0
+      '@aws-sdk/middleware-logger': 3.535.0
+      '@aws-sdk/middleware-recursion-detection': 3.535.0
+      '@aws-sdk/middleware-user-agent': 3.540.0
+      '@aws-sdk/region-config-resolver': 3.535.0
+      '@aws-sdk/types': 3.535.0
+      '@aws-sdk/util-endpoints': 3.540.0
+      '@aws-sdk/util-user-agent-browser': 3.535.0
+      '@aws-sdk/util-user-agent-node': 3.535.0
+      '@smithy/config-resolver': 2.2.0
+      '@smithy/core': 1.4.2
+      '@smithy/fetch-http-handler': 2.5.0
+      '@smithy/hash-node': 2.2.0
+      '@smithy/invalid-dependency': 2.2.0
+      '@smithy/middleware-content-length': 2.2.0
+      '@smithy/middleware-endpoint': 2.5.1
+      '@smithy/middleware-retry': 2.3.1
+      '@smithy/middleware-serde': 2.3.0
+      '@smithy/middleware-stack': 2.2.0
+      '@smithy/node-config-provider': 2.3.0
+      '@smithy/node-http-handler': 2.5.0
+      '@smithy/protocol-http': 3.3.0
+      '@smithy/smithy-client': 2.5.1
+      '@smithy/types': 2.12.0
+      '@smithy/url-parser': 2.2.0
+      '@smithy/util-base64': 2.3.0
+      '@smithy/util-body-length-browser': 2.2.0
+      '@smithy/util-body-length-node': 2.3.0
+      '@smithy/util-defaults-mode-browser': 2.2.1
+      '@smithy/util-defaults-mode-node': 2.3.1
+      '@smithy/util-endpoints': 1.2.0
+      '@smithy/util-middleware': 2.2.0
+      '@smithy/util-retry': 2.2.0
+      '@smithy/util-utf8': 2.3.0
+      tslib: 2.6.2
+    transitivePeerDependencies:
+      - aws-crt
     dev: false
 
-  /@azure/identity@2.1.0:
-    resolution: {integrity: sha512-BPDz1sK7Ul9t0l9YKLEa8PHqWU4iCfhGJ+ELJl6c8CP3TpJt2urNCbm0ZHsthmxRsYoMPbz2Dvzj30zXZVmAFw==}
-    engines: {node: '>=12.0.0'}
+  /@aws-sdk/client-sso@3.478.0:
+    resolution: {integrity: sha512-Jxy9cE1JMkPR0PklCpq3cORHnZq/Z4klhSTNGgZNeBWovMa+plor52kyh8iUNHKl3XEJvTbHM7V+dvrr/x0P1g==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@azure/abort-controller': 1.1.0
-      '@azure/core-auth': 1.4.0
-      '@azure/core-client': 1.6.1
-      '@azure/core-rest-pipeline': 1.9.2
-      '@azure/core-tracing': 1.0.1
-      '@azure/core-util': 1.1.1
-      '@azure/logger': 1.0.3
-      '@azure/msal-browser': 2.30.0
-      '@azure/msal-common': 7.6.0
-      '@azure/msal-node': 1.14.2
-      events: 3.3.0
-      jws: 4.0.0
-      open: 8.4.0
-      stoppable: 1.1.0
-      tslib: 2.5.0
-      uuid: 8.3.2
+      '@aws-crypto/sha256-browser': 3.0.0
+      '@aws-crypto/sha256-js': 3.0.0
+      '@aws-sdk/core': 3.477.0
+      '@aws-sdk/middleware-host-header': 3.468.0
+      '@aws-sdk/middleware-logger': 3.468.0
+      '@aws-sdk/middleware-recursion-detection': 3.468.0
+      '@aws-sdk/middleware-user-agent': 3.478.0
+      '@aws-sdk/region-config-resolver': 3.470.0
+      '@aws-sdk/types': 3.468.0
+      '@aws-sdk/util-endpoints': 3.478.0
+      '@aws-sdk/util-user-agent-browser': 3.468.0
+      '@aws-sdk/util-user-agent-node': 3.470.0
+      '@smithy/config-resolver': 2.0.21
+      '@smithy/core': 1.2.0
+      '@smithy/fetch-http-handler': 2.3.1
+      '@smithy/hash-node': 2.0.17
+      '@smithy/invalid-dependency': 2.0.15
+      '@smithy/middleware-content-length': 2.0.17
+      '@smithy/middleware-endpoint': 2.2.3
+      '@smithy/middleware-retry': 2.0.24
+      '@smithy/middleware-serde': 2.0.15
+      '@smithy/middleware-stack': 2.0.9
+      '@smithy/node-config-provider': 2.1.8
+      '@smithy/node-http-handler': 2.2.1
+      '@smithy/protocol-http': 3.0.11
+      '@smithy/smithy-client': 2.1.18
+      '@smithy/types': 2.7.0
+      '@smithy/url-parser': 2.0.15
+      '@smithy/util-base64': 2.0.1
+      '@smithy/util-body-length-browser': 2.0.1
+      '@smithy/util-body-length-node': 2.1.0
+      '@smithy/util-defaults-mode-browser': 2.0.22
+      '@smithy/util-defaults-mode-node': 2.0.29
+      '@smithy/util-endpoints': 1.0.7
+      '@smithy/util-retry': 2.0.8
+      '@smithy/util-utf8': 2.0.2
+      tslib: 2.6.2
     transitivePeerDependencies:
-      - supports-color
+      - aws-crt
     dev: false
 
-  /@azure/keyvault-keys@4.6.0:
-    resolution: {integrity: sha512-0112LegxeR03L8J4k+q6HwBVvrpd9y+oInG0FG3NaHXN7YUubVBon/eb5jFI6edGrvNigpxSR0XIsprFXdkzCQ==}
-    engines: {node: '>=12.0.0'}
+  /@aws-sdk/client-sso@3.549.0:
+    resolution: {integrity: sha512-lz+yflOAj5Q263FlCsKpNqttaCb2NPh8jC76gVCqCt7TPxRDBYVaqg0OZYluDaETIDNJi4DwN2Azcck7ilwuPw==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@azure/abort-controller': 1.1.0
-      '@azure/core-auth': 1.4.0
-      '@azure/core-client': 1.6.1
-      '@azure/core-http-compat': 1.3.0
-      '@azure/core-lro': 2.4.0
-      '@azure/core-paging': 1.3.0
-      '@azure/core-rest-pipeline': 1.9.2
-      '@azure/core-tracing': 1.0.1
-      '@azure/core-util': 1.1.1
-      '@azure/logger': 1.0.3
-      tslib: 2.5.0
+      '@aws-crypto/sha256-browser': 3.0.0
+      '@aws-crypto/sha256-js': 3.0.0
+      '@aws-sdk/core': 3.549.0
+      '@aws-sdk/middleware-host-header': 3.535.0
+      '@aws-sdk/middleware-logger': 3.535.0
+      '@aws-sdk/middleware-recursion-detection': 3.535.0
+      '@aws-sdk/middleware-user-agent': 3.540.0
+      '@aws-sdk/region-config-resolver': 3.535.0
+      '@aws-sdk/types': 3.535.0
+      '@aws-sdk/util-endpoints': 3.540.0
+      '@aws-sdk/util-user-agent-browser': 3.535.0
+      '@aws-sdk/util-user-agent-node': 3.535.0
+      '@smithy/config-resolver': 2.2.0
+      '@smithy/core': 1.4.2
+      '@smithy/fetch-http-handler': 2.5.0
+      '@smithy/hash-node': 2.2.0
+      '@smithy/invalid-dependency': 2.2.0
+      '@smithy/middleware-content-length': 2.2.0
+      '@smithy/middleware-endpoint': 2.5.1
+      '@smithy/middleware-retry': 2.3.1
+      '@smithy/middleware-serde': 2.3.0
+      '@smithy/middleware-stack': 2.2.0
+      '@smithy/node-config-provider': 2.3.0
+      '@smithy/node-http-handler': 2.5.0
+      '@smithy/protocol-http': 3.3.0
+      '@smithy/smithy-client': 2.5.1
+      '@smithy/types': 2.12.0
+      '@smithy/url-parser': 2.2.0
+      '@smithy/util-base64': 2.3.0
+      '@smithy/util-body-length-browser': 2.2.0
+      '@smithy/util-body-length-node': 2.3.0
+      '@smithy/util-defaults-mode-browser': 2.2.1
+      '@smithy/util-defaults-mode-node': 2.3.1
+      '@smithy/util-endpoints': 1.2.0
+      '@smithy/util-middleware': 2.2.0
+      '@smithy/util-retry': 2.2.0
+      '@smithy/util-utf8': 2.3.0
+      tslib: 2.6.2
     transitivePeerDependencies:
-      - supports-color
+      - aws-crt
     dev: false
 
-  /@azure/logger@1.0.3:
-    resolution: {integrity: sha512-aK4s3Xxjrx3daZr3VylxejK3vG5ExXck5WOHDJ8in/k9AqlfIyFMMT1uG7u8mNjX+QRILTIn0/Xgschfh/dQ9g==}
-    engines: {node: '>=12.0.0'}
+  /@aws-sdk/client-sts@3.478.0:
+    resolution: {integrity: sha512-D+QID0dYzmn9dcxgKP3/nMndUqiQbDLsqI0Zf2pG4MW5gPhVNKlDGIV3Ztz8SkMjzGJExNOLW2L569o8jshJVw==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      tslib: 2.5.0
+      '@aws-crypto/sha256-browser': 3.0.0
+      '@aws-crypto/sha256-js': 3.0.0
+      '@aws-sdk/core': 3.477.0
+      '@aws-sdk/credential-provider-node': 3.478.0
+      '@aws-sdk/middleware-host-header': 3.468.0
+      '@aws-sdk/middleware-logger': 3.468.0
+      '@aws-sdk/middleware-recursion-detection': 3.468.0
+      '@aws-sdk/middleware-user-agent': 3.478.0
+      '@aws-sdk/region-config-resolver': 3.470.0
+      '@aws-sdk/types': 3.468.0
+      '@aws-sdk/util-endpoints': 3.478.0
+      '@aws-sdk/util-user-agent-browser': 3.468.0
+      '@aws-sdk/util-user-agent-node': 3.470.0
+      '@smithy/config-resolver': 2.0.21
+      '@smithy/core': 1.2.0
+      '@smithy/fetch-http-handler': 2.3.1
+      '@smithy/hash-node': 2.0.17
+      '@smithy/invalid-dependency': 2.0.15
+      '@smithy/middleware-content-length': 2.0.17
+      '@smithy/middleware-endpoint': 2.2.3
+      '@smithy/middleware-retry': 2.0.24
+      '@smithy/middleware-serde': 2.0.15
+      '@smithy/middleware-stack': 2.0.9
+      '@smithy/node-config-provider': 2.1.8
+      '@smithy/node-http-handler': 2.2.1
+      '@smithy/protocol-http': 3.0.11
+      '@smithy/smithy-client': 2.1.18
+      '@smithy/types': 2.7.0
+      '@smithy/url-parser': 2.0.15
+      '@smithy/util-base64': 2.0.1
+      '@smithy/util-body-length-browser': 2.0.1
+      '@smithy/util-body-length-node': 2.1.0
+      '@smithy/util-defaults-mode-browser': 2.0.22
+      '@smithy/util-defaults-mode-node': 2.0.29
+      '@smithy/util-endpoints': 1.0.7
+      '@smithy/util-middleware': 2.0.8
+      '@smithy/util-retry': 2.0.8
+      '@smithy/util-utf8': 2.0.2
+      fast-xml-parser: 4.2.5
+      tslib: 2.6.2
+    transitivePeerDependencies:
+      - aws-crt
     dev: false
 
-  /@azure/msal-browser@2.30.0:
-    resolution: {integrity: sha512-4Y9+rjJiTFP7KEmuq1btmIrBgk0ImNyKsXj6A6NHZALd1X0M6W7L7kxpH6F+d1tEkMv8bYnZdn7IcauXbL8Llw==}
-    engines: {node: '>=0.8.0'}
-    dependencies:
-      '@azure/msal-common': 7.6.0
+  /@aws-sdk/client-sts@3.549.0(@aws-sdk/credential-provider-node@3.549.0):
+    resolution: {integrity: sha512-63IreJ598Dzvpb+6sy81KfIX5iQxnrWSEtlyeCdC2GO6gmSQVwJzc9kr5pAC83lHmlZcm/Q3KZr3XBhRQqP0og==}
+    engines: {node: '>=14.0.0'}
+    peerDependencies:
+      '@aws-sdk/credential-provider-node': ^3.549.0
+    dependencies:
+      '@aws-crypto/sha256-browser': 3.0.0
+      '@aws-crypto/sha256-js': 3.0.0
+      '@aws-sdk/core': 3.549.0
+      '@aws-sdk/credential-provider-node': 3.549.0
+      '@aws-sdk/middleware-host-header': 3.535.0
+      '@aws-sdk/middleware-logger': 3.535.0
+      '@aws-sdk/middleware-recursion-detection': 3.535.0
+      '@aws-sdk/middleware-user-agent': 3.540.0
+      '@aws-sdk/region-config-resolver': 3.535.0
+      '@aws-sdk/types': 3.535.0
+      '@aws-sdk/util-endpoints': 3.540.0
+      '@aws-sdk/util-user-agent-browser': 3.535.0
+      '@aws-sdk/util-user-agent-node': 3.535.0
+      '@smithy/config-resolver': 2.2.0
+      '@smithy/core': 1.4.2
+      '@smithy/fetch-http-handler': 2.5.0
+      '@smithy/hash-node': 2.2.0
+      '@smithy/invalid-dependency': 2.2.0
+      '@smithy/middleware-content-length': 2.2.0
+      '@smithy/middleware-endpoint': 2.5.1
+      '@smithy/middleware-retry': 2.3.1
+      '@smithy/middleware-serde': 2.3.0
+      '@smithy/middleware-stack': 2.2.0
+      '@smithy/node-config-provider': 2.3.0
+      '@smithy/node-http-handler': 2.5.0
+      '@smithy/protocol-http': 3.3.0
+      '@smithy/smithy-client': 2.5.1
+      '@smithy/types': 2.12.0
+      '@smithy/url-parser': 2.2.0
+      '@smithy/util-base64': 2.3.0
+      '@smithy/util-body-length-browser': 2.2.0
+      '@smithy/util-body-length-node': 2.3.0
+      '@smithy/util-defaults-mode-browser': 2.2.1
+      '@smithy/util-defaults-mode-node': 2.3.1
+      '@smithy/util-endpoints': 1.2.0
+      '@smithy/util-middleware': 2.2.0
+      '@smithy/util-retry': 2.2.0
+      '@smithy/util-utf8': 2.3.0
+      tslib: 2.6.2
+    transitivePeerDependencies:
+      - aws-crt
     dev: false
 
-  /@azure/msal-common@7.6.0:
-    resolution: {integrity: sha512-XqfbglUTVLdkHQ8F9UQJtKseRr3sSnr9ysboxtoswvaMVaEfvyLtMoHv9XdKUfOc0qKGzNgRFd9yRjIWVepl6Q==}
-    engines: {node: '>=0.8.0'}
+  /@aws-sdk/core@3.477.0:
+    resolution: {integrity: sha512-o0434EH+d1BxHZvgG7z8vph2SYefciQ5RnJw2MgvETGnthgqsnI4nnNJLSw0FVeqCeS18n6vRtzqlGYR2YPCNg==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@smithy/core': 1.2.0
+      '@smithy/protocol-http': 3.0.11
+      '@smithy/signature-v4': 2.0.5
+      '@smithy/smithy-client': 2.1.18
+      '@smithy/types': 2.7.0
+      tslib: 2.6.2
     dev: false
 
-  /@azure/msal-node@1.14.2:
-    resolution: {integrity: sha512-t3whVhhLdZVVeDEtUPD2Wqfa8BDi3EDMnpWp8dbuRW0GhUpikBfs4AQU0Fe6P9zS87n9LpmUTLrIcPEEuzkvfA==}
-    engines: {node: 10 || 12 || 14 || 16 || 18}
+  /@aws-sdk/core@3.549.0:
+    resolution: {integrity: sha512-jC61OxJn72r/BbuDRCcluiw05Xw9eVLG0CwxQpF3RocxfxyZqlrGYaGecZ8Wy+7g/3sqGRC/Ar5eUhU1YcLx7w==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@azure/msal-common': 7.6.0
-      jsonwebtoken: 9.0.0
-      uuid: 8.3.2
+      '@smithy/core': 1.4.2
+      '@smithy/protocol-http': 3.3.0
+      '@smithy/signature-v4': 2.2.1
+      '@smithy/smithy-client': 2.5.1
+      '@smithy/types': 2.12.0
+      fast-xml-parser: 4.2.5
+      tslib: 2.6.2
     dev: false
 
-  /@azure/storage-blob@12.11.0:
-    resolution: {integrity: sha512-na+FisoARuaOWaHWpmdtk3FeuTWf2VWamdJ9/TJJzj5ZdXPLC3juoDgFs6XVuJIoK30yuBpyFBEDXVRK4pB7Tg==}
-    engines: {node: '>=12.0.0'}
+  /@aws-sdk/credential-provider-env@3.468.0:
+    resolution: {integrity: sha512-k/1WHd3KZn0EQYjadooj53FC0z24/e4dUZhbSKTULgmxyO62pwh9v3Brvw4WRa/8o2wTffU/jo54tf4vGuP/ZA==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@azure/abort-controller': 1.1.0
-      '@azure/core-http': 2.2.7
-      '@azure/core-lro': 2.4.0
-      '@azure/core-paging': 1.3.0
-      '@azure/core-tracing': 1.0.0-preview.13
-      '@azure/logger': 1.0.3
-      events: 3.3.0
-      tslib: 2.5.0
-    transitivePeerDependencies:
-      - encoding
+      '@aws-sdk/types': 3.468.0
+      '@smithy/property-provider': 2.0.16
+      '@smithy/types': 2.7.0
+      tslib: 2.6.2
     dev: false
 
-  /@babel/code-frame@7.18.6:
-    resolution: {integrity: sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==}
-    engines: {node: '>=6.9.0'}
+  /@aws-sdk/credential-provider-env@3.535.0:
+    resolution: {integrity: sha512-XppwO8c0GCGSAvdzyJOhbtktSEaShg14VJKg8mpMa1XcgqzmcqqHQjtDWbx5rZheY1VdpXZhpEzJkB6LpQejpA==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@babel/highlight': 7.18.6
-    dev: true
+      '@aws-sdk/types': 3.535.0
+      '@smithy/property-provider': 2.2.0
+      '@smithy/types': 2.12.0
+      tslib: 2.6.2
+    dev: false
 
-  /@babel/code-frame@7.21.4:
-    resolution: {integrity: sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==}
-    engines: {node: '>=6.9.0'}
+  /@aws-sdk/credential-provider-http@3.535.0:
+    resolution: {integrity: sha512-kdj1wCmOMZ29jSlUskRqN04S6fJ4dvt0Nq9Z32SA6wO7UG8ht6Ot9h/au/eTWJM3E1somZ7D771oK7dQt9b8yw==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@babel/highlight': 7.18.6
-    dev: true
-
-  /@babel/compat-data@7.20.10:
-    resolution: {integrity: sha512-sEnuDPpOJR/fcafHMjpcpGN5M2jbUGUHwmuWKM/YdPzeEDJg8bgmbcWQFUfE32MQjti1koACvoPVsDe8Uq+idg==}
-    engines: {node: '>=6.9.0'}
-    dev: true
+      '@aws-sdk/types': 3.535.0
+      '@smithy/fetch-http-handler': 2.5.0
+      '@smithy/node-http-handler': 2.5.0
+      '@smithy/property-provider': 2.2.0
+      '@smithy/protocol-http': 3.3.0
+      '@smithy/smithy-client': 2.5.1
+      '@smithy/types': 2.12.0
+      '@smithy/util-stream': 2.2.0
+      tslib: 2.6.2
+    dev: false
 
-  /@babel/compat-data@7.21.5:
-    resolution: {integrity: sha512-M+XAiQ7GzQ3FDPf0KOLkugzptnIypt0X0ma0wmlTKPR3IchgNFdx2JXxZdvd18JY5s7QkaFD/qyX0dsMpog/Ug==}
-    engines: {node: '>=6.9.0'}
-    dev: true
+  /@aws-sdk/credential-provider-ini@3.478.0:
+    resolution: {integrity: sha512-SsrYEYUvTG9ZoPC+zB19AnVoOKID+QIEHJDIi1GCZXW5kTVyr1saTVm4orG2TjYvbHQMddsWtHOvGYXZWAYMbw==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@aws-sdk/credential-provider-env': 3.468.0
+      '@aws-sdk/credential-provider-process': 3.468.0
+      '@aws-sdk/credential-provider-sso': 3.478.0
+      '@aws-sdk/credential-provider-web-identity': 3.468.0
+      '@aws-sdk/types': 3.468.0
+      '@smithy/credential-provider-imds': 2.1.4
+      '@smithy/property-provider': 2.0.16
+      '@smithy/shared-ini-file-loader': 2.2.7
+      '@smithy/types': 2.7.0
+      tslib: 2.6.2
+    transitivePeerDependencies:
+      - aws-crt
+    dev: false
 
-  /@babel/core@7.20.12:
-    resolution: {integrity: sha512-XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg==}
-    engines: {node: '>=6.9.0'}
+  /@aws-sdk/credential-provider-ini@3.549.0(@aws-sdk/credential-provider-node@3.549.0):
+    resolution: {integrity: sha512-k6IIrluZjQpzui5Din8fW3bFFhHaJ64XrsfYx0Ks1mb7xan84dJxmYP3tdDDmLzUeJv5h95ag88taHfjY9rakA==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@ampproject/remapping': 2.2.0
-      '@babel/code-frame': 7.18.6
-      '@babel/generator': 7.20.7
-      '@babel/helper-compilation-targets': 7.20.7(@babel/core@7.20.12)
-      '@babel/helper-module-transforms': 7.20.11
-      '@babel/helpers': 7.20.7
-      '@babel/parser': 7.20.7
-      '@babel/template': 7.20.7
-      '@babel/traverse': 7.20.12
-      '@babel/types': 7.20.7
-      convert-source-map: 1.9.0
-      debug: 4.3.4(supports-color@8.1.1)
-      gensync: 1.0.0-beta.2
-      json5: 2.2.3
-      semver: 6.3.0
+      '@aws-sdk/client-sts': 3.549.0(@aws-sdk/credential-provider-node@3.549.0)
+      '@aws-sdk/credential-provider-env': 3.535.0
+      '@aws-sdk/credential-provider-process': 3.535.0
+      '@aws-sdk/credential-provider-sso': 3.549.0(@aws-sdk/credential-provider-node@3.549.0)
+      '@aws-sdk/credential-provider-web-identity': 3.549.0(@aws-sdk/credential-provider-node@3.549.0)
+      '@aws-sdk/types': 3.535.0
+      '@smithy/credential-provider-imds': 2.3.0
+      '@smithy/property-provider': 2.2.0
+      '@smithy/shared-ini-file-loader': 2.4.0
+      '@smithy/types': 2.12.0
+      tslib: 2.6.2
     transitivePeerDependencies:
-      - supports-color
-    dev: true
+      - '@aws-sdk/credential-provider-node'
+      - aws-crt
+    dev: false
 
-  /@babel/core@7.21.5:
-    resolution: {integrity: sha512-9M398B/QH5DlfCOTKDZT1ozXr0x8uBEeFd+dJraGUZGiaNpGCDVGCc14hZexsMblw3XxltJ+6kSvogp9J+5a9g==}
-    engines: {node: '>=6.9.0'}
+  /@aws-sdk/credential-provider-node@3.478.0:
+    resolution: {integrity: sha512-nwDutJYeHiIZCQDgKIUrsgwAWTil0mNe+cbd+j8fi+wwxkWUzip+F0+z02molJ8WrUUKNRhqB1V5aVx7IranuA==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@ampproject/remapping': 2.2.0
-      '@babel/code-frame': 7.21.4
-      '@babel/generator': 7.21.5
-      '@babel/helper-compilation-targets': 7.21.5(@babel/core@7.21.5)
-      '@babel/helper-module-transforms': 7.21.5
-      '@babel/helpers': 7.21.5
-      '@babel/parser': 7.21.5
-      '@babel/template': 7.20.7
-      '@babel/traverse': 7.21.5
-      '@babel/types': 7.21.5
-      convert-source-map: 1.9.0
-      debug: 4.3.4(supports-color@8.1.1)
-      gensync: 1.0.0-beta.2
-      json5: 2.2.3
-      semver: 6.3.0
+      '@aws-sdk/credential-provider-env': 3.468.0
+      '@aws-sdk/credential-provider-ini': 3.478.0
+      '@aws-sdk/credential-provider-process': 3.468.0
+      '@aws-sdk/credential-provider-sso': 3.478.0
+      '@aws-sdk/credential-provider-web-identity': 3.468.0
+      '@aws-sdk/types': 3.468.0
+      '@smithy/credential-provider-imds': 2.1.4
+      '@smithy/property-provider': 2.0.16
+      '@smithy/shared-ini-file-loader': 2.2.7
+      '@smithy/types': 2.7.0
+      tslib: 2.6.2
     transitivePeerDependencies:
-      - supports-color
-    dev: true
+      - aws-crt
+    dev: false
 
-  /@babel/generator@7.20.7:
-    resolution: {integrity: sha512-7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw==}
-    engines: {node: '>=6.9.0'}
+  /@aws-sdk/credential-provider-node@3.549.0:
+    resolution: {integrity: sha512-f3YgalsMuywEAVX4AUm9tojqrBdfpAac0+D320ePzas0Ntbp7ItYu9ceKIhgfzXO3No7P3QK0rCrOxL+ABTn8Q==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@babel/types': 7.20.7
-      '@jridgewell/gen-mapping': 0.3.2
-      jsesc: 2.5.2
-    dev: true
+      '@aws-sdk/credential-provider-env': 3.535.0
+      '@aws-sdk/credential-provider-http': 3.535.0
+      '@aws-sdk/credential-provider-ini': 3.549.0(@aws-sdk/credential-provider-node@3.549.0)
+      '@aws-sdk/credential-provider-process': 3.535.0
+      '@aws-sdk/credential-provider-sso': 3.549.0(@aws-sdk/credential-provider-node@3.549.0)
+      '@aws-sdk/credential-provider-web-identity': 3.549.0(@aws-sdk/credential-provider-node@3.549.0)
+      '@aws-sdk/types': 3.535.0
+      '@smithy/credential-provider-imds': 2.3.0
+      '@smithy/property-provider': 2.2.0
+      '@smithy/shared-ini-file-loader': 2.4.0
+      '@smithy/types': 2.12.0
+      tslib: 2.6.2
+    transitivePeerDependencies:
+      - aws-crt
+    dev: false
 
-  /@babel/generator@7.21.5:
-    resolution: {integrity: sha512-SrKK/sRv8GesIW1bDagf9cCG38IOMYZusoe1dfg0D8aiUe3Amvoj1QtjTPAWcfrZFvIwlleLb0gxzQidL9w14w==}
-    engines: {node: '>=6.9.0'}
+  /@aws-sdk/credential-provider-process@3.468.0:
+    resolution: {integrity: sha512-OYSn1A/UsyPJ7Z8Q2cNhTf55O36shPmSsvOfND04nSfu1nPaR+VUvvsP7v+brhGpwC/GAKTIdGAo4blH31BS6A==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@babel/types': 7.21.5
-      '@jridgewell/gen-mapping': 0.3.2
-      '@jridgewell/trace-mapping': 0.3.17
-      jsesc: 2.5.2
-    dev: true
+      '@aws-sdk/types': 3.468.0
+      '@smithy/property-provider': 2.0.16
+      '@smithy/shared-ini-file-loader': 2.2.7
+      '@smithy/types': 2.7.0
+      tslib: 2.6.2
+    dev: false
 
-  /@babel/helper-annotate-as-pure@7.18.6:
-    resolution: {integrity: sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==}
-    engines: {node: '>=6.9.0'}
+  /@aws-sdk/credential-provider-process@3.535.0:
+    resolution: {integrity: sha512-9O1OaprGCnlb/kYl8RwmH7Mlg8JREZctB8r9sa1KhSsWFq/SWO0AuJTyowxD7zL5PkeS4eTvzFFHWCa3OO5epA==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@babel/types': 7.20.7
-    dev: true
+      '@aws-sdk/types': 3.535.0
+      '@smithy/property-provider': 2.2.0
+      '@smithy/shared-ini-file-loader': 2.4.0
+      '@smithy/types': 2.12.0
+      tslib: 2.6.2
+    dev: false
 
-  /@babel/helper-builder-binary-assignment-operator-visitor@7.18.9:
-    resolution: {integrity: sha512-yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw==}
-    engines: {node: '>=6.9.0'}
+  /@aws-sdk/credential-provider-sso@3.478.0:
+    resolution: {integrity: sha512-LsDShG51X/q+s5ZFN7kHVqrd8ZHdyEyHqdhoocmRvvw2Dif50M0AqQfvCrW1ndj5CNzXO4x/eH8EK5ZOVlS6Sg==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@babel/helper-explode-assignable-expression': 7.18.6
-      '@babel/types': 7.21.5
-    dev: true
+      '@aws-sdk/client-sso': 3.478.0
+      '@aws-sdk/token-providers': 3.478.0
+      '@aws-sdk/types': 3.468.0
+      '@smithy/property-provider': 2.0.16
+      '@smithy/shared-ini-file-loader': 2.2.7
+      '@smithy/types': 2.7.0
+      tslib: 2.6.2
+    transitivePeerDependencies:
+      - aws-crt
+    dev: false
 
-  /@babel/helper-compilation-targets@7.20.7(@babel/core@7.20.12):
-    resolution: {integrity: sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
+  /@aws-sdk/credential-provider-sso@3.549.0(@aws-sdk/credential-provider-node@3.549.0):
+    resolution: {integrity: sha512-BGopRKHs7W8zkoH8qmSHrjudj263kXbhVkAUPxVUz0I28+CZNBgJC/RfVCbOpzmysIQEpwSqvOv1y0k+DQzIJQ==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@babel/compat-data': 7.20.10
-      '@babel/core': 7.20.12
-      '@babel/helper-validator-option': 7.18.6
-      browserslist: 4.21.4
-      lru-cache: 5.1.1
-      semver: 6.3.0
-    dev: true
+      '@aws-sdk/client-sso': 3.549.0
+      '@aws-sdk/token-providers': 3.549.0(@aws-sdk/credential-provider-node@3.549.0)
+      '@aws-sdk/types': 3.535.0
+      '@smithy/property-provider': 2.2.0
+      '@smithy/shared-ini-file-loader': 2.4.0
+      '@smithy/types': 2.12.0
+      tslib: 2.6.2
+    transitivePeerDependencies:
+      - '@aws-sdk/credential-provider-node'
+      - aws-crt
+    dev: false
 
-  /@babel/helper-compilation-targets@7.20.7(@babel/core@7.21.5):
-    resolution: {integrity: sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
+  /@aws-sdk/credential-provider-web-identity@3.468.0:
+    resolution: {integrity: sha512-rexymPmXjtkwCPfhnUq3EjO1rSkf39R4Jz9CqiM7OsqK2qlT5Y/V3gnMKn0ZMXsYaQOMfM3cT5xly5R+OKDHlw==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@babel/compat-data': 7.20.10
-      '@babel/core': 7.21.5
-      '@babel/helper-validator-option': 7.18.6
-      browserslist: 4.21.4
-      lru-cache: 5.1.1
-      semver: 6.3.0
-    dev: true
+      '@aws-sdk/types': 3.468.0
+      '@smithy/property-provider': 2.0.16
+      '@smithy/types': 2.7.0
+      tslib: 2.6.2
+    dev: false
 
-  /@babel/helper-compilation-targets@7.21.5(@babel/core@7.20.12):
-    resolution: {integrity: sha512-1RkbFGUKex4lvsB9yhIfWltJM5cZKUftB2eNajaDv3dCMEp49iBG0K14uH8NnX9IPux2+mK7JGEOB0jn48/J6w==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
+  /@aws-sdk/credential-provider-web-identity@3.549.0(@aws-sdk/credential-provider-node@3.549.0):
+    resolution: {integrity: sha512-QzclVXPxuwSI7515l34sdvliVq5leroO8P7RQFKRgfyQKO45o1psghierwG3PgV6jlMiv78FIAGJBr/n4qZ7YA==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@babel/compat-data': 7.21.5
-      '@babel/core': 7.20.12
-      '@babel/helper-validator-option': 7.21.0
-      browserslist: 4.21.4
-      lru-cache: 5.1.1
-      semver: 6.3.0
-    dev: true
+      '@aws-sdk/client-sts': 3.549.0(@aws-sdk/credential-provider-node@3.549.0)
+      '@aws-sdk/types': 3.535.0
+      '@smithy/property-provider': 2.2.0
+      '@smithy/types': 2.12.0
+      tslib: 2.6.2
+    transitivePeerDependencies:
+      - '@aws-sdk/credential-provider-node'
+      - aws-crt
+    dev: false
 
-  /@babel/helper-compilation-targets@7.21.5(@babel/core@7.21.5):
-    resolution: {integrity: sha512-1RkbFGUKex4lvsB9yhIfWltJM5cZKUftB2eNajaDv3dCMEp49iBG0K14uH8NnX9IPux2+mK7JGEOB0jn48/J6w==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
+  /@aws-sdk/middleware-bucket-endpoint@3.470.0:
+    resolution: {integrity: sha512-vLXXNWtsRmEIwzJ9HUQfIuTNAsEzvCv0Icsnkvt2BiBZXnmHdp2vIC3e3+kfy1D7dVQloXqMmnfcLu/BUMu2Jw==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@babel/compat-data': 7.21.5
-      '@babel/core': 7.21.5
-      '@babel/helper-validator-option': 7.21.0
-      browserslist: 4.21.4
-      lru-cache: 5.1.1
-      semver: 6.3.0
-    dev: true
+      '@aws-sdk/types': 3.468.0
+      '@aws-sdk/util-arn-parser': 3.465.0
+      '@smithy/node-config-provider': 2.1.8
+      '@smithy/protocol-http': 3.0.11
+      '@smithy/types': 2.7.0
+      '@smithy/util-config-provider': 2.0.0
+      tslib: 2.6.2
+    dev: false
 
-  /@babel/helper-create-class-features-plugin@7.20.12(@babel/core@7.20.12):
-    resolution: {integrity: sha512-9OunRkbT0JQcednL0UFvbfXpAsUXiGjUk0a7sN8fUXX7Mue79cUSMjHGDRRi/Vz9vYlpIhLV5fMD5dKoMhhsNQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
+  /@aws-sdk/middleware-expect-continue@3.468.0:
+    resolution: {integrity: sha512-/wmLjmfgeulxhhmnxX3X3N933TvGsYckVIFjAtDSpLjqkbwzEcNiLq7AdmNJ4BfxG0MCMgcht561DCCD19x8Bg==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-annotate-as-pure': 7.18.6
-      '@babel/helper-environment-visitor': 7.18.9
-      '@babel/helper-function-name': 7.19.0
-      '@babel/helper-member-expression-to-functions': 7.20.7
-      '@babel/helper-optimise-call-expression': 7.18.6
-      '@babel/helper-replace-supers': 7.20.7
-      '@babel/helper-skip-transparent-expression-wrappers': 7.20.0
-      '@babel/helper-split-export-declaration': 7.18.6
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
+      '@aws-sdk/types': 3.468.0
+      '@smithy/protocol-http': 3.0.11
+      '@smithy/types': 2.7.0
+      tslib: 2.6.2
+    dev: false
 
-  /@babel/helper-create-class-features-plugin@7.20.12(@babel/core@7.21.5):
-    resolution: {integrity: sha512-9OunRkbT0JQcednL0UFvbfXpAsUXiGjUk0a7sN8fUXX7Mue79cUSMjHGDRRi/Vz9vYlpIhLV5fMD5dKoMhhsNQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
+  /@aws-sdk/middleware-flexible-checksums@3.468.0:
+    resolution: {integrity: sha512-LQwL/N5MCj3Y5keLLewHTqeAXUIMsHFZyxDXRm/uxrOon9ufLKDvGvzAmfwn1/CuSUo66ZfT8VPSA4BsC90RtA==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-annotate-as-pure': 7.18.6
-      '@babel/helper-environment-visitor': 7.18.9
-      '@babel/helper-function-name': 7.19.0
-      '@babel/helper-member-expression-to-functions': 7.20.7
-      '@babel/helper-optimise-call-expression': 7.18.6
-      '@babel/helper-replace-supers': 7.20.7
-      '@babel/helper-skip-transparent-expression-wrappers': 7.20.0
-      '@babel/helper-split-export-declaration': 7.18.6
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
+      '@aws-crypto/crc32': 3.0.0
+      '@aws-crypto/crc32c': 3.0.0
+      '@aws-sdk/types': 3.468.0
+      '@smithy/is-array-buffer': 2.0.0
+      '@smithy/protocol-http': 3.0.11
+      '@smithy/types': 2.7.0
+      '@smithy/util-utf8': 2.0.2
+      tslib: 2.6.2
+    dev: false
 
-  /@babel/helper-create-regexp-features-plugin@7.20.5(@babel/core@7.20.12):
-    resolution: {integrity: sha512-m68B1lkg3XDGX5yCvGO0kPx3v9WIYLnzjKfPcQiwntEQa5ZeRkPmo2X/ISJc8qxWGfwUr+kvZAeEzAwLec2r2w==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
+  /@aws-sdk/middleware-host-header@3.468.0:
+    resolution: {integrity: sha512-gwQ+/QhX+lhof304r6zbZ/V5l5cjhGRxLL3CjH1uJPMcOAbw9wUlMdl+ibr8UwBZ5elfKFGiB1cdW/0uMchw0w==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-annotate-as-pure': 7.18.6
-      regexpu-core: 5.2.2
-    dev: true
+      '@aws-sdk/types': 3.468.0
+      '@smithy/protocol-http': 3.0.11
+      '@smithy/types': 2.7.0
+      tslib: 2.6.2
+    dev: false
 
-  /@babel/helper-create-regexp-features-plugin@7.20.5(@babel/core@7.21.5):
-    resolution: {integrity: sha512-m68B1lkg3XDGX5yCvGO0kPx3v9WIYLnzjKfPcQiwntEQa5ZeRkPmo2X/ISJc8qxWGfwUr+kvZAeEzAwLec2r2w==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
+  /@aws-sdk/middleware-host-header@3.535.0:
+    resolution: {integrity: sha512-0h6TWjBWtDaYwHMQJI9ulafeS4lLaw1vIxRjbpH0svFRt6Eve+Sy8NlVhECfTU2hNz/fLubvrUxsXoThaLBIew==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-annotate-as-pure': 7.18.6
-      regexpu-core: 5.2.2
-    dev: true
+      '@aws-sdk/types': 3.535.0
+      '@smithy/protocol-http': 3.3.0
+      '@smithy/types': 2.12.0
+      tslib: 2.6.2
+    dev: false
 
-  /@babel/helper-define-polyfill-provider@0.3.3(@babel/core@7.20.12):
-    resolution: {integrity: sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==}
-    peerDependencies:
-      '@babel/core': ^7.4.0-0
+  /@aws-sdk/middleware-location-constraint@3.468.0:
+    resolution: {integrity: sha512-0gBX/lDynQr4YIhM9h1dVnkVWqrg+34iOCVIUq8jHxzUzgZWglGkG9lHGGg0r1xkLTmegeoo1OKH8wrQ6n33Cg==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-compilation-targets': 7.21.5(@babel/core@7.20.12)
-      '@babel/helper-plugin-utils': 7.20.2
-      debug: 4.3.4(supports-color@8.1.1)
-      lodash.debounce: 4.0.8
-      resolve: 1.22.1
-      semver: 6.3.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
+      '@aws-sdk/types': 3.468.0
+      '@smithy/types': 2.7.0
+      tslib: 2.6.2
+    dev: false
 
-  /@babel/helper-define-polyfill-provider@0.3.3(@babel/core@7.21.5):
-    resolution: {integrity: sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==}
-    peerDependencies:
-      '@babel/core': ^7.4.0-0
+  /@aws-sdk/middleware-logger@3.468.0:
+    resolution: {integrity: sha512-X5XHKV7DHRXI3f29SAhJPe/OxWRFgDWDMMCALfzhmJfCi6Jfh0M14cJKoC+nl+dk9lB+36+jKjhjETZaL2bPlA==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-compilation-targets': 7.21.5(@babel/core@7.21.5)
-      '@babel/helper-plugin-utils': 7.20.2
-      debug: 4.3.4(supports-color@8.1.1)
-      lodash.debounce: 4.0.8
-      resolve: 1.22.1
-      semver: 6.3.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@babel/helper-environment-visitor@7.18.9:
-    resolution: {integrity: sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==}
-    engines: {node: '>=6.9.0'}
-    dev: true
-
-  /@babel/helper-environment-visitor@7.21.5:
-    resolution: {integrity: sha512-IYl4gZ3ETsWocUWgsFZLM5i1BYx9SoemminVEXadgLBa9TdeorzgLKm8wWLA6J1N/kT3Kch8XIk1laNzYoHKvQ==}
-    engines: {node: '>=6.9.0'}
-    dev: true
+      '@aws-sdk/types': 3.468.0
+      '@smithy/types': 2.7.0
+      tslib: 2.6.2
+    dev: false
 
-  /@babel/helper-explode-assignable-expression@7.18.6:
-    resolution: {integrity: sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg==}
-    engines: {node: '>=6.9.0'}
+  /@aws-sdk/middleware-logger@3.535.0:
+    resolution: {integrity: sha512-huNHpONOrEDrdRTvSQr1cJiRMNf0S52NDXtaPzdxiubTkP+vni2MohmZANMOai/qT0olmEVX01LhZ0ZAOgmg6A==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@babel/types': 7.21.5
-    dev: true
+      '@aws-sdk/types': 3.535.0
+      '@smithy/types': 2.12.0
+      tslib: 2.6.2
+    dev: false
 
-  /@babel/helper-function-name@7.19.0:
-    resolution: {integrity: sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==}
-    engines: {node: '>=6.9.0'}
+  /@aws-sdk/middleware-recursion-detection@3.468.0:
+    resolution: {integrity: sha512-vch9IQib2Ng9ucSyRW2eKNQXHUPb5jUPCLA5otTW/8nGjcOU37LxQG4WrxO7uaJ9Oe8hjHO+hViE3P0KISUhtA==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@babel/template': 7.20.7
-      '@babel/types': 7.21.5
-    dev: true
+      '@aws-sdk/types': 3.468.0
+      '@smithy/protocol-http': 3.0.11
+      '@smithy/types': 2.7.0
+      tslib: 2.6.2
+    dev: false
 
-  /@babel/helper-function-name@7.21.0:
-    resolution: {integrity: sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==}
-    engines: {node: '>=6.9.0'}
+  /@aws-sdk/middleware-recursion-detection@3.535.0:
+    resolution: {integrity: sha512-am2qgGs+gwqmR4wHLWpzlZ8PWhm4ktj5bYSgDrsOfjhdBlWNxvPoID9/pDAz5RWL48+oH7I6SQzMqxXsFDikrw==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@babel/template': 7.20.7
-      '@babel/types': 7.21.5
-    dev: true
+      '@aws-sdk/types': 3.535.0
+      '@smithy/protocol-http': 3.3.0
+      '@smithy/types': 2.12.0
+      tslib: 2.6.2
+    dev: false
 
-  /@babel/helper-hoist-variables@7.18.6:
-    resolution: {integrity: sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==}
-    engines: {node: '>=6.9.0'}
+  /@aws-sdk/middleware-sdk-s3@3.474.0:
+    resolution: {integrity: sha512-62aAo/8u5daIabeJ+gseYeHeShe9eYH6mH+kfWmLsHybXCCv1EaD/ZkdXWNhL0HZ3bUI1z1SF1p8jjTAWALnwA==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@babel/types': 7.21.5
-    dev: true
+      '@aws-sdk/types': 3.468.0
+      '@aws-sdk/util-arn-parser': 3.465.0
+      '@smithy/node-config-provider': 2.1.8
+      '@smithy/protocol-http': 3.0.11
+      '@smithy/signature-v4': 2.0.5
+      '@smithy/smithy-client': 2.1.18
+      '@smithy/types': 2.7.0
+      '@smithy/util-config-provider': 2.0.0
+      tslib: 2.6.2
+    dev: false
 
-  /@babel/helper-member-expression-to-functions@7.20.7:
-    resolution: {integrity: sha512-9J0CxJLq315fEdi4s7xK5TQaNYjZw+nDVpVqr1axNGKzdrdwYBD5b4uKv3n75aABG0rCCTK8Im8Ww7eYfMrZgw==}
-    engines: {node: '>=6.9.0'}
+  /@aws-sdk/middleware-signing@3.468.0:
+    resolution: {integrity: sha512-s+7fSB1gdnnTj5O0aCCarX3z5Vppop8kazbNSZADdkfHIDWCN80IH4ZNjY3OWqaAz0HmR4LNNrovdR304ojb4Q==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@babel/types': 7.21.5
-    dev: true
+      '@aws-sdk/types': 3.468.0
+      '@smithy/property-provider': 2.0.16
+      '@smithy/protocol-http': 3.0.11
+      '@smithy/signature-v4': 2.0.5
+      '@smithy/types': 2.7.0
+      '@smithy/util-middleware': 2.0.8
+      tslib: 2.6.2
+    dev: false
 
-  /@babel/helper-module-imports@7.18.6:
-    resolution: {integrity: sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==}
-    engines: {node: '>=6.9.0'}
+  /@aws-sdk/middleware-ssec@3.468.0:
+    resolution: {integrity: sha512-y1qLW24wRkOGBTK5d6eJXf6d8HYo4rzT4a1mNDN1rd18NSffwQ6Yke5qeUiIaxa0y/l+FvvNYErbhYtij2rJoQ==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@babel/types': 7.20.7
-    dev: true
+      '@aws-sdk/types': 3.468.0
+      '@smithy/types': 2.7.0
+      tslib: 2.6.2
+    dev: false
 
-  /@babel/helper-module-imports@7.21.4:
-    resolution: {integrity: sha512-orajc5T2PsRYUN3ZryCEFeMDYwyw09c/pZeaQEZPH0MpKzSvn3e0uXsDBu3k03VI+9DBiRo+l22BfKTpKwa/Wg==}
-    engines: {node: '>=6.9.0'}
+  /@aws-sdk/middleware-user-agent@3.478.0:
+    resolution: {integrity: sha512-Rec+nAPIzzwxgHPW+xqY6tooJGFOytpYg/xSRv8/IXl3xKGhmpMGs6gDWzmMBv/qy5nKTvLph/csNWJ98GWXCw==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@babel/types': 7.21.5
-    dev: true
+      '@aws-sdk/types': 3.468.0
+      '@aws-sdk/util-endpoints': 3.478.0
+      '@smithy/protocol-http': 3.0.11
+      '@smithy/types': 2.7.0
+      tslib: 2.6.2
+    dev: false
 
-  /@babel/helper-module-transforms@7.20.11:
-    resolution: {integrity: sha512-uRy78kN4psmji1s2QtbtcCSaj/LILFDp0f/ymhpQH5QY3nljUZCaNWz9X1dEj/8MBdBEFECs7yRhKn8i7NjZgg==}
-    engines: {node: '>=6.9.0'}
+  /@aws-sdk/middleware-user-agent@3.540.0:
+    resolution: {integrity: sha512-8Rd6wPeXDnOYzWj1XCmOKcx/Q87L0K1/EHqOBocGjLVbN3gmRxBvpmR1pRTjf7IsWfnnzN5btqtcAkfDPYQUMQ==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@babel/helper-environment-visitor': 7.18.9
-      '@babel/helper-module-imports': 7.18.6
-      '@babel/helper-simple-access': 7.20.2
-      '@babel/helper-split-export-declaration': 7.18.6
-      '@babel/helper-validator-identifier': 7.19.1
-      '@babel/template': 7.20.7
-      '@babel/traverse': 7.20.12
-      '@babel/types': 7.20.7
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
+      '@aws-sdk/types': 3.535.0
+      '@aws-sdk/util-endpoints': 3.540.0
+      '@smithy/protocol-http': 3.3.0
+      '@smithy/types': 2.12.0
+      tslib: 2.6.2
+    dev: false
 
-  /@babel/helper-module-transforms@7.21.5:
-    resolution: {integrity: sha512-bI2Z9zBGY2q5yMHoBvJ2a9iX3ZOAzJPm7Q8Yz6YeoUjU/Cvhmi2G4QyTNyPBqqXSgTjUxRg3L0xV45HvkNWWBw==}
-    engines: {node: '>=6.9.0'}
+  /@aws-sdk/region-config-resolver@3.470.0:
+    resolution: {integrity: sha512-C1o1J06iIw8cyAAOvHqT4Bbqf+PgQ/RDlSyjt2gFfP2OovDpc2o2S90dE8f8iZdSGpg70N5MikT1DBhW9NbhtQ==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@babel/helper-environment-visitor': 7.21.5
-      '@babel/helper-module-imports': 7.21.4
-      '@babel/helper-simple-access': 7.21.5
-      '@babel/helper-split-export-declaration': 7.18.6
-      '@babel/helper-validator-identifier': 7.19.1
-      '@babel/template': 7.20.7
-      '@babel/traverse': 7.21.5
-      '@babel/types': 7.21.5
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
+      '@smithy/node-config-provider': 2.1.8
+      '@smithy/types': 2.7.0
+      '@smithy/util-config-provider': 2.0.0
+      '@smithy/util-middleware': 2.0.8
+      tslib: 2.6.2
+    dev: false
 
-  /@babel/helper-optimise-call-expression@7.18.6:
-    resolution: {integrity: sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==}
-    engines: {node: '>=6.9.0'}
+  /@aws-sdk/region-config-resolver@3.535.0:
+    resolution: {integrity: sha512-IXOznDiaItBjsQy4Fil0kzX/J3HxIOknEphqHbOfUf+LpA5ugcsxuQQONrbEQusCBnfJyymrldBvBhFmtlU9Wg==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@babel/types': 7.21.5
-    dev: true
-
-  /@babel/helper-plugin-utils@7.20.2:
-    resolution: {integrity: sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==}
-    engines: {node: '>=6.9.0'}
-    dev: true
+      '@aws-sdk/types': 3.535.0
+      '@smithy/node-config-provider': 2.3.0
+      '@smithy/types': 2.12.0
+      '@smithy/util-config-provider': 2.3.0
+      '@smithy/util-middleware': 2.2.0
+      tslib: 2.6.2
+    dev: false
 
-  /@babel/helper-remap-async-to-generator@7.18.9(@babel/core@7.20.12):
-    resolution: {integrity: sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
+  /@aws-sdk/signature-v4-multi-region@3.474.0:
+    resolution: {integrity: sha512-93OWRQgTJZASXLrlUNX7mmXknNkYxFYldRLARmYQccONmnIqgYQW0lQj8BFwqkHJTzSMik3/UsU0SHKwZ9ynYA==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-annotate-as-pure': 7.18.6
-      '@babel/helper-environment-visitor': 7.18.9
-      '@babel/helper-wrap-function': 7.20.5
-      '@babel/types': 7.21.5
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
+      '@aws-sdk/middleware-sdk-s3': 3.474.0
+      '@aws-sdk/types': 3.468.0
+      '@smithy/protocol-http': 3.0.11
+      '@smithy/signature-v4': 2.0.5
+      '@smithy/types': 2.7.0
+      tslib: 2.6.2
+    dev: false
 
-  /@babel/helper-remap-async-to-generator@7.18.9(@babel/core@7.21.5):
-    resolution: {integrity: sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
+  /@aws-sdk/token-providers@3.478.0:
+    resolution: {integrity: sha512-7b5tj1y/wGHZIZ+ckjOUKgKrMuCJMF/G1UKZKIqqdekeEsjcThbvoxAMeY0FEowu2ODVk/ggOmpBFxcu0iYd6A==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-annotate-as-pure': 7.18.6
-      '@babel/helper-environment-visitor': 7.18.9
-      '@babel/helper-wrap-function': 7.20.5
-      '@babel/types': 7.21.5
+      '@aws-crypto/sha256-browser': 3.0.0
+      '@aws-crypto/sha256-js': 3.0.0
+      '@aws-sdk/middleware-host-header': 3.468.0
+      '@aws-sdk/middleware-logger': 3.468.0
+      '@aws-sdk/middleware-recursion-detection': 3.468.0
+      '@aws-sdk/middleware-user-agent': 3.478.0
+      '@aws-sdk/region-config-resolver': 3.470.0
+      '@aws-sdk/types': 3.468.0
+      '@aws-sdk/util-endpoints': 3.478.0
+      '@aws-sdk/util-user-agent-browser': 3.468.0
+      '@aws-sdk/util-user-agent-node': 3.470.0
+      '@smithy/config-resolver': 2.0.21
+      '@smithy/fetch-http-handler': 2.3.1
+      '@smithy/hash-node': 2.0.17
+      '@smithy/invalid-dependency': 2.0.15
+      '@smithy/middleware-content-length': 2.0.17
+      '@smithy/middleware-endpoint': 2.2.3
+      '@smithy/middleware-retry': 2.0.24
+      '@smithy/middleware-serde': 2.0.15
+      '@smithy/middleware-stack': 2.0.9
+      '@smithy/node-config-provider': 2.1.8
+      '@smithy/node-http-handler': 2.2.1
+      '@smithy/property-provider': 2.0.16
+      '@smithy/protocol-http': 3.0.11
+      '@smithy/shared-ini-file-loader': 2.2.7
+      '@smithy/smithy-client': 2.1.18
+      '@smithy/types': 2.7.0
+      '@smithy/url-parser': 2.0.15
+      '@smithy/util-base64': 2.0.1
+      '@smithy/util-body-length-browser': 2.0.1
+      '@smithy/util-body-length-node': 2.1.0
+      '@smithy/util-defaults-mode-browser': 2.0.22
+      '@smithy/util-defaults-mode-node': 2.0.29
+      '@smithy/util-endpoints': 1.0.7
+      '@smithy/util-retry': 2.0.8
+      '@smithy/util-utf8': 2.0.2
+      tslib: 2.6.2
     transitivePeerDependencies:
-      - supports-color
-    dev: true
+      - aws-crt
+    dev: false
 
-  /@babel/helper-replace-supers@7.20.7:
-    resolution: {integrity: sha512-vujDMtB6LVfNW13jhlCrp48QNslK6JXi7lQG736HVbHz/mbf4Dc7tIRh1Xf5C0rF7BP8iiSxGMCmY6Ci1ven3A==}
-    engines: {node: '>=6.9.0'}
+  /@aws-sdk/token-providers@3.549.0(@aws-sdk/credential-provider-node@3.549.0):
+    resolution: {integrity: sha512-rJyeXkXknLukRFGuMQOgKnPBa+kLODJtOqEBf929SpQ96f1I6ytdndmWbB5B/OQN5Fu5DOOQUQqJypDQVl5ibQ==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@babel/helper-environment-visitor': 7.18.9
-      '@babel/helper-member-expression-to-functions': 7.20.7
-      '@babel/helper-optimise-call-expression': 7.18.6
-      '@babel/template': 7.20.7
-      '@babel/traverse': 7.21.5
-      '@babel/types': 7.21.5
+      '@aws-sdk/client-sso-oidc': 3.549.0(@aws-sdk/credential-provider-node@3.549.0)
+      '@aws-sdk/types': 3.535.0
+      '@smithy/property-provider': 2.2.0
+      '@smithy/shared-ini-file-loader': 2.4.0
+      '@smithy/types': 2.12.0
+      tslib: 2.6.2
     transitivePeerDependencies:
-      - supports-color
-    dev: true
+      - '@aws-sdk/credential-provider-node'
+      - aws-crt
+    dev: false
 
-  /@babel/helper-simple-access@7.20.2:
-    resolution: {integrity: sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==}
-    engines: {node: '>=6.9.0'}
+  /@aws-sdk/types@3.357.0:
+    resolution: {integrity: sha512-/riCRaXg3p71BeWnShrai0y0QTdXcouPSM0Cn1olZbzTf7s71aLEewrc96qFrL70XhY4XvnxMpqQh+r43XIL3g==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@babel/types': 7.21.5
-    dev: true
+      tslib: 2.6.2
 
-  /@babel/helper-simple-access@7.21.5:
-    resolution: {integrity: sha512-ENPDAMC1wAjR0uaCUwliBdiSl1KBJAVnMTzXqi64c2MG8MPR6ii4qf7bSXDqSFbr4W6W028/rf5ivoHop5/mkg==}
-    engines: {node: '>=6.9.0'}
+  /@aws-sdk/types@3.468.0:
+    resolution: {integrity: sha512-rx/9uHI4inRbp2tw3Y4Ih4PNZkVj32h7WneSg3MVgVjAoVD5Zti9KhS5hkvsBxfgmQmg0AQbE+b1sy5WGAgntA==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@babel/types': 7.21.5
-    dev: true
+      '@smithy/types': 2.7.0
+      tslib: 2.6.2
+    dev: false
 
-  /@babel/helper-skip-transparent-expression-wrappers@7.20.0:
-    resolution: {integrity: sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg==}
-    engines: {node: '>=6.9.0'}
+  /@aws-sdk/types@3.535.0:
+    resolution: {integrity: sha512-aY4MYfduNj+sRR37U7XxYR8wemfbKP6lx00ze2M2uubn7mZotuVrWYAafbMSXrdEMSToE5JDhr28vArSOoLcSg==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@babel/types': 7.21.5
-    dev: true
+      '@smithy/types': 2.12.0
+      tslib: 2.6.2
+    dev: false
 
-  /@babel/helper-split-export-declaration@7.18.6:
-    resolution: {integrity: sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==}
-    engines: {node: '>=6.9.0'}
+  /@aws-sdk/util-arn-parser@3.465.0:
+    resolution: {integrity: sha512-zOJ82vzDJFqBX9yZBlNeHHrul/kpx/DCoxzW5UBbZeb26kfV53QhMSoEmY8/lEbBqlqargJ/sgRC845GFhHNQw==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@babel/types': 7.21.5
-    dev: true
-
-  /@babel/helper-string-parser@7.19.4:
-    resolution: {integrity: sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==}
-    engines: {node: '>=6.9.0'}
-
-  /@babel/helper-string-parser@7.21.5:
-    resolution: {integrity: sha512-5pTUx3hAJaZIdW99sJ6ZUUgWq/Y+Hja7TowEnLNMm1VivRgZQL3vpBY3qUACVsvw+yQU6+YgfBVmcbLaZtrA1w==}
-    engines: {node: '>=6.9.0'}
-    dev: true
+      tslib: 2.6.2
+    dev: false
 
-  /@babel/helper-validator-identifier@7.19.1:
-    resolution: {integrity: sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==}
-    engines: {node: '>=6.9.0'}
+  /@aws-sdk/util-endpoints@3.478.0:
+    resolution: {integrity: sha512-u9Mcg3euGJGs5clPt9mBuhBjHiEKiD0PnfvArhfq9i+dcY5mbCq/i1Dezp3iv1fZH9xxQt7hPXDfSpt1yUSM6g==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@aws-sdk/types': 3.468.0
+      '@smithy/util-endpoints': 1.0.7
+      tslib: 2.6.2
+    dev: false
 
-  /@babel/helper-validator-option@7.18.6:
-    resolution: {integrity: sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==}
-    engines: {node: '>=6.9.0'}
-    dev: true
+  /@aws-sdk/util-endpoints@3.540.0:
+    resolution: {integrity: sha512-1kMyQFAWx6f8alaI6UT65/5YW/7pDWAKAdNwL6vuJLea03KrZRX3PMoONOSJpAS5m3Ot7HlWZvf3wZDNTLELZw==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@aws-sdk/types': 3.535.0
+      '@smithy/types': 2.12.0
+      '@smithy/util-endpoints': 1.2.0
+      tslib: 2.6.2
+    dev: false
 
-  /@babel/helper-validator-option@7.21.0:
-    resolution: {integrity: sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ==}
-    engines: {node: '>=6.9.0'}
-    dev: true
+  /@aws-sdk/util-locate-window@3.310.0:
+    resolution: {integrity: sha512-qo2t/vBTnoXpjKxlsC2e1gBrRm80M3bId27r0BRB2VniSSe7bL1mmzM+/HFtujm0iAxtPM+aLEflLJlJeDPg0w==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      tslib: 2.6.2
+    dev: false
 
-  /@babel/helper-wrap-function@7.20.5:
-    resolution: {integrity: sha512-bYMxIWK5mh+TgXGVqAtnu5Yn1un+v8DDZtqyzKRLUzrh70Eal2O3aZ7aPYiMADO4uKlkzOiRiZ6GX5q3qxvW9Q==}
-    engines: {node: '>=6.9.0'}
+  /@aws-sdk/util-user-agent-browser@3.468.0:
+    resolution: {integrity: sha512-OJyhWWsDEizR3L+dCgMXSUmaCywkiZ7HSbnQytbeKGwokIhD69HTiJcibF/sgcM5gk4k3Mq3puUhGnEZ46GIig==}
     dependencies:
-      '@babel/helper-function-name': 7.21.0
-      '@babel/template': 7.20.7
-      '@babel/traverse': 7.21.5
-      '@babel/types': 7.21.5
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
+      '@aws-sdk/types': 3.468.0
+      '@smithy/types': 2.7.0
+      bowser: 2.11.0
+      tslib: 2.6.2
+    dev: false
 
-  /@babel/helpers@7.20.7:
-    resolution: {integrity: sha512-PBPjs5BppzsGaxHQCDKnZ6Gd9s6xl8bBCluz3vEInLGRJmnZan4F6BYCeqtyXqkk4W5IlPmjK4JlOuZkpJ3xZA==}
-    engines: {node: '>=6.9.0'}
+  /@aws-sdk/util-user-agent-browser@3.535.0:
+    resolution: {integrity: sha512-RWMcF/xV5n+nhaA/Ff5P3yNP3Kur/I+VNZngog4TEs92oB/nwOdAg/2JL8bVAhUbMrjTjpwm7PItziYFQoqyig==}
     dependencies:
-      '@babel/template': 7.20.7
-      '@babel/traverse': 7.20.12
-      '@babel/types': 7.20.7
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
+      '@aws-sdk/types': 3.535.0
+      '@smithy/types': 2.12.0
+      bowser: 2.11.0
+      tslib: 2.6.2
+    dev: false
 
-  /@babel/helpers@7.21.5:
-    resolution: {integrity: sha512-BSY+JSlHxOmGsPTydUkPf1MdMQ3M81x5xGCOVgWM3G8XH77sJ292Y2oqcp0CbbgxhqBuI46iUz1tT7hqP7EfgA==}
-    engines: {node: '>=6.9.0'}
+  /@aws-sdk/util-user-agent-node@3.470.0:
+    resolution: {integrity: sha512-QxsZ9iVHcBB/XRdYvwfM5AMvNp58HfqkIrH88mY0cmxuvtlIGDfWjczdDrZMJk9y0vIq+cuoCHsGXHu7PyiEAQ==}
+    engines: {node: '>=14.0.0'}
+    peerDependencies:
+      aws-crt: '>=1.0.0'
+    peerDependenciesMeta:
+      aws-crt:
+        optional: true
     dependencies:
-      '@babel/template': 7.20.7
-      '@babel/traverse': 7.21.5
-      '@babel/types': 7.21.5
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
+      '@aws-sdk/types': 3.468.0
+      '@smithy/node-config-provider': 2.1.8
+      '@smithy/types': 2.7.0
+      tslib: 2.6.2
+    dev: false
 
-  /@babel/highlight@7.18.6:
-    resolution: {integrity: sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==}
-    engines: {node: '>=6.9.0'}
+  /@aws-sdk/util-user-agent-node@3.535.0:
+    resolution: {integrity: sha512-dRek0zUuIT25wOWJlsRm97nTkUlh1NDcLsQZIN2Y8KxhwoXXWtJs5vaDPT+qAg+OpcNj80i1zLR/CirqlFg/TQ==}
+    engines: {node: '>=14.0.0'}
+    peerDependencies:
+      aws-crt: '>=1.0.0'
+    peerDependenciesMeta:
+      aws-crt:
+        optional: true
     dependencies:
-      '@babel/helper-validator-identifier': 7.19.1
-      chalk: 2.4.2
-      js-tokens: 4.0.0
-    dev: true
+      '@aws-sdk/types': 3.535.0
+      '@smithy/node-config-provider': 2.3.0
+      '@smithy/types': 2.12.0
+      tslib: 2.6.2
+    dev: false
 
-  /@babel/parser@7.20.7:
-    resolution: {integrity: sha512-T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg==}
-    engines: {node: '>=6.0.0'}
-    hasBin: true
+  /@aws-sdk/util-utf8-browser@3.259.0:
+    resolution: {integrity: sha512-UvFa/vR+e19XookZF8RzFZBrw2EUkQWxiBW0yYQAhvk3C+QVGl0H3ouca8LDBlBfQKXwmW3huo/59H8rwb1wJw==}
     dependencies:
-      '@babel/types': 7.20.7
+      tslib: 2.6.2
+    dev: false
 
-  /@babel/parser@7.21.5:
-    resolution: {integrity: sha512-J+IxH2IsxV4HbnTrSWgMAQj0UEo61hDA4Ny8h8PCX0MLXiibqHbqIOVneqdocemSBc22VpBKxt4J6FQzy9HarQ==}
-    engines: {node: '>=6.0.0'}
-    hasBin: true
+  /@aws-sdk/xml-builder@3.472.0:
+    resolution: {integrity: sha512-PwjVxz1hr9up8QkddabuScPZ/d5aDHgvHYgK4acHYzltXL4wngfvimi5ZqXTzVWF2QANxHmWnHUr45QJX71oJQ==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@babel/types': 7.21.5
-    dev: true
+      '@smithy/types': 2.7.0
+      tslib: 2.6.2
+    dev: false
 
-  /@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.18.6(@babel/core@7.20.12):
-    resolution: {integrity: sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
+  /@azure/abort-controller@1.1.0:
+    resolution: {integrity: sha512-TrRLIoSQVzfAJX9H1JeFjzAoDGcoK1IYX1UImfceTZpsyYfWr09Ss1aHW1y5TrrR3iq6RZLBwJ3E24uwPhwahw==}
+    engines: {node: '>=12.0.0'}
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
+      tslib: 2.6.2
+    dev: false
 
-  /@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.18.6(@babel/core@7.21.5):
-    resolution: {integrity: sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
+  /@azure/abort-controller@2.0.0:
+    resolution: {integrity: sha512-RP/mR/WJchR+g+nQFJGOec+nzeN/VvjlwbinccoqfhTsTHbb8X5+mLDp48kHT0ueyum0BNSwGm0kX0UZuIqTGg==}
+    engines: {node: '>=18.0.0'}
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
+      tslib: 2.6.2
+    dev: false
 
-  /@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.20.7(@babel/core@7.20.12):
-    resolution: {integrity: sha512-sbr9+wNE5aXMBBFBICk01tt7sBf2Oc9ikRFEcem/ZORup9IMUdNhW7/wVLEbbtlWOsEubJet46mHAL2C8+2jKQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.13.0
+  /@azure/core-auth@1.4.0:
+    resolution: {integrity: sha512-HFrcTgmuSuukRf/EdPmqBrc5l6Q5Uu+2TbuhaKbgaCpP2TfAeiNaQPAadxO+CYBRHGUzIDteMAjFspFLDLnKVQ==}
+    engines: {node: '>=12.0.0'}
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/helper-skip-transparent-expression-wrappers': 7.20.0
-      '@babel/plugin-proposal-optional-chaining': 7.20.7(@babel/core@7.20.12)
-    dev: true
+      '@azure/abort-controller': 1.1.0
+      tslib: 2.6.2
+    dev: false
 
-  /@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.20.7(@babel/core@7.21.5):
-    resolution: {integrity: sha512-sbr9+wNE5aXMBBFBICk01tt7sBf2Oc9ikRFEcem/ZORup9IMUdNhW7/wVLEbbtlWOsEubJet46mHAL2C8+2jKQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.13.0
+  /@azure/core-auth@1.6.0:
+    resolution: {integrity: sha512-3X9wzaaGgRaBCwhLQZDtFp5uLIXCPrGbwJNWPPugvL4xbIGgScv77YzzxToKGLAKvG9amDoofMoP+9hsH1vs1w==}
+    engines: {node: '>=18.0.0'}
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/helper-skip-transparent-expression-wrappers': 7.20.0
-      '@babel/plugin-proposal-optional-chaining': 7.20.7(@babel/core@7.21.5)
-    dev: true
+      '@azure/abort-controller': 2.0.0
+      '@azure/core-util': 1.7.0
+      tslib: 2.6.2
+    dev: false
 
-  /@babel/plugin-proposal-async-generator-functions@7.20.7(@babel/core@7.20.12):
-    resolution: {integrity: sha512-xMbiLsn/8RK7Wq7VeVytytS2L6qE69bXPB10YCmMdDZbKF4okCqY74pI/jJQ/8U0b/F6NrT2+14b8/P9/3AMGA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
+  /@azure/core-client@1.6.1:
+    resolution: {integrity: sha512-mZ1MSKhZBYoV8GAWceA+PEJFWV2VpdNSpxxcj1wjIAOi00ykRuIQChT99xlQGZWLY3/NApWhSImlFwsmCEs4vA==}
+    engines: {node: '>=12.0.0'}
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-environment-visitor': 7.18.9
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/helper-remap-async-to-generator': 7.18.9(@babel/core@7.20.12)
-      '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.20.12)
+      '@azure/abort-controller': 1.1.0
+      '@azure/core-auth': 1.6.0
+      '@azure/core-rest-pipeline': 1.9.2
+      '@azure/core-tracing': 1.0.1
+      '@azure/core-util': 1.7.0
+      '@azure/logger': 1.0.3
+      tslib: 2.6.2
     transitivePeerDependencies:
       - supports-color
-    dev: true
+    dev: false
 
-  /@babel/plugin-proposal-async-generator-functions@7.20.7(@babel/core@7.21.5):
-    resolution: {integrity: sha512-xMbiLsn/8RK7Wq7VeVytytS2L6qE69bXPB10YCmMdDZbKF4okCqY74pI/jJQ/8U0b/F6NrT2+14b8/P9/3AMGA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
+  /@azure/core-http-compat@1.3.0:
+    resolution: {integrity: sha512-ZN9avruqbQ5TxopzG3ih3KRy52n8OAbitX3fnZT5go4hzu0J+KVPSzkL+Wt3hpJpdG8WIfg1sBD1tWkgUdEpBA==}
+    engines: {node: '>=12.0.0'}
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-environment-visitor': 7.18.9
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/helper-remap-async-to-generator': 7.18.9(@babel/core@7.21.5)
-      '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.21.5)
+      '@azure/abort-controller': 1.1.0
+      '@azure/core-client': 1.6.1
+      '@azure/core-rest-pipeline': 1.9.2
     transitivePeerDependencies:
       - supports-color
-    dev: true
+    dev: false
 
-  /@babel/plugin-proposal-class-properties@7.18.6(@babel/core@7.20.12):
-    resolution: {integrity: sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
+  /@azure/core-http@2.3.2:
+    resolution: {integrity: sha512-Z4dfbglV9kNZO177CNx4bo5ekFuYwwsvjLiKdZI4r84bYGv3irrbQz7JC3/rUfFH2l4T/W6OFleJaa2X0IaQqw==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@azure/abort-controller': 1.1.0
+      '@azure/core-auth': 1.6.0
+      '@azure/core-tracing': 1.0.0-preview.13
+      '@azure/core-util': 1.7.0
+      '@azure/logger': 1.0.3
+      '@types/node-fetch': 2.6.4
+      '@types/tunnel': 0.0.3
+      form-data: 4.0.0
+      node-fetch: 2.7.0(encoding@0.1.13)
+      process: 0.11.10
+      tough-cookie: 4.1.3
+      tslib: 2.6.2
+      tunnel: 0.0.6
+      uuid: 8.3.2
+      xml2js: 0.5.0
+    transitivePeerDependencies:
+      - encoding
+    dev: false
+
+  /@azure/core-lro@2.4.0:
+    resolution: {integrity: sha512-F65+rYkll1dpw3RGm8/SSiSj+/QkMeYDanzS/QKlM1dmuneVyXbO46C88V1MRHluLGdMP6qfD3vDRYALn0z0tQ==}
+    engines: {node: '>=12.0.0'}
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-create-class-features-plugin': 7.20.12(@babel/core@7.20.12)
-      '@babel/helper-plugin-utils': 7.20.2
+      '@azure/abort-controller': 1.1.0
+      '@azure/logger': 1.0.3
+      tslib: 2.6.2
+    dev: false
+
+  /@azure/core-paging@1.3.0:
+    resolution: {integrity: sha512-H6Tg9eBm0brHqLy0OSAGzxIh1t4UL8eZVrSUMJ60Ra9cwq2pOskFqVpz2pYoHDsBY1jZ4V/P8LRGb5D5pmC6rg==}
+    engines: {node: '>=12.0.0'}
+    dependencies:
+      tslib: 2.6.2
+    dev: false
+
+  /@azure/core-rest-pipeline@1.9.2:
+    resolution: {integrity: sha512-8rXI6ircjenaLp+PkOFpo37tQ1PQfztZkfVj97BIF3RPxHAsoVSgkJtu3IK/bUEWcb7HzXSoyBe06M7ODRkRyw==}
+    engines: {node: '>=12.0.0'}
+    dependencies:
+      '@azure/abort-controller': 1.1.0
+      '@azure/core-auth': 1.6.0
+      '@azure/core-tracing': 1.0.1
+      '@azure/core-util': 1.7.0
+      '@azure/logger': 1.0.3
+      form-data: 4.0.0
+      http-proxy-agent: 5.0.0
+      https-proxy-agent: 5.0.1
+      tslib: 2.6.2
+      uuid: 8.3.2
     transitivePeerDependencies:
       - supports-color
-    dev: true
+    dev: false
 
-  /@babel/plugin-proposal-class-properties@7.18.6(@babel/core@7.21.5):
-    resolution: {integrity: sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
+  /@azure/core-tracing@1.0.0-preview.13:
+    resolution: {integrity: sha512-KxDlhXyMlh2Jhj2ykX6vNEU0Vou4nHr025KoSEiz7cS3BNiHNaZcdECk/DmLkEB0as5T7b/TpRcehJ5yV6NeXQ==}
+    engines: {node: '>=12.0.0'}
+    dependencies:
+      '@opentelemetry/api': 1.2.0
+      tslib: 2.6.2
+    dev: false
+
+  /@azure/core-tracing@1.0.1:
+    resolution: {integrity: sha512-I5CGMoLtX+pI17ZdiFJZgxMJApsK6jjfm85hpgp3oazCdq5Wxgh4wMr7ge/TTWW1B5WBuvIOI1fMU/FrOAMKrw==}
+    engines: {node: '>=12.0.0'}
+    dependencies:
+      tslib: 2.6.2
+    dev: false
+
+  /@azure/core-util@1.1.1:
+    resolution: {integrity: sha512-A4TBYVQCtHOigFb2ETiiKFDocBoI1Zk2Ui1KpI42aJSIDexF7DHQFpnjonltXAIU/ceH+1fsZAWWgvX6/AKzog==}
+    engines: {node: '>=12.0.0'}
+    dependencies:
+      '@azure/abort-controller': 1.1.0
+      tslib: 2.6.2
+    dev: false
+
+  /@azure/core-util@1.7.0:
+    resolution: {integrity: sha512-Zq2i3QO6k9DA8vnm29mYM4G8IE9u1mhF1GUabVEqPNX8Lj833gdxQ2NAFxt2BZsfAL+e9cT8SyVN7dFVJ/Hf0g==}
+    engines: {node: '>=18.0.0'}
+    dependencies:
+      '@azure/abort-controller': 2.0.0
+      tslib: 2.6.2
+    dev: false
+
+  /@azure/identity@3.4.2:
+    resolution: {integrity: sha512-0q5DL4uyR0EZ4RXQKD8MadGH6zTIcloUoS/RVbCpNpej4pwte0xpqYxk8K97Py2RiuUvI7F4GXpoT4046VfufA==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@azure/abort-controller': 1.1.0
+      '@azure/core-auth': 1.6.0
+      '@azure/core-client': 1.6.1
+      '@azure/core-rest-pipeline': 1.9.2
+      '@azure/core-tracing': 1.0.1
+      '@azure/core-util': 1.7.0
+      '@azure/logger': 1.0.3
+      '@azure/msal-browser': 3.10.0
+      '@azure/msal-node': 2.6.4
+      events: 3.3.0
+      jws: 4.0.0
+      open: 8.4.0
+      stoppable: 1.1.0
+      tslib: 2.6.2
+    transitivePeerDependencies:
+      - supports-color
+    dev: false
+
+  /@azure/keyvault-keys@4.6.0:
+    resolution: {integrity: sha512-0112LegxeR03L8J4k+q6HwBVvrpd9y+oInG0FG3NaHXN7YUubVBon/eb5jFI6edGrvNigpxSR0XIsprFXdkzCQ==}
+    engines: {node: '>=12.0.0'}
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-create-class-features-plugin': 7.20.12(@babel/core@7.21.5)
-      '@babel/helper-plugin-utils': 7.20.2
+      '@azure/abort-controller': 1.1.0
+      '@azure/core-auth': 1.4.0
+      '@azure/core-client': 1.6.1
+      '@azure/core-http-compat': 1.3.0
+      '@azure/core-lro': 2.4.0
+      '@azure/core-paging': 1.3.0
+      '@azure/core-rest-pipeline': 1.9.2
+      '@azure/core-tracing': 1.0.1
+      '@azure/core-util': 1.1.1
+      '@azure/logger': 1.0.3
+      tslib: 2.6.2
     transitivePeerDependencies:
       - supports-color
+    dev: false
+
+  /@azure/logger@1.0.3:
+    resolution: {integrity: sha512-aK4s3Xxjrx3daZr3VylxejK3vG5ExXck5WOHDJ8in/k9AqlfIyFMMT1uG7u8mNjX+QRILTIn0/Xgschfh/dQ9g==}
+    engines: {node: '>=12.0.0'}
+    dependencies:
+      tslib: 2.6.2
+    dev: false
+
+  /@azure/msal-browser@3.10.0:
+    resolution: {integrity: sha512-mnmi8dCXVNZI+AGRq0jKQ3YiodlIC4W9npr6FCB9WN6NQT+6rq+cIlxgUb//BjLyzKsnYo+i4LROGeMyU+6v1A==}
+    engines: {node: '>=0.8.0'}
+    dependencies:
+      '@azure/msal-common': 14.7.1
+    dev: false
+
+  /@azure/msal-common@14.7.1:
+    resolution: {integrity: sha512-v96btzjM7KrAu4NSEdOkhQSTGOuNUIIsUdB8wlyB9cdgl5KqEKnTonHUZ8+khvZ6Ap542FCErbnTyDWl8lZ2rA==}
+    engines: {node: '>=0.8.0'}
+    dev: false
+
+  /@azure/msal-node@2.6.4:
+    resolution: {integrity: sha512-nNvEPx009/80UATCToF+29NZYocn01uKrB91xtFr7bSqkqO1PuQGXRyYwryWRztUrYZ1YsSbw9A+LmwOhpVvcg==}
+    engines: {node: '>=16'}
+    dependencies:
+      '@azure/msal-common': 14.7.1
+      jsonwebtoken: 9.0.2
+      uuid: 8.3.2
+    dev: false
+
+  /@azure/storage-blob@12.11.0:
+    resolution: {integrity: sha512-na+FisoARuaOWaHWpmdtk3FeuTWf2VWamdJ9/TJJzj5ZdXPLC3juoDgFs6XVuJIoK30yuBpyFBEDXVRK4pB7Tg==}
+    engines: {node: '>=12.0.0'}
+    dependencies:
+      '@azure/abort-controller': 1.1.0
+      '@azure/core-http': 2.3.2
+      '@azure/core-lro': 2.4.0
+      '@azure/core-paging': 1.3.0
+      '@azure/core-tracing': 1.0.0-preview.13
+      '@azure/logger': 1.0.3
+      events: 3.3.0
+      tslib: 2.6.2
+    transitivePeerDependencies:
+      - encoding
+    dev: false
+
+  /@babel/code-frame@7.22.5:
+    resolution: {integrity: sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/highlight': 7.22.5
+
+  /@babel/code-frame@7.23.5:
+    resolution: {integrity: sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/highlight': 7.23.4
+      chalk: 2.4.2
+
+  /@babel/compat-data@7.22.9:
+    resolution: {integrity: sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ==}
+    engines: {node: '>=6.9.0'}
+
+  /@babel/compat-data@7.23.5:
+    resolution: {integrity: sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==}
+    engines: {node: '>=6.9.0'}
     dev: true
 
-  /@babel/plugin-proposal-class-static-block@7.20.7(@babel/core@7.20.12):
-    resolution: {integrity: sha512-AveGOoi9DAjUYYuUAG//Ig69GlazLnoyzMw68VCDux+c1tsnnH/OkYcpz/5xzMkEFC6UxjR5Gw1c+iY2wOGVeQ==}
+  /@babel/core@7.22.9:
+    resolution: {integrity: sha512-G2EgeufBcYw27U4hhoIwFcgc1XU7TlXJ3mv04oOv1WCuo900U/anZSPzEqNjwdjgffkk2Gs0AN0dW1CKVLcG7w==}
     engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.12.0
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-create-class-features-plugin': 7.20.12(@babel/core@7.20.12)
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.20.12)
+      '@ampproject/remapping': 2.2.1
+      '@babel/code-frame': 7.23.5
+      '@babel/generator': 7.22.9
+      '@babel/helper-compilation-targets': 7.22.9(@babel/core@7.22.9)
+      '@babel/helper-module-transforms': 7.22.9(@babel/core@7.22.9)
+      '@babel/helpers': 7.22.6
+      '@babel/parser': 7.24.0
+      '@babel/template': 7.22.5
+      '@babel/traverse': 7.22.8
+      '@babel/types': 7.24.0
+      convert-source-map: 1.9.0
+      debug: 4.3.4(supports-color@8.1.1)
+      gensync: 1.0.0-beta.2
+      json5: 2.2.3
+      semver: 7.6.0
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /@babel/plugin-proposal-class-static-block@7.20.7(@babel/core@7.21.5):
-    resolution: {integrity: sha512-AveGOoi9DAjUYYuUAG//Ig69GlazLnoyzMw68VCDux+c1tsnnH/OkYcpz/5xzMkEFC6UxjR5Gw1c+iY2wOGVeQ==}
+  /@babel/core@7.24.0:
+    resolution: {integrity: sha512-fQfkg0Gjkza3nf0c7/w6Xf34BW4YvzNfACRLmmb7XRLa6XHdR+K9AlJlxneFfWYf6uhOzuzZVTjF/8KfndZANw==}
     engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.12.0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-create-class-features-plugin': 7.20.12(@babel/core@7.21.5)
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.21.5)
+      '@ampproject/remapping': 2.2.1
+      '@babel/code-frame': 7.23.5
+      '@babel/generator': 7.23.6
+      '@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.24.0
+      '@babel/template': 7.24.0
+      '@babel/traverse': 7.24.0
+      '@babel/types': 7.24.0
+      convert-source-map: 2.0.0
+      debug: 4.3.4(supports-color@8.1.1)
+      gensync: 1.0.0-beta.2
+      json5: 2.2.3
+      semver: 7.6.0
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@babel/plugin-proposal-dynamic-import@7.18.6(@babel/core@7.20.12):
-    resolution: {integrity: sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==}
+  /@babel/generator@7.22.9:
+    resolution: {integrity: sha512-KtLMbmicyuK2Ak/FTCJVbDnkN1SlT8/kceFTiuDiiRUUSMnHMidxSCdG4ndkTOHHpoomWe/4xkvHkEOncwjYIw==}
     engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.20.12)
-    dev: true
+      '@babel/types': 7.24.0
+      '@jridgewell/gen-mapping': 0.3.2
+      '@jridgewell/trace-mapping': 0.3.18
+      jsesc: 2.5.2
 
-  /@babel/plugin-proposal-dynamic-import@7.18.6(@babel/core@7.21.5):
-    resolution: {integrity: sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==}
+  /@babel/generator@7.23.6:
+    resolution: {integrity: sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==}
     engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.21.5)
+      '@babel/types': 7.24.0
+      '@jridgewell/gen-mapping': 0.3.2
+      '@jridgewell/trace-mapping': 0.3.18
+      jsesc: 2.5.2
     dev: true
 
-  /@babel/plugin-proposal-export-namespace-from@7.18.9(@babel/core@7.20.12):
-    resolution: {integrity: sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==}
+  /@babel/helper-annotate-as-pure@7.22.5:
+    resolution: {integrity: sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==}
     engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.20.12)
+      '@babel/types': 7.24.0
     dev: true
 
-  /@babel/plugin-proposal-export-namespace-from@7.18.9(@babel/core@7.21.5):
-    resolution: {integrity: sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==}
+  /@babel/helper-builder-binary-assignment-operator-visitor@7.22.15:
+    resolution: {integrity: sha512-QkBXwGgaoC2GtGZRoma6kv7Szfv06khvhFav67ZExau2RaXzy8MpHSMO2PNoP2XtmQphJQRHFfg77Bq731Yizw==}
     engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.21.5)
+      '@babel/types': 7.24.0
     dev: true
 
-  /@babel/plugin-proposal-json-strings@7.18.6(@babel/core@7.20.12):
-    resolution: {integrity: sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==}
+  /@babel/helper-compilation-targets@7.22.9(@babel/core@7.22.9):
+    resolution: {integrity: sha512-7qYrNM6HjpnPHJbopxmb8hSPoZ0gsX8IvUS32JGVoy+pU9e5N0nLr1VjJoR6kA4d9dmGLxNYOjeB8sUDal2WMw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
-      '@babel/core': ^7.0.0-0
+      '@babel/core': ^7.0.0
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.20.12)
-    dev: true
+      '@babel/compat-data': 7.22.9
+      '@babel/core': 7.22.9
+      '@babel/helper-validator-option': 7.22.5
+      browserslist: 4.21.9
+      lru-cache: 5.1.1
+      semver: 7.6.0
 
-  /@babel/plugin-proposal-json-strings@7.18.6(@babel/core@7.21.5):
-    resolution: {integrity: sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==}
+  /@babel/helper-compilation-targets@7.23.6:
+    resolution: {integrity: sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==}
     engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.21.5)
+      '@babel/compat-data': 7.23.5
+      '@babel/helper-validator-option': 7.23.5
+      browserslist: 4.23.0
+      lru-cache: 5.1.1
+      semver: 7.6.0
     dev: true
 
-  /@babel/plugin-proposal-logical-assignment-operators@7.20.7(@babel/core@7.20.12):
-    resolution: {integrity: sha512-y7C7cZgpMIjWlKE5T7eJwp+tnRYM89HmRvWM5EQuB5BoHEONjmQ8lSNmBUwOyy/GFRsohJED51YBF79hE1djug==}
+  /@babel/helper-create-class-features-plugin@7.22.9(@babel/core@7.24.0):
+    resolution: {integrity: sha512-Pwyi89uO4YrGKxL/eNJ8lfEH55DnRloGPOseaA8NFNL6jAUnn+KccaISiFazCj5IolPPDjGSdzQzXVzODVRqUQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
-      '@babel/core': ^7.0.0-0
+      '@babel/core': ^7.0.0
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.20.12)
+      '@babel/core': 7.24.0
+      '@babel/helper-annotate-as-pure': 7.22.5
+      '@babel/helper-environment-visitor': 7.22.5
+      '@babel/helper-function-name': 7.22.5
+      '@babel/helper-member-expression-to-functions': 7.22.5
+      '@babel/helper-optimise-call-expression': 7.22.5
+      '@babel/helper-replace-supers': 7.22.9(@babel/core@7.24.0)
+      '@babel/helper-skip-transparent-expression-wrappers': 7.22.5
+      '@babel/helper-split-export-declaration': 7.22.6
+      semver: 7.6.0
     dev: true
 
-  /@babel/plugin-proposal-logical-assignment-operators@7.20.7(@babel/core@7.21.5):
-    resolution: {integrity: sha512-y7C7cZgpMIjWlKE5T7eJwp+tnRYM89HmRvWM5EQuB5BoHEONjmQ8lSNmBUwOyy/GFRsohJED51YBF79hE1djug==}
+  /@babel/helper-create-class-features-plugin@7.24.0(@babel/core@7.24.0):
+    resolution: {integrity: sha512-QAH+vfvts51BCsNZ2PhY6HAggnlS6omLLFTsIpeqZk/MmJ6cW7tgz5yRv0fMJThcr6FmbMrENh1RgrWPTYA76g==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
-      '@babel/core': ^7.0.0-0
+      '@babel/core': ^7.0.0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.21.5)
+      '@babel/core': 7.24.0
+      '@babel/helper-annotate-as-pure': 7.22.5
+      '@babel/helper-environment-visitor': 7.22.20
+      '@babel/helper-function-name': 7.23.0
+      '@babel/helper-member-expression-to-functions': 7.23.0
+      '@babel/helper-optimise-call-expression': 7.22.5
+      '@babel/helper-replace-supers': 7.22.20(@babel/core@7.24.0)
+      '@babel/helper-skip-transparent-expression-wrappers': 7.22.5
+      '@babel/helper-split-export-declaration': 7.22.6
+      semver: 7.6.0
     dev: true
 
-  /@babel/plugin-proposal-nullish-coalescing-operator@7.18.6(@babel/core@7.20.12):
-    resolution: {integrity: sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==}
+  /@babel/helper-create-regexp-features-plugin@7.22.15(@babel/core@7.24.0):
+    resolution: {integrity: sha512-29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
-      '@babel/core': ^7.0.0-0
+      '@babel/core': ^7.0.0
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.20.12)
+      '@babel/core': 7.24.0
+      '@babel/helper-annotate-as-pure': 7.22.5
+      regexpu-core: 5.3.2
+      semver: 7.6.0
     dev: true
 
-  /@babel/plugin-proposal-nullish-coalescing-operator@7.18.6(@babel/core@7.21.5):
-    resolution: {integrity: sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==}
+  /@babel/helper-create-regexp-features-plugin@7.22.9(@babel/core@7.24.0):
+    resolution: {integrity: sha512-+svjVa/tFwsNSG4NEy1h85+HQ5imbT92Q5/bgtS7P0GTQlP8WuFdqsiABmQouhiFGyV66oGxZFpeYHza1rNsKw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
-      '@babel/core': ^7.0.0-0
+      '@babel/core': ^7.0.0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.21.5)
+      '@babel/core': 7.24.0
+      '@babel/helper-annotate-as-pure': 7.22.5
+      regexpu-core: 5.3.2
+      semver: 7.6.0
     dev: true
 
-  /@babel/plugin-proposal-numeric-separator@7.18.6(@babel/core@7.20.12):
-    resolution: {integrity: sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==}
-    engines: {node: '>=6.9.0'}
+  /@babel/helper-define-polyfill-provider@0.5.0(@babel/core@7.24.0):
+    resolution: {integrity: sha512-NovQquuQLAQ5HuyjCz7WQP9MjRj7dx++yspwiyUiGl9ZyadHRSql1HZh5ogRd8W8w6YM6EQ/NTB8rgjLt5W65Q==}
     peerDependencies:
-      '@babel/core': ^7.0.0-0
+      '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.20.12)
+      '@babel/core': 7.24.0
+      '@babel/helper-compilation-targets': 7.23.6
+      '@babel/helper-plugin-utils': 7.24.0
+      debug: 4.3.4(supports-color@8.1.1)
+      lodash.debounce: 4.0.8
+      resolve: 1.22.8
+    transitivePeerDependencies:
+      - supports-color
     dev: true
 
-  /@babel/plugin-proposal-numeric-separator@7.18.6(@babel/core@7.21.5):
-    resolution: {integrity: sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==}
-    engines: {node: '>=6.9.0'}
+  /@babel/helper-define-polyfill-provider@0.6.1(@babel/core@7.24.0):
+    resolution: {integrity: sha512-o7SDgTJuvx5vLKD6SFvkydkSMBvahDKGiNJzG22IZYXhiqoe9efY7zocICBgzHV4IRg5wdgl2nEL/tulKIEIbA==}
     peerDependencies:
-      '@babel/core': ^7.0.0-0
+      '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.21.5)
+      '@babel/core': 7.24.0
+      '@babel/helper-compilation-targets': 7.23.6
+      '@babel/helper-plugin-utils': 7.24.0
+      debug: 4.3.4(supports-color@8.1.1)
+      lodash.debounce: 4.0.8
+      resolve: 1.22.8
+    transitivePeerDependencies:
+      - supports-color
     dev: true
 
-  /@babel/plugin-proposal-object-rest-spread@7.20.7(@babel/core@7.20.12):
-    resolution: {integrity: sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==}
+  /@babel/helper-environment-visitor@7.22.20:
+    resolution: {integrity: sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==}
     engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/compat-data': 7.20.10
-      '@babel/core': 7.20.12
-      '@babel/helper-compilation-targets': 7.21.5(@babel/core@7.20.12)
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.20.12)
-      '@babel/plugin-transform-parameters': 7.20.7(@babel/core@7.20.12)
     dev: true
 
-  /@babel/plugin-proposal-object-rest-spread@7.20.7(@babel/core@7.21.5):
-    resolution: {integrity: sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==}
+  /@babel/helper-environment-visitor@7.22.5:
+    resolution: {integrity: sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==}
+    engines: {node: '>=6.9.0'}
+
+  /@babel/helper-function-name@7.22.5:
+    resolution: {integrity: sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==}
     engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/compat-data': 7.20.10
-      '@babel/core': 7.21.5
-      '@babel/helper-compilation-targets': 7.21.5(@babel/core@7.21.5)
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.21.5)
-      '@babel/plugin-transform-parameters': 7.20.7(@babel/core@7.21.5)
-    dev: true
+      '@babel/template': 7.22.5
+      '@babel/types': 7.24.0
 
-  /@babel/plugin-proposal-optional-catch-binding@7.18.6(@babel/core@7.20.12):
-    resolution: {integrity: sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==}
+  /@babel/helper-function-name@7.23.0:
+    resolution: {integrity: sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==}
     engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.20.12)
+      '@babel/template': 7.24.0
+      '@babel/types': 7.24.0
     dev: true
 
-  /@babel/plugin-proposal-optional-catch-binding@7.18.6(@babel/core@7.21.5):
-    resolution: {integrity: sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==}
+  /@babel/helper-hoist-variables@7.22.5:
+    resolution: {integrity: sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==}
     engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.21.5)
-    dev: true
+      '@babel/types': 7.24.0
 
-  /@babel/plugin-proposal-optional-chaining@7.20.7(@babel/core@7.20.12):
-    resolution: {integrity: sha512-T+A7b1kfjtRM51ssoOfS1+wbyCVqorfyZhT99TvxxLMirPShD8CzKMRepMlCBGM5RpHMbn8s+5MMHnPstJH6mQ==}
+  /@babel/helper-member-expression-to-functions@7.22.5:
+    resolution: {integrity: sha512-aBiH1NKMG0H2cGZqspNvsaBe6wNGjbJjuLy29aU+eDZjSbbN53BaxlpB02xm9v34pLTZ1nIQPFYn2qMZoa5BQQ==}
     engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/helper-skip-transparent-expression-wrappers': 7.20.0
-      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.20.12)
+      '@babel/types': 7.24.0
     dev: true
 
-  /@babel/plugin-proposal-optional-chaining@7.20.7(@babel/core@7.21.5):
-    resolution: {integrity: sha512-T+A7b1kfjtRM51ssoOfS1+wbyCVqorfyZhT99TvxxLMirPShD8CzKMRepMlCBGM5RpHMbn8s+5MMHnPstJH6mQ==}
+  /@babel/helper-member-expression-to-functions@7.23.0:
+    resolution: {integrity: sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==}
     engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/helper-skip-transparent-expression-wrappers': 7.20.0
-      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.21.5)
+      '@babel/types': 7.24.0
     dev: true
 
-  /@babel/plugin-proposal-private-methods@7.18.6(@babel/core@7.20.12):
-    resolution: {integrity: sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==}
+  /@babel/helper-module-imports@7.22.15:
+    resolution: {integrity: sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==}
     engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-create-class-features-plugin': 7.20.12(@babel/core@7.20.12)
-      '@babel/helper-plugin-utils': 7.20.2
-    transitivePeerDependencies:
-      - supports-color
+      '@babel/types': 7.24.0
     dev: true
 
-  /@babel/plugin-proposal-private-methods@7.18.6(@babel/core@7.21.5):
-    resolution: {integrity: sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==}
+  /@babel/helper-module-imports@7.22.5:
+    resolution: {integrity: sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==}
     engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-create-class-features-plugin': 7.20.12(@babel/core@7.21.5)
-      '@babel/helper-plugin-utils': 7.20.2
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
+      '@babel/types': 7.24.0
 
-  /@babel/plugin-proposal-private-property-in-object@7.20.5(@babel/core@7.20.12):
-    resolution: {integrity: sha512-Vq7b9dUA12ByzB4EjQTPo25sFhY+08pQDBSZRtUAkj7lb7jahaHR5igera16QZ+3my1nYR4dKsNdYj5IjPHilQ==}
+  /@babel/helper-module-transforms@7.22.9(@babel/core@7.22.9):
+    resolution: {integrity: sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
-      '@babel/core': ^7.0.0-0
+      '@babel/core': ^7.0.0
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-annotate-as-pure': 7.18.6
-      '@babel/helper-create-class-features-plugin': 7.20.12(@babel/core@7.20.12)
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.20.12)
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
+      '@babel/core': 7.22.9
+      '@babel/helper-environment-visitor': 7.22.5
+      '@babel/helper-module-imports': 7.22.5
+      '@babel/helper-simple-access': 7.22.5
+      '@babel/helper-split-export-declaration': 7.22.6
+      '@babel/helper-validator-identifier': 7.22.20
 
-  /@babel/plugin-proposal-private-property-in-object@7.20.5(@babel/core@7.21.5):
-    resolution: {integrity: sha512-Vq7b9dUA12ByzB4EjQTPo25sFhY+08pQDBSZRtUAkj7lb7jahaHR5igera16QZ+3my1nYR4dKsNdYj5IjPHilQ==}
+  /@babel/helper-module-transforms@7.23.3(@babel/core@7.24.0):
+    resolution: {integrity: sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
-      '@babel/core': ^7.0.0-0
+      '@babel/core': ^7.0.0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-annotate-as-pure': 7.18.6
-      '@babel/helper-create-class-features-plugin': 7.20.12(@babel/core@7.21.5)
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.21.5)
-    transitivePeerDependencies:
-      - supports-color
+      '@babel/core': 7.24.0
+      '@babel/helper-environment-visitor': 7.22.20
+      '@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.22.20
     dev: true
 
-  /@babel/plugin-proposal-unicode-property-regex@7.18.6(@babel/core@7.20.12):
-    resolution: {integrity: sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==}
-    engines: {node: '>=4'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
+  /@babel/helper-optimise-call-expression@7.22.5:
+    resolution: {integrity: sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==}
+    engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-create-regexp-features-plugin': 7.20.5(@babel/core@7.20.12)
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/types': 7.24.0
     dev: true
 
-  /@babel/plugin-proposal-unicode-property-regex@7.18.6(@babel/core@7.21.5):
-    resolution: {integrity: sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==}
-    engines: {node: '>=4'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-create-regexp-features-plugin': 7.20.5(@babel/core@7.21.5)
-      '@babel/helper-plugin-utils': 7.20.2
+  /@babel/helper-plugin-utils@7.22.5:
+    resolution: {integrity: sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==}
+    engines: {node: '>=6.9.0'}
+
+  /@babel/helper-plugin-utils@7.24.0:
+    resolution: {integrity: sha512-9cUznXMG0+FxRuJfvL82QlTqIzhVW9sL0KjMPHhAOOvpQGL8QtdxnBKILjBqxlHyliz0yCa1G903ZXI/FuHy2w==}
+    engines: {node: '>=6.9.0'}
     dev: true
 
-  /@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.20.12):
-    resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==}
+  /@babel/helper-remap-async-to-generator@7.22.20(@babel/core@7.24.0):
+    resolution: {integrity: sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      '@babel/core': ^7.0.0-0
+      '@babel/core': ^7.0.0
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/core': 7.24.0
+      '@babel/helper-annotate-as-pure': 7.22.5
+      '@babel/helper-environment-visitor': 7.22.20
+      '@babel/helper-wrap-function': 7.22.20
     dev: true
 
-  /@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.21.5):
-    resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==}
+  /@babel/helper-replace-supers@7.22.20(@babel/core@7.24.0):
+    resolution: {integrity: sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      '@babel/core': ^7.0.0-0
+      '@babel/core': ^7.0.0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/core': 7.24.0
+      '@babel/helper-environment-visitor': 7.22.20
+      '@babel/helper-member-expression-to-functions': 7.23.0
+      '@babel/helper-optimise-call-expression': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-bigint@7.8.3(@babel/core@7.21.5):
-    resolution: {integrity: sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==}
+  /@babel/helper-replace-supers@7.22.9(@babel/core@7.24.0):
+    resolution: {integrity: sha512-LJIKvvpgPOPUThdYqcX6IXRuIcTkcAub0IaDRGCZH0p5GPUp7PhRU9QVgFcDDd51BaPkk77ZjqFwh6DZTAEmGg==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      '@babel/core': ^7.0.0-0
+      '@babel/core': ^7.0.0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/core': 7.24.0
+      '@babel/helper-environment-visitor': 7.22.5
+      '@babel/helper-member-expression-to-functions': 7.22.5
+      '@babel/helper-optimise-call-expression': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.20.12):
-    resolution: {integrity: sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
+  /@babel/helper-simple-access@7.22.5:
+    resolution: {integrity: sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==}
+    engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
+      '@babel/types': 7.24.0
 
-  /@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.21.5):
-    resolution: {integrity: sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
+  /@babel/helper-skip-transparent-expression-wrappers@7.22.5:
+    resolution: {integrity: sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==}
+    engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/types': 7.24.0
     dev: true
 
-  /@babel/plugin-syntax-class-static-block@7.14.5(@babel/core@7.20.12):
-    resolution: {integrity: sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==}
+  /@babel/helper-split-export-declaration@7.22.6:
+    resolution: {integrity: sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==}
     engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
+      '@babel/types': 7.24.0
 
-  /@babel/plugin-syntax-class-static-block@7.14.5(@babel/core@7.21.5):
-    resolution: {integrity: sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==}
+  /@babel/helper-string-parser@7.23.4:
+    resolution: {integrity: sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==}
     engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
 
-  /@babel/plugin-syntax-dynamic-import@7.8.3(@babel/core@7.20.12):
-    resolution: {integrity: sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
+  /@babel/helper-validator-identifier@7.22.20:
+    resolution: {integrity: sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==}
+    engines: {node: '>=6.9.0'}
 
-  /@babel/plugin-syntax-dynamic-import@7.8.3(@babel/core@7.21.5):
-    resolution: {integrity: sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
+  /@babel/helper-validator-option@7.22.5:
+    resolution: {integrity: sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==}
+    engines: {node: '>=6.9.0'}
+
+  /@babel/helper-validator-option@7.23.5:
+    resolution: {integrity: sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==}
+    engines: {node: '>=6.9.0'}
     dev: true
 
-  /@babel/plugin-syntax-export-namespace-from@7.8.3(@babel/core@7.20.12):
-    resolution: {integrity: sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
+  /@babel/helper-wrap-function@7.22.20:
+    resolution: {integrity: sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw==}
+    engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/helper-function-name': 7.22.5
+      '@babel/template': 7.24.0
+      '@babel/types': 7.24.0
     dev: true
 
-  /@babel/plugin-syntax-export-namespace-from@7.8.3(@babel/core@7.21.5):
-    resolution: {integrity: sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
+  /@babel/helpers@7.22.6:
+    resolution: {integrity: sha512-YjDs6y/fVOYFV8hAf1rxd1QvR9wJe1pDBZ2AREKq/SDayfPzgk0PBnVuTCE5X1acEpMMNOVUqoe+OwiZGJ+OaA==}
+    engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
+      '@babel/template': 7.22.5
+      '@babel/traverse': 7.22.8
+      '@babel/types': 7.24.0
+    transitivePeerDependencies:
+      - supports-color
 
-  /@babel/plugin-syntax-flow@7.18.6(@babel/core@7.21.5):
-    resolution: {integrity: sha512-LUbR+KNTBWCUAqRG9ex5Gnzu2IOkt8jRJbHHXFT9q+L9zm7M/QQbEqXyw1n1pohYvOyWC8CjeyjrSaIwiYjK7A==}
+  /@babel/helpers@7.24.0:
+    resolution: {integrity: sha512-ulDZdc0Aj5uLc5nETsa7EPx2L7rM0YJM8r7ck7U73AXi7qOV44IHHRAYZHY6iU1rr3C5N4NtTmMRUJP6kwCWeA==}
     engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/template': 7.24.0
+      '@babel/traverse': 7.24.0
+      '@babel/types': 7.24.0
+    transitivePeerDependencies:
+      - supports-color
     dev: true
 
-  /@babel/plugin-syntax-import-assertions@7.20.0(@babel/core@7.20.12):
-    resolution: {integrity: sha512-IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ==}
+  /@babel/highlight@7.22.5:
+    resolution: {integrity: sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==}
     engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
+      '@babel/helper-validator-identifier': 7.22.20
+      chalk: 2.4.2
+      js-tokens: 4.0.0
 
-  /@babel/plugin-syntax-import-assertions@7.20.0(@babel/core@7.21.5):
-    resolution: {integrity: sha512-IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ==}
+  /@babel/highlight@7.23.4:
+    resolution: {integrity: sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==}
     engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
+      '@babel/helper-validator-identifier': 7.22.20
+      chalk: 2.4.2
+      js-tokens: 4.0.0
 
-  /@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.21.5):
-    resolution: {integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
+  /@babel/parser@7.24.0:
+    resolution: {integrity: sha512-QuP/FxEAzMSjXygs8v4N9dvdXzEHN4W1oF3PxuWAtPo08UdM17u89RDMgjLn/mlc56iM0HlLmVkO/wgR+rDgHg==}
+    engines: {node: '>=6.0.0'}
+    hasBin: true
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
+      '@babel/types': 7.24.0
 
-  /@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.20.12):
-    resolution: {integrity: sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==}
+  /@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.23.3(@babel/core@7.24.0):
+    resolution: {integrity: sha512-iRkKcCqb7iGnq9+3G6rZ+Ciz5VywC4XNRHe57lKM+jOeYAoR0lVqdeeDRfh0tQcTfw/+vBhHn926FmQhLtlFLQ==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      '@babel/core': ^7.0.0-0
+      '@babel/core': ^7.0.0
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  /@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.21.5):
-    resolution: {integrity: sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==}
+  /@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.23.3(@babel/core@7.24.0):
+    resolution: {integrity: sha512-WwlxbfMNdVEpQjZmK5mhm7oSwD3dS6eU+Iwsi4Knl9wAletWem7kaRsGOG+8UEbRyqxY4SS5zvtfXwX+jMxUwQ==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      '@babel/core': ^7.0.0-0
+      '@babel/core': ^7.13.0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/helper-skip-transparent-expression-wrappers': 7.22.5
+      '@babel/plugin-transform-optional-chaining': 7.23.4(@babel/core@7.24.0)
     dev: true
 
-  /@babel/plugin-syntax-jsx@7.18.6(@babel/core@7.20.12):
-    resolution: {integrity: sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==}
+  /@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@7.23.7(@babel/core@7.24.0):
+    resolution: {integrity: sha512-LlRT7HgaifEpQA1ZgLVOIJZZFVPWN5iReq/7/JixwBtwcoeVGDBD53ZV28rrsLYOZs1Y/EHhA8N/Z6aazHR8cw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
-      '@babel/core': ^7.0.0-0
+      '@babel/core': ^7.0.0
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/core': 7.24.0
+      '@babel/helper-environment-visitor': 7.22.20
+      '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  /@babel/plugin-syntax-jsx@7.18.6(@babel/core@7.21.5):
-    resolution: {integrity: sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==}
+  /@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2(@babel/core@7.24.0):
+    resolution: {integrity: sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/core': 7.24.0
     dev: true
 
-  /@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.20.12):
-    resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==}
+  /@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.22.9):
+    resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.21.5):
-    resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==}
+  /@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.24.0):
+    resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.20.12):
-    resolution: {integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==}
+  /@babel/plugin-syntax-bigint@7.8.3(@babel/core@7.22.9):
+    resolution: {integrity: sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.21.5):
-    resolution: {integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==}
+  /@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.22.9):
+    resolution: {integrity: sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.20.12):
-    resolution: {integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==}
+  /@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.24.0):
+    resolution: {integrity: sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.21.5):
-    resolution: {integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==}
+  /@babel/plugin-syntax-class-static-block@7.14.5(@babel/core@7.24.0):
+    resolution: {integrity: sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  /@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.20.12):
-    resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==}
+  /@babel/plugin-syntax-dynamic-import@7.8.3(@babel/core@7.24.0):
+    resolution: {integrity: sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  /@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.21.5):
-    resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==}
+  /@babel/plugin-syntax-export-namespace-from@7.8.3(@babel/core@7.24.0):
+    resolution: {integrity: sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  /@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.20.12):
-    resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==}
+  /@babel/plugin-syntax-flow@7.23.3(@babel/core@7.24.0):
+    resolution: {integrity: sha512-YZiAIpkJAwQXBJLIQbRFayR5c+gJ35Vcz3bg954k7cd73zqjvhacJuL9RbrzPz8qPmZdgqP6EUKwy0PCNhaaPA==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  /@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.21.5):
-    resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==}
+  /@babel/plugin-syntax-import-assertions@7.23.3(@babel/core@7.24.0):
+    resolution: {integrity: sha512-lPgDSU+SJLK3xmFDTV2ZRQAiM7UuUjGidwBywFavObCiZc1BeAAcMtHJKUya92hPHO+at63JJPLygilZard8jw==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  /@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.20.12):
-    resolution: {integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==}
+  /@babel/plugin-syntax-import-attributes@7.23.3(@babel/core@7.24.0):
+    resolution: {integrity: sha512-pawnE0P9g10xgoP7yKr6CK63K2FMsTE+FZidZO/1PwRdzmAPVs+HS1mAURUsgaoxammTJvULUdIkEK0gOcU2tA==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  /@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.21.5):
-    resolution: {integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==}
+  /@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.22.9):
+    resolution: {integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-syntax-private-property-in-object@7.14.5(@babel/core@7.20.12):
-    resolution: {integrity: sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==}
-    engines: {node: '>=6.9.0'}
+  /@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.24.0):
+    resolution: {integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-private-property-in-object@7.14.5(@babel/core@7.21.5):
-    resolution: {integrity: sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==}
-    engines: {node: '>=6.9.0'}
+  /@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.22.9):
+    resolution: {integrity: sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.20.12):
-    resolution: {integrity: sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==}
-    engines: {node: '>=6.9.0'}
+  /@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.24.0):
+    resolution: {integrity: sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.21.5):
-    resolution: {integrity: sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==}
+  /@babel/plugin-syntax-jsx@7.18.6(@babel/core@7.22.9):
+    resolution: {integrity: sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-syntax-typescript@7.20.0(@babel/core@7.21.5):
-    resolution: {integrity: sha512-rd9TkG+u1CExzS4SM1BlMEhMXwFLKVjOAFFCDx9PbX5ycJWDoWMcwdJH9RhkPu1dOgn5TrxLot/Gx6lWFuAUNQ==}
+  /@babel/plugin-syntax-jsx@7.23.3(@babel/core@7.24.0):
+    resolution: {integrity: sha512-EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-arrow-functions@7.20.7(@babel/core@7.20.12):
-    resolution: {integrity: sha512-3poA5E7dzDomxj9WXWwuD6A5F3kc7VXwIJO+E+J8qtDtS+pXPAhrgEyh+9GBwBgPq1Z+bB+/JD60lp5jsN7JPQ==}
-    engines: {node: '>=6.9.0'}
+  /@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.22.9):
+    resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-transform-arrow-functions@7.20.7(@babel/core@7.21.5):
-    resolution: {integrity: sha512-3poA5E7dzDomxj9WXWwuD6A5F3kc7VXwIJO+E+J8qtDtS+pXPAhrgEyh+9GBwBgPq1Z+bB+/JD60lp5jsN7JPQ==}
-    engines: {node: '>=6.9.0'}
+  /@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.24.0):
+    resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-async-to-generator@7.20.7(@babel/core@7.20.12):
-    resolution: {integrity: sha512-Uo5gwHPT9vgnSXQxqGtpdufUiWp96gk7yiP4Mp5bm1QMkEmLXBO7PAGYbKoJ6DhAwiNkcHFBol/x5zZZkL/t0Q==}
-    engines: {node: '>=6.9.0'}
+  /@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.22.9):
+    resolution: {integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-module-imports': 7.18.6
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/helper-remap-async-to-generator': 7.18.9(@babel/core@7.20.12)
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-transform-async-to-generator@7.20.7(@babel/core@7.21.5):
-    resolution: {integrity: sha512-Uo5gwHPT9vgnSXQxqGtpdufUiWp96gk7yiP4Mp5bm1QMkEmLXBO7PAGYbKoJ6DhAwiNkcHFBol/x5zZZkL/t0Q==}
-    engines: {node: '>=6.9.0'}
+  /@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.24.0):
+    resolution: {integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-module-imports': 7.18.6
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/helper-remap-async-to-generator': 7.18.9(@babel/core@7.21.5)
-    transitivePeerDependencies:
-      - supports-color
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-block-scoped-functions@7.18.6(@babel/core@7.20.12):
-    resolution: {integrity: sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==}
-    engines: {node: '>=6.9.0'}
+  /@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.22.9):
+    resolution: {integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-transform-block-scoped-functions@7.18.6(@babel/core@7.21.5):
-    resolution: {integrity: sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==}
-    engines: {node: '>=6.9.0'}
+  /@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.24.0):
+    resolution: {integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-block-scoping@7.20.11(@babel/core@7.20.12):
-    resolution: {integrity: sha512-tA4N427a7fjf1P0/2I4ScsHGc5jcHPbb30xMbaTke2gxDuWpUfXDuX1FEymJwKk4tuGUvGcejAR6HdZVqmmPyw==}
-    engines: {node: '>=6.9.0'}
+  /@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.22.9):
+    resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-transform-block-scoping@7.20.11(@babel/core@7.21.5):
-    resolution: {integrity: sha512-tA4N427a7fjf1P0/2I4ScsHGc5jcHPbb30xMbaTke2gxDuWpUfXDuX1FEymJwKk4tuGUvGcejAR6HdZVqmmPyw==}
-    engines: {node: '>=6.9.0'}
+  /@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.24.0):
+    resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-classes@7.20.7(@babel/core@7.20.12):
-    resolution: {integrity: sha512-LWYbsiXTPKl+oBlXUGlwNlJZetXD5Am+CyBdqhPsDVjM9Jc8jwBJFrKhHf900Kfk2eZG1y9MAG3UNajol7A4VQ==}
-    engines: {node: '>=6.9.0'}
+  /@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.22.9):
+    resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-annotate-as-pure': 7.18.6
-      '@babel/helper-compilation-targets': 7.21.5(@babel/core@7.20.12)
-      '@babel/helper-environment-visitor': 7.18.9
-      '@babel/helper-function-name': 7.19.0
-      '@babel/helper-optimise-call-expression': 7.18.6
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/helper-replace-supers': 7.20.7
-      '@babel/helper-split-export-declaration': 7.18.6
-      globals: 11.12.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-transform-classes@7.20.7(@babel/core@7.21.5):
-    resolution: {integrity: sha512-LWYbsiXTPKl+oBlXUGlwNlJZetXD5Am+CyBdqhPsDVjM9Jc8jwBJFrKhHf900Kfk2eZG1y9MAG3UNajol7A4VQ==}
-    engines: {node: '>=6.9.0'}
+  /@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.24.0):
+    resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-annotate-as-pure': 7.18.6
-      '@babel/helper-compilation-targets': 7.21.5(@babel/core@7.21.5)
-      '@babel/helper-environment-visitor': 7.18.9
-      '@babel/helper-function-name': 7.19.0
-      '@babel/helper-optimise-call-expression': 7.18.6
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/helper-replace-supers': 7.20.7
-      '@babel/helper-split-export-declaration': 7.18.6
-      globals: 11.12.0
-    transitivePeerDependencies:
-      - supports-color
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-computed-properties@7.20.7(@babel/core@7.20.12):
-    resolution: {integrity: sha512-Lz7MvBK6DTjElHAmfu6bfANzKcxpyNPeYBGEafyA6E5HtRpjpZwU+u7Qrgz/2OR0z+5TvKYbPdphfSaAcZBrYQ==}
-    engines: {node: '>=6.9.0'}
+  /@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.22.9):
+    resolution: {integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/template': 7.20.7
-    dev: true
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-transform-computed-properties@7.20.7(@babel/core@7.21.5):
-    resolution: {integrity: sha512-Lz7MvBK6DTjElHAmfu6bfANzKcxpyNPeYBGEafyA6E5HtRpjpZwU+u7Qrgz/2OR0z+5TvKYbPdphfSaAcZBrYQ==}
-    engines: {node: '>=6.9.0'}
+  /@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.24.0):
+    resolution: {integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/template': 7.20.7
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-destructuring@7.20.7(@babel/core@7.20.12):
-    resolution: {integrity: sha512-Xwg403sRrZb81IVB79ZPqNQME23yhugYVqgTxAhT99h485F4f+GMELFhhOsscDUB7HCswepKeCKLn/GZvUKoBA==}
+  /@babel/plugin-syntax-private-property-in-object@7.14.5(@babel/core@7.24.0):
+    resolution: {integrity: sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  /@babel/plugin-transform-destructuring@7.20.7(@babel/core@7.21.5):
-    resolution: {integrity: sha512-Xwg403sRrZb81IVB79ZPqNQME23yhugYVqgTxAhT99h485F4f+GMELFhhOsscDUB7HCswepKeCKLn/GZvUKoBA==}
+  /@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.22.9):
+    resolution: {integrity: sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-transform-dotall-regex@7.18.6(@babel/core@7.20.12):
-    resolution: {integrity: sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==}
+  /@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.24.0):
+    resolution: {integrity: sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-create-regexp-features-plugin': 7.20.5(@babel/core@7.20.12)
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-dotall-regex@7.18.6(@babel/core@7.21.5):
-    resolution: {integrity: sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==}
+  /@babel/plugin-syntax-typescript@7.20.0(@babel/core@7.22.9):
+    resolution: {integrity: sha512-rd9TkG+u1CExzS4SM1BlMEhMXwFLKVjOAFFCDx9PbX5ycJWDoWMcwdJH9RhkPu1dOgn5TrxLot/Gx6lWFuAUNQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-create-regexp-features-plugin': 7.20.5(@babel/core@7.21.5)
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-transform-duplicate-keys@7.18.9(@babel/core@7.20.12):
-    resolution: {integrity: sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw==}
+  /@babel/plugin-syntax-typescript@7.23.3(@babel/core@7.24.0):
+    resolution: {integrity: sha512-9EiNjVJOMwCO+43TqoTrgQ8jMwcAd0sWyXi9RPfIsLTj4R2MADDDQXELhffaUx/uJv2AYcxBgPwH6j4TIA4ytQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-duplicate-keys@7.18.9(@babel/core@7.21.5):
-    resolution: {integrity: sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw==}
+  /@babel/plugin-syntax-unicode-sets-regex@7.18.6(@babel/core@7.24.0):
+    resolution: {integrity: sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
-      '@babel/core': ^7.0.0-0
+      '@babel/core': ^7.0.0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/core': 7.24.0
+      '@babel/helper-create-regexp-features-plugin': 7.22.9(@babel/core@7.24.0)
+      '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  /@babel/plugin-transform-exponentiation-operator@7.18.6(@babel/core@7.20.12):
-    resolution: {integrity: sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==}
+  /@babel/plugin-transform-arrow-functions@7.23.3(@babel/core@7.24.0):
+    resolution: {integrity: sha512-NzQcQrzaQPkaEwoTm4Mhyl8jI1huEL/WWIEvudjTCMJ9aBZNpsJbMASx7EQECtQQPS/DcnFpo0FIh3LvEO9cxQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-builder-binary-assignment-operator-visitor': 7.18.9
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  /@babel/plugin-transform-exponentiation-operator@7.18.6(@babel/core@7.21.5):
-    resolution: {integrity: sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==}
+  /@babel/plugin-transform-async-generator-functions@7.23.9(@babel/core@7.24.0):
+    resolution: {integrity: sha512-8Q3veQEDGe14dTYuwagbRtwxQDnytyg1JFu4/HwEMETeofocrB0U0ejBJIXoeG/t2oXZ8kzCyI0ZZfbT80VFNQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-builder-binary-assignment-operator-visitor': 7.18.9
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/core': 7.24.0
+      '@babel/helper-environment-visitor': 7.22.20
+      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/helper-remap-async-to-generator': 7.22.20(@babel/core@7.24.0)
+      '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.24.0)
     dev: true
 
-  /@babel/plugin-transform-flow-strip-types@7.19.0(@babel/core@7.21.5):
-    resolution: {integrity: sha512-sgeMlNaQVbCSpgLSKP4ZZKfsJVnFnNQlUSk6gPYzR/q7tzCgQF2t8RBKAP6cKJeZdveei7Q7Jm527xepI8lNLg==}
+  /@babel/plugin-transform-async-to-generator@7.23.3(@babel/core@7.24.0):
+    resolution: {integrity: sha512-A7LFsKi4U4fomjqXJlZg/u0ft/n8/7n7lpffUP/ZULx/DtV9SGlNKZolHH6PE8Xl1ngCc0M11OaeZptXVkfKSw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/plugin-syntax-flow': 7.18.6(@babel/core@7.21.5)
+      '@babel/core': 7.24.0
+      '@babel/helper-module-imports': 7.22.15
+      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/helper-remap-async-to-generator': 7.22.20(@babel/core@7.24.0)
     dev: true
 
-  /@babel/plugin-transform-for-of@7.18.8(@babel/core@7.20.12):
-    resolution: {integrity: sha512-yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ==}
+  /@babel/plugin-transform-block-scoped-functions@7.23.3(@babel/core@7.24.0):
+    resolution: {integrity: sha512-vI+0sIaPIO6CNuM9Kk5VmXcMVRiOpDh7w2zZt9GXzmE/9KD70CUEVhvPR/etAeNK/FAEkhxQtXOzVF3EuRL41A==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  /@babel/plugin-transform-for-of@7.18.8(@babel/core@7.21.5):
-    resolution: {integrity: sha512-yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ==}
+  /@babel/plugin-transform-block-scoping@7.23.4(@babel/core@7.24.0):
+    resolution: {integrity: sha512-0QqbP6B6HOh7/8iNR4CQU2Th/bbRtBp4KS9vcaZd1fZ0wSh5Fyssg0UCIHwxh+ka+pNDREbVLQnHCMHKZfPwfw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  /@babel/plugin-transform-function-name@7.18.9(@babel/core@7.20.12):
-    resolution: {integrity: sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ==}
+  /@babel/plugin-transform-class-properties@7.22.5(@babel/core@7.24.0):
+    resolution: {integrity: sha512-nDkQ0NfkOhPTq8YCLiWNxp1+f9fCobEjCb0n8WdbNUBc4IB5V7P1QnX9IjpSoquKrXF5SKojHleVNs2vGeHCHQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-compilation-targets': 7.21.5(@babel/core@7.20.12)
-      '@babel/helper-function-name': 7.19.0
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/core': 7.24.0
+      '@babel/helper-create-class-features-plugin': 7.22.9(@babel/core@7.24.0)
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-function-name@7.18.9(@babel/core@7.21.5):
-    resolution: {integrity: sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ==}
+  /@babel/plugin-transform-class-properties@7.23.3(@babel/core@7.24.0):
+    resolution: {integrity: sha512-uM+AN8yCIjDPccsKGlw271xjJtGii+xQIF/uMPS8H15L12jZTsLfF4o5vNO7d/oUguOyfdikHGc/yi9ge4SGIg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-compilation-targets': 7.21.5(@babel/core@7.21.5)
-      '@babel/helper-function-name': 7.19.0
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/core': 7.24.0
+      '@babel/helper-create-class-features-plugin': 7.24.0(@babel/core@7.24.0)
+      '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  /@babel/plugin-transform-literals@7.18.9(@babel/core@7.20.12):
-    resolution: {integrity: sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg==}
+  /@babel/plugin-transform-class-static-block@7.23.4(@babel/core@7.24.0):
+    resolution: {integrity: sha512-nsWu/1M+ggti1SOALj3hfx5FXzAY06fwPJsUZD4/A5e1bWi46VUIWtD+kOX6/IdhXGsXBWllLFDSnqSCdUNydQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
-      '@babel/core': ^7.0.0-0
+      '@babel/core': ^7.12.0
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/core': 7.24.0
+      '@babel/helper-create-class-features-plugin': 7.24.0(@babel/core@7.24.0)
+      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.24.0)
     dev: true
 
-  /@babel/plugin-transform-literals@7.18.9(@babel/core@7.21.5):
-    resolution: {integrity: sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg==}
+  /@babel/plugin-transform-classes@7.23.8(@babel/core@7.24.0):
+    resolution: {integrity: sha512-yAYslGsY1bX6Knmg46RjiCiNSwJKv2IUC8qOdYKqMMr0491SXFhcHqOdRDeCRohOOIzwN/90C6mQ9qAKgrP7dg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/core': 7.24.0
+      '@babel/helper-annotate-as-pure': 7.22.5
+      '@babel/helper-compilation-targets': 7.23.6
+      '@babel/helper-environment-visitor': 7.22.20
+      '@babel/helper-function-name': 7.23.0
+      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/helper-replace-supers': 7.22.20(@babel/core@7.24.0)
+      '@babel/helper-split-export-declaration': 7.22.6
+      globals: 11.12.0
     dev: true
 
-  /@babel/plugin-transform-member-expression-literals@7.18.6(@babel/core@7.20.12):
-    resolution: {integrity: sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==}
+  /@babel/plugin-transform-computed-properties@7.23.3(@babel/core@7.24.0):
+    resolution: {integrity: sha512-dTj83UVTLw/+nbiHqQSFdwO9CbTtwq1DsDqm3CUEtDrZNET5rT5E6bIdTlOftDTDLMYxvxHNEYO4B9SLl8SLZw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/template': 7.24.0
     dev: true
 
-  /@babel/plugin-transform-member-expression-literals@7.18.6(@babel/core@7.21.5):
-    resolution: {integrity: sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==}
+  /@babel/plugin-transform-destructuring@7.23.3(@babel/core@7.24.0):
+    resolution: {integrity: sha512-n225npDqjDIr967cMScVKHXJs7rout1q+tt50inyBCPkyZ8KxeI6d+GIbSBTT/w/9WdlWDOej3V9HE5Lgk57gw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  /@babel/plugin-transform-modules-amd@7.20.11(@babel/core@7.20.12):
-    resolution: {integrity: sha512-NuzCt5IIYOW0O30UvqktzHYR2ud5bOWbY0yaxWZ6G+aFzOMJvrs5YHNikrbdaT15+KNO31nPOy5Fim3ku6Zb5g==}
+  /@babel/plugin-transform-dotall-regex@7.23.3(@babel/core@7.24.0):
+    resolution: {integrity: sha512-vgnFYDHAKzFaTVp+mneDsIEbnJ2Np/9ng9iviHw3P/KVcgONxpNULEW/51Z/BaFojG2GI2GwwXck5uV1+1NOYQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-module-transforms': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
-    transitivePeerDependencies:
-      - supports-color
+      '@babel/core': 7.24.0
+      '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.24.0)
+      '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  /@babel/plugin-transform-modules-amd@7.20.11(@babel/core@7.21.5):
-    resolution: {integrity: sha512-NuzCt5IIYOW0O30UvqktzHYR2ud5bOWbY0yaxWZ6G+aFzOMJvrs5YHNikrbdaT15+KNO31nPOy5Fim3ku6Zb5g==}
+  /@babel/plugin-transform-duplicate-keys@7.23.3(@babel/core@7.24.0):
+    resolution: {integrity: sha512-RrqQ+BQmU3Oyav3J+7/myfvRCq7Tbz+kKLLshUmMwNlDHExbGL7ARhajvoBJEvc+fCguPPu887N+3RRXBVKZUA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-module-transforms': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
-    transitivePeerDependencies:
-      - supports-color
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  /@babel/plugin-transform-modules-commonjs@7.20.11(@babel/core@7.20.12):
-    resolution: {integrity: sha512-S8e1f7WQ7cimJQ51JkAaDrEtohVEitXjgCGAS2N8S31Y42E+kWwfSz83LYz57QdBm7q9diARVqanIaH2oVgQnw==}
+  /@babel/plugin-transform-dynamic-import@7.23.4(@babel/core@7.24.0):
+    resolution: {integrity: sha512-V6jIbLhdJK86MaLh4Jpghi8ho5fGzt3imHOBu/x0jlBaPYqDoWz4RDXjmMOfnh+JWNaQleEAByZLV0QzBT4YQQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-module-transforms': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/helper-simple-access': 7.20.2
-    transitivePeerDependencies:
-      - supports-color
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.24.0)
     dev: true
 
-  /@babel/plugin-transform-modules-commonjs@7.20.11(@babel/core@7.21.5):
-    resolution: {integrity: sha512-S8e1f7WQ7cimJQ51JkAaDrEtohVEitXjgCGAS2N8S31Y42E+kWwfSz83LYz57QdBm7q9diARVqanIaH2oVgQnw==}
+  /@babel/plugin-transform-exponentiation-operator@7.23.3(@babel/core@7.24.0):
+    resolution: {integrity: sha512-5fhCsl1odX96u7ILKHBj4/Y8vipoqwsJMh4csSA8qFfxrZDEA4Ssku2DyNvMJSmZNOEBT750LfFPbtrnTP90BQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-module-transforms': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/helper-simple-access': 7.20.2
-    transitivePeerDependencies:
-      - supports-color
+      '@babel/core': 7.24.0
+      '@babel/helper-builder-binary-assignment-operator-visitor': 7.22.15
+      '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  /@babel/plugin-transform-modules-systemjs@7.20.11(@babel/core@7.20.12):
-    resolution: {integrity: sha512-vVu5g9BPQKSFEmvt2TA4Da5N+QVS66EX21d8uoOihC+OCpUoGvzVsXeqFdtAEfVa5BILAeFt+U7yVmLbQnAJmw==}
+  /@babel/plugin-transform-export-namespace-from@7.23.4(@babel/core@7.24.0):
+    resolution: {integrity: sha512-GzuSBcKkx62dGzZI1WVgTWvkkz84FZO5TC5T8dl/Tht/rAla6Dg/Mz9Yhypg+ezVACf/rgDuQt3kbWEv7LdUDQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-hoist-variables': 7.18.6
-      '@babel/helper-module-transforms': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/helper-validator-identifier': 7.19.1
-    transitivePeerDependencies:
-      - supports-color
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.24.0)
     dev: true
 
-  /@babel/plugin-transform-modules-systemjs@7.20.11(@babel/core@7.21.5):
-    resolution: {integrity: sha512-vVu5g9BPQKSFEmvt2TA4Da5N+QVS66EX21d8uoOihC+OCpUoGvzVsXeqFdtAEfVa5BILAeFt+U7yVmLbQnAJmw==}
+  /@babel/plugin-transform-flow-strip-types@7.23.3(@babel/core@7.24.0):
+    resolution: {integrity: sha512-26/pQTf9nQSNVJCrLB1IkHUKyPxR+lMrH2QDPG89+Znu9rAMbtrybdbWeE9bb7gzjmE5iXHEY+e0HUwM6Co93Q==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-hoist-variables': 7.18.6
-      '@babel/helper-module-transforms': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/helper-validator-identifier': 7.19.1
-    transitivePeerDependencies:
-      - supports-color
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/plugin-syntax-flow': 7.23.3(@babel/core@7.24.0)
     dev: true
 
-  /@babel/plugin-transform-modules-umd@7.18.6(@babel/core@7.20.12):
-    resolution: {integrity: sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ==}
+  /@babel/plugin-transform-for-of@7.23.6(@babel/core@7.24.0):
+    resolution: {integrity: sha512-aYH4ytZ0qSuBbpfhuofbg/e96oQ7U2w1Aw/UQmKT+1l39uEhUPoFS3fHevDc1G0OvewyDudfMKY1OulczHzWIw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-module-transforms': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
-    transitivePeerDependencies:
-      - supports-color
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/helper-skip-transparent-expression-wrappers': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-modules-umd@7.18.6(@babel/core@7.21.5):
-    resolution: {integrity: sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ==}
+  /@babel/plugin-transform-function-name@7.23.3(@babel/core@7.24.0):
+    resolution: {integrity: sha512-I1QXp1LxIvt8yLaib49dRW5Okt7Q4oaxao6tFVKS/anCdEOMtYwWVKoiOA1p34GOWIZjUK0E+zCp7+l1pfQyiw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-module-transforms': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
-    transitivePeerDependencies:
-      - supports-color
+      '@babel/core': 7.24.0
+      '@babel/helper-compilation-targets': 7.23.6
+      '@babel/helper-function-name': 7.23.0
+      '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  /@babel/plugin-transform-named-capturing-groups-regex@7.20.5(@babel/core@7.20.12):
-    resolution: {integrity: sha512-mOW4tTzi5iTLnw+78iEq3gr8Aoq4WNRGpmSlrogqaiCBoR1HFhpU4JkpQFOHfeYx3ReVIFWOQJS4aZBRvuZ6mA==}
+  /@babel/plugin-transform-json-strings@7.23.4(@babel/core@7.24.0):
+    resolution: {integrity: sha512-81nTOqM1dMwZ/aRXQ59zVubN9wHGqk6UtqRK+/q+ciXmRy8fSolhGVvG09HHRGo4l6fr/c4ZhXUQH0uFW7PZbg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
-      '@babel/core': ^7.0.0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-create-regexp-features-plugin': 7.20.5(@babel/core@7.20.12)
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.24.0)
     dev: true
 
-  /@babel/plugin-transform-named-capturing-groups-regex@7.20.5(@babel/core@7.21.5):
-    resolution: {integrity: sha512-mOW4tTzi5iTLnw+78iEq3gr8Aoq4WNRGpmSlrogqaiCBoR1HFhpU4JkpQFOHfeYx3ReVIFWOQJS4aZBRvuZ6mA==}
+  /@babel/plugin-transform-literals@7.23.3(@babel/core@7.24.0):
+    resolution: {integrity: sha512-wZ0PIXRxnwZvl9AYpqNUxpZ5BiTGrYt7kueGQ+N5FiQ7RCOD4cm8iShd6S6ggfVIWaJf2EMk8eRzAh52RfP4rQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
-      '@babel/core': ^7.0.0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-create-regexp-features-plugin': 7.20.5(@babel/core@7.21.5)
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  /@babel/plugin-transform-new-target@7.18.6(@babel/core@7.20.12):
-    resolution: {integrity: sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw==}
+  /@babel/plugin-transform-logical-assignment-operators@7.23.4(@babel/core@7.24.0):
+    resolution: {integrity: sha512-Mc/ALf1rmZTP4JKKEhUwiORU+vcfarFVLfcFiolKUo6sewoxSEgl36ak5t+4WamRsNr6nzjZXQjM35WsU+9vbg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.24.0)
     dev: true
 
-  /@babel/plugin-transform-new-target@7.18.6(@babel/core@7.21.5):
-    resolution: {integrity: sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw==}
+  /@babel/plugin-transform-member-expression-literals@7.23.3(@babel/core@7.24.0):
+    resolution: {integrity: sha512-sC3LdDBDi5x96LA+Ytekz2ZPk8i/Ck+DEuDbRAll5rknJ5XRTSaPKEYwomLcs1AA8wg9b3KjIQRsnApj+q51Ag==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  /@babel/plugin-transform-object-super@7.18.6(@babel/core@7.20.12):
-    resolution: {integrity: sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==}
+  /@babel/plugin-transform-modules-amd@7.23.3(@babel/core@7.24.0):
+    resolution: {integrity: sha512-vJYQGxeKM4t8hYCKVBlZX/gtIY2I7mRGFNcm85sgXGMTBcoV3QdVtdpbcWEbzbfUIUZKwvgFT82mRvaQIebZzw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/helper-replace-supers': 7.20.7
-    transitivePeerDependencies:
-      - supports-color
+      '@babel/core': 7.24.0
+      '@babel/helper-module-transforms': 7.23.3(@babel/core@7.24.0)
+      '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  /@babel/plugin-transform-object-super@7.18.6(@babel/core@7.21.5):
-    resolution: {integrity: sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==}
+  /@babel/plugin-transform-modules-commonjs@7.23.3(@babel/core@7.24.0):
+    resolution: {integrity: sha512-aVS0F65LKsdNOtcz6FRCpE4OgsP2OFnW46qNxNIX9h3wuzaNcSQsJysuMwqSibC98HPrf2vCgtxKNwS0DAlgcA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/helper-replace-supers': 7.20.7
-    transitivePeerDependencies:
-      - supports-color
+      '@babel/core': 7.24.0
+      '@babel/helper-module-transforms': 7.23.3(@babel/core@7.24.0)
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/helper-simple-access': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-parameters@7.20.7(@babel/core@7.20.12):
-    resolution: {integrity: sha512-WiWBIkeHKVOSYPO0pWkxGPfKeWrCJyD3NJ53+Lrp/QMSZbsVPovrVl2aWZ19D/LTVnaDv5Ap7GJ/B2CTOZdrfA==}
+  /@babel/plugin-transform-modules-systemjs@7.23.9(@babel/core@7.24.0):
+    resolution: {integrity: sha512-KDlPRM6sLo4o1FkiSlXoAa8edLXFsKKIda779fbLrvmeuc3itnjCtaO6RrtoaANsIJANj+Vk1zqbZIMhkCAHVw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/core': 7.24.0
+      '@babel/helper-hoist-variables': 7.22.5
+      '@babel/helper-module-transforms': 7.23.3(@babel/core@7.24.0)
+      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/helper-validator-identifier': 7.22.20
     dev: true
 
-  /@babel/plugin-transform-parameters@7.20.7(@babel/core@7.21.5):
-    resolution: {integrity: sha512-WiWBIkeHKVOSYPO0pWkxGPfKeWrCJyD3NJ53+Lrp/QMSZbsVPovrVl2aWZ19D/LTVnaDv5Ap7GJ/B2CTOZdrfA==}
+  /@babel/plugin-transform-modules-umd@7.23.3(@babel/core@7.24.0):
+    resolution: {integrity: sha512-zHsy9iXX2nIsCBFPud3jKn1IRPWg3Ing1qOZgeKV39m1ZgIdpJqvlWVeiHBZC6ITRG0MfskhYe9cLgntfSFPIg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/core': 7.24.0
+      '@babel/helper-module-transforms': 7.23.3(@babel/core@7.24.0)
+      '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  /@babel/plugin-transform-property-literals@7.18.6(@babel/core@7.20.12):
-    resolution: {integrity: sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==}
+  /@babel/plugin-transform-named-capturing-groups-regex@7.22.5(@babel/core@7.24.0):
+    resolution: {integrity: sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
-      '@babel/core': ^7.0.0-0
+      '@babel/core': ^7.0.0
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/core': 7.24.0
+      '@babel/helper-create-regexp-features-plugin': 7.22.9(@babel/core@7.24.0)
+      '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  /@babel/plugin-transform-property-literals@7.18.6(@babel/core@7.21.5):
-    resolution: {integrity: sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==}
+  /@babel/plugin-transform-new-target@7.23.3(@babel/core@7.24.0):
+    resolution: {integrity: sha512-YJ3xKqtJMAT5/TIZnpAR3I+K+WaDowYbN3xyxI8zxx/Gsypwf9B9h0VB+1Nh6ACAAPRS5NSRje0uVv5i79HYGQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  /@babel/plugin-transform-react-jsx-self@7.21.0(@babel/core@7.21.5):
-    resolution: {integrity: sha512-f/Eq+79JEu+KUANFks9UZCcvydOOGMgF7jBrcwjHa5jTZD8JivnhCJYvmlhR/WTXBWonDExPoW0eO/CR4QJirA==}
+  /@babel/plugin-transform-nullish-coalescing-operator@7.23.4(@babel/core@7.24.0):
+    resolution: {integrity: sha512-jHE9EVVqHKAQx+VePv5LLGHjmHSJR76vawFPTdlxR/LVJPfOEGxREQwQfjuZEOPTwG92X3LINSh3M40Rv4zpVA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
+      '@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)
     dev: true
 
-  /@babel/plugin-transform-react-jsx-source@7.19.6(@babel/core@7.21.5):
-    resolution: {integrity: sha512-RpAi004QyMNisst/pvSanoRdJ4q+jMCWyk9zdw/CyLB9j8RXEahodR6l2GyttDRyEVWZtbN+TpLiHJ3t34LbsQ==}
+  /@babel/plugin-transform-numeric-separator@7.23.4(@babel/core@7.24.0):
+    resolution: {integrity: sha512-mps6auzgwjRrwKEZA05cOwuDc9FAzoyFS4ZsG/8F43bTLf/TgkJg7QXOrPO1JO599iA3qgK9MXdMGOEC8O1h6Q==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.24.0)
     dev: true
 
-  /@babel/plugin-transform-react-jsx@7.20.7(@babel/core@7.20.12):
-    resolution: {integrity: sha512-Tfq7qqD+tRj3EoDhY00nn2uP2hsRxgYGi5mLQ5TimKav0a9Lrpd4deE+fcLXU8zFYRjlKPHZhpCvfEA6qnBxqQ==}
+  /@babel/plugin-transform-object-rest-spread@7.24.0(@babel/core@7.24.0):
+    resolution: {integrity: sha512-y/yKMm7buHpFFXfxVFS4Vk1ToRJDilIa6fKRioB9Vjichv58TDGXTvqV0dN7plobAmTW5eSEGXDngE+Mm+uO+w==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-annotate-as-pure': 7.18.6
-      '@babel/helper-module-imports': 7.18.6
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/plugin-syntax-jsx': 7.18.6(@babel/core@7.20.12)
-      '@babel/types': 7.20.7
+      '@babel/compat-data': 7.23.5
+      '@babel/core': 7.24.0
+      '@babel/helper-compilation-targets': 7.23.6
+      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.24.0)
+      '@babel/plugin-transform-parameters': 7.23.3(@babel/core@7.24.0)
     dev: true
 
-  /@babel/plugin-transform-regenerator@7.20.5(@babel/core@7.20.12):
-    resolution: {integrity: sha512-kW/oO7HPBtntbsahzQ0qSE3tFvkFwnbozz3NWFhLGqH75vLEg+sCGngLlhVkePlCs3Jv0dBBHDzCHxNiFAQKCQ==}
+  /@babel/plugin-transform-object-super@7.23.3(@babel/core@7.24.0):
+    resolution: {integrity: sha512-BwQ8q0x2JG+3lxCVFohg+KbQM7plfpBwThdW9A6TMtWwLsbDA01Ek2Zb/AgDN39BiZsExm4qrXxjk+P1/fzGrA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.20.2
-      regenerator-transform: 0.15.1
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/helper-replace-supers': 7.22.20(@babel/core@7.24.0)
     dev: true
 
-  /@babel/plugin-transform-regenerator@7.20.5(@babel/core@7.21.5):
-    resolution: {integrity: sha512-kW/oO7HPBtntbsahzQ0qSE3tFvkFwnbozz3NWFhLGqH75vLEg+sCGngLlhVkePlCs3Jv0dBBHDzCHxNiFAQKCQ==}
+  /@babel/plugin-transform-optional-catch-binding@7.23.4(@babel/core@7.24.0):
+    resolution: {integrity: sha512-XIq8t0rJPHf6Wvmbn9nFxU6ao4c7WhghTR5WyV8SrJfUFzyxhCm4nhC+iAp3HFhbAKLfYpgzhJ6t4XCtVwqO5A==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
-      regenerator-transform: 0.15.1
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.24.0)
     dev: true
 
-  /@babel/plugin-transform-reserved-words@7.18.6(@babel/core@7.20.12):
-    resolution: {integrity: sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA==}
+  /@babel/plugin-transform-optional-chaining@7.23.4(@babel/core@7.24.0):
+    resolution: {integrity: sha512-ZU8y5zWOfjM5vZ+asjgAPwDaBjJzgufjES89Rs4Lpq63O300R/kOz30WCLo6BxxX6QVEilwSlpClnG5cZaikTA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/helper-skip-transparent-expression-wrappers': 7.22.5
+      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.24.0)
     dev: true
 
-  /@babel/plugin-transform-reserved-words@7.18.6(@babel/core@7.21.5):
-    resolution: {integrity: sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA==}
+  /@babel/plugin-transform-parameters@7.23.3(@babel/core@7.24.0):
+    resolution: {integrity: sha512-09lMt6UsUb3/34BbECKVbVwrT9bO6lILWln237z7sLaWnMsTi7Yc9fhX5DLpkJzAGfaReXI22wP41SZmnAA3Vw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  /@babel/plugin-transform-shorthand-properties@7.18.6(@babel/core@7.20.12):
-    resolution: {integrity: sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==}
+  /@babel/plugin-transform-private-methods@7.22.5(@babel/core@7.24.0):
+    resolution: {integrity: sha512-PPjh4gyrQnGe97JTalgRGMuU4icsZFnWkzicB/fUtzlKUqvsWBKEpPPfr5a2JiyirZkHxnAqkQMO5Z5B2kK3fA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/core': 7.24.0
+      '@babel/helper-create-class-features-plugin': 7.22.9(@babel/core@7.24.0)
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-shorthand-properties@7.18.6(@babel/core@7.21.5):
-    resolution: {integrity: sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==}
+  /@babel/plugin-transform-private-methods@7.23.3(@babel/core@7.24.0):
+    resolution: {integrity: sha512-UzqRcRtWsDMTLrRWFvUBDwmw06tCQH9Rl1uAjfh6ijMSmGYQ+fpdB+cnqRC8EMh5tuuxSv0/TejGL+7vyj+50g==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/core': 7.24.0
+      '@babel/helper-create-class-features-plugin': 7.24.0(@babel/core@7.24.0)
+      '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  /@babel/plugin-transform-spread@7.20.7(@babel/core@7.20.12):
-    resolution: {integrity: sha512-ewBbHQ+1U/VnH1fxltbJqDeWBU1oNLG8Dj11uIv3xVf7nrQu0bPGe5Rf716r7K5Qz+SqtAOVswoVunoiBtGhxw==}
+  /@babel/plugin-transform-private-property-in-object@7.23.4(@babel/core@7.24.0):
+    resolution: {integrity: sha512-9G3K1YqTq3F4Vt88Djx1UZ79PDyj+yKRnUy7cZGSMe+a7jkwD259uKKuUzQlPkGam7R+8RJwh5z4xO27fA1o2A==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/helper-skip-transparent-expression-wrappers': 7.20.0
+      '@babel/core': 7.24.0
+      '@babel/helper-annotate-as-pure': 7.22.5
+      '@babel/helper-create-class-features-plugin': 7.24.0(@babel/core@7.24.0)
+      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.24.0)
     dev: true
 
-  /@babel/plugin-transform-spread@7.20.7(@babel/core@7.21.5):
-    resolution: {integrity: sha512-ewBbHQ+1U/VnH1fxltbJqDeWBU1oNLG8Dj11uIv3xVf7nrQu0bPGe5Rf716r7K5Qz+SqtAOVswoVunoiBtGhxw==}
+  /@babel/plugin-transform-property-literals@7.23.3(@babel/core@7.24.0):
+    resolution: {integrity: sha512-jR3Jn3y7cZp4oEWPFAlRsSWjxKe4PZILGBSd4nis1TsC5qeSpb+nrtihJuDhNI7QHiVbUaiXa0X2RZY3/TI6Nw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/helper-skip-transparent-expression-wrappers': 7.20.0
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  /@babel/plugin-transform-sticky-regex@7.18.6(@babel/core@7.20.12):
-    resolution: {integrity: sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==}
+  /@babel/plugin-transform-regenerator@7.23.3(@babel/core@7.24.0):
+    resolution: {integrity: sha512-KP+75h0KghBMcVpuKisx3XTu9Ncut8Q8TuvGO4IhY+9D5DFEckQefOuIsB/gQ2tG71lCke4NMrtIPS8pOj18BQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.24.0
+      regenerator-transform: 0.15.2
     dev: true
 
-  /@babel/plugin-transform-sticky-regex@7.18.6(@babel/core@7.21.5):
-    resolution: {integrity: sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==}
+  /@babel/plugin-transform-reserved-words@7.23.3(@babel/core@7.24.0):
+    resolution: {integrity: sha512-QnNTazY54YqgGxwIexMZva9gqbPa15t/x9VS+0fsEFWplwVpXYZivtgl43Z1vMpc1bdPP2PP8siFeVcnFvA3Cg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  /@babel/plugin-transform-template-literals@7.18.9(@babel/core@7.20.12):
-    resolution: {integrity: sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==}
+  /@babel/plugin-transform-shorthand-properties@7.23.3(@babel/core@7.24.0):
+    resolution: {integrity: sha512-ED2fgqZLmexWiN+YNFX26fx4gh5qHDhn1O2gvEhreLW2iI63Sqm4llRLCXALKrCnbN4Jy0VcMQZl/SAzqug/jg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  /@babel/plugin-transform-template-literals@7.18.9(@babel/core@7.21.5):
-    resolution: {integrity: sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==}
+  /@babel/plugin-transform-spread@7.23.3(@babel/core@7.24.0):
+    resolution: {integrity: sha512-VvfVYlrlBVu+77xVTOAoxQ6mZbnIq5FM0aGBSFEcIh03qHf+zNqA4DC/3XMUozTg7bZV3e3mZQ0i13VB6v5yUg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/helper-skip-transparent-expression-wrappers': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-typeof-symbol@7.18.9(@babel/core@7.20.12):
-    resolution: {integrity: sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw==}
+  /@babel/plugin-transform-sticky-regex@7.23.3(@babel/core@7.24.0):
+    resolution: {integrity: sha512-HZOyN9g+rtvnOU3Yh7kSxXrKbzgrm5X4GncPY1QOquu7epga5MxKHVpYu2hvQnry/H+JjckSYRb93iNfsioAGg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  /@babel/plugin-transform-typeof-symbol@7.18.9(@babel/core@7.21.5):
-    resolution: {integrity: sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw==}
+  /@babel/plugin-transform-template-literals@7.23.3(@babel/core@7.24.0):
+    resolution: {integrity: sha512-Flok06AYNp7GV2oJPZZcP9vZdszev6vPBkHLwxwSpaIqx75wn6mUd3UFWsSsA0l8nXAKkyCmL/sR02m8RYGeHg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  /@babel/plugin-transform-typescript@7.20.7(@babel/core@7.21.5):
-    resolution: {integrity: sha512-m3wVKEvf6SoszD8pu4NZz3PvfKRCMgk6D6d0Qi9hNnlM5M6CFS92EgF4EiHVLKbU0r/r7ty1hg7NPZwE7WRbYw==}
+  /@babel/plugin-transform-typeof-symbol@7.23.3(@babel/core@7.24.0):
+    resolution: {integrity: sha512-4t15ViVnaFdrPC74be1gXBSMzXk3B4Us9lP7uLRQHTFpV5Dvt33pn+2MyyNxmN3VTTm3oTrZVMUmuw3oBnQ2oQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-create-class-features-plugin': 7.20.12(@babel/core@7.21.5)
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/plugin-syntax-typescript': 7.20.0(@babel/core@7.21.5)
-    transitivePeerDependencies:
-      - supports-color
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  /@babel/plugin-transform-unicode-escapes@7.18.10(@babel/core@7.20.12):
-    resolution: {integrity: sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ==}
+  /@babel/plugin-transform-typescript@7.23.6(@babel/core@7.24.0):
+    resolution: {integrity: sha512-6cBG5mBvUu4VUD04OHKnYzbuHNP8huDsD3EDqqpIpsswTDoqHCjLoHb6+QgsV1WsT2nipRqCPgxD3LXnEO7XfA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/core': 7.24.0
+      '@babel/helper-annotate-as-pure': 7.22.5
+      '@babel/helper-create-class-features-plugin': 7.24.0(@babel/core@7.24.0)
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/plugin-syntax-typescript': 7.23.3(@babel/core@7.24.0)
     dev: true
 
-  /@babel/plugin-transform-unicode-escapes@7.18.10(@babel/core@7.21.5):
-    resolution: {integrity: sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ==}
+  /@babel/plugin-transform-unicode-escapes@7.23.3(@babel/core@7.24.0):
+    resolution: {integrity: sha512-OMCUx/bU6ChE3r4+ZdylEqAjaQgHAgipgW8nsCfu5pGqDcFytVd91AwRvUJSBZDz0exPGgnjoqhgRYLRjFZc9Q==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  /@babel/plugin-transform-unicode-regex@7.18.6(@babel/core@7.20.12):
-    resolution: {integrity: sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==}
+  /@babel/plugin-transform-unicode-property-regex@7.23.3(@babel/core@7.24.0):
+    resolution: {integrity: sha512-KcLIm+pDZkWZQAFJ9pdfmh89EwVfmNovFBcXko8szpBeF8z68kWIPeKlmSOkT9BXJxs2C0uk+5LxoxIv62MROA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-create-regexp-features-plugin': 7.20.5(@babel/core@7.20.12)
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/core': 7.24.0
+      '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.24.0)
+      '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  /@babel/plugin-transform-unicode-regex@7.18.6(@babel/core@7.21.5):
-    resolution: {integrity: sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==}
+  /@babel/plugin-transform-unicode-regex@7.23.3(@babel/core@7.24.0):
+    resolution: {integrity: sha512-wMHpNA4x2cIA32b/ci3AfwNgheiva2W0WUKWTK7vBHBhDKfPsc5cFGNWm69WBqpwd86u1qwZ9PWevKqm1A3yAw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-create-regexp-features-plugin': 7.20.5(@babel/core@7.21.5)
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/core': 7.24.0
+      '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.24.0)
+      '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  /@babel/preset-env@7.20.2(@babel/core@7.20.12):
-    resolution: {integrity: sha512-1G0efQEWR1EHkKvKHqbG+IN/QdgwfByUpM5V5QroDzGV2t3S/WXNQd693cHiHTlCFMpr9B6FkPFXDA2lQcKoDg==}
+  /@babel/plugin-transform-unicode-sets-regex@7.23.3(@babel/core@7.24.0):
+    resolution: {integrity: sha512-W7lliA/v9bNR83Qc3q1ip9CQMZ09CcHDbHfbLRDNuAhn1Mvkr1ZNF7hPmztMQvtTGVLJ9m8IZqWsTkXOml8dbw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
-      '@babel/core': ^7.0.0-0
+      '@babel/core': ^7.0.0
     dependencies:
-      '@babel/compat-data': 7.20.10
-      '@babel/core': 7.20.12
-      '@babel/helper-compilation-targets': 7.20.7(@babel/core@7.20.12)
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/helper-validator-option': 7.18.6
-      '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.18.6(@babel/core@7.20.12)
-      '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.20.7(@babel/core@7.20.12)
-      '@babel/plugin-proposal-async-generator-functions': 7.20.7(@babel/core@7.20.12)
-      '@babel/plugin-proposal-class-properties': 7.18.6(@babel/core@7.20.12)
-      '@babel/plugin-proposal-class-static-block': 7.20.7(@babel/core@7.20.12)
-      '@babel/plugin-proposal-dynamic-import': 7.18.6(@babel/core@7.20.12)
-      '@babel/plugin-proposal-export-namespace-from': 7.18.9(@babel/core@7.20.12)
-      '@babel/plugin-proposal-json-strings': 7.18.6(@babel/core@7.20.12)
-      '@babel/plugin-proposal-logical-assignment-operators': 7.20.7(@babel/core@7.20.12)
-      '@babel/plugin-proposal-nullish-coalescing-operator': 7.18.6(@babel/core@7.20.12)
-      '@babel/plugin-proposal-numeric-separator': 7.18.6(@babel/core@7.20.12)
-      '@babel/plugin-proposal-object-rest-spread': 7.20.7(@babel/core@7.20.12)
-      '@babel/plugin-proposal-optional-catch-binding': 7.18.6(@babel/core@7.20.12)
-      '@babel/plugin-proposal-optional-chaining': 7.20.7(@babel/core@7.20.12)
-      '@babel/plugin-proposal-private-methods': 7.18.6(@babel/core@7.20.12)
-      '@babel/plugin-proposal-private-property-in-object': 7.20.5(@babel/core@7.20.12)
-      '@babel/plugin-proposal-unicode-property-regex': 7.18.6(@babel/core@7.20.12)
-      '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.20.12)
-      '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.20.12)
-      '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.20.12)
-      '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.20.12)
-      '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.20.12)
-      '@babel/plugin-syntax-import-assertions': 7.20.0(@babel/core@7.20.12)
-      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.20.12)
-      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.20.12)
-      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.20.12)
-      '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.20.12)
-      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.20.12)
-      '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.20.12)
-      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.20.12)
-      '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.20.12)
-      '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.20.12)
-      '@babel/plugin-transform-arrow-functions': 7.20.7(@babel/core@7.20.12)
-      '@babel/plugin-transform-async-to-generator': 7.20.7(@babel/core@7.20.12)
-      '@babel/plugin-transform-block-scoped-functions': 7.18.6(@babel/core@7.20.12)
-      '@babel/plugin-transform-block-scoping': 7.20.11(@babel/core@7.20.12)
-      '@babel/plugin-transform-classes': 7.20.7(@babel/core@7.20.12)
-      '@babel/plugin-transform-computed-properties': 7.20.7(@babel/core@7.20.12)
-      '@babel/plugin-transform-destructuring': 7.20.7(@babel/core@7.20.12)
-      '@babel/plugin-transform-dotall-regex': 7.18.6(@babel/core@7.20.12)
-      '@babel/plugin-transform-duplicate-keys': 7.18.9(@babel/core@7.20.12)
-      '@babel/plugin-transform-exponentiation-operator': 7.18.6(@babel/core@7.20.12)
-      '@babel/plugin-transform-for-of': 7.18.8(@babel/core@7.20.12)
-      '@babel/plugin-transform-function-name': 7.18.9(@babel/core@7.20.12)
-      '@babel/plugin-transform-literals': 7.18.9(@babel/core@7.20.12)
-      '@babel/plugin-transform-member-expression-literals': 7.18.6(@babel/core@7.20.12)
-      '@babel/plugin-transform-modules-amd': 7.20.11(@babel/core@7.20.12)
-      '@babel/plugin-transform-modules-commonjs': 7.20.11(@babel/core@7.20.12)
-      '@babel/plugin-transform-modules-systemjs': 7.20.11(@babel/core@7.20.12)
-      '@babel/plugin-transform-modules-umd': 7.18.6(@babel/core@7.20.12)
-      '@babel/plugin-transform-named-capturing-groups-regex': 7.20.5(@babel/core@7.20.12)
-      '@babel/plugin-transform-new-target': 7.18.6(@babel/core@7.20.12)
-      '@babel/plugin-transform-object-super': 7.18.6(@babel/core@7.20.12)
-      '@babel/plugin-transform-parameters': 7.20.7(@babel/core@7.20.12)
-      '@babel/plugin-transform-property-literals': 7.18.6(@babel/core@7.20.12)
-      '@babel/plugin-transform-regenerator': 7.20.5(@babel/core@7.20.12)
-      '@babel/plugin-transform-reserved-words': 7.18.6(@babel/core@7.20.12)
-      '@babel/plugin-transform-shorthand-properties': 7.18.6(@babel/core@7.20.12)
-      '@babel/plugin-transform-spread': 7.20.7(@babel/core@7.20.12)
-      '@babel/plugin-transform-sticky-regex': 7.18.6(@babel/core@7.20.12)
-      '@babel/plugin-transform-template-literals': 7.18.9(@babel/core@7.20.12)
-      '@babel/plugin-transform-typeof-symbol': 7.18.9(@babel/core@7.20.12)
-      '@babel/plugin-transform-unicode-escapes': 7.18.10(@babel/core@7.20.12)
-      '@babel/plugin-transform-unicode-regex': 7.18.6(@babel/core@7.20.12)
-      '@babel/preset-modules': 0.1.5(@babel/core@7.20.12)
-      '@babel/types': 7.20.7
-      babel-plugin-polyfill-corejs2: 0.3.3(@babel/core@7.20.12)
-      babel-plugin-polyfill-corejs3: 0.6.0(@babel/core@7.20.12)
-      babel-plugin-polyfill-regenerator: 0.4.1(@babel/core@7.20.12)
-      core-js-compat: 3.27.1
-      semver: 6.3.0
-    transitivePeerDependencies:
-      - supports-color
+      '@babel/core': 7.24.0
+      '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.24.0)
+      '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  /@babel/preset-env@7.20.2(@babel/core@7.21.5):
-    resolution: {integrity: sha512-1G0efQEWR1EHkKvKHqbG+IN/QdgwfByUpM5V5QroDzGV2t3S/WXNQd693cHiHTlCFMpr9B6FkPFXDA2lQcKoDg==}
+  /@babel/preset-env@7.24.0(@babel/core@7.24.0):
+    resolution: {integrity: sha512-ZxPEzV9IgvGn73iK0E6VB9/95Nd7aMFpbE0l8KQFDG70cOV9IxRP7Y2FUPmlK0v6ImlLqYX50iuZ3ZTVhOF2lA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/compat-data': 7.20.10
-      '@babel/core': 7.21.5
-      '@babel/helper-compilation-targets': 7.20.7(@babel/core@7.21.5)
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/helper-validator-option': 7.18.6
-      '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.18.6(@babel/core@7.21.5)
-      '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.20.7(@babel/core@7.21.5)
-      '@babel/plugin-proposal-async-generator-functions': 7.20.7(@babel/core@7.21.5)
-      '@babel/plugin-proposal-class-properties': 7.18.6(@babel/core@7.21.5)
-      '@babel/plugin-proposal-class-static-block': 7.20.7(@babel/core@7.21.5)
-      '@babel/plugin-proposal-dynamic-import': 7.18.6(@babel/core@7.21.5)
-      '@babel/plugin-proposal-export-namespace-from': 7.18.9(@babel/core@7.21.5)
-      '@babel/plugin-proposal-json-strings': 7.18.6(@babel/core@7.21.5)
-      '@babel/plugin-proposal-logical-assignment-operators': 7.20.7(@babel/core@7.21.5)
-      '@babel/plugin-proposal-nullish-coalescing-operator': 7.18.6(@babel/core@7.21.5)
-      '@babel/plugin-proposal-numeric-separator': 7.18.6(@babel/core@7.21.5)
-      '@babel/plugin-proposal-object-rest-spread': 7.20.7(@babel/core@7.21.5)
-      '@babel/plugin-proposal-optional-catch-binding': 7.18.6(@babel/core@7.21.5)
-      '@babel/plugin-proposal-optional-chaining': 7.20.7(@babel/core@7.21.5)
-      '@babel/plugin-proposal-private-methods': 7.18.6(@babel/core@7.21.5)
-      '@babel/plugin-proposal-private-property-in-object': 7.20.5(@babel/core@7.21.5)
-      '@babel/plugin-proposal-unicode-property-regex': 7.18.6(@babel/core@7.21.5)
-      '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.21.5)
-      '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.21.5)
-      '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.21.5)
-      '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.21.5)
-      '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.21.5)
-      '@babel/plugin-syntax-import-assertions': 7.20.0(@babel/core@7.21.5)
-      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.21.5)
-      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.21.5)
-      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.21.5)
-      '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.21.5)
-      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.21.5)
-      '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.21.5)
-      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.21.5)
-      '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.21.5)
-      '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.21.5)
-      '@babel/plugin-transform-arrow-functions': 7.20.7(@babel/core@7.21.5)
-      '@babel/plugin-transform-async-to-generator': 7.20.7(@babel/core@7.21.5)
-      '@babel/plugin-transform-block-scoped-functions': 7.18.6(@babel/core@7.21.5)
-      '@babel/plugin-transform-block-scoping': 7.20.11(@babel/core@7.21.5)
-      '@babel/plugin-transform-classes': 7.20.7(@babel/core@7.21.5)
-      '@babel/plugin-transform-computed-properties': 7.20.7(@babel/core@7.21.5)
-      '@babel/plugin-transform-destructuring': 7.20.7(@babel/core@7.21.5)
-      '@babel/plugin-transform-dotall-regex': 7.18.6(@babel/core@7.21.5)
-      '@babel/plugin-transform-duplicate-keys': 7.18.9(@babel/core@7.21.5)
-      '@babel/plugin-transform-exponentiation-operator': 7.18.6(@babel/core@7.21.5)
-      '@babel/plugin-transform-for-of': 7.18.8(@babel/core@7.21.5)
-      '@babel/plugin-transform-function-name': 7.18.9(@babel/core@7.21.5)
-      '@babel/plugin-transform-literals': 7.18.9(@babel/core@7.21.5)
-      '@babel/plugin-transform-member-expression-literals': 7.18.6(@babel/core@7.21.5)
-      '@babel/plugin-transform-modules-amd': 7.20.11(@babel/core@7.21.5)
-      '@babel/plugin-transform-modules-commonjs': 7.20.11(@babel/core@7.21.5)
-      '@babel/plugin-transform-modules-systemjs': 7.20.11(@babel/core@7.21.5)
-      '@babel/plugin-transform-modules-umd': 7.18.6(@babel/core@7.21.5)
-      '@babel/plugin-transform-named-capturing-groups-regex': 7.20.5(@babel/core@7.21.5)
-      '@babel/plugin-transform-new-target': 7.18.6(@babel/core@7.21.5)
-      '@babel/plugin-transform-object-super': 7.18.6(@babel/core@7.21.5)
-      '@babel/plugin-transform-parameters': 7.20.7(@babel/core@7.21.5)
-      '@babel/plugin-transform-property-literals': 7.18.6(@babel/core@7.21.5)
-      '@babel/plugin-transform-regenerator': 7.20.5(@babel/core@7.21.5)
-      '@babel/plugin-transform-reserved-words': 7.18.6(@babel/core@7.21.5)
-      '@babel/plugin-transform-shorthand-properties': 7.18.6(@babel/core@7.21.5)
-      '@babel/plugin-transform-spread': 7.20.7(@babel/core@7.21.5)
-      '@babel/plugin-transform-sticky-regex': 7.18.6(@babel/core@7.21.5)
-      '@babel/plugin-transform-template-literals': 7.18.9(@babel/core@7.21.5)
-      '@babel/plugin-transform-typeof-symbol': 7.18.9(@babel/core@7.21.5)
-      '@babel/plugin-transform-unicode-escapes': 7.18.10(@babel/core@7.21.5)
-      '@babel/plugin-transform-unicode-regex': 7.18.6(@babel/core@7.21.5)
-      '@babel/preset-modules': 0.1.5(@babel/core@7.21.5)
-      '@babel/types': 7.20.7
-      babel-plugin-polyfill-corejs2: 0.3.3(@babel/core@7.21.5)
-      babel-plugin-polyfill-corejs3: 0.6.0(@babel/core@7.21.5)
-      babel-plugin-polyfill-regenerator: 0.4.1(@babel/core@7.21.5)
-      core-js-compat: 3.27.1
-      semver: 6.3.0
+      '@babel/compat-data': 7.23.5
+      '@babel/core': 7.24.0
+      '@babel/helper-compilation-targets': 7.23.6
+      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/helper-validator-option': 7.23.5
+      '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.23.3(@babel/core@7.24.0)
+      '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.23.3(@babel/core@7.24.0)
+      '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly': 7.23.7(@babel/core@7.24.0)
+      '@babel/plugin-proposal-private-property-in-object': 7.21.0-placeholder-for-preset-env.2(@babel/core@7.24.0)
+      '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.24.0)
+      '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.24.0)
+      '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.24.0)
+      '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.24.0)
+      '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.24.0)
+      '@babel/plugin-syntax-import-assertions': 7.23.3(@babel/core@7.24.0)
+      '@babel/plugin-syntax-import-attributes': 7.23.3(@babel/core@7.24.0)
+      '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.24.0)
+      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.24.0)
+      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.24.0)
+      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.24.0)
+      '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.24.0)
+      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.24.0)
+      '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.24.0)
+      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.24.0)
+      '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.24.0)
+      '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.24.0)
+      '@babel/plugin-syntax-unicode-sets-regex': 7.18.6(@babel/core@7.24.0)
+      '@babel/plugin-transform-arrow-functions': 7.23.3(@babel/core@7.24.0)
+      '@babel/plugin-transform-async-generator-functions': 7.23.9(@babel/core@7.24.0)
+      '@babel/plugin-transform-async-to-generator': 7.23.3(@babel/core@7.24.0)
+      '@babel/plugin-transform-block-scoped-functions': 7.23.3(@babel/core@7.24.0)
+      '@babel/plugin-transform-block-scoping': 7.23.4(@babel/core@7.24.0)
+      '@babel/plugin-transform-class-properties': 7.23.3(@babel/core@7.24.0)
+      '@babel/plugin-transform-class-static-block': 7.23.4(@babel/core@7.24.0)
+      '@babel/plugin-transform-classes': 7.23.8(@babel/core@7.24.0)
+      '@babel/plugin-transform-computed-properties': 7.23.3(@babel/core@7.24.0)
+      '@babel/plugin-transform-destructuring': 7.23.3(@babel/core@7.24.0)
+      '@babel/plugin-transform-dotall-regex': 7.23.3(@babel/core@7.24.0)
+      '@babel/plugin-transform-duplicate-keys': 7.23.3(@babel/core@7.24.0)
+      '@babel/plugin-transform-dynamic-import': 7.23.4(@babel/core@7.24.0)
+      '@babel/plugin-transform-exponentiation-operator': 7.23.3(@babel/core@7.24.0)
+      '@babel/plugin-transform-export-namespace-from': 7.23.4(@babel/core@7.24.0)
+      '@babel/plugin-transform-for-of': 7.23.6(@babel/core@7.24.0)
+      '@babel/plugin-transform-function-name': 7.23.3(@babel/core@7.24.0)
+      '@babel/plugin-transform-json-strings': 7.23.4(@babel/core@7.24.0)
+      '@babel/plugin-transform-literals': 7.23.3(@babel/core@7.24.0)
+      '@babel/plugin-transform-logical-assignment-operators': 7.23.4(@babel/core@7.24.0)
+      '@babel/plugin-transform-member-expression-literals': 7.23.3(@babel/core@7.24.0)
+      '@babel/plugin-transform-modules-amd': 7.23.3(@babel/core@7.24.0)
+      '@babel/plugin-transform-modules-commonjs': 7.23.3(@babel/core@7.24.0)
+      '@babel/plugin-transform-modules-systemjs': 7.23.9(@babel/core@7.24.0)
+      '@babel/plugin-transform-modules-umd': 7.23.3(@babel/core@7.24.0)
+      '@babel/plugin-transform-named-capturing-groups-regex': 7.22.5(@babel/core@7.24.0)
+      '@babel/plugin-transform-new-target': 7.23.3(@babel/core@7.24.0)
+      '@babel/plugin-transform-nullish-coalescing-operator': 7.23.4(@babel/core@7.24.0)
+      '@babel/plugin-transform-numeric-separator': 7.23.4(@babel/core@7.24.0)
+      '@babel/plugin-transform-object-rest-spread': 7.24.0(@babel/core@7.24.0)
+      '@babel/plugin-transform-object-super': 7.23.3(@babel/core@7.24.0)
+      '@babel/plugin-transform-optional-catch-binding': 7.23.4(@babel/core@7.24.0)
+      '@babel/plugin-transform-optional-chaining': 7.23.4(@babel/core@7.24.0)
+      '@babel/plugin-transform-parameters': 7.23.3(@babel/core@7.24.0)
+      '@babel/plugin-transform-private-methods': 7.23.3(@babel/core@7.24.0)
+      '@babel/plugin-transform-private-property-in-object': 7.23.4(@babel/core@7.24.0)
+      '@babel/plugin-transform-property-literals': 7.23.3(@babel/core@7.24.0)
+      '@babel/plugin-transform-regenerator': 7.23.3(@babel/core@7.24.0)
+      '@babel/plugin-transform-reserved-words': 7.23.3(@babel/core@7.24.0)
+      '@babel/plugin-transform-shorthand-properties': 7.23.3(@babel/core@7.24.0)
+      '@babel/plugin-transform-spread': 7.23.3(@babel/core@7.24.0)
+      '@babel/plugin-transform-sticky-regex': 7.23.3(@babel/core@7.24.0)
+      '@babel/plugin-transform-template-literals': 7.23.3(@babel/core@7.24.0)
+      '@babel/plugin-transform-typeof-symbol': 7.23.3(@babel/core@7.24.0)
+      '@babel/plugin-transform-unicode-escapes': 7.23.3(@babel/core@7.24.0)
+      '@babel/plugin-transform-unicode-property-regex': 7.23.3(@babel/core@7.24.0)
+      '@babel/plugin-transform-unicode-regex': 7.23.3(@babel/core@7.24.0)
+      '@babel/plugin-transform-unicode-sets-regex': 7.23.3(@babel/core@7.24.0)
+      '@babel/preset-modules': 0.1.6-no-external-plugins(@babel/core@7.24.0)
+      babel-plugin-polyfill-corejs2: 0.4.10(@babel/core@7.24.0)
+      babel-plugin-polyfill-corejs3: 0.9.0(@babel/core@7.24.0)
+      babel-plugin-polyfill-regenerator: 0.5.5(@babel/core@7.24.0)
+      core-js-compat: 3.36.0
+      semver: 7.6.0
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@babel/preset-flow@7.18.6(@babel/core@7.21.5):
-    resolution: {integrity: sha512-E7BDhL64W6OUqpuyHnSroLnqyRTcG6ZdOBl1OKI/QK/HJfplqK/S3sq1Cckx7oTodJ5yOXyfw7rEADJ6UjoQDQ==}
+  /@babel/preset-flow@7.24.0(@babel/core@7.24.0):
+    resolution: {integrity: sha512-cum/nSi82cDaSJ21I4PgLTVlj0OXovFk6GRguJYe/IKg6y6JHLTbJhybtX4k35WT9wdeJfEVjycTixMhBHd0Dg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/helper-validator-option': 7.18.6
-      '@babel/plugin-transform-flow-strip-types': 7.19.0(@babel/core@7.21.5)
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/helper-validator-option': 7.23.5
+      '@babel/plugin-transform-flow-strip-types': 7.23.3(@babel/core@7.24.0)
     dev: true
 
-  /@babel/preset-modules@0.1.5(@babel/core@7.20.12):
-    resolution: {integrity: sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==}
+  /@babel/preset-modules@0.1.6-no-external-plugins(@babel/core@7.24.0):
+    resolution: {integrity: sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==}
     peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/plugin-proposal-unicode-property-regex': 7.18.6(@babel/core@7.20.12)
-      '@babel/plugin-transform-dotall-regex': 7.18.6(@babel/core@7.20.12)
-      '@babel/types': 7.21.5
-      esutils: 2.0.3
-    dev: true
-
-  /@babel/preset-modules@0.1.5(@babel/core@7.21.5):
-    resolution: {integrity: sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
+      '@babel/core': ^7.0.0-0 || ^8.0.0-0 <8.0.0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/plugin-proposal-unicode-property-regex': 7.18.6(@babel/core@7.21.5)
-      '@babel/plugin-transform-dotall-regex': 7.18.6(@babel/core@7.21.5)
-      '@babel/types': 7.21.5
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/types': 7.24.0
       esutils: 2.0.3
     dev: true
 
-  /@babel/preset-typescript@7.18.6(@babel/core@7.21.5):
-    resolution: {integrity: sha512-s9ik86kXBAnD760aybBucdpnLsAt0jK1xqJn2juOn9lkOvSHV60os5hxoVJsPzMQxvnUJFAlkont2DvvaYEBtQ==}
+  /@babel/preset-typescript@7.23.3(@babel/core@7.24.0):
+    resolution: {integrity: sha512-17oIGVlqz6CchO9RFYn5U6ZpWRZIngayYCtrPRSgANSwC2V1Jb+iP74nVxzzXJte8b8BYxrL1yY96xfhTBrNNQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/helper-validator-option': 7.18.6
-      '@babel/plugin-transform-typescript': 7.20.7(@babel/core@7.21.5)
-    transitivePeerDependencies:
-      - supports-color
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/helper-validator-option': 7.23.5
+      '@babel/plugin-syntax-jsx': 7.23.3(@babel/core@7.24.0)
+      '@babel/plugin-transform-modules-commonjs': 7.23.3(@babel/core@7.24.0)
+      '@babel/plugin-transform-typescript': 7.23.6(@babel/core@7.24.0)
     dev: true
 
-  /@babel/register@7.18.9(@babel/core@7.21.5):
-    resolution: {integrity: sha512-ZlbnXDcNYHMR25ITwwNKT88JiaukkdVj/nG7r3wnuXkOTHc60Uy05PwMCPre0hSkY68E6zK3xz+vUJSP2jWmcw==}
+  /@babel/register@7.23.7(@babel/core@7.24.0):
+    resolution: {integrity: sha512-EjJeB6+kvpk+Y5DAkEAmbOBEFkh9OASx0huoEkqYTFxAZHzOAX2Oh5uwAUuL2rUddqfM0SA+KPXV2TbzoZ2kvQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.5
+      '@babel/core': 7.24.0
       clone-deep: 4.0.1
       find-cache-dir: 2.1.0
       make-dir: 2.1.0
-      pirates: 4.0.5
+      pirates: 4.0.6
       source-map-support: 0.5.21
     dev: true
 
-  /@babel/runtime-corejs3@7.20.7:
-    resolution: {integrity: sha512-jr9lCZ4RbRQmCR28Q8U8Fu49zvFqLxTY9AMOUz+iyMohMoAgpEcVxY+wJNay99oXOpOcCTODkk70NDN2aaJEeg==}
+  /@babel/regjsgen@0.8.0:
+    resolution: {integrity: sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==}
+    dev: true
+
+  /@babel/runtime@7.22.6:
+    resolution: {integrity: sha512-wDb5pWm4WDdF6LFUde3Jl8WzPA+3ZbxYqkC6xAXuD3irdEHN1k0NfTRrJD8ZD378SJ61miMLCqIOXYhd8x+AJQ==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      core-js-pure: 3.27.1
       regenerator-runtime: 0.13.11
     dev: true
 
-  /@babel/runtime@7.19.4:
-    resolution: {integrity: sha512-EXpLCrk55f+cYqmHsSR+yD/0gAIMxxA9QK9lnQWzhMCvt+YmoBN7Zx94s++Kv0+unHk39vxNO8t+CMA2WSS3wA==}
+  /@babel/runtime@7.23.6:
+    resolution: {integrity: sha512-zHd0eUrf5GZoOWVCXp6koAKQTfZV07eit6bGPmJgnZdnSAvvZee6zniW2XMF7Cmc4ISOOnPy3QaSiIJGJkVEDQ==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      regenerator-runtime: 0.13.9
+      regenerator-runtime: 0.14.1
 
-  /@babel/runtime@7.20.7:
-    resolution: {integrity: sha512-UF0tvkUtxwAgZ5W/KrkHf0Rn0fdnLDU9ScxBrEVNUprE/MzirjK4MJUX1/BVDv00Sv8cljtukVK1aky++X1SjQ==}
+  /@babel/standalone@7.23.6:
+    resolution: {integrity: sha512-+AzS6BZwZdSosrgS/TiGDYLxtlefARKClWgJ4ql//XfmV9KbPWbkEekvbvDRJ8a6qog8E9j3CziHLz5dbIEMyw==}
     engines: {node: '>=6.9.0'}
-    dependencies:
-      regenerator-runtime: 0.13.11
+    dev: true
 
-  /@babel/standalone@7.20.12:
-    resolution: {integrity: sha512-hK/X+m1il3w1tYS4H8LDaGCEdiT47SVqEXY8RiEAgou26BystipSU8ZL6EvBR6t5l7lTv0ilBiChXWblKJ5iUA==}
+  /@babel/template@7.22.5:
+    resolution: {integrity: sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==}
     engines: {node: '>=6.9.0'}
-    dev: true
+    dependencies:
+      '@babel/code-frame': 7.22.5
+      '@babel/parser': 7.24.0
+      '@babel/types': 7.24.0
 
-  /@babel/template@7.20.7:
-    resolution: {integrity: sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==}
+  /@babel/template@7.24.0:
+    resolution: {integrity: sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/code-frame': 7.21.4
-      '@babel/parser': 7.21.5
-      '@babel/types': 7.21.5
+      '@babel/code-frame': 7.23.5
+      '@babel/parser': 7.24.0
+      '@babel/types': 7.24.0
     dev: true
 
-  /@babel/traverse@7.20.12:
-    resolution: {integrity: sha512-MsIbFN0u+raeja38qboyF8TIT7K0BFzz/Yd/77ta4MsUsmP2RAnidIlwq7d5HFQrH/OZJecGV6B71C4zAgpoSQ==}
+  /@babel/traverse@7.22.8:
+    resolution: {integrity: sha512-y6LPR+wpM2I3qJrsheCTwhIinzkETbplIgPBbwvqPKc+uljeA5gP+3nP8irdYt1mjQaDnlIcG+dw8OjAco4GXw==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/code-frame': 7.18.6
-      '@babel/generator': 7.20.7
-      '@babel/helper-environment-visitor': 7.18.9
-      '@babel/helper-function-name': 7.19.0
-      '@babel/helper-hoist-variables': 7.18.6
-      '@babel/helper-split-export-declaration': 7.18.6
-      '@babel/parser': 7.20.7
-      '@babel/types': 7.20.7
+      '@babel/code-frame': 7.23.5
+      '@babel/generator': 7.22.9
+      '@babel/helper-environment-visitor': 7.22.5
+      '@babel/helper-function-name': 7.22.5
+      '@babel/helper-hoist-variables': 7.22.5
+      '@babel/helper-split-export-declaration': 7.22.6
+      '@babel/parser': 7.24.0
+      '@babel/types': 7.24.0
       debug: 4.3.4(supports-color@8.1.1)
       globals: 11.12.0
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /@babel/traverse@7.21.5:
-    resolution: {integrity: sha512-AhQoI3YjWi6u/y/ntv7k48mcrCXmus0t79J9qPNlk/lAsFlCiJ047RmbfMOawySTHtywXhbXgpx/8nXMYd+oFw==}
+  /@babel/traverse@7.24.0:
+    resolution: {integrity: sha512-HfuJlI8qq3dEDmNU5ChzzpZRWq+oxCZQyMzIMEqLho+AQnhMnKQUzH6ydo3RBl/YjPCuk68Y6s0Gx0AeyULiWw==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/code-frame': 7.21.4
-      '@babel/generator': 7.21.5
-      '@babel/helper-environment-visitor': 7.21.5
-      '@babel/helper-function-name': 7.21.0
-      '@babel/helper-hoist-variables': 7.18.6
-      '@babel/helper-split-export-declaration': 7.18.6
-      '@babel/parser': 7.21.5
-      '@babel/types': 7.21.5
+      '@babel/code-frame': 7.23.5
+      '@babel/generator': 7.23.6
+      '@babel/helper-environment-visitor': 7.22.20
+      '@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.24.0
+      '@babel/types': 7.24.0
       debug: 4.3.4(supports-color@8.1.1)
       globals: 11.12.0
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@babel/types@7.20.7:
-    resolution: {integrity: sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg==}
+  /@babel/types@7.23.6:
+    resolution: {integrity: sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/helper-string-parser': 7.19.4
-      '@babel/helper-validator-identifier': 7.19.1
+      '@babel/helper-string-parser': 7.23.4
+      '@babel/helper-validator-identifier': 7.22.20
       to-fast-properties: 2.0.0
+    dev: true
 
-  /@babel/types@7.21.5:
-    resolution: {integrity: sha512-m4AfNvVF2mVC/F7fDEdH2El3HzUg9It/XsCxZiOTTA3m3qYfcSVSbTfM6Q9xG+hYDniZssYhlXKKUMD5m8tF4Q==}
+  /@babel/types@7.24.0:
+    resolution: {integrity: sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/helper-string-parser': 7.21.5
-      '@babel/helper-validator-identifier': 7.19.1
+      '@babel/helper-string-parser': 7.23.4
+      '@babel/helper-validator-identifier': 7.22.20
       to-fast-properties: 2.0.0
-    dev: true
 
   /@bcoe/v8-coverage@0.2.3:
     resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==}
+
+  /@chromatic-com/storybook@1.2.18(react@18.2.0):
+    resolution: {integrity: sha512-Fi3T4gO1zIRr77mz6tqRZRusFneA6MtJxQT38Csizez2ZViOmTUd81sHVC4MDHvhnwDaksqnDKvNUYcl1m3nIA==}
+    engines: {node: '>=16.0.0', yarn: '>=1.22.18'}
+    dependencies:
+      chromatic: 11.0.8
+      filesize: 10.1.0
+      jsonfile: 6.1.0
+      react-confetti: 6.1.0(react@18.2.0)
+      strip-ansi: 7.1.0
+    transitivePeerDependencies:
+      - '@chromatic-com/cypress'
+      - '@chromatic-com/playwright'
+      - react
     dev: true
 
-  /@codemirror/autocomplete@6.4.0(@codemirror/language@6.2.1)(@codemirror/state@6.1.4)(@codemirror/view@6.5.1)(@lezer/common@1.0.1):
-    resolution: {integrity: sha512-HLF2PnZAm1s4kGs30EiqKMgD7XsYaQ0XJnMR0rofEWQ5t5D60SfqpDIkIh1ze5tiEbyUWm8+VJ6W1/erVvBMIA==}
+  /@codemirror/autocomplete@6.11.1(@codemirror/language@6.9.3)(@codemirror/state@6.3.3)(@codemirror/view@6.22.3)(@lezer/common@1.1.0):
+    resolution: {integrity: sha512-L5UInv8Ffd6BPw0P3EF7JLYAMeEbclY7+6Q11REt8vhih8RuLreKtPy/xk8wPxs4EQgYqzI7cdgpiYwWlbS/ow==}
     peerDependencies:
       '@codemirror/language': ^6.0.0
       '@codemirror/state': ^6.0.0
       '@codemirror/view': ^6.0.0
       '@lezer/common': ^1.0.0
     dependencies:
-      '@codemirror/language': 6.2.1
-      '@codemirror/state': 6.1.4
-      '@codemirror/view': 6.5.1
-      '@lezer/common': 1.0.1
+      '@codemirror/language': 6.9.3
+      '@codemirror/state': 6.3.3
+      '@codemirror/view': 6.22.3
+      '@lezer/common': 1.1.0
     dev: false
 
-  /@codemirror/commands@6.1.2:
-    resolution: {integrity: sha512-sO3jdX1s0pam6lIdeSJLMN3DQ6mPEbM4yLvyKkdqtmd/UDwhXA5+AwFJ89rRXm6vTeOXBsE5cAmlos/t7MJdgg==}
+  /@codemirror/commands@6.3.2:
+    resolution: {integrity: sha512-tjoi4MCWDNxgIpoLZ7+tezdS9OEB6pkiDKhfKx9ReJ/XBcs2G2RXIu+/FxXBlWsPTsz6C9q/r4gjzrsxpcnqCQ==}
     dependencies:
-      '@codemirror/language': 6.2.1
-      '@codemirror/state': 6.1.4
-      '@codemirror/view': 6.5.1
-      '@lezer/common': 1.0.1
+      '@codemirror/language': 6.9.3
+      '@codemirror/state': 6.3.3
+      '@codemirror/view': 6.22.3
+      '@lezer/common': 1.1.0
     dev: false
 
-  /@codemirror/lang-css@6.0.1(@codemirror/view@6.5.1)(@lezer/common@1.0.1):
+  /@codemirror/lang-css@6.0.1(@codemirror/view@6.22.3)(@lezer/common@1.1.0):
     resolution: {integrity: sha512-rlLq1Dt0WJl+2epLQeAsfqIsx3lGu4HStHCJu95nGGuz2P2fNugbU3dQYafr2VRjM4eMC9HviI6jvS98CNtG5w==}
     dependencies:
-      '@codemirror/autocomplete': 6.4.0(@codemirror/language@6.2.1)(@codemirror/state@6.1.4)(@codemirror/view@6.5.1)(@lezer/common@1.0.1)
-      '@codemirror/language': 6.2.1
-      '@codemirror/state': 6.1.4
+      '@codemirror/autocomplete': 6.11.1(@codemirror/language@6.9.3)(@codemirror/state@6.3.3)(@codemirror/view@6.22.3)(@lezer/common@1.1.0)
+      '@codemirror/language': 6.9.3
+      '@codemirror/state': 6.3.3
       '@lezer/css': 1.1.1
     transitivePeerDependencies:
       - '@codemirror/view'
       - '@lezer/common'
     dev: false
 
-  /@codemirror/lang-javascript@6.1.2:
-    resolution: {integrity: sha512-OcwLfZXdQ1OHrLiIcKCn7MqZ7nx205CMKlhe+vL88pe2ymhT9+2P+QhwkYGxMICj8TDHyp8HFKVwpiisUT7iEQ==}
+  /@codemirror/lang-javascript@6.2.1:
+    resolution: {integrity: sha512-jlFOXTejVyiQCW3EQwvKH0m99bUYIw40oPmFjSX2VS78yzfe0HELZ+NEo9Yfo1MkGRpGlj3Gnu4rdxV1EnAs5A==}
     dependencies:
-      '@codemirror/autocomplete': 6.4.0(@codemirror/language@6.2.1)(@codemirror/state@6.1.4)(@codemirror/view@6.5.1)(@lezer/common@1.0.1)
-      '@codemirror/language': 6.2.1
-      '@codemirror/lint': 6.0.0
-      '@codemirror/state': 6.1.4
-      '@codemirror/view': 6.5.1
-      '@lezer/common': 1.0.1
+      '@codemirror/autocomplete': 6.11.1(@codemirror/language@6.9.3)(@codemirror/state@6.3.3)(@codemirror/view@6.22.3)(@lezer/common@1.1.0)
+      '@codemirror/language': 6.9.3
+      '@codemirror/lint': 6.4.2
+      '@codemirror/state': 6.3.3
+      '@codemirror/view': 6.22.3
+      '@lezer/common': 1.1.0
       '@lezer/javascript': 1.0.2
     dev: false
 
-  /@codemirror/language@6.2.1:
-    resolution: {integrity: sha512-MC3svxuvIj0MRpFlGHxLS6vPyIdbTr2KKPEW46kCoCXw2ktb4NTkpkPBI/lSP/FoNXLCBJ0mrnUi1OoZxtpW1Q==}
+  /@codemirror/lang-json@6.0.1:
+    resolution: {integrity: sha512-+T1flHdgpqDDlJZ2Lkil/rLiRy684WMLc74xUnjJH48GQdfJo/pudlTRreZmKwzP8/tGdKf83wlbAdOCzlJOGQ==}
+    dependencies:
+      '@codemirror/language': 6.9.3
+      '@lezer/json': 1.0.0
+    dev: false
+
+  /@codemirror/lang-python@6.1.3(@codemirror/state@6.3.3)(@codemirror/view@6.22.3)(@lezer/common@1.1.0):
+    resolution: {integrity: sha512-S9w2Jl74hFlD5nqtUMIaXAq9t5WlM0acCkyuQWUUSvZclk1sV+UfnpFiZzuZSG+hfEaOmxKR5UxY/Uxswn7EhQ==}
+    dependencies:
+      '@codemirror/autocomplete': 6.11.1(@codemirror/language@6.9.3)(@codemirror/state@6.3.3)(@codemirror/view@6.22.3)(@lezer/common@1.1.0)
+      '@codemirror/language': 6.9.3
+      '@lezer/python': 1.1.5
+    transitivePeerDependencies:
+      - '@codemirror/state'
+      - '@codemirror/view'
+      - '@lezer/common'
+    dev: false
+
+  /@codemirror/language@6.9.3:
+    resolution: {integrity: sha512-qq48pYzoi6ldYWV/52+Z9Ou6QouVI+8YwvxFbUypI33NbjG2UeRHKENRyhwljTTiOqjQ33FjyZj6EREQ9apAOQ==}
     dependencies:
-      '@codemirror/state': 6.1.4
-      '@codemirror/view': 6.5.1
-      '@lezer/common': 1.0.1
+      '@codemirror/state': 6.3.3
+      '@codemirror/view': 6.22.3
+      '@lezer/common': 1.1.0
       '@lezer/highlight': 1.1.1
       '@lezer/lr': 1.2.3
       style-mod: 4.0.0
     dev: false
 
-  /@codemirror/lint@6.0.0:
-    resolution: {integrity: sha512-nUUXcJW1Xp54kNs+a1ToPLK8MadO0rMTnJB8Zk4Z8gBdrN0kqV7uvUraU/T2yqg+grDNR38Vmy/MrhQN/RgwiA==}
+  /@codemirror/lint@6.4.2:
+    resolution: {integrity: sha512-wzRkluWb1ptPKdzlsrbwwjYCPLgzU6N88YBAmlZi8WFyuiEduSd05MnJYNogzyc8rPK7pj6m95ptUApc8sHKVA==}
     dependencies:
-      '@codemirror/state': 6.1.4
-      '@codemirror/view': 6.5.1
+      '@codemirror/state': 6.3.3
+      '@codemirror/view': 6.22.3
       crelt: 1.0.5
     dev: false
 
-  /@codemirror/state@6.1.4:
-    resolution: {integrity: sha512-g+3OJuRylV5qsXuuhrc6Cvs1NQluNioepYMM2fhnpYkNk7NgX+j0AFuevKSVKzTDmDyt9+Puju+zPdHNECzCNQ==}
+  /@codemirror/state@6.3.3:
+    resolution: {integrity: sha512-0wufKcTw2dEwEaADajjHf6hBy1sh3M6V0e+q4JKIhLuiMSe5td5HOWpUdvKth1fT1M9VYOboajoBHpkCd7PG7A==}
     dev: false
 
-  /@codemirror/view@6.5.1:
-    resolution: {integrity: sha512-xBKP8N3AXOs06VcKvIuvIQoUlGs7Hb78ftJWahLaRX909jKPMgGxR5XjvrawzTTZMSTU3DzdjDNPwG6fPM/ypQ==}
+  /@codemirror/view@6.22.3:
+    resolution: {integrity: sha512-rqnq+Zospwoi3x1vZ8BGV1MlRsaGljX+6qiGYmIpJ++M+LCC+wjfDaPklhwpWSgv7pr/qx29KiAKQBH5+DOn4w==}
     dependencies:
-      '@codemirror/state': 6.1.4
-      style-mod: 4.0.0
+      '@codemirror/state': 6.3.3
+      style-mod: 4.1.0
       w3c-keyname: 2.2.6
     dev: false
 
@@ -4533,11 +4788,15 @@ packages:
     resolution: {integrity: sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==}
     engines: {node: '>=0.1.90'}
 
-  /@cspotcode/source-map-support@0.8.1:
-    resolution: {integrity: sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==}
-    engines: {node: '>=12'}
-    dependencies:
-      '@jridgewell/trace-mapping': 0.3.9
+  /@common.js/is-network-error@1.0.1:
+    resolution: {integrity: sha512-dkk7FX8L/JLia5pi+IQ11lCw2D6FTmbWL2iWTHgCbP40/deeXgknlkEQcQ/rOkjwQbqp8RZ4ey/anR17K66sqw==}
+    engines: {node: '>=16'}
+    dev: false
+
+  /@ctrl/tinycolor@3.6.0:
+    resolution: {integrity: sha512-/Z3l6pXthq0JvMYdUFyX9j0MaCltlIn6mfh9jLyQwg5aPKxkyNa0PTHtU1AlFXLNk55ZuAeJRcpvq+tmLfKmaQ==}
+    engines: {node: '>=10'}
+    dev: false
 
   /@curlconverter/yargs-parser@0.0.1:
     resolution: {integrity: sha512-DbEVRYqrorzwqc63MQ3RODflut1tNla8ZCKo1h83lF7+fbntgubZsDfRDBv5Lxj3vkKuvAolysNM2ekwJev8wA==}
@@ -4557,8 +4816,8 @@ packages:
       y18n: 5.0.8
     dev: false
 
-  /@cypress/request@2.88.10:
-    resolution: {integrity: sha512-Zp7F+R93N0yZyG34GutyTNr+okam7s/Fzc1+i3kcqOP8vk6OuajuE9qZJ6Rs+10/1JFtXFYMdyarnU1rZuJesg==}
+  /@cypress/request@3.0.1:
+    resolution: {integrity: sha512-TWivJlJi8ZDx2wGOw1dbLuHJKUYX7bWySw377nlnGOW3hP9/MUKIsEdXT/YngWxVdgNCHRBmFlBipE+5/2ZZlQ==}
     engines: {node: '>= 6'}
     dependencies:
       aws-sign2: 0.7.0
@@ -4574,9 +4833,9 @@ packages:
       json-stringify-safe: 5.0.1
       mime-types: 2.1.35
       performance-now: 2.1.0
-      qs: 6.5.3
+      qs: 6.10.4
       safe-buffer: 5.2.1
-      tough-cookie: 2.5.0
+      tough-cookie: 4.1.3
       tunnel-agent: 0.6.0
       uuid: 8.3.2
     dev: true
@@ -4598,17 +4857,18 @@ packages:
       kuler: 2.0.0
     dev: false
 
-  /@deep-consulting-solutions/incident-handling@0.0.25(mysql2@2.3.3)(sqlite3@5.1.6):
-    resolution: {integrity: sha512-0Ie4QRay4wJjVKlmUoBqBuqyeRdEBfUD84dhcjuFzcyB2QD1tQ7EF2VeMECURWmPlSGcIAjYYkjqDDe8xlmhTQ==, tarball: https://npm.pkg.github.com/download/@Deep-Consulting-Solutions/incident-handling/0.0.25/cd65a0c0ceaae5862b1e5a1c93b9c205491a1043}
+  /@deep-consulting-solutions/incident-handling@0.0.37:
+    resolution: {integrity: sha512-9WTwt8k+tWTcf5QmY+IrOyJn0DEjgOxqW60ZpbwhZr/XOLOyfGkKL6z4Dqd21vU5QEUeWlTEbuqZgurMpnK45Q==, tarball: https://npm.pkg.github.com/download/@Deep-Consulting-Solutions/incident-handling/0.0.37/658e6504b6fd7871684b78818444a0e5f7c9005e}
     dependencies:
-      '@deep-consulting-solutions/zoho-utils': 1.6.47
+      '@deep-consulting-solutions/zoho-utils': 1.6.61
+      axios: 1.6.7
       dotenv: 8.6.0
-      express: 4.18.2
-      express-async-errors: 3.1.1(express@4.18.2)
+      express: 4.19.2
+      express-async-errors: 3.1.1(express@4.19.2)
       ioredis: 4.28.5
       moment: 2.29.4
-      pg: 8.8.0
-      typeorm: 0.2.45(ioredis@4.28.5)(mysql2@2.3.3)(pg@8.8.0)(sqlite3@5.1.6)
+      pg: 8.11.3
+      typeorm: 0.2.45(ioredis@4.28.5)(pg@8.11.3)
       winston: 3.8.2
       winston-console-format: 1.0.8
       yup: 0.32.11
@@ -4630,17 +4890,17 @@ packages:
       - typeorm-aurora-data-api-driver
     dev: false
 
-  /@deep-consulting-solutions/zoho-utils@1.6.47:
-    resolution: {integrity: sha512-IzY0vgEhJvqOLrRMja11L3J1vxmQkUp0Og5loWzr0T1gHquGL13gXJSznk/3kfVLpFPAgjpCBYi1TA2dQ+ETzg==, tarball: https://npm.pkg.github.com/download/@Deep-Consulting-Solutions/zoho-utils/1.6.47/a6ff110adcf1cfa295c104a0246f7ba3788ac403}
+  /@deep-consulting-solutions/zoho-utils@1.6.61:
+    resolution: {integrity: sha512-n1mMBLAUxAbxLkVRx+k4DjglSFP7eBJZT9LBKHRM8bQXWAjZh6NB4VftkY1jGlXHCwBHCZJH0Gs/zkAcBdUdig==, tarball: https://npm.pkg.github.com/download/@Deep-Consulting-Solutions/zoho-utils/1.6.61/b8b4871965bfa053068d94e183f493ee86ac4ea9}
     hasBin: true
     dependencies:
-      aws-sdk: 2.1231.0
-      axios: 0.21.4(debug@4.3.2)
+      aws-sdk: 2.1617.0
+      axios: 1.6.7
       commander: 6.2.1
       cors: 2.8.5
       dotenv: 8.6.0
-      express: 4.18.2
-      express-async-errors: 3.1.1(express@4.18.2)
+      express: 4.19.2
+      express-async-errors: 3.1.1(express@4.19.2)
       form-data: 4.0.0
       ioredis: 4.28.5
       libphonenumber-js: 1.10.14
@@ -4661,212 +4921,234 @@ packages:
     engines: {node: '>=10.0.0'}
     dev: true
 
-  /@emotion/use-insertion-effect-with-fallbacks@1.0.0(react@17.0.2):
-    resolution: {integrity: sha512-1eEgUGmkaljiBnRMTdksDV1W4kUnmwgp7X9G8B++9GYwl1lUdqSndSriIrTJ0N7LQaoauY9JJ2yhiOYK5+NI4A==}
+  /@element-plus/icons-vue@2.1.0(vue@3.4.21):
+    resolution: {integrity: sha512-PSBn3elNoanENc1vnCfh+3WA9fimRC7n+fWkf3rE5jvv+aBohNHABC/KAR5KWPecxWxDTVT1ERpRbOMRcOV/vA==}
     peerDependencies:
-      react: '>=16.8.0'
+      vue: ^3.2.0
     dependencies:
-      react: 17.0.2
-    dev: true
+      vue: 3.4.21(typescript@5.4.2)
+    dev: false
+
+  /@emotion/is-prop-valid@1.2.1:
+    resolution: {integrity: sha512-61Mf7Ufx4aDxx1xlDeOm8aFFigGHE4z+0sKCa+IHCeZKiyP9RLD0Mmx7m8b9/Cf37f7NAvQOOJAbQQGVr5uERw==}
+    dependencies:
+      '@emotion/memoize': 0.8.1
+    dev: true
+
+  /@emotion/memoize@0.8.1:
+    resolution: {integrity: sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA==}
+    dev: true
+
+  /@emotion/unitless@0.8.0:
+    resolution: {integrity: sha512-VINS5vEYAscRl2ZUDiT3uMPlrFQupiKgHz5AA4bCH1miKBg4qtwkim1qPmJj/4WG6TreYMY111rEFsjupcOKHw==}
+    dev: true
 
-  /@esbuild/android-arm64@0.16.17:
-    resolution: {integrity: sha512-MIGl6p5sc3RDTLLkYL1MyL8BMRN4tLMRCn+yRJJmEDvYZ2M7tmAf80hx1kbNEUX2KJ50RRtxZ4JHLvCfuB6kBg==}
+  /@emotion/use-insertion-effect-with-fallbacks@1.0.1(react@18.2.0):
+    resolution: {integrity: sha512-jT/qyKZ9rzLErtrjGgdkMBn2OP8wl0G3sQlBb3YPryvKHsjvINUhVaPFfP+fpBcOkmrVOVEEHQFJ7nbj2TH2gw==}
+    peerDependencies:
+      react: '>=16.8.0'
+    dependencies:
+      react: 18.2.0
+    dev: true
+
+  /@esbuild/android-arm64@0.19.8:
+    resolution: {integrity: sha512-B8JbS61bEunhfx8kasogFENgQfr/dIp+ggYXwTqdbMAgGDhRa3AaPpQMuQU0rNxDLECj6FhDzk1cF9WHMVwrtA==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [android]
     dev: true
     optional: true
 
-  /@esbuild/android-arm@0.16.17:
-    resolution: {integrity: sha512-N9x1CMXVhtWEAMS7pNNONyA14f71VPQN9Cnavj1XQh6T7bskqiLLrSca4O0Vr8Wdcga943eThxnVp3JLnBMYtw==}
+  /@esbuild/android-arm@0.19.8:
+    resolution: {integrity: sha512-31E2lxlGM1KEfivQl8Yf5aYU/mflz9g06H6S15ITUFQueMFtFjESRMoDSkvMo8thYvLBax+VKTPlpnx+sPicOA==}
     engines: {node: '>=12'}
     cpu: [arm]
     os: [android]
     dev: true
     optional: true
 
-  /@esbuild/android-x64@0.16.17:
-    resolution: {integrity: sha512-a3kTv3m0Ghh4z1DaFEuEDfz3OLONKuFvI4Xqczqx4BqLyuFaFkuaG4j2MtA6fuWEFeC5x9IvqnX7drmRq/fyAQ==}
+  /@esbuild/android-x64@0.19.8:
+    resolution: {integrity: sha512-rdqqYfRIn4jWOp+lzQttYMa2Xar3OK9Yt2fhOhzFXqg0rVWEfSclJvZq5fZslnz6ypHvVf3CT7qyf0A5pM682A==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [android]
     dev: true
     optional: true
 
-  /@esbuild/darwin-arm64@0.16.17:
-    resolution: {integrity: sha512-/2agbUEfmxWHi9ARTX6OQ/KgXnOWfsNlTeLcoV7HSuSTv63E4DqtAc+2XqGw1KHxKMHGZgbVCZge7HXWX9Vn+w==}
+  /@esbuild/darwin-arm64@0.19.8:
+    resolution: {integrity: sha512-RQw9DemMbIq35Bprbboyf8SmOr4UXsRVxJ97LgB55VKKeJOOdvsIPy0nFyF2l8U+h4PtBx/1kRf0BelOYCiQcw==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [darwin]
     dev: true
     optional: true
 
-  /@esbuild/darwin-x64@0.16.17:
-    resolution: {integrity: sha512-2By45OBHulkd9Svy5IOCZt376Aa2oOkiE9QWUK9fe6Tb+WDr8hXL3dpqi+DeLiMed8tVXspzsTAvd0jUl96wmg==}
+  /@esbuild/darwin-x64@0.19.8:
+    resolution: {integrity: sha512-3sur80OT9YdeZwIVgERAysAbwncom7b4bCI2XKLjMfPymTud7e/oY4y+ci1XVp5TfQp/bppn7xLw1n/oSQY3/Q==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [darwin]
     dev: true
     optional: true
 
-  /@esbuild/freebsd-arm64@0.16.17:
-    resolution: {integrity: sha512-mt+cxZe1tVx489VTb4mBAOo2aKSnJ33L9fr25JXpqQqzbUIw/yzIzi+NHwAXK2qYV1lEFp4OoVeThGjUbmWmdw==}
+  /@esbuild/freebsd-arm64@0.19.8:
+    resolution: {integrity: sha512-WAnPJSDattvS/XtPCTj1tPoTxERjcTpH6HsMr6ujTT+X6rylVe8ggxk8pVxzf5U1wh5sPODpawNicF5ta/9Tmw==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [freebsd]
     dev: true
     optional: true
 
-  /@esbuild/freebsd-x64@0.16.17:
-    resolution: {integrity: sha512-8ScTdNJl5idAKjH8zGAsN7RuWcyHG3BAvMNpKOBaqqR7EbUhhVHOqXRdL7oZvz8WNHL2pr5+eIT5c65kA6NHug==}
+  /@esbuild/freebsd-x64@0.19.8:
+    resolution: {integrity: sha512-ICvZyOplIjmmhjd6mxi+zxSdpPTKFfyPPQMQTK/w+8eNK6WV01AjIztJALDtwNNfFhfZLux0tZLC+U9nSyA5Zg==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [freebsd]
     dev: true
     optional: true
 
-  /@esbuild/linux-arm64@0.16.17:
-    resolution: {integrity: sha512-7S8gJnSlqKGVJunnMCrXHU9Q8Q/tQIxk/xL8BqAP64wchPCTzuM6W3Ra8cIa1HIflAvDnNOt2jaL17vaW+1V0g==}
+  /@esbuild/linux-arm64@0.19.8:
+    resolution: {integrity: sha512-z1zMZivxDLHWnyGOctT9JP70h0beY54xDDDJt4VpTX+iwA77IFsE1vCXWmprajJGa+ZYSqkSbRQ4eyLCpCmiCQ==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [linux]
     dev: true
     optional: true
 
-  /@esbuild/linux-arm@0.16.17:
-    resolution: {integrity: sha512-iihzrWbD4gIT7j3caMzKb/RsFFHCwqqbrbH9SqUSRrdXkXaygSZCZg1FybsZz57Ju7N/SHEgPyaR0LZ8Zbe9gQ==}
+  /@esbuild/linux-arm@0.19.8:
+    resolution: {integrity: sha512-H4vmI5PYqSvosPaTJuEppU9oz1dq2A7Mr2vyg5TF9Ga+3+MGgBdGzcyBP7qK9MrwFQZlvNyJrvz6GuCaj3OukQ==}
     engines: {node: '>=12'}
     cpu: [arm]
     os: [linux]
     dev: true
     optional: true
 
-  /@esbuild/linux-ia32@0.16.17:
-    resolution: {integrity: sha512-kiX69+wcPAdgl3Lonh1VI7MBr16nktEvOfViszBSxygRQqSpzv7BffMKRPMFwzeJGPxcio0pdD3kYQGpqQ2SSg==}
+  /@esbuild/linux-ia32@0.19.8:
+    resolution: {integrity: sha512-1a8suQiFJmZz1khm/rDglOc8lavtzEMRo0v6WhPgxkrjcU0LkHj+TwBrALwoz/OtMExvsqbbMI0ChyelKabSvQ==}
     engines: {node: '>=12'}
     cpu: [ia32]
     os: [linux]
     dev: true
     optional: true
 
-  /@esbuild/linux-loong64@0.16.17:
-    resolution: {integrity: sha512-dTzNnQwembNDhd654cA4QhbS9uDdXC3TKqMJjgOWsC0yNCbpzfWoXdZvp0mY7HU6nzk5E0zpRGGx3qoQg8T2DQ==}
+  /@esbuild/linux-loong64@0.19.8:
+    resolution: {integrity: sha512-fHZWS2JJxnXt1uYJsDv9+b60WCc2RlvVAy1F76qOLtXRO+H4mjt3Tr6MJ5l7Q78X8KgCFudnTuiQRBhULUyBKQ==}
     engines: {node: '>=12'}
     cpu: [loong64]
     os: [linux]
     dev: true
     optional: true
 
-  /@esbuild/linux-mips64el@0.16.17:
-    resolution: {integrity: sha512-ezbDkp2nDl0PfIUn0CsQ30kxfcLTlcx4Foz2kYv8qdC6ia2oX5Q3E/8m6lq84Dj/6b0FrkgD582fJMIfHhJfSw==}
+  /@esbuild/linux-mips64el@0.19.8:
+    resolution: {integrity: sha512-Wy/z0EL5qZYLX66dVnEg9riiwls5IYnziwuju2oUiuxVc+/edvqXa04qNtbrs0Ukatg5HEzqT94Zs7J207dN5Q==}
     engines: {node: '>=12'}
     cpu: [mips64el]
     os: [linux]
     dev: true
     optional: true
 
-  /@esbuild/linux-ppc64@0.16.17:
-    resolution: {integrity: sha512-dzS678gYD1lJsW73zrFhDApLVdM3cUF2MvAa1D8K8KtcSKdLBPP4zZSLy6LFZ0jYqQdQ29bjAHJDgz0rVbLB3g==}
+  /@esbuild/linux-ppc64@0.19.8:
+    resolution: {integrity: sha512-ETaW6245wK23YIEufhMQ3HSeHO7NgsLx8gygBVldRHKhOlD1oNeNy/P67mIh1zPn2Hr2HLieQrt6tWrVwuqrxg==}
     engines: {node: '>=12'}
     cpu: [ppc64]
     os: [linux]
     dev: true
     optional: true
 
-  /@esbuild/linux-riscv64@0.16.17:
-    resolution: {integrity: sha512-ylNlVsxuFjZK8DQtNUwiMskh6nT0vI7kYl/4fZgV1llP5d6+HIeL/vmmm3jpuoo8+NuXjQVZxmKuhDApK0/cKw==}
+  /@esbuild/linux-riscv64@0.19.8:
+    resolution: {integrity: sha512-T2DRQk55SgoleTP+DtPlMrxi/5r9AeFgkhkZ/B0ap99zmxtxdOixOMI570VjdRCs9pE4Wdkz7JYrsPvsl7eESg==}
     engines: {node: '>=12'}
     cpu: [riscv64]
     os: [linux]
     dev: true
     optional: true
 
-  /@esbuild/linux-s390x@0.16.17:
-    resolution: {integrity: sha512-gzy7nUTO4UA4oZ2wAMXPNBGTzZFP7mss3aKR2hH+/4UUkCOyqmjXiKpzGrY2TlEUhbbejzXVKKGazYcQTZWA/w==}
+  /@esbuild/linux-s390x@0.19.8:
+    resolution: {integrity: sha512-NPxbdmmo3Bk7mbNeHmcCd7R7fptJaczPYBaELk6NcXxy7HLNyWwCyDJ/Xx+/YcNH7Im5dHdx9gZ5xIwyliQCbg==}
     engines: {node: '>=12'}
     cpu: [s390x]
     os: [linux]
     dev: true
     optional: true
 
-  /@esbuild/linux-x64@0.16.17:
-    resolution: {integrity: sha512-mdPjPxfnmoqhgpiEArqi4egmBAMYvaObgn4poorpUaqmvzzbvqbowRllQ+ZgzGVMGKaPkqUmPDOOFQRUFDmeUw==}
+  /@esbuild/linux-x64@0.19.8:
+    resolution: {integrity: sha512-lytMAVOM3b1gPypL2TRmZ5rnXl7+6IIk8uB3eLsV1JwcizuolblXRrc5ShPrO9ls/b+RTp+E6gbsuLWHWi2zGg==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [linux]
     dev: true
     optional: true
 
-  /@esbuild/netbsd-x64@0.16.17:
-    resolution: {integrity: sha512-/PzmzD/zyAeTUsduZa32bn0ORug+Jd1EGGAUJvqfeixoEISYpGnAezN6lnJoskauoai0Jrs+XSyvDhppCPoKOA==}
+  /@esbuild/netbsd-x64@0.19.8:
+    resolution: {integrity: sha512-hvWVo2VsXz/8NVt1UhLzxwAfo5sioj92uo0bCfLibB0xlOmimU/DeAEsQILlBQvkhrGjamP0/el5HU76HAitGw==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [netbsd]
     dev: true
     optional: true
 
-  /@esbuild/openbsd-x64@0.16.17:
-    resolution: {integrity: sha512-2yaWJhvxGEz2RiftSk0UObqJa/b+rIAjnODJgv2GbGGpRwAfpgzyrg1WLK8rqA24mfZa9GvpjLcBBg8JHkoodg==}
+  /@esbuild/openbsd-x64@0.19.8:
+    resolution: {integrity: sha512-/7Y7u77rdvmGTxR83PgaSvSBJCC2L3Kb1M/+dmSIvRvQPXXCuC97QAwMugBNG0yGcbEGfFBH7ojPzAOxfGNkwQ==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [openbsd]
     dev: true
     optional: true
 
-  /@esbuild/sunos-x64@0.16.17:
-    resolution: {integrity: sha512-xtVUiev38tN0R3g8VhRfN7Zl42YCJvyBhRKw1RJjwE1d2emWTVToPLNEQj/5Qxc6lVFATDiy6LjVHYhIPrLxzw==}
+  /@esbuild/sunos-x64@0.19.8:
+    resolution: {integrity: sha512-9Lc4s7Oi98GqFA4HzA/W2JHIYfnXbUYgekUP/Sm4BG9sfLjyv6GKKHKKVs83SMicBF2JwAX6A1PuOLMqpD001w==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [sunos]
     dev: true
     optional: true
 
-  /@esbuild/win32-arm64@0.16.17:
-    resolution: {integrity: sha512-ga8+JqBDHY4b6fQAmOgtJJue36scANy4l/rL97W+0wYmijhxKetzZdKOJI7olaBaMhWt8Pac2McJdZLxXWUEQw==}
+  /@esbuild/win32-arm64@0.19.8:
+    resolution: {integrity: sha512-rq6WzBGjSzihI9deW3fC2Gqiak68+b7qo5/3kmB6Gvbh/NYPA0sJhrnp7wgV4bNwjqM+R2AApXGxMO7ZoGhIJg==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [win32]
     dev: true
     optional: true
 
-  /@esbuild/win32-ia32@0.16.17:
-    resolution: {integrity: sha512-WnsKaf46uSSF/sZhwnqE4L/F89AYNMiD4YtEcYekBt9Q7nj0DiId2XH2Ng2PHM54qi5oPrQ8luuzGszqi/veig==}
+  /@esbuild/win32-ia32@0.19.8:
+    resolution: {integrity: sha512-AIAbverbg5jMvJznYiGhrd3sumfwWs8572mIJL5NQjJa06P8KfCPWZQ0NwZbPQnbQi9OWSZhFVSUWjjIrn4hSw==}
     engines: {node: '>=12'}
     cpu: [ia32]
     os: [win32]
     dev: true
     optional: true
 
-  /@esbuild/win32-x64@0.16.17:
-    resolution: {integrity: sha512-y+EHuSchhL7FjHgvQL/0fnnFmO4T1bhvWANX6gcnqTjtnKWbTvUMCpGnv2+t+31d7RzyEAYAd4u2fnIhHL6N/Q==}
+  /@esbuild/win32-x64@0.19.8:
+    resolution: {integrity: sha512-bfZ0cQ1uZs2PqpulNL5j/3w+GDhP36k1K5c38QdQg+Swy51jFZWWeIkteNsufkQxp986wnqRRsb/bHbY1WQ7TA==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [win32]
     dev: true
     optional: true
 
-  /@eslint-community/eslint-utils@4.4.0(eslint@8.39.0):
+  /@eslint-community/eslint-utils@4.4.0(eslint@8.57.0):
     resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
     dependencies:
-      eslint: 8.39.0
-      eslint-visitor-keys: 3.4.0
+      eslint: 8.57.0
+      eslint-visitor-keys: 3.4.3
     dev: true
 
-  /@eslint-community/regexpp@4.5.0:
-    resolution: {integrity: sha512-vITaYzIcNmjn5tF5uxcZ/ft7/RXGrMUIS9HalWckEOF6ESiwXKoMzAQf2UW0aVd6rnOeExTJVd5hmWXucBKGXQ==}
+  /@eslint-community/regexpp@4.6.2:
+    resolution: {integrity: sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==}
     engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
     dev: true
 
-  /@eslint/eslintrc@2.0.2:
-    resolution: {integrity: sha512-3W4f5tDUra+pA+FzgugqL2pRimUTDJWKr7BINqOpkZrC0uYI0NIc0/JFgBROCU07HR6GieA5m3/rsPIhDmCXTQ==}
+  /@eslint/eslintrc@2.1.4:
+    resolution: {integrity: sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
       ajv: 6.12.6
       debug: 4.3.4(supports-color@8.1.1)
-      espree: 9.5.1
+      espree: 9.6.1
       globals: 13.20.0
       ignore: 5.2.4
       import-fresh: 3.3.0
@@ -4877,43 +5159,47 @@ packages:
       - supports-color
     dev: true
 
-  /@eslint/js@8.39.0:
-    resolution: {integrity: sha512-kf9RB0Fg7NZfap83B3QOqOGg9QmD9yBudqQXzzOtn3i4y7ZUXe5ONeW34Gwi+TxhH4mvj72R1Zc300KUMa9Bng==}
+  /@eslint/js@8.57.0:
+    resolution: {integrity: sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dev: true
 
-  /@exodus/schemasafe@1.0.1:
-    resolution: {integrity: sha512-PQdbF8dGd4LnbwBlcc4ML8RKYdplm+e9sUeWBTr4zgF13/Shiuov9XznvM4T8cb1CfyKK21yTUkuAIIh/DAH/g==}
+  /@ewoudenberg/difflib@0.1.0:
+    resolution: {integrity: sha512-OU5P5mJyD3OoWYMWY+yIgwvgNS9cFAU10f+DDuvtogcWQOoJIsQ4Hy2McSfUfhKjq8L0FuWVb4Rt7kgA+XK86A==}
+    dependencies:
+      heap: 0.2.7
     dev: false
 
+  /@exodus/schemasafe@1.3.0:
+    resolution: {integrity: sha512-5Aap/GaRupgNx/feGBwLLTVv8OQFfv3pq2lPRzPg9R+IOBnDgghTGW7l7EuVXOvg5cc/xSAlRW8rBrjIC3Nvqw==}
+
   /@faker-js/faker@5.5.3:
     resolution: {integrity: sha512-R11tGE6yIFwqpaIqcfkcg7AICXzFg14+5h5v0TfF/9+RMDL6jhzCy/pxHVOfbALGdtVYdt6JdR21tuxEgl34dw==}
     dev: false
 
-  /@faker-js/faker@7.6.0:
-    resolution: {integrity: sha512-XK6BTq1NDMo9Xqw/YkYyGjSsg44fbNwYRx7QK2CuoQgyy+f1rrTDHoExVM5PsyXCtfl2vs2vVJ0MN0yN6LppRw==}
-    engines: {node: '>=14.0.0', npm: '>=6.0.0'}
+  /@faker-js/faker@8.0.2:
+    resolution: {integrity: sha512-Uo3pGspElQW91PCvKSIAXoEgAUlRnH29sX2/p89kg7sP1m2PzCufHINd0FhTXQf6DYGiUlVncdSPa2F9wxed2A==}
+    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0, npm: '>=6.14.13'}
     dev: true
 
   /@fal-works/esbuild-plugin-global-externals@2.1.2:
     resolution: {integrity: sha512-cEee/Z+I12mZcFJshKcCqC8tuX5hG3s+d+9nZ3LabqKF1vKdF41B92pJVCBggjAGORAeOzyyDDKrZwIkLffeOQ==}
     dev: true
 
-  /@figspec/components@1.0.1:
-    resolution: {integrity: sha512-UvnEamPEAMh9HExViqpobWmX25g1+soA9kcJu+It3VerMa7CeVyaIbQydNf1Gys5v/rxJVdTDRgQ7OXW2zAAig==}
-    dependencies:
-      lit: 2.6.1
-    dev: true
+  /@fastify/busboy@2.0.0:
+    resolution: {integrity: sha512-JUFJad5lv7jxj926GPgymrWQxxjPYuJNiNjNMzqT+HiuP6Vl3dk5xzG+8sTX96np0ZAluvaMzPsjhHZ5rNuNQQ==}
+    engines: {node: '>=14'}
+    dev: false
 
-  /@figspec/react@1.0.3(react@17.0.2):
-    resolution: {integrity: sha512-r683qOko+5CbT48Ox280fMx2MNAtaFPgCNJvldOqN3YtmAzlcTT+YSxd3OahA+kjXGGrnzDbUgeTOX1cPLII+g==}
-    peerDependencies:
-      react: ^16.14.0 || ^17.0.0 || ^18.0.0
+  /@floating-ui/core@1.3.1:
+    resolution: {integrity: sha512-Bu+AMaXNjrpjh41znzHqaz3r2Nr8hHuHZT6V2LBKMhyMl0FgKA62PNYbqnfgmzOhoWZj70Zecisbo4H1rotP5g==}
+    dev: false
+
+  /@floating-ui/dom@1.4.5:
+    resolution: {integrity: sha512-96KnRWkRnuBSSFbj0sFGwwOUd8EkiecINVl0O9wiZlZ64EkpyAOG3Xc2vKKNJmru0Z7RqWNymA+6b8OZqjgyyw==}
     dependencies:
-      '@figspec/components': 1.0.1
-      '@lit-labs/react': 1.1.1
-      react: 17.0.2
-    dev: true
+      '@floating-ui/core': 1.3.1
+    dev: false
 
   /@fontsource/open-sans@4.5.12:
     resolution: {integrity: sha512-WKCexsVbOECJUSOgG7GnrUxe+3ds4Sa1yhsTjSnszI+0TaJvMZnDnn5YDKwA/KwLbkZqCaV3nvMTH97jJuxWNA==}
@@ -4922,6 +5208,7 @@ packages:
   /@fortawesome/fontawesome-common-types@0.2.36:
     resolution: {integrity: sha512-a/7BiSgobHAgBWeN7N0w+lAhInrGxksn13uK7231n2m8EDPE3BMCl9NZLTGrj9ZXfCmC6LM0QLqXidIizVQ6yg==}
     engines: {node: '>=6'}
+    dev: false
 
   /@fortawesome/fontawesome-common-types@6.2.0:
     resolution: {integrity: sha512-rBevIsj2nclStJ7AxTdfsa3ovHb1H+qApwrxcTVo+NNdeJiB9V75hsKfrkG5AwNcRUNxrPPiScGYCNmLMoh8pg==}
@@ -4933,6 +5220,7 @@ packages:
     engines: {node: '>=6'}
     dependencies:
       '@fortawesome/fontawesome-common-types': 0.2.36
+    dev: false
 
   /@fortawesome/free-regular-svg-icons@6.2.0:
     resolution: {integrity: sha512-M1dG+PAmkYMTL9BSUHFXY5oaHwBYfHCPhbJ8qj8JELsc9XCrUJ6eEHWip4q0tE+h9C0DVyFkwIM9t7QYyCpprQ==}
@@ -4946,32 +5234,115 @@ packages:
     engines: {node: '>=6'}
     dependencies:
       '@fortawesome/fontawesome-common-types': 0.2.36
-
-  /@fortawesome/vue-fontawesome@2.0.8(@fortawesome/fontawesome-svg-core@1.2.36)(vue@2.7.14):
-    resolution: {integrity: sha512-SRmP0q9Ox4zq8ydDR/hrH+23TVU1bdwYVnugLVaAIwklOHbf56gx6JUGlwES7zjuNYqzKgl8e39iYf6ph8qSQw==}
-    peerDependencies:
-      '@fortawesome/fontawesome-svg-core': ~1 || ~6
-      vue: ~2
-    dependencies:
-      '@fortawesome/fontawesome-svg-core': 1.2.36
-      vue: 2.7.14
     dev: false
 
-  /@fortawesome/vue-fontawesome@2.0.9(@fortawesome/fontawesome-svg-core@1.2.36)(vue@2.7.14):
-    resolution: {integrity: sha512-tUmO92PFHbLOplitjHNBVGMJm6S57vp16tBXJVPKSI/6CfjrgLycqKxEpC6f7qsOqUdoXs5nIv4HLUfrOMHzuw==}
+  /@fortawesome/vue-fontawesome@3.0.3(@fortawesome/fontawesome-svg-core@1.2.36)(vue@3.4.21):
+    resolution: {integrity: sha512-KCPHi9QemVXGMrfuwf3nNnNo129resAIQWut9QTAMXmXqL2ErABC6ohd2yY5Ipq0CLWNbKHk8TMdTXL/Zf3ZhA==}
     peerDependencies:
       '@fortawesome/fontawesome-svg-core': ~1 || ~6
-      vue: ~2
+      vue: '>= 3.0.0 < 4'
     dependencies:
       '@fortawesome/fontawesome-svg-core': 1.2.36
-      vue: 2.7.14
-    dev: true
+      vue: 3.4.21(typescript@5.4.2)
+    dev: false
 
   /@gar/promisify@1.1.3:
     resolution: {integrity: sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==}
     dev: false
     optional: true
 
+  /@getzep/zep-js@0.9.0:
+    resolution: {integrity: sha512-GNaH7EwAisAaMuaUZzOR3hk3yTc7LXrqboPfSN6mZE0rAWGHOjT7V53Hec6yFJqFyXs4/7DsJvZlOcs+gEygNQ==}
+    engines: {node: '>=18.0.0'}
+    dependencies:
+      '@supercharge/promise-pool': 3.1.0
+      semver: 7.6.0
+      typescript: 5.4.2
+    dev: false
+
+  /@google-ai/generativelanguage@0.2.1:
+    resolution: {integrity: sha512-oqEQScnGO6UoEqdKMIGiRfLWNpc83RtLWcO/g/VH3+2PnqIwEqJThDAMCHmRZ9B3zUiiL2cd4FaHx3ZU93CXEA==}
+    engines: {node: '>=12.0.0'}
+    dependencies:
+      google-gax: 3.6.1
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
+    dev: false
+
+  /@google-cloud/paginator@3.0.7:
+    resolution: {integrity: sha512-jJNutk0arIQhmpUUQJPJErsojqo834KcyB6X7a1mxuic8i1tKXxde8E69IZxNZawRIlZdIK2QY4WALvlK5MzYQ==}
+    engines: {node: '>=10'}
+    dependencies:
+      arrify: 2.0.1
+      extend: 3.0.2
+    dev: false
+
+  /@google-cloud/projectify@3.0.0:
+    resolution: {integrity: sha512-HRkZsNmjScY6Li8/kb70wjGlDDyLkVk3KvoEo9uIoxSjYLJasGiCch9+PqRVDOCGUFvEIqyogl+BeqILL4OJHA==}
+    engines: {node: '>=12.0.0'}
+    dev: false
+
+  /@google-cloud/promisify@3.0.1:
+    resolution: {integrity: sha512-z1CjRjtQyBOYL+5Qr9DdYIfrdLBe746jRTYfaYU6MeXkqp7UfYs/jX16lFFVzZ7PGEJvqZNqYUEtb1mvDww4pA==}
+    engines: {node: '>=12'}
+    dev: false
+
+  /@google-cloud/storage@6.11.0:
+    resolution: {integrity: sha512-p5VX5K2zLTrMXlKdS1CiQNkKpygyn7CBFm5ZvfhVj6+7QUsjWvYx9YDMkYXdarZ6JDt4cxiu451y9QUIH82ZTw==}
+    engines: {node: '>=12'}
+    dependencies:
+      '@google-cloud/paginator': 3.0.7
+      '@google-cloud/projectify': 3.0.0
+      '@google-cloud/promisify': 3.0.1
+      abort-controller: 3.0.0
+      async-retry: 1.3.3
+      compressible: 2.0.18
+      duplexify: 4.1.2
+      ent: 2.2.0
+      extend: 3.0.2
+      gaxios: 5.1.0
+      google-auth-library: 8.8.0
+      mime: 3.0.0
+      mime-types: 2.1.35
+      p-limit: 3.1.0
+      retry-request: 5.0.2
+      teeny-request: 8.0.3
+      uuid: 8.3.2
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
+    dev: false
+
+  /@google/generative-ai@0.7.1:
+    resolution: {integrity: sha512-WTjMLLYL/xfA5BW6xAycRPiAX7FNHKAxrid/ayqC1QMam0KAK0NbMeS9Lubw80gVg5xFMLE+H7pw4wdNzTOlxw==}
+    engines: {node: '>=18.0.0'}
+    dev: false
+
+  /@google/generative-ai@0.8.0:
+    resolution: {integrity: sha512-O55FgK1Jvl2JuJP1cnRHEAM8A4Lr3yKtjQrCn2QXOXVT+L5+o/nFQcx0/oIo3oq1Kq9TjjgewXyb9BBrK+Wd0A==}
+    engines: {node: '>=18.0.0'}
+    dev: false
+
+  /@grpc/grpc-js@1.8.21:
+    resolution: {integrity: sha512-KeyQeZpxeEBSqFVTi3q2K7PiPXmgBfECc4updA1ejCLjYmoAlvvM3ZMp5ztTDUCUQmoY3CpDxvchjO1+rFkoHg==}
+    engines: {node: ^8.13.0 || >=10.10.0}
+    dependencies:
+      '@grpc/proto-loader': 0.7.10
+      '@types/node': 18.16.16
+    dev: false
+
+  /@grpc/proto-loader@0.7.10:
+    resolution: {integrity: sha512-CAqDfoaQ8ykFd9zqBDn4k6iWT9loLAlc2ETmDFS9JCD70gDcnA4L3AFEo2iV7KyAtAAHFW9ftq1Fz+Vsgq80RQ==}
+    engines: {node: '>=6'}
+    hasBin: true
+    dependencies:
+      lodash.camelcase: 4.3.0
+      long: 5.2.3
+      protobufjs: 7.2.6
+      yargs: 17.7.2
+    dev: false
+
   /@hapi/hoek@9.3.0:
     resolution: {integrity: sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==}
     dev: true
@@ -4982,11 +5353,16 @@ packages:
       '@hapi/hoek': 9.3.0
     dev: true
 
-  /@humanwhocodes/config-array@0.11.8:
-    resolution: {integrity: sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==}
+  /@huggingface/inference@2.6.4:
+    resolution: {integrity: sha512-Xna7arltBSBoKaH3diGi3sYvkExgJMd/pF4T6vl2YbmDccbr1G/X5EPZ2048p+YgrJYG1jTYFCtY6Dr3HvJaow==}
+    engines: {node: '>=18'}
+    dev: false
+
+  /@humanwhocodes/config-array@0.11.14:
+    resolution: {integrity: sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==}
     engines: {node: '>=10.10.0'}
     dependencies:
-      '@humanwhocodes/object-schema': 1.2.1
+      '@humanwhocodes/object-schema': 2.0.2
       debug: 4.3.4(supports-color@8.1.1)
       minimatch: 3.1.2
     transitivePeerDependencies:
@@ -4998,8 +5374,8 @@ packages:
     engines: {node: '>=12.22'}
     dev: true
 
-  /@humanwhocodes/object-schema@1.2.1:
-    resolution: {integrity: sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==}
+  /@humanwhocodes/object-schema@2.0.2:
+    resolution: {integrity: sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==}
     dev: true
 
   /@icetee/ftp@0.3.15:
@@ -5010,9 +5386,84 @@ packages:
       xregexp: 2.0.0
     dev: false
 
+  /@iconify-json/mdi@1.1.63:
+    resolution: {integrity: sha512-b07dRM5LYdwJqd/lm+1+JDNDNSWHvpZ7ujb73oJxx3lmK1J0giDS0BSc4yia0hixNV0Z2q/4GyxAu/A8XqDnbg==}
+    dependencies:
+      '@iconify/types': 2.0.0
+    dev: true
+
+  /@iconify/types@2.0.0:
+    resolution: {integrity: sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg==}
+    dev: true
+
+  /@iconify/utils@2.1.11:
+    resolution: {integrity: sha512-M/w3PkN8zQYXi8N6qK/KhnYMfEbbb6Sk8RZVn8g+Pmmu5ybw177RpsaGwpziyHeUsu4etrexYSWq3rwnIqzYCg==}
+    dependencies:
+      '@antfu/install-pkg': 0.1.1
+      '@antfu/utils': 0.7.6
+      '@iconify/types': 2.0.0
+      debug: 4.3.4(supports-color@8.1.1)
+      kolorist: 1.8.0
+      local-pkg: 0.4.3
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@intlify/core-base@9.2.2:
+    resolution: {integrity: sha512-JjUpQtNfn+joMbrXvpR4hTF8iJQ2sEFzzK3KIESOx+f+uwIjgw20igOyaIdhfsVVBCds8ZM64MoeNSx+PHQMkA==}
+    engines: {node: '>= 14'}
+    dependencies:
+      '@intlify/devtools-if': 9.2.2
+      '@intlify/message-compiler': 9.2.2
+      '@intlify/shared': 9.2.2
+      '@intlify/vue-devtools': 9.2.2
+    dev: false
+
+  /@intlify/devtools-if@9.2.2:
+    resolution: {integrity: sha512-4ttr/FNO29w+kBbU7HZ/U0Lzuh2cRDhP8UlWOtV9ERcjHzuyXVZmjyleESK6eVP60tGC9QtQW9yZE+JeRhDHkg==}
+    engines: {node: '>= 14'}
+    dependencies:
+      '@intlify/shared': 9.2.2
+    dev: false
+
+  /@intlify/message-compiler@9.2.2:
+    resolution: {integrity: sha512-IUrQW7byAKN2fMBe8z6sK6riG1pue95e5jfokn8hA5Q3Bqy4MBJ5lJAofUsawQJYHeoPJ7svMDyBaVJ4d0GTtA==}
+    engines: {node: '>= 14'}
+    dependencies:
+      '@intlify/shared': 9.2.2
+      source-map: 0.6.1
+    dev: false
+
+  /@intlify/shared@9.2.2:
+    resolution: {integrity: sha512-wRwTpsslgZS5HNyM7uDQYZtxnbI12aGiBZURX3BTR9RFIKKRWpllTsgzHWvj3HKm3Y2Sh5LPC1r0PDCKEhVn9Q==}
+    engines: {node: '>= 14'}
+    dev: false
+
+  /@intlify/vue-devtools@9.2.2:
+    resolution: {integrity: sha512-+dUyqyCHWHb/UcvY1MlIpO87munedm3Gn6E9WWYdWrMuYLcoIoOEVDWSS8xSwtlPU+kA+MEQTP6Q1iI/ocusJg==}
+    engines: {node: '>= 14'}
+    dependencies:
+      '@intlify/core-base': 9.2.2
+      '@intlify/shared': 9.2.2
+    dev: false
+
+  /@ioredis/as-callback@3.0.0:
+    resolution: {integrity: sha512-Kqv1rZ3WbgOrS+hgzJ5xG5WQuhvzzSTRYvNeyPMLOAM78MHSnuKI20JeJGbpuAt//LCuP0vsexZcorqW7kWhJg==}
+    dev: true
+
   /@ioredis/commands@1.2.0:
     resolution: {integrity: sha512-Sx1pU8EM64o2BrqNpEO1CNLtKQwyhuXuqyfH7oGKCk+1a33d2r5saW8zNwm3j6BTExtjrv2BxTgzzkMwts6vGg==}
-    dev: false
+
+  /@isaacs/cliui@8.0.2:
+    resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==}
+    engines: {node: '>=12'}
+    dependencies:
+      string-width: 5.1.2
+      string-width-cjs: /string-width@4.2.3
+      strip-ansi: 7.1.0
+      strip-ansi-cjs: /strip-ansi@6.0.1
+      wrap-ansi: 8.1.0
+      wrap-ansi-cjs: /wrap-ansi@7.0.0
 
   /@istanbuljs/load-nyc-config@1.1.0:
     resolution: {integrity: sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==}
@@ -5023,27 +5474,24 @@ packages:
       get-package-type: 0.1.0
       js-yaml: 3.14.1
       resolve-from: 5.0.0
-    dev: true
 
   /@istanbuljs/schema@0.1.3:
     resolution: {integrity: sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==}
     engines: {node: '>=8'}
-    dev: true
 
-  /@jest/console@29.5.0:
-    resolution: {integrity: sha512-NEpkObxPwyw/XxZVLPmAGKE89IQRp4puc6IQRPru6JKd1M3fW9v1xM1AnzIJE65hbCkzQAdnL8P47e9hzhiYLQ==}
+  /@jest/console@29.6.2:
+    resolution: {integrity: sha512-0N0yZof5hi44HAR2pPS+ikJ3nzKNoZdVu8FffRf3wy47I7Dm7etk/3KetMdRUqzVd16V4O2m2ISpNTbnIuqy1w==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/types': 29.5.0
-      '@types/node': 16.18.12
+      '@jest/types': 29.6.1
+      '@types/node': 18.16.16
       chalk: 4.1.2
-      jest-message-util: 29.5.0
-      jest-util: 29.5.0
+      jest-message-util: 29.6.2
+      jest-util: 29.6.2
       slash: 3.0.0
-    dev: true
 
-  /@jest/core@29.5.0:
-    resolution: {integrity: sha512-28UzQc7ulUrOQw1IsN/kv1QES3q2kkbl/wGslyhAclqZ/8cMdB5M68BffkIdSJgKBUt50d3hbwJ92XESlE7LiQ==}
+  /@jest/core@29.6.2:
+    resolution: {integrity: sha512-Oj+5B+sDMiMWLhPFF+4/DvHOf+U10rgvCLGPHP8Xlsy/7QxS51aU/eBngudHlJXnaWD5EohAgJ4js+T6pa+zOg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     peerDependencies:
       node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
@@ -5051,106 +5499,87 @@ packages:
       node-notifier:
         optional: true
     dependencies:
-      '@jest/console': 29.5.0
-      '@jest/reporters': 29.5.0
-      '@jest/test-result': 29.5.0
-      '@jest/transform': 29.5.0
-      '@jest/types': 29.5.0
-      '@types/node': 16.18.12
+      '@jest/console': 29.6.2
+      '@jest/reporters': 29.6.2
+      '@jest/test-result': 29.6.2
+      '@jest/transform': 29.6.2
+      '@jest/types': 29.6.1
+      '@types/node': 18.16.16
       ansi-escapes: 4.3.2
       chalk: 4.1.2
-      ci-info: 3.7.1
+      ci-info: 3.8.0
       exit: 0.1.2
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
       jest-changed-files: 29.5.0
-      jest-config: 29.5.0(@types/node@16.18.12)
-      jest-haste-map: 29.5.0
-      jest-message-util: 29.5.0
+      jest-config: 29.6.2(@types/node@18.16.16)
+      jest-haste-map: 29.6.2
+      jest-message-util: 29.6.2
       jest-regex-util: 29.4.3
-      jest-resolve: 29.5.0
-      jest-resolve-dependencies: 29.5.0
-      jest-runner: 29.5.0
-      jest-runtime: 29.5.0
-      jest-snapshot: 29.5.0
-      jest-util: 29.5.0
-      jest-validate: 29.5.0
-      jest-watcher: 29.5.0
+      jest-resolve: 29.6.2
+      jest-resolve-dependencies: 29.6.2
+      jest-runner: 29.6.2
+      jest-runtime: 29.6.2
+      jest-snapshot: 29.6.2
+      jest-util: 29.6.2
+      jest-validate: 29.6.2
+      jest-watcher: 29.6.2
       micromatch: 4.0.5
-      pretty-format: 29.5.0
+      pretty-format: 29.6.2
       slash: 3.0.0
       strip-ansi: 6.0.1
     transitivePeerDependencies:
+      - babel-plugin-macros
       - supports-color
       - ts-node
-    dev: true
-
-  /@jest/environment@29.5.0:
-    resolution: {integrity: sha512-5FXw2+wD29YU1d4I2htpRX7jYnAyTRjP2CsXQdo9SAM8g3ifxWPSV0HnClSn71xwctr0U3oZIIH+dtbfmnbXVQ==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dependencies:
-      '@jest/fake-timers': 29.5.0
-      '@jest/types': 29.5.0
-      '@types/node': 16.18.12
-      jest-mock: 29.5.0
-    dev: true
-
-  /@jest/expect-utils@29.3.1:
-    resolution: {integrity: sha512-wlrznINZI5sMjwvUoLVk617ll/UYfGIZNxmbU+Pa7wmkL4vYzhV9R2pwVqUh4NWWuLQWkI8+8mOkxs//prKQ3g==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dependencies:
-      jest-get-type: 29.2.0
-    dev: true
 
-  /@jest/expect-utils@29.4.2:
-    resolution: {integrity: sha512-Dd3ilDJpBnqa0GiPN7QrudVs0cczMMHtehSo2CSTjm3zdHx0RcpmhFNVEltuEFeqfLIyWKFI224FsMSQ/nsJQA==}
+  /@jest/environment@29.6.2:
+    resolution: {integrity: sha512-AEcW43C7huGd/vogTddNNTDRpO6vQ2zaQNrttvWV18ArBx9Z56h7BIsXkNFJVOO4/kblWEQz30ckw0+L3izc+Q==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      jest-get-type: 29.4.2
-    dev: true
+      '@jest/fake-timers': 29.6.2
+      '@jest/types': 29.6.1
+      '@types/node': 18.16.16
+      jest-mock: 29.6.2
 
-  /@jest/expect-utils@29.5.0:
-    resolution: {integrity: sha512-fmKzsidoXQT2KwnrwE0SQq3uj8Z763vzR8LnLBwC2qYWEFpjX8daRsk6rHUM1QvNlEW/UJXNXm59ztmJJWs2Mg==}
+  /@jest/expect-utils@29.6.2:
+    resolution: {integrity: sha512-6zIhM8go3RV2IG4aIZaZbxwpOzz3ZiM23oxAlkquOIole+G6TrbeXnykxWYlqF7kz2HlBjdKtca20x9atkEQYg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       jest-get-type: 29.4.3
-    dev: true
 
-  /@jest/expect@29.5.0:
-    resolution: {integrity: sha512-PueDR2HGihN3ciUNGr4uelropW7rqUfTiOn+8u0leg/42UhblPxHkfoh0Ruu3I9Y1962P3u2DY4+h7GVTSVU6g==}
+  /@jest/expect@29.6.2:
+    resolution: {integrity: sha512-m6DrEJxVKjkELTVAztTLyS/7C92Y2b0VYqmDROYKLLALHn8T/04yPs70NADUYPrV3ruI+H3J0iUIuhkjp7vkfg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      expect: 29.5.0
-      jest-snapshot: 29.5.0
+      expect: 29.6.2
+      jest-snapshot: 29.6.2
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /@jest/fake-timers@29.5.0:
-    resolution: {integrity: sha512-9ARvuAAQcBwDAqOnglWq2zwNIRUDtk/SCkp/ToGEhFv5r86K21l+VEs0qNTaXtyiY0lEePl3kylijSYJQqdbDg==}
+  /@jest/fake-timers@29.6.2:
+    resolution: {integrity: sha512-euZDmIlWjm1Z0lJ1D0f7a0/y5Kh/koLFMUBE5SUYWrmy8oNhJpbTBDAP6CxKnadcMLDoDf4waRYCe35cH6G6PA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/types': 29.5.0
+      '@jest/types': 29.6.1
       '@sinonjs/fake-timers': 10.0.2
-      '@types/node': 16.18.12
-      jest-message-util: 29.5.0
-      jest-mock: 29.5.0
-      jest-util: 29.5.0
-    dev: true
+      '@types/node': 18.16.16
+      jest-message-util: 29.6.2
+      jest-mock: 29.6.2
+      jest-util: 29.6.2
 
-  /@jest/globals@29.5.0:
-    resolution: {integrity: sha512-S02y0qMWGihdzNbUiqSAiKSpSozSuHX5UYc7QbnHP+D9Lyw8DgGGCinrN9uSuHPeKgSSzvPom2q1nAtBvUsvPQ==}
+  /@jest/globals@29.6.2:
+    resolution: {integrity: sha512-cjuJmNDjs6aMijCmSa1g2TNG4Lby/AeU7/02VtpW+SLcZXzOLK2GpN2nLqcFjmhy3B3AoPeQVx7BnyOf681bAw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/environment': 29.5.0
-      '@jest/expect': 29.5.0
-      '@jest/types': 29.5.0
-      jest-mock: 29.5.0
+      '@jest/environment': 29.6.2
+      '@jest/expect': 29.6.2
+      '@jest/types': 29.6.1
+      jest-mock: 29.6.2
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /@jest/reporters@29.5.0:
-    resolution: {integrity: sha512-D05STXqj/M8bP9hQNSICtPqz97u7ffGzZu+9XLucXhkOFBqKcXe04JLZOgIekOxdb73MAoBUFnqvf7MCpKk5OA==}
+  /@jest/reporters@29.6.2:
+    resolution: {integrity: sha512-sWtijrvIav8LgfJZlrGCdN0nP2EWbakglJY49J1Y5QihcQLfy7ovyxxjJBRXMNltgt4uPtEcFmIMbVshEDfFWw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     peerDependencies:
       node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
@@ -5159,161 +5588,128 @@ packages:
         optional: true
     dependencies:
       '@bcoe/v8-coverage': 0.2.3
-      '@jest/console': 29.5.0
-      '@jest/test-result': 29.5.0
-      '@jest/transform': 29.5.0
-      '@jest/types': 29.5.0
-      '@jridgewell/trace-mapping': 0.3.17
-      '@types/node': 16.18.12
+      '@jest/console': 29.6.2
+      '@jest/test-result': 29.6.2
+      '@jest/transform': 29.6.2
+      '@jest/types': 29.6.1
+      '@jridgewell/trace-mapping': 0.3.18
+      '@types/node': 18.16.16
       chalk: 4.1.2
       collect-v8-coverage: 1.0.1
       exit: 0.1.2
       glob: 7.2.3
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
       istanbul-lib-coverage: 3.2.0
       istanbul-lib-instrument: 5.2.1
       istanbul-lib-report: 3.0.0
       istanbul-lib-source-maps: 4.0.1
       istanbul-reports: 3.1.5
-      jest-message-util: 29.5.0
-      jest-util: 29.5.0
-      jest-worker: 29.5.0
+      jest-message-util: 29.6.2
+      jest-util: 29.6.2
+      jest-worker: 29.6.2
       slash: 3.0.0
       string-length: 4.0.2
       strip-ansi: 6.0.1
-      v8-to-istanbul: 9.0.1
+      v8-to-istanbul: 9.1.0
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /@jest/schemas@29.4.2:
-    resolution: {integrity: sha512-ZrGzGfh31NtdVH8tn0mgJw4khQuNHiKqdzJAFbCaERbyCP9tHlxWuL/mnMu8P7e/+k4puWjI1NOzi/sFsjce/g==}
+  /@jest/schemas@29.4.3:
+    resolution: {integrity: sha512-VLYKXQmtmuEz6IxJsrZwzG9NvtkQsWNnWMsKxqWNu3+CnfzJQhp0WDDKWLVV9hLKr0l3SLLFRqcYHjhtyuDVxg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       '@sinclair/typebox': 0.25.21
     dev: true
 
-  /@jest/schemas@29.4.3:
-    resolution: {integrity: sha512-VLYKXQmtmuEz6IxJsrZwzG9NvtkQsWNnWMsKxqWNu3+CnfzJQhp0WDDKWLVV9hLKr0l3SLLFRqcYHjhtyuDVxg==}
+  /@jest/schemas@29.6.0:
+    resolution: {integrity: sha512-rxLjXyJBTL4LQeJW3aKo0M/+GkCOXsO+8i9Iu7eDb6KwtP65ayoDsitrdPBtujxQ88k4wI2FNYfa6TOGwSn6cQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@sinclair/typebox': 0.25.21
-    dev: true
+      '@sinclair/typebox': 0.27.8
 
-  /@jest/source-map@29.4.3:
-    resolution: {integrity: sha512-qyt/mb6rLyd9j1jUts4EQncvS6Yy3PM9HghnNv86QBlV+zdL2inCdK1tuVlL+J+lpiw2BI67qXOrX3UurBqQ1w==}
+  /@jest/schemas@29.6.3:
+    resolution: {integrity: sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jridgewell/trace-mapping': 0.3.17
-      callsites: 3.1.0
-      graceful-fs: 4.2.10
-    dev: true
+      '@sinclair/typebox': 0.27.8
 
-  /@jest/test-result@29.5.0:
-    resolution: {integrity: sha512-fGl4rfitnbfLsrfx1uUpDEESS7zM8JdgZgOCQuxQvL1Sn/I6ijeAVQWGfXI9zb1i9Mzo495cIpVZhA0yr60PkQ==}
+  /@jest/source-map@29.6.0:
+    resolution: {integrity: sha512-oA+I2SHHQGxDCZpbrsCQSoMLb3Bz547JnM+jUr9qEbuw0vQlWZfpPS7CO9J7XiwKicEz9OFn/IYoLkkiUD7bzA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/console': 29.5.0
-      '@jest/types': 29.5.0
-      '@types/istanbul-lib-coverage': 2.0.4
-      collect-v8-coverage: 1.0.1
-    dev: true
+      '@jridgewell/trace-mapping': 0.3.18
+      callsites: 3.1.0
+      graceful-fs: 4.2.11
 
-  /@jest/test-sequencer@29.5.0:
-    resolution: {integrity: sha512-yPafQEcKjkSfDXyvtgiV4pevSeyuA6MQr6ZIdVkWJly9vkqjnFfcfhRQqpD5whjoU8EORki752xQmjaqoFjzMQ==}
+  /@jest/test-result@29.6.2:
+    resolution: {integrity: sha512-3VKFXzcV42EYhMCsJQURptSqnyjqCGbtLuX5Xxb6Pm6gUf1wIRIl+mandIRGJyWKgNKYF9cnstti6Ls5ekduqw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/test-result': 29.5.0
-      graceful-fs: 4.2.10
-      jest-haste-map: 29.5.0
-      slash: 3.0.0
-    dev: true
+      '@jest/console': 29.6.2
+      '@jest/types': 29.6.1
+      '@types/istanbul-lib-coverage': 2.0.4
+      collect-v8-coverage: 1.0.1
 
-  /@jest/transform@29.4.2:
-    resolution: {integrity: sha512-kf1v5iTJHn7p9RbOsBuc/lcwyPtJaZJt5885C98omWz79NIeD3PfoiiaPSu7JyCyFzNOIzKhmMhQLUhlTL9BvQ==}
+  /@jest/test-sequencer@29.6.2:
+    resolution: {integrity: sha512-GVYi6PfPwVejO7slw6IDO0qKVum5jtrJ3KoLGbgBWyr2qr4GaxFV6su+ZAjdTX75Sr1DkMFRk09r2ZVa+wtCGw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@babel/core': 7.21.5
-      '@jest/types': 29.5.0
-      '@jridgewell/trace-mapping': 0.3.17
-      babel-plugin-istanbul: 6.1.1
-      chalk: 4.1.2
-      convert-source-map: 2.0.0
-      fast-json-stable-stringify: 2.1.0
-      graceful-fs: 4.2.10
-      jest-haste-map: 29.5.0
-      jest-regex-util: 29.4.3
-      jest-util: 29.5.0
-      micromatch: 4.0.5
-      pirates: 4.0.5
+      '@jest/test-result': 29.6.2
+      graceful-fs: 4.2.11
+      jest-haste-map: 29.6.2
       slash: 3.0.0
-      write-file-atomic: 4.0.2
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
 
-  /@jest/transform@29.5.0:
-    resolution: {integrity: sha512-8vbeZWqLJOvHaDfeMuoHITGKSz5qWc9u04lnWrQE3VyuSw604PzQM824ZeX9XSjUCeDiE3GuxZe5UKa8J61NQw==}
+  /@jest/transform@29.6.2:
+    resolution: {integrity: sha512-ZqCqEISr58Ce3U+buNFJYUktLJZOggfyvR+bZMaiV1e8B1SIvJbwZMrYz3gx/KAPn9EXmOmN+uB08yLCjWkQQg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@babel/core': 7.21.5
-      '@jest/types': 29.5.0
-      '@jridgewell/trace-mapping': 0.3.17
+      '@babel/core': 7.22.9
+      '@jest/types': 29.6.1
+      '@jridgewell/trace-mapping': 0.3.18
       babel-plugin-istanbul: 6.1.1
       chalk: 4.1.2
       convert-source-map: 2.0.0
       fast-json-stable-stringify: 2.1.0
-      graceful-fs: 4.2.10
-      jest-haste-map: 29.5.0
+      graceful-fs: 4.2.11
+      jest-haste-map: 29.6.2
       jest-regex-util: 29.4.3
-      jest-util: 29.5.0
+      jest-util: 29.6.2
       micromatch: 4.0.5
       pirates: 4.0.5
       slash: 3.0.0
       write-file-atomic: 4.0.2
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /@jest/types@26.6.2:
-    resolution: {integrity: sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==}
-    engines: {node: '>= 10.14.2'}
+  /@jest/types@27.5.1:
+    resolution: {integrity: sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
     dependencies:
       '@types/istanbul-lib-coverage': 2.0.4
       '@types/istanbul-reports': 3.0.1
-      '@types/node': 16.18.12
-      '@types/yargs': 15.0.15
+      '@types/node': 18.16.16
+      '@types/yargs': 16.0.9
       chalk: 4.1.2
     dev: true
 
-  /@jest/types@29.5.0:
-    resolution: {integrity: sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==}
+  /@jest/types@29.6.1:
+    resolution: {integrity: sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/schemas': 29.4.3
+      '@jest/schemas': 29.6.0
       '@types/istanbul-lib-coverage': 2.0.4
       '@types/istanbul-reports': 3.0.1
-      '@types/node': 16.18.12
+      '@types/node': 18.16.16
       '@types/yargs': 17.0.19
       chalk: 4.1.2
-    dev: true
-
-  /@jridgewell/gen-mapping@0.1.1:
-    resolution: {integrity: sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==}
-    engines: {node: '>=6.0.0'}
-    dependencies:
-      '@jridgewell/set-array': 1.1.2
-      '@jridgewell/sourcemap-codec': 1.4.14
-    dev: true
 
   /@jridgewell/gen-mapping@0.3.2:
     resolution: {integrity: sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==}
     engines: {node: '>=6.0.0'}
     dependencies:
       '@jridgewell/set-array': 1.1.2
-      '@jridgewell/sourcemap-codec': 1.4.14
-      '@jridgewell/trace-mapping': 0.3.17
-    dev: true
+      '@jridgewell/sourcemap-codec': 1.4.15
+      '@jridgewell/trace-mapping': 0.3.18
 
   /@jridgewell/resolve-uri@3.1.0:
     resolution: {integrity: sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==}
@@ -5322,37 +5718,40 @@ packages:
   /@jridgewell/set-array@1.1.2:
     resolution: {integrity: sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==}
     engines: {node: '>=6.0.0'}
-    dev: true
 
   /@jridgewell/source-map@0.3.2:
     resolution: {integrity: sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==}
     dependencies:
       '@jridgewell/gen-mapping': 0.3.2
-      '@jridgewell/trace-mapping': 0.3.17
+      '@jridgewell/trace-mapping': 0.3.18
     dev: true
 
   /@jridgewell/sourcemap-codec@1.4.14:
     resolution: {integrity: sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==}
 
-  /@jridgewell/trace-mapping@0.3.17:
-    resolution: {integrity: sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==}
-    dependencies:
-      '@jridgewell/resolve-uri': 3.1.0
-      '@jridgewell/sourcemap-codec': 1.4.14
-    dev: true
+  /@jridgewell/sourcemap-codec@1.4.15:
+    resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==}
 
-  /@jridgewell/trace-mapping@0.3.9:
-    resolution: {integrity: sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==}
+  /@jridgewell/trace-mapping@0.3.18:
+    resolution: {integrity: sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==}
     dependencies:
       '@jridgewell/resolve-uri': 3.1.0
       '@jridgewell/sourcemap-codec': 1.4.14
 
-  /@js-joda/core@5.4.1:
-    resolution: {integrity: sha512-+uMco2Xm9VYJ81XYWwrvgsM9xEvqs9JvLNrN4/fOg7YJKk4yeqAg+O/cpoFPTGxvfL2Zy0mUcnKlIz9UV0Cadw==}
+  /@js-joda/core@5.6.1:
+    resolution: {integrity: sha512-Xla/d7ZMMR6+zRd6lTio0wRZECfcfFJP7GGe9A9L4tDOlD5CX4YcZ4YZle9w58bBYzssojVapI84RraKWDQZRg==}
     dev: false
 
   /@jsdevtools/ono@7.1.3:
     resolution: {integrity: sha512-4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg==}
+    dev: false
+
+  /@jsdoc/salty@0.2.6:
+    resolution: {integrity: sha512-aA+awb5yoml8TQ3CzI5Ue7sM3VMRC4l1zJJW4fgZ8OCL1wshJZhNzaf0PL85DSnOUw6QuFgeHGD/eq/xwwAF2g==}
+    engines: {node: '>=v12.0.0'}
+    dependencies:
+      lodash: 4.17.21
+    dev: false
 
   /@jsplumb/browser-ui@5.13.2:
     resolution: {integrity: sha512-BZ76kPtxESMIdhcCtWXPdICMudJyBVzDxaKY4jlne93Zq1T2ErfpNQ3E6f3JZfvoyvlNbKgh0udYkZ7Yg7BmIQ==}
@@ -5382,10 +5781,6 @@ packages:
     resolution: {integrity: sha512-POrqlZMOo821oa49Xbxb+pNmnxu0z2oS7FOeklRxKuYXR+7nsP0j9PpXjo8E8Ily4TaP+pdUnatb53vAaONO3g==}
     dev: false
 
-  /@juggle/resize-observer@3.4.0:
-    resolution: {integrity: sha512-dfLbk+PwWvFzSxwk3n5ySL0hfBog779o8h68wK/7/APo/7cgyWp5jcXockbxdk5kFRkbeXWm4Fbi9FrdN381sA==}
-    dev: true
-
   /@kafkajs/confluent-schema-registry@1.0.6:
     resolution: {integrity: sha512-NrZL1peOIlmlLKvheQcJAx9PHdnc4kaW+9+Yt4jXUfbbYR9EFNCZt6yApI4SwlFilaiZieReM6XslWy1LZAvoQ==}
     dependencies:
@@ -5393,6 +5788,10 @@ packages:
       mappersmith: 2.40.0
     dev: false
 
+  /@kurkle/color@0.3.2:
+    resolution: {integrity: sha512-fuscdXJ9G1qb7W8VdHi+IwRqij3lBkosAm4ydQtEmbY58OzHXqQhvlxqEkoz0yssNVn38bcpRWgA9PP+OGoisw==}
+    dev: false
+
   /@kwsites/file-exists@1.1.1:
     resolution: {integrity: sha512-m9/5YGR18lIwxSFDwfE3oA7bWuq9kdau6ugN4H2rJeyhFQZcG9AgSHkQtSD15a8WvTgfz9aikZMrKPHvbpqFiw==}
     dependencies:
@@ -5405,20283 +5804,20103 @@ packages:
     resolution: {integrity: sha512-GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw==}
     dev: false
 
-  /@lezer/common@1.0.1:
-    resolution: {integrity: sha512-8TR5++Q/F//tpDsLd5zkrvEX5xxeemafEaek7mUp7Y+bI8cKQXdSqhzTOBaOogETcMOVr0pT3BBPXp13477ciw==}
-    dev: false
-
-  /@lezer/css@1.1.1:
-    resolution: {integrity: sha512-mSjx+unLLapEqdOYDejnGBokB5+AiJKZVclmud0MKQOKx3DLJ5b5VTCstgDDknR6iIV4gVrN6euzsCnj0A2gQA==}
-    dependencies:
-      '@lezer/highlight': 1.1.1
-      '@lezer/lr': 1.2.3
-    dev: false
-
-  /@lezer/highlight@1.1.1:
-    resolution: {integrity: sha512-duv9D23O9ghEDnnUDmxu+L8pJy4nYo4AbCOHIudUhscrLSazqeJeK1V50EU6ZufWF1zv0KJwu/frFRyZWXxHBQ==}
-    dependencies:
-      '@lezer/common': 1.0.1
-    dev: false
-
-  /@lezer/html@1.3.0:
-    resolution: {integrity: sha512-jU/ah8DEoiECLTMouU/X/ujIg6k9WQMIOFMaCLebzaXfrguyGaR3DpTgmk0tbljiuIJ7hlmVJPcJcxGzmCd0Mg==}
-    dependencies:
-      '@lezer/common': 1.0.1
-      '@lezer/highlight': 1.1.1
-      '@lezer/lr': 1.2.3
-    dev: false
-
-  /@lezer/javascript@1.0.2:
-    resolution: {integrity: sha512-IjOVeIRhM8IuafWNnk+UzRz7p4/JSOKBNINLYLsdSGuJS9Ju7vFdc82AlTt0jgtV5D8eBZf4g0vK4d3ttBNz7A==}
-    dependencies:
-      '@lezer/highlight': 1.1.1
-      '@lezer/lr': 1.2.3
-    dev: false
-
-  /@lezer/lr@1.2.3:
-    resolution: {integrity: sha512-qpB7rBzH8f6Mzjv2AVZRahcm+2Cf7nbIH++uXbvVOL1yIRvVWQ3HAM/saeBLCyz/togB7LGo76qdJYL1uKQlqA==}
+  /@langchain/anthropic@0.1.16:
+    resolution: {integrity: sha512-vCbwkZ3pkMSKf67fBgNlslvuW9f3EZGBbO8Ic2etgX3xFl6L0WuMtfS26P1FCDpRwaKuC1BrCj2aLAeMzMq/Fg==}
+    engines: {node: '>=18'}
     dependencies:
-      '@lezer/common': 1.0.1
+      '@anthropic-ai/sdk': 0.20.7
+      '@langchain/core': 0.1.61
+      fast-xml-parser: 4.3.5
+      zod: 3.22.4
+      zod-to-json-schema: 3.22.4(zod@3.22.4)
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
     dev: false
 
-  /@lit-labs/react@1.1.1:
-    resolution: {integrity: sha512-9TC+/ZWb6BJlWCyUr14FKFlaGnyKpeEDorufXozQgke/VoVrslUQNaL7nBmrAWdNrmzx5jWgi8lFmWwrxMjnlA==}
-    dev: true
-
-  /@lit-labs/ssr-dom-shim@1.0.0:
-    resolution: {integrity: sha512-ic93MBXfApIFTrup4a70M/+ddD8xdt2zxxj9sRwHQzhS9ag/syqkD8JPdTXsc1gUy2K8TTirhlCqyTEM/sifNw==}
-    dev: true
-
-  /@lit/reactive-element@1.6.1:
-    resolution: {integrity: sha512-va15kYZr7KZNNPZdxONGQzpUr+4sxVu7V/VG7a8mRfPPXUyhEYj5RzXCQmGrlP3tAh0L3HHm5AjBMFYRqlM9SA==}
-    dependencies:
-      '@lit-labs/ssr-dom-shim': 1.0.0
-    dev: true
-
-  /@mapbox/node-pre-gyp@1.0.10:
-    resolution: {integrity: sha512-4ySo4CjzStuprMwk35H5pPbkymjv1SF3jGLj6rAHp/xT/RF7TL7bd9CTm1xDY49K2qF7jmR/g7k+SkLETP6opA==}
-    hasBin: true
+  /@langchain/cohere@0.0.8:
+    resolution: {integrity: sha512-HZ0NcJqEQj4vwiBiL97fFe1DreGzvUuAQZ41IeIJJKPxG4anNQ7EI1qrjmOEY71Hbnqty16Y5IPK4DbvsR6YFQ==}
+    engines: {node: '>=18'}
     dependencies:
-      detect-libc: 2.0.1
-      https-proxy-agent: 5.0.1
-      make-dir: 3.1.0
-      node-fetch: 2.6.8
-      nopt: 5.0.0
-      npmlog: 5.0.1
-      rimraf: 3.0.2
-      semver: 7.3.8
-      tar: 6.1.13
+      '@langchain/core': 0.1.61
+      cohere-ai: 7.9.5
     transitivePeerDependencies:
       - encoding
-      - supports-color
     dev: false
 
-  /@mdx-js/react@2.3.0(react@17.0.2):
-    resolution: {integrity: sha512-zQH//gdOmuu7nt2oJR29vFhDv88oGPmVw6BggmrHeMI+xgEkp1B2dX9/bMBSYtK0dyLX/aOmesKS09g222K1/g==}
-    peerDependencies:
-      react: '>=16'
-    dependencies:
-      '@types/mdx': 2.0.3
-      '@types/react': 18.0.27
-      react: 17.0.2
-    dev: true
-
-  /@miragejs/pretender-node-polyfill@0.1.2:
-    resolution: {integrity: sha512-M/BexG/p05C5lFfMunxo/QcgIJnMT2vDVCd00wNqK2ImZONIlEETZwWJu1QtLxtmYlSHlCFl3JNzp0tLe7OJ5g==}
-    dev: true
-
-  /@modyfi/vite-plugin-yaml@1.0.4(vite@4.0.4):
-    resolution: {integrity: sha512-qkT0KiR3AQQRfUvDzLv4+1rYAzXj+QmGhAbyUd0Ordf9xynK76i758lk5GiEfxuQxbvdqDaJ9oXkH/KacbSjQQ==}
-    peerDependencies:
-      vite: ^2.6.0 || ^3.0.0 || ^4.0.0
-    dependencies:
-      '@rollup/pluginutils': 5.0.2
-      js-yaml: 4.1.0
-      tosource: 2.0.0-alpha.3
-      vite: 4.0.4(@types/node@16.18.12)(sass@1.55.0)(terser@5.16.1)
-    transitivePeerDependencies:
-      - rollup
-    dev: true
-
-  /@msgpackr-extract/msgpackr-extract-darwin-arm64@2.2.0:
-    resolution: {integrity: sha512-Z9LFPzfoJi4mflGWV+rv7o7ZbMU5oAU9VmzCgL240KnqDW65Y2HFCT3MW06/ITJSnbVLacmcEJA8phywK7JinQ==}
-    cpu: [arm64]
-    os: [darwin]
-    dev: false
-    optional: true
-
-  /@msgpackr-extract/msgpackr-extract-darwin-x64@2.2.0:
-    resolution: {integrity: sha512-vq0tT8sjZsy4JdSqmadWVw6f66UXqUCabLmUVHZwUFzMgtgoIIQjT4VVRHKvlof3P/dMCkbMJ5hB1oJ9OWHaaw==}
-    cpu: [x64]
-    os: [darwin]
-    dev: false
-    optional: true
-
-  /@msgpackr-extract/msgpackr-extract-linux-arm64@2.2.0:
-    resolution: {integrity: sha512-hlxxLdRmPyq16QCutUtP8Tm6RDWcyaLsRssaHROatgnkOxdleMTgetf9JsdncL8vLh7FVy/RN9i3XR5dnb9cRA==}
-    cpu: [arm64]
-    os: [linux]
-    dev: false
-    optional: true
-
-  /@msgpackr-extract/msgpackr-extract-linux-arm@2.2.0:
-    resolution: {integrity: sha512-SaJ3Qq4lX9Syd2xEo9u3qPxi/OB+5JO/ngJKK97XDpa1C587H9EWYO6KD8995DAjSinWvdHKRrCOXVUC5fvGOg==}
-    cpu: [arm]
-    os: [linux]
-    dev: false
-    optional: true
-
-  /@msgpackr-extract/msgpackr-extract-linux-x64@2.2.0:
-    resolution: {integrity: sha512-94y5PJrSOqUNcFKmOl7z319FelCLAE0rz/jPCWS+UtdMZvpa4jrQd+cJPQCLp2Fes1yAW/YUQj/Di6YVT3c3Iw==}
-    cpu: [x64]
-    os: [linux]
-    dev: false
-    optional: true
-
-  /@msgpackr-extract/msgpackr-extract-win32-x64@2.2.0:
-    resolution: {integrity: sha512-XrC0JzsqQSvOyM3t04FMLO6z5gCuhPE6k4FXuLK5xf52ZbdvcFe1yBmo7meCew9B8G2f0T9iu9t3kfTYRYROgA==}
-    cpu: [x64]
-    os: [win32]
-    dev: false
-    optional: true
-
-  /@n8n_io/license-sdk@2.3.0:
-    resolution: {integrity: sha512-1qOg4VEi2mZzhAJ5Uh9IT9Jn/b3xCaxyFbovYLtymzy3ObafUyWieUrSQri3BrCbW1dwQHz99DEVFxYCq1Je0Q==}
-    engines: {node: '>=14.0.0', npm: '>=7.10.0'}
-    dependencies:
-      crypto-js: 4.1.1
-      node-machine-id: 1.1.12
-      node-rsa: 1.1.1
-      undici: 5.21.0
-    dev: false
-
-  /@n8n_io/riot-tmpl@3.0.0:
-    resolution: {integrity: sha512-bExAbGAp+LE4EXUcXl/kcZofKefrLIVZl8Kg36fim6KZATrWF8Nh7cdp/dOWzgZT6h8/ScqKxjv23W3KoeR40Q==}
-    dependencies:
-      eslint-config-riot: 1.0.0
-    dev: false
-
-  /@ngneat/falso@6.1.0:
-    resolution: {integrity: sha512-eka5OxW65B1RphpLJ04Pd4PEkrmTab/Ut50K0OceAdM+O+MZA7YF9xo51uZgkxbhg8bJ5zEh5vucDRMSofcqsw==}
-    dependencies:
-      seedrandom: 3.0.5
-      uuid: 8.3.2
-    dev: true
-
-  /@nodelib/fs.scandir@2.1.5:
-    resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==}
-    engines: {node: '>= 8'}
-    dependencies:
-      '@nodelib/fs.stat': 2.0.5
-      run-parallel: 1.2.0
-
-  /@nodelib/fs.stat@2.0.5:
-    resolution: {integrity: sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==}
-    engines: {node: '>= 8'}
-
-  /@nodelib/fs.walk@1.2.8:
-    resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==}
-    engines: {node: '>= 8'}
-    dependencies:
-      '@nodelib/fs.scandir': 2.1.5
-      fastq: 1.15.0
-
-  /@npmcli/fs@1.1.1:
-    resolution: {integrity: sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==}
-    dependencies:
-      '@gar/promisify': 1.1.3
-      semver: 7.3.8
-    dev: false
-    optional: true
-
-  /@npmcli/move-file@1.1.2:
-    resolution: {integrity: sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==}
-    engines: {node: '>=10'}
-    deprecated: This functionality has been moved to @npmcli/fs
-    dependencies:
-      mkdirp: 1.0.4
-      rimraf: 3.0.2
-    dev: false
-    optional: true
-
-  /@oclif/command@1.8.18(@oclif/config@1.18.5)(supports-color@8.1.1):
-    resolution: {integrity: sha512-qTad+jtiriMMbkw6ArtcUY89cwLwmwDnD4KSGT+OQiZKYtegp3NUCM9JN8lfj/aKC+0kvSitJM4ULzbgiVTKQQ==}
-    engines: {node: '>=12.0.0'}
-    peerDependencies:
-      '@oclif/config': ^1
-    dependencies:
-      '@oclif/config': 1.18.5(supports-color@8.1.1)
-      '@oclif/errors': 1.3.6
-      '@oclif/help': 1.0.3(supports-color@8.1.1)
-      '@oclif/parser': 3.8.8
-      debug: 4.3.4(supports-color@8.1.1)
-      semver: 7.3.8
-    transitivePeerDependencies:
-      - supports-color
-
-  /@oclif/config@1.18.2:
-    resolution: {integrity: sha512-cE3qfHWv8hGRCP31j7fIS7BfCflm/BNZ2HNqHexH+fDrdF2f1D5S8VmXWLC77ffv3oDvWyvE9AZeR0RfmHCCaA==}
-    engines: {node: '>=8.0.0'}
-    dependencies:
-      '@oclif/errors': 1.3.6
-      '@oclif/parser': 3.8.8
-      debug: 4.3.4(supports-color@8.1.1)
-      globby: 11.1.0
-      is-wsl: 2.2.0
-      tslib: 2.5.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@oclif/config@1.18.5(supports-color@8.1.1):
-    resolution: {integrity: sha512-R6dBedaUVn5jtAh79aaRm7jezx4l3V7Im9NORlLmudz5BL1foMeuXEvnqm+bMiejyexVA+oi9mto6YKZPzo/5Q==}
-    engines: {node: '>=8.0.0'}
-    dependencies:
-      '@oclif/errors': 1.3.6
-      '@oclif/parser': 3.8.8
-      debug: 4.3.4(supports-color@8.1.1)
-      globby: 11.1.0
-      is-wsl: 2.2.0
-      tslib: 2.5.0
-    transitivePeerDependencies:
-      - supports-color
-
-  /@oclif/core@1.16.6:
-    resolution: {integrity: sha512-g6ILjfs9sbyZGEXV+CUBR22wfT2D7/SNW1QvUAR3K8l4Joe1Z/xD2e2Dk27EA8+mU+HcwiTZJKiTVq7BUtZe5g==}
-    engines: {node: '>=14.0.0'}
-    dependencies:
-      '@oclif/linewrap': 1.0.0
-      '@oclif/screen': 3.0.2
-      ansi-escapes: 4.3.2
-      ansi-styles: 4.3.0
-      cardinal: 2.1.1
-      chalk: 4.1.2
-      clean-stack: 3.0.1
-      cli-progress: 3.11.2
-      debug: 4.3.4(supports-color@8.1.1)
-      ejs: 3.1.8
-      fs-extra: 9.1.0
-      get-package-type: 0.1.0
-      globby: 11.1.0
-      hyperlinker: 1.0.0
-      indent-string: 4.0.0
-      is-wsl: 2.2.0
-      js-yaml: 3.14.1
-      natural-orderby: 2.0.3
-      object-treeify: 1.1.33
-      password-prompt: 1.1.2
-      semver: 7.3.8
-      string-width: 4.2.3
-      strip-ansi: 6.0.1
-      supports-color: 8.1.1
-      supports-hyperlinks: 2.3.0
-      tslib: 2.5.0
-      widest-line: 3.1.0
-      wrap-ansi: 7.0.0
-    dev: false
-
-  /@oclif/dev-cli@1.26.10:
-    resolution: {integrity: sha512-dJ+II9rVXckzFvG+82PbfphMTnoqiHvsuAAbcHrLdZWPBnFAiDKhNYE0iHnA/knAC4VGXhogsrAJ3ERT5d5r2g==}
-    engines: {node: '>=8.10.0'}
-    hasBin: true
+  /@langchain/community@0.0.53(@aws-sdk/client-bedrock-runtime@3.549.0)(@aws-sdk/credential-provider-node@3.549.0)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@0.2.1)(@huggingface/inference@2.6.4)(@pinecone-database/pinecone@2.2.0)(@qdrant/js-client-rest@1.7.0)(@supabase/supabase-js@2.38.5)(@xata.io/client@0.28.0)(cohere-ai@6.2.2)(html-to-text@9.0.5)(lodash@4.17.21)(pg@8.11.3)(redis@4.6.12):
+    resolution: {integrity: sha512-iFqZPt4MRssGYsQoKSXWJQaYTZCC7WNuilp2JCCs3wKmJK3l6mR0eV+PDrnT+TaDHUVxt/b0rwgM0sOiy0j2jA==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      '@aws-crypto/sha256-js': ^5.0.0
+      '@aws-sdk/client-bedrock-agent-runtime': ^3.485.0
+      '@aws-sdk/client-bedrock-runtime': ^3.422.0
+      '@aws-sdk/client-dynamodb': ^3.310.0
+      '@aws-sdk/client-kendra': ^3.352.0
+      '@aws-sdk/client-lambda': ^3.310.0
+      '@aws-sdk/client-sagemaker-runtime': ^3.310.0
+      '@aws-sdk/client-sfn': ^3.310.0
+      '@aws-sdk/credential-provider-node': ^3.388.0
+      '@azure/search-documents': ^12.0.0
+      '@clickhouse/client': ^0.2.5
+      '@cloudflare/ai': '*'
+      '@datastax/astra-db-ts': ^1.0.0
+      '@elastic/elasticsearch': ^8.4.0
+      '@getmetal/metal-sdk': '*'
+      '@getzep/zep-js': ^0.9.0
+      '@gomomento/sdk': ^1.51.1
+      '@gomomento/sdk-core': ^1.51.1
+      '@google-ai/generativelanguage': ^0.2.1
+      '@gradientai/nodejs-sdk': ^1.2.0
+      '@huggingface/inference': ^2.6.4
+      '@mozilla/readability': '*'
+      '@neondatabase/serverless': '*'
+      '@opensearch-project/opensearch': '*'
+      '@pinecone-database/pinecone': '*'
+      '@planetscale/database': ^1.8.0
+      '@premai/prem-sdk': ^0.3.25
+      '@qdrant/js-client-rest': ^1.8.2
+      '@raycast/api': ^1.55.2
+      '@rockset/client': ^0.9.1
+      '@smithy/eventstream-codec': ^2.0.5
+      '@smithy/protocol-http': ^3.0.6
+      '@smithy/signature-v4': ^2.0.10
+      '@smithy/util-utf8': ^2.0.0
+      '@supabase/postgrest-js': ^1.1.1
+      '@supabase/supabase-js': ^2.10.0
+      '@tensorflow-models/universal-sentence-encoder': '*'
+      '@tensorflow/tfjs-converter': '*'
+      '@tensorflow/tfjs-core': '*'
+      '@upstash/redis': ^1.20.6
+      '@upstash/vector': ^1.0.7
+      '@vercel/kv': ^0.2.3
+      '@vercel/postgres': ^0.5.0
+      '@writerai/writer-sdk': ^0.40.2
+      '@xata.io/client': ^0.28.0
+      '@xenova/transformers': ^2.5.4
+      '@zilliz/milvus2-sdk-node': '>=2.2.7'
+      better-sqlite3: ^9.4.0
+      cassandra-driver: ^4.7.2
+      cborg: ^4.1.1
+      chromadb: '*'
+      closevector-common: 0.1.3
+      closevector-node: 0.1.6
+      closevector-web: 0.1.6
+      cohere-ai: '*'
+      convex: ^1.3.1
+      couchbase: ^4.3.0
+      discord.js: ^14.14.1
+      dria: ^0.0.3
+      duck-duck-scrape: ^2.2.5
+      faiss-node: ^0.5.1
+      firebase-admin: ^11.9.0 || ^12.0.0
+      google-auth-library: ^8.9.0
+      googleapis: ^126.0.1
+      hnswlib-node: ^3.0.0
+      html-to-text: ^9.0.5
+      interface-datastore: ^8.2.11
+      ioredis: ^5.3.2
+      it-all: ^3.0.4
+      jsdom: '*'
+      jsonwebtoken: ^9.0.2
+      llmonitor: ^0.5.9
+      lodash: ^4.17.21
+      lunary: ^0.6.11
+      mongodb: '>=5.2.0'
+      mysql2: ^3.3.3
+      neo4j-driver: '*'
+      node-llama-cpp: '*'
+      pg: ^8.11.0
+      pg-copy-streams: ^6.0.5
+      pickleparser: ^0.2.1
+      portkey-ai: ^0.1.11
+      redis: '*'
+      replicate: ^0.18.0
+      typeorm: ^0.3.12
+      typesense: ^1.5.3
+      usearch: ^1.1.1
+      vectordb: ^0.1.4
+      voy-search: 0.6.2
+      weaviate-ts-client: '*'
+      web-auth-library: ^1.0.3
+      ws: ^8.14.2
+    peerDependenciesMeta:
+      '@aws-crypto/sha256-js':
+        optional: true
+      '@aws-sdk/client-bedrock-agent-runtime':
+        optional: true
+      '@aws-sdk/client-bedrock-runtime':
+        optional: true
+      '@aws-sdk/client-dynamodb':
+        optional: true
+      '@aws-sdk/client-kendra':
+        optional: true
+      '@aws-sdk/client-lambda':
+        optional: true
+      '@aws-sdk/client-sagemaker-runtime':
+        optional: true
+      '@aws-sdk/client-sfn':
+        optional: true
+      '@aws-sdk/credential-provider-node':
+        optional: true
+      '@azure/search-documents':
+        optional: true
+      '@clickhouse/client':
+        optional: true
+      '@cloudflare/ai':
+        optional: true
+      '@datastax/astra-db-ts':
+        optional: true
+      '@elastic/elasticsearch':
+        optional: true
+      '@getmetal/metal-sdk':
+        optional: true
+      '@getzep/zep-js':
+        optional: true
+      '@gomomento/sdk':
+        optional: true
+      '@gomomento/sdk-core':
+        optional: true
+      '@google-ai/generativelanguage':
+        optional: true
+      '@gradientai/nodejs-sdk':
+        optional: true
+      '@huggingface/inference':
+        optional: true
+      '@mozilla/readability':
+        optional: true
+      '@neondatabase/serverless':
+        optional: true
+      '@opensearch-project/opensearch':
+        optional: true
+      '@pinecone-database/pinecone':
+        optional: true
+      '@planetscale/database':
+        optional: true
+      '@premai/prem-sdk':
+        optional: true
+      '@qdrant/js-client-rest':
+        optional: true
+      '@raycast/api':
+        optional: true
+      '@rockset/client':
+        optional: true
+      '@smithy/eventstream-codec':
+        optional: true
+      '@smithy/protocol-http':
+        optional: true
+      '@smithy/signature-v4':
+        optional: true
+      '@smithy/util-utf8':
+        optional: true
+      '@supabase/postgrest-js':
+        optional: true
+      '@supabase/supabase-js':
+        optional: true
+      '@tensorflow-models/universal-sentence-encoder':
+        optional: true
+      '@tensorflow/tfjs-converter':
+        optional: true
+      '@tensorflow/tfjs-core':
+        optional: true
+      '@upstash/redis':
+        optional: true
+      '@upstash/vector':
+        optional: true
+      '@vercel/kv':
+        optional: true
+      '@vercel/postgres':
+        optional: true
+      '@writerai/writer-sdk':
+        optional: true
+      '@xata.io/client':
+        optional: true
+      '@xenova/transformers':
+        optional: true
+      '@zilliz/milvus2-sdk-node':
+        optional: true
+      better-sqlite3:
+        optional: true
+      cassandra-driver:
+        optional: true
+      cborg:
+        optional: true
+      chromadb:
+        optional: true
+      closevector-common:
+        optional: true
+      closevector-node:
+        optional: true
+      closevector-web:
+        optional: true
+      cohere-ai:
+        optional: true
+      convex:
+        optional: true
+      couchbase:
+        optional: true
+      discord.js:
+        optional: true
+      dria:
+        optional: true
+      duck-duck-scrape:
+        optional: true
+      faiss-node:
+        optional: true
+      firebase-admin:
+        optional: true
+      google-auth-library:
+        optional: true
+      googleapis:
+        optional: true
+      hnswlib-node:
+        optional: true
+      html-to-text:
+        optional: true
+      interface-datastore:
+        optional: true
+      ioredis:
+        optional: true
+      it-all:
+        optional: true
+      jsdom:
+        optional: true
+      jsonwebtoken:
+        optional: true
+      llmonitor:
+        optional: true
+      lodash:
+        optional: true
+      lunary:
+        optional: true
+      mongodb:
+        optional: true
+      mysql2:
+        optional: true
+      neo4j-driver:
+        optional: true
+      node-llama-cpp:
+        optional: true
+      pg:
+        optional: true
+      pg-copy-streams:
+        optional: true
+      pickleparser:
+        optional: true
+      portkey-ai:
+        optional: true
+      redis:
+        optional: true
+      replicate:
+        optional: true
+      typeorm:
+        optional: true
+      typesense:
+        optional: true
+      usearch:
+        optional: true
+      vectordb:
+        optional: true
+      voy-search:
+        optional: true
+      weaviate-ts-client:
+        optional: true
+      web-auth-library:
+        optional: true
+      ws:
+        optional: true
     dependencies:
-      '@oclif/command': 1.8.18(@oclif/config@1.18.5)(supports-color@8.1.1)
-      '@oclif/config': 1.18.5(supports-color@8.1.1)
-      '@oclif/errors': 1.3.6
-      '@oclif/plugin-help': 3.2.18
-      cli-ux: 5.6.7(@oclif/config@1.18.5)
-      debug: 4.3.4(supports-color@8.1.1)
-      find-yarn-workspace-root: 2.0.0
-      fs-extra: 8.1.0
-      github-slugger: 1.4.0
+      '@aws-sdk/client-bedrock-runtime': 3.549.0
+      '@aws-sdk/credential-provider-node': 3.549.0
+      '@getzep/zep-js': 0.9.0
+      '@google-ai/generativelanguage': 0.2.1
+      '@huggingface/inference': 2.6.4
+      '@langchain/core': 0.1.61
+      '@langchain/openai': 0.0.28
+      '@pinecone-database/pinecone': 2.2.0
+      '@qdrant/js-client-rest': 1.7.0(typescript@5.4.2)
+      '@supabase/supabase-js': 2.38.5
+      '@xata.io/client': 0.28.0(typescript@5.4.2)
+      cohere-ai: 6.2.2
+      expr-eval: 2.0.2
+      flat: 5.0.2
+      html-to-text: 9.0.5
+      langsmith: 0.1.12
       lodash: 4.17.21
-      normalize-package-data: 3.0.3
-      qqjs: 0.3.11
-      tslib: 2.5.0
+      pg: 8.11.3
+      redis: 4.6.12
+      uuid: 9.0.1
+      zod: 3.22.4
+      zod-to-json-schema: 3.22.5(zod@3.22.4)
     transitivePeerDependencies:
+      - encoding
       - supports-color
-    dev: true
+    dev: false
 
-  /@oclif/errors@1.3.5:
-    resolution: {integrity: sha512-OivucXPH/eLLlOT7FkCMoZXiaVYf8I/w1eTAM1+gKzfhALwWTusxEx7wBmW0uzvkSg/9ovWLycPaBgJbM3LOCQ==}
-    engines: {node: '>=8.0.0'}
-    dependencies:
-      clean-stack: 3.0.1
-      fs-extra: 8.1.0
-      indent-string: 4.0.0
-      strip-ansi: 6.0.1
-      wrap-ansi: 7.0.0
-    dev: true
-
-  /@oclif/errors@1.3.6:
-    resolution: {integrity: sha512-fYaU4aDceETd89KXP+3cLyg9EHZsLD3RxF2IU9yxahhBpspWjkWi3Dy3bTgcwZ3V47BgxQaGapzJWDM33XIVDQ==}
-    engines: {node: '>=8.0.0'}
-    dependencies:
-      clean-stack: 3.0.1
-      fs-extra: 8.1.0
-      indent-string: 4.0.0
-      strip-ansi: 6.0.1
-      wrap-ansi: 7.0.0
-
-  /@oclif/help@1.0.3(supports-color@8.1.1):
-    resolution: {integrity: sha512-AjjhSWFQkRb9rChEH+IRUmp0CxEacYpUbh+kQqtdCR9CDSsj2a3ibWjtMtJb4lFGAle6kVKfaal/juYe+6P5TQ==}
-    engines: {node: '>=8.0.0'}
-    dependencies:
-      '@oclif/config': 1.18.5(supports-color@8.1.1)
-      '@oclif/errors': 1.3.6
-      chalk: 4.1.2
-      indent-string: 4.0.0
-      lodash: 4.17.21
-      string-width: 4.2.3
-      strip-ansi: 6.0.1
-      widest-line: 3.1.0
-      wrap-ansi: 6.2.0
-    transitivePeerDependencies:
-      - supports-color
-
-  /@oclif/linewrap@1.0.0:
-    resolution: {integrity: sha512-Ups2dShK52xXa8w6iBWLgcjPJWjais6KPJQq3gQ/88AY6BXoTX+MIGFPrWQO1KLMiQfoTpcLnUwloN4brrVUHw==}
-
-  /@oclif/parser@3.8.8:
-    resolution: {integrity: sha512-OgqQAtpyq1XFJG3dvLl9aqiO+F5pubkzt7AivUDkNoa6/hNgVZ79vvTO8sqo5XAAhOm/fcTSerZ35OTnTJb1ng==}
-    engines: {node: '>=8.0.0'}
-    dependencies:
-      '@oclif/errors': 1.3.6
-      '@oclif/linewrap': 1.0.0
-      chalk: 4.1.2
-      tslib: 2.5.0
-
-  /@oclif/plugin-help@3.2.18:
-    resolution: {integrity: sha512-5n5Pkz4L0duknIvFwx2Ko9Xda3miT6RZP8bgaaK3Q/9fzVBrhi4bOM0u05/OThI6V+3NsSdxYS2o1NLcXToWDg==}
-    engines: {node: '>=8.0.0'}
-    dependencies:
-      '@oclif/command': 1.8.18(@oclif/config@1.18.5)(supports-color@8.1.1)
-      '@oclif/config': 1.18.2
-      '@oclif/errors': 1.3.5
-      '@oclif/help': 1.0.3(supports-color@8.1.1)
-      chalk: 4.1.2
-      indent-string: 4.0.0
-      lodash: 4.17.21
-      string-width: 4.2.3
-      strip-ansi: 6.0.1
-      widest-line: 3.1.0
-      wrap-ansi: 6.2.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@oclif/screen@1.0.4:
-    resolution: {integrity: sha512-60CHpq+eqnTxLZQ4PGHYNwUX572hgpMHGPtTWMjdTMsAvlm69lZV/4ly6O3sAYkomo4NggGcomrDpBe34rxUqw==}
-    engines: {node: '>=8.0.0'}
-    dev: true
-
-  /@oclif/screen@3.0.2:
-    resolution: {integrity: sha512-S/SF/XYJeevwIgHFmVDAFRUvM3m+OjhvCAYMk78ZJQCYCQ5wS7j+LTt1ZEv2jpEEGg2tx/F6TYYWxddNAYHrFQ==}
-    engines: {node: '>=12.0.0'}
-    dev: false
-
-  /@opentelemetry/api@1.2.0:
-    resolution: {integrity: sha512-0nBr+VZNKm9tvNDZFstI3Pq1fCTEDK5OZTnVKNvBNAKgd0yIvmwsP4m61rEv7ZP+tOUjWJhROpxK5MsnlF911g==}
-    engines: {node: '>=8.0.0'}
-    dev: false
-
-  /@pinia/testing@0.0.14(pinia@2.0.23)(vue@2.7.14):
-    resolution: {integrity: sha512-ZmZwVNd/NnKYLIfjfuKl0zlJ3UdiXFpsHzSlL6wCeezSlyrqGMxsIQKv0J6fleu38gyCNTPBEipfxrt8V4+VIg==}
-    peerDependencies:
-      pinia: '>=2.0.19'
-    dependencies:
-      pinia: 2.0.23(typescript@5.0.3)(vue@2.7.14)
-      vue-demi: 0.13.11(vue@2.7.14)
-    transitivePeerDependencies:
-      - '@vue/composition-api'
-      - vue
-    dev: true
-
-  /@pkgr/utils@2.3.1:
-    resolution: {integrity: sha512-wfzX8kc1PMyUILA+1Z/EqoE4UCXGy0iRGMhPwdfae1+f0OXlLqCk+By+aMzgJBzR9AzS4CDizioG6Ss1gvAFJw==}
-    engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0}
-    dependencies:
-      cross-spawn: 7.0.3
-      is-glob: 4.0.3
-      open: 8.4.0
-      picocolors: 1.0.0
-      tiny-glob: 0.2.9
-      tslib: 2.5.0
-    dev: true
-
-  /@rollup/pluginutils@5.0.2:
-    resolution: {integrity: sha512-pTd9rIsP92h+B6wWwFbW8RkZv4hiR/xKsqre4SIuAOaOEQRxi0lqLke9k2/7WegC85GgUs9pjmOjCUi3In4vwA==}
-    engines: {node: '>=14.0.0'}
-    peerDependencies:
-      rollup: ^1.20.0||^2.0.0||^3.0.0
+  /@langchain/community@0.0.53(@pinecone-database/pinecone@2.1.0)(ioredis@5.3.2)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mysql2@3.9.7)(pg@8.11.3)(ws@8.14.2):
+    resolution: {integrity: sha512-iFqZPt4MRssGYsQoKSXWJQaYTZCC7WNuilp2JCCs3wKmJK3l6mR0eV+PDrnT+TaDHUVxt/b0rwgM0sOiy0j2jA==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      '@aws-crypto/sha256-js': ^5.0.0
+      '@aws-sdk/client-bedrock-agent-runtime': ^3.485.0
+      '@aws-sdk/client-bedrock-runtime': ^3.422.0
+      '@aws-sdk/client-dynamodb': ^3.310.0
+      '@aws-sdk/client-kendra': ^3.352.0
+      '@aws-sdk/client-lambda': ^3.310.0
+      '@aws-sdk/client-sagemaker-runtime': ^3.310.0
+      '@aws-sdk/client-sfn': ^3.310.0
+      '@aws-sdk/credential-provider-node': ^3.388.0
+      '@azure/search-documents': ^12.0.0
+      '@clickhouse/client': ^0.2.5
+      '@cloudflare/ai': '*'
+      '@datastax/astra-db-ts': ^1.0.0
+      '@elastic/elasticsearch': ^8.4.0
+      '@getmetal/metal-sdk': '*'
+      '@getzep/zep-js': ^0.9.0
+      '@gomomento/sdk': ^1.51.1
+      '@gomomento/sdk-core': ^1.51.1
+      '@google-ai/generativelanguage': ^0.2.1
+      '@gradientai/nodejs-sdk': ^1.2.0
+      '@huggingface/inference': ^2.6.4
+      '@mozilla/readability': '*'
+      '@neondatabase/serverless': '*'
+      '@opensearch-project/opensearch': '*'
+      '@pinecone-database/pinecone': '*'
+      '@planetscale/database': ^1.8.0
+      '@premai/prem-sdk': ^0.3.25
+      '@qdrant/js-client-rest': ^1.8.2
+      '@raycast/api': ^1.55.2
+      '@rockset/client': ^0.9.1
+      '@smithy/eventstream-codec': ^2.0.5
+      '@smithy/protocol-http': ^3.0.6
+      '@smithy/signature-v4': ^2.0.10
+      '@smithy/util-utf8': ^2.0.0
+      '@supabase/postgrest-js': ^1.1.1
+      '@supabase/supabase-js': ^2.10.0
+      '@tensorflow-models/universal-sentence-encoder': '*'
+      '@tensorflow/tfjs-converter': '*'
+      '@tensorflow/tfjs-core': '*'
+      '@upstash/redis': ^1.20.6
+      '@upstash/vector': ^1.0.7
+      '@vercel/kv': ^0.2.3
+      '@vercel/postgres': ^0.5.0
+      '@writerai/writer-sdk': ^0.40.2
+      '@xata.io/client': ^0.28.0
+      '@xenova/transformers': ^2.5.4
+      '@zilliz/milvus2-sdk-node': '>=2.2.7'
+      better-sqlite3: ^9.4.0
+      cassandra-driver: ^4.7.2
+      cborg: ^4.1.1
+      chromadb: '*'
+      closevector-common: 0.1.3
+      closevector-node: 0.1.6
+      closevector-web: 0.1.6
+      cohere-ai: '*'
+      convex: ^1.3.1
+      couchbase: ^4.3.0
+      discord.js: ^14.14.1
+      dria: ^0.0.3
+      duck-duck-scrape: ^2.2.5
+      faiss-node: ^0.5.1
+      firebase-admin: ^11.9.0 || ^12.0.0
+      google-auth-library: ^8.9.0
+      googleapis: ^126.0.1
+      hnswlib-node: ^3.0.0
+      html-to-text: ^9.0.5
+      interface-datastore: ^8.2.11
+      ioredis: ^5.3.2
+      it-all: ^3.0.4
+      jsdom: '*'
+      jsonwebtoken: ^9.0.2
+      llmonitor: ^0.5.9
+      lodash: ^4.17.21
+      lunary: ^0.6.11
+      mongodb: '>=5.2.0'
+      mysql2: ^3.3.3
+      neo4j-driver: '*'
+      node-llama-cpp: '*'
+      pg: ^8.11.0
+      pg-copy-streams: ^6.0.5
+      pickleparser: ^0.2.1
+      portkey-ai: ^0.1.11
+      redis: '*'
+      replicate: ^0.18.0
+      typeorm: ^0.3.12
+      typesense: ^1.5.3
+      usearch: ^1.1.1
+      vectordb: ^0.1.4
+      voy-search: 0.6.2
+      weaviate-ts-client: '*'
+      web-auth-library: ^1.0.3
+      ws: ^8.14.2
     peerDependenciesMeta:
-      rollup:
+      '@aws-crypto/sha256-js':
         optional: true
-    dependencies:
-      '@types/estree': 1.0.0
-      estree-walker: 2.0.2
-      picomatch: 2.3.1
-    dev: true
-
-  /@rudderstack/rudder-sdk-node@1.0.6:
-    resolution: {integrity: sha512-kJYCXv6fRFbQrAp3hMsgRCnAa7RUBdbiGLBT9PcpQURi0VwHmD7mk3Ja7U4HDnL0EHXYJpPyx3oSonkklmPJ9Q==}
-    engines: {node: '>=4'}
-    dependencies:
-      '@segment/loosely-validate-event': 2.0.0
-      auto-changelog: 1.16.4
-      axios: 0.21.4(debug@4.3.2)
-      axios-retry: 3.3.1
-      bull: 3.29.3
-      lodash.clonedeep: 4.5.0
-      lodash.isstring: 4.0.1
-      md5: 2.3.0
-      ms: 2.1.3
-      remove-trailing-slash: 0.1.1
-      serialize-javascript: 5.0.1
-      uuid: 8.3.2
-      winston: 3.8.2
-    transitivePeerDependencies:
-      - debug
-      - encoding
-      - supports-color
-    dev: false
-
-  /@segment/loosely-validate-event@2.0.0:
-    resolution: {integrity: sha512-ZMCSfztDBqwotkl848ODgVcAmN4OItEWDCkshcKz0/W6gGSQayuuCtWV/MlodFivAZD793d6UgANd6wCXUfrIw==}
-    dependencies:
-      component-type: 1.2.1
-      join-component: 1.1.0
-    dev: false
-
-  /@selderee/plugin-htmlparser2@0.6.0:
-    resolution: {integrity: sha512-J3jpy002TyBjd4N/p6s+s90eX42H2eRhK3SbsZuvTDv977/E8p2U3zikdiehyJja66do7FlxLomZLPlvl2/xaA==}
-    dependencies:
-      domhandler: 4.3.1
-      selderee: 0.6.0
-    dev: false
-
-  /@sentry-internal/tracing@7.47.0:
-    resolution: {integrity: sha512-udpHnCzF8DQsWf0gQwd0XFGp6Y8MOiwnl8vGt2ohqZGS3m1+IxoRLXsSkD8qmvN6KKDnwbaAvYnK0z0L+AW95g==}
-    engines: {node: '>=8'}
-    dependencies:
-      '@sentry/core': 7.47.0
-      '@sentry/types': 7.47.0
-      '@sentry/utils': 7.47.0
-      tslib: 2.5.0
-    dev: true
-
-  /@sentry/bundler-plugin-core@0.4.0:
-    resolution: {integrity: sha512-Xi+dqaSOoxbdmxegX7f66FVOxm2dVJLmrMXUpoNyuV6ASoccRWzouGaFekP059SUTTD05ytk1mHqwgVuBCA0Dw==}
-    engines: {node: '>= 10'}
-    dependencies:
-      '@sentry/cli': 2.17.0(patch_hash=nchnoezkq6p37qaiku3vrpwraq)
-      '@sentry/node': 7.28.1
-      '@sentry/tracing': 7.47.0
-      magic-string: 0.27.0
-      unplugin: 1.0.1
-    transitivePeerDependencies:
-      - encoding
-      - supports-color
-    dev: true
-
-  /@sentry/cli@2.17.0(patch_hash=nchnoezkq6p37qaiku3vrpwraq):
-    resolution: {integrity: sha512-CHIMEg8+YNCpEBDgUctu+DvG3S8+g8Zn9jTE5MMGINNmGkQTMG179LuDE04B/inaCYixLVNpFPTe6Iow3tXjnQ==}
-    engines: {node: '>= 10'}
-    hasBin: true
-    dependencies:
-      https-proxy-agent: 5.0.1
-      node-fetch: 2.6.8
-      progress: 2.0.3
-      proxy-from-env: 1.1.0
-      which: 2.0.2
-    transitivePeerDependencies:
-      - encoding
-      - supports-color
-    dev: true
-    patched: true
-
-  /@sentry/core@7.28.1:
-    resolution: {integrity: sha512-7wvnuvn/mrAfcugWoCG/3pqDIrUgH5t+HisMJMGw0h9Tc33KqrmqMDCQVvjlrr2pWrw/vuUCFdm8CbUHJ832oQ==}
-    engines: {node: '>=8'}
-    dependencies:
-      '@sentry/types': 7.28.1
-      '@sentry/utils': 7.28.1
-      tslib: 2.5.0
-
-  /@sentry/core@7.47.0:
-    resolution: {integrity: sha512-EFhZhKdMu7wKmWYZwbgTi8FNZ7Fq+HdlXiZWNz51Bqe3pHmfAkdHtAEs0Buo0v623MKA0CA4EjXIazGUM34XTg==}
-    engines: {node: '>=8'}
-    dependencies:
-      '@sentry/types': 7.47.0
-      '@sentry/utils': 7.47.0
-      tslib: 2.5.0
-    dev: true
-
-  /@sentry/integrations@7.28.1:
-    resolution: {integrity: sha512-opeXVR1L9mZmZcpAs9kX+4JPY7pXhVupy17Sbz+43zd5CshYTveIcttGNPp+EPT3j7mMU+1TMAYZspKqJXtEBQ==}
-    engines: {node: '>=8'}
-    dependencies:
-      '@sentry/types': 7.28.1
-      '@sentry/utils': 7.28.1
-      localforage: 1.10.0
-      tslib: 2.5.0
-    dev: false
-
-  /@sentry/node@7.28.1:
-    resolution: {integrity: sha512-n7AbpJqZJjWPpKNGc55mP7AdQ+XSomS9MZJuZ+Xt2AU52aVwGPI4z9aHUJFSDGaMHHiu/toyPnoUES+XZf6/hw==}
-    engines: {node: '>=8'}
-    dependencies:
-      '@sentry/core': 7.28.1
-      '@sentry/types': 7.28.1
-      '@sentry/utils': 7.28.1
-      cookie: 0.4.2
-      https-proxy-agent: 5.0.1
-      lru_map: 0.3.3
-      tslib: 2.5.0
-    transitivePeerDependencies:
-      - supports-color
-
-  /@sentry/tracing@7.47.0:
-    resolution: {integrity: sha512-hJCpKdekwaFNbCVXxfCz5IxfSEJIKnkPmRSVHITOm5VhKwq2e5kmy4Rn6bzSETwJFSDE8LGbR/3eSfGTqw37XA==}
-    engines: {node: '>=8'}
-    dependencies:
-      '@sentry-internal/tracing': 7.47.0
-    dev: true
-
-  /@sentry/types@7.28.1:
-    resolution: {integrity: sha512-DvSplMVrVEmOzR2M161V5+B8Up3vR71xMqJOpWTzE9TqtFJRGPtqT/5OBsNJJw1+/j2ssMcnKwbEo9Q2EGeS6g==}
-    engines: {node: '>=8'}
-
-  /@sentry/types@7.47.0:
-    resolution: {integrity: sha512-GxXocplN0j1+uczovHrfkykl9wvkamDtWxlPUQgyGlbLGZn+UH1Y79D4D58COaFWGEZdSNKr62gZAjfEYu9nQA==}
-    engines: {node: '>=8'}
-    dev: true
-
-  /@sentry/utils@7.28.1:
-    resolution: {integrity: sha512-75/jzLUO9HH09iC9TslNimGbxOP3jgn89P+q7uR+rp2fJfRExHVeKJZQdK0Ij4/SmE7TJ3Uh2r154N0INZEx1g==}
-    engines: {node: '>=8'}
-    dependencies:
-      '@sentry/types': 7.28.1
-      tslib: 2.5.0
-
-  /@sentry/utils@7.47.0:
-    resolution: {integrity: sha512-A89SaOLp6XeZfByeYo2C8Ecye/YAtk/gENuyOUhQEdMulI6mZdjqtHAp7pTMVgkBc/YNARVuoa+kR/IdRrTPkQ==}
-    engines: {node: '>=8'}
-    dependencies:
-      '@sentry/types': 7.47.0
-      tslib: 2.5.0
-    dev: true
-
-  /@sentry/vite-plugin@0.4.0:
-    resolution: {integrity: sha512-dBxM00MCLzO/idzAqj33ZfbIBKZxP+FzpxtS2WaV0yzad9yLBAFZ/VGDIGHQJC0Qo3fsFi/CZpmN39wJkJoWFA==}
-    engines: {node: '>= 10'}
-    dependencies:
-      '@sentry/bundler-plugin-core': 0.4.0
-    transitivePeerDependencies:
-      - encoding
-      - supports-color
-    dev: true
-
-  /@servie/events@1.0.0:
-    resolution: {integrity: sha512-sBSO19KzdrJCM3gdx6eIxV8M9Gxfgg6iDQmH5TIAGaUu+X9VDdsINXJOnoiZ1Kx3TrHdH4bt5UVglkjsEGBcvw==}
-    dev: false
-
-  /@sideway/address@4.1.4:
-    resolution: {integrity: sha512-7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw==}
-    dependencies:
-      '@hapi/hoek': 9.3.0
-    dev: true
-
-  /@sideway/formula@3.0.0:
-    resolution: {integrity: sha512-vHe7wZ4NOXVfkoRb8T5otiENVlT7a3IAiw7H5M2+GO+9CDgcVUUsX1zalAztCmwyOr2RUTGJdgB+ZvSVqmdHmg==}
-    dev: true
-
-  /@sideway/pinpoint@2.0.0:
-    resolution: {integrity: sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==}
-    dev: true
-
-  /@sinclair/typebox@0.25.21:
-    resolution: {integrity: sha512-gFukHN4t8K4+wVC+ECqeqwzBDeFeTzBXroBTqE6vcWrQGbEUpHO7LYdG0f4xnvYq4VOEwITSlHlp0JBAIFMS/g==}
-    dev: true
-
-  /@sinonjs/commons@2.0.0:
-    resolution: {integrity: sha512-uLa0j859mMrg2slwQYdO/AkrOfmH+X6LTVmNTS9CqexuE2IvVORIkSpJLqePAbEnKJ77aMmCwr1NUZ57120Xcg==}
-    dependencies:
-      type-detect: 4.0.8
-    dev: true
-
-  /@sinonjs/fake-timers@10.0.2:
-    resolution: {integrity: sha512-SwUDyjWnah1AaNl7kxsa7cfLhlTYoiyhDAIgyh+El30YvXs/o7OLXpYH88Zdhyx9JExKrmHDJ+10bwIcY80Jmw==}
-    dependencies:
-      '@sinonjs/commons': 2.0.0
-    dev: true
-
-  /@sqltools/formatter@1.2.5:
-    resolution: {integrity: sha512-Uy0+khmZqUrUGm5dmMqVlnvufZRSK0FbYzVgp0UMstm+F5+W2/jnEEQyc9vo1ZR/E5ZI/B1WjjoTqBqwJL6Krw==}
-    dev: false
-
-  /@storybook/addon-actions@7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-4n/J/MgKsBxt4/p1tsm+EaC8Sq2frNjSL4gkUrMpCB8LASK0onVttd/kSpc41Pck+R/nK812nSrfUhLkEsAGiA==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-    peerDependenciesMeta:
-      react:
+      '@aws-sdk/client-bedrock-agent-runtime':
         optional: true
-      react-dom:
+      '@aws-sdk/client-bedrock-runtime':
         optional: true
-    dependencies:
-      '@storybook/client-logger': 7.0.0-beta.46
-      '@storybook/components': 7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/core-events': 7.0.0-beta.46
-      '@storybook/global': 5.0.0
-      '@storybook/manager-api': 7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/preview-api': 7.0.0-beta.46
-      '@storybook/theming': 7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/types': 7.0.0-beta.46
-      dequal: 2.0.3
-      lodash: 4.17.21
-      polished: 4.2.2
-      prop-types: 15.8.1
-      react: 17.0.2
-      react-dom: 18.2.0(react@17.0.2)
-      react-inspector: 6.0.1(react@17.0.2)
-      telejson: 7.0.4
-      ts-dedent: 2.2.0
-      uuid-browser: 3.1.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@storybook/addon-backgrounds@7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-u2stsYYsEUOiZFDLmAurjemy2yKkGmOgHVoF3LjMdUVejJCCOf/9VyMwqCoe3jif4N5xI5WB/CKtwu3OC5V/5Q==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-    peerDependenciesMeta:
-      react:
+      '@aws-sdk/client-dynamodb':
         optional: true
-      react-dom:
+      '@aws-sdk/client-kendra':
         optional: true
-    dependencies:
-      '@storybook/client-logger': 7.0.0-beta.46
-      '@storybook/components': 7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/core-events': 7.0.0-beta.46
-      '@storybook/global': 5.0.0
-      '@storybook/manager-api': 7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/preview-api': 7.0.0-beta.46
-      '@storybook/theming': 7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/types': 7.0.0-beta.46
-      memoizerific: 1.11.3
-      react: 17.0.2
-      react-dom: 18.2.0(react@17.0.2)
-      ts-dedent: 2.2.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@storybook/addon-controls@7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-iKi86tbeWtBduV6bu/eeXrUGzPi2RE4omN552QjGwMFqP05hJtK2jdrrFi5gYtdbTt/kaIsJGzKPrj9l887lMQ==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-    peerDependenciesMeta:
-      react:
+      '@aws-sdk/client-lambda':
         optional: true
-      react-dom:
+      '@aws-sdk/client-sagemaker-runtime':
         optional: true
-    dependencies:
-      '@storybook/blocks': 7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/client-logger': 7.0.0-beta.46
-      '@storybook/components': 7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/core-common': 7.0.0-beta.46
-      '@storybook/manager-api': 7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/node-logger': 7.0.0-beta.46
-      '@storybook/preview-api': 7.0.0-beta.46
-      '@storybook/theming': 7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/types': 7.0.0-beta.46
-      lodash: 4.17.21
-      react: 17.0.2
-      react-dom: 18.2.0(react@17.0.2)
-      ts-dedent: 2.2.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@storybook/addon-docs@7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-ksdDLwsNxnGHMTlQORRd7LF1J7O2YxXEj9rmoETBPQlKSj0UUW8yRf91mB8oHEbp9wbGC6BVHDUubPJMx9PCCw==}
-    peerDependencies:
-      '@storybook/mdx1-csf': '>=1.0.0-0'
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-    peerDependenciesMeta:
-      '@storybook/mdx1-csf':
-        optional: true
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/plugin-transform-react-jsx': 7.20.7(@babel/core@7.20.12)
-      '@jest/transform': 29.4.2
-      '@mdx-js/react': 2.3.0(react@17.0.2)
-      '@storybook/blocks': 7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/client-logger': 7.0.0-beta.46
-      '@storybook/components': 7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/csf-plugin': 7.0.0-beta.46
-      '@storybook/csf-tools': 7.0.0-beta.46
-      '@storybook/global': 5.0.0
-      '@storybook/mdx2-csf': 1.1.0-next.1
-      '@storybook/node-logger': 7.0.0-beta.46
-      '@storybook/postinstall': 7.0.0-beta.46
-      '@storybook/preview-api': 7.0.0-beta.46
-      '@storybook/theming': 7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/types': 7.0.0-beta.46
-      fs-extra: 11.1.0
-      react: 17.0.2
-      react-dom: 18.2.0(react@17.0.2)
-      remark-external-links: 8.0.0
-      remark-slug: 6.1.0
-      ts-dedent: 2.2.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@storybook/addon-essentials@7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-Chvj4gezsIHzAIplAjJIHhRG5WMoVl4AVCyrTD3E5h/8qqXXsLMDWN3sOl6pl/11OV1F1bhM4fFjgJxn9eGoEA==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-    dependencies:
-      '@storybook/addon-actions': 7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/addon-backgrounds': 7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/addon-controls': 7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/addon-docs': 7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/addon-highlight': 7.0.0-beta.46
-      '@storybook/addon-measure': 7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/addon-outline': 7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/addon-toolbars': 7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/addon-viewport': 7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/core-common': 7.0.0-beta.46
-      '@storybook/manager-api': 7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/node-logger': 7.0.0-beta.46
-      '@storybook/preview-api': 7.0.0-beta.46
-      react: 17.0.2
-      react-dom: 18.2.0(react@17.0.2)
-      ts-dedent: 2.2.0
-    transitivePeerDependencies:
-      - '@storybook/mdx1-csf'
-      - supports-color
-    dev: true
-
-  /@storybook/addon-highlight@7.0.0-beta.46:
-    resolution: {integrity: sha512-bMwOdhIRofIG/MJvR5TxFWDWoBWhVC8xTgiytjSjzpo4HxWxUspCAC7mrriZ0QZvHGeTm8uk/P/3IRcb1EPIZA==}
-    dependencies:
-      '@storybook/core-events': 7.0.0-beta.46
-      '@storybook/global': 5.0.0
-      '@storybook/preview-api': 7.0.0-beta.46
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@storybook/addon-links@7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-m5WZ/AVzkb4sHvu/25CQ4EjlHTr+T9enh5cHZD9c5frEpFX4gwOczcYirMKFzEI93dDkv6LX1Yo51hOOpJrhrg==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-    peerDependenciesMeta:
-      react:
+      '@aws-sdk/client-sfn':
         optional: true
-      react-dom:
+      '@aws-sdk/credential-provider-node':
         optional: true
-    dependencies:
-      '@storybook/client-logger': 7.0.0-beta.46
-      '@storybook/core-events': 7.0.0-beta.46
-      '@storybook/csf': 0.1.2-next.0
-      '@storybook/global': 5.0.0
-      '@storybook/manager-api': 7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/preview-api': 7.0.0-beta.46
-      '@storybook/router': 7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/types': 7.0.0-beta.46
-      prop-types: 15.8.1
-      react: 17.0.2
-      react-dom: 18.2.0(react@17.0.2)
-      ts-dedent: 2.2.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@storybook/addon-measure@7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-jvwvcvJ9YEhScRy51GUTSVDQSbNnhbMYQXTbvWjuzSV3RJolSx+lT+ILNblF6QptK5GKpM0GBKGLd1e5oXUlhA==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-    peerDependenciesMeta:
-      react:
+      '@azure/search-documents':
         optional: true
-      react-dom:
+      '@clickhouse/client':
         optional: true
-    dependencies:
-      '@storybook/client-logger': 7.0.0-beta.46
-      '@storybook/components': 7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/core-events': 7.0.0-beta.46
-      '@storybook/global': 5.0.0
-      '@storybook/manager-api': 7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/preview-api': 7.0.0-beta.46
-      '@storybook/types': 7.0.0-beta.46
-      react: 17.0.2
-      react-dom: 18.2.0(react@17.0.2)
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@storybook/addon-outline@7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-hENg4a2lDeTVM9xuI0nHRsL/QMVTlmvtr2dOEOUul9gtwSjmssZ3Hr8LIeujp2WbSOL8xwx9s1NP15LCb367YQ==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-    peerDependenciesMeta:
-      react:
+      '@cloudflare/ai':
         optional: true
-      react-dom:
+      '@datastax/astra-db-ts':
         optional: true
-    dependencies:
-      '@storybook/client-logger': 7.0.0-beta.46
-      '@storybook/components': 7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/core-events': 7.0.0-beta.46
-      '@storybook/global': 5.0.0
-      '@storybook/manager-api': 7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/preview-api': 7.0.0-beta.46
-      '@storybook/types': 7.0.0-beta.46
-      react: 17.0.2
-      react-dom: 18.2.0(react@17.0.2)
-      ts-dedent: 2.2.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@storybook/addon-postcss@3.0.0-alpha.1(webpack@5.75.0):
-    resolution: {integrity: sha512-j3DB//h89ctz0Orh1N4AHuzdzYhbL5XhUdh1V5rJ6tPOhHZ57v60tS4owukY4nE5gqM345lbuXK6MjbSZPqZdQ==}
-    engines: {node: '>=14', yarn: ^1.17.0}
-    dependencies:
-      '@storybook/node-logger': 6.5.15
-      css-loader: 3.6.0(webpack@5.75.0)
-      postcss: 7.0.39
-      postcss-loader: 4.3.0(postcss@7.0.39)(webpack@5.75.0)
-      style-loader: 1.3.0(webpack@5.75.0)
-    transitivePeerDependencies:
-      - webpack
-    dev: true
-
-  /@storybook/addon-toolbars@7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-kC12SbWTOROE7IO82Ctl/wX/MXVhwkPia0zj9DbGul2xAwj59L5ZlWMdM+bG73VpSgbFDRIy3UZikSDgXUs/Ig==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-    peerDependenciesMeta:
-      react:
+      '@elastic/elasticsearch':
         optional: true
-      react-dom:
+      '@getmetal/metal-sdk':
         optional: true
-    dependencies:
-      '@storybook/client-logger': 7.0.0-beta.46
-      '@storybook/components': 7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/manager-api': 7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/preview-api': 7.0.0-beta.46
-      '@storybook/theming': 7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2)
-      react: 17.0.2
-      react-dom: 18.2.0(react@17.0.2)
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@storybook/addon-viewport@7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-vKINgaKSl1czI54Kh3Q7Rx9KsxjdCg1aeKW2cFxztBi1OlcKxjb85hnfhreyGlSphjsKRaQtX9fPGPRwdcaPTQ==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-    peerDependenciesMeta:
-      react:
+      '@getzep/zep-js':
         optional: true
-      react-dom:
+      '@gomomento/sdk':
         optional: true
-    dependencies:
-      '@storybook/client-logger': 7.0.0-beta.46
-      '@storybook/components': 7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/core-events': 7.0.0-beta.46
-      '@storybook/global': 5.0.0
-      '@storybook/manager-api': 7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/preview-api': 7.0.0-beta.46
-      '@storybook/theming': 7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2)
-      memoizerific: 1.11.3
-      prop-types: 15.8.1
-      react: 17.0.2
-      react-dom: 18.2.0(react@17.0.2)
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@storybook/addons@6.5.15(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-xT31SuSX+kYGyxCNK2nqL7WTxucs3rSmhiCLovJcUjYk+QquV3c2c53Ki7lwwdDbzfXFcNAe0HJ4hoTN4jhn0Q==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-    dependencies:
-      '@storybook/api': 6.5.15(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/channels': 6.5.15
-      '@storybook/client-logger': 6.5.15
-      '@storybook/core-events': 6.5.15
-      '@storybook/csf': 0.0.2--canary.4566f4d.1
-      '@storybook/router': 6.5.15(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/theming': 6.5.15(react-dom@18.2.0)(react@17.0.2)
-      '@types/webpack-env': 1.18.0
-      core-js: 3.27.2
-      global: 4.4.0
-      react: 17.0.2
-      react-dom: 18.2.0(react@17.0.2)
-      regenerator-runtime: 0.13.11
-    dev: true
-
-  /@storybook/addons@7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-p2My3VkxPm3bzpV+giiM9zXt0fWnBN0UI4CXOroXlzPiTuxpJJcSXY65K4hHVuV4tvVRX023kQ0r+sEjxEaQSg==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-    dependencies:
-      '@storybook/manager-api': 7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/preview-api': 7.0.0-beta.46
-      '@storybook/types': 7.0.0-beta.46
-      react: 17.0.2
-      react-dom: 18.2.0(react@17.0.2)
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@storybook/api@6.5.15(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-BBE0KXKvj1/3jTghbIoWfrcDM0t+xO7EYtWWAXD6XlhGsZVD2Dy82Z52ONyLulMDRpMWl0OYy3h6A1YnFUH25w==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-    dependencies:
-      '@storybook/channels': 6.5.15
-      '@storybook/client-logger': 6.5.15
-      '@storybook/core-events': 6.5.15
-      '@storybook/csf': 0.0.2--canary.4566f4d.1
-      '@storybook/router': 6.5.15(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/semver': 7.3.2
-      '@storybook/theming': 6.5.15(react-dom@18.2.0)(react@17.0.2)
-      core-js: 3.27.2
-      fast-deep-equal: 3.1.3
-      global: 4.4.0
-      lodash: 4.17.21
-      memoizerific: 1.11.3
-      react: 17.0.2
-      react-dom: 18.2.0(react@17.0.2)
-      regenerator-runtime: 0.13.11
-      store2: 2.14.2
-      telejson: 6.0.8
-      ts-dedent: 2.2.0
-      util-deprecate: 1.0.2
-    dev: true
-
-  /@storybook/api@7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-S42ZsT8uU2FNrCHVOtNEm5Wqebymu9S6iWXN/QSreQdrX2mvqcvbPbcFOa2nfNnUiBHrCjzF2ZySV1WnsJxtOQ==}
-    dependencies:
-      '@storybook/client-logger': 7.0.0-beta.46
-      '@storybook/manager-api': 7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2)
-    transitivePeerDependencies:
-      - react
-      - react-dom
-      - supports-color
-    dev: true
-
-  /@storybook/blocks@7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-ziNMCAtJbZ2RnWx95iA7TAYRKugjDbt7/qp0yNHrEpwS5ddQOb3O6Yb7BbNDrAhhJ/oapDtyelSZJYM7BL6gSQ==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-    dependencies:
-      '@storybook/channels': 7.0.0-beta.46
-      '@storybook/client-logger': 7.0.0-beta.46
-      '@storybook/components': 7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/core-events': 7.0.0-beta.46
-      '@storybook/csf': 0.1.2-next.0
-      '@storybook/docs-tools': 7.0.0-beta.46
-      '@storybook/global': 5.0.0
-      '@storybook/manager-api': 7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/preview-api': 7.0.0-beta.46
-      '@storybook/theming': 7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/types': 7.0.0-beta.46
-      '@types/lodash': 4.14.191
-      color-convert: 2.0.1
-      dequal: 2.0.3
-      lodash: 4.17.21
-      markdown-to-jsx: 7.1.9(react@17.0.2)
-      memoizerific: 1.11.3
-      polished: 4.2.2
-      react: 17.0.2
-      react-colorful: 5.6.1(react-dom@18.2.0)(react@17.0.2)
-      react-dom: 18.2.0(react@17.0.2)
-      ts-dedent: 2.2.0
-      util-deprecate: 1.0.2
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@storybook/builder-manager@7.0.0-beta.46:
-    resolution: {integrity: sha512-uQ4pAr2/gcdgZPmnxvA51VQxyZGh44TuDuoJB1IOcIenh/U5PPZ5VqCDrB8ONU46bKy32uzxz/Xpd9nHedIUiA==}
-    dependencies:
-      '@fal-works/esbuild-plugin-global-externals': 2.1.2
-      '@storybook/core-common': 7.0.0-beta.46
-      '@storybook/manager': 7.0.0-beta.46
-      '@storybook/node-logger': 7.0.0-beta.46
-      '@types/ejs': 3.1.1
-      '@types/find-cache-dir': 3.2.1
-      '@yarnpkg/esbuild-plugin-pnp': 3.0.0-rc.15(esbuild@0.16.17)
-      browser-assert: 1.2.1
-      ejs: 3.1.8
-      esbuild: 0.16.17
-      esbuild-plugin-alias: 0.2.1
-      express: 4.18.2
-      find-cache-dir: 3.3.2
-      fs-extra: 11.1.0
-      process: 0.11.10
-      slash: 3.0.0
-      util: 0.12.5
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@storybook/builder-webpack5@7.0.0-beta.46(esbuild@0.16.17)(react-dom@18.2.0)(react@17.0.2)(typescript@5.0.3)(vue-template-compiler@2.7.14):
-    resolution: {integrity: sha512-1pvo9IDlz836hiDFmALVttQxw4ehSd3UEhE6Yz0B+TMl4cAQuSRWze8w2sI474tiHtGeKGRoIIWmH5hSVQvFrQ==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
+      '@gomomento/sdk-core':
         optional: true
-    dependencies:
-      '@babel/core': 7.20.12
-      '@storybook/addons': 7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/api': 7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/channel-postmessage': 7.0.0-beta.46
-      '@storybook/channel-websocket': 7.0.0-beta.46
-      '@storybook/channels': 7.0.0-beta.46
-      '@storybook/client-api': 7.0.0-beta.46
-      '@storybook/client-logger': 7.0.0-beta.46
-      '@storybook/components': 7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/core-common': 7.0.0-beta.46
-      '@storybook/core-events': 7.0.0-beta.46
-      '@storybook/core-webpack': 7.0.0-beta.46
-      '@storybook/global': 5.0.0
-      '@storybook/manager-api': 7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/node-logger': 7.0.0-beta.46
-      '@storybook/preview': 7.0.0-beta.46
-      '@storybook/preview-api': 7.0.0-beta.46
-      '@storybook/router': 7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/store': 7.0.0-beta.46
-      '@storybook/theming': 7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2)
-      '@types/node': 16.18.12
-      '@types/semver': 7.3.13
-      babel-loader: 9.1.2(@babel/core@7.20.12)(webpack@5.75.0)
-      babel-plugin-named-exports-order: 0.0.2
-      browser-assert: 1.2.1
-      case-sensitive-paths-webpack-plugin: 2.4.0
-      css-loader: 6.7.3(webpack@5.75.0)
-      express: 4.18.2
-      fork-ts-checker-webpack-plugin: 6.5.2(typescript@5.0.3)(vue-template-compiler@2.7.14)(webpack@5.75.0)
-      fs-extra: 11.1.0
-      html-webpack-plugin: 5.5.0(webpack@5.75.0)
-      path-browserify: 1.0.1
-      process: 0.11.10
-      react: 17.0.2
-      react-dom: 18.2.0(react@17.0.2)
-      semver: 7.3.8
-      slash: 3.0.0
-      style-loader: 3.3.1(webpack@5.75.0)
-      terser-webpack-plugin: 5.3.6(esbuild@0.16.17)(webpack@5.75.0)
-      ts-dedent: 2.2.0
-      typescript: 5.0.3
-      util: 0.12.5
-      util-deprecate: 1.0.2
-      webpack: 5.75.0(esbuild@0.16.17)
-      webpack-dev-middleware: 5.3.3(webpack@5.75.0)
-      webpack-hot-middleware: 2.25.3
-      webpack-virtual-modules: 0.4.6
-    transitivePeerDependencies:
-      - '@swc/core'
-      - esbuild
-      - eslint
-      - supports-color
-      - uglify-js
-      - vue-template-compiler
-      - webpack-cli
-    dev: true
-
-  /@storybook/channel-postmessage@7.0.0-beta.46:
-    resolution: {integrity: sha512-bJ7/9J1vHrm4czBzB1gNV6N6eYVP2JQJjteMjyul1ujS6PhC243GB2PTlQDwrE9MuPGIP1Qv6dSgs9bMQeXNVg==}
-    dependencies:
-      '@storybook/channels': 7.0.0-beta.46
-      '@storybook/client-logger': 7.0.0-beta.46
-      '@storybook/core-events': 7.0.0-beta.46
-      '@storybook/global': 5.0.0
-      qs: 6.11.0
-      telejson: 7.0.4
-    dev: true
-
-  /@storybook/channel-websocket@7.0.0-beta.46:
-    resolution: {integrity: sha512-Y/d3aXpytu8yVws2sPrFyXPvtM+clAfo4WU5g3YvpPMO/K6bohfpVtucLrHIvq/lFDdoK3nWwi9AhqPe2E1YKg==}
-    dependencies:
-      '@storybook/channels': 7.0.0-beta.46
-      '@storybook/client-logger': 7.0.0-beta.46
-      '@storybook/global': 5.0.0
-      telejson: 7.0.4
-    dev: true
-
-  /@storybook/channels@6.5.15:
-    resolution: {integrity: sha512-gPpsBgirv2NCXbH4WbYqdkI0JLE96aiVuu7UEWfn9yu071pQ9CLHbhXGD9fSFNrfOkyBBY10ppSE7uCXw3Wexg==}
-    dependencies:
-      core-js: 3.27.2
-      ts-dedent: 2.2.0
-      util-deprecate: 1.0.2
-    dev: true
-
-  /@storybook/channels@7.0.0-beta.46:
-    resolution: {integrity: sha512-fNsUiWe+K+jnHyeG1WrUrJDGHmO/QLOek0Ly+5j2LhV7PG4S/33IUVShux4yfZIMJwtrVtaawM306q1uJofFaw==}
-    dev: true
-
-  /@storybook/cli@7.0.0-beta.46:
-    resolution: {integrity: sha512-4JTTnW0GlQzp6KCPMRxNjKwpFoaywXAUn2pXfXaI44WCLdT7IjHEEvK5Z5kwAW9cc+2mGT7tMqy0Xwd+acvMDQ==}
-    hasBin: true
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/preset-env': 7.20.2(@babel/core@7.20.12)
-      '@storybook/codemod': 7.0.0-beta.46
-      '@storybook/core-common': 7.0.0-beta.46
-      '@storybook/core-server': 7.0.0-beta.46
-      '@storybook/csf-tools': 7.0.0-beta.46
-      '@storybook/node-logger': 7.0.0-beta.46
-      '@storybook/telemetry': 7.0.0-beta.46
-      '@storybook/types': 7.0.0-beta.46
-      '@types/semver': 7.3.13
-      boxen: 5.1.2
-      chalk: 4.1.2
-      commander: 6.2.1
-      cross-spawn: 7.0.3
-      detect-indent: 6.1.0
-      envinfo: 7.8.1
-      execa: 5.1.1
-      express: 4.18.2
-      find-up: 5.0.0
-      fs-extra: 11.1.0
-      get-port: 5.1.1
-      giget: 1.0.0
-      globby: 11.1.0
-      jscodeshift: 0.14.0(@babel/preset-env@7.20.2)
-      leven: 3.1.0
-      prompts: 2.4.2
-      puppeteer-core: 2.1.1
-      read-pkg-up: 7.0.1
-      semver: 7.3.8
-      shelljs: 0.8.5
-      simple-update-notifier: 1.0.7
-      strip-json-comments: 3.1.1
-      tempy: 1.0.1
-      ts-dedent: 2.2.0
-      util-deprecate: 1.0.2
-    transitivePeerDependencies:
-      - bufferutil
-      - encoding
-      - supports-color
-      - utf-8-validate
-    dev: true
-
-  /@storybook/client-api@7.0.0-beta.46:
-    resolution: {integrity: sha512-cpCI6tMExvgfI+xfuzZItFrntz4PTTWSek9RG8E5SGZjKGg0vEuCaEBNIOK8PX5sRvqbFCfg6xqLZh8ZwW8Upg==}
-    dependencies:
-      '@storybook/client-logger': 7.0.0-beta.46
-      '@storybook/preview-api': 7.0.0-beta.46
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@storybook/client-logger@6.5.15:
-    resolution: {integrity: sha512-0uyxKvodq+FycGv6aUwC1wUR6suXf2+7ywMFAOlYolI4UvNj8NyU/5AfgKT5XnxYAgPmoCiAjOE700TrfHrosw==}
-    dependencies:
-      core-js: 3.27.2
-      global: 4.4.0
-    dev: true
-
-  /@storybook/client-logger@7.0.0-beta.46:
-    resolution: {integrity: sha512-dehsFk2DDrxY1l+HtsILCw4MQTw4/7XBpAWK01dR4xOagCZvmGJqVRouDVqZJBB3NAEw1uSKR5Jy+2teu9sCOA==}
-    dependencies:
-      '@storybook/global': 5.0.0
-    dev: true
-
-  /@storybook/codemod@7.0.0-beta.46:
-    resolution: {integrity: sha512-UZZIwogqqpsdkSNBWXZgpYjRIQN/cIJIkwL0Tt7fba6sx31HMCUdyiTBXQC6YvzoF/w2FWx/JRFBFqs9E7XpjA==}
-    dependencies:
-      '@babel/core': 7.21.5
-      '@babel/preset-env': 7.20.2(@babel/core@7.21.5)
-      '@babel/types': 7.20.7
-      '@storybook/csf': 0.1.2-next.0
-      '@storybook/csf-tools': 7.0.0-beta.46
-      '@storybook/node-logger': 7.0.0-beta.46
-      '@storybook/types': 7.0.0-beta.46
-      cross-spawn: 7.0.3
-      globby: 11.1.0
-      jscodeshift: 0.14.0(@babel/preset-env@7.20.2)
-      lodash: 4.17.21
-      prettier: 2.8.3
-      recast: 0.23.1
-      util: 0.12.5
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@storybook/components@6.5.15(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-bHTT0Oa3s4g+MBMaLBbX9ofMtb1AW59AzIUNGrfqW1XqJMGuUHMiJ7TSo+i5dRSFpbFygnwMEG9LfHxpR2Z0Dw==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-    dependencies:
-      '@storybook/client-logger': 6.5.15
-      '@storybook/csf': 0.0.2--canary.4566f4d.1
-      '@storybook/theming': 6.5.15(react-dom@18.2.0)(react@17.0.2)
-      core-js: 3.27.2
-      memoizerific: 1.11.3
-      qs: 6.11.0
-      react: 17.0.2
-      react-dom: 18.2.0(react@17.0.2)
-      regenerator-runtime: 0.13.11
-      util-deprecate: 1.0.2
-    dev: true
-
-  /@storybook/components@7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-/rwNE7BHJ7RXDNC53yQCAb1JH56QJG7n258jxDJ0OSCAtTsaxfa2VPVJHDqEllnOh2VsbC1jF5msfGHoMbAV0A==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-    dependencies:
-      '@storybook/client-logger': 7.0.0-beta.46
-      '@storybook/csf': 0.1.2-next.0
-      '@storybook/global': 5.0.0
-      '@storybook/theming': 7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/types': 7.0.0-beta.46
-      memoizerific: 1.11.3
-      react: 17.0.2
-      react-dom: 18.2.0(react@17.0.2)
-      use-resize-observer: 9.1.0(react-dom@18.2.0)(react@17.0.2)
-      util-deprecate: 1.0.2
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@storybook/core-client@7.0.0-beta.46:
-    resolution: {integrity: sha512-XEYjS6z+HL5tpriLFSoWPnJbZ04PdN1YNb3mn0GhPUZuCBWqjssH1T5gt5w5L2ZEbsiWBLHBbs34tQLWCGsnTg==}
-    dependencies:
-      '@storybook/client-logger': 7.0.0-beta.46
-      '@storybook/preview-api': 7.0.0-beta.46
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@storybook/core-common@7.0.0-beta.46:
-    resolution: {integrity: sha512-NerwE0237uqFpnLMWrsk0J0IAU3A/VD7GBiCWdySz4sgKFv2aFV9m/Rbucoo4jHhAbZs2B4a+q4vvVIZvse0Hw==}
-    dependencies:
-      '@babel/core': 7.20.12
-      '@storybook/node-logger': 7.0.0-beta.46
-      '@storybook/types': 7.0.0-beta.46
-      '@types/babel__core': 7.20.0
-      '@types/express': 4.17.14
-      '@types/node': 16.18.12
-      '@types/pretty-hrtime': 1.0.1
-      chalk: 4.1.2
-      esbuild: 0.16.17
-      esbuild-register: 3.4.2(esbuild@0.16.17)
-      express: 4.18.2
-      file-system-cache: 2.0.2
-      find-up: 5.0.0
-      fs-extra: 11.1.0
-      glob: 8.1.0
-      glob-promise: 6.0.2(glob@8.1.0)
-      handlebars: 4.7.7
-      lazy-universal-dotenv: 4.0.0
-      picomatch: 2.3.1
-      pkg-dir: 5.0.0
-      pretty-hrtime: 1.0.3
-      resolve-from: 5.0.0
-      slash: 3.0.0
-      ts-dedent: 2.2.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@storybook/core-events@6.5.15:
-    resolution: {integrity: sha512-B1Ba6l5W7MeNclclqMMTMHgYgfdpB5SIhNCQFnzIz8blynzRhNFMdxvbAl6Je5G0S4xydYYd7Lno2kXQebs7HA==}
-    dependencies:
-      core-js: 3.27.2
-    dev: true
-
-  /@storybook/core-events@7.0.0-beta.46:
-    resolution: {integrity: sha512-ogC+bHeMsmpZuEiKWCUdgncATgDsnPTDqumgV99fXDWrYpt2KUePsZSBSTaI97lTZqko3WN1GTBbqqZ0OrerHw==}
-    dev: true
-
-  /@storybook/core-server@7.0.0-beta.46:
-    resolution: {integrity: sha512-QKEfI1Aoi69fnP52UzZfG6DEtc+gWKqJjbTiIq/RA+4OXEQiRne/Z8I2NopSCrTKJTwidEJ2K0OcVimhFxHERQ==}
-    dependencies:
-      '@aw-web-design/x-default-browser': 1.4.88
-      '@discoveryjs/json-ext': 0.5.7
-      '@storybook/builder-manager': 7.0.0-beta.46
-      '@storybook/core-common': 7.0.0-beta.46
-      '@storybook/core-events': 7.0.0-beta.46
-      '@storybook/csf': 0.1.2-next.0
-      '@storybook/csf-tools': 7.0.0-beta.46
-      '@storybook/docs-mdx': 0.1.1-next.3
-      '@storybook/global': 5.0.0
-      '@storybook/manager': 7.0.0-beta.46
-      '@storybook/node-logger': 7.0.0-beta.46
-      '@storybook/preview-api': 7.0.0-beta.46
-      '@storybook/telemetry': 7.0.0-beta.46
-      '@storybook/types': 7.0.0-beta.46
-      '@types/detect-port': 1.3.2
-      '@types/node': 16.18.12
-      '@types/node-fetch': 2.6.2
-      '@types/pretty-hrtime': 1.0.1
-      '@types/semver': 7.3.13
-      better-opn: 2.1.1
-      boxen: 5.1.2
-      chalk: 4.1.2
-      cli-table3: 0.6.3
-      compression: 1.7.4
-      detect-port: 1.5.1
-      express: 4.18.2
-      fs-extra: 11.1.0
-      globby: 11.1.0
-      ip: 2.0.0
-      lodash: 4.17.21
-      node-fetch: 2.6.8
-      open: 8.4.0
-      pretty-hrtime: 1.0.3
-      prompts: 2.4.2
-      read-pkg-up: 7.0.1
-      semver: 7.3.8
-      serve-favicon: 2.5.0
-      slash: 3.0.0
-      telejson: 7.0.4
-      ts-dedent: 2.2.0
-      util-deprecate: 1.0.2
-      watchpack: 2.4.0
-      ws: 8.12.0
-    transitivePeerDependencies:
-      - bufferutil
-      - encoding
-      - supports-color
-      - utf-8-validate
-    dev: true
-
-  /@storybook/core-webpack@7.0.0-beta.46:
-    resolution: {integrity: sha512-YpPLECzWcZQ1+U78FkX5Ec9bOpx7tOqoBpBgQP4gGShZZA6v3oe8Q8UDAe84SzNxkH/d/AWsIpu0bIhK/WWgtg==}
-    dependencies:
-      '@storybook/core-common': 7.0.0-beta.46
-      '@storybook/node-logger': 7.0.0-beta.46
-      '@storybook/types': 7.0.0-beta.46
-      '@types/node': 16.18.12
-      ts-dedent: 2.2.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@storybook/csf-plugin@7.0.0-beta.46:
-    resolution: {integrity: sha512-8FQKNajJQWCF1NA8MGZI0+GtlulLSBRmj4e7cP+0NCVs49ypslRpWQRFMRaTibYgMlOvCsGpZLgYMNghRbiJSg==}
-    dependencies:
-      '@storybook/csf-tools': 7.0.0-beta.46
-      unplugin: 0.10.2
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@storybook/csf-tools@7.0.0-beta.46:
-    resolution: {integrity: sha512-H7zXfL1wf/1jWi5MaFISt/taxE41fgpV/uLfi5CHcHLX9ZgeQs2B/2utpUgwvBsxiL+E/jKAt5cLeuZCIvglMg==}
-    dependencies:
-      '@babel/types': 7.20.7
-      '@storybook/csf': 0.1.2-next.0
-      '@storybook/types': 7.0.0-beta.46
-      fs-extra: 11.1.0
-      recast: 0.23.1
-      ts-dedent: 2.2.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@storybook/csf@0.0.2--canary.4566f4d.1:
-    resolution: {integrity: sha512-9OVvMVh3t9znYZwb0Svf/YQoxX2gVOeQTGe2bses2yj+a3+OJnCrUF3/hGv6Em7KujtOdL2LL+JnG49oMVGFgQ==}
-    dependencies:
-      lodash: 4.17.21
-    dev: true
-
-  /@storybook/csf@0.1.2-next.0:
-    resolution: {integrity: sha512-Kf9XPAnO9VBxxYWNiW3pc1t7lDZ178VFfTCVWOm9r6Fdzm94j3zUNT06WiOojblVVaKsJktk8cT9b27Fmcxs5Q==}
-    dependencies:
-      type-fest: 2.19.0
-    dev: true
-
-  /@storybook/docs-mdx@0.1.1-next.3:
-    resolution: {integrity: sha512-gdjVot7Lphf1LZnd9Bi3d3bCVMxDEoJGId1fYpaABpx+sMxeO3w2QA24fPeHa8jlRsEPY/W1p34jxPmu57KaHQ==}
-    dev: true
-
-  /@storybook/docs-tools@7.0.0-beta.46:
-    resolution: {integrity: sha512-lTZyjz6PspoCEpelIKznEfoHCQIchxhtHAtU/OJIbZIk1Hu2AuMOOJiD7yEC8lD2yhlO4XNR/ZegxPidzdPfeA==}
-    dependencies:
-      '@babel/core': 7.20.12
-      '@storybook/core-common': 7.0.0-beta.46
-      '@storybook/preview-api': 7.0.0-beta.46
-      '@storybook/types': 7.0.0-beta.46
-      '@types/doctrine': 0.0.3
-      doctrine: 3.0.0
-      lodash: 4.17.21
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@storybook/global@5.0.0:
-    resolution: {integrity: sha512-FcOqPAXACP0I3oJ/ws6/rrPT9WGhu915Cg8D02a9YxLo0DE9zI+a9A5gRGvmQ09fiWPukqI8ZAEoQEdWUKMQdQ==}
-    dev: true
-
-  /@storybook/manager-api@7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-9GvE1h/jbQ2rkMXahJ4oHlPynyffXwIlKiDFgdDyauZquh7uLDc+ANLLoppzf4EGD7QVcGJ31SU9EUhTjqYQCw==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-    dependencies:
-      '@storybook/channels': 7.0.0-beta.46
-      '@storybook/client-logger': 7.0.0-beta.46
-      '@storybook/core-events': 7.0.0-beta.46
-      '@storybook/csf': 0.1.2-next.0
-      '@storybook/global': 5.0.0
-      '@storybook/router': 7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/theming': 7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/types': 7.0.0-beta.46
-      dequal: 2.0.3
-      lodash: 4.17.21
-      memoizerific: 1.11.3
-      react: 17.0.2
-      react-dom: 18.2.0(react@17.0.2)
-      semver: 7.3.8
-      store2: 2.14.2
-      telejson: 7.0.4
-      ts-dedent: 2.2.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@storybook/manager@7.0.0-beta.46:
-    resolution: {integrity: sha512-0Tsm47YM3SU9rvPpXxp6/toQ1DDUrIbZt1pXcj72szLZvi7U/fXTMpsBX9gOB1MNVYIYRqS2V+jcO8UjFd4qyQ==}
-    dev: true
-
-  /@storybook/mdx2-csf@1.1.0-next.1:
-    resolution: {integrity: sha512-ONvFBZySHsBIkUYGrUM8FCG2tDKf663TIErztPSOghOpmBGyFLjSsXJHkNWiRi4c740PoemLqJd2XZZVlXRVLQ==}
-    dev: true
-
-  /@storybook/node-logger@6.5.15:
-    resolution: {integrity: sha512-LQjjbfMuUXm7wZTBKb+iGeCNnej4r1Jb2NxG3Svu2bVhaoB6u33jHAcbmhXpXW1jghzW3kQwOU7BoLuJiRRFIw==}
-    dependencies:
-      '@types/npmlog': 4.1.4
-      chalk: 4.1.2
-      core-js: 3.27.2
-      npmlog: 5.0.1
-      pretty-hrtime: 1.0.3
-    dev: true
-
-  /@storybook/node-logger@7.0.0-beta.46:
-    resolution: {integrity: sha512-EEf9apXHZuYRrwuFckwg/0InAr/TRTllqJjo5E+fH5UWDRr3aRSrDFb57C84FwP8cY/aKMf+quPQZ7/LoDqpzQ==}
-    dependencies:
-      '@types/npmlog': 4.1.4
-      chalk: 4.1.2
-      npmlog: 5.0.1
-      pretty-hrtime: 1.0.3
-    dev: true
-
-  /@storybook/postinstall@7.0.0-beta.46:
-    resolution: {integrity: sha512-tQ6hv57SPVxyOYPQzhlrhkuKs3Nk4Efa1DN9bzYg5jEzXbeZ9uK4jmV9TDQdWv0QeAvK81SD1YNI2OtzbLPVgA==}
-    dev: true
-
-  /@storybook/preset-vue-webpack@7.0.0-beta.46(@babel/core@7.21.5)(@babel/preset-env@7.20.2)(babel-loader@9.1.2)(css-loader@6.7.3)(esbuild@0.16.17)(typescript@5.0.3)(vue-loader@15.10.1)(vue-template-compiler@2.7.14)(vue@2.7.14):
-    resolution: {integrity: sha512-X40UKuFlXV5lQuVrdP4jBEkPwf+9whXqJwNnBMlQICU/SEwC5oE2sqi7cFU5sZ8DBVzqDunxCE0rfYETeliyyw==}
-    engines: {node: '>=16.0.0'}
-    peerDependencies:
-      '@babel/core': '*'
-      babel-loader: ^7.0.0 || ^8.0.0 || ^9.0.0
-      css-loader: '*'
-      vue: ^2.6.8
-      vue-loader: ^15.7.0
-      vue-template-compiler: ^2.6.14
-    dependencies:
-      '@babel/core': 7.21.5
-      '@storybook/core-webpack': 7.0.0-beta.46
-      '@storybook/docs-tools': 7.0.0-beta.46
-      '@types/node': 16.18.12
-      babel-loader: 9.1.2(@babel/core@7.21.5)(webpack@5.75.0)
-      css-loader: 6.7.3(webpack@5.75.0)
-      ts-loader: 9.4.2(typescript@5.0.3)(webpack@5.75.0)
-      vue: 2.7.14
-      vue-docgen-api: 4.56.4(vue@2.7.14)
-      vue-docgen-loader: 1.5.1(@babel/preset-env@7.20.2)(vue-docgen-api@4.56.4)(webpack@5.75.0)
-      vue-loader: 15.10.1(css-loader@6.7.3)(react-dom@18.2.0)(react@17.0.2)(vue-template-compiler@2.7.14)(webpack@5.75.0)
-      vue-template-compiler: 2.7.14
-      webpack: 5.75.0(esbuild@0.16.17)
-    transitivePeerDependencies:
-      - '@babel/preset-env'
-      - '@swc/core'
-      - esbuild
-      - supports-color
-      - typescript
-      - uglify-js
-      - webpack-cli
-    dev: true
-
-  /@storybook/preview-api@7.0.0-beta.46:
-    resolution: {integrity: sha512-sEfdUk9rMcIrCKYA9q6/735VUGRaQvGaUpATjy468WOhXwUgASFjBvRk6w0xu/lpfcnIcPwoDVpbYR17kKvzTg==}
-    dependencies:
-      '@storybook/channel-postmessage': 7.0.0-beta.46
-      '@storybook/channels': 7.0.0-beta.46
-      '@storybook/client-logger': 7.0.0-beta.46
-      '@storybook/core-events': 7.0.0-beta.46
-      '@storybook/csf': 0.1.2-next.0
-      '@storybook/global': 5.0.0
-      '@storybook/types': 7.0.0-beta.46
-      '@types/qs': 6.9.7
-      dequal: 2.0.3
-      lodash: 4.17.21
-      memoizerific: 1.11.3
-      qs: 6.11.0
-      slash: 3.0.0
-      synchronous-promise: 2.0.16
-      ts-dedent: 2.2.0
-      util-deprecate: 1.0.2
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@storybook/preview@7.0.0-beta.46:
-    resolution: {integrity: sha512-4k62e85sR6Cyl0O7ZeCct/pE0v+tjIjGhHDs9U0AZbfBJlSppazRAP51q6v1QdF2eWDgdRbn3oTQnW8rdCBeMg==}
-    dev: true
-
-  /@storybook/router@6.5.15(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-9t8rI8t7/Krolau29gsdjdbRQ66orONIyP0efp0EukVgv6reNFzb/U14ARrl0uHys6Tl5Xyece9FoakQUdn8Kg==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-    dependencies:
-      '@storybook/client-logger': 6.5.15
-      core-js: 3.27.2
-      memoizerific: 1.11.3
-      qs: 6.11.0
-      react: 17.0.2
-      react-dom: 18.2.0(react@17.0.2)
-      regenerator-runtime: 0.13.11
-    dev: true
-
-  /@storybook/router@7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-W0mrFxILTrOvM2nca2WfXenHHnblX9gPOEfXBrw+0ZQ2eyuXPCPCgNMHfz+ZXVIVOTJHQ5NCgq5Fbpwrrz+P1A==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-    dependencies:
-      '@storybook/client-logger': 7.0.0-beta.46
-      memoizerific: 1.11.3
-      qs: 6.11.0
-      react: 17.0.2
-      react-dom: 18.2.0(react@17.0.2)
-    dev: true
-
-  /@storybook/semver@7.3.2:
-    resolution: {integrity: sha512-SWeszlsiPsMI0Ps0jVNtH64cI5c0UF3f7KgjVKJoNP30crQ6wUSddY2hsdeczZXEKVJGEn50Q60flcGsQGIcrg==}
-    engines: {node: '>=10'}
-    hasBin: true
-    dependencies:
-      core-js: 3.27.2
-      find-up: 4.1.0
-    dev: true
-
-  /@storybook/store@7.0.0-beta.46:
-    resolution: {integrity: sha512-gGe6RuBp4ZFYKzvZrYaxc8rNbVWWKaq8mFfKzL2NJ7o0o9zrcW7GVT6Klfr4JP3+slPhPt0KQTH9FL33/6T8VA==}
-    dependencies:
-      '@storybook/client-logger': 7.0.0-beta.46
-      '@storybook/preview-api': 7.0.0-beta.46
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@storybook/telemetry@7.0.0-beta.46:
-    resolution: {integrity: sha512-sDdE0GZDOYzyoZ2Z4o4ei1WVyJp3Ac5u3ZPldZKYxen4mFhM+vVbDvpwkvp8aXrO59L9I8aleyEMjmTFqJWhjw==}
-    dependencies:
-      '@storybook/client-logger': 7.0.0-beta.46
-      '@storybook/core-common': 7.0.0-beta.46
-      chalk: 4.1.2
-      detect-package-manager: 2.0.1
-      fetch-retry: 5.0.3
-      fs-extra: 11.1.0
-      isomorphic-unfetch: 3.1.0
-      nanoid: 3.3.4
-      read-pkg-up: 7.0.1
-    transitivePeerDependencies:
-      - encoding
-      - supports-color
-    dev: true
-
-  /@storybook/theming@6.5.15(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-pgdW0lVZKKXQ4VhIfLHycMmwFSVOY7vLTKnytag4Y8Yz+aXm0bwDN/QxPntFzDH47F1Rcy2ywNnvty8ooDTvuA==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-    dependencies:
-      '@storybook/client-logger': 6.5.15
-      core-js: 3.27.2
-      memoizerific: 1.11.3
-      react: 17.0.2
-      react-dom: 18.2.0(react@17.0.2)
-      regenerator-runtime: 0.13.11
-    dev: true
-
-  /@storybook/theming@7.0.0-beta.46(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-Zhiu8gEWgUoHYP8VMCXuI1TyjG+MwMDLqooFGoNoaX/p0Fg+orf+Y4u1J8eXUMv75tlPEoBvmAv8pa8REvxYGw==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-    dependencies:
-      '@emotion/use-insertion-effect-with-fallbacks': 1.0.0(react@17.0.2)
-      '@storybook/client-logger': 7.0.0-beta.46
-      '@storybook/global': 5.0.0
-      memoizerific: 1.11.3
-      react: 17.0.2
-      react-dom: 18.2.0(react@17.0.2)
-    dev: true
-
-  /@storybook/types@7.0.0-beta.46:
-    resolution: {integrity: sha512-I5nf8aDYmkM3FqlBAqr2SxnIp16iydvjSegShHEeraXDs9wSqbyAlYuw8m2WcN+bGA2qqhGUGEWbJv5bY3WaTQ==}
-    dependencies:
-      '@babel/core': 7.20.12
-      '@storybook/channels': 7.0.0-beta.46
-      '@types/babel__core': 7.20.0
-      '@types/express': 4.17.14
-      express: 4.18.2
-      file-system-cache: 2.0.2
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@storybook/vue-webpack5@7.0.0-beta.46(@babel/core@7.21.5)(@babel/preset-env@7.20.2)(babel-loader@9.1.2)(css-loader@6.7.3)(esbuild@0.16.17)(react-dom@18.2.0)(react@17.0.2)(typescript@5.0.3)(vue-loader@15.10.1)(vue-template-compiler@2.7.14)(vue@2.7.14):
-    resolution: {integrity: sha512-PJJo/NGiWL1raOfHpJTb3X6LmLAC2TgI3EV2nDlkPigxj29O+zeMkyvfDky7eWpgOIbVqqtNVUYGH1GwbL7jqw==}
-    engines: {node: '>=16.0.0'}
-    peerDependencies:
-      '@babel/core': '*'
-      babel-loader: ^7.0.0 || ^8.0.0 || ^9.0.0
-      css-loader: '*'
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-      vue: ^2.6.8
-      vue-loader: ^15.7.0
-      vue-template-compiler: ^2.6.8
-    dependencies:
-      '@babel/core': 7.21.5
-      '@storybook/builder-webpack5': 7.0.0-beta.46(esbuild@0.16.17)(react-dom@18.2.0)(react@17.0.2)(typescript@5.0.3)(vue-template-compiler@2.7.14)
-      '@storybook/core-common': 7.0.0-beta.46
-      '@storybook/preset-vue-webpack': 7.0.0-beta.46(@babel/core@7.21.5)(@babel/preset-env@7.20.2)(babel-loader@9.1.2)(css-loader@6.7.3)(esbuild@0.16.17)(typescript@5.0.3)(vue-loader@15.10.1)(vue-template-compiler@2.7.14)(vue@2.7.14)
-      '@storybook/vue': 7.0.0-beta.46(@babel/core@7.21.5)(babel-loader@9.1.2)(css-loader@6.7.3)(vue@2.7.14)
-      '@types/node': 16.18.12
-      babel-loader: 9.1.2(@babel/core@7.21.5)(webpack@5.75.0)
-      css-loader: 6.7.3(webpack@5.75.0)
-      react: 17.0.2
-      react-dom: 18.2.0(react@17.0.2)
-      vue: 2.7.14
-      vue-loader: 15.10.1(css-loader@6.7.3)(react-dom@18.2.0)(react@17.0.2)(vue-template-compiler@2.7.14)(webpack@5.75.0)
-      vue-template-compiler: 2.7.14
-    transitivePeerDependencies:
-      - '@babel/preset-env'
-      - '@swc/core'
-      - esbuild
-      - eslint
-      - supports-color
-      - typescript
-      - uglify-js
-      - webpack-cli
-    dev: true
-
-  /@storybook/vue@7.0.0-beta.46(@babel/core@7.21.5)(babel-loader@9.1.2)(css-loader@6.7.3)(vue@2.7.14):
-    resolution: {integrity: sha512-ULUZ78BuHKbz98VmmdqstDOh+rBSDAoxUlwr3hTOfoK84HyxpXizab8BK4lCK+DkYvxeUduDcHn9aT3VbjGbsA==}
-    engines: {node: '>=16.0.0'}
-    peerDependencies:
-      '@babel/core': '*'
-      babel-loader: ^7.0.0 || ^8.0.0 || ^9.0.0
-      css-loader: '*'
-      vue: ^2.6.8
-    peerDependenciesMeta:
-      babel-loader:
+      '@google-ai/generativelanguage':
+        optional: true
+      '@gradientai/nodejs-sdk':
+        optional: true
+      '@huggingface/inference':
+        optional: true
+      '@mozilla/readability':
+        optional: true
+      '@neondatabase/serverless':
+        optional: true
+      '@opensearch-project/opensearch':
+        optional: true
+      '@pinecone-database/pinecone':
+        optional: true
+      '@planetscale/database':
+        optional: true
+      '@premai/prem-sdk':
+        optional: true
+      '@qdrant/js-client-rest':
+        optional: true
+      '@raycast/api':
+        optional: true
+      '@rockset/client':
+        optional: true
+      '@smithy/eventstream-codec':
+        optional: true
+      '@smithy/protocol-http':
+        optional: true
+      '@smithy/signature-v4':
+        optional: true
+      '@smithy/util-utf8':
+        optional: true
+      '@supabase/postgrest-js':
+        optional: true
+      '@supabase/supabase-js':
+        optional: true
+      '@tensorflow-models/universal-sentence-encoder':
+        optional: true
+      '@tensorflow/tfjs-converter':
+        optional: true
+      '@tensorflow/tfjs-core':
+        optional: true
+      '@upstash/redis':
+        optional: true
+      '@upstash/vector':
+        optional: true
+      '@vercel/kv':
+        optional: true
+      '@vercel/postgres':
+        optional: true
+      '@writerai/writer-sdk':
+        optional: true
+      '@xata.io/client':
+        optional: true
+      '@xenova/transformers':
+        optional: true
+      '@zilliz/milvus2-sdk-node':
+        optional: true
+      better-sqlite3:
+        optional: true
+      cassandra-driver:
+        optional: true
+      cborg:
+        optional: true
+      chromadb:
+        optional: true
+      closevector-common:
+        optional: true
+      closevector-node:
+        optional: true
+      closevector-web:
+        optional: true
+      cohere-ai:
+        optional: true
+      convex:
+        optional: true
+      couchbase:
+        optional: true
+      discord.js:
+        optional: true
+      dria:
+        optional: true
+      duck-duck-scrape:
+        optional: true
+      faiss-node:
+        optional: true
+      firebase-admin:
+        optional: true
+      google-auth-library:
+        optional: true
+      googleapis:
+        optional: true
+      hnswlib-node:
+        optional: true
+      html-to-text:
+        optional: true
+      interface-datastore:
+        optional: true
+      ioredis:
+        optional: true
+      it-all:
+        optional: true
+      jsdom:
+        optional: true
+      jsonwebtoken:
+        optional: true
+      llmonitor:
+        optional: true
+      lodash:
+        optional: true
+      lunary:
+        optional: true
+      mongodb:
+        optional: true
+      mysql2:
+        optional: true
+      neo4j-driver:
+        optional: true
+      node-llama-cpp:
+        optional: true
+      pg:
+        optional: true
+      pg-copy-streams:
+        optional: true
+      pickleparser:
+        optional: true
+      portkey-ai:
+        optional: true
+      redis:
+        optional: true
+      replicate:
+        optional: true
+      typeorm:
+        optional: true
+      typesense:
+        optional: true
+      usearch:
+        optional: true
+      vectordb:
+        optional: true
+      voy-search:
+        optional: true
+      weaviate-ts-client:
+        optional: true
+      web-auth-library:
+        optional: true
+      ws:
         optional: true
     dependencies:
-      '@babel/core': 7.21.5
-      '@storybook/client-logger': 7.0.0-beta.46
-      '@storybook/core-client': 7.0.0-beta.46
-      '@storybook/docs-tools': 7.0.0-beta.46
-      '@storybook/global': 5.0.0
-      '@storybook/preview-api': 7.0.0-beta.46
-      '@storybook/types': 7.0.0-beta.46
-      babel-loader: 9.1.2(@babel/core@7.21.5)(webpack@5.75.0)
-      css-loader: 6.7.3(webpack@5.75.0)
-      ts-dedent: 2.2.0
-      type-fest: 2.19.0
-      vue: 2.7.14
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@techteamer/ocsp@1.0.0:
-    resolution: {integrity: sha512-lNAOoFHaZN+4huo30ukeqVrUmfC+avoEBYQ11QAnAw1PFhnI5oBCg8O/TNiCoEWix7gNGBIEjrQwtPREqKMPog==}
-    dependencies:
-      asn1.js: 5.4.1
-      asn1.js-rfc2560: 5.0.1(asn1.js@5.4.1)
-      asn1.js-rfc5280: 3.0.0
-      async: 3.2.4
-      simple-lru-cache: 0.0.2
-    dev: false
-
-  /@tediousjs/connection-string@0.3.0:
-    resolution: {integrity: sha512-d/keJiNKfpHo+GmSB8QcsAwBx8h+V1UbdozA5TD+eSLXprNY53JAYub47J9evsSKWDdNG5uVj0FiMozLKuzowQ==}
-    dev: false
-
-  /@testing-library/dom@7.31.2:
-    resolution: {integrity: sha512-3UqjCpey6HiTZT92vODYLPxTBWlM8ZOOjr3LX5F37/VRipW2M1kX6I/Cm4VXzteZqfGfagg8yXywpcOgQBlNsQ==}
-    engines: {node: '>=10'}
-    dependencies:
-      '@babel/code-frame': 7.18.6
-      '@babel/runtime': 7.20.7
-      '@types/aria-query': 4.2.2
-      aria-query: 4.2.2
-      chalk: 4.1.2
-      dom-accessibility-api: 0.5.15
-      lz-string: 1.4.4
-      pretty-format: 26.6.2
-    dev: true
-
-  /@testing-library/jest-dom@5.16.5:
-    resolution: {integrity: sha512-N5ixQ2qKpi5OLYfwQmUb/5mSV9LneAcaUfp32pn4yCnpb8r/Yz0pXFPck21dIicKmi+ta5WRAknkZCfA8refMA==}
-    engines: {node: '>=8', npm: '>=6', yarn: '>=1'}
-    dependencies:
-      '@adobe/css-tools': 4.0.2
-      '@babel/runtime': 7.20.7
-      '@types/testing-library__jest-dom': 5.14.5
-      aria-query: 5.1.3
-      chalk: 3.0.0
-      css.escape: 1.5.1
-      dom-accessibility-api: 0.5.15
-      lodash: 4.17.21
-      redent: 3.0.0
-    dev: true
-
-  /@testing-library/user-event@14.4.3(@testing-library/dom@7.31.2):
-    resolution: {integrity: sha512-kCUc5MEwaEMakkO5x7aoD+DLi02ehmEM2QCGWvNqAS1dV/fAvORWEjnjsEIvml59M7Y5kCkWN6fCCyPOe8OL6Q==}
-    engines: {node: '>=12', npm: '>=6'}
-    peerDependencies:
-      '@testing-library/dom': '>=7.21.4'
-    dependencies:
-      '@testing-library/dom': 7.31.2
-    dev: true
-
-  /@testing-library/vue@5.8.3(vue-template-compiler@2.7.14)(vue@2.7.14):
-    resolution: {integrity: sha512-M6+QqP1xuFHixKOeXF9pCLbtiyJZRKfJRP+unBf6Ljm7aS1V2CSS95oTetFoblaj0W1+AC9XJgwmUDtlLoaakQ==}
-    engines: {node: '>10.18'}
-    peerDependencies:
-      vue: ^2.6.10
-      vue-template-compiler: ^2.6.10
-    dependencies:
-      '@babel/runtime': 7.19.4
-      '@testing-library/dom': 7.31.2
-      '@vue/test-utils': 1.3.0(vue-template-compiler@2.7.14)(vue@2.7.14)
-      vue: 2.7.14
-      vue-template-compiler: 2.7.14
-    dev: true
-
-  /@tokenizer/token@0.3.0:
-    resolution: {integrity: sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A==}
-    dev: false
-
-  /@tootallnate/once@1.1.2:
-    resolution: {integrity: sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==}
-    engines: {node: '>= 6'}
-    dev: false
-
-  /@tootallnate/once@2.0.0:
-    resolution: {integrity: sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==}
-    engines: {node: '>= 10'}
-
-  /@tsconfig/node10@1.0.9:
-    resolution: {integrity: sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==}
-
-  /@tsconfig/node12@1.0.11:
-    resolution: {integrity: sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==}
-
-  /@tsconfig/node14@1.0.3:
-    resolution: {integrity: sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==}
-
-  /@tsconfig/node16@1.0.4:
-    resolution: {integrity: sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==}
-
-  /@types/amqplib@0.10.1:
-    resolution: {integrity: sha512-j6ANKT79ncUDnAs/+9r9eDujxbeJoTjoVu33gHHcaPfmLQaMhvfbH2GqSe8KUM444epAp1Vl3peVOQfZk3UIqA==}
-    dependencies:
-      '@types/node': 16.18.12
-    dev: true
-
-  /@types/aria-query@4.2.2:
-    resolution: {integrity: sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig==}
-    dev: true
-
-  /@types/asn1@0.2.0:
-    resolution: {integrity: sha512-5TMxIpYbIA9c1J0hYQjQDX3wr+rTgQEAXaW2BI8ECM8FO53wSW4HFZplTalrKSHuZUc76NtXcePRhwuOHqGD5g==}
-    dependencies:
-      '@types/node': 16.18.12
-
-  /@types/aws4@1.11.2:
-    resolution: {integrity: sha512-x0f96eBPrCCJzJxdPbUvDFRva4yPpINJzTuXXpmS2j9qLUpF2nyGzvXPlRziuGbCsPukwY4JfuO+8xwsoZLzGw==}
-    dependencies:
-      '@types/node': 16.18.12
-    dev: true
-
-  /@types/babel__core@7.20.0:
-    resolution: {integrity: sha512-+n8dL/9GWblDO0iU6eZAwEIJVr5DWigtle+Q6HLOrh/pdbXOhOtqzq8VPPE2zvNJzSKY4vH/z3iT3tn0A3ypiQ==}
-    dependencies:
-      '@babel/parser': 7.21.5
-      '@babel/types': 7.21.5
-      '@types/babel__generator': 7.6.4
-      '@types/babel__template': 7.4.1
-      '@types/babel__traverse': 7.18.2
-    dev: true
-
-  /@types/babel__generator@7.6.4:
-    resolution: {integrity: sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==}
-    dependencies:
-      '@babel/types': 7.20.7
-    dev: true
-
-  /@types/babel__template@7.4.1:
-    resolution: {integrity: sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==}
-    dependencies:
-      '@babel/parser': 7.20.7
-      '@babel/types': 7.20.7
-    dev: true
-
-  /@types/babel__traverse@7.18.2:
-    resolution: {integrity: sha512-FcFaxOr2V5KZCviw1TnutEMVUVsGt4D2hP1TAfXZAMKuHYW3xQhe3jTxNPWutgCJ3/X1c5yX8ZoGVEItxKbwBg==}
-    dependencies:
-      '@babel/types': 7.20.7
-    dev: true
-
-  /@types/basic-auth@1.1.3:
-    resolution: {integrity: sha512-W3rv6J0IGlxqgE2eQ2pTb0gBjaGtejQpJ6uaCjz3UQ65+TFTPC5/lAE+POfx1YLdjtxvejJzsIAfd3MxWiVmfg==}
-    dependencies:
-      '@types/node': 16.18.12
-    dev: true
-
-  /@types/bcryptjs@2.4.2:
-    resolution: {integrity: sha512-LiMQ6EOPob/4yUL66SZzu6Yh77cbzJFYll+ZfaPiPPFswtIlA/Fs1MzdKYA7JApHU49zQTbJGX3PDmCpIdDBRQ==}
-    dev: true
-
-  /@types/bluebird@3.5.37:
-    resolution: {integrity: sha512-g2qEd+zkfkTEudA2SrMAeAvY7CrFqtbsLILm2dT2VIeKTqMqVzcdfURlvu6FU3srRgbmXN1Srm94pg34EIehww==}
-    dev: true
-
-  /@types/body-parser-xml@2.0.2:
-    resolution: {integrity: sha512-LlmFkP3BTfacofFevInpM8iZ6+hALZ9URUt5JpSw76irhHCdbqbcBtbxbu2MO8HUGoIROQ5wuB55rLS99xNgCg==}
-    dependencies:
-      '@types/body-parser': 1.19.2
-      '@types/connect': 3.4.35
-      '@types/express-serve-static-core': 4.17.31
-      '@types/node': 16.18.12
-      '@types/xml2js': 0.4.11
-    dev: true
-
-  /@types/body-parser@1.19.2:
-    resolution: {integrity: sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==}
-    dependencies:
-      '@types/connect': 3.4.35
-      '@types/node': 16.18.12
-
-  /@types/canvas-confetti@1.6.0:
-    resolution: {integrity: sha512-Yq6rIccwcco0TLD5SMUrIM7Fk7Fe/C0jmNRxJJCLtAF6gebDkPuUjK5EHedxecm69Pi/aA+It39Ux4OHmFhjRw==}
-    dev: true
-
-  /@types/caseless@0.12.2:
-    resolution: {integrity: sha512-6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w==}
-    dev: true
-
-  /@types/chai-subset@1.3.3:
-    resolution: {integrity: sha512-frBecisrNGz+F4T6bcc+NLeolfiojh5FxW2klu669+8BARtyQv2C/GkNW6FUodVe4BroGMP/wER/YDGc7rEllw==}
-    dependencies:
-      '@types/chai': 4.3.4
-    dev: true
-
-  /@types/chai@4.3.4:
-    resolution: {integrity: sha512-KnRanxnpfpjUTqTCXslZSEdLfXExwgNxYPdiO2WGUj8+HDjFi8R3k5RVKPeSCzLjCcshCAtVO2QBbVuAV4kTnw==}
-    dev: true
-
-  /@types/cheerio@0.22.31:
-    resolution: {integrity: sha512-Kt7Cdjjdi2XWSfrZ53v4Of0wG3ZcmaegFXjMmz9tfNrZSkzzo36G0AL1YqSdcIA78Etjt6E609pt5h1xnQkPUw==}
-    dependencies:
-      '@types/node': 16.18.12
-    dev: true
-
-  /@types/compression@1.0.1:
-    resolution: {integrity: sha512-GuoIYzD70h+4JUqUabsm31FGqvpCYHGKcLtor7nQ/YvUyNX0o9SJZ9boFI5HjFfbOda5Oe/XOvNK6FES8Y/79w==}
-    dependencies:
-      '@types/express': 4.17.14
-    dev: true
-
-  /@types/concat-stream@2.0.0:
-    resolution: {integrity: sha512-t3YCerNM7NTVjLuICZo5gYAXYoDvpuuTceCcFQWcDQz26kxUR5uIWolxbIR5jRNIXpMqhOpW/b8imCR1LEmuJw==}
-    dependencies:
-      '@types/node': 16.18.12
-    dev: true
-
-  /@types/connect-history-api-fallback@1.3.5:
-    resolution: {integrity: sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw==}
-    dependencies:
-      '@types/express-serve-static-core': 4.17.31
-      '@types/node': 16.18.12
-    dev: true
-
-  /@types/connect@3.4.35:
-    resolution: {integrity: sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==}
-    dependencies:
-      '@types/node': 16.18.12
-
-  /@types/convict@6.1.1:
-    resolution: {integrity: sha512-R+JLaTvhsD06p4jyjUDtbd5xMtZTRE3c0iI+lrFWZogSVEjgTWPYwvJPVf+t92E+yrlbXa4X4Eg9ro6gPdUt4w==}
-    dependencies:
-      '@types/node': 16.18.12
-    dev: true
-
-  /@types/cookie-parser@1.4.3:
-    resolution: {integrity: sha512-CqSKwFwefj4PzZ5n/iwad/bow2hTCh0FlNAeWLtQM3JA/NX/iYagIpWG2cf1bQKQ2c9gU2log5VUCrn7LDOs0w==}
-    dependencies:
-      '@types/express': 4.17.14
-    dev: true
-
-  /@types/cookiejar@2.1.2:
-    resolution: {integrity: sha512-t73xJJrvdTjXrn4jLS9VSGRbz0nUY3cl2DMGDU48lKl+HR9dbbjW2A9r3g40VA++mQpy6uuHg33gy7du2BKpog==}
-    dev: true
-
-  /@types/cron@1.7.3:
-    resolution: {integrity: sha512-iPmUXyIJG1Js+ldPYhOQcYU3kCAQ2FWrSkm1FJPoii2eYSn6wEW6onPukNTT0bfiflexNSRPl6KWmAIqS+36YA==}
-    dependencies:
-      '@types/node': 16.18.12
-      moment: 2.29.4
-    dev: true
-
-  /@types/crypto-js@4.1.1:
-    resolution: {integrity: sha512-BG7fQKZ689HIoc5h+6D2Dgq1fABRa0RbBWKBd9SP/MVRVXROflpm5fhwyATX5duFmbStzyzyycPB8qUYKDH3NA==}
-    dev: true
-
-  /@types/dateformat@3.0.1:
-    resolution: {integrity: sha512-KlPPdikagvL6ELjWsljbyDIPzNCeliYkqRpI+zea99vBBbCIA5JNshZAwQKTON139c87y9qvTFVgkFd14rtS4g==}
-    dev: true
-
-  /@types/deep-equal@1.0.1:
-    resolution: {integrity: sha512-mMUu4nWHLBlHtxXY17Fg6+ucS/MnndyOWyOe7MmwkoMYxvfQU2ajtRaEvqSUv+aVkMqH/C0NCI8UoVfRNQ10yg==}
-    dev: true
-
-  /@types/detect-port@1.3.2:
-    resolution: {integrity: sha512-xxgAGA2SAU4111QefXPSp5eGbDm/hW6zhvYl9IeEPZEry9F4d66QAHm5qpUXjb6IsevZV/7emAEx5MhP6O192g==}
-    dev: true
-
-  /@types/doctrine@0.0.3:
-    resolution: {integrity: sha512-w5jZ0ee+HaPOaX25X2/2oGR/7rgAQSYII7X7pp0m9KgBfMP7uKfMfTvcpl5Dj+eDBbpxKGiqE+flqDr6XTd2RA==}
-    dev: true
-
-  /@types/ejs@3.1.1:
-    resolution: {integrity: sha512-RQul5wEfY7BjWm0sYY86cmUN/pcXWGyVxWX93DFFJvcrxax5zKlieLwA3T77xJGwNcZW0YW6CYG70p1m8xPFmA==}
-    dev: true
-
-  /@types/es-aggregate-error@1.0.2:
-    resolution: {integrity: sha512-erqUpFXksaeR2kejKnhnjZjbFxUpGZx4Z7ydNL9ie8tEhXPiZTsLeUDJ6aR1F8j5wWUAtOAQWUqkc7givBJbBA==}
-    dependencies:
-      '@types/node': 16.18.12
+      '@langchain/core': 0.1.61
+      '@langchain/openai': 0.0.28
+      '@pinecone-database/pinecone': 2.1.0
+      expr-eval: 2.0.2
+      flat: 5.0.2
+      ioredis: 5.3.2
+      jsonwebtoken: 9.0.2
+      langsmith: 0.1.12
+      lodash: 4.17.21
+      mysql2: 3.9.7
+      pg: 8.11.3
+      uuid: 9.0.1
+      ws: 8.14.2
+      zod: 3.22.4
+      zod-to-json-schema: 3.22.5(zod@3.22.4)
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
     dev: false
 
-  /@types/eslint-scope@3.7.4:
-    resolution: {integrity: sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==}
-    dependencies:
-      '@types/eslint': 8.37.0
-      '@types/estree': 1.0.0
-    dev: true
-
-  /@types/eslint@8.37.0:
-    resolution: {integrity: sha512-Piet7dG2JBuDIfohBngQ3rCt7MgO9xCO4xIMKxBThCq5PNRB91IjlJ10eJVwfoNtvTErmxLzwBZ7rHZtbOMmFQ==}
-    dependencies:
-      '@types/estree': 1.0.0
-      '@types/json-schema': 7.0.11
-    dev: true
-
-  /@types/estree@0.0.51:
-    resolution: {integrity: sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==}
-    dev: true
-
-  /@types/estree@1.0.0:
-    resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
-    dev: true
-
-  /@types/eventsource@1.1.9:
-    resolution: {integrity: sha512-F3K4oyM12o8W9jxuJmW+1sc8kdw0Hj0t+26urwkcolPJTgkfppEfIdftdcXmUU2QPBIwcrYO6diqgIqgCDf1FA==}
-    dev: true
-
-  /@types/express-serve-static-core@4.17.31:
-    resolution: {integrity: sha512-DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q==}
-    dependencies:
-      '@types/node': 16.18.12
-      '@types/qs': 6.9.7
-      '@types/range-parser': 1.2.4
-
-  /@types/express@4.17.14:
-    resolution: {integrity: sha512-TEbt+vaPFQ+xpxFLFssxUDXj5cWCxZJjIcB7Yg0k0GMHGtgtQgpvx/MUQUeAkNbA9AAGrwkAsoeItdTgS7FMyg==}
-    dependencies:
-      '@types/body-parser': 1.19.2
-      '@types/express-serve-static-core': 4.17.31
-      '@types/qs': 6.9.7
-      '@types/serve-static': 1.15.0
-
-  /@types/file-saver@2.0.5:
-    resolution: {integrity: sha512-zv9kNf3keYegP5oThGLaPk8E081DFDuwfqjtiTzm6PoxChdJ1raSuADf2YGCVIyrSynLrgc8JWv296s7Q7pQSQ==}
-    dev: true
-
-  /@types/find-cache-dir@3.2.1:
-    resolution: {integrity: sha512-frsJrz2t/CeGifcu/6uRo4b+SzAwT4NYCVPu1GN8IB9XTzrpPkGuV0tmh9mN+/L0PklAlsC3u5Fxt0ju00LXIw==}
-    dev: true
-
-  /@types/formidable@1.2.5:
-    resolution: {integrity: sha512-zu3mQJa4hDNubEMViSj937602XdDGzK7Q5pJ5QmLUbNxclbo9tZGt5jtwM352ssZ+pqo5V4H14TBvT/ALqQQcA==}
-    dependencies:
-      '@types/node': 16.18.12
-    dev: true
-
-  /@types/ftp@0.3.33:
-    resolution: {integrity: sha512-L7wFlX3t9GsGgNS0oxLt6zbAZZGgsdptMmciL4cdxHmbL3Hz4Lysh8YqAR34eHsJ1uacJITcZBBDl5XpQlxPpQ==}
-    dependencies:
-      '@types/node': 16.18.12
-    dev: true
-
-  /@types/generic-pool@3.1.11:
-    resolution: {integrity: sha512-3mcD3ewmaKPbiAZglGj8We4ohlSMfw/xS+bbYUhTv/ALgqrrtJjyL4Ju9IgapXooBCTFEew5LAKQqzZV6/43xg==}
-    dependencies:
-      '@types/node': 16.18.12
-    dev: true
-
-  /@types/glob@8.0.0:
-    resolution: {integrity: sha512-l6NQsDDyQUVeoTynNpC9uRvCUint/gSUXQA2euwmTuWGvPY5LSDUu6tkCtJB2SvGQlJQzLaKqcGZP4//7EDveA==}
-    dependencies:
-      '@types/minimatch': 5.1.2
-      '@types/node': 16.18.12
-    dev: true
-
-  /@types/gm@1.25.0:
-    resolution: {integrity: sha512-y0nI4vp+0Vtsve+daADIHeSckm11TnWAdC4CBq2BEXTg+CfJiolnsnzsXeIEuIpBCksjN26LUZlvQKJDpthw5g==}
-    dependencies:
-      '@types/node': 16.18.12
-    dev: true
-
-  /@types/graceful-fs@4.1.6:
-    resolution: {integrity: sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==}
-    dependencies:
-      '@types/node': 16.18.12
-    dev: true
-
-  /@types/html-minifier-terser@6.1.0:
-    resolution: {integrity: sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==}
-    dev: true
-
-  /@types/humanize-duration@3.27.1:
-    resolution: {integrity: sha512-K3e+NZlpCKd6Bd/EIdqjFJRFHbrq5TzPPLwREk5Iv/YoIjQrs6ljdAUCo+Lb2xFlGNOjGSE0dqsVD19cZL137w==}
-    dev: true
-
-  /@types/imap-simple@4.2.5:
-    resolution: {integrity: sha512-Sfu70sdFXzVIhivsflpanlED8gZr4VRzz2AVU9i1ARU8gskr9nDd4tVGkqYtxfwajQfZDklkXbeHSOZYEeJmTQ==}
-    dependencies:
-      '@types/imap': 0.8.35
-      '@types/node': 16.18.12
-    dev: true
-
-  /@types/imap@0.8.35:
-    resolution: {integrity: sha512-4Tk8lGFvRFYCEaHxb2BZFZPs2XiYBSboEbb1Kq1oBqA2aRqPV0pjzyXGpMKi9jILsDPlrG7s0EFnnh8qb3h3ww==}
-    dependencies:
-      '@types/node': 16.18.12
-    dev: true
-
-  /@types/inquirer@6.5.0:
-    resolution: {integrity: sha512-rjaYQ9b9y/VFGOpqBEXRavc3jh0a+e6evAbI31tMda8VlPaSy0AZJfXsvmIe3wklc7W6C3zCSfleuMXR7NOyXw==}
-    dependencies:
-      '@types/through': 0.0.30
-      rxjs: 6.6.7
-    dev: true
-
-  /@types/is-function@1.0.1:
-    resolution: {integrity: sha512-A79HEEiwXTFtfY+Bcbo58M2GRYzCr9itHWzbzHVFNEYCcoU/MMGwYYf721gBrnhpj1s6RGVVha/IgNFnR0Iw/Q==}
-    dev: true
-
-  /@types/istanbul-lib-coverage@2.0.4:
-    resolution: {integrity: sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==}
-    dev: true
-
-  /@types/istanbul-lib-report@3.0.0:
-    resolution: {integrity: sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==}
+  /@langchain/core@0.1.61:
+    resolution: {integrity: sha512-C8OkAly+ugvXsL8TACCmFv9WTTcT4gvQaG6NbrXCOzibBCywfxxcTqEMOyg3zIKpxHEmR0DHqh0OiJRHocnsCg==}
+    engines: {node: '>=18'}
     dependencies:
-      '@types/istanbul-lib-coverage': 2.0.4
-    dev: true
+      ansi-styles: 5.2.0
+      camelcase: 6.3.0
+      decamelize: 1.2.0
+      js-tiktoken: 1.0.8
+      langsmith: 0.1.12
+      ml-distance: 4.0.1
+      mustache: 4.2.0
+      p-queue: 6.6.2
+      p-retry: 4.6.2
+      uuid: 9.0.1
+      zod: 3.22.4
+      zod-to-json-schema: 3.22.4(zod@3.22.4)
+    dev: false
+
+  /@langchain/google-genai@0.0.12:
+    resolution: {integrity: sha512-NDARJ+ZxjlkTHDvNroiG6V+3gW0u0OlMvbDEYAAXR6wFGIV09//ekolr+bA290ZCN77Ei+BEOsd6Ax1wBk3Z4w==}
+    engines: {node: '>=18'}
+    dependencies:
+      '@google/generative-ai': 0.7.1
+      '@langchain/core': 0.1.61
+    dev: false
+
+  /@langchain/groq@0.0.8:
+    resolution: {integrity: sha512-xqbe35K+12fiYtC/uqkaTT4AXxqL5uvhCrHzc+nBoFkTwM6YfTFE1ch95RZ5G2JnK1U9pKAre/trUSzlU1/6Kg==}
+    engines: {node: '>=18'}
+    dependencies:
+      '@langchain/core': 0.1.61
+      '@langchain/openai': 0.0.28
+      groq-sdk: 0.3.2
+      zod: 3.22.4
+      zod-to-json-schema: 3.22.5(zod@3.22.4)
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
+    dev: false
 
-  /@types/istanbul-reports@3.0.1:
-    resolution: {integrity: sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==}
+  /@langchain/mistralai@0.0.19:
+    resolution: {integrity: sha512-Uin/jve1NCZLAFa9dpOKzE3Y2+uSnMJQX5ria9vO3lnTGRlvBwcMhyGDoTYdI+gnQgHH4ceBoIBzJDlVG+WVWw==}
+    engines: {node: '>=18'}
     dependencies:
-      '@types/istanbul-lib-report': 3.0.0
-    dev: true
+      '@langchain/core': 0.1.61
+      '@mistralai/mistralai': 0.1.3
+      uuid: 9.0.1
+      zod: 3.22.4
+      zod-to-json-schema: 3.22.4(zod@3.22.4)
+    transitivePeerDependencies:
+      - encoding
+    dev: false
 
-  /@types/jest@29.2.5:
-    resolution: {integrity: sha512-H2cSxkKgVmqNHXP7TC2L/WUorrZu8ZigyRywfVzv6EyBlxj39n4C00hjXYQWsbwqgElaj/CiAeSRmk5GoaKTgw==}
+  /@langchain/openai@0.0.28:
+    resolution: {integrity: sha512-2s1RA3/eAnz4ahdzsMPBna9hfAqpFNlWdHiPxVGZ5yrhXsbLWWoPcF+22LCk9t0HJKtazi2GCIWc0HVXH9Abig==}
+    engines: {node: '>=18'}
     dependencies:
-      expect: 29.3.1
-      pretty-format: 29.4.2
-    dev: true
+      '@langchain/core': 0.1.61
+      js-tiktoken: 1.0.8
+      openai: 4.38.5
+      zod: 3.22.4
+      zod-to-json-schema: 3.22.4(zod@3.22.4)
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
+    dev: false
 
-  /@types/jest@29.5.0:
-    resolution: {integrity: sha512-3Emr5VOl/aoBwnWcH/EFQvlSAmjV+XtV9GGu5mwdYew5vhQh0IUZx/60x0TzHDu09Bi7HMx10t/namdJw5QIcg==}
+  /@langchain/pinecone@0.0.3:
+    resolution: {integrity: sha512-uhmGdiF6OLL583kQNMdKl799+3E1nQphrZ4a/Y/yQcXKUPVNZYwNLUimK1ws80RBhfqR7DKvywkvERoOsvCDlA==}
+    engines: {node: '>=18'}
     dependencies:
-      expect: 29.4.2
-      pretty-format: 29.4.2
-    dev: true
-
-  /@types/jmespath@0.15.0:
-    resolution: {integrity: sha512-uaht4XcYSq5ZrPriQW8C+g5DhptewRd1E84ph7L167sCyzLObz+U3JTpmYq/CNkvjNsz2mtyQoHPNEYQYTzWmg==}
-    dev: true
-
-  /@types/js-nacl@1.3.0:
-    resolution: {integrity: sha512-juUvxo444ZfwDSwWyhssMxSN+snqTdiUoOVXZF+/ffVrGHq3rAf1fmczWn3z9TCEAuRbaTmgAcYlZ9MutyyOkQ==}
-    dev: true
+      '@langchain/core': 0.1.61
+      '@pinecone-database/pinecone': 2.2.0
+      flat: 5.0.2
+      uuid: 9.0.1
+    dev: false
 
-  /@types/jsdom@20.0.1:
-    resolution: {integrity: sha512-d0r18sZPmMQr1eG35u12FZfhIXNrnsPU/g5wvRKCUf/tOGilKKwYMYGqh33BNR6ba+2gkHw1EUiHoN3mn7E5IQ==}
+  /@langchain/pinecone@0.0.4:
+    resolution: {integrity: sha512-9Rme771vHbRKXHy0IxOFFUyYtJfL+I1LgleF1cSkb2ZxgtOwN7uvh0Cp23WrCzEh8DHVEaRYPSbBC4W3YfqwfA==}
+    engines: {node: '>=18'}
     dependencies:
-      '@types/node': 16.18.12
-      '@types/tough-cookie': 4.0.2
-      parse5: 7.1.1
-    dev: true
-
-  /@types/json-diff@0.5.2:
-    resolution: {integrity: sha512-2oqXStJYYLDHCciNAClY277Ti3kXT+JLvPD7lLm/490i+B7g0GR6M4qiW+bd2V5vpB+yMKY8IelbsHMAYX1D0A==}
-    dev: true
-
-  /@types/json-schema@7.0.11:
-    resolution: {integrity: sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==}
-
-  /@types/json5@0.0.29:
-    resolution: {integrity: sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==}
-    dev: true
-
-  /@types/jsonpath@0.2.0:
-    resolution: {integrity: sha512-v7qlPA0VpKUlEdhghbDqRoKMxFB3h3Ch688TApBJ6v+XLDdvWCGLJIYiPKGZnS6MAOie+IorCfNYVHOPIHSWwQ==}
-    dev: true
+      '@langchain/core': 0.1.61
+      '@pinecone-database/pinecone': 2.2.0
+      flat: 5.0.2
+      uuid: 9.0.1
+    dev: false
 
-  /@types/jsonwebtoken@9.0.1:
-    resolution: {integrity: sha512-c5ltxazpWabia/4UzhIoaDcIza4KViOQhdbjRlfcIGVnsE3c3brkz9Z+F/EeJIECOQP7W7US2hNE930cWWkPiw==}
+  /@langchain/redis@0.0.2:
+    resolution: {integrity: sha512-kDaW4JotKH4J9QxcsRP0onydxz8QgGD1bYosdpzuZ2a7kYcDeJWMqapR0eFFjOznemgyn27jxUFGG0GhvI3pYA==}
+    engines: {node: '>=18'}
     dependencies:
-      '@types/node': 16.18.12
-
-  /@types/linkify-it@3.0.2:
-    resolution: {integrity: sha512-HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA==}
-    dev: true
-
-  /@types/localtunnel@1.9.0:
-    resolution: {integrity: sha512-3YxO7RHRrmtYNX6Rhkr97bnXHrF1Ckfo4axENWLcBXWi+8B1WsNbqPqe5Eg6TA5survjAWWvLTu1KQesuLHVgQ==}
-    dev: true
+      '@langchain/core': 0.1.61
+      redis: 4.6.13
+    dev: false
 
-  /@types/lodash-es@4.17.6:
-    resolution: {integrity: sha512-R+zTeVUKDdfoRxpAryaQNRKk3105Rrgx2CFRClIgRGaqDTdjsm8h6IYA8ir584W3ePzkZfst5xIgDwYrlh9HLg==}
+  /@langchain/textsplitters@0.0.0:
+    resolution: {integrity: sha512-3hPesWomnmVeYMppEGYbyv0v/sRUugUdlFBNn9m1ueJYHAIKbvCErkWxNUH3guyKKYgJVrkvZoQxcd9faucSaw==}
+    engines: {node: '>=18'}
     dependencies:
-      '@types/lodash': 4.14.186
-    dev: true
+      '@langchain/core': 0.1.61
+      js-tiktoken: 1.0.11
+    dev: false
 
-  /@types/lodash.assign@4.2.7:
-    resolution: {integrity: sha512-FABtilcXqbXBj9jnSqgTbmr0Wy3lhDgMkGtNfcE+wipuKi2/fv7wB9rCeJfLi1H/qt1YxVAENtQkdKisYIwFKg==}
-    dependencies:
-      '@types/lodash': 4.14.191
-    dev: true
+  /@lezer/common@1.1.0:
+    resolution: {integrity: sha512-XPIN3cYDXsoJI/oDWoR2tD++juVrhgIago9xyKhZ7IhGlzdDM9QgC8D8saKNCz5pindGcznFr2HBSsEQSWnSjw==}
+    dev: false
 
-  /@types/lodash.assignwith@4.2.7:
-    resolution: {integrity: sha512-7NbtlOcZFkjIS/vXkppYruo/RvSkTHj1BcumhCIxQSLCh50SmRIPqXrogRijwB3yy/3ULsiw9ZRn4ihw9oHHHg==}
+  /@lezer/css@1.1.1:
+    resolution: {integrity: sha512-mSjx+unLLapEqdOYDejnGBokB5+AiJKZVclmud0MKQOKx3DLJ5b5VTCstgDDknR6iIV4gVrN6euzsCnj0A2gQA==}
     dependencies:
-      '@types/lodash': 4.14.191
-    dev: true
+      '@lezer/highlight': 1.1.1
+      '@lezer/lr': 1.2.3
+    dev: false
 
-  /@types/lodash.camelcase@4.3.7:
-    resolution: {integrity: sha512-Nfi6jpo9vuEOSIJP+mpbTezKyEt75DQlbwjiDvs/JctWkbnHDoyQo5lWqdvgNiJmVUjcmkfvlrvSEgJYvurOKg==}
+  /@lezer/highlight@1.1.1:
+    resolution: {integrity: sha512-duv9D23O9ghEDnnUDmxu+L8pJy4nYo4AbCOHIudUhscrLSazqeJeK1V50EU6ZufWF1zv0KJwu/frFRyZWXxHBQ==}
     dependencies:
-      '@types/lodash': 4.14.186
-    dev: true
+      '@lezer/common': 1.1.0
+    dev: false
 
-  /@types/lodash.clone@4.5.7:
-    resolution: {integrity: sha512-jugWYM+xBUQCpWbn7p6BSbf8bRMHtJYnEIGZYngbStaU0aN4VFgAAkGgsc+MtHuepBOmjyUGiGv+dHnQQIGLZA==}
+  /@lezer/html@1.3.0:
+    resolution: {integrity: sha512-jU/ah8DEoiECLTMouU/X/ujIg6k9WQMIOFMaCLebzaXfrguyGaR3DpTgmk0tbljiuIJ7hlmVJPcJcxGzmCd0Mg==}
     dependencies:
-      '@types/lodash': 4.14.191
-    dev: true
+      '@lezer/common': 1.1.0
+      '@lezer/highlight': 1.1.1
+      '@lezer/lr': 1.2.3
+    dev: false
 
-  /@types/lodash.compact@3.0.7:
-    resolution: {integrity: sha512-yHP+S4QY9C/OLWc+Ei7A1rdwGcBgwFOaW20eZU8qA42dNRwUWnGltDAmKg5ICVGrgJKTokv0gsz1dsQl1gKA2w==}
+  /@lezer/javascript@1.0.2:
+    resolution: {integrity: sha512-IjOVeIRhM8IuafWNnk+UzRz7p4/JSOKBNINLYLsdSGuJS9Ju7vFdc82AlTt0jgtV5D8eBZf4g0vK4d3ttBNz7A==}
     dependencies:
-      '@types/lodash': 4.14.191
-    dev: true
+      '@lezer/highlight': 1.1.1
+      '@lezer/lr': 1.2.3
+    dev: false
 
-  /@types/lodash.concat@4.5.7:
-    resolution: {integrity: sha512-qgF1loqQByL+CW9UbSU1lTLOZmjnIdxQYn3EQsFpGaE/eZyIoOGdACM4jsG6WIAv8WZkto6QhvtAgl3v1wn3WQ==}
+  /@lezer/json@1.0.0:
+    resolution: {integrity: sha512-zbAuUY09RBzCoCA3lJ1+ypKw5WSNvLqGMtasdW6HvVOqZoCpPr8eWrsGnOVWGKGn8Rh21FnrKRVlJXrGAVUqRw==}
     dependencies:
-      '@types/lodash': 4.14.191
-    dev: true
+      '@lezer/highlight': 1.1.1
+      '@lezer/lr': 1.2.3
+    dev: false
 
-  /@types/lodash.debounce@4.0.7:
-    resolution: {integrity: sha512-X1T4wMZ+gT000M2/91SYj0d/7JfeNZ9PeeOldSNoE/lunLeQXKvkmIumI29IaKMotU/ln/McOIvgzZcQ/3TrSA==}
+  /@lezer/lr@1.2.3:
+    resolution: {integrity: sha512-qpB7rBzH8f6Mzjv2AVZRahcm+2Cf7nbIH++uXbvVOL1yIRvVWQ3HAM/saeBLCyz/togB7LGo76qdJYL1uKQlqA==}
     dependencies:
-      '@types/lodash': 4.14.191
-    dev: true
+      '@lezer/common': 1.1.0
+    dev: false
 
-  /@types/lodash.difference@4.5.7:
-    resolution: {integrity: sha512-L7r80ymosy9HiqndKY9XfWeneRwOqAramdAL184pQhlS5PB+J3sKnpgUCBh7r9E6Rsdf4D4bty7t7HEC5Jny1Q==}
+  /@lezer/python@1.1.5:
+    resolution: {integrity: sha512-h0DVr6IfrmKUbTc5PeetaC87IZYoHyn5JogsVYW5mRDpVRyEsvaLBMLyEN4Ufc2BKp1c9y2Pkr8ZNLxS8dTLsQ==}
     dependencies:
-      '@types/lodash': 4.14.191
-    dev: true
+      '@lezer/highlight': 1.1.1
+      '@lezer/lr': 1.2.3
+    dev: false
 
-  /@types/lodash.escaperegexp@4.1.7:
-    resolution: {integrity: sha512-2TfHizz0jsnyVkV4X1PMyk6KkibXTBHM43X+6BCR3KE6KgADdbirSF+oiEvPQl6mwuHXZjkxar9d4AFYORgfww==}
+  /@mdx-js/react@3.0.1(@types/react@18.0.27)(react@18.2.0):
+    resolution: {integrity: sha512-9ZrPIU4MGf6et1m1ov3zKf+q9+deetI51zprKB1D/z3NOb+rUxxtEl3mCjW5wTGh6VhRdwPueh1oRzi6ezkA8A==}
+    peerDependencies:
+      '@types/react': '>=16'
+      react: '>=16'
     dependencies:
-      '@types/lodash': 4.14.191
+      '@types/mdx': 2.0.3
+      '@types/react': 18.0.27
+      react: 18.2.0
     dev: true
 
-  /@types/lodash.every@4.6.7:
-    resolution: {integrity: sha512-WmQWJILnkXbWny8/M5/IJEXFm5+MTCiBHbRLgYuxaEKD7KKAViys5qMJ7nvytF33ZMtLYXVFNYYI62BCr0UMtg==}
+  /@microsoft/api-extractor-model@7.28.3:
+    resolution: {integrity: sha512-wT/kB2oDbdZXITyDh2SQLzaWwTOFbV326fP0pUwNW00WeliARs0qjmXBWmGWardEzp2U3/axkO3Lboqun6vrig==}
     dependencies:
-      '@types/lodash': 4.14.191
+      '@microsoft/tsdoc': 0.14.2
+      '@microsoft/tsdoc-config': 0.16.2
+      '@rushstack/node-core-library': 3.62.0
+    transitivePeerDependencies:
+      - '@types/node'
     dev: true
 
-  /@types/lodash.find@4.6.7:
-    resolution: {integrity: sha512-ESwK5k3nf9ufS+M2niH06/gjrREihHobyWQLs5c5+O93uar3N9s0rNx8bBfG9zLYVaPBJEsEIk06hm5ccstF5w==}
+  /@microsoft/api-extractor@7.39.0:
+    resolution: {integrity: sha512-PuXxzadgnvp+wdeZFPonssRAj/EW4Gm4s75TXzPk09h3wJ8RS3x7typf95B4vwZRrPTQBGopdUl+/vHvlPdAcg==}
+    hasBin: true
     dependencies:
-      '@types/lodash': 4.14.191
+      '@microsoft/api-extractor-model': 7.28.3
+      '@microsoft/tsdoc': 0.14.2
+      '@microsoft/tsdoc-config': 0.16.2
+      '@rushstack/node-core-library': 3.62.0
+      '@rushstack/rig-package': 0.5.1
+      '@rushstack/ts-command-line': 4.17.1
+      colors: 1.2.5
+      lodash: 4.17.21
+      resolve: 1.22.8
+      semver: 7.6.0
+      source-map: 0.6.1
+      typescript: 5.4.2
+    transitivePeerDependencies:
+      - '@types/node'
     dev: true
 
-  /@types/lodash.first@3.0.7:
-    resolution: {integrity: sha512-CYgaLK5ylAMDJN2k2hnKlAnNSqBnk4s97OABI/fXJXnWb+IDjgBJ8Y1qNgw8TTmk/Pz05OshDFhoNIf9ry9esA==}
+  /@microsoft/tsdoc-config@0.16.2:
+    resolution: {integrity: sha512-OGiIzzoBLgWWR0UdRJX98oYO+XKGf7tiK4Zk6tQ/E4IJqGCe7dvkTvgDZV5cFJUzLGDOjeAXrnZoA6QkVySuxw==}
     dependencies:
-      '@types/lodash': 4.14.191
+      '@microsoft/tsdoc': 0.14.2
+      ajv: 6.12.6
+      jju: 1.4.0
+      resolve: 1.19.0
     dev: true
 
-  /@types/lodash.flow@3.5.7:
-    resolution: {integrity: sha512-F3avAQHJPiewhugySHZ8CUgnYRiJwauOU5/PQdxWs8VU3WDbPnyea1XQ8rC8VT+08J43Ycz9fH1QD+isJukAxA==}
-    dependencies:
-      '@types/lodash': 4.14.191
+  /@microsoft/tsdoc@0.14.2:
+    resolution: {integrity: sha512-9b8mPpKrfeGRuhFH5iO1iwCLeIIsV6+H1sRfxbkoGXIyQE2BTsPd9zqSqQJ+pv5sJ/hT5M1zvOFL02MnEezFug==}
     dev: true
 
-  /@types/lodash.get@4.4.7:
-    resolution: {integrity: sha512-af34Mj+KdDeuzsJBxc/XeTtOx0SZHZNLd+hdrn+PcKGQs0EG2TJTzQAOTCZTgDJCArahlCzLWSy8c2w59JRz7Q==}
-    dependencies:
-      '@types/lodash': 4.14.191
+  /@miragejs/pretender-node-polyfill@0.1.2:
+    resolution: {integrity: sha512-M/BexG/p05C5lFfMunxo/QcgIJnMT2vDVCd00wNqK2ImZONIlEETZwWJu1QtLxtmYlSHlCFl3JNzp0tLe7OJ5g==}
     dev: true
 
-  /@types/lodash.intersection@4.4.7:
-    resolution: {integrity: sha512-7ukD2s54bmRNNpiH9ApEErO4H6mB8+WmXFr/6RpP3e/n7h3UFhEJC7QwLcoWAqOrYCIRFMAAwDf3ambSsW8c5Q==}
+  /@mistralai/mistralai@0.1.3:
+    resolution: {integrity: sha512-WUHxC2xdeqX9PTXJEqdiNY54vT2ir72WSJrZTTBKRnkfhX6zIfCYA24faRlWjUB5WTpn+wfdGsTMl3ArijlXFA==}
     dependencies:
-      '@types/lodash': 4.14.191
-    dev: true
+      node-fetch: 2.7.0(encoding@0.1.13)
+    transitivePeerDependencies:
+      - encoding
+    dev: false
 
-  /@types/lodash.isarray@4.0.7:
-    resolution: {integrity: sha512-j4LGkaWRU3siKODqnY9xffwoJgnpp4TYsfCxDhRSZwIbX4qD+TkH483r6+mqGkgqlnP08NhjQYhDXPLWgA2uxQ==}
+  /@mongodb-js/saslprep@1.1.0:
+    resolution: {integrity: sha512-Xfijy7HvfzzqiOAhAepF4SGN5e9leLkMvg/OPOF97XemjfVCYN/oWa75wnkc6mltMSTwY+XlbhWgUOJmkFspSw==}
     dependencies:
-      '@types/lodash': 4.14.191
-    dev: true
+      sparse-bitfield: 3.0.3
+    dev: false
 
-  /@types/lodash.isempty@4.4.7:
-    resolution: {integrity: sha512-YOzlpoIn9jrfHzjIukKnu9Le3tmi+0PhUdOt2rMpJW/4J6jX7s0HeBatXdh9QckLga8qt4EKBxVIEqtEq6pzLg==}
-    dependencies:
-      '@types/lodash': 4.14.191
-    dev: true
+  /@msgpackr-extract/msgpackr-extract-darwin-arm64@3.0.2:
+    resolution: {integrity: sha512-9bfjwDxIDWmmOKusUcqdS4Rw+SETlp9Dy39Xui9BEGEk19dDwH0jhipwFzEff/pFg95NKymc6TOTbRKcWeRqyQ==}
+    cpu: [arm64]
+    os: [darwin]
+    dev: false
+    optional: true
 
-  /@types/lodash.isequal@4.5.6:
-    resolution: {integrity: sha512-Ww4UGSe3DmtvLLJm2F16hDwEQSv7U0Rr8SujLUA2wHI2D2dm8kPu6Et+/y303LfjTIwSBKXB/YTUcAKpem/XEg==}
-    dependencies:
-      '@types/lodash': 4.14.191
-    dev: true
+  /@msgpackr-extract/msgpackr-extract-darwin-x64@3.0.2:
+    resolution: {integrity: sha512-lwriRAHm1Yg4iDf23Oxm9n/t5Zpw1lVnxYU3HnJPTi2lJRkKTrps1KVgvL6m7WvmhYVt/FIsssWay+k45QHeuw==}
+    cpu: [x64]
+    os: [darwin]
+    dev: false
+    optional: true
 
-  /@types/lodash.isobject@3.0.7:
-    resolution: {integrity: sha512-nuC74gk3hEmpY4Jq5xIfQc9uoWg2ozVIqS7OwS9xPncFr+d6ULBDpBBOcSaJKm2euKANHBeRGNEaHMAddIzSfA==}
-    dependencies:
-      '@types/lodash': 4.14.191
-    dev: true
+  /@msgpackr-extract/msgpackr-extract-linux-arm64@3.0.2:
+    resolution: {integrity: sha512-FU20Bo66/f7He9Fp9sP2zaJ1Q8L9uLPZQDub/WlUip78JlPeMbVL8546HbZfcW9LNciEXc8d+tThSJjSC+tmsg==}
+    cpu: [arm64]
+    os: [linux]
+    dev: false
+    optional: true
 
-  /@types/lodash.isstring@4.0.7:
-    resolution: {integrity: sha512-gt4q4n1Who4JxLeFR/kduS2Tia+biQk/zdbIkOfMvAldXHJdcC5SsvZREchkwa4CwKK+DqhIm3wfigFYzNKS8Q==}
-    dependencies:
-      '@types/lodash': 4.14.191
-    dev: true
+  /@msgpackr-extract/msgpackr-extract-linux-arm@3.0.2:
+    resolution: {integrity: sha512-MOI9Dlfrpi2Cuc7i5dXdxPbFIgbDBGgKR5F2yWEa6FVEtSWncfVNKW5AKjImAQ6CZlBK9tympdsZJ2xThBiWWA==}
+    cpu: [arm]
+    os: [linux]
+    dev: false
+    optional: true
 
-  /@types/lodash.iteratee@4.7.7:
-    resolution: {integrity: sha512-1zCzLzchulYwbosCY6yD0cOBuHNJlmFkWwIMz8Z8a0rtfYr3JBlaT0wZ534ZLjyjxCMx1kZEHCpyMt9lQ2ptmA==}
-    dependencies:
-      '@types/lodash': 4.14.186
-    dev: true
+  /@msgpackr-extract/msgpackr-extract-linux-x64@3.0.2:
+    resolution: {integrity: sha512-gsWNDCklNy7Ajk0vBBf9jEx04RUxuDQfBse918Ww+Qb9HCPoGzS+XJTLe96iN3BVK7grnLiYghP/M4L8VsaHeA==}
+    cpu: [x64]
+    os: [linux]
+    dev: false
+    optional: true
 
-  /@types/lodash.last@3.0.7:
-    resolution: {integrity: sha512-hh43wZke0moPkPAqi8WS5VSH+qb2O1Ln8pootwpWv3dTTa0htqFcdAxqfxGNf52XxDem6SDlaf0Ks/f95Qo3Vw==}
-    dependencies:
-      '@types/lodash': 4.14.191
-    dev: true
+  /@msgpackr-extract/msgpackr-extract-win32-x64@3.0.2:
+    resolution: {integrity: sha512-O+6Gs8UeDbyFpbSh2CPEz/UOrrdWPTBYNblZK5CxxLisYt4kGX3Sc+czffFonyjiGSq3jWLwJS/CCJc7tBr4sQ==}
+    cpu: [x64]
+    os: [win32]
+    dev: false
+    optional: true
 
-  /@types/lodash.lt@3.9.7:
-    resolution: {integrity: sha512-PVkUcZFQL9PViFol5hz6JAI4jj5mtnCZo5J1mDN2GaLMmMP46sZRii2v3cvmWOvlSEV+LGvxpo+DVnWHLWAAqw==}
+  /@n8n/codemirror-lang-sql@1.0.2(@codemirror/view@6.22.3)(@lezer/common@1.1.0):
+    resolution: {integrity: sha512-sOf/KyewSu3Ikij0CkRtzJJDhRDZcwNCEYl8UdH4U/riL0/XZGcBD7MYofCCcKszanJZiEWRZ2KU1sRp234iMg==}
     dependencies:
-      '@types/lodash': 4.14.191
-    dev: true
+      '@codemirror/autocomplete': 6.11.1(@codemirror/language@6.9.3)(@codemirror/state@6.3.3)(@codemirror/view@6.22.3)(@lezer/common@1.1.0)
+      '@codemirror/language': 6.9.3
+      '@codemirror/state': 6.3.3
+      '@lezer/highlight': 1.1.1
+      '@lezer/lr': 1.2.3
+    transitivePeerDependencies:
+      - '@codemirror/view'
+      - '@lezer/common'
+    dev: false
 
-  /@types/lodash.map@4.6.13:
-    resolution: {integrity: sha512-kppRBzlpuvQQsr7R2nv/DDDZds8fglRFNAK70WUOkOC18KOcuQ22oQF9Kgy5Z2v/eDNkBm0ltrT6FThSkuWwow==}
+  /@n8n/localtunnel@2.1.0:
+    resolution: {integrity: sha512-k5mb+Aeb3+4cRfWaEsMSiTsF1oARFvAuI3EOvxitrgVmiWk592h4nCI7vtjq1nsVT+PWKmB6dBoTQ0+6HHIpug==}
+    engines: {node: '>=18.0.0'}
+    hasBin: true
     dependencies:
-      '@types/lodash': 4.14.191
-    dev: true
+      axios: 1.6.7(debug@4.3.4)
+      debug: 4.3.4(supports-color@8.1.1)
+      openurl: 1.1.1
+      yargs: 17.7.2
+    transitivePeerDependencies:
+      - supports-color
+    dev: false
 
-  /@types/lodash.merge@4.6.7:
-    resolution: {integrity: sha512-OwxUJ9E50gw3LnAefSHJPHaBLGEKmQBQ7CZe/xflHkyy/wH2zVyEIAKReHvVrrn7zKdF58p16We9kMfh7v0RRQ==}
+  /@n8n/p-retry@6.2.0-2:
+    resolution: {integrity: sha512-rbnMnSdEwq2yuYMgzOQ4jTXm+oH7yjN/0ISfB/7O6pUcEPsZt9UW60BYfQ1WWHkKa/evI8vgER2zV5/RC1BupQ==}
+    engines: {node: '>=18.10'}
     dependencies:
-      '@types/lodash': 4.14.191
-    dev: true
+      '@common.js/is-network-error': 1.0.1
+      '@types/retry': 0.12.5
+      retry: 0.13.1
+    dev: false
 
-  /@types/lodash.mergewith@4.6.7:
-    resolution: {integrity: sha512-3m+lkO5CLRRYU0fhGRp7zbsGi6+BZj0uTVSwvcKU+nSlhjA9/QRNfuSGnD2mX6hQA7ZbmcCkzk5h4ZYGOtk14A==}
+  /@n8n/tournament@1.0.2:
+    resolution: {integrity: sha512-fTpi7F8ra5flGSVfRzohPyG7czAAKCZPlLjdKdwbLJivLoI/Ekhgodov1jfVSCVFVbwQ06gRQRxLEDzl2jl8ig==}
+    engines: {node: '>=18.10', pnpm: '>=8.6'}
     dependencies:
-      '@types/lodash': 4.14.191
-    dev: true
+      '@n8n_io/riot-tmpl': 4.0.1
+      ast-types: 0.16.1
+      esprima-next: 5.8.4
+      recast: 0.22.0
+    dev: false
 
-  /@types/lodash.omit@4.5.7:
-    resolution: {integrity: sha512-6q6cNg0tQ6oTWjSM+BcYMBhan54P/gLqBldG4AuXd3nKr0oeVekWNS4VrNEu3BhCSDXtGapi7zjhnna0s03KpA==}
+  /@n8n/typeorm@0.3.20-9(@sentry/node@7.87.0)(ioredis@5.3.2)(mysql2@3.9.7)(pg@8.11.3)(sqlite3@5.1.7):
+    resolution: {integrity: sha512-m9HrksvTftGQ2h6JLB3nq8uIaX19OPoa9MYLRqces4Y18r4b5mmdXH/qTrjxFiA1z4SP/KNCsvq90iRnT1pb1w==}
+    engines: {node: '>=16.13.0'}
+    hasBin: true
+    peerDependencies:
+      '@google-cloud/spanner': ^5.18.0
+      '@libsql/client': ^0.4.2
+      '@sap/hana-client': ^2.12.25
+      '@sentry/node': ^7.87.0
+      better-sqlite3: ^7.1.2 || ^8.0.0 || ^9.0.0
+      hdb-pool: ^0.1.6
+      ioredis: ^5.0.4
+      mongodb: ^5.8.0
+      mssql: ^9.1.1 || ^10.0.1
+      mysql2: ^2.2.5 || ^3.0.1
+      oracledb: ^6.3.0
+      pg: ^8.5.1
+      pg-native: ^3.0.0
+      pg-query-stream: ^4.0.0
+      redis: ^3.1.1 || ^4.0.0
+      sql.js: ^1.4.0
+      sqlite3: ^5.0.3
+      ts-node: ^10.7.0
+      typeorm-aurora-data-api-driver: ^2.0.0
+    peerDependenciesMeta:
+      '@google-cloud/spanner':
+        optional: true
+      '@libsql/client':
+        optional: true
+      '@sap/hana-client':
+        optional: true
+      '@sentry/node':
+        optional: true
+      better-sqlite3:
+        optional: true
+      hdb-pool:
+        optional: true
+      ioredis:
+        optional: true
+      mongodb:
+        optional: true
+      mssql:
+        optional: true
+      mysql2:
+        optional: true
+      oracledb:
+        optional: true
+      pg:
+        optional: true
+      pg-native:
+        optional: true
+      pg-query-stream:
+        optional: true
+      redis:
+        optional: true
+      sql.js:
+        optional: true
+      sqlite3:
+        optional: true
+      ts-node:
+        optional: true
+      typeorm-aurora-data-api-driver:
+        optional: true
     dependencies:
-      '@types/lodash': 4.14.191
-    dev: true
+      '@n8n/p-retry': 6.2.0-2
+      '@sentry/node': 7.87.0
+      '@sqltools/formatter': 1.2.5
+      app-root-path: 3.1.0
+      async-mutex: 0.5.0
+      buffer: 6.0.3
+      chalk: 4.1.2
+      dayjs: 1.11.10
+      debug: 4.3.4(supports-color@8.1.1)
+      dotenv: 16.3.1
+      glob: 10.3.10
+      ioredis: 5.3.2
+      mkdirp: 2.1.3
+      mysql2: 3.9.7
+      pg: 8.11.3
+      reflect-metadata: 0.2.1
+      sha.js: 2.4.11
+      sqlite3: 5.1.7
+      tarn: 3.0.2
+      tslib: 2.6.2
+      uuid: 9.0.1
+      yargs: 17.7.2
+    transitivePeerDependencies:
+      - supports-color
+    dev: false
 
-  /@types/lodash.partialright@4.2.7:
-    resolution: {integrity: sha512-6RiMKczgdzVFbLXkZynaL+1FgNRQN1YhnKb3wxb04yaIuT+5QUaT+70xx60uOSaZwNd9fvPVVxhPQHL9MP3YHg==}
+  /@n8n/typeorm@0.3.20-9(pg@8.11.3)(redis@4.6.12)(sqlite3@5.1.7):
+    resolution: {integrity: sha512-m9HrksvTftGQ2h6JLB3nq8uIaX19OPoa9MYLRqces4Y18r4b5mmdXH/qTrjxFiA1z4SP/KNCsvq90iRnT1pb1w==}
+    engines: {node: '>=16.13.0'}
+    hasBin: true
+    peerDependencies:
+      '@google-cloud/spanner': ^5.18.0
+      '@libsql/client': ^0.4.2
+      '@sap/hana-client': ^2.12.25
+      '@sentry/node': ^7.87.0
+      better-sqlite3: ^7.1.2 || ^8.0.0 || ^9.0.0
+      hdb-pool: ^0.1.6
+      ioredis: ^5.0.4
+      mongodb: ^5.8.0
+      mssql: ^9.1.1 || ^10.0.1
+      mysql2: ^2.2.5 || ^3.0.1
+      oracledb: ^6.3.0
+      pg: ^8.5.1
+      pg-native: ^3.0.0
+      pg-query-stream: ^4.0.0
+      redis: ^3.1.1 || ^4.0.0
+      sql.js: ^1.4.0
+      sqlite3: ^5.0.3
+      ts-node: ^10.7.0
+      typeorm-aurora-data-api-driver: ^2.0.0
+    peerDependenciesMeta:
+      '@google-cloud/spanner':
+        optional: true
+      '@libsql/client':
+        optional: true
+      '@sap/hana-client':
+        optional: true
+      '@sentry/node':
+        optional: true
+      better-sqlite3:
+        optional: true
+      hdb-pool:
+        optional: true
+      ioredis:
+        optional: true
+      mongodb:
+        optional: true
+      mssql:
+        optional: true
+      mysql2:
+        optional: true
+      oracledb:
+        optional: true
+      pg:
+        optional: true
+      pg-native:
+        optional: true
+      pg-query-stream:
+        optional: true
+      redis:
+        optional: true
+      sql.js:
+        optional: true
+      sqlite3:
+        optional: true
+      ts-node:
+        optional: true
+      typeorm-aurora-data-api-driver:
+        optional: true
     dependencies:
-      '@types/lodash': 4.14.191
-    dev: true
+      '@n8n/p-retry': 6.2.0-2
+      '@sqltools/formatter': 1.2.5
+      app-root-path: 3.1.0
+      async-mutex: 0.5.0
+      buffer: 6.0.3
+      chalk: 4.1.2
+      dayjs: 1.11.10
+      debug: 4.3.4(supports-color@8.1.1)
+      dotenv: 16.3.1
+      glob: 10.3.10
+      mkdirp: 2.1.3
+      pg: 8.11.3
+      redis: 4.6.12
+      reflect-metadata: 0.2.1
+      sha.js: 2.4.11
+      sqlite3: 5.1.7
+      tarn: 3.0.2
+      tslib: 2.6.2
+      uuid: 9.0.1
+      yargs: 17.7.2
+    transitivePeerDependencies:
+      - supports-color
+    dev: false
 
-  /@types/lodash.pick@4.4.7:
-    resolution: {integrity: sha512-HgdyKz7/1+oeoVzbpu1XiX/Bti9AUksHtOILH38T07aKvqoirzcdOsrO2+Yg3L51Hv/8m1MetvHZEUGeABiTiQ==}
+  /@n8n/vm2@3.9.20:
+    resolution: {integrity: sha512-qk2oJYkuFRVSTxoro4obX/sv/wT1pViZjHh/isjOvFB93D52QIg3TCjMPsHOfHTmkxCKJffjLrUvjIwvWzSMCQ==}
+    engines: {node: '>=18.10', pnpm: '>=8.6.12'}
+    hasBin: true
     dependencies:
-      '@types/lodash': 4.14.191
-    dev: true
+      acorn: 8.11.2
+      acorn-walk: 8.2.0
+    dev: false
 
-  /@types/lodash.pickby@4.6.7:
-    resolution: {integrity: sha512-4ebXRusuLflfscbD0PUX4eVknDHD9Yf+uMtBIvA/hrnTqeAzbuHuDjvnYriLjUrI9YrhCPVKUf4wkRSXJQ6gig==}
+  /@n8n_io/license-sdk@2.10.0:
+    resolution: {integrity: sha512-o6jJSQJ80uGGgGCaSr0NPVGpJd3ePR+fGBQ7MtnNKxxQy3m4iX8reKGoLAphANNzQHnXVFHqo7U2zXlI8h4ZvA==}
+    engines: {node: '>=18.12.1', npm: '>=8.19.2'}
     dependencies:
-      '@types/lodash': 4.14.191
-    dev: true
+      crypto-js: 4.2.0
+      node-machine-id: 1.1.12
+      node-rsa: 1.1.1
+      undici: 6.4.0
+    dev: false
 
-  /@types/lodash.reduce@4.6.7:
-    resolution: {integrity: sha512-HwJ3H45BNHhSLciBZSd8oAxrz0d+ko5mXVHIeanmu0WpFiwkMg+XAv1Pp4FUsdNW34S6J60+tJbH30aULOe5MA==}
+  /@n8n_io/riot-tmpl@4.0.0:
+    resolution: {integrity: sha512-/xw8HQgYQlBCrt3IKpNSSB1CgpP7XArw1QTRjP+KEw+OHT8XGvHxXrW9VGdUu9RwDnzm/LFu+dNLeDmwJMeOwQ==}
     dependencies:
-      '@types/lodash': 4.14.191
-    dev: true
+      eslint-config-riot: 1.0.0
+    dev: false
 
-  /@types/lodash.remove@4.7.7:
-    resolution: {integrity: sha512-jZrQtY6zdukkFFinY+yxikzU3hCS6SEXsTy103Ao+2YsZq2H+D/NpXuAoZpcpn7BTMBUsgr2NO7l4UYHxKXXjw==}
+  /@n8n_io/riot-tmpl@4.0.1:
+    resolution: {integrity: sha512-/zdRbEfTFjsm1NqnpPQHgZTkTdbp5v3VUxGeMA9098sps8jRCTraQkc3AQstJgHUm7ylBXJcIVhnVeLUMWAfwQ==}
     dependencies:
-      '@types/lodash': 4.14.186
-    dev: true
+      eslint-config-riot: 1.0.0
+    dev: false
 
-  /@types/lodash.set@4.3.7:
-    resolution: {integrity: sha512-bS5Wkg/nrT82YUfkNYPSccFrNZRL+irl7Yt4iM6OTSQ0VZJED2oUIVm15NkNtUAQ8SRhCe+axqERUV6MJgkeEg==}
+  /@ndelangen/get-tarball@3.0.7:
+    resolution: {integrity: sha512-NqGfTZIZpRFef1GoVaShSSRwDC3vde3ThtTeqFdcYd6ipKqnfEVhjK2hUeHjCQUcptyZr2TONqcloFXM+5QBrQ==}
     dependencies:
-      '@types/lodash': 4.14.191
+      gunzip-maybe: 1.4.2
+      pump: 3.0.0
+      tar-fs: 2.1.1
     dev: true
 
-  /@types/lodash.some@4.6.7:
-    resolution: {integrity: sha512-RA8+uBPdrCNxuUFQUVQ0exAJ2iU1L4UyltrmhChbZXYsEewS2QRE7wIcp1sHsjUpwA+6++Yfk/lupGLYr6zbUg==}
+  /@ngneat/falso@6.4.0:
+    resolution: {integrity: sha512-f6r036h2fX/AoHw1eV2t8+qWQwrbSrozs3zXMhhwoO7SJBc+DGMxRWEhFeYIinfwx0uhUH8ggx5+PDLzYESLOA==}
     dependencies:
-      '@types/lodash': 4.14.191
+      seedrandom: 3.0.5
+      uuid: 8.3.2
     dev: true
 
-  /@types/lodash.sortby@4.7.7:
-    resolution: {integrity: sha512-J/4IS+jQopGBrrRetBXDCX0KnSeXJZ0rOTmGAxR9MWGV24YdHxX8IRi9LCGAU9GKWlBov9KRSfQpuup9PReqrw==}
+  /@nodelib/fs.scandir@2.1.5:
+    resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==}
+    engines: {node: '>= 8'}
     dependencies:
-      '@types/lodash': 4.14.191
-    dev: true
+      '@nodelib/fs.stat': 2.0.5
+      run-parallel: 1.2.0
 
-  /@types/lodash.split@4.4.7:
-    resolution: {integrity: sha512-4L/89eW9ZFOkJscM/u0nRwWaN5jHK/esQ71FHuVgePAtBD9YRdYS4cM1HRyIxN3xAoRRrw1Ohf2HQjSk0zwuqA==}
-    dependencies:
-      '@types/lodash': 4.14.191
-    dev: true
+  /@nodelib/fs.stat@2.0.5:
+    resolution: {integrity: sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==}
+    engines: {node: '>= 8'}
 
-  /@types/lodash.tonumber@4.0.7:
-    resolution: {integrity: sha512-+hJ7A8gssoiVJVNM9x+9ljzeg/EsmI3FdrElUYSfqAHFvlt/2Oc8hBJdIS1lZDkVV0pNMABaDVmtygu2yZstGg==}
+  /@nodelib/fs.walk@1.2.8:
+    resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==}
+    engines: {node: '>= 8'}
     dependencies:
-      '@types/lodash': 4.14.191
-    dev: true
+      '@nodelib/fs.scandir': 2.1.5
+      fastq: 1.15.0
 
-  /@types/lodash.tostring@4.1.7:
-    resolution: {integrity: sha512-bcLdE0foFSalisXPfZj2ukqnD6b+pg/JJoeU3szUopQG6H5emLwzZhwXkCHhDv5q23JTQz0d0er4KVpN2USZoQ==}
+  /@npmcli/fs@1.1.1:
+    resolution: {integrity: sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==}
     dependencies:
-      '@types/lodash': 4.14.191
-    dev: true
+      '@gar/promisify': 1.1.3
+      semver: 7.6.0
+    dev: false
+    optional: true
 
-  /@types/lodash.trim@4.5.7:
-    resolution: {integrity: sha512-ZKqKyxHdZz/nnCWJoame6iMHuH3uPMik750o0K75tsLuZ6SJV+18Dca/u9RPDHYO6kVdbROWM/e/8DcZZjCcMw==}
+  /@npmcli/move-file@1.1.2:
+    resolution: {integrity: sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==}
+    engines: {node: '>=10'}
+    deprecated: This functionality has been moved to @npmcli/fs
     dependencies:
-      '@types/lodash': 4.14.191
-    dev: true
+      mkdirp: 1.0.4
+      rimraf: 3.0.2
+    dev: false
+    optional: true
 
-  /@types/lodash.union@4.6.7:
-    resolution: {integrity: sha512-6HXM6tsnHJzKgJE0gA/LhTGf/7AbjUk759WZ1MziVm+OBNAATHhdgj+a3KVE8g76GCLAnN4ZEQQG1EGgtBIABA==}
+  /@oclif/core@3.18.1:
+    resolution: {integrity: sha512-l0LsjzGcqjbUEdeSBX6bdZieVmEv82Q0W3StiyaDMEnPZ9KLH28HrLpcZg6d50mCYW9CUZNzmRo6qrCHWrgLKw==}
+    engines: {node: '>=18.0.0'}
     dependencies:
-      '@types/lodash': 4.14.191
-    dev: true
+      '@types/cli-progress': 3.11.5
+      ansi-escapes: 4.3.2
+      ansi-styles: 4.3.0
+      cardinal: 2.1.1
+      chalk: 4.1.2
+      clean-stack: 3.0.1
+      cli-progress: 3.12.0
+      color: 4.2.3
+      debug: 4.3.4(supports-color@8.1.1)
+      ejs: 3.1.9
+      get-package-type: 0.1.0
+      globby: 11.1.0
+      hyperlinker: 1.0.0
+      indent-string: 4.0.0
+      is-wsl: 2.2.0
+      js-yaml: 3.14.1
+      natural-orderby: 2.0.3
+      object-treeify: 1.1.33
+      password-prompt: 1.1.3
+      slice-ansi: 4.0.0
+      string-width: 4.2.3
+      strip-ansi: 6.0.1
+      supports-color: 8.1.1
+      supports-hyperlinks: 2.3.0
+      widest-line: 3.1.0
+      wordwrap: 1.0.0
+      wrap-ansi: 7.0.0
+    dev: false
 
-  /@types/lodash.unionby@4.8.7:
-    resolution: {integrity: sha512-Hf8IGRLQlcsxo1JpFWSoefjedUVM1Kp6W7RAk2WKitYj4dt/oHfOXi9wkLPAlIzjvTH3oPJizcey2SLSBW4TwQ==}
-    dependencies:
-      '@types/lodash': 4.14.186
+  /@one-ini/wasm@0.1.1:
+    resolution: {integrity: sha512-XuySG1E38YScSJoMlqovLru4KTUNSjgVTIjyh7qMX6aNN5HY5Ct5LhRJdxO79JtTzKfzV/bnWpz+zquYrISsvw==}
     dev: true
 
-  /@types/lodash.uniq@4.5.7:
-    resolution: {integrity: sha512-qg7DeAbdZMi6DGvCxThlJycykLLhETrJrQZ6F2KaZ+o0sNK1qRHz46lgNA+nHHjwrmA2a91DyiZTp3ey3m1rEw==}
-    dependencies:
-      '@types/lodash': 4.14.186
-    dev: true
+  /@opentelemetry/api@1.2.0:
+    resolution: {integrity: sha512-0nBr+VZNKm9tvNDZFstI3Pq1fCTEDK5OZTnVKNvBNAKgd0yIvmwsP4m61rEv7ZP+tOUjWJhROpxK5MsnlF911g==}
+    engines: {node: '>=8.0.0'}
+    dev: false
 
-  /@types/lodash.uniqby@4.7.7:
-    resolution: {integrity: sha512-sv2g6vkCIvEUsK5/Vq17haoZaisfj2EWW8mP7QWlnKi6dByoNmeuHDDXHR7sabuDqwO4gvU7ModIL22MmnOocg==}
-    dependencies:
-      '@types/lodash': 4.14.191
+  /@otplib/core@12.0.1:
+    resolution: {integrity: sha512-4sGntwbA/AC+SbPhbsziRiD+jNDdIzsZ3JUyfZwjtKyc/wufl1pnSIaG4Uqx8ymPagujub0o92kgBnB89cuAMA==}
     dev: true
 
-  /@types/lodash.unset@4.5.7:
-    resolution: {integrity: sha512-/i371dATnLQ4tazwcX/n+rGk3M6RnMbA3lJKrKFjELicPExmZ1LcKtGfHBECuPS2TTl3yDuaFmWtmfACVuBBAQ==}
+  /@otplib/plugin-crypto@12.0.1:
+    resolution: {integrity: sha512-qPuhN3QrT7ZZLcLCyKOSNhuijUi9G5guMRVrxq63r9YNOxxQjPm59gVxLM+7xGnHnM6cimY57tuKsjK7y9LM1g==}
     dependencies:
-      '@types/lodash': 4.14.191
+      '@otplib/core': 12.0.1
     dev: true
 
-  /@types/lodash.upperfirst@4.3.7:
-    resolution: {integrity: sha512-CrBjoB4lO6h7tXNMBUl1eh/w0KdMosiEOXOoD5DMECsA/kDWo/WQfOt1KyGKVvgwK3I6cKAY6z8LymKiMazLFg==}
+  /@otplib/plugin-thirty-two@12.0.1:
+    resolution: {integrity: sha512-MtT+uqRso909UkbrrYpJ6XFjj9D+x2Py7KjTO9JDPhL0bJUYVu5kFP4TFZW4NFAywrAtFRxOVY261u0qwb93gA==}
     dependencies:
-      '@types/lodash': 4.14.191
+      '@otplib/core': 12.0.1
+      thirty-two: 1.0.2
     dev: true
 
-  /@types/lodash.zip@4.2.7:
-    resolution: {integrity: sha512-wRtK2bZ0HYXkJkeldrD35qOquGn5GOmp8+o886N18Aqw2DGFLP7JCTEb00j3xQZ+PCMTyfMS2OMbLUwah+bcyg==}
+  /@otplib/preset-default@12.0.1:
+    resolution: {integrity: sha512-xf1v9oOJRyXfluBhMdpOkr+bsE+Irt+0D5uHtvg6x1eosfmHCsCC6ej/m7FXiWqdo0+ZUI6xSKDhJwc8yfiOPQ==}
     dependencies:
-      '@types/lodash': 4.14.191
-    dev: true
-
-  /@types/lodash@4.14.186:
-    resolution: {integrity: sha512-eHcVlLXP0c2FlMPm56ITode2AgLMSa6aJ05JTTbYbI+7EMkCEE5qk2E41d5g2lCVTqRe0GnnRFurmlCsDODrPw==}
-    dev: true
-
-  /@types/lodash@4.14.191:
-    resolution: {integrity: sha512-BdZ5BCCvho3EIXw6wUCXHe7rS53AIDPLE+JzwgT+OsJk53oBfbSmZZ7CX4VaRoN78N+TJpFi9QPlfIVNmJYWxQ==}
-
-  /@types/lossless-json@1.0.1:
-    resolution: {integrity: sha512-zPE8kmpeL5/6L5gtTQHSOkAW/OSYYNTDRt6/2oEgLO1Zd3Rj5WVDoMloTtLJxQJhZGLGbL4pktKSh3NbzdaWdw==}
-    dev: true
-
-  /@types/luxon@3.2.0:
-    resolution: {integrity: sha512-lGmaGFoaXHuOLXFvuju2bfvZRqxAqkHPx9Y9IQdQABrinJJshJwfNCKV+u7rR3kJbiqfTF/NhOkcxxAFrObyaA==}
+      '@otplib/core': 12.0.1
+      '@otplib/plugin-crypto': 12.0.1
+      '@otplib/plugin-thirty-two': 12.0.1
     dev: true
 
-  /@types/mailparser@2.7.4:
-    resolution: {integrity: sha512-JGIV4RtcjBO1jsD0RTDoXOmm1zzHr07rWPmNREBBM1oAjjfy99Ne4Y7s/akVSZoksm/JWQMcFQ42LbsufHRVfg==}
+  /@otplib/preset-v11@12.0.1:
+    resolution: {integrity: sha512-9hSetMI7ECqbFiKICrNa4w70deTUfArtwXykPUvSHWOdzOlfa9ajglu7mNCntlvxycTiOAXkQGwjQCzzDEMRMg==}
     dependencies:
-      '@types/node': 16.18.12
+      '@otplib/core': 12.0.1
+      '@otplib/plugin-crypto': 12.0.1
+      '@otplib/plugin-thirty-two': 12.0.1
     dev: true
 
-  /@types/markdown-it-emoji@2.0.2:
-    resolution: {integrity: sha512-2ln8Wjbcj/0oRi/6VnuMeWEHHuK8uapFttvcLmDIe1GKCsFBLOLBX+D+xhDa9oWOQV0IpvxwrSfKKssAqqroog==}
+  /@pinecone-database/pinecone@2.1.0:
+    resolution: {integrity: sha512-sbU5+FZ2yhG+tJYwEochoZei5988OLWZyM2aT4wenWc6sbKGV69Jm9Yl4yix10NNglzfksF9avkte1a0/k7x5Q==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@types/markdown-it': 12.2.3
-    dev: true
+      '@sinclair/typebox': 0.29.6
+      ajv: 8.12.0
+      cross-fetch: 3.1.8(encoding@0.1.13)
+      encoding: 0.1.13
+    dev: false
 
-  /@types/markdown-it-link-attributes@3.0.1:
-    resolution: {integrity: sha512-K8RnNb1q8j7rDOJbMF7AnlhCC/45BjrQ8z3WZWOrvkBIl8u9RXvmBdG/hfpnmK1JhhEZcmFEKWt+ilW1Mly+2Q==}
+  /@pinecone-database/pinecone@2.2.0:
+    resolution: {integrity: sha512-qfVs9n5YyTmerIV1GE1u89xF1W3oFSF53STW68Oqyxey0dGq4775cCw8G5pnwoy872uqfh+tMRDME9bcWfinUw==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@types/markdown-it': 12.2.3
-    dev: true
+      '@sinclair/typebox': 0.29.6
+      ajv: 8.12.0
+      cross-fetch: 3.1.8(encoding@0.1.13)
+      encoding: 0.1.13
+    dev: false
 
-  /@types/markdown-it@12.2.3:
-    resolution: {integrity: sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ==}
+  /@pinia/testing@0.1.3(pinia@2.1.6)(vue@3.4.21):
+    resolution: {integrity: sha512-D2Ds2s69kKFaRf2KCcP1NhNZEg5+we59aRyQalwRm7ygWfLM25nDH66267U3hNvRUOTx8ofL24GzodZkOmB5xw==}
+    peerDependencies:
+      pinia: '>=2.1.5'
     dependencies:
-      '@types/linkify-it': 3.0.2
-      '@types/mdurl': 1.0.2
+      pinia: 2.1.6(typescript@5.4.2)(vue@3.4.21)
+      vue-demi: 0.14.5(vue@3.4.21)
+    transitivePeerDependencies:
+      - '@vue/composition-api'
+      - vue
     dev: true
 
-  /@types/mdurl@1.0.2:
-    resolution: {integrity: sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA==}
-    dev: true
+  /@pkgjs/parseargs@0.11.0:
+    resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==}
+    engines: {node: '>=14'}
+    optional: true
 
-  /@types/mdx@2.0.3:
-    resolution: {integrity: sha512-IgHxcT3RC8LzFLhKwP3gbMPeaK7BM9eBH46OdapPA7yvuIUJ8H6zHZV53J8hGZcTSnt95jANt+rTBNUUc22ACQ==}
+  /@pkgr/core@0.1.1:
+    resolution: {integrity: sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA==}
+    engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0}
     dev: true
 
-  /@types/mime-types@2.1.1:
-    resolution: {integrity: sha512-vXOTGVSLR2jMw440moWTC7H19iUyLtP3Z1YTj7cSsubOICinjMxFeb/V57v9QdyyPGbbWolUFSSmSiRSn94tFw==}
-    dev: true
+  /@protobufjs/aspromise@1.1.2:
+    resolution: {integrity: sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==}
+    dev: false
 
-  /@types/mime@1.3.2:
-    resolution: {integrity: sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==}
-    dev: true
+  /@protobufjs/base64@1.1.2:
+    resolution: {integrity: sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==}
+    dev: false
 
-  /@types/mime@3.0.1:
-    resolution: {integrity: sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA==}
+  /@protobufjs/codegen@2.0.4:
+    resolution: {integrity: sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==}
+    dev: false
 
-  /@types/minimatch@5.1.2:
-    resolution: {integrity: sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==}
-    dev: true
+  /@protobufjs/eventemitter@1.1.0:
+    resolution: {integrity: sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q==}
+    dev: false
 
-  /@types/mssql@6.0.8:
-    resolution: {integrity: sha512-N3dr3o1c6EXhHhhNRaKpLTdAoXT/s6qDEJET5FID2gFCj58vIV9q/7RtkvYdE6ntpkJF5F9hpURhxT/oC62yLw==}
+  /@protobufjs/fetch@1.1.0:
+    resolution: {integrity: sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==}
     dependencies:
-      '@types/node': 16.18.12
-      '@types/tedious': 4.0.9
-    dev: true
+      '@protobufjs/aspromise': 1.1.2
+      '@protobufjs/inquire': 1.1.0
+    dev: false
 
-  /@types/multer@1.4.7:
-    resolution: {integrity: sha512-/SNsDidUFCvqqcWDwxv2feww/yqhNeTRL5CVoL3jU4Goc4kKEL10T7Eye65ZqPNi4HRx8sAEX59pV1aEH7drNA==}
-    dependencies:
-      '@types/express': 4.17.14
+  /@protobufjs/float@1.0.2:
+    resolution: {integrity: sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==}
     dev: false
 
-  /@types/node-fetch@2.6.2:
-    resolution: {integrity: sha512-DHqhlq5jeESLy19TYhLakJ07kNumXWjcDdxXsLUMJZ6ue8VZJj4kLPQVE/2mdHh3xZziNF1xppu5lwmS53HR+A==}
-    dependencies:
-      '@types/node': 16.18.12
-      form-data: 3.0.1
+  /@protobufjs/inquire@1.1.0:
+    resolution: {integrity: sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q==}
+    dev: false
 
-  /@types/node-ssh@7.0.1:
-    resolution: {integrity: sha512-98EuH7UQl/WWwwDxpbANQ76HwBdzcSnC9zLSdrtVW7jjYeOTQ6TxBygbGwzZR4ho1agbd941UnHCdrXz2sS8JQ==}
+  /@protobufjs/path@1.1.2:
+    resolution: {integrity: sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==}
+    dev: false
+
+  /@protobufjs/pool@1.1.0:
+    resolution: {integrity: sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw==}
+    dev: false
+
+  /@protobufjs/utf8@1.1.0:
+    resolution: {integrity: sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==}
+    dev: false
+
+  /@qdrant/js-client-rest@1.7.0(typescript@5.4.2):
+    resolution: {integrity: sha512-16O0EQfrrybcPVipodxykr6dMUlBzKW7a63cSDUFVgc5a1AWESwERykwjuvW5KqvKdkPcxZ2NssrvgUO1W3MgA==}
+    engines: {node: '>=18.0.0', pnpm: '>=8'}
+    peerDependencies:
+      typescript: ^5.4.2
     dependencies:
-      '@types/node': 16.18.12
-      '@types/ssh2': 1.11.6
-      '@types/ssh2-streams': 0.1.9
-    dev: true
+      '@qdrant/openapi-typescript-fetch': 1.2.1
+      '@sevinf/maybe': 0.5.0
+      typescript: 5.4.2
+      undici: 5.26.4
+    dev: false
 
-  /@types/node@16.18.12:
-    resolution: {integrity: sha512-vzLe5NaNMjIE3mcddFVGlAXN1LEWueUsMsOJWaT6wWMJGyljHAWHznqfnKUQWGzu7TLPrGvWdNAsvQYW+C0xtw==}
+  /@qdrant/openapi-typescript-fetch@1.2.1:
+    resolution: {integrity: sha512-oiBJRN1ME7orFZocgE25jrM3knIF/OKJfMsZPBbtMMKfgNVYfps0MokGvSJkBmecj6bf8QoLXWIGlIoaTM4Zmw==}
+    engines: {node: '>=12.0.0', pnpm: '>=8'}
+    dev: false
 
-  /@types/nodemailer@6.4.6:
-    resolution: {integrity: sha512-pD6fL5GQtUKvD2WnPmg5bC2e8kWCAPDwMPmHe/ohQbW+Dy0EcHgZ2oCSuPlWNqk74LS5BVMig1SymQbFMPPK3w==}
+  /@radix-ui/react-compose-refs@1.0.1(@types/react@18.0.27)(react@18.2.0):
+    resolution: {integrity: sha512-fDSBgd44FKHa1FRMU59qBMPFcl2PZE+2nmqunj+BWFyYYjnhIDWL2ItDs3rrbJDQOtzt5nIebLCQc4QRfz6LJw==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
     dependencies:
-      '@types/node': 16.18.12
+      '@babel/runtime': 7.23.6
+      '@types/react': 18.0.27
+      react: 18.2.0
     dev: true
 
-  /@types/normalize-package-data@2.4.1:
-    resolution: {integrity: sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==}
+  /@radix-ui/react-slot@1.0.2(@types/react@18.0.27)(react@18.2.0):
+    resolution: {integrity: sha512-YeTpuq4deV+6DusvVUW4ivBgnkHwECUu0BiN43L5UCDFgdhsRUWAghhTF5MbvNTPzmiFOx90asDSUjWuCNapwg==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+    dependencies:
+      '@babel/runtime': 7.23.6
+      '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.0.27)(react@18.2.0)
+      '@types/react': 18.0.27
+      react: 18.2.0
     dev: true
 
-  /@types/npmlog@4.1.4:
-    resolution: {integrity: sha512-WKG4gTr8przEZBiJ5r3s8ZIAoMXNbOgQ+j/d5O4X3x6kZJRLNvyUJuUK/KoG3+8BaOHPhp2m7WC6JKKeovDSzQ==}
-    dev: true
+  /@redis/bloom@1.2.0(@redis/client@1.5.13):
+    resolution: {integrity: sha512-HG2DFjYKbpNmVXsa0keLHp/3leGJz1mjh09f2RLGGLQZzSHpkmZWuwJbAvo3QcRY8p80m5+ZdXZdYOSBLlp7Cg==}
+    peerDependencies:
+      '@redis/client': ^1.0.0
+    dependencies:
+      '@redis/client': 1.5.13
+    dev: false
 
-  /@types/openapi-to-postmanv2@3.2.0:
-    resolution: {integrity: sha512-oXe9T+tZxl5eRzJXB0R8gD+pAcvu0efsOFyCWO1FQiQRlZ/w/cW4HZ/6OkepsYLy8jysvGDex3NT72ojJpFCDw==}
+  /@redis/bloom@1.2.0(@redis/client@1.5.14):
+    resolution: {integrity: sha512-HG2DFjYKbpNmVXsa0keLHp/3leGJz1mjh09f2RLGGLQZzSHpkmZWuwJbAvo3QcRY8p80m5+ZdXZdYOSBLlp7Cg==}
+    peerDependencies:
+      '@redis/client': ^1.0.0
     dependencies:
-      '@types/postman-collection': 3.5.7
-    dev: true
+      '@redis/client': 1.5.14
+    dev: false
 
-  /@types/parse-json@4.0.0:
-    resolution: {integrity: sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==}
-    dev: true
+  /@redis/client@1.5.13:
+    resolution: {integrity: sha512-epkUM9D0Sdmt93/8Ozk43PNjLi36RZzG+d/T1Gdu5AI8jvghonTeLYV69WVWdilvFo+PYxbP0TZ0saMvr6nscQ==}
+    engines: {node: '>=14'}
+    dependencies:
+      cluster-key-slot: 1.1.2
+      generic-pool: 3.9.0
+      yallist: 4.0.0
+    dev: false
 
-  /@types/parseurl@1.3.1:
-    resolution: {integrity: sha512-sAfjGAYgJ/MZsk95f3ByThfJgasZk1hWJROghBwfKnLLNANEAG/WHckAcT6HNqx2sHwVlci7OAX7k1KYpOcgMw==}
+  /@redis/client@1.5.14:
+    resolution: {integrity: sha512-YGn0GqsRBFUQxklhY7v562VMOP0DcmlrHHs3IV1mFE3cbxe31IITUkqhBcIhVSI/2JqtWAJXg5mjV4aU+zD0HA==}
+    engines: {node: '>=14'}
     dependencies:
-      '@types/node': 16.18.12
-    dev: true
+      cluster-key-slot: 1.1.2
+      generic-pool: 3.9.0
+      yallist: 4.0.0
+    dev: false
 
-  /@types/passport-jwt@3.0.7:
-    resolution: {integrity: sha512-qRQ4qlww1Yhs3IaioDKrsDNmKy6gLDLgFsGwpCnc2YqWovO2Oxu9yCQdWHMJafQ7UIuOba4C4/TNXcGkQfEjlQ==}
+  /@redis/graph@1.1.1(@redis/client@1.5.13):
+    resolution: {integrity: sha512-FEMTcTHZozZciLRl6GiiIB4zGm5z5F3F6a6FZCyrfxdKOhFlGkiAqlexWMBzCi4DcRoyiOsuLfW+cjlGWyExOw==}
+    peerDependencies:
+      '@redis/client': ^1.0.0
     dependencies:
-      '@types/express': 4.17.14
-      '@types/jsonwebtoken': 9.0.1
-      '@types/passport-strategy': 0.2.35
-    dev: true
+      '@redis/client': 1.5.13
+    dev: false
 
-  /@types/passport-strategy@0.2.35:
-    resolution: {integrity: sha512-o5D19Jy2XPFoX2rKApykY15et3Apgax00RRLf0RUotPDUsYrQa7x4howLYr9El2mlUApHmCMv5CZ1IXqKFQ2+g==}
+  /@redis/graph@1.1.1(@redis/client@1.5.14):
+    resolution: {integrity: sha512-FEMTcTHZozZciLRl6GiiIB4zGm5z5F3F6a6FZCyrfxdKOhFlGkiAqlexWMBzCi4DcRoyiOsuLfW+cjlGWyExOw==}
+    peerDependencies:
+      '@redis/client': ^1.0.0
     dependencies:
-      '@types/express': 4.17.14
-      '@types/passport': 1.0.11
-    dev: true
+      '@redis/client': 1.5.14
+    dev: false
 
-  /@types/passport@1.0.11:
-    resolution: {integrity: sha512-pz1cx9ptZvozyGKKKIPLcVDVHwae4hrH5d6g5J+DkMRRjR3cVETb4jMabhXAUbg3Ov7T22nFHEgaK2jj+5CBpw==}
+  /@redis/json@1.0.6(@redis/client@1.5.13):
+    resolution: {integrity: sha512-rcZO3bfQbm2zPRpqo82XbW8zg4G/w4W3tI7X8Mqleq9goQjAGLL7q/1n1ZX4dXEAmORVZ4s1+uKLaUOg7LrUhw==}
+    peerDependencies:
+      '@redis/client': ^1.0.0
     dependencies:
-      '@types/express': 4.17.14
-    dev: true
+      '@redis/client': 1.5.13
+    dev: false
 
-  /@types/pdf-parse@1.1.1:
-    resolution: {integrity: sha512-lDBKAslCwvfK2uvS1Uk+UCpGvw+JRy5vnBFANPKFSY92n/iEnunXi0KVBjPJXhsM4jtdcPnS7tuZ0zjA9x6piQ==}
-    dev: true
+  /@redis/json@1.0.6(@redis/client@1.5.14):
+    resolution: {integrity: sha512-rcZO3bfQbm2zPRpqo82XbW8zg4G/w4W3tI7X8Mqleq9goQjAGLL7q/1n1ZX4dXEAmORVZ4s1+uKLaUOg7LrUhw==}
+    peerDependencies:
+      '@redis/client': ^1.0.0
+    dependencies:
+      '@redis/client': 1.5.14
+    dev: false
 
-  /@types/postman-collection@3.5.7:
-    resolution: {integrity: sha512-wqZ/MlGEYP+RoiofnAnKDJAHxRzmMK97CeFLoHPNoHdHX0uyBLCDl+uZV9x4xuPVRjkeM4xcarIaUaUk47c7SQ==}
+  /@redis/search@1.1.6(@redis/client@1.5.13):
+    resolution: {integrity: sha512-mZXCxbTYKBQ3M2lZnEddwEAks0Kc7nauire8q20oA0oA/LoA+E/b5Y5KZn232ztPb1FkIGqo12vh3Lf+Vw5iTw==}
+    peerDependencies:
+      '@redis/client': ^1.0.0
     dependencies:
-      '@types/node': 16.18.12
-    dev: true
+      '@redis/client': 1.5.13
+    dev: false
 
-  /@types/prettier@2.7.1:
-    resolution: {integrity: sha512-ri0UmynRRvZiiUJdiz38MmIblKK+oH30MztdBVR95dv/Ubw6neWSb8u1XpRb72L4qsZOhz+L+z9JD40SJmfWow==}
-    dev: true
+  /@redis/search@1.1.6(@redis/client@1.5.14):
+    resolution: {integrity: sha512-mZXCxbTYKBQ3M2lZnEddwEAks0Kc7nauire8q20oA0oA/LoA+E/b5Y5KZn232ztPb1FkIGqo12vh3Lf+Vw5iTw==}
+    peerDependencies:
+      '@redis/client': ^1.0.0
+    dependencies:
+      '@redis/client': 1.5.14
+    dev: false
 
-  /@types/pretty-hrtime@1.0.1:
-    resolution: {integrity: sha512-VjID5MJb1eGKthz2qUerWT8+R4b9N+CHvGCzg9fn4kWZgaF9AhdYikQio3R7wV8YY1NsQKPaCwKz1Yff+aHNUQ==}
-    dev: true
+  /@redis/time-series@1.0.5(@redis/client@1.5.13):
+    resolution: {integrity: sha512-IFjIgTusQym2B5IZJG3XKr5llka7ey84fw/NOYqESP5WUfQs9zz1ww/9+qoz4ka/S6KcGBodzlCeZ5UImKbscg==}
+    peerDependencies:
+      '@redis/client': ^1.0.0
+    dependencies:
+      '@redis/client': 1.5.13
+    dev: false
 
-  /@types/promise-ftp-common@1.1.0:
-    resolution: {integrity: sha512-mqo6D4qdiJdzeqlzFwEIchQQZk2hZacjssmjoAX7nClcREmRUUsnmgbWXEfA2qK986rwOPqepfRoSu7rsjAKag==}
-    dev: true
+  /@redis/time-series@1.0.5(@redis/client@1.5.14):
+    resolution: {integrity: sha512-IFjIgTusQym2B5IZJG3XKr5llka7ey84fw/NOYqESP5WUfQs9zz1ww/9+qoz4ka/S6KcGBodzlCeZ5UImKbscg==}
+    peerDependencies:
+      '@redis/client': ^1.0.0
+    dependencies:
+      '@redis/client': 1.5.14
+    dev: false
 
-  /@types/promise-ftp@1.3.4:
-    resolution: {integrity: sha512-fCIX7I84e25RX6bZ+qiIv0Puu5axWhCj9+El+4Kz1gZZyO/NvwdGTNQ33y6jdrPuTn3Df3kg7nMi1HohjNQLog==}
+  /@redocly/ajv@8.11.0:
+    resolution: {integrity: sha512-9GWx27t7xWhDIR02PA18nzBdLcKQRgc46xNQvjFkrYk4UOmvKhJ/dawwiX0cCOeetN5LcaaiqQbVOWYK62SGHw==}
     dependencies:
-      '@types/bluebird': 3.5.37
-      '@types/ftp': 0.3.33
-      '@types/node': 16.18.12
-      '@types/promise-ftp-common': 1.1.0
+      fast-deep-equal: 3.1.3
+      json-schema-traverse: 1.0.0
+      require-from-string: 2.0.2
+      uri-js: 4.4.1
     dev: true
 
-  /@types/prop-types@15.7.5:
-    resolution: {integrity: sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==}
+  /@redocly/cli@1.6.0:
+    resolution: {integrity: sha512-0naVFJGR2tVcpMIHSFRr2HAoyy70qMqDAP6kXcnOdkGkwLRJ8s/5n1STwsym/yZwNkhrt2M0cKT6KAMlTUeCeg==}
+    engines: {node: '>=14.19.0', npm: '>=7.0.0'}
+    hasBin: true
+    dependencies:
+      '@redocly/openapi-core': 1.6.0
+      chokidar: 3.5.2
+      colorette: 1.4.0
+      core-js: 3.35.0
+      get-port-please: 3.1.2
+      glob: 7.2.3
+      handlebars: 4.7.8
+      mobx: 6.12.0
+      node-fetch: 2.7.0(encoding@0.1.13)
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
+      redoc: 2.1.3(core-js@3.35.0)(mobx@6.12.0)(react-dom@18.2.0)(react@18.2.0)(styled-components@6.1.8)
+      semver: 7.6.0
+      simple-websocket: 9.1.0
+      styled-components: 6.1.8(react-dom@18.2.0)(react@18.2.0)
+      yargs: 17.0.1
+    transitivePeerDependencies:
+      - bufferutil
+      - encoding
+      - react-native
+      - supports-color
+      - utf-8-validate
     dev: true
 
-  /@types/psl@1.1.0:
-    resolution: {integrity: sha512-HhZnoLAvI2koev3czVPzBNRYvdrzJGLjQbWZhqFmS9Q6a0yumc5qtfSahBGb5g+6qWvA8iiQktqGkwoIXa/BNQ==}
+  /@redocly/openapi-core@1.6.0:
+    resolution: {integrity: sha512-oao6Aey4peLKfagzWGb6N7OBI6CoDWEP4ka/XjrUNZw+UoKVVg3hVBXW4Vr3CJ2O8j6wEa2i+Lbb92VQQsoxwg==}
+    engines: {node: '>=14.19.0', npm: '>=7.0.0'}
+    dependencies:
+      '@redocly/ajv': 8.11.0
+      '@types/node': 18.16.16
+      colorette: 1.4.0
+      js-levenshtein: 1.1.6
+      js-yaml: 4.1.0
+      lodash.isequal: 4.5.0
+      minimatch: 5.1.5
+      node-fetch: 2.7.0(encoding@0.1.13)
+      pluralize: 8.0.0
+      yaml-ast-parser: 0.0.43
+    transitivePeerDependencies:
+      - encoding
     dev: true
 
-  /@types/qrcode@1.5.0:
-    resolution: {integrity: sha512-x5ilHXRxUPIMfjtM+1vf/GPTRWZ81nqscursm5gMznJeK9M0YnZ1c3bEvRLQ0zSSgedLx1J6MGL231ObQGGhaA==}
+  /@rollup/plugin-alias@5.1.0(rollup@3.29.4):
+    resolution: {integrity: sha512-lpA3RZ9PdIG7qqhEfv79tBffNaoDuukFDrmhLqg9ifv99u/ehn+lOg30x2zmhf8AQqQUZaMk/B9fZraQ6/acDQ==}
+    engines: {node: '>=14.0.0'}
+    peerDependencies:
+      rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0
+    peerDependenciesMeta:
+      rollup:
+        optional: true
     dependencies:
-      '@types/node': 16.18.12
+      rollup: 3.29.4
+      slash: 4.0.0
     dev: true
 
-  /@types/qs@6.9.7:
-    resolution: {integrity: sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==}
-
-  /@types/range-parser@1.2.4:
-    resolution: {integrity: sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==}
-
-  /@types/react@18.0.27:
-    resolution: {integrity: sha512-3vtRKHgVxu3Jp9t718R9BuzoD4NcQ8YJ5XRzsSKxNDiDonD2MXIT1TmSkenxuCycZJoQT5d2vE8LwWJxBC1gmA==}
+  /@rollup/plugin-commonjs@25.0.7(rollup@3.29.4):
+    resolution: {integrity: sha512-nEvcR+LRjEjsaSsc4x3XZfCCvZIaSMenZu/OiwOKGN2UhQpAYI7ru7czFvyWbErlpoGjnSX3D5Ch5FcMA3kRWQ==}
+    engines: {node: '>=14.0.0'}
+    peerDependencies:
+      rollup: ^2.68.0||^3.0.0||^4.0.0
+    peerDependenciesMeta:
+      rollup:
+        optional: true
     dependencies:
-      '@types/prop-types': 15.7.5
-      '@types/scheduler': 0.16.2
-      csstype: 3.1.1
+      '@rollup/pluginutils': 5.0.5(rollup@3.29.4)
+      commondir: 1.0.1
+      estree-walker: 2.0.2
+      glob: 8.1.0
+      is-reference: 1.2.1
+      magic-string: 0.30.5
+      rollup: 3.29.4
     dev: true
 
-  /@types/redis@2.8.32:
-    resolution: {integrity: sha512-7jkMKxcGq9p242exlbsVzuJb57KqHRhNl4dHoQu2Y5v9bCAbtIXXH0R3HleSQW4CTOqpHIYUW3t6tpUj4BVQ+w==}
+  /@rollup/plugin-json@6.1.0(rollup@3.29.4):
+    resolution: {integrity: sha512-EGI2te5ENk1coGeADSIwZ7G2Q8CJS2sF120T7jLw4xFw9n7wIOXHo+kIYRAoVpJAN+kmqZSoO3Fp4JtoNF4ReA==}
+    engines: {node: '>=14.0.0'}
+    peerDependencies:
+      rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0
+    peerDependenciesMeta:
+      rollup:
+        optional: true
     dependencies:
-      '@types/node': 16.18.12
+      '@rollup/pluginutils': 5.1.0(rollup@3.29.4)
+      rollup: 3.29.4
     dev: true
 
-  /@types/replacestream@4.0.1:
-    resolution: {integrity: sha512-3ecTmnzB90sgarVpIszCF1cX2cnxwqDovWb31jGrKfxAL0Knui1H7Reaz/zlT9zaE3u0un7L5cNy9fQPy0d2sg==}
+  /@rollup/plugin-node-resolve@15.2.3(rollup@3.29.4):
+    resolution: {integrity: sha512-j/lym8nf5E21LwBT4Df1VD6hRO2L2iwUeUmP7litikRsVp1H6NWx20NEp0Y7su+7XGc476GnXXc4kFeZNGmaSQ==}
+    engines: {node: '>=14.0.0'}
+    peerDependencies:
+      rollup: ^2.78.0||^3.0.0||^4.0.0
+    peerDependenciesMeta:
+      rollup:
+        optional: true
+    dependencies:
+      '@rollup/pluginutils': 5.0.5(rollup@3.29.4)
+      '@types/resolve': 1.20.2
+      deepmerge: 4.3.1
+      is-builtin-module: 3.2.1
+      is-module: 1.0.0
+      resolve: 1.22.8
+      rollup: 3.29.4
     dev: true
 
-  /@types/request-promise-native@1.0.18:
-    resolution: {integrity: sha512-tPnODeISFc/c1LjWyLuZUY+Z0uLB3+IMfNoQyDEi395+j6kTFTTRAqjENjoPJUid4vHRGEozoTrcTrfZM+AcbA==}
+  /@rollup/plugin-replace@5.0.5(rollup@3.29.4):
+    resolution: {integrity: sha512-rYO4fOi8lMaTg/z5Jb+hKnrHHVn8j2lwkqwyS4kTRhKyWOLf2wST2sWXr4WzWiTcoHTp2sTjqUbqIj2E39slKQ==}
+    engines: {node: '>=14.0.0'}
+    peerDependencies:
+      rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0
+    peerDependenciesMeta:
+      rollup:
+        optional: true
     dependencies:
-      '@types/request': 2.48.8
+      '@rollup/pluginutils': 5.0.5(rollup@3.29.4)
+      magic-string: 0.30.5
+      rollup: 3.29.4
     dev: true
 
-  /@types/request@2.48.8:
-    resolution: {integrity: sha512-whjk1EDJPcAR2kYHRbFl/lKeeKYTi05A15K9bnLInCVroNDCtXce57xKdI0/rQaA3K+6q0eFyUBPmqfSndUZdQ==}
+  /@rollup/pluginutils@5.0.5(rollup@3.29.4):
+    resolution: {integrity: sha512-6aEYR910NyP73oHiJglti74iRyOwgFU4x3meH/H8OJx6Ry0j6cOVZ5X/wTvub7G7Ao6qaHBEaNsV3GLJkSsF+Q==}
+    engines: {node: '>=14.0.0'}
+    peerDependencies:
+      rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0
+    peerDependenciesMeta:
+      rollup:
+        optional: true
     dependencies:
-      '@types/caseless': 0.12.2
-      '@types/node': 16.18.12
-      '@types/tough-cookie': 4.0.2
-      form-data: 2.5.1
+      '@types/estree': 1.0.0
+      estree-walker: 2.0.2
+      picomatch: 2.3.1
+      rollup: 3.29.4
     dev: true
 
-  /@types/sanitize-html@2.8.0:
-    resolution: {integrity: sha512-Uih6caOm3DsBYnVGOYn0A9NoTNe1c4aPStmHC/YA2JrpP9kx//jzaRcIklFvSpvVQEcpl/ZCr4DgISSf/YxTvg==}
+  /@rollup/pluginutils@5.1.0(rollup@3.29.4):
+    resolution: {integrity: sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g==}
+    engines: {node: '>=14.0.0'}
+    peerDependencies:
+      rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0
+    peerDependenciesMeta:
+      rollup:
+        optional: true
     dependencies:
-      htmlparser2: 8.0.1
+      '@types/estree': 1.0.0
+      estree-walker: 2.0.2
+      picomatch: 2.3.1
+      rollup: 3.29.4
     dev: true
 
-  /@types/scheduler@0.16.2:
-    resolution: {integrity: sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==}
+  /@rollup/rollup-android-arm-eabi@4.6.0:
+    resolution: {integrity: sha512-keHkkWAe7OtdALGoutLY3utvthkGF+Y17ws9LYT8pxMBYXaCoH/8dXS2uzo6e8+sEhY7y/zi5RFo22Dy2lFpDw==}
+    cpu: [arm]
+    os: [android]
     dev: true
+    optional: true
 
-  /@types/semver@7.3.13:
-    resolution: {integrity: sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==}
+  /@rollup/rollup-android-arm64@4.6.0:
+    resolution: {integrity: sha512-y3Kt+34smKQNWilicPbBz/MXEY7QwDzMFNgwEWeYiOhUt9MTWKjHqe3EVkXwT2fR7izOvHpDWZ0o2IyD9SWX7A==}
+    cpu: [arm64]
+    os: [android]
     dev: true
+    optional: true
 
-  /@types/send@0.17.1:
-    resolution: {integrity: sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q==}
-    dependencies:
-      '@types/mime': 1.3.2
-      '@types/node': 16.18.12
+  /@rollup/rollup-darwin-arm64@4.6.0:
+    resolution: {integrity: sha512-oLzzxcUIHltHxOCmaXl+pkIlU+uhSxef5HfntW7RsLh1eHm+vJzjD9Oo4oUKso4YuP4PpbFJNlZjJuOrxo8dPg==}
+    cpu: [arm64]
+    os: [darwin]
     dev: true
+    optional: true
 
-  /@types/serve-static@1.15.0:
-    resolution: {integrity: sha512-z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg==}
-    dependencies:
-      '@types/mime': 3.0.1
-      '@types/node': 16.18.12
+  /@rollup/rollup-darwin-x64@4.6.0:
+    resolution: {integrity: sha512-+ANnmjkcOBaV25n0+M0Bere3roeVAnwlKW65qagtuAfIxXF9YxUneRyAn/RDcIdRa7QrjRNJL3jR7T43ObGe8Q==}
+    cpu: [x64]
+    os: [darwin]
+    dev: true
+    optional: true
 
-  /@types/shelljs@0.8.11:
-    resolution: {integrity: sha512-x9yaMvEh5BEaZKeVQC4vp3l+QoFj3BXcd4aYfuKSzIIyihjdVARAadYy3SMNIz0WCCdS2vB9JL/U6GQk5PaxQw==}
-    dependencies:
-      '@types/glob': 8.0.0
-      '@types/node': 16.18.12
+  /@rollup/rollup-linux-arm-gnueabihf@4.6.0:
+    resolution: {integrity: sha512-tBTSIkjSVUyrekddpkAqKOosnj1Fc0ZY0rJL2bIEWPKqlEQk0paORL9pUIlt7lcGJi3LzMIlUGXvtNi1Z6MOCQ==}
+    cpu: [arm]
+    os: [linux]
     dev: true
+    optional: true
 
-  /@types/showdown@1.9.4:
-    resolution: {integrity: sha512-50ehC3IAijfkvoNqmQ+VL73S7orOxmAK8ljQAFBv8o7G66lAZyxQj1L3BAv2dD86myLXI+sgKP1kcxAaxW356w==}
+  /@rollup/rollup-linux-arm64-gnu@4.6.0:
+    resolution: {integrity: sha512-Ed8uJI3kM11de9S0j67wAV07JUNhbAqIrDYhQBrQW42jGopgheyk/cdcshgGO4fW5Wjq97COCY/BHogdGvKVNQ==}
+    cpu: [arm64]
+    os: [linux]
     dev: true
+    optional: true
 
-  /@types/sinonjs__fake-timers@8.1.1:
-    resolution: {integrity: sha512-0kSuKjAS0TrGLJ0M/+8MaFkGsQhZpB6pxOmvS3K8FYI72K//YmdfoW9X2qPsAKh1mkwxGD5zib9s1FIFed6E8g==}
+  /@rollup/rollup-linux-arm64-musl@4.6.0:
+    resolution: {integrity: sha512-mZoNQ/qK4D7SSY8v6kEsAAyDgznzLLuSFCA3aBHZTmf3HP/dW4tNLTtWh9+LfyO0Z1aUn+ecpT7IQ3WtIg3ViQ==}
+    cpu: [arm64]
+    os: [linux]
     dev: true
+    optional: true
 
-  /@types/sizzle@2.3.3:
-    resolution: {integrity: sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==}
+  /@rollup/rollup-linux-x64-gnu@4.6.0:
+    resolution: {integrity: sha512-rouezFHpwCqdEXsqAfNsTgSWO0FoZ5hKv5p+TGO5KFhyN/dvYXNMqMolOb8BkyKcPqjYRBeT+Z6V3aM26rPaYg==}
+    cpu: [x64]
+    os: [linux]
+    dev: true
+    optional: true
+
+  /@rollup/rollup-linux-x64-musl@4.6.0:
+    resolution: {integrity: sha512-Bbm+fyn3S6u51urfj3YnqBXg5vI2jQPncRRELaucmhBVyZkbWClQ1fEsRmdnCPpQOQfkpg9gZArvtMVkOMsh1w==}
+    cpu: [x64]
+    os: [linux]
+    dev: true
+    optional: true
+
+  /@rollup/rollup-win32-arm64-msvc@4.6.0:
+    resolution: {integrity: sha512-+MRMcyx9L2kTrTUzYmR61+XVsliMG4odFb5UmqtiT8xOfEicfYAGEuF/D1Pww1+uZkYhBqAHpvju7VN+GnC3ng==}
+    cpu: [arm64]
+    os: [win32]
     dev: true
+    optional: true
 
-  /@types/snowflake-sdk@1.6.8:
-    resolution: {integrity: sha512-hf7YoxKjdk22VtKBR7/vCSYSv/YyHhbkTiZ+Dk/UnC83GMYOFaXbZktt0cIP98rmhk4V8nGpbpEivV4y6GUFNw==}
-    dependencies:
-      '@types/generic-pool': 3.1.11
-      '@types/node': 16.18.12
+  /@rollup/rollup-win32-ia32-msvc@4.6.0:
+    resolution: {integrity: sha512-rxfeE6K6s/Xl2HGeK6cO8SiQq3k/3BYpw7cfhW5Bk2euXNEpuzi2cc7llxx1si1QgwfjNtdRNTGqdBzGlFZGFw==}
+    cpu: [ia32]
+    os: [win32]
     dev: true
+    optional: true
 
-  /@types/speakeasy@2.0.7:
-    resolution: {integrity: sha512-JEcOhN2SQCoX86ZfiZEe8px84sVJtivBXMZfOVyARTYEj0hrwwbj1nF0FwEL3nJSoEV6uTbcdLllMKBgAYHWCQ==}
-    dependencies:
-      '@types/node': 16.18.12
+  /@rollup/rollup-win32-x64-msvc@4.6.0:
+    resolution: {integrity: sha512-QqmCsydHS172Y0Kc13bkMXvipbJSvzeglBncJG3LsYJSiPlxYACz7MmJBs4A8l1oU+jfhYEIC/+AUSlvjmiX/g==}
+    cpu: [x64]
+    os: [win32]
     dev: true
+    optional: true
 
-  /@types/ssh2-sftp-client@5.3.2:
-    resolution: {integrity: sha512-s5R3hsnI3/7Ar57LG++gm2kxgONHtOZY2A3AgGzEwiJlHR8j7MRPDw1n/hG6oMnOUJ4zuoLNtDXgDfmmxV4lDA==}
+  /@rudderstack/rudder-sdk-node@2.0.7(tslib@2.6.2):
+    resolution: {integrity: sha512-V8SWlryHDHSleM51udW3DbmCyADa7Naa9OTtG/YjgTStxFsyLnGRYd9Mr616qR94Gi1h/zYhE/tvWio+0fiSzA==}
+    engines: {node: '>=12'}
+    peerDependencies:
+      tslib: ^2.6.2
     dependencies:
-      '@types/ssh2': 1.11.6
-    dev: true
+      axios: 1.6.7
+      axios-retry: 3.7.0
+      component-type: 1.2.1
+      join-component: 1.1.0
+      lodash.clonedeep: 4.5.0
+      lodash.isstring: 4.0.1
+      md5: 2.3.0
+      ms: 2.1.3
+      remove-trailing-slash: 0.1.1
+      serialize-javascript: 6.0.2
+      tslib: 2.6.2
+      uuid: 8.3.2
+    optionalDependencies:
+      bull: 4.11.3
+    transitivePeerDependencies:
+      - debug
+      - supports-color
+    dev: false
 
-  /@types/ssh2-streams@0.1.9:
-    resolution: {integrity: sha512-I2J9jKqfmvXLR5GomDiCoHrEJ58hAOmFrekfFqmCFd+A6gaEStvWnPykoWUwld1PNg4G5ag1LwdA+Lz1doRJqg==}
+  /@rushstack/node-core-library@3.62.0:
+    resolution: {integrity: sha512-88aJn2h8UpSvdwuDXBv1/v1heM6GnBf3RjEy6ZPP7UnzHNCqOHA2Ut+ScYUbXcqIdfew9JlTAe3g+cnX9xQ/Aw==}
+    peerDependencies:
+      '@types/node': ^18.16.16
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
     dependencies:
-      '@types/node': 16.18.12
+      colors: 1.2.5
+      fs-extra: 7.0.1
+      import-lazy: 4.0.0
+      jju: 1.4.0
+      resolve: 1.22.8
+      semver: 7.6.0
+      z-schema: 5.0.5
     dev: true
 
-  /@types/ssh2@1.11.6:
-    resolution: {integrity: sha512-8Mf6bhzYYBLEB/G6COux7DS/F5bCWwojv/qFo2yH/e4cLzAavJnxvFXrYW59iKfXdhG6OmzJcXDasgOb/s0rxw==}
+  /@rushstack/rig-package@0.5.1:
+    resolution: {integrity: sha512-pXRYSe29TjRw7rqxD4WS3HN/sRSbfr+tJs4a9uuaSIBAITbUggygdhuG0VrO0EO+QqH91GhYMN4S6KRtOEmGVA==}
     dependencies:
-      '@types/node': 16.18.12
+      resolve: 1.22.8
+      strip-json-comments: 3.1.1
     dev: true
 
-  /@types/sshpk@1.17.1:
-    resolution: {integrity: sha512-bOJek/W++DvWRNAeHmpvgX8Q1ypAq4nmeVi3nJ+pjDcMB214S8kSGkxRUw/Uz+zau4VwxcfNp0xUq4s/3DLjLw==}
+  /@rushstack/ts-command-line@4.17.1:
+    resolution: {integrity: sha512-2jweO1O57BYP5qdBGl6apJLB+aRIn5ccIRTPDyULh0KMwVzFqWtw6IZWt1qtUoZD/pD2RNkIOosH6Cq45rIYeg==}
     dependencies:
-      '@types/asn1': 0.2.0
-      '@types/node': 16.18.12
-    dev: true
-
-  /@types/stack-utils@2.0.1:
-    resolution: {integrity: sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==}
+      '@types/argparse': 1.0.38
+      argparse: 1.0.10
+      colors: 1.2.5
+      string-argv: 0.3.1
     dev: true
 
-  /@types/strftime@0.9.8:
-    resolution: {integrity: sha512-QIvDlGAKyF3YJbT3QZnfC+RIvV5noyDbi+ZJ5rkaSRqxCGrYJefgXm3leZAjtoQOutZe1hCXbAg+p89/Vj4HlQ==}
+  /@selderee/plugin-htmlparser2@0.11.0:
+    resolution: {integrity: sha512-P33hHGdldxGabLFjPPpaTxVolMrzrcegejx+0GxjrIb9Zv48D8yAIA/QTDR2dFl7Uz7urX8aX6+5bCZslr+gWQ==}
+    dependencies:
+      domhandler: 5.0.3
+      selderee: 0.11.0
     dev: false
 
-  /@types/superagent@4.1.13:
-    resolution: {integrity: sha512-YIGelp3ZyMiH0/A09PMAORO0EBGlF5xIKfDpK74wdYvWUs2o96b5CItJcWPdH409b7SAXIIG6p8NdU/4U2Maww==}
+  /@sentry-internal/tracing@7.87.0:
+    resolution: {integrity: sha512-HYa0+rfFmYQ/DadXoiuarTSxrcnYDCd/fm0pFuOHjICtfja8IcLegVYP2/r3CgwB+IjquCtJ5kDcqS/NTgUcpA==}
+    engines: {node: '>=8'}
     dependencies:
-      '@types/cookiejar': 2.1.2
-      '@types/node': 16.18.12
-    dev: true
+      '@sentry/core': 7.87.0
+      '@sentry/types': 7.87.0
+      '@sentry/utils': 7.87.0
 
-  /@types/supertest@2.0.12:
-    resolution: {integrity: sha512-X3HPWTwXRerBZS7Mo1k6vMVR1Z6zmJcDVn5O/31whe0tnjE4te6ZJSJGq1RiqHPjzPdMTfjCFogDJmwng9xHaQ==}
+  /@sentry/bundler-plugin-core@2.5.0:
+    resolution: {integrity: sha512-UNjeTSf0Irt/RsC1Xsfxa+RC92mBvjzuWQnvHJ5c+mXwUt+jLcFgGMCSVK/FCDZO+gAeKzmU1+G2UexbsNAP8w==}
+    engines: {node: '>= 14'}
     dependencies:
-      '@types/superagent': 4.1.13
+      '@sentry/cli': 2.17.0(patch_hash=nchnoezkq6p37qaiku3vrpwraq)
+      '@sentry/node': 7.87.0
+      '@sentry/utils': 7.60.1
+      dotenv: 16.3.1
+      find-up: 5.0.0
+      glob: 9.3.2
+      magic-string: 0.27.0
+      unplugin: 1.0.1
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
     dev: true
 
-  /@types/swagger-ui-express@4.1.3:
-    resolution: {integrity: sha512-jqCjGU/tGEaqIplPy3WyQg+Nrp6y80DCFnDEAvVKWkJyv0VivSSDCChkppHRHAablvInZe6pijDFMnavtN0vqA==}
+  /@sentry/cli@2.17.0(patch_hash=nchnoezkq6p37qaiku3vrpwraq):
+    resolution: {integrity: sha512-CHIMEg8+YNCpEBDgUctu+DvG3S8+g8Zn9jTE5MMGINNmGkQTMG179LuDE04B/inaCYixLVNpFPTe6Iow3tXjnQ==}
+    engines: {node: '>= 10'}
+    hasBin: true
     dependencies:
-      '@types/express': 4.17.14
-      '@types/serve-static': 1.15.0
+      https-proxy-agent: 5.0.1
+      node-fetch: 2.7.0(encoding@0.1.13)
+      progress: 2.0.3
+      proxy-from-env: 1.1.0
+      which: 2.0.2
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
     dev: true
+    patched: true
 
-  /@types/swagger-ui@3.52.0:
-    resolution: {integrity: sha512-SlufixEmh+8CLHNgTfAfCT1icNOF7bXboWabhHr1+hIolqlvfwYJGe7HgRcpI3ChE7HWASmEKLkMu34rxseJjQ==}
-    dev: true
+  /@sentry/core@7.87.0:
+    resolution: {integrity: sha512-jkoXqK/nuYh8DYS+n7uaSuSIdw4HJemyRkXsWjAEPtEgD7taGMafZGbP5pl+XE38SE59jTBxmKnkUEZOFMgZGA==}
+    engines: {node: '>=8'}
+    dependencies:
+      '@sentry/types': 7.87.0
+      '@sentry/utils': 7.87.0
 
-  /@types/syslog-client@1.1.2:
-    resolution: {integrity: sha512-X8MwGedXYNmYltPDaZQCM9X6cSdfFbJZWhrU81gWKsg+Q6mSgRWs/12Mq9nHaUV4wqMYDNrnytbwbMUiVnWegw==}
+  /@sentry/integrations@7.87.0:
+    resolution: {integrity: sha512-xbyOQeyfG1sF2PBMIOz3c3i0Y3+8q4UlxoeOhpFe6Vpjek+I/g7onZT6YevT6cWG083cg+rS0VCgPQSUV2lxIw==}
+    engines: {node: '>=8'}
     dependencies:
-      '@types/node': 16.18.12
-    dev: true
+      '@sentry/core': 7.87.0
+      '@sentry/types': 7.87.0
+      '@sentry/utils': 7.87.0
+      localforage: 1.10.0
+    dev: false
 
-  /@types/tedious@4.0.9:
-    resolution: {integrity: sha512-ipwFvfy9b2m0gjHsIX0D6NAAwGCKokzf5zJqUZHUGt+7uWVlBIy6n2eyMgiKQ8ChLFVxic/zwQUhjLYNzbHDRA==}
+  /@sentry/node@7.87.0:
+    resolution: {integrity: sha512-mGcZMCL3/IMTLIRcWLF+H9z2Bb2d34gKmg2rhXqI8BqhhUA551jMRlZv/y4za2Osjy550KwVoNsA1qtEe5mYyQ==}
+    engines: {node: '>=8'}
     dependencies:
-      '@types/node': 16.18.12
+      '@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
+    transitivePeerDependencies:
+      - supports-color
+
+  /@sentry/types@7.60.1:
+    resolution: {integrity: sha512-8lKKSCOhZ953cWxwnfZwoR3ZFFlZG4P3PQFTaFt/u4LxLh/0zYbdtgvtUqXRURjMCi5P6ddeE9Uw9FGnTJCsTw==}
+    engines: {node: '>=8'}
     dev: true
 
-  /@types/testing-library__jest-dom@5.14.5:
-    resolution: {integrity: sha512-SBwbxYoyPIvxHbeHxTZX2Pe/74F/tX2/D3mMvzabdeJ25bBojfW0TyB8BHrbq/9zaaKICJZjLP+8r6AeZMFCuQ==}
+  /@sentry/types@7.87.0:
+    resolution: {integrity: sha512-w8jKFHq/Llupmr2FezmFgQsnm3y/CnqLjb7s6PstI78E409wrhH7p7oqX/OEuzccH1qNCNwes/3QKvPTRQDB4Q==}
+    engines: {node: '>=8'}
+
+  /@sentry/utils@7.60.1:
+    resolution: {integrity: sha512-ik+5sKGBx4DWuvf6UUKPSafaDiASxP+Xvjg3C9ppop2I/JWxP1FfZ5g22n5ZmPmNahD6clTSoTWly8qyDUlUOw==}
+    engines: {node: '>=8'}
     dependencies:
-      '@types/jest': 29.2.5
+      '@sentry/types': 7.60.1
+      tslib: 2.6.2
     dev: true
 
-  /@types/through@0.0.30:
-    resolution: {integrity: sha512-FvnCJljyxhPM3gkRgWmxmDZyAQSiBQQWLI0A0VFL0K7W1oRUrPJSqNO0NvTnLkBcotdlp3lKvaT0JrnyRDkzOg==}
+  /@sentry/utils@7.87.0:
+    resolution: {integrity: sha512-7xgtPTnTNP/4IznFMFXxltuaXfLvzznrYCDMv9ny8EeUjJqlLX3CVA8Qq3YALsLCQCKcrGRARbAcd/EGG//w2w==}
+    engines: {node: '>=8'}
     dependencies:
-      '@types/node': 16.18.12
-    dev: true
+      '@sentry/types': 7.87.0
 
-  /@types/tmp@0.2.3:
-    resolution: {integrity: sha512-dDZH/tXzwjutnuk4UacGgFRwV+JSLaXL1ikvidfJprkb7L9Nx1njcRHHmi3Dsvt7pgqqTEeucQuOrWHPFgzVHA==}
+  /@sentry/vite-plugin@2.5.0:
+    resolution: {integrity: sha512-u5lfIysy6UVzUGn/adyDcRXfzFyip4mLGThTnKeOeA9rCgmJUVnErH8TD8xhTKdpq/MBiQ+KqrC6xG9pKCa96g==}
+    engines: {node: '>= 14'}
+    dependencies:
+      '@sentry/bundler-plugin-core': 2.5.0
+      unplugin: 1.0.1
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
     dev: true
 
-  /@types/tough-cookie@2.3.8:
-    resolution: {integrity: sha512-7axfYN8SW9pWg78NgenHasSproWQee5rzyPVLC9HpaQSDgNArsnKJD88EaMfi4Pl48AyciO3agYCFqpHS1gLpg==}
+  /@sevinf/maybe@0.5.0:
+    resolution: {integrity: sha512-ARhyoYDnY1LES3vYI0fiG6e9esWfTNcXcO6+MPJJXcnyMV3bim4lnFt45VXouV7y82F4x3YH8nOQ6VztuvUiWg==}
     dev: false
 
-  /@types/tough-cookie@4.0.2:
-    resolution: {integrity: sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw==}
-    dev: true
-
-  /@types/trusted-types@2.0.2:
-    resolution: {integrity: sha512-F5DIZ36YVLE+PN+Zwws4kJogq47hNgX3Nx6WyDJ3kcplxyke3XIzB8uK5n/Lpm1HBsbGzd6nmGehL8cPekP+Tg==}
-    dev: true
-
-  /@types/tunnel@0.0.3:
-    resolution: {integrity: sha512-sOUTGn6h1SfQ+gbgqC364jLFBw2lnFqkgF3q0WovEHRLMrVD1sd5aufqi/aJObLekJO+Aq5z646U4Oxy6shXMA==}
+  /@sideway/address@4.1.4:
+    resolution: {integrity: sha512-7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw==}
     dependencies:
-      '@types/node': 16.18.12
-    dev: false
-
-  /@types/unist@2.0.6:
-    resolution: {integrity: sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==}
+      '@hapi/hoek': 9.3.0
     dev: true
 
-  /@types/uuid@8.3.4:
-    resolution: {integrity: sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw==}
+  /@sideway/formula@3.0.1:
+    resolution: {integrity: sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg==}
     dev: true
 
-  /@types/uuid@9.0.0:
-    resolution: {integrity: sha512-kr90f+ERiQtKWMz5rP32ltJ/BtULDI5RVO0uavn1HQUOwjx0R1h0rnDYNL0CepF1zL5bSY6FISAfd9tOdDhU5Q==}
-    dev: false
-
-  /@types/validator@13.7.10:
-    resolution: {integrity: sha512-t1yxFAR2n0+VO6hd/FJ9F2uezAZVWHLmpmlJzm1eX03+H7+HsuTAp7L8QJs+2pQCfWkP1+EXsGK9Z9v7o/qPVQ==}
-    dev: false
-
-  /@types/validator@13.7.7:
-    resolution: {integrity: sha512-jiEw2kTUJ8Jsh4A1K4b5Pkjj9Xz6FktLLOQ36ZVLRkmxFbpTvAV2VRoKMojz8UlZxNg/2dZqzpigH4JYn1bkQg==}
+  /@sideway/pinpoint@2.0.0:
+    resolution: {integrity: sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==}
     dev: true
 
-  /@types/vorpal@1.12.2:
-    resolution: {integrity: sha512-y9Ydpp4K9k+gGKFFmpnYNXJxhaq7smglPMcF2wymMaEbPhMS2gHkkD9OMoaqhktJErI+VeHG1ciy1JNz1nhOTQ==}
+  /@sinclair/typebox@0.25.21:
+    resolution: {integrity: sha512-gFukHN4t8K4+wVC+ECqeqwzBDeFeTzBXroBTqE6vcWrQGbEUpHO7LYdG0f4xnvYq4VOEwITSlHlp0JBAIFMS/g==}
     dev: true
 
-  /@types/webidl-conversions@7.0.0:
-    resolution: {integrity: sha512-xTE1E+YF4aWPJJeUzaZI5DRntlkY3+BCVJi0axFptnjGmAoWxkyREIh/XMrfxVLejwQxMCfDXdICo0VLxThrog==}
-    dev: false
-
-  /@types/webpack-env@1.18.0:
-    resolution: {integrity: sha512-56/MAlX5WMsPVbOg7tAxnYvNYMMWr/QJiIp6BxVSW3JJXUVzzOn64qW8TzQyMSqSUFM2+PVI4aUHcHOzIz/1tg==}
-    dev: true
+  /@sinclair/typebox@0.27.8:
+    resolution: {integrity: sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==}
 
-  /@types/whatwg-url@8.2.2:
-    resolution: {integrity: sha512-FtQu10RWgn3D9U4aazdwIE2yzphmTJREDqNdODHrbrZmmMqI0vMheC/6NE/J1Yveaj8H+ela+YwWTjq5PGmuhA==}
-    dependencies:
-      '@types/node': 16.18.12
-      '@types/webidl-conversions': 7.0.0
+  /@sinclair/typebox@0.29.6:
+    resolution: {integrity: sha512-aX5IFYWlMa7tQ8xZr3b2gtVReCvg7f3LEhjir/JAjX2bJCMVJA5tIPv30wTD4KDfcwMd7DDYY3hFDeGmOgtrZQ==}
     dev: false
 
-  /@types/ws@8.5.4:
-    resolution: {integrity: sha512-zdQDHKUgcX/zBc4GrwsE/7dVdAD8JR4EuiAXiiUhhfyIJXXb2+PrGshFyeXWQPMmmZ2XxgaqclgpIC7eTXc1mg==}
+  /@sinonjs/commons@2.0.0:
+    resolution: {integrity: sha512-uLa0j859mMrg2slwQYdO/AkrOfmH+X6LTVmNTS9CqexuE2IvVORIkSpJLqePAbEnKJ77aMmCwr1NUZ57120Xcg==}
     dependencies:
-      '@types/node': 16.18.12
-    dev: true
+      type-detect: 4.0.8
 
-  /@types/xml2js@0.4.11:
-    resolution: {integrity: sha512-JdigeAKmCyoJUiQljjr7tQG3if9NkqGUgwEUqBvV0N7LM4HyQk7UXCnusRa1lnvXAEYJ8mw8GtZWioagNztOwA==}
+  /@sinonjs/fake-timers@10.0.2:
+    resolution: {integrity: sha512-SwUDyjWnah1AaNl7kxsa7cfLhlTYoiyhDAIgyh+El30YvXs/o7OLXpYH88Zdhyx9JExKrmHDJ+10bwIcY80Jmw==}
     dependencies:
-      '@types/node': 16.18.12
-    dev: true
-
-  /@types/yamljs@0.2.31:
-    resolution: {integrity: sha512-QcJ5ZczaXAqbVD3o8mw/mEBhRvO5UAdTtbvgwL/OgoWubvNBh6/MxLBAigtcgIFaq3shon9m3POIxQaLQt4fxQ==}
-    dev: true
-
-  /@types/yargs-parser@21.0.0:
-    resolution: {integrity: sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==}
-    dev: true
+      '@sinonjs/commons': 2.0.0
 
-  /@types/yargs@15.0.15:
-    resolution: {integrity: sha512-IziEYMU9XoVj8hWg7k+UJrXALkGFjWJhn5QFEv9q4p+v40oZhSuC135M38st8XPjICL7Ey4TV64ferBGUoJhBg==}
+  /@smithy/abort-controller@2.0.15:
+    resolution: {integrity: sha512-JkS36PIS3/UCbq/MaozzV7jECeL+BTt4R75bwY8i+4RASys4xOyUS1HsRyUNSqUXFP4QyCz5aNnh3ltuaxv+pw==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@types/yargs-parser': 21.0.0
-    dev: true
+      '@smithy/types': 2.7.0
+      tslib: 2.6.2
+    dev: false
 
-  /@types/yargs@17.0.19:
-    resolution: {integrity: sha512-cAx3qamwaYX9R0fzOIZAlFpo4A+1uBVCxqpKz9D26uTF4srRXaGTTsikQmaotCtNdbhzyUH7ft6p9ktz9s6UNQ==}
+  /@smithy/abort-controller@2.2.0:
+    resolution: {integrity: sha512-wRlta7GuLWpTqtFfGo+nZyOO1vEvewdNR1R4rTxpC8XU6vG/NDyrFBhwLZsqg1NUoR1noVaXJPC/7ZK47QCySw==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@types/yargs-parser': 21.0.0
-    dev: true
+      '@smithy/types': 2.12.0
+      tslib: 2.6.2
+    dev: false
 
-  /@types/yauzl@2.10.0:
-    resolution: {integrity: sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==}
+  /@smithy/chunked-blob-reader-native@2.0.1:
+    resolution: {integrity: sha512-N2oCZRglhWKm7iMBu7S6wDzXirjAofi7tAd26cxmgibRYOBS4D3hGfmkwCpHdASZzwZDD8rluh0Rcqw1JeZDRw==}
     dependencies:
-      '@types/node': 16.18.12
-    dev: true
-    optional: true
-
-  /@types/zen-observable@0.8.3:
-    resolution: {integrity: sha512-fbF6oTd4sGGy0xjHPKAt+eS2CrxJ3+6gQ3FGcBoIJR2TLAyCkCyI8JqZNy+FeON0AhVgNJoUumVoZQjBFUqHkw==}
+      '@smithy/util-base64': 2.0.1
+      tslib: 2.6.2
     dev: false
 
-  /@typescript-eslint/eslint-plugin@5.59.0(patch_hash=tk3n6hvmqwfzrfqe3awfxnqtuy)(@typescript-eslint/parser@5.59.0)(eslint@8.39.0)(typescript@5.0.3):
-    resolution: {integrity: sha512-p0QgrEyrxAWBecR56gyn3wkG15TJdI//eetInP3zYRewDh0XS+DhB3VUAd3QqvziFsfaQIoIuZMxZRB7vXYaYw==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    peerDependencies:
-      '@typescript-eslint/parser': ^5.0.0
-      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
+  /@smithy/chunked-blob-reader@2.0.0:
+    resolution: {integrity: sha512-k+J4GHJsMSAIQPChGBrjEmGS+WbPonCXesoqP9fynIqjn7rdOThdH8FAeCmokP9mxTYKQAKoHCLPzNlm6gh7Wg==}
     dependencies:
-      '@eslint-community/regexpp': 4.5.0
-      '@typescript-eslint/parser': 5.59.0(eslint@8.39.0)(typescript@5.0.3)
-      '@typescript-eslint/scope-manager': 5.59.0
-      '@typescript-eslint/type-utils': 5.59.0(eslint@8.39.0)(typescript@5.0.3)
-      '@typescript-eslint/utils': 5.59.0(eslint@8.39.0)(typescript@5.0.3)
-      debug: 4.3.4(supports-color@8.1.1)
-      eslint: 8.39.0
-      grapheme-splitter: 1.0.4
-      ignore: 5.2.4
-      natural-compare-lite: 1.4.0
-      semver: 7.3.8
-      tsutils: 3.21.0(typescript@5.0.3)
-      typescript: 5.0.3
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-    patched: true
+      tslib: 2.6.2
+    dev: false
 
-  /@typescript-eslint/parser@5.59.0(eslint@8.39.0)(typescript@5.0.3):
-    resolution: {integrity: sha512-qK9TZ70eJtjojSUMrrEwA9ZDQ4N0e/AuoOIgXuNBorXYcBDk397D2r5MIe1B3cok/oCtdNC5j+lUUpVB+Dpb+w==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    peerDependencies:
-      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
+  /@smithy/config-resolver@2.0.21:
+    resolution: {integrity: sha512-rlLIGT+BeqjnA6C2FWumPRJS1UW07iU5ZxDHtFuyam4W65gIaOFMjkB90ofKCIh+0mLVQrQFrl/VLtQT/6FWTA==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@typescript-eslint/scope-manager': 5.59.0
-      '@typescript-eslint/types': 5.59.0
-      '@typescript-eslint/typescript-estree': 5.59.0(typescript@5.0.3)
-      debug: 4.3.4(supports-color@8.1.1)
-      eslint: 8.39.0
-      typescript: 5.0.3
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
+      '@smithy/node-config-provider': 2.1.8
+      '@smithy/types': 2.7.0
+      '@smithy/util-config-provider': 2.0.0
+      '@smithy/util-middleware': 2.0.8
+      tslib: 2.6.2
+    dev: false
 
-  /@typescript-eslint/scope-manager@5.45.0:
-    resolution: {integrity: sha512-noDMjr87Arp/PuVrtvN3dXiJstQR1+XlQ4R1EvzG+NMgXi8CuMCXpb8JqNtFHKceVSQ985BZhfRdowJzbv4yKw==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+  /@smithy/config-resolver@2.2.0:
+    resolution: {integrity: sha512-fsiMgd8toyUba6n1WRmr+qACzXltpdDkPTAaDqc8QqPBUzO+/JKwL6bUBseHVi8tu9l+3JOK+tSf7cay+4B3LA==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@typescript-eslint/types': 5.45.0
-      '@typescript-eslint/visitor-keys': 5.45.0
-    dev: true
+      '@smithy/node-config-provider': 2.3.0
+      '@smithy/types': 2.12.0
+      '@smithy/util-config-provider': 2.3.0
+      '@smithy/util-middleware': 2.2.0
+      tslib: 2.6.2
+    dev: false
 
-  /@typescript-eslint/scope-manager@5.59.0:
-    resolution: {integrity: sha512-tsoldKaMh7izN6BvkK6zRMINj4Z2d6gGhO2UsI8zGZY3XhLq1DndP3Ycjhi1JwdwPRwtLMW4EFPgpuKhbCGOvQ==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+  /@smithy/core@1.2.0:
+    resolution: {integrity: sha512-l8R89X7+hlt2FEFg+OrNq29LP3h9DfGPmO6ObwT9IXWHD6V7ycpj5u2rVQyIis26ovrgOYakl6nfgmPMm8m1IQ==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@typescript-eslint/types': 5.59.0
-      '@typescript-eslint/visitor-keys': 5.59.0
-    dev: true
+      '@smithy/middleware-endpoint': 2.2.3
+      '@smithy/middleware-retry': 2.0.24
+      '@smithy/middleware-serde': 2.0.15
+      '@smithy/protocol-http': 3.0.11
+      '@smithy/smithy-client': 2.1.18
+      '@smithy/types': 2.7.0
+      '@smithy/util-middleware': 2.0.8
+      tslib: 2.6.2
+    dev: false
 
-  /@typescript-eslint/type-utils@5.59.0(eslint@8.39.0)(typescript@5.0.3):
-    resolution: {integrity: sha512-d/B6VSWnZwu70kcKQSCqjcXpVH+7ABKH8P1KNn4K7j5PXXuycZTPXF44Nui0TEm6rbWGi8kc78xRgOC4n7xFgA==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    peerDependencies:
-      eslint: '*'
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
+  /@smithy/core@1.4.2:
+    resolution: {integrity: sha512-2fek3I0KZHWJlRLvRTqxTEri+qV0GRHrJIoLFuBMZB4EMg4WgeBGfF0X6abnrNYpq55KJ6R4D6x4f0vLnhzinA==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@typescript-eslint/typescript-estree': 5.59.0(typescript@5.0.3)
-      '@typescript-eslint/utils': 5.59.0(eslint@8.39.0)(typescript@5.0.3)
-      debug: 4.3.4(supports-color@8.1.1)
-      eslint: 8.39.0
-      tsutils: 3.21.0(typescript@5.0.3)
-      typescript: 5.0.3
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@typescript-eslint/types@5.45.0:
-    resolution: {integrity: sha512-QQij+u/vgskA66azc9dCmx+rev79PzX8uDHpsqSjEFtfF2gBUTRCpvYMh2gw2ghkJabNkPlSUCimsyBEQZd1DA==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    dev: true
-
-  /@typescript-eslint/types@5.59.0:
-    resolution: {integrity: sha512-yR2h1NotF23xFFYKHZs17QJnB51J/s+ud4PYU4MqdZbzeNxpgUr05+dNeCN/bb6raslHvGdd6BFCkVhpPk/ZeA==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    dev: true
+      '@smithy/middleware-endpoint': 2.5.1
+      '@smithy/middleware-retry': 2.3.1
+      '@smithy/middleware-serde': 2.3.0
+      '@smithy/protocol-http': 3.3.0
+      '@smithy/smithy-client': 2.5.1
+      '@smithy/types': 2.12.0
+      '@smithy/util-middleware': 2.2.0
+      tslib: 2.6.2
+    dev: false
 
-  /@typescript-eslint/typescript-estree@5.45.0(typescript@5.0.3):
-    resolution: {integrity: sha512-maRhLGSzqUpFcZgXxg1qc/+H0bT36lHK4APhp0AEUVrpSwXiRAomm/JGjSG+kNUio5kAa3uekCYu/47cnGn5EQ==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    peerDependencies:
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
+  /@smithy/credential-provider-imds@2.1.4:
+    resolution: {integrity: sha512-cwPJN1fa1YOQzhBlTXRavABEYRRchci1X79QRwzaNLySnIMJfztyv1Zkst0iZPLMnpn8+CnHu3wOHS11J5Dr3A==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@typescript-eslint/types': 5.45.0
-      '@typescript-eslint/visitor-keys': 5.45.0
-      debug: 4.3.4(supports-color@8.1.1)
-      globby: 11.1.0
-      is-glob: 4.0.3
-      semver: 7.3.8
-      tsutils: 3.21.0(typescript@5.0.3)
-      typescript: 5.0.3
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
+      '@smithy/node-config-provider': 2.1.8
+      '@smithy/property-provider': 2.0.16
+      '@smithy/types': 2.7.0
+      '@smithy/url-parser': 2.0.15
+      tslib: 2.6.2
+    dev: false
 
-  /@typescript-eslint/typescript-estree@5.59.0(typescript@5.0.3):
-    resolution: {integrity: sha512-sUNnktjmI8DyGzPdZ8dRwW741zopGxltGs/SAPgGL/AAgDpiLsCFLcMNSpbfXfmnNeHmK9h3wGmCkGRGAoUZAg==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    peerDependencies:
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-    dependencies:
-      '@typescript-eslint/types': 5.59.0
-      '@typescript-eslint/visitor-keys': 5.59.0
-      debug: 4.3.4(supports-color@8.1.1)
-      globby: 11.1.0
-      is-glob: 4.0.3
-      semver: 7.3.8
-      tsutils: 3.21.0(typescript@5.0.3)
-      typescript: 5.0.3
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
+  /@smithy/credential-provider-imds@2.3.0:
+    resolution: {integrity: sha512-BWB9mIukO1wjEOo1Ojgl6LrG4avcaC7T/ZP6ptmAaW4xluhSIPZhY+/PI5YKzlk+jsm+4sQZB45Bt1OfMeQa3w==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@smithy/node-config-provider': 2.3.0
+      '@smithy/property-provider': 2.2.0
+      '@smithy/types': 2.12.0
+      '@smithy/url-parser': 2.2.0
+      tslib: 2.6.2
+    dev: false
 
-  /@typescript-eslint/utils@5.45.0(eslint@8.39.0)(typescript@5.0.3):
-    resolution: {integrity: sha512-OUg2JvsVI1oIee/SwiejTot2OxwU8a7UfTFMOdlhD2y+Hl6memUSL4s98bpUTo8EpVEr0lmwlU7JSu/p2QpSvA==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    peerDependencies:
-      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+  /@smithy/eventstream-codec@2.0.14:
+    resolution: {integrity: sha512-g/OU/MeWGfHDygoXgMWfG/Xb0QqDnAGcM9t2FRrVAhleXYRddGOEnfanR5cmHgB9ue52MJsyorqFjckzXsylaA==}
     dependencies:
-      '@types/json-schema': 7.0.11
-      '@types/semver': 7.3.13
-      '@typescript-eslint/scope-manager': 5.45.0
-      '@typescript-eslint/types': 5.45.0
-      '@typescript-eslint/typescript-estree': 5.45.0(typescript@5.0.3)
-      eslint: 8.39.0
-      eslint-scope: 5.1.1
-      eslint-utils: 3.0.0(eslint@8.39.0)
-      semver: 7.3.8
-    transitivePeerDependencies:
-      - supports-color
-      - typescript
-    dev: true
+      '@aws-crypto/crc32': 3.0.0
+      '@smithy/types': 2.7.0
+      '@smithy/util-hex-encoding': 2.0.0
+      tslib: 2.6.2
+    dev: false
 
-  /@typescript-eslint/utils@5.59.0(eslint@8.39.0)(typescript@5.0.3):
-    resolution: {integrity: sha512-GGLFd+86drlHSvPgN/el6dRQNYYGOvRSDVydsUaQluwIW3HvbXuxyuD5JETvBt/9qGYe+lOrDk6gRrWOHb/FvA==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    peerDependencies:
-      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+  /@smithy/eventstream-codec@2.0.15:
+    resolution: {integrity: sha512-crjvz3j1gGPwA0us6cwS7+5gAn35CTmqu/oIxVbYJo2Qm/sGAye6zGJnMDk3BKhWZw5kcU1G4MxciTkuBpOZPg==}
     dependencies:
-      '@eslint-community/eslint-utils': 4.4.0(eslint@8.39.0)
-      '@types/json-schema': 7.0.11
-      '@types/semver': 7.3.13
-      '@typescript-eslint/scope-manager': 5.59.0
-      '@typescript-eslint/types': 5.59.0
-      '@typescript-eslint/typescript-estree': 5.59.0(typescript@5.0.3)
-      eslint: 8.39.0
-      eslint-scope: 5.1.1
-      semver: 7.3.8
-    transitivePeerDependencies:
-      - supports-color
-      - typescript
-    dev: true
+      '@aws-crypto/crc32': 3.0.0
+      '@smithy/types': 2.7.0
+      '@smithy/util-hex-encoding': 2.0.0
+      tslib: 2.6.2
+    dev: false
 
-  /@typescript-eslint/visitor-keys@5.45.0:
-    resolution: {integrity: sha512-jc6Eccbn2RtQPr1s7th6jJWQHBHI6GBVQkCHoJFQ5UreaKm59Vxw+ynQUPPY2u2Amquc+7tmEoC2G52ApsGNNg==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+  /@smithy/eventstream-codec@2.2.0:
+    resolution: {integrity: sha512-8janZoJw85nJmQZc4L8TuePp2pk1nxLgkxIR0TUjKJ5Dkj5oelB9WtiSSGXCQvNsJl0VSTvK/2ueMXxvpa9GVw==}
     dependencies:
-      '@typescript-eslint/types': 5.45.0
-      eslint-visitor-keys: 3.4.0
-    dev: true
+      '@aws-crypto/crc32': 3.0.0
+      '@smithy/types': 2.12.0
+      '@smithy/util-hex-encoding': 2.2.0
+      tslib: 2.6.2
+    dev: false
 
-  /@typescript-eslint/visitor-keys@5.59.0:
-    resolution: {integrity: sha512-qZ3iXxQhanchCeaExlKPV3gDQFxMUmU35xfd5eCXB6+kUw1TUAbIy2n7QIrwz9s98DQLzNWyHp61fY0da4ZcbA==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+  /@smithy/eventstream-serde-browser@2.0.15:
+    resolution: {integrity: sha512-WiFG5N9j3jmS5P0z5Xev6dO0c3lf7EJYC2Ncb0xDnWFvShwXNn741AF71ABr5EcZw8F4rQma0362MMjAwJeZog==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@typescript-eslint/types': 5.59.0
-      eslint-visitor-keys: 3.4.0
-    dev: true
+      '@smithy/eventstream-serde-universal': 2.0.15
+      '@smithy/types': 2.7.0
+      tslib: 2.6.2
+    dev: false
 
-  /@vitejs/plugin-legacy@3.0.1(terser@5.16.1)(vite@4.0.4):
-    resolution: {integrity: sha512-XCtEjxoR3rmy000ujYRBp5kggWqzHz9+F20/yIMUWOzbvu0+KW1e14Fvb8h7SpNn+bfjGW1RiAs1Vrgb7Js+iQ==}
-    engines: {node: ^14.18.0 || >=16.0.0}
-    peerDependencies:
-      terser: ^5.4.0
-      vite: ^4.0.0
+  /@smithy/eventstream-serde-browser@2.2.0:
+    resolution: {integrity: sha512-UaPf8jKbcP71BGiO0CdeLmlg+RhWnlN8ipsMSdwvqBFigl5nil3rHOI/5GE3tfiuX8LvY5Z9N0meuU7Rab7jWw==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@babel/standalone': 7.20.12
-      core-js: 3.27.2
-      magic-string: 0.27.0
-      regenerator-runtime: 0.13.11
-      systemjs: 6.13.0
-      terser: 5.16.1
-      vite: 4.0.4(@types/node@16.18.12)(sass@1.55.0)(terser@5.16.1)
-    dev: true
+      '@smithy/eventstream-serde-universal': 2.2.0
+      '@smithy/types': 2.12.0
+      tslib: 2.6.2
+    dev: false
 
-  /@vitejs/plugin-react@4.0.0(vite@4.0.4):
-    resolution: {integrity: sha512-HX0XzMjL3hhOYm+0s95pb0Z7F8O81G7joUHgfDd/9J/ZZf5k4xX6QAMFkKsHFxaHlf6X7GD7+XuaZ66ULiJuhQ==}
-    engines: {node: ^14.18.0 || >=16.0.0}
-    peerDependencies:
-      vite: ^4.2.0
+  /@smithy/eventstream-serde-config-resolver@2.0.15:
+    resolution: {integrity: sha512-o65d2LRjgCbWYH+VVNlWXtmsI231SO99ZTOL4UuIPa6WTjbSHWtlXvUcJG9libhEKWmEV9DIUiH2IqyPWi7ubA==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/plugin-transform-react-jsx-self': 7.21.0(@babel/core@7.21.5)
-      '@babel/plugin-transform-react-jsx-source': 7.19.6(@babel/core@7.21.5)
-      react-refresh: 0.14.0
-      vite: 4.0.4(@types/node@16.18.12)(sass@1.55.0)(terser@5.16.1)
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
+      '@smithy/types': 2.7.0
+      tslib: 2.6.2
+    dev: false
 
-  /@vitejs/plugin-vue2@2.2.0(vite@4.0.4)(vue@2.7.14):
-    resolution: {integrity: sha512-1km7zEuZ/9QRPvzXSjikbTYGQPG86Mq1baktpC4sXqsXlb02HQKfi+fl8qVS703JM7cgm24Ga9j+RwKmvFn90A==}
-    engines: {node: ^14.18.0 || >= 16.0.0}
-    peerDependencies:
-      vite: ^3.0.0 || ^4.0.0
-      vue: ^2.7.0-0
+  /@smithy/eventstream-serde-config-resolver@2.2.0:
+    resolution: {integrity: sha512-RHhbTw/JW3+r8QQH7PrganjNCiuiEZmpi6fYUAetFfPLfZ6EkiA08uN3EFfcyKubXQxOwTeJRZSQmDDCdUshaA==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      vite: 4.0.4(@types/node@16.18.12)(sass@1.55.0)(terser@5.16.1)
-      vue: 2.7.14
-    dev: true
+      '@smithy/types': 2.12.0
+      tslib: 2.6.2
+    dev: false
 
-  /@vitest/coverage-c8@0.28.5(jsdom@21.1.0)(sass@1.58.0):
-    resolution: {integrity: sha512-zCNyurjudoG0BAqAgknvlBhkV2V9ZwyYLWOAGtHSDhL/St49MJT+V2p1G0yPaoqBbKOTATVnP5H2p1XL15H75g==}
+  /@smithy/eventstream-serde-node@2.0.15:
+    resolution: {integrity: sha512-9OOXiIhHq1VeOG6xdHkn2ZayfMYM3vzdUTV3zhcCnt+tMqA3BJK3XXTJFRR2BV28rtRM778DzqbBTf+hqwQPTg==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      c8: 7.12.0
-      picocolors: 1.0.0
-      std-env: 3.3.2
-      vitest: 0.28.5(jsdom@21.1.0)(sass@1.58.0)
-    transitivePeerDependencies:
-      - '@edge-runtime/vm'
-      - '@vitest/browser'
-      - '@vitest/ui'
-      - happy-dom
-      - jsdom
-      - less
-      - sass
-      - stylus
-      - sugarss
-      - supports-color
-      - terser
-    dev: true
+      '@smithy/eventstream-serde-universal': 2.0.15
+      '@smithy/types': 2.7.0
+      tslib: 2.6.2
+    dev: false
 
-  /@vitest/coverage-c8@0.28.5(sass@1.55.0)(terser@5.16.1):
-    resolution: {integrity: sha512-zCNyurjudoG0BAqAgknvlBhkV2V9ZwyYLWOAGtHSDhL/St49MJT+V2p1G0yPaoqBbKOTATVnP5H2p1XL15H75g==}
+  /@smithy/eventstream-serde-node@2.2.0:
+    resolution: {integrity: sha512-zpQMtJVqCUMn+pCSFcl9K/RPNtQE0NuMh8sKpCdEHafhwRsjP50Oq/4kMmvxSRy6d8Jslqd8BLvDngrUtmN9iA==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      c8: 7.12.0
-      picocolors: 1.0.0
-      std-env: 3.3.2
-      vitest: 0.28.5(sass@1.55.0)(terser@5.16.1)
-    transitivePeerDependencies:
-      - '@edge-runtime/vm'
-      - '@vitest/browser'
-      - '@vitest/ui'
-      - happy-dom
-      - jsdom
-      - less
-      - sass
-      - stylus
-      - sugarss
-      - supports-color
-      - terser
-    dev: true
+      '@smithy/eventstream-serde-universal': 2.2.0
+      '@smithy/types': 2.12.0
+      tslib: 2.6.2
+    dev: false
 
-  /@vitest/expect@0.28.5:
-    resolution: {integrity: sha512-gqTZwoUTwepwGIatnw4UKpQfnoyV0Z9Czn9+Lo2/jLIt4/AXLTn+oVZxlQ7Ng8bzcNkR+3DqLJ08kNr8jRmdNQ==}
+  /@smithy/eventstream-serde-universal@2.0.15:
+    resolution: {integrity: sha512-dP8AQp/pXlWBjvL0TaPBJC3rM0GoYv7O0Uim8d/7UKZ2Wo13bFI3/BhQfY/1DeiP1m23iCHFNFtOQxfQNBB8rQ==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@vitest/spy': 0.28.5
-      '@vitest/utils': 0.28.5
-      chai: 4.3.7
-    dev: true
+      '@smithy/eventstream-codec': 2.0.15
+      '@smithy/types': 2.7.0
+      tslib: 2.6.2
+    dev: false
 
-  /@vitest/runner@0.28.5:
-    resolution: {integrity: sha512-NKkHtLB+FGjpp5KmneQjTcPLWPTDfB7ie+MmF1PnUBf/tGe2OjGxWyB62ySYZ25EYp9krR5Bw0YPLS/VWh1QiA==}
+  /@smithy/eventstream-serde-universal@2.2.0:
+    resolution: {integrity: sha512-pvoe/vvJY0mOpuF84BEtyZoYfbehiFj8KKWk1ds2AT0mTLYFVs+7sBJZmioOFdBXKd48lfrx1vumdPdmGlCLxA==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@vitest/utils': 0.28.5
-      p-limit: 4.0.0
-      pathe: 1.1.0
-    dev: true
+      '@smithy/eventstream-codec': 2.2.0
+      '@smithy/types': 2.12.0
+      tslib: 2.6.2
+    dev: false
 
-  /@vitest/spy@0.28.5:
-    resolution: {integrity: sha512-7if6rsHQr9zbmvxN7h+gGh2L9eIIErgf8nSKYDlg07HHimCxp4H6I/X/DPXktVPPLQfiZ1Cw2cbDIx9fSqDjGw==}
+  /@smithy/fetch-http-handler@2.3.1:
+    resolution: {integrity: sha512-6MNk16fqb8EwcYY8O8WxB3ArFkLZ2XppsSNo1h7SQcFdDDwIumiJeO6wRzm7iB68xvsOQzsdQKbdtTieS3hfSQ==}
     dependencies:
-      tinyspy: 1.0.2
-    dev: true
+      '@smithy/protocol-http': 3.0.11
+      '@smithy/querystring-builder': 2.0.15
+      '@smithy/types': 2.7.0
+      '@smithy/util-base64': 2.0.1
+      tslib: 2.6.2
+    dev: false
 
-  /@vitest/utils@0.28.5:
-    resolution: {integrity: sha512-UyZdYwdULlOa4LTUSwZ+Paz7nBHGTT72jKwdFSV4IjHF1xsokp+CabMdhjvVhYwkLfO88ylJT46YMilnkSARZA==}
+  /@smithy/fetch-http-handler@2.5.0:
+    resolution: {integrity: sha512-BOWEBeppWhLn/no/JxUL/ghTfANTjT7kg3Ww2rPqTUY9R4yHPXxJ9JhMe3Z03LN3aPwiwlpDIUcVw1xDyHqEhw==}
     dependencies:
-      cli-truncate: 3.1.0
-      diff: 5.1.0
-      loupe: 2.3.6
-      picocolors: 1.0.0
-      pretty-format: 27.5.1
-    dev: true
+      '@smithy/protocol-http': 3.3.0
+      '@smithy/querystring-builder': 2.2.0
+      '@smithy/types': 2.12.0
+      '@smithy/util-base64': 2.3.0
+      tslib: 2.6.2
+    dev: false
 
-  /@volar/language-core@1.0.24:
-    resolution: {integrity: sha512-vTN+alJiWwK0Pax6POqrmevbtFW2dXhjwWiW/MW4f48eDYPLdyURWcr8TixO7EN/nHsUBj2udT7igFKPtjyAKg==}
+  /@smithy/hash-blob-browser@2.0.16:
+    resolution: {integrity: sha512-cSYRi05LA7DZDwjB1HL0BP8B56eUNNeLglVH147QTXFyuXJq/7erAIiLRfsyXB8+GfFHkSS5BHbc76a7k/AYPA==}
     dependencies:
-      '@volar/source-map': 1.0.24
-      muggle-string: 0.1.0
-    dev: true
+      '@smithy/chunked-blob-reader': 2.0.0
+      '@smithy/chunked-blob-reader-native': 2.0.1
+      '@smithy/types': 2.7.0
+      tslib: 2.6.2
+    dev: false
 
-  /@volar/source-map@1.0.24:
-    resolution: {integrity: sha512-Qsv/tkplx18pgBr8lKAbM1vcDqgkGKQzbChg6NW+v0CZc3G7FLmK+WrqEPzKlN7Cwdc6XVL559Nod8WKAfKr4A==}
+  /@smithy/hash-node@2.0.17:
+    resolution: {integrity: sha512-Il6WuBcI1nD+e2DM7tTADMf01wEPGK8PAhz4D+YmDUVaoBqlA+CaH2uDJhiySifmuKBZj748IfygXty81znKhw==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      muggle-string: 0.1.0
-    dev: true
+      '@smithy/types': 2.7.0
+      '@smithy/util-buffer-from': 2.0.0
+      '@smithy/util-utf8': 2.0.2
+      tslib: 2.6.2
+    dev: false
 
-  /@volar/typescript@1.0.24:
-    resolution: {integrity: sha512-f8hCSk+PfKR1/RQHxZ79V1NpDImHoivqoizK+mstphm25tn/YJ/JnKNjZHB+o21fuW0yKlI26NV3jkVb2Cc/7A==}
+  /@smithy/hash-node@2.2.0:
+    resolution: {integrity: sha512-zLWaC/5aWpMrHKpoDF6nqpNtBhlAYKF/7+9yMN7GpdR8CzohnWfGtMznPybnwSS8saaXBMxIGwJqR4HmRp6b3g==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@volar/language-core': 1.0.24
-    dev: true
+      '@smithy/types': 2.12.0
+      '@smithy/util-buffer-from': 2.2.0
+      '@smithy/util-utf8': 2.3.0
+      tslib: 2.6.2
+    dev: false
 
-  /@volar/vue-language-core@1.0.24:
-    resolution: {integrity: sha512-2NTJzSgrwKu6uYwPqLiTMuAzi7fAY3yFy5PJ255bGJc82If0Xr+cW8pC80vpjG0D/aVLmlwAdO4+Ya2BI8GdDg==}
+  /@smithy/hash-stream-node@2.0.17:
+    resolution: {integrity: sha512-ey8DtnATzp1mOXgS7rqMwSmAki6iJA+jgNucKcxRkhMB1rrICfHg+rhmIF50iLPDHUhTcS5pBMOrLzzpZftvNQ==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@volar/language-core': 1.0.24
-      '@volar/source-map': 1.0.24
-      '@vue/compiler-dom': 3.2.45
-      '@vue/compiler-sfc': 3.2.45
-      '@vue/reactivity': 3.2.45
-      '@vue/shared': 3.2.45
-      minimatch: 5.1.5
-      vue-template-compiler: 2.7.14
-    dev: true
+      '@smithy/types': 2.7.0
+      '@smithy/util-utf8': 2.0.2
+      tslib: 2.6.2
+    dev: false
 
-  /@volar/vue-typescript@1.0.24:
-    resolution: {integrity: sha512-9a25oHDvGaNC0okRS47uqJI6FxY4hUQZUsxeOUFHcqVxZEv8s17LPuP/pMMXyz7jPygrZubB/qXqHY5jEu/akA==}
+  /@smithy/invalid-dependency@2.0.15:
+    resolution: {integrity: sha512-dlEKBFFwVfzA5QroHlBS94NpgYjXhwN/bFfun+7w3rgxNvVy79SK0w05iGc7UAeC5t+D7gBxrzdnD6hreZnDVQ==}
     dependencies:
-      '@volar/typescript': 1.0.24
-      '@volar/vue-language-core': 1.0.24
-    dev: true
+      '@smithy/types': 2.7.0
+      tslib: 2.6.2
+    dev: false
 
-  /@vue/compiler-core@3.2.45:
-    resolution: {integrity: sha512-rcMj7H+PYe5wBV3iYeUgbCglC+pbpN8hBLTJvRiK2eKQiWqu+fG9F+8sW99JdL4LQi7Re178UOxn09puSXvn4A==}
+  /@smithy/invalid-dependency@2.2.0:
+    resolution: {integrity: sha512-nEDASdbKFKPXN2O6lOlTgrEEOO9NHIeO+HVvZnkqc8h5U9g3BIhWsvzFo+UcUbliMHvKNPD/zVxDrkP1Sbgp8Q==}
     dependencies:
-      '@babel/parser': 7.20.7
-      '@vue/shared': 3.2.45
-      estree-walker: 2.0.2
-      source-map: 0.6.1
-    dev: true
+      '@smithy/types': 2.12.0
+      tslib: 2.6.2
+    dev: false
 
-  /@vue/compiler-dom@3.2.45:
-    resolution: {integrity: sha512-tyYeUEuKqqZO137WrZkpwfPCdiiIeXYCcJ8L4gWz9vqaxzIQRccTSwSWZ/Axx5YR2z+LvpUbmPNXxuBU45lyRw==}
+  /@smithy/is-array-buffer@2.0.0:
+    resolution: {integrity: sha512-z3PjFjMyZNI98JFRJi/U0nGoLWMSJlDjAW4QUX2WNZLas5C0CmVV6LJ01JI0k90l7FvpmixjWxPFmENSClQ7ug==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@vue/compiler-core': 3.2.45
-      '@vue/shared': 3.2.45
-    dev: true
+      tslib: 2.6.2
+    dev: false
 
-  /@vue/compiler-sfc@2.7.14:
-    resolution: {integrity: sha512-aNmNHyLPsw+sVvlQFQ2/8sjNuLtK54TC6cuKnVzAY93ks4ZBrvwQSnkkIh7bsbNhum5hJBS00wSDipQ937f5DA==}
+  /@smithy/is-array-buffer@2.2.0:
+    resolution: {integrity: sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@babel/parser': 7.20.7
-      postcss: 8.4.21
-      source-map: 0.6.1
+      tslib: 2.6.2
+    dev: false
 
-  /@vue/compiler-sfc@3.2.45:
-    resolution: {integrity: sha512-1jXDuWah1ggsnSAOGsec8cFjT/K6TMZ0sPL3o3d84Ft2AYZi2jWJgRMjw4iaK0rBfA89L5gw427H4n1RZQBu6Q==}
+  /@smithy/md5-js@2.0.17:
+    resolution: {integrity: sha512-jmISTCnEkOnm2oCNx/rMkvBT/eQh3aA6nktevkzbmn/VYqYEuc5Z2n5sTTqsciMSO01Lvf56wG1A4twDqovYeQ==}
     dependencies:
-      '@babel/parser': 7.20.7
-      '@vue/compiler-core': 3.2.45
-      '@vue/compiler-dom': 3.2.45
-      '@vue/compiler-ssr': 3.2.45
-      '@vue/reactivity-transform': 3.2.45
-      '@vue/shared': 3.2.45
-      estree-walker: 2.0.2
-      magic-string: 0.25.9
-      postcss: 8.4.21
-      source-map: 0.6.1
-    dev: true
+      '@smithy/types': 2.7.0
+      '@smithy/util-utf8': 2.0.2
+      tslib: 2.6.2
+    dev: false
 
-  /@vue/compiler-ssr@3.2.45:
-    resolution: {integrity: sha512-6BRaggEGqhWht3lt24CrIbQSRD5O07MTmd+LjAn5fJj568+R9eUD2F7wMQJjX859seSlrYog7sUtrZSd7feqrQ==}
+  /@smithy/middleware-content-length@2.0.17:
+    resolution: {integrity: sha512-OyadvMcKC7lFXTNBa8/foEv7jOaqshQZkjWS9coEXPRZnNnihU/Ls+8ZuJwGNCOrN2WxXZFmDWhegbnM4vak8w==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@vue/compiler-dom': 3.2.45
-      '@vue/shared': 3.2.45
-    dev: true
+      '@smithy/protocol-http': 3.0.11
+      '@smithy/types': 2.7.0
+      tslib: 2.6.2
+    dev: false
 
-  /@vue/component-compiler-utils@3.3.0(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-97sfH2mYNU+2PzGrmK2haqffDpVASuib9/w2/noxiFi31Z54hW+q3izKQXXQZSNhtiUpAI36uSuYepeBe4wpHQ==}
+  /@smithy/middleware-content-length@2.2.0:
+    resolution: {integrity: sha512-5bl2LG1Ah/7E5cMSC+q+h3IpVHMeOkG0yLRyQT1p2aMJkSrZG7RlXHPuAgb7EyaFeidKEnnd/fNaLLaKlHGzDQ==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      consolidate: 0.15.1(react-dom@18.2.0)(react@17.0.2)
-      hash-sum: 1.0.2
-      lru-cache: 4.1.5
-      merge-source-map: 1.1.0
-      postcss: 7.0.39
-      postcss-selector-parser: 6.0.11
-      source-map: 0.6.1
-      vue-template-es2015-compiler: 1.9.1
-    optionalDependencies:
-      prettier: 2.8.3
-    transitivePeerDependencies:
-      - arc-templates
-      - atpl
-      - babel-core
-      - bracket-template
-      - coffee-script
-      - dot
-      - dust
-      - dustjs-helpers
-      - dustjs-linkedin
-      - eco
-      - ect
-      - ejs
-      - haml-coffee
-      - hamlet
-      - hamljs
-      - handlebars
-      - hogan.js
-      - htmling
-      - jade
-      - jazz
-      - jqtpl
-      - just
-      - liquid-node
-      - liquor
-      - lodash
-      - marko
-      - mote
-      - mustache
-      - nunjucks
-      - plates
-      - pug
-      - qejs
-      - ractive
-      - razor-tmpl
-      - react
-      - react-dom
-      - slm
-      - squirrelly
-      - swig
-      - swig-templates
-      - teacup
-      - templayed
-      - then-jade
-      - then-pug
-      - tinyliquid
-      - toffee
-      - twig
-      - twing
-      - underscore
-      - vash
-      - velocityjs
-      - walrus
-      - whiskers
-    dev: true
+      '@smithy/protocol-http': 3.3.0
+      '@smithy/types': 2.12.0
+      tslib: 2.6.2
+    dev: false
 
-  /@vue/devtools-api@6.4.5:
-    resolution: {integrity: sha512-JD5fcdIuFxU4fQyXUu3w2KpAJHzTVdN+p4iOX2lMWSHMOoQdMAcpFLZzm9Z/2nmsoZ1a96QEhZ26e50xLBsgOQ==}
+  /@smithy/middleware-endpoint@2.2.3:
+    resolution: {integrity: sha512-nYfxuq0S/xoAjdLbyn1ixeVB6cyH9wYCMtbbOCpcCRYR5u2mMtqUtVjjPAZ/DIdlK3qe0tpB0Q76szFGNuz+kQ==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@smithy/middleware-serde': 2.0.15
+      '@smithy/node-config-provider': 2.1.8
+      '@smithy/shared-ini-file-loader': 2.2.7
+      '@smithy/types': 2.7.0
+      '@smithy/url-parser': 2.0.15
+      '@smithy/util-middleware': 2.0.8
+      tslib: 2.6.2
+    dev: false
 
-  /@vue/eslint-config-typescript@8.0.0(@typescript-eslint/eslint-plugin@5.59.0)(@typescript-eslint/parser@5.59.0)(eslint-plugin-vue@7.17.0)(eslint@8.39.0)(typescript@5.0.3):
-    resolution: {integrity: sha512-8u8Qpg4qfjJoNeRMdHlxif9BcGy4iYSSK4YYW5AFPPRtkBJiCqtoyT72l4F3ZeZII09ax2N6yQeHbQ0CXQi1bA==}
-    engines: {node: ^10.12.0 || >=12.0.0}
-    peerDependencies:
-      '@typescript-eslint/eslint-plugin': ^5.0.0
-      '@typescript-eslint/parser': ^5.0.0
-      eslint: ^6.2.0 || ^7.0.0 || ^8.0.0
-      eslint-plugin-vue: ^7.17.0
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
+  /@smithy/middleware-endpoint@2.5.1:
+    resolution: {integrity: sha512-1/8kFp6Fl4OsSIVTWHnNjLnTL8IqpIb/D3sTSczrKFnrE9VMNWxnrRKNvpUHOJ6zpGD5f62TPm7+17ilTJpiCQ==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@typescript-eslint/eslint-plugin': 5.59.0(patch_hash=tk3n6hvmqwfzrfqe3awfxnqtuy)(@typescript-eslint/parser@5.59.0)(eslint@8.39.0)(typescript@5.0.3)
-      '@typescript-eslint/parser': 5.59.0(eslint@8.39.0)(typescript@5.0.3)
-      eslint: 8.39.0
-      eslint-plugin-vue: 7.17.0(eslint@8.39.0)
-      typescript: 5.0.3
-      vue-eslint-parser: 7.11.0(eslint@8.39.0)
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
+      '@smithy/middleware-serde': 2.3.0
+      '@smithy/node-config-provider': 2.3.0
+      '@smithy/shared-ini-file-loader': 2.4.0
+      '@smithy/types': 2.12.0
+      '@smithy/url-parser': 2.2.0
+      '@smithy/util-middleware': 2.2.0
+      tslib: 2.6.2
+    dev: false
 
-  /@vue/reactivity-transform@3.2.45:
-    resolution: {integrity: sha512-BHVmzYAvM7vcU5WmuYqXpwaBHjsS8T63jlKGWVtHxAHIoMIlmaMyurUSEs1Zcg46M4AYT5MtB1U274/2aNzjJQ==}
+  /@smithy/middleware-retry@2.0.24:
+    resolution: {integrity: sha512-q2SvHTYu96N7lYrn3VSuX3vRpxXHR/Cig6MJpGWxd0BWodUQUWlKvXpWQZA+lTaFJU7tUvpKhRd4p4MU3PbeJg==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@babel/parser': 7.20.7
-      '@vue/compiler-core': 3.2.45
-      '@vue/shared': 3.2.45
-      estree-walker: 2.0.2
-      magic-string: 0.25.9
-    dev: true
+      '@smithy/node-config-provider': 2.1.8
+      '@smithy/protocol-http': 3.0.11
+      '@smithy/service-error-classification': 2.0.8
+      '@smithy/smithy-client': 2.1.18
+      '@smithy/types': 2.7.0
+      '@smithy/util-middleware': 2.0.8
+      '@smithy/util-retry': 2.0.8
+      tslib: 2.6.2
+      uuid: 8.3.2
+    dev: false
 
-  /@vue/reactivity@3.2.45:
-    resolution: {integrity: sha512-PRvhCcQcyEVohW0P8iQ7HDcIOXRjZfAsOds3N99X/Dzewy8TVhTCT4uXpAHfoKjVTJRA0O0K+6QNkDIZAxNi3A==}
+  /@smithy/middleware-retry@2.3.1:
+    resolution: {integrity: sha512-P2bGufFpFdYcWvqpyqqmalRtwFUNUA8vHjJR5iGqbfR6mp65qKOLcUd6lTr4S9Gn/enynSrSf3p3FVgVAf6bXA==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@vue/shared': 3.2.45
-    dev: true
+      '@smithy/node-config-provider': 2.3.0
+      '@smithy/protocol-http': 3.3.0
+      '@smithy/service-error-classification': 2.1.5
+      '@smithy/smithy-client': 2.5.1
+      '@smithy/types': 2.12.0
+      '@smithy/util-middleware': 2.2.0
+      '@smithy/util-retry': 2.2.0
+      tslib: 2.6.2
+      uuid: 9.0.1
+    dev: false
 
-  /@vue/shared@3.2.45:
-    resolution: {integrity: sha512-Ewzq5Yhimg7pSztDV+RH1UDKBzmtqieXQlpTVm2AwraoRL/Rks96mvd8Vgi7Lj+h+TH8dv7mXD3FRZR3TUvbSg==}
-    dev: true
+  /@smithy/middleware-serde@2.0.15:
+    resolution: {integrity: sha512-FOZRFk/zN4AT4wzGuBY+39XWe+ZnCFd0gZtyw3f9Okn2CJPixl9GyWe98TIaljeZdqWkgrzGyPre20AcW2UMHQ==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@smithy/types': 2.7.0
+      tslib: 2.6.2
+    dev: false
 
-  /@vue/test-utils@1.3.0(vue-template-compiler@2.7.14)(vue@2.7.14):
-    resolution: {integrity: sha512-Xk2Xiyj2k5dFb8eYUKkcN9PzqZSppTlx7LaQWBbdA8tqh3jHr/KHX2/YLhNFc/xwDrgeLybqd+4ZCPJSGPIqeA==}
-    peerDependencies:
-      vue: 2.x
-      vue-template-compiler: ^2.x
+  /@smithy/middleware-serde@2.3.0:
+    resolution: {integrity: sha512-sIADe7ojwqTyvEQBe1nc/GXB9wdHhi9UwyX0lTyttmUWDJLP655ZYE1WngnNyXREme8I27KCaUhyhZWRXL0q7Q==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      dom-event-types: 1.1.0
-      lodash: 4.17.21
-      pretty: 2.0.0
-      vue: 2.7.14
-      vue-template-compiler: 2.7.14
-    dev: true
+      '@smithy/types': 2.12.0
+      tslib: 2.6.2
+    dev: false
 
-  /@webassemblyjs/ast@1.11.1:
-    resolution: {integrity: sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==}
+  /@smithy/middleware-stack@2.0.9:
+    resolution: {integrity: sha512-bCB5dUtGQ5wh7QNL2ELxmDc6g7ih7jWU3Kx6MYH1h4mZbv9xL3WyhKHojRltThCB1arLPyTUFDi+x6fB/oabtA==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@webassemblyjs/helper-numbers': 1.11.1
-      '@webassemblyjs/helper-wasm-bytecode': 1.11.1
-    dev: true
+      '@smithy/types': 2.7.0
+      tslib: 2.6.2
+    dev: false
 
-  /@webassemblyjs/floating-point-hex-parser@1.11.1:
-    resolution: {integrity: sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==}
-    dev: true
+  /@smithy/middleware-stack@2.2.0:
+    resolution: {integrity: sha512-Qntc3jrtwwrsAC+X8wms8zhrTr0sFXnyEGhZd9sLtsJ/6gGQKFzNB+wWbOcpJd7BR8ThNCoKt76BuQahfMvpeA==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@smithy/types': 2.12.0
+      tslib: 2.6.2
+    dev: false
 
-  /@webassemblyjs/helper-api-error@1.11.1:
-    resolution: {integrity: sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==}
-    dev: true
+  /@smithy/node-config-provider@2.1.8:
+    resolution: {integrity: sha512-+w26OKakaBUGp+UG+dxYZtFb5fs3tgHg3/QrRrmUZj+rl3cIuw840vFUXX35cVPTUCQIiTqmz7CpVF7+hdINdQ==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@smithy/property-provider': 2.0.16
+      '@smithy/shared-ini-file-loader': 2.2.7
+      '@smithy/types': 2.7.0
+      tslib: 2.6.2
+    dev: false
 
-  /@webassemblyjs/helper-buffer@1.11.1:
-    resolution: {integrity: sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==}
-    dev: true
+  /@smithy/node-config-provider@2.3.0:
+    resolution: {integrity: sha512-0elK5/03a1JPWMDPaS726Iw6LpQg80gFut1tNpPfxFuChEEklo2yL823V94SpTZTxmKlXFtFgsP55uh3dErnIg==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@smithy/property-provider': 2.2.0
+      '@smithy/shared-ini-file-loader': 2.4.0
+      '@smithy/types': 2.12.0
+      tslib: 2.6.2
+    dev: false
 
-  /@webassemblyjs/helper-numbers@1.11.1:
-    resolution: {integrity: sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==}
+  /@smithy/node-http-handler@2.2.1:
+    resolution: {integrity: sha512-8iAKQrC8+VFHPAT8pg4/j6hlsTQh+NKOWlctJBrYtQa4ExcxX7aSg3vdQ2XLoYwJotFUurg/NLqFCmZaPRrogw==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@webassemblyjs/floating-point-hex-parser': 1.11.1
-      '@webassemblyjs/helper-api-error': 1.11.1
-      '@xtuc/long': 4.2.2
-    dev: true
+      '@smithy/abort-controller': 2.0.15
+      '@smithy/protocol-http': 3.0.11
+      '@smithy/querystring-builder': 2.0.15
+      '@smithy/types': 2.7.0
+      tslib: 2.6.2
+    dev: false
 
-  /@webassemblyjs/helper-wasm-bytecode@1.11.1:
-    resolution: {integrity: sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==}
-    dev: true
+  /@smithy/node-http-handler@2.5.0:
+    resolution: {integrity: sha512-mVGyPBzkkGQsPoxQUbxlEfRjrj6FPyA3u3u2VXGr9hT8wilsoQdZdvKpMBFMB8Crfhv5dNkKHIW0Yyuc7eABqA==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@smithy/abort-controller': 2.2.0
+      '@smithy/protocol-http': 3.3.0
+      '@smithy/querystring-builder': 2.2.0
+      '@smithy/types': 2.12.0
+      tslib: 2.6.2
+    dev: false
 
-  /@webassemblyjs/helper-wasm-section@1.11.1:
-    resolution: {integrity: sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==}
+  /@smithy/property-provider@2.0.16:
+    resolution: {integrity: sha512-28Ky0LlOqtEjwg5CdHmwwaDRHcTWfPRzkT6HrhwOSRS2RryAvuDfJrZpM+BMcrdeCyEg1mbcgIMoqTla+rdL8Q==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@webassemblyjs/ast': 1.11.1
-      '@webassemblyjs/helper-buffer': 1.11.1
-      '@webassemblyjs/helper-wasm-bytecode': 1.11.1
-      '@webassemblyjs/wasm-gen': 1.11.1
-    dev: true
+      '@smithy/types': 2.7.0
+      tslib: 2.6.2
+    dev: false
 
-  /@webassemblyjs/ieee754@1.11.1:
-    resolution: {integrity: sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==}
+  /@smithy/property-provider@2.2.0:
+    resolution: {integrity: sha512-+xiil2lFhtTRzXkx8F053AV46QnIw6e7MV8od5Mi68E1ICOjCeCHw2XfLnDEUHnT9WGUIkwcqavXjfwuJbGlpg==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@xtuc/ieee754': 1.2.0
-    dev: true
+      '@smithy/types': 2.12.0
+      tslib: 2.6.2
+    dev: false
 
-  /@webassemblyjs/leb128@1.11.1:
-    resolution: {integrity: sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==}
+  /@smithy/protocol-http@3.0.11:
+    resolution: {integrity: sha512-3ziB8fHuXIRamV/akp/sqiWmNPR6X+9SB8Xxnozzj+Nq7hSpyKdFHd1FLpBkgfGFUTzzcBJQlDZPSyxzmdcx5A==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@xtuc/long': 4.2.2
-    dev: true
+      '@smithy/types': 2.7.0
+      tslib: 2.6.2
+    dev: false
 
-  /@webassemblyjs/utf8@1.11.1:
-    resolution: {integrity: sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==}
-    dev: true
+  /@smithy/protocol-http@3.3.0:
+    resolution: {integrity: sha512-Xy5XK1AFWW2nlY/biWZXu6/krgbaf2dg0q492D8M5qthsnU2H+UgFeZLbM76FnH7s6RO/xhQRkj+T6KBO3JzgQ==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@smithy/types': 2.12.0
+      tslib: 2.6.2
+    dev: false
 
-  /@webassemblyjs/wasm-edit@1.11.1:
-    resolution: {integrity: sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==}
+  /@smithy/querystring-builder@2.0.15:
+    resolution: {integrity: sha512-e1q85aT6HutvouOdN+dMsN0jcdshp50PSCvxDvo6aIM57LqeXimjfONUEgfqQ4IFpYWAtVixptyIRE5frMp/2A==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@webassemblyjs/ast': 1.11.1
-      '@webassemblyjs/helper-buffer': 1.11.1
-      '@webassemblyjs/helper-wasm-bytecode': 1.11.1
-      '@webassemblyjs/helper-wasm-section': 1.11.1
-      '@webassemblyjs/wasm-gen': 1.11.1
-      '@webassemblyjs/wasm-opt': 1.11.1
-      '@webassemblyjs/wasm-parser': 1.11.1
-      '@webassemblyjs/wast-printer': 1.11.1
-    dev: true
+      '@smithy/types': 2.7.0
+      '@smithy/util-uri-escape': 2.0.0
+      tslib: 2.6.2
+    dev: false
 
-  /@webassemblyjs/wasm-gen@1.11.1:
-    resolution: {integrity: sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==}
+  /@smithy/querystring-builder@2.2.0:
+    resolution: {integrity: sha512-L1kSeviUWL+emq3CUVSgdogoM/D9QMFaqxL/dd0X7PCNWmPXqt+ExtrBjqT0V7HLN03Vs9SuiLrG3zy3JGnE5A==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@webassemblyjs/ast': 1.11.1
-      '@webassemblyjs/helper-wasm-bytecode': 1.11.1
-      '@webassemblyjs/ieee754': 1.11.1
-      '@webassemblyjs/leb128': 1.11.1
-      '@webassemblyjs/utf8': 1.11.1
-    dev: true
+      '@smithy/types': 2.12.0
+      '@smithy/util-uri-escape': 2.2.0
+      tslib: 2.6.2
+    dev: false
 
-  /@webassemblyjs/wasm-opt@1.11.1:
-    resolution: {integrity: sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==}
+  /@smithy/querystring-parser@2.0.15:
+    resolution: {integrity: sha512-jbBvoK3cc81Cj1c1TH1qMYxNQKHrYQ2DoTntN9FBbtUWcGhc+T4FP6kCKYwRLXyU4AajwGIZstvNAmIEgUUNTQ==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@webassemblyjs/ast': 1.11.1
-      '@webassemblyjs/helper-buffer': 1.11.1
-      '@webassemblyjs/wasm-gen': 1.11.1
-      '@webassemblyjs/wasm-parser': 1.11.1
-    dev: true
+      '@smithy/types': 2.7.0
+      tslib: 2.6.2
+    dev: false
 
-  /@webassemblyjs/wasm-parser@1.11.1:
-    resolution: {integrity: sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==}
+  /@smithy/querystring-parser@2.2.0:
+    resolution: {integrity: sha512-BvHCDrKfbG5Yhbpj4vsbuPV2GgcpHiAkLeIlcA1LtfpMz3jrqizP1+OguSNSj1MwBHEiN+jwNisXLGdajGDQJA==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@webassemblyjs/ast': 1.11.1
-      '@webassemblyjs/helper-api-error': 1.11.1
-      '@webassemblyjs/helper-wasm-bytecode': 1.11.1
-      '@webassemblyjs/ieee754': 1.11.1
-      '@webassemblyjs/leb128': 1.11.1
-      '@webassemblyjs/utf8': 1.11.1
-    dev: true
+      '@smithy/types': 2.12.0
+      tslib: 2.6.2
+    dev: false
 
-  /@webassemblyjs/wast-printer@1.11.1:
-    resolution: {integrity: sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==}
+  /@smithy/service-error-classification@2.0.8:
+    resolution: {integrity: sha512-jCw9+005im8tsfYvwwSc4TTvd29kXRFkH9peQBg5R/4DD03ieGm6v6Hpv9nIAh98GwgYg1KrztcINC1s4o7/hg==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@webassemblyjs/ast': 1.11.1
-      '@xtuc/long': 4.2.2
-    dev: true
+      '@smithy/types': 2.7.0
+    dev: false
 
-  /@xmldom/xmldom@0.8.6:
-    resolution: {integrity: sha512-uRjjusqpoqfmRkTaNuLJ2VohVr67Q5YwDATW3VU7PfzTj6IRaihGrYI7zckGZjxQPBIp63nfvJbM+Yu5ICh0Bg==}
-    engines: {node: '>=10.0.0'}
+  /@smithy/service-error-classification@2.1.5:
+    resolution: {integrity: sha512-uBDTIBBEdAQryvHdc5W8sS5YX7RQzF683XrHePVdFmAgKiMofU15FLSM0/HU03hKTnazdNRFa0YHS7+ArwoUSQ==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@smithy/types': 2.12.0
     dev: false
 
-  /@xtuc/ieee754@1.2.0:
-    resolution: {integrity: sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==}
-    dev: true
+  /@smithy/shared-ini-file-loader@2.2.7:
+    resolution: {integrity: sha512-0Qt5CuiogIuvQIfK+be7oVHcPsayLgfLJGkPlbgdbl0lD28nUKu4p11L+UG3SAEsqc9UsazO+nErPXw7+IgDpQ==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@smithy/types': 2.7.0
+      tslib: 2.6.2
+    dev: false
 
-  /@xtuc/long@4.2.2:
-    resolution: {integrity: sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==}
-    dev: true
+  /@smithy/shared-ini-file-loader@2.4.0:
+    resolution: {integrity: sha512-WyujUJL8e1B6Z4PBfAqC/aGY1+C7T0w20Gih3yrvJSk97gpiVfB+y7c46T4Nunk+ZngLq0rOIdeVeIklk0R3OA==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@smithy/types': 2.12.0
+      tslib: 2.6.2
+    dev: false
 
-  /@yarnpkg/esbuild-plugin-pnp@3.0.0-rc.15(esbuild@0.16.17):
-    resolution: {integrity: sha512-kYzDJO5CA9sy+on/s2aIW0411AklfCi8Ck/4QDivOqsMKpStZA2SsR+X27VTggGwpStWaLrjJcDcdDMowtG8MA==}
-    engines: {node: '>=14.15.0'}
-    peerDependencies:
-      esbuild: '>=0.10.0'
+  /@smithy/signature-v4@2.0.5:
+    resolution: {integrity: sha512-ABIzXmUDXK4n2c9cXjQLELgH2RdtABpYKT+U131e2I6RbCypFZmxIHmIBufJzU2kdMCQ3+thBGDWorAITFW04A==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      esbuild: 0.16.17
-      tslib: 2.5.0
-    dev: true
+      '@smithy/eventstream-codec': 2.0.14
+      '@smithy/is-array-buffer': 2.0.0
+      '@smithy/types': 2.7.0
+      '@smithy/util-hex-encoding': 2.0.0
+      '@smithy/util-middleware': 2.0.8
+      '@smithy/util-uri-escape': 2.0.0
+      '@smithy/util-utf8': 2.0.2
+      tslib: 2.6.2
+    dev: false
 
-  /a-sync-waterfall@1.0.1:
-    resolution: {integrity: sha512-RYTOHHdWipFUliRFMCS4X2Yn2X8M87V/OpSqWzKKOGhzqyUxzyVmhHDH9sAvG+ZuQf/TAOFsLCpMw09I1ufUnA==}
+  /@smithy/signature-v4@2.2.1:
+    resolution: {integrity: sha512-j5fHgL1iqKTsKJ1mTcw88p0RUcidDu95AWSeZTgiYJb+QcfwWU/UpBnaqiB59FNH5MiAZuSbOBnZlwzeeY2tIw==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@smithy/is-array-buffer': 2.2.0
+      '@smithy/types': 2.12.0
+      '@smithy/util-hex-encoding': 2.2.0
+      '@smithy/util-middleware': 2.2.0
+      '@smithy/util-uri-escape': 2.2.0
+      '@smithy/util-utf8': 2.3.0
+      tslib: 2.6.2
     dev: false
 
-  /abab@2.0.6:
-    resolution: {integrity: sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==}
-    dev: true
+  /@smithy/smithy-client@2.1.18:
+    resolution: {integrity: sha512-7FqdbaJiVaHJDD9IfDhmzhSDbpjyx+ZsfdYuOpDJF09rl8qlIAIlZNoSaflKrQ3cEXZN2YxGPaNWGhbYimyIRQ==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@smithy/middleware-stack': 2.0.9
+      '@smithy/types': 2.7.0
+      '@smithy/util-stream': 2.0.23
+      tslib: 2.6.2
+    dev: false
 
-  /abbrev@1.1.1:
-    resolution: {integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==}
+  /@smithy/smithy-client@2.5.1:
+    resolution: {integrity: sha512-jrbSQrYCho0yDaaf92qWgd+7nAeap5LtHTI51KXqmpIFCceKU3K9+vIVTUH72bOJngBMqa4kyu1VJhRcSrk/CQ==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@smithy/middleware-endpoint': 2.5.1
+      '@smithy/middleware-stack': 2.2.0
+      '@smithy/protocol-http': 3.3.0
+      '@smithy/types': 2.12.0
+      '@smithy/util-stream': 2.2.0
+      tslib: 2.6.2
+    dev: false
 
-  /accepts@1.3.8:
-    resolution: {integrity: sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==}
-    engines: {node: '>= 0.6'}
+  /@smithy/types@2.12.0:
+    resolution: {integrity: sha512-QwYgloJ0sVNBeBuBs65cIkTbfzV/Q6ZNPCJ99EICFEdJYG50nGIY/uYXp+TbsdJReIuPr0a0kXmCvren3MbRRw==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      mime-types: 2.1.35
-      negotiator: 0.6.3
+      tslib: 2.6.2
+    dev: false
 
-  /acorn-globals@7.0.1:
-    resolution: {integrity: sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==}
+  /@smithy/types@2.7.0:
+    resolution: {integrity: sha512-1OIFyhK+vOkMbu4aN2HZz/MomREkrAC/HqY5mlJMUJfGrPRwijJDTeiN8Rnj9zUaB8ogXAfIOtZrrgqZ4w7Wnw==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      acorn: 8.8.1
-      acorn-walk: 8.2.0
-    dev: true
+      tslib: 2.6.2
+    dev: false
 
-  /acorn-import-assertions@1.8.0(acorn@8.8.1):
-    resolution: {integrity: sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==}
-    peerDependencies:
-      acorn: ^8
+  /@smithy/url-parser@2.0.15:
+    resolution: {integrity: sha512-sADUncUj9rNbOTrdDGm4EXlUs0eQ9dyEo+V74PJoULY4jSQxS+9gwEgsPYyiu8PUOv16JC/MpHonOgqP/IEDZA==}
     dependencies:
-      acorn: 8.8.1
-    dev: true
+      '@smithy/querystring-parser': 2.0.15
+      '@smithy/types': 2.7.0
+      tslib: 2.6.2
+    dev: false
 
-  /acorn-jsx@5.3.2(acorn@7.4.1):
-    resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
-    peerDependencies:
-      acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
+  /@smithy/url-parser@2.2.0:
+    resolution: {integrity: sha512-hoA4zm61q1mNTpksiSWp2nEl1dt3j726HdRhiNgVJQMj7mLp7dprtF57mOB6JvEk/x9d2bsuL5hlqZbBuHQylQ==}
     dependencies:
-      acorn: 7.4.1
-    dev: true
+      '@smithy/querystring-parser': 2.2.0
+      '@smithy/types': 2.12.0
+      tslib: 2.6.2
+    dev: false
 
-  /acorn-jsx@5.3.2(acorn@8.8.1):
-    resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
-    peerDependencies:
-      acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
+  /@smithy/util-base64@2.0.1:
+    resolution: {integrity: sha512-DlI6XFYDMsIVN+GH9JtcRp3j02JEVuWIn/QOZisVzpIAprdsxGveFed0bjbMRCqmIFe8uetn5rxzNrBtIGrPIQ==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      acorn: 8.8.1
-    dev: true
+      '@smithy/util-buffer-from': 2.0.0
+      tslib: 2.6.2
+    dev: false
 
-  /acorn-walk@8.2.0:
-    resolution: {integrity: sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==}
-    engines: {node: '>=0.4.0'}
+  /@smithy/util-base64@2.3.0:
+    resolution: {integrity: sha512-s3+eVwNeJuXUwuMbusncZNViuhv2LjVJ1nMwTqSA0XAC7gjKhqqxRdJPhR8+YrkoZ9IiIbFk/yK6ACe/xlF+hw==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@smithy/util-buffer-from': 2.2.0
+      '@smithy/util-utf8': 2.3.0
+      tslib: 2.6.2
+    dev: false
 
-  /acorn@7.4.1:
-    resolution: {integrity: sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==}
-    engines: {node: '>=0.4.0'}
-    hasBin: true
-    dev: true
+  /@smithy/util-body-length-browser@2.0.1:
+    resolution: {integrity: sha512-NXYp3ttgUlwkaug4bjBzJ5+yIbUbUx8VsSLuHZROQpoik+gRkIBeEG9MPVYfvPNpuXb/puqodeeUXcKFe7BLOQ==}
+    dependencies:
+      tslib: 2.6.2
+    dev: false
 
-  /acorn@8.8.1:
-    resolution: {integrity: sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==}
-    engines: {node: '>=0.4.0'}
-    hasBin: true
+  /@smithy/util-body-length-browser@2.2.0:
+    resolution: {integrity: sha512-dtpw9uQP7W+n3vOtx0CfBD5EWd7EPdIdsQnWTDoFf77e3VUf05uA7R7TGipIo8e4WL2kuPdnsr3hMQn9ziYj5w==}
+    dependencies:
+      tslib: 2.6.2
+    dev: false
 
-  /address@1.2.1:
-    resolution: {integrity: sha512-B+6bi5D34+fDYENiH5qOlA0cV2rAGKuWZ9LeyUUehbXy8e0VS9e498yO0Jeeh+iM+6KbfudHTFjXw2MmJD4QRA==}
-    engines: {node: '>= 10.0.0'}
+  /@smithy/util-body-length-node@2.1.0:
+    resolution: {integrity: sha512-/li0/kj/y3fQ3vyzn36NTLGmUwAICb7Jbe/CsWCktW363gh1MOcpEcSO3mJ344Gv2dqz8YJCLQpb6hju/0qOWw==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      tslib: 2.6.2
     dev: false
 
-  /address@1.2.2:
-    resolution: {integrity: sha512-4B/qKCfeE/ODUaAUpSwfzazo5x29WD4r3vXiWsB7I2mSDAihwEqKO+g8GELZUQSSAo5e1XTYh3ZVfLyxBc12nA==}
-    engines: {node: '>= 10.0.0'}
-    dev: true
+  /@smithy/util-body-length-node@2.3.0:
+    resolution: {integrity: sha512-ITWT1Wqjubf2CJthb0BuT9+bpzBfXeMokH/AAa5EJQgbv9aPMVfnM76iFIZVFf50hYXGbtiV71BHAthNWd6+dw==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      tslib: 2.6.2
+    dev: false
 
-  /adler-32@1.2.0:
-    resolution: {integrity: sha512-/vUqU/UY4MVeFsg+SsK6c+/05RZXIHZMGJA+PX5JyWI0ZRcBpupnRuPLU/NXXoFwMYCPCoxIfElM2eS+DUXCqQ==}
-    engines: {node: '>=0.8'}
-    hasBin: true
+  /@smithy/util-buffer-from@2.0.0:
+    resolution: {integrity: sha512-/YNnLoHsR+4W4Vf2wL5lGv0ksg8Bmk3GEGxn2vEQt52AQaPSCuaO5PM5VM7lP1K9qHRKHwrPGktqVoAHKWHxzw==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      exit-on-epipe: 1.0.1
-      printj: 1.1.2
+      '@smithy/is-array-buffer': 2.0.0
+      tslib: 2.6.2
     dev: false
 
-  /adler-32@1.3.1:
-    resolution: {integrity: sha512-ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A==}
-    engines: {node: '>=0.8'}
+  /@smithy/util-buffer-from@2.2.0:
+    resolution: {integrity: sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@smithy/is-array-buffer': 2.2.0
+      tslib: 2.6.2
     dev: false
 
-  /agent-base@5.1.1:
-    resolution: {integrity: sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g==}
-    engines: {node: '>= 6.0.0'}
-    dev: true
+  /@smithy/util-config-provider@2.0.0:
+    resolution: {integrity: sha512-xCQ6UapcIWKxXHEU4Mcs2s7LcFQRiU3XEluM2WcCjjBtQkUN71Tb+ydGmJFPxMUrW/GWMgQEEGipLym4XG0jZg==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      tslib: 2.6.2
+    dev: false
 
-  /agent-base@6.0.2:
-    resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==}
-    engines: {node: '>= 6.0.0'}
+  /@smithy/util-config-provider@2.3.0:
+    resolution: {integrity: sha512-HZkzrRcuFN1k70RLqlNK4FnPXKOpkik1+4JaBoHNJn+RnJGYqaa3c5/+XtLOXhlKzlRgNvyaLieHTW2VwGN0VQ==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      debug: 4.3.4(supports-color@8.1.1)
-    transitivePeerDependencies:
-      - supports-color
+      tslib: 2.6.2
+    dev: false
 
-  /agentkeepalive@4.2.1:
-    resolution: {integrity: sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==}
-    engines: {node: '>= 8.0.0'}
+  /@smithy/util-defaults-mode-browser@2.0.22:
+    resolution: {integrity: sha512-qcF20IHHH96FlktvBRICDXDhLPtpVmtksHmqNGtotb9B0DYWXsC6jWXrkhrrwF7tH26nj+npVTqh9isiFV1gdA==}
+    engines: {node: '>= 10.0.0'}
     dependencies:
-      debug: 4.3.4(supports-color@8.1.1)
-      depd: 1.1.2
-      humanize-ms: 1.2.1
-    transitivePeerDependencies:
-      - supports-color
+      '@smithy/property-provider': 2.0.16
+      '@smithy/smithy-client': 2.1.18
+      '@smithy/types': 2.7.0
+      bowser: 2.11.0
+      tslib: 2.6.2
     dev: false
-    optional: true
 
-  /aggregate-error@3.1.0:
-    resolution: {integrity: sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==}
-    engines: {node: '>=8'}
+  /@smithy/util-defaults-mode-browser@2.2.1:
+    resolution: {integrity: sha512-RtKW+8j8skk17SYowucwRUjeh4mCtnm5odCL0Lm2NtHQBsYKrNW0od9Rhopu9wF1gHMfHeWF7i90NwBz/U22Kw==}
+    engines: {node: '>= 10.0.0'}
     dependencies:
-      clean-stack: 2.2.0
-      indent-string: 4.0.0
+      '@smithy/property-provider': 2.2.0
+      '@smithy/smithy-client': 2.5.1
+      '@smithy/types': 2.12.0
+      bowser: 2.11.0
+      tslib: 2.6.2
+    dev: false
 
-  /ajv-formats@2.1.1(ajv@8.1.0):
-    resolution: {integrity: sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==}
-    peerDependencies:
-      ajv: ^8.0.0
-    peerDependenciesMeta:
-      ajv:
-        optional: true
+  /@smithy/util-defaults-mode-node@2.0.29:
+    resolution: {integrity: sha512-+uG/15VoUh6JV2fdY9CM++vnSuMQ1VKZ6BdnkUM7R++C/vLjnlg+ToiSR1FqKZbMmKBXmsr8c/TsDWMAYvxbxQ==}
+    engines: {node: '>= 10.0.0'}
     dependencies:
-      ajv: 8.1.0
+      '@smithy/config-resolver': 2.0.21
+      '@smithy/credential-provider-imds': 2.1.4
+      '@smithy/node-config-provider': 2.1.8
+      '@smithy/property-provider': 2.0.16
+      '@smithy/smithy-client': 2.1.18
+      '@smithy/types': 2.7.0
+      tslib: 2.6.2
     dev: false
 
-  /ajv-formats@2.1.1(ajv@8.12.0):
-    resolution: {integrity: sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==}
-    peerDependencies:
-      ajv: ^8.0.0
-    peerDependenciesMeta:
-      ajv:
-        optional: true
+  /@smithy/util-defaults-mode-node@2.3.1:
+    resolution: {integrity: sha512-vkMXHQ0BcLFysBMWgSBLSk3+leMpFSyyFj8zQtv5ZyUBx8/owVh1/pPEkzmW/DR/Gy/5c8vjLDD9gZjXNKbrpA==}
+    engines: {node: '>= 10.0.0'}
     dependencies:
-      ajv: 8.12.0
+      '@smithy/config-resolver': 2.2.0
+      '@smithy/credential-provider-imds': 2.3.0
+      '@smithy/node-config-provider': 2.3.0
+      '@smithy/property-provider': 2.2.0
+      '@smithy/smithy-client': 2.5.1
+      '@smithy/types': 2.12.0
+      tslib: 2.6.2
+    dev: false
 
-  /ajv-keywords@3.5.2(ajv@6.12.6):
-    resolution: {integrity: sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==}
-    peerDependencies:
-      ajv: ^6.9.1
+  /@smithy/util-endpoints@1.0.7:
+    resolution: {integrity: sha512-Q2gEind3jxoLk6hdKWyESMU7LnXz8aamVwM+VeVjOYzYT1PalGlY/ETa48hv2YpV4+YV604y93YngyzzzQ4IIA==}
+    engines: {node: '>= 14.0.0'}
     dependencies:
-      ajv: 6.12.6
-    dev: true
+      '@smithy/node-config-provider': 2.1.8
+      '@smithy/types': 2.7.0
+      tslib: 2.6.2
+    dev: false
 
-  /ajv-keywords@5.1.0(ajv@8.12.0):
-    resolution: {integrity: sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==}
-    peerDependencies:
-      ajv: ^8.8.2
+  /@smithy/util-endpoints@1.2.0:
+    resolution: {integrity: sha512-BuDHv8zRjsE5zXd3PxFXFknzBG3owCpjq8G3FcsXW3CykYXuEqM3nTSsmLzw5q+T12ZYuDlVUZKBdpNbhVtlrQ==}
+    engines: {node: '>= 14.0.0'}
     dependencies:
-      ajv: 8.12.0
-      fast-deep-equal: 3.1.3
-    dev: true
+      '@smithy/node-config-provider': 2.3.0
+      '@smithy/types': 2.12.0
+      tslib: 2.6.2
+    dev: false
 
-  /ajv@6.12.6:
-    resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==}
+  /@smithy/util-hex-encoding@2.0.0:
+    resolution: {integrity: sha512-c5xY+NUnFqG6d7HFh1IFfrm3mGl29lC+vF+geHv4ToiuJCBmIfzx6IeHLg+OgRdPFKDXIw6pvi+p3CsscaMcMA==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      fast-deep-equal: 3.1.3
-      fast-json-stable-stringify: 2.1.0
-      json-schema-traverse: 0.4.1
-      uri-js: 4.4.1
+      tslib: 2.6.2
+    dev: false
 
-  /ajv@8.1.0:
-    resolution: {integrity: sha512-B/Sk2Ix7A36fs/ZkuGLIR86EdjbgR6fsAcbx9lOP/QBSXujDNbVmIS/U4Itz5k8fPFDeVZl/zQ/gJW4Jrq6XjQ==}
+  /@smithy/util-hex-encoding@2.2.0:
+    resolution: {integrity: sha512-7iKXR+/4TpLK194pVjKiasIyqMtTYJsgKgM242Y9uzt5dhHnUDvMNb+3xIhRJ9QhvqGii/5cRUt4fJn3dtXNHQ==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      fast-deep-equal: 3.1.3
-      json-schema-traverse: 1.0.0
-      require-from-string: 2.0.2
-      uri-js: 4.4.1
+      tslib: 2.6.2
     dev: false
 
-  /ajv@8.12.0:
-    resolution: {integrity: sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==}
+  /@smithy/util-middleware@2.0.8:
+    resolution: {integrity: sha512-qkvqQjM8fRGGA8P2ydWylMhenCDP8VlkPn8kiNuFEaFz9xnUKC2irfqsBSJrfrOB9Qt6pQsI58r3zvvumhFMkw==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      fast-deep-equal: 3.1.3
-      json-schema-traverse: 1.0.0
-      require-from-string: 2.0.2
-      uri-js: 4.4.1
+      '@smithy/types': 2.7.0
+      tslib: 2.6.2
+    dev: false
 
-  /amqplib@0.10.3:
-    resolution: {integrity: sha512-UHmuSa7n8vVW/a5HGh2nFPqAEr8+cD4dEZ6u9GjP91nHfr1a54RyAKyra7Sb5NH7NBKOUlyQSMXIp0qAixKexw==}
-    engines: {node: '>=10'}
+  /@smithy/util-middleware@2.2.0:
+    resolution: {integrity: sha512-L1qpleXf9QD6LwLCJ5jddGkgWyuSvWBkJwWAZ6kFkdifdso+sk3L3O1HdmPvCdnCK3IS4qWyPxev01QMnfHSBw==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@acuminous/bitsyntax': 0.1.2
-      buffer-more-ints: 1.0.0
-      readable-stream: 1.1.14
-      url-parse: 1.5.10
-    transitivePeerDependencies:
-      - supports-color
+      '@smithy/types': 2.12.0
+      tslib: 2.6.2
     dev: false
 
-  /ansi-align@3.0.1:
-    resolution: {integrity: sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==}
+  /@smithy/util-retry@2.0.8:
+    resolution: {integrity: sha512-cQTPnVaVFMjjS6cb44WV2yXtHVyXDC5icKyIbejMarJEApYeJWpBU3LINTxHqp/tyLI+MZOUdosr2mZ3sdziNg==}
+    engines: {node: '>= 14.0.0'}
     dependencies:
-      string-width: 4.2.3
-    dev: true
+      '@smithy/service-error-classification': 2.0.8
+      '@smithy/types': 2.7.0
+      tslib: 2.6.2
+    dev: false
 
-  /ansi-colors@1.1.0:
-    resolution: {integrity: sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==}
-    engines: {node: '>=0.10.0'}
+  /@smithy/util-retry@2.2.0:
+    resolution: {integrity: sha512-q9+pAFPTfftHXRytmZ7GzLFFrEGavqapFc06XxzZFcSIGERXMerXxCitjOG1prVDR9QdjqotF40SWvbqcCpf8g==}
+    engines: {node: '>= 14.0.0'}
     dependencies:
-      ansi-wrap: 0.1.0
-    dev: true
+      '@smithy/service-error-classification': 2.1.5
+      '@smithy/types': 2.12.0
+      tslib: 2.6.2
+    dev: false
 
-  /ansi-colors@4.1.3:
-    resolution: {integrity: sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==}
-    engines: {node: '>=6'}
-    dev: true
+  /@smithy/util-stream@2.0.23:
+    resolution: {integrity: sha512-OJMWq99LAZJUzUwTk+00plyxX3ESktBaGPhqNIEVab+53gLULiWN9B/8bRABLg0K6R6Xg4t80uRdhk3B/LZqMQ==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@smithy/fetch-http-handler': 2.3.1
+      '@smithy/node-http-handler': 2.2.1
+      '@smithy/types': 2.7.0
+      '@smithy/util-base64': 2.0.1
+      '@smithy/util-buffer-from': 2.0.0
+      '@smithy/util-hex-encoding': 2.0.0
+      '@smithy/util-utf8': 2.0.2
+      tslib: 2.6.2
+    dev: false
 
-  /ansi-escapes@3.2.0:
-    resolution: {integrity: sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==}
-    engines: {node: '>=4'}
+  /@smithy/util-stream@2.2.0:
+    resolution: {integrity: sha512-17faEXbYWIRst1aU9SvPZyMdWmqIrduZjVOqCPMIsWFNxs5yQQgFrJL6b2SdiCzyW9mJoDjFtgi53xx7EH+BXA==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@smithy/fetch-http-handler': 2.5.0
+      '@smithy/node-http-handler': 2.5.0
+      '@smithy/types': 2.12.0
+      '@smithy/util-base64': 2.3.0
+      '@smithy/util-buffer-from': 2.2.0
+      '@smithy/util-hex-encoding': 2.2.0
+      '@smithy/util-utf8': 2.3.0
+      tslib: 2.6.2
+    dev: false
 
-  /ansi-escapes@4.3.2:
-    resolution: {integrity: sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==}
-    engines: {node: '>=8'}
+  /@smithy/util-uri-escape@2.0.0:
+    resolution: {integrity: sha512-ebkxsqinSdEooQduuk9CbKcI+wheijxEb3utGXkCoYQkJnwTnLbH1JXGimJtUkQwNQbsbuYwG2+aFVyZf5TLaw==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      type-fest: 0.21.3
+      tslib: 2.6.2
+    dev: false
 
-  /ansi-gray@0.1.1:
-    resolution: {integrity: sha512-HrgGIZUl8h2EHuZaU9hTR/cU5nhKxpVE1V6kdGsQ8e4zirElJ5fvtfc8N7Q1oq1aatO275i8pUFUCpNWCAnVWw==}
-    engines: {node: '>=0.10.0'}
+  /@smithy/util-uri-escape@2.2.0:
+    resolution: {integrity: sha512-jtmJMyt1xMD/d8OtbVJ2gFZOSKc+ueYJZPW20ULW1GOp/q/YIM0wNh+u8ZFao9UaIGz4WoPW8hC64qlWLIfoDA==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      ansi-wrap: 0.1.0
-    dev: true
+      tslib: 2.6.2
+    dev: false
 
-  /ansi-html-community@0.0.8:
-    resolution: {integrity: sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==}
-    engines: {'0': node >= 0.8.0}
-    hasBin: true
-    dev: true
+  /@smithy/util-utf8@2.0.2:
+    resolution: {integrity: sha512-qOiVORSPm6Ce4/Yu6hbSgNHABLP2VMv8QOC3tTDNHHlWY19pPyc++fBTbZPtx6egPXi4HQxKDnMxVxpbtX2GoA==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@smithy/util-buffer-from': 2.0.0
+      tslib: 2.6.2
+    dev: false
 
-  /ansi-regex@2.1.1:
-    resolution: {integrity: sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  /@smithy/util-utf8@2.3.0:
+    resolution: {integrity: sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@smithy/util-buffer-from': 2.2.0
+      tslib: 2.6.2
+    dev: false
 
-  /ansi-regex@4.1.1:
-    resolution: {integrity: sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==}
-    engines: {node: '>=6'}
-    dev: true
+  /@smithy/util-waiter@2.0.15:
+    resolution: {integrity: sha512-9Y+btzzB7MhLADW7xgD6SjvmoYaRkrb/9SCbNGmNdfO47v38rxb90IGXyDtAK0Shl9bMthTmLgjlfYc+vtz2Qw==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      '@smithy/abort-controller': 2.0.15
+      '@smithy/types': 2.7.0
+      tslib: 2.6.2
+    dev: false
 
-  /ansi-regex@5.0.1:
-    resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==}
-    engines: {node: '>=8'}
+  /@sqltools/formatter@1.2.5:
+    resolution: {integrity: sha512-Uy0+khmZqUrUGm5dmMqVlnvufZRSK0FbYzVgp0UMstm+F5+W2/jnEEQyc9vo1ZR/E5ZI/B1WjjoTqBqwJL6Krw==}
+    dev: false
 
-  /ansi-regex@6.0.1:
-    resolution: {integrity: sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==}
-    engines: {node: '>=12'}
+  /@storybook/addon-a11y@8.0.0:
+    resolution: {integrity: sha512-lxvXOMYqeM6DOUvNP3e18GzPDVhcOZtLnjkJ8XQbRk2xx2qHodAEiFhiKBhfStsn6/rg0zWLRpZ1NJxjnZ0l/Q==}
+    dependencies:
+      '@storybook/addon-highlight': 8.0.0
+      axe-core: 4.7.2
     dev: true
 
-  /ansi-styles@3.2.1:
-    resolution: {integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==}
-    engines: {node: '>=4'}
+  /@storybook/addon-actions@8.0.0:
+    resolution: {integrity: sha512-QXfnEWZt5k35cPYsLvxq505XrCgXujc4UEkky1lBtSMI9SLzlXZg3fC/lW0c0hiu2c0+zI+y4fj5vTE9AZJdjw==}
     dependencies:
-      color-convert: 1.9.3
+      '@storybook/core-events': 8.0.0
+      '@storybook/global': 5.0.0
+      '@types/uuid': 9.0.7
+      dequal: 2.0.3
+      polished: 4.2.2
+      uuid: 9.0.0
     dev: true
 
-  /ansi-styles@4.3.0:
-    resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==}
-    engines: {node: '>=8'}
+  /@storybook/addon-backgrounds@8.0.0:
+    resolution: {integrity: sha512-hJLrtJa3paAL1DdArdqRFSPWji7s2kJlPh8mUhDpMHy0AOWrcslUanHWVmmgYpnBsYBgQcldt6eRIROtqgpSeA==}
     dependencies:
-      color-convert: 2.0.1
-
-  /ansi-styles@5.2.0:
-    resolution: {integrity: sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==}
-    engines: {node: '>=10'}
+      '@storybook/global': 5.0.0
+      memoizerific: 1.11.3
+      ts-dedent: 2.2.0
     dev: true
 
-  /ansi-styles@6.2.1:
-    resolution: {integrity: sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==}
-    engines: {node: '>=12'}
+  /@storybook/addon-controls@8.0.0(@types/react@18.0.27)(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-hBYJ9O6G+lN43TxNPnw78GhLirjRVN8kFJSVg2Bha87hIvS3c/zx5ZWqtiXjp4wL4/r/IFe4EvBcBQh4Mpi8uw==}
+    dependencies:
+      '@storybook/blocks': 8.0.0(@types/react@18.0.27)(react-dom@18.2.0)(react@18.2.0)
+      lodash: 4.17.21
+      ts-dedent: 2.2.0
+    transitivePeerDependencies:
+      - '@types/react'
+      - encoding
+      - react
+      - react-dom
+      - supports-color
     dev: true
 
-  /ansi-wrap@0.1.0:
-    resolution: {integrity: sha512-ZyznvL8k/FZeQHr2T6LzcJ/+vBApDnMNZvfVFy3At0knswWd6rJ3/0Hhmpu8oqa6C92npmozs890sX9Dl6q+Qw==}
-    engines: {node: '>=0.10.0'}
+  /@storybook/addon-docs@8.0.0:
+    resolution: {integrity: sha512-P86M4Mo3FKtMIzSc8Hao46NmrlBs4w81BVf3AWNVka5aIPdWP2pINgDDDweASPgFKMVQNWUreR5pl0DHZfaJ5g==}
+    dependencies:
+      '@babel/core': 7.22.9
+      '@mdx-js/react': 3.0.1(@types/react@18.0.27)(react@18.2.0)
+      '@storybook/blocks': 8.0.0(@types/react@18.0.27)(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/client-logger': 8.0.0
+      '@storybook/components': 8.0.0(@types/react@18.0.27)(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/csf-plugin': 8.0.0
+      '@storybook/csf-tools': 8.0.0
+      '@storybook/global': 5.0.0
+      '@storybook/node-logger': 8.0.0
+      '@storybook/preview-api': 8.0.0
+      '@storybook/react-dom-shim': 8.0.0(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/theming': 8.0.0(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/types': 8.0.0
+      '@types/react': 18.0.27
+      fs-extra: 11.1.1
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
+      rehype-external-links: 3.0.0
+      rehype-slug: 6.0.0
+      ts-dedent: 2.2.0
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
     dev: true
 
-  /ansicolors@0.3.2:
-    resolution: {integrity: sha512-QXu7BPrP29VllRxH8GwB7x5iX5qWKAAMLqKQGWTeLWVlNHNOpVMJ91dsxQAIWXpjuW5wqvxu3Jd/nRjrJ+0pqg==}
-
-  /any-promise@1.3.0:
-    resolution: {integrity: sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==}
-    dev: false
-
-  /anymatch@2.0.0:
-    resolution: {integrity: sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==}
-    dependencies:
-      micromatch: 3.1.10
-      normalize-path: 2.1.1
+  /@storybook/addon-essentials@8.0.0(@types/react@18.0.27)(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-n5uNerxBj2PrL8NJhzSUL3ctsW3Wy0ySBBrrChhBaXLoAkTP+KpJlX8h55abxdMkI0i+dreS//XQ0lpw1KX4pw==}
+    dependencies:
+      '@storybook/addon-actions': 8.0.0
+      '@storybook/addon-backgrounds': 8.0.0
+      '@storybook/addon-controls': 8.0.0(@types/react@18.0.27)(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/addon-docs': 8.0.0
+      '@storybook/addon-highlight': 8.0.0
+      '@storybook/addon-measure': 8.0.0
+      '@storybook/addon-outline': 8.0.0
+      '@storybook/addon-toolbars': 8.0.0
+      '@storybook/addon-viewport': 8.0.0
+      '@storybook/core-common': 8.0.0
+      '@storybook/manager-api': 8.0.0(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/node-logger': 8.0.0
+      '@storybook/preview-api': 8.0.0
+      ts-dedent: 2.2.0
     transitivePeerDependencies:
+      - '@types/react'
+      - encoding
+      - react
+      - react-dom
       - supports-color
     dev: true
 
-  /anymatch@3.1.3:
-    resolution: {integrity: sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==}
-    engines: {node: '>= 8'}
+  /@storybook/addon-highlight@8.0.0:
+    resolution: {integrity: sha512-bSba9UTcPJBFUy5peIU8XPlKK/7lT054977oLGgVYup2u88km6pWaMNSGMWhb3xXdseTgrj96k/b+md4X+WrMg==}
     dependencies:
-      normalize-path: 3.0.0
-      picomatch: 2.3.1
-
-  /app-root-dir@1.0.2:
-    resolution: {integrity: sha512-jlpIfsOoNoafl92Sz//64uQHGSyMrD2vYG5d8o2a4qGvyNCvXur7bzIsWtAC/6flI2RYAp3kv8rsfBtaLm7w0g==}
+      '@storybook/global': 5.0.0
     dev: true
 
-  /app-root-path@3.1.0:
-    resolution: {integrity: sha512-biN3PwB2gUtjaYy/isrU3aNWI5w+fAfvHkSvCKeQGxhmYpwKFUxudR3Yya+KqVRHBmEDYh+/lTozYCFbmzX4nA==}
-    engines: {node: '>= 6.0.0'}
-    dev: false
-
-  /append-buffer@1.0.2:
-    resolution: {integrity: sha512-WLbYiXzD3y/ATLZFufV/rZvWdZOs+Z/+5v1rBZ463Jn398pa6kcde27cvozYnBoxXblGZTFfoPpsaEw0orU5BA==}
-    engines: {node: '>=0.10.0'}
+  /@storybook/addon-interactions@8.0.0:
+    resolution: {integrity: sha512-lb6WZAeF3MIT05wSVbz2ZKDpTIoTmHW5e8hImdquNlOm8qNm4fl5BLpVrZT1YkC6v42MM8yU/DeeUw+8w7rXDg==}
     dependencies:
-      buffer-equal: 1.0.1
+      '@storybook/global': 5.0.0
+      '@storybook/types': 8.0.0
+      jest-mock: 27.5.1
+      polished: 4.2.2
+      ts-dedent: 2.2.0
     dev: true
 
-  /append-field@1.0.0:
-    resolution: {integrity: sha512-klpgFSWLW1ZEs8svjfb7g4qWY0YS5imI82dTg+QahUvJ8YqAY0P10Uk8tTyh9ZGuYEZEMaeJYCF5BFuX552hsw==}
-    dev: false
+  /@storybook/addon-links@8.0.0(react@18.2.0):
+    resolution: {integrity: sha512-UjB68EJwSvRsD326KJAzYkuzhCdJmkliiitaqSJ7GUdgGgTkKC7cqH8QmRC0SK5qRi0lN59ARIKPiP5wjsEeOw==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0
+    peerDependenciesMeta:
+      react:
+        optional: true
+    dependencies:
+      '@storybook/csf': 0.1.2
+      '@storybook/global': 5.0.0
+      react: 18.2.0
+      ts-dedent: 2.2.0
+    dev: true
 
-  /aproba@2.0.0:
-    resolution: {integrity: sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==}
+  /@storybook/addon-measure@8.0.0:
+    resolution: {integrity: sha512-vSqQMxNHO++1XIyOF4HkQ/9UNADYCVCzoWG/JwOmWJ1NdfaPffN+QxLn+MYq+ex9R174nBdbjVqb2+e4MdYzPw==}
+    dependencies:
+      '@storybook/global': 5.0.0
+      tiny-invariant: 1.3.1
+    dev: true
 
-  /arch@2.2.0:
-    resolution: {integrity: sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==}
+  /@storybook/addon-outline@8.0.0:
+    resolution: {integrity: sha512-8/rs+4UYSQNE2J2CgeeAMJuz7UmJRN4T2Id4oESv7nfM+aUXXF1cOBw1EnofBie2ukVad9lATlsPaNx6ldoWsg==}
+    dependencies:
+      '@storybook/global': 5.0.0
+      ts-dedent: 2.2.0
     dev: true
 
-  /archy@1.0.0:
-    resolution: {integrity: sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==}
+  /@storybook/addon-toolbars@8.0.0:
+    resolution: {integrity: sha512-+nNe52DAs42VIJxJnsg3d3BAVf+svR9lvaf3dD/HgS9vBWtp2wIumDM6b05umnVuR/dXviSpdpy+gm/cCdIQGQ==}
     dev: true
 
-  /are-we-there-yet@2.0.0:
-    resolution: {integrity: sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==}
-    engines: {node: '>=10'}
+  /@storybook/addon-viewport@8.0.0:
+    resolution: {integrity: sha512-eqgyZszJSz6C3GXJTn8/8bmL8zqALr4dnBFg8w/RJ+gydVCk17Ow3ifYTWrEGVLXCCwd0XbCZGj9tAmfhovjTQ==}
     dependencies:
-      delegates: 1.0.0
-      readable-stream: 3.6.0
+      memoizerific: 1.11.3
+    dev: true
 
-  /are-we-there-yet@3.0.1:
-    resolution: {integrity: sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==}
-    engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
+  /@storybook/blocks@8.0.0(@types/react@18.0.27)(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-Sxy7pOa6B3ci/XhfKca6u97Kz6pGZV5ieQBUWRYByUZTjiOp12RVLFptexxrJHyNBA00BHJPek4fvFSJfn6nOQ==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0
+      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+    peerDependenciesMeta:
+      react:
+        optional: true
+      react-dom:
+        optional: true
     dependencies:
-      delegates: 1.0.0
-      readable-stream: 3.6.0
-    dev: false
-    optional: true
-
-  /arg@4.1.3:
-    resolution: {integrity: sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==}
+      '@storybook/channels': 8.0.0
+      '@storybook/client-logger': 8.0.0
+      '@storybook/components': 8.0.0(@types/react@18.0.27)(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/core-events': 8.0.0
+      '@storybook/csf': 0.1.2
+      '@storybook/docs-tools': 8.0.0
+      '@storybook/global': 5.0.0
+      '@storybook/icons': 1.2.9(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/manager-api': 8.0.0(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/preview-api': 8.0.0
+      '@storybook/theming': 8.0.0(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/types': 8.0.0
+      '@types/lodash': 4.14.195
+      color-convert: 2.0.1
+      dequal: 2.0.3
+      lodash: 4.17.21
+      markdown-to-jsx: 7.3.2(react@18.2.0)
+      memoizerific: 1.11.3
+      polished: 4.2.2
+      react: 18.2.0
+      react-colorful: 5.6.1(react-dom@18.2.0)(react@18.2.0)
+      react-dom: 18.2.0(react@18.2.0)
+      telejson: 7.2.0
+      tocbot: 4.21.0
+      ts-dedent: 2.2.0
+      util-deprecate: 1.0.2
+    transitivePeerDependencies:
+      - '@types/react'
+      - encoding
+      - supports-color
+    dev: true
 
-  /argparse@1.0.10:
-    resolution: {integrity: sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==}
+  /@storybook/builder-manager@8.0.0:
+    resolution: {integrity: sha512-cUj1YKOvk+pemom9QXdLm+yWRovTQiV2HPfdjVftASD++Bau2hVpZKDhII0dLKg9mluojJ6Rt83F1daAyA2njQ==}
     dependencies:
-      sprintf-js: 1.0.3
-
-  /argparse@2.0.1:
-    resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
+      '@fal-works/esbuild-plugin-global-externals': 2.1.2
+      '@storybook/core-common': 8.0.0
+      '@storybook/manager': 8.0.0
+      '@storybook/node-logger': 8.0.0
+      '@types/ejs': 3.1.1
+      '@yarnpkg/esbuild-plugin-pnp': 3.0.0-rc.15(esbuild@0.19.8)
+      browser-assert: 1.2.1
+      ejs: 3.1.9
+      esbuild: 0.19.8
+      esbuild-plugin-alias: 0.2.1
+      express: 4.19.2
+      fs-extra: 11.1.1
+      process: 0.11.10
+      util: 0.12.5
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
+    dev: true
 
-  /aria-query@4.2.2:
-    resolution: {integrity: sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==}
-    engines: {node: '>=6.0'}
+  /@storybook/builder-vite@8.0.0(typescript@5.4.2)(vite@5.1.6):
+    resolution: {integrity: sha512-dJhd8QwQDELwStbM1P6LEXjFHVbhMM4jH5L+UkDDrS42m2YTvizdGhyRvEJajLz1Ar7o4++p2hBBA/dU9NXfJQ==}
+    peerDependencies:
+      '@preact/preset-vite': '*'
+      typescript: ^5.4.2
+      vite: ^4.0.0 || ^5.0.0
+      vite-plugin-glimmerx: '*'
+    peerDependenciesMeta:
+      '@preact/preset-vite':
+        optional: true
+      typescript:
+        optional: true
+      vite-plugin-glimmerx:
+        optional: true
     dependencies:
-      '@babel/runtime': 7.20.7
-      '@babel/runtime-corejs3': 7.20.7
+      '@storybook/channels': 8.0.0
+      '@storybook/client-logger': 8.0.0
+      '@storybook/core-common': 8.0.0
+      '@storybook/core-events': 8.0.0
+      '@storybook/csf-plugin': 8.0.0
+      '@storybook/node-logger': 8.0.0
+      '@storybook/preview': 8.0.0
+      '@storybook/preview-api': 8.0.0
+      '@storybook/types': 8.0.0
+      '@types/find-cache-dir': 3.2.1
+      browser-assert: 1.2.1
+      es-module-lexer: 0.9.3
+      express: 4.19.2
+      find-cache-dir: 3.3.2
+      fs-extra: 11.1.1
+      magic-string: 0.30.8
+      ts-dedent: 2.2.0
+      typescript: 5.4.2
+      vite: 5.1.6(sass@1.64.1)
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
     dev: true
 
-  /aria-query@5.1.3:
-    resolution: {integrity: sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==}
+  /@storybook/channels@8.0.0:
+    resolution: {integrity: sha512-uykCBlSIMVodsgTFC/XAgO7JeaTJrKtDmmM6Z4liGkPS6EUvurOEu2vK6FuvojzhLHdVJ5bP+VXSJerfm7aE4Q==}
     dependencies:
-      deep-equal: 2.2.0
+      '@storybook/client-logger': 8.0.0
+      '@storybook/core-events': 8.0.0
+      '@storybook/global': 5.0.0
+      telejson: 7.2.0
+      tiny-invariant: 1.3.1
     dev: true
 
-  /arr-diff@4.0.0:
-    resolution: {integrity: sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==}
-    engines: {node: '>=0.10.0'}
+  /@storybook/cli@8.0.0(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-4W99ldBUJjrEbZlxI4rvqW8lRY+AP2+wLGRMp4nyI/XW5cp7R+OryZf4imHgecunBQyKGXVek+poDlgKPQsxsg==}
+    hasBin: true
+    dependencies:
+      '@babel/core': 7.24.0
+      '@babel/types': 7.23.6
+      '@ndelangen/get-tarball': 3.0.7
+      '@storybook/codemod': 8.0.0
+      '@storybook/core-common': 8.0.0
+      '@storybook/core-events': 8.0.0
+      '@storybook/core-server': 8.0.0(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/csf-tools': 8.0.0
+      '@storybook/node-logger': 8.0.0
+      '@storybook/telemetry': 8.0.0
+      '@storybook/types': 8.0.0
+      '@types/semver': 7.5.0
+      '@yarnpkg/fslib': 2.10.3
+      '@yarnpkg/libzip': 2.3.0
+      chalk: 4.1.2
+      commander: 6.2.1
+      cross-spawn: 7.0.3
+      detect-indent: 6.1.0
+      envinfo: 7.8.1
+      execa: 5.1.1
+      find-up: 5.0.0
+      fs-extra: 11.1.1
+      get-npm-tarball-url: 2.0.3
+      giget: 1.0.0
+      globby: 11.1.0
+      jscodeshift: 0.15.2(@babel/preset-env@7.24.0)
+      leven: 3.1.0
+      ora: 5.4.1
+      prettier: 3.2.5
+      prompts: 2.4.2
+      read-pkg-up: 7.0.1
+      semver: 7.6.0
+      strip-json-comments: 3.1.1
+      tempy: 1.0.1
+      tiny-invariant: 1.3.1
+      ts-dedent: 2.2.0
+    transitivePeerDependencies:
+      - '@babel/preset-env'
+      - bufferutil
+      - encoding
+      - react
+      - react-dom
+      - supports-color
+      - utf-8-validate
     dev: true
 
-  /arr-filter@1.1.2:
-    resolution: {integrity: sha512-A2BETWCqhsecSvCkWAeVBFLH6sXEUGASuzkpjL3GR1SlL/PWL6M3J8EAAld2Uubmh39tvkJTqC9LeLHCUKmFXA==}
-    engines: {node: '>=0.10.0'}
+  /@storybook/client-logger@8.0.0:
+    resolution: {integrity: sha512-olc1vUfaZNkXc7L8UoCdGmyBieHQbsaB+0vVoivYMSa1DHYtXE75RefU3lhMSGrkvIZmXMvfaIDmnyJIOB5FxA==}
     dependencies:
-      make-iterator: 1.0.1
+      '@storybook/global': 5.0.0
     dev: true
 
-  /arr-flatten@1.1.0:
-    resolution: {integrity: sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==}
-    engines: {node: '>=0.10.0'}
+  /@storybook/codemod@8.0.0:
+    resolution: {integrity: sha512-rLY3M1xL+4S5dUB8XoSfDF46FxdntSsaFH4sjHZ08itVbwAAl7XqhYElVGueuobTgicJcOVTY8CJNkWcY6ETzA==}
+    dependencies:
+      '@babel/core': 7.24.0
+      '@babel/preset-env': 7.24.0(@babel/core@7.24.0)
+      '@babel/types': 7.24.0
+      '@storybook/csf': 0.1.2
+      '@storybook/csf-tools': 8.0.0
+      '@storybook/node-logger': 8.0.0
+      '@storybook/types': 8.0.0
+      '@types/cross-spawn': 6.0.2
+      cross-spawn: 7.0.3
+      globby: 11.1.0
+      jscodeshift: 0.15.2(@babel/preset-env@7.24.0)
+      lodash: 4.17.21
+      prettier: 3.2.5
+      recast: 0.23.6
+      tiny-invariant: 1.3.1
+    transitivePeerDependencies:
+      - supports-color
     dev: true
 
-  /arr-map@2.0.2:
-    resolution: {integrity: sha512-tVqVTHt+Q5Xb09qRkbu+DidW1yYzz5izWS2Xm2yFm7qJnmUfz4HPzNxbHkdRJbz2lrqI7S+z17xNYdFcBBO8Hw==}
-    engines: {node: '>=0.10.0'}
+  /@storybook/components@8.0.0(@types/react@18.0.27)(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-+LmHnR2XQQ76uyWW5u+9ZBlS5sPyJWE6cbMdmkJ0PMGaZdZuF07urcg4z4/qBsDxRZDquBPu/Li5xx6OjXhVKw==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0
+      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
     dependencies:
-      make-iterator: 1.0.1
+      '@radix-ui/react-slot': 1.0.2(@types/react@18.0.27)(react@18.2.0)
+      '@storybook/client-logger': 8.0.0
+      '@storybook/csf': 0.1.2
+      '@storybook/global': 5.0.0
+      '@storybook/icons': 1.2.9(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/theming': 8.0.0(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/types': 8.0.0
+      memoizerific: 1.11.3
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
+      util-deprecate: 1.0.2
+    transitivePeerDependencies:
+      - '@types/react'
     dev: true
 
-  /arr-union@3.1.0:
-    resolution: {integrity: sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==}
-    engines: {node: '>=0.10.0'}
+  /@storybook/core-common@8.0.0:
+    resolution: {integrity: sha512-fqlQYw5/PDW/oj34QwU5u0HkNLPgELfszsvLFsUcwI7uAzwb/WC2WdPvncT7qRPNcSZLXKJcA8QAqKL4t4I8bg==}
+    dependencies:
+      '@storybook/core-events': 8.0.0
+      '@storybook/csf-tools': 8.0.0
+      '@storybook/node-logger': 8.0.0
+      '@storybook/types': 8.0.0
+      '@yarnpkg/fslib': 2.10.3
+      '@yarnpkg/libzip': 2.3.0
+      chalk: 4.1.2
+      cross-spawn: 7.0.3
+      esbuild: 0.19.8
+      esbuild-register: 3.5.0(esbuild@0.19.8)
+      execa: 5.1.1
+      file-system-cache: 2.3.0
+      find-cache-dir: 3.3.2
+      find-up: 5.0.0
+      fs-extra: 11.1.1
+      glob: 10.3.10
+      handlebars: 4.7.8
+      lazy-universal-dotenv: 4.0.0
+      node-fetch: 2.7.0(encoding@0.1.13)
+      picomatch: 2.3.1
+      pkg-dir: 5.0.0
+      pretty-hrtime: 1.0.3
+      resolve-from: 5.0.0
+      semver: 7.6.0
+      tempy: 1.0.1
+      tiny-invariant: 1.3.1
+      ts-dedent: 2.2.0
+      util: 0.12.5
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
     dev: true
 
-  /array-each@1.0.1:
-    resolution: {integrity: sha512-zHjL5SZa68hkKHBFBK6DJCTtr9sfTCPCaph/L7tMSLcTFgy+zX7E+6q5UArbtOtMBCtxdICpfTCspRse+ywyXA==}
-    engines: {node: '>=0.10.0'}
+  /@storybook/core-events@8.0.0:
+    resolution: {integrity: sha512-kkabj4V99gOTBW+y3HM/LTCDekglqb+lslZMamM+Ytxv1lCqCEOIR/OGfnYOyEaK4BLcx61Zp+fO30FZxtoT1w==}
+    dependencies:
+      ts-dedent: 2.2.0
     dev: true
 
-  /array-flatten@1.1.1:
-    resolution: {integrity: sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==}
-
-  /array-includes@3.1.6:
-    resolution: {integrity: sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==}
-    engines: {node: '>= 0.4'}
+  /@storybook/core-server@8.0.0(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-uVvS4psu/wQ+m9JTAvEvSwxjNKiCviNmNX1fv/VYRhQiAHhdb3e58NfeHd6QBffyOF80hY1RJWe3vAPcNIoZxA==}
     dependencies:
-      call-bind: 1.0.2
-      define-properties: 1.1.4
-      es-abstract: 1.21.1
-      get-intrinsic: 1.1.3
-      is-string: 1.0.7
+      '@aw-web-design/x-default-browser': 1.4.126
+      '@babel/core': 7.24.0
+      '@discoveryjs/json-ext': 0.5.7
+      '@storybook/builder-manager': 8.0.0
+      '@storybook/channels': 8.0.0
+      '@storybook/core-common': 8.0.0
+      '@storybook/core-events': 8.0.0
+      '@storybook/csf': 0.1.2
+      '@storybook/csf-tools': 8.0.0
+      '@storybook/docs-mdx': 3.0.0
+      '@storybook/global': 5.0.0
+      '@storybook/manager': 8.0.0
+      '@storybook/manager-api': 8.0.0(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/node-logger': 8.0.0
+      '@storybook/preview-api': 8.0.0
+      '@storybook/telemetry': 8.0.0
+      '@storybook/types': 8.0.0
+      '@types/detect-port': 1.3.2
+      '@types/node': 18.16.16
+      '@types/pretty-hrtime': 1.0.1
+      '@types/semver': 7.5.0
+      better-opn: 3.0.2
+      chalk: 4.1.2
+      cli-table3: 0.6.3
+      compression: 1.7.4
+      detect-port: 1.5.1
+      express: 4.19.2
+      fs-extra: 11.1.1
+      globby: 11.1.0
+      ip: 2.0.1
+      lodash: 4.17.21
+      open: 8.4.0
+      pretty-hrtime: 1.0.3
+      prompts: 2.4.2
+      read-pkg-up: 7.0.1
+      semver: 7.6.0
+      telejson: 7.2.0
+      tiny-invariant: 1.3.1
+      ts-dedent: 2.2.0
+      util: 0.12.5
+      util-deprecate: 1.0.2
+      watchpack: 2.4.0
+      ws: 8.14.2
+    transitivePeerDependencies:
+      - bufferutil
+      - encoding
+      - react
+      - react-dom
+      - supports-color
+      - utf-8-validate
     dev: true
 
-  /array-initial@1.1.0:
-    resolution: {integrity: sha512-BC4Yl89vneCYfpLrs5JU2aAu9/a+xWbeKhvISg9PT7eWFB9UlRvI+rKEtk6mgxWr3dSkk9gQ8hCrdqt06NXPdw==}
-    engines: {node: '>=0.10.0'}
+  /@storybook/csf-plugin@8.0.0:
+    resolution: {integrity: sha512-bCX3XvZ8X1dS08ung0IhugtTUOK+rWwRjWjyj5WC7fl5HYyFYQ91MC2f8EccYQaDYl9Dfvo1cw685gnk6PoLbw==}
     dependencies:
-      array-slice: 1.1.0
-      is-number: 4.0.0
+      '@storybook/csf-tools': 8.0.0
+      unplugin: 1.5.1
+    transitivePeerDependencies:
+      - supports-color
     dev: true
 
-  /array-last@1.3.0:
-    resolution: {integrity: sha512-eOCut5rXlI6aCOS7Z7kCplKRKyiFQ6dHFBem4PwlwKeNFk2/XxTrhRh5T9PyaEWGy/NHTZWbY+nsZlNFJu9rYg==}
-    engines: {node: '>=0.10.0'}
+  /@storybook/csf-tools@8.0.0:
+    resolution: {integrity: sha512-VIMaZJiGM2NVzlgxaOyaVlH1pw/VSrJygDqOZyANh/kl4KHA+6xIqOkZC+X0+5K295dTFx2nR6S3btTjwT/Wrg==}
     dependencies:
-      is-number: 4.0.0
-    dev: true
-
-  /array-parallel@0.1.3:
-    resolution: {integrity: sha512-TDPTwSWW5E4oiFiKmz6RGJ/a80Y91GuLgUYuLd49+XBS75tYo8PNgaT2K/OxuQYqkoI852MDGBorg9OcUSTQ8w==}
-    dev: false
-
-  /array-series@0.1.5:
-    resolution: {integrity: sha512-L0XlBwfx9QetHOsbLDrE/vh2t018w9462HM3iaFfxRiK83aJjAt/Ja3NMkOW7FICwWTlQBa3ZbL5FKhuQWkDrg==}
-    dev: false
-
-  /array-slice@1.1.0:
-    resolution: {integrity: sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==}
-    engines: {node: '>=0.10.0'}
+      '@babel/generator': 7.23.6
+      '@babel/parser': 7.24.0
+      '@babel/traverse': 7.24.0
+      '@babel/types': 7.24.0
+      '@storybook/csf': 0.1.2
+      '@storybook/types': 8.0.0
+      fs-extra: 11.1.1
+      recast: 0.23.6
+      ts-dedent: 2.2.0
+    transitivePeerDependencies:
+      - supports-color
     dev: true
 
-  /array-sort@1.0.0:
-    resolution: {integrity: sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg==}
-    engines: {node: '>=0.10.0'}
+  /@storybook/csf@0.1.2:
+    resolution: {integrity: sha512-ePrvE/pS1vsKR9Xr+o+YwdqNgHUyXvg+1Xjx0h9LrVx7Zq4zNe06pd63F5EvzTbCbJsHj7GHr9tkiaqm7U8WRA==}
     dependencies:
-      default-compare: 1.0.0
-      get-value: 2.0.6
-      kind-of: 5.1.0
+      type-fest: 2.19.0
     dev: true
 
-  /array-union@2.1.0:
-    resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==}
-    engines: {node: '>=8'}
-
-  /array-unique@0.3.2:
-    resolution: {integrity: sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==}
-    engines: {node: '>=0.10.0'}
+  /@storybook/docs-mdx@3.0.0:
+    resolution: {integrity: sha512-NmiGXl2HU33zpwTv1XORe9XG9H+dRUC1Jl11u92L4xr062pZtrShLmD4VKIsOQujxhhOrbxpwhNOt+6TdhyIdQ==}
     dev: true
 
-  /array.prototype.flat@1.3.1:
-    resolution: {integrity: sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==}
-    engines: {node: '>= 0.4'}
+  /@storybook/docs-tools@8.0.0:
+    resolution: {integrity: sha512-d6slxGMosurSTPp1zOTnr7EILnm9xmUrT0xF3Vxr3Yat5/YQEe3WSADktIFyWwlqvIu7MQ8Lh+oelAb5TuxiDw==}
     dependencies:
-      call-bind: 1.0.2
-      define-properties: 1.1.4
-      es-abstract: 1.21.1
-      es-shim-unscopables: 1.0.0
+      '@storybook/core-common': 8.0.0
+      '@storybook/preview-api': 8.0.0
+      '@storybook/types': 8.0.0
+      '@types/doctrine': 0.0.3
+      assert: 2.1.0
+      doctrine: 3.0.0
+      lodash: 4.17.21
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
     dev: true
 
-  /array.prototype.flatmap@1.3.1:
-    resolution: {integrity: sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.2
-      define-properties: 1.1.4
-      es-abstract: 1.21.1
-      es-shim-unscopables: 1.0.0
+  /@storybook/global@5.0.0:
+    resolution: {integrity: sha512-FcOqPAXACP0I3oJ/ws6/rrPT9WGhu915Cg8D02a9YxLo0DE9zI+a9A5gRGvmQ09fiWPukqI8ZAEoQEdWUKMQdQ==}
     dev: true
 
-  /array.prototype.reduce@1.0.4:
-    resolution: {integrity: sha512-WnM+AjG/DvLRLo4DDl+r+SvCzYtD2Jd9oeBYMcEaI7t3fFrHY9M53/wdLcTvmZNQ70IU6Htj0emFkZ5TS+lrdw==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.2
-      define-properties: 1.1.4
-      es-abstract: 1.21.1
-      es-array-method-boxes-properly: 1.0.0
-      is-string: 1.0.7
-    dev: false
-
-  /asap@2.0.6:
-    resolution: {integrity: sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==}
-
-  /asn1.js-rfc2560@5.0.1(asn1.js@5.4.1):
-    resolution: {integrity: sha512-1PrVg6kuBziDN3PGFmRk3QrjpKvP9h/Hv5yMrFZvC1kpzP6dQRzf5BpKstANqHBkaOUmTpakJWhicTATOA/SbA==}
+  /@storybook/icons@1.2.9(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-cOmylsz25SYXaJL/gvTk/dl3pyk7yBFRfeXTsHvTA3dfhoU/LWSq0NKL9nM7WBasJyn6XPSGnLS4RtKXLw5EUg==}
+    engines: {node: '>=14.0.0'}
     peerDependencies:
-      asn1.js: ^5.0.0
-    dependencies:
-      asn1.js: 5.4.1
-      asn1.js-rfc5280: 3.0.0
-    dev: false
-
-  /asn1.js-rfc5280@3.0.0:
-    resolution: {integrity: sha512-Y2LZPOWeZ6qehv698ZgOGGCZXBQShObWnGthTrIFlIQjuV1gg2B8QOhWFRExq/MR1VnPpIIe7P9vX2vElxv+Pg==}
-    dependencies:
-      asn1.js: 5.4.1
-    dev: false
-
-  /asn1.js@5.4.1:
-    resolution: {integrity: sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==}
-    dependencies:
-      bn.js: 4.12.0
-      inherits: 2.0.4
-      minimalistic-assert: 1.0.1
-      safer-buffer: 2.1.2
-    dev: false
-
-  /asn1@0.2.6:
-    resolution: {integrity: sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==}
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0
+      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
     dependencies:
-      safer-buffer: 2.1.2
-
-  /assert-never@1.2.1:
-    resolution: {integrity: sha512-TaTivMB6pYI1kXwrFlEhLeGfOqoDNdTxjCdwRfFFkEA30Eu+k48W34nlok2EYWJfFFzqaEmichdNM7th6M5HNw==}
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
     dev: true
 
-  /assert-options@0.7.0:
-    resolution: {integrity: sha512-7q9uNH/Dh8gFgpIIb9ja8PJEWA5AQy3xnBC8jtKs8K/gNVCr1K6kIvlm59HUyYgvM7oEDoLzGgPcGd9FqhtXEQ==}
-    engines: {node: '>=8.0.0'}
-    dev: false
-
-  /assert-plus@1.0.0:
-    resolution: {integrity: sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==}
-    engines: {node: '>=0.8'}
-
-  /assert@2.0.0:
-    resolution: {integrity: sha512-se5Cd+js9dXJnu6Ag2JFc00t+HmHOen+8Q+L7O9zI0PqQXr20uk2J0XQqMxZEeo5U50o8Nvmmx7dZrl+Ufr35A==}
+  /@storybook/instrumenter@8.0.0:
+    resolution: {integrity: sha512-wNDVmyLu3kRf/2xf8lQJBI8Gx5eGlvOFwCagUfgd5Ke3l3Xo0XUgNjqFBbqG9ZouC21U6znBTYsIS+eEe61i7w==}
     dependencies:
-      es6-object-assign: 1.1.0
-      is-nan: 1.3.2
-      object-is: 1.1.5
+      '@storybook/channels': 8.0.0
+      '@storybook/client-logger': 8.0.0
+      '@storybook/core-events': 8.0.0
+      '@storybook/global': 5.0.0
+      '@storybook/preview-api': 8.0.0
+      '@vitest/utils': 0.34.7
       util: 0.12.5
     dev: true
 
-  /assertion-error@1.1.0:
-    resolution: {integrity: sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==}
+  /@storybook/manager-api@8.0.0(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-vJcCc2hG78RjIyhmooqnBlVrTdIomzRqG5WO025tXFgRV1eRUkWJRqSSudcLJO6wk77ZSAtI1ihsDrjsrBFWZw==}
+    dependencies:
+      '@storybook/channels': 8.0.0
+      '@storybook/client-logger': 8.0.0
+      '@storybook/core-events': 8.0.0
+      '@storybook/csf': 0.1.2
+      '@storybook/global': 5.0.0
+      '@storybook/router': 8.0.0
+      '@storybook/theming': 8.0.0(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/types': 8.0.0
+      dequal: 2.0.3
+      lodash: 4.17.21
+      memoizerific: 1.11.3
+      store2: 2.14.2
+      telejson: 7.2.0
+      ts-dedent: 2.2.0
+    transitivePeerDependencies:
+      - react
+      - react-dom
     dev: true
 
-  /assign-symbols@1.0.0:
-    resolution: {integrity: sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==}
-    engines: {node: '>=0.10.0'}
+  /@storybook/manager@8.0.0:
+    resolution: {integrity: sha512-1aCHzc+A4IOdDves+mE0K9bjyyPzPAIlR7oI6kSuO416/HXXJDdN5G825OQB/VIBYc1b8cNElMdNVKQK2FQorQ==}
     dev: true
 
-  /ast-types@0.13.4:
-    resolution: {integrity: sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==}
-    engines: {node: '>=4'}
-    dependencies:
-      tslib: 2.5.0
-    dev: false
+  /@storybook/node-logger@8.0.0:
+    resolution: {integrity: sha512-C/sMNQqCIYVtJaLpe92RSkPgW3GXcWp6QeH5+glfP42kh+G9axxnEJJ996tyAnNQRzUuI+Eh+B7ytPZU1/WseQ==}
+    dev: true
 
-  /ast-types@0.14.2:
-    resolution: {integrity: sha512-O0yuUDnZeQDL+ncNGlJ78BiO4jnYI3bvMsD5prT0/nsgijG/LpNBIr63gTjVTNsiGkgQhiyCShTgxt8oXOrklA==}
-    engines: {node: '>=4'}
+  /@storybook/preview-api@8.0.0:
+    resolution: {integrity: sha512-R2NBKtvHi+i1b/3PZe4u4YdJ7dlqr8YTqLn7syB/YSnKRAa7DYed+GJLu4qFJisE6IuYi+57AsdW16otRFEVvg==}
     dependencies:
-      tslib: 2.5.0
+      '@storybook/channels': 8.0.0
+      '@storybook/client-logger': 8.0.0
+      '@storybook/core-events': 8.0.0
+      '@storybook/csf': 0.1.2
+      '@storybook/global': 5.0.0
+      '@storybook/types': 8.0.0
+      '@types/qs': 6.9.7
+      dequal: 2.0.3
+      lodash: 4.17.21
+      memoizerific: 1.11.3
+      qs: 6.11.0
+      tiny-invariant: 1.3.1
+      ts-dedent: 2.2.0
+      util-deprecate: 1.0.2
     dev: true
 
-  /ast-types@0.15.2:
-    resolution: {integrity: sha512-c27loCv9QkZinsa5ProX751khO9DJl/AcB5c2KNtA6NRvHKS0PgLfcftz72KVq504vB0Gku5s2kUZzDBvQWvHg==}
-    engines: {node: '>=4'}
-    dependencies:
-      tslib: 2.5.0
+  /@storybook/preview@8.0.0:
+    resolution: {integrity: sha512-cFV7+6LYe1qr1HXm+oc74Z6ygAKgkjkhfGsfDhdS+UrzoFL9JF/+++RcE+xSBNVfzZjL19U1CsPEN0v0smIbkQ==}
+    dev: true
 
-  /ast-types@0.16.1:
-    resolution: {integrity: sha512-6t10qk83GOG8p0vKmaCr8eiilZwO171AvbROMtvvNiwrTly62t+7XkA8RdIIVbpMhCASAsxgAzdRSwh6nw/5Dg==}
-    engines: {node: '>=4'}
+  /@storybook/react-dom-shim@8.0.0(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-bpT/7XyO9T+mWJojAblnuScum/UI65UksaL1jKYySMpBuW4jTJVE1YPzN1oe9A4me8HQCPeDw4Rg+ZB91H5sKA==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0
+      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
     dependencies:
-      tslib: 2.5.0
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
     dev: true
 
-  /astral-regex@2.0.0:
-    resolution: {integrity: sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==}
-    engines: {node: '>=8'}
+  /@storybook/router@8.0.0:
+    resolution: {integrity: sha512-NPV4pb7TBOepPymHBLDmnwPcH4SnrNsD3LiHaVoaE4xaKMZBse2slWxeWM6IGb6Ynoy6pQpsHhAnt+rTjlcv9w==}
+    dependencies:
+      '@storybook/client-logger': 8.0.0
+      memoizerific: 1.11.3
+      qs: 6.11.0
     dev: true
 
-  /async-done@1.3.2:
-    resolution: {integrity: sha512-uYkTP8dw2og1tu1nmza1n1CMW0qb8gWWlwqMmLb7MhBVs4BXrFziT6HXUd+/RlRA/i4H9AkofYloUbs1fwMqlw==}
-    engines: {node: '>= 0.10'}
+  /@storybook/telemetry@8.0.0:
+    resolution: {integrity: sha512-TpPswQYvhpFCyojWdKKOL7JMUhGqAr6Rqc/KQx4KEkHZat4K1yP7idNqpEIo/gavhlS1xVCNyp+WtzBI7d1PFw==}
     dependencies:
-      end-of-stream: 1.4.4
-      once: 1.4.0
-      process-nextick-args: 2.0.1
-      stream-exhaust: 1.0.2
+      '@storybook/client-logger': 8.0.0
+      '@storybook/core-common': 8.0.0
+      '@storybook/csf-tools': 8.0.0
+      chalk: 4.1.2
+      detect-package-manager: 2.0.1
+      fetch-retry: 5.0.3
+      fs-extra: 11.1.1
+      read-pkg-up: 7.0.1
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
     dev: true
 
-  /async-limiter@1.0.1:
-    resolution: {integrity: sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==}
+  /@storybook/test@8.0.0(@types/jest@29.5.3)(jest@29.6.2)(vitest@1.3.1):
+    resolution: {integrity: sha512-am0Pj1wqgsOUpW4RCfZtVGMIF8ddwMCbortOezEKcFuwAaNPE+p62alG+vOVIR0D19fs0XouWJj8rGo3OhzJRA==}
+    dependencies:
+      '@storybook/client-logger': 8.0.0
+      '@storybook/core-events': 8.0.0
+      '@storybook/instrumenter': 8.0.0
+      '@storybook/preview-api': 8.0.0
+      '@testing-library/dom': 9.3.3
+      '@testing-library/jest-dom': 6.4.2(@types/jest@29.5.3)(jest@29.6.2)(vitest@1.3.1)
+      '@testing-library/user-event': 14.5.2(@testing-library/dom@9.3.3)
+      '@vitest/expect': 1.1.3
+      '@vitest/spy': 1.3.1
+      chai: 4.3.10
+      util: 0.12.5
+    transitivePeerDependencies:
+      - '@jest/globals'
+      - '@types/bun'
+      - '@types/jest'
+      - jest
+      - vitest
     dev: true
 
-  /async-settle@1.0.0:
-    resolution: {integrity: sha512-VPXfB4Vk49z1LHHodrEQ6Xf7W4gg1w0dAPROHngx7qgDjqmIQ+fXmwgGXTW/ITLai0YLSvWepJOP9EVpMnEAcw==}
-    engines: {node: '>= 0.10'}
+  /@storybook/theming@8.0.0(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-Yu6ybemarPN3RBdsljtvpEVNqnqG1YxDLOmkzl1MFtJ1uA5Zd5mTMjc37iD0WDvLOk8mc1HmEqB5+fDrX0U4Vw==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0
+      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+    peerDependenciesMeta:
+      react:
+        optional: true
+      react-dom:
+        optional: true
     dependencies:
-      async-done: 1.3.2
+      '@emotion/use-insertion-effect-with-fallbacks': 1.0.1(react@18.2.0)
+      '@storybook/client-logger': 8.0.0
+      '@storybook/global': 5.0.0
+      memoizerific: 1.11.3
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
     dev: true
 
-  /async-validator@1.8.5:
-    resolution: {integrity: sha512-tXBM+1m056MAX0E8TL2iCjg8WvSyXu0Zc8LNtYqrVeyoL3+esHRZ4SieE9fKQyyU09uONjnMEjrNBMqT0mbvmA==}
+  /@storybook/types@8.0.0:
+    resolution: {integrity: sha512-6nJipdgoAkVFk2JpRPCm9vb/Yuak2lmdZRv9qzl8cNRttlbOESVlzbmhgxCmWV0OYUaMeYge9L8NWhJ14LKbzw==}
     dependencies:
-      babel-runtime: 6.26.0
-    dev: false
-
-  /async@3.2.4:
-    resolution: {integrity: sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==}
-
-  /asynckit@0.4.0:
-    resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==}
-
-  /at-least-node@1.0.0:
-    resolution: {integrity: sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==}
-    engines: {node: '>= 4.0.0'}
-
-  /atob@2.1.2:
-    resolution: {integrity: sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==}
-    engines: {node: '>= 4.5.0'}
-    hasBin: true
+      '@storybook/channels': 8.0.0
+      '@types/express': 4.17.21
+      file-system-cache: 2.3.0
     dev: true
 
-  /auto-changelog@1.16.4:
-    resolution: {integrity: sha512-h7diyELoq692AA4oqO50ULoYKIomUdzuQ+NW+eFPwIX0xzVbXEu9cIcgzZ3TYNVbpkGtcNKh51aRfAQNef7HVA==}
-    hasBin: true
+  /@storybook/vue3-vite@8.0.0(react-dom@18.2.0)(react@18.2.0)(vite@5.1.6)(vue@3.4.21):
+    resolution: {integrity: sha512-SjFaKFb/goBEFi4hzJUPjSJVDg2j4mYldynNruPcqB6G/dyLUpZC36EjrlPNO7HcT7tq7hSwsYG22Th5jYODYw==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      vite: ^4.0.0 || ^5.0.0
     dependencies:
-      commander: 5.1.0
-      core-js: 3.27.2
-      handlebars: 4.7.7
-      lodash.uniqby: 4.7.0
-      node-fetch: 2.6.8
-      parse-github-url: 1.0.2
-      regenerator-runtime: 0.13.9
-      semver: 6.3.0
+      '@storybook/builder-vite': 8.0.0(typescript@5.4.2)(vite@5.1.6)
+      '@storybook/core-server': 8.0.0(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/vue3': 8.0.0(vue@3.4.21)
+      find-package-json: 1.2.0
+      magic-string: 0.30.8
+      typescript: 5.4.2
+      vite: 5.1.6(sass@1.64.1)
+      vue-component-meta: 1.8.27(typescript@5.4.2)
+      vue-docgen-api: 4.76.0(vue@3.4.21)
     transitivePeerDependencies:
+      - '@preact/preset-vite'
+      - bufferutil
       - encoding
-    dev: false
+      - react
+      - react-dom
+      - supports-color
+      - utf-8-validate
+      - vite-plugin-glimmerx
+      - vue
+    dev: true
 
-  /autoprefixer@10.4.13(postcss@8.4.21):
-    resolution: {integrity: sha512-49vKpMqcZYsJjwotvt4+h/BCjJVnhGwcLpDt5xkcaOG3eLrG/HUYLagrihYsQ+qrIBgIzX1Rw7a6L8I/ZA1Atg==}
-    engines: {node: ^10 || ^12 || >=14}
-    hasBin: true
+  /@storybook/vue3@8.0.0(vue@3.4.21):
+    resolution: {integrity: sha512-CiAY3XRm3BCDsADZSun8YiiqFynK6vUECpIylETvd06rLzyS0VdTpPgODjR8h6nQlTwilcvSpJNeqTLCebL5LQ==}
+    engines: {node: '>=18.0.0'}
     peerDependencies:
-      postcss: ^8.1.0
+      vue: ^3.0.0
     dependencies:
-      browserslist: 4.21.4
-      caniuse-lite: 1.0.30001445
-      fraction.js: 4.2.0
-      normalize-range: 0.1.2
-      picocolors: 1.0.0
-      postcss: 8.4.21
-      postcss-value-parser: 4.2.0
+      '@storybook/docs-tools': 8.0.0
+      '@storybook/global': 5.0.0
+      '@storybook/preview-api': 8.0.0
+      '@storybook/types': 8.0.0
+      '@vue/compiler-core': 3.4.21
+      lodash: 4.17.21
+      ts-dedent: 2.2.0
+      type-fest: 2.19.0
+      vue: 3.4.21(typescript@5.4.2)
+      vue-component-type-helpers: 2.0.17
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
     dev: true
 
-  /available-typed-arrays@1.0.5:
-    resolution: {integrity: sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==}
-    engines: {node: '>= 0.4'}
-
-  /avsc@5.7.6:
-    resolution: {integrity: sha512-jyn9tfd9J3h7pgJSk4qQ/1c1Tk5qiXrvmdCDON2UjcFplqRu/KpmKmpi+Ess8ZKmmqK12U4Y3VHrfwQs1xSMZA==}
-    engines: {node: '>=0.11'}
-    dev: false
-
-  /aws-sdk@2.1231.0:
-    resolution: {integrity: sha512-ONBuRsOxsu0zL8u/Vmz49tPWi9D4ls2pjb6szdfSx9VQef7bOnWe9gJpWoA94OTzcjOWsvjsG7UgjvQJkIuPBg==}
-    engines: {node: '>= 10.0.0'}
+  /@supabase/functions-js@2.1.5:
+    resolution: {integrity: sha512-BNzC5XhCzzCaggJ8s53DP+WeHHGT/NfTsx2wUSSGKR2/ikLFQTBCDzMvGz/PxYMqRko/LwncQtKXGOYp1PkPaw==}
     dependencies:
-      buffer: 4.9.2
-      events: 1.1.1
-      ieee754: 1.1.13
-      jmespath: 0.16.0
-      querystring: 0.2.0
-      sax: 1.2.1
-      url: 0.10.3
-      util: 0.12.4
-      uuid: 8.0.0
-      xml2js: 0.5.0
+      '@supabase/node-fetch': 2.6.15
     dev: false
 
-  /aws-sign2@0.7.0:
-    resolution: {integrity: sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==}
-
-  /aws4@1.11.0:
-    resolution: {integrity: sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==}
-
-  /axios-retry@3.3.1:
-    resolution: {integrity: sha512-RohAUQTDxBSWLFEnoIG/6bvmy8l3TfpkclgStjl5MDCMBDgapAWCmr1r/9harQfWC8bzLC8job6UcL1A1Yc+/Q==}
+  /@supabase/gotrue-js@2.57.0:
+    resolution: {integrity: sha512-/CcAW40aPKgp9/w9WgXVUQFg1AOdvFR687ONOMjASPBuC6FsNbKlcXp4pc+rwKNtxyxDkBbR+x7zj/8g00r/Og==}
     dependencies:
-      '@babel/runtime': 7.19.4
-      is-retry-allowed: 2.2.0
+      '@supabase/node-fetch': 2.6.15
     dev: false
 
-  /axios@0.21.4(debug@4.3.2):
-    resolution: {integrity: sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==}
-    dependencies:
-      follow-redirects: 1.15.2(debug@4.3.2)
-    transitivePeerDependencies:
-      - debug
-
-  /axios@0.27.2(debug@3.2.7):
-    resolution: {integrity: sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==}
+  /@supabase/node-fetch@2.6.15:
+    resolution: {integrity: sha512-1ibVeYUacxWYi9i0cf5efil6adJ9WRyZBLivgjs+AUpewx1F3xPi7gLgaASI2SmIQxPoCEjAsLAzKPgMJVgOUQ==}
+    engines: {node: 4.x || >=6.0.0}
     dependencies:
-      follow-redirects: 1.15.2(debug@3.2.7)
-      form-data: 4.0.0
-    transitivePeerDependencies:
-      - debug
+      whatwg-url: 5.0.0
     dev: false
 
-  /babel-core@7.0.0-bridge.0(@babel/core@7.21.5):
-    resolution: {integrity: sha512-poPX9mZH/5CSanm50Q+1toVci6pv5KSRv/5TWCwtzQS5XEwn40BcCrgIeMFWP9CKKIniKXNxoIOnOq4VVlGXhg==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
+  /@supabase/postgrest-js@1.9.0:
+    resolution: {integrity: sha512-axP6cU69jDrLbfihJKQ6vU27tklD0gzb9idkMN363MtTXeJVt5DQNT3JnJ58JVNBdL74hgm26rAsFNvHk+tnSw==}
     dependencies:
-      '@babel/core': 7.21.5
-    dev: true
-
-  /babel-helper-vue-jsx-merge-props@2.0.3:
-    resolution: {integrity: sha512-gsLiKK7Qrb7zYJNgiXKpXblxbV5ffSwR0f5whkPAaBAR4fhi6bwRZxX9wBlIc5M/v8CCkXUbXZL4N/nSE97cqg==}
+      '@supabase/node-fetch': 2.6.15
     dev: false
 
-  /babel-jest@29.5.0(@babel/core@7.21.5):
-    resolution: {integrity: sha512-mA4eCDh5mSo2EcA9xQjVTpmbbNk32Zb3Q3QFQsNhaK56Q+yoXowzFodLux30HRgyOho5rsQ6B0P9QpMkvvnJ0Q==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    peerDependencies:
-      '@babel/core': ^7.8.0
+  /@supabase/realtime-js@2.8.4:
+    resolution: {integrity: sha512-5C9slLTGikHnYmAnIBOaPogAgbcNY68vnIyE6GpqIKjHElVb6LIi4clwNcjHSj4z6szuvvzj8T/+ePEgGEGekw==}
     dependencies:
-      '@babel/core': 7.21.5
-      '@jest/transform': 29.5.0
-      '@types/babel__core': 7.20.0
-      babel-plugin-istanbul: 6.1.1
-      babel-preset-jest: 29.5.0(@babel/core@7.21.5)
-      chalk: 4.1.2
-      graceful-fs: 4.2.10
-      slash: 3.0.0
+      '@supabase/node-fetch': 2.6.15
+      '@types/phoenix': 1.6.4
+      '@types/websocket': 1.0.10
+      websocket: 1.0.34
     transitivePeerDependencies:
       - supports-color
-    dev: true
-
-  /babel-loader@9.1.2(@babel/core@7.20.12)(webpack@5.75.0):
-    resolution: {integrity: sha512-mN14niXW43tddohGl8HPu5yfQq70iUThvFL/4QzESA7GcZoC0eVOhvWdQ8+3UlSjaDE9MVtsW9mxDY07W7VpVA==}
-    engines: {node: '>= 14.15.0'}
-    peerDependencies:
-      '@babel/core': ^7.12.0
-      webpack: '>=5'
-    dependencies:
-      '@babel/core': 7.20.12
-      find-cache-dir: 3.3.2
-      schema-utils: 4.0.0
-      webpack: 5.75.0(esbuild@0.16.17)
-    dev: true
+    dev: false
 
-  /babel-loader@9.1.2(@babel/core@7.21.5)(webpack@5.75.0):
-    resolution: {integrity: sha512-mN14niXW43tddohGl8HPu5yfQq70iUThvFL/4QzESA7GcZoC0eVOhvWdQ8+3UlSjaDE9MVtsW9mxDY07W7VpVA==}
-    engines: {node: '>= 14.15.0'}
-    peerDependencies:
-      '@babel/core': ^7.12.0
-      webpack: '>=5'
+  /@supabase/storage-js@2.5.4:
+    resolution: {integrity: sha512-yspHD19I9uQUgfTh0J94+/r/g6hnhdQmw6Y7OWqr/EbnL6uvicGV1i1UDkkmeUHqfF9Mbt2sLtuxRycYyKv2ew==}
     dependencies:
-      '@babel/core': 7.21.5
-      find-cache-dir: 3.3.2
-      schema-utils: 4.0.0
-      webpack: 5.75.0(esbuild@0.16.17)
-    dev: true
+      '@supabase/node-fetch': 2.6.15
+    dev: false
 
-  /babel-plugin-istanbul@6.1.1:
-    resolution: {integrity: sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==}
-    engines: {node: '>=8'}
+  /@supabase/supabase-js@2.38.5:
+    resolution: {integrity: sha512-QTXld3AfwAJgeOGyOKsCcT7AjC3jJxN02iHy299Fw+qKX0lJ1tVVhMGlga101C1stUCvgzjcypmMSGiZ2oeKsw==}
     dependencies:
-      '@babel/helper-plugin-utils': 7.20.2
-      '@istanbuljs/load-nyc-config': 1.1.0
-      '@istanbuljs/schema': 0.1.3
-      istanbul-lib-instrument: 5.2.1
-      test-exclude: 6.0.0
+      '@supabase/functions-js': 2.1.5
+      '@supabase/gotrue-js': 2.57.0
+      '@supabase/node-fetch': 2.6.15
+      '@supabase/postgrest-js': 1.9.0
+      '@supabase/realtime-js': 2.8.4
+      '@supabase/storage-js': 2.5.4
     transitivePeerDependencies:
       - supports-color
-    dev: true
+    dev: false
 
-  /babel-plugin-jest-hoist@29.5.0:
-    resolution: {integrity: sha512-zSuuuAlTMT4mzLj2nPnUm6fsE6270vdOfnpbJ+RmruU75UhLFvL0N2NgI7xpeS7NaB6hGqmd5pVpGTDYvi4Q3w==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+  /@supercharge/promise-pool@3.1.0:
+    resolution: {integrity: sha512-gB3NukbIcYzRtPoE6dx9svQYPodxvnfQlaaQd8N/z87E6WaMfRE7o5HwB+LZ+KeM0nsNAq1n4TmBtfz1VCUR+Q==}
+    engines: {node: '>=8'}
+    dev: false
+
+  /@sxzz/popperjs-es@2.11.7:
+    resolution: {integrity: sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ==}
+    dev: false
+
+  /@techteamer/ocsp@1.0.1:
+    resolution: {integrity: sha512-q4pW5wAC6Pc3JI8UePwE37CkLQ5gDGZMgjSX4MEEm4D4Di59auDQ8UNIDzC4gRnPNmmcwjpPxozq8p5pjiOmOw==}
     dependencies:
-      '@babel/template': 7.20.7
-      '@babel/types': 7.21.5
-      '@types/babel__core': 7.20.0
-      '@types/babel__traverse': 7.18.2
-    dev: true
+      asn1.js: 5.4.1
+      asn1.js-rfc2560: 5.0.1(asn1.js@5.4.1)
+      asn1.js-rfc5280: 3.0.0
+      async: 3.2.4
+      simple-lru-cache: 0.0.2
+    dev: false
 
-  /babel-plugin-named-exports-order@0.0.2:
-    resolution: {integrity: sha512-OgOYHOLoRK+/mvXU9imKHlG6GkPLYrUCvFXG/CM93R/aNNO8pOOF4aS+S8CCHMDQoNSeiOYEZb/G6RwL95Jktw==}
-    dev: true
+  /@tediousjs/connection-string@0.5.0:
+    resolution: {integrity: sha512-7qSgZbincDDDFyRweCIEvZULFAw5iz/DeunhvuxpL31nfntX3P4Yd4HkHBRg9H8CdqY1e5WFN1PZIz/REL9MVQ==}
+    dev: false
 
-  /babel-plugin-polyfill-corejs2@0.3.3(@babel/core@7.20.12):
-    resolution: {integrity: sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
+  /@testing-library/dom@9.3.3:
+    resolution: {integrity: sha512-fB0R+fa3AUqbLHWyxXa2kGVtf1Fe1ZZFr0Zp6AIbIAzXb2mKbEXl+PCQNUOaq5lbTab5tfctfXRNsWXxa2f7Aw==}
+    engines: {node: '>=14'}
     dependencies:
-      '@babel/compat-data': 7.20.10
-      '@babel/core': 7.20.12
-      '@babel/helper-define-polyfill-provider': 0.3.3(@babel/core@7.20.12)
-      semver: 6.3.0
-    transitivePeerDependencies:
-      - supports-color
+      '@babel/code-frame': 7.22.5
+      '@babel/runtime': 7.23.6
+      '@types/aria-query': 5.0.1
+      aria-query: 5.1.3
+      chalk: 4.1.2
+      dom-accessibility-api: 0.5.15
+      lz-string: 1.5.0
+      pretty-format: 27.5.1
     dev: true
 
-  /babel-plugin-polyfill-corejs2@0.3.3(@babel/core@7.21.5):
-    resolution: {integrity: sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==}
+  /@testing-library/jest-dom@6.1.5(@types/jest@29.5.3)(jest@29.6.2)(vitest@1.3.1):
+    resolution: {integrity: sha512-3y04JLW+EceVPy2Em3VwNr95dOKqA8DhR0RJHhHKDZNYXcVXnEK7WIrpj4eYU8SVt/qYZ2aRWt/WgQ+grNES8g==}
+    engines: {node: '>=14', npm: '>=6', yarn: '>=1'}
     peerDependencies:
-      '@babel/core': ^7.0.0-0
+      '@jest/globals': '>= 28'
+      '@types/jest': '>= 28'
+      jest: '>= 28'
+      vitest: '>= 0.32'
+    peerDependenciesMeta:
+      '@jest/globals':
+        optional: true
+      '@types/jest':
+        optional: true
+      jest:
+        optional: true
+      vitest:
+        optional: true
     dependencies:
-      '@babel/compat-data': 7.20.10
-      '@babel/core': 7.21.5
-      '@babel/helper-define-polyfill-provider': 0.3.3(@babel/core@7.21.5)
-      semver: 6.3.0
-    transitivePeerDependencies:
-      - supports-color
+      '@adobe/css-tools': 4.3.2
+      '@babel/runtime': 7.22.6
+      '@types/jest': 29.5.3
+      aria-query: 5.1.3
+      chalk: 3.0.0
+      css.escape: 1.5.1
+      dom-accessibility-api: 0.5.15
+      jest: 29.6.2
+      lodash: 4.17.21
+      redent: 3.0.0
+      vitest: 1.3.1
     dev: true
 
-  /babel-plugin-polyfill-corejs3@0.6.0(@babel/core@7.20.12):
-    resolution: {integrity: sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==}
+  /@testing-library/jest-dom@6.4.2(@types/jest@29.5.3)(jest@29.6.2)(vitest@1.3.1):
+    resolution: {integrity: sha512-CzqH0AFymEMG48CpzXFriYYkOjk6ZGPCLMhW9e9jg3KMCn5OfJecF8GtGW7yGfR/IgCe3SX8BSwjdzI6BBbZLw==}
+    engines: {node: '>=14', npm: '>=6', yarn: '>=1'}
     peerDependencies:
-      '@babel/core': ^7.0.0-0
+      '@jest/globals': '>= 28'
+      '@types/bun': latest
+      '@types/jest': '>= 28'
+      jest: '>= 28'
+      vitest: '>= 0.32'
+    peerDependenciesMeta:
+      '@jest/globals':
+        optional: true
+      '@types/bun':
+        optional: true
+      '@types/jest':
+        optional: true
+      jest:
+        optional: true
+      vitest:
+        optional: true
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-define-polyfill-provider': 0.3.3(@babel/core@7.20.12)
-      core-js-compat: 3.27.1
-    transitivePeerDependencies:
-      - supports-color
+      '@adobe/css-tools': 4.3.2
+      '@babel/runtime': 7.23.6
+      '@types/jest': 29.5.3
+      aria-query: 5.1.3
+      chalk: 3.0.0
+      css.escape: 1.5.1
+      dom-accessibility-api: 0.6.3
+      jest: 29.6.2
+      lodash: 4.17.21
+      redent: 3.0.0
+      vitest: 1.3.1
     dev: true
 
-  /babel-plugin-polyfill-corejs3@0.6.0(@babel/core@7.21.5):
-    resolution: {integrity: sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==}
+  /@testing-library/user-event@14.5.1(@testing-library/dom@9.3.3):
+    resolution: {integrity: sha512-UCcUKrUYGj7ClomOo2SpNVvx4/fkd/2BbIHDCle8A0ax+P3bU7yJwDBDrS6ZwdTMARWTGODX1hEsCcO+7beJjg==}
+    engines: {node: '>=12', npm: '>=6'}
     peerDependencies:
-      '@babel/core': ^7.0.0-0
+      '@testing-library/dom': '>=7.21.4'
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-define-polyfill-provider': 0.3.3(@babel/core@7.21.5)
-      core-js-compat: 3.27.1
-    transitivePeerDependencies:
-      - supports-color
+      '@testing-library/dom': 9.3.3
     dev: true
 
-  /babel-plugin-polyfill-regenerator@0.4.1(@babel/core@7.20.12):
-    resolution: {integrity: sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==}
+  /@testing-library/user-event@14.5.2(@testing-library/dom@9.3.3):
+    resolution: {integrity: sha512-YAh82Wh4TIrxYLmfGcixwD18oIjyC1pFQC2Y01F2lzV2HTMiYrI0nze0FD0ocB//CKS/7jIUgae+adPqxK5yCQ==}
+    engines: {node: '>=12', npm: '>=6'}
     peerDependencies:
-      '@babel/core': ^7.0.0-0
+      '@testing-library/dom': '>=7.21.4'
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-define-polyfill-provider': 0.3.3(@babel/core@7.20.12)
-    transitivePeerDependencies:
-      - supports-color
+      '@testing-library/dom': 9.3.3
     dev: true
 
-  /babel-plugin-polyfill-regenerator@0.4.1(@babel/core@7.21.5):
-    resolution: {integrity: sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==}
+  /@testing-library/vue@8.0.1(@vue/compiler-sfc@3.4.21)(vue@3.4.21):
+    resolution: {integrity: sha512-l51ZEpjTQ6glq3wM+asQ1GbKJMGcxwgHEygETx0aCRN4TjFEGvMZy4YdWKs/y7bu4bmLrxcxhbEPP7iPSW/2OQ==}
+    engines: {node: '>=14'}
     peerDependencies:
-      '@babel/core': ^7.0.0-0
+      '@vue/compiler-sfc': '>= 3'
+      vue: '>= 3'
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/helper-define-polyfill-provider': 0.3.3(@babel/core@7.21.5)
+      '@babel/runtime': 7.23.6
+      '@testing-library/dom': 9.3.3
+      '@vue/compiler-sfc': 3.4.21
+      '@vue/test-utils': 2.4.3(vue@3.4.21)
+      vue: 3.4.21(typescript@5.4.2)
     transitivePeerDependencies:
-      - supports-color
+      - '@vue/server-renderer'
     dev: true
 
-  /babel-preset-current-node-syntax@1.0.1(@babel/core@7.21.5):
-    resolution: {integrity: sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-    dependencies:
-      '@babel/core': 7.21.5
-      '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.21.5)
-      '@babel/plugin-syntax-bigint': 7.8.3(@babel/core@7.21.5)
-      '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.21.5)
-      '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.21.5)
-      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.21.5)
-      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.21.5)
-      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.21.5)
-      '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.21.5)
-      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.21.5)
-      '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.21.5)
-      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.21.5)
-      '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.21.5)
-    dev: true
-
-  /babel-preset-jest@29.5.0(@babel/core@7.21.5):
-    resolution: {integrity: sha512-JOMloxOqdiBSxMAzjRaH023/vvcaSaec49zvg+2LmNsktC7ei39LTJGw02J+9uUtTZUq6xbLyJ4dxe9sSmIuAg==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-    dependencies:
-      '@babel/core': 7.21.5
-      babel-plugin-jest-hoist: 29.5.0
-      babel-preset-current-node-syntax: 1.0.1(@babel/core@7.21.5)
-    dev: true
+  /@tokenizer/token@0.3.0:
+    resolution: {integrity: sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A==}
+    dev: false
 
-  /babel-runtime@6.26.0:
-    resolution: {integrity: sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==}
-    dependencies:
-      core-js: 2.6.12
-      regenerator-runtime: 0.11.1
+  /@tootallnate/once@1.1.2:
+    resolution: {integrity: sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==}
+    engines: {node: '>= 6'}
     dev: false
+    optional: true
 
-  /babel-walk@3.0.0-canary-5:
-    resolution: {integrity: sha512-GAwkz0AihzY5bkwIY5QDR+LvsRQgB/B+1foMPvi0FZPMl5fjD7ICiznUiBdLYMH1QYe6vqu4gWYytZOccLouFw==}
-    engines: {node: '>= 10.0.0'}
-    dependencies:
-      '@babel/types': 7.21.5
+  /@tootallnate/once@2.0.0:
+    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'}
     dev: true
 
-  /bach@1.2.0:
-    resolution: {integrity: sha512-bZOOfCb3gXBXbTFXq3OZtGR88LwGeJvzu6szttaIzymOTS4ZttBNOWSv7aLZja2EMycKtRYV0Oa8SNKH/zkxvg==}
-    engines: {node: '>= 0.10'}
+  /@tsconfig/node18@18.2.2:
+    resolution: {integrity: sha512-d6McJeGsuoRlwWZmVIeE8CUA27lu6jLjvv1JzqmpsytOYYbVi1tHZEnwCNVOXnj4pyLvneZlFlpXUK+X9wBWyw==}
+    dev: true
+
+  /@types/amqplib@0.10.1:
+    resolution: {integrity: sha512-j6ANKT79ncUDnAs/+9r9eDujxbeJoTjoVu33gHHcaPfmLQaMhvfbH2GqSe8KUM444epAp1Vl3peVOQfZk3UIqA==}
     dependencies:
-      arr-filter: 1.1.2
-      arr-flatten: 1.1.0
-      arr-map: 2.0.2
-      array-each: 1.0.1
-      array-initial: 1.1.0
-      array-last: 1.3.0
-      async-done: 1.3.2
-      async-settle: 1.0.0
-      now-and-later: 2.0.1
+      '@types/node': 18.16.16
     dev: true
 
-  /balanced-match@1.0.2:
-    resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
+  /@types/argparse@1.0.38:
+    resolution: {integrity: sha512-ebDJ9b0e702Yr7pWgB0jzm+CX4Srzz8RcXtLJDJB+BSccqMa36uyH/zUsSYao5+BD1ytv3k3rPYCq4mAE1hsXA==}
+    dev: true
 
-  /base32.js@0.0.1:
-    resolution: {integrity: sha512-EGHIRiegFa62/SsA1J+Xs2tIzludPdzM064N9wjbiEgHnGnJ1V0WEpA4pEwCYT5nDvZk3ubf0shqaCS7k6xeUQ==}
-    dev: false
+  /@types/aria-query@5.0.1:
+    resolution: {integrity: sha512-XTIieEY+gvJ39ChLcB4If5zHtPxt3Syj5rgZR+e1ctpmK8NjPf0zFqsz4JpLJT0xla9GFDKjy8Cpu331nrmE1Q==}
+    dev: true
 
-  /base64-js@1.5.1:
-    resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
+  /@types/asn1@0.2.0:
+    resolution: {integrity: sha512-5TMxIpYbIA9c1J0hYQjQDX3wr+rTgQEAXaW2BI8ECM8FO53wSW4HFZplTalrKSHuZUc76NtXcePRhwuOHqGD5g==}
+    dependencies:
+      '@types/node': 18.16.16
 
-  /base64-url@2.3.3:
-    resolution: {integrity: sha512-dLMhIsK7OplcDauDH/tZLvK7JmUZK3A7KiQpjNzsBrM6Etw7hzNI1tLEywqJk9NnwkgWuFKSlx/IUO7vF6Mo8Q==}
-    engines: {node: '>=6'}
+  /@types/aws4@1.11.2:
+    resolution: {integrity: sha512-x0f96eBPrCCJzJxdPbUvDFRva4yPpINJzTuXXpmS2j9qLUpF2nyGzvXPlRziuGbCsPukwY4JfuO+8xwsoZLzGw==}
+    dependencies:
+      '@types/node': 18.16.16
     dev: true
 
-  /base@0.11.2:
-    resolution: {integrity: sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==}
-    engines: {node: '>=0.10.0'}
+  /@types/babel__core@7.20.0:
+    resolution: {integrity: sha512-+n8dL/9GWblDO0iU6eZAwEIJVr5DWigtle+Q6HLOrh/pdbXOhOtqzq8VPPE2zvNJzSKY4vH/z3iT3tn0A3ypiQ==}
     dependencies:
-      cache-base: 1.0.1
-      class-utils: 0.3.6
-      component-emitter: 1.3.0
-      define-property: 1.0.0
-      isobject: 3.0.1
-      mixin-deep: 1.3.2
-      pascalcase: 0.1.1
-    dev: true
+      '@babel/parser': 7.24.0
+      '@babel/types': 7.24.0
+      '@types/babel__generator': 7.6.4
+      '@types/babel__template': 7.4.1
+      '@types/babel__traverse': 7.18.2
 
-  /basic-auth@2.0.1:
-    resolution: {integrity: sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==}
-    engines: {node: '>= 0.8'}
+  /@types/babel__generator@7.6.4:
+    resolution: {integrity: sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==}
     dependencies:
-      safe-buffer: 5.1.2
-    dev: false
+      '@babel/types': 7.24.0
 
-  /bcrypt-pbkdf@1.0.2:
-    resolution: {integrity: sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==}
+  /@types/babel__template@7.4.1:
+    resolution: {integrity: sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==}
     dependencies:
-      tweetnacl: 0.14.5
+      '@babel/parser': 7.24.0
+      '@babel/types': 7.24.0
 
-  /bcryptjs@2.4.3:
-    resolution: {integrity: sha512-V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ==}
-    dev: false
+  /@types/babel__traverse@7.18.2:
+    resolution: {integrity: sha512-FcFaxOr2V5KZCviw1TnutEMVUVsGt4D2hP1TAfXZAMKuHYW3xQhe3jTxNPWutgCJ3/X1c5yX8ZoGVEItxKbwBg==}
+    dependencies:
+      '@babel/types': 7.24.0
 
-  /better-opn@2.1.1:
-    resolution: {integrity: sha512-kIPXZS5qwyKiX/HcRvDYfmBQUa8XP17I0mYZZ0y4UhpYOSvtsLHDYqmomS+Mj20aDvD3knEiQ0ecQy2nhio3yA==}
-    engines: {node: '>8.0.0'}
+  /@types/basic-auth@1.1.3:
+    resolution: {integrity: sha512-W3rv6J0IGlxqgE2eQ2pTb0gBjaGtejQpJ6uaCjz3UQ65+TFTPC5/lAE+POfx1YLdjtxvejJzsIAfd3MxWiVmfg==}
     dependencies:
-      open: 7.4.2
+      '@types/node': 18.16.16
     dev: true
 
-  /big-integer@1.6.51:
-    resolution: {integrity: sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==}
-    engines: {node: '>=0.6'}
-
-  /big.js@5.2.2:
-    resolution: {integrity: sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==}
+  /@types/bcryptjs@2.4.2:
+    resolution: {integrity: sha512-LiMQ6EOPob/4yUL66SZzu6Yh77cbzJFYll+ZfaPiPPFswtIlA/Fs1MzdKYA7JApHU49zQTbJGX3PDmCpIdDBRQ==}
     dev: true
 
-  /bignumber.js@2.4.0:
-    resolution: {integrity: sha512-uw4ra6Cv483Op/ebM0GBKKfxZlSmn6NgFRby5L3yGTlunLj53KQgndDlqy2WVFOwgvurocApYkSud0aO+mvrpQ==}
-    dev: false
-
-  /binary-extensions@2.2.0:
-    resolution: {integrity: sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==}
-    engines: {node: '>=8'}
+  /@types/bluebird@3.5.37:
+    resolution: {integrity: sha512-g2qEd+zkfkTEudA2SrMAeAvY7CrFqtbsLILm2dT2VIeKTqMqVzcdfURlvu6FU3srRgbmXN1Srm94pg34EIehww==}
+    dev: true
 
-  /binascii@0.0.2:
-    resolution: {integrity: sha512-rA2CrUl1+6yKrn+XgLs8Hdy18OER1UW146nM+ixzhQXDY+Bd3ySkyIJGwF2a4I45JwbvF1mDL/nWkqBwpOcdBA==}
-    dev: false
+  /@types/body-parser@1.19.2:
+    resolution: {integrity: sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==}
+    dependencies:
+      '@types/connect': 3.4.35
+      '@types/node': 18.16.16
 
-  /bintrees@1.0.2:
-    resolution: {integrity: sha512-VOMgTMwjAaUG580SXn3LacVgjurrbMme7ZZNYGSSV7mmtY6QQRh0Eg3pwIcntQ77DErK1L0NxkbetjcoXzVwKw==}
+  /@types/caseless@0.12.5:
+    resolution: {integrity: sha512-hWtVTC2q7hc7xZ/RLbxapMvDMgUnDvKvMOpKal4DrMyfGBUfB1oKaZlIRr6mJL+If3bAP6sV/QneGzF6tJjZDg==}
     dev: false
 
-  /bl@4.1.0:
-    resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==}
+  /@types/cheerio@0.22.31:
+    resolution: {integrity: sha512-Kt7Cdjjdi2XWSfrZ53v4Of0wG3ZcmaegFXjMmz9tfNrZSkzzo36G0AL1YqSdcIA78Etjt6E609pt5h1xnQkPUw==}
     dependencies:
-      buffer: 5.7.1
-      inherits: 2.0.4
-      readable-stream: 3.6.0
+      '@types/node': 18.16.16
+    dev: true
 
-  /bl@5.0.0:
-    resolution: {integrity: sha512-8vxFNZ0pflFfi0WXA3WQXlj6CaMEwsmh63I1CNp0q+wWv8sD0ARx1KovSQd0l2GkwrMIOyedq0EF1FxI+RCZLQ==}
+  /@types/cli-progress@3.11.5:
+    resolution: {integrity: sha512-D4PbNRbviKyppS5ivBGyFO29POlySLmA2HyUFE4p5QGazAMM3CwkKWcvTl8gvElSuxRh6FPKL8XmidX873ou4g==}
     dependencies:
-      buffer: 6.0.3
-      inherits: 2.0.4
-      readable-stream: 3.6.0
+      '@types/node': 18.16.16
     dev: false
 
-  /blob-util@2.0.2:
-    resolution: {integrity: sha512-T7JQa+zsXXEa6/8ZhHcQEW1UFfVM49Ts65uBkFL6fz2QmrElqmbajIDJvuA0tEhRe5eIjpV9ZF+0RfZR9voJFQ==}
+  /@types/compression@1.0.1:
+    resolution: {integrity: sha512-GuoIYzD70h+4JUqUabsm31FGqvpCYHGKcLtor7nQ/YvUyNX0o9SJZ9boFI5HjFfbOda5Oe/XOvNK6FES8Y/79w==}
+    dependencies:
+      '@types/express': 4.17.21
     dev: true
 
-  /bluebird@2.11.0:
-    resolution: {integrity: sha512-UfFSr22dmHPQqPP9XWHRhq+gWnHCYguQGkXQlbyPtW5qTnhFWA8/iXg765tH0cAjy7l/zPJ1aBTO0g5XgA7kvQ==}
-    dev: false
-
-  /bluebird@3.7.2:
-    resolution: {integrity: sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==}
-
-  /bn.js@4.12.0:
-    resolution: {integrity: sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==}
-    dev: false
-
-  /body-parser-xml@2.0.3:
-    resolution: {integrity: sha512-tWvcAbh8QPd/lj+yfGZBMY/roof/e2iSXrJbYXYjxVhHQ88D2CF3AxDTdwhb9wcNdHVNbCttaWipchJPEs5r0g==}
-    engines: {node: '>=10'}
+  /@types/concat-stream@2.0.0:
+    resolution: {integrity: sha512-t3YCerNM7NTVjLuICZo5gYAXYoDvpuuTceCcFQWcDQz26kxUR5uIWolxbIR5jRNIXpMqhOpW/b8imCR1LEmuJw==}
     dependencies:
-      xml2js: 0.5.0
-    dev: false
+      '@types/node': 18.16.16
+    dev: true
 
-  /body-parser@1.20.1:
-    resolution: {integrity: sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==}
-    engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16}
+  /@types/connect@3.4.35:
+    resolution: {integrity: sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==}
     dependencies:
-      bytes: 3.1.2
-      content-type: 1.0.4
-      debug: 2.6.9
-      depd: 2.0.0
-      destroy: 1.2.0
-      http-errors: 2.0.0
-      iconv-lite: 0.4.24
-      on-finished: 2.4.1
-      qs: 6.11.0
-      raw-body: 2.5.1
-      type-is: 1.6.18
-      unpipe: 1.0.0
-    transitivePeerDependencies:
-      - supports-color
+      '@types/node': 18.16.16
 
-  /boolbase@1.0.0:
-    resolution: {integrity: sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==}
-
-  /boxen@5.1.2:
-    resolution: {integrity: sha512-9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ==}
-    engines: {node: '>=10'}
-    dependencies:
-      ansi-align: 3.0.1
-      camelcase: 6.3.0
-      chalk: 4.1.2
-      cli-boxes: 2.2.1
-      string-width: 4.2.3
-      type-fest: 0.20.2
-      widest-line: 3.1.0
-      wrap-ansi: 7.0.0
+  /@types/convict@6.1.1:
+    resolution: {integrity: sha512-R+JLaTvhsD06p4jyjUDtbd5xMtZTRE3c0iI+lrFWZogSVEjgTWPYwvJPVf+t92E+yrlbXa4X4Eg9ro6gPdUt4w==}
+    dependencies:
+      '@types/node': 18.16.16
     dev: true
 
-  /bplist-parser@0.2.0:
-    resolution: {integrity: sha512-z0M+byMThzQmD9NILRniCUXYsYpjwnlO8N5uCFaCqIOpqRsJCrQL9NK3JsD67CN5a08nF5oIL2bD6loTdHOuKw==}
-    engines: {node: '>= 5.10.0'}
+  /@types/cookie-parser@1.4.3:
+    resolution: {integrity: sha512-CqSKwFwefj4PzZ5n/iwad/bow2hTCh0FlNAeWLtQM3JA/NX/iYagIpWG2cf1bQKQ2c9gU2log5VUCrn7LDOs0w==}
     dependencies:
-      big-integer: 1.6.51
+      '@types/express': 4.17.21
     dev: true
 
-  /brace-expansion@1.1.11:
-    resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==}
-    dependencies:
-      balanced-match: 1.0.2
-      concat-map: 0.0.1
+  /@types/cookiejar@2.1.5:
+    resolution: {integrity: sha512-he+DHOWReW0nghN24E1WUqM0efK4kI9oTqDm6XmK8ZPe2djZ90BSNdGnIyCLzCPw7/pogPlGbzI2wHGGmi4O/Q==}
+    dev: true
 
-  /brace-expansion@2.0.1:
-    resolution: {integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==}
+  /@types/cron@1.7.3:
+    resolution: {integrity: sha512-iPmUXyIJG1Js+ldPYhOQcYU3kCAQ2FWrSkm1FJPoii2eYSn6wEW6onPukNTT0bfiflexNSRPl6KWmAIqS+36YA==}
     dependencies:
-      balanced-match: 1.0.2
+      '@types/node': 18.16.16
+      moment: 2.29.4
+    dev: true
 
-  /braces@2.3.2:
-    resolution: {integrity: sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==}
-    engines: {node: '>=0.10.0'}
+  /@types/cross-spawn@6.0.2:
+    resolution: {integrity: sha512-KuwNhp3eza+Rhu8IFI5HUXRP0LIhqH5cAjubUvGXXthh4YYBuP2ntwEX+Cz8GJoZUHlKo247wPWOfA9LYEq4cw==}
     dependencies:
-      arr-flatten: 1.1.0
-      array-unique: 0.3.2
-      extend-shallow: 2.0.1
-      fill-range: 4.0.0
-      isobject: 3.0.1
-      repeat-element: 1.1.4
-      snapdragon: 0.8.2
-      snapdragon-node: 2.1.1
-      split-string: 3.1.0
-      to-regex: 3.0.2
-    transitivePeerDependencies:
-      - supports-color
+      '@types/node': 18.16.16
     dev: true
 
-  /braces@3.0.2:
-    resolution: {integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==}
-    engines: {node: '>=8'}
-    dependencies:
-      fill-range: 7.0.1
+  /@types/dateformat@3.0.1:
+    resolution: {integrity: sha512-KlPPdikagvL6ELjWsljbyDIPzNCeliYkqRpI+zea99vBBbCIA5JNshZAwQKTON139c87y9qvTFVgkFd14rtS4g==}
+    dev: true
 
-  /browser-assert@1.2.1:
-    resolution: {integrity: sha512-nfulgvOR6S4gt9UKCeGJOuSGBPGiFT6oQ/2UBnvTY/5aQ1PnksW72fhZkM30DzoRRv2WpwZf1vHHEr3mtuXIWQ==}
+  /@types/deep-equal@1.0.1:
+    resolution: {integrity: sha512-mMUu4nWHLBlHtxXY17Fg6+ucS/MnndyOWyOe7MmwkoMYxvfQU2ajtRaEvqSUv+aVkMqH/C0NCI8UoVfRNQ10yg==}
     dev: true
 
-  /browser-request@0.3.3:
-    resolution: {integrity: sha512-YyNI4qJJ+piQG6MMEuo7J3Bzaqssufx04zpEKYfSrl/1Op59HWali9zMtBpXnkmqMcOuWJPZvudrm9wISmnCbg==}
-    engines: {'0': node}
-    dev: false
+  /@types/detect-port@1.3.2:
+    resolution: {integrity: sha512-xxgAGA2SAU4111QefXPSp5eGbDm/hW6zhvYl9IeEPZEry9F4d66QAHm5qpUXjb6IsevZV/7emAEx5MhP6O192g==}
+    dev: true
 
-  /browserslist@4.21.4:
-    resolution: {integrity: sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==}
-    engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
-    hasBin: true
-    dependencies:
-      caniuse-lite: 1.0.30001445
-      electron-to-chromium: 1.4.284
-      node-releases: 2.0.8
-      update-browserslist-db: 1.0.10(browserslist@4.21.4)
+  /@types/doctrine@0.0.3:
+    resolution: {integrity: sha512-w5jZ0ee+HaPOaX25X2/2oGR/7rgAQSYII7X7pp0m9KgBfMP7uKfMfTvcpl5Dj+eDBbpxKGiqE+flqDr6XTd2RA==}
     dev: true
 
-  /bs-logger@0.2.6:
-    resolution: {integrity: sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==}
-    engines: {node: '>= 6'}
-    dependencies:
-      fast-json-stable-stringify: 2.1.0
+  /@types/ejs@3.1.1:
+    resolution: {integrity: sha512-RQul5wEfY7BjWm0sYY86cmUN/pcXWGyVxWX93DFFJvcrxax5zKlieLwA3T77xJGwNcZW0YW6CYG70p1m8xPFmA==}
     dev: true
 
-  /bser@2.1.1:
-    resolution: {integrity: sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==}
+  /@types/emscripten@1.39.7:
+    resolution: {integrity: sha512-tLqYV94vuqDrXh515F/FOGtBcRMTPGvVV1LzLbtYDcQmmhtpf/gLYf+hikBbQk8MzOHNz37wpFfJbYAuSn8HqA==}
+    dev: true
+
+  /@types/eslint-scope@3.7.4:
+    resolution: {integrity: sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==}
     dependencies:
-      node-int64: 0.4.0
+      '@types/eslint': 8.56.5
+      '@types/estree': 1.0.0
     dev: true
 
-  /bson@4.7.0:
-    resolution: {integrity: sha512-VrlEE4vuiO1WTpfof4VmaVolCVYkYTgB9iWgYNOrVlnifpME/06fhFRmONgBhClD5pFC1t9ZWqFUQEQAzY43bA==}
-    engines: {node: '>=6.9.0'}
+  /@types/eslint@8.56.5:
+    resolution: {integrity: sha512-u5/YPJHo1tvkSF2CE0USEkxon82Z5DBy2xR+qfyYNszpX9qcs4sT6uq2kBbj4BXY1+DBGDPnrhMZV3pKWGNukw==}
     dependencies:
-      buffer: 5.7.1
-    dev: false
+      '@types/estree': 1.0.0
+      '@types/json-schema': 7.0.15
+    dev: true
 
-  /buffer-crc32@0.2.13:
-    resolution: {integrity: sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==}
+  /@types/estree@0.0.51:
+    resolution: {integrity: sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==}
     dev: true
 
-  /buffer-equal-constant-time@1.0.1:
-    resolution: {integrity: sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==}
+  /@types/estree@1.0.0:
+    resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
+    dev: true
 
-  /buffer-equal@1.0.1:
-    resolution: {integrity: sha512-QoV3ptgEaQpvVwbXdSO39iqPQTCxSF7A5U99AxbHYqUdCizL/lH2Z0A2y6nbZucxMEOtNyZfG2s6gsVugGpKkg==}
-    engines: {node: '>=0.4'}
+  /@types/eventsource@1.1.9:
+    resolution: {integrity: sha512-F3K4oyM12o8W9jxuJmW+1sc8kdw0Hj0t+26urwkcolPJTgkfppEfIdftdcXmUU2QPBIwcrYO6diqgIqgCDf1FA==}
     dev: true
 
-  /buffer-from@1.1.2:
-    resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==}
+  /@types/express-serve-static-core@4.17.43(patch_hash=5orrj4qleu2iko5t27vl44u4we):
+    resolution: {integrity: sha512-oaYtiBirUOPQGSWNGPWnzyAFJ0BP3cwvN4oWZQY+zUBwpVIGsKUkpBpSztp74drYcjavs7SKFZ4DX1V2QeN8rg==}
+    dependencies:
+      '@types/node': 18.16.16
+      '@types/qs': 6.9.7
+      '@types/range-parser': 1.2.4
+      '@types/send': 0.17.4
+    patched: true
 
-  /buffer-more-ints@1.0.0:
-    resolution: {integrity: sha512-EMetuGFz5SLsT0QTnXzINh4Ksr+oo4i+UGTXEshiGCQWnsgSs7ZhJ8fzlwQ+OzEMs0MpDAMr1hxnblp5a4vcHg==}
-    dev: false
+  /@types/express@4.17.21:
+    resolution: {integrity: sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==}
+    dependencies:
+      '@types/body-parser': 1.19.2
+      '@types/express-serve-static-core': 4.17.43(patch_hash=5orrj4qleu2iko5t27vl44u4we)
+      '@types/qs': 6.9.7
+      '@types/serve-static': 1.15.0
 
-  /buffer-writer@2.0.0:
-    resolution: {integrity: sha512-a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw==}
-    engines: {node: '>=4'}
-    dev: false
+  /@types/file-saver@2.0.5:
+    resolution: {integrity: sha512-zv9kNf3keYegP5oThGLaPk8E081DFDuwfqjtiTzm6PoxChdJ1raSuADf2YGCVIyrSynLrgc8JWv296s7Q7pQSQ==}
+    dev: true
 
-  /buffer@4.9.2:
-    resolution: {integrity: sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==}
+  /@types/find-cache-dir@3.2.1:
+    resolution: {integrity: sha512-frsJrz2t/CeGifcu/6uRo4b+SzAwT4NYCVPu1GN8IB9XTzrpPkGuV0tmh9mN+/L0PklAlsC3u5Fxt0ju00LXIw==}
+    dev: true
+
+  /@types/formidable@3.4.5:
+    resolution: {integrity: sha512-s7YPsNVfnsng5L8sKnG/Gbb2tiwwJTY1conOkJzTMRvJAlLFW1nEua+ADsJQu8N1c0oTHx9+d5nqg10WuT9gHQ==}
     dependencies:
-      base64-js: 1.5.1
-      ieee754: 1.2.1
-      isarray: 1.0.0
-    dev: false
+      '@types/node': 18.16.16
+    dev: true
 
-  /buffer@5.7.1:
-    resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==}
+  /@types/ftp@0.3.33:
+    resolution: {integrity: sha512-L7wFlX3t9GsGgNS0oxLt6zbAZZGgsdptMmciL4cdxHmbL3Hz4Lysh8YqAR34eHsJ1uacJITcZBBDl5XpQlxPpQ==}
     dependencies:
-      base64-js: 1.5.1
-      ieee754: 1.2.1
+      '@types/node': 18.16.16
+    dev: true
 
-  /buffer@6.0.3:
-    resolution: {integrity: sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==}
+  /@types/glob@8.0.0:
+    resolution: {integrity: sha512-l6NQsDDyQUVeoTynNpC9uRvCUint/gSUXQA2euwmTuWGvPY5LSDUu6tkCtJB2SvGQlJQzLaKqcGZP4//7EDveA==}
     dependencies:
-      base64-js: 1.5.1
-      ieee754: 1.2.1
-    dev: false
+      '@types/minimatch': 5.1.2
+      '@types/node': 18.16.16
 
-  /buildcheck@0.0.3:
-    resolution: {integrity: sha512-pziaA+p/wdVImfcbsZLNF32EiWyujlQLwolMqUQE8xpKNOH7KmZQaY8sXN7DGOEzPAElo9QTaeNRfGnf3iOJbA==}
-    engines: {node: '>=10.0.0'}
-    dev: false
-    optional: true
+  /@types/gm@1.25.0:
+    resolution: {integrity: sha512-y0nI4vp+0Vtsve+daADIHeSckm11TnWAdC4CBq2BEXTg+CfJiolnsnzsXeIEuIpBCksjN26LUZlvQKJDpthw5g==}
+    dependencies:
+      '@types/node': 18.16.16
+    dev: true
 
-  /builtin-modules@3.3.0:
-    resolution: {integrity: sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==}
-    engines: {node: '>=6'}
+  /@types/graceful-fs@4.1.6:
+    resolution: {integrity: sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==}
+    dependencies:
+      '@types/node': 18.16.16
+
+  /@types/hast@3.0.4:
+    resolution: {integrity: sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==}
+    dependencies:
+      '@types/unist': 2.0.6
     dev: true
 
-  /bull@3.29.3:
-    resolution: {integrity: sha512-MOqV1dKLy1YQgP9m3lFolyMxaU+1+o4afzYYf0H4wNM+x/S0I1QPQfkgGlLiH00EyFrvSmeubeCYFP47rTfpjg==}
-    engines: {node: '>=10'}
+  /@types/html-to-text@9.0.4:
+    resolution: {integrity: sha512-pUY3cKH/Nm2yYrEmDlPR1mR7yszjGx4DrwPjQ702C4/D5CwHuZTgZdIdwPkRbcuhs7BAh2L5rg3CL5cbRiGTCQ==}
+    dev: true
+
+  /@types/humanize-duration@3.27.1:
+    resolution: {integrity: sha512-K3e+NZlpCKd6Bd/EIdqjFJRFHbrq5TzPPLwREk5Iv/YoIjQrs6ljdAUCo+Lb2xFlGNOjGSE0dqsVD19cZL137w==}
+    dev: true
+
+  /@types/imap@0.8.40:
+    resolution: {integrity: sha512-kWFwOc88CGwWZlHqCnZiceS6EralsAHdjpQyk1+fIA875NQdIHvLpdD5NU3Pi1yZ8FKFdOF81UDNAo8/XS6HiQ==}
     dependencies:
-      cron-parser: 2.18.0
-      debuglog: 1.0.1
-      get-port: 5.1.1
-      ioredis: 4.28.5
-      lodash: 4.17.21
-      p-timeout: 3.2.0
-      promise.prototype.finally: 3.1.3
-      semver: 7.3.8
-      util.promisify: 1.1.1
-      uuid: 8.3.2
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
+      '@types/node': 18.16.16
+    dev: true
 
-  /bull@4.10.2:
-    resolution: {integrity: sha512-xa65xtWjQsLqYU/eNaXxq9VRG8xd6qNsQEjR7yjYuae05xKrzbVMVj2QgrYsTMmSs/vsqJjHqHSRRiW1+IkGXQ==}
-    engines: {node: '>=12'}
+  /@types/inquirer@6.5.0:
+    resolution: {integrity: sha512-rjaYQ9b9y/VFGOpqBEXRavc3jh0a+e6evAbI31tMda8VlPaSy0AZJfXsvmIe3wklc7W6C3zCSfleuMXR7NOyXw==}
     dependencies:
-      cron-parser: 4.7.0
-      debuglog: 1.0.1
-      get-port: 5.1.1
-      ioredis: 5.2.4
-      lodash: 4.17.21
-      msgpackr: 1.8.1
-      p-timeout: 3.2.0
-      semver: 7.3.8
-      uuid: 8.3.2
+      '@types/through': 0.0.30
+      rxjs: 6.6.7
+    dev: true
+
+  /@types/ioredis-mock@8.2.2:
+    resolution: {integrity: sha512-bnbPHOjxy4TUDjRh61MMoK2QvDNZqrMDXJYrEDZP/HPFvBubR24CQ0DBi5lgWhLxG4lvVsXPRDXtZ03+JgonoQ==}
+    dependencies:
+      ioredis: 5.3.2
     transitivePeerDependencies:
       - supports-color
-    dev: false
+    dev: true
 
-  /busboy@1.6.0:
-    resolution: {integrity: sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==}
-    engines: {node: '>=10.16.0'}
+  /@types/istanbul-lib-coverage@2.0.4:
+    resolution: {integrity: sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==}
+
+  /@types/istanbul-lib-report@3.0.0:
+    resolution: {integrity: sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==}
     dependencies:
-      streamsearch: 1.1.0
-    dev: false
+      '@types/istanbul-lib-coverage': 2.0.4
 
-  /byte-length@1.0.2:
-    resolution: {integrity: sha512-ovBpjmsgd/teRmgcPh23d4gJvxDoXtAzEL9xTfMU8Yc2kqCDb7L9jAG0XHl1nzuGl+h3ebCIF1i62UFyA9V/2Q==}
-    dev: false
+  /@types/istanbul-reports@3.0.1:
+    resolution: {integrity: sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==}
+    dependencies:
+      '@types/istanbul-lib-report': 3.0.0
 
-  /bytes@3.0.0:
-    resolution: {integrity: sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==}
-    engines: {node: '>= 0.8'}
+  /@types/jest@29.5.3:
+    resolution: {integrity: sha512-1Nq7YrO/vJE/FYnqYyw0FS8LdrjExSgIiHyKg7xPpn+yi8Q4huZryKnkJatN1ZRH89Kw2v33/8ZMB7DuZeSLlA==}
+    dependencies:
+      expect: 29.5.0
+      pretty-format: 29.5.0
+    dev: true
 
-  /bytes@3.1.2:
-    resolution: {integrity: sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==}
-    engines: {node: '>= 0.8'}
+  /@types/jmespath@0.15.0:
+    resolution: {integrity: sha512-uaht4XcYSq5ZrPriQW8C+g5DhptewRd1E84ph7L167sCyzLObz+U3JTpmYq/CNkvjNsz2mtyQoHPNEYQYTzWmg==}
+    dev: true
 
-  /c8@7.12.0:
-    resolution: {integrity: sha512-CtgQrHOkyxr5koX1wEUmN/5cfDa2ckbHRA4Gy5LAL0zaCFtVWJS5++n+w4/sr2GWGerBxgTjpKeDclk/Qk6W/A==}
-    engines: {node: '>=10.12.0'}
-    hasBin: true
-    dependencies:
-      '@bcoe/v8-coverage': 0.2.3
-      '@istanbuljs/schema': 0.1.3
-      find-up: 5.0.0
-      foreground-child: 2.0.0
-      istanbul-lib-coverage: 3.2.0
-      istanbul-lib-report: 3.0.0
-      istanbul-reports: 3.1.5
-      rimraf: 3.0.2
-      test-exclude: 6.0.0
-      v8-to-istanbul: 9.0.1
-      yargs: 16.2.0
-      yargs-parser: 20.2.9
+  /@types/js-nacl@1.3.0:
+    resolution: {integrity: sha512-juUvxo444ZfwDSwWyhssMxSN+snqTdiUoOVXZF+/ffVrGHq3rAf1fmczWn3z9TCEAuRbaTmgAcYlZ9MutyyOkQ==}
     dev: true
 
-  /cac@6.7.14:
-    resolution: {integrity: sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==}
-    engines: {node: '>=8'}
+  /@types/jsdom@20.0.1:
+    resolution: {integrity: sha512-d0r18sZPmMQr1eG35u12FZfhIXNrnsPU/g5wvRKCUf/tOGilKKwYMYGqh33BNR6ba+2gkHw1EUiHoN3mn7E5IQ==}
+    dependencies:
+      '@types/node': 18.16.16
+      '@types/tough-cookie': 4.0.2
+      parse5: 7.1.2
     dev: true
 
-  /cacache@15.3.0:
-    resolution: {integrity: sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==}
-    engines: {node: '>= 10'}
+  /@types/jsdom@21.1.6:
+    resolution: {integrity: sha512-/7kkMsC+/kMs7gAYmmBR9P0vGTnOoLhQhyhQJSlXGI5bzTHp6xdo0TtKWQAsz6pmSAeVqKSbqeyP6hytqr9FDw==}
     dependencies:
-      '@npmcli/fs': 1.1.1
-      '@npmcli/move-file': 1.1.2
-      chownr: 2.0.0
-      fs-minipass: 2.1.0
-      glob: 7.2.3
-      infer-owner: 1.0.4
-      lru-cache: 6.0.0
-      minipass: 3.3.6
-      minipass-collect: 1.0.2
-      minipass-flush: 1.0.5
-      minipass-pipeline: 1.2.4
-      mkdirp: 1.0.4
-      p-map: 4.0.0
-      promise-inflight: 1.0.1
-      rimraf: 3.0.2
-      ssri: 8.0.1
-      tar: 6.1.13
-      unique-filename: 1.1.1
-    transitivePeerDependencies:
-      - bluebird
-    dev: false
-    optional: true
+      '@types/node': 18.16.16
+      '@types/tough-cookie': 4.0.2
+      parse5: 7.1.2
+    dev: true
+
+  /@types/json-diff@1.0.0:
+    resolution: {integrity: sha512-dCXC1F73Sqriz2d8Wt/sP/DztE+rlfIRPxW9WSYheHp/l3gvkeSvM6l4vhm7t4Dgn8AJAxNKajx/eobbPdP6Wg==}
+    dev: true
+
+  /@types/json-schema@7.0.15:
+    resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==}
+
+  /@types/jsonpath@0.2.0:
+    resolution: {integrity: sha512-v7qlPA0VpKUlEdhghbDqRoKMxFB3h3Ch688TApBJ6v+XLDdvWCGLJIYiPKGZnS6MAOie+IorCfNYVHOPIHSWwQ==}
+    dev: true
 
-  /cache-base@1.0.1:
-    resolution: {integrity: sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==}
-    engines: {node: '>=0.10.0'}
+  /@types/jsonwebtoken@9.0.6:
+    resolution: {integrity: sha512-/5hndP5dCjloafCXns6SZyESp3Ldq7YjH3zwzwczYnjxIT0Fqzk5ROSYVGfFyczIue7IUEj8hkvLbPoLQ18vQw==}
     dependencies:
-      collection-visit: 1.0.0
-      component-emitter: 1.3.0
-      get-value: 2.0.6
-      has-value: 1.0.0
-      isobject: 3.0.1
-      set-value: 2.0.1
-      to-object-path: 0.3.0
-      union-value: 1.0.1
-      unset-value: 1.0.0
+      '@types/node': 18.16.16
     dev: true
 
-  /cachedir@2.3.0:
-    resolution: {integrity: sha512-A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw==}
-    engines: {node: '>=6'}
-    dev: true
+  /@types/linkify-it@3.0.2:
+    resolution: {integrity: sha512-HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA==}
 
-  /call-bind@1.0.2:
-    resolution: {integrity: sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==}
+  /@types/lodash-es@4.17.6:
+    resolution: {integrity: sha512-R+zTeVUKDdfoRxpAryaQNRKk3105Rrgx2CFRClIgRGaqDTdjsm8h6IYA8ir584W3ePzkZfst5xIgDwYrlh9HLg==}
     dependencies:
-      function-bind: 1.1.1
-      get-intrinsic: 1.1.3
+      '@types/lodash': 4.14.195
 
-  /call-me-maybe@1.0.1:
-    resolution: {integrity: sha512-wCyFsDQkKPwwF8BDwOiWNx/9K45L/hvggQiDbve+viMNMQnWhrlYIuBk09offfwCRtCO9P6XwUttufzU11WCVw==}
+  /@types/lodash.set@4.3.9:
+    resolution: {integrity: sha512-KOxyNkZpbaggVmqbpr82N2tDVTx05/3/j0f50Es1prxrWB0XYf9p3QNxqcbWb7P1Q9wlvsUSlCFnwlPCIJ46PQ==}
+    dependencies:
+      '@types/lodash': 4.14.195
+    dev: false
 
-  /callback-stream@1.1.0:
-    resolution: {integrity: sha512-sAZ9kODla+mGACBZ1IpTCAisKoGnv6PykW7fPk1LrM+mMepE18Yz0515yoVcrZy7dQsTUp3uZLQ/9Sx1RnLoHw==}
+  /@types/lodash.sortby@4.7.9:
+    resolution: {integrity: sha512-PDmjHnOlndLS59GofH0pnxIs+n9i4CWeXGErSB5JyNFHu2cmvW6mQOaUKjG8EDPkni14IgF8NsRW8bKvFzTm9A==}
     dependencies:
-      inherits: 2.0.4
-      readable-stream: 2.3.7
+      '@types/lodash': 4.14.195
     dev: false
 
-  /callsites@3.1.0:
-    resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==}
-    engines: {node: '>=6'}
+  /@types/lodash@4.14.195:
+    resolution: {integrity: sha512-Hwx9EUgdwf2GLarOjQp5ZH8ZmblzcbTBC2wtQWNKARBSxM9ezRIAUpeDTgoQRAFB0+8CNWXVA9+MaSOzOF3nPg==}
 
-  /camel-case@4.1.2:
-    resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
-    dependencies:
-      pascal-case: 3.1.2
-      tslib: 2.5.0
+  /@types/long@4.0.2:
+    resolution: {integrity: sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA==}
+    dev: false
 
-  /camelcase@3.0.0:
-    resolution: {integrity: sha512-4nhGqUkc4BqbBBB4Q6zLuD7lzzrHYrjKGeYaEji/3tFR5VdJu9v+LilhGIVe8wxEJPPOeWo7eg8dwY13TZ1BNg==}
-    engines: {node: '>=0.10.0'}
+  /@types/lossless-json@1.0.1:
+    resolution: {integrity: sha512-zPE8kmpeL5/6L5gtTQHSOkAW/OSYYNTDRt6/2oEgLO1Zd3Rj5WVDoMloTtLJxQJhZGLGbL4pktKSh3NbzdaWdw==}
     dev: true
 
-  /camelcase@5.3.1:
-    resolution: {integrity: sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==}
-    engines: {node: '>=6'}
-
-  /camelcase@6.3.0:
-    resolution: {integrity: sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==}
-    engines: {node: '>=10'}
+  /@types/luxon@3.2.0:
+    resolution: {integrity: sha512-lGmaGFoaXHuOLXFvuju2bfvZRqxAqkHPx9Y9IQdQABrinJJshJwfNCKV+u7rR3kJbiqfTF/NhOkcxxAFrObyaA==}
+    dev: true
 
-  /caniuse-lite@1.0.30001445:
-    resolution: {integrity: sha512-8sdQIdMztYmzfTMO6KfLny878Ln9c2M0fc7EH60IjlP4Dc4PiCy7K2Vl3ITmWgOyPgVQKa5x+UP/KqFsxj4mBg==}
+  /@types/mailparser@3.4.4:
+    resolution: {integrity: sha512-C6Znp2QVS25JqtuPyxj38Qh+QoFcLycdxsvcc6IZCGekhaMBzbdTXzwGzhGoYb3TfKu8IRCNV0sV1o3Od97cEQ==}
+    dependencies:
+      '@types/node': 18.16.16
+      iconv-lite: 0.6.3
     dev: true
 
-  /canvas-confetti@1.6.0:
-    resolution: {integrity: sha512-ej+w/m8Jzpv9Z7W7uJZer14Ke8P2ogsjg4ZMGIuq4iqUOqY2Jq8BNW42iGmNfRwREaaEfFIczLuZZiEVSYNHAA==}
-    dev: false
+  /@types/markdown-it-emoji@2.0.2:
+    resolution: {integrity: sha512-2ln8Wjbcj/0oRi/6VnuMeWEHHuK8uapFttvcLmDIe1GKCsFBLOLBX+D+xhDa9oWOQV0IpvxwrSfKKssAqqroog==}
+    dependencies:
+      '@types/markdown-it': 12.2.3
+    dev: true
 
-  /capital-case@1.0.4:
-    resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
+  /@types/markdown-it-link-attributes@3.0.1:
+    resolution: {integrity: sha512-K8RnNb1q8j7rDOJbMF7AnlhCC/45BjrQ8z3WZWOrvkBIl8u9RXvmBdG/hfpnmK1JhhEZcmFEKWt+ilW1Mly+2Q==}
     dependencies:
-      no-case: 3.0.4
-      tslib: 2.5.0
-      upper-case-first: 2.0.2
-    dev: false
+      '@types/markdown-it': 12.2.3
+    dev: true
 
-  /cardinal@2.1.1:
-    resolution: {integrity: sha512-JSr5eOgoEymtYHBjNWyjrMqet9Am2miJhlfKNdqLp6zoeAh0KN5dRAcxlecj5mAJrmQomgiOBj35xHLrFjqBpw==}
-    hasBin: true
+  /@types/markdown-it@12.2.3:
+    resolution: {integrity: sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ==}
     dependencies:
-      ansicolors: 0.3.2
-      redeyed: 2.1.1
+      '@types/linkify-it': 3.0.2
+      '@types/mdurl': 1.0.2
 
-  /case-sensitive-paths-webpack-plugin@2.4.0:
-    resolution: {integrity: sha512-roIFONhcxog0JSSWbvVAh3OocukmSgpqOH6YpMkCvav/ySIV3JKg4Dc8vYtQjYi/UxpNE36r/9v+VqTQqgkYmw==}
-    engines: {node: '>=4'}
+  /@types/md5@2.3.5:
+    resolution: {integrity: sha512-/i42wjYNgE6wf0j2bcTX6kuowmdL/6PE4IVitMpm2eYKBUuYCprdcWVK+xEF0gcV6ufMCRhtxmReGfc6hIK7Jw==}
     dev: true
 
-  /caseless@0.12.0:
-    resolution: {integrity: sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==}
+  /@types/mdurl@1.0.2:
+    resolution: {integrity: sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA==}
 
-  /cfb@1.2.2:
-    resolution: {integrity: sha512-KfdUZsSOw19/ObEWasvBP/Ac4reZvAGauZhs6S/gqNhXhI7cKwvlH7ulj+dOEYnca4bm4SGo8C1bTAQvnTjgQA==}
-    engines: {node: '>=0.8'}
-    dependencies:
-      adler-32: 1.3.1
-      crc-32: 1.2.2
-    dev: false
+  /@types/mdx@2.0.3:
+    resolution: {integrity: sha512-IgHxcT3RC8LzFLhKwP3gbMPeaK7BM9eBH46OdapPA7yvuIUJ8H6zHZV53J8hGZcTSnt95jANt+rTBNUUc22ACQ==}
+    dev: true
 
-  /chai@4.3.7:
-    resolution: {integrity: sha512-HLnAzZ2iupm25PlN0xFreAlBA5zaBSv3og0DdeGA4Ar6h6rJ3A0rolRUKJhSF2V10GZKDgWF/VmAEsNWjCRB+A==}
-    engines: {node: '>=4'}
-    dependencies:
-      assertion-error: 1.1.0
-      check-error: 1.0.2
-      deep-eql: 4.1.3
-      get-func-name: 2.0.0
-      loupe: 2.3.6
-      pathval: 1.1.1
-      type-detect: 4.0.8
+  /@types/methods@1.1.4:
+    resolution: {integrity: sha512-ymXWVrDiCxTBE3+RIrrP533E70eA+9qu7zdWoHuOmGujkYtzf4HQF96b8nwHLqhuf4ykX61IGRIB38CC6/sImQ==}
     dev: true
 
-  /chalk@2.4.2:
-    resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==}
-    engines: {node: '>=4'}
-    dependencies:
-      ansi-styles: 3.2.1
-      escape-string-regexp: 1.0.5
-      supports-color: 5.5.0
+  /@types/mime-types@2.1.1:
+    resolution: {integrity: sha512-vXOTGVSLR2jMw440moWTC7H19iUyLtP3Z1YTj7cSsubOICinjMxFeb/V57v9QdyyPGbbWolUFSSmSiRSn94tFw==}
     dev: true
 
-  /chalk@3.0.0:
-    resolution: {integrity: sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==}
-    engines: {node: '>=8'}
+  /@types/mime@1.3.5:
+    resolution: {integrity: sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==}
+
+  /@types/mime@3.0.1:
+    resolution: {integrity: sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA==}
+
+  /@types/minimatch@5.1.2:
+    resolution: {integrity: sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==}
+
+  /@types/mssql@9.1.5:
+    resolution: {integrity: sha512-Q9EsgXwuRoX5wvUSu24YfbKMbFChv7pZ/jeCzPkj47ehcuXYsBcfogwrtVFosSjinD4Q/MY2YPGk9Yy1cM2Ywg==}
     dependencies:
-      ansi-styles: 4.3.0
-      supports-color: 7.2.0
+      '@types/node': 18.16.16
+      '@types/tedious': 4.0.9
+      tarn: 3.0.2
     dev: true
 
-  /chalk@4.1.2:
-    resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==}
-    engines: {node: '>=10'}
+  /@types/multer@1.4.7:
+    resolution: {integrity: sha512-/SNsDidUFCvqqcWDwxv2feww/yqhNeTRL5CVoL3jU4Goc4kKEL10T7Eye65ZqPNi4HRx8sAEX59pV1aEH7drNA==}
     dependencies:
-      ansi-styles: 4.3.0
-      supports-color: 7.2.0
+      '@types/express': 4.17.21
+    dev: false
 
-  /change-case@4.1.2:
-    resolution: {integrity: sha512-bSxY2ws9OtviILG1EiY5K7NNxkqg/JnRnFxLtKQ96JaviiIxi7djMrSd0ECT9AC+lttClmYwKw53BWpOMblo7A==}
+  /@types/node-fetch@2.6.4:
+    resolution: {integrity: sha512-1ZX9fcN4Rvkvgv4E6PAY5WXUFWFcRWxZa3EW83UjycOB9ljJCedb2CupIP4RZMEwF/M3eTcCihbBRgwtGbg5Rg==}
     dependencies:
-      camel-case: 4.1.2
-      capital-case: 1.0.4
-      constant-case: 3.0.4
-      dot-case: 3.0.4
-      header-case: 2.0.4
-      no-case: 3.0.4
-      param-case: 3.0.4
-      pascal-case: 3.1.2
-      path-case: 3.0.4
-      sentence-case: 3.0.4
-      snake-case: 3.0.4
-      tslib: 2.5.0
+      '@types/node': 18.16.16
+      form-data: 3.0.1
     dev: false
 
-  /char-regex@1.0.2:
-    resolution: {integrity: sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==}
-    engines: {node: '>=10'}
+  /@types/node-ssh@7.0.1:
+    resolution: {integrity: sha512-98EuH7UQl/WWwwDxpbANQ76HwBdzcSnC9zLSdrtVW7jjYeOTQ6TxBygbGwzZR4ho1agbd941UnHCdrXz2sS8JQ==}
+    dependencies:
+      '@types/node': 18.16.16
+      '@types/ssh2': 1.11.6
+      '@types/ssh2-streams': 0.1.9
     dev: true
 
-  /character-parser@2.2.0:
-    resolution: {integrity: sha512-+UqJQjFEFaTAs3bNsF2j2kEN1baG/zghZbdqoYEDxGZtJo9LBzl1A+m0D4n3qKx8N2FNv8/Xp6yV9mQmBuptaw==}
+  /@types/node@18.16.16:
+    resolution: {integrity: sha512-NpaM49IGQQAUlBhHMF82QH80J08os4ZmyF9MkpCzWAGuOHqE4gTEbhzd7L3l5LmWuZ6E0OiC1FweQ4tsiW35+g==}
+
+  /@types/nodemailer@6.4.14:
+    resolution: {integrity: sha512-fUWthHO9k9DSdPCSPRqcu6TWhYyxTBg382vlNIttSe9M7XfsT06y0f24KHXtbnijPGGRIcVvdKHTNikOI6qiHA==}
     dependencies:
-      is-regex: 1.1.4
+      '@types/node': 18.16.16
     dev: true
 
-  /chardet@0.7.0:
-    resolution: {integrity: sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==}
+  /@types/normalize-package-data@2.4.1:
+    resolution: {integrity: sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==}
+    dev: true
+
+  /@types/openapi-to-postmanv2@3.2.4:
+    resolution: {integrity: sha512-5SMU3TY2gmQRs6Ri7WRlI7tF2QEK0K4GfL50ghAPOUv4NkxhG37Aq2qystytm9fcmUgHDfyrkwZyprRgp85mxg==}
+    dependencies:
+      '@types/postman-collection': 3.5.10
     dev: false
 
-  /charenc@0.0.2:
-    resolution: {integrity: sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==}
+  /@types/phoenix@1.6.4:
+    resolution: {integrity: sha512-B34A7uot1Cv0XtaHRYDATltAdKx0BvVKNgYNqE4WjtPUa4VQJM7kxeXcVKaH+KS+kCmZ+6w+QaUdcljiheiBJA==}
     dev: false
 
-  /charset@1.0.1:
-    resolution: {integrity: sha512-6dVyOOYjpfFcL1Y4qChrAoQLRHvj2ziyhcm0QJlhOcAhykL/k1kTUPbeo+87MNRTRdk2OIIsIXbuF3x2wi5EXg==}
-    engines: {node: '>=4.0.0'}
+  /@types/postman-collection@3.5.10:
+    resolution: {integrity: sha512-l8xAUZNW9MzKWyeWuPgQlnyvpX8beeLqXYZTixr55Figae8/0gFb5l5GcU1y+3yeDmbXdY57cGxdvu+4OGbMdg==}
+    dependencies:
+      '@types/node': 18.16.16
     dev: false
 
-  /check-error@1.0.2:
-    resolution: {integrity: sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==}
+  /@types/pretty-hrtime@1.0.1:
+    resolution: {integrity: sha512-VjID5MJb1eGKthz2qUerWT8+R4b9N+CHvGCzg9fn4kWZgaF9AhdYikQio3R7wV8YY1NsQKPaCwKz1Yff+aHNUQ==}
     dev: true
 
-  /check-more-types@2.24.0:
-    resolution: {integrity: sha512-Pj779qHxV2tuapviy1bSZNEL1maXr13bPYpsvSDB68HlYcYuhlDrmGd63i0JHMCLKzc7rUSNIrpdJlhVlNwrxA==}
-    engines: {node: '>= 0.8.0'}
+  /@types/promise-ftp-common@1.1.0:
+    resolution: {integrity: sha512-mqo6D4qdiJdzeqlzFwEIchQQZk2hZacjssmjoAX7nClcREmRUUsnmgbWXEfA2qK986rwOPqepfRoSu7rsjAKag==}
     dev: true
 
-  /cheerio-select@1.6.0:
-    resolution: {integrity: sha512-eq0GdBvxVFbqWgmCm7M3XGs1I8oLy/nExUnh6oLqmBditPO9AqQJrkslDpMun/hZ0yyTs8L0m85OHp4ho6Qm9g==}
+  /@types/promise-ftp@1.3.4:
+    resolution: {integrity: sha512-fCIX7I84e25RX6bZ+qiIv0Puu5axWhCj9+El+4Kz1gZZyO/NvwdGTNQ33y6jdrPuTn3Df3kg7nMi1HohjNQLog==}
     dependencies:
-      css-select: 4.3.0
-      css-what: 6.1.0
-      domelementtype: 2.3.0
-      domhandler: 4.3.1
-      domutils: 2.8.0
-    dev: false
+      '@types/bluebird': 3.5.37
+      '@types/ftp': 0.3.33
+      '@types/node': 18.16.16
+      '@types/promise-ftp-common': 1.1.0
+    dev: true
 
-  /cheerio@1.0.0-rc.6:
-    resolution: {integrity: sha512-hjx1XE1M/D5pAtMgvWwE21QClmAEeGHOIDfycgmndisdNgI6PE1cGRQkMGBcsbUbmEQyWu5PJLUcAOjtQS8DWw==}
-    engines: {node: '>= 0.12'}
-    dependencies:
-      cheerio-select: 1.6.0
-      dom-serializer: 1.4.1
-      domhandler: 4.3.1
-      htmlparser2: 6.1.0
-      parse5: 6.0.1
-      parse5-htmlparser2-tree-adapter: 6.0.1
-    dev: false
+  /@types/prop-types@15.7.5:
+    resolution: {integrity: sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==}
+    dev: true
 
-  /chokidar@3.5.2:
-    resolution: {integrity: sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==}
-    engines: {node: '>= 8.10.0'}
+  /@types/psl@1.1.0:
+    resolution: {integrity: sha512-HhZnoLAvI2koev3czVPzBNRYvdrzJGLjQbWZhqFmS9Q6a0yumc5qtfSahBGb5g+6qWvA8iiQktqGkwoIXa/BNQ==}
+    dev: true
+
+  /@types/qrcode@1.5.5:
+    resolution: {integrity: sha512-CdfBi/e3Qk+3Z/fXYShipBT13OJ2fDO2Q2w5CIP5anLTLIndQG9z6P1cnm+8zCWSpm5dnxMFd/uREtb0EXuQzg==}
     dependencies:
-      anymatch: 3.1.3
-      braces: 3.0.2
-      glob-parent: 5.1.2
-      is-binary-path: 2.1.0
-      is-glob: 4.0.3
-      normalize-path: 3.0.0
-      readdirp: 3.6.0
-    optionalDependencies:
-      fsevents: 2.3.2
+      '@types/node': 18.16.16
 
-  /chownr@1.1.4:
-    resolution: {integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==}
+  /@types/qs@6.9.7:
+    resolution: {integrity: sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==}
+
+  /@types/quoted-printable@1.0.2:
+    resolution: {integrity: sha512-3B28oB1rRaZNb3N5dlxysm8lH1ujzvReDuYBiIO4jvpTIg9ksrILCNgPxSGVyTWE/qwuxzgHaVehwMK3CVqAtA==}
     dev: true
 
-  /chownr@2.0.0:
-    resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==}
-    engines: {node: '>=10'}
+  /@types/range-parser@1.2.4:
+    resolution: {integrity: sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==}
 
-  /chrome-trace-event@1.0.3:
-    resolution: {integrity: sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==}
-    engines: {node: '>=6.0'}
+  /@types/react@18.0.27:
+    resolution: {integrity: sha512-3vtRKHgVxu3Jp9t718R9BuzoD4NcQ8YJ5XRzsSKxNDiDonD2MXIT1TmSkenxuCycZJoQT5d2vE8LwWJxBC1gmA==}
+    dependencies:
+      '@types/prop-types': 15.7.5
+      '@types/scheduler': 0.16.2
+      csstype: 3.1.3
     dev: true
 
-  /ci-info@3.7.1:
-    resolution: {integrity: sha512-4jYS4MOAaCIStSRwiuxc4B8MYhIe676yO1sYGzARnjXkWpmzZMMYxY6zu8WYWDhSuth5zhrQ1rhNSibyyvv4/w==}
-    engines: {node: '>=8'}
+  /@types/readable-stream@4.0.10:
+    resolution: {integrity: sha512-AbUKBjcC8SHmImNi4yK2bbjogQlkFSg7shZCcicxPQapniOlajG8GCc39lvXzCWX4lLRRs7DM3VAeSlqmEVZUA==}
+    dependencies:
+      '@types/node': 18.16.16
+      safe-buffer: 5.1.2
+    dev: false
+
+  /@types/replacestream@4.0.1:
+    resolution: {integrity: sha512-3ecTmnzB90sgarVpIszCF1cX2cnxwqDovWb31jGrKfxAL0Knui1H7Reaz/zlT9zaE3u0un7L5cNy9fQPy0d2sg==}
     dev: true
 
-  /cjs-module-lexer@1.2.2:
-    resolution: {integrity: sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==}
+  /@types/request-promise-native@1.0.21:
+    resolution: {integrity: sha512-NJ1M6iqWTEUT+qdP+OmXsRZ6tSdkoBdblHKatIWTVP1HdYpHU3IkfpLPf4MWb0+CC4Nl3TtLpYhDlhjZxytDIA==}
+    dependencies:
+      '@types/request': 2.48.12
+    dev: false
+
+  /@types/request@2.48.12:
+    resolution: {integrity: sha512-G3sY+NpsA9jnwm0ixhAFQSJ3Q9JkpLZpJbI3GMv0mIAT0y3mRabYeINzal5WOChIiaTEGQYlHOKgkaM9EisWHw==}
+    dependencies:
+      '@types/caseless': 0.12.5
+      '@types/node': 18.16.16
+      '@types/tough-cookie': 4.0.2
+      form-data: 2.5.1
+    dev: false
+
+  /@types/resolve@1.20.2:
+    resolution: {integrity: sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==}
     dev: true
 
-  /clamp@1.0.1:
-    resolution: {integrity: sha512-kgMuFyE78OC6Dyu3Dy7vcx4uy97EIbVxJB/B0eJ3bUNAkwdNcxYzgKltnyADiYwsR7SEqkkUPsEUT//OVS6XMA==}
+  /@types/retry@0.12.0:
+    resolution: {integrity: sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==}
     dev: false
 
-  /class-transformer@0.5.1:
-    resolution: {integrity: sha512-SQa1Ws6hUbfC98vKGxZH3KFY0Y1lm5Zm0SY8XX9zbK7FJCyVEac3ATW0RIpwzW+oOfmHE5PMPufDG9hCfoEOMw==}
+  /@types/retry@0.12.5:
+    resolution: {integrity: sha512-3xSjTp3v03X/lSQLkczaN9UIEwJMoMCA1+Nb5HfbJEQWogdeQIyVtTvxPXDQjZ5zws8rFQfVfRdz03ARihPJgw==}
     dev: false
 
-  /class-utils@0.3.6:
-    resolution: {integrity: sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      arr-union: 3.1.0
-      define-property: 0.2.5
-      isobject: 3.0.1
-      static-extend: 0.1.2
+  /@types/rfc2047@2.0.1:
+    resolution: {integrity: sha512-slgtykv+XXME7EperkdqfdBBUGcs28ru+a21BK0zOQY4IoxE7tEqvIcvAFAz5DJVxyOmoAUXo30Oxpm3KS+TBQ==}
     dev: true
 
-  /class-validator@0.14.0:
-    resolution: {integrity: sha512-ct3ltplN8I9fOwUd8GrP8UQixwff129BkEtuWDKL5W45cQuLd19xqmTLu5ge78YDm/fdje6FMt0hGOhl0lii3A==}
+  /@types/rimraf@3.0.2:
+    resolution: {integrity: sha512-F3OznnSLAUxFrCEu/L5PY8+ny8DtcFRjx7fZZ9bycvXRi3KPTRS9HOitGZwvPg0juRhXFWIeKX58cnX5YqLohQ==}
     dependencies:
-      '@types/validator': 13.7.10
-      libphonenumber-js: 1.10.14
-      validator: 13.7.0
+      '@types/glob': 8.0.0
+      '@types/node': 18.16.16
     dev: false
 
-  /clean-css@5.3.2:
-    resolution: {integrity: sha512-JVJbM+f3d3Q704rF4bqQ5UUyTtuJ0JRKNbTKVEeujCCBoMdkEi+V+e8oktO9qGQNSvHrFTM6JZRXrUvGR1czww==}
-    engines: {node: '>= 10.0'}
-    dependencies:
-      source-map: 0.6.1
+  /@types/sanitize-html@2.11.0:
+    resolution: {integrity: sha512-7oxPGNQHXLHE48r/r/qjn7q0hlrs3kL7oZnGj0Wf/h9tj/6ibFyRkNbsDxaBBZ4XUZ0Dx5LGCyDJ04ytSofacQ==}
+    dependencies:
+      htmlparser2: 8.0.2
+    dev: true
+
+  /@types/scheduler@0.16.2:
+    resolution: {integrity: sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==}
+    dev: true
+
+  /@types/semver@7.5.0:
+    resolution: {integrity: sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw==}
     dev: true
 
-  /clean-regexp@1.0.0:
-    resolution: {integrity: sha512-GfisEZEJvzKrmGWkvfhgzcz/BllN1USeqD2V6tg14OAOgaCD2Z/PUEuxnAZ/nPvmaHRG7a8y77p1T/IRQ4D1Hw==}
-    engines: {node: '>=4'}
+  /@types/send@0.17.4:
+    resolution: {integrity: sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==}
     dependencies:
-      escape-string-regexp: 1.0.5
-    dev: true
+      '@types/mime': 1.3.5
+      '@types/node': 18.16.16
 
-  /clean-stack@2.2.0:
-    resolution: {integrity: sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==}
-    engines: {node: '>=6'}
+  /@types/serve-static@1.15.0:
+    resolution: {integrity: sha512-z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg==}
+    dependencies:
+      '@types/mime': 3.0.1
+      '@types/node': 18.16.16
 
-  /clean-stack@3.0.1:
-    resolution: {integrity: sha512-lR9wNiMRcVQjSB3a7xXGLuz4cr4wJuuXlaAEbRutGowQTmlp7R72/DOgN21e8jdwblMWl9UOJMJXarX94pzKdg==}
-    engines: {node: '>=10'}
+  /@types/shelljs@0.8.11:
+    resolution: {integrity: sha512-x9yaMvEh5BEaZKeVQC4vp3l+QoFj3BXcd4aYfuKSzIIyihjdVARAadYy3SMNIz0WCCdS2vB9JL/U6GQk5PaxQw==}
     dependencies:
-      escape-string-regexp: 4.0.0
+      '@types/glob': 8.0.0
+      '@types/node': 18.16.16
+    dev: true
 
-  /cli-boxes@2.2.1:
-    resolution: {integrity: sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==}
-    engines: {node: '>=6'}
+  /@types/showdown@1.9.4:
+    resolution: {integrity: sha512-50ehC3IAijfkvoNqmQ+VL73S7orOxmAK8ljQAFBv8o7G66lAZyxQj1L3BAv2dD86myLXI+sgKP1kcxAaxW356w==}
     dev: true
 
-  /cli-color@0.1.7:
-    resolution: {integrity: sha512-xNaQxWYgI6DD4xIJLn8GY2zDZVbrN0vsU1fEbDNAHZRyceWhpj7A08mYcG1AY92q1Aw0geYkVfiAcEYIZtuTSg==}
-    engines: {node: '>=0.1.103'}
-    dependencies:
-      es5-ext: 0.8.2
-    dev: false
+  /@types/sinonjs__fake-timers@8.1.1:
+    resolution: {integrity: sha512-0kSuKjAS0TrGLJ0M/+8MaFkGsQhZpB6pxOmvS3K8FYI72K//YmdfoW9X2qPsAKh1mkwxGD5zib9s1FIFed6E8g==}
+    dev: true
 
-  /cli-cursor@3.1.0:
-    resolution: {integrity: sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==}
-    engines: {node: '>=8'}
-    dependencies:
-      restore-cursor: 3.1.0
+  /@types/sizzle@2.3.3:
+    resolution: {integrity: sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==}
+    dev: true
 
-  /cli-highlight@2.1.11:
-    resolution: {integrity: sha512-9KDcoEVwyUXrjcJNvHD0NFc/hiwe/WPVYIleQh2O1N2Zro5gWJZ/K+3DGn8w8P/F6FxOgzyC5bxDyHIgCSPhGg==}
-    engines: {node: '>=8.0.0', npm: '>=5.0.0'}
-    hasBin: true
+  /@types/snowflake-sdk@1.6.20:
+    resolution: {integrity: sha512-Dr7oIXrWthlk9wVWpZgpm49BT8cFFXz43u7SkJKyiZK3WHiHQo4b+m2/p3WIpkYzZCcOZZ/t1B09XMd7+u1Wjw==}
     dependencies:
-      chalk: 4.1.2
-      highlight.js: 10.7.3
-      mz: 2.7.0
-      parse5: 5.1.1
-      parse5-htmlparser2-tree-adapter: 6.0.1
-      yargs: 16.2.0
-    dev: false
+      '@types/node': 18.16.16
+      generic-pool: 3.9.0
+    dev: true
 
-  /cli-progress@3.11.2:
-    resolution: {integrity: sha512-lCPoS6ncgX4+rJu5bS3F/iCz17kZ9MPZ6dpuTtI0KXKABkhyXIdYB3Inby1OpaGti3YlI3EeEkM9AuWpelJrVA==}
-    engines: {node: '>=4'}
+  /@types/speakeasy@2.0.10:
+    resolution: {integrity: sha512-QVRlDW5r4yl7p7xkNIbAIC/JtyOcClDIIdKfuG7PWdDT1MmyhtXSANsildohy0K+Lmvf/9RUtLbNLMacvrVwxA==}
     dependencies:
-      string-width: 4.2.3
+      '@types/node': 18.16.16
 
-  /cli-table3@0.6.3:
-    resolution: {integrity: sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg==}
-    engines: {node: 10.* || >= 12.*}
+  /@types/ssh2-sftp-client@5.3.2:
+    resolution: {integrity: sha512-s5R3hsnI3/7Ar57LG++gm2kxgONHtOZY2A3AgGzEwiJlHR8j7MRPDw1n/hG6oMnOUJ4zuoLNtDXgDfmmxV4lDA==}
     dependencies:
-      string-width: 4.2.3
-    optionalDependencies:
-      '@colors/colors': 1.5.0
+      '@types/ssh2': 1.11.6
     dev: true
 
-  /cli-truncate@2.1.0:
-    resolution: {integrity: sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==}
-    engines: {node: '>=8'}
+  /@types/ssh2-streams@0.1.9:
+    resolution: {integrity: sha512-I2J9jKqfmvXLR5GomDiCoHrEJ58hAOmFrekfFqmCFd+A6gaEStvWnPykoWUwld1PNg4G5ag1LwdA+Lz1doRJqg==}
     dependencies:
-      slice-ansi: 3.0.0
-      string-width: 4.2.3
+      '@types/node': 18.16.16
     dev: true
 
-  /cli-truncate@3.1.0:
-    resolution: {integrity: sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+  /@types/ssh2@1.11.6:
+    resolution: {integrity: sha512-8Mf6bhzYYBLEB/G6COux7DS/F5bCWwojv/qFo2yH/e4cLzAavJnxvFXrYW59iKfXdhG6OmzJcXDasgOb/s0rxw==}
     dependencies:
-      slice-ansi: 5.0.0
-      string-width: 5.1.2
+      '@types/node': 18.16.16
     dev: true
 
-  /cli-ux@5.6.7(@oclif/config@1.18.5):
-    resolution: {integrity: sha512-dsKAurMNyFDnO6X1TiiRNiVbL90XReLKcvIq4H777NMqXGBxBws23ag8ubCJE97vVZEgWG2eSUhsyLf63Jv8+g==}
-    engines: {node: '>=8.0.0'}
-    deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
+  /@types/sshpk@1.17.1:
+    resolution: {integrity: sha512-bOJek/W++DvWRNAeHmpvgX8Q1ypAq4nmeVi3nJ+pjDcMB214S8kSGkxRUw/Uz+zau4VwxcfNp0xUq4s/3DLjLw==}
     dependencies:
-      '@oclif/command': 1.8.18(@oclif/config@1.18.5)(supports-color@8.1.1)
-      '@oclif/errors': 1.3.6
-      '@oclif/linewrap': 1.0.0
-      '@oclif/screen': 1.0.4
-      ansi-escapes: 4.3.2
-      ansi-styles: 4.3.0
-      cardinal: 2.1.1
-      chalk: 4.1.2
-      clean-stack: 3.0.1
-      cli-progress: 3.11.2
-      extract-stack: 2.0.0
-      fs-extra: 8.1.0
-      hyperlinker: 1.0.0
-      indent-string: 4.0.0
-      is-wsl: 2.2.0
-      js-yaml: 3.14.1
-      lodash: 4.17.21
-      natural-orderby: 2.0.3
-      object-treeify: 1.1.33
-      password-prompt: 1.1.2
-      semver: 7.3.8
-      string-width: 4.2.3
-      strip-ansi: 6.0.1
-      supports-color: 8.1.1
-      supports-hyperlinks: 2.3.0
-      tslib: 2.5.0
-    transitivePeerDependencies:
-      - '@oclif/config'
+      '@types/asn1': 0.2.0
+      '@types/node': 18.16.16
     dev: true
 
-  /cli-width@3.0.0:
-    resolution: {integrity: sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==}
-    engines: {node: '>= 10'}
+  /@types/stack-utils@2.0.1:
+    resolution: {integrity: sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==}
+
+  /@types/strftime@0.9.8:
+    resolution: {integrity: sha512-QIvDlGAKyF3YJbT3QZnfC+RIvV5noyDbi+ZJ5rkaSRqxCGrYJefgXm3leZAjtoQOutZe1hCXbAg+p89/Vj4HlQ==}
     dev: false
 
-  /cli@1.0.1:
-    resolution: {integrity: sha512-41U72MB56TfUMGndAKK8vJ78eooOD4Z5NOL4xEfjc0c23s+6EYKXlXsmACBVclLP1yOfWCgEganVzddVrSNoTg==}
-    engines: {node: '>=0.2.5'}
+  /@types/stylis@4.2.0:
+    resolution: {integrity: sha512-n4sx2bqL0mW1tvDf/loQ+aMX7GQD3lc3fkCMC55VFNDu/vBOabO+LTIeXKM14xK0ppk5TUGcWRjiSpIlUpghKw==}
+    dev: true
+
+  /@types/superagent@8.1.4:
+    resolution: {integrity: sha512-uzSBYwrpal8y2X2Pul5ZSWpzRiDha2FLcquaN95qUPnOjYgm/zQ5LIdqeJpQJTRWNTN+Rhm0aC8H06Ds2rqCYw==}
     dependencies:
-      exit: 0.1.2
-      glob: 7.2.3
+      '@types/cookiejar': 2.1.5
+      '@types/methods': 1.1.4
+      '@types/node': 18.16.16
     dev: true
 
-  /client-oauth2@4.3.3:
-    resolution: {integrity: sha512-k8AvUYJon0vv75ufoVo4nALYb/qwFFicO3I0+39C6xEdflqVtr+f9cy+0ZxAduoVSTfhP5DX2tY2XICAd5hy6Q==}
-    engines: {node: '>=4.2.0'}
+  /@types/supertest@6.0.2:
+    resolution: {integrity: sha512-137ypx2lk/wTQbW6An6safu9hXmajAifU/s7szAHLN/FeIm5w7yR0Wkl9fdJMRSHwOn4HLAI0DaB2TOORuhPDg==}
     dependencies:
-      popsicle: 12.1.0
-      safe-buffer: 5.2.1
-    dev: false
+      '@types/methods': 1.1.4
+      '@types/superagent': 8.1.4
+    dev: true
 
-  /cliui@3.2.0:
-    resolution: {integrity: sha512-0yayqDxWQbqk3ojkYqUKqaAQ6AfNKeKWRNA8kR0WXzAsdHpP4BIaOmMAG87JGuO6qcobyW4GjxHd9PmhEd+T9w==}
+  /@types/swagger-ui-express@4.1.6:
+    resolution: {integrity: sha512-UVSiGYXa5IzdJJG3hrc86e8KdZWLYxyEsVoUI4iPXc7CO4VZ3AfNP8d/8+hrDRIqz+HAaSMtZSqAsF3Nq2X/Dg==}
     dependencies:
-      string-width: 1.0.2
-      strip-ansi: 3.0.1
-      wrap-ansi: 2.1.0
+      '@types/express': 4.17.21
+      '@types/serve-static': 1.15.0
+    dev: true
+
+  /@types/swagger-ui@3.52.4:
+    resolution: {integrity: sha512-7NV7q8BfupqdQxr26OkM0g0YEPB9uXnKGzXadgcearvI9MoCHt3F72lPTX3fZZIlrr21DC0IK26wcDMZ37oFDA==}
     dev: true
 
-  /cliui@5.0.0:
-    resolution: {integrity: sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==}
+  /@types/syslog-client@1.1.2:
+    resolution: {integrity: sha512-X8MwGedXYNmYltPDaZQCM9X6cSdfFbJZWhrU81gWKsg+Q6mSgRWs/12Mq9nHaUV4wqMYDNrnytbwbMUiVnWegw==}
     dependencies:
-      string-width: 3.1.0
-      strip-ansi: 5.2.0
-      wrap-ansi: 5.1.0
+      '@types/node': 18.16.16
     dev: true
 
-  /cliui@6.0.0:
-    resolution: {integrity: sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==}
+  /@types/tedious@4.0.9:
+    resolution: {integrity: sha512-ipwFvfy9b2m0gjHsIX0D6NAAwGCKokzf5zJqUZHUGt+7uWVlBIy6n2eyMgiKQ8ChLFVxic/zwQUhjLYNzbHDRA==}
     dependencies:
-      string-width: 4.2.3
-      strip-ansi: 6.0.1
-      wrap-ansi: 6.2.0
+      '@types/node': 18.16.16
+    dev: true
 
-  /cliui@7.0.4:
-    resolution: {integrity: sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==}
+  /@types/temp@0.9.4:
+    resolution: {integrity: sha512-+VfWIwrlept2VBTj7Y2wQnI/Xfscy1u8Pyj/puYwss6V1IblXn1x7S0S9eFh6KyBolgLCm+rUFzhFAbdkR691g==}
     dependencies:
-      string-width: 4.2.3
-      strip-ansi: 6.0.1
-      wrap-ansi: 7.0.0
+      '@types/node': 18.16.16
+    dev: true
 
-  /cliui@8.0.1:
-    resolution: {integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==}
-    engines: {node: '>=12'}
+  /@types/through@0.0.30:
+    resolution: {integrity: sha512-FvnCJljyxhPM3gkRgWmxmDZyAQSiBQQWLI0A0VFL0K7W1oRUrPJSqNO0NvTnLkBcotdlp3lKvaT0JrnyRDkzOg==}
     dependencies:
-      string-width: 4.2.3
-      strip-ansi: 6.0.1
-      wrap-ansi: 7.0.0
+      '@types/node': 18.16.16
+    dev: true
 
-  /clone-buffer@1.0.0:
-    resolution: {integrity: sha512-KLLTJWrvwIP+OPfMn0x2PheDEP20RPUcGXj/ERegTgdmPEZylALQldygiqrPPu8P45uNuPs7ckmReLY6v/iA5g==}
-    engines: {node: '>= 0.10'}
+  /@types/tmp@0.2.3:
+    resolution: {integrity: sha512-dDZH/tXzwjutnuk4UacGgFRwV+JSLaXL1ikvidfJprkb7L9Nx1njcRHHmi3Dsvt7pgqqTEeucQuOrWHPFgzVHA==}
     dev: true
 
-  /clone-deep@4.0.1:
-    resolution: {integrity: sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==}
-    engines: {node: '>=6'}
+  /@types/tough-cookie@4.0.2:
+    resolution: {integrity: sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw==}
+
+  /@types/tunnel@0.0.3:
+    resolution: {integrity: sha512-sOUTGn6h1SfQ+gbgqC364jLFBw2lnFqkgF3q0WovEHRLMrVD1sd5aufqi/aJObLekJO+Aq5z646U4Oxy6shXMA==}
     dependencies:
-      is-plain-object: 2.0.4
-      kind-of: 6.0.3
-      shallow-clone: 3.0.1
+      '@types/node': 18.16.16
+    dev: false
+
+  /@types/unist@2.0.6:
+    resolution: {integrity: sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==}
     dev: true
 
-  /clone-stats@1.0.0:
-    resolution: {integrity: sha512-au6ydSpg6nsrigcZ4m8Bc9hxjeW+GJ8xh5G3BJCMt4WXe1H10UNaVOamqQTmrx1kjVuxAHIQSNU6hY4Nsn9/ag==}
+  /@types/unist@3.0.2:
+    resolution: {integrity: sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ==}
     dev: true
 
-  /clone@2.1.2:
-    resolution: {integrity: sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==}
-    engines: {node: '>=0.8'}
+  /@types/utf8@3.0.3:
+    resolution: {integrity: sha512-+lqLGxWZsEe4Z6OrzBI7Ym4SMUTaMS5yOrHZ0/IL0bpIye1Qbs4PpobJL2mLDbftUXlPFZR7fu6d1yM+bHLX1w==}
     dev: true
 
-  /cloneable-readable@1.1.3:
-    resolution: {integrity: sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==}
+  /@types/uuencode@0.0.3:
+    resolution: {integrity: sha512-NaBWHPPQvcXqiSaMAGa2Ea/XaFcK/nHwGe2akwJBXRLkCNa2+izx/F1aKJrzFH+L68D88VLYIATTYP7B2k4zVA==}
     dependencies:
-      inherits: 2.0.4
-      process-nextick-args: 2.0.1
-      readable-stream: 2.3.7
+      '@types/node': 18.16.16
     dev: true
 
-  /cluster-key-slot@1.1.1:
-    resolution: {integrity: sha512-rwHwUfXL40Chm1r08yrhU3qpUvdVlgkKNeyeGPOxnW8/SyVDvgRaed/Uz54AqWNaTCAThlj6QAs3TZcKI0xDEw==}
-    engines: {node: '>=0.10.0'}
+  /@types/uuid@8.3.4:
+    resolution: {integrity: sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw==}
+
+  /@types/uuid@9.0.0:
+    resolution: {integrity: sha512-kr90f+ERiQtKWMz5rP32ltJ/BtULDI5RVO0uavn1HQUOwjx0R1h0rnDYNL0CepF1zL5bSY6FISAfd9tOdDhU5Q==}
     dev: false
 
-  /co@4.6.0:
-    resolution: {integrity: sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==}
-    engines: {iojs: '>= 1.0.0', node: '>= 0.12.0'}
-    dev: true
+  /@types/uuid@9.0.7:
+    resolution: {integrity: sha512-WUtIVRUZ9i5dYXefDEAI7sh9/O7jGvHg7Df/5O/gtH3Yabe5odI3UWopVR1qbPXQtvOxWu3mM4XxlYeZtMWF4g==}
 
-  /code-point-at@1.1.0:
-    resolution: {integrity: sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==}
-    engines: {node: '>=0.10.0'}
+  /@types/validator@13.7.10:
+    resolution: {integrity: sha512-t1yxFAR2n0+VO6hd/FJ9F2uezAZVWHLmpmlJzm1eX03+H7+HsuTAp7L8QJs+2pQCfWkP1+EXsGK9Z9v7o/qPVQ==}
+    dev: false
+
+  /@types/validator@13.7.7:
+    resolution: {integrity: sha512-jiEw2kTUJ8Jsh4A1K4b5Pkjj9Xz6FktLLOQ36ZVLRkmxFbpTvAV2VRoKMojz8UlZxNg/2dZqzpigH4JYn1bkQg==}
     dev: true
 
-  /codemirror-lang-html-n8n@1.0.0:
-    resolution: {integrity: sha512-ofNP6VTDGJ5rue+kTCZlDZdF1PnE0sl2cAkfrsCAd5MlBgDmqTwuFJIkTI6KXOJXs0ucdTYH6QLhy9BSW7EaOQ==}
-    dependencies:
-      '@codemirror/autocomplete': 6.4.0(@codemirror/language@6.2.1)(@codemirror/state@6.1.4)(@codemirror/view@6.5.1)(@lezer/common@1.0.1)
-      '@codemirror/lang-css': 6.0.1(@codemirror/view@6.5.1)(@lezer/common@1.0.1)
-      '@codemirror/lang-javascript': 6.1.2
-      '@codemirror/language': 6.2.1
-      '@codemirror/state': 6.1.4
-      '@codemirror/view': 6.5.1
-      '@lezer/common': 1.0.1
-      '@lezer/css': 1.1.1
-      '@lezer/highlight': 1.1.1
-      '@lezer/html': 1.3.0
-      '@lezer/lr': 1.2.3
+  /@types/web-bluetooth@0.0.16:
+    resolution: {integrity: sha512-oh8q2Zc32S6gd/j50GowEjKLoOVOwHP/bWVjKJInBwQqdOYMdPrf1oVlelTlyfFK3CKxL1uahMDAr+vy8T7yMQ==}
     dev: false
 
-  /codemirror-lang-n8n-expression@0.2.0(@codemirror/state@6.1.4)(@codemirror/view@6.5.1)(@lezer/common@1.0.1):
-    resolution: {integrity: sha512-kdlpzevdCpWcpbNcwES9YZy+rDFwWOdO6Z78SWxT6jMhCPmdHQmO+gJ39aXAXlUI7OGLfOBtg1/ONxPjRpEIYQ==}
-    dependencies:
-      '@codemirror/autocomplete': 6.4.0(@codemirror/language@6.2.1)(@codemirror/state@6.1.4)(@codemirror/view@6.5.1)(@lezer/common@1.0.1)
-      '@codemirror/language': 6.2.1
-      '@lezer/highlight': 1.1.1
-      '@lezer/lr': 1.2.3
-    transitivePeerDependencies:
-      - '@codemirror/state'
-      - '@codemirror/view'
-      - '@lezer/common'
+  /@types/web-bluetooth@0.0.18:
+    resolution: {integrity: sha512-v/ZHEj9xh82usl8LMR3GarzFY1IrbXJw5L4QfQhokjRV91q+SelFqxQWSep1ucXEZ22+dSTwLFkXeur25sPIbw==}
     dev: false
 
-  /codepage@1.15.0:
-    resolution: {integrity: sha512-3g6NUTPd/YtuuGrhMnOMRjFc+LJw/bnMp3+0r/Wcz3IXUuCosKRJvMphm5+Q+bvTVGcJJuRvVLuYba+WojaFaA==}
-    engines: {node: '>=0.8'}
+  /@types/webidl-conversions@7.0.0:
+    resolution: {integrity: sha512-xTE1E+YF4aWPJJeUzaZI5DRntlkY3+BCVJi0axFptnjGmAoWxkyREIh/XMrfxVLejwQxMCfDXdICo0VLxThrog==}
     dev: false
 
-  /collect-v8-coverage@1.0.1:
-    resolution: {integrity: sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==}
-    dev: true
-
-  /collection-map@1.0.0:
-    resolution: {integrity: sha512-5D2XXSpkOnleOI21TG7p3T0bGAsZ/XknZpKBmGYyluO8pw4zA3K8ZlrBIbC4FXg3m6z/RNFiUFfT2sQK01+UHA==}
-    engines: {node: '>=0.10.0'}
+  /@types/websocket@1.0.10:
+    resolution: {integrity: sha512-svjGZvPB7EzuYS94cI7a+qhwgGU1y89wUgjT6E2wVUfmAGIvRfT7obBvRtnhXCSsoMdlG4gBFGE7MfkIXZLoww==}
     dependencies:
-      arr-map: 2.0.2
-      for-own: 1.0.0
-      make-iterator: 1.0.1
-    dev: true
+      '@types/node': 18.16.16
+    dev: false
 
-  /collection-visit@1.0.0:
-    resolution: {integrity: sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==}
-    engines: {node: '>=0.10.0'}
+  /@types/whatwg-url@11.0.4:
+    resolution: {integrity: sha512-lXCmTWSHJvf0TRSO58nm978b8HJ/EdsSsEKLd3ODHFjo+3VGAyyTp4v50nWvwtzBxSMQrVOK7tcuN0zGPLICMw==}
     dependencies:
-      map-visit: 1.0.0
-      object-visit: 1.0.1
-    dev: true
+      '@types/webidl-conversions': 7.0.0
+    dev: false
 
-  /color-convert@1.9.3:
-    resolution: {integrity: sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==}
+  /@types/ws@8.5.4(patch_hash=nbzuqaoyqbrfwipijj5qriqqju):
+    resolution: {integrity: sha512-zdQDHKUgcX/zBc4GrwsE/7dVdAD8JR4EuiAXiiUhhfyIJXXb2+PrGshFyeXWQPMmmZ2XxgaqclgpIC7eTXc1mg==}
     dependencies:
-      color-name: 1.1.3
+      '@types/node': 18.16.16
+    dev: true
+    patched: true
 
-  /color-convert@2.0.1:
-    resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==}
-    engines: {node: '>=7.0.0'}
+  /@types/xml2js@0.4.14:
+    resolution: {integrity: sha512-4YnrRemBShWRO2QjvUin8ESA41rH+9nQGLUGZV/1IDhi3SL9OhdpNC/MrulTWuptXKwhx/aDxE7toV0f/ypIXQ==}
     dependencies:
-      color-name: 1.1.4
+      '@types/node': 18.16.16
+    dev: true
 
-  /color-name@1.1.3:
-    resolution: {integrity: sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==}
+  /@types/yamljs@0.2.31:
+    resolution: {integrity: sha512-QcJ5ZczaXAqbVD3o8mw/mEBhRvO5UAdTtbvgwL/OgoWubvNBh6/MxLBAigtcgIFaq3shon9m3POIxQaLQt4fxQ==}
+    dev: true
 
-  /color-name@1.1.4:
-    resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==}
+  /@types/yargs-parser@21.0.0:
+    resolution: {integrity: sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==}
 
-  /color-string@1.9.1:
-    resolution: {integrity: sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==}
+  /@types/yargs@16.0.9:
+    resolution: {integrity: sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==}
     dependencies:
-      color-name: 1.1.4
-      simple-swizzle: 0.2.2
-    dev: false
-
-  /color-support@1.1.3:
-    resolution: {integrity: sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==}
-    hasBin: true
+      '@types/yargs-parser': 21.0.0
+    dev: true
 
-  /color@3.2.1:
-    resolution: {integrity: sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==}
+  /@types/yargs@17.0.19:
+    resolution: {integrity: sha512-cAx3qamwaYX9R0fzOIZAlFpo4A+1uBVCxqpKz9D26uTF4srRXaGTTsikQmaotCtNdbhzyUH7ft6p9ktz9s6UNQ==}
     dependencies:
-      color-convert: 1.9.3
-      color-string: 1.9.1
-    dev: false
+      '@types/yargs-parser': 21.0.0
 
-  /colorette@2.0.19:
-    resolution: {integrity: sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==}
+  /@types/yauzl@2.10.0:
+    resolution: {integrity: sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==}
+    dependencies:
+      '@types/node': 18.16.16
     dev: true
+    optional: true
 
-  /colors@1.4.0:
-    resolution: {integrity: sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==}
-    engines: {node: '>=0.1.90'}
+  /@types/zen-observable@0.8.3:
+    resolution: {integrity: sha512-fbF6oTd4sGGy0xjHPKAt+eS2CrxJ3+6gQ3FGcBoIJR2TLAyCkCyI8JqZNy+FeON0AhVgNJoUumVoZQjBFUqHkw==}
     dev: false
 
-  /colorspace@1.1.4:
-    resolution: {integrity: sha512-BgvKJiuVu1igBUF2kEjRCZXol6wiiGbY5ipL/oVPwm0BL9sIpMIzM8IK7vwuxIIzOXMV3Ey5w+vxhm0rR/TN8w==}
+  /@typescript-eslint/eslint-plugin@7.2.0(@typescript-eslint/parser@7.2.0)(eslint@8.57.0)(typescript@5.4.2):
+    resolution: {integrity: sha512-mdekAHOqS9UjlmyF/LSs6AIEvfceV749GFxoBAjwAv0nkevfKHWQFDMcBZWUiIC5ft6ePWivXoS36aKQ0Cy3sw==}
+    engines: {node: ^16.0.0 || >=18.0.0}
+    peerDependencies:
+      '@typescript-eslint/parser': ^7.0.0
+      eslint: ^8.56.0
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
     dependencies:
-      color: 3.2.1
-      text-hex: 1.0.0
-    dev: false
+      '@eslint-community/regexpp': 4.6.2
+      '@typescript-eslint/parser': 7.2.0(eslint@8.57.0)(typescript@5.4.2)
+      '@typescript-eslint/scope-manager': 7.2.0
+      '@typescript-eslint/type-utils': 7.2.0(eslint@8.57.0)(typescript@5.4.2)
+      '@typescript-eslint/utils': 7.2.0(eslint@8.57.0)(typescript@5.4.2)
+      '@typescript-eslint/visitor-keys': 7.2.0
+      debug: 4.3.4(supports-color@8.1.1)
+      eslint: 8.57.0
+      graphemer: 1.4.0
+      ignore: 5.2.4
+      natural-compare: 1.4.0
+      semver: 7.6.0
+      ts-api-utils: 1.0.1(typescript@5.4.2)
+      typescript: 5.4.2
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
 
-  /combined-stream@1.0.8:
-    resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==}
-    engines: {node: '>= 0.8'}
+  /@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.4.2):
+    resolution: {integrity: sha512-5FKsVcHTk6TafQKQbuIVkXq58Fnbkd2wDL4LB7AURN7RUOu1utVP+G8+6u3ZhEroW3DF6hyo3ZEXxgKgp4KeCg==}
+    engines: {node: ^16.0.0 || >=18.0.0}
+    peerDependencies:
+      eslint: ^8.56.0
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
     dependencies:
-      delayed-stream: 1.0.0
+      '@typescript-eslint/scope-manager': 7.2.0
+      '@typescript-eslint/types': 7.2.0
+      '@typescript-eslint/typescript-estree': 7.2.0(typescript@5.4.2)
+      '@typescript-eslint/visitor-keys': 7.2.0
+      debug: 4.3.4(supports-color@8.1.1)
+      eslint: 8.57.0
+      typescript: 5.4.2
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
 
-  /commander@2.20.3:
-    resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==}
+  /@typescript-eslint/scope-manager@6.7.5:
+    resolution: {integrity: sha512-GAlk3eQIwWOJeb9F7MKQ6Jbah/vx1zETSDw8likab/eFcqkjSD7BI75SDAeC5N2L0MmConMoPvTsmkrg71+B1A==}
+    engines: {node: ^16.0.0 || >=18.0.0}
+    dependencies:
+      '@typescript-eslint/types': 6.7.5
+      '@typescript-eslint/visitor-keys': 6.7.5
+    dev: true
 
-  /commander@5.1.0:
-    resolution: {integrity: sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==}
-    engines: {node: '>= 6'}
+  /@typescript-eslint/scope-manager@7.2.0:
+    resolution: {integrity: sha512-Qh976RbQM/fYtjx9hs4XkayYujB/aPwglw2choHmf3zBjB4qOywWSdt9+KLRdHubGcoSwBnXUH2sR3hkyaERRg==}
+    engines: {node: ^16.0.0 || >=18.0.0}
+    dependencies:
+      '@typescript-eslint/types': 7.2.0
+      '@typescript-eslint/visitor-keys': 7.2.0
+    dev: true
 
-  /commander@6.2.1:
-    resolution: {integrity: sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==}
-    engines: {node: '>= 6'}
+  /@typescript-eslint/type-utils@7.2.0(eslint@8.57.0)(typescript@5.4.2):
+    resolution: {integrity: sha512-xHi51adBHo9O9330J8GQYQwrKBqbIPJGZZVQTHHmy200hvkLZFWJIFtAG/7IYTWUyun6DE6w5InDReePJYJlJA==}
+    engines: {node: ^16.0.0 || >=18.0.0}
+    peerDependencies:
+      eslint: ^8.56.0
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+    dependencies:
+      '@typescript-eslint/typescript-estree': 7.2.0(typescript@5.4.2)
+      '@typescript-eslint/utils': 7.2.0(eslint@8.57.0)(typescript@5.4.2)
+      debug: 4.3.4(supports-color@8.1.1)
+      eslint: 8.57.0
+      ts-api-utils: 1.0.1(typescript@5.4.2)
+      typescript: 5.4.2
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
 
-  /commander@8.3.0:
-    resolution: {integrity: sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==}
-    engines: {node: '>= 12'}
+  /@typescript-eslint/types@6.7.5:
+    resolution: {integrity: sha512-WboQBlOXtdj1tDFPyIthpKrUb+kZf2VroLZhxKa/VlwLlLyqv/PwUNgL30BlTVZV1Wu4Asu2mMYPqarSO4L5ZQ==}
+    engines: {node: ^16.0.0 || >=18.0.0}
     dev: true
 
-  /commander@9.4.1:
-    resolution: {integrity: sha512-5EEkTNyHNGFPD2H+c/dXXfQZYa/scCKasxWcXJaWnNJ99pnQN9Vnmqow+p+PlFPE63Q6mThaZws1T+HxfpgtPw==}
-    engines: {node: ^12.20.0 || >=14}
+  /@typescript-eslint/types@7.2.0:
+    resolution: {integrity: sha512-XFtUHPI/abFhm4cbCDc5Ykc8npOKBSJePY3a3s+lwumt7XWJuzP5cZcfZ610MIPHjQjNsOLlYK8ASPaNG8UiyA==}
+    engines: {node: ^16.0.0 || >=18.0.0}
+    dev: true
 
-  /commist@1.1.0:
-    resolution: {integrity: sha512-rraC8NXWOEjhADbZe9QBNzLAN5Q3fsTPQtBV+fEVj6xKIgDgNiEVE6ZNfHpZOqfQ21YUzfVNUXLOEZquYvQPPg==}
+  /@typescript-eslint/typescript-estree@6.7.5(typescript@5.4.2):
+    resolution: {integrity: sha512-NhJiJ4KdtwBIxrKl0BqG1Ur+uw7FiOnOThcYx9DpOGJ/Abc9z2xNzLeirCG02Ig3vkvrc2qFLmYSSsaITbKjlg==}
+    engines: {node: ^16.0.0 || >=18.0.0}
+    peerDependencies:
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
     dependencies:
-      leven: 2.1.0
-      minimist: 1.2.7
-    dev: false
+      '@typescript-eslint/types': 6.7.5
+      '@typescript-eslint/visitor-keys': 6.7.5
+      debug: 4.3.4(supports-color@8.1.1)
+      globby: 11.1.0
+      is-glob: 4.0.3
+      semver: 7.6.0
+      ts-api-utils: 1.0.1(typescript@5.4.2)
+      typescript: 5.4.2
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
 
-  /common-tags@1.8.2:
-    resolution: {integrity: sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==}
-    engines: {node: '>=4.0.0'}
+  /@typescript-eslint/typescript-estree@7.2.0(typescript@5.4.2):
+    resolution: {integrity: sha512-cyxS5WQQCoBwSakpMrvMXuMDEbhOo9bNHHrNcEWis6XHx6KF518tkF1wBvKIn/tpq5ZpUYK7Bdklu8qY0MsFIA==}
+    engines: {node: ^16.0.0 || >=18.0.0}
+    peerDependencies:
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+    dependencies:
+      '@typescript-eslint/types': 7.2.0
+      '@typescript-eslint/visitor-keys': 7.2.0
+      debug: 4.3.4(supports-color@8.1.1)
+      globby: 11.1.0
+      is-glob: 4.0.3
+      minimatch: 9.0.3
+      semver: 7.6.0
+      ts-api-utils: 1.0.1(typescript@5.4.2)
+      typescript: 5.4.2
+    transitivePeerDependencies:
+      - supports-color
     dev: true
 
-  /commondir@1.0.1:
-    resolution: {integrity: sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==}
+  /@typescript-eslint/utils@6.7.5(eslint@8.57.0)(typescript@5.4.2):
+    resolution: {integrity: sha512-pfRRrH20thJbzPPlPc4j0UNGvH1PjPlhlCMq4Yx7EGjV7lvEeGX0U6MJYe8+SyFutWgSHsdbJ3BXzZccYggezA==}
+    engines: {node: ^16.0.0 || >=18.0.0}
+    peerDependencies:
+      eslint: ^7.0.0 || ^8.0.0
+    dependencies:
+      '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0)
+      '@types/json-schema': 7.0.15
+      '@types/semver': 7.5.0
+      '@typescript-eslint/scope-manager': 6.7.5
+      '@typescript-eslint/types': 6.7.5
+      '@typescript-eslint/typescript-estree': 6.7.5(typescript@5.4.2)
+      eslint: 8.57.0
+      semver: 7.6.0
+    transitivePeerDependencies:
+      - supports-color
+      - typescript
     dev: true
 
-  /component-emitter@1.3.0:
-    resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
+  /@typescript-eslint/utils@7.2.0(eslint@8.57.0)(typescript@5.4.2):
+    resolution: {integrity: sha512-YfHpnMAGb1Eekpm3XRK8hcMwGLGsnT6L+7b2XyRv6ouDuJU1tZir1GS2i0+VXRatMwSI1/UfcyPe53ADkU+IuA==}
+    engines: {node: ^16.0.0 || >=18.0.0}
+    peerDependencies:
+      eslint: ^8.56.0
+    dependencies:
+      '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0)
+      '@types/json-schema': 7.0.15
+      '@types/semver': 7.5.0
+      '@typescript-eslint/scope-manager': 7.2.0
+      '@typescript-eslint/types': 7.2.0
+      '@typescript-eslint/typescript-estree': 7.2.0(typescript@5.4.2)
+      eslint: 8.57.0
+      semver: 7.6.0
+    transitivePeerDependencies:
+      - supports-color
+      - typescript
     dev: true
 
-  /component-props@1.1.1:
-    resolution: {integrity: sha512-69pIRJs9fCCHRqCz3390YF2LV1Lu6iEMZ5zuVqqUn+G20V9BNXlMs0cWawWeW9g4Ynmg29JmkG6R7/lUJoGd1Q==}
-    dev: false
+  /@typescript-eslint/visitor-keys@6.7.5:
+    resolution: {integrity: sha512-3MaWdDZtLlsexZzDSdQWsFQ9l9nL8B80Z4fImSpyllFC/KLqWQRdEcB+gGGO+N3Q2uL40EsG66wZLsohPxNXvg==}
+    engines: {node: ^16.0.0 || >=18.0.0}
+    dependencies:
+      '@typescript-eslint/types': 6.7.5
+      eslint-visitor-keys: 3.4.3
+    dev: true
 
-  /component-type@1.2.1:
-    resolution: {integrity: sha512-Kgy+2+Uwr75vAi6ChWXgHuLvd+QLD7ssgpaRq2zCvt80ptvAfMc/hijcJxXkBa2wMlEZcJvC2H8Ubo+A9ATHIg==}
-    dev: false
+  /@typescript-eslint/visitor-keys@7.2.0:
+    resolution: {integrity: sha512-c6EIQRHhcpl6+tO8EMR+kjkkV+ugUNXOmeASA1rlzkd8EPIriavpWoiEz1HR/VLhbVIdhqnV6E7JZm00cBDx2A==}
+    engines: {node: ^16.0.0 || >=18.0.0}
+    dependencies:
+      '@typescript-eslint/types': 7.2.0
+      eslint-visitor-keys: 3.4.3
+    dev: true
 
-  /component-xor@0.0.4:
-    resolution: {integrity: sha512-ZIt6sla8gfo+AFVRZoZOertcnD5LJaY2T9CKE2j13NJxQt/mUafD69Bl7/Y4AnpI2LGjiXH7cOfJDx/n2G9edA==}
-    dev: false
+  /@ungap/structured-clone@1.2.0:
+    resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==}
+    dev: true
 
-  /compressible@2.0.18:
-    resolution: {integrity: sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==}
-    engines: {node: '>= 0.6'}
+  /@vitejs/plugin-vue@5.0.4(vite@5.1.6)(vue@3.4.21):
+    resolution: {integrity: sha512-WS3hevEszI6CEVEx28F8RjTX97k3KsrcY6kvTg7+Whm5y3oYvcqzVeGCU3hxSAn4uY2CLCkeokkGKpoctccilQ==}
+    engines: {node: ^18.0.0 || >=20.0.0}
+    peerDependencies:
+      vite: ^5.0.0
+      vue: ^3.2.25
     dependencies:
-      mime-db: 1.52.0
+      vite: 5.1.6(sass@1.64.1)
+      vue: 3.4.21(typescript@5.4.2)
+    dev: true
 
-  /compression@1.7.4:
-    resolution: {integrity: sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==}
-    engines: {node: '>= 0.8.0'}
+  /@vitest/coverage-v8@1.2.1(vitest@1.3.1):
+    resolution: {integrity: sha512-fJEhKaDwGMZtJUX7BRcGxooGwg1Hl0qt53mVup/ZJeznhvL5EodteVnb/mcByhEcvVWbK83ZF31c7nPEDi4LOQ==}
+    peerDependencies:
+      vitest: ^1.0.0
     dependencies:
-      accepts: 1.3.8
-      bytes: 3.0.0
-      compressible: 2.0.18
-      debug: 2.6.9
-      on-headers: 1.0.2
-      safe-buffer: 5.1.2
-      vary: 1.1.2
+      '@ampproject/remapping': 2.2.1
+      '@bcoe/v8-coverage': 0.2.3
+      debug: 4.3.4(supports-color@8.1.1)
+      istanbul-lib-coverage: 3.2.2
+      istanbul-lib-report: 3.0.1
+      istanbul-lib-source-maps: 4.0.1
+      istanbul-reports: 3.1.6
+      magic-string: 0.30.5
+      magicast: 0.3.3
+      picocolors: 1.0.0
+      std-env: 3.6.0
+      test-exclude: 6.0.0
+      v8-to-istanbul: 9.2.0
+      vitest: 1.3.1
     transitivePeerDependencies:
       - supports-color
+    dev: true
 
-  /compute-gcd@1.2.1:
-    resolution: {integrity: sha512-TwMbxBNz0l71+8Sc4czv13h4kEqnchV9igQZBi6QUaz09dnz13juGnnaWWJTRsP3brxOoxeB4SA2WELLw1hCtg==}
+  /@vitest/expect@1.1.3:
+    resolution: {integrity: sha512-MnJqsKc1Ko04lksF9XoRJza0bGGwTtqfbyrsYv5on4rcEkdo+QgUdITenBQBUltKzdxW7K3rWh+nXRULwsdaVg==}
     dependencies:
-      validate.io-array: 1.0.6
-      validate.io-function: 1.0.2
-      validate.io-integer-array: 1.0.0
-    dev: false
+      '@vitest/spy': 1.1.3
+      '@vitest/utils': 1.1.3
+      chai: 4.3.10
+    dev: true
 
-  /compute-lcm@1.1.2:
-    resolution: {integrity: sha512-OFNPdQAXnQhDSKioX8/XYT6sdUlXwpeMjfd6ApxMJfyZ4GxmLR1xvMERctlYhlHwIiz6CSpBc2+qYKjHGZw4TQ==}
+  /@vitest/expect@1.3.1:
+    resolution: {integrity: sha512-xofQFwIzfdmLLlHa6ag0dPV8YsnKOCP1KdAeVVh34vSjN2dcUiXYCD9htu/9eM7t8Xln4v03U9HLxLpPlsXdZw==}
     dependencies:
-      compute-gcd: 1.2.1
-      validate.io-array: 1.0.6
-      validate.io-function: 1.0.2
-      validate.io-integer-array: 1.0.0
-    dev: false
-
-  /concat-map@0.0.1:
-    resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}
+      '@vitest/spy': 1.3.1
+      '@vitest/utils': 1.3.1
+      chai: 4.3.10
+    dev: true
 
-  /concat-stream@1.6.2:
-    resolution: {integrity: sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==}
-    engines: {'0': node >= 0.8}
+  /@vitest/runner@1.3.1:
+    resolution: {integrity: sha512-5FzF9c3jG/z5bgCnjr8j9LNq/9OxV2uEBAITOXfoe3rdZJTdO7jzThth7FXv/6b+kdY65tpRQB7WaKhNZwX+Kg==}
     dependencies:
-      buffer-from: 1.1.2
-      inherits: 2.0.4
-      readable-stream: 2.3.7
-      typedarray: 0.0.6
+      '@vitest/utils': 1.3.1
+      p-limit: 5.0.0
+      pathe: 1.1.1
+    dev: true
 
-  /concat-stream@2.0.0:
-    resolution: {integrity: sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==}
-    engines: {'0': node >= 6.0}
+  /@vitest/snapshot@1.3.1:
+    resolution: {integrity: sha512-EF++BZbt6RZmOlE3SuTPu/NfwBF6q4ABS37HHXzs2LUVPBLx2QoY/K0fKpRChSo8eLiuxcbCVfqKgx/dplCDuQ==}
     dependencies:
-      buffer-from: 1.1.2
-      inherits: 2.0.4
-      readable-stream: 3.6.0
-      typedarray: 0.0.6
-    dev: false
+      magic-string: 0.30.8
+      pathe: 1.1.1
+      pretty-format: 29.7.0
+    dev: true
 
-  /concurrently@5.3.0:
-    resolution: {integrity: sha512-8MhqOB6PWlBfA2vJ8a0bSFKATOdWlHiQlk11IfmQBPaHVP8oP2gsh2MObE6UR3hqDHqvaIvLTyceNW6obVuFHQ==}
-    engines: {node: '>=6.0.0'}
-    hasBin: true
+  /@vitest/spy@1.1.3:
+    resolution: {integrity: sha512-Ec0qWyGS5LhATFQtldvChPTAHv08yHIOZfiNcjwRQbFPHpkih0md9KAbs7TfeIfL7OFKoe7B/6ukBTqByubXkQ==}
     dependencies:
-      chalk: 2.4.2
-      date-fns: 2.29.3
-      lodash: 4.17.21
-      read-pkg: 4.0.1
-      rxjs: 6.6.7
-      spawn-command: 0.0.2-1
-      supports-color: 6.1.0
-      tree-kill: 1.2.2
-      yargs: 13.3.2
+      tinyspy: 2.2.0
     dev: true
 
-  /condense-newlines@0.2.1:
-    resolution: {integrity: sha512-P7X+QL9Hb9B/c8HI5BFFKmjgBu2XpQuF98WZ9XkO+dBGgk5XgwiQz7o1SmpglNWId3581UcS0SFAWfoIhMHPfg==}
-    engines: {node: '>=0.10.0'}
+  /@vitest/spy@1.3.1:
+    resolution: {integrity: sha512-xAcW+S099ylC9VLU7eZfdT9myV67Nor9w9zhf0mGCYJSO+zM2839tOeROTdikOi/8Qeusffvxb/MyBSOja1Uig==}
     dependencies:
-      extend-shallow: 2.0.1
-      is-whitespace: 0.3.0
-      kind-of: 3.2.2
+      tinyspy: 2.2.0
     dev: true
 
-  /config-chain@1.1.13:
-    resolution: {integrity: sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==}
+  /@vitest/utils@0.34.7:
+    resolution: {integrity: sha512-ziAavQLpCYS9sLOorGrFFKmy2gnfiNU0ZJ15TsMz/K92NAPS/rp9K4z6AJQQk5Y8adCy4Iwpxy7pQumQ/psnRg==}
     dependencies:
-      ini: 1.3.8
-      proto-list: 1.2.4
+      diff-sequences: 29.6.3
+      loupe: 2.3.7
+      pretty-format: 29.7.0
     dev: true
 
-  /confusing-browser-globals@1.0.11:
-    resolution: {integrity: sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==}
+  /@vitest/utils@1.1.3:
+    resolution: {integrity: sha512-Dyt3UMcdElTll2H75vhxfpZu03uFpXRCHxWnzcrFjZxT1kTbq8ALUYIeBgGolo1gldVdI0YSlQRacsqxTwNqwg==}
+    dependencies:
+      diff-sequences: 29.6.3
+      estree-walker: 3.0.3
+      loupe: 2.3.7
+      pretty-format: 29.7.0
     dev: true
 
-  /connect-history-api-fallback@1.6.0:
-    resolution: {integrity: sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==}
-    engines: {node: '>=0.8'}
-    dev: false
-
-  /console-browserify@1.1.0:
-    resolution: {integrity: sha512-duS7VP5pvfsNLDvL1O4VOEbw37AI3A4ZUQYemvDlnpGrNu9tprR7BYWpDYwC0Xia0Zxz5ZupdiIrUp0GH1aXfg==}
+  /@vitest/utils@1.3.1:
+    resolution: {integrity: sha512-d3Waie/299qqRyHTm2DjADeTaNdNSVsnwHPWrs20JMpjh6eiVq7ggggweO8rc4arhf6rRkWuHKwvxGvejUXZZQ==}
     dependencies:
-      date-now: 0.1.4
+      diff-sequences: 29.6.3
+      estree-walker: 3.0.3
+      loupe: 2.3.7
+      pretty-format: 29.7.0
     dev: true
 
-  /console-control-strings@1.1.0:
-    resolution: {integrity: sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==}
-
-  /consolidate@0.15.1(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==}
-    engines: {node: '>= 0.10.0'}
-    peerDependencies:
-      arc-templates: ^0.5.3
-      atpl: '>=0.7.6'
-      babel-core: ^6.26.3
-      bracket-template: ^1.1.5
-      coffee-script: ^1.12.7
-      dot: ^1.1.3
-      dust: ^0.3.0
-      dustjs-helpers: ^1.7.4
-      dustjs-linkedin: ^2.7.5
-      eco: ^1.1.0-rc-3
-      ect: ^0.5.9
-      ejs: ^3.1.5
-      haml-coffee: ^1.14.1
-      hamlet: ^0.3.3
-      hamljs: ^0.6.2
-      handlebars: ^4.7.6
-      hogan.js: ^3.0.2
-      htmling: ^0.0.8
-      jade: ^1.11.0
-      jazz: ^0.0.18
-      jqtpl: ~1.1.0
-      just: ^0.1.8
-      liquid-node: ^3.0.1
-      liquor: ^0.0.5
-      lodash: ^4.17.20
-      marko: ^3.14.4
-      mote: ^0.2.0
-      mustache: ^3.0.0
-      nunjucks: ^3.2.2
-      plates: ~0.4.11
-      pug: ^3.0.0
-      qejs: ^3.0.5
-      ractive: ^1.3.12
-      razor-tmpl: ^1.3.1
-      react: ^16.13.1
-      react-dom: ^16.13.1
-      slm: ^2.0.0
-      squirrelly: ^5.1.0
-      swig: ^1.4.2
-      swig-templates: ^2.0.3
-      teacup: ^2.0.0
-      templayed: '>=0.2.3'
-      then-jade: '*'
-      then-pug: '*'
-      tinyliquid: ^0.2.34
-      toffee: ^0.3.6
-      twig: ^1.15.2
-      twing: ^5.0.2
-      underscore: ^1.11.0
-      vash: ^0.13.0
-      velocityjs: ^2.0.1
-      walrus: ^0.10.1
-      whiskers: ^0.4.0
-    peerDependenciesMeta:
-      arc-templates:
-        optional: true
-      atpl:
-        optional: true
-      babel-core:
-        optional: true
-      bracket-template:
-        optional: true
-      coffee-script:
-        optional: true
-      dot:
-        optional: true
-      dust:
-        optional: true
-      dustjs-helpers:
-        optional: true
-      dustjs-linkedin:
-        optional: true
-      eco:
-        optional: true
-      ect:
-        optional: true
-      ejs:
-        optional: true
-      haml-coffee:
-        optional: true
-      hamlet:
-        optional: true
-      hamljs:
-        optional: true
-      handlebars:
-        optional: true
-      hogan.js:
-        optional: true
-      htmling:
-        optional: true
-      jade:
-        optional: true
-      jazz:
-        optional: true
-      jqtpl:
-        optional: true
-      just:
-        optional: true
-      liquid-node:
-        optional: true
-      liquor:
-        optional: true
-      lodash:
-        optional: true
-      marko:
-        optional: true
-      mote:
-        optional: true
-      mustache:
-        optional: true
-      nunjucks:
-        optional: true
-      plates:
-        optional: true
-      pug:
-        optional: true
-      qejs:
-        optional: true
-      ractive:
-        optional: true
-      razor-tmpl:
-        optional: true
-      react:
-        optional: true
-      react-dom:
-        optional: true
-      slm:
-        optional: true
-      squirrelly:
-        optional: true
-      swig:
-        optional: true
-      swig-templates:
-        optional: true
-      teacup:
-        optional: true
-      templayed:
-        optional: true
-      then-jade:
-        optional: true
-      then-pug:
-        optional: true
-      tinyliquid:
-        optional: true
-      toffee:
-        optional: true
-      twig:
-        optional: true
-      twing:
-        optional: true
-      underscore:
-        optional: true
-      vash:
-        optional: true
-      velocityjs:
-        optional: true
-      walrus:
-        optional: true
-      whiskers:
-        optional: true
+  /@volar/language-core@1.11.1:
+    resolution: {integrity: sha512-dOcNn3i9GgZAcJt43wuaEykSluAuOkQgzni1cuxLxTV0nJKanQztp7FxyswdRILaKH+P2XZMPRp2S4MV/pElCw==}
     dependencies:
-      bluebird: 3.7.2
-      react: 17.0.2
-      react-dom: 18.2.0(react@17.0.2)
+      '@volar/source-map': 1.11.1
     dev: true
 
-  /constant-case@3.0.4:
-    resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
+  /@volar/language-core@2.1.2:
+    resolution: {integrity: sha512-5qsDp0Gf6fE09UWCeK7bkVn6NxMwC9OqFWQkMMkeej8h8XjyABPdRygC2RCrqDrfVdGijqlMQeXs6yRS+vfZYA==}
     dependencies:
-      no-case: 3.0.4
-      tslib: 2.5.0
-      upper-case: 2.0.2
-    dev: false
+      '@volar/source-map': 2.1.2
+    dev: true
 
-  /constantinople@4.0.1:
-    resolution: {integrity: sha512-vCrqcSIq4//Gx74TXXCGnHpulY1dskqLTFGDmhrGxzeXL8lF8kvXv6mpNWlJj1uD4DW23D4ljAqbY4RRaaUZIw==}
+  /@volar/source-map@1.11.1:
+    resolution: {integrity: sha512-hJnOnwZ4+WT5iupLRnuzbULZ42L7BWWPMmruzwtLhJfpDVoZLjNBxHDi2sY2bgZXCKlpU5XcsMFoYrsQmPhfZg==}
     dependencies:
-      '@babel/parser': 7.21.5
-      '@babel/types': 7.21.5
+      muggle-string: 0.3.1
     dev: true
 
-  /content-disposition@0.5.4:
-    resolution: {integrity: sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==}
-    engines: {node: '>= 0.6'}
+  /@volar/source-map@2.1.2:
+    resolution: {integrity: sha512-yFJqsuLm1OaWrsz9E3yd3bJcYIlHqdZ8MbmIoZLrAzMYQDcoF26/INIhgziEXSdyHc8xd7rd/tJdSnUyh0gH4Q==}
     dependencies:
-      safe-buffer: 5.2.1
-
-  /content-type@1.0.4:
-    resolution: {integrity: sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==}
-    engines: {node: '>= 0.6'}
-
-  /convert-source-map@1.9.0:
-    resolution: {integrity: sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==}
+      muggle-string: 0.4.1
     dev: true
 
-  /convert-source-map@2.0.0:
-    resolution: {integrity: sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==}
+  /@volar/typescript@1.11.1:
+    resolution: {integrity: sha512-iU+t2mas/4lYierSnoFOeRFQUhAEMgsFuQxoxvwn5EdQopw43j+J27a4lt9LMInx1gLJBC6qL14WYGlgymaSMQ==}
+    dependencies:
+      '@volar/language-core': 1.11.1
+      path-browserify: 1.0.1
     dev: true
 
-  /convict@6.2.4:
-    resolution: {integrity: sha512-qN60BAwdMVdofckX7AlohVJ2x9UvjTNoKVXCL2LxFk1l7757EJqf1nySdMkPQer0bt8kQ5lQiyZ9/2NvrFBuwQ==}
-    engines: {node: '>=6'}
+  /@volar/typescript@2.1.2:
+    resolution: {integrity: sha512-lhTancZqamvaLvoz0u/uth8dpudENNt2LFZOWCw9JZiX14xRFhdhfzmphiCRb7am9E6qAJSbdS/gMt1utXAoHQ==}
     dependencies:
-      lodash.clonedeep: 4.5.0
-      yargs-parser: 20.2.9
-    dev: false
+      '@volar/language-core': 2.1.2
+      path-browserify: 1.0.1
+    dev: true
 
-  /cookie-parser@1.4.6:
-    resolution: {integrity: sha512-z3IzaNjdwUC2olLIB5/ITd0/setiaFMLYiZJle7xg5Fe9KWAceil7xszYfHHBtDFYLSgJduS2Ty0P1uJdPDJeA==}
-    engines: {node: '>= 0.8.0'}
+  /@vue/compiler-core@3.4.21:
+    resolution: {integrity: sha512-MjXawxZf2SbZszLPYxaFCjxfibYrzr3eYbKxwpLR9EQN+oaziSu3qKVbwBERj1IFIB8OLUewxB5m/BFzi613og==}
     dependencies:
-      cookie: 0.4.1
-      cookie-signature: 1.0.6
-    dev: false
+      '@babel/parser': 7.24.0
+      '@vue/shared': 3.4.21
+      entities: 4.5.0
+      estree-walker: 2.0.2
+      source-map-js: 1.0.2
 
-  /cookie-signature@1.0.6:
-    resolution: {integrity: sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==}
+  /@vue/compiler-dom@3.4.21:
+    resolution: {integrity: sha512-IZC6FKowtT1sl0CR5DpXSiEB5ayw75oT2bma1BEhV7RRR1+cfwLrxc2Z8Zq/RGFzJ8w5r9QtCOvTjQgdn0IKmA==}
+    dependencies:
+      '@vue/compiler-core': 3.4.21
+      '@vue/shared': 3.4.21
 
-  /cookie@0.4.1:
-    resolution: {integrity: sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==}
-    engines: {node: '>= 0.6'}
-    dev: false
+  /@vue/compiler-sfc@3.4.21:
+    resolution: {integrity: sha512-me7epoTxYlY+2CUM7hy9PCDdpMPfIwrOvAXud2Upk10g4YLv9UBW7kL798TvMeDhPthkZ0CONNrK2GoeI1ODiQ==}
+    dependencies:
+      '@babel/parser': 7.24.0
+      '@vue/compiler-core': 3.4.21
+      '@vue/compiler-dom': 3.4.21
+      '@vue/compiler-ssr': 3.4.21
+      '@vue/shared': 3.4.21
+      estree-walker: 2.0.2
+      magic-string: 0.30.8
+      postcss: 8.4.35
+      source-map-js: 1.0.2
 
-  /cookie@0.4.2:
-    resolution: {integrity: sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==}
-    engines: {node: '>= 0.6'}
+  /@vue/compiler-ssr@3.4.21:
+    resolution: {integrity: sha512-M5+9nI2lPpAsgXOGQobnIueVqc9sisBFexh5yMIMRAPYLa7+5wEJs8iqOZc1WAa9WQbx9GR2twgznU8LTIiZ4Q==}
+    dependencies:
+      '@vue/compiler-dom': 3.4.21
+      '@vue/shared': 3.4.21
 
-  /cookie@0.5.0:
-    resolution: {integrity: sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==}
-    engines: {node: '>= 0.6'}
+  /@vue/devtools-api@6.4.5:
+    resolution: {integrity: sha512-JD5fcdIuFxU4fQyXUu3w2KpAJHzTVdN+p4iOX2lMWSHMOoQdMAcpFLZzm9Z/2nmsoZ1a96QEhZ26e50xLBsgOQ==}
+    dev: false
 
-  /cookiejar@2.1.4:
-    resolution: {integrity: sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw==}
-    dev: true
+  /@vue/devtools-api@6.5.0:
+    resolution: {integrity: sha512-o9KfBeaBmCKl10usN4crU53fYtC1r7jJwdGKjPT24t348rHxgfpZ0xL3Xm/gLUYnc0oTp8LAmrxOeLyu6tbk2Q==}
 
-  /copy-descriptor@0.1.1:
-    resolution: {integrity: sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==}
-    engines: {node: '>=0.10.0'}
+  /@vue/eslint-config-prettier@9.0.0(@types/eslint@8.56.5)(eslint@8.57.0)(prettier@3.2.5):
+    resolution: {integrity: sha512-z1ZIAAUS9pKzo/ANEfd2sO+v2IUalz7cM/cTLOZ7vRFOPk5/xuRKQteOu1DErFLAh/lYGXMVZ0IfYKlyInuDVg==}
+    peerDependencies:
+      eslint: '>= 8.0.0'
+      prettier: ^3.2.5
+    dependencies:
+      eslint: 8.57.0
+      eslint-config-prettier: 9.1.0(eslint@8.57.0)
+      eslint-plugin-prettier: 5.1.3(@types/eslint@8.56.5)(eslint-config-prettier@9.1.0)(eslint@8.57.0)(prettier@3.2.5)
+      prettier: 3.2.5
+    transitivePeerDependencies:
+      - '@types/eslint'
     dev: true
 
-  /copy-props@2.0.5:
-    resolution: {integrity: sha512-XBlx8HSqrT0ObQwmSzM7WE5k8FxTV75h1DX1Z3n6NhQ/UYYAvInWYmG06vFt7hQZArE2fuO62aihiWIVQwh1sw==}
+  /@vue/eslint-config-typescript@13.0.0(eslint-plugin-vue@9.23.0)(eslint@8.57.0)(typescript@5.4.2):
+    resolution: {integrity: sha512-MHh9SncG/sfqjVqjcuFLOLD6Ed4dRAis4HNt0dXASeAuLqIAx4YMB1/m2o4pUKK1vCt8fUvYG8KKX2Ot3BVZTg==}
+    engines: {node: ^18.18.0 || >=20.0.0}
+    peerDependencies:
+      eslint: ^8.56.0
+      eslint-plugin-vue: ^9.0.0
+      typescript: ^5.4.2
+    peerDependenciesMeta:
+      typescript:
+        optional: true
     dependencies:
-      each-props: 1.3.2
-      is-plain-object: 5.0.0
+      '@typescript-eslint/eslint-plugin': 7.2.0(@typescript-eslint/parser@7.2.0)(eslint@8.57.0)(typescript@5.4.2)
+      '@typescript-eslint/parser': 7.2.0(eslint@8.57.0)(typescript@5.4.2)
+      eslint: 8.57.0
+      eslint-plugin-vue: 9.23.0(eslint@8.57.0)
+      typescript: 5.4.2
+      vue-eslint-parser: 9.4.2(eslint@8.57.0)
+    transitivePeerDependencies:
+      - supports-color
     dev: true
 
-  /copy-to-clipboard@3.3.3:
-    resolution: {integrity: sha512-2KV8NhB5JqC3ky0r9PMCAZKbUHSwtEo4CwCs0KXgruG43gX5PMqDEBbVU4OUzw2MuAWUfsuFmWvEKG5QRfSnJA==}
+  /@vue/language-core@1.8.27(typescript@5.4.2):
+    resolution: {integrity: sha512-L8Kc27VdQserNaCUNiSFdDl9LWT24ly8Hpwf1ECy3aFb9m6bDhBGQYOujDm21N7EW3moKIOKEanQwe1q5BK+mA==}
+    peerDependencies:
+      typescript: ^5.4.2
+    peerDependenciesMeta:
+      typescript:
+        optional: true
     dependencies:
-      toggle-selection: 1.0.6
-    dev: false
-
-  /copy-to@2.0.1:
-    resolution: {integrity: sha512-3DdaFaU/Zf1AnpLiFDeNCD4TOWe3Zl2RZaTzUvWiIk5ERzcCodOE20Vqq4fzCbNoHURFHT4/us/Lfq+S2zyY4w==}
-    dev: false
+      '@volar/language-core': 1.11.1
+      '@volar/source-map': 1.11.1
+      '@vue/compiler-dom': 3.4.21
+      '@vue/shared': 3.4.21
+      computeds: 0.0.1
+      minimatch: 9.0.3
+      muggle-string: 0.3.1
+      path-browserify: 1.0.1
+      typescript: 5.4.2
+      vue-template-compiler: 2.7.14
+    dev: true
 
-  /core-js-compat@3.27.1:
-    resolution: {integrity: sha512-Dg91JFeCDA17FKnneN7oCMz4BkQ4TcffkgHP4OWwp9yx3pi7ubqMDXXSacfNak1PQqjc95skyt+YBLHQJnkJwA==}
+  /@vue/language-core@2.0.6(typescript@5.4.2):
+    resolution: {integrity: sha512-UzqU12tzf9XLqRO3TiWPwRNpP4fyUzE6MAfOQWQNZ4jy6a30ARRUpmODDKq6O8C4goMc2AlPqTmjOHPjHkilSg==}
+    peerDependencies:
+      typescript: ^5.4.2
+    peerDependenciesMeta:
+      typescript:
+        optional: true
     dependencies:
-      browserslist: 4.21.4
+      '@volar/language-core': 2.1.2
+      '@vue/compiler-dom': 3.4.21
+      '@vue/shared': 3.4.21
+      computeds: 0.0.1
+      minimatch: 9.0.3
+      path-browserify: 1.0.1
+      typescript: 5.4.2
+      vue-template-compiler: 2.7.14
     dev: true
 
-  /core-js-pure@3.27.1:
-    resolution: {integrity: sha512-BS2NHgwwUppfeoqOXqi08mUqS5FiZpuRuJJpKsaME7kJz0xxuk0xkhDdfMIlP/zLa80krBqss1LtD7f889heAw==}
-    dev: true
+  /@vue/reactivity@3.4.21:
+    resolution: {integrity: sha512-UhenImdc0L0/4ahGCyEzc/pZNwVgcglGy9HVzJ1Bq2Mm9qXOpP8RyNTjookw/gOCUlXSEtuZ2fUg5nrHcoqJcw==}
+    dependencies:
+      '@vue/shared': 3.4.21
 
-  /core-js@2.6.12:
-    resolution: {integrity: sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==}
-    deprecated: core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.
-    dev: false
+  /@vue/runtime-core@3.4.21:
+    resolution: {integrity: sha512-pQthsuYzE1XcGZznTKn73G0s14eCJcjaLvp3/DKeYWoFacD9glJoqlNBxt3W2c5S40t6CCcpPf+jG01N3ULyrA==}
+    dependencies:
+      '@vue/reactivity': 3.4.21
+      '@vue/shared': 3.4.21
 
-  /core-js@3.27.2:
-    resolution: {integrity: sha512-9ashVQskuh5AZEZ1JdQWp1GqSoC1e1G87MzRqg2gIfVAQ7Qn9K+uFj8EcniUFA4P2NLZfV+TOlX1SzoKfo+s7w==}
+  /@vue/runtime-dom@3.4.21:
+    resolution: {integrity: sha512-gvf+C9cFpevsQxbkRBS1NpU8CqxKw0ebqMvLwcGQrNpx6gqRDodqKqA+A2VZZpQ9RpK2f9yfg8VbW/EpdFUOJw==}
+    dependencies:
+      '@vue/runtime-core': 3.4.21
+      '@vue/shared': 3.4.21
+      csstype: 3.1.3
 
-  /core-util-is@1.0.2:
-    resolution: {integrity: sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==}
+  /@vue/server-renderer@3.4.21(vue@3.4.21):
+    resolution: {integrity: sha512-aV1gXyKSN6Rz+6kZ6kr5+Ll14YzmIbeuWe7ryJl5muJ4uwSwY/aStXTixx76TwkZFJLm1aAlA/HSWEJ4EyiMkg==}
+    peerDependencies:
+      vue: 3.4.21
+    dependencies:
+      '@vue/compiler-ssr': 3.4.21
+      '@vue/shared': 3.4.21
+      vue: 3.4.21(typescript@5.4.2)
 
-  /core-util-is@1.0.3:
-    resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==}
+  /@vue/shared@3.4.21:
+    resolution: {integrity: sha512-PuJe7vDIi6VYSinuEbUIQgMIRZGgM8e4R+G+/dQTk0X1NEdvgvvgv7m+rfmDH1gZzyA1OjjoWskvHlfRNfQf3g==}
 
-  /cors@2.8.5:
-    resolution: {integrity: sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==}
-    engines: {node: '>= 0.10'}
+  /@vue/test-utils@2.4.3(vue@3.4.21):
+    resolution: {integrity: sha512-F4K7mF+ad++VlTrxMJVRnenKSJmO6fkQt2wpRDiKDesQMkfpniGWsqEi/JevxGBo2qEkwwjvTUAoiGJLNx++CA==}
+    peerDependencies:
+      '@vue/server-renderer': ^3.0.1
+      vue: ^3.0.1
+    peerDependenciesMeta:
+      '@vue/server-renderer':
+        optional: true
     dependencies:
-      object-assign: 4.1.1
-      vary: 1.1.2
-    dev: false
+      js-beautify: 1.14.9
+      vue: 3.4.21(typescript@5.4.2)
+      vue-component-type-helpers: 1.8.25
+    dev: true
 
-  /cosmiconfig@6.0.0:
-    resolution: {integrity: sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==}
-    engines: {node: '>=8'}
-    dependencies:
-      '@types/parse-json': 4.0.0
-      import-fresh: 3.3.0
-      parse-json: 5.2.0
-      path-type: 4.0.0
-      yaml: 1.10.2
+  /@vue/tsconfig@0.5.1:
+    resolution: {integrity: sha512-VcZK7MvpjuTPx2w6blwnwZAu5/LgBUtejFOi3pPGQFXQN5Ela03FUtd2Qtg4yWGGissVL0dr6Ro1LfOFh+PCuQ==}
     dev: true
 
-  /cosmiconfig@7.1.0:
-    resolution: {integrity: sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==}
-    engines: {node: '>=10'}
+  /@vueuse/components@10.5.0(vue@3.4.21):
+    resolution: {integrity: sha512-zWQZ8zkNBvX++VHfyiUaQ4otb+4PWI8679GR8FvdrNnj+01LXnqvrkyKd8yTCMJ9nHqwRRTJikS5fu4Zspn9DQ==}
     dependencies:
-      '@types/parse-json': 4.0.0
-      import-fresh: 3.3.0
-      parse-json: 5.2.0
-      path-type: 4.0.0
-      yaml: 1.10.2
-    dev: true
+      '@vueuse/core': 10.5.0(vue@3.4.21)
+      '@vueuse/shared': 10.5.0(vue@3.4.21)
+      vue-demi: 0.14.6(vue@3.4.21)
+    transitivePeerDependencies:
+      - '@vue/composition-api'
+      - vue
+    dev: false
 
-  /cpu-features@0.0.4:
-    resolution: {integrity: sha512-fKiZ/zp1mUwQbnzb9IghXtHtDoTMtNeb8oYGx6kX2SYfhnG0HNdBEBIzB9b5KlXu5DQPhfy3mInbBxFcgwAr3A==}
-    engines: {node: '>=10.0.0'}
+  /@vueuse/core@10.5.0(vue@3.4.21):
+    resolution: {integrity: sha512-z/tI2eSvxwLRjOhDm0h/SXAjNm8N5ld6/SC/JQs6o6kpJ6Ya50LnEL8g5hoYu005i28L0zqB5L5yAl8Jl26K3A==}
     dependencies:
-      buildcheck: 0.0.3
-      nan: 2.17.0
+      '@types/web-bluetooth': 0.0.18
+      '@vueuse/metadata': 10.5.0
+      '@vueuse/shared': 10.5.0(vue@3.4.21)
+      vue-demi: 0.14.6(vue@3.4.21)
+    transitivePeerDependencies:
+      - '@vue/composition-api'
+      - vue
     dev: false
-    optional: true
 
-  /crc-32@1.2.2:
-    resolution: {integrity: sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==}
-    engines: {node: '>=0.8'}
-    hasBin: true
+  /@vueuse/core@9.13.0(vue@3.4.21):
+    resolution: {integrity: sha512-pujnclbeHWxxPRqXWmdkKV5OX4Wk4YeK7wusHqRwU0Q7EFusHoqNA/aPhB6KCh9hEqJkLAJo7bb0Lh9b+OIVzw==}
+    dependencies:
+      '@types/web-bluetooth': 0.0.16
+      '@vueuse/metadata': 9.13.0
+      '@vueuse/shared': 9.13.0(vue@3.4.21)
+      vue-demi: 0.14.5(vue@3.4.21)
+    transitivePeerDependencies:
+      - '@vue/composition-api'
+      - vue
     dev: false
 
-  /create-require@1.1.1:
-    resolution: {integrity: sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==}
+  /@vueuse/metadata@10.5.0:
+    resolution: {integrity: sha512-fEbElR+MaIYyCkeM0SzWkdoMtOpIwO72x8WsZHRE7IggiOlILttqttM69AS13nrDxosnDBYdyy3C5mR1LCxHsw==}
+    dev: false
 
-  /crelt@1.0.5:
-    resolution: {integrity: sha512-+BO9wPPi+DWTDcNYhr/W90myha8ptzftZT+LwcmUbbok0rcP/fequmFYCw8NMoH7pkAZQzU78b3kYrlua5a9eA==}
+  /@vueuse/metadata@9.13.0:
+    resolution: {integrity: sha512-gdU7TKNAUVlXXLbaF+ZCfte8BjRJQWPCa2J55+7/h+yDtzw3vOoGQDRXzI6pyKyo6bXFT5/QoPE4hAknExjRLQ==}
     dev: false
 
-  /cron-parser@2.18.0:
-    resolution: {integrity: sha512-s4odpheTyydAbTBQepsqd2rNWGa2iV3cyo8g7zbI2QQYGLVsfbhmwukayS1XHppe02Oy1fg7mg6xoaraVJeEcg==}
-    engines: {node: '>=0.8'}
+  /@vueuse/shared@10.5.0(vue@3.4.21):
+    resolution: {integrity: sha512-18iyxbbHYLst9MqU1X1QNdMHIjks6wC7XTVf0KNOv5es/Ms6gjVFCAAWTVP2JStuGqydg3DT+ExpFORUEi9yhg==}
     dependencies:
-      is-nan: 1.3.2
-      moment-timezone: 0.5.37
+      vue-demi: 0.14.6(vue@3.4.21)
+    transitivePeerDependencies:
+      - '@vue/composition-api'
+      - vue
     dev: false
 
-  /cron-parser@4.7.0:
-    resolution: {integrity: sha512-BdAELR+MCT2ZWsIBhZKDuUqIUCBjHHulPJnm53OfdRLA4EWBjva3R+KM5NeidJuGsNXdEcZkjC7SCnkW5rAFSA==}
-    engines: {node: '>=12.0.0'}
+  /@vueuse/shared@9.13.0(vue@3.4.21):
+    resolution: {integrity: sha512-UrnhU+Cnufu4S6JLCPZnkWh0WwZGUp72ktOF2DFptMlOs3TOdVv8xJN53zhHGARmVOsz5KqOls09+J1NR6sBKw==}
     dependencies:
-      luxon: 3.3.0
+      vue-demi: 0.14.5(vue@3.4.21)
+    transitivePeerDependencies:
+      - '@vue/composition-api'
+      - vue
     dev: false
 
-  /cron@1.7.2:
-    resolution: {integrity: sha512-+SaJ2OfeRvfQqwXQ2kgr0Y5pzBR/lijf5OpnnaruwWnmI799JfWr2jN2ItOV9s3A/+TFOt6mxvKzQq5F0Jp6VQ==}
+  /@webassemblyjs/ast@1.11.1:
+    resolution: {integrity: sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==}
     dependencies:
-      moment-timezone: 0.5.37
-    dev: false
+      '@webassemblyjs/helper-numbers': 1.11.1
+      '@webassemblyjs/helper-wasm-bytecode': 1.11.1
+    dev: true
 
-  /cross-env@7.0.3:
-    resolution: {integrity: sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==}
-    engines: {node: '>=10.14', npm: '>=6', yarn: '>=1'}
-    hasBin: true
+  /@webassemblyjs/floating-point-hex-parser@1.11.1:
+    resolution: {integrity: sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==}
+    dev: true
+
+  /@webassemblyjs/helper-api-error@1.11.1:
+    resolution: {integrity: sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==}
+    dev: true
+
+  /@webassemblyjs/helper-buffer@1.11.1:
+    resolution: {integrity: sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==}
+    dev: true
+
+  /@webassemblyjs/helper-numbers@1.11.1:
+    resolution: {integrity: sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==}
     dependencies:
-      cross-spawn: 7.0.3
+      '@webassemblyjs/floating-point-hex-parser': 1.11.1
+      '@webassemblyjs/helper-api-error': 1.11.1
+      '@xtuc/long': 4.2.2
     dev: true
 
-  /cross-spawn@4.0.2:
-    resolution: {integrity: sha512-yAXz/pA1tD8Gtg2S98Ekf/sewp3Lcp3YoFKJ4Hkp5h5yLWnKVTDU0kwjKJ8NDCYcfTLfyGkzTikst+jWypT1iA==}
+  /@webassemblyjs/helper-wasm-bytecode@1.11.1:
+    resolution: {integrity: sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==}
+    dev: true
+
+  /@webassemblyjs/helper-wasm-section@1.11.1:
+    resolution: {integrity: sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==}
     dependencies:
-      lru-cache: 4.1.5
-      which: 1.3.1
-    dev: false
+      '@webassemblyjs/ast': 1.11.1
+      '@webassemblyjs/helper-buffer': 1.11.1
+      '@webassemblyjs/helper-wasm-bytecode': 1.11.1
+      '@webassemblyjs/wasm-gen': 1.11.1
+    dev: true
 
-  /cross-spawn@6.0.5:
-    resolution: {integrity: sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==}
-    engines: {node: '>=4.8'}
+  /@webassemblyjs/ieee754@1.11.1:
+    resolution: {integrity: sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==}
     dependencies:
-      nice-try: 1.0.5
-      path-key: 2.0.1
-      semver: 5.7.1
-      shebang-command: 1.2.0
-      which: 1.3.1
+      '@xtuc/ieee754': 1.2.0
+    dev: true
 
-  /cross-spawn@7.0.3:
-    resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==}
-    engines: {node: '>= 8'}
+  /@webassemblyjs/leb128@1.11.1:
+    resolution: {integrity: sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==}
     dependencies:
-      path-key: 3.1.1
-      shebang-command: 2.0.0
-      which: 2.0.2
+      '@xtuc/long': 4.2.2
     dev: true
 
-  /crypt@0.0.2:
-    resolution: {integrity: sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==}
-    dev: false
+  /@webassemblyjs/utf8@1.11.1:
+    resolution: {integrity: sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==}
+    dev: true
 
-  /crypto-js@4.1.1:
-    resolution: {integrity: sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==}
-    dev: false
+  /@webassemblyjs/wasm-edit@1.11.1:
+    resolution: {integrity: sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==}
+    dependencies:
+      '@webassemblyjs/ast': 1.11.1
+      '@webassemblyjs/helper-buffer': 1.11.1
+      '@webassemblyjs/helper-wasm-bytecode': 1.11.1
+      '@webassemblyjs/helper-wasm-section': 1.11.1
+      '@webassemblyjs/wasm-gen': 1.11.1
+      '@webassemblyjs/wasm-opt': 1.11.1
+      '@webassemblyjs/wasm-parser': 1.11.1
+      '@webassemblyjs/wast-printer': 1.11.1
+    dev: true
 
-  /crypto-random-string@2.0.0:
-    resolution: {integrity: sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==}
-    engines: {node: '>=8'}
+  /@webassemblyjs/wasm-gen@1.11.1:
+    resolution: {integrity: sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==}
+    dependencies:
+      '@webassemblyjs/ast': 1.11.1
+      '@webassemblyjs/helper-wasm-bytecode': 1.11.1
+      '@webassemblyjs/ieee754': 1.11.1
+      '@webassemblyjs/leb128': 1.11.1
+      '@webassemblyjs/utf8': 1.11.1
     dev: true
 
-  /csrf@3.1.0:
-    resolution: {integrity: sha512-uTqEnCvWRk042asU6JtapDTcJeeailFy4ydOQS28bj1hcLnYRiqi8SsD2jS412AY1I/4qdOwWZun774iqywf9w==}
-    engines: {node: '>= 0.8'}
+  /@webassemblyjs/wasm-opt@1.11.1:
+    resolution: {integrity: sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==}
     dependencies:
-      rndm: 1.2.0
-      tsscmp: 1.0.6
-      uid-safe: 2.1.5
-    dev: false
+      '@webassemblyjs/ast': 1.11.1
+      '@webassemblyjs/helper-buffer': 1.11.1
+      '@webassemblyjs/wasm-gen': 1.11.1
+      '@webassemblyjs/wasm-parser': 1.11.1
+    dev: true
 
-  /css-loader@3.6.0(webpack@5.75.0):
-    resolution: {integrity: sha512-M5lSukoWi1If8dhQAUCvj4H8vUt3vOnwbQBH9DdTm/s4Ym2B/3dPMtYZeJmq7Q3S3Pa+I94DcZ7pc9bP14cWIQ==}
-    engines: {node: '>= 8.9.0'}
-    peerDependencies:
-      webpack: ^4.0.0 || ^5.0.0
+  /@webassemblyjs/wasm-parser@1.11.1:
+    resolution: {integrity: sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==}
     dependencies:
-      camelcase: 5.3.1
-      cssesc: 3.0.0
-      icss-utils: 4.1.1
-      loader-utils: 1.4.2
-      normalize-path: 3.0.0
-      postcss: 7.0.39
-      postcss-modules-extract-imports: 2.0.0
-      postcss-modules-local-by-default: 3.0.3
-      postcss-modules-scope: 2.2.0
-      postcss-modules-values: 3.0.0
-      postcss-value-parser: 4.2.0
-      schema-utils: 2.7.1
-      semver: 6.3.0
-      webpack: 5.75.0(esbuild@0.16.17)
+      '@webassemblyjs/ast': 1.11.1
+      '@webassemblyjs/helper-api-error': 1.11.1
+      '@webassemblyjs/helper-wasm-bytecode': 1.11.1
+      '@webassemblyjs/ieee754': 1.11.1
+      '@webassemblyjs/leb128': 1.11.1
+      '@webassemblyjs/utf8': 1.11.1
     dev: true
 
-  /css-loader@6.7.3(webpack@5.75.0):
-    resolution: {integrity: sha512-qhOH1KlBMnZP8FzRO6YCH9UHXQhVMcEGLyNdb7Hv2cpcmJbW0YrddO+tG1ab5nT41KpHIYGsbeHqxB9xPu1pKQ==}
-    engines: {node: '>= 12.13.0'}
-    peerDependencies:
-      webpack: ^5.0.0
+  /@webassemblyjs/wast-printer@1.11.1:
+    resolution: {integrity: sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==}
     dependencies:
-      icss-utils: 5.1.0(postcss@8.4.21)
-      postcss: 8.4.21
-      postcss-modules-extract-imports: 3.0.0(postcss@8.4.21)
-      postcss-modules-local-by-default: 4.0.0(postcss@8.4.21)
-      postcss-modules-scope: 3.0.0(postcss@8.4.21)
-      postcss-modules-values: 4.0.0(postcss@8.4.21)
-      postcss-value-parser: 4.2.0
-      semver: 7.3.8
-      webpack: 5.75.0(esbuild@0.16.17)
+      '@webassemblyjs/ast': 1.11.1
+      '@xtuc/long': 4.2.2
     dev: true
 
-  /css-select@4.3.0:
-    resolution: {integrity: sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==}
+  /@xata.io/client@0.28.0(typescript@5.4.2):
+    resolution: {integrity: sha512-V6rpx+9C6uYdGUDUvk5xIot19zRvDEQhkHXWGIkKY/SCKu4w68S81Z88tgGLRaknSFjpAm7H/rvGBR2DrDpqtQ==}
+    peerDependencies:
+      typescript: ^5.4.2
     dependencies:
-      boolbase: 1.0.0
-      css-what: 6.1.0
-      domhandler: 4.3.1
-      domutils: 2.8.0
-      nth-check: 2.1.1
+      typescript: 5.4.2
+    dev: false
 
-  /css-what@6.1.0:
-    resolution: {integrity: sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==}
-    engines: {node: '>= 6'}
+  /@xmldom/xmldom@0.8.6:
+    resolution: {integrity: sha512-uRjjusqpoqfmRkTaNuLJ2VohVr67Q5YwDATW3VU7PfzTj6IRaihGrYI7zckGZjxQPBIp63nfvJbM+Yu5ICh0Bg==}
+    engines: {node: '>=10.0.0'}
+    dev: false
 
-  /css.escape@1.5.1:
-    resolution: {integrity: sha512-YUifsXXuknHlUsmlgyY0PKzgPOr7/FjCePfHNt0jxm83wHZi44VDMQ7/fGNkjY3/jV1MC+1CmZbaHzugyeRtpg==}
+  /@xtuc/ieee754@1.2.0:
+    resolution: {integrity: sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==}
     dev: true
 
-  /cssesc@3.0.0:
-    resolution: {integrity: sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==}
-    engines: {node: '>=4'}
-    hasBin: true
+  /@xtuc/long@4.2.2:
+    resolution: {integrity: sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==}
     dev: true
 
-  /cssfilter@0.0.10:
-    resolution: {integrity: sha512-FAaLDaplstoRsDR8XGYH51znUN0UY7nMc6Z9/fvE8EXGwvJE9hu7W2vHwx1+bd6gCYnln9nLbzxFTrcO9YQDZw==}
-    dev: false
-
-  /cssom@0.3.8:
-    resolution: {integrity: sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==}
+  /@yarnpkg/esbuild-plugin-pnp@3.0.0-rc.15(esbuild@0.19.8):
+    resolution: {integrity: sha512-kYzDJO5CA9sy+on/s2aIW0411AklfCi8Ck/4QDivOqsMKpStZA2SsR+X27VTggGwpStWaLrjJcDcdDMowtG8MA==}
+    engines: {node: '>=14.15.0'}
+    peerDependencies:
+      esbuild: '>=0.10.0'
+    dependencies:
+      esbuild: 0.19.8
+      tslib: 2.6.2
     dev: true
 
-  /cssom@0.5.0:
-    resolution: {integrity: sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==}
+  /@yarnpkg/fslib@2.10.3:
+    resolution: {integrity: sha512-41H+Ga78xT9sHvWLlFOZLIhtU6mTGZ20pZ29EiZa97vnxdohJD2AF42rCoAoWfqUz486xY6fhjMH+DYEM9r14A==}
+    engines: {node: '>=12 <14 || 14.2 - 14.9 || >14.10.0'}
+    dependencies:
+      '@yarnpkg/libzip': 2.3.0
+      tslib: 2.6.2
     dev: true
 
-  /cssstyle@2.3.0:
-    resolution: {integrity: sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==}
-    engines: {node: '>=8'}
+  /@yarnpkg/libzip@2.3.0:
+    resolution: {integrity: sha512-6xm38yGVIa6mKm/DUCF2zFFJhERh/QWp1ufm4cNUvxsONBmfPg8uZ9pZBdOmF6qFGr/HlT6ABBkCSx/dlEtvWg==}
+    engines: {node: '>=12 <14 || 14.2 - 14.9 || >14.10.0'}
     dependencies:
-      cssom: 0.3.8
+      '@types/emscripten': 1.39.7
+      tslib: 2.6.2
     dev: true
 
-  /csstype@3.1.1:
-    resolution: {integrity: sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==}
-
-  /curlconverter@3.21.0(chokidar@3.5.2):
-    resolution: {integrity: sha512-DXCnp1A/Xa69FujksUfdvWQFAnIn/C+4Wuv8t+UVdZkF/lY5bzj98GGKOGme7V/ckSHDLxE29Xp76sJ5Cpsp5A==}
-    hasBin: true
-    dependencies:
-      '@curlconverter/yargs': 0.0.2
-      cookie: 0.4.2
-      jsesc: 3.0.2
-      nunjucks: 3.2.3(chokidar@3.5.2)
-      query-string: 7.1.1
-      string.prototype.startswith: 1.0.0
-      yamljs: 0.3.0
-    transitivePeerDependencies:
-      - chokidar
+  /a-sync-waterfall@1.0.1:
+    resolution: {integrity: sha512-RYTOHHdWipFUliRFMCS4X2Yn2X8M87V/OpSqWzKKOGhzqyUxzyVmhHDH9sAvG+ZuQf/TAOFsLCpMw09I1ufUnA==}
     dev: false
 
-  /currency-codes@2.1.0:
-    resolution: {integrity: sha512-aASwFNP8VjZ0y0PWlSW7c9N/isYTLxK6OCbm7aVuQMk7dWO2zgup9KGiFQgeL9OGL5P/ulvCHcjQizmuEeZXtw==}
+  /abab@2.0.6:
+    resolution: {integrity: sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==}
+    dev: true
+
+  /abbrev@1.1.1:
+    resolution: {integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==}
+
+  /abort-controller@3.0.0:
+    resolution: {integrity: sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==}
+    engines: {node: '>=6.5'}
     dependencies:
-      first-match: 0.0.1
-      nub: 0.0.0
+      event-target-shim: 5.0.1
     dev: false
 
-  /cypress-real-events@1.7.6(cypress@12.8.1):
-    resolution: {integrity: sha512-yP6GnRrbm6HK5q4DH6Nnupz37nOfZu/xn1xFYqsE2o4G73giPWQOdu6375QYpwfU1cvHNCgyD2bQ2hPH9D7NMw==}
-    peerDependencies:
-      cypress: ^4.x || ^5.x || ^6.x || ^7.x || ^8.x || ^9.x || ^10.x || ^11.x || ^12.x
+  /accepts@1.3.8:
+    resolution: {integrity: sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==}
+    engines: {node: '>= 0.6'}
     dependencies:
-      cypress: 12.8.1
-    dev: true
+      mime-types: 2.1.35
+      negotiator: 0.6.3
 
-  /cypress@12.8.1:
-    resolution: {integrity: sha512-lIFbKdaSYAOarNLHNFa2aPZu6YSF+8UY4VRXMxJrFUnk6RvfG0AWsZ7/qle/aIz30TNUD4aOihz2ZgS4vuQVSA==}
-    engines: {node: ^14.0.0 || ^16.0.0 || >=18.0.0}
-    hasBin: true
+  /acorn-globals@7.0.1:
+    resolution: {integrity: sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==}
     dependencies:
-      '@cypress/request': 2.88.10
-      '@cypress/xvfb': 1.2.4(supports-color@8.1.1)
-      '@types/node': 16.18.12
-      '@types/sinonjs__fake-timers': 8.1.1
-      '@types/sizzle': 2.3.3
-      arch: 2.2.0
-      blob-util: 2.0.2
-      bluebird: 3.7.2
-      buffer: 5.7.1
-      cachedir: 2.3.0
-      chalk: 4.1.2
-      check-more-types: 2.24.0
-      cli-cursor: 3.1.0
-      cli-table3: 0.6.3
-      commander: 5.1.0
-      common-tags: 1.8.2
-      dayjs: 1.11.6
-      debug: 4.3.4(supports-color@8.1.1)
-      enquirer: 2.3.6
-      eventemitter2: 6.4.7
-      execa: 4.1.0
-      executable: 4.1.1
-      extract-zip: 2.0.1(supports-color@8.1.1)
-      figures: 3.2.0
-      fs-extra: 9.1.0
-      getos: 3.2.1
-      is-ci: 3.0.1
-      is-installed-globally: 0.4.0
-      lazy-ass: 1.6.0
-      listr2: 3.14.0(enquirer@2.3.6)
-      lodash: 4.17.21
-      log-symbols: 4.1.0
-      minimist: 1.2.7
-      ospath: 1.2.2
-      pretty-bytes: 5.6.0
-      proxy-from-env: 1.0.0
-      request-progress: 3.0.0
-      semver: 7.3.8
-      supports-color: 8.1.1
-      tmp: 0.2.1
-      untildify: 4.0.0
-      yauzl: 2.10.0
+      acorn: 8.11.2
+      acorn-walk: 8.3.2
     dev: true
 
-  /d@1.0.1:
-    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+  /acorn-import-assertions@1.8.0(acorn@8.11.2):
+    resolution: {integrity: sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==}
+    peerDependencies:
+      acorn: ^8
     dependencies:
-      es5-ext: 0.10.62
-      type: 1.2.0
+      acorn: 8.11.2
     dev: true
 
-  /dashdash@1.14.1:
-    resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
-    engines: {node: '>=0.10'}
+  /acorn-jsx@5.3.2(acorn@8.11.2):
+    resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
+    peerDependencies:
+      acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
     dependencies:
-      assert-plus: 1.0.0
+      acorn: 8.11.2
 
-  /data-uri-to-buffer@3.0.1:
-    resolution: {integrity: sha512-WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og==}
-    engines: {node: '>= 6'}
+  /acorn-walk@8.2.0:
+    resolution: {integrity: sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==}
+    engines: {node: '>=0.4.0'}
     dev: false
 
-  /data-urls@3.0.2:
-    resolution: {integrity: sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==}
-    engines: {node: '>=12'}
-    dependencies:
-      abab: 2.0.6
-      whatwg-mimetype: 3.0.0
-      whatwg-url: 11.0.0
+  /acorn-walk@8.3.2:
+    resolution: {integrity: sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==}
+    engines: {node: '>=0.4.0'}
     dev: true
 
-  /date-fns@2.29.3:
-    resolution: {integrity: sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA==}
-    engines: {node: '>=0.11'}
-
-  /date-now@0.1.4:
-    resolution: {integrity: sha512-AsElvov3LoNB7tf5k37H2jYSB+ZZPMT5sG2QjJCcdlV5chIv6htBUBUui2IKRjgtKAKtCBN7Zbwa+MtwLjSeNw==}
+  /acorn@7.4.1:
+    resolution: {integrity: sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==}
+    engines: {node: '>=0.4.0'}
+    hasBin: true
     dev: true
 
-  /dateformat@3.0.3:
-    resolution: {integrity: sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==}
-    dev: false
+  /acorn@8.11.2:
+    resolution: {integrity: sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==}
+    engines: {node: '>=0.4.0'}
+    hasBin: true
 
-  /dayjs@1.11.6:
-    resolution: {integrity: sha512-zZbY5giJAinCG+7AGaw0wIhNZ6J8AhWuSXKvuc1KAyMiRsvGQWqh4L+MomvhdAYjN+lqvVCMq1I41e3YHvXkyQ==}
+  /address@1.2.2:
+    resolution: {integrity: sha512-4B/qKCfeE/ODUaAUpSwfzazo5x29WD4r3vXiWsB7I2mSDAihwEqKO+g8GELZUQSSAo5e1XTYh3ZVfLyxBc12nA==}
+    engines: {node: '>= 10.0.0'}
     dev: true
 
-  /de-indent@1.0.2:
-    resolution: {integrity: sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==}
+  /adm-zip@0.5.10:
+    resolution: {integrity: sha512-x0HvcHqVJNTPk/Bw8JbLWlWoo6Wwnsug0fnYYro1HBrjxZ3G7/AZk7Ahv8JwDe1uIcz8eBqvu86FuF1POiG7vQ==}
+    engines: {node: '>=6.0'}
+    dev: false
 
-  /debug@2.6.9:
-    resolution: {integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==}
-    peerDependencies:
-      supports-color: '*'
-    peerDependenciesMeta:
-      supports-color:
-        optional: true
+  /agent-base@6.0.2:
+    resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==}
+    engines: {node: '>= 6.0.0'}
     dependencies:
-      ms: 2.0.0
+      debug: 4.3.4(supports-color@8.1.1)
+    transitivePeerDependencies:
+      - supports-color
 
-  /debug@3.2.7(supports-color@5.5.0):
-    resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==}
-    peerDependencies:
-      supports-color: '*'
-    peerDependenciesMeta:
-      supports-color:
-        optional: true
+  /agent-base@7.1.0:
+    resolution: {integrity: sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==}
+    engines: {node: '>= 14'}
     dependencies:
-      ms: 2.1.3
-      supports-color: 5.5.0
+      debug: 4.3.4(supports-color@8.1.1)
+    transitivePeerDependencies:
+      - supports-color
 
-  /debug@3.2.7(supports-color@8.1.1):
-    resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==}
-    peerDependencies:
-      supports-color: '*'
-    peerDependenciesMeta:
-      supports-color:
-        optional: true
+  /agentkeepalive@4.2.1:
+    resolution: {integrity: sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==}
+    engines: {node: '>= 8.0.0'}
     dependencies:
-      ms: 2.1.3
-      supports-color: 8.1.1
-    dev: true
+      debug: 4.3.4(supports-color@8.1.1)
+      depd: 1.1.2
+      humanize-ms: 1.2.1
+    transitivePeerDependencies:
+      - supports-color
+    dev: false
 
-  /debug@4.3.2:
-    resolution: {integrity: sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==}
-    engines: {node: '>=6.0'}
+  /aggregate-error@3.1.0:
+    resolution: {integrity: sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==}
+    engines: {node: '>=8'}
+    dependencies:
+      clean-stack: 2.2.0
+      indent-string: 4.0.0
+
+  /ajv-draft-04@1.0.0(ajv@8.11.0):
+    resolution: {integrity: sha512-mv00Te6nmYbRp5DCwclxtt7yV/joXJPGS7nM+97GdxvuttCOfgI3K4U25zboyeX0O+myI8ERluxQe5wljMmVIw==}
     peerDependencies:
-      supports-color: '*'
+      ajv: ^8.5.0
     peerDependenciesMeta:
-      supports-color:
+      ajv:
         optional: true
     dependencies:
-      ms: 2.1.2
+      ajv: 8.11.0
+    dev: false
 
-  /debug@4.3.4(supports-color@8.1.1):
-    resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==}
-    engines: {node: '>=6.0'}
+  /ajv-draft-04@1.0.0(ajv@8.12.0):
+    resolution: {integrity: sha512-mv00Te6nmYbRp5DCwclxtt7yV/joXJPGS7nM+97GdxvuttCOfgI3K4U25zboyeX0O+myI8ERluxQe5wljMmVIw==}
     peerDependencies:
-      supports-color: '*'
+      ajv: ^8.5.0
     peerDependenciesMeta:
-      supports-color:
+      ajv:
         optional: true
     dependencies:
-      ms: 2.1.2
-      supports-color: 8.1.1
-
-  /debuglog@1.0.1:
-    resolution: {integrity: sha512-syBZ+rnAK3EgMsH2aYEOLUW7mZSY9Gb+0wUMCFsZvcmiz+HigA0LOcq/HoQqVuGG+EKykunc7QG2bzrponfaSw==}
+      ajv: 8.12.0
     dev: false
 
-  /decamelize@1.2.0:
-    resolution: {integrity: sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==}
-    engines: {node: '>=0.10.0'}
-
-  /decimal.js@10.4.3:
-    resolution: {integrity: sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==}
-    dev: true
-
-  /decode-uri-component@0.2.2:
-    resolution: {integrity: sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==}
-    engines: {node: '>=0.10'}
+  /ajv-formats@2.1.1(ajv@8.11.0):
+    resolution: {integrity: sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==}
+    peerDependencies:
+      ajv: ^8.0.0
+    peerDependenciesMeta:
+      ajv:
+        optional: true
+    dependencies:
+      ajv: 8.11.0
+    dev: false
 
-  /dedent@0.7.0:
-    resolution: {integrity: sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==}
-    dev: true
+  /ajv-formats@2.1.1(ajv@8.12.0):
+    resolution: {integrity: sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==}
+    peerDependencies:
+      ajv: ^8.0.0
+    peerDependenciesMeta:
+      ajv:
+        optional: true
+    dependencies:
+      ajv: 8.12.0
+    dev: false
 
-  /deep-eql@4.1.3:
-    resolution: {integrity: sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==}
-    engines: {node: '>=6'}
+  /ajv-keywords@3.5.2(ajv@6.12.6):
+    resolution: {integrity: sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==}
+    peerDependencies:
+      ajv: ^6.9.1
     dependencies:
-      type-detect: 4.0.8
+      ajv: 6.12.6
     dev: true
 
-  /deep-equal@2.2.0:
-    resolution: {integrity: sha512-RdpzE0Hv4lhowpIUKKMJfeH6C1pXdtT1/it80ubgWqwI3qpuxUBpC1S4hnHg+zjnuOoDkzUtUCEEkG+XG5l3Mw==}
+  /ajv@6.12.6:
+    resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==}
     dependencies:
-      call-bind: 1.0.2
-      es-get-iterator: 1.1.3
-      get-intrinsic: 1.1.3
-      is-arguments: 1.1.1
-      is-array-buffer: 3.0.1
-      is-date-object: 1.0.5
-      is-regex: 1.1.4
-      is-shared-array-buffer: 1.0.2
-      isarray: 2.0.5
-      object-is: 1.1.5
-      object-keys: 1.1.1
-      object.assign: 4.1.4
-      regexp.prototype.flags: 1.4.3
-      side-channel: 1.0.4
-      which-boxed-primitive: 1.0.2
-      which-collection: 1.0.1
-      which-typed-array: 1.1.9
-
-  /deep-is@0.1.4:
-    resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
+      fast-deep-equal: 3.1.3
+      fast-json-stable-stringify: 2.1.0
+      json-schema-traverse: 0.4.1
+      uri-js: 4.4.1
 
-  /deepmerge@1.5.2:
-    resolution: {integrity: sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ==}
-    engines: {node: '>=0.10.0'}
+  /ajv@8.11.0:
+    resolution: {integrity: sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==}
+    dependencies:
+      fast-deep-equal: 3.1.3
+      json-schema-traverse: 1.0.0
+      require-from-string: 2.0.2
+      uri-js: 4.4.1
     dev: false
 
-  /deepmerge@4.2.2:
-    resolution: {integrity: sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==}
-    engines: {node: '>=0.10.0'}
-
-  /default-browser-id@3.0.0:
-    resolution: {integrity: sha512-OZ1y3y0SqSICtE8DE4S8YOE9UZOJ8wO16fKWVP5J1Qz42kV9jcnMVFrEE/noXb/ss3Q4pZIH79kxofzyNNtUNA==}
-    engines: {node: '>=12'}
+  /ajv@8.12.0:
+    resolution: {integrity: sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==}
     dependencies:
-      bplist-parser: 0.2.0
-      untildify: 4.0.0
-    dev: true
+      fast-deep-equal: 3.1.3
+      json-schema-traverse: 1.0.0
+      require-from-string: 2.0.2
+      uri-js: 4.4.1
+    dev: false
 
-  /default-compare@1.0.0:
-    resolution: {integrity: sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==}
-    engines: {node: '>=0.10.0'}
+  /amqplib@0.10.3:
+    resolution: {integrity: sha512-UHmuSa7n8vVW/a5HGh2nFPqAEr8+cD4dEZ6u9GjP91nHfr1a54RyAKyra7Sb5NH7NBKOUlyQSMXIp0qAixKexw==}
+    engines: {node: '>=10'}
     dependencies:
-      kind-of: 5.1.0
-    dev: true
+      '@acuminous/bitsyntax': 0.1.2
+      buffer-more-ints: 1.0.0
+      readable-stream: 1.1.14
+      url-parse: 1.5.10
+    transitivePeerDependencies:
+      - supports-color
+    dev: false
 
-  /default-resolution@2.0.0:
-    resolution: {integrity: sha512-2xaP6GiwVwOEbXCGoJ4ufgC76m8cj805jrghScewJC2ZDsb9U0b4BIrba+xt/Uytyd0HvQ6+WymSRTfnYj59GQ==}
-    engines: {node: '>= 0.10'}
+  /ansi-colors@4.1.3:
+    resolution: {integrity: sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==}
+    engines: {node: '>=6'}
     dev: true
 
-  /default-user-agent@1.0.0:
-    resolution: {integrity: sha512-bDF7bg6OSNcSwFWPu4zYKpVkJZQYVrAANMYB8bc9Szem1D0yKdm4sa/rOCs2aC9+2GMqQ7KnwtZRvDhmLF0dXw==}
-    engines: {node: '>= 0.10.0'}
+  /ansi-escapes@4.3.2:
+    resolution: {integrity: sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==}
+    engines: {node: '>=8'}
     dependencies:
-      os-name: 1.0.3
-    dev: false
+      type-fest: 0.21.3
 
-  /define-lazy-prop@2.0.0:
-    resolution: {integrity: sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==}
+  /ansi-regex@5.0.1:
+    resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==}
     engines: {node: '>=8'}
 
-  /define-properties@1.1.4:
-    resolution: {integrity: sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      has-property-descriptors: 1.0.0
-      object-keys: 1.1.1
+  /ansi-regex@6.0.1:
+    resolution: {integrity: sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==}
+    engines: {node: '>=12'}
 
-  /define-property@0.2.5:
-    resolution: {integrity: sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==}
-    engines: {node: '>=0.10.0'}
+  /ansi-styles@3.2.1:
+    resolution: {integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==}
+    engines: {node: '>=4'}
     dependencies:
-      is-descriptor: 0.1.6
-    dev: true
+      color-convert: 1.9.3
 
-  /define-property@1.0.0:
-    resolution: {integrity: sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==}
-    engines: {node: '>=0.10.0'}
+  /ansi-styles@4.3.0:
+    resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==}
+    engines: {node: '>=8'}
     dependencies:
-      is-descriptor: 1.0.2
-    dev: true
+      color-convert: 2.0.1
 
-  /define-property@2.0.2:
-    resolution: {integrity: sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      is-descriptor: 1.0.2
-      isobject: 3.0.1
-    dev: true
+  /ansi-styles@5.2.0:
+    resolution: {integrity: sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==}
+    engines: {node: '>=10'}
 
-  /defu@6.1.2:
-    resolution: {integrity: sha512-+uO4+qr7msjNNWKYPHqN/3+Dx3NFkmIzayk2L1MyZQlvgZb/J1A0fo410dpKrN2SnqFjt8n4JL8fDJE0wIgjFQ==}
-    dev: true
+  /ansi-styles@6.2.1:
+    resolution: {integrity: sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==}
+    engines: {node: '>=12'}
 
-  /degenerator@3.0.2:
-    resolution: {integrity: sha512-c0mef3SNQo56t6urUU6tdQAs+ThoD0o9B9MJ8HEt7NQcGEILCRFqQb7ZbP9JAv+QF1Ky5plydhMR/IrqWDm+TQ==}
-    engines: {node: '>= 6'}
-    dependencies:
-      ast-types: 0.13.4
-      escodegen: 1.14.3
-      esprima: 4.0.1
-      vm2: 3.9.17
+  /ansicolors@0.3.2:
+    resolution: {integrity: sha512-QXu7BPrP29VllRxH8GwB7x5iX5qWKAAMLqKQGWTeLWVlNHNOpVMJ91dsxQAIWXpjuW5wqvxu3Jd/nRjrJ+0pqg==}
     dev: false
 
-  /del@6.1.1:
-    resolution: {integrity: sha512-ua8BhapfP0JUJKC/zV9yHHDW/rDoDxP4Zhn3AkA6/xT6gY7jYXJiaeyBZznYVujhZZET+UgcbZiQ7sN3WqcImg==}
-    engines: {node: '>=10'}
-    dependencies:
-      globby: 11.1.0
-      graceful-fs: 4.2.10
-      is-glob: 4.0.3
-      is-path-cwd: 2.2.0
-      is-path-inside: 3.0.3
-      p-map: 4.0.0
-      rimraf: 3.0.2
-      slash: 3.0.0
-    dev: true
+  /any-promise@1.3.0:
+    resolution: {integrity: sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==}
+    dev: false
 
-  /delayed-stream@1.0.0:
-    resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==}
-    engines: {node: '>=0.4.0'}
+  /anymatch@3.1.3:
+    resolution: {integrity: sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==}
+    engines: {node: '>= 8'}
+    dependencies:
+      normalize-path: 3.0.0
+      picomatch: 2.3.1
 
-  /delegates@1.0.0:
-    resolution: {integrity: sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==}
+  /app-root-dir@1.0.2:
+    resolution: {integrity: sha512-jlpIfsOoNoafl92Sz//64uQHGSyMrD2vYG5d8o2a4qGvyNCvXur7bzIsWtAC/6flI2RYAp3kv8rsfBtaLm7w0g==}
+    dev: true
 
-  /denque@1.5.1:
-    resolution: {integrity: sha512-XwE+iZ4D6ZUB7mfYRMb5wByE8L74HCn30FBN7sWnXksWc1LO1bPDl67pBR9o/kC4z/xSNAwkMYcGgqDV3BE3Hw==}
-    engines: {node: '>=0.10'}
+  /app-root-path@3.1.0:
+    resolution: {integrity: sha512-biN3PwB2gUtjaYy/isrU3aNWI5w+fAfvHkSvCKeQGxhmYpwKFUxudR3Yya+KqVRHBmEDYh+/lTozYCFbmzX4nA==}
+    engines: {node: '>= 6.0.0'}
     dev: false
 
-  /denque@2.1.0:
-    resolution: {integrity: sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==}
-    engines: {node: '>=0.10'}
+  /append-field@1.0.0:
+    resolution: {integrity: sha512-klpgFSWLW1ZEs8svjfb7g4qWY0YS5imI82dTg+QahUvJ8YqAY0P10Uk8tTyh9ZGuYEZEMaeJYCF5BFuX552hsw==}
     dev: false
 
-  /depd@1.1.2:
-    resolution: {integrity: sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==}
-    engines: {node: '>= 0.6'}
+  /aproba@2.0.0:
+    resolution: {integrity: sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==}
     dev: false
     optional: true
 
-  /depd@2.0.0:
-    resolution: {integrity: sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==}
-    engines: {node: '>= 0.8'}
-
-  /dequal@2.0.3:
-    resolution: {integrity: sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==}
-    engines: {node: '>=6'}
+  /arch@2.2.0:
+    resolution: {integrity: sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==}
     dev: true
 
-  /destroy@1.2.0:
-    resolution: {integrity: sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==}
-    engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16}
+  /are-we-there-yet@3.0.1:
+    resolution: {integrity: sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==}
+    engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
+    dependencies:
+      delegates: 1.0.0
+      readable-stream: 3.6.0
+    dev: false
+    optional: true
 
-  /detect-file@1.0.0:
-    resolution: {integrity: sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q==}
-    engines: {node: '>=0.10.0'}
+  /arg@5.0.2:
+    resolution: {integrity: sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==}
     dev: true
 
-  /detect-indent@6.1.0:
-    resolution: {integrity: sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==}
-    engines: {node: '>=8'}
+  /argparse@1.0.10:
+    resolution: {integrity: sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==}
+    dependencies:
+      sprintf-js: 1.0.3
+
+  /argparse@2.0.1:
+    resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
+
+  /aria-query@5.1.3:
+    resolution: {integrity: sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==}
+    dependencies:
+      deep-equal: 2.2.0
     dev: true
 
-  /detect-libc@2.0.1:
-    resolution: {integrity: sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==}
-    engines: {node: '>=8'}
+  /array-buffer-byte-length@1.0.0:
+    resolution: {integrity: sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==}
+    dependencies:
+      call-bind: 1.0.7
+      is-array-buffer: 3.0.2
     dev: false
 
-  /detect-newline@3.1.0:
-    resolution: {integrity: sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==}
-    engines: {node: '>=8'}
-    dev: true
+  /array-buffer-byte-length@1.0.1:
+    resolution: {integrity: sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.7
+      is-array-buffer: 3.0.4
 
-  /detect-package-manager@2.0.1:
-    resolution: {integrity: sha512-j/lJHyoLlWi6G1LDdLgvUtz60Zo5GEj+sVYtTVXnYLDPuzgC3llMxonXym9zIwhhUII8vjdw0LXxavpLqTbl1A==}
-    engines: {node: '>=12'}
+  /array-flatten@1.1.1:
+    resolution: {integrity: sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==}
+
+  /array-hyper-unique@2.1.4:
+    resolution: {integrity: sha512-RVsGx2YpFGhGpgdkK7A0VjFQecVUCowpkQerGCsyXVRXHxccAlPPTDt9ueF/X7Zq/6z6duZ49i9WzTCzcnQygQ==}
     dependencies:
-      execa: 5.1.1
-    dev: true
+      deep-eql: 4.0.0
+      lodash: 4.17.21
+    dev: false
 
-  /detect-port@1.5.1:
-    resolution: {integrity: sha512-aBzdj76lueB6uUst5iAs7+0H/oOjqI5D16XUWxlWMIMROhcM0rfsNVk93zTngq1dDNpoXRr++Sus7ETAExppAQ==}
-    hasBin: true
+  /array-includes@3.1.7:
+    resolution: {integrity: sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ==}
+    engines: {node: '>= 0.4'}
     dependencies:
-      address: 1.2.2
-      debug: 4.3.4(supports-color@8.1.1)
-    transitivePeerDependencies:
-      - supports-color
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-abstract: 1.22.5
+      get-intrinsic: 1.2.4
+      is-string: 1.0.7
     dev: true
 
-  /dezalgo@1.0.4:
-    resolution: {integrity: sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==}
+  /array-parallel@0.1.3:
+    resolution: {integrity: sha512-TDPTwSWW5E4oiFiKmz6RGJ/a80Y91GuLgUYuLd49+XBS75tYo8PNgaT2K/OxuQYqkoI852MDGBorg9OcUSTQ8w==}
+    dev: false
+
+  /array-series@0.1.5:
+    resolution: {integrity: sha512-L0XlBwfx9QetHOsbLDrE/vh2t018w9462HM3iaFfxRiK83aJjAt/Ja3NMkOW7FICwWTlQBa3ZbL5FKhuQWkDrg==}
+    dev: false
+
+  /array-union@2.1.0:
+    resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==}
+    engines: {node: '>=8'}
+
+  /array.prototype.findlastindex@1.2.3:
+    resolution: {integrity: sha512-LzLoiOMAxvy+Gd3BAq3B7VeIgPdo+Q8hthvKtXybMvRV0jrXfJM/t8mw7nNlpEcVlVUnCnM2KSX4XU5HmpodOA==}
+    engines: {node: '>= 0.4'}
     dependencies:
-      asap: 2.0.6
-      wrappy: 1.0.2
-    dev: true
-
-  /diff-sequences@29.4.2:
-    resolution: {integrity: sha512-R6P0Y6PrsH3n4hUXxL3nns0rbRk6Q33js3ygJBeEpbzLzgcNuJ61+u0RXasFpTKISw99TxUzFnumSnRLsjhLaw==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-abstract: 1.22.5
+      es-shim-unscopables: 1.0.0
+      get-intrinsic: 1.2.4
     dev: true
 
-  /diff-sequences@29.4.3:
-    resolution: {integrity: sha512-ofrBgwpPhCD85kMKtE9RYFFq6OC1A89oW2vvgWZNCwxrUpRUILopY7lsYyMDSjc8g6U6aiO0Qubg6r4Wgt5ZnA==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+  /array.prototype.flat@1.3.2:
+    resolution: {integrity: sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-abstract: 1.22.5
+      es-shim-unscopables: 1.0.0
     dev: true
 
-  /diff@4.0.2:
-    resolution: {integrity: sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==}
-    engines: {node: '>=0.3.1'}
-
-  /diff@5.1.0:
-    resolution: {integrity: sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==}
-    engines: {node: '>=0.3.1'}
+  /array.prototype.flatmap@1.3.2:
+    resolution: {integrity: sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-abstract: 1.22.5
+      es-shim-unscopables: 1.0.0
     dev: true
 
-  /difflib@0.2.4:
-    resolution: {integrity: sha512-9YVwmMb0wQHQNr5J9m6BSj6fk4pfGITGQOOs+D9Fl+INODWFOfvhIU1hNv6GgR1RBoC/9NJcwu77zShxV0kT7w==}
+  /arraybuffer.prototype.slice@1.0.1:
+    resolution: {integrity: sha512-09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw==}
+    engines: {node: '>= 0.4'}
     dependencies:
-      heap: 0.2.7
+      array-buffer-byte-length: 1.0.0
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      get-intrinsic: 1.2.4
+      is-array-buffer: 3.0.2
+      is-shared-array-buffer: 1.0.2
     dev: false
 
-  /digest-header@0.0.1:
-    resolution: {integrity: sha512-Qi0KOZgRnkQJuvMWbs1ZRRajEnbsMU8xlJI4rHIbPC+skHQ30heO5cIHpUFT4jAvAe+zPtdavLSAxASqoyZ3cg==}
-    engines: {node: '>= 0.10.0'}
+  /arraybuffer.prototype.slice@1.0.3:
+    resolution: {integrity: sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==}
+    engines: {node: '>= 0.4'}
     dependencies:
-      utility: 0.1.11
+      array-buffer-byte-length: 1.0.1
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-abstract: 1.22.5
+      es-errors: 1.3.0
+      get-intrinsic: 1.2.4
+      is-array-buffer: 3.0.4
+      is-shared-array-buffer: 1.0.3
+
+  /arrify@2.0.1:
+    resolution: {integrity: sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==}
+    engines: {node: '>=8'}
     dev: false
 
-  /dijkstrajs@1.0.3:
-    resolution: {integrity: sha512-qiSlmBq9+BCdCA/L46dw8Uy93mloxsPSbwnm5yrKn2vMPiy8KyAskTF6zuV/j5BMsmOGZDPs7KjU+mjb670kfA==}
-    dev: false
+  /asap@2.0.6:
+    resolution: {integrity: sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==}
 
-  /dir-glob@3.0.1:
-    resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==}
-    engines: {node: '>=8'}
+  /asn1.js-rfc2560@5.0.1(asn1.js@5.4.1):
+    resolution: {integrity: sha512-1PrVg6kuBziDN3PGFmRk3QrjpKvP9h/Hv5yMrFZvC1kpzP6dQRzf5BpKstANqHBkaOUmTpakJWhicTATOA/SbA==}
+    peerDependencies:
+      asn1.js: ^5.0.0
     dependencies:
-      path-type: 4.0.0
+      asn1.js: 5.4.1
+      asn1.js-rfc5280: 3.0.0
+    dev: false
 
-  /discontinuous-range@1.0.0:
-    resolution: {integrity: sha512-c68LpLbO+7kP/b1Hr1qs8/BJ09F5khZGTxqxZuhzxpmwJKOgRFHJWIb9/KmqnqHhLdO55aOxFH/EGBvUQbL/RQ==}
+  /asn1.js-rfc5280@3.0.0:
+    resolution: {integrity: sha512-Y2LZPOWeZ6qehv698ZgOGGCZXBQShObWnGthTrIFlIQjuV1gg2B8QOhWFRExq/MR1VnPpIIe7P9vX2vElxv+Pg==}
+    dependencies:
+      asn1.js: 5.4.1
     dev: false
 
-  /doctrine@2.1.0:
-    resolution: {integrity: sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==}
-    engines: {node: '>=0.10.0'}
+  /asn1.js@5.4.1:
+    resolution: {integrity: sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==}
     dependencies:
-      esutils: 2.0.3
-    dev: true
+      bn.js: 4.12.0
+      inherits: 2.0.4
+      minimalistic-assert: 1.0.1
+      safer-buffer: 2.1.2
+    dev: false
 
-  /doctrine@3.0.0:
-    resolution: {integrity: sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==}
-    engines: {node: '>=6.0.0'}
+  /asn1@0.2.6:
+    resolution: {integrity: sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==}
     dependencies:
-      esutils: 2.0.3
-    dev: true
+      safer-buffer: 2.1.2
 
-  /doctypes@1.1.0:
-    resolution: {integrity: sha512-LLBi6pEqS6Do3EKQ3J0NqHWV5hhb78Pi8vvESYwyOy2c31ZEZVdtitdzsQsKb7878PEERhzUk0ftqGhG6Mz+pQ==}
+  /assert-never@1.2.1:
+    resolution: {integrity: sha512-TaTivMB6pYI1kXwrFlEhLeGfOqoDNdTxjCdwRfFFkEA30Eu+k48W34nlok2EYWJfFFzqaEmichdNM7th6M5HNw==}
     dev: true
 
-  /dom-accessibility-api@0.5.15:
-    resolution: {integrity: sha512-8o+oVqLQZoruQPYy3uAAQtc6YbtSiRq5aPJBhJ82YTJRHvI6ofhYAkC81WmjFTnfUbqg6T3aCglIpU9p/5e7Cw==}
-    dev: true
+  /assert-options@0.8.0:
+    resolution: {integrity: sha512-qSELrEaEz4sGwTs4Qh+swQkjiHAysC4rot21+jzXU86dJzNG+FDqBzyS3ohSoTRf4ZLA3FSwxQdiuNl5NXUtvA==}
+    engines: {node: '>=10.0.0'}
+    dev: false
+
+  /assert-plus@1.0.0:
+    resolution: {integrity: sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==}
+    engines: {node: '>=0.8'}
+
+  /assert@2.0.0:
+    resolution: {integrity: sha512-se5Cd+js9dXJnu6Ag2JFc00t+HmHOen+8Q+L7O9zI0PqQXr20uk2J0XQqMxZEeo5U50o8Nvmmx7dZrl+Ufr35A==}
+    dependencies:
+      es6-object-assign: 1.1.0
+      is-nan: 1.3.2
+      object-is: 1.1.5
+      util: 0.12.5
 
-  /dom-converter@0.2.0:
-    resolution: {integrity: sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==}
+  /assert@2.1.0:
+    resolution: {integrity: sha512-eLHpSK/Y4nhMJ07gDaAzoX/XAKS8PSaojml3M0DM4JpV1LAi5JOJ/p6H/XWrl8L+DzVEvVCW1z3vWAaB9oTsQw==}
     dependencies:
-      utila: 0.4.0
+      call-bind: 1.0.7
+      is-nan: 1.3.2
+      object-is: 1.1.5
+      object.assign: 4.1.5
+      util: 0.12.5
     dev: true
 
-  /dom-event-types@1.1.0:
-    resolution: {integrity: sha512-jNCX+uNJ3v38BKvPbpki6j5ItVlnSqVV6vDWGS6rExzCMjsc39frLjm1n91o6YaKK6AZl0wLloItW6C6mr61BQ==}
+  /assertion-error@1.1.0:
+    resolution: {integrity: sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==}
     dev: true
 
-  /dom-iterator@1.0.0:
-    resolution: {integrity: sha512-7dsMOQI07EMU98gQM8NSB3GsAiIeBYIPKpnxR3c9xOvdvBjChAcOM0iJ222I3p5xyiZO9e5oggkNaCusuTdYig==}
+  /ast-types@0.15.2:
+    resolution: {integrity: sha512-c27loCv9QkZinsa5ProX751khO9DJl/AcB5c2KNtA6NRvHKS0PgLfcftz72KVq504vB0Gku5s2kUZzDBvQWvHg==}
+    engines: {node: '>=4'}
     dependencies:
-      component-props: 1.1.1
-      component-xor: 0.0.4
+      tslib: 2.6.2
     dev: false
 
-  /dom-serializer@0.2.2:
-    resolution: {integrity: sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==}
+  /ast-types@0.16.1:
+    resolution: {integrity: sha512-6t10qk83GOG8p0vKmaCr8eiilZwO171AvbROMtvvNiwrTly62t+7XkA8RdIIVbpMhCASAsxgAzdRSwh6nw/5Dg==}
+    engines: {node: '>=4'}
     dependencies:
-      domelementtype: 2.3.0
-      entities: 2.2.0
-    dev: true
+      tslib: 2.6.2
 
-  /dom-serializer@1.4.1:
-    resolution: {integrity: sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==}
+  /astral-regex@2.0.0:
+    resolution: {integrity: sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==}
+    engines: {node: '>=8'}
+
+  /async-mutex@0.5.0:
+    resolution: {integrity: sha512-1A94B18jkJ3DYq284ohPxoXbfTA5HsQ7/Mf4DEhcyLx3Bz27Rh59iScbB6EPiP+B+joue6YCxcMXSbFC1tZKwA==}
     dependencies:
-      domelementtype: 2.3.0
-      domhandler: 4.3.1
-      entities: 2.2.0
+      tslib: 2.6.2
+    dev: false
 
-  /dom-serializer@2.0.0:
-    resolution: {integrity: sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==}
+  /async-retry@1.3.3:
+    resolution: {integrity: sha512-wfr/jstw9xNi/0teMHrRW7dsz3Lt5ARhYNZ2ewpadnhaIp5mbALhOAP+EAdsC7t4Z6wqsDVv9+W6gm1Dk9mEyw==}
     dependencies:
-      domelementtype: 2.3.0
-      domhandler: 5.0.3
-      entities: 4.4.0
+      retry: 0.13.1
+    dev: false
 
-  /dom-walk@0.1.2:
-    resolution: {integrity: sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==}
-    dev: true
+  /async-validator@4.2.5:
+    resolution: {integrity: sha512-7HhHjtERjqlNbZtqNqy2rckN/SpOOlmDliet+lP7k+eKZEjPk3DgyeU9lIXLdeLz0uBbbVp+9Qdow9wJWgwwfg==}
+    dev: false
 
-  /domelementtype@1.3.1:
-    resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
-    dev: true
+  /async@3.2.4:
+    resolution: {integrity: sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==}
 
-  /domelementtype@2.3.0:
-    resolution: {integrity: sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==}
+  /asynckit@0.4.0:
+    resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==}
 
-  /domexception@4.0.0:
-    resolution: {integrity: sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==}
-    engines: {node: '>=12'}
-    dependencies:
-      webidl-conversions: 7.0.0
+  /at-least-node@1.0.0:
+    resolution: {integrity: sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==}
+    engines: {node: '>= 4.0.0'}
     dev: true
 
-  /domhandler@2.3.0:
-    resolution: {integrity: sha512-q9bUwjfp7Eif8jWxxxPSykdRZAb6GkguBGSgvvCrhI9wB71W2K/Kvv4E61CF/mcCfnVJDeDWx/Vb/uAqbDj6UQ==}
+  /autoprefixer@10.4.14(postcss@8.4.32):
+    resolution: {integrity: sha512-FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ==}
+    engines: {node: ^10 || ^12 || >=14}
+    hasBin: true
+    peerDependencies:
+      postcss: ^8.1.0
     dependencies:
-      domelementtype: 1.3.1
+      browserslist: 4.21.9
+      caniuse-lite: 1.0.30001517
+      fraction.js: 4.2.0
+      normalize-range: 0.1.2
+      picocolors: 1.0.0
+      postcss: 8.4.32
+      postcss-value-parser: 4.2.0
     dev: true
 
-  /domhandler@4.3.1:
-    resolution: {integrity: sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==}
-    engines: {node: '>= 4'}
-    dependencies:
-      domelementtype: 2.3.0
-
-  /domhandler@5.0.3:
-    resolution: {integrity: sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==}
-    engines: {node: '>= 4'}
-    dependencies:
-      domelementtype: 2.3.0
-
-  /domutils@1.5.1:
-    resolution: {integrity: sha512-gSu5Oi/I+3wDENBsOWBiRK1eoGxcywYSqg3rR960/+EfY0CF4EX1VPkgHOZ3WiS/Jg2DtliF6BhWcHlfpYUcGw==}
+  /autoprefixer@10.4.14(postcss@8.4.35):
+    resolution: {integrity: sha512-FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ==}
+    engines: {node: ^10 || ^12 || >=14}
+    hasBin: true
+    peerDependencies:
+      postcss: ^8.1.0
     dependencies:
-      dom-serializer: 0.2.2
-      domelementtype: 1.3.1
+      browserslist: 4.21.9
+      caniuse-lite: 1.0.30001517
+      fraction.js: 4.2.0
+      normalize-range: 0.1.2
+      picocolors: 1.0.0
+      postcss: 8.4.35
+      postcss-value-parser: 4.2.0
     dev: true
 
-  /domutils@2.8.0:
-    resolution: {integrity: sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==}
+  /available-typed-arrays@1.0.7:
+    resolution: {integrity: sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==}
+    engines: {node: '>= 0.4'}
     dependencies:
-      dom-serializer: 1.4.1
-      domelementtype: 2.3.0
-      domhandler: 4.3.1
+      possible-typed-array-names: 1.0.0
 
-  /domutils@3.0.1:
-    resolution: {integrity: sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q==}
-    dependencies:
-      dom-serializer: 2.0.0
-      domelementtype: 2.3.0
-      domhandler: 5.0.3
+  /avsc@5.7.6:
+    resolution: {integrity: sha512-jyn9tfd9J3h7pgJSk4qQ/1c1Tk5qiXrvmdCDON2UjcFplqRu/KpmKmpi+Ess8ZKmmqK12U4Y3VHrfwQs1xSMZA==}
+    engines: {node: '>=0.11'}
+    dev: false
 
-  /dot-case@3.0.4:
-    resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
+  /aws-sdk@2.1617.0:
+    resolution: {integrity: sha512-lIZtMv/0H0OJG/0sMscXB8e96M03AcqpfIEyuuNES4ZkytjyiTaLYCfviYudrRn7gcLbX/b3/TPphymBng4tHw==}
+    engines: {node: '>= 10.0.0'}
     dependencies:
-      no-case: 3.0.4
-      tslib: 2.5.0
+      buffer: 4.9.2
+      events: 1.1.1
+      ieee754: 1.1.13
+      jmespath: 0.16.0
+      querystring: 0.2.0
+      sax: 1.2.1
+      url: 0.10.3
+      util: 0.12.5
+      uuid: 8.0.0
+      xml2js: 0.6.2
+    dev: false
 
-  /dotenv-expand@10.0.0:
-    resolution: {integrity: sha512-GopVGCpVS1UKH75VKHGuQFqS1Gusej0z4FyQkPdwjil2gNIv+LNsqBlboOzpJFZKVT95GkCyWJbBSdFEFUWI2A==}
-    engines: {node: '>=12'}
-    dev: true
+  /aws-sign2@0.7.0:
+    resolution: {integrity: sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==}
 
-  /dotenv@16.0.3:
-    resolution: {integrity: sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ==}
-    engines: {node: '>=12'}
+  /aws4@1.11.0:
+    resolution: {integrity: sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==}
 
-  /dotenv@8.6.0:
-    resolution: {integrity: sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==}
-    engines: {node: '>=10'}
-    dev: false
+  /axe-core@4.7.2:
+    resolution: {integrity: sha512-zIURGIS1E1Q4pcrMjp+nnEh+16G56eG/MUllJH8yEvw7asDo7Ac9uhC9KIH5jzpITueEZolfYglnCGIuSBz39g==}
+    engines: {node: '>=4'}
+    dev: true
 
-  /dreamopt@0.6.0:
-    resolution: {integrity: sha512-KRJa47iBEK0y6ZtgCgy2ykuvMT8c9gj3ua9Dv7vCkclFJJeH2FjhGY2xO5qBoWGahsjCGMlk4Cq9wJYeWxuYhQ==}
-    engines: {node: '>=0.4.0'}
+  /axios-retry@3.7.0:
+    resolution: {integrity: sha512-ZTnCkJbRtfScvwiRnoVskFAfvU0UG3xNcsjwTR0mawSbIJoothxn67gKsMaNAFHRXJ1RmuLhmZBzvyXi3+9WyQ==}
     dependencies:
-      wordwrap: 1.0.0
+      '@babel/runtime': 7.23.6
+      is-retry-allowed: 2.2.0
     dev: false
 
-  /duplexer@0.1.2:
-    resolution: {integrity: sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==}
-    dev: true
-
-  /duplexify@3.7.1:
-    resolution: {integrity: sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==}
+  /axios@1.6.7:
+    resolution: {integrity: sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==}
     dependencies:
-      end-of-stream: 1.4.4
-      inherits: 2.0.4
-      readable-stream: 2.3.7
-      stream-shift: 1.0.1
+      follow-redirects: 1.15.6(debug@3.2.7)
+      form-data: 4.0.0
+      proxy-from-env: 1.1.0
+    transitivePeerDependencies:
+      - debug
+    dev: false
 
-  /duplexify@4.1.2:
-    resolution: {integrity: sha512-fz3OjcNCHmRP12MJoZMPglx8m4rrFP8rovnk4vT8Fs+aonZoCwGg10dSsQsfP/E62eZcPTMSMP6686fu9Qlqtw==}
+  /axios@1.6.7(debug@3.2.7):
+    resolution: {integrity: sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==}
     dependencies:
-      end-of-stream: 1.4.4
-      inherits: 2.0.4
-      readable-stream: 3.6.0
-      stream-shift: 1.0.1
+      follow-redirects: 1.15.6(debug@3.2.7)
+      form-data: 4.0.0
+      proxy-from-env: 1.1.0
+    transitivePeerDependencies:
+      - debug
     dev: false
 
-  /each-props@1.3.2:
-    resolution: {integrity: sha512-vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA==}
+  /axios@1.6.7(debug@4.3.4):
+    resolution: {integrity: sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==}
     dependencies:
-      is-plain-object: 2.0.4
-      object.defaults: 1.1.0
-    dev: true
+      follow-redirects: 1.15.6(debug@4.3.4)
+      form-data: 4.0.0
+      proxy-from-env: 1.1.0
+    transitivePeerDependencies:
+      - debug
 
-  /eastasianwidth@0.2.0:
-    resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==}
+  /babel-core@7.0.0-bridge.0(@babel/core@7.24.0):
+    resolution: {integrity: sha512-poPX9mZH/5CSanm50Q+1toVci6pv5KSRv/5TWCwtzQS5XEwn40BcCrgIeMFWP9CKKIniKXNxoIOnOq4VVlGXhg==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.24.0
     dev: true
 
-  /ecc-jsbn@0.1.2:
-    resolution: {integrity: sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==}
+  /babel-jest@29.6.2(@babel/core@7.22.9):
+    resolution: {integrity: sha512-BYCzImLos6J3BH/+HvUCHG1dTf2MzmAB4jaVxHV+29RZLjR29XuYTmsf2sdDwkrb+FczkGo3kOhE7ga6sI0P4A==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    peerDependencies:
+      '@babel/core': ^7.8.0
     dependencies:
-      jsbn: 0.1.1
-      safer-buffer: 2.1.2
+      '@babel/core': 7.22.9
+      '@jest/transform': 29.6.2
+      '@types/babel__core': 7.20.0
+      babel-plugin-istanbul: 6.1.1
+      babel-preset-jest: 29.5.0(@babel/core@7.22.9)
+      chalk: 4.1.2
+      graceful-fs: 4.2.11
+      slash: 3.0.0
+    transitivePeerDependencies:
+      - supports-color
 
-  /ecdsa-sig-formatter@1.0.11:
-    resolution: {integrity: sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==}
+  /babel-plugin-istanbul@6.1.1:
+    resolution: {integrity: sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==}
+    engines: {node: '>=8'}
     dependencies:
-      safe-buffer: 5.2.1
+      '@babel/helper-plugin-utils': 7.22.5
+      '@istanbuljs/load-nyc-config': 1.1.0
+      '@istanbuljs/schema': 0.1.3
+      istanbul-lib-instrument: 5.2.1
+      test-exclude: 6.0.0
+    transitivePeerDependencies:
+      - supports-color
 
-  /editorconfig@0.15.3:
-    resolution: {integrity: sha512-M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g==}
-    hasBin: true
+  /babel-plugin-jest-hoist@29.5.0:
+    resolution: {integrity: sha512-zSuuuAlTMT4mzLj2nPnUm6fsE6270vdOfnpbJ+RmruU75UhLFvL0N2NgI7xpeS7NaB6hGqmd5pVpGTDYvi4Q3w==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      commander: 2.20.3
-      lru-cache: 4.1.5
-      semver: 5.7.1
-      sigmund: 1.0.1
-    dev: true
-
-  /ee-first@1.1.1:
-    resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==}
+      '@babel/template': 7.22.5
+      '@babel/types': 7.24.0
+      '@types/babel__core': 7.20.0
+      '@types/babel__traverse': 7.18.2
 
-  /ejs@3.1.8:
-    resolution: {integrity: sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ==}
-    engines: {node: '>=0.10.0'}
-    hasBin: true
+  /babel-plugin-polyfill-corejs2@0.4.10(@babel/core@7.24.0):
+    resolution: {integrity: sha512-rpIuu//y5OX6jVU+a5BCn1R5RSZYWAl2Nar76iwaOdycqb6JPxediskWFMMl7stfwNJR4b7eiQvh5fB5TEQJTQ==}
+    peerDependencies:
+      '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
     dependencies:
-      jake: 10.8.5
-
-  /electron-to-chromium@1.4.284:
-    resolution: {integrity: sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==}
+      '@babel/compat-data': 7.23.5
+      '@babel/core': 7.24.0
+      '@babel/helper-define-polyfill-provider': 0.6.1(@babel/core@7.24.0)
+      semver: 7.6.0
+    transitivePeerDependencies:
+      - supports-color
     dev: true
 
-  /element-ui@2.15.12(patch_hash=prckukfdop5sl2her6de25cod4)(vue@2.7.14):
-    resolution: {integrity: sha512-Y5FMT2BPOindU2GkDEQ5ZKUVxDawKONRNMh2eL3uBx1FOtvUJ+L6IxXLVsNxq4WnaX/UnVNgWXebl7DobygZMg==}
+  /babel-plugin-polyfill-corejs3@0.9.0(@babel/core@7.24.0):
+    resolution: {integrity: sha512-7nZPG1uzK2Ymhy/NbaOWTg3uibM2BmGASS4vHS4szRZAIR8R6GwA/xAujpdrXU5iyklrimWnLWU+BLF9suPTqg==}
     peerDependencies:
-      vue: ^2.5.17
+      '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
     dependencies:
-      async-validator: 1.8.5
-      babel-helper-vue-jsx-merge-props: 2.0.3
-      deepmerge: 1.5.2
-      normalize-wheel: 1.0.1
-      resize-observer-polyfill: 1.5.1
-      throttle-debounce: 1.1.0
-      vue: 2.7.14
-    dev: false
-    patched: true
-
-  /emittery@0.13.1:
-    resolution: {integrity: sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==}
-    engines: {node: '>=12'}
+      '@babel/core': 7.24.0
+      '@babel/helper-define-polyfill-provider': 0.5.0(@babel/core@7.24.0)
+      core-js-compat: 3.36.0
+    transitivePeerDependencies:
+      - supports-color
     dev: true
 
-  /emoji-regex@7.0.3:
-    resolution: {integrity: sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==}
+  /babel-plugin-polyfill-regenerator@0.5.5(@babel/core@7.24.0):
+    resolution: {integrity: sha512-OJGYZlhLqBh2DDHeqAxWB1XIvr49CxiJ2gIt61/PU55CQK4Z58OzMqjDe1zwQdQk+rBYsRc+1rJmdajM3gimHg==}
+    peerDependencies:
+      '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
+    dependencies:
+      '@babel/core': 7.24.0
+      '@babel/helper-define-polyfill-provider': 0.5.0(@babel/core@7.24.0)
+    transitivePeerDependencies:
+      - supports-color
     dev: true
 
-  /emoji-regex@8.0.0:
-    resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}
+  /babel-preset-current-node-syntax@1.0.1(@babel/core@7.22.9):
+    resolution: {integrity: sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+    dependencies:
+      '@babel/core': 7.22.9
+      '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.22.9)
+      '@babel/plugin-syntax-bigint': 7.8.3(@babel/core@7.22.9)
+      '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.22.9)
+      '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.22.9)
+      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.22.9)
+      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.22.9)
+      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.22.9)
+      '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.22.9)
+      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.22.9)
+      '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.22.9)
+      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.22.9)
+      '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.22.9)
+
+  /babel-preset-jest@29.5.0(@babel/core@7.22.9):
+    resolution: {integrity: sha512-JOMloxOqdiBSxMAzjRaH023/vvcaSaec49zvg+2LmNsktC7ei39LTJGw02J+9uUtTZUq6xbLyJ4dxe9sSmIuAg==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+    dependencies:
+      '@babel/core': 7.22.9
+      babel-plugin-jest-hoist: 29.5.0
+      babel-preset-current-node-syntax: 1.0.1(@babel/core@7.22.9)
 
-  /emoji-regex@9.2.2:
-    resolution: {integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==}
+  /babel-walk@3.0.0-canary-5:
+    resolution: {integrity: sha512-GAwkz0AihzY5bkwIY5QDR+LvsRQgB/B+1foMPvi0FZPMl5fjD7ICiznUiBdLYMH1QYe6vqu4gWYytZOccLouFw==}
+    engines: {node: '>= 10.0.0'}
+    dependencies:
+      '@babel/types': 7.24.0
     dev: true
 
-  /emojis-list@3.0.0:
-    resolution: {integrity: sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==}
-    engines: {node: '>= 4'}
-    dev: true
+  /balanced-match@1.0.2:
+    resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
 
-  /enabled@2.0.0:
-    resolution: {integrity: sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==}
+  /base-64@0.1.0:
+    resolution: {integrity: sha512-Y5gU45svrR5tI2Vt/X9GPd3L0HNIKzGu202EjxrXMpuc2V2CiKgemAbUUsqYmZJvPtCXoUKjNZwBJzsNScUbXA==}
     dev: false
 
-  /encode-utf8@1.0.3:
-    resolution: {integrity: sha512-ucAnuBEhUK4boH2HjVYG5Q2mQyPorvv0u/ocS+zhdw0S8AlHYY+GOFhP1Gio5z4icpP2ivFSvhtFjQi8+T9ppw==}
+  /base-64@1.0.0:
+    resolution: {integrity: sha512-kwDPIFCGx0NZHog36dj+tHiwP4QMzsZ3AgMViUBKI0+V5n4U0ufTCUMhnQ04diaRI8EX/QcPfql7zlhZ7j4zgg==}
     dev: false
 
-  /encodeurl@1.0.2:
-    resolution: {integrity: sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==}
-    engines: {node: '>= 0.8'}
-
-  /encoding-japanese@2.0.0:
-    resolution: {integrity: sha512-++P0RhebUC8MJAwJOsT93dT+5oc5oPImp1HubZpAuCZ5kTLnhuuBhKHj2jJeO/Gj93idPBWmIuQ9QWMe5rX3pQ==}
-    engines: {node: '>=8.10.0'}
+  /base32.js@0.0.1:
+    resolution: {integrity: sha512-EGHIRiegFa62/SsA1J+Xs2tIzludPdzM064N9wjbiEgHnGnJ1V0WEpA4pEwCYT5nDvZk3ubf0shqaCS7k6xeUQ==}
     dev: false
 
-  /encoding@0.1.13:
-    resolution: {integrity: sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==}
+  /base64-js@1.5.1:
+    resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
+
+  /basic-auth@2.0.1:
+    resolution: {integrity: sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==}
+    engines: {node: '>= 0.8'}
     dependencies:
-      iconv-lite: 0.6.3
+      safe-buffer: 5.1.2
     dev: false
-    optional: true
 
-  /end-of-stream@1.4.4:
-    resolution: {integrity: sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==}
+  /bcrypt-pbkdf@1.0.2:
+    resolution: {integrity: sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==}
     dependencies:
-      once: 1.4.0
+      tweetnacl: 0.14.5
 
-  /enhanced-resolve@5.13.0:
-    resolution: {integrity: sha512-eyV8f0y1+bzyfh8xAwW/WTSZpLbjhqc4ne9eGSH4Zo2ejdyiNG9pU6mf9DG8a7+Auk6MFTlNOT4Y2y/9k8GKVg==}
-    engines: {node: '>=10.13.0'}
-    dependencies:
-      graceful-fs: 4.2.10
-      tapable: 2.2.1
-    dev: true
+  /bcryptjs@2.4.3:
+    resolution: {integrity: sha512-V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ==}
+    dev: false
 
-  /enquirer@2.3.6:
-    resolution: {integrity: sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==}
-    engines: {node: '>=8.6'}
+  /better-opn@3.0.2:
+    resolution: {integrity: sha512-aVNobHnJqLiUelTaHat9DZ1qM2w0C0Eym4LPI/3JxOnSokGVdsl1T1kN7TFvsEAD8G47A6VKQ0TVHqbBnYMJlQ==}
+    engines: {node: '>=12.0.0'}
     dependencies:
-      ansi-colors: 4.1.3
+      open: 8.4.0
     dev: true
 
-  /entities@1.0.0:
-    resolution: {integrity: sha512-LbLqfXgJMmy81t+7c14mnulFHJ170cM6E+0vMXR9k/ZiZwgX8i5pNgjTCX3SO4VeUsFLV+8InixoretwU+MjBQ==}
-    dev: true
+  /big-integer@1.6.51:
+    resolution: {integrity: sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==}
+    engines: {node: '>=0.6'}
 
-  /entities@2.2.0:
-    resolution: {integrity: sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==}
+  /bignumber.js@9.1.1:
+    resolution: {integrity: sha512-pHm4LsMJ6lzgNGVfZHjMoO8sdoRhOzOH4MLmY65Jg70bpxCKu5iOHNJyfF6OyvYw7t8Fpf35RuzUyqnQsj8Vig==}
+    dev: false
 
-  /entities@3.0.1:
-    resolution: {integrity: sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==}
-    engines: {node: '>=0.12'}
+  /bignumber.js@9.1.2:
+    resolution: {integrity: sha512-2/mKyZH9K85bzOEfhXDBFZTGd1CTs+5IHpeFQo9luiBG7hghdC851Pj2WAhb6E3R6b9tZj/XKhbg4fum+Kepug==}
     dev: false
 
-  /entities@4.4.0:
-    resolution: {integrity: sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==}
-    engines: {node: '>=0.12'}
+  /binary-extensions@2.2.0:
+    resolution: {integrity: sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==}
+    engines: {node: '>=8'}
 
-  /env-paths@2.2.1:
-    resolution: {integrity: sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==}
-    engines: {node: '>=6'}
+  /binary-search@1.3.6:
+    resolution: {integrity: sha512-nbE1WxOTTrUWIfsfZ4aHGYu5DOuNkbxGokjV6Z2kxfJK3uaAb8zNK1muzOeipoLHZjInT4Br88BHpzevc681xA==}
     dev: false
-    optional: true
-
-  /envinfo@7.8.1:
-    resolution: {integrity: sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==}
-    engines: {node: '>=4'}
-    hasBin: true
-    dev: true
 
-  /err-code@2.0.3:
-    resolution: {integrity: sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==}
+  /binascii@0.0.2:
+    resolution: {integrity: sha512-rA2CrUl1+6yKrn+XgLs8Hdy18OER1UW146nM+ixzhQXDY+Bd3ySkyIJGwF2a4I45JwbvF1mDL/nWkqBwpOcdBA==}
     dev: false
 
-  /error-ex@1.3.2:
-    resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==}
+  /bindings@1.5.0:
+    resolution: {integrity: sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==}
     dependencies:
-      is-arrayish: 0.2.1
-    dev: true
+      file-uri-to-path: 1.0.0
+    dev: false
 
-  /es-abstract@1.21.1:
-    resolution: {integrity: sha512-QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      available-typed-arrays: 1.0.5
-      call-bind: 1.0.2
-      es-set-tostringtag: 2.0.1
-      es-to-primitive: 1.2.1
-      function-bind: 1.1.1
-      function.prototype.name: 1.1.5
-      get-intrinsic: 1.1.3
-      get-symbol-description: 1.0.0
-      globalthis: 1.0.3
-      gopd: 1.0.1
-      has: 1.0.3
-      has-property-descriptors: 1.0.0
-      has-proto: 1.0.1
-      has-symbols: 1.0.3
-      internal-slot: 1.0.4
-      is-array-buffer: 3.0.1
-      is-callable: 1.2.7
-      is-negative-zero: 2.0.2
-      is-regex: 1.1.4
-      is-shared-array-buffer: 1.0.2
-      is-string: 1.0.7
-      is-typed-array: 1.1.10
-      is-weakref: 1.0.2
-      object-inspect: 1.12.3
-      object-keys: 1.1.1
-      object.assign: 4.1.4
-      regexp.prototype.flags: 1.4.3
-      safe-regex-test: 1.0.0
-      string.prototype.trimend: 1.0.6
-      string.prototype.trimstart: 1.0.6
-      typed-array-length: 1.0.4
-      unbox-primitive: 1.0.2
-      which-typed-array: 1.1.9
+  /bintrees@1.0.2:
+    resolution: {integrity: sha512-VOMgTMwjAaUG580SXn3LacVgjurrbMme7ZZNYGSSV7mmtY6QQRh0Eg3pwIcntQ77DErK1L0NxkbetjcoXzVwKw==}
+    dev: false
 
-  /es-aggregate-error@1.0.8:
-    resolution: {integrity: sha512-AKUb5MKLWMozPlFRHOKqWD7yta5uaEhH21qwtnf6FlKjNjTJOoqFi0/G14+FfSkIQhhu6X68Af4xgRC6y8qG4A==}
-    engines: {node: '>= 0.4'}
+  /bl@4.1.0:
+    resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==}
     dependencies:
-      define-properties: 1.1.4
-      es-abstract: 1.21.1
-      function-bind: 1.1.1
-      functions-have-names: 1.2.3
-      get-intrinsic: 1.1.3
-      globalthis: 1.0.3
-      has-property-descriptors: 1.0.0
-    dev: false
+      buffer: 5.7.1
+      inherits: 2.0.4
+      readable-stream: 3.6.0
 
-  /es-array-method-boxes-properly@1.0.0:
-    resolution: {integrity: sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==}
+  /bl@5.0.0:
+    resolution: {integrity: sha512-8vxFNZ0pflFfi0WXA3WQXlj6CaMEwsmh63I1CNp0q+wWv8sD0ARx1KovSQd0l2GkwrMIOyedq0EF1FxI+RCZLQ==}
+    dependencies:
+      buffer: 6.0.3
+      inherits: 2.0.4
+      readable-stream: 3.6.0
     dev: false
 
-  /es-get-iterator@1.1.3:
-    resolution: {integrity: sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==}
+  /bl@6.0.12:
+    resolution: {integrity: sha512-EnEYHilP93oaOa2MnmNEjAcovPS3JlQZOyzGXi3EyEpPhm9qWvdDp7BmAVEVusGzp8LlwQK56Av+OkDoRjzE0w==}
     dependencies:
-      call-bind: 1.0.2
-      get-intrinsic: 1.1.3
-      has-symbols: 1.0.3
-      is-arguments: 1.1.1
-      is-map: 2.0.2
-      is-set: 2.0.2
-      is-string: 1.0.7
-      isarray: 2.0.5
-      stop-iteration-iterator: 1.0.0
+      '@types/readable-stream': 4.0.10
+      buffer: 6.0.3
+      inherits: 2.0.4
+      readable-stream: 4.4.2
+    dev: false
 
-  /es-module-lexer@0.9.3:
-    resolution: {integrity: sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==}
+  /blob-util@2.0.2:
+    resolution: {integrity: sha512-T7JQa+zsXXEa6/8ZhHcQEW1UFfVM49Ts65uBkFL6fz2QmrElqmbajIDJvuA0tEhRe5eIjpV9ZF+0RfZR9voJFQ==}
     dev: true
 
-  /es-set-tostringtag@2.0.1:
-    resolution: {integrity: sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      get-intrinsic: 1.1.3
-      has: 1.0.3
-      has-tostringtag: 1.0.0
+  /bluebird@2.11.0:
+    resolution: {integrity: sha512-UfFSr22dmHPQqPP9XWHRhq+gWnHCYguQGkXQlbyPtW5qTnhFWA8/iXg765tH0cAjy7l/zPJ1aBTO0g5XgA7kvQ==}
+    dev: false
 
-  /es-shim-unscopables@1.0.0:
-    resolution: {integrity: sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==}
-    dependencies:
-      has: 1.0.3
-    dev: true
+  /bluebird@3.4.7:
+    resolution: {integrity: sha512-iD3898SR7sWVRHbiQv+sHUtHnMvC1o3nW5rAcqnq3uOn07DSAppZYUkIGslDz6gXC7HfunPe7YVBgoEJASPcHA==}
+    dev: false
 
-  /es-to-primitive@1.2.1:
-    resolution: {integrity: sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      is-callable: 1.2.7
-      is-date-object: 1.0.5
-      is-symbol: 1.0.4
+  /bluebird@3.7.2:
+    resolution: {integrity: sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==}
 
-  /es5-ext@0.10.62:
-    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
-    engines: {node: '>=0.10'}
+  /bn.js@4.12.0:
+    resolution: {integrity: sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==}
+    dev: false
+
+  /bn.js@5.2.1:
+    resolution: {integrity: sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==}
+    dev: false
+
+  /body-parser@1.20.2:
+    resolution: {integrity: sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==}
+    engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16}
     dependencies:
-      es6-iterator: 2.0.3
-      es6-symbol: 3.1.3
-      next-tick: 1.1.0
-    dev: true
+      bytes: 3.1.2
+      content-type: 1.0.5
+      debug: 2.6.9
+      depd: 2.0.0
+      destroy: 1.2.0
+      http-errors: 2.0.0
+      iconv-lite: 0.4.24
+      on-finished: 2.4.1
+      qs: 6.11.0
+      raw-body: 2.5.2
+      type-is: 1.6.18
+      unpipe: 1.0.0
+    transitivePeerDependencies:
+      - supports-color
 
-  /es5-ext@0.8.2:
-    resolution: {integrity: sha512-H19ompyhnKiBdjHR1DPHvf5RHgHPmJaY9JNzFGbMbPgdsUkvnUCN1Ke8J4Y0IMyTwFM2M9l4h2GoHwzwpSmXbA==}
-    engines: {node: '>=0.4'}
+  /boolbase@1.0.0:
+    resolution: {integrity: sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==}
+
+  /bowser@2.11.0:
+    resolution: {integrity: sha512-AlcaJBi/pqqJBIQ8U9Mcpc9i8Aqxn88Skv5d+xBX006BY5u8N3mGLHa5Lgppa7L/HfwgwLgZ6NYs+Ag6uUmJRA==}
     dev: false
 
-  /es6-iterator@2.0.3:
-    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+  /bplist-parser@0.2.0:
+    resolution: {integrity: sha512-z0M+byMThzQmD9NILRniCUXYsYpjwnlO8N5uCFaCqIOpqRsJCrQL9NK3JsD67CN5a08nF5oIL2bD6loTdHOuKw==}
+    engines: {node: '>= 5.10.0'}
     dependencies:
-      d: 1.0.1
-      es5-ext: 0.10.62
-      es6-symbol: 3.1.3
+      big-integer: 1.6.51
     dev: true
 
-  /es6-object-assign@1.1.0:
-    resolution: {integrity: sha512-MEl9uirslVwqQU369iHNWZXsI8yaZYGg/D65aOgZkeyFJwHYSxilf7rQzXKI7DdDuBPrBXbfk3sl9hJhmd5AUw==}
+  /brace-expansion@1.1.11:
+    resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==}
+    dependencies:
+      balanced-match: 1.0.2
+      concat-map: 0.0.1
+
+  /brace-expansion@2.0.1:
+    resolution: {integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==}
+    dependencies:
+      balanced-match: 1.0.2
+
+  /braces@3.0.2:
+    resolution: {integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==}
+    engines: {node: '>=8'}
+    dependencies:
+      fill-range: 7.0.1
+
+  /browser-assert@1.2.1:
+    resolution: {integrity: sha512-nfulgvOR6S4gt9UKCeGJOuSGBPGiFT6oQ/2UBnvTY/5aQ1PnksW72fhZkM30DzoRRv2WpwZf1vHHEr3mtuXIWQ==}
     dev: true
 
-  /es6-promise@3.3.1:
-    resolution: {integrity: sha512-SOp9Phqvqn7jtEUxPWdWfWoLmyt2VaJ6MpvP9Comy1MceMXqE6bxvaTu4iaxpYYPzhny28Lc+M87/c2cPK6lDg==}
+  /browser-request@0.3.3:
+    resolution: {integrity: sha512-YyNI4qJJ+piQG6MMEuo7J3Bzaqssufx04zpEKYfSrl/1Op59HWali9zMtBpXnkmqMcOuWJPZvudrm9wISmnCbg==}
+    engines: {'0': node}
     dev: false
 
-  /es6-symbol@3.1.3:
-    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+  /browserify-zlib@0.1.4:
+    resolution: {integrity: sha512-19OEpq7vWgsH6WkvkBJQDFvJS1uPcbFOQ4v9CU839dO+ZZXUZO6XpE6hNCqvlIIj+4fZvRiJ6DsAQ382GwiyTQ==}
     dependencies:
-      d: 1.0.1
-      ext: 1.7.0
+      pako: 0.2.9
     dev: true
 
-  /es6-weak-map@2.0.3:
-    resolution: {integrity: sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==}
+  /browserslist@4.21.9:
+    resolution: {integrity: sha512-M0MFoZzbUrRU4KNfCrDLnvyE7gub+peetoTid3TBIqtunaDJyXlwhakT+/VkvSXcfIzFfK/nkCs4nmyTmxdNSg==}
+    engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
+    hasBin: true
     dependencies:
-      d: 1.0.1
-      es5-ext: 0.10.62
-      es6-iterator: 2.0.3
-      es6-symbol: 3.1.3
-    dev: true
+      caniuse-lite: 1.0.30001517
+      electron-to-chromium: 1.4.475
+      node-releases: 2.0.13
+      update-browserslist-db: 1.0.11(browserslist@4.21.9)
 
-  /esbuild-plugin-alias@0.2.1:
-    resolution: {integrity: sha512-jyfL/pwPqaFXyKnj8lP8iLk6Z0m099uXR45aSN8Av1XD4vhvQutxxPzgA2bTcAwQpa1zCXDcWOlhFgyP3GKqhQ==}
+  /browserslist@4.23.0:
+    resolution: {integrity: sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==}
+    engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
+    hasBin: true
+    dependencies:
+      caniuse-lite: 1.0.30001597
+      electron-to-chromium: 1.4.703
+      node-releases: 2.0.14
+      update-browserslist-db: 1.0.13(browserslist@4.23.0)
     dev: true
 
-  /esbuild-register@3.4.2(esbuild@0.16.17):
-    resolution: {integrity: sha512-kG/XyTDyz6+YDuyfB9ZoSIOOmgyFCH+xPRtsCa8W85HLRV5Csp+o3jWVbOSHgSLfyLc5DmP+KFDNwty4mEjC+Q==}
-    peerDependencies:
-      esbuild: '>=0.12 <1'
+  /bs-logger@0.2.6:
+    resolution: {integrity: sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==}
+    engines: {node: '>= 6'}
     dependencies:
-      debug: 4.3.4(supports-color@8.1.1)
-      esbuild: 0.16.17
-    transitivePeerDependencies:
-      - supports-color
+      fast-json-stable-stringify: 2.1.0
     dev: true
 
-  /esbuild@0.16.17:
-    resolution: {integrity: sha512-G8LEkV0XzDMNwXKgM0Jwu3nY3lSTwSGY6XbxM9cr9+s0T/qSV1q1JVPBGzm3dcjhCic9+emZDmMffkwgPeOeLg==}
-    engines: {node: '>=12'}
-    hasBin: true
-    optionalDependencies:
-      '@esbuild/android-arm': 0.16.17
-      '@esbuild/android-arm64': 0.16.17
-      '@esbuild/android-x64': 0.16.17
-      '@esbuild/darwin-arm64': 0.16.17
-      '@esbuild/darwin-x64': 0.16.17
-      '@esbuild/freebsd-arm64': 0.16.17
-      '@esbuild/freebsd-x64': 0.16.17
-      '@esbuild/linux-arm': 0.16.17
-      '@esbuild/linux-arm64': 0.16.17
-      '@esbuild/linux-ia32': 0.16.17
-      '@esbuild/linux-loong64': 0.16.17
-      '@esbuild/linux-mips64el': 0.16.17
-      '@esbuild/linux-ppc64': 0.16.17
-      '@esbuild/linux-riscv64': 0.16.17
-      '@esbuild/linux-s390x': 0.16.17
-      '@esbuild/linux-x64': 0.16.17
-      '@esbuild/netbsd-x64': 0.16.17
-      '@esbuild/openbsd-x64': 0.16.17
-      '@esbuild/sunos-x64': 0.16.17
-      '@esbuild/win32-arm64': 0.16.17
-      '@esbuild/win32-ia32': 0.16.17
-      '@esbuild/win32-x64': 0.16.17
-    dev: true
+  /bser@2.1.1:
+    resolution: {integrity: sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==}
+    dependencies:
+      node-int64: 0.4.0
 
-  /escalade@3.1.1:
-    resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==}
-    engines: {node: '>=6'}
+  /bson@6.3.0:
+    resolution: {integrity: sha512-balJfqwwTBddxfnidJZagCBPP/f48zj9Sdp3OJswREOgsJzHiQSaOIAtApSgDQFYgHqAvFkp53AFSqjMDZoTFw==}
+    engines: {node: '>=16.20.1'}
+    dev: false
 
-  /escape-html@1.0.3:
-    resolution: {integrity: sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==}
+  /buffer-crc32@0.2.13:
+    resolution: {integrity: sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==}
+    dev: true
 
-  /escape-string-regexp@1.0.5:
-    resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==}
-    engines: {node: '>=0.8.0'}
+  /buffer-equal-constant-time@1.0.1:
+    resolution: {integrity: sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==}
+    dev: false
 
-  /escape-string-regexp@2.0.0:
-    resolution: {integrity: sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==}
-    engines: {node: '>=8'}
-    dev: true
+  /buffer-from@1.1.2:
+    resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==}
 
-  /escape-string-regexp@4.0.0:
-    resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==}
-    engines: {node: '>=10'}
+  /buffer-more-ints@1.0.0:
+    resolution: {integrity: sha512-EMetuGFz5SLsT0QTnXzINh4Ksr+oo4i+UGTXEshiGCQWnsgSs7ZhJ8fzlwQ+OzEMs0MpDAMr1hxnblp5a4vcHg==}
+    dev: false
 
-  /escodegen@1.14.3:
-    resolution: {integrity: sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==}
-    engines: {node: '>=4.0'}
-    hasBin: true
-    dependencies:
-      esprima: 4.0.1
-      estraverse: 4.3.0
-      esutils: 2.0.3
-      optionator: 0.8.3
-    optionalDependencies:
-      source-map: 0.6.1
+  /buffer-writer@2.0.0:
+    resolution: {integrity: sha512-a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw==}
+    engines: {node: '>=4'}
     dev: false
 
-  /escodegen@2.0.0:
-    resolution: {integrity: sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==}
-    engines: {node: '>=6.0'}
-    hasBin: true
+  /buffer@4.9.2:
+    resolution: {integrity: sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==}
     dependencies:
-      esprima: 4.0.1
-      estraverse: 5.3.0
-      esutils: 2.0.3
-      optionator: 0.8.3
-    optionalDependencies:
-      source-map: 0.6.1
-    dev: true
+      base64-js: 1.5.1
+      ieee754: 1.2.1
+      isarray: 1.0.0
+    dev: false
 
-  /eslint-config-airbnb-base@15.0.0(eslint-plugin-import@2.27.5)(eslint@8.39.0):
-    resolution: {integrity: sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==}
-    engines: {node: ^10.12.0 || >=12.0.0}
-    peerDependencies:
-      eslint: ^7.32.0 || ^8.2.0
-      eslint-plugin-import: ^2.25.2
+  /buffer@5.7.1:
+    resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==}
     dependencies:
-      confusing-browser-globals: 1.0.11
-      eslint: 8.39.0
-      eslint-plugin-import: 2.27.5(@typescript-eslint/parser@5.59.0)(eslint-import-resolver-typescript@3.5.5)(eslint@8.39.0)
-      object.assign: 4.1.4
-      object.entries: 1.1.5
-      semver: 6.3.0
-    dev: true
+      base64-js: 1.5.1
+      ieee754: 1.2.1
 
-  /eslint-config-airbnb-typescript@17.0.0(@typescript-eslint/eslint-plugin@5.59.0)(@typescript-eslint/parser@5.59.0)(eslint-plugin-import@2.27.5)(eslint@8.39.0):
-    resolution: {integrity: sha512-elNiuzD0kPAPTXjFWg+lE24nMdHMtuxgYoD30OyMD6yrW1AhFZPAg27VX7d3tzOErw+dgJTNWfRSDqEcXb4V0g==}
-    peerDependencies:
-      '@typescript-eslint/eslint-plugin': ^5.13.0
-      '@typescript-eslint/parser': ^5.0.0
-      eslint: ^7.32.0 || ^8.2.0
-      eslint-plugin-import: ^2.25.3
+  /buffer@6.0.3:
+    resolution: {integrity: sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==}
     dependencies:
-      '@typescript-eslint/eslint-plugin': 5.59.0(patch_hash=tk3n6hvmqwfzrfqe3awfxnqtuy)(@typescript-eslint/parser@5.59.0)(eslint@8.39.0)(typescript@5.0.3)
-      '@typescript-eslint/parser': 5.59.0(eslint@8.39.0)(typescript@5.0.3)
-      eslint: 8.39.0
-      eslint-config-airbnb-base: 15.0.0(eslint-plugin-import@2.27.5)(eslint@8.39.0)
-      eslint-plugin-import: 2.27.5(@typescript-eslint/parser@5.59.0)(eslint-import-resolver-typescript@3.5.5)(eslint@8.39.0)
-    dev: true
+      base64-js: 1.5.1
+      ieee754: 1.2.1
+    dev: false
 
-  /eslint-config-prettier@8.8.0(eslint@8.39.0):
-    resolution: {integrity: sha512-wLbQiFre3tdGgpDv67NQKnJuTlcUVYHas3k+DZCc2U2BadthoEY4B7hLPvAxaqdyOGCzuLfii2fqGph10va7oA==}
-    hasBin: true
-    peerDependencies:
-      eslint: '>=7.0.0'
+  /bufferutil@4.0.8:
+    resolution: {integrity: sha512-4T53u4PdgsXqKaIctwF8ifXlRTTmEPJ8iEPWFdGZvcf7sbwYo6FKFEX9eNNAnzFZ7EzJAQ3CJeOtCRA4rDp7Pw==}
+    engines: {node: '>=6.14.2'}
     dependencies:
-      eslint: 8.39.0
-    dev: true
+      node-gyp-build: 4.7.0
+    dev: false
 
-  /eslint-config-riot@1.0.0:
-    resolution: {integrity: sha512-NB/L/1Y30qyJcG5xZxCJKW/+bqyj+llbcCwo9DEz8bESIP0SLTOQ8T1DWCCFc+wJ61AMEstj4511PSScqMMfCw==}
+  /buildcheck@0.0.3:
+    resolution: {integrity: sha512-pziaA+p/wdVImfcbsZLNF32EiWyujlQLwolMqUQE8xpKNOH7KmZQaY8sXN7DGOEzPAElo9QTaeNRfGnf3iOJbA==}
+    engines: {node: '>=10.0.0'}
     dev: false
+    optional: true
+
+  /builtin-modules@3.3.0:
+    resolution: {integrity: sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==}
+    engines: {node: '>=6'}
+    dev: true
 
-  /eslint-import-resolver-node@0.3.7:
-    resolution: {integrity: sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==}
+  /bull@4.11.3:
+    resolution: {integrity: sha512-DhS0XtiAuejkAY08iGOdDK35eex/yGNoezlWqGJTu9FqWFF/oBjUhpsusE9SXiI4culyDbOoFs+l3ar0VXhFqQ==}
+    engines: {node: '>=12'}
     dependencies:
-      debug: 3.2.7(supports-color@5.5.0)
-      is-core-module: 2.11.0
-      resolve: 1.22.1
+      cron-parser: 4.9.0
+      get-port: 5.1.1
+      ioredis: 5.3.2
+      lodash: 4.17.21
+      msgpackr: 1.10.1
+      semver: 7.6.0
+      uuid: 8.3.2
     transitivePeerDependencies:
       - supports-color
-    dev: true
+    dev: false
+    optional: true
 
-  /eslint-import-resolver-typescript@3.5.5(@typescript-eslint/parser@5.59.0)(eslint-plugin-import@2.27.5)(eslint@8.39.0):
-    resolution: {integrity: sha512-TdJqPHs2lW5J9Zpe17DZNQuDnox4xo2o+0tE7Pggain9Rbc19ik8kFtXdxZ250FVx2kF4vlt2RSf4qlUpG7bhw==}
-    engines: {node: ^14.18.0 || >=16.0.0}
-    peerDependencies:
-      eslint: '*'
-      eslint-plugin-import: '*'
+  /bull@4.12.1:
+    resolution: {integrity: sha512-ft4hTmex7WGSHt56mydw9uRKskkvgiNwqTYiV9b6q3ubhplglQmjo9OZrHlcUVNwBqSBhnzlsJQ9N/Wd7nhENA==}
+    engines: {node: '>=12'}
     dependencies:
-      debug: 4.3.4(supports-color@8.1.1)
-      enhanced-resolve: 5.13.0
-      eslint: 8.39.0
-      eslint-module-utils: 2.7.4(@typescript-eslint/parser@5.59.0)(eslint-import-resolver-node@0.3.7)(eslint-import-resolver-typescript@3.5.5)(eslint@8.39.0)
-      eslint-plugin-import: 2.27.5(@typescript-eslint/parser@5.59.0)(eslint-import-resolver-typescript@3.5.5)(eslint@8.39.0)
-      get-tsconfig: 4.5.0
-      globby: 13.1.3
-      is-core-module: 2.11.0
-      is-glob: 4.0.3
-      synckit: 0.8.5
+      cron-parser: 4.9.0
+      get-port: 5.1.1
+      ioredis: 5.3.2
+      lodash: 4.17.21
+      msgpackr: 1.10.1
+      semver: 7.6.0
+      uuid: 8.3.2
     transitivePeerDependencies:
-      - '@typescript-eslint/parser'
-      - eslint-import-resolver-node
-      - eslint-import-resolver-webpack
       - supports-color
+    dev: false
+
+  /busboy@1.6.0:
+    resolution: {integrity: sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==}
+    engines: {node: '>=10.16.0'}
+    dependencies:
+      streamsearch: 1.1.0
+    dev: false
+
+  /bytes@3.0.0:
+    resolution: {integrity: sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==}
+    engines: {node: '>= 0.8'}
+
+  /bytes@3.1.2:
+    resolution: {integrity: sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==}
+    engines: {node: '>= 0.8'}
+
+  /cac@6.7.14:
+    resolution: {integrity: sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==}
+    engines: {node: '>=8'}
     dev: true
 
-  /eslint-module-utils@2.7.4(@typescript-eslint/parser@5.59.0)(eslint-import-resolver-node@0.3.7)(eslint-import-resolver-typescript@3.5.5)(eslint@8.39.0):
-    resolution: {integrity: sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==}
-    engines: {node: '>=4'}
-    peerDependencies:
-      '@typescript-eslint/parser': '*'
-      eslint: '*'
-      eslint-import-resolver-node: '*'
-      eslint-import-resolver-typescript: '*'
-      eslint-import-resolver-webpack: '*'
-    peerDependenciesMeta:
-      '@typescript-eslint/parser':
-        optional: true
-      eslint:
-        optional: true
-      eslint-import-resolver-node:
-        optional: true
-      eslint-import-resolver-typescript:
-        optional: true
-      eslint-import-resolver-webpack:
-        optional: true
+  /cacache@15.3.0:
+    resolution: {integrity: sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==}
+    engines: {node: '>= 10'}
     dependencies:
-      '@typescript-eslint/parser': 5.59.0(eslint@8.39.0)(typescript@5.0.3)
-      debug: 3.2.7(supports-color@5.5.0)
-      eslint: 8.39.0
-      eslint-import-resolver-node: 0.3.7
-      eslint-import-resolver-typescript: 3.5.5(@typescript-eslint/parser@5.59.0)(eslint-plugin-import@2.27.5)(eslint@8.39.0)
+      '@npmcli/fs': 1.1.1
+      '@npmcli/move-file': 1.1.2
+      chownr: 2.0.0
+      fs-minipass: 2.1.0
+      glob: 7.2.3
+      infer-owner: 1.0.4
+      lru-cache: 6.0.0
+      minipass: 3.3.6
+      minipass-collect: 1.0.2
+      minipass-flush: 1.0.5
+      minipass-pipeline: 1.2.4
+      mkdirp: 1.0.4
+      p-map: 4.0.0
+      promise-inflight: 1.0.1
+      rimraf: 3.0.2
+      ssri: 8.0.1
+      tar: 6.2.1
+      unique-filename: 1.1.1
     transitivePeerDependencies:
-      - supports-color
+      - bluebird
+    dev: false
+    optional: true
+
+  /cache-manager@5.2.3:
+    resolution: {integrity: sha512-9OErI8fksFkxAMJ8Mco0aiZSdphyd90HcKiOMJQncSlU1yq/9lHHxrT8PDayxrmr9IIIZPOAEfXuGSD7g29uog==}
+    dependencies:
+      lodash.clonedeep: 4.5.0
+      lru-cache: 9.1.2
+    dev: false
+
+  /cachedir@2.3.0:
+    resolution: {integrity: sha512-A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw==}
+    engines: {node: '>=6'}
     dev: true
 
-  /eslint-plugin-diff@2.0.1(eslint@8.39.0):
-    resolution: {integrity: sha512-qqbvwaaO1cfkUprliqiRojRsD0qGsvzmJNqNrb9s0h15sDVzZMXYdu0TUFpUwauLeU28etSsfWIp0Uu+OAcXXw==}
-    engines: {node: '>=14.0.0'}
-    peerDependencies:
-      eslint: '>=6.7.0'
+  /call-bind@1.0.2:
+    resolution: {integrity: sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==}
     dependencies:
-      eslint: 8.39.0
-    dev: true
+      function-bind: 1.1.2
+      get-intrinsic: 1.2.4
 
-  /eslint-plugin-import@2.27.5(@typescript-eslint/parser@5.59.0)(eslint-import-resolver-typescript@3.5.5)(eslint@8.39.0):
-    resolution: {integrity: sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==}
-    engines: {node: '>=4'}
-    peerDependencies:
-      '@typescript-eslint/parser': '*'
-      eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8
-    peerDependenciesMeta:
-      '@typescript-eslint/parser':
-        optional: true
+  /call-bind@1.0.7:
+    resolution: {integrity: sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==}
+    engines: {node: '>= 0.4'}
     dependencies:
-      '@typescript-eslint/parser': 5.59.0(eslint@8.39.0)(typescript@5.0.3)
-      array-includes: 3.1.6
-      array.prototype.flat: 1.3.1
-      array.prototype.flatmap: 1.3.1
-      debug: 3.2.7(supports-color@5.5.0)
-      doctrine: 2.1.0
-      eslint: 8.39.0
-      eslint-import-resolver-node: 0.3.7
-      eslint-module-utils: 2.7.4(@typescript-eslint/parser@5.59.0)(eslint-import-resolver-node@0.3.7)(eslint-import-resolver-typescript@3.5.5)(eslint@8.39.0)
-      has: 1.0.3
-      is-core-module: 2.11.0
-      is-glob: 4.0.3
-      minimatch: 3.1.2
-      object.values: 1.1.6
-      resolve: 1.22.1
-      semver: 6.3.0
-      tsconfig-paths: 3.14.1
-    transitivePeerDependencies:
-      - eslint-import-resolver-typescript
-      - eslint-import-resolver-webpack
-      - supports-color
-    dev: true
+      es-define-property: 1.0.0
+      es-errors: 1.3.0
+      function-bind: 1.1.2
+      get-intrinsic: 1.2.4
+      set-function-length: 1.2.2
 
-  /eslint-plugin-n8n-local-rules@1.0.0:
-    resolution: {integrity: sha512-qe6sVFDP1Vj5eXlqZxYZpIjwYvhuqXlI0P8OfPyhiPOhMkFtr0TpFphD8/6WCzkm7LJCvG1eJEzURCtMIsFTAg==}
-    dev: true
+  /call-me-maybe@1.0.1:
+    resolution: {integrity: sha512-wCyFsDQkKPwwF8BDwOiWNx/9K45L/hvggQiDbve+viMNMQnWhrlYIuBk09offfwCRtCO9P6XwUttufzU11WCVw==}
+
+  /callsites@3.1.0:
+    resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==}
+    engines: {node: '>=6'}
 
-  /eslint-plugin-n8n-nodes-base@1.12.0(eslint@8.39.0)(typescript@5.0.3):
-    resolution: {integrity: sha512-AotXR6IsxLNnxp4OxhD33xcmRFwVq7ZImBd0mTgpirV3VX8pCJDdiDlI2zCAICcICZxtOdbVtHOMhhnMjTh71A==}
+  /camel-case@4.1.2:
+    resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
-      '@typescript-eslint/utils': 5.45.0(eslint@8.39.0)(typescript@5.0.3)
-      camel-case: 4.1.2
-      eslint-plugin-n8n-nodes-base: registry.npmjs.org/eslint-plugin-n8n-nodes-base@1.12.0(eslint@8.39.0)(typescript@5.0.3)
-      indefinite: 2.4.1
       pascal-case: 3.1.2
-      pluralize: 8.0.0
-      prettier: 2.8.3
-      sentence-case: 3.0.4
-      title-case: 3.0.3
-    transitivePeerDependencies:
-      - eslint
-      - supports-color
-      - typescript
-    dev: true
+      tslib: 2.6.2
 
-  /eslint-plugin-prettier@4.2.1(eslint-config-prettier@8.8.0)(eslint@8.39.0)(prettier@2.8.3):
-    resolution: {integrity: sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==}
-    engines: {node: '>=12.0.0'}
-    peerDependencies:
-      eslint: '>=7.28.0'
-      eslint-config-prettier: '*'
-      prettier: '>=2.0.0'
-    peerDependenciesMeta:
-      eslint-config-prettier:
-        optional: true
-    dependencies:
-      eslint: 8.39.0
-      eslint-config-prettier: 8.8.0(eslint@8.39.0)
-      prettier: 2.8.3
-      prettier-linter-helpers: 1.0.0
+  /camelcase@5.3.1:
+    resolution: {integrity: sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==}
+    engines: {node: '>=6'}
+
+  /camelcase@6.3.0:
+    resolution: {integrity: sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==}
+    engines: {node: '>=10'}
+
+  /camelize@1.0.1:
+    resolution: {integrity: sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ==}
     dev: true
 
-  /eslint-plugin-unicorn@46.0.0(eslint@8.39.0):
-    resolution: {integrity: sha512-j07WkC+PFZwk8J33LYp6JMoHa1lXc1u6R45pbSAipjpfpb7KIGr17VE2D685zCxR5VL4cjrl65kTJflziQWMDA==}
-    engines: {node: '>=14.18'}
-    peerDependencies:
-      eslint: '>=8.28.0'
+  /caniuse-api@3.0.0:
+    resolution: {integrity: sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==}
     dependencies:
-      '@babel/helper-validator-identifier': 7.19.1
-      '@eslint-community/eslint-utils': 4.4.0(eslint@8.39.0)
-      ci-info: 3.7.1
-      clean-regexp: 1.0.0
-      eslint: 8.39.0
-      esquery: 1.5.0
-      indent-string: 4.0.0
-      is-builtin-module: 3.2.1
-      jsesc: 3.0.2
-      lodash: 4.17.21
-      pluralize: 8.0.0
-      read-pkg-up: 7.0.1
-      regexp-tree: 0.1.25
-      regjsparser: 0.9.1
-      safe-regex: 2.1.1
-      semver: 7.3.8
-      strip-indent: 3.0.0
+      browserslist: 4.23.0
+      caniuse-lite: 1.0.30001517
+      lodash.memoize: 4.1.2
+      lodash.uniq: 4.5.0
     dev: true
 
-  /eslint-plugin-vue@7.17.0(eslint@8.39.0):
-    resolution: {integrity: sha512-Rq5R2QetDCgC+kBFQw1+aJ5B93tQ4xqZvoCUxuIzwTonngNArsdP8ChM8PowIzsJvRtWl4ltGh/bZcN3xhFWSw==}
-    engines: {node: '>=8.10'}
-    peerDependencies:
-      eslint: ^6.2.0 || ^7.0.0 || ^8.0.0-0
-    dependencies:
-      eslint: 8.39.0
-      eslint-utils: 2.1.0
-      natural-compare: 1.4.0
-      semver: 6.3.0
-      vue-eslint-parser: 7.11.0(eslint@8.39.0)
-    transitivePeerDependencies:
-      - supports-color
+  /caniuse-lite@1.0.30001517:
+    resolution: {integrity: sha512-Vdhm5S11DaFVLlyiKu4hiUTkpZu+y1KA/rZZqVQfOD5YdDT/eQKlkt7NaE0WGOFgX32diqt9MiP9CAiFeRklaA==}
+
+  /caniuse-lite@1.0.30001597:
+    resolution: {integrity: sha512-7LjJvmQU6Sj7bL0j5b5WY/3n7utXUJvAe1lxhsHDbLmwX9mdL86Yjtr+5SRCyf8qME4M7pU2hswj0FpyBVCv9w==}
     dev: true
 
-  /eslint-scope@5.1.1:
-    resolution: {integrity: sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==}
-    engines: {node: '>=8.0.0'}
+  /capital-case@1.0.4:
+    resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
-      esrecurse: 4.3.0
-      estraverse: 4.3.0
-    dev: true
+      no-case: 3.0.4
+      tslib: 2.6.2
+      upper-case-first: 2.0.2
+    dev: false
 
-  /eslint-scope@7.2.0:
-    resolution: {integrity: sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+  /cardinal@2.1.1:
+    resolution: {integrity: sha512-JSr5eOgoEymtYHBjNWyjrMqet9Am2miJhlfKNdqLp6zoeAh0KN5dRAcxlecj5mAJrmQomgiOBj35xHLrFjqBpw==}
+    hasBin: true
     dependencies:
-      esrecurse: 4.3.0
-      estraverse: 5.3.0
-    dev: true
+      ansicolors: 0.3.2
+      redeyed: 2.1.1
+    dev: false
 
-  /eslint-utils@2.1.0:
-    resolution: {integrity: sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==}
-    engines: {node: '>=6'}
+  /caseless@0.12.0:
+    resolution: {integrity: sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==}
+
+  /catharsis@0.9.0:
+    resolution: {integrity: sha512-prMTQVpcns/tzFgFVkVp6ak6RykZyWb3gu8ckUpd6YkTlacOd3DXGJjIpD4Q6zJirizvaiAjSSHlOsA+6sNh2A==}
+    engines: {node: '>= 10'}
     dependencies:
-      eslint-visitor-keys: 1.3.0
-    dev: true
+      lodash: 4.17.21
+    dev: false
 
-  /eslint-utils@3.0.0(eslint@8.39.0):
-    resolution: {integrity: sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==}
-    engines: {node: ^10.0.0 || ^12.0.0 || >= 14.0.0}
-    peerDependencies:
-      eslint: '>=5'
+  /chai@4.3.10:
+    resolution: {integrity: sha512-0UXG04VuVbruMUYbJ6JctvH0YnC/4q3/AkT18q4NaITo91CUm0liMS9VqzT9vZhVQ/1eqPanMWjBM+Juhfb/9g==}
+    engines: {node: '>=4'}
     dependencies:
-      eslint: 8.39.0
-      eslint-visitor-keys: 2.1.0
+      assertion-error: 1.1.0
+      check-error: 1.0.3
+      deep-eql: 4.1.3
+      get-func-name: 2.0.2
+      loupe: 2.3.7
+      pathval: 1.1.1
+      type-detect: 4.0.8
     dev: true
 
-  /eslint-visitor-keys@1.3.0:
-    resolution: {integrity: sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==}
+  /chalk@2.4.2:
+    resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==}
     engines: {node: '>=4'}
+    dependencies:
+      ansi-styles: 3.2.1
+      escape-string-regexp: 1.0.5
+      supports-color: 5.5.0
+
+  /chalk@3.0.0:
+    resolution: {integrity: sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==}
+    engines: {node: '>=8'}
+    dependencies:
+      ansi-styles: 4.3.0
+      supports-color: 7.2.0
     dev: true
 
-  /eslint-visitor-keys@2.1.0:
-    resolution: {integrity: sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==}
+  /chalk@4.1.2:
+    resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==}
     engines: {node: '>=10'}
-    dev: true
+    dependencies:
+      ansi-styles: 4.3.0
+      supports-color: 7.2.0
 
-  /eslint-visitor-keys@3.4.0:
-    resolution: {integrity: sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+  /chalk@5.3.0:
+    resolution: {integrity: sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==}
+    engines: {node: ^12.17.0 || ^14.13 || >=16.0.0}
     dev: true
 
-  /eslint@8.39.0:
-    resolution: {integrity: sha512-mwiok6cy7KTW7rBpo05k6+p4YVZByLNjAZ/ACB9DRCu4YDRwjXI01tWHp6KAUWelsBetTxKK/2sHB0vdS8Z2Og==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    hasBin: true
+  /change-case@4.1.2:
+    resolution: {integrity: sha512-bSxY2ws9OtviILG1EiY5K7NNxkqg/JnRnFxLtKQ96JaviiIxi7djMrSd0ECT9AC+lttClmYwKw53BWpOMblo7A==}
     dependencies:
-      '@eslint-community/eslint-utils': 4.4.0(eslint@8.39.0)
-      '@eslint-community/regexpp': 4.5.0
-      '@eslint/eslintrc': 2.0.2
-      '@eslint/js': 8.39.0
-      '@humanwhocodes/config-array': 0.11.8
-      '@humanwhocodes/module-importer': 1.0.1
-      '@nodelib/fs.walk': 1.2.8
-      ajv: 6.12.6
-      chalk: 4.1.2
-      cross-spawn: 7.0.3
-      debug: 4.3.4(supports-color@8.1.1)
-      doctrine: 3.0.0
-      escape-string-regexp: 4.0.0
-      eslint-scope: 7.2.0
-      eslint-visitor-keys: 3.4.0
-      espree: 9.5.1
-      esquery: 1.5.0
-      esutils: 2.0.3
-      fast-deep-equal: 3.1.3
-      file-entry-cache: 6.0.1
-      find-up: 5.0.0
-      glob-parent: 6.0.2
-      globals: 13.20.0
-      grapheme-splitter: 1.0.4
-      ignore: 5.2.4
-      import-fresh: 3.3.0
-      imurmurhash: 0.1.4
-      is-glob: 4.0.3
-      is-path-inside: 3.0.3
-      js-sdsl: 4.1.5
-      js-yaml: 4.1.0
-      json-stable-stringify-without-jsonify: 1.0.1
-      levn: 0.4.1
-      lodash.merge: 4.6.2
-      minimatch: 3.1.2
-      natural-compare: 1.4.0
-      optionator: 0.9.1
-      strip-ansi: 6.0.1
-      strip-json-comments: 3.1.1
-      text-table: 0.2.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
+      camel-case: 4.1.2
+      capital-case: 1.0.4
+      constant-case: 3.0.4
+      dot-case: 3.0.4
+      header-case: 2.0.4
+      no-case: 3.0.4
+      param-case: 3.0.4
+      pascal-case: 3.1.2
+      path-case: 3.0.4
+      sentence-case: 3.0.4
+      snake-case: 3.0.4
+      tslib: 2.6.2
+    dev: false
 
-  /espree@6.2.1:
-    resolution: {integrity: sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==}
-    engines: {node: '>=6.0.0'}
-    dependencies:
-      acorn: 7.4.1
-      acorn-jsx: 5.3.2(acorn@7.4.1)
-      eslint-visitor-keys: 1.3.0
-    dev: true
+  /char-regex@1.0.2:
+    resolution: {integrity: sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==}
+    engines: {node: '>=10'}
 
-  /espree@9.5.1:
-    resolution: {integrity: sha512-5yxtHSZXRSW5pvv3hAlXM5+/Oswi1AUFqBmbibKb5s6bp3rGIDkyXU6xCoyuuLhijr4SFwPrXRoZjz0AZDN9tg==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+  /character-parser@2.2.0:
+    resolution: {integrity: sha512-+UqJQjFEFaTAs3bNsF2j2kEN1baG/zghZbdqoYEDxGZtJo9LBzl1A+m0D4n3qKx8N2FNv8/Xp6yV9mQmBuptaw==}
     dependencies:
-      acorn: 8.8.1
-      acorn-jsx: 5.3.2(acorn@8.8.1)
-      eslint-visitor-keys: 3.4.0
+      is-regex: 1.1.4
     dev: true
 
-  /esprima-next@5.8.4:
-    resolution: {integrity: sha512-8nYVZ4ioIH4Msjb/XmhnBdz5WRRBaYqevKa1cv9nGJdCehMbzZCPNEEnqfLCZVetUVrUPEcb5IYyu1GG4hFqgg==}
-    engines: {node: '>=12'}
-    hasBin: true
+  /chardet@0.7.0:
+    resolution: {integrity: sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==}
     dev: false
 
-  /esprima@1.2.2:
-    resolution: {integrity: sha512-+JpPZam9w5DuJ3Q67SqsMGtiHKENSMRVoxvArfJZK01/BfLEObtZ6orJa/MtoGNR/rfMgp5837T41PAmTwAv/A==}
-    engines: {node: '>=0.4.0'}
-    hasBin: true
+  /charenc@0.0.2:
+    resolution: {integrity: sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==}
     dev: false
 
-  /esprima@4.0.1:
-    resolution: {integrity: sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==}
-    engines: {node: '>=4'}
-    hasBin: true
+  /charset@1.0.1:
+    resolution: {integrity: sha512-6dVyOOYjpfFcL1Y4qChrAoQLRHvj2ziyhcm0QJlhOcAhykL/k1kTUPbeo+87MNRTRdk2OIIsIXbuF3x2wi5EXg==}
+    engines: {node: '>=4.0.0'}
+    dev: false
 
-  /esquery@1.4.0:
-    resolution: {integrity: sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==}
-    engines: {node: '>=0.10'}
+  /chart.js@4.4.0:
+    resolution: {integrity: sha512-vQEj6d+z0dcsKLlQvbKIMYFHd3t8W/7L2vfJIbYcfyPcRx92CsHqECpueN8qVGNlKyDcr5wBrYAYKnfu/9Q1hQ==}
+    engines: {pnpm: '>=7'}
     dependencies:
-      estraverse: 5.3.0
-    dev: true
+      '@kurkle/color': 0.3.2
+    dev: false
 
-  /esquery@1.5.0:
-    resolution: {integrity: sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==}
-    engines: {node: '>=0.10'}
+  /check-error@1.0.3:
+    resolution: {integrity: sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==}
     dependencies:
-      estraverse: 5.3.0
+      get-func-name: 2.0.2
     dev: true
 
-  /esrecurse@4.3.0:
-    resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==}
-    engines: {node: '>=4.0'}
+  /check-more-types@2.24.0:
+    resolution: {integrity: sha512-Pj779qHxV2tuapviy1bSZNEL1maXr13bPYpsvSDB68HlYcYuhlDrmGd63i0JHMCLKzc7rUSNIrpdJlhVlNwrxA==}
+    engines: {node: '>= 0.8.0'}
+    dev: true
+
+  /cheerio-select@1.6.0:
+    resolution: {integrity: sha512-eq0GdBvxVFbqWgmCm7M3XGs1I8oLy/nExUnh6oLqmBditPO9AqQJrkslDpMun/hZ0yyTs8L0m85OHp4ho6Qm9g==}
+    dependencies:
+      css-select: 4.3.0
+      css-what: 6.1.0
+      domelementtype: 2.3.0
+      domhandler: 4.3.1
+      domutils: 2.8.0
+    dev: false
+
+  /cheerio@1.0.0-rc.6:
+    resolution: {integrity: sha512-hjx1XE1M/D5pAtMgvWwE21QClmAEeGHOIDfycgmndisdNgI6PE1cGRQkMGBcsbUbmEQyWu5PJLUcAOjtQS8DWw==}
+    engines: {node: '>= 0.12'}
+    dependencies:
+      cheerio-select: 1.6.0
+      dom-serializer: 1.4.1
+      domhandler: 4.3.1
+      htmlparser2: 6.1.0
+      parse5: 6.0.1
+      parse5-htmlparser2-tree-adapter: 6.0.1
+    dev: false
+
+  /chokidar@3.5.2:
+    resolution: {integrity: sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==}
+    engines: {node: '>= 8.10.0'}
     dependencies:
-      estraverse: 5.3.0
-    dev: true
+      anymatch: 3.1.3
+      braces: 3.0.2
+      glob-parent: 5.1.2
+      is-binary-path: 2.1.0
+      is-glob: 4.0.3
+      normalize-path: 3.0.0
+      readdirp: 3.6.0
+    optionalDependencies:
+      fsevents: 2.3.3
 
-  /estraverse@4.3.0:
-    resolution: {integrity: sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==}
-    engines: {node: '>=4.0'}
+  /chownr@1.1.4:
+    resolution: {integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==}
 
-  /estraverse@5.3.0:
-    resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==}
-    engines: {node: '>=4.0'}
+  /chownr@2.0.0:
+    resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==}
+    engines: {node: '>=10'}
+
+  /chromatic@11.0.8:
+    resolution: {integrity: sha512-+zJ5h0/Eu5z26KCNLIw2tknbK69gUO8q3Jsew4oU0Q/i/NPhIwcXhvPP7u75aLJgX1EI61+ndiGJA/yeQZQcgw==}
+    hasBin: true
+    peerDependencies:
+      '@chromatic-com/cypress': ^0.*.* || ^1.0.0
+      '@chromatic-com/playwright': ^0.*.* || ^1.0.0
+    peerDependenciesMeta:
+      '@chromatic-com/cypress':
+        optional: true
+      '@chromatic-com/playwright':
+        optional: true
     dev: true
 
-  /estree-walker@2.0.2:
-    resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==}
+  /chrome-trace-event@1.0.3:
+    resolution: {integrity: sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==}
+    engines: {node: '>=6.0'}
     dev: true
 
-  /esutils@2.0.3:
-    resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==}
-    engines: {node: '>=0.10.0'}
+  /ci-info@3.8.0:
+    resolution: {integrity: sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==}
+    engines: {node: '>=8'}
 
-  /etag@1.8.1:
-    resolution: {integrity: sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==}
-    engines: {node: '>= 0.6'}
+  /ci-info@4.0.0:
+    resolution: {integrity: sha512-TdHqgGf9odd8SXNuxtUBVx8Nv+qZOejE6qyqiy5NtbYYQOeFa6zmHkxlPzmaLxWWHsU6nJmB7AETdVPi+2NBUg==}
+    engines: {node: '>=8'}
+    dev: true
 
-  /event-stream@3.3.4:
-    resolution: {integrity: sha512-QHpkERcGsR0T7Qm3HNJSyXKEEj8AHNxkY3PK8TS2KJvQ7NiSHe3DDpwVKKtoYprL/AreyzFBeIkBIWChAqn60g==}
+  /citty@0.1.5:
+    resolution: {integrity: sha512-AS7n5NSc0OQVMV9v6wt3ByujNIrne0/cTjiC2MYqhvao57VNfiuVksTSr2p17nVOhEr2KtqiAkGwHcgMC/qUuQ==}
     dependencies:
-      duplexer: 0.1.2
-      from: 0.1.7
-      map-stream: 0.1.0
-      pause-stream: 0.0.11
-      split: 0.3.3
-      stream-combiner: 0.0.4
-      through: 2.3.8
+      consola: 3.2.3
     dev: true
 
-  /eventemitter2@6.4.7:
-    resolution: {integrity: sha512-tYUSVOGeQPKt/eC1ABfhHy5Xd96N3oIijJvN3O9+TsC28T5V9yX9oEfEK5faP0EFSNVOG97qtAS68GBrQB2hDg==}
-    dev: true
+  /cjs-module-lexer@1.2.2:
+    resolution: {integrity: sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==}
 
-  /events@1.1.1:
-    resolution: {integrity: sha512-kEcvvCBByWXGnZy6JUlgAp2gBIUjfCAV6P6TgT1/aaQKcmuAEC4OZTV1I4EWQLz2gxZw76atuVyvHhTxvi0Flw==}
-    engines: {node: '>=0.4.x'}
+  /class-transformer@0.5.1:
+    resolution: {integrity: sha512-SQa1Ws6hUbfC98vKGxZH3KFY0Y1lm5Zm0SY8XX9zbK7FJCyVEac3ATW0RIpwzW+oOfmHE5PMPufDG9hCfoEOMw==}
     dev: false
 
-  /events@3.3.0:
-    resolution: {integrity: sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==}
-    engines: {node: '>=0.8.x'}
-
-  /eventsource@2.0.2:
-    resolution: {integrity: sha512-IzUmBGPR3+oUG9dUeXynyNmf91/3zUSJg1lCktzKw47OXuhco54U3r9B7O4XX+Rb1Itm9OZ2b0RkTs10bICOxA==}
-    engines: {node: '>=12.0.0'}
+  /class-validator@0.14.0:
+    resolution: {integrity: sha512-ct3ltplN8I9fOwUd8GrP8UQixwff129BkEtuWDKL5W45cQuLd19xqmTLu5ge78YDm/fdje6FMt0hGOhl0lii3A==}
+    dependencies:
+      '@types/validator': 13.7.10
+      libphonenumber-js: 1.10.14
+      validator: 13.7.0
     dev: false
 
-  /execa@0.10.0:
-    resolution: {integrity: sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==}
-    engines: {node: '>=4'}
-    dependencies:
-      cross-spawn: 6.0.5
-      get-stream: 3.0.0
-      is-stream: 1.1.0
-      npm-run-path: 2.0.2
-      p-finally: 1.0.0
-      signal-exit: 3.0.7
-      strip-eof: 1.0.0
+  /classnames@2.5.1:
+    resolution: {integrity: sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==}
     dev: true
 
-  /execa@4.1.0:
-    resolution: {integrity: sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==}
-    engines: {node: '>=10'}
+  /clean-regexp@1.0.0:
+    resolution: {integrity: sha512-GfisEZEJvzKrmGWkvfhgzcz/BllN1USeqD2V6tg14OAOgaCD2Z/PUEuxnAZ/nPvmaHRG7a8y77p1T/IRQ4D1Hw==}
+    engines: {node: '>=4'}
     dependencies:
-      cross-spawn: 7.0.3
-      get-stream: 5.2.0
-      human-signals: 1.1.1
-      is-stream: 2.0.1
-      merge-stream: 2.0.0
-      npm-run-path: 4.0.1
-      onetime: 5.1.2
-      signal-exit: 3.0.7
-      strip-final-newline: 2.0.0
+      escape-string-regexp: 1.0.5
     dev: true
 
-  /execa@5.1.1:
-    resolution: {integrity: sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==}
-    engines: {node: '>=10'}
-    dependencies:
-      cross-spawn: 7.0.3
-      get-stream: 6.0.1
-      human-signals: 2.1.0
-      is-stream: 2.0.1
-      merge-stream: 2.0.0
-      npm-run-path: 4.0.1
-      onetime: 5.1.2
-      signal-exit: 3.0.7
-      strip-final-newline: 2.0.0
-    dev: true
+  /clean-stack@2.2.0:
+    resolution: {integrity: sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==}
+    engines: {node: '>=6'}
 
-  /executable@4.1.1:
-    resolution: {integrity: sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg==}
-    engines: {node: '>=4'}
+  /clean-stack@3.0.1:
+    resolution: {integrity: sha512-lR9wNiMRcVQjSB3a7xXGLuz4cr4wJuuXlaAEbRutGowQTmlp7R72/DOgN21e8jdwblMWl9UOJMJXarX94pzKdg==}
+    engines: {node: '>=10'}
     dependencies:
-      pify: 2.3.0
-    dev: true
-
-  /exit-on-epipe@1.0.1:
-    resolution: {integrity: sha512-h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw==}
-    engines: {node: '>=0.8'}
+      escape-string-regexp: 4.0.0
     dev: false
 
-  /exit@0.1.2:
-    resolution: {integrity: sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==}
-    engines: {node: '>= 0.8.0'}
-    dev: true
-
-  /expand-brackets@2.1.4:
-    resolution: {integrity: sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==}
-    engines: {node: '>=0.10.0'}
+  /cli-cursor@3.1.0:
+    resolution: {integrity: sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==}
+    engines: {node: '>=8'}
     dependencies:
-      debug: 2.6.9
-      define-property: 0.2.5
-      extend-shallow: 2.0.1
-      posix-character-classes: 0.1.1
-      regex-not: 1.0.2
-      snapdragon: 0.8.2
-      to-regex: 3.0.2
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
+      restore-cursor: 3.1.0
 
-  /expand-tilde@2.0.2:
-    resolution: {integrity: sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==}
-    engines: {node: '>=0.10.0'}
+  /cli-highlight@2.1.11:
+    resolution: {integrity: sha512-9KDcoEVwyUXrjcJNvHD0NFc/hiwe/WPVYIleQh2O1N2Zro5gWJZ/K+3DGn8w8P/F6FxOgzyC5bxDyHIgCSPhGg==}
+    engines: {node: '>=8.0.0', npm: '>=5.0.0'}
+    hasBin: true
     dependencies:
-      homedir-polyfill: 1.0.3
+      chalk: 4.1.2
+      highlight.js: 10.7.3
+      mz: 2.7.0
+      parse5: 5.1.1
+      parse5-htmlparser2-tree-adapter: 6.0.1
+      yargs: 16.2.0
+    dev: false
 
-  /expect@29.3.1:
-    resolution: {integrity: sha512-gGb1yTgU30Q0O/tQq+z30KBWv24ApkMgFUpvKBkyLUBL68Wv8dHdJxTBZFl/iT8K/bqDHvUYRH6IIN3rToopPA==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+  /cli-progress@3.12.0:
+    resolution: {integrity: sha512-tRkV3HJ1ASwm19THiiLIXLO7Im7wlTuKnvkYaTkyoAPefqjNg7W7DHKUlGRxy9vxDvbyCYQkQozvptuMkGCg8A==}
+    engines: {node: '>=4'}
     dependencies:
-      '@jest/expect-utils': 29.3.1
-      jest-get-type: 29.2.0
-      jest-matcher-utils: 29.3.1
-      jest-message-util: 29.3.1
-      jest-util: 29.5.0
-    dev: true
+      string-width: 4.2.3
+    dev: false
 
-  /expect@29.4.2:
-    resolution: {integrity: sha512-+JHYg9O3hd3RlICG90OPVjRkPBoiUH7PxvDVMnRiaq1g6JUgZStX514erMl0v2Dc5SkfVbm7ztqbd6qHHPn+mQ==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dependencies:
-      '@jest/expect-utils': 29.4.2
-      jest-get-type: 29.4.2
-      jest-matcher-utils: 29.4.2
-      jest-message-util: 29.4.2
-      jest-util: 29.5.0
+  /cli-spinners@2.9.0:
+    resolution: {integrity: sha512-4/aL9X3Wh0yiMQlE+eeRhWP6vclO3QRtw1JHKIT0FFUs5FjpFmESqtMvYZ0+lbzBw900b95mS0hohy+qn2VK/g==}
+    engines: {node: '>=6'}
     dev: true
 
-  /expect@29.5.0:
-    resolution: {integrity: sha512-yM7xqUrCO2JdpFo4XpM82t+PJBFybdqoQuJLDGeDX2ij8NZzqRHyu3Hp188/JX7SWqud+7t4MUdvcgGBICMHZg==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+  /cli-table3@0.6.3:
+    resolution: {integrity: sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg==}
+    engines: {node: 10.* || >= 12.*}
     dependencies:
-      '@jest/expect-utils': 29.5.0
-      jest-get-type: 29.4.3
-      jest-matcher-utils: 29.5.0
-      jest-message-util: 29.5.0
-      jest-util: 29.5.0
+      string-width: 4.2.3
+    optionalDependencies:
+      '@colors/colors': 1.5.0
     dev: true
 
-  /express-async-errors@3.1.1(express@4.18.2):
-    resolution: {integrity: sha512-h6aK1da4tpqWSbyCa3FxB/V6Ehd4EEB15zyQq9qe75OZBp0krinNKuH4rAY+S/U/2I36vdLAUFSjQJ+TFmODng==}
-    peerDependencies:
-      express: ^4.16.2
+  /cli-truncate@2.1.0:
+    resolution: {integrity: sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==}
+    engines: {node: '>=8'}
     dependencies:
-      express: 4.18.2
-    dev: false
+      slice-ansi: 3.0.0
+      string-width: 4.2.3
+    dev: true
 
-  /express-handlebars@7.0.2:
-    resolution: {integrity: sha512-W7QuI8i4jjxGNqZJebXzugHuJV32uGTMWqSzqTKsgBTPVsWR3oYR2b9VNQ53vmWbUH1G8r/9GIO3WCqa1Myf1w==}
-    engines: {node: '>=v16'}
-    dependencies:
-      glob: 9.3.1
-      graceful-fs: 4.2.10
-      handlebars: 4.7.7
+  /cli-width@3.0.0:
+    resolution: {integrity: sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==}
+    engines: {node: '>= 10'}
     dev: false
 
-  /express-openapi-validator@4.13.8:
-    resolution: {integrity: sha512-89/sdkq+BKBuIyykaMl/vR9grFc3WFUPTjFo0THHbu+5g+q8rA7fKeoMfz+h84yOQIBcztmJ5ZJdk5uhEls31A==}
+  /cliui@6.0.0:
+    resolution: {integrity: sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==}
     dependencies:
-      '@types/multer': 1.4.7
-      ajv: 6.12.6
-      content-type: 1.0.4
-      json-schema-ref-parser: 9.0.9
-      lodash.clonedeep: 4.5.0
-      lodash.get: 4.4.2
-      lodash.uniq: 4.5.0
-      lodash.zipobject: 4.1.3
-      media-typer: 1.1.0
-      multer: 1.4.5-lts.1
-      ono: 7.1.3
-      path-to-regexp: 6.2.1
+      string-width: 4.2.3
+      strip-ansi: 6.0.1
+      wrap-ansi: 6.2.0
     dev: false
 
-  /express-prom-bundle@6.6.0(prom-client@13.2.0):
-    resolution: {integrity: sha512-tZh2P2p5a8/yxQ5VbRav011Poa4R0mHqdFwn9Swe/obXDe5F0jY9wtRAfNYnqk4LXY7akyvR/nrvAHxQPWUjsQ==}
-    engines: {node: '>=10'}
-    peerDependencies:
-      prom-client: '>=12.0.0'
+  /cliui@7.0.4:
+    resolution: {integrity: sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==}
     dependencies:
-      on-finished: 2.4.1
-      prom-client: 13.2.0
-      url-value-parser: 2.2.0
-    dev: false
+      string-width: 4.2.3
+      strip-ansi: 6.0.1
+      wrap-ansi: 7.0.0
 
-  /express@4.18.2:
-    resolution: {integrity: sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==}
-    engines: {node: '>= 0.10.0'}
+  /cliui@8.0.1:
+    resolution: {integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==}
+    engines: {node: '>=12'}
     dependencies:
-      accepts: 1.3.8
-      array-flatten: 1.1.1
-      body-parser: 1.20.1
-      content-disposition: 0.5.4
-      content-type: 1.0.4
-      cookie: 0.5.0
-      cookie-signature: 1.0.6
-      debug: 2.6.9
-      depd: 2.0.0
-      encodeurl: 1.0.2
-      escape-html: 1.0.3
-      etag: 1.8.1
-      finalhandler: 1.2.0
-      fresh: 0.5.2
-      http-errors: 2.0.0
-      merge-descriptors: 1.0.1
-      methods: 1.1.2
-      on-finished: 2.4.1
-      parseurl: 1.3.3
-      path-to-regexp: 0.1.7
-      proxy-addr: 2.0.7
-      qs: 6.11.0
-      range-parser: 1.2.1
-      safe-buffer: 5.2.1
-      send: 0.18.0
-      serve-static: 1.15.0
-      setprototypeof: 1.2.0
-      statuses: 2.0.1
-      type-is: 1.6.18
-      utils-merge: 1.0.1
-      vary: 1.1.2
-    transitivePeerDependencies:
-      - supports-color
+      string-width: 4.2.3
+      strip-ansi: 6.0.1
+      wrap-ansi: 7.0.0
 
-  /ext@1.7.0:
-    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+  /clone-deep@4.0.1:
+    resolution: {integrity: sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==}
+    engines: {node: '>=6'}
     dependencies:
-      type: 2.7.2
+      is-plain-object: 2.0.4
+      kind-of: 6.0.3
+      shallow-clone: 3.0.1
     dev: true
 
-  /extend-shallow@2.0.1:
-    resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      is-extendable: 0.1.1
+  /clone@1.0.4:
+    resolution: {integrity: sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==}
+    engines: {node: '>=0.8'}
+    dev: true
 
-  /extend-shallow@3.0.2:
-    resolution: {integrity: sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      assign-symbols: 1.0.0
-      is-extendable: 1.0.1
+  /clsx@1.2.1:
+    resolution: {integrity: sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==}
+    engines: {node: '>=6'}
     dev: true
 
-  /extend@3.0.2:
-    resolution: {integrity: sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==}
+  /cluster-key-slot@1.1.2:
+    resolution: {integrity: sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA==}
+    engines: {node: '>=0.10.0'}
 
-  /external-editor@3.1.0:
-    resolution: {integrity: sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==}
-    engines: {node: '>=4'}
+  /co@4.6.0:
+    resolution: {integrity: sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==}
+    engines: {iojs: '>= 1.0.0', node: '>= 0.12.0'}
+
+  /codemirror-lang-html-n8n@1.0.0:
+    resolution: {integrity: sha512-ofNP6VTDGJ5rue+kTCZlDZdF1PnE0sl2cAkfrsCAd5MlBgDmqTwuFJIkTI6KXOJXs0ucdTYH6QLhy9BSW7EaOQ==}
     dependencies:
-      chardet: 0.7.0
-      iconv-lite: 0.4.24
-      tmp: 0.0.33
+      '@codemirror/autocomplete': 6.11.1(@codemirror/language@6.9.3)(@codemirror/state@6.3.3)(@codemirror/view@6.22.3)(@lezer/common@1.1.0)
+      '@codemirror/lang-css': 6.0.1(@codemirror/view@6.22.3)(@lezer/common@1.1.0)
+      '@codemirror/lang-javascript': 6.2.1
+      '@codemirror/language': 6.9.3
+      '@codemirror/state': 6.3.3
+      '@codemirror/view': 6.22.3
+      '@lezer/common': 1.1.0
+      '@lezer/css': 1.1.1
+      '@lezer/highlight': 1.1.1
+      '@lezer/html': 1.3.0
+      '@lezer/lr': 1.2.3
     dev: false
 
-  /extglob@2.0.4:
-    resolution: {integrity: sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==}
-    engines: {node: '>=0.10.0'}
+  /codemirror-lang-n8n-expression@0.3.0(@codemirror/state@6.3.3)(@codemirror/view@6.22.3)(@lezer/common@1.1.0):
+    resolution: {integrity: sha512-lY3qD+FB0/JCotK9hV40YhE+jC98iyC8L667pnguq7gxgIU3Kgy2RHy+PAxz/GpLR7BYtUMyVumZU7dJnjiXbw==}
     dependencies:
-      array-unique: 0.3.2
-      define-property: 1.0.0
-      expand-brackets: 2.1.4
-      extend-shallow: 2.0.1
-      fragment-cache: 0.2.1
-      regex-not: 1.0.2
-      snapdragon: 0.8.2
-      to-regex: 3.0.2
+      '@codemirror/autocomplete': 6.11.1(@codemirror/language@6.9.3)(@codemirror/state@6.3.3)(@codemirror/view@6.22.3)(@lezer/common@1.1.0)
+      '@codemirror/language': 6.9.3
+      '@lezer/highlight': 1.1.1
+      '@lezer/lr': 1.2.3
     transitivePeerDependencies:
-      - supports-color
-    dev: true
+      - '@codemirror/state'
+      - '@codemirror/view'
+      - '@lezer/common'
+    dev: false
 
-  /extract-stack@2.0.0:
-    resolution: {integrity: sha512-AEo4zm+TenK7zQorGK1f9mJ8L14hnTDi2ZQPR+Mub1NX8zimka1mXpV5LpH8x9HoUmFSHZCfLHqWvp0Y4FxxzQ==}
-    engines: {node: '>=8'}
-    dev: true
+  /cohere-ai@6.2.2:
+    resolution: {integrity: sha512-+Tq+4e8N/YWKJqFpWaULsfbZR/GOvGh8WWYFKR1bpipu8bCok3VcbTPnBmIToQiIqOgFpGk3HsA4b0guVyL3vg==}
+    dev: false
 
-  /extract-zip@1.7.0:
-    resolution: {integrity: sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==}
-    hasBin: true
+  /cohere-ai@7.9.5:
+    resolution: {integrity: sha512-tr8LUR3Q46agFpfEwaYwzYO4qAuN0/R/8YroG4bc86LadOacBAabctZUq0zfCdLiL7gB4yWJs4QCzfpRH3rQuw==}
     dependencies:
-      concat-stream: 1.6.2
-      debug: 2.6.9
-      mkdirp: 0.5.6
-      yauzl: 2.10.0
+      form-data: 4.0.0
+      js-base64: 3.7.2
+      node-fetch: 2.7.0(encoding@0.1.13)
+      qs: 6.11.2
+      url-join: 4.0.1
     transitivePeerDependencies:
-      - supports-color
-    dev: true
+      - encoding
+    dev: false
 
-  /extract-zip@2.0.1(supports-color@8.1.1):
-    resolution: {integrity: sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==}
-    engines: {node: '>= 10.17.0'}
-    hasBin: true
+  /collect-v8-coverage@1.0.1:
+    resolution: {integrity: sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==}
+
+  /color-convert@1.9.3:
+    resolution: {integrity: sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==}
     dependencies:
-      debug: 4.3.4(supports-color@8.1.1)
-      get-stream: 5.2.0
-      yauzl: 2.10.0
-    optionalDependencies:
-      '@types/yauzl': 2.10.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
+      color-name: 1.1.3
 
-  /extsprintf@1.3.0:
-    resolution: {integrity: sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==}
-    engines: {'0': node >=0.6.0}
+  /color-convert@2.0.1:
+    resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==}
+    engines: {node: '>=7.0.0'}
+    dependencies:
+      color-name: 1.1.4
 
-  /fake-xml-http-request@2.1.2:
-    resolution: {integrity: sha512-HaFMBi7r+oEC9iJNpc3bvcW7Z7iLmM26hPDmlb0mFwyANSsOQAtJxbdWsXITKOzZUyMYK0zYCv3h5yDj9TsiXg==}
-    dev: true
+  /color-name@1.1.3:
+    resolution: {integrity: sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==}
 
-  /fancy-log@1.3.3:
-    resolution: {integrity: sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==}
-    engines: {node: '>= 0.10'}
+  /color-name@1.1.4:
+    resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==}
+
+  /color-string@1.9.1:
+    resolution: {integrity: sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==}
     dependencies:
-      ansi-gray: 0.1.1
-      color-support: 1.1.3
-      parse-node-version: 1.0.1
-      time-stamp: 1.1.0
-    dev: true
+      color-name: 1.1.4
+      simple-swizzle: 0.2.2
+    dev: false
 
-  /fast-deep-equal@3.1.3:
-    resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==}
+  /color-support@1.1.3:
+    resolution: {integrity: sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==}
+    hasBin: true
+    dev: false
+    optional: true
 
-  /fast-diff@1.2.0:
-    resolution: {integrity: sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==}
-    dev: true
+  /color@3.2.1:
+    resolution: {integrity: sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==}
+    dependencies:
+      color-convert: 1.9.3
+      color-string: 1.9.1
+    dev: false
 
-  /fast-glob@3.2.12:
-    resolution: {integrity: sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==}
-    engines: {node: '>=8.6.0'}
+  /color@4.2.3:
+    resolution: {integrity: sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==}
+    engines: {node: '>=12.5.0'}
     dependencies:
-      '@nodelib/fs.stat': 2.0.5
-      '@nodelib/fs.walk': 1.2.8
-      glob-parent: 5.1.2
-      merge2: 1.4.1
-      micromatch: 4.0.5
+      color-convert: 2.0.1
+      color-string: 1.9.1
+    dev: false
 
-  /fast-json-stable-stringify@2.1.0:
-    resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==}
+  /colord@2.9.3:
+    resolution: {integrity: sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==}
+    dev: true
 
-  /fast-levenshtein@1.1.4:
-    resolution: {integrity: sha512-Ia0sQNrMPXXkqVFt6w6M1n1oKo3NfKs+mvaV811Jwir7vAk9a6PVV9VPYf6X3BU97QiLEmuW3uXH9u87zDFfdw==}
+  /colorette@1.4.0:
+    resolution: {integrity: sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==}
     dev: true
 
-  /fast-levenshtein@2.0.6:
-    resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==}
+  /colorette@2.0.19:
+    resolution: {integrity: sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==}
+    dev: true
 
-  /fast-safe-stringify@2.1.1:
-    resolution: {integrity: sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==}
+  /colors@1.2.5:
+    resolution: {integrity: sha512-erNRLao/Y3Fv54qUa0LBB+//Uf3YwMUmdJinN20yMXm9zdKKqH9wt7R9IIVZ+K7ShzfpLV/Zg8+VyrBJYB4lpg==}
+    engines: {node: '>=0.1.90'}
+    dev: true
 
-  /fastq@1.15.0:
-    resolution: {integrity: sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==}
-    dependencies:
-      reusify: 1.0.4
+  /colors@1.4.0:
+    resolution: {integrity: sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==}
+    engines: {node: '>=0.1.90'}
+    dev: false
 
-  /fb-watchman@2.0.2:
-    resolution: {integrity: sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==}
+  /colorspace@1.1.4:
+    resolution: {integrity: sha512-BgvKJiuVu1igBUF2kEjRCZXol6wiiGbY5ipL/oVPwm0BL9sIpMIzM8IK7vwuxIIzOXMV3Ey5w+vxhm0rR/TN8w==}
     dependencies:
-      bser: 2.1.1
-    dev: true
+      color: 3.2.1
+      text-hex: 1.0.0
+    dev: false
 
-  /fd-slicer@1.1.0:
-    resolution: {integrity: sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==}
+  /combined-stream@1.0.8:
+    resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==}
+    engines: {node: '>= 0.8'}
     dependencies:
-      pend: 1.2.0
-    dev: true
+      delayed-stream: 1.0.0
 
-  /fecha@4.2.3:
-    resolution: {integrity: sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw==}
+  /commander@10.0.1:
+    resolution: {integrity: sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==}
+    engines: {node: '>=14'}
+
+  /commander@11.1.0:
+    resolution: {integrity: sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==}
+    engines: {node: '>=16'}
     dev: false
 
-  /fetch-retry@5.0.3:
-    resolution: {integrity: sha512-uJQyMrX5IJZkhoEUBQ3EjxkeiZkppBd5jS/fMTJmfZxLSiaQjv2zD0kTvuvkSH89uFvgSlB6ueGpjD3HWN7Bxw==}
-    dev: true
+  /commander@2.20.3:
+    resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==}
 
-  /fflate@0.7.4:
-    resolution: {integrity: sha512-5u2V/CDW15QM1XbbgS+0DfPxVB+jUKhWEKuuFuHncbk3tEEqzmoXL+2KyOFuKGqOnmdIy0/davWF1CkuwtibCw==}
+  /commander@5.1.0:
+    resolution: {integrity: sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==}
+    engines: {node: '>= 6'}
     dev: false
 
-  /figures@3.2.0:
-    resolution: {integrity: sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==}
-    engines: {node: '>=8'}
-    dependencies:
-      escape-string-regexp: 1.0.5
+  /commander@6.2.1:
+    resolution: {integrity: sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==}
+    engines: {node: '>= 6'}
 
-  /file-entry-cache@6.0.1:
-    resolution: {integrity: sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==}
-    engines: {node: ^10.12.0 || >=12.0.0}
-    dependencies:
-      flat-cache: 3.0.4
+  /commander@7.2.0:
+    resolution: {integrity: sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==}
+    engines: {node: '>= 10'}
     dev: true
 
-  /file-saver@2.0.5:
-    resolution: {integrity: sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==}
+  /commander@8.3.0:
+    resolution: {integrity: sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==}
+    engines: {node: '>= 12'}
+    dev: true
+
+  /commander@9.4.1:
+    resolution: {integrity: sha512-5EEkTNyHNGFPD2H+c/dXXfQZYa/scCKasxWcXJaWnNJ99pnQN9Vnmqow+p+PlFPE63Q6mThaZws1T+HxfpgtPw==}
+    engines: {node: ^12.20.0 || >=14}
+
+  /commist@3.2.0:
+    resolution: {integrity: sha512-4PIMoPniho+LqXmpS5d3NuGYncG6XWlkBSVGiWycL22dd42OYdUGil2CWuzklaJoNxyxUSpO4MKIBU94viWNAw==}
     dev: false
 
-  /file-system-cache@2.0.2:
-    resolution: {integrity: sha512-lp4BHO4CWqvRyx88Tt3quZic9ZMf4cJyquYq7UI8sH42Bm2ArlBBjKQAalZOo+UfaBassb7X123Lik5qZ/tSAA==}
-    dependencies:
-      fs-extra: 11.1.0
-      ramda: 0.28.0
+  /common-tags@1.8.2:
+    resolution: {integrity: sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==}
+    engines: {node: '>=4.0.0'}
     dev: true
 
-  /file-type@16.5.4:
-    resolution: {integrity: sha512-/yFHK0aGjFEgDJjEKP0pWCplsPFPhwyfwevf/pVxiN0tmE4L9LmwWxWukdJSHdoCli4VgQLehjJtwQBnqmsKcw==}
-    engines: {node: '>=10'}
-    dependencies:
-      readable-web-to-node-stream: 3.0.2
-      strtok3: 6.3.0
-      token-types: 4.2.1
-    dev: false
+  /commondir@1.0.1:
+    resolution: {integrity: sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==}
+    dev: true
 
-  /file-type@3.9.0:
-    resolution: {integrity: sha512-RLoqTXE8/vPmMuTI88DAzhMYC99I8BWv7zYP4A1puo5HIjEJ5EX48ighy4ZyKMG9EDXxBgW6e++cn7d1xuFghA==}
-    engines: {node: '>=0.10.0'}
-    dev: false
+  /component-emitter@1.3.0:
+    resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
+    dev: true
 
-  /file-uri-to-path@2.0.0:
-    resolution: {integrity: sha512-hjPFI8oE/2iQPVe4gbrJ73Pp+Xfub2+WI2LlXDbsaJBwT5wuMh35WNWVYYTpnz895shtwfyutMFLFywpQAFdLg==}
-    engines: {node: '>= 6'}
+  /component-type@1.2.1:
+    resolution: {integrity: sha512-Kgy+2+Uwr75vAi6ChWXgHuLvd+QLD7ssgpaRq2zCvt80ptvAfMc/hijcJxXkBa2wMlEZcJvC2H8Ubo+A9ATHIg==}
     dev: false
 
-  /filelist@1.0.4:
-    resolution: {integrity: sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==}
+  /compressible@2.0.18:
+    resolution: {integrity: sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==}
+    engines: {node: '>= 0.6'}
     dependencies:
-      minimatch: 5.1.5
+      mime-db: 1.52.0
+
+  /compression@1.7.4:
+    resolution: {integrity: sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==}
+    engines: {node: '>= 0.8.0'}
+    dependencies:
+      accepts: 1.3.8
+      bytes: 3.0.0
+      compressible: 2.0.18
+      debug: 2.6.9
+      on-headers: 1.0.2
+      safe-buffer: 5.1.2
+      vary: 1.1.2
+    transitivePeerDependencies:
+      - supports-color
+
+  /compute-gcd@1.2.1:
+    resolution: {integrity: sha512-TwMbxBNz0l71+8Sc4czv13h4kEqnchV9igQZBi6QUaz09dnz13juGnnaWWJTRsP3brxOoxeB4SA2WELLw1hCtg==}
+    dependencies:
+      validate.io-array: 1.0.6
+      validate.io-function: 1.0.2
+      validate.io-integer-array: 1.0.0
+    dev: false
 
-  /fill-range@4.0.0:
-    resolution: {integrity: sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==}
-    engines: {node: '>=0.10.0'}
+  /compute-lcm@1.1.2:
+    resolution: {integrity: sha512-OFNPdQAXnQhDSKioX8/XYT6sdUlXwpeMjfd6ApxMJfyZ4GxmLR1xvMERctlYhlHwIiz6CSpBc2+qYKjHGZw4TQ==}
     dependencies:
-      extend-shallow: 2.0.1
-      is-number: 3.0.0
-      repeat-string: 1.6.1
-      to-regex-range: 2.1.1
+      compute-gcd: 1.2.1
+      validate.io-array: 1.0.6
+      validate.io-function: 1.0.2
+      validate.io-integer-array: 1.0.0
+    dev: false
+
+  /computeds@0.0.1:
+    resolution: {integrity: sha512-7CEBgcMjVmitjYo5q8JTJVra6X5mQ20uTThdK+0kR7UEaDrAWEQcRiBtWJzga4eRpP6afNwwLsX2SET2JhVB1Q==}
     dev: true
 
-  /fill-range@7.0.1:
-    resolution: {integrity: sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==}
-    engines: {node: '>=8'}
-    dependencies:
-      to-regex-range: 5.0.1
+  /concat-map@0.0.1:
+    resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}
 
-  /filter-obj@1.1.0:
-    resolution: {integrity: sha512-8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ==}
-    engines: {node: '>=0.10.0'}
+  /concat-stream@1.6.2:
+    resolution: {integrity: sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==}
+    engines: {'0': node >= 0.8}
+    dependencies:
+      buffer-from: 1.1.2
+      inherits: 2.0.4
+      readable-stream: 2.3.7
+      typedarray: 0.0.6
     dev: false
 
-  /finalhandler@1.2.0:
-    resolution: {integrity: sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==}
-    engines: {node: '>= 0.8'}
+  /concat-stream@2.0.0:
+    resolution: {integrity: sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==}
+    engines: {'0': node >= 6.0}
     dependencies:
-      debug: 2.6.9
-      encodeurl: 1.0.2
-      escape-html: 1.0.3
-      on-finished: 2.4.1
-      parseurl: 1.3.3
-      statuses: 2.0.1
-      unpipe: 1.0.0
-    transitivePeerDependencies:
-      - supports-color
+      buffer-from: 1.1.2
+      inherits: 2.0.4
+      readable-stream: 3.6.0
+      typedarray: 0.0.6
+    dev: false
 
-  /find-cache-dir@2.1.0:
-    resolution: {integrity: sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==}
-    engines: {node: '>=6'}
+  /concurrently@8.2.0:
+    resolution: {integrity: sha512-nnLMxO2LU492mTUj9qX/az/lESonSZu81UznYDoXtz1IQf996ixVqPAgHXwvHiHCAef/7S8HIK+fTFK7Ifk8YA==}
+    engines: {node: ^14.13.0 || >=16.0.0}
+    hasBin: true
     dependencies:
-      commondir: 1.0.1
-      make-dir: 2.1.0
-      pkg-dir: 3.0.0
+      chalk: 4.1.2
+      date-fns: 2.30.0
+      lodash: 4.17.21
+      rxjs: 7.8.1
+      shell-quote: 1.8.1
+      spawn-command: 0.0.2
+      supports-color: 8.1.1
+      tree-kill: 1.2.2
+      yargs: 17.7.2
     dev: true
 
-  /find-cache-dir@3.3.2:
-    resolution: {integrity: sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==}
-    engines: {node: '>=8'}
+  /config-chain@1.1.13:
+    resolution: {integrity: sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==}
     dependencies:
-      commondir: 1.0.1
-      make-dir: 3.1.0
-      pkg-dir: 4.2.0
+      ini: 1.3.8
+      proto-list: 1.2.4
     dev: true
 
-  /find-up@1.1.2:
-    resolution: {integrity: sha512-jvElSjyuo4EMQGoTwo1uJU5pQMwTW5lS1x05zzfJuTIyLR3zwO27LYrxNg+dlvKpGOuGy/MzBdXh80g0ve5+HA==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      path-exists: 2.1.0
-      pinkie-promise: 2.0.1
+  /confusing-browser-globals@1.0.11:
+    resolution: {integrity: sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==}
     dev: true
 
-  /find-up@3.0.0:
-    resolution: {integrity: sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==}
-    engines: {node: '>=6'}
-    dependencies:
-      locate-path: 3.0.0
+  /consola@3.2.3:
+    resolution: {integrity: sha512-I5qxpzLv+sJhTVEoLYNcTW+bThDCPsit0vLNKShZx6rLtpilNpmmeTPaeqJb9ZE9dV3DGaeby6Vuhrw38WjeyQ==}
+    engines: {node: ^14.18.0 || >=16.10.0}
     dev: true
 
-  /find-up@4.1.0:
-    resolution: {integrity: sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==}
-    engines: {node: '>=8'}
-    dependencies:
-      locate-path: 5.0.0
-      path-exists: 4.0.0
+  /console-control-strings@1.1.0:
+    resolution: {integrity: sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==}
+    dev: false
+    optional: true
 
-  /find-up@5.0.0:
-    resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==}
-    engines: {node: '>=10'}
+  /constant-case@3.0.4:
+    resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
-      locate-path: 6.0.0
-      path-exists: 4.0.0
-    dev: true
+      no-case: 3.0.4
+      tslib: 2.6.2
+      upper-case: 2.0.2
+    dev: false
 
-  /find-yarn-workspace-root@2.0.0:
-    resolution: {integrity: sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ==}
+  /constantinople@4.0.1:
+    resolution: {integrity: sha512-vCrqcSIq4//Gx74TXXCGnHpulY1dskqLTFGDmhrGxzeXL8lF8kvXv6mpNWlJj1uD4DW23D4ljAqbY4RRaaUZIw==}
     dependencies:
-      micromatch: 4.0.5
+      '@babel/parser': 7.24.0
+      '@babel/types': 7.24.0
     dev: true
 
-  /findup-sync@2.0.0:
-    resolution: {integrity: sha512-vs+3unmJT45eczmcAZ6zMJtxN3l/QXeccaXQx5cu/MeJMhewVfoWZqibRkOxPnmoR59+Zy5hjabfQc6JLSah4g==}
-    engines: {node: '>= 0.10'}
+  /content-disposition@0.5.4:
+    resolution: {integrity: sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==}
+    engines: {node: '>= 0.6'}
     dependencies:
-      detect-file: 1.0.0
-      is-glob: 3.1.0
-      micromatch: 3.1.10
-      resolve-dir: 1.0.1
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
+      safe-buffer: 5.2.1
 
-  /findup-sync@3.0.0:
-    resolution: {integrity: sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==}
-    engines: {node: '>= 0.10'}
+  /content-type@1.0.5:
+    resolution: {integrity: sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==}
+    engines: {node: '>= 0.6'}
+
+  /convert-source-map@1.9.0:
+    resolution: {integrity: sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==}
+
+  /convert-source-map@2.0.0:
+    resolution: {integrity: sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==}
+
+  /convict@6.2.4:
+    resolution: {integrity: sha512-qN60BAwdMVdofckX7AlohVJ2x9UvjTNoKVXCL2LxFk1l7757EJqf1nySdMkPQer0bt8kQ5lQiyZ9/2NvrFBuwQ==}
+    engines: {node: '>=6'}
     dependencies:
-      detect-file: 1.0.0
-      is-glob: 4.0.3
-      micromatch: 3.1.10
-      resolve-dir: 1.0.1
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
+      lodash.clonedeep: 4.5.0
+      yargs-parser: 20.2.9
+    dev: false
 
-  /fined@1.2.0:
-    resolution: {integrity: sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==}
-    engines: {node: '>= 0.10'}
+  /cookie-parser@1.4.6:
+    resolution: {integrity: sha512-z3IzaNjdwUC2olLIB5/ITd0/setiaFMLYiZJle7xg5Fe9KWAceil7xszYfHHBtDFYLSgJduS2Ty0P1uJdPDJeA==}
+    engines: {node: '>= 0.8.0'}
     dependencies:
-      expand-tilde: 2.0.2
-      is-plain-object: 2.0.4
-      object.defaults: 1.1.0
-      object.pick: 1.3.0
-      parse-filepath: 1.0.2
-    dev: true
+      cookie: 0.4.1
+      cookie-signature: 1.0.6
+    dev: false
 
-  /first-match@0.0.1:
-    resolution: {integrity: sha512-VvKbnaxrC0polTFDC+teKPTdl2mn6B/KUW+WB3C9RzKDeNwbzfLdnUz3FxC+tnjvus6bI0jWrWicQyVIPdS37A==}
+  /cookie-signature@1.0.6:
+    resolution: {integrity: sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==}
+
+  /cookie@0.4.1:
+    resolution: {integrity: sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==}
+    engines: {node: '>= 0.6'}
     dev: false
 
-  /flagged-respawn@1.0.1:
-    resolution: {integrity: sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==}
-    engines: {node: '>= 0.10'}
+  /cookie@0.4.2:
+    resolution: {integrity: sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==}
+    engines: {node: '>= 0.6'}
+    dev: false
+
+  /cookie@0.6.0:
+    resolution: {integrity: sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==}
+    engines: {node: '>= 0.6'}
+
+  /cookiejar@2.1.4:
+    resolution: {integrity: sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw==}
     dev: true
 
-  /flat-cache@3.0.4:
-    resolution: {integrity: sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==}
-    engines: {node: ^10.12.0 || >=12.0.0}
+  /core-js-compat@3.36.0:
+    resolution: {integrity: sha512-iV9Pd/PsgjNWBXeq8XRtWVSgz2tKAfhfvBs7qxYty+RlRd+OCksaWmOnc4JKrTc1cToXL1N0s3l/vwlxPtdElw==}
     dependencies:
-      flatted: 3.2.7
-      rimraf: 3.0.2
+      browserslist: 4.23.0
     dev: true
 
-  /flatted@3.2.7:
-    resolution: {integrity: sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==}
-
-  /flow-parser@0.197.0:
-    resolution: {integrity: sha512-yhwkJPxH1JBg0aJunk/jVRy5p3UhVZBGkzL1hq/GK+GaBh6bKr2YKkv6gDuiufaw+i3pKWQgOLtD++1cvrgXLA==}
-    engines: {node: '>=0.4.0'}
+  /core-js@3.31.0:
+    resolution: {integrity: sha512-NIp2TQSGfR6ba5aalZD+ZQ1fSxGhDo/s1w0nx3RYzf2pnJxt7YynxFlFScP6eV7+GZsKO95NSjGxyJsU3DZgeQ==}
     dev: true
 
-  /flush-write-stream@1.1.1:
-    resolution: {integrity: sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==}
-    dependencies:
-      inherits: 2.0.4
-      readable-stream: 2.3.7
+  /core-js@3.35.0:
+    resolution: {integrity: sha512-ntakECeqg81KqMueeGJ79Q5ZgQNR+6eaE8sxGCx62zMbAIj65q+uYvatToew3m6eAGdU4gNZwpZ34NMe4GYswg==}
     dev: true
 
-  /fn.name@1.1.0:
-    resolution: {integrity: sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==}
-    dev: false
+  /core-util-is@1.0.2:
+    resolution: {integrity: sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==}
 
-  /follow-redirects@1.15.2(debug@3.2.7):
-    resolution: {integrity: sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==}
-    engines: {node: '>=4.0'}
-    peerDependencies:
-      debug: '*'
-    peerDependenciesMeta:
-      debug:
-        optional: true
-    dependencies:
-      debug: 3.2.7(supports-color@5.5.0)
-    dev: false
+  /core-util-is@1.0.3:
+    resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==}
 
-  /follow-redirects@1.15.2(debug@4.3.2):
-    resolution: {integrity: sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==}
-    engines: {node: '>=4.0'}
-    peerDependencies:
-      debug: '*'
-    peerDependenciesMeta:
-      debug:
-        optional: true
+  /cors@2.8.5:
+    resolution: {integrity: sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==}
+    engines: {node: '>= 0.10'}
     dependencies:
-      debug: 4.3.2
+      object-assign: 4.1.1
+      vary: 1.1.2
+    dev: false
 
-  /for-each@0.3.3:
-    resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==}
+  /cpu-features@0.0.4:
+    resolution: {integrity: sha512-fKiZ/zp1mUwQbnzb9IghXtHtDoTMtNeb8oYGx6kX2SYfhnG0HNdBEBIzB9b5KlXu5DQPhfy3mInbBxFcgwAr3A==}
+    engines: {node: '>=10.0.0'}
     dependencies:
-      is-callable: 1.2.7
-
-  /for-in@1.0.2:
-    resolution: {integrity: sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+      buildcheck: 0.0.3
+      nan: 2.17.0
+    dev: false
+    optional: true
 
-  /for-own@1.0.0:
-    resolution: {integrity: sha512-0OABksIGrxKK8K4kynWkQ7y1zounQxP+CWnyclVwj81KW3vlLlGUx57DKGcP/LH216GzqnstnPocF16Nxs0Ycg==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      for-in: 1.0.2
-    dev: true
+  /crelt@1.0.5:
+    resolution: {integrity: sha512-+BO9wPPi+DWTDcNYhr/W90myha8ptzftZT+LwcmUbbok0rcP/fequmFYCw8NMoH7pkAZQzU78b3kYrlua5a9eA==}
+    dev: false
 
-  /foreground-child@2.0.0:
-    resolution: {integrity: sha512-dCIq9FpEcyQyXKCkyzmlPTFNgrCzPudOe+mhvJU5zAtlBnGVy2yKxtfsxK2tQBThwq225jcvBjpw1Gr40uzZCA==}
-    engines: {node: '>=8.0.0'}
+  /crlf-normalize@1.0.19(ts-toolbelt@9.6.0):
+    resolution: {integrity: sha512-cpV1h7YwFtIA36NHtyWuMMMPGxUp6zrzxjRnFEDLh1ZH0SPNUqCWmM8RlKVycxvKHgZOxWXs3XxX/DAlBAjFzA==}
     dependencies:
-      cross-spawn: 7.0.3
-      signal-exit: 3.0.7
-    dev: true
-
-  /forever-agent@0.6.1:
-    resolution: {integrity: sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==}
+      ts-type: 3.0.1(ts-toolbelt@9.6.0)
+    transitivePeerDependencies:
+      - ts-toolbelt
+    dev: false
 
-  /fork-ts-checker-webpack-plugin@6.5.2(typescript@5.0.3)(vue-template-compiler@2.7.14)(webpack@5.75.0):
-    resolution: {integrity: sha512-m5cUmF30xkZ7h4tWUgTAcEaKmUW7tfyUyTqNNOz7OxWJ0v1VWKTcOvH8FWHUwSjlW/356Ijc9vi3XfcPstpQKA==}
-    engines: {node: '>=10', yarn: '>=1.0.0'}
-    peerDependencies:
-      eslint: '>= 6'
-      typescript: '>= 2.7'
-      vue-template-compiler: '*'
-      webpack: '>= 4'
-    peerDependenciesMeta:
-      eslint:
-        optional: true
-      vue-template-compiler:
-        optional: true
+  /cron-parser@4.9.0:
+    resolution: {integrity: sha512-p0SaNjrHOnQeR8/VnfGbmg9te2kfyYSQ7Sc/j/6DtPL3JQvKxmjO9TSjNFpujqV3vEYYBvNNvXSxzyksBWAx1Q==}
+    engines: {node: '>=12.0.0'}
     dependencies:
-      '@babel/code-frame': 7.18.6
-      '@types/json-schema': 7.0.11
-      chalk: 4.1.2
-      chokidar: 3.5.2
-      cosmiconfig: 6.0.0
-      deepmerge: 4.2.2
-      fs-extra: 9.1.0
-      glob: 7.2.3
-      memfs: 3.4.13
-      minimatch: 3.1.2
-      schema-utils: 2.7.0
-      semver: 7.3.8
-      tapable: 1.1.3
-      typescript: 5.0.3
-      vue-template-compiler: 2.7.14
-      webpack: 5.75.0(esbuild@0.16.17)
-    dev: true
+      luxon: 3.4.4
+    dev: false
 
-  /form-data@2.3.3:
-    resolution: {integrity: sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==}
-    engines: {node: '>= 0.12'}
+  /cron@1.7.2:
+    resolution: {integrity: sha512-+SaJ2OfeRvfQqwXQ2kgr0Y5pzBR/lijf5OpnnaruwWnmI799JfWr2jN2ItOV9s3A/+TFOt6mxvKzQq5F0Jp6VQ==}
     dependencies:
-      asynckit: 0.4.0
-      combined-stream: 1.0.8
-      mime-types: 2.1.35
+      moment-timezone: 0.5.37
+    dev: false
 
-  /form-data@2.5.1:
-    resolution: {integrity: sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==}
-    engines: {node: '>= 0.12'}
+  /cross-env@7.0.3:
+    resolution: {integrity: sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==}
+    engines: {node: '>=10.14', npm: '>=6', yarn: '>=1'}
+    hasBin: true
     dependencies:
-      asynckit: 0.4.0
-      combined-stream: 1.0.8
-      mime-types: 2.1.35
+      cross-spawn: 7.0.3
     dev: true
 
-  /form-data@3.0.1:
-    resolution: {integrity: sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==}
-    engines: {node: '>= 6'}
+  /cross-fetch@3.1.8(encoding@0.1.13):
+    resolution: {integrity: sha512-cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg==}
     dependencies:
-      asynckit: 0.4.0
-      combined-stream: 1.0.8
-      mime-types: 2.1.35
+      node-fetch: 2.7.0(encoding@0.1.13)
+    transitivePeerDependencies:
+      - encoding
+    dev: false
 
-  /form-data@4.0.0:
-    resolution: {integrity: sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==}
-    engines: {node: '>= 6'}
+  /cross-spawn@4.0.2:
+    resolution: {integrity: sha512-yAXz/pA1tD8Gtg2S98Ekf/sewp3Lcp3YoFKJ4Hkp5h5yLWnKVTDU0kwjKJ8NDCYcfTLfyGkzTikst+jWypT1iA==}
     dependencies:
-      asynckit: 0.4.0
-      combined-stream: 1.0.8
-      mime-types: 2.1.35
-
-  /formidable@1.2.6:
-    resolution: {integrity: sha512-KcpbcpuLNOwrEjnbpMC0gS+X8ciDoZE1kkqzat4a8vrprf+s9pKNQ/QIwWfbfs4ltgmFl3MD177SNTkve3BwGQ==}
-    deprecated: 'Please upgrade to latest, formidable@v2 or formidable@v3! Check these notes: https://bit.ly/2ZEqIau'
+      lru-cache: 4.1.5
+      which: 1.3.1
     dev: false
 
-  /formidable@2.1.2:
-    resolution: {integrity: sha512-CM3GuJ57US06mlpQ47YcunuUZ9jpm8Vx+P2CGt2j7HpgkKZO/DJYQ0Bobim8G6PFQmK5lOqOOdUXboU+h73A4g==}
+  /cross-spawn@7.0.3:
+    resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==}
+    engines: {node: '>= 8'}
     dependencies:
-      dezalgo: 1.0.4
-      hexoid: 1.0.0
-      once: 1.4.0
-      qs: 6.11.0
-    dev: true
+      path-key: 3.1.1
+      shebang-command: 2.0.0
+      which: 2.0.2
 
-  /formstream@1.1.1:
-    resolution: {integrity: sha512-yHRxt3qLFnhsKAfhReM4w17jP+U1OlhUjnKPPtonwKbIJO7oBP0MvoxkRUwb8AU9n0MIkYy5X5dK6pQnbj+R2Q==}
-    dependencies:
-      destroy: 1.2.0
-      mime: 2.6.0
-      pause-stream: 0.0.11
+  /crypt@0.0.2:
+    resolution: {integrity: sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==}
     dev: false
 
-  /forwarded@0.2.0:
-    resolution: {integrity: sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==}
-    engines: {node: '>= 0.6'}
+  /crypto-js@4.2.0:
+    resolution: {integrity: sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==}
+    dev: false
 
-  /frac@1.1.2:
-    resolution: {integrity: sha512-w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA==}
-    engines: {node: '>=0.8'}
+  /crypto-random-string@2.0.0:
+    resolution: {integrity: sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==}
+    engines: {node: '>=8'}
+    dev: true
+
+  /csrf@3.1.0:
+    resolution: {integrity: sha512-uTqEnCvWRk042asU6JtapDTcJeeailFy4ydOQS28bj1hcLnYRiqi8SsD2jS412AY1I/4qdOwWZun774iqywf9w==}
+    engines: {node: '>= 0.8'}
+    dependencies:
+      rndm: 1.2.0
+      tsscmp: 1.0.6
+      uid-safe: 2.1.5
     dev: false
 
-  /fraction.js@4.2.0:
-    resolution: {integrity: sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==}
+  /css-color-keywords@1.0.0:
+    resolution: {integrity: sha512-FyyrDHZKEjXDpNJYvVsV960FiqQyXc/LlYmsxl2BcdMb2WPx0OGRVgTg55rPSyLSNMqP52R9r8geSp7apN3Ofg==}
+    engines: {node: '>=4'}
     dev: true
 
-  /fragment-cache@0.2.1:
-    resolution: {integrity: sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==}
-    engines: {node: '>=0.10.0'}
+  /css-declaration-sorter@7.1.1(postcss@8.4.32):
+    resolution: {integrity: sha512-dZ3bVTEEc1vxr3Bek9vGwfB5Z6ESPULhcRvO472mfjVnj8jRcTnKO8/JTczlvxM10Myb+wBM++1MtdO76eWcaQ==}
+    engines: {node: ^14 || ^16 || >=18}
+    peerDependencies:
+      postcss: ^8.0.9
     dependencies:
-      map-cache: 0.2.2
+      postcss: 8.4.32
     dev: true
 
-  /fresh@0.5.2:
-    resolution: {integrity: sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==}
-    engines: {node: '>= 0.6'}
+  /css-select@4.3.0:
+    resolution: {integrity: sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==}
+    dependencies:
+      boolbase: 1.0.0
+      css-what: 6.1.0
+      domhandler: 4.3.1
+      domutils: 2.8.0
+      nth-check: 2.1.1
+    dev: false
 
-  /from@0.1.7:
-    resolution: {integrity: sha512-twe20eF1OxVxp/ML/kq2p1uc6KvFK/+vs8WjEbeKmV2He22MKm7YF2ANIt+EOqhJ5L3K/SuuPhk0hWQDjOM23g==}
+  /css-select@5.1.0:
+    resolution: {integrity: sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==}
+    dependencies:
+      boolbase: 1.0.0
+      css-what: 6.1.0
+      domhandler: 5.0.3
+      domutils: 3.0.1
+      nth-check: 2.1.1
     dev: true
 
-  /fs-constants@1.0.0:
-    resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==}
+  /css-to-react-native@3.2.0:
+    resolution: {integrity: sha512-e8RKaLXMOFii+02mOlqwjbD00KSEKqblnpO9e++1aXS1fPQOpS1YoqdVHBqPjHNoxeF2mimzVqawm2KCbEdtHQ==}
+    dependencies:
+      camelize: 1.0.1
+      css-color-keywords: 1.0.0
+      postcss-value-parser: 4.2.0
     dev: true
 
-  /fs-extra@11.1.0:
-    resolution: {integrity: sha512-0rcTq621PD5jM/e0a3EJoGC/1TC5ZBCERW82LQuwfGnCa1V8w7dpYH1yNu+SLb6E5dkeCBzKEyLGlFrnr+dUyw==}
-    engines: {node: '>=14.14'}
+  /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'}
     dependencies:
-      graceful-fs: 4.2.10
-      jsonfile: 6.1.0
-      universalify: 2.0.0
+      mdn-data: 2.0.28
+      source-map-js: 1.0.2
     dev: true
 
-  /fs-extra@6.0.1:
-    resolution: {integrity: sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==}
+  /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}
     dependencies:
-      graceful-fs: 4.2.10
-      jsonfile: 4.0.0
-      universalify: 0.1.2
+      mdn-data: 2.0.30
+      source-map-js: 1.0.2
     dev: true
 
-  /fs-extra@8.1.0:
-    resolution: {integrity: sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==}
-    engines: {node: '>=6 <7 || >=8'}
-    dependencies:
-      graceful-fs: 4.2.10
-      jsonfile: 4.0.0
-      universalify: 0.1.2
+  /css-what@6.1.0:
+    resolution: {integrity: sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==}
+    engines: {node: '>= 6'}
 
-  /fs-extra@9.1.0:
-    resolution: {integrity: sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==}
-    engines: {node: '>=10'}
+  /css.escape@1.5.1:
+    resolution: {integrity: sha512-YUifsXXuknHlUsmlgyY0PKzgPOr7/FjCePfHNt0jxm83wHZi44VDMQ7/fGNkjY3/jV1MC+1CmZbaHzugyeRtpg==}
+    dev: true
+
+  /cssesc@3.0.0:
+    resolution: {integrity: sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==}
+    engines: {node: '>=4'}
+    hasBin: true
+    dev: true
+
+  /cssfilter@0.0.10:
+    resolution: {integrity: sha512-FAaLDaplstoRsDR8XGYH51znUN0UY7nMc6Z9/fvE8EXGwvJE9hu7W2vHwx1+bd6gCYnln9nLbzxFTrcO9YQDZw==}
+    dev: false
+
+  /cssnano-preset-default@6.0.2(postcss@8.4.32):
+    resolution: {integrity: sha512-VnZybFeZ63AiVqIUNlxqMxpj9VU8B5j0oKgP7WyVt/7mkyf97KsYkNzsPTV/RVmy54Pg7cBhOK4WATbdCB44gw==}
+    engines: {node: ^14 || ^16 || >=18.0}
+    peerDependencies:
+      postcss: ^8.4.31
     dependencies:
-      at-least-node: 1.0.0
-      graceful-fs: 4.2.10
-      jsonfile: 6.1.0
-      universalify: 2.0.0
+      css-declaration-sorter: 7.1.1(postcss@8.4.32)
+      cssnano-utils: 4.0.1(postcss@8.4.32)
+      postcss: 8.4.32
+      postcss-calc: 9.0.1(postcss@8.4.32)
+      postcss-colormin: 6.0.1(postcss@8.4.32)
+      postcss-convert-values: 6.0.1(postcss@8.4.32)
+      postcss-discard-comments: 6.0.1(postcss@8.4.32)
+      postcss-discard-duplicates: 6.0.1(postcss@8.4.32)
+      postcss-discard-empty: 6.0.1(postcss@8.4.32)
+      postcss-discard-overridden: 6.0.1(postcss@8.4.32)
+      postcss-merge-longhand: 6.0.1(postcss@8.4.32)
+      postcss-merge-rules: 6.0.2(postcss@8.4.32)
+      postcss-minify-font-values: 6.0.1(postcss@8.4.32)
+      postcss-minify-gradients: 6.0.1(postcss@8.4.32)
+      postcss-minify-params: 6.0.1(postcss@8.4.32)
+      postcss-minify-selectors: 6.0.1(postcss@8.4.32)
+      postcss-normalize-charset: 6.0.1(postcss@8.4.32)
+      postcss-normalize-display-values: 6.0.1(postcss@8.4.32)
+      postcss-normalize-positions: 6.0.1(postcss@8.4.32)
+      postcss-normalize-repeat-style: 6.0.1(postcss@8.4.32)
+      postcss-normalize-string: 6.0.1(postcss@8.4.32)
+      postcss-normalize-timing-functions: 6.0.1(postcss@8.4.32)
+      postcss-normalize-unicode: 6.0.1(postcss@8.4.32)
+      postcss-normalize-url: 6.0.1(postcss@8.4.32)
+      postcss-normalize-whitespace: 6.0.1(postcss@8.4.32)
+      postcss-ordered-values: 6.0.1(postcss@8.4.32)
+      postcss-reduce-initial: 6.0.1(postcss@8.4.32)
+      postcss-reduce-transforms: 6.0.1(postcss@8.4.32)
+      postcss-svgo: 6.0.1(postcss@8.4.32)
+      postcss-unique-selectors: 6.0.1(postcss@8.4.32)
+    dev: true
 
-  /fs-minipass@2.1.0:
-    resolution: {integrity: sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==}
-    engines: {node: '>= 8'}
+  /cssnano-utils@4.0.1(postcss@8.4.32):
+    resolution: {integrity: sha512-6qQuYDqsGoiXssZ3zct6dcMxiqfT6epy7x4R0TQJadd4LWO3sPR6JH6ZByOvVLoZ6EdwPGgd7+DR1EmX3tiXQQ==}
+    engines: {node: ^14 || ^16 || >=18.0}
+    peerDependencies:
+      postcss: ^8.4.31
     dependencies:
-      minipass: 3.3.6
+      postcss: 8.4.32
+    dev: true
 
-  /fs-mkdirp-stream@1.0.0:
-    resolution: {integrity: sha512-+vSd9frUnapVC2RZYfL3FCB2p3g4TBhaUmrsWlSudsGdnxIuUvBB2QM1VZeBtc49QFwrp+wQLrDs3+xxDgI5gQ==}
-    engines: {node: '>= 0.10'}
+  /cssnano@6.0.2(postcss@8.4.32):
+    resolution: {integrity: sha512-Tu9wv8UdN6CoiQnIVkCNvi+0rw/BwFWOJBlg2bVfEyKaadSuE3Gq/DD8tniVvggTJGwK88UjqZp7zL5sv6t1aA==}
+    engines: {node: ^14 || ^16 || >=18.0}
+    peerDependencies:
+      postcss: ^8.4.31
     dependencies:
-      graceful-fs: 4.2.10
-      through2: 2.0.5
+      cssnano-preset-default: 6.0.2(postcss@8.4.32)
+      lilconfig: 3.0.0
+      postcss: 8.4.32
     dev: true
 
-  /fs-monkey@1.0.3:
-    resolution: {integrity: sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==}
+  /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'}
+    dependencies:
+      css-tree: 2.2.1
     dev: true
 
-  /fs.realpath@1.0.0:
-    resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
+  /cssom@0.3.8:
+    resolution: {integrity: sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==}
+    dev: true
 
-  /fsevents@2.3.2:
-    resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==}
-    engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
-    os: [darwin]
-    optional: true
+  /cssom@0.5.0:
+    resolution: {integrity: sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==}
+    dev: true
 
-  /ftp@0.3.10:
-    resolution: {integrity: sha512-faFVML1aBx2UoDStmLwv2Wptt4vw5x03xxX172nhA5Y5HBshW5JweqQ2W4xL4dezQTG8inJsuYcpPHHU3X5OTQ==}
-    engines: {node: '>=0.8.0'}
+  /cssstyle@2.3.0:
+    resolution: {integrity: sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==}
+    engines: {node: '>=8'}
     dependencies:
-      readable-stream: 1.1.14
-      xregexp: 2.0.0
-    dev: false
-
-  /function-bind@1.1.1:
-    resolution: {integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==}
+      cssom: 0.3.8
+    dev: true
 
-  /function.prototype.name@1.1.5:
-    resolution: {integrity: sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==}
-    engines: {node: '>= 0.4'}
+  /cssstyle@3.0.0:
+    resolution: {integrity: sha512-N4u2ABATi3Qplzf0hWbVCdjenim8F3ojEXpBDF5hBpjzW182MjNGLqfmQ0SkSPeQ+V86ZXgeH8aXj6kayd4jgg==}
+    engines: {node: '>=14'}
     dependencies:
-      call-bind: 1.0.2
-      define-properties: 1.1.4
-      es-abstract: 1.21.1
-      functions-have-names: 1.2.3
+      rrweb-cssom: 0.6.0
+    dev: true
 
-  /functions-have-names@1.2.3:
-    resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==}
+  /csstype@3.1.2:
+    resolution: {integrity: sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==}
+    dev: true
 
-  /gauge@3.0.2:
-    resolution: {integrity: sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==}
-    engines: {node: '>=10'}
-    dependencies:
-      aproba: 2.0.0
-      color-support: 1.1.3
-      console-control-strings: 1.1.0
-      has-unicode: 2.0.1
-      object-assign: 4.1.1
-      signal-exit: 3.0.7
-      string-width: 4.2.3
-      strip-ansi: 6.0.1
-      wide-align: 1.1.5
+  /csstype@3.1.3:
+    resolution: {integrity: sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==}
 
-  /gauge@4.0.4:
-    resolution: {integrity: sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==}
-    engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
-    dependencies:
-      aproba: 2.0.0
-      color-support: 1.1.3
-      console-control-strings: 1.1.0
-      has-unicode: 2.0.1
-      signal-exit: 3.0.7
-      string-width: 4.2.3
-      strip-ansi: 6.0.1
-      wide-align: 1.1.5
+  /csv-parse@5.5.0:
+    resolution: {integrity: sha512-RxruSK3M4XgzcD7Trm2wEN+SJ26ChIb903+IWxNOcB5q4jT2Cs+hFr6QP39J05EohshRFEvyzEBoZ/466S2sbw==}
     dev: false
-    optional: true
 
-  /generate-function@2.3.1:
-    resolution: {integrity: sha512-eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ==}
+  /curlconverter@3.21.0(chokidar@3.5.2):
+    resolution: {integrity: sha512-DXCnp1A/Xa69FujksUfdvWQFAnIn/C+4Wuv8t+UVdZkF/lY5bzj98GGKOGme7V/ckSHDLxE29Xp76sJ5Cpsp5A==}
+    hasBin: true
     dependencies:
-      is-property: 1.0.2
+      '@curlconverter/yargs': 0.0.2
+      cookie: 0.4.2
+      jsesc: 3.0.2
+      nunjucks: 3.2.4(chokidar@3.5.2)
+      query-string: 7.1.3
+      string.prototype.startswith: 1.0.0
+      yamljs: 0.3.0
+    transitivePeerDependencies:
+      - chokidar
     dev: false
 
-  /generic-pool@3.9.0:
-    resolution: {integrity: sha512-hymDOu5B53XvN4QT9dBmZxPX4CWhBPPLguTZ9MMFeFa/Kg0xWVfylOVNlJji/E7yTZWFd/q9GO5TxDLq156D7g==}
-    engines: {node: '>= 4'}
+  /currency-codes@2.1.0:
+    resolution: {integrity: sha512-aASwFNP8VjZ0y0PWlSW7c9N/isYTLxK6OCbm7aVuQMk7dWO2zgup9KGiFQgeL9OGL5P/ulvCHcjQizmuEeZXtw==}
+    dependencies:
+      first-match: 0.0.1
+      nub: 0.0.0
     dev: false
 
-  /gensync@1.0.0-beta.2:
-    resolution: {integrity: sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==}
-    engines: {node: '>=6.9.0'}
+  /cypress-otp@1.0.3:
+    resolution: {integrity: sha512-o7LssfI0HRHa+TkaOE5/Aukv6M9vsoZAtYESr9m7Ky2i+HRNb2p/IRelE7Z0wJ/UK2f+nXAGZIfXqraf9EPDqw==}
+    dependencies:
+      otplib: 12.0.1
     dev: true
 
-  /get-caller-file@1.0.3:
-    resolution: {integrity: sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==}
-
-  /get-caller-file@2.0.5:
-    resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==}
-    engines: {node: 6.* || 8.* || >= 10.*}
+  /cypress-real-events@1.11.0(cypress@13.6.2):
+    resolution: {integrity: sha512-4LXVRsyq+xBh5TmlEyO1ojtBXtN7xw720Pwb9rEE9rkJuXmeH3VyoR1GGayMGr+Itqf11eEjfDewtDmcx6PWPQ==}
+    peerDependencies:
+      cypress: ^4.x || ^5.x || ^6.x || ^7.x || ^8.x || ^9.x || ^10.x || ^11.x || ^12.x || ^13.x
+    dependencies:
+      cypress: 13.6.2
+    dev: true
 
-  /get-func-name@2.0.0:
-    resolution: {integrity: sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==}
+  /cypress@13.6.2:
+    resolution: {integrity: sha512-TW3bGdPU4BrfvMQYv1z3oMqj71YI4AlgJgnrycicmPZAXtvywVFZW9DAToshO65D97rCWfG/kqMFsYB6Kp91gQ==}
+    engines: {node: ^16.0.0 || ^18.0.0 || >=20.0.0}
+    hasBin: true
+    dependencies:
+      '@cypress/request': 3.0.1
+      '@cypress/xvfb': 1.2.4(supports-color@8.1.1)
+      '@types/node': 18.16.16
+      '@types/sinonjs__fake-timers': 8.1.1
+      '@types/sizzle': 2.3.3
+      arch: 2.2.0
+      blob-util: 2.0.2
+      bluebird: 3.7.2
+      buffer: 5.7.1
+      cachedir: 2.3.0
+      chalk: 4.1.2
+      check-more-types: 2.24.0
+      cli-cursor: 3.1.0
+      cli-table3: 0.6.3
+      commander: 6.2.1
+      common-tags: 1.8.2
+      dayjs: 1.11.6
+      debug: 4.3.4(supports-color@8.1.1)
+      enquirer: 2.3.6
+      eventemitter2: 6.4.7
+      execa: 4.1.0
+      executable: 4.1.1
+      extract-zip: 2.0.1(supports-color@8.1.1)
+      figures: 3.2.0
+      fs-extra: 9.1.0
+      getos: 3.2.1
+      is-ci: 3.0.1
+      is-installed-globally: 0.4.0
+      lazy-ass: 1.6.0
+      listr2: 3.14.0(enquirer@2.3.6)
+      lodash: 4.17.21
+      log-symbols: 4.1.0
+      minimist: 1.2.8
+      ospath: 1.2.2
+      pretty-bytes: 5.6.0
+      process: 0.11.10
+      proxy-from-env: 1.0.0
+      request-progress: 3.0.0
+      semver: 7.6.0
+      supports-color: 8.1.1
+      tmp: 0.2.1
+      untildify: 4.0.0
+      yauzl: 2.10.0
     dev: true
 
-  /get-intrinsic@1.1.3:
-    resolution: {integrity: sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==}
+  /d3-dsv@2.0.0:
+    resolution: {integrity: sha512-E+Pn8UJYx9mViuIUkoc93gJGGYut6mSDKy2+XaPwccwkRGlR+LO97L2VCCRjQivTwLHkSnAJG7yo00BWY6QM+w==}
+    hasBin: true
     dependencies:
-      function-bind: 1.1.1
-      has: 1.0.3
-      has-symbols: 1.0.3
-
-  /get-package-type@0.1.0:
-    resolution: {integrity: sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==}
-    engines: {node: '>=8.0.0'}
-
-  /get-port@5.1.1:
-    resolution: {integrity: sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==}
-    engines: {node: '>=8'}
+      commander: 2.20.3
+      iconv-lite: 0.4.24
+      rw: 1.3.3
+    dev: false
 
-  /get-stream@3.0.0:
-    resolution: {integrity: sha512-GlhdIUuVakc8SJ6kK0zAFbiGzRFzNnY4jUuEbV9UROo4Y+0Ny4fjvcZFVTeDA4odpFyOQzaw6hXukJSq/f28sQ==}
-    engines: {node: '>=4'}
-    dev: true
+  /d@1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
 
-  /get-stream@5.2.0:
-    resolution: {integrity: sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==}
-    engines: {node: '>=8'}
+  /dashdash@1.14.1:
+    resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
+    engines: {node: '>=0.10'}
     dependencies:
-      pump: 3.0.0
-    dev: true
+      assert-plus: 1.0.0
 
-  /get-stream@6.0.1:
-    resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==}
-    engines: {node: '>=10'}
+  /data-urls@3.0.2:
+    resolution: {integrity: sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==}
+    engines: {node: '>=12'}
+    dependencies:
+      abab: 2.0.6
+      whatwg-mimetype: 3.0.0
+      whatwg-url: 11.0.0
     dev: true
 
-  /get-symbol-description@1.0.0:
-    resolution: {integrity: sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==}
-    engines: {node: '>= 0.4'}
+  /data-urls@5.0.0:
+    resolution: {integrity: sha512-ZYP5VBHshaDAiVZxjbRVcFJpc+4xGgT0bK3vzy1HLN8jTO975HEbuYzZJcHoQEY5K1a0z8YayJkyVETa08eNTg==}
+    engines: {node: '>=18'}
     dependencies:
-      call-bind: 1.0.2
-      get-intrinsic: 1.1.3
-
-  /get-system-fonts@2.0.2:
-    resolution: {integrity: sha512-zzlgaYnHMIEgHRrfC7x0Qp0Ylhw/sHpM6MHXeVBTYIsvGf5GpbnClB+Q6rAPdn+0gd2oZZIo6Tj3EaWrt4VhDQ==}
-    engines: {node: '>8.0.0'}
-    dev: false
-
-  /get-tsconfig@4.5.0:
-    resolution: {integrity: sha512-MjhiaIWCJ1sAU4pIQ5i5OfOuHHxVo1oYeNsWTON7jxYkod8pHocXeh+SSbmu5OZZZK73B6cbJ2XADzXehLyovQ==}
+      whatwg-mimetype: 4.0.0
+      whatwg-url: 14.0.0
     dev: true
 
-  /get-uri@3.0.2:
-    resolution: {integrity: sha512-+5s0SJbGoyiJTZZ2JTpFPLMPSch72KEqGOTvQsBqg0RBWvwhWUSYZFAtz3TPW0GXJuLBJPts1E241iHg+VRfhg==}
-    engines: {node: '>= 6'}
+  /date-fns-tz@2.0.0(date-fns@2.30.0):
+    resolution: {integrity: sha512-OAtcLdB9vxSXTWHdT8b398ARImVwQMyjfYGkKD2zaGpHseG2UPHbHjXELReErZFxWdSLph3c2zOaaTyHfOhERQ==}
+    peerDependencies:
+      date-fns: '>=2.0.0'
     dependencies:
-      '@tootallnate/once': 1.1.2
-      data-uri-to-buffer: 3.0.1
-      debug: 4.3.4(supports-color@8.1.1)
-      file-uri-to-path: 2.0.0
-      fs-extra: 8.1.0
-      ftp: 0.3.10
-    transitivePeerDependencies:
-      - supports-color
+      date-fns: 2.30.0
     dev: false
 
-  /get-value@2.0.6:
-    resolution: {integrity: sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==}
-    engines: {node: '>=0.10.0'}
-    dev: true
-
-  /getos@3.2.1:
-    resolution: {integrity: sha512-U56CfOK17OKgTVqozZjUKNdkfEv6jk5WISBJ8SHoagjE6L69zOwl3Z+O8myjY9MEW3i2HPWQBt/LTbCgcC973Q==}
+  /date-fns@2.30.0:
+    resolution: {integrity: sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==}
+    engines: {node: '>=0.11'}
     dependencies:
-      async: 3.2.4
-    dev: true
+      '@babel/runtime': 7.23.6
 
-  /getpass@0.1.7:
-    resolution: {integrity: sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==}
-    dependencies:
-      assert-plus: 1.0.0
+  /dateformat@3.0.3:
+    resolution: {integrity: sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==}
+    dev: false
 
-  /giget@1.0.0:
-    resolution: {integrity: sha512-KWELZn3Nxq5+0So485poHrFriK9Bn3V/x9y+wgqrHkbmnGbjfLmZ685/SVA/ovW+ewoqW0gVI47pI4yW/VNobQ==}
-    hasBin: true
-    dependencies:
-      colorette: 2.0.19
-      defu: 6.1.2
-      https-proxy-agent: 5.0.1
-      mri: 1.2.0
-      node-fetch-native: 1.0.1
-      pathe: 1.1.0
-      tar: 6.1.13
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
+  /dayjs@1.11.10:
+    resolution: {integrity: sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ==}
+    dev: false
 
-  /github-slugger@1.4.0:
-    resolution: {integrity: sha512-w0dzqw/nt51xMVmlaV1+JRzN+oCa1KfcgGEWhxUG16wbdA+Xnt/yoFO8Z8x/V82ZcZ0wy6ln9QDup5avbhiDhQ==}
-    dev: true
+  /dayjs@1.11.6:
+    resolution: {integrity: sha512-zZbY5giJAinCG+7AGaw0wIhNZ6J8AhWuSXKvuc1KAyMiRsvGQWqh4L+MomvhdAYjN+lqvVCMq1I41e3YHvXkyQ==}
 
-  /github-slugger@1.5.0:
-    resolution: {integrity: sha512-wIh+gKBI9Nshz2o46B0B3f5k/W+WI9ZAv6y5Dn5WJ5SK1t0TnDimB4WE5rmTD05ZAIn8HALCZVmCsvj0w0v0lw==}
+  /de-indent@1.0.2:
+    resolution: {integrity: sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==}
     dev: true
 
-  /glob-parent@3.1.0:
-    resolution: {integrity: sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==}
+  /debug@2.6.9:
+    resolution: {integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
     dependencies:
-      is-glob: 3.1.0
-      path-dirname: 1.0.2
+      ms: 2.0.0
 
-  /glob-parent@5.1.2:
-    resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==}
-    engines: {node: '>= 6'}
+  /debug@3.2.7(supports-color@5.5.0):
+    resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
     dependencies:
-      is-glob: 4.0.3
+      ms: 2.1.3
+      supports-color: 5.5.0
 
-  /glob-parent@6.0.2:
-    resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==}
-    engines: {node: '>=10.13.0'}
+  /debug@3.2.7(supports-color@8.1.1):
+    resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
     dependencies:
-      is-glob: 4.0.3
+      ms: 2.1.3
+      supports-color: 8.1.1
     dev: true
 
-  /glob-promise@6.0.2(glob@8.1.0):
-    resolution: {integrity: sha512-Ni2aDyD1ekD6x8/+K4hDriRDbzzfuK4yKpqSymJ4P7IxbtARiOOuU+k40kbHM0sLIlbf1Qh0qdMkAHMZYE6XJQ==}
-    engines: {node: '>=16'}
+  /debug@4.3.4(supports-color@8.1.1):
+    resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==}
+    engines: {node: '>=6.0'}
     peerDependencies:
-      glob: ^8.0.3
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
     dependencies:
-      '@types/glob': 8.0.0
-      glob: 8.1.0
-    dev: true
+      ms: 2.1.2
+      supports-color: 8.1.1
 
-  /glob-stream@6.1.0:
-    resolution: {integrity: sha512-uMbLGAP3S2aDOHUDfdoYcdIePUCfysbAd0IAoWVZbeGU/oNQ8asHVSshLDJUPWxfzj8zsCG7/XeHPHTtow0nsw==}
-    engines: {node: '>= 0.10'}
-    dependencies:
-      extend: 3.0.2
-      glob: 7.2.3
-      glob-parent: 3.1.0
-      is-negated-glob: 1.0.0
-      ordered-read-streams: 1.0.1
-      pumpify: 1.5.1
-      readable-stream: 2.3.7
-      remove-trailing-separator: 1.1.0
-      to-absolute-glob: 2.0.2
-      unique-stream: 2.3.1
+  /decamelize@1.2.0:
+    resolution: {integrity: sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==}
+    engines: {node: '>=0.10.0'}
+    dev: false
 
-  /glob-to-regexp@0.4.1:
-    resolution: {integrity: sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==}
+  /decimal.js@10.4.3:
+    resolution: {integrity: sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==}
     dev: true
 
-  /glob-watcher@5.0.5:
-    resolution: {integrity: sha512-zOZgGGEHPklZNjZQaZ9f41i7F2YwE+tS5ZHrDhbBCk3stwahn5vQxnFmBJZHoYdusR6R1bLSXeGUy/BhctwKzw==}
-    engines: {node: '>= 0.10'}
-    dependencies:
-      anymatch: 2.0.0
-      async-done: 1.3.2
-      chokidar: 3.5.2
-      is-negated-glob: 1.0.0
-      just-debounce: 1.1.0
-      normalize-path: 3.0.0
-      object.defaults: 1.1.0
-    transitivePeerDependencies:
-      - supports-color
+  /decko@1.2.0:
+    resolution: {integrity: sha512-m8FnyHXV1QX+S1cl+KPFDIl6NMkxtKsy6+U/aYyjrOqWMuwAwYWu7ePqrsUHtDR5Y8Yk2pi/KIDSgF+vT4cPOQ==}
     dev: true
 
-  /glob@7.2.3:
-    resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
-    dependencies:
-      fs.realpath: 1.0.0
-      inflight: 1.0.6
-      inherits: 2.0.4
-      minimatch: 3.1.2
-      once: 1.4.0
-      path-is-absolute: 1.0.1
+  /decode-uri-component@0.2.2:
+    resolution: {integrity: sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==}
+    engines: {node: '>=0.10'}
+    dev: false
 
-  /glob@8.1.0:
-    resolution: {integrity: sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==}
-    engines: {node: '>=12'}
+  /decompress-response@6.0.0:
+    resolution: {integrity: sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==}
+    engines: {node: '>=10'}
     dependencies:
-      fs.realpath: 1.0.0
-      inflight: 1.0.6
-      inherits: 2.0.4
-      minimatch: 5.1.5
-      once: 1.4.0
+      mimic-response: 3.1.0
+    dev: false
 
-  /glob@9.3.1:
-    resolution: {integrity: sha512-qERvJb7IGsnkx6YYmaaGvDpf77c951hICMdWaFXyH3PlVob8sbPJJyJX0kWkiCWyXUzoy9UOTNjGg0RbD8bYIw==}
-    engines: {node: '>=16 || 14 >=14.17'}
+  /dedent@1.3.0:
+    resolution: {integrity: sha512-7glNLfvdsMzZm3FpRY1CHuI2lbYDR+71YmrhmTZjYFD5pfT0ACgnGRdrrC9Mk2uICnzkcdelCx5at787UDGOvg==}
+    peerDependencies:
+      babel-plugin-macros: ^3.1.0
+    peerDependenciesMeta:
+      babel-plugin-macros:
+        optional: true
+
+  /deep-eql@4.0.0:
+    resolution: {integrity: sha512-GxJC5MOg2KyQlv6WiUF/VAnMj4MWnYiXo4oLgeptOELVoknyErb4Z8+5F/IM/K4g9/80YzzatxmWcyRwUseH0A==}
+    engines: {node: '>=6'}
     dependencies:
-      fs.realpath: 1.0.0
-      minimatch: 7.4.2
-      minipass: 4.2.5
-      path-scurry: 1.6.2
+      type-detect: 4.0.8
     dev: false
 
-  /global-dirs@3.0.0:
-    resolution: {integrity: sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA==}
-    engines: {node: '>=10'}
+  /deep-eql@4.1.3:
+    resolution: {integrity: sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==}
+    engines: {node: '>=6'}
     dependencies:
-      ini: 2.0.0
+      type-detect: 4.0.8
     dev: true
 
-  /global-modules@1.0.0:
-    resolution: {integrity: sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==}
-    engines: {node: '>=0.10.0'}
+  /deep-equal@2.2.0:
+    resolution: {integrity: sha512-RdpzE0Hv4lhowpIUKKMJfeH6C1pXdtT1/it80ubgWqwI3qpuxUBpC1S4hnHg+zjnuOoDkzUtUCEEkG+XG5l3Mw==}
     dependencies:
-      global-prefix: 1.0.2
-      is-windows: 1.0.2
-      resolve-dir: 1.0.1
-    dev: true
+      call-bind: 1.0.2
+      es-get-iterator: 1.1.3
+      get-intrinsic: 1.2.1
+      is-arguments: 1.1.1
+      is-array-buffer: 3.0.2
+      is-date-object: 1.0.5
+      is-regex: 1.1.4
+      is-shared-array-buffer: 1.0.2
+      isarray: 2.0.5
+      object-is: 1.1.5
+      object-keys: 1.1.1
+      object.assign: 4.1.4
+      regexp.prototype.flags: 1.5.0
+      side-channel: 1.0.4
+      which-boxed-primitive: 1.0.2
+      which-collection: 1.0.1
+      which-typed-array: 1.1.11
+
+  /deep-extend@0.6.0:
+    resolution: {integrity: sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==}
+    engines: {node: '>=4.0.0'}
+    dev: false
+
+  /deep-is@0.1.4:
+    resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
 
-  /global-prefix@1.0.2:
-    resolution: {integrity: sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg==}
+  /deepmerge@4.3.1:
+    resolution: {integrity: sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==}
     engines: {node: '>=0.10.0'}
+
+  /default-browser-id@3.0.0:
+    resolution: {integrity: sha512-OZ1y3y0SqSICtE8DE4S8YOE9UZOJ8wO16fKWVP5J1Qz42kV9jcnMVFrEE/noXb/ss3Q4pZIH79kxofzyNNtUNA==}
+    engines: {node: '>=12'}
     dependencies:
-      expand-tilde: 2.0.2
-      homedir-polyfill: 1.0.3
-      ini: 1.3.8
-      is-windows: 1.0.2
-      which: 1.3.1
+      bplist-parser: 0.2.0
+      untildify: 4.0.0
     dev: true
 
-  /global@4.4.0:
-    resolution: {integrity: sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==}
+  /defaults@1.0.4:
+    resolution: {integrity: sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==}
     dependencies:
-      min-document: 2.19.0
-      process: 0.11.10
+      clone: 1.0.4
     dev: true
 
-  /globals@11.12.0:
-    resolution: {integrity: sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==}
-    engines: {node: '>=4'}
-    dev: true
+  /define-data-property@1.1.4:
+    resolution: {integrity: sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      es-define-property: 1.0.0
+      es-errors: 1.3.0
+      gopd: 1.0.1
 
-  /globals@13.20.0:
-    resolution: {integrity: sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==}
+  /define-lazy-prop@2.0.0:
+    resolution: {integrity: sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==}
     engines: {node: '>=8'}
+
+  /define-properties@1.2.0:
+    resolution: {integrity: sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==}
+    engines: {node: '>= 0.4'}
     dependencies:
-      type-fest: 0.20.2
-    dev: true
+      has-property-descriptors: 1.0.2
+      object-keys: 1.1.1
 
-  /globalthis@1.0.3:
-    resolution: {integrity: sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==}
+  /define-properties@1.2.1:
+    resolution: {integrity: sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==}
     engines: {node: '>= 0.4'}
     dependencies:
-      define-properties: 1.1.4
+      define-data-property: 1.1.4
+      has-property-descriptors: 1.0.2
+      object-keys: 1.1.1
+
+  /defu@6.1.2:
+    resolution: {integrity: sha512-+uO4+qr7msjNNWKYPHqN/3+Dx3NFkmIzayk2L1MyZQlvgZb/J1A0fo410dpKrN2SnqFjt8n4JL8fDJE0wIgjFQ==}
+    dev: true
 
-  /globalyzer@0.1.0:
-    resolution: {integrity: sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q==}
+  /defu@6.1.3:
+    resolution: {integrity: sha512-Vy2wmG3NTkmHNg/kzpuvHhkqeIx3ODWqasgCRbKtbXEN0G+HpEEv9BtJLp7ZG1CZloFaC41Ah3ZFbq7aqCqMeQ==}
     dev: true
 
-  /globby@11.1.0:
-    resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==}
+  /del@6.1.1:
+    resolution: {integrity: sha512-ua8BhapfP0JUJKC/zV9yHHDW/rDoDxP4Zhn3AkA6/xT6gY7jYXJiaeyBZznYVujhZZET+UgcbZiQ7sN3WqcImg==}
     engines: {node: '>=10'}
     dependencies:
-      array-union: 2.1.0
-      dir-glob: 3.0.1
-      fast-glob: 3.2.12
-      ignore: 5.2.4
-      merge2: 1.4.1
+      globby: 11.1.0
+      graceful-fs: 4.2.11
+      is-glob: 4.0.3
+      is-path-cwd: 2.2.0
+      is-path-inside: 3.0.3
+      p-map: 4.0.0
+      rimraf: 3.0.2
       slash: 3.0.0
-
-  /globby@13.1.3:
-    resolution: {integrity: sha512-8krCNHXvlCgHDpegPzleMq07yMYTO2sXKASmZmquEYWEmCx6J5UTRbp5RwMJkTJGtcQ44YpiUYUiN0b9mzy8Bw==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
-    dependencies:
-      dir-glob: 3.0.1
-      fast-glob: 3.2.12
-      ignore: 5.2.4
-      merge2: 1.4.1
-      slash: 4.0.0
     dev: true
 
-  /globrex@0.1.2:
-    resolution: {integrity: sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==}
-    dev: true
+  /delayed-stream@1.0.0:
+    resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==}
+    engines: {node: '>=0.4.0'}
 
-  /glogg@1.0.2:
-    resolution: {integrity: sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==}
-    engines: {node: '>= 0.10'}
-    dependencies:
-      sparkles: 1.0.1
-    dev: true
+  /delegates@1.0.0:
+    resolution: {integrity: sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==}
+    dev: false
+    optional: true
 
-  /gm@1.25.0:
-    resolution: {integrity: sha512-4kKdWXTtgQ4biIo7hZA396HT062nDVVHPjQcurNZ3o/voYN+o5FUC5kOwuORbpExp3XbTJ3SU7iRipiIhQtovw==}
-    engines: {node: '>=14'}
-    dependencies:
-      array-parallel: 0.1.3
-      array-series: 0.1.5
-      cross-spawn: 4.0.2
-      debug: 3.2.7(supports-color@5.5.0)
-    transitivePeerDependencies:
-      - supports-color
+  /denque@1.5.1:
+    resolution: {integrity: sha512-XwE+iZ4D6ZUB7mfYRMb5wByE8L74HCn30FBN7sWnXksWc1LO1bPDl67pBR9o/kC4z/xSNAwkMYcGgqDV3BE3Hw==}
+    engines: {node: '>=0.10'}
     dev: false
 
-  /google-timezones-json@1.1.0:
-    resolution: {integrity: sha512-6BmBx9gJVALV2jsfMks8PwmkWT5ip3+bmMyTgXu4PY+G8nKjHi61yrL7rSXpMYRsIzUXhVKpj+MnjhnwG9nung==}
+  /denque@2.1.0:
+    resolution: {integrity: sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==}
+    engines: {node: '>=0.10'}
+
+  /depd@1.1.2:
+    resolution: {integrity: sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==}
+    engines: {node: '>= 0.6'}
     dev: false
 
-  /gopd@1.0.1:
-    resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==}
-    dependencies:
-      get-intrinsic: 1.1.3
+  /depd@2.0.0:
+    resolution: {integrity: sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==}
+    engines: {node: '>= 0.8'}
 
-  /graceful-fs@4.2.10:
-    resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==}
+  /dequal@2.0.3:
+    resolution: {integrity: sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==}
+    engines: {node: '>=6'}
+    dev: true
+
+  /destroy@1.2.0:
+    resolution: {integrity: sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==}
+    engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16}
 
-  /grapheme-splitter@1.0.4:
-    resolution: {integrity: sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==}
+  /detect-indent@6.1.0:
+    resolution: {integrity: sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==}
+    engines: {node: '>=8'}
     dev: true
 
-  /graphlib@2.1.8:
-    resolution: {integrity: sha512-jcLLfkpoVGmH7/InMC/1hIvOPSUh38oJtGhvrOFGzioE1DZ+0YW16RgmOJhHiuWTvGiJQ9Z1Ik43JvkRPRvE+A==}
-    dependencies:
-      lodash: 4.17.21
+  /detect-libc@2.0.1:
+    resolution: {integrity: sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==}
+    engines: {node: '>=8'}
     dev: false
 
-  /growly@1.3.0:
-    resolution: {integrity: sha512-+xGQY0YyAWCnqy7Cd++hc2JqMYzlm0dG30Jd0beaA64sROr8C4nt8Yc9V5Ro3avlSUDTN0ulqP/VBKi1/lLygw==}
-    dev: true
+  /detect-newline@3.1.0:
+    resolution: {integrity: sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==}
+    engines: {node: '>=8'}
 
-  /gulp-cli@2.3.0:
-    resolution: {integrity: sha512-zzGBl5fHo0EKSXsHzjspp3y5CONegCm8ErO5Qh0UzFzk2y4tMvzLWhoDokADbarfZRL2pGpRp7yt6gfJX4ph7A==}
-    engines: {node: '>= 0.10'}
-    hasBin: true
+  /detect-package-manager@2.0.1:
+    resolution: {integrity: sha512-j/lJHyoLlWi6G1LDdLgvUtz60Zo5GEj+sVYtTVXnYLDPuzgC3llMxonXym9zIwhhUII8vjdw0LXxavpLqTbl1A==}
+    engines: {node: '>=12'}
     dependencies:
-      ansi-colors: 1.1.0
-      archy: 1.0.0
-      array-sort: 1.0.0
-      color-support: 1.1.3
-      concat-stream: 1.6.2
-      copy-props: 2.0.5
-      fancy-log: 1.3.3
-      gulplog: 1.0.0
-      interpret: 1.4.0
-      isobject: 3.0.1
-      liftoff: 3.1.0
-      matchdep: 2.0.0
-      mute-stdout: 1.0.1
-      pretty-hrtime: 1.0.3
-      replace-homedir: 1.0.0
-      semver-greatest-satisfied-range: 1.1.0
-      v8flags: 3.2.0
-      yargs: 7.1.2
-    transitivePeerDependencies:
-      - supports-color
+      execa: 5.1.1
     dev: true
 
-  /gulp@4.0.2:
-    resolution: {integrity: sha512-dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA==}
-    engines: {node: '>= 0.10'}
+  /detect-port@1.5.1:
+    resolution: {integrity: sha512-aBzdj76lueB6uUst5iAs7+0H/oOjqI5D16XUWxlWMIMROhcM0rfsNVk93zTngq1dDNpoXRr++Sus7ETAExppAQ==}
     hasBin: true
     dependencies:
-      glob-watcher: 5.0.5
-      gulp-cli: 2.3.0
-      undertaker: 1.3.0
-      vinyl-fs: 3.0.3
+      address: 1.2.2
+      debug: 4.3.4(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /gulplog@1.0.0:
-    resolution: {integrity: sha512-hm6N8nrm3Y08jXie48jsC55eCZz9mnb4OirAStEk2deqeyhXU3C1otDVh+ccttMuc1sBi6RX6ZJ720hs9RCvgw==}
-    engines: {node: '>= 0.10'}
-    dependencies:
-      glogg: 1.0.2
-    dev: true
-
-  /handlebars@4.7.7:
-    resolution: {integrity: sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==}
-    engines: {node: '>=0.4.7'}
-    hasBin: true
+  /dezalgo@1.0.4:
+    resolution: {integrity: sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==}
     dependencies:
-      minimist: 1.2.7
-      neo-async: 2.6.2
-      source-map: 0.6.1
-      wordwrap: 1.0.0
-    optionalDependencies:
-      uglify-js: 3.17.4
+      asap: 2.0.6
+      wrappy: 1.0.2
 
-  /har-schema@2.0.0:
-    resolution: {integrity: sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==}
-    engines: {node: '>=4'}
-    dev: false
+  /diff-sequences@29.6.3:
+    resolution: {integrity: sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
 
-  /har-validator@5.1.5:
-    resolution: {integrity: sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==}
-    engines: {node: '>=6'}
-    deprecated: this library is no longer supported
+  /digest-fetch@1.3.0:
+    resolution: {integrity: sha512-CGJuv6iKNM7QyZlM2T3sPAdZWd/p9zQiRNS9G+9COUCwzWFTs0Xp8NF5iePx7wtvhDykReiRRrSeNb4oMmB8lA==}
     dependencies:
-      ajv: 6.12.6
-      har-schema: 2.0.0
+      base-64: 0.1.0
+      md5: 2.3.0
     dev: false
 
-  /has-bigints@1.0.2:
-    resolution: {integrity: sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==}
+  /dijkstrajs@1.0.3:
+    resolution: {integrity: sha512-qiSlmBq9+BCdCA/L46dw8Uy93mloxsPSbwnm5yrKn2vMPiy8KyAskTF6zuV/j5BMsmOGZDPs7KjU+mjb670kfA==}
+    dev: false
 
-  /has-flag@3.0.0:
-    resolution: {integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==}
-    engines: {node: '>=4'}
+  /dingbat-to-unicode@1.0.1:
+    resolution: {integrity: sha512-98l0sW87ZT58pU4i61wa2OHwxbiYSbuxsCBozaVnYX2iCnr3bLM3fIes1/ej7h1YdOKuKt/MLs706TVnALA65w==}
+    dev: false
 
-  /has-flag@4.0.0:
-    resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==}
+  /dir-glob@3.0.1:
+    resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==}
     engines: {node: '>=8'}
-
-  /has-property-descriptors@1.0.0:
-    resolution: {integrity: sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==}
-    dependencies:
-      get-intrinsic: 1.1.3
-
-  /has-proto@1.0.1:
-    resolution: {integrity: sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==}
-    engines: {node: '>= 0.4'}
-
-  /has-symbols@1.0.3:
-    resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==}
-    engines: {node: '>= 0.4'}
-
-  /has-tostringtag@1.0.0:
-    resolution: {integrity: sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==}
-    engines: {node: '>= 0.4'}
     dependencies:
-      has-symbols: 1.0.3
-
-  /has-unicode@2.0.1:
-    resolution: {integrity: sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==}
+      path-type: 4.0.0
 
-  /has-value@0.3.1:
-    resolution: {integrity: sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==}
+  /doctrine@2.1.0:
+    resolution: {integrity: sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      get-value: 2.0.6
-      has-values: 0.1.4
-      isobject: 2.1.0
+      esutils: 2.0.3
     dev: true
 
-  /has-value@1.0.0:
-    resolution: {integrity: sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==}
-    engines: {node: '>=0.10.0'}
+  /doctrine@3.0.0:
+    resolution: {integrity: sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==}
+    engines: {node: '>=6.0.0'}
     dependencies:
-      get-value: 2.0.6
-      has-values: 1.0.0
-      isobject: 3.0.1
+      esutils: 2.0.3
     dev: true
 
-  /has-values@0.1.4:
-    resolution: {integrity: sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==}
-    engines: {node: '>=0.10.0'}
+  /doctypes@1.1.0:
+    resolution: {integrity: sha512-LLBi6pEqS6Do3EKQ3J0NqHWV5hhb78Pi8vvESYwyOy2c31ZEZVdtitdzsQsKb7878PEERhzUk0ftqGhG6Mz+pQ==}
     dev: true
 
-  /has-values@1.0.0:
-    resolution: {integrity: sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      is-number: 3.0.0
-      kind-of: 4.0.0
+  /dom-accessibility-api@0.5.15:
+    resolution: {integrity: sha512-8o+oVqLQZoruQPYy3uAAQtc6YbtSiRq5aPJBhJ82YTJRHvI6ofhYAkC81WmjFTnfUbqg6T3aCglIpU9p/5e7Cw==}
     dev: true
 
-  /has@1.0.3:
-    resolution: {integrity: sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==}
-    engines: {node: '>= 0.4.0'}
-    dependencies:
-      function-bind: 1.1.1
-
-  /hash-sum@1.0.2:
-    resolution: {integrity: sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==}
+  /dom-accessibility-api@0.6.3:
+    resolution: {integrity: sha512-7ZgogeTnjuHbo+ct10G9Ffp0mif17idi0IyWNVA/wcwcm7NPOD/WEHVP3n7n3MhXqxoIYm8d6MuZohYWIZ4T3w==}
     dev: true
 
-  /he@1.2.0:
-    resolution: {integrity: sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==}
-    hasBin: true
-
-  /header-case@2.0.4:
-    resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
+  /dom-serializer@1.4.1:
+    resolution: {integrity: sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==}
     dependencies:
-      capital-case: 1.0.4
-      tslib: 2.5.0
-    dev: false
-
-  /heap@0.2.7:
-    resolution: {integrity: sha512-2bsegYkkHO+h/9MGbn6KWcE45cHZgPANo5LXF7EvWdT0yT2EguSVO1nDgU5c8+ZOPwp2vMNa7YFsJhVcDR9Sdg==}
+      domelementtype: 2.3.0
+      domhandler: 4.3.1
+      entities: 2.2.0
     dev: false
 
-  /help-me@1.1.0:
-    resolution: {integrity: sha512-P/IZ8yOMne3SCTHbVY429NZ67B/2bVQlcYGZh2iPPbdLrEQ/qY5aGChn0YTDmt7Sb4IKRI51fypItav+lNl76w==}
+  /dom-serializer@2.0.0:
+    resolution: {integrity: sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==}
     dependencies:
-      callback-stream: 1.1.0
-      glob-stream: 6.1.0
-      through2: 2.0.5
-      xtend: 4.0.2
-    dev: false
+      domelementtype: 2.3.0
+      domhandler: 5.0.3
+      entities: 4.4.0
 
-  /hexoid@1.0.0:
-    resolution: {integrity: sha512-QFLV0taWQOZtvIRIAdBChesmogZrtuXvVWsFHZTk2SU+anspqZ2vMnoLg7IE1+Uk16N19APic1BuF8bC8c2m5g==}
-    engines: {node: '>=8'}
+  /domelementtype@2.3.0:
+    resolution: {integrity: sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==}
+
+  /domexception@4.0.0:
+    resolution: {integrity: sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==}
+    engines: {node: '>=12'}
+    dependencies:
+      webidl-conversions: 7.0.0
     dev: true
 
-  /highlight.js@10.7.3:
-    resolution: {integrity: sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==}
+  /domhandler@4.3.1:
+    resolution: {integrity: sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==}
+    engines: {node: '>= 4'}
+    dependencies:
+      domelementtype: 2.3.0
     dev: false
 
-  /homedir-polyfill@1.0.3:
-    resolution: {integrity: sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==}
-    engines: {node: '>=0.10.0'}
+  /domhandler@5.0.3:
+    resolution: {integrity: sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==}
+    engines: {node: '>= 4'}
     dependencies:
-      parse-passwd: 1.0.0
+      domelementtype: 2.3.0
 
-  /hosted-git-info@2.8.9:
-    resolution: {integrity: sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==}
+  /dommatrix@1.0.3:
+    resolution: {integrity: sha512-l32Xp/TLgWb8ReqbVJAFIvXmY7go4nTxxlWiAFyhoQw9RKEOHBZNnyGvJWqDVSPmq3Y9HlM4npqF/T6VMOXhww==}
+    deprecated: dommatrix is no longer maintained. Please use @thednp/dommatrix.
+    dev: false
+
+  /dompurify@2.4.7:
+    resolution: {integrity: sha512-kxxKlPEDa6Nc5WJi+qRgPbOAbgTpSULL+vI3NUXsZMlkJxTqYI9wg5ZTay2sFrdZRWHPWNi+EdAhcJf81WtoMQ==}
     dev: true
 
-  /hosted-git-info@4.1.0:
-    resolution: {integrity: sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==}
-    engines: {node: '>=10'}
+  /domutils@2.8.0:
+    resolution: {integrity: sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==}
+    dependencies:
+      dom-serializer: 1.4.1
+      domelementtype: 2.3.0
+      domhandler: 4.3.1
+    dev: false
+
+  /domutils@3.0.1:
+    resolution: {integrity: sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q==}
     dependencies:
-      lru-cache: 6.0.0
-    dev: true
+      dom-serializer: 2.0.0
+      domelementtype: 2.3.0
+      domhandler: 5.0.3
 
-  /html-encoding-sniffer@3.0.0:
-    resolution: {integrity: sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==}
-    engines: {node: '>=12'}
+  /dot-case@3.0.4:
+    resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
-      whatwg-encoding: 2.0.0
-    dev: true
-
-  /html-entities@2.3.3:
-    resolution: {integrity: sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA==}
-    dev: true
+      no-case: 3.0.4
+      tslib: 2.6.2
+    dev: false
 
-  /html-escaper@2.0.2:
-    resolution: {integrity: sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==}
+  /dotenv-expand@10.0.0:
+    resolution: {integrity: sha512-GopVGCpVS1UKH75VKHGuQFqS1Gusej0z4FyQkPdwjil2gNIv+LNsqBlboOzpJFZKVT95GkCyWJbBSdFEFUWI2A==}
+    engines: {node: '>=12'}
     dev: true
 
-  /html-minifier-terser@6.1.0:
-    resolution: {integrity: sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==}
+  /dotenv@16.3.1:
+    resolution: {integrity: sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==}
     engines: {node: '>=12'}
-    hasBin: true
-    dependencies:
-      camel-case: 4.1.2
-      clean-css: 5.3.2
-      commander: 8.3.0
-      he: 1.2.0
-      param-case: 3.0.4
-      relateurl: 0.2.7
-      terser: 5.16.1
-    dev: true
 
-  /html-to-text@8.2.0:
-    resolution: {integrity: sha512-CLXExYn1b++Lgri+ZyVvbUEFwzkLZppjjZOwB7X1qv2jIi8MrMEvxWX5KQ7zATAzTvcqgmtO00M2kCRMtEdOKQ==}
-    engines: {node: '>=10.23.2'}
-    hasBin: true
+  /dotenv@8.6.0:
+    resolution: {integrity: sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==}
+    engines: {node: '>=10'}
+    dev: false
+
+  /dreamopt@0.8.0:
+    resolution: {integrity: sha512-vyJTp8+mC+G+5dfgsY+r3ckxlz+QMX40VjPQsZc5gxVAxLmi64TBoVkP54A/pRAXMXsbu2GMMBrZPxNv23waMg==}
+    engines: {node: '>=0.4.0'}
     dependencies:
-      '@selderee/plugin-htmlparser2': 0.6.0
-      deepmerge: 4.2.2
-      he: 1.2.0
-      htmlparser2: 6.1.0
-      minimist: 1.2.7
-      selderee: 0.6.0
+      wordwrap: 1.0.0
     dev: false
 
-  /html-webpack-plugin@5.5.0(webpack@5.75.0):
-    resolution: {integrity: sha512-sy88PC2cRTVxvETRgUHFrL4No3UxvcH8G1NepGhqaTT+GXN2kTamqasot0inS5hXeg1cMbFDt27zzo9p35lZVw==}
-    engines: {node: '>=10.13.0'}
-    peerDependencies:
-      webpack: ^5.20.0
+  /duck@0.1.12:
+    resolution: {integrity: sha512-wkctla1O6VfP89gQ+J/yDesM0S7B7XLXjKGzXxMDVFg7uEn706niAtyYovKbyq1oT9YwDcly721/iUWoc8MVRg==}
     dependencies:
-      '@types/html-minifier-terser': 6.1.0
-      html-minifier-terser: 6.1.0
-      lodash: 4.17.21
-      pretty-error: 4.0.0
-      tapable: 2.2.1
-      webpack: 5.75.0(esbuild@0.16.17)
+      underscore: 1.13.6
+    dev: false
+
+  /duplexer@0.1.2:
+    resolution: {integrity: sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==}
     dev: true
 
-  /htmlparser2@3.8.3:
-    resolution: {integrity: sha512-hBxEg3CYXe+rPIua8ETe7tmG3XDn9B0edOE/e9wH2nLczxzgdu0m0aNHY+5wFZiviLWLdANPJTssa92dMcXQ5Q==}
+  /duplexify@3.7.1:
+    resolution: {integrity: sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==}
     dependencies:
-      domelementtype: 1.3.1
-      domhandler: 2.3.0
-      domutils: 1.5.1
-      entities: 1.0.0
-      readable-stream: 1.1.14
+      end-of-stream: 1.4.4
+      inherits: 2.0.4
+      readable-stream: 2.3.7
+      stream-shift: 1.0.1
     dev: true
 
-  /htmlparser2@6.1.0:
-    resolution: {integrity: sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==}
+  /duplexify@4.1.2:
+    resolution: {integrity: sha512-fz3OjcNCHmRP12MJoZMPglx8m4rrFP8rovnk4vT8Fs+aonZoCwGg10dSsQsfP/E62eZcPTMSMP6686fu9Qlqtw==}
     dependencies:
-      domelementtype: 2.3.0
-      domhandler: 4.3.1
-      domutils: 2.8.0
-      entities: 2.2.0
+      end-of-stream: 1.4.4
+      inherits: 2.0.4
+      readable-stream: 3.6.0
+      stream-shift: 1.0.1
+    dev: false
+
+  /eastasianwidth@0.2.0:
+    resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==}
 
-  /htmlparser2@8.0.1:
-    resolution: {integrity: sha512-4lVbmc1diZC7GUJQtRQ5yBAeUCL1exyMwmForWkRLnwyzWBFxN633SALPMGYaWZvKe9j1pRZJpauvmxENSp/EA==}
+  /ecc-jsbn@0.1.2:
+    resolution: {integrity: sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==}
     dependencies:
-      domelementtype: 2.3.0
-      domhandler: 5.0.3
-      domutils: 3.0.1
-      entities: 4.4.0
+      jsbn: 0.1.1
+      safer-buffer: 2.1.2
 
-  /http-cache-semantics@4.1.1:
-    resolution: {integrity: sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==}
+  /ecdsa-sig-formatter@1.0.11:
+    resolution: {integrity: sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==}
+    dependencies:
+      safe-buffer: 5.2.1
     dev: false
-    optional: true
 
-  /http-call@5.3.0:
-    resolution: {integrity: sha512-ahwimsC23ICE4kPl9xTBjKB4inbRaeLyZeRunC/1Jy/Z6X8tv22MEAjK+KBOMSVLaqXPTTmd8638waVIKLGx2w==}
-    engines: {node: '>=8.0.0'}
+  /editorconfig@1.0.4:
+    resolution: {integrity: sha512-L9Qe08KWTlqYMVvMcTIvMAdl1cDUubzRNYL+WfA4bLDMHe4nemKkpmYzkznE1FwLKu0EEmy6obgQKzMJrg4x9Q==}
+    engines: {node: '>=14'}
+    hasBin: true
     dependencies:
-      content-type: 1.0.4
-      debug: 4.3.4(supports-color@8.1.1)
-      is-retry-allowed: 1.2.0
-      is-stream: 2.0.1
-      parse-json: 4.0.0
-      tunnel-agent: 0.6.0
-    transitivePeerDependencies:
-      - supports-color
+      '@one-ini/wasm': 0.1.1
+      commander: 10.0.1
+      minimatch: 9.0.1
+      semver: 7.6.0
     dev: true
 
-  /http-errors@2.0.0:
-    resolution: {integrity: sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==}
-    engines: {node: '>= 0.8'}
+  /ee-first@1.1.1:
+    resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==}
+
+  /ejs@3.1.9:
+    resolution: {integrity: sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==}
+    engines: {node: '>=0.10.0'}
+    hasBin: true
     dependencies:
-      depd: 2.0.0
-      inherits: 2.0.4
-      setprototypeof: 1.2.0
-      statuses: 2.0.1
-      toidentifier: 1.0.1
+      jake: 10.8.5
 
-  /http-proxy-agent@4.0.1:
-    resolution: {integrity: sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==}
-    engines: {node: '>= 6'}
+  /electron-to-chromium@1.4.475:
+    resolution: {integrity: sha512-mTye5u5P98kSJO2n7zYALhpJDmoSQejIGya0iR01GpoRady8eK3bw7YHHnjA1Rfi4ZSLdpuzlAC7Zw+1Zu7Z6A==}
+
+  /electron-to-chromium@1.4.703:
+    resolution: {integrity: sha512-094ZZC4nHXPKl/OwPinSMtLN9+hoFkdfQGKnvXbY+3WEAYtVDpz9UhJIViiY6Zb8agvqxiaJzNG9M+pRZWvSZw==}
+    dev: true
+
+  /element-plus@2.3.6(vue@3.4.21):
+    resolution: {integrity: sha512-GLz0pXUYI2zRfIgyI6W7SWmHk6dSEikP9yR++hsQUyy63+WjutoiGpA3SZD4cGPSXUzRFeKfVr8CnYhK5LqXZw==}
+    peerDependencies:
+      vue: ^3.2.0
     dependencies:
-      '@tootallnate/once': 1.1.2
-      agent-base: 6.0.2
-      debug: 4.3.4(supports-color@8.1.1)
+      '@ctrl/tinycolor': 3.6.0
+      '@element-plus/icons-vue': 2.1.0(vue@3.4.21)
+      '@floating-ui/dom': 1.4.5
+      '@popperjs/core': /@sxzz/popperjs-es@2.11.7
+      '@types/lodash': 4.14.195
+      '@types/lodash-es': 4.17.6
+      '@vueuse/core': 9.13.0(vue@3.4.21)
+      async-validator: 4.2.5
+      dayjs: 1.11.6
+      escape-html: 1.0.3
+      lodash: 4.17.21
+      lodash-es: 4.17.21
+      lodash-unified: 1.0.3(@types/lodash-es@4.17.6)(lodash-es@4.17.21)(lodash@4.17.21)
+      memoize-one: 6.0.0
+      normalize-wheel-es: 1.2.0
+      vue: 3.4.21(typescript@5.4.2)
     transitivePeerDependencies:
-      - supports-color
+      - '@vue/composition-api'
     dev: false
 
-  /http-proxy-agent@5.0.0:
-    resolution: {integrity: sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==}
-    engines: {node: '>= 6'}
-    dependencies:
-      '@tootallnate/once': 2.0.0
-      agent-base: 6.0.2
-      debug: 4.3.4(supports-color@8.1.1)
-    transitivePeerDependencies:
-      - supports-color
+  /email-providers@2.0.1:
+    resolution: {integrity: sha512-lFWdT7sJilGO0UOO25D3urNH7Np1XTB/7GD/9nGM4YxNqAzkunuJyt9ZyG4cZ+UEGqH/lbK4vczg0B6NtyPflw==}
+    engines: {node: '>=16'}
+    dev: false
 
-  /http-reasons@0.1.0:
-    resolution: {integrity: sha512-P6kYh0lKZ+y29T2Gqz+RlC9WBLhKe8kDmcJ+A+611jFfxdPsbMRQ5aNmFRM3lENqFkK+HTTL+tlQviAiv0AbLQ==}
+  /emittery@0.13.1:
+    resolution: {integrity: sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==}
+    engines: {node: '>=12'}
+
+  /emoji-regex@8.0.0:
+    resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}
+
+  /emoji-regex@9.2.2:
+    resolution: {integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==}
+
+  /enabled@2.0.0:
+    resolution: {integrity: sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==}
     dev: false
 
-  /http-signature@1.2.0:
-    resolution: {integrity: sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==}
-    engines: {node: '>=0.8', npm: '>=1.3.7'}
-    dependencies:
-      assert-plus: 1.0.0
-      jsprim: 1.4.2
-      sshpk: 1.17.0
+  /encode-utf8@1.0.3:
+    resolution: {integrity: sha512-ucAnuBEhUK4boH2HjVYG5Q2mQyPorvv0u/ocS+zhdw0S8AlHYY+GOFhP1Gio5z4icpP2ivFSvhtFjQi8+T9ppw==}
     dev: false
 
-  /http-signature@1.3.6:
-    resolution: {integrity: sha512-3adrsD6zqo4GsTqtO7FyrejHNv+NgiIfAfv68+jVlFmSr9OGy7zrxONceFRLKvnnZA5jbxQBX1u9PpB6Wi32Gw==}
-    engines: {node: '>=0.10'}
-    dependencies:
-      assert-plus: 1.0.0
-      jsprim: 2.0.2
-      sshpk: 1.17.0
-    dev: true
+  /encodeurl@1.0.2:
+    resolution: {integrity: sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==}
+    engines: {node: '>= 0.8'}
 
-  /http2-client@1.3.5:
-    resolution: {integrity: sha512-EC2utToWl4RKfs5zd36Mxq7nzHHBuomZboI0yYL6Y0RmBgT7Sgkq4rQ0ezFTYoIsSs7Tm9SJe+o2FcAg6GBhGA==}
+  /encoding-japanese@2.0.0:
+    resolution: {integrity: sha512-++P0RhebUC8MJAwJOsT93dT+5oc5oPImp1HubZpAuCZ5kTLnhuuBhKHj2jJeO/Gj93idPBWmIuQ9QWMe5rX3pQ==}
+    engines: {node: '>=8.10.0'}
     dev: false
 
-  /https-proxy-agent@4.0.0:
-    resolution: {integrity: sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg==}
-    engines: {node: '>= 6.0.0'}
+  /encoding@0.1.13:
+    resolution: {integrity: sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==}
     dependencies:
-      agent-base: 5.1.1
-      debug: 4.3.4(supports-color@8.1.1)
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
+      iconv-lite: 0.6.3
 
-  /https-proxy-agent@5.0.1:
-    resolution: {integrity: sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==}
-    engines: {node: '>= 6'}
+  /end-of-stream@1.4.4:
+    resolution: {integrity: sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==}
     dependencies:
-      agent-base: 6.0.2
-      debug: 4.3.4(supports-color@8.1.1)
-    transitivePeerDependencies:
-      - supports-color
+      once: 1.4.0
 
-  /human-signals@1.1.1:
-    resolution: {integrity: sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==}
-    engines: {node: '>=8.12.0'}
+  /enhanced-resolve@5.13.0:
+    resolution: {integrity: sha512-eyV8f0y1+bzyfh8xAwW/WTSZpLbjhqc4ne9eGSH4Zo2ejdyiNG9pU6mf9DG8a7+Auk6MFTlNOT4Y2y/9k8GKVg==}
+    engines: {node: '>=10.13.0'}
+    dependencies:
+      graceful-fs: 4.2.10
+      tapable: 2.2.1
     dev: true
 
-  /human-signals@2.1.0:
-    resolution: {integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==}
-    engines: {node: '>=10.17.0'}
+  /enquirer@2.3.6:
+    resolution: {integrity: sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==}
+    engines: {node: '>=8.6'}
+    dependencies:
+      ansi-colors: 4.1.3
     dev: true
 
-  /humanize-duration@3.27.3:
-    resolution: {integrity: sha512-iimHkHPfIAQ8zCDQLgn08pRqSVioyWvnGfaQ8gond2wf7Jq2jJ+24ykmnRyiz3fIldcn4oUuQXpjqKLhSVR7lw==}
+  /ent@2.2.0:
+    resolution: {integrity: sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA==}
     dev: false
 
-  /humanize-ms@1.2.1:
-    resolution: {integrity: sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==}
-    dependencies:
-      ms: 2.1.3
+  /entities@2.1.0:
+    resolution: {integrity: sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==}
     dev: false
 
-  /hyperlinker@1.0.0:
-    resolution: {integrity: sha512-Ty8UblRWFEcfSuIaajM34LdPXIhbs1ajEX/BBPv24J+enSVaEVY63xQ6lTO9VRYS5LAoghIG0IDJ+p+IPzKUQQ==}
-    engines: {node: '>=4'}
+  /entities@2.2.0:
+    resolution: {integrity: sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==}
+    dev: false
 
-  /iconv-lite@0.4.24:
-    resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      safer-buffer: 2.1.2
+  /entities@3.0.1:
+    resolution: {integrity: sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==}
+    engines: {node: '>=0.12'}
+    dev: false
 
-  /iconv-lite@0.6.3:
-    resolution: {integrity: sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      safer-buffer: 2.1.2
+  /entities@4.4.0:
+    resolution: {integrity: sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==}
+    engines: {node: '>=0.12'}
 
-  /ics@2.40.0:
-    resolution: {integrity: sha512-PPkE9ij60sGhqdTxZZzsXQPB/TCXAB/dD3NqUf1I/GkbJzPeJHHMzaoMQiYAsm1pFaHRp2OIhFDgUBihkk8s/w==}
-    dependencies:
-      nanoid: 3.3.4
-      yup: 0.32.11
+  /entities@4.5.0:
+    resolution: {integrity: sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==}
+    engines: {node: '>=0.12'}
+
+  /env-paths@2.2.1:
+    resolution: {integrity: sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==}
+    engines: {node: '>=6'}
     dev: false
+    optional: true
 
-  /icss-utils@4.1.1:
-    resolution: {integrity: sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA==}
-    engines: {node: '>= 6'}
-    dependencies:
-      postcss: 7.0.39
+  /envinfo@7.8.1:
+    resolution: {integrity: sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==}
+    engines: {node: '>=4'}
+    hasBin: true
     dev: true
 
-  /icss-utils@5.1.0(postcss@8.4.21):
-    resolution: {integrity: sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==}
-    engines: {node: ^10 || ^12 || >= 14}
-    peerDependencies:
-      postcss: ^8.1.0
+  /epub2@3.0.2(ts-toolbelt@9.6.0):
+    resolution: {integrity: sha512-rhvpt27CV5MZfRetfNtdNwi3XcNg1Am0TwfveJkK8YWeHItHepQ8Js9J06v8XRIjuTrCW/NSGYMTy55Of7BfNQ==}
     dependencies:
-      postcss: 8.4.21
-    dev: true
-
-  /ieee754@1.1.13:
-    resolution: {integrity: sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==}
+      adm-zip: 0.5.10
+      array-hyper-unique: 2.1.4
+      bluebird: 3.7.2
+      crlf-normalize: 1.0.19(ts-toolbelt@9.6.0)
+      tslib: 2.6.2
+      xml2js: 0.6.2
+    transitivePeerDependencies:
+      - ts-toolbelt
     dev: false
 
-  /ieee754@1.2.1:
-    resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}
-
-  /ignore-by-default@1.0.1:
-    resolution: {integrity: sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==}
-    dev: true
+  /err-code@2.0.3:
+    resolution: {integrity: sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==}
+    dev: false
 
-  /ignore@5.2.4:
-    resolution: {integrity: sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==}
-    engines: {node: '>= 4'}
+  /error-ex@1.3.2:
+    resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==}
+    dependencies:
+      is-arrayish: 0.2.1
 
-  /imap-simple@4.3.0:
-    resolution: {integrity: sha512-SW3LtfEJFjlJKS/h2CmpX2IKpya2RXobR3ENJJW4iMQ3QYPxWxf5oeaz1K3P4eGUwfGEndkqt7uVDKnEyG9zeQ==}
+  /es-abstract@1.22.1:
+    resolution: {integrity: sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==}
+    engines: {node: '>= 0.4'}
     dependencies:
-      iconv-lite: 0.4.24
-      imap: 0.8.19
-      nodeify: 1.0.1
-      quoted-printable: 1.0.1
-      utf8: 2.1.2
-      uuencode: 0.0.4
+      array-buffer-byte-length: 1.0.0
+      arraybuffer.prototype.slice: 1.0.1
+      available-typed-arrays: 1.0.7
+      call-bind: 1.0.7
+      es-set-tostringtag: 2.0.1
+      es-to-primitive: 1.2.1
+      function.prototype.name: 1.1.5
+      get-intrinsic: 1.2.4
+      get-symbol-description: 1.0.0
+      globalthis: 1.0.3
+      gopd: 1.0.1
+      has: 1.0.3
+      has-property-descriptors: 1.0.2
+      has-proto: 1.0.3
+      has-symbols: 1.0.3
+      internal-slot: 1.0.5
+      is-array-buffer: 3.0.2
+      is-callable: 1.2.7
+      is-negative-zero: 2.0.2
+      is-regex: 1.1.4
+      is-shared-array-buffer: 1.0.2
+      is-string: 1.0.7
+      is-typed-array: 1.1.13
+      is-weakref: 1.0.2
+      object-inspect: 1.13.1
+      object-keys: 1.1.1
+      object.assign: 4.1.5
+      regexp.prototype.flags: 1.5.0
+      safe-array-concat: 1.0.0
+      safe-regex-test: 1.0.0
+      string.prototype.trim: 1.2.7
+      string.prototype.trimend: 1.0.6
+      string.prototype.trimstart: 1.0.6
+      typed-array-buffer: 1.0.0
+      typed-array-byte-length: 1.0.0
+      typed-array-byte-offset: 1.0.0
+      typed-array-length: 1.0.4
+      unbox-primitive: 1.0.2
+      which-typed-array: 1.1.15
     dev: false
 
-  /imap@0.8.19:
-    resolution: {integrity: sha512-z5DxEA1uRnZG73UcPA4ES5NSCGnPuuouUx43OPX7KZx1yzq3N8/vx2mtXEShT5inxB3pRgnfG1hijfu7XN2YMw==}
-    engines: {node: '>=0.8.0'}
+  /es-abstract@1.22.5:
+    resolution: {integrity: sha512-oW69R+4q2wG+Hc3KZePPZxOiisRIqfKBVo/HLx94QcJeWGU/8sZhCvc829rd1kS366vlJbzBfXf9yWwf0+Ko7w==}
+    engines: {node: '>= 0.4'}
     dependencies:
-      readable-stream: 1.1.14
-      utf7: 1.0.2
-    dev: false
+      array-buffer-byte-length: 1.0.1
+      arraybuffer.prototype.slice: 1.0.3
+      available-typed-arrays: 1.0.7
+      call-bind: 1.0.7
+      es-define-property: 1.0.0
+      es-errors: 1.3.0
+      es-set-tostringtag: 2.0.3
+      es-to-primitive: 1.2.1
+      function.prototype.name: 1.1.6
+      get-intrinsic: 1.2.4
+      get-symbol-description: 1.0.2
+      globalthis: 1.0.3
+      gopd: 1.0.1
+      has-property-descriptors: 1.0.2
+      has-proto: 1.0.3
+      has-symbols: 1.0.3
+      hasown: 2.0.2
+      internal-slot: 1.0.7
+      is-array-buffer: 3.0.4
+      is-callable: 1.2.7
+      is-negative-zero: 2.0.3
+      is-regex: 1.1.4
+      is-shared-array-buffer: 1.0.3
+      is-string: 1.0.7
+      is-typed-array: 1.1.13
+      is-weakref: 1.0.2
+      object-inspect: 1.13.1
+      object-keys: 1.1.1
+      object.assign: 4.1.5
+      regexp.prototype.flags: 1.5.2
+      safe-array-concat: 1.1.2
+      safe-regex-test: 1.0.3
+      string.prototype.trim: 1.2.8
+      string.prototype.trimend: 1.0.7
+      string.prototype.trimstart: 1.0.7
+      typed-array-buffer: 1.0.2
+      typed-array-byte-length: 1.0.1
+      typed-array-byte-offset: 1.0.2
+      typed-array-length: 1.0.5
+      unbox-primitive: 1.0.2
+      which-typed-array: 1.1.15
 
-  /immediate@3.0.6:
-    resolution: {integrity: sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==}
+  /es-aggregate-error@1.0.12:
+    resolution: {integrity: sha512-j0PupcmELoVbYS2NNrsn5zcLLEsryQwP02x8fRawh7c2eEaPHwJFAxltZsqV7HJjsF57+SMpYyVRWgbVLfOagg==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      define-data-property: 1.1.4
+      define-properties: 1.2.1
+      es-abstract: 1.22.5
+      es-errors: 1.3.0
+      function-bind: 1.1.2
+      globalthis: 1.0.3
+      has-property-descriptors: 1.0.2
+      set-function-name: 2.0.2
     dev: false
 
-  /immutable@4.1.0:
-    resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
-    dev: true
-
-  /immutable@4.2.2:
-    resolution: {integrity: sha512-fTMKDwtbvO5tldky9QZ2fMX7slR0mYpY5nbnFWYp0fOzDhHqhgIw9KoYgxLWsoNTS9ZHGauHj18DTyEw6BK3Og==}
-    dev: true
-
-  /import-fresh@3.3.0:
-    resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==}
-    engines: {node: '>=6'}
+  /es-define-property@1.0.0:
+    resolution: {integrity: sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==}
+    engines: {node: '>= 0.4'}
     dependencies:
-      parent-module: 1.0.1
-      resolve-from: 4.0.0
-    dev: true
+      get-intrinsic: 1.2.4
 
-  /import-local@3.1.0:
-    resolution: {integrity: sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==}
-    engines: {node: '>=8'}
-    hasBin: true
-    dependencies:
-      pkg-dir: 4.2.0
-      resolve-cwd: 3.0.0
-    dev: true
+  /es-errors@1.3.0:
+    resolution: {integrity: sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==}
+    engines: {node: '>= 0.4'}
 
-  /imurmurhash@0.1.4:
-    resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==}
-    engines: {node: '>=0.8.19'}
+  /es-get-iterator@1.1.3:
+    resolution: {integrity: sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==}
+    dependencies:
+      call-bind: 1.0.7
+      get-intrinsic: 1.2.4
+      has-symbols: 1.0.3
+      is-arguments: 1.1.1
+      is-map: 2.0.2
+      is-set: 2.0.2
+      is-string: 1.0.7
+      isarray: 2.0.5
+      stop-iteration-iterator: 1.0.0
 
-  /indefinite@2.4.1:
-    resolution: {integrity: sha512-4C1k983crWkOu4tfmx8by1jQ0xBLBo0EhNV1WsRem2y+IbzLmPkYycjrQe399heo3bZ5OYpImQo2o85vQ0HkSQ==}
-    engines: {node: '>=6.0.0'}
+  /es-module-lexer@0.9.3:
+    resolution: {integrity: sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==}
     dev: true
 
-  /indent-string@4.0.0:
-    resolution: {integrity: sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==}
-    engines: {node: '>=8'}
-
-  /infer-owner@1.0.4:
-    resolution: {integrity: sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==}
+  /es-set-tostringtag@2.0.1:
+    resolution: {integrity: sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      get-intrinsic: 1.2.4
+      has: 1.0.3
+      has-tostringtag: 1.0.2
     dev: false
-    optional: true
-
-  /inflected@2.1.0:
-    resolution: {integrity: sha512-hAEKNxvHf2Iq3H60oMBHkB4wl5jn3TPF3+fXek/sRwAB5gP9xWs4r7aweSF95f99HFoz69pnZTcu8f0SIHV18w==}
-    dev: true
 
-  /inflight@1.0.6:
-    resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==}
+  /es-set-tostringtag@2.0.3:
+    resolution: {integrity: sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==}
+    engines: {node: '>= 0.4'}
     dependencies:
-      once: 1.4.0
-      wrappy: 1.0.2
+      get-intrinsic: 1.2.4
+      has-tostringtag: 1.0.2
+      hasown: 2.0.2
 
-  /inherits@2.0.4:
-    resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}
-
-  /ini@1.3.8:
-    resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==}
+  /es-shim-unscopables@1.0.0:
+    resolution: {integrity: sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==}
+    dependencies:
+      has: 1.0.3
     dev: true
 
-  /ini@2.0.0:
-    resolution: {integrity: sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==}
-    engines: {node: '>=10'}
-    dev: true
+  /es-to-primitive@1.2.1:
+    resolution: {integrity: sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      is-callable: 1.2.7
+      is-date-object: 1.0.5
+      is-symbol: 1.0.4
 
-  /inquirer@7.3.3:
-    resolution: {integrity: sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==}
-    engines: {node: '>=8.0.0'}
+  /es5-ext@0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
     dependencies:
-      ansi-escapes: 4.3.2
-      chalk: 4.1.2
-      cli-cursor: 3.1.0
-      cli-width: 3.0.0
-      external-editor: 3.1.0
-      figures: 3.2.0
-      lodash: 4.17.21
-      mute-stream: 0.0.8
-      run-async: 2.4.1
-      rxjs: 6.6.7
-      string-width: 4.2.3
-      strip-ansi: 6.0.1
-      through: 2.3.8
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
     dev: false
 
-  /internal-slot@1.0.4:
-    resolution: {integrity: sha512-tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ==}
-    engines: {node: '>= 0.4'}
+  /es6-iterator@2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
     dependencies:
-      get-intrinsic: 1.1.3
-      has: 1.0.3
-      side-channel: 1.0.4
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
 
-  /interpret@1.4.0:
-    resolution: {integrity: sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==}
-    engines: {node: '>= 0.10'}
+  /es6-object-assign@1.1.0:
+    resolution: {integrity: sha512-MEl9uirslVwqQU369iHNWZXsI8yaZYGg/D65aOgZkeyFJwHYSxilf7rQzXKI7DdDuBPrBXbfk3sl9hJhmd5AUw==}
 
-  /invert-kv@1.0.0:
-    resolution: {integrity: sha512-xgs2NH9AE66ucSq4cNG1nhSFghr5l6tdL15Pk+jl46bmmBapgoaY/AacXyaDznAqmGL99TiLSQgO/XazFSKYeQ==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  /es6-promise@3.3.1:
+    resolution: {integrity: sha512-SOp9Phqvqn7jtEUxPWdWfWoLmyt2VaJ6MpvP9Comy1MceMXqE6bxvaTu4iaxpYYPzhny28Lc+M87/c2cPK6lDg==}
 
-  /ioredis@4.28.5:
-    resolution: {integrity: sha512-3GYo0GJtLqgNXj4YhrisLaNNvWSNwSS2wS4OELGfGxH8I69+XfNdnmV1AyN+ZqMh0i7eX+SWjrwFKDBDgfBC1A==}
-    engines: {node: '>=6'}
+  /es6-symbol@3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
     dependencies:
-      cluster-key-slot: 1.1.1
-      debug: 4.3.4(supports-color@8.1.1)
-      denque: 1.5.1
-      lodash.defaults: 4.2.0
-      lodash.flatten: 4.4.0
-      lodash.isarguments: 3.1.0
-      p-map: 2.1.0
-      redis-commands: 1.7.0
-      redis-errors: 1.2.0
-      redis-parser: 3.0.0
-      standard-as-callback: 2.1.0
-    transitivePeerDependencies:
-      - supports-color
+      d: 1.0.1
+      ext: 1.7.0
     dev: false
 
-  /ioredis@5.2.4:
-    resolution: {integrity: sha512-qIpuAEt32lZJQ0XyrloCRdlEdUUNGG9i0UOk6zgzK6igyudNWqEBxfH6OlbnOOoBBvr1WB02mm8fR55CnikRng==}
-    engines: {node: '>=12.22.0'}
+  /esbuild-plugin-alias@0.2.1:
+    resolution: {integrity: sha512-jyfL/pwPqaFXyKnj8lP8iLk6Z0m099uXR45aSN8Av1XD4vhvQutxxPzgA2bTcAwQpa1zCXDcWOlhFgyP3GKqhQ==}
+    dev: true
+
+  /esbuild-register@3.5.0(esbuild@0.19.8):
+    resolution: {integrity: sha512-+4G/XmakeBAsvJuDugJvtyF1x+XJT4FMocynNpxrvEBViirpfUn2PgNpCHedfWhF4WokNsO/OvMKrmJOIJsI5A==}
+    peerDependencies:
+      esbuild: '>=0.12 <1'
     dependencies:
-      '@ioredis/commands': 1.2.0
-      cluster-key-slot: 1.1.1
       debug: 4.3.4(supports-color@8.1.1)
-      denque: 2.1.0
-      lodash.defaults: 4.2.0
-      lodash.isarguments: 3.1.0
-      redis-errors: 1.2.0
-      redis-parser: 3.0.0
-      standard-as-callback: 2.1.0
+      esbuild: 0.19.8
     transitivePeerDependencies:
       - supports-color
-    dev: false
+    dev: true
 
-  /ip-regex@2.1.0:
-    resolution: {integrity: sha512-58yWmlHpp7VYfcdTwMTvwMmqx/Elfxjd9RXTDyMsbL7lLWmhMylLEqiYVLKuLzOZqVgiWXD9MfR62Vv89VRxkw==}
-    engines: {node: '>=4'}
-    dev: false
+  /esbuild@0.19.8:
+    resolution: {integrity: sha512-l7iffQpT2OrZfH2rXIp7/FkmaeZM0vxbxN9KfiCwGYuZqzMg/JdvX26R31Zxn/Pxvsrg3Y9N6XTcnknqDyyv4w==}
+    engines: {node: '>=12'}
+    hasBin: true
+    optionalDependencies:
+      '@esbuild/android-arm': 0.19.8
+      '@esbuild/android-arm64': 0.19.8
+      '@esbuild/android-x64': 0.19.8
+      '@esbuild/darwin-arm64': 0.19.8
+      '@esbuild/darwin-x64': 0.19.8
+      '@esbuild/freebsd-arm64': 0.19.8
+      '@esbuild/freebsd-x64': 0.19.8
+      '@esbuild/linux-arm': 0.19.8
+      '@esbuild/linux-arm64': 0.19.8
+      '@esbuild/linux-ia32': 0.19.8
+      '@esbuild/linux-loong64': 0.19.8
+      '@esbuild/linux-mips64el': 0.19.8
+      '@esbuild/linux-ppc64': 0.19.8
+      '@esbuild/linux-riscv64': 0.19.8
+      '@esbuild/linux-s390x': 0.19.8
+      '@esbuild/linux-x64': 0.19.8
+      '@esbuild/netbsd-x64': 0.19.8
+      '@esbuild/openbsd-x64': 0.19.8
+      '@esbuild/sunos-x64': 0.19.8
+      '@esbuild/win32-arm64': 0.19.8
+      '@esbuild/win32-ia32': 0.19.8
+      '@esbuild/win32-x64': 0.19.8
+    dev: true
 
-  /ip@1.1.8:
-    resolution: {integrity: sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg==}
-    dev: false
+  /escalade@3.1.1:
+    resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==}
+    engines: {node: '>=6'}
 
-  /ip@2.0.0:
-    resolution: {integrity: sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==}
+  /escape-html@1.0.3:
+    resolution: {integrity: sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==}
 
-  /ipaddr.js@1.9.1:
-    resolution: {integrity: sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==}
-    engines: {node: '>= 0.10'}
+  /escape-string-regexp@1.0.5:
+    resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==}
+    engines: {node: '>=0.8.0'}
 
-  /is-absolute-url@3.0.3:
-    resolution: {integrity: sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==}
+  /escape-string-regexp@2.0.0:
+    resolution: {integrity: sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==}
     engines: {node: '>=8'}
-    dev: true
 
-  /is-absolute@1.0.0:
-    resolution: {integrity: sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==}
-    engines: {node: '>=0.10.0'}
+  /escape-string-regexp@4.0.0:
+    resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==}
+    engines: {node: '>=10'}
+
+  /escodegen@1.14.3:
+    resolution: {integrity: sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==}
+    engines: {node: '>=4.0'}
+    hasBin: true
     dependencies:
-      is-relative: 1.0.0
-      is-windows: 1.0.2
+      esprima: 4.0.1
+      estraverse: 4.3.0
+      esutils: 2.0.3
+      optionator: 0.8.3
+    optionalDependencies:
+      source-map: 0.6.1
+    dev: false
 
-  /is-accessor-descriptor@0.1.6:
-    resolution: {integrity: sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==}
-    engines: {node: '>=0.10.0'}
+  /escodegen@2.0.0:
+    resolution: {integrity: sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==}
+    engines: {node: '>=6.0'}
+    hasBin: true
     dependencies:
-      kind-of: 3.2.2
+      esprima: 4.0.1
+      estraverse: 5.3.0
+      esutils: 2.0.3
+      optionator: 0.8.3
+    optionalDependencies:
+      source-map: 0.6.1
     dev: true
 
-  /is-accessor-descriptor@1.0.0:
-    resolution: {integrity: sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==}
-    engines: {node: '>=0.10.0'}
+  /eslint-config-airbnb-base@15.0.0(eslint-plugin-import@2.29.1)(eslint@8.57.0):
+    resolution: {integrity: sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==}
+    engines: {node: ^10.12.0 || >=12.0.0}
+    peerDependencies:
+      eslint: ^7.32.0 || ^8.2.0
+      eslint-plugin-import: ^2.25.2
     dependencies:
-      kind-of: 6.0.3
+      confusing-browser-globals: 1.0.11
+      eslint: 8.57.0
+      eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.2.0)(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0)
+      object.assign: 4.1.5
+      object.entries: 1.1.5
+      semver: 7.6.0
     dev: true
 
-  /is-arguments@1.1.1:
-    resolution: {integrity: sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==}
-    engines: {node: '>= 0.4'}
+  /eslint-config-airbnb-typescript@18.0.0(@typescript-eslint/eslint-plugin@7.2.0)(@typescript-eslint/parser@7.2.0)(eslint-plugin-import@2.29.1)(eslint@8.57.0):
+    resolution: {integrity: sha512-oc+Lxzgzsu8FQyFVa4QFaVKiitTYiiW3frB9KYW5OWdPrqFc7FzxgB20hP4cHMlr+MBzGcLl3jnCOVOydL9mIg==}
+    peerDependencies:
+      '@typescript-eslint/eslint-plugin': ^7.0.0
+      '@typescript-eslint/parser': ^7.0.0
+      eslint: ^8.56.0
     dependencies:
-      call-bind: 1.0.2
-      has-tostringtag: 1.0.0
+      '@typescript-eslint/eslint-plugin': 7.2.0(@typescript-eslint/parser@7.2.0)(eslint@8.57.0)(typescript@5.4.2)
+      '@typescript-eslint/parser': 7.2.0(eslint@8.57.0)(typescript@5.4.2)
+      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
+    dev: true
 
-  /is-array-buffer@3.0.1:
-    resolution: {integrity: sha512-ASfLknmY8Xa2XtB4wmbz13Wu202baeA18cJBCeCy0wXUHZF0IPyVEXqKEcd+t2fNSLLL1vC6k7lxZEojNbISXQ==}
+  /eslint-config-prettier@9.1.0(eslint@8.57.0):
+    resolution: {integrity: sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==}
+    hasBin: true
+    peerDependencies:
+      eslint: '>=7.0.0'
     dependencies:
-      call-bind: 1.0.2
-      get-intrinsic: 1.1.3
-      is-typed-array: 1.1.10
-
-  /is-arrayish@0.2.1:
-    resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==}
+      eslint: 8.57.0
     dev: true
 
-  /is-arrayish@0.3.2:
-    resolution: {integrity: sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==}
+  /eslint-config-riot@1.0.0:
+    resolution: {integrity: sha512-NB/L/1Y30qyJcG5xZxCJKW/+bqyj+llbcCwo9DEz8bESIP0SLTOQ8T1DWCCFc+wJ61AMEstj4511PSScqMMfCw==}
     dev: false
 
-  /is-bigint@1.0.4:
-    resolution: {integrity: sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==}
+  /eslint-import-resolver-node@0.3.9:
+    resolution: {integrity: sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==}
     dependencies:
-      has-bigints: 1.0.2
+      debug: 3.2.7(supports-color@5.5.0)
+      is-core-module: 2.13.1
+      resolve: 1.22.8
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
 
-  /is-binary-path@2.1.0:
-    resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==}
-    engines: {node: '>=8'}
+  /eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.2.0)(eslint-plugin-import@2.29.1)(eslint@8.57.0):
+    resolution: {integrity: sha512-xgdptdoi5W3niYeuQxKmzVDTATvLYqhpwmykwsh7f6HIOStGWEIL9iqZgQDF9u9OEzrRwR8no5q2VT+bjAujTg==}
+    engines: {node: ^14.18.0 || >=16.0.0}
+    peerDependencies:
+      eslint: '*'
+      eslint-plugin-import: '*'
     dependencies:
-      binary-extensions: 2.2.0
+      debug: 4.3.4(supports-color@8.1.1)
+      enhanced-resolve: 5.13.0
+      eslint: 8.57.0
+      eslint-module-utils: 2.8.0(@typescript-eslint/parser@7.2.0)(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-import-resolver-typescript@3.6.1)(eslint@8.57.0)
+      fast-glob: 3.3.2
+      get-tsconfig: 4.5.0
+      is-core-module: 2.13.1
+      is-glob: 4.0.3
+    transitivePeerDependencies:
+      - '@typescript-eslint/parser'
+      - eslint-import-resolver-node
+      - eslint-import-resolver-webpack
+      - supports-color
+    dev: true
 
-  /is-boolean-object@1.1.2:
-    resolution: {integrity: sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==}
-    engines: {node: '>= 0.4'}
+  /eslint-module-utils@2.8.0(@typescript-eslint/parser@7.2.0)(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0):
+    resolution: {integrity: sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==}
+    engines: {node: '>=4'}
+    peerDependencies:
+      '@typescript-eslint/parser': '*'
+      eslint: '*'
+      eslint-import-resolver-node: '*'
+      eslint-import-resolver-typescript: '*'
+      eslint-import-resolver-webpack: '*'
+    peerDependenciesMeta:
+      '@typescript-eslint/parser':
+        optional: true
+      eslint:
+        optional: true
+      eslint-import-resolver-node:
+        optional: true
+      eslint-import-resolver-typescript:
+        optional: true
+      eslint-import-resolver-webpack:
+        optional: true
     dependencies:
-      call-bind: 1.0.2
-      has-tostringtag: 1.0.0
+      '@typescript-eslint/parser': 7.2.0(eslint@8.57.0)(typescript@5.4.2)
+      debug: 3.2.7(supports-color@5.5.0)
+      eslint: 8.57.0
+      eslint-import-resolver-node: 0.3.9
+      eslint-import-resolver-typescript: 3.6.1(@typescript-eslint/parser@7.2.0)(eslint-plugin-import@2.29.1)(eslint@8.57.0)
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
 
-  /is-buffer@1.1.6:
-    resolution: {integrity: sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==}
+  /eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.2.0)(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0):
+    resolution: {integrity: sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==}
+    engines: {node: '>=4'}
+    peerDependencies:
+      '@typescript-eslint/parser': '*'
+      eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8
+    peerDependenciesMeta:
+      '@typescript-eslint/parser':
+        optional: true
+    dependencies:
+      '@typescript-eslint/parser': 7.2.0(eslint@8.57.0)(typescript@5.4.2)
+      array-includes: 3.1.7
+      array.prototype.findlastindex: 1.2.3
+      array.prototype.flat: 1.3.2
+      array.prototype.flatmap: 1.3.2
+      debug: 3.2.7(supports-color@5.5.0)
+      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-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
+      minimatch: 3.1.2
+      object.fromentries: 2.0.7
+      object.groupby: 1.0.1
+      object.values: 1.1.7
+      semver: 7.6.0
+      tsconfig-paths: 4.2.0
+    transitivePeerDependencies:
+      - eslint-import-resolver-typescript
+      - eslint-import-resolver-webpack
+      - supports-color
+    dev: true
 
-  /is-builtin-module@3.2.1:
-    resolution: {integrity: sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==}
-    engines: {node: '>=6'}
+  /eslint-plugin-lodash@7.4.0(eslint@8.57.0):
+    resolution: {integrity: sha512-Tl83UwVXqe1OVeBRKUeWcfg6/pCW1GTRObbdnbEJgYwjxp5Q92MEWQaH9+dmzbRt6kvYU1Mp893E79nJiCSM8A==}
+    engines: {node: '>=10'}
+    peerDependencies:
+      eslint: '>=2'
     dependencies:
-      builtin-modules: 3.3.0
+      eslint: 8.57.0
+      lodash: 4.17.21
     dev: true
 
-  /is-callable@1.2.7:
-    resolution: {integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==}
-    engines: {node: '>= 0.4'}
+  /eslint-plugin-n8n-local-rules@1.0.0:
+    resolution: {integrity: sha512-qe6sVFDP1Vj5eXlqZxYZpIjwYvhuqXlI0P8OfPyhiPOhMkFtr0TpFphD8/6WCzkm7LJCvG1eJEzURCtMIsFTAg==}
+    dev: true
 
-  /is-ci@3.0.1:
-    resolution: {integrity: sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==}
-    hasBin: true
+  /eslint-plugin-n8n-nodes-base@1.16.0(eslint@8.57.0)(typescript@5.4.2):
+    resolution: {integrity: sha512-OEztJRuT/jv/WvwRXbXNirdYYddpAo2KZEJeOsVniK1ZCChuG4rrZJU3sgMRZMK6W9Pr613uWabW2q8tU2eKJg==}
+    engines: {node: '>=18.10', pnpm: '>=8.6'}
     dependencies:
-      ci-info: 3.7.1
+      '@typescript-eslint/utils': 6.7.5(eslint@8.57.0)(typescript@5.4.2)
+      camel-case: 4.1.2
+      indefinite: 2.4.3
+      pascal-case: 3.1.2
+      pluralize: 8.0.0
+      sentence-case: 3.0.4
+      title-case: 3.0.3
+    transitivePeerDependencies:
+      - eslint
+      - supports-color
+      - typescript
     dev: true
 
-  /is-core-module@2.11.0:
-    resolution: {integrity: sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==}
+  /eslint-plugin-prettier@5.1.3(@types/eslint@8.56.5)(eslint-config-prettier@9.1.0)(eslint@8.57.0)(prettier@3.2.5):
+    resolution: {integrity: sha512-C9GCVAs4Eq7ZC/XFQHITLiHJxQngdtraXaM+LoUFoFp/lHNl2Zn8f3WQbe9HvTBBQ9YnKFB0/2Ajdqwo5D1EAw==}
+    engines: {node: ^14.18.0 || >=16.0.0}
+    peerDependencies:
+      '@types/eslint': '>=8.0.0'
+      eslint: '>=8.0.0'
+      eslint-config-prettier: '*'
+      prettier: ^3.2.5
+    peerDependenciesMeta:
+      '@types/eslint':
+        optional: true
+      eslint-config-prettier:
+        optional: true
     dependencies:
-      has: 1.0.3
+      '@types/eslint': 8.56.5
+      eslint: 8.57.0
+      eslint-config-prettier: 9.1.0(eslint@8.57.0)
+      prettier: 3.2.5
+      prettier-linter-helpers: 1.0.0
+      synckit: 0.8.8
+    dev: true
 
-  /is-data-descriptor@0.1.4:
-    resolution: {integrity: sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==}
-    engines: {node: '>=0.10.0'}
+  /eslint-plugin-unicorn@51.0.1(eslint@8.57.0):
+    resolution: {integrity: sha512-MuR/+9VuB0fydoI0nIn2RDA5WISRn4AsJyNSaNKLVwie9/ONvQhxOBbkfSICBPnzKrB77Fh6CZZXjgTt/4Latw==}
+    engines: {node: '>=16'}
+    peerDependencies:
+      eslint: '>=8.56.0'
     dependencies:
-      kind-of: 3.2.2
+      '@babel/helper-validator-identifier': 7.22.20
+      '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0)
+      '@eslint/eslintrc': 2.1.4
+      ci-info: 4.0.0
+      clean-regexp: 1.0.0
+      core-js-compat: 3.36.0
+      eslint: 8.57.0
+      esquery: 1.5.0
+      indent-string: 4.0.0
+      is-builtin-module: 3.2.1
+      jsesc: 3.0.2
+      pluralize: 8.0.0
+      read-pkg-up: 7.0.1
+      regexp-tree: 0.1.27
+      regjsparser: 0.10.0
+      semver: 7.6.0
+      strip-indent: 3.0.0
+    transitivePeerDependencies:
+      - supports-color
     dev: true
 
-  /is-data-descriptor@1.0.0:
-    resolution: {integrity: sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==}
-    engines: {node: '>=0.10.0'}
+  /eslint-plugin-unused-imports@3.1.0(@typescript-eslint/eslint-plugin@7.2.0)(eslint@8.57.0):
+    resolution: {integrity: sha512-9l1YFCzXKkw1qtAru1RWUtG2EVDZY0a0eChKXcL+EZ5jitG7qxdctu4RnvhOJHv4xfmUf7h+JJPINlVpGhZMrw==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      '@typescript-eslint/eslint-plugin': 6 - 7
+      eslint: '8'
+    peerDependenciesMeta:
+      '@typescript-eslint/eslint-plugin':
+        optional: true
     dependencies:
-      kind-of: 6.0.3
+      '@typescript-eslint/eslint-plugin': 7.2.0(@typescript-eslint/parser@7.2.0)(eslint@8.57.0)(typescript@5.4.2)
+      eslint: 8.57.0
+      eslint-rule-composer: 0.3.0
     dev: true
 
-  /is-date-object@1.0.5:
-    resolution: {integrity: sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==}
-    engines: {node: '>= 0.4'}
+  /eslint-plugin-vue@9.23.0(eslint@8.57.0):
+    resolution: {integrity: sha512-Bqd/b7hGYGrlV+wP/g77tjyFmp81lh5TMw0be9093X02SyelxRRfCI6/IsGq/J7Um0YwB9s0Ry0wlFyjPdmtUw==}
+    engines: {node: ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^6.2.0 || ^7.0.0 || ^8.0.0
     dependencies:
-      has-tostringtag: 1.0.0
+      '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0)
+      eslint: 8.57.0
+      natural-compare: 1.4.0
+      nth-check: 2.1.1
+      postcss-selector-parser: 6.0.16
+      semver: 7.6.0
+      vue-eslint-parser: 9.4.2(eslint@8.57.0)
+      xml-name-validator: 4.0.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
 
-  /is-descriptor@0.1.6:
-    resolution: {integrity: sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==}
-    engines: {node: '>=0.10.0'}
+  /eslint-rule-composer@0.3.0:
+    resolution: {integrity: sha512-bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg==}
+    engines: {node: '>=4.0.0'}
+    dev: true
+
+  /eslint-scope@5.1.1:
+    resolution: {integrity: sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==}
+    engines: {node: '>=8.0.0'}
     dependencies:
-      is-accessor-descriptor: 0.1.6
-      is-data-descriptor: 0.1.4
-      kind-of: 5.1.0
+      esrecurse: 4.3.0
+      estraverse: 4.3.0
     dev: true
 
-  /is-descriptor@1.0.2:
-    resolution: {integrity: sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==}
-    engines: {node: '>=0.10.0'}
+  /eslint-scope@7.2.2:
+    resolution: {integrity: sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
-      is-accessor-descriptor: 1.0.0
-      is-data-descriptor: 1.0.0
-      kind-of: 6.0.3
+      esrecurse: 4.3.0
+      estraverse: 5.3.0
     dev: true
 
-  /is-docker@2.2.1:
-    resolution: {integrity: sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==}
-    engines: {node: '>=8'}
-    hasBin: true
+  /eslint-visitor-keys@3.4.3:
+    resolution: {integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
 
-  /is-expression@4.0.0:
-    resolution: {integrity: sha512-zMIXX63sxzG3XrkHkrAPvm/OVZVSCPNkwMHU8oTX7/U3AL78I0QXCEICXUM13BIa8TYGZ68PiTKfQz3yaTNr4A==}
+  /eslint@8.57.0:
+    resolution: {integrity: sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    hasBin: true
     dependencies:
-      acorn: 7.4.1
-      object-assign: 4.1.1
+      '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0)
+      '@eslint-community/regexpp': 4.6.2
+      '@eslint/eslintrc': 2.1.4
+      '@eslint/js': 8.57.0
+      '@humanwhocodes/config-array': 0.11.14
+      '@humanwhocodes/module-importer': 1.0.1
+      '@nodelib/fs.walk': 1.2.8
+      '@ungap/structured-clone': 1.2.0
+      ajv: 6.12.6
+      chalk: 4.1.2
+      cross-spawn: 7.0.3
+      debug: 4.3.4(supports-color@8.1.1)
+      doctrine: 3.0.0
+      escape-string-regexp: 4.0.0
+      eslint-scope: 7.2.2
+      eslint-visitor-keys: 3.4.3
+      espree: 9.6.1
+      esquery: 1.5.0
+      esutils: 2.0.3
+      fast-deep-equal: 3.1.3
+      file-entry-cache: 6.0.1
+      find-up: 5.0.0
+      glob-parent: 6.0.2
+      globals: 13.20.0
+      graphemer: 1.4.0
+      ignore: 5.2.4
+      imurmurhash: 0.1.4
+      is-glob: 4.0.3
+      is-path-inside: 3.0.3
+      js-yaml: 4.1.0
+      json-stable-stringify-without-jsonify: 1.0.1
+      levn: 0.4.1
+      lodash.merge: 4.6.2
+      minimatch: 3.1.2
+      natural-compare: 1.4.0
+      optionator: 0.9.3
+      strip-ansi: 6.0.1
+      text-table: 0.2.0
+    transitivePeerDependencies:
+      - supports-color
     dev: true
 
-  /is-extendable@0.1.1:
-    resolution: {integrity: sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==}
-    engines: {node: '>=0.10.0'}
+  /esm-resolve@1.0.8:
+    resolution: {integrity: sha512-pzYHY8bf7uLpDuefGsI6JtHVS1J3N1uOkIEC36ejvvWhiiMr/xKBX4PrxCtsxeISJbCEMBLkPZvRwZNHgdwn5A==}
+    dev: true
 
-  /is-extendable@1.0.1:
-    resolution: {integrity: sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==}
-    engines: {node: '>=0.10.0'}
+  /espree@9.6.1:
+    resolution: {integrity: sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
-      is-plain-object: 2.0.4
-    dev: true
+      acorn: 8.11.2
+      acorn-jsx: 5.3.2(acorn@8.11.2)
+      eslint-visitor-keys: 3.4.3
 
-  /is-extglob@2.1.1:
-    resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==}
-    engines: {node: '>=0.10.0'}
+  /esprima-next@5.8.4:
+    resolution: {integrity: sha512-8nYVZ4ioIH4Msjb/XmhnBdz5WRRBaYqevKa1cv9nGJdCehMbzZCPNEEnqfLCZVetUVrUPEcb5IYyu1GG4hFqgg==}
+    engines: {node: '>=12'}
+    hasBin: true
+    dev: false
+
+  /esprima@1.2.2:
+    resolution: {integrity: sha512-+JpPZam9w5DuJ3Q67SqsMGtiHKENSMRVoxvArfJZK01/BfLEObtZ6orJa/MtoGNR/rfMgp5837T41PAmTwAv/A==}
+    engines: {node: '>=0.4.0'}
+    hasBin: true
+    dev: false
+
+  /esprima@4.0.1:
+    resolution: {integrity: sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==}
+    engines: {node: '>=4'}
+    hasBin: true
 
-  /is-fullwidth-code-point@1.0.0:
-    resolution: {integrity: sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==}
-    engines: {node: '>=0.10.0'}
+  /esquery@1.5.0:
+    resolution: {integrity: sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==}
+    engines: {node: '>=0.10'}
     dependencies:
-      number-is-nan: 1.0.1
+      estraverse: 5.3.0
     dev: true
 
-  /is-fullwidth-code-point@2.0.0:
-    resolution: {integrity: sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==}
-    engines: {node: '>=4'}
+  /esrecurse@4.3.0:
+    resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==}
+    engines: {node: '>=4.0'}
+    dependencies:
+      estraverse: 5.3.0
     dev: true
 
-  /is-fullwidth-code-point@3.0.0:
-    resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==}
-    engines: {node: '>=8'}
-
-  /is-fullwidth-code-point@4.0.0:
-    resolution: {integrity: sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==}
-    engines: {node: '>=12'}
-    dev: true
+  /estraverse@4.3.0:
+    resolution: {integrity: sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==}
+    engines: {node: '>=4.0'}
 
-  /is-function@1.0.2:
-    resolution: {integrity: sha512-lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ==}
-    dev: true
+  /estraverse@5.3.0:
+    resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==}
+    engines: {node: '>=4.0'}
 
-  /is-generator-fn@2.1.0:
-    resolution: {integrity: sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==}
-    engines: {node: '>=6'}
-    dev: true
+  /estree-walker@2.0.2:
+    resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==}
 
-  /is-generator-function@1.0.10:
-    resolution: {integrity: sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==}
-    engines: {node: '>= 0.4'}
+  /estree-walker@3.0.3:
+    resolution: {integrity: sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==}
     dependencies:
-      has-tostringtag: 1.0.0
+      '@types/estree': 1.0.0
+    dev: true
 
-  /is-glob@3.1.0:
-    resolution: {integrity: sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==}
+  /esutils@2.0.3:
+    resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==}
     engines: {node: '>=0.10.0'}
-    dependencies:
-      is-extglob: 2.1.1
 
-  /is-glob@4.0.3:
-    resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      is-extglob: 2.1.1
+  /etag@1.8.1:
+    resolution: {integrity: sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==}
+    engines: {node: '>= 0.6'}
 
-  /is-installed-globally@0.4.0:
-    resolution: {integrity: sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==}
-    engines: {node: '>=10'}
+  /event-stream@3.3.4:
+    resolution: {integrity: sha512-QHpkERcGsR0T7Qm3HNJSyXKEEj8AHNxkY3PK8TS2KJvQ7NiSHe3DDpwVKKtoYprL/AreyzFBeIkBIWChAqn60g==}
     dependencies:
-      global-dirs: 3.0.0
-      is-path-inside: 3.0.3
+      duplexer: 0.1.2
+      from: 0.1.7
+      map-stream: 0.1.0
+      pause-stream: 0.0.11
+      split: 0.3.3
+      stream-combiner: 0.0.4
+      through: 2.3.8
     dev: true
 
-  /is-lambda@1.0.1:
-    resolution: {integrity: sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==}
+  /event-target-shim@5.0.1:
+    resolution: {integrity: sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==}
+    engines: {node: '>=6'}
     dev: false
-    optional: true
 
-  /is-map@2.0.2:
-    resolution: {integrity: sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==}
+  /eventemitter2@6.4.7:
+    resolution: {integrity: sha512-tYUSVOGeQPKt/eC1ABfhHy5Xd96N3oIijJvN3O9+TsC28T5V9yX9oEfEK5faP0EFSNVOG97qtAS68GBrQB2hDg==}
+    dev: true
 
-  /is-nan@1.3.2:
-    resolution: {integrity: sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.2
-      define-properties: 1.1.4
+  /eventemitter3@4.0.7:
+    resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
 
-  /is-negated-glob@1.0.0:
-    resolution: {integrity: sha512-czXVVn/QEmgvej1f50BZ648vUI+em0xqMq2Sn+QncCLN4zj1UAxlT+kw/6ggQTOaZPd1HqKQGEqbpQVtJucWug==}
-    engines: {node: '>=0.10.0'}
+  /events@1.1.1:
+    resolution: {integrity: sha512-kEcvvCBByWXGnZy6JUlgAp2gBIUjfCAV6P6TgT1/aaQKcmuAEC4OZTV1I4EWQLz2gxZw76atuVyvHhTxvi0Flw==}
+    engines: {node: '>=0.4.x'}
+    dev: false
 
-  /is-negative-zero@2.0.2:
-    resolution: {integrity: sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==}
-    engines: {node: '>= 0.4'}
+  /events@3.3.0:
+    resolution: {integrity: sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==}
+    engines: {node: '>=0.8.x'}
 
-  /is-number-object@1.0.7:
-    resolution: {integrity: sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      has-tostringtag: 1.0.0
+  /eventsource@2.0.2:
+    resolution: {integrity: sha512-IzUmBGPR3+oUG9dUeXynyNmf91/3zUSJg1lCktzKw47OXuhco54U3r9B7O4XX+Rb1Itm9OZ2b0RkTs10bICOxA==}
+    engines: {node: '>=12.0.0'}
+    dev: false
 
-  /is-number@3.0.0:
-    resolution: {integrity: sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==}
-    engines: {node: '>=0.10.0'}
+  /execa@4.1.0:
+    resolution: {integrity: sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==}
+    engines: {node: '>=10'}
     dependencies:
-      kind-of: 3.2.2
-    dev: true
-
-  /is-number@4.0.0:
-    resolution: {integrity: sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==}
-    engines: {node: '>=0.10.0'}
-    dev: true
-
-  /is-number@7.0.0:
-    resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==}
-    engines: {node: '>=0.12.0'}
-
-  /is-path-cwd@2.2.0:
-    resolution: {integrity: sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==}
-    engines: {node: '>=6'}
+      cross-spawn: 7.0.3
+      get-stream: 5.2.0
+      human-signals: 1.1.1
+      is-stream: 2.0.1
+      merge-stream: 2.0.0
+      npm-run-path: 4.0.1
+      onetime: 5.1.2
+      signal-exit: 3.0.7
+      strip-final-newline: 2.0.0
     dev: true
 
-  /is-path-inside@3.0.3:
-    resolution: {integrity: sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==}
-    engines: {node: '>=8'}
-    dev: true
+  /execa@5.1.1:
+    resolution: {integrity: sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==}
+    engines: {node: '>=10'}
+    dependencies:
+      cross-spawn: 7.0.3
+      get-stream: 6.0.1
+      human-signals: 2.1.0
+      is-stream: 2.0.1
+      merge-stream: 2.0.0
+      npm-run-path: 4.0.1
+      onetime: 5.1.2
+      signal-exit: 3.0.7
+      strip-final-newline: 2.0.0
 
-  /is-plain-obj@2.1.0:
-    resolution: {integrity: sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==}
-    engines: {node: '>=8'}
+  /execa@8.0.1:
+    resolution: {integrity: sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==}
+    engines: {node: '>=16.17'}
+    dependencies:
+      cross-spawn: 7.0.3
+      get-stream: 8.0.1
+      human-signals: 5.0.0
+      is-stream: 3.0.0
+      merge-stream: 2.0.0
+      npm-run-path: 5.1.0
+      onetime: 6.0.0
+      signal-exit: 4.1.0
+      strip-final-newline: 3.0.0
     dev: true
 
-  /is-plain-object@2.0.4:
-    resolution: {integrity: sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==}
-    engines: {node: '>=0.10.0'}
+  /executable@4.1.1:
+    resolution: {integrity: sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg==}
+    engines: {node: '>=4'}
     dependencies:
-      isobject: 3.0.1
+      pify: 2.3.0
     dev: true
 
-  /is-plain-object@5.0.0:
-    resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
-    engines: {node: '>=0.10.0'}
+  /exit@0.1.2:
+    resolution: {integrity: sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==}
+    engines: {node: '>= 0.8.0'}
 
-  /is-potential-custom-element-name@1.0.1:
-    resolution: {integrity: sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==}
-    dev: true
+  /expand-template@2.0.3:
+    resolution: {integrity: sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==}
+    engines: {node: '>=6'}
+    dev: false
 
-  /is-promise@1.0.1:
-    resolution: {integrity: sha512-mjWH5XxnhMA8cFnDchr6qRP9S/kLntKuEfIYku+PaN1CnS8v+OG9O/BKpRCVRJvpIkgAZm0Pf5Is3iSSOILlcg==}
+  /expand-tilde@2.0.2:
+    resolution: {integrity: sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      homedir-polyfill: 1.0.3
     dev: false
 
-  /is-promise@2.2.2:
-    resolution: {integrity: sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==}
+  /expect@29.5.0:
+    resolution: {integrity: sha512-yM7xqUrCO2JdpFo4XpM82t+PJBFybdqoQuJLDGeDX2ij8NZzqRHyu3Hp188/JX7SWqud+7t4MUdvcgGBICMHZg==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    dependencies:
+      '@jest/expect-utils': 29.6.2
+      jest-get-type: 29.4.3
+      jest-matcher-utils: 29.5.0
+      jest-message-util: 29.5.0
+      jest-util: 29.6.2
     dev: true
 
-  /is-property@1.0.2:
-    resolution: {integrity: sha512-Ks/IoX00TtClbGQr4TWXemAnktAQvYB7HzcCxDGqEZU6oCmb2INHuOoKxbtR+HFkmYWBKv/dOZtGRiAjDhj92g==}
+  /expect@29.6.2:
+    resolution: {integrity: sha512-iAErsLxJ8C+S02QbLAwgSGSezLQK+XXRDt8IuFXFpwCNw2ECmzZSmjKcCaFVp5VRMk+WAvz6h6jokzEzBFZEuA==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    dependencies:
+      '@jest/expect-utils': 29.6.2
+      '@types/node': 18.16.16
+      jest-get-type: 29.4.3
+      jest-matcher-utils: 29.6.2
+      jest-message-util: 29.6.2
+      jest-util: 29.6.2
+
+  /expr-eval@2.0.2:
+    resolution: {integrity: sha512-4EMSHGOPSwAfBiibw3ndnP0AvjDWLsMvGOvWEZ2F96IGk0bIVdjQisOHxReSkE13mHcfbuCiXw+G4y0zv6N8Eg==}
     dev: false
 
-  /is-regex@1.1.4:
-    resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
-    engines: {node: '>= 0.4'}
+  /express-async-errors@3.1.1(express@4.19.2):
+    resolution: {integrity: sha512-h6aK1da4tpqWSbyCa3FxB/V6Ehd4EEB15zyQq9qe75OZBp0krinNKuH4rAY+S/U/2I36vdLAUFSjQJ+TFmODng==}
+    peerDependencies:
+      express: ^4.16.2
     dependencies:
-      call-bind: 1.0.2
-      has-tostringtag: 1.0.0
+      express: 4.19.2
+    dev: false
 
-  /is-relative@1.0.0:
-    resolution: {integrity: sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==}
-    engines: {node: '>=0.10.0'}
+  /express-handlebars@7.1.2:
+    resolution: {integrity: sha512-ss9d3mBChOLTEtyfzXCsxlItUxpgS3i4cb/F70G6Q5ohQzmD12XB4x/Y9U6YboeeYBJZt7WQ5yUNu7ZSQ/EGyQ==}
+    engines: {node: '>=v16'}
     dependencies:
-      is-unc-path: 1.0.0
+      glob: 10.3.10
+      graceful-fs: 4.2.11
+      handlebars: 4.7.8
+    dev: false
 
-  /is-retry-allowed@1.2.0:
-    resolution: {integrity: sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  /express-openapi-validator@5.1.6:
+    resolution: {integrity: sha512-CF24Pef5uThjdsCbjo1UP2mYx2YCkQl1HFoikCFFafFpZBCZ0YErD/RbqlcnKbKM9tMwXZsjAuuO84b2hmdF4g==}
+    dependencies:
+      '@apidevtools/json-schema-ref-parser': 9.1.2
+      '@types/multer': 1.4.7
+      ajv: 8.12.0
+      ajv-draft-04: 1.0.0(ajv@8.12.0)
+      ajv-formats: 2.1.1(ajv@8.12.0)
+      content-type: 1.0.5
+      json-schema-traverse: 1.0.0
+      lodash.clonedeep: 4.5.0
+      lodash.get: 4.4.2
+      media-typer: 1.1.0
+      multer: 1.4.5-lts.1
+      ono: 7.1.3
+      path-to-regexp: 6.2.1
+    dev: false
 
-  /is-retry-allowed@2.2.0:
-    resolution: {integrity: sha512-XVm7LOeLpTW4jV19QSH38vkswxoLud8sQ57YwJVTPWdiaI9I8keEhGFpBlslyVsgdQy4Opg8QOLb8YRgsyZiQg==}
+  /express-prom-bundle@6.6.0(prom-client@13.2.0):
+    resolution: {integrity: sha512-tZh2P2p5a8/yxQ5VbRav011Poa4R0mHqdFwn9Swe/obXDe5F0jY9wtRAfNYnqk4LXY7akyvR/nrvAHxQPWUjsQ==}
     engines: {node: '>=10'}
+    peerDependencies:
+      prom-client: '>=12.0.0'
+    dependencies:
+      on-finished: 2.4.1
+      prom-client: 13.2.0
+      url-value-parser: 2.2.0
     dev: false
 
-  /is-set@2.0.2:
-    resolution: {integrity: sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==}
-
-  /is-shared-array-buffer@1.0.2:
-    resolution: {integrity: sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==}
+  /express-rate-limit@7.2.0(express@4.19.2):
+    resolution: {integrity: sha512-T7nul1t4TNyfZMJ7pKRKkdeVJWa2CqB8NA1P8BwYaoDI5QSBZARv5oMS43J7b7I5P+4asjVXjb7ONuwDKucahg==}
+    engines: {node: '>= 16'}
+    peerDependencies:
+      express: 4 || 5 || ^5.0.0-beta.1
     dependencies:
-      call-bind: 1.0.2
-
-  /is-stream@1.1.0:
-    resolution: {integrity: sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+      express: 4.19.2
+    dev: false
 
-  /is-stream@2.0.1:
-    resolution: {integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==}
-    engines: {node: '>=8'}
+  /express@4.19.2:
+    resolution: {integrity: sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==}
+    engines: {node: '>= 0.10.0'}
+    dependencies:
+      accepts: 1.3.8
+      array-flatten: 1.1.1
+      body-parser: 1.20.2
+      content-disposition: 0.5.4
+      content-type: 1.0.5
+      cookie: 0.6.0
+      cookie-signature: 1.0.6
+      debug: 2.6.9
+      depd: 2.0.0
+      encodeurl: 1.0.2
+      escape-html: 1.0.3
+      etag: 1.8.1
+      finalhandler: 1.2.0
+      fresh: 0.5.2
+      http-errors: 2.0.0
+      merge-descriptors: 1.0.1
+      methods: 1.1.2
+      on-finished: 2.4.1
+      parseurl: 1.3.3
+      path-to-regexp: 0.1.7
+      proxy-addr: 2.0.7
+      qs: 6.11.0
+      range-parser: 1.2.1
+      safe-buffer: 5.2.1
+      send: 0.18.0
+      serve-static: 1.15.0
+      setprototypeof: 1.2.0
+      statuses: 2.0.1
+      type-is: 1.6.18
+      utils-merge: 1.0.1
+      vary: 1.1.2
+    transitivePeerDependencies:
+      - supports-color
 
-  /is-string@1.0.7:
-    resolution: {integrity: sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==}
-    engines: {node: '>= 0.4'}
+  /ext@1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
     dependencies:
-      has-tostringtag: 1.0.0
+      type: 2.7.2
+    dev: false
 
-  /is-symbol@1.0.4:
-    resolution: {integrity: sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      has-symbols: 1.0.3
+  /extend@3.0.2:
+    resolution: {integrity: sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==}
 
-  /is-typed-array@1.1.10:
-    resolution: {integrity: sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==}
-    engines: {node: '>= 0.4'}
+  /external-editor@3.1.0:
+    resolution: {integrity: sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==}
+    engines: {node: '>=4'}
     dependencies:
-      available-typed-arrays: 1.0.5
-      call-bind: 1.0.2
-      for-each: 0.3.3
-      gopd: 1.0.1
-      has-tostringtag: 1.0.0
-
-  /is-typedarray@1.0.0:
-    resolution: {integrity: sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==}
+      chardet: 0.7.0
+      iconv-lite: 0.4.24
+      tmp: 0.0.33
+    dev: false
 
-  /is-unc-path@1.0.0:
-    resolution: {integrity: sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==}
-    engines: {node: '>=0.10.0'}
+  /extract-zip@2.0.1(supports-color@8.1.1):
+    resolution: {integrity: sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==}
+    engines: {node: '>= 10.17.0'}
+    hasBin: true
     dependencies:
-      unc-path-regex: 0.1.2
-
-  /is-unicode-supported@0.1.0:
-    resolution: {integrity: sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==}
-    engines: {node: '>=10'}
+      debug: 4.3.4(supports-color@8.1.1)
+      get-stream: 5.2.0
+      yauzl: 2.10.0
+    optionalDependencies:
+      '@types/yauzl': 2.10.0
+    transitivePeerDependencies:
+      - supports-color
     dev: true
 
-  /is-utf8@0.2.1:
-    resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
-    dev: true
+  /extsprintf@1.3.0:
+    resolution: {integrity: sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==}
+    engines: {'0': node >=0.6.0}
 
-  /is-valid-glob@1.0.0:
-    resolution: {integrity: sha512-AhiROmoEFDSsjx8hW+5sGwgKVIORcXnrlAx/R0ZSeaPw70Vw0CqkGBBhHGL58Uox2eXnU1AnvXJl1XlyedO5bA==}
-    engines: {node: '>=0.10.0'}
+  /fake-xml-http-request@2.1.2:
+    resolution: {integrity: sha512-HaFMBi7r+oEC9iJNpc3bvcW7Z7iLmM26hPDmlb0mFwyANSsOQAtJxbdWsXITKOzZUyMYK0zYCv3h5yDj9TsiXg==}
     dev: true
 
-  /is-weakmap@2.0.1:
-    resolution: {integrity: sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==}
+  /fast-deep-equal@3.1.3:
+    resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==}
 
-  /is-weakref@1.0.2:
-    resolution: {integrity: sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==}
-    dependencies:
-      call-bind: 1.0.2
+  /fast-diff@1.2.0:
+    resolution: {integrity: sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==}
+    dev: true
 
-  /is-weakset@2.0.2:
-    resolution: {integrity: sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==}
+  /fast-glob@3.2.12:
+    resolution: {integrity: sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==}
+    engines: {node: '>=8.6.0'}
     dependencies:
-      call-bind: 1.0.2
-      get-intrinsic: 1.1.3
+      '@nodelib/fs.stat': 2.0.5
+      '@nodelib/fs.walk': 1.2.8
+      glob-parent: 5.1.2
+      merge2: 1.4.1
+      micromatch: 4.0.5
 
-  /is-whitespace@0.3.0:
-    resolution: {integrity: sha512-RydPhl4S6JwAyj0JJjshWJEFG6hNye3pZFBRZaTUfZFwGHxzppNaNOVgQuS/E/SlhrApuMXrpnK1EEIXfdo3Dg==}
-    engines: {node: '>=0.10.0'}
+  /fast-glob@3.3.2:
+    resolution: {integrity: sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==}
+    engines: {node: '>=8.6.0'}
+    dependencies:
+      '@nodelib/fs.stat': 2.0.5
+      '@nodelib/fs.walk': 1.2.8
+      glob-parent: 5.1.2
+      merge2: 1.4.1
+      micromatch: 4.0.5
     dev: true
 
-  /is-windows@1.0.2:
-    resolution: {integrity: sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==}
-    engines: {node: '>=0.10.0'}
+  /fast-json-stable-stringify@2.1.0:
+    resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==}
 
-  /is-wsl@2.2.0:
-    resolution: {integrity: sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==}
-    engines: {node: '>=8'}
-    dependencies:
-      is-docker: 2.2.1
+  /fast-levenshtein@2.0.6:
+    resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==}
 
-  /isarray@0.0.1:
-    resolution: {integrity: sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==}
+  /fast-safe-stringify@2.1.1:
+    resolution: {integrity: sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==}
 
-  /isarray@1.0.0:
-    resolution: {integrity: sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==}
+  /fast-text-encoding@1.0.6:
+    resolution: {integrity: sha512-VhXlQgj9ioXCqGstD37E/HBeqEGV/qOD/kmbVG8h5xKBYvM1L3lR1Zn4555cQ8GkYbJa8aJSipLPndE1k6zK2w==}
+    dev: false
 
-  /isarray@2.0.5:
-    resolution: {integrity: sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==}
+  /fast-xml-parser@4.2.5:
+    resolution: {integrity: sha512-B9/wizE4WngqQftFPmdaMYlXoJlJOYxGQOanC77fq9k8+Z0v5dDSVh+3glErdIROP//s/jgb7ZuxKfB8nVyo0g==}
+    hasBin: true
+    dependencies:
+      strnum: 1.0.5
+    dev: false
 
-  /isbot@3.6.1:
-    resolution: {integrity: sha512-e1RmjWns87x60QyiHberWWMJGutL3+Ad0nZ8cz735iDEDDS6ApPfKSFo4EMj0PmMZ0m0ntpWIM0ADdqDFvUJPQ==}
-    engines: {node: '>=12'}
+  /fast-xml-parser@4.2.7:
+    resolution: {integrity: sha512-J8r6BriSLO1uj2miOk1NW0YVm8AGOOu3Si2HQp/cSmo6EA4m3fcwu2WKjJ4RK9wMLBtg69y1kS8baDiQBR41Ig==}
+    hasBin: true
+    dependencies:
+      strnum: 1.0.5
     dev: false
 
-  /isexe@2.0.0:
-    resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
+  /fast-xml-parser@4.3.5:
+    resolution: {integrity: sha512-sWvP1Pl8H03B8oFJpFR3HE31HUfwtX7Rlf9BNsvdpujD4n7WMhfmu8h9wOV2u+c1k0ZilTADhPqypzx2J690ZQ==}
+    hasBin: true
+    dependencies:
+      strnum: 1.0.5
+    dev: false
 
-  /iso-639-1@2.1.15:
-    resolution: {integrity: sha512-7c7mBznZu2ktfvyT582E2msM+Udc1EjOyhVRE/0ZsjD9LBtWSm23h3PtiRh2a35XoUsTQQjJXaJzuLjXsOdFDg==}
-    engines: {node: '>=6.0'}
+  /fastest-levenshtein@1.0.16:
+    resolution: {integrity: sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==}
+    engines: {node: '>= 4.9.1'}
     dev: false
 
-  /isobject@2.1.0:
-    resolution: {integrity: sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==}
-    engines: {node: '>=0.10.0'}
+  /fastq@1.15.0:
+    resolution: {integrity: sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==}
     dependencies:
-      isarray: 1.0.0
-    dev: true
-
-  /isobject@3.0.1:
-    resolution: {integrity: sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+      reusify: 1.0.4
 
-  /isobject@4.0.0:
-    resolution: {integrity: sha512-S/2fF5wH8SJA/kmwr6HYhK/RI/OkhD84k8ntalo0iJjZikgq1XFvR5M8NPT1x5F7fBwCG3qHfnzeP/Vh/ZxCUA==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  /fb-watchman@2.0.2:
+    resolution: {integrity: sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==}
+    dependencies:
+      bser: 2.1.1
 
-  /isomorphic-unfetch@3.1.0:
-    resolution: {integrity: sha512-geDJjpoZ8N0kWexiwkX8F9NkTsXhetLPVbZFQ+JTW239QNOwvB0gniuR1Wc6f0AMTn7/mFGyXvHTifrCp/GH8Q==}
+  /fd-slicer@1.1.0:
+    resolution: {integrity: sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==}
     dependencies:
-      node-fetch: 2.6.8
-      unfetch: 4.2.0
-    transitivePeerDependencies:
-      - encoding
+      pend: 1.2.0
     dev: true
 
-  /isstream@0.1.2:
-    resolution: {integrity: sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==}
+  /fecha@4.2.3:
+    resolution: {integrity: sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw==}
+    dev: false
 
-  /istanbul-lib-coverage@3.2.0:
-    resolution: {integrity: sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==}
-    engines: {node: '>=8'}
+  /fengari-interop@0.1.3(fengari@0.1.4):
+    resolution: {integrity: sha512-EtZ+oTu3kEwVJnoymFPBVLIbQcCoy9uWCVnMA6h3M/RqHkUBsLYp29+RRHf9rKr6GwjubWREU1O7RretFIXjHw==}
+    peerDependencies:
+      fengari: ^0.1.0
+    dependencies:
+      fengari: 0.1.4
     dev: true
 
-  /istanbul-lib-instrument@5.2.1:
-    resolution: {integrity: sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==}
-    engines: {node: '>=8'}
+  /fengari@0.1.4:
+    resolution: {integrity: sha512-6ujqUuiIYmcgkGz8MGAdERU57EIluGGPSUgGPTsco657EHa+srq0S3/YUl/r9kx1+D+d4rGfYObd+m8K22gB1g==}
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/parser': 7.21.5
-      '@istanbuljs/schema': 0.1.3
-      istanbul-lib-coverage: 3.2.0
-      semver: 6.3.0
-    transitivePeerDependencies:
-      - supports-color
+      readline-sync: 1.4.10
+      sprintf-js: 1.1.2
+      tmp: 0.0.33
     dev: true
 
-  /istanbul-lib-report@3.0.0:
-    resolution: {integrity: sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==}
+  /fetch-retry@5.0.3:
+    resolution: {integrity: sha512-uJQyMrX5IJZkhoEUBQ3EjxkeiZkppBd5jS/fMTJmfZxLSiaQjv2zD0kTvuvkSH89uFvgSlB6ueGpjD3HWN7Bxw==}
+    dev: true
+
+  /fflate@0.7.4:
+    resolution: {integrity: sha512-5u2V/CDW15QM1XbbgS+0DfPxVB+jUKhWEKuuFuHncbk3tEEqzmoXL+2KyOFuKGqOnmdIy0/davWF1CkuwtibCw==}
+    dev: false
+
+  /figures@3.2.0:
+    resolution: {integrity: sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==}
     engines: {node: '>=8'}
     dependencies:
-      istanbul-lib-coverage: 3.2.0
-      make-dir: 3.1.0
-      supports-color: 7.2.0
-    dev: true
+      escape-string-regexp: 1.0.5
 
-  /istanbul-lib-source-maps@4.0.1:
-    resolution: {integrity: sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==}
-    engines: {node: '>=10'}
+  /file-entry-cache@6.0.1:
+    resolution: {integrity: sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==}
+    engines: {node: ^10.12.0 || >=12.0.0}
     dependencies:
-      debug: 4.3.4(supports-color@8.1.1)
-      istanbul-lib-coverage: 3.2.0
-      source-map: 0.6.1
-    transitivePeerDependencies:
-      - supports-color
+      flat-cache: 3.0.4
     dev: true
 
-  /istanbul-reports@3.1.5:
-    resolution: {integrity: sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==}
-    engines: {node: '>=8'}
+  /file-saver@2.0.5:
+    resolution: {integrity: sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==}
+    dev: false
+
+  /file-system-cache@2.3.0:
+    resolution: {integrity: sha512-l4DMNdsIPsVnKrgEXbJwDJsA5mB8rGwHYERMgqQx/xAUtChPJMre1bXBzDEqqVbWv9AIbFezXMxeEkZDSrXUOQ==}
     dependencies:
-      html-escaper: 2.0.2
-      istanbul-lib-report: 3.0.0
+      fs-extra: 11.1.1
+      ramda: 0.29.0
     dev: true
 
-  /jake@10.8.5:
-    resolution: {integrity: sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw==}
+  /file-type@16.5.4:
+    resolution: {integrity: sha512-/yFHK0aGjFEgDJjEKP0pWCplsPFPhwyfwevf/pVxiN0tmE4L9LmwWxWukdJSHdoCli4VgQLehjJtwQBnqmsKcw==}
     engines: {node: '>=10'}
-    hasBin: true
     dependencies:
-      async: 3.2.4
-      chalk: 4.1.2
-      filelist: 1.0.4
-      minimatch: 3.1.2
+      readable-web-to-node-stream: 3.0.2
+      strtok3: 6.3.0
+      token-types: 4.2.1
+    dev: false
 
-  /jest-changed-files@29.5.0:
-    resolution: {integrity: sha512-IFG34IUMUaNBIxjQXF/iu7g6EcdMrGRRxaUSw92I/2g2YC6vCdTltl4nHvt7Ci5nSJwXIkCu8Ka1DKF+X7Z1Ag==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+  /file-type@3.9.0:
+    resolution: {integrity: sha512-RLoqTXE8/vPmMuTI88DAzhMYC99I8BWv7zYP4A1puo5HIjEJ5EX48ighy4ZyKMG9EDXxBgW6e++cn7d1xuFghA==}
+    engines: {node: '>=0.10.0'}
+    dev: false
+
+  /file-uri-to-path@1.0.0:
+    resolution: {integrity: sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==}
+    dev: false
+
+  /filelist@1.0.4:
+    resolution: {integrity: sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==}
     dependencies:
-      execa: 5.1.1
-      p-limit: 3.1.0
+      minimatch: 5.1.5
+
+  /filesize@10.1.0:
+    resolution: {integrity: sha512-GTLKYyBSDz3nPhlLVPjPWZCnhkd9TrrRArNcy8Z+J2cqScB7h2McAzR6NBX6nYOoWafql0roY8hrocxnZBv9CQ==}
+    engines: {node: '>= 10.4.0'}
     dev: true
 
-  /jest-circus@29.5.0:
-    resolution: {integrity: sha512-gq/ongqeQKAplVxqJmbeUOJJKkW3dDNPY8PjhJ5G0lBRvu0e3EWGxGy5cI4LAGA7gV2UHCtWBI4EMXK8c9nQKA==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+  /fill-range@7.0.1:
+    resolution: {integrity: sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==}
+    engines: {node: '>=8'}
     dependencies:
-      '@jest/environment': 29.5.0
-      '@jest/expect': 29.5.0
-      '@jest/test-result': 29.5.0
-      '@jest/types': 29.5.0
-      '@types/node': 16.18.12
-      chalk: 4.1.2
-      co: 4.6.0
-      dedent: 0.7.0
-      is-generator-fn: 2.1.0
-      jest-each: 29.5.0
-      jest-matcher-utils: 29.5.0
-      jest-message-util: 29.5.0
-      jest-runtime: 29.5.0
-      jest-snapshot: 29.5.0
-      jest-util: 29.5.0
-      p-limit: 3.1.0
-      pretty-format: 29.5.0
-      pure-rand: 6.0.1
-      slash: 3.0.0
-      stack-utils: 2.0.6
+      to-regex-range: 5.0.1
+
+  /filter-obj@1.1.0:
+    resolution: {integrity: sha512-8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ==}
+    engines: {node: '>=0.10.0'}
+    dev: false
+
+  /finalhandler@1.2.0:
+    resolution: {integrity: sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==}
+    engines: {node: '>= 0.8'}
+    dependencies:
+      debug: 2.6.9
+      encodeurl: 1.0.2
+      escape-html: 1.0.3
+      on-finished: 2.4.1
+      parseurl: 1.3.3
+      statuses: 2.0.1
+      unpipe: 1.0.0
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /jest-cli@29.5.0:
-    resolution: {integrity: sha512-L1KcP1l4HtfwdxXNFCL5bmUbLQiKrakMUriBEcc1Vfz6gx31ORKdreuWvmQVBit+1ss9NNR3yxjwfwzZNdQXJw==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    hasBin: true
-    peerDependencies:
-      node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
-    peerDependenciesMeta:
-      node-notifier:
-        optional: true
+  /find-cache-dir@2.1.0:
+    resolution: {integrity: sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==}
+    engines: {node: '>=6'}
     dependencies:
-      '@jest/core': 29.5.0
-      '@jest/test-result': 29.5.0
-      '@jest/types': 29.5.0
-      chalk: 4.1.2
-      exit: 0.1.2
-      graceful-fs: 4.2.10
-      import-local: 3.1.0
-      jest-config: 29.5.0(@types/node@16.18.12)
-      jest-util: 29.5.0
-      jest-validate: 29.5.0
-      prompts: 2.4.2
-      yargs: 17.6.2
-    transitivePeerDependencies:
-      - '@types/node'
-      - supports-color
-      - ts-node
+      commondir: 1.0.1
+      make-dir: 2.1.0
+      pkg-dir: 3.0.0
     dev: true
 
-  /jest-config@29.5.0(@types/node@16.18.12):
-    resolution: {integrity: sha512-kvDUKBnNJPNBmFFOhDbm59iu1Fii1Q6SxyhXfvylq3UTHbg6o7j/g8k2dZyXWLvfdKB1vAPxNZnMgtKJcmu3kA==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    peerDependencies:
-      '@types/node': '*'
-      ts-node: '>=9.0.0'
-    peerDependenciesMeta:
-      '@types/node':
-        optional: true
-      ts-node:
-        optional: true
+  /find-cache-dir@3.3.2:
+    resolution: {integrity: sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==}
+    engines: {node: '>=8'}
     dependencies:
-      '@babel/core': 7.21.5
-      '@jest/test-sequencer': 29.5.0
-      '@jest/types': 29.5.0
-      '@types/node': 16.18.12
-      babel-jest: 29.5.0(@babel/core@7.21.5)
-      chalk: 4.1.2
-      ci-info: 3.7.1
-      deepmerge: 4.2.2
-      glob: 7.2.3
-      graceful-fs: 4.2.10
-      jest-circus: 29.5.0
-      jest-environment-node: 29.5.0
-      jest-get-type: 29.4.3
-      jest-regex-util: 29.4.3
-      jest-resolve: 29.5.0
-      jest-runner: 29.5.0
-      jest-util: 29.5.0
-      jest-validate: 29.5.0
-      micromatch: 4.0.5
-      parse-json: 5.2.0
-      pretty-format: 29.5.0
-      slash: 3.0.0
-      strip-json-comments: 3.1.1
-    transitivePeerDependencies:
-      - supports-color
+      commondir: 1.0.1
+      make-dir: 3.1.0
+      pkg-dir: 4.2.0
     dev: true
 
-  /jest-diff@29.3.1:
-    resolution: {integrity: sha512-vU8vyiO7568tmin2lA3r2DP8oRvzhvRcD4DjpXc6uGveQodyk7CKLhQlCSiwgx3g0pFaE88/KLZ0yaTWMc4Uiw==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dependencies:
-      chalk: 4.1.2
-      diff-sequences: 29.4.2
-      jest-get-type: 29.4.2
-      pretty-format: 29.4.2
+  /find-package-json@1.2.0:
+    resolution: {integrity: sha512-+SOGcLGYDJHtyqHd87ysBhmaeQ95oWspDKnMXBrnQ9Eq4OkLNqejgoaD8xVWu6GPa0B6roa6KinCMEMcVeqONw==}
     dev: true
 
-  /jest-diff@29.4.2:
-    resolution: {integrity: sha512-EK8DSajVtnjx9sa1BkjZq3mqChm2Cd8rIzdXkQMA8e0wuXq53ypz6s5o5V8HRZkoEt2ywJ3eeNWFKWeYr8HK4g==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+  /find-up@3.0.0:
+    resolution: {integrity: sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==}
+    engines: {node: '>=6'}
     dependencies:
-      chalk: 4.1.2
-      diff-sequences: 29.4.2
-      jest-get-type: 29.4.2
-      pretty-format: 29.4.2
+      locate-path: 3.0.0
     dev: true
 
-  /jest-diff@29.5.0:
-    resolution: {integrity: sha512-LtxijLLZBduXnHSniy0WMdaHjmQnt3g5sa16W4p0HqukYTTsyTW3GD1q41TyGl5YFXj/5B2U6dlh5FM1LIMgxw==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+  /find-up@4.1.0:
+    resolution: {integrity: sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==}
+    engines: {node: '>=8'}
     dependencies:
-      chalk: 4.1.2
-      diff-sequences: 29.4.3
-      jest-get-type: 29.4.3
-      pretty-format: 29.5.0
-    dev: true
+      locate-path: 5.0.0
+      path-exists: 4.0.0
 
-  /jest-docblock@29.4.3:
-    resolution: {integrity: sha512-fzdTftThczeSD9nZ3fzA/4KkHtnmllawWrXO69vtI+L9WjEIuXWs4AmyME7lN5hU7dB0sHhuPfcKofRsUb/2Fg==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+  /find-up@5.0.0:
+    resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==}
+    engines: {node: '>=10'}
     dependencies:
-      detect-newline: 3.1.0
+      locate-path: 6.0.0
+      path-exists: 4.0.0
     dev: true
 
-  /jest-each@29.5.0:
-    resolution: {integrity: sha512-HM5kIJ1BTnVt+DQZ2ALp3rzXEl+g726csObrW/jpEGl+CDSSQpOJJX2KE/vEg8cxcMXdyEPu6U4QX5eruQv5hA==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+  /first-match@0.0.1:
+    resolution: {integrity: sha512-VvKbnaxrC0polTFDC+teKPTdl2mn6B/KUW+WB3C9RzKDeNwbzfLdnUz3FxC+tnjvus6bI0jWrWicQyVIPdS37A==}
+    dev: false
+
+  /flat-cache@3.0.4:
+    resolution: {integrity: sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==}
+    engines: {node: ^10.12.0 || >=12.0.0}
     dependencies:
-      '@jest/types': 29.5.0
-      chalk: 4.1.2
-      jest-get-type: 29.4.3
-      jest-util: 29.5.0
-      pretty-format: 29.5.0
+      flatted: 3.2.7
+      rimraf: 3.0.2
     dev: true
 
-  /jest-environment-jsdom@29.5.0:
-    resolution: {integrity: sha512-/KG8yEK4aN8ak56yFVdqFDzKNHgF4BAymCx2LbPNPsUshUlfAl0eX402Xm1pt+eoG9SLZEUVifqXtX8SK74KCw==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+  /flat@5.0.2:
+    resolution: {integrity: sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==}
+    hasBin: true
+    dev: false
+
+  /flatted@3.2.7:
+    resolution: {integrity: sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==}
+
+  /flow-parser@0.197.0:
+    resolution: {integrity: sha512-yhwkJPxH1JBg0aJunk/jVRy5p3UhVZBGkzL1hq/GK+GaBh6bKr2YKkv6gDuiufaw+i3pKWQgOLtD++1cvrgXLA==}
+    engines: {node: '>=0.4.0'}
+    dev: true
+
+  /fn.name@1.1.0:
+    resolution: {integrity: sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==}
+    dev: false
+
+  /follow-redirects@1.15.6(debug@3.2.7):
+    resolution: {integrity: sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==}
+    engines: {node: '>=4.0'}
     peerDependencies:
-      canvas: ^2.5.0
+      debug: '*'
     peerDependenciesMeta:
-      canvas:
+      debug:
         optional: true
     dependencies:
-      '@jest/environment': 29.5.0
-      '@jest/fake-timers': 29.5.0
-      '@jest/types': 29.5.0
-      '@types/jsdom': 20.0.1
-      '@types/node': 16.18.12
-      jest-mock: 29.5.0
-      jest-util: 29.5.0
-      jsdom: 20.0.2
-    transitivePeerDependencies:
-      - bufferutil
-      - supports-color
-      - utf-8-validate
-    dev: true
+      debug: 3.2.7(supports-color@5.5.0)
+    dev: false
 
-  /jest-environment-node@29.5.0:
-    resolution: {integrity: sha512-ExxuIK/+yQ+6PRGaHkKewYtg6hto2uGCgvKdb2nfJfKXgZ17DfXjvbZ+jA1Qt9A8EQSfPnt5FKIfnOO3u1h9qw==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+  /follow-redirects@1.15.6(debug@4.3.4):
+    resolution: {integrity: sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==}
+    engines: {node: '>=4.0'}
+    peerDependencies:
+      debug: '*'
+    peerDependenciesMeta:
+      debug:
+        optional: true
     dependencies:
-      '@jest/environment': 29.5.0
-      '@jest/fake-timers': 29.5.0
-      '@jest/types': 29.5.0
-      '@types/node': 16.18.12
-      jest-mock: 29.5.0
-      jest-util: 29.5.0
-    dev: true
-
-  /jest-get-type@29.2.0:
-    resolution: {integrity: sha512-uXNJlg8hKFEnDgFsrCjznB+sTxdkuqiCL6zMgA75qEbAJjJYTs9XPrvDctrEig2GDow22T/LvHgO57iJhXB/UA==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dev: true
+      debug: 4.3.4(supports-color@8.1.1)
 
-  /jest-get-type@29.4.2:
-    resolution: {integrity: sha512-vERN30V5i2N6lqlFu4ljdTqQAgrkTFMC9xaIIfOPYBw04pufjXRty5RuXBiB1d72tGbURa/UgoiHB90ruOSivg==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dev: true
+  /for-each@0.3.3:
+    resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==}
+    dependencies:
+      is-callable: 1.2.7
 
-  /jest-get-type@29.4.3:
-    resolution: {integrity: sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+  /foreach@2.0.6:
+    resolution: {integrity: sha512-k6GAGDyqLe9JaebCsFCoudPPWfihKu8pylYXRlqP1J7ms39iPoTtk2fviNglIeQEwdh0bQeKJ01ZPyuyQvKzwg==}
     dev: true
 
-  /jest-haste-map@29.5.0:
-    resolution: {integrity: sha512-IspOPnnBro8YfVYSw6yDRKh/TiCdRngjxeacCps1cQ9cgVN6+10JUcuJ1EabrgYLOATsIAigxA0rLR9x/YlrSA==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+  /foreground-child@3.1.1:
+    resolution: {integrity: sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==}
+    engines: {node: '>=14'}
     dependencies:
-      '@jest/types': 29.5.0
-      '@types/graceful-fs': 4.1.6
-      '@types/node': 16.18.12
-      anymatch: 3.1.3
-      fb-watchman: 2.0.2
-      graceful-fs: 4.2.10
-      jest-regex-util: 29.4.3
-      jest-util: 29.5.0
-      jest-worker: 29.5.0
-      micromatch: 4.0.5
-      walker: 1.0.8
-    optionalDependencies:
-      fsevents: 2.3.2
-    dev: true
+      cross-spawn: 7.0.3
+      signal-exit: 4.1.0
 
-  /jest-leak-detector@29.5.0:
-    resolution: {integrity: sha512-u9YdeeVnghBUtpN5mVxjID7KbkKE1QU4f6uUwuxiY0vYRi9BUCLKlPEZfDGR67ofdFmDz9oPAy2G92Ujrntmow==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+  /forever-agent@0.6.1:
+    resolution: {integrity: sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==}
+
+  /form-data-encoder@1.7.2:
+    resolution: {integrity: sha512-qfqtYan3rxrnCk1VYaA4H+Ms9xdpPqvLZa6xmMgFvhO32x7/3J/ExcTd6qpxM0vH2GdMI+poehyBZvqfMTto8A==}
+    dev: false
+
+  /form-data@2.3.3:
+    resolution: {integrity: sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==}
+    engines: {node: '>= 0.12'}
     dependencies:
-      jest-get-type: 29.4.3
-      pretty-format: 29.5.0
-    dev: true
+      asynckit: 0.4.0
+      combined-stream: 1.0.8
+      mime-types: 2.1.35
 
-  /jest-matcher-utils@29.3.1:
-    resolution: {integrity: sha512-fkRMZUAScup3txIKfMe3AIZZmPEjWEdsPJFK3AIy5qRohWqQFg1qrmKfYXR9qEkNc7OdAu2N4KPHibEmy4HPeQ==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+  /form-data@2.5.1:
+    resolution: {integrity: sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==}
+    engines: {node: '>= 0.12'}
     dependencies:
-      chalk: 4.1.2
-      jest-diff: 29.3.1
-      jest-get-type: 29.2.0
-      pretty-format: 29.4.2
-    dev: true
+      asynckit: 0.4.0
+      combined-stream: 1.0.8
+      mime-types: 2.1.35
+    dev: false
 
-  /jest-matcher-utils@29.4.2:
-    resolution: {integrity: sha512-EZaAQy2je6Uqkrm6frnxBIdaWtSYFoR8SVb2sNLAtldswlR/29JAgx+hy67llT3+hXBaLB0zAm5UfeqerioZyg==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+  /form-data@3.0.1:
+    resolution: {integrity: sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==}
+    engines: {node: '>= 6'}
     dependencies:
-      chalk: 4.1.2
-      jest-diff: 29.4.2
-      jest-get-type: 29.4.2
-      pretty-format: 29.4.2
-    dev: true
+      asynckit: 0.4.0
+      combined-stream: 1.0.8
+      mime-types: 2.1.35
+    dev: false
 
-  /jest-matcher-utils@29.5.0:
-    resolution: {integrity: sha512-lecRtgm/rjIK0CQ7LPQwzCs2VwW6WAahA55YBuI+xqmhm7LAaxokSB8C97yJeYyT+HvQkH741StzpU41wohhWw==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+  /form-data@4.0.0:
+    resolution: {integrity: sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==}
+    engines: {node: '>= 6'}
     dependencies:
-      chalk: 4.1.2
-      jest-diff: 29.5.0
-      jest-get-type: 29.4.3
-      pretty-format: 29.5.0
-    dev: true
+      asynckit: 0.4.0
+      combined-stream: 1.0.8
+      mime-types: 2.1.35
 
-  /jest-message-util@29.3.1:
-    resolution: {integrity: sha512-lMJTbgNcDm5z+6KDxWtqOFWlGQxD6XaYwBqHR8kmpkP+WWWG90I35kdtQHY67Ay5CSuydkTBbJG+tH9JShFCyA==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+  /formdata-node@4.4.1:
+    resolution: {integrity: sha512-0iirZp3uVDjVGt9p49aTaqjk84TrglENEDuqfdlZQ1roC9CWlPk6Avf8EEnZNcAqPonwkG35x4n3ww/1THYAeQ==}
+    engines: {node: '>= 12.20'}
     dependencies:
-      '@babel/code-frame': 7.21.4
-      '@jest/types': 29.5.0
-      '@types/stack-utils': 2.0.1
-      chalk: 4.1.2
-      graceful-fs: 4.2.10
-      micromatch: 4.0.5
-      pretty-format: 29.4.2
-      slash: 3.0.0
-      stack-utils: 2.0.6
-    dev: true
+      node-domexception: 1.0.0
+      web-streams-polyfill: 4.0.0-beta.3
+    dev: false
 
-  /jest-message-util@29.4.2:
-    resolution: {integrity: sha512-SElcuN4s6PNKpOEtTInjOAA8QvItu0iugkXqhYyguRvQoXapg5gN+9RQxLAkakChZA7Y26j6yUCsFWN+hlKD6g==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+  /formidable@3.5.1:
+    resolution: {integrity: sha512-WJWKelbRHN41m5dumb0/k8TeAx7Id/y3a+Z7QfhxP/htI9Js5zYaEDtG8uMgG0vM0lOlqnmjE99/kfpOYi/0Og==}
     dependencies:
-      '@babel/code-frame': 7.18.6
-      '@jest/types': 29.5.0
-      '@types/stack-utils': 2.0.1
-      chalk: 4.1.2
-      graceful-fs: 4.2.10
-      micromatch: 4.0.5
-      pretty-format: 29.4.2
-      slash: 3.0.0
-      stack-utils: 2.0.6
+      dezalgo: 1.0.4
+      hexoid: 1.0.0
+      once: 1.4.0
+
+  /forwarded@0.2.0:
+    resolution: {integrity: sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==}
+    engines: {node: '>= 0.6'}
+
+  /fraction.js@4.2.0:
+    resolution: {integrity: sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==}
     dev: true
 
-  /jest-message-util@29.5.0:
-    resolution: {integrity: sha512-Kijeg9Dag6CKtIDA7O21zNTACqD5MD/8HfIV8pdD94vFyFuer52SigdC3IQMhab3vACxXMiFk+yMHNdbqtyTGA==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dependencies:
-      '@babel/code-frame': 7.18.6
-      '@jest/types': 29.5.0
-      '@types/stack-utils': 2.0.1
-      chalk: 4.1.2
-      graceful-fs: 4.2.10
-      micromatch: 4.0.5
-      pretty-format: 29.5.0
-      slash: 3.0.0
-      stack-utils: 2.0.6
+  /fresh@0.5.2:
+    resolution: {integrity: sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==}
+    engines: {node: '>= 0.6'}
+
+  /from@0.1.7:
+    resolution: {integrity: sha512-twe20eF1OxVxp/ML/kq2p1uc6KvFK/+vs8WjEbeKmV2He22MKm7YF2ANIt+EOqhJ5L3K/SuuPhk0hWQDjOM23g==}
     dev: true
 
-  /jest-mock-extended@3.0.4(jest@29.5.0)(typescript@5.0.3):
-    resolution: {integrity: sha512-2ynEZ7IEJNrhrgshklDMhrOdnmW4Nt+PhkyRqZxRgpwMo7JjmFWMzyp0+eSyk+H9KK1QjXI5xTZIw6x7cVDcRg==}
-    peerDependencies:
-      jest: ^24.0.0 || ^25.0.0 || ^26.0.0 || ^27.0.0 || ^28.0.0 || ^29.0.0
-      typescript: ^3.0.0 || ^4.0.0 || ^5.0.0
+  /fs-constants@1.0.0:
+    resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==}
+
+  /fs-extra@11.1.1:
+    resolution: {integrity: sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==}
+    engines: {node: '>=14.14'}
     dependencies:
-      jest: 29.5.0
-      ts-essentials: 7.0.3(typescript@5.0.3)
-      typescript: 5.0.3
+      graceful-fs: 4.2.11
+      jsonfile: 6.1.0
+      universalify: 2.0.0
     dev: true
 
-  /jest-mock@29.5.0:
-    resolution: {integrity: sha512-GqOzvdWDE4fAV2bWQLQCkujxYWL7RxjCnj71b5VhDAGOevB3qj3Ovg26A5NI84ZpODxyzaozXLOh2NCgkbvyaw==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+  /fs-extra@7.0.1:
+    resolution: {integrity: sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==}
+    engines: {node: '>=6 <7 || >=8'}
     dependencies:
-      '@jest/types': 29.5.0
-      '@types/node': 16.18.12
-      jest-util: 29.5.0
+      graceful-fs: 4.2.11
+      jsonfile: 4.0.0
+      universalify: 0.1.2
     dev: true
 
-  /jest-pnp-resolver@1.2.2(jest-resolve@29.5.0):
-    resolution: {integrity: sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==}
-    engines: {node: '>=6'}
-    peerDependencies:
-      jest-resolve: '*'
-    peerDependenciesMeta:
-      jest-resolve:
-        optional: true
+  /fs-extra@9.1.0:
+    resolution: {integrity: sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==}
+    engines: {node: '>=10'}
     dependencies:
-      jest-resolve: 29.5.0
+      at-least-node: 1.0.0
+      graceful-fs: 4.2.11
+      jsonfile: 6.1.0
+      universalify: 2.0.0
     dev: true
 
-  /jest-regex-util@29.4.3:
-    resolution: {integrity: sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dev: true
+  /fs-minipass@2.1.0:
+    resolution: {integrity: sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==}
+    engines: {node: '>= 8'}
+    dependencies:
+      minipass: 3.3.6
 
-  /jest-resolve-dependencies@29.5.0:
-    resolution: {integrity: sha512-sjV3GFr0hDJMBpYeUuGduP+YeCRbd7S/ck6IvL3kQ9cpySYKqcqhdLLC2rFwrcL7tz5vYibomBrsFYWkIGGjOg==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+  /fs.realpath@1.0.0:
+    resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
+
+  /fsevents@2.3.3:
+    resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==}
+    engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
+    os: [darwin]
+    optional: true
+
+  /function-bind@1.1.2:
+    resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==}
+
+  /function.prototype.name@1.1.5:
+    resolution: {integrity: sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==}
+    engines: {node: '>= 0.4'}
     dependencies:
-      jest-regex-util: 29.4.3
-      jest-snapshot: 29.5.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-abstract: 1.22.5
+      functions-have-names: 1.2.3
+    dev: false
 
-  /jest-resolve@29.5.0:
-    resolution: {integrity: sha512-1TzxJ37FQq7J10jPtQjcc+MkCkE3GBpBecsSUWJ0qZNJpmg6m0D9/7II03yJulm3H/fvVjgqLh/k2eYg+ui52w==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+  /function.prototype.name@1.1.6:
+    resolution: {integrity: sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==}
+    engines: {node: '>= 0.4'}
     dependencies:
-      chalk: 4.1.2
-      graceful-fs: 4.2.10
-      jest-haste-map: 29.5.0
-      jest-pnp-resolver: 1.2.2(jest-resolve@29.5.0)
-      jest-util: 29.5.0
-      jest-validate: 29.5.0
-      resolve: 1.22.1
-      resolve.exports: 2.0.0
-      slash: 3.0.0
-    dev: true
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-abstract: 1.22.5
+      functions-have-names: 1.2.3
 
-  /jest-runner@29.5.0:
-    resolution: {integrity: sha512-m7b6ypERhFghJsslMLhydaXBiLf7+jXy8FwGRHO3BGV1mcQpPbwiqiKUR2zU2NJuNeMenJmlFZCsIqzJCTeGLQ==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+  /functions-have-names@1.2.3:
+    resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==}
+
+  /fuse.js@7.0.0:
+    resolution: {integrity: sha512-14F4hBIxqKvD4Zz/XjDc3y94mNZN6pRv3U13Udo0lNLCWRBUsrMv2xwcF/y/Z5sV6+FQW+/ow68cHpm4sunt8Q==}
+    engines: {node: '>=10'}
+    dev: false
+
+  /gauge@4.0.4:
+    resolution: {integrity: sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==}
+    engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
     dependencies:
-      '@jest/console': 29.5.0
-      '@jest/environment': 29.5.0
-      '@jest/test-result': 29.5.0
-      '@jest/transform': 29.5.0
-      '@jest/types': 29.5.0
-      '@types/node': 16.18.12
-      chalk: 4.1.2
-      emittery: 0.13.1
-      graceful-fs: 4.2.10
-      jest-docblock: 29.4.3
-      jest-environment-node: 29.5.0
-      jest-haste-map: 29.5.0
-      jest-leak-detector: 29.5.0
-      jest-message-util: 29.5.0
-      jest-resolve: 29.5.0
-      jest-runtime: 29.5.0
-      jest-util: 29.5.0
-      jest-watcher: 29.5.0
-      jest-worker: 29.5.0
-      p-limit: 3.1.0
-      source-map-support: 0.5.13
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
+      aproba: 2.0.0
+      color-support: 1.1.3
+      console-control-strings: 1.1.0
+      has-unicode: 2.0.1
+      signal-exit: 3.0.7
+      string-width: 4.2.3
+      strip-ansi: 6.0.1
+      wide-align: 1.1.5
+    dev: false
+    optional: true
 
-  /jest-runtime@29.5.0:
-    resolution: {integrity: sha512-1Hr6Hh7bAgXQP+pln3homOiEZtCDZFqwmle7Ew2j8OlbkIu6uE3Y/etJQG8MLQs3Zy90xrp2C0BRrtPHG4zryw==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+  /gaxios@5.1.0:
+    resolution: {integrity: sha512-aezGIjb+/VfsJtIcHGcBSerNEDdfdHeMros+RbYbGpmonKWQCOVOes0LVZhn1lDtIgq55qq0HaxymIoae3Fl/A==}
+    engines: {node: '>=12'}
     dependencies:
-      '@jest/environment': 29.5.0
-      '@jest/fake-timers': 29.5.0
-      '@jest/globals': 29.5.0
-      '@jest/source-map': 29.4.3
-      '@jest/test-result': 29.5.0
-      '@jest/transform': 29.5.0
-      '@jest/types': 29.5.0
-      '@types/node': 16.18.12
-      chalk: 4.1.2
-      cjs-module-lexer: 1.2.2
-      collect-v8-coverage: 1.0.1
-      glob: 7.2.3
-      graceful-fs: 4.2.10
-      jest-haste-map: 29.5.0
-      jest-message-util: 29.5.0
-      jest-mock: 29.5.0
-      jest-regex-util: 29.4.3
-      jest-resolve: 29.5.0
-      jest-snapshot: 29.5.0
-      jest-util: 29.5.0
-      slash: 3.0.0
-      strip-bom: 4.0.0
+      extend: 3.0.2
+      https-proxy-agent: 5.0.1
+      is-stream: 2.0.1
+      node-fetch: 2.7.0(encoding@0.1.13)
     transitivePeerDependencies:
+      - encoding
       - supports-color
-    dev: true
+    dev: false
 
-  /jest-snapshot@29.5.0:
-    resolution: {integrity: sha512-x7Wolra5V0tt3wRs3/ts3S6ciSQVypgGQlJpz2rsdQYoUKxMxPNaoHMGJN6qAuPJqS+2iQ1ZUn5kl7HCyls84g==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+  /gcp-metadata@5.2.0:
+    resolution: {integrity: sha512-aFhhvvNycky2QyhG+dcfEdHBF0FRbYcf39s6WNHUDysKSrbJ5vuFbjydxBcmewtXeV248GP8dWT3ByPNxsyHCw==}
+    engines: {node: '>=12'}
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/generator': 7.20.7
-      '@babel/plugin-syntax-jsx': 7.18.6(@babel/core@7.21.5)
-      '@babel/plugin-syntax-typescript': 7.20.0(@babel/core@7.21.5)
-      '@babel/traverse': 7.20.12
-      '@babel/types': 7.20.7
-      '@jest/expect-utils': 29.5.0
-      '@jest/transform': 29.5.0
-      '@jest/types': 29.5.0
-      '@types/babel__traverse': 7.18.2
-      '@types/prettier': 2.7.1
-      babel-preset-current-node-syntax: 1.0.1(@babel/core@7.21.5)
-      chalk: 4.1.2
-      expect: 29.5.0
-      graceful-fs: 4.2.10
-      jest-diff: 29.5.0
-      jest-get-type: 29.4.3
-      jest-matcher-utils: 29.5.0
-      jest-message-util: 29.5.0
-      jest-util: 29.5.0
-      natural-compare: 1.4.0
-      pretty-format: 29.5.0
-      semver: 7.3.8
+      gaxios: 5.1.0
+      json-bigint: 1.0.0
     transitivePeerDependencies:
+      - encoding
       - supports-color
-    dev: true
+    dev: false
 
-  /jest-util@29.5.0:
-    resolution: {integrity: sha512-RYMgG/MTadOr5t8KdhejfvUU82MxsCu5MF6KuDUHl+NuwzUt+Sm6jJWxTJVrDR1j5M/gJVCPKQEpWXY+yIQ6lQ==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+  /generate-function@2.3.1:
+    resolution: {integrity: sha512-eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ==}
     dependencies:
-      '@jest/types': 29.5.0
-      '@types/node': 16.18.12
-      chalk: 4.1.2
-      ci-info: 3.7.1
-      graceful-fs: 4.2.10
-      picomatch: 2.3.1
-    dev: true
+      is-property: 1.0.2
+    dev: false
 
-  /jest-validate@29.5.0:
-    resolution: {integrity: sha512-pC26etNIi+y3HV8A+tUGr/lph9B18GnzSRAkPaaZJIE1eFdiYm6/CewuiJQ8/RlfHd1u/8Ioi8/sJ+CmbA+zAQ==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dependencies:
-      '@jest/types': 29.5.0
-      camelcase: 6.3.0
-      chalk: 4.1.2
-      jest-get-type: 29.4.3
-      leven: 3.1.0
-      pretty-format: 29.5.0
-    dev: true
+  /generic-pool@3.9.0:
+    resolution: {integrity: sha512-hymDOu5B53XvN4QT9dBmZxPX4CWhBPPLguTZ9MMFeFa/Kg0xWVfylOVNlJji/E7yTZWFd/q9GO5TxDLq156D7g==}
+    engines: {node: '>= 4'}
 
-  /jest-watcher@29.5.0:
-    resolution: {integrity: sha512-KmTojKcapuqYrKDpRwfqcQ3zjMlwu27SYext9pt4GlF5FUgB+7XE1mcCnSm6a4uUpFyQIkb6ZhzZvHl+jiBCiA==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dependencies:
-      '@jest/test-result': 29.5.0
-      '@jest/types': 29.5.0
-      '@types/node': 16.18.12
-      ansi-escapes: 4.3.2
-      chalk: 4.1.2
-      emittery: 0.13.1
-      jest-util: 29.5.0
-      string-length: 4.0.2
+  /gensync@1.0.0-beta.2:
+    resolution: {integrity: sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==}
+    engines: {node: '>=6.9.0'}
+
+  /get-caller-file@2.0.5:
+    resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==}
+    engines: {node: 6.* || 8.* || >= 10.*}
+
+  /get-func-name@2.0.2:
+    resolution: {integrity: sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==}
     dev: true
 
-  /jest-worker@27.5.1:
-    resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==}
-    engines: {node: '>= 10.13.0'}
+  /get-intrinsic@1.2.1:
+    resolution: {integrity: sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==}
     dependencies:
-      '@types/node': 16.18.12
-      merge-stream: 2.0.0
-      supports-color: 8.1.1
-    dev: true
+      function-bind: 1.1.2
+      has: 1.0.3
+      has-proto: 1.0.3
+      has-symbols: 1.0.3
 
-  /jest-worker@29.5.0:
-    resolution: {integrity: sha512-NcrQnevGoSp4b5kg+akIpthoAFHxPBcb5P6mYPY0fUNT+sSvmtu6jlkEle3anczUKIKEbMxFimk9oTP/tpIPgA==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+  /get-intrinsic@1.2.4:
+    resolution: {integrity: sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==}
+    engines: {node: '>= 0.4'}
     dependencies:
-      '@types/node': 16.18.12
-      jest-util: 29.5.0
-      merge-stream: 2.0.0
-      supports-color: 8.1.1
+      es-errors: 1.3.0
+      function-bind: 1.1.2
+      has-proto: 1.0.3
+      has-symbols: 1.0.3
+      hasown: 2.0.2
+
+  /get-npm-tarball-url@2.0.3:
+    resolution: {integrity: sha512-R/PW6RqyaBQNWYaSyfrh54/qtcnOp22FHCCiRhSSZj0FP3KQWCsxxt0DzIdVTbwTqe9CtQfvl/FPD4UIPt4pqw==}
+    engines: {node: '>=12.17'}
     dev: true
 
-  /jest@29.5.0:
-    resolution: {integrity: sha512-juMg3he2uru1QoXX078zTa7pO85QyB9xajZc6bU+d9yEGwrKX6+vGmJQ3UdVZsvTEUARIdObzH68QItim6OSSQ==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    hasBin: true
-    peerDependencies:
-      node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
-    peerDependenciesMeta:
-      node-notifier:
-        optional: true
-    dependencies:
-      '@jest/core': 29.5.0
-      '@jest/types': 29.5.0
-      import-local: 3.1.0
-      jest-cli: 29.5.0
-    transitivePeerDependencies:
-      - '@types/node'
-      - supports-color
-      - ts-node
+  /get-package-type@0.1.0:
+    resolution: {integrity: sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==}
+    engines: {node: '>=8.0.0'}
+
+  /get-port-please@3.1.2:
+    resolution: {integrity: sha512-Gxc29eLs1fbn6LQ4jSU4vXjlwyZhF5HsGuMAa7gqBP4Rw4yxxltyDUuF5MBclFzDTXO+ACchGQoeela4DSfzdQ==}
     dev: true
 
-  /jmespath@0.16.0:
-    resolution: {integrity: sha512-9FzQjJ7MATs1tSpnco1K6ayiYE3figslrXA72G2HQ/n76RzvYlofyi5QM+iX4YRs/pu3yzxlVQSST23+dMDknw==}
-    engines: {node: '>= 0.6.0'}
+  /get-port@5.1.1:
+    resolution: {integrity: sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==}
+    engines: {node: '>=8'}
     dev: false
 
-  /joi@17.7.0:
-    resolution: {integrity: sha512-1/ugc8djfn93rTE3WRKdCzGGt/EtiYKxITMO4Wiv6q5JL1gl9ePt4kBsl1S499nbosspfctIQTpYIhSmHA3WAg==}
+  /get-stream@5.2.0:
+    resolution: {integrity: sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==}
+    engines: {node: '>=8'}
     dependencies:
-      '@hapi/hoek': 9.3.0
-      '@hapi/topo': 5.1.0
-      '@sideway/address': 4.1.4
-      '@sideway/formula': 3.0.0
-      '@sideway/pinpoint': 2.0.0
+      pump: 3.0.0
     dev: true
 
-  /join-component@1.1.0:
-    resolution: {integrity: sha512-bF7vcQxbODoGK1imE2P9GS9aw4zD0Sd+Hni68IMZLj7zRnquH7dXUmMw9hDI5S/Jzt7q+IyTXN0rSg2GI0IKhQ==}
-    dev: false
+  /get-stream@6.0.1:
+    resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==}
+    engines: {node: '>=10'}
 
-  /jose@4.11.4:
-    resolution: {integrity: sha512-94FdcR8felat4vaTJyL/WVdtlWLlsnLMZP8v+A0Vru18K3bQ22vn7TtpVh3JlgBFNIlYOUlGqwp/MjRPOnIyCQ==}
-    dev: false
+  /get-stream@8.0.1:
+    resolution: {integrity: sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==}
+    engines: {node: '>=16'}
+    dev: true
 
-  /jquery@3.6.1:
-    resolution: {integrity: sha512-opJeO4nCucVnsjiXOE+/PcCgYw9Gwpvs/a6B1LL/lQhwWwpbVEVYDZ1FokFr8PRc7ghYlrFPuyHuiiDNTQxmcw==}
+  /get-symbol-description@1.0.0:
+    resolution: {integrity: sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.7
+      get-intrinsic: 1.2.4
     dev: false
 
-  /js-base64@3.7.2:
-    resolution: {integrity: sha512-NnRs6dsyqUXejqk/yv2aiXlAvOs56sLkX6nUdeaNezI5LFFLlsZjOThmwnrcwh5ZZRwZlCMnVAY3CvhIhoVEKQ==}
+  /get-symbol-description@1.0.2:
+    resolution: {integrity: sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.7
+      es-errors: 1.3.0
+      get-intrinsic: 1.2.4
+
+  /get-system-fonts@2.0.2:
+    resolution: {integrity: sha512-zzlgaYnHMIEgHRrfC7x0Qp0Ylhw/sHpM6MHXeVBTYIsvGf5GpbnClB+Q6rAPdn+0gd2oZZIo6Tj3EaWrt4VhDQ==}
+    engines: {node: '>8.0.0'}
     dev: false
 
-  /js-beautify@1.14.7:
-    resolution: {integrity: sha512-5SOX1KXPFKx+5f6ZrPsIPEY7NwKeQz47n3jm2i+XeHx9MoRsfQenlOP13FQhWvg8JRS0+XLO6XYUQ2GX+q+T9A==}
-    engines: {node: '>=10'}
-    hasBin: true
+  /get-tsconfig@4.5.0:
+    resolution: {integrity: sha512-MjhiaIWCJ1sAU4pIQ5i5OfOuHHxVo1oYeNsWTON7jxYkod8pHocXeh+SSbmu5OZZZK73B6cbJ2XADzXehLyovQ==}
+    dev: true
+
+  /getos@3.2.1:
+    resolution: {integrity: sha512-U56CfOK17OKgTVqozZjUKNdkfEv6jk5WISBJ8SHoagjE6L69zOwl3Z+O8myjY9MEW3i2HPWQBt/LTbCgcC973Q==}
     dependencies:
-      config-chain: 1.1.13
-      editorconfig: 0.15.3
-      glob: 8.1.0
-      nopt: 6.0.0
+      async: 3.2.4
+    dev: true
+
+  /getpass@0.1.7:
+    resolution: {integrity: sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==}
+    dependencies:
+      assert-plus: 1.0.0
+
+  /giget@1.0.0:
+    resolution: {integrity: sha512-KWELZn3Nxq5+0So485poHrFriK9Bn3V/x9y+wgqrHkbmnGbjfLmZ685/SVA/ovW+ewoqW0gVI47pI4yW/VNobQ==}
+    hasBin: true
+    dependencies:
+      colorette: 2.0.19
+      defu: 6.1.3
+      https-proxy-agent: 5.0.1
+      mri: 1.2.0
+      node-fetch-native: 1.0.1
+      pathe: 1.1.1
+      tar: 6.2.1
+    transitivePeerDependencies:
+      - supports-color
     dev: true
 
-  /js-md4@0.3.2:
-    resolution: {integrity: sha512-/GDnfQYsltsjRswQhN9fhv3EMw2sCpUdrdxyWDOUK7eyD++r3gRhzgiQgc/x4MAv2i1iuQ4lxO5mvqM3vj4bwA==}
-    dev: false
-
-  /js-nacl@1.4.0:
-    resolution: {integrity: sha512-HgYLcutGbMYBJrwgVICiHliuw1OJLy2U3tIuK6a1rZ06KC84TPl81WG1hcBRrBCiIIuBe3PSo9G4IZOMGdSg3Q==}
+  /github-from-package@0.0.0:
+    resolution: {integrity: sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==}
     dev: false
 
-  /js-sdsl@4.1.5:
-    resolution: {integrity: sha512-08bOAKweV2NUC1wqTtf3qZlnpOX/R2DU9ikpjOHs0H+ibQv3zpncVQg6um4uYtRtrwIX8M4Nh3ytK4HGlYAq7Q==}
+  /github-slugger@2.0.0:
+    resolution: {integrity: sha512-IaOQ9puYtjrkq7Y0Ygl9KDZnrf/aiUJYUpVf89y8kyaxbRG7Y1SrX/jaumrv81vc61+kiMempujsM3Yw7w5qcw==}
     dev: true
 
-  /js-stringify@1.0.2:
-    resolution: {integrity: sha512-rtS5ATOo2Q5k1G+DADISilDA6lv79zIiwFd6CcjuIxGKLFm5C+RLImRscVap9k55i+MOZwgliw+NejvkLuGD5g==}
+  /glob-parent@5.1.2:
+    resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==}
+    engines: {node: '>= 6'}
+    dependencies:
+      is-glob: 4.0.3
+
+  /glob-parent@6.0.2:
+    resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==}
+    engines: {node: '>=10.13.0'}
+    dependencies:
+      is-glob: 4.0.3
     dev: true
 
-  /js-tokens@4.0.0:
-    resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
+  /glob-to-regexp@0.4.1:
+    resolution: {integrity: sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==}
     dev: true
 
-  /js-yaml@3.14.1:
-    resolution: {integrity: sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==}
+  /glob@10.3.10:
+    resolution: {integrity: sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==}
+    engines: {node: '>=16 || 14 >=14.17'}
     hasBin: true
     dependencies:
-      argparse: 1.0.10
-      esprima: 4.0.1
+      foreground-child: 3.1.1
+      jackspeak: 2.3.6
+      minimatch: 9.0.3
+      minipass: 7.0.2
+      path-scurry: 1.10.1
 
-  /js-yaml@4.1.0:
-    resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==}
+  /glob@10.3.3:
+    resolution: {integrity: sha512-92vPiMb/iqpmEgsOoIDvTjc50wf9CCCvMzsi6W0JLPeUKE8TWP1a73PgqSrqy7iAZxaSD1YdzU7QZR5LF51MJw==}
+    engines: {node: '>=16 || 14 >=14.17'}
     hasBin: true
     dependencies:
-      argparse: 2.0.1
+      foreground-child: 3.1.1
+      jackspeak: 2.2.2
+      minimatch: 9.0.3
+      minipass: 7.0.2
+      path-scurry: 1.10.1
+    dev: true
 
-  /jsbi@4.3.0:
-    resolution: {integrity: sha512-SnZNcinB4RIcnEyZqFPdGPVgrg2AcnykiBy0sHVJQKHYeaLUvi3Exj+iaPpLnFVkDPZIV4U0yvgC9/R4uEAZ9g==}
-    dev: false
+  /glob@7.2.3:
+    resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
+    dependencies:
+      fs.realpath: 1.0.0
+      inflight: 1.0.6
+      inherits: 2.0.4
+      minimatch: 3.1.2
+      once: 1.4.0
+      path-is-absolute: 1.0.1
 
-  /jsbn@0.1.1:
-    resolution: {integrity: sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==}
+  /glob@8.1.0:
+    resolution: {integrity: sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==}
+    engines: {node: '>=12'}
+    dependencies:
+      fs.realpath: 1.0.0
+      inflight: 1.0.6
+      inherits: 2.0.4
+      minimatch: 5.1.5
+      once: 1.4.0
 
-  /jscodeshift@0.13.1(@babel/preset-env@7.20.2):
-    resolution: {integrity: sha512-lGyiEbGOvmMRKgWk4vf+lUrCWO/8YR8sUR3FKF1Cq5fovjZDlIcw3Hu5ppLHAnEXshVffvaM0eyuY/AbOeYpnQ==}
-    hasBin: true
-    peerDependencies:
-      '@babel/preset-env': ^7.1.6
+  /glob@9.3.2:
+    resolution: {integrity: sha512-BTv/JhKXFEHsErMte/AnfiSv8yYOLLiyH2lTg8vn02O21zWFgHPTfxtgn1QRe7NRgggUhC8hacR2Re94svHqeA==}
+    engines: {node: '>=16 || 14 >=14.17'}
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/parser': 7.21.5
-      '@babel/plugin-proposal-class-properties': 7.18.6(@babel/core@7.21.5)
-      '@babel/plugin-proposal-nullish-coalescing-operator': 7.18.6(@babel/core@7.21.5)
-      '@babel/plugin-proposal-optional-chaining': 7.20.7(@babel/core@7.21.5)
-      '@babel/plugin-transform-modules-commonjs': 7.20.11(@babel/core@7.21.5)
-      '@babel/preset-env': 7.20.2(@babel/core@7.21.5)
-      '@babel/preset-flow': 7.18.6(@babel/core@7.21.5)
-      '@babel/preset-typescript': 7.18.6(@babel/core@7.21.5)
-      '@babel/register': 7.18.9(@babel/core@7.21.5)
-      babel-core: 7.0.0-bridge.0(@babel/core@7.21.5)
-      chalk: 4.1.2
-      flow-parser: 0.197.0
-      graceful-fs: 4.2.10
-      micromatch: 3.1.10
-      neo-async: 2.6.2
-      node-dir: 0.1.17
-      recast: 0.20.5
-      temp: 0.8.4
-      write-file-atomic: 2.4.3
-    transitivePeerDependencies:
-      - supports-color
+      fs.realpath: 1.0.0
+      minimatch: 7.4.2
+      minipass: 4.2.5
+      path-scurry: 1.10.1
+
+  /global-dirs@3.0.0:
+    resolution: {integrity: sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA==}
+    engines: {node: '>=10'}
+    dependencies:
+      ini: 2.0.0
     dev: true
 
-  /jscodeshift@0.14.0(@babel/preset-env@7.20.2):
-    resolution: {integrity: sha512-7eCC1knD7bLUPuSCwXsMZUH51O8jIcoVyKtI6P0XM0IVzlGjckPy3FIwQlorzbN0Sg79oK+RlohN32Mqf/lrYA==}
-    hasBin: true
-    peerDependencies:
-      '@babel/preset-env': ^7.1.6
+  /globals@11.12.0:
+    resolution: {integrity: sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==}
+    engines: {node: '>=4'}
+
+  /globals@13.20.0:
+    resolution: {integrity: sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==}
+    engines: {node: '>=8'}
     dependencies:
-      '@babel/core': 7.21.5
-      '@babel/parser': 7.20.7
-      '@babel/plugin-proposal-class-properties': 7.18.6(@babel/core@7.21.5)
-      '@babel/plugin-proposal-nullish-coalescing-operator': 7.18.6(@babel/core@7.21.5)
-      '@babel/plugin-proposal-optional-chaining': 7.20.7(@babel/core@7.21.5)
-      '@babel/plugin-transform-modules-commonjs': 7.20.11(@babel/core@7.21.5)
-      '@babel/preset-env': 7.20.2(@babel/core@7.20.12)
-      '@babel/preset-flow': 7.18.6(@babel/core@7.21.5)
-      '@babel/preset-typescript': 7.18.6(@babel/core@7.21.5)
-      '@babel/register': 7.18.9(@babel/core@7.21.5)
-      babel-core: 7.0.0-bridge.0(@babel/core@7.21.5)
-      chalk: 4.1.2
-      flow-parser: 0.197.0
-      graceful-fs: 4.2.10
-      micromatch: 4.0.5
-      neo-async: 2.6.2
-      node-dir: 0.1.17
-      recast: 0.21.5
-      temp: 0.8.4
-      write-file-atomic: 2.4.3
-    transitivePeerDependencies:
-      - supports-color
+      type-fest: 0.20.2
     dev: true
 
-  /jsdom@20.0.2:
-    resolution: {integrity: sha512-AHWa+QO/cgRg4N+DsmHg1Y7xnz+8KU3EflM0LVDTdmrYOc1WWTSkOjtpUveQH+1Bqd5rtcVnb/DuxV/UjDO4rA==}
+  /globalthis@1.0.3:
+    resolution: {integrity: sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      define-properties: 1.2.1
+
+  /globby@11.1.0:
+    resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==}
+    engines: {node: '>=10'}
+    dependencies:
+      array-union: 2.1.0
+      dir-glob: 3.0.1
+      fast-glob: 3.2.12
+      ignore: 5.2.4
+      merge2: 1.4.1
+      slash: 3.0.0
+
+  /globby@13.2.2:
+    resolution: {integrity: sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+    dependencies:
+      dir-glob: 3.0.1
+      fast-glob: 3.3.2
+      ignore: 5.2.4
+      merge2: 1.4.1
+      slash: 4.0.0
+    dev: true
+
+  /gm@1.25.0:
+    resolution: {integrity: sha512-4kKdWXTtgQ4biIo7hZA396HT062nDVVHPjQcurNZ3o/voYN+o5FUC5kOwuORbpExp3XbTJ3SU7iRipiIhQtovw==}
     engines: {node: '>=14'}
-    peerDependencies:
-      canvas: ^2.5.0
-    peerDependenciesMeta:
-      canvas:
-        optional: true
     dependencies:
-      abab: 2.0.6
-      acorn: 8.8.1
-      acorn-globals: 7.0.1
-      cssom: 0.5.0
-      cssstyle: 2.3.0
-      data-urls: 3.0.2
-      decimal.js: 10.4.3
-      domexception: 4.0.0
-      escodegen: 2.0.0
-      form-data: 4.0.0
-      html-encoding-sniffer: 3.0.0
-      http-proxy-agent: 5.0.0
-      https-proxy-agent: 5.0.1
-      is-potential-custom-element-name: 1.0.1
-      nwsapi: 2.2.2
-      parse5: 7.1.1
-      saxes: 6.0.0
-      symbol-tree: 3.2.4
-      tough-cookie: 4.1.2
-      w3c-xmlserializer: 3.0.0
-      webidl-conversions: 7.0.0
-      whatwg-encoding: 2.0.0
-      whatwg-mimetype: 3.0.0
-      whatwg-url: 11.0.0
-      ws: 8.12.0
-      xml-name-validator: 4.0.0
+      array-parallel: 0.1.3
+      array-series: 0.1.5
+      cross-spawn: 4.0.2
+      debug: 3.2.7(supports-color@5.5.0)
     transitivePeerDependencies:
-      - bufferutil
       - supports-color
-      - utf-8-validate
-    dev: true
+    dev: false
 
-  /jsdom@21.1.0:
-    resolution: {integrity: sha512-m0lzlP7qOtthD918nenK3hdItSd2I+V3W9IrBcB36sqDwG+KnUs66IF5GY7laGWUnlM9vTsD0W1QwSEBYWWcJg==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      canvas: ^2.5.0
-    peerDependenciesMeta:
-      canvas:
-        optional: true
+  /google-auth-library@8.8.0:
+    resolution: {integrity: sha512-0iJn7IDqObDG5Tu9Tn2WemmJ31ksEa96IyK0J0OZCpTh6CrC6FrattwKX87h3qKVuprCJpdOGKc1Xi8V0kMh8Q==}
+    engines: {node: '>=12'}
     dependencies:
-      abab: 2.0.6
-      acorn: 8.8.1
-      acorn-globals: 7.0.1
-      cssom: 0.5.0
-      cssstyle: 2.3.0
-      data-urls: 3.0.2
-      decimal.js: 10.4.3
-      domexception: 4.0.0
-      escodegen: 2.0.0
-      form-data: 4.0.0
-      html-encoding-sniffer: 3.0.0
-      http-proxy-agent: 5.0.0
-      https-proxy-agent: 5.0.1
-      is-potential-custom-element-name: 1.0.1
-      nwsapi: 2.2.2
-      parse5: 7.1.1
-      saxes: 6.0.0
-      symbol-tree: 3.2.4
-      tough-cookie: 4.1.2
-      w3c-xmlserializer: 4.0.0
-      webidl-conversions: 7.0.0
-      whatwg-encoding: 2.0.0
-      whatwg-mimetype: 3.0.0
-      whatwg-url: 11.0.0
-      ws: 8.12.0
-      xml-name-validator: 4.0.0
+      arrify: 2.0.1
+      base64-js: 1.5.1
+      ecdsa-sig-formatter: 1.0.11
+      fast-text-encoding: 1.0.6
+      gaxios: 5.1.0
+      gcp-metadata: 5.2.0
+      gtoken: 6.1.2
+      jws: 4.0.0
+      lru-cache: 6.0.0
     transitivePeerDependencies:
-      - bufferutil
+      - encoding
       - supports-color
-      - utf-8-validate
-    dev: true
+    dev: false
 
-  /jsesc@0.5.0:
-    resolution: {integrity: sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==}
+  /google-gax@3.6.1:
+    resolution: {integrity: sha512-g/lcUjGcB6DSw2HxgEmCDOrI/CByOwqRvsuUvNalHUK2iPPPlmAIpbMbl62u0YufGMr8zgE3JL7th6dCb1Ry+w==}
+    engines: {node: '>=12'}
     hasBin: true
-    dev: true
+    dependencies:
+      '@grpc/grpc-js': 1.8.21
+      '@grpc/proto-loader': 0.7.10
+      '@types/long': 4.0.2
+      '@types/rimraf': 3.0.2
+      abort-controller: 3.0.0
+      duplexify: 4.1.2
+      fast-text-encoding: 1.0.6
+      google-auth-library: 8.8.0
+      is-stream-ended: 0.1.4
+      node-fetch: 2.7.0(encoding@0.1.13)
+      object-hash: 3.0.0
+      proto3-json-serializer: 1.1.1
+      protobufjs: 7.2.4
+      protobufjs-cli: 1.1.1(protobufjs@7.2.4)
+      retry-request: 5.0.2
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
+    dev: false
 
-  /jsesc@2.5.2:
-    resolution: {integrity: sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==}
-    engines: {node: '>=4'}
+  /google-p12-pem@4.0.1:
+    resolution: {integrity: sha512-WPkN4yGtz05WZ5EhtlxNDWPhC4JIic6G8ePitwUWy4l+XPVYec+a0j0Ts47PDtW59y3RwAhUd9/h9ZZ63px6RQ==}
+    engines: {node: '>=12.0.0'}
     hasBin: true
-    dev: true
+    dependencies:
+      node-forge: 1.3.1
+    dev: false
 
-  /jsesc@3.0.2:
-    resolution: {integrity: sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==}
-    engines: {node: '>=6'}
-    hasBin: true
+  /google-timezones-json@1.1.0:
+    resolution: {integrity: sha512-6BmBx9gJVALV2jsfMks8PwmkWT5ip3+bmMyTgXu4PY+G8nKjHi61yrL7rSXpMYRsIzUXhVKpj+MnjhnwG9nung==}
+    dev: false
 
-  /jshint@2.13.5:
-    resolution: {integrity: sha512-dB2n1w3OaQ35PLcBGIWXlszjbPZwsgZoxsg6G8PtNf2cFMC1l0fObkYLUuXqTTdi6tKw4sAjfUseTdmDMHQRcg==}
-    hasBin: true
+  /gopd@1.0.1:
+    resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==}
     dependencies:
-      cli: 1.0.1
-      console-browserify: 1.1.0
-      exit: 0.1.2
-      htmlparser2: 3.8.3
-      lodash: 4.17.21
-      minimatch: 3.0.8
-      strip-json-comments: 1.0.4
-    dev: true
+      get-intrinsic: 1.2.4
 
-  /json-diff@0.5.5:
-    resolution: {integrity: sha512-B2RSfPv8Y5iqm6/9aKC3cOhXPzjYupKDpGuqT5py9NRulL8J0UoB/zKXUo70xBsuxPcIFgtsGgEdXLrNp0GL7w==}
-    hasBin: true
-    dependencies:
-      cli-color: 0.1.7
-      difflib: 0.2.4
-      dreamopt: 0.6.0
-    dev: false
+  /graceful-fs@4.2.10:
+    resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==}
 
-  /json-parse-better-errors@1.0.2:
-    resolution: {integrity: sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==}
-    dev: true
+  /graceful-fs@4.2.11:
+    resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==}
 
-  /json-parse-even-better-errors@2.3.1:
-    resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==}
+  /graphemer@1.4.0:
+    resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==}
     dev: true
 
-  /json-schema-compare@0.2.2:
-    resolution: {integrity: sha512-c4WYmDKyJXhs7WWvAWm3uIYnfyWFoIp+JEoX34rctVvEkMYCPGhXtvmFFXiffBbxfZsvQ0RNnV5H7GvDF5HCqQ==}
-    dependencies:
-      lodash: 4.17.21
-    dev: false
-
-  /json-schema-merge-allof@0.8.1:
-    resolution: {integrity: sha512-CTUKmIlPJbsWfzRRnOXz+0MjIqvnleIXwFTzz+t9T86HnYX/Rozria6ZVGLktAU9e+NygNljveP+yxqtQp/Q4w==}
-    engines: {node: '>=12.0.0'}
+  /graphlib@2.1.8:
+    resolution: {integrity: sha512-jcLLfkpoVGmH7/InMC/1hIvOPSUh38oJtGhvrOFGzioE1DZ+0YW16RgmOJhHiuWTvGiJQ9Z1Ik43JvkRPRvE+A==}
     dependencies:
-      compute-lcm: 1.1.2
-      json-schema-compare: 0.2.2
       lodash: 4.17.21
     dev: false
 
-  /json-schema-ref-parser@9.0.9:
-    resolution: {integrity: sha512-qcP2lmGy+JUoQJ4DOQeLaZDqH9qSkeGCK3suKWxJXS82dg728Mn3j97azDMaOUmJAN4uCq91LdPx4K7E8F1a7Q==}
-    engines: {node: '>=10'}
+  /groq-sdk@0.3.2:
+    resolution: {integrity: sha512-Xp1xOea7nqUcTMndpiA8VkjZ05jM/eUUeCILxhRF+c2etBz/myQwRcUrr5lpWc0euIt96AiBMa9aYa0Iqrh13g==}
     dependencies:
-      '@apidevtools/json-schema-ref-parser': 9.0.9
+      '@types/node': 18.16.16
+      '@types/node-fetch': 2.6.4
+      abort-controller: 3.0.0
+      agentkeepalive: 4.2.1
+      digest-fetch: 1.3.0
+      form-data-encoder: 1.7.2
+      formdata-node: 4.4.1
+      node-fetch: 2.7.0(encoding@0.1.13)
+      web-streams-polyfill: 3.2.1
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
     dev: false
 
-  /json-schema-traverse@0.4.1:
-    resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==}
-
-  /json-schema-traverse@1.0.0:
-    resolution: {integrity: sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==}
-
-  /json-schema@0.4.0:
-    resolution: {integrity: sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==}
-
-  /json-stable-stringify-without-jsonify@1.0.1:
-    resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==}
-
-  /json-stringify-safe@5.0.1:
-    resolution: {integrity: sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==}
+  /gtoken@6.1.2:
+    resolution: {integrity: sha512-4ccGpzz7YAr7lxrT2neugmXQ3hP9ho2gcaityLVkiUecAiwiy60Ii8gRbZeOsXV19fYaRjgBSshs8kXw+NKCPQ==}
+    engines: {node: '>=12.0.0'}
+    dependencies:
+      gaxios: 5.1.0
+      google-p12-pem: 4.0.1
+      jws: 4.0.0
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
+    dev: false
 
-  /json5@1.0.2:
-    resolution: {integrity: sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==}
+  /gunzip-maybe@1.4.2:
+    resolution: {integrity: sha512-4haO1M4mLO91PW57BMsDFf75UmwoRX0GkdD+Faw+Lr+r/OZrOCS0pIBwOL1xCKQqnQzbNFGgK2V2CpBUPeFNTw==}
     hasBin: true
     dependencies:
-      minimist: 1.2.7
+      browserify-zlib: 0.1.4
+      is-deflate: 1.0.0
+      is-gzip: 1.0.0
+      peek-stream: 1.1.3
+      pumpify: 1.5.1
+      through2: 2.0.5
     dev: true
 
-  /json5@2.2.3:
-    resolution: {integrity: sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==}
-    engines: {node: '>=6'}
+  /handlebars@4.7.8:
+    resolution: {integrity: sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==}
+    engines: {node: '>=0.4.7'}
     hasBin: true
-    dev: true
-
-  /jsonc-parser@3.2.0:
-    resolution: {integrity: sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==}
-    dev: true
-
-  /jsonfile@4.0.0:
-    resolution: {integrity: sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==}
-    optionalDependencies:
-      graceful-fs: 4.2.10
-
-  /jsonfile@6.1.0:
-    resolution: {integrity: sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==}
     dependencies:
-      universalify: 2.0.0
+      minimist: 1.2.8
+      neo-async: 2.6.2
+      source-map: 0.6.1
+      wordwrap: 1.0.0
     optionalDependencies:
-      graceful-fs: 4.2.10
+      uglify-js: 3.17.4
 
-  /jsonpath@1.1.1:
-    resolution: {integrity: sha512-l6Cg7jRpixfbgoWgkrl77dgEj8RPvND0wMH6TwQmi9Qs4TFfS9u5cUFnbeKTwj5ga5Y3BTGGNI28k117LJ009w==}
-    dependencies:
-      esprima: 1.2.2
-      static-eval: 2.0.2
-      underscore: 1.12.1
+  /har-schema@2.0.0:
+    resolution: {integrity: sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==}
+    engines: {node: '>=4'}
     dev: false
 
-  /jsonschema@1.4.1:
-    resolution: {integrity: sha512-S6cATIPVv1z0IlxdN+zUk5EPjkGCdnhN4wVSBlvoUO1tOLJootbo9CquNJmbIh4yikWHiUedhRYrNPn1arpEmQ==}
+  /har-validator@5.1.5:
+    resolution: {integrity: sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==}
+    engines: {node: '>=6'}
+    deprecated: this library is no longer supported
+    dependencies:
+      ajv: 6.12.6
+      har-schema: 2.0.0
     dev: false
 
-  /jsonwebtoken@9.0.0:
-    resolution: {integrity: sha512-tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw==}
-    engines: {node: '>=12', npm: '>=6'}
+  /has-bigints@1.0.2:
+    resolution: {integrity: sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==}
+
+  /has-flag@3.0.0:
+    resolution: {integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==}
+    engines: {node: '>=4'}
+
+  /has-flag@4.0.0:
+    resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==}
+    engines: {node: '>=8'}
+
+  /has-property-descriptors@1.0.2:
+    resolution: {integrity: sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==}
     dependencies:
-      jws: 3.2.2
-      lodash: 4.17.21
-      ms: 2.1.3
-      semver: 7.3.8
+      es-define-property: 1.0.0
 
-  /jsprim@1.4.2:
-    resolution: {integrity: sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==}
-    engines: {node: '>=0.6.0'}
+  /has-proto@1.0.3:
+    resolution: {integrity: sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==}
+    engines: {node: '>= 0.4'}
+
+  /has-symbols@1.0.3:
+    resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==}
+    engines: {node: '>= 0.4'}
+
+  /has-tostringtag@1.0.2:
+    resolution: {integrity: sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==}
+    engines: {node: '>= 0.4'}
     dependencies:
-      assert-plus: 1.0.0
-      extsprintf: 1.3.0
-      json-schema: 0.4.0
-      verror: 1.10.0
+      has-symbols: 1.0.3
+
+  /has-unicode@2.0.1:
+    resolution: {integrity: sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==}
     dev: false
+    optional: true
 
-  /jsprim@2.0.2:
-    resolution: {integrity: sha512-gqXddjPqQ6G40VdnI6T6yObEC+pDNvyP95wdQhkWkg7crHH3km5qP1FsOXEkzEQwnz6gz5qGTn1c2Y52wP3OyQ==}
-    engines: {'0': node >=0.6.0}
+  /has@1.0.3:
+    resolution: {integrity: sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==}
+    engines: {node: '>= 0.4.0'}
     dependencies:
-      assert-plus: 1.0.0
-      extsprintf: 1.3.0
-      json-schema: 0.4.0
-      verror: 1.10.0
+      function-bind: 1.1.2
+
+  /hash-sum@2.0.0:
+    resolution: {integrity: sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==}
     dev: true
 
-  /jssha@3.3.0:
-    resolution: {integrity: sha512-w9OtT4ALL+fbbwG3gw7erAO0jvS5nfvrukGPMWIAoea359B26ALXGpzy4YJSp9yGnpUvuvOw1nSjSoHDfWSr1w==}
-    dev: false
+  /hasown@2.0.2:
+    resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      function-bind: 1.1.2
 
-  /jstransformer@1.0.0:
-    resolution: {integrity: sha512-C9YK3Rf8q6VAPDCCU9fnqo3mAfOH6vUGnMcP4AQAYIEpWtfGLpwOTmZ+igtdK5y+VvI2n3CyYSzy4Qh34eq24A==}
+  /hast-util-heading-rank@3.0.0:
+    resolution: {integrity: sha512-EJKb8oMUXVHcWZTDepnr+WNbfnXKFNf9duMesmr4S8SXTJBJ9M4Yok08pu9vxdJwdlGRhVumk9mEhkEvKGifwA==}
     dependencies:
-      is-promise: 2.2.2
-      promise: 7.3.1
+      '@types/hast': 3.0.4
     dev: true
 
-  /just-debounce@1.1.0:
-    resolution: {integrity: sha512-qpcRocdkUmf+UTNBYx5w6dexX5J31AKK1OmPwH630a83DdVVUIngk55RSAiIGpQyoH0dlr872VHfPjnQnK1qDQ==}
+  /hast-util-is-element@3.0.0:
+    resolution: {integrity: sha512-Val9mnv2IWpLbNPqc/pUem+a7Ipj2aHacCwgNfTiK0vJKl0LF+4Ba4+v1oPHFpf3bLYmreq0/l3Gud9S5OH42g==}
+    dependencies:
+      '@types/hast': 3.0.4
     dev: true
 
-  /jwa@1.4.1:
-    resolution: {integrity: sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==}
+  /hast-util-to-string@3.0.0:
+    resolution: {integrity: sha512-OGkAxX1Ua3cbcW6EJ5pT/tslVb90uViVkcJ4ZZIMW/R33DX/AkcJcRrPebPwJkHYwlDHXz4aIwvAAaAdtrACFA==}
     dependencies:
-      buffer-equal-constant-time: 1.0.1
-      ecdsa-sig-formatter: 1.0.11
-      safe-buffer: 5.2.1
+      '@types/hast': 3.0.4
+    dev: true
 
-  /jwa@2.0.0:
-    resolution: {integrity: sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==}
+  /he@1.2.0:
+    resolution: {integrity: sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==}
+    hasBin: true
+
+  /header-case@2.0.4:
+    resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
-      buffer-equal-constant-time: 1.0.1
-      ecdsa-sig-formatter: 1.0.11
-      safe-buffer: 5.2.1
+      capital-case: 1.0.4
+      tslib: 2.6.2
     dev: false
 
-  /jwks-rsa@3.0.1:
-    resolution: {integrity: sha512-UUOZ0CVReK1QVU3rbi9bC7N5/le8ziUj0A2ef1Q0M7OPD2KvjEYizptqIxGIo6fSLYDkqBrazILS18tYuRc8gw==}
-    engines: {node: '>=14'}
-    dependencies:
-      '@types/express': 4.17.14
-      '@types/jsonwebtoken': 9.0.1
-      debug: 4.3.4(supports-color@8.1.1)
-      jose: 4.11.4
-      limiter: 1.1.5
-      lru-memoizer: 2.1.4
-    transitivePeerDependencies:
-      - supports-color
+  /heap@0.2.7:
+    resolution: {integrity: sha512-2bsegYkkHO+h/9MGbn6KWcE45cHZgPANo5LXF7EvWdT0yT2EguSVO1nDgU5c8+ZOPwp2vMNa7YFsJhVcDR9Sdg==}
     dev: false
 
-  /jws@3.2.2:
-    resolution: {integrity: sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==}
-    dependencies:
-      jwa: 1.4.1
-      safe-buffer: 5.2.1
+  /helmet@7.1.0:
+    resolution: {integrity: sha512-g+HZqgfbpXdCkme/Cd/mZkV0aV3BZZZSugecH03kl38m/Kmdx8jKjBikpDj2cr+Iynv4KpYEviojNdTJActJAg==}
+    engines: {node: '>=16.0.0'}
+    dev: false
 
-  /jws@4.0.0:
-    resolution: {integrity: sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==}
+  /help-me@4.2.0:
+    resolution: {integrity: sha512-TAOnTB8Tz5Dw8penUuzHVrKNKlCIbwwbHnXraNJxPwf8LRtE2HlM84RYuezMFcwOJmoYOCWVDyJ8TQGxn9PgxA==}
     dependencies:
-      jwa: 2.0.0
-      safe-buffer: 5.2.1
+      glob: 8.1.0
+      readable-stream: 3.6.0
     dev: false
 
-  /kafkajs@1.16.0:
-    resolution: {integrity: sha512-+Rcfu2hyQ/jv5skqRY8xA7Ra+mmRkDAzCaLDYbkGtgsNKpzxPWiLbk8ub0dgr4EbWrN1Zb4BCXHUkD6+zYfdWg==}
-    engines: {node: '>=10.13.0'}
+  /hexoid@1.0.0:
+    resolution: {integrity: sha512-QFLV0taWQOZtvIRIAdBChesmogZrtuXvVWsFHZTk2SU+anspqZ2vMnoLg7IE1+Uk16N19APic1BuF8bC8c2m5g==}
+    engines: {node: '>=8'}
+
+  /highlight.js@10.7.3:
+    resolution: {integrity: sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==}
     dev: false
 
-  /kind-of@3.2.2:
-    resolution: {integrity: sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      is-buffer: 1.1.6
-    dev: true
+  /highlight.js@11.9.0:
+    resolution: {integrity: sha512-fJ7cW7fQGCYAkgv4CPfwFHrfd/cLS4Hau96JuJ+ZTOWhjnhoeN1ub1tFmALm/+lW5z4WCAuAV9bm05AP0mS6Gw==}
+    engines: {node: '>=12.0.0'}
+    dev: false
 
-  /kind-of@4.0.0:
-    resolution: {integrity: sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==}
+  /homedir-polyfill@1.0.3:
+    resolution: {integrity: sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      is-buffer: 1.1.6
-    dev: true
+      parse-passwd: 1.0.0
+    dev: false
 
-  /kind-of@5.1.0:
-    resolution: {integrity: sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==}
-    engines: {node: '>=0.10.0'}
+  /hookable@5.5.3:
+    resolution: {integrity: sha512-Yc+BQe8SvoXH1643Qez1zqLRmbA5rCL+sSmk6TVos0LWVfNIB7PGncdlId77WzLGSIB5KaWgTaNTs2lNVEI6VQ==}
     dev: true
 
-  /kind-of@6.0.3:
-    resolution: {integrity: sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==}
-    engines: {node: '>=0.10.0'}
+  /hosted-git-info@2.8.9:
+    resolution: {integrity: sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==}
     dev: true
 
-  /kleur@3.0.3:
-    resolution: {integrity: sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==}
-    engines: {node: '>=6'}
+  /html-encoding-sniffer@3.0.0:
+    resolution: {integrity: sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==}
+    engines: {node: '>=12'}
+    dependencies:
+      whatwg-encoding: 2.0.0
     dev: true
 
-  /klona@2.0.5:
-    resolution: {integrity: sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==}
-    engines: {node: '>= 8'}
+  /html-encoding-sniffer@4.0.0:
+    resolution: {integrity: sha512-Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ==}
+    engines: {node: '>=18'}
+    dependencies:
+      whatwg-encoding: 3.1.1
     dev: true
 
-  /klona@2.0.6:
-    resolution: {integrity: sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==}
-    engines: {node: '>= 8'}
-    dev: true
+  /html-escaper@2.0.2:
+    resolution: {integrity: sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==}
 
-  /kuler@2.0.0:
-    resolution: {integrity: sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A==}
+  /html-to-text@9.0.5:
+    resolution: {integrity: sha512-qY60FjREgVZL03vJU6IfMV4GDjGBIoOyvuFdpBDIX9yTlDw0TjxVBQp+P8NvpdIXNJvfWBTNul7fsAQJq2FNpg==}
+    engines: {node: '>=14'}
+    dependencies:
+      '@selderee/plugin-htmlparser2': 0.11.0
+      deepmerge: 4.3.1
+      dom-serializer: 2.0.0
+      htmlparser2: 8.0.2
+      selderee: 0.11.0
     dev: false
 
-  /last-run@1.1.1:
-    resolution: {integrity: sha512-U/VxvpX4N/rFvPzr3qG5EtLKEnNI0emvIQB3/ecEwv+8GHaUKbIB8vxv1Oai5FAF0d0r7LXHhLLe5K/yChm5GQ==}
-    engines: {node: '>= 0.10'}
+  /htmlparser2@6.1.0:
+    resolution: {integrity: sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==}
     dependencies:
-      default-resolution: 2.0.0
-      es6-weak-map: 2.0.3
-    dev: true
-
-  /lazy-ass@1.6.0:
-    resolution: {integrity: sha512-cc8oEVoctTvsFZ/Oje/kGnHbpWHYBe8IAJe4C0QNc3t8uM/0Y8+erSz/7Y1ALuXTEZTMvxXwO6YbX1ey3ujiZw==}
-    engines: {node: '> 0.8'}
-    dev: true
+      domelementtype: 2.3.0
+      domhandler: 4.3.1
+      domutils: 2.8.0
+      entities: 2.2.0
+    dev: false
 
-  /lazy-universal-dotenv@4.0.0:
-    resolution: {integrity: sha512-aXpZJRnTkpK6gQ/z4nk+ZBLd/Qdp118cvPruLSIQzQNRhKwEcdXCOzXuF55VDqIiuAaY3UGZ10DJtvZzDcvsxg==}
-    engines: {node: '>=14.0.0'}
+  /htmlparser2@8.0.2:
+    resolution: {integrity: sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==}
     dependencies:
-      app-root-dir: 1.0.2
-      dotenv: 16.0.3
-      dotenv-expand: 10.0.0
-    dev: true
+      domelementtype: 2.3.0
+      domhandler: 5.0.3
+      domutils: 3.0.1
+      entities: 4.4.0
 
-  /lazystream@1.0.1:
-    resolution: {integrity: sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==}
-    engines: {node: '>= 0.6.3'}
-    dependencies:
-      readable-stream: 2.3.7
-    dev: true
+  /http-cache-semantics@4.1.1:
+    resolution: {integrity: sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==}
+    dev: false
+    optional: true
 
-  /lcid@1.0.0:
-    resolution: {integrity: sha512-YiGkH6EnGrDGqLMITnGjXtGmNtjoXw9SVUzcaos8RBi7Ps0VBylkq+vOcY9QE5poLasPCR849ucFUkl0UzUyOw==}
-    engines: {node: '>=0.10.0'}
+  /http-errors@2.0.0:
+    resolution: {integrity: sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==}
+    engines: {node: '>= 0.8'}
     dependencies:
-      invert-kv: 1.0.0
-    dev: true
+      depd: 2.0.0
+      inherits: 2.0.4
+      setprototypeof: 1.2.0
+      statuses: 2.0.1
+      toidentifier: 1.0.1
 
-  /ldapts@4.2.2:
-    resolution: {integrity: sha512-UHe7BtEhPUFHZZ6XHnRvLHWQrftTap3PgGU0nOLtrFeigZvfpXSsqJ8C9uXNouDV+iDHqoWwplS0eHoDu/GIEQ==}
-    engines: {node: '>=14'}
+  /http-proxy-agent@4.0.1:
+    resolution: {integrity: sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==}
+    engines: {node: '>= 6'}
     dependencies:
-      '@types/asn1': 0.2.0
-      '@types/node': 16.18.12
-      '@types/uuid': 9.0.0
-      asn1: 0.2.6
+      '@tootallnate/once': 1.1.2
+      agent-base: 6.0.2
       debug: 4.3.4(supports-color@8.1.1)
-      strict-event-emitter-types: 2.0.0
-      uuid: 9.0.0
     transitivePeerDependencies:
       - supports-color
     dev: false
+    optional: true
 
-  /lead@1.0.0:
-    resolution: {integrity: sha512-IpSVCk9AYvLHo5ctcIXxOBpMWUe+4TKN3VPWAKUbJikkmsGp0VrSM8IttVc32D6J4WUsiPE6aEFRNmIoF/gdow==}
-    engines: {node: '>= 0.10'}
-    dependencies:
-      flush-write-stream: 1.1.1
-    dev: true
-
-  /leven@2.1.0:
-    resolution: {integrity: sha512-nvVPLpIHUxCUoRLrFqTgSxXJ614d8AgQoWl7zPe/2VadE8+1dpU3LBhowRuBAcuwruWtOdD8oYC9jDNJjXDPyA==}
-    engines: {node: '>=0.10.0'}
-    dev: false
-
-  /leven@3.1.0:
-    resolution: {integrity: sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==}
-    engines: {node: '>=6'}
-    dev: true
-
-  /levn@0.3.0:
-    resolution: {integrity: sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==}
-    engines: {node: '>= 0.8.0'}
+  /http-proxy-agent@5.0.0:
+    resolution: {integrity: sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==}
+    engines: {node: '>= 6'}
     dependencies:
-      prelude-ls: 1.1.2
-      type-check: 0.3.2
+      '@tootallnate/once': 2.0.0
+      agent-base: 6.0.2
+      debug: 4.3.4(supports-color@8.1.1)
+    transitivePeerDependencies:
+      - supports-color
 
-  /levn@0.4.1:
-    resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
-    engines: {node: '>= 0.8.0'}
+  /http-proxy-agent@7.0.0:
+    resolution: {integrity: sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ==}
+    engines: {node: '>= 14'}
     dependencies:
-      prelude-ls: 1.2.1
-      type-check: 0.4.0
+      agent-base: 7.1.0
+      debug: 4.3.4(supports-color@8.1.1)
+    transitivePeerDependencies:
+      - supports-color
     dev: true
 
-  /libbase64@1.2.1:
-    resolution: {integrity: sha512-l+nePcPbIG1fNlqMzrh68MLkX/gTxk/+vdvAb388Ssi7UuUN31MI44w4Yf33mM3Cm4xDfw48mdf3rkdHszLNew==}
+  /http-reasons@0.1.0:
+    resolution: {integrity: sha512-P6kYh0lKZ+y29T2Gqz+RlC9WBLhKe8kDmcJ+A+611jFfxdPsbMRQ5aNmFRM3lENqFkK+HTTL+tlQviAiv0AbLQ==}
     dev: false
 
-  /libmime@5.1.0:
-    resolution: {integrity: sha512-xOqorG21Va+3CjpFOfFTU7SWohHH2uIX9ZY4Byz6J+lvpfvc486tOAT/G9GfbrKtJ9O7NCX9o0aC2lxqbnZ9EA==}
+  /http-signature@1.2.0:
+    resolution: {integrity: sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==}
+    engines: {node: '>=0.8', npm: '>=1.3.7'}
     dependencies:
-      encoding-japanese: 2.0.0
-      iconv-lite: 0.6.3
-      libbase64: 1.2.1
-      libqp: 1.1.0
+      assert-plus: 1.0.0
+      jsprim: 1.4.2
+      sshpk: 1.17.0
     dev: false
 
-  /libphonenumber-js@1.10.14:
-    resolution: {integrity: sha512-McGS7GV/WjJ2KjfOGhJU1oJn29RYeo7Q+RpANRbUNMQ9gj5XArpbjurSuyYPTejFwbaUojstQ4XyWCrAzGOUXw==}
-    dev: false
+  /http-signature@1.3.6:
+    resolution: {integrity: sha512-3adrsD6zqo4GsTqtO7FyrejHNv+NgiIfAfv68+jVlFmSr9OGy7zrxONceFRLKvnnZA5jbxQBX1u9PpB6Wi32Gw==}
+    engines: {node: '>=0.10'}
+    dependencies:
+      assert-plus: 1.0.0
+      jsprim: 2.0.2
+      sshpk: 1.17.0
+    dev: true
 
-  /libqp@1.1.0:
-    resolution: {integrity: sha512-4Rgfa0hZpG++t1Vi2IiqXG9Ad1ig4QTmtuZF946QJP4bPqOYC78ixUXgz5TW/wE7lNaNKlplSYTxQ+fR2KZ0EA==}
-    dev: false
+  /http2-client@1.3.5:
+    resolution: {integrity: sha512-EC2utToWl4RKfs5zd36Mxq7nzHHBuomZboI0yYL6Y0RmBgT7Sgkq4rQ0ezFTYoIsSs7Tm9SJe+o2FcAg6GBhGA==}
 
-  /lie@3.1.1:
-    resolution: {integrity: sha512-RiNhHysUjhrDQntfYSfY4MU24coXXdEOgw9WGcKHNeEwffDYbF//u87M1EWaMGzuFoSbqW0C9C6lEEhDOAswfw==}
+  /https-proxy-agent@5.0.1:
+    resolution: {integrity: sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==}
+    engines: {node: '>= 6'}
     dependencies:
-      immediate: 3.0.6
-    dev: false
+      agent-base: 6.0.2
+      debug: 4.3.4(supports-color@8.1.1)
+    transitivePeerDependencies:
+      - supports-color
 
-  /liftoff@3.1.0:
-    resolution: {integrity: sha512-DlIPlJUkCV0Ips2zf2pJP0unEoT1kwYhiiPUGF3s/jtxTCjziNLoiVVh+jqWOWeFi6mmwQ5fNxvAUyPad4Dfog==}
-    engines: {node: '>= 0.8'}
+  /https-proxy-agent@7.0.2:
+    resolution: {integrity: sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==}
+    engines: {node: '>= 14'}
     dependencies:
-      extend: 3.0.2
-      findup-sync: 3.0.0
-      fined: 1.2.0
-      flagged-respawn: 1.0.1
-      is-plain-object: 2.0.4
-      object.map: 1.0.1
-      rechoir: 0.6.2
-      resolve: 1.22.1
+      agent-base: 7.1.0
+      debug: 4.3.4(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
+
+  /human-signals@1.1.1:
+    resolution: {integrity: sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==}
+    engines: {node: '>=8.12.0'}
     dev: true
 
-  /limiter@1.1.5:
-    resolution: {integrity: sha512-FWWMIEOxz3GwUI4Ts/IvgVy6LPvoMPgjMdQ185nN6psJyBJ4yOpzqm695/h5umdLJg2vW3GR5iG11MAkR2AzJA==}
-    dev: false
+  /human-signals@2.1.0:
+    resolution: {integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==}
+    engines: {node: '>=10.17.0'}
 
-  /lines-and-columns@1.2.4:
-    resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==}
+  /human-signals@5.0.0:
+    resolution: {integrity: sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==}
+    engines: {node: '>=16.17.0'}
     dev: true
 
-  /linkify-it@4.0.0:
-    resolution: {integrity: sha512-QAxkXyzT/TXgwGyY4rTgC95Ex6/lZ5/lYTV9nug6eJt93BCBQGOE47D/g2+/m5J1MrVLr2ot97OXkBZ9bBpR4A==}
-    dependencies:
-      uc.micro: 1.0.6
+  /humanize-duration@3.27.3:
+    resolution: {integrity: sha512-iimHkHPfIAQ8zCDQLgn08pRqSVioyWvnGfaQ8gond2wf7Jq2jJ+24ykmnRyiz3fIldcn4oUuQXpjqKLhSVR7lw==}
     dev: false
 
-  /linkify-it@4.0.1:
-    resolution: {integrity: sha512-C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw==}
+  /humanize-ms@1.2.1:
+    resolution: {integrity: sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==}
     dependencies:
-      uc.micro: 1.0.6
+      ms: 2.1.3
     dev: false
 
-  /liquid-json@0.3.1:
-    resolution: {integrity: sha512-wUayTU8MS827Dam6MxgD72Ui+KOSF+u/eIqpatOtjnvgJ0+mnDq33uC2M7J0tPK+upe/DpUAuK4JUU89iBoNKQ==}
+  /hyperlinker@1.0.0:
+    resolution: {integrity: sha512-Ty8UblRWFEcfSuIaajM34LdPXIhbs1ajEX/BBPv24J+enSVaEVY63xQ6lTO9VRYS5LAoghIG0IDJ+p+IPzKUQQ==}
     engines: {node: '>=4'}
     dev: false
 
-  /listr2@3.14.0(enquirer@2.3.6):
-    resolution: {integrity: sha512-TyWI8G99GX9GjE54cJ+RrNMcIFBfwMPxc3XTFiAYGN4s10hWROGtOg7+O6u6LE3mNkyld7RSLE6nrKBvTfcs3g==}
-    engines: {node: '>=10.0.0'}
-    peerDependencies:
-      enquirer: '>= 2.3.0 < 3'
-    peerDependenciesMeta:
-      enquirer:
-        optional: true
-    dependencies:
-      cli-truncate: 2.1.0
-      colorette: 2.0.19
-      enquirer: 2.3.6
-      log-update: 4.0.0
-      p-map: 4.0.0
-      rfdc: 1.3.0
-      rxjs: 7.5.7
-      through: 2.3.8
-      wrap-ansi: 7.0.0
-    dev: true
-
-  /lit-element@3.2.2:
-    resolution: {integrity: sha512-6ZgxBR9KNroqKb6+htkyBwD90XGRiqKDHVrW/Eh0EZ+l+iC+u+v+w3/BA5NGi4nizAVHGYvQBHUDuSmLjPp7NQ==}
-    dependencies:
-      '@lit/reactive-element': 1.6.1
-      lit-html: 2.6.1
-    dev: true
-
-  /lit-html@2.6.1:
-    resolution: {integrity: sha512-Z3iw+E+3KKFn9t2YKNjsXNEu/LRLI98mtH/C6lnFg7kvaqPIzPn124Yd4eT/43lyqrejpc5Wb6BHq3fdv4S8Rw==}
+  /iconv-lite@0.4.24:
+    resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
+    engines: {node: '>=0.10.0'}
     dependencies:
-      '@types/trusted-types': 2.0.2
-    dev: true
+      safer-buffer: 2.1.2
 
-  /lit@2.6.1:
-    resolution: {integrity: sha512-DT87LD64f8acR7uVp7kZfhLRrHkfC/N4BVzAtnw9Yg8087mbBJ//qedwdwX0kzDbxgPccWRW6mFwGbRQIxy0pw==}
-    dependencies:
-      '@lit/reactive-element': 1.6.1
-      lit-element: 3.2.2
-      lit-html: 2.6.1
-    dev: true
+  /iconv-lite@0.4.5:
+    resolution: {integrity: sha512-LQ4GtDkFagYaac8u4rE73zWu7h0OUUmR0qVBOgzLyFSoJhoDG2xV9PZJWWyVVcYha/9/RZzQHUinFMbNKiOoAA==}
+    engines: {node: '>=0.8.0'}
+    dev: false
 
-  /load-json-file@1.1.0:
-    resolution: {integrity: sha512-cy7ZdNRXdablkXYNI049pthVeXFurRyb9+hA/dZzerZ0pGTx42z+y+ssxBaVV2l70t1muq5IdKhn4UtcoGUY9A==}
+  /iconv-lite@0.6.3:
+    resolution: {integrity: sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: 4.2.10
-      parse-json: 2.2.0
-      pify: 2.3.0
-      pinkie-promise: 2.0.1
-      strip-bom: 2.0.0
-    dev: true
+      safer-buffer: 2.1.2
 
-  /load-json-file@6.2.0:
-    resolution: {integrity: sha512-gUD/epcRms75Cw8RT1pUdHugZYM5ce64ucs2GEISABwkRsOQr0q2wm/MV2TKThycIe5e0ytRweW2RZxclogCdQ==}
-    engines: {node: '>=8'}
+  /ics@2.40.0:
+    resolution: {integrity: sha512-PPkE9ij60sGhqdTxZZzsXQPB/TCXAB/dD3NqUf1I/GkbJzPeJHHMzaoMQiYAsm1pFaHRp2OIhFDgUBihkk8s/w==}
     dependencies:
-      graceful-fs: 4.2.10
-      parse-json: 5.2.0
-      strip-bom: 4.0.0
-      type-fest: 0.6.0
-    dev: true
-
-  /loader-runner@4.3.0:
-    resolution: {integrity: sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==}
-    engines: {node: '>=6.11.5'}
-    dev: true
+      nanoid: 3.3.6
+      yup: 0.32.11
+    dev: false
 
-  /loader-utils@1.4.2:
-    resolution: {integrity: sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==}
-    engines: {node: '>=4.0.0'}
-    dependencies:
-      big.js: 5.2.2
-      emojis-list: 3.0.0
-      json5: 1.0.2
-    dev: true
+  /ieee754@1.1.13:
+    resolution: {integrity: sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==}
+    dev: false
 
-  /loader-utils@2.0.2:
-    resolution: {integrity: sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==}
-    engines: {node: '>=8.9.0'}
-    dependencies:
-      big.js: 5.2.2
-      emojis-list: 3.0.0
-      json5: 2.2.3
-    dev: true
+  /ieee754@1.2.1:
+    resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}
 
-  /loader-utils@2.0.4:
-    resolution: {integrity: sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==}
-    engines: {node: '>=8.9.0'}
-    dependencies:
-      big.js: 5.2.2
-      emojis-list: 3.0.0
-      json5: 2.2.3
+  /ignore-by-default@1.0.1:
+    resolution: {integrity: sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==}
     dev: true
 
-  /local-pkg@0.4.2:
-    resolution: {integrity: sha512-mlERgSPrbxU3BP4qBqAvvwlgW4MTg78iwJdGGnv7kibKjWcJksrG3t6LB5lXI93wXRDvG4NpUgJFmTG4T6rdrg==}
-    engines: {node: '>=14'}
-    dev: true
+  /ignore@5.2.4:
+    resolution: {integrity: sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==}
+    engines: {node: '>= 4'}
 
-  /localforage@1.10.0:
-    resolution: {integrity: sha512-14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg==}
+  /imap@0.8.19:
+    resolution: {integrity: sha512-z5DxEA1uRnZG73UcPA4ES5NSCGnPuuouUx43OPX7KZx1yzq3N8/vx2mtXEShT5inxB3pRgnfG1hijfu7XN2YMw==}
+    engines: {node: '>=0.8.0'}
     dependencies:
-      lie: 3.1.1
+      readable-stream: 1.1.14
+      utf7: 1.0.2
     dev: false
 
-  /localtunnel@2.0.2:
-    resolution: {integrity: sha512-n418Cn5ynvJd7m/N1d9WVJISLJF/ellZnfsLnx8WBWGzxv/ntNcFkJ1o6se5quUhCplfLGBNL5tYHiq5WF3Nug==}
-    engines: {node: '>=8.3.0'}
-    hasBin: true
-    dependencies:
-      axios: 0.21.4(debug@4.3.2)
-      debug: 4.3.2
-      openurl: 1.1.1
-      yargs: 17.1.1
-    transitivePeerDependencies:
-      - supports-color
+  /immediate@3.0.6:
+    resolution: {integrity: sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==}
     dev: false
 
-  /locate-path@3.0.0:
-    resolution: {integrity: sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==}
+  /immutable@4.2.2:
+    resolution: {integrity: sha512-fTMKDwtbvO5tldky9QZ2fMX7slR0mYpY5nbnFWYp0fOzDhHqhgIw9KoYgxLWsoNTS9ZHGauHj18DTyEw6BK3Og==}
+    dev: true
+
+  /import-fresh@3.3.0:
+    resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==}
     engines: {node: '>=6'}
     dependencies:
-      p-locate: 3.0.0
-      path-exists: 3.0.0
+      parent-module: 1.0.1
+      resolve-from: 4.0.0
     dev: true
 
-  /locate-path@5.0.0:
-    resolution: {integrity: sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==}
+  /import-lazy@4.0.0:
+    resolution: {integrity: sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==}
     engines: {node: '>=8'}
-    dependencies:
-      p-locate: 4.1.0
+    dev: true
 
-  /locate-path@6.0.0:
-    resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==}
-    engines: {node: '>=10'}
+  /import-local@3.1.0:
+    resolution: {integrity: sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==}
+    engines: {node: '>=8'}
+    hasBin: true
     dependencies:
-      p-locate: 5.0.0
+      pkg-dir: 4.2.0
+      resolve-cwd: 3.0.0
+
+  /imurmurhash@0.1.4:
+    resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==}
+    engines: {node: '>=0.8.19'}
+
+  /indefinite@2.4.3:
+    resolution: {integrity: sha512-tLgivPQiMY76i93YKhjV5cMiORWfrk3FHdD1mREBNKlWbHmBrObLfOz6xlTk+beboj/JJSlhuCpCMmChR5Sgng==}
+    engines: {node: '>=6.0.0'}
     dev: true
 
-  /lodash-es@4.17.21:
-    resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
-    dev: false
+  /indent-string@4.0.0:
+    resolution: {integrity: sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==}
+    engines: {node: '>=8'}
 
-  /lodash.assign@4.2.0:
-    resolution: {integrity: sha512-hFuH8TY+Yji7Eja3mGiuAxBqLagejScbG8GbG0j6o9vzn0YL14My+ktnqtZgFTosKymC9/44wP6s7xyuLfnClw==}
+  /infer-owner@1.0.4:
+    resolution: {integrity: sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==}
+    dev: false
+    optional: true
 
-  /lodash.assignwith@4.2.0:
-    resolution: {integrity: sha512-ZznplvbvtjK2gMvnQ1BR/zqPFZmS6jbK4p+6Up4xcRYA7yMIwxHCfbTcrYxXKzzqLsQ05eJPVznEW3tuwV7k1g==}
+  /infisical-node@1.3.0:
+    resolution: {integrity: sha512-tTnnExRAO/ZyqiRdnSlBisErNToYWgtunMWh+8opClEt5qjX7l6HC/b4oGo2AuR2Pf41IR+oqo+dzkM1TCvlUA==}
+    dependencies:
+      axios: 1.6.7
+      dotenv: 16.3.1
+      tweetnacl: 1.0.3
+      tweetnacl-util: 0.15.1
+    transitivePeerDependencies:
+      - debug
     dev: false
 
-  /lodash.camelcase@4.3.0:
-    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+  /inflected@2.1.0:
+    resolution: {integrity: sha512-hAEKNxvHf2Iq3H60oMBHkB4wl5jn3TPF3+fXek/sRwAB5gP9xWs4r7aweSF95f99HFoz69pnZTcu8f0SIHV18w==}
     dev: true
 
-  /lodash.clone@4.5.0:
-    resolution: {integrity: sha512-GhrVeweiTD6uTmmn5hV/lzgCQhccwReIVRLHp7LT4SopOjqEZ5BbX8b5WWEtAKasjmy8hR7ZPwsYlxRCku5odg==}
-    dev: false
-
-  /lodash.clonedeep@4.5.0:
-    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+  /inflight@1.0.6:
+    resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==}
+    dependencies:
+      once: 1.4.0
+      wrappy: 1.0.2
 
-  /lodash.compact@3.0.1:
-    resolution: {integrity: sha512-2ozeiPi+5eBXW1CLtzjk8XQFhQOEMwwfxblqeq6EGyTxZJ1bPATqilY0e6g2SLQpP4KuMeuioBhEnWz5Pr7ICQ==}
+  /inherits@2.0.4:
+    resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}
 
-  /lodash.concat@4.5.0:
-    resolution: {integrity: sha512-US6b1Nqek3shg2qmv1IjTN5P7tPL1RKu77VpdGtVprxmnTI/HlsHGqI2Oa5Irznk0ZB5IXHwocMeMZK8vf4+CA==}
-    dev: false
+  /ini@1.3.8:
+    resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==}
 
-  /lodash.debounce@4.0.8:
-    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+  /ini@2.0.0:
+    resolution: {integrity: sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==}
+    engines: {node: '>=10'}
     dev: true
 
-  /lodash.defaults@4.2.0:
-    resolution: {integrity: sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==}
-    dev: false
-
-  /lodash.difference@4.5.0:
-    resolution: {integrity: sha512-dS2j+W26TQ7taQBGN8Lbbq04ssV3emRw4NY58WErlTO29pIqS0HmoT5aJ9+TUQ1N3G+JOZSji4eugsWwGp9yPA==}
-    dev: false
-
-  /lodash.escaperegexp@4.1.2:
-    resolution: {integrity: sha512-TM9YBvyC84ZxE3rgfefxUWiQKLilstD6k7PTGt6wfbtXF8ixIJLOL3VYyV/z+ZiPLsVxAsKAFVwWlWeb2Y8Yyw==}
+  /inquirer@7.3.3:
+    resolution: {integrity: sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==}
+    engines: {node: '>=8.0.0'}
+    dependencies:
+      ansi-escapes: 4.3.2
+      chalk: 4.1.2
+      cli-cursor: 3.1.0
+      cli-width: 3.0.0
+      external-editor: 3.1.0
+      figures: 3.2.0
+      lodash: 4.17.21
+      mute-stream: 0.0.8
+      run-async: 2.4.1
+      rxjs: 6.6.7
+      string-width: 4.2.3
+      strip-ansi: 6.0.1
+      through: 2.3.8
     dev: false
 
-  /lodash.every@4.6.0:
-    resolution: {integrity: sha512-isF82d+65/sNvQ3aaQAW7LLHnnTxSN/2fm4rhYyuufLzA4VtHz6y6S5vFwe6PQVr2xdqUOyxBbTNKDpnmeu50w==}
-    dev: false
+  /internal-slot@1.0.5:
+    resolution: {integrity: sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      get-intrinsic: 1.2.4
+      has: 1.0.3
+      side-channel: 1.0.4
 
-  /lodash.find@4.6.0:
-    resolution: {integrity: sha512-yaRZoAV3Xq28F1iafWN1+a0rflOej93l1DQUejs3SZ41h2O9UJBoS9aueGjPDgAl4B6tPC0NuuchLKaDQQ3Isg==}
+  /internal-slot@1.0.7:
+    resolution: {integrity: sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      es-errors: 1.3.0
+      hasown: 2.0.2
+      side-channel: 1.0.4
 
-  /lodash.first@3.0.0:
-    resolution: {integrity: sha512-FnBs6c5eWZY1P88K2+NHiLZjp+pBRbLbt9kDGBCtiY+tfRGhR7LmIxTphpspmRXxyQeJXM5LHoq62yVjcBjcCw==}
-    dev: false
+  /interpret@1.4.0:
+    resolution: {integrity: sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==}
+    engines: {node: '>= 0.10'}
 
-  /lodash.flatten@4.4.0:
-    resolution: {integrity: sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==}
+  /ioredis-mock@8.8.1(@types/ioredis-mock@8.2.2)(ioredis@5.3.2):
+    resolution: {integrity: sha512-zXSaDf86EcDFVf8jMOirWU6Js4WcwLd/cxwJiCh9EbD1GoHfeE/fVqLhLz/l1MkyL85Fb6MwfF2Fr/9819Ul9Q==}
+    engines: {node: '>=12.22'}
+    peerDependencies:
+      '@types/ioredis-mock': ^8
+      ioredis: ^5
+    dependencies:
+      '@ioredis/as-callback': 3.0.0
+      '@ioredis/commands': 1.2.0
+      '@types/ioredis-mock': 8.2.2
+      fengari: 0.1.4
+      fengari-interop: 0.1.3(fengari@0.1.4)
+      ioredis: 5.3.2
+      semver: 7.6.0
+    dev: true
 
-  /lodash.flow@3.5.0:
-    resolution: {integrity: sha512-ff3BX/tSioo+XojX4MOsOMhJw0nZoUEF011LX8g8d3gvjVbxd89cCio4BCXronjxcTUIJUoqKEUA+n4CqvvRPw==}
+  /ioredis@4.28.5:
+    resolution: {integrity: sha512-3GYo0GJtLqgNXj4YhrisLaNNvWSNwSS2wS4OELGfGxH8I69+XfNdnmV1AyN+ZqMh0i7eX+SWjrwFKDBDgfBC1A==}
+    engines: {node: '>=6'}
+    dependencies:
+      cluster-key-slot: 1.1.2
+      debug: 4.3.4(supports-color@8.1.1)
+      denque: 1.5.1
+      lodash.defaults: 4.2.0
+      lodash.flatten: 4.4.0
+      lodash.isarguments: 3.1.0
+      p-map: 2.1.0
+      redis-commands: 1.7.0
+      redis-errors: 1.2.0
+      redis-parser: 3.0.0
+      standard-as-callback: 2.1.0
+    transitivePeerDependencies:
+      - supports-color
     dev: false
 
-  /lodash.forin@4.4.0:
-    resolution: {integrity: sha512-APldePP4yvGhMcplVxv9L+exdLHMRHRhH1Q9O70zRJMm9HbTm6zxaihXtNl+ICOBApeFWoH7jNmFr/L4XfWeiQ==}
-    dev: true
-
-  /lodash.get@4.4.2:
-    resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
+  /ioredis@5.3.2:
+    resolution: {integrity: sha512-1DKMMzlIHM02eBBVOFQ1+AolGjs6+xEcM4PDL7NqOS6szq7H9jSaEkIUH6/a5Hl241LzW6JLSiAbNvTQjUupUA==}
+    engines: {node: '>=12.22.0'}
+    dependencies:
+      '@ioredis/commands': 1.2.0
+      cluster-key-slot: 1.1.2
+      debug: 4.3.4(supports-color@8.1.1)
+      denque: 2.1.0
+      lodash.defaults: 4.2.0
+      lodash.isarguments: 3.1.0
+      redis-errors: 1.2.0
+      redis-parser: 3.0.0
+      standard-as-callback: 2.1.0
+    transitivePeerDependencies:
+      - supports-color
 
-  /lodash.has@4.5.2:
-    resolution: {integrity: sha512-rnYUdIo6xRCJnQmbVFEwcxF144erlD+M3YcJUVesflU9paQaE8p+fJDcIQrlMYbxoANFL+AB9hZrzSBBk5PL+g==}
-    dev: true
+  /ip@2.0.1:
+    resolution: {integrity: sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ==}
 
-  /lodash.intersection@4.4.0:
-    resolution: {integrity: sha512-N+L0cCfnqMv6mxXtSPeKt+IavbOBBSiAEkKyLasZ8BVcP9YXQgxLO12oPR8OyURwKV8l5vJKiE1M8aS70heuMg==}
-    dev: false
+  /ipaddr.js@1.9.1:
+    resolution: {integrity: sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==}
+    engines: {node: '>= 0.10'}
 
-  /lodash.invokemap@4.6.0:
-    resolution: {integrity: sha512-CfkycNtMqgUlfjfdh2BhKO/ZXrP8ePOX5lEU/g0R3ItJcnuxWDwokMGKx1hWcfOikmyOVx6X9IwWnDGlgKl61w==}
+  /is-absolute-url@4.0.1:
+    resolution: {integrity: sha512-/51/TKE88Lmm7Gc4/8btclNXWS+g50wXhYJq8HWIBAGUBnoAdRu1aXeh364t/O7wXDAcTJDP8PNuNKWUDWie+A==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
     dev: true
 
-  /lodash.isarguments@3.1.0:
-    resolution: {integrity: sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==}
-    dev: false
-
-  /lodash.isarray@4.0.0:
-    resolution: {integrity: sha512-V8ViWvoNlXpCrB6Ewaj3ScRXUpmCvqp4tJUxa3dlovuJj/8lp3SND5Kw4v5OeuHgoyw4qJN+gl36qZqp6WYQ6g==}
-    deprecated: This package is deprecated. Use Array.isArray.
+  /is-any-array@2.0.1:
+    resolution: {integrity: sha512-UtilS7hLRu++wb/WBAw9bNuP1Eg04Ivn1vERJck8zJthEvXCBEBpGR/33u/xLKWEQf95803oalHrVDptcAvFdQ==}
     dev: false
 
-  /lodash.isempty@4.4.0:
-    resolution: {integrity: sha512-oKMuF3xEeqDltrGMfDxAPGIVMSSRv8tbRSODbrs4KGsRRLEhrW8N8Rd4DRgB2+621hY8A8XwwrTVhXWpxFvMzg==}
+  /is-arguments@1.1.1:
+    resolution: {integrity: sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.7
+      has-tostringtag: 1.0.2
 
-  /lodash.isequal@4.5.0:
-    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+  /is-array-buffer@3.0.2:
+    resolution: {integrity: sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==}
+    dependencies:
+      call-bind: 1.0.7
+      get-intrinsic: 1.2.4
+      is-typed-array: 1.1.13
 
-  /lodash.isfunction@3.0.9:
-    resolution: {integrity: sha512-AirXNj15uRIMMPihnkInB4i3NHeb4iBtNg9WRWuK2o31S+ePwwNmDPaTL3o7dTJ+VXNZim7rFs4rxN4YU1oUJw==}
-    dev: true
+  /is-array-buffer@3.0.4:
+    resolution: {integrity: sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.7
+      get-intrinsic: 1.2.4
 
-  /lodash.isinteger@4.0.4:
-    resolution: {integrity: sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==}
-    dev: true
+  /is-arrayish@0.2.1:
+    resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==}
 
-  /lodash.isobject@3.0.2:
-    resolution: {integrity: sha512-3/Qptq2vr7WeJbB4KHUSKlq8Pl7ASXi3UG6CMbBm8WRtXi8+GHm7mKaU3urfpSEzWe2wCIChs6/sdocUsTKJiA==}
+  /is-arrayish@0.3.2:
+    resolution: {integrity: sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==}
     dev: false
 
-  /lodash.isplainobject@4.0.6:
-    resolution: {integrity: sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==}
-    dev: true
+  /is-bigint@1.0.4:
+    resolution: {integrity: sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==}
+    dependencies:
+      has-bigints: 1.0.2
 
-  /lodash.isstring@4.0.1:
-    resolution: {integrity: sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==}
-    dev: false
+  /is-binary-path@2.1.0:
+    resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==}
+    engines: {node: '>=8'}
+    dependencies:
+      binary-extensions: 2.2.0
 
-  /lodash.iteratee@4.7.0:
-    resolution: {integrity: sha512-yv3cSQZmfpbIKo4Yo45B1taEvxjNvcpF1CEOc0Y6dEyvhPIfEJE3twDwPgWTPQubcSgXyBwBKG6wpQvWMDOf6Q==}
-    dev: false
+  /is-boolean-object@1.1.2:
+    resolution: {integrity: sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.7
+      has-tostringtag: 1.0.2
 
-  /lodash.last@3.0.0:
-    resolution: {integrity: sha512-14mq7rSkCxG4XMy9lF2FbIOqqgF0aH0NfPuQ3LPR3vIh0kHnUvIYP70dqa1Hf47zyXfQ8FzAg0MYOQeSuE1R7A==}
+  /is-buffer@1.1.6:
+    resolution: {integrity: sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==}
     dev: false
 
-  /lodash.lowerfirst@4.3.1:
-    resolution: {integrity: sha512-UUKX7VhP1/JL54NXg2aq/E1Sfnjjes8fNYTNkPU8ZmsaVeBvPHKdbNaN79Re5XRL01u6wbq3j0cbYZj71Fcu5w==}
+  /is-builtin-module@3.2.1:
+    resolution: {integrity: sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==}
+    engines: {node: '>=6'}
+    dependencies:
+      builtin-modules: 3.3.0
     dev: true
 
-  /lodash.lt@3.9.2:
-    resolution: {integrity: sha512-WMyxj1+48IlnUWMYALOD6+o61apx5xdiXDtHBOp6QlkeZ19QpX7LiqHMXCnZWGd35QMZoZV/iJIhIhM01WPz3A==}
-    dev: false
-
-  /lodash.map@4.6.0:
-    resolution: {integrity: sha512-worNHGKLDetmcEYDvh2stPCrrQRkP20E4l0iIS7F8EvzMqBBi7ltvFN5m1HvTf1P7Jk1txKhvFcmYsCr8O2F1Q==}
+  /is-callable@1.2.7:
+    resolution: {integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==}
+    engines: {node: '>= 0.4'}
 
-  /lodash.mapvalues@4.6.0:
-    resolution: {integrity: sha512-JPFqXFeZQ7BfS00H58kClY7SPVeHertPE0lNuCyZ26/XlN8TvakYD7b9bGyNmXbT/D3BbtPAAmq90gPWqLkxlQ==}
+  /is-ci@3.0.1:
+    resolution: {integrity: sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==}
+    hasBin: true
+    dependencies:
+      ci-info: 3.8.0
     dev: true
 
-  /lodash.memoize@4.1.2:
-    resolution: {integrity: sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==}
-    dev: true
+  /is-core-module@2.13.1:
+    resolution: {integrity: sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==}
+    dependencies:
+      hasown: 2.0.2
 
-  /lodash.merge@4.6.2:
-    resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
+  /is-date-object@1.0.5:
+    resolution: {integrity: sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      has-tostringtag: 1.0.2
 
-  /lodash.mergewith@4.6.2:
-    resolution: {integrity: sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==}
-    dev: false
+  /is-deflate@1.0.0:
+    resolution: {integrity: sha512-YDoFpuZWu1VRXlsnlYMzKyVRITXj7Ej/V9gXQ2/pAe7X1J7M/RNOqaIYi6qUn+B7nGyB9pDXrv02dsB58d2ZAQ==}
+    dev: true
 
-  /lodash.omit@4.5.0:
-    resolution: {integrity: sha512-XeqSp49hNGmlkj2EJlfrQFIzQ6lXdNro9sddtQzcJY8QaoC2GO0DT7xaIokHeyM+mIT0mPMlPvkYzg2xCuHdZg==}
-    dev: false
+  /is-docker@2.2.1:
+    resolution: {integrity: sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==}
+    engines: {node: '>=8'}
+    hasBin: true
 
-  /lodash.once@4.1.1:
-    resolution: {integrity: sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==}
+  /is-expression@4.0.0:
+    resolution: {integrity: sha512-zMIXX63sxzG3XrkHkrAPvm/OVZVSCPNkwMHU8oTX7/U3AL78I0QXCEICXUM13BIa8TYGZ68PiTKfQz3yaTNr4A==}
+    dependencies:
+      acorn: 7.4.1
+      object-assign: 4.1.1
     dev: true
 
-  /lodash.orderby@4.6.0:
-    resolution: {integrity: sha512-T0rZxKmghOOf5YPnn8EY5iLYeWCpZq8G41FfqoVHH5QDTAFaghJRmAdLiadEDq+ztgM2q5PjA+Z1fOwGrLgmtg==}
-    dev: false
-
-  /lodash.partialright@4.2.1:
-    resolution: {integrity: sha512-yebmPMQZH7i4El6SdJTW9rn8irWl8VTcsmiWqm/I4sY8/ZjbSo0Z512HL6soeAu3mh5rhx5uIIo6kYJOQXbCxw==}
-    dev: false
+  /is-extglob@2.1.1:
+    resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==}
+    engines: {node: '>=0.10.0'}
 
-  /lodash.pick@4.4.0:
-    resolution: {integrity: sha512-hXt6Ul/5yWjfklSGvLQl8vM//l3FtyHZeuelpzK6mm99pNvN9yTDruNZPEJZD1oWrqo+izBmB7oUfWgcCX7s4Q==}
+  /is-fullwidth-code-point@3.0.0:
+    resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==}
+    engines: {node: '>=8'}
 
-  /lodash.pickby@4.6.0:
-    resolution: {integrity: sha512-AZV+GsS/6ckvPOVQPXSiFFacKvKB4kOQu6ynt9wz0F3LO4R9Ij4K1ddYsIytDpSgLz88JHd9P+oaLeej5/Sl7Q==}
-    dev: false
+  /is-generator-fn@2.1.0:
+    resolution: {integrity: sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==}
+    engines: {node: '>=6'}
 
-  /lodash.reduce@4.6.0:
-    resolution: {integrity: sha512-6raRe2vxCYBhpBu+B+TtNGUzah+hQjVdu3E17wfusjyrXBka2nBS8OH/gjVZ5PvHOhWmIZTYri09Z6n/QfnNMw==}
-    dev: false
+  /is-generator-function@1.0.10:
+    resolution: {integrity: sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      has-tostringtag: 1.0.2
 
-  /lodash.remove@4.7.0:
-    resolution: {integrity: sha512-GnwkSsEXGXirSxh3YI+jc/qvptE2DV8ZjA4liK0NT1MJ3mNDMFhX3bY+4Wr8onlNItYuPp7/4u19Fi55mvzkTw==}
-    dev: false
+  /is-glob@4.0.3:
+    resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      is-extglob: 2.1.1
 
-  /lodash.set@4.3.2:
-    resolution: {integrity: sha512-4hNPN5jlm/N/HLMCO43v8BXKq9Z7QdAGc/VGrRD61w8gN9g/6jF9A4L1pbUgBLCffi0w9VsXfTOij5x8iTyFvg==}
-    dev: false
+  /is-gzip@1.0.0:
+    resolution: {integrity: sha512-rcfALRIb1YewtnksfRIHGcIY93QnK8BIQ/2c9yDYcG/Y6+vRoJuTWBmmSEbyLLYtXm7q35pHOHbZFQBaLrhlWQ==}
+    engines: {node: '>=0.10.0'}
+    dev: true
 
-  /lodash.snakecase@4.1.1:
-    resolution: {integrity: sha512-QZ1d4xoBHYUeuouhEq3lk3Uq7ldgyFXGBhg04+oRLnIz8o9T65Eh+8YdroUwn846zchkA9yDsDl5CVVaV2nqYw==}
+  /is-installed-globally@0.4.0:
+    resolution: {integrity: sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==}
+    engines: {node: '>=10'}
+    dependencies:
+      global-dirs: 3.0.0
+      is-path-inside: 3.0.3
     dev: true
 
-  /lodash.some@4.6.0:
-    resolution: {integrity: sha512-j7MJE+TuT51q9ggt4fSgVqro163BEFjAt3u97IqU+JA2DkWl80nFTrowzLpZ/BnpN7rrl0JA/593NAdd8p/scQ==}
-    dev: false
+  /is-interactive@1.0.0:
+    resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
+    engines: {node: '>=8'}
+    dev: true
 
-  /lodash.sortby@4.7.0:
-    resolution: {integrity: sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==}
+  /is-lambda@1.0.1:
+    resolution: {integrity: sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==}
     dev: false
+    optional: true
 
-  /lodash.split@4.4.2:
-    resolution: {integrity: sha512-kn1IDX0aHfg0FsnPIyxCHTamZXt3YK3aExRH1LW8YhzP6+sCldTm8+E4aIg+nSmM6R4eqdWGrXWtfYI961bwIw==}
-    dev: false
+  /is-map@2.0.2:
+    resolution: {integrity: sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==}
 
-  /lodash.throttle@4.1.1:
-    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
-    dev: false
+  /is-module@1.0.0:
+    resolution: {integrity: sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==}
+    dev: true
 
-  /lodash.tonumber@4.0.3:
-    resolution: {integrity: sha512-SY0SwuPOHRwKcCNTdsntPYb+Zddz5mDUIVFABzRMqmAiL41pMeyoQFGxYAw5zdc9NnH4pbJqiqqp5ckfxa+zSA==}
-    dev: false
+  /is-nan@1.3.2:
+    resolution: {integrity: sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.7
+      define-properties: 1.2.1
 
-  /lodash.tostring@4.1.4:
-    resolution: {integrity: sha512-xWHJ0LY7cSz/C/4ghNNiYA1Ong0VLdzAzrjDHvOzN+eJHzDEHme2+k+w/9Pk8dtdwcASMUbxN1/mtj6mFI25Ng==}
+  /is-negative-zero@2.0.2:
+    resolution: {integrity: sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==}
+    engines: {node: '>= 0.4'}
     dev: false
 
-  /lodash.trim@4.5.1:
-    resolution: {integrity: sha512-nJAlRl/K+eiOehWKDzoBVrSMhK0K3A3YQsUNXHQa5yIrKBAhsZgSu3KoAFoFT+mEgiyBHddZ0pRk1ITpIp90Wg==}
-    dev: false
+  /is-negative-zero@2.0.3:
+    resolution: {integrity: sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==}
+    engines: {node: '>= 0.4'}
 
-  /lodash.union@4.6.0:
-    resolution: {integrity: sha512-c4pB2CdGrGdjMKYLA+XiRDO7Y0PRQbm/Gzg8qMj+QH+pFVAoTp5sBpO0odL3FjoPCGjK96p6qsP+yQoiLoOBcw==}
-    dev: false
+  /is-number-object@1.0.7:
+    resolution: {integrity: sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      has-tostringtag: 1.0.2
 
-  /lodash.unionby@4.8.0:
-    resolution: {integrity: sha512-e60kn4GJIunNkw6v9MxRnUuLYI/Tyuanch7ozoCtk/1irJTYBj+qNTxr5B3qVflmJhwStJBv387Cb+9VOfABMg==}
-    dev: false
+  /is-number@7.0.0:
+    resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==}
+    engines: {node: '>=0.12.0'}
 
-  /lodash.uniq@4.5.0:
-    resolution: {integrity: sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==}
+  /is-path-cwd@2.2.0:
+    resolution: {integrity: sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==}
+    engines: {node: '>=6'}
+    dev: true
 
-  /lodash.uniqby@4.7.0:
-    resolution: {integrity: sha512-e/zcLx6CSbmaEgFHCA7BnoQKyCtKMxnuWrJygbwPs/AIn+IMKl66L8/s+wBUn5LRw2pZx3bUHibiV1b6aTWIww==}
+  /is-path-inside@3.0.3:
+    resolution: {integrity: sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==}
+    engines: {node: '>=8'}
+    dev: true
 
-  /lodash.unset@4.5.2:
-    resolution: {integrity: sha512-bwKX88k2JhCV9D1vtE8+naDKlLiGrSmf8zi/Y9ivFHwbmRfA8RxS/aVJ+sIht2XOwqoNr4xUPUkGZpc1sHFEKg==}
-    dev: false
+  /is-plain-object@2.0.4:
+    resolution: {integrity: sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      isobject: 3.0.1
+    dev: true
 
-  /lodash.upperfirst@4.3.1:
-    resolution: {integrity: sha512-sReKOYJIJf74dhJONhU4e0/shzi1trVbSWDOhKYE5XV2O+H7Sb2Dihwuc7xWxVl+DgFPyTqIN3zMfT9cq5iWDg==}
+  /is-plain-object@5.0.0:
+    resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
+    engines: {node: '>=0.10.0'}
     dev: false
 
-  /lodash.values@4.3.0:
-    resolution: {integrity: sha512-r0RwvdCv8id9TUblb/O7rYPwVy6lerCbcawrfdo9iC/1t1wsNMJknO79WNBgwkH0hIeJ08jmvvESbFpNb4jH0Q==}
+  /is-potential-custom-element-name@1.0.1:
+    resolution: {integrity: sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==}
     dev: true
 
-  /lodash.zip@4.2.0:
-    resolution: {integrity: sha512-C7IOaBBK/0gMORRBd8OETNx3kmOkgIWIPvyDpZSCTwUrpYmgZwJkjZeOD8ww4xbOUOs4/attY+pciKvadNfFbg==}
-    dev: false
+  /is-promise@2.2.2:
+    resolution: {integrity: sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==}
+    dev: true
 
-  /lodash.zipobject@4.1.3:
-    resolution: {integrity: sha512-A9SzX4hMKWS25MyalwcOnNoplyHbkNVsjidhTp8ru0Sj23wY9GWBKS8gAIGDSAqeWjIjvE4KBEl24XXAs+v4wQ==}
+  /is-property@1.0.2:
+    resolution: {integrity: sha512-Ks/IoX00TtClbGQr4TWXemAnktAQvYB7HzcCxDGqEZU6oCmb2INHuOoKxbtR+HFkmYWBKv/dOZtGRiAjDhj92g==}
     dev: false
 
-  /lodash@4.17.21:
-    resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==}
-
-  /log-symbols@4.1.0:
-    resolution: {integrity: sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==}
-    engines: {node: '>=10'}
+  /is-reference@1.2.1:
+    resolution: {integrity: sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==}
     dependencies:
-      chalk: 4.1.2
-      is-unicode-supported: 0.1.0
+      '@types/estree': 1.0.0
     dev: true
 
-  /log-update@4.0.0:
-    resolution: {integrity: sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==}
-    engines: {node: '>=10'}
+  /is-regex@1.1.4:
+    resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
+    engines: {node: '>= 0.4'}
     dependencies:
-      ansi-escapes: 4.3.2
-      cli-cursor: 3.1.0
-      slice-ansi: 4.0.0
-      wrap-ansi: 6.2.0
-    dev: true
+      call-bind: 1.0.7
+      has-tostringtag: 1.0.2
 
-  /logform@2.4.2:
-    resolution: {integrity: sha512-W4c9himeAwXEdZ05dQNerhFz2XG80P9Oj0loPUMV23VC2it0orMHQhJm4hdnnor3rd1HsGf6a2lPwBM1zeXHGw==}
-    dependencies:
-      '@colors/colors': 1.5.0
-      fecha: 4.2.3
-      ms: 2.1.3
-      safe-stable-stringify: 2.4.0
-      triple-beam: 1.3.0
+  /is-retry-allowed@2.2.0:
+    resolution: {integrity: sha512-XVm7LOeLpTW4jV19QSH38vkswxoLud8sQ57YwJVTPWdiaI9I8keEhGFpBlslyVsgdQy4Opg8QOLb8YRgsyZiQg==}
+    engines: {node: '>=10'}
     dev: false
 
-  /long@4.0.0:
-    resolution: {integrity: sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==}
-    dev: false
+  /is-set@2.0.2:
+    resolution: {integrity: sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==}
 
-  /loose-envify@1.4.0:
-    resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==}
-    hasBin: true
+  /is-shared-array-buffer@1.0.2:
+    resolution: {integrity: sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==}
     dependencies:
-      js-tokens: 4.0.0
-    dev: true
+      call-bind: 1.0.7
 
-  /lossless-json@1.0.5:
-    resolution: {integrity: sha512-RicKUuLwZVNZ6ZdJHgIZnSeA05p8qWc5NW0uR96mpPIjN9WDLUg9+kj1esQU1GkPn9iLZVKatSQK5gyiaFHgJA==}
+  /is-shared-array-buffer@1.0.3:
+    resolution: {integrity: sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.7
+
+  /is-stream-ended@0.1.4:
+    resolution: {integrity: sha512-xj0XPvmr7bQFTvirqnFr50o0hQIh6ZItDqloxt5aJrR4NQsYeSsyFQERYGCAzfindAcnKjINnwEEgLx4IqVzQw==}
     dev: false
 
-  /loupe@2.3.6:
-    resolution: {integrity: sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA==}
-    dependencies:
-      get-func-name: 2.0.0
+  /is-stream@2.0.1:
+    resolution: {integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==}
+    engines: {node: '>=8'}
+
+  /is-stream@3.0.0:
+    resolution: {integrity: sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
     dev: true
 
-  /lower-case@2.0.2:
-    resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
+  /is-string@1.0.7:
+    resolution: {integrity: sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==}
+    engines: {node: '>= 0.4'}
     dependencies:
-      tslib: 2.5.0
+      has-tostringtag: 1.0.2
 
-  /lru-cache@4.0.2:
-    resolution: {integrity: sha512-uQw9OqphAGiZhkuPlpFGmdTU2tEuhxTourM/19qGJrxBPHAr/f8BT1a0i/lOclESnGatdJG/UCkP9kZB/Lh1iw==}
+  /is-symbol@1.0.4:
+    resolution: {integrity: sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==}
+    engines: {node: '>= 0.4'}
     dependencies:
-      pseudomap: 1.0.2
-      yallist: 2.1.2
-    dev: false
+      has-symbols: 1.0.3
 
-  /lru-cache@4.1.5:
-    resolution: {integrity: sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==}
+  /is-typed-array@1.1.13:
+    resolution: {integrity: sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==}
+    engines: {node: '>= 0.4'}
     dependencies:
-      pseudomap: 1.0.2
-      yallist: 2.1.2
+      which-typed-array: 1.1.15
 
-  /lru-cache@5.1.1:
-    resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==}
-    dependencies:
-      yallist: 3.1.1
+  /is-typedarray@1.0.0:
+    resolution: {integrity: sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==}
 
-  /lru-cache@6.0.0:
-    resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==}
+  /is-unicode-supported@0.1.0:
+    resolution: {integrity: sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==}
     engines: {node: '>=10'}
+    dev: true
+
+  /is-weakmap@2.0.1:
+    resolution: {integrity: sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==}
+
+  /is-weakref@1.0.2:
+    resolution: {integrity: sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==}
     dependencies:
-      yallist: 4.0.0
+      call-bind: 1.0.7
 
-  /lru-cache@7.18.3:
-    resolution: {integrity: sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==}
-    engines: {node: '>=12'}
-    dev: false
+  /is-weakset@2.0.2:
+    resolution: {integrity: sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==}
+    dependencies:
+      call-bind: 1.0.7
+      get-intrinsic: 1.2.4
 
-  /lru-memoizer@2.1.4:
-    resolution: {integrity: sha512-IXAq50s4qwrOBrXJklY+KhgZF+5y98PDaNo0gi/v2KQBFLyWr+JyFvijZXkGKjQj/h9c0OwoE+JZbwUXce76hQ==}
+  /is-wsl@2.2.0:
+    resolution: {integrity: sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==}
+    engines: {node: '>=8'}
     dependencies:
-      lodash.clonedeep: 4.5.0
-      lru-cache: 4.0.2
+      is-docker: 2.2.1
+
+  /isarray@0.0.1:
+    resolution: {integrity: sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==}
     dev: false
 
-  /lru_map@0.3.3:
-    resolution: {integrity: sha512-Pn9cox5CsMYngeDbmChANltQl+5pi6XmTrraMSzhPmMBbmgcxmqWry0U3PGapCU1yB4/LqCcom7qhHZiF/jGfQ==}
+  /isarray@1.0.0:
+    resolution: {integrity: sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==}
+
+  /isarray@2.0.5:
+    resolution: {integrity: sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==}
 
-  /luxon@3.3.0:
-    resolution: {integrity: sha512-An0UCfG/rSiqtAIiBPO0Y9/zAnHUZxAMiCpTd5h2smgsj7GGmcenvrvww2cqNA8/4A5ZrD1gJpHN2mIHZQF+Mg==}
+  /isbot@3.6.13:
+    resolution: {integrity: sha512-uoP4uK5Dc2CrabmK+Gue1jTL+scHiCc1c9rblRpJwG8CPxjLIv8jmGyyGRGkbPOweayhkskdZsEQXG6p+QCQrg==}
     engines: {node: '>=12'}
     dev: false
 
-  /lz-string@1.4.4:
-    resolution: {integrity: sha512-0ckx7ZHRPqb0oUm8zNr+90mtf9DQB60H1wMCjBtfi62Kl3a7JbHob6gA2bC+xRvZoOL+1hzUK8jeuEIQE8svEQ==}
-    hasBin: true
+  /isexe@2.0.0:
+    resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
+
+  /iso-639-1@2.1.15:
+    resolution: {integrity: sha512-7c7mBznZu2ktfvyT582E2msM+Udc1EjOyhVRE/0ZsjD9LBtWSm23h3PtiRh2a35XoUsTQQjJXaJzuLjXsOdFDg==}
+    engines: {node: '>=6.0'}
+    dev: false
+
+  /isobject@3.0.1:
+    resolution: {integrity: sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==}
+    engines: {node: '>=0.10.0'}
     dev: true
 
-  /magic-string@0.25.9:
-    resolution: {integrity: sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==}
+  /isstream@0.1.2:
+    resolution: {integrity: sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==}
+
+  /istanbul-lib-coverage@3.2.0:
+    resolution: {integrity: sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==}
+    engines: {node: '>=8'}
+
+  /istanbul-lib-coverage@3.2.2:
+    resolution: {integrity: sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==}
+    engines: {node: '>=8'}
+
+  /istanbul-lib-instrument@5.2.1:
+    resolution: {integrity: sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==}
+    engines: {node: '>=8'}
     dependencies:
-      sourcemap-codec: 1.4.8
-    dev: true
+      '@babel/core': 7.22.9
+      '@babel/parser': 7.24.0
+      '@istanbuljs/schema': 0.1.3
+      istanbul-lib-coverage: 3.2.0
+      semver: 7.6.0
+    transitivePeerDependencies:
+      - supports-color
 
-  /magic-string@0.27.0:
-    resolution: {integrity: sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==}
-    engines: {node: '>=12'}
+  /istanbul-lib-report@3.0.0:
+    resolution: {integrity: sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==}
+    engines: {node: '>=8'}
     dependencies:
-      '@jridgewell/sourcemap-codec': 1.4.14
+      istanbul-lib-coverage: 3.2.0
+      make-dir: 3.1.0
+      supports-color: 7.2.0
+
+  /istanbul-lib-report@3.0.1:
+    resolution: {integrity: sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==}
+    engines: {node: '>=10'}
+    dependencies:
+      istanbul-lib-coverage: 3.2.2
+      make-dir: 4.0.0
+      supports-color: 7.2.0
     dev: true
 
-  /mailparser@3.5.0:
-    resolution: {integrity: sha512-mdr2DFgz8LKC0/Q6io6znA0HVnzaPFT0a4TTnLeZ7mWHlkfnm227Wxlq7mHh7AgeP32h7gOUpXvyhSfJJIEeyg==}
+  /istanbul-lib-source-maps@4.0.1:
+    resolution: {integrity: sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==}
+    engines: {node: '>=10'}
     dependencies:
-      encoding-japanese: 2.0.0
-      he: 1.2.0
-      html-to-text: 8.2.0
-      iconv-lite: 0.6.3
-      libmime: 5.1.0
-      linkify-it: 4.0.0
-      mailsplit: 5.3.2
-      nodemailer: 6.7.3
-      tlds: 1.231.0
-    dev: false
+      debug: 4.3.4(supports-color@8.1.1)
+      istanbul-lib-coverage: 3.2.2
+      source-map: 0.6.1
+    transitivePeerDependencies:
+      - supports-color
 
-  /mailsplit@5.3.2:
-    resolution: {integrity: sha512-coES12hhKqagkuBTJoqERX+y9bXNpxbxw3Esd07auuwKYmcagouVlgucyIVRp48fnswMKxcUtLoFn/L1a75ynQ==}
+  /istanbul-reports@3.1.5:
+    resolution: {integrity: sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==}
+    engines: {node: '>=8'}
     dependencies:
-      libbase64: 1.2.1
-      libmime: 5.1.0
-      libqp: 1.1.0
-    dev: false
+      html-escaper: 2.0.2
+      istanbul-lib-report: 3.0.0
 
-  /make-dir@2.1.0:
-    resolution: {integrity: sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==}
-    engines: {node: '>=6'}
+  /istanbul-reports@3.1.6:
+    resolution: {integrity: sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg==}
+    engines: {node: '>=8'}
     dependencies:
-      pify: 4.0.1
-      semver: 5.7.1
+      html-escaper: 2.0.2
+      istanbul-lib-report: 3.0.1
     dev: true
 
-  /make-dir@3.1.0:
-    resolution: {integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==}
-    engines: {node: '>=8'}
+  /jackspeak@2.2.2:
+    resolution: {integrity: sha512-mgNtVv4vUuaKA97yxUHoA3+FkuhtxkjdXEWOyB/N76fjy0FjezEt34oy3epBtvCvS+7DyKwqCFWx/oJLV5+kCg==}
+    engines: {node: '>=14'}
     dependencies:
-      semver: 6.3.0
+      '@isaacs/cliui': 8.0.2
+    optionalDependencies:
+      '@pkgjs/parseargs': 0.11.0
+    dev: true
 
-  /make-error-cause@2.3.0:
-    resolution: {integrity: sha512-etgt+n4LlOkGSJbBTV9VROHA5R7ekIPS4vfh+bCAoJgRrJWdqJCBbpS3osRJ/HrT7R68MzMiY3L3sDJ/Fd8aBg==}
+  /jackspeak@2.3.6:
+    resolution: {integrity: sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==}
+    engines: {node: '>=14'}
     dependencies:
-      make-error: 1.3.6
-    dev: false
+      '@isaacs/cliui': 8.0.2
+    optionalDependencies:
+      '@pkgjs/parseargs': 0.11.0
 
-  /make-error@1.3.6:
-    resolution: {integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==}
+  /jake@10.8.5:
+    resolution: {integrity: sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw==}
+    engines: {node: '>=10'}
+    hasBin: true
+    dependencies:
+      async: 3.2.4
+      chalk: 4.1.2
+      filelist: 1.0.4
+      minimatch: 3.1.2
 
-  /make-fetch-happen@9.1.0:
-    resolution: {integrity: sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==}
-    engines: {node: '>= 10'}
+  /jest-changed-files@29.5.0:
+    resolution: {integrity: sha512-IFG34IUMUaNBIxjQXF/iu7g6EcdMrGRRxaUSw92I/2g2YC6vCdTltl4nHvt7Ci5nSJwXIkCu8Ka1DKF+X7Z1Ag==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      agentkeepalive: 4.2.1
-      cacache: 15.3.0
-      http-cache-semantics: 4.1.1
-      http-proxy-agent: 4.0.1
-      https-proxy-agent: 5.0.1
-      is-lambda: 1.0.1
-      lru-cache: 6.0.0
-      minipass: 3.3.6
-      minipass-collect: 1.0.2
-      minipass-fetch: 1.4.1
-      minipass-flush: 1.0.5
-      minipass-pipeline: 1.2.4
-      negotiator: 0.6.3
-      promise-retry: 2.0.1
-      socks-proxy-agent: 6.2.1
-      ssri: 8.0.1
+      execa: 5.1.1
+      p-limit: 3.1.0
+
+  /jest-circus@29.6.2:
+    resolution: {integrity: sha512-G9mN+KOYIUe2sB9kpJkO9Bk18J4dTDArNFPwoZ7WKHKel55eKIS/u2bLthxgojwlf9NLCVQfgzM/WsOVvoC6Fw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    dependencies:
+      '@jest/environment': 29.6.2
+      '@jest/expect': 29.6.2
+      '@jest/test-result': 29.6.2
+      '@jest/types': 29.6.1
+      '@types/node': 18.16.16
+      chalk: 4.1.2
+      co: 4.6.0
+      dedent: 1.3.0
+      is-generator-fn: 2.1.0
+      jest-each: 29.6.2
+      jest-matcher-utils: 29.6.2
+      jest-message-util: 29.6.2
+      jest-runtime: 29.6.2
+      jest-snapshot: 29.6.2
+      jest-util: 29.6.2
+      p-limit: 3.1.0
+      pretty-format: 29.7.0
+      pure-rand: 6.0.1
+      slash: 3.0.0
+      stack-utils: 2.0.6
+    transitivePeerDependencies:
+      - babel-plugin-macros
+      - supports-color
+
+  /jest-cli@29.6.2:
+    resolution: {integrity: sha512-TT6O247v6dCEX2UGHGyflMpxhnrL0DNqP2fRTKYm3nJJpCTfXX3GCMQPGFjXDoj0i5/Blp3jriKXFgdfmbYB6Q==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    hasBin: true
+    peerDependencies:
+      node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
+    peerDependenciesMeta:
+      node-notifier:
+        optional: true
+    dependencies:
+      '@jest/core': 29.6.2
+      '@jest/test-result': 29.6.2
+      '@jest/types': 29.6.1
+      chalk: 4.1.2
+      exit: 0.1.2
+      graceful-fs: 4.2.11
+      import-local: 3.1.0
+      jest-config: 29.6.2(@types/node@18.16.16)
+      jest-util: 29.6.2
+      jest-validate: 29.6.2
+      prompts: 2.4.2
+      yargs: 17.7.2
     transitivePeerDependencies:
-      - bluebird
+      - '@types/node'
+      - babel-plugin-macros
       - supports-color
-    dev: false
-    optional: true
+      - ts-node
 
-  /make-iterator@1.0.1:
-    resolution: {integrity: sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==}
-    engines: {node: '>=0.10.0'}
+  /jest-config@29.6.2(@types/node@18.16.16):
+    resolution: {integrity: sha512-VxwFOC8gkiJbuodG9CPtMRjBUNZEHxwfQXmIudSTzFWxaci3Qub1ddTRbFNQlD/zUeaifLndh/eDccFX4wCMQw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    peerDependencies:
+      '@types/node': ^18.16.16
+      ts-node: '>=9.0.0'
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
+      ts-node:
+        optional: true
     dependencies:
-      kind-of: 6.0.3
-    dev: true
+      '@babel/core': 7.22.9
+      '@jest/test-sequencer': 29.6.2
+      '@jest/types': 29.6.1
+      '@types/node': 18.16.16
+      babel-jest: 29.6.2(@babel/core@7.22.9)
+      chalk: 4.1.2
+      ci-info: 3.8.0
+      deepmerge: 4.3.1
+      glob: 7.2.3
+      graceful-fs: 4.2.11
+      jest-circus: 29.6.2
+      jest-environment-node: 29.6.2
+      jest-get-type: 29.4.3
+      jest-regex-util: 29.4.3
+      jest-resolve: 29.6.2
+      jest-runner: 29.6.2
+      jest-util: 29.6.2
+      jest-validate: 29.6.2
+      micromatch: 4.0.5
+      parse-json: 5.2.0
+      pretty-format: 29.6.2
+      slash: 3.0.0
+      strip-json-comments: 3.1.1
+    transitivePeerDependencies:
+      - babel-plugin-macros
+      - supports-color
 
-  /makeerror@1.0.12:
-    resolution: {integrity: sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==}
+  /jest-diff@29.5.0:
+    resolution: {integrity: sha512-LtxijLLZBduXnHSniy0WMdaHjmQnt3g5sa16W4p0HqukYTTsyTW3GD1q41TyGl5YFXj/5B2U6dlh5FM1LIMgxw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      tmpl: 1.0.5
-    dev: true
-
-  /map-cache@0.2.2:
-    resolution: {integrity: sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==}
-    engines: {node: '>=0.10.0'}
-    dev: true
-
-  /map-or-similar@1.5.0:
-    resolution: {integrity: sha512-0aF7ZmVon1igznGI4VS30yugpduQW3y3GkcgGJOp7d8x8QrizhigUxjI/m2UojsXXto+jLAH3KSz+xOJTiORjg==}
-    dev: true
-
-  /map-stream@0.1.0:
-    resolution: {integrity: sha512-CkYQrPYZfWnu/DAmVCpTSX/xHpKZ80eKh2lAkyA6AJTef6bW+6JpbQZN5rofum7da+SyN1bi5ctTm+lTfcCW3g==}
+      chalk: 4.1.2
+      diff-sequences: 29.6.3
+      jest-get-type: 29.4.3
+      pretty-format: 29.7.0
     dev: true
 
-  /map-visit@1.0.0:
-    resolution: {integrity: sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==}
-    engines: {node: '>=0.10.0'}
+  /jest-diff@29.6.2:
+    resolution: {integrity: sha512-t+ST7CB9GX5F2xKwhwCf0TAR17uNDiaPTZnVymP9lw0lssa9vG+AFyDZoeIHStU3WowFFwT+ky+er0WVl2yGhA==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      object-visit: 1.0.1
-    dev: true
-
-  /mappersmith@2.40.0:
-    resolution: {integrity: sha512-Es99fy0E52fxmhRvCyed7WVlSyuz6ME/wOsRpSmi0GcbMEZ6y5D2GL4+qNGPCc2P270J5yw8L2zg+K4BWACcHg==}
-    dev: false
-
-  /markdown-it-emoji@2.0.2:
-    resolution: {integrity: sha512-zLftSaNrKuYl0kR5zm4gxXjHaOI3FAOEaloKmRA5hijmJZvSjmxcokOLlzycb/HXlUFWzXqpIEoyEMCE4i9MvQ==}
-    dev: false
-
-  /markdown-it-link-attributes@4.0.1:
-    resolution: {integrity: sha512-pg5OK0jPLg62H4k7M9mRJLT61gUp9nvG0XveKYHMOOluASo9OEF13WlXrpAp2aj35LbedAy3QOCgQCw0tkLKAQ==}
-    dev: false
-
-  /markdown-it-task-lists@2.1.1:
-    resolution: {integrity: sha512-TxFAc76Jnhb2OUu+n3yz9RMu4CwGfaT788br6HhEDlvWfdeJcLUsxk1Hgw2yJio0OXsxv7pyIPmvECY7bMbluA==}
-    dev: false
+      chalk: 4.1.2
+      diff-sequences: 29.6.3
+      jest-get-type: 29.4.3
+      pretty-format: 29.7.0
 
-  /markdown-it@13.0.1:
-    resolution: {integrity: sha512-lTlxriVoy2criHP0JKRhO2VDG9c2ypWCsT237eDiLqi09rmbKoUetyGHq2uOIRoRS//kfoJckS0eUzzkDR+k2Q==}
-    hasBin: true
+  /jest-docblock@29.4.3:
+    resolution: {integrity: sha512-fzdTftThczeSD9nZ3fzA/4KkHtnmllawWrXO69vtI+L9WjEIuXWs4AmyME7lN5hU7dB0sHhuPfcKofRsUb/2Fg==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      argparse: 2.0.1
-      entities: 3.0.1
-      linkify-it: 4.0.1
-      mdurl: 1.0.1
-      uc.micro: 1.0.6
-    dev: false
+      detect-newline: 3.1.0
 
-  /markdown-to-jsx@7.1.9(react@17.0.2):
-    resolution: {integrity: sha512-x4STVIKIJR0mGgZIZ5RyAeQD7FEZd5tS8m/htbcVGlex32J+hlSLj+ExrHCxP6nRKF1EKbcO7i6WhC1GtOpBlA==}
-    engines: {node: '>= 10'}
-    peerDependencies:
-      react: '>= 0.14.0'
+  /jest-each@29.6.2:
+    resolution: {integrity: sha512-MsrsqA0Ia99cIpABBc3izS1ZYoYfhIy0NNWqPSE0YXbQjwchyt6B1HD2khzyPe1WiJA7hbxXy77ZoUQxn8UlSw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      react: 17.0.2
-    dev: true
+      '@jest/types': 29.6.1
+      chalk: 4.1.2
+      jest-get-type: 29.4.3
+      jest-util: 29.6.2
+      pretty-format: 29.7.0
 
-  /matchdep@2.0.0:
-    resolution: {integrity: sha512-LFgVbaHIHMqCRuCZyfCtUOq9/Lnzhi7Z0KFUE2fhD54+JN2jLh3hC02RLkqauJ3U4soU6H1J3tfj/Byk7GoEjA==}
-    engines: {node: '>= 0.10.0'}
+  /jest-environment-jsdom@29.6.2:
+    resolution: {integrity: sha512-7oa/+266AAEgkzae8i1awNEfTfjwawWKLpiw2XesZmaoVVj9u9t8JOYx18cG29rbPNtkUlZ8V4b5Jb36y/VxoQ==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    peerDependencies:
+      canvas: ^2.5.0
+    peerDependenciesMeta:
+      canvas:
+        optional: true
     dependencies:
-      findup-sync: 2.0.0
-      micromatch: 3.1.10
-      resolve: 1.22.1
-      stack-trace: 0.0.10
+      '@jest/environment': 29.6.2
+      '@jest/fake-timers': 29.6.2
+      '@jest/types': 29.6.1
+      '@types/jsdom': 20.0.1
+      '@types/node': 18.16.16
+      jest-mock: 29.6.2
+      jest-util: 29.6.2
+      jsdom: 20.0.2
     transitivePeerDependencies:
+      - bufferutil
       - supports-color
+      - utf-8-validate
     dev: true
 
-  /material-colors@1.2.6:
-    resolution: {integrity: sha512-6qE4B9deFBIa9YSpOc9O0Sgc43zTeVYbgDT5veRKSlB2+ZuHNoVVxA1L/ckMUayV9Ay9y7Z/SZCLcGteW9i7bg==}
-    dev: false
-
-  /md5@2.3.0:
-    resolution: {integrity: sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==}
-    dependencies:
-      charenc: 0.0.2
-      crypt: 0.0.2
-      is-buffer: 1.1.6
-    dev: false
-
-  /mdast-util-definitions@4.0.0:
-    resolution: {integrity: sha512-k8AJ6aNnUkB7IE+5azR9h81O5EQ/cTDXtWdMq9Kk5KcEW/8ritU5CeLg/9HhOC++nALHBlaogJ5jz0Ybk3kPMQ==}
+  /jest-environment-node@29.6.2:
+    resolution: {integrity: sha512-YGdFeZ3T9a+/612c5mTQIllvWkddPbYcN2v95ZH24oWMbGA4GGS2XdIF92QMhUhvrjjuQWYgUGW2zawOyH63MQ==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      unist-util-visit: 2.0.3
-    dev: true
+      '@jest/environment': 29.6.2
+      '@jest/fake-timers': 29.6.2
+      '@jest/types': 29.6.1
+      '@types/node': 18.16.16
+      jest-mock: 29.6.2
+      jest-util: 29.6.2
 
-  /mdast-util-to-string@1.1.0:
-    resolution: {integrity: sha512-jVU0Nr2B9X3MU4tSK7JP1CMkSvOj7X5l/GboG1tKRw52lLF1x2Ju92Ms9tNetCcbfX3hzlM73zYo2NKkWSfF/A==}
+  /jest-expect-message@1.1.3:
+    resolution: {integrity: sha512-bTK77T4P+zto+XepAX3low8XVQxDgaEqh3jSTQOG8qvPpD69LsIdyJTa+RmnJh3HNSzJng62/44RPPc7OIlFxg==}
     dev: true
 
-  /mdurl@1.0.1:
-    resolution: {integrity: sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==}
-    dev: false
+  /jest-get-type@29.4.3:
+    resolution: {integrity: sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
 
-  /media-typer@0.3.0:
-    resolution: {integrity: sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==}
-    engines: {node: '>= 0.6'}
+  /jest-haste-map@29.6.2:
+    resolution: {integrity: sha512-+51XleTDAAysvU8rT6AnS1ZJ+WHVNqhj1k6nTvN2PYP+HjU3kqlaKQ1Lnw3NYW3bm2r8vq82X0Z1nDDHZMzHVA==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    dependencies:
+      '@jest/types': 29.6.1
+      '@types/graceful-fs': 4.1.6
+      '@types/node': 18.16.16
+      anymatch: 3.1.3
+      fb-watchman: 2.0.2
+      graceful-fs: 4.2.11
+      jest-regex-util: 29.4.3
+      jest-util: 29.6.2
+      jest-worker: 29.6.2
+      micromatch: 4.0.5
+      walker: 1.0.8
+    optionalDependencies:
+      fsevents: 2.3.3
 
-  /media-typer@1.1.0:
-    resolution: {integrity: sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw==}
-    engines: {node: '>= 0.8'}
-    dev: false
+  /jest-leak-detector@29.6.2:
+    resolution: {integrity: sha512-aNqYhfp5uYEO3tdWMb2bfWv6f0b4I0LOxVRpnRLAeque2uqOVVMLh6khnTcE2qJ5wAKop0HcreM1btoysD6bPQ==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    dependencies:
+      jest-get-type: 29.4.3
+      pretty-format: 29.7.0
 
-  /memfs@3.4.13:
-    resolution: {integrity: sha512-omTM41g3Skpvx5dSYeZIbXKcXoAVc/AoMNwn9TKx++L/gaen/+4TTttmu8ZSch5vfVJ8uJvGbroTsIlslRg6lg==}
-    engines: {node: '>= 4.0.0'}
+  /jest-matcher-utils@29.5.0:
+    resolution: {integrity: sha512-lecRtgm/rjIK0CQ7LPQwzCs2VwW6WAahA55YBuI+xqmhm7LAaxokSB8C97yJeYyT+HvQkH741StzpU41wohhWw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      fs-monkey: 1.0.3
+      chalk: 4.1.2
+      jest-diff: 29.5.0
+      jest-get-type: 29.4.3
+      pretty-format: 29.6.2
     dev: true
 
-  /memoizerific@1.11.3:
-    resolution: {integrity: sha512-/EuHYwAPdLtXwAwSZkh/Gutery6pD2KYd44oQLhAvQp/50mpyduZh8Q7PYHXTCJ+wuXxt7oij2LXyIJOOYFPog==}
+  /jest-matcher-utils@29.6.2:
+    resolution: {integrity: sha512-4LiAk3hSSobtomeIAzFTe+N8kL6z0JtF3n6I4fg29iIW7tt99R7ZcIFW34QkX+DuVrf+CUe6wuVOpm7ZKFJzZQ==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      map-or-similar: 1.5.0
+      chalk: 4.1.2
+      jest-diff: 29.6.2
+      jest-get-type: 29.4.3
+      pretty-format: 29.7.0
+
+  /jest-message-util@29.5.0:
+    resolution: {integrity: sha512-Kijeg9Dag6CKtIDA7O21zNTACqD5MD/8HfIV8pdD94vFyFuer52SigdC3IQMhab3vACxXMiFk+yMHNdbqtyTGA==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    dependencies:
+      '@babel/code-frame': 7.22.5
+      '@jest/types': 29.6.1
+      '@types/stack-utils': 2.0.1
+      chalk: 4.1.2
+      graceful-fs: 4.2.11
+      micromatch: 4.0.5
+      pretty-format: 29.6.2
+      slash: 3.0.0
+      stack-utils: 2.0.6
     dev: true
 
-  /memory-pager@1.5.0:
-    resolution: {integrity: sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==}
-    dev: false
-    optional: true
+  /jest-message-util@29.6.2:
+    resolution: {integrity: sha512-vnIGYEjoPSuRqV8W9t+Wow95SDp6KPX2Uf7EoeG9G99J2OVh7OSwpS4B6J0NfpEIpfkBNHlBZpA2rblEuEFhZQ==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    dependencies:
+      '@babel/code-frame': 7.22.5
+      '@jest/types': 29.6.1
+      '@types/stack-utils': 2.0.1
+      chalk: 4.1.2
+      graceful-fs: 4.2.11
+      micromatch: 4.0.5
+      pretty-format: 29.6.2
+      slash: 3.0.0
+      stack-utils: 2.0.6
 
-  /merge-descriptors@1.0.1:
-    resolution: {integrity: sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==}
+  /jest-mock-extended@3.0.4(jest@29.6.2)(typescript@5.4.2):
+    resolution: {integrity: sha512-2ynEZ7IEJNrhrgshklDMhrOdnmW4Nt+PhkyRqZxRgpwMo7JjmFWMzyp0+eSyk+H9KK1QjXI5xTZIw6x7cVDcRg==}
+    peerDependencies:
+      jest: ^24.0.0 || ^25.0.0 || ^26.0.0 || ^27.0.0 || ^28.0.0 || ^29.0.0
+      typescript: ^5.4.2
+    dependencies:
+      jest: 29.6.2
+      ts-essentials: 7.0.3(typescript@5.4.2)
+      typescript: 5.4.2
 
-  /merge-source-map@1.1.0:
-    resolution: {integrity: sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==}
+  /jest-mock@27.5.1:
+    resolution: {integrity: sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
     dependencies:
-      source-map: 0.6.1
+      '@jest/types': 27.5.1
+      '@types/node': 18.16.16
     dev: true
 
-  /merge-stream@2.0.0:
-    resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==}
-    dev: true
+  /jest-mock@29.6.2:
+    resolution: {integrity: sha512-hoSv3lb3byzdKfwqCuT6uTscan471GUECqgNYykg6ob0yiAw3zYc7OrPnI9Qv8Wwoa4lC7AZ9hyS4AiIx5U2zg==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    dependencies:
+      '@jest/types': 29.6.1
+      '@types/node': 18.16.16
+      jest-util: 29.6.2
 
-  /merge2@1.4.1:
-    resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==}
-    engines: {node: '>= 8'}
+  /jest-pnp-resolver@1.2.2(jest-resolve@29.6.2):
+    resolution: {integrity: sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==}
+    engines: {node: '>=6'}
+    peerDependencies:
+      jest-resolve: '*'
+    peerDependenciesMeta:
+      jest-resolve:
+        optional: true
+    dependencies:
+      jest-resolve: 29.6.2
 
-  /methods@1.1.2:
-    resolution: {integrity: sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==}
-    engines: {node: '>= 0.6'}
+  /jest-regex-util@29.4.3:
+    resolution: {integrity: sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
 
-  /micromatch@3.1.10:
-    resolution: {integrity: sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==}
-    engines: {node: '>=0.10.0'}
+  /jest-resolve-dependencies@29.6.2:
+    resolution: {integrity: sha512-LGqjDWxg2fuQQm7ypDxduLu/m4+4Lb4gczc13v51VMZbVP5tSBILqVx8qfWcsdP8f0G7aIqByIALDB0R93yL+w==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      arr-diff: 4.0.0
-      array-unique: 0.3.2
-      braces: 2.3.2
-      define-property: 2.0.2
-      extend-shallow: 3.0.2
-      extglob: 2.0.4
-      fragment-cache: 0.2.1
-      kind-of: 6.0.3
-      nanomatch: 1.2.13
-      object.pick: 1.3.0
-      regex-not: 1.0.2
-      snapdragon: 0.8.2
-      to-regex: 3.0.2
+      jest-regex-util: 29.4.3
+      jest-snapshot: 29.6.2
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /micromatch@4.0.5:
-    resolution: {integrity: sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==}
-    engines: {node: '>=8.6'}
+  /jest-resolve@29.6.2:
+    resolution: {integrity: sha512-G/iQUvZWI5e3SMFssc4ug4dH0aZiZpsDq9o1PtXTV1210Ztyb2+w+ZgQkB3iOiC5SmAEzJBOHWz6Hvrd+QnNPw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      braces: 3.0.2
-      picomatch: 2.3.1
-
-  /mime-db@1.52.0:
-    resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
-    engines: {node: '>= 0.6'}
+      chalk: 4.1.2
+      graceful-fs: 4.2.11
+      jest-haste-map: 29.6.2
+      jest-pnp-resolver: 1.2.2(jest-resolve@29.6.2)
+      jest-util: 29.6.2
+      jest-validate: 29.6.2
+      resolve: 1.22.8
+      resolve.exports: 2.0.0
+      slash: 3.0.0
 
-  /mime-format@2.0.1:
-    resolution: {integrity: sha512-XxU3ngPbEnrYnNbIX+lYSaYg0M01v6p2ntd2YaFksTu0vayaw5OJvbdRyWs07EYRlLED5qadUZ+xo+XhOvFhwg==}
+  /jest-runner@29.6.2:
+    resolution: {integrity: sha512-wXOT/a0EspYgfMiYHxwGLPCZfC0c38MivAlb2lMEAlwHINKemrttu1uSbcGbfDV31sFaPWnWJPmb2qXM8pqZ4w==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      charset: 1.0.1
-    dev: false
+      '@jest/console': 29.6.2
+      '@jest/environment': 29.6.2
+      '@jest/test-result': 29.6.2
+      '@jest/transform': 29.6.2
+      '@jest/types': 29.6.1
+      '@types/node': 18.16.16
+      chalk: 4.1.2
+      emittery: 0.13.1
+      graceful-fs: 4.2.11
+      jest-docblock: 29.4.3
+      jest-environment-node: 29.6.2
+      jest-haste-map: 29.6.2
+      jest-leak-detector: 29.6.2
+      jest-message-util: 29.6.2
+      jest-resolve: 29.6.2
+      jest-runtime: 29.6.2
+      jest-util: 29.6.2
+      jest-watcher: 29.6.2
+      jest-worker: 29.6.2
+      p-limit: 3.1.0
+      source-map-support: 0.5.13
+    transitivePeerDependencies:
+      - supports-color
 
-  /mime-types@2.1.35:
-    resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
-    engines: {node: '>= 0.6'}
+  /jest-runtime@29.6.2:
+    resolution: {integrity: sha512-2X9dqK768KufGJyIeLmIzToDmsN0m7Iek8QNxRSI/2+iPFYHF0jTwlO3ftn7gdKd98G/VQw9XJCk77rbTGZnJg==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      mime-db: 1.52.0
-
-  /mime@1.6.0:
-    resolution: {integrity: sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==}
-    engines: {node: '>=4'}
-    hasBin: true
-
-  /mime@2.6.0:
-    resolution: {integrity: sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==}
-    engines: {node: '>=4.0.0'}
-    hasBin: true
-
-  /mimic-fn@2.1.0:
-    resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==}
-    engines: {node: '>=6'}
+      '@jest/environment': 29.6.2
+      '@jest/fake-timers': 29.6.2
+      '@jest/globals': 29.6.2
+      '@jest/source-map': 29.6.0
+      '@jest/test-result': 29.6.2
+      '@jest/transform': 29.6.2
+      '@jest/types': 29.6.1
+      '@types/node': 18.16.16
+      chalk: 4.1.2
+      cjs-module-lexer: 1.2.2
+      collect-v8-coverage: 1.0.1
+      glob: 7.2.3
+      graceful-fs: 4.2.11
+      jest-haste-map: 29.6.2
+      jest-message-util: 29.6.2
+      jest-mock: 29.6.2
+      jest-regex-util: 29.4.3
+      jest-resolve: 29.6.2
+      jest-snapshot: 29.6.2
+      jest-util: 29.6.2
+      slash: 3.0.0
+      strip-bom: 4.0.0
+    transitivePeerDependencies:
+      - supports-color
 
-  /min-document@2.19.0:
-    resolution: {integrity: sha512-9Wy1B3m3f66bPPmU5hdA4DR4PB2OfDU/+GS3yAB7IQozE3tqXaVv2zOjgla7MEGSRv95+ILmOuvhLkOK6wJtCQ==}
+  /jest-snapshot@29.6.2:
+    resolution: {integrity: sha512-1OdjqvqmRdGNvWXr/YZHuyhh5DeaLp1p/F8Tht/MrMw4Kr1Uu/j4lRG+iKl1DAqUJDWxtQBMk41Lnf/JETYBRA==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      dom-walk: 0.1.2
-    dev: true
-
-  /min-indent@1.0.1:
-    resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==}
-    engines: {node: '>=4'}
-    dev: true
-
-  /minimalistic-assert@1.0.1:
-    resolution: {integrity: sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==}
-    dev: false
+      '@babel/core': 7.22.9
+      '@babel/generator': 7.22.9
+      '@babel/plugin-syntax-jsx': 7.18.6(@babel/core@7.22.9)
+      '@babel/plugin-syntax-typescript': 7.20.0(@babel/core@7.22.9)
+      '@babel/types': 7.24.0
+      '@jest/expect-utils': 29.6.2
+      '@jest/transform': 29.6.2
+      '@jest/types': 29.6.1
+      babel-preset-current-node-syntax: 1.0.1(@babel/core@7.22.9)
+      chalk: 4.1.2
+      expect: 29.6.2
+      graceful-fs: 4.2.11
+      jest-diff: 29.6.2
+      jest-get-type: 29.4.3
+      jest-matcher-utils: 29.6.2
+      jest-message-util: 29.6.2
+      jest-util: 29.6.2
+      natural-compare: 1.4.0
+      pretty-format: 29.6.2
+      semver: 7.6.0
+    transitivePeerDependencies:
+      - supports-color
 
-  /minimatch@3.0.8:
-    resolution: {integrity: sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==}
+  /jest-util@29.5.0:
+    resolution: {integrity: sha512-RYMgG/MTadOr5t8KdhejfvUU82MxsCu5MF6KuDUHl+NuwzUt+Sm6jJWxTJVrDR1j5M/gJVCPKQEpWXY+yIQ6lQ==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      brace-expansion: 1.1.11
+      '@jest/types': 29.6.1
+      '@types/node': 18.16.16
+      chalk: 4.1.2
+      ci-info: 3.8.0
+      graceful-fs: 4.2.11
+      picomatch: 2.3.1
     dev: true
 
-  /minimatch@3.1.2:
-    resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}
+  /jest-util@29.6.2:
+    resolution: {integrity: sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      brace-expansion: 1.1.11
+      '@jest/types': 29.6.1
+      '@types/node': 18.16.16
+      chalk: 4.1.2
+      ci-info: 3.8.0
+      graceful-fs: 4.2.11
+      picomatch: 2.3.1
 
-  /minimatch@5.1.5:
-    resolution: {integrity: sha512-CI8wwdrll4ehjPAqs8TL8lBPyNnpZlQI02Wn8C1weNz/QbUbjh3OMxgMKSnvqfKFdLlks3EzHB9tO0BqGc3phQ==}
-    engines: {node: '>=10'}
+  /jest-validate@29.6.2:
+    resolution: {integrity: sha512-vGz0yMN5fUFRRbpJDPwxMpgSXW1LDKROHfBopAvDcmD6s+B/s8WJrwi+4bfH4SdInBA5C3P3BI19dBtKzx1Arg==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      brace-expansion: 2.0.1
+      '@jest/types': 29.6.1
+      camelcase: 6.3.0
+      chalk: 4.1.2
+      jest-get-type: 29.4.3
+      leven: 3.1.0
+      pretty-format: 29.6.2
 
-  /minimatch@7.4.2:
-    resolution: {integrity: sha512-xy4q7wou3vUoC9k1xGTXc+awNdGaGVHtFUaey8tiX4H1QRc04DZ/rmDFwNm2EBsuYEhAZ6SgMmYf3InGY6OauA==}
-    engines: {node: '>=10'}
+  /jest-watcher@29.6.2:
+    resolution: {integrity: sha512-GZitlqkMkhkefjfN/p3SJjrDaxPflqxEAv3/ik10OirZqJGYH5rPiIsgVcfof0Tdqg3shQGdEIxDBx+B4tuLzA==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      brace-expansion: 2.0.1
-    dev: false
-
-  /minimist@1.2.7:
-    resolution: {integrity: sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==}
+      '@jest/test-result': 29.6.2
+      '@jest/types': 29.6.1
+      '@types/node': 18.16.16
+      ansi-escapes: 4.3.2
+      chalk: 4.1.2
+      emittery: 0.13.1
+      jest-util: 29.6.2
+      string-length: 4.0.2
 
-  /minipass-collect@1.0.2:
-    resolution: {integrity: sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==}
-    engines: {node: '>= 8'}
+  /jest-worker@27.5.1:
+    resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==}
+    engines: {node: '>= 10.13.0'}
     dependencies:
-      minipass: 3.3.6
-    dev: false
-    optional: true
+      '@types/node': 18.16.16
+      merge-stream: 2.0.0
+      supports-color: 8.1.1
+    dev: true
 
-  /minipass-fetch@1.4.1:
-    resolution: {integrity: sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==}
-    engines: {node: '>=8'}
+  /jest-worker@29.6.2:
+    resolution: {integrity: sha512-l3ccBOabTdkng8I/ORCkADz4eSMKejTYv1vB/Z83UiubqhC1oQ5Li6dWCyqOIvSifGjUBxuvxvlm6KGK2DtuAQ==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      minipass: 3.3.6
-      minipass-sized: 1.0.3
-      minizlib: 2.1.2
-    optionalDependencies:
-      encoding: 0.1.13
-    dev: false
-    optional: true
+      '@types/node': 18.16.16
+      jest-util: 29.6.2
+      merge-stream: 2.0.0
+      supports-color: 8.1.1
 
-  /minipass-flush@1.0.5:
-    resolution: {integrity: sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==}
-    engines: {node: '>= 8'}
+  /jest@29.6.2:
+    resolution: {integrity: sha512-8eQg2mqFbaP7CwfsTpCxQ+sHzw1WuNWL5UUvjnWP4hx2riGz9fPSzYOaU5q8/GqWn1TfgZIVTqYJygbGbWAANg==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    hasBin: true
+    peerDependencies:
+      node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
+    peerDependenciesMeta:
+      node-notifier:
+        optional: true
     dependencies:
-      minipass: 3.3.6
-    dev: false
-    optional: true
+      '@jest/core': 29.6.2
+      '@jest/types': 29.6.1
+      import-local: 3.1.0
+      jest-cli: 29.6.2
+    transitivePeerDependencies:
+      - '@types/node'
+      - babel-plugin-macros
+      - supports-color
+      - ts-node
 
-  /minipass-pipeline@1.2.4:
-    resolution: {integrity: sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==}
-    engines: {node: '>=8'}
-    dependencies:
-      minipass: 3.3.6
-    dev: false
-    optional: true
+  /jiti@1.21.0:
+    resolution: {integrity: sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==}
+    hasBin: true
+    dev: true
 
-  /minipass-sized@1.0.3:
-    resolution: {integrity: sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==}
-    engines: {node: '>=8'}
-    dependencies:
-      minipass: 3.3.6
+  /jju@1.4.0:
+    resolution: {integrity: sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA==}
+    dev: true
+
+  /jmespath@0.16.0:
+    resolution: {integrity: sha512-9FzQjJ7MATs1tSpnco1K6ayiYE3figslrXA72G2HQ/n76RzvYlofyi5QM+iX4YRs/pu3yzxlVQSST23+dMDknw==}
+    engines: {node: '>= 0.6.0'}
     dev: false
-    optional: true
 
-  /minipass@3.3.6:
-    resolution: {integrity: sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==}
-    engines: {node: '>=8'}
+  /joi@17.11.0:
+    resolution: {integrity: sha512-NgB+lZLNoqISVy1rZocE9PZI36bL/77ie924Ri43yEvi9GUUMPeyVIr8KdFTMUlby1p0PBYMk9spIxEUQYqrJQ==}
     dependencies:
-      yallist: 4.0.0
+      '@hapi/hoek': 9.3.0
+      '@hapi/topo': 5.1.0
+      '@sideway/address': 4.1.4
+      '@sideway/formula': 3.0.1
+      '@sideway/pinpoint': 2.0.0
+    dev: true
 
-  /minipass@4.2.5:
-    resolution: {integrity: sha512-+yQl7SX3bIT83Lhb4BVorMAHVuqsskxRdlmO9kTpyukp8vsm2Sn/fUOV9xlnG8/a5JsypJzap21lz/y3FBMJ8Q==}
-    engines: {node: '>=8'}
+  /join-component@1.1.0:
+    resolution: {integrity: sha512-bF7vcQxbODoGK1imE2P9GS9aw4zD0Sd+Hni68IMZLj7zRnquH7dXUmMw9hDI5S/Jzt7q+IyTXN0rSg2GI0IKhQ==}
+    dev: false
 
-  /minizlib@2.1.2:
-    resolution: {integrity: sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==}
-    engines: {node: '>= 8'}
-    dependencies:
-      minipass: 3.3.6
-      yallist: 4.0.0
+  /js-base64@3.7.2:
+    resolution: {integrity: sha512-NnRs6dsyqUXejqk/yv2aiXlAvOs56sLkX6nUdeaNezI5LFFLlsZjOThmwnrcwh5ZZRwZlCMnVAY3CvhIhoVEKQ==}
+    dev: false
 
-  /miragejs@0.1.47:
-    resolution: {integrity: sha512-99tuCbIAlMhNhyF3s5d3+5/FdJ7O4jSq/5e3e+sDv7L8dZdwJuwutXe0pobJ7hm6yRChTDjK+Nn8dZZd175wbg==}
-    engines: {node: 6.* || 8.* || >= 10.*}
+  /js-beautify@1.14.9:
+    resolution: {integrity: sha512-coM7xq1syLcMyuVGyToxcj2AlzhkDjmfklL8r0JgJ7A76wyGMpJ1oA35mr4APdYNO/o/4YY8H54NQIJzhMbhBg==}
+    engines: {node: '>=12'}
+    hasBin: true
     dependencies:
-      '@miragejs/pretender-node-polyfill': 0.1.2
-      inflected: 2.1.0
-      lodash.assign: 4.2.0
-      lodash.camelcase: 4.3.0
-      lodash.clonedeep: 4.5.0
-      lodash.compact: 3.0.1
-      lodash.find: 4.6.0
-      lodash.flatten: 4.4.0
-      lodash.forin: 4.4.0
-      lodash.get: 4.4.2
-      lodash.has: 4.5.2
-      lodash.invokemap: 4.6.0
-      lodash.isempty: 4.4.0
-      lodash.isequal: 4.5.0
-      lodash.isfunction: 3.0.9
-      lodash.isinteger: 4.0.4
-      lodash.isplainobject: 4.0.6
-      lodash.lowerfirst: 4.3.1
-      lodash.map: 4.6.0
-      lodash.mapvalues: 4.6.0
-      lodash.pick: 4.4.0
-      lodash.snakecase: 4.1.1
-      lodash.uniq: 4.5.0
-      lodash.uniqby: 4.7.0
-      lodash.values: 4.3.0
-      pretender: 3.4.7
+      config-chain: 1.1.13
+      editorconfig: 1.0.4
+      glob: 8.1.0
+      nopt: 6.0.0
     dev: true
 
-  /mixin-deep@1.3.2:
-    resolution: {integrity: sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==}
+  /js-levenshtein@1.1.6:
+    resolution: {integrity: sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g==}
     engines: {node: '>=0.10.0'}
-    dependencies:
-      for-in: 1.0.2
-      is-extendable: 1.0.1
     dev: true
 
-  /mkdirp-classic@0.5.3:
-    resolution: {integrity: sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==}
-    dev: true
-
-  /mkdirp@0.5.6:
-    resolution: {integrity: sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==}
-    hasBin: true
-    dependencies:
-      minimist: 1.2.7
-
-  /mkdirp@1.0.4:
-    resolution: {integrity: sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==}
-    engines: {node: '>=10'}
-    hasBin: true
+  /js-md4@0.3.2:
+    resolution: {integrity: sha512-/GDnfQYsltsjRswQhN9fhv3EMw2sCpUdrdxyWDOUK7eyD++r3gRhzgiQgc/x4MAv2i1iuQ4lxO5mvqM3vj4bwA==}
+    dev: false
 
-  /mkdirp@2.1.3:
-    resolution: {integrity: sha512-sjAkg21peAG9HS+Dkx7hlG9Ztx7HLeKnvB3NQRcu/mltCVmvkF0pisbiTSfDVYTT86XEfZrTUosLdZLStquZUw==}
-    engines: {node: '>=10'}
-    hasBin: true
+  /js-nacl@1.4.0:
+    resolution: {integrity: sha512-HgYLcutGbMYBJrwgVICiHliuw1OJLy2U3tIuK6a1rZ06KC84TPl81WG1hcBRrBCiIIuBe3PSo9G4IZOMGdSg3Q==}
     dev: false
 
-  /mlly@1.1.0:
-    resolution: {integrity: sha512-cwzBrBfwGC1gYJyfcy8TcZU1f+dbH/T+TuOhtYP2wLv/Fb51/uV7HJQfBPtEupZ2ORLRU1EKFS/QfS3eo9+kBQ==}
-    dependencies:
-      acorn: 8.8.1
-      pathe: 1.1.0
-      pkg-types: 1.0.1
-      ufo: 1.0.1
-    dev: true
+  /js-sdsl@4.3.0:
+    resolution: {integrity: sha512-mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ==}
+    dev: false
 
-  /mock-jwks@1.0.9(nock@13.2.9):
-    resolution: {integrity: sha512-kshOXv5h5hA5bGR0Mb2S24GFdKkFvrWoRTv3phLRKH/HRu/UoPUx0zJLAorOE8SmFtGsfOTPFD7jfQD5Y9ZlZA==}
-    peerDependencies:
-      nock: ^11 || ^12 || ^13
-    dependencies:
-      base64-url: 2.3.3
-      jsonwebtoken: 9.0.0
-      nock: 13.2.9
-      node-forge: 1.3.1
-      node-rsa: 1.1.1
+  /js-stringify@1.0.2:
+    resolution: {integrity: sha512-rtS5ATOo2Q5k1G+DADISilDA6lv79zIiwFd6CcjuIxGKLFm5C+RLImRscVap9k55i+MOZwgliw+NejvkLuGD5g==}
     dev: true
 
-  /mock-require@3.0.3:
-    resolution: {integrity: sha512-lLzfLHcyc10MKQnNUCv7dMcoY/2Qxd6wJfbqCcVk3LDb8An4hF6ohk5AztrvgKhJCqj36uyzi/p5se+tvyD+Wg==}
-    engines: {node: '>=4.3.0'}
+  /js-tiktoken@1.0.11:
+    resolution: {integrity: sha512-PajXFLq2vx7/8jllQZ43vzNpAai/0MOVdJjW/UrNyJorNQRTjHrqdGJG/mjHVy7h9M6dW6CaG43eNLMYFkTh6w==}
     dependencies:
-      get-caller-file: 1.0.3
-      normalize-path: 2.1.1
+      base64-js: 1.5.1
     dev: false
 
-  /moment-timezone@0.5.37:
-    resolution: {integrity: sha512-uEDzDNFhfaywRl+vwXxffjjq1q0Vzr+fcQpQ1bU0kbzorfS7zVtZnCnGc8mhWmF39d4g4YriF6kwA75mJKE/Zg==}
+  /js-tiktoken@1.0.8:
+    resolution: {integrity: sha512-r7XK3E9/I+SOrbAGqb39pyO/rHAS1diAOSRAvaaLfHgXjkUSK9AiSd+r84Vn2f/GvXJYRAxKj8NHrUvqlaH5qg==}
     dependencies:
-      moment: 2.29.4
+      base64-js: 1.5.1
     dev: false
 
-  /moment@2.29.4:
-    resolution: {integrity: sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==}
+  /js-tokens@4.0.0:
+    resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
 
-  /monaco-editor@0.33.0:
-    resolution: {integrity: sha512-VcRWPSLIUEgQJQIE0pVT8FcGBIgFoxz7jtqctE+IiCxWugD0DwgyQBcZBhdSrdMC84eumoqMZsGl2GTreOzwqw==}
+  /js-tokens@8.0.3:
+    resolution: {integrity: sha512-UfJMcSJc+SEXEl9lH/VLHSZbThQyLpw1vLO1Lb+j4RWDvG3N2f7yj3PVQA3cmkTBNldJ9eFnM+xEXxHIXrYiJw==}
+    dev: true
 
-  /mongodb-connection-string-url@2.5.4:
-    resolution: {integrity: sha512-SeAxuWs0ez3iI3vvmLk/j2y+zHwigTDKQhtdxTgt5ZCOQQS5+HW4g45/Xw5vzzbn7oQXCNQ24Z40AkJsizEy7w==}
+  /js-yaml@3.14.1:
+    resolution: {integrity: sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==}
+    hasBin: true
     dependencies:
-      '@types/whatwg-url': 8.2.2
-      whatwg-url: 11.0.0
-    dev: false
+      argparse: 1.0.10
+      esprima: 4.0.1
 
-  /mongodb@4.10.0:
-    resolution: {integrity: sha512-My2QxLTw0Cc1O9gih0mz4mqo145Jq4rLAQx0Glk/Ha9iYBzYpt4I2QFNRIh35uNFNfe8KFQcdwY1/HKxXBkinw==}
-    engines: {node: '>=12.9.0'}
+  /js-yaml@4.1.0:
+    resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==}
+    hasBin: true
     dependencies:
-      bson: 4.7.0
-      denque: 2.1.0
-      mongodb-connection-string-url: 2.5.4
-      socks: 2.7.1
-    optionalDependencies:
-      saslprep: 1.0.3
+      argparse: 2.0.1
+
+  /js2xmlparser@4.0.2:
+    resolution: {integrity: sha512-6n4D8gLlLf1n5mNLQPRfViYzu9RATblzPEtm1SthMX1Pjao0r9YI9nw7ZIfRxQMERS87mcswrg+r/OYrPRX6jA==}
+    dependencies:
+      xmlcreate: 2.0.4
     dev: false
 
-  /moo@0.5.2:
-    resolution: {integrity: sha512-iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q==}
+  /jsbi@4.3.0:
+    resolution: {integrity: sha512-SnZNcinB4RIcnEyZqFPdGPVgrg2AcnykiBy0sHVJQKHYeaLUvi3Exj+iaPpLnFVkDPZIV4U0yvgC9/R4uEAZ9g==}
     dev: false
 
-  /morgan@1.10.0:
-    resolution: {integrity: sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==}
-    engines: {node: '>= 0.8.0'}
+  /jsbn@0.1.1:
+    resolution: {integrity: sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==}
+
+  /jscodeshift@0.15.2(@babel/preset-env@7.24.0):
+    resolution: {integrity: sha512-FquR7Okgmc4Sd0aEDwqho3rEiKR3BdvuG9jfdHjLJ6JQoWSMpavug3AoIfnfWhxFlf+5pzQh8qjqz0DWFrNQzA==}
+    hasBin: true
+    peerDependencies:
+      '@babel/preset-env': ^7.1.6
+    peerDependenciesMeta:
+      '@babel/preset-env':
+        optional: true
     dependencies:
-      basic-auth: 2.0.1
-      debug: 2.6.9
-      depd: 2.0.0
-      on-finished: 2.3.0
-      on-headers: 1.0.2
+      '@babel/core': 7.24.0
+      '@babel/parser': 7.24.0
+      '@babel/plugin-transform-class-properties': 7.22.5(@babel/core@7.24.0)
+      '@babel/plugin-transform-modules-commonjs': 7.23.3(@babel/core@7.24.0)
+      '@babel/plugin-transform-nullish-coalescing-operator': 7.23.4(@babel/core@7.24.0)
+      '@babel/plugin-transform-optional-chaining': 7.23.4(@babel/core@7.24.0)
+      '@babel/plugin-transform-private-methods': 7.22.5(@babel/core@7.24.0)
+      '@babel/preset-env': 7.24.0(@babel/core@7.24.0)
+      '@babel/preset-flow': 7.24.0(@babel/core@7.24.0)
+      '@babel/preset-typescript': 7.23.3(@babel/core@7.24.0)
+      '@babel/register': 7.23.7(@babel/core@7.24.0)
+      babel-core: 7.0.0-bridge.0(@babel/core@7.24.0)
+      chalk: 4.1.2
+      flow-parser: 0.197.0
+      graceful-fs: 4.2.11
+      micromatch: 4.0.5
+      neo-async: 2.6.2
+      node-dir: 0.1.17
+      recast: 0.23.3
+      temp: 0.8.4
+      write-file-atomic: 2.4.3
     transitivePeerDependencies:
       - supports-color
+    dev: true
+
+  /jsdoc@4.0.2:
+    resolution: {integrity: sha512-e8cIg2z62InH7azBBi3EsSEqrKx+nUtAS5bBcYTSpZFA+vhNPyhv8PTFZ0WsjOPDj04/dOLlm08EDcQJDqaGQg==}
+    engines: {node: '>=12.0.0'}
+    hasBin: true
+    dependencies:
+      '@babel/parser': 7.24.0
+      '@jsdoc/salty': 0.2.6
+      '@types/markdown-it': 12.2.3
+      bluebird: 3.7.2
+      catharsis: 0.9.0
+      escape-string-regexp: 2.0.0
+      js2xmlparser: 4.0.2
+      klaw: 3.0.0
+      markdown-it: 12.3.2
+      markdown-it-anchor: 8.6.7(@types/markdown-it@12.2.3)(markdown-it@12.3.2)
+      marked: 4.3.0
+      mkdirp: 1.0.4
+      requizzle: 0.2.4
+      strip-json-comments: 3.1.1
+      underscore: 1.13.6
     dev: false
 
-  /mqtt-packet@6.10.0:
-    resolution: {integrity: sha512-ja8+mFKIHdB1Tpl6vac+sktqy3gA8t9Mduom1BA75cI+R9AHnZOiaBQwpGiWnaVJLDGRdNhQmFaAqd7tkKSMGA==}
+  /jsdom@20.0.2:
+    resolution: {integrity: sha512-AHWa+QO/cgRg4N+DsmHg1Y7xnz+8KU3EflM0LVDTdmrYOc1WWTSkOjtpUveQH+1Bqd5rtcVnb/DuxV/UjDO4rA==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      canvas: ^2.5.0
+    peerDependenciesMeta:
+      canvas:
+        optional: true
     dependencies:
-      bl: 4.1.0
-      debug: 4.3.4(supports-color@8.1.1)
-      process-nextick-args: 2.0.1
+      abab: 2.0.6
+      acorn: 8.11.2
+      acorn-globals: 7.0.1
+      cssom: 0.5.0
+      cssstyle: 2.3.0
+      data-urls: 3.0.2
+      decimal.js: 10.4.3
+      domexception: 4.0.0
+      escodegen: 2.0.0
+      form-data: 4.0.0
+      html-encoding-sniffer: 3.0.0
+      http-proxy-agent: 5.0.0
+      https-proxy-agent: 5.0.1
+      is-potential-custom-element-name: 1.0.1
+      nwsapi: 2.2.2
+      parse5: 7.1.2
+      saxes: 6.0.0
+      symbol-tree: 3.2.4
+      tough-cookie: 4.1.3
+      w3c-xmlserializer: 3.0.0
+      webidl-conversions: 7.0.0
+      whatwg-encoding: 2.0.0
+      whatwg-mimetype: 3.0.0
+      whatwg-url: 11.0.0
+      ws: 8.14.2
+      xml-name-validator: 4.0.0
     transitivePeerDependencies:
+      - bufferutil
       - supports-color
-    dev: false
+      - utf-8-validate
+    dev: true
 
-  /mqtt@4.2.6:
-    resolution: {integrity: sha512-GpxVObyOzL0CGPBqo6B04GinN8JLk12NRYAIkYvARd9ZCoJKevvOyCaWK6bdK/kFSDj3LPDnCsJbezzNlsi87Q==}
-    engines: {node: '>=10.0.0'}
-    hasBin: true
+  /jsdom@23.0.1:
+    resolution: {integrity: sha512-2i27vgvlUsGEBO9+/kJQRbtqtm+191b5zAZrU/UezVmnC2dlDAFLgDYJvAEi94T4kjsRKkezEtLQTgsNEsW2lQ==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      canvas: ^2.11.2
+    peerDependenciesMeta:
+      canvas:
+        optional: true
     dependencies:
-      commist: 1.1.0
-      concat-stream: 2.0.0
-      debug: 4.3.4(supports-color@8.1.1)
-      duplexify: 4.1.2
-      help-me: 1.1.0
-      inherits: 2.0.4
-      minimist: 1.2.7
-      mqtt-packet: 6.10.0
-      pump: 3.0.0
-      readable-stream: 3.6.0
-      reinterval: 1.1.0
-      split2: 3.2.2
-      ws: 7.5.9
-      xtend: 4.0.2
+      cssstyle: 3.0.0
+      data-urls: 5.0.0
+      decimal.js: 10.4.3
+      form-data: 4.0.0
+      html-encoding-sniffer: 4.0.0
+      http-proxy-agent: 7.0.0
+      https-proxy-agent: 7.0.2
+      is-potential-custom-element-name: 1.0.1
+      nwsapi: 2.2.7
+      parse5: 7.1.2
+      rrweb-cssom: 0.6.0
+      saxes: 6.0.0
+      symbol-tree: 3.2.4
+      tough-cookie: 4.1.3
+      w3c-xmlserializer: 5.0.0
+      webidl-conversions: 7.0.0
+      whatwg-encoding: 3.1.1
+      whatwg-mimetype: 4.0.0
+      whatwg-url: 14.0.0
+      ws: 8.14.2
+      xml-name-validator: 5.0.0
     transitivePeerDependencies:
       - bufferutil
       - supports-color
       - utf-8-validate
-    dev: false
-
-  /mri@1.2.0:
-    resolution: {integrity: sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==}
-    engines: {node: '>=4'}
     dev: true
 
-  /ms@2.0.0:
-    resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==}
-
-  /ms@2.1.1:
-    resolution: {integrity: sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==}
+  /jsesc@0.5.0:
+    resolution: {integrity: sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==}
+    hasBin: true
     dev: true
 
-  /ms@2.1.2:
-    resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==}
-
-  /ms@2.1.3:
-    resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
+  /jsesc@2.5.2:
+    resolution: {integrity: sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==}
+    engines: {node: '>=4'}
+    hasBin: true
 
-  /msgpackr-extract@2.2.0:
-    resolution: {integrity: sha512-0YcvWSv7ZOGl9Od6Y5iJ3XnPww8O7WLcpYMDwX+PAA/uXLDtyw94PJv9GLQV/nnp3cWlDhMoyKZIQLrx33sWog==}
+  /jsesc@3.0.2:
+    resolution: {integrity: sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==}
+    engines: {node: '>=6'}
     hasBin: true
-    dependencies:
-      node-gyp-build-optional-packages: 5.0.3
-    optionalDependencies:
-      '@msgpackr-extract/msgpackr-extract-darwin-arm64': 2.2.0
-      '@msgpackr-extract/msgpackr-extract-darwin-x64': 2.2.0
-      '@msgpackr-extract/msgpackr-extract-linux-arm': 2.2.0
-      '@msgpackr-extract/msgpackr-extract-linux-arm64': 2.2.0
-      '@msgpackr-extract/msgpackr-extract-linux-x64': 2.2.0
-      '@msgpackr-extract/msgpackr-extract-win32-x64': 2.2.0
-    dev: false
-    optional: true
 
-  /msgpackr@1.8.1:
-    resolution: {integrity: sha512-05fT4J8ZqjYlR4QcRDIhLCYKUOHXk7C/xa62GzMKj74l3up9k2QZ3LgFc6qWdsPHl91QA2WLWqWc8b8t7GLNNw==}
-    optionalDependencies:
-      msgpackr-extract: 2.2.0
+  /json-bigint@1.0.0:
+    resolution: {integrity: sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==}
+    dependencies:
+      bignumber.js: 9.1.1
     dev: false
 
-  /mssql@8.1.4:
-    resolution: {integrity: sha512-nqkYYehETWVvFLB9zAGJV2kegOsdtLjUnkHA52aFhlE0ZIoOXC3BL8pLERwFicFypM4i3DX1hYeuM726EEIxjQ==}
-    engines: {node: '>=10'}
+  /json-diff@1.0.6:
+    resolution: {integrity: sha512-tcFIPRdlc35YkYdGxcamJjllUhXWv4n2rK9oJ2RsAzV4FBkuV4ojKEDgcZ+kpKxDmJKv+PFK65+1tVVOnSeEqA==}
     hasBin: true
     dependencies:
-      '@tediousjs/connection-string': 0.3.0
-      commander: 9.4.1
-      debug: 4.3.4(supports-color@8.1.1)
-      rfdc: 1.3.0
-      tarn: 3.0.2
-      tedious: 14.7.0
-    transitivePeerDependencies:
-      - supports-color
+      '@ewoudenberg/difflib': 0.1.0
+      colors: 1.4.0
+      dreamopt: 0.8.0
     dev: false
 
-  /muggle-string@0.1.0:
-    resolution: {integrity: sha512-Tr1knR3d2mKvvWthlk7202rywKbiOm4rVFLsfAaSIhJ6dt9o47W4S+JMtWhd/PW9Wrdew2/S2fSvhz3E2gkfEg==}
-    dev: true
+  /json-parse-even-better-errors@2.3.1:
+    resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==}
 
-  /multer@1.4.5-lts.1:
-    resolution: {integrity: sha512-ywPWvcDMeH+z9gQq5qYHCCy+ethsk4goepZ45GLD63fOu0YcNecQxi64nDs3qluZB+murG3/D4dJ7+dGctcCQQ==}
-    engines: {node: '>= 6.0.0'}
+  /json-pointer@0.6.2:
+    resolution: {integrity: sha512-vLWcKbOaXlO+jvRy4qNd+TI1QUPZzfJj1tpJ3vAXDych5XJf93ftpUKe5pKCrzyIIwgBJcOcCVRUfqQP25afBw==}
     dependencies:
-      append-field: 1.0.0
-      busboy: 1.6.0
-      concat-stream: 1.6.2
-      mkdirp: 0.5.6
-      object-assign: 4.1.1
-      type-is: 1.6.18
-      xtend: 4.0.2
-    dev: false
-
-  /mute-stdout@1.0.1:
-    resolution: {integrity: sha512-kDcwXR4PS7caBpuRYYBUz9iVixUk3anO3f5OYFiIPwK/20vCzKCHyKoulbiDY1S53zD2bxUpxN/IJ+TnXjfvxg==}
-    engines: {node: '>= 0.10'}
-    dev: true
-
-  /mute-stream@0.0.8:
-    resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
-    dev: false
-
-  /mylas@2.1.13:
-    resolution: {integrity: sha512-+MrqnJRtxdF+xngFfUUkIMQrUUL0KsxbADUkn23Z/4ibGg192Q+z+CQyiYwvWTsYjJygmMR8+w3ZDa98Zh6ESg==}
-    engines: {node: '>=12.0.0'}
+      foreach: 2.0.6
     dev: true
 
-  /mysql2@2.3.3:
-    resolution: {integrity: sha512-wxJUev6LgMSgACDkb/InIFxDprRa6T95+VEoR+xPvtngtccNH2dGjEB/fVZ8yg1gWv1510c9CvXuJHi5zUm0ZA==}
-    engines: {node: '>= 8.0'}
+  /json-schema-compare@0.2.2:
+    resolution: {integrity: sha512-c4WYmDKyJXhs7WWvAWm3uIYnfyWFoIp+JEoX34rctVvEkMYCPGhXtvmFFXiffBbxfZsvQ0RNnV5H7GvDF5HCqQ==}
     dependencies:
-      denque: 2.1.0
-      generate-function: 2.3.1
-      iconv-lite: 0.6.3
-      long: 4.0.0
-      lru-cache: 6.0.0
-      named-placeholders: 1.1.2
-      seq-queue: 0.0.5
-      sqlstring: 2.3.3
+      lodash: 4.17.21
     dev: false
 
-  /mz@2.7.0:
-    resolution: {integrity: sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==}
+  /json-schema-merge-allof@0.8.1:
+    resolution: {integrity: sha512-CTUKmIlPJbsWfzRRnOXz+0MjIqvnleIXwFTzz+t9T86HnYX/Rozria6ZVGLktAU9e+NygNljveP+yxqtQp/Q4w==}
+    engines: {node: '>=12.0.0'}
     dependencies:
-      any-promise: 1.3.0
-      object-assign: 4.1.1
-      thenify-all: 1.6.0
+      compute-lcm: 1.1.2
+      json-schema-compare: 0.2.2
+      lodash: 4.17.21
     dev: false
 
-  /named-placeholders@1.1.2:
-    resolution: {integrity: sha512-wiFWqxoLL3PGVReSZpjLVxyJ1bRqe+KKJVbr4hGs1KWfTZTQyezHFBbuKj9hsizHyGV2ne7EMjHdxEGAybD5SA==}
-    engines: {node: '>=6.0.0'}
-    dependencies:
-      lru-cache: 4.1.5
+  /json-schema-to-zod@2.0.14:
+    resolution: {integrity: sha512-Pp9wg1/AcMw5KA1RA7t6ybUTIes1yX0vp8PeE48cPnddHb+ZZWbAKPaFXVf4Pif4XSbo9u9i/hIzBcS1UHK/TA==}
+    hasBin: true
     dev: false
 
-  /nan@2.17.0:
-    resolution: {integrity: sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==}
-    dev: false
-    optional: true
+  /json-schema-traverse@0.4.1:
+    resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==}
 
-  /nanoclone@0.2.1:
-    resolution: {integrity: sha512-wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA==}
-    dev: false
+  /json-schema-traverse@1.0.0:
+    resolution: {integrity: sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==}
 
-  /nanoid@3.3.4:
-    resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
-    engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
-    hasBin: true
+  /json-schema@0.4.0:
+    resolution: {integrity: sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==}
 
-  /nanomatch@1.2.13:
-    resolution: {integrity: sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      arr-diff: 4.0.0
-      array-unique: 0.3.2
-      define-property: 2.0.2
-      extend-shallow: 3.0.2
-      fragment-cache: 0.2.1
-      is-windows: 1.0.2
-      kind-of: 6.0.3
-      object.pick: 1.3.0
-      regex-not: 1.0.2
-      snapdragon: 0.8.2
-      to-regex: 3.0.2
-    transitivePeerDependencies:
-      - supports-color
+  /json-stable-stringify-without-jsonify@1.0.1:
+    resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==}
     dev: true
 
-  /native-duplexpair@1.0.0:
-    resolution: {integrity: sha512-E7QQoM+3jvNtlmyfqRZ0/U75VFgCls+fSkbml2MpgWkWyz3ox8Y58gNhfuziuQYGNNQAbFZJQck55LHCnCK6CA==}
-    dev: false
+  /json-stringify-safe@5.0.1:
+    resolution: {integrity: sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==}
+
+  /json5@2.2.3:
+    resolution: {integrity: sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==}
+    engines: {node: '>=6'}
+    hasBin: true
 
-  /natural-compare-lite@1.4.0:
-    resolution: {integrity: sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==}
+  /jsonc-parser@3.2.0:
+    resolution: {integrity: sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==}
     dev: true
 
-  /natural-compare@1.4.0:
-    resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}
+  /jsonfile@4.0.0:
+    resolution: {integrity: sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==}
+    optionalDependencies:
+      graceful-fs: 4.2.11
     dev: true
 
-  /natural-orderby@2.0.3:
-    resolution: {integrity: sha512-p7KTHxU0CUrcOXe62Zfrb5Z13nLvPhSWR/so3kFulUQU0sgUll2Z0LwpsLN351eOOD+hRGu/F1g+6xDfPeD++Q==}
+  /jsonfile@6.1.0:
+    resolution: {integrity: sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==}
+    dependencies:
+      universalify: 2.0.0
+    optionalDependencies:
+      graceful-fs: 4.2.11
+    dev: true
 
-  /nearley@2.20.1:
-    resolution: {integrity: sha512-+Mc8UaAebFzgV+KpI5n7DasuuQCHA89dmwm7JXw3TV43ukfNQ9DnBH3Mdb2g/I4Fdxc26pwimBWvjIw0UAILSQ==}
-    hasBin: true
+  /jsonpath@1.1.1:
+    resolution: {integrity: sha512-l6Cg7jRpixfbgoWgkrl77dgEj8RPvND0wMH6TwQmi9Qs4TFfS9u5cUFnbeKTwj5ga5Y3BTGGNI28k117LJ009w==}
     dependencies:
-      commander: 2.20.3
-      moo: 0.5.2
-      railroad-diagrams: 1.0.0
-      randexp: 0.4.6
+      esprima: 1.2.2
+      static-eval: 2.0.2
+      underscore: 1.12.1
     dev: false
 
-  /negotiator@0.6.3:
-    resolution: {integrity: sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==}
-    engines: {node: '>= 0.6'}
-
-  /neo-async@2.6.2:
-    resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
-
-  /netmask@2.0.2:
-    resolution: {integrity: sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==}
-    engines: {node: '>= 0.4.0'}
+  /jsonpointer@5.0.1:
+    resolution: {integrity: sha512-p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ==}
+    engines: {node: '>=0.10.0'}
     dev: false
 
-  /next-tick@1.1.0:
-    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
-    dev: true
-
-  /nice-try@1.0.5:
-    resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
-
-  /no-case@3.0.4:
-    resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
-    dependencies:
-      lower-case: 2.0.2
-      tslib: 2.5.0
+  /jsonschema@1.4.1:
+    resolution: {integrity: sha512-S6cATIPVv1z0IlxdN+zUk5EPjkGCdnhN4wVSBlvoUO1tOLJootbo9CquNJmbIh4yikWHiUedhRYrNPn1arpEmQ==}
+    dev: false
 
-  /nock@13.2.9:
-    resolution: {integrity: sha512-1+XfJNYF1cjGB+TKMWi29eZ0b82QOvQs2YoLNzbpWGqFMtRQHTa57osqdGj4FrFPgkO4D4AZinzUJR9VvW3QUA==}
-    engines: {node: '>= 10.13'}
+  /jsonwebtoken@9.0.2:
+    resolution: {integrity: sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==}
+    engines: {node: '>=12', npm: '>=6'}
     dependencies:
-      debug: 4.3.4(supports-color@8.1.1)
-      json-stringify-safe: 5.0.1
-      lodash: 4.17.21
-      propagate: 2.0.1
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /node-abort-controller@3.0.1:
-    resolution: {integrity: sha512-/ujIVxthRs+7q6hsdjHMaj8hRG9NuWmwrz+JdRwZ14jdFoKSkm+vDsCbF9PLpnSqjaWQJuTmVtcWHNLr+vrOFw==}
+      jws: 3.2.2
+      lodash.includes: 4.3.0
+      lodash.isboolean: 3.0.3
+      lodash.isinteger: 4.0.4
+      lodash.isnumber: 3.0.3
+      lodash.isplainobject: 4.0.6
+      lodash.isstring: 4.0.1
+      lodash.once: 4.1.1
+      ms: 2.1.3
+      semver: 7.6.0
     dev: false
 
-  /node-addon-api@4.3.0:
-    resolution: {integrity: sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ==}
+  /jsprim@1.4.2:
+    resolution: {integrity: sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==}
+    engines: {node: '>=0.6.0'}
+    dependencies:
+      assert-plus: 1.0.0
+      extsprintf: 1.3.0
+      json-schema: 0.4.0
+      verror: 1.10.0
     dev: false
 
-  /node-cleanup@2.1.2:
-    resolution: {integrity: sha512-qN8v/s2PAJwGUtr1/hYTpNKlD6Y9rc4p8KSmJXyGdYGZsDGKXrGThikLFP9OCHFeLeEpQzPwiAtdIvBLqm//Hw==}
-    dev: true
-
-  /node-dir@0.1.17:
-    resolution: {integrity: sha512-tmPX422rYgofd4epzrNoOXiE8XFZYOcCq1vD7MAXCDO+O+zndlA2ztdKKMa+EeuBG5tHETpr4ml4RGgpqDCCAg==}
-    engines: {node: '>= 0.10.5'}
+  /jsprim@2.0.2:
+    resolution: {integrity: sha512-gqXddjPqQ6G40VdnI6T6yObEC+pDNvyP95wdQhkWkg7crHH3km5qP1FsOXEkzEQwnz6gz5qGTn1c2Y52wP3OyQ==}
+    engines: {'0': node >=0.6.0}
     dependencies:
-      minimatch: 3.1.2
+      assert-plus: 1.0.0
+      extsprintf: 1.3.0
+      json-schema: 0.4.0
+      verror: 1.10.0
     dev: true
 
-  /node-ensure@0.0.0:
-    resolution: {integrity: sha512-DRI60hzo2oKN1ma0ckc6nQWlHU69RH6xN0sjQTjMpChPfTYvKZdcQFfdYK2RWbJcKyUizSIy/l8OTGxMAM1QDw==}
+  /jssha@3.3.0:
+    resolution: {integrity: sha512-w9OtT4ALL+fbbwG3gw7erAO0jvS5nfvrukGPMWIAoea359B26ALXGpzy4YJSp9yGnpUvuvOw1nSjSoHDfWSr1w==}
     dev: false
 
-  /node-fetch-h2@2.3.0:
-    resolution: {integrity: sha512-ofRW94Ab0T4AOh5Fk8t0h8OBWrmjb0SSB20xh1H8YnPV9EJ+f5AMoYSUQ2zgJ4Iq2HAK0I2l5/Nequ8YzFS3Hg==}
-    engines: {node: 4.x || >=6.0.0}
-    dependencies:
-      http2-client: 1.3.5
+  /jssha@3.3.1:
+    resolution: {integrity: sha512-VCMZj12FCFMQYcFLPRm/0lOBbLi8uM2BhXPTqw3U4YAfs4AZfiApOoBLoN8cQE60Z50m1MYMTQVCfgF/KaCVhQ==}
     dev: false
 
-  /node-fetch-native@1.0.1:
-    resolution: {integrity: sha512-VzW+TAk2wE4X9maiKMlT+GsPU4OMmR1U9CrHSmd3DFLn2IcZ9VJ6M6BBugGfYUnPCLSYxXdZy17M0BEJyhUTwg==}
-    dev: true
-
-  /node-fetch@2.6.7:
-    resolution: {integrity: sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==}
-    engines: {node: 4.x || >=6.0.0}
-    peerDependencies:
-      encoding: ^0.1.0
-    peerDependenciesMeta:
-      encoding:
-        optional: true
+  /jstransformer@1.0.0:
+    resolution: {integrity: sha512-C9YK3Rf8q6VAPDCCU9fnqo3mAfOH6vUGnMcP4AQAYIEpWtfGLpwOTmZ+igtdK5y+VvI2n3CyYSzy4Qh34eq24A==}
     dependencies:
-      whatwg-url: 5.0.0
+      is-promise: 2.2.2
+      promise: 7.3.1
     dev: true
 
-  /node-fetch@2.6.8:
-    resolution: {integrity: sha512-RZ6dBYuj8dRSfxpUSu+NsdF1dpPpluJxwOp+6IoDp/sH2QNDSvurYsAa+F1WxY2RjA1iP93xhcsUoYbF2XBqVg==}
-    engines: {node: 4.x || >=6.0.0}
-    peerDependencies:
-      encoding: ^0.1.0
-    peerDependenciesMeta:
-      encoding:
-        optional: true
+  /jszip@3.10.1:
+    resolution: {integrity: sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==}
     dependencies:
-      whatwg-url: 5.0.0
-
-  /node-forge@1.3.1:
-    resolution: {integrity: sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==}
-    engines: {node: '>= 6.13.0'}
-
-  /node-gyp-build-optional-packages@5.0.3:
-    resolution: {integrity: sha512-k75jcVzk5wnnc/FMxsf4udAoTEUv2jY3ycfdSd3yWu6Cnd1oee6/CfZJApyscA4FJOmdoixWwiwOyf16RzD5JA==}
-    hasBin: true
+      lie: 3.3.0
+      pako: 1.0.11
+      readable-stream: 2.3.7
+      setimmediate: 1.0.5
     dev: false
-    optional: true
 
-  /node-gyp@8.4.1:
-    resolution: {integrity: sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w==}
-    engines: {node: '>= 10.12.0'}
-    hasBin: true
+  /jwa@1.4.1:
+    resolution: {integrity: sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==}
     dependencies:
-      env-paths: 2.2.1
-      glob: 7.2.3
-      graceful-fs: 4.2.10
-      make-fetch-happen: 9.1.0
-      nopt: 5.0.0
-      npmlog: 6.0.2
-      rimraf: 3.0.2
-      semver: 7.3.8
-      tar: 6.1.13
-      which: 2.0.2
-    transitivePeerDependencies:
-      - bluebird
-      - supports-color
+      buffer-equal-constant-time: 1.0.1
+      ecdsa-sig-formatter: 1.0.11
+      safe-buffer: 5.2.1
     dev: false
-    optional: true
 
-  /node-html-markdown@1.2.0:
-    resolution: {integrity: sha512-mGA53bSqo7j62PjmMuFPdO0efNT9pqiGYhQTNVCWkY7PdduRIECJF7n7NOrr5cb+d/js1GdYRLpoTYDwawRk6A==}
-    engines: {node: '>=10.0.0'}
+  /jwa@2.0.0:
+    resolution: {integrity: sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==}
     dependencies:
-      node-html-parser: 5.4.2
+      buffer-equal-constant-time: 1.0.1
+      ecdsa-sig-formatter: 1.0.11
+      safe-buffer: 5.2.1
     dev: false
 
-  /node-html-parser@5.4.2:
-    resolution: {integrity: sha512-RaBPP3+51hPne/OolXxcz89iYvQvKOydaqoePpOgXcrOKZhjVIzmpKZz+Hd/RBO2/zN2q6CNJhQzucVz+u3Jyw==}
+  /jws@3.2.2:
+    resolution: {integrity: sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==}
     dependencies:
-      css-select: 4.3.0
-      he: 1.2.0
+      jwa: 1.4.1
+      safe-buffer: 5.2.1
     dev: false
 
-  /node-int64@0.4.0:
-    resolution: {integrity: sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==}
-    dev: true
+  /jws@4.0.0:
+    resolution: {integrity: sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==}
+    dependencies:
+      jwa: 2.0.0
+      safe-buffer: 5.2.1
+    dev: false
 
-  /node-machine-id@1.1.12:
-    resolution: {integrity: sha512-QNABxbrPa3qEIfrE6GOJ7BYIuignnJw7iQ2YPbc3Nla1HzRJjXzZOiikfF8m7eAMfichLt3M4VgLOetqgDmgGQ==}
+  /kafkajs@1.16.0:
+    resolution: {integrity: sha512-+Rcfu2hyQ/jv5skqRY8xA7Ra+mmRkDAzCaLDYbkGtgsNKpzxPWiLbk8ub0dgr4EbWrN1Zb4BCXHUkD6+zYfdWg==}
+    engines: {node: '>=10.13.0'}
     dev: false
 
-  /node-notifier@10.0.1:
-    resolution: {integrity: sha512-YX7TSyDukOZ0g+gmzjB6abKu+hTGvO8+8+gIFDsRCU2t8fLV/P2unmt+LGFaIa4y64aX98Qksa97rgz4vMNeLQ==}
-    dependencies:
-      growly: 1.3.0
-      is-wsl: 2.2.0
-      semver: 7.3.8
-      shellwords: 0.1.1
-      uuid: 8.3.2
-      which: 2.0.2
+  /kind-of@6.0.3:
+    resolution: {integrity: sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==}
+    engines: {node: '>=0.10.0'}
     dev: true
 
-  /node-readfiles@0.2.0:
-    resolution: {integrity: sha512-SU00ZarexNlE4Rjdm83vglt5Y9yiQ+XI1XpflWlb7q7UTN1JUItm69xMeiQCTxtTfnzt+83T8Cx+vI2ED++VDA==}
+  /klaw@3.0.0:
+    resolution: {integrity: sha512-0Fo5oir+O9jnXu5EefYbVK+mHMBeEVEy2cmctR1O1NECcCkPRreJKrS6Qt/j3KC2C148Dfo9i3pCmCMsdqGr0g==}
     dependencies:
-      es6-promise: 3.3.1
+      graceful-fs: 4.2.11
     dev: false
 
-  /node-releases@2.0.8:
-    resolution: {integrity: sha512-dFSmB8fFHEH/s81Xi+Y/15DQY6VHW81nXRj86EMSL3lmuTmK1e+aT4wrFCkTbm+gSwkw4KpX+rT/pMM2c1mF+A==}
-    dev: true
+  /kleur@3.0.3:
+    resolution: {integrity: sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==}
+    engines: {node: '>=6'}
 
-  /node-rsa@1.1.1:
-    resolution: {integrity: sha512-Jd4cvbJMryN21r5HgxQOpMEqv+ooke/korixNNK3mGqfGJmy0M77WDDzo/05969+OkMy3XW1UuZsSmW9KQm7Fw==}
-    dependencies:
-      asn1: 0.2.6
+  /kolorist@1.8.0:
+    resolution: {integrity: sha512-Y+60/zizpJ3HRH8DCss+q95yr6145JXZo46OTpFvDZWLfRCE4qChOyk1b26nMaNpfHHgxagk9dXT5OP0Tfe+dQ==}
+    dev: true
 
-  /node-ssh@12.0.5:
-    resolution: {integrity: sha512-uN2GTGdBRUUKkZmcNBr9OM+xKL6zq74emnkSyb1TshBdVWegj3boue6QallQeqZzo7YGVheP5gAovUL+8hZSig==}
-    engines: {node: '>= 10'}
-    dependencies:
-      is-stream: 2.0.1
-      make-dir: 3.1.0
-      sb-promise-queue: 2.1.0
-      sb-scandir: 3.1.0
-      shell-escape: 0.2.0
-      ssh2: 1.11.0
+  /kuler@2.0.0:
+    resolution: {integrity: sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A==}
     dev: false
 
-  /nodeify@1.0.1:
-    resolution: {integrity: sha512-n7C2NyEze8GCo/z73KdbjRsBiLbv6eBn1FxwYKQ23IqGo7pQY3mhQan61Sv7eEDJCiyUjTVrVkXTzJCo1dW7Aw==}
+  /langchain@0.1.36(@aws-sdk/client-bedrock-runtime@3.549.0)(@aws-sdk/credential-provider-node@3.549.0)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@0.2.1)(@huggingface/inference@2.6.4)(@pinecone-database/pinecone@2.2.0)(@qdrant/js-client-rest@1.7.0)(@supabase/supabase-js@2.38.5)(@xata.io/client@0.28.0)(cohere-ai@6.2.2)(d3-dsv@2.0.0)(epub2@3.0.2)(html-to-text@9.0.5)(lodash@4.17.21)(mammoth@1.6.0)(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12):
+    resolution: {integrity: sha512-NTbnCL/jKWIeEI//Nm1oG8nhW3vkYWvEMr1MPotmTThTfeKfO87eV/OAzAyh6Ruy6GFs/qofRgQZGIe6XvXTNQ==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      '@aws-sdk/client-s3': ^3.310.0
+      '@aws-sdk/client-sagemaker-runtime': ^3.310.0
+      '@aws-sdk/client-sfn': ^3.310.0
+      '@aws-sdk/credential-provider-node': ^3.388.0
+      '@azure/storage-blob': ^12.15.0
+      '@gomomento/sdk': ^1.51.1
+      '@gomomento/sdk-core': ^1.51.1
+      '@gomomento/sdk-web': ^1.51.1
+      '@google-ai/generativelanguage': ^0.2.1
+      '@google-cloud/storage': ^6.10.1 || ^7.7.0
+      '@mendable/firecrawl-js': ^0.0.13
+      '@notionhq/client': ^2.2.10
+      '@pinecone-database/pinecone': '*'
+      '@supabase/supabase-js': ^2.10.0
+      '@vercel/kv': ^0.2.3
+      '@xata.io/client': ^0.28.0
+      apify-client: ^2.7.1
+      assemblyai: ^4.0.0
+      axios: 1.6.7
+      cheerio: ^1.0.0-rc.12
+      chromadb: '*'
+      convex: ^1.3.1
+      couchbase: ^4.3.0
+      d3-dsv: ^2.0.0
+      epub2: ^3.0.1
+      faiss-node: '*'
+      fast-xml-parser: '*'
+      google-auth-library: ^8.9.0
+      handlebars: ^4.7.8
+      html-to-text: ^9.0.5
+      ignore: ^5.2.0
+      ioredis: ^5.3.2
+      jsdom: '*'
+      mammoth: ^1.6.0
+      mongodb: '>=5.2.0'
+      node-llama-cpp: '*'
+      notion-to-md: ^3.1.0
+      officeparser: ^4.0.4
+      pdf-parse: 1.1.1
+      peggy: ^3.0.2
+      playwright: ^1.32.1
+      puppeteer: ^19.7.2
+      pyodide: ^0.24.1
+      redis: ^4.6.4
+      sonix-speech-recognition: ^2.1.1
+      srt-parser-2: ^1.2.3
+      typeorm: ^0.3.12
+      weaviate-ts-client: '*'
+      web-auth-library: ^1.0.3
+      ws: ^8.14.2
+      youtube-transcript: ^1.0.6
+      youtubei.js: ^9.1.0
+    peerDependenciesMeta:
+      '@aws-sdk/client-s3':
+        optional: true
+      '@aws-sdk/client-sagemaker-runtime':
+        optional: true
+      '@aws-sdk/client-sfn':
+        optional: true
+      '@aws-sdk/credential-provider-node':
+        optional: true
+      '@azure/storage-blob':
+        optional: true
+      '@gomomento/sdk':
+        optional: true
+      '@gomomento/sdk-core':
+        optional: true
+      '@gomomento/sdk-web':
+        optional: true
+      '@google-ai/generativelanguage':
+        optional: true
+      '@google-cloud/storage':
+        optional: true
+      '@mendable/firecrawl-js':
+        optional: true
+      '@notionhq/client':
+        optional: true
+      '@pinecone-database/pinecone':
+        optional: true
+      '@supabase/supabase-js':
+        optional: true
+      '@vercel/kv':
+        optional: true
+      '@xata.io/client':
+        optional: true
+      apify-client:
+        optional: true
+      assemblyai:
+        optional: true
+      axios:
+        optional: true
+      cheerio:
+        optional: true
+      chromadb:
+        optional: true
+      convex:
+        optional: true
+      couchbase:
+        optional: true
+      d3-dsv:
+        optional: true
+      epub2:
+        optional: true
+      faiss-node:
+        optional: true
+      fast-xml-parser:
+        optional: true
+      google-auth-library:
+        optional: true
+      handlebars:
+        optional: true
+      html-to-text:
+        optional: true
+      ignore:
+        optional: true
+      ioredis:
+        optional: true
+      jsdom:
+        optional: true
+      mammoth:
+        optional: true
+      mongodb:
+        optional: true
+      node-llama-cpp:
+        optional: true
+      notion-to-md:
+        optional: true
+      officeparser:
+        optional: true
+      pdf-parse:
+        optional: true
+      peggy:
+        optional: true
+      playwright:
+        optional: true
+      puppeteer:
+        optional: true
+      pyodide:
+        optional: true
+      redis:
+        optional: true
+      sonix-speech-recognition:
+        optional: true
+      srt-parser-2:
+        optional: true
+      typeorm:
+        optional: true
+      weaviate-ts-client:
+        optional: true
+      web-auth-library:
+        optional: true
+      ws:
+        optional: true
+      youtube-transcript:
+        optional: true
+      youtubei.js:
+        optional: true
+    dependencies:
+      '@anthropic-ai/sdk': 0.9.1
+      '@aws-sdk/credential-provider-node': 3.549.0
+      '@google-ai/generativelanguage': 0.2.1
+      '@langchain/community': 0.0.53(@aws-sdk/client-bedrock-runtime@3.549.0)(@aws-sdk/credential-provider-node@3.549.0)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@0.2.1)(@huggingface/inference@2.6.4)(@pinecone-database/pinecone@2.2.0)(@qdrant/js-client-rest@1.7.0)(@supabase/supabase-js@2.38.5)(@xata.io/client@0.28.0)(cohere-ai@6.2.2)(html-to-text@9.0.5)(lodash@4.17.21)(pg@8.11.3)(redis@4.6.12)
+      '@langchain/core': 0.1.61
+      '@langchain/openai': 0.0.28
+      '@langchain/textsplitters': 0.0.0
+      '@pinecone-database/pinecone': 2.2.0
+      '@supabase/supabase-js': 2.38.5
+      '@xata.io/client': 0.28.0(typescript@5.4.2)
+      binary-extensions: 2.2.0
+      d3-dsv: 2.0.0
+      epub2: 3.0.2(ts-toolbelt@9.6.0)
+      html-to-text: 9.0.5
+      js-tiktoken: 1.0.8
+      js-yaml: 4.1.0
+      jsonpointer: 5.0.1
+      langchainhub: 0.0.8
+      langsmith: 0.1.12
+      mammoth: 1.6.0
+      ml-distance: 4.0.1
+      openapi-types: 12.1.3
+      p-retry: 4.6.2
+      pdf-parse: 1.1.1
+      redis: 4.6.12
+      uuid: 9.0.1
+      yaml: 2.3.4
+      zod: 3.22.4
+      zod-to-json-schema: 3.22.4(zod@3.22.4)
+    transitivePeerDependencies:
+      - '@aws-crypto/sha256-js'
+      - '@aws-sdk/client-bedrock-agent-runtime'
+      - '@aws-sdk/client-bedrock-runtime'
+      - '@aws-sdk/client-dynamodb'
+      - '@aws-sdk/client-kendra'
+      - '@aws-sdk/client-lambda'
+      - '@azure/search-documents'
+      - '@clickhouse/client'
+      - '@cloudflare/ai'
+      - '@datastax/astra-db-ts'
+      - '@elastic/elasticsearch'
+      - '@getmetal/metal-sdk'
+      - '@getzep/zep-js'
+      - '@gradientai/nodejs-sdk'
+      - '@huggingface/inference'
+      - '@mozilla/readability'
+      - '@neondatabase/serverless'
+      - '@opensearch-project/opensearch'
+      - '@planetscale/database'
+      - '@premai/prem-sdk'
+      - '@qdrant/js-client-rest'
+      - '@raycast/api'
+      - '@rockset/client'
+      - '@smithy/eventstream-codec'
+      - '@smithy/protocol-http'
+      - '@smithy/signature-v4'
+      - '@smithy/util-utf8'
+      - '@supabase/postgrest-js'
+      - '@tensorflow-models/universal-sentence-encoder'
+      - '@tensorflow/tfjs-converter'
+      - '@tensorflow/tfjs-core'
+      - '@upstash/redis'
+      - '@upstash/vector'
+      - '@vercel/postgres'
+      - '@writerai/writer-sdk'
+      - '@xenova/transformers'
+      - '@zilliz/milvus2-sdk-node'
+      - better-sqlite3
+      - cassandra-driver
+      - cborg
+      - closevector-common
+      - closevector-node
+      - closevector-web
+      - cohere-ai
+      - discord.js
+      - dria
+      - duck-duck-scrape
+      - encoding
+      - firebase-admin
+      - googleapis
+      - hnswlib-node
+      - interface-datastore
+      - it-all
+      - jsonwebtoken
+      - llmonitor
+      - lodash
+      - lunary
+      - mysql2
+      - neo4j-driver
+      - pg
+      - pg-copy-streams
+      - pickleparser
+      - portkey-ai
+      - replicate
+      - supports-color
+      - typesense
+      - usearch
+      - vectordb
+      - voy-search
+    dev: false
+
+  /langchain@0.1.36(@pinecone-database/pinecone@2.1.0)(axios@1.6.7)(handlebars@4.7.8)(ioredis@5.3.2)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mysql2@3.9.7)(pg@8.11.3)(ws@8.14.2):
+    resolution: {integrity: sha512-NTbnCL/jKWIeEI//Nm1oG8nhW3vkYWvEMr1MPotmTThTfeKfO87eV/OAzAyh6Ruy6GFs/qofRgQZGIe6XvXTNQ==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      '@aws-sdk/client-s3': ^3.310.0
+      '@aws-sdk/client-sagemaker-runtime': ^3.310.0
+      '@aws-sdk/client-sfn': ^3.310.0
+      '@aws-sdk/credential-provider-node': ^3.388.0
+      '@azure/storage-blob': ^12.15.0
+      '@gomomento/sdk': ^1.51.1
+      '@gomomento/sdk-core': ^1.51.1
+      '@gomomento/sdk-web': ^1.51.1
+      '@google-ai/generativelanguage': ^0.2.1
+      '@google-cloud/storage': ^6.10.1 || ^7.7.0
+      '@mendable/firecrawl-js': ^0.0.13
+      '@notionhq/client': ^2.2.10
+      '@pinecone-database/pinecone': '*'
+      '@supabase/supabase-js': ^2.10.0
+      '@vercel/kv': ^0.2.3
+      '@xata.io/client': ^0.28.0
+      apify-client: ^2.7.1
+      assemblyai: ^4.0.0
+      axios: 1.6.7
+      cheerio: ^1.0.0-rc.12
+      chromadb: '*'
+      convex: ^1.3.1
+      couchbase: ^4.3.0
+      d3-dsv: ^2.0.0
+      epub2: ^3.0.1
+      faiss-node: '*'
+      fast-xml-parser: '*'
+      google-auth-library: ^8.9.0
+      handlebars: ^4.7.8
+      html-to-text: ^9.0.5
+      ignore: ^5.2.0
+      ioredis: ^5.3.2
+      jsdom: '*'
+      mammoth: ^1.6.0
+      mongodb: '>=5.2.0'
+      node-llama-cpp: '*'
+      notion-to-md: ^3.1.0
+      officeparser: ^4.0.4
+      pdf-parse: 1.1.1
+      peggy: ^3.0.2
+      playwright: ^1.32.1
+      puppeteer: ^19.7.2
+      pyodide: ^0.24.1
+      redis: ^4.6.4
+      sonix-speech-recognition: ^2.1.1
+      srt-parser-2: ^1.2.3
+      typeorm: ^0.3.12
+      weaviate-ts-client: '*'
+      web-auth-library: ^1.0.3
+      ws: ^8.14.2
+      youtube-transcript: ^1.0.6
+      youtubei.js: ^9.1.0
+    peerDependenciesMeta:
+      '@aws-sdk/client-s3':
+        optional: true
+      '@aws-sdk/client-sagemaker-runtime':
+        optional: true
+      '@aws-sdk/client-sfn':
+        optional: true
+      '@aws-sdk/credential-provider-node':
+        optional: true
+      '@azure/storage-blob':
+        optional: true
+      '@gomomento/sdk':
+        optional: true
+      '@gomomento/sdk-core':
+        optional: true
+      '@gomomento/sdk-web':
+        optional: true
+      '@google-ai/generativelanguage':
+        optional: true
+      '@google-cloud/storage':
+        optional: true
+      '@mendable/firecrawl-js':
+        optional: true
+      '@notionhq/client':
+        optional: true
+      '@pinecone-database/pinecone':
+        optional: true
+      '@supabase/supabase-js':
+        optional: true
+      '@vercel/kv':
+        optional: true
+      '@xata.io/client':
+        optional: true
+      apify-client:
+        optional: true
+      assemblyai:
+        optional: true
+      axios:
+        optional: true
+      cheerio:
+        optional: true
+      chromadb:
+        optional: true
+      convex:
+        optional: true
+      couchbase:
+        optional: true
+      d3-dsv:
+        optional: true
+      epub2:
+        optional: true
+      faiss-node:
+        optional: true
+      fast-xml-parser:
+        optional: true
+      google-auth-library:
+        optional: true
+      handlebars:
+        optional: true
+      html-to-text:
+        optional: true
+      ignore:
+        optional: true
+      ioredis:
+        optional: true
+      jsdom:
+        optional: true
+      mammoth:
+        optional: true
+      mongodb:
+        optional: true
+      node-llama-cpp:
+        optional: true
+      notion-to-md:
+        optional: true
+      officeparser:
+        optional: true
+      pdf-parse:
+        optional: true
+      peggy:
+        optional: true
+      playwright:
+        optional: true
+      puppeteer:
+        optional: true
+      pyodide:
+        optional: true
+      redis:
+        optional: true
+      sonix-speech-recognition:
+        optional: true
+      srt-parser-2:
+        optional: true
+      typeorm:
+        optional: true
+      weaviate-ts-client:
+        optional: true
+      web-auth-library:
+        optional: true
+      ws:
+        optional: true
+      youtube-transcript:
+        optional: true
+      youtubei.js:
+        optional: true
     dependencies:
-      is-promise: 1.0.1
-      promise: 1.3.0
-    dev: false
-
-  /nodemailer@6.7.3:
-    resolution: {integrity: sha512-KUdDsspqx89sD4UUyUKzdlUOper3hRkDVkrKh/89G+d9WKsU5ox51NWS4tB1XR5dPUdR4SP0E3molyEfOvSa3g==}
-    engines: {node: '>=6.0.0'}
+      '@anthropic-ai/sdk': 0.9.1
+      '@langchain/community': 0.0.53(@pinecone-database/pinecone@2.1.0)(ioredis@5.3.2)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mysql2@3.9.7)(pg@8.11.3)(ws@8.14.2)
+      '@langchain/core': 0.1.61
+      '@langchain/openai': 0.0.28
+      '@langchain/textsplitters': 0.0.0
+      '@pinecone-database/pinecone': 2.1.0
+      axios: 1.6.7
+      binary-extensions: 2.2.0
+      handlebars: 4.7.8
+      ioredis: 5.3.2
+      js-tiktoken: 1.0.8
+      js-yaml: 4.1.0
+      jsonpointer: 5.0.1
+      langchainhub: 0.0.8
+      langsmith: 0.1.12
+      ml-distance: 4.0.1
+      openapi-types: 12.1.3
+      p-retry: 4.6.2
+      uuid: 9.0.1
+      ws: 8.14.2
+      yaml: 2.3.4
+      zod: 3.22.4
+      zod-to-json-schema: 3.22.4(zod@3.22.4)
+    transitivePeerDependencies:
+      - '@aws-crypto/sha256-js'
+      - '@aws-sdk/client-bedrock-agent-runtime'
+      - '@aws-sdk/client-bedrock-runtime'
+      - '@aws-sdk/client-dynamodb'
+      - '@aws-sdk/client-kendra'
+      - '@aws-sdk/client-lambda'
+      - '@azure/search-documents'
+      - '@clickhouse/client'
+      - '@cloudflare/ai'
+      - '@datastax/astra-db-ts'
+      - '@elastic/elasticsearch'
+      - '@getmetal/metal-sdk'
+      - '@getzep/zep-js'
+      - '@gradientai/nodejs-sdk'
+      - '@huggingface/inference'
+      - '@mozilla/readability'
+      - '@neondatabase/serverless'
+      - '@opensearch-project/opensearch'
+      - '@planetscale/database'
+      - '@premai/prem-sdk'
+      - '@qdrant/js-client-rest'
+      - '@raycast/api'
+      - '@rockset/client'
+      - '@smithy/eventstream-codec'
+      - '@smithy/protocol-http'
+      - '@smithy/signature-v4'
+      - '@smithy/util-utf8'
+      - '@supabase/postgrest-js'
+      - '@tensorflow-models/universal-sentence-encoder'
+      - '@tensorflow/tfjs-converter'
+      - '@tensorflow/tfjs-core'
+      - '@upstash/redis'
+      - '@upstash/vector'
+      - '@vercel/postgres'
+      - '@writerai/writer-sdk'
+      - '@xenova/transformers'
+      - '@zilliz/milvus2-sdk-node'
+      - better-sqlite3
+      - cassandra-driver
+      - cborg
+      - closevector-common
+      - closevector-node
+      - closevector-web
+      - cohere-ai
+      - discord.js
+      - dria
+      - duck-duck-scrape
+      - encoding
+      - firebase-admin
+      - googleapis
+      - hnswlib-node
+      - interface-datastore
+      - it-all
+      - jsonwebtoken
+      - llmonitor
+      - lodash
+      - lunary
+      - mysql2
+      - neo4j-driver
+      - pg
+      - pg-copy-streams
+      - pickleparser
+      - portkey-ai
+      - replicate
+      - supports-color
+      - typesense
+      - usearch
+      - vectordb
+      - voy-search
     dev: false
 
-  /nodemailer@6.8.0:
-    resolution: {integrity: sha512-EjYvSmHzekz6VNkNd12aUqAco+bOkRe3Of5jVhltqKhEsjw/y0PYPJfp83+s9Wzh1dspYAkUW/YNQ350NATbSQ==}
-    engines: {node: '>=6.0.0'}
+  /langchainhub@0.0.8:
+    resolution: {integrity: sha512-Woyb8YDHgqqTOZvWIbm2CaFDGfZ4NTSyXV687AG4vXEfoNo7cGQp7nhl7wL3ehenKWmNEmcxCLgOZzW8jE6lOQ==}
     dev: false
 
-  /nodemon@2.0.20:
-    resolution: {integrity: sha512-Km2mWHKKY5GzRg6i1j5OxOHQtuvVsgskLfigG25yTtbyfRGn/GNvIbRyOf1PSCKJ2aT/58TiuUsuOU5UToVViw==}
-    engines: {node: '>=8.10.0'}
-    hasBin: true
-    dependencies:
-      chokidar: 3.5.2
-      debug: 3.2.7(supports-color@5.5.0)
-      ignore-by-default: 1.0.1
-      minimatch: 3.1.2
-      pstree.remy: 1.1.8
-      semver: 5.7.1
-      simple-update-notifier: 1.0.7
-      supports-color: 5.5.0
-      touch: 3.1.0
-      undefsafe: 2.0.5
-    dev: true
-
-  /nopt@1.0.10:
-    resolution: {integrity: sha512-NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg==}
-    hasBin: true
-    dependencies:
-      abbrev: 1.1.1
-    dev: true
-
-  /nopt@5.0.0:
-    resolution: {integrity: sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==}
-    engines: {node: '>=6'}
-    hasBin: true
+  /langsmith@0.1.12:
+    resolution: {integrity: sha512-ActVB73EPOIXNbtM8Xm+hjX/ZX39EOnNaCOVaRY/LZQiFDH6+ZbPd4hRm6FfwaXe1zhGqP9nKS3JtVTGY1S+VA==}
     dependencies:
-      abbrev: 1.1.1
+      '@types/uuid': 9.0.7
+      commander: 10.0.1
+      p-queue: 6.6.2
+      p-retry: 4.6.2
+      uuid: 9.0.1
     dev: false
 
-  /nopt@6.0.0:
-    resolution: {integrity: sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==}
-    engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
-    hasBin: true
-    dependencies:
-      abbrev: 1.1.1
-    dev: true
-
-  /normalize-package-data@2.5.0:
-    resolution: {integrity: sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==}
-    dependencies:
-      hosted-git-info: 2.8.9
-      resolve: 1.22.1
-      semver: 5.7.1
-      validate-npm-package-license: 3.0.4
+  /lazy-ass@1.6.0:
+    resolution: {integrity: sha512-cc8oEVoctTvsFZ/Oje/kGnHbpWHYBe8IAJe4C0QNc3t8uM/0Y8+erSz/7Y1ALuXTEZTMvxXwO6YbX1ey3ujiZw==}
+    engines: {node: '> 0.8'}
     dev: true
 
-  /normalize-package-data@3.0.3:
-    resolution: {integrity: sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==}
-    engines: {node: '>=10'}
+  /lazy-universal-dotenv@4.0.0:
+    resolution: {integrity: sha512-aXpZJRnTkpK6gQ/z4nk+ZBLd/Qdp118cvPruLSIQzQNRhKwEcdXCOzXuF55VDqIiuAaY3UGZ10DJtvZzDcvsxg==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      hosted-git-info: 4.1.0
-      is-core-module: 2.11.0
-      semver: 7.3.8
-      validate-npm-package-license: 3.0.4
+      app-root-dir: 1.0.2
+      dotenv: 16.3.1
+      dotenv-expand: 10.0.0
     dev: true
 
-  /normalize-path@2.1.1:
-    resolution: {integrity: sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==}
-    engines: {node: '>=0.10.0'}
+  /ldapts@4.2.6:
+    resolution: {integrity: sha512-r1eOj2PtTJi+9aZxLirktoHntuYXlbQD9ZXCjiZmJx0VBQtBcWc+rueqABuh/AxMcFHNPDSJLJAXxoj5VevTwQ==}
+    engines: {node: '>=14'}
     dependencies:
-      remove-trailing-separator: 1.1.0
-
-  /normalize-path@3.0.0:
-    resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==}
-    engines: {node: '>=0.10.0'}
-
-  /normalize-range@0.1.2:
-    resolution: {integrity: sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+      '@types/asn1': 0.2.0
+      '@types/node': 18.16.16
+      '@types/uuid': 9.0.0
+      asn1: 0.2.6
+      debug: 4.3.4(supports-color@8.1.1)
+      strict-event-emitter-types: 2.0.0
+      uuid: 9.0.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: false
 
-  /normalize-wheel@1.0.1:
-    resolution: {integrity: sha512-1OnlAPZ3zgrk8B91HyRj+eVv+kS5u+Z0SCsak6Xil/kmgEia50ga7zfkumayonZrImffAxPU/5WcyGhzetHNPA==}
+  /leac@0.6.0:
+    resolution: {integrity: sha512-y+SqErxb8h7nE/fiEX07jsbuhrpO9lL8eca7/Y1nuWV2moNlXhyd59iDGcRf6moVyDMbmTNzL40SUyrFU/yDpg==}
     dev: false
 
-  /now-and-later@2.0.1:
-    resolution: {integrity: sha512-KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ==}
-    engines: {node: '>= 0.10'}
-    dependencies:
-      once: 1.4.0
-    dev: true
+  /leven@3.1.0:
+    resolution: {integrity: sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==}
+    engines: {node: '>=6'}
 
-  /npm-run-path@2.0.2:
-    resolution: {integrity: sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==}
-    engines: {node: '>=4'}
+  /levn@0.3.0:
+    resolution: {integrity: sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==}
+    engines: {node: '>= 0.8.0'}
     dependencies:
-      path-key: 2.0.1
-    dev: true
+      prelude-ls: 1.1.2
+      type-check: 0.3.2
 
-  /npm-run-path@4.0.1:
-    resolution: {integrity: sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==}
-    engines: {node: '>=8'}
+  /levn@0.4.1:
+    resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
+    engines: {node: '>= 0.8.0'}
     dependencies:
-      path-key: 3.1.1
+      prelude-ls: 1.2.1
+      type-check: 0.4.0
     dev: true
 
-  /npmlog@5.0.1:
-    resolution: {integrity: sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==}
-    dependencies:
-      are-we-there-yet: 2.0.0
-      console-control-strings: 1.1.0
-      gauge: 3.0.2
-      set-blocking: 2.0.0
-
-  /npmlog@6.0.2:
-    resolution: {integrity: sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==}
-    engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
-    dependencies:
-      are-we-there-yet: 3.0.1
-      console-control-strings: 1.1.0
-      gauge: 4.0.4
-      set-blocking: 2.0.0
+  /libbase64@1.2.1:
+    resolution: {integrity: sha512-l+nePcPbIG1fNlqMzrh68MLkX/gTxk/+vdvAb388Ssi7UuUN31MI44w4Yf33mM3Cm4xDfw48mdf3rkdHszLNew==}
     dev: false
-    optional: true
 
-  /nth-check@2.1.1:
-    resolution: {integrity: sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==}
+  /libmime@5.2.0:
+    resolution: {integrity: sha512-X2U5Wx0YmK0rXFbk67ASMeqYIkZ6E5vY7pNWRKtnNzqjvdYYG8xtPDpCnuUEnPU9vlgNev+JoSrcaKSUaNvfsw==}
     dependencies:
-      boolbase: 1.0.0
-
-  /nub@0.0.0:
-    resolution: {integrity: sha512-dK0Ss9C34R/vV0FfYJXuqDAqHlaW9fvWVufq9MmGF2umCuDbd5GRfRD9fpi/LiM0l4ZXf8IBB+RYmZExqCrf0w==}
+      encoding-japanese: 2.0.0
+      iconv-lite: 0.6.3
+      libbase64: 1.2.1
+      libqp: 2.0.1
     dev: false
 
-  /number-is-nan@1.0.1:
-    resolution: {integrity: sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==}
-    engines: {node: '>=0.10.0'}
-    dev: true
-
-  /nunjucks@3.2.3(chokidar@3.5.2):
-    resolution: {integrity: sha512-psb6xjLj47+fE76JdZwskvwG4MYsQKXUtMsPh6U0YMvmyjRtKRFcxnlXGWglNybtNTNVmGdp94K62/+NjF5FDQ==}
-    engines: {node: '>= 6.9.0'}
-    hasBin: true
-    peerDependencies:
-      chokidar: ^3.3.0
-    peerDependenciesMeta:
-      chokidar:
-        optional: true
+  /libmime@5.2.1:
+    resolution: {integrity: sha512-A0z9O4+5q+ZTj7QwNe/Juy1KARNb4WaviO4mYeFC4b8dBT2EEqK2pkM+GC8MVnkOjqhl5nYQxRgnPYRRTNmuSQ==}
     dependencies:
-      a-sync-waterfall: 1.0.1
-      asap: 2.0.6
-      chokidar: 3.5.2
-      commander: 5.1.0
+      encoding-japanese: 2.0.0
+      iconv-lite: 0.6.3
+      libbase64: 1.2.1
+      libqp: 2.0.1
     dev: false
 
-  /nwsapi@2.2.2:
-    resolution: {integrity: sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw==}
-    dev: true
-
-  /oas-kit-common@1.0.8:
-    resolution: {integrity: sha512-pJTS2+T0oGIwgjGpw7sIRU8RQMcUoKCDWFLdBqKB2BNmGpbBMH2sdqAaOXUg8OzonZHU0L7vfJu1mJFEiYDWOQ==}
-    dependencies:
-      fast-safe-stringify: 2.1.1
+  /libphonenumber-js@1.10.14:
+    resolution: {integrity: sha512-McGS7GV/WjJ2KjfOGhJU1oJn29RYeo7Q+RpANRbUNMQ9gj5XArpbjurSuyYPTejFwbaUojstQ4XyWCrAzGOUXw==}
     dev: false
 
-  /oas-linter@3.2.2:
-    resolution: {integrity: sha512-KEGjPDVoU5K6swgo9hJVA/qYGlwfbFx+Kg2QB/kd7rzV5N8N5Mg6PlsoCMohVnQmo+pzJap/F610qTodKzecGQ==}
-    dependencies:
-      '@exodus/schemasafe': 1.0.1
-      should: 13.2.3
-      yaml: 1.10.2
+  /libqp@2.0.1:
+    resolution: {integrity: sha512-Ka0eC5LkF3IPNQHJmYBWljJsw0UvM6j+QdKRbWyCdTmYwvIDE6a7bCm0UkTAL/K+3KXK5qXT/ClcInU01OpdLg==}
     dev: false
 
-  /oas-resolver-browser@2.5.6:
-    resolution: {integrity: sha512-Jw5elT/kwUJrnGaVuRWe1D7hmnYWB8rfDDjBnpQ+RYY/dzAewGXeTexXzt4fGEo6PUE4eqKqPWF79MZxxvMppA==}
-    hasBin: true
+  /lie@3.1.1:
+    resolution: {integrity: sha512-RiNhHysUjhrDQntfYSfY4MU24coXXdEOgw9WGcKHNeEwffDYbF//u87M1EWaMGzuFoSbqW0C9C6lEEhDOAswfw==}
     dependencies:
-      node-fetch-h2: 2.3.0
-      oas-kit-common: 1.0.8
-      path-browserify: 1.0.1
-      reftools: 1.1.9
-      yaml: 1.10.2
-      yargs: 17.6.2
+      immediate: 3.0.6
     dev: false
 
-  /oas-resolver@2.5.6:
-    resolution: {integrity: sha512-Yx5PWQNZomfEhPPOphFbZKi9W93CocQj18NlD2Pa4GWZzdZpSJvYwoiuurRI7m3SpcChrnO08hkuQDL3FGsVFQ==}
-    hasBin: true
+  /lie@3.3.0:
+    resolution: {integrity: sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==}
     dependencies:
-      node-fetch-h2: 2.3.0
-      oas-kit-common: 1.0.8
-      reftools: 1.1.9
-      yaml: 1.10.2
-      yargs: 17.6.2
-    dev: false
-
-  /oas-schema-walker@1.1.5:
-    resolution: {integrity: sha512-2yucenq1a9YPmeNExoUa9Qwrt9RFkjqaMAA1X+U7sbb0AqBeTIdMHky9SQQ6iN94bO5NW0W4TRYXerG+BdAvAQ==}
+      immediate: 3.0.6
     dev: false
 
-  /oas-validator@5.0.8:
-    resolution: {integrity: sha512-cu20/HE5N5HKqVygs3dt94eYJfBi0TsZvPVXDhbXQHiEityDN+RROTleefoKRKKJ9dFAF2JBkDHgvWj0sjKGmw==}
-    dependencies:
-      call-me-maybe: 1.0.1
-      oas-kit-common: 1.0.8
-      oas-linter: 3.2.2
-      oas-resolver: 2.5.6
-      oas-schema-walker: 1.1.5
-      reftools: 1.1.9
-      should: 13.2.3
-      yaml: 1.10.2
-    dev: false
+  /lilconfig@3.0.0:
+    resolution: {integrity: sha512-K2U4W2Ff5ibV7j7ydLr+zLAkIg5JJ4lPn1Ltsdt+Tz/IjQ8buJ55pZAxoP34lqIiwtF9iAvtLv3JGv7CAyAg+g==}
+    engines: {node: '>=14'}
+    dev: true
 
-  /oauth-1.0a@2.2.6:
-    resolution: {integrity: sha512-6bkxv3N4Gu5lty4viIcIAnq5GbxECviMBeKR3WX/q87SPQ8E8aursPZUtsXDnxCs787af09WPRBLqYrf/lwoYQ==}
-    dev: false
+  /lines-and-columns@1.2.4:
+    resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==}
 
-  /oauth-sign@0.9.0:
-    resolution: {integrity: sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==}
+  /linkify-it@3.0.3:
+    resolution: {integrity: sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==}
+    dependencies:
+      uc.micro: 1.0.6
     dev: false
 
-  /object-assign@4.1.1:
-    resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==}
-    engines: {node: '>=0.10.0'}
-
-  /object-copy@0.1.0:
-    resolution: {integrity: sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==}
-    engines: {node: '>=0.10.0'}
+  /linkify-it@4.0.1:
+    resolution: {integrity: sha512-C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw==}
     dependencies:
-      copy-descriptor: 0.1.1
-      define-property: 0.2.5
-      kind-of: 3.2.2
-    dev: true
-
-  /object-hash@3.0.0:
-    resolution: {integrity: sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==}
-    engines: {node: '>= 6'}
+      uc.micro: 1.0.6
     dev: false
 
-  /object-inspect@1.12.3:
-    resolution: {integrity: sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==}
-
-  /object-is@1.1.5:
-    resolution: {integrity: sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==}
-    engines: {node: '>= 0.4'}
+  /linkify-it@5.0.0:
+    resolution: {integrity: sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==}
     dependencies:
-      call-bind: 1.0.2
-      define-properties: 1.1.4
-
-  /object-keys@1.1.1:
-    resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==}
-    engines: {node: '>= 0.4'}
+      uc.micro: 2.0.0
+    dev: false
 
-  /object-treeify@1.1.33:
-    resolution: {integrity: sha512-EFVjAYfzWqWsBMRHPMAXLCDIJnpMhdWAqR7xG6M6a2cs6PMFpl/+Z20w9zDW4vkxOFfddegBKq9Rehd0bxWE7A==}
-    engines: {node: '>= 10'}
+  /liquid-json@0.3.1:
+    resolution: {integrity: sha512-wUayTU8MS827Dam6MxgD72Ui+KOSF+u/eIqpatOtjnvgJ0+mnDq33uC2M7J0tPK+upe/DpUAuK4JUU89iBoNKQ==}
+    engines: {node: '>=4'}
+    dev: false
 
-  /object-visit@1.0.1:
-    resolution: {integrity: sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==}
-    engines: {node: '>=0.10.0'}
+  /listr2@3.14.0(enquirer@2.3.6):
+    resolution: {integrity: sha512-TyWI8G99GX9GjE54cJ+RrNMcIFBfwMPxc3XTFiAYGN4s10hWROGtOg7+O6u6LE3mNkyld7RSLE6nrKBvTfcs3g==}
+    engines: {node: '>=10.0.0'}
+    peerDependencies:
+      enquirer: '>= 2.3.0 < 3'
+    peerDependenciesMeta:
+      enquirer:
+        optional: true
     dependencies:
-      isobject: 3.0.1
+      cli-truncate: 2.1.0
+      colorette: 2.0.19
+      enquirer: 2.3.6
+      log-update: 4.0.0
+      p-map: 4.0.0
+      rfdc: 1.3.0
+      rxjs: 7.8.1
+      through: 2.3.8
+      wrap-ansi: 7.0.0
     dev: true
 
-  /object.assign@4.1.4:
-    resolution: {integrity: sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.2
-      define-properties: 1.1.4
-      has-symbols: 1.0.3
-      object-keys: 1.1.1
+  /loader-runner@4.3.0:
+    resolution: {integrity: sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==}
+    engines: {node: '>=6.11.5'}
+    dev: true
 
-  /object.defaults@1.1.0:
-    resolution: {integrity: sha512-c/K0mw/F11k4dEUBMW8naXUuBuhxRCfG7W+yFy8EcijU/rSmazOUd1XAEEe6bC0OuXY4HUKjTJv7xbxIMqdxrA==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      array-each: 1.0.1
-      array-slice: 1.1.0
-      for-own: 1.0.0
-      isobject: 3.0.1
+  /local-pkg@0.4.3:
+    resolution: {integrity: sha512-SFppqq5p42fe2qcZQqqEOiVRXl+WCP1MdT6k7BDEW1j++sp5fIY+/fdRQitvKgB5BrBcmrs5m/L0v2FrU5MY1g==}
+    engines: {node: '>=14'}
     dev: true
 
-  /object.entries@1.1.5:
-    resolution: {integrity: sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==}
-    engines: {node: '>= 0.4'}
+  /local-pkg@0.5.0:
+    resolution: {integrity: sha512-ok6z3qlYyCDS4ZEU27HaU6x/xZa9Whf8jD4ptH5UZTQYZVYeb9bnZ3ojVhiJNLiXK1Hfc0GNbLXcmZ5plLDDBg==}
+    engines: {node: '>=14'}
     dependencies:
-      call-bind: 1.0.2
-      define-properties: 1.1.4
-      es-abstract: 1.21.1
+      mlly: 1.4.2
+      pkg-types: 1.0.3
     dev: true
 
-  /object.getownpropertydescriptors@2.1.4:
-    resolution: {integrity: sha512-sccv3L/pMModT6dJAYF3fzGMVcb38ysQ0tEE6ixv2yXJDtEIPph268OlAdJj5/qZMZDq2g/jqvwppt36uS/uQQ==}
-    engines: {node: '>= 0.8'}
+  /localforage@1.10.0:
+    resolution: {integrity: sha512-14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg==}
     dependencies:
-      array.prototype.reduce: 1.0.4
-      call-bind: 1.0.2
-      define-properties: 1.1.4
-      es-abstract: 1.21.1
+      lie: 3.1.1
     dev: false
 
-  /object.map@1.0.1:
-    resolution: {integrity: sha512-3+mAJu2PLfnSVGHwIWubpOFLscJANBKuB/6A4CxBstc4aqwQY0FWcsppuy4jU5GSB95yES5JHSI+33AWuS4k6w==}
-    engines: {node: '>=0.10.0'}
+  /locate-path@3.0.0:
+    resolution: {integrity: sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==}
+    engines: {node: '>=6'}
     dependencies:
-      for-own: 1.0.0
-      make-iterator: 1.0.1
+      p-locate: 3.0.0
+      path-exists: 3.0.0
     dev: true
 
-  /object.pick@1.3.0:
-    resolution: {integrity: sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==}
-    engines: {node: '>=0.10.0'}
+  /locate-path@5.0.0:
+    resolution: {integrity: sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==}
+    engines: {node: '>=8'}
     dependencies:
-      isobject: 3.0.1
-    dev: true
+      p-locate: 4.1.0
 
-  /object.reduce@1.0.1:
-    resolution: {integrity: sha512-naLhxxpUESbNkRqc35oQ2scZSJueHGQNUfMW/0U37IgN6tE2dgDWg3whf+NEliy3F/QysrO48XKUz/nGPe+AQw==}
-    engines: {node: '>=0.10.0'}
+  /locate-path@6.0.0:
+    resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==}
+    engines: {node: '>=10'}
     dependencies:
-      for-own: 1.0.0
-      make-iterator: 1.0.1
+      p-locate: 5.0.0
     dev: true
 
-  /object.values@1.1.6:
-    resolution: {integrity: sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.2
-      define-properties: 1.1.4
-      es-abstract: 1.21.1
-    dev: true
+  /lodash-es@4.17.21:
+    resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
+    dev: false
 
-  /on-finished@2.3.0:
-    resolution: {integrity: sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==}
-    engines: {node: '>= 0.8'}
+  /lodash-unified@1.0.3(@types/lodash-es@4.17.6)(lodash-es@4.17.21)(lodash@4.17.21):
+    resolution: {integrity: sha512-WK9qSozxXOD7ZJQlpSqOT+om2ZfcT4yO+03FuzAHD0wF6S0l0090LRPDx3vhTTLZ8cFKpBn+IOcVXK6qOcIlfQ==}
+    peerDependencies:
+      '@types/lodash-es': '*'
+      lodash: '*'
+      lodash-es: '*'
     dependencies:
-      ee-first: 1.1.1
+      '@types/lodash-es': 4.17.6
+      lodash: 4.17.21
+      lodash-es: 4.17.21
     dev: false
 
-  /on-finished@2.4.1:
-    resolution: {integrity: sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==}
-    engines: {node: '>= 0.8'}
-    dependencies:
-      ee-first: 1.1.1
+  /lodash.camelcase@4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
 
-  /on-headers@1.0.2:
-    resolution: {integrity: sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==}
-    engines: {node: '>= 0.8'}
+  /lodash.clonedeep@4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
 
-  /once@1.4.0:
-    resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}
-    dependencies:
-      wrappy: 1.0.2
+  /lodash.debounce@4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: true
 
-  /one-time@1.0.0:
-    resolution: {integrity: sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g==}
-    dependencies:
-      fn.name: 1.1.0
+  /lodash.defaults@4.2.0:
+    resolution: {integrity: sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==}
+
+  /lodash.flatten@4.4.0:
+    resolution: {integrity: sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==}
     dev: false
 
-  /onetime@5.1.2:
-    resolution: {integrity: sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==}
-    engines: {node: '>=6'}
-    dependencies:
-      mimic-fn: 2.1.0
+  /lodash.get@4.4.2:
+    resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
 
-  /ono@7.1.3:
-    resolution: {integrity: sha512-9jnfVriq7uJM4o5ganUY54ntUm+5EK21EGaQ5NWnkWg3zz5ywbbonlBguRcnmF1/HDiIe3zxNxXcO1YPBmPcQQ==}
-    dependencies:
-      '@jsdevtools/ono': 7.1.3
+  /lodash.includes@4.3.0:
+    resolution: {integrity: sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==}
     dev: false
 
-  /open@7.4.2:
-    resolution: {integrity: sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==}
-    engines: {node: '>=8'}
-    dependencies:
-      is-docker: 2.2.1
-      is-wsl: 2.2.0
+  /lodash.isarguments@3.1.0:
+    resolution: {integrity: sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==}
 
-  /open@8.4.0:
-    resolution: {integrity: sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==}
-    engines: {node: '>=12'}
-    dependencies:
-      define-lazy-prop: 2.0.0
-      is-docker: 2.2.1
-      is-wsl: 2.2.0
+  /lodash.isboolean@3.0.3:
+    resolution: {integrity: sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==}
+    dev: false
 
-  /openapi-jsonschema-parameters@12.1.0:
-    resolution: {integrity: sha512-JmJfBHAomeWefA9HAu5Ee9VDtLRG6C2jVwOjHXvBL8BcRw65ibYTmWMvA7MIYbPT1WHe1waUzw4An7a+Nr/RWg==}
-    dependencies:
-      openapi-types: 12.1.0
+  /lodash.isequal@4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: true
+
+  /lodash.isinteger@4.0.4:
+    resolution: {integrity: sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==}
     dev: false
 
-  /openapi-request-validator@12.1.0:
-    resolution: {integrity: sha512-WbcX/mrRGq0GBOqf/Rv4X0vY2WUO1ZmOjrWsnRByEIIJ/6LDWVUqlgEnpVEzpDN8Z2/XoK+YPcFnqIalFmn3sA==}
-    dependencies:
-      ajv: 8.12.0
-      ajv-formats: 2.1.1(ajv@8.12.0)
-      content-type: 1.0.4
-      openapi-jsonschema-parameters: 12.1.0
-      openapi-types: 12.1.0
-      ts-log: 2.2.5
+  /lodash.isnumber@3.0.3:
+    resolution: {integrity: sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==}
     dev: false
 
-  /openapi-to-postmanv2@4.12.0:
-    resolution: {integrity: sha512-bItgckkDx+HDKMxz7LN/V97mor+GbZKui2YaDOWAmKjxeL/7LpvO3hrn7p/MvV8F8hW0lXOEPC256so7a2yk+w==}
-    engines: {node: '>=8'}
-    hasBin: true
-    dependencies:
-      ajv: 8.1.0
-      ajv-formats: 2.1.1(ajv@8.1.0)
-      async: 3.2.4
-      commander: 2.20.3
-      graphlib: 2.1.8
-      js-yaml: 3.14.1
-      json-schema-merge-allof: 0.8.1
-      lodash: 4.17.21
-      oas-resolver-browser: 2.5.6
-      object-hash: 3.0.0
-      path-browserify: 1.0.1
-      postman-collection: 4.1.5
-      swagger2openapi: 7.0.8
-      traverse: 0.6.6
-      yaml: 1.10.2
-    transitivePeerDependencies:
-      - encoding
+  /lodash.isplainobject@4.0.6:
+    resolution: {integrity: sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==}
+    dev: false
+
+  /lodash.isstring@4.0.1:
+    resolution: {integrity: sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==}
     dev: false
 
-  /openapi-types@1.3.5:
-    resolution: {integrity: sha512-11oi4zYorsgvg5yBarZplAqbpev5HkuVNPlZaPTknPDzAynq+lnJdXAmruGWP0s+dNYZS7bjM+xrTpJw7184Fg==}
+  /lodash.memoize@4.1.2:
+    resolution: {integrity: sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==}
     dev: true
 
-  /openapi-types@10.0.0:
-    resolution: {integrity: sha512-Y8xOCT2eiKGYDzMW9R4x5cmfc3vGaaI4EL2pwhDmodWw1HlK18YcZ4uJxc7Rdp7/gGzAygzH9SXr6GKYIXbRcQ==}
+  /lodash.merge@4.6.2:
+    resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
+    dev: true
+
+  /lodash.once@4.1.1:
+    resolution: {integrity: sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==}
+
+  /lodash.orderby@4.6.0:
+    resolution: {integrity: sha512-T0rZxKmghOOf5YPnn8EY5iLYeWCpZq8G41FfqoVHH5QDTAFaghJRmAdLiadEDq+ztgM2q5PjA+Z1fOwGrLgmtg==}
     dev: false
 
-  /openapi-types@12.1.0:
-    resolution: {integrity: sha512-XpeCy01X6L5EpP+6Hc3jWN7rMZJ+/k1lwki/kTmWzbVhdPie3jd5O2ZtedEx8Yp58icJ0osVldLMrTB/zslQXA==}
+  /lodash.set@4.3.2:
+    resolution: {integrity: sha512-4hNPN5jlm/N/HLMCO43v8BXKq9Z7QdAGc/VGrRD61w8gN9g/6jF9A4L1pbUgBLCffi0w9VsXfTOij5x8iTyFvg==}
     dev: false
 
-  /openurl@1.1.1:
-    resolution: {integrity: sha512-d/gTkTb1i1GKz5k3XE3XFV/PxQ1k45zDqGP2OA7YhgsaLoqm6qRvARAZOFer1fcXritWlGBRCu/UgeS4HAnXAA==}
+  /lodash.sortby@4.7.0:
+    resolution: {integrity: sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==}
     dev: false
 
-  /optionator@0.8.3:
-    resolution: {integrity: sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==}
-    engines: {node: '>= 0.8.0'}
-    dependencies:
-      deep-is: 0.1.4
-      fast-levenshtein: 2.0.6
-      levn: 0.3.0
-      prelude-ls: 1.1.2
-      type-check: 0.3.2
-      word-wrap: 1.2.3
+  /lodash.throttle@4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
 
-  /optionator@0.9.1:
-    resolution: {integrity: sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==}
-    engines: {node: '>= 0.8.0'}
-    dependencies:
-      deep-is: 0.1.4
-      fast-levenshtein: 2.0.6
-      levn: 0.4.1
-      prelude-ls: 1.2.1
-      type-check: 0.4.0
-      word-wrap: 1.2.3
+  /lodash.uniq@4.5.0:
+    resolution: {integrity: sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==}
     dev: true
 
-  /ordered-read-streams@1.0.1:
-    resolution: {integrity: sha512-Z87aSjx3r5c0ZB7bcJqIgIRX5bxR7A4aSzvIbaxd0oTkWBCOoKfuGHiKj60CHVUgg1Phm5yMZzBdt8XqRs73Mw==}
-    dependencies:
-      readable-stream: 2.3.7
+  /lodash@4.17.21:
+    resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==}
 
-  /os-locale@1.4.0:
-    resolution: {integrity: sha512-PRT7ZORmwu2MEFt4/fv3Q+mEfN4zetKxufQrkShY2oGvUms9r8otu5HfdyIFHkYXjO7laNsoVGmM2MANfuTA8g==}
-    engines: {node: '>=0.10.0'}
+  /log-symbols@4.1.0:
+    resolution: {integrity: sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==}
+    engines: {node: '>=10'}
     dependencies:
-      lcid: 1.0.0
+      chalk: 4.1.2
+      is-unicode-supported: 0.1.0
     dev: true
 
-  /os-name@1.0.3:
-    resolution: {integrity: sha512-f5estLO2KN8vgtTRaILIgEGBoBrMnZ3JQ7W9TMZCnOIGwHe8TRGSpcagnWDo+Dfhd/z08k9Xe75hvciJJ8Qaew==}
-    engines: {node: '>=0.10.0'}
-    hasBin: true
+  /log-update@4.0.0:
+    resolution: {integrity: sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==}
+    engines: {node: '>=10'}
     dependencies:
-      osx-release: 1.1.0
-      win-release: 1.1.1
-    dev: false
-
-  /os-tmpdir@1.0.2:
-    resolution: {integrity: sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==}
-    engines: {node: '>=0.10.0'}
-    dev: false
-
-  /ospath@1.2.2:
-    resolution: {integrity: sha512-o6E5qJV5zkAbIDNhGSIlyOhScKXgQrSRMilfph0clDfM0nEnBOlKlH4sWDmG95BW/CvwNz0vmm7dJVtU2KlMiA==}
+      ansi-escapes: 4.3.2
+      cli-cursor: 3.1.0
+      slice-ansi: 4.0.0
+      wrap-ansi: 6.2.0
     dev: true
 
-  /osx-release@1.1.0:
-    resolution: {integrity: sha512-ixCMMwnVxyHFQLQnINhmIpWqXIfS2YOXchwQrk+OFzmo6nDjQ0E4KXAyyUh0T0MZgV4bUhkRrAbVqlE4yLVq4A==}
-    engines: {node: '>=0.10.0'}
-    hasBin: true
+  /logform@2.4.2:
+    resolution: {integrity: sha512-W4c9himeAwXEdZ05dQNerhFz2XG80P9Oj0loPUMV23VC2it0orMHQhJm4hdnnor3rd1HsGf6a2lPwBM1zeXHGw==}
     dependencies:
-      minimist: 1.2.7
+      '@colors/colors': 1.5.0
+      fecha: 4.2.3
+      ms: 2.1.3
+      safe-stable-stringify: 2.4.0
+      triple-beam: 1.3.0
     dev: false
 
-  /otpauth@9.1.1:
-    resolution: {integrity: sha512-XhimxmkREwf6GJvV4svS9OVMFJ/qRGz+QBEGwtW5OMf9jZlx9yw25RZMXdrO6r7DHgfIaETJb1lucZXZtn3jgw==}
-    dependencies:
-      jssha: 3.3.0
+  /long@4.0.0:
+    resolution: {integrity: sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==}
     dev: false
 
-  /p-cancelable@2.1.1:
-    resolution: {integrity: sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==}
-    engines: {node: '>=8'}
+  /long@5.2.3:
+    resolution: {integrity: sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==}
     dev: false
 
-  /p-finally@1.0.0:
-    resolution: {integrity: sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==}
-    engines: {node: '>=4'}
-
-  /p-limit@2.3.0:
-    resolution: {integrity: sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==}
-    engines: {node: '>=6'}
-    dependencies:
-      p-try: 2.2.0
-
-  /p-limit@3.1.0:
-    resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==}
-    engines: {node: '>=10'}
+  /loose-envify@1.4.0:
+    resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==}
+    hasBin: true
     dependencies:
-      yocto-queue: 0.1.0
+      js-tokens: 4.0.0
     dev: true
 
-  /p-limit@4.0.0:
-    resolution: {integrity: sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+  /lop@0.4.1:
+    resolution: {integrity: sha512-9xyho9why2A2tzm5aIcMWKvzqKsnxrf9B5I+8O30olh6lQU8PH978LqZoI4++37RBgS1Em5i54v1TFs/3wnmXQ==}
     dependencies:
-      yocto-queue: 1.0.0
-    dev: true
+      duck: 0.1.12
+      option: 0.2.4
+      underscore: 1.13.6
+    dev: false
 
-  /p-locate@3.0.0:
-    resolution: {integrity: sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==}
-    engines: {node: '>=6'}
+  /lossless-json@1.0.5:
+    resolution: {integrity: sha512-RicKUuLwZVNZ6ZdJHgIZnSeA05p8qWc5NW0uR96mpPIjN9WDLUg9+kj1esQU1GkPn9iLZVKatSQK5gyiaFHgJA==}
+    dev: false
+
+  /loupe@2.3.7:
+    resolution: {integrity: sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==}
     dependencies:
-      p-limit: 2.3.0
+      get-func-name: 2.0.2
     dev: true
 
-  /p-locate@4.1.0:
-    resolution: {integrity: sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==}
-    engines: {node: '>=8'}
+  /lower-case@2.0.2:
+    resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      p-limit: 2.3.0
+      tslib: 2.6.2
 
-  /p-locate@5.0.0:
-    resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==}
-    engines: {node: '>=10'}
+  /lru-cache@4.1.5:
+    resolution: {integrity: sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==}
     dependencies:
-      p-limit: 3.1.0
-    dev: true
-
-  /p-map@2.1.0:
-    resolution: {integrity: sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==}
-    engines: {node: '>=6'}
+      pseudomap: 1.0.2
+      yallist: 2.1.2
     dev: false
 
-  /p-map@4.0.0:
-    resolution: {integrity: sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==}
-    engines: {node: '>=10'}
+  /lru-cache@5.1.1:
+    resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==}
     dependencies:
-      aggregate-error: 3.1.0
+      yallist: 3.1.1
 
-  /p-timeout@3.2.0:
-    resolution: {integrity: sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==}
-    engines: {node: '>=8'}
+  /lru-cache@6.0.0:
+    resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==}
+    engines: {node: '>=10'}
     dependencies:
-      p-finally: 1.0.0
+      yallist: 4.0.0
+
+  /lru-cache@7.18.3:
+    resolution: {integrity: sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==}
+    engines: {node: '>=12'}
     dev: false
 
-  /p-try@2.2.0:
-    resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==}
-    engines: {node: '>=6'}
+  /lru-cache@8.0.5:
+    resolution: {integrity: sha512-MhWWlVnuab1RG5/zMRRcVGXZLCXrZTgfwMikgzCegsPnG62yDQo5JnqKkrK4jO5iKqDAZGItAqN5CtKBCBWRUA==}
+    engines: {node: '>=16.14'}
 
-  /pac-proxy-agent@5.0.0:
-    resolution: {integrity: sha512-CcFG3ZtnxO8McDigozwE3AqAw15zDvGH+OjXO4kzf7IkEKkQ4gxQ+3sdF50WmhQ4P/bVusXcqNE2S3XrNURwzQ==}
-    engines: {node: '>= 8'}
-    dependencies:
-      '@tootallnate/once': 1.1.2
-      agent-base: 6.0.2
-      debug: 4.3.4(supports-color@8.1.1)
-      get-uri: 3.0.2
-      http-proxy-agent: 4.0.1
-      https-proxy-agent: 5.0.1
-      pac-resolver: 5.0.1
-      raw-body: 2.5.1
-      socks-proxy-agent: 5.0.1
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
+  /lru-cache@9.1.2:
+    resolution: {integrity: sha512-ERJq3FOzJTxBbFjZ7iDs+NiK4VI9Wz+RdrrAB8dio1oV+YvdPzUEE4QNiT2VD51DkIbCYRUUzCRkssXCHqSnKQ==}
+    engines: {node: 14 || >=16.14}
 
-  /pac-resolver@5.0.1:
-    resolution: {integrity: sha512-cy7u00ko2KVgBAjuhevqpPeHIkCIqPe1v24cydhWjmeuzaBfmUWFCZJ1iAh5TuVzVZoUzXIW7K8sMYOZ84uZ9Q==}
-    engines: {node: '>= 8'}
-    dependencies:
-      degenerator: 3.0.2
-      ip: 1.1.8
-      netmask: 2.0.2
-    dev: false
+  /lunr@2.3.9:
+    resolution: {integrity: sha512-zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow==}
+    dev: true
 
-  /packet-reader@1.0.0:
-    resolution: {integrity: sha512-HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ==}
+  /luxon@3.3.0:
+    resolution: {integrity: sha512-An0UCfG/rSiqtAIiBPO0Y9/zAnHUZxAMiCpTd5h2smgsj7GGmcenvrvww2cqNA8/4A5ZrD1gJpHN2mIHZQF+Mg==}
+    engines: {node: '>=12'}
     dev: false
 
-  /pako@1.0.11:
-    resolution: {integrity: sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==}
+  /luxon@3.4.4:
+    resolution: {integrity: sha512-zobTr7akeGHnv7eBOXcRgMeCP6+uyYsczwmeRCauvpvaAltgNyTbLH/+VaEAPUeWBT+1GuNmz4wC/6jtQzbbVA==}
+    engines: {node: '>=12'}
     dev: false
 
-  /param-case@3.0.4:
-    resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
+  /lz-string@1.5.0:
+    resolution: {integrity: sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==}
+    hasBin: true
+    dev: true
+
+  /magic-string@0.27.0:
+    resolution: {integrity: sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==}
+    engines: {node: '>=12'}
     dependencies:
-      dot-case: 3.0.4
-      tslib: 2.5.0
+      '@jridgewell/sourcemap-codec': 1.4.15
+    dev: true
 
-  /parent-module@1.0.1:
-    resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==}
-    engines: {node: '>=6'}
+  /magic-string@0.30.5:
+    resolution: {integrity: sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==}
+    engines: {node: '>=12'}
     dependencies:
-      callsites: 3.1.0
+      '@jridgewell/sourcemap-codec': 1.4.15
     dev: true
 
-  /parse-filepath@1.0.2:
-    resolution: {integrity: sha512-FwdRXKCohSVeXqwtYonZTXtbGJKrn+HNyWDYVcp5yuJlesTwNH4rsmRZ+GrKAPJ5bLpRxESMeS+Rl0VCHRvB2Q==}
-    engines: {node: '>=0.8'}
+  /magic-string@0.30.8:
+    resolution: {integrity: sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==}
+    engines: {node: '>=12'}
     dependencies:
-      is-absolute: 1.0.0
-      map-cache: 0.2.2
-      path-root: 0.1.1
+      '@jridgewell/sourcemap-codec': 1.4.15
+
+  /magicast@0.3.3:
+    resolution: {integrity: sha512-ZbrP1Qxnpoes8sz47AM0z08U+jW6TyRgZzcWy3Ma3vDhJttwMwAFDMMQFobwdBxByBD46JYmxRzeF7w2+wJEuw==}
+    dependencies:
+      '@babel/parser': 7.24.0
+      '@babel/types': 7.24.0
+      source-map-js: 1.0.2
     dev: true
 
-  /parse-github-url@1.0.2:
-    resolution: {integrity: sha512-kgBf6avCbO3Cn6+RnzRGLkUsv4ZVqv/VfAYkRsyBcgkshNvVBkRn1FEZcW0Jb+npXQWm2vHPnnOqFteZxRRGNw==}
-    engines: {node: '>=0.10.0'}
-    hasBin: true
+  /mailparser@3.6.7:
+    resolution: {integrity: sha512-/3x8HW70DNehw+3vdOPKdlLuxOHoWcGB5jfx5vJ5XUbY9/2jUJbrrhda5Si8Dj/3w08U0y5uGAkqs5+SPTPKoA==}
+    dependencies:
+      encoding-japanese: 2.0.0
+      he: 1.2.0
+      html-to-text: 9.0.5
+      iconv-lite: 0.6.3
+      libmime: 5.2.1
+      linkify-it: 5.0.0
+      mailsplit: 5.4.0
+      nodemailer: 6.9.9
+      tlds: 1.248.0
     dev: false
 
-  /parse-json@2.2.0:
-    resolution: {integrity: sha512-QR/GGaKCkhwk1ePQNYDRKYZ3mwU9ypsKhB0XyFnLQdomyEqk3e8wpW3V5Jp88zbxK4n5ST1nqo+g9juTpownhQ==}
-    engines: {node: '>=0.10.0'}
+  /mailsplit@5.4.0:
+    resolution: {integrity: sha512-wnYxX5D5qymGIPYLwnp6h8n1+6P6vz/MJn5AzGjZ8pwICWssL+CCQjWBIToOVHASmATot4ktvlLo6CyLfOXWYA==}
     dependencies:
-      error-ex: 1.3.2
-    dev: true
+      libbase64: 1.2.1
+      libmime: 5.2.0
+      libqp: 2.0.1
+    dev: false
 
-  /parse-json@4.0.0:
-    resolution: {integrity: sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==}
-    engines: {node: '>=4'}
+  /make-dir@2.1.0:
+    resolution: {integrity: sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==}
+    engines: {node: '>=6'}
     dependencies:
-      error-ex: 1.3.2
-      json-parse-better-errors: 1.0.2
+      pify: 4.0.1
+      semver: 7.6.0
     dev: true
 
-  /parse-json@5.2.0:
-    resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==}
+  /make-dir@3.1.0:
+    resolution: {integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==}
     engines: {node: '>=8'}
     dependencies:
-      '@babel/code-frame': 7.18.6
-      error-ex: 1.3.2
-      json-parse-even-better-errors: 2.3.1
-      lines-and-columns: 1.2.4
-    dev: true
+      semver: 7.6.0
 
-  /parse-node-version@1.0.1:
-    resolution: {integrity: sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==}
-    engines: {node: '>= 0.10'}
+  /make-dir@4.0.0:
+    resolution: {integrity: sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==}
+    engines: {node: '>=10'}
+    dependencies:
+      semver: 7.6.0
     dev: true
 
-  /parse-passwd@1.0.0:
-    resolution: {integrity: sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==}
-    engines: {node: '>=0.10.0'}
+  /make-error@1.3.6:
+    resolution: {integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==}
+    dev: true
 
-  /parse-srcset@1.0.2:
-    resolution: {integrity: sha512-/2qh0lav6CmI15FzA3i/2Bzk2zCgQhGMkvhOhKNcBVQ1ldgpbfiNTVslmooUmWJcADi1f1kIeynbDRVzNlfR6Q==}
+  /make-fetch-happen@9.1.0:
+    resolution: {integrity: sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==}
+    engines: {node: '>= 10'}
+    dependencies:
+      agentkeepalive: 4.2.1
+      cacache: 15.3.0
+      http-cache-semantics: 4.1.1
+      http-proxy-agent: 4.0.1
+      https-proxy-agent: 5.0.1
+      is-lambda: 1.0.1
+      lru-cache: 6.0.0
+      minipass: 3.3.6
+      minipass-collect: 1.0.2
+      minipass-fetch: 1.4.1
+      minipass-flush: 1.0.5
+      minipass-pipeline: 1.2.4
+      negotiator: 0.6.3
+      promise-retry: 2.0.1
+      socks-proxy-agent: 6.2.1
+      ssri: 8.0.1
+    transitivePeerDependencies:
+      - bluebird
+      - supports-color
     dev: false
+    optional: true
 
-  /parse5-htmlparser2-tree-adapter@6.0.1:
-    resolution: {integrity: sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==}
+  /makeerror@1.0.12:
+    resolution: {integrity: sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==}
     dependencies:
-      parse5: 6.0.1
-    dev: false
+      tmpl: 1.0.5
 
-  /parse5@5.1.1:
-    resolution: {integrity: sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==}
+  /mammoth@1.6.0:
+    resolution: {integrity: sha512-jOwbj6BwJzxCf6jr2l1zmSemniIkLnchvELXnDJCANlJawhzyIKObIq48B8kWEPLgUUh57k7FtEO3DHFQMnjMg==}
+    engines: {node: '>=12.0.0'}
+    hasBin: true
+    dependencies:
+      '@xmldom/xmldom': 0.8.6
+      argparse: 1.0.10
+      base64-js: 1.5.1
+      bluebird: 3.4.7
+      dingbat-to-unicode: 1.0.1
+      jszip: 3.10.1
+      lop: 0.4.1
+      path-is-absolute: 1.0.1
+      underscore: 1.13.6
+      xmlbuilder: 10.1.1
     dev: false
 
-  /parse5@6.0.1:
-    resolution: {integrity: sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==}
-    dev: false
+  /map-or-similar@1.5.0:
+    resolution: {integrity: sha512-0aF7ZmVon1igznGI4VS30yugpduQW3y3GkcgGJOp7d8x8QrizhigUxjI/m2UojsXXto+jLAH3KSz+xOJTiORjg==}
+    dev: true
 
-  /parse5@7.1.1:
-    resolution: {integrity: sha512-kwpuwzB+px5WUg9pyK0IcK/shltJN5/OVhQagxhCQNtT9Y9QRZqNY2e1cmbu/paRh5LMnz/oVTVLBpjFmMZhSg==}
-    dependencies:
-      entities: 4.4.0
+  /map-stream@0.1.0:
+    resolution: {integrity: sha512-CkYQrPYZfWnu/DAmVCpTSX/xHpKZ80eKh2lAkyA6AJTef6bW+6JpbQZN5rofum7da+SyN1bi5ctTm+lTfcCW3g==}
     dev: true
 
-  /parseley@0.7.0:
-    resolution: {integrity: sha512-xyOytsdDu077M3/46Am+2cGXEKM9U9QclBDv7fimY7e+BBlxh2JcBp2mgNsmkyA9uvgyTjVzDi7cP1v4hcFxbw==}
-    dependencies:
-      moo: 0.5.2
-      nearley: 2.20.1
+  /mappersmith@2.40.0:
+    resolution: {integrity: sha512-Es99fy0E52fxmhRvCyed7WVlSyuz6ME/wOsRpSmi0GcbMEZ6y5D2GL4+qNGPCc2P270J5yw8L2zg+K4BWACcHg==}
     dev: false
 
-  /parseurl@1.3.3:
-    resolution: {integrity: sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==}
-    engines: {node: '>= 0.8'}
-
-  /pascal-case@3.1.2:
-    resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
-    dependencies:
-      no-case: 3.0.4
-      tslib: 2.5.0
-
-  /pascalcase@0.1.1:
-    resolution: {integrity: sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==}
-    engines: {node: '>=0.10.0'}
+  /mark.js@8.11.1:
+    resolution: {integrity: sha512-1I+1qpDt4idfgLQG+BNWmrqku+7/2bi5nLf4YwF8y8zXvmfiTBY3PV3ZibfrjBueCByROpuBjLLFCajqkgYoLQ==}
     dev: true
 
-  /passport-cookie@1.0.9:
-    resolution: {integrity: sha512-8a6foX2bbGoJzup0RAiNcC2tTqzYS46RQEK3Z4u8p86wesPUjgDaji3C7+5j4TGyCq4ZoOV+3YLw1Hy6cV6kyw==}
-    engines: {node: '>= 0.10.0'}
+  /markdown-it-anchor@8.6.7(@types/markdown-it@12.2.3)(markdown-it@12.3.2):
+    resolution: {integrity: sha512-FlCHFwNnutLgVTflOYHPW2pPcl2AACqVzExlkGQNsi4CJgqOHN7YTgDd4LuhgN1BFO3TS0vLAruV1Td6dwWPJA==}
+    peerDependencies:
+      '@types/markdown-it': '*'
+      markdown-it: '*'
     dependencies:
-      passport-strategy: 1.0.0
+      '@types/markdown-it': 12.2.3
+      markdown-it: 12.3.2
     dev: false
 
-  /passport-jwt@4.0.0:
-    resolution: {integrity: sha512-BwC0n2GP/1hMVjR4QpnvqA61TxenUMlmfNjYNgK0ZAs0HK4SOQkHcSv4L328blNTLtHq7DbmvyNJiH+bn6C5Mg==}
-    dependencies:
-      jsonwebtoken: 9.0.0
-      passport-strategy: 1.0.0
+  /markdown-it-emoji@2.0.2:
+    resolution: {integrity: sha512-zLftSaNrKuYl0kR5zm4gxXjHaOI3FAOEaloKmRA5hijmJZvSjmxcokOLlzycb/HXlUFWzXqpIEoyEMCE4i9MvQ==}
     dev: false
 
-  /passport-strategy@1.0.0:
-    resolution: {integrity: sha512-CB97UUvDKJde2V0KDWWB3lyf6PC3FaZP7YxZ2G8OAtn9p4HI9j9JLP9qjOGZFvyl8uwNT8qM+hGnz/n16NI7oA==}
-    engines: {node: '>= 0.4.0'}
+  /markdown-it-link-attributes@4.0.1:
+    resolution: {integrity: sha512-pg5OK0jPLg62H4k7M9mRJLT61gUp9nvG0XveKYHMOOluASo9OEF13WlXrpAp2aj35LbedAy3QOCgQCw0tkLKAQ==}
     dev: false
 
-  /passport@0.6.0:
-    resolution: {integrity: sha512-0fe+p3ZnrWRW74fe8+SvCyf4a3Pb2/h7gFkQ8yTJpAO50gDzlfjZUZTO1k5Eg9kUct22OxHLqDZoKUWRHOh9ug==}
-    engines: {node: '>= 0.4.0'}
-    dependencies:
-      passport-strategy: 1.0.0
-      pause: 0.0.1
-      utils-merge: 1.0.1
+  /markdown-it-task-lists@2.1.1:
+    resolution: {integrity: sha512-TxFAc76Jnhb2OUu+n3yz9RMu4CwGfaT788br6HhEDlvWfdeJcLUsxk1Hgw2yJio0OXsxv7pyIPmvECY7bMbluA==}
     dev: false
 
-  /password-prompt@1.1.2:
-    resolution: {integrity: sha512-bpuBhROdrhuN3E7G/koAju0WjVw9/uQOG5Co5mokNj0MiOSBVZS1JTwM4zl55hu0WFmIEFvO9cU9sJQiBIYeIA==}
-    dependencies:
-      ansi-escapes: 3.2.0
-      cross-spawn: 6.0.5
-
-  /path-browserify@1.0.1:
-    resolution: {integrity: sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==}
-
-  /path-case@3.0.4:
-    resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
+  /markdown-it@12.3.2:
+    resolution: {integrity: sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==}
+    hasBin: true
     dependencies:
-      dot-case: 3.0.4
-      tslib: 2.5.0
+      argparse: 2.0.1
+      entities: 2.1.0
+      linkify-it: 3.0.3
+      mdurl: 1.0.1
+      uc.micro: 1.0.6
     dev: false
 
-  /path-dirname@1.0.2:
-    resolution: {integrity: sha512-ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q==}
-
-  /path-exists@2.1.0:
-    resolution: {integrity: sha512-yTltuKuhtNeFJKa1PiRzfLAU5182q1y4Eb4XCJ3PBqyzEDkAZRzBrKKBct682ls9reBVHf9udYLN5Nd+K1B9BQ==}
-    engines: {node: '>=0.10.0'}
+  /markdown-it@13.0.1:
+    resolution: {integrity: sha512-lTlxriVoy2criHP0JKRhO2VDG9c2ypWCsT237eDiLqi09rmbKoUetyGHq2uOIRoRS//kfoJckS0eUzzkDR+k2Q==}
+    hasBin: true
     dependencies:
-      pinkie-promise: 2.0.1
-    dev: true
-
-  /path-exists@3.0.0:
-    resolution: {integrity: sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==}
-    engines: {node: '>=4'}
-    dev: true
-
-  /path-exists@4.0.0:
-    resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==}
-    engines: {node: '>=8'}
-
-  /path-is-absolute@1.0.1:
-    resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==}
-    engines: {node: '>=0.10.0'}
-
-  /path-key@2.0.1:
-    resolution: {integrity: sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==}
-    engines: {node: '>=4'}
+      argparse: 2.0.1
+      entities: 3.0.1
+      linkify-it: 4.0.1
+      mdurl: 1.0.1
+      uc.micro: 1.0.6
+    dev: false
 
-  /path-key@3.1.1:
-    resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==}
-    engines: {node: '>=8'}
+  /markdown-to-jsx@7.3.2(react@18.2.0):
+    resolution: {integrity: sha512-B+28F5ucp83aQm+OxNrPkS8z0tMKaeHiy0lHJs3LqCyDQFtWuenaIrkaVTgAm1pf1AU85LXltva86hlaT17i8Q==}
+    engines: {node: '>= 10'}
+    peerDependencies:
+      react: '>= 0.14.0'
+    dependencies:
+      react: 18.2.0
     dev: true
 
-  /path-parse@1.0.7:
-    resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==}
+  /marked@4.3.0:
+    resolution: {integrity: sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A==}
+    engines: {node: '>= 12'}
+    hasBin: true
 
-  /path-root-regex@0.1.2:
-    resolution: {integrity: sha512-4GlJ6rZDhQZFE0DPVKh0e9jmZ5egZfxTkp7bcRDuPlJXbAwhxcl2dINPUAsjLdejqaLsCeg8axcLjIbvBjN4pQ==}
-    engines: {node: '>=0.10.0'}
+  /md5@2.3.0:
+    resolution: {integrity: sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==}
+    dependencies:
+      charenc: 0.0.2
+      crypt: 0.0.2
+      is-buffer: 1.1.6
+    dev: false
+
+  /mdn-data@2.0.28:
+    resolution: {integrity: sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==}
     dev: true
 
-  /path-root@0.1.1:
-    resolution: {integrity: sha512-QLcPegTHF11axjfojBIoDygmS2E3Lf+8+jI6wOVmNVenrKSo3mFdSGiIgdSHenczw3wPtlVMQaFVwGmM7BJdtg==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      path-root-regex: 0.1.2
+  /mdn-data@2.0.30:
+    resolution: {integrity: sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==}
     dev: true
 
-  /path-scurry@1.6.2:
-    resolution: {integrity: sha512-J6MQNh56h6eHFY3vsQ+Lq+zKPwn71POieutmVt2leU8W+zz8HVIdJyn3I3Zs6IKbIQtuKXirVjTBFNBcbFO44Q==}
-    engines: {node: '>=16 || 14 >=14.17'}
-    dependencies:
-      lru-cache: 7.18.3
-      minipass: 4.2.5
+  /mdurl@1.0.1:
+    resolution: {integrity: sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==}
     dev: false
 
-  /path-to-regexp@0.1.7:
-    resolution: {integrity: sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==}
+  /media-typer@0.3.0:
+    resolution: {integrity: sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==}
+    engines: {node: '>= 0.6'}
 
-  /path-to-regexp@6.2.1:
-    resolution: {integrity: sha512-JLyh7xT1kizaEvcaXOQwOc2/Yhw6KZOvPf1S8401UyLk86CU79LN3vl7ztXGm/pZ+YjoyAJ4rxmHwbkBXJX+yw==}
+  /media-typer@1.1.0:
+    resolution: {integrity: sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw==}
+    engines: {node: '>= 0.8'}
     dev: false
 
-  /path-type@1.1.0:
-    resolution: {integrity: sha512-S4eENJz1pkiQn9Znv33Q+deTOKmbl+jj1Fl+qiP/vYezj+S8x+J3Uo0ISrx/QoEvIlOaDWJhPaRd1flJ9HXZqg==}
-    engines: {node: '>=0.10.0'}
+  /memoize-one@6.0.0:
+    resolution: {integrity: sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw==}
+    dev: false
+
+  /memoizerific@1.11.3:
+    resolution: {integrity: sha512-/EuHYwAPdLtXwAwSZkh/Gutery6pD2KYd44oQLhAvQp/50mpyduZh8Q7PYHXTCJ+wuXxt7oij2LXyIJOOYFPog==}
     dependencies:
-      graceful-fs: 4.2.10
-      pify: 2.3.0
-      pinkie-promise: 2.0.1
+      map-or-similar: 1.5.0
     dev: true
 
-  /path-type@4.0.0:
-    resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==}
-    engines: {node: '>=8'}
+  /memory-pager@1.5.0:
+    resolution: {integrity: sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==}
+    dev: false
 
-  /pathe@1.1.0:
-    resolution: {integrity: sha512-ODbEPR0KKHqECXW1GoxdDb+AZvULmXjVPy4rt+pGo2+TnjJTIPJQSVS6N63n8T2Ip+syHhbn52OewKicV0373w==}
-    dev: true
+  /merge-descriptors@1.0.1:
+    resolution: {integrity: sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==}
 
-  /pathval@1.1.1:
-    resolution: {integrity: sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==}
-    dev: true
+  /merge-stream@2.0.0:
+    resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==}
 
-  /pause-stream@0.0.11:
-    resolution: {integrity: sha512-e3FBlXLmN/D1S+zHzanP4E/4Z60oFAa3O051qt1pxa7DEJWKAyil6upYVXCWadEnuoqa4Pkc9oUx9zsxYeRv8A==}
-    dependencies:
-      through: 2.3.8
+  /merge2@1.4.1:
+    resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==}
+    engines: {node: '>= 8'}
 
-  /pause@0.0.1:
-    resolution: {integrity: sha512-KG8UEiEVkR3wGEb4m5yZkVCzigAD+cVEJck2CzYZO37ZGJfctvVptVO192MwrtPhzONn6go8ylnOdMhKqi4nfg==}
-    dev: false
+  /methods@1.1.2:
+    resolution: {integrity: sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==}
+    engines: {node: '>= 0.6'}
 
-  /pdf-parse@1.1.1:
-    resolution: {integrity: sha512-v6ZJ/efsBpGrGGknjtq9J/oC8tZWq0KWL5vQrk2GlzLEQPUDB1ex+13Rmidl1neNN358Jn9EHZw5y07FFtaC7A==}
-    engines: {node: '>=6.8.1'}
+  /micromatch@4.0.5:
+    resolution: {integrity: sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==}
+    engines: {node: '>=8.6'}
     dependencies:
-      debug: 3.2.7(supports-color@5.5.0)
-      node-ensure: 0.0.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
+      braces: 3.0.2
+      picomatch: 2.3.1
 
-  /peek-readable@4.1.0:
-    resolution: {integrity: sha512-ZI3LnwUv5nOGbQzD9c2iDG6toheuXSZP5esSHBjopsXH4dg19soufvpUGA3uohi5anFtGb2lhAVdHzH6R/Evvg==}
-    engines: {node: '>=8'}
-    dev: false
+  /mime-db@1.52.0:
+    resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
+    engines: {node: '>= 0.6'}
 
-  /pend@1.2.0:
-    resolution: {integrity: sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==}
-    dev: true
+  /mime-format@2.0.1:
+    resolution: {integrity: sha512-XxU3ngPbEnrYnNbIX+lYSaYg0M01v6p2ntd2YaFksTu0vayaw5OJvbdRyWs07EYRlLED5qadUZ+xo+XhOvFhwg==}
+    dependencies:
+      charset: 1.0.1
+    dev: false
 
-  /performance-now@2.1.0:
-    resolution: {integrity: sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==}
+  /mime-types@2.1.35:
+    resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
+    engines: {node: '>= 0.6'}
+    dependencies:
+      mime-db: 1.52.0
 
-  /pg-connection-string@2.5.0:
-    resolution: {integrity: sha512-r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ==}
-    dev: false
+  /mime@1.6.0:
+    resolution: {integrity: sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==}
+    engines: {node: '>=4'}
+    hasBin: true
 
-  /pg-int8@1.0.1:
-    resolution: {integrity: sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==}
+  /mime@2.6.0:
+    resolution: {integrity: sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==}
     engines: {node: '>=4.0.0'}
-    dev: false
+    hasBin: true
+    dev: true
 
-  /pg-minify@1.6.2:
-    resolution: {integrity: sha512-1KdmFGGTP6jplJoI8MfvRlfvMiyBivMRP7/ffh4a11RUFJ7kC2J0ZHlipoKiH/1hz+DVgceon9U2qbaHpPeyPg==}
-    engines: {node: '>=8.0'}
+  /mime@3.0.0:
+    resolution: {integrity: sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==}
+    engines: {node: '>=10.0.0'}
+    hasBin: true
     dev: false
 
-  /pg-pool@3.5.2(pg@8.8.0):
-    resolution: {integrity: sha512-His3Fh17Z4eg7oANLob6ZvH8xIVen3phEZh2QuyrIl4dQSDVEabNducv6ysROKpDNPSD+12tONZVWfSgMvDD9w==}
-    peerDependencies:
-      pg: '>=8.0'
-    dependencies:
-      pg: 8.8.0
-    dev: false
+  /mimic-fn@2.1.0:
+    resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==}
+    engines: {node: '>=6'}
 
-  /pg-promise@10.12.0:
-    resolution: {integrity: sha512-7uN64iEHrhtRcOaU/AT3925S20JzQJG2nWVK2IUz5SlhB1eNdkXjAYoQtei+5kLJo81mOWcFq7x9J9VRldp0ig==}
-    engines: {node: '>=12.0'}
-    dependencies:
-      assert-options: 0.7.0
-      pg: 8.8.0
-      pg-minify: 1.6.2
-      spex: 3.2.0
-    transitivePeerDependencies:
-      - pg-native
-    dev: false
+  /mimic-fn@4.0.0:
+    resolution: {integrity: sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==}
+    engines: {node: '>=12'}
+    dev: true
 
-  /pg-protocol@1.5.0:
-    resolution: {integrity: sha512-muRttij7H8TqRNu/DxrAJQITO4Ac7RmX3Klyr/9mJEOBeIpgnF8f9jAfRz5d3XwQZl5qBjF9gLsUtMPJE0vezQ==}
+  /mimic-response@3.1.0:
+    resolution: {integrity: sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==}
+    engines: {node: '>=10'}
     dev: false
 
-  /pg-types@2.2.0:
-    resolution: {integrity: sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==}
+  /min-indent@1.0.1:
+    resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==}
     engines: {node: '>=4'}
-    dependencies:
-      pg-int8: 1.0.1
-      postgres-array: 2.0.0
-      postgres-bytea: 1.0.0
-      postgres-date: 1.0.7
-      postgres-interval: 1.2.0
-    dev: false
+    dev: true
 
-  /pg@8.8.0:
-    resolution: {integrity: sha512-UXYN0ziKj+AeNNP7VDMwrehpACThH7LUl/p8TDFpEUuSejCUIwGSfxpHsPvtM6/WXFy6SU4E5RG4IJV/TZAGjw==}
-    engines: {node: '>= 8.0.0'}
-    peerDependencies:
-      pg-native: '>=3.0.1'
-    peerDependenciesMeta:
-      pg-native:
-        optional: true
+  /minifaker@1.34.1:
+    resolution: {integrity: sha512-O9+c6GaUETgtKe65bJkpDTJxGcAALiUPqJtDv97dT3o0uP2HmyUVEguEGm6PLKuoSzZUmHqSTZ4cS7m8xKFEAg==}
     dependencies:
-      buffer-writer: 2.0.0
-      packet-reader: 1.0.0
-      pg-connection-string: 2.5.0
-      pg-pool: 3.5.2(pg@8.8.0)
-      pg-protocol: 1.5.0
-      pg-types: 2.2.0
-      pgpass: 1.0.5
+      '@types/uuid': 8.3.4
+      nanoid: 3.3.6
+      uuid: 8.3.2
     dev: false
 
-  /pgpass@1.0.5:
-    resolution: {integrity: sha512-FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug==}
-    dependencies:
-      split2: 4.1.0
+  /minimalistic-assert@1.0.1:
+    resolution: {integrity: sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==}
     dev: false
 
-  /picocolors@0.2.1:
-    resolution: {integrity: sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==}
-    dev: true
+  /minimatch@3.1.2:
+    resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}
+    dependencies:
+      brace-expansion: 1.1.11
 
-  /picocolors@1.0.0:
-    resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==}
+  /minimatch@5.1.5:
+    resolution: {integrity: sha512-CI8wwdrll4ehjPAqs8TL8lBPyNnpZlQI02Wn8C1weNz/QbUbjh3OMxgMKSnvqfKFdLlks3EzHB9tO0BqGc3phQ==}
+    engines: {node: '>=10'}
+    dependencies:
+      brace-expansion: 2.0.1
 
-  /picomatch@2.3.1:
-    resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==}
-    engines: {node: '>=8.6'}
+  /minimatch@7.4.2:
+    resolution: {integrity: sha512-xy4q7wou3vUoC9k1xGTXc+awNdGaGVHtFUaey8tiX4H1QRc04DZ/rmDFwNm2EBsuYEhAZ6SgMmYf3InGY6OauA==}
+    engines: {node: '>=10'}
+    dependencies:
+      brace-expansion: 2.0.1
 
-  /pify@2.3.0:
-    resolution: {integrity: sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==}
-    engines: {node: '>=0.10.0'}
+  /minimatch@9.0.1:
+    resolution: {integrity: sha512-0jWhJpD/MdhPXwPuiRkCbfYfSKp2qnn2eOc279qI7f+osl/l+prKSrvhg157zSYvx/1nmgn2NqdT6k2Z7zSH9w==}
+    engines: {node: '>=16 || 14 >=14.17'}
+    dependencies:
+      brace-expansion: 2.0.1
     dev: true
 
-  /pify@3.0.0:
-    resolution: {integrity: sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==}
-    engines: {node: '>=4'}
-    dev: true
+  /minimatch@9.0.3:
+    resolution: {integrity: sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==}
+    engines: {node: '>=16 || 14 >=14.17'}
+    dependencies:
+      brace-expansion: 2.0.1
 
-  /pify@4.0.1:
-    resolution: {integrity: sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==}
-    engines: {node: '>=6'}
-    dev: true
+  /minimist@1.2.8:
+    resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==}
 
-  /pinia@2.0.23(typescript@5.0.3)(vue@2.7.14):
-    resolution: {integrity: sha512-N15hFf4o5STrxpNrib1IEb1GOArvPYf1zPvQVRGOO1G1d74Ak0J0lVyalX/SmrzdT4Q0nlEFjbURsmBmIGUR5Q==}
-    peerDependencies:
-      '@vue/composition-api': ^1.4.0
-      typescript: '>=4.4.4'
-      vue: ^2.6.14 || ^3.2.0
-    peerDependenciesMeta:
-      '@vue/composition-api':
-        optional: true
-      typescript:
-        optional: true
+  /minipass-collect@1.0.2:
+    resolution: {integrity: sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==}
+    engines: {node: '>= 8'}
     dependencies:
-      '@vue/devtools-api': 6.4.5
-      typescript: 5.0.3
-      vue: 2.7.14
-      vue-demi: 0.13.11(vue@2.7.14)
+      minipass: 3.3.6
+    dev: false
+    optional: true
 
-  /pinkie-promise@2.0.1:
-    resolution: {integrity: sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==}
-    engines: {node: '>=0.10.0'}
+  /minipass-fetch@1.4.1:
+    resolution: {integrity: sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==}
+    engines: {node: '>=8'}
     dependencies:
-      pinkie: 2.0.4
-    dev: true
-
-  /pinkie@2.0.4:
-    resolution: {integrity: sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+      minipass: 3.3.6
+      minipass-sized: 1.0.3
+      minizlib: 2.1.2
+    optionalDependencies:
+      encoding: 0.1.13
+    dev: false
+    optional: true
 
-  /pirates@4.0.5:
-    resolution: {integrity: sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==}
-    engines: {node: '>= 6'}
-    dev: true
+  /minipass-flush@1.0.5:
+    resolution: {integrity: sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==}
+    engines: {node: '>= 8'}
+    dependencies:
+      minipass: 3.3.6
+    dev: false
+    optional: true
 
-  /pkg-dir@3.0.0:
-    resolution: {integrity: sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==}
-    engines: {node: '>=6'}
+  /minipass-pipeline@1.2.4:
+    resolution: {integrity: sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==}
+    engines: {node: '>=8'}
     dependencies:
-      find-up: 3.0.0
-    dev: true
+      minipass: 3.3.6
+    dev: false
+    optional: true
 
-  /pkg-dir@4.2.0:
-    resolution: {integrity: sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==}
+  /minipass-sized@1.0.3:
+    resolution: {integrity: sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==}
     engines: {node: '>=8'}
     dependencies:
-      find-up: 4.1.0
-    dev: true
+      minipass: 3.3.6
+    dev: false
+    optional: true
 
-  /pkg-dir@5.0.0:
-    resolution: {integrity: sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA==}
-    engines: {node: '>=10'}
+  /minipass@3.3.6:
+    resolution: {integrity: sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==}
+    engines: {node: '>=8'}
     dependencies:
-      find-up: 5.0.0
-    dev: true
+      yallist: 4.0.0
+
+  /minipass@4.2.5:
+    resolution: {integrity: sha512-+yQl7SX3bIT83Lhb4BVorMAHVuqsskxRdlmO9kTpyukp8vsm2Sn/fUOV9xlnG8/a5JsypJzap21lz/y3FBMJ8Q==}
+    engines: {node: '>=8'}
+
+  /minipass@5.0.0:
+    resolution: {integrity: sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==}
+    engines: {node: '>=8'}
+
+  /minipass@7.0.2:
+    resolution: {integrity: sha512-eL79dXrE1q9dBbDCLg7xfn/vl7MS4F1gvJAgjJrQli/jbQWdUttuVawphqpffoIYfRdq78LHx6GP4bU/EQ2ATA==}
+    engines: {node: '>=16 || 14 >=14.17'}
 
-  /pkg-types@1.0.1:
-    resolution: {integrity: sha512-jHv9HB+Ho7dj6ItwppRDDl0iZRYBD0jsakHXtFgoLr+cHSF6xC+QL54sJmWxyGxOLYSHm0afhXhXcQDQqH9z8g==}
+  /minizlib@2.1.2:
+    resolution: {integrity: sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==}
+    engines: {node: '>= 8'}
     dependencies:
-      jsonc-parser: 3.2.0
-      mlly: 1.1.0
-      pathe: 1.1.0
-    dev: true
+      minipass: 3.3.6
+      yallist: 4.0.0
 
-  /plimit-lit@1.4.1:
-    resolution: {integrity: sha512-bK14ePAod0XWhXwjT6XvYfjcQ9PbCUkZXnDCAKRMZTJCaDIV9VFya1S/I+3WSbpdR8uBhCDh8TS4lQ/JQvhNFA==}
+  /miragejs@0.1.48:
+    resolution: {integrity: sha512-MGZAq0Q3OuRYgZKvlB69z4gLN4G3PvgC4A2zhkCXCXrLD5wm2cCnwNB59xOBVA+srZ0zEes6u+VylcPIkB4SqA==}
+    engines: {node: 6.* || 8.* || >= 10.*}
     dependencies:
-      queue-lit: 1.5.0
+      '@miragejs/pretender-node-polyfill': 0.1.2
+      inflected: 2.1.0
+      lodash: 4.17.21
+      pretender: 3.4.7
     dev: true
 
-  /pluralize@8.0.0:
-    resolution: {integrity: sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==}
-    engines: {node: '>=4'}
-    dev: true
+  /mkdirp-classic@0.5.3:
+    resolution: {integrity: sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==}
 
-  /pngjs@5.0.0:
-    resolution: {integrity: sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw==}
-    engines: {node: '>=10.13.0'}
+  /mkdirp@0.5.6:
+    resolution: {integrity: sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==}
+    hasBin: true
+    dependencies:
+      minimist: 1.2.8
     dev: false
 
-  /polished@4.2.2:
-    resolution: {integrity: sha512-Sz2Lkdxz6F2Pgnpi9U5Ng/WdWAUZxmHrNPoVlm3aAemxoy2Qy7LGjQg4uf8qKelDAUW94F4np3iH2YPf2qefcQ==}
+  /mkdirp@1.0.4:
+    resolution: {integrity: sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==}
     engines: {node: '>=10'}
-    dependencies:
-      '@babel/runtime': 7.20.7
-    dev: true
+    hasBin: true
 
-  /popsicle-content-encoding@1.0.0(servie@4.3.3):
-    resolution: {integrity: sha512-4Df+vTfM8wCCJVTzPujiI6eOl3SiWQkcZg0AMrOkD1enMXsF3glIkFUZGvour1Sj7jOWCsNSEhBxpbbhclHhzw==}
-    peerDependencies:
-      servie: ^4.0.0
-    dependencies:
-      servie: 4.3.3
+  /mkdirp@2.1.3:
+    resolution: {integrity: sha512-sjAkg21peAG9HS+Dkx7hlG9Ztx7HLeKnvB3NQRcu/mltCVmvkF0pisbiTSfDVYTT86XEfZrTUosLdZLStquZUw==}
+    engines: {node: '>=10'}
+    hasBin: true
     dev: false
 
-  /popsicle-cookie-jar@1.0.0(servie@4.3.3):
-    resolution: {integrity: sha512-vrlOGvNVELko0+J8NpGC5lHWDGrk8LQJq9nwAMIVEVBfN1Lib3BLxAaLRGDTuUnvl45j5N9dT2H85PULz6IjjQ==}
+  /mkdist@1.4.0(typescript@5.4.2):
+    resolution: {integrity: sha512-LzzdzWDx6cWWPd8saIoO+kT5jnbijfeDaE6jZfmCYEi3YL2aJSyF23/tCFee/mDuh/ek1UQeSYdLeSa6oesdiw==}
+    hasBin: true
     peerDependencies:
-      servie: ^4.0.0
+      sass: ^1.69.5
+      typescript: ^5.4.2
+    peerDependenciesMeta:
+      sass:
+        optional: true
+      typescript:
+        optional: true
     dependencies:
-      '@types/tough-cookie': 2.3.8
-      servie: 4.3.3
-      tough-cookie: 3.0.1
-    dev: false
+      autoprefixer: 10.4.14(postcss@8.4.32)
+      citty: 0.1.5
+      cssnano: 6.0.2(postcss@8.4.32)
+      defu: 6.1.3
+      esbuild: 0.19.8
+      fs-extra: 11.1.1
+      globby: 13.2.2
+      jiti: 1.21.0
+      mlly: 1.4.2
+      mri: 1.2.0
+      pathe: 1.1.1
+      postcss: 8.4.32
+      postcss-nested: 6.0.1(postcss@8.4.32)
+      typescript: 5.4.2
+    dev: true
 
-  /popsicle-redirects@1.1.1(servie@4.3.3):
-    resolution: {integrity: sha512-mC2HrKjdTAWDalOjGxlXw9j6Qxrz/Yd2ui6bPxpi2IQDYWpF4gUAMxbA8EpSWJhLi0PuWKDwTHHPrUPGutAoIA==}
-    peerDependencies:
-      servie: ^4.1.0
+  /ml-array-mean@1.1.6:
+    resolution: {integrity: sha512-MIdf7Zc8HznwIisyiJGRH9tRigg3Yf4FldW8DxKxpCCv/g5CafTw0RRu51nojVEOXuCQC7DRVVu5c7XXO/5joQ==}
     dependencies:
-      servie: 4.3.3
+      ml-array-sum: 1.1.6
     dev: false
 
-  /popsicle-transport-http@1.2.1(servie@4.3.3):
-    resolution: {integrity: sha512-i5r3IGHkGiBDm1oPFvOfEeSGWR0lQJcsdTqwvvDjXqcTHYJJi4iSi3ecXIttDiTBoBtRAFAE9nF91fspQr63FQ==}
-    peerDependencies:
-      servie: ^4.2.0
+  /ml-array-sum@1.1.6:
+    resolution: {integrity: sha512-29mAh2GwH7ZmiRnup4UyibQZB9+ZLyMShvt4cH4eTK+cL2oEMIZFnSyB3SS8MlsTh6q/w/yh48KmqLxmovN4Dw==}
     dependencies:
-      make-error-cause: 2.3.0
-      servie: 4.3.3
+      is-any-array: 2.0.1
     dev: false
 
-  /popsicle-transport-xhr@2.0.0(servie@4.3.3):
-    resolution: {integrity: sha512-5Sbud4Widngf1dodJE5cjEYXkzEUIl8CzyYRYR57t6vpy9a9KPGQX6KBKdPjmBZlR5A06pOBXuJnVr23l27rtA==}
-    peerDependencies:
-      servie: ^4.2.0
-    dependencies:
-      servie: 4.3.3
+  /ml-distance-euclidean@2.0.0:
+    resolution: {integrity: sha512-yC9/2o8QF0A3m/0IXqCTXCzz2pNEzvmcE/9HFKOZGnTjatvBbsn4lWYJkxENkA4Ug2fnYl7PXQxnPi21sgMy/Q==}
     dev: false
 
-  /popsicle-user-agent@1.0.0(servie@4.3.3):
-    resolution: {integrity: sha512-epKaq3TTfTzXcxBxjpoKYMcTTcAX8Rykus6QZu77XNhJuRHSRxMd+JJrbX/3PFI0opFGSN0BabbAYCbGxbu0mA==}
-    peerDependencies:
-      servie: ^4.0.0
+  /ml-distance@4.0.1:
+    resolution: {integrity: sha512-feZ5ziXs01zhyFUUUeZV5hwc0f5JW0Sh0ckU1koZe/wdVkJdGxcP06KNQuF0WBTj8FttQUzcvQcpcrOp/XrlEw==}
     dependencies:
-      servie: 4.3.3
+      ml-array-mean: 1.1.6
+      ml-distance-euclidean: 2.0.0
+      ml-tree-similarity: 1.0.0
     dev: false
 
-  /popsicle@12.1.0:
-    resolution: {integrity: sha512-muNC/cIrWhfR6HqqhHazkxjob3eyECBe8uZYSQ/N5vixNAgssacVleerXnE8Are5fspR0a+d2qWaBR1g7RYlmw==}
+  /ml-tree-similarity@1.0.0:
+    resolution: {integrity: sha512-XJUyYqjSuUQkNQHMscr6tcjldsOoAekxADTplt40QKfwW6nd++1wHWV9AArl0Zvw/TIHgNaZZNvr8QGvE8wLRg==}
     dependencies:
-      popsicle-content-encoding: 1.0.0(servie@4.3.3)
-      popsicle-cookie-jar: 1.0.0(servie@4.3.3)
-      popsicle-redirects: 1.1.1(servie@4.3.3)
-      popsicle-transport-http: 1.2.1(servie@4.3.3)
-      popsicle-transport-xhr: 2.0.0(servie@4.3.3)
-      popsicle-user-agent: 1.0.0(servie@4.3.3)
-      servie: 4.3.3
-      throwback: 4.1.0
+      binary-search: 1.3.6
+      num-sort: 2.1.0
     dev: false
 
-  /posix-character-classes@0.1.1:
-    resolution: {integrity: sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==}
-    engines: {node: '>=0.10.0'}
-    dev: true
-
-  /postcss-loader@4.3.0(postcss@7.0.39)(webpack@5.75.0):
-    resolution: {integrity: sha512-M/dSoIiNDOo8Rk0mUqoj4kpGq91gcxCfb9PoyZVdZ76/AuhxylHDYZblNE8o+EQ9AMSASeMFEKxZf5aU6wlx1Q==}
-    engines: {node: '>= 10.13.0'}
-    peerDependencies:
-      postcss: ^7.0.0 || ^8.0.1
-      webpack: ^4.0.0 || ^5.0.0
-    dependencies:
-      cosmiconfig: 7.1.0
-      klona: 2.0.6
-      loader-utils: 2.0.4
-      postcss: 7.0.39
-      schema-utils: 3.1.1
-      semver: 7.3.8
-      webpack: 5.75.0(esbuild@0.16.17)
-    dev: true
-
-  /postcss-modules-extract-imports@2.0.0:
-    resolution: {integrity: sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==}
-    engines: {node: '>= 6'}
+  /mlly@1.4.2:
+    resolution: {integrity: sha512-i/Ykufi2t1EZ6NaPLdfnZk2AX8cs0d+mTzVKuPfqPKPatxLApaBoxJQ9x1/uckXtrS/U5oisPMDkNs0yQTaBRg==}
     dependencies:
-      postcss: 7.0.39
+      acorn: 8.11.2
+      pathe: 1.1.1
+      pkg-types: 1.0.3
+      ufo: 1.3.2
     dev: true
 
-  /postcss-modules-extract-imports@3.0.0(postcss@8.4.21):
-    resolution: {integrity: sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==}
-    engines: {node: ^10 || ^12 || >= 14}
+  /mobx-react-lite@3.4.3(mobx@6.12.0)(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-NkJREyFTSUXR772Qaai51BnE1voWx56LOL80xG7qkZr6vo8vEaLF3sz1JNUVh+rxmUzxYaqOhfuxTfqUh0FXUg==}
     peerDependencies:
-      postcss: ^8.1.0
-    dependencies:
-      postcss: 8.4.21
-    dev: true
-
-  /postcss-modules-local-by-default@3.0.3:
-    resolution: {integrity: sha512-e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw==}
-    engines: {node: '>= 6'}
+      mobx: ^6.1.0
+      react: ^16.8.0 || ^17 || ^18
+      react-dom: '*'
+      react-native: '*'
+    peerDependenciesMeta:
+      react-dom:
+        optional: true
+      react-native:
+        optional: true
     dependencies:
-      icss-utils: 4.1.1
-      postcss: 7.0.39
-      postcss-selector-parser: 6.0.11
-      postcss-value-parser: 4.2.0
+      mobx: 6.12.0
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
     dev: true
 
-  /postcss-modules-local-by-default@4.0.0(postcss@8.4.21):
-    resolution: {integrity: sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==}
-    engines: {node: ^10 || ^12 || >= 14}
+  /mobx-react@7.6.0(mobx@6.12.0)(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-+HQUNuh7AoQ9ZnU6c4rvbiVVl+wEkb9WqYsVDzGLng+Dqj1XntHu79PvEWKtSMoMj67vFp/ZPXcElosuJO8ckA==}
     peerDependencies:
-      postcss: ^8.1.0
+      mobx: ^6.1.0
+      react: ^16.8.0 || ^17 || ^18
+      react-dom: '*'
+      react-native: '*'
+    peerDependenciesMeta:
+      react-dom:
+        optional: true
+      react-native:
+        optional: true
     dependencies:
-      icss-utils: 5.1.0(postcss@8.4.21)
-      postcss: 8.4.21
-      postcss-selector-parser: 6.0.11
-      postcss-value-parser: 4.2.0
+      mobx: 6.12.0
+      mobx-react-lite: 3.4.3(mobx@6.12.0)(react-dom@18.2.0)(react@18.2.0)
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
     dev: true
 
-  /postcss-modules-scope@2.2.0:
-    resolution: {integrity: sha512-YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ==}
-    engines: {node: '>= 6'}
-    dependencies:
-      postcss: 7.0.39
-      postcss-selector-parser: 6.0.11
+  /mobx@6.12.0:
+    resolution: {integrity: sha512-Mn6CN6meXEnMa0a5u6a5+RKrqRedHBhZGd15AWLk9O6uFY4KYHzImdt8JI8WODo1bjTSRnwXhJox+FCUZhCKCQ==}
     dev: true
 
-  /postcss-modules-scope@3.0.0(postcss@8.4.21):
-    resolution: {integrity: sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==}
-    engines: {node: ^10 || ^12 || >= 14}
-    peerDependencies:
-      postcss: ^8.1.0
+  /moment-timezone@0.5.37:
+    resolution: {integrity: sha512-uEDzDNFhfaywRl+vwXxffjjq1q0Vzr+fcQpQ1bU0kbzorfS7zVtZnCnGc8mhWmF39d4g4YriF6kwA75mJKE/Zg==}
     dependencies:
-      postcss: 8.4.21
-      postcss-selector-parser: 6.0.11
-    dev: true
+      moment: 2.29.4
+    dev: false
+
+  /moment@2.29.4:
+    resolution: {integrity: sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==}
 
-  /postcss-modules-values@3.0.0:
-    resolution: {integrity: sha512-1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg==}
+  /mongodb-connection-string-url@3.0.0:
+    resolution: {integrity: sha512-t1Vf+m1I5hC2M5RJx/7AtxgABy1cZmIPQRMXw+gEIPn/cZNF3Oiy+l0UIypUwVB5trcWHq3crg2g3uAR9aAwsQ==}
     dependencies:
-      icss-utils: 4.1.1
-      postcss: 7.0.39
-    dev: true
+      '@types/whatwg-url': 11.0.4
+      whatwg-url: 13.0.0
+    dev: false
 
-  /postcss-modules-values@4.0.0(postcss@8.4.21):
-    resolution: {integrity: sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==}
-    engines: {node: ^10 || ^12 || >= 14}
+  /mongodb@6.3.0:
+    resolution: {integrity: sha512-tt0KuGjGtLUhLoU263+xvQmPHEGTw5LbcNC73EoFRYgSHwZt5tsoJC110hDyO1kjQzpgNrpdcSza9PknWN4LrA==}
+    engines: {node: '>=16.20.1'}
     peerDependencies:
-      postcss: ^8.1.0
+      '@aws-sdk/credential-providers': ^3.188.0
+      '@mongodb-js/zstd': ^1.1.0
+      gcp-metadata: ^5.2.0
+      kerberos: ^2.0.1
+      mongodb-client-encryption: '>=6.0.0 <7'
+      snappy: ^7.2.2
+      socks: ^2.7.1
+    peerDependenciesMeta:
+      '@aws-sdk/credential-providers':
+        optional: true
+      '@mongodb-js/zstd':
+        optional: true
+      gcp-metadata:
+        optional: true
+      kerberos:
+        optional: true
+      mongodb-client-encryption:
+        optional: true
+      snappy:
+        optional: true
+      socks:
+        optional: true
     dependencies:
-      icss-utils: 5.1.0(postcss@8.4.21)
-      postcss: 8.4.21
-    dev: true
+      '@mongodb-js/saslprep': 1.1.0
+      bson: 6.3.0
+      mongodb-connection-string-url: 3.0.0
+    dev: false
 
-  /postcss-selector-parser@6.0.11:
-    resolution: {integrity: sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==}
-    engines: {node: '>=4'}
+  /morgan@1.10.0:
+    resolution: {integrity: sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==}
+    engines: {node: '>= 0.8.0'}
     dependencies:
-      cssesc: 3.0.0
-      util-deprecate: 1.0.2
-    dev: true
-
-  /postcss-value-parser@4.2.0:
-    resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==}
-    dev: true
+      basic-auth: 2.0.1
+      debug: 2.6.9
+      depd: 2.0.0
+      on-finished: 2.3.0
+      on-headers: 1.0.2
+    transitivePeerDependencies:
+      - supports-color
+    dev: false
 
-  /postcss@7.0.39:
-    resolution: {integrity: sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==}
-    engines: {node: '>=6.0.0'}
+  /mqtt-packet@8.2.0:
+    resolution: {integrity: sha512-21Vo7XdRXUw2qhdTfk8GeOl2jtb8Dkwd4dKxn/epvf37mxTxHodvBJoozTPZGVwh57JXlsh2ChsaxMsAfqxp+A==}
     dependencies:
-      picocolors: 0.2.1
-      source-map: 0.6.1
-    dev: true
+      bl: 5.0.0
+      debug: 4.3.4(supports-color@8.1.1)
+      process-nextick-args: 2.0.1
+    transitivePeerDependencies:
+      - supports-color
+    dev: false
 
-  /postcss@8.4.21:
-    resolution: {integrity: sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==}
-    engines: {node: ^10 || ^12 || >=14}
+  /mqtt@5.0.2:
+    resolution: {integrity: sha512-JctWQpxjVVjn5LqAAhfgutMNMbHZf+puG9LnbWga0wRbWW7QVfHPu4Vz2iDSyHfGpW8HWLF+jb01vySDDzIKnQ==}
+    engines: {node: '>=16.0.0'}
+    hasBin: true
     dependencies:
-      nanoid: 3.3.4
-      picocolors: 1.0.0
-      source-map-js: 1.0.2
+      commist: 3.2.0
+      concat-stream: 2.0.0
+      debug: 4.3.4(supports-color@8.1.1)
+      duplexify: 4.1.2
+      help-me: 4.2.0
+      lru-cache: 7.18.3
+      minimist: 1.2.8
+      mqtt-packet: 8.2.0
+      number-allocator: 1.0.14
+      readable-stream: 4.4.2
+      reinterval: 1.1.0
+      rfdc: 1.3.0
+      split2: 4.2.0
+      ws: 8.14.2
+    transitivePeerDependencies:
+      - bufferutil
+      - supports-color
+      - utf-8-validate
+    dev: false
 
-  /postgres-array@2.0.0:
-    resolution: {integrity: sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==}
+  /mri@1.2.0:
+    resolution: {integrity: sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==}
     engines: {node: '>=4'}
-    dev: false
+    dev: true
 
-  /postgres-bytea@1.0.0:
-    resolution: {integrity: sha512-xy3pmLuQqRBZBXDULy7KbaitYqLcmxigw14Q5sj8QBVLqEwXfeybIKVWiqAXTlcvdvb0+xkOtDbfQMOf4lST1w==}
-    engines: {node: '>=0.10.0'}
-    dev: false
+  /ms@2.0.0:
+    resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==}
 
-  /postgres-date@1.0.7:
-    resolution: {integrity: sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==}
-    engines: {node: '>=0.10.0'}
-    dev: false
+  /ms@2.1.2:
+    resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==}
 
-  /postgres-interval@1.2.0:
-    resolution: {integrity: sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      xtend: 4.0.2
-    dev: false
+  /ms@2.1.3:
+    resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
 
-  /posthog-node@2.2.2:
-    resolution: {integrity: sha512-aXYe/D+28kF63W8Cz53t09ypEORz+ULeDCahdAqhVrRm2scbOXFbtnn0GGhvMpYe45grepLKuwui9KxrZ2ZuMw==}
-    engines: {node: '>=14.17.0'}
+  /msgpackr-extract@3.0.2:
+    resolution: {integrity: sha512-SdzXp4kD/Qf8agZ9+iTu6eql0m3kWm1A2y1hkpTeVNENutaB0BwHlSvAIaMxwntmRUAUjon2V4L8Z/njd0Ct8A==}
+    hasBin: true
     dependencies:
-      axios: 0.27.2(debug@3.2.7)
-    transitivePeerDependencies:
-      - debug
+      node-gyp-build-optional-packages: 5.0.7
+    optionalDependencies:
+      '@msgpackr-extract/msgpackr-extract-darwin-arm64': 3.0.2
+      '@msgpackr-extract/msgpackr-extract-darwin-x64': 3.0.2
+      '@msgpackr-extract/msgpackr-extract-linux-arm': 3.0.2
+      '@msgpackr-extract/msgpackr-extract-linux-arm64': 3.0.2
+      '@msgpackr-extract/msgpackr-extract-linux-x64': 3.0.2
+      '@msgpackr-extract/msgpackr-extract-win32-x64': 3.0.2
     dev: false
+    optional: true
 
-  /postman-collection@4.1.5:
-    resolution: {integrity: sha512-BY3NfP7EYExZG5ER9P82r0ZRc17z88WZAzn121EpWC8FM3HYtFwWJpXOsZk+2MKFn3agCq4JPRhnWw3G6XBXgw==}
-    engines: {node: '>=10'}
-    dependencies:
-      '@faker-js/faker': 5.5.3
-      file-type: 3.9.0
-      http-reasons: 0.1.0
-      iconv-lite: 0.6.3
-      liquid-json: 0.3.1
-      lodash: 4.17.21
-      mime-format: 2.0.1
-      mime-types: 2.1.35
-      postman-url-encoder: 3.0.5
-      semver: 7.3.7
-      uuid: 8.3.2
+  /msgpackr@1.10.1:
+    resolution: {integrity: sha512-r5VRLv9qouXuLiIBrLpl2d5ZvPt8svdQTl5/vMvE4nzDMyEX4sgW5yWhuBBj5UmgwOTWj8CIdSXn5sAfsHAWIQ==}
+    optionalDependencies:
+      msgpackr-extract: 3.0.2
     dev: false
 
-  /postman-url-encoder@3.0.5:
-    resolution: {integrity: sha512-jOrdVvzUXBC7C+9gkIkpDJ3HIxOHTIqjpQ4C1EMt1ZGeMvSEpbFCKq23DEfgsj46vMnDgyQf+1ZLp2Wm+bKSsA==}
-    engines: {node: '>=10'}
+  /mssql@10.0.2:
+    resolution: {integrity: sha512-GrQ6gzv2xA7ndOvONyZ++4RZsNkr8qDiIpvuFn2pR3TPiSk/cKdmvOrDU3jWgon7EPj7CPgmDiMh7Hgtft2xLg==}
+    engines: {node: '>=14'}
+    hasBin: true
     dependencies:
-      punycode: 2.2.0
+      '@tediousjs/connection-string': 0.5.0
+      commander: 11.1.0
+      debug: 4.3.4(supports-color@8.1.1)
+      rfdc: 1.3.0
+      tarn: 3.0.2
+      tedious: 16.7.1
+    transitivePeerDependencies:
+      - supports-color
     dev: false
 
-  /prelude-ls@1.1.2:
-    resolution: {integrity: sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==}
-    engines: {node: '>= 0.8.0'}
-
-  /prelude-ls@1.2.1:
-    resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
-    engines: {node: '>= 0.8.0'}
+  /muggle-string@0.3.1:
+    resolution: {integrity: sha512-ckmWDJjphvd/FvZawgygcUeQCxzvohjFO5RxTjj4eq8kw359gFF3E1brjfI+viLMxss5JrHTDRHZvu2/tuy0Qg==}
     dev: true
 
-  /pretender@3.4.7:
-    resolution: {integrity: sha512-jkPAvt1BfRi0RKamweJdEcnjkeu7Es8yix3bJ+KgBC5VpG/Ln4JE3hYN6vJym4qprm8Xo5adhWpm3HCoft1dOw==}
-    dependencies:
-      fake-xml-http-request: 2.1.2
-      route-recognizer: 0.3.4
+  /muggle-string@0.4.1:
+    resolution: {integrity: sha512-VNTrAak/KhO2i8dqqnqnAHOa3cYBwXEZe9h+D5h/1ZqFSTEFHdM65lR7RoIqq3tBBYavsOXV84NoHXZ0AkPyqQ==}
     dev: true
 
-  /prettier-linter-helpers@1.0.0:
-    resolution: {integrity: sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==}
-    engines: {node: '>=6.0.0'}
+  /multer@1.4.5-lts.1:
+    resolution: {integrity: sha512-ywPWvcDMeH+z9gQq5qYHCCy+ethsk4goepZ45GLD63fOu0YcNecQxi64nDs3qluZB+murG3/D4dJ7+dGctcCQQ==}
+    engines: {node: '>= 6.0.0'}
     dependencies:
-      fast-diff: 1.2.0
-    dev: true
+      append-field: 1.0.0
+      busboy: 1.6.0
+      concat-stream: 1.6.2
+      mkdirp: 0.5.6
+      object-assign: 4.1.1
+      type-is: 1.6.18
+      xtend: 4.0.2
+    dev: false
 
-  /prettier@2.8.3:
-    resolution: {integrity: sha512-tJ/oJ4amDihPoufT5sM0Z1SKEuKay8LfVAMlbbhnnkvt6BUserZylqo2PN+p9KeljLr0OHa2rXHU1T8reeoTrw==}
-    engines: {node: '>=10.13.0'}
+  /mustache@4.2.0:
+    resolution: {integrity: sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ==}
     hasBin: true
+    dev: false
 
-  /pretty-bytes@5.6.0:
-    resolution: {integrity: sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==}
-    engines: {node: '>=6'}
+  /mute-stream@0.0.8:
+    resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
+    dev: false
 
-  /pretty-error@4.0.0:
-    resolution: {integrity: sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw==}
-    dependencies:
-      lodash: 4.17.21
-      renderkid: 3.0.0
+  /mylas@2.1.13:
+    resolution: {integrity: sha512-+MrqnJRtxdF+xngFfUUkIMQrUUL0KsxbADUkn23Z/4ibGg192Q+z+CQyiYwvWTsYjJygmMR8+w3ZDa98Zh6ESg==}
+    engines: {node: '>=12.0.0'}
     dev: true
 
-  /pretty-format@26.6.2:
-    resolution: {integrity: sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==}
-    engines: {node: '>= 10'}
+  /mysql2@3.9.7:
+    resolution: {integrity: sha512-KnJT8vYRcNAZv73uf9zpXqNbvBG7DJrs+1nACsjZP1HMJ1TgXEy8wnNilXAn/5i57JizXKtrUtwDB7HxT9DDpw==}
+    engines: {node: '>= 8.0'}
     dependencies:
-      '@jest/types': 26.6.2
-      ansi-regex: 5.0.1
-      ansi-styles: 4.3.0
-      react-is: 17.0.2
-    dev: true
+      denque: 2.1.0
+      generate-function: 2.3.1
+      iconv-lite: 0.6.3
+      long: 5.2.3
+      lru-cache: 8.0.5
+      named-placeholders: 1.1.3
+      seq-queue: 0.0.5
+      sqlstring: 2.3.3
+    dev: false
 
-  /pretty-format@27.5.1:
-    resolution: {integrity: sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+  /mz@2.7.0:
+    resolution: {integrity: sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==}
     dependencies:
-      ansi-regex: 5.0.1
-      ansi-styles: 5.2.0
-      react-is: 17.0.2
-    dev: true
+      any-promise: 1.3.0
+      object-assign: 4.1.1
+      thenify-all: 1.6.0
+    dev: false
 
-  /pretty-format@29.4.2:
-    resolution: {integrity: sha512-qKlHR8yFVCbcEWba0H0TOC8dnLlO4vPlyEjRPw31FZ2Rupy9nLa8ZLbYny8gWEl8CkEhJqAE6IzdNELTBVcBEg==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+  /named-placeholders@1.1.3:
+    resolution: {integrity: sha512-eLoBxg6wE/rZkJPhU/xRX1WTpkFEwDJEN96oxFrTsqBdbT5ec295Q+CoHrL9IT0DipqKhmGcaZmwOt8OON5x1w==}
+    engines: {node: '>=12.0.0'}
     dependencies:
-      '@jest/schemas': 29.4.2
-      ansi-styles: 5.2.0
-      react-is: 18.2.0
-    dev: true
+      lru-cache: 7.18.3
+    dev: false
 
-  /pretty-format@29.5.0:
-    resolution: {integrity: sha512-V2mGkI31qdttvTFX7Mt4efOqHXqJWMu4/r66Xh3Z3BwZaPfPJgp6/gbwoujRpPUtfEF6AUUWx3Jim3GCw5g/Qw==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dependencies:
-      '@jest/schemas': 29.4.3
-      ansi-styles: 5.2.0
-      react-is: 18.2.0
-    dev: true
+  /nan@2.17.0:
+    resolution: {integrity: sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==}
+    dev: false
+    optional: true
 
-  /pretty-hrtime@1.0.3:
-    resolution: {integrity: sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==}
-    engines: {node: '>= 0.8'}
-    dev: true
+  /nanoclone@0.2.1:
+    resolution: {integrity: sha512-wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA==}
+    dev: false
 
-  /pretty@2.0.0:
-    resolution: {integrity: sha512-G9xUchgTEiNpormdYBl+Pha50gOUovT18IvAe7EYMZ1/f9W/WWMPRn+xI68yXNMUk3QXHDwo/1wV/4NejVNe1w==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      condense-newlines: 0.2.1
-      extend-shallow: 2.0.1
-      js-beautify: 1.14.7
-    dev: true
+  /nanoid@3.3.6:
+    resolution: {integrity: sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==}
+    engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
+    hasBin: true
 
-  /printj@1.1.2:
-    resolution: {integrity: sha512-zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ==}
-    engines: {node: '>=0.8'}
+  /nanoid@3.3.7:
+    resolution: {integrity: sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==}
+    engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
     hasBin: true
+
+  /napi-build-utils@1.0.2:
+    resolution: {integrity: sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==}
     dev: false
 
-  /prismjs@1.29.0:
-    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
-    engines: {node: '>=6'}
+  /native-duplexpair@1.0.0:
+    resolution: {integrity: sha512-E7QQoM+3jvNtlmyfqRZ0/U75VFgCls+fSkbml2MpgWkWyz3ox8Y58gNhfuziuQYGNNQAbFZJQck55LHCnCK6CA==}
     dev: false
 
-  /process-nextick-args@2.0.1:
-    resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==}
+  /natural-compare@1.4.0:
+    resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}
 
-  /process@0.11.10:
-    resolution: {integrity: sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==}
-    engines: {node: '>= 0.6.0'}
+  /natural-orderby@2.0.3:
+    resolution: {integrity: sha512-p7KTHxU0CUrcOXe62Zfrb5Z13nLvPhSWR/so3kFulUQU0sgUll2Z0LwpsLN351eOOD+hRGu/F1g+6xDfPeD++Q==}
+    dev: false
 
-  /progress@2.0.3:
-    resolution: {integrity: sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==}
-    engines: {node: '>=0.4.0'}
-    dev: true
+  /negotiator@0.6.3:
+    resolution: {integrity: sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==}
+    engines: {node: '>= 0.6'}
 
-  /prom-client@13.2.0:
-    resolution: {integrity: sha512-wGr5mlNNdRNzEhRYXgboUU2LxHWIojxscJKmtG3R8f4/KiWqyYgXTLHs0+Ted7tG3zFT7pgHJbtomzZ1L0ARaQ==}
-    engines: {node: '>=10'}
-    dependencies:
-      tdigest: 0.1.2
-    dev: false
+  /neo-async@2.6.2:
+    resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
 
-  /promise-ftp-common@1.1.5:
-    resolution: {integrity: sha512-a84F/zM2Z0Ry/ht3nXfV6Ze7BISOQlWrct/YObrluJn8qy2LVeeQ+IJ7jD4bkmM0N2xfXYy5nurz4L1KEj+rJg==}
+  /next-tick@1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
     dev: false
 
-  /promise-ftp@1.3.5(promise-ftp-common@1.1.5):
-    resolution: {integrity: sha512-v368jPSqzmjjKDIyggulC+dRFcpAOEX7aFdEWkFYQp8Ao3P2N4Y6XnFFdKgK7PtkylwvGQkZR/65HZuzmq0V7A==}
-    engines: {node: '>=0.11.13'}
-    peerDependencies:
-      promise-ftp-common: ^1.1.5
+  /no-case@3.0.4:
+    resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
-      '@icetee/ftp': 0.3.15
-      bluebird: 2.11.0
-      promise-ftp-common: 1.1.5
-    dev: false
+      lower-case: 2.0.2
+      tslib: 2.6.2
 
-  /promise-inflight@1.0.1:
-    resolution: {integrity: sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==}
-    peerDependencies:
-      bluebird: '*'
-    peerDependenciesMeta:
-      bluebird:
-        optional: true
-    dev: false
-    optional: true
+  /nock@13.3.2:
+    resolution: {integrity: sha512-CwbljitiWJhF1gL83NbanhoKs1l23TDlRioNraPTZrzZIEooPemrHRj5m0FZCPkB1ecdYCSWWGcHysJgX/ngnQ==}
+    engines: {node: '>= 10.13'}
+    dependencies:
+      debug: 4.3.4(supports-color@8.1.1)
+      json-stringify-safe: 5.0.1
+      lodash: 4.17.21
+      propagate: 2.0.1
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
 
-  /promise-retry@2.0.1:
-    resolution: {integrity: sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==}
+  /node-abi@3.54.0:
+    resolution: {integrity: sha512-p7eGEiQil0YUV3ItH4/tBb781L5impVmmx2E9FRKF7d18XXzp4PGT2tdYMFY6wQqgxD0IwNZOiSJ0/K0fSi/OA==}
     engines: {node: '>=10'}
     dependencies:
-      err-code: 2.0.3
-      retry: 0.12.0
+      semver: 7.6.0
     dev: false
 
-  /promise.prototype.finally@3.1.3:
-    resolution: {integrity: sha512-EXRF3fC9/0gz4qkt/f5EP5iW4kj9oFpBICNpCNOb/52+8nlHIX07FPLbi/q4qYBQ1xZqivMzTpNQSnArVASolQ==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.2
-      define-properties: 1.1.4
-      es-abstract: 1.21.1
+  /node-abort-controller@3.1.1:
+    resolution: {integrity: sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ==}
     dev: false
 
-  /promise@1.3.0:
-    resolution: {integrity: sha512-R9WrbTF3EPkVtWjp7B7umQGVndpsi+rsDAfrR4xAALQpFLa/+2OriecLhawxzvii2gd9+DZFwROWDuUUaqS5yA==}
-    dependencies:
-      is-promise: 1.0.1
+  /node-addon-api@7.1.0:
+    resolution: {integrity: sha512-mNcltoe1R8o7STTegSOHdnJNN7s5EUvhoS7ShnTHDyOSd+8H+UdWODq6qSv67PjC8Zc5JRT8+oLAMCr0SIXw7g==}
+    engines: {node: ^16 || ^18 || >= 20}
     dev: false
 
-  /promise@7.3.1:
-    resolution: {integrity: sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==}
-    dependencies:
-      asap: 2.0.6
+  /node-cleanup@2.1.2:
+    resolution: {integrity: sha512-qN8v/s2PAJwGUtr1/hYTpNKlD6Y9rc4p8KSmJXyGdYGZsDGKXrGThikLFP9OCHFeLeEpQzPwiAtdIvBLqm//Hw==}
     dev: true
 
-  /prompts@2.4.2:
-    resolution: {integrity: sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==}
-    engines: {node: '>= 6'}
+  /node-dir@0.1.17:
+    resolution: {integrity: sha512-tmPX422rYgofd4epzrNoOXiE8XFZYOcCq1vD7MAXCDO+O+zndlA2ztdKKMa+EeuBG5tHETpr4ml4RGgpqDCCAg==}
+    engines: {node: '>= 0.10.5'}
     dependencies:
-      kleur: 3.0.3
-      sisteransi: 1.0.5
+      minimatch: 3.1.2
     dev: true
 
-  /prop-types@15.8.1:
-    resolution: {integrity: sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==}
+  /node-domexception@1.0.0:
+    resolution: {integrity: sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==}
+    engines: {node: '>=10.5.0'}
+    dev: false
+
+  /node-ensure@0.0.0:
+    resolution: {integrity: sha512-DRI60hzo2oKN1ma0ckc6nQWlHU69RH6xN0sjQTjMpChPfTYvKZdcQFfdYK2RWbJcKyUizSIy/l8OTGxMAM1QDw==}
+    dev: false
+
+  /node-fetch-h2@2.3.0:
+    resolution: {integrity: sha512-ofRW94Ab0T4AOh5Fk8t0h8OBWrmjb0SSB20xh1H8YnPV9EJ+f5AMoYSUQ2zgJ4Iq2HAK0I2l5/Nequ8YzFS3Hg==}
+    engines: {node: 4.x || >=6.0.0}
     dependencies:
-      loose-envify: 1.4.0
-      object-assign: 4.1.1
-      react-is: 16.13.1
-    dev: true
+      http2-client: 1.3.5
 
-  /propagate@2.0.1:
-    resolution: {integrity: sha512-vGrhOavPSTz4QVNuBNdcNXePNdNMaO1xj9yBeH1ScQPjk/rhg9sSlCXPhMkFuaNNW/syTvYqsnbIJxMBfRbbag==}
-    engines: {node: '>= 8'}
+  /node-fetch-native@1.0.1:
+    resolution: {integrity: sha512-VzW+TAk2wE4X9maiKMlT+GsPU4OMmR1U9CrHSmd3DFLn2IcZ9VJ6M6BBugGfYUnPCLSYxXdZy17M0BEJyhUTwg==}
     dev: true
 
-  /property-expr@2.0.5:
-    resolution: {integrity: sha512-IJUkICM5dP5znhCckHSv30Q4b5/JA5enCtkRHYaOVOAocnH/1BQEYTC5NMfT3AVl/iXKdr3aqQbQn9DxyWknwA==}
+  /node-fetch@2.6.8:
+    resolution: {integrity: sha512-RZ6dBYuj8dRSfxpUSu+NsdF1dpPpluJxwOp+6IoDp/sH2QNDSvurYsAa+F1WxY2RjA1iP93xhcsUoYbF2XBqVg==}
+    engines: {node: 4.x || >=6.0.0}
+    peerDependencies:
+      encoding: ^0.1.0
+    peerDependenciesMeta:
+      encoding:
+        optional: true
+    dependencies:
+      whatwg-url: 5.0.0
     dev: false
 
-  /proto-list@1.2.4:
-    resolution: {integrity: sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==}
-    dev: true
-
-  /proxy-addr@2.0.7:
-    resolution: {integrity: sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==}
-    engines: {node: '>= 0.10'}
+  /node-fetch@2.7.0(encoding@0.1.13):
+    resolution: {integrity: sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==}
+    engines: {node: 4.x || >=6.0.0}
+    peerDependencies:
+      encoding: ^0.1.0
+    peerDependenciesMeta:
+      encoding:
+        optional: true
     dependencies:
-      forwarded: 0.2.0
-      ipaddr.js: 1.9.1
+      encoding: 0.1.13
+      whatwg-url: 5.0.0
 
-  /proxy-agent@5.0.0:
-    resolution: {integrity: sha512-gkH7BkvLVkSfX9Dk27W6TyNOWWZWRilRfk1XxGNWOYJ2TuedAv1yFpCaU9QSBmBe716XOTNpYNOzhysyw8xn7g==}
-    engines: {node: '>= 8'}
+  /node-forge@1.3.1:
+    resolution: {integrity: sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==}
+    engines: {node: '>= 6.13.0'}
+    dev: false
+
+  /node-gyp-build-optional-packages@5.0.7:
+    resolution: {integrity: sha512-YlCCc6Wffkx0kHkmam79GKvDQ6x+QZkMjFGrIMxgFNILFvGSbCp2fCBC55pGTT9gVaz8Na5CLmxt/urtzRv36w==}
+    hasBin: true
+    dev: false
+    optional: true
+
+  /node-gyp-build@4.7.0:
+    resolution: {integrity: sha512-PbZERfeFdrHQOOXiAKOY0VPbykZy90ndPKk0d+CFDegTKmWp1VgOTz2xACVbr1BjCWxrQp68CXtvNsveFhqDJg==}
+    hasBin: true
+    dev: false
+
+  /node-gyp@8.4.1:
+    resolution: {integrity: sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w==}
+    engines: {node: '>= 10.12.0'}
+    hasBin: true
     dependencies:
-      agent-base: 6.0.2
-      debug: 4.3.4(supports-color@8.1.1)
-      http-proxy-agent: 4.0.1
-      https-proxy-agent: 5.0.1
-      lru-cache: 5.1.1
-      pac-proxy-agent: 5.0.0
-      proxy-from-env: 1.1.0
-      socks-proxy-agent: 5.0.1
+      env-paths: 2.2.1
+      glob: 7.2.3
+      graceful-fs: 4.2.10
+      make-fetch-happen: 9.1.0
+      nopt: 5.0.0
+      npmlog: 6.0.2
+      rimraf: 3.0.2
+      semver: 7.6.0
+      tar: 6.2.1
+      which: 2.0.2
     transitivePeerDependencies:
+      - bluebird
       - supports-color
     dev: false
+    optional: true
+
+  /node-html-markdown@1.2.0:
+    resolution: {integrity: sha512-mGA53bSqo7j62PjmMuFPdO0efNT9pqiGYhQTNVCWkY7PdduRIECJF7n7NOrr5cb+d/js1GdYRLpoTYDwawRk6A==}
+    engines: {node: '>=10.0.0'}
+    dependencies:
+      node-html-parser: 5.4.2
+    dev: false
+
+  /node-html-parser@5.4.2:
+    resolution: {integrity: sha512-RaBPP3+51hPne/OolXxcz89iYvQvKOydaqoePpOgXcrOKZhjVIzmpKZz+Hd/RBO2/zN2q6CNJhQzucVz+u3Jyw==}
+    dependencies:
+      css-select: 4.3.0
+      he: 1.2.0
+    dev: false
 
-  /proxy-from-env@1.0.0:
-    resolution: {integrity: sha512-F2JHgJQ1iqwnHDcQjVBsq3n/uoaFL+iPW/eAeL7kVxy/2RrWaN4WroKjjvbsoRtv0ftelNyC01bjRhn/bhcf4A==}
-    dev: true
+  /node-int64@0.4.0:
+    resolution: {integrity: sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==}
 
-  /proxy-from-env@1.1.0:
-    resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==}
+  /node-machine-id@1.1.12:
+    resolution: {integrity: sha512-QNABxbrPa3qEIfrE6GOJ7BYIuignnJw7iQ2YPbc3Nla1HzRJjXzZOiikfF8m7eAMfichLt3M4VgLOetqgDmgGQ==}
+    dev: false
 
-  /ps-tree@1.2.0:
-    resolution: {integrity: sha512-0VnamPPYHl4uaU/nSFeZZpR21QAWRz+sRv4iW9+v/GS/J5U5iZB5BNN6J0RMoOvdx2gWM2+ZFMIm58q24e4UYA==}
-    engines: {node: '>= 0.10'}
-    hasBin: true
+  /node-readfiles@0.2.0:
+    resolution: {integrity: sha512-SU00ZarexNlE4Rjdm83vglt5Y9yiQ+XI1XpflWlb7q7UTN1JUItm69xMeiQCTxtTfnzt+83T8Cx+vI2ED++VDA==}
     dependencies:
-      event-stream: 3.3.4
-    dev: true
-
-  /pseudomap@1.0.2:
-    resolution: {integrity: sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==}
+      es6-promise: 3.3.1
 
-  /psl@1.9.0:
-    resolution: {integrity: sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==}
+  /node-releases@2.0.13:
+    resolution: {integrity: sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==}
 
-  /pstree.remy@1.1.8:
-    resolution: {integrity: sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==}
+  /node-releases@2.0.14:
+    resolution: {integrity: sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==}
     dev: true
 
-  /pug-attrs@3.0.0:
-    resolution: {integrity: sha512-azINV9dUtzPMFQktvTXciNAfAuVh/L/JCl0vtPCwvOA21uZrC08K/UnmrL+SXGEVc1FwzjW62+xw5S/uaLj6cA==}
+  /node-rsa@1.1.1:
+    resolution: {integrity: sha512-Jd4cvbJMryN21r5HgxQOpMEqv+ooke/korixNNK3mGqfGJmy0M77WDDzo/05969+OkMy3XW1UuZsSmW9KQm7Fw==}
     dependencies:
-      constantinople: 4.0.1
-      js-stringify: 1.0.2
-      pug-runtime: 3.0.1
-    dev: true
+      asn1: 0.2.6
+    dev: false
 
-  /pug-code-gen@3.0.2:
-    resolution: {integrity: sha512-nJMhW16MbiGRiyR4miDTQMRWDgKplnHyeLvioEJYbk1RsPI3FuA3saEP8uwnTb2nTJEKBU90NFVWJBk4OU5qyg==}
+  /node-ssh@12.0.5:
+    resolution: {integrity: sha512-uN2GTGdBRUUKkZmcNBr9OM+xKL6zq74emnkSyb1TshBdVWegj3boue6QallQeqZzo7YGVheP5gAovUL+8hZSig==}
+    engines: {node: '>= 10'}
     dependencies:
-      constantinople: 4.0.1
-      doctypes: 1.1.0
-      js-stringify: 1.0.2
-      pug-attrs: 3.0.0
-      pug-error: 2.0.0
-      pug-runtime: 3.0.1
-      void-elements: 3.1.0
-      with: 7.0.2
-    dev: true
+      is-stream: 2.0.1
+      make-dir: 3.1.0
+      sb-promise-queue: 2.1.0
+      sb-scandir: 3.1.0
+      shell-escape: 0.2.0
+      ssh2: 1.11.0
+    dev: false
 
-  /pug-error@2.0.0:
-    resolution: {integrity: sha512-sjiUsi9M4RAGHktC1drQfCr5C5eriu24Lfbt4s+7SykztEOwVZtbFk1RRq0tzLxcMxMYTBR+zMQaG07J/btayQ==}
-    dev: true
+  /nodemailer@6.9.9:
+    resolution: {integrity: sha512-dexTll8zqQoVJEZPwQAKzxxtFn0qTnjdQTchoU6Re9BUUGBJiOy3YMn/0ShTW6J5M0dfQ1NeDeRTTl4oIWgQMA==}
+    engines: {node: '>=6.0.0'}
+    dev: false
 
-  /pug-filters@4.0.0:
-    resolution: {integrity: sha512-yeNFtq5Yxmfz0f9z2rMXGw/8/4i1cCFecw/Q7+D0V2DdtII5UvqE12VaZ2AY7ri6o5RNXiweGH79OCq+2RQU4A==}
+  /nodemon@3.0.1:
+    resolution: {integrity: sha512-g9AZ7HmkhQkqXkRc20w+ZfQ73cHLbE8hnPbtaFbFtCumZsjyMhKk9LajQ07U5Ux28lvFjZ5X7HvWR1xzU8jHVw==}
+    engines: {node: '>=10'}
+    hasBin: true
     dependencies:
-      constantinople: 4.0.1
-      jstransformer: 1.0.0
-      pug-error: 2.0.0
-      pug-walk: 2.0.0
-      resolve: 1.22.1
+      chokidar: 3.5.2
+      debug: 3.2.7(supports-color@5.5.0)
+      ignore-by-default: 1.0.1
+      minimatch: 3.1.2
+      pstree.remy: 1.1.8
+      semver: 7.6.0
+      simple-update-notifier: 2.0.0
+      supports-color: 5.5.0
+      touch: 3.1.0
+      undefsafe: 2.0.5
     dev: true
 
-  /pug-lexer@5.0.1:
-    resolution: {integrity: sha512-0I6C62+keXlZPZkOJeVam9aBLVP2EnbeDw3An+k0/QlqdwH6rv8284nko14Na7c0TtqtogfWXcRoFE4O4Ff20w==}
+  /nopt@1.0.10:
+    resolution: {integrity: sha512-NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg==}
+    hasBin: true
     dependencies:
-      character-parser: 2.2.0
-      is-expression: 4.0.0
-      pug-error: 2.0.0
+      abbrev: 1.1.1
     dev: true
 
-  /pug-linker@4.0.0:
-    resolution: {integrity: sha512-gjD1yzp0yxbQqnzBAdlhbgoJL5qIFJw78juN1NpTLt/mfPJ5VgC4BvkoD3G23qKzJtIIXBbcCt6FioLSFLOHdw==}
+  /nopt@5.0.0:
+    resolution: {integrity: sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==}
+    engines: {node: '>=6'}
+    hasBin: true
     dependencies:
-      pug-error: 2.0.0
-      pug-walk: 2.0.0
-    dev: true
+      abbrev: 1.1.1
+    dev: false
+    optional: true
 
-  /pug-load@3.0.0:
-    resolution: {integrity: sha512-OCjTEnhLWZBvS4zni/WUMjH2YSUosnsmjGBB1An7CsKQarYSWQ0GCVyd4eQPMFJqZ8w9xgs01QdiZXKVjk92EQ==}
+  /nopt@6.0.0:
+    resolution: {integrity: sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==}
+    engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
+    hasBin: true
     dependencies:
-      object-assign: 4.1.1
-      pug-walk: 2.0.0
+      abbrev: 1.1.1
     dev: true
 
-  /pug-parser@6.0.0:
-    resolution: {integrity: sha512-ukiYM/9cH6Cml+AOl5kETtM9NR3WulyVP2y4HOU45DyMim1IeP/OOiyEWRr6qk5I5klpsBnbuHpwKmTx6WURnw==}
+  /normalize-package-data@2.5.0:
+    resolution: {integrity: sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==}
     dependencies:
-      pug-error: 2.0.0
-      token-stream: 1.0.0
-    dev: true
-
-  /pug-runtime@3.0.1:
-    resolution: {integrity: sha512-L50zbvrQ35TkpHwv0G6aLSuueDRwc/97XdY8kL3tOT0FmhgG7UypU3VztfV/LATAvmUfYi4wNxSajhSAeNN+Kg==}
+      hosted-git-info: 2.8.9
+      resolve: 1.22.8
+      semver: 7.6.0
+      validate-npm-package-license: 3.0.4
     dev: true
 
-  /pug-strip-comments@2.0.0:
-    resolution: {integrity: sha512-zo8DsDpH7eTkPHCXFeAk1xZXJbyoTfdPlNR0bK7rpOMuhBYb0f5qUVCO1xlsitYd3w5FQTK7zpNVKb3rZoUrrQ==}
-    dependencies:
-      pug-error: 2.0.0
-    dev: true
+  /normalize-path@3.0.0:
+    resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==}
+    engines: {node: '>=0.10.0'}
 
-  /pug-walk@2.0.0:
-    resolution: {integrity: sha512-yYELe9Q5q9IQhuvqsZNwA5hfPkMJ8u92bQLIMcsMxf/VADjNtEYptU+inlufAFYcWdHlwNfZOEnOOQrZrcyJCQ==}
+  /normalize-range@0.1.2:
+    resolution: {integrity: sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==}
+    engines: {node: '>=0.10.0'}
     dev: true
 
-  /pug@3.0.2:
-    resolution: {integrity: sha512-bp0I/hiK1D1vChHh6EfDxtndHji55XP/ZJKwsRqrz6lRia6ZC2OZbdAymlxdVFwd1L70ebrVJw4/eZ79skrIaw==}
-    dependencies:
-      pug-code-gen: 3.0.2
-      pug-filters: 4.0.0
-      pug-lexer: 5.0.1
-      pug-linker: 4.0.0
-      pug-load: 3.0.0
-      pug-parser: 6.0.0
-      pug-runtime: 3.0.1
-      pug-strip-comments: 2.0.0
-    dev: true
+  /normalize-wheel-es@1.2.0:
+    resolution: {integrity: sha512-Wj7+EJQ8mSuXr2iWfnujrimU35R2W4FAErEyTmJoJ7ucwTn2hOUSsRehMb5RSYkxXGTM7Y9QpvPmp++w5ftoJw==}
+    dev: false
 
-  /pump@2.0.1:
-    resolution: {integrity: sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==}
+  /npm-run-path@4.0.1:
+    resolution: {integrity: sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==}
+    engines: {node: '>=8'}
     dependencies:
-      end-of-stream: 1.4.4
-      once: 1.4.0
+      path-key: 3.1.1
 
-  /pump@3.0.0:
-    resolution: {integrity: sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==}
+  /npm-run-path@5.1.0:
+    resolution: {integrity: sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
     dependencies:
-      end-of-stream: 1.4.4
-      once: 1.4.0
+      path-key: 4.0.0
+    dev: true
 
-  /pumpify@1.5.1:
-    resolution: {integrity: sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==}
+  /npmlog@6.0.2:
+    resolution: {integrity: sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==}
+    engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
     dependencies:
-      duplexify: 3.7.1
-      inherits: 2.0.4
-      pump: 2.0.1
-
-  /punycode@1.3.2:
-    resolution: {integrity: sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==}
+      are-we-there-yet: 3.0.1
+      console-control-strings: 1.1.0
+      gauge: 4.0.4
+      set-blocking: 2.0.0
     dev: false
+    optional: true
 
-  /punycode@2.2.0:
-    resolution: {integrity: sha512-LN6QV1IJ9ZhxWTNdktaPClrNfp8xdSAYS0Zk2ddX7XsXZAxckMHPCBcHRo0cTcEIgYPRiGEkmji3Idkh2yFtYw==}
-    engines: {node: '>=6'}
-
-  /puppeteer-core@2.1.1:
-    resolution: {integrity: sha512-n13AWriBMPYxnpbb6bnaY5YoY6rGj8vPLrz6CZF3o0qJNEwlcfJVxBzYZ0NJsQ21UbdJoijPCDrM++SUVEz7+w==}
-    engines: {node: '>=8.16.0'}
+  /nth-check@2.1.1:
+    resolution: {integrity: sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==}
     dependencies:
-      '@types/mime-types': 2.1.1
-      debug: 4.3.4(supports-color@8.1.1)
-      extract-zip: 1.7.0
-      https-proxy-agent: 4.0.0
-      mime: 2.6.0
-      mime-types: 2.1.35
-      progress: 2.0.3
-      proxy-from-env: 1.1.0
-      rimraf: 2.7.1
-      ws: 6.2.2
-    transitivePeerDependencies:
-      - bufferutil
-      - supports-color
-      - utf-8-validate
-    dev: true
+      boolbase: 1.0.0
 
-  /pure-rand@6.0.1:
-    resolution: {integrity: sha512-t+x1zEHDjBwkDGY5v5ApnZ/utcd4XYDiJsaQQoptTXgUXX95sDg1elCdJghzicm7n2mbCBJ3uYWr6M22SO19rg==}
-    dev: true
+  /nub@0.0.0:
+    resolution: {integrity: sha512-dK0Ss9C34R/vV0FfYJXuqDAqHlaW9fvWVufq9MmGF2umCuDbd5GRfRD9fpi/LiM0l4ZXf8IBB+RYmZExqCrf0w==}
+    dev: false
 
-  /python-struct@1.1.3:
-    resolution: {integrity: sha512-UsI/mNvk25jRpGKYI38Nfbv84z48oiIWwG67DLVvjRhy8B/0aIK+5Ju5WOHgw/o9rnEmbAS00v4rgKFQeC332Q==}
-    dependencies:
-      long: 4.0.0
+  /num-sort@2.1.0:
+    resolution: {integrity: sha512-1MQz1Ed8z2yckoBeSfkQHHO9K1yDRxxtotKSJ9yvcTUUxSvfvzEq5GwBrjjHEpMlq/k5gvXdmJ1SbYxWtpNoVg==}
+    engines: {node: '>=8'}
     dev: false
 
-  /qqjs@0.3.11:
-    resolution: {integrity: sha512-pB2X5AduTl78J+xRSxQiEmga1jQV0j43jOPs/MTgTLApGFEOn6NgdE2dEjp7nvDtjkIOZbvFIojAiYUx6ep3zg==}
-    engines: {node: '>=8.0.0'}
+  /number-allocator@1.0.14:
+    resolution: {integrity: sha512-OrL44UTVAvkKdOdRQZIJpLkAdjXGTRda052sN4sO77bKEzYYqWKMBjQvrJFzqygI99gL6Z4u2xctPW1tB8ErvA==}
     dependencies:
-      chalk: 2.4.2
       debug: 4.3.4(supports-color@8.1.1)
-      execa: 0.10.0
-      fs-extra: 6.0.1
-      get-stream: 5.2.0
-      glob: 7.2.3
-      globby: 11.1.0
-      http-call: 5.3.0
-      load-json-file: 6.2.0
-      pkg-dir: 4.2.0
-      tar-fs: 2.1.1
-      tmp: 0.1.0
-      write-json-file: 4.3.0
+      js-sdsl: 4.3.0
     transitivePeerDependencies:
       - supports-color
-    dev: true
-
-  /qrcode@1.5.3:
-    resolution: {integrity: sha512-puyri6ApkEHYiVl4CFzo1tDkAZ+ATcnbJrJ6RiBM1Fhctdn/ix9MTE3hRph33omisEbC/2fcfemsseiKgBPKZg==}
-    engines: {node: '>=10.13.0'}
-    hasBin: true
-    dependencies:
-      dijkstrajs: 1.0.3
-      encode-utf8: 1.0.3
-      pngjs: 5.0.0
-      yargs: 15.4.1
     dev: false
 
-  /qs@6.11.0:
-    resolution: {integrity: sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==}
-    engines: {node: '>=0.6'}
-    dependencies:
-      side-channel: 1.0.4
-
-  /qs@6.5.3:
-    resolution: {integrity: sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==}
-    engines: {node: '>=0.6'}
-
-  /query-string@7.1.1:
-    resolution: {integrity: sha512-MplouLRDHBZSG9z7fpuAAcI7aAYjDLhtsiVZsevsfaHWDS2IDdORKbSd1kWUA+V4zyva/HZoSfpwnYMMQDhb0w==}
-    engines: {node: '>=6'}
+  /nunjucks@3.2.4(chokidar@3.5.2):
+    resolution: {integrity: sha512-26XRV6BhkgK0VOxfbU5cQI+ICFUtMLixv1noZn1tGU38kQH5A5nmmbk/O45xdyBhD1esk47nKrY0mvQpZIhRjQ==}
+    engines: {node: '>= 6.9.0'}
+    hasBin: true
+    peerDependencies:
+      chokidar: 3.5.2
+    peerDependenciesMeta:
+      chokidar:
+        optional: true
     dependencies:
-      decode-uri-component: 0.2.2
-      filter-obj: 1.1.0
-      split-on-first: 1.1.0
-      strict-uri-encode: 2.0.0
-    dev: false
-
-  /querystring@0.2.0:
-    resolution: {integrity: sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==}
-    engines: {node: '>=0.4.x'}
-    deprecated: The querystring API is considered Legacy. new code should use the URLSearchParams API instead.
+      a-sync-waterfall: 1.0.1
+      asap: 2.0.6
+      chokidar: 3.5.2
+      commander: 5.1.0
     dev: false
 
-  /querystring@0.2.1:
-    resolution: {integrity: sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg==}
-    engines: {node: '>=0.4.x'}
-    deprecated: The querystring API is considered Legacy. new code should use the URLSearchParams API instead.
+  /nwsapi@2.2.2:
+    resolution: {integrity: sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw==}
     dev: true
 
-  /querystringify@2.2.0:
-    resolution: {integrity: sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==}
-
-  /queue-lit@1.5.0:
-    resolution: {integrity: sha512-IslToJ4eiCEE9xwMzq3viOO5nH8sUWUCwoElrhNMozzr9IIt2qqvB4I+uHu/zJTQVqc9R5DFwok4ijNK1pU3fA==}
+  /nwsapi@2.2.7:
+    resolution: {integrity: sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==}
     dev: true
 
-  /queue-microtask@1.2.3:
-    resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
+  /oas-kit-common@1.0.8:
+    resolution: {integrity: sha512-pJTS2+T0oGIwgjGpw7sIRU8RQMcUoKCDWFLdBqKB2BNmGpbBMH2sdqAaOXUg8OzonZHU0L7vfJu1mJFEiYDWOQ==}
+    dependencies:
+      fast-safe-stringify: 2.1.1
 
-  /quoted-printable@1.0.1:
-    resolution: {integrity: sha512-cihC68OcGiQOjGiXuo5Jk6XHANTHl1K4JLk/xlEJRTIXfy19Sg6XzB95XonYgr+1rB88bCpr7WZE7D7AlZow4g==}
+  /oas-linter@3.2.2:
+    resolution: {integrity: sha512-KEGjPDVoU5K6swgo9hJVA/qYGlwfbFx+Kg2QB/kd7rzV5N8N5Mg6PlsoCMohVnQmo+pzJap/F610qTodKzecGQ==}
+    dependencies:
+      '@exodus/schemasafe': 1.3.0
+      should: 13.2.3
+      yaml: 1.10.2
+
+  /oas-resolver-browser@2.5.6:
+    resolution: {integrity: sha512-Jw5elT/kwUJrnGaVuRWe1D7hmnYWB8rfDDjBnpQ+RYY/dzAewGXeTexXzt4fGEo6PUE4eqKqPWF79MZxxvMppA==}
     hasBin: true
     dependencies:
-      utf8: 2.1.2
+      node-fetch-h2: 2.3.0
+      oas-kit-common: 1.0.8
+      path-browserify: 1.0.1
+      reftools: 1.1.9
+      yaml: 1.10.2
+      yargs: 17.7.2
     dev: false
 
-  /railroad-diagrams@1.0.0:
-    resolution: {integrity: sha512-cz93DjNeLY0idrCNOH6PviZGRN9GJhsdm9hpn1YCS879fj4W+x5IFJhhkRZcwVgMmFF7R82UA/7Oh+R8lLZg6A==}
-    dev: false
+  /oas-resolver@2.5.6:
+    resolution: {integrity: sha512-Yx5PWQNZomfEhPPOphFbZKi9W93CocQj18NlD2Pa4GWZzdZpSJvYwoiuurRI7m3SpcChrnO08hkuQDL3FGsVFQ==}
+    hasBin: true
+    dependencies:
+      node-fetch-h2: 2.3.0
+      oas-kit-common: 1.0.8
+      reftools: 1.1.9
+      yaml: 1.10.2
+      yargs: 17.7.2
 
-  /ramda@0.28.0:
-    resolution: {integrity: sha512-9QnLuG/kPVgWvMQ4aODhsBUFKOUmnbUnsSXACv+NCQZcHbeb+v8Lodp8OVxtRULN1/xOyYLLaL6npE6dMq5QTA==}
-    dev: true
+  /oas-schema-walker@1.1.5:
+    resolution: {integrity: sha512-2yucenq1a9YPmeNExoUa9Qwrt9RFkjqaMAA1X+U7sbb0AqBeTIdMHky9SQQ6iN94bO5NW0W4TRYXerG+BdAvAQ==}
 
-  /randexp@0.4.6:
-    resolution: {integrity: sha512-80WNmd9DA0tmZrw9qQa62GPPWfuXJknrmVmLcxvq4uZBdYqb1wYoKTmnlGUchvVWe0XiLupYkBoXVOxz3C8DYQ==}
-    engines: {node: '>=0.12'}
+  /oas-validator@5.0.8:
+    resolution: {integrity: sha512-cu20/HE5N5HKqVygs3dt94eYJfBi0TsZvPVXDhbXQHiEityDN+RROTleefoKRKKJ9dFAF2JBkDHgvWj0sjKGmw==}
     dependencies:
-      discontinuous-range: 1.0.0
-      ret: 0.1.15
-    dev: false
+      call-me-maybe: 1.0.1
+      oas-kit-common: 1.0.8
+      oas-linter: 3.2.2
+      oas-resolver: 2.5.6
+      oas-schema-walker: 1.1.5
+      reftools: 1.1.9
+      should: 13.2.3
+      yaml: 1.10.2
 
-  /random-bytes@1.0.0:
-    resolution: {integrity: sha512-iv7LhNVO047HzYR3InF6pUcUsPQiHTM1Qal51DcGSuZFBil1aBBWG5eHPNek7bvILMaYJ/8RU1e8w1AMdHmLQQ==}
-    engines: {node: '>= 0.8'}
+  /oauth-1.0a@2.2.6:
+    resolution: {integrity: sha512-6bkxv3N4Gu5lty4viIcIAnq5GbxECviMBeKR3WX/q87SPQ8E8aursPZUtsXDnxCs787af09WPRBLqYrf/lwoYQ==}
     dev: false
 
-  /randombytes@2.1.0:
-    resolution: {integrity: sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==}
-    dependencies:
-      safe-buffer: 5.2.1
+  /oauth-sign@0.9.0:
+    resolution: {integrity: sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==}
+    dev: false
 
-  /range-parser@1.2.1:
-    resolution: {integrity: sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==}
-    engines: {node: '>= 0.6'}
+  /object-assign@4.1.1:
+    resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==}
+    engines: {node: '>=0.10.0'}
 
-  /raw-body@2.5.1:
-    resolution: {integrity: sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==}
-    engines: {node: '>= 0.8'}
-    dependencies:
-      bytes: 3.1.2
-      http-errors: 2.0.0
-      iconv-lite: 0.4.24
-      unpipe: 1.0.0
+  /object-hash@3.0.0:
+    resolution: {integrity: sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==}
+    engines: {node: '>= 6'}
+    dev: false
 
-  /react-colorful@5.6.1(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-1exovf0uGTGyq5mXQT0zgQ80uvj2PCwvF8zY1RN9/vbJVSjSo3fsB/4L3ObbF7u70NduSiK4xu4Y6q1MHoUGEw==}
-    peerDependencies:
-      react: '>=16.8.0'
-      react-dom: '>=16.8.0'
-    dependencies:
-      react: 17.0.2
-      react-dom: 18.2.0(react@17.0.2)
-    dev: true
+  /object-inspect@1.12.3:
+    resolution: {integrity: sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==}
 
-  /react-dom@18.2.0(react@17.0.2):
-    resolution: {integrity: sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==}
-    peerDependencies:
-      react: ^18.2.0
-    dependencies:
-      loose-envify: 1.4.0
-      react: 17.0.2
-      scheduler: 0.23.0
-    dev: true
+  /object-inspect@1.13.1:
+    resolution: {integrity: sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==}
 
-  /react-inspector@6.0.1(react@17.0.2):
-    resolution: {integrity: sha512-cxKSeFTf7jpSSVddm66sKdolG90qURAX3g1roTeaN6x0YEbtWc8JpmFN9+yIqLNH2uEkYerWLtJZIXRIFuBKrg==}
-    peerDependencies:
-      react: ^16.8.4 || ^17.0.0 || ^18.0.0
+  /object-is@1.1.5:
+    resolution: {integrity: sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==}
+    engines: {node: '>= 0.4'}
     dependencies:
-      react: 17.0.2
-    dev: true
-
-  /react-is@16.13.1:
-    resolution: {integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==}
-    dev: true
-
-  /react-is@17.0.2:
-    resolution: {integrity: sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==}
-    dev: true
+      call-bind: 1.0.7
+      define-properties: 1.2.0
 
-  /react-is@18.2.0:
-    resolution: {integrity: sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==}
-    dev: true
+  /object-keys@1.1.1:
+    resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==}
+    engines: {node: '>= 0.4'}
 
-  /react-refresh@0.14.0:
-    resolution: {integrity: sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  /object-treeify@1.1.33:
+    resolution: {integrity: sha512-EFVjAYfzWqWsBMRHPMAXLCDIJnpMhdWAqR7xG6M6a2cs6PMFpl/+Z20w9zDW4vkxOFfddegBKq9Rehd0bxWE7A==}
+    engines: {node: '>= 10'}
+    dev: false
 
-  /react@17.0.2:
-    resolution: {integrity: sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==}
-    engines: {node: '>=0.10.0'}
+  /object.assign@4.1.4:
+    resolution: {integrity: sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==}
+    engines: {node: '>= 0.4'}
     dependencies:
-      loose-envify: 1.4.0
-      object-assign: 4.1.1
-    dev: true
+      call-bind: 1.0.7
+      define-properties: 1.2.0
+      has-symbols: 1.0.3
+      object-keys: 1.1.1
 
-  /read-pkg-up@1.0.1:
-    resolution: {integrity: sha512-WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A==}
-    engines: {node: '>=0.10.0'}
+  /object.assign@4.1.5:
+    resolution: {integrity: sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==}
+    engines: {node: '>= 0.4'}
     dependencies:
-      find-up: 1.1.2
-      read-pkg: 1.1.0
-    dev: true
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      has-symbols: 1.0.3
+      object-keys: 1.1.1
 
-  /read-pkg-up@7.0.1:
-    resolution: {integrity: sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==}
-    engines: {node: '>=8'}
+  /object.entries@1.1.5:
+    resolution: {integrity: sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==}
+    engines: {node: '>= 0.4'}
     dependencies:
-      find-up: 4.1.0
-      read-pkg: 5.2.0
-      type-fest: 0.8.1
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-abstract: 1.22.5
     dev: true
 
-  /read-pkg@1.1.0:
-    resolution: {integrity: sha512-7BGwRHqt4s/uVbuyoeejRn4YmFnYZiFl4AuaeXHlgZf3sONF0SOGlxs2Pw8g6hCKupo08RafIO5YXFNOKTfwsQ==}
-    engines: {node: '>=0.10.0'}
+  /object.fromentries@2.0.7:
+    resolution: {integrity: sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==}
+    engines: {node: '>= 0.4'}
     dependencies:
-      load-json-file: 1.1.0
-      normalize-package-data: 2.5.0
-      path-type: 1.1.0
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-abstract: 1.22.5
     dev: true
 
-  /read-pkg@4.0.1:
-    resolution: {integrity: sha512-+UBirHHDm5J+3WDmLBZYSklRYg82nMlz+enn+GMZ22nSR2f4bzxmhso6rzQW/3mT2PVzpzDTiYIZahk8UmZ44w==}
-    engines: {node: '>=6'}
+  /object.groupby@1.0.1:
+    resolution: {integrity: sha512-HqaQtqLnp/8Bn4GL16cj+CUYbnpe1bh0TtEaWvybszDG4tgxCJuRpV8VGuvNaI1fAnI4lUJzDG55MXcOH4JZcQ==}
     dependencies:
-      normalize-package-data: 2.5.0
-      parse-json: 4.0.0
-      pify: 3.0.0
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-abstract: 1.22.5
+      get-intrinsic: 1.2.4
     dev: true
 
-  /read-pkg@5.2.0:
-    resolution: {integrity: sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==}
-    engines: {node: '>=8'}
+  /object.values@1.1.7:
+    resolution: {integrity: sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==}
+    engines: {node: '>= 0.4'}
     dependencies:
-      '@types/normalize-package-data': 2.4.1
-      normalize-package-data: 2.5.0
-      parse-json: 5.2.0
-      type-fest: 0.6.0
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-abstract: 1.22.5
     dev: true
 
-  /readable-stream@1.1.14:
-    resolution: {integrity: sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==}
-    dependencies:
-      core-util-is: 1.0.3
-      inherits: 2.0.4
-      isarray: 0.0.1
-      string_decoder: 0.10.31
-
-  /readable-stream@2.3.7:
-    resolution: {integrity: sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==}
-    dependencies:
-      core-util-is: 1.0.3
-      inherits: 2.0.4
-      isarray: 1.0.0
-      process-nextick-args: 2.0.1
-      safe-buffer: 5.1.2
-      string_decoder: 1.1.1
-      util-deprecate: 1.0.2
-
-  /readable-stream@3.6.0:
-    resolution: {integrity: sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==}
-    engines: {node: '>= 6'}
-    dependencies:
-      inherits: 2.0.4
-      string_decoder: 1.3.0
-      util-deprecate: 1.0.2
-
-  /readable-web-to-node-stream@3.0.2:
-    resolution: {integrity: sha512-ePeK6cc1EcKLEhJFt/AebMCLL+GgSKhuygrZ/GLaKZYEecIgIECf4UaUuaByiGtzckwR4ain9VzUh95T1exYGw==}
-    engines: {node: '>=8'}
+  /on-finished@2.3.0:
+    resolution: {integrity: sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==}
+    engines: {node: '>= 0.8'}
     dependencies:
-      readable-stream: 3.6.0
+      ee-first: 1.1.1
     dev: false
 
-  /readdirp@3.6.0:
-    resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==}
-    engines: {node: '>=8.10.0'}
+  /on-finished@2.4.1:
+    resolution: {integrity: sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==}
+    engines: {node: '>= 0.8'}
     dependencies:
-      picomatch: 2.3.1
+      ee-first: 1.1.1
 
-  /recast@0.20.5:
-    resolution: {integrity: sha512-E5qICoPoNL4yU0H0NoBDntNB0Q5oMSNh9usFctYniLBluTthi3RsQVBXIJNbApOlvSwW/RGxIuokPcAc59J5fQ==}
-    engines: {node: '>= 4'}
+  /on-headers@1.0.2:
+    resolution: {integrity: sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==}
+    engines: {node: '>= 0.8'}
+
+  /once@1.4.0:
+    resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}
     dependencies:
-      ast-types: 0.14.2
-      esprima: 4.0.1
-      source-map: 0.6.1
-      tslib: 2.5.0
-    dev: true
+      wrappy: 1.0.2
 
-  /recast@0.21.5:
-    resolution: {integrity: sha512-hjMmLaUXAm1hIuTqOdeYObMslq/q+Xff6QE3Y2P+uoHAg2nmVlLBps2hzh1UJDdMtDTMXOFewK6ky51JQIeECg==}
-    engines: {node: '>= 4'}
+  /one-time@1.0.0:
+    resolution: {integrity: sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g==}
     dependencies:
-      ast-types: 0.15.2
-      esprima: 4.0.1
-      source-map: 0.6.1
-      tslib: 2.5.0
+      fn.name: 1.1.0
+    dev: false
 
-  /recast@0.22.0:
-    resolution: {integrity: sha512-5AAx+mujtXijsEavc5lWXBPQqrM4+Dl5qNH96N2aNeuJFUzpiiToKPsxQD/zAIJHspz7zz0maX0PCtCTFVlixQ==}
-    engines: {node: '>= 4'}
+  /onetime@5.1.2:
+    resolution: {integrity: sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==}
+    engines: {node: '>=6'}
     dependencies:
-      assert: 2.0.0
-      ast-types: 0.15.2
-      esprima: 4.0.1
-      source-map: 0.6.1
-      tslib: 2.5.0
-    dev: true
+      mimic-fn: 2.1.0
 
-  /recast@0.23.1:
-    resolution: {integrity: sha512-RokaBcoxSjXUDzz1TXSZmZsSW6ZpLmlA3GGqJ8uuTrQ9hZhEz+4Tpsc+gRvYRJ2BU4H+ZyUlg91eSGDw7bwy7g==}
-    engines: {node: '>= 4'}
+  /onetime@6.0.0:
+    resolution: {integrity: sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==}
+    engines: {node: '>=12'}
     dependencies:
-      assert: 2.0.0
-      ast-types: 0.16.1
-      esprima: 4.0.1
-      source-map: 0.6.1
-      tslib: 2.5.0
+      mimic-fn: 4.0.0
     dev: true
 
-  /rechoir@0.6.2:
-    resolution: {integrity: sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw==}
-    engines: {node: '>= 0.10'}
+  /ono@7.1.3:
+    resolution: {integrity: sha512-9jnfVriq7uJM4o5ganUY54ntUm+5EK21EGaQ5NWnkWg3zz5ywbbonlBguRcnmF1/HDiIe3zxNxXcO1YPBmPcQQ==}
     dependencies:
-      resolve: 1.22.1
+      '@jsdevtools/ono': 7.1.3
+    dev: false
 
-  /redent@3.0.0:
-    resolution: {integrity: sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==}
+  /open@7.4.2:
+    resolution: {integrity: sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==}
     engines: {node: '>=8'}
     dependencies:
-      indent-string: 4.0.0
-      strip-indent: 3.0.0
-    dev: true
+      is-docker: 2.2.1
+      is-wsl: 2.2.0
+    dev: false
 
-  /redeyed@2.1.1:
-    resolution: {integrity: sha512-FNpGGo1DycYAdnrKFxCMmKYgo/mILAqtRYbkdQD8Ep/Hk2PQ5+aEAEx+IU713RTDmuBaH0c8P5ZozurNu5ObRQ==}
+  /open@8.4.0:
+    resolution: {integrity: sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==}
+    engines: {node: '>=12'}
     dependencies:
-      esprima: 4.0.1
+      define-lazy-prop: 2.0.0
+      is-docker: 2.2.1
+      is-wsl: 2.2.0
 
-  /redis-commands@1.7.0:
-    resolution: {integrity: sha512-nJWqw3bTFy21hX/CPKHth6sfhZbdiHP6bTawSgQBlKOVRG7EZkfHbbHwQJnrE4vsQf0CMNE+3gJ4Fmm16vdVlQ==}
+  /openai@4.38.5:
+    resolution: {integrity: sha512-Ym5GJL98ZhLJJ7enBx53jjG3vwN/fsB+Ozh46nnRZZS9W1NiYqbwkJ+sXd3dkCIiWIgcyyOPL2Zr8SQAzbpj3g==}
+    hasBin: true
+    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)
+      web-streams-polyfill: 3.2.1
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
     dev: false
 
-  /redis-errors@1.2.0:
-    resolution: {integrity: sha512-1qny3OExCf0UvUV/5wpYKf2YwPcOqXzkwKKSmKHiE6ZMQs5heeE/c8eXK+PNllPvmjgAbfnsbpkGZWy8cBpn9w==}
-    engines: {node: '>=4'}
+  /openapi-jsonschema-parameters@12.1.3:
+    resolution: {integrity: sha512-aHypKxWHwu2lVqfCIOCZeJA/2NTDiP63aPwuoIC+5ksLK5/IQZ3oKTz7GiaIegz5zFvpMDxDvLR2DMQQSkOAug==}
+    dependencies:
+      openapi-types: 12.1.3
     dev: false
 
-  /redis-parser@3.0.0:
-    resolution: {integrity: sha512-DJnGAeenTdpMEH6uAJRK/uiyEIH9WVsUmoLwzudwGJUwZPp80PDBWPHXSAGNPwNvIXAbe7MSUB1zQFugFml66A==}
-    engines: {node: '>=4'}
+  /openapi-request-validator@12.1.0:
+    resolution: {integrity: sha512-WbcX/mrRGq0GBOqf/Rv4X0vY2WUO1ZmOjrWsnRByEIIJ/6LDWVUqlgEnpVEzpDN8Z2/XoK+YPcFnqIalFmn3sA==}
     dependencies:
-      redis-errors: 1.2.0
+      ajv: 8.12.0
+      ajv-formats: 2.1.1(ajv@8.12.0)
+      content-type: 1.0.5
+      openapi-jsonschema-parameters: 12.1.3
+      openapi-types: 12.1.3
+      ts-log: 2.2.5
     dev: false
 
-  /redis@3.1.2:
-    resolution: {integrity: sha512-grn5KoZLr/qrRQVwoSkmzdbw6pwF+/rwODtrOr6vuBRiR/f3rjSTGupbF90Zpqm2oenix8Do6RV7pYEkGwlKkw==}
-    engines: {node: '>=10'}
+  /openapi-sampler@1.4.0:
+    resolution: {integrity: sha512-3FKJQCHAMG9T7RsRy9u5Ft4ERPq1QQmn77C8T3OSofYL9uur59AqychvQ0YQKijrqRwIkAbzkh+nQnAE3gjMVA==}
     dependencies:
-      denque: 1.5.1
-      redis-commands: 1.7.0
-      redis-errors: 1.2.0
-      redis-parser: 3.0.0
-    dev: false
+      '@types/json-schema': 7.0.15
+      json-pointer: 0.6.2
+    dev: true
 
-  /redlock@4.2.0:
-    resolution: {integrity: sha512-j+oQlG+dOwcetUt2WJWttu4CZVeRzUrcVcISFmEmfyuwCVSJ93rDT7YSgg7H7rnxwoRyk/jU46kycVka5tW7jA==}
-    engines: {node: '>=8.0.0'}
+  /openapi-to-postmanv2@4.20.1:
+    resolution: {integrity: sha512-Cr8fWZVtBk6M+vzyogeJGUpSrGatugMkPmaBZsbdS3rXNir1xRxUG6KQ4RTL8LoaK1oVGlIfU9Jp9NsPmockfg==}
+    engines: {node: '>=8'}
+    hasBin: true
     dependencies:
-      bluebird: 3.7.2
+      ajv: 8.11.0
+      ajv-draft-04: 1.0.0(ajv@8.11.0)
+      ajv-formats: 2.1.1(ajv@8.11.0)
+      async: 3.2.4
+      commander: 2.20.3
+      graphlib: 2.1.8
+      js-yaml: 4.1.0
+      json-schema-merge-allof: 0.8.1
+      lodash: 4.17.21
+      oas-resolver-browser: 2.5.6
+      object-hash: 3.0.0
+      path-browserify: 1.0.1
+      postman-collection: 4.2.1
+      swagger2openapi: 7.0.8
+      traverse: 0.6.6
+      yaml: 1.10.2
+    transitivePeerDependencies:
+      - encoding
     dev: false
 
-  /reflect-metadata@0.1.13:
-    resolution: {integrity: sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==}
+  /openapi-types@10.0.0:
+    resolution: {integrity: sha512-Y8xOCT2eiKGYDzMW9R4x5cmfc3vGaaI4EL2pwhDmodWw1HlK18YcZ4uJxc7Rdp7/gGzAygzH9SXr6GKYIXbRcQ==}
     dev: false
 
-  /reftools@1.1.9:
-    resolution: {integrity: sha512-OVede/NQE13xBQ+ob5CKd5KyeJYU2YInb1bmV4nRoOfquZPkAkxuOXicSe1PvqIuZZ4kD13sPKBbR7UFDmli6w==}
+  /openapi-types@12.1.3:
+    resolution: {integrity: sha512-N4YtSYJqghVu4iek2ZUvcN/0aqH1kRDuNqzcycDxhOUpg7GdvLa2F3DgS6yBNhInhv2r/6I0Flkn7CqL8+nIcw==}
     dev: false
 
-  /regenerate-unicode-properties@10.1.0:
-    resolution: {integrity: sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==}
-    engines: {node: '>=4'}
-    dependencies:
-      regenerate: 1.4.2
-    dev: true
-
-  /regenerate@1.4.2:
-    resolution: {integrity: sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==}
-    dev: true
-
-  /regenerator-runtime@0.11.1:
-    resolution: {integrity: sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==}
+  /openurl@1.1.1:
+    resolution: {integrity: sha512-d/gTkTb1i1GKz5k3XE3XFV/PxQ1k45zDqGP2OA7YhgsaLoqm6qRvARAZOFer1fcXritWlGBRCu/UgeS4HAnXAA==}
     dev: false
 
-  /regenerator-runtime@0.13.11:
-    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+  /option@0.2.4:
+    resolution: {integrity: sha512-pkEqbDyl8ou5cpq+VsnQbe/WlEy5qS7xPzMS1U55OCG9KPvwFD46zDbxQIj3egJSFc3D+XhYOPUzz49zQAVy7A==}
+    dev: false
 
-  /regenerator-runtime@0.13.9:
-    resolution: {integrity: sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==}
+  /optionator@0.8.3:
+    resolution: {integrity: sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==}
+    engines: {node: '>= 0.8.0'}
+    dependencies:
+      deep-is: 0.1.4
+      fast-levenshtein: 2.0.6
+      levn: 0.3.0
+      prelude-ls: 1.1.2
+      type-check: 0.3.2
+      word-wrap: 1.2.3
 
-  /regenerator-transform@0.15.1:
-    resolution: {integrity: sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg==}
+  /optionator@0.9.3:
+    resolution: {integrity: sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==}
+    engines: {node: '>= 0.8.0'}
     dependencies:
-      '@babel/runtime': 7.20.7
+      '@aashutoshrathi/word-wrap': 1.2.6
+      deep-is: 0.1.4
+      fast-levenshtein: 2.0.6
+      levn: 0.4.1
+      prelude-ls: 1.2.1
+      type-check: 0.4.0
     dev: true
 
-  /regex-not@1.0.2:
-    resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
-    engines: {node: '>=0.10.0'}
+  /ora@5.4.1:
+    resolution: {integrity: sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==}
+    engines: {node: '>=10'}
     dependencies:
-      extend-shallow: 3.0.2
-      safe-regex: 1.1.0
+      bl: 4.1.0
+      chalk: 4.1.2
+      cli-cursor: 3.1.0
+      cli-spinners: 2.9.0
+      is-interactive: 1.0.0
+      is-unicode-supported: 0.1.0
+      log-symbols: 4.1.0
+      strip-ansi: 6.0.1
+      wcwidth: 1.0.1
     dev: true
 
-  /regexp-tree@0.1.25:
-    resolution: {integrity: sha512-szcL3aqw+vEeuxhL1AMYRyeMP+goYF5I/guaH10uJX5xbGyeQeNPPneaj3ZWVmGLCDxrVaaYekkr5R12gk4dJw==}
-    hasBin: true
+  /os-tmpdir@1.0.2:
+    resolution: {integrity: sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==}
+    engines: {node: '>=0.10.0'}
+
+  /ospath@1.2.2:
+    resolution: {integrity: sha512-o6E5qJV5zkAbIDNhGSIlyOhScKXgQrSRMilfph0clDfM0nEnBOlKlH4sWDmG95BW/CvwNz0vmm7dJVtU2KlMiA==}
     dev: true
 
-  /regexp.prototype.flags@1.4.3:
-    resolution: {integrity: sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==}
-    engines: {node: '>= 0.4'}
+  /otpauth@9.1.1:
+    resolution: {integrity: sha512-XhimxmkREwf6GJvV4svS9OVMFJ/qRGz+QBEGwtW5OMf9jZlx9yw25RZMXdrO6r7DHgfIaETJb1lucZXZtn3jgw==}
     dependencies:
-      call-bind: 1.0.2
-      define-properties: 1.1.4
-      functions-have-names: 1.2.3
+      jssha: 3.3.0
+    dev: false
 
-  /regexpu-core@5.2.2:
-    resolution: {integrity: sha512-T0+1Zp2wjF/juXMrMxHxidqGYn8U4R+zleSJhX9tQ1PUsS8a9UtYfbsF9LdiVgNX3kiX8RNaKM42nfSgvFJjmw==}
-    engines: {node: '>=4'}
+  /otplib@12.0.1:
+    resolution: {integrity: sha512-xDGvUOQjop7RDgxTQ+o4pOol0/3xSZzawTiPKRrHnQWAy0WjhNs/5HdIDJCrqC4MBynmjXgULc6YfioaxZeFgg==}
     dependencies:
-      regenerate: 1.4.2
-      regenerate-unicode-properties: 10.1.0
-      regjsgen: 0.7.1
-      regjsparser: 0.9.1
-      unicode-match-property-ecmascript: 2.0.0
-      unicode-match-property-value-ecmascript: 2.1.0
+      '@otplib/core': 12.0.1
+      '@otplib/preset-default': 12.0.1
+      '@otplib/preset-v11': 12.0.1
     dev: true
 
-  /regjsgen@0.7.1:
-    resolution: {integrity: sha512-RAt+8H2ZEzHeYWxZ3H2z6tF18zyyOnlcdaafLrm21Bguj7uZy6ULibiAFdXEtKQY4Sy7wDTwDiOazasMLc4KPA==}
-    dev: true
+  /p-cancelable@2.1.1:
+    resolution: {integrity: sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==}
+    engines: {node: '>=8'}
+    dev: false
 
-  /regjsparser@0.9.1:
-    resolution: {integrity: sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==}
-    hasBin: true
-    dependencies:
-      jsesc: 0.5.0
-    dev: true
+  /p-finally@1.0.0:
+    resolution: {integrity: sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==}
+    engines: {node: '>=4'}
+    dev: false
 
-  /reinterval@1.1.0:
-    resolution: {integrity: sha512-QIRet3SYrGp0HUHO88jVskiG6seqUGC5iAG7AwI/BV4ypGcuqk9Du6YQBUOUqm9c8pw1eyLoIaONifRua1lsEQ==}
+  /p-lazy@3.1.0:
+    resolution: {integrity: sha512-sCJn0Cdahs6G6SX9+DUihVFUhrzDEduzE5xeViVBGtoqy5dBWko7W8T6Kk6TjR2uevRXJO7CShfWrqdH5s3w3g==}
+    engines: {node: '>=8'}
     dev: false
 
-  /relateurl@0.2.7:
-    resolution: {integrity: sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==}
-    engines: {node: '>= 0.10'}
-    dev: true
+  /p-limit@2.3.0:
+    resolution: {integrity: sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==}
+    engines: {node: '>=6'}
+    dependencies:
+      p-try: 2.2.0
 
-  /remark-external-links@8.0.0:
-    resolution: {integrity: sha512-5vPSX0kHoSsqtdftSHhIYofVINC8qmp0nctkeU9YoJwV3YfiBRiI6cbFRJ0oI/1F9xS+bopXG0m2KS8VFscuKA==}
+  /p-limit@3.1.0:
+    resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==}
+    engines: {node: '>=10'}
     dependencies:
-      extend: 3.0.2
-      is-absolute-url: 3.0.3
-      mdast-util-definitions: 4.0.0
-      space-separated-tokens: 1.1.5
-      unist-util-visit: 2.0.3
-    dev: true
+      yocto-queue: 0.1.0
 
-  /remark-slug@6.1.0:
-    resolution: {integrity: sha512-oGCxDF9deA8phWvxFuyr3oSJsdyUAxMFbA0mZ7Y1Sas+emILtO+e5WutF9564gDsEN4IXaQXm5pFo6MLH+YmwQ==}
+  /p-limit@5.0.0:
+    resolution: {integrity: sha512-/Eaoq+QyLSiXQ4lyYV23f14mZRQcXnxfHrN0vCai+ak9G0pp9iEQukIIZq5NccEvwRB8PUnZT0KsOoDCINS1qQ==}
+    engines: {node: '>=18'}
     dependencies:
-      github-slugger: 1.5.0
-      mdast-util-to-string: 1.1.0
-      unist-util-visit: 2.0.3
+      yocto-queue: 1.0.0
     dev: true
 
-  /remove-bom-buffer@3.0.0:
-    resolution: {integrity: sha512-8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ==}
-    engines: {node: '>=0.10.0'}
+  /p-locate@3.0.0:
+    resolution: {integrity: sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==}
+    engines: {node: '>=6'}
     dependencies:
-      is-buffer: 1.1.6
-      is-utf8: 0.2.1
+      p-limit: 2.3.0
     dev: true
 
-  /remove-bom-stream@1.2.0:
-    resolution: {integrity: sha512-wigO8/O08XHb8YPzpDDT+QmRANfW6vLqxfaXm1YXhnFf3AkSLyjfG3GEFg4McZkmgL7KvCj5u2KczkvSP6NfHA==}
-    engines: {node: '>= 0.10'}
+  /p-locate@4.1.0:
+    resolution: {integrity: sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==}
+    engines: {node: '>=8'}
     dependencies:
-      remove-bom-buffer: 3.0.0
-      safe-buffer: 5.2.1
-      through2: 2.0.5
+      p-limit: 2.3.0
+
+  /p-locate@5.0.0:
+    resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==}
+    engines: {node: '>=10'}
+    dependencies:
+      p-limit: 3.1.0
     dev: true
 
-  /remove-trailing-separator@1.1.0:
-    resolution: {integrity: sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==}
+  /p-map@2.1.0:
+    resolution: {integrity: sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==}
+    engines: {node: '>=6'}
+    dev: false
+
+  /p-map@4.0.0:
+    resolution: {integrity: sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==}
+    engines: {node: '>=10'}
+    dependencies:
+      aggregate-error: 3.1.0
 
-  /remove-trailing-slash@0.1.1:
-    resolution: {integrity: sha512-o4S4Qh6L2jpnCy83ysZDau+VORNvnFw07CKSAymkd6ICNVEPisMyzlc00KlvvicsxKck94SEwhDnMNdICzO+tA==}
+  /p-queue@6.6.2:
+    resolution: {integrity: sha512-RwFpb72c/BhQLEXIZ5K2e+AhgNVmIejGlTgiB9MzZ0e93GRvqZ7uSi0dvRF7/XIXDeNkra2fNHBxTyPDGySpjQ==}
+    engines: {node: '>=8'}
+    dependencies:
+      eventemitter3: 4.0.7
+      p-timeout: 3.2.0
     dev: false
 
-  /renderkid@3.0.0:
-    resolution: {integrity: sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg==}
+  /p-retry@4.6.2:
+    resolution: {integrity: sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==}
+    engines: {node: '>=8'}
     dependencies:
-      css-select: 4.3.0
-      dom-converter: 0.2.0
-      htmlparser2: 6.1.0
-      lodash: 4.17.21
-      strip-ansi: 6.0.1
-    dev: true
+      '@types/retry': 0.12.0
+      retry: 0.13.1
+    dev: false
 
-  /repeat-element@1.1.4:
-    resolution: {integrity: sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  /p-timeout@3.2.0:
+    resolution: {integrity: sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==}
+    engines: {node: '>=8'}
+    dependencies:
+      p-finally: 1.0.0
+    dev: false
 
-  /repeat-string@1.6.1:
-    resolution: {integrity: sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==}
-    engines: {node: '>=0.10'}
-    dev: true
+  /p-try@2.2.0:
+    resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==}
+    engines: {node: '>=6'}
 
-  /replace-ext@1.0.1:
-    resolution: {integrity: sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==}
-    engines: {node: '>= 0.10'}
+  /packet-reader@1.0.0:
+    resolution: {integrity: sha512-HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ==}
+    dev: false
+
+  /pako@0.2.9:
+    resolution: {integrity: sha512-NUcwaKxUxWrZLpDG+z/xZaCgQITkA/Dv4V/T6bw7VON6l1Xz/VnrBqrYjZQ12TamKHzITTfOEIYUj48y2KXImA==}
     dev: true
 
-  /replace-homedir@1.0.0:
-    resolution: {integrity: sha512-CHPV/GAglbIB1tnQgaiysb8H2yCy8WQ7lcEwQ/eT+kLj0QHV8LnJW0zpqpE7RSkrMSRoa+EBoag86clf7WAgSg==}
-    engines: {node: '>= 0.10'}
+  /pako@1.0.11:
+    resolution: {integrity: sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==}
+    dev: false
+
+  /param-case@3.0.4:
+    resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
-      homedir-polyfill: 1.0.3
-      is-absolute: 1.0.0
-      remove-trailing-separator: 1.1.0
+      dot-case: 3.0.4
+      tslib: 2.6.2
+    dev: false
+
+  /parent-module@1.0.1:
+    resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==}
+    engines: {node: '>=6'}
+    dependencies:
+      callsites: 3.1.0
     dev: true
 
-  /replace-in-file@6.3.5:
-    resolution: {integrity: sha512-arB9d3ENdKva2fxRnSjwBEXfK1npgyci7ZZuwysgAp7ORjHSyxz6oqIjTEv8R0Ydl4Ll7uOAZXL4vbkhGIizCg==}
-    engines: {node: '>=10'}
-    hasBin: true
+  /parse-json@5.2.0:
+    resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==}
+    engines: {node: '>=8'}
     dependencies:
-      chalk: 4.1.2
-      glob: 7.2.3
-      yargs: 17.6.0
+      '@babel/code-frame': 7.23.5
+      error-ex: 1.3.2
+      json-parse-even-better-errors: 2.3.1
+      lines-and-columns: 1.2.4
+
+  /parse-passwd@1.0.0:
+    resolution: {integrity: sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==}
+    engines: {node: '>=0.10.0'}
+    dev: false
+
+  /parse-srcset@1.0.2:
+    resolution: {integrity: sha512-/2qh0lav6CmI15FzA3i/2Bzk2zCgQhGMkvhOhKNcBVQ1ldgpbfiNTVslmooUmWJcADi1f1kIeynbDRVzNlfR6Q==}
+    dev: false
+
+  /parse5-htmlparser2-tree-adapter@6.0.1:
+    resolution: {integrity: sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==}
+    dependencies:
+      parse5: 6.0.1
     dev: false
 
-  /replacestream@4.0.3:
-    resolution: {integrity: sha512-AC0FiLS352pBBiZhd4VXB1Ab/lh0lEgpP+GGvZqbQh8a5cmXVoTe5EX/YeTFArnp4SRGTHh1qCHu9lGs1qG8sA==}
-    dependencies:
-      escape-string-regexp: 1.0.5
-      object-assign: 4.1.1
-      readable-stream: 2.3.7
+  /parse5@5.1.1:
+    resolution: {integrity: sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==}
     dev: false
 
-  /request-progress@3.0.0:
-    resolution: {integrity: sha512-MnWzEHHaxHO2iWiQuHrUPBi/1WeBf5PkxQqNyNvLl9VAYSdXkP8tQ3pBSeCPD+yw0v0Aq1zosWLz0BdeXpWwZg==}
+  /parse5@6.0.1:
+    resolution: {integrity: sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==}
+    dev: false
+
+  /parse5@7.1.2:
+    resolution: {integrity: sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==}
     dependencies:
-      throttleit: 1.0.0
+      entities: 4.5.0
     dev: true
 
-  /request-promise-core@1.1.4(request@2.88.2):
-    resolution: {integrity: sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==}
-    engines: {node: '>=0.10.0'}
-    peerDependencies:
-      request: ^2.34
+  /parseley@0.12.1:
+    resolution: {integrity: sha512-e6qHKe3a9HWr0oMRVDTRhKce+bRO8VGQR3NyVwcjwrbhMmFCX9KszEV35+rn4AdilFAq9VPxP/Fe1wC9Qjd2lw==}
     dependencies:
-      lodash: 4.17.21
-      request: 2.88.2
+      leac: 0.6.0
+      peberminta: 0.9.0
     dev: false
 
-  /request-promise-native@1.0.9(request@2.88.2):
-    resolution: {integrity: sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==}
-    engines: {node: '>=0.12.0'}
-    deprecated: request-promise-native has been deprecated because it extends the now deprecated request package, see https://github.com/request/request/issues/3142
-    peerDependencies:
-      request: ^2.34
+  /parseurl@1.3.3:
+    resolution: {integrity: sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==}
+    engines: {node: '>= 0.8'}
+
+  /pascal-case@3.1.2:
+    resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
-      request: 2.88.2
-      request-promise-core: 1.1.4(request@2.88.2)
-      stealthy-require: 1.1.1
-      tough-cookie: 2.5.0
+      no-case: 3.0.4
+      tslib: 2.6.2
+
+  /password-prompt@1.1.3:
+    resolution: {integrity: sha512-HkrjG2aJlvF0t2BMH0e2LB/EHf3Lcq3fNMzy4GYHcQblAvOl+QQji1Lx7WRBMqpVK8p+KR7bCg7oqAMXtdgqyw==}
+    dependencies:
+      ansi-escapes: 4.3.2
+      cross-spawn: 7.0.3
     dev: false
 
-  /request@2.88.2:
-    resolution: {integrity: sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==}
-    engines: {node: '>= 6'}
-    deprecated: request has been deprecated, see https://github.com/request/request/issues/3142
+  /path-browserify@1.0.1:
+    resolution: {integrity: sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==}
+
+  /path-case@3.0.4:
+    resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
-      aws-sign2: 0.7.0
-      aws4: 1.11.0
-      caseless: 0.12.0
-      combined-stream: 1.0.8
-      extend: 3.0.2
-      forever-agent: 0.6.1
-      form-data: 2.3.3
-      har-validator: 5.1.5
-      http-signature: 1.2.0
-      is-typedarray: 1.0.0
-      isstream: 0.1.2
-      json-stringify-safe: 5.0.1
-      mime-types: 2.1.35
-      oauth-sign: 0.9.0
-      performance-now: 2.1.0
-      qs: 6.5.3
-      safe-buffer: 5.2.1
-      tough-cookie: 2.5.0
-      tunnel-agent: 0.6.0
-      uuid: 3.4.0
+      dot-case: 3.0.4
+      tslib: 2.6.2
     dev: false
 
-  /require-directory@2.1.1:
-    resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
-    engines: {node: '>=0.10.0'}
+  /path-exists@3.0.0:
+    resolution: {integrity: sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==}
+    engines: {node: '>=4'}
+    dev: true
 
-  /require-from-string@2.0.2:
-    resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==}
+  /path-exists@4.0.0:
+    resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==}
+    engines: {node: '>=8'}
+
+  /path-is-absolute@1.0.1:
+    resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==}
     engines: {node: '>=0.10.0'}
 
-  /require-main-filename@1.0.1:
-    resolution: {integrity: sha512-IqSUtOVP4ksd1C/ej5zeEh/BIP2ajqpn8c5x+q99gvcIG/Qf0cud5raVnE/Dwd0ua9TXYDoDc0RE5hBSdz22Ug==}
+  /path-key@3.1.1:
+    resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==}
+    engines: {node: '>=8'}
+
+  /path-key@4.0.0:
+    resolution: {integrity: sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==}
+    engines: {node: '>=12'}
     dev: true
 
-  /require-main-filename@2.0.0:
-    resolution: {integrity: sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==}
+  /path-parse@1.0.7:
+    resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==}
 
-  /requires-port@1.0.0:
-    resolution: {integrity: sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==}
+  /path-scurry@1.10.1:
+    resolution: {integrity: sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==}
+    engines: {node: '>=16 || 14 >=14.17'}
+    dependencies:
+      lru-cache: 9.1.2
+      minipass: 7.0.2
+
+  /path-to-regexp@0.1.7:
+    resolution: {integrity: sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==}
 
-  /resize-observer-polyfill@1.5.1:
-    resolution: {integrity: sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==}
+  /path-to-regexp@6.2.1:
+    resolution: {integrity: sha512-JLyh7xT1kizaEvcaXOQwOc2/Yhw6KZOvPf1S8401UyLk86CU79LN3vl7ztXGm/pZ+YjoyAJ4rxmHwbkBXJX+yw==}
     dev: false
 
-  /resolve-cwd@3.0.0:
-    resolution: {integrity: sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==}
+  /path-type@4.0.0:
+    resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==}
     engines: {node: '>=8'}
-    dependencies:
-      resolve-from: 5.0.0
+
+  /pathe@1.1.1:
+    resolution: {integrity: sha512-d+RQGp0MAYTIaDBIMmOfMwz3E+LOZnxx1HZd5R18mmCZY0QBlK0LDZfPc8FW8Ed2DlvsuE6PRjroDY+wg4+j/Q==}
     dev: true
 
-  /resolve-dir@1.0.1:
-    resolution: {integrity: sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      expand-tilde: 2.0.2
-      global-modules: 1.0.0
+  /pathval@1.1.1:
+    resolution: {integrity: sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==}
     dev: true
 
-  /resolve-from@4.0.0:
-    resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==}
-    engines: {node: '>=4'}
+  /pause-stream@0.0.11:
+    resolution: {integrity: sha512-e3FBlXLmN/D1S+zHzanP4E/4Z60oFAa3O051qt1pxa7DEJWKAyil6upYVXCWadEnuoqa4Pkc9oUx9zsxYeRv8A==}
+    dependencies:
+      through: 2.3.8
     dev: true
 
-  /resolve-from@5.0.0:
-    resolution: {integrity: sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==}
+  /pdf-parse@1.1.1:
+    resolution: {integrity: sha512-v6ZJ/efsBpGrGGknjtq9J/oC8tZWq0KWL5vQrk2GlzLEQPUDB1ex+13Rmidl1neNN358Jn9EHZw5y07FFtaC7A==}
+    engines: {node: '>=6.8.1'}
+    dependencies:
+      debug: 3.2.7(supports-color@5.5.0)
+      node-ensure: 0.0.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: false
+
+  /pdfjs-dist@2.16.105:
+    resolution: {integrity: sha512-J4dn41spsAwUxCpEoVf6GVoz908IAA3mYiLmNxg8J9kfRXc2jxpbUepcP0ocp0alVNLFthTAM8DZ1RaHh8sU0A==}
+    peerDependencies:
+      worker-loader: ^3.0.8
+    peerDependenciesMeta:
+      worker-loader:
+        optional: true
+    dependencies:
+      dommatrix: 1.0.3
+      web-streams-polyfill: 3.2.1
+    dev: false
+
+  /peberminta@0.9.0:
+    resolution: {integrity: sha512-XIxfHpEuSJbITd1H3EeQwpcZbTLHc+VVr8ANI9t5sit565tsI4/xK3KWTUFE2e6QiangUkh3B0jihzmGnNrRsQ==}
+    dev: false
+
+  /peek-readable@4.1.0:
+    resolution: {integrity: sha512-ZI3LnwUv5nOGbQzD9c2iDG6toheuXSZP5esSHBjopsXH4dg19soufvpUGA3uohi5anFtGb2lhAVdHzH6R/Evvg==}
     engines: {node: '>=8'}
-    dev: true
+    dev: false
 
-  /resolve-options@1.1.0:
-    resolution: {integrity: sha512-NYDgziiroVeDC29xq7bp/CacZERYsA9bXYd1ZmcJlF3BcrZv5pTb4NG7SjdyKDnXZ84aC4vo2u6sNKIA1LCu/A==}
-    engines: {node: '>= 0.10'}
+  /peek-stream@1.1.3:
+    resolution: {integrity: sha512-FhJ+YbOSBb9/rIl2ZeE/QHEsWn7PqNYt8ARAY3kIgNGOk13g9FGyIY6JIl/xB/3TFRVoTv5as0l11weORrTekA==}
     dependencies:
-      value-or-function: 3.0.0
+      buffer-from: 1.1.2
+      duplexify: 3.7.1
+      through2: 2.0.5
     dev: true
 
-  /resolve-url@0.2.1:
-    resolution: {integrity: sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==}
-    deprecated: https://github.com/lydell/resolve-url#deprecated
+  /pend@1.2.0:
+    resolution: {integrity: sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==}
     dev: true
 
-  /resolve.exports@2.0.0:
-    resolution: {integrity: sha512-6K/gDlqgQscOlg9fSRpWstA8sYe8rbELsSTNpx+3kTrsVCzvSl0zIvRErM7fdl9ERWDsKnrLnwB+Ne89918XOg==}
-    engines: {node: '>=10'}
+  /perfect-scrollbar@1.5.5:
+    resolution: {integrity: sha512-dzalfutyP3e/FOpdlhVryN4AJ5XDVauVWxybSkLZmakFE2sS3y3pc4JnSprw8tGmHvkaG5Edr5T7LBTZ+WWU2g==}
     dev: true
 
-  /resolve@1.22.1:
-    resolution: {integrity: sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==}
-    hasBin: true
-    dependencies:
-      is-core-module: 2.11.0
-      path-parse: 1.0.7
-      supports-preserve-symlinks-flag: 1.0.0
-
-  /restore-cursor@3.1.0:
-    resolution: {integrity: sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==}
-    engines: {node: '>=8'}
-    dependencies:
-      onetime: 5.1.2
-      signal-exit: 3.0.7
+  /performance-now@2.1.0:
+    resolution: {integrity: sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==}
 
-  /ret@0.1.15:
-    resolution: {integrity: sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==}
-    engines: {node: '>=0.12'}
+  /pg-cloudflare@1.1.1:
+    resolution: {integrity: sha512-xWPagP/4B6BgFO+EKz3JONXv3YDgvkbVrGw2mTo3D6tVDQRh1e7cqVGvyR3BE+eQgAvx1XhW/iEASj4/jCWl3Q==}
+    dev: false
+    optional: true
 
-  /retry@0.12.0:
-    resolution: {integrity: sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==}
-    engines: {node: '>= 4'}
+  /pg-connection-string@2.6.2:
+    resolution: {integrity: sha512-ch6OwaeaPYcova4kKZ15sbJ2hKb/VP48ZD2gE7i1J+L4MspCtBMAx8nMgz7bksc7IojCIIWuEhHibSMFH8m8oA==}
     dev: false
 
-  /reusify@1.0.4:
-    resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==}
-    engines: {iojs: '>=1.0.0', node: '>=0.10.0'}
+  /pg-int8@1.0.1:
+    resolution: {integrity: sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==}
+    engines: {node: '>=4.0.0'}
+    dev: false
 
-  /rfdc@1.3.0:
-    resolution: {integrity: sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==}
+  /pg-minify@1.6.2:
+    resolution: {integrity: sha512-1KdmFGGTP6jplJoI8MfvRlfvMiyBivMRP7/ffh4a11RUFJ7kC2J0ZHlipoKiH/1hz+DVgceon9U2qbaHpPeyPg==}
+    engines: {node: '>=8.0'}
+    dev: false
 
-  /rhea@1.0.24:
-    resolution: {integrity: sha512-PEl62U2EhxCO5wMUZ2/bCBcXAVKN9AdMSNQOrp3+R5b77TEaOSiy16MQ0sIOmzj/iqsgIAgPs1mt3FYfu1vIXA==}
+  /pg-pool@3.6.1(pg@8.11.3):
+    resolution: {integrity: sha512-jizsIzhkIitxCGfPRzJn1ZdcosIt3pz9Sh3V01fm1vZnbnCMgmGl5wvGGdNN2EL9Rmb0EcFoCkixH4Pu+sP9Og==}
+    peerDependencies:
+      pg: '>=8.0'
     dependencies:
-      debug: 3.2.7(supports-color@5.5.0)
-    transitivePeerDependencies:
-      - supports-color
+      pg: 8.11.3
     dev: false
 
-  /rimraf@2.6.3:
-    resolution: {integrity: sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==}
-    hasBin: true
+  /pg-pool@3.6.1(pg@8.8.0):
+    resolution: {integrity: sha512-jizsIzhkIitxCGfPRzJn1ZdcosIt3pz9Sh3V01fm1vZnbnCMgmGl5wvGGdNN2EL9Rmb0EcFoCkixH4Pu+sP9Og==}
+    peerDependencies:
+      pg: '>=8.0'
     dependencies:
-      glob: 7.2.3
-    dev: true
+      pg: 8.8.0
+    dev: false
 
-  /rimraf@2.7.1:
-    resolution: {integrity: sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==}
-    hasBin: true
+  /pg-promise@10.15.4:
+    resolution: {integrity: sha512-BKlHCMCdNUmF6gagVbehRWSEiVcZzPVltEx14OJExR9Iz9/1R6KETDWLLGv2l6yRqYFnEZZy1VDjRhArzeIGrw==}
+    engines: {node: '>=12.0'}
     dependencies:
-      glob: 7.2.3
-    dev: true
+      assert-options: 0.8.0
+      pg: 8.8.0
+      pg-minify: 1.6.2
+      spex: 3.2.0
+    transitivePeerDependencies:
+      - pg-native
+    dev: false
 
-  /rimraf@3.0.2:
-    resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==}
-    hasBin: true
-    dependencies:
-      glob: 7.2.3
+  /pg-protocol@1.6.0:
+    resolution: {integrity: sha512-M+PDm637OY5WM307051+bsDia5Xej6d9IR4GwJse1qA1DIhiKlksvrneZOYQq42OM+spubpcNYEo2FcKQrDk+Q==}
+    dev: false
 
-  /rndm@1.2.0:
-    resolution: {integrity: sha512-fJhQQI5tLrQvYIYFpOnFinzv9dwmR7hRnUz1XqP3OJ1jIweTNOd6aTO4jwQSgcBSFUB+/KHJxuGneime+FdzOw==}
+  /pg-types@2.2.0:
+    resolution: {integrity: sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==}
+    engines: {node: '>=4'}
+    dependencies:
+      pg-int8: 1.0.1
+      postgres-array: 2.0.0
+      postgres-bytea: 1.0.0
+      postgres-date: 1.0.7
+      postgres-interval: 1.2.0
     dev: false
 
-  /rollup@3.10.0:
-    resolution: {integrity: sha512-JmRYz44NjC1MjVF2VKxc0M1a97vn+cDxeqWmnwyAF4FvpjK8YFdHpaqvQB+3IxCvX05vJxKZkoMDU8TShhmJVA==}
-    engines: {node: '>=14.18.0', npm: '>=8.0.0'}
-    hasBin: true
+  /pg@8.11.3:
+    resolution: {integrity: sha512-+9iuvG8QfaaUrrph+kpF24cXkH1YOOUeArRNYIxq1viYHZagBxrTno7cecY1Fa44tJeZvaoG+Djpkc3JwehN5g==}
+    engines: {node: '>= 8.0.0'}
+    peerDependencies:
+      pg-native: '>=3.0.1'
+    peerDependenciesMeta:
+      pg-native:
+        optional: true
+    dependencies:
+      buffer-writer: 2.0.0
+      packet-reader: 1.0.0
+      pg-connection-string: 2.6.2
+      pg-pool: 3.6.1(pg@8.11.3)
+      pg-protocol: 1.6.0
+      pg-types: 2.2.0
+      pgpass: 1.0.5
     optionalDependencies:
-      fsevents: 2.3.2
-    dev: true
-
-  /route-recognizer@0.3.4:
-    resolution: {integrity: sha512-2+MhsfPhvauN1O8KaXpXAOfR/fwe8dnUXVM+xw7yt40lJRfPVQxV6yryZm0cgRvAj5fMF/mdRZbL2ptwbs5i2g==}
-    dev: true
+      pg-cloudflare: 1.1.1
+    dev: false
 
-  /rss-parser@3.12.0:
-    resolution: {integrity: sha512-aqD3E8iavcCdkhVxNDIdg1nkBI17jgqF+9OqPS1orwNaOgySdpvq6B+DoONLhzjzwV8mWg37sb60e4bmLK117A==}
+  /pg@8.8.0:
+    resolution: {integrity: sha512-UXYN0ziKj+AeNNP7VDMwrehpACThH7LUl/p8TDFpEUuSejCUIwGSfxpHsPvtM6/WXFy6SU4E5RG4IJV/TZAGjw==}
+    engines: {node: '>= 8.0.0'}
+    peerDependencies:
+      pg-native: '>=3.0.1'
+    peerDependenciesMeta:
+      pg-native:
+        optional: true
     dependencies:
-      entities: 2.2.0
-      xml2js: 0.5.0
-    dev: false
-
-  /run-async@2.4.1:
-    resolution: {integrity: sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==}
-    engines: {node: '>=0.12.0'}
+      buffer-writer: 2.0.0
+      packet-reader: 1.0.0
+      pg-connection-string: 2.6.2
+      pg-pool: 3.6.1(pg@8.8.0)
+      pg-protocol: 1.6.0
+      pg-types: 2.2.0
+      pgpass: 1.0.5
     dev: false
 
-  /run-parallel@1.2.0:
-    resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==}
+  /pgpass@1.0.5:
+    resolution: {integrity: sha512-FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug==}
     dependencies:
-      queue-microtask: 1.2.3
+      split2: 4.2.0
+    dev: false
 
-  /run-script-os@1.1.6:
-    resolution: {integrity: sha512-ql6P2LzhBTTDfzKts+Qo4H94VUKpxKDFz6QxxwaUZN0mwvi7L3lpOI7BqPCq7lgDh3XLl0dpeXwfcVIitlrYrw==}
-    hasBin: true
-    dev: true
+  /picocolors@1.0.0:
+    resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==}
 
-  /rxjs@6.6.7:
-    resolution: {integrity: sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==}
-    engines: {npm: '>=2.0.0'}
-    dependencies:
-      tslib: 2.5.0
+  /picomatch@2.3.1:
+    resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==}
+    engines: {node: '>=8.6'}
 
-  /rxjs@7.5.7:
-    resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
-    dependencies:
-      tslib: 2.5.0
+  /pify@2.3.0:
+    resolution: {integrity: sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==}
+    engines: {node: '>=0.10.0'}
     dev: true
 
-  /safe-buffer@5.1.1:
-    resolution: {integrity: sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==}
+  /pify@4.0.1:
+    resolution: {integrity: sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==}
+    engines: {node: '>=6'}
     dev: true
 
-  /safe-buffer@5.1.2:
-    resolution: {integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==}
-
-  /safe-buffer@5.2.1:
-    resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==}
-
-  /safe-regex-test@1.0.0:
-    resolution: {integrity: sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==}
+  /pinia@2.1.6(typescript@5.4.2)(vue@3.4.21):
+    resolution: {integrity: sha512-bIU6QuE5qZviMmct5XwCesXelb5VavdOWKWaB17ggk++NUwQWWbP5YnsONTk3b752QkW9sACiR81rorpeOMSvQ==}
+    peerDependencies:
+      '@vue/composition-api': ^1.4.0
+      typescript: ^5.4.2
+      vue: ^2.6.14 || ^3.3.0
+    peerDependenciesMeta:
+      '@vue/composition-api':
+        optional: true
+      typescript:
+        optional: true
     dependencies:
-      call-bind: 1.0.2
-      get-intrinsic: 1.1.3
-      is-regex: 1.1.4
+      '@vue/devtools-api': 6.5.0
+      typescript: 5.4.2
+      vue: 3.4.21(typescript@5.4.2)
+      vue-demi: 0.14.5(vue@3.4.21)
 
-  /safe-regex@1.1.0:
-    resolution: {integrity: sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==}
-    dependencies:
-      ret: 0.1.15
-    dev: true
+  /pirates@4.0.5:
+    resolution: {integrity: sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==}
+    engines: {node: '>= 6'}
 
-  /safe-regex@2.1.1:
-    resolution: {integrity: sha512-rx+x8AMzKb5Q5lQ95Zoi6ZbJqwCLkqi3XuJXp5P3rT8OEc6sZCJG5AE5dU3lsgRr/F4Bs31jSlVN+j5KrsGu9A==}
-    dependencies:
-      regexp-tree: 0.1.25
+  /pirates@4.0.6:
+    resolution: {integrity: sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==}
+    engines: {node: '>= 6'}
     dev: true
 
-  /safe-stable-stringify@2.4.0:
-    resolution: {integrity: sha512-eehKHKpab6E741ud7ZIMcXhKcP6TSIezPkNZhy5U8xC6+VvrRdUA2tMgxGxaGl4cz7c2Ew5+mg5+wNB16KQqrA==}
-    engines: {node: '>=10'}
-    dev: false
-
-  /safer-buffer@2.1.2:
-    resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}
-
-  /samlify@2.8.9:
-    resolution: {integrity: sha512-+HHxkBweHwWEEiFWelGhTTX2Zv/7Tjh6xbZPYUURe7JWp1N9cO2jUOiSb13gTzCEXtffye+Ld7M/f2gCU5+B2Q==}
-    dependencies:
-      '@authenio/xml-encryption': 2.0.2
-      '@xmldom/xmldom': 0.8.6
-      camelcase: 6.3.0
-      node-forge: 1.3.1
-      node-rsa: 1.1.1
-      pako: 1.0.11
-      uuid: 8.3.2
-      xml: 1.0.1
-      xml-crypto: 3.0.1
-      xpath: 0.0.32
-    dev: false
-
-  /sanitize-html@2.10.0:
-    resolution: {integrity: sha512-JqdovUd81dG4k87vZt6uA6YhDfWkUGruUu/aPmXLxXi45gZExnt9Bnw/qeQU8oGf82vPyaE0vO4aH0PbobB9JQ==}
+  /pkce-challenge@3.0.0(patch_hash=dypouzb3lve7vncq25i5fuanki):
+    resolution: {integrity: sha512-sQ8sJJJuLhA5pFnoxayMCrFnBMNj7DDpa+TWxOXl4B24oXHlVSADi/3Bowm66QuzWkBuF6DhmaelCdlC2JKwsg==}
     dependencies:
-      deepmerge: 4.2.2
-      escape-string-regexp: 4.0.0
-      htmlparser2: 8.0.1
-      is-plain-object: 5.0.0
-      parse-srcset: 1.0.2
-      postcss: 8.4.21
+      crypto-js: 4.2.0
     dev: false
+    patched: true
 
-  /saslprep@1.0.3:
-    resolution: {integrity: sha512-/MY/PEMbk2SuY5sScONwhUDsV2p77Znkb/q3nSVstq/yQzYJOH/Azh29p9oJLsl3LnQwSvZDKagDGBsBwSooag==}
+  /pkg-dir@3.0.0:
+    resolution: {integrity: sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==}
     engines: {node: '>=6'}
     dependencies:
-      sparse-bitfield: 3.0.3
-    dev: false
-    optional: true
+      find-up: 3.0.0
+    dev: true
 
-  /sass-loader@10.3.1(sass@1.55.0)(webpack@5.75.0):
-    resolution: {integrity: sha512-y2aBdtYkbqorVavkC3fcJIUDGIegzDWPn3/LAFhsf3G+MzPKTJx37sROf5pXtUeggSVbNbmfj8TgRaSLMelXRA==}
-    engines: {node: '>= 10.13.0'}
-    peerDependencies:
-      fibers: '>= 3.1.0'
-      node-sass: ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0
-      sass: ^1.3.0
-      webpack: ^4.36.0 || ^5.0.0
-    peerDependenciesMeta:
-      fibers:
-        optional: true
-      node-sass:
-        optional: true
-      sass:
-        optional: true
+  /pkg-dir@4.2.0:
+    resolution: {integrity: sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==}
+    engines: {node: '>=8'}
     dependencies:
-      klona: 2.0.5
-      loader-utils: 2.0.2
-      neo-async: 2.6.2
-      sass: 1.55.0
-      schema-utils: 3.1.1
-      semver: 7.3.8
-      webpack: 5.75.0(esbuild@0.16.17)
-    dev: true
+      find-up: 4.1.0
 
-  /sass-loader@13.2.0(sass@1.58.0)(webpack@5.75.0):
-    resolution: {integrity: sha512-JWEp48djQA4nbZxmgC02/Wh0eroSUutulROUusYJO9P9zltRbNN80JCBHqRGzjd4cmZCa/r88xgfkjGD0TXsHg==}
-    engines: {node: '>= 14.15.0'}
-    peerDependencies:
-      fibers: '>= 3.1.0'
-      node-sass: ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0
-      sass: ^1.3.0
-      sass-embedded: '*'
-      webpack: ^5.0.0
-    peerDependenciesMeta:
-      fibers:
-        optional: true
-      node-sass:
-        optional: true
-      sass:
-        optional: true
-      sass-embedded:
-        optional: true
+  /pkg-dir@5.0.0:
+    resolution: {integrity: sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA==}
+    engines: {node: '>=10'}
     dependencies:
-      klona: 2.0.6
-      neo-async: 2.6.2
-      sass: 1.58.0
-      webpack: 5.75.0(esbuild@0.16.17)
+      find-up: 5.0.0
     dev: true
 
-  /sass@1.55.0:
-    resolution: {integrity: sha512-Pk+PMy7OGLs9WaxZGJMn7S96dvlyVBwwtToX895WmCpAOr5YiJYEUJfiJidMuKb613z2xNWcXCHEuOvjZbqC6A==}
-    engines: {node: '>=12.0.0'}
-    hasBin: true
+  /pkg-types@1.0.3:
+    resolution: {integrity: sha512-nN7pYi0AQqJnoLPC9eHFQ8AcyaixBUOwvqc5TDnIKCMEE6I0y8P7OKA7fPexsXGCGxQDl/cmrLAp26LhcwxZ4A==}
     dependencies:
-      chokidar: 3.5.2
-      immutable: 4.1.0
-      source-map-js: 1.0.2
+      jsonc-parser: 3.2.0
+      mlly: 1.4.2
+      pathe: 1.1.1
     dev: true
 
-  /sass@1.58.0:
-    resolution: {integrity: sha512-PiMJcP33DdKtZ/1jSjjqVIKihoDc6yWmYr9K/4r3fVVIEDAluD0q7XZiRKrNJcPK3qkLRF/79DND1H5q1LBjgg==}
-    engines: {node: '>=12.0.0'}
-    hasBin: true
+  /plimit-lit@1.4.1:
+    resolution: {integrity: sha512-bK14ePAod0XWhXwjT6XvYfjcQ9PbCUkZXnDCAKRMZTJCaDIV9VFya1S/I+3WSbpdR8uBhCDh8TS4lQ/JQvhNFA==}
     dependencies:
-      chokidar: 3.5.2
-      immutable: 4.2.2
-      source-map-js: 1.0.2
+      queue-lit: 1.5.0
     dev: true
 
-  /sax@1.2.1:
-    resolution: {integrity: sha512-8I2a3LovHTOpm7NV5yOyO8IHqgVsfK4+UuySrXU8YXkSRX7k6hCV9b3HrkKCr3nMpgj+0bmocaJJWpvp1oc7ZA==}
-    dev: false
+  /pluralize@8.0.0:
+    resolution: {integrity: sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==}
+    engines: {node: '>=4'}
+    dev: true
 
-  /sax@1.2.4:
-    resolution: {integrity: sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==}
+  /pngjs@5.0.0:
+    resolution: {integrity: sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw==}
+    engines: {node: '>=10.13.0'}
     dev: false
 
-  /saxes@6.0.0:
-    resolution: {integrity: sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==}
-    engines: {node: '>=v12.22.7'}
+  /polished@4.2.2:
+    resolution: {integrity: sha512-Sz2Lkdxz6F2Pgnpi9U5Ng/WdWAUZxmHrNPoVlm3aAemxoy2Qy7LGjQg4uf8qKelDAUW94F4np3iH2YPf2qefcQ==}
+    engines: {node: '>=10'}
     dependencies:
-      xmlchars: 2.2.0
+      '@babel/runtime': 7.23.6
     dev: true
 
-  /sb-promise-queue@2.1.0:
-    resolution: {integrity: sha512-zwq4YuP1FQFkGx2Q7GIkZYZ6PqWpV+bg0nIO1sJhWOyGyhqbj0MsTvK6lCFo5TQwX5pZr6SCQ75e8PCDCuNvkg==}
-    engines: {node: '>= 8'}
-    dev: false
-
-  /sb-scandir@3.1.0:
-    resolution: {integrity: sha512-70BVm2xz9jn94zSQdpvYrEG101/UV9TVGcfWr9T5iob3QhCK4lYXeculfBqPGFv3XTeKgx4dpWyYIDeZUqo4kg==}
-    engines: {node: '>= 8'}
-    dependencies:
-      sb-promise-queue: 2.1.0
-    dev: false
+  /possible-typed-array-names@1.0.0:
+    resolution: {integrity: sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==}
+    engines: {node: '>= 0.4'}
 
-  /scheduler@0.23.0:
-    resolution: {integrity: sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==}
+  /postcss-calc@9.0.1(postcss@8.4.32):
+    resolution: {integrity: sha512-TipgjGyzP5QzEhsOZUaIkeO5mKeMFpebWzRogWG/ysonUlnHcq5aJe0jOjpfzUU8PeSaBQnrE8ehR0QA5vs8PQ==}
+    engines: {node: ^14 || ^16 || >=18.0}
+    peerDependencies:
+      postcss: ^8.2.2
     dependencies:
-      loose-envify: 1.4.0
+      postcss: 8.4.32
+      postcss-selector-parser: 6.0.13
+      postcss-value-parser: 4.2.0
     dev: true
 
-  /schema-utils@2.7.0:
-    resolution: {integrity: sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==}
-    engines: {node: '>= 8.9.0'}
+  /postcss-colormin@6.0.1(postcss@8.4.32):
+    resolution: {integrity: sha512-Tb9aR2wCJCzKuNjIeMzVNd0nXjQy25HDgFmmaRsHnP0eP/k8uQWE4S8voX5S2coO5CeKrp+USFs1Ayv9Tpxx6w==}
+    engines: {node: ^14 || ^16 || >=18.0}
+    peerDependencies:
+      postcss: ^8.4.31
     dependencies:
-      '@types/json-schema': 7.0.11
-      ajv: 6.12.6
-      ajv-keywords: 3.5.2(ajv@6.12.6)
+      browserslist: 4.23.0
+      caniuse-api: 3.0.0
+      colord: 2.9.3
+      postcss: 8.4.32
+      postcss-value-parser: 4.2.0
     dev: true
 
-  /schema-utils@2.7.1:
-    resolution: {integrity: sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==}
-    engines: {node: '>= 8.9.0'}
+  /postcss-convert-values@6.0.1(postcss@8.4.32):
+    resolution: {integrity: sha512-zTd4Vh0HxGkhg5aHtfCogcRHzGkvblfdWlQ53lIh1cJhYcGyIxh2hgtKoVh40AMktRERet+JKdB04nNG19kjmA==}
+    engines: {node: ^14 || ^16 || >=18.0}
+    peerDependencies:
+      postcss: ^8.4.31
     dependencies:
-      '@types/json-schema': 7.0.11
-      ajv: 6.12.6
-      ajv-keywords: 3.5.2(ajv@6.12.6)
+      browserslist: 4.23.0
+      postcss: 8.4.32
+      postcss-value-parser: 4.2.0
     dev: true
 
-  /schema-utils@3.1.1:
-    resolution: {integrity: sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==}
-    engines: {node: '>= 10.13.0'}
+  /postcss-discard-comments@6.0.1(postcss@8.4.32):
+    resolution: {integrity: sha512-f1KYNPtqYLUeZGCHQPKzzFtsHaRuECe6jLakf/RjSRqvF5XHLZnM2+fXLhb8Qh/HBFHs3M4cSLb1k3B899RYIg==}
+    engines: {node: ^14 || ^16 || >=18.0}
+    peerDependencies:
+      postcss: ^8.4.31
     dependencies:
-      '@types/json-schema': 7.0.11
-      ajv: 6.12.6
-      ajv-keywords: 3.5.2(ajv@6.12.6)
+      postcss: 8.4.32
     dev: true
 
-  /schema-utils@4.0.0:
-    resolution: {integrity: sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==}
-    engines: {node: '>= 12.13.0'}
+  /postcss-discard-duplicates@6.0.1(postcss@8.4.32):
+    resolution: {integrity: sha512-1hvUs76HLYR8zkScbwyJ8oJEugfPV+WchpnA+26fpJ7Smzs51CzGBHC32RS03psuX/2l0l0UKh2StzNxOrKCYg==}
+    engines: {node: ^14 || ^16 || >=18.0}
+    peerDependencies:
+      postcss: ^8.4.31
     dependencies:
-      '@types/json-schema': 7.0.11
-      ajv: 8.12.0
-      ajv-formats: 2.1.1(ajv@8.12.0)
-      ajv-keywords: 5.1.0(ajv@8.12.0)
+      postcss: 8.4.32
     dev: true
 
-  /seedrandom@3.0.5:
-    resolution: {integrity: sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg==}
+  /postcss-discard-empty@6.0.1(postcss@8.4.32):
+    resolution: {integrity: sha512-yitcmKwmVWtNsrrRqGJ7/C0YRy53i0mjexBDQ9zYxDwTWVBgbU4+C9jIZLmQlTDT9zhml+u0OMFJh8+31krmOg==}
+    engines: {node: ^14 || ^16 || >=18.0}
+    peerDependencies:
+      postcss: ^8.4.31
+    dependencies:
+      postcss: 8.4.32
     dev: true
 
-  /selderee@0.6.0:
-    resolution: {integrity: sha512-ibqWGV5aChDvfVdqNYuaJP/HnVBhlRGSRrlbttmlMpHcLuTqqbMH36QkSs9GEgj5M88JDYLI8eyP94JaQ8xRlg==}
+  /postcss-discard-overridden@6.0.1(postcss@8.4.32):
+    resolution: {integrity: sha512-qs0ehZMMZpSESbRkw1+inkf51kak6OOzNRaoLd/U7Fatp0aN2HQ1rxGOrJvYcRAN9VpX8kUF13R2ofn8OlvFVA==}
+    engines: {node: ^14 || ^16 || >=18.0}
+    peerDependencies:
+      postcss: ^8.4.31
     dependencies:
-      parseley: 0.7.0
-    dev: false
+      postcss: 8.4.32
+    dev: true
 
-  /semver-greatest-satisfied-range@1.1.0:
-    resolution: {integrity: sha512-Ny/iyOzSSa8M5ML46IAx3iXc6tfOsYU2R4AXi2UpHk60Zrgyq6eqPj/xiOfS0rRl/iiQ/rdJkVjw/5cdUyCntQ==}
-    engines: {node: '>= 0.10'}
+  /postcss-merge-longhand@6.0.1(postcss@8.4.32):
+    resolution: {integrity: sha512-vmr/HZQzaPXc45FRvSctqFTF05UaDnTn5ABX+UtQPJznDWT/QaFbVc/pJ5C2YPxx2J2XcfmWowlKwtCDwiQ5hA==}
+    engines: {node: ^14 || ^16 || >=18.0}
+    peerDependencies:
+      postcss: ^8.4.31
     dependencies:
-      sver-compat: 1.5.0
+      postcss: 8.4.32
+      postcss-value-parser: 4.2.0
+      stylehacks: 6.0.1(postcss@8.4.32)
     dev: true
 
-  /semver@5.3.0:
-    resolution: {integrity: sha512-mfmm3/H9+67MCVix1h+IXTpDwL6710LyHuk7+cWC9T1mE0qz4iHhh6r4hU2wrIT9iTsAAC2XQRvfblL028cpLw==}
-    hasBin: true
-    dev: false
-
-  /semver@5.7.1:
-    resolution: {integrity: sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==}
-    hasBin: true
-
-  /semver@6.3.0:
-    resolution: {integrity: sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==}
-    hasBin: true
-
-  /semver@7.0.0:
-    resolution: {integrity: sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==}
-    hasBin: true
+  /postcss-merge-rules@6.0.2(postcss@8.4.32):
+    resolution: {integrity: sha512-6lm8bl0UfriSfxI+F/cezrebqqP8w702UC6SjZlUlBYwuRVNbmgcJuQU7yePIvD4MNT53r/acQCUAyulrpgmeQ==}
+    engines: {node: ^14 || ^16 || >=18.0}
+    peerDependencies:
+      postcss: ^8.4.31
+    dependencies:
+      browserslist: 4.23.0
+      caniuse-api: 3.0.0
+      cssnano-utils: 4.0.1(postcss@8.4.32)
+      postcss: 8.4.32
+      postcss-selector-parser: 6.0.13
     dev: true
 
-  /semver@7.3.7:
-    resolution: {integrity: sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==}
-    engines: {node: '>=10'}
-    hasBin: true
+  /postcss-minify-font-values@6.0.1(postcss@8.4.32):
+    resolution: {integrity: sha512-tIwmF1zUPoN6xOtA/2FgVk1ZKrLcCvE0dpZLtzyyte0j9zUeB8RTbCqrHZGjJlxOvNWKMYtunLrrl7HPOiR46w==}
+    engines: {node: ^14 || ^16 || >=18.0}
+    peerDependencies:
+      postcss: ^8.4.31
     dependencies:
-      lru-cache: 6.0.0
-    dev: false
+      postcss: 8.4.32
+      postcss-value-parser: 4.2.0
+    dev: true
 
-  /semver@7.3.8:
-    resolution: {integrity: sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==}
-    engines: {node: '>=10'}
-    hasBin: true
+  /postcss-minify-gradients@6.0.1(postcss@8.4.32):
+    resolution: {integrity: sha512-M1RJWVjd6IOLPl1hYiOd5HQHgpp6cvJVLrieQYS9y07Yo8itAr6jaekzJphaJFR0tcg4kRewCk3kna9uHBxn/w==}
+    engines: {node: ^14 || ^16 || >=18.0}
+    peerDependencies:
+      postcss: ^8.4.31
     dependencies:
-      lru-cache: 6.0.0
+      colord: 2.9.3
+      cssnano-utils: 4.0.1(postcss@8.4.32)
+      postcss: 8.4.32
+      postcss-value-parser: 4.2.0
+    dev: true
 
-  /send@0.18.0:
-    resolution: {integrity: sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==}
-    engines: {node: '>= 0.8.0'}
+  /postcss-minify-params@6.0.1(postcss@8.4.32):
+    resolution: {integrity: sha512-eFvGWArqh4khPIgPDu6SZNcaLctx97nO7c59OXnRtGntAp5/VS4gjMhhW9qUFsK6mQ27pEZGt2kR+mPizI+Z9g==}
+    engines: {node: ^14 || ^16 || >=18.0}
+    peerDependencies:
+      postcss: ^8.4.31
     dependencies:
-      debug: 2.6.9
-      depd: 2.0.0
-      destroy: 1.2.0
-      encodeurl: 1.0.2
-      escape-html: 1.0.3
-      etag: 1.8.1
-      fresh: 0.5.2
-      http-errors: 2.0.0
-      mime: 1.6.0
-      ms: 2.1.3
-      on-finished: 2.4.1
-      range-parser: 1.2.1
-      statuses: 2.0.1
-    transitivePeerDependencies:
-      - supports-color
+      browserslist: 4.23.0
+      cssnano-utils: 4.0.1(postcss@8.4.32)
+      postcss: 8.4.32
+      postcss-value-parser: 4.2.0
+    dev: true
 
-  /sentence-case@3.0.4:
-    resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
+  /postcss-minify-selectors@6.0.1(postcss@8.4.32):
+    resolution: {integrity: sha512-mfReq5wrS6vkunxvJp6GDuOk+Ak6JV7134gp8L+ANRnV9VwqzTvBtX6lpohooVU750AR0D3pVx2Zn6uCCwOAfQ==}
+    engines: {node: ^14 || ^16 || >=18.0}
+    peerDependencies:
+      postcss: ^8.4.31
     dependencies:
-      no-case: 3.0.4
-      tslib: 2.5.0
-      upper-case-first: 2.0.2
+      postcss: 8.4.32
+      postcss-selector-parser: 6.0.13
+    dev: true
 
-  /seq-queue@0.0.5:
-    resolution: {integrity: sha512-hr3Wtp/GZIc/6DAGPDcV4/9WoZhjrkXsi5B/07QgX8tsdc6ilr7BFM6PM6rbdAX1kFSDYeZGLipIZZKyQP0O5Q==}
-    dev: false
+  /postcss-nested@6.0.1(postcss@8.4.32):
+    resolution: {integrity: sha512-mEp4xPMi5bSWiMbsgoPfcP74lsWLHkQbZc3sY+jWYd65CUwXrUaTp0fmNpa01ZcETKlIgUdFN/MpS2xZtqL9dQ==}
+    engines: {node: '>=12.0'}
+    peerDependencies:
+      postcss: ^8.2.14
+    dependencies:
+      postcss: 8.4.32
+      postcss-selector-parser: 6.0.13
+    dev: true
 
-  /serialize-javascript@5.0.1:
-    resolution: {integrity: sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==}
+  /postcss-normalize-charset@6.0.1(postcss@8.4.32):
+    resolution: {integrity: sha512-aW5LbMNRZ+oDV57PF9K+WI1Z8MPnF+A8qbajg/T8PP126YrGX1f9IQx21GI2OlGz7XFJi/fNi0GTbY948XJtXg==}
+    engines: {node: ^14 || ^16 || >=18.0}
+    peerDependencies:
+      postcss: ^8.4.31
     dependencies:
-      randombytes: 2.1.0
-    dev: false
+      postcss: 8.4.32
+    dev: true
 
-  /serialize-javascript@6.0.1:
-    resolution: {integrity: sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==}
+  /postcss-normalize-display-values@6.0.1(postcss@8.4.32):
+    resolution: {integrity: sha512-mc3vxp2bEuCb4LgCcmG1y6lKJu1Co8T+rKHrcbShJwUmKJiEl761qb/QQCfFwlrvSeET3jksolCR/RZuMURudw==}
+    engines: {node: ^14 || ^16 || >=18.0}
+    peerDependencies:
+      postcss: ^8.4.31
     dependencies:
-      randombytes: 2.1.0
+      postcss: 8.4.32
+      postcss-value-parser: 4.2.0
     dev: true
 
-  /serve-favicon@2.5.0:
-    resolution: {integrity: sha512-FMW2RvqNr03x+C0WxTyu6sOv21oOjkq5j8tjquWccwa6ScNyGFOGJVpuS1NmTVGBAHS07xnSKotgf2ehQmf9iA==}
-    engines: {node: '>= 0.8.0'}
+  /postcss-normalize-positions@6.0.1(postcss@8.4.32):
+    resolution: {integrity: sha512-HRsq8u/0unKNvm0cvwxcOUEcakFXqZ41fv3FOdPn916XFUrympjr+03oaLkuZENz3HE9RrQE9yU0Xv43ThWjQg==}
+    engines: {node: ^14 || ^16 || >=18.0}
+    peerDependencies:
+      postcss: ^8.4.31
     dependencies:
-      etag: 1.8.1
-      fresh: 0.5.2
-      ms: 2.1.1
-      parseurl: 1.3.3
-      safe-buffer: 5.1.1
+      postcss: 8.4.32
+      postcss-value-parser: 4.2.0
     dev: true
 
-  /serve-static@1.15.0:
-    resolution: {integrity: sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==}
-    engines: {node: '>= 0.8.0'}
+  /postcss-normalize-repeat-style@6.0.1(postcss@8.4.32):
+    resolution: {integrity: sha512-Gbb2nmCy6tTiA7Sh2MBs3fj9W8swonk6lw+dFFeQT68B0Pzwp1kvisJQkdV6rbbMSd9brMlS8I8ts52tAGWmGQ==}
+    engines: {node: ^14 || ^16 || >=18.0}
+    peerDependencies:
+      postcss: ^8.4.31
     dependencies:
-      encodeurl: 1.0.2
-      escape-html: 1.0.3
-      parseurl: 1.3.3
-      send: 0.18.0
-    transitivePeerDependencies:
-      - supports-color
+      postcss: 8.4.32
+      postcss-value-parser: 4.2.0
+    dev: true
 
-  /servie@4.3.3:
-    resolution: {integrity: sha512-b0IrY3b1gVMsWvJppCf19g1p3JSnS0hQi6xu4Hi40CIhf0Lx8pQHcvBL+xunShpmOiQzg1NOia812NAWdSaShw==}
+  /postcss-normalize-string@6.0.1(postcss@8.4.32):
+    resolution: {integrity: sha512-5Fhx/+xzALJD9EI26Aq23hXwmv97Zfy2VFrt5PLT8lAhnBIZvmaT5pQk+NuJ/GWj/QWaKSKbnoKDGLbV6qnhXg==}
+    engines: {node: ^14 || ^16 || >=18.0}
+    peerDependencies:
+      postcss: ^8.4.31
     dependencies:
-      '@servie/events': 1.0.0
-      byte-length: 1.0.2
-      ts-expect: 1.3.0
-    dev: false
+      postcss: 8.4.32
+      postcss-value-parser: 4.2.0
+    dev: true
 
-  /set-blocking@2.0.0:
-    resolution: {integrity: sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==}
+  /postcss-normalize-timing-functions@6.0.1(postcss@8.4.32):
+    resolution: {integrity: sha512-4zcczzHqmCU7L5dqTB9rzeqPWRMc0K2HoR+Bfl+FSMbqGBUcP5LRfgcH4BdRtLuzVQK1/FHdFoGT3F7rkEnY+g==}
+    engines: {node: ^14 || ^16 || >=18.0}
+    peerDependencies:
+      postcss: ^8.4.31
+    dependencies:
+      postcss: 8.4.32
+      postcss-value-parser: 4.2.0
+    dev: true
 
-  /set-value@2.0.1:
-    resolution: {integrity: sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==}
-    engines: {node: '>=0.10.0'}
+  /postcss-normalize-unicode@6.0.1(postcss@8.4.32):
+    resolution: {integrity: sha512-ok9DsI94nEF79MkvmLfHfn8ddnKXA7w+8YuUoz5m7b6TOdoaRCpvu/QMHXQs9+DwUbvp+ytzz04J55CPy77PuQ==}
+    engines: {node: ^14 || ^16 || >=18.0}
+    peerDependencies:
+      postcss: ^8.4.31
     dependencies:
-      extend-shallow: 2.0.1
-      is-extendable: 0.1.1
-      is-plain-object: 2.0.4
-      split-string: 3.1.0
+      browserslist: 4.23.0
+      postcss: 8.4.32
+      postcss-value-parser: 4.2.0
     dev: true
 
-  /setprototypeof@1.2.0:
-    resolution: {integrity: sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==}
+  /postcss-normalize-url@6.0.1(postcss@8.4.32):
+    resolution: {integrity: sha512-jEXL15tXSvbjm0yzUV7FBiEXwhIa9H88JOXDGQzmcWoB4mSjZIsmtto066s2iW9FYuIrIF4k04HA2BKAOpbsaQ==}
+    engines: {node: ^14 || ^16 || >=18.0}
+    peerDependencies:
+      postcss: ^8.4.31
+    dependencies:
+      postcss: 8.4.32
+      postcss-value-parser: 4.2.0
+    dev: true
 
-  /sha.js@2.4.11:
-    resolution: {integrity: sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==}
-    hasBin: true
+  /postcss-normalize-whitespace@6.0.1(postcss@8.4.32):
+    resolution: {integrity: sha512-76i3NpWf6bB8UHlVuLRxG4zW2YykF9CTEcq/9LGAiz2qBuX5cBStadkk0jSkg9a9TCIXbMQz7yzrygKoCW9JuA==}
+    engines: {node: ^14 || ^16 || >=18.0}
+    peerDependencies:
+      postcss: ^8.4.31
     dependencies:
-      inherits: 2.0.4
-      safe-buffer: 5.2.1
-    dev: false
+      postcss: 8.4.32
+      postcss-value-parser: 4.2.0
+    dev: true
 
-  /shallow-clone@3.0.1:
-    resolution: {integrity: sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==}
-    engines: {node: '>=8'}
+  /postcss-ordered-values@6.0.1(postcss@8.4.32):
+    resolution: {integrity: sha512-XXbb1O/MW9HdEhnBxitZpPFbIvDgbo9NK4c/5bOfiKpnIGZDoL2xd7/e6jW5DYLsWxBbs+1nZEnVgnjnlFViaA==}
+    engines: {node: ^14 || ^16 || >=18.0}
+    peerDependencies:
+      postcss: ^8.4.31
     dependencies:
-      kind-of: 6.0.3
+      cssnano-utils: 4.0.1(postcss@8.4.32)
+      postcss: 8.4.32
+      postcss-value-parser: 4.2.0
     dev: true
 
-  /shebang-command@1.2.0:
-    resolution: {integrity: sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==}
-    engines: {node: '>=0.10.0'}
+  /postcss-reduce-initial@6.0.1(postcss@8.4.32):
+    resolution: {integrity: sha512-cgzsI2ThG1PMSdSyM9A+bVxiiVgPIVz9f5c6H+TqEv0CA89iCOO81mwLWRWLgOKFtQkKob9nNpnkxG/1RlgFcA==}
+    engines: {node: ^14 || ^16 || >=18.0}
+    peerDependencies:
+      postcss: ^8.4.31
     dependencies:
-      shebang-regex: 1.0.0
+      browserslist: 4.23.0
+      caniuse-api: 3.0.0
+      postcss: 8.4.32
+    dev: true
 
-  /shebang-command@2.0.0:
-    resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==}
-    engines: {node: '>=8'}
+  /postcss-reduce-transforms@6.0.1(postcss@8.4.32):
+    resolution: {integrity: sha512-fUbV81OkUe75JM+VYO1gr/IoA2b/dRiH6HvMwhrIBSUrxq3jNZQZitSnugcTLDi1KkQh1eR/zi+iyxviUNBkcQ==}
+    engines: {node: ^14 || ^16 || >=18.0}
+    peerDependencies:
+      postcss: ^8.4.31
     dependencies:
-      shebang-regex: 3.0.0
+      postcss: 8.4.32
+      postcss-value-parser: 4.2.0
     dev: true
 
-  /shebang-regex@1.0.0:
-    resolution: {integrity: sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==}
-    engines: {node: '>=0.10.0'}
+  /postcss-selector-parser@6.0.13:
+    resolution: {integrity: sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==}
+    engines: {node: '>=4'}
+    dependencies:
+      cssesc: 3.0.0
+      util-deprecate: 1.0.2
+    dev: true
 
-  /shebang-regex@3.0.0:
-    resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
-    engines: {node: '>=8'}
+  /postcss-selector-parser@6.0.16:
+    resolution: {integrity: sha512-A0RVJrX+IUkVZbW3ClroRWurercFhieevHB38sr2+l9eUClMqome3LmEmnhlNy+5Mr2EYN6B2Kaw9wYdd+VHiw==}
+    engines: {node: '>=4'}
+    dependencies:
+      cssesc: 3.0.0
+      util-deprecate: 1.0.2
     dev: true
 
-  /shell-escape@0.2.0:
-    resolution: {integrity: sha512-uRRBT2MfEOyxuECseCZd28jC1AJ8hmqqneWQ4VWUTgCAFvb3wKU1jLqj6egC4Exrr88ogg3dp+zroH4wJuaXzw==}
-    dev: false
+  /postcss-svgo@6.0.1(postcss@8.4.32):
+    resolution: {integrity: sha512-eWV4Rrqa06LzTgqirOv5Ln6WTGyU7Pbeqj9WEyKo9tpnWixNATVJMeaEcOHOW1ZYyjcG8wSJwX/28DvU3oy3HA==}
+    engines: {node: ^14 || ^16 || >= 18}
+    peerDependencies:
+      postcss: ^8.4.31
+    dependencies:
+      postcss: 8.4.32
+      postcss-value-parser: 4.2.0
+      svgo: 3.1.0
+    dev: true
 
-  /shelljs@0.8.5:
-    resolution: {integrity: sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==}
-    engines: {node: '>=4'}
-    hasBin: true
+  /postcss-unique-selectors@6.0.1(postcss@8.4.32):
+    resolution: {integrity: sha512-/KCCEpNNR7oXVJ38/Id7GC9Nt0zxO1T3zVbhVaq6F6LSG+3gU3B7+QuTHfD0v8NPEHlzewAout29S0InmB78EQ==}
+    engines: {node: ^14 || ^16 || >=18.0}
+    peerDependencies:
+      postcss: ^8.4.31
     dependencies:
-      glob: 7.2.3
-      interpret: 1.4.0
-      rechoir: 0.6.2
+      postcss: 8.4.32
+      postcss-selector-parser: 6.0.13
+    dev: true
 
-  /shellwords@0.1.1:
-    resolution: {integrity: sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==}
+  /postcss-value-parser@4.2.0:
+    resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==}
     dev: true
 
-  /should-equal@2.0.0:
-    resolution: {integrity: sha512-ZP36TMrK9euEuWQYBig9W55WPC7uo37qzAEmbjHz4gfyuXrEUgF8cUvQVO+w+d3OMfPvSRQJ22lSm8MQJ43LTA==}
+  /postcss@8.4.31:
+    resolution: {integrity: sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==}
+    engines: {node: ^10 || ^12 || >=14}
     dependencies:
-      should-type: 1.4.0
+      nanoid: 3.3.6
+      picocolors: 1.0.0
+      source-map-js: 1.0.2
+    dev: true
+
+  /postcss@8.4.32:
+    resolution: {integrity: sha512-D/kj5JNu6oo2EIy+XL/26JEDTlIbB8hw85G8StOE6L74RQAVVP5rej6wxCNqyMbR4RkPfqvezVbPw81Ngd6Kcw==}
+    engines: {node: ^10 || ^12 || >=14}
+    dependencies:
+      nanoid: 3.3.7
+      picocolors: 1.0.0
+      source-map-js: 1.0.2
+    dev: true
+
+  /postcss@8.4.35:
+    resolution: {integrity: sha512-u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA==}
+    engines: {node: ^10 || ^12 || >=14}
+    dependencies:
+      nanoid: 3.3.7
+      picocolors: 1.0.0
+      source-map-js: 1.0.2
+
+  /postgres-array@2.0.0:
+    resolution: {integrity: sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==}
+    engines: {node: '>=4'}
     dev: false
 
-  /should-format@3.0.3:
-    resolution: {integrity: sha512-hZ58adtulAk0gKtua7QxevgUaXTTXxIi8t41L3zo9AHvjXO1/7sdLECuHeIN2SRtYXpNkmhoUP2pdeWgricQ+Q==}
+  /postgres-bytea@1.0.0:
+    resolution: {integrity: sha512-xy3pmLuQqRBZBXDULy7KbaitYqLcmxigw14Q5sj8QBVLqEwXfeybIKVWiqAXTlcvdvb0+xkOtDbfQMOf4lST1w==}
+    engines: {node: '>=0.10.0'}
+    dev: false
+
+  /postgres-date@1.0.7:
+    resolution: {integrity: sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==}
+    engines: {node: '>=0.10.0'}
+    dev: false
+
+  /postgres-interval@1.2.0:
+    resolution: {integrity: sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==}
+    engines: {node: '>=0.10.0'}
     dependencies:
-      should-type: 1.4.0
-      should-type-adaptors: 1.1.0
+      xtend: 4.0.2
     dev: false
 
-  /should-type-adaptors@1.1.0:
-    resolution: {integrity: sha512-JA4hdoLnN+kebEp2Vs8eBe9g7uy0zbRo+RMcU0EsNy+R+k049Ki+N5tT5Jagst2g7EAja+euFuoXFCa8vIklfA==}
+  /posthog-node@3.2.1:
+    resolution: {integrity: sha512-ofNX3TPfZPlWErVc2EDk66cIrfp9EXeKBsXFxf8ISXK57b10ANwRnKAlf5rQjxjRKqcUWmV0d3ZfOeVeYracMw==}
+    engines: {node: '>=15.0.0'}
     dependencies:
-      should-type: 1.4.0
-      should-util: 1.0.1
+      axios: 1.6.7
+      rusha: 0.8.14
+    transitivePeerDependencies:
+      - debug
     dev: false
 
-  /should-type@1.4.0:
-    resolution: {integrity: sha512-MdAsTu3n25yDbIe1NeN69G4n6mUnJGtSJHygX3+oN0ZbO3DTiATnf7XnYJdGT42JCXurTb1JI0qOBR65shvhPQ==}
+  /postman-collection@4.2.1:
+    resolution: {integrity: sha512-DFLt3/yu8+ldtOTIzmBUctoupKJBOVK4NZO0t68K2lIir9smQg7OdQTBjOXYy+PDh7u0pSDvD66tm93eBHEPHA==}
+    engines: {node: '>=10'}
+    dependencies:
+      '@faker-js/faker': 5.5.3
+      file-type: 3.9.0
+      http-reasons: 0.1.0
+      iconv-lite: 0.6.3
+      liquid-json: 0.3.1
+      lodash: 4.17.21
+      mime-format: 2.0.1
+      mime-types: 2.1.35
+      postman-url-encoder: 3.0.5
+      semver: 7.6.0
+      uuid: 8.3.2
     dev: false
 
-  /should-util@1.0.1:
-    resolution: {integrity: sha512-oXF8tfxx5cDk8r2kYqlkUJzZpDBqVY/II2WhvU0n9Y3XYvAYRmeaf1PvvIvTgPnv4KJ+ES5M0PyDq5Jp+Ygy2g==}
+  /postman-collection@4.4.0:
+    resolution: {integrity: sha512-2BGDFcUwlK08CqZFUlIC8kwRJueVzPjZnnokWPtJCd9f2J06HBQpGL7t2P1Ud1NEsK9NHq9wdipUhWLOPj5s/Q==}
+    engines: {node: '>=10'}
+    dependencies:
+      '@faker-js/faker': 5.5.3
+      file-type: 3.9.0
+      http-reasons: 0.1.0
+      iconv-lite: 0.6.3
+      liquid-json: 0.3.1
+      lodash: 4.17.21
+      mime-format: 2.0.1
+      mime-types: 2.1.35
+      postman-url-encoder: 3.0.5
+      semver: 7.6.0
+      uuid: 8.3.2
     dev: false
 
-  /should@13.2.3:
-    resolution: {integrity: sha512-ggLesLtu2xp+ZxI+ysJTmNjh2U0TsC+rQ/pfED9bUZZ4DKefP27D+7YJVVTvKsmjLpIi9jAa7itwDGkDDmt1GQ==}
+  /postman-url-encoder@3.0.5:
+    resolution: {integrity: sha512-jOrdVvzUXBC7C+9gkIkpDJ3HIxOHTIqjpQ4C1EMt1ZGeMvSEpbFCKq23DEfgsj46vMnDgyQf+1ZLp2Wm+bKSsA==}
+    engines: {node: '>=10'}
     dependencies:
-      should-equal: 2.0.0
-      should-format: 3.0.3
-      should-type: 1.4.0
-      should-type-adaptors: 1.1.0
-      should-util: 1.0.1
+      punycode: 2.3.1
     dev: false
 
-  /showdown@2.1.0:
-    resolution: {integrity: sha512-/6NVYu4U819R2pUIk79n67SYgJHWCce0a5xTP979WbNp0FL9MN1I1QK662IDU1b6JzKTvmhgI7T7JYIxBi3kMQ==}
+  /prebuild-install@7.1.1:
+    resolution: {integrity: sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==}
+    engines: {node: '>=10'}
     hasBin: true
     dependencies:
-      commander: 9.4.1
+      detect-libc: 2.0.1
+      expand-template: 2.0.3
+      github-from-package: 0.0.0
+      minimist: 1.2.8
+      mkdirp-classic: 0.5.3
+      napi-build-utils: 1.0.2
+      node-abi: 3.54.0
+      pump: 3.0.0
+      rc: 1.2.8
+      simple-get: 4.0.1
+      tar-fs: 2.1.1
+      tunnel-agent: 0.6.0
     dev: false
 
-  /side-channel@1.0.4:
-    resolution: {integrity: sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==}
+  /prelude-ls@1.1.2:
+    resolution: {integrity: sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==}
+    engines: {node: '>= 0.8.0'}
+
+  /prelude-ls@1.2.1:
+    resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
+    engines: {node: '>= 0.8.0'}
+    dev: true
+
+  /pretender@3.4.7:
+    resolution: {integrity: sha512-jkPAvt1BfRi0RKamweJdEcnjkeu7Es8yix3bJ+KgBC5VpG/Ln4JE3hYN6vJym4qprm8Xo5adhWpm3HCoft1dOw==}
     dependencies:
-      call-bind: 1.0.2
-      get-intrinsic: 1.1.3
-      object-inspect: 1.12.3
+      fake-xml-http-request: 2.1.2
+      route-recognizer: 0.3.4
+    dev: true
 
-  /siginfo@2.0.0:
-    resolution: {integrity: sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==}
+  /prettier-linter-helpers@1.0.0:
+    resolution: {integrity: sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==}
+    engines: {node: '>=6.0.0'}
+    dependencies:
+      fast-diff: 1.2.0
+    dev: true
+
+  /prettier@3.2.5:
+    resolution: {integrity: sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==}
+    engines: {node: '>=14'}
+    hasBin: true
+
+  /pretty-bytes@5.6.0:
+    resolution: {integrity: sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==}
+    engines: {node: '>=6'}
+
+  /pretty-bytes@6.1.1:
+    resolution: {integrity: sha512-mQUvGU6aUFQ+rNvTIAcZuWGRT9a6f6Yrg9bHs4ImKF+HZCEK+plBvnAZYSIQztknZF2qnzNtr6F8s0+IuptdlQ==}
+    engines: {node: ^14.13.1 || >=16.0.0}
+    dev: true
+
+  /pretty-format@27.5.1:
+    resolution: {integrity: sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      ansi-regex: 5.0.1
+      ansi-styles: 5.2.0
+      react-is: 17.0.2
     dev: true
 
-  /sigmund@1.0.1:
-    resolution: {integrity: sha512-fCvEXfh6NWpm+YSuY2bpXb/VIihqWA6hLsgboC+0nl71Q7N7o2eaCW8mJa/NLvQhs6jpd3VZV4UiUQlV6+lc8g==}
+  /pretty-format@29.5.0:
+    resolution: {integrity: sha512-V2mGkI31qdttvTFX7Mt4efOqHXqJWMu4/r66Xh3Z3BwZaPfPJgp6/gbwoujRpPUtfEF6AUUWx3Jim3GCw5g/Qw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    dependencies:
+      '@jest/schemas': 29.4.3
+      ansi-styles: 5.2.0
+      react-is: 18.2.0
     dev: true
 
-  /signal-exit@3.0.7:
-    resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==}
-
-  /simple-git@3.17.0:
-    resolution: {integrity: sha512-JozI/s8jr3nvLd9yn2jzPVHnhVzt7t7QWfcIoDcqRIGN+f1IINGv52xoZti2kkYfoRhhRvzMSNPfogHMp97rlw==}
+  /pretty-format@29.6.2:
+    resolution: {integrity: sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@kwsites/file-exists': 1.1.1
-      '@kwsites/promise-deferred': 1.1.1
-      debug: 4.3.4(supports-color@8.1.1)
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-
-  /simple-lru-cache@0.0.2:
-    resolution: {integrity: sha512-uEv/AFO0ADI7d99OHDmh1QfYzQk/izT1vCmu/riQfh7qjBVUUgRT87E5s5h7CxWCA/+YoZerykpEthzVrW3LIw==}
-    dev: false
+      '@jest/schemas': 29.6.0
+      ansi-styles: 5.2.0
+      react-is: 18.2.0
 
-  /simple-swizzle@0.2.2:
-    resolution: {integrity: sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==}
+  /pretty-format@29.7.0:
+    resolution: {integrity: sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      is-arrayish: 0.3.2
-    dev: false
+      '@jest/schemas': 29.6.3
+      ansi-styles: 5.2.0
+      react-is: 18.2.0
 
-  /simple-update-notifier@1.0.7:
-    resolution: {integrity: sha512-BBKgR84BJQJm6WjWFMHgLVuo61FBDSj1z/xSFUIozqO6wO7ii0JxCqlIud7Enr/+LhlbNI0whErq96P2qHNWew==}
-    engines: {node: '>=8.10.0'}
-    dependencies:
-      semver: 7.0.0
+  /pretty-hrtime@1.0.3:
+    resolution: {integrity: sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==}
+    engines: {node: '>= 0.8'}
     dev: true
 
-  /sisteransi@1.0.5:
-    resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==}
+  /prismjs@1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
     dev: true
 
-  /slash@3.0.0:
-    resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==}
-    engines: {node: '>=8'}
+  /process-nextick-args@2.0.1:
+    resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==}
 
-  /slash@4.0.0:
-    resolution: {integrity: sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==}
-    engines: {node: '>=12'}
-    dev: true
+  /process@0.11.10:
+    resolution: {integrity: sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==}
+    engines: {node: '>= 0.6.0'}
 
-  /slice-ansi@3.0.0:
-    resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
-    engines: {node: '>=8'}
-    dependencies:
-      ansi-styles: 4.3.0
-      astral-regex: 2.0.0
-      is-fullwidth-code-point: 3.0.0
+  /progress@2.0.3:
+    resolution: {integrity: sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==}
+    engines: {node: '>=0.4.0'}
     dev: true
 
-  /slice-ansi@4.0.0:
-    resolution: {integrity: sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==}
+  /prom-client@13.2.0:
+    resolution: {integrity: sha512-wGr5mlNNdRNzEhRYXgboUU2LxHWIojxscJKmtG3R8f4/KiWqyYgXTLHs0+Ted7tG3zFT7pgHJbtomzZ1L0ARaQ==}
     engines: {node: '>=10'}
     dependencies:
-      ansi-styles: 4.3.0
-      astral-regex: 2.0.0
-      is-fullwidth-code-point: 3.0.0
-    dev: true
+      tdigest: 0.1.2
+    dev: false
 
-  /slice-ansi@5.0.0:
-    resolution: {integrity: sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==}
-    engines: {node: '>=12'}
+  /promise-ftp-common@1.1.5:
+    resolution: {integrity: sha512-a84F/zM2Z0Ry/ht3nXfV6Ze7BISOQlWrct/YObrluJn8qy2LVeeQ+IJ7jD4bkmM0N2xfXYy5nurz4L1KEj+rJg==}
+    dev: false
+
+  /promise-ftp@1.3.5(promise-ftp-common@1.1.5):
+    resolution: {integrity: sha512-v368jPSqzmjjKDIyggulC+dRFcpAOEX7aFdEWkFYQp8Ao3P2N4Y6XnFFdKgK7PtkylwvGQkZR/65HZuzmq0V7A==}
+    engines: {node: '>=0.11.13'}
+    peerDependencies:
+      promise-ftp-common: ^1.1.5
     dependencies:
-      ansi-styles: 6.2.1
-      is-fullwidth-code-point: 4.0.0
-    dev: true
+      '@icetee/ftp': 0.3.15
+      bluebird: 2.11.0
+      promise-ftp-common: 1.1.5
+    dev: false
 
-  /smart-buffer@4.2.0:
-    resolution: {integrity: sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==}
-    engines: {node: '>= 6.0.0', npm: '>= 3.0.0'}
+  /promise-inflight@1.0.1:
+    resolution: {integrity: sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==}
+    peerDependencies:
+      bluebird: '*'
+    peerDependenciesMeta:
+      bluebird:
+        optional: true
     dev: false
+    optional: true
 
-  /snake-case@3.0.4:
-    resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
+  /promise-retry@2.0.1:
+    resolution: {integrity: sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==}
+    engines: {node: '>=10'}
     dependencies:
-      dot-case: 3.0.4
-      tslib: 2.5.0
+      err-code: 2.0.3
+      retry: 0.12.0
     dev: false
 
-  /snapdragon-node@2.1.1:
-    resolution: {integrity: sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==}
-    engines: {node: '>=0.10.0'}
+  /promise@7.3.1:
+    resolution: {integrity: sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==}
     dependencies:
-      define-property: 1.0.0
-      isobject: 3.0.1
-      snapdragon-util: 3.0.1
+      asap: 2.0.6
     dev: true
 
-  /snapdragon-util@3.0.1:
-    resolution: {integrity: sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==}
-    engines: {node: '>=0.10.0'}
+  /prompts@2.4.2:
+    resolution: {integrity: sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==}
+    engines: {node: '>= 6'}
     dependencies:
-      kind-of: 3.2.2
-    dev: true
+      kleur: 3.0.3
+      sisteransi: 1.0.5
 
-  /snapdragon@0.8.2:
-    resolution: {integrity: sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==}
-    engines: {node: '>=0.10.0'}
+  /prop-types@15.8.1:
+    resolution: {integrity: sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==}
     dependencies:
-      base: 0.11.2
-      debug: 2.6.9
-      define-property: 0.2.5
-      extend-shallow: 2.0.1
-      map-cache: 0.2.2
-      source-map: 0.5.7
-      source-map-resolve: 0.5.3
-      use: 3.1.1
-    transitivePeerDependencies:
-      - supports-color
+      loose-envify: 1.4.0
+      object-assign: 4.1.1
+      react-is: 16.13.1
     dev: true
 
-  /snowflake-sdk@1.6.14(asn1.js@5.4.1):
-    resolution: {integrity: sha512-sKg17Yz1/aydKxlA4unlprH+uw9ZsvRezdUmamLjNlvsXQsw+pok4PoMeCKtWs2OSVFnX0VO3eSacCPglQrAQA==}
-    dependencies:
-      '@azure/storage-blob': 12.11.0
-      '@techteamer/ocsp': 1.0.0
-      agent-base: 6.0.2
-      asn1.js-rfc2560: 5.0.1(asn1.js@5.4.1)
-      asn1.js-rfc5280: 3.0.0
-      aws-sdk: 2.1231.0
-      axios: 0.27.2(debug@3.2.7)
-      big-integer: 1.6.51
-      bignumber.js: 2.4.0
-      binascii: 0.0.2
-      browser-request: 0.3.3
-      debug: 3.2.7(supports-color@5.5.0)
-      expand-tilde: 2.0.2
-      extend: 3.0.2
-      generic-pool: 3.9.0
-      glob: 7.2.3
-      jsonwebtoken: 9.0.0
-      mime-types: 2.1.35
-      mkdirp: 1.0.4
-      mock-require: 3.0.3
-      moment: 2.29.4
-      moment-timezone: 0.5.37
-      open: 7.4.2
-      python-struct: 1.1.3
-      simple-lru-cache: 0.0.2
-      string-similarity: 4.0.4
-      test-console: 2.0.0
-      tmp: 0.2.1
-      urllib: 2.39.1
-      uuid: 3.4.0
-      winston: 3.8.2
-    transitivePeerDependencies:
-      - asn1.js
-      - encoding
-      - supports-color
+  /propagate@2.0.1:
+    resolution: {integrity: sha512-vGrhOavPSTz4QVNuBNdcNXePNdNMaO1xj9yBeH1ScQPjk/rhg9sSlCXPhMkFuaNNW/syTvYqsnbIJxMBfRbbag==}
+    engines: {node: '>= 8'}
+    dev: true
+
+  /property-expr@2.0.5:
+    resolution: {integrity: sha512-IJUkICM5dP5znhCckHSv30Q4b5/JA5enCtkRHYaOVOAocnH/1BQEYTC5NMfT3AVl/iXKdr3aqQbQn9DxyWknwA==}
     dev: false
 
-  /socks-proxy-agent@5.0.1:
-    resolution: {integrity: sha512-vZdmnjb9a2Tz6WEQVIurybSwElwPxMZaIc7PzqbJTrezcKNznv6giT7J7tZDZ1BojVaa1jvO/UiUdhDVB0ACoQ==}
-    engines: {node: '>= 6'}
+  /proto-list@1.2.4:
+    resolution: {integrity: sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==}
+    dev: true
+
+  /proto3-json-serializer@1.1.1:
+    resolution: {integrity: sha512-AwAuY4g9nxx0u52DnSMkqqgyLHaW/XaPLtaAo3y/ZCfeaQB/g4YDH4kb8Wc/mWzWvu0YjOznVnfn373MVZZrgw==}
+    engines: {node: '>=12.0.0'}
     dependencies:
-      agent-base: 6.0.2
-      debug: 4.3.4(supports-color@8.1.1)
-      socks: 2.7.1
-    transitivePeerDependencies:
-      - supports-color
+      protobufjs: 7.2.6
     dev: false
 
-  /socks-proxy-agent@6.2.1:
-    resolution: {integrity: sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ==}
-    engines: {node: '>= 10'}
+  /protobufjs-cli@1.1.1(protobufjs@7.2.4):
+    resolution: {integrity: sha512-VPWMgIcRNyQwWUv8OLPyGQ/0lQY/QTQAVN5fh+XzfDwsVw1FZ2L3DM/bcBf8WPiRz2tNpaov9lPZfNcmNo6LXA==}
+    engines: {node: '>=12.0.0'}
+    hasBin: true
+    peerDependencies:
+      protobufjs: ^7.0.0
     dependencies:
-      agent-base: 6.0.2
-      debug: 4.3.4(supports-color@8.1.1)
-      socks: 2.7.1
-    transitivePeerDependencies:
-      - supports-color
+      chalk: 4.1.2
+      escodegen: 1.14.3
+      espree: 9.6.1
+      estraverse: 5.3.0
+      glob: 8.1.0
+      jsdoc: 4.0.2
+      minimist: 1.2.8
+      protobufjs: 7.2.4
+      semver: 7.6.0
+      tmp: 0.2.1
+      uglify-js: 3.17.4
     dev: false
-    optional: true
 
-  /socks@2.7.1:
-    resolution: {integrity: sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==}
-    engines: {node: '>= 10.13.0', npm: '>= 3.0.0'}
+  /protobufjs@7.2.4:
+    resolution: {integrity: sha512-AT+RJgD2sH8phPmCf7OUZR8xGdcJRga4+1cOaXJ64hvcSkVhNcRHOwIxUatPH15+nj59WAGTDv3LSGZPEQbJaQ==}
+    engines: {node: '>=12.0.0'}
     dependencies:
-      ip: 2.0.0
-      smart-buffer: 4.2.0
+      '@protobufjs/aspromise': 1.1.2
+      '@protobufjs/base64': 1.1.2
+      '@protobufjs/codegen': 2.0.4
+      '@protobufjs/eventemitter': 1.1.0
+      '@protobufjs/fetch': 1.1.0
+      '@protobufjs/float': 1.0.2
+      '@protobufjs/inquire': 1.1.0
+      '@protobufjs/path': 1.1.2
+      '@protobufjs/pool': 1.1.0
+      '@protobufjs/utf8': 1.1.0
+      '@types/node': 18.16.16
+      long: 5.2.3
+    dev: false
+
+  /protobufjs@7.2.6:
+    resolution: {integrity: sha512-dgJaEDDL6x8ASUZ1YqWciTRrdOuYNzoOf27oHNfdyvKqHr5i0FV7FSLU+aIeFjyFgVxrpTOtQUi0BLLBymZaBw==}
+    engines: {node: '>=12.0.0'}
+    dependencies:
+      '@protobufjs/aspromise': 1.1.2
+      '@protobufjs/base64': 1.1.2
+      '@protobufjs/codegen': 2.0.4
+      '@protobufjs/eventemitter': 1.1.0
+      '@protobufjs/fetch': 1.1.0
+      '@protobufjs/float': 1.0.2
+      '@protobufjs/inquire': 1.1.0
+      '@protobufjs/path': 1.1.2
+      '@protobufjs/pool': 1.1.0
+      '@protobufjs/utf8': 1.1.0
+      '@types/node': 18.16.16
+      long: 5.2.3
     dev: false
 
-  /sort-keys@4.2.0:
-    resolution: {integrity: sha512-aUYIEU/UviqPgc8mHR6IW1EGxkAXpeRETYcrzg8cLAvUPZcpAlleSXHV2mY7G12GphSH6Gzv+4MMVSSkbdteHg==}
-    engines: {node: '>=8'}
+  /proxy-addr@2.0.7:
+    resolution: {integrity: sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==}
+    engines: {node: '>= 0.10'}
     dependencies:
-      is-plain-obj: 2.1.0
+      forwarded: 0.2.0
+      ipaddr.js: 1.9.1
+
+  /proxy-from-env@1.0.0:
+    resolution: {integrity: sha512-F2JHgJQ1iqwnHDcQjVBsq3n/uoaFL+iPW/eAeL7kVxy/2RrWaN4WroKjjvbsoRtv0ftelNyC01bjRhn/bhcf4A==}
     dev: true
 
-  /source-map-js@1.0.2:
-    resolution: {integrity: sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==}
-    engines: {node: '>=0.10.0'}
+  /proxy-from-env@1.1.0:
+    resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==}
 
-  /source-map-resolve@0.5.3:
-    resolution: {integrity: sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==}
-    deprecated: See https://github.com/lydell/source-map-resolve#deprecated
+  /ps-tree@1.2.0:
+    resolution: {integrity: sha512-0VnamPPYHl4uaU/nSFeZZpR21QAWRz+sRv4iW9+v/GS/J5U5iZB5BNN6J0RMoOvdx2gWM2+ZFMIm58q24e4UYA==}
+    engines: {node: '>= 0.10'}
+    hasBin: true
     dependencies:
-      atob: 2.1.2
-      decode-uri-component: 0.2.2
-      resolve-url: 0.2.1
-      source-map-url: 0.4.1
-      urix: 0.1.0
+      event-stream: 3.3.4
     dev: true
 
-  /source-map-support@0.5.13:
-    resolution: {integrity: sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==}
+  /pseudomap@1.0.2:
+    resolution: {integrity: sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==}
+    dev: false
+
+  /psl@1.9.0:
+    resolution: {integrity: sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==}
+
+  /pstree.remy@1.1.8:
+    resolution: {integrity: sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==}
+    dev: true
+
+  /pug-attrs@3.0.0:
+    resolution: {integrity: sha512-azINV9dUtzPMFQktvTXciNAfAuVh/L/JCl0vtPCwvOA21uZrC08K/UnmrL+SXGEVc1FwzjW62+xw5S/uaLj6cA==}
     dependencies:
-      buffer-from: 1.1.2
-      source-map: 0.6.1
+      constantinople: 4.0.1
+      js-stringify: 1.0.2
+      pug-runtime: 3.0.1
     dev: true
 
-  /source-map-support@0.5.21:
-    resolution: {integrity: sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==}
+  /pug-code-gen@3.0.2:
+    resolution: {integrity: sha512-nJMhW16MbiGRiyR4miDTQMRWDgKplnHyeLvioEJYbk1RsPI3FuA3saEP8uwnTb2nTJEKBU90NFVWJBk4OU5qyg==}
     dependencies:
-      buffer-from: 1.1.2
-      source-map: 0.6.1
+      constantinople: 4.0.1
+      doctypes: 1.1.0
+      js-stringify: 1.0.2
+      pug-attrs: 3.0.0
+      pug-error: 2.0.0
+      pug-runtime: 3.0.1
+      void-elements: 3.1.0
+      with: 7.0.2
+    dev: true
 
-  /source-map-url@0.4.1:
-    resolution: {integrity: sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==}
-    deprecated: See https://github.com/lydell/source-map-url#deprecated
+  /pug-error@2.0.0:
+    resolution: {integrity: sha512-sjiUsi9M4RAGHktC1drQfCr5C5eriu24Lfbt4s+7SykztEOwVZtbFk1RRq0tzLxcMxMYTBR+zMQaG07J/btayQ==}
     dev: true
 
-  /source-map@0.5.7:
-    resolution: {integrity: sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==}
-    engines: {node: '>=0.10.0'}
+  /pug-filters@4.0.0:
+    resolution: {integrity: sha512-yeNFtq5Yxmfz0f9z2rMXGw/8/4i1cCFecw/Q7+D0V2DdtII5UvqE12VaZ2AY7ri6o5RNXiweGH79OCq+2RQU4A==}
+    dependencies:
+      constantinople: 4.0.1
+      jstransformer: 1.0.0
+      pug-error: 2.0.0
+      pug-walk: 2.0.0
+      resolve: 1.22.8
     dev: true
 
-  /source-map@0.6.1:
-    resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==}
-    engines: {node: '>=0.10.0'}
-
-  /sourcemap-codec@1.4.8:
-    resolution: {integrity: sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==}
-    deprecated: Please use @jridgewell/sourcemap-codec instead
+  /pug-lexer@5.0.1:
+    resolution: {integrity: sha512-0I6C62+keXlZPZkOJeVam9aBLVP2EnbeDw3An+k0/QlqdwH6rv8284nko14Na7c0TtqtogfWXcRoFE4O4Ff20w==}
+    dependencies:
+      character-parser: 2.2.0
+      is-expression: 4.0.0
+      pug-error: 2.0.0
     dev: true
 
-  /space-separated-tokens@1.1.5:
-    resolution: {integrity: sha512-q/JSVd1Lptzhf5bkYm4ob4iWPjx0KiRe3sRFBNrVqbJkFaBm5vbbowy1mymoPNLRa52+oadOhJ+K49wsSeSjTA==}
+  /pug-linker@4.0.0:
+    resolution: {integrity: sha512-gjD1yzp0yxbQqnzBAdlhbgoJL5qIFJw78juN1NpTLt/mfPJ5VgC4BvkoD3G23qKzJtIIXBbcCt6FioLSFLOHdw==}
+    dependencies:
+      pug-error: 2.0.0
+      pug-walk: 2.0.0
     dev: true
 
-  /sparkles@1.0.1:
-    resolution: {integrity: sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==}
-    engines: {node: '>= 0.10'}
+  /pug-load@3.0.0:
+    resolution: {integrity: sha512-OCjTEnhLWZBvS4zni/WUMjH2YSUosnsmjGBB1An7CsKQarYSWQ0GCVyd4eQPMFJqZ8w9xgs01QdiZXKVjk92EQ==}
+    dependencies:
+      object-assign: 4.1.1
+      pug-walk: 2.0.0
     dev: true
 
-  /sparse-bitfield@3.0.3:
-    resolution: {integrity: sha512-kvzhi7vqKTfkh0PZU+2D2PIllw2ymqJKujUcyPMd9Y75Nv4nPbGJZXNhxsgdQab2BmlDct1YnfQCguEvHr7VsQ==}
+  /pug-parser@6.0.0:
+    resolution: {integrity: sha512-ukiYM/9cH6Cml+AOl5kETtM9NR3WulyVP2y4HOU45DyMim1IeP/OOiyEWRr6qk5I5klpsBnbuHpwKmTx6WURnw==}
     dependencies:
-      memory-pager: 1.5.0
-    dev: false
-    optional: true
+      pug-error: 2.0.0
+      token-stream: 1.0.0
+    dev: true
 
-  /spawn-command@0.0.2-1:
-    resolution: {integrity: sha512-n98l9E2RMSJ9ON1AKisHzz7V42VDiBQGY6PB1BwRglz99wpVsSuGzQ+jOi6lFXBGVTCrRpltvjm+/XA+tpeJrg==}
+  /pug-runtime@3.0.1:
+    resolution: {integrity: sha512-L50zbvrQ35TkpHwv0G6aLSuueDRwc/97XdY8kL3tOT0FmhgG7UypU3VztfV/LATAvmUfYi4wNxSajhSAeNN+Kg==}
     dev: true
 
-  /spdx-correct@3.1.1:
-    resolution: {integrity: sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==}
+  /pug-strip-comments@2.0.0:
+    resolution: {integrity: sha512-zo8DsDpH7eTkPHCXFeAk1xZXJbyoTfdPlNR0bK7rpOMuhBYb0f5qUVCO1xlsitYd3w5FQTK7zpNVKb3rZoUrrQ==}
     dependencies:
-      spdx-expression-parse: 3.0.1
-      spdx-license-ids: 3.0.12
+      pug-error: 2.0.0
     dev: true
 
-  /spdx-exceptions@2.3.0:
-    resolution: {integrity: sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==}
+  /pug-walk@2.0.0:
+    resolution: {integrity: sha512-yYELe9Q5q9IQhuvqsZNwA5hfPkMJ8u92bQLIMcsMxf/VADjNtEYptU+inlufAFYcWdHlwNfZOEnOOQrZrcyJCQ==}
     dev: true
 
-  /spdx-expression-parse@3.0.1:
-    resolution: {integrity: sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==}
+  /pug@3.0.2:
+    resolution: {integrity: sha512-bp0I/hiK1D1vChHh6EfDxtndHji55XP/ZJKwsRqrz6lRia6ZC2OZbdAymlxdVFwd1L70ebrVJw4/eZ79skrIaw==}
     dependencies:
-      spdx-exceptions: 2.3.0
-      spdx-license-ids: 3.0.12
+      pug-code-gen: 3.0.2
+      pug-filters: 4.0.0
+      pug-lexer: 5.0.1
+      pug-linker: 4.0.0
+      pug-load: 3.0.0
+      pug-parser: 6.0.0
+      pug-runtime: 3.0.1
+      pug-strip-comments: 2.0.0
     dev: true
 
-  /spdx-license-ids@3.0.12:
-    resolution: {integrity: sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA==}
+  /pump@2.0.1:
+    resolution: {integrity: sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==}
+    dependencies:
+      end-of-stream: 1.4.4
+      once: 1.4.0
     dev: true
 
-  /speakeasy@2.0.0:
-    resolution: {integrity: sha512-lW2A2s5LKi8rwu77ewisuUOtlCydF/hmQSOJjpTqTj1gZLkNgTaYnyvfxy2WBr4T/h+9c4g8HIITfj83OkFQFw==}
-    engines: {node: '>= 0.10.0'}
+  /pump@3.0.0:
+    resolution: {integrity: sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==}
     dependencies:
-      base32.js: 0.0.1
-    dev: false
+      end-of-stream: 1.4.4
+      once: 1.4.0
 
-  /spex@3.2.0:
-    resolution: {integrity: sha512-9srjJM7NaymrpwMHvSmpDeIK5GoRMX/Tq0E8aOlDPS54dDnDUIp30DrP9SphMPEETDLzEM9+4qo+KipmbtPecg==}
-    engines: {node: '>=4.5'}
+  /pumpify@1.5.1:
+    resolution: {integrity: sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==}
+    dependencies:
+      duplexify: 3.7.1
+      inherits: 2.0.4
+      pump: 2.0.1
+    dev: true
+
+  /punycode@1.3.2:
+    resolution: {integrity: sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==}
     dev: false
 
-  /split-on-first@1.1.0:
-    resolution: {integrity: sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw==}
+  /punycode@2.3.1:
+    resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==}
     engines: {node: '>=6'}
+
+  /pure-rand@6.0.1:
+    resolution: {integrity: sha512-t+x1zEHDjBwkDGY5v5ApnZ/utcd4XYDiJsaQQoptTXgUXX95sDg1elCdJghzicm7n2mbCBJ3uYWr6M22SO19rg==}
+
+  /pyodide@0.23.4(patch_hash=kzcwsjcayy5m6iezu7r4tdimjq):
+    resolution: {integrity: sha512-WpQUHaIXQ1xede5BMqPAjBcmopxN22s5hEsYOR8T7/UW/fkNLFUn07SaemUgthbtvedD5JGymMMj4VpD9sGMTg==}
+    dependencies:
+      base-64: 1.0.0
+      node-fetch: 2.6.8
+      ws: 8.14.2
+    transitivePeerDependencies:
+      - bufferutil
+      - encoding
+      - utf-8-validate
     dev: false
+    patched: true
 
-  /split-string@3.1.0:
-    resolution: {integrity: sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==}
-    engines: {node: '>=0.10.0'}
+  /python-struct@1.1.3:
+    resolution: {integrity: sha512-UsI/mNvk25jRpGKYI38Nfbv84z48oiIWwG67DLVvjRhy8B/0aIK+5Ju5WOHgw/o9rnEmbAS00v4rgKFQeC332Q==}
     dependencies:
-      extend-shallow: 3.0.2
-    dev: true
+      long: 4.0.0
+    dev: false
 
-  /split2@3.2.2:
-    resolution: {integrity: sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==}
+  /qrcode.vue@3.3.4(vue@3.4.21):
+    resolution: {integrity: sha512-ZVPmKZUUqM/wZ19mIhecFJs7mO6KXFiZZmBZyU6wiB2aXZfYc/VpolXakQcKw/9aGFEmSHHVKfgNwyxtw/Q2Sw==}
+    peerDependencies:
+      vue: ^3.0.0
     dependencies:
-      readable-stream: 3.6.0
+      vue: 3.4.21(typescript@5.4.2)
     dev: false
 
-  /split2@4.1.0:
-    resolution: {integrity: sha512-VBiJxFkxiXRlUIeyMQi8s4hgvKCSjtknJv/LVYbrgALPwf5zSKmEwV9Lst25AkvMDnvxODugjdl6KZgwKM1WYQ==}
-    engines: {node: '>= 10.x'}
+  /qrcode@1.5.3:
+    resolution: {integrity: sha512-puyri6ApkEHYiVl4CFzo1tDkAZ+ATcnbJrJ6RiBM1Fhctdn/ix9MTE3hRph33omisEbC/2fcfemsseiKgBPKZg==}
+    engines: {node: '>=10.13.0'}
+    hasBin: true
+    dependencies:
+      dijkstrajs: 1.0.3
+      encode-utf8: 1.0.3
+      pngjs: 5.0.0
+      yargs: 15.4.1
     dev: false
 
-  /split@0.3.3:
-    resolution: {integrity: sha512-wD2AeVmxXRBoX44wAycgjVpMhvbwdI2aZjCkvfNcH1YqHQvJVa1duWc73OyVGJUc05fhFaTZeQ/PYsrmyH0JVA==}
+  /qs@6.10.4:
+    resolution: {integrity: sha512-OQiU+C+Ds5qiH91qh/mg0w+8nwQuLjM4F4M/PbmhDOoYehPh+Fb0bDjtR1sOvy7YKxvj28Y/M0PhP5uVX0kB+g==}
+    engines: {node: '>=0.6'}
     dependencies:
-      through: 2.3.8
+      side-channel: 1.0.4
     dev: true
 
-  /sprintf-js@1.0.3:
-    resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==}
-
-  /sprintf-js@1.1.2:
-    resolution: {integrity: sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==}
-    dev: false
+  /qs@6.11.0:
+    resolution: {integrity: sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==}
+    engines: {node: '>=0.6'}
+    dependencies:
+      side-channel: 1.0.4
 
-  /sqlite3@5.1.6:
-    resolution: {integrity: sha512-olYkWoKFVNSSSQNvxVUfjiVbz3YtBwTJj+mfV5zpHmqW3sELx2Cf4QCdirMelhM5Zh+KDVaKgQHqCxrqiWHybw==}
-    requiresBuild: true
-    peerDependenciesMeta:
-      node-gyp:
-        optional: true
+  /qs@6.11.2:
+    resolution: {integrity: sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==}
+    engines: {node: '>=0.6'}
     dependencies:
-      '@mapbox/node-pre-gyp': 1.0.10
-      node-addon-api: 4.3.0
-      tar: 6.1.13
-    optionalDependencies:
-      node-gyp: 8.4.1
-    transitivePeerDependencies:
-      - bluebird
-      - encoding
-      - supports-color
+      side-channel: 1.0.4
     dev: false
 
-  /sqlstring@2.3.3:
-    resolution: {integrity: sha512-qC9iz2FlN7DQl3+wjwn3802RTyjCx7sDvfQEXchwa6CWOx07/WVfh91gBmQ9fahw8snwGEWU3xGzOt4tFyHLxg==}
-    engines: {node: '>= 0.6'}
+  /qs@6.5.3:
+    resolution: {integrity: sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==}
+    engines: {node: '>=0.6'}
     dev: false
 
-  /sse-channel@4.0.0:
-    resolution: {integrity: sha512-I539Tc0gyDTQ2QCSg4v78Flxo/UbqR9x7JoyPcqaPtwo+qzeOw/fF+aPSbk0xTvBQAAAZk7Dlkc8K1bum5GUnw==}
+  /query-string@7.1.3:
+    resolution: {integrity: sha512-hh2WYhq4fi8+b+/2Kg9CEge4fDPvHS534aOOvOZeQ3+Vf2mCFsaFBYj0i+iXcAq6I9Vzp5fjMFBlONvayDC1qg==}
+    engines: {node: '>=6'}
+    dependencies:
+      decode-uri-component: 0.2.2
+      filter-obj: 1.1.0
+      split-on-first: 1.1.0
+      strict-uri-encode: 2.0.0
     dev: false
 
-  /ssf@0.11.2:
-    resolution: {integrity: sha512-+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g==}
-    engines: {node: '>=0.8'}
-    dependencies:
-      frac: 1.1.2
+  /querystring@0.2.0:
+    resolution: {integrity: sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==}
+    engines: {node: '>=0.4.x'}
+    deprecated: The querystring API is considered Legacy. new code should use the URLSearchParams API instead.
     dev: false
 
-  /ssh2-sftp-client@7.2.3:
-    resolution: {integrity: sha512-Bmq4Uewu3e0XOwu5bnPbiS5KRQYv+dff5H6+85V4GZrPrt0Fkt1nUH+uXanyAkoNxUpzjnAPEEoLdOaBO9c3xw==}
-    engines: {node: '>=10.24.1'}
+  /querystringify@2.2.0:
+    resolution: {integrity: sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==}
+
+  /queue-lit@1.5.0:
+    resolution: {integrity: sha512-IslToJ4eiCEE9xwMzq3viOO5nH8sUWUCwoElrhNMozzr9IIt2qqvB4I+uHu/zJTQVqc9R5DFwok4ijNK1pU3fA==}
+    dev: true
+
+  /queue-microtask@1.2.3:
+    resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
+
+  /quoted-printable@1.0.1:
+    resolution: {integrity: sha512-cihC68OcGiQOjGiXuo5Jk6XHANTHl1K4JLk/xlEJRTIXfy19Sg6XzB95XonYgr+1rB88bCpr7WZE7D7AlZow4g==}
+    hasBin: true
     dependencies:
-      concat-stream: 2.0.0
-      promise-retry: 2.0.1
-      ssh2: 1.11.0
+      utf8: 2.1.2
     dev: false
 
-  /ssh2@1.11.0:
-    resolution: {integrity: sha512-nfg0wZWGSsfUe/IBJkXVll3PEZ//YH2guww+mP88gTpuSU4FtZN7zu9JoeTGOyCNx2dTDtT9fOpWwlzyj4uOOw==}
-    engines: {node: '>=10.16.0'}
-    dependencies:
-      asn1: 0.2.6
-      bcrypt-pbkdf: 1.0.2
-    optionalDependencies:
-      cpu-features: 0.0.4
-      nan: 2.17.0
+  /ramda@0.29.0:
+    resolution: {integrity: sha512-BBea6L67bYLtdbOqfp8f58fPMqEwx0doL+pAi8TZyp2YWz8R9G8z9x75CZI8W+ftqhFHCpEX2cRnUUXK130iKA==}
+    dev: true
+
+  /random-bytes@1.0.0:
+    resolution: {integrity: sha512-iv7LhNVO047HzYR3InF6pUcUsPQiHTM1Qal51DcGSuZFBil1aBBWG5eHPNek7bvILMaYJ/8RU1e8w1AMdHmLQQ==}
+    engines: {node: '>= 0.8'}
     dev: false
 
-  /sshpk@1.17.0:
-    resolution: {integrity: sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==}
-    engines: {node: '>=0.10.0'}
-    hasBin: true
+  /randombytes@2.1.0:
+    resolution: {integrity: sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==}
     dependencies:
-      asn1: 0.2.6
-      assert-plus: 1.0.0
-      bcrypt-pbkdf: 1.0.2
-      dashdash: 1.14.1
-      ecc-jsbn: 0.1.2
-      getpass: 0.1.7
-      jsbn: 0.1.1
-      safer-buffer: 2.1.2
-      tweetnacl: 0.14.5
+      safe-buffer: 5.2.1
 
-  /ssri@8.0.1:
-    resolution: {integrity: sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==}
-    engines: {node: '>= 8'}
+  /range-parser@1.2.1:
+    resolution: {integrity: sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==}
+    engines: {node: '>= 0.6'}
+
+  /raw-body@2.5.1:
+    resolution: {integrity: sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==}
+    engines: {node: '>= 0.8'}
     dependencies:
-      minipass: 3.3.6
+      bytes: 3.1.2
+      http-errors: 2.0.0
+      iconv-lite: 0.4.24
+      unpipe: 1.0.0
     dev: false
-    optional: true
-
-  /stack-trace@0.0.10:
-    resolution: {integrity: sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==}
 
-  /stack-utils@2.0.6:
-    resolution: {integrity: sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==}
-    engines: {node: '>=10'}
+  /raw-body@2.5.2:
+    resolution: {integrity: sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==}
+    engines: {node: '>= 0.8'}
     dependencies:
-      escape-string-regexp: 2.0.0
-    dev: true
-
-  /stackback@0.0.2:
-    resolution: {integrity: sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==}
-    dev: true
+      bytes: 3.1.2
+      http-errors: 2.0.0
+      iconv-lite: 0.4.24
+      unpipe: 1.0.0
 
-  /standard-as-callback@2.1.0:
-    resolution: {integrity: sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A==}
+  /rc@1.2.8:
+    resolution: {integrity: sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==}
+    hasBin: true
+    dependencies:
+      deep-extend: 0.6.0
+      ini: 1.3.8
+      minimist: 1.2.8
+      strip-json-comments: 2.0.1
     dev: false
 
-  /start-server-and-test@1.14.0:
-    resolution: {integrity: sha512-on5ELuxO2K0t8EmNj9MtVlFqwBMxfWOhu4U7uZD1xccVpFlOQKR93CSe0u98iQzfNxRyaNTb/CdadbNllplTsw==}
-    engines: {node: '>=6'}
-    hasBin: true
+  /react-colorful@5.6.1(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-1exovf0uGTGyq5mXQT0zgQ80uvj2PCwvF8zY1RN9/vbJVSjSo3fsB/4L3ObbF7u70NduSiK4xu4Y6q1MHoUGEw==}
+    peerDependencies:
+      react: '>=16.8.0'
+      react-dom: '>=16.8.0'
     dependencies:
-      bluebird: 3.7.2
-      check-more-types: 2.24.0
-      debug: 4.3.2
-      execa: 5.1.1
-      lazy-ass: 1.6.0
-      ps-tree: 1.2.0
-      wait-on: 6.0.0(debug@4.3.2)
-    transitivePeerDependencies:
-      - supports-color
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
     dev: true
 
-  /static-eval@2.0.2:
-    resolution: {integrity: sha512-N/D219Hcr2bPjLxPiV+TQE++Tsmrady7TqAJugLy7Xk1EumfDWS/f5dtBbkRCGE7wKKXuYockQoj8Rm2/pVKyg==}
+  /react-confetti@6.1.0(react@18.2.0):
+    resolution: {integrity: sha512-7Ypx4vz0+g8ECVxr88W9zhcQpbeujJAVqL14ZnXJ3I23mOI9/oBVTQ3dkJhUmB0D6XOtCZEM6N0Gm9PMngkORw==}
+    engines: {node: '>=10.18'}
+    peerDependencies:
+      react: ^16.3.0 || ^17.0.1 || ^18.0.0
     dependencies:
-      escodegen: 1.14.3
-    dev: false
+      react: 18.2.0
+      tween-functions: 1.2.0
+    dev: true
 
-  /static-extend@0.1.2:
-    resolution: {integrity: sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==}
-    engines: {node: '>=0.10.0'}
+  /react-dom@18.2.0(react@18.2.0):
+    resolution: {integrity: sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==}
+    peerDependencies:
+      react: ^18.2.0
     dependencies:
-      define-property: 0.2.5
-      object-copy: 0.1.0
+      loose-envify: 1.4.0
+      react: 18.2.0
+      scheduler: 0.23.0
     dev: true
 
-  /statuses@1.5.0:
-    resolution: {integrity: sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==}
-    engines: {node: '>= 0.6'}
-    dev: false
-
-  /statuses@2.0.1:
-    resolution: {integrity: sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==}
-    engines: {node: '>= 0.8'}
+  /react-is@16.13.1:
+    resolution: {integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==}
+    dev: true
 
-  /std-env@3.3.2:
-    resolution: {integrity: sha512-uUZI65yrV2Qva5gqE0+A7uVAvO40iPo6jGhs7s8keRfHCmtg+uB2X6EiLGCI9IgL1J17xGhvoOqSz79lzICPTA==}
+  /react-is@17.0.2:
+    resolution: {integrity: sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==}
     dev: true
 
-  /stealthy-require@1.1.1:
-    resolution: {integrity: sha512-ZnWpYnYugiOVEY5GkcuJK1io5V8QmNYChG62gSit9pQVGErXtrKuPC55ITaVSukmMta5qpMU7vqLt2Lnni4f/g==}
-    engines: {node: '>=0.10.0'}
-    dev: false
+  /react-is@18.2.0:
+    resolution: {integrity: sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==}
 
-  /stop-iteration-iterator@1.0.0:
-    resolution: {integrity: sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==}
-    engines: {node: '>= 0.4'}
+  /react-tabs@4.3.0(react@18.2.0):
+    resolution: {integrity: sha512-2GfoG+f41kiBIIyd3gF+/GRCCYtamC8/2zlAcD8cqQmqI9Q+YVz7fJLHMmU9pXDVYYHpJeCgUSBJju85vu5q8Q==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-0 || ^18.0.0
     dependencies:
-      internal-slot: 1.0.4
-
-  /stoppable@1.1.0:
-    resolution: {integrity: sha512-KXDYZ9dszj6bzvnEMRYvxgeTHU74QBFL54XKtP3nyMuJ81CFYtABZ3bAzL2EdFUaEwJOBOgENyFj3R7oTzDyyw==}
-    engines: {node: '>=4', npm: '>=6'}
-    dev: false
-
-  /store2@2.14.2:
-    resolution: {integrity: sha512-siT1RiqlfQnGqgT/YzXVUNsom9S0H1OX+dpdGN1xkyYATo4I6sep5NmsRD/40s3IIOvlCq6akxkqG82urIZW1w==}
+      clsx: 1.2.1
+      prop-types: 15.8.1
+      react: 18.2.0
     dev: true
 
-  /storybook-addon-designs@6.3.1(react@17.0.2):
-    resolution: {integrity: sha512-QCHZp4KuUikOq52MPiMfU8QifYTfhHar5vWlbcfkFDz1YrgGMy+QAEt5Y3Vdnffl4GKSK1lAsLuvTuzqTBRvnw==}
+  /react@18.2.0:
+    resolution: {integrity: sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==}
+    engines: {node: '>=0.10.0'}
     dependencies:
-      '@figspec/react': 1.0.3(react@17.0.2)
-    transitivePeerDependencies:
-      - react
+      loose-envify: 1.4.0
     dev: true
 
-  /storybook-addon-themes@6.1.0(react-dom@18.2.0)(react@17.0.2)(vue@2.7.14):
-    resolution: {integrity: sha512-ZT8aNgrwFVNEOmOPBLNS0WBacjvMFo/bZ83P8MmsJ3Ewqt0AbmPioghTZccARUn/EQ+LrDxyh2D0QgmLaKo07Q==}
-    peerDependencies:
-      react: '*'
-      svelte: '*'
-      vue: '*'
-    peerDependenciesMeta:
-      react:
-        optional: true
-      svelte:
-        optional: true
-      vue:
-        optional: true
+  /read-pkg-up@7.0.1:
+    resolution: {integrity: sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==}
+    engines: {node: '>=8'}
     dependencies:
-      '@storybook/addons': 6.5.15(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/api': 6.5.15(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/components': 6.5.15(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/core-events': 6.5.15
-      '@storybook/theming': 6.5.15(react-dom@18.2.0)(react@17.0.2)
-      core-js: 3.27.2
-      global: 4.4.0
-      memoizerific: 1.11.3
-      react: 17.0.2
-      vue: 2.7.14
-    transitivePeerDependencies:
-      - react-dom
+      find-up: 4.1.0
+      read-pkg: 5.2.0
+      type-fest: 0.8.1
     dev: true
 
-  /storybook@7.0.0-beta.46:
-    resolution: {integrity: sha512-xMMCSrnfU2JLQVH7G8eJQVTwCwx3ABA/WeDxPCkNESR1PBVWA/OipUxE4wTD3z/1XLq0sfwknZcJZgz1mhqaAQ==}
-    hasBin: true
+  /read-pkg@5.2.0:
+    resolution: {integrity: sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==}
+    engines: {node: '>=8'}
     dependencies:
-      '@storybook/cli': 7.0.0-beta.46
-    transitivePeerDependencies:
-      - bufferutil
-      - encoding
-      - supports-color
-      - utf-8-validate
+      '@types/normalize-package-data': 2.4.1
+      normalize-package-data: 2.5.0
+      parse-json: 5.2.0
+      type-fest: 0.6.0
     dev: true
 
-  /stream-browserify@3.0.0:
-    resolution: {integrity: sha512-H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA==}
+  /readable-stream@1.1.14:
+    resolution: {integrity: sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==}
     dependencies:
+      core-util-is: 1.0.3
       inherits: 2.0.4
-      readable-stream: 3.6.0
+      isarray: 0.0.1
+      string_decoder: 0.10.31
     dev: false
 
-  /stream-combiner@0.0.4:
-    resolution: {integrity: sha512-rT00SPnTVyRsaSz5zgSPma/aHSOic5U1prhYdRy5HS2kTZviFpmDgzilbtsJsxiroqACmayynDN/9VzIbX5DOw==}
+  /readable-stream@2.3.7:
+    resolution: {integrity: sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==}
     dependencies:
-      duplexer: 0.1.2
-    dev: true
-
-  /stream-exhaust@1.0.2:
-    resolution: {integrity: sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw==}
-    dev: true
-
-  /stream-shift@1.0.1:
-    resolution: {integrity: sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==}
+      core-util-is: 1.0.3
+      inherits: 2.0.4
+      isarray: 1.0.0
+      process-nextick-args: 2.0.1
+      safe-buffer: 5.1.2
+      string_decoder: 1.1.1
+      util-deprecate: 1.0.2
 
-  /streamsearch@1.1.0:
-    resolution: {integrity: sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==}
-    engines: {node: '>=10.0.0'}
-    dev: false
+  /readable-stream@3.6.0:
+    resolution: {integrity: sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==}
+    engines: {node: '>= 6'}
+    dependencies:
+      inherits: 2.0.4
+      string_decoder: 1.3.0
+      util-deprecate: 1.0.2
 
-  /strftime@0.10.2:
-    resolution: {integrity: sha512-Y6IZaTVM80chcMe7j65Gl/0nmlNdtt+KWPle5YeCAjmsBfw+id2qdaJ5MDrxUq+OmHKab+jHe7mUjU/aNMSZZg==}
-    engines: {node: '>=0.2.0'}
+  /readable-stream@4.4.2:
+    resolution: {integrity: sha512-Lk/fICSyIhodxy1IDK2HazkeGjSmezAWX2egdtJnYhtzKEsBPJowlI6F6LPb5tqIQILrMbx22S5o3GuJavPusA==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dependencies:
+      abort-controller: 3.0.0
+      buffer: 6.0.3
+      events: 3.3.0
+      process: 0.11.10
+      string_decoder: 1.3.0
     dev: false
 
-  /strict-event-emitter-types@2.0.0:
-    resolution: {integrity: sha512-Nk/brWYpD85WlOgzw5h173aci0Teyv8YdIAEtV+N88nDB0dLlazZyJMIsN6eo1/AR61l+p6CJTG1JIyFaoNEEA==}
+  /readable-web-to-node-stream@3.0.2:
+    resolution: {integrity: sha512-ePeK6cc1EcKLEhJFt/AebMCLL+GgSKhuygrZ/GLaKZYEecIgIECf4UaUuaByiGtzckwR4ain9VzUh95T1exYGw==}
+    engines: {node: '>=8'}
+    dependencies:
+      readable-stream: 3.6.0
     dev: false
 
-  /strict-uri-encode@2.0.0:
-    resolution: {integrity: sha512-QwiXZgpRcKkhTj2Scnn++4PKtWsH0kpzZ62L2R6c/LUVYv7hVnZqcg2+sMuT6R7Jusu1vviK/MFsu6kNJfWlEQ==}
-    engines: {node: '>=4'}
-    dev: false
+  /readdirp@3.6.0:
+    resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==}
+    engines: {node: '>=8.10.0'}
+    dependencies:
+      picomatch: 2.3.1
 
-  /string-argv@0.3.1:
-    resolution: {integrity: sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==}
-    engines: {node: '>=0.6.19'}
+  /readline-sync@1.4.10:
+    resolution: {integrity: sha512-gNva8/6UAe8QYepIQH/jQ2qn91Qj0B9sYjMBBs3QOB8F2CXcKgLxQaJRP76sWVRQt+QU+8fAkCbCvjjMFu7Ycw==}
+    engines: {node: '>= 0.8.0'}
     dev: true
 
-  /string-length@4.0.2:
-    resolution: {integrity: sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==}
-    engines: {node: '>=10'}
+  /recast@0.21.5:
+    resolution: {integrity: sha512-hjMmLaUXAm1hIuTqOdeYObMslq/q+Xff6QE3Y2P+uoHAg2nmVlLBps2hzh1UJDdMtDTMXOFewK6ky51JQIeECg==}
+    engines: {node: '>= 4'}
     dependencies:
-      char-regex: 1.0.2
-      strip-ansi: 6.0.1
-    dev: true
-
-  /string-similarity@4.0.4:
-    resolution: {integrity: sha512-/q/8Q4Bl4ZKAPjj8WerIBJWALKkaPRfrvhfF8k/B23i4nzrlRj2/go1m90In7nG/3XDSbOo0+pu6RvCTM9RGMQ==}
+      ast-types: 0.15.2
+      esprima: 4.0.1
+      source-map: 0.6.1
+      tslib: 2.6.2
     dev: false
 
-  /string-template-parser@1.2.6:
-    resolution: {integrity: sha512-GsSNOkzaupvBRDKtO8j7limAd0DStJUHy+iQ0rBVaPJO9Jt+lfCVN0eJJEqqr/oBtZ5t29QhVTo9HREAdY1YxQ==}
-    dev: true
+  /recast@0.22.0:
+    resolution: {integrity: sha512-5AAx+mujtXijsEavc5lWXBPQqrM4+Dl5qNH96N2aNeuJFUzpiiToKPsxQD/zAIJHspz7zz0maX0PCtCTFVlixQ==}
+    engines: {node: '>= 4'}
+    dependencies:
+      assert: 2.0.0
+      ast-types: 0.15.2
+      esprima: 4.0.1
+      source-map: 0.6.1
+      tslib: 2.6.2
+    dev: false
 
-  /string-width@1.0.2:
-    resolution: {integrity: sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==}
-    engines: {node: '>=0.10.0'}
+  /recast@0.23.3:
+    resolution: {integrity: sha512-HbCVFh2ANP6a09nzD4lx7XthsxMOJWKX5pIcUwtLrmeEIl3I0DwjCoVXDE0Aobk+7k/mS3H50FK4iuYArpcT6Q==}
+    engines: {node: '>= 4'}
     dependencies:
-      code-point-at: 1.1.0
-      is-fullwidth-code-point: 1.0.0
-      strip-ansi: 3.0.1
+      assert: 2.0.0
+      ast-types: 0.16.1
+      esprima: 4.0.1
+      source-map: 0.6.1
+      tslib: 2.6.2
     dev: true
 
-  /string-width@3.1.0:
-    resolution: {integrity: sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==}
-    engines: {node: '>=6'}
+  /recast@0.23.6:
+    resolution: {integrity: sha512-9FHoNjX1yjuesMwuthAmPKabxYQdOgihFYmT5ebXfYGBcnqXZf3WOVz+5foEZ8Y83P4ZY6yQD5GMmtV+pgCCAQ==}
+    engines: {node: '>= 4'}
     dependencies:
-      emoji-regex: 7.0.3
-      is-fullwidth-code-point: 2.0.0
-      strip-ansi: 5.2.0
+      ast-types: 0.16.1
+      esprima: 4.0.1
+      source-map: 0.6.1
+      tiny-invariant: 1.3.3
+      tslib: 2.6.2
     dev: true
 
-  /string-width@4.2.3:
-    resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==}
-    engines: {node: '>=8'}
+  /rechoir@0.6.2:
+    resolution: {integrity: sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw==}
+    engines: {node: '>= 0.10'}
     dependencies:
-      emoji-regex: 8.0.0
-      is-fullwidth-code-point: 3.0.0
-      strip-ansi: 6.0.1
+      resolve: 1.22.3
 
-  /string-width@5.1.2:
-    resolution: {integrity: sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==}
-    engines: {node: '>=12'}
+  /redent@3.0.0:
+    resolution: {integrity: sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==}
+    engines: {node: '>=8'}
     dependencies:
-      eastasianwidth: 0.2.0
-      emoji-regex: 9.2.2
-      strip-ansi: 7.0.1
+      indent-string: 4.0.0
+      strip-indent: 3.0.0
     dev: true
 
-  /string.prototype.startswith@1.0.0:
-    resolution: {integrity: sha512-VHhsDkuf8gsw4JNRK9cIZjYe6r7PsVUutVohaBhqYAoPaRADoQH+mMgUg7Cs/TgQeDGEvI+PzPEMOdvdsCMvpg==}
+  /redeyed@2.1.1:
+    resolution: {integrity: sha512-FNpGGo1DycYAdnrKFxCMmKYgo/mILAqtRYbkdQD8Ep/Hk2PQ5+aEAEx+IU713RTDmuBaH0c8P5ZozurNu5ObRQ==}
     dependencies:
-      define-properties: 1.1.4
-      es-abstract: 1.21.1
+      esprima: 4.0.1
     dev: false
 
-  /string.prototype.trimend@1.0.6:
-    resolution: {integrity: sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==}
-    dependencies:
-      call-bind: 1.0.2
-      define-properties: 1.1.4
-      es-abstract: 1.21.1
-
-  /string.prototype.trimstart@1.0.6:
-    resolution: {integrity: sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==}
-    dependencies:
-      call-bind: 1.0.2
-      define-properties: 1.1.4
-      es-abstract: 1.21.1
+  /redis-commands@1.7.0:
+    resolution: {integrity: sha512-nJWqw3bTFy21hX/CPKHth6sfhZbdiHP6bTawSgQBlKOVRG7EZkfHbbHwQJnrE4vsQf0CMNE+3gJ4Fmm16vdVlQ==}
+    dev: false
 
-  /string_decoder@0.10.31:
-    resolution: {integrity: sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==}
+  /redis-errors@1.2.0:
+    resolution: {integrity: sha512-1qny3OExCf0UvUV/5wpYKf2YwPcOqXzkwKKSmKHiE6ZMQs5heeE/c8eXK+PNllPvmjgAbfnsbpkGZWy8cBpn9w==}
+    engines: {node: '>=4'}
 
-  /string_decoder@1.1.1:
-    resolution: {integrity: sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==}
+  /redis-parser@3.0.0:
+    resolution: {integrity: sha512-DJnGAeenTdpMEH6uAJRK/uiyEIH9WVsUmoLwzudwGJUwZPp80PDBWPHXSAGNPwNvIXAbe7MSUB1zQFugFml66A==}
+    engines: {node: '>=4'}
     dependencies:
-      safe-buffer: 5.1.2
+      redis-errors: 1.2.0
 
-  /string_decoder@1.3.0:
-    resolution: {integrity: sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==}
+  /redis@4.6.12:
+    resolution: {integrity: sha512-41Xuuko6P4uH4VPe5nE3BqXHB7a9lkFL0J29AlxKaIfD6eWO8VO/5PDF9ad2oS+mswMsfFxaM5DlE3tnXT+P8Q==}
     dependencies:
-      safe-buffer: 5.2.1
+      '@redis/bloom': 1.2.0(@redis/client@1.5.13)
+      '@redis/client': 1.5.13
+      '@redis/graph': 1.1.1(@redis/client@1.5.13)
+      '@redis/json': 1.0.6(@redis/client@1.5.13)
+      '@redis/search': 1.1.6(@redis/client@1.5.13)
+      '@redis/time-series': 1.0.5(@redis/client@1.5.13)
+    dev: false
 
-  /strip-ansi@3.0.1:
-    resolution: {integrity: sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==}
-    engines: {node: '>=0.10.0'}
+  /redis@4.6.13:
+    resolution: {integrity: sha512-MHgkS4B+sPjCXpf+HfdetBwbRz6vCtsceTmw1pHNYJAsYxrfpOP6dz+piJWGos8wqG7qb3vj/Rrc5qOlmInUuA==}
     dependencies:
-      ansi-regex: 2.1.1
-    dev: true
+      '@redis/bloom': 1.2.0(@redis/client@1.5.14)
+      '@redis/client': 1.5.14
+      '@redis/graph': 1.1.1(@redis/client@1.5.14)
+      '@redis/json': 1.0.6(@redis/client@1.5.14)
+      '@redis/search': 1.1.6(@redis/client@1.5.14)
+      '@redis/time-series': 1.0.5(@redis/client@1.5.14)
+    dev: false
 
-  /strip-ansi@5.2.0:
-    resolution: {integrity: sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==}
-    engines: {node: '>=6'}
+  /redlock@4.2.0:
+    resolution: {integrity: sha512-j+oQlG+dOwcetUt2WJWttu4CZVeRzUrcVcISFmEmfyuwCVSJ93rDT7YSgg7H7rnxwoRyk/jU46kycVka5tW7jA==}
+    engines: {node: '>=8.0.0'}
     dependencies:
-      ansi-regex: 4.1.1
+      bluebird: 3.7.2
+    dev: false
+
+  /redoc@2.1.3(core-js@3.35.0)(mobx@6.12.0)(react-dom@18.2.0)(react@18.2.0)(styled-components@6.1.8):
+    resolution: {integrity: sha512-d7F9qLLxaiFW4GC03VkwlX9wuRIpx9aiIIf3o6mzMnqPfhxrn2IRKGndrkJeVdItgCfmg9jXZiFEowm60f1meQ==}
+    engines: {node: '>=6.9', npm: '>=3.0.0'}
+    peerDependencies:
+      core-js: ^3.1.4
+      mobx: ^6.0.4
+      react: ^16.8.4 || ^17.0.0 || ^18.0.0
+      react-dom: ^16.8.4 || ^17.0.0 || ^18.0.0
+      styled-components: ^4.1.1 || ^5.1.1 || ^6.0.5
+    dependencies:
+      '@redocly/openapi-core': 1.6.0
+      classnames: 2.5.1
+      core-js: 3.35.0
+      decko: 1.2.0
+      dompurify: 2.4.7
+      eventemitter3: 4.0.7
+      json-pointer: 0.6.2
+      lunr: 2.3.9
+      mark.js: 8.11.1
+      marked: 4.3.0
+      mobx: 6.12.0
+      mobx-react: 7.6.0(mobx@6.12.0)(react-dom@18.2.0)(react@18.2.0)
+      openapi-sampler: 1.4.0
+      path-browserify: 1.0.1
+      perfect-scrollbar: 1.5.5
+      polished: 4.2.2
+      prismjs: 1.29.0
+      prop-types: 15.8.1
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
+      react-tabs: 4.3.0(react@18.2.0)
+      slugify: 1.4.7
+      stickyfill: 1.1.1
+      styled-components: 6.1.8(react-dom@18.2.0)(react@18.2.0)
+      swagger2openapi: 7.0.8
+      url-template: 2.0.8
+    transitivePeerDependencies:
+      - encoding
+      - react-native
     dev: true
 
-  /strip-ansi@6.0.1:
-    resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==}
-    engines: {node: '>=8'}
-    dependencies:
-      ansi-regex: 5.0.1
+  /reflect-metadata@0.1.14:
+    resolution: {integrity: sha512-ZhYeb6nRaXCfhnndflDK8qI6ZQ/YcWZCISRAWICW9XYqMUwjZM9Z0DveWX/ABN01oxSHwVxKQmxeYZSsm0jh5A==}
+    dev: false
 
-  /strip-ansi@7.0.1:
-    resolution: {integrity: sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==}
-    engines: {node: '>=12'}
-    dependencies:
-      ansi-regex: 6.0.1
-    dev: true
+  /reflect-metadata@0.2.1:
+    resolution: {integrity: sha512-i5lLI6iw9AU3Uu4szRNPPEkomnkjRTaVt9hy/bn5g/oSzekBSMeLZblcjP74AW0vBabqERLLIrz+gR8QYR54Tw==}
+    dev: false
 
-  /strip-bom@2.0.0:
-    resolution: {integrity: sha512-kwrX1y7czp1E69n2ajbG65mIo9dqvJ+8aBQXOGVxqwvNbsXdFM6Lq37dLAY3mknUwru8CfcCbfOLL/gMo+fi3g==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      is-utf8: 0.2.1
-    dev: true
+  /reftools@1.1.9:
+    resolution: {integrity: sha512-OVede/NQE13xBQ+ob5CKd5KyeJYU2YInb1bmV4nRoOfquZPkAkxuOXicSe1PvqIuZZ4kD13sPKBbR7UFDmli6w==}
 
-  /strip-bom@3.0.0:
-    resolution: {integrity: sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==}
+  /regenerate-unicode-properties@10.1.0:
+    resolution: {integrity: sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==}
     engines: {node: '>=4'}
+    dependencies:
+      regenerate: 1.4.2
     dev: true
 
-  /strip-bom@4.0.0:
-    resolution: {integrity: sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==}
-    engines: {node: '>=8'}
+  /regenerate@1.4.2:
+    resolution: {integrity: sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==}
     dev: true
 
-  /strip-eof@1.0.0:
-    resolution: {integrity: sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q==}
-    engines: {node: '>=0.10.0'}
+  /regenerator-runtime@0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
     dev: true
 
-  /strip-final-newline@2.0.0:
-    resolution: {integrity: sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==}
-    engines: {node: '>=6'}
-    dev: true
+  /regenerator-runtime@0.14.1:
+    resolution: {integrity: sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==}
 
-  /strip-indent@3.0.0:
-    resolution: {integrity: sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==}
-    engines: {node: '>=8'}
+  /regenerator-transform@0.15.2:
+    resolution: {integrity: sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==}
     dependencies:
-      min-indent: 1.0.1
+      '@babel/runtime': 7.23.6
     dev: true
 
-  /strip-json-comments@1.0.4:
-    resolution: {integrity: sha512-AOPG8EBc5wAikaG1/7uFCNFJwnKOuQwFTpYBdTW6OvWHeZBQBrAA/amefHGrEiOnCPcLFZK6FUPtWVKpQVIRgg==}
-    engines: {node: '>=0.8.0'}
+  /regexp-tree@0.1.27:
+    resolution: {integrity: sha512-iETxpjK6YoRWJG5o6hXLwvjYAoW+FEZn9os0PD/b6AP6xQwsa/Y7lCVgIixBbUPMfhu+i2LtdeAqVTgGlQarfA==}
     hasBin: true
     dev: true
 
-  /strip-json-comments@3.1.1:
-    resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==}
-    engines: {node: '>=8'}
-    dev: true
-
-  /strip-literal@1.0.0:
-    resolution: {integrity: sha512-5o4LsH1lzBzO9UFH63AJ2ad2/S2AVx6NtjOcaz+VTT2h1RiRvbipW72z8M/lxEhcPHDBQwpDrnTF7sXy/7OwCQ==}
+  /regexp.prototype.flags@1.5.0:
+    resolution: {integrity: sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==}
+    engines: {node: '>= 0.4'}
     dependencies:
-      acorn: 8.8.1
-    dev: true
+      call-bind: 1.0.7
+      define-properties: 1.2.0
+      functions-have-names: 1.2.3
 
-  /strtok3@6.3.0:
-    resolution: {integrity: sha512-fZtbhtvI9I48xDSywd/somNqgUHl2L2cstmXCCif0itOf96jeW18MBSyrLuNicYQVkvpOxkZtkzujiTJ9LW5Jw==}
-    engines: {node: '>=10'}
+  /regexp.prototype.flags@1.5.2:
+    resolution: {integrity: sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==}
+    engines: {node: '>= 0.4'}
     dependencies:
-      '@tokenizer/token': 0.3.0
-      peek-readable: 4.1.0
-    dev: false
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-errors: 1.3.0
+      set-function-name: 2.0.2
 
-  /style-loader@1.3.0(webpack@5.75.0):
-    resolution: {integrity: sha512-V7TCORko8rs9rIqkSrlMfkqA63DfoGBBJmK1kKGCcSi+BWb4cqz0SRsnp4l6rU5iwOEd0/2ePv68SV22VXon4Q==}
-    engines: {node: '>= 8.9.0'}
-    peerDependencies:
-      webpack: ^4.0.0 || ^5.0.0
+  /regexpu-core@5.3.2:
+    resolution: {integrity: sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==}
+    engines: {node: '>=4'}
     dependencies:
-      loader-utils: 2.0.4
-      schema-utils: 2.7.1
-      webpack: 5.75.0(esbuild@0.16.17)
+      '@babel/regjsgen': 0.8.0
+      regenerate: 1.4.2
+      regenerate-unicode-properties: 10.1.0
+      regjsparser: 0.9.1
+      unicode-match-property-ecmascript: 2.0.0
+      unicode-match-property-value-ecmascript: 2.1.0
     dev: true
 
-  /style-loader@3.3.1(webpack@5.75.0):
-    resolution: {integrity: sha512-GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ==}
-    engines: {node: '>= 12.13.0'}
-    peerDependencies:
-      webpack: ^5.0.0
+  /regjsparser@0.10.0:
+    resolution: {integrity: sha512-qx+xQGZVsy55CH0a1hiVwHmqjLryfh7wQyF5HO07XJ9f7dQMY/gPQHhlyDkIzJKC+x2fUCpCcUODUUUFrm7SHA==}
+    hasBin: true
     dependencies:
-      webpack: 5.75.0(esbuild@0.16.17)
+      jsesc: 0.5.0
     dev: true
 
-  /style-mod@4.0.0:
-    resolution: {integrity: sha512-OPhtyEjyyN9x3nhPsu76f52yUGXiZcgvsrFVtvTkyGRQJ0XK+GPc6ov1z+lRpbeabka+MYEQxOYRnt5nF30aMw==}
-    dev: false
-
-  /superagent@8.0.9:
-    resolution: {integrity: sha512-4C7Bh5pyHTvU33KpZgwrNKh/VQnvgtCSqPRfJAUdmrtSYePVzVg4E4OzsrbkhJj9O7SO6Bnv75K/F8XVZT8YHA==}
-    engines: {node: '>=6.4.0 <13 || >=14'}
+  /regjsparser@0.9.1:
+    resolution: {integrity: sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==}
+    hasBin: true
     dependencies:
-      component-emitter: 1.3.0
-      cookiejar: 2.1.4
-      debug: 4.3.4(supports-color@8.1.1)
-      fast-safe-stringify: 2.1.1
-      form-data: 4.0.0
-      formidable: 2.1.2
-      methods: 1.1.2
-      mime: 2.6.0
-      qs: 6.11.0
-      semver: 7.3.8
-    transitivePeerDependencies:
-      - supports-color
+      jsesc: 0.5.0
     dev: true
 
-  /supertest@6.3.3:
-    resolution: {integrity: sha512-EMCG6G8gDu5qEqRQ3JjjPs6+FYT1a7Hv5ApHvtSghmOFJYtsU5S+pSb6Y2EUeCEY3CmEL3mmQ8YWlPOzQomabA==}
-    engines: {node: '>=6.4.0'}
+  /rehype-external-links@3.0.0:
+    resolution: {integrity: sha512-yp+e5N9V3C6bwBeAC4n796kc86M4gJCdlVhiMTxIrJG5UHDMh+PJANf9heqORJbt1nrCbDwIlAZKjANIaVBbvw==}
     dependencies:
-      methods: 1.1.2
-      superagent: 8.0.9
-    transitivePeerDependencies:
-      - supports-color
+      '@types/hast': 3.0.4
+      '@ungap/structured-clone': 1.2.0
+      hast-util-is-element: 3.0.0
+      is-absolute-url: 4.0.1
+      space-separated-tokens: 2.0.2
+      unist-util-visit: 5.0.0
     dev: true
 
-  /supports-color@5.5.0:
-    resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==}
-    engines: {node: '>=4'}
-    dependencies:
-      has-flag: 3.0.0
-
-  /supports-color@6.1.0:
-    resolution: {integrity: sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==}
-    engines: {node: '>=6'}
+  /rehype-slug@6.0.0:
+    resolution: {integrity: sha512-lWyvf/jwu+oS5+hL5eClVd3hNdmwM1kAC0BUvEGD19pajQMIzcNUd/k9GsfQ+FfECvX+JE+e9/btsKH0EjJT6A==}
     dependencies:
-      has-flag: 3.0.0
+      '@types/hast': 3.0.4
+      github-slugger: 2.0.0
+      hast-util-heading-rank: 3.0.0
+      hast-util-to-string: 3.0.0
+      unist-util-visit: 5.0.0
     dev: true
 
-  /supports-color@7.2.0:
-    resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==}
-    engines: {node: '>=8'}
-    dependencies:
-      has-flag: 4.0.0
+  /reinterval@1.1.0:
+    resolution: {integrity: sha512-QIRet3SYrGp0HUHO88jVskiG6seqUGC5iAG7AwI/BV4ypGcuqk9Du6YQBUOUqm9c8pw1eyLoIaONifRua1lsEQ==}
+    dev: false
 
-  /supports-color@8.1.1:
-    resolution: {integrity: sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==}
+  /remove-trailing-slash@0.1.1:
+    resolution: {integrity: sha512-o4S4Qh6L2jpnCy83ysZDau+VORNvnFw07CKSAymkd6ICNVEPisMyzlc00KlvvicsxKck94SEwhDnMNdICzO+tA==}
+    dev: false
+
+  /replace-in-file@6.3.5:
+    resolution: {integrity: sha512-arB9d3ENdKva2fxRnSjwBEXfK1npgyci7ZZuwysgAp7ORjHSyxz6oqIjTEv8R0Ydl4Ll7uOAZXL4vbkhGIizCg==}
     engines: {node: '>=10'}
+    hasBin: true
     dependencies:
-      has-flag: 4.0.0
+      chalk: 4.1.2
+      glob: 7.2.3
+      yargs: 17.6.0
+    dev: false
 
-  /supports-hyperlinks@2.3.0:
-    resolution: {integrity: sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==}
-    engines: {node: '>=8'}
+  /replacestream@4.0.3:
+    resolution: {integrity: sha512-AC0FiLS352pBBiZhd4VXB1Ab/lh0lEgpP+GGvZqbQh8a5cmXVoTe5EX/YeTFArnp4SRGTHh1qCHu9lGs1qG8sA==}
     dependencies:
-      has-flag: 4.0.0
-      supports-color: 7.2.0
-
-  /supports-preserve-symlinks-flag@1.0.0:
-    resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==}
-    engines: {node: '>= 0.4'}
+      escape-string-regexp: 1.0.5
+      object-assign: 4.1.1
+      readable-stream: 2.3.7
+    dev: false
 
-  /sver-compat@1.5.0:
-    resolution: {integrity: sha512-aFTHfmjwizMNlNE6dsGmoAM4lHjL0CyiobWaFiXWSlD7cIxshW422Nb8KbXCmR6z+0ZEPY+daXJrDyh/vuwTyg==}
+  /request-progress@3.0.0:
+    resolution: {integrity: sha512-MnWzEHHaxHO2iWiQuHrUPBi/1WeBf5PkxQqNyNvLl9VAYSdXkP8tQ3pBSeCPD+yw0v0Aq1zosWLz0BdeXpWwZg==}
     dependencies:
-      es6-iterator: 2.0.3
-      es6-symbol: 3.1.3
+      throttleit: 1.0.0
     dev: true
 
-  /swagger-ui-dist@4.14.3:
-    resolution: {integrity: sha512-Y7Sta24I9r+G6dX3ZTIq9Psr55cDC3myCB0E00ZnVkB0Wn3cO77NdLXSM0f90WZh9VpgTetKpMPR3n2VqKr+lQ==}
+  /request-promise-core@1.1.4(request@2.88.2):
+    resolution: {integrity: sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==}
+    engines: {node: '>=0.10.0'}
+    peerDependencies:
+      request: ^2.34
+    dependencies:
+      lodash: 4.17.21
+      request: 2.88.2
     dev: false
 
-  /swagger-ui-express@4.5.0(express@4.18.2):
-    resolution: {integrity: sha512-DHk3zFvsxrkcnurGvQlAcLuTDacAVN1JHKDgcba/gr2NFRE4HGwP1YeHIXMiGznkWR4AeS7X5vEblNn4QljuNA==}
-    engines: {node: '>= v0.10.32'}
+  /request-promise-native@1.0.9(request@2.88.2):
+    resolution: {integrity: sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==}
+    engines: {node: '>=0.12.0'}
+    deprecated: request-promise-native has been deprecated because it extends the now deprecated request package, see https://github.com/request/request/issues/3142
     peerDependencies:
-      express: '>=4.0.0'
+      request: ^2.34
     dependencies:
-      express: 4.18.2
-      swagger-ui-dist: 4.14.3
+      request: 2.88.2
+      request-promise-core: 1.1.4(request@2.88.2)
+      stealthy-require: 1.1.1
+      tough-cookie: 2.5.0
     dev: false
 
-  /swagger2openapi@7.0.8:
-    resolution: {integrity: sha512-upi/0ZGkYgEcLeGieoz8gT74oWHA0E7JivX7aN9mAf+Tc7BQoRBvnIGHoPDw+f9TXTW4s6kGYCZJtauP6OYp7g==}
-    hasBin: true
+  /request@2.88.2:
+    resolution: {integrity: sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==}
+    engines: {node: '>= 6'}
+    deprecated: request has been deprecated, see https://github.com/request/request/issues/3142
     dependencies:
-      call-me-maybe: 1.0.1
-      node-fetch: 2.6.8
-      node-fetch-h2: 2.3.0
-      node-readfiles: 0.2.0
-      oas-kit-common: 1.0.8
-      oas-resolver: 2.5.6
-      oas-schema-walker: 1.1.5
-      oas-validator: 5.0.8
-      reftools: 1.1.9
-      yaml: 1.10.2
-      yargs: 17.6.2
-    transitivePeerDependencies:
-      - encoding
+      aws-sign2: 0.7.0
+      aws4: 1.11.0
+      caseless: 0.12.0
+      combined-stream: 1.0.8
+      extend: 3.0.2
+      forever-agent: 0.6.1
+      form-data: 2.3.3
+      har-validator: 5.1.5
+      http-signature: 1.2.0
+      is-typedarray: 1.0.0
+      isstream: 0.1.2
+      json-stringify-safe: 5.0.1
+      mime-types: 2.1.35
+      oauth-sign: 0.9.0
+      performance-now: 2.1.0
+      qs: 6.5.3
+      safe-buffer: 5.2.1
+      tough-cookie: 2.5.0
+      tunnel-agent: 0.6.0
+      uuid: 3.4.0
     dev: false
 
-  /symbol-tree@3.2.4:
-    resolution: {integrity: sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==}
-    dev: true
-
-  /synchronous-promise@2.0.16:
-    resolution: {integrity: sha512-qImOD23aDfnIDNqlG1NOehdB9IYsn1V9oByPjKY1nakv2MQYCEMyX033/q+aEtYCpmYK1cv2+NTmlH+ra6GA5A==}
-    dev: true
+  /require-directory@2.1.1:
+    resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
+    engines: {node: '>=0.10.0'}
 
-  /synckit@0.8.5:
-    resolution: {integrity: sha512-L1dapNV6vu2s/4Sputv8xGsCdAVlb5nRDMFU/E27D44l5U6cw1g0dGd45uLc+OXjNMmF4ntiMdCimzcjFKQI8Q==}
-    engines: {node: ^14.18.0 || >=16.0.0}
-    dependencies:
-      '@pkgr/utils': 2.3.1
-      tslib: 2.5.0
-    dev: true
+  /require-from-string@2.0.2:
+    resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==}
+    engines: {node: '>=0.10.0'}
 
-  /syslog-client@1.1.1:
-    resolution: {integrity: sha512-c3qKw8JzCuHt0mwrzKQr8eqOc3RB28HgOpFuwGMO3GLscVpfR+0ECevWLZq/yIJTbx3WTb3QXBFVpTFtKAPDrw==}
+  /require-main-filename@2.0.0:
+    resolution: {integrity: sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==}
     dev: false
 
-  /systemjs@6.13.0:
-    resolution: {integrity: sha512-P3cgh2bpaPvAO2NE3uRp/n6hmk4xPX4DQf+UzTlCAycssKdqhp6hjw+ENWe+aUS7TogKRFtptMosTSFeC6R55g==}
-    dev: true
-
-  /tapable@1.1.3:
-    resolution: {integrity: sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==}
-    engines: {node: '>=6'}
-    dev: true
+  /requires-port@1.0.0:
+    resolution: {integrity: sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==}
 
-  /tapable@2.2.1:
-    resolution: {integrity: sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==}
-    engines: {node: '>=6'}
-    dev: true
+  /requizzle@0.2.4:
+    resolution: {integrity: sha512-JRrFk1D4OQ4SqovXOgdav+K8EAhSB/LJZqCz8tbX0KObcdeM15Ss59ozWMBWmmINMagCwmqn4ZNryUGpBsl6Jw==}
+    dependencies:
+      lodash: 4.17.21
+    dev: false
 
-  /tar-fs@2.1.1:
-    resolution: {integrity: sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==}
+  /resolve-cwd@3.0.0:
+    resolution: {integrity: sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==}
+    engines: {node: '>=8'}
     dependencies:
-      chownr: 1.1.4
-      mkdirp-classic: 0.5.3
-      pump: 3.0.0
-      tar-stream: 2.2.0
+      resolve-from: 5.0.0
+
+  /resolve-from@4.0.0:
+    resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==}
+    engines: {node: '>=4'}
     dev: true
 
-  /tar-stream@2.2.0:
-    resolution: {integrity: sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==}
-    engines: {node: '>=6'}
-    dependencies:
-      bl: 4.1.0
-      end-of-stream: 1.4.4
-      fs-constants: 1.0.0
-      inherits: 2.0.4
-      readable-stream: 3.6.0
+  /resolve-from@5.0.0:
+    resolution: {integrity: sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==}
+    engines: {node: '>=8'}
+
+  /resolve.exports@2.0.0:
+    resolution: {integrity: sha512-6K/gDlqgQscOlg9fSRpWstA8sYe8rbELsSTNpx+3kTrsVCzvSl0zIvRErM7fdl9ERWDsKnrLnwB+Ne89918XOg==}
+    engines: {node: '>=10'}
+
+  /resolve@1.19.0:
+    resolution: {integrity: sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==}
+    dependencies:
+      is-core-module: 2.13.1
+      path-parse: 1.0.7
     dev: true
 
-  /tar@6.1.13:
-    resolution: {integrity: sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw==}
-    engines: {node: '>=10'}
+  /resolve@1.22.3:
+    resolution: {integrity: sha512-P8ur/gp/AmbEzjr729bZnLjXK5Z+4P0zhIJgBgzqRih7hL7BOukHGtSTA3ACMY467GRFz3duQsi0bDZdR7DKdw==}
+    hasBin: true
     dependencies:
-      chownr: 2.0.0
-      fs-minipass: 2.1.0
-      minipass: 4.2.5
-      minizlib: 2.1.2
-      mkdirp: 1.0.4
-      yallist: 4.0.0
+      is-core-module: 2.13.1
+      path-parse: 1.0.7
+      supports-preserve-symlinks-flag: 1.0.0
 
-  /tarn@3.0.2:
-    resolution: {integrity: sha512-51LAVKUSZSVfI05vjPESNc5vwqqZpbXCsU+/+wxlOrUjk2SnFTt97v9ZgQrD4YmxYW1Px6w2KjaDitCfkvgxMQ==}
-    engines: {node: '>=8.0.0'}
-    dev: false
+  /resolve@1.22.8:
+    resolution: {integrity: sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==}
+    hasBin: true
+    dependencies:
+      is-core-module: 2.13.1
+      path-parse: 1.0.7
+      supports-preserve-symlinks-flag: 1.0.0
 
-  /tdigest@0.1.2:
-    resolution: {integrity: sha512-+G0LLgjjo9BZX2MfdvPfH+MKLCrxlXSYec5DaPYP1fe6Iyhf0/fSmJ0bFiZ1F8BT6cGXl2LpltQptzjXKWEkKA==}
+  /restore-cursor@3.1.0:
+    resolution: {integrity: sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==}
+    engines: {node: '>=8'}
     dependencies:
-      bintrees: 1.0.2
-    dev: false
+      onetime: 5.1.2
+      signal-exit: 3.0.7
 
-  /tedious@14.7.0:
-    resolution: {integrity: sha512-d3qlmZcvZyt7akyPHiOdR+knfzObWZH3mW+gouQTSb7YTSwtpHuYHcvsQabfbY7oOvgbs51xRb7CwOahWK/t9w==}
-    engines: {node: '>=12.3.0'}
+  /retry-request@5.0.2:
+    resolution: {integrity: sha512-wfI3pk7EE80lCIXprqh7ym48IHYdwmAAzESdbU8Q9l7pnRCk9LEhpbOTNKjz6FARLm/Bl5m+4F0ABxOkYUujSQ==}
+    engines: {node: '>=12'}
     dependencies:
-      '@azure/identity': 2.1.0
-      '@azure/keyvault-keys': 4.6.0
-      '@js-joda/core': 5.4.1
-      '@types/es-aggregate-error': 1.0.2
-      bl: 5.0.0
-      es-aggregate-error: 1.0.8
-      iconv-lite: 0.6.3
-      js-md4: 0.3.2
-      jsbi: 4.3.0
-      native-duplexpair: 1.0.0
-      node-abort-controller: 3.0.1
-      punycode: 2.2.0
-      sprintf-js: 1.1.2
+      debug: 4.3.4(supports-color@8.1.1)
+      extend: 3.0.2
     transitivePeerDependencies:
       - supports-color
     dev: false
 
-  /telejson@6.0.8:
-    resolution: {integrity: sha512-nerNXi+j8NK1QEfBHtZUN/aLdDcyupA//9kAboYLrtzZlPLpUfqbVGWb9zz91f/mIjRbAYhbgtnJHY8I1b5MBg==}
-    dependencies:
-      '@types/is-function': 1.0.1
-      global: 4.4.0
-      is-function: 1.0.2
-      is-regex: 1.1.4
-      is-symbol: 1.0.4
-      isobject: 4.0.0
-      lodash: 4.17.21
-      memoizerific: 1.11.3
-    dev: true
+  /retry@0.12.0:
+    resolution: {integrity: sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==}
+    engines: {node: '>= 4'}
+    dev: false
+
+  /retry@0.13.1:
+    resolution: {integrity: sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==}
+    engines: {node: '>= 4'}
+    dev: false
+
+  /reusify@1.0.4:
+    resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==}
+    engines: {iojs: '>=1.0.0', node: '>=0.10.0'}
 
-  /telejson@7.0.4:
-    resolution: {integrity: sha512-J4QEuCnYGXAI9KSN7RXK0a0cOW2ONpjc4IQbInGZ6c3stvplLAYyZjTnScrRd8deXVjNCFV1wXcLC7SObDuQYA==}
+  /rfc2047@4.0.1:
+    resolution: {integrity: sha512-x5zHBAZtSSZDuBNAqGEAVpsQFV+YUluIkMWVaYRMEeGoLPxNVMmg67TxRnXwmRmCB7QaneyrkWXeKqbjfcK6RA==}
     dependencies:
-      memoizerific: 1.11.3
-    dev: true
+      iconv-lite: 0.4.5
+    dev: false
 
-  /temp-dir@2.0.0:
-    resolution: {integrity: sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg==}
-    engines: {node: '>=8'}
-    dev: true
+  /rfdc@1.3.0:
+    resolution: {integrity: sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==}
 
-  /temp@0.8.4:
-    resolution: {integrity: sha512-s0ZZzd0BzYv5tLSptZooSjK8oj6C+c19p7Vqta9+6NPOf7r+fxq0cJe6/oN4LTC79sy5NY8ucOJNgwsKCSbfqg==}
-    engines: {node: '>=6.0.0'}
+  /rhea@1.0.24:
+    resolution: {integrity: sha512-PEl62U2EhxCO5wMUZ2/bCBcXAVKN9AdMSNQOrp3+R5b77TEaOSiy16MQ0sIOmzj/iqsgIAgPs1mt3FYfu1vIXA==}
     dependencies:
-      rimraf: 2.6.3
-    dev: true
+      debug: 3.2.7(supports-color@5.5.0)
+    transitivePeerDependencies:
+      - supports-color
+    dev: false
 
-  /tempy@1.0.1:
-    resolution: {integrity: sha512-biM9brNqxSc04Ee71hzFbryD11nX7VPhQQY32AdDmjFvodsRFz/3ufeoTZ6uYkRFfGo188tENcASNs3vTdsM0w==}
-    engines: {node: '>=10'}
+  /rimraf@2.6.3:
+    resolution: {integrity: sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==}
+    hasBin: true
     dependencies:
-      del: 6.1.1
-      is-stream: 2.0.1
-      temp-dir: 2.0.0
-      type-fest: 0.16.0
-      unique-string: 2.0.0
-    dev: true
+      glob: 7.2.3
 
-  /terser-webpack-plugin@5.3.6(esbuild@0.16.17)(webpack@5.75.0):
-    resolution: {integrity: sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ==}
-    engines: {node: '>= 10.13.0'}
-    peerDependencies:
-      '@swc/core': '*'
-      esbuild: '*'
-      uglify-js: '*'
-      webpack: ^5.1.0
-    peerDependenciesMeta:
-      '@swc/core':
-        optional: true
-      esbuild:
-        optional: true
-      uglify-js:
-        optional: true
+  /rimraf@3.0.2:
+    resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==}
+    hasBin: true
     dependencies:
-      '@jridgewell/trace-mapping': 0.3.17
-      esbuild: 0.16.17
-      jest-worker: 27.5.1
-      schema-utils: 3.1.1
-      serialize-javascript: 6.0.1
-      terser: 5.16.1
-      webpack: 5.75.0(esbuild@0.16.17)
-    dev: true
+      glob: 7.2.3
 
-  /terser@5.16.1:
-    resolution: {integrity: sha512-xvQfyfA1ayT0qdK47zskQgRZeWLoOQ8JQ6mIgRGVNwZKdQMU+5FkCBjmv4QjcrTzyZquRw2FVtlJSRUmMKQslw==}
-    engines: {node: '>=10'}
+  /rimraf@5.0.1:
+    resolution: {integrity: sha512-OfFZdwtd3lZ+XZzYP/6gTACubwFcHdLRqS9UX3UwpU2dnGQYkPFISRwvM3w9IiB2w7bW5qGo/uAwE4SmXXSKvg==}
+    engines: {node: '>=14'}
     hasBin: true
     dependencies:
-      '@jridgewell/source-map': 0.3.2
-      acorn: 8.8.1
-      commander: 2.20.3
-      source-map-support: 0.5.21
+      glob: 10.3.3
     dev: true
 
-  /test-console@2.0.0:
-    resolution: {integrity: sha512-ciILzfCQCny8zy1+HEw2yBLKus7LNMsAHymsp2fhvGTVh5pWE5v2EB7V+5ag3WM9aO2ULtgsXVQePWYE+fb7pA==}
+  /rndm@1.2.0:
+    resolution: {integrity: sha512-fJhQQI5tLrQvYIYFpOnFinzv9dwmR7hRnUz1XqP3OJ1jIweTNOd6aTO4jwQSgcBSFUB+/KHJxuGneime+FdzOw==}
     dev: false
 
-  /test-exclude@6.0.0:
-    resolution: {integrity: sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==}
-    engines: {node: '>=8'}
+  /rollup-plugin-dts@6.1.0(rollup@3.29.4)(typescript@5.4.2):
+    resolution: {integrity: sha512-ijSCPICkRMDKDLBK9torss07+8dl9UpY9z1N/zTeA1cIqdzMlpkV3MOOC7zukyvQfDyxa1s3Dl2+DeiP/G6DOw==}
+    engines: {node: '>=16'}
+    peerDependencies:
+      rollup: ^3.29.4 || ^4
+      typescript: ^5.4.2
     dependencies:
-      '@istanbuljs/schema': 0.1.3
-      glob: 7.2.3
-      minimatch: 3.1.2
+      magic-string: 0.30.5
+      rollup: 3.29.4
+      typescript: 5.4.2
+    optionalDependencies:
+      '@babel/code-frame': 7.23.5
     dev: true
 
-  /text-hex@1.0.0:
-    resolution: {integrity: sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==}
-    dev: false
+  /rollup@3.29.4:
+    resolution: {integrity: sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==}
+    engines: {node: '>=14.18.0', npm: '>=8.0.0'}
+    hasBin: true
+    optionalDependencies:
+      fsevents: 2.3.3
+    dev: true
 
-  /text-table@0.2.0:
-    resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==}
+  /rollup@4.6.0:
+    resolution: {integrity: sha512-R8i5Her4oO1LiMQ3jKf7MUglYV/mhQ5g5OKeld5CnkmPdIGo79FDDQYqPhq/PCVuTQVuxsWgIbDy9F+zdHn80w==}
+    engines: {node: '>=18.0.0', npm: '>=8.0.0'}
+    hasBin: true
+    optionalDependencies:
+      '@rollup/rollup-android-arm-eabi': 4.6.0
+      '@rollup/rollup-android-arm64': 4.6.0
+      '@rollup/rollup-darwin-arm64': 4.6.0
+      '@rollup/rollup-darwin-x64': 4.6.0
+      '@rollup/rollup-linux-arm-gnueabihf': 4.6.0
+      '@rollup/rollup-linux-arm64-gnu': 4.6.0
+      '@rollup/rollup-linux-arm64-musl': 4.6.0
+      '@rollup/rollup-linux-x64-gnu': 4.6.0
+      '@rollup/rollup-linux-x64-musl': 4.6.0
+      '@rollup/rollup-win32-arm64-msvc': 4.6.0
+      '@rollup/rollup-win32-ia32-msvc': 4.6.0
+      '@rollup/rollup-win32-x64-msvc': 4.6.0
+      fsevents: 2.3.3
     dev: true
 
-  /thenify-all@1.6.0:
-    resolution: {integrity: sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==}
-    engines: {node: '>=0.8'}
-    dependencies:
-      thenify: 3.3.1
-    dev: false
+  /route-recognizer@0.3.4:
+    resolution: {integrity: sha512-2+MhsfPhvauN1O8KaXpXAOfR/fwe8dnUXVM+xw7yt40lJRfPVQxV6yryZm0cgRvAj5fMF/mdRZbL2ptwbs5i2g==}
+    dev: true
 
-  /thenify@3.3.1:
-    resolution: {integrity: sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==}
+  /rrule@2.8.1:
+    resolution: {integrity: sha512-hM3dHSBMeaJ0Ktp7W38BJZ7O1zOgaFEsn41PDk+yHoEtfLV+PoJt9E9xAlZiWgf/iqEqionN0ebHFZIDAp+iGw==}
     dependencies:
-      any-promise: 1.3.0
-    dev: false
-
-  /throttle-debounce@1.1.0:
-    resolution: {integrity: sha512-XH8UiPCQcWNuk2LYePibW/4qL97+ZQ1AN3FNXwZRBNPPowo/NRU5fAlDCSNBJIYCKbioZfuYtMhG4quqoJhVzg==}
-    engines: {node: '>=4'}
+      tslib: 2.6.2
     dev: false
 
-  /throttleit@1.0.0:
-    resolution: {integrity: sha512-rkTVqu6IjfQ/6+uNuuc3sZek4CEYxTJom3IktzgdSxcZqdARuebbA/f4QmAxMQIxqq9ZLEUkSYqvuk1I6VKq4g==}
+  /rrweb-cssom@0.6.0:
+    resolution: {integrity: sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw==}
     dev: true
 
-  /through2-filter@3.0.0:
-    resolution: {integrity: sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==}
+  /rss-parser@3.13.0:
+    resolution: {integrity: sha512-7jWUBV5yGN3rqMMj7CZufl/291QAhvrrGpDNE4k/02ZchL0npisiYYqULF71jCEKoIiHvK/Q2e6IkDwPziT7+w==}
     dependencies:
-      through2: 2.0.5
-      xtend: 4.0.2
+      entities: 2.2.0
+      xml2js: 0.5.0
+    dev: false
 
-  /through2@2.0.5:
-    resolution: {integrity: sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==}
+  /run-async@2.4.1:
+    resolution: {integrity: sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==}
+    engines: {node: '>=0.12.0'}
+    dev: false
+
+  /run-parallel@1.2.0:
+    resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==}
     dependencies:
-      readable-stream: 2.3.7
-      xtend: 4.0.2
+      queue-microtask: 1.2.3
 
-  /through@2.3.8:
-    resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==}
+  /run-script-os@1.1.6:
+    resolution: {integrity: sha512-ql6P2LzhBTTDfzKts+Qo4H94VUKpxKDFz6QxxwaUZN0mwvi7L3lpOI7BqPCq7lgDh3XLl0dpeXwfcVIitlrYrw==}
+    hasBin: true
+    dev: true
 
-  /throwback@4.1.0:
-    resolution: {integrity: sha512-dLFe8bU8SeH0xeqeKL7BNo8XoPC/o91nz9/ooeplZPiso+DZukhoyZcSz9TFnUNScm+cA9qjU1m1853M6sPOng==}
+  /rusha@0.8.14:
+    resolution: {integrity: sha512-cLgakCUf6PedEu15t8kbsjnwIFFR2D4RfL+W3iWFJ4iac7z4B0ZI8fxy4R3J956kAI68HclCFGL8MPoUVC3qVA==}
     dev: false
 
-  /time-stamp@1.1.0:
-    resolution: {integrity: sha512-gLCeArryy2yNTRzTGKbZbloctj64jkZ57hj5zdraXue6aFgd6PmvVtEyiUU+hvU0v7q08oVv8r8ev0tRo6bvgw==}
-    engines: {node: '>=0.10.0'}
-    dev: true
-
-  /timeago.js@4.0.2:
-    resolution: {integrity: sha512-a7wPxPdVlQL7lqvitHGGRsofhdwtkoSXPGATFuSOA2i1ZNQEPLrGnj68vOp2sOJTCFAQVXPeNMX/GctBaO9L2w==}
+  /rw@1.3.3:
+    resolution: {integrity: sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ==}
     dev: false
 
-  /tiny-glob@0.2.9:
-    resolution: {integrity: sha512-g/55ssRPUjShh+xkfx9UPDXqhckHEsHr4Vd9zX55oSdGZc/MD0m3sferOkwWtp98bv+kcVfEHtRJgBVJzelrzg==}
+  /rxjs@6.6.7:
+    resolution: {integrity: sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==}
+    engines: {npm: '>=2.0.0'}
     dependencies:
-      globalyzer: 0.1.0
-      globrex: 0.1.2
-    dev: true
+      tslib: 2.6.2
 
-  /tinybench@2.3.1:
-    resolution: {integrity: sha512-hGYWYBMPr7p4g5IarQE7XhlyWveh1EKhy4wUBS1LrHXCKYgvz+4/jCqgmJqZxxldesn05vccrtME2RLLZNW7iA==}
+  /rxjs@7.8.1:
+    resolution: {integrity: sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==}
+    dependencies:
+      tslib: 2.6.2
     dev: true
 
-  /tinycolor2@1.5.2:
-    resolution: {integrity: sha512-h80m9GPFGbcLzZByXlNSEhp1gf8Dy+VX/2JCGUZsWLo7lV1mnE/XlxGYgRBoMLJh1lIDXP0EMC4RPTjlRaV+Bg==}
+  /safe-array-concat@1.0.0:
+    resolution: {integrity: sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ==}
+    engines: {node: '>=0.4'}
+    dependencies:
+      call-bind: 1.0.7
+      get-intrinsic: 1.2.4
+      has-symbols: 1.0.3
+      isarray: 2.0.5
     dev: false
 
-  /tinypool@0.3.1:
-    resolution: {integrity: sha512-zLA1ZXlstbU2rlpA4CIeVaqvWq41MTWqLY3FfsAXgC8+f7Pk7zroaJQxDgxn1xNudKW6Kmj4808rPFShUlIRmQ==}
-    engines: {node: '>=14.0.0'}
-    dev: true
+  /safe-array-concat@1.1.2:
+    resolution: {integrity: sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==}
+    engines: {node: '>=0.4'}
+    dependencies:
+      call-bind: 1.0.7
+      get-intrinsic: 1.2.4
+      has-symbols: 1.0.3
+      isarray: 2.0.5
 
-  /tinyspy@1.0.2:
-    resolution: {integrity: sha512-bSGlgwLBYf7PnUsQ6WOc6SJ3pGOcd+d8AA6EUnLDDM0kWEstC1JIlSZA3UNliDXhd9ABoS7hiRBDCu+XP/sf1Q==}
-    engines: {node: '>=14.0.0'}
-    dev: true
+  /safe-buffer@5.1.2:
+    resolution: {integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==}
 
-  /title-case@3.0.3:
-    resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
+  /safe-buffer@5.2.1:
+    resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==}
+
+  /safe-regex-test@1.0.0:
+    resolution: {integrity: sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==}
+    dependencies:
+      call-bind: 1.0.7
+      get-intrinsic: 1.2.4
+      is-regex: 1.1.4
+    dev: false
+
+  /safe-regex-test@1.0.3:
+    resolution: {integrity: sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==}
+    engines: {node: '>= 0.4'}
     dependencies:
-      tslib: 2.5.0
+      call-bind: 1.0.7
+      es-errors: 1.3.0
+      is-regex: 1.1.4
 
-  /tlds@1.231.0:
-    resolution: {integrity: sha512-L7UQwueHSkGxZHQBXHVmXW64oi+uqNtzFt2x6Ssk7NVnpIbw16CRs4eb/jmKOZ9t2JnqZ/b3Cfvo97lnXqKrhw==}
-    hasBin: true
+  /safe-stable-stringify@2.4.0:
+    resolution: {integrity: sha512-eehKHKpab6E741ud7ZIMcXhKcP6TSIezPkNZhy5U8xC6+VvrRdUA2tMgxGxaGl4cz7c2Ew5+mg5+wNB16KQqrA==}
+    engines: {node: '>=10'}
     dev: false
 
-  /tmp-promise@3.0.3:
-    resolution: {integrity: sha512-RwM7MoPojPxsOBYnyd2hy0bxtIlVrihNs9pj5SUvY8Zz1sQcQG2tG1hSr8PDxfgEB8RNKDhqbIlroIarSNDNsQ==}
+  /safer-buffer@2.1.2:
+    resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}
+
+  /samlify@2.8.9:
+    resolution: {integrity: sha512-+HHxkBweHwWEEiFWelGhTTX2Zv/7Tjh6xbZPYUURe7JWp1N9cO2jUOiSb13gTzCEXtffye+Ld7M/f2gCU5+B2Q==}
     dependencies:
-      tmp: 0.2.1
+      '@authenio/xml-encryption': 2.0.2
+      '@xmldom/xmldom': 0.8.6
+      camelcase: 6.3.0
+      node-forge: 1.3.1
+      node-rsa: 1.1.1
+      pako: 1.0.11
+      uuid: 8.3.2
+      xml: 1.0.1
+      xml-crypto: 3.0.1
+      xpath: 0.0.32
     dev: false
 
-  /tmp@0.0.33:
-    resolution: {integrity: sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==}
-    engines: {node: '>=0.6.0'}
+  /sanitize-html@2.12.1:
+    resolution: {integrity: sha512-Plh+JAn0UVDpBRP/xEjsk+xDCoOvMBwQUf/K+/cBAVuTbtX8bj2VB7S1sL1dssVpykqp0/KPSesHrqXtokVBpA==}
     dependencies:
-      os-tmpdir: 1.0.2
+      deepmerge: 4.3.1
+      escape-string-regexp: 4.0.0
+      htmlparser2: 8.0.2
+      is-plain-object: 5.0.0
+      parse-srcset: 1.0.2
+      postcss: 8.4.35
     dev: false
 
-  /tmp@0.1.0:
-    resolution: {integrity: sha512-J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw==}
-    engines: {node: '>=6'}
+  /sass-loader@13.3.2(sass@1.64.1)(webpack@5.75.0):
+    resolution: {integrity: sha512-CQbKl57kdEv+KDLquhC+gE3pXt74LEAzm+tzywcA0/aHZuub8wTErbjAoNI57rPUWRYRNC5WUnNl8eGJNbDdwg==}
+    engines: {node: '>= 14.15.0'}
+    peerDependencies:
+      fibers: '>= 3.1.0'
+      node-sass: ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0
+      sass: ^1.3.0
+      sass-embedded: '*'
+      webpack: ^5.0.0
+    peerDependenciesMeta:
+      fibers:
+        optional: true
+      node-sass:
+        optional: true
+      sass:
+        optional: true
+      sass-embedded:
+        optional: true
     dependencies:
-      rimraf: 2.7.1
+      neo-async: 2.6.2
+      sass: 1.64.1
+      webpack: 5.75.0
     dev: true
 
-  /tmp@0.2.1:
-    resolution: {integrity: sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==}
-    engines: {node: '>=8.17.0'}
+  /sass@1.64.1:
+    resolution: {integrity: sha512-16rRACSOFEE8VN7SCgBu1MpYCyN7urj9At898tyzdXFhC+a+yOX5dXwAR7L8/IdPJ1NB8OYoXmD55DM30B2kEQ==}
+    engines: {node: '>=14.0.0'}
+    hasBin: true
     dependencies:
-      rimraf: 3.0.2
-
-  /tmpl@1.0.5:
-    resolution: {integrity: sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==}
+      chokidar: 3.5.2
+      immutable: 4.2.2
+      source-map-js: 1.0.2
     dev: true
 
-  /to-absolute-glob@2.0.2:
-    resolution: {integrity: sha512-rtwLUQEwT8ZeKQbyFJyomBRYXyE16U5VKuy0ftxLMK/PZb2fkOsg5r9kHdauuVDbsNdIBoC/HCthpidamQFXYA==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      is-absolute: 1.0.0
-      is-negated-glob: 1.0.0
+  /sax@1.2.1:
+    resolution: {integrity: sha512-8I2a3LovHTOpm7NV5yOyO8IHqgVsfK4+UuySrXU8YXkSRX7k6hCV9b3HrkKCr3nMpgj+0bmocaJJWpvp1oc7ZA==}
+    dev: false
 
-  /to-fast-properties@2.0.0:
-    resolution: {integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==}
-    engines: {node: '>=4'}
+  /sax@1.2.4:
+    resolution: {integrity: sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==}
+    dev: false
 
-  /to-object-path@0.3.0:
-    resolution: {integrity: sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==}
-    engines: {node: '>=0.10.0'}
+  /saxes@6.0.0:
+    resolution: {integrity: sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==}
+    engines: {node: '>=v12.22.7'}
     dependencies:
-      kind-of: 3.2.2
+      xmlchars: 2.2.0
     dev: true
 
-  /to-regex-range@2.1.1:
-    resolution: {integrity: sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      is-number: 3.0.0
-      repeat-string: 1.6.1
-    dev: true
+  /sb-promise-queue@2.1.0:
+    resolution: {integrity: sha512-zwq4YuP1FQFkGx2Q7GIkZYZ6PqWpV+bg0nIO1sJhWOyGyhqbj0MsTvK6lCFo5TQwX5pZr6SCQ75e8PCDCuNvkg==}
+    engines: {node: '>= 8'}
+    dev: false
 
-  /to-regex-range@5.0.1:
-    resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}
-    engines: {node: '>=8.0'}
+  /sb-scandir@3.1.0:
+    resolution: {integrity: sha512-70BVm2xz9jn94zSQdpvYrEG101/UV9TVGcfWr9T5iob3QhCK4lYXeculfBqPGFv3XTeKgx4dpWyYIDeZUqo4kg==}
+    engines: {node: '>= 8'}
     dependencies:
-      is-number: 7.0.0
+      sb-promise-queue: 2.1.0
+    dev: false
 
-  /to-regex@3.0.2:
-    resolution: {integrity: sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==}
-    engines: {node: '>=0.10.0'}
+  /scheduler@0.23.0:
+    resolution: {integrity: sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==}
     dependencies:
-      define-property: 2.0.2
-      extend-shallow: 3.0.2
-      regex-not: 1.0.2
-      safe-regex: 1.1.0
+      loose-envify: 1.4.0
     dev: true
 
-  /to-through@2.0.0:
-    resolution: {integrity: sha512-+QIz37Ly7acM4EMdw2PRN389OneM5+d844tirkGp4dPKzI5OE72V9OsbFp+CIYJDahZ41ZV05hNtcPAQUAm9/Q==}
-    engines: {node: '>= 0.10'}
+  /schema-utils@3.1.1:
+    resolution: {integrity: sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==}
+    engines: {node: '>= 10.13.0'}
     dependencies:
-      through2: 2.0.5
+      '@types/json-schema': 7.0.15
+      ajv: 6.12.6
+      ajv-keywords: 3.5.2(ajv@6.12.6)
     dev: true
 
-  /toggle-selection@1.0.6:
-    resolution: {integrity: sha512-BiZS+C1OS8g/q2RRbJmy59xpyghNBqrr6k5L/uKBGRsTfxmu3ffiRnd8mlGPUVayg8pvfi5urfnu8TU7DVOkLQ==}
-    dev: false
-
-  /toidentifier@1.0.1:
-    resolution: {integrity: sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==}
-    engines: {node: '>=0.6'}
+  /scule@1.1.1:
+    resolution: {integrity: sha512-sHtm/SsIK9BUBI3EFT/Gnp9VoKfY6QLvlkvAE6YK7454IF8FSgJEAnJpVdSC7K5/pjI5NfxhzBLW2JAfYA/shQ==}
+    dev: true
 
-  /token-stream@1.0.0:
-    resolution: {integrity: sha512-VSsyNPPW74RpHwR8Fc21uubwHY7wMDeJLys2IX5zJNih+OnAnaifKHo+1LHT7DAdloQ7apeaaWg8l7qnf/TnEg==}
+  /seedrandom@3.0.5:
+    resolution: {integrity: sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg==}
     dev: true
 
-  /token-types@4.2.1:
-    resolution: {integrity: sha512-6udB24Q737UD/SDsKAHI9FCRP7Bqc9D/MQUV02ORQg5iskjtLJlZJNdN4kKtcdtwCeWIwIHDGaUsTsCCAa8sFQ==}
-    engines: {node: '>=10'}
+  /selderee@0.11.0:
+    resolution: {integrity: sha512-5TF+l7p4+OsnP8BCCvSyZiSPc4x4//p5uPwK8TCnVPJYRmU2aYKMpOXvw8zM5a5JvuuCGN1jmsMwuU2W02ukfA==}
     dependencies:
-      '@tokenizer/token': 0.3.0
-      ieee754: 1.2.1
+      parseley: 0.12.1
     dev: false
 
-  /toposort@2.0.2:
-    resolution: {integrity: sha512-0a5EOkAUp8D4moMi2W8ZF8jcga7BgZd91O/yabJCFY8az+XSzeGyTKs0Aoo897iV1Nj6guFq8orWDS96z91oGg==}
-    dev: false
-
-  /tosource@2.0.0-alpha.3:
-    resolution: {integrity: sha512-KAB2lrSS48y91MzFPFuDg4hLbvDiyTjOVgaK7Erw+5AmZXNq4sFRVn8r6yxSLuNs15PaokrDRpS61ERY9uZOug==}
+  /semver@7.6.0:
+    resolution: {integrity: sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==}
     engines: {node: '>=10'}
-    dev: true
-
-  /touch@3.1.0:
-    resolution: {integrity: sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==}
     hasBin: true
     dependencies:
-      nopt: 1.0.10
-    dev: true
+      lru-cache: 6.0.0
 
-  /tough-cookie@2.5.0:
-    resolution: {integrity: sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==}
-    engines: {node: '>=0.8'}
+  /send@0.18.0:
+    resolution: {integrity: sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==}
+    engines: {node: '>= 0.8.0'}
     dependencies:
-      psl: 1.9.0
-      punycode: 2.2.0
+      debug: 2.6.9
+      depd: 2.0.0
+      destroy: 1.2.0
+      encodeurl: 1.0.2
+      escape-html: 1.0.3
+      etag: 1.8.1
+      fresh: 0.5.2
+      http-errors: 2.0.0
+      mime: 1.6.0
+      ms: 2.1.3
+      on-finished: 2.4.1
+      range-parser: 1.2.1
+      statuses: 2.0.1
+    transitivePeerDependencies:
+      - supports-color
 
-  /tough-cookie@3.0.1:
-    resolution: {integrity: sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==}
-    engines: {node: '>=6'}
+  /sentence-case@3.0.4:
+    resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
-      ip-regex: 2.1.0
-      psl: 1.9.0
-      punycode: 2.2.0
+      no-case: 3.0.4
+      tslib: 2.6.2
+      upper-case-first: 2.0.2
+
+  /seq-queue@0.0.5:
+    resolution: {integrity: sha512-hr3Wtp/GZIc/6DAGPDcV4/9WoZhjrkXsi5B/07QgX8tsdc6ilr7BFM6PM6rbdAX1kFSDYeZGLipIZZKyQP0O5Q==}
     dev: false
 
-  /tough-cookie@4.1.2:
-    resolution: {integrity: sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==}
-    engines: {node: '>=6'}
+  /serialize-javascript@6.0.2:
+    resolution: {integrity: sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==}
     dependencies:
-      psl: 1.9.0
-      punycode: 2.2.0
-      universalify: 0.2.0
-      url-parse: 1.5.10
+      randombytes: 2.1.0
 
-  /tr46@0.0.3:
-    resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==}
+  /serve-static@1.15.0:
+    resolution: {integrity: sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==}
+    engines: {node: '>= 0.8.0'}
+    dependencies:
+      encodeurl: 1.0.2
+      escape-html: 1.0.3
+      parseurl: 1.3.3
+      send: 0.18.0
+    transitivePeerDependencies:
+      - supports-color
 
-  /tr46@3.0.0:
-    resolution: {integrity: sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==}
-    engines: {node: '>=12'}
+  /set-blocking@2.0.0:
+    resolution: {integrity: sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==}
+    dev: false
+
+  /set-function-length@1.2.2:
+    resolution: {integrity: sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==}
+    engines: {node: '>= 0.4'}
     dependencies:
-      punycode: 2.2.0
+      define-data-property: 1.1.4
+      es-errors: 1.3.0
+      function-bind: 1.1.2
+      get-intrinsic: 1.2.4
+      gopd: 1.0.1
+      has-property-descriptors: 1.0.2
 
-  /transliteration@2.3.5:
-    resolution: {integrity: sha512-HAGI4Lq4Q9dZ3Utu2phaWgtm3vB6PkLUFqWAScg/UW+1eZ/Tg6Exo4oC0/3VUol/w4BlefLhUUSVBr/9/ZGQOw==}
-    engines: {node: '>=6.0.0'}
-    hasBin: true
+  /set-function-name@2.0.2:
+    resolution: {integrity: sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==}
+    engines: {node: '>= 0.4'}
     dependencies:
-      yargs: 17.6.0
-    dev: false
+      define-data-property: 1.1.4
+      es-errors: 1.3.0
+      functions-have-names: 1.2.3
+      has-property-descriptors: 1.0.2
 
-  /traverse@0.6.6:
-    resolution: {integrity: sha512-kdf4JKs8lbARxWdp7RKdNzoJBhGUcIalSYibuGyHJbmk40pOysQ0+QPvlkCOICOivDWU2IJo2rkrxyTK2AH4fw==}
+  /setimmediate@1.0.5:
+    resolution: {integrity: sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==}
     dev: false
 
-  /tree-kill@1.2.2:
-    resolution: {integrity: sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==}
+  /setprototypeof@1.2.0:
+    resolution: {integrity: sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==}
+
+  /sha.js@2.4.11:
+    resolution: {integrity: sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==}
     hasBin: true
-    dev: true
+    dependencies:
+      inherits: 2.0.4
+      safe-buffer: 5.2.1
+    dev: false
 
-  /trim@1.0.1:
-    resolution: {integrity: sha512-3JVP2YVqITUisXblCDq/Bi4P9457G/sdEamInkyvCsjbTcXLXIiG7XCb4kGMFWh6JGXesS3TKxOPtrncN/xe8w==}
+  /shallow-clone@3.0.1:
+    resolution: {integrity: sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==}
+    engines: {node: '>=8'}
+    dependencies:
+      kind-of: 6.0.3
     dev: true
 
-  /triple-beam@1.3.0:
-    resolution: {integrity: sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw==}
-    dev: false
-
-  /ts-dedent@2.2.0:
-    resolution: {integrity: sha512-q5W7tVM71e2xjHZTlgfTDoPF/SmqKG5hddq9SzR49CH2hayqRKJtQ4mtRlSxKaJlR/+9rEM+mnBHf7I2/BQcpQ==}
-    engines: {node: '>=6.10'}
+  /shallowequal@1.1.0:
+    resolution: {integrity: sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==}
     dev: true
 
-  /ts-essentials@7.0.3(typescript@5.0.3):
-    resolution: {integrity: sha512-8+gr5+lqO3G84KdiTSMRLtuyJ+nTBVRKuCrK4lidMPdVeEp0uqC875uE5NMcaA7YYMN7XsNiFQuMvasF8HT/xQ==}
-    peerDependencies:
-      typescript: '>=3.7.0'
+  /shebang-command@2.0.0:
+    resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==}
+    engines: {node: '>=8'}
     dependencies:
-      typescript: 5.0.3
-    dev: true
+      shebang-regex: 3.0.0
+
+  /shebang-regex@3.0.0:
+    resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
+    engines: {node: '>=8'}
 
-  /ts-expect@1.3.0:
-    resolution: {integrity: sha512-e4g0EJtAjk64xgnFPD6kTBUtpnMVzDrMb12N1YZV0VvSlhnVT3SGxiYTLdGy8Q5cYHOIC/FAHmZ10eGrAguicQ==}
+  /shell-escape@0.2.0:
+    resolution: {integrity: sha512-uRRBT2MfEOyxuECseCZd28jC1AJ8hmqqneWQ4VWUTgCAFvb3wKU1jLqj6egC4Exrr88ogg3dp+zroH4wJuaXzw==}
     dev: false
 
-  /ts-jest@29.1.0(@babel/core@7.21.5)(jest@29.5.0)(typescript@5.0.3):
-    resolution: {integrity: sha512-ZhNr7Z4PcYa+JjMl62ir+zPiNJfXJN6E8hSLnaUKhOgqcn8vb3e537cpkd0FuAfRK3sR1LSqM1MOhliXNgOFPA==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+  /shell-quote@1.8.1:
+    resolution: {integrity: sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==}
+    dev: true
+
+  /shelljs@0.8.5:
+    resolution: {integrity: sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==}
+    engines: {node: '>=4'}
     hasBin: true
-    peerDependencies:
-      '@babel/core': '>=7.0.0-beta.0 <8'
-      '@jest/types': ^29.0.0
-      babel-jest: ^29.0.0
-      esbuild: '*'
-      jest: ^29.0.0
-      typescript: '>=4.3 <6'
-    peerDependenciesMeta:
-      '@babel/core':
-        optional: true
-      '@jest/types':
-        optional: true
-      babel-jest:
-        optional: true
-      esbuild:
-        optional: true
     dependencies:
-      '@babel/core': 7.21.5
-      bs-logger: 0.2.6
-      fast-json-stable-stringify: 2.1.0
-      jest: 29.5.0
-      jest-util: 29.5.0
-      json5: 2.2.3
-      lodash.memoize: 4.1.2
-      make-error: 1.3.6
-      semver: 7.3.8
-      typescript: 5.0.3
-      yargs-parser: 21.1.1
-    dev: true
+      glob: 7.2.3
+      interpret: 1.4.0
+      rechoir: 0.6.2
 
-  /ts-loader@9.4.2(typescript@5.0.3)(webpack@5.75.0):
-    resolution: {integrity: sha512-OmlC4WVmFv5I0PpaxYb+qGeGOdm5giHU7HwDDUjw59emP2UYMHy9fFSDcYgSNoH8sXcj4hGCSEhlDZ9ULeDraA==}
-    engines: {node: '>=12.0.0'}
-    peerDependencies:
-      typescript: '*'
-      webpack: ^5.0.0
+  /should-equal@2.0.0:
+    resolution: {integrity: sha512-ZP36TMrK9euEuWQYBig9W55WPC7uo37qzAEmbjHz4gfyuXrEUgF8cUvQVO+w+d3OMfPvSRQJ22lSm8MQJ43LTA==}
     dependencies:
-      chalk: 4.1.2
-      enhanced-resolve: 5.13.0
-      micromatch: 4.0.5
-      semver: 7.3.8
-      typescript: 5.0.3
-      webpack: 5.75.0(esbuild@0.16.17)
-    dev: true
+      should-type: 1.4.0
 
-  /ts-log@2.2.5:
-    resolution: {integrity: sha512-PGcnJoTBnVGy6yYNFxWVNkdcAuAMstvutN9MgDJIV6L0oG8fB+ZNNy1T+wJzah8RPGor1mZuPQkVfXNDpy9eHA==}
-    dev: false
+  /should-format@3.0.3:
+    resolution: {integrity: sha512-hZ58adtulAk0gKtua7QxevgUaXTTXxIi8t41L3zo9AHvjXO1/7sdLECuHeIN2SRtYXpNkmhoUP2pdeWgricQ+Q==}
+    dependencies:
+      should-type: 1.4.0
+      should-type-adaptors: 1.1.0
 
-  /ts-map@1.0.3:
-    resolution: {integrity: sha512-vDWbsl26LIcPGmDpoVzjEP6+hvHZkBkLW7JpvwbCv/5IYPJlsbzCVXY3wsCeAxAUeTclNOUZxnLdGh3VBD/J6w==}
-    dev: true
+  /should-type-adaptors@1.1.0:
+    resolution: {integrity: sha512-JA4hdoLnN+kebEp2Vs8eBe9g7uy0zbRo+RMcU0EsNy+R+k049Ki+N5tT5Jagst2g7EAja+euFuoXFCa8vIklfA==}
+    dependencies:
+      should-type: 1.4.0
+      should-util: 1.0.1
+
+  /should-type@1.4.0:
+    resolution: {integrity: sha512-MdAsTu3n25yDbIe1NeN69G4n6mUnJGtSJHygX3+oN0ZbO3DTiATnf7XnYJdGT42JCXurTb1JI0qOBR65shvhPQ==}
 
-  /ts-node@10.9.1(@types/node@16.18.12)(typescript@5.0.3):
-    resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==}
-    hasBin: true
-    peerDependencies:
-      '@swc/core': '>=1.2.50'
-      '@swc/wasm': '>=1.2.50'
-      '@types/node': '*'
-      typescript: '>=2.7'
-    peerDependenciesMeta:
-      '@swc/core':
-        optional: true
-      '@swc/wasm':
-        optional: true
+  /should-util@1.0.1:
+    resolution: {integrity: sha512-oXF8tfxx5cDk8r2kYqlkUJzZpDBqVY/II2WhvU0n9Y3XYvAYRmeaf1PvvIvTgPnv4KJ+ES5M0PyDq5Jp+Ygy2g==}
+
+  /should@13.2.3:
+    resolution: {integrity: sha512-ggLesLtu2xp+ZxI+ysJTmNjh2U0TsC+rQ/pfED9bUZZ4DKefP27D+7YJVVTvKsmjLpIi9jAa7itwDGkDDmt1GQ==}
     dependencies:
-      '@cspotcode/source-map-support': 0.8.1
-      '@tsconfig/node10': 1.0.9
-      '@tsconfig/node12': 1.0.11
-      '@tsconfig/node14': 1.0.3
-      '@tsconfig/node16': 1.0.4
-      '@types/node': 16.18.12
-      acorn: 8.8.1
-      acorn-walk: 8.2.0
-      arg: 4.1.3
-      create-require: 1.1.1
-      diff: 4.0.2
-      make-error: 1.3.6
-      typescript: 5.0.3
-      v8-compile-cache-lib: 3.0.1
-      yn: 3.1.1
+      should-equal: 2.0.0
+      should-format: 3.0.3
+      should-type: 1.4.0
+      should-type-adaptors: 1.1.0
+      should-util: 1.0.1
 
-  /tsc-alias@1.8.2:
-    resolution: {integrity: sha512-ukBkcNekOgwtnSWYLD5QsMX3yQWg7JviAs8zg3qJGgu4LGtY3tsV4G6vnqvOXIDkbC+XL9vbhObWSpRA5/6wbg==}
+  /showdown@2.1.0:
+    resolution: {integrity: sha512-/6NVYu4U819R2pUIk79n67SYgJHWCce0a5xTP979WbNp0FL9MN1I1QK662IDU1b6JzKTvmhgI7T7JYIxBi3kMQ==}
     hasBin: true
     dependencies:
-      chokidar: 3.5.2
       commander: 9.4.1
-      globby: 11.1.0
-      mylas: 2.1.13
-      normalize-path: 3.0.0
-      plimit-lit: 1.4.1
-    dev: true
+    dev: false
 
-  /tsc-watch@6.0.0(typescript@5.0.3):
-    resolution: {integrity: sha512-zgpju+/z5z29/kK5V28Nz16CMkX2voFOUxkTlCim/R25hxzbyUqu2NfTnmJBQfESBSPbEQUGqDdB9A8opAcB4A==}
-    engines: {node: '>=12.12.0'}
-    hasBin: true
-    peerDependencies:
-      typescript: '*'
+  /side-channel@1.0.4:
+    resolution: {integrity: sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==}
     dependencies:
-      cross-spawn: 7.0.3
-      node-cleanup: 2.1.2
-      ps-tree: 1.2.0
-      string-argv: 0.3.1
-      typescript: 5.0.3
-    dev: true
+      call-bind: 1.0.7
+      get-intrinsic: 1.2.1
+      object-inspect: 1.12.3
 
-  /tsconfig-paths@3.14.1:
-    resolution: {integrity: sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==}
-    dependencies:
-      '@types/json5': 0.0.29
-      json5: 1.0.2
-      minimist: 1.2.7
-      strip-bom: 3.0.0
+  /siginfo@2.0.0:
+    resolution: {integrity: sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==}
     dev: true
 
-  /tsconfig-paths@4.1.2:
-    resolution: {integrity: sha512-uhxiMgnXQp1IR622dUXI+9Ehnws7i/y6xvpZB9IbUVOPy0muvdvgXeZOn88UcGPiT98Vp3rJPTa8bFoalZ3Qhw==}
-    engines: {node: '>=6'}
-    dependencies:
-      json5: 2.2.3
-      minimist: 1.2.7
-      strip-bom: 3.0.0
-    dev: true
+  /signal-exit@3.0.7:
+    resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==}
 
-  /tslib@2.5.0:
-    resolution: {integrity: sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==}
+  /signal-exit@4.1.0:
+    resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==}
+    engines: {node: '>=14'}
 
-  /tsscmp@1.0.6:
-    resolution: {integrity: sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==}
-    engines: {node: '>=0.6.x'}
+  /simple-concat@1.0.1:
+    resolution: {integrity: sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==}
     dev: false
 
-  /tsutils@3.21.0(typescript@5.0.3):
-    resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
-    engines: {node: '>= 6'}
-    peerDependencies:
-      typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta'
+  /simple-get@4.0.1:
+    resolution: {integrity: sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==}
     dependencies:
-      tslib: 2.5.0
-      typescript: 5.0.3
-    dev: true
+      decompress-response: 6.0.0
+      once: 1.4.0
+      simple-concat: 1.0.1
+    dev: false
 
-  /tunnel-agent@0.6.0:
-    resolution: {integrity: sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==}
+  /simple-git@3.17.0:
+    resolution: {integrity: sha512-JozI/s8jr3nvLd9yn2jzPVHnhVzt7t7QWfcIoDcqRIGN+f1IINGv52xoZti2kkYfoRhhRvzMSNPfogHMp97rlw==}
     dependencies:
-      safe-buffer: 5.2.1
+      '@kwsites/file-exists': 1.1.1
+      '@kwsites/promise-deferred': 1.1.1
+      debug: 4.3.4(supports-color@8.1.1)
+    transitivePeerDependencies:
+      - supports-color
+    dev: false
 
-  /tunnel@0.0.6:
-    resolution: {integrity: sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==}
-    engines: {node: '>=0.6.11 <=0.7.0 || >=0.7.3'}
+  /simple-lru-cache@0.0.2:
+    resolution: {integrity: sha512-uEv/AFO0ADI7d99OHDmh1QfYzQk/izT1vCmu/riQfh7qjBVUUgRT87E5s5h7CxWCA/+YoZerykpEthzVrW3LIw==}
     dev: false
 
-  /turbo-darwin-64@1.8.8:
-    resolution: {integrity: sha512-18cSeIm7aeEvIxGyq7PVoFyEnPpWDM/0CpZvXKHpQ6qMTkfNt517qVqUTAwsIYqNS8xazcKAqkNbvU1V49n65Q==}
-    cpu: [x64]
-    os: [darwin]
-    dev: true
-    optional: true
+  /simple-swizzle@0.2.2:
+    resolution: {integrity: sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==}
+    dependencies:
+      is-arrayish: 0.3.2
+    dev: false
 
-  /turbo-darwin-arm64@1.8.8:
-    resolution: {integrity: sha512-ruGRI9nHxojIGLQv1TPgN7ud4HO4V8mFBwSgO6oDoZTNuk5ybWybItGR+yu6fni5vJoyMHXOYA2srnxvOc7hjQ==}
-    cpu: [arm64]
-    os: [darwin]
+  /simple-update-notifier@2.0.0:
+    resolution: {integrity: sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==}
+    engines: {node: '>=10'}
+    dependencies:
+      semver: 7.6.0
     dev: true
-    optional: true
 
-  /turbo-linux-64@1.8.8:
-    resolution: {integrity: sha512-N/GkHTHeIQogXB1/6ZWfxHx+ubYeb8Jlq3b/3jnU4zLucpZzTQ8XkXIAfJG/TL3Q7ON7xQ8yGOyGLhHL7MpFRg==}
-    cpu: [x64]
-    os: [linux]
+  /simple-websocket@9.1.0:
+    resolution: {integrity: sha512-8MJPnjRN6A8UCp1I+H/dSFyjwJhp6wta4hsVRhjf8w9qBHRzxYt14RaOcjvQnhD1N4yKOddEjflwMnQM4VtXjQ==}
+    dependencies:
+      debug: 4.3.4(supports-color@8.1.1)
+      queue-microtask: 1.2.3
+      randombytes: 2.1.0
+      readable-stream: 3.6.0
+      ws: 7.5.9
+    transitivePeerDependencies:
+      - bufferutil
+      - supports-color
+      - utf-8-validate
     dev: true
-    optional: true
 
-  /turbo-linux-arm64@1.8.8:
-    resolution: {integrity: sha512-hKqLbBHgUkYf2Ww8uBL9UYdBFQ5677a7QXdsFhONXoACbDUPvpK4BKlz3NN7G4NZ+g9dGju+OJJjQP0VXRHb5w==}
-    cpu: [arm64]
-    os: [linux]
+  /sisteransi@1.0.5:
+    resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==}
+
+  /slash@3.0.0:
+    resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==}
+    engines: {node: '>=8'}
+
+  /slash@4.0.0:
+    resolution: {integrity: sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==}
+    engines: {node: '>=12'}
     dev: true
-    optional: true
 
-  /turbo-windows-64@1.8.8:
-    resolution: {integrity: sha512-2ndjDJyzkNslXxLt+PQuU21AHJWc8f6MnLypXy3KsN4EyX/uKKGZS0QJWz27PeHg0JS75PVvhfFV+L9t9i+Yyg==}
-    cpu: [x64]
-    os: [win32]
+  /slice-ansi@3.0.0:
+    resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
+    engines: {node: '>=8'}
+    dependencies:
+      ansi-styles: 4.3.0
+      astral-regex: 2.0.0
+      is-fullwidth-code-point: 3.0.0
     dev: true
-    optional: true
 
-  /turbo-windows-arm64@1.8.8:
-    resolution: {integrity: sha512-xCA3oxgmW9OMqpI34AAmKfOVsfDljhD5YBwgs0ZDsn5h3kCHhC4x9W5dDk1oyQ4F5EXSH3xVym5/xl1J6WRpUg==}
-    cpu: [arm64]
-    os: [win32]
+  /slice-ansi@4.0.0:
+    resolution: {integrity: sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==}
+    engines: {node: '>=10'}
+    dependencies:
+      ansi-styles: 4.3.0
+      astral-regex: 2.0.0
+      is-fullwidth-code-point: 3.0.0
+
+  /slugify@1.4.7:
+    resolution: {integrity: sha512-tf+h5W1IrjNm/9rKKj0JU2MDMruiopx0jjVA5zCdBtcGjfp0+c5rHw/zADLC3IeKlGHtVbHtpfzvYA0OYT+HKg==}
+    engines: {node: '>=8.0.0'}
     dev: true
+
+  /smart-buffer@4.2.0:
+    resolution: {integrity: sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==}
+    engines: {node: '>= 6.0.0', npm: '>= 3.0.0'}
+    dev: false
     optional: true
 
-  /turbo@1.8.8:
-    resolution: {integrity: sha512-qYJ5NjoTX+591/x09KgsDOPVDUJfU9GoS+6jszQQlLp1AHrf1wRFA3Yps8U+/HTG03q0M4qouOfOLtRQP4QypA==}
-    hasBin: true
-    optionalDependencies:
-      turbo-darwin-64: 1.8.8
-      turbo-darwin-arm64: 1.8.8
-      turbo-linux-64: 1.8.8
-      turbo-linux-arm64: 1.8.8
-      turbo-windows-64: 1.8.8
-      turbo-windows-arm64: 1.8.8
-    dev: true
+  /snake-case@3.0.4:
+    resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
+    dependencies:
+      dot-case: 3.0.4
+      tslib: 2.6.2
+    dev: false
 
-  /tweetnacl@0.14.5:
-    resolution: {integrity: sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==}
+  /snowflake-sdk@1.9.2(asn1.js@5.4.1):
+    resolution: {integrity: sha512-pPTE8V6RHw78KBAn56rGVri3LRciuJDz/oDUmkJej3fUnOHP28YBLl3kjiW0J5bbPzDPHhSAkeeCsjrbGyAB/w==}
+    peerDependencies:
+      asn1.js: ^5.4.1
+    dependencies:
+      '@aws-sdk/client-s3': 3.478.0
+      '@azure/storage-blob': 12.11.0
+      '@google-cloud/storage': 6.11.0
+      '@techteamer/ocsp': 1.0.1
+      agent-base: 6.0.2
+      asn1.js: 5.4.1
+      asn1.js-rfc2560: 5.0.1(asn1.js@5.4.1)
+      asn1.js-rfc5280: 3.0.0
+      axios: 1.6.7(debug@3.2.7)
+      big-integer: 1.6.51
+      bignumber.js: 9.1.2
+      binascii: 0.0.2
+      bn.js: 5.2.1
+      browser-request: 0.3.3
+      debug: 3.2.7(supports-color@5.5.0)
+      expand-tilde: 2.0.2
+      extend: 3.0.2
+      fast-xml-parser: 4.2.7
+      fastest-levenshtein: 1.0.16
+      generic-pool: 3.9.0
+      glob: 9.3.2
+      https-proxy-agent: 7.0.2
+      jsonwebtoken: 9.0.2
+      mime-types: 2.1.35
+      mkdirp: 1.0.4
+      moment: 2.29.4
+      moment-timezone: 0.5.37
+      open: 7.4.2
+      python-struct: 1.1.3
+      simple-lru-cache: 0.0.2
+      tmp: 0.2.1
+      uuid: 8.3.2
+      winston: 3.8.2
+    transitivePeerDependencies:
+      - aws-crt
+      - encoding
+      - supports-color
+    dev: false
 
-  /type-check@0.3.2:
-    resolution: {integrity: sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==}
-    engines: {node: '>= 0.8.0'}
+  /socks-proxy-agent@6.2.1:
+    resolution: {integrity: sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ==}
+    engines: {node: '>= 10'}
     dependencies:
-      prelude-ls: 1.1.2
+      agent-base: 6.0.2
+      debug: 4.3.4(supports-color@8.1.1)
+      socks: 2.7.1
+    transitivePeerDependencies:
+      - supports-color
+    dev: false
+    optional: true
 
-  /type-check@0.4.0:
-    resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}
-    engines: {node: '>= 0.8.0'}
+  /socks@2.7.1:
+    resolution: {integrity: sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==}
+    engines: {node: '>= 10.13.0', npm: '>= 3.0.0'}
     dependencies:
-      prelude-ls: 1.2.1
-    dev: true
+      ip: 2.0.1
+      smart-buffer: 4.2.0
+    dev: false
+    optional: true
 
-  /type-detect@4.0.8:
-    resolution: {integrity: sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==}
-    engines: {node: '>=4'}
-    dev: true
+  /source-map-js@1.0.2:
+    resolution: {integrity: sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==}
+    engines: {node: '>=0.10.0'}
 
-  /type-fest@0.16.0:
-    resolution: {integrity: sha512-eaBzG6MxNzEn9kiwvtre90cXaNLkmadMWa1zQMs3XORCXNbsH/OewwbxC5ia9dCxIxnTAsSxXJaa/p5y8DlvJg==}
-    engines: {node: '>=10'}
-    dev: true
+  /source-map-support@0.5.13:
+    resolution: {integrity: sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==}
+    dependencies:
+      buffer-from: 1.1.2
+      source-map: 0.6.1
 
-  /type-fest@0.20.2:
-    resolution: {integrity: sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==}
-    engines: {node: '>=10'}
-    dev: true
+  /source-map-support@0.5.21:
+    resolution: {integrity: sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==}
+    dependencies:
+      buffer-from: 1.1.2
+      source-map: 0.6.1
 
-  /type-fest@0.21.3:
-    resolution: {integrity: sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==}
-    engines: {node: '>=10'}
+  /source-map@0.6.1:
+    resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==}
+    engines: {node: '>=0.10.0'}
 
-  /type-fest@0.6.0:
-    resolution: {integrity: sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==}
-    engines: {node: '>=8'}
+  /space-separated-tokens@2.0.2:
+    resolution: {integrity: sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==}
     dev: true
 
-  /type-fest@0.8.1:
-    resolution: {integrity: sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==}
-    engines: {node: '>=8'}
+  /sparse-bitfield@3.0.3:
+    resolution: {integrity: sha512-kvzhi7vqKTfkh0PZU+2D2PIllw2ymqJKujUcyPMd9Y75Nv4nPbGJZXNhxsgdQab2BmlDct1YnfQCguEvHr7VsQ==}
+    dependencies:
+      memory-pager: 1.5.0
+    dev: false
+
+  /spawn-command@0.0.2:
+    resolution: {integrity: sha512-zC8zGoGkmc8J9ndvml8Xksr1Amk9qBujgbF0JAIWO7kXr43w0h/0GJNM/Vustixu+YE8N/MTrQ7N31FvHUACxQ==}
     dev: true
 
-  /type-fest@2.19.0:
-    resolution: {integrity: sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==}
-    engines: {node: '>=12.20'}
+  /spdx-correct@3.1.1:
+    resolution: {integrity: sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==}
+    dependencies:
+      spdx-expression-parse: 3.0.1
+      spdx-license-ids: 3.0.12
     dev: true
 
-  /type-is@1.6.18:
-    resolution: {integrity: sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==}
-    engines: {node: '>= 0.6'}
-    dependencies:
-      media-typer: 0.3.0
-      mime-types: 2.1.35
+  /spdx-exceptions@2.3.0:
+    resolution: {integrity: sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==}
+    dev: true
 
-  /type@1.2.0:
-    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+  /spdx-expression-parse@3.0.1:
+    resolution: {integrity: sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==}
+    dependencies:
+      spdx-exceptions: 2.3.0
+      spdx-license-ids: 3.0.12
     dev: true
 
-  /type@2.7.2:
-    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+  /spdx-license-ids@3.0.12:
+    resolution: {integrity: sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA==}
     dev: true
 
-  /typed-array-length@1.0.4:
-    resolution: {integrity: sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==}
+  /speakeasy@2.0.0:
+    resolution: {integrity: sha512-lW2A2s5LKi8rwu77ewisuUOtlCydF/hmQSOJjpTqTj1gZLkNgTaYnyvfxy2WBr4T/h+9c4g8HIITfj83OkFQFw==}
+    engines: {node: '>= 0.10.0'}
     dependencies:
-      call-bind: 1.0.2
-      for-each: 0.3.3
-      is-typed-array: 1.1.10
+      base32.js: 0.0.1
+    dev: false
 
-  /typedarray-to-buffer@3.1.5:
-    resolution: {integrity: sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==}
+  /spex@3.2.0:
+    resolution: {integrity: sha512-9srjJM7NaymrpwMHvSmpDeIK5GoRMX/Tq0E8aOlDPS54dDnDUIp30DrP9SphMPEETDLzEM9+4qo+KipmbtPecg==}
+    engines: {node: '>=4.5'}
+    dev: false
+
+  /split-on-first@1.1.0:
+    resolution: {integrity: sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw==}
+    engines: {node: '>=6'}
+    dev: false
+
+  /split2@4.2.0:
+    resolution: {integrity: sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==}
+    engines: {node: '>= 10.x'}
+    dev: false
+
+  /split@0.3.3:
+    resolution: {integrity: sha512-wD2AeVmxXRBoX44wAycgjVpMhvbwdI2aZjCkvfNcH1YqHQvJVa1duWc73OyVGJUc05fhFaTZeQ/PYsrmyH0JVA==}
     dependencies:
-      is-typedarray: 1.0.0
+      through: 2.3.8
     dev: true
 
-  /typedarray@0.0.6:
-    resolution: {integrity: sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==}
+  /sprintf-js@1.0.3:
+    resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==}
 
-  /typedi@0.10.0(patch_hash=syy565ld7euwcedfbmx53j2qc4):
-    resolution: {integrity: sha512-v3UJF8xm68BBj6AF4oQML3ikrfK2c9EmZUyLOfShpJuItAqVBHWP/KtpGinkSsIiP6EZyyb6Z3NXyW9dgS9X1w==}
-    dev: false
-    patched: true
+  /sprintf-js@1.1.2:
+    resolution: {integrity: sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==}
 
-  /typeorm@0.2.45(ioredis@4.28.5)(mysql2@2.3.3)(pg@8.8.0)(sqlite3@5.1.6):
-    resolution: {integrity: sha512-c0rCO8VMJ3ER7JQ73xfk0zDnVv0WDjpsP6Q1m6CVKul7DB9iVdWLRjPzc8v2eaeBuomsbZ2+gTaYr8k1gm3bYA==}
-    hasBin: true
-    peerDependencies:
-      '@sap/hana-client': ^2.11.14
-      better-sqlite3: ^7.1.2
-      hdb-pool: ^0.1.6
-      ioredis: ^4.28.3
-      mongodb: ^3.6.0
-      mssql: ^6.3.1
-      mysql2: ^2.2.5
-      oracledb: ^5.1.0
-      pg: ^8.5.1
-      pg-native: ^3.0.0
-      pg-query-stream: ^4.0.0
-      redis: ^3.1.1
-      sql.js: ^1.4.0
-      sqlite3: ^5.0.2
-      typeorm-aurora-data-api-driver: ^2.0.0
+  /sqlite3@5.1.7:
+    resolution: {integrity: sha512-GGIyOiFaG+TUra3JIfkI/zGP8yZYLPQ0pl1bH+ODjiX57sPhrLU5sQJn1y9bDKZUFYkX1crlrPfSYt0BKKdkog==}
+    requiresBuild: true
     peerDependenciesMeta:
-      '@sap/hana-client':
-        optional: true
-      better-sqlite3:
-        optional: true
-      hdb-pool:
-        optional: true
-      ioredis:
-        optional: true
-      mongodb:
-        optional: true
-      mssql:
-        optional: true
-      mysql2:
-        optional: true
-      oracledb:
-        optional: true
-      pg:
-        optional: true
-      pg-native:
-        optional: true
-      pg-query-stream:
-        optional: true
-      redis:
-        optional: true
-      sql.js:
-        optional: true
-      sqlite3:
-        optional: true
-      typeorm-aurora-data-api-driver:
+      node-gyp:
         optional: true
     dependencies:
-      '@sqltools/formatter': 1.2.5
-      app-root-path: 3.1.0
-      buffer: 6.0.3
-      chalk: 4.1.2
-      cli-highlight: 2.1.11
-      debug: 4.3.4(supports-color@8.1.1)
-      dotenv: 8.6.0
-      glob: 7.2.3
-      ioredis: 4.28.5
-      js-yaml: 4.1.0
-      mkdirp: 1.0.4
-      mysql2: 2.3.3
-      pg: 8.8.0
-      reflect-metadata: 0.1.13
-      sha.js: 2.4.11
-      sqlite3: 5.1.6
-      tslib: 2.5.0
-      uuid: 8.3.2
-      xml2js: 0.5.0
-      yargs: 17.6.2
-      zen-observable-ts: 1.1.0
+      bindings: 1.5.0
+      node-addon-api: 7.1.0
+      prebuild-install: 7.1.1
+      tar: 6.2.1
+    optionalDependencies:
+      node-gyp: 8.4.1
     transitivePeerDependencies:
+      - bluebird
       - supports-color
     dev: false
 
-  /typeorm@0.3.12(ioredis@5.2.4)(mysql2@2.3.3)(pg@8.8.0)(sqlite3@5.1.6)(ts-node@10.9.1):
-    resolution: {integrity: sha512-sYSxBmCf1nJLLTcYtwqZ+lQIRtLPyUoO93rHTOKk9vJCyT4UfRtU7oRsJvfvKP3nnZTD1hzz2SEy2zwPEN6OyA==}
-    engines: {node: '>= 12.9.0'}
-    hasBin: true
-    peerDependencies:
-      '@google-cloud/spanner': ^5.18.0
-      '@sap/hana-client': ^2.12.25
-      better-sqlite3: ^7.1.2 || ^8.0.0
-      hdb-pool: ^0.1.6
-      ioredis: ^5.0.4
-      mongodb: ^3.6.0
-      mssql: ^7.3.0
-      mysql2: ^2.2.5 || ^3.0.1
-      oracledb: ^5.1.0
-      pg: ^8.5.1
-      pg-native: ^3.0.0
-      pg-query-stream: ^4.0.0
-      redis: ^3.1.1 || ^4.0.0
-      sql.js: ^1.4.0
-      sqlite3: ^5.0.3
-      ts-node: ^10.7.0
-      typeorm-aurora-data-api-driver: ^2.0.0
-    peerDependenciesMeta:
-      '@google-cloud/spanner':
-        optional: true
-      '@sap/hana-client':
-        optional: true
-      better-sqlite3:
-        optional: true
-      hdb-pool:
-        optional: true
-      ioredis:
-        optional: true
-      mongodb:
-        optional: true
-      mssql:
-        optional: true
-      mysql2:
-        optional: true
-      oracledb:
-        optional: true
-      pg:
-        optional: true
-      pg-native:
-        optional: true
-      pg-query-stream:
-        optional: true
-      redis:
-        optional: true
-      sql.js:
-        optional: true
-      sqlite3:
-        optional: true
-      ts-node:
-        optional: true
-      typeorm-aurora-data-api-driver:
-        optional: true
+  /sqlstring@2.3.3:
+    resolution: {integrity: sha512-qC9iz2FlN7DQl3+wjwn3802RTyjCx7sDvfQEXchwa6CWOx07/WVfh91gBmQ9fahw8snwGEWU3xGzOt4tFyHLxg==}
+    engines: {node: '>= 0.6'}
+    dev: false
+
+  /sse-channel@4.0.0:
+    resolution: {integrity: sha512-I539Tc0gyDTQ2QCSg4v78Flxo/UbqR9x7JoyPcqaPtwo+qzeOw/fF+aPSbk0xTvBQAAAZk7Dlkc8K1bum5GUnw==}
+    dev: false
+
+  /ssh2-sftp-client@7.2.3:
+    resolution: {integrity: sha512-Bmq4Uewu3e0XOwu5bnPbiS5KRQYv+dff5H6+85V4GZrPrt0Fkt1nUH+uXanyAkoNxUpzjnAPEEoLdOaBO9c3xw==}
+    engines: {node: '>=10.24.1'}
     dependencies:
-      '@sqltools/formatter': 1.2.5
-      app-root-path: 3.1.0
-      buffer: 6.0.3
-      chalk: 4.1.2
-      cli-highlight: 2.1.11
-      date-fns: 2.29.3
-      debug: 4.3.4(supports-color@8.1.1)
-      dotenv: 16.0.3
-      glob: 8.1.0
-      ioredis: 5.2.4
-      js-yaml: 4.1.0
-      mkdirp: 2.1.3
-      mysql2: 2.3.3
-      pg: 8.8.0
-      reflect-metadata: 0.1.13
-      sha.js: 2.4.11
-      sqlite3: 5.1.6
-      ts-node: 10.9.1(@types/node@16.18.12)(typescript@5.0.3)
-      tslib: 2.5.0
-      uuid: 9.0.0
-      xml2js: 0.5.0
-      yargs: 17.6.2
-    transitivePeerDependencies:
-      - supports-color
+      concat-stream: 2.0.0
+      promise-retry: 2.0.1
+      ssh2: 1.11.0
     dev: false
 
-  /typescript@5.0.3:
-    resolution: {integrity: sha512-xv8mOEDnigb/tN9PSMTwSEqAnUvkoXMQlicOb0IUVDBSQCgBSaAAROUZYy2IcUy5qU6XajK5jjjO7TMWqBTKZA==}
-    engines: {node: '>=12.20'}
+  /ssh2@1.11.0:
+    resolution: {integrity: sha512-nfg0wZWGSsfUe/IBJkXVll3PEZ//YH2guww+mP88gTpuSU4FtZN7zu9JoeTGOyCNx2dTDtT9fOpWwlzyj4uOOw==}
+    engines: {node: '>=10.16.0'}
+    dependencies:
+      asn1: 0.2.6
+      bcrypt-pbkdf: 1.0.2
+    optionalDependencies:
+      cpu-features: 0.0.4
+      nan: 2.17.0
+    dev: false
+
+  /sshpk@1.17.0:
+    resolution: {integrity: sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==}
+    engines: {node: '>=0.10.0'}
     hasBin: true
+    dependencies:
+      asn1: 0.2.6
+      assert-plus: 1.0.0
+      bcrypt-pbkdf: 1.0.2
+      dashdash: 1.14.1
+      ecc-jsbn: 0.1.2
+      getpass: 0.1.7
+      jsbn: 0.1.1
+      safer-buffer: 2.1.2
+      tweetnacl: 0.14.5
 
-  /uc.micro@1.0.6:
-    resolution: {integrity: sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==}
+  /ssri@8.0.1:
+    resolution: {integrity: sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==}
+    engines: {node: '>= 8'}
+    dependencies:
+      minipass: 3.3.6
+    dev: false
+    optional: true
+
+  /stack-trace@0.0.10:
+    resolution: {integrity: sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==}
     dev: false
 
-  /ufo@1.0.1:
-    resolution: {integrity: sha512-boAm74ubXHY7KJQZLlXrtMz52qFvpsbOxDcZOnw/Wf+LS4Mmyu7JxmzD4tDLtUQtmZECypJ0FrCz4QIe6dvKRA==}
+  /stack-utils@2.0.6:
+    resolution: {integrity: sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==}
+    engines: {node: '>=10'}
+    dependencies:
+      escape-string-regexp: 2.0.0
+
+  /stackback@0.0.2:
+    resolution: {integrity: sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==}
     dev: true
 
-  /uglify-js@3.17.4:
-    resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==}
-    engines: {node: '>=0.8.0'}
+  /standard-as-callback@2.1.0:
+    resolution: {integrity: sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A==}
+
+  /start-server-and-test@2.0.3:
+    resolution: {integrity: sha512-QsVObjfjFZKJE6CS6bSKNwWZCKBG6975/jKRPPGFfFh+yOQglSeGXiNWjzgQNXdphcBI9nXbyso9tPfX4YAUhg==}
+    engines: {node: '>=16'}
     hasBin: true
-    optional: true
+    dependencies:
+      arg: 5.0.2
+      bluebird: 3.7.2
+      check-more-types: 2.24.0
+      debug: 4.3.4(supports-color@8.1.1)
+      execa: 5.1.1
+      lazy-ass: 1.6.0
+      ps-tree: 1.2.0
+      wait-on: 7.2.0(debug@4.3.4)
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
 
-  /uid-safe@2.1.5:
-    resolution: {integrity: sha512-KPHm4VL5dDXKz01UuEd88Df+KzynaohSL9fBh096KWAxSKZQDI2uBrVqtvRM4rwrIrRRKsdLNML/lnaaVSRioA==}
-    engines: {node: '>= 0.8'}
+  /static-eval@2.0.2:
+    resolution: {integrity: sha512-N/D219Hcr2bPjLxPiV+TQE++Tsmrady7TqAJugLy7Xk1EumfDWS/f5dtBbkRCGE7wKKXuYockQoj8Rm2/pVKyg==}
     dependencies:
-      random-bytes: 1.0.0
+      escodegen: 1.14.3
     dev: false
 
-  /unbox-primitive@1.0.2:
-    resolution: {integrity: sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==}
-    dependencies:
-      call-bind: 1.0.2
-      has-bigints: 1.0.2
-      has-symbols: 1.0.3
-      which-boxed-primitive: 1.0.2
+  /statuses@2.0.1:
+    resolution: {integrity: sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==}
+    engines: {node: '>= 0.8'}
+
+  /std-env@3.6.0:
+    resolution: {integrity: sha512-aFZ19IgVmhdB2uX599ve2kE6BIE3YMnQ6Gp6BURhW/oIzpXGKr878TQfAQZn1+i0Flcc/UKUy1gOlcfaUBCryg==}
+    dev: true
 
-  /unc-path-regex@0.1.2:
-    resolution: {integrity: sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==}
+  /stealthy-require@1.1.1:
+    resolution: {integrity: sha512-ZnWpYnYugiOVEY5GkcuJK1io5V8QmNYChG62gSit9pQVGErXtrKuPC55ITaVSukmMta5qpMU7vqLt2Lnni4f/g==}
     engines: {node: '>=0.10.0'}
+    dev: false
 
-  /undefsafe@2.0.5:
-    resolution: {integrity: sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==}
+  /stickyfill@1.1.1:
+    resolution: {integrity: sha512-GCp7vHAfpao+Qh/3Flh9DXEJ/qSi0KJwJw6zYlZOtRYXWUIpMM6mC2rIep/dK8RQqwW0KxGJIllmjPIBOGN8AA==}
     dev: true
 
-  /underscore@1.12.1:
-    resolution: {integrity: sha512-hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw==}
+  /stop-iteration-iterator@1.0.0:
+    resolution: {integrity: sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      internal-slot: 1.0.5
+
+  /stoppable@1.1.0:
+    resolution: {integrity: sha512-KXDYZ9dszj6bzvnEMRYvxgeTHU74QBFL54XKtP3nyMuJ81CFYtABZ3bAzL2EdFUaEwJOBOgENyFj3R7oTzDyyw==}
+    engines: {node: '>=4', npm: '>=6'}
     dev: false
 
-  /undertaker-registry@1.0.1:
-    resolution: {integrity: sha512-UR1khWeAjugW3548EfQmL9Z7pGMlBgXteQpr1IZeZBtnkCJQJIJ1Scj0mb9wQaPvUZ9Q17XqW6TIaPchJkyfqw==}
-    engines: {node: '>= 0.10'}
+  /store2@2.14.2:
+    resolution: {integrity: sha512-siT1RiqlfQnGqgT/YzXVUNsom9S0H1OX+dpdGN1xkyYATo4I6sep5NmsRD/40s3IIOvlCq6akxkqG82urIZW1w==}
     dev: true
 
-  /undertaker@1.3.0:
-    resolution: {integrity: sha512-/RXwi5m/Mu3H6IHQGww3GNt1PNXlbeCuclF2QYR14L/2CHPz3DFZkvB5hZ0N/QUkiXWCACML2jXViIQEQc2MLg==}
-    engines: {node: '>= 0.10'}
+  /storybook@8.0.0(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-ZWfFoKLsZ7kYgqcVgDeUZpN89cxzEx2Mw9afhfMNzwSnjhx9xRdzdNvK7DY1nDnfborxzBhkvwYf/oxRbifKuw==}
+    hasBin: true
     dependencies:
-      arr-flatten: 1.1.0
-      arr-map: 2.0.2
-      bach: 1.2.0
-      collection-map: 1.0.0
-      es6-weak-map: 2.0.3
-      fast-levenshtein: 1.1.4
-      last-run: 1.1.1
-      object.defaults: 1.1.0
-      object.reduce: 1.0.1
-      undertaker-registry: 1.0.1
+      '@storybook/cli': 8.0.0(react-dom@18.2.0)(react@18.2.0)
+    transitivePeerDependencies:
+      - '@babel/preset-env'
+      - bufferutil
+      - encoding
+      - react
+      - react-dom
+      - supports-color
+      - utf-8-validate
     dev: true
 
-  /undici@5.21.0:
-    resolution: {integrity: sha512-HOjK8l6a57b2ZGXOcUsI5NLfoTrfmbOl90ixJDl0AEFG4wgHNDQxtZy15/ZQp7HhjkpaGlp/eneMgtsu1dIlUA==}
-    engines: {node: '>=12.18'}
+  /stream-browserify@3.0.0:
+    resolution: {integrity: sha512-H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA==}
     dependencies:
-      busboy: 1.6.0
+      inherits: 2.0.4
+      readable-stream: 3.6.0
     dev: false
 
-  /unescape@1.0.1:
-    resolution: {integrity: sha512-O0+af1Gs50lyH1nUu3ZyYS1cRh01Q/kUKatTOkSs7jukXE6/NebucDVxyiDsA9AQ4JC1V1jUH9EO8JX2nMDgGQ==}
-    engines: {node: '>=0.10.0'}
+  /stream-combiner@0.0.4:
+    resolution: {integrity: sha512-rT00SPnTVyRsaSz5zgSPma/aHSOic5U1prhYdRy5HS2kTZviFpmDgzilbtsJsxiroqACmayynDN/9VzIbX5DOw==}
+    dependencies:
+      duplexer: 0.1.2
+    dev: true
+
+  /stream-events@1.0.5:
+    resolution: {integrity: sha512-E1GUzBSgvct8Jsb3v2X15pjzN1tYebtbLaMg+eBOUOAxgbLoSbT2NS91ckc5lJD1KfLjId+jXJRgo0qnV5Nerg==}
     dependencies:
-      extend-shallow: 2.0.1
+      stubs: 3.0.0
     dev: false
 
-  /unfetch@4.2.0:
-    resolution: {integrity: sha512-F9p7yYCn6cIW9El1zi0HI6vqpeIvBsr3dSuRO6Xuppb1u5rXpCPmMvLSyECLhybr9isec8Ohl0hPekMVrEinDA==}
-    dev: true
+  /stream-shift@1.0.1:
+    resolution: {integrity: sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==}
 
-  /unicode-canonical-property-names-ecmascript@2.0.0:
-    resolution: {integrity: sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==}
+  /streamsearch@1.1.0:
+    resolution: {integrity: sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==}
+    engines: {node: '>=10.0.0'}
+    dev: false
+
+  /strftime@0.10.2:
+    resolution: {integrity: sha512-Y6IZaTVM80chcMe7j65Gl/0nmlNdtt+KWPle5YeCAjmsBfw+id2qdaJ5MDrxUq+OmHKab+jHe7mUjU/aNMSZZg==}
+    engines: {node: '>=0.2.0'}
+    dev: false
+
+  /strict-event-emitter-types@2.0.0:
+    resolution: {integrity: sha512-Nk/brWYpD85WlOgzw5h173aci0Teyv8YdIAEtV+N88nDB0dLlazZyJMIsN6eo1/AR61l+p6CJTG1JIyFaoNEEA==}
+    dev: false
+
+  /strict-uri-encode@2.0.0:
+    resolution: {integrity: sha512-QwiXZgpRcKkhTj2Scnn++4PKtWsH0kpzZ62L2R6c/LUVYv7hVnZqcg2+sMuT6R7Jusu1vviK/MFsu6kNJfWlEQ==}
     engines: {node: '>=4'}
+    dev: false
+
+  /string-argv@0.3.1:
+    resolution: {integrity: sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==}
+    engines: {node: '>=0.6.19'}
     dev: true
 
-  /unicode-match-property-ecmascript@2.0.0:
-    resolution: {integrity: sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==}
-    engines: {node: '>=4'}
+  /string-length@4.0.2:
+    resolution: {integrity: sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==}
+    engines: {node: '>=10'}
     dependencies:
-      unicode-canonical-property-names-ecmascript: 2.0.0
-      unicode-property-aliases-ecmascript: 2.1.0
-    dev: true
+      char-regex: 1.0.2
+      strip-ansi: 6.0.1
 
-  /unicode-match-property-value-ecmascript@2.1.0:
-    resolution: {integrity: sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==}
-    engines: {node: '>=4'}
-    dev: true
+  /string-width@4.2.3:
+    resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==}
+    engines: {node: '>=8'}
+    dependencies:
+      emoji-regex: 8.0.0
+      is-fullwidth-code-point: 3.0.0
+      strip-ansi: 6.0.1
 
-  /unicode-property-aliases-ecmascript@2.1.0:
-    resolution: {integrity: sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==}
-    engines: {node: '>=4'}
-    dev: true
+  /string-width@5.1.2:
+    resolution: {integrity: sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==}
+    engines: {node: '>=12'}
+    dependencies:
+      eastasianwidth: 0.2.0
+      emoji-regex: 9.2.2
+      strip-ansi: 7.1.0
 
-  /union-value@1.0.1:
-    resolution: {integrity: sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==}
-    engines: {node: '>=0.10.0'}
+  /string.prototype.startswith@1.0.0:
+    resolution: {integrity: sha512-VHhsDkuf8gsw4JNRK9cIZjYe6r7PsVUutVohaBhqYAoPaRADoQH+mMgUg7Cs/TgQeDGEvI+PzPEMOdvdsCMvpg==}
     dependencies:
-      arr-union: 3.1.0
-      get-value: 2.0.6
-      is-extendable: 0.1.1
-      set-value: 2.0.1
-    dev: true
+      define-properties: 1.2.0
+      es-abstract: 1.22.1
+    dev: false
 
-  /unique-filename@1.1.1:
-    resolution: {integrity: sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==}
+  /string.prototype.trim@1.2.7:
+    resolution: {integrity: sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==}
+    engines: {node: '>= 0.4'}
     dependencies:
-      unique-slug: 2.0.2
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-abstract: 1.22.5
     dev: false
-    optional: true
 
-  /unique-slug@2.0.2:
-    resolution: {integrity: sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==}
+  /string.prototype.trim@1.2.8:
+    resolution: {integrity: sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==}
+    engines: {node: '>= 0.4'}
     dependencies:
-      imurmurhash: 0.1.4
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-abstract: 1.22.5
+
+  /string.prototype.trimend@1.0.6:
+    resolution: {integrity: sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==}
+    dependencies:
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-abstract: 1.22.5
     dev: false
-    optional: true
 
-  /unique-stream@2.3.1:
-    resolution: {integrity: sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==}
+  /string.prototype.trimend@1.0.7:
+    resolution: {integrity: sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==}
     dependencies:
-      json-stable-stringify-without-jsonify: 1.0.1
-      through2-filter: 3.0.0
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-abstract: 1.22.5
 
-  /unique-string@2.0.0:
-    resolution: {integrity: sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==}
+  /string.prototype.trimstart@1.0.6:
+    resolution: {integrity: sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==}
+    dependencies:
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-abstract: 1.22.5
+    dev: false
+
+  /string.prototype.trimstart@1.0.7:
+    resolution: {integrity: sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==}
+    dependencies:
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-abstract: 1.22.5
+
+  /string_decoder@0.10.31:
+    resolution: {integrity: sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==}
+    dev: false
+
+  /string_decoder@1.1.1:
+    resolution: {integrity: sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==}
+    dependencies:
+      safe-buffer: 5.1.2
+
+  /string_decoder@1.3.0:
+    resolution: {integrity: sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==}
+    dependencies:
+      safe-buffer: 5.2.1
+
+  /strip-ansi@6.0.1:
+    resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==}
     engines: {node: '>=8'}
     dependencies:
-      crypto-random-string: 2.0.0
+      ansi-regex: 5.0.1
+
+  /strip-ansi@7.1.0:
+    resolution: {integrity: sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==}
+    engines: {node: '>=12'}
+    dependencies:
+      ansi-regex: 6.0.1
+
+  /strip-bom@3.0.0:
+    resolution: {integrity: sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==}
+    engines: {node: '>=4'}
     dev: true
 
-  /unist-util-is@4.1.0:
-    resolution: {integrity: sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg==}
+  /strip-bom@4.0.0:
+    resolution: {integrity: sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==}
+    engines: {node: '>=8'}
+
+  /strip-final-newline@2.0.0:
+    resolution: {integrity: sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==}
+    engines: {node: '>=6'}
+
+  /strip-final-newline@3.0.0:
+    resolution: {integrity: sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==}
+    engines: {node: '>=12'}
     dev: true
 
-  /unist-util-visit-parents@3.1.1:
-    resolution: {integrity: sha512-1KROIZWo6bcMrZEwiH2UrXDyalAa0uqzWCxCJj6lPOvTve2WkfgCytoDTPaMnodXh1WrXOq0haVYHj99ynJlsg==}
+  /strip-indent@3.0.0:
+    resolution: {integrity: sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==}
+    engines: {node: '>=8'}
     dependencies:
-      '@types/unist': 2.0.6
-      unist-util-is: 4.1.0
+      min-indent: 1.0.1
     dev: true
 
-  /unist-util-visit@2.0.3:
-    resolution: {integrity: sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q==}
+  /strip-json-comments@2.0.1:
+    resolution: {integrity: sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==}
+    engines: {node: '>=0.10.0'}
+    dev: false
+
+  /strip-json-comments@3.1.1:
+    resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==}
+    engines: {node: '>=8'}
+
+  /strip-literal@2.0.0:
+    resolution: {integrity: sha512-f9vHgsCWBq2ugHAkGMiiYY+AYG0D/cbloKKg0nhaaaSNsujdGIpVXCNsrJpCKr5M0f4aI31mr13UjY6GAuXCKA==}
     dependencies:
-      '@types/unist': 2.0.6
-      unist-util-is: 4.1.0
-      unist-util-visit-parents: 3.1.1
+      js-tokens: 8.0.3
     dev: true
 
-  /universalify@0.1.2:
-    resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==}
-    engines: {node: '>= 4.0.0'}
+  /strnum@1.0.5:
+    resolution: {integrity: sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA==}
+    dev: false
 
-  /universalify@0.2.0:
-    resolution: {integrity: sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==}
-    engines: {node: '>= 4.0.0'}
+  /strtok3@6.3.0:
+    resolution: {integrity: sha512-fZtbhtvI9I48xDSywd/somNqgUHl2L2cstmXCCif0itOf96jeW18MBSyrLuNicYQVkvpOxkZtkzujiTJ9LW5Jw==}
+    engines: {node: '>=10'}
+    dependencies:
+      '@tokenizer/token': 0.3.0
+      peek-readable: 4.1.0
+    dev: false
 
-  /universalify@2.0.0:
-    resolution: {integrity: sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==}
-    engines: {node: '>= 10.0.0'}
+  /stubs@3.0.0:
+    resolution: {integrity: sha512-PdHt7hHUJKxvTCgbKX9C1V/ftOcjJQgz8BZwNfV5c4B6dcGqlpelTbJ999jBGZ2jYiPAwcX5dP6oBwVlBlUbxw==}
+    dev: false
 
-  /unpipe@1.0.0:
-    resolution: {integrity: sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==}
-    engines: {node: '>= 0.8'}
+  /style-mod@4.0.0:
+    resolution: {integrity: sha512-OPhtyEjyyN9x3nhPsu76f52yUGXiZcgvsrFVtvTkyGRQJ0XK+GPc6ov1z+lRpbeabka+MYEQxOYRnt5nF30aMw==}
+    dev: false
+
+  /style-mod@4.1.0:
+    resolution: {integrity: sha512-Ca5ib8HrFn+f+0n4N4ScTIA9iTOQ7MaGS1ylHcoVqW9J7w2w8PzN6g9gKmTYgGEBH8e120+RCmhpje6jC5uGWA==}
+    dev: false
+
+  /styled-components@6.1.8(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-PQ6Dn+QxlWyEGCKDS71NGsXoVLKfE1c3vApkvDYS5KAK+V8fNWGhbSUEo9Gg2iaID2tjLXegEW3bZDUGpofRWw==}
+    engines: {node: '>= 16'}
+    peerDependencies:
+      react: '>= 16.8.0'
+      react-dom: '>= 16.8.0'
+    dependencies:
+      '@emotion/is-prop-valid': 1.2.1
+      '@emotion/unitless': 0.8.0
+      '@types/stylis': 4.2.0
+      css-to-react-native: 3.2.0
+      csstype: 3.1.2
+      postcss: 8.4.31
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
+      shallowequal: 1.1.0
+      stylis: 4.3.1
+      tslib: 2.6.2
+    dev: true
+
+  /stylehacks@6.0.1(postcss@8.4.32):
+    resolution: {integrity: sha512-jTqG2aIoX2fYg0YsGvqE4ooE/e75WmaEjnNiP6Ag7irLtHxML8NJRxRxS0HyDpde8DRGuEXTFVHVfR5Tmbxqzg==}
+    engines: {node: ^14 || ^16 || >=18.0}
+    peerDependencies:
+      postcss: ^8.4.31
+    dependencies:
+      browserslist: 4.23.0
+      postcss: 8.4.32
+      postcss-selector-parser: 6.0.13
+    dev: true
+
+  /stylis@4.3.1:
+    resolution: {integrity: sha512-EQepAV+wMsIaGVGX1RECzgrcqRRU/0sYOHkeLsZ3fzHaHXZy4DaOOX0vOlGQdlsjkh3mFHAIlVimpwAs4dslyQ==}
+    dev: true
+
+  /superagent@8.1.2:
+    resolution: {integrity: sha512-6WTxW1EB6yCxV5VFOIPQruWGHqc3yI7hEmZK6h+pyk69Lk/Ut7rLUY6W/ONF2MjBuGjvmMiIpsrVJ2vjrHlslA==}
+    engines: {node: '>=6.4.0 <13 || >=14'}
+    dependencies:
+      component-emitter: 1.3.0
+      cookiejar: 2.1.4
+      debug: 4.3.4(supports-color@8.1.1)
+      fast-safe-stringify: 2.1.1
+      form-data: 4.0.0
+      formidable: 3.5.1
+      methods: 1.1.2
+      mime: 2.6.0
+      qs: 6.11.0
+      semver: 7.6.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
 
-  /unplugin@0.10.2:
-    resolution: {integrity: sha512-6rk7GUa4ICYjae5PrAllvcDeuT8pA9+j5J5EkxbMFaV+SalHhxZ7X2dohMzu6C3XzsMT+6jwR/+pwPNR3uK9MA==}
+  /supertest@6.3.4:
+    resolution: {integrity: sha512-erY3HFDG0dPnhw4U+udPfrzXa4xhSG+n4rxfRuZWCUvjFWwKl+OxWf/7zk50s84/fAAs7vf5QAb9uRa0cCykxw==}
+    engines: {node: '>=6.4.0'}
     dependencies:
-      acorn: 8.8.1
-      chokidar: 3.5.2
-      webpack-sources: 3.2.3
-      webpack-virtual-modules: 0.4.6
+      methods: 1.1.2
+      superagent: 8.1.2
+    transitivePeerDependencies:
+      - supports-color
     dev: true
 
-  /unplugin@1.0.1:
-    resolution: {integrity: sha512-aqrHaVBWW1JVKBHmGo33T5TxeL0qWzfvjWokObHA9bYmN7eNDkwOxmLjhioHl9878qDFMAaT51XNroRyuz7WxA==}
+  /supports-color@5.5.0:
+    resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==}
+    engines: {node: '>=4'}
     dependencies:
-      acorn: 8.8.1
-      chokidar: 3.5.2
-      webpack-sources: 3.2.3
-      webpack-virtual-modules: 0.5.0
-    dev: true
+      has-flag: 3.0.0
 
-  /unset-value@1.0.0:
-    resolution: {integrity: sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==}
-    engines: {node: '>=0.10.0'}
+  /supports-color@7.2.0:
+    resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==}
+    engines: {node: '>=8'}
     dependencies:
-      has-value: 0.3.1
-      isobject: 3.0.1
-    dev: true
+      has-flag: 4.0.0
 
-  /untildify@4.0.0:
-    resolution: {integrity: sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==}
+  /supports-color@8.1.1:
+    resolution: {integrity: sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==}
+    engines: {node: '>=10'}
+    dependencies:
+      has-flag: 4.0.0
+
+  /supports-hyperlinks@2.3.0:
+    resolution: {integrity: sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==}
     engines: {node: '>=8'}
-    dev: true
+    dependencies:
+      has-flag: 4.0.0
+      supports-color: 7.2.0
+    dev: false
 
-  /update-browserslist-db@1.0.10(browserslist@4.21.4):
-    resolution: {integrity: sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==}
+  /supports-preserve-symlinks-flag@1.0.0:
+    resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==}
+    engines: {node: '>= 0.4'}
+
+  /svgo@3.1.0:
+    resolution: {integrity: sha512-R5SnNA89w1dYgNv570591F66v34b3eQShpIBcQtZtM5trJwm1VvxbIoMpRYY3ybTAutcKTLEmTsdnaknOHbiQA==}
+    engines: {node: '>=14.0.0'}
     hasBin: true
-    peerDependencies:
-      browserslist: '>= 4.21.0'
     dependencies:
-      browserslist: 4.21.4
-      escalade: 3.1.1
+      '@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.0
     dev: true
 
-  /upper-case-first@2.0.2:
-    resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
-    dependencies:
-      tslib: 2.5.0
+  /swagger-ui-dist@5.11.0:
+    resolution: {integrity: sha512-j0PIATqQSEFGOLmiJOJZj1X1Jt6bFIur3JpY7+ghliUnfZs0fpWDdHEkn9q7QUlBtKbkn6TepvSxTqnE8l3s0A==}
+    dev: false
 
-  /upper-case@2.0.2:
-    resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
+  /swagger-ui-express@5.0.0(express@4.19.2):
+    resolution: {integrity: sha512-tsU9tODVvhyfkNSvf03E6FAk+z+5cU3lXAzMy6Pv4av2Gt2xA0++fogwC4qo19XuFf6hdxevPuVCSKFuMHJhFA==}
+    engines: {node: '>= v0.10.32'}
+    peerDependencies:
+      express: '>=4.0.0 || >=5.0.0-beta'
     dependencies:
-      tslib: 2.5.0
+      express: 4.19.2
+      swagger-ui-dist: 5.11.0
     dev: false
 
-  /uri-js@4.4.1:
-    resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}
+  /swagger2openapi@7.0.8:
+    resolution: {integrity: sha512-upi/0ZGkYgEcLeGieoz8gT74oWHA0E7JivX7aN9mAf+Tc7BQoRBvnIGHoPDw+f9TXTW4s6kGYCZJtauP6OYp7g==}
+    hasBin: true
     dependencies:
-      punycode: 2.2.0
+      call-me-maybe: 1.0.1
+      node-fetch: 2.7.0(encoding@0.1.13)
+      node-fetch-h2: 2.3.0
+      node-readfiles: 0.2.0
+      oas-kit-common: 1.0.8
+      oas-resolver: 2.5.6
+      oas-schema-walker: 1.1.5
+      oas-validator: 5.0.8
+      reftools: 1.1.9
+      yaml: 1.10.2
+      yargs: 17.7.2
+    transitivePeerDependencies:
+      - encoding
 
-  /urix@0.1.0:
-    resolution: {integrity: sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==}
-    deprecated: Please see https://github.com/lydell/urix#deprecated
+  /symbol-tree@3.2.4:
+    resolution: {integrity: sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==}
     dev: true
 
-  /url-parse@1.5.10:
-    resolution: {integrity: sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==}
+  /synckit@0.8.8:
+    resolution: {integrity: sha512-HwOKAP7Wc5aRGYdKH+dw0PRRpbO841v2DENBtjnR5HFWoiNByAl7vrx3p0G/rCyYXQsrxqtX48TImFtPcIHSpQ==}
+    engines: {node: ^14.18.0 || >=16.0.0}
     dependencies:
-      querystringify: 2.2.0
-      requires-port: 1.0.0
+      '@pkgr/core': 0.1.1
+      tslib: 2.6.2
+    dev: true
 
-  /url-pattern@1.0.3:
-    resolution: {integrity: sha512-uQcEj/2puA4aq1R3A2+VNVBgaWYR24FdWjl7VNW83rnWftlhyzOZ/tBjezRiC2UkIzuxC8Top3IekN3vUf1WxA==}
-    engines: {node: '>=0.12.0'}
+  /syslog-client@1.1.1:
+    resolution: {integrity: sha512-c3qKw8JzCuHt0mwrzKQr8eqOc3RB28HgOpFuwGMO3GLscVpfR+0ECevWLZq/yIJTbx3WTb3QXBFVpTFtKAPDrw==}
     dev: false
 
-  /url-value-parser@2.2.0:
-    resolution: {integrity: sha512-yIQdxJpgkPamPPAPuGdS7Q548rLhny42tg8d4vyTNzFqvOnwqrgHXvgehT09U7fwrzxi3RxCiXjoNUNnNOlQ8A==}
-    engines: {node: '>=6.0.0'}
-    dev: false
+  /tapable@2.2.1:
+    resolution: {integrity: sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==}
+    engines: {node: '>=6'}
+    dev: true
 
-  /url@0.10.3:
-    resolution: {integrity: sha512-hzSUW2q06EqL1gKM/a+obYHLIO6ct2hwPuviqTTOcfFVc61UbfJ2Q32+uGL/HCPxKqrdGB5QUwIe7UqlDgwsOQ==}
+  /tar-fs@2.1.1:
+    resolution: {integrity: sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==}
     dependencies:
-      punycode: 1.3.2
-      querystring: 0.2.0
-    dev: false
+      chownr: 1.1.4
+      mkdirp-classic: 0.5.3
+      pump: 3.0.0
+      tar-stream: 2.2.0
 
-  /urllib@2.39.1:
-    resolution: {integrity: sha512-c3sLtY8uhc/WoyJt/nNcEwO4fFC9sFYMQmU5NKoUz9OqUYrPSbYFPflocZCA5oCTavky9weK+YA2EHjsva9AwQ==}
-    engines: {node: '>= 0.10.0'}
+  /tar-stream@2.2.0:
+    resolution: {integrity: sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==}
+    engines: {node: '>=6'}
     dependencies:
-      any-promise: 1.3.0
-      content-type: 1.0.4
-      debug: 2.6.9
-      default-user-agent: 1.0.0
-      digest-header: 0.0.1
-      ee-first: 1.1.1
-      formstream: 1.1.1
-      humanize-ms: 1.2.1
-      iconv-lite: 0.4.24
-      ip: 1.1.8
-      proxy-agent: 5.0.0
-      pump: 3.0.0
-      qs: 6.11.0
-      statuses: 1.5.0
-      utility: 1.17.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
+      bl: 4.1.0
+      end-of-stream: 1.4.4
+      fs-constants: 1.0.0
+      inherits: 2.0.4
+      readable-stream: 3.6.0
 
-  /use-resize-observer@9.1.0(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-R25VqO9Wb3asSD4eqtcxk8sJalvIOYBqS8MNZlpDSQ4l4xMQxC/J7Id9HoTqPq8FwULIn0PVW+OAqF2dyYbjow==}
-    peerDependencies:
-      react: 16.8.0 - 18
-      react-dom: 16.8.0 - 18
+  /tar@6.2.1:
+    resolution: {integrity: sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==}
+    engines: {node: '>=10'}
     dependencies:
-      '@juggle/resize-observer': 3.4.0
-      react: 17.0.2
-      react-dom: 18.2.0(react@17.0.2)
-    dev: true
+      chownr: 2.0.0
+      fs-minipass: 2.1.0
+      minipass: 5.0.0
+      minizlib: 2.1.2
+      mkdirp: 1.0.4
+      yallist: 4.0.0
 
-  /use@3.1.1:
-    resolution: {integrity: sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  /tarn@3.0.2:
+    resolution: {integrity: sha512-51LAVKUSZSVfI05vjPESNc5vwqqZpbXCsU+/+wxlOrUjk2SnFTt97v9ZgQrD4YmxYW1Px6w2KjaDitCfkvgxMQ==}
+    engines: {node: '>=8.0.0'}
 
-  /utf7@1.0.2:
-    resolution: {integrity: sha512-qQrPtYLLLl12NF4DrM9CvfkxkYI97xOb5dsnGZHE3teFr0tWiEZ9UdgMPczv24vl708cYMpe6mGXGHrotIp3Bw==}
+  /tdigest@0.1.2:
+    resolution: {integrity: sha512-+G0LLgjjo9BZX2MfdvPfH+MKLCrxlXSYec5DaPYP1fe6Iyhf0/fSmJ0bFiZ1F8BT6cGXl2LpltQptzjXKWEkKA==}
     dependencies:
-      semver: 5.3.0
-    dev: false
-
-  /utf8@2.1.2:
-    resolution: {integrity: sha512-QXo+O/QkLP/x1nyi54uQiG0XrODxdysuQvE5dtVqv7F5K2Qb6FsN+qbr6KhF5wQ20tfcV3VQp0/2x1e1MRSPWg==}
+      bintrees: 1.0.2
     dev: false
 
-  /util-deprecate@1.0.2:
-    resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
-
-  /util.promisify@1.1.1:
-    resolution: {integrity: sha512-/s3UsZUrIfa6xDhr7zZhnE9SLQ5RIXyYfiVnMMyMDzOc8WhWN4Nbh36H842OyurKbCDAesZOJaVyvmSl6fhGQw==}
+  /tedious@16.7.1:
+    resolution: {integrity: sha512-NmedZS0NJiTv3CoYnf1FtjxIDUgVYzEmavrc8q2WHRb+lP4deI9BpQfmNnBZZaWusDbP5FVFZCcvzb3xOlNVlQ==}
+    engines: {node: '>=16'}
     dependencies:
-      call-bind: 1.0.2
-      define-properties: 1.1.4
-      for-each: 0.3.3
-      has-symbols: 1.0.3
-      object.getownpropertydescriptors: 2.1.4
+      '@azure/identity': 3.4.2
+      '@azure/keyvault-keys': 4.6.0
+      '@js-joda/core': 5.6.1
+      bl: 6.0.12
+      es-aggregate-error: 1.0.12
+      iconv-lite: 0.6.3
+      js-md4: 0.3.2
+      jsbi: 4.3.0
+      native-duplexpair: 1.0.0
+      node-abort-controller: 3.1.1
+      sprintf-js: 1.1.2
+    transitivePeerDependencies:
+      - supports-color
     dev: false
 
-  /util@0.12.4:
-    resolution: {integrity: sha512-bxZ9qtSlGUWSOy9Qa9Xgk11kSslpuZwaxCg4sNIDj6FLucDab2JxnHwyNTCpHMtK1MjoQiWQ6DiUMZYbSrO+Sw==}
+  /teeny-request@8.0.3:
+    resolution: {integrity: sha512-jJZpA5He2y52yUhA7pyAGZlgQpcB+xLjcN0eUFxr9c8hP/H7uOXbBNVo/O0C/xVfJLJs680jvkFgVJEEvk9+ww==}
+    engines: {node: '>=12'}
     dependencies:
-      inherits: 2.0.4
-      is-arguments: 1.1.1
-      is-generator-function: 1.0.10
-      is-typed-array: 1.1.10
-      safe-buffer: 5.2.1
-      which-typed-array: 1.1.9
+      http-proxy-agent: 5.0.0
+      https-proxy-agent: 5.0.1
+      node-fetch: 2.7.0(encoding@0.1.13)
+      stream-events: 1.0.5
+      uuid: 9.0.1
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
     dev: false
 
-  /util@0.12.5:
-    resolution: {integrity: sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==}
+  /telejson@7.2.0:
+    resolution: {integrity: sha512-1QTEcJkJEhc8OnStBx/ILRu5J2p0GjvWsBx56bmZRqnrkdBMUe+nX92jxV+p3dB4CP6PZCdJMQJwCggkNBMzkQ==}
     dependencies:
-      inherits: 2.0.4
-      is-arguments: 1.1.1
-      is-generator-function: 1.0.10
-      is-typed-array: 1.1.10
-      which-typed-array: 1.1.9
+      memoizerific: 1.11.3
     dev: true
 
-  /utila@0.4.0:
-    resolution: {integrity: sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA==}
+  /temp-dir@2.0.0:
+    resolution: {integrity: sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg==}
+    engines: {node: '>=8'}
     dev: true
 
-  /utility@0.1.11:
-    resolution: {integrity: sha512-epFsJ71+/yC7MKMX7CM9azP31QBIQhywkiBUj74i/T3Y2TXtEor26QBkat7lGamrrNTr5CBI1imd/8F0Bmqw4g==}
-    engines: {node: '>= 0.8.0'}
+  /temp@0.8.4:
+    resolution: {integrity: sha512-s0ZZzd0BzYv5tLSptZooSjK8oj6C+c19p7Vqta9+6NPOf7r+fxq0cJe6/oN4LTC79sy5NY8ucOJNgwsKCSbfqg==}
+    engines: {node: '>=6.0.0'}
     dependencies:
-      address: 1.2.1
-    dev: false
+      rimraf: 2.6.3
+    dev: true
 
-  /utility@1.17.0:
-    resolution: {integrity: sha512-KdVkF9An/0239BJ4+dqOa7NPrPIOeQE9AGfx0XS16O9DBiHNHRJMoeU5nL6pRGAkgJOqdOu8R4gBRcXnAocJKw==}
-    engines: {node: '>= 0.12.0'}
+  /temp@0.9.4:
+    resolution: {integrity: sha512-yYrrsWnrXMcdsnu/7YMYAofM1ktpL5By7vZhf15CrXijWWrEYZks5AXBudalfSWJLlnen/QUJUB5aoB0kqZUGA==}
+    engines: {node: '>=6.0.0'}
     dependencies:
-      copy-to: 2.0.1
-      escape-html: 1.0.3
       mkdirp: 0.5.6
-      mz: 2.7.0
-      unescape: 1.0.1
-    dev: false
-
-  /utils-merge@1.0.1:
-    resolution: {integrity: sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==}
-    engines: {node: '>= 0.4.0'}
-
-  /uuencode@0.0.4:
-    resolution: {integrity: sha512-yEEhCuCi5wRV7Z5ZVf9iV2gWMvUZqKJhAs1ecFdKJ0qzbyaVelmsE3QjYAamehfp9FKLiZbKldd+jklG3O0LfA==}
+      rimraf: 2.6.3
     dev: false
 
-  /uuid-browser@3.1.0:
-    resolution: {integrity: sha512-dsNgbLaTrd6l3MMxTtouOCFw4CBFc/3a+GgYA2YyrJvyQ1u6q4pcu3ktLoUZ/VN/Aw9WsauazbgsgdfVWgAKQg==}
+  /tempy@1.0.1:
+    resolution: {integrity: sha512-biM9brNqxSc04Ee71hzFbryD11nX7VPhQQY32AdDmjFvodsRFz/3ufeoTZ6uYkRFfGo188tENcASNs3vTdsM0w==}
+    engines: {node: '>=10'}
+    dependencies:
+      del: 6.1.1
+      is-stream: 2.0.1
+      temp-dir: 2.0.0
+      type-fest: 0.16.0
+      unique-string: 2.0.0
     dev: true
 
-  /uuid@3.4.0:
-    resolution: {integrity: sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==}
-    deprecated: Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.
-    hasBin: true
-    dev: false
-
-  /uuid@8.0.0:
-    resolution: {integrity: sha512-jOXGuXZAWdsTH7eZLtyXMqUb9EcWMGZNbL9YcGBJl4MH4nrxHmZJhEHvyLFrkxo+28uLb/NYRcStH48fnD0Vzw==}
-    hasBin: true
-    dev: false
+  /terser-webpack-plugin@5.3.6(webpack@5.75.0):
+    resolution: {integrity: sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ==}
+    engines: {node: '>= 10.13.0'}
+    peerDependencies:
+      '@swc/core': '*'
+      esbuild: '*'
+      uglify-js: '*'
+      webpack: ^5.1.0
+    peerDependenciesMeta:
+      '@swc/core':
+        optional: true
+      esbuild:
+        optional: true
+      uglify-js:
+        optional: true
+    dependencies:
+      '@jridgewell/trace-mapping': 0.3.18
+      jest-worker: 27.5.1
+      schema-utils: 3.1.1
+      serialize-javascript: 6.0.2
+      terser: 5.16.1
+      webpack: 5.75.0
+    dev: true
 
-  /uuid@8.3.2:
-    resolution: {integrity: sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==}
+  /terser@5.16.1:
+    resolution: {integrity: sha512-xvQfyfA1ayT0qdK47zskQgRZeWLoOQ8JQ6mIgRGVNwZKdQMU+5FkCBjmv4QjcrTzyZquRw2FVtlJSRUmMKQslw==}
+    engines: {node: '>=10'}
     hasBin: true
+    dependencies:
+      '@jridgewell/source-map': 0.3.2
+      acorn: 8.11.2
+      commander: 2.20.3
+      source-map-support: 0.5.21
+    dev: true
 
-  /uuid@9.0.0:
-    resolution: {integrity: sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==}
-    hasBin: true
-    dev: false
+  /test-exclude@6.0.0:
+    resolution: {integrity: sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==}
+    engines: {node: '>=8'}
+    dependencies:
+      '@istanbuljs/schema': 0.1.3
+      glob: 7.2.3
+      minimatch: 3.1.2
 
-  /v-click-outside@3.2.0:
-    resolution: {integrity: sha512-QD0bDy38SHJXQBjgnllmkI/rbdiwmq9RC+/+pvrFjYJKTn8dtp7Penf9q1lLBta280fYG2q53mgLhQ+3l3z74w==}
-    engines: {node: '>=6'}
+  /text-hex@1.0.0:
+    resolution: {integrity: sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==}
     dev: false
 
-  /v8-compile-cache-lib@3.0.1:
-    resolution: {integrity: sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==}
-
-  /v8-to-istanbul@9.0.1:
-    resolution: {integrity: sha512-74Y4LqY74kLE6IFyIjPtkSTWzUZmj8tdHT9Ii/26dvQ6K9Dl2NbEfj0XgU2sHCtKgt5VupqhlO/5aWuqS+IY1w==}
-    engines: {node: '>=10.12.0'}
-    dependencies:
-      '@jridgewell/trace-mapping': 0.3.17
-      '@types/istanbul-lib-coverage': 2.0.4
-      convert-source-map: 1.9.0
+  /text-table@0.2.0:
+    resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==}
     dev: true
 
-  /v8flags@3.2.0:
-    resolution: {integrity: sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==}
-    engines: {node: '>= 0.10'}
+  /thenify-all@1.6.0:
+    resolution: {integrity: sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==}
+    engines: {node: '>=0.8'}
     dependencies:
-      homedir-polyfill: 1.0.3
-    dev: true
+      thenify: 3.3.1
+    dev: false
 
-  /validate-npm-package-license@3.0.4:
-    resolution: {integrity: sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==}
+  /thenify@3.3.1:
+    resolution: {integrity: sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==}
     dependencies:
-      spdx-correct: 3.1.1
-      spdx-expression-parse: 3.0.1
-    dev: true
-
-  /validate.io-array@1.0.6:
-    resolution: {integrity: sha512-DeOy7CnPEziggrOO5CZhVKJw6S3Yi7e9e65R1Nl/RTN1vTQKnzjfvks0/8kQ40FP/dsjRAOd4hxmJ7uLa6vxkg==}
+      any-promise: 1.3.0
     dev: false
 
-  /validate.io-function@1.0.2:
-    resolution: {integrity: sha512-LlFybRJEriSuBnUhQyG5bwglhh50EpTL2ul23MPIuR1odjO7XaMLFV8vHGwp7AZciFxtYOeiSCT5st+XSPONiQ==}
-    dev: false
+  /thirty-two@1.0.2:
+    resolution: {integrity: sha512-OEI0IWCe+Dw46019YLl6V10Us5bi574EvlJEOcAkB29IzQ/mYD1A6RyNHLjZPiHCmuodxvgF6U+vZO1L15lxVA==}
+    engines: {node: '>=0.2.6'}
+    dev: true
 
-  /validate.io-integer-array@1.0.0:
-    resolution: {integrity: sha512-mTrMk/1ytQHtCY0oNO3dztafHYyGU88KL+jRxWuzfOmQb+4qqnWmI+gykvGp8usKZOM0H7keJHEbRaFiYA0VrA==}
-    dependencies:
-      validate.io-array: 1.0.6
-      validate.io-integer: 1.0.5
-    dev: false
+  /throttleit@1.0.0:
+    resolution: {integrity: sha512-rkTVqu6IjfQ/6+uNuuc3sZek4CEYxTJom3IktzgdSxcZqdARuebbA/f4QmAxMQIxqq9ZLEUkSYqvuk1I6VKq4g==}
+    dev: true
 
-  /validate.io-integer@1.0.5:
-    resolution: {integrity: sha512-22izsYSLojN/P6bppBqhgUDjCkr5RY2jd+N2a3DCAUey8ydvrZ/OkGvFPR7qfOpwR2LC5p4Ngzxz36g5Vgr/hQ==}
+  /through2@2.0.5:
+    resolution: {integrity: sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==}
     dependencies:
-      validate.io-number: 1.0.3
-    dev: false
+      readable-stream: 2.3.7
+      xtend: 4.0.2
+    dev: true
 
-  /validate.io-number@1.0.3:
-    resolution: {integrity: sha512-kRAyotcbNaSYoDnXvb4MHg/0a1egJdLwS6oJ38TJY7aw9n93Fl/3blIXdyYvPOp55CNxywooG/3BcrwNrBpcSg==}
-    dev: false
+  /through@2.3.8:
+    resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==}
 
-  /validator@13.7.0:
-    resolution: {integrity: sha512-nYXQLCBkpJ8X6ltALua9dRrZDHVYxjJ1wgskNt1lH9fzGjs3tgojGSCBjmEPwkWS1y29+DrizMTW19Pr9uB2nw==}
-    engines: {node: '>= 0.10'}
+  /timeago.js@4.0.2:
+    resolution: {integrity: sha512-a7wPxPdVlQL7lqvitHGGRsofhdwtkoSXPGATFuSOA2i1ZNQEPLrGnj68vOp2sOJTCFAQVXPeNMX/GctBaO9L2w==}
+    dev: false
 
-  /value-or-function@3.0.0:
-    resolution: {integrity: sha512-jdBB2FrWvQC/pnPtIqcLsMaQgjhdb6B7tk1MMyTKapox+tQZbdRP4uLxu/JY0t7fbfDCUMnuelzEYv5GsxHhdg==}
-    engines: {node: '>= 0.10'}
+  /tiny-invariant@1.3.1:
+    resolution: {integrity: sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw==}
     dev: true
 
-  /vary@1.1.2:
-    resolution: {integrity: sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==}
-    engines: {node: '>= 0.8'}
+  /tiny-invariant@1.3.3:
+    resolution: {integrity: sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==}
+    dev: true
 
-  /verror@1.10.0:
-    resolution: {integrity: sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==}
-    engines: {'0': node >=0.6.0}
-    dependencies:
-      assert-plus: 1.0.0
-      core-util-is: 1.0.2
-      extsprintf: 1.3.0
+  /tinybench@2.5.1:
+    resolution: {integrity: sha512-65NKvSuAVDP/n4CqH+a9w2kTlLReS9vhsAP06MWx+/89nMinJyB2icyl58RIcqCmIggpojIGeuJGhjU1aGMBSg==}
+    dev: true
 
-  /vinyl-fs@3.0.3:
-    resolution: {integrity: sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng==}
-    engines: {node: '>= 0.10'}
-    dependencies:
-      fs-mkdirp-stream: 1.0.0
-      glob-stream: 6.1.0
-      graceful-fs: 4.2.10
-      is-valid-glob: 1.0.0
-      lazystream: 1.0.1
-      lead: 1.0.0
-      object.assign: 4.1.4
-      pumpify: 1.5.1
-      readable-stream: 2.3.7
-      remove-bom-buffer: 3.0.0
-      remove-bom-stream: 1.2.0
-      resolve-options: 1.1.0
-      through2: 2.0.5
-      to-through: 2.0.0
-      value-or-function: 3.0.0
-      vinyl: 2.2.1
-      vinyl-sourcemap: 1.1.0
+  /tinypool@0.8.2:
+    resolution: {integrity: sha512-SUszKYe5wgsxnNOVlBYO6IC+8VGWdVGZWAqUxp3UErNBtptZvWbwyUOyzNL59zigz2rCA92QiL3wvG+JDSdJdQ==}
+    engines: {node: '>=14.0.0'}
     dev: true
 
-  /vinyl-sourcemap@1.1.0:
-    resolution: {integrity: sha512-NiibMgt6VJGJmyw7vtzhctDcfKch4e4n9TBeoWlirb7FMg9/1Ov9k+A5ZRAtywBpRPiyECvQRQllYM8dECegVA==}
-    engines: {node: '>= 0.10'}
-    dependencies:
-      append-buffer: 1.0.2
-      convert-source-map: 1.9.0
-      graceful-fs: 4.2.10
-      normalize-path: 2.1.1
-      now-and-later: 2.0.1
-      remove-bom-buffer: 3.0.0
-      vinyl: 2.2.1
+  /tinyspy@2.2.0:
+    resolution: {integrity: sha512-d2eda04AN/cPOR89F7Xv5bK/jrQEhmcLFe6HFldoeO9AJtps+fqEnh486vnT/8y4bw38pSyxDcTCAq+Ks2aJTg==}
+    engines: {node: '>=14.0.0'}
     dev: true
 
-  /vinyl@2.2.1:
-    resolution: {integrity: sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==}
-    engines: {node: '>= 0.10'}
+  /title-case@3.0.3:
+    resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      clone: 2.1.2
-      clone-buffer: 1.0.0
-      clone-stats: 1.0.0
-      cloneable-readable: 1.1.3
-      remove-trailing-separator: 1.1.0
-      replace-ext: 1.0.1
-    dev: true
+      tslib: 2.6.2
 
-  /vite-node@0.28.5(@types/node@16.18.12)(sass@1.55.0)(terser@5.16.1):
-    resolution: {integrity: sha512-LmXb9saMGlrMZbXTvOveJKwMTBTNUH66c8rJnQ0ZPNX+myPEol64+szRzXtV5ORb0Hb/91yq+/D3oERoyAt6LA==}
-    engines: {node: '>=v14.16.0'}
+  /tlds@1.248.0:
+    resolution: {integrity: sha512-noj0KdpWTBhwsKxMOXk0rN9otg4kTgLm4WohERRHbJ9IY+kSDKr3RmjitaQ3JFzny+DyvBOQKlFZhp0G0qNSfg==}
     hasBin: true
+    dev: false
+
+  /tmp-promise@3.0.3:
+    resolution: {integrity: sha512-RwM7MoPojPxsOBYnyd2hy0bxtIlVrihNs9pj5SUvY8Zz1sQcQG2tG1hSr8PDxfgEB8RNKDhqbIlroIarSNDNsQ==}
     dependencies:
-      cac: 6.7.14
-      debug: 4.3.4(supports-color@8.1.1)
-      mlly: 1.1.0
-      pathe: 1.1.0
-      picocolors: 1.0.0
-      source-map: 0.6.1
-      source-map-support: 0.5.21
-      vite: 4.0.4(@types/node@16.18.12)(sass@1.55.0)(terser@5.16.1)
-    transitivePeerDependencies:
-      - '@types/node'
-      - less
-      - sass
-      - stylus
-      - sugarss
-      - supports-color
-      - terser
-    dev: true
+      tmp: 0.2.1
+    dev: false
 
-  /vite-plugin-monaco-editor@1.1.0(monaco-editor@0.33.0):
-    resolution: {integrity: sha512-IvtUqZotrRoVqwT0PBBDIZPNraya3BxN/bfcNfnxZ5rkJiGcNtO5eAOWWSgT7zullIAEqQwxMU83yL9J5k7gww==}
-    peerDependencies:
-      monaco-editor: '>=0.33.0'
+  /tmp@0.0.33:
+    resolution: {integrity: sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==}
+    engines: {node: '>=0.6.0'}
     dependencies:
-      monaco-editor: 0.33.0
-    dev: true
+      os-tmpdir: 1.0.2
 
-  /vite@4.0.4(@types/node@16.18.12)(sass@1.55.0)(terser@5.16.1):
-    resolution: {integrity: sha512-xevPU7M8FU0i/80DMR+YhgrzR5KS2ORy1B4xcX/cXLsvnUWvfHuqMmVU6N0YiJ4JWGRJJsLCgjEzKjG9/GKoSw==}
-    engines: {node: ^14.18.0 || >=16.0.0}
-    hasBin: true
-    peerDependencies:
-      '@types/node': '>= 14'
-      less: '*'
-      sass: '*'
-      stylus: '*'
-      sugarss: '*'
-      terser: ^5.4.0
-    peerDependenciesMeta:
-      '@types/node':
-        optional: true
-      less:
-        optional: true
-      sass:
-        optional: true
-      stylus:
-        optional: true
-      sugarss:
-        optional: true
-      terser:
-        optional: true
+  /tmp@0.2.1:
+    resolution: {integrity: sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==}
+    engines: {node: '>=8.17.0'}
     dependencies:
-      '@types/node': 16.18.12
-      esbuild: 0.16.17
-      postcss: 8.4.21
-      resolve: 1.22.1
-      rollup: 3.10.0
-      sass: 1.55.0
-      terser: 5.16.1
-    optionalDependencies:
-      fsevents: 2.3.2
-    dev: true
+      rimraf: 3.0.2
 
-  /vitest@0.28.5(jsdom@21.1.0)(sass@1.58.0):
-    resolution: {integrity: sha512-pyCQ+wcAOX7mKMcBNkzDwEHRGqQvHUl0XnoHR+3Pb1hytAHISgSxv9h0gUiSiYtISXUU3rMrKiKzFYDrI6ZIHA==}
-    engines: {node: '>=v14.16.0'}
-    hasBin: true
-    peerDependencies:
-      '@edge-runtime/vm': '*'
-      '@vitest/browser': '*'
-      '@vitest/ui': '*'
-      happy-dom: '*'
-      jsdom: '*'
-    peerDependenciesMeta:
-      '@edge-runtime/vm':
-        optional: true
-      '@vitest/browser':
-        optional: true
-      '@vitest/ui':
-        optional: true
-      happy-dom:
-        optional: true
-      jsdom:
-        optional: true
+  /tmpl@1.0.5:
+    resolution: {integrity: sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==}
+
+  /to-fast-properties@2.0.0:
+    resolution: {integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==}
+    engines: {node: '>=4'}
+
+  /to-regex-range@5.0.1:
+    resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}
+    engines: {node: '>=8.0'}
     dependencies:
-      '@types/chai': 4.3.4
-      '@types/chai-subset': 1.3.3
-      '@types/node': 16.18.12
-      '@vitest/expect': 0.28.5
-      '@vitest/runner': 0.28.5
-      '@vitest/spy': 0.28.5
-      '@vitest/utils': 0.28.5
-      acorn: 8.8.1
-      acorn-walk: 8.2.0
-      cac: 6.7.14
-      chai: 4.3.7
-      debug: 4.3.4(supports-color@8.1.1)
-      jsdom: 21.1.0
-      local-pkg: 0.4.2
-      pathe: 1.1.0
-      picocolors: 1.0.0
-      source-map: 0.6.1
-      std-env: 3.3.2
-      strip-literal: 1.0.0
-      tinybench: 2.3.1
-      tinypool: 0.3.1
-      tinyspy: 1.0.2
-      vite: 4.0.4(@types/node@16.18.12)(sass@1.55.0)(terser@5.16.1)
-      vite-node: 0.28.5(@types/node@16.18.12)(sass@1.55.0)(terser@5.16.1)
-      why-is-node-running: 2.2.2
-    transitivePeerDependencies:
-      - less
-      - sass
-      - stylus
-      - sugarss
-      - supports-color
-      - terser
+      is-number: 7.0.0
+
+  /tocbot@4.21.0:
+    resolution: {integrity: sha512-vXk8htr8mIl3hc2s2mDkaPTBfqmqZA2o0x7eXbxUibdrpEIPdpM0L9hH/RvEvlgSM+ZTgS34sGipk5+VrLJCLA==}
     dev: true
 
-  /vitest@0.28.5(sass@1.55.0)(terser@5.16.1):
-    resolution: {integrity: sha512-pyCQ+wcAOX7mKMcBNkzDwEHRGqQvHUl0XnoHR+3Pb1hytAHISgSxv9h0gUiSiYtISXUU3rMrKiKzFYDrI6ZIHA==}
-    engines: {node: '>=v14.16.0'}
-    hasBin: true
-    peerDependencies:
-      '@edge-runtime/vm': '*'
-      '@vitest/browser': '*'
-      '@vitest/ui': '*'
-      happy-dom: '*'
-      jsdom: '*'
-    peerDependenciesMeta:
-      '@edge-runtime/vm':
-        optional: true
-      '@vitest/browser':
-        optional: true
-      '@vitest/ui':
-        optional: true
-      happy-dom:
-        optional: true
-      jsdom:
-        optional: true
-    dependencies:
-      '@types/chai': 4.3.4
-      '@types/chai-subset': 1.3.3
-      '@types/node': 16.18.12
-      '@vitest/expect': 0.28.5
-      '@vitest/runner': 0.28.5
-      '@vitest/spy': 0.28.5
-      '@vitest/utils': 0.28.5
-      acorn: 8.8.1
-      acorn-walk: 8.2.0
-      cac: 6.7.14
-      chai: 4.3.7
-      debug: 4.3.4(supports-color@8.1.1)
-      local-pkg: 0.4.2
-      pathe: 1.1.0
-      picocolors: 1.0.0
-      source-map: 0.6.1
-      std-env: 3.3.2
-      strip-literal: 1.0.0
-      tinybench: 2.3.1
-      tinypool: 0.3.1
-      tinyspy: 1.0.2
-      vite: 4.0.4(@types/node@16.18.12)(sass@1.55.0)(terser@5.16.1)
-      vite-node: 0.28.5(@types/node@16.18.12)(sass@1.55.0)(terser@5.16.1)
-      why-is-node-running: 2.2.2
-    transitivePeerDependencies:
-      - less
-      - sass
-      - stylus
-      - sugarss
-      - supports-color
-      - terser
+  /toidentifier@1.0.1:
+    resolution: {integrity: sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==}
+    engines: {node: '>=0.6'}
+
+  /token-stream@1.0.0:
+    resolution: {integrity: sha512-VSsyNPPW74RpHwR8Fc21uubwHY7wMDeJLys2IX5zJNih+OnAnaifKHo+1LHT7DAdloQ7apeaaWg8l7qnf/TnEg==}
     dev: true
 
-  /vm2@3.9.17:
-    resolution: {integrity: sha512-AqwtCnZ/ERcX+AVj9vUsphY56YANXxRuqMb7GsDtAr0m0PcQX3u0Aj3KWiXM0YAHy7i6JEeHrwOnwXbGYgRpAw==}
-    engines: {node: '>=6.0'}
-    hasBin: true
+  /token-types@4.2.1:
+    resolution: {integrity: sha512-6udB24Q737UD/SDsKAHI9FCRP7Bqc9D/MQUV02ORQg5iskjtLJlZJNdN4kKtcdtwCeWIwIHDGaUsTsCCAa8sFQ==}
+    engines: {node: '>=10'}
     dependencies:
-      acorn: 8.8.1
-      acorn-walk: 8.2.0
+      '@tokenizer/token': 0.3.0
+      ieee754: 1.2.1
     dev: false
 
-  /void-elements@3.1.0:
-    resolution: {integrity: sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w==}
-    engines: {node: '>=0.10.0'}
+  /toposort@2.0.2:
+    resolution: {integrity: sha512-0a5EOkAUp8D4moMi2W8ZF8jcga7BgZd91O/yabJCFY8az+XSzeGyTKs0Aoo897iV1Nj6guFq8orWDS96z91oGg==}
+    dev: false
+
+  /touch@3.1.0:
+    resolution: {integrity: sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==}
+    hasBin: true
+    dependencies:
+      nopt: 1.0.10
     dev: true
 
-  /vue-agile@2.0.0:
-    resolution: {integrity: sha512-5xkSLJQNRdQ7qpEnXj5FgLg33XKRHaTZKGP5qkvteOc/uGJX89MYCjPSgdNqJ1GYFGfdGAp0jvhihW8OMuXS3g==}
+  /tough-cookie@2.5.0:
+    resolution: {integrity: sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==}
+    engines: {node: '>=0.8'}
     dependencies:
-      lodash.orderby: 4.6.0
-      lodash.throttle: 4.1.1
+      psl: 1.9.0
+      punycode: 2.3.1
     dev: false
 
-  /vue-class-component@7.2.6(vue@2.7.14):
-    resolution: {integrity: sha512-+eaQXVrAm/LldalI272PpDe3+i4mPis0ORiMYxF6Ae4hyuCh15W8Idet7wPUEs4N4YptgFHGys4UrgNQOMyO6w==}
-    peerDependencies:
-      vue: ^2.0.0
+  /tough-cookie@4.1.3:
+    resolution: {integrity: sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==}
+    engines: {node: '>=6'}
     dependencies:
-      vue: 2.7.14
-    dev: true
+      psl: 1.9.0
+      punycode: 2.3.1
+      universalify: 0.2.0
+      url-parse: 1.5.10
 
-  /vue-color@2.8.1:
-    resolution: {integrity: sha512-BoLCEHisXi2QgwlhZBg9UepvzZZmi4176vbr+31Shen5WWZwSLVgdScEPcB+yrAtuHAz42309C0A4+WiL9lNBw==}
-    dependencies:
-      clamp: 1.0.1
-      lodash.throttle: 4.1.1
-      material-colors: 1.2.6
-      tinycolor2: 1.5.2
-    dev: false
+  /tr46@0.0.3:
+    resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==}
 
-  /vue-demi@0.13.11(vue@2.7.14):
-    resolution: {integrity: sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==}
+  /tr46@3.0.0:
+    resolution: {integrity: sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==}
     engines: {node: '>=12'}
-    hasBin: true
-    requiresBuild: true
-    peerDependencies:
-      '@vue/composition-api': ^1.0.0-rc.1
-      vue: ^3.0.0-0 || ^2.6.0
-    peerDependenciesMeta:
-      '@vue/composition-api':
-        optional: true
     dependencies:
-      vue: 2.7.14
-
-  /vue-docgen-api@4.56.4(vue@2.7.14):
-    resolution: {integrity: sha512-Z59qNUYZNHMZL0QITNbqobGKJgmqyOs4OiAdzr1Ug7ys1gkFBGewiuwPURTsoM2zi4GWZWy2eW4B5FevwT7gpA==}
-    dependencies:
-      '@babel/parser': 7.20.7
-      '@babel/types': 7.20.7
-      '@vue/compiler-dom': 3.2.45
-      '@vue/compiler-sfc': 3.2.45
-      ast-types: 0.14.2
-      hash-sum: 1.0.2
-      lru-cache: 4.1.5
-      pug: 3.0.2
-      recast: 0.22.0
-      ts-map: 1.0.3
-      vue-inbrowser-compiler-independent-utils: 4.56.2(vue@2.7.14)
-    transitivePeerDependencies:
-      - vue
+      punycode: 2.3.1
     dev: true
 
-  /vue-docgen-loader@1.5.1(@babel/preset-env@7.20.2)(vue-docgen-api@4.56.4)(webpack@5.75.0):
-    resolution: {integrity: sha512-coMmQYsg+fy18SVtBNU7/tztdqEyrneFfwQFLmx8O7jaJ11VZ//9tRWXlwGzJM07cPRwMHDKMlAdWrpuw3U46A==}
-    engines: {node: '>= 8.16'}
-    peerDependencies:
-      vue-docgen-api: '>=3'
-      webpack: '>=4'
+  /tr46@4.1.1:
+    resolution: {integrity: sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw==}
+    engines: {node: '>=14'}
     dependencies:
-      clone: 2.1.2
-      jscodeshift: 0.13.1(@babel/preset-env@7.20.2)
-      loader-utils: 1.4.2
-      querystring: 0.2.1
-      vue-docgen-api: 4.56.4(vue@2.7.14)
-      webpack: 5.75.0(esbuild@0.16.17)
-    transitivePeerDependencies:
-      - '@babel/preset-env'
-      - supports-color
-    dev: true
+      punycode: 2.3.1
+    dev: false
 
-  /vue-eslint-parser@7.11.0(eslint@8.39.0):
-    resolution: {integrity: sha512-qh3VhDLeh773wjgNTl7ss0VejY9bMMa0GoDG2fQVyDzRFdiU3L7fw74tWZDHNQXdZqxO3EveQroa9ct39D2nqg==}
-    engines: {node: '>=8.10'}
-    peerDependencies:
-      eslint: '>=5.0.0'
+  /tr46@5.0.0:
+    resolution: {integrity: sha512-tk2G5R2KRwBd+ZN0zaEXpmzdKyOYksXwywulIX95MBODjSzMIuQnQ3m8JxgbhnL1LeVo7lqQKsYa1O3Htl7K5g==}
+    engines: {node: '>=18'}
     dependencies:
-      debug: 4.3.4(supports-color@8.1.1)
-      eslint: 8.39.0
-      eslint-scope: 5.1.1
-      eslint-visitor-keys: 1.3.0
-      espree: 6.2.1
-      esquery: 1.4.0
-      lodash: 4.17.21
-      semver: 6.3.0
-    transitivePeerDependencies:
-      - supports-color
+      punycode: 2.3.1
     dev: true
 
-  /vue-fragment@1.5.1(vue@2.7.14):
-    resolution: {integrity: sha512-ig6eES6TcMBbANW71ylB+AJgRN+Zksb3f50AxjGpAk6hMzqmeuD80qeh4LJP0jVw2dMBMjgRUfIkrvxygoRgtQ==}
-    peerDependencies:
-      vue: ^2.5.16
+  /transliteration@2.3.5:
+    resolution: {integrity: sha512-HAGI4Lq4Q9dZ3Utu2phaWgtm3vB6PkLUFqWAScg/UW+1eZ/Tg6Exo4oC0/3VUol/w4BlefLhUUSVBr/9/ZGQOw==}
+    engines: {node: '>=6.0.0'}
+    hasBin: true
     dependencies:
-      vue: 2.7.14
+      yargs: 17.7.2
+    dev: false
+
+  /traverse@0.6.6:
+    resolution: {integrity: sha512-kdf4JKs8lbARxWdp7RKdNzoJBhGUcIalSYibuGyHJbmk40pOysQ0+QPvlkCOICOivDWU2IJo2rkrxyTK2AH4fw==}
     dev: false
 
-  /vue-hot-reload-api@2.3.4:
-    resolution: {integrity: sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog==}
+  /tree-kill@1.2.2:
+    resolution: {integrity: sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==}
+    hasBin: true
     dev: true
 
-  /vue-i18n@8.27.2(vue@2.7.14):
-    resolution: {integrity: sha512-QVzn7u2WVH8F7eSKIM00lujC7x1mnuGPaTnDTmB01Hd709jDtB9kYtBqM+MWmp5AJRx3gnqAdZbee9MelqwFBg==}
-    peerDependencies:
-      vue: ^2
-    dependencies:
-      vue: 2.7.14
+  /triple-beam@1.3.0:
+    resolution: {integrity: sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw==}
     dev: false
 
-  /vue-inbrowser-compiler-independent-utils@4.56.2(vue@2.7.14):
-    resolution: {integrity: sha512-szE2vZDSkZlItq+K4MevgvCGKt5IzM6OkIjyCuj/09ty2akixeQGNFRXyDELMdmVVzmN+9nJn02YKnoPkhXHwA==}
+  /ts-api-utils@1.0.1(typescript@5.4.2):
+    resolution: {integrity: sha512-lC/RGlPmwdrIBFTX59wwNzqh7aR2otPNPR/5brHZm/XKFYKsfqxihXUe9pU3JI+3vGkl+vyCoNNnPhJn3aLK1A==}
+    engines: {node: '>=16.13.0'}
     peerDependencies:
-      vue: '>=2'
+      typescript: ^5.4.2
     dependencies:
-      vue: 2.7.14
+      typescript: 5.4.2
+    dev: true
+
+  /ts-dedent@2.2.0:
+    resolution: {integrity: sha512-q5W7tVM71e2xjHZTlgfTDoPF/SmqKG5hddq9SzR49CH2hayqRKJtQ4mtRlSxKaJlR/+9rEM+mnBHf7I2/BQcpQ==}
+    engines: {node: '>=6.10'}
     dev: true
 
-  /vue-infinite-loading@2.4.5(vue@2.7.14):
-    resolution: {integrity: sha512-xhq95Mxun060bRnsOoLE2Be6BR7jYwuC89kDe18+GmCLVrRA/dU0jrGb12Xu6NjmKs+iTW0AA6saSEmEW4cR7g==}
+  /ts-essentials@7.0.3(typescript@5.4.2):
+    resolution: {integrity: sha512-8+gr5+lqO3G84KdiTSMRLtuyJ+nTBVRKuCrK4lidMPdVeEp0uqC875uE5NMcaA7YYMN7XsNiFQuMvasF8HT/xQ==}
     peerDependencies:
-      vue: ^2.6.10
+      typescript: ^5.4.2
     dependencies:
-      vue: 2.7.14
-    dev: false
+      typescript: 5.4.2
 
-  /vue-json-pretty@1.9.3:
-    resolution: {integrity: sha512-b13DP1WGQ+ACUU2K5hmwFfHrHnydCFSTerE7fppeYMojSWN/5EOPODQECfIIRaJ7zzHtPW9OifkThFGPyY0xRg==}
-    engines: {node: '>= 10.0.0', npm: '>= 5.0.0'}
+  /ts-ics@1.2.2(date-fns@2.30.0)(lodash@4.17.21)(zod@3.22.4):
+    resolution: {integrity: sha512-L7T5JQi99qQ2Uv7AoCHUZ8Mx1bJYo7qBZtBckuHueR90I3WVdW5NC/tOqTVgu18c3zj08du+xlgWlTIcE+Foxw==}
+    peerDependencies:
+      date-fns: ^2
+      lodash: ^4
+      zod: ^3
+    dependencies:
+      date-fns: 2.30.0
+      date-fns-tz: 2.0.0(date-fns@2.30.0)
+      lodash: 4.17.21
+      zod: 3.22.4
     dev: false
 
-  /vue-loader@15.10.1(css-loader@6.7.3)(react-dom@18.2.0)(react@17.0.2)(vue-template-compiler@2.7.14)(webpack@5.75.0):
-    resolution: {integrity: sha512-SaPHK1A01VrNthlix6h1hq4uJu7S/z0kdLUb6klubo738NeQoLbS6V9/d8Pv19tU0XdQKju3D1HSKuI8wJ5wMA==}
+  /ts-jest@29.1.1(@babel/core@7.24.0)(jest@29.6.2)(typescript@5.4.2):
+    resolution: {integrity: sha512-D6xjnnbP17cC85nliwGiL+tpoKN0StpgE0TeOjXQTU6MVCfsB4v7aW05CgQ/1OywGb0x/oy9hHFnN+sczTiRaA==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    hasBin: true
     peerDependencies:
-      '@vue/compiler-sfc': ^3.0.8
-      cache-loader: '*'
-      css-loader: '*'
-      vue-template-compiler: '*'
-      webpack: ^3.0.0 || ^4.1.0 || ^5.0.0-0
+      '@babel/core': '>=7.0.0-beta.0 <8'
+      '@jest/types': ^29.0.0
+      babel-jest: ^29.0.0
+      esbuild: '*'
+      jest: ^29.0.0
+      typescript: ^5.4.2
     peerDependenciesMeta:
-      '@vue/compiler-sfc':
+      '@babel/core':
         optional: true
-      cache-loader:
+      '@jest/types':
         optional: true
-      vue-template-compiler:
+      babel-jest:
+        optional: true
+      esbuild:
         optional: true
     dependencies:
-      '@vue/component-compiler-utils': 3.3.0(react-dom@18.2.0)(react@17.0.2)
-      css-loader: 6.7.3(webpack@5.75.0)
-      hash-sum: 1.0.2
-      loader-utils: 1.4.2
-      vue-hot-reload-api: 2.3.4
-      vue-style-loader: 4.1.3
-      vue-template-compiler: 2.7.14
-      webpack: 5.75.0(esbuild@0.16.17)
-    transitivePeerDependencies:
-      - arc-templates
-      - atpl
-      - babel-core
-      - bracket-template
-      - coffee-script
-      - dot
-      - dust
-      - dustjs-helpers
-      - dustjs-linkedin
-      - eco
-      - ect
-      - ejs
-      - haml-coffee
-      - hamlet
-      - hamljs
-      - handlebars
-      - hogan.js
-      - htmling
-      - jade
-      - jazz
-      - jqtpl
-      - just
-      - liquid-node
-      - liquor
-      - lodash
-      - marko
-      - mote
-      - mustache
-      - nunjucks
-      - plates
-      - pug
-      - qejs
-      - ractive
-      - razor-tmpl
-      - react
-      - react-dom
-      - slm
-      - squirrelly
-      - swig
-      - swig-templates
-      - teacup
-      - templayed
-      - then-jade
-      - then-pug
-      - tinyliquid
-      - toffee
-      - twig
-      - twing
-      - underscore
-      - vash
-      - velocityjs
-      - walrus
-      - whiskers
-    dev: true
-
-  /vue-prism-editor@0.3.0:
-    resolution: {integrity: sha512-yNSuwql/xHMJrWghn/OhZ5WPBKdhx7FkvFjgq2uDm99jHSJhuGwhcgPyuoGzpm6w8DRDzi85lgerKCu8DTDWWg==}
-    dependencies:
-      dom-iterator: 1.0.0
-      escape-html: 1.0.3
-      unescape: 1.0.1
+      '@babel/core': 7.24.0
+      bs-logger: 0.2.6
+      fast-json-stable-stringify: 2.1.0
+      jest: 29.6.2
+      jest-util: 29.5.0
+      json5: 2.2.3
+      lodash.memoize: 4.1.2
+      make-error: 1.3.6
+      semver: 7.6.0
+      typescript: 5.4.2
+      yargs-parser: 21.1.1
+    dev: true
+
+  /ts-log@2.2.5:
+    resolution: {integrity: sha512-PGcnJoTBnVGy6yYNFxWVNkdcAuAMstvutN9MgDJIV6L0oG8fB+ZNNy1T+wJzah8RPGor1mZuPQkVfXNDpy9eHA==}
     dev: false
 
-  /vue-property-decorator@9.1.2(vue-class-component@7.2.6)(vue@2.7.14):
-    resolution: {integrity: sha512-xYA8MkZynPBGd/w5QFJ2d/NM0z/YeegMqYTphy7NJQXbZcuU6FC6AOdUAcy4SXP+YnkerC6AfH+ldg7PDk9ESQ==}
-    peerDependencies:
-      vue: '*'
-      vue-class-component: '*'
-    dependencies:
-      vue: 2.7.14
-      vue-class-component: 7.2.6(vue@2.7.14)
+  /ts-map@1.0.3:
+    resolution: {integrity: sha512-vDWbsl26LIcPGmDpoVzjEP6+hvHZkBkLW7JpvwbCv/5IYPJlsbzCVXY3wsCeAxAUeTclNOUZxnLdGh3VBD/J6w==}
     dev: true
 
-  /vue-router@3.6.5(vue@2.7.14):
-    resolution: {integrity: sha512-VYXZQLtjuvKxxcshuRAwjHnciqZVoXAjTjcqBTz4rKc8qih9g9pI3hbDjmqXaHdgL3v8pV6P8Z335XvHzESxLQ==}
-    peerDependencies:
-      vue: ^2
-    dependencies:
-      vue: 2.7.14
+  /ts-toolbelt@9.6.0:
+    resolution: {integrity: sha512-nsZd8ZeNUzukXPlJmTBwUAuABDe/9qtVDelJeT/qW0ow3ZS3BsQJtNkan1802aM9Uf68/Y8ljw86Hu0h5IUW3w==}
     dev: false
 
-  /vue-style-loader@4.1.3:
-    resolution: {integrity: sha512-sFuh0xfbtpRlKfm39ss/ikqs9AbKCoXZBpHeVZ8Tx650o0k0q/YCM7FRvigtxpACezfq6af+a7JeqVTWvncqDg==}
+  /ts-type@3.0.1(ts-toolbelt@9.6.0):
+    resolution: {integrity: sha512-cleRydCkBGBFQ4KAvLH0ARIkciduS745prkGVVxPGvcRGhMMoSJUB7gNR1ByKhFTEYrYRg2CsMRGYnqp+6op+g==}
+    peerDependencies:
+      ts-toolbelt: ^9.6.0
     dependencies:
-      hash-sum: 1.0.2
-      loader-utils: 1.4.2
-    dev: true
+      '@types/node': 18.16.16
+      ts-toolbelt: 9.6.0
+      tslib: 2.6.2
+      typedarray-dts: 1.0.0
+    dev: false
 
-  /vue-template-compiler@2.7.14:
-    resolution: {integrity: sha512-zyA5Y3ArvVG0NacJDkkzJuPQDF8RFeRlzV2vLeSnhSpieO6LK2OVbdLPi5MPPs09Ii+gMO8nY4S3iKQxBxDmWQ==}
+  /tsc-alias@1.8.7:
+    resolution: {integrity: sha512-59Q/zUQa3miTf99mLbSqaW0hi1jt4WoG8Uhe5hSZJHQpSoFW9eEwvW7jlKMHXWvT+zrzy3SN9PE/YBhQ+WVydA==}
+    hasBin: true
     dependencies:
-      de-indent: 1.0.2
-      he: 1.2.0
-
-  /vue-template-es2015-compiler@1.9.1:
-    resolution: {integrity: sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==}
+      chokidar: 3.5.2
+      commander: 9.4.1
+      globby: 11.1.0
+      mylas: 2.1.13
+      normalize-path: 3.0.0
+      plimit-lit: 1.4.1
     dev: true
 
-  /vue-tsc@1.0.24(typescript@5.0.3):
-    resolution: {integrity: sha512-mmU1s5SAqE1nByQAiQnao9oU4vX+mSdsgI8H57SfKH6UVzq/jP9+Dbi2GaV+0b4Cn361d2ln8m6xeU60ApiEXg==}
+  /tsc-watch@6.0.4(typescript@5.4.2):
+    resolution: {integrity: sha512-cHvbvhjO86w2aGlaHgSCeQRl+Aqw6X6XN4sQMPZKF88GoP30O+oTuh5lRIJr5pgFWrRpF1AgXnJJ2DoFEIPHyg==}
+    engines: {node: '>=12.12.0'}
     hasBin: true
     peerDependencies:
-      typescript: '*'
+      typescript: ^5.4.2
     dependencies:
-      '@volar/vue-language-core': 1.0.24
-      '@volar/vue-typescript': 1.0.24
-      typescript: 5.0.3
+      cross-spawn: 7.0.3
+      node-cleanup: 2.1.2
+      ps-tree: 1.2.0
+      string-argv: 0.3.1
+      typescript: 5.4.2
     dev: true
 
-  /vue-typed-mixins@0.2.0:
-    resolution: {integrity: sha512-0OxuinandPWv3nm5k/reYkuKtX3jjPZ40Sy9roJz0ih8PUzmI7zSRiXFEJ62LsyRegw9Tqy+qMkajk7ipKP8Vg==}
-    dev: false
-
-  /vue2-boring-avatars@0.3.4:
-    resolution: {integrity: sha512-N3FYX9Z6rZdTeP3BOBz2LMxlWo9WRmPF6SOsYzz+tEuUH0QjX8UD7c1X95J8pZ7cFvbh9QflVujYQRqRiiwoAg==}
-    dependencies:
-      core-js: 3.27.2
-      vue: 2.7.14
-      vue-color: 2.8.1
-    dev: false
-
-  /vue2-boring-avatars@0.3.8:
-    resolution: {integrity: sha512-8vNN+zhCIiIMnSQDu0DwhJ11e9r3t4t12dromXmXDtRryBhV58NPn4XgMb4JKrBlfNK92KFrY/cxRy3nzhQfpQ==}
+  /tsconfig-paths@4.2.0:
+    resolution: {integrity: sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==}
+    engines: {node: '>=6'}
     dependencies:
-      core-js: 3.27.2
-      vue: 2.7.14
-      vue-color: 2.8.1
-    dev: false
+      json5: 2.2.3
+      minimist: 1.2.8
+      strip-bom: 3.0.0
+    dev: true
 
-  /vue2-teleport@1.0.1:
-    resolution: {integrity: sha512-hbY/Q0x8qXGFxo6h4KU4YYesUcN+uUjliqqC0PoNSgpcbS2QRb3qXi+7XMTgLYs0a8i7o1H6Mu43UV4Vbgkhgw==}
-    dev: false
+  /tslib@2.6.2:
+    resolution: {integrity: sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==}
 
-  /vue2-touch-events@3.2.2:
-    resolution: {integrity: sha512-rGV8jxgOQEJYkJCp7uOBe3hjvmG1arThrq1wGtJHwJTgi65+P2a+0l4CYcQO/U1ZFqTq2/TT2+oTE6H7Y+6Eog==}
+  /tsscmp@1.0.6:
+    resolution: {integrity: sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==}
+    engines: {node: '>=0.6.x'}
     dev: false
 
-  /vue@2.7.14:
-    resolution: {integrity: sha512-b2qkFyOM0kwqWFuQmgd4o+uHGU7T+2z3T+WQp8UBjADfEv2n4FEMffzBmCKNP0IGzOEEfYjvtcC62xaSKeQDrQ==}
+  /tunnel-agent@0.6.0:
+    resolution: {integrity: sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==}
     dependencies:
-      '@vue/compiler-sfc': 2.7.14
-      csstype: 3.1.1
+      safe-buffer: 5.2.1
 
-  /w3c-keyname@2.2.6:
-    resolution: {integrity: sha512-f+fciywl1SJEniZHD6H+kUO8gOnwIr7f4ijKA6+ZvJFjeGi1r4PDLl53Ayud9O/rk64RqgoQine0feoeOU0kXg==}
+  /tunnel@0.0.6:
+    resolution: {integrity: sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==}
+    engines: {node: '>=0.6.11 <=0.7.0 || >=0.7.3'}
     dev: false
 
-  /w3c-xmlserializer@3.0.0:
-    resolution: {integrity: sha512-3WFqGEgSXIyGhOmAFtlicJNMjEps8b1MG31NCA0/vOF9+nKMUW1ckhi9cnNHmf88Rzw5V+dwIwsm2C7X8k9aQg==}
-    engines: {node: '>=12'}
-    dependencies:
-      xml-name-validator: 4.0.0
+  /turbo-darwin-64@1.13.3:
+    resolution: {integrity: sha512-glup8Qx1qEFB5jerAnXbS8WrL92OKyMmg5Hnd4PleLljAeYmx+cmmnsmLT7tpaVZIN58EAAwu8wHC6kIIqhbWA==}
+    cpu: [x64]
+    os: [darwin]
     dev: true
+    optional: true
 
-  /w3c-xmlserializer@4.0.0:
-    resolution: {integrity: sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==}
-    engines: {node: '>=14'}
-    dependencies:
-      xml-name-validator: 4.0.0
+  /turbo-darwin-arm64@1.13.3:
+    resolution: {integrity: sha512-/np2xD+f/+9qY8BVtuOQXRq5f9LehCFxamiQnwdqWm5iZmdjygC5T3uVSYuagVFsZKMvX3ycySwh8dylGTl6lg==}
+    cpu: [arm64]
+    os: [darwin]
     dev: true
+    optional: true
 
-  /wait-on@6.0.0(debug@4.3.2):
-    resolution: {integrity: sha512-tnUJr9p5r+bEYXPUdRseolmz5XqJTTj98JgOsfBn7Oz2dxfE2g3zw1jE+Mo8lopM3j3et/Mq1yW7kKX6qw7RVw==}
-    engines: {node: '>=10.0.0'}
-    hasBin: true
-    dependencies:
-      axios: 0.21.4(debug@4.3.2)
-      joi: 17.7.0
-      lodash: 4.17.21
-      minimist: 1.2.7
-      rxjs: 7.5.7
-    transitivePeerDependencies:
-      - debug
+  /turbo-linux-64@1.13.3:
+    resolution: {integrity: sha512-G+HGrau54iAnbXLfl+N/PynqpDwi/uDzb6iM9hXEDG+yJnSJxaHMShhOkXYJPk9offm9prH33Khx2scXrYVW1g==}
+    cpu: [x64]
+    os: [linux]
     dev: true
+    optional: true
 
-  /walker@1.0.8:
-    resolution: {integrity: sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==}
-    dependencies:
-      makeerror: 1.0.12
+  /turbo-linux-arm64@1.13.3:
+    resolution: {integrity: sha512-qWwEl5VR02NqRyl68/3pwp3c/olZuSp+vwlwrunuoNTm6JXGLG5pTeme4zoHNnk0qn4cCX7DFrOboArlYxv0wQ==}
+    cpu: [arm64]
+    os: [linux]
     dev: true
+    optional: true
 
-  /watchpack@2.4.0:
-    resolution: {integrity: sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==}
-    engines: {node: '>=10.13.0'}
-    dependencies:
-      glob-to-regexp: 0.4.1
-      graceful-fs: 4.2.10
+  /turbo-windows-64@1.13.3:
+    resolution: {integrity: sha512-Nudr4bRChfJzBPzEmpVV85VwUYRCGKecwkBFpbp2a4NtrJ3+UP1VZES653ckqCu2FRyRuS0n03v9euMbAvzH+Q==}
+    cpu: [x64]
+    os: [win32]
     dev: true
+    optional: true
 
-  /webidl-conversions@3.0.1:
-    resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==}
-
-  /webidl-conversions@7.0.0:
-    resolution: {integrity: sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==}
-    engines: {node: '>=12'}
-
-  /webpack-dev-middleware@5.3.3(webpack@5.75.0):
-    resolution: {integrity: sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==}
-    engines: {node: '>= 12.13.0'}
-    peerDependencies:
-      webpack: ^4.0.0 || ^5.0.0
-    dependencies:
-      colorette: 2.0.19
-      memfs: 3.4.13
-      mime-types: 2.1.35
-      range-parser: 1.2.1
-      schema-utils: 4.0.0
-      webpack: 5.75.0(esbuild@0.16.17)
+  /turbo-windows-arm64@1.13.3:
+    resolution: {integrity: sha512-ouJCgsVLd3icjRLmRvHQDDZnmGzT64GBupM1Y+TjtYn2LVaEBoV6hicFy8x5DUpnqdLy+YpCzRMkWlwhmkX7sQ==}
+    cpu: [arm64]
+    os: [win32]
     dev: true
+    optional: true
 
-  /webpack-hot-middleware@2.25.3:
-    resolution: {integrity: sha512-IK/0WAHs7MTu1tzLTjio73LjS3Ov+VvBKQmE8WPlJutgG5zT6Urgq/BbAdRrHTRpyzK0dvAvFh1Qg98akxgZpA==}
-    dependencies:
-      ansi-html-community: 0.0.8
-      html-entities: 2.3.3
-      strip-ansi: 6.0.1
+  /turbo@1.13.3:
+    resolution: {integrity: sha512-n17HJv4F4CpsYTvKzUJhLbyewbXjq1oLCi90i5tW1TiWDz16ML1eDG7wi5dHaKxzh5efIM56SITnuVbMq5dk4g==}
+    hasBin: true
+    optionalDependencies:
+      turbo-darwin-64: 1.13.3
+      turbo-darwin-arm64: 1.13.3
+      turbo-linux-64: 1.13.3
+      turbo-linux-arm64: 1.13.3
+      turbo-windows-64: 1.13.3
+      turbo-windows-arm64: 1.13.3
     dev: true
 
-  /webpack-sources@3.2.3:
-    resolution: {integrity: sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==}
-    engines: {node: '>=10.13.0'}
+  /tween-functions@1.2.0:
+    resolution: {integrity: sha512-PZBtLYcCLtEcjL14Fzb1gSxPBeL7nWvGhO5ZFPGqziCcr8uvHp0NDmdjBchp6KHL+tExcg0m3NISmKxhU394dA==}
     dev: true
 
-  /webpack-virtual-modules@0.4.6:
-    resolution: {integrity: sha512-5tyDlKLqPfMqjT3Q9TAqf2YqjwmnUleZwzJi1A5qXnlBCdj2AtOJ6wAWdglTIDOPgOiOrXeBeFcsQ8+aGQ6QbA==}
-    dev: true
+  /tweetnacl-util@0.15.1:
+    resolution: {integrity: sha512-RKJBIj8lySrShN4w6i/BonWp2Z/uxwC3h4y7xsRrpP59ZboCd0GpEVsOnMDYLMmKBpYhb5TgHzZXy7wTfYFBRw==}
+    dev: false
 
-  /webpack-virtual-modules@0.5.0:
-    resolution: {integrity: sha512-kyDivFZ7ZM0BVOUteVbDFhlRt7Ah/CSPwJdi8hBpkK7QLumUqdLtVfm/PX/hkcnrvr0i77fO5+TjZ94Pe+C9iw==}
-    dev: true
+  /tweetnacl@0.14.5:
+    resolution: {integrity: sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==}
 
-  /webpack@5.75.0(esbuild@0.16.17):
-    resolution: {integrity: sha512-piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ==}
-    engines: {node: '>=10.13.0'}
-    hasBin: true
-    peerDependencies:
-      webpack-cli: '*'
-    peerDependenciesMeta:
-      webpack-cli:
-        optional: true
+  /tweetnacl@1.0.3:
+    resolution: {integrity: sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==}
+    dev: false
+
+  /type-check@0.3.2:
+    resolution: {integrity: sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==}
+    engines: {node: '>= 0.8.0'}
     dependencies:
-      '@types/eslint-scope': 3.7.4
-      '@types/estree': 0.0.51
-      '@webassemblyjs/ast': 1.11.1
-      '@webassemblyjs/wasm-edit': 1.11.1
-      '@webassemblyjs/wasm-parser': 1.11.1
-      acorn: 8.8.1
-      acorn-import-assertions: 1.8.0(acorn@8.8.1)
-      browserslist: 4.21.4
-      chrome-trace-event: 1.0.3
-      enhanced-resolve: 5.13.0
-      es-module-lexer: 0.9.3
-      eslint-scope: 5.1.1
-      events: 3.3.0
-      glob-to-regexp: 0.4.1
-      graceful-fs: 4.2.10
-      json-parse-even-better-errors: 2.3.1
-      loader-runner: 4.3.0
-      mime-types: 2.1.35
-      neo-async: 2.6.2
-      schema-utils: 3.1.1
-      tapable: 2.2.1
-      terser-webpack-plugin: 5.3.6(esbuild@0.16.17)(webpack@5.75.0)
-      watchpack: 2.4.0
-      webpack-sources: 3.2.3
-    transitivePeerDependencies:
-      - '@swc/core'
-      - esbuild
-      - uglify-js
+      prelude-ls: 1.1.2
+
+  /type-check@0.4.0:
+    resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}
+    engines: {node: '>= 0.8.0'}
+    dependencies:
+      prelude-ls: 1.2.1
     dev: true
 
-  /whatwg-encoding@2.0.0:
-    resolution: {integrity: sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==}
-    engines: {node: '>=12'}
-    dependencies:
-      iconv-lite: 0.6.3
+  /type-detect@4.0.8:
+    resolution: {integrity: sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==}
+    engines: {node: '>=4'}
+
+  /type-fest@0.16.0:
+    resolution: {integrity: sha512-eaBzG6MxNzEn9kiwvtre90cXaNLkmadMWa1zQMs3XORCXNbsH/OewwbxC5ia9dCxIxnTAsSxXJaa/p5y8DlvJg==}
+    engines: {node: '>=10'}
     dev: true
 
-  /whatwg-mimetype@3.0.0:
-    resolution: {integrity: sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==}
-    engines: {node: '>=12'}
+  /type-fest@0.20.2:
+    resolution: {integrity: sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==}
+    engines: {node: '>=10'}
     dev: true
 
-  /whatwg-url@11.0.0:
-    resolution: {integrity: sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==}
-    engines: {node: '>=12'}
-    dependencies:
-      tr46: 3.0.0
-      webidl-conversions: 7.0.0
+  /type-fest@0.21.3:
+    resolution: {integrity: sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==}
+    engines: {node: '>=10'}
 
-  /whatwg-url@5.0.0:
-    resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==}
-    dependencies:
-      tr46: 0.0.3
-      webidl-conversions: 3.0.1
+  /type-fest@0.6.0:
+    resolution: {integrity: sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==}
+    engines: {node: '>=8'}
+    dev: true
 
-  /which-boxed-primitive@1.0.2:
-    resolution: {integrity: sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==}
+  /type-fest@0.8.1:
+    resolution: {integrity: sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==}
+    engines: {node: '>=8'}
+    dev: true
+
+  /type-fest@2.19.0:
+    resolution: {integrity: sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==}
+    engines: {node: '>=12.20'}
+    dev: true
+
+  /type-is@1.6.18:
+    resolution: {integrity: sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==}
+    engines: {node: '>= 0.6'}
     dependencies:
-      is-bigint: 1.0.4
-      is-boolean-object: 1.1.2
-      is-number-object: 1.0.7
-      is-string: 1.0.7
-      is-symbol: 1.0.4
+      media-typer: 0.3.0
+      mime-types: 2.1.35
 
-  /which-collection@1.0.1:
-    resolution: {integrity: sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==}
+  /type@1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type@2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
+  /typed-array-buffer@1.0.0:
+    resolution: {integrity: sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==}
+    engines: {node: '>= 0.4'}
     dependencies:
-      is-map: 2.0.2
-      is-set: 2.0.2
-      is-weakmap: 2.0.1
-      is-weakset: 2.0.2
+      call-bind: 1.0.7
+      get-intrinsic: 1.2.4
+      is-typed-array: 1.1.13
+    dev: false
 
-  /which-module@1.0.0:
-    resolution: {integrity: sha512-F6+WgncZi/mJDrammbTuHe1q0R5hOXv/mBaiNA2TCNT/LTHusX0V+CJnj9XT8ki5ln2UZyyddDgHfCzyrOH7MQ==}
-    dev: true
+  /typed-array-buffer@1.0.2:
+    resolution: {integrity: sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.7
+      es-errors: 1.3.0
+      is-typed-array: 1.1.13
 
-  /which-module@2.0.0:
-    resolution: {integrity: sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==}
+  /typed-array-byte-length@1.0.0:
+    resolution: {integrity: sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.7
+      for-each: 0.3.3
+      has-proto: 1.0.3
+      is-typed-array: 1.1.13
+    dev: false
 
-  /which-typed-array@1.1.9:
-    resolution: {integrity: sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==}
+  /typed-array-byte-length@1.0.1:
+    resolution: {integrity: sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==}
     engines: {node: '>= 0.4'}
     dependencies:
-      available-typed-arrays: 1.0.5
-      call-bind: 1.0.2
+      call-bind: 1.0.7
       for-each: 0.3.3
       gopd: 1.0.1
-      has-tostringtag: 1.0.0
-      is-typed-array: 1.1.10
+      has-proto: 1.0.3
+      is-typed-array: 1.1.13
 
-  /which@1.3.1:
-    resolution: {integrity: sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==}
-    hasBin: true
+  /typed-array-byte-offset@1.0.0:
+    resolution: {integrity: sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==}
+    engines: {node: '>= 0.4'}
     dependencies:
-      isexe: 2.0.0
+      available-typed-arrays: 1.0.7
+      call-bind: 1.0.7
+      for-each: 0.3.3
+      has-proto: 1.0.3
+      is-typed-array: 1.1.13
+    dev: false
 
-  /which@2.0.2:
-    resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==}
-    engines: {node: '>= 8'}
-    hasBin: true
+  /typed-array-byte-offset@1.0.2:
+    resolution: {integrity: sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==}
+    engines: {node: '>= 0.4'}
     dependencies:
-      isexe: 2.0.0
+      available-typed-arrays: 1.0.7
+      call-bind: 1.0.7
+      for-each: 0.3.3
+      gopd: 1.0.1
+      has-proto: 1.0.3
+      is-typed-array: 1.1.13
 
-  /why-is-node-running@2.2.2:
-    resolution: {integrity: sha512-6tSwToZxTOcotxHeA+qGCq1mVzKR3CwcJGmVcY+QE8SHy6TnpFnh8PAvPNHYr7EcuVeG0QSMxtYCuO1ta/G/oA==}
-    engines: {node: '>=8'}
-    hasBin: true
+  /typed-array-length@1.0.4:
+    resolution: {integrity: sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==}
     dependencies:
-      siginfo: 2.0.0
-      stackback: 0.0.2
-    dev: true
+      call-bind: 1.0.7
+      for-each: 0.3.3
+      is-typed-array: 1.1.13
+    dev: false
 
-  /wide-align@1.1.5:
-    resolution: {integrity: sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==}
+  /typed-array-length@1.0.5:
+    resolution: {integrity: sha512-yMi0PlwuznKHxKmcpoOdeLwxBoVPkqZxd7q2FgMkmD3bNwvF5VW0+UlUQ1k1vmktTu4Yu13Q0RIxEP8+B+wloA==}
+    engines: {node: '>= 0.4'}
     dependencies:
-      string-width: 4.2.3
+      call-bind: 1.0.7
+      for-each: 0.3.3
+      gopd: 1.0.1
+      has-proto: 1.0.3
+      is-typed-array: 1.1.13
+      possible-typed-array-names: 1.0.0
 
-  /widest-line@3.1.0:
-    resolution: {integrity: sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==}
-    engines: {node: '>=8'}
-    dependencies:
-      string-width: 4.2.3
+  /typedarray-dts@1.0.0:
+    resolution: {integrity: sha512-Ka0DBegjuV9IPYFT1h0Qqk5U4pccebNIJCGl8C5uU7xtOs+jpJvKGAY4fHGK25hTmXZOEUl9Cnsg5cS6K/b5DA==}
+    dev: false
 
-  /win-release@1.1.1:
-    resolution: {integrity: sha512-iCRnKVvGxOQdsKhcQId2PXV1vV3J/sDPXKA4Oe9+Eti2nb2ESEsYHRYls/UjoUW3bIc5ZDO8dTH50A/5iVN+bw==}
-    engines: {node: '>=0.10.0'}
+  /typedarray-to-buffer@3.1.5:
+    resolution: {integrity: sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==}
     dependencies:
-      semver: 5.7.1
+      is-typedarray: 1.0.0
     dev: false
 
-  /winston-console-format@1.0.8:
-    resolution: {integrity: sha512-dq7t/E0D0QRi4XIOwu6HM1+5e//WPqylH88GVjKEhQVrzGFg34MCz+G7pMJcXFBen9C0kBsu5GYgbYsE2LDwKw==}
-    dependencies:
-      colors: 1.4.0
-      logform: 2.4.2
-      triple-beam: 1.3.0
+  /typedarray@0.0.6:
+    resolution: {integrity: sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==}
     dev: false
 
-  /winston-transport@4.5.0:
-    resolution: {integrity: sha512-YpZzcUzBedhlTAfJg6vJDlyEai/IFMIVcaEZZyl3UXIl4gmqRpU7AE89AHLkbzLUsv0NVmw7ts+iztqKxxPW1Q==}
-    engines: {node: '>= 6.4.0'}
+  /typedi@0.10.0(patch_hash=sk6omkefrosihg7lmqbzh7vfxe):
+    resolution: {integrity: sha512-v3UJF8xm68BBj6AF4oQML3ikrfK2c9EmZUyLOfShpJuItAqVBHWP/KtpGinkSsIiP6EZyyb6Z3NXyW9dgS9X1w==}
+    dev: false
+    patched: true
+
+  /typeorm@0.2.45(ioredis@4.28.5)(pg@8.11.3):
+    resolution: {integrity: sha512-c0rCO8VMJ3ER7JQ73xfk0zDnVv0WDjpsP6Q1m6CVKul7DB9iVdWLRjPzc8v2eaeBuomsbZ2+gTaYr8k1gm3bYA==}
+    hasBin: true
+    peerDependencies:
+      '@sap/hana-client': ^2.11.14
+      better-sqlite3: ^7.1.2
+      hdb-pool: ^0.1.6
+      ioredis: ^4.28.3
+      mongodb: ^3.6.0
+      mssql: ^6.3.1
+      mysql2: ^2.2.5
+      oracledb: ^5.1.0
+      pg: ^8.5.1
+      pg-native: ^3.0.0
+      pg-query-stream: ^4.0.0
+      redis: ^3.1.1
+      sql.js: ^1.4.0
+      sqlite3: ^5.0.2
+      typeorm-aurora-data-api-driver: ^2.0.0
+    peerDependenciesMeta:
+      '@sap/hana-client':
+        optional: true
+      better-sqlite3:
+        optional: true
+      hdb-pool:
+        optional: true
+      ioredis:
+        optional: true
+      mongodb:
+        optional: true
+      mssql:
+        optional: true
+      mysql2:
+        optional: true
+      oracledb:
+        optional: true
+      pg:
+        optional: true
+      pg-native:
+        optional: true
+      pg-query-stream:
+        optional: true
+      redis:
+        optional: true
+      sql.js:
+        optional: true
+      sqlite3:
+        optional: true
+      typeorm-aurora-data-api-driver:
+        optional: true
     dependencies:
-      logform: 2.4.2
-      readable-stream: 3.6.0
-      triple-beam: 1.3.0
+      '@sqltools/formatter': 1.2.5
+      app-root-path: 3.1.0
+      buffer: 6.0.3
+      chalk: 4.1.2
+      cli-highlight: 2.1.11
+      debug: 4.3.4(supports-color@8.1.1)
+      dotenv: 8.6.0
+      glob: 7.2.3
+      ioredis: 4.28.5
+      js-yaml: 4.1.0
+      mkdirp: 1.0.4
+      pg: 8.11.3
+      reflect-metadata: 0.1.14
+      sha.js: 2.4.11
+      tslib: 2.6.2
+      uuid: 8.3.2
+      xml2js: 0.4.23
+      yargs: 17.7.2
+      zen-observable-ts: 1.1.0
+    transitivePeerDependencies:
+      - supports-color
     dev: false
 
-  /winston@3.8.2:
-    resolution: {integrity: sha512-MsE1gRx1m5jdTTO9Ld/vND4krP2To+lgDoMEHGGa4HIlAUyXJtfc7CxQcGXVyz2IBpw5hbFkj2b/AtUdQwyRew==}
-    engines: {node: '>= 12.0.0'}
+  /typescript@5.4.2:
+    resolution: {integrity: sha512-+2/g0Fds1ERlP6JsakQQDXjZdZMM+rqpamFZJEKh4kwTIn3iDkgKtby0CeNd5ATNZ4Ry1ax15TMx0W2V+miizQ==}
+    engines: {node: '>=14.17'}
+    hasBin: true
+
+  /uc.micro@1.0.6:
+    resolution: {integrity: sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==}
+    dev: false
+
+  /uc.micro@2.0.0:
+    resolution: {integrity: sha512-DffL94LsNOccVn4hyfRe5rdKa273swqeA5DJpMOeFmEn1wCDc7nAbbB0gXlgBCL7TNzeTv6G7XVWzan7iJtfig==}
+    dev: false
+
+  /ufo@1.3.2:
+    resolution: {integrity: sha512-o+ORpgGwaYQXgqGDwd+hkS4PuZ3QnmqMMxRuajK/a38L6fTpcE5GPIfrf+L/KemFzfUpeUQc1rRS1iDBozvnFA==}
+    dev: true
+
+  /uglify-js@3.17.4:
+    resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==}
+    engines: {node: '>=0.8.0'}
+    hasBin: true
+
+  /uid-safe@2.1.5:
+    resolution: {integrity: sha512-KPHm4VL5dDXKz01UuEd88Df+KzynaohSL9fBh096KWAxSKZQDI2uBrVqtvRM4rwrIrRRKsdLNML/lnaaVSRioA==}
+    engines: {node: '>= 0.8'}
     dependencies:
-      '@colors/colors': 1.5.0
-      '@dabh/diagnostics': 2.0.3
-      async: 3.2.4
-      is-stream: 2.0.1
-      logform: 2.4.2
-      one-time: 1.0.0
-      readable-stream: 3.6.0
-      safe-stable-stringify: 2.4.0
-      stack-trace: 0.0.10
-      triple-beam: 1.3.0
-      winston-transport: 4.5.0
+      random-bytes: 1.0.0
     dev: false
 
-  /with@7.0.2:
-    resolution: {integrity: sha512-RNGKj82nUPg3g5ygxkQl0R937xLyho1J24ItRCBTr/m1YnZkzJy1hUiHUJrc/VlsDQzsCnInEGSg3bci0Lmd4w==}
-    engines: {node: '>= 10.0.0'}
+  /unbox-primitive@1.0.2:
+    resolution: {integrity: sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==}
+    dependencies:
+      call-bind: 1.0.7
+      has-bigints: 1.0.2
+      has-symbols: 1.0.3
+      which-boxed-primitive: 1.0.2
+
+  /unbuild@2.0.0(typescript@5.4.2):
+    resolution: {integrity: sha512-JWCUYx3Oxdzvw2J9kTAp+DKE8df/BnH/JTSj6JyA4SH40ECdFu7FoJJcrm8G92B7TjofQ6GZGjJs50TRxoH6Wg==}
+    hasBin: true
+    peerDependencies:
+      typescript: ^5.4.2
+    peerDependenciesMeta:
+      typescript:
+        optional: true
     dependencies:
-      '@babel/parser': 7.21.5
-      '@babel/types': 7.21.5
-      assert-never: 1.2.1
-      babel-walk: 3.0.0-canary-5
+      '@rollup/plugin-alias': 5.1.0(rollup@3.29.4)
+      '@rollup/plugin-commonjs': 25.0.7(rollup@3.29.4)
+      '@rollup/plugin-json': 6.1.0(rollup@3.29.4)
+      '@rollup/plugin-node-resolve': 15.2.3(rollup@3.29.4)
+      '@rollup/plugin-replace': 5.0.5(rollup@3.29.4)
+      '@rollup/pluginutils': 5.0.5(rollup@3.29.4)
+      chalk: 5.3.0
+      citty: 0.1.5
+      consola: 3.2.3
+      defu: 6.1.2
+      esbuild: 0.19.8
+      globby: 13.2.2
+      hookable: 5.5.3
+      jiti: 1.21.0
+      magic-string: 0.30.5
+      mkdist: 1.4.0(typescript@5.4.2)
+      mlly: 1.4.2
+      pathe: 1.1.1
+      pkg-types: 1.0.3
+      pretty-bytes: 6.1.1
+      rollup: 3.29.4
+      rollup-plugin-dts: 6.1.0(rollup@3.29.4)(typescript@5.4.2)
+      scule: 1.1.1
+      typescript: 5.4.2
+      untyped: 1.4.0
+    transitivePeerDependencies:
+      - sass
+      - supports-color
     dev: true
 
-  /wmf@1.0.2:
-    resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
-    engines: {node: '>=0.8'}
-    dev: false
+  /undefsafe@2.0.5:
+    resolution: {integrity: sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==}
+    dev: true
 
-  /word-wrap@1.2.3:
-    resolution: {integrity: sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==}
-    engines: {node: '>=0.10.0'}
+  /underscore@1.12.1:
+    resolution: {integrity: sha512-hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw==}
+    dev: false
 
-  /word@0.3.0:
-    resolution: {integrity: sha512-OELeY0Q61OXpdUfTp+oweA/vtLVg5VDOXh+3he3PNzLGG/y0oylSOC1xRVj0+l4vQ3tj/bB1HVHv1ocXkQceFA==}
-    engines: {node: '>=0.8'}
+  /underscore@1.13.6:
+    resolution: {integrity: sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==}
     dev: false
 
-  /wordwrap@1.0.0:
-    resolution: {integrity: sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==}
+  /undici@5.26.4:
+    resolution: {integrity: sha512-OG+QOf0fTLtazL9P9X7yqWxQ+Z0395Wk6DSkyTxtaq3wQEjIroVe7Y4asCX/vcCxYpNGMnwz8F0qbRYUoaQVMw==}
+    engines: {node: '>=14.0'}
+    dependencies:
+      '@fastify/busboy': 2.0.0
+    dev: false
 
-  /wrap-ansi@2.1.0:
-    resolution: {integrity: sha512-vAaEaDM946gbNpH5pLVNR+vX2ht6n0Bt3GXwVB1AuAqZosOvHNF3P7wDnh8KLkSqgUh0uh77le7Owgoz+Z9XBw==}
-    engines: {node: '>=0.10.0'}
+  /undici@6.4.0:
+    resolution: {integrity: sha512-wYaKgftNqf6Je7JQ51YzkEkEevzOgM7at5JytKO7BjaURQpERW8edQSMrr2xb+Yv4U8Yg47J24+lc9+NbeXMFA==}
+    engines: {node: '>=18.0'}
     dependencies:
-      string-width: 1.0.2
-      strip-ansi: 3.0.1
+      '@fastify/busboy': 2.0.0
+    dev: false
+
+  /unicode-canonical-property-names-ecmascript@2.0.0:
+    resolution: {integrity: sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==}
+    engines: {node: '>=4'}
     dev: true
 
-  /wrap-ansi@5.1.0:
-    resolution: {integrity: sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==}
-    engines: {node: '>=6'}
+  /unicode-match-property-ecmascript@2.0.0:
+    resolution: {integrity: sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==}
+    engines: {node: '>=4'}
     dependencies:
-      ansi-styles: 3.2.1
-      string-width: 3.1.0
-      strip-ansi: 5.2.0
+      unicode-canonical-property-names-ecmascript: 2.0.0
+      unicode-property-aliases-ecmascript: 2.1.0
     dev: true
 
-  /wrap-ansi@6.2.0:
-    resolution: {integrity: sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==}
-    engines: {node: '>=8'}
-    dependencies:
-      ansi-styles: 4.3.0
-      string-width: 4.2.3
-      strip-ansi: 6.0.1
+  /unicode-match-property-value-ecmascript@2.1.0:
+    resolution: {integrity: sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==}
+    engines: {node: '>=4'}
+    dev: true
 
-  /wrap-ansi@7.0.0:
-    resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==}
-    engines: {node: '>=10'}
-    dependencies:
-      ansi-styles: 4.3.0
-      string-width: 4.2.3
-      strip-ansi: 6.0.1
+  /unicode-property-aliases-ecmascript@2.1.0:
+    resolution: {integrity: sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==}
+    engines: {node: '>=4'}
+    dev: true
 
-  /wrappy@1.0.2:
-    resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}
+  /unique-filename@1.1.1:
+    resolution: {integrity: sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==}
+    dependencies:
+      unique-slug: 2.0.2
+    dev: false
+    optional: true
 
-  /write-file-atomic@2.4.3:
-    resolution: {integrity: sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==}
+  /unique-slug@2.0.2:
+    resolution: {integrity: sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==}
     dependencies:
-      graceful-fs: 4.2.10
       imurmurhash: 0.1.4
-      signal-exit: 3.0.7
-    dev: true
+    dev: false
+    optional: true
 
-  /write-file-atomic@3.0.3:
-    resolution: {integrity: sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==}
+  /unique-string@2.0.0:
+    resolution: {integrity: sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==}
+    engines: {node: '>=8'}
     dependencies:
-      imurmurhash: 0.1.4
-      is-typedarray: 1.0.0
-      signal-exit: 3.0.7
-      typedarray-to-buffer: 3.1.5
+      crypto-random-string: 2.0.0
     dev: true
 
-  /write-file-atomic@4.0.2:
-    resolution: {integrity: sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==}
-    engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
+  /unist-util-is@6.0.0:
+    resolution: {integrity: sha512-2qCTHimwdxLfz+YzdGfkqNlH0tLi9xjTnHddPmJwtIG9MGsdbutfTc4P+haPD7l7Cjxf/WZj+we5qfVPvvxfYw==}
     dependencies:
-      imurmurhash: 0.1.4
-      signal-exit: 3.0.7
+      '@types/unist': 3.0.2
     dev: true
 
-  /write-json-file@4.3.0:
-    resolution: {integrity: sha512-PxiShnxf0IlnQuMYOPPhPkhExoCQuTUNPOa/2JWCYTmBquU9njyyDuwRKN26IZBlp4yn1nt+Agh2HOOBl+55HQ==}
-    engines: {node: '>=8.3'}
+  /unist-util-visit-parents@6.0.1:
+    resolution: {integrity: sha512-L/PqWzfTP9lzzEa6CKs0k2nARxTdZduw3zyh8d2NVBnsyvHjSX4TWse388YrrQKbvI8w20fGjGlhgT96WwKykw==}
     dependencies:
-      detect-indent: 6.1.0
-      graceful-fs: 4.2.10
-      is-plain-obj: 2.1.0
-      make-dir: 3.1.0
-      sort-keys: 4.2.0
-      write-file-atomic: 3.0.3
+      '@types/unist': 3.0.2
+      unist-util-is: 6.0.0
     dev: true
 
-  /ws@6.2.2:
-    resolution: {integrity: sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==}
-    peerDependencies:
-      bufferutil: ^4.0.1
-      utf-8-validate: ^5.0.2
-    peerDependenciesMeta:
-      bufferutil:
-        optional: true
-      utf-8-validate:
-        optional: true
+  /unist-util-visit@5.0.0:
+    resolution: {integrity: sha512-MR04uvD+07cwl/yhVuVWAtw+3GOR/knlL55Nd/wAdblk27GCVt3lqpTivy/tkJcZoNPzTwS1Y+KMojlLDhoTzg==}
     dependencies:
-      async-limiter: 1.0.1
+      '@types/unist': 3.0.2
+      unist-util-is: 6.0.0
+      unist-util-visit-parents: 6.0.1
     dev: true
 
-  /ws@7.5.9:
-    resolution: {integrity: sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==}
-    engines: {node: '>=8.3.0'}
+  /universalify@0.1.2:
+    resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==}
+    engines: {node: '>= 4.0.0'}
+    dev: true
+
+  /universalify@0.2.0:
+    resolution: {integrity: sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==}
+    engines: {node: '>= 4.0.0'}
+
+  /universalify@2.0.0:
+    resolution: {integrity: sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==}
+    engines: {node: '>= 10.0.0'}
+    dev: true
+
+  /unpipe@1.0.0:
+    resolution: {integrity: sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==}
+    engines: {node: '>= 0.8'}
+
+  /unplugin-icons@0.17.4:
+    resolution: {integrity: sha512-PHLxjBx3ZV8RUBvfMafFl8uWH88jHeZgOijcRpkwgne7y2Ovx7WI0Ltzzw3fjZQ7dGaDhB8udyKVdm9N2S6BIw==}
     peerDependencies:
-      bufferutil: ^4.0.1
-      utf-8-validate: ^5.0.2
+      '@svgr/core': '>=7.0.0'
+      '@svgx/core': ^1.0.1
+      '@vue/compiler-sfc': ^3.0.2 || ^2.7.0
+      vue-template-compiler: ^2.6.12
+      vue-template-es2015-compiler: ^1.9.0
     peerDependenciesMeta:
-      bufferutil:
+      '@svgr/core':
         optional: true
-      utf-8-validate:
+      '@svgx/core':
         optional: true
-    dev: false
-
-  /ws@8.12.0:
-    resolution: {integrity: sha512-kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig==}
-    engines: {node: '>=10.0.0'}
-    peerDependencies:
-      bufferutil: ^4.0.1
-      utf-8-validate: '>=5.0.2'
-    peerDependenciesMeta:
-      bufferutil:
+      '@vue/compiler-sfc':
         optional: true
-      utf-8-validate:
+      vue-template-compiler:
         optional: true
+      vue-template-es2015-compiler:
+        optional: true
+    dependencies:
+      '@antfu/install-pkg': 0.1.1
+      '@antfu/utils': 0.7.6
+      '@iconify/utils': 2.1.11
+      debug: 4.3.4(supports-color@8.1.1)
+      kolorist: 1.8.0
+      local-pkg: 0.5.0
+      unplugin: 1.5.1
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
 
-  /xlsx@0.17.5:
-    resolution: {integrity: sha512-lXNU0TuYsvElzvtI6O7WIVb9Zar1XYw7Xb3VAx2wn8N/n0whBYrCnHMxtFyIiUU1Wjf09WzmLALDfBO5PqTb1g==}
-    engines: {node: '>=0.8'}
+  /unplugin@1.0.1:
+    resolution: {integrity: sha512-aqrHaVBWW1JVKBHmGo33T5TxeL0qWzfvjWokObHA9bYmN7eNDkwOxmLjhioHl9878qDFMAaT51XNroRyuz7WxA==}
+    dependencies:
+      acorn: 8.11.2
+      chokidar: 3.5.2
+      webpack-sources: 3.2.3
+      webpack-virtual-modules: 0.5.0
+    dev: true
+
+  /unplugin@1.5.1:
+    resolution: {integrity: sha512-0QkvG13z6RD+1L1FoibQqnvTwVBXvS4XSPwAyinVgoOCl2jAgwzdUKmEj05o4Lt8xwQI85Hb6mSyYkcAGwZPew==}
+    dependencies:
+      acorn: 8.11.2
+      chokidar: 3.5.2
+      webpack-sources: 3.2.3
+      webpack-virtual-modules: 0.6.1
+    dev: true
+
+  /untildify@4.0.0:
+    resolution: {integrity: sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==}
+    engines: {node: '>=8'}
+    dev: true
+
+  /untyped@1.4.0:
+    resolution: {integrity: sha512-Egkr/s4zcMTEuulcIb7dgURS6QpN7DyqQYdf+jBtiaJvQ+eRsrtWUoX84SbvQWuLkXsOjM+8sJC9u6KoMK/U7Q==}
     hasBin: true
     dependencies:
-      adler-32: 1.2.0
-      cfb: 1.2.2
-      codepage: 1.15.0
-      crc-32: 1.2.2
-      ssf: 0.11.2
-      wmf: 1.0.2
-      word: 0.3.0
-    dev: false
+      '@babel/core': 7.22.9
+      '@babel/standalone': 7.23.6
+      '@babel/types': 7.23.6
+      defu: 6.1.2
+      jiti: 1.21.0
+      mri: 1.2.0
+      scule: 1.1.1
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
 
-  /xml-crypto@3.0.1:
-    resolution: {integrity: sha512-7XrwB3ujd95KCO6+u9fidb8ajvRJvIfGNWD0XLJoTWlBKz+tFpUzEYxsN+Il/6/gHtEs1RgRh2RH+TzhcWBZUw==}
-    engines: {node: '>=0.4.0'}
+  /update-browserslist-db@1.0.11(browserslist@4.21.9):
+    resolution: {integrity: sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==}
+    hasBin: true
+    peerDependencies:
+      browserslist: '>= 4.21.0'
     dependencies:
-      '@xmldom/xmldom': 0.8.6
-      xpath: 0.0.32
-    dev: false
+      browserslist: 4.21.9
+      escalade: 3.1.1
+      picocolors: 1.0.0
 
-  /xml-name-validator@4.0.0:
-    resolution: {integrity: sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==}
-    engines: {node: '>=12'}
+  /update-browserslist-db@1.0.13(browserslist@4.23.0):
+    resolution: {integrity: sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==}
+    hasBin: true
+    peerDependencies:
+      browserslist: '>= 4.21.0'
+    dependencies:
+      browserslist: 4.23.0
+      escalade: 3.1.1
+      picocolors: 1.0.0
     dev: true
 
-  /xml2js@0.5.0:
-    resolution: {integrity: sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==}
-    engines: {node: '>=4.0.0'}
+  /upper-case-first@2.0.2:
+    resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      sax: 1.2.4
-      xmlbuilder: 11.0.1
-    dev: false
+      tslib: 2.6.2
 
-  /xml@1.0.1:
-    resolution: {integrity: sha512-huCv9IH9Tcf95zuYCsQraZtWnJvBtLVE0QHMOs8bWyZAFZNDcYjsPq1nEx8jKA9y+Beo9v+7OBPRisQTjinQMw==}
+  /upper-case@2.0.2:
+    resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
+    dependencies:
+      tslib: 2.6.2
     dev: false
 
-  /xmlbuilder@11.0.1:
-    resolution: {integrity: sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==}
-    engines: {node: '>=4.0'}
+  /uri-js@4.4.1:
+    resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}
+    dependencies:
+      punycode: 2.3.1
+
+  /url-join@4.0.1:
+    resolution: {integrity: sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA==}
     dev: false
 
-  /xmlchars@2.2.0:
-    resolution: {integrity: sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==}
+  /url-parse@1.5.10:
+    resolution: {integrity: sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==}
+    dependencies:
+      querystringify: 2.2.0
+      requires-port: 1.0.0
+
+  /url-template@2.0.8:
+    resolution: {integrity: sha512-XdVKMF4SJ0nP/O7XIPB0JwAEuT9lDIYnNsK8yGVe43y0AWoKeJNdv3ZNWh7ksJ6KqQFjOO6ox/VEitLnaVNufw==}
     dev: true
 
-  /xmllint-wasm@3.0.1:
-    resolution: {integrity: sha512-t+aKQXJQNAt9/qLgCjhHUmCnPXAyqBKiyh8oV0ZwBMar/uB+5F40tqOJZ97JwLADcqQr5WB2bjCxLKrm+DHz1g==}
-    engines: {node: '>=10.5.0'}
+  /url-value-parser@2.2.0:
+    resolution: {integrity: sha512-yIQdxJpgkPamPPAPuGdS7Q548rLhny42tg8d4vyTNzFqvOnwqrgHXvgehT09U7fwrzxi3RxCiXjoNUNnNOlQ8A==}
+    engines: {node: '>=6.0.0'}
     dev: false
 
-  /xpath@0.0.32:
-    resolution: {integrity: sha512-rxMJhSIoiO8vXcWvSifKqhvV96GjiD5wYb8/QHdoRyQvraTpp4IEv944nhGausZZ3u7dhQXteZuZbaqfpB7uYw==}
-    engines: {node: '>=0.6.0'}
+  /url@0.10.3:
+    resolution: {integrity: sha512-hzSUW2q06EqL1gKM/a+obYHLIO6ct2hwPuviqTTOcfFVc61UbfJ2Q32+uGL/HCPxKqrdGB5QUwIe7UqlDgwsOQ==}
+    dependencies:
+      punycode: 1.3.2
+      querystring: 0.2.0
     dev: false
 
-  /xregexp@2.0.0:
-    resolution: {integrity: sha512-xl/50/Cf32VsGq/1R8jJE5ajH1yMCQkpmoS10QbFZWl2Oor4H0Me64Pu2yxvsRWK3m6soJbmGfzSR7BYmDcWAA==}
+  /utf-8-validate@5.0.10:
+    resolution: {integrity: sha512-Z6czzLq4u8fPOyx7TU6X3dvUZVvoJmxSQ+IcrlmagKhilxlhZgxPK6C5Jqbkw1IDUmFTM+cz9QDnnLTwDz/2gQ==}
+    engines: {node: '>=6.14.2'}
+    dependencies:
+      node-gyp-build: 4.7.0
     dev: false
 
-  /xss@1.0.14:
-    resolution: {integrity: sha512-og7TEJhXvn1a7kzZGQ7ETjdQVS2UfZyTlsEdDOqvQF7GoxNfY+0YLCzBy1kPdsDDx4QuNAonQPddpsn6Xl/7sw==}
-    engines: {node: '>= 0.10.0'}
-    hasBin: true
+  /utf7@1.0.2:
+    resolution: {integrity: sha512-qQrPtYLLLl12NF4DrM9CvfkxkYI97xOb5dsnGZHE3teFr0tWiEZ9UdgMPczv24vl708cYMpe6mGXGHrotIp3Bw==}
     dependencies:
-      commander: 2.20.3
-      cssfilter: 0.0.10
+      semver: 7.6.0
     dev: false
 
-  /xtend@4.0.2:
-    resolution: {integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==}
-    engines: {node: '>=0.4'}
-
-  /y18n@3.2.2:
-    resolution: {integrity: sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==}
-    dev: true
+  /utf8@2.1.2:
+    resolution: {integrity: sha512-QXo+O/QkLP/x1nyi54uQiG0XrODxdysuQvE5dtVqv7F5K2Qb6FsN+qbr6KhF5wQ20tfcV3VQp0/2x1e1MRSPWg==}
+    dev: false
 
-  /y18n@4.0.3:
-    resolution: {integrity: sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==}
+  /utf8@3.0.0:
+    resolution: {integrity: sha512-E8VjFIQ/TyQgp+TZfS6l8yp/xWppSAHzidGiRrqe4bK4XP9pTRyKFgGJpO3SN7zdX4DeomTrwaseCHovfpFcqQ==}
+    dev: false
 
-  /y18n@5.0.8:
-    resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==}
-    engines: {node: '>=10'}
+  /util-deprecate@1.0.2:
+    resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
 
-  /yallist@2.1.2:
-    resolution: {integrity: sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==}
+  /util@0.12.5:
+    resolution: {integrity: sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==}
+    dependencies:
+      inherits: 2.0.4
+      is-arguments: 1.1.1
+      is-generator-function: 1.0.10
+      is-typed-array: 1.1.13
+      which-typed-array: 1.1.15
 
-  /yallist@3.1.1:
-    resolution: {integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==}
+  /utils-merge@1.0.1:
+    resolution: {integrity: sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==}
+    engines: {node: '>= 0.4.0'}
 
-  /yallist@4.0.0:
-    resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==}
+  /uuencode@0.0.4:
+    resolution: {integrity: sha512-yEEhCuCi5wRV7Z5ZVf9iV2gWMvUZqKJhAs1ecFdKJ0qzbyaVelmsE3QjYAamehfp9FKLiZbKldd+jklG3O0LfA==}
+    dev: false
 
-  /yaml@1.10.2:
-    resolution: {integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==}
-    engines: {node: '>= 6'}
+  /uuid@3.4.0:
+    resolution: {integrity: sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==}
+    deprecated: Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.
+    hasBin: true
+    dev: false
 
-  /yamljs@0.3.0:
-    resolution: {integrity: sha512-C/FsVVhht4iPQYXOInoxUM/1ELSf9EsgKH34FofQOp6hwCPrW4vG4w5++TED3xRUo8gD7l0P1J1dLlDYzODsTQ==}
+  /uuid@8.0.0:
+    resolution: {integrity: sha512-jOXGuXZAWdsTH7eZLtyXMqUb9EcWMGZNbL9YcGBJl4MH4nrxHmZJhEHvyLFrkxo+28uLb/NYRcStH48fnD0Vzw==}
     hasBin: true
-    dependencies:
-      argparse: 1.0.10
-      glob: 7.2.3
     dev: false
 
-  /yargs-parser@13.1.2:
-    resolution: {integrity: sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==}
-    dependencies:
-      camelcase: 5.3.1
-      decamelize: 1.2.0
-    dev: true
+  /uuid@8.3.2:
+    resolution: {integrity: sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==}
+    hasBin: true
 
-  /yargs-parser@18.1.3:
-    resolution: {integrity: sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==}
-    engines: {node: '>=6'}
-    dependencies:
-      camelcase: 5.3.1
-      decamelize: 1.2.0
+  /uuid@9.0.0:
+    resolution: {integrity: sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==}
+    hasBin: true
 
-  /yargs-parser@20.2.9:
-    resolution: {integrity: sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==}
-    engines: {node: '>=10'}
+  /uuid@9.0.1:
+    resolution: {integrity: sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==}
+    hasBin: true
+    dev: false
 
-  /yargs-parser@21.1.1:
-    resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==}
-    engines: {node: '>=12'}
+  /v3-infinite-loading@1.2.2:
+    resolution: {integrity: sha512-MWJc6yChnqeUasBFJ3Enu8IGPcQgRMSTrAEtT1MsHBEx+QjwvNTaY8o+8V9DgVt1MVhQSl3MC55hsaWLJmpRMw==}
+    dev: false
 
-  /yargs-parser@5.0.1:
-    resolution: {integrity: sha512-wpav5XYiddjXxirPoCTUPbqM0PXvJ9hiBMvuJgInvo4/lAOTZzUprArw17q2O1P2+GHhbBr18/iQwjL5Z9BqfA==}
+  /v8-to-istanbul@9.1.0:
+    resolution: {integrity: sha512-6z3GW9x8G1gd+JIIgQQQxXuiJtCXeAjp6RaPEPLv62mH3iPHPxV6W3robxtCzNErRo6ZwTmzWhsbNvjyEBKzKA==}
+    engines: {node: '>=10.12.0'}
     dependencies:
-      camelcase: 3.0.0
-      object.assign: 4.1.4
-    dev: true
+      '@jridgewell/trace-mapping': 0.3.18
+      '@types/istanbul-lib-coverage': 2.0.4
+      convert-source-map: 1.9.0
 
-  /yargs@13.3.2:
-    resolution: {integrity: sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==}
+  /v8-to-istanbul@9.2.0:
+    resolution: {integrity: sha512-/EH/sDgxU2eGxajKdwLCDmQ4FWq+kpi3uCmBGpw1xJtnAxEjlD8j8PEiGWpCIMIs3ciNAgH0d3TTJiUkYzyZjA==}
+    engines: {node: '>=10.12.0'}
     dependencies:
-      cliui: 5.0.0
-      find-up: 3.0.0
-      get-caller-file: 2.0.5
-      require-directory: 2.1.1
-      require-main-filename: 2.0.0
-      set-blocking: 2.0.0
-      string-width: 3.1.0
-      which-module: 2.0.0
-      y18n: 4.0.3
-      yargs-parser: 13.1.2
+      '@jridgewell/trace-mapping': 0.3.18
+      '@types/istanbul-lib-coverage': 2.0.4
+      convert-source-map: 2.0.0
     dev: true
 
-  /yargs@15.4.1:
-    resolution: {integrity: sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==}
-    engines: {node: '>=8'}
-    dependencies:
-      cliui: 6.0.0
-      decamelize: 1.2.0
-      find-up: 4.1.0
-      get-caller-file: 2.0.5
-      require-directory: 2.1.1
-      require-main-filename: 2.0.0
-      set-blocking: 2.0.0
-      string-width: 4.2.3
-      which-module: 2.0.0
-      y18n: 4.0.3
-      yargs-parser: 18.1.3
-
-  /yargs@16.2.0:
-    resolution: {integrity: sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==}
-    engines: {node: '>=10'}
+  /validate-npm-package-license@3.0.4:
+    resolution: {integrity: sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==}
     dependencies:
-      cliui: 7.0.4
-      escalade: 3.1.1
-      get-caller-file: 2.0.5
-      require-directory: 2.1.1
-      string-width: 4.2.3
-      y18n: 5.0.8
-      yargs-parser: 20.2.9
+      spdx-correct: 3.1.1
+      spdx-expression-parse: 3.0.1
+    dev: true
 
-  /yargs@17.1.1:
-    resolution: {integrity: sha512-c2k48R0PwKIqKhPMWjeiF6y2xY/gPMUlro0sgxqXpbOIohWiLNXWslsootttv7E1e73QPAMQSg5FeySbVcpsPQ==}
-    engines: {node: '>=12'}
-    dependencies:
-      cliui: 7.0.4
-      escalade: 3.1.1
-      get-caller-file: 2.0.5
-      require-directory: 2.1.1
-      string-width: 4.2.3
-      y18n: 5.0.8
-      yargs-parser: 20.2.9
+  /validate.io-array@1.0.6:
+    resolution: {integrity: sha512-DeOy7CnPEziggrOO5CZhVKJw6S3Yi7e9e65R1Nl/RTN1vTQKnzjfvks0/8kQ40FP/dsjRAOd4hxmJ7uLa6vxkg==}
     dev: false
 
-  /yargs@17.6.0:
-    resolution: {integrity: sha512-8H/wTDqlSwoSnScvV2N/JHfLWOKuh5MVla9hqLjK3nsfyy6Y4kDSYSvkU5YCUEPOSnRXfIyx3Sq+B/IWudTo4g==}
-    engines: {node: '>=12'}
-    dependencies:
-      cliui: 8.0.1
-      escalade: 3.1.1
-      get-caller-file: 2.0.5
-      require-directory: 2.1.1
-      string-width: 4.2.3
-      y18n: 5.0.8
-      yargs-parser: 21.1.1
+  /validate.io-function@1.0.2:
+    resolution: {integrity: sha512-LlFybRJEriSuBnUhQyG5bwglhh50EpTL2ul23MPIuR1odjO7XaMLFV8vHGwp7AZciFxtYOeiSCT5st+XSPONiQ==}
     dev: false
 
-  /yargs@17.6.2:
-    resolution: {integrity: sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw==}
-    engines: {node: '>=12'}
-    dependencies:
-      cliui: 8.0.1
-      escalade: 3.1.1
-      get-caller-file: 2.0.5
-      require-directory: 2.1.1
-      string-width: 4.2.3
-      y18n: 5.0.8
-      yargs-parser: 21.1.1
-
-  /yargs@7.1.2:
-    resolution: {integrity: sha512-ZEjj/dQYQy0Zx0lgLMLR8QuaqTihnxirir7EwUHp1Axq4e3+k8jXU5K0VLbNvedv1f4EWtBonDIZm0NUr+jCcA==}
+  /validate.io-integer-array@1.0.0:
+    resolution: {integrity: sha512-mTrMk/1ytQHtCY0oNO3dztafHYyGU88KL+jRxWuzfOmQb+4qqnWmI+gykvGp8usKZOM0H7keJHEbRaFiYA0VrA==}
     dependencies:
-      camelcase: 3.0.0
-      cliui: 3.2.0
-      decamelize: 1.2.0
-      get-caller-file: 1.0.3
-      os-locale: 1.4.0
-      read-pkg-up: 1.0.1
-      require-directory: 2.1.1
-      require-main-filename: 1.0.1
-      set-blocking: 2.0.0
-      string-width: 1.0.2
-      which-module: 1.0.0
-      y18n: 3.2.2
-      yargs-parser: 5.0.1
-    dev: true
+      validate.io-array: 1.0.6
+      validate.io-integer: 1.0.5
+    dev: false
 
-  /yauzl@2.10.0:
-    resolution: {integrity: sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==}
+  /validate.io-integer@1.0.5:
+    resolution: {integrity: sha512-22izsYSLojN/P6bppBqhgUDjCkr5RY2jd+N2a3DCAUey8ydvrZ/OkGvFPR7qfOpwR2LC5p4Ngzxz36g5Vgr/hQ==}
     dependencies:
-      buffer-crc32: 0.2.13
-      fd-slicer: 1.1.0
-    dev: true
+      validate.io-number: 1.0.3
+    dev: false
 
-  /yn@3.1.1:
-    resolution: {integrity: sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==}
-    engines: {node: '>=6'}
+  /validate.io-number@1.0.3:
+    resolution: {integrity: sha512-kRAyotcbNaSYoDnXvb4MHg/0a1egJdLwS6oJ38TJY7aw9n93Fl/3blIXdyYvPOp55CNxywooG/3BcrwNrBpcSg==}
+    dev: false
 
-  /yocto-queue@0.1.0:
-    resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
-    engines: {node: '>=10'}
-    dev: true
+  /validator@13.7.0:
+    resolution: {integrity: sha512-nYXQLCBkpJ8X6ltALua9dRrZDHVYxjJ1wgskNt1lH9fzGjs3tgojGSCBjmEPwkWS1y29+DrizMTW19Pr9uB2nw==}
+    engines: {node: '>= 0.10'}
 
-  /yocto-queue@1.0.0:
-    resolution: {integrity: sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==}
-    engines: {node: '>=12.20'}
-    dev: true
+  /vary@1.1.2:
+    resolution: {integrity: sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==}
+    engines: {node: '>= 0.8'}
 
-  /yup@0.32.11:
-    resolution: {integrity: sha512-Z2Fe1bn+eLstG8DRR6FTavGD+MeAwyfmouhHsIUgaADz8jvFKbO/fXc2trJKZg+5EBjh4gGm3iU/t3onKlXHIg==}
-    engines: {node: '>=10'}
+  /verror@1.10.0:
+    resolution: {integrity: sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==}
+    engines: {'0': node >=0.6.0}
     dependencies:
-      '@babel/runtime': 7.20.7
-      '@types/lodash': 4.14.191
-      lodash: 4.17.21
-      lodash-es: 4.17.21
-      nanoclone: 0.2.1
-      property-expr: 2.0.5
-      toposort: 2.0.2
-    dev: false
+      assert-plus: 1.0.0
+      core-util-is: 1.0.2
+      extsprintf: 1.3.0
 
-  /z-schema@4.2.4:
-    resolution: {integrity: sha512-YvBeW5RGNeNzKOUJs3rTL4+9rpcvHXt5I051FJbOcitV8bl40pEfcG0Q+dWSwS0/BIYrMZ/9HHoqLllMkFhD0w==}
-    engines: {node: '>=6.0.0'}
+  /vite-node@1.3.1:
+    resolution: {integrity: sha512-azbRrqRxlWTJEVbzInZCTchx0X69M/XPTCz4H+TLvlTcR/xH/3hkRqhOakT41fMJCMzXTu4UvegkZiEoJAWvng==}
+    engines: {node: ^18.0.0 || >=20.0.0}
     hasBin: true
     dependencies:
-      lodash.get: 4.4.2
-      lodash.isequal: 4.5.0
-      validator: 13.7.0
-    optionalDependencies:
-      commander: 2.20.3
+      cac: 6.7.14
+      debug: 4.3.4(supports-color@8.1.1)
+      pathe: 1.1.1
+      picocolors: 1.0.0
+      vite: 5.1.6(sass@1.64.1)
+    transitivePeerDependencies:
+      - '@types/node'
+      - less
+      - lightningcss
+      - sass
+      - stylus
+      - sugarss
+      - supports-color
+      - terser
     dev: true
 
-  /zen-observable-ts@1.1.0:
-    resolution: {integrity: sha512-1h4zlLSqI2cRLPJUHJFL8bCWHhkpuXkF+dbGkRaWjgDIG26DmzyshUMrdV/rL3UnR+mhaX4fRq8LPouq0MYYIA==}
+  /vite-plugin-checker@0.6.4(patch_hash=emhml6hz55p6dz7xjncbjppjdm)(typescript@5.4.2)(vite@5.1.6)(vue-tsc@2.0.6):
+    resolution: {integrity: sha512-2zKHH5oxr+ye43nReRbC2fny1nyARwhxdm0uNYp/ERy4YvU9iZpNOsueoi/luXw5gnpqRSvjcEPxXbS153O2wA==}
+    engines: {node: '>=14.16'}
+    peerDependencies:
+      eslint: '>=7'
+      meow: ^9.0.0
+      optionator: ^0.9.1
+      stylelint: '>=13'
+      typescript: ^5.4.2
+      vite: '>=2.0.0'
+      vls: '*'
+      vti: '*'
+      vue-tsc: '>=1.3.9'
+    peerDependenciesMeta:
+      eslint:
+        optional: true
+      meow:
+        optional: true
+      optionator:
+        optional: true
+      stylelint:
+        optional: true
+      typescript:
+        optional: true
+      vls:
+        optional: true
+      vti:
+        optional: true
+      vue-tsc:
+        optional: true
     dependencies:
-      '@types/zen-observable': 0.8.3
-      zen-observable: 0.8.15
-    dev: false
+      '@babel/code-frame': 7.23.5
+      ansi-escapes: 4.3.2
+      chalk: 4.1.2
+      chokidar: 3.5.2
+      commander: 8.3.0
+      fast-glob: 3.2.12
+      fs-extra: 11.1.1
+      npm-run-path: 4.0.1
+      semver: 7.6.0
+      strip-ansi: 6.0.1
+      tiny-invariant: 1.3.1
+      typescript: 5.4.2
+      vite: 5.1.6(sass@1.64.1)
+      vscode-languageclient: 7.0.0
+      vscode-languageserver: 7.0.0
+      vscode-languageserver-textdocument: 1.0.11
+      vscode-uri: 3.0.8
+      vue-tsc: 2.0.6(typescript@5.4.2)
+    dev: true
+    patched: true
 
-  /zen-observable@0.8.15:
-    resolution: {integrity: sha512-PQ2PC7R9rslx84ndNBZB/Dkv8V8fZEpk83RLgXtYd0fwUgEjseMn1Dgajh2x6S8QbZAFa9p2qVCEuYZNgve0dQ==}
-    dev: false
+  /vite-plugin-dts@3.7.3(rollup@3.29.4)(typescript@5.4.2)(vite@5.1.6):
+    resolution: {integrity: sha512-26eTlBYdpjRLWCsTJebM8vkCieE+p9gP3raf+ecDnzzK5E3FG6VE1wcy55OkRpfWWVlVvKkYFe6uvRHYWx7Nog==}
+    engines: {node: ^14.18.0 || >=16.0.0}
+    peerDependencies:
+      typescript: ^5.4.2
+      vite: '*'
+    peerDependenciesMeta:
+      vite:
+        optional: true
+    dependencies:
+      '@microsoft/api-extractor': 7.39.0
+      '@rollup/pluginutils': 5.1.0(rollup@3.29.4)
+      '@vue/language-core': 1.8.27(typescript@5.4.2)
+      debug: 4.3.4(supports-color@8.1.1)
+      kolorist: 1.8.0
+      typescript: 5.4.2
+      vite: 5.1.6(sass@1.64.1)
+      vue-tsc: 1.8.27(typescript@5.4.2)
+    transitivePeerDependencies:
+      - '@types/node'
+      - rollup
+      - supports-color
+    dev: true
 
-  registry.npmjs.org/@eslint-community/eslint-utils@4.4.0(eslint@8.39.0):
-    resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz}
-    id: registry.npmjs.org/@eslint-community/eslint-utils/4.4.0
-    name: '@eslint-community/eslint-utils'
-    version: 4.4.0
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+  /vite@5.1.6(sass@1.64.1):
+    resolution: {integrity: sha512-yYIAZs9nVfRJ/AiOLCA91zzhjsHUgMjB+EigzFb6W2XTLO8JixBCKCjvhKZaye+NKYHCrkv3Oh50dH9EdLU2RA==}
+    engines: {node: ^18.0.0 || >=20.0.0}
+    hasBin: true
     peerDependencies:
-      eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
+      '@types/node': ^18.16.16
+      less: '*'
+      lightningcss: ^1.21.0
+      sass: '*'
+      stylus: '*'
+      sugarss: '*'
+      terser: ^5.4.0
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
+      less:
+        optional: true
+      lightningcss:
+        optional: true
+      sass:
+        optional: true
+      stylus:
+        optional: true
+      sugarss:
+        optional: true
+      terser:
+        optional: true
     dependencies:
-      eslint: registry.npmjs.org/eslint@8.39.0
-      eslint-visitor-keys: registry.npmjs.org/eslint-visitor-keys@3.4.0
-    dev: true
-
-  registry.npmjs.org/@eslint-community/regexpp@4.5.0:
-    resolution: {integrity: sha512-vITaYzIcNmjn5tF5uxcZ/ft7/RXGrMUIS9HalWckEOF6ESiwXKoMzAQf2UW0aVd6rnOeExTJVd5hmWXucBKGXQ==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.5.0.tgz}
-    name: '@eslint-community/regexpp'
-    version: 4.5.0
-    engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
+      esbuild: 0.19.8
+      postcss: 8.4.35
+      rollup: 4.6.0
+      sass: 1.64.1
+    optionalDependencies:
+      fsevents: 2.3.3
     dev: true
 
-  registry.npmjs.org/@eslint/eslintrc@2.0.2:
-    resolution: {integrity: sha512-3W4f5tDUra+pA+FzgugqL2pRimUTDJWKr7BINqOpkZrC0uYI0NIc0/JFgBROCU07HR6GieA5m3/rsPIhDmCXTQ==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.2.tgz}
-    name: '@eslint/eslintrc'
-    version: 2.0.2
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+  /vitest@1.3.1:
+    resolution: {integrity: sha512-/1QJqXs8YbCrfv/GPQ05wAZf2eakUPLPa18vkJAKE7RXOKfVHqMZZ1WlTjiwl6Gcn65M5vpNUB6EFLnEdRdEXQ==}
+    engines: {node: ^18.0.0 || >=20.0.0}
+    hasBin: true
+    peerDependencies:
+      '@edge-runtime/vm': '*'
+      '@types/node': ^18.16.16
+      '@vitest/browser': 1.3.1
+      '@vitest/ui': 1.3.1
+      happy-dom: '*'
+      jsdom: '*'
+    peerDependenciesMeta:
+      '@edge-runtime/vm':
+        optional: true
+      '@types/node':
+        optional: true
+      '@vitest/browser':
+        optional: true
+      '@vitest/ui':
+        optional: true
+      happy-dom:
+        optional: true
+      jsdom:
+        optional: true
     dependencies:
-      ajv: registry.npmjs.org/ajv@6.12.6
-      debug: registry.npmjs.org/debug@4.3.4
-      espree: registry.npmjs.org/espree@9.5.1
-      globals: registry.npmjs.org/globals@13.20.0
-      ignore: registry.npmjs.org/ignore@5.2.4
-      import-fresh: registry.npmjs.org/import-fresh@3.3.0
-      js-yaml: registry.npmjs.org/js-yaml@4.1.0
-      minimatch: registry.npmjs.org/minimatch@3.1.2
-      strip-json-comments: registry.npmjs.org/strip-json-comments@3.1.1
+      '@vitest/expect': 1.3.1
+      '@vitest/runner': 1.3.1
+      '@vitest/snapshot': 1.3.1
+      '@vitest/spy': 1.3.1
+      '@vitest/utils': 1.3.1
+      acorn-walk: 8.3.2
+      chai: 4.3.10
+      debug: 4.3.4(supports-color@8.1.1)
+      execa: 8.0.1
+      local-pkg: 0.5.0
+      magic-string: 0.30.8
+      pathe: 1.1.1
+      picocolors: 1.0.0
+      std-env: 3.6.0
+      strip-literal: 2.0.0
+      tinybench: 2.5.1
+      tinypool: 0.8.2
+      vite: 5.1.6(sass@1.64.1)
+      vite-node: 1.3.1
+      why-is-node-running: 2.2.2
     transitivePeerDependencies:
+      - less
+      - lightningcss
+      - sass
+      - stylus
+      - sugarss
       - supports-color
+      - terser
     dev: true
 
-  registry.npmjs.org/@eslint/js@8.39.0:
-    resolution: {integrity: sha512-kf9RB0Fg7NZfap83B3QOqOGg9QmD9yBudqQXzzOtn3i4y7ZUXe5ONeW34Gwi+TxhH4mvj72R1Zc300KUMa9Bng==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/@eslint/js/-/js-8.39.0.tgz}
-    name: '@eslint/js'
-    version: 8.39.0
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+  /void-elements@3.1.0:
+    resolution: {integrity: sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w==}
+    engines: {node: '>=0.10.0'}
     dev: true
 
-  registry.npmjs.org/@humanwhocodes/config-array@0.11.8:
-    resolution: {integrity: sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz}
-    name: '@humanwhocodes/config-array'
-    version: 0.11.8
-    engines: {node: '>=10.10.0'}
-    dependencies:
-      '@humanwhocodes/object-schema': registry.npmjs.org/@humanwhocodes/object-schema@1.2.1
-      debug: registry.npmjs.org/debug@4.3.4
-      minimatch: registry.npmjs.org/minimatch@3.1.2
-    transitivePeerDependencies:
-      - supports-color
+  /vscode-jsonrpc@6.0.0:
+    resolution: {integrity: sha512-wnJA4BnEjOSyFMvjZdpiOwhSq9uDoK8e/kpRJDTaMYzwlkrhG1fwDIZI94CLsLzlCK5cIbMMtFlJlfR57Lavmg==}
+    engines: {node: '>=8.0.0 || >=10.0.0'}
     dev: true
 
-  registry.npmjs.org/@humanwhocodes/module-importer@1.0.1:
-    resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz}
-    name: '@humanwhocodes/module-importer'
-    version: 1.0.1
-    engines: {node: '>=12.22'}
+  /vscode-languageclient@7.0.0:
+    resolution: {integrity: sha512-P9AXdAPlsCgslpP9pRxYPqkNYV7Xq8300/aZDpO35j1fJm/ncize8iGswzYlcvFw5DQUx4eVk+KvfXdL0rehNg==}
+    engines: {vscode: ^1.52.0}
+    dependencies:
+      minimatch: 3.1.2
+      semver: 7.6.0
+      vscode-languageserver-protocol: 3.16.0
     dev: true
 
-  registry.npmjs.org/@humanwhocodes/object-schema@1.2.1:
-    resolution: {integrity: sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz}
-    name: '@humanwhocodes/object-schema'
-    version: 1.2.1
+  /vscode-languageserver-protocol@3.16.0:
+    resolution: {integrity: sha512-sdeUoAawceQdgIfTI+sdcwkiK2KU+2cbEYA0agzM2uqaUy2UpnnGHtWTHVEtS0ES4zHU0eMFRGN+oQgDxlD66A==}
+    dependencies:
+      vscode-jsonrpc: 6.0.0
+      vscode-languageserver-types: 3.16.0
     dev: true
 
-  registry.npmjs.org/@nodelib/fs.scandir@2.1.5:
-    resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz}
-    name: '@nodelib/fs.scandir'
-    version: 2.1.5
-    engines: {node: '>= 8'}
-    dependencies:
-      '@nodelib/fs.stat': registry.npmjs.org/@nodelib/fs.stat@2.0.5
-      run-parallel: registry.npmjs.org/run-parallel@1.2.0
+  /vscode-languageserver-textdocument@1.0.11:
+    resolution: {integrity: sha512-X+8T3GoiwTVlJbicx/sIAF+yuJAqz8VvwJyoMVhwEMoEKE/fkDmrqUgDMyBECcM2A2frVZIUj5HI/ErRXCfOeA==}
     dev: true
 
-  registry.npmjs.org/@nodelib/fs.stat@2.0.5:
-    resolution: {integrity: sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz}
-    name: '@nodelib/fs.stat'
-    version: 2.0.5
-    engines: {node: '>= 8'}
+  /vscode-languageserver-types@3.16.0:
+    resolution: {integrity: sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA==}
     dev: true
 
-  registry.npmjs.org/@nodelib/fs.walk@1.2.8:
-    resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz}
-    name: '@nodelib/fs.walk'
-    version: 1.2.8
-    engines: {node: '>= 8'}
+  /vscode-languageserver@7.0.0:
+    resolution: {integrity: sha512-60HTx5ID+fLRcgdHfmz0LDZAXYEV68fzwG0JWwEPBode9NuMYTIxuYXPg4ngO8i8+Ou0lM7y6GzaYWbiDL0drw==}
+    hasBin: true
     dependencies:
-      '@nodelib/fs.scandir': registry.npmjs.org/@nodelib/fs.scandir@2.1.5
-      fastq: registry.npmjs.org/fastq@1.15.0
+      vscode-languageserver-protocol: 3.16.0
     dev: true
 
-  registry.npmjs.org/@types/json-schema@7.0.11:
-    resolution: {integrity: sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz}
-    name: '@types/json-schema'
-    version: 7.0.11
+  /vscode-uri@3.0.8:
+    resolution: {integrity: sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw==}
     dev: true
 
-  registry.npmjs.org/@types/semver@7.3.13:
-    resolution: {integrity: sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/@types/semver/-/semver-7.3.13.tgz}
-    name: '@types/semver'
-    version: 7.3.13
-    dev: true
+  /vue-agile@2.0.0:
+    resolution: {integrity: sha512-5xkSLJQNRdQ7qpEnXj5FgLg33XKRHaTZKGP5qkvteOc/uGJX89MYCjPSgdNqJ1GYFGfdGAp0jvhihW8OMuXS3g==}
+    dependencies:
+      lodash.orderby: 4.6.0
+      lodash.throttle: 4.1.1
+    dev: false
 
-  registry.npmjs.org/@typescript-eslint/scope-manager@5.45.0:
-    resolution: {integrity: sha512-noDMjr87Arp/PuVrtvN3dXiJstQR1+XlQ4R1EvzG+NMgXi8CuMCXpb8JqNtFHKceVSQ985BZhfRdowJzbv4yKw==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.45.0.tgz}
-    name: '@typescript-eslint/scope-manager'
-    version: 5.45.0
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+  /vue-boring-avatars@1.3.0(vue@3.4.21):
+    resolution: {integrity: sha512-X0Ur6+aYE8jXjKyY/LaWKrZ+FeJmc4xsirdz/lLuvm68wiokJc26Y9WpYPDuS1L2GwbvRDqLrnd9F2eL46buzA==}
+    peerDependencies:
+      vue: ^3.0.0
     dependencies:
-      '@typescript-eslint/types': registry.npmjs.org/@typescript-eslint/types@5.45.0
-      '@typescript-eslint/visitor-keys': registry.npmjs.org/@typescript-eslint/visitor-keys@5.45.0
-    dev: true
+      vue: 3.4.21(typescript@5.4.2)
+    dev: false
 
-  registry.npmjs.org/@typescript-eslint/types@5.45.0:
-    resolution: {integrity: sha512-QQij+u/vgskA66azc9dCmx+rev79PzX8uDHpsqSjEFtfF2gBUTRCpvYMh2gw2ghkJabNkPlSUCimsyBEQZd1DA==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/@typescript-eslint/types/-/types-5.45.0.tgz}
-    name: '@typescript-eslint/types'
-    version: 5.45.0
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    dev: true
+  /vue-chartjs@5.2.0(chart.js@4.4.0)(vue@3.4.21):
+    resolution: {integrity: sha512-d3zpKmGZr2OWHQ1xmxBcAn5ShTG917+/UCLaSpaCDDqT0U7DBsvFzTs69ZnHCgKoXT55GZDW8YEj9Av+dlONLA==}
+    peerDependencies:
+      chart.js: ^4.1.1
+      vue: ^3.0.0-0 || ^2.7.0
+    dependencies:
+      chart.js: 4.4.0
+      vue: 3.4.21(typescript@5.4.2)
+    dev: false
 
-  registry.npmjs.org/@typescript-eslint/typescript-estree@5.45.0(typescript@5.0.3):
-    resolution: {integrity: sha512-maRhLGSzqUpFcZgXxg1qc/+H0bT36lHK4APhp0AEUVrpSwXiRAomm/JGjSG+kNUio5kAa3uekCYu/47cnGn5EQ==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.45.0.tgz}
-    id: registry.npmjs.org/@typescript-eslint/typescript-estree/5.45.0
-    name: '@typescript-eslint/typescript-estree'
-    version: 5.45.0
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+  /vue-component-meta@1.8.27(typescript@5.4.2):
+    resolution: {integrity: sha512-j3WJsyQHP4TDlvnjHc/eseo0/eVkf0FaCpkqGwez5zD+Tj31onBzWZEXTnWKs8xRj0n3dMNYdy3SpiS6NubSvg==}
     peerDependencies:
-      typescript: '*'
+      typescript: ^5.4.2
     peerDependenciesMeta:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/types': registry.npmjs.org/@typescript-eslint/types@5.45.0
-      '@typescript-eslint/visitor-keys': registry.npmjs.org/@typescript-eslint/visitor-keys@5.45.0
-      debug: registry.npmjs.org/debug@4.3.4
-      globby: registry.npmjs.org/globby@11.1.0
-      is-glob: registry.npmjs.org/is-glob@4.0.3
-      semver: registry.npmjs.org/semver@7.3.8
-      tsutils: registry.npmjs.org/tsutils@3.21.0(typescript@5.0.3)
-      typescript: registry.npmjs.org/typescript@5.0.3
-    transitivePeerDependencies:
-      - supports-color
+      '@volar/typescript': 1.11.1
+      '@vue/language-core': 1.8.27(typescript@5.4.2)
+      path-browserify: 1.0.1
+      typescript: 5.4.2
+      vue-component-type-helpers: 1.8.27
     dev: true
 
-  registry.npmjs.org/@typescript-eslint/utils@5.45.0(eslint@8.39.0)(typescript@5.0.3):
-    resolution: {integrity: sha512-OUg2JvsVI1oIee/SwiejTot2OxwU8a7UfTFMOdlhD2y+Hl6memUSL4s98bpUTo8EpVEr0lmwlU7JSu/p2QpSvA==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.45.0.tgz}
-    id: registry.npmjs.org/@typescript-eslint/utils/5.45.0
-    name: '@typescript-eslint/utils'
-    version: 5.45.0
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    peerDependencies:
-      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
-    dependencies:
-      '@types/json-schema': registry.npmjs.org/@types/json-schema@7.0.11
-      '@types/semver': registry.npmjs.org/@types/semver@7.3.13
-      '@typescript-eslint/scope-manager': registry.npmjs.org/@typescript-eslint/scope-manager@5.45.0
-      '@typescript-eslint/types': registry.npmjs.org/@typescript-eslint/types@5.45.0
-      '@typescript-eslint/typescript-estree': registry.npmjs.org/@typescript-eslint/typescript-estree@5.45.0(typescript@5.0.3)
-      eslint: registry.npmjs.org/eslint@8.39.0
-      eslint-scope: registry.npmjs.org/eslint-scope@5.1.1
-      eslint-utils: registry.npmjs.org/eslint-utils@3.0.0(eslint@8.39.0)
-      semver: registry.npmjs.org/semver@7.3.8
-    transitivePeerDependencies:
-      - supports-color
-      - typescript
+  /vue-component-type-helpers@1.8.25:
+    resolution: {integrity: sha512-NCA6sekiJIMnMs4DdORxATXD+/NRkQpS32UC+I1KQJUasx+Z7MZUb3Y+MsKsFmX+PgyTYSteb73JW77AibaCCw==}
     dev: true
 
-  registry.npmjs.org/@typescript-eslint/visitor-keys@5.45.0:
-    resolution: {integrity: sha512-jc6Eccbn2RtQPr1s7th6jJWQHBHI6GBVQkCHoJFQ5UreaKm59Vxw+ynQUPPY2u2Amquc+7tmEoC2G52ApsGNNg==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.45.0.tgz}
-    name: '@typescript-eslint/visitor-keys'
-    version: 5.45.0
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    dependencies:
-      '@typescript-eslint/types': registry.npmjs.org/@typescript-eslint/types@5.45.0
-      eslint-visitor-keys: registry.npmjs.org/eslint-visitor-keys@3.3.0
+  /vue-component-type-helpers@1.8.27:
+    resolution: {integrity: sha512-0vOfAtI67UjeO1G6UiX5Kd76CqaQ67wrRZiOe7UAb9Jm6GzlUr/fC7CV90XfwapJRjpCMaZFhv1V0ajWRmE9Dg==}
     dev: true
 
-  registry.npmjs.org/acorn-jsx@5.3.2(acorn@8.8.1):
-    resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz}
-    id: registry.npmjs.org/acorn-jsx/5.3.2
-    name: acorn-jsx
-    version: 5.3.2
-    peerDependencies:
-      acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
-    dependencies:
-      acorn: registry.npmjs.org/acorn@8.8.1
+  /vue-component-type-helpers@2.0.17:
+    resolution: {integrity: sha512-2car49m8ciqg/JjgMBkx7o/Fd2A7fHESxNqL/2vJYFLXm4VwYO4yH0rexOi4a35vwNgDyvt17B07Vj126l9rAQ==}
     dev: true
 
-  registry.npmjs.org/acorn@8.8.1:
-    resolution: {integrity: sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz}
-    name: acorn
-    version: 8.8.1
-    engines: {node: '>=0.4.0'}
+  /vue-demi@0.14.5(vue@3.4.21):
+    resolution: {integrity: sha512-o9NUVpl/YlsGJ7t+xuqJKx8EBGf1quRhCiT6D/J0pfwmk9zUwYkC7yrF4SZCe6fETvSM3UNL2edcbYrSyc4QHA==}
+    engines: {node: '>=12'}
     hasBin: true
-    dev: true
-
-  registry.npmjs.org/ajv@6.12.6:
-    resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz}
-    name: ajv
-    version: 6.12.6
+    peerDependencies:
+      '@vue/composition-api': ^1.0.0-rc.1
+      vue: ^3.0.0-0 || ^2.6.0
+    peerDependenciesMeta:
+      '@vue/composition-api':
+        optional: true
     dependencies:
-      fast-deep-equal: registry.npmjs.org/fast-deep-equal@3.1.3
-      fast-json-stable-stringify: registry.npmjs.org/fast-json-stable-stringify@2.1.0
-      json-schema-traverse: registry.npmjs.org/json-schema-traverse@0.4.1
-      uri-js: registry.npmjs.org/uri-js@4.4.1
-    dev: true
+      vue: 3.4.21(typescript@5.4.2)
 
-  registry.npmjs.org/ansi-regex@5.0.1:
-    resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz}
-    name: ansi-regex
-    version: 5.0.1
-    engines: {node: '>=8'}
-    dev: true
-
-  registry.npmjs.org/ansi-styles@4.3.0:
-    resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz}
-    name: ansi-styles
-    version: 4.3.0
-    engines: {node: '>=8'}
+  /vue-demi@0.14.6(vue@3.4.21):
+    resolution: {integrity: sha512-8QA7wrYSHKaYgUxDA5ZC24w+eHm3sYCbp0EzcDwKqN3p6HqtTCGR/GVsPyZW92unff4UlcSh++lmqDWN3ZIq4w==}
+    engines: {node: '>=12'}
+    hasBin: true
+    peerDependencies:
+      '@vue/composition-api': ^1.0.0-rc.1
+      vue: ^3.0.0-0 || ^2.6.0
+    peerDependenciesMeta:
+      '@vue/composition-api':
+        optional: true
     dependencies:
-      color-convert: registry.npmjs.org/color-convert@2.0.1
-    dev: true
-
-  registry.npmjs.org/argparse@2.0.1:
-    resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz}
-    name: argparse
-    version: 2.0.1
-    dev: true
+      vue: 3.4.21(typescript@5.4.2)
+    dev: false
 
-  registry.npmjs.org/array-union@2.1.0:
-    resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz}
-    name: array-union
-    version: 2.1.0
-    engines: {node: '>=8'}
+  /vue-docgen-api@4.76.0(vue@3.4.21):
+    resolution: {integrity: sha512-Nykmg/Net1BhoS1tENGqcevDdgha4us0x2Xnin7n5SxxAH6+s10FXTWtg7E9+jhC3GWEE83lcFHMS/Ml4C1dog==}
+    peerDependencies:
+      vue: '>=2'
+    dependencies:
+      '@babel/parser': 7.24.0
+      '@babel/types': 7.23.6
+      '@vue/compiler-dom': 3.4.21
+      '@vue/compiler-sfc': 3.4.21
+      ast-types: 0.16.1
+      esm-resolve: 1.0.8
+      hash-sum: 2.0.0
+      lru-cache: 8.0.5
+      pug: 3.0.2
+      recast: 0.23.3
+      ts-map: 1.0.3
+      vue: 3.4.21(typescript@5.4.2)
+      vue-inbrowser-compiler-independent-utils: 4.71.1(vue@3.4.21)
     dev: true
 
-  registry.npmjs.org/balanced-match@1.0.2:
-    resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz}
-    name: balanced-match
-    version: 1.0.2
+  /vue-eslint-parser@9.4.2(eslint@8.57.0):
+    resolution: {integrity: sha512-Ry9oiGmCAK91HrKMtCrKFWmSFWvYkpGglCeFAIqDdr9zdXmMMpJOmUJS7WWsW7fX81h6mwHmUZCQQ1E0PkSwYQ==}
+    engines: {node: ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: '>=6.0.0'
+    dependencies:
+      debug: 4.3.4(supports-color@8.1.1)
+      eslint: 8.57.0
+      eslint-scope: 7.2.2
+      eslint-visitor-keys: 3.4.3
+      espree: 9.6.1
+      esquery: 1.5.0
+      lodash: 4.17.21
+      semver: 7.6.0
+    transitivePeerDependencies:
+      - supports-color
     dev: true
 
-  registry.npmjs.org/brace-expansion@1.1.11:
-    resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz}
-    name: brace-expansion
-    version: 1.1.11
+  /vue-i18n@9.2.2(vue@3.4.21):
+    resolution: {integrity: sha512-yswpwtj89rTBhegUAv9Mu37LNznyu3NpyLQmozF3i1hYOhwpG8RjcjIFIIfnu+2MDZJGSZPXaKWvnQA71Yv9TQ==}
+    engines: {node: '>= 14'}
+    peerDependencies:
+      vue: ^3.0.0
     dependencies:
-      balanced-match: registry.npmjs.org/balanced-match@1.0.2
-      concat-map: registry.npmjs.org/concat-map@0.0.1
-    dev: true
+      '@intlify/core-base': 9.2.2
+      '@intlify/shared': 9.2.2
+      '@intlify/vue-devtools': 9.2.2
+      '@vue/devtools-api': 6.4.5
+      vue: 3.4.21(typescript@5.4.2)
+    dev: false
 
-  registry.npmjs.org/braces@3.0.2:
-    resolution: {integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/braces/-/braces-3.0.2.tgz}
-    name: braces
-    version: 3.0.2
-    engines: {node: '>=8'}
+  /vue-inbrowser-compiler-independent-utils@4.71.1(vue@3.4.21):
+    resolution: {integrity: sha512-K3wt3iVmNGaFEOUR4JIThQRWfqokxLfnPslD41FDZB2ajXp789+wCqJyGYlIFsvEQ2P61PInw6/ph5iiqg51gg==}
+    peerDependencies:
+      vue: '>=2'
     dependencies:
-      fill-range: registry.npmjs.org/fill-range@7.0.1
+      vue: 3.4.21(typescript@5.4.2)
     dev: true
 
-  registry.npmjs.org/callsites@3.1.0:
-    resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz}
-    name: callsites
-    version: 3.1.0
-    engines: {node: '>=6'}
-    dev: true
+  /vue-json-pretty@2.2.4(vue@3.4.21):
+    resolution: {integrity: sha512-JX80b3QDrspcH43C53CdtYeq/froApQGSV5y43bEMWFj2LGOxB96aH1VmvrFA21nD1WTP6nwfFMQqGXuS4jyFQ==}
+    engines: {node: '>= 10.0.0', npm: '>= 5.0.0'}
+    peerDependencies:
+      vue: '>=3.0.0'
+    dependencies:
+      vue: 3.4.21(typescript@5.4.2)
+    dev: false
 
-  registry.npmjs.org/camel-case@4.1.2:
-    resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz}
-    name: camel-case
-    version: 4.1.2
+  /vue-markdown-render@2.0.1(typescript@5.4.2):
+    resolution: {integrity: sha512-/UBCu0OrZ9zzEDtiZVwlV/CQ+CgcwViServGis3TRXSVc6+6lJxcaOcD43vRoQzYfPa9r9WDt0Q7GyupOmpEWA==}
     dependencies:
-      pascal-case: registry.npmjs.org/pascal-case@3.1.2
-      tslib: registry.npmjs.org/tslib@2.5.0
-    dev: true
+      markdown-it: 12.3.2
+      vue: 3.4.21(typescript@5.4.2)
+    transitivePeerDependencies:
+      - typescript
+    dev: false
 
-  registry.npmjs.org/chalk@4.1.2:
-    resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz}
-    name: chalk
-    version: 4.1.2
-    engines: {node: '>=10'}
+  /vue-markdown-render@2.1.1(vue@3.4.21):
+    resolution: {integrity: sha512-szuJVbCwgIpVsggd8IHGB2lLo8BH8Ojd+wakaOTASNxdYcccKxoMcvDqUsLoGwgKDY8yJf0U/+ppffEYxsEHkA==}
+    peerDependencies:
+      vue: ^3.3.4
     dependencies:
-      ansi-styles: registry.npmjs.org/ansi-styles@4.3.0
-      supports-color: registry.npmjs.org/supports-color@7.2.0
-    dev: true
+      markdown-it: 12.3.2
+      vue: 3.4.21(typescript@5.4.2)
+    dev: false
 
-  registry.npmjs.org/color-convert@2.0.1:
-    resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz}
-    name: color-convert
-    version: 2.0.1
-    engines: {node: '>=7.0.0'}
+  /vue-router@4.2.2(vue@3.4.21):
+    resolution: {integrity: sha512-cChBPPmAflgBGmy3tBsjeoe3f3VOSG6naKyY5pjtrqLGbNEXdzCigFUHgBvp9e3ysAtFtEx7OLqcSDh/1Cq2TQ==}
+    peerDependencies:
+      vue: ^3.2.0
     dependencies:
-      color-name: registry.npmjs.org/color-name@1.1.4
-    dev: true
+      '@vue/devtools-api': 6.5.0
+      vue: 3.4.21(typescript@5.4.2)
+    dev: false
 
-  registry.npmjs.org/color-name@1.1.4:
-    resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz}
-    name: color-name
-    version: 1.1.4
+  /vue-template-compiler@2.7.14:
+    resolution: {integrity: sha512-zyA5Y3ArvVG0NacJDkkzJuPQDF8RFeRlzV2vLeSnhSpieO6LK2OVbdLPi5MPPs09Ii+gMO8nY4S3iKQxBxDmWQ==}
+    dependencies:
+      de-indent: 1.0.2
+      he: 1.2.0
     dev: true
 
-  registry.npmjs.org/concat-map@0.0.1:
-    resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz}
-    name: concat-map
-    version: 0.0.1
+  /vue-tsc@1.8.27(typescript@5.4.2):
+    resolution: {integrity: sha512-WesKCAZCRAbmmhuGl3+VrdWItEvfoFIPXOvUJkjULi+x+6G/Dy69yO3TBRJDr9eUlmsNAwVmxsNZxvHKzbkKdg==}
+    hasBin: true
+    peerDependencies:
+      typescript: ^5.4.2
+    dependencies:
+      '@volar/typescript': 1.11.1
+      '@vue/language-core': 1.8.27(typescript@5.4.2)
+      semver: 7.6.0
+      typescript: 5.4.2
     dev: true
 
-  registry.npmjs.org/cross-spawn@7.0.3:
-    resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz}
-    name: cross-spawn
-    version: 7.0.3
-    engines: {node: '>= 8'}
+  /vue-tsc@2.0.6(typescript@5.4.2):
+    resolution: {integrity: sha512-kK50W4XqQL34vHRkxlRWLicrT6+F9xfgCgJ4KSmCHcytKzc1u3c94XXgI+CjmhOSxyw0krpExF7Obo7y4+0dVQ==}
+    hasBin: true
+    peerDependencies:
+      typescript: ^5.4.2
     dependencies:
-      path-key: registry.npmjs.org/path-key@3.1.1
-      shebang-command: registry.npmjs.org/shebang-command@2.0.0
-      which: registry.npmjs.org/which@2.0.2
+      '@volar/typescript': 2.1.2
+      '@vue/language-core': 2.0.6(typescript@5.4.2)
+      semver: 7.6.0
+      typescript: 5.4.2
     dev: true
 
-  registry.npmjs.org/debug@4.3.4:
-    resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/debug/-/debug-4.3.4.tgz}
-    name: debug
-    version: 4.3.4
-    engines: {node: '>=6.0'}
+  /vue3-touch-events@4.1.3:
+    resolution: {integrity: sha512-uXTclRzn7de1mgiDIZ8N4J/wnWl1vBPLTWr60fqoLXu7ifhDKpl83Q2m9qA20KfEiAy+L4X/xXGc5ptGmdPh4A==}
+    dev: false
+
+  /vue@3.4.21(typescript@5.4.2):
+    resolution: {integrity: sha512-5hjyV/jLEIKD/jYl4cavMcnzKwjMKohureP8ejn3hhEjwhWIhWeuzL2kJAjzl/WyVsgPY56Sy4Z40C3lVshxXA==}
     peerDependencies:
-      supports-color: '*'
+      typescript: ^5.4.2
     peerDependenciesMeta:
-      supports-color:
+      typescript:
         optional: true
     dependencies:
-      ms: registry.npmjs.org/ms@2.1.2
-    dev: true
+      '@vue/compiler-dom': 3.4.21
+      '@vue/compiler-sfc': 3.4.21
+      '@vue/runtime-dom': 3.4.21
+      '@vue/server-renderer': 3.4.21(vue@3.4.21)
+      '@vue/shared': 3.4.21
+      typescript: 5.4.2
 
-  registry.npmjs.org/deep-is@0.1.4:
-    resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz}
-    name: deep-is
-    version: 0.1.4
-    dev: true
+  /w3c-keyname@2.2.6:
+    resolution: {integrity: sha512-f+fciywl1SJEniZHD6H+kUO8gOnwIr7f4ijKA6+ZvJFjeGi1r4PDLl53Ayud9O/rk64RqgoQine0feoeOU0kXg==}
+    dev: false
 
-  registry.npmjs.org/dir-glob@3.0.1:
-    resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz}
-    name: dir-glob
-    version: 3.0.1
-    engines: {node: '>=8'}
+  /w3c-xmlserializer@3.0.0:
+    resolution: {integrity: sha512-3WFqGEgSXIyGhOmAFtlicJNMjEps8b1MG31NCA0/vOF9+nKMUW1ckhi9cnNHmf88Rzw5V+dwIwsm2C7X8k9aQg==}
+    engines: {node: '>=12'}
     dependencies:
-      path-type: registry.npmjs.org/path-type@4.0.0
+      xml-name-validator: 4.0.0
     dev: true
 
-  registry.npmjs.org/doctrine@3.0.0:
-    resolution: {integrity: sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz}
-    name: doctrine
-    version: 3.0.0
-    engines: {node: '>=6.0.0'}
+  /w3c-xmlserializer@5.0.0:
+    resolution: {integrity: sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==}
+    engines: {node: '>=18'}
     dependencies:
-      esutils: registry.npmjs.org/esutils@2.0.3
-    dev: true
-
-  registry.npmjs.org/escape-string-regexp@4.0.0:
-    resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz}
-    name: escape-string-regexp
-    version: 4.0.0
-    engines: {node: '>=10'}
+      xml-name-validator: 5.0.0
     dev: true
 
-  registry.npmjs.org/eslint-plugin-n8n-nodes-base@1.12.0(eslint@8.39.0)(typescript@5.0.3):
-    resolution: {integrity: sha512-AotXR6IsxLNnxp4OxhD33xcmRFwVq7ZImBd0mTgpirV3VX8pCJDdiDlI2zCAICcICZxtOdbVtHOMhhnMjTh71A==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/eslint-plugin-n8n-nodes-base/-/eslint-plugin-n8n-nodes-base-1.12.0.tgz}
-    id: registry.npmjs.org/eslint-plugin-n8n-nodes-base/1.12.0
-    name: eslint-plugin-n8n-nodes-base
-    version: 1.12.0
-    dependencies:
-      '@typescript-eslint/utils': registry.npmjs.org/@typescript-eslint/utils@5.45.0(eslint@8.39.0)(typescript@5.0.3)
-      camel-case: registry.npmjs.org/camel-case@4.1.2
-      indefinite: registry.npmjs.org/indefinite@2.4.1
-      pascal-case: registry.npmjs.org/pascal-case@3.1.2
-      pluralize: registry.npmjs.org/pluralize@8.0.0
-      prettier: registry.npmjs.org/prettier@2.8.3
-      sentence-case: registry.npmjs.org/sentence-case@3.0.4
-      title-case: registry.npmjs.org/title-case@3.0.3
+  /wait-on@7.2.0(debug@4.3.4):
+    resolution: {integrity: sha512-wCQcHkRazgjG5XoAq9jbTMLpNIjoSlZslrJ2+N9MxDsGEv1HnFoVjOCexL0ESva7Y9cu350j+DWADdk54s4AFQ==}
+    engines: {node: '>=12.0.0'}
+    hasBin: true
+    dependencies:
+      axios: 1.6.7(debug@4.3.4)
+      joi: 17.11.0
+      lodash: 4.17.21
+      minimist: 1.2.8
+      rxjs: 7.8.1
     transitivePeerDependencies:
-      - eslint
-      - supports-color
-      - typescript
+      - debug
     dev: true
 
-  registry.npmjs.org/eslint-scope@5.1.1:
-    resolution: {integrity: sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz}
-    name: eslint-scope
-    version: 5.1.1
-    engines: {node: '>=8.0.0'}
+  /walker@1.0.8:
+    resolution: {integrity: sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==}
     dependencies:
-      esrecurse: registry.npmjs.org/esrecurse@4.3.0
-      estraverse: registry.npmjs.org/estraverse@4.3.0
-    dev: true
+      makeerror: 1.0.12
 
-  registry.npmjs.org/eslint-scope@7.2.0:
-    resolution: {integrity: sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.0.tgz}
-    name: eslint-scope
-    version: 7.2.0
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+  /watchpack@2.4.0:
+    resolution: {integrity: sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==}
+    engines: {node: '>=10.13.0'}
     dependencies:
-      esrecurse: registry.npmjs.org/esrecurse@4.3.0
-      estraverse: registry.npmjs.org/estraverse@5.3.0
+      glob-to-regexp: 0.4.1
+      graceful-fs: 4.2.11
     dev: true
 
-  registry.npmjs.org/eslint-utils@3.0.0(eslint@8.39.0):
-    resolution: {integrity: sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz}
-    id: registry.npmjs.org/eslint-utils/3.0.0
-    name: eslint-utils
-    version: 3.0.0
-    engines: {node: ^10.0.0 || ^12.0.0 || >= 14.0.0}
-    peerDependencies:
-      eslint: '>=5'
+  /wcwidth@1.0.1:
+    resolution: {integrity: sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==}
     dependencies:
-      eslint: registry.npmjs.org/eslint@8.39.0
-      eslint-visitor-keys: registry.npmjs.org/eslint-visitor-keys@2.1.0
+      defaults: 1.0.4
     dev: true
 
-  registry.npmjs.org/eslint-visitor-keys@2.1.0:
-    resolution: {integrity: sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz}
-    name: eslint-visitor-keys
-    version: 2.1.0
-    engines: {node: '>=10'}
+  /web-streams-polyfill@3.2.1:
+    resolution: {integrity: sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q==}
+    engines: {node: '>= 8'}
+    dev: false
+
+  /web-streams-polyfill@4.0.0-beta.3:
+    resolution: {integrity: sha512-QW95TCTaHmsYfHDybGMwO5IJIM93I/6vTRk+daHTWFPhwh+C8Cg7j7XyKrwrj8Ib6vYXe0ocYNrmzY4xAAN6ug==}
+    engines: {node: '>= 14'}
+    dev: false
+
+  /webidl-conversions@3.0.1:
+    resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==}
+
+  /webidl-conversions@7.0.0:
+    resolution: {integrity: sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==}
+    engines: {node: '>=12'}
+
+  /webpack-sources@3.2.3:
+    resolution: {integrity: sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==}
+    engines: {node: '>=10.13.0'}
     dev: true
 
-  registry.npmjs.org/eslint-visitor-keys@3.3.0:
-    resolution: {integrity: sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz}
-    name: eslint-visitor-keys
-    version: 3.3.0
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+  /webpack-virtual-modules@0.5.0:
+    resolution: {integrity: sha512-kyDivFZ7ZM0BVOUteVbDFhlRt7Ah/CSPwJdi8hBpkK7QLumUqdLtVfm/PX/hkcnrvr0i77fO5+TjZ94Pe+C9iw==}
     dev: true
 
-  registry.npmjs.org/eslint-visitor-keys@3.4.0:
-    resolution: {integrity: sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.0.tgz}
-    name: eslint-visitor-keys
-    version: 3.4.0
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+  /webpack-virtual-modules@0.6.1:
+    resolution: {integrity: sha512-poXpCylU7ExuvZK8z+On3kX+S8o/2dQ/SVYueKA0D4WEMXROXgY8Ez50/bQEUmvoSMMrWcrJqCHuhAbsiwg7Dg==}
+    dev: true
+
+  /webpack@5.75.0:
+    resolution: {integrity: sha512-piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ==}
+    engines: {node: '>=10.13.0'}
+    hasBin: true
+    peerDependencies:
+      webpack-cli: '*'
+    peerDependenciesMeta:
+      webpack-cli:
+        optional: true
+    dependencies:
+      '@types/eslint-scope': 3.7.4
+      '@types/estree': 0.0.51
+      '@webassemblyjs/ast': 1.11.1
+      '@webassemblyjs/wasm-edit': 1.11.1
+      '@webassemblyjs/wasm-parser': 1.11.1
+      acorn: 8.11.2
+      acorn-import-assertions: 1.8.0(acorn@8.11.2)
+      browserslist: 4.23.0
+      chrome-trace-event: 1.0.3
+      enhanced-resolve: 5.13.0
+      es-module-lexer: 0.9.3
+      eslint-scope: 5.1.1
+      events: 3.3.0
+      glob-to-regexp: 0.4.1
+      graceful-fs: 4.2.11
+      json-parse-even-better-errors: 2.3.1
+      loader-runner: 4.3.0
+      mime-types: 2.1.35
+      neo-async: 2.6.2
+      schema-utils: 3.1.1
+      tapable: 2.2.1
+      terser-webpack-plugin: 5.3.6(webpack@5.75.0)
+      watchpack: 2.4.0
+      webpack-sources: 3.2.3
+    transitivePeerDependencies:
+      - '@swc/core'
+      - esbuild
+      - uglify-js
     dev: true
 
-  registry.npmjs.org/eslint@8.39.0:
-    resolution: {integrity: sha512-mwiok6cy7KTW7rBpo05k6+p4YVZByLNjAZ/ACB9DRCu4YDRwjXI01tWHp6KAUWelsBetTxKK/2sHB0vdS8Z2Og==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/eslint/-/eslint-8.39.0.tgz}
-    name: eslint
-    version: 8.39.0
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    hasBin: true
+  /websocket@1.0.34:
+    resolution: {integrity: sha512-PRDso2sGwF6kM75QykIesBijKSVceR6jL2G8NGYyq2XrItNC2P5/qL5XeR056GhA+Ly7JMFvJb9I312mJfmqnQ==}
+    engines: {node: '>=4.0.0'}
     dependencies:
-      '@eslint-community/eslint-utils': registry.npmjs.org/@eslint-community/eslint-utils@4.4.0(eslint@8.39.0)
-      '@eslint-community/regexpp': registry.npmjs.org/@eslint-community/regexpp@4.5.0
-      '@eslint/eslintrc': registry.npmjs.org/@eslint/eslintrc@2.0.2
-      '@eslint/js': registry.npmjs.org/@eslint/js@8.39.0
-      '@humanwhocodes/config-array': registry.npmjs.org/@humanwhocodes/config-array@0.11.8
-      '@humanwhocodes/module-importer': registry.npmjs.org/@humanwhocodes/module-importer@1.0.1
-      '@nodelib/fs.walk': registry.npmjs.org/@nodelib/fs.walk@1.2.8
-      ajv: registry.npmjs.org/ajv@6.12.6
-      chalk: registry.npmjs.org/chalk@4.1.2
-      cross-spawn: registry.npmjs.org/cross-spawn@7.0.3
-      debug: registry.npmjs.org/debug@4.3.4
-      doctrine: registry.npmjs.org/doctrine@3.0.0
-      escape-string-regexp: registry.npmjs.org/escape-string-regexp@4.0.0
-      eslint-scope: registry.npmjs.org/eslint-scope@7.2.0
-      eslint-visitor-keys: registry.npmjs.org/eslint-visitor-keys@3.4.0
-      espree: registry.npmjs.org/espree@9.5.1
-      esquery: registry.npmjs.org/esquery@1.5.0
-      esutils: registry.npmjs.org/esutils@2.0.3
-      fast-deep-equal: registry.npmjs.org/fast-deep-equal@3.1.3
-      file-entry-cache: registry.npmjs.org/file-entry-cache@6.0.1
-      find-up: registry.npmjs.org/find-up@5.0.0
-      glob-parent: registry.npmjs.org/glob-parent@6.0.2
-      globals: registry.npmjs.org/globals@13.20.0
-      grapheme-splitter: registry.npmjs.org/grapheme-splitter@1.0.4
-      ignore: registry.npmjs.org/ignore@5.2.4
-      import-fresh: registry.npmjs.org/import-fresh@3.3.0
-      imurmurhash: registry.npmjs.org/imurmurhash@0.1.4
-      is-glob: registry.npmjs.org/is-glob@4.0.3
-      is-path-inside: registry.npmjs.org/is-path-inside@3.0.3
-      js-sdsl: registry.npmjs.org/js-sdsl@4.1.5
-      js-yaml: registry.npmjs.org/js-yaml@4.1.0
-      json-stable-stringify-without-jsonify: registry.npmjs.org/json-stable-stringify-without-jsonify@1.0.1
-      levn: registry.npmjs.org/levn@0.4.1
-      lodash.merge: registry.npmjs.org/lodash.merge@4.6.2
-      minimatch: registry.npmjs.org/minimatch@3.1.2
-      natural-compare: registry.npmjs.org/natural-compare@1.4.0
-      optionator: registry.npmjs.org/optionator@0.9.1
-      strip-ansi: registry.npmjs.org/strip-ansi@6.0.1
-      strip-json-comments: registry.npmjs.org/strip-json-comments@3.1.1
-      text-table: registry.npmjs.org/text-table@0.2.0
+      bufferutil: 4.0.8
+      debug: 2.6.9
+      es5-ext: 0.10.62
+      typedarray-to-buffer: 3.1.5
+      utf-8-validate: 5.0.10
+      yaeti: 0.0.6
     transitivePeerDependencies:
       - supports-color
-    dev: true
-
-  registry.npmjs.org/espree@9.5.1:
-    resolution: {integrity: sha512-5yxtHSZXRSW5pvv3hAlXM5+/Oswi1AUFqBmbibKb5s6bp3rGIDkyXU6xCoyuuLhijr4SFwPrXRoZjz0AZDN9tg==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/espree/-/espree-9.5.1.tgz}
-    name: espree
-    version: 9.5.1
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    dependencies:
-      acorn: registry.npmjs.org/acorn@8.8.1
-      acorn-jsx: registry.npmjs.org/acorn-jsx@5.3.2(acorn@8.8.1)
-      eslint-visitor-keys: registry.npmjs.org/eslint-visitor-keys@3.4.0
-    dev: true
+    dev: false
 
-  registry.npmjs.org/esquery@1.5.0:
-    resolution: {integrity: sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz}
-    name: esquery
-    version: 1.5.0
-    engines: {node: '>=0.10'}
+  /whatwg-encoding@2.0.0:
+    resolution: {integrity: sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==}
+    engines: {node: '>=12'}
     dependencies:
-      estraverse: registry.npmjs.org/estraverse@5.3.0
+      iconv-lite: 0.6.3
     dev: true
 
-  registry.npmjs.org/esrecurse@4.3.0:
-    resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz}
-    name: esrecurse
-    version: 4.3.0
-    engines: {node: '>=4.0'}
+  /whatwg-encoding@3.1.1:
+    resolution: {integrity: sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==}
+    engines: {node: '>=18'}
     dependencies:
-      estraverse: registry.npmjs.org/estraverse@5.3.0
-    dev: true
-
-  registry.npmjs.org/estraverse@4.3.0:
-    resolution: {integrity: sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz}
-    name: estraverse
-    version: 4.3.0
-    engines: {node: '>=4.0'}
-    dev: true
-
-  registry.npmjs.org/estraverse@5.3.0:
-    resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz}
-    name: estraverse
-    version: 5.3.0
-    engines: {node: '>=4.0'}
+      iconv-lite: 0.6.3
     dev: true
 
-  registry.npmjs.org/esutils@2.0.3:
-    resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz}
-    name: esutils
-    version: 2.0.3
-    engines: {node: '>=0.10.0'}
+  /whatwg-mimetype@3.0.0:
+    resolution: {integrity: sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==}
+    engines: {node: '>=12'}
     dev: true
 
-  registry.npmjs.org/fast-deep-equal@3.1.3:
-    resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz}
-    name: fast-deep-equal
-    version: 3.1.3
+  /whatwg-mimetype@4.0.0:
+    resolution: {integrity: sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==}
+    engines: {node: '>=18'}
     dev: true
 
-  registry.npmjs.org/fast-glob@3.2.12:
-    resolution: {integrity: sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz}
-    name: fast-glob
-    version: 3.2.12
-    engines: {node: '>=8.6.0'}
+  /whatwg-url@11.0.0:
+    resolution: {integrity: sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==}
+    engines: {node: '>=12'}
     dependencies:
-      '@nodelib/fs.stat': registry.npmjs.org/@nodelib/fs.stat@2.0.5
-      '@nodelib/fs.walk': registry.npmjs.org/@nodelib/fs.walk@1.2.8
-      glob-parent: registry.npmjs.org/glob-parent@5.1.2
-      merge2: registry.npmjs.org/merge2@1.4.1
-      micromatch: registry.npmjs.org/micromatch@4.0.5
-    dev: true
-
-  registry.npmjs.org/fast-json-stable-stringify@2.1.0:
-    resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz}
-    name: fast-json-stable-stringify
-    version: 2.1.0
-    dev: true
-
-  registry.npmjs.org/fast-levenshtein@2.0.6:
-    resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz}
-    name: fast-levenshtein
-    version: 2.0.6
+      tr46: 3.0.0
+      webidl-conversions: 7.0.0
     dev: true
 
-  registry.npmjs.org/fastq@1.15.0:
-    resolution: {integrity: sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz}
-    name: fastq
-    version: 1.15.0
+  /whatwg-url@13.0.0:
+    resolution: {integrity: sha512-9WWbymnqj57+XEuqADHrCJ2eSXzn8WXIW/YSGaZtb2WKAInQ6CHfaUUcTyyver0p8BDg5StLQq8h1vtZuwmOig==}
+    engines: {node: '>=16'}
     dependencies:
-      reusify: registry.npmjs.org/reusify@1.0.4
-    dev: true
+      tr46: 4.1.1
+      webidl-conversions: 7.0.0
+    dev: false
 
-  registry.npmjs.org/file-entry-cache@6.0.1:
-    resolution: {integrity: sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz}
-    name: file-entry-cache
-    version: 6.0.1
-    engines: {node: ^10.12.0 || >=12.0.0}
+  /whatwg-url@14.0.0:
+    resolution: {integrity: sha512-1lfMEm2IEr7RIV+f4lUNPOqfFL+pO+Xw3fJSqmjX9AbXcXcYOkCe1P6+9VBZB6n94af16NfZf+sSk0JCBZC9aw==}
+    engines: {node: '>=18'}
     dependencies:
-      flat-cache: registry.npmjs.org/flat-cache@3.0.4
+      tr46: 5.0.0
+      webidl-conversions: 7.0.0
     dev: true
 
-  registry.npmjs.org/fill-range@7.0.1:
-    resolution: {integrity: sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz}
-    name: fill-range
-    version: 7.0.1
-    engines: {node: '>=8'}
+  /whatwg-url@5.0.0:
+    resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==}
     dependencies:
-      to-regex-range: registry.npmjs.org/to-regex-range@5.0.1
-    dev: true
+      tr46: 0.0.3
+      webidl-conversions: 3.0.1
 
-  registry.npmjs.org/find-up@5.0.0:
-    resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz}
-    name: find-up
-    version: 5.0.0
-    engines: {node: '>=10'}
+  /which-boxed-primitive@1.0.2:
+    resolution: {integrity: sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==}
     dependencies:
-      locate-path: registry.npmjs.org/locate-path@6.0.0
-      path-exists: registry.npmjs.org/path-exists@4.0.0
-    dev: true
+      is-bigint: 1.0.4
+      is-boolean-object: 1.1.2
+      is-number-object: 1.0.7
+      is-string: 1.0.7
+      is-symbol: 1.0.4
 
-  registry.npmjs.org/flat-cache@3.0.4:
-    resolution: {integrity: sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz}
-    name: flat-cache
-    version: 3.0.4
-    engines: {node: ^10.12.0 || >=12.0.0}
+  /which-collection@1.0.1:
+    resolution: {integrity: sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==}
     dependencies:
-      flatted: registry.npmjs.org/flatted@3.2.7
-      rimraf: registry.npmjs.org/rimraf@3.0.2
-    dev: true
+      is-map: 2.0.2
+      is-set: 2.0.2
+      is-weakmap: 2.0.1
+      is-weakset: 2.0.2
 
-  registry.npmjs.org/flatted@3.2.7:
-    resolution: {integrity: sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz}
-    name: flatted
-    version: 3.2.7
-    dev: true
+  /which-module@2.0.1:
+    resolution: {integrity: sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==}
+    dev: false
 
-  registry.npmjs.org/fs.realpath@1.0.0:
-    resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz}
-    name: fs.realpath
-    version: 1.0.0
-    dev: true
+  /which-typed-array@1.1.11:
+    resolution: {integrity: sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      available-typed-arrays: 1.0.7
+      call-bind: 1.0.7
+      for-each: 0.3.3
+      gopd: 1.0.1
+      has-tostringtag: 1.0.2
 
-  registry.npmjs.org/glob-parent@5.1.2:
-    resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz}
-    name: glob-parent
-    version: 5.1.2
-    engines: {node: '>= 6'}
+  /which-typed-array@1.1.15:
+    resolution: {integrity: sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==}
+    engines: {node: '>= 0.4'}
     dependencies:
-      is-glob: registry.npmjs.org/is-glob@4.0.3
-    dev: true
+      available-typed-arrays: 1.0.7
+      call-bind: 1.0.7
+      for-each: 0.3.3
+      gopd: 1.0.1
+      has-tostringtag: 1.0.2
 
-  registry.npmjs.org/glob-parent@6.0.2:
-    resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz}
-    name: glob-parent
-    version: 6.0.2
-    engines: {node: '>=10.13.0'}
+  /which@1.3.1:
+    resolution: {integrity: sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==}
+    hasBin: true
     dependencies:
-      is-glob: registry.npmjs.org/is-glob@4.0.3
-    dev: true
+      isexe: 2.0.0
+    dev: false
 
-  registry.npmjs.org/glob@7.2.3:
-    resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/glob/-/glob-7.2.3.tgz}
-    name: glob
-    version: 7.2.3
+  /which@2.0.2:
+    resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==}
+    engines: {node: '>= 8'}
+    hasBin: true
     dependencies:
-      fs.realpath: registry.npmjs.org/fs.realpath@1.0.0
-      inflight: registry.npmjs.org/inflight@1.0.6
-      inherits: registry.npmjs.org/inherits@2.0.4
-      minimatch: registry.npmjs.org/minimatch@3.1.2
-      once: registry.npmjs.org/once@1.4.0
-      path-is-absolute: registry.npmjs.org/path-is-absolute@1.0.1
-    dev: true
+      isexe: 2.0.0
 
-  registry.npmjs.org/globals@13.20.0:
-    resolution: {integrity: sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/globals/-/globals-13.20.0.tgz}
-    name: globals
-    version: 13.20.0
+  /why-is-node-running@2.2.2:
+    resolution: {integrity: sha512-6tSwToZxTOcotxHeA+qGCq1mVzKR3CwcJGmVcY+QE8SHy6TnpFnh8PAvPNHYr7EcuVeG0QSMxtYCuO1ta/G/oA==}
     engines: {node: '>=8'}
+    hasBin: true
     dependencies:
-      type-fest: registry.npmjs.org/type-fest@0.20.2
+      siginfo: 2.0.0
+      stackback: 0.0.2
     dev: true
 
-  registry.npmjs.org/globby@11.1.0:
-    resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/globby/-/globby-11.1.0.tgz}
-    name: globby
-    version: 11.1.0
-    engines: {node: '>=10'}
+  /wide-align@1.1.5:
+    resolution: {integrity: sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==}
     dependencies:
-      array-union: registry.npmjs.org/array-union@2.1.0
-      dir-glob: registry.npmjs.org/dir-glob@3.0.1
-      fast-glob: registry.npmjs.org/fast-glob@3.2.12
-      ignore: registry.npmjs.org/ignore@5.2.4
-      merge2: registry.npmjs.org/merge2@1.4.1
-      slash: registry.npmjs.org/slash@3.0.0
-    dev: true
-
-  registry.npmjs.org/grapheme-splitter@1.0.4:
-    resolution: {integrity: sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz}
-    name: grapheme-splitter
-    version: 1.0.4
-    dev: true
+      string-width: 4.2.3
+    dev: false
+    optional: true
 
-  registry.npmjs.org/has-flag@4.0.0:
-    resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz}
-    name: has-flag
-    version: 4.0.0
+  /widest-line@3.1.0:
+    resolution: {integrity: sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==}
     engines: {node: '>=8'}
-    dev: true
-
-  registry.npmjs.org/ignore@5.2.4:
-    resolution: {integrity: sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz}
-    name: ignore
-    version: 5.2.4
-    engines: {node: '>= 4'}
-    dev: true
-
-  registry.npmjs.org/import-fresh@3.3.0:
-    resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz}
-    name: import-fresh
-    version: 3.3.0
-    engines: {node: '>=6'}
     dependencies:
-      parent-module: registry.npmjs.org/parent-module@1.0.1
-      resolve-from: registry.npmjs.org/resolve-from@4.0.0
-    dev: true
-
-  registry.npmjs.org/imurmurhash@0.1.4:
-    resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz}
-    name: imurmurhash
-    version: 0.1.4
-    engines: {node: '>=0.8.19'}
-    dev: true
-
-  registry.npmjs.org/indefinite@2.4.1:
-    resolution: {integrity: sha512-4C1k983crWkOu4tfmx8by1jQ0xBLBo0EhNV1WsRem2y+IbzLmPkYycjrQe399heo3bZ5OYpImQo2o85vQ0HkSQ==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/indefinite/-/indefinite-2.4.1.tgz}
-    name: indefinite
-    version: 2.4.1
-    engines: {node: '>=6.0.0'}
-    dev: true
+      string-width: 4.2.3
+    dev: false
 
-  registry.npmjs.org/inflight@1.0.6:
-    resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz}
-    name: inflight
-    version: 1.0.6
+  /winston-console-format@1.0.8:
+    resolution: {integrity: sha512-dq7t/E0D0QRi4XIOwu6HM1+5e//WPqylH88GVjKEhQVrzGFg34MCz+G7pMJcXFBen9C0kBsu5GYgbYsE2LDwKw==}
     dependencies:
-      once: registry.npmjs.org/once@1.4.0
-      wrappy: registry.npmjs.org/wrappy@1.0.2
-    dev: true
-
-  registry.npmjs.org/inherits@2.0.4:
-    resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz}
-    name: inherits
-    version: 2.0.4
-    dev: true
-
-  registry.npmjs.org/is-extglob@2.1.1:
-    resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz}
-    name: is-extglob
-    version: 2.1.1
-    engines: {node: '>=0.10.0'}
-    dev: true
+      colors: 1.4.0
+      logform: 2.4.2
+      triple-beam: 1.3.0
+    dev: false
 
-  registry.npmjs.org/is-glob@4.0.3:
-    resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz}
-    name: is-glob
-    version: 4.0.3
-    engines: {node: '>=0.10.0'}
+  /winston-transport@4.5.0:
+    resolution: {integrity: sha512-YpZzcUzBedhlTAfJg6vJDlyEai/IFMIVcaEZZyl3UXIl4gmqRpU7AE89AHLkbzLUsv0NVmw7ts+iztqKxxPW1Q==}
+    engines: {node: '>= 6.4.0'}
     dependencies:
-      is-extglob: registry.npmjs.org/is-extglob@2.1.1
-    dev: true
-
-  registry.npmjs.org/is-number@7.0.0:
-    resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz}
-    name: is-number
-    version: 7.0.0
-    engines: {node: '>=0.12.0'}
-    dev: true
-
-  registry.npmjs.org/is-path-inside@3.0.3:
-    resolution: {integrity: sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz}
-    name: is-path-inside
-    version: 3.0.3
-    engines: {node: '>=8'}
-    dev: true
-
-  registry.npmjs.org/isexe@2.0.0:
-    resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz}
-    name: isexe
-    version: 2.0.0
-    dev: true
+      logform: 2.4.2
+      readable-stream: 3.6.0
+      triple-beam: 1.3.0
+    dev: false
 
-  registry.npmjs.org/js-sdsl@4.1.5:
-    resolution: {integrity: sha512-08bOAKweV2NUC1wqTtf3qZlnpOX/R2DU9ikpjOHs0H+ibQv3zpncVQg6um4uYtRtrwIX8M4Nh3ytK4HGlYAq7Q==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.5.tgz}
-    name: js-sdsl
-    version: 4.1.5
-    dev: true
+  /winston@3.8.2:
+    resolution: {integrity: sha512-MsE1gRx1m5jdTTO9Ld/vND4krP2To+lgDoMEHGGa4HIlAUyXJtfc7CxQcGXVyz2IBpw5hbFkj2b/AtUdQwyRew==}
+    engines: {node: '>= 12.0.0'}
+    dependencies:
+      '@colors/colors': 1.5.0
+      '@dabh/diagnostics': 2.0.3
+      async: 3.2.4
+      is-stream: 2.0.1
+      logform: 2.4.2
+      one-time: 1.0.0
+      readable-stream: 3.6.0
+      safe-stable-stringify: 2.4.0
+      stack-trace: 0.0.10
+      triple-beam: 1.3.0
+      winston-transport: 4.5.0
+    dev: false
 
-  registry.npmjs.org/js-yaml@4.1.0:
-    resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz}
-    name: js-yaml
-    version: 4.1.0
-    hasBin: true
+  /with@7.0.2:
+    resolution: {integrity: sha512-RNGKj82nUPg3g5ygxkQl0R937xLyho1J24ItRCBTr/m1YnZkzJy1hUiHUJrc/VlsDQzsCnInEGSg3bci0Lmd4w==}
+    engines: {node: '>= 10.0.0'}
     dependencies:
-      argparse: registry.npmjs.org/argparse@2.0.1
+      '@babel/parser': 7.24.0
+      '@babel/types': 7.24.0
+      assert-never: 1.2.1
+      babel-walk: 3.0.0-canary-5
     dev: true
 
-  registry.npmjs.org/json-schema-traverse@0.4.1:
-    resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz}
-    name: json-schema-traverse
-    version: 0.4.1
-    dev: true
+  /word-wrap@1.2.3:
+    resolution: {integrity: sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==}
+    engines: {node: '>=0.10.0'}
 
-  registry.npmjs.org/json-stable-stringify-without-jsonify@1.0.1:
-    resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz}
-    name: json-stable-stringify-without-jsonify
-    version: 1.0.1
-    dev: true
+  /wordwrap@1.0.0:
+    resolution: {integrity: sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==}
 
-  registry.npmjs.org/levn@0.4.1:
-    resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/levn/-/levn-0.4.1.tgz}
-    name: levn
-    version: 0.4.1
-    engines: {node: '>= 0.8.0'}
+  /wrap-ansi@6.2.0:
+    resolution: {integrity: sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==}
+    engines: {node: '>=8'}
     dependencies:
-      prelude-ls: registry.npmjs.org/prelude-ls@1.2.1
-      type-check: registry.npmjs.org/type-check@0.4.0
-    dev: true
+      ansi-styles: 4.3.0
+      string-width: 4.2.3
+      strip-ansi: 6.0.1
 
-  registry.npmjs.org/locate-path@6.0.0:
-    resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz}
-    name: locate-path
-    version: 6.0.0
+  /wrap-ansi@7.0.0:
+    resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==}
     engines: {node: '>=10'}
     dependencies:
-      p-locate: registry.npmjs.org/p-locate@5.0.0
-    dev: true
-
-  registry.npmjs.org/lodash.merge@4.6.2:
-    resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz}
-    name: lodash.merge
-    version: 4.6.2
-    dev: true
-
-  registry.npmjs.org/lower-case@2.0.2:
-    resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz}
-    name: lower-case
-    version: 2.0.2
-    dependencies:
-      tslib: registry.npmjs.org/tslib@2.5.0
-    dev: true
+      ansi-styles: 4.3.0
+      string-width: 4.2.3
+      strip-ansi: 6.0.1
 
-  registry.npmjs.org/lru-cache@6.0.0:
-    resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz}
-    name: lru-cache
-    version: 6.0.0
-    engines: {node: '>=10'}
+  /wrap-ansi@8.1.0:
+    resolution: {integrity: sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==}
+    engines: {node: '>=12'}
     dependencies:
-      yallist: registry.npmjs.org/yallist@4.0.0
-    dev: true
+      ansi-styles: 6.2.1
+      string-width: 5.1.2
+      strip-ansi: 7.1.0
 
-  registry.npmjs.org/merge2@1.4.1:
-    resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz}
-    name: merge2
-    version: 1.4.1
-    engines: {node: '>= 8'}
-    dev: true
+  /wrappy@1.0.2:
+    resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}
 
-  registry.npmjs.org/micromatch@4.0.5:
-    resolution: {integrity: sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz}
-    name: micromatch
-    version: 4.0.5
-    engines: {node: '>=8.6'}
+  /write-file-atomic@2.4.3:
+    resolution: {integrity: sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==}
     dependencies:
-      braces: registry.npmjs.org/braces@3.0.2
-      picomatch: registry.npmjs.org/picomatch@2.3.1
+      graceful-fs: 4.2.11
+      imurmurhash: 0.1.4
+      signal-exit: 3.0.7
     dev: true
 
-  registry.npmjs.org/minimatch@3.1.2:
-    resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz}
-    name: minimatch
-    version: 3.1.2
+  /write-file-atomic@4.0.2:
+    resolution: {integrity: sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==}
+    engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
     dependencies:
-      brace-expansion: registry.npmjs.org/brace-expansion@1.1.11
-    dev: true
+      imurmurhash: 0.1.4
+      signal-exit: 3.0.7
 
-  registry.npmjs.org/ms@2.1.2:
-    resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/ms/-/ms-2.1.2.tgz}
-    name: ms
-    version: 2.1.2
+  /ws@7.5.9:
+    resolution: {integrity: sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==}
+    engines: {node: '>=8.3.0'}
+    peerDependencies:
+      bufferutil: ^4.0.1
+      utf-8-validate: ^5.0.2
+    peerDependenciesMeta:
+      bufferutil:
+        optional: true
+      utf-8-validate:
+        optional: true
     dev: true
 
-  registry.npmjs.org/natural-compare@1.4.0:
-    resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz}
-    name: natural-compare
-    version: 1.4.0
-    dev: true
+  /ws@8.14.2:
+    resolution: {integrity: sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==}
+    engines: {node: '>=10.0.0'}
+    peerDependencies:
+      bufferutil: ^4.0.1
+      utf-8-validate: '>=5.0.2'
+    peerDependenciesMeta:
+      bufferutil:
+        optional: true
+      utf-8-validate:
+        optional: true
 
-  registry.npmjs.org/no-case@3.0.4:
-    resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz}
-    name: no-case
-    version: 3.0.4
+  /xml-crypto@3.0.1:
+    resolution: {integrity: sha512-7XrwB3ujd95KCO6+u9fidb8ajvRJvIfGNWD0XLJoTWlBKz+tFpUzEYxsN+Il/6/gHtEs1RgRh2RH+TzhcWBZUw==}
+    engines: {node: '>=0.4.0'}
     dependencies:
-      lower-case: registry.npmjs.org/lower-case@2.0.2
-      tslib: registry.npmjs.org/tslib@2.5.0
-    dev: true
+      '@xmldom/xmldom': 0.8.6
+      xpath: 0.0.32
+    dev: false
 
-  registry.npmjs.org/once@1.4.0:
-    resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/once/-/once-1.4.0.tgz}
-    name: once
-    version: 1.4.0
-    dependencies:
-      wrappy: registry.npmjs.org/wrappy@1.0.2
+  /xml-name-validator@4.0.0:
+    resolution: {integrity: sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==}
+    engines: {node: '>=12'}
     dev: true
 
-  registry.npmjs.org/optionator@0.9.1:
-    resolution: {integrity: sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz}
-    name: optionator
-    version: 0.9.1
-    engines: {node: '>= 0.8.0'}
-    dependencies:
-      deep-is: registry.npmjs.org/deep-is@0.1.4
-      fast-levenshtein: registry.npmjs.org/fast-levenshtein@2.0.6
-      levn: registry.npmjs.org/levn@0.4.1
-      prelude-ls: registry.npmjs.org/prelude-ls@1.2.1
-      type-check: registry.npmjs.org/type-check@0.4.0
-      word-wrap: registry.npmjs.org/word-wrap@1.2.3
+  /xml-name-validator@5.0.0:
+    resolution: {integrity: sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==}
+    engines: {node: '>=18'}
     dev: true
 
-  registry.npmjs.org/p-limit@3.1.0:
-    resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz}
-    name: p-limit
-    version: 3.1.0
-    engines: {node: '>=10'}
+  /xml2js@0.4.23:
+    resolution: {integrity: sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==}
+    engines: {node: '>=4.0.0'}
     dependencies:
-      yocto-queue: registry.npmjs.org/yocto-queue@0.1.0
-    dev: true
+      sax: 1.2.4
+      xmlbuilder: 11.0.1
+    dev: false
 
-  registry.npmjs.org/p-locate@5.0.0:
-    resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz}
-    name: p-locate
-    version: 5.0.0
-    engines: {node: '>=10'}
+  /xml2js@0.5.0:
+    resolution: {integrity: sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==}
+    engines: {node: '>=4.0.0'}
     dependencies:
-      p-limit: registry.npmjs.org/p-limit@3.1.0
-    dev: true
+      sax: 1.2.4
+      xmlbuilder: 11.0.1
+    dev: false
 
-  registry.npmjs.org/parent-module@1.0.1:
-    resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz}
-    name: parent-module
-    version: 1.0.1
-    engines: {node: '>=6'}
+  /xml2js@0.6.2:
+    resolution: {integrity: sha512-T4rieHaC1EXcES0Kxxj4JWgaUQHDk+qwHcYOCFHfiwKz7tOVPLq7Hjq9dM1WCMhylqMEfP7hMcOIChvotiZegA==}
+    engines: {node: '>=4.0.0'}
     dependencies:
-      callsites: registry.npmjs.org/callsites@3.1.0
-    dev: true
+      sax: 1.2.4
+      xmlbuilder: 11.0.1
+    dev: false
 
-  registry.npmjs.org/pascal-case@3.1.2:
-    resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz}
-    name: pascal-case
-    version: 3.1.2
-    dependencies:
-      no-case: registry.npmjs.org/no-case@3.0.4
-      tslib: registry.npmjs.org/tslib@2.5.0
-    dev: true
+  /xml@1.0.1:
+    resolution: {integrity: sha512-huCv9IH9Tcf95zuYCsQraZtWnJvBtLVE0QHMOs8bWyZAFZNDcYjsPq1nEx8jKA9y+Beo9v+7OBPRisQTjinQMw==}
+    dev: false
 
-  registry.npmjs.org/path-exists@4.0.0:
-    resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz}
-    name: path-exists
-    version: 4.0.0
-    engines: {node: '>=8'}
-    dev: true
+  /xmlbuilder@10.1.1:
+    resolution: {integrity: sha512-OyzrcFLL/nb6fMGHbiRDuPup9ljBycsdCypwuyg5AAHvyWzGfChJpCXMG88AGTIMFhGZ9RccFN1e6lhg3hkwKg==}
+    engines: {node: '>=4.0'}
+    dev: false
 
-  registry.npmjs.org/path-is-absolute@1.0.1:
-    resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz}
-    name: path-is-absolute
-    version: 1.0.1
-    engines: {node: '>=0.10.0'}
-    dev: true
+  /xmlbuilder@11.0.1:
+    resolution: {integrity: sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==}
+    engines: {node: '>=4.0'}
+    dev: false
 
-  registry.npmjs.org/path-key@3.1.1:
-    resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz}
-    name: path-key
-    version: 3.1.1
-    engines: {node: '>=8'}
+  /xmlchars@2.2.0:
+    resolution: {integrity: sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==}
     dev: true
 
-  registry.npmjs.org/path-type@4.0.0:
-    resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz}
-    name: path-type
-    version: 4.0.0
-    engines: {node: '>=8'}
-    dev: true
+  /xmlcreate@2.0.4:
+    resolution: {integrity: sha512-nquOebG4sngPmGPICTS5EnxqhKbCmz5Ox5hsszI2T6U5qdrJizBc+0ilYSEjTSzU0yZcmvppztXe/5Al5fUwdg==}
+    dev: false
 
-  registry.npmjs.org/picomatch@2.3.1:
-    resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz}
-    name: picomatch
-    version: 2.3.1
-    engines: {node: '>=8.6'}
-    dev: true
+  /xmllint-wasm@3.0.1:
+    resolution: {integrity: sha512-t+aKQXJQNAt9/qLgCjhHUmCnPXAyqBKiyh8oV0ZwBMar/uB+5F40tqOJZ97JwLADcqQr5WB2bjCxLKrm+DHz1g==}
+    engines: {node: '>=10.5.0'}
+    dev: false
 
-  registry.npmjs.org/pluralize@8.0.0:
-    resolution: {integrity: sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/pluralize/-/pluralize-8.0.0.tgz}
-    name: pluralize
-    version: 8.0.0
-    engines: {node: '>=4'}
-    dev: true
+  /xpath@0.0.32:
+    resolution: {integrity: sha512-rxMJhSIoiO8vXcWvSifKqhvV96GjiD5wYb8/QHdoRyQvraTpp4IEv944nhGausZZ3u7dhQXteZuZbaqfpB7uYw==}
+    engines: {node: '>=0.6.0'}
+    dev: false
 
-  registry.npmjs.org/prelude-ls@1.2.1:
-    resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz}
-    name: prelude-ls
-    version: 1.2.1
-    engines: {node: '>= 0.8.0'}
-    dev: true
+  /xregexp@2.0.0:
+    resolution: {integrity: sha512-xl/50/Cf32VsGq/1R8jJE5ajH1yMCQkpmoS10QbFZWl2Oor4H0Me64Pu2yxvsRWK3m6soJbmGfzSR7BYmDcWAA==}
+    dev: false
 
-  registry.npmjs.org/prettier@2.8.3:
-    resolution: {integrity: sha512-tJ/oJ4amDihPoufT5sM0Z1SKEuKay8LfVAMlbbhnnkvt6BUserZylqo2PN+p9KeljLr0OHa2rXHU1T8reeoTrw==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/prettier/-/prettier-2.8.3.tgz}
-    name: prettier
-    version: 2.8.3
-    engines: {node: '>=10.13.0'}
+  /xss@1.0.14:
+    resolution: {integrity: sha512-og7TEJhXvn1a7kzZGQ7ETjdQVS2UfZyTlsEdDOqvQF7GoxNfY+0YLCzBy1kPdsDDx4QuNAonQPddpsn6Xl/7sw==}
+    engines: {node: '>= 0.10.0'}
     hasBin: true
-    dev: true
+    dependencies:
+      commander: 2.20.3
+      cssfilter: 0.0.10
+    dev: false
 
-  registry.npmjs.org/punycode@2.2.0:
-    resolution: {integrity: sha512-LN6QV1IJ9ZhxWTNdktaPClrNfp8xdSAYS0Zk2ddX7XsXZAxckMHPCBcHRo0cTcEIgYPRiGEkmji3Idkh2yFtYw==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/punycode/-/punycode-2.2.0.tgz}
-    name: punycode
-    version: 2.2.0
-    engines: {node: '>=6'}
-    dev: true
+  /xtend@4.0.2:
+    resolution: {integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==}
+    engines: {node: '>=0.4'}
 
-  registry.npmjs.org/queue-microtask@1.2.3:
-    resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz}
-    name: queue-microtask
-    version: 1.2.3
-    dev: true
+  /y18n@4.0.3:
+    resolution: {integrity: sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==}
+    dev: false
 
-  registry.npmjs.org/resolve-from@4.0.0:
-    resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz}
-    name: resolve-from
-    version: 4.0.0
-    engines: {node: '>=4'}
-    dev: true
+  /y18n@5.0.8:
+    resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==}
+    engines: {node: '>=10'}
 
-  registry.npmjs.org/reusify@1.0.4:
-    resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz}
-    name: reusify
-    version: 1.0.4
-    engines: {iojs: '>=1.0.0', node: '>=0.10.0'}
-    dev: true
+  /yaeti@0.0.6:
+    resolution: {integrity: sha512-MvQa//+KcZCUkBTIC9blM+CU9J2GzuTytsOUwf2lidtvkx/6gnEp1QvJv34t9vdjhFmha/mUiNDbN0D0mJWdug==}
+    engines: {node: '>=0.10.32'}
+    dev: false
 
-  registry.npmjs.org/rimraf@3.0.2:
-    resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz}
-    name: rimraf
-    version: 3.0.2
-    hasBin: true
-    dependencies:
-      glob: registry.npmjs.org/glob@7.2.3
-    dev: true
+  /yallist@2.1.2:
+    resolution: {integrity: sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==}
+    dev: false
 
-  registry.npmjs.org/run-parallel@1.2.0:
-    resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz}
-    name: run-parallel
-    version: 1.2.0
-    dependencies:
-      queue-microtask: registry.npmjs.org/queue-microtask@1.2.3
-    dev: true
+  /yallist@3.1.1:
+    resolution: {integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==}
 
-  registry.npmjs.org/semver@7.3.8:
-    resolution: {integrity: sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/semver/-/semver-7.3.8.tgz}
-    name: semver
-    version: 7.3.8
-    engines: {node: '>=10'}
-    hasBin: true
-    dependencies:
-      lru-cache: registry.npmjs.org/lru-cache@6.0.0
-    dev: true
+  /yallist@4.0.0:
+    resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==}
 
-  registry.npmjs.org/sentence-case@3.0.4:
-    resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/sentence-case/-/sentence-case-3.0.4.tgz}
-    name: sentence-case
-    version: 3.0.4
-    dependencies:
-      no-case: registry.npmjs.org/no-case@3.0.4
-      tslib: registry.npmjs.org/tslib@2.5.0
-      upper-case-first: registry.npmjs.org/upper-case-first@2.0.2
+  /yaml-ast-parser@0.0.43:
+    resolution: {integrity: sha512-2PTINUwsRqSd+s8XxKaJWQlUuEMHJQyEuh2edBbW8KNJz0SJPwUSD2zRWqezFEdN7IzAgeuYHFUCF7o8zRdZ0A==}
     dev: true
 
-  registry.npmjs.org/shebang-command@2.0.0:
-    resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz}
-    name: shebang-command
-    version: 2.0.0
-    engines: {node: '>=8'}
-    dependencies:
-      shebang-regex: registry.npmjs.org/shebang-regex@3.0.0
-    dev: true
+  /yaml@1.10.2:
+    resolution: {integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==}
+    engines: {node: '>= 6'}
 
-  registry.npmjs.org/shebang-regex@3.0.0:
-    resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz}
-    name: shebang-regex
-    version: 3.0.0
-    engines: {node: '>=8'}
-    dev: true
+  /yaml@2.3.4:
+    resolution: {integrity: sha512-8aAvwVUSHpfEqTQ4w/KMlf3HcRdt50E5ODIQJBw1fQ5RL34xabzxtUlzTXVqc4rkZsPbvrXKWnABCD7kWSmocA==}
+    engines: {node: '>= 14'}
+    dev: false
 
-  registry.npmjs.org/slash@3.0.0:
-    resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/slash/-/slash-3.0.0.tgz}
-    name: slash
-    version: 3.0.0
-    engines: {node: '>=8'}
-    dev: true
+  /yamljs@0.3.0:
+    resolution: {integrity: sha512-C/FsVVhht4iPQYXOInoxUM/1ELSf9EsgKH34FofQOp6hwCPrW4vG4w5++TED3xRUo8gD7l0P1J1dLlDYzODsTQ==}
+    hasBin: true
+    dependencies:
+      argparse: 1.0.10
+      glob: 7.2.3
+    dev: false
 
-  registry.npmjs.org/strip-ansi@6.0.1:
-    resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz}
-    name: strip-ansi
-    version: 6.0.1
-    engines: {node: '>=8'}
+  /yargs-parser@18.1.3:
+    resolution: {integrity: sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==}
+    engines: {node: '>=6'}
     dependencies:
-      ansi-regex: registry.npmjs.org/ansi-regex@5.0.1
-    dev: true
+      camelcase: 5.3.1
+      decamelize: 1.2.0
+    dev: false
 
-  registry.npmjs.org/strip-json-comments@3.1.1:
-    resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz}
-    name: strip-json-comments
-    version: 3.1.1
-    engines: {node: '>=8'}
-    dev: true
+  /yargs-parser@20.2.9:
+    resolution: {integrity: sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==}
+    engines: {node: '>=10'}
+
+  /yargs-parser@21.1.1:
+    resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==}
+    engines: {node: '>=12'}
 
-  registry.npmjs.org/supports-color@7.2.0:
-    resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz}
-    name: supports-color
-    version: 7.2.0
+  /yargs@15.4.1:
+    resolution: {integrity: sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==}
     engines: {node: '>=8'}
     dependencies:
-      has-flag: registry.npmjs.org/has-flag@4.0.0
-    dev: true
-
-  registry.npmjs.org/text-table@0.2.0:
-    resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz}
-    name: text-table
-    version: 0.2.0
-    dev: true
+      cliui: 6.0.0
+      decamelize: 1.2.0
+      find-up: 4.1.0
+      get-caller-file: 2.0.5
+      require-directory: 2.1.1
+      require-main-filename: 2.0.0
+      set-blocking: 2.0.0
+      string-width: 4.2.3
+      which-module: 2.0.1
+      y18n: 4.0.3
+      yargs-parser: 18.1.3
+    dev: false
 
-  registry.npmjs.org/title-case@3.0.3:
-    resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/title-case/-/title-case-3.0.3.tgz}
-    name: title-case
-    version: 3.0.3
+  /yargs@16.2.0:
+    resolution: {integrity: sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==}
+    engines: {node: '>=10'}
     dependencies:
-      tslib: registry.npmjs.org/tslib@2.5.0
-    dev: true
+      cliui: 7.0.4
+      escalade: 3.1.1
+      get-caller-file: 2.0.5
+      require-directory: 2.1.1
+      string-width: 4.2.3
+      y18n: 5.0.8
+      yargs-parser: 20.2.9
+    dev: false
 
-  registry.npmjs.org/to-regex-range@5.0.1:
-    resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz}
-    name: to-regex-range
-    version: 5.0.1
-    engines: {node: '>=8.0'}
+  /yargs@17.0.1:
+    resolution: {integrity: sha512-xBBulfCc8Y6gLFcrPvtqKz9hz8SO0l1Ni8GgDekvBX2ro0HRQImDGnikfc33cgzcYUSncapnNcZDjVFIH3f6KQ==}
+    engines: {node: '>=12'}
     dependencies:
-      is-number: registry.npmjs.org/is-number@7.0.0
+      cliui: 7.0.4
+      escalade: 3.1.1
+      get-caller-file: 2.0.5
+      require-directory: 2.1.1
+      string-width: 4.2.3
+      y18n: 5.0.8
+      yargs-parser: 20.2.9
     dev: true
 
-  registry.npmjs.org/tslib@2.5.0:
-    resolution: {integrity: sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz}
-    name: tslib
-    version: 2.5.0
-    dev: true
+  /yargs@17.6.0:
+    resolution: {integrity: sha512-8H/wTDqlSwoSnScvV2N/JHfLWOKuh5MVla9hqLjK3nsfyy6Y4kDSYSvkU5YCUEPOSnRXfIyx3Sq+B/IWudTo4g==}
+    engines: {node: '>=12'}
+    dependencies:
+      cliui: 8.0.1
+      escalade: 3.1.1
+      get-caller-file: 2.0.5
+      require-directory: 2.1.1
+      string-width: 4.2.3
+      y18n: 5.0.8
+      yargs-parser: 21.1.1
+    dev: false
 
-  registry.npmjs.org/tsutils@3.21.0(typescript@5.0.3):
-    resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz}
-    id: registry.npmjs.org/tsutils/3.21.0
-    name: tsutils
-    version: 3.21.0
-    engines: {node: '>= 6'}
-    peerDependencies:
-      typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta'
+  /yargs@17.7.2:
+    resolution: {integrity: sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==}
+    engines: {node: '>=12'}
     dependencies:
-      tslib: registry.npmjs.org/tslib@2.5.0
-      typescript: registry.npmjs.org/typescript@5.0.3
-    dev: true
+      cliui: 8.0.1
+      escalade: 3.1.1
+      get-caller-file: 2.0.5
+      require-directory: 2.1.1
+      string-width: 4.2.3
+      y18n: 5.0.8
+      yargs-parser: 21.1.1
 
-  registry.npmjs.org/type-check@0.4.0:
-    resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz}
-    name: type-check
-    version: 0.4.0
-    engines: {node: '>= 0.8.0'}
+  /yauzl@2.10.0:
+    resolution: {integrity: sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==}
     dependencies:
-      prelude-ls: registry.npmjs.org/prelude-ls@1.2.1
+      buffer-crc32: 0.2.13
+      fd-slicer: 1.1.0
     dev: true
 
-  registry.npmjs.org/type-fest@0.20.2:
-    resolution: {integrity: sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz}
-    name: type-fest
-    version: 0.20.2
+  /yocto-queue@0.1.0:
+    resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
     engines: {node: '>=10'}
-    dev: true
 
-  registry.npmjs.org/typescript@5.0.3:
-    resolution: {integrity: sha512-xv8mOEDnigb/tN9PSMTwSEqAnUvkoXMQlicOb0IUVDBSQCgBSaAAROUZYy2IcUy5qU6XajK5jjjO7TMWqBTKZA==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/typescript/-/typescript-5.0.3.tgz}
-    name: typescript
-    version: 5.0.3
+  /yocto-queue@1.0.0:
+    resolution: {integrity: sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==}
     engines: {node: '>=12.20'}
-    hasBin: true
     dev: true
 
-  registry.npmjs.org/upper-case-first@2.0.2:
-    resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/upper-case-first/-/upper-case-first-2.0.2.tgz}
-    name: upper-case-first
-    version: 2.0.2
+  /yup@0.32.11:
+    resolution: {integrity: sha512-Z2Fe1bn+eLstG8DRR6FTavGD+MeAwyfmouhHsIUgaADz8jvFKbO/fXc2trJKZg+5EBjh4gGm3iU/t3onKlXHIg==}
+    engines: {node: '>=10'}
     dependencies:
-      tslib: registry.npmjs.org/tslib@2.5.0
-    dev: true
+      '@babel/runtime': 7.23.6
+      '@types/lodash': 4.14.195
+      lodash: 4.17.21
+      lodash-es: 4.17.21
+      nanoclone: 0.2.1
+      property-expr: 2.0.5
+      toposort: 2.0.2
+    dev: false
 
-  registry.npmjs.org/uri-js@4.4.1:
-    resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz}
-    name: uri-js
-    version: 4.4.1
+  /z-schema@5.0.5:
+    resolution: {integrity: sha512-D7eujBWkLa3p2sIpJA0d1pr7es+a7m0vFAnZLlCEKq/Ij2k0MLi9Br2UPxoxdYystm5K1yeBGzub0FlYUEWj2Q==}
+    engines: {node: '>=8.0.0'}
+    hasBin: true
     dependencies:
-      punycode: registry.npmjs.org/punycode@2.2.0
+      lodash.get: 4.4.2
+      lodash.isequal: 4.5.0
+      validator: 13.7.0
+    optionalDependencies:
+      commander: 9.4.1
     dev: true
 
-  registry.npmjs.org/which@2.0.2:
-    resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/which/-/which-2.0.2.tgz}
-    name: which
-    version: 2.0.2
-    engines: {node: '>= 8'}
-    hasBin: true
+  /zen-observable-ts@1.1.0:
+    resolution: {integrity: sha512-1h4zlLSqI2cRLPJUHJFL8bCWHhkpuXkF+dbGkRaWjgDIG26DmzyshUMrdV/rL3UnR+mhaX4fRq8LPouq0MYYIA==}
     dependencies:
-      isexe: registry.npmjs.org/isexe@2.0.0
-    dev: true
+      '@types/zen-observable': 0.8.3
+      zen-observable: 0.8.15
+    dev: false
 
-  registry.npmjs.org/word-wrap@1.2.3:
-    resolution: {integrity: sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz}
-    name: word-wrap
-    version: 1.2.3
-    engines: {node: '>=0.10.0'}
-    dev: true
+  /zen-observable@0.8.15:
+    resolution: {integrity: sha512-PQ2PC7R9rslx84ndNBZB/Dkv8V8fZEpk83RLgXtYd0fwUgEjseMn1Dgajh2x6S8QbZAFa9p2qVCEuYZNgve0dQ==}
+    dev: false
 
-  registry.npmjs.org/wrappy@1.0.2:
-    resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz}
-    name: wrappy
-    version: 1.0.2
-    dev: true
+  /zod-to-json-schema@3.22.4(zod@3.22.4):
+    resolution: {integrity: sha512-2Ed5dJ+n/O3cU383xSY28cuVi0BCQhF8nYqWU5paEpl7fVdqdAmiLdqLyfblbNdfOFwFfi/mqU4O1pwc60iBhQ==}
+    peerDependencies:
+      zod: ^3.22.4
+    dependencies:
+      zod: 3.22.4
+    dev: false
 
-  registry.npmjs.org/yallist@4.0.0:
-    resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz}
-    name: yallist
-    version: 4.0.0
-    dev: true
+  /zod-to-json-schema@3.22.5(zod@3.22.4):
+    resolution: {integrity: sha512-+akaPo6a0zpVCCseDed504KBJUQpEW5QZw7RMneNmKw+fGaML1Z9tUNLnHHAC8x6dzVRO1eB2oEMyZRnuBZg7Q==}
+    peerDependencies:
+      zod: ^3.22.4
+    dependencies:
+      zod: 3.22.4
+    dev: false
 
-  registry.npmjs.org/yocto-queue@0.1.0:
-    resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz}
-    name: yocto-queue
-    version: 0.1.0
-    engines: {node: '>=10'}
-    dev: true
+  /zod@3.22.4:
+    resolution: {integrity: sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg==}
+    dev: false
+
+  '@cdn.sheetjs.com/xlsx-0.19.3/xlsx-0.19.3.tgz':
+    resolution: {registry: https://registry.npmjs.org/, tarball: https://cdn.sheetjs.com/xlsx-0.19.3/xlsx-0.19.3.tgz}
+    name: xlsx
+    version: 0.19.3
+    engines: {node: '>=0.8'}
+    hasBin: true
+    dev: false
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 4a89a5858c0a8..ce18506b3820a 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -1,3 +1,4 @@
 packages:
   - packages/*
+  - packages/@n8n/*
   - packages/@n8n_io/*
diff --git a/scripts/format.mjs b/scripts/format.mjs
index f278e77ec1df1..11b267b47792f 100644
--- a/scripts/format.mjs
+++ b/scripts/format.mjs
@@ -4,7 +4,7 @@ import fs from 'fs';
 import path from 'path';
 import { execSync } from 'child_process';
 
-const prettier = path.resolve('node_modules', 'prettier', 'bin-prettier.js');
+const prettier = path.resolve('node_modules', '.bin', 'prettier');
 
 if (!fs.existsSync(prettier)) {
 	throw new Error(
diff --git a/scripts/run-e2e.js b/scripts/run-e2e.js
new file mode 100755
index 0000000000000..a5d75c5f4b71d
--- /dev/null
+++ b/scripts/run-e2e.js
@@ -0,0 +1,71 @@
+#!/usr/bin/env node
+const { spawn } = require('child_process');
+const { mkdirSync, mkdtempSync } = require('fs');
+const { tmpdir } = require('os');
+const { join } = require('path');
+
+function runTests(options) {
+	const testsDir = join(tmpdir(), 'n8n-e2e/');
+	mkdirSync(testsDir, { recursive: true });
+
+	const userFolder = mkdtempSync(testsDir);
+
+	process.env.N8N_USER_FOLDER = userFolder;
+	process.env.E2E_TESTS = 'true';
+	process.env.NODE_OPTIONS = '--dns-result-order=ipv4first';
+	process.env.VUE_APP_MAX_PINNED_DATA_SIZE = `${16 * 1024}`;
+
+	if (options.customEnv) {
+		Object.keys(options.customEnv).forEach((key) => {
+			process.env[key] = options.customEnv[key];
+		});
+	}
+
+	const cmd = `start-server-and-test ${options.startCommand} ${options.url} '${options.testCommand}'`;
+	const testProcess = spawn(cmd, [], { stdio: 'inherit', shell: true });
+
+	// Listen for termination signals to properly kill the test process
+	process.on('SIGINT', () => {
+		testProcess.kill('SIGINT');
+	});
+
+	process.on('SIGTERM', () => {
+		testProcess.kill('SIGTERM');
+	});
+
+	testProcess.on('exit', (code) => {
+		process.exit(code);
+	});
+}
+
+const scenario = process.argv[2];
+
+switch (scenario) {
+	case 'ui':
+		runTests({
+			startCommand: 'start',
+			url: 'http://localhost:5678/favicon.ico',
+			testCommand: 'cypress open',
+		});
+		break;
+	case 'dev':
+		runTests({
+			startCommand: 'dev',
+			url: 'http://localhost:8080/favicon.ico',
+			testCommand: 'cypress open',
+			customEnv: {
+				CYPRESS_BASE_URL: 'http://localhost:8080',
+			},
+		});
+		break;
+	case 'all':
+		runTests({
+			startCommand: 'start',
+			url: 'http://localhost:5678/favicon.ico',
+			testCommand: 'cypress run --headless',
+		});
+		break;
+	default:
+		console.error('Unknown scenario');
+		process.exit(1);
+}
diff --git a/scripts/trim-fe-packageJson.js b/scripts/trim-fe-packageJson.js
new file mode 100644
index 0000000000000..611cb2ec3c50d
--- /dev/null
+++ b/scripts/trim-fe-packageJson.js
@@ -0,0 +1,15 @@
+const { writeFileSync } = require('fs');
+const { resolve } = require('path');
+const baseDir = resolve(__dirname, '..');
+
+const trimPackageJson = (packageName) => {
+	const filePath = resolve(baseDir, 'packages', packageName, 'package.json');
+	const { scripts, peerDependencies, devDependencies, dependencies, ...packageJson } = require(
+		filePath,
+	);
+	writeFileSync(filePath, JSON.stringify(packageJson, null, 2) + '\n', 'utf-8');
+};
+
+trimPackageJson('@n8n/chat');
+trimPackageJson('design-system');
+trimPackageJson('editor-ui');
diff --git a/scripts/validate-docs-links.js b/scripts/validate-docs-links.js
deleted file mode 100644
index aab9a23380fd5..0000000000000
--- a/scripts/validate-docs-links.js
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/usr/bin/env node
-
-const path = require('path');
-const https = require('https');
-const glob = require('fast-glob');
-const pLimit = require('p-limit');
-
-const nodesBaseDir = path.resolve(__dirname, '../packages/nodes-base');
-
-const validateUrl = async (kind, name, documentationUrl) =>
-	new Promise((resolve, reject) => {
-		if (!documentationUrl) resolve([name, null]);
-		const url = new URL(
-			/^https?:\/\//.test(documentationUrl)
-				? documentationUrl
-				: `https://docs.n8n.io/integrations/builtin/${kind}/${documentationUrl.toLowerCase()}/`,
-		);
-		https
-			.request(
-				{
-					hostname: url.hostname,
-					port: 443,
-					path: url.pathname,
-					method: 'HEAD',
-				},
-				(res) => resolve([name, res.statusCode]),
-			)
-			.on('error', (e) => reject(e))
-			.end();
-	});
-
-const checkLinks = async (kind) => {
-	let types = require(path.join(nodesBaseDir, `dist/types/${kind}.json`));
-	if (kind === 'nodes')
-		types = types.filter(({ codex }) => !!codex?.resources?.primaryDocumentation);
-	const limit = pLimit(30);
-	const statuses = await Promise.all(
-		types.map((type) =>
-			limit(() => {
-				const documentationUrl =
-					kind === 'credentials'
-						? type.documentationUrl
-						: type.codex?.resources?.primaryDocumentation?.[0]?.url;
-				return validateUrl(kind, type.displayName, documentationUrl);
-			}),
-		),
-	);
-
-	const missingDocs = [];
-	const invalidUrls = [];
-	for (const [name, statusCode] of statuses) {
-		if (statusCode === null) missingDocs.push(name);
-		if (statusCode !== 200) invalidUrls.push(name);
-	}
-
-	if (missingDocs.length) console.log('Documentation URL missing for %s', kind, missingDocs);
-	if (invalidUrls.length) console.log('Documentation URL invalid for %s', kind, invalidUrls);
-	if (missingDocs.length || invalidUrls.length) process.exit(1);
-};
-
-(async () => {
-	await checkLinks('credentials');
-	await checkLinks('nodes');
-})();
diff --git a/tsconfig.backend.json b/tsconfig.backend.json
new file mode 100644
index 0000000000000..438fc8851bd83
--- /dev/null
+++ b/tsconfig.backend.json
@@ -0,0 +1,6 @@
+{
+	"compilerOptions": {
+		"types": ["node", "jest"],
+		"noEmit": true
+	}
+}
diff --git a/tsconfig.build.json b/tsconfig.build.json
new file mode 100644
index 0000000000000..8a1a0105e38c7
--- /dev/null
+++ b/tsconfig.build.json
@@ -0,0 +1,16 @@
+{
+	"compilerOptions": {
+		"types": ["node"],
+		"noEmit": false,
+		"noUnusedLocals": false,
+		"noUnusedParameters": false,
+		"declaration": true
+	},
+	"tsc-alias": {
+		"replacers": {
+			"base-url": {
+				"enabled": false
+			}
+		}
+	}
+}
diff --git a/tsconfig.json b/tsconfig.json
index 986eb63ac6550..1b0bd25650b62 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -11,14 +11,16 @@
 		"noImplicitAny": true,
 		"noImplicitReturns": true,
 		"noUnusedLocals": true,
+		"noUnusedParameters": true,
 		"strictNullChecks": true,
 		"preserveConstEnums": true,
 		"esModuleInterop": true,
 		"resolveJsonModule": true,
 		"incremental": true,
-		"declaration": true,
+		"declaration": false,
 		"sourceMap": true,
 		"skipLibCheck": true
 	},
-	"exclude": ["**/dist/**/*", "**/node_modules/**/*"]
+	"exclude": ["**/dist/**/*", "**/node_modules/**/*", "cypress"],
+	"files": ["node_modules/jest-expect-message/types/index.d.ts"]
 }
diff --git a/turbo.json b/turbo.json
index c1fb2798dd1d5..f0b0521623c1a 100644
--- a/turbo.json
+++ b/turbo.json
@@ -5,16 +5,21 @@
 			"cache": false
 		},
 		"build": {
-			"dependsOn": ["^build"]
+			"dependsOn": ["^build"],
+			"outputs": ["dist/**"]
 		},
 		"typecheck": {},
 		"format": {},
 		"lint": {},
 		"lintfix": {},
 		"test": {},
-		"watch": {},
+		"watch": {
+			"cache": false,
+			"persistent": true
+		},
 		"dev": {
-			"cache": false
+			"cache": false,
+			"persistent": true
 		}
 	}
 }
diff --git a/vitest.workspace.ts b/vitest.workspace.ts
new file mode 100644
index 0000000000000..ec031654d2c95
--- /dev/null
+++ b/vitest.workspace.ts
@@ -0,0 +1 @@
+export default ['packages/{design-system,editor-ui}'];